Prevent unloading methods used in root_fiber while calling another Fiber (#2939)

Fixing SEGVs like: http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/2744905 http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/2744420 http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/2741400 [Bug #16664] (cherry picked from commit adcf0316d1ecedae2a9157ad941550e0c0fb510b)
author: Takashi Kokubun <takashikkbn@gmail.com> 2020-02-28 23:58:33 -0800
committer: NARUSE, Yui <naruse@airemix.jp> 2020-03-15 19:35:24 +0900
commit: a36ead3f4fe801ddaebe6d1ed905e9e3276dbac7 (patch)
tree: 53de69643c057929db9305329fa16989b96c9ded /test/ruby/test_rubyoptions.rb
parent: 17e925b9917f4877f2da8c64316feb3ce1ca2932 (diff)
0 files changed, 0 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore
index a72211d03f..76c9bc0b78 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,6 +14,7 @@
 COPYING.LIB
 ChangeLog.pre-alpha
 ChangeLog.pre1_1
+ChangeLog-1.8.0
 Makefile
 README.fat-patch
 README.v6
@@ -34,9 +35,12 @@ newdate.rb
 newver.rb
 parse.c
 patches
+patches-master
+pitest.rb
 ppack
 preview
 rbconfig.rb
+rename2.h
 repack
 riscos
 rubicon
diff --git a/.document b/.document
index 230c50e387..8a05d61beb 100644
--- a/.document
+++ b/.document
@@ -6,6 +6,9 @@
 # Process all the C source files
 *.c
 
+# prelude
+prelude.rb
+
 # the lib/ directory (which has its own .document file)
 
 lib
@@ -14,3 +17,6 @@ lib
 # and some of the ext/ directory (which has its own .document file)
 
 ext
+
+# rdoc files
+doc/*.rdoc
diff --git a/.gdbinit b/.gdbinit
new file mode 100644
index 0000000000..2a38da8892
--- /dev/null
+++ b/.gdbinit
@@ -0,0 +1,757 @@
+define rp
+  if ruby_dummy_gdb_enums.special_consts
+  end
+  if (VALUE)($arg0) & RUBY_FIXNUM_FLAG
+    printf "FIXNUM: %ld\n", (long)($arg0) >> 1
+  else
+  if ((VALUE)($arg0) & ~(~(VALUE)0<<RUBY_SPECIAL_SHIFT)) == RUBY_SYMBOL_FLAG
+    set $id = (($arg0) >> RUBY_SPECIAL_SHIFT)
+    if $id == '!' || $id == '+' || $id == '-' || $id == '*' || $id == '/' || $id == '%' || $id == '<' || $id == '>' || $id == '`'
+      printf "SYMBOL(:%c)\n", $id
+    else
+    if $id == idDot2
+      echo SYMBOL(:..)\n
+    else
+    if $id == idDot3
+      echo SYMBOL(:...)\n
+    else
+    if $id == idUPlus
+      echo SYMBOL(:+@)\n
+    else
+    if $id == idUMinus
+      echo SYMBOL(:-@)\n
+    else
+    if $id == idPow
+      echo SYMBOL(:**)\n
+    else
+    if $id == idCmp
+      echo SYMBOL(:<=>)\n
+    else
+    if $id == idLTLT
+      echo SYMBOL(:<<)\n
+    else
+    if $id == idLE
+      echo SYMBOL(:<=)\n
+    else
+    if $id == idGE
+      echo SYMBOL(:>=)\n
+    else
+    if $id == idEq
+      echo SYMBOL(:==)\n
+    else
+    if $id == idEqq
+      echo SYMBOL(:===)\n
+    else
+    if $id == idNeq
+      echo SYMBOL(:!=)\n
+    else
+    if $id == idEqTilde
+      echo SYMBOL(:=~)\n
+    else
+    if $id == idNeqTilde
+      echo SYMBOL(:!~)\n
+    else
+    if $id == idAREF
+      echo SYMBOL(:[])\n
+    else
+    if $id == idASET
+      echo SYMBOL(:[]=)\n
+    else
+      printf "SYMBOL(%ld)\n", $id
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+    end
+  else
+  if ($arg0) == RUBY_Qfalse
+    echo false\n
+  else
+  if ($arg0) == RUBY_Qtrue
+    echo true\n
+  else
+  if ($arg0) == RUBY_Qnil
+    echo nil\n
+  else
+  if ($arg0) == RUBY_Qundef
+    echo undef\n
+  else
+  if (VALUE)($arg0) & RUBY_IMMEDIATE_MASK
+    echo immediate\n
+  else
+  set $flags = ((struct RBasic*)($arg0))->flags
+  if ($flags & RUBY_T_MASK) == RUBY_T_NONE
+    printf "T_NONE: "
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_NIL
+    printf "T_NIL: "
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
+    printf "T_OBJECT: "
+    print (struct RObject *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
+    printf "T_CLASS%s: ", ($flags & RUBY_FL_SINGLETON) ? "*" : ""
+    print (struct RClass *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_ICLASS
+    printf "T_ICLASS: "
+    print (struct RClass *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_MODULE
+    printf "T_MODULE: "
+    print (struct RClass *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_FLOAT
+    printf "T_FLOAT: %.16g ", (((struct RFloat*)($arg0))->float_value)
+    print (struct RFloat *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_STRING
+    printf "T_STRING: "
+    set print address off
+    output (char *)(($flags & RUBY_FL_USER1) ? \
+	    ((struct RString*)($arg0))->as.heap.ptr : \
+	    ((struct RString*)($arg0))->as.ary)
+    set print address on
+    printf " bytesize:%ld ", ($flags & RUBY_FL_USER1) ? \
+            ((struct RString*)($arg0))->as.heap.len : \
+            (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+    if !($flags & RUBY_FL_USER1)
+      printf "(embed) "
+    else
+      if ($flags & RUBY_FL_USER2)
+        printf "(shared) "
+      end
+      if ($flags & RUBY_FL_USER3)
+        printf "(assoc) "
+      end
+    end
+    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
+    if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
+      printf "coderange:unknown "
+    else
+    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
+      printf "coderange:7bit "
+    else
+    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
+      printf "coderange:valid "
+    else
+      printf "coderange:broken "
+    end
+    end
+    end
+    print (struct RString *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_REGEXP
+    set $regsrc = ((struct RRegexp*)($arg0))->src
+    set $rsflags = ((struct RBasic*)$regsrc)->flags
+    printf "T_REGEXP: "
+    set print address off
+    output (char *)(($rsflags & RUBY_FL_USER1) ? \
+	    ((struct RString*)$regsrc)->as.heap.ptr : \
+	    ((struct RString*)$regsrc)->as.ary)
+    set print address on
+    printf " len:%ld ", ($rsflags & RUBY_FL_USER1) ? \
+            ((struct RString*)$regsrc)->as.heap.len : \
+            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+    if $flags & RUBY_FL_USER6
+      printf "(none) "
+    end
+    if $flags & RUBY_FL_USER5
+      printf "(literal) "
+    end
+    if $flags & RUBY_FL_USER4
+      printf "(fixed) "
+    end
+    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
+    print (struct RRegexp *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
+    if ($flags & RUBY_FL_USER1)
+      set $len = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
+      printf "T_ARRAY: len=%ld ", $len
+      printf "(embed) "
+      if ($len == 0)
+	printf "{(empty)} "
+      else
+	output/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
+	printf " "
+      end
+    else
+      set $len = ((struct RArray*)($arg0))->as.heap.len
+      printf "T_ARRAY: len=%ld ", $len
+      if ($flags & RUBY_FL_USER2)
+	printf "(shared) shared="
+	output/x ((struct RArray*)($arg0))->as.heap.aux.shared
+	printf " "
+      else
+	printf "(ownership) capa=%ld ", ((struct RArray*)($arg0))->as.heap.aux.capa
+      end
+      if ($len == 0)
+	printf "{(empty)} "
+      else
+	output/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
+	printf " "
+      end
+    end
+    print (struct RArray *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_FIXNUM
+    printf "T_FIXNUM: "
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_HASH
+    printf "T_HASH: ",
+    if ((struct RHash *)($arg0))->ntbl
+      printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
+    end
+    print (struct RHash *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
+    printf "T_STRUCT: len=%ld ", \
+      (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+       ($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) >> (RUBY_FL_USHIFT+1) : \
+       ((struct RStruct *)($arg0))->as.heap.len)
+    print (struct RStruct *)($arg0)
+    x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+          ((struct RStruct *)($arg0))->as.ary : \
+          ((struct RStruct *)($arg0))->as.heap.ptr)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
+    printf "T_BIGNUM: sign=%d len=%ld ", \
+      (($flags & RUBY_FL_USER1) != 0), \
+      (($flags & RUBY_FL_USER2) ? \
+       ($flags & (RUBY_FL_USER5|RUBY_FL_USER4|RUBY_FL_USER3)) >> (RUBY_FL_USHIFT+3) : \
+       ((struct RBignum*)($arg0))->as.heap.len)
+    if $flags & RUBY_FL_USER2
+      printf "(embed) "
+    end
+    print (struct RBignum *)($arg0)
+    x/xw (($flags & RUBY_FL_USER2) ? \
+          ((struct RBignum*)($arg0))->as.ary : \
+          ((struct RBignum*)($arg0))->as.heap.digits)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
+    printf "T_RATIONAL: "
+    print (struct RRational *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_COMPLEX
+    printf "T_COMPLEX: "
+    print (struct RComplex *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_FILE
+    printf "T_FILE: "
+    print (struct RFile *)($arg0)
+    output *((struct RFile *)($arg0))->fptr
+    printf "\n"
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_TRUE
+    printf "T_TRUE: "
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_FALSE
+    printf "T_FALSE: "
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_DATA
+    if ((struct RTypedData *)($arg0))->typed_flag == 1
+      printf "T_DATA(%s): ", ((struct RTypedData *)($arg0))->type->wrap_struct_name
+      print (struct RTypedData *)($arg0)
+    else
+      printf "T_DATA: "
+      print (struct RData *)($arg0)
+    end
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_MATCH
+    printf "T_MATCH: "
+    print (struct RMatch *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
+    printf "T_SYMBOL: "
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_UNDEF
+    printf "T_UNDEF: "
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_NODE
+    printf "T_NODE("
+    output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
+    printf "): "
+    print *(NODE *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_ZOMBIE
+    printf "T_ZOMBIE: "
+    print (struct RData *)($arg0)
+  else
+    printf "unknown: "
+    print (struct RBasic *)($arg0)
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+end
+document rp
+  Print a Ruby's VALUE.
+end
+
+define nd_type
+  print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
+end
+document nd_type
+  Print a Ruby' node type.
+end
+
+define nd_file
+  print ((NODE*)($arg0))->nd_file
+end
+document nd_file
+  Print the source file name of a node.
+end
+
+define nd_line
+  print ((unsigned int)((((NODE*)($arg0))->flags>>RUBY_NODE_LSHIFT)&RUBY_NODE_LMASK))
+end
+document nd_line
+  Print the source line number of a node.
+end
+
+# Print members of ruby node.
+
+define nd_head
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+define nd_alen
+  printf "u2.argc: "
+  p ($arg0).u2.argc
+end
+
+define nd_next
+  printf "u3.node: "
+  rp ($arg0).u3.node
+end
+
+
+define nd_cond
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+define nd_body
+  printf "u2.node: "
+  rp ($arg0).u2.node
+end
+
+define nd_else
+  printf "u3.node: "
+  rp ($arg0).u3.node
+end
+
+
+define nd_orig
+  printf "u3.value: "
+  rp ($arg0).u3.value
+end
+
+
+define nd_resq
+  printf "u2.node: "
+  rp ($arg0).u2.node
+end
+
+define nd_ensr
+  printf "u3.node: "
+  rp ($arg0).u3.node
+end
+
+
+define nd_1st
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+define nd_2nd
+  printf "u2.node: "
+  rp ($arg0).u2.node
+end
+
+
+define nd_stts
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+
+define nd_entry
+  printf "u3.entry: "
+  p ($arg0).u3.entry
+end
+
+define nd_vid
+  printf "u1.id: "
+  p ($arg0).u1.id
+end
+
+define nd_cflag
+  printf "u2.id: "
+  p ($arg0).u2.id
+end
+
+define nd_cval
+  printf "u3.value: "
+  rp ($arg0).u3.value
+end
+
+
+define nd_cnt
+  printf "u3.cnt: "
+  p ($arg0).u3.cnt
+end
+
+define nd_tbl
+  printf "u1.tbl: "
+  p ($arg0).u1.tbl
+end
+
+
+define nd_var
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+define nd_ibdy
+  printf "u2.node: "
+  rp ($arg0).u2.node
+end
+
+define nd_iter
+  printf "u3.node: "
+  rp ($arg0).u3.node
+end
+
+
+define nd_value
+  printf "u2.node: "
+  rp ($arg0).u2.node
+end
+
+define nd_aid
+  printf "u3.id: "
+  p ($arg0).u3.id
+end
+
+
+define nd_lit
+  printf "u1.value: "
+  rp ($arg0).u1.value
+end
+
+
+define nd_frml
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+define nd_rest
+  printf "u2.argc: "
+  p ($arg0).u2.argc
+end
+
+define nd_opt
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+
+define nd_recv
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+define nd_mid
+  printf "u2.id: "
+  p ($arg0).u2.id
+end
+
+define nd_args
+  printf "u3.node: "
+  rp ($arg0).u3.node
+end
+
+
+define nd_noex
+  printf "u1.id: "
+  p ($arg0).u1.id
+end
+
+define nd_defn
+  printf "u3.node: "
+  rp ($arg0).u3.node
+end
+
+
+define nd_old
+  printf "u1.id: "
+  p ($arg0).u1.id
+end
+
+define nd_new
+  printf "u2.id: "
+  p ($arg0).u2.id
+end
+
+
+define nd_cfnc
+  printf "u1.cfunc: "
+  p ($arg0).u1.cfunc
+end
+
+define nd_argc
+  printf "u2.argc: "
+  p ($arg0).u2.argc
+end
+
+
+define nd_cname
+  printf "u1.id: "
+  p ($arg0).u1.id
+end
+
+define nd_super
+  printf "u3.node: "
+  rp ($arg0).u3.node
+end
+
+
+define nd_modl
+  printf "u1.id: "
+  p ($arg0).u1.id
+end
+
+define nd_clss
+  printf "u1.value: "
+  rp ($arg0).u1.value
+end
+
+
+define nd_beg
+  printf "u1.node: "
+  rp ($arg0).u1.node
+end
+
+define nd_end
+  printf "u2.node: "
+  rp ($arg0).u2.node
+end
+
+define nd_state
+  printf "u3.state: "
+  p ($arg0).u3.state
+end
+
+define nd_rval
+  printf "u2.value: "
+  rp ($arg0).u2.value
+end
+
+
+define nd_nth
+  printf "u2.argc: "
+  p ($arg0).u2.argc
+end
+
+
+define nd_tag
+  printf "u1.id: "
+  p ($arg0).u1.id
+end
+
+define nd_tval
+  printf "u2.value: "
+  rp ($arg0).u2.value
+end
+
+define rb_p
+  call rb_p($arg0)
+end
+
+define rb_numtable_entry
+  set $rb_numtable_tbl = $arg0
+  set $rb_numtable_id = (st_data_t)$arg1
+  set $rb_numtable_key = 0
+  set $rb_numtable_rec = 0
+  if $rb_numtable_tbl->entries_packed
+    set $rb_numtable_p = $rb_numtable_tbl->bins
+    while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->bins+$rb_numtable_tbl->num_entries
+      if (st_data_t)$rb_numtable_p[0] == $rb_numtable_id
+	set $rb_numtable_key = (st_data_t)$rb_numtable_p[0]
+	set $rb_numtable_rec = (st_data_t)$rb_numtable_p[1]
+	set $rb_numtable_p = 0
+      else
+	set $rb_numtable_p = $rb_numtable_p + 2
+      end
+    end
+  else
+    set $rb_numtable_p = $rb_numtable_tbl->bins[$rb_numtable_id % $rb_numtable_tbl->num_bins]
+    while $rb_numtable_p
+      if $rb_numtable_p->key == $rb_numtable_id
+	set $rb_numtable_key = $rb_numtable_p->key
+	set $rb_numtable_rec = $rb_numtable_p->record
+	set $rb_numtable_p = 0
+      else
+	set $rb_numtable_p = $rb_numtable_p->next
+      end
+    end
+  end
+end
+
+define rb_id2name
+  rb_numtable_entry global_symbols.id_str (ID)$arg0
+  if $rb_numtable_rec
+    rp $rb_numtable_rec
+  else
+    echo undef\n
+  end
+end
+document rb_id2name
+  Print the name of id
+end
+
+define rb_method_entry
+  set $rb_method_entry_klass = (struct RClass *)$arg0
+  set $rb_method_entry_id = (ID)$arg1
+  set $rb_method_entry_me = (rb_method_entry_t *)0
+  while !$rb_method_entry_me && $rb_method_entry_klass
+    rb_numtable_entry $rb_method_entry_klass->m_tbl $rb_method_entry_id
+    set $rb_method_entry_me = (rb_method_entry_t *)$rb_numtable_rec
+    if !$rb_method_entry_me
+      set $rb_method_entry_klass = (struct RClass *)$rb_method_entry_klass->ptr->super
+    end
+  end
+  if $rb_method_entry_me
+    print *$rb_method_entry_klass
+    print *$rb_method_entry_me
+  else
+    echo method not found\n
+  end
+end
+document rb_method_entry
+  Search method entry by class and id
+end
+
+define rb_classname
+  call classname($arg0)
+  rb_p $
+  print *(struct RClass*)($arg0)
+end
+
+define rb_backtrace
+  call rb_backtrace()
+end
+
+define iseq
+  if dummy_gdb_enums.special_consts
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_NONE
+    echo [none]\n
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_LABEL
+    print *(LABEL*)($arg0)
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_INSN
+    print *(INSN*)($arg0)
+    if ((INSN*)($arg0))->insn_id != YARVINSN_jump
+      set $i = 0
+      set $operand_size = ((INSN*)($arg0))->operand_size
+      set $operands = ((INSN*)($arg0))->operands
+      while $i < $operand_size
+	rp $operands[$i++]
+      end
+    end
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_ADJUST
+    print *(ADJUST*)($arg0)
+  end
+end
+
+define rb_ps
+  rb_ps_vm ruby_current_vm
+end
+document rb_ps
+Dump all threads and their callstacks
+end
+
+define rb_ps_vm
+  print $ps_vm = (rb_vm_t*)$arg0
+  set $ps_threads = (st_table*)$ps_vm->living_threads
+  if $ps_threads->entries_packed
+    set $ps_threads_i = 0
+    while $ps_threads_i < $ps_threads->num_entries
+      set $ps_threads_key = (st_data_t)$ps_threads->bins[$ps_threads_i * 2]
+      set $ps_threads_val = (st_data_t)$ps_threads->bins[$ps_threads_i * 2 + 1]
+      rb_ps_thread $ps_threads_key $ps_threads_val
+      set $ps_threads_i = $ps_threads_i + 1
+    end
+  else
+    set $ps_threads_ptr = (st_table_entry*)$ps_threads->head
+    while $ps_threads_ptr
+      set $ps_threads_key = (st_data_t)$ps_threads_ptr->key
+      set $ps_threads_val = (st_data_t)$ps_threads_ptr->record
+      rb_ps_thread $ps_threads_key $ps_threads_val
+      set $ps_threads_ptr = (st_table_entry*)$ps_threads_ptr->fore
+    end
+  end
+end
+document rb_ps_vm
+Dump all threads in a (rb_vm_t*) and their callstacks
+end
+
+define rb_ps_thread
+  set $ps_thread = (struct RTypedData*)$arg0
+  set $ps_thread_id = $arg1
+  print $ps_thread_th = (rb_thread_t*)$ps_thread->data
+end
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..3212d4a1f4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,426 @@
+# /
+*.bak
+*.dylib
+*.inc
+*.o
+*.orig
+*.rej
+*.sav
+*.swp
+*~
+.*-*
+.*.list
+.*.time
+.DS_Store
+.ccmalloc
+.ext
+.pc
+.ppack
+.svn
+/.git
+/*_prelude.c
+/COPYING.LIB
+/ChangeLog-1.8.0
+/ChangeLog.pre-alpha
+/ChangeLog.pre1_1
+/Doxyfile
+/GNUmakefile
+/Makefile
+/README.atheos
+/README.fat-patch
+/README.v6
+/TAGS
+/archive
+/autom4te*.cache
+/automake
+/beos
+/breakpoints.gdb
+/config.cache
+/config.h
+/config.h.in
+/config.log
+/config.status
+/config.status.lineno
+/configure
+/enc.mk
+/enc/trans/*.c
+/encdb.h
+/ext/win32ole/.document
+/goruby
+/id.h
+/largefile.h
+/lex.c
+/libruby*.*
+/miniprelude.c
+/miniruby
+/newdate.rb
+/newline.c
+/newver.rb
+/parse.c
+/parse.h
+/patches
+/patches-master
+/pitest.rb
+/ppack
+/prelude.c
+/preview
+/rbconfig.rb
+/rename2.h
+/repack
+/revision.h
+/riscos
+/rubicon
+/ruby
+/ruby-man.rd.gz
+/test.rb
+/tmp
+/transdb.h
+/uncommon.mk
+/web
+/y.output
+/y.tab.c
+/yasmdata.rb
+
+# /benchmark/
+/benchmark/bmx_*.rb
+
+# /enc/trans/
+/enc/trans/*.c
+
+# /ext/
+/ext/extinit.c
+/ext/*.log
+
+# /ext/bigdecimal/
+/ext/bigdecimal/*.def
+/ext/bigdecimal/Makefile
+/ext/bigdecimal/bigdecimal.a
+/ext/bigdecimal/extconf.h
+/ext/bigdecimal/mkmf.log
+/ext/bigdecimal/conftest.dSYM
+
+# /ext/continuation/
+/ext/continuation/extconf.h
+/ext/continuation/Makefile
+
+# /ext/coverage/
+/ext/coverage/extconf.h
+/ext/coverage/Makefile
+
+# /ext/curses/
+/ext/curses/*.def
+/ext/curses/Makefile
+/ext/curses/curses.a
+/ext/curses/extconf.h
+/ext/curses/mkmf.log
+/ext/curses/conftest.dSYM
+
+# /ext/dbm/
+/ext/dbm/Makefile
+/ext/dbm/mkmf.log
+/ext/dbm/*.def
+/ext/dbm/extconf.h
+/ext/dbm/conftest.dSYM
+
+# /ext/digest/
+/ext/digest/*.def
+/ext/digest/Makefile
+/ext/digest/digest.a
+/ext/digest/extconf.h
+/ext/digest/mkmf.log
+
+# /ext/digest/bubblebabble/
+/ext/digest/bubblebabble/Makefile
+/ext/digest/bubblebabble/mkmf.log
+/ext/digest/bubblebabble/*.def
+/ext/digest/bubblebabble/extconf.h
+
+# /ext/digest/md5/
+/ext/digest/md5/*.def
+/ext/digest/md5/Makefile
+/ext/digest/md5/extconf.h
+/ext/digest/md5/md5.a
+/ext/digest/md5/mkmf.log
+/ext/digest/md5/conftest.dSYM
+
+# /ext/digest/rmd160/
+/ext/digest/rmd160/*.def
+/ext/digest/rmd160/Makefile
+/ext/digest/rmd160/extconf.h
+/ext/digest/rmd160/mkmf.log
+/ext/digest/rmd160/rmd160.a
+/ext/digest/rmd160/conftest.dSYM
+
+# /ext/digest/sha1/
+/ext/digest/sha1/*.def
+/ext/digest/sha1/Makefile
+/ext/digest/sha1/extconf.h
+/ext/digest/sha1/mkmf.log
+/ext/digest/sha1/sha1.a
+/ext/digest/sha1/conftest.dSYM
+
+# /ext/digest/sha2/
+/ext/digest/sha2/*.def
+/ext/digest/sha2/Makefile
+/ext/digest/sha2/extconf.h
+/ext/digest/sha2/mkmf.log
+/ext/digest/sha2/sha2.a
+
+# /ext/dl/
+/ext/dl/*.def
+/ext/dl/*.func
+/ext/dl/*.o
+/ext/dl/*~
+/ext/dl/Makefile
+/ext/dl/dl.a
+/ext/dl/extconf.h
+/ext/dl/mkmf.log
+/ext/dl/conftest.dSYM
+
+# /ext/dl/callback/
+/ext/dl/callback/*.def
+/ext/dl/callback/*.func
+/ext/dl/callback/*.o
+/ext/dl/callback/*~
+/ext/dl/callback/Makefile
+/ext/dl/callback/callback-*.c
+/ext/dl/callback/callback.a
+/ext/dl/callback/callback.c
+/ext/dl/callback/extconf.h
+/ext/dl/callback/mkmf.log
+/ext/dl/callback/conftest.dSYM
+
+# /ext/dl/win32/
+/ext/dl/win32/Makefile
+
+# /ext/etc/
+/ext/etc/*.def
+/ext/etc/Makefile
+/ext/etc/etc.a
+/ext/etc/extconf.h
+/ext/etc/mkmf.log
+/ext/etc/conftest.dSYM
+
+# /ext/fcntl/
+/ext/fcntl/*.def
+/ext/fcntl/Makefile
+/ext/fcntl/extconf.h
+/ext/fcntl/fcntl.a
+/ext/fcntl/mkmf.log
+
+# /ext/fiber/
+/ext/fiber/extconf.h
+/ext/fiber/Makefile
+
+# /ext/fiddle/
+/ext/fiddle/Makefile
+/ext/fiddle/extconf.h
+/ext/fiddle/mkmf.log
+/ext/fiddle/fiddle.a
+
+# /ext/gdbm/
+/ext/gdbm/Makefile
+/ext/gdbm/mkmf.log
+/ext/gdbm/*.def
+/ext/gdbm/extconf.h
+/ext/gdbm/conftest.dSYM
+
+# /ext/iconv/
+/ext/iconv/*.def
+/ext/iconv/Makefile
+/ext/iconv/config.charset
+/ext/iconv/extconf.h
+/ext/iconv/iconv.a
+/ext/iconv/iconv.rb
+/ext/iconv/mkmf.log
+/ext/iconv/conftest.dSYM
+
+# /ext/io/nonblock/
+/ext/io/nonblock/Makefile
+/ext/io/nonblock/extconf.h
+/ext/io/nonblock/mkmf.log
+/ext/io/nonblock/nonblock.a
+
+# /ext/io/wait/
+/ext/io/wait/Makefile
+/ext/io/wait/extconf.h
+/ext/io/wait/mkmf.log
+/ext/io/wait/wait.a
+
+# /ext/json/
+/ext/json/Makefile
+/ext/json/extconf.h
+
+# /ext/json/ext/generator/
+/ext/json/ext/generator/*.def
+/ext/json/ext/generator/Makefile
+/ext/json/ext/generator/extconf.h
+/ext/json/ext/generator/mkmf.log
+/ext/json/ext/generator/generator.a
+
+# /ext/json/ext/parser/
+/ext/json/ext/parser/*.def
+/ext/json/ext/parser/Makefile
+/ext/json/ext/parser/extconf.h
+/ext/json/ext/parser/mkmf.log
+/ext/json/ext/parser/parser.a
+
+# /ext/mathn/complex/
+/ext/mathn/complex/Makefile
+/ext/mathn/complex/extconf.h
+
+# /ext/mathn/rational/
+/ext/mathn/rational/Makefile
+/ext/mathn/rational/extconf.h
+
+# /ext/nkf/
+/ext/nkf/*.def
+/ext/nkf/Makefile
+/ext/nkf/extconf.h
+/ext/nkf/mkmf.log
+/ext/nkf/nkf.a
+
+# /ext/objspace/
+/ext/objspace/Makefile
+/ext/objspace/extconf.h
+
+# /ext/openssl/
+/ext/openssl/GNUmakefile
+/ext/openssl/Makefile
+/ext/openssl/dep
+/ext/openssl/extconf.h
+/ext/openssl/mkmf.log
+/ext/openssl/openssl.a
+/ext/openssl/conftest.dSYM
+
+# /ext/psych/
+/ext/psych/Makefile
+/ext/psych/extconf.h
+/ext/psych/mkmf.log
+/ext/psych/psych.a
+
+# /ext/pty/
+/ext/pty/*.def
+/ext/pty/Makefile
+/ext/pty/extconf.h
+/ext/pty/mkmf.log
+/ext/pty/pty.a
+/ext/pty/conftest.dSYM
+
+# /ext/racc/cparse/
+/ext/racc/cparse/*.def
+/ext/racc/cparse/Makefile
+/ext/racc/cparse/cparse.a
+/ext/racc/cparse/extconf.h
+/ext/racc/cparse/mkmf.log
+/ext/racc/cparse/conftest.dSYM
+
+# /ext/readline/
+/ext/readline/*.def
+/ext/readline/Makefile
+/ext/readline/extconf.h
+/ext/readline/mkmf.log
+/ext/readline/readline.a
+/ext/readline/conftest.dSYM
+
+# /ext/ripper/
+/ext/ripper/Makefile
+/ext/ripper/mkmf.log
+/ext/ripper/eventids1.c
+/ext/ripper/eventids2table.c
+/ext/ripper/ripper.*
+/ext/ripper/ids1
+/ext/ripper/ids2
+/ext/ripper/extconf.h
+/ext/ripper/y.output
+
+# /ext/sdbm/
+/ext/sdbm/*.def
+/ext/sdbm/Makefile
+/ext/sdbm/extconf.h
+/ext/sdbm/mkmf.log
+/ext/sdbm/sdbm.a
+
+# /ext/socket/
+/ext/socket/*.def
+/ext/socket/Makefile
+/ext/socket/constants.h
+/ext/socket/constdefs.h
+/ext/socket/constdefs.c
+/ext/socket/extconf.h
+/ext/socket/mkmf.log
+/ext/socket/socket.a
+/ext/socket/conftest.dSYM
+
+# /ext/stringio/
+/ext/stringio/*.def
+/ext/stringio/Makefile
+/ext/stringio/extconf.h
+/ext/stringio/mkmf.log
+/ext/stringio/stringio.a
+
+# /ext/strscan/
+/ext/strscan/*.def
+/ext/strscan/Makefile
+/ext/strscan/extconf.h
+/ext/strscan/mkmf.log
+/ext/strscan/strscan.a
+
+# /ext/syck/
+/ext/syck/*.def
+/ext/syck/Makefile
+/ext/syck/extconf.h
+/ext/syck/mkmf.log
+/ext/syck/syck.a
+
+# /ext/syslog/
+/ext/syslog/*.def
+/ext/syslog/Makefile
+/ext/syslog/extconf.h
+/ext/syslog/mkmf.log
+/ext/syslog/syslog.a
+/ext/syslog/conftest.dSYM
+
+# /ext/tmpdir/
+/ext/tmpdir/Makefile
+/ext/tmpdir/extconf.h
+/ext/tmpdir/mkmf.log
+/ext/tmpdir/tmpdir.a
+
+# /ext/tk/
+/ext/tk/Makefile
+/ext/tk/*.log
+/ext/tk/*.def
+/ext/tk/conftest.dSYM
+/ext/tk/extconf.h
+/ext/tk/config_list
+
+# /ext/tk/tkutil/
+/ext/tk/tkutil/Makefile
+/ext/tk/tkutil/*.log
+/ext/tk/tkutil/*.def
+/ext/tk/tkutil/conftest.dSYM
+/ext/tk/tkutil/extconf.h
+
+# /ext/win32ole/
+/ext/win32ole/Makefile
+/ext/win32ole/mkmf.log
+/ext/win32ole/*.log
+/ext/win32ole/.document
+
+# /ext/zlib/
+/ext/zlib/*.def
+/ext/zlib/Makefile
+/ext/zlib/extconf.h
+/ext/zlib/mkmf.log
+/ext/zlib/zlib.a
+/ext/zlib/conftest.dSYM
+
+# /lib/rexml/
+
+# /spec/
+/spec/mspec
+/spec/rubyspec
+
+# /win32/
+/win32/*.ico
diff --git a/.indent.pro b/.indent.pro
new file mode 100644
index 0000000000..6a207a0554
--- /dev/null
+++ b/.indent.pro
@@ -0,0 +1,21 @@
+-bap
+-nbbb
+-nbc
+-br
+-nbs
+-ncdb
+-ce
+-cli0.5
+-ndj
+-ei
+-nfc1
+-i4
+-l120
+-lp
+-npcs
+-psl
+-sc
+-sob
+
+-TID
+-TVALUE
diff --git a/COPYING.ja b/COPYING.ja
index 933cc7cb9a..aa2a163848 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -1,6 +1,6 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
-Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
-$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL (the GNU General
+Public License)$B%P!<%8%g%s(B2$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`(B
+$B$r:FG[I[$G$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
 
   1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
 
diff --git a/ChangeLog b/ChangeLog
index d98e7b1f30..04ef3ebb63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,76 +1,38863 @@
-Sun Jun 15 22:34:09 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+Fri Jul 22 21:18:20 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	Merged 16241 from trunk.
+	* lib/uri/generic.rb (WFKV_): unroll the loop of regexp.
 
-	* lib/net/telnet.rb:  Fixing a bug where line endings would not be properly
+	* lib/uri/generic.rb (URI.decode_www_form_component): ditto.
+
+Fri Nov 22 12:43:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod): ignore too long fraction part, which does not
+	  affect the result.
+
+Mon Apr 15 14:57:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/parser/parser.rl (json_string_unescape): workaround fix
+	  for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
+	  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862
+
+Mon Apr 15 10:56:55 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
+	  reserving a memory space with ALLOCA_N for restoring machine stack
+	  stored in cont->machine_stack, but clang optimized out it (and
+	  maybe #5851 is also caused by this).
+	  This affected TestContinuation#test_check_localvars.
+
+	* cont.c (cont_restore_1): revert workaround introduced in r32201.
+
+Tue May 22 11:09:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): use real path for non-shared
+	  build.
+
+	* configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
+
+	* tool/rbinstall.rb (bin-comm): prepend prolog shell script if
+	  necessary.
+
+	* ruby.c (ruby_init_loadpath_safe): relatively called non-shared
+	  binary cannot be found in PATH, so use given pathname.
+
+Mon May 21 16:27:24 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
+	  module before calling rb_class2name().
+
+Fri May 18 18:13:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#configuration): keep space at end of
+	  OUTFLAG and COUTFLAG.  [ruby-dev:45650]
+
+Fri May 11 14:09:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC,
+	  must not cast it to unsigned long, which may be shorter than
+	  VALUE, and the result can be mere garbage.
+
+Fri Apr 20 12:40:19 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem:  Removed to avoid
+	  conflict with ca-bundle.pem
+	* lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
+	  ditto.
+	* lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
+	  ditto.
+
+Fri Apr 20 09:04:35 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Apply the following security fixes to RubyGems 1.3.7:
+
+	  RubyGems now disallows redirection from HTTPS to HTTP.
+
+	  RubyGems now verifies SSL connections.
+
+	  Patch by Hiroshi Nakamura.
+
+	* test/rubygems:  ditto.
+
+Thu Jun  3 05:37:46 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* tool/rbinstall.rb (install-bin): Allow bin/* install from dot-dirs.
+	  Fixes rvm and multiruby installations.
+
+Thu Oct 27 09:57:56 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
+	  patched by The Written Word Inc. [ruby-core:40422] [Bug #5489]
+
+Tue Feb 14 00:00:19 2012  okkez  <okkez000@gmail.com>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): fix memory
+	  leak. [ruby-dev:44904] [Bug #5688]
+
+Fri Feb  9 02:11:19 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* backport r34482 from trunk
+
+	* ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL
+	  option to prevent BEAST attack. See [Bug #5353].
+
+	  In OpenSSL, OP_DONT_INSERT_EMPTY_FRAGMENTS is used to prevent
+	  TLS-CBC-IV vulunerability described at
+	  http://www.openssl.org/~bodo/tls-cbc.txt
+	  It's known issue of TLSv1/SSLv3 but it attracts lots of attention
+	  these days as BEAST attack. (CVE-2011-3389)
+
+	  Until now ossl sets OP_ALL at SSLContext allocation and call
+	  SSL_CTX_set_options at connection.  SSL_CTX_set_options updates the
+	  value by using |= so bits set by OP_ALL cannot be unset afterwards.
+	  This commit changes to call SSL_CTX_set_options only 1 time for each
+	  SSLContext. It sets the specified value if SSLContext#options= are
+	  called and sets OP_ALL if not.
+
+	  To help users to unset bits in OP_ALL, this commit also adds several
+	  constant to SSL such as
+	  OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS.  These constants were
+	  not exposed in Ruby because there's no way to unset bits in OP_ALL
+	  before.
+
+	  Following is an example to enable 0/n split for BEAST prevention.
+
+	    ctx.options = OP_ALL & ~OP_DONT_INSERT_EMPTY_FRAGMENTS
+
+	* test/openssl/test_ssl.rb: Test above option exists.
+
+Fri Jul  1 11:41:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_trans): free heap ptr when the str is not embeded.
+	  patched by Eric Wong. [Bug #4956] [ruby-core:37708]
+
+Fri Jul  1 08:21:28 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_getivar): check vm state version
+	  to invalidate inline chache (ivar index).
+	  fixes Bug #4926.
+
+	* vm_insnhelper.c (vm_setivar): ditto.
+
+Wed Feb  1 09:50:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/re.rdoc (Repetition): fix typo.  reported by Ori Avtalion
+	  and patched by Zachary Scott.  [Bug #5947]
+
+Tue Jan 24 11:38:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.encode_www_form_component): initialize on
+	  requiring to support JRuby, which runs parallel multithreads.
+	  [ruby-core:42222] [Bug #5925]
+
+	* lib/uri/common.rb (URI.decode_www_form_component): initialize on
+
+Mon Jan 16 16:41:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (Regexp): fix incorrect options when casting to
+	  a Regexp, and suppress encoding option warnings.
+	  https://github.com/ruby/ruby/pull/82
+
+Wed Dec 28 11:22:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
+	  instead of typoed regexp.  [ruby-core:41829] [Bug #5817]
+
+Fri Jul  1 06:41:36 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_threadptr_check_signal): only wake up main thread.
+
+	* thread.c (rb_threadptr_execute_interrupts_common): check signal
+	  deliverly if it is main thread.
+	  fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
+
+	* bootstraptest/test_fork.rb: add a test for above.
+
+	* signal.c (rb_get_next_signal): skip if signal_buff is empty.
+	 (check signal_buff.size first)
+
+	* vm_core.h: remove unused variable rb_thread_t::exec_signal.
+
+	* thread.c (rb_thread_check_trap_pending): check
+	  rb_signal_buff_size() because rb_thread_t::exec_signal
+	  is no longer available.
+
+Fri Jul  1 03:28:25 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (Init_class_hierarchy): should name BasicObject
+	  explicitly.
+
+	* variable.c (rb_const_defined_0): should not check for
+	  superclasses as const_get.
+
+Thu Jun 30 22:17:04 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
+	  for methods defined by define_method(). fixes Bug #4613.
+
+	* thread.c (call_trace_proc): Fix to skip if class is not given (0).
+	  Note that ID and Class object are passed for call/return event
+	  if the called method was defined by define_method().
+	  If you are author of tracer/profiler/debugger, this may be an
+	  important change.  You should check passed class as zero or
+	  non-zero instead of checking the event type.
+
+	* test/ruby/test_settracefunc.rb: add a test for above.
+
+Thu Jun 30 21:18:35 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* configure.in: Add warnflags for XL/C on AIX during configure
+	  to avoid [Bug #3971]. See [ruby-core:32859]
+
+Thu Jun 30 20:12:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].
+
+Thu Jun 30 12:25:34 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): allocate
+	  machine stack for the timer thread at least 12KB.  FreeBSD 8.2
+	  AMD64 causes machine stack overflow (SIGSEGV) only with
+	  PTHREAD_STACK_MIN (maybe defined as 2KB).
+
+Thu Jun 30 01:31:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_s_pass): change RDoc description and remove
+	  a sample code. The actual implementaion never behave as explained by
+	  an example. It's a documentation bug.
+
+Thu Jun 30 00:54:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_stop): change RDoc sample code. The old
+	  example is buggy and may cause deadlock. The patch is
+	  suggested by Heesob Park <phasis@gmail.com>. Thank you!
+	  [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:49:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_wakeup): change RDoc sample code. The old
+	  example is buggy and may not display anything by a race.
+	  The patch is suggested by Heesob Parrk <phasis@gmail.com>.
+	  Thank you! [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:43:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_run): change RDoc. The old example is buggy
+	  and may cause deadlock. The patch is suggested by Heesob Park
+	  <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:03:20 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/completion.rb: complate correctry string literal. fix
+	  [Bug #1145].
+
+Wed Jun 29 23:17:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
+
+Wed Jun 29 13:55:36 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_get_0): should not look for superclasses if
+	  the second optional argument is given for #const_get().
+	  fix [Bug #3422] [Bug #3423]
+
+Tue Jun 28 21:44:58 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
+
+Tue Jun 28 20:39:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!).
+	  global_variables, local_variables, and instance_variables returns
+	  Symbols from 1.9 and need to stringify before evaling it.
+	  See #4931.
+
+Tue Jun 28 07:50:32 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (Init_Object):  Teach RDoc what Init_class_hierarchy does to
+	  hook up ri for BasicObject, Object, Module and Class.
+
+Tue Jun 28 01:19:52 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: fix [Bug #4232].
+
+Tue Jun 28 00:14:13 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.
+
+	* test/drb/test_drb.rb: ditto.
+
+	* test/drb/drbtest.rb: ditto.
+
+	* test/drb/ut_eq.rb: ditto.
+
+Tue Jun 28 00:08:43 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/workspace.rb: fix BUG#4793.
+
+Mon Jun 27 01:34:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
+	  start with + sign, which means NIS.  these are returned in the
+	  case that passwd and group entries in /etc/nsswitch.conf are set
+	  to use "nis" explicitly on Debian.  fixed #3683
+
+Mon Jun 27 00:44:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (rb_parser_end_seen_p): fix documentation about return
+	  value. patched by Sho Hashimoto. [Bug #4511]
+
+Wed Jun  1 06:43:13 2011  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* load.c (loaded_feature_path): cut nonsence loop execution to fix
+	  performance bug.
+
+Sat Jun 25 23:45:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_insnhelper.c (vm_search_superclass): avoid control frame
+	  stack overrun. currently super() in Proc created in a method
+	  defined by Module#define_method raise NoMethodError. [Bug #4881]
+	* test/ruby/test_method.rb t_super_in_proc_from_define_method):
+	  add test for it.
+
+Thu Jun 23 19:30:53 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check
+	  argument type with NUM2LONG if the arg is not a Time object.
+	  See #4919.
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_timeout): Check
+	  type with NUM2LONG. Time as an arg is not allowed. See #4919.
+
+	* test/openssl/test_ssl_session.rb (test_session_time,
+	  test_session_timeout): Test it.
+
+Fri Jun 24 19:57:30 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/webrick/httprequest.rb (setup_forwarded_info): Parsing request
+	  header failed when the request is from 2 or more Apache reverse
+	  proxies. It's said that all X-Forwarded-* headers will contain more
+	  than one (comma-separated) value if the original request already
+	  contained one of these headers.  Since we could use these values as
+	  Host header, we choose the initial(first) value. See #4922.
+
+	* test/webrick/test_httprequest.rb (test_forwarded): Test it.
+
+Sat Jul  9 19:25:02 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/tk/extconf.rb: I gave up to fix the build issue of ext/tk with Windows
+	  installer (mingw32).  Ported whole ext/tk/extconf.rb from trunk.
+
+Mon Jul  4 00:28:05 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/tk/extconf.rb (find_tcl): fixed a TypeError on --with-opt-dir.
+	  reported by luislavena and ksmakoto.
+
+Sun Jul  3 22:40:37 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/zlib/zlib.c: added a prototype to get rid of SEGV on x86_64
+	  darwin.
+	  Reported by kosaki and nagachika. Patch by nagachika.
+
+Sun Jul  3 21:02:05 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/socket/extconf.rb (have_type("PADDRINFO")): new check.
+
+	* ext/socket/addrinfo.h: fixed a compilation problem with VC++ 2010.
+
+Wed Jun 29 23:09:14 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
+
+Sun Jun 12 16:19:48 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]
+
+Thu Jun  2 00:45:26 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: fix for uninitialized global variables.
+	  [Ruby 1.9 - Bug #4811]
+
+Tue Jun  7 13:36:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
+	  command line escape issues on Windows.  fixed #4835.
+
+Mon Jun 13 23:38:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_parse_string): flush delayed token.  based on a
+	  patch by Masaya Tarui in [ruby-dev:43762].  Bug #4544
+
+	* parse.y (yylex): revert r24557.  delayed token at the end of
+	  string should be flushed already by the above change.
+
+Mon Jun 13 23:38:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_parse_string): flush delayed token.  based on a
+	  patch by Masaya Tarui in [ruby-dev:43762].  Bug #4544
+
+	* parse.y (yylex): revert r24557.  delayed token at the end of
+	  string should be flushed already by the above change.
+
+Mon Jun 13 23:05:01 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
+	  (unix_recv_io): ditto.
+	  fixed by Eric Wong.  [ruby-core:35574]
+
+	* test/socket/test_unix.rb: test added for above problem.
+
+Thu May 12 12:24:22 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+
+        * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
+        However, the problem is not revised in this.
+        This adds the control of using function of SSLv2 in made macro by function check.
+
+Mon Jun 13 18:33:04 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
+	  to prevent random number sequence repeatation at forked child
+	  process which has same pid.
+	  reported by Eric Wong.  [ruby-core:35765]
+
+Sat Jun 11 18:02:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_getc): should be 7bit if ascii.  fixes #4557
+
+Sat Jun 11 16:28:25 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/formatters/pretty.rb
+	  (REXML::Formatters::Pretty#write_text),
+	  test/rexml/test_core.rb
+	  (Tester#test_pretty_format_long_text_finite): don't ignore
+	  'width' parameter in pretty formatter. fixes #4498
+	  Reported by Michael Frasca. Thanks!!!
+
+Sat Jun 11 16:04:03 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/xpathparser.rb
+	  (REXML::Parsers::XPathParser#parse),
+	  test/rexml/test_elements.rb
+	  (ElementsTester#test_each_with_frozen_condition):
+	  don't modify original XPath. fixes #4164
+	  Reported by Pavel Shved. Thanks!!!
+
+Sat Jun 11 16:04:03 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/xpathparser.rb
+	  (REXML::Parsers::XPathParser#parse),
+	  test/rexml/test_elements.rb
+	  (ElementsTester::test_each_with_frozen_condition):
+	  don't modify original XPath. fixes #4164
+	  Reported by Pavel Shved. Thanks!!!
+
+Mon Jun  6 09:39:43 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): release event objects to plug memory
+	leak.  Thanks Mark J. Titorenko!
+
+Tue Dec 21 00:46:20 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_cleanup_func): Don't touch native threading
+	  resource at fork. Sadly this is purely bandaid. We need to
+	  implement proper fix later. [Bug #4169] [ruby-core:33767]
+
+Tue May 24 07:06:34 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/extconf.rb: search directories for 64bit library (e.g.
+	  /usr/lib64) and bug fix.
+
+Mon Jun  6 07:08:54 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/drb/ut_array.rb: uses 'druby://localhost:0' instead of nil
+	  as well as test/drb/ut_drb.rb.  This fixes the same problem as
+	  [ruby-dev:23078].
+
+	* test/drb/ut_array_drbssl.rb: ditto.
+
+Fri May 27 08:35:04 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
+
+Tue May 24 07:06:34 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fail to start Tk.mainloop (exit immediately) on
+	  some environment (reported on [ruby-talk:381444]).
+
+Sat Jan 22 11:49:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
+	  when multiple merge keys are specified.
+
+	* test/psych/test_merge_keys.rb: tests for multi-merge key support
+	
+Sat Jan 22 11:33:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
+	  part of YAML 1.1, so they should be supported.  Remove warning and
+	  merge keys to parent.  [ruby-core:34679]
+
+	* test/psych/test_merge_keys.rb: test for merge keys
+
+Thu Jul 15 00:35:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (localtime_with_gmtoff_zone): renamed from
+	  localtime_with_gmtoff and return the timezone abbreviation name.
+	  (guess_local_offset): return the isdst and timezone abbreviation name.
+	  (localtimew): use the returned isdst and timezone abbreviation name.
+	  [ruby-core:31275]
+
+Mon Nov 22 14:22:45 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (time_zone): use rb_locale_str_new_cstr to set encoding
+	  as locale and convert its content to internal encoding.
+	  [ruby-core:33278]
+
+Fri Jan 14 14:01:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_unpack): the resulted string of unpack('M') must have
+	  ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]
+
+Sat Dec 25 20:01:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize
+	  GVL at new process creation.
+
+Sat Feb  5 10:09:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_get_expanded_load_path): always expand load paths.
+
+Tue Jul  6 22:57:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly
+	  to avoid select() on a socket which TCP state is CLOSED.
+	  patch by Eric Wong.  [ruby-core:31053]
+
+Mon May 30 15:44:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_mult): as r31805, volatile it.
+	  Without this, clang -O fails calculation.
+
+	* numeric.c (fix_mul): ditto.
+
+	* rational.c (f_imul): ditto.
+
+Mon May 30 10:26:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (int_pow): make sure to assign the result of x * z.
+	  If xz is optimized out, the value won't overflow.
+
+Sun May 29 15:09:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): fix for negative value.
+
+Sat May 28 03:04:27 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.
+
+Fri May 27 22:38:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fill_cbuf): finish reading at EOF.
+
+Fri May 27 11:31:51 2011  misfo <tedwardo2@gmail.com>
+
+	* lib/rexml/text.rb (REXML::Text#initialize): prevent an error
+	  when passing a frozen string to REXML::Text.new
+
+	  dup the string passed in instead of cloning so that it's frozen
+	  state is ignored
+
+Sun May 22 07:10:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_dsa.rb: Add tests for sign/verify.
+
+Thu May 19 07:47:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_rsa.rb: Add tests for sign/verify.
+
+Wed May 18 20:25:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/timeout.rb (Timeout#timeout): don't leak "execution expired"
+	  exception. [Bug #4283] [ruby-core:34534].
+
+Wed May 18 03:14:49 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_singleton.rb:  Add tests from lib/singleton.rb.  Patch by
+	  Pete Higgins.  [Ruby 1.9 - Bug #4715]
+
+Tue May 17 20:20:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (rb_thread_struct): add volatile to
+	  transition_for_lock because it is not protected by lock.
+
+Sun May 15 21:22:35 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (cont_init): clear macihne_stack_start/end of saved thread to
+	  prevent mark machine stack of GC'ed Thread. root Fiber is not initialized by
+	  fiber_init(). based on a patch by Serge Balyuk [ruby-core:35891] fixes #4612
+	* test/ruby/test_fiber.rb (test_gc_root_fiber): add test for it.
+
+Wed May 11 19:45:27 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/forwardable.rb: support 'delegate :foo => :bar' for to meet
+	  by specification of RDOC.
+
+Sun May  8 19:39:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_cond_timedwait): add to care EINTR.
+	* thread_pthread.c (thread_timer): remove EINTR check.
+
+Fri May  6 15:01:11 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by
+	  silently ignoring lesser significant digits.  Required buffer
+	  length can be computable so you might at first think of
+	  allocating enough memory space on the fly using alloca().  That
+	  is a wrong idea because when using alloca there is always risk
+	  of integer overflow.  A function that accepts outer-process
+	  resources like this should not blindly trust its inputs.  In
+	  this particular case we just want to generate miliseconds
+	  resolution by strtod() so the string in question needs no more
+	  length than what we originally have.  Ignoring lesser
+	  significant digits should suffice I believe.
+
+Fri May  6 14:25:53 2011  Tinco Andringa <mail@tinco.nl>
+
+	* ext/syck/rubyext.c (mktime_do): YAML.load time correctly parse
+	  usecs smaller than 1 fixes #4571
+
+Thu May  5 17:36:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* eval.c (frame_func_id): store result of method_entry_of_iseq() to
+	  cfp->me because method_entry_of_iseq() might become expensive.
+
+Thu May  5 15:03:51 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* eval.c (frame_func_id): __method__ return different name from
+	  methods defined by Module#define_method with a same block.
+	  [ruby-core:35386] fixes #4606
+	* eval (method_entry_of_iseq): new helper function. search control
+	  frame stack for a method entry which has given iseq.
+	* test/ruby/test_method.rb: add tests for #4696
+
+Mon May  2 00:36:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/socket/init.c (rsock_connect): add to care EINTR. based
+	  on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
+
+Sat Apr 30 03:25:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.
+	  the patch was written by Eric Wong. [Feature #4531]
+
+Thu Apr 28 15:32:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
+	  mswin/mingw.
+
+Wed Apr 27 07:42:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (STRIP): use proper toolchain.  based on a patch
+	  from Jon Forums at [ruby-core:35909].  fixes #4617
+
+Wed Apr 27 00:51:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_truncate): fix function.
+
+	* include/ruby/win32.h (ftruncate, truncate, ftello, fseeko): non-64
+	  versions on mingw are useless because they use int32_t.  fixes #4564
+
+Mon Apr 25 21:31:36 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+
+	* ext/openssl/extconf.rb: Should check SSLv2_*method.
+	  openssl compiled with "no-ssl2" the extconf don't fail
+	  when running `make' having this compilation errors.
+	  Patched by Laurent Arnoud. fixes #4562, #4556
+
+Mon Apr 25 20:53:32 2011  Tajima, Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
+
+Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c (kill): accept 0 as pid, fixes #4596
+
+Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c (kill): accept 0 as pid, fixes #4596
+
+Fri Apr 22 11:49:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
+	  XML-RPC's int is 32bit int, and Fixnum also may be beyond 32bit.
+
+Fri Apr 22 04:16:14 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): strings from psych have proper taint
+	  markings.
+
+	* test/psych/test_tainted.rb: test for string taint
+
+Thu Apr 21 01:01:28 2011  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): maximum length of lpCommandLine is
+	  32,768 characters, including the Unicode terminating null character.
+	
+Sat Oct  9 16:54:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RSHIFT): quote to get rid of argument expansion
+	  for autoconf 2.68.
+
+Wed Apr 20 14:41:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_each_line): check string's length when compare
+	  separator and string. [ruby-core:35815] fixes #4586
+
+Mon Apr 18 12:15:46 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
+	  avoid float error. [ruby-core:35804]
+
+Fri Apr 15 15:10:29 2011  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/uri/generic.rb (#route_from_path): Fix a bug where
+	  URI('http://h/b/').route_to('http://h/b') wrongly returned './'
+	  (should be '../b'). [Bug #4476]
+
+Thu Apr 14 23:43:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (ruby_float_step): wrong loop condition.
+	  fixes [ruby-core:35753], reported by Joey Zhou.
+
+	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
+	  test above change.
+
+Thu Apr 14 21:21:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (frexp, modf): wrongly declared as pure in
+	  mingw math.h.
+
+Thu Apr 14 21:21:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (ftruncate, truncate): mingw64 misses
+	  prototypes.
+
+Thu Apr 14 16:01:45 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* io.c (rb_f_syscall): reduce warning: "HAVE___SYSCALL" is not defined.
+
+Tue Apr 12 19:19:50 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb: avoid race condition. fixes #4572
+
+Tue Apr 12 10:37:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: VC doesn't have ftruncate() and others, but
+	  ruby needs HAVE_ macros to use our emulation functions.
+	  (fix the problem of 31262)
+
+Tue Apr 12 01:33:00 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in: properly evaluate existence of truncate, ftruncate
+	  and ftello for MinGW. [ruby-core:35678]
+	* win32/win32.c: rename truncate, ftruncate and ftello to avoid 
+	  redefinitions.
+	* win32/win32.h: ditto.
+
+Fri Apr  8 16:01:56 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getline): check whether str is
+	  a string when str and lim are given.
+	  https://twitter.com/watson1978/status/56225052152168449
+
+Wed Apr  6 15:12:40 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize):
+	  pop pushed error after each try of reading. fixes #4550
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_initialize): ditto.
+
+Wed Apr  6 11:36:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize):
+	  pop pushed error after each try of reading. fixes #4550
+
+Mon Apr  4 21:41:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_syswrite): While local FS writes are usually
+	  buffered, the buffers can be full or the file opened with
+	  O_SYNC. IO#syswrite can also be used on blocking IOs
+	  (pipe/socket) just like IO#write.
+	  The patch is written by Eric Wong. [ruby-core:35554]
+
+Fri Mar 25 19:39:40 2011  Ben Walton <bwalton@artsci.utoronto.ca>
+
+	* test/test_syslog.rb:
+	  Skip syslog tests that rely on LOG_PERROR unless it's defined
+
+	  Instead of checking looking at the platform to determine if the tests
+	  relying on LOG_PERROR should be run, look for the definition of the
+	  constant as this will be robust against all platforms as long as the
+	  underlying syslog.c code sets it up correctly.
+
+	  This specifically addresses failures on Solaris 9.
+
+	  Use LOG_PID instead of LOG_PERROR in Syslog.open test
+
+          LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms
+	  that don't define it.  Solaris 9 and 10 are examples of this.
+
+	  Use LOG_PID instead.
+
+Thu Mar 24 11:36:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_x509name.c: id_aref's type is ID.
+
+Thu Mar 24 09:56:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
+	  so it should use NUM2INT.
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
+
+Wed Mar 23 08:07:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): fix inaccurate results.
+
+Wed Mar 23 00:12:16 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c: wait process real termination after reading 
+	  exit code. fixes #4518
+
+Wed Mar 16 15:06:21 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should
+	  not change sync mode on exception.
+	* test/openssl/test_buffering.rb: added
+
+Sun Mar 13 16:07:58 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/pstore.rb: Fix don't raise "nested transaction" when thread_safe
+	  is true. Patch by Masaki Matsushita (Glass_saga). [ruby-dev:43337]
+
+	* test/test_pstore.rb: Test for above.
+	  Patch by Masaki Matsushita (Glass_saga) [ruby-dev:43337]
+
+Thu Mar 10 21:59:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser_encode_length): add exception as UTF8-MAC for
+	  magic comment's emacs newline specifier
+	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
+
+Thu Mar 10 16:00:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser_encode_length): fix typo: the length of
+	  "-dos" and "-mac" is not 5 but 4.
+	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
+
+Thu Mar 10 16:00:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser_encode_length): fix typo: the length of
+	  "-dos" and "-mac" is not 5 but 4.
+	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
+
+Mon Mar  7 22:59:39 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/pstore.rb: Delete variable @transaction and fix #4474. Patch by
+	  Masaki Matsushita (Glass_saga).
+
+	* test/test_pstore.rb(test_thread_safe): Add test for #4474.
+
+Sat Mar  5 22:54:36 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* include/ruby/intern.h: fix a typo of prototype declaration.
+	  rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213]
+
+Thu Mar  3 21:21:42 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
+	  >= 3 is not supported on Windows, so should not specify such options
+	  when calling spawn or others.
+
+Sat May 14 12:20:22 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* strftime.c (STRFTIME):  return 0 and ERANGE when precision is too
+	  large. [ruby-dev:43284] fixes #4456
+	  based on r31011.
+
+	* test/test_time.rb (TestTime#test_huge_precision): test for #4456.
+
+Sat Feb 26 07:10:05 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: fix parsing timezone's whose
+	  whose format is (+/-)hhmm.  Thanks Gonçalo Silva!
+
+	* test/psych/test_scalar_scanner.rb: test for bug.
+
+Mon Feb 28 13:02:15 2011  Danial Pearce <github@tigris.id.au>
+
+	* lib/tempfile.rb: Fix example file paths in docs for tempfile.
+	  https://github.com/ruby/ruby/pull/5
+
+Mon Feb 21 10:54:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
+	  or sequences when emitting JSON.
+	* ext/psych/lib/psych/json/tree_builder.rb: do not emit custom tags in
+	  sequences when emitting JSON.
+	* test/psych/json/test_stream.rb: tests for custom stream emits.
+	* test/psych/test_json_tree.rb: tests for JSON emits.
+
+Sun Feb 20 16:26:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (exec_recursive): prevent temporary objects from GC.
+
+	* prevent temporary objects from GC, and should not use
+	  RSTRING_PTR() for function calls since it evaluates the argument
+	  a couple of times.
+
+Sun Feb 20 02:14:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage
+	  because FreeBSD don't permit it. If it's used, it behave as
+	  pthread_sigmask(xx, NULL, &mask).
+
+	* signal.c (init_sigchld): ditto.
+
+Sat Feb 19 22:37:42 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_insnhelper.c (vm_check_if_namespace): guard temporary object
+	  from GC.
+
+Fri Feb 18 00:28:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* compile.c (get_exception_sym2type): guard temporary object from GC.
+
+Tue May  3 18:23:57 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/date/test_date.rb (TestDate#test_coerce):
+	  test for [ruby-core:35127].
+
+Sun Feb 13 00:48:47 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (Date#===): [ruby-core:35127]
+
+Fri Feb 11 19:45:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): use rb_ary_free to free internal object.
+
+	* gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
+	  [ruby-core:35192]
+
+Fri Feb 11 16:57:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_transcode.rb (test_from_cp50221): fix wrong
+	  assertion and move back.
+
+Tue Feb  8 01:00:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* process.c (proc_setgroups): add GC guard to prevent intermediate
+	  variable from GC.
+
+Mon Feb  7 22:56:16 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
+	  Object#tap to restore STDOUT.sync.
+
+Sun Feb  6 12:18:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (words, qwords): dispatch array events.  based on a
+	  patch from Michael Edgar.  [Bug #4365].
+
+Sat Feb  5 21:47:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (mlhs_basic): include mlhs_post for ripper.  a patch
+	  from Michael Edgar at [ruby-core:35078].
+
+Sat Feb  5 11:29:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
+
+	* ext/json/parser/parser.rl (cParser_initialize): ditto.
+
+	* ext/json/parser/parser.h (GET_PARSER): check if initialized.
+	  [ruby-core:35079]
+
+	* ext/json/parser/parser.rl (cParser_initialize): ditto.
+
+Sun May  1 18:35:34 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/fileutils/fileasserts.rb (assert_block): little workaround
+	  for [ruby-dev:43174].
+
+Sat Feb  5 21:22:21 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_block): move from
+	  test/fileutils/fileasserts.rb.
+
+	* test/fileutils/fileasserts.rb (assert_block): pass arguments
+	  as-is.  [ruby-dev:43174]
+
+Sat Feb  5 03:37:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::LowMethods): make low level methods
+	  in NoWrite and DryRun to do nothing.  [ruby-dev:43129]
+
+	* test/fileutils/fileasserts.rb: add message arguments.
+
+	* test/fileutils/fileasserts.rb (Test::Unit::Assertions#assert_block):
+	  show the given message.
+
+Sat Feb  5 02:09:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lex_getline, parser_set_encode): set encoding of lines
+	  in SCRIPT_LINES__ as source encoding.  [ruby-dev:43168]
+
+Wed Apr  6 21:25:08 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* thread.c (thread_s_kill): workaround for [ruby-core:35086].
+	  fixes #4367.
+
+	* test/ruby/test_thread.rb (TestThread#test_kill_wrong_argument):
+	  test for [ruby-core:35086].
+
+Fri Feb  4 12:11:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* string.c (str_utf8_nth): fixed a conditon of optimized lead
+	  byte counting. [Bug #4366][ruby-dev:43170]
+
+Fri Feb  4 00:14:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
+	  before rb_str_resurrect.
+
+Thu Feb  3 18:33:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	e ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
+	  because gz->z.input is hidden string. [ruby-core:35057]
+
+Thu Feb  3 07:02:16 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular
+	  expressions can round trip. [ruby-core:34969]
+
+	* test/psych/test_yaml.rb: test for ARG_ENCODING_NONE regex
+
+	* ext/sych/lib/syck/rubytypes.rb: ARG_ENCODING_NONE regular
+	  expressions can round trip.
+
+	* test/syck/test_yaml.rb: test for ARG_ENCODING_NONE regex
+
+Mon Jan 31 21:32:44 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread.c (thread_start_func_2): check deadlock condition before
+	  release thread stack. fix memory violation when deadlock detected.
+	  reported by Max Aller. [Bug #4009] [ruby-core:32982]
+
+Mon Jan 31 14:45:47 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale::#search_file):
+	  Gem might be undefined if --disable-gems. [ruby-core:34990]
+
+Mon Jan 31 04:45:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
+	  rb_resize_capa because rb_resize_capa expects resized length is
+	  smaller than current array length. call rb_ary_unshare before
+	  rb_resize_capa because rb_resize_capa losts the reference to
+	  original shared array. [ruby-core:34997]
+
+Sun Jan 30 16:15:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
+	  work on x86_64 due to the design of DL2.
+
+	* test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.
+
+Sun Jan 30 15:13:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
+	  byte.
+
+Sun Jan 30 12:53:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/emacs_mule.c (emacsmule_islead): fix inverse condition.
+
+Sun Jan 30 08:02:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: Mac OS X wrongly reports it has fdatasync(3).
+
+Fri Feb 18 19:31:31 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
+	  race condition in the case where the given path is a directory,
+	  and some other user can move that directory, and create a
+	  symlink while this method is executing.
+	  Reported by: Nicholas Jefferson <nicholas at pythonic.com.au>
+
+Sat Jan 29 22:16:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_join): [].join.encoding must be US-ASCII.
+	  [ruby-list:47790]
+
+Fri Jan 28 12:05:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Add #include<sys/stat.h> when struct stat is
+	  tested. Otherwise, incomplete type dereference error will occur.
+
+Fri Jan 28 02:37:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* re.c (rb_reg_raise): add GC guard to prevent intermediate
+	  variable from GC.
+
+Fri Jan 28 02:35:41 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* hash.c (rb_hash_fetch_m): add GC guard to prevent intermediate
+	  variable from GC.
+
+Wed Jan 26 22:57:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* class.c (clone_method): add GC guard to prevent intermediate
+	  variable from GC. [Bug #4321] [ruby-dev:43107]
+
+Wed Jan 26 22:28:49 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
+	  variable from GC. [Bug #4322] [ruby-dev:43108]
+
+Wed Jan 26 10:36:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (=~): documentation fix; the return value is nil when
+	  it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
+
+Tue Jan 25 08:28:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): get rid of out-of-bound access.
+
+Tue Jan 25 07:00:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_string_value_cstr): rb_str_modify can change
+	  RSTRING_PTR.
+
+Tue Jan 25 07:48:22 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_thread.rb: remove unused variables.
+
+Tue Jan 25 07:45:44 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get
+	  rid of method redefined.
+
+Tue Jan 25 03:24:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_thread.rb: Added various ConditionVariable tests.
+
+Mon Jan 24 21:04:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_invalid_str): prevent intermediate variable from GC.
+	  [ruby-core:34820]
+
+Sat Jan 22 11:21:40 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): fixing off-by-one error on line numbers
+	  in parse exceptions.  [ruby-core:34690]
+
+	* test/psych/test_parser.rb: test for error
+
+Wed Jan 19 13:04:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* proc.c (proc_call): Add gc guard to avoid segfault. The fix
+	  is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
+
+Tue Jan 18 23:31:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y: avoid NULL reference.  [ruby-dev:43067]
+
+Wed Jan 19 02:54:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
+	  no bytes are written to the buf. [ruby-dev:43062]
+
+Tue Jan 18 02:46:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
+	  strings should be dumped with double quotes. [ruby-core:34186]
+
+	* test/psych/test_json_tree.rb: test for double quotes
+
+Sun Jan 16 22:06:30 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* too/rbinstall.rb (install?(:ext, :comm, :gem)): no longer 
+	  installs no-versioned gempsecs. [ruby-core:34011]
+	  Patch by Luis Lavena.
+
+Fri Jan 14 15:32:29 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: call neither logout nor disconnect
+	  unless connected.  patch by Kazuhiro NISHIYAMA.  [ruby-dev:42860]
+
+Fri Jan 14 14:56:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/imap.rb: use bytesize for binary strings.
+	  patched by Yoshimasa Niwa. [ruby-core:34222]
+
+Fri Jan 14 13:38:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
+	  gzip's header is the size of uncompressed input data modulo 2^32.
+	  [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
+
+Fri Jan 14 07:30:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_next_argv): go advance when the next file cannot be
+	  read.  [ruby-core:34446]
+
+Wed Jan 12 23:55:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
+	  long type arguments.
+
+Thu Jan 13 00:06:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]
+
+Thu Jan 13 00:00:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_f_syscall): Some syscall return unsigned or pointer value.
+	  Therefore we should only check the result is -1 or not. [ruby-core:34062]
+
+Wed Jan 12 16:25:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/net/http.rb (Net::HTTP#connect): makes it timeout during 
+	  SSL handshake too. [ruby-core:34203]
+	  Patch by Marc Slemko.
+
+	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_timeout_during_HTTP_session):
+	  test for [ruby-core:34203]
+
+	* test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
+	  ditto.
+
+Sun Jan  9 16:31:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* io.c (Kernel.#syscall): implemented on LP64/LLP64 environments too.
+	  also uses __syscall if available for *BSD on 64bit architecture.
+	  [ruby-core:34062]
+
+Wed Jan 12 16:24:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE 
+	  and RL_PROMPT_END_IGNORE. [ruby-core:34331]
+
+	* ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
+	  RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
+	  error with libedit.
+
+Sun Jan  9 14:47:50 2011  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
+	  fixed #3616 [ruby-core:31484] IRB + readline incorrectly counts
+	  non-printing characters in prompt
+
+Fri Jan  7 21:54:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
+	  regexp after open bracket.  [ruby-core:34183]
+
+Thu Jan  6 22:42:02 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
+	  fail in certain case.  this patch is contributed from Ray Chason
+	  <chasonr at gmail.com> in personal communication.
+
+Thu Jan  6 11:27:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
+	  should not be included in JSON mapping
+
+Thu Jan  6 05:14:41 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (get_strio, strio_set_string)
+	  (strio_reopen): check if frozen.  [ruby-core:33648]
+
+Wed Jan  5 13:56:54 2011  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/http.rb (Net::HTTP#get): A header hash given should not
+	  be modified.
+
+Sun Jan  9 16:31:34 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE): 
+	  some platoform has a locale without territory but with 
+	  encoding.
+	  (#each_sub_locale): ditto.
+
+Sat Jan  1 17:02:50 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale#search_file): make it possible
+	  to load a localization from a gem.
+	  (IRB::Locale#lc_path): obsoleted because of the change of #search_file
+	  (IRB::Locale#each_localized_path): new private method, based on lc_path
+	  (IRB::Locale#find): follows the change of #search_file.
+	  (IRB::Locale#load): removed duplicate with #find.
+
+Fri Dec 31 03:23:26 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
+	  patched by Peter Weldon <peter.weldon AT null.net>
+	  [ruby-core:33985]
+
+Wed Jan  5 12:10:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* Use _WIN32 rather than checking for windows.h.  Thanks Jon Forums!
+	  [ruby-core:33977]
+
+Tue Dec 28 04:32:37 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/extconf.rb: check for windows.h while building fiddle.
+	  Thanks Jon Forums! [ruby-core:33923]
+
+Sun Dec 26 11:39:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.
+	  http://twitter.com/#!/wannabe53/status/18797576396472321
+	  http://twitter.com/#!/wannabe53/status/18798416150663168
+
+Sun Dec 26 04:31:15 2010  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
+	  Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]
+
+Sat Dec 25 15:04:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
+	  suite writing to the source directory.
+
+Sat Dec 25 14:27:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_extract_encoding_option): accept Encoding object as
+	  encoding: optional argument.  [ruby-dev:42884]
+
+Sat Dec 25 15:08:08 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
+	  We must reinitialize GVL at new process creation. Otherwise
+	  we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
+
+Wed Sep  8 22:46:31 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
+	  blocked on Windows while blocking call for SSLSocket.  Need to
+	  convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.
+	  Patch by arton. ref #3794.
+
+Thu Dec 23 23:29:04 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk, win32/Makefile.sub: fixes dependencies.
+	  patch by nobu.
+
+Thu Dec 23 22:29:08 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* io.c (io_fillbuf): fixes a mistake on merging r30280, at r30321.
+
+Thu Dec 23 06:35:41 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
+	  connection verification fails.
+
+Tue Dec 21 06:25:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rexml/test_contrib.rb (ContribTester#test_pos): should not
+	  use fixed path name for tests.  [ruby-dev:42827]
+
+	* test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use
+	  fixed port for tests.  [ruby-dev:42828]
+
+Tue Dec 21 01:41:42 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* io.c : add an extra byte to buffer for the specification of read
+	  in Windows. see [ruby-core:33460] and r29980. and, we have to
+	  discuss how to do this one byte.
+
+Wed Dec 15 04:02:00 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
+	  fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
+	  Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
+
+Sat Dec 11 05:48:28 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
+	  [ruby-dev:42716] [Ruby 1.9-Bug#4129]
+
+	* ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at exit.
+
+Tue Dec  7 22:37:15 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* io.c (io_read): duplicate string if shared. [ruby-dev:42719]
+
+Tue Dec  7 21:59:37 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/light/node.rb: remove circular require.
+
+Tue Dec  7 18:56:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
+	  patched by Kouhei Yanagita [ruby-dev:42696]
+
+Tue Dec  7 00:27:14 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* win32/win32.c (rb_w32_read): fixed more for readline,
+	  and so on. [ruby-core:33511]
+
+Mon Dec  6 18:56:42 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_string.rb (TestString#test_scan): add a test for
+	  [ruby-core:33338] #4087.
+
+Thu Dec 23 19:17:14 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/net/imap/cacert.pem: updated because it has been expired.
+
+	* test/net/imap/server.crt: signed again because CA cert was expired.
+
+Sun Dec  5 17:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (make_metaclass): fix probable typo.  builtin type flag
+	  cannot be used with FL_TEST.
+
+Sun Dec  5 12:09:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
+
+Sun Dec  5 11:27:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): decrement for ungotten line.
+	  [ruby-dev:42680]
+
+Fri Dec  3 07:08:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getline): round upto next char
+	  boundary.  [ruby-dev:42674]
+
+Thu Dec  2 15:31:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): more fix. [ruby-core:33513]
+
+Thu Dec  2 13:41:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): workaround for console reading troubles.
+	  fixed [ruby-core:33511]
+
+Tue Nov 30 12:23:52 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): read only 1 byte at once on console.
+	  workaround of Windows bug. see [ruby-core:33460].
+	  this is not the final solution.
+
+Mon Nov 29 22:55:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
+	  by nested repeat operators.  [ruby-core:33464]
+
+Mon Nov 29 18:31:31 2010  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
+	  - Removed commented-out options that are no longer under discussion.
+	  - Added two more tests for forthcomming clarifications.
+
+Mon Nov 29 05:54:22 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (native_cond_*): Check return code.
+	  (Some OSs except Linux return error code).
+
+Sat Nov 27 19:12:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: parenthesize macro arguments.
+
+Sat Nov 27 18:08:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]
+
+Fri Nov 26 09:48:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_str): should succeed the taint status from
+	  the origin. [ruby-core:33338]
+
+Tue Nov 23 18:54:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): should mark self in conrol
+	  frames.  [ruby-core:33289]
+
+Sat Oct 30 00:35:13 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_s_compile): fix optional argument.
+	  a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
+
+Mon Nov 22 21:30:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_inspect): fix for ascii-compatible external
+	  encoding and different encoding string.  [ruby-core:33283]
+
+Mon Nov 22 18:33:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_inspect): append for each chars instead of bulk
+	  copy if encoding conversion is needed.  [ruby-core:33283]
+
+Mon Nov 22 11:58:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
+	  receiver is 7BIT and the argument is non ASCII.
+
+Sat Nov 20 01:57:55 2010  Akio Tajima  <artonx@yahoo.co.jp>
+
+	* common.mk: add dependency(insns.inc) to compile.obj
+
+Thu Nov 18 00:02:17 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Upgrading output encoding with ASCII content 
+	  as needed.  [ruby-core:33229]
+
+Tue Nov 17 08:54:04 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Upgrading output encoding as needed.  [ruby-core:33135]
+
+Tue Nov 16 22:30:39 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
+	  Coverity Scan found this bug.
+
+Tue Nov 16 06:39:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
+	  values if block is given.  [ruby-core:33193]
+
+Tue Nov 16 00:21:20 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
+	  found this bug.  [ruby-dev:42579]
+
+Mon Nov 15 23:54:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
+	  size_t to a pointer typed VALUE*.  Coverity Scan found this defect.
+
+Mon Nov 15 23:41:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_set_exception_local_table, iseq_set_local_table,
+	  rb_iseq_build_from_ary): fix type inconsistency (which is benign
+	  because sizeof(ID) == sizeof(ID*), though).  Coverity Scan found
+	  these bugs.
+
+Mon Nov 15 22:47:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
+	  Scan found this bug.
+
+Mon Nov 15 06:43:48 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
+	  pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
+
+Mon Dec  6 22:53:49 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* cygwin/GNUMakefile.in ($(RCFILES)): fixes [ruby-core:33525].
+	  Patch by Luis Lavena <luislavena AT gmail.com>.
+	  http://groups.google.com/group/rubyinstaller/browse_thread/thread/412abfdcb695aecb
+
+Mon Dec  6 22:28:41 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* string.c (rb_str_concat): partially reverts r30040 because
+	  it unpexpectedly changes the behavior of String#<<.
+
+Fri Nov  5 00:14:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/extconf.rb: fixing ffi library location on windows.
+	  Thanks Usa! [ruby-core:32930]
+
+Wed Nov  3 14:13:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): concatenation of valid
+	  encoding string and invalid encoding string should result
+	  invalid encoding.  [ruby-core:33027]
+
+Wed Nov  3 07:47:25 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
+	  regex options.  a patch from Heesob Park in [ruby-core:32988].
+
+Sat Oct 30 06:32:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
+	  group of the created file is inherited from the parent
+	  directory on BSDs and MacOS X.  Linux also inherit the group if
+	  the setgid bit of the directory is set.  It causes the test fail.
+	  fixed by Shota Fukumori.  [ruby-dev:42458]
+
+Fri Oct 29 03:04:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_dump): fix expected length. [ruby-core:32935]
+
+Thu Oct 21 15:42:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/telnet.rb (Net::Telnet#close): added.
+	  patched by Erik Hollensbe [ruby-dev:42260] #3830
+
+Wed Oct 27 18:27:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
+	  before closing read end, to get rid of timing problem.
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
+
+Wed Oct 27 13:51:25 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#pipe): need to propagate exceptions
+	  in read/write thread. fix r29541.
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
+
+Thu Oct 21 00:05:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#pipe): get rid of deadlock on pipe.
+	  a patch from Tomoyuki Chikanaga at [ruby-dev:42435].  #3970
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
+
+Mon Oct 18 10:19:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (transport_request): @socket may be nil.
+	  patched by Egbert Eich [ruby-core:32829]
+
+Sun Oct 17 10:40:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_define_{class,module}_id_under): register to be
+	  marked, which probably are defined and used internally.
+
+Sat Oct 16 11:10:55 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
+	  according to GB2312. [Bug #3937] [ruby-core:32758]
+
+Fri Oct 15 23:36:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
+	  unsigned int.
+
+Fri Oct 15 20:30:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (dev_t): use RUBY_REPLACE_TYPE.
+
+	* file.c (rb_stat_inspect): use PRI_DEVT_PREFIX.
+
+Thu Oct 14 07:35:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (DEVT2NUM): added. Size of dev_t is depend on the
+	  environment even if POSIX defines dev_t as unsigned integer.
+	  For example, OpenVMS, 64bit Solaris 9, and NetBSD 6 defines
+	  dev_t as 64bit unsigned integer.
+
+	* file.c (rb_stat_dev): use DEVT2NUM.
+
+	* file.c (rb_stat_dev_major): dev_t is not long. major(3)'s return
+	  value is int.
+
+	* file.c (rb_stat_dev_minor): dev_t is not long. minor(3)'s return
+	  value is int.
+
+	* configure.in: check size of dev_t.
+
+Thu Oct 14 20:50:51 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (reg_get_val): expand environment in 
+	  the pathname. [Bug #3907]
+
+Thu Oct 14 04:16:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (ruby_float_step): fix Numeric#step with infinity unit
+	  doesn't works well. [ruby-core:32779]
+
+Wed Oct 13 22:32:34 2010  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
+	  string. Thanks nobu and tDiary dev members. [Bug #3909]
+
+Tue Oct 12 23:58:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_open_osfhandle, rb_w32_wopen, rb_w32_pipe):
+	  use uintptr_t instead of long for win64.
+
+Tue Oct 12 23:55:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): fix cast.
+
+Tue Oct 12 18:25:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
+	  may be a Bignum. On 64bit for errors. [ruby-dev:42366]
+
+Tue Oct 12 18:25:04 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_concat): use unsigned int for GB18030.
+
+Tue Oct 12 15:52:35 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_strerror): unmap some range of errno for
+	  workaround of VC10's strerror() and sys_nerr problem.
+	  based on a patch from Akio Tajima, [ruby-dev:42355].
+
+Tue Oct 12 15:36:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_ungetc): use unsigned int for GB18030.
+
+Tue Oct 12 15:10:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (rb_enc_uint_chr): split from int_chr.
+
+	* numeric.c (int_chr): use rb_enc_uint_chr.
+
+	* include/ruby/encoding.h (rb_enc_uint_chr): added.
+
+Tue Oct 12 14:04:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (int_chr): a codepoint of Ruby M17N must be 32bit
+	  unsigned int; GB18030 uses MSB. Also note that OnigCodePoint
+	  is defined as uisigned int.
+
+Mon Oct 11 20:20:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
+	  encoding of Zlib::GzipReader.
+	  http://hibari.2ch.net/test/read.cgi/tech/1281473294/271
+
+Mon Oct 11 14:03:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (syserr_initialize): set the encoding of Errno::*#message
+	  as locale. [ruby-dev:42358]
+
+Mon Oct 11 06:11:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_set_encoding): use rb_funcall2 when the io is not
+	  a T_FILE. [ruby-dev:42356]
+
+Fri Oct  8 00:24:54 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Fixing documentation typos.  [ruby-core:32712]
+
+Wed Oct  6 11:52:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): write_mutex might have been destroyed
+	  already in finalization phase, as the order of finalizers is not
+	  guaranteed.  rb_mutex_t should be used in place of Mutex object
+	  in the future.
+
+Mon Oct  4 12:43:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (regexp): dregexp has literal string only at the head
+	  and successors are array.  [ruby-core:32682]
+
+Mon Oct  4 09:30:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new
+	  accepts only Strings, so call Integer#to_s(16).
+	  16 is for an optimization. [ruby-dev:42336]
+
+Mon Oct  4 07:57:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (fiber_memsize): Return size.
+	  Before this change, fiber_memsize always returns 0.
+
+Sat Oct  2 22:59:32 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_thread.rb: add for win32ole with Thread.
+
+Thu Sep 30 16:11:08 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_getenv): should return NULL if specified name
+	  is empty. a patch from Heesob Park at [ruby-core:32650]
+
+Sun Aug 29 13:22:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_method_id_and_class): curried proc has no
+	  method.  [ruby-core:31871]
+
+Fri Sep 24 23:44:59 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_call), vm.c (invoke_block_from_c),
+	  vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
+	  [ruby-core:32075]
+
+	* vm_eval.c (rb_funcall_passing_block): new function to call
+	  method with passing given block.
+
+Fri Sep 24 15:50:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_to_i): fix rdoc: String#to_i raises an
+	  exception when base is invalid. [ruby-core:31685]
+
+Wed Sep 22 16:59:40 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/test_prime.rb (TestPrime#test_new): the warning expected have
+	  not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
+	  a.k.a. sora_h. [ruby-dev:42272]
+	  Recovers $stderr even if StringIO.new fails. Reported by unak.
+
+Wed Sep 22 01:55:48 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_method.rb: fix last commit.
+
+Wed Sep 22 01:49:52 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_method.rb: add a test for [ruby-core:30534].
+
+Mon Sep 20 23:23:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (bracket): get rid of scanning at the end of the pattern
+	  string, not to raise an exception while globbing command line.
+	  [ruby-core:32478]
+
+Fri Sep 17 23:44:07 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:
+	add missing method availability check. [ruby-core:32447]
+	Reported by Wiebe Cazemier. Thanks!!!
+
+Fri Sep 17 23:23:26 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
+
+Fri Sep 17 23:10:44 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_core.rb: enable.
+
+Fri Sep 17 22:46:02 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: untabify.
+
+Fri Sep 17 22:29:56 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: fix fixture data path. All REXML tests are worked.
+
+Fri Sep 17 22:15:15 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_listener.rb: remove needless codes.
+
+Fri Sep 17 22:12:23 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: import REXML tests from
+	http://www.germane-software.com/repos/rexml/trunk/test/.
+	Many tests are failed temporary. I'll fix them quickly. Sorry.
+
+Fri Sep 17 08:30:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tracer.rb: count only non-internal libraries in stack trace,
+	  ignoring custom_require.  [ruby-core:31858]
+
+Thu Sep 16 08:30:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): fix rdoc.  pointed out by Tomoyuki
+	  Chikanaga at [ruby-core:32395], and a patch from Daniel
+	  Bovensiepen at [ruby-core:32403].
+
+Thu Sep 16 08:27:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
+	  [ruby-core:32394]
+
+Wed Sep 15 13:37:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: "localhost" not guaranteed to
+	  resolve to "127.0.0.1".  On my machine it is "::1" instead.
+	  The problem is, you have to connect to the imaps server via
+	  the canonical name written in a server certificate, and that
+	  of the server.cert is "localhost".  So you have to listen to
+	  the address of what "localhost" resolves to.  I think this
+	  situation cannot be resolved in a handy manner because the
+	  test "test_imaps_post_connection_check" is actually
+	  expecting to connect to a server via an address other than
+	  the CN.  On my machine several assertions won't pass because
+	  the test cannot connect to the server.
+
+Wed Sep 15 09:12:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_puts): fix for wide char encoding strings.
+	  [ruby-dev:42212]
+
+Wed Sep 15 07:27:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_times): mentioned about Hash argument.  a patch
+	  from Daniel Bovensiepen at [ruby-core:32386].
+
+	* sprintf.c (get_hash): ditto, and fix typo.
+
+Mon Sep 13 19:56:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
+	  bug in system header of darwin 9.  [ruby-core:32341]
+
+Mon Sep 13 10:12:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): reject Float('0x0.').
+	  [ruby-dev:42239] Bug #3820
+
+Mon Sep 13 09:23:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
+	  with rb_scan_args. Before this fix, OpenSSL::BN#prime?
+	  is fully broken. [ruby-dev:42225]
+
+Sun Sep 12 21:21:50 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: [ruby-core:32096]  Thanks Colin Bartlett.
+
+Tue Nov  2 21:33:43 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* hash.c (ruby_setenv): merged r29225 but just warning
+	  instead of raising an exception. c.f. [ruby-core:32250].
+
+Sep 11 16:47:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ruby_setenv): raise if putenv and SetEnvironmentVariable
+	  failed, because of the restriction of the size on Windows.
+	  based on a patch from Peter Weldon at [ruby-core:32304].  fix:
+	  Bug#3812, [ruby-core:32250]
+
+Sat Sep 11 12:32:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
+	  zombie prototype declarations.  a patch from Eric Hodel
+	  at [ruby-core:32305].
+
+Thu Sep  9 23:25:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace_each): skip allocator frames which have no
+	  name.  [ruby-core:32231]
+
+Thu Sep  9 10:44:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
+	  that it ignores characters after = in ENV.
+	  patched by Jeremy Evans [ruby-core:32184]
+
+Thu Sep  9 09:02:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/rbinstall.rb (install?): gemspec filename should include
+	  its version. patched by Luis Lavena [ruby-core:32165]
+
+Mon Sep  6 11:03:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* Fixed wrong check of missing functions. Patch by Adrian Quark.
+	  ref #3400
+	  The patch contains following comment:
+	    This patch should avoid unnecessary incompatibility with future
+	    versions of Openssl.  Changes suggested by bmaher_at_amazon.com.
+
+Mon Sep  6 10:31:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_s_get_line_buffer):
+	  Readline.line_buffer should return locale string.
+	  [ruby-dev:42184] #3791
+
+Sat Sep  4 23:48:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_readlink): symlink target should be in
+	  filesystem encoding.
+
+Wed Sep  1 14:33:36 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enum.c (enum_zip): fix typo of rdoc.
+	  patched by Andrei Kulakov [ruby-core:31974]
+
+Wed Sep  1 12:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ruby_suppress_tracing): restore the state and invoke
+	  the func with normal state.  a patch from Satoshi Shiba <shiba
+	  AT rvm.jp> at [ruby-dev:42162].  [ruby-core:31783]
+
+Tue Aug 31 17:32:34 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
+	  stubs". Thanks, Akio Tajima [ruby-dev:42159].
+
+Tue Aug 10 11:26:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/un.rb (httpd): SIGQUIT and SIGHUP are not guaranteed to exist.
+
+Sat Aug 14 17:48:41 2010  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* test/objspace/test_objspace.rb: added test for objspace.
+
+	* ext/objspace/objspace.c: considers T_ZOMBIE by lazy sweep GC.
+
+	* gc.c: considers that dsize was 0. [ruby-dev:42022]
+
+Tue Aug 31 03:42:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_setup_table): fix bug in r29146.
+	  Initialize table even if cflag is 0; tr_find see whether
+	  del is empty or not.
+
+	* string.c (tr_find): nodel can't be NULL; if NULL, it means
+	  it is not specified.
+
+Mon Aug 30 15:00:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_setup_table): initialize negating table when
+	  negating string is given. [ruby-core:31851]
+
+	* string.c (tr_find): add a sentence for the time when
+	  target characters include negating one.
+
+	* string.c (rb_str_count): move definition.
+
+Sun Aug 29 23:54:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
+	  include assignment.  [Bug #3759], [ruby-dev:42154]
+
+	* lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
+	  name signleton class.  [Bug #3759], [ruby-dev:42154]
+
+Sat Sep 25 22:48:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_DLDFLAGS): fix quoting.
+
+Sat Sep 25 10:30:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_DLDFLAGS): use -unexported_symbol only
+	  when available.  http://trac.macports.org/ticket/26341
+
+Sat Oct 16 10:54:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (CPP): already used in .c.i rule.
+
+	* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
+	  --preprocessor options explicitly.  [ruby-core:32776]
+
+Thu Sep 23 09:01:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_cref_push): no outer cref is needed for proc
+	  from method.  Bug #3786, Bug #3860, [ruby-core:32501]
+
+Sun Sep 19 13:44:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_SO): fix an oversight of replace
+	  RUBY_INSTALL_NAME with RUBY_SO_NAME.  a patch from Jeremy Evans
+	  at [ruby-core:32474].
+
+Sun Aug 29 12:19:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_failed): should honor encoding.  [ruby-core:31915]
+
+Fri Aug 27 12:26:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* object.c (rb_obj_class): remove mention of obsolete method.
+	  a patch from Run Paint Run Run at [ruby-core:31842].
+
+Thu Aug 26 10:37:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regint.h (OnigStackIndex): the type should be intptr_t.
+	  Original Oniguruma assumes the size of long and that of void *
+	  are equal, but it's not true on LLP64 platform: mswin64.
+	  originally patched by shintaro kuwamoto [ruby-dev:42133]
+
+Thu Aug 26 10:38:11 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
+
+	* test/fiddle/helper.rb: AIX does not have dynamically loadable lib[cm].
+
+Wed Aug 25 03:42:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
+	  reported by kuwamoto shintaro in [ruby-dev:42125].
+
+Mon Aug 23 13:09:27 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* backport r29071 from ruby_1_8;
+
+	  * ext/openssl/ossl_asn1.c (obj_to_asn1bool): fixed ASN1::Boolean
+	    encoding issue for OpenSSL 1.0.0 compatibility.
+	    ASN1::Boolean.new(false).to_der wrongly generated "\1\1\377" which
+	    means 'true'.
+
+	    ASN1_TYPE_set of OpenSSL <= 0.9.8 treats value 0x100 as 'false'
+	    but OpenSSL >= 1.0.0 treats it as 'true'.  ruby-ossl was using
+	    0x100 for 'false' for backward compatibility.  Just use 0x0 for
+	    the case OpenSSL >= OpenSSL 0.9.7.
+
+	  * test/openssl/test_asn1.rb: test added.
+
+Mon Aug 23 22:30:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (version.o): depends on both of version.h and
+	  include/ruby/version.h.   [ruby-dev:42063]
+
+Mon Aug 23 12:28:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_search): fix: 4th argument should be regexp
+	  object. patched by shintaro kuwamoto [ruby-dev:41667] #3459
+
+Mon Aug 23 02:23:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): make sure to have digit-sequence after 'p'
+	  for hexadecimal-floating-constant. [ruby-dev:42105]
+
+Sun Aug 22 09:08:02 2010  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (UINT2NUM): fix ifdef condition for LLP64.
+	  reported by Daniel Gutmanas.  [ruby-core:31778]
+
+Sun Aug 22 05:55:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: fix typo.  a patch from Eric Wong at
+	  [ruby-core:31810].
+
+Thu Aug 19 12:04:39 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* array.c (rb_ary_permutation, rb_ary_repeated_permutation,
+	  rb_ary_repeated_combination, rb_ary_product):
+	  use ary_make_shared_copy instead of ary_make_substitution.
+	  [ruby-dev:42067] [Bug #3708]
+
+	* test/ruby/test_array.rb (test_product, test_repeated_permutation,
+	  test_repeated_combination): append assertions against [Bug #3708].
+
+Thu Aug 19 11:11:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enum.c (enum_inject): fix typo of rdoc.
+	  patched by Andrei Kulakov [ruby-core:31768]
+
+Thu Aug 19 06:03:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_push_frame): initialize block_iseq.  a patch
+	  from Peter Weldon at [ruby-core:31757].
+
+Wed Sep 15 02:13:44 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
+	  Thanks Jeremy Evans! [ruby-core:32384]
+
+Wed Aug 18 01:37:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c: revert r26701; it introduces Bug #3681.
+	  [ruby-core:31677]
+
+Mon Aug 16 23:16:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* NEWS: updated.  a patch from Kazuhiro NISHIYAMA in [ruby-dev:42001].
+
+Sun Aug 15 19:59:58 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error):
+	  Fix for possible cross-site scripting (CVE-2010-0541). 
+	  Found by Apple, reported by Hideki Yamane.
+	  Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>.
+
+Fri Jul 30 08:51:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): home directory must be absolute.
+	  [ruby-core:31537]
+
+Fri Jul 30 08:33:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): should check if could find user.
+	  [ruby-core:31538]
+
+Sat Aug  7 13:33:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call0): fix for VM_METHOD_TYPE_NOTIMPLEMENTED.
+	  [ruby-dev:41953]
+
+Fri Aug  6 18:59:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (realpath_rec): rb_str_modify depends on the length, so
+	  resize instead.
+
+Thu Aug  5 21:20:31 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (NODE_ARGSCAT, NODE_ARGSPUSH): drop unused ARGSCAT
+	  results when poped is true.  [ruby-dev:41933], [Bug #3658]
+	  This is retry of r28870 and r28873 which were reverted.
+
+Thu Aug  5 16:57:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_make_pattern): fold continuous PLAINs to get rid of
+	  snail at too deep path.  [ruby-dev:41871]
+
+Sat Aug  7 09:47:06 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: fix checking version of GCC.
+
+Mon Aug  2 21:51:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): rb_str_set_len modifies ptr
+	  since r26303.
+
+Mon Aug  2 21:16:03 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
+	  version is older than 3.4.4. [ruby-core:31567] [Bug #3637]
+	* ext/win32ole/extconf.rb: ditto.
+
+Fri Jul 30 07:48:04 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
+	  even if MacOS X Aqua version [ruby-dev:41883].
+
+Thu Aug  5 18:36:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (nucomp_marshal_load): should check the argument.
+	  [ruby-core:31622]
+
+	* rational.c (nurat_marshal_load): ditto
+
+Mon Aug  2 16:34:32 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (native_thread_join): need to wait thread, of course.
+	  [ruby-dev:41911]
+
+Mon Aug  2 12:22:22 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (file_expand_path): wrong condition. [ruby-core:31591]
+
+Thu Jul 29 02:38:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: not [freebsd] but [freebsd*] for AS_CASE.
+
+Mon Jul 26 13:52:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: define BROKEN_CLOSE only on FreeBSD.
+	  This needs to merge to 1.9.2.
+
+Mon Jul 26 11:51:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: define BROKEN_CLOSE on FreeBSD.
+	  This fixes build failure on MSVC. [ruby-core:31481]
+
+	* include/ruby/ruby.h, include/ruby/missing.h:
+	  use BROKEN_CLOSE for replacing close(2).
+
+Mon Aug  2 00:03:18 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* util.c (ruby_add_suffix): fixed a bug returning uninitialized value.
+	  This is the essential part from r28794 of trunk.
+
+Mon Jul 26 13:01:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): should mark iseq itself other than normal
+	  iseq.  [ruby-dev:41880]
+
+Mon Jul 26 09:51:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): mark only self of normal iseqs, not
+	  nodes.  [ruby-dev:41874]
+
+Sun Aug  1 10:23:48 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/irb/init.rb (IRB.parse_opts): set VERBOSE to true when debug
+	  switch called in irb.  a patch from Andrew Grimm in
+	  [ruby-core:31558].
+
+Sun Aug  1 09:35:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (big_op): comparison of bignum and infinity has returned 1
+	  or -1, but it must return boolean.
+
+Wed Jul 21 15:22:17 2010  Evan Phoenix <evan@fallingsnow.net>
+
+	* lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from
+	  from gems properly.
+
+Tue Jul 20 11:35:11 2010  Evan Phoenix  <evan@ruby-lang.org>
+
+	* lib/rubygems.rb: Load the custom require if --disable-rubygems
+	  was used.
+
+Tue Jul 20 11:27:18 2010  Evan Phoenix  <evan@ruby-lang.org>
+
+	* gem_prelude.rb: Pull in rubygem's custom require
+	  [ruby-core:30846]
+
+	* lib/rubygems.rb: Handle always having custom require available
+
+Tue Jul 13 20:58:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_DEFAULT_ARCH): adjust for target
+	  cpu. [ruby-core:31243]
+
+Fri Jul 23 15:09:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_MINGW32): ignore msvc suffix.
+
+Fri Jul 23 09:02:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): fixed out-of-boundary access at invalid
+	  multibyte characters.
+
+Thu Jul 22 16:27:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): fix broken Regexp#inspect when it
+	  is ASCII-8BIT and non-ASCII character.
+	  The length of character should be from original byte string.
+	  [ruby-core:31431]
+
+Thu Jul 22 03:02:55 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* README.EXT: fix signature of rb_ensure and rb_rescue to match
+	  implementation.
+
+Tue Jul 20 12:42:06 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (rb_getaddrinfo): according to my
+	  valgrind output this variable should be initialized beforehand.
+
+Tue Jul 20 12:50:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_flush_buffer): write and buffer operations should be
+	  monolithic.  [ruby-core:31348]
+
+Tue Jul 20 12:27:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#copy): check file name
+	  spearator boundary.  [ruby-core:31360]
+
+Mon Jul 19 09:00:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* NEWS (Kernel#instance_eval): add an incompatible change since
+	  the 1.9.1 release.  [ruby-core:31336]
+
+Fri Jul 16 12:06:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (ext-arch): prune directories start with '-'.
+
+Wed Jul 14 18:18:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regexec.c (match_at): add end point to enclen's argument.
+	  This only effect on compilinig with -DONIG_DEBUG_MATCH.
+
+Tue Jul 13 20:46:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/handle.c (rb_dlhandle_close): should not pass a dynamic
+	          string to rb_raise directly.
+
+Sun Jul 11 21:20:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT{,.ja} (rb_block_call): fixed about third/fourth
+	  arguments to the block.  based on [ruby-core:31192] by Asher
+	  Haig.  [Bug #3558]
+
+Thu Jul 22 14:30:17 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/missing.h: add prototype for ruby_close().
+
+Thu Jul 22 22:38:32 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c: add short documentation about named reference.
+	  [ruby-core:31294]
+
+Thu Jul 22 22:14:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regexec.c (onig_search): don't skip non-ANYCHARs when
+	  .* fails to match. This causes to fail matching
+	  ANYCHAR_STAR with LOOK_BEHIND. This fix is workaround
+	  and disable the optimization. [ruby-dev:41851]
+
+Thu Jul 22 22:13:48 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread_pthread.c (get_stack): fix memory leak; pthread_attr_destory
+	  must be called even when pthread_getattr_np is used.
+	  [ruby-core:31269]
+
+Wed Jul 21 12:39:15 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/cmath.rb (CMath#cbrt): cbrt should accept a negative real
+	  numbers.  [ruby-core:31234]
+
+Thu Jul 15 21:43:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* numeric.c (fix_divide): must not use rb_rational_new1 for coercion
+	  because it returns an argument itself when canonical mode is set.
+	  [ruby-core:31279]
+
+Thu Jul 15 21:38:31 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (bm_free): fix memory leak.  [ruby-core:30869] [Bug #3466]
+
+Tue Jul 13 12:04:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* missing/close.c: keep original errno.
+
+Thu Jul  8 00:15:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gem_prelude.rb: provide workaround for gem activation.  Currently,
+	  gem activation does not work by default.  Now it can be worked
+	  around by requiring "rubygems" first.  [ruby-core:29486]
+	  a patch from Evan Phoenix in [ruby-core:31096].
+
+	* lib/rubygems.rb: ditto.
+
+Sun Jul 11 15:14:03 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in ({|dist-|real-}clean-ext): fixes the previous
+	  commit. http://twitter.com/knu/status/18247078381
+
+	* tool/rmdirs: ditto.
+
+Sat Jul 10 20:03:48 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in ({|dist-|real-}clean-ext): fixes syntax 
+	  for /bin/sh on Solaris
+
+	* tool/rmdirs: ditto
+
+Thu Jul  8 15:47:34 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+        * string.c (rb_str_conv_enc_opts): fix infinite loop because
+          of ISO-2022-JP conversion with empty string.
+          patched by Brian Buchanan [ruby-core:31107]
+
+Wed Jul  7 10:26:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* missing/close.c: ignore ECONNRESET.
+	  FreeBSD wrongly sets ECONNRESET on close(2) and
+	  it causes false-negative exceptions. [ruby-dev:41778]
+
+	* configure.in: ditto.
+
+Sun Jul  4 17:13:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (swallow, prepare_getline_args, rb_io_getline_1): fix for
+	  paragraph mode reading in non-ascii-compatible encoding.
+	  [ruby-dev:41803]
+
+Sat Jul 10 11:41:54 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/psych/test_date_time.rb (TestDateTime#test_round_trip_with_offset):
+	  test for [ruby-core:31023].
+
+Mon Jul  5 12:32:01 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb (parse_string): support
+	  timezones that are not one hour off. [ruby-core:31023]
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+
+Sat Jul  3 09:47:26 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb(visit_Psych_Nodes_Scalar):
+	  teaching Psych to deserialize DateTime objects. [Bug #1390]
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb(visit_DateTime): added a
+	  method for serializing DateTime objects.
+
+	* ext/psych/lib/psych/scalar_scanner.rb(parse_time): add method for
+	  parsing times objects from a string.
+	
+	* test/psych/test_date_time.rb: tests for dumping DateTime objects.
+
+Sat Jul  3 09:13:55 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use
+	  Time#nsec to accurately serialize time objects. [ruby-core:29233]
+
+Tue Jul  6 00:34:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (thread_free): free altstack to prevent memory leak.  a patch
+	  from Tomoyuki Chikanaga in [ruby-dev:41815]. [Bug #3537]
+
+Tue Jul  6 00:29:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (NONASCII_MASK): NONASCII_MASK must be unsigned.
+	  [ruby-dev:41782]
+
+Fri Jul  2 19:07:09 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* io.c (argf_inplace_mode_set): prohibits an assignment
+	  of a tainted value. Patch by unak.
+
+	* util.c, file.c: prevents a buffer over-run on windows.
+	  Patch by unak.
+
+Tue Jun 29 19:39:59 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_method.rb (is_ruby64): check
+	  ruby binary is mswin64 or mingw64. [ruby-dev:41756]
+
+Mon Jun 28 20:32:33 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
+	  that Ruby is 32bit or 64bit binary in order to get correct offset
+	  value. [ruby-dev:41741]
+
+Mon Jun 28 21:56:14 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_fd_resize, rb_fd_copy): avoid NULL dereference upon
+	  failed realloc by using xrealloc instead of not realloc.  a patch
+	  from Jim Meyering <meyering at redhat.com> in [ruby-core:30920]
+	  [Bug #3489]
+
+Thu Jul  1 16:26:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (thread_start_func_1): don't call
+	  native_thread_init_stack(th) on cygwin to avoid the segv
+	  introduced by r27789. Cygwin's signal implementation is half
+	  baked so USE_SIGNALSTACK is not defined and it needs another
+	  treatment.
+
+Thu Jul  1 13:00:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (test-knownbug): ignore known bugs.
+
+Thu Jul  1 12:59:14 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/rubygems/test_gem_activation.rb: comment out a test for WONTFIX
+	  bug.
+
+Mon Jun 28 22:14:22 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/rdoc/test_rdoc_ri_driver.rb (TestRDocRIDriver#test_formatter):
+	  fix a test accordingly to r28455.
+
+Mon Jun 28 05:32:51 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rdoc/ri/driver.rb (RDoc::RI::Driver#formatter): should use bs
+	  format when stdout is piped.  [ruby-core:30734]
+
+Mon Jun 28 03:12:03 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bootstraptest/test_class.rb: add a test for [ruby-core:30843].
+
+Mon Jun 28 02:43:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* class.c (rb_mod_init_copy): when class is dup'ed, a metaclass of the
+	  class should be attached to the dup'ed class, not the original
+	  class.  [ruby-core:30843] [Bug #3461]
+
+Sat Jun 26 07:59:18 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
+	  that OS is Windows 32bit or Windows 64bit in order to get
+	  correct offset value.
+
+Fri Jun 25 11:45:36 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Fixing a bug that prevented CSV from parsing
+	  all multi-line fields correctly.  Patch by Rob Biedenharn.
+
+Sat Jun 26 10:08:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): no needs to copy the
+	  original ENV, since it's done in spawn automatically.
+	  [ruby-dev:41733]
+
+Fri Jun 25 10:07:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
+	  return the exit status.
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): change the
+	  environment of spawned process only.
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): get rid of possible
+	  deadlock.
+
+Wed Jun 23 23:49:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (str_is_number): renamed from str_isnumber to
+	  avoid confusion to str_isnumber in ext/socket/getaddrinfo.c.
+
+Wed Jun 23 21:32:08 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64
+	  registry entry at first. [ruby-dev:41674] [Bug #3464]
+
+Thu Jul  1 04:21:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c: don't use __P.
+
+Wed Jun 30 07:29:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (test_script_from_stdin): by using
+	  a pipe, get rid of not-well-defined behavior after the child
+	  process terminated in pty.
+
+Wed Jun 30 02:37:30 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* thread_pthread.c (get_stack): use pthread_getthrds_np() for AIX.
+
+	* configure.in: ditto.
+
+Wed Jun 23 21:17:32 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for
+	  getaddrinfo problem on Mac OS X Snow Leopard.  [ruby-core:29427]
+	  patch by Wataru Kimura.  [ruby-core:30842]
+
+Wed Jun 23 06:44:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (fchown): need to check.  a patch by Eric Wong
+	  at [ruby-core:30818].
+
+	* io.c (argf_next_argv): check for setting owner/group.
+
+Tue Jun 22 21:33:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/optparse/test_summary.rb: fixed superclass so that it run
+	  solely.
+
+Sat Jun 19 03:35:58 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the
+	  exception message when attempting to load an unknown class.  Thanks
+	  nobu! [ruby-dev:41399]
+
+	* test/psych/test_psych.rb: test for the exception message
+
+Fri Jun 18 01:50:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* object.c: Object#public_methods, private_methods, etc. returns
+	  method ids that belong to the class or the singleton class(es) of
+	  the object.  [ruby-dev:41613]
+
+	* class.c: on the other hand, Module#public_instance_methods, etc.
+	  returns method ids that belong to the module itself (even if the
+	  module is singleton, it does not return method ids of super
+	  class(es); see [ruby-core:28837]).
+
+Tue Jun 29 21:16:05 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* ext/stringio/stringio.c (strio_write): add RB_GC_GUARD.
+
+Tue Jun 29 14:41:07 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_realpath_internal, realpath_rec): skip UNC share root
+	  on DOSISH platforms.
+	  http://pc12.2ch.net/test/read.cgi/tech/1272248179/600
+
+Tue Jun 29 06:41:01 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: stop creating a dummy Tcl/Tk interpreter (fix
+	  [ruby-core:30358]). And hide a root window before starting eventloop.
+
+	* ext/tk/extconf.rb: use tclConfig.sh/tkConfig.sh when frameworks
+	  are enabled on MacOS X.
+
+	* ext/tk/stubs.c: dirty hack for frameworks and stubs on MacOS X.
+
+Tue Jun 29 01:44:33 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* ext/dl/lib/dl/func.rb (call): don't overwrite original arguments
+	  to defend from GC.
+	* test/dl/test_func.rb (test_string): add test for above.
+
+Tue Jun 29 01:41:42 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent
+	  RB_GC_GUARD_PTR being removed by optimization.
+
+Tue Jun 29 01:22:08 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi
+	  header files. Thanks Yugui! [ruby-core:30917]
+
+Sun Jun 27 23:31:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h, io.c: reverted r21709.
+
+	* ruby.c (load_file_internal): nothing to read if EOF reached
+	  while reading shebang.  [ruby-core:30910]
+
+Sun Jun 27 13:25:07 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (simple_sendfile): don't try to send data more than SSIZE_MAX
+	  with single sendfile call..
+	  based on the patch by Eric Wong.  [ruby-core:30908]
+
+Sun Jun 27 10:41:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/require_paths_builder.rb (write_require_paths_file_if_needed):
+	  no reason that bin directory should be included in $LOAD_PATH.
+	  it is for executable files, but not libraries.  [ruby-core:25936]
+
+Sat Jun 26 11:56:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (clear-installed-list): put redirection before set
+	  command, since it seems to be handled by nmake in special way.
+	  [ruby-dev:41711]
+
+Fri Jun 25 06:24:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/un.rb (httpd): MaxClients also should be integer.
+	  [ruby-dev:41724] [Bug #3477]
+
+	* lib/un.rb (setup): fix of word splitting.  [ruby-dev:41723]
+	  [Bug #3476]
+
+Wed Jun 16 01:38:40 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
+	  On Debian/lenny, which is a "supported" platform, ffi.h is installed
+	  in /usr/include/i486-linux-gnu/.  This causes build error when using
+	  gcc whose target is not i486-linux-gnu.
+
+Tue Jun 15 17:14:58 2010  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: De Morgan's laws.
+
+Tue Jun 15 12:09:00 2010  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
+
+Wed Jun 16 00:04:38 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_io.rb (safe_4): does not use Timeout because
+	  Timeout.timeout uses Thread#kill which raises SecurityError when
+	  $SAFE == 4.  based on a patch from Tomoyuki Chikanaga.
+	  [ruby-dev:41484]
+
+	* test/ruby/test_io.rb (test_print_separators): use pipe (test helper
+	  method) instead of IO.pipe.  [ruby-dev:41484]
+
+Mon Jun 14 04:03:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/fiddle/closure.c (dealloc): refix workaround r28300.
+	  don't use ffi_closure_alloc, ffi_prep_closure_loc and
+	  ffi_closure_free on MACOSX and __linux__.
+	  [ruby-dev:41483] [ruby-dev:41214]
+
+Sun Jun 13 15:46:07 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rubyoptions.rb: add a simple test for __END__ and
+	  DATA.
+
+Fri Jun 11 22:59:31 2010  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/missing.h (isnan): fix compilation error on OpenBSD.
+
+Thu Jun 24 05:44:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (struct dump_arg, struct load_arg): merge taint and
+	  untrust flags into infection as bit flags.
+
+	* marshal.c (w_nbyte, clear_dump_arg): infect the buffer as soon
+	  as appending, because it might have been finalized already at
+	  exit.  based on a patch by Tomoyuki Chikanaga
+	  at [ruby-dev:41672].  [Bug #3463]
+
+Wed Jun 23 17:12:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* NEWS (ptr): new method and deprecated methods.  [ruby-dev:41681]
+
+	* ext/pty/{README,README.ja}: ditto.
+
+	* ext/pty/pty.c (pty_check): add rdoc.
+
+Wed Jun 23 12:44:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_regexp.rb (test_dup_warn): read in UTF-8
+	  encoding regardless environment.
+
+	* test/ruby/envutil.rb (invoke_ruby): add encoding option.
+
+Tue Jun 22 23:10:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (num_exact): fix for mathn.  [ruby-dev:41599]
+
+
+Tue Jun 22 22:00:06 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb: suppress warnings.
+
+Tue Jun 22 13:26:47 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/delegate.rb: Forward #trust, #untrust, #taint and #untaint
+	  to both the delegator and __getobj__ [ruby-core:26138]
+
+Tue Jun 22 01:38:23 2010  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
+	  many arguments. [ruby-dev:41481]
+
+	* test/drb/test_drb.rb: ditto.
+
+	* test/drb/drbtest.rb: ditto.
+
+Tue Jun 22 00:57:57 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (prevent_directory_traversal): apply filesystem encoding to path
+	  only during calling File.expand_path.  [ruby-dev:41423]
+
+Mon Jun 21 23:41:08 2010  wanabe  <s.wanabe@gmail.com>
+
+	* eval_error.c (error_print): clear raised_flag while error-printing
+	  to avoid hang. [ruby-core:27608]
+
+	* test/ruby/test_beginendblock.rb (test_endblock_raise): add test for
+	  above.
+
+Fri Jun 18 23:08:18 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in (distclean-ext): removes directories for extensions
+	  correctly.
+
+	* common.mk (realclean-local): removes id.h too.
+
+Fri Jun 18 01:33:21 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* enc/Makefile.in (realclean): has been missing. necessary
+	  for make realclean-enc.
+
+Fri Jun 18 01:12:33 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in (RMDIRS): reverts r27011 because it causes bothersome
+	  messages on make clean.
+
+Thu Jun 17 18:55:01 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_str_encode_ospath): when the encoding of the parameter
+	  is ASCII-8BIT, should recognize as filesystem encoding, and convert
+	  to UTF-8 on Windows.
+
+	* file.c (realpath_rec): should convert to ospath encoding before
+	  calling lstat().
+
+	* file.c (rb_realpath_internal): resolved string should take over
+	  the encoding of base string.
+
+	* transcode.c (rb_str_encode): should return new string always.
+	  fixed #3444.
+
+Thu Jun 17 18:22:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/digest/sha2/lib/sha2.rb: revert r28347.  It's my mistake.
+
+Thu Jun 17 17:32:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so",
+	  for the filename extension part of native libraries.
+
+Thu Jun 17 17:30:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/digest/sha2/extconf.rb: remove a check for uint64_t.
+
+Wed Jun 16 18:35:20 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest: Work around a build problem with VC++ 2010, likely
+	  due to a bug of its cl.exe. [Bug #3231]
+
+Wed Jun 16 15:44:59 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c (rb_bug): existance of _set_abort_behavior() depends on
+	  runtime version, not compiler version.
+
+Mon Jun 14 22:36:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS 
+	  for Windows.
+
+	* test/socket/test_nonblock.rb (test_sendmsg_nonblock_error): ditto.
+
+	  [ruby-dev:41597] reported by Masaya Tarui.
+
+Sun Jun 13 04:27:55 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/delegate.rb: Delegate !=, eql? and hash [ruby-core:26139]
+
+Sun Jun 13 02:17:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf8_mac.trans (buf_apply): fix for patterns
+	  whose result is 2 bytes. [ruby-core:30751]
+
+Sun Jun 13 01:40:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (rb_localtime_r2): fix mixed declarations and code.
+
+Sun Jun 13 01:37:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/dl/lib/dl.rb: don't require when already loaded.
+
+Sun Jun 13 01:37:08 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/fiddle/closure.c (dealloc): workaround fix for libffi's
+	  ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214]
+
+Fri Jun 11 23:21:35 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (init_leap_second_info): check the result of
+	  gmtime_with_leapsecond.
+
+Fri Jun 11 22:39:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rubygems/install_update_options.rb
+	  (Gem::InstallUpdateOptions#add_install_update_options): deprecate
+	  --test option which has not worked.  [ruby-core:21714]
+	
+	* test/rubygems/test_gem_command_manager.rb: ditto.
+
+Fri Jun 11 22:36:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* README: add a note about linking a library whose license is not
+	  compatible with Ruby License.  [ruby-core:30662]
+
+Sun Jun  6 19:55:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_product): clear uninitialized elements in temporary
+	  array.
+
+Sat Jun  5 06:20:57 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* dir.c: Clarification of what '*' matches.  Patch by John Wells
+	  <john.wells at greatworx.com>
+
+Thu Jun  3 00:58:45 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/dl/lib/dl/cparser.rb (parse_ctype): add backwards compatibility
+	  by supporting "uint" types in the c parser. [ruby-core:29750]
+	* test/dl/test_cparser.rb: adding a test for "uint" changes.
+
+Wed Jun  2 11:40:02 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): should consider block on stack,
+	  if block argument is passed.  [ruby-core:30534]
+
+	* parse.c (arg_concat_gen): should append to nd_head, not to
+	  nd_iter for NODE_BLOCK_PASS.
+
+Fri Jun 11 07:34:25 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): test the result of LOCALTIME.
+
+Mon May 31 15:07:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): Refix r28102: this breaks
+	  r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]
+
+Mon May 31 02:17:54 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (defined): respond_to_missing? may not be available
+	  (for BasicObject instances).
+
+Sun May 30 21:48:07 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/tempfile.rb (Tempfile#unlink): leave @data.  Assigning nil to
+	  @data caused double closing error of the same IO in finalizer.  a
+	  patch from Simon Nicholls.  [ruby-core:29395]
+
+Sun May 30 16:54:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* file.c (rb_file_directory_p): update rdoc.  a patch from Ilkka
+	  Laukkanen.  [ruby-core:30016]
+
+Sat Jun  5 16:39:13 2010  Tanaka Akira  <akr@fsij.org>
+
+	* .gdbinit (rp): show type name for RTypedData.
+
+Sat Jun  5 10:03:31 2010  Tanaka Akira  <akr@fsij.org>
+
+	* .gdbinit (rp): detect and show RTypedData.
+
+Fri May 28 20:35:21 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (blocking_region_begin): avoid RUBY_VM_CHECK_INTS()
+	call during GVL state transition. [Bug#3354] [ruby-dev:41435]
+
+Fri Jun 11 00:42:45 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (rb_localtime_r2): fix localtime overflow check.
+
+Thu Jun 10 23:05:44 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (rb_localtime_r2): refine localtime overflow check for
+	  FreeBSD 6.4.
+
+Thu Jun 10 21:35:27 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): always outerpolate from past.
+	  [ruby-core:30672] reported by Benoit Daloze.
+	  backport r28238 from trunk.
+
+	* time.c (calc_tm_yday): extracted from timegmw_noleapsecond.
+	  backport r28236 from trunk.
+
+Thu Jun 10 10:06:25 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_putc): documentation updated to mention putc would
+	  not work well with multi-byte characters.  [ruby-core:30697]
+
+	* io.c (rb_f_putc): ditto.
+
+Tue Jun  8 22:14:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_systmpdir): moved from ext/tmpdir.
+
+	* ext/etc/etc.c (etc_sysconfdir): added.
+
+	* lib/rubygems/config_file.rb, lib/tmpdir.rb: use etc.
+
+Tue Jun  8 06:27:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gem_prelude.rb: load full rubygems at LoadError for activation
+	  check.  [ruby-core:29486]
+
+Tue Jun  8 06:04:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (parse_mode_enc): set set_by_bom bit.  [ruby-core:30641]
+
+Sun Jun  6 23:35:12 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* gc.c (heaps_slot, assign_heap_slot, gc_sweep): skip sweep if
+	  heap_slot's status is pre-free phase.  [ruby-dev:41543]
+
+Sun Jun  6 22:37:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_buf_cat_escaped_char): get rid of buffer
+	  overflow on platforms int is bigger than 32bit, and warnings.
+
+Sun Jun  6 10:44:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_product): need to set the length in order to get
+	  the entries marked.  [ruby-dev:41540]
+
+Sun Jun  6 08:26:01 2010  Tanaka Akira  <akr@fsij.org>
+
+	* vm.c (Init_BareVM): call Init_native_thread here.
+
+	* thread.c (Init_Thread): don't call Init_native_thread.
+
+	* thread_pthread.c (Init_native_thread): exported.
+
+	* thread_win32.c (Init_native_thread): ditto.
+
+	[ruby-dev:41536]
+
+Sun Jun  6 08:21:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* NEWS: Enumerable#join has been reverted.  [ruby-core:30604]
+
+Sun Jun  6 02:56:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_unicode_p): check the encoding is Unicode
+	  or not by the name; not function's pointer. [ruby-dev:41479]
+
+Sat Jun  5 23:15:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): ASCII incompatible strings
+	  must always escape or converted.
+
+	* re.c (rb_reg_expr_str): use rb_str_buf_cat_escaped_char
+	  when resenc is given: for Regexp#inspect or error message.
+
+	* re.c (rb_reg_desc): add 'n' for ENCODING_NONE.
+
+Sat Jun  5 23:15:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (sym_inspect): Escape when the symbol is not
+	  resulted encoding and not ascii_only. It had escaped
+	  ascii-incompatible string, but it is wrong.
+
+Sat Jun  5 23:15:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_buf_cat_escaped_char): defined.
+	  Splited from rb_str_inspect.
+
+Sat Jun  5 23:14:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): inspect as ASCII when the codepoint
+	  of a character in Unicode string is ASCII printable one.
+
+Sat Jun  5 15:59:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options, load_file_internal): $0 seen from
+	  required libraries by -r option should be the main script.
+	  [ruby-core:23717]
+
+Sat Jun  5 15:15:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): support for child
+	  process env.
+
+Sat Jun  5 14:11:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb (test_exception_during_shutdown):
+	  need to raise always.
+
+Sat Jun  5 13:10:47 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (eql?, ==, minor): Fix bugs when comparing/returning
+	  some empty matrices.
+
+Sat Jun  5 11:00:48 2010  Tanaka Akira  <akr@fsij.org>
+
+	* error.c (rb_name_err_mesg_new): guard mesg, recv and method.
+	  The problem in [ruby-dev:41464] is caused because mesg is collected.
+
+Sat Jun  5 08:30:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_f_test): 'W' should test writable by real uid/git,
+	  not world writable.   [ruby-core:30587]
+
+Fri Jun  4 10:46:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_inspect): should taint the result.
+	  [ruby-dev:41533]
+
+Thu Jun  3 23:34:55 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb: Emit a deprecation warning in
+	  verbose mode and add a caution to the overview section of the
+	  document. [ruby-dev:41525]
+
+Thu Jun  3 19:33:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_inspect): suppress warnings by
+	  rb_sprintf.
+
+	* ext/dl/cptr.c (rb_dlptr_s_malloc): suppress warnings.
+
+Thu Jun  3 18:58:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (ruby_init_ext): statically linked extensions have no
+	  real path.  [ruby-dev:41526]
+
+	* vm.c (rb_vm_call_cfunc): add filepath argument.
+
+Thu Jun  3 18:17:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rake/test_win32.rb (Rake::TestWin32): update tests.
+	  [ruby-core:30309]
+
+	* test/io/nonblock/test_flush.rb (test_flush): try pipe and
+	  socketpair.  [ruby-dev:41517]
+
+Thu Jun  3 09:39:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/dl.h (DLSTACK_TYPE): type of stack is same as VALUE.
+	  reported by sakiyama shin in [ruby-dev:41514]
+
+Thu Jun  3 06:30:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_path.rb (test_path): workaround for drive
+	  letter.
+
+	* test/ruby/test_path.rb (test_path): get rid of blocking on
+	  access to non-existent host.
+
+Tue Jun  1 23:22:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (unescape_nonascii): \P{FOO} is also Unicode property in
+	  regexp. [ruby-core:30540]
+
+Tue Jun  1 01:14:31 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* io.c (pipe_open): add RB_GC_GUARD.
+	  This caused failure when test/ruby/test_argf.rb is executed with
+	  GC.stress = true in mswin32_90
+
+Mon May 31 19:25:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regparse.c (onig_syntax_warn): do not use external strings as
+	  printf format.
+
+Mon May 31 18:22:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line
+	  always regardless of ruby.
+
+Mon May 31 04:03:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): check if expanded dname encoding is
+	  compatible with fname, not just copying.  [ruby-core:30516]
+
+	* test/ruby/test_beginendblock.rb (test_endblockwarn): needs
+	  encoding comment.
+
+Mon May 31 01:28:58 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/delegate: Delegator: combine (public|protected) methods with
+	  those of the delegated object. [ruby-core:27224]
+	  DelegateClass: combine (public|protected) instance methods
+	  with those of the delegated superclass.
+
+Sun May 30 22:14:14 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/set.rb (keep_if, select!): New methods [ruby-core:29749]
+
+Sun May 30 19:17:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: updated to b856dd07.
+	  this cleans warnings.
+
+Sun May 30 18:49:45 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/generator/template/darkfish/classpage.rhtml:
+	  fix encoding value of XML declaration. [ruby-dev:41452]
+
+Sun May 30 03:40:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_utf8, parser_tokadd_string): allow NUL
+	  containing symbol literals, as well as String#to_sym.
+	  [ruby-dev:41447]
+
+Sun May 30 02:21:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
+	  This caused failure when test/csv is executed with GC.stress = true.
+
+Sun May 30 00:02:39 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gc.c (force_chain_object, rb_objspace_call_finalizer): delete
+	  finalizer entry after corresponding finalizer is executed.
+	  This caused SEGV when test/cgi is executed with GC.stress = true.
+
+Sat May 29 23:30:33 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (str_replace_shared): change embedded state atomically.
+	  [ruby-core:29953] [ruby-dev:41456]
+
+Fri May 28 00:32:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* insns.def (invokesuper): check consistency between class of self and
+	  class of method being invoked by super.  This is temporary measure
+	  for YARV.  See [ruby-core:30313] in detail.  See [ruby-dev:40959]
+	  [ruby-dev:39772] [ruby-core:27000] [ruby-core:27230]
+
+	* vm_insnhelper.c (vm_search_superclass): ditto.
+
+Thu May 27 12:42:23 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* LGPL: Removed.  We no longer have LGPL'd source files in our
+	  tree.
+
+Wed May 26 18:40:23 2010  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* test/rinda/test_rinda.rb (TupleSpaceTest, TupleSpaceProxyTest):
+	  kill a used thread at teardown.  [ruby-dev:41397]
+
+Wed May 26 11:50:09 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* marshal.c (Init_marshal): document marshal_dump and marshal_load.
+
+Mon May 24 23:04:41 2010  Tanaka Akira  <akr@fsij.org>
+
+	* error.c: fix wrong exception class name in rdoc.
+
+Sat May 29 13:55:22 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encindex): avoid infinite require
+	  loop. [ruby-core:30467]
+
+Sat May 29 12:05:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc#read_file_contents): take care of BOM.
+	  [ruby-dev:41452]
+
+Sat May 29 09:34:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb: fix for --disable-gems.
+
+Fri May 28 18:39:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_inspect): escape ASCII-compatible strings.
+
+	* string.c (rb_str_inspect): escape ASCII-compatible strings.
+
+Fri May 28 17:34:48 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* array.c (rb_ary_product): Use tmpary instead, to ensure marking
+	  arrays by GC.
+
+Fri May 28 11:58:42 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* array.c (rb_ary_product): Do not rely on GC, t0 should be
+	  checked explicitly.
+
+Fri May 28 10:40:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (checking_for): ignore toplevel.
+
+Fri May 28 00:47:16 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* error.c (rb_bug): suppress the error report dialog if report_bug()
+	  is finished successfly.
+
+Thu May 27 23:52:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_filesystem_encindex): defined.
+
+	* include/ruby/encoding.h (rb_locale_encindex): ditto.
+
+	* encoding.c (rb_filesystem_encindex): remove static.
+
+	* encoding.c (rb_locale_encindex): ditto.
+
+Thu May 27 23:51:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_home_dir): set filesystem encoding.
+
+Thu May 27 23:51:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): set encoding as the same of fname
+	  when _result_ is not filesystem encoding. [ruby-dev:41429]
+
+Thu May 27 23:51:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): use rb_enc_associate_index and
+	  rb_filesystem_encindex. Strings related FileSystem should
+	  have filesystem_encoding.
+
+	* file.c (SET_EXTERNAL_ENCODING): removed.
+
+Thu May 27 22:39:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): call ReadFile() with len = 0 before
+	  reading really on console, because the first ReadFile() call after
+	  PeekConsoleInput() always returns broken data. (Windows's bug).
+	  [ruby-core:29018]
+
+Wed May 26 20:19:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_rand): add the result of random to the
+	  beginning of range, not the opposite.  [ruby-dev:41415]
+
+Wed May 26 19:55:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (file_expand_path): revert a part of r22392. it's commit miss.
+
+Wed May 26 12:08:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_rand): subtraction method of non-numeric can
+	  return Float.  [ruby-dev:41410]
+
+Wed May 26 10:35:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_large_fd_select): needed on mingw, even
+	  though fd_mask is not available.  [ruby-core:30401]
+
+Wed May 26 00:13:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (add_code_range_to_buf0): fix false negative
+	  warning when given range is just before previous range.
+	  [ruby-dev:41406]
+
+Tue May 25 16:37:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el (ruby-style-version): take revision if
+	  keyword is expanded. [ruby-dev:41408]
+
+Tue May 25 13:26:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/vm.h, include/ruby/encoding.h: add external
+	  linkage.
+
+Tue May 25 01:46:49 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_f_caller): update rdoc.  a patch from Nobuhiro IMAI
+	  <nov at yo.rim.or.jp> in [ruby-dev:41387].
+
+Mon May 24 19:00:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (warn_balanced, parser_yylex): no warnings after closing
+	  parens.
+
+Mon May 24 08:16:02 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_f_spawn): use correct command name for the error
+	  message.  [ruby-dev:41395]
+
+Fri May 21 01:06:05 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (subtract_tv): if the rest is zero, should finish waiting
+	  immediately.
+
+	* win32/win32.c (subtract): ditto.
+	  based on a patch from Roger Pack in [ruby-core:27957].
+
+Thu May 20 22:49:04 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* re.c (rb_reg_s_union_m): update rdoc.  [ruby-dev:41354]
+
+Thu May 20 20:47:46 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): raise NoMethodError
+	  when COM method is not found. [ruby-core:30160] [Bug #3277]
+
+	* test/win32ole/test_win32ole.rb (test_no_method_error): ditto.
+
+Wed May 19 23:36:57 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: [ruby-dev:41334] [Bug #3307] invalid result
+	  on searching tcl.h/tk.h. Thanks, Masaya Tarui.
+
+Wed May 19 23:19:30 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP
+	  object only when it is not closed.  [ruby-dev:41350]
+
+Sun May  9 08:24:24 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): terminates @receiver_thread even if
+	  @sock.shutdown raises an exception.  [ruby-dev:34881]
+
+Sun May 16 22:17:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (setup_exception): let SystemStackError#backtrace return an
+	  single element array instead of string itself.  [ruby-core:30196]
+
+Sun May 23 17:29:41 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (capi): uses a timestamp file to get rid of
+	  generating twice.
+
+Sun May 23 17:48:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/x509-internal.rb, lib/forwardable.rb,
+	  lib/irb/cmd/fork.rb, lib/mutex_m.rb,
+	  lib/shell/process-controller.rb, lib/sync.rb, object.c:
+	  suppress warnings patched by Benoit Daloze at [ruby-core:30366].
+
+	* parse.y (warn_balanced): no warning for singleton class.
+	  [ruby-core:30366]
+
+Sun May 23 17:16:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
+	  warnings with -Wconversion.
+
+Sat May 22 06:46:45 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c: revert FIBER_USE_NATIVE feature.
+	i.e. r27635, r27643, r27646, r27682, r27701
+
+Fri May 21 23:46:43 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): merged from trunk (r27922).
+	  raise NoMethodError when COM method is not found.
+
+	* test/win32ole/test_win32ole.rb (test_no_method_error): ditto.
+
+Fri May 21 19:11:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_convert, rb_nkf_guess): check too huge
+	  string.
+
+Thu May 20 22:19:37 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_f_caller): update rdoc.  a patch from Nobuhiro IMAI
+	  <nov at yo.rim.or.jp> in [ruby-dev:41348].
+
+Thu May 20 22:17:24 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (vm_backtrace_each): now takes an init function to distinguish
+	  an empty stack from out of stack.  [ruby-dev:41366]
+
+	* vm_eval.c (print_backtrace, rb_thread_backtrace): ditto.
+
+Wed May 19 22:48:06 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: mswin/mingw ruby has socketpair(), but it's
+	  not exist as such name in ruby static library, so mkmf.rb cannot
+	  find it.
+
+Wed May 19 20:09:38 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_f_caller): return [] instead of nil when the function
+	  is called on toplevel.  [ruby-dev:41348]
+
+Wed May 19 20:06:11 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* iseq_compile_each (NODE_DEFINED): put nil first to fix stack
+	  consistency.  [ruby-core:30293]
+	  Now, lfinish[0] of defined_expr seems not to be used.  Refactoring
+	  may be needed.
+
+Wed May 19 17:22:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* version.h (RUBY_VERSION_TEENY): revert to API version 1.9.1.
+
+Wed May 19 10:46:05 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (argv_size): merged into join_argv() to maintain the
+	  agreement with it.  removed code has a calclulation bug.
+	  fixed [Bug#2388]
+
+	* win32/win32.c (join_argv): calc and return the length of joined
+	  argv.
+	  the cause of the original bug was clarified by Masaya TARUI
+	  <tarui AT prx.jp> and the solution was suggested by him, too.
+
+Mon May 17 11:09:58 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#entries): returns pathname in
+	  UTF-8 on Windows to allow FileUtils accessing all pathnames
+	  internally.
+
+Sun May 16 22:21:32 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (mnew): initialize a field.  a patch from Takahiro Kambe.
+	  [ruby-dev:41312]
+
+Sun May 16 17:16:09 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (proc_binding): don't propagative filename and line_no of
+	  binding that is created from C level.  [ruby-dev:41322]
+
+	* vm_eval.c (eval_string_with_cref): ditto.
+
+Sun May 16 13:55:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_loaderror): use locale string, not ascii-8bit.
+
+Sun May 16 21:14:04 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test):
+	  fixes "NoMethodError: undefined method `[]=' for nil:NilClass"
+
+Fri May 14 01:17:10 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_core.c (rb_thread_struct): add a field for sigaltstack.
+
+	* thread_pthread.c (thread_start_func_1): initialize machine stack
+	  information.
+
+	* thread.c (thread_start_func_2): set sigaltstack for each sub thread.
+	  [ruby-core:24540] [ruby-core:30207]
+
+Thu May 13 07:37:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/sdbm/_sdbm.c: include unistd.h before sdbm.h for off_t.
+	  fix compilation problem on FreeBSD 6.4.
+
+Wed May 12 11:39:10 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: test all IPPROTO_* constants for recent Win32
+	  SDK.
+
+Tue May 11 23:07:22 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test IPPROTO_IP and IPPROTO_IPV6 constants.
+
+	* ext/socket/mkconstants.rb: define macros for enum.
+
+	  [ruby-dev:38849]
+
+Tue May 11 21:53:18 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/rake/test_task_arguments.rb: makes ENV empty during tests
+	  because ENV may change the behavior of Rake::TaskArguments.
+	  [ruby-core:29984]
+
+Tue May 11 09:57:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (rb_vm_get_sourceline): add prototype.
+
+Tue May 11 09:53:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/psych/parser.c (PSYCH_TRANSCODE): get rid of bare use of gcc
+	  extension.
+
+Mon May 10 02:58:33 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_compile_each), vm_insnhelper.c (vm_invoke_block,
+	  vm_throw): allow "return" and "yield" even in singleton class
+	  definition.  based on a patch from wanabe <s.wanabe AT gmail.com>
+	  for "return".  [ruby-core:21379] [ruby-dev:40975]
+
+	* insns.def (defineclass): ditto (straightforwardly push block ptr,
+	  instead of dfp ptr with special flag).
+
+	* vm_core.h (RUBY_VM_CLASS_SPECIAL_P): ditto (no longer needed).
+
+	* proc.c (proc_new): ditto (remove handling for special flag).
+
+	* bootstraptest/test_jump.rb: add tests for above.
+
+Sun May 16 14:41:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (dln_find.o): fix dependency.
+
+Sun May  9 23:07:53 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (proc_dup): copy blockprocval.  proc_dup is used by
+	  define_method, which made blockprocval be GC'ed mistakenly.
+	  [ruby-core:30023]
+
+Sun May 16 14:55:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (dln_find.o): fix dependency.
+
+Tue May 11 01:20:43 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): Return strings encoded as
+	  Encoding.default_internal if set.
+
+Mon May 10 03:36:56 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (eval_string_with_cref): propagative filename and line_no
+	  of binding.  [ruby-dev:38767] [ruby-core:28307]
+
+	* vm_core.h (rb_binding_t), proc.c: add filename and line_no fields to
+	  preserve them.
+
+Mon May 10 02:29:51 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (fiber_switch): raise FiberError when returning to dead
+	  fiber.  [ruby-dev:40833]
+
+Sun May 16 11:39:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/missing.h (signbit): add missing prototype.
+
+Sun May 16 10:49:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
+	  a patch by Masaya TARUI <tarui AT prx.jp>.
+
+Sun May 16 02:23:00 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* configure.in: can not load libruby.so if gcc is used with
+	  --enable-shared on AIX.
+
+Sat May 15 17:16:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
+	  errno is not set.  [ruby-dev:41317]
+
+Thu May 13 18:20:16 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (swallow): should use more_char() instead of fill_cbuf().
+	  suggested by akr.
+
+Thu May 13 13:09:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_get_sourceline): moved from eval_intern.h for
+	  vm_dump.c.
+
+Thu May 13 13:04:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (swallow): support text mode and UTF-16/32 as internal encoding.
+	  [Bug #1576]
+
+	* io.c (io_shift_cbuf): read and throw it away when str is NULL.
+
+Wed May 12 16:43:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_to_s): fixed broken output including nuls.
+
+Wed May 12 16:34:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (rb_vm_get_sourceline): add prototype.
+
+Wed May 12 16:25:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_to_s): exponent needs 2 digits.
+
+Mon May 10 06:59:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (rdoc): rdoc should depend main. Moreover when XRUBY
+	  is miniruby, it can run after miniruby is built.
+
+Tue May 11 15:14:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_8.c: Add new alias UTF-8-HFS for UTF8-MAC.
+	  http://www.gnu.org/software/emacs/NEWS.23.2
+
+Wed May 12 09:21:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_m): fix wrong index for the lang
+	  option's value 'N'. reported by Masaya TARUI via IRC.
+
+Wed May 12 16:02:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_to_s): fill lower zeros.
+
+Wed May 12 15:50:20 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/generator/ri.rb (generate): should load existing cache
+	  before generating it.
+
+Wed May 12 15:37:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_to_s): make minimum string representation.
+	  [ruby-core:30145]
+
+Wed May 12 15:04:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (BigMath#log): improved
+	  precision and performance. [ruby-dev:41295]
+
+Tue May 11 14:26:00 2010  Kenta Murata <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (atan),
+	  test/bigdecimal/test_bigmath.rb (test_atan): explicitly specify
+	  the precision for calculating a reciprocal number of an argument.
+	  [Bug #3267]
+
+Tue May 11 14:10:36 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (rb_big_abs_find_minbit): get rid of a warning of VC.
+
+Tue May 11 14:09:21 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_has_cancel_io): new
+	  function.
+
+	* io.c (WAIT_FD_IN_WIN32): check only when it's not cancelable.
+
+Tue May 11 11:49:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/sdbm/sdbm.h (DBM): large file support on win32.
+	  [ruby-core:23039]
+
+	* ext/sdbm/depend: objects depend on sdbm.h.
+
+Mon May 10 23:50:19 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_unpack): add a missing break.
+
+Sun May  9 23:53:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_GC_GUARD_PTR): get rid of removal by
+	  optimization.
+
+Sun May  9 16:28:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (fiber_initialize_machine_stack_context): try to release
+	  unnecessary fibers and retry to create.  based on a patch from
+	  masaya tarui at [ruby-dev:41230].
+
+Sun May  9 08:32:56 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/generator/generator.c (fbuffer_inc_capa):
+	  fix tha use of REALLOC_N. [ruby-dev:41227]
+
+Sun May  9 09:15:03 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: use IPv4 for
+	  test_imaps_post_connection_check.  [ruby-dev:41189]
+
+Sun May  9 02:57:02 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
+	  yet. [ruby-core:30095]
+
+Sun May  9 09:30:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.
+
+	* ext/json/{generator,parser}/depend: added.
+
+Sun May  9 05:44:59 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* include/ruby/ruby.h (rb_intern): fix compile error.
+
+Sun May  9 02:37:33 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* io.c (nogvl_copy_stream_sendfile): mixed decls not allowed.
+
+	* include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
+	  arguments.
+
+Sun May  9 01:15:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (stackgrowdirection): removed duplicated code, use
+	  STACK_UPPER macro instead.
+
+	* gc.h (STACK_DIR_UPPER): moved from thread_pthread.c.
+
+Sun May  9 00:35:56 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/dl/test_base.rb (libc_so, libm_so): supports solaris.
+
+Sun May  9 00:27:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_aset): fixed argument type.
+
+Sat May  8 19:03:31 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/default.mspec (config): . is no longer in $:.
+
+Sat May  8 13:48:31 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c (rb_ary_fetch, rb_ary_splice, rb_ary_store): Improve
+	  IndexError messages [ruby-core:28394]
+
+	* hash.c (rb_hash_fetch_m): Improve KeyError message
+
+Sat May  8 11:07:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpAlloc): ensure buf does not get
+	  collected.  based on a patch masaya tarui at [ruby-dev:41213].
+
+Sat May  8 10:03:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (BasicSocket#connect_address): MacOS X 10.6
+	  returns "::ffff:a.b.c.d" for IPv4-mapped IPv6 address.
+	  [ruby-dev:41215] patch by Tomoyuki Chikanaga.
+
+Fri May  7 11:30:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (install-man): install mdocs directly without
+	  temporary files.  [ruby-dev:41204]
+
+Fri May  7 09:16:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/extconf.rb (get_tclConfig_dirs): glob with EXEEXT.
+
+	* ext/tk/extconf.rb (search_tclConfig): fixed typo.
+
+Fri May  7 06:45:28 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: search directories on PATH, only if containing
+	  tclsh or wish command (probably right fix for [ruby-core:30010]).
+
+Fri May  7 03:40:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpCtoV): fix to check overflow.
+
+Thu May  6 22:19:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* cont.c: define FIBER_USE_NATIVE only when _WIN32_WINNT >= 0x0400
+	  on Windows because Fiber APIs are supported only such building
+	  (and running) environments.
+	  [ruby-dev:41192]
+
+Thu May  6 19:13:43 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/openssl/test_ec.rb: added test_dsa_sign_asn1_FIPS186_3. dgst is
+	  truncated with ec_key.group.order.size after openssl 0.9.8m for
+	  FIPS 186-3 compliance.
+
+	  WARNING: ruby-openssl aims to wrap an OpenSSL so when you're using
+	  openssl 0.9.8l or earlier version, EC.dsa_sign_asn1 raises
+	  OpenSSL::PKey::ECError as before and EC.dsa_verify_asn1 just returns
+	  false when you pass dgst longer than expected (no truncation
+	  performed).
+
+	* ext/openssl/ossl_pkey_ec.c: rdoc typo fixed.
+
+Thu May  6 18:12:43 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (fiber_setcontext): Fix last commit.
+
+Thu May  6 17:16:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (rb_localtime_r2): get rid of infinite loop bug of
+	  localtime() on x86_64-darwin.  [ruby-core:30031]
+
+Thu May  6 15:56:12 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/*: Adding fiddle library to wrap libffi
+	* test/fiddle/*: testing fiddle extension
+	* ext/dl/lib/dl.rb: Requiring fiddle if it is available
+	* ext/dl/lib/dl/callback.rb: using Fiddle if it is available
+	* ext/dl/lib/dl/func.rb: ditto
+
+Thu May  6 15:04:37 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_match_m): add description about optional
+	  position parameter. [ruby-list:47064]
+	  patched by KISHIMOTO, Makoto <ksmakoto AT dd.iij4u.or.jp>
+
+Thu May  6 14:12:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb: test RUBY_PLATFORM for loading tmpdir.so to avoid
+	  LoadError.
+
+Thu May  6 12:41:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: add rationalize methods of Complex, Float, Integer, NilClass,
+	  and Rational classes.
+
+Thu May  6 12:12:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README: update.
+
+Thu May  6 03:34:29 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: apply FIBER_USE_NATIVE patch.  This patch improve
+	  Fiber context switching cost using system APIs.  Detail comments
+	  are written in cont.c.
+
+Thu May  6 02:16:48 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (rb_unlink_method_entry, rb_sweep_method_entry):
+	  added.  Unlinked method entries are collected to
+	  vm->unlinked_method_entry_list.  On the GC timing, mark all method
+	  entries which are on all living threads.  Only non-marked method
+	  entries are collected.  This hack prevents releasing living method
+	  entry.
+	  [Performance Consideration] Since this Method Entry GC (MEGC)
+	  doesn't occuer frequently, MEGC will not be a performance bottleneck.
+	  However, to traverse living method entries, every control frame push
+	  needs to clear cfp->me field.  This will be a performance issue
+	  (because pushing control frame is occurred frequently).
+	  Bug #2777 [ruby-dev:40457]
+
+	* cont.c (fiber_init): init cfp->me.
+
+	* gc.c (garbage_collect): kick rb_sweep_method_entry().
+
+	* method.h (rb_method_entry_t): add a mark field.
+
+	* vm.c (invoke_block_from_c): set passed me.
+
+	* vm.c (rb_thread_mark): mark cfp->me.
+
+	* vm_core.h (rb_thread_t): add a field passed_me.
+
+	* vm_core.h (rb_vm_t): add a field unlinked_method_entry_list.
+
+	* vm_insnhelper.c (vm_push_frame): clear cfp->me at all times.
+
+	* vm_insnhelper.c (vm_call_bmethod): pass me.
+
+	* bootstraptest/test_method.rb: add a test.
+
+Wed May  5 22:22:51 2010  wanabe  <s.wanabe@gmail.com>
+
+	* compile.c (iseq_set_sequence): fix check range of ic_index.
+	  a patch from Tomoyuki Chikanaga.  #3236
+
+Wed May  5 21:49:31 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* dln.c (aix_loaderror): use execerror for load error on AIX.
+	  This can avoid SEGV reported by Perry Smith.  [Bug #2063]
+
+Wed May  5 20:37:54 2010  wanabe  <s.wanabe@gmail.com>
+
+	* thread_win32.c (w32_wait_events): get GVL before handle interrupt
+	  event.   [ruby-core:27199], [ruby-core:29698]
+
+Wed May  5 19:00:01 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: revert. enbugged by last commit.
+	  ([ruby-dev:41133], [ruby-dev:41134], [ruby-core:30010])
+
+	* ext/tk/README.tcltklib: ditto.
+
+Wed May  5 15:54:35 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_stat): use STAT macro instead of calling stat() directly.
+	  reported by Bill Kelly.  [ruby-core:30012]
+
+Wed May  5 11:43:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/test_io.rb (megacontent-copy_stream): get rid of
+	  deadlock.
+
+Wed May  5 07:27:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_mark_method_entry): renamed.
+
+Wed May  5 05:20:27 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h, vm_method.c: rename some internal functions related to
+	  rb_method_entry_t.
+	  rb_add_method_me()        -> rb_method_entry_set().
+	  rb_get_method_entry()     -> rb_method_entry_without_cache().
+	  rb_gc_mark_method_entry() -> rb_mark_method_entry().
+
+	* class.c, proc.c: ditto.
+
+Tue May  4 22:59:48 2010  wanabe  <s.wanabe@gmail.com>
+
+	* compile.c (iseq_build_body): update iseq->ic_size.
+	  a patch from Tomoyuki Chikanaga. see #3236.
+
+Tue May  4 18:51:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (name_err_mesg_to_str): preserve encoding of inspection.
+	  [ruby-core:29948]
+
+Tue May  4 18:38:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb (test_copy_stream):
+	  IO.copy_stream support binmode only currently.
+	  [ruby-core:23724]
+
+Tue May  4 12:46:09 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (argument_error): push correct backtrace.
+	  Bug #2281 [ruby-core:26333]
+
+Tue May  4 12:38:40 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (sockopt_inspect): use rb_str_cat2 and
+	  rb_str_append.
+
+	* ext/socket/ancdata.c (ancillary_inspect): refined.
+
+Tue May  4 11:48:06 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_inspect): use rb_str_cat2 and
+	  rb_str_append.
+
+Tue May  4 07:52:33 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/net/http.rb (Net::HTTPResponse#read_chunked): ensure to skip the
+	  last newline of chunk.  [ruby-core:29229]
+
+	* test/net/http/utils.rb: add an option for chunked response test.
+
+	* test/net/http/test_http.rb: add tests for chunked response.
+
+Tue May  4 03:37:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Update nkf 2010-04-28.
+
+Mon May  3 21:08:16 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* sample/README: update file list. [ruby-core:28981]
+
+Mon May  3 08:15:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/emitter.c (syck_scan_scalar): set SCAN_WHITEEDGE flag
+	  when scalar begins with newline.  patches from Dave B <daz AT
+	  d10.karoo.co.uk> at [ruby-core:23019] and caleb clausen at
+	  [ruby-core:25851].  [ruby-core:23006][ruby-core:29925]
+
+Sun May  2 17:52:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/task.rb (RDoc::Task): should not override newer code.
+
+Sun May  2 17:25:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): ignore signedness.
+
+Sun May  2 12:04:30 2010  wanabe  <s.wanabe@gmail.com>
+
+	* iseq.c (iseq_load): allow filepath to be nil.
+	  a patch from Tomoyuki Chikanaga in [Bug #3229].
+
+Sun May  2 08:54:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::NEEDS_BINMODE): check if O_BINARY value instead
+	  of fragile check by platform name.
+
+Sun May  2 07:38:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (dir_config): should not modify argument arrays
+	  themselves.
+
+Sat May  1 22:53:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#size): stat by path name when it is
+	  closed.
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  keep the first trace.
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  fixed filtering.  [ruby-core:29908]
+
+Sat May  1 16:46:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_IsInfinite): don't use
+	  non-ascii character.
+
+Sat May  1 14:08:29 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/server.rb:  Fix bug when serving gems.
+
+Sat May  1 14:05:36 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Upgrade to RDoc 2.5.8.
+
+Sat May  1 09:43:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  filter out traces in minitest directory.  [ruby-core:29908]
+
+Sat May  1 06:42:57 2010  wanabe  <s.wanabe@gmail.com>
+
+	* win32/win32.c: add declaration of wstati64 for gcc.
+
+Sat May  1 02:41:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* merge some patches from win32-uncode-test branch.
+	  see #1685.
+
+	* file.c, include/ruby/intern.h (rb_str_encode_ospath): new function
+	  to convert encoding for pathname.
+
+	* win32.c, include/ruby/win32.h (rb_w32_ulink, rb_w32_urename,
+	  rb_w32_ustati64, rb_w32_uopen, rb_w32_uutime, rb_w32_uchdir,
+	  rb_w32_umkdir, rb_w32_urmdir, rb_w32_uunlink): new functions to
+	  accept UTF-8 path.
+
+	* win32/win32.c (rb_w32_opendir, link, rb_w32_stati64, rb_w32_utime,
+	  rb_w32_unlink): use WCHAR path internally.
+
+	* file.c (rb_stat, eaccess, access_internal, rb_file_s_ftype,
+	  chmod_internal, rb_file_chmod, rb_file_chown, utime_internal,
+	  rb_file_s_link, unlink_internal, rb_file_s_rename): use UTF-8 version
+	  functions on Win32.
+
+	* file.c (apply2files, rb_stat, rb_file_s_lstat, rb_file_symlink_p,
+	  rb_file_readable_p, rb_file_writable_p, rb_file_executable_p,
+	  check3rdbyte, rb_file_identical_p, rb_file_chmod, rb_file_chown,
+	  rb_file_s_link, rb_file_s_symlink, rb_file_s_rename): call
+	  rb_str_encode_ospath() before passing the path to system.
+
+	* io.c (rb_sysopen): ditto.
+
+	* dir.c (dir_chdir, dir_s_mkdir, dir_s_rmdir): ditto.
+
+Sat May  1 00:26:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  assertion message must be String or Proc.  suggested by caleb
+	  clausen at [ruby-core:29884].
+
+Sat May  1 00:14:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_io.rb: skip false tests on Windows.
+	  [ruby-core:29886]
+
+Fri Apr 30 22:46:27 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* math.c: Math::DomainError < StandardError [ruby-core:29855]
+
+Fri Apr 30 21:40:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/test_open3.rb (TestOpen3#test_commandline): use simple
+	  command via shell.  [ruby-dev:41100]
+
+Fri Apr 30 15:38:45 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: better support for MinGW environment.
+
+Fri Apr 30 12:05:20 2010  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (file_expand_path): call rb_str_set_len before BUFCHECK to
+	  prevent rb_str_resize in BUFCHECK discard the content.
+
+Fri Apr 30 11:48:31 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* string.c (rb_str_sub_bang): String#sub! now raises an error when
+	  called on a frozen string, even if no change is made.
+	  See [ruby-core:23657]
+
+Fri Apr 30 11:40:44 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* eval.c (make_exception, rb_obj_extend): Fix error messages in case
+	  of wrong
+	  number of arguments
+
+	* file.c (rb_f_test, rb_file_s_umask): ditto
+
+	* numeric.c (int_chr, num_step): ditto
+
+	* process.c (rb_f_sleep): ditto
+
+	* re.c (rb_reg_initialize_m): ditto
+
+	* signal.c (rb_f_kill, sig_trap): ditto
+
+	* string.c (rb_str_aref_m, rb_str_aset_m, rb_str_count,
+	  rb_str_delete_bang,
+	  rb_str_slice_bang, rb_str_sub_bang, str_gsub): ditto
+
+	* proc.c (curry): rdoc fix
+
+Fri Apr 30 04:09:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (TIMET_MAX): should be time_t, not unsigned_time_t.
+
+Fri Apr 30 03:59:08 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (rb_time_unmagnify_to_float): should cast.
+
+Fri Apr 30 03:38:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (fix_mul): the width of fixnum is same as long's on all
+	  platforms.
+
+Fri Apr 30 03:17:20 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Improve algorithm for Matrix#determinant and
+	  Matrix#rank
+	  {determinant,det,rank}_e are now deprecated. [ruby-core:28273]
+	  Also fixes a bug in Determinant#rank (e.g. [[0,1][0,1][0,1]])
+	  Matrix#singular?, Matrix#regular? now raise on rectangular matrices
+	  and use determinant instead of rank.
+
+Fri Apr 30 00:52:56 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): define some constants to select
+	  collect code for win64.
+
+Thu Apr 29 20:10:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/test_open3.rb (test_commandline): use dump instead of
+	  shellwords.  [ruby-core:23797]
+
+Thu Apr 29 18:39:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/thwait.rb (ThreadsWait#join): refined rdoc again.
+	  [ruby-core:29863] [ruby-dev:41092]
+
+Thu Apr 29 14:46:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby: use more descriptive assertions.
+
+	* test/ruby: fixed nonsense assertions.
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  reverted.  [ruby-core:29872]
+
+Thu Apr 29 12:33:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/thwait.rb (ThreadsWait#join): refined rdoc.  [ruby-core:29863]
+
+Thu Apr 29 12:16:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): reject
+	  non-boolean values.  [ruby-core:29868]
+
+Thu Apr 29 11:20:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (seek_before_access): renamed.  see [ruby-core:29861].
+
+	* io.c (rb_io_s_binread): fixed rdoc.  parts of a patch from Roger
+	  Pack in [ruby-core:29861].
+
+Thu Apr 29 03:50:49 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/xmlrpc/utils.rb: Fixing an incompatibility with
+	  reflection methods returning Symbols.  Patch by
+	  HD Moore.  [ruby-core:29821]
+
+Wed Apr 28 23:53:15 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/thwait.rb: revise rdoc.  a patch from Roger Pack in
+	  [ruby-core:27362].
+
+Wed Apr 28 23:21:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Update to JSON 1.4.2.
+
+Wed Apr 28 22:53:57 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread. (rb_thread_terminate_all): revert r24591 which caused SEGV
+	  sometimes.  [ruby-dev:40936] [ruby-core:27245] [ruby-core:27416]
+
+Wed Apr 28 22:26:55 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/psych/visitors/test_yaml_tree.rb (test_struct_const): remove
+	  Struct::Foo which affects test/ruby/test_struct to warn redefining
+	  constant.
+
+Wed Apr 28 18:04:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_timespec): use rb_check_funcall.
+
+Wed Apr 28 17:14:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/extconf.rb: CMSG_ macros are broken on 64bit darwin,
+	  because of use of __DARWIN_ALIGN.
+
+Wed Apr 28 16:44:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h ({RSTRING,RSTRUCT,RBIGNUM}_LENINT): check long
+	  to cast to int.
+
+Wed Apr 28 16:28:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/unixsocket.c (sendmsg_blocking, recvmsg_blocking):
+	  define only when used.
+
+	* ext/socket/rubysocket.h: non-implemented method definitions need
+	  to be shared.
+
+Wed Apr 28 10:27:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (ruby_vsnprintf, ruby_snprintf): suppress warnings.
+	  why return int in spite of the arguments of size_t?
+
+Wed Apr 28 09:49:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/compile_prelude.rb: enable optimization.
+
+Wed Apr 28 09:43:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (warn_balanced): do not warn for EXPR_ENDFN.
+
+Tue Apr 27 23:57:04 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (ruby_cleanup): add exception guard around code running
+	  signal handler (of r27513).  Absence of the guard made
+	  bootstraptest/test_thread.rb fail sometimes.
+
+Tue Apr 27 22:55:29 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* insns.def (onceinlinecache): add exclusion control for a region
+	  between onceinlinecache and setinlinecache.  [ruby-dev:39768]
+
+Tue Apr 27 22:40:54 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* iseq.c (set_relation): do not use top_wrapper as bottom of cref,
+	  which caused constant lookup error when "wrapped load" is used;
+	  instead, use Object as bottom, and push top_wrapper on Object.
+	  [ruby-core:25039]
+
+Tue Apr 27 21:24:40 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (ruby_cleanup): before cleanup, check signal buffer and run
+	  handler if any.  [ruby-core:20970]
+
+	* thread.c (rb_threadptr_check_signal): separeted from
+	  timer_thread_function.
+
+Tue Apr 27 18:00:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP#rcptto_list): fixed typo.
+	  [ruby-core:29809]
+
+Tue Apr 27 12:44:23 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Import RDoc 2.5.7.  Fixes #1318 and ruby-core:29780.
+
+Tue Apr 27 10:54:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_read_escape): deny extra character escapes.
+	  [ruby-core:27228]
+
+Tue Apr 27 06:20:13 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (select_internal): IO which cbuf is not empty is readable.
+
+Tue Apr 27 00:07:32 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (program): check void_expr when rb_parse_in_main().
+	  [ruby-dev:38717]
+
+Mon Apr 26 20:11:05 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c, rational.c, lib/cmath.rb, lib/date.rb lib/date/delta*:
+	  reverted r27484-27486.  now official spec.
+
+Mon Apr 26 15:42:59 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/json/generator/generator.c (convert_UTF8_to_JSON_ASCII): get rid
+	  of a warning.
+
+Mon Apr 26 13:11:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_get_value): escape Qundef.
+
+Mon Apr 26 12:42:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (warn_balanced): warn according to last state.
+
+Mon Apr 26 09:05:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Update to JSON 1.4.1.
+
+Sun Apr 25 23:50:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (ruby_dup): update max fd.
+
+Sun Apr 25 21:56:49 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (fetch_internal): do not quote message data item
+	  names.  Thanks, Eric Hodel.  [ruby-core:23508]
+
+Sun Apr 25 15:59:02 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb: reverted experimental r23900.
+
+Sun Apr 25 15:51:00 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c, ratioanl.c: reverted experimental r24565.
+
+Sun Apr 25 15:34:48 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/delta*: reverted experimental r24567 and
+	  r25393.
+
+Sun Apr 25 11:02:20 2010  wanabe  <s.wanabe@gmail.com>
+
+	* hash.c (ruby_setenv): putenv on msvcrt.dll can't remove empty value.
+
+Sat Apr 24 23:40:50 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb: use [""].pack("p").size to detect the pointer size.
+
+Sat Apr 24 21:07:27 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/psych/test_psych.rb: don't leave temporary files.
+
+Sat Apr 24 16:27:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (RUBY_PROGRAM_VERSION): added
+
+	* tool/rbinstall.rb: expand target file name.
+
+	* template/fake.rb.in: no need for hook if extmk.
+
+Sat Apr 24 14:40:20 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: raise IOError when byte oriented operations occur with
+	  non-empty character buffer.
+	  [ruby-dev:40493] [ruby-dev:40506]
+
+Sat Apr 24 13:06:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (get_arglen): skip the last terminator of argv before
+	  checking environ.
+
+	* ruby.c (get_arglen): duplicate environ area if setenv and unsetenv
+	  are provided.
+
+	* ruby.c (set_arg0): keep empty strings.
+
+Sat Apr 24 09:44:40 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/yaml2byte.c (bytestring_append, bytestring_extend):
+	  removed wrong extra assignments.  a patch from Marcus Rueckert
+	  <darix AT opensu.se> at [ruby-core:29759].
+
+Sat Apr 24 00:41:52 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* process.c (rb_f_fork): remove after_exec() which sometimes caused
+	  two timer threads started.  [ruby-core:25217]
+
+	* signal.c: use pthread_sigmask() instead of sigprocmask().
+	  sigprocmask() is unspecified behavior on multi-thread programs.
+	  [ruby-core:25217]
+
+Sat Apr 24 00:36:05 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/dl/test_base.rb: add kfreebsd support.  based on a patch from
+	  Petr Salinger in [ruby-core:29769].
+	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560293
+
+Sat Apr 24 00:14:41 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl_session.c (SSL_SESSION_cmp): remove static for
+	  loopy version of openssl (0.9.8l?).
+
+Fri Apr 23 23:27:17 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_config.c: fix compilation failure with
+	  OpenSSL 0.9.8.
+
+Fri Apr 23 17:29:35 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_config.c: OpenSSL 1.0.0 support.
+	  [ruby-core:29256]
+
+	* ext/openssl/extconf.rb: check some functions added/removed at
+	  OpenSSL 1.0.0.
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which
+	  exists.
+
+	* ext/openssl/ossl_ssl_session (SSL_SESSION_cmp): removed at 1.0.0,
+	  so implement compatible fuction here.
+
+Fri Apr 23 14:37:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gem_prelude.rb (Gem::QuickLoader.load_full_rubygems_library):
+	  get rid of creating same regexps many times.
+
+	* lib/rubygems/custom_require.rb (Kernel#require): ditto.
+
+Fri Apr 23 14:07:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/etc.rd, doc/etc.rd.ja: moved from ext/etc.
+
+	* ext/etc.c (Init_etc): fixed rdoc.
+
+Fri Apr 23 11:31:25 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Update to RDoc 2.5.6.
+
+Fri Apr 23 04:11:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ripper/test_parser_events.rb (test_unterminated_regexp):
+	  separate test.
+
+Fri Apr 23 01:47:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_wopen): shouldn't use FILE_FLAG_OVERLAPPED with
+	  normal file.  #1807, #2510, #2549
+
+Fri Apr 23 01:28:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (ubf_handle): remove unused typedef.
+
+Thu Apr 22 23:10:59 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (mnew): fix wrong error message when Kernel#public_method
+	  receives name of private method.  [Bug #2425]
+
+Thu Apr 22 22:56:42 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bootstraptest/test_thread.rb: fix test.  [Bug #2342]
+
+Thu Apr 22 21:50:17 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/ext/multi-irb.rb: fix multi-irb running
+	  parallelly. [ruby-dev:41031] [Bug #3182]
+
+Thu Apr 22 17:13:34 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems: Import RubyGems 1.3.7.pre.1 (as 1.3.6.1).
+
+Thu Apr 22 16:43:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (warn_balanced): removed false warning.
+
+	* parse.y (parser_yylex): skip whitespaces after method name.
+
+Wed Apr 22 02:16:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.[ch]: replace _DEBUG with BIGDECIMAL_DEBUG
+	  to prevent activating debugging code when compiled with -DEBUG flag
+	  on Windows. [ruby-core:22989] #1308
+
+Wed Apr 21 21:24:20 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/digest/sha2/extconf.rb: check SHA256_CTX and SHA512_CTX to fix
+	  compilation failure on OpenBSD 4.4.
+
+Wed Apr 21 15:13:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_getc): fix incomplete character immediately before EOF
+	  with newline converter. [ruby-dev:41024]
+
+Wed Apr 21 13:44:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (regexp): check each fragments.   [ruby-core:27374]
+
+Wed Apr 21 13:36:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): reverted r27388 due to backward
+	  compatibility.
+
+	* parse.y (parser_yylex): warn confusing binary operators after
+	  local variable.
+
+Wed Apr 21 11:53:47 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 2.5.5.  Fixes bugs in ri, Darkfish and
+	  rdoc option handling.
+
+Wed Apr 21 11:31:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): abandoned EXPR_VCALL.
+
+Wed Apr 21 03:17:17 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_getc): set read_encoding to resulted one character
+	  string. [ruby-dev:41023]
+
+Wed Apr 21 00:29:39 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (bigmul1_karatsuba): fix calculation order to prevent
+	  underflow.  [ruby-core:29088]
+
+Wed Apr 21 00:26:17 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (NODE_NEXT, NODE_REDO): add dummy putnil instruction to
+	  fix stack consistency error.  [ruby-core:28172]
+
+	* bootstraptest/test_jump.rb: add a test for above.
+
+Wed Apr 21 00:16:44 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/zlib/zlib.c (rb_deflate_params): update buf_filled count because
+	  deflateParams writes to out buffer.  And, revert r18029 because the
+	  flush was not needed now and emits garbage.  [ruby-dev:40802]
+
+Wed Apr 21 00:01:05 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_method.c (rb_add_method_def): decrement alias count of
+	  rb_method_definition_t to prevent memory leak.  see
+	  [ruby-dev:41021].
+
+Tue Apr 20 21:33:06 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/registry.rb (PredefinedKey#create): root key
+	  name should be a string.  fixed [ruby-core:28192]
+
+Tue Apr 20 19:25:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fix for tLPAREN_ARG.
+
+Tue Apr 20 12:34:23 2010  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/{core, util}.rb (RFC822_DAYS, RFC822_MONTHS):
+	  move the constant because used only util.rb.
+
+Tue Apr 20 12:24:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lex_state_e, IS_END, IS_SPCARG, parser_yylex): separate
+	  the state after vcall.  [ruby-core:29578]
+
+Tue Apr 20 01:03:00 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bootstraptest/test_fork.rb: add a test for [ruby-core:28924].
+
+Tue Apr 20 00:43:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_extname): skip last directory separators.
+	  [ruby-core:29627]
+
+Tue Apr 20 00:41:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (internal_{read,write}_func, rb_{read,write}_internal):
+	  reverted r27265, since now rb_thread_blocking_region() preserves
+	  errno.
+
+Mon Apr 19 23:14:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_thread_blocking_region, rb_thread_blocking_region_end):
+	  preserve errno.  [Bug #2606] [ruby-core:28924]
+
+Mon Apr 19 19:41:10 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::cp_r): backport r11156 from ruby_1_8.
+
+Mon Apr 19 19:18:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): reduced duplicated conditions.
+
+Mon Apr 19 13:58:04 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 2.5.4.  Fixes #3169, #3160, #3023.
+
+Mon Apr 19 12:46:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout#timeout): propagate errors to the
+	  caller.  [ruby-dev:41010]
+
+Mon Apr 19 00:27:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_method.c (rb_add_method_def): workarond fix for redefinition
+	  of methods. This is because cfp->me uses the rb_method_entry
+	  which is freed by redefinition of remove_method. Note that
+	  reusing may cause another problem when the usage is changed.
+	  [ruby-core:27320] [ruby-core:29464]
+
+Sun Apr 18 22:13:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string_content): cond_stack and cmdarg_stack are VALUE.
+
+Sun Apr 18 18:07:47 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255.
+	  [ruby-core:29501]
+
+Sun Apr 18 12:48:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): seems like a symbol-literal when spaces
+	  are unbalanced.  [ruby-core:29578]
+
+Sun Apr 18 12:32:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string_content): preserve cond_stack and cmdarg_stack.
+	  [ruby-core:29579]
+
+Sun Apr 18 05:50:58 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: defaulting binary string
+	  format to "literal" format.
+
+Sun Apr 18 02:13:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (identify_identifier): add '_' to the regexp.
+
+Sat Apr 17 23:21:15 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: use AC_TRY_LINK instead of AC_TRY_COMPILE.
+	  On Solaris it can compile with signbit but can't link.
+
+Sat Apr 17 20:34:09 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/envutil.rb: update Gem::ConfigMap to fake environment for
+	  tests.  Some test of rubygems had failed because envutil.rb changed
+	  only RbConfig::CONFIG but not Gem::ConfigMap.
+
+Sat Apr 17 20:31:08 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/irb/ruby-lex.rb (identify_identifier): allow multibyte character
+	  as identifier.  [ruby-core:27275]
+
+Sat Apr 17 09:19:27 2010  wanabe  <s.wanabe@gmail.com>
+
+	* compile.c (iseq_compile_each): fix splat condition in NODE_WHEN.
+	  [Bug #2226]
+
+Sat Apr 17 08:57:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP#rcptto_list): continue when at least
+	  one RCPT is accepted.  based on a patch from Kero van Gelder at
+	  [ruby-core:26190].
+
+Sat Apr 17 07:43:55 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/thread/test_queue.rb (TestQueue#grind): fix typos.
+
+Sat Apr 17 07:27:53 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add Array#repeated_{combinationpermutation} [Feature #2981]
+
+Sat Apr 17 05:30:22 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/core_ext.rb (yaml_as): supporting deprecated
+	  "yaml_as" method
+	* ext/syck/lib/syck/tag.rb: ditto
+
+Sat Apr 17 05:25:15 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/coder.rb (scalar): supporting deprecated methods
+	* ext/psych/lib/psych/deprecated.rb: supporting deprecated
+	  to_yaml_properties method
+
+Sat Apr 17 01:32:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (rb_io_rewind, rb_io_eof): add rdoc.  based on a patch from
+	  Roger Pack in [ruby-core:26771] [Bug #2377].
+
+Fri Apr 16 23:42:56 2010  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_folderitem2_invokeverb.rb (test_invokeverb):
+	  run test only when "Create Shortcut (&S)" menu is found.
+	  [ruby-core:29550] [Bug #1602]
+
+Fri Apr 16 21:52:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (string_content, etc): counts of CMDARG_PUSH and POP were
+	  inconsistent.  [ruby-core:22637]
+
+Fri Apr 16 21:27:57 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): revert r23389,
+	  which not only is unnecessary but also causes the inconsistency of
+	  return type.  [ruby-core:25706] [Bug #2129]
+
+Fri Apr 16 20:05:24 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/thread.rb (Queue#push, #pop, SizedQueue#push, #pop): remove
+	  code that kicks waiting thread twice, which caused race and
+	  deadlock.  a patch from James M. Lawrence.  [ruby-core:25537]
+
+	* test/thread/test_queue.rb: added.
+
+Fri Apr 16 20:01:47 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* .gitignore: updated.
+
+Fri Apr 16 16:51:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/file2lastrev.rb (VCS::SVN::get_revisions.): remind about
+	  DOSISH, sometimes.
+
+Fri Apr 16 16:15:40 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_repeated_permutation): new method added. a patch
+	  from Makoto Kishimoto in [ruby-core:29267]   [ruby-core:28724]
+
+	* array.c (rb_ary_repeated_combination): ditto.
+
+Thu Apr 15 22:41:47 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_thread_priority, rb_thread_priority_set): fix rdoc.
+	  Lower-priority thread may run even if there are higher-priority
+	  threads.  See [ruby-dev:40977].
+
+Thu Apr 15 22:33:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/uri/ftp.rb (URI::FTP#set_path): added to correct handling of
+	  special case where path of ftp is relative.  This converts relative
+	  path to absolute one, because external representation of ftp path is
+	  relative and internal representation is absolute.  [ruby-core:24077]
+
+	* lib/uri/ftp.rb (URI::FTP#initialize): converts absolute to relative.
+
+	* lib/uri/generic.rb (URI::Generic#check_path): allow relative path
+	  when scheme is ftp.
+
+Thu Apr 15 21:54:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/file2lastrev.rb: use backtick for ruby 1.8.
+
+Thu Apr 15 21:13:29 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/file2lastrev.rb: this should run with ruby 1.8.
+
+Thu Apr 15 20:41:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/file2lastrev.rb: make -q effective for files not version
+	  controlled.
+
+Thu Apr 15 14:50:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace_each): get rid of use of malloc from signal
+	  handler by using ruby_engine_name.  [ruby-core:29497]
+
+	* vm_eval.c (print_backtrace): file may be nil when segfaulted in
+	  very early stage.
+
+	* vm_dump.c (bugreport_backtrace): ditto.
+
+Thu Apr 15 11:51:49 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (help): small fix.
+
+Wed Apr 14 22:09:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/source.rb: force_encoding("UTF-8") when the input
+	  is already UTF-8. patched by Kouhei Sutou [ruby-core:23404]
+
+Wed Apr 14 18:23:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* configure.in (signbit): signbit is a macro in C99.
+
+Wed Apr 14 17:56:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_shift_cbuf): should terminate.
+	  http://golf.shinh.org/p.rb?DECimal+number+to+BINary#Ruby
+
+Wed Apr 14 16:29:02 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (GET_STACK_BOUNDS): fixed macro argument names.  a patch from
+	  Satoshi Shiba <shiba AT rvm.jp> at [ruby-dev:40973].
+
+	* gc.h (ruby_get_stack_grow_direction): fixed prototype.
+
+	* thread_pthread.c (get_stack, ruby_stack_overflowed_p): both side
+	  should be same type.  [Bug #3145]
+
+Wed Apr 14 15:58:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_string_value_cstr): make NUL terminated if it is
+	  not done.
+
+Wed Apr 14 12:56:21 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap (encode_utf7): encode & properly.  Thanks, Kengo
+	  Matsuyama.  [ruby-dev:38063]
+
+Wed Apr 14 11:39:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/lib/syck/basenode.rb (Syck::BaseNode#match_path): fixed
+	  library name.
+
+	* ext/syck/lib/yaml/syck.rb: split from ext/syck/lib/syck.rb for
+	  backward compatibility.
+
+Wed Apr 14 09:24:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Refix [nkf-bug:21393]. (explicit -X)
+
+Tue Apr 13 20:36:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Fix: Windows Codepages wrongly convert
+	  Halfwidth Katakana. [nkf-bug:21393]
+
+Tue Apr 13 15:00:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (make_seed_value): fix leading-zero-guard condition on
+	  bdigit is smaller than 32bit.
+
+Tue Apr 13 13:57:36 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/completion.rb (CompletionProc): fix [ruby-dev:40953]
+	  [Bug #3126]. Thanks Kazuhiro NISHIYAMA.
+
+Tue Apr 13 09:32:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (transcode_loop): insert output the value when
+	  fallback hash has a related key. [ruby-dev:40540]
+	  [ruby-dev:40829] #3036
+
+	* transcode.c (rb_econv_prepare_opts): pass to newhash
+	  a value with the key :fallback.
+
+Tue Apr 13 00:12:04 2010  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (rand_init): use the absolute value of seed to
+	  make srand(-2**40) portable with 32bit and 64bit.
+	  [ruby-core:29292](2)
+
+Mon Apr 12 22:48:47 2010  Tanaka Akira  <akr@fsij.org>
+
+	* enumerator.c (inspect_enumerator): don't raise for uninitialized
+	  enumerator.
+
+Mon Apr 12 21:47:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* LEGAL: separated the section for parse.c.  contributed by Paul
+	  Betteridge in [ruby-core:29472].
+
+Mon Apr 12 09:19:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (fu_each_src_dest): ensure src is accessible.
+
+	* lib/fileutils.rb (fu_same): use File.identical? to get rid of
+	  exceptions.  [ruby-core:28141]
+
+	* lib/fileutils.rb (fu_have_st_ino): no longer used.
+
+	* lib/fileutils.rb (fu_have_st_ino): check if required method is
+	  defined, instead of platform name.
+
+Mon Apr 12 05:10:20 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: New method Matrix.build [ruby-core:28272]
+
+Mon Apr 12 03:45:25 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Deprecate elements_to_{f/i/r}
+
+Mon Apr 12 03:30:29 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Handle coercion errors by raising TypeErrors
+	  [ruby-core:26736]
+
+Mon Apr 12 00:51:21 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* io.c (rb_io_getline_fast, rb_io_getline_1): fix ARGF.lineno
+	  behavior. [ruby-core:25205]
+
+	* test/ruby/test_argf.rb (TestArgf#test_lineno3): add a test for
+	  above.
+
+Sun Apr 11 23:25:17 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* configure.in: can not load libraries if --with-opt-dir is used
+	  on AIX. [Bug #3107]
+
+Sun Apr 11 14:44:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/irb/ruby-lex.rb (RubyLex#getc): revert r10817, which caused
+	  regression for handling case when there is no newline at the end of
+	  file.  [ruby-core:28248]
+
+Sun Apr 11 12:08:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_replicate): new encoding name must be valid
+	  c-string.  [ruby-dev:40954]
+
+Sun Apr 11 11:58:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (ftruncate): rename to get rid of conflict
+	  with same name but non-LFS function on MinGW.  [ruby-core:24757]
+
+Sun Apr 11 10:33:34 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 2.5.3.  Includes r27288 and r27290.
+
+Sun Apr 11 09:31:39 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* test/syck/*: Moved test/yaml to test/syck since it's actually
+	  testing the syck YAML engine.
+
+Sun Apr 11 08:56:44 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (setup_output_dir): compare by Time#to_i.
+	  Cached created time doesn't have fractinal times,
+	  but FileStat#mtime has; so rdoc almost alway judged files
+	  are updated.
+
+Sun Apr 11 07:40:48 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (setup_output_dir): fix typo. [ruby-core:29415]
+
+Sun Apr 11 07:01:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (decode_www_form_component): validate.
+	  [ruby-dev:40938]
+
+	* lib/uri/common.rb (decode_www_form): allow empty string.
+
+	* lib/uri/common.rb: fix nodoc for constant. [ruby-dev:40949]
+
+Sat Apr 10 21:26:22 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/markup/preprocess.rb (RDoc::Markup::PreProcess#handle):
+	  use File.binread to avoid locale dependency.
+
+Sat Apr 10 15:18:26 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Import RDoc 2.5.2
+	* lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): Don't parse rdoc
+	  files, reverts r24976 in favor of include directive support in C
+	  parser.
+
+Sat Apr 10 13:14:22 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): add SSLContext#ssl_timeout=,
+	  which allows net/https to specify timeout.  [ruby-core:24812]
+
+Sat Apr 10 07:36:13 2010  wanabe  <s.wanabe@gmail.com>
+
+	* vm_method.c (rb_add_method): clear attr.location before rb_ary_new3.
+	  a patch from Masaya TARUI in [Bug #3108]
+
+Sat Apr 10 05:27:26 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/deprecated.rb: implementing Psych.quick_emit and
+	  adding deprecation warnings.
+	* ext/psych/lib/psych/visitors/to_ruby.rb: supporting deprecated
+	  yaml_initialize api.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: supporting deprecated
+	  to_yaml api.
+
+Sat Apr 10 01:08:53 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c: parse raises a TypeError when nil is passed in.
+
+Sat Apr 10 00:01:51 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/pty/lib/expect.rb: preserve buffer read, instead of discard.
+	  based on a patch from Luiz Angelo Daros de Luca in
+	  [ruby-core:23464].
+
+Fri Apr  9 23:58:58 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/pty/lib/expect.rb: raise an error when argument is unexpected
+	  type.  based on a patch from Luiz Angelo Daros de Luca in
+	  [ruby-core:23464].
+
+Fri Apr  9 23:57:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/pty/lib/expect.rb: add rdoc.  based on a patch from Luiz Angelo
+	  Daros de Luca in [ruby-core:23464].
+
+Fri Apr  9 23:54:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/irb/init.rb, lib/irb/lc/help-message,
+	  lib/irb/lc/ja/help-message: add -w flag.  [ruby-core:24594]
+
+Fri Apr  9 23:51:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal),
+	  ext/socket/unixsocket.c (rsock_init_unixsock): check the result of
+	  listen(2).  based on a patch from Mike Pomraning.  [ruby-core:23698]
+
+Fri Apr  9 21:22:10 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/completion.rb (CompletionProc): irb will be stuck with
+	  long variable name at copletion. [Bug#1969]. refix [ruby-core:28366].
+
+Fri Apr  9 20:54:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (decode_www_form): don't ignore leading '?'.
+	  [ruby-dev:40938]
+
+	* lib/uri/common.rb (decode_www_form): check whether argument is
+	  valid application/x-www-form-urlencoded data.
+
+Fri Apr  9 20:29:13 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can
+	  precede the last reference).  [ruby-dev:40942]
+
+Fri Apr  9 20:05:05 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* dir.c (push_glob): add RB_GC_GUARD to prevent str being free'ed.
+	  a patch from Masaya TARUI in [ruby-dev:40939].  [ruby-dev:40514]
+
+Fri Apr  9 10:53:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* compile.c (iseq_compile_each): stop hiding, and freeze unpopped
+	string nodes to allow method redefinition.  [ruby-dev:40641]
+
+Fri Apr  9 01:26:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (internal_{read,write}_func, rb_{read,write}_internal):
+	  preserve errno.  a patch from Takehiro Kubo in [ruby-core:29340].
+	  [ruby-core:28924]
+
+Fri Apr  9 01:12:07 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/irb/completion.rb (CompletionProc): calling the method "methods"
+	  may raise an exception.  [ruby-core:28366]
+
+Thu Apr  8 14:33:24 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in: --disable-install-doc should prohibit doxygen.
+
+Thu Apr  8 14:23:51 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: include errno.h before defining errnos.
+	  see [ruby-core:29314]
+
+Thu Apr  8 11:45:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/yaml.rb: use Psych if only it is loaded already.
+
+	* lib/yaml.rb (YAML::EngineManager#yamler): set the result after
+	  successfully switched.
+
+Thu Apr  8 07:22:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rand_init): ignore higher bits if all they are same as
+	  the lower sign bit.  [ruby-core:29292](2)
+
+Thu Apr  8 07:16:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/cmd/help.rb (IRB::ExtendCommand::Help#execute): use RI
+	  interactive mode if no argument.  [ruby-dev:39839]
+
+Wed Apr  8 02:33:55 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c (rb_ary_permutation): Remove limitation for lengthy permutations
+	  [ruby-core:29240]
+
+	* test/ruby/test_array.rb: ditto
+
+Wed Apr  7 23:33:55 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* misc/ruby-mode.el (ruby-mode-map): binded C-c C-c and C-c C-c C-u
+	  to comment-region and uncomment-region. Thanks Michael Klishin!
+	  [Feature #872] [ruby-core:20552]
+
+Wed Apr  7 21:44:14 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (ASCTIME): unused macro removed.
+
+Wed Apr  7 16:45:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (Makefile): reverted r27244.
+
+Wed Apr  7 11:49:34 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/quickpath.rb (REXML::QuickPath::predicate):
+	  fix regexp.
+
+Wed Apr  7 09:44:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (Makefile): quote init-commands.
+
+	* configure.in (Makefile): `make ruby` builds ruby command
+	  even if RUBY_INSTALL_NAME is customized or it has extension.
+
+Wed Apr  7 03:28:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc#{initialize,setup_output_dir}):
+	  initialize @last_created and use it.
+
+Wed Apr  7 02:05:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/fake.rb.in: not define $extout to make target in cwd.
+
+Tue Apr  6 23:01:35 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h: Introduce UNINITIALIZED_VAR() macro.
+	* thread.c (do_select): Use UNINITIALIZED_VAR() instead FAKE_FD_ZERO().
+	  Also, remove FAKE_FD_ZERO completely. [Feature #3018]
+
+Tue Apr  6 14:53:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: check definition existence before defining
+	  errno macros.
+
+	* win32/win32.c (errmap): define winsock errors mappings.
+	  these are VC++10 support. see [ruby-core:29278]
+
+Tue Apr  6 21:55:25 2010  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: test localtime(3) overflow.  [ruby-dev:40910]
+
+	* time.c (rb_gmtime_r): renamed from rb_gmtime.
+	  (rb_localtime_r): renamed from rb_localtime.
+	  (rb_localtime_r2): call rb_localtime_r and validate the result if
+	  there is overflow problem.
+	  (rb_gmtime_r2): call rb_gmtime_r and validate the result if there
+	  is overflow problem.
+
+Tue Apr  6 11:21:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/fake.rb.in: hooks for extconf.rb.
+
+Tue Apr  6 06:19:36 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/text.rb (REXML::Text.check): comment out
+	  broken logic.
+
+Tue Apr  6 05:59:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/parsers/baseparser.rb (LETTER, DIGIT):
+	  always use POSIX charclass.
+
+	* lib/rexml/parsers/baseparser.rb (NAMECHAR):
+	  remove duplicated range.
+
+	* lib/rexml/xmltokens.rb (NCNAME_STR, NAMECHAR): ditto.
+
+	* lib/rexml/parsers/xpathparser.rb (PathExpr): ditto.
+
+	* lib/rexml/text.rb (REXML::Text#initialize):
+	  initialize @parent.
+
+Mon Apr  5 19:54:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (make_regexp): use onig_new_with_source to keep
+	  sourcefile and sourceline.
+
+	* re.c (onig_new_with_source): copied from onig_new in
+	  regcomp.c for keep sourcefile and sourceline.
+
+Mon Apr  5 13:20:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
+	  defined EWOULDBLOCK.  based on a patch from Charlie Savage,
+	  see [ruby-core:29255]
+
+Mon Apr  5 13:10:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/psych/lib/psych/core_ext.rb: remove before alias.
+
+	* ext/syck/lib/syck.rb: don't warn called by itself.
+
+Mon Apr  5 13:08:24 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb (each_export): VC10 support.
+	  a patch from Charlie Savage in [ruby-core:29254]
+
+Sun Apr  4 22:18:32 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (cmp): optimize for fixnums.
+	  (lt): use cmp.
+	  (gt): ditto.
+	  (le): ditto.
+	  (ge): ditto.
+	  (wlt): use wcmp.
+	  (wgt): ditto.
+	  (wle): ditto.
+	  (wge): ditto.
+	  (time_subsec): use wmod.
+
+Sun Apr  4 10:04:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h: replace snprintf and vsnprintf by
+	  ruby_snprintf and ruby_vsnprintf. [ruby-dev:40909]
+
+	* configure.in: don't check snprintf(3) and vsnprintf(3).
+
+	* include/ruby/missing.h: don't declare snprintf and vsnprintf.
+
+	* include/ruby/ruby.h: include stdarg.h.
+
+	* sprintf.c: include vsnprintf.c
+
+	* vsnprintf.c: renamed from missing/vsnprintf.c.
+
+	* vsnprintf.c: remove useless ifdefs.
+
+	* win32/mkexports.rb: use ruby_snprintf and ruby_vsnprintf.
+
+Sun Apr  4 09:44:01 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (lt): call <=> instead of <.
+
+Sun Apr  4 06:46:16 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* lib/yaml: Moved to ext/syck/lib, Syck only uses Syck constant.
+	* lib/yaml.rb: Added an engine manager for choosing YAML engine.
+	* ext/syck/lib/syck/rubytypes.rb: squashed warnings when using Psych
+
+Sat Apr  3 22:47:51 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: don't define STRUCT_WIDEVAL.
+
+Sat Apr  3 18:15:02 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc#{setup,update}_output_dir): store mtimes
+	  per files in the flag file.
+
+	* lib/rdoc/rdoc.rb (RDoc#normalized_file_list): skip already
+	  processed and unmodified files.
+
+Sat Apr  3 15:09:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (rdoc): no force-update, and add RDOCFLAGS.
+
+	* lib/rdoc/options.rb (RDoc#parse): no-force-update option.
+
+Sat Apr  3 10:51:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_rand): raise ArgumentError on nil, as the
+	  documentation implies.  [ruby-core:29075]
+
+	* random.c (rb_f_rand): mentioned the case of when max is nil.
+
+Sat Apr  3 06:56:11 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c (rb_ary_product): Accept a block [ruby-core:29045]
+
+Sat Apr  3 04:46:00 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/file2lastrev.rb (VCS#relative_to): path and @srcdir may have
+	  different relative-ness.
+
+Sat Apr  3 03:19:01 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/benchmark.rb (Benchmark::Tms#add): fix NameError.
+	  [ruby-dev:40906]
+
+	* test/benchmark/test_benchmark.rb: add a test for above.
+
+Sat Apr  3 01:50:02 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser/ruby.rb (RDoc#make_message): no empty lines.
+
+	* lib/rdoc/stats.rb (RDoc::Normal#print_file): send to stdout and
+	  flush always
+
+Sat Apr  3 00:03:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.
+
+	* lib/rdoc/parser/c.rb (RDoc#handle_method): see source files in
+	  source directory.
+
+Fri Apr  2 22:13:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb: reverted r27186 to add generators.
+
+Fri Apr  2 21:17:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* NEWS: added reverse_lookup option.
+
+Fri Apr  2 15:26:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_ri_driver.rb (with_dummy_pager): don't grasp
+	  the terminal.
+
+Fri Apr  2 14:43:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc::Generator): defer by autoload.
+
+	* lib/rdoc/generator/darkfish.rb: use normal library instead of
+	  gem.
+
+Fri Apr  2 14:26:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
+	  RUBY_VERSION.  reapplied r24990.
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables
+	  are delimited by a semicolon.  supported Vim style.  reapplied
+	  r24988 with fixing a typo for shebang.
+
+Fri Apr  2 14:16:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc
+	  files.  reapplied r24976.
+
+	* lib/rdoc/parser/c.rb: fixed a small error in the documentation.
+	  [ruby-core:24744]  reapplied r24395.
+
+	* lib/rdoc/parser.rb (RDoc::Parser.binary?): blksize may be nil
+	  and is irrelevant to whether a file is binary.  TAB and newlines
+	  would be usually considered to be included in text data.
+	  reapplied r23071 and r24297.
+
+Fri Apr  2 13:59:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): Gem::Enable has been
+	  obsolete.  reapplied r24599.
+
+	* lib/rdoc/ri/paths.rb: follows $ridir.  reapplied r23554.
+
+	* lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): expand_path deals with
+	  platform dependent environments.  reapplied r21312.
+
+Fri Apr  2 12:52:25 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/parser.rb (binary?): regression.
+
+Fri Apr  2 11:54:49 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (init_env): wrong calculation of the head of setenv
+	  string.  [ruby-core:29216]
+	  a patch from Heesob Park in [ruby-core:29218]
+
+Fri Apr  2 08:24:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (ruby_setsid): split from proc_setsid.
+
+	* process.c (proc_daemon): use EXIT_SUCCESS instead of magic number.
+
+Fri Apr  2 07:00:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cptr.c (rb_dlptr_inspect): fix format specifiers.
+
+Fri Apr  2 05:38:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (InitVM): calls per-VM initialization in
+	  single VM, but does nothing in MVM.
+
+Fri Apr  2 02:56:56 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: New instance methods:
+	  empty? [ruby-core:26284], each, each_with_index [ruby-core:28400],
+	  conjugate, conj, imaginary, imag, real, real?, rectangular, rect
+		[ruby-core:26285]
+
+	Removed compare_by*, inspect_org, cf [ruby-core:26268]
+
+	Matrix.empty: raise on negative sizes
+
+	Matrix.determinant: raise on rectangular matrices [ruby-core:28271]
+
+Thu Apr  1 17:17:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/iso2022.trans: CP50221 supports 8bit JIS.
+
+Thu Apr  1 16:44:00 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc, test/rdoc: Imported RDoc 2.5
+
+Thu Apr  1 14:30:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/utf_16{be,le}.c (utf16{be,le}_mbc_to_code): simplified.
+
+Thu Apr  1 14:07:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (BSD__hdtoa): don't use C99 macros. (FP_NORMAL etc)
+
+Thu Apr  1 13:30:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): support %a format. [ruby-dev:40650]
+
+	* missing/vsnprintf.c (BSD_vfprintf): ditto.
+
+	* missing/vsnprintf.c (cvt): ditto.
+
+	* util.c (BSD__hdtoa): added.  This is 2-clause BSDL licensed
+	  by David Schultz and from FreeBSD.
+
+	* LEGAL: add about hdtoa() in util.c.
+
+Thu Apr  1 13:24:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): return 0.0 if hexadecimal and
+	  badcheck is FALSE: Float("0x1p+0") works, but "0x1p+0".to_f
+	  doesn't. [ruby-dev:40650]
+
+	* util.c (ruby_strtod): allow hexadecimal integers.
+
+Thu Apr  1 13:20:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/scanf.rb: support %a format. [ruby-dev:40650]
+
+Thu Apr  1 12:04:10 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRE_TIMET_PREFIX): define if configure doesn't
+	  defines it.  [ruby-core:29190]
+
+Thu Apr  1 11:36:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_initialize): fixed a rdoc miss that textmode and
+	  binmode flag explanation was reversed each other.  a patch from
+	  Heesob Park in [ruby-core:29166].
+
+Thu Apr  1 09:54:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RUBY_{DEFAULT,NEVER}_FREE): added.
+	  [ruby-dev:40889]
+
+Thu Apr  1 04:55:08 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (rb_big_abs_find_minbit): fix handling the last word.
+
+Thu Apr  1 04:30:11 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (long_mul): overflow condition changed.
+	  (wi_mul): ditto.
+
+Wed Mar 31 23:33:29 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (long_mul): extracted from mul and avoid integer overflow.
+	  (wi_mul): extracted from wmul and avoid integer overflow.
+
+Wed Mar 31 21:30:38 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: less bignum allocations.
+
+	* strftime.c (rb_strftime_timespec): defined to avoid rational for
+	  nano second resolution time.
+
+Wed Mar 31 16:05:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rake/test_{package_task,rules,task_manager}.rb: use
+	  temporary directories.
+
+Wed Mar 31 13:53:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rubygems/gemutilities.rb (setup, teardown):
+	  Object#to_yaml must use syck on RubyGem.
+
+Wed Mar 31 06:57:14 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (timew2timespec): fix previous change.
+
+Wed Mar 31 00:32:19 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (wdivmod): renamed from wdivmodv.  fix neg/pos and pos/neg.
+	  (split_second): return number of seconds as wideval_t.
+	  (timet2wv): new function.
+	  (wv2timet): new function.
+	  (timet2wideval): removed.
+
+Tue Mar 30 22:24:19 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: use more polymorphic operations.
+
+Tue Mar 30 22:12:38 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add URI.decode and URI.encode to Obsoleted methods,
+	  and fix typos. [ruby-dev:40852]
+
+	* NEWS: add Time#subsec.
+
+Tue Mar 30 22:07:12 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: reorder wide value implementation.
+
+Tue Mar 30 22:00:44 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb.rb: support [Feature#988], [ruby-core:21177].
+	* lib/irb/context.rb: fix Context#verbose?.
+
+Tue Mar 30 21:56:33 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: make wide value more polymorphic.
+
+Tue Mar 30 21:18:32 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/psych/extconf.rb: install psych .so to not psych/ but direct.
+	  This prepends to install *.rb files to psych/psych.
+
+	* ext/psych/lib/psych.rb: require 'psych.so'.
+
+Tue Mar 30 20:55:14 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (w2v): renamed from w2xv.
+	  (v2w): renamed from xv2w.
+	  (rb_time_magnify): takes wideval_t.
+	  (rb_time_unmagnify): returns wideval_t.
+
+Tue Mar 30 19:46:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/psych/lib: moved external library dependent files from lib.
+	  [ruby-core:29129]
+
+Tue Mar 30 18:25:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_dirname): split from rb_file_s_dirname.
+
+	* load.c (rb_f_require_relative): use absolute path instead of
+	  expanded path.
+
+Tue Mar 30 13:57:08 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* process.c (proc_daemon): Process.daemon should raise an error on
+	  failure regardless of whether the implementation uses daemon(3)
+	  or not. [ruby-dev:40832]
+
+Tue Mar 30 13:11:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/file2lastrev.rb (VCS::GIT_SVN): removed because git-log can
+	  deal with git-svn repository faster than git-svn-info.
+
+	* tool/file2lastrev.rb (VCS#get_revisions): particular commands do
+	  not depend on instance.
+
+Tue Mar 30 08:55:50 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/psych/extconf.rb: Making library detection more agnostic.
+
+Tue Mar 30 08:10:59 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* lib/psych.rb: Fix problem with empty and white-space only strings.
+	  Thanks Peter McLain!
+	* test/psych/test_psych.rb: tests for change.
+
+Tue Mar 30 05:31:39 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* lib/psych.rb: documentation updates.  Thanks Peter McLain!
+	* lib/psych/{coder,tree_builder}.rb: ditto
+
+Tue Mar 30 03:56:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/psych/{emitter,parser,psych}.c: move variable
+	  declaration to the first of the block.
+
+Mon Mar 29 21:47:44 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* prelude.rb, .document: Stuff in prelude.rb should be documented
+	  as well.
+
+Mon Mar 29 20:23:05 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/matrix.rb(Vector#each2, Vector#collect2): add type check for
+	Integer[Bug #2495].
+
+Mon Mar 29 19:45:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: wide value condition changed.
+
+Mon Mar 29 18:10:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (Numeric): accept rationals.
+
+Mon Mar 29 15:10:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#open): re-open with same mode and
+	  options as initialize.
+
+Mon Mar 29 09:16:45 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c: change include order; ruby.h should be at first.
+
+Mon Mar 29 06:47:25 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/psych/*: importing Psych to trunk
+	* test/psych/*: ditto
+	* lib/psych/*: ditto
+
+Sun Mar 28 10:03:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/scanf.rb: fix max width modifier for %f.
+
+Sun Mar 28 10:35:45 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.6.0 r5717.
+	* test/minitest/*.rb: ditto.
+
+Sun Mar 28 10:12:28 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (rb_time_magnify): fix for LP64.
+
+Sun Mar 28 09:28:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/scanf.rb: fix %[egEFG] isn't accept.
+
+Sun Mar 28 09:53:02 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: rename small integer specialization related identifiers.
+
+Sun Mar 28 08:20:37 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (weq): specialize for small integer.
+	  (wne): ditto.
+	  (wlt): ditto.
+	  (wgt): ditto.
+	  (wle): ditto.
+	  (wge): ditto.
+	  (rb_time_magnify): ditto.
+	  (rb_time_unmagnify): ditto.
+	  (rb_time_unmagnify_to_float): new function to avoid rational for
+	  Time#to_f and Time#-.
+
+Sun Mar 28 07:12:41 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (mul): condition refined.
+
+Sun Mar 28 02:14:13 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: fix previous commit.
+
+Sat Mar 27 23:17:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: use 64bit arithmetic even on platforms with 32bit VALUE.
+
+Fri Mar 26 23:52:07 2010  wanabe  <s.wanabe@gmail.com>
+
+	* NEWS: add Thread#add_trace_func and Thread#set_trace_func.
+
+Fri Mar 26 22:58:10 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
+	  store->ex_data.sk.  a patch from Christian Holtje in
+	  [ruby-core:28907].  [ruby-core:23971] [ruby-core:18121]
+
+Fri Mar 26 19:55:41 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* Makefile.in (DOXYGEN): Define a missing variable DOXYGEN.  Build
+	  has been failing when doxygen(1) is found by configure but the
+	  variable is not defined by the system and make(1) does not allow
+	  an empty command. ("@$(DOXYGEN)" was the cause)
+
+Fri Mar 26 19:28:03 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_hash.rb (test_recursive_key): recursive keys are
+	  permitted now.  [ruby-dev:40735]
+
+Fri Mar 26 12:36:10 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* lib/yaml/basenode.rb: deprecating YPath methods
+
+	* lib/yaml/stream.rb: deprecating YAML::Stream#edit
+
+Fri Mar 26 12:29:28 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* lib/yaml/encoding.rb: YAML.encode, YAML.decode are deprecated.
+
+	* lib/yaml/stringio.rb: yaml/stringio.rb is deprecated.
+
+	* lib/yaml/ypath.rb: YAML::YPath is deprecated.
+
+Fri Mar 26 04:52:19 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: fix [ruby-core:28901] [Bug #2997].
+	  Thanks, Michael Graff.
+
+	* ext/tk/tcltklib.c: use xfree() for memories allocated by ALLOC().
+
+	* ext/tk/tkutil/tkutil.c: ditto.
+
+	* ext/tk/lib/tkextlib/version.rb: forgot updating.
+
+Thu Mar 25 23:53:22 2010  wanabe  <s.wanabe@gmail.com>
+
+	* thread.c (thread_reset_event_flags): set flags to thread.  [Bug #693]
+
+Thu Mar 25 23:17:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* file.c (rb_get_path_check): prefer #to_path over #to_str.  a patch
+	  originally written by me, and modified by Nobuyoshi Nakada.
+	  [ruby-core:24257]
+
+Thu Mar 25 18:10:08 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: Array#{uniq,uniq!} can take a block. see [ruby-dev:37998]
+
+Thu Mar 25 17:21:49 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add IO#autoclose=, IO#autoclose?, IO#codepoints,
+	  IO#each_codepoint.
+
+Thu Mar 25 14:50:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_{read,write}): fix handle leaks.  based on
+	  a patch from Heesob Park in [ruby-core:28919].  [ruby-core:28833]
+
+Thu Mar 25 12:37:37 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add Kernel#singleton_class.
+
+Thu Mar 25 11:34:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c, node.h, strftime.c, enc/trans/utf8_mac.trans:
+	  added explicit casts for suppressing warnings.
+
+Thu Mar 25 11:34:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* test/ruby/test_dir_m17n.rb: HFS+ escapes invalid byte sequences of
+	  filenames.
+
+Thu Mar 25 05:44:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ruby_version): needs runnable CPP.
+
+Thu Mar 25 04:42:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): take a breath for HP-UX make
+	  [ruby-core:28938].
+
+	* tool/make-snapshot (Dir.mktmpdir): for 1.8.6 backward compatibility.
+
+	* tool/make-snapshot (package): $: no longer contains ".", in trunk.
+
+Thu Mar 25 03:52:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/charset_alias.rb: update of URL.  [ruby-dev:38360]
+
+Wed Mar 24 23:43:40 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (thread_create_core): let new thread inherit RUBY_EVENT_VM
+	  of event_flags.  [ruby-core:25191]
+
+	* thread.c (rb_threadptr_exec_event_hooks): delete RUBY_EVENT_VM if
+	  all event_hooks are removed.
+
+Wed Mar 24 22:58:02 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* configure.in: revert the previous commit, which seemed to break make
+	  install.  The files of standard libraries are directly installed to
+	  $(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1
+
+Wed Mar 24 18:16:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LDSHARED, CPP): keep $(CC).  [ruby-core:28912]
+
+Wed Mar 24 14:33:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): limit read size to 16KB if the file
+	  seems to be console.  [ruby-core:28902]
+
+Wed Mar 24 10:18:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): set length of string before calling
+	  rb_enc_check because rb_enc_check scans its content.
+	  This prevents warnings by valgrind.
+
+Tue Mar 23 23:58:51 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Incorporating the fixes from the recent
+	  FasterCSV releases:  1.5.2 and 1.5.3.  New parser
+	  by Tim Elliott.  [ruby-core:25038]
+
+Tue Mar 23 18:35:46 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* object.c (rb_obj_singleton_class): new method
+	  Kernel#singleton_class.  [ruby-core:21702]
+
+Tue Mar 23 01:13:59 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: use rsock_ prefix for internal initialization functions.
+
+Mon Mar 22 20:32:22 2010  wanabe  <s.wanabe@gmail.com>
+
+	* proc.c (rb_method_location): return attr's location if it is setup.
+	  [Feature #2084]
+
+	* NEWS: follow above.
+
+	* vm_method.c (rb_add_method): save attr's location.
+
+	* gc.c (mark_method_entry): mark attr's location.
+
+	* method.h (rb_method_definition_t): add member to save attr's location.
+
+	* vm_eval.c (vm_call0): follow above.
+
+	* vm_insnhelper.c (vm_call_method): ditto.
+
+	* vm_method.c (rb_method_definition_eq): ditto.
+
+Mon Mar 22 19:31:06 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (Date#>>): fixed.  [ruby-core:28011]
+
+Mon Mar 22 18:01:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RMDIRS): use rmdir -p if possible.
+
+	* Makefile.in ({dist,real}clean-ext): fix for removing ext
+	  directories.
+
+Mon Mar 22 09:06:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/.document: extracted from ext/.document.
+
+Mon Mar 22 00:50:33 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (rsock_revlookup_flag): declared.
+
+Mon Mar 22 00:01:24 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup (config.h): RUBY_EXEC_PREFIX defined.
+
+Sun Mar 21 00:46:29 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.encode_www_form_component):
+	  convert strings of HTML5 ASCII incompatible encoding
+	  to UTF-8.
+
+	* lib/uri/common.rb (URI.encode_www_form_component):
+	  "\x83\x41" of Shift_JIS should be encoded as "%83A".
+	  This follows real implementations.
+
+	* lib/uri/common.rb (URI.decode_www_form_component):
+	  use given encoding for force_encoding. [ruby-dev:40721]
+
+Sun Mar 21 21:09:17 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv-replace.rb: specify super class for rdoc.
+
+	* lib/ipaddr.rb: ditto.
+
+Sun Mar 21 19:52:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_initialize): add autoclose argument to control close
+	  at finalization.  [ruby-core:26222]
+
+	* io.c (rb_io_autoclose_p, rb_io_set_autoclose): new methods.
+
+Sun Mar 21 19:50:04 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: make sources rdoc friendly.
+
+Sun Mar 21 17:57:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (IO_RBUF_CAPA_FOR): use large buffer as cbuf if readconv is
+	  needed for performance improvement.  based on a patch by Roger Pack
+	  in [ruby-core:28163].  [ruby-core:28162]
+
+Sun Mar 21 17:14:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: reuse hash object.
+
+Sun Mar 21 12:32:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (transcode_compile_tree): make
+	  valid_encoding mandatory unless from_encoding is registered in
+	  ValidEncoding.
+	  (transcode_tbl_only): ditto.
+	  (transcode_tblgen): ditto.
+	  (ValidEncoding): new function.
+
+	* enc/trans/escape.trans: specify valid_encoding.
+
+	* enc/trans/emoji_sjis_docomo.trans: ditto.
+
+	* enc/trans/emoji.trans: ditto.
+
+	* enc/trans/emoji_iso2022_kddi.trans: ditto.
+
+	* enc/trans/big5.trans: ditto.
+
+	* enc/trans/emoji_sjis_softbank.trans: ditto.
+
+	* enc/trans/emoji_sjis_kddi.trans: ditto.
+
+	* enc/trans/chinese.trans: use ValidEncoding() instead of
+	  ValidEncoding[].
+
+Sun Mar 21 09:43:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (IO_[CRW]BUF_CAPA_MIN): replaced magic numbers.
+
+Sun Mar 21 09:22:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* object.c (rb_obj_hash): use LONG2FIX to avoid Bignum allocation.
+
+Sat Mar 20 22:51:46 2010  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_sum): use UCHAR_MAX.
+
+Sat Mar 20 19:16:42 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (ActionMap.unambiguous_action): use
+	  Array#delete.
+	  (ActionMap.merge2): defined.
+	  (ActionMap::PostMemo): removed.
+	  (transcode_compile_tree): use ActionMap.merge2.
+
+Sat Mar 20 13:26:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_uniq_bang): the array is already unique if the
+	  length is zero or one.
+	  (rb_ary_uniq): ditto.
+
+Sat Mar 20 12:30:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib: fixed typo.  a patch by Sho Hashimoto in [ruby-dev:40716].
+
+Sat Mar 20 11:32:18 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (each_firstbyte_range): tuned for less
+	  method calls.
+
+Sat Mar 20 00:59:50 2010  wanabe  <s.wanabe@gmail.com>
+
+	* ext/dl/lib/dl/pack.rb (DL#pack): allow LLP64.
+
+Fri Mar 19 05:26:31 2010  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_sum): don't call method for each byte.
+
+Thu Mar 18 21:24:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (miniruby): link $(NORMALMAINOBJ).
+
+Thu Mar 18 19:52:27 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: scan singleton mappings sequentially.
+
+Thu Mar 18 06:28:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_EXEC_PREFIX): added to config.h.
+
+	* ruby.c (ruby_init_loadpath_safe): TMP_RUBY_PREFIX should be
+	  exec_prefix, not rubylibprefix.  [ruby-core:28718]
+
+	* version.c (RUBY_LIB_PREFIX): fallback to RUBY_EXEC_PREFIX.
+
+Thu Mar 18 05:58:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_{to_i,mod,divmod,div2}):
+	  removed unused variables.
+
+Thu Mar 18 04:40:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern3): get rid of type-punning cast.
+
+Thu Mar 18 02:29:42 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_build_body): add mark to jump table hash of case.
+
+Thu Mar 18 00:58:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): Add support for Hexadecimal
+	  floating-point expression [ruby-dev:40650] #2969
+
+Thu Mar 18 00:00:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.{en,de}code_www_form_component):
+	  renamed from URI.{en,de}code_www_component. [ruby-dev:40672]
+
+	* lib/uri/common.rb (URI.encode_www_form_component): %-encoded
+	  element should have always two hex.
+
+	* lib/uri/common.rb (URI.encode_www_form_component):
+	  better treatment for ASCII incompatible encodings and
+	  encodings whose lead byte may use 7bit.
+
+	* lib/uri/common.rb (URI.decode_www_form_component): add %20.
+
+	* lib/uri/common.rb (URI.decode_www_form_component): add
+	  result's encoding as 2nd argument.
+
+	* lib/uri/common.rb (URI.decode_www_form): added.
+
+Wed Mar 17 16:25:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_aset): allow recursive key.  [ruby-core:24648]
+
+Wed Mar 17 06:39:59 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.h (rb_warning, rb_sys_warning): fixed typo in rdoc.
+	  [ruby-core:28696]
+
+Wed Mar 17 02:29:46 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c, iseq.c, ruby.c, vm.c, vm_core.h, vm_eval.c: add absolute
+	  path field into rb_iseq_t.  The field contains a string representing
+	  a path to corresponding source file. or nil when the iseq is created
+	  from -e, stdin, eval, etc.  This field is used for require_relative.
+	  [ruby-dev:40004]
+
+	* load.c (rb_f_require_relative): add C implementation of
+	  require_relative.
+
+	* prelude.rb (require_relative): get rid of Ruby implementation of
+	  require_relative.
+
+Wed Mar 17 01:24:01 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (rb_intern3): prohibit Symbol with an invalid encoding.
+	  [ruby-core:24621]
+
+	* test/ruby/test_m17n_comb.rb: modify a test for above.
+
+Tue Mar 16 22:51:11 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: specialize for singleton mappings.
+
+Tue Mar 16 20:13:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enc/trans/emoji.trans: added codepoints leading 0xf4 into
+	  nomap_table.
+
+Tue Mar 16 17:33:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpCtoV): keep e's sign.
+	  When e doesn't over flow e * BASE_FIG but overflow e * 10,
+	  e will overflow.
+
+Tue Mar 16 17:18:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_str_conv_enc_opts): missing prototype.
+
+Tue Mar 16 15:20:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tmpdir: split from lib/tmpdir.rb.
+
+	* win32/win32.c (rb_w32_system_tmpdir): extracted from init_env.
+
+	* win32/win32.c (rb_w32_getcwd): removed duplicated code.
+
+Tue Mar 16 14:06:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (ENC_TO_ENCINDEX): suppress warnings.
+
+Tue Mar 16 14:03:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RSHIFT): parenthesize the argument of cast instead
+	  of the result.
+
+Tue Mar 16 11:23:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): ignore dname if it has different
+	  drive letter or UNC.
+
+Tue Mar 16 07:16:56 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: redundant loop removed.
+
+Tue Mar 16 07:01:43 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: refactored to use tree as memo key.
+
+Tue Mar 16 04:05:13 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: more info in generating macro names.
+
+Mon Mar 15 21:58:03 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: ActionMap#each_firstbyte inlined.
+
+Mon Mar 15 21:22:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (transcode_tblgen): add valid_encoding
+	  optional argument.
+
+	* enc/trans/single_byte.trans use valid_encoding argument for
+	  transcode_tblgen.
+
+	* enc/trans/chinese.trans: ditto.
+
+Mon Mar 15 18:33:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (default_rand): removed initial buffer.
+
+	* random.c (Init_RandomSeed): initialize seed of default random.
+
+	* random.c (Init_RandomSeed2): turn the seed to Bignum object.
+
+Mon Mar 15 17:28:30 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_print): RDoc update.  a patch from Daniel Kelley
+	  in [ruby-core:28643].
+
+Mon Mar 15 14:06:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (next_state): no initialization here.
+
+	* random.c (default_mt): always return initialized MT.
+
+Mon Mar 15 11:49:48 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c (rb_reset_random_seed): set seed in this.
+	  [ruby-core:28655]
+
+Mon Mar 15 10:26:02 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: import latest nkf. [master 9306cb0]
+	  this also fixes [ruby-dev:40607]
+
+Mon Mar 15 09:34:17 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.encode_www_component):
+	  call str.to_s at first.
+
+Mon Mar 15 09:36:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbian/README.SYMBIAN: fixed broken patch and converted to
+	  unified diff.
+
+Mon Mar 15 07:51:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
+
+Mon Mar 15 07:41:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (realpath_rec): use same cache.
+
+	* file.c (realpath_internal): regulate separators in prefix.
+	  [ruby-core:28653]
+
+	* file.c (FILE_ALT_SEPARATOR): separated condition.
+
+Mon Mar 15 04:41:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_each_codepoint): read directly when readconv is
+	  needed but internal encoding is not set.  [ruby-core:28650]
+
+Mon Mar 15 04:18:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/file2lastrev.rb (VCS::{SVN,GIT}#get_revisions):
+	  use block argument 'path' to get the path given by super.
+
+Mon Mar 15 02:43:59 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (Action#hash): defined.
+	  (Action#eql?): ditto.
+	  (Action#==): ditto.
+
+Mon Mar 15 01:52:46 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: refactored.
+
+Mon Mar 15 01:18:31 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup (*.pkg): Ruby Core installation separated from standard extensions.
+
+	* symbian/configure.bat: ditto.
+
+	* symbian/README.SYMBIAN: ditto.
+
+	* symbian/setup (config.h): support for 2nd internal drive added.
+
+Mon Mar 15 00:11:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/file2lastrev.rb (VCS::GIT_SVN#get_revisions) :
+	  use block argument 'path' to get the path given by super.
+
+	* tool/file2lastrev.rb (VCS::GIT#get_revisions):
+	  use double quotes for Windows.
+	  patched by Vladimir Sizikov [ruby-core:28651]
+
+Sun Mar 14 22:38:31 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: consider valid_encoding for max_input.
+
+Sun Mar 14 15:46:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/emoji.trans: fix nomap_table.
+
+Sun Mar 14 09:50:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (insn_data_to_s_detail), iseq.c (insn_operand_intern):
+	  fixed format specifiers.
+
+Sun Mar 14 07:20:17 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (EXPAND_PATH_BUFFER): make it back to usascii, to prevent
+	  infinite loop on some platform. [ruby-dev:40629]
+
+Sun Mar 14 02:40:38 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: reject ambiguous mapping.
+
+	* enc/trans/single_byte.trans: remove ambiguous mapping such as
+	  \xD6 -> U+05F2 and \xD6\xC7 -> U+FB1F in Windows-1255
+
+Sat Mar 13 23:48:27 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (file_expand_path): should not just copy the encoding
+	  from fname.  [ruby-core:28635]
+
+	* file.c (EXPAND_PATH_BUFFER): set filesystem_encoding, not
+	  usascii for path buffer.
+
+Sat Mar 13 17:48:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/file2lastrev.rb: refactored.  fixed changed revision of git.
+
+Sat Mar 13 15:44:20 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_print): should not print field separator at the end
+	  of arguments.  [ruby-talk:358633]
+
+Sat Mar 13 14:49:55 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_join): remove Enumerable#join. [ruby-core:24786]
+
+	* array.c (ary_join_1): use #to_ary to detect recursive array.
+
+Sat Mar 13 12:26:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h (MakeOpenFile): finalize fptr to get rid of
+	  memory leak.
+
+Sat Mar 13 11:14:26 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* load.c (rb_get_expanded_load_path): expand paths if any item in $:
+	  is not a string.
+
+Sat Mar 13 10:16:32 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* load.c (rb_get_expanded_load_path): does not expand paths if all
+	  the items in $: are absolute paths.  [ruby-core:28113]
+
+Sat Mar 13 10:03:52 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: fix [Bug #2840] Tk doesn't built in mingw.
+
+Sat Mar 13 03:24:15 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: show consumed time at last.
+
+Sat Mar 13 00:44:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_basename): check encoding of suffix.
+
+Sat Mar 13 00:11:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): mark initial load paths.
+
+	* gem_prelude.rb (push_all_highest_version_gems_on_load_path):
+	  search insertion position by initial load path mark.
+
+	* lib/rubygems.rb (Gem.load_path_insert_index): ditto.
+
+Fri Mar 12 21:34:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: emoji encodings.
+
+Fri Mar 12 17:14:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.encode_www_form): new method to
+	  generate URL-encoded form data. [ruby-dev:39246]
+
+	* lib/uri/common.rb (URI.encode_www_component,
+	  URI.decode_www_component): new method for encode/decode
+	  a name/value of HTML form.
+
+Fri Mar 12 17:36:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb
+	  (WEBrick::HTTPServlet::CGIHandler#do_GET):
+	  set binary mode for tempfile.
+	  http://pc12.2ch.net/test/read.cgi/tech/1265467681/286
+
+Fri Mar 12 13:52:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* tool/compile_prelude.rb: TMP_RUBY_PREFIX should replace
+	  rubylibprefix but not prefix.
+
+Fri Mar 12 09:43:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* complex.c (f_signbit): remove condition for signbit because
+	  all platforms have signbit from r26871.
+
+Fri Mar 12 07:25:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_env): get rid of alloca() for outer string.
+
+Fri Mar 12 07:17:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/racc/cparse/cparse.c: suppressed warnings for shortening on
+	  platforms where pointer is bigger than int.
+
+Fri Mar 12 07:15:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe, ruby_init_gems): set and remove
+	  TMP_RUBY_PREFIX.
+
+	* variable.c (rb_const_remove): new function.
+
+	* tool/compile_prelude.rb: split each preludes.
+
+Fri Mar 12 07:09:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (config.status): setup MINIRUBY environment for
+	  cross-compiling.
+
+Fri Mar 12 06:48:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/extconf.rb: log() is built-in in some compilers and needs
+	  proper declaration.
+
+Fri Mar 12 06:37:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sample/timeout.rb: split from lib/timeout.rb.
+
+Thu Mar 11 22:35:27 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_round): new method Time#round.  [ruby-dev:40595]
+
+Thu Mar 11 17:31:59 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_transcode0): confirm the code range.
+
+Thu Mar 11 12:14:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/signbit.c: added.
+
+Thu Mar 11 11:16:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if target_archs has changed.
+
+Thu Mar 11 01:33:30 2010  wanabe  <s.wanabe@gmail.com>
+
+	* win32/win32.c (signbit): allow x64.
+
+Thu Mar 11 01:04:48 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* iseq.c (rb_iseq_clone): sets local_iseq and klass properly.
+
+Wed Mar 10 21:25:41 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enum.c (min_ii, max_ii, minmax_ii): remove wrong optimization that
+	  reuses array for yield parameter, which caused unexpected behavior.
+	  [ruby-core:25989]
+
+Wed Mar 10 12:10:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enc/x_emoji.h: renamed from enc/x-emoji.c.
+
+Wed Mar 10 04:17:08 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (defined_expr), insns.def (defined): fix to pass a Symbol
+	  object such as :$foo for the "defined?($foo)" expression
+	  on defined instruction.  This patch fixes ISeq#to_a/load.
+
+Tue Mar  9 20:50:09 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/dl/test_method.rb: delete a residual test for dl on libffi.
+
+Tue Mar  9 18:00:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enc/trans/EMOJI/*.src, enc/trans/emoji*,
+	  enc/x-emoji.c, test/ruby/enc/test_emoji.rb,
+	  tool/enc-emoji-citrus-gen.rb, tool/enc-emoji4unicode.rb,
+	  tool/jisx0208.rb, tool/test/test_jisx0208.rb:
+	  new encodings to support emoji charsets, which are used by
+	  Japanese mobile phones [ruby-dev:40528].
+	  Thanks Yoji Shidara for a lot of contribution.
+
+	* tool/transcode-tblgen.rb: modified for enc-emoji4unicode.rb.
+
+Tue Mar  9 14:57:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/transcode-tblgen.rb (ActionMap#generate_node):
+	  remove useless dup.
+
+	* tool/transcode-tblgen.rb (transcode_tbl_only): remove duplicated
+	  method call for encode_utf8.
+
+Tue Mar  9 14:55:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_to_s): remove unused variable.
+
+Tue Mar  9 12:17:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* tool/transcode-tblgen.rb (StrSet#parse, ActionMap#generate_node):
+	  optimization (reusing object and improving memoize).
+	  [ruby-dev:40582]
+
+Sun Mar  7 02:27:03 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* dln.c [DLN_NEEDS_ALT_SEPARATOR] (translit_separator): small typo
+	  fixed.
+
+	* symbian/setup (*.pkg): Shared library installation path fixed to
+	  match changes in version.c.
+
+	* symbian/setup (ruby.mmp): SOURCE dln_find.c added.
+
+Sun Mar  7 23:14:22 2010  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_pack): use DIGSPERLONG and BITSPERDIG.
+	  (rb_big_unpack): use DIGSPERLONG.
+
+Sun Mar  7 19:21:10 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* io.c: Fix documentation for each/each_line/lines, bytes/each_byte,
+	  codepoints/each_code_point [ruby-core:23948]
+
+	* string.c: ditto
+
+	* ext/stringio/stringio.c: ditto
+
+Sun Mar  7 13:49:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* file.c: add optional basedir argument for realpath/realdirpath.
+	  (realpath_internal): handle basedir.
+	  (rb_file_s_realpath): extract basedir from argument list.
+	  (rb_file_s_realdirpath): extract basedir from argument list.
+
+	* lib/pathname.rb (realpath): pass basedir.
+	  (realdirpath): ditto.
+
+Sun Mar  7 02:05:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_set_filesystem_encoding):
+	  filesystem encoding on Mac OS X is now
+	  default external encoding. so Mac OS X is now
+	  treated as one of Unix. [ruby-dev:40439]
+
+	* file.c (file_path_convert): ditto.
+
+Sat Mar  6 22:07:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c: fix the prototype of rb_big2ulong_pack.
+
+Sat Mar  6 13:45:37 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (rb_io_s_write, rb_io_s_binwrite): delete File#write and
+	  #binwrite.  It may take a long time to make them stable, so 1.9.2
+	  should not include them.  We need refactoring to implement them
+	  again.
+
+	* test/ruby/test_io.rb: delete tests for them.
+
+Sat Mar  6 10:03:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (rb_io_s_binwrite): use mode "r+b" instead of "ab" to handle
+	  offset correctly.  [ruby-core:28517]
+
+	* test/ruby/test_io.rb: use assert_equal instead of assert.
+
+Sat Mar  6 01:08:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): VC6 has __int64.
+
+Fri Mar  5 19:36:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (econv_opts): set :undef => :replace when
+	  :replace is given and :invalid is not given. [ruby-dev:40554]
+
+Fri Mar  5 17:51:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): suppressed a warning.
+
+	* win32/win32.c (rb_w32_map_errno, winnt_stat, rb_chsize): ditto.
+
+	* win32/win32.c (rb_w32_aspawn): get rid of overflow.
+
+Fri Mar  5 11:59:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (signbit): defined on mingw.
+
+Thu Mar  4 22:49:42 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (setup_exception): avoid line number 0 when setting
+	  $DEBUG=true.  [ruby-dev:39116]
+
+Thu Mar  4 22:45:02 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (io_s_write, io_s_binwrite): add File#write and #binwrite.
+	  [ruby-core:21701]
+
+	* test/ruby/test_io.rb: add tests for above.
+
+Mon Mar  4 13:14:34 2010  wanabe  <s.wanabe@gmail.com>
+
+	* gc.c (gc_profile_total_time): add GC::Profiler.total_time.
+	  [ruby-core:27169]
+
+	* NEWS: ditto.
+
+Thu Mar  4 10:15:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* complex.c (m_log, m_exp): remove unused functions.
+
+Thu Mar  4 02:34:59 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_env.rb (TestEnv#test_select_bang): add tests.
+
+Thu Mar  4 02:29:52 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_hash.rb (TestHash#test_keep_if): fix typo.
+
+Thu Mar  4 00:10:54 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (HEX2): extracted from regexps.
+
+Wed Mar  3 23:16:32 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* complex.c (nucomp_real_check): raise TypeError instead of
+	  ArgumentError when argument is not a real as expected
+	  [ruby-core:28395]
+
+	* rational.c (nurat_int_check): ditto (for integers)
+
+Wed Mar  3 23:07:08 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (Vector#each): Return self and optimization
+	  [ruby-core:28405]
+
+Wed Mar  3 18:35:55 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_select_bang): add #select! and keep_if to Hash.
+
+	* hash.c (env_select_bang): ..and to ENV.
+
+Wed Mar  3 15:54:20 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/matrix.rb (Vector#each2, collect2): small refactoring.
+
+Wed Mar  3 16:14:24 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/matrix.rb (Vector#each): make Vector enumerable.
+	  [ruby-core:28405]
+
+Wed Mar  3 14:28:23 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_select_bang): select! removes all elements for
+	  which block returns false.  [ruby-core:27286]
+
+	* array.c (rb_ary_keep_if): #keep_if, new method.
+
+Wed Mar  3 06:19:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (signbit): defined.
+
+	* win32/Makefile.sub, symbian/setup (config.h): pack.c requires
+	  SIZEOF_INT*_T now.
+
+Tue Mar  2 21:16:48 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (rb_io_lines, rb_io_bytes, rb_io_chars, rb_io_codepoints):
+	  change to alias to each_*, in similar way to ARGF and String.
+	  [ruby-core:23948]
+
+Tue Mar  2 15:54:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (noname_disable_map): add NT_ANCHOR case.
+	  Without this change, captured groups in anchors (look-ahead,
+	  look-behind, and so on) are not removed and
+	  unintended invalid backref error occur. [ruby-core:28235]
+
+	* regcomp.c (renumber_by_map): ditto.
+
+Tue Mar  2 14:42:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* test/dl/test_closure.rb: forget to revert at r26764.
+
+Tue Mar  2 14:29:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext_safe, rb_find_file_safe): skip argument
+	  checks in file_expand_path().
+
+Tue Mar  2 13:54:44 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* test/ruby/test_math.rb: Fix lgamma test
+
+Mon Mar  1 23:26:56 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (pty_open): refine the path for master IO.
+
+Mon Mar  1 20:07:06 2010  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* ext/zlib/zlib.c (zstream_expand_buffer_into): remove compare
+	  different type values warning.
+
+Mon Mar  1 17:42:45 2010  wanabe  <s.wanabe@gmail.com>
+
+	* configure.in (mingw): do not detect snprintf/vsnprintf.
+
+Mon Mar  1 16:54:21 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/oniguruma.h: updated to follow Oniguruma 5.9.2.
+
+	* re.c (make_regexp): use onig_new() instead of onig_alloc_init().
+
+	* re.c (rb_reg_to_s): ditto.
+Sun Feb 28 21:32:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (get_device_once): raise on error when fail is
+	  non-zero.
+
+Sun Feb 28 18:58:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* math.c (rb_eMathDomainError): new exception class
+	  for representing mathematical domain error instead
+	  of Errno::EDOM.
+
+	* math.c (domain_check, infinity_check): removed,
+	  no longer needed.
+
+	* math.c (math_atan2, math_acos, math_asin, math_acosh,
+	  math_atanh, math_log, math_log2, math_log10, math_sqrt,
+	  math_gamma, math_lgamma): mathematical domain errors
+	  are checked and raised before calling libm's functions.
+
+	* test/ruby/test_math.rb: updated for changes of math.c.
+
+Sun Feb 28 15:07:28 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_pack): use union to avoid pointer cast.
+	  (pack_unpack): ditto.
+
+Sun Feb 28 11:49:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0.
+	  patched by Jeroen van Meeuwen at [ruby-core:25210]
+	  fixed by Nobuyoshi Nakada [ruby-core:25238],
+	  Hongli Lai [ruby-core:27417],
+	  and Motohiro KOSAKI [ruby-core:28063]
+
+	* ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls):
+	  split pkcs7_get_certs_or_crls.
+
+Sun Feb 28 11:42:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/openssl/{test_x509cert.rb,openssl,test_x509crl.rb,
+	  test_x509req.rb}:
+	  fix false positive tests because of OpenSSL spec change.
+	  patched by originally Hongli Lai [ruby-core:27417],
+	  and fixed by Motohiro KOSAKI [ruby-core:28063]
+
+Sun Feb 28 11:21:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/openssl/{test_x509cert.rb,openssl,test_x509req.rb}:
+	  remove false positive tests because of OpenSSL spec change.
+	  patched by Motohiro KOSAKI [ruby-core:28063]
+	  see also [ruby-dev:40077]
+
+Sun Feb 28 11:25:16 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_pack): generalized integer packer implemented.
+	  (pack_unpack): generalized integer unpacker implemented.
+
+Sun Feb 28 06:58:53 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swap32): use __builtin_bswap32 on gcc 4.3.0 or later.
+	  (swap64): ditto.
+
+Sun Feb 28 00:38:18 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c: use integer types with explicit size.
+
+Sat Feb 27 15:54:55 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c: check assumption on QUAD_SIZE and SIZEOF_LONG.
+
+	* bignum.c: check assumption on SIZEOF_LONG and SIZEOF_BDIGITS.
+
+Sat Feb 27 03:48:18 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c: fix q and Q for big endian environments which have no
+	  8 bytes integer type.
+	  (pack_pack): use rb_big_pack.
+	  (pack_unpack): use rb_big_unpack.
+
+	* include/ruby/intern.h (rb_big_pack): declared.
+	  (rb_big_unpack): ditto.
+
+	* bignum.c (rb_big_pack): new function.
+	  (rb_big_unpack): ditto.
+
+Fri Feb 26 21:36:51 2010  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: fix rb_quad_pack and rb_quad_unpack for environments
+	  which don't have 8bytes integer type.  This still depends on little
+	  endian.
+	  (rb_quad_pack): use quad_buf_complement.  don't raise for large
+	  values.
+	  (rb_quad_unpack): use quad_buf_complement.
+	  (quad_buf_complement): new function extracted from rb_quad_pack.
+	  add one after bitwise negation.
+
+Fri Feb 26 21:29:48 2010  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (RSHIFT): add parenthesis to suppress warning.
+
+Fri Feb 26 20:51:47 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/socket/raddrinfo.c, ext/socket/udpsocket.c: avoid illegal cast
+	  from void-returning function to VALUE-returning one.  It causes SEGV
+	  on RubySpec with mingw32.
+
+Fri Feb 26 20:07:48 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (QUAD_SIZE): it should be always 8.
+
+	* bignum.c (rb_quad_pack): use LONG_LONG version only if
+	  SIZEOF_LONG_LONG == QUAD_SIZE.
+
+Fri Feb 26 16:49:29 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (swap64): fix for VC6.
+
+Fri Feb 26 14:17:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_pack, pack_unpack): suppressed warnings.
+
+Fri Feb 26 07:44:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/dl: revert dl with libffi because it can't run on mswin now.
+
+Thu Feb 25 22:59:46 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c: consider DYNAMIC_ENDIAN.  refactored.
+
+Thu Feb 25 11:17:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* rational.c (nurat_expt): use Float#** when Rational ** Float.
+	  This fixes Rational(3,1)**3.0=>26.99999999999999 on FreeBSD.
+
+	* complex.c (rb_fexpt): removed.
+	  Note that this function is not static but is private.
+
+Thu Feb 25 00:43:57 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: Change the operand type of setinlinecache
+	  (OFFSET to IC).  This IC must be same as corresponding
+	  getinlinecache instruction's IC operand.
+	  This change is for a little performance improvement
+	  (getting IC directly) and is for the AOT compilation development.
+
+	* compile.c, iseq.c, insns.def: Change the approach to handling inline
+	  cache (IC) type operand to enable the above change.
+	  This change also affects ISeq#to_a method.  The inline cache operand
+	  will be dumped by fixnum, the index of inline cache, in other words,
+	  inline cache identity.
+
+	* template/insns_info.inc.tmpl, tool/instruction.rb: No need to count
+	  inline cache size (insn_iclen()).
+
+Thu Feb 25 00:57:59 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swap64): don't redefine.
+
+Thu Feb 25 00:29:55 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_unpack): don't use OFF32 for gcc 4.5.
+
+Wed Feb 24 22:39:15 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg.
+	  (Resolv::DNS::Requester#request): raise ResolvTimeout
+	  consistently for timeout.
+
+Wed Feb 24 14:38:16 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer: Removed obsolete files.
+
+Wed Feb 24 11:52:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (translit_separator): moved back from load.c again.
+
+	* dln_find.c: split from dln.c.
+
+Wed Feb 24 09:31:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/extconf.rb: use OpenSSL only when all transform
+	  functions are available.
+
+Wed Feb 24 00:39:17 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (str_new_empty): String#split, partition, rpartition
+	  taints the resulting strings if self is tainted.
+
+Mon Feb 22 21:35:33 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/digest/sha2/sha2init.c: test OpenSSL more strictly.
+
+Mon Feb 22 11:52:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems: update to 1.3.6.
+
+Mon Feb 22 11:21:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/sha2: Use OpenSSL's SHA1 engine if available.
+
+Sun Feb 21 21:20:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile, install_files): honor srcprefix
+	  argument if given.  [ruby-dev:40449]
+
+Sun Feb 21 13:29:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/rubygems_version.rb: outdated.  [ruby-core:28275]
+
+Sun Feb 21 06:24:12 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup (config.h): HAVE_STRUCT_TIMEZONE, VOID_UNSETENV, and RUBY_LIB_VERSION_STYLE defined.
+	* symbian/setup (ruby.mmp): SOURCE node.c added.
+
+Mon Feb 22 09:15:45 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark_children): lost comment added.
+
+Sat Feb 20 14:42:19 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object0): should prepare placeholder before
+	  processing instance variables.  [ruby-dev:40414]
+
+	* marshal.c (id2encidx): no longer need arg.
+
+Sat Feb 20 14:36:16 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm.c (vm_backtrace_each): use called_id when method definition
+	  structure is already freed.  [ruby-dev:40234] [ruby-core:27959]
+
+Fri Feb 19 00:04:19 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/drb/drb.rb (DRbServer#stop_service): join killed thread to
+	  ensure service stops.  [ruby-dev:40441]
+
+Thu Feb 18 22:31:15 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* math.c (math_atanh): raise ERANGE without calling atanh if absolute
+	  value is 1 to achieve platform-independent math.  [ruby-core:28219]
+
+	* math.c (math_lgamma): return [Infinity, 1] without calling lgamma_r
+	  if argument is infinity or -infinity.  [ruby-core:28219]
+
+Thu Feb 18 22:28:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* configure.in: new --with-ext and --with-out-ext options for extmk.
+	* tool/mkconfig.rb: normalizing --with-out-ext to --without-ext.
+
+Thu Feb 18 21:50:00 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'.
+
+Thu Feb 18 02:14:26 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (io_fread, io_getpartial, io_read, io_sysread): by using lock,
+	  prohibit modification of buffer string during read (which had caused
+	  EFAULT or SEGV).  [ruby-dev:40437]
+
+	* test/ruby/test_io.rb: rewrite tests for the old behavior.
+
+Wed Feb 17 21:34:01 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regcomp.c (setup_tree, onig_compile): optimize .* at last by
+	  converting into (?>.*), which does not backtrack.  [ruby-core:27791]
+
+	* test/ruby/test_regexp.rb: add a test for above.
+
+Wed Feb 17 21:26:53 2010  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_normal_exit): add :timeout option.
+
+Wed Feb 17 17:05:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_cfunc): removed unused variable.
+
+	* vm.c (vm_frametype_name): define only when VMDEBUG.
+
+Wed Feb 17 15:34:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/dl_conversions.c (rb_dl_type_to_ffi_type): support signed
+	  long long.
+
+	* ext/dl/cfunc.c (rb_dlcfunc_inspect): get rid of overflow.
+
+	* ext/dl/closure.c (dlc_callback, rb_dlclosure_init): ditto.
+
+	* ext/dl/cptr.c (rb_dlptr_s_malloc): ditto.
+
+	* ext/dl/method.c (rb_dlfunction_initialize): ditto.
+
+Wed Feb 17 01:16:12 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* hash.c (hash_update): always raise an exception when adding a new
+	  key during iteration.  Traditionally, an exception was raised only
+	  when rehash occurs, but it may lead to difficult bug to reproduce.
+	  [ruby-core:23614]
+
+Tue Feb 16 22:09:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gc.c (chain_finalized_object): fix precedence.
+
+Tue Feb 16 21:32:01 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gc.c (rb_objspace_call_finalizer): always run finalizer at exit,
+	  before object is free'd.  [ruby-dev:40382]
+
+Tue Feb 16 20:56:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (rb_group_member): renamed from group_member.
+	  don't use group_member() in glibc because it's not valgrind clean.
+	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570047
+
+Tue Feb 16 19:19:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): convert signed value to
+	  unsigned.
+
+Tue Feb 16 19:02:59 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/dl/test_{base,handle}.rb: use more verbose assertions.
+
+	* test/dl/test_import.rb (DL::LIBC::BoundQsortCallback): renamed
+	  to get rid of overwriting warning.
+
+Tue Feb 16 11:03:19 2010  Aaron Patterson  <aaron@tenderlovemaking.com>
+
+	* ext/dl/method.c: Adding DL::Method as a superclass for DL::Function
+
+Mon Feb 15 23:37:30 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: check lseek error by errno.  NetBSD 4.0.1 may return -1 as
+	  a file position of tty.
+
+Mon Feb 15 23:08:56 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pstore.rb (PStore#initialize): initialize @thread_safe.
+	  [ruby-core:27853]
+
+Mon Feb 15 22:45:26 2010  Tanaka Akira  <akr@fsij.org>
+
+	* st.c (st_foreach): don't access ptr->hash after func call.
+	  It may access freed area.
+
+Mon Feb 15 22:25:16 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/zlib/zlib.c (zlib_mem_alloc): suppress valgrind warnings.
+	  http://www.zlib.net/zlib_faq.html#faq36
+
+Mon Feb 15 22:18:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_add): propagate fixed time offset.
+
+Mon Feb 15 17:42:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* signal.c (USE_SIGALTSTACK): NetBSD can't use sigaltstack(2)
+	  with pthread.
+	  http://netbsd.gw.com/cgi-bin/man-cgi?sigaltstack++NetBSD-current
+
+Mon Feb 15 13:11:47 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_push_m): use rb_ary_modify instead of
+	  rb_ary_modify_check. This fixes regression due to r26632.
+
+Sun Feb 14 12:54:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): removed duplicated entry for regexp.
+	  [ruby-dev:40416]
+
+Sun Feb 14 04:45:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): register regexp object before encoding
+	  name.  [ruby-dev:40414]
+
+	* re.c (rb_reg_alloc, rb_reg_init_str): split from rb_reg_new_str.
+
+Sat Feb 13 17:07:20 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_delete): RDoc update.  a patch from Hugh Sasse.
+	  [ruby-core:28128]
+
+	* array.c (rb_ary_compact_bang): ditto.
+
+Sat Feb 13 15:01:24 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (id2encidx): duplicated entry for encoding name.
+	  [ruby-dev:40388]
+
+Sat Feb 13 12:17:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb (Tempfile::Remover): new class to replace
+	  Tempfile.callback.  port r24902 from Ruby 1.8.
+
+Fri Feb 12 17:55:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (thread_free): fixed typo.
+
+Fri Feb 12 02:27:39 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#initialize, Set#replace, Set#merge)
+	  (Set#subtract, Set#&): Fix duck type tests. [ruby-core:28078]
+
+	* lib/set.rb (Set#initialize, Set#replace, Set#merge)
+	  (Set#subtract, Set#&): Try #each if #each_entry fails.
+
+Thu Feb 11 20:43:00 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_oflags_modestr): return "r" for O_RDONLY|O_APPEND.
+	  [ruby-dev:40379]
+
+Thu Feb 11 19:19:21 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* missing/alloca.c: s/RUBY_LIB/RUBY_LIB_PREFIX/ [ruby-dev:40395]
+
+Thu Feb 11 17:52:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_exec): reset thread state before restarting vm loop
+	  from catch scope.  [ruby-core:28129], [ruby-core:28143]
+
+Thu Feb 11 14:43:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): read sequentially since marshal source
+	  may not be possible to rewind.  [ruby-dev:40386]
+
+	* marshal.c (r_object0): replace non-1.8 escapes directly.
+
+Thu Feb 11 09:49:31 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: fix [ruby-core:28144] reported by Hans de Graaff.
+	  (Resolv::DNS#make_requester): pass nameserver_port to
+	  UnconnectedUDP.new.
+	  (Resolv::DNS.bind_random_port): change the is_ipv6 argument to
+	  bind_host.
+	  (Resolv::DNS::Requester#initialize): change instance variable to
+	  store multiple sockets.
+	  (Resolv::DNS::Requester#request): pass readable sockets to
+	  recv_reply.
+	  (Resolv::DNS::Requester#close): close all sockets.
+	  (Resolv::DNS::Requester::UnconnectedUDP#initialize): allocate
+	  a socket for each address family of name servers.
+	  (Resolv::DNS::Requester::UnconnectedUDP#recv_reply): read from the
+	  passwd readable socket.
+	  (Resolv::DNS::Requester::UnconnectedUDP#sender): use appropriate
+	  socket for the target nameserver.
+	  (Resolv::DNS::Requester::ConnectedUDP): follow the instance variable
+	  change.
+	  (Resolv::DNS::Requester::TCP#sender): ditto.
+	  (Resolv::DNS::Config#nameserver_port): new method.
+
+Thu Feb 11 01:45:04 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (vm_exec): temporarily revert r26628, which causes SEGV when
+	  executing rubyspec.
+
+Wed Feb 10 16:31:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_push_m, rb_ary_unshift_m, rb_ary_aset),
+	  (rb_ary_insert, rb_ary_replace, rb_ary_concat),
+	  (rb_ary_uniq_bang, rb_ary_flatten_bang): check if frozen after
+	  wrong number of arguments but before TypeError.
+	  [ruby-core:28140]
+
+	* hash.c (rb_hash_replace): ditto.
+
+	* string.c (rb_str_replace): ditto.
+
+Wed Feb 10 04:06:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_exec): reset thread state before starting vm loop.
+	  [ruby-core:28129]
+
+Tue Feb  9 23:48:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): fix precision too.
+
+Tue Feb  9 23:26:07 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix precision.
+	  [ruby-core:17472][ruby-dev:35372][ruby-dev:40105][ruby-dev:40358]
+
+Tue Feb  9 22:23:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (READ_CHECK): do not select fd before reading, that had made
+	  TCPServer#gets stuck.  [ruby-dev:40317]
+
+Tue Feb  9 21:27:38 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/text.rb (REXML::Text#initialize): REXML::Text.new checks
+	  raw text for illegal characters without entity check, for the sake
+	  of 1.8 compatibility.  This had caused rubyspec error.
+
+Mon Feb  8 23:49:24 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_getline_fast): wrong calculation of new position
+	  from rb_str_coderange_scan_restartable().  [ruby-core:28103]
+
+	* io.c (read_all): ditto.
+
+	* sprintf.c (rb_str_format): ditto.
+
+Mon Feb  8 21:03:53 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (socket_s_ip_address_list): obtain the scope_id
+	  of IPv6 link local address on OpenSolaris.
+
+Mon Feb  8 16:27:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dmyversion.c: empty load path in miniruby.
+
+	* common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.
+
+	* tool/eval.rb, win32/{mkexports,resource}.rb: miniruby no longer
+	  contains "." in $:.
+
+Mon Feb  8 15:15:07 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_clone): call initialize_clone hook method to
+	  call initialize_copy.
+
+	* object.c (rb_obj_dup): call initialize_dup hook.
+
+	* lib/delegate.rb (Delegator#initialize_clone): use new hook to
+	  implement deep copy.  [ruby-dev:40242]
+
+	* lib/delegate.rb (Delegator#initialize_dup): ditto.
+
+	* test/test_delegate.rb (TestDelegateClass#test_copy_frozen): add
+	  a test to ensure #clone copies frozen status.
+
+Mon Feb  8 10:28:58 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: check pthread_attr_getstack to prevent obsolete
+	  warning for pthread_attr_getstackaddr.
+
+Sun Feb  7 23:12:34 2010  Tanaka Akira  <akr@fsij.org>
+
+	* sample/test.rb: sort files for syntax validation.
+
+Sun Feb  7 23:08:53 2010  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb: sort test files.
+
+Sun Feb  7 12:53:12 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rake.rb (Rake::FileList::ARRAY_METHODS): fix test failure by <=>
+	  definition at Kernel.
+
+Sun Feb  7 03:01:46 2010  Tanaka Akira  <akr@fsij.org>
+
+	* math.c (math_lgamma): initialize sign because
+	  lgamma(NaN) doesn't set the sign in OpenSolaris.
+
+Sun Feb  7 00:23:21 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* class.c (rb_class_init_copy): raise a TypeError if the argument is
+	  BasicObject.  [ruby-core:27060]
+
+Sat Feb  6 23:37:11 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (initialize): set @sock to a NullSocket instance to
+	  raise FTPConnectionError when not connected.   [ruby-dev:40258]
+
+Sat Feb  6 23:25:57 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses/view2.rb: replaced with Hugh Sasse's version.
+	  [ruby-core:27894]
+
+Sat Feb  6 22:57:00 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (receive_responses): does not hang when an
+	  unexpected BYE response received.  fixed [ruby-core:27944].
+	  Thanks, Bob Potter.
+
+Sat Feb  6 21:31:23 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb (wait): supported timeout.
+
+	* test/net/imap/test_imap.rb (test_exception_during_idle): use timeout.
+
+Sat Feb  6 19:35:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* tool/compile_prelude.rb: fix require path.
+
+Sat Feb  6 12:02:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#method_missing),
+	  (Delegator.delegating_block): don't hide backtrace from
+	  __getobj__ and reduced exception messages when $DEBUG.
+
+Sat Feb  6 11:35:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/ipsocket.c (ip_addr, ip_peeraddr),
+	  ext/socket/socket.c (sock_s_getaddrinfo): added optional
+	  reverse_lookup flag.  [ruby-core:28007]
+
+Sat Feb  6 01:55:02 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/stringio/stringio.c (strio_ungetc): pads with \000 when the
+	  current position is after the end.  [ruby-dev:40271]
+
+Sat Feb  6 01:14:54 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/purelib.rb, common.mk: to simulate ruby command more precisely,
+	  remove "." from $: of virtual environment for build and test.
+
+Sat Feb  6 00:02:31 2010  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (fill_random_seed): don't use O_NOFOLLOW because
+	  /dev/urandom is a symlink in OpenSolaris.
+
+	* lib/securerandom.rb (SecureRandom.random_bytes): ditto.
+
+Fri Feb  5 16:38:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator): include copy of Kernel.
+	  [ruby-dev:40314]
+
+	* lib/delegate.rb (Delegator#{dup,clone}): class of copy should be
+	  Delegator.  [ruby-dev:40313]
+
+Fri Feb  5 09:26:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bignum.c (big_op): remove unused variables.
+
+Fri Feb  5 02:06:57 2010  Aaron Patterson  <tenderlove@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb: Struct members are emitted without a leading
+	  colon.  Thanks Yusuke Endoh! [ruby-core:28052]
+
+	* test/yaml/test_struct.rb: fixed tests to go with Struct changes
+
+	* test/yaml/test_yaml.rb: fixed tests to go with Struct changes
+
+Fri Feb  5 00:34:24 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (big_gt, big_ge, big_lt, big_ge): added Bignum#>, >=, < and
+	  <= to allow to compare with BigDecimal.  [ruby-dev:40167]
+
+Thu Feb  4 15:47:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (native_thread_init_stack): use get_stack.
+	  patched by KOSAKI Motohiro [ruby-dev:40309]
+
+	* thread_pthread.c (ruby_init_stack): use get_stack
+	  on platforms which have pthread_attr_get_np.
+	  (FreeBSD, DragonFlyBSD and NetBSD)
+	  This is because FreeBSD and DragonFly BSD must use
+	  pthread_attr_get_np to get stack size of main thread,
+	  but Mac OS X and Linux with LinuxThreads must use getrlimit.
+	  <http://www.nminoru.jp/~nminoru/programming/stackoverflow_handling.html>
+	  <http://d.hatena.ne.jp/nurse/20100204>
+
+Thu Feb  4 09:55:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: FreeBSD, DragonFly BSD and OpenBSD needs
+	  pthread_np.h to use pthread_*_np functions.
+	  OpenBSD's pthread_*_np also depend sys/signal.h,
+	  but it is included at signal.h via vm_core.h via thread.c.
+
+Thu Feb  4 08:15:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator): now inherits BasicObject.
+	  [ruby-dev:39154], [Bug #2679], [ruby-dev:40242]
+
+Thu Feb  4 03:00:59 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): get red of
+	  floating point exception.
+
+Thu Feb  4 01:24:01 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix infinity
+	  handling.  1 / Infinity was evaluated to NaN.
+
+Thu Feb  4 00:37:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_mdump, time_mload): dump/load utc_offset.
+	  [ruby-dev:40063]
+
+Wed Feb  3 22:22:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check for non-portable stack attribute functions.
+
+Wed Feb  3 20:10:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/iconv/charset_alias.rb: pass block argument to outer local
+	  variable.
+
+Wed Feb  3 20:08:05 2010  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (realpath_rec): rb_path_last_separator may return NULL.
+
+Wed Feb  3 13:15:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c: DragonFlyBSD is also the same as FreeBSD
+	  on getting the stack size of the main thread.
+
+Wed Feb  3 12:30:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack): use pthread_get_attr_np
+	  to get the stack size of the main thread on FreeBSD.
+
+	* thread_pthread.c: include pthread_np.h on FreeBSD.
+
+Wed Feb  3 11:38:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/{closure,function}.c: removed C99 features and warnings.
+
+Wed Feb  3 10:12:09 2010  Aaron Patterson  <tenderlove@ruby-lang.org>
+
+	* ext/dl/function.c: DL::Function now uses libffi
+
+	* ext/dl/cfunc.c (rb_dl_set_last_error): set to non static so errors
+	  can be exposed.
+
+	* ext/dl/closure.c: DL::Closure will now be used in place of
+	  ext/dl/callback/*.
+
+	* ext/dl/dl.c: legacy callbacks removed in favor of libffi
+
+	* ext/dl/dl_conversions.(c,h): used for converting ruby types to FFI
+	  types.
+
+	* ext/dl/callback/*: replaced by libffi callbacks.
+
+	* ext/dl/lib/dl/callback.rb: Converting internal callbacks to use
+	  DL::Closure
+
+	* ext/dl/lib/dl/closure.rb: Ruby parts of the new DL::Closure object
+
+	* ext/dl/lib/dl/import.rb: More conversion to use DL::Closure object
+
+	* ext/dl/lib/dl/value.rb (ruby2ffi): adding private method for
+	  DL::CPtr to ffi value conversion.
+
+Tue Feb  2 18:15:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c: turn on do_not_reverse_lookup by default,
+	  which has been reverted in r9880 probably unintentionally,
+	  according to matz.  [ruby-core:24530]
+
+Tue Feb  2 14:46:06 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c: move implementation of each_slice, each_cons,
+	  each_with_object to enum.c.
+
+	* enum.c (each_slice_i): convert multiple values from yield into
+	  an array.
+
+	* enum.c (each_cons_i): ditto.
+
+	* enum.c (each_with_object_i): ditto.
+
+Tue Feb  2 14:30:27 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_each_entry): new method #each_entry to pack values
+	  from yield into an array.
+
+	* lib/set.rb (Set#merge): use Enumerable#each_entry to implement
+	  Set compatible to 1.8 behavior.  [ruby-core:27985]
+
+	* lib/set.rb: replace is_a?(Enumerable) with respond_to?(:each)
+	  for duck typing.
+
+	* lib/set.rb (SortedSet#add): typo fixed.
+
+Tue Feb  2 11:13:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#marshal_dump): exclude
+	  delegator-specific instance variables.
+
+Mon Feb  1 21:26:41 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/matrix.rb (Vector#each2): returns a self.  [ruby-dev:40241]
+
+Mon Feb  1 17:08:42 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_minus): RDoc update.  a patch from red stun
+	  in [ruby-core:27951]
+
+Mon Feb  1 07:36:33 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil/tkutil.c: fix SEGV on TkUtil::CallbackSubst._setup_subst_table.
+
+	* ext/tk/lib/tk.rb: [ruby1.9] fix freeze at exit.
+
+	* ext/tk/lib/tk.rb: [POTENTIAL INCOMPATIBLE] return NoMethodError
+	  for TkWindow#to_ary and to_str.
+
+	* ext/tk/lib/tkextlib/tcllib/plotchart.rb: wrong arguments.
+
+	* ext/tk/sample/tkballoonhelp.rb: fail to support TkEntry widgets.
+
+Sun Jan 31 23:20:43 2010  wanabe  <s.wanabe@gmail.com>
+
+	* io.c (rb_io_each_codepoint): use cbuf when needs readconv.
+
+Sun Jan 31 23:07:23 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_dir.rb: use string instead of symbol as file name.
+
+Sun Jan 31 22:41:33 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_string_value): fix the previous commit.
+
+Sun Jan 31 21:43:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_string_value): make no exception for Symbol.
+	  [ruby-dev:40274]
+
+Sun Jan 31 21:10:15 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (vm_throw): fixed infinite loop.  [ruby-core:27969]
+
+Sun Jan 31 21:29:58 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
+	  parent is specified, since Text.check may need doctype.  partially
+	  revert r26518.
+
+Sun Jan 31 15:50:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/text.rb (REXML::Text#initialize): fix typo and a bug that
+	  seems to be caused by refactoring.
+
+Sun Jan 31 15:46:37 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/parent.rb (REXML::Parent#delete): return the deleted node
+	  because the rdoc of REXML::Element#delete_element says it returns
+	  "the element that was removed."  [REXMLTracker#161]
+
+Sun Jan 31 14:33:00 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: A bug fix for deleting blank Table rows from Andy Hartford.
+
+Sun Jan 31 13:31:43 2010  wanabe  <s.wanabe@gmail.com>
+
+	* gc.c (obj_free): free rb_classext_t of eigenclass.  [Bug #1392]
+
+Sun Jan 31 13:00:14 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/document.rb (REXML::Document#add): fix duplicate XMLDecls
+	  and bad DocTypes in REXML::Document.    (Bug #19058) [ruby-core:27979]
+	  based on the patch by Federico Builes.
+
+Fri Jan 29 22:49:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/getoptlong.rb (set_options): ensure that the type of argument is
+	  Array, restoring this check that was deleted at r10239.  This caused
+	  rubyspec error.
+
+Fri Jan 29 12:59:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (mingw): needs $(DEFFILE) for extension libraries.
+	  [ruby-core:27946]
+
+Fri Jan 29 11:09:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_do): log no source when no development env.
+
+	* lib/mkmf.rb (create_makefile): srcprefix always needs $(srcdir).
+
+	* lib/mkmf.rb (create_makefile): yield configuration if a block is
+	  given.
+
+Fri Jan 29 09:43:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf8_mac.trans (buf_shift_char): don't see uninitialized
+	  value. [ruby-dev:40233]
+
+Fri Jan 29 01:42:24 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#initialize_copy): use initialize_copy
+	  instead of overriding clone/dup.  [ruby-dev:40221]
+	  it now always clones the target, it might cause incompatibility.
+
+Fri Jan 29 01:26:53 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): update RDoc to
+	  denote that #to_i raises FloatDomainError for Inf and NaN.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): fast #to_i using
+	  BigDecimal_split().
+
+	* bignum.c (conv_digit): use faster ISDIGIT() assuming ASCII.
+
+Fri Jan 29 00:18:54 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/cgi.rb: set autoload to CGI::HtmlExtension.  [ruby-dev:40194]
+
+Thu Jan 28 09:44:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (onig_compile): initialize ScanEnv.
+	  mainly to initialize env->warnings_flag [ruby-dev:40196]
+
+	* regparse.c (scan_env_clear): clear warnings_flag.
+
+Wed Jan 27 23:33:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/matrix/test_matrix.rb, test/matrix/test_vector.rb: add some
+	  tests.
+
+Wed Jan 27 23:29:36 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/thread.rb (ConditionVariable#wait, signal, broadcast): return
+	  self (for 1.8 compatibility).
+
+Wed Jan 27 23:27:54 2010  Keiju Ishitsuka  <keiju@emperor2.pendome>
+
+	* lib/matrix.rb: add exception Matrix::ErrOperationNotImplemented
+	  [ruby-dev:40149].
+	* lib/matrix.rb: change message of exception
+	  Matrix::ErrOperationNotDefined [ruby-dev:40150], [ruby-dev:40176].
+	* lib/matrix.rb: add method Vector#/ [ruby-dev:40151].
+	* lib/matrix.rb(Matrix::Scalar#+,-,/): delete meaningless when
+	  switch. [ruby-dev:40149]
+
+Wed Jan 27 23:22:54 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* vm_dump.c (bugreport_backtrace): trivial change.
+
+	* vm_dump.c (rb_vm_bugreport): uninitialized local variable i.
+	  [ruby-dev:40169]
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test):
+	  follow above change.
+
+Wed Jan 27 23:20:52 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_exception.rb
+	  (TestException#test_thread_signal_location):
+	  change test method name.
+
+Wed Jan 27 22:48:40 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/matrix.rb (determinant): fix name error.
+
+Wed Jan 27 22:26:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_backtrace): "circular require" warning was output to
+	  stdout except the first line.  All line is output to stderr now.
+	  [ruby-dev:40147]
+
+Wed Jan 27 00:22:20 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod, BigDecimal_mod,
+	  BigDecimal_divmod, BigDecimal_div2): BigDecimal#% and #div returned
+	  an array itself that was returned by #divmod.
+
+Wed Jan 27 00:19:30 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpCtoV): do not raise infinity
+	  exception for BigDecimal("0E200000000000").
+
+Tue Jan 26 21:50:31 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpCtoV): BigDecimal("0E200000000000")
+	  was Infinity, not 0.
+
+	* test/bigdecimal/test_bigdecimal.rb: add a test for above.
+
+Tue Jan 26 21:36:22 2010  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: test unsetenv returns a value.
+	  unsetenv is void in older BSDs (FreeBSD 6 and OpenBSD 4.5 at least).
+
+	* hash.c (ruby_setenv): don't use the result of unsetenv if unsetenv
+	  doesn't return a value.
+
+Tue Jan 26 21:32:03 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: suppress a warning.
+
+	* ext/extmk.rb: ditto.
+
+Tue Jan 26 20:23:22 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (rb_vm_invoke_proc): this function must not catch TAG_RETURN
+	  because vm_exec does.  This caused rubyspec error.  [ruby-dev:40158]
+
+Tue Jan 26 20:21:28 2010  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/eq.rb: fix circular require in drb.
+	  reported by akr. see [ruby-dev:40156] [ruby-core:27661]
+
+Tue Jan 26 19:59:17 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c (rb_gzfile_s_wrap): add rdoc. [Bug #2656]
+	  patched by Hugh Sasse [ruby-core:27692] [ruby-core:27852]
+
+	* ext/zlib/doc/zlib.rd: removed.
+
+Tue Jan 26 16:43:34 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/strscan/strscan.c: fix rdoc. (length -> bytesize)
+	  reported by Kornelius Kalnbach. see [ruby-core:27792]
+
+Tue Jan 26 07:06:05 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/matrix.rb: suppress warnings.
+
+Tue Jan 26 03:16:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c, vm_core.h, eval.c: because rb_protect must not be jumped by
+	  callcc, revert r26407.  And rename trap_tag to protect_tag and
+	  change exception message (across trap -> across stack rewinding
+	  barrier).
+
+Mon Jan 25 23:08:10 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (do_select): wrong conditions.  [ruby-core:27753]
+
+Mon Jan 25 22:31:53 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/envutil.rb: use method_defined? instead of
+	  instance_methods.include?.
+
+Mon Jan 25 22:08:20 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (rb_cont_call, cont_restore_1): remove trap_tag check because
+	  it seems not to make sense.  [ruby-dev:40121]
+
+	* vm_core.h, eval.c (rb_protect): ditto.
+
+Mon Jan 25 21:43:05 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/envutil.rb: fix the check if instance method `ruby' is
+	  defined or not.
+
+Mon Jan 25 21:17:32 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rubyoptions.rb (test_segv_test): add a test for
+	  bugreport trace dumper.
+
+Mon Jan 25 17:47:02 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (pty_check): needs WNOHANG to poll, return $?, and
+	  call raise_from_check() with pid_t.  [ruby-dev:40141]
+
+Mon Jan 25 17:36:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* version.c (RUBY_LIB, RUBY_*_LIB): moved from configures.
+
+Mon Jan 25 12:11:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (USE_SIGALTSTACK): only when SA_SIGINFO also is
+	  available.  see [ruby-core:27768].
+
+Mon Jan 25 12:02:34 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dln.c, file.c, io.c, signal.c: add __HAIKU__.
+	  patched by Alexander von Gluck [ruby-core:27767]
+
+Mon Jan 25 11:45:47 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* math.c (domain_check): ignore errno if y is inf.
+	  r26335 is because NetBSD 5.0's asin and acos returns
+	  0.0 with errno EDOM. But it breaks Linux whose gamma returns inf
+	  with errno ERANGE on.
+
+Sun Jan 24 22:48:05 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, vm.c, vm_eval.c, vm_insnhelper.c: fix issues about
+	  return and c-return trace.  This issue skips (c-)return event
+	  with global jump such as break or return.  This fix make vm invoke
+	  hooks at stack rewind timing.  fix [ruby-core:27606] [Bug #2610].
+
+	* test/ruby/test_settracefunc.rb: add a test for above.
+
+Sun Jan 24 14:21:48 2010  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_enc_strlen_cr): increment by rb_enc_mbminlen(enc) for
+	  broken byte sequence.  [ruby-core:27748]
+	  (rb_str_inspect): ditto.
+
+Sun Jan 24 05:18:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): unlock all locking mutexes
+	  before clean up.  [ruby-core:26877]
+
+	* thread.c (rb_thread_atfork): no other threads to be joined.
+
+	* vm_core.h (rb_thread_lock_unlock, rb_thread_lock_destroy):
+	  new functions.
+
+	* vm.c (ruby_vm_destruct): unlock and destroy global VM lock.
+
+Sun Jan 24 00:31:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/parser/ruby.rb: fix typo.
+	  patched by Hal Brodigan [ruby-core:21536]
+
+Sun Jan 24 00:02:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/markup/to_html_crossref.rb: fix failure of the test.
+	  patched by Tomoyuki Chikanaga and nobu [ruby-core:20564]
+
+Sat Jan 23 23:27:12 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (dir_s_glob): add rdoc by Roger Pack. [ruby-core:27669]
+
+Sat Jan 23 23:12:56 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/generator/html.rb (RDoc::Generator::HTML#gen_into):
+	  make the rdoc(generating html) run faster and use less memory.
+	  patch by Tetsu Soh [ruby-core:27656]
+
+Sat Jan 23 19:54:48 2010  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE.ole_initialize,
+	  WIN32OLE.ole_uninitialize to use in win32ole.rb.
+	  You must not use these methods.
+
+	* ext/win32ole/lib/win32ole.rb: add win32ole.rb
+	  re-define Thread#initialize (fix ruby-core:27634)
+
+Sat Jan 23 00:25:19 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* sample/coverage.rb: preserve exit status.
+
+Sat Jan 23 00:21:18 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_dir.rb: get rid of debug print.
+
+	* test/ruby/test_module.rb: fixed to make test-all work.
+
+Fri Jan 22 23:54:04 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb: add a test for Array#rotate, rotate!.
+
+	* test/ruby/test_dir.rb, test/ruby/test_fnmatch.rb: add some tests
+	  (for coverage of dir.c).
+
+	* test/ruby/test_enum.rb: add a test for Enumerable#minmax.
+
+	* test/ruby/test_enumerator.rb: add some tests for Enumerator#inspect,
+	  Enumerator::Generator and Yielder.
+
+	* test/ruby/test_env.rb: add a test for ENV#index.
+
+	* test/ruby/test_exception.rb: add some tests (for coverage of
+	  error.c).
+
+	* test/ruby/test_hash.rb: add a test for recursive check.
+
+	* test/ruby/test_integer.rb: add a test for number of argument of
+	  Integer.
+
+	* test/ruby/test_method.rb: add a test for define_method.
+
+	* test/ruby/test_module.rb: add a test for constant of included
+	  module.
+
+	* test/ruby/test_proc.rb: add a test for parameters with cfunc.
+
+Fri Jan 22 23:50:03 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_regexp.rb, test/ruby/test_symbol.rb,
+	  test/ruby/test_variable.rb: add some tests (for coverage of
+	  compile.c).
+
+Fri Jan 22 21:05:34 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_mload): add submicro into vtm.subsecx.  [ruby-dev:40133]
+
+Fri Jan 22 14:26:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (rdoc): needs encodings and exts.
+
+Fri Jan 22 14:16:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: add missing comma.
+
+Fri Jan 22 01:07:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_bignum.rb, test/ruby/test_class.rb,
+	  test/ruby/test_defined.rb, test/ruby/test_hash.rb,
+	  test/ruby/test_primitive.rb, test/ruby/test_variable.rb: add some
+	  tests (for coverage).
+
+Fri Jan 22 01:03:28 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_require.rb (test_define_class): expect TypeError
+	  instead of NameError.  [ruby-core:27504]
+
+Thu Jan 21 15:09:35 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in: some tidy.
+
+Thu Jan 21 11:15:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_rotate): new methods, Array#rotate! and
+	  Array#rotate.  [ruby-dev:17194]
+
+	* array.c (rb_ary_reverse_m): copy directly.
+
+Thu Jan 21 09:38:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: use AS_CASE instead of when, to get rid of
+	  an unintentional substitution.
+
+Thu Jan 21 08:45:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_s_disasm): check for proc first.  based on the
+	  patch by Roger Pack in [ruby-core:27626].  [ruby-core:27227]
+
+Wed Jan 20 16:09:59 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* common.mk (compile.$(OBJEXT)): dependencies lacking.
+
+	* vm_method.c (rb_add_method_cfunc): invalid initializer for C89
+
+	* compile.c (iseq_insns_unification): int might be smaller than int*
+
+Tue Jan 19 20:00:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::Config.default_config_hash): return an
+	  empty hash when resolv.conf is not available.  [ruby-core:27620]
+
+	* lib/resolv.rb (Resolv::DNS::Config#lazy_initialize): fixed the
+	  defaults of nameserver and port.
+
+Tue Jan 19 14:29:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (clean-ext): allow glob patterns.
+
+	* ext/extmk.rb: ditto.
+
+Tue Jan 19 14:19:26 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/zlib/{extconf.rb, zlib.c): crc32_combine and adler32_combine is
+	  supported on Zlib 1.2.2.1, so check them for old zlib.
+
+Tue Jan 19 09:03:37 2010  Aaron Patterson  <tenderlove@ruby-lang.org>
+
+	* ext/zlib/zlib.c: added Zlib.crc32_combine and Zlib.adler32_combine
+
+	* test/zlib/test_zlib.rb: corresponding tests [ruby-core:27551]
+
+
+Tue Jan 19 02:02:32 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb: add some tests (for coverage).
+
+	* test/ruby/test_bignum.rb: ditto.
+
+Tue Jan 19 01:57:12 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_bignum.rb: some coerce definitions (for test) was
+	  wrong.
+
+Tue Jan 19 01:53:11 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (bigsub_int): remove nonsense loop.
+
+Tue Jan 19 01:42:36 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (top_compstmt, top_stmts, top_stmt): prohibit BEGIN {} in
+	  non-toplevel scope.  [ruby-core:21657]
+
+	* test/ruby/test_beginendblock.rb (test_begininclass): add a test for
+	  above.
+
+Mon Jan 18 17:16:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/webrick/httpservlet/filehandler.rb (make_partial_content):
+	  add bytes-unit.  [ruby-dev:40030]
+
+Mon Jan 18 15:49:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
+	  use inclusive range same as the header representation.
+
+Mon Jan 18 03:59:57 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_instance_hexdigest_bang): Fix
+	  rdoc.
+
+	* ext/digest/lib/digest.rb (Digest::Class.base64digest)
+	  (Digest::Instance#base64digest{,!}): New methods.
+
+Sun Jan 17 22:48:44 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_instance_digest)
+	  (rb_digest_instance_hexdigest): Save a method call of reset()
+	  for a disposable clone.
+
+Sun Jan 17 19:24:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (domain_check): check errno first.
+	  NetBSD 5.0's asin and acos returns 0.0 with errno EDOM.
+
+Sun Jan 17 14:24:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (rb_str_derive): use long.
+
+	* ext/iconv/iconv.c (iconv_convert): suppress a warning.
+
+	* lib/mkmf.rb (check_signedness): new method.
+
+	* lib/mkmf.rb (have_header, create_header): use String#tr_cpp.
+
+Thu Jan 14 13:06:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_hash, int_chr): fixed type.
+
+Thu Jan 14 12:50:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_concat): fixed range check for Fixnum, and
+	  added checks for integer overflow and invalid char code.
+
+Thu Jan 14 09:34:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_concat): raise RangeError when the argument is
+	  negative value. [ruby-core:27583]
+
+Thu Jan 14 08:49:59 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_to_r): convert to rational if internal representation
+	  is not rational.
+
+Thu Jan 14 04:01:50 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_mdump): use nano_num and nano_den instead of subnano to
+	  avoid Rational class in marshaled data which prevent unmarshal by
+	  Ruby 1.8.
+	  (time_mload): use nano_num and nano_den.
+
+Wed Jan 13 11:57:38 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* object.c (rb_class_initialize): Make sure BasicObject doesn't get
+	  initialized twice [ruby-core:27577]
+
+	* class.c (rb_class_init_copy): ditto
+
+Wed Jan 13 06:54:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check for if struct timezone is defined.
+
+	* missing.h (struct timezone): define if not defined.
+
+	* win32/win32.h (struct timezone): defined in the newer w32api.
+	  [ruby-core:27515]
+
+Wed Jan 13 00:33:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/shell/command-processor.rb: fix typo by Sho Hashimoto.
+	  reported and patched at [ruby-dev:40058] [Bug #2599]
+
+Tue Jan 12 23:48:29 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb:
+	accept any time format in maker. [ruby-core:26923]
+
+Tue Jan 12 21:56:00 2010  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_set_len): call rb_str_modify.
+
+	* file.c (realpath_rec): don't call rb_str_modify before
+	  rb_str_set_len.
+
+Tue Jan 12 20:44:14 2010  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (realpath_internal): call rb_secure.
+
+Tue Jan 12 16:48:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP.start): options may not be given.
+
+Tue Jan 12 16:48:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): check if instream
+	  is closed instead of fd 0.
+
+	* ext/readline/readline.c (Init_readline): use STDIN for input.
+	  Reported by Sora Harakami. See
+	  http://d.hatena.ne.jp/codnote/20100111/1263174134
+
+Tue Jan 12 16:09:02 2010  wanabe  <s.wanabe@gmail.com>
+
+	* test/ruby/test_process.rb (test_execopts_env): MANDATORY_ENVS might
+	  not be a part of ENV.  e.g. TMPDIR.
+
+Tue Jan 12 14:07:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP.start): add hash argument to
+	  set ssl related options. when use_ssl is set default value
+	  of verify_mode is OpenSSL::SSL::VERIFY_PEER. [ruby-dev:40003]
+
+Tue Jan 12 14:53:07 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (init_env): use _wputenv() instead of
+	  SetEnvironmentVariableW() because latter doesn't set msvcrt's environ
+	  work area, of course.
+	  [Bug #2552]
+
+Tue Jan 12 13:33:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (realpath_rec): trace symbolic link only when supporting
+	  readlink().
+
+Tue Jan 12 12:49:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
+	  which ends with an underscore.
+
+Tue Jan 12 09:58:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c: need to include errno.h for EINVAL.
+
+	* hash.c (ruby_setenv): fixed typo.  see [ruby-dev:40026]
+
+Tue Jan 12 09:22:43 2010  Tanaka Akira  <akr@fsij.org>
+
+	* prelude.rb (require_relative): use File.realpath.  [ruby-dev:40040]
+
+	* include/ruby/intern.h: declare rb_dir_getwd.
+
+	* dir.c (rb_dir_getwd): copied from dir_s_getwd to export.
+	  (dir_s_getwd): use rb_dir_getwd.
+
+	* file.c (rb_file_s_realpath): new method File.realpath.
+	  (rb_file_s_realdirpath): new method File.realdirpath.
+
+	* lib/pathname.rb (Pathname#realpath): use File.realpath.
+	  (Pathname#realdirpath): use File.realdirpath.
+
+Mon Jan 11 22:45:08 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* hash.c (ruby_setenv): Improve the emulation of setenv(3) on
+	  environments where putenv(3) is used.  Raise EINVAL If a
+	  variable name contains an '='.
+
+Mon Jan 11 18:16:38 2010  wanabe  <s.wanabe@gmail.com>
+
+	* vm_insnhelper.h (GET_BLOCK_PTR): return 0 when in class frame.
+	  [Bug #2583]
+
+Mon Jan 11 16:52:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_strlen): added. [ruby-dev:40028]
+
+	* include/ruby/intern.h (rb_str_strlen): declared.
+
+Mon Jan 11 13:30:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/webrick/accesslog.rb (WEBrick::AccessLog#format): fixed typo.
+
+	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status#initialize):
+	  accept 0 or more arguments.  [ruby-dev:40021]
+
+Mon Jan 11 12:47:58 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* hash.c (ruby_setenv): ENV.[]= should raise an error if setenv(3)
+	  or putenv(3) fails.  [ruby-dev:40023]
+
+Sun Jan 10 17:25:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/webrick/accesslog.rb : Escape needed.
+
+	* lib/webrick/httpstatus.rb : ditto.
+
+	* lib/webrick/httprequest.rb : ditto.
+
+	* lib/webrick/httputils.rb : ditto.
+
+	* test/webrick/test_cgi.rb (TestWEBrickCGI::test_bad_): Test for it.
+
+Sun Jan 10 04:54:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_define_class): raise TypeError same as class
+	  statement.  [ruby-core:27504]
+
+Sun Jan 10 04:41:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): needs ARCH_FLAG.
+
+Sat Jan  9 14:20:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (install-all): maybe typo.
+
+Sat Jan  9 14:01:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* missing/vsnprintf.c (BSD_vfprintf): get rid of a warning of VC++ x64.
+
+Sat Jan  9 08:40:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/configure.bat (WIN32DIR): regularise file separators.
+
+Fri Jan  8 23:35:18 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (mnew): don't check visibility of method body if public
+	  ZSUPER method is found.  [ruby-dev:39767]
+
+	* test/ruby/test_method.rb: add a test for above.
+
+Fri Jan  8 22:59:40 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_method.c (rb_alias): skip ZSUPER method when searching body of
+	  source method.  [ruby-dev:39760]
+
+	* test/ruby/test_alias.rb: add a test for above.
+
+Fri Jan  8 21:15:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http, lib/net/https: move content from net/https to
+	  net/http. [ruby-dev:39986]
+
+Fri Jan  8 14:06:01 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_s_read): close the IO if an exception is raised on
+	  seeking. [ruby-core:27429]
+
+Fri Jan  8 13:12:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_symbol): dump no encoding for 7bit only coderange
+	  symbol.  [ruby-core:27375]
+
+Thu Jan  7 07:56:09 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.5.0 r5596.
+	* test/minitest/*.rb: ditto.
+
+Tue Jan  5 19:30:53 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_exception.rb: add a test. cf [ruby-dev:39116]
+
+Tue Jan  5 02:03:34 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (DTRACE): clear this when `dtrace -l` fails.
+	  Note that current FreeBSD needs privilege to call it;
+	  so to use DTrace on FreeBSD, you should run configure as root.
+
+Mon Jan  4 21:24:18 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* gc.c: added UNLIKELY to probes for optimization.
+
+	* vm.c: ditto.
+
+	* thread.c: ditto.
+
+Mon Jan  4 09:30:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (TRACING_MODEL): follow yugui's previous changes.
+
+Mon Jan  4 09:30:25 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (InterlockedExchangePointer): old SDK support.
+
+Sun Jan  3 23:54:51 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* trace.h: new file. wraps tracing mechanisms.
+
+	* defs/dtrace.d: new file. defined a dtrace provider "ruby".
+
+	* include/ruby/ruby.h (LIKELY): moved from vm.c.
+	  (UNLIKELY): ditto.
+	  (OBJSETUP): probe "object-create".
+	  (RUBY_EVENT_RESCUE): new event.
+
+	* vm_exec.c (DEBUG_ENTER_INSN): embedded a probe insn-entry into it.
+	  (DEBUG_END_INSN): insn-return.
+
+	* vm.c (LIKELY): moved into ruby.h.
+	  (UNLIKELY): ditto.
+	  (Init_BareVM): embedded a probe "raise" into it.
+
+	* variable.c (rb_class2name_without_alloc): new utility function.
+
+	* tool/rbinstall.rb (install?(:ext, :arch, :'ext-arch')): installs
+	  dtrace.d if necessary.
+
+	* thread_pthread.c (add_signal_thread_list): probe "raise".
+	  (rb_thread_create_timer_thread): ditto.
+
+	* thread.c (rb_thread_schedule_rec): probes "thread-enter" and
+	  "thread-leave",
+	  (thread_start_func_2): ditto.
+	  (thread_cleanup_func): probe "thread-term"
+
+	* lib/mkmf.rb: supports dtrace postprocessor on making an extension.
+
+	* iseq.c (rb_vm_insn_name): new utility function.
+	  (rb_vm_insn_len): ditto.
+
+	* insns.def (hook): probes "method-entry", "method-return", "line",
+	  and "rescue".
+
+	* compile.c (iseq_compile_each): adds a trace op for "rescue" probe.
+
+	* gc.c (garbage_collect): probes "gc-begin" and "gc-end".
+	  (obj_free): probe "object-free"
+	  (garbage_collect_with_gvl): probe "raise"
+	  (negative_size_allocation_error): ditto.
+	  (rb_memerror): ditto.
+
+	* eval.c (rb_rescue2): probe "rescue"
+	  (rb_longjmp): probe "raise"
+
+	* ext/probe/probe.c: new extension for application defined probes.
+
+	* ext/probe/extconf.rb: ditto.
+
+	* configure.in (--with-tracing-model): new option to choose a tracing
+	  mechanism.
+	  (DTRACE): new substitution. name of dtrace(1).
+	  (RUBY_TRACING_MODEL): new substitution.
+	  (DTRACE_OBJ): ditto.
+	  (MINIDTRACE_OBJ): ditto.
+	  (GOLFDTRACE_OBJ): ditto.
+	  (LIBRUBY_DTRACE_OBJ): ditto.
+	  (RUBY_DTRACE_POSTPROCESS): new macro. checks whether the dtrace on
+	  the system needs postprocessing.
+	  (RUBY_DTRACE_BSD_BROKEN): new macro. checks whether the dtrace
+	  supports USDT.
+
+	* Makefile.in:
+	  (DTRACE): new variable. name of dtrace(1).
+	  (TRACING_MODEL): new variable. name of the chosen tracing mechanism.
+	  (DTRACE_OBJ): same as the one in configure.in.
+	  (MINIDTRACE_OBJ): ditto.
+	  (GOLFDTRACE_OBJ): ditto.
+	  (LIBRUBY_DTRACE_OBJ): ditto.
+	  (CPPOUTFILE): new substitution. necessary for generating dtrace.d
+	  (trace_none.h): new target for TRACING_MODEL=none
+	  (RUBY_H_INCLUDES): appended a header for tracing.
+	  (distclean-local): also removes preprocessed version of dtrace.d
+	  ($(LIBRUBY_A)): needs $(LIBRUBY_DTRACE_OBJ) if dtrace needs
+	  postprocessing.
+	  ($(PROGRAM)): ditto.
+	  (golf): ditto.
+	  (miniruby): ditto.
+	  ($(arch_hdrdir)/ruby/dtrace.d): new target. preprocessed version
+	  of defs/dtrace.d. generated if necessary.
+	  ($(arch_hdrdir)/ruby/trace_dtrace.h): new target.
+	  definition of probes.
+	  ($(LIBRUBY_DTRACE_OBJ)): new target. generated if dtrace needs
+	  postprocessing.
+	  ($(DTRACE_OBJ)): ditto.
+	  ($(MINIDTRACE_OBJ)): ditto.
+	  ($(GOLFDTRACE_OBJ)): ditto.
+
+Sun Jan  3 15:34:19 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/rexml/text.rb: String no longer has #each.
+	  Patch by Mitsutaka Mimura (takkanm). [ruby-dev:39949].
+
+Sun Jan  3 01:29:18 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#inspect):
+	  implemented.
+
+Sat Jan  2 15:57:54 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS#initialize): new option :nameserver_port.
+	  (Resolv::DNS#each_resource): pass port number.
+	  (Resolv::DNS#make_requester): ditto.
+	  (Resolv::DNS::Config#lazy_initialize): initialize @nameserver_port
+	  instead of @nameserver.
+	  (Resolv::DNS::Config#single?): return port number addition to the
+	  nameserver.
+	  (Resolv::DNS::Config#generate_timeouts): use @nameserver_port.
+	  (Resolv::DNS::Config#resolv): yield port number.
+
+Sat Jan  2 00:43:22 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (initialize_regexp): allow leading
+	  and trailing white space, and forbid extra characters
+	  on another lines. [ruby-core:26223]
+	  RFC 3986  Appendix C.  Delimiting a URI in Context
+	  draft-duerst-iri-bis-07  7.2.  Web Address processing
+
+Fri Jan  1 23:17:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI#normalize!): normalize case of
+	  scheme. [ruby-core:27309]
+
+Fri Jan  1 00:47:57 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_instance_method_unimpl): Suppress
+	  compiler warnings.
+
+Fri Jan  1 00:00:00 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/mkconfig.rb: generate RbConfig.ruby in rbconfig.rb.
+
+	* lib/webrick/httpservlet/cgihandler.rb: use RbConfig.ruby.
+
+	* test/ruby/envutil.rb: ditto.
+
+	* benchmark/report.rb: ditto.
+
+	* benchmark/runc.rb: ditto.
+
+	* tool/eval.rb: ditto.
+
+Thu Dec 31 18:18:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/rubysocket.h: include addrinfo.h only when using our own
+	  getaddrinfo.c.
+
+Thu Dec 31 14:20:11 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (save_redirect_fd): consider EBADF that the fd is not used.
+	  [ruby-dev:39938]
+
+Thu Dec 31 06:03:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_type): typed.
+
+	* ext/socket/extconf.rb: fix for wide-getaddrinfo option.
+
+	* ext/socket/addrinfo.c: rename {addr,name}info functions to ensure
+	  those are used on darwin.
+
+Thu Dec 31 03:27:53 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (native_thread_destroy): decreased the probability of
+	  using the interrupt event in the thread termination.
+	  see [ruby-core:27199].
+
+Thu Dec 31 02:35:57 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (w32_error): should report the function.
+
+Thu Dec 31 01:58:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: fix for extstatic.
+
+Wed Dec 30 19:43:00 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (RREGEXP_SRC_END): added.
+
+Wed Dec 30 19:40:00 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/defines.h (INFINITY): this is float.
+
+	* include/ruby/defines.h (NAN): ditto.
+
+	* numeric.c (rb_infinity): change content as float.
+
+	* numeric.c (rb_nan): ditto.
+
+Wed Dec 30 17:59:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gem_prelude.rb (push_all_highest_version_gems_on_load_path):
+	  simplified.
+
+	* lib/rubygems/command_manager.rb (Gem#load_and_instantiate):
+	  rescue only NameError from const_get.
+
+	* lib/rubygems/source_index.rb (Gem#load_specification): don't use
+	  RUBY_VERSION to branch.
+
+	* lib/rubygems/validator.rb (Gem::TestRunner, Gem#alien): ditto.
+
+	* lib/rubygems.rb: Kernel#gem is already defined, and workaround
+	  for home directory and custom_require are no longer needed.
+
+Tue Dec 29 16:03:33 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (Init_Numeric): Add Float::INFINITY and Float::NAN.
+	  [ruby-dev:1657] [ruby-dev:4760] [ruby-list:7023]
+	  [ruby-list:46690]
+	  [ruby-core:26632] [ruby-talk:41352] [ruby-talk:203333]
+
+	* include/ruby/defines.h (INFINITY): defined.
+
+	* include/ruby/defines.h (NAN): defined.
+
+	* include/ruby/util.h (ruby_div0): removed.
+
+	* numeric.c (fix_pow): use INFINITY and NAN
+	  instead of ruby_div0(1.0).
+
+	* marshal.c (r_object0): ditto.
+
+	* bignum.c (big_fdiv): ditto.
+
+Tue Dec 29 10:36:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::STANDALONE):
+	  any number spaces can be placed between equal-sign and the value.
+	  patch from Ed Howland in [ruby-core:27345].
+
+Mon Dec 28 22:33:58 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): force to inherit standard I/O handles.
+	  this change fixes [ruby-core:27273], but other side effects might
+	  exist.
+
+Mon Dec 28 22:00:10 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_marshal.rb: added tests for taintness/untrustness
+	  propagation.
+
+Mon Dec 28 18:13:26 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* sample/occur2.rb: reimplemented in modern style. [ruby-dev:39927].
+
+Mon Dec 28 17:19:37 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/install-sh: correction by Hiro Asari.
+	  https://gist.github.com/264558/58ad1cae45cde49600bbb39286af2aae23e639d5
+
+Mon Dec 28 13:18:52 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/install-sh: wrote the intention. [ruby-dev:39928]
+
+Sun Dec 27 10:45:00 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (foleparam_initialize): add foleparam_initialize
+	  to check argument of WIN32OLE_PARAM.new
+
+	* test/win32ole/test_win32ole_param.rb (test_s_new): add some assertion
+	  to test WIN32OLE_PARAM.new
+
+Sun Dec 27 09:41:54 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/rbinstall.rb (install?(:local, :comm, :bin, :'bin-comm')):
+	  Makes it vim friendly.  __END__ in a heredoc is confusing with
+	  the script end for vim.
+
+Sun Dec 27 09:13:55 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* sample/occur2.rb: have been broken. fixed for Ruby 1.9 feature.
+
+Thu Dec 24 16:32:30 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/uri/generic.rb (eql?): Check the class of the compared object.
+	  Based on a patch by Peter McLain [ruby-core:27019]
+
+Thu Dec 24 15:20:03 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regexec.c (match_at): follow enclen's change.
+
+Thu Dec 24 12:08:00 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/delegate.rb (marshal_dump/load): dump & load instance variables
+	  by default [ruby-core:24211]
+
+Thu Dec 24 10:31:50 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/object.c (rb_obj_cmp): Default <=> operator returns 0 if
+	  objects are == [ruby-core:24063]
+
+Wed Dec 23 09:12:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
+	  always must be binary mode.  c.f. Bug#2341
+
+Thu Dec 10 09:20:58 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): undef Encoding.new because
+	  a class which is rb_undef_alloc-func-ed can't call new method.
+	  [ruby-dev:39862]
+
+	* vm.c (Init_VM): undef RubyVM.new and RubyVM::Env.new.
+
+Mon Dec 21 17:51:44 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (optimize_node_left): include equal on the condition of for-loop.
+	  This bug also affects original Oniguruma. [ruby-core:27247]
+
+Mon Dec 21 10:03:33 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (print_enc_string): follow enclen's change.
+
+	* regcomp.c (onig_print_compiled_byte_code): ditto.
+
+	* regcomp.c (onig_print_compiled_byte_code): change prototype.
+
+	* regint.c (onig_print_compiled_byte_code): comment out.
+
+Mon Dec 21 08:04:34 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* object.c: BasicObject#initialize accepts any number of arguments
+	  [ruby-core:27080]
+
+Mon Dec 21 02:45:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_iterate): remove SEGV (retry).
+
+Sun Dec 20 23:18:23 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_iterate): remove SEGV (use the original patch).
+	  [ruby-dev:39874]
+
+Sun Dec 20 21:26:05 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_iterate): pass current block when the argument bl_proc
+	  is NULL.  This behavior can be used to make enumerator faster
+	  [ruby-dev:39874]
+
+	* enumerator.c (enumerator_each): pass current block directly instead
+	  of trampoline block (enumerator_each_i).
+
+	* io.c (argf_each_line, argf_each_byte, argf_each_char): ditto.
+
+Sat Dec 19 14:59:30 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gem_prelude.rb (Kernel#gem): should make gem private.  a patch
+	  from Sho Hashimoto in [ruby-dev:39838].
+
+Sat Dec 19 14:57:17 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/webrick/config.rb (WEBrick::Config): typo fixed.  a patch
+	  from Sho Hashimoto in [ruby-dev:39835].
+
+Sat Dec 19 11:06:48 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (each2,collect2,map2): Fix enumerator
+	  [ruby-core:27225]
+
+Sat Dec 19 09:58:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (check_funcall): reset method_missing_reason before
+	  trying the call.  based on a patch from Yehuda Katz in
+	  [ruby-core:27219].
+
+Sat Dec 19 09:29:22 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/set.rb: Add checks that passed argument is Enumerable.
+	  [ruby-core:23844]
+
+Wed Dec 16 20:28:46 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/envutil.rb: fix a typo in assert message.
+
+Wed Dec 16 16:57:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/un.rb (httpd): try to convert port number to integer.
+
+Wed Dec 16 11:18:30 2009  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in(MINIRUBY): use "$BASERUBY" as a default ruby executable
+	  name.
+
+Wed Dec 16 00:53:14 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): rescue more exceptions which is possible to
+	  occur by other process change the directory tree.
+
+Tue Dec 15 09:06:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/find.rb (Find.find): get rid of race condition.
+
+Mon Dec 14 22:33:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): rescue only ENOENT and EACCES for lstat.
+
+Mon Dec 14 21:49:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): narrow rescue region.
+
+Mon Dec 14 09:20:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/find.rb (Find.find): removed already unnecessary code.
+
+Sun Dec 13 23:48:25 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): sort directory entries.  [ruby-dev:39847]
+
+Sun Dec 13 20:55:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
+	  reject non-string.
+
+Sun Dec 13 20:26:57 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (rb_parser_dump_tree): add prototype.
+
+Thu Dec 10 20:55:55 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode_data.h, transcode.c, tool/transcode-tblgen.rb: Added
+	  support for new transcoding instruction FUNsio (with Tatsuya Mizuno)
+
+	* enc/trans/gb18030.trans: Significantly reduced GB18030 conversion
+	  table footprint using FUNsio and differences (with Tatsuya Mizuno)
+
+	* test/ruby/test_transcode.rb: Minor name fix (from Tatsuya Mizuno)
+
+Thu Dec 10 17:22:36 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_eval.c (yield_under): yields self the same as 1.8.
+
+Thu Dec 10 15:49:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (native_mutex_reinitialize_atfork): release and
+	  re-acquire the lock at re-initialization.
+
+Thu Dec 10 12:56:02 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_replicate): add Encoding#replicate(name).
+
+	* encoding.c (enc_replicate_with_index): renamed from old
+	  enc_replicate.
+
+	* encoding.c (rb_enc_from_encoding_index): split from
+	  rb_enc_from_encoding.
+
+Thu Dec 10 09:15:00 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): CHAR_ESC_LEN should be 13.
+
+Thu Dec 10 01:12:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (dyna_pop_gen): pop dvars.  [ruby-dev:39861]
+
+Thu Dec 10 00:46:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.c (dump_node): fixed for long members.
+
+Wed Dec  9 22:57:04 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* node.c: node management added.  Currently, only pretty-dumper is
+	  implemented.  [ruby-dev:39853]
+
+	* ruby.c: --dump=parsetree and --dump=parsetree_with_comment options
+	  added.  This is just for debug or research purpose.  Note that the
+	  compatibility of these options are not supported at all.
+
+Wed Dec  9 09:50:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_justify): fixed the case a fill size is a
+	  multiple of the length of the padding.  [ruby-dev:39856]
+
+Tue Dec  8 23:41:34 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/configure.bat: now recognize --with-*-{dir,include,lib} options
+	  and pass them to mkmf.
+
+	* win32/configure.bat: general conversion from ``/'' to ``\'' of
+	  configure_args is not necessary any longer.
+
+	* win32/setup.mak: BASERUBY is used as command, so always need to
+	  convert ``/'' to ``\'' within it.
+
+Tue Dec  8 23:39:52 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (flo_eq): suppress a warning on VC++ for x64.
+
+Tue Dec  8 16:19:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems: update to 1.3.5.
+
+	* lib/rubygems/defaults.rb (Gem::default_dir): removed a clause
+	  doing nothing.
+
+Tue Dec  8 03:50:24 2009  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (rb_f_test): use string form in unknown command error
+	  message.
+
+Mon Dec  7 14:11:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): reverted r26007.  [ruby-dev:39845]
+
+	* test/test_delegate.rb (test_marshal): moved from test_marshal.rb.
+
+Mon Dec  7 13:05:59 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* string.c (rb_str_justify): CVE-2009-4124.
+	  Fixes a bug reported by
+	  Emmanouel Kellinis <Emmanouel.Kellinis AT kpmg.co.uk>, KPMG London;
+	  Patch by nobu.
+
+Sun Dec  6 23:50:46 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* strftime.c: %l should be 1..12 instead of 0..12 [ruby-core:27072]
+
+Sun Dec  6 23:16:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): reduce stat system call.
+
+Sun Dec  6 16:02:15 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httpservlet/filehandler.rb: escape filename of index.
+	  [ruby-dev:37768]
+
+Sun Dec  6 00:35:16 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup (config.h): EXECUTABLE_EXTS moved from
+	  dln.c:dln_find_1().
+
+Sat Dec  5 15:35:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): dump instance variables when using
+	  marshal_dump.   [ruby-core:24211]
+
+	* variable.c (rb_ivar_count): added.
+
+Sat Dec  5 13:19:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: default ac_cv_prog_CC to CC.
+
+Sat Dec  5 10:18:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/extend-command.rb (def_extend_command): fixed argument
+	  number for negative arity.
+
+Fri Dec  4 16:50:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (k_def): adjust the location of method definition to the
+	  line of def.  [Bug #2427]
+
+Fri Dec  4 19:05:28 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (defined): should respect #respond_to_missing? as
+	  #respond_to? does.
+
+Fri Dec  4 15:50:18 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_eval.c (yield_under): does not yield self, and passes blockptr
+	  instead of &block to vm_cref_push().  [ruby-dev:39833]
+
+Fri Dec  4 15:15:43 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (num_exact): should not accept strings as operands, even
+	  though they respond to #to_r.  ideally, strict rational
+	  conversion should be done by a method like #to_rational, not #to_r.
+	  [ruby-core:23729]
+
+Fri Dec  4 13:10:23 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/stringio/stringio.c (ungetc): RDoc updated.  trunk allows
+	  pushing back behind the beginning of the pseudo stream.
+
+Fri Dec  4 03:10:38 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* compile.c (compile_cpath, iseq_compile_each): reverted
+	  constant/class variable lookup in instance_eval etc. to the
+	  behavior of 1.8.
+
+	* eval.c (rb_mod_nesting): ditto.
+
+	* insns.def (putspecialobject, defineclass): ditto.
+
+	* node.h (NODE_FL_CREF_PUSHED_BY_EVAL): ditto.
+
+	* vm_core.h (VM_SPECIAL_OBJECT_CONST_BASE): ditto.
+
+	* vm_eval.c (yield_under, eval_under): ditto.
+
+	* vm_insnhelper.c (vm_cref_push, vm_get_const_base,
+	  vm_get_ev_const, vm_get_cvar_base): ditto.
+
+Thu Dec 3 20:27:27 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/gb18030-tbl.rb: Fix omission of C1 region in code table
+	  (from Tatsuya Mizuno)
+
+	* test/ruby/test_transcode.rb: Added test for converting full range of
+	  Unicode codepoints from/to GB18030 (from Tatsuya Mizuno)
+
+Wed Dec  2 23:51:28 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c: initialize @hostname of SSLSocket to avoid
+	  warning at SSLSocket#connect.
+
+Tue Dec  1 18:01:43 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/digest/test_digest_extend.rb: added tests for digest framework.
+
+Tue Dec  1 12:01:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (dyna_push_gen, dyna_pop_gen): no needs to save both of
+	  args and vars.  [ruby-core:26961]
+
+	* parse.y (dyna_push_gen): use rb_node_newnode() for ripper.
+	  [ruby-core:26961]
+
+	* parse.y (dyna_push_gen, dyna_pop_gen): adjust local vtable level
+	  for the case of syntax errors in method name or argument inside
+	  do block.   [ruby-core:26961]
+
+Mon Nov 30 16:57:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (command_output): $makeflags are already quoted.
+
+Mon Nov 30 16:54:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, win32/Makefile.sub (EXECUTABLE_EXTS): moved from
+	  dln.c:dln_find_1().
+
+	* lib/mkmf.rb (def find_executable0): use EXECUTABLE_EXTS, not
+	  only EXEEXT.  [ruby-core:26821]
+
+Mon Nov 30 11:00:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): suppress an extra error message after
+	  numeric literal without digits.  based on a patch from ujihisa .
+	  in [ruby-dev:39811].  [ruby-dev:39798]
+
+Sun Nov 29 16:56:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (check_funcall_failed): pass ID.  [ruby-core:26934]
+
+Sun Nov 29 06:37:53 2009  Aaron Patterson  <tenderlove@ruby-lang.org>
+
+	* lib/rexml/formatters/default.rb (write_attribute): fix an
+	  exception when printing a document when duplicate namespaced
+	  attributes exist. Thanks, Alexey Froloff [ruby-core:26837]
+
+Sat Nov 28 09:05:53 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_eval.c (check_funcall_failed): should rescue user raised
+	  NoMethodError.  rescue all NoMethodError if receiver does not
+	  respond to the method name.  [ruby-dev:39796]
+
+Thu Nov 26 21:14:30 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_complex.rb (@unify): fix the detection if math
+	  loaded. This makes test_complex.rb work fine with the previous
+	  commit.
+
+	* test/ruby/test_rational.rb (@unify): ditto.
+
+Thu Nov 26 21:13:36 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/test_mathn.rb (TestMathn): new test case.
+	  test for r25067.
+
+Thu Nov 26 21:11:23 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/openssl/test_config.rb (OpenSSL::TestConfig): new test case.
+	  test for r25017.
+
+Thu Nov 26 21:08:54 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_range.rb (TestRange#test_comparison_when_recursive):
+	  test for r25010.
+
+	* test/ruby/test_struct.rb (TestStruct#test_comparison_when_recursive):
+	  ditto.
+
+Thu Nov 26 20:18:02 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gem_prelude.rb (Gem.set_home): must dup before force_encoding
+	  and must force_encoding before gsub.
+	  cf. Yen Sign problem of SJIS [ruby-core:26910]
+
+Thu Nov 26 17:54:37 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{configure.bat, setup.mak, Makefile.sub}: add new configure
+	  option ``--with-ntver''.
+
+Thu Nov 26 11:42:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/mkmf/base.rb: use $INCFLAGS to add -I option.  [Bug#2387]
+
+Thu Nov 26 07:17:58 2009  wanabe  <s.wanabe@gmail.com>
+
+	* marshal.c (mark_dump_arg): mark str.  see also [ruby-dev:39735]
+
+Thu Nov 26 00:05:58 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/digest/test_digest_extend.rb: Added tests for current digest
+	  framework.
+
+Wed Nov 25 20:46:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* vm_eval.c (rb_search_method_entry): refine error message.
+
+Wed Nov 25 19:29:05 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_instance_method_unimpl): Do not
+	  call rb_inspect() on an object that does not implement necessary
+	  methods; reported by NaHi.
+
+Wed Nov 25 19:30:30 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c: Added a check for an internal error
+	  (with Tatsuya Mizuno)
+
+Tue Nov 24 22:57:46 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (EnvUtil.invoke_ruby): raise Timeout::Error
+	  instead of flunk.  reported by Yusuke Endoh.
+
+Tue Nov 24 22:31:44 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (ruby_vm_destruct, thread_memsize): fix argument type to make
+	  RUBY_MARK_FREE_DEBUG available.
+
+Tue Nov 24 21:25:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* error.c: include errno.h at beginning.
+
+Tue Nov 24 20:11:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* strftime.c: %Y format a year with 4 digits at least.
+
+	* lib/time.rb: format a year with 4 digits at least.
+
+Tue Nov 24 20:05:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* defs/known_errors.def: more errors.
+
+Tue Nov 24 20:01:49 2009  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (rb_bug_errno): declared.
+
+	* include/ruby/intern.h (rb_strerrno): declaration removed.
+
+	* error.c (rb_strerrno): make it static.  return NULL for unknown
+	  errors.
+	  (rb_bug_errno): defined.
+
+	* thread_pthread.c: use rb_bug_errno.
+
+	* signal.c (ruby_signal): use rb_bug_errno.
+
+Tue Nov 24 10:17:38 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_path_convert): fix fs_encoding is not assign.
+
+Tue Nov 24 10:00:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_strerrno): constified.
+
+Tue Nov 24 09:49:31 2009  Tanaka Akira  <akr@fsij.org>
+
+	* error.c (rb_strerrno): return "UNKNOWNERROR" for non-zero unknown
+	  error.
+
+Tue Nov 24 09:18:33 2009  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_strerrno): declared.
+
+	* template/known_errors.inc.tmpl: generate defined_error() and
+	  undefined_error() instead of set_syserr.
+
+	* error.c (Init_syserr): define defined_error() and undefined_error()
+	  to follow the above change.
+	  (rb_strerrno): defined.
+
+	* thread_pthread.c: show error message and errno macro name with
+	  rb_bug.
+
+Mon Nov 23 16:06:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (RUBY_STACK_MIN, RUBY_STACK_SPACE): delay for
+	  platforms where PTHREAD_STACK_MIN is not compile time constant.
+	  [ruby-dev:39751]
+
+Mon Nov 23 11:26:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_find_1): removed duplication.
+
+Mon Nov 23 04:12:00 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/newline.trans (fun_so_universal_newline): generate \n
+	  after \r\n detection instead of just after \r.
+	  [ruby-list:45988] [ruby-core:25881] [ruby-core:26788]
+
+Sat Nov 21 18:48:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* vm_eval.c (rb_search_method_entry): show flags and klass value in
+	  not implemented error message.
+
+Sat Nov 21 16:38:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (marshal_dump): use normal object as the buffer so
+	  that no hidden object is exposed to ruby-level.  [ruby-dev:39744]
+
+Sat Nov 21 15:58:43 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (read_all): fix: false negative invalid byte sequence
+	  on reading from pipes. [ruby-dev:39743]
+	  fix: assign the variable 'pos' as relative value from recent pos.
+
+Sat Nov 21 14:44:16 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_path_convert): delay getting UTF8-MAC encoding
+	  while really needed. [ruby-core:26807]
+
+Fri Nov 20 21:16:54 2009  Tanaka Akira  <akr@fsij.org>
+
+	* vm_eval.c (rb_search_method_entry): avoid trigraph.
+
+Thu Nov 19 23:17:06 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (putbinaryfile): use APPE for resume.
+	  Thanks, Tomoyuki Chikanaga.
+
+Thu Nov 19 22:50:05 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (flag_list): untaint strings to intern in the safe
+	  level 1.
+
+	* lib/net/imap.rb (max_flag_count=): new methods to set the max
+	  number of flags interned to symbols.
+
+Thu Nov 19 20:43:39 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/getnameinfo.c: need to include extconf.h for HAVE_* macros.
+	  reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
+
+Thu Nov 19 17:00:59 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: nmake execute the file named echo if it exists
+	  in the PATH.  reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
+
+Thu Nov 19 02:50:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* vm_eval.c (rb_search_method_entry): show the type of the hidden
+	  object.
+	  (rb_type_str): new function for above.
+
+Thu Nov 19 00:47:09 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (MORE_CHAR_SUSPENDED): renamed from MORE_CHAR_CBUF_FULL.
+
+Wed Nov 18 22:00:13 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (fill_cbuf): extracted from more_char.
+	  (io_shift_cbuf): fix memmove condition.
+	  (read_all): use fill_cbuf directly to avoid ECONV_AFTER_OUTPUT.
+	  [ruby-dev:39708]
+
+Wed Nov 18 18:25:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_atfork_internal): reinitialize global lock
+	  at fork to get rid of deadlock.  based on the patch from Hongli
+	  Lai in [ruby-core:26783].  [ruby-core:23572]
+
+Wed Nov 18 17:48:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (terminate_atfork_i): all mutex locks by other threads
+	  have been abandoned at fork.
+
+Wed Nov 18 15:27:20 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (file_path_convert): delay getting filesystem encoding
+	  while really needed.
+
+Wed Nov 18 12:33:42 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_set_default_encoding): reset filesystem
+	  encoding because on resetting default_external because
+	  Unix's filesystem encoding depends on default_external.
+
+	* encoding.c (enc_set_filesystem_encoding): added.
+
+	* ruby.c (process_options): don't call rb_filesystem_encoding
+	  because filesystem encoding is reset when default_external
+	  is reset.
+
+Wed Nov 18 11:57:32 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* math.c (math_gamma): fix incorrect comparison expression.
+	  see also [ruby-dev:39709] [Bug #2381]
+
+Wed Nov 18 11:37:05 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_scan_open_args): move path encoding conversion
+	  for filesystem encoding of Mac OS X.
+
+	* file.c (file_path_convert): added for convert encoding
+	  of file path.
+
+	* file.c (rb_get_path_check): add file_path_convert.
+
+Wed Nov 18 10:17:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_utf8_nth): no count_utf8_lead_bytes_with_word
+	  optimization for short string.  [ruby-core:26787]
+
+	* string.c (str_utf8_offset): str_utf8_nth never return NULL.
+
+Wed Nov 18 10:12:34 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_undef): should raise TypeError if klass is nil.
+	  1.instance_eval { undef to_s } causes SEGV before this fix.
+
+	* test/ruby/test_undef.rb: new tests for undef.
+
+Wed Nov 18 08:41:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_utf8_nth): fixed overrun.  [ruby-core:26787]
+
+Wed Nov 18 07:51:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (parse_mode_enc): fix invalid access.
+
+Tue Nov 17 23:50:06 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_alias): should raise TypeError if klass is nil.
+	  1.instance_eval { alias to_string to_s } causes SEGV before this
+	  fix.
+
+	* test/ruby/test_alias.rb (test_special_const_alias): ditto.
+
+Tue Nov 17 17:53:53 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/big5.c, enc/trans/big5.trans, enc/trans/big5-uao-tbl.rb,
+	  test/ruby/test-transcode.rb: Added Encoding 'Big5-UAO' and transcoding
+	  for it (from Tatsuya Mizuno) (see Bug #1784)
+
+Tue Nov 17 16:26:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (opt_case_dispatch): runtime value cannot be used as
+	  an element initializer.
+
+	* vm_insnhelper.c (opt_case_dispatch_i): gets rid of type-punning
+	  calls.
+
+Mon Nov 16 15:51:53 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): protected singleton methods of
+	  an object should not be able to called from other instances of the
+	  class of the object.  [ruby-core:26761]
+
+	* vm_eval.c (rb_method_call_status): ditto.
+
+	* test/ruby/test_module.rb (test_protected_singleton_method): ditto.
+
+Mon Nov 16 14:03:53 2009  wanabe  <s.wanabe@gmail.com>
+
+	* io.c (read_all): shift read buffer if exception occurred.
+	  pointed out in [ruby-dev:39702].
+
+Mon Nov 16 07:59:38 2009  wanabe  <s.wanabe@gmail.com>
+
+	* io.c (read_all): don't call io_shift_cbuf until buffering enough or
+	  econv_finished.   [ruby-dev:39696]
+
+	* io.c (more_char): don't call clear_readconv to read buffer after
+	  econv_finished.
+
+	* io.c (appendline, rb_io_each_codepoint): clear readconv when done.
+
+Mon Nov 16 01:58:08 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* include/ruby/ruby.h (rb_classext_t): annotate @internal.
+
+Mon Nov 16 01:35:34 2009  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_filesystem_encindex): use default external encoding
+	  instead of locale encoding in Unix.
+
+	* ruby.c (process_options): delay filesystem encoding
+	  initialization until default external encoding initialization.
+
+Mon Nov 16 00:06:26 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (thread_cleanup_func): delete locking_mutex when thread
+	  object become dummy because of fork.  [ruby-core:26744]
+	  [ruby-core:26745]
+
+	* bootstraptest/test_thread.rb: add a test for above.
+
+Sat Nov 14 21:54:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* class.c (rb_mod_init_copy): fix memory leak of Class#dup.
+	  [ruby-dev:39687]
+
+Sat Nov 14 17:09:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--with-opt-dir): ignore and suppress a warning.
+	  [ruby-dev:39684]
+
+Sat Nov 14 16:43:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ruby_setenv): get rid of crash in Solaris 8 and 10.
+	  [ruby-core:26668]
+
+Sat Nov 14 09:16:54 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): Fix comparisons
+	  [ruby-core:26646]
+
+	* test/bigdecimal/test_bigdecimal.rb (class): Fix and improve tests.
+
+Sat Nov 14 04:07:06 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb (TkVariable::coerce): fix bug on a
+	  numeric value.
+
+Sat Nov 14 03:35:29 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb: TkVariable#*(other) and /(other) have a
+	  bug on handling of the "other" value.
+
+Fri Nov 13 21:18:15 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/zlib/zlib.c (rb_zlib_adler32): fix typo.
+
+Fri Nov 13 16:22:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): see first_func, not first_proc,
+	  to decide which to use.
+
+	* gc.c (vm_xrealloc): use the given object space.
+
+Fri Nov 13 00:46:24 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI::pretty): fix the overflow bug
+	  if stripped string.[ruby-dev:37975]
+
+Thu Nov 12 23:08:11 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (read_from_cmdline): this code is better.
+	  [ruby-core:25991]
+
+Thu Nov 12 22:55:42 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/net/telnet.rb: don't use simple delegate.
+	  because SimpleDelegate behavior changed.
+
+Thu Nov 12 14:33:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_win32.c (thread_errno): CreateThread does not set errno.
+
+	* thread.c (thread_create_core): moved failure handling from
+	  native_thread_core().
+
+	* thread_pthread.c (native_thread_create): constified.
+
+Thu Nov 12 10:08:56 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .document: remove documents not in rdoc format until
+	  rdoc supports non rdoc files. [ruby-core:26459]
+
+Thu Nov 12 06:42:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#initialize): option hash may not be
+	  given.  [ruby-core:26681]
+
+Thu Nov 12 01:29:15 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enumerator.c (yielder_yield_push): Yielder#<< should return self.
+	  [ruby-dev:39660]
+
+Wed Nov 11 19:17:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#initialize): merge mode option.
+
+	* lib/tmpdir.rb (Dir::Tmpname#create): splat options.
+
+Wed Nov 11 12:54:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ruby_setenv): use ruby_strdup().
+
+Wed Nov 11 12:19:27 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (ruby_setenv): also set CRT workarea.  ref [ruby-core:25010]
+
+Wed Nov 11 09:36:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object, r_object0): use RHASH_IFNONE but not ifnone
+	  directly.
+
+Wed Nov 11 08:32:45 2009  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (blocking_region_begin): define before BLOCKING_REGION.
+	  reported by Luis Lavena.  [ruby-core:26670]
+
+Wed Nov 11 08:22:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* util.c (ruby_strtod): use dval() consistently.
+
+Wed Nov 11 02:14:48 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/matrix/test_matrix.rb (TestMatrix#test_rank):
+	  added a test method for r24969.
+
+Tue Nov 10 08:23:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_f_exec, rb_f_system, rb_f_spawn): mentioned about
+	  the shell to be used when the command line is single string.
+	  See [ruby-core:26652]
+
+Mon Nov  9 20:15:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (rb_gc_save_machine_context): don't save the stack pointer
+	  in this function.
+	  (RB_GC_SAVE_MACHINE_CONTEXT): call rb_gc_save_machine_context and
+	  save the stack pointer at caller side.
+	  (rb_thread_schedule_rec): use RB_GC_SAVE_MACHINE_CONTEXT instead of
+	  rb_gc_save_machine_context.
+	  (blocking_region_begin): changed to a macro.  use
+	  RB_GC_SAVE_MACHINE_CONTEXT instead of rb_gc_save_machine_context.
+	  [ruby-dev:39659]
+
+Mon Nov  9 11:28:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): add -Wno-long-long.
+
+Sun Nov  8 18:13:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c: use RHASH_IFNONE but not ifnone directly.
+
+Sat Nov  7 21:02:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb (PP::ObjectMixin#pretty_print): use to_s regardless of
+	  instance variables.
+
+Sat Nov  7 20:59:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_push_frame): get rid of out-of-bounds
+	  access.
+
+Sat Nov  7 12:41:19 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_insnhelper.c (VM_CALLEE_SETUP_ARG): revert r25521.
+	   [ruby-core:26427] [ruby-core:26447]
+
+Fri Nov  6 18:33:47 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_push_frame): add CHECK_STACK_OVERFLOW.
+	  [ruby-dev:39592]
+
+	* eval.c (rb_longjmp): add 1 level backtrace for sysstack_error
+	  without calling any method to prevent further stack overflow.
+
+	* eval.c (make_exception): don't call #exception for
+	  sysstack_error to prevent stack overflow.
+
+	* proc.c (Init_Proc): don't freeze sysstack_error.
+
+	* eval.c (rb_longjmp): move reentrant check after exception
+	  preparation.
+
+Fri Nov  6 17:13:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_header): split the line by tabs.
+
+Fri Nov  6 12:02:32 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (MINIDLNOBJ): set default as dmydln.o.
+	  Now LLVM clang seems to be able to build Ruby 1.9.
+
+Fri Nov  6 09:29:32 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encindex): add fallback to
+	  ASCII-8BIT on Windows.
+
+Fri Nov  6 07:29:07 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_case.rb: merged r25658 from ruby_1_8.
+
+Thu Nov  5 12:27:07 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gem_prelude.rb (Gem.user_home): force_encoding(
+	  Encoding.find('filesystem')). [ruby-core:26525]
+
+Thu Nov  5 07:47:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (BEGIN): now local_push and local_pop are necessary in
+	  ripper.
+
+Wed Nov  4 21:39:10 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .document: add some README files to default rdoc's of trunk.
+	  patched by Roger Pack [ruby-core:26459]
+
+Wed Nov  4 16:06:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/st.h (SIZEOF_ST_INDEX_T): moved from st.c for
+	  Init_RandomSeed().
+
+Wed Nov  4 15:50:16 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (NUM2CHR): prefix __extension__ for
+	  braced-groups within expressions.
+
+Wed Nov  4 15:46:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (set_{internal,external}_encoding_once): fixed typos.
+
+Wed Nov  4 12:49:18 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c (mnew): Fix scope issue [ruby-core:26069]
+
+Wed Nov  4 08:50:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_hash_start): moved from string.c.
+
+	* random.c (Init_RandomSeed2): register global address before set.
+
+	* random.c (Init_RandomSeed): initialize hashseed.
+
+Wed Nov  4 08:26:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_check): moved other checks from GetDIR.
+
+	* dir.c (GetDIR): fixed a variable name.
+
+Wed Nov  4 08:19:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (rb_fiber_start): fixed unconditional test.
+
+Wed Nov  4 02:08:14 2009  Aaron Patterson  <tenderlove@ruby-lang.org>
+
+	* ext/dl/cptr.c (rb_dlptr_eql, rb_dlptr_cmp): DL::CPtr#== and DL::CPtr#<=>
+	  should not raise an exception when compared to a different object.
+
+Wed Nov  4 00:05:36 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_upto): make next object before yield its block.
+	  fix: can modify original begin string of String#upto.
+	  [ruby-dev:26384] [ruby-dev:39626]
+
+Mon Nov  2 18:33:21 2009  wanabe  <s.wanabe@gmail.com>
+
+	* cont.c (fiber_free): don't free unallocated local_storage. see #1325.
+
+	* cont.c (cont_init): clear local_storage not to use current thread's.
+
+	* cont.c (fiber_t_alloc, root_fiber_alloc): link itself always for
+	  a case that fiber_link_remove() is called before fiber_link_join().
+
+	* cont.c (fiber_init): clear cont->vm_stack and th->stack before
+	  root_fiber_alloc() in rb_fiber_current().
+
+Mon Nov  2 14:52:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_exc_raise, rb_exc_fatal, rb_make_exception):
+	  suppressed shorten-64-to-32 warnings.
+
+Mon Nov  2 14:43:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_pthread.c (native_stop_timer_thread): delay joining timer
+	  thread after unlocking mutex.
+
+Mon Nov  2 13:31:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_pthread.c (native_stop_timer_thread): need to join timer thread
+	  only when really stopping it.
+
+Mon Nov  2 12:55:50 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_{pthread,win32}.c (native_stop_timer_thread): join the thread
+	  here.
+
+	* thread_{pthread,win32}.c (native_reset_timer_thread): new function.
+
+	* thread.c (rb_thread_stop_timer_thread, rb_thread_reset_timer_thread):
+	  call above function instead of simply setting 0.
+
+Mon Nov  2 11:22:19 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/registry.rb: update rdoc. [ruby-core:26022]
+
+Sun Nov  1 20:16:03 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: fixed rdoc. [ruby-core:26457]
+
+Sun Nov  1 16:24:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_stack_grow_dir): fix for universal binary.
+
+	* configure.in (sitehdrdir, vendorhdrdir): fixed default values.
+
+Sun Nov  1 13:31:16 2009  wanabe  <s.wanabe@gmail.com>
+
+	* win32/win32.c (overlapped_socket_io, recvmsg, sendmsg): pass handle
+	  instead of pointer to CloseHandle().
+
+Sun Nov  1 13:11:27 2009  wanabe  <s.wanabe@gmail.com>
+
+	* ext/socket/socket.c (socket_s_ip_address_list): use FreeLibrary() to
+	  free HMODULE.
+
+Sun Nov  1 08:17:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (GET_STACK_BOUNDS): refactored common code.  based on a
+	  patch from Suraj N. Kurapati <sunaku AT gmail.com> in
+	  [ruby-core:26443].
+
+Sat Oct 31 23:44:35 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_count): remove optimization using #size.
+	  revert r25560.
+
+	* vm_eval.c (rb_funcall_no_recursive): remove method.
+
+Sat Oct 31 23:28:49 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_eval.c (check_funcall): logic updated according to
+	  [ruby-dev:39594].  search method entry, call if it exists;
+	  otherwise check method_missing, call if it was overridden,
+	  protecting exceptions; if NoMethodError happens, check method
+	  name.
+
+	* vm_eval.c (vm_call0): use idMethodMissing.
+
+	* vm_eval.c (rb_search_method_entry): typo fixed.
+
+Sat Oct 31 17:19:28 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPResponse#each_response_header):
+	  cosmetic: '?\ ' -> '?\s'
+
+Fri Oct 30 22:09:47 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPResponse#each_response_header):
+	  accept multiline message header of HTTP response.  see #1796.
+	  cf. RFC 2616 '4.2 Message Header'.
+
+	* test/net/http/test_httpresponse.rb: added.
+
+Fri Oct 30 18:54:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (trnext): detect empty range and raise exception.
+	   [ruby-dev:39108]
+
+Fri Oct 30 17:01:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (enum call_type): get rid of last comma.
+
+	* vm_eval.c (vm_call0, vm_call_super, rb_f_send, rb_f_public_send):
+	  fixed call_type.  [ruby-dev:39581]
+
+	* vm_eval.c (rb_search_method_entry, rb_method_call_status): split
+	  from rb_call0().
+
+	* vm_eval.c (rb_check_funcall): get rid of raising exceptions and
+	  hiding further exceptions.  [ruby-dev:39584]
+
+	* vm_eval.c (rb_funcall_no_recursive): ditto.
+
+Fri Oct 30 13:36:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_blocking_region): reverted r25566, and added
+	  description that no exception is allowed inside `func', instead.
+	  see [ruby-dev:39582]
+
+Fri Oct 30 13:13:16 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32.c (recvmsg, sendmsg, link): shouldn't raise ruby's exceptions
+	  in the functions expected as system API.  see [ruby-dev:39579] and
+	  [ruby-dev:39582]
+
+Fri Oct 30 12:59:20 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (rb_thread_blocking_region): standard C doesn't accept
+	  preprocessing directive within macro expansion.
+
+Fri Oct 30 10:55:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_blocking_region): must ensure to unlock GVL.
+	  [ruby-dev:39579]
+
+Fri Oct 30 04:47:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RSTRING_END): trivial optimization.
+
+	* string.c (rb_str_sub_bang): trivial optimization.
+
+Fri Oct 30 02:11:36 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_count): call #size using rb_funcall_no_recursive()
+	  to prevent infinite recursive calls.  [ruby-core:24794]
+
+	* vm_eval.c (rb_funcall_no_recursive): utility function to check
+	  direct recursive call.
+
+	* vm_eval.c (rb_check_funcall): move from eval.c. [refactoring]
+
+Thu Oct 29 18:37:02 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): revert previous commit.
+
+	* ruby.c (process_options): ditto.
+
+Thu Oct 29 15:35:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): set locale and filesystem encindex.
+
+	* ruby.c (process_options): move setting func of filesystem
+	  encoding to Init_Encoding.
+
+Thu Oct 29 15:43:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_name_err_mesg_new): added prototype.
+
+Thu Oct 29 13:53:18 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_to_ary): do not use #respond_to? to detect
+	  to_ary.  Just call.  [ruby-core:23738]
+
+	* eval.c (rb_check_funcall): new function with method existence
+	  check.  returns Qundef when the method does not exist.
+
+	* enumerator.c (enumerator_rewind): just call method, using
+	  rb_check_funcall().  [ruby-core:23738]
+
+	* error.c (exc_equal): ditto.
+
+	* object.c (convert_type): ditto.
+
+	* error.c (rb_name_err_mesg_new): export function.
+
+	* eval.c (make_exception): ditto.
+
+	* io.c (pop_last_hash): return early when the last argument is nil.
+
+	* io.c (rb_io_puts): treat T_STRING specially for small
+	  optimization.
+
+	* vm_eval.c (raise_method_missing): skip method call if possible
+	  using rb_method_basic_definition_p().
+
+	* vm_eval.c (method_missing): ditto.
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_debug): test
+	  suites changed to ignore exceptions caused by just-call policy.
+
+Thu Oct 29 04:41:44 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (process_options): call rb_filesystem_encoding().
+
+Thu Oct 29 04:40:36 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (Init_IO): rb_default_rs should be US-ASCII.
+
+Thu Oct 29 01:22:01 2009  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* ext/socket/extconf.rb : Compilation failure on AIX.
+	  ss_len (a member of struct sockaddr_storage) has preceding __,
+	  but ss_family does not have it from AIX 5.2.
+
+Wed Oct 28 16:32:49 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (get_filesystem_encoding): removed.
+
+	* encoding.c (rb_locale_encindex): added.
+
+	* encoding.c (rb_filesystem_encindex): added.
+
+	* encoding.c (rb_filesystem_encindex): add an alias 'filesystem'.
+	  [ruby-dev:39574]
+
+	* encoding.c (enc_find): add rdoc about special aliases.
+
+	* gem_prelude.rb (Gem.set_home): use Encoding.find('filesystem').
+
+	* gem_prelude.rb (Gem.set_paths): ditto.
+
+Wed Oct 28 15:02:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gem_prelude.rb (Gem.set_home):
+	  force_encoding(Encoding.filesystem_encoding)
+	  [ruby-core:25959]
+
+	* gem_prelude.rb (Gem.set_paths): ditto.
+
+Wed Oct 28 14:24:45 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (get_filesystem_encoding):
+	  add Encoding.filesystem_encoding [ruby-dev:39546]
+	  also see [ruby-core:25959]
+
+Wed Oct 28 14:51:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_each_group): fixed typo.
+
+
+Wed Oct 28 13:02:10 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#initialize): sets @binary to true.
+
+	* lib/net/ftp.rb (Net::FTP#binary=): sends a TYPE command only when
+	  logged in. [ruby-dev:39548]
+
+	* lib/net/ftp.rb (Net::FTP#send_type_command): new private method
+	  which sends an appropriate TYPE command according to the value of
+	  @binary.
+
+	* lib/net/ftp.rb (Net::FTP#login): calls send_type_command instead
+	  of binary=.
+
+Wed Oct 28 12:26:51 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_setup_method): should push call frame before
+	  raising exception, to put the Ruby-defined method name in the
+	  error message.  [ruby-core:26333]
+
+	* vm_insnhelper.c (VM_CALLEE_SETUP_ARG): macro modified.
+
+	* vm_insnhelper.c (vm_yield_setup_args): modified for new
+	  VM_CALLEE_SETUP_ARG macro.
+
+Tue Oct 27 22:46:44 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#initialize): @sock = nil.
+
+	* lib/net/ftp.rb (Net::FTP#binary=): send command only when
+	  socket is open. [ruby-dev:39548]
+
+Tue Oct 27 22:22:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (Init_stringio): added read_nonblock and
+	  write_nonblock aliases.  [ruby-dev:39551]
+
+	* ext/stringio/stringio.c (strio_data_type): typed.
+
+Tue Oct 27 21:20:35 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb: add TkVariable#+@ and -@ method.
+
+Tue Oct 27 16:36:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (chopped_length): get rid of unexpected exception.
+	  see [ruby-core:26336].
+
+Tue Oct 27 15:53:10 2009  Tanaka Akira  <akr@fsij.org>
+
+	* gc.h (SET_MACHINE_STACK_END): use __i386.
+	  Some compiler may not define __i386__.
+	  Solaris 64-bit Developer's Guide:
+	  http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view
+
+Tue Oct 27 15:44:48 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
+	  a Pathname instance into a string.  [ruby-core:26237]
+
+Tue Oct 27 12:30:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.h (SET_MACHINE_STACK_END): use __i386__ instead of __i386,
+	  and explicit size qualifiers.
+
+Tue Oct 27 09:40:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.h (SET_MACHINE_STACK_END): add x86_64 version by nobu.
+
+Tue Oct 27 09:27:59 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.c (DECL_SC_REG): use __clang__.
+
+Tue Oct 27 08:56:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: reverted r25443 because build_os is used in mkmf.rb
+	  on some platforms.  [ruby-core:26332]
+
+Tue Oct 27 08:01:57 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* parse.y (ripper_filename): add Ripper#filename. [ruby-dev:37856]
+
+	* test/ripper/test_filter.rb: add more tests.
+
+Tue Oct 27 07:53:25 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (garbage_collect_with_gvl): do not garbage_collect when
+	  dont_gc flag turned on.  [ruby-core:26327]
+
+Tue Oct 27 07:38:39 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c,stubs.c: remove errors or warnings when compiled
+	  with old ruby 1.8.x.
+
+	* ext/tk/tkutil/tkutil.c: ditto.
+
+Tue Oct 27 05:56:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm.c (invoke_block_from_c): return Qnil when its iseq is
+	  SPECIAL CONST. [ruby-core:26335]
+
+Tue Oct 27 05:11:49 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.c (DECL_SC_REG): check defined(__asm__) before use it.
+	  LLVM/clang defines __GNUC__ but doesn't have __asm__.
+
+Tue Oct 27 03:45:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): added RUBY_SITEARCH to use
+	  different name from RUBY_ARCH.  [ruby-core:26324]
+
+Mon Oct 26 20:04:13 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c (rb_ary_cmp): Array#<=> returns nil when comparison fails
+	  [ruby-core:26316]
+
+Mon Oct 26 18:37:57 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (default_proc_arity_check): new support function.
+
+	* hash.c (rb_hash_initialize): should do arity check as #default_proc=.
+	  [ruby-core:26281]
+
+Mon Oct 26 13:24:17 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/remote-tk.rb: typo fixed.
+
+Mon Oct 26 12:34:08 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ruby.c (usage): -T and -W descriptions updated.  see
+	  [ruby-dev:39539]
+
+	* man/ruby.1: ditto.
+
+Mon Oct 26 12:06:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_fwrite): adjust stdio file position after direct write on
+	  BSDish platforms.   [ruby-core:26300]
+
+Sun Oct 25 15:44:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/handle.c (dlhandle_sym): fixed an invalid local variable
+	  declaration.
+
+Sun Oct 25 13:33:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_cntl): F_DUPFD is platform dependent.
+
+Sun Oct 25 10:19:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/handle.c (rb_dlhandle_close): fixed an invalid local
+	  variable declaration.
+
+Sun Oct 25 05:44:34 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (**): Optimization (up to 45% faster)
+
+Sat Oct 24 14:28:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_set_default_proc): checks arity of default_proc
+	  of a Hash.  [ruby-core:26087]
+
+Sat Oct 24 13:38:45 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_cmp): defines Object#<=>.  [ruby-core:24063]
+
+Sat Oct 24 09:51:28 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_flat_map): new method that concatenates the values
+	  from given block.  also provides alias #collect_concat.
+
+Sat Oct 24 00:36:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_cntl): update max file descriptor by the result of
+	  fcntl(F_DUPFD).
+
+Fri Oct 23 16:31:14 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_class_new): move class check to rb_check_inheritable().
+
+	* class.c (rb_check_inheritable): should not allow subclass of
+	  class Class.  [ruby-core:26225]
+
+Fri Oct 23 14:25:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (target, target_alias): replace with real cpu.
+
+	* mkconfig.rb: build* are not needed in rbconfig.rb.
+
+	* configure.in (warnflags): use -Wextra only when
+	  -Wno-missing-field-initializers is available.
+
+	* configure.in (optflags): removed -fomit-frame-pointer by default.
+
+Fri Oct 23 09:12:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pathname.rb (Pathname::SAME_PATHS): FNM_SYSCASE is always
+	  non-nil.
+
+Fri Oct 23 07:32:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
+	  ruby without current libraries.
+
+	* common.mk (rdoc): use XRUBY.
+
+Fri Oct 23 07:28:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): use -Wextra instead of -Wall.
+
+	* gc.c (mark_current_machine_context): get rid of warning.
+
+Thu Oct 22 21:10:39 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* class.c (rb_obj_basic_to_s_p): typo.  Please become familiar with
+	  the ANSI style.
+
+Thu Oct 22 20:20:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_in_out_err): test_stdout and
+	  test_stderr should be an array.
+
+	* test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of
+	  assert_in_out_err should be a string.
+
+Thu Oct 22 17:49:05 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
+	  convert an integer back and forth.
+
+Thu Oct 22 17:29:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg_prepend): removed.  a patch from Mikhail T. in
+	  [ruby-core:26217].
+
+Thu Oct 22 04:54:41 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_inspect): print instance variables only when
+	  Object#to_s is not overridden.  [ruby-core:24425]
+
+	* class.c (rb_obj_basic_to_s_p): new function.
+
+Wed Oct 21 19:32:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_inspect): fixed rdoc about the case that to_s
+	  is called.  [ruby-core:24425]
+
+Wed Oct 21 08:17:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/logger/test_logger.rb (TestLogDevice#test_write): check
+	  also error message.
+
+Wed Oct 21 03:54:41 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb:
+	  Creator functions now strict with their arguments
+	  Support for empty matrices (see new method Matrix.empty)
+	  Matrix#trace raises an ErrDimensionMismatch if the matrix is not square
+	  Enumerators are returned when no block given
+	  Consistent results when accessing elements with out of bounds indices
+	  Details in [ruby-core:23598].
+
+Wed Oct 21 00:27:15 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/webrick/httpauth/digestauth.rb: typo in exception message fixed.
+
+Wed Oct 21 00:17:28 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: imported upstream version (logger/1.2.7) see #2238.
+	  * do not raise an exception even if log writing failed.
+	  * do not raise ShiftingError if an aged file already exists.
+	    (no ShiftingError will be raised from 1.2.7, just warn() instead)
+	* test/logger/test_logger.rb: ditto.
+
+Tue Oct 20 22:29:06 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/matrix.rb:  Bug fix. See detail [ruby-core:23598].
+
+Tue Oct 20 17:57:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_symbol, r_symreal): fixed the order of symbol and
+	  its encoding modifier, in order to make the dump readable from
+	  1.8.  [ruby-dev:39515]
+
+Tue Oct 20 16:41:18 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (finite, scalb): inline'ed non-standard
+	  identifier macros.  [ruby-core:26166]
+
+Tue Oct 20 15:38:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_intern): enable literal optimization.
+
+	* parse.y (method_call): dispatch symbols.  a patch from Andy Keep in
+	  [ruby-core:26169].  [ruby-core:26165]
+
+	* parse.y (mlhs_basic): fixed handling splat in middle of mlhs.  a
+	  patch from Andy Keep in [ruby-core:26163]
+
+	* parse.y (parser_here_document): dispatch delayed heredoc
+	  contents.  based on a patch from Andy Keep in [ruby-core:24855].
+
+Mon Oct 19 15:17:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (rb_method_entry): search method entry by class and id.
+
+Mon Oct 19 15:03:31 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (enc/unicode/name2ctype.h): no need to create
+	  directory if it already exists.
+
+Mon Oct 19 11:34:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (rb_ps): dump all threads and their callstacks.  based
+	  on [ruby-core:26155] by Joshua ben Jore <twists AT gmail.com>.
+
+Mon Oct 19 10:59:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (prepare_iseq_build, rb_iseq_build_for_ruby2cext):
+	  untrust mark array.  [ruby-core:26137]
+
+Mon Oct 19 05:49:53 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/rexml/element.rb (text=): false should be converted to string.
+	  A patch by Teruo Oshida [ruby-dev:38351]
+
+Sun Oct 18 22:33:25 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: do not require lib/delta.rb.
+
+	* lib/date/delta.rb: follows the above change.
+
+Sun Oct 18 19:14:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (is_special_global_name): add boundary check.
+
+Sun Oct 18 18:31:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): should not dup tmp string.  a
+	  patch from neomjp neomjp in [ruby-core:24251].
+
+Sun Oct 18 09:49:14 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/test_prime.rb
+	  (TestPrime#test_eratosthenes_works_fine_after_timeout):
+	  test for [ruby-dev:39465].
+
+	* lib/prime.rb (Prime::EratosthenesSieve):
+	  fixed [ruby-dev:39465].
+	  suppressed memory reallocation.
+	  constantified some magic numbers.
+
+Sat Oct 17 22:11:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (id2encidx): register encoding name.
+	  (r_object0): register object before encoding name.
+	  [ruby-core:24882]
+
+Sat Oct 17 17:56:58 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/rake/test_fileutils.rb (Rake::TestFileUtils#test_sh): uses
+	  FileUtils::RUBY instead of fixed "ruby" so that the ruby command
+	  works fine in Ruby's "make test-all".
+	  (test_sh_with_a_single_string_argument): ditto.
+	  (test_sh_with_multiple_arguments): ditto.
+	  (test_sh_failure): ditto
+	  (test_sh_special_handling): ditto.
+
+Sat Oct 17 17:30:06 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (big_split): fix off-by-one error.  [ruby-dev:39501]
+
+Sat Oct 17 16:34:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (parser_yylex): fix token even after trailing under score.
+
+Sat Oct 17 11:27:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_method.c (basic_obj_respond_to): call #respond_to_missing?
+	  always with two arguments.  [ruby-core:26090]
+
+Sat Oct 17 08:51:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#respond_to_missing): warn only when
+	  specified method is a private.  [ruby-dev:39498]
+
+Fri Oct 17 00:05:53 2009  wanabe  <s.wanabe@gmail.com>
+
+	* st.c (unpack_entries): save table->bins and never change the table
+	  during unpacking. Because st_insert() may cause GC and refer the
+	  table, i.e. st_foreach().  [Bug #2196]
+
+Fri Oct 16 22:20:25 2009  Tanaka Akira  <akr@fsij.org>
+
+	* prelude.rb (require_relative): defined as a module function of
+	  Kernel.
+
+Fri Oct 16 20:18:28 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#method_missing): remove backtrace
+	  lines _until_ `method_missing'.
+
+Fri Oct 16 20:09:55 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#freeze): #freeze should freeze self
+	  and the target at once.   [ruby-core:26118]
+
+Fri Oct 16 19:39:28 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#respond_to_missing): warn if optional
+	  include_private argument is not false.  Delegator does (and
+	  should) not forward private methods.  [ruby-core:26080]
+
+	* lib/delegate.rb (Delegator#respond_to_missing): instead of
+	  redefining #respond_to?, use #respond_to_missing?.  [ruby-core:26081]
+
+Fri Oct 16 18:42:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/test_gc.rb: added tests based on [ruby-dev:39484]
+	  from wanabe <s.wanabe AT gmail.com>.
+
+Fri Oct 16 16:09:01 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn): `\'' is also quote character.
+
+Fri Oct 16 13:40:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.h (rb_gc_debug_body): constified.
+
+Fri Oct 16 13:20:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpMidRound): remove warnings.
+	  patch from Charlie Savage. [ruby-core:22869]
+
+	* ext/digest/bubblebabble/bubblebabble.c (bubblebabble_str_new): ditto.
+
+	* ext/digest/digest.c (hexencode_str_new): ditto.
+
+	* ext/iconv/iconv.c (iconv_convert): ditto.
+
+	* ext/socket/socket.c (inspect_sockaddr): ditto.
+
+	* ext/socket/raddrinfo.c (sockaddr_obj): ditto.
+
+	* ext/syck/emitter.c (syck_emitter_write): ditto.
+
+	* ext/syck/emitter.c (syck_emitter_flush): ditto.
+
+	* ext/syck/emitter.c (syck_emit_tag): ditto.
+
+Fri Oct 16 12:03:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io
+	  doesn't have encoding.
+
+Fri Oct 16 03:15:52 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/csv.rb (CSV#read_to_char): set encoding and verify data
+	  which read from io before encode it to @encoding.
+
+	* lib/csv.rb (CSV#raw_encoding): add to get @io's encoding.
+
+	* lib/csv.rb (CSV#read_io): add to read string and set @io's
+	  encoding.
+
+Thu Oct 15 18:26:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern3): check symbol table overflow before generate
+	  next id.  [ruby-core:26092]
+
+Thu Oct 15 15:14:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_encoding_set): get rid of parsing non-ascii string, and
+	  refine messages for invalid name encoding.
+
+	* io.c (io_reopen): unread current buffer before telling the
+	  position, for the case of reopening same file.  [ruby-dev:39479]
+
+Thu Oct 15 14:20:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_create): cannot retry with given block.
+	  [ruby-dev:39487]
+
+Thu Oct 15 09:25:07 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK
+	  flag in st_mode of struct stat. so, use rb_w32_issocket() function
+	  instead of S_ISSOCK macro.
+
+Thu Oct 15 00:47:42 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb,
+	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  use UTS#18 for POSIX character class.
+	  http://rubyspec.org/issues/show/161
+
+Thu Oct 15 00:26:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (rsock_init_sock): validate file descriptor.
+
+Wed Oct 14 13:24:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): script name should not be shown in an
+	  error message before loaded.
+
+Wed Oct 14 09:06:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_run_node): need to call ruby_cleanup() always even
+	  if any error occurred so far.
+
+Wed Oct 14 08:08:12 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c (mnew): Method#new checks for respond_to_missing? with
+	  private set to true
+	  [ruby-core:26069]
+
+Tue Oct 13 21:05:01 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb,
+	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  Add DerivedCoreProperties, PropList (Binary Property),
+	  PropertyAlias and PropertyValueAlias.
+	  Now users of tool/enc-unicode.rb should specify
+	  the directory of UCD files.
+
+Tue Oct 13 18:54:25 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/variable.rb: bug fix. additional trace definition changes the
+	  option of first trace definition.
+
+Tue Oct 13 18:23:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (token_info_push, token_info_pop): reduced ifdefs.
+
+	* parse.y (parser_magic_comment): fixed normalization.
+
+Tue Oct 13 09:04:14 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* thread.c: Revert changes to Thread#raise made in r25278
+	  [ruby-core:25367]
+
+	* eval_intern.h: ditto
+
+Mon Oct 12 23:27:57 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (login): use "anonymous@" as a default password.
+	  [ruby-dev:39451]
+
+Mon Oct 12 22:48:25 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (retrlines): added a new block parameter.
+
+	* lib/net/ftp.rb (gettextfile): preserve missing end-of-line at end
+	  of files.  [ruby-core:24590]
+
+Mon Oct 12 19:48:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_run_node): if an exception occurred in ruby_option,
+	  the result is not executable.
+
+Mon Oct 12 05:51:11 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (fetch_token): warn invalid back reference
+	  and subexp call. (\k and \g).
+
+Mon Oct 12 03:47:42 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (has_encoding): added for check the regexp
+	  is dumped by 1.8 or 1.9.
+
+	* marshal.c (r_object0): use has_encoding.
+
+Sun Oct 11 15:54:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/gdbm/gdbm.c (fgdbm_select): fixed rdoc.  a patch from Justin
+	  Collins in [ruby-core:26050].
+
+Sun Oct 11 10:27:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/context.rb (IRB::Context#irb_name): removed duplicated
+	  attr_reader.  [ruby-core:26047]
+
+	* lib/irb/ruby-lex.rb (RubyLex#lex_int2): removed duplicated
+	  character class range.
+
+Sun Oct 11 10:04:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (fetch_token_in_cc): warn when \p is not
+	  followed by property name.
+
+	* regparse.c (fetch_token): ditto.
+
+Sun Oct 11 09:44:46 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regerror.c (onig_vsnprintf_with_pattern): added.
+
+	* regparse.c (onig_syntax_warn): use above.
+
+Sun Oct 11 09:04:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc
+	  optimization.
+
+	* include/ruby/ruby.h (ruby_exec_node): declared.
+
+Sun Oct 11 03:10:50 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (onig_syntax_warn): added.
+
+	* regparse.c (CC_ESC_WARN, CLOSE_BRACKET_WITHOUT_ESC_WARN,
+	  CC_DUP_WARN, UNKNOWN_ESC_WARN): use onig_syntax_warn.
+
+Sun Oct 11 00:14:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (marshal_dump, marshal_load): prevent from GC.
+
+Sat Oct 10 23:57:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (path_check_0): prevent from GC.
+
+Sat Oct 10 23:51:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_transcoding, str_transcoding_resize): fixed
+	  types.
+
+Sat Oct 10 20:35:27 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* math.c (math_atanh): reverted r25279.
+
+Sat Oct 10 19:03:29 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c: use rb_thread_blocking_region to avoid
+	  rb_read_check.  This makes other threads runnable in getstr and
+	  wgetstr.
+	  (getch_func): extracted from curses_getch.
+	  (curses_getch): use rb_thread_blocking_region with getch_func.
+	  (getstr_func): extracted from curses_getstr.
+	  (curses_getstr): use rb_thread_blocking_region with getstr_func.
+	  (wgetch_func): extracted from window_getch.
+	  (window_getch): use rb_thread_blocking_region with wgetch_func.
+	  (wgetstr_func): extracted from window_getstr.
+	  (window_getstr): use rb_thread_blocking_region with wgetstr_func.
+
+	* include/ruby/io.h (rb_read_check): deprecated because it access
+	  internal of stdio.
+
+Sat Oct 10 18:59:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (cflags, cxxflags): remove duplicating options.
+
+Sat Oct 10 18:19:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp),
+	  win32/mkexports.rb (each_export): exclude _threadptr_ functions.
+
+Sat Oct 10 17:55:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_threadptr_errinfo): renamed.
+
+Sat Oct 10 17:03:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_exec_node): removed unused argument.
+
+Sat Oct 10 14:55:55 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* math.c (math_atanh): Fix bug for Math.atanh(+/-1). It now returns
+	  +-Infinity. [ruby-core:26028]
+
+Sat Oct 10 14:09:40 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* thread.c (rb_threadptr_execute_interrupts_rec, rb_threadptr_raise):
+	  Thread#raise with no argument will now re-raise the current exception
+	  if there is one [ruby-core:25367]
+
+	* eval.c (get_errinfo, rb_rubylevel_thread_errinfo): Getter for
+	  current exception for a given thread
+
+Fri Oct  9 23:10:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_method.c (rb_method_boundp): should exclude NOEX_RESPONDS.
+	  based on the patch from Nikolai Lugovoi.  [ruby-core:25949]
+
+Fri Oct  9 21:14:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP): disable
+	  reverse lookup.
+	  (Resolv::DNS::Requester::UnconnectedUDP): ditto.
+
+Fri Oct  9 10:12:13 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/irb/context.rb (IRB::Context#initialize):
+	  remove warnings when $VERBOSE is set as true in .irbrc.
+
+Fri Oct  9 02:58:18 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb: optimized.
+
+	* enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  U+100000-U+10FFFD is assigned, not Cn.
+
+Fri Oct  9 02:12:02 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* ext/curses/curses.c: Many functions of module Curses could cause a
+	  crash if the ncurses library was not properly initialized.
+	  Fix pointed out by Alexander Beisig [ruby-core:22592]
+	  Functions fixed: attroff, attron, attrset, bkgd, bkgdset,
+	  can_change_color, close_screen, closed, color_content, curs_set,
+	  def_prog_mode, delch, deleteln, getmouse, getstr, has_colors,
+	  init_color, init_pair, insertln, keyname, mouseinterval, mousemask,
+	  pair_content, pair_number, reset_prog_mode, resizeterm, scrl,
+	  setscrreg, standend, standout, start_color, timeout, ungetmouse,
+	  use_default_colors
+
+Fri Oct  9 01:07:34 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (ADD_TRACE): fire coverage event in ensure clause.
+	  [ruby-dev:39303]
+
+	* iseq.h, iseq.c: ditto.
+
+Fri Oct  9 00:33:29 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/net/telnet.rb (cmd): Pass FailEOF options: patch by Brian
+	  Candler [ruby-core:22723]
+
+Fri Oct  9 00:01:17 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.udp_server_recv): extracted from
+	  Socket.udp_server_loop_on.
+
+Thu Oct  8 05:45:14 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb: parse range notation of UnicodeData.txt.
+
+	* enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  follow above change. [ruby-dev:39444]
+
+Thu Oct  8 02:46:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_inspect): copy by chunks.
+
+Thu Oct  8 01:23:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_s_disasm): accept proc objects.  [ruby-core:18762]
+
+Wed Oct  7 16:42:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (mark_dump_arg, mark_load_arg): ignore already cleaned
+	  data.  [ruby-core:25969]
+
+	* marshal.c (clear_dump_arg, clear_load_arg): clear freed fields.
+
+Wed Oct  7 16:06:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_long2int): evaluates the argument only
+	  once.
+
+	* struct.c (rb_struct_alloc): check array length overflow.
+
+Wed Oct  7 09:23:49 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): don't assign -1 to unsigned int.
+
+Wed Oct  7 00:27:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS.bind_random_port): bind to "::" for IPv6.
+	  (Resolv::DNS::ConnectedUDP#initialize): specify is_ipv6 argument of
+	  bind_random_port.
+	  [ruby-core:25970]
+
+Tue Oct  6 23:32:38 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upto): RDoc updated.  a patch from Nobuhiro
+	  IMAI <nov at yo.rim.or.jp> in [ruby-dev:39440]. [ruby-dev:39439]
+
+Tue Oct  6 21:30:58 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_reopen): avoid close if possible.
+
+Tue Oct  6 18:56:09 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_select): Struct#select should return
+	  enumerator when no block given.
+
+Tue Oct  6 06:26:00 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* * ext/tk/lib/tk/canvas.rb: *** POTENTIALLY INCOMPATIBLE ***
+	  'tags' option of a TkcItem object should give a list of TkcTag objs.
+
+	* ext/tk/lib/tkextlib/vu/dial.rb: fix logical bug.
+
+	* ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb:
+	  lack of support for methodcall_optkeys.
+
+Mon Oct  5 17:19:33 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator::public_api): take snapshot of
+	  public method at the beginning time.
+
+	* lib/delegate.rb (SimpleDelegator#initialize): use
+	  Delegator.public_api since public_method might be added after
+	  initialization.  [ruby-dev:39383]
+
+	* lib/delegate.rb (DelegateClass): ditto.
+
+Mon Oct  5 12:22:12 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
+	  calls inside of the loop by keeping pointers in local
+	  variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
+	  It was found and fixed at Security and Programming camp 2009.
+
+	* string.c (rb_str_{times, split_m}): ditto.
+
+	* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
+	  inspect}_struct, recursive_{equal, hash, eql}): ditto.
+
+Mon Oct  5 00:09:57 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_method.c (basic_obj_respond_to): should not call
+	  #respond_to_missing? for not implemented methods.
+	  [ruby-core:25909]
+
+	* vm_method.c (rb_method_boundp): returns exceptional value 2 for
+	  not-implemented methods when called from #respond_to? (specifies
+	  by new constant NOEX_RESPONDS).
+
+	* method.h (enum): new constant NOEX_RESPONDS added.
+
+Sun Oct  4 22:16:29 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/cookie.rb: add default value to @@accept_charset
+	  if have not defined. [ruby-dev:38987]
+
+	* lib/cgi/util.rb: ditto.
+
+Sun Oct  4 19:30:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (struct {dump,load}_arg): manage with dfree, instead
+	  of using local variable which may be moved by context switch.
+	  [ruby-dev:39425]
+
+Sun Oct  4 15:00:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (NATINT_LEN, pack_pack): suppressed warnings.
+
+Sun Oct  4 14:01:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems.rb (Gem::binary_mode): binary mode uses binary
+	  encoding.
+
+Sun Oct  4 08:27:10 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (slicebefore_ii): use id_eqq.
+
+Sun Oct  4 06:40:09 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup (ruby.mmp): added macro RUBY_EXPORT to match the
+	  change in dln.c
+
+Sun Oct  4 05:34:34 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb: add TkVariable#to_hash,to_proc,to_int,
+	  to_str,to_ary
+
+Sun Oct  4 00:59:52 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb: fix command-line option of
+	  non-interactive terminal. [ruby-core:23016]
+
+Sun Oct  4 00:40:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake/contrib: added.  [ruby-core:25918]
+
+Sat Oct  3 22:14:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (bv_decls, bvar): fix for block variables.
+	  [ruby-dev:39423]
+
+Sat Oct  3 21:19:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_add_method_def): no redefinition warning on
+	  undef.
+
+Sat Oct  3 18:51:11 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_f_integer): now Integer() takes optional base
+	  argument.  base will be ignored for non string values.
+	  suggested by Sam Carr at RubyFoo Lounge at London.
+
+	* test/ruby/test_integer.rb (TestInteger#test_Integer): test
+	  updated.
+
+Sat Oct  3 04:34:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assignable_gen): parser_yyerror takes two arguments.
+
+Sat Oct  3 04:07:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake: updated to rake code to rake-0.8.7 source code base.
+
+	* lib/rake/loaders/makefile.rb (Rake::MakefileLoader#process_line):
+	  respace dependencies too.
+
+Sat Oct  3 02:59:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assignable_gen): get rid of macro collision.
+
+Sat Oct  3 02:49:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_make_shared): should count frozen array itself.
+
+Sat Oct  3 01:01:20 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/unicode/name2ctype.h: Updated to Unicode 5.2.0.
+
+Sat Oct  3 01:01:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: workaround for regexp metacharacters of expr in
+	  prefix path.
+
+Sat Oct  3 00:47:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ripper/dummyparser.rb (DummyParser): improvement by Magnus
+	  Holm in [ruby-core:25884].
+	  * remove scanner events which simply returned the first argument.
+	  * all parser events are now automatically generated.
+	  * simplify blocks.
+
+Sat Oct  3 00:43:52 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* method.h (rb_method_type_t): remove a comma at end of
+	  enumerator list.
+
+Sat Oct  3 00:31:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (discrete_object_p): needs the argument type to get rid
+	  of truncation on platforms where VALUE is larger than int.
+
+Fri Oct  2 22:30:15 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/unicode/name2ctype.h.blt, enc/unicode/name2ctype.kwd,
+	  enc/unicode/name2ctype.src: Updated to Unicode 5.2.0.
+	  NOTE: when you update these data, download UnicodeData.txt
+	  and Scripts.txt from http://www.unicode.org/Public/UNIDATA/
+	  and run
+	  ruby1.9 tool/enc-unicode.rb UnicodeData.txt Scripts.txt \
+	  > enc/unicode/name2ctype.kwd
+
+	* enc/unicode/Scripts.txt: removed.
+
+	* enc/unicode/UnicodeData.txt: removed.
+
+Fri Oct  2 20:49:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_slice_before): take a pattern if no block given.
+
+Fri Oct  2 20:37:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_yylval_id, ripper_get_{id,value}): wrap ID by
+	  NODE to track local variable assignment.
+
+	* parse.y (lvar_defined_gen, assignable_gen): enable local
+	  variable check.  [ruby-core:24923]
+
+	* parse.y (validate): use value only.
+
+	* test/ripper/test_parser_events.rb (test_local_variables): tests
+	  based on a patch from Magnus Holm in [ruby-core:25885].
+
+Fri Oct  2 15:34:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ruby_suppress_tracing): get rid of clobbering by
+	  longjmp.
+
+Fri Oct  2 09:20:35 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (rb_origenviron): remove unused old variable.
+	  [ruby-dev:39412]
+
+Thu Oct  1 14:16:39 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{setup.mak,Makefile.sub,win32.c},include/ruby/win32.h (RT_VER):
+	  split compiler specification and runtime library specification.
+
+	* win32/Makefile.sub (LD_SHARED*, config.status): no need to embed
+	  manifest if not exist.
+
+Thu Oct  1 13:23:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_getpid): simply call GetCurrentProcessId()
+	  instead of calling MSVCRT's getpid().
+
+Wed Sep 30 13:15:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_add_method_def): show the location where
+	  overwritten method was defined.  [ruby-dev:39400]
+
+Wed Sep 30 00:37:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_block_call): extracted.
+
+Wed Sep 30 00:00:25 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): escape as \x{XXXX} when the encoding is
+	  other than Unicode. [ruby-dev:39388]
+
+Wed Sep 30 00:00:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (THREAD_MODEL): modified message when no thread
+	  model is available.
+
+Tue Sep 29 23:17:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_scan_open_args): rb_utf8mac_encoding is undefined.
+
+Tue Sep 29 22:25:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_struct_iv_get): deprecated because it is
+	  not used and access internal structure.
+
+Tue Sep 29 22:19:36 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb (assert_equal): use Time#subsec if nsec
+	  is not enough to distinguish arguments.
+
+Tue Sep 29 21:16:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_scan_open_args): add UTF8-MAC to no-convertion encoding.
+
+Tue Sep 29 21:21:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--enable-pthread): deprecated.
+
+Tue Sep 29 21:03:59 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/pp.rb (Kernel#pp): returns its arguments, like Kernel#p.
+	  [ruby-dev:34830]
+
+Tue Sep 29 17:02:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/lib/json/common.rb (recurse_proc): removed needless
+	  module_function, since visibility is already module_function.
+
+Tue Sep 29 13:48:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_definition_eq): non-null definition is
+	  not equal to null definition.
+
+	* vm_method.c (rb_add_method_def): nothing to do if old method had
+	  same definition.  [ruby-dev:39397]
+
+Tue Sep 29 06:50:32 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): dump as \uXXXX when the
+	  string is in Unicode. [ruby-dev:39388]
+
+Tue Sep 29 06:49:16 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_unicode_p): defined.
+	  Returns 1 when the encoding is Unicode series
+	  other than UTF-7 else 0.
+
+Tue Sep 29 04:14:08 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encoding): On Unix systems,
+	  filesystem encoding should be locale encoding.
+	  [ruby-dev:39393]
+
+Tue Sep 29 04:07:58 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* hash.c (rb_f_getenv): use rb_filesystem_str_new_cstr
+	  instead of rb_str_new2.
+	  ENV['PATH'].encoding should be Filesystem Encoding
+	  because its content is related to filesystem.
+	  see [ruby-dev:39393]
+
+	* hash.c (env_fetch): ditto.
+
+	* string.c (rb_filesystem_str_new): defined.
+
+	* string.c (rb_filesystem_str_new_cstr): ditto.
+
+	* include/ruby/intern.h (rb_filesystem_str_new): added.
+
+	* include/ruby/intern.h (rb_filesystem_str_new_cstr): ditto.
+
+Tue Sep 29 04:06:18 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/st.h: include inttypes.h and stdint.h.
+
+Tue Sep 29 00:07:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_f_getenv, env_fetch): env string may be overwritten.
+
+Mon Sep 28 23:30:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (load_lib, dln_find_exe_r): env string may be overwritten.
+
+	* dln.c (dln_{exit,loaderror,memerror,notimplement}): renamed as
+	  independent names.
+
+	* dln.c (aix_loaderror): needs format string.
+
+Mon Sep 28 19:36:20 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (LK_ERR): with overlapped I/O, LockFileEx() returns
+	  ERROR_IO_PENDING if the file is locked.
+
+Mon Sep 28 19:05:05 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* include/ruby/st.h: aligned prototype of st_hash_uint32 with function
+	  definition (fixing compiling problem on cygwin)
+
+Mon Sep 28 12:13:15 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* method.h (enum): new method type VM_METHOD_TYPE_MISSING.
+
+	* vm_eval.c (vm_call0): invoking VM_METHOD_TYPE_MISSING method
+	  objects.
+
+	* vm_insnhelper.c (vm_call_method): invoking method defined from
+	  VM_METHOD_TYPE_MISSING.
+
+	* proc.c (rb_method_entry_arity): ditto.
+
+	* vm_method.c (rb_method_entry_eq): two method object wraps
+	  method_missing with same symbol should be equal.
+	  [ruby-core:25755]
+
+	* proc.c (mnew): should always return method object.
+
+Mon Sep 28 11:38:07 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string): the byte after ``\'' may be a part of
+	  multibyte character, so pushback it. [ruby-list:46416]
+
+Mon Sep 28 10:06:38 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* stringio/stringio.c (strio_read): set ASCII-8BIT encoding
+	  when length argument is given.
+
+Mon Sep 28 01:28:17 2009  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* Makefile.in (miniruby): suppress duplication warning on AIX.
+
+Mon Sep 28 01:13:25 2009  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* common.mk (ruby.imp): add text section [Bug #2064].
+
+	* common.mk (ruby.imp): do not export Init_*.
+
+Sun Sep 27 13:06:43 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb (PP:ObjectMixin#pretty_print): delegates has no inspect
+	  method.  [ruby-core:25804]
+
+Sun Sep 27 12:01:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_buf_cat2): optimize since all second arguments are
+	  constant literals.
+
+	* string.c (str_cat_char): unused now.
+
+	* string.c (rb_hash_{uint{32,},end}): removed.
+
+Sun Sep 27 11:58:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (optflags): add -fomit-frame-pointer by default.
+
+Sun Sep 27 11:28:15 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_minmax): use struct for memo.
+	  (enum_minmax_by): ditto.
+
+Sun Sep 27 10:21:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): check all flags if each are available.
+
+Sun Sep 27 05:35:17 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/ext/generator/generator.c: Documentation patch by okkez.
+	  [Bug #2075]
+
+Sun Sep 27 04:20:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): result's encoding should be fixed.
+	  If default_internal is not nil, the encoding is default_internal.
+	  Else if default_external is not nil, the encoding is default_external.
+	  But the encoding is not ASCII-compatible, the encoding is replaced by
+	  US-ASCII.
+	  Characters in ASCII-incompatible encoding or non ASCII characters
+	  in other than the encoding will be \xXX escaped.
+	  [ruby-dev:39343]
+
+	* string.c (str_buf_cat2): defined.
+
+	* string.c (prefix_escape): removed.
+
+Sun Sep 27 05:37:45 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/missing-pips.c: Updated to work with the latest PIPS 1.6.
+
+	* symbian/setup: ditto.
+
+	* symbian/README.SYMBIAN: ditto.
+
+Sun Sep 27 02:00:46 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c: use rename-macro instead of RUBY_ALIAS_FUNCTION_TYPE.
+	  Because build causes failure.
+
+Sat Sep 26 23:29:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c: moved murmur hash from string.c.  [ruby-dev:39376]
+
+Sun Sep 26 00:24:14 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup: Updated .mmp file generation due to blockinlining.c removal.
+
+Sat Sep 26 22:39:24 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in(test-rubyspec): explicitly executes run subcommand of
+	  mspec.
+
+	* spec/README: typo fix
+
+Sat Sep 26 17:53:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (COLLISION): improved collision log feature.
+
+	* string.c (hash): updated to MurmurHash 2.0 2009-09-19.
+
+	* string.c (rb_hash_start): fixed shift width on 128bit platform.
+
+	* include/ruby/intern.h (rb_hash_{start,uint32,uint,end}): fixed
+	  prototypes.
+
+Sat Sep 26 13:26:55 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/net/http.rb (transport_request): Handle timeout error by
+	  closing socket if exception raised. [ruby-core:20976]
+
+Sat Sep 26 12:08:17 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_eq): method defined from same
+	  block/proc should be equal.  [ruby-core:25755] [ruby-core:24791]
+
+Sat Sep 26 08:35:12 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (compile_string): rename to parse_string(), because
+	  this function only parse String to NODE.
+
+Fri Sep 25 16:01:45 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_access): new function to
+	  replace MSVCRT's access().
+	  [ruby-core:25761]
+
+	* file.c (eaccess): workaround for recent MSVCRT is no longer needed.
+
+Fri Sep 25 13:04:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew): fix for instance method of Module, BasicObject
+	  and subclass of a class which overrides respond_to_missing?.
+	  based on a patch from Nikolai Lugovoi <nlugovoi AT gmail.com> in
+	  [ruby-core:25748].
+
+Fri Sep 25 11:56:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_mod_method_defined): should return true or false.
+
+Thu Sep 24 13:32:53 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (mnew): generate method object that wraps method_missing,
+	  when #respond_to_missing? is defined.
+
+	* test/ruby/test_object.rb (test_respond_to_missing): add test
+	  suites for #respond_to_missing? changes.
+
+Thu Sep 24 09:41:42 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/mathn.rb (Bignum#**): Fixed bignum**fixnum that was broken when
+	  requiring lib/mathn
+	  [ruby-core:25740]
+
+Thu Sep 24 02:21:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (atan): atan(Infinity) is
+	  PI/2.
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (atan): reduce loop with
+	  the double-angle formula.  based on a patch from Masahiro
+	  Kanai (CanI) in [ruby-dev:39367].
+
+Thu Sep 24 01:14:18 2009  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* dln.c (aix_loaderror): fixed typo. suppress warnings.
+
+Thu Sep 24 00:17:06 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_minmax): reduce comparison.
+	  (enum_minmax_by): ditto.
+
+Wed Sep 23 22:58:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/thread.rb (ConditionVariable#wait): add timeout argument.
+	  [ruby-talk:346154]
+
+Wed Sep 23 21:25:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (atan): refined.
+
+Wed Sep 23 17:08:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assign_in_cond): also should warn assignment to dvar in
+	  conditional.  [ruby-dev:39363]
+
+Wed Sep 23 13:14:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_upto): keep first width.  [ruby-dev:39361]
+
+Wed Sep 23 11:28:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/instruction.rb (make_header_prepare_stack): check stack
+	  overflow.  [ruby-core:25714]
+
+	* tool/instruction.rb (make_footer_stack_val): ditto.
+
+
+Wed Sep 23 05:03:36 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c (umethod_bind, rb_mod_define_method): Fix bug that
+	  disallowed methods from singleton classes to be used for
+	  UnboundMethod#bind, Kernel#define_singleton_method and
+	  Module#define_method, even when that singleton class was of the right
+	  kind_of. A patch by Shane O'Brien [ruby-core:25632]
+
+Tue Sep 22 22:56:48 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_method.c (basic_obj_respond_to): new function to fundamental
+	  behavior for #respond_to?
+
+	* vm_method.c (basic_obj_respond_to): calls #respond_to_missing
+	  method if overridden, to check responsiveness of methods
+	  implemented by #method_missing.
+
+Tue Sep 22 16:34:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_table_entry, st_get_key): use st_index_t.
+
+Tue Sep 22 16:28:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regenc.h (PosixBracketEntryType): constified.
+
+	* regenc.h (PosixBracketEntryInit): suppress warnings.
+
+	* regerror.c (onig_error_code_to_str, onig_snprintf_with_pattern):
+	  fixed type.
+
+	* regparse.c (st_str_end_key, str_end_cmp, str_end_hash):
+	  constified.
+
+	* tool/transcode-tblgen.rb (transcode_generated_code): fixed type.
+
+Tue Sep 22 10:29:06 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_chunk): new method Enumerable#chunk.
+	* enum.c (enum_slice_before): new method Enumerable#slice_before.
+	  [ruby-dev:38392] [ruby-dev:39240]
+
+Tue Sep 22 05:58:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c, cont.c, gc.c, insns.def, iseq.c, iseq.h, process.c,
+	  thread.c, vm.c, vm_core.h, vm_dump.c, vm_eval.c,
+	  vm_insnhelper.c, vm_method.c, template/insns_info.inc.tmpl,
+	  tool/instruction.rb: fixed types.
+
+Tue Sep 22 05:04:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/{ludcmp,math}.rb: depend on
+	  bigdecimal.
+
+	* ext/bigdecimal/lib/bigdecimal/*.rb: made module functions.
+
+Tue Sep 22 04:47:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValue): support conversion from
+	  Rational.  [ruby-core:25697]
+
+Tue Sep 22 04:43:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (INSNS): depend on tools.
+
+Tue Sep 22 01:10:22 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* ossl_ocsp.c (ossl_ocspres_to_der): Bug fix in Response#to_def.
+	  Patch by Chris Chandler [ruby-core:18411]
+
+Tue Sep 22 01:10:02 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* ossl_config.c (ossl_config_add_value_m, ossl_config_set_section):
+	  Check if frozen (or untrusted for $SAFE >= 4) [ruby-core:18377]
+
+Mon Sep 21 17:12:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_binding): allow proc from method.  [ruby-core:25589]
+
+	* vm.c (collect_local_variables_in_env): block iseq can be NULL.
+
+Mon Sep 21 10:50:37 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (rb_time_succ): make Time#succ obsolete since time is not
+	  a discrete value.
+
+	* range.c (discrete_object_p): treat time objects specially to
+	  determine discrete values, since time objects have #succ yet are
+	  discrete (for now at least).
+
+Mon Sep 21 10:13:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_new, cont_capture, fiber_t_alloc): needs already
+	  running thread.  cf. [ruby-core:25681]
+
+Mon Sep 21 00:07:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (sin, cos, atan, exp, log):
+	  improved precision and performance.  based on a patch from Makoto
+	  Yamashita in [ruby-core:25600] and [ruby-core:25602].
+
+Sun Sep 20 11:11:34 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* struct.c (rb_struct_equal, rb_struct_eql): Handle comparison of
+	  recursive structures [ruby-core:24759]
+
+	* range.c (range_eq, range_eql):  ditto for ranges
+
+Sat Sep 19 17:46:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (ENABLE_VM_OBJSPACE): socklist needs st_table in
+	  rb_w32_sysinit(), before object space initialization.
+
+Sat Sep 19 17:32:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (GlobPathValue), file.c (rb_get_path_check): path names
+	  must be ASCII compatible.
+
+Sat Sep 19 00:02:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_type): forward declaration to suppress a
+	  warning.  a patch from Naohisa Goto at [ruby-dev:39350]
+
+Fri Sep 18 23:59:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (GlobPathValue): adjust return types.  based on a patch
+	  from Naohisa Goto at [ruby-dev:39350].
+
+Fri Sep 18 23:51:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): entry regexp object before its encoding
+	  name.  [ruby-core:25625]
+
+Fri Sep 18 16:29:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (eval.o): needs vm.h.
+
+	* eval.c (ruby_cleanup): destruct current VM before exit.
+
+	* gc.c (rb_objspace_free): free object space.
+
+	* vm.c (ruby_vm_destruct): destruct and free VM struct.
+
+Fri Sep 18 16:15:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each), parse.y (stmt, arg): arg_concat()
+	  on op_asgn was inversed.  [ruby-core:25629] [Bug #2050]
+
+Fri Sep 18 16:06:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (GlobPathValue): glob allows null bytes as separators.
+
+Fri Sep 18 10:11:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/re.rdoc: use rdoc mode.
+
+	* misc/rdoc-mode.el: added.
+
+Fri Sep 18 09:02:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
+	  RUBY_VERSION.
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables
+	  are delimited by a semicolon.  supported Vim style.
+
+Fri Sep 18 07:06:41 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]
+
+Fri Sep 18 06:47:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (push_glob): str should be a string always.
+
+	* dir.c (rb_push_glob, dir_globs): use #to_path to convert non-
+	  string values.  cf. [ruby-dev:39345]
+
+Fri Sep 18 06:36:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
+	  [ruby-dev:39345]
+
+	* lib/mkmf.rb (create_header): open in binmode.
+
+Thu Sep 17 18:34:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (vm_xrealloc): free as like standard free if size is zero.
+
+Thu Sep 17 15:41:02 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h: use rb_node_newnode() directly.
+
+Thu Sep 17 15:01:32 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c: removed.
+
+	* README.EXT: ditto.
+
+	* README.EXT.ja: ditto.
+
+Thu Sep 17 13:50:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_s_debug_set): set level, not only boolean.
+
+Thu Sep 17 13:12:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc
+	  files.
+
+	* doc/re.rdoc: renamed from re.rb.
+
+Thu Sep 17 09:37:28 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* doc/re.rb: New document for Ruby's fork of Oniguruma.
+	  written by Run Paint Run Run [ruby-core:25420]
+
+	* re.c: import document in doc/re.rb.
+
+	* .document: add doc/re.rb.
+
+Thu Sep 17 06:03:40 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (Matrix#rank): Two bug fixes. One made
+	  Matrix[[0,0],[0,0],[1,0]].rank raise a NoMethodError while the other
+	  one had Matrix[[0,1],[0,0],[1,0]].rank raise a TypeError.
+
+Thu Sep 17 06:02:04 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Optimizations
+
+Thu Sep 17 00:36:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_mdump): error message refined.
+
+Wed Sep 16 19:27:43 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_thread.rb (TestThread#test_recursive): remove
+	  implementation dependent test.
+
+Wed Sep 16 17:42:52 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): install-capi needs docdir.  And,
+	  mandir, infodir and ridir are also depend on datadir like docdir.
+
+Wed Sep 16 17:20:49 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (Matrix#/): Fix obvious bug
+
+Wed Sep 16 16:59:34 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (DOCTARGETS): rdoc is default.
+
+Wed Sep 16 16:27:40 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: typo.
+
+Wed Sep 16 16:20:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CAPITARGET): enable iff doxygen is available.
+
+	* configure.in (INSTALLDOC): enable if rdoc or doxygen are enabled.
+
+	* common.mk (docs): target to make documents.
+
+	* Makefile.in, win32/Makefile.sub (install-{all,nodoc}): trigger
+	  by $(INSTALLDOC) from install.
+
+Wed Sep 16 13:39:10 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (determinant): Bug fix where determinant failed on
+	  some matrices [ruby-core:23597]
+
+Wed Sep 16 13:30:20 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb:  trivial optimizations
+
+Wed Sep 16 13:15:17 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* template/Doxyfile.tmpl: RbConfig::CONFIG['DOT'] is sometimes nil.
+
+Wed Sep 16 10:14:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja (rb_protect, rb_jump_tag): added.
+
+Wed Sep 16 10:12:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (main): makes also encs.
+
+Wed Sep 16 06:30:07 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* thread.c (rb_exec_recursive_outer, rb_exec_recursive): Added method
+	  to short-circuit to the outermost level in case of recursion
+
+	* test/ruby/test_thread.rb (test_recursive_outer): Test for above
+
+	* hash.c (rb_hash_hash): Return a sensible hash for in case of
+	  recursion [ruby-core:24648]
+
+	* range.c (rb_range_hash): ditto
+
+	* struct.c (rb_struct_hash): ditto
+
+	* array.c (rb_array_hash): ditto
+
+	* test/ruby/test_array.rb (test_hash2): test for above
+
+Wed Sep 16 06:17:33 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* vm_eval.c (rb_catch_obj, rb_catch, rb_f_catch): No longer use the
+	  obsolete function rb_iterate.
+
+Tue Sep 15 21:48:12 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (--enable-frame-address): removed.
+
+Tue Sep 15 15:21:01 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{configure.bat,Makefile.sub} (RDOCTARGET): the meaning of this
+	  macro was changed at r24923.
+
+Tue Sep 15 15:16:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (install-rdoc), configure.in (RDOCTARGET): removed
+	  circular dependency.  [ruby-dev:39339]
+
+Tue Sep 15 15:09:13 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/configure.bat: need a space before a tab to output the tab by
+	  echo.
+
+Tue Sep 15 14:24:52 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_split_m): use rb_isspace when the
+	  string may be ASCII-incompatible.
+
+	* string.c (rb_str_lstrip_bang): ditto.
+
+	* string.c (rb_str_rstrip_bang): ditto.
+
+Tue Sep 15 12:12:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_USE_BUILTIN_FRAME_ADDRESS): check after real
+	  target CPU is set.
+
+	* configure.in (RUBY_UNIVERSAL_ARCH): check real target CPU after
+	  AC_PROG_CC.
+
+Tue Sep 15 06:42:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (install-all): target to install all.
+
+	* tool/rbinstall.rb (parse_args): accept all install targets.
+
+	* tool/rbinstall.rb (parse_args): show help message and exit if
+	  rbconfig could not load.
+
+Tue Sep 15 04:25:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RDOCTARGET): use install-all.  [ruby-dev:39334]
+
+Tue Sep 15 03:00:35 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_lstrip_bang): use ascii_isspace().  [ruby-dev:39322]
+
+	* string.c (rb_str_rstrip_bang): ditto.
+
+	* string.c (rb_str_split_m): ditto.
+
+Mon Sep 14 16:39:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c, parse.y: fixed types.
+
+	* node.h (nd_line): limit to int.
+
+Mon Sep 14 11:23:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, common.mk, */configure.bat (rdoc): make before
+	  install if rdoc is enabled.  [ruby-dev:39325]
+
+Mon Sep 14 10:56:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (check-ruby): run all test of ruby itself.
+
+Mon Sep 14 10:44:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_TYPE_P): should not use BUILTIN_TYPE for
+	  special constants.
+
+Mon Sep 14 10:08:19 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): use rb_enc_mbc_to_codepoint
+	  because we already knew char is found and got length.
+
+Mon Sep 14 09:59:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
+	  (LONG2NUM, ULONG2NUM, NUM2CHR): get rid of backward references of
+	  macros.  the code couldn't compile by VC.
+
+Mon Sep 14 08:33:11 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/net/http.rb (each_*): return enumerator if no block present.
+	  Patch by Arthur Schreiber [ruby-core:18310]
+
+Mon Sep 14 06:42:21 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/cgi/cookie.rb (value): Keep CGI::Cookie#value in sync with the
+	  cookie itself. Based on a patch by Arthur Schreiber [ruby-core:17634]
+
+Mon Sep 14 05:21:12 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/net/http.rb (fetch): Handle properly default values; a patch by
+	  Arthur Schreiber [ruby-core:18308]
+
+Mon Sep 14 04:07:09 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/set.rb (==): Optimization; patch by Arthur Schreiber [ruby-core:17203]
+
+Mon Sep 14 03:30:23 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/pre-build: added rule to generate id.h for Symbian build.
+
+	* symbian/configure.bat: fixed harmless error message.
+
+
+Sun Sep 13 22:18:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_mod_remove_const): do not change VM state when an
+	  exception will occur.
+
+Sun Sep 13 21:25:01 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (oletypelib_get_libattr): some refactoring
+	  by adding oletypelib_get_libattr.
+
+Sun Sep 13 20:55:19 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (oletypelib_get_typelib): some refactoring
+	  by adding oletypelib_get_typelib.
+
+Sun Sep 13 20:18:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_sflag, proc_options, load_file_internal): fixed
+	  types.
+
+Sun Sep 13 19:39:59 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: some refactoring.
+
+Sun Sep 13 19:38:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): no need to define DATA when error.
+
+Sun Sep 13 18:48:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (XLDFLAGS): link startup code with ObjC support.
+
+Sun Sep 13 13:38:00 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* thread.c (recursive_*): refactored the access to the inspect
+	  table used by rb_exec_recursive_*. The functions recursive_push,
+	  pop and check now assume a valid hash table as their first
+	  argument. Added documentation.
+
+Sun Sep 13 12:07:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (SYM2ID): needs parens.
+
+	* include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
+	  (LONG2NUM, ULONG2NUM, NUM2CHR, rb_type_p, rb_special_const_p):
+	  GCC specific optimization.
+
+Sun Sep 13 11:06:12 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI::Meta#content_type_parse): strip quotes.
+
+Sun Sep 13 09:38:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/prime.rb (EratosthenesGenerator#initialize): call super.
+	  (TrialDivisionGenerator, Generator23): ditto.  [ruby-core:25539]
+
+Sun Sep 13 09:34:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_add_method_def): no warning for inherited
+	  method.
+
+Sun Sep 13 08:30:30 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: fix WIN32OLE_TYPELIB.new when the 1st
+	  argument is the non-registered file.
+
+Sun Sep 13 02:08:43 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: change members of iseq_inline_cache_entry.
+	  make cache value members to one union member "ic_value".
+
+	* insns.def: ditto.
+
+	* vm_insnhelper.c: ditto.
+
+Sun Sep 13 01:15:49 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (URI::FTP#buffer_open): fix the %2F handling.
+
+Sun Sep 13 00:46:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (CALL_METHOD_HOOK): refined with macro.
+
+	* vm_method.c (rb_remove_method_id): no definition body is
+	  undefined.
+
+	* vm_method.c (rb_add_method, rb_add_method_me): call method added
+	  hook after definition.  [ruby-core:25536]
+
+	* vm_method.c (rb_alias): hooks are called from rb_add_method_def.
+
+Sat Sep 12 22:47:24 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (URI::FTP#buffer_open): use the port specified in
+	  the URI.
+
+Sat Sep 12 17:31:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (GCC): subst for GCC depending extension libraries.
+
+Sat Sep 12 07:52:59 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): initialize result
+	  variant value.
+
+Fri Sep 11 21:52:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* NEWS: update for 1.9.2.  based on a patch from Run Paint Run Run
+	  in [ruby-core:25534].
+
+Fri Sep 11 21:38:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check for real target cpu on darwin 10.
+
+Fri Sep 11 18:51:57 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/fileutils: use require_relative to require fileasserts.
+
+Fri Sep 11 14:22:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (debugflags): use gdb by default on linux and
+	  darwin.
+
+	* configure.in (XLDFLAGS): keep ARCHFILE macro on AIX.
+
+	* configure.in (RUBY_REPLACE_TYPE): define typename to default
+	  type if the latter is found.
+
+Fri Sep 11 13:57:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (fstat): override if large file support is
+	  enabled.
+
+Fri Sep 11 11:33:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config.{guess,sub}: updated to automake-1.11.
+
+Fri Sep 11 10:38:33 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s
+	  to k.  A patch from swdyh <youhei@gmail.com>
+	  http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39
+
+Fri Sep 11 09:45:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (aix_loaderror): get rid of using uninitialized value in the
+	  case loadquery fails.  fixed wrong index variable usage.  see
+	  [ruby-core:25479].
+
+Fri Sep 11 07:52:43 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* unicode.c (onigenc_unicode_property_name_to_ctype):
+	  ignore case of properties.
+
+	* tool/enc-unicode.rb: downcase properties list.
+
+	* enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  follow above.
+
+Fri Sep 11 05:00:19 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h (rb_data_type_t): Add comments.
+	  And add a member variable "data", a multi-purpose storage
+	  area for rb_data_type.
+
+Fri Sep 11 02:14:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/dl: use require_relative to require test_base.rb.
+
+Fri Sep 11 02:06:44 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (rb_char_to_option_kcode): ASCII-8BIT should
+	  also delay.
+
+	* re.c (parser_regx_options): return rb_ascii8bit_encindex on
+	  ASCII-8BIT. [ruby-dev:39300]
+
+Fri Sep 11 01:14:00 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/net/http.rb (fetch): rdoc fix, patch by Arthur Schreiber.
+	  [ruby-core:18309].
+
+Thu Sep 10 23:00:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): fix for parallel execution.
+	  [ruby-core:25509]
+
+Thu Sep 10 21:22:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/dl/test_cptr.rb (test_free=): test SEGV at first.
+	  [ruby-dev:39269]
+
+Thu Sep 10 21:20:59 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_normal_exit): Don't use
+	  AssertionMessage.
+
+Thu Sep 10 15:59:05 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (UNKNOWN_ESC_WARN): added.
+
+	* regparse.c (conv_backslash_value): Warn unknown
+	  escaped chars in regexp. [ruby-dev:39104]
+
+Wed Sep  9 22:02:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#copy_file): open the source
+	  file first to ensure it can be copied.  [ruby-core:25498]
+
+Wed Sep  9 21:20:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_data_type): typed.
+
+	* ext/dl/cfunc.c (dlcfunc_data_type): typed.
+
+	* ext/dl/cptr.c (dlptr_data_type): ditto.
+
+	* ext/dl/handle.c (dlhandle_data_type): ditto.
+
+Wed Sep  9 17:17:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (parser_regx_options): only one kcode should effect
+	  options [ruby-core:25411]
+
+Wed Sep  9 15:46:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_feature_provided): fixed for autoloading extension
+	  library without suffix.
+
+Wed Sep  9 15:24:32 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* include/ruby/st.h : revert previous commit.
+
+	* ext/objspace/objspace.c : remove st_memsize declare.
+
+Wed Sep  9 14:07:19 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* include/ruby/st.h : fix duplicate st_memsize declare.
+
+Wed Sep  9 13:33:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_autoload): initialize typed data.
+
+Wed Sep  9 13:10:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_free_table): constified.
+
+Wed Sep  9 13:09:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_data_type): typed.
+
+	* enumerator.c (enumerator_data_type): typed.
+	  (yielder_data_type, generator_data_type): ditto.
+
+	* error.c (name_err_mesg_data_type): typed.
+
+	* file.c (stat_data_type): typed.
+
+	* thread.c (thgroup_data_type, mutex_data_type, barrier_data_type):
+	  typed.
+
+	* time.c (time_data_type): typed.
+
+	* transcode.c (econv_data_type): typed.
+
+	* variable.c (autoload_data_type): typed.
+
+Wed Sep  9 11:11:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_data_type_struct): constified dsize.
+
+Wed Sep  9 11:07:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_memsize): fixed wrong expression on IA64.
+
+Wed Sep  9 10:51:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_restore_1, rb_cont_call): should be Fiber.
+
+Wed Sep  9 00:27:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_data_type, fiber_data_type): typed.
+
+Tue Sep  8 22:37:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb, lib/tmpdir.rb (Tmpname): extracted new module.
+	  [ruby-dev:39197]
+
+Tue Sep  8 22:18:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_init_*table_with_size): use st_index_t.
+
+	* include/ruby/st.h (st_hash_func): use st_index_t.
+
+Tue Sep  8 21:48:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): mark callers iseqs.  [ruby-core:25474]
+	  [Bug #2062]
+
+Tue Sep  8 11:53:58 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_mark): no need to mark inline cache entries.
+
+	* insns.def (onceinlinecache, setinlinecache): save a value
+	  to mark cached value.
+
+Tue Sep  8 08:32:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/dl/test_{cfunc,ptr}.rb: added tests from Aaron Patterson.
+	  see [ruby-dev:39249].
+
+Mon Sep  7 17:22:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_tell): adjustment for ungotten data.
+
+Mon Sep  7 17:13:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_encname_bom_p): removed magic number.
+
+Mon Sep  7 12:26:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/inspector.rb (IRB::INSPECTORS.def_inspector): support
+	  object without #inspect defined.  a patch from Daniel
+	  Bovensiepen.  [ruby-core:25200]
+
+Mon Sep  7 05:38:34 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (opt_*): add IC operands.
+
+	* vm_insnhelper.h (CALL_SIMPLE_METHOD): add a version which
+	  use an inline cache.  USE_IC_FOR_SPECIALIZED_METHOD macro
+	  switches the behaviour.  This change also removes
+	  CALL_SIMPLE_METHOD_IC() macro.
+
+	* tool/instruction.rb: fix elimination process to ignore
+	  variable "ic".
+
+Mon Sep  7 05:21:09 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* Makefile.in, common.mk: move a id.h generation rule.
+
+Mon Sep  7 05:07:59 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: remove RUBY_VERSION output.
+
+Mon Sep  7 05:06:16 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c: rename macro name ENABLE_IC_FOR_IVAR
+	  to USE_IC_FOR_IVAR.
+
+Mon Sep  7 03:21:40 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.escape): obsoleted.
+
+	* lib/uri/common.rb (URI.unescape): ditto.
+
+Sun Sep  6 18:13:54 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.h (CALL_SIMPLE_METHOD_IC): make a macro
+	  invoke simple method with inline cache entry.
+
+	* insns.def (opt_length, opt_size): fix to use inline method cache.
+
+Sun Sep  6 17:47:21 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* template/id.h.tmpl: fix this.
+
+	* id.h: removed.  Because this file is generated automatically.
+
+Sun Sep  6 17:31:28 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_specialized_instruction), insns.def (opt_size):
+	  optimize #size methods (by specialized instruction).
+
+	* id.c, id.h, vm.c, vm_insnhelper.h: ditto.
+
+Sun Sep  6 16:13:06 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (setinstancevariable), vm_insnhelper.c (vm_setivar):
+	  fix to use inline cache (trivial optimization).
+
+Sun Sep  6 10:34:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c: fixed rdoc, a patch from Nobuhiro IMAI at [ruby-core:25433].
+
+Sun Sep  6 05:19:09 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c: Add rdoc for ARGF.
+	  contributed by Run Paint Run Run. [ruby-core:23854]
+
+Sat Sep  5 15:21:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): op_asgn to aref should return rhs.
+	  [ruby-core:25387]
+
+Sat Sep  5 10:38:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): &&= and ||= should return rhs.
+	  [ruby-dev:39163] (#1996), [ruby-core:25143]
+
+Sat Sep  5 08:51:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (update_char_offset): position should be long.
+
+	* re.c (match_hash, match_equal): new methods.  [ruby-core:24748]
+
+	* re.c (reg_match_pos, rb_reg_eqq, rb_reg_s_quote): get rid of use
+	  VALUE as int.
+
+Fri Sep  4 20:40:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (round): added declaration.  [ruby-dev:39222]
+
+Fri Sep  4 06:15:39 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (Init_Dir): alias Dir#path to Dir#to_path.  [ruby-core:25326]
+
+Fri Sep  4 04:49:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_rand): fixed rdoc.  [ruby-core:25332]
+
+Fri Sep  4 04:46:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/webrick/httpservlet/abstract.rb (do_OPTIONS): method names
+	  are symbols now.  [ruby-core:24580]
+
+Thu Sep  3 17:56:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (literal_concat_gen): concat body from dstr instead of
+	  nd_next.  [ruby-core:25284]
+
+Wed Sep  2 16:49:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (math_gamma): get rid of direct comparison between too
+	  big double and integer, with gcc on x86_64.  [ruby-core:25257]
+
+Wed Sep  2 13:47:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (domain_check): simplified.
+
+Wed Sep  2 11:32:24 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_free): fix to free method table (fix memory leak).
+
+Wed Sep  2 07:42:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/instruction.rb (RubyVM::InstructionsLoader#make_stackcaching_insns):
+	  simplified.
+
+Wed Sep  2 02:32:46 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/common.rb (NaN): Change definition
+	  of NaN to 0.0/0 for 1.8/1.9 compatibility.
+
+Wed Sep  2 01:16:32 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Update to JSON 1.1.9.
+
+Tue Sep  1 19:56:28 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (eval_string_with_cref): fix to check local_table_size.
+	  [ruby-dev:39205] [Bug #2024]
+
+Mon Aug 31 16:20:41 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* class.c (make_singleton_class): variable name changed.
+	  removed an unnecessary conditional.
+
+Mon Aug 31 14:17:09 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* class.c: refactored singleton class related matters.
+	  Handles eigenclasses and plain classes transparently.
+
+	  (make_metaclass): renamed from make_metametaclass.
+	  (METACLASS_OF): new utility macro
+	  (META_CLASS_OF_CLASS_CLASS): ditto.
+	  (ENSURE_EIGENCLASS): ditto.
+	  (make_singleton_class): extracted from rb_singleton_class.
+	  (boot_defclass): moved from object.c
+	  (Init_class_hierarchy): extracted from Init_Object.
+	  (rb_make_metaclass): refactored.
+	  (singleton_class_of): extracted from rb_singleton_class.
+	  (rb_singleton_class): refactored.
+	  (rb_define_singleton_method): it needs a metaclass only
+	  but not its metametaclass.
+
+	* object.c: booting class hierarchy was moved to class.c
+	  for keeping dependency between compilation units least.
+	  (Init_Object): extracting the booting into
+	  Init_class_hierarchy.
+	  (boot_defclass): moved to class.c.
+
+Sun Aug 30 23:44:09 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): use mktime for the first guess.
+
+Sun Aug 30 16:38:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_enc_symname2_p): not depend on nul terminator.
+
+Sun Aug 30 14:11:45 2009  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: dependencies updated.
+
+Sun Aug 30 13:00:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (add): shortcut implemented for fixnums.
+	  (sub): ditto.
+	  (mul): ditto.
+
+Sun Aug 30 10:24:43 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (eq): apply RTEST.
+	  (ne): ditto.
+	  (add): avoid method dispatch for bignums.
+	  (sub): ditto.
+	  (mul): ditto.
+	  (mod): ditto.
+
+Sun Aug 30 09:45:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigmul1_single): new function specialized respect to
+	  multiply two single digit bignums.
+	  (bigmul0): use bigmul1_single.
+
+Sun Aug 30 03:59:43 2009  Tanaka Akira  <akr@fsij.org>
+
+	* timev.h (TIME_SCALE): defined as 1000000000.
+	  (struct vtm): subsec is replaced by subsecx.
+	  subsec * TIME_SCALE == subsecx.
+
+	* time.c: avoid rational in most cases.
+	  (struct time_object): timev is replaced by timexv.
+	  timev * TIME_SCALE == timexv.
+
+Sun Aug 30 03:17:25 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (init_leap_second_info): use TIMET_MAX.
+
+Sun Aug 30 01:15:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr;
+	  set and convert its encoding. [ruby-dev:38304]
+
+Sat Aug 29 20:40:02 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* vm_eval.c (rb_call0): gets rid of checking method cache twice.
+
+	* method.h (rb_get_method_entry): added a prototype of the function.
+	  (rb_method_entry_without_cache): more friendly name.
+
+Sat Aug 29 12:16:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tmpdir.rb (Dir.mktmpdir): rolled back r24699.  [ruby-dev:39193]
+
+Sat Aug 29 03:27:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#make_tmpname): removed thread race
+	  condition.
+
+	* lib/tmpdir.rb (Dir.mktmpdir): ditto.
+
+Fri Aug 28 20:29:34 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb (Tempfile#callback): Debug information should be
+	  output to stderr, not stdout; pointed out by akira yamada.
+	  cf. [ruby-dev:39072]
+
+Fri Aug 28 20:34:24 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: use SafeStringValue instead of
+	  Check_SafeStr.
+
+Fri Aug 28 13:30:43 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (do_select): rollback r24680. void struct initializer is
+	  invalid.
+
+Fri Aug 28 11:45:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* method.h (rb_method_definition_t): split from rb_method_entry_
+	  to deal aliases.  [ruby-dev:39165]
+
+	* proc.c (struct METHOD): contains rb_method_entry_t copy.
+
+Fri Aug 28 10:21:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_mark): skip outdated cache entries.
+
+	* vm_core.h ({GET,INC}_VM_STATE_VERSION): moved from
+	  vm_insnhelper.h.
+
+Fri Aug 28 07:25:25 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (next_i): typo fixed (reached at end -> reached an
+	  end).  pointed out by James Edward Gray II at LoneStar RubyConf.
+
+Thu Aug 27 18:31:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_remove_method_id): exported.
+
+	* numeric.c (num_sadded): fix for non-ascii method name.
+
+Thu Aug 27 14:32:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_preprocess_dregexp): set encoding as ASCII-8BIT
+	  when /n is specified and the embedded string is escaped text.
+
+Thu Aug 27 13:51:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_rand): random integer can be a fixnum for
+	  bignum range.  [ruby-dev:39173]
+
+Thu Aug 27 08:16:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/strscan/strscan.c (strscan_set_string): set string should not be
+	  duped or frozen, because freezing it causes #concat method failure,
+	  and unnecessary to dup without freezing.  a patch from Aaron
+	  Patterson at [ruby-core:25145].
+
+Thu Aug 27 02:06:11 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (enc/unicode/name2ctype.kwd):
+	  remove rules to generate name2ctype.kwd from
+	  UnicodeData.txt and Scripts.txt.
+	  if you want to generate, use tool/enc-unicode.rb.
+
+Thu Aug 27 02:00:09 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* unicode.c (PROPERTY_NAME_MAX_SIZE): use MAX_WORD_LENGTH.
+
+Wed Aug 26 23:59:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_rand): refined error message.
+
+	* random.c (random_rand): fixed for edge cases of ranges.
+	  [ruby-dev:39166]
+
+Wed Aug 26 21:49:23 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/tempfile.rb: add documents from Hongli Lai's fork.
+	  cf [ruby-core:25131].
+
+Wed Aug 26 19:51:13 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/mkconfig.rb (program_transform_name): fix for multiple trans
+	  rules for autoconf 2.61 or earlier.
+
+	* tool/rbinstall.rb (program_transform_name): ditto.
+
+Wed Aug 26 19:20:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_rand): unified random_int and random_float.
+	  [ruby-dev:39158].  and fixes [ruby-core:24655], [ruby-core:24677],
+	  [ruby-core:24679].
+
+Wed Aug 26 18:59:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/test_tempfile.rb: merged from Hongli Lai's fork.
+	  cf [ruby-core:25131].
+
+Wed Aug 26 18:49:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#close!): should not undefine finalizer
+	  by just unlink.
+
+Wed Aug 26 17:00:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61
+	  or earlier.
+
+Wed Aug 26 14:34:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#close!, Tempfile#path): added side
+	  notes from Hongli Lai's fork.
+
+	* lib/tempfile.rb (Tempfile#unlink, Tempfile.callback): do nothing
+	  any more once unlinked.
+
+Wed Aug 26 13:48:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#unlink): reverted r23494, since the
+	  usage in RubyInline is considered wrong.
+
+Wed Aug 26 12:36:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (collect_local_variables_in_env): skips internal variables.
+	  [ruby-core:25125]
+
+Tue Aug 25 23:51:07 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb: added for generate name2ctype.kwd.
+	  contributed by Run Paint Run Run [ruby-core:24775]
+
+	* enc/unicode.c (CodeRanges): move definitions to name2ctype.h.
+
+	* enc/unicode/name2ctype.h.blt, enc/unicode/name2ctype.kwd,
+	  enc/unicode/name2ctype.src: updated to v5.1.
+
+	* enc/unicode/UnicodeData.txt, enc/unicode/Scripts.txt: added v5.1.
+
+	* Makefile.in: add rule to generate name2ctype.kwd from
+	  UnicodeData.txt and Scripts.txt.
+
+Tue Aug 25 22:31:51 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (MKDIR_P): Set 'mkdir -p' to MKDIR_P
+	  when AC_PROG_MKDIR_P doesn't set MKDIR_P.
+
+Tue Aug 25 17:38:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_clone, bigmul1_normal, bigdivrem): trivial
+	  optimization.
+
+	* bignum.c (big2dbl): truncates zero digits to get rid of possible
+	  underflow.
+
+Tue Aug 25 12:22:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (enc/unicode/name2ctype.h): explicitly ignores the
+	  result of diff and turns -e option off, because *BSD make passes
+	  it by default.
+
+Tue Aug 25 02:16:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): use linker_flag and changed undefined
+	  and multiply_defined behaviors. cf [ruby-core:25086].
+
+Mon Aug 24 21:31:37 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb, test/rss/test_maker_2.0.rb: fix a bug
+	that RSS Maker doesn't accept 'false' as guid's isPermaLink.
+	Reported by Joe Holt. Thanks!!!
+
+Mon Aug 24 18:58:56 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/missing.h (vsnprintf): rollback a part of r24179, because
+	  it's meaningless.
+
+Mon Aug 24 16:35:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_delete_safe): deals with packed entries.
+	  [ruby-core:25080]
+
+	* st.c (st_cleanup_safe): ditto.  [ruby-core:25081]
+
+Mon Aug 24 13:24:07 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (MAKEDIRS): define.
+
+	* common.mk (capi): using $(MAKEDIRS), so depends on $(PREP).
+
+Mon Aug 24 13:14:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): set cross_compiling only when
+	  universal binary.
+
+Mon Aug 24 12:55:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (enc/unicode/name2ctype.h): use md instead of
+	  $(MAKEDIRS).
+
+Sun Aug 23 15:22:45 2009  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (main): "usage" description updated.
+
+Sun Aug 23 15:12:22 2009  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (Dir.mktmpdir): updated to latest.
+	  (in_temporary_working_directory): temporary directory name changed.
+
+Sun Aug 23 00:56:13 2009  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (rb_thread_schedule): don't recur infinitely.
+	  (rb_threadptr_execute_interrupts): ditto.
+	  [ruby-dev:38060]
+
+Sat Aug 22 15:07:23 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/syck/rubyext.c (id_hash_new): new function to create a hash
+	  which key is compared by object id.
+	  (syck_emitter_reset): use id_hash_new for bonus->data.
+
+	* lib/yaml.rb (YAML.quick_emit): give the object itself to emitter.
+	  don't use object_id and hash.
+
+Sat Aug 22 13:05:22 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in: use CP and MV macros.
+
+Sat Aug 22 01:29:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
+	  [ruby-dev:39153]
+
+Sat Aug 22 00:48:08 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enumerator.c (ary2sv): add dup argument.
+	  (enumerator_next): call ary2sv with dup=0.
+	  (enumerator_peek): call ary2sv with dup=1 to return duplicated array.
+	  (enumerator_peek_values_m): new function to return duplicated array.
+	  (Init_Enumerator): use enumerator_peek_values_m as
+	  Enumerator#peek_value.
+
+Sat Aug 22 00:03:19 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_check_deadlock): decrease number of sleepers before
+	  deadlock detection because the deadlock exception makes main thread
+	  run.  [ruby-dev:39142]
+
+Fri Aug 21 22:34:58 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enumerator.c (get_next_values): extracted from
+	  enumerator_next_values.
+	  (enumerator_next_values): use get_next_values.
+	  (enumerator_peek_values): ditto.
+
+Fri Aug 21 17:01:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/unicode/name2ctype.h: split from enc/unicode.c and made a
+	  perfect hash.
+
+Fri Aug 21 15:13:08 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/io.h, io.c (FMODE_SETENC_BY_BOM):
+	  renamed from FMODE_STRIP_BOM.
+
+Thu Aug 20 01:24:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_fmode_modestr): change modestr syntax for BOM
+	  to "BOM|UTF-*". [ruby-dev:39106]
+
+	* io.c (parse_mode_enc): ditto.
+
+Fri Aug 21 15:01:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): use rb_prep_terminal
+	  only on Windows.
+
+Fri Aug 21 07:25:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/gemdirs.rb: split from lib/rdoc/ri/paths.rb to ge
+	  rid of loading rubygems and searching all gems always.
+
+Fri Aug 21 07:14:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_PROGRAM_VERSION, RUBY_RELEASE_DATE): extracts
+	  from version.h for cross-compiling.
+
+	* template/fake.rb.in (RUBY_VERSION, RUBY_DESCRIPTION): use above.
+
+Fri Aug 21 00:08:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): Gem::Enable has been obsolete.
+
+Thu Aug 20 23:56:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_sysopen): moved sysopen_struct from rb_sysopen_internal.
+
+Thu Aug 20 23:39:51 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (reduce_nodes_gen): preserve NODE_FL_NEWLINE flag during
+	  node reducing.  [ruby-core:24463]
+
+Thu Aug 20 14:39:47 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_get): add rl_prep_terminal(1).
+	  incited by jitte [ruby-list:43546]
+
+Thu Aug 20 12:09:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ivar2_hash_type): disabled for now.
+
+Thu Aug 20 08:39:50 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_thread_terminate_all): do not ignore interrupt when
+	  reaping threads on termination.  [ruby-dev:39107]
+
+Thu Aug 20 02:32:08 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enumerator.c (next_init): don't clear feedvalue.
+
+Thu Aug 20 01:28:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enumerator.c: implement Enumerator#{next_values,peek_values,feed}
+	  and StopIteration#result.  [ruby-dev:39109]
+	  (struct enumerator): replace no_next by stop_exc.
+	  new field feedvalue.
+	  (enumerator_mark): mark feedvalue and stop_exc.
+	  (enumerator_init): initialize feedvalue and stop_exc.
+	  (enumerator_init_copy): initialize feedvalue.
+	  (next_ii): send yield arguments as an array.  return feedvalue.
+	  (next_i): generate StopIteration exception here.  set result.
+	  (next_init): initialize feedvalue.
+	  (enumerator_next_values): new method Enumerator#next_values.
+	  (ary2sv): new function.
+	  (enumerator_peek_values): new method Enumerator#peek_values.
+	  (enumerator_feed): new method Enumerator#feed.
+	  (yielder_yield): return the yield value.
+	  (generator_each): return the iterator value.
+	  (stop_result): new method StopIteration#result.
+
+Thu Aug 20 01:06:48 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (DEFINE_STRUCT_DIRENT): use union to allocate sufficient
+	  memory space for Solaris.  a patch from Naohisa GOTO
+	  <ngoto at gen-info.osaka-u.ac.jp> in [ruby-dev:39132].
+	  [ruby-dev:39062]
+
+	* configure.in (SIZEOF_STRUCT_DIRENT_TOO_SMALL): Solaris dirent
+	  check.
+
+Wed Aug 19 11:32:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/unicode.c (CodeRanges): initialized statically.
+
+Wed Aug 19 02:54:01 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_settracefunc.rb (test_return, test_return2): add two
+	  tests for [ruby-dev:38701] and [ruby-core:24463].
+
+Wed Aug 19 01:08:34 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (NODE_RETURN): fire return event at explicit return.
+	  [ruby-dev:38701]
+
+Tue Aug 18 21:00:26 2009  Tanaka Akira  <akr@fsij.org>
+
+	* enumerator.c (enumerator_peek): new method Enumerator#peek.
+	  (enumerator_next): don't rewind at end.
+	  [ruby-dev:38932]
+
+Tue Aug 18 13:46:14 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* touch test/rdoc/empty.dat to run test_rdoc_parser.rb
+
+Tue Aug 18 11:37:24 2009  wanabe  <s.wanabe@gmail.com>
+
+	* vm_insnhelper.c (vm_call_cfunc): ensure hook c-return.
+	  [Bug #1588]
+
+	* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_raise):
+	  follow above.
+
+Tue Aug 18 01:57:00 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): treat symbols specially so that iterating
+	  over symbols should work like strings.  [ruby-core:24780]
+
+	* range.c (range_each): ditto.
+
+Tue Aug 18 01:21:31 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_each): should honor to_str conversion.
+
+Mon Aug 17 23:45:40 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/delta.rb: removed require 'date'.  added to_c.
+
+Mon Aug 17 14:35:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lex_get_str, lex_io_gets, rb_parser_compile_string):
+	  must be ascii compatible.
+
+Mon Aug 17 10:37:41 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (add_code_range_to_buf0): added with checkdup argument.
+
+	* regparse.c (add_code_range_to_buf): use above.
+
+	* regparse.c (add_code_range0): added with checkdup argument.
+
+	* regparse.c (add_code_range): use above.
+
+	* regparse.c (i_apply_case_fold): don't warn if the duplicate is
+	  caused by case folding.
+
+Mon Aug 17 08:31:56 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/delta.rb: merged from date4.  [experimental]
+
+	* lib/date/delta/parser.*: ditto.
+
+	* lib/date.rb: followed the above changes.
+
+Mon Aug 17 08:19:03 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (strptime): removed \v; since \s includes \v.
+
+Mon Aug 17 08:14:26 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_rationalize) added.  [experimental]
+
+	* rational.c ({nurat,nilclass,integer,float}_rationalize) ditto.
+
+Mon Aug 17 08:11:53 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb: use num#i.
+
+Mon Aug 17 07:59:00 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c (flo_pow,fix_pow): may return complex number.
+
+	* bignum.c (rb_big_pow): ditto.
+
+Mon Aug 17 07:16:10 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_imaginary): num#i to return imaginary counterpart
+	  of the given numeric.
+
+	* complex.c (Init_Complex): undef #i for complex numbers.
+
+Mon Aug 17 00:17:33 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/complex.rb, lib/rational.rb: added warning messages.
+
+Sun Aug 16 23:58:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yylex): should dispatch scan-event even when follows
+	  just after delayed-token.  [ruby-dev:37855] [Bug #1071]
+
+Sun Aug 16 22:20:16 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: reverted.
+
+Sun Aug 16 21:31:21 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/date/format.rb: suppressed a warning.
+
+	* lib/irb/ruby-lex.rb: ditto.
+
+Sun Aug 16 15:25:26 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/csv.rb: Change magic comment to US-ASCII in order to
+	  make literals as US-ASCII.
+
+Sun Aug 16 10:45:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regparse.c (parse_char_class, parse_exp, parse_branch),
+	  (parse_subexp): fixed memory leak.  a patch from Ralf Junker
+	  <ralfjunker AT gmx.de> at [ruby-core:24921].
+
+Sun Aug 16 10:38:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace_each, vm_backtrace_push),
+	  vm_eval.c (print_backtrace), vm_dump.c (bugreport_backtrace):
+	  rb_backtrace_iter_func now takes VALUE as file and method names.
+
+Sun Aug 16 03:06:59 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (opt_eq_func): fix optimization bug.  This issue
+	  was found out and debugged with Takuto Hayashi at Security and
+	  Programming camp 2009.
+
+Sun Aug 16 01:10:00 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (add_ctype_to_cc_by_range): fix the first
+	  character bigger than sb_out was dropped.
+
+	* test/ruby/test_regexp.rb (TestRegexp#test_posix_bracket):
+	  add tests for above.
+
+Sun Aug 16 00:30:33 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/oniguruma.h
+	  (ONIGENC_CTYPE_SPECIAL_MASK): added.
+	  (ONIGENC_CTYPE_D): ditto.
+	  (ONIGENC_CTYPE_S): ditto.
+	  (ONIGENC_CTYPE_W): ditto.
+
+	* regparse.c: \d, \s and \w are now non Unicode class.
+	  [ruby-dev:39026]
+	  (fetch_token_in_cc): use ONIGENC_CTYPE_[DSW] for \d/\s/\w.
+	  (fetch_token): ditto.
+	  (add_ctype_to_cc): add routines for ONIGENC_CTYPE_[DSW].
+	  (parse_exp): ditto.
+
+	* test/ruby/test_regexp.rb (TestRegexp#test_char_class):
+	  add tests for above.
+
+Sat Aug 15 10:39:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (fname, string_dvar, sym, dsym, f_arglist): removed
+	  duplications.
+
+Fri Aug 14 20:03:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_check_safe_str): deprecated.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_add_{file,path}):
+	  replaced deprecated function.
+
+Fri Aug 14 17:59:12 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_preprocess_dregexp): change Exception class to
+	  RegexpError.
+
+	* test/ruby/test_m17n.rb (test_regexp_usascii): follow above.
+
+	* test/ruby/test_m17n.rb (test_regexp_embed): ditto.
+
+Fri Aug 14 17:17:42 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/Makefile.in (MKDIRS): revert r24525.
+
+Fri Aug 14 16:28:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/lib/digest/hmac.rb (Digest::HMAC#initialize): faster
+	  code.
+
+Fri Aug 14 14:31:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rubyhdrdir): fixed typo.  [ruby-dev:39079]
+
+Fri Aug 14 00:29:22 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* doc/ChangeLog-1.8.0: add forgotten entry contributed by
+	  TAKAHASHI Kaoru.  [ruby-dev:39065]
+
+Fri Aug 14 00:19:49 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#method_missing): __FILE__ may contain
+	  multi-byte characters.  a patch from Kenta Murata in [ruby-dev:39066].
+
+Thu Aug 13 21:01:03 2009  wanabe  <s.wanabe@gmail.com>
+
+	* vm.c (vm_exec): returning from lambda runs ensure section.
+	  [Bug #1729]
+
+Thu Aug 13 18:40:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): set cross_compiling to yes
+	  only when AC_COMPUTE_INT, and inverted the arguments.
+
+Thu Aug 13 18:22:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of
+	  _AC_COMPUTE_INT_COMPILE with cross compiling, since its arguments
+	  have been changed at autoconf 2.64.
+
+Thu Aug 13 16:31:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (opt_case_dispatch): suppressed a warning.
+
+	* vm_insnhelper.c (opt_case_dispatch_i): ditto.
+
+Thu Aug 13 16:20:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, Makefile.in (MAKEDIRS): used MKDIR_P instead of
+	  as_mkdir_p.  [ruby-dev:39063]
+
+Thu Aug 13 15:37:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): fixed
+	  infinite loop for wide encodings.  reported by Ralf Junker a
+	  [ruby-core:24892].  [ruby-core:24904]
+
+Wed Aug 12 21:07:46 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: if ipv6 is enabled, the version of Windows
+	  must be XP or later.
+	  [ruby-core:24601]
+
+Wed Aug 12 15:59:29 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (yes-test-knownbug): use RUNRUBY instead of MINIRUBY.
+
+Wed Aug 12 15:52:04 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* class.c (rb_define_module_id_under): fix the name.
+
+	* class.c (rb_define_module_under): fix for previous changes.
+
+Wed Aug 12 15:32:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_define_class_id_under, rb_define_module_id_under):
+	  new functions to define a nested class/module with non-ascii
+	  name.
+
+	* struct.c (make_struct): use name with encoding.
+
+	* struct.c (inspect_struct): ditto.  [ruby-core:24849]
+
+Wed Aug 12 Wed Aug 12 14:54:34 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h: check
+	  definition of (classes)#=== for case/when optimization.
+	  Fix Bug #1376 [ruby-core:23190].
+
+	* string.c (Init_String), bignum.c (Init_Bignum),
+	  numeric.c (Init_Numeric): define String#===, Symbol#===,
+	  Bignum#===, Fixnum#===, Float#=== as same as (classes)#==.
+
+Wed Aug 12 14:14:42 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (readdir_internal): free old temporary filename.
+	  [ruby-core:24820]
+
+Wed Aug 12 12:59:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_new_frozen): must not change encoding of frozen
+	  shared string.  [ruby-dev:39068]
+
+Wed Aug 12 11:51:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_broken_crypt): needs more checks.
+
+Wed Aug 12 07:41:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): If a string is empty and
+	  other's encoding is US-ASCII, returns the empty string's encoding.
+	  [ruby-list:46274]
+
+Wed Aug 12 07:38:12 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (is_data_encoding): fix condition.
+
+	* encoding.c (enc_capable): ditto.
+
+Tue Aug 11 23:12:31 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (complete_frags): Monday must be suitable for %W's
+	  default day.
+
+Tue Aug 11 21:42:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_divmod): fixed rdoc.  [ruby-core:24862]
+
+Mon Aug 10 21:45:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_path2class): no deprecation.
+
+Mon Aug 10 10:57:59 2009  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c: reject unused longlife gc. longlife gc target is longlife
+	  NODE by method table and vm inline cache. but, fixed it at
+	  r24085, r24128. so I rejected longlife gc.
+
+	* debug.c: ditto.
+
+	* include/ruby/intern.h: ditto.
+
+	* include/ruby/ruby.h: ditto.
+
+	* iseq.c: ditto.
+
+	* node.h: ditto.
+
+	* vm_insnhelper.c: ditto.
+
+	* vm_insnhelper.h: ditto.
+
+Mon Aug 10 06:55:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (class2path, w_unique, w_extended, w_class, w_uclass):
+	  deal with non-ascii class path.  [ruby-core:24790]
+
+	* marshal.c (r_unique, path2class, path2module, obj_alloc_by_path),
+	  (r_object0): ditto.
+
+	* variable.c (rb_path_to_class): new encoding-aware function to
+	  get a class from its name.
+
+Sun Aug  9 21:14:03 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb (search_tclConfig): last change isn't enough.
+	  fixed it.
+
+Sun Aug  9 16:36:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ruby.imp): excluded prelude.o to get rid of circular
+	  dependency.  [ruby-dev:39052]
+
+Sun Aug  9 14:49:24 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (rb_big_cmp, bigsub, big_real_len, bigmul1_normal,
+	  bigmul1_balance, big_split): remove BDIGITS() inside of the loops.
+	  same as r24444.
+
+Sat Aug  8 17:03:21 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_ascii_compatible_p): added. [ruby-core:24793]
+	  (Init_Encoding): New API Encoding#ascii_compatible?.
+
+Sun Aug  9 07:25:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/eventids2.c (token_to_eventid): added
+	  keyword_do_LAMBDA.  [ruby-dev:39049]
+
+Sun Aug  9 02:07:41 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/compile_prelude.rb: fixes a regexp pattern for require.
+	  It had matched 'require("foo"('.
+
+Sat Aug  8 11:42:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigzero_p): removing BDIGITS() inside of the
+	  loop. inspired by Masahiro Kanai's blog entry
+	  <http://d.hatena.ne.jp/CanI/20090807/1249657492>.
+
+Sat Aug  8 06:18:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_symbol r_symlink, r_symbol, r_object0): fix for
+	  non-ascii symbols.  loading such symbols can cause segfaults in
+	  older versions.  [ruby-core:24788]
+
+Fri Aug  7 03:25:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.c (error_print): removed an extra argument.
+
+Fri Aug  7 03:22:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
+
+Fri Aug  7 01:49:41 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/sha2.c: The ULL suffix is not supported by
+	  pre-C99 compilers, so resurrect the ULL() macro to regain
+	  portability. [ruby-dev:39032]
+
+Fri Aug  7 01:35:26 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/*/extconf.rb: inttypes.h and unistd.h need not be
+	  checked here. [ruby-dev:39032]
+
+Fri Aug  7 01:04:17 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb (search_tclConfig): fix logic bug.
+
+Thu Aug  6 21:18:15 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/digest/sha2/lib/sha2.rb: should require sha2.so.
+
+Thu Aug  6 21:11:40 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/digest/sha2/sha2.c (*_Final): typos.
+
+Thu Aug  6 19:46:56 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/sha2.h (BYTE_ORDER): Define BYTE_ORDER as
+	  necessary. [ruby-dev:39029]
+
+Thu Aug  6 16:36:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (valid_encoding_name_p): rejects too long encoding
+	  names.
+
+	* encoding.c (encoding_data_type): typed data.
+
+	* encoding.c (enc_capable, rb_enc_get_index): Symbol is encoding
+	  capable.
+
+	* encoding.c (rb_enc_associate_index): cannot set encoding on
+	  special constants.
+
+Thu Aug  6 15:44:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_eq): deals with optimized method
+	  properly.  [ruby-core:24789]
+
+Thu Aug  6 13:30:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/mkmf/base.rb (TestMkmf): was turned into a class, because
+	  MiniUnit doesn't complain even if a testcase has no tests.
+
+Thu Aug  6 13:00:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (check_sizeof): added optional compiler option
+	  argument.  [ruby-core:24785]
+
+	* lib/mkmf.rb (create_makefile): suppressed shadowing outer local
+	  variable warnings.
+
+Thu Aug  6 12:05:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/testcase.rb (Test::Unit): removes silly TestCase
+	  class.
+
+Thu Aug  6 01:37:20 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/sha2.[ch]: Update to 1.0 RELEASE which fixes an
+	  off-by-one bug in SHA-256 hashing.  Reduce differences from
+	  the original while at it. [Bug #1799]
+
+Thu Aug  6 00:09:56 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (IPAddr#hash): Take account of netmask; submitted
+	  by Nobuhiro IMAI in [ruby-dev:39011]
+
+Wed Aug  5 19:19:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): assumes -x flag if no "ruby" is in
+	  the shebang line.  [ruby-dev:39015]
+
+Wed Aug  5 19:11:01 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (rb_stdio_set_default_encoding): declared.
+
+Wed Aug  5 18:46:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (ruby_dummy_gdb_enums): made public.  [ruby-dev:39001]
+
+Wed Aug  5 13:49:09 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upto): generate numerical sequence when
+	  characters in both edges are all digits.  [ruby-talk:343186]
+
+Wed Aug  5 12:54:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
+	  [ruby-core:24767]
+
+Wed Aug  5 12:39:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp): reset raised flag before fatal error.
+
+Wed Aug  5 10:20:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_preprocess_dregexp): add options to arguments.
+
+	* re.c (rb_reg_new_ary): follow above.
+
+	* re.c (rb_reg_preprocess_dregexp): change error message when
+	  /.../n has a non escaped non ASCII character in non ASCII-8BIT
+	  script. [ruby-dev:38524]
+
+Wed Aug  5 03:28:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): expands paths before
+	  requiring.  [ruby-dev:39012]
+
+Wed Aug  5 01:38:27 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/pp.rb (guard_inspect_key): untrust internal hash to prevent
+	  unexpected SecurityError.
+
+	* test/ruby/test_object.rb: add a test for [ruby-dev:38982].
+
+Wed Aug  5 00:33:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser/c.rb: fixed a small error in the documentation.
+	  [ruby-core:24744]
+
+Tue Aug  4 22:10:34 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (has_redirection): need to execute shell if commandline
+	  includes newline.  cf. [ruby-core:24560]
+
+Tue Aug  4 15:06:58 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (IPAddr#{eql?,hash}): Add IPAddr#{eql?,hash} so
+	  that an IPAddr object can be used as a hash key, a set element,
+	  etc.; suggested by Nick Brown <nick@nick-brown.com>.
+
+Tue Aug  4 13:07:10 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/oniguruma.h (ONIG_SYN_WARN_CC_DUP): defined.
+	* regparse.h (ScanEnv): add warnings_flag.
+	* regparse.c (CC_DUP_WARN): defined for warn duplicated characters in
+	  character class of regexp. [ruby-core:24593]
+	  (add_code_range_to_buf): add CC_DUP_WARN.
+	  (next_state_val): add CC_DUP_WARN.
+	  (OnigSyntaxRuby): add ONIG_SYN_WARN_CC_DUP.
+	  (SET_ALL_MULTI_BYTE_RANGE): add env to arguments.
+	  (add_code_range): ditto.
+	  (add_code_range_to_buf): ditto.
+	  (not_code_range_buf): ditto.
+	  (or_code_range_buf): ditto.
+	  (and_code_range1): ditto.
+	  (and_code_range_buf): ditto.
+	  (and_cclass): ditto.
+	  (or_cclass): ditto.
+	  (add_ctype_to_cc_by_range): ditto.
+	  (add_ctype_to_cc): ditto.
+	  (parse_char_class): ditto.
+
+Tue Aug  4 12:40:45 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/encdb.c (ENC_SET_BASE): fix typo.
+	  patch by ujihisa [ruby-dev:39004]
+
+Tue Aug  4 11:57:39 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_eql, range_eq): fixed equality to work for
+	  subclasses of Range.  a patch from Marc-Andre Lafortune.
+	   [ruby-core:22190]
+
+	* test/ruby/test_range.rb: add assertions for above.
+
+Tue Aug  4 09:41:11 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/big5.c (EncLen_Big5): back to original Big5 table.
+	  (EncLen_Big5_HKSCS): for Big5-HKSCS.
+	  (trans): add the lead byte table for Big5-HKSCS.
+	  (big5_mbc_enc_len): abstract function for Big5 series.
+	  (big5_mbc_enc_len): for Big5.
+	  (big5_hkscs_mbc_enc_len): for Big5-HKSCS.
+	  (BIG5_HKSCS_P): added.
+	  (BIG5_ISMB_FIRST): add routine for Big5-HKSCS.
+	  (big5_hkscs): add for Big5-HKSCS.
+
+Tue Aug  4 09:33:54 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_set_base): Add for setting base encoding
+	  with their names. this is internal function.
+
+	* template/encdb.h.tmpl: specify ENC_SET_BASE for second encodings in
+	  each encoding files.
+
+	* enc/encdb.c (rb_enc_set_base): add a declaration.
+	  (ENC_SET_BASE): ditto.
+
+Tue Aug  4 06:30:01 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_replace): should copy compare_by_identity status as well.
+	  [ruby-core:24728]
+
+Tue Aug  4 05:43:03 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (recursive_push): need to set UNTRUST.  [ruby-dev:38997]
+
+Tue Aug  4 03:56:51 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tcltklib.c: fix trouble on old-style C function
+	  declarations [ruby-core:22871].
+
+	* ext/tk/lib/tcltklib.c: (ruby_1_8) fix warning about RUBY_RELEASE_DATE
+
+	* ext/tk/lib/tk/multi-tk.rb: kill zombie threads.
+
+	* ext/tk/lib/tk/fontchooser.rb: fix typo and support OptionObj.
+
+	* ext/tk/lib/tk/{canvas.rb,virtevent.rb,image.rb,timer.rb}:
+	  don't create unnecessary array.
+
+Mon Aug  3 22:19:24 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (rb_mod_include): fix document.  [ruby-core:24675]
+
+Mon Aug  3 18:25:08 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/svr.rb: obsolete TCPserver renamed.  [ruby-core:24712]
+
+	* sample/tsvr.rb: ditto.
+
+	* sample/dualstack-httpd.rb: ditto.
+
+Mon Aug  3 18:12:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (recursive_push): untrust internal hash to prevent
+	  unexpected SecurityError.  a patch from Kazuhiro NISHIYAMA.
+	  Fix: #1864  [ruby-dev:38982]
+
+Mon Aug  3 17:06:05 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/README: updated.  a patch from Daniel Bovensiepen.
+	  [ruby-core:24693]
+
+Mon Aug  3 16:28:09 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_connect): return value was broken when some
+	  error occurred.
+	  [ruby-core:24234]
+
+Mon Aug  3 15:56:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (permute0): use chars for boolean array.
+
+	* array.c (rb_ary_{permutation,combination}): disallow reentrance
+	  with continuation since work-buffers cannot restore.
+
+	* array.c (rb_ary_{permutation,combination,product}): must not use
+	  ary_discard on strings.
+
+Mon Aug  3 06:43:25 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_hash): normalize -0.0 to 0.0.  [ruby-core:24577]
+
+Mon Aug  3 00:32:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_random_int): arguments have to be converted to
+	  integer.  [ruby-core:24679]
+
+Sun Aug  2 21:04:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (literal_concat0): tail can be nil.  [ruby-dev:38980]
+
+Sun Aug  2 20:09:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_combination, rb_ary_product): prevent from GC.
+
+Sun Aug  2 16:53:19 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rand.rb: add tests for Random#float's rejection
+	  against Infinity and NaN.
+
+Sun Aug  2 14:20:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rand_int): prevent from GC.
+
+Sat Aug  1 19:23:27 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_trans): change condition of singlebyte
+	  optimization.
+
+Sat Aug  1 18:50:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_float): rejects Infinity and NaN.
+	  [ruby-core:24651]
+
+Sat Aug  1 18:34:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): suppressed warnings.
+	  cf: [ruby-dev:38975]
+
+Sat Aug  1 05:18:36 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_trans): can't use singlebyte optimization when
+	  the replacement is multibyte. [ruby-core:24612]
+
+Fri Jul 31 18:01:34 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/securerandom.rb (SecureRandom.random_bytes): return string should
+	  be ASCII-8BIT.  [ruby-core:24640]
+
+Fri Jul 31 16:28:33 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_stdio_set_default_encoding): added.
+
+	* ruby.c (process_options): call rb_stdio_set_default_encoding
+	  after setting default internal and external.
+
+Fri Jul 31 15:06:33 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/compile_prelude.rb: too long string literal causes compile error
+	  on some platforms.
+
+Fri Jul 31 13:15:27 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* transcode.c (str_encode_bang): C99ism.
+
+Fri Jul 31 11:48:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): used more appropriate construct.
+
+Fri Jul 31 10:54:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (literal_concat_gen): reduced unnecessary node at string
+	  literal concatenation with empty head dstr.  [ruby-dev:38968]
+
+Fri Jul 31 02:57:39 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as
+	  NODE_STR.  [ruby-dev:38968]
+
+	* bootstraptest/test_syntax.rb: add a test for above.
+
+Fri Jul 31 00:55:48 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_module.rb (test_ancestors, test_included_modules):
+	  ignore rake mixins.
+
+Fri Jul 31 00:30:54 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (vm_call_cfunc): let set_trace_func use called_id
+	  instead of original_id.
+
+Thu Jul 30 23:04:32 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* gem_prelude.rb (Gem.path): uses Gem.default_path as a default value
+	  so that ruby finds gems in ~/.gem/.
+	  (Gem.user_home): reduced version of lib/rubygems.rb's.
+	  Gem.default_path needs it.
+
+Thu Jul 30 22:28:04 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/compile_prelude.rb: replaces "require" with in-place evaluation
+	  so that copy & paste for lib/rubygems/default.rb is not necessary.
+
+	* gem_prelude.rb: removes copied codes from lib/rubygems/defaults.rb.
+	  uses require instead.
+
+	* common.mk (prelude.c): adds dependency for lib/rubygems/defaults.rb.
+
+Thu Jul 30 21:56:18 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rand.rb: add tests for Random class.
+
+Thu Jul 30 21:48:56 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* random.c (init_genrand): ensure invariant of mt->next and mt->left.
+	  mt->next should always equal mt->state + N + 1 - mt->left.
+	  In fact, 'r = Random.new(0); r == r.dup' has returned false.
+
+Thu Jul 30 21:43:41 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* random.c (random_bytes): use NUM2LONG instead of FIX2LONG because
+	  Random#bytes may receive bignum.
+
+Thu Jul 30 21:39:42 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_compile_each): fix stack consistency error.
+	  [ruby-core:24611]
+
+	* bootstraptest/test_method.rb: add tests for above.
+
+Thu Jul 30 18:39:39 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c: added check for frozen string for encode! (see Bug #1836)
+
+	* test/ruby/test_transcode.rb: added tests for the above
+
+Thu Jul 30 16:45:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass): preserve encoding of class/module
+	  names.  [ruby-core:24600]
+
+	* variable.c (rb_set_class_path_string): set class path with a
+	  string value.
+
+Thu Jul 30 16:12:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (Init_var_tables): initializes __classid__ ID.
+
+	* variable.c: use st_data_t for st functions.
+
+Thu Jul 29 14:25:14 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI::unescape): support encoding option.
+
+	* lib/cgi/cookie.rb (CGI::Cookie.parse): fix for the encoded value.
+
+Wed Jul 29 08:08:07 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (regexp): regexp literal at the top of dstr is still needed
+	  even if it is empty.
+
+Wed Jul 29 03:36:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/json/lib/json/common.rb (JSON#recurse_proc): remove
+	  unnecessary private specifier.  [ruby-dev:38929]
+
+Wed Jul 29 03:34:46 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, vm_insnhelper.c (vm_call_method): revive
+	  VM_CALL_OPT_SEND_BIT and use it to recognize "send" method.
+
+Wed Jul 29 03:11:59 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (rb_method_entry_arity): support not_implemented method.
+	  (I have no idea to test it)
+
+Tue Jul 28 19:36:26 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (rb_method_entry_arity): support optimized method (send).
+
+	* test/ruby/test_method.rb: add a test for above.
+
+Tue Jul 28 04:34:05 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/extconf.rb: bug fix and ignore invalid Tcl/Tk libraries.
+
+	* ext/tk/lib/config_list.in: bug fix and add a new option.
+
+	* ext/tk/lib/README.tcltklib: update for a new option.
+
+Mon Jul 27 19:03:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_*str_new_cstr, rb_str_buf_new_cstr),
+	  (rb_str_buf_cat2, rb_str_cat2, rb_exc_new2): suppress warnings.
+
+Mon Jul 27 10:24:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser.rb (RDoc::Parser.binary?): fix for empty files.
+	  [ruby-dev:38848]
+
+Mon Jul 27 06:51:41 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_eof): should call next_argv() before testing.
+	  [ruby-core:24561]
+
+Sun Jul 26 19:17:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_eof): go to the next file if called after ARGF.close
+	  or ARGF.skip.  a patch from Mike Kasick at [ruby-core:24561].
+
+Sun Jul 26 18:30:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): __send__ can call protected
+	  methods.  [ruby-core:24500]
+
+Sun Jul 26 01:09:14 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* ext/bigdecimal.c: moved BASE_FIG definition before it is used
+	  first time.
+
+	* include/ruby/defines.h [__SYMBIAN32__]: defined TRUE and FALSE to match
+	  changes in bignum.c and array.c.
+
+Sat Jul 25 17:49:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_eof): should not have reached EOF before trying to
+	  read.  based on a patch by Heesob Park <phasis AT gmail.com> in
+	  [ruby-core:24559].  [ruby-core:24557]
+
+Sat Jul 25 13:44:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (nucomp_hash), rational.c (nurat_hash): not to use
+	  hash value of class so that equality against subclasses can
+	  work.  [ruby-dev:38850]
+
+Sat Jul 25 01:05:59 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/big5.c: Fix EncLen_BIG5 for Big5-HKSCS. see [ruby-core:24390]
+
+Fri Jul 24 19:19:19 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/big5.trans, big5-hkscs-tbl.rb:
+	  new Chinese BIG5-HKSCS transcoding (with Tatsuya Mizuno)
+	  see [ruby-core:24390]
+
+	* test/ruby/test_transcode.rb: added tests for the above
+	  (with Tatsuya Mizuno)
+
+	* enc/big5.c: Added BIG5-HKSCS as a replicate encoding of BIG5
+	  (short term solution, needs more work; with Tatsuya Mizuno)
+
+	* tool/transcode-tblgen.rb: made 'pat' directly accessible in
+	  class StrSet
+
+Fri Jul 24 18:03:01 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (idle): leaves IDLE in a ensure clause.  a patch
+	  from Eric Hodel.
+
+	* test/net/imap/test_imap.rb (setup, teardown): turn on
+	  Socket.do_not_reverse_lookup in tests.
+
+Fri Jul 24 00:13:41 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (resp_text_code): accepts response codes without
+	  text.  [ruby-core:24194]
+
+	* lib/net/imap.rb (idle, idle_done): new methods for the IMAP4 IDLE
+	  command (RFC 2177).  Thanks, Eric Hodel.
+
+	* lib/net/imap.rb (format_date, format_datetime): new method to
+	  format IMAP-style date/datetime. Thanks, Eric Hodel.
+
+Thu Jul 23 17:31:02 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb: make irb be able to parse
+	  string_dvar. [ruby-core: 24051]
+
+Thu Jul 23 17:26:51 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: should not create "config_list" in a $srcdir.
+
+Thu Jul 23 14:35:02 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
+	  mean to call runtime's open() if textmode.
+
+Thu Jul 23 08:53:24 2009  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup/simple_markup/: Remove useless directory.
+	  [Bug #1343]
+
+Thu Jul 23 08:52:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_{state,left}): internal/debug use.
+
+Wed Jul 22 19:29:26 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_module.rb (TestModule#test_alias): warning
+	  message updated.
+
+Thu Jul 23 00:39:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (class.o): depends on vm_core.h.
+
+Thu Jul 23 00:10:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (init_leap_second_info): checks the result of gmtime to
+	  suppress warnings.
+
+Wed Jul 22 22:23:24 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_core.h (struct rb_iseq_t): add a new field line_no.  This field
+	  represents line number from which the original code of the iseq
+	  starts.  [ruby-dev:38698]
+
+	* iseq.c, compile.c: ditto.
+
+	* parse.y: line number hack (for Proc#source_location) is no longer
+	  needed.
+
+	* test/ruby/test_settracefunc.rb: line number of set_trace_func is now
+	  compatible with 1.8's.
+
+Wed Jul 22 22:16:48 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* method.h: Commas at end of enum list not allowed as of C89
+
+	* vm_method.c (rb_add_method): avoid C++ comment
+
+	* vm_insnhelper.c (vm_call_cfunc): ditto.
+
+Wed Jul 22 20:42:52 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: define IPPROTO_IPV6 macro for recent Windows
+	  SDK.
+
+Wed Jul 22 19:32:10 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/mkconstants.rb: define IPV6_* constants only when INET6
+	  is defined.
+
+Wed Jul 22 19:23:04 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: ipv6 support is disabled by default on mswin.
+
+Wed Jul 22 17:41:08 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): drop IPv6 addresses
+	  if INET6 is not defined.
+
+Wed Jul 22 17:29:59 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: enable ipv6 support for win32.
+
+Wed Jul 22 16:38:39 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* hash.c (Hash::[]): rdoc. patch by Marc-Andre Lafortune.
+	  #1385.
+
+Wed Jul 22 10:00:53 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (WSAMSG): get rid of compile error on VC9 and mingw.
+
+Wed Jul 22 06:35:56 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_enum.rb (TestEnumerable#each): recursive join now
+	  raises ArgumentError.
+
+Wed Jul 22 02:33:57 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb.rb: forget svn commit.
+
+Wed Jul 22 01:20:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bootstraptest/test_io.rb: block write may block for long time.
+
+Wed Jul 22 00:34:39 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
+	  IRB::irb_at_exit. no use finalizer saving history. [ruby-dev-38563]
+
+Tue Jul 21 23:47:38 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* random.c (rand_init): array length of random seed was broken, which
+	  causes memory error with srand(2**1000000-1).
+
+	* test/ruby/test_rand.c: test for above.
+
+Tue Jul 21 21:37:19 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].
+
+	* lib/tracer.rb: no show lines unknown line number. [ruby-core:22096],
+	  no trace display  c-call and c-return as default.
+
+Tue Jul 21 16:24:41 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (vtdate2rbtime): VT_DATE variant object
+	  is converted to Time object now.
+
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_with_nil,
+	  test_conversion_time2date, test_conversion_str2date,
+	  test_conversion_vt_date, test_set_value): ditto.
+
+	* ext/win32ole/win32ole.c (rbtime2vtdate): refactoring.
+
+Tue Jul 21 16:07:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tracer.rb: toplevel caller exists now.  [ruby-core:24454]
+
+Tue Jul 21 13:36:20 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch] (recvmsg, sendmsg): new functions to support recvmsg/
+	  sendmsg like UNIX. these functions are experimental and not tested
+	  well. bug reports are welcome.
+
+Tue Jul 21 13:35:21 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (TEST_RUNNABLE): follow r24209.
+
+Tue Jul 21 12:45:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_enable, rb_gc_disable): should return Qtrue/Qfalse.
+
+Tue Jul 21 12:38:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_generic_ivar_memsize): should not remove generic
+	  instance variable table.
+
+Mon Jul 20 20:35:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_f_open): add rdoc about specifying ext_enc as *-bom.
+
+Mon Jul 20 19:00:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_dstr_fragments): reduced needless literal.
+
+	* parse.y (xstring, regexp, dsym, literal_concat, evstr2dstr):
+	  literal at the top of dstr is no longer needed if it is empty,
+	  since concatstrings and toregexp always create new strings.
+
+Mon Jul 20 12:51:39 2009  wanabe  <s.wanabe@gmail.com>
+
+	* lib/matrix.rb (Matrix#rank): revert a part of r20859 to avoid
+	  infinite loop.  [Bug #1020]
+
+Mon Jul 20 11:12:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, Makefile.in (TEST_RUNNABLE): tests are no
+	  runnable if cross-compiling.
+
+	* common.mk (btest*, test*): ditto.
+
+Mon Jul 20 10:55:18 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Addrinfo#family_addrinfo): fix a typo in
+	  error message.  patch by Nobuhiro IMAI.  [ruby-dev:38828]
+
+Sun Jul 19 22:22:54 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (float_to_r): an improvement.
+
+Sun Jul 19 20:41:24 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (make_patterns): do not use \d.
+
+	* rational.c (make_patterns): ditto.
+
+Sun Jul 19 17:32:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_read): should taint the result.  [ruby-dev:38826]
+
+Sun Jul 19 11:00:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (me_opts): fixed optimized method aliasing.
+	  [ruby-dev:38824]
+
+Sun Jul 19 10:54:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.accept_loop): rescue
+	  IO::WaitReadable instead of Errno::EWOULDBLOCK.
+	  (Socket.udp_server_loop_on): ditto.
+
+Sat Jul 18 23:44:59 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (reg_enc_error): use rb_enc_get to get the encoding of
+	  a Regexp object. REGEXP(re)->ptr->enc is the encoding of the
+	  regexp engine for patterns and target strings.
+	  [ruby-core:23208]
+
+Sat Jul 18 17:43:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_hash_cmp): got rid of overflow.
+
+Sat Jul 18 16:03:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h (TRUE, FALSE): for internal use.
+
+Sat Jul 18 11:39:49 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* random.c: workaround for VC++ 6.0.
+
+Sat Jul 18 09:16:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_random_{int32,real,bytes,int}): added functions for
+	  extension libraries.
+
+Sat Jul 18 09:07:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (fill_random_seed): use cryptographic service on Windows.
+
+Sat Jul 18 07:56:00 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fail to create a widget object for an unknown
+	  widget path.
+
+Sat Jul 18 07:06:31 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves().
+	  Extend usage pattern of grid_column()/grid_row().
+
+Sat Jul 18 06:30:35 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: include winsock headers in extern "C++" for
+	  C++ extension libraries.
+
+	* include/ruby/missing.h (vsnprintf): workaround for VC++.
+	  [ruby-core:23096]
+
+Sat Jul 18 00:23:47 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/readline/readline.c (Init_readline): rl_catch_signals does
+	  not exist on some platform like Mac OS X 10.5.
+
+	* ext/readline/extconf.rb: checks existence of rl_catch_signals.
+
+Fri Jul 17 22:37:22 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (socket_s_ip_address_list): drop inactive
+	  adapters.
+
+	* test/socket/test_{nonblock,addrinfo,socket}.rb: skip some tests on
+	  Windows.
+	  [ruby-core:23051]
+
+Fri Jul 17 22:29:21 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/readline/readline.c (Init_readline): use rl_catch_sigwinch only
+	  when existing.
+
+	* ext/readline/extconf.rb: check existence of rl_catch_sigwinch, and
+	  workaround for native Win32 readline port.
+
+Fri Jul 17 18:18:23 2009  Tanaka Akira  <akr@fsij.org>
+
+	* range.c (recursive_hash): extracted from range_hash.  reject
+	  recursive key.
+	  (range_hash): use recursive_hash.
+
+Fri Jul 17 18:11:32 2009  Tanaka Akira  <akr@fsij.org>
+
+	* struct.c (recursive_hash): extracted from rb_struct_hash.  reject
+	  recursive key.
+	  (rb_struct_hash): use recursive_hash.
+
+Fri Jul 17 16:45:22 2009  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (recursive_hash): reject recursive key.
+
+Fri Jul 17 15:20:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (DIGSPERINT): fix for LP64.
+
+	* random.c (fill_random_seed): /dev/urandom is not available on
+	  DOSISH systems.
+
+	* random.c (random_equal): new method Random#==.
+
+Fri Jul 17 13:35:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (rsock_getfamily): return AF_UNSPEC if getsockname
+	  is failed.  [ruby-core:24383]
+
+Fri Jul 17 01:22:57 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (recursive_join): raise ArgumentError for joining
+	  recursive array.
+
+	* array.c (ary_join_1): ditto.
+
+	* test/ruby/test_array.rb (TestArray#test_join2): test updated for
+	  recursive join.
+
+Thu Jul 16 23:32:16 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb,ext/tk/config_list.in: ignore paths which includes
+	  white space characters on Windows.[ruby-dev:38794]
+
+	* ext/tk/lib/tk.rb: works on Cygwin (limitation:: Tk.mainloop works on
+	  the main thread only).
+
+Thu Jul 16 20:58:18 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole.rb (test_s_codepage_changed,
+	  test_s_locale_set, test_s_locale_change): skip test if Japanese
+	  locale is not installed. [ruby-core:23806]
+
+	* test/win32ole/test_win32ole_variant.rb (test_conversion_str2cy):
+	  ditto.
+
+Thu Jul 16 19:02:28 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): servers
+	  is nil if an error occurs before setting it.
+
+Thu Jul 16 18:42:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (fill_random_seed): suppress a warning.
+
+Thu Jul 16 18:30:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_aset, recursive_hash): rejects recursive hash.
+	  [ruby-core:22921]
+
+Thu Jul 16 18:28:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* id.c (Init_id), vm.c (vm_exec): @#__ThrowState__ is no longer
+	  used.  [ruby-dev:38760]
+
+Thu Jul 16 17:41:28 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (rb_alias): fix a case which try non-existing method alias.
+
+	* test/ruby/test_alias.rb: add a test.
+
+Thu Jul 16 16:00:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_reopen): discards read buffer.  [ruby-core:24240]
+
+Thu Jul 16 15:52:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_new, rb_bigzero_p), range.c (rb_range_values):
+	  added for random.c.
+
+	* random.c (rb_random_t): objectified.  [EXPERIMENTAL]
+	  [ruby-dev:30954]
+
+Thu Jul 16 14:08:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_sample): RDoc update.  a patch from Florian
+	  Frank.   [ruby-core:24347]
+
+Thu Jul 16 12:42:10 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): rl_free_line_state
+	  before rl_cleanup_after_signal.
+
+	* ext/readline/readline.c (Init_readline): set rl_catch_signals and
+	  rl_catch_sigwinch as 0. [ruby-core:21884]
+
+Thu Jul 16 08:59:22 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* node.h, vm_core.h, variable.c: rename global_entry to rb_global_entry.
+
+	* compile.c, insns.def, iseq.c, vm_insnhelper.h: ditto.
+
+Thu Jul 16 08:57:44 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c: separate clearing cache entry code.
+
+Thu Jul 16 08:56:32 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* dir.c (push_glob): re-fix GC problem.
+
+Thu Jul 16 08:55:27 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: add method.h.
+
+Thu Jul 16 08:53:26 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* io.c (argf_free): free data body.
+
+Wed Jul 15 23:46:55 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h, vm_core.h: add rb_method_entry_t.  Remove nodes around
+	  method management.  This change affect some VM control stack structure.
+
+	* vm.c, vm_insnhelper.c, vm_method.c, vm_eval.c: ditto.  and make some
+	  refactoring.
+
+	* insns.def, class.c, eval.c, proc.c, vm_dump.c : ditto.
+
+	* vm_core.h, compile.c (iseq_specialized_instruction): remove
+	  VM_CALL_SEND_BIT.  use another optimization tech for Kernel#send.
+
+	* node.h: remove unused node types.
+
+	* ext/objspace/objspace.c (count_nodes): ditto.
+
+	* gc.c: add mark/free functions for method entry.
+
+	* include/ruby/intern.h: remove decl of
+	  rb_define_notimplement_method_id().  nobody can use it
+	  because noex is not opened.
+
+	* iseq.c (iseq_mark): fix to check ic_method is available.
+
+	* iseq.c (rb_iseq_disasm): fix to use rb_method_get_iseq().
+
+Wed Jul 15 23:45:11 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* dir.c (push_glob): fix GC problem.
+
+Wed Jul 15 17:33:52 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/purelib.rb: translates a fake path to rubygems in $" into
+	  an alternative in $: so that Kernel.#require does not load
+	  more rubygems.rb.
+	  Resolves many failures in test/rubygems/*.
+
+	* gem_prelude.rb (Gem.load_full_rubygems_library): supports case
+	  the rubygems to load is not in $(rubylibprefix).
+	  (Gem.path_to_full_rubygems_library): new method for the changes in
+	  purelib.rb and Gem.load_full_rubygems_library.
+	  (Gem.fake_rubygems_as_loaded): new method.
+
+Wed Jul 15 16:29:35 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.
+
+Wed Jul 15 06:21:50 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782]
+
+Wed Jul 15 04:22:54 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
+	  set tempfile name with literal.
+
+Tue Jul 14 21:53:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/nonblock: moved from ext/io/wait/lib.
+
+Tue Jul 14 17:29:20 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_index_m): return nil if pos is out of string.
+	  [ruby-core:23660]
+
+Tue Jul 14 16:13:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_initialize): check if the descriptor can be accessed
+	  in the specified open mode.  [ruby-dev:38571]
+
+Tue Jul 14 09:26:14 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: Long-term-callback support isn't stable yet.
+	  So, disable the feature and waiting for improvement in the future.
+
+Tue Jul 14 01:28:17 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_m17n.rb (TestM17N#test_env): the encoding of
+	  ENV is now locale encoding.
+
+Tue Jul 14 01:24:56 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): should return real object.
+
+Tue Jul 14 01:06:31 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enumerator.c (yielder_yield_i): use rb_proc_new instead of
+	  rb_iterate.  [ruby-dev:38518]
+
+	* README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call
+	  instead.
+
+	* README.EXT.ja: ditto.
+
+Tue Jul 14 00:45:41 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_case.rb (TestCase#test_deoptimization):
+	  test for [ruby-core:23190].
+
+Mon Jul 13 22:49:50 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/prime.rb (Prime#prime_division): now decomposes
+	  negative integer into a decomposition with element [-1, 1].
+
+	* test/test_prime.rb: test for it.
+
+Mon Jul 13 22:28:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (pipe_open): handles leaked on win32 when an error occurs.
+
+Mon Jul 13 20:21:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): should not shadow outer variable not to
+	  return Qnil always.
+
+Mon Jul 13 19:41:05 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): copy instance variables to new regexp.
+
+Mon Jul 13 17:49:11 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, compile.c: declare struct iseq_inline_cache_entry.
+	  Inline cache (IC) entries are no longer GC managed object.
+	  IC entries are freed when ISeq is freed.
+
+	* iseq.c: fix mark, free, memsize functions for above change.
+
+	* insns.def: remove rb_gc_write_barrier().
+
+	* vm_insnhelper.c (vm_method_search): ditto.
+
+	* tool/instruction.rb, template/insns_info.inc.tmpl (insn_iclen):
+	  added.
+
+Mon Jul 13 13:35:08 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm_insnhelper.c (getinstancevariable):
+	  fix to use inline cache.
+
+	* compile.c: fix to skip inline cache entry (IC).  IC is added
+	  automatically by compiler.
+
+	* insns.def, vm_insnhelper.h: fix IC positions.
+
+	* iseq.c: increment minor_version of ISeq because of above change.
+
+Mon Jul 13 08:01:00 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: New strategy for searching Tcl/Tk libraries.
+
+	* ext/tk/*: Support new features of Tcl/Tk8.6b1 and minor bug fixes.
+	     ( [KNOWN BUG] Ruby/Tk on Ruby 1.9 will not work on Cygwin. )
+
+	* ext/tk/*: Unify sources between Ruby 1.8 & 1.9.
+	            Improve default_widget_set handling.
+
+	* ext/tk/*: Multi-TkInterpreter (multi-tk.rb) works on Ruby 1.8 & 1.9.
+	     ( [KNOWN BUG] On Ruby 1.8, join to a long term Thread on Tk
+	        callbacks may freeze. On Ruby 1.9, cannot create a second
+	        master interpreter (creating slaves are OK); supported master
+	        interpreter is the default master interpreter only. )
+
+	* ext/tk/lib/tkextlib/*: Update supported versions of Tk extensions.
+	         Tcllib 1.8/Tklib 0.4.1  ==>  Tcllib 1.11.1/Tklib 0.5
+	         BWidgets 1.7            ==>  BWidgets 1.8
+	         TkTable 2.9             ==>  TkTable 2.10
+	         TkTreeCtrl 2005-12-02   ==>  TkTreeCtrl 2.2.9
+	         Tile 0.8.0/8.5.1        ==>  Tile 0.8.3/8.6b1
+	         IncrTcl 2005-02-14      ==>  IncrTcl 2008-12-15
+	         TclX 2005-02-07         ==>  TclX 2008-12-15
+	         Trofs 0.4.3             ==>  Trofs 0.4.4
+
+Mon Jul 13 01:18:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_timespec): rounds subsecond toward zero.
+
+Sun Jul 12 23:51:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* hash.c (env_str_new): use rb_locale_str_new instead of
+	  rb_tainted_str_new. rb_locale_str_new set string locale
+	  encoding and tainted.
+
+Sun Jul 12 23:56:40 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: added some shortcuts.
+
+	* rational.c: ditto.
+
+Sun Jul 12 23:30:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_to_integer, rb_check_to_integer): return Bignum
+	  as-is.
+
+Sun Jul 12 21:07:46 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: use k_exact_{zero,one}_p macro.
+
+	* rational.c: ditto.
+
+Sun Jul 12 20:42:58 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c (fix_divide): added an entry to rational.
+
+	* rational.c (rb_rational_reciprocal): added.
+
+	* complex.c (f_reciprocal): added.
+
+Sun Jul 12 02:24:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rand_init): use fixed buffer for small numbers.
+
+Sat Jul 11 14:43:34 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_io_m17n.rb (test_strip_bom): added.
+
+Sat Jul 11 07:11:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  array length is long.
+
+	* ext/readline/readline.c (readline_s_get_filename_quote_characters):
+	  missing type of self.
+
+Sat Jul 11 02:37:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (limited_rand): expands to long before shift so that
+	  the result does not overflow.
+
+Sat Jul 11 00:16:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rand_init): got rid of buffer overflow.
+
+Sat Jul 11 00:11:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_join_1): should recurse for element array.
+
+Fri Jul 10 23:10:11 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_strip_bom): ungetbyte third byte when UTF-16LE.
+
+Fri Jul 10 23:04:16 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_strip_bom): Fix condition of second byte of
+	  UTF-16LE/UTF-32LE.
+
+Fri Jul 10 21:45:30 2009  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/extconf.rb: checked rl_refresh_line in readline.
+
+	* ext/readline/readline.c (readline_s_refresh_line): add new
+	  method, a patch from Koichiro Ohba. see [ruby-list:45922].
+
+Fri Jul 10 21:00:05 2009  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/extconf.rb: checked rl_line_buffer and rl_point in
+	  readline.
+
+	* ext/readline/readline.c (readline_s_get_line_buffer): new method.
+	  (readline_s_get_point): new method.
+
+Fri Jul 10 16:30:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (recursive_join): use obj to tell if recursion occurs.
+	  [ruby-core:24150]
+
+	* enum.c (enum_join): reverted r23966.  [ruby-core:24196]
+
+Fri Jul 10 14:41:34 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): set encoding only if the encoding
+	  is not US-ASCII.
+
+Fri Jul 10 14:44:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (struct MT): ruby already assumes int has 32bit a
+	  least, so no needs to use long.
+
+	* random.c (rand_init): copies data to be used really only.
+
+Fri Jul 10 11:41:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
+	  prototypes.  [ruby-dev:38756]
+
+Fri Jul 10 10:25:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_superclass): checks for implicit
+	  argument passing before method search.  [ruby-core:24244]
+
+Fri Jul 10 07:22:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_data_type): typed.
+
+Thu Jul  9 23:28:48 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/io.h (FMODE_STRIP_BOM): new constant.
+
+	* io.c (io_encname_bom_p): judge whether the encoding name
+	  is *-bom or not.
+	  (parse_mode_enc): drop "-bom".
+	  (rb_io_modestr_fmode): set FMODE_STRIP_BOM if needed.
+	  (rb_io_extract_modeenc): ditto.
+	  (io_strip_bom): strip bom if exists.
+	  (io_set_encoding_by_bom): set encoding if there is bom.
+	  Set encoding and strip bom when modeenc string is "r:foo-bom"
+	  [ruby-dev:37236]
+
+Thu Jul  9 21:56:59 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): replace \u by u when the regexp is
+	  made by Ruby 1.8. [ruby-dev:36750]
+
+Wed Jul  8 23:13:54 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_div): omitted zero division check.
+
+Wed Jul  8 21:00:37 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/inspector.rb: forget svn add.
+
+Wed Jul  8 19:10:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_check_type): rejects typed data.
+
+Wed Jul  8 18:28:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c ({proc,binding,method}_data_type): typed.
+
+Wed Jul  8 16:47:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_basename): returns new string instead of
+	  shared string from FilePathStringValue().  [ruby-core:24199]
+
+Wed Jul  8 04:28:16 2009  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/.document:  Update with extensions that appear to have
+	  documentation.  [ruby-core:24181]
+
+Wed Jul  8 04:28:16 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h:
+	  rename
+	    "...TypeStruct" and "typed_struct" to
+	    "TypedData..." and "typeddata", respectively.
+	  rename
+	    rb_data_type_t#name to
+	    rb_data_type_t#wrap_struct_name.
+
+	* error.c, gc.c, iseq.c, vm.c: ditto.
+
+Tue Jul  7 20:23:27 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* bin/irb, lib/irb.rb lib/irb/*: irb-0.9.6, extend inspect-mode
+
+Tue Jul  7 17:00:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): deal with typed struct like
+	  as obj_free().
+
+	* error.c (rb_typed_struct_is_kind_of): new function to see if the
+	  given typed struct.
+
+	* error.c (rb_check_typed_struct): new function to check typed
+	  struct.
+
+	* include/ruby/ruby.h (Check_TypedStruct, Data_Get_TypedStruct):
+	  new macro to check typed struct.
+
+Tue Jul  7 13:36:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (DEFINE_ENUMFUNCS): included function signature.
+
+	* enum.c (rb_enum_join): non-nil separator must be convertible to
+	  String.  [ruby-core:24172]
+
+Tue Jul  7 12:47:28 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (rb_enum_join): should propagate taint to the return
+	  value.  the change was overridden by r23967.  [ruby-core:24176]
+
+Tue Jul  7 11:56:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (GC_PROF_SET_MALLOC_INFO, GC_PROF_SET_HEAP_INFO): simplified.
+
+Tue Jul  7 10:12:37 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_ext_int_to_encs): Set external encoding if
+	  ext==intern. [ruby-dev:38278]
+
+Mon Jul  6 09:31:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (make_curry_proc): should propagate lambda-ness.
+	  [ruby-core:24127]
+
+	* proc.c (proc_hash): use long.
+
+Mon Jul  6 09:06:49 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_module.rb (TestModule#test_undef): adjust to
+	  message change.
+
+	* test/ruby/test_object.rb (TestObject#test_redefine_method_which_may_case_serious_problem): ditto.
+
+	* test/ruby/test_object.rb (TestObject#test_remove_method): ditto.
+
+Mon Jul  6 09:04:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_join): deals with self recursive objects to get rid
+	  of infinite recursion.  [ruby-core:24150]
+
+Mon Jul  6 08:00:10 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_to_a): should propagate taint to the return value.
+	  [ruby-core:24152]
+
+	* enum.c (enum_sort_by): ditto.
+
+Mon Jul  6 00:41:41 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: edited rdoc.
+
+Sun Jul  5 23:55:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): fix Time.local(2009,2,31) failure on 64bit
+	  time_t environment.
+
+Sun Jul  5 22:43:13 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_s_polar): now arg is optional.
+
+Sun Jul  5 20:40:35 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (float_arg): returns PI for -0.0.
+
+Sun Jul  5 14:04:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_threadptr_exec_event_hooks): new function to
+	  execute event hooks, with preserving errinfo.  [ruby-core:24118]
+
+Sun Jul  5 08:14:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_add_method, remove_method, rb_undef): fixed
+	  minor grammatical errors in warnings.  a patch from Run Pain
+	  Run Run at [ruby-core:24141].
+
+	* vm_method.c (Init_eval_method): registers notimplement_body as a
+	  mark-object.
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): restores the firs
+	  arg where is overwritten at funcall.  [ruby-core:24139]
+
+Sat Jul  4 08:20:03 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (dbl2ival): should raise FloatDomainError on Infinity
+	  and NaN as 1.8 does.  [ruby-dev:38726]
+
+Fri Jul  3 22:48:45 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): less number of guesses for hh:mm:60.
+
+Fri Jul  3 21:30:14 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_equal_p): removed.
+
+Fri Jul  3 21:07:29 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: renamed equal_p to eqeq_p.
+
+	* complex.c: ditto.
+
+	* complex.c (nucomp_equal_p): added.
+	  Complex(NaN).equal?(Complex(NaN)) should return true.
+
+Fri Jul  3 19:48:40 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: undef-ed shome methods.  [ruby-core:24110]
+
+	* complex.c (Numeric#arg): NaN for NaN.  [ruby-core:24116]
+
+Fri Jul  3 18:35:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (struct rb_iseq_struct): fixed types.
+
+	* vm_core.h (ic_vmstat): VM state version is VALUE.
+
+Fri Jul  3 02:52:20 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): time guess strategy refined again.
+
+Fri Jul  3 00:36:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): time guess strategy refined.
+
+Thu Jul  2 11:16:25 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: added response to Net::IMAP::ResponseError.
+	  a patch from Eric Hodel in [ruby-core:24111].
+
+Thu Jul  2 08:04:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (num_exact): rb_check_to_integer() can deal with both of
+	  Fixnum and Bignum together.
+
+Thu Jul  2 07:53:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fixed wrong variable.
+
+Thu Jul  2 05:37:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (num_exact): use to_r for T_FLOAT.
+
+Thu Jul  2 05:15:54 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (quo): return an integer if possible.
+
+Wed Jul  1 21:09:25 2009  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_time_num_new): declared.
+
+	* time.c (nsec2timev): extracted from time_new_internal.
+	  (time_new_internal): change argument to VALUE.
+	  (rb_time_new): follow the argument change.
+	  (rb_time_nano_new): ditto.
+	  (rb_time_num_new): new function.
+
+	* ext/socket/ancdata.c (ancillary_timestamp): use rb_time_num_new to
+	  represent struct bintime preciously.
+
+Wed Jul  1 08:46:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_encoding): encodings need extra depth.
+	  [ruby-core:24100]
+
+Wed Jul  1 06:47:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_grep): gets rid of type-punning calls.
+
+Wed Jul  1 06:36:28 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_join): add Enumerable#join.
+
+	* array.c (ary_join_1): recursive join for Enumerators (and
+	  objects with #to_a).
+
+	* array.c (rb_ary_join): performance tune.
+
+Tue Jun 30 18:19:07 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_hash): documentation fix.  a patch from
+	  Marc-Andre Lafortune.  [ruby-core:23943]
+
+	* object.c (rb_mod_cmp): ditto.
+
+	* range.c (range_eq): ditto.
+
+	* string.c (rb_str_partition, rb_str_rpartition): ditto.
+
+	* struct.c (rb_struct_s_def): ditto.
+
+Tue Jun 30 17:44:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (reg_match_pos): adjust offset based on characters, not
+	  bytes.  [ruby-dev:38722]
+
+	* string.c (rb_str_offset): new function.
+
+	* string.c (rb_str_index_m): no call to rb_reg_adjust_startpos().
+
+Tue Jun 30 16:57:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb: renamed to get rid of collision against
+	  instruction.rb on command line completion of shell.
+
+	* tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
+	  frozen strings unless really changed.
+
+	* tool/file2lastrev.rb: get rid of global variables.
+
+	* tool/compile_prelude.rb: use US-ASCII name.
+
+Tue Jun 30 16:46:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def, tool/instruction.rb: fixed types.
+
+Tue Jun 30 11:08:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/oniguruma.h, include/ruby/re.h, re.c, regcomp.c,
+	  regenc.c, regerror.c, regexec.c, regint.h, regparse.c: use long.
+
+Tue Jun 30 11:05:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_find_1): fixed index overrun.
+
+Tue Jun 30 08:42:34 2009  Eric Hodel  <drbrain@segment7.net>
+
+	* tool/instruby.rb: summary is required in a .gemspec.
+
+Tue Jun 30 01:35:12 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/strip-rdocs.rb: supports QT style doxy-comments.
+
+Tue Jun 30 01:24:10 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (log2, cbrt): added.  [experimental]
+
+Tue Jun 30 01:19:53 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_expt): do not use rb_fexpt.
+
+Mon Jun 29 22:50:10 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Doxyfile.in: removed. merged into template/Doxyfile.template
+
+	* configure.in: new checking for dot and doxygen.
+
+	* template/Doxyfile.template: merged with Doxyfile.in.
+	  configured some options.
+
+	* common.mk (capi): use $(DOXYGEN) instead of "doxygen".
+	  (Doxyfile): removed a duplicate entry in the dependency.
+
+Mon Jun 29 21:01:31 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_expt): checks exactness.
+
+Mon Jun 29 20:29:11 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (float_to_r): always returns rational.
+
+Mon Jun 29 18:55:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_find_1): fix for files with dots.  [ruby-dev:38588]
+
+Mon Jun 29 17:14:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): should copy original encoding.
+	  [ruby-dev:38612]
+
+Sun Jun 28 23:10:55 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* gem_prelude.c (Gem.default_dir): follows the change on
+	  lib/rubygems/default.rb in r23879
+
+Sun Jun 28 23:32:11 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_div): raises ZeroDivisionError immediately
+	  when the given second argument is zero.
+
+	* rational.c (nurat_fdiv): never raise even if the given second
+	  argument is zero.
+
+	* rational.c (rb_raise_zerodiv): changed the message (zero to 0).
+
+Sun Jun 28 22:25:07 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_expt): convert to a float when the given power
+	  is a bignum.
+
+	* rational.c (nurat_expt): ditto.
+
+Sun Jun 28 21:16:48 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (sqrt): fixed an issue [ruby-list:45852].
+
+Sun Jun 28 19:48:29 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_expt): some improvements.
+
+	* rational.c (nurat_expt): ditto.
+
+Sun Jun 28 19:03:46 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/instruby.rb (:gem): registers the bundled version
+	  of minitest as a gem as rdoc or rake.
+	  c.f. [ruby-dev:38692].
+
+Sun Jun 28 19:02:07 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry.
+
+	* lib/rubygems/defaults.rb (Gem.default_dir): considers
+	  "--with-rubylibprefix" configure option.
+
+Sun Jun 28 09:21:00 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: renamed some static functions.
+
+	* rational.c: ditto.
+
+Sat Jun 27 19:06:22 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_addsub): new
+
+	* complex.c (nucomp_{add,sub}): use nucomp_addsub.
+
+	* complex.c (nucomp_divide): changed the algorithm.
+
+	* complex.c (nucomp_abs): added shortcuts.
+
+Sat Jun 27 16:56:33 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_cmp): use rb_num_coerce_cmp.
+
+Sat Jun 27 16:45:10 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: revised rdoc.
+
+	* rational.c: ditto.
+
+	* numeric.c: ditto.
+
+Sat Jun 27 13:44:48 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS, lib/rss/maker/base.rb, test/rss/test_maker_2.0.rb: add
+	item.guid.permanent_link? and item.guid.permanent_link=.
+
+Sat Jun 27 13:41:00 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS: rss: 0.2.5 -> 0.2.7.
+
+	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.6 -> 0.2.7.
+
+Sat Jun 27 03:16:56 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_chr): use default_internal encoding as default
+	  destination encoding if set.  [ruby-core:23997]
+
+Sat Jun 27 03:09:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_rewind): need to rewind $. and ARGF.lineno.
+	  [ruby-core:24046]
+
+	* io.c (struct argf): refactoring on $. and ARGF.lineno behavior.
+
+Fri Jun 26 21:48:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (pty_getpty): check dup failure.
+
+Fri Jun 26 17:33:46 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_rubyopt):
+	  test suite add '.' to RUBYLIB.  remove checks.
+
+	* test/ruby/test_require.rb (TestRequire#test_tainted_loadpath):
+	  the default tempdir directory /tmp is world writable, so
+	  SecurityError would be raised.  check removed.
+
+Fri Jun 26 16:32:59 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (COMPILE_PRELUDE): need -I. before -rrbconfig.
+	  [ruby-dev:38714]
+
+Thu Jun 25 18:41:51 2009  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.4.2 r5269.
+	* test/minitest/*.rb: ditto.
+
+Thu Jun 25 17:58:39 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to
+	  set its encoding to ASCII-8BIT.  [ruby-core:24029]
+
+Thu Jun 25 13:04:58 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: '&' in sed s command's replacement is '\&' in ruby.
+	  [ruby-dev:38713]
+
+Thu Jun 25 06:50:23 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_each_codepoint): uninitialized local variable enc.
+
+Thu Jun 25 06:25:49 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (first_i): wrong condition for no argument #first.
+	  [ruby-core:24017]
+
+Wed Jun 24 20:19:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_s_now): new function.  Time.now don't take arguments.
+
+Wed Jun 24 16:08:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/resource.rb: CONFIG["TEENY"] is not ruby's version but API's
+	  one.  So need to use RUBY_VERSION instead.
+
+Wed Jun 24 16:07:04 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb: rbconfig.rb exists at ".".
+
+Wed Jun 24 15:02:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_set_encode): show the erred file name instead of
+	  the file that requires it.  [ruby-core:24006]
+
+Wed Jun 24 11:41:20 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-style.el: It is too late to set c-file-style in
+	  c-mode-hook (at least on Emacs 23).  Call c-set-style instead.
+
+Tue Jun 23 21:28:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_get_path_check): check with given safe level.
+
+	* file.c (rb_find_file_ext_safe, rb_find_file_safe): ditto.
+
+	* safe.c (rb_insecure_operation): function to raise security
+	  error.
+
+Tue Jun 23 20:32:43 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gc.c: remove the definition of GC_DEBUG (debugging macro).
+
+Tue Jun 23 16:16:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ruby_version): defaults revision to 0 when no
+	  revision.h exists.
+
+Tue Jun 23 16:04:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext, rb_find_file): no needs to expand
+	  paths with tilde twice.
+
+	* load.c (rb_f_load): load the given path directly if not found in
+	  load_path.
+
+	* load.c (search_required): search file in specified safe level.
+
+	* load.c (rb_require_safe): path to load is already searched in
+	  search_required().
+
+Tue Jun 23 12:43:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: remove PACKAGE_* macros generated by autotools.
+	  [ruby-core:20938]
+
+Tue Jun 23 01:17:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (process_options): don't specify .so for encdb here.
+	  "." is replaced by "_" in load_encoding.
+
+	* encoding.c (load_encoding): add .so here.
+
+Mon Jun 22 23:24:22 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_generic_ivar_memsize): typo fixed.  a patch from
+	  Kazuhiro NISHIYAMA.  [ruby-dev:38700]
+
+	* ext/objspace/objspace.c (memsize_of): ditto.
+
+Mon Jun 22 21:21:59 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: remove __CHECKER__ test.
+
+	* dir.c: ditto.
+
+	* dln.c: ditto.
+
+	* file.c: ditto.
+
+	* process.c: ditto.
+
+Mon Jun 22 17:15:38 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_each_codepoint): new method.
+	  [ruby-core:23949]
+
+	* ext/stringio/stringio.c (strio_each_codepoint): ditto.
+
+Mon Jun 22 16:26:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): removed "." from load_path.
+
+Mon Jun 22 16:14:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_arguments, iseq_compile_each): internal
+	  arrays must be hidden.  [ruby-dev:38613]
+
+	* vm.c (Init_top_self): ditto.
+
+Mon Jun 22 14:41:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options), enc/prelude.rb: encdb and transdb are
+	  extension libraries.
+
+	* ruby.c (process_options): set progname earlier.
+
+Mon Jun 22 13:50:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_fdatasync): new method IO#fdatasync.
+
+Sun Jun 21 22:33:05 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* load.c (Init_load): $: must be readonly.  [ruby-dev:38690]
+
+	* ruby.c (ruby_prog_init): $-W must be readonly.  [ruby-dev:38691]
+
+Sun Jun 21 10:47:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#copy_file): open with
+	  default umask.  [ruby-core:23952]
+
+Sun Jun 21 10:46:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (enc_arg): default internal encoding may not be set.
+	  [ruby-core:23932]
+
+Sat Jun 20 21:11:43 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c (num_div): don't use num_floor which is actually
+	  flo_floor.
+
+	* numeric.c (num_modulo): don't call '%'.
+
+	* numeric.c (num_divmod): use num_modulo.
+
+	* numeric.c: defined '%'.
+
+	* rational.c (nurat_idiv,nurat_mod,nurat_divmod,nurat_rem): removed.
+
+Sat Jun 20 20:28:44 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: edited rdoc.
+
+	* numeric.c: ditto.
+
+Sat Jun 20 08:56:47 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: edited rdoc.
+
+	* rational.c: ditto.
+
+	* numeric.c: ditto.
+
+Sat Jun 20 07:17:52 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/monitor.rb (MonitorMixin::extend_object): should use
+	  #__send__ instead of #send to avoid possible name conflict.
+	  [ruby-core:23907]
+
+Sat Jun 20 06:56:31 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: edited rdoc.
+
+	* rational.c: ditto.
+
+Sat Jun 20 05:08:59 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: edited rdoc.
+
+	* rational.c: ditto.
+
+Sat Jun 20 04:30:35 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_abs): removed.
+
+Sat Jun 20 03:34:16 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: added rdoc.
+
+Fri Jun 19 23:43:38 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: edited rdoc.
+
+Fri Jun 19 22:58:16 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: edited rdoc.
+
+Fri Jun 19 22:21:17 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: edited rdoc.
+
+Fri Jun 19 21:56:01 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_expt): delegates to complex when self is
+	  negative.  because Float#** does not produce complex.
+
+Fri Jun 19 21:40:58 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: edited rdoc.
+
+	* rational.c: ditto.
+
+Fri Jun 19 20:53:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]
+
+Fri Jun 19 20:44:45 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: constant COMPLEX_NAME has been removed.
+
+	* rational.c: constant RATIONAL_NAME has been removed.
+
+Fri Jun 19 20:39:46 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: added rdoc.  a patch from Run Paint Run Run.
+
+Fri Jun 19 17:04:59 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_cmp): should always return nil for NaN.
+
+	* numeric.c (flo_cmp): handle infinite value specially using
+	  infinite? method internally.  [ruby-dev:38681]
+
+Fri Jun 19 09:28:45 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c (*_numerator,*_denominator): moved to rational.c.
+
+	* rational.c (*_numerator,*_denominator): moved from numeric.c.
+
+Fri Jun 19 08:14:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (big_lshift, big_rshift): return Bignum always without
+	  normalization.  [ruby-dev:38679]
+
+Thu Jun 18 22:31:38 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_s_convert): calls to_r when the given argument
+	  is non-integer.
+
+	* rational.c (nurat_s_convert): raises TypeError when the given
+	  argument is nil.
+
+	* complex.c (nucomp_s_convert): ditto.
+
+Thu Jun 18 20:32:11 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c (num_numerator, num_denominator): use
+	  to_r [ruby-core:23910].
+
+Thu Jun 18 16:21:05 2009  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.4.0 r5083.
+	* test/minitest/*.rb: ditto.
+
+Thu Jun 18 10:12:49 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): went infinity too
+	  early.  add BASE_FIG margin.  [ruby-dev:38673]
+
+Thu Jun 18 01:35:51 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_cmp): Infinity is greater than any bignum
+	  number.  [ruby-dev:38672]
+
+	* bignum.c (rb_big_cmp): ditto.
+
+Thu Jun 18 01:29:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): drive letter is ascii only.
+	  [ruby-dev:38612]
+
+Thu Jun 18 01:09:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ridir, RI_BASE_NAME): fixed for path expansion.
+	  [ruby-core:23876]
+
+Wed Jun 17 23:46:08 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_coerce): accepts Complex when the imag is
+	  exact zero.
+
+Wed Jun 17 21:25:54 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* bignum.c (rb_big_fdiv): checks whether the given second argument
+	  can be converted to float properly.
+
+	* numeric.c (fix_fdiv): calls rb_big_fdiv when the given second
+	  argument is a bignum.
+
+	* rational.c (nurat_fdiv): should calculate Float(x/y), not
+	  Float(x)/Float(y).
+
+Wed Jun 17 16:57:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* load.c (rb_f_require): RDoc updated.  a patch from Run Paint Run
+	  Run in [ruby-core:23833].
+
+	* load.c (rb_mod_autoload): ditto.  [ruby-core:23835]
+
+Wed Jun 17 14:37:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sample/test.rb (valid_syntax?): skips BOM.  [ruby-dev:38666]
+
+	* test/ruby/test_system.rb (TestSystem#valid_syntax?): ditto.
+
+Wed Jun 17 13:54:18 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/strscan/strscan.c (Init_strscan): remove obsolete
+	  matchedsize method, use matched_size instead.  [ruby-dev:38591]
+
+Wed Jun 17 12:37:37 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on
+	  stack overflows in the signal handler, if sigaltstack is
+	  available.  On stack overflow (and with sigaltstack), the signal
+	  handler is more likely to have room to create an exception
+	  object.  [ruby-core:23813]
+
+Wed Jun 17 08:10:38 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace: added.  objspace library extends some methods to
+	  ObjectSpace module.
+
+Wed Jun 17 08:14:01 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_coerce): accepts Complex instances.
+
+	* rational.c (nurat_coerce): accepts Rational
+	  instances. [ruby-core:23859]
+
+Wed Jun 17 07:36:22 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httputils.rb (parse_form_data): escape boundary of
+	  multipart/form-data when embed in regexp.
+
+Wed Jun 17 07:24:26 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_memsize): added.
+
+	* io.c (rb_io_memsize): added.
+
+	* regcomp.c (onig_memsize): added.
+
+	* string.c (rb_str_memsize): added.
+
+	* transcode.c (rb_transcoding_memsize, rb_econv_memsize): added.
+
+	* variable.c (rb_geneic_ivar_memsize): added.
+
+Wed Jun 17 07:04:33 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_memsize): added.  Use RTypedData instead of RData
+	  for ISeq.
+
+	* vm.c (env_memsize, vm_memsize, thread_memsize): added.  Use
+	  RTypedData instead of RData for Env, VM, Thread.
+
+Wed Jun 17 06:48:28 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* st.c, include/ruby/st.h (st_memsize): added.  This function returns
+	  the memory usage of st_table.
+
+Wed Jun 17 06:19:06 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: New structure RTypedData, added.
+	  This structure includes more explicit type information for
+	  T_DATA objects.  If RData(obj)->dfree is immediate value `1' on
+	  T_DATA object obj, obj is needed to be accessed with RTYPEDDATA(obj)
+	  instead of RDATA(obj).  A RTypedData structure points the structure
+	  rb_typed_data_t.  rb_typed_data_t includes information such as the
+	  type name of this data, mark and free function what RData includes,
+	  and memsize function show how data consuming the memory size.
+	  Note that you do not need any change existing T_DATA objects.
+	  If you use RDataType instead of RData on T_DATA object,
+	  you can specify explicit type information.
+
+	* gc.c (rb_data_typed_object_alloc, rb_objspace_data_type_memsize,
+	  rb_objspace_data_type_name): added.
+
+Wed Jun 17 06:14:23 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix indent.
+
+Wed Jun 17 06:05:03 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_each_objects): New C API, added.
+
+Wed Jun 17 00:31:30 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_argf.rb (TestArgf#test_skip): updated test
+	  according to clarified behavior.
+
+Tue Jun 16 22:47:37 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (fptr_finalize): revert last change.  [ruby-dev:38648]
+
+	* io.c (fptr_finalize): skip close(2) for fd 0,1,2.
+
+Tue Jun 16 20:07:09 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (transcode_restartable0): refix can't build with VC9.
+
+Tue Jun 16 16:09:59 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* parse.y (parser_read_escape, parser_tokadd_escape):
+	  replace scan_oct as ruby_scan_oct.
+
+Tue Jun 16 06:40:31 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (fptr_finalize): should close stdin/stdout/stderr when
+	  closed explicitly.   [ruby-core:23853]
+
+	* io.c (argf_skip): should close only when current_file is available.
+
+Tue Jun 16 01:50:02 2009  Tanaka Akira  <akr@fsij.org>
+
+	* vm_eval.c (rb_call0): refine exception message for hidden objects.
+
+Mon Jun 15 22:35:31 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* bignum.c (rb_big2db): (-Float::MAX.to_i*2).to_f should return
+	  -HUGE_VAL (-Infinity).
+
+Mon Jun 15 18:48:41 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_each_line): should return self.  [ruby-core:23852]
+
+	* io.c (argf_each_byte, argf_each_char): ditto.
+
+Mon Jun 15 17:48:42 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (os_obj_of): invoke garbage collection before iteration, to
+	  avoid accessing half recycled object references.  [ruby-dev:38613]
+
+Mon Jun 15 11:04:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (rp, iseq): load dummy_gdb_enums on demand.
+	  [ruby-dev:38606]
+
+Sun Jun 14 14:57:57 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, vm_eval.c: add Thread.backtrace.
+
+	* test/ruby/test_thread.rb: add a test.
+
+Sun Jun 14 13:58:32 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* transcode.c (transcode_restartable0): revert last commit because
+	  this change cause SEGV at test-all.
+
+Sun Jun 14 10:49:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext, rb_find_file): canonicalize absolute
+	  paths.  [ruby-core:23845]
+
+	* file.c (rb_file_size): added rdoc.  a patch from Run Paint Run
+	  Run at [ruby-core:23839].
+
+Sun Jun 14 07:53:26 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_fdiv): use fdiv recursively.
+
+	* complex.c (nucomp_expt): reduced code.
+
+Sun Jun 14 03:37:09 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf8_mac.trans: remove wrong optimization.
+
+Sun Jun 14 01:53:00 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (transcode_restartable0): can't build with VC9.
+
+Sun Jun 14 01:23:41 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_to_f): use fdiv.
+
+Sat Jun 13 15:03:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_lock): show backtrace at circular require.
+
+	* load.c (rb_provide): assumes us-ascii only.
+
+	* load.c (rb_require_safe): FilePathValue() implies rb_str_new4().
+
+	* load.c (rb_mod_autoload): try conversion to path like as
+	  require.  [ruby-core:23834]
+
+Sat Jun 13 09:58:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_ivar): should not set internal encoding ivar as an
+	  ordinary ivar.  [ruby-dev:38596]
+
+Sat Jun 13 07:08:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_local_variables): now returns symbols.  a patch from
+	  Run Paint Run Run at [ruby-core:23828].
+
+Sat Jun 13 07:06:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_catch): updated rdoc about generalized argument,
+	  and the case without arguments.  [ruby-core:23827]
+
+Sat Jun 13 06:50:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is
+	  obsolete, use Timeout::Error instead.  [ruby-core:23821]
+
+Sat Jun 13 06:45:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_throw): fixed rdoc about exception.
+	  [ruby-core:23824]
+
+Fri Jun 12 14:56:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): associate the input encoding when
+	  copying an absolute path.  [ruby-dev:38594]
+
+Fri Jun 12 02:41:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_replace_shared): shared target must be frozen.
+	  [ruby-core:23727]
+
+Thu Jun 11 21:05:09 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (exp): omitted redundant function call.
+
+Thu Jun 11 17:49:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (gfCheckVal): never used.
+
+	* ext/bigdecimal/bigdecimal.c (VpInit): fixed format modifiers.
+
+	* ext/bigdecimal/bigdecimal.c (VPrint): constified.
+
+Thu Jun 11 15:27:17 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/prime.rb: documentation typo fixed.  a patch from okkez.
+	  [ruby-dev:38586]
+
+Wed Jun 10 18:15:17 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (dir_s_getwd): directory path's encoding should be filesystem's
+	  one.
+
+	* lib/tmpdir.rb: ditto (but not finished yet.)
+
+Wed Jun 10 06:28:15 2009  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*: Upgrade to RubyGems 1.3.4 r2223.
+
+Tue Jun  9 22:38:09 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (log10): raised exception when the given number is
+	  a negative real.
+
+Tue Jun  9 15:13:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_s_glob): fixed rdoc.  a patch from Joseph Pecoraro a
+	  [ruby-core:23767].
+
+	* dir.c (sys_warning): get rid of type-punning function cast.
+
+	* dir.c (ruby_glob0): get rid of possible overflow.
+
+Tue Jun  9 10:58:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (RMALL): need for distclean-rdoc.
+
+Tue Jun  9 01:07:33 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: rename functions which require a parameter
+	  "rb_thread_t *", the prefix to be rb_threadptr_ instead of
+	  rb_thread_.
+
+	* thread.c (rb_thread_add_event_hook(), rb_thread_remove_event_hook):
+	  change the parameter type from rb_thread_t * to VALUE.
+
+	* eval.c, eval_error.c, eval_intern.h, signal.c, vm_core.h, vm_eval.c:
+	  ditto.
+
+	* include/ruby/intern.h: remove decl of rb_thread_signal_raise() and
+	  rb_thread_signal_exit().
+
+Mon Jun  8 05:07:41 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): print fatal error
+	  message to stderr instead of using rb_bug().
+
+	* KNOWNBUGS.rb, bootstraptest/test_fork.rb: move a fixed test.
+
+Sun Jun  7 22:44:20 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (log): avoided redundant expression.
+
+Sat Jun  6 02:49:05 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_reject_bang): always check frozen status.
+	  [ruby-core:23715]
+
+	* hash.c (rb_hash_update): ditto.
+
+	* hash.c (rb_hash_reject_bang): call rb_hash_foreach() directly.
+
+	* hash.c (rb_hash_update_i): call st_insert() directly.
+
+	* hash.c (rb_hash_update_block_i): ditto.
+
+Fri Jun  5 07:12:32 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mkmf.rb (#link_command): should dup CONFTEST_C which is
+	  frozen.  ref  [ruby-core:23675].  [ruby-core:23702]
+
+Thu Jun  4 02:25:51 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/base64.rb: typo fixed.  a patch from okkez.   [ruby-dev:38564]
+
+Wed Jun  3 09:03:23 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_first): should check negative length.
+
+Tue Jun  2 17:32:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (first_i): Enumerator#first should consume only what is
+	  needed.   a patch from Marc-Andre Lafortune.  [ruby-core:23661]
+
+	* enum.c (enum_first): call to_int once for an argument.  based on
+	  a patch from Marc-Andre Lafortune.
+
+Tue Jun  2 13:27:21 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ripper/test_filter.rb: add tests. see [ruby-dev:37856]
+
+Tue Jun  2 07:44:43 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_gsub_bang): modify check at the beginning.
+	  [ruby-core:23662]  ref [ruby-core:23657]
+
+	* string.c (rb_str_rstrip_bang): ditto.  [ruby-core:23657]
+
+	* string.c (rb_str_chop_bang): ditto.
+
+	* string.c (rb_str_chomp_bang): ditto.
+
+	* string.c (rb_str_reverse_bang): modify check added.  [ruby-core:23671]
+
+Mon Jun  1 11:21:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_capture, fiber_store): reraise transferred error.
+
+	* cont.c (fiber_switch): transfers dead fiber error to the previous
+	  or root fiber if the current fiber is dead.  [ruby-core:23651]
+
+Mon Jun  1 10:41:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_exc_new2): optimization for literal.
+
+Mon Jun  1 07:20:02 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): returns Inf if
+	  exp is bigger than DBL_MANT_DIG.
+
+Sun May 31 23:28:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): checks for duplication of source
+	  files.
+
+Sun May 31 23:26:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (istrailinggarbage): fixed typo.
+
+Fri May 29 17:10:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (Init_Struct): made #to_s an alias to #inspect to
+	  reduce the result of recursive struct.  a patch from ujihisa a
+	  [ruby-dev:38554].
+
+Fri May 29 17:08:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (Init_Hash): made #to_s an alias to #inspect to reduce
+	  the result of recursive hash.  a patch from ujihisa a
+	  [ruby-core:23601].  [ruby-dev:38555]
+
+Fri May 29 09:30:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (collect_all): checks interrupts.  [ruby-core:23594]
+
+Thu May 28 07:39:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (THREAD_MODEL): reject unknown value and checks
+	  pthread.h only when pthread.  [ruby-core:23577]
+
+Thu May 28 03:47:46 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/optparse/opttest.rb: typo fixed.  [ruby-dev:38544]
+
+Thu May 28 03:43:10 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_strftime): update RDoc according to info from
+	  Marc-Andre Lafortune in [ruby-core:23575].  [ruby-core:23564]
+
+Thu May 28 02:40:54 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/uri: don't set @parser if it is DEFAULT_PARSER for marshaling
+	  URI objects between Ruby 1.8 and Ruby 1.9.
+	  [ruby-dev:38377]
+
+Wed May 27 23:00:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (struct parser_params): lex_gets_ptr should be long.
+
+Wed May 27 18:00:15 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigand_int): new function to calculate bignum and
+	  fixnum without allocating internal bignum.
+
+	* bignum.c (bigor_int): ditto.
+
+	* bignum.c (bigxor_int): ditto.
+
+	* bignum.c (bigand_int): even less object allocation.
+
+Wed May 27 14:29:55 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_encoding): more compact encoding information for
+	  US-ASCII and UTF-8.  [incompatible] [experimental]
+
+	* marshal.c (r_ivar): restore :E encoding information.
+
+Wed May 27 14:08:39 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (st_insert2): new function with processing new key,
+	  e.g. copy.
+
+	* hash.c (rb_hash_aset): use st_insert2() to reduce redundant
+	  st_lookup calls.
+
+Wed May 27 02:31:38 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_getc): the function for
+	  rl_getc_function must be a byte function.
+	  so use getbyte method. [ruby-dev:38535]
+
+Tue May 26 14:24:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c: fixed types.
+
+	* common.mk (bignum.o, numeric.o): depend on util.h.
+
+	* bignum.c, marshal.c: fixed types.
+
+	* numeric.c (infinite_value): use ruby_div0.
+
+	* include/ruby/util.h (ruby_div0): moved from marshal.c.
+
+Tue May 26 11:01:41 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* lib/mkmf.rb: use map! to replace strings in $objs array.
+
+Tue May 26 10:12:08 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bignew_1): inline memory allocation.
+
+	* bignum.c (bigtrunc): call rb_big_resize() only when needed.
+
+	* bignum.c (bigfixize): declare inline.
+
+Tue May 26 05:39:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (FilePathValue): prevent from GC.
+
+	* include/ruby/ruby.h (NUM2LONG): added GCC specific optimization.
+
+Tue May 26 03:41:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (rb_gmtime, rb_localtime): gmtime and localtime return
+	  NULL on error.  [ruby-core:23551]
+
+Tue May 26 03:38:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char, rb_str_each_codepoint): string
+	  length must be long.
+
+Mon May 25 13:27:32 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* lib/mkmf.rb: dont use gsub! method for frozen string.
+
+Mon May 25 11:47:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb, tool/instruby.rb: removed redundant code.
+
+Mon May 25 09:34:09 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_hash): avoid calling rb_enc_str_asciionly_p().
+
+	* string.c (rb_str_replace): avoid redundant calling rb_str_new4().
+
+	* string.c (str_replace): factor out replacement from
+	  rb_str_replace() without type check nor discarding the
+	  destination contents.
+
+Mon May 25 08:06:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_partition): should use the converted result.  a
+	  patch from Marc-Andre Lafortune at [ruby-core:23540].
+
+	* string.c (rb_str_rpartition): ditto.
+
+Mon May 25 06:25:38 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
+	  are handled properly now. ref: [ruby-core:23402]
+
+	* test/ruby/test_m17n.rb (TestM17N#test_sprintf_p): test fixed
+
+Mon May 25 05:32:19 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::HTTP_STATUS): typo fixed.  a patch from
+	  Nobuhiro IMAI.  [ruby-dev:38538]
+
+Sun May 24 22:48:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_exec_recursive_paired): new function for proper
+	  handling of recursive arrays.  [EXPERIMENTAL] [ruby-core:23402]
+
+	* array.c (rb_ary_equal, rb_ary_eql, rb_ary_cmp): use above.
+
+	* hash.c (hash_equal): ditto.
+
+Sun May 24 22:39:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (syserr_initialize): errno is int.
+
+Sun May 24 00:52:54 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in ($ridir): new configuration. [ruby-core:23520].
+	  c.f. [ruby-core:23519].
+
+	  (--with-ridir): new configure option.
+
+	* tool/instruby.rb (:doc, :rdoc): uses $ridir instead of
+	  a fixed path.
+
+	* lib/rdoc/ri/paths.rb: follows $ridir.
+
+	* Makefile.in: removes RIDATADIR which is no longer used.
+
+	* bcc32/Makefile.sub: generates the 'ridir' entry for RbConfig.
+	  removes RIDATADIR which is no longer used.
+
+	* win32/Makefile.sub: ditto.
+
+Sat May 23 23:52:33 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_each_char): return original string.
+	  [ruby-core:23499]
+
+	* string.c (rb_str_each_codepoint): protect string from
+	  modification.
+
+Sat May 23 21:48:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/handle.c (rb_dlhandle_s_sym): added a method to access
+	  using RTLD_NEXT.  [ruby-dev:38152]
+
+	* ext/dl/handle.c (Init_dlhandle): added constants DEFAULT and
+	  NEXT which correspond to RTLD_DEFAULT and RTLD_NEXT.
+
+Sat May 23 18:53:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/lib/dl/cparser.rb (DL::CParser#parse_struct_signature):
+	  splitting with regexp source string is obsolete.  a patch from
+	  Minwoo Lee at [ruby-core:23494].
+
+	* ext/dl/cptr.c (rb_dlptr_cmp): return signed value, and restrict
+	  to Fixnum.  [ruby-dev:38533]
+
+Fri May 22 23:22:53 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* missing/vsnprintf.c (errno): [BUG] fixes a compilation
+	  error on SIZEOF_LONG > SIZEOF_INT.
+	  (BSD_vfprintf): ditto.
+
+Fri May 22 23:20:48 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/default.mspec: follows runruby.rb's move at r23542.
+
+Fri May 22 21:38:55 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* NEWS: add Time#to_r.
+
+Fri May 22 20:29:01 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* config.guess: moved into tool/.
+
+	* config.sub: ditto.
+
+	* install-sh: ditto
+
+	* configure.in: follows the moves.
+
+	* LEGAL: ditto.
+
+Fri May 22 20:10:18 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* instruby.rb: moved into tool/.
+
+	* mkconfig.rb: ditto.
+
+	* rubytest.rb: ditto.
+
+	* runruby.rb: ditto.
+
+	* common.mk: follows the moves.
+
+	* configure.in: ditto.
+
+	* win32/Makefile.sub: ditto.
+
+Fri May 22 05:09:43 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_slice_bang): avoid call of rb_scan_args() unless
+	  it's really necessary.
+
+Thu May 21 22:17:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl, id.h (enum ruby_method_ids): added some IDs.
+
+	* debug.c (dummy_gdb_enums): added enum ruby_method_ids.
+
+	* .gdbinit (rp): improved output of Symbol.
+
+Thu May 21 21:07:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/vsnprintf.c (BSD_vfprintf): support for 'z' modifier.
+
+Thu May 21 18:55:33 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* gem_prelude.rb (Gem.default_dir and misc.): use rubylibprefix.
+	  follows the change in r23368.
+
+Thu May 21 12:07:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_EVENT_HOOKS_HAVE_CALLBACK_DATA):
+	  new macro for compatibility check.
+
+Thu May 21 01:43:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_long2int, RARRAY_LENINT): check long to
+	  cast to int.  [ruby-dev:38508]
+
+	* struct.c, vm_eval.c, vm_insnhelper.c: use RARRAY_LENINT.
+
+Wed May 20 21:00:27 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* rb_enc_get_index: allows an arbitrary RData as the argument but not
+	  only what points a rb_encoding.
+
+Wed May 20 20:54:37 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/.gitignore: ignores rubyspec/ and mspec/.
+
+Wed May 20 19:41:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (rb_struct_new): get rid of too large alloca.
+
+	* struct.c (rb_struct_hash): use long.
+
+Wed May 20 18:58:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c, vm_insnhelper.c: argument number is restricted to
+	  int, and fixed overflow.
+
+Wed May 20 18:34:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (zip_ary): should use long.
+
+	* enumerator.c (inspect_enumerator): should use long.
+
+Wed May 20 09:18:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_count): optimized for 1byte string count by
+	  avoiding tr_setup_table().
+
+Wed May 20 06:25:29 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_fast_mbclen): faster mbclen for strings known
+	  to be valid.
+
+	* string.c (enc_strlen): coderange specified version of
+	  rb_enc_strlen().  use rb_enc_fast_mbclen() if coderange is 7bit
+	  or valid.
+
+	* string.c (str_gsub): use rb_enc_fast_mbclen().
+
+	* string.c (rb_str_reverse, rb_str_split_m, rb_str_each_char,
+	  scan_once): ditto.
+
+Wed May 20 06:20:05 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#unlink): close first for Windows.  a
+	  patch from Florian Frank.  [ruby-core:23505]
+
+Wed May 20 00:13:38 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_codepoint_len): combine rb_enc_codepoint()
+	  and rb_enc_codelen() in one function to reduce calls.
+
+	* encoding.c (rb_enc_codepoint): compatibility function.
+
+	* sprintf.c (rb_str_format): use rb_enc_codepoint_len().
+
+	* string.c (rb_str_inspect, rb_str_upcase_bang,
+	  rb_str_downcase_bang, rb_str_capitalize_bang,
+	  rb_str_swapcase_bang, trnext, tr_trans, rb_str_delete_bang,
+	  rb_str_squeeze_bang, rb_str_count, rb_str_split_m,
+	  rb_str_each_line, rb_str_each_codepoint, rb_str_lstrip_bang,
+	  sym_printable): ditto.
+
+	* transcode.c (make_econv_exception): use rb_enc_mbc_to_codepoint()
+
+Wed May 20 00:05:52 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_method.c (rb_attr): should preserve encoding info.
+	  [ruby-dev:38498]
+
+Tue May 19 22:54:35 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* time.c (time_minus): always return a Float.  [ruby-dev:38446]
+
+	* time.c (time_to_r): new method.  [ruby-dev:38461]
+
+Tue May 19 13:59:35 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (clone_method): add cast to remove warning from
+	  rb_gc_write_barrier().
+
+Tue May 19 13:54:15 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (struct_ivar_get): new function to avoid repeated
+	  rb_intern() calls.
+
+	* struct.c (rb_struct_iv_get): use struct_ivar_get()
+
+	* struct.c (num_members): ditto.
+
+	* struct.c (rb_struct_s_members): ditto.
+
+	* class.c (rb_singleton_class): cache symbol to reduce calls to
+	  rb_intern().
+
+Tue May 19 07:52:05 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_time.rb: make tests timezone independent.
+	  reported by zunda.  [ruby-dev:38492]
+
+Mon May 18 21:40:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb (Pathname#sub): suppress a warning.  [ruby-dev:38488]
+
+Sun May 17 23:23:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (SRC_EXT): should be flat.
+	  http://twitter.com/_tad_/status/1825862632
+
+Sun May 17 23:05:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): VARIABLE_LIBPATH is always
+	  defined, see its value instead.
+
+Sun May 17 18:59:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (nd_line): NODE_LMASK is not needed.
+
+	* node.h (NOEX_SAFE): made int.
+
+Sun May 17 14:23:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (rb_parse_in_eval): returns true in true eval, not in
+	  main.  [ruby-dev:38382]
+
+	* parse.y (program): inherits dvars in eval or main.
+
+Sun May 17 14:02:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_script): sets also VM toplevel program name.
+
+	* ruby.c (process_options): no longer needs additional frame.
+
+	* vm.c (rb_vm_get_sourceline): should not access out of bound.
+
+Sun May 17 09:47:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (cmdline_options_init): initialize encodings.
+
+	* ruby.c (add_modules, require_libraries, process_sflag):
+
+	* ruby.c (process_sflag): not process twice.
+
+	* ruby.c (moreswitches): get rid of possible overflow.
+
+Sun May 17 09:31:05 2009  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (foletypelib_name): should return
+	  encoded name corresponding to WIN32OLE.codepage.
+
+Sun May 17 09:02:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): support for cygwin 1.7.  see
+	  [ruby-core:23241].
+	  gets rid of possible buffer overflow with realpath().
+
+	* ruby.c (set_arg0): get rids of overrun.
+
+Sat May 16 18:38:32 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb: add nil check.
+
+Sat May 16 18:36:01 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_maker_atom_feed.rb: suppress warnings.
+
+Sat May 16 18:33:15 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS: add RSS::Maker.supported?(version).
+
+Sat May 16 18:26:42 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb, test/test_parser_1.0.rb: fix foaf:Image
+	element causes parse error even if ignore_unknown_element mode.
+
+Sat May 16 18:14:19 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker.rb, lib/rss/maker/0.9.rb,
+	test/test_maker_*.rb: add RSS::Maker.supported?
+
+Sat May 16 18:12:39 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/content/*, lib/rss/dublincore/*: fix circular require.
+	* test/test_maker_atom_feed.rb,
+	test/test_maker_atom_entry.rb: suppress warnings.
+
+Sat May 16 18:07:17 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb:
+	remove needless codes.
+
+Sat May 16 18:05:07 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/entry.rb: fix a typo.
+
+Sat May 16 18:02:57 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/feed.rb, test/test_maker_atom_entry.rb,
+	test/test_maker_atom_feed.rb: fix duplicated dc:date.
+	Reported by Kazuhiro NISHIYAMA. Thanks!!! [ruby-list:46014]
+
+Sat May 16 18:02:16 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb, lib/rss/maker/1.0.rb, lib/rss/maker/feed.rb,
+	test/rss/test_maker_1.0.rb, test/rss/test_maker_atom_feed.rb:
+	RSS 1.0 and Atom feed maker treat maker.channel.language as
+	maker.channel.dc_language.
+
+Sat May 16 17:57:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/lib/dl/callback.rb (DL#remove_callback_internal): ignore
+	  unbound function.  [ruby-dev:38474]
+
+Sat May 16 17:51:11 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/rss_recent.rb, sample/rss/list_description.rb: use
+	UTF-8.
+
+Sat May 16 17:47:55 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
+	0.2.5 -> 0.2.6.
+
+Sat May 16 17:26:04 2009  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* iseq.c (rb_iseq_clone): use longlife object and insert write barrier.
+
+	* vm_insnhelper.c (vm_cref_push): ditto.
+
+	* vm_insnhelper.h (COPY_CREF): insert write barrier.
+
+Sat May 16 13:49:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_autoload_load): gets rid of false warning.
+	  [ruby-core:23466]
+
+Sat May 16 10:59:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/drb/dhasenc.rb: add magic comment for encoding.
+
+	* sample/mine.rb: ditto.
+
+	* ext/tk/sample/tcltklib/sample1.rb: ditto.
+
+Sat May 16 09:49:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (magic_comment_encoding): ignores unused emacs-style
+	  encoding comment, as like Vim styles.  [ruby-core:23470]
+
+Sat May 16 09:30:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defs/keywords (reserved_word): made inline function static.
+	  [ruby-core:23210]
+
+	* parse.y (rb_reserved_word): ordinary function for ripper.
+
+Sat May 16 09:19:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (magic_comment_encoding): use rb_compile_warning() to
+	  show the currently parsing file name.  [ruby-core:23469]
+
+Sat May 16 09:03:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ruby_version): now version.h includes
+	  include/ruby/version.h, so need to tell to cpp to see
+	  $(srcdir)/include.  [ruby-core:23468]
+
+Fri May 15 17:35:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_shift, rb_ary_shift_m): clears unused elements.
+	  [ruby-dev:38448]
+
+Fri May 15 15:15:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_autoload_load): checks if iv_tbl is valid.
+	  [ruby-dev:38456]
+
+Fri May 15 11:17:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak (-version-): now version.h includes
+	  include/ruby/version.h, so need to tell to cpp to check
+	  $(srcdir)/include.
+	  reported by KIMURA Koichi at http://www.kt.rim.or.jp/%7ekbk/zakkicho/09/zakkicho0905b.html#D20090514-6
+
+Thu May 14 16:13:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getpwuid): use rb_uid_t.  [ruby-dev:38443]
+
+	* ext/stringio/stringio.c (strio_ungetbyte): encoding should no
+	  be effective.
+
+Thu May 14 10:17:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sample/test.rb (valid_syntax?): defaults to us-ascii.
+
+Wed May 13 22:34:31 2009  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c: add longlife garbage collection. [ruby-dev:38423]
+	  (NORMAL_HEAPS_USED): new macro.
+	  (LONGLIFE_ALLOCATE_HEAPS_MIN): ditto.
+	  (add_longlife_heaps_slot): new function.
+	  (rb_newobj_from_longlife_heap): ditto.
+	  (rb_newobj_longlife): ditto.
+	  (rb_node_newnode_longlife): ditto.
+	  (rb_gc_write_barrier): ditto.
+	  (remembered_set_recycle): ditto.
+	  (rb_gc_mark_remembered_set): ditto.
+	  (clear_mark_longlife_heaps): ditto.
+	  (gc_sweep_for_longlife): ditto.
+	  (assign_heap_slot): new argument to longlife heaps slot.
+	  (add_freelist): ditto.
+	  (gc_sweep): avoid longlife heap slot. set longlife_collection
+	  flag at add heap.
+	  (rb_gc_force_recycle): avoid mark object and remembered_set
+	  object.
+	  (garbage_collect): add longlife collection.
+	  (rb_gc_start): invoke longlife collection.
+	  (gc_profile_record_get): for longlife collection profile.
+	  (gc_profile_result): ditto.
+
+	* include/ruby/intern.h (rb_gc_write_barrier): declared.
+
+	* include/ruby/ruby.h (FL_REMEMBERED_SET): renamed from FL_RESERVED.
+
+	* debug.c (FL_REMEMBERED_SET): ditto.
+
+	* insns.def (setinlinecache): insert write barrier.
+
+	* vm_insnhelper.c (vm_method_search): ditto.
+
+	* set_relation (set_relation): use longlife object.
+
+	* vm.c (vm_define_method): ditto.
+
+	* vm_core.h (NEW_INLINE_CACHE_ENTRY): ditto.
+
+	* vm_method.c (rb_add_method): ditto.
+
+	* class.c (rb_add_method): ditto.
+
+	* node.h (NEW_NODE_LONGLIFE): new macro.
+	  (rb_node_newnode_longlife): declared.
+
+Wed May 13 15:23:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/version.h: extracted the extensions interface and
+	  the never-changeable info.
+
+Wed May 13 03:20:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_init_1): unused variable removed.
+
+Tue May 12 21:03:02 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: support fixed UTC offset.  [ruby-dev:38326]
+	  (leap_year_v_p): new macro.
+	  (TIME_FIXOFF_P): new macro.
+	  (TIME_SET_FIXOFF): new macro.
+	  (time_init_0): renamed from time_init.
+	  (time_set_utc_offset): new function.
+	  (vtm_add_offset): new function.
+	  (utc_offset_arg): new function.
+	  (time_init_1): new function.
+	  (time_init): call time_init_0 or time_init_1 according argc.
+	  (validate_utc_offset): new function.
+	  (time_localtime_m): new function.
+	  (time_fixoff): new function.
+	  (time_getlocaltime): take optional UTC offset argument.
+	  (time_get_tm): support fixed UTC offset time.
+	  (Init_Time): make Time#{initialize,localtime,getlocal} varargs.
+
+	* strftime.c (rb_strftime): vtm->zone can be NULL now.
+
+Tue May 12 18:23:40 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* yarvtest: removed because it's outdated.
+
+Mon May 11 21:46:20 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: add semicolons to some grammar rules not terminated
+	  with them.  a patch from Dave B in [ruby-core:23422].
+
+Mon May 11 20:08:33 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* io.c (Init_IO): add constant File::NOATIME.  [ruby-core:23194]
+
+Mon May 11 13:08:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb (rubylibdir): use rubylibprefix.  [ruby-dev:38426]
+
+Mon May 11 08:37:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): support
+	   coercing into Rational.   [ruby-core:23415]
+
+Mon May 11 04:39:45 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP#check_auth_args): should not change
+	  number of methods for the sake of compatibility.
+
+Sun May 10 11:36:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_instance_p): new function to check if
+	  the argument is an instance of DL::CFunc.
+
+	* ext/dl/cptr.c (rb_dlptr_initialize, rb_dlptr_s_malloc): checks
+	  if DL::CFunc.  [ruby-dev:38403].
+
+	* ext/dl/lib/dl/cparser.rb (DL::CParser#parse_signature): strips
+	  spaces.  based on a patch from Takashi Tamura in [ruby-dev:38398].
+
+	* ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): block must be
+	  given if arg is not bound.  [ruby-dev:38404]
+
+	* ext/dl/cfunc.c (rb_dlcfunc_instance_p): new function to check if
+	  the argument is an instance of DL::CFunc.
+
+Sat May  9 19:57:00 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_float.rb (TestFloat#test_sleep_with_Float): add a
+	  test. see [ruby-core:23282]
+
+Sat May  9 19:23:46 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: use subsec instead of nsec.
+
+Sat May  9 12:19:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c: 3rd argument of rb_hash_foreach() is VALUE.
+
+	* hash.c (rb_any_hash, recursive_hash): use VALUE for hash.
+
+Sat May  9 11:14:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4.  a patch
+	  from Alexey Froloff in [ruby-core:23398].  [ruby-core:22924]
+
+Fri May  8 19:38:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_link0): removes waste dSYM directories left
+	  when debug and universal-binary are enabled.
+
+	* lib/mkmf.rb (check_sizeof): fixed wrong recurring result for
+	  intrinsic types.
+
+Fri May  8 10:14:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, configure.in, win32/Makefile.sub (RUBY_BASE_NAME):
+	  program base name.  [ruby-dev:38241]
+
+	* configure.in (--with-soname): base name of shared library.
+	  [ruby-dev:38290]
+
+Fri May  8 10:07:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_flatten_bang): clears temporary array.
+
+Fri May  8 02:30:14 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (SortedSet#add): Do not require each newly added
+	  element to be Comparable but to respond to <=>. [ruby-dev:38371]
+
+Thu May  7 21:42:51 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rubyoptions.rb (test_indentation_check): add a test
+	  for indentation check.  [ruby-dev:38382]
+
+Thu May  7 16:40:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_flatten_bang): returns nil if nothing changed.
+	  a patch from Marc-Andre Lafortune in [ruby-core:23382].
+
+Thu May  7 14:26:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sample): negative sample number is invalid.
+	  [ruby-core:23374]
+
+Thu May  7 14:16:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c, include/ruby/encoding.h: fixed types.
+
+	* include/ruby/encoding.h (rb_enc_nth): long is used for index.
+
+Thu May  7 14:01:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (r_le): fixed types.
+
+	* range.c (range_eql): fixed rdoc.
+
+Thu May  7 13:10:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): should be rb_pid_t.
+
+Wed May  6 16:50:20 2009  Tanaka Akira  <akr@fsij.org>
+
+	* math.c (math_gamma): use a table for positive small integers.
+
+Wed May  6 09:27:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.ja: code for THINK_C does not exist already.  [Bug #1435]
+
+Wed May  6 05:33:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CFLAGS, CXXFLAGS): strips extra spaces.
+
+Tue May  5 11:29:07 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/ifchange: Fix: arguments which begin with minus sign may
+	  parsed as options.  Because of older systems, don't use --
+	  but use parentheses.
+
+Tue May  5 10:42:28 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Update to JSON 1.1.4.
+
+Tue May  5 07:22:37 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c: NOMAP is now multibyte direct map.
+
+	* transcode.c: remove ASIS.
+
+	* transcode_data.h: ditto.
+
+	* tool/transcode-tb (ActionMap#generate_info): remove :asis.
+
+	* tool/transcode-tb (ActionMap#generate_info): add :nomap0.
+
+	* enc/trans/utf8_mac.trans: replace :asis by :nomap0.
+
+Sat May  2 22:53:02 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (SortedSet): Fix document. [Bug #1429]
+
+Sat May  2 10:34:29 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf8_mac-tbl.rb: don't use Unicode escape.
+
+	* enc/trans/utf8_mac.trans: follow above.
+
+Sat May  2 09:19:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (Init_Array): made #to_s an alias to #inspect to reduce
+	  the result of recursive array.  a patch from ujihisa at
+	  [ruby-dev:38362]
+
+Fri May  1 16:50:05 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#merge): Only directly use the passed objects
+	  @hash instance variable when self and the passed object are
+	  instances of the same class. [Bug #118]
+
+Fri May  1 16:44:11 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (SortedSet#add): Do not let an incomparable object
+	  in. [Bug #118]
+
+Fri May  1 13:18:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (_longjmp): never return.  see [ruby-core:23241]
+
+Fri May  1 01:31:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/extmk.rb: use RbConfig instead of Config.
+
+	* instruby.rb: ditto.
+
+	* lib/rubygems.rb: ditto.
+
+	* test/rubygems/test_config.rb: ditto.
+
+Thu Apr 30 21:23:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG.
+
+	* spec/default.mspec: ditto.
+
+	* yarvtest/yarvtest.rb: ditto.
+
+	* instruby.rb: ditto.
+
+	* benchmark/report.rb: ditto.
+
+	* benchmark/runc.rb: ditto.
+
+	* tool/eval.rb: ditto.
+
+	* test/rubygems/test_gem.rb: ditto.
+
+	* test/rubygems/test_config.rb: ditto.
+
+	* test/rubygems/test_gem_platform.rb: ditto.
+
+Thu Apr 30 18:18:13 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/http.rb: documentation typo fixed.  [ruby-core:23335]
+
+Thu Apr 30 15:27:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/utf8_mac.trans: get rid of a 1.9 feature for cross
+	  compile.
+
+Thu Apr 30 11:35:30 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encoding): Change filesystem_encoding of
+	  Mac OS X to UTF-8.
+
+Wed Apr 29 21:23:40 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/iso_2022_jp.h: add CP50221.
+
+	* enc/trans/iso2022.trans: add converter for CP50221.
+
+Wed Apr 29 15:22:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_join): recursive array has no meaning as path
+	  name.  [ruby-core:23329]
+
+Tue Apr 28 19:09:45 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/test_timeout.rb (TestTimeout#test_timeout): add a test.
+
+Tue Apr 28 07:13:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pp.rb (Struct#pretty_print): coerce to a string since
+	  anonymous class has name no longer.  [ruby-dev:38349]
+
+Mon Apr 27 16:47:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ruby_version): uses sed instead of grep if the
+	  result is need, to get rid of GREP_OPTIONS.  [ruby-dev:38336]
+
+Mon Apr 27 01:25:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_getc): use rl_getc_function if
+	  possible, to get rid of hang up at EOF without a newline.
+
+Sun Apr 26 23:19:32 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf8_mac.trans: Add converter for UTF8-MAC.
+
+	* enc/trans/utf8_mac-tbl.rb: ditto.
+
+	* test/ruby/test_econv.rb: tests for above.
+
+Sun Apr 26 22:17:02 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/transcode-tb (ActionMap#each_firstbyte):
+	  if :asis collides other mappings, use another.
+
+	* tool/transcode-tb (ActionMap#generate_info):
+	  add :asis for ASIS.
+
+Sun Apr 26 21:59:43 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (ASIS): added for multi byte direct map.
+
+	* transcode.c (transcode_restartable0): ditto.
+
+Sun Apr 26 20:33:12 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/transcode-tb (ActionMap#generate_node):
+	  Use ActionMap#gennode instead of generate_node
+	  because of initialization.
+
+Sun Apr 26 20:21:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .gitignore: added.
+
+Sun Apr 26 20:17:24 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rake.rb: use RbConfig::CONFIG instead of Config::CONFIG.
+
+	* lib/rbconfig/datadir.rb: ditto.
+
+Sun Apr 26 19:30:29 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_arg): unused variable removed.
+
+Sun Apr 26 18:35:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_reopen): keeps pathv for prep_stdio.  [ruby-dev:38131]
+
+Sun Apr 26 15:13:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#parse_in_order): do not make an
+	  option from non-option argument.  [ruby-dev:38333]
+
+Sat Apr 25 19:11:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_daemon): use daemon(3) only on *BSD.
+
+	* process.c (proc_daemon): double fork to ensure not having ctty.
+	  [ruby-core:23305]
+
+Sat Apr 25 16:19:48 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (month_arg): extracted from time_arg.
+	  (validate_vtm): ditto.
+
+Sat Apr 25 16:03:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (TIME_COPY_GMT): new macro.
+	  (time_s_at): use TIME_COPY_GMT.
+	  (time_succ): ditto.
+
+Sat Apr 25 15:54:04 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_mload): use TIME_SET_UTC.
+
+Sat Apr 25 15:47:54 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_get_tm): take time_object instead of gmt.
+
+Sat Apr 25 15:39:44 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_succ): refactored to avoid gmt variable.
+	  (strftimev): use TIME_UTC_P.
+	  (time_strftime): ditto.
+
+Sat Apr 25 15:21:33 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (TIME_UTC_P): new macro.
+	  (TIME_SET_UTC): ditto.
+	  (TIME_LOCALTIME_P): ditto.
+	  (TIME_SET_LOCALTIME): ditto.
+	  (time_utc_p): use the above macro.
+	  (time_localtime): ditto.
+	  (time_localtime): ditto.
+	  (time_gmtime): ditto.
+	  (time_to_s): ditto.
+	  (time_add): ditto.
+	  (time_sec): ditto.
+	  (time_min): ditto.
+	  (time_hour): ditto.
+	  (time_mday): ditto.
+	  (time_mon): ditto.
+	  (time_year): ditto.
+	  (time_wday): ditto.
+	  (wday_p): ditto.
+	  (time_yday): ditto.
+	  (time_isdst): ditto.
+	  (time_zone): ditto.
+	  (time_utc_offset): ditto.
+	  (time_to_a): ditto.
+	  (strftimev): ditto.
+	  (time_strftime): ditto.
+	  (time_mdump): ditto.
+
+Thu Apr 23 01:30:37 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/zlib/zlib.c (Zlib::GzipFile#path): New method.
+
+Wed Apr 22 20:25:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_timespec): check out-of-range.  [ruby-core:23282]
+	  [Bug #1396]
+
+Wed Apr 22 19:33:13 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.parse): use year completion in Date._parse.
+
+Wed Apr 22 11:12:15 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (GMTIME, LOCALTIME): should set result if not have *_r().
+
+	* time.c (localtime_with_gmtoff): now always needed tmbuf.
+
+Wed Apr 22 10:38:47 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (glob_helper): C99(gcc)-ism.
+
+	* time.c (find_time_t): GUESS macro needs the variable named ``result''
+	  always.
+
+Wed Apr 22 09:27:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (localtime_with_gmtoff): fixed cross function jump.
+
+Wed Apr 22 03:06:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time#rfc2822): pad leading zeros for year.
+	  (Time#httpdate): ditto.
+	  (Time#xmlschema): ditto.
+
+Wed Apr 22 02:10:48 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time#xmlschema): use subsec instead of nsec.
+
+Wed Apr 22 01:27:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_arg): use the year argument as-is.  [ruby-dev:38194]
+
+	* lib/time.rb (Time.parse): interpret small year 0..99 as 1950..2049.
+
+Wed Apr 22 00:32:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (find_time_t): constified.
+
+Wed Apr 22 00:11:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (leap_year_v_p): removed.
+
+Tue Apr 21 23:52:45 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: remove time_t restriction from Time class.
+
+	* timev.h: new file to define struct vtm.
+
+	* strftime.c: format struct vtm instead of struct tm.
+
+	* ext/syck/rubyext.c (mktime_do): don't use time_t;
+
+	[ruby-dev:38191]
+
+Tue Apr 21 09:25:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_path, dir_each, glob_helper): use readdir_r() if
+	  available.
+
+Tue Apr 21 09:20:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (init_mkmf): needs default library path even if
+	  cross compiling.
+
+Tue Apr 21 07:07:45 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_push): bypass rb_ary_store().
+
+Tue Apr 21 01:25:16 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigsub_int): subtraction without making internal
+	  bignum values.
+
+	* bignum.c (bigadd_int): ditto for addition.
+
+	* bignum.c (bigtrunc): declare inline.
+
+	* bignum.c (rb_quad_pack): fix condition.
+
+Tue Apr 21 01:13:42 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup (config.h): added TIMET2NUM and NUM2TIMET to match
+	  the change in time.c
+
+Mon Apr 20 20:29:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_split_m): faster processing on 7bit strings.
+
+	* string.c (ascii_isspace): faster isspace() for 7bit strings.
+
+Sun Apr 19 14:43:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): the order of local variables on stack is
+	  undefined.  should use outermost VALUE for ruby_init_stack.
+
+	* gc.c (ruby_get_stack_grow_direction, Init_stack): allows volatile
+	  pointer.
+
+	* thread_*.c (ruby_init_stack): ditto.
+
+Sun Apr 19 13:17:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gem_prelude.rb (Gem::QuickLoader#push_gem_version_on_load_path):
+	  check for requirement if the gem is installed.  a patch from
+	  Kyosuke MOROHASHI at [ruby-dev:38020].
+
+Sun Apr 19 01:39:17 2009  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (proc_seteuid_m): defined to use rb_f_notimplement if not
+	  implemented.
+	  (proc_setegid_m): ditto.
+
+Sun Apr 19 01:03:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (proc_setuid): use rb_f_notimplement if not implemented.
+	  (proc_setgid): ditto.
+
+Sat Apr 18 23:07:18 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c: use rb_f_notimplement for methods not
+	  implemented.
+
+	* ext/openssl/ossl_engine.c: ditto.
+
+	* ext/openssl/ossl_config.c: ditto.
+
+	* ext/openssl/ossl_cipher.c: ditto.
+
+	* ext/openssl/ossl_pkcs5.c: ditto.
+
+	* ext/openssl/ossl_x509ext.c: ditto.
+
+	* ext/socket/socket.c: ditto.
+
+	* ext/socket/basicsocket.c: ditto.
+
+	* ext/socket/ancdata.c: ditto.
+
+	* ext/socket/unixsocket.c: ditto.
+
+	* ext/iconv/iconv.c: ditto.
+
+Sat Apr 18 21:07:34 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c: use rb_f_notimplement for methods not
+	  implemented.
+
+Fri Apr 17 01:51:17 2009  Tanaka Akira  <akr@fsij.org>
+
+	* node.h (rb_notimplement_body_p): declared.
+
+	* vm_method.c (Init_eval_method): suppress a warning.
+
+	* io.c (rb_io_fsync): use rb_f_notimplement if not implemented.
+	  (rb_io_close_on_exec_p): ditto.
+	  (rb_io_set_close_on_exec): ditto.
+	  (rb_io_fcntl): ditto.
+	  (rb_f_syscall): ditto.
+
+	* dir.c (dir_tell): ditto.
+	  (dir_seek): ditto.
+	  (dir_s_chroot): ditto.
+
+	* process.c (proc_getpgrp): ditto.
+	  (proc_setpgrp): ditto.
+	  (proc_getpgid): ditto.
+	  (proc_setpgid): ditto.
+	  (proc_setsid): ditto.
+	  (proc_getpriority): ditto.
+	  (proc_setpriority): ditto.
+	  (proc_getrlimit): ditto.
+	  (proc_setrlimit): ditto.
+	  (p_sys_setuid): ditto.
+	  (p_sys_setruid): ditto.
+	  (p_sys_seteuid): ditto.
+	  (p_sys_setreuid): ditto.
+	  (p_sys_setresuid): ditto.
+	  (p_sys_setgid): ditto.
+	  (p_sys_setrgid): ditto.
+	  (p_sys_setegid): ditto.
+	  (p_sys_setregid): ditto.
+	  (p_sys_setreuid): ditto.
+	  (p_sys_setresgid): ditto.
+	  (p_sys_issetugid): ditto.
+	  (proc_getgroups): ditto.
+	  (proc_setgroups): ditto.
+	  (proc_initgroups): ditto.
+	  (proc_daemon): ditto.
+	  (rb_proc_times): ditto.
+
+	* file.c (rb_file_s_lchown): ditto.
+	  (rb_file_s_link): ditto.
+	  (rb_file_s_symlink): ditto.
+	  (rb_file_s_readlink): ditto.
+	  (rb_file_s_truncate): ditto.
+	  (rb_file_truncate): ditto.
+
+Fri Apr 17 00:53:47 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/cgi/core.rb (read_multipart): When path is not defined,
+	  define local_path as a method always returning nil instead of
+	  aliasing.  This is because StringIO#path no longer exists.
+
+Fri Apr 17 00:45:09 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* dir.c (bracket): fix escape handling for range character in bracket
+	  of fnmatch pattern.  e.g., '[a\-c]' should not match 'b'.
+
+Thu Apr 16 23:09:03 2009  Tanaka Akira  <akr@fsij.org>
+
+	* class.c (rb_define_method_id): use rb_define_notimplement_method_id
+	  if rb_f_notimplement is given.
+	  (rb_define_protected_method): ditto.
+	  (rb_define_private_method): ditto.
+	  (rb_define_method): use rb_define_method_id.
+
+	* include/ruby/intern.h (rb_f_notimplement): declared.
+	  (rb_define_notimplement_method_id): declared.
+
+	* proc.c (method_inspect): show not-implemented.
+
+	* vm_method.c (notimplement_body): new variable.
+	  (rb_notimplement_body_p): new function.
+	  (rb_method_boundp): return false if not implemented.
+	  (rb_f_notimplement): new function.
+	  (rb_define_notimplement_method_id): new function.
+
+	* process.c (rb_f_fork): use rb_f_notimplement if not implemented.
+
+	* file.c (rb_file_s_lchmod): use rb_f_notimplement if not implemented.
+
+Wed Apr 15 20:24:49 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_flatten): flatten(0) works as Array#dup.
+	  [ruby-core:23168]
+
+	* test/ruby/test_array.rb: add a test for above.
+
+Wed Apr 15 11:53:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (fnmatch_helper): use rb_enc_precise_mbclen and
+	  fail if bytes are invalid. [ruby-dev:38307]
+
+Tue Apr 14 18:11:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (bracket): if same in bytes, path is matching.
+	  [ruby-dev:38305]
+
+Mon Apr 13 17:21:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): scan coderange incrementally.
+
+Mon Apr 13 11:35:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): optimize previous commit.
+	  [ruby-list:45954]
+
+Mon Apr 13 10:58:54 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): check encoding compatibility only on
+	  real parts.
+
+Sun Apr 12 19:54:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (bracket, fnmatch_helper): compare bytewise first, to get
+	  rid of invalid byte sequence.  [ruby-dev:38303]
+
+Sat Apr 11 08:45:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (Makefile): phony ruby target needs empty command.
+
+Fri Apr 10 11:32:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (up): updates timestamp file.
+
+Fri Apr 10 04:54:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (Makefile): info-program needs common.mk.
+
+Fri Apr 10 03:46:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_INSTALL_NAME): use --program-transform-name.
+
+	* instruby.rb, mkconfig.rb: deal with --program-transform-name
+	  better.  now supports s, y commands and single addressing.
+
+Thu Apr  9 23:59:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: don't override the rule for ruby.
+
+Wed Apr  8 21:58:12 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_str_dump): buffer length plus one byte for null
+	  terminator.  [ruby-dev:38294]
+
+	* test/ruby/test_m17n.rb (test_str_dump): add a test for above.
+
+Wed Apr  8 20:08:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_rstrip_bang): should not sign-expand non-ascii.
+	  [ruby-core:23158]
+
+Wed Apr  8 17:29:29 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_chop_bang): reset coderange. [ruby-core:23155]
+
+Wed Apr  8 14:00:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (what_type?): fixed typo, and refined for member of
+	  aggregation types.
+
+	* lib/mkmf.rb (Logging.postpone): copy postponed output always.
+
+Wed Apr  8 09:45:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_SO): removed redundant additional version
+	  numbers.
+
+Tue Apr  7 13:35:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (info): shows configured names.
+
+	* configure.in (Makefile): works even if RUBY_INSTALL_NAME
+	  contains macro.
+
+	* configure.in (LIBRUBY_DLDFLAGS): compatibility version is
+	  ruby_version.
+
+	* configure.in (RUBY_REPLACE_TYPE): defines type modifier prefix
+	  for printf.
+
+Tue Apr  7 02:27:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_DEFINT): should pass includes to
+	  AC_CHECK_SIZEOF and RUBY_CHECK_SIZEOF.
+
+	* configure.in (CFLAGS, CXXFLAGS): need ARCH_FLAG for universal
+	  binary.
+
+Tue Apr  7 01:08:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_to_s): reduce fragments if no precision lost.
+	  c.f. [ruby-core:23075]
+
+Mon Apr  6 23:16:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CFLAGS, CXXFLAGS): override with $cflags and
+	  $cxxflags if not given.  [ruby-core:23130]
+
+Mon Apr  6 19:26:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (utime_failed): refined the error message for EINVAL on
+	  DOSISH platforms, where it may fail depending on filesystems.
+	  see [ruby-dev:38277].
+
+Mon Apr  6 16:38:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (sys_fail2, rb_file_s_readlink, BUFCHECK, rmext),
+	  (rb_file_s_basename): get rid of overflow.
+
+Mon Apr  6 15:11:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (int_chr): checks overflow.
+
+Mon Apr  6 10:49:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/stringio/test_stringio.rb (test_path): StringIO#path is no
+	  longer defined.  [ruby-dev:38254]
+
+Mon Apr  6 10:47:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_path): removed.  [ruby-dev:38254]
+
+Sun Apr  5 18:02:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_fd_resize): does nothing on Win32.
+
+Sat Apr  4 17:05:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (RB_NUM_COERCE_FUNCS_NEED_OPID): macro to
+	  check compatibility.  [ruby-dev:38162]
+
+Sat Apr  4 07:38:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb (sitearch): default to arch.
+
+Fri Apr  3 14:02:42 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/irb/completion.rb (IRB::InputCompletor::Operators): Add
+	  overloadable negative operators.
+
+	* lib/irb/ruby-lex.rb (RubyLex#lex_init): Support overloadable
+	  negative operators.
+
+	* lib/irb/ruby-lex.rb (RubyLex#identify_identifier): Minus signs
+	  need to be escaped in regexp character class.
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords, ruby-parse-partial):
+	  Support overloadable negative operators.
+
+Fri Apr  3 12:45:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: quotes arguments with spaces always.
+
+Thu Apr  2 14:50:06 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/getoptlong.rb: remove unused rdoc/usage from example.
+	   [ruby-core:23098]
+
+Thu Apr  2 07:42:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): updated.
+
+Wed Apr  1 20:37:49 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (rb_cv_fork_with_pthread): fail if the child process
+	  fail.
+
+Wed Apr  1 19:46:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): support for parallel make.  a
+	  patch from Takuto Matsuu at [ruby-dev:38220].
+
+Wed Apr  1 19:39:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_LDSHARED): use $(CC) instead of cc.
+	  a patch from Wataru Kimura at [ruby-dev:38225].
+
+Wed Apr  1 18:53:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): should not #include inside a
+	  function, since headers may have declarations.
+	  c.f. [ruby-core:23095]
+
+Wed Apr  1 18:44:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: ignores version numbers in config.status.  replaces
+	  all $$s in program_transform_name.
+
+Wed Apr  1 15:12:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (.c.i): use CPP instead of CC, since gcc -E can'
+	  work with multiple -arch options.
+
+Wed Apr  1 13:46:20 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_thread_fd_select): new function to call select
+	  using rb_fdset_t.
+
+	* io.c (select_internal): use rb_thread_fd_select instead of
+	  rb_thread_select.  based on the patch from Kengo Matsuyama.
+	  [ruby-dev:38221]
+
+Wed Apr  1 13:16:19 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_sleep): RDoc disambiguation.  [ruby-talk:332632]
+
+Tue Mar 31 15:17:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: fixed the help strings for the header and library
+	  dir switches, and updated to use AS_HELP_STRING.  patches from
+	  Richard Brown, c.f. [ruby-core:23067].
+
+Mon Mar 31 08:18:57 2009  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* test/csv/test_interface.rb, test/csv/test_serialization.rb:
+	  Trying more fixes some failing tests on Windows.
+
+Mon Mar 30 19:04:25 2009  Tanaka Akira  <akr@fsij.org>
+
+	* .gdbinit (rp): show negative fixnum correctly.
+
+Mon Mar 30 12:12:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (eval_string_with_cref): replaces the message if
+	  frozen.  [ruby-dev:38208]
+
+Mon Mar 30 01:00:20 2009  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* test/csv/test_interface.rb: Trying a fix for some failing tests
+	  on Windows.
+
+Sun Mar 29 08:59:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pathname.rb (Pathname#relative_path_from): compares path
+	  components according to system default case-sensitiveness.
+	  [ruby-core:22829]
+
+Sat Mar 28 11:10:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ruby.imp): all symbols in static library need to be
+	  exported, so that encoding-extensions can be loaded.  based on a
+	  patch from Yutaka Kanemoto <kinpoco AT gmail.com> in
+	  [ruby-talk:332282].
+
+Sat Mar 28 08:49:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): checks if named argument given twice.
+
+	* sprintf.c (GETNAMEARG): remembers named arg is used, to get rid
+	  of too many arguments warning.
+
+Sat Mar 28 03:16:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (link_command, cc_command, cpp_command): should no
+	  override extout defined in extmk.rb.
+
+Fri Mar 27 12:56:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (what_type?): checks more restrictively, and
+	  supports universal binary.
+
+Fri Mar 27 01:33:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_cmp): negate the result of reverse comparison.
+
+Fri Mar 27 01:19:50 2009  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_cmpint): FIX2INT may fail on LP64 platforms.
+
+Thu Mar 26 12:22:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb (String#is_binary_data?): TAB would be
+	  usually considered to be included in text data.
+
+	* lib/rdoc/parser.rb (RDoc::Parser.binary?): blksize may be nil
+	  and is irrelevant to whether a file is binary.  copied from
+	  above since TAB and newlines would be usually considered to be
+	  included in text data.
+
+Thu Mar 26 11:33:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
+	  --program-prefix and --program-suffix.  reapplied r19923.
+
+Wed Mar 25 07:45:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (target_alias): replaces cpu with universal too.
+
+	* configure.in (target): replaces cpu with arch by --with-arch.
+
+	* mkconfig.rb (TOPDIR): chops arch in config instead of
+	  RUBY_PLATFORM which varies on universal_binary.
+
+	* mkconfig.rb (MAJOR, MINOR, TEENY): reads from version.h always.
+
+Tue Mar 24 19:23:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): need to include $4.
+
+Tue Mar 24 17:08:52 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* io.c (rb_io_inspect): Cannot access fptr->fd if fptr is NULL.
+	  This fixes a coredump caused by: ruby -e "class X < IO; def
+	  initialize; end; end; p X.new.inspect"
+
+Mon Mar 23 22:01:00 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_timespec): use NUM2TIMET.
+	  (time_s_at): ditto.
+
+Mon Mar 23 21:52:26 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* process.c (Init_process): Better patch for eliminating an
+	  "unused variable".
+
+Mon Mar 23 21:41:14 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dbm/dbm.c (fdbm_initialize): Make the file variable
+	  volatile, because FilePathValue() currently does not protect the
+	  given variable from GC. (Probably it should)
+
+	* ext/sdbm/init.c (fsdbm_initialize): Ditto.
+
+Mon Mar 23 19:22:14 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* file.c (rb_file_s_lstat): Back out.
+
+Mon Mar 23 18:54:57 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* file.c (rb_file_s_stat, rb_file_s_lstat): Remove repeated type
+	  checks.
+
+Mon Mar 23 14:57:48 2009  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c (init_heap): set default to heap slots length
+	  if HEAP_OBJ_LIMIT is larger than HEAP_MIN_SLOTS. [Bug #1310]
+	  (set_heaps_increment): increment next_heaps_length if
+	  next_heaps_length and heaps_used are same.
+
+Mon Mar 23 14:32:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn): use original command if not found.
+
+Mon Mar 23 06:51:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (link_so): replaces $(TARGET) with basename of the
+	  target.  [ruby-talk:330286]
+
+Sun Mar 22 14:51:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): use NULL as
+	  application name for batch files.
+
+Sat Mar 21 15:54:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl.c (write_would_block): defined.
+	  (read_would_block): defined.
+	  (ossl_start_ssl): add nonblock argument.
+	  (ossl_ssl_connect): follow ossl_start_ssl change.
+	  (ossl_ssl_connect_nonblock): new method.
+	  (ossl_ssl_accept): follow ossl_start_ssl change.
+	  (ossl_ssl_accept_nonblock): new method.
+	  (ossl_ssl_read_internal): use write_would_block and
+	  read_would_block.
+	  (ossl_ssl_write_internal): ditto.
+
+Sat Mar 21 08:19:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_exec): prints error message only on platforms
+	  neither close-on-exec nor spawnv is supported.
+
+Sat Mar 21 08:17:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): omit program name
+	  if actual program path is found.  [ruby-core:22960]
+
+Sat Mar 21 07:25:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): should pass program name even if multiple
+	  arguments are given.  fix for TestProcess::test_argv0.
+
+Sat Mar 21 02:37:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/buffering.rb
+	  (OpenSSL::Buffering#write_nonblock): new method.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_write_nonblock): new method.
+	  (ossl_ssl_write_internal): defined.
+	  (ossl_ssl_write): use ossl_ssl_write_internal.
+
+Fri Mar 20 18:25:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (errmap): added ERROR_MOD_NOT_FOUND.
+
+Fri Mar 20 09:22:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (libprefix): must not append "lib" after $(libdir),
+	  when load_relative is not used on darwin.  a patch from Kenta
+	  Murata at [ruby-dev:38182].
+
+Thu Mar 19 20:29:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_mWaitReadable): defined.
+	  (rb_mWaitWritable): defined.
+	  (io_getpartial): extend IO::WaitReadable on EWOULDBLOCK and EAGAIN.
+	  (rb_io_write_nonblock): extend IO::WaitWritable on EWOULDBLOCK and
+	  EAGAIN.
+
+	* error.c (make_errno_exc): extracted from rb_sys_fail.
+	  (rb_mod_sys_fail): new function.
+
+	* include/ruby/ruby.h (rb_mod_sys_fail): declared.
+	  (rb_mWaitReadable): declared.
+	  (rb_mWaitWritable): declared.
+
+	* ext/socket/init.c (rsock_s_recvfrom_nonblock): extend
+	  IO::WaitReadable on EWOULDBLOCK and EAGAIN.
+	  (rsock_s_accept_nonblock): extend IO::WaitReadable on EWOULDBLOCK,
+	  EAGAIN, ECONNABORTED and EPROTO.
+
+	* ext/socket/socket.c (sock_connect_nonblock): extend IO::WaitWritable
+	  on EINPROGRESS.
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): extend
+	  IO::WaitWritable on EWOULDBLOCK and EAGAIN.
+	  (bsock_recvmsg_internal): extend IO::WaitReadable on EWOULDBLOCK and
+	  EAGAIN.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): raise SSLError
+	  extended by IO::WaitReadable/IO::WaitWritable on
+	  SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE.
+
+	* ext/openssl/ossl.c (ossl_make_error): extracted from ossl_raise.
+	  (ossl_exc_new): new function.
+
+	* ext/openssl/ossl.h (ossl_exc_new): declared.
+
+	* lib/net/protocol.rb (rbuf_fill): rescue IO::WaitReadable and
+	  IO::WaitWritable.
+
+	  [ruby-core:22539], [ruby-dev:38140]
+
+Thu Mar 19 18:49:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): allows qualified name.
+
+	* configure.in (RUBY_REPLACE_TYPE): checks more strictly.
+
+	* configure.in (struct stat.st_size, struct stat.st_blocks),
+	  (struct stat.st_ino): check for size.
+
+	* lib/mkmf.rb (check_sizeof): allows qualified name.
+
+	* file.c (rb_stat_ino, rb_stat_blocks): check by size.
+
+Wed Mar 18 16:59:48 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/test_syslog.rb (TestSyslog#test_open): check
+	  param after block again. because detect not to call block.
+
+Wed Mar 18 16:54:04 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* ext/socket/ancdata.c: not use pktinfo.ipi_spec_dst if not defined
+	* ext/socket/extconf.rb: define HAVE_IPI_SPEC_DST
+
+Wed Mar 18 16:38:11 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/test_syslog.rb (TestSyslog#test_open): check
+	  block parameter in block. [ruby-dev:38180]
+
+Wed Mar 18 12:48:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (report_bug): rb_bug can be caused by extension
+	  libraries.
+
+Wed Mar 18 02:41:33 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network
+	  families problem. a patch from Charl Matthee at [ruby-core:21033].
+
+Tue Mar 17 21:42:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): creates .revision.time and passes
+	  CHDIR to create prerequisite files.
+
+Tue Mar 17 18:00:55 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (Enumerator#{each_,}{with_index,with_object}): Fix
+	  a bug where any parameter but the first one is dropped even if
+	  multiple values are yielded with. [Bug #1198]
+
+Tue Mar 17 14:25:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb (Pathname#sub): set $~ in block.binding.
+	  [ruby-dev:38173]
+
+Tue Mar 17 13:48:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): added RUBY_COREDLL.
+
+	* ext/dl/handle.c (rb_dlhandle_initialize): returns msvcrt if libc
+	  or RUBY_COREDLL is given.  [ruby-core:22828]
+
+Tue Mar 17 10:29:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
+	  string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
+	  instead of strcpy, strncpy and sprintf.
+
+Mon Mar 16 17:15:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/dl/test_win32.rb (Win32API): enclosed by DL::TestWin32.
+	  [ruby-core:22827]
+
+Mon Mar 16 16:37:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core),
+	  (lib_watchdog_core): tv_usec is not time_t.
+
+Mon Mar 16 12:30:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (REVISION_H): keeps timestamp of revision.h.
+	  [ruby-core:22900]
+
+	* tool/ifchange, win32/ifchange.bat: extended --timestamp option.
+
+Mon Mar 16 09:28:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.mk, win32/Makefile.sub: added preprocessing rules.
+
+Sun Mar 15 12:34:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/minitest/test_mini_test.rb: fixed tests depending on the
+	  detail of floating point representation.
+
+Sun Mar 15 12:01:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/installer.rb (Gem::Installer#shebang): fix for env
+	  shebang.
+
+Sun Mar 15 11:15:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h ({RSTRING,RBIGNUM}_EMBED_LEN_MAX): made int.
+
+	* include/ruby/ruby.h (OBJ_{TAINTED,UNTRUSTED,FROZEN}): return int.
+
+	* include/ruby/encoding.h (ENC_CODERANGE): ditto.
+
+Sun Mar 15 11:11:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_hash_uint, rb_hash_start, rb_hash_end): use VALUE
+	  rather than unsigned int.
+
+Sun Mar 15 11:00:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): stop the timer thread before exec.
+
+Sun Mar 15 09:17:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (.y.c): use SRC_FILE which contains slashes instead of
+	  backslashes.  [ruby-core:22891]
+
+Sun Mar 15 08:26:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (srcs-ext): creates ext/dl/callback/callback.c also.
+
+Sun Mar 15 03:29:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (SAVED_GROUP_ID, p_gid_switch): should be rb_gid_t.
+
+Sun Mar 15 02:53:13 2009  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_subpat): accept capture name.
+	  (rb_str_aref): follow above change.
+	  (rb_str_aref_m): pass the 2nd argument to rb_str_subpat.
+	  (rb_str_subpat_set): accept capture name.
+	  (rb_str_aset): follow above change.
+	  (rb_str_partition): ditto.
+	  (rb_str_aset_m): pass the 2nd argument to rb_str_subpat_set.
+
+	* include/ruby/intern.h (rb_reg_backref_number): declared.
+
+	* re.c (rb_reg_backref_number): defined.
+
+	  [ruby-core:21057]
+
+Sun Mar 15 02:09:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (bmcall): should not uninitialized variable.  a patch from
+	  pegacorn at [ruby-dev:38169].
+
+Sat Mar 14 18:25:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_scan_oct, ruby_scan_hex): use size_t.
+
+Sat Mar 14 18:18:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_proc_call, rb_node_arity, bmcall, curry): checks
+	  overflow.
+
+	* proc.c (rb_proc_parameters): unnamed_parameters() expects in
+	  not VALUE.
+
+Sat Mar 14 17:54:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_each_words): assume no string exceeds INT_MAX.
+
+Sat Mar 14 15:59:04 2009  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_spawn_internal): use int variable for status.
+
+Sat Mar 14 14:45:51 2009  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_f_system): use rb_pid_t for pid.
+	  (rb_spawn_internal): local variable renamed.
+
+Sat Mar 14 14:16:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strdup, Balloc, rv_alloc): use size_t.
+
+Sat Mar 14 13:53:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_qsort): the result of cmp must be signed, so ge
+	  rid of reuse of a variable.
+
+Sat Mar 14 10:56:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (init_funcname_len, dln_find_exe_r, dln_find_file_r): use
+	  size_t.
+
+	* file.c (rb_stat_inspect, file_expand_path): ditto.
+
+	* util.c (ruby_qsort): ditto.
+
+Sat Mar 14 10:39:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (CXX_EXT): checks for case-sensitive filesystem with
+	  FNM_SYSCASE rather than build_os.
+
+Fri Mar 13 23:03:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (wait_connectable0): remove unreachable code.
+
+Fri Mar 13 23:00:02 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): pass [include] to AC_CHECK_SIZEOF.
+
+Fri Mar 13 20:58:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* dln.c (dln_find_1): compare fspace in size_t world.
+
+Fri Mar 13 18:58:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CFLAGS, CXXFLAGS): moved after warnflags.
+
+Fri Mar 13 18:10:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_throw_obj): inverted call flow.  [ruby-core:22872]
+
+Fri Mar 13 17:04:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (bool): not define to get rid of conflict
+	  against curses.
+
+Fri Mar 13 16:45:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks.
+	  [ruby-core:22860]
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id): suppress a
+	  warning.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_flush_sessions): time_t may
+	  be larger than long.
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_get_time),
+	  (ossl_ssl_session_get_timeout): use TIMET2NUM() to convert
+	  time_t.
+
+Fri Mar 13 15:10:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use
+	  OPENSSL_free instead of free.  a patch from Charlie Savage at
+	  [ruby-core:22858].
+
+Fri Mar 13 21:11:51 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/sdbm/_sdbm.c: should include "ruby/defines.h" as well for
+	  prototypes of compatibility functions on Win32 platform.
+	  [ruby-core:22870]
+
+Fri Mar 13 10:42:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (AC_HEADER_STDBOOL): added.
+
+	* include/ruby/ruby.h (NUM2INT, rb_special_const_p): returns true
+	  and false instead of Qtrue and Qfalse for platforms where VALUE
+	  is bigger than int.
+
+	* gc.c (gc_stress_set), ext/openssl/ossl_asn1.c (decode_bool): go
+	  rid of variables named `bool'.
+
+Fri Mar 13 10:16:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (struct stat.st_size): may be huge.
+
+Fri Mar 13 09:30:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (bigfixize): zero length Bignum is 0.
+
+Fri Mar 13 09:17:12 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils#fu_get_gid): stringify group
+	  argument before making regexp match.  [ruby-dev:38155]
+
+Fri Mar 13 08:06:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (rv_strdup): macro to duplicate nul-terminated string.
+	  [ruby-core:22852]
+
+Thu Mar 12 22:41:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl: suppress warnings.
+
+	* ext/openssl/ossl.h (OSSL_Debug): don't use gcc extension for
+	  variadic macro.
+
+Thu Mar 12 22:29:36 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (WARNFLAGS): warning 4996 is only in VC++8 or
+	  later.
+
+Thu Mar 12 22:14:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_def_const): use INT2NUM because
+	  OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG doesn't fit into Fixnum.
+
+Thu Mar 12 18:16:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c, bignum.c, dln.c, error.c, gc.c, io.c, marshal.c,
+	  numeric.c, pack.c, strftime.c, string.c, thread.c, transcode.c,
+	  transcode_data.h, util.c, variable.c, vm_dump.c,
+	  include/ruby/encoding.h, missing/crypt.c, missing/vsnprintf.c:
+	  suppress VC type warnings.  [ruby-core:22726]
+
+	* marshal.c (div0), numeric.c (infinite_value): new functions to
+	  get rid of VC division by 0 warnings.
+
+	* st.c: use st_index_t for indexes instead of int.
+
+	* vm.c (rb_vm_get_sourceline), vm_insnhelper.c (vm_throw): use
+	  rb_num_t.
+
+Thu Mar 12 09:30:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): if same size type is found, no
+	  more calculation is needed.
+
+	* configure.in (RUBY_DEFINT): falls back to RUBY_CHECK_SIZEOF if
+	  size is not immediate.
+
+Thu Mar 12 09:24:24 2009  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h: suppress warnings of overflow.
+
+Thu Mar 12 09:15:14 2009  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h: suppress warnings of overflow.
+
+Thu Mar 12 05:49:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): added some default flags,
+	  pointer-arith, write-strings and shorten-64-to-32, but suppress
+	  unused-parameter and missing-field-initializers, if possible.
+
+	* configure.in (RUBY_CHECK_HUGE): checks whether a value range is
+	  larger than long.
+
+	* file.c (rb_stat_blocks): struct stat.st_blocks may be larger
+	  than long.
+
+	* io.c (copy_stream_fallback_body): off_t may be larger than long.
+
+	* iseq.c (rb_iseq_disasm): RSTRING_LEN() returns long.
+
+	* process.c (rb_f_sleep): time() needs time_t.
+
+	* random.c (fill_random_seed): enclosed conditionally used
+	  variables.
+
+	* thread_pthread.c (ruby_init_stack): range of rlim_cur may be
+	  larger than int.
+
+	* missing/vsnprintf.c (BSD_vfprintf): commented out code which has
+	  no effect at all.
+
+Thu Mar 12 02:10:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: strip spaces from ruby_version.
+	  Sun C 5.9 SunOS_i386 Build47_dlight 2007/05/22 generates
+	  `ruby_version= 1 "." 9 "." 1'.
+
+Thu Mar 12 01:18:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_seek): use long for seekdir().
+
+Thu Mar 12 01:08:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/ytab.sed: replaces backslashes with slash for nmake.
+
+Wed Mar 11 21:23:06 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_mload): don't clear tm_mday.
+
+Wed Mar 11 20:13:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol
+	  name.   [ruby-dev:38150]
+
+Wed Mar 11 17:26:38 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/win32/lib/Win32API.rb: call by :stdcall as default.
+	  [ruby-core:22826]
+
+Wed Mar 11 13:27:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stack_type): uses VALUE which is able to be stored
+	  parser stack.
+
+Wed Mar 11 13:22:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_env): set TMPDIR if none of TMPDIR, TMP,
+	  TEMP is set.
+
+	* win32/win32.c (rb_w32_telldir, rb_w32_seekdir): should use long,
+	  as defined by SUSv3.
+
+Wed Mar 11 13:03:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/handle.c (rb_dlhandle_sym): fixed heap corruption.
+	  [ruby-core:22822]
+
+Wed Mar 11 06:12:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): expands libpath and removes
+	  last /lib.
+
+Wed Mar 11 04:47:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_to_i, time_hash): time_t may be bigger than long
+	  and int.
+
+	* time.c (time_timeval, rb_time_timeval, obj2nsec, time_strftime),
+	  (time_mdump, time_mload): suppress warnings.
+
+	* win32/Makefile.sub (config.h): added TIMET2NUM and NUM2TIMET.
+
+Wed Mar 11 04:29:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c: suppress warnings.  based on a patch from Charlie
+	  Savage at [ruby-core:22804].
+
+Wed Mar 11 04:22:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (sig_trap): suppress warnings.
+
+Tue Mar 10 20:07:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (WARNFLAGS): uses -wd4996 instead of
+	  CRTDEFFLAGS.  cf. [ruby-core:22725]
+
+Tue Mar 10 19:58:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (strcasecmp, strncasecmp): use _ prefixed
+	  versions to suppress warnings.
+
+	* ext/dl/callback/mkcallback.rb (DLTYPE[FLOAT]): cast to suppress
+	  warnings.  [ruby-core:22792]
+
+	* array.c, bignum.c, gc.c, numeric.c, string.c, util.c, insns.def,
+	  missing/crypt.c, missing/vsnprintf.c, : suppress warnings.
+	  [ruby-core:22792]
+
+Tue Mar 10 13:45:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO
+	  and so on.  based on a patch by Charlie Savage at
+	  [ruby-core:22794]
+
+	* win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so
+	  that extconf.rb could refer it.  [ruby-core:22725]
+
+Tue Mar 10 11:36:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (prepare_iseq_build): too few arguments to function
+	  rb_ary_tmp_new().
+
+Tue Mar 10 10:53:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_compile_with_option): argument may be converted.
+
+Tue Mar 10 04:56:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (MINIRUBY): keep macro into Makefile.
+
+	* configure.in (RUBY_CHECK_SIZEOF): fix for fallback.
+
+	* configure.in (MANGLED_PATH): defines for RUBYLIB_PREFIX.
+
+	* ruby.c (ruby_init_loadpath_safe): uses string as buffer.
+
+	* symbian/setup (config_h): defines MANGLED_PATH.
+
+Tue Mar 10 03:48:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/callback/depend: fix for parallel build.
+
+	* ext/dl/callback/extconf.rb: callback.h is no longer created.
+
+	* ext/dl/callback/mkcallback.rb: creates main source first.
+
+	* ext/dl/callback/extconf.rb ($distcleanfiles): added callback.c.
+
+Tue Mar 10 00:06:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (load_relative): new option to enable load path
+	  relative to libruby_so.
+
+	* ruby.c (ruby_init_loadpath_safe): added the case using dladdr().
+
+Mon Mar  9 16:49:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake: updated to rake code to rake-0.8.4 source code base.
+
+Mon Mar  9 16:03:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/installer.rb (Gem::Installer#initialize): env may
+	  not be under /usr/bin.
+
+	* lib/rubygems/installer.rb (Gem::Installer#shebang): uses /bin/sh
+	  if shebang has any options, since env shebang trick does no
+	  work with options.
+
+Mon Mar  9 15:19:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (manpages): use basename to compare and for Tempfile.
+
+Mon Mar  9 14:55:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (default gems): installs default gemspecs.
+
+Mon Mar  9 14:48:08 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (OPTFLAGS): simplified. see [ruby-core:22725]
+
+Mon Mar  9 14:33:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb: prints names of the directories where files are
+	  installed to.
+
+Mon Mar  9 02:25:54 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_proc.rb: add some tests.
+
+Mon Mar  9 01:38:00 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_enum.rb: add some tests.
+
+Mon Mar  9 01:12:37 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_object.rb: add a test for Object#method_missing.
+
+Mon Mar  9 01:11:17 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_file_exhaustive.rb: add tests for File#size and
+	  File.absolute_path.
+
+Sun Mar  8 23:02:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (LDFLAGS): always prepends -link.
+
+Sun Mar  8 11:39:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): dirty hack to compute multiple
+	  sizeof, for apple's universal binary.
+
+Sat Mar  7 22:06:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (universal_binary): checks if sizes are same on all
+	  architectures.
+
+Sat Mar  7 18:45:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: checks if cd really succeeded.
+
+Sat Mar  7 14:24:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: don't use CONFIG_SHELL for testing shell feature in
+	  Makefile.
+
+Sat Mar  7 14:07:31 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: fix the location of cdcmd.
+
+Sat Mar  7 13:52:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: the shell which runs configure may be different from
+	  the shell for make.  configure likes bash but Makefile specifies
+	  SHELL=/bin/sh.
+
+Sat Mar  7 12:31:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/erb/test_erb.rb: reverted space sensitive test results.
+
+	* test/rdoc/test_rdoc_parser_c.rb: ditto.
+
+	* test/rdoc/test_rdoc_ri_default_display.rb: ditto.
+
+Fri Mar  6 23:35:59 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (SecureRandom.urlsafe_base64): add optional
+	  argument to add padding.
+
+Fri Mar  6 19:25:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_LIB_VERSION_STYLE): sets full or minor style
+	  not to show RUBY_VERSION_MAJOR and so on.
+
+	* version.h (RUBY_LIB_VERSION): makes from RUBY_LIB_VERSION_STYLE.
+
+	* configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using
+	  physical directory.
+
+	* Makefile.in (update-mspec): split from update-rubyspec.
+
+	* win32/Makefile.sub (update-{rubyspec,mspec}): added.
+
+Fri Mar  6 14:28:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (INSNS): moved variable
+	  definition before rule.
+
+Fri Mar  6 13:47:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake/loaders/makefile.rb (Rake::MakefileLoader#load): deals with
+	  escaped spaces.  incorporated from rake 0.8.4.
+
+	* lib/rake/testtask.rb (Rake::TestTask#define): passes each libs
+	  as each arguments with expanded.  incorporated from rake 0.8.4.
+
+Thu Mar  5 18:36:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_to_s): keeps enough precision for round trip.
+	  [ruby-core:22325]
+
+Thu Mar  5 17:42:06 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_fill): doc for Array#fill misses indication
+	  about negative value for the start argument.  [ruby-core:22497]
+
+Thu Mar  5 16:56:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores
+	  non-existent directory.
+
+Thu Mar  5 14:52:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_sysinit): initializes version info first.
+
+	* win32/win32.c (rb_w32_osid): always define for binary compatibility.
+
+Thu Mar  5 11:52:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (make_insns_rules): rule to make rules for insns.
+
+Thu Mar  5 11:27:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (miniruby.exe): workaround for a failure of
+	  mt.exe on Windows 7 beta.  [ruby-talk:330284]
+
+Thu Mar  5 10:32:17 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/dl/test_base.rb: Add dragonfly to libc and libm switch.
+
+Thu Mar  5 10:29:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_eql): extracted from rb_str_equal and rb_str_eql.
+
+	* string.c (rb_str_chomp_bang): keeps 7bit coderange.
+
+Thu Mar  5 10:10:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (enc_initialized_p): ENC_UNINITIALIZED
+	  is not defined already.
+
+	* include/ruby/encoding.h (ENC_FROM_ENCINDEX): removed because
+	  depending on a static variable.
+
+Thu Mar  5 04:42:52 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb: fix wrong test, and add a test for
+	  sort_by!.
+
+Thu Mar  5 04:32:38 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb: add some tests for coverage.
+
+Thu Mar  5 00:06:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/README.win32 (Requirement): added unicows.lib and dll.
+
+Wed Mar  4 23:29:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, win32/configure.bat (--enable-win95): new option
+	  to enable/disable win95 support.
+
+Wed Mar  4 21:21:51 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/thread.rb (SizedQueue#push): fix limit condition.
+	  [ruby-dev:38135]
+
+Wed Mar  4 20:27:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (mingw): checks if unicows.lib is available.
+
+	* include/ruby/win32.h (WIN95): moved to config.h
+
+	* win32/Makefile.sub (LIBS): links unicows.lib if available.
+
+	* win32/Makefile.sub (config.h): defines WIN95 only if unicows.lib
+	  is available.
+
+	* win32/setup.mak (-unicows-): checks if unicows.lib is available.
+
+Tue Mar  3 17:10:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): removes object files no longer used and
+	  files to be removed by old distclean.
+
+Tue Mar  3 16:51:51 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/resolv.rb: get rid of warning.
+
+	* ext/dl/lib/dl/func.rb: ditto.
+
+Tue Mar  3 16:25:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
+	  $srcs are always Array or nil now.
+
+Tue Mar  3 15:54:11 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/{registry,resolv}.rb: use dl/import instead
+	  of Win32API.
+
+Tue Mar  3 15:53:20 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/lib/dl/func.rb (DL::Function.name): delegate to @cfunc.
+
+Tue Mar  3 15:40:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/dl.c (rb_dl_init_callbacks): autoloads callbacks.
+
+	* ext/dl/callback: split from dl.
+
+	* ext/dl/lib/dl/cparser.rb (DL::CParser::parse_signature): fixed
+	  variable name.
+
+	* ext/dl/lib/dl/pack.rb (DL::PackInfo): reduced redundant
+	  initialization.
+
+	* ext/dl/lib/dl/stack.rb (DL::Stack): ditto.
+
+	* ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil.
+
+	* test/dl: moved from ext/dl/test.
+
+Tue Mar  3 14:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (main): passes $(MAKE) to mkmain_cmd
+
+	* ext/extmk.rb (command_output): uses arguments to invoke make.
+
+Tue Mar  3 01:56:03 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (SecureRandom.urlsafe_base64): delete padding.
+
+Mon Mar  2 21:39:08 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (SS_LEN): defined unconditionally.
+
+Mon Mar  2 21:26:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (anc_inspect_socket_creds): suppress warnings.
+
+Mon Mar  2 21:13:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (rsock_discard_cmsg_resource): defined
+	  unconditionally.
+
+Mon Mar  2 21:06:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_mload): don't use "sun" variable
+	  for Solaris.
+
+Mon Mar  2 21:01:36 2009  Tanaka Akira  <akr@fsij.org>
+
+	* file.c: include fcntl.h for O_RDONLY on Solaris.
+
+Mon Mar  2 19:43:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::Parser#escape): escaped string is ascii
+	  only.
+
+	* lib/uri/common.rb (URI::Parser#unescape): converts bytewise.
+	  [ruby-dev:38005], [ruby-dev:38110]
+
+Mon Mar  2 16:40:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja (Macros): added HAVE_RUBY_*_H.
+
+Mon Mar  2 12:22:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_env): keeps wide chars as wide chars.
+
+Mon Mar  2 11:01:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/dl.h (dlerror): fixed on Windows.
+
+	* ext/dl/handle.c (rb_dlhandle_initialize): returns handle to
+	  libruby if nil is given on Windows as dlopen.
+
+	* ext/dl/handle.c (rb_dlhandle_sym): get rid of buffer overrun,
+	  and try ASCII WINAPI versions too.
+
+Mon Mar  2 10:29:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp), include/ruby/intern.h (ruby_cleanup): fixed
+	  prototypes.
+
+Mon Mar  2 00:56:45 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/observer.rb: The module observable uses now a hash to
+	  store listeners. merged a patch from Alessandro Di Maria in
+	  [ruby-core:22560].
+
+Sun Mar  1 22:59:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c: suppress warnings.
+
+	* ext/socket/socket.c: ditto.
+
+	* ext/socket/unixsocket.c: ditto.
+
+Sun Mar  1 20:57:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily.
+
+Sun Mar  1 19:52:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/win32/lib/Win32API.rb (initialize): passes res
+	  arguments to DL.
+
+Sun Mar  1 19:38:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_run): suppress a warning.  a patch from
+	  Charlie Savage at [ruby-core:22607].
+
+Sun Mar  1 19:36:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_dtoa): allocates one more byte to get rid of buffer
+	  overrun.  a patch from Charlie Savage at [ruby-core:22604].
+
+Sun Mar  1 19:10:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (.y.c): removed extra backslash.  [ruby-core:22602]
+
+Sun Mar  1 19:02:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): fix for stdcall and missing
+	  argument numbers.  [ruby-core:22601]
+
+	* ext/dl/dl.h (DLSTACK_PROTO0_): added.
+
+	* ext/dl/mkcallback.rb (gencallback, gen_callback_file),
+	  (rb_dl_init_callbacks): omit stdcall functions unless supported.
+
+	* lib/rubygems/config_file.rb (SHGetFolderPath): stdcall.
+
+Sun Mar  1 17:27:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (gfDebug): uncommented out.
+	  [ruby-core:22600]
+
+Sun Mar  1 16:15:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_waitpid): use wait_each() on no waitpid platforms.
+	  [ruby-dev:38054]
+
+Sun Mar  1 16:01:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_daemon): stops and restarts timer thread because
+	  daemon(3) implies fork(2).  [ruby-dev:38055]
+
+Sun Mar  1 15:45:49 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ (rsock_make_hostent): renamed from sock_make_hostent.
+	  (rsock_addrinfo): renamed from sock_addrinfo.
+	  (rsock_getaddrinfo): renamed from sock_getaddrinfo.
+	  (rsock_socket): renamed from ruby_socket.
+	  (rsock_sock_s_socketpair): renamed from sock_s_socketpair.
+	  (rsock_connect): renamed from ruby_connect.
+
+	* ext/socket/socket.c (sock_listen): make it static.
+
+Sun Mar  1 15:29:31 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: add rsock_ prefix.
+
+Sat Feb 28 21:52:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* vm_eval.c (rb_iterate): use volatile to suppress warnings.
+
+	* eval.c (ruby_cleanup): ditto.
+
+Sat Feb 28 20:09:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* eval_error.c (error_print): use volatile to suppress warnings.
+
+	* vm_eval.c (eval_string_with_cref): ditto.
+
+	* thread.c (rb_exec_recursive): ditto.
+
+	* eval_jump.c (rb_exec_end_proc): ditto.
+
+	* eval.c (ruby_exec_node): ditto.
+	  (rb_longjmp): ditto.
+
+Sat Feb 28 18:28:58 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_unix_rights): check message type.
+
+Sat Feb 28 16:18:39 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/http.rb: suppress warnings of non-existing instance variable
+	  access for SSL.
+
+Sat Feb 28 14:50:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (BasicSocket#connect_address): returns ::1
+	  if the address is IPv4-mapped IPv6 address for 0.0.0.0 for MacOS X.
+
+Sat Feb 28 00:18:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c: suppress strict-aliasing warning with
+	  gcc version 4.4.0 20090219 (Red Hat 4.4.0-0.21) on Fedora 11 Alpha.
+
+	* ext/socket/socket.c: ditto.
+
+	* ext/socket/unixsocket.c: ditto.
+
+	* ext/socket/sockport.h (SS_LEN): defined.
+	  (SET_SS_LEN): ditto.
+
+Fri Feb 27 22:30:18 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): close FDs passed by
+	  SCM_RIGHTS unless :scm_rights=>true is given.
+	  (discard_cmsg): extracted from rsock_discard_cmsg_resource.
+
+Fri Feb 27 22:14:22 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/buffering.rb: define Buffering module under
+	  OpenSSL.  [ruby-dev:37906]
+
+Fri Feb 27 22:09:24 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb: don't define assert_not_* if already
+	  overridden.
+
+Fri Feb 27 22:02:34 2009  Tanaka Akira  <akr@fsij.org>
+
+	* util.c: fix SEGV by test_time.rb with
+	  gcc version 4.4.0 20090219 (Red Hat 4.4.0-0.21) on Fedora 11 Alpha.
+
+Fri Feb 27 18:30:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (cdhash_type, iseq_set_sequence): should not call
+	  methods of the argument of case, to keep the semantics of
+	  case/when.  [ruby-dev:38079]
+
+Fri Feb 27 18:01:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (ruby_get_stack_grow_direction): no needs to use thread
+	  here, and not initialized yet.  [ruby-core:22439]
+
+Fri Feb 27 17:45:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_load_ok): checks if regular file, except for the
+	  platform disallows to open directories, e.g. dosish.
+	  [ruby-dev:38097], [Bug #1221]
+
+Fri Feb 27 14:39:40 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le, flo_eql): revert
+	  isnan() checks for VC++6.
+
+	* insns.def (opt_lt, opt_gt): ditto.
+
+Fri Feb 27 14:23:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (modifiable): check if really frozen.
+	  [ruby-core:22559]
+
+Thu Feb 26 23:14:46 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (BasicSocket#connect_address): new method.
+
+Thu Feb 26 19:29:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (hash_foreach_iter): fix for prototype.
+
+Thu Feb 26 18:36:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (INSNS, newline.c, miniprelude.c, prelude.c),
+	  (node_name.inc, known_errors.inc): unified from Makefile.in and
+	  win32/Makefile.sub.
+
+Thu Feb 26 13:30:34 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* util.c (valid_filename): use our own implementation of open(),
+	  close() and unlink().
+
+Thu Feb 26 13:23:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (cdhash_each): resurrects internal literals.
+
+Thu Feb 26 10:56:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (rb_w32_wopen): prototype forgotten.
+
+	* io.c (rb_sysopen_internal): shouldn't replace undefined chars in this
+	  case.
+
+Thu Feb 26 01:34:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: more MSG_* constants.
+
+Thu Feb 26 00:21:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (sockopt_level): extracted from sockopt_level_m.
+	  (sockopt_optname): extracted from sockopt_optname_m.
+	  (sockopt_data): apply StringValue.
+	  (sockopt_s_linger): new method.
+	  (sockopt_linger): new method.
+	  (inspect_linger): show onoff value if it is neither 0 nor 1.
+
+Wed Feb 25 23:23:03 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_unix_rights): raise
+	  NotImplementedError if no fd passing feature.
+	  (ancillary_timestamp): raise NotImplementedError if no timestamp
+	  feature.
+
+Wed Feb 25 23:18:53 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_s_unix_rights): new method.
+
+Wed Feb 25 23:01:26 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/unixsocket.c (unix_recv_io): prevent FD leak when 2 fd is
+	  sent on LP64 platform.
+
+	* ext/socket/rubysocket.h (rsock_discard_cmsg_resource): declared.
+
+	* ext/socket/ancdata.c (rsock_discard_cmsg_resource): renamed from
+	  discard_cmsg_resource.  export it.
+
+Wed Feb 25 17:31:32 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (sysopen_func, rb_sysopen_internal, rb_sysopen): open file
+	  by UTF-16'ed filename on Windows.
+
+	* io.c (rb_file_open_generic, rb_io_s_sysopen, rb_io_reopen,
+	  argf_next_argv): follow above change.
+
+	* io.c (rb_scan_open_args): no longer need to convert filepath here on
+	  Windows.
+
+	* win32/wio32.c (rb_w32_wopen): new function to open file by UTF-16'ed
+	  filename.
+
+	* win32/win32.c (rb_w32_open): call rb_w32_open().
+
+Wed Feb 25 15:05:35 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): use un.rb as cp instead of
+	  cmd.exe's copy command.
+
+	* lib/mkmf.rb (create_makefile): no longer need to convert path
+	  separator when copying file.
+
+Wed Feb 25 12:27:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_force_encoding): should clear coderange at changing
+	  encoding.  [ruby-core:22437]
+
+Wed Feb 25 12:06:09 2009    <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline_1): enables limit even if rs is given.
+	  [ruby-core:22434]
+
+Wed Feb 25 02:28:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_chomp_bang): coderange may change.
+	  [ruby-core:22414]
+
+Wed Feb 25 02:17:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_delete_bang): should recalculate coderange.
+	  [ruby-talk:329267]
+
+Wed Feb 25 00:41:21 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* class.c (rb_scan_args): Allow specifying the number of trailing
+	  mandatory arguments right after the number of optional arguments
+	  only if the number of leading mandatory arguments is not omitted.
+
+	* ext/socket/tcpserver.c (tcp_svr_init): Make use of it.
+
+Wed Feb 25 00:28:25 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_size): new method added.  [ruby-core:22088]
+
+Wed Feb 25 00:15:15 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c (curses_colors): new method added.  a patch
+	  from Alexander Beisig in [ruby-core:22331].
+
+	* ext/curses/curses.c (curses_color_pairs): ditto.
+
+Wed Feb 25 00:05:13 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* class.c (rb_scan_args): Revamp rb_scan_args() to compute the
+	  number of required and optional arguments precisely to prepare
+	  for a more informative error message.
+
+Tue Feb 24 23:58:52 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_index, rb_ary_rindex): Emit a warning that a
+	  given block is unused when an argument is specified.
+
+Tue Feb 24 22:00:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sockaddr_obj): convert fe80:1::1 to fe80::1%1.
+
+Tue Feb 24 19:56:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_timestamp): support SCM_BINTIME.
+
+Tue Feb 24 19:45:15 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_timestamp): new method.
+
+Tue Feb 24 19:01:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (main): split from exts and makes main program after
+	  building exts with miniruby, to get rid of overwriting running
+	  program.  [ruby-core:22339]
+
+	* Makefile.in, win32/Makefile.sub (RUNCMD, MKMAIN_CMD): macros to
+	  run script file.
+
+	* ext/extmk.rb (parse_args): added --command-output option which
+	  creates script file to make main program.
+
+Tue Feb 24 17:58:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ripper.c): exec can't work on Windows.
+
+	* ext/ripper/depend (.SUFFIXES): nmake doesn't have .y by default.
+
+	* Makefile.in (id.h): overwrites unconditionally.
+
+Tue Feb 24 13:13:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/vsnprintf.c (BSD_vfprintf): ptrdiff_t may be larger than
+	  long.
+
+Tue Feb 24 11:21:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_disable_interrupt, rb_enable_interrupt): see
+	  USE_TRAP_MASK.
+
+Tue Feb 24 10:49:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_waitpid): last argument was missing.
+
+	* process.c (waitall_each): fixed typo.  a patch from shinichiro.h
+	  <shinichiro.hamaji AT gmail.com> at [ruby-dev:38054].
+
+Tue Feb 24 01:53:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_eq): remove unnecessary NaN check using isnan().
+	  comparison regarding NaN is false anyway.
+
+	* numeric.c (flo_gt, flo_ge, flo_lt, flo_le, flo_eql): ditto.
+
+Tue Feb 24 01:22:19 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bootstraptest/test_thread.rb: fix for environment where fork is not
+	  available.
+
+Tue Feb 24 01:19:38 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (thread_cleanup_func): unlock all locked mutexes even when
+	  forking.  [ruby-core:22269]
+
+Tue Feb 24 00:54:16 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (opt_minus): inline float operation.
+
+	* insns.def (opt_lt, opt_gt): ditto.
+
+Tue Feb 24 00:24:13 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_each): check #succ only when it is really
+	  needed.  small performance improvement.
+
+	* math.c (Need_Float): call rb_to_float() only when it is really
+	  needed.  small performance improvement.
+
+Tue Feb 24 00:19:33 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/pathname.rb (Pathname#foreachline): removed wrongly
+	  resurrected method.  [ruby-dev:38065]
+
+Mon Feb 23 20:39:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (inspect_timespec_as_abstime): new function to
+	  show struct timespec.
+	  (ancillary_inspect): use it for SCM_TIMESTAMPNS on GNU/Linux.
+
+Mon Feb 23 20:30:06 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (inspect_bintime_as_abstime): new function to
+	  show struct bintime.
+	  (ancillary_inspect): use it for SCM_BINTIME on FreeBSD.
+
+	* ext/socket/mkconstants.rb: define SCM_BINTIME.
+
+Mon Feb 23 20:18:49 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (inspect_timeval_as_abstime): use time_t
+	  variable to avoid a warning on environments which use long as
+	  tv_sec as NetBSD.
+
+Mon Feb 23 15:53:30 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_index, rb_ary_rindex): We know that argc is not
+	  zero when we reach here.
+
+	* array.c (rb_ary_initialize, rb_ary_index): Shrink a double
+	  space. (NFC)
+
+Mon Feb 23 14:47:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (mv): added description for the case of
+	  different partitions.  [ruby-talk:329072]
+
+Mon Feb 23 10:19:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (USE_SYMBOL_AS_METHOD_NAME): Module#methods,
+	  #singleton_methods and so on return Symbols.  [ruby-talk:328775]
+
+Mon Feb 23 10:15:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja: added macros for the Compatibilities.
+
+Mon Feb 23 03:19:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: define SO_TIMESTAMPNS and SCM_TIMESTAMPNS
+	  if available.
+
+Mon Feb 23 02:54:31 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_inspect): use SCM_TIMESTAMP instead
+	  of SO_TIMESTAMP.  SCM_TIMESTAMP != SO_TIMESTAMP on MacOS X.
+
+Mon Feb 23 02:44:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (inspect_timeval_as_abstime): new function.
+	  (ancillary_inspect): use it for SO_TIMESTAMP.
+
+Mon Feb 23 02:26:44 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_timeval_as_interval): renamed from
+	  inspect_timeval.
+
+Mon Feb 23 02:10:09 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_timeval): fix the size test.
+
+Sun Feb 22 22:42:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (tr_trans): should recalculate coderange.
+	  [ruby-core:22326] (reopened at [ruby-core:22328])
+
+Sun Feb 22 20:09:29 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_linger): message refined.
+
+Sun Feb 22 19:28:08 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (s_recvfrom): use rb_io_wait_readable after
+	  recvfrom.
+
+Sun Feb 22 18:40:04 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_errno): new function.
+	  (sockopt_inspect): use inspect_errno for SO_ERROR.
+
+Sun Feb 22 15:11:51 2009  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (Init_Regexp): define Regexp::FIXEDENCODING.  [ruby-dev:38066]
+
+Sun Feb 22 14:33:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (tr_trans): should not be affected by the encoding of
+	  replacement unless actually modified.  [ruby-talk:328967]
+	  [ruby-core:22326]
+
+Sun Feb 22 13:38:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/init.c (s_recvfrom_nonblock): handles EAGAIN too.
+
+	* ext/socket/init.c (s_accept_nonblock): ditto, and EPROTO depends
+	  on platforms.
+
+Sun Feb 22 13:03:12 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* eval.c (ruby_options): the evaluator now expects iseq instead of tree.
+
+	* ruby.c (ruby_process_options): ditto.
+
+Sun Feb 22 13:03:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (configure): unset PWD to use symlink to building
+	  directory.
+
+	* Makefile.in (up): cd doesn't need LC_TIME, VCS needs.
+
+Sun Feb 22 10:43:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (method_missing): should not pop cfp if missing method
+	  is method_missing.  [ruby-core:22298]
+
+	* vm_eval.c (rb_raise_method_missing): new function to directly
+	  raise NoMethodError.
+
+	* vm_insnhelper.c (vm_call_method): fixed the case method_missing
+	  is missing.
+
+Sun Feb 22 02:15:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): handle EMSGSIZE as
+	  well.
+
+Sun Feb 22 02:03:46 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): check max length
+	  overflow.
+
+Sun Feb 22 01:52:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): don't call
+	  discard_cmsg_resource when EMFILE.
+
+Sun Feb 22 01:48:51 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): gc when SCM_RIGHTS
+	  hit the file descriptor limit.
+
+Sun Feb 22 00:51:58 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_getpartial): error message describes what should be
+	  waited after nonblocking error.
+	  (rb_io_write_nonblock): ditto.
+
+	* ext/socket/init.c (s_recvfrom_nonblock): ditto.
+	  (s_accept_nonblock): ditto.
+
+	* ext/socket/socket.c (sock_connect_nonblock): ditto.
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): ditto.
+	  (bsock_recvmsg_internal): ditto.
+
+Sun Feb 22 00:31:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): check recvmsg error
+	  earlier.
+
+Fri Feb 20 23:28:11 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* util.c (rv_alloc, freedtoa): use our normal xmalloc()/xfree() because
+	  couldn't free the returned pointer from ruby_dtoa().
+
+	* missing/vsnprintf.c (cvt): receive buffer and use/return it instead
+	  of returning the pointer returned from BSD__dtoa().
+
+	* missing/vsnprintf.c (BSD_vfprintf): pass buf to cvt() as the buffer.
+	  [ruby-core:22184]
+
+Thu Feb 19 22:59:09 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (make_io_for_unix_rights): cmsg_len may be
+	  bigger than msg_controllen on 4.4BSD at least.
+	  freeze unix_rights array.
+
+Thu Feb 19 22:17:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): fix exception.
+
+Thu Feb 19 21:13:03 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_unix_rights): method renamed.
+
+Thu Feb 19 15:47:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/fake.rb.in: extracted from Makefile.in.
+
+	* configure.in (fake.rb): prefixed with $(arch)-.
+
+Thu Feb 19 15:39:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
+	  returns positive value on success, not non-zero.  [ruby-core:21762]
+
+Thu Feb 19 15:17:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tmpdir.rb (@@systmpdir): File.expand_path also joins paths.
+
+Thu Feb 19 15:14:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_each_group): defines only when Etc::Group is
+	  available.
+
+Thu Feb 19 15:11:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (translit_char): moved from ruby.c.
+
+	* load.c (load_ext): transliterates file separators and back if
+	  needed.
+
+	* symbian/setup (DLN_NEEDS_ALT_SEPARATOR): defined.
+
+Thu Feb 19 14:48:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c
+
+Thu Feb 19 14:39:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (darwin): uses -unexported_symbol option of ld instead
+	  of objcopy
+
+	* configure.in (darwin): makes dylib instead of so.
+
+Thu Feb 19 14:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): added phony targets.
+
+	* lib/mkmf.rb (create_makefile): creates target directories before
+	  copying.  [ruby-core:21958]
+
+	* lib/mkmf.rb (create_makefile): removes directories in the depth
+	  order.
+
+Thu Feb 19 13:56:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_home_dir): checks if HAVE_PWD_H.  [ruby-dev:38049]
+
+Thu Feb 19 08:45:48 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* ext/socket/rubysocket.h: add "#include <sys/stat.h>"
+
+Thu Feb 19 03:42:48 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_rights): new method.
+	  (make_io_for_rights): new function to allocate
+	  IOs for FDs in SCM_RIGHTS message.
+	  (bsock_recvmsg_internal): use make_io_for_rights.  So the FDs can be
+	  closed by GC.
+
+Thu Feb 19 03:28:59 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* README.EXT, README.EXT.ja: Improve the document about
+	  rb_scan_args() even more.
+
+Thu Feb 19 03:12:51 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_file_exhaustive.rb: skip some tests if euid == 0.
+	  a patch from Lucas Nussbaum in [ruby-core:22209].
+
+Thu Feb 19 03:00:49 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* README.EXT, README.EXT.ja: Improve the document about
+	  rb_scan_args().
+
+Wed Feb 18 22:47:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (discard_cmsg_resource): new function to close
+	  file descriptors in control message.
+	  (bsock_recvmsg_internal): call discard_cmsg_resource before retrying
+	  recvmsg.
+
+Wed Feb 18 21:47:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment.
+
+Wed Feb 18 21:34:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): prevent misalignment.
+
+Wed Feb 18 21:09:43 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): reduce code on
+	  environments which have no control message.
+
+Wed Feb 18 20:27:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (OBJCOPY): set ac_cv_prog_ac_ct_OBJCOPY to do nothing
+	  on cygwin and mingw because symbols are exported by def file.
+
+Wed Feb 18 15:35:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_chown): use chown unless HAVE_FCHOWN.
+
+	* io.c (pipe_open): sarg is always used unless HAVE_FORK.
+
+Wed Feb 18 15:23:34 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* bootstraptest/runner.rb: Use RUBY_DESCRIPTION if defined.
+
+Wed Feb 18 14:33:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_resurrect), string.c (rb_str_resurrect): new
+	  functions based on [ruby-dev:37983]
+
+	* insns.def (putstring, duparray): use rb_{ary,str}_resurrect().
+
+	* iseq.c (iseq_data_to_ary): needs to result TS_VALUE.
+
+Wed Feb 18 12:35:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_extname): fix for spaces before extension.
+	  [ruby-dev:38044]
+
+Wed Feb 18 12:00:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): suppress a warning.  named magic
+	  numbers.
+
+Wed Feb 18 10:29:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): do not delete main thread from
+	  living_threads.  [ruby-core:19385], [ruby-core:22158]
+
+Wed Feb 18 01:05:05 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl: avoid cyclic require.
+
+	* ext/openssl/lib/openssl/ssl-internal.rb: renamed from ssl.rb
+
+	* ext/openssl/lib/openssl/x509-internal.rb: renamed from x509.rb.
+
+	* lib/net/imap.rb: require openssl, instead of openssl/ssl.
+
+	* lib/net/pop.rb: require openssl, instead of openssl/ssl.
+
+	[ruby-dev:38018]
+
+Wed Feb 18 00:55:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (Etc::Passwd.each, Etc::Group.each): new methods.
+	  [ruby-dev:37999]
+
+Tue Feb 17 23:25:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): make the padding
+	  removing only on NetBSD.
+
+Tue Feb 17 19:39:04 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): should not remove the
+	  last padding of control messages, basically.
+
+Tue Feb 17 12:50:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_shared_replace): no need for
+	  str_make_independent.
+
+Tue Feb 17 05:41:08 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: fix to add "ensure" codes across "while" clause
+	  before "return" expression.  [ruby-dev:37967]
+
+	* bootstraptest/test_flow.rb: add a test.
+
+Tue Feb 17 01:53:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: generate rb_define_const directly for
+	  rdoc.
+
+	* ext/.document: add socket/constdefs.c.
+
+	* ext/socket/constants.c (sock_define_const): removed.
+	  (sock_define_uconst): ditto.
+	  (rb_mSockConst): new static variable.
+
+Mon Feb 16 23:14:51 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
+	  the last padding to prevent sendmsg failure in test_udp_server in
+	  test/socket/test_socket.rb on OpenBSD 4.4.
+
+Mon Feb 16 21:59:32 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup: Update Symbian config to match recent changes in missing/alloca.c
+
+Mon Feb 16 17:04:14 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* class.c (rb_scan_args), README.EXT, README.EXT.ja: Add support
+	  for specifying the number of the trailing mandatory arguments.
+	  Update the documents accordingly. [ruby-dev:37995]
+
+Mon Feb 16 16:46:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (set_debug_option): added rtc_error option.
+
+	* win32/Makefile.sub (CRTDEFFLAGS): separated from DEFS.
+
+	* win32/win32.c (rtc_error_handler): ignores RTC errors unless
+	  rtc_error debug option is given.
+
+	* win32/win32.c (rb_w32_sysinit): suppress useless CRT assertions.
+	  [ruby-core:22116]
+
+Sun Feb 15 21:43:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (OpenStruct#new_ostruct_member): checks if frozen.
+	  [ruby-talk:328195], [ruby-core:22142]
+
+Sun Feb 15 21:22:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions): aliases
+	  assert_not_ methods.
+
+Sun Feb 15 16:57:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (SecureRandom.urlsafe_base64): new method.
+
+Sun Feb 15 14:58:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* hash.c (hash_i): use Murmurhash.
+
+Sun Feb 15 11:45:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_define_hooked_variable): suppress false assertion
+	  with VC9.  [ruby-core:22115]
+
+Sun Feb 15 08:35:33 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_pp.rb: extract from lib/pp.rb.
+
+	* test/test_prettyprint.rb: extract from lib/prettyprint.rb.
+
+	* test/test_tsort.rb: extract from lib/tsort.rb.
+
+Sun Feb 15 06:34:22 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.parse): raise ArgumentError if Date._parse don't
+	  extract date information.  [ruby-core:20912]
+
+Sun Feb 15 04:48:08 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end),
+	  include/ruby/intern.h: add Murmurhash API.  [ruby-dev:37784]
+
+	* complex.c (nucomp_hash), array.c (rb_ary_hash), time.c (time_hash),
+	  string.c (rb_str_hash), object.c (rb_obj_hash), range.c
+	  (range_hash), struct.c (rb_struct_hash), hash.c (rb_any_hash),
+	  rational.c (nurat_hash): use Murmurhash.  [ruby-dev:37784]
+
+Sun Feb 15 03:50:21 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* hash.c (rb_hash): always return a fixnum value because a return
+	  value of rb_hash may be used as a hash value itself and bignums have
+	  no unique VALUE.
+
+	* test/ruby/test_hash.rb: add a test for above.
+
+Sun Feb 15 00:45:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_uniq_bang, rb_ary_uniq): unique by the result of
+	  given block.  [ruby-dev:37998]
+
+Sun Feb 15 00:39:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_resize_capa): should not overwrite outside embedded
+	  array.
+
+Sat Feb 14 20:18:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_time.rb: extracted from lib/time.rb.
+
+Sat Feb 14 19:20:15 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb: obsolete methods removed.
+	  [ruby-core:21564]
+
+Sat Feb 14 15:46:01 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/pathname.rb (Pathname#binread): added.  [ruby-dev:37952]
+
+Sat Feb 14 13:14:18 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* iseq.c: remove nil parameter from Proc#parameters
+	  after rest appeared.
+
+Sat Feb 14 07:23:52 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_external_str_new_with_enc): change evaluation order
+	  for speed.
+
+Sat Feb 14 02:20:04 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (SET_SA_LEN): cast to void for suppressing a
+	  warning.
+
+Fri Feb 13 23:37:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/win32/lib/Win32API.rb (Win32API#initialize): DL.dlopen
+	  raises DLError.
+
+Fri Feb 13 21:13:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (Init_socket): define TCPServer#listen and
+	  UNIXServer#listen here for rdoc.
+
+Fri Feb 13 20:59:48 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (extract_ipv6_pktinfo): set sa_len for 4.4BSD.
+
+Fri Feb 13 15:34:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (simple_default_value): removed.  default values of optional
+	  parameters are not available still now.  [ruby-dev:37980]
+
+Fri Feb 13 15:11:11 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (eval_string_with_cref): use rb_vm_get_ruby_level_next_cfp()
+	  instead of vm_get_ruby_level_caller_cfp().  checking a upper frame
+	  is not enough.  [ruby-dev:37984]
+
+	* proc.c, vm_core.h: declare rb_vm_get_ruby_level_next_cfp()
+	  on vm_core.h.
+
+Fri Feb 13 15:01:40 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_alive_p): fix to return true instead of 0.
+	  [ruby-dev:37991]
+
+	* test/ruby/test_fiber.rb: add a test for Fiber#alive?
+
+Fri Feb 13 09:43:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_flock): using flock defined in
+	  win32/win32.c on mingw.
+
+Fri Feb 13 01:45:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_sequence, compile_dstr_fragments),
+	  (iseq_compile_each): hides other internal objects.
+
+	* compile.c (iseq_compile_each): just freeze xstr.
+
+Fri Feb 13 00:48:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass): try to autoload const to be overridden.
+
+Thu Feb 12 23:22:29 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_socket.rb (test_udp_server): filter out unreachable
+	  addresses.  [ruby-dev:37970]
+
+Thu Feb 12 22:51:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (hide_obj): OBJ_FREEZE() is not an expression.  a patch
+	  from nagachika <nagachika00 AT gmail.com> at [ruby-dev:37977].
+
+	* compile.c (insn_set_sc_state): fixed typo.
+
+Thu Feb 12 12:36:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/basicsocket.c (bsock_getpeereid): implemented for Solaris
+	  using getpeerucred.
+
+	* ext/socket/extconf.rb: check ucred.h and getpeerucred.
+
+	* ext/socket/rubysocket.h: include ucred.h if available.
+
+Thu Feb 12 19:42:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_array_, defined_expr, iseq_compile_each): hide
+	  and freeze internal literal objects, to prevent from modifying.
+	  [ruby-dev:37959]
+
+	* iseq.c (insn_operand_intern): copy internal literal objects.
+
+	* insns.def (putstring, duparray): ditto.
+
+	* string.c (rb_str_replace): exported.
+
+Thu Feb 12 17:17:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_ungetc): calculates new position
+	  before reallocation.  [Bug#1099]
+
+Thu Feb 12 16:50:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: a patch to build on GNU/kOpenSolaris from Rober
+	  Millan at [ruby-core:21888].
+
+Thu Feb 12 15:28:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* iseq.c (simple_default_value): allow plain strings as default
+	  values.
+
+Wed Feb 11 18:09:41 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (define_final, undefine_final): shouldn't add/remove finalizer
+	  of frozen objects.
+
+	* gc.c (undefine_final): should remove FL_FINALIZE flag.
+	  [ruby-dev:37964] (also see [ruby-dev:37959])
+
+Wed Feb 11 17:37:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.udp_server_sockets): call the block
+	  if given.  close the sockets when the block exits.
+	  (Socket.udp_server_loop): use udp_server_sockets in block form.
+
+Wed Feb 11 17:34:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets): call the block
+	  if given.  close the sockets when the block exits.
+	  (Socket.tcp_server_loop): use tcp_server_sockets in block form.
+
+Wed Feb 11 17:01:52 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.unix_server_loop): use
+	  unix_server_socket with a block.
+
+Wed Feb 11 16:54:26 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.unix_server_socket): close the
+	  socket when the block exits.
+
+Wed Feb 11 16:50:59 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.unix_server_socket): call the block
+	  if given.  remove the socket file when the block exits.
+
+Wed Feb 11 16:44:20 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_s_ip_pktinfo): make 3rd argument
+	  optional.
+
+Wed Feb 11 15:47:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_make_shared): returns shared root array itself, and
+	  frozen array can be shared.
+
+Wed Feb 11 14:46:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (setspecial, putstring): fixed typos in rdoc.
+
+	* insns.def (toregexp): uses rb_ary_tmp_new(), and clears it after
+	  used.
+
+Wed Feb 11 14:08:23 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (anc_inspect_socket_rights): return 1 on
+	  success.  0 on failure.
+	  (anc_inspect_passcred_credentials): ditto.
+	  (anc_inspect_socket_creds): ditto.
+	  (anc_inspect_socket_creds): ditto.
+	  (anc_inspect_socket_creds): ditto.
+	  (anc_inspect_ip_recvdstaddr): ditto.
+	  (anc_inspect_ip_pktinfo): ditto.
+	  (anc_inspect_ipv6_pktinfo): ditto.
+	  (ancillary_inspect): check family.
+
+Wed Feb 11 12:55:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (anc_inspect_ip_pktinfo): make result bit
+	  succinct.
+	  (Init_ancdata): fix number of arguments.
+
+Wed Feb 11 11:47:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (Init_ipsocket): undef getpeereid at IPSocket.
+
+Wed Feb 11 10:16:34 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: check getpeereid.
+
+	* ext/socket/basicsocket.c (bsock_getpeereid): new method.
+
+Wed Feb 11 09:58:59 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket::UDPSource#inspect): fix variable
+	  name.
+
+Wed Feb 11 00:38:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX.
+
+	* ext/socket/raddrinfo.c (make_ipaddr): local variable renamed.
+
+Tue Feb 10 23:44:53 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (struct recvfrom_arg): use struct
+	  sockaddr_storage.
+	  (recvfrom_blocking): follow struct recvfrom_arg change.
+	  (s_recvfrom): ditto.
+	  (s_recvfrom_nonblock): use struct sockaddr_storage.
+
+	* ext/socket/socket.c (sock_accept): use struct sockaddr_storage.
+	  (sock_accept_nonblock): ditto.
+	  (sock_sysaccept): ditto.
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): use struct
+	  sockaddr_storage.
+
+Tue Feb 10 23:30:32 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/basicsocket.c (bsock_getpeername): use struct
+	  sockaddr_storage.
+	  (bsock_local_address): ditto.
+	  (bsock_remote_address): ditto.
+
+Tue Feb 10 21:26:33 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.udp_server_sockets): new method.
+	  (Socket.udp_server_loop_on): new method.
+	  (Socket.udp_server_loop): new method
+	  (Socket.ip_sockets_port0): extracted from tcp_server_sockets_port0.
+	  (Socket::UDPSource): new class.
+
+Tue Feb 10 21:14:43 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sockaddr_obj): fill pfamily.
+
+Tue Feb 10 21:09:23 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (sockopt_s_bool): new method.
+	  (sockopt_bool): new method.
+
+Tue Feb 10 20:58:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (sockopt_family_m): renamed from sockopt_family.
+	  (sockopt_level_m): renamed from sockopt_level.
+	  (sockopt_optname_m): renamed from sockopt_optname.
+	  (inspect_local_peercred): follow the renaming.
+	  (Init_sockopt): ditto.
+
+Tue Feb 10 20:56:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (anc_inspect_socket_creds): refactored to avoid
+	  a rb_str_cat2 call.
+
+Tue Feb 10 04:34:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (when): makes parentheses balanced.
+
+Tue Feb 10 01:28:49 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ip_cmsg_type_to_sym): renamed from
+	  cmsg_type_to_sym.
+
+Tue Feb 10 01:22:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (sockopt_inspect): refactored.
+
+Tue Feb 10 01:02:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: generate intern_family_noprefix.
+
+	* ext/socket/option.c (sockopt_inspect): use intern_family_noprefix
+	  not to show AF_ prefix.
+
+	* ext/socket/ancdata.c (ancillary_inspect): ditto.
+
+Mon Feb  9 23:21:29 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/constants.c (level_arg): use unknown_level_to_int for
+	  non internet protocol.
+	  (optname_arg): use only so_optname_to_int for non internet protocol.
+	  (cmsg_type_arg): use only scm_optname_to_int for non internet
+	  protocol.
+
+	* ext/socket/mkconstants.rb: generate unknown_level_to_int.
+	  rename iplevel_to_int to ip_level_to_int.
+
+Mon Feb  9 23:04:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: rename level_to_int to iplevel_to_int.
+	  rename intern_level to intern_iplevel.
+
+	* ext/socket/constants.c: follow the renaming.
+
+	* ext/socket/option.c: ditto.
+
+	* ext/socket/ancdata.c: ditto.
+
+Mon Feb  9 22:52:13 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (level_arg): add family argument.
+	  (optname_arg): ditto.
+	  (cmsg_type_arg): ditto.
+	  (rb_sock_getfamily): declared.
+
+	* ext/socket/constants.c (level_arg): add family argument.
+	  (optname_arg): ditto.
+	  (cmsg_type_arg): ditto.
+
+	* ext/socket/init.c (rb_sock_getfamily): defined.
+
+	* ext/socket/option.c (sockopt_initialize): give family for level_arg
+	  and optname_arg.
+	  (sockopt_s_int): ditto.
+
+	* ext/socket/basicsocket.c (bsock_setsockopt): ditto.
+	  (bsock_getsockopt): ditto.
+
+	* ext/socket/ancdata.c (ancillary_initialize): ditto.
+	  (ancillary_s_int): ditto.
+	  (ancillary_cmsg_is_p): ditto.
+	  (bsock_sendmsg_internal): ditto.
+	  (bsock_recvmsg_internal): use rb_sock_getfamily.
+
+Mon Feb  9 21:48:59 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_inspect): show address family.
+
+Mon Feb  9 20:19:36 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/basicsocket.c (bsock_getsockname): use sockaddr_storage.
+
+Mon Feb  9 20:11:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (load_conv_function51932): fixed for the
+	  case IMultiLanguage is not available.  [ruby-dev:37950]
+
+Mon Feb  9 20:04:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_int): return 1/0 on success/failure.
+	  (inspect_uint): ditto.
+	  (inspect_linger): ditto.
+	  (inspect_socktype): ditto.
+	  (inspect_timeval): ditto.
+	  (inspect_peercred): ditto.
+	  (inspect_local_peercred): ditto.
+	  (sockopt_inspect): refactored.
+
+Mon Feb  9 20:00:26 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: more constants for Solaris.
+
+Mon Feb  9 19:59:18 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/basicsocket.c (bsock_getsockopt): refine address family
+	  examination.
+
+Mon Feb  9 19:52:32 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (sockopt_initialize): argument conversion
+	  reordered.
+
+Mon Feb  9 19:46:22 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_initialize): add family argument.
+	  (ancdata_new): ditto.
+	  (ancillary_s_int): ditto.
+	  (ancillary_family): new function.
+	  (ancillary_family_m): new method.
+	  (ancillary_s_ip_pktinfo): follow ancdata_new change.
+	  (ancillary_s_ipv6_pktinfo): ditto.
+	  (bsock_recvmsg_internal): examine the socket address family.
+
+Mon Feb  9 11:31:09 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_encoding_set): ignore second argument when external and
+	  internal are same. [ruby-dev:37939]
+
+Mon Feb  9 09:05:12 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_local_peercred): check version.
+	  (sockopt_inspect): suppress warning.
+
+Mon Feb  9 02:04:03 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_peercred): struct ucred contains
+	  effective uid/gid.
+
+Mon Feb  9 00:44:45 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (sockopt_inspect): add ifdef guard for
+	  LOCAL_PEERCRED.
+
+Mon Feb  9 00:37:06 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_local_peercred): cr_uid is a effective
+	  uid, not a real uid.
+
+Mon Feb  9 00:30:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: check sys/param.h and sys/ucred.h.
+
+	* ext/socket/rubysocket.h: include sys/param.h and sys/ucred.h.
+
+	* ext/socket/option.c (inspect_local_peercred): new function to show
+	  LOCAL_PEERCRED socket option on FreeBSD.
+	  (sockopt_inspect): show as LOCAL_* socket option if AF_UNIX and level
+	  is 0.
+
+Mon Feb  9 00:01:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (sockopt_new): add family argument.
+
+	* ext/socket/option.c (sockopt_initialize): add vfamily argument.
+	  (sockopt_new): add family argument and record it in the object.
+	  (sockopt_family): new method.
+	  (sockopt_s_int): add vfamily argument.
+	  (sockopt_inspect): show family.
+
+	* ext/socket/basicsocket.c (bsock_getsockopt): check address family
+	  using getsockname.
+
+Sun Feb  8 23:37:17 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enumerator.c (enumerator_with_index): receives one argument which
+	  represents a start offset.  [ruby-dev:37921]
+
+Sun Feb  8 23:28:05 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* include/ruby/st.h, st.c: order entries by a linked list instead of
+	  a loop to fix iteration miss when hash is modified during iteration.
+	  [ruby-dev:37910]
+
+Sun Feb  8 23:22:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_peercred): new function to show
+	  SO_PEERCRED socket option on GNU/Linux.
+
+Sun Feb  8 22:44:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/backward/rubysig.h (rb_thread_blocking_region_begin),
+	  (rb_thread_blocking_region_end): marked as deprecated.
+
+	* include/ruby/backward/rubysig.h (TRAP_BEG): fix for C++.  a
+	  patch from Aman Gupta at [ruby-core:21934]
+
+Sun Feb  8 21:47:50 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: check struct cmsgcred.
+
+	* ext/socket/ancdata.c (anc_inspect_passcred_credentials): add
+	  "(ucred)".
+	  (anc_inspect_socket_creds): show struct cmsgcred too, for FreeBSD.
+
+Sun Feb  8 21:05:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
+	  detach spawned process.  [ruby-dev:37936]
+
+Sun Feb  8 20:30:29 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: check struct sockcred.
+
+	* ext/socket/ancdata.c (anc_inspect_socket_creds): new function to
+	  show SCM_CREDS on NetBSD.
+
+Sun Feb  8 19:05:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/backward/rubysig.h: extern "C" was missing.
+	  [ruby-core:21929]
+
+Sun Feb  8 18:46:15 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (anc_inspect_passcred_credentials): new
+	  function to show SCM_CREDENTIALS on GNU/Linux.
+
+Sun Feb  8 18:34:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_s_binread): ensures file path.  [ruby-dev:37940]
+
+Sun Feb  8 13:52:02 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (init_unix_addrinfo): add socktype argument.
+	  (addrinfo_initialize): follow init_unix_addrinfo change.
+	  (addrinfo_s_unix): add optional argument: socktype
+
+Sun Feb  8 13:09:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_APPEND_OPTION, RUBY_APPEND_OPTIONS),
+	  (RUBY_PREPEND_OPTION, RUBY_PREPEND_OPTIONS): add option(s)
+	  without duplication.
+
+	* configure.in (RUBY_DEFINE_IF): changed parameter order, now
+	  condition comes first.
+
+	* configure.in (universal_binary): checks architecture macros, and
+	  improved thin load paths.
+
+Sun Feb  8 09:41:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* runruby.rb: gets extout and arch from rbconfig.rb.
+
+Sat Feb  7 21:26:15 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_addrinfo.rb (test_family_addrinfo): don't use
+	  www.ruby-lang.org.
+	  http://d.hatena.ne.jp/nagachika/20090204/working_for_0f0e
+
+Sat Feb  7 18:02:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--with-arch): added new option to support
+	  universal binary.  replaced --enable-fat-binary option which
+	  didn't work actually.
+
+	* configure.in (RUBY_FUNC_ATTRIBUTE): added conditional test.
+
+	* configure.in (ac_cv_type_getgroups): declared because getgroups()
+	  fills rest of the buffer with garbage on Rosetta.
+
+	* configure.in (alloca): defines only for powerpc, but always
+	  create empty object to suppress ld warning.
+
+	* configure.in (LIBRUBY_DLDFLAGS): set compatibility version with
+	  TEENY.
+
+	* configure.in (CFLAGS, LDFLAGS): separates ARCH_FLAG.
+
+	* configure.in (arch): renamed to "universal" from "fat".
+
+	* Makefile.in (ARCH_FLAG): added.
+
+	* include/ruby/defines.h (WORDS_BIGENDIAN): uses
+	  AC_APPLE_UNIVERSAL_BUILD.
+
+	* missing/alloca.c (alloca): defines only if C_ALLOCA is defined.
+
+Sat Feb  7 12:31:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* runruby.rb: added --precommand and --show options.
+
+	* runruby.rb: added --cpu option.
+
+	* runruby.rb: skips version check in rbconfig.rb.
+
+Sat Feb  7 11:44:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_header): needs dependent headers if trying to
+	  compile.
+
+	* ext/socket/extconf.rb: net/if.h depends on other headers.
+
+Sat Feb  7 04:02:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* dir.c (dir_read): don't disable rdoc.
+
+Fri Feb  6 23:28:33 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_fread): use rb_io_wait_readable for retry
+	  avoid Errno::EINTR on ruby -e 'trap(:CHLD) {}; spawn("sleep 1"); STDIN.read'
+
+Fri Feb  6 22:36:11 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* thread_pthread.c (native_thread_create) [__SYMBIAN32__]: reduced pthread stack size.
+
+	* thread_pthread.c (thread_timer) [__SYMBIAN32__]: compiled out unsupported yet signal-related functionality.
+
+	* io.c (pipe_open) [__SYMBIAN32__]: fixed compile time error.
+
+Fri Feb  6 22:11:46 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* include/ruby/defines.h [__SYMBIAN32__]: included <sys/select.h> for fd_set definition
+
+Fri Feb  6 21:58:24 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/missing-pips.c: added a stub for missing PIPS function execl.
+
+	* process.c (rb_proc_exec) [__SYMBIAN32__]: removed conditional around execl function call.
+
+Fri Feb  6 20:37:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (register_sigaltstack): ignore sigaltstack error.
+	  It fails on OpenBSD 4.4 when pthread library is linked.
+
+Fri Feb  6 18:18:07 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_readdir_with_enc): fallback to OS's conversion
+	  when ASCII-8BIT is passed.
+
+Fri Feb  6 17:19:23 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{dir.h, win32.c} (rb_w32_readdir_with_enc): new function to
+	  read entry with specified enc.
+
+	* win32/win32.c (readdir_internal): extract from rb_w32_opendir().
+
+	* win32/win32.c (opendir_internal): extract from rb_w32_readdir().
+
+	* dir.c (dir_read, dir_each): use new READDIR macro instead of readdir()
+	  to pass enc for special version of readdir, such as above.
+
+Fri Feb  6 12:11:24 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (process_options): set initial default_external before -r.
+
+Fri Feb  6 12:03:47 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (process_options): -K and -E in shebang should be reflect to
+	  default_external. [ruby-dev:37920]
+
+Fri Feb  6 07:52:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (chfunc): type fixed.
+
+Fri Feb  6 02:51:59 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_each_codepoint): update RDoc for
+	  String#codepoints.  a patch from Radoslaw Bulat in
+	  [ruby-core:21835]
+
+Fri Feb  6 01:09:13 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead
+	  of #elif.  a patch from NISHIMATSU Takeshi <t_nissie at yahoo.co.jp>
+	  in [ruby-list:45856].
+
+Thu Feb  5 20:28:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_run_exec_options_err): renamed from
+	  rb_run_exec_options.
+	  (rb_exec_err): renamed from rb_exec.
+	  (rb_fork_err): renamed from rb_fork.
+	  (rb_spawn_err): renamed from rb_spawn.
+	  (rb_run_exec_options): declared with 1.9.1 compatible signature.
+	  (rb_exec): ditto.
+	  (rb_fork): ditto.
+	  (rb_spawn): ditto.
+
+	* process.c (rb_run_exec_options_err): renamed from
+	  rb_run_exec_options.
+	  (rb_exec_err): renamed from rb_exec.
+	  (rb_fork_err): renamed from rb_fork.
+	  (rb_spawn_err): renamed from rb_spawn.
+	  (rb_run_exec_options): defined.
+	  (rb_exec): ditto.
+	  (rb_fork): ditto.
+	  (rb_spawn): ditto.
+
+	* io.c: follow above change.
+
+	* ext/pty/pty.c: follow above change.
+
+	  [ruby-dev:37893]
+
+Thu Feb  5 19:58:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: AddrInfo is renamed to Addrinfo.  [ruby-dev:37876]
+
+Thu Feb  5 16:18:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_SITE_LIB_PATH, RUBY_VENDOR_LIB_PATH): fix for
+	  NetBSD.
+
+Thu Feb  5 16:04:29 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): follow recent changes about paths.
+
+Thu Feb  5 14:26:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (MAJOR, MINOR, TEENY): uses RUBY_VERSION_*.
+
+	* mkconfig.rb (prefix): uses ruby_version in config.status.
+
+Thu Feb  5 12:24:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_uniq): gets rid of copying.
+
+Thu Feb  5 12:01:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_add_hash): split from ary_make_hash().
+
+	* array.c (ary_make_hash): hide a Hash used internally.
+
+	* array.c (ary_recycle_hash): clears internally used hash.  this
+	  name came from [ruby-dev:37908].
+
+	* array.c (rb_ary_diff, rb_ary_and, rb_ary_or, rb_ary_uniq_bang):
+	  recycle hashes.
+
+Thu Feb  5 11:21:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_LIB_VERSION): added for library version, to
+	  split from core version.  [ruby-dev:37748]
+
+	* configure.in (RUBY_LIB_PATH, etc): moved actual version
+	  dependent stuff to version.c.
+
+	* ruby.c (ruby_init_loadpath_safe): ditto.
+
+	* version.c (ruby_initial_load_paths): moved initial load path
+	  version depending on version from ruby.c.
+
+	* version.h (RUBY_VERSION_{MAJOR,MINOR,TEENY}): now mean library
+	  and API version, and reverted to 1.9.1.  [ruby-dev:37889]
+
+Thu Feb  5 07:39:33 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/readline/readline.c (Init_readline): remove_history(0) may be
+	  NULL.  [ruby-dev:37891]
+
+Thu Feb  5 03:55:22 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (LOCALTIME): should call tzset() before localtime_r().
+	  [ruby-dev:37896]
+
+Thu Feb  5 02:12:35 2009  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/configure.bat: Updated Symbian configuration procedure to
+	  avoid creating files outside build directory
+
+	* symbian/pre-build: ditto
+
+	* symbian/setup: ditto
+
+	* symbian/rubyu.def: removed
+
+Thu Feb  5 01:44:02 2009  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_econv_exception): refine error message for
+	  undefined conversion.  [ruby-core:21828]
+
+Thu Feb  5 01:18:25 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_socketpair): make 3rd argument optional.
+
+	* ext/socket/unixsocket.c (unix_s_socketpair): follow the above
+	  change.
+
+	* ext/socket/rubysocket.h (sock_s_socketpair): ditto.
+
+Thu Feb  5 00:09:39 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_ipv6_to_ipv4): new method.
+
+Wed Feb  4 21:59:31 2009  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_econv_exception): show U+XXXX form for undefined
+	  conversion error from UTF-8.
+
+Wed Feb  4 21:57:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_dump): use MBCLEN_CHARFOUND_P properly.
+
+Wed Feb  4 21:55:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb: refine success message.
+
+Wed Feb  4 19:10:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (id.h): updates from parse.h.
+
+Wed Feb  4 11:45:06 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb: shouldn't export DllMain.
+	  reported at http://pc11.2ch.net/test/read.cgi/tech/1233686068/21
+
+Wed Feb  4 10:12:05 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/vsnprintf.c (BSD_vfprintf): should support 't' format
+	  modifier to handle PRIdPTRDIFF.  thanks for the info from
+	  Kazuhiro NISHIYAMA.  [ruby-core:21807]
+
+Wed Feb  4 01:28:46 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: fix struct in_pktinfo and struct in6_pktinfo
+	  detection.
+
+Wed Feb  4 00:32:59 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/etc/test_etc.rb(test_getpwnam, test_getgrgid, test_getgrnam):
+	  support an environment that has duplicative entries.  a patch from
+	  Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp> in
+	  [ruby-dev:37882].
+
+Wed Feb  4 00:17:52 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): skip
+	  socket creation error.
+
+Tue Feb  3 23:37:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): resets EOF flag after parse.
+
+Tue Feb  3 23:13:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace): always returns non-nil array if lev is
+	  negative.  [ruby-core:21795]
+
+Tue Feb  3 21:19:06 2009  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/extconf.rb: checked rl_set_screen_size and
+	  rl_get_screen_size.
+
+	* ext/readline/readline.c (readline_s_set_screen_size): added
+	  Readline.set_screen_size.
+
+	* ext/readline/readline.c (readline_s_get_screen_size): added
+	  Readline.get_screen_size.
+
+Tue Feb  3 21:07:19 2009  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c (readline_s_set_completion_proc): set
+	  default if proc is nil. fix #1095
+
+Tue Feb  3 16:36:06 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* array.c (rb_ary_sort_by_bang): RDoc update.
+
+	* NEWS: add Array#sort_by!.
+
+Tue Feb  3 16:23:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): new
+	  private function for allocating same port both IPv4 and IPv6.
+	  (Socket.tcp_server_sockets): use tcp_server_sockets_port0 for port 0.
+
+Tue Feb  3 14:12:10 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: validate data before sending to a server.
+	  [ruby-core:20320]
+
+Tue Feb  3 12:35:41 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (match_array): replace match_check().
+
+	* re.c (match_values_at): ditto.
+
+Tue Feb  3 12:09:08 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (hmac_md5): should use String#ord to get ascii
+	  code from the one-character string.
+
+Tue Feb  3 11:25:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_lock): warn for circular require.  [ruby-core:20794],
+	  [ruby-core:20797]
+
+Tue Feb  3 08:35:12 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets): extracted from
+	  Socket.tcp_server_loop.
+	  (Socket.accept_loop): ditto.
+	  (Socket.unix_server_socket): extracted from Socket.unix_server_loop.
+	  (Socket.unix_server_loop): use Socket.accept_loop.
+
+Tue Feb  3 08:21:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_readpartial.rb (make_pipe): readpartial does not
+	  work in text mode.
+
+Tue Feb  3 08:18:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (RUBYDEF): uses mkexports.rb on cygwin too.
+
+	* win32/mkexports.rb (Exports::Cygwin): added.
+
+Tue Feb  3 08:10:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (Doxyfile): moved from Makefile.in.
+
+	* template/Doxyfile.tmpl: split from Doxyfile.in.
+
+Tue Feb  3 08:01:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write): use of cast expressions as lvalues
+	  is deprecated.
+
+Tue Feb  3 07:57:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/extconf.rb (in_pktinfo, in6_pktinfo),
+	  ext/socket/ancdata.c: defined in w32api/ws2tcpip.h on cygwin but
+	  cannot compile for some reason.
+
+Tue Feb  3 07:02:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/langinfo.c (nl_langinfo_codeset): accepts iso-8859
+	  fragment.  [ruby-core:21757]
+
+Tue Feb  3 07:01:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb (patchlevel): config.status may not contain
+	  PATCHLEVEL even if other version numbers exist.
+
+Mon Feb  2 23:43:00 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (Init_addrinfo): add AddrInfo#to_s as an
+	  alias of AddrInfo#to_sockaddr.
+
+	* ext/socket/option.c (Init_sockopt): add Socket::Option#to_s as an
+	  alias of Socket::Option#data.
+
+	  [ruby-dev:37873]
+
+Mon Feb  2 21:04:13 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_sort_by_bang): RDoc update.  [ruby-core:21742]
+
+Mon Feb  2 20:49:24 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c: Introduce id_each to save rb_intern() and SYM2ID()
+	  calls.
+
+Mon Feb  2 19:55:51 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_addrinfo.rb: use AddrInfo.getaddrinfo to generate
+	  IPv6 address.  AddrInfo.ip generates IPv4 address for IPv4 mapped
+	  IPv6 address if --with-lookup-order-hack=INET.
+	  [ruby-dev:37868]
+
+Mon Feb  2 19:17:16 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* doc/NEWS-1.9.1: typo fixed: collect_all -> collect.
+	   [ruby-core:21706]
+
+Mon Feb  2 17:23:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (dir.o, win32.o): depend on win32/dir.h.
+
+Mon Feb  2 17:13:46 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* mkconfig.rb: patchlevel is sometimes minus.
+
+	* win32/resource.rb: ditto.
+
+Mon Feb  2 17:11:23 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (cmsg_type_to_sym): add #ifdef for no IPv6
+	  environment.
+
+Mon Feb  2 17:05:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext): should not be infected from other
+	  load paths.
+
+Mon Feb  2 16:33:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_s_home): new method.   [ruby-core:21454]
+
+Mon Feb  2 16:06:10 2009  Tanaka Akira  <akr@fsij.org>
+
+	* version.h: bump up to 1.9.2 patchlevel -1.
+	  yugui recommend "-1" strongly.
+
+	* lib/rubygems/version.rb: accept negative patchlevel.
+
+Mon Feb  2 14:53:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,
+	  optional.
+
+Mon Feb  2 14:47:53 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_sort_by_bang): new method.  requested in
+	  [ruby-core:21709]
+
+Mon Feb  2 14:22:56 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/constants.c (cmsg_type_arg): INET6 check.
+
+Mon Feb  2 14:18:20 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: use INET6 instead of IPV6.
+
+Mon Feb  2 12:47:47 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/{options,raddrinfo}.c: use INET6 instead of AF_INET6 for
+	  VC++6.
+
+Mon Feb  2 12:41:52 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* complex.c (f_signbit): regard NaN as a positive value.
+	  [ruby-dev:37861].
+
+Mon Feb  2 12:39:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sample/test.rb (valid_syntax?), test/ruby/test_system.rb
+	  (TestSystem::valid_syntax?): use catch and throw instead of
+	  return inside BEGIN block.
+
+Mon Feb  2 11:45:10 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (cmsg_type_arg): declared.
+	  (Init_ancdata): ditto.
+
+	* ext/socket/init.c (Init_socket_init): call Init_ancdata.
+
+	* ext/socket/constants.c (cmsg_type_arg): defined.
+
+	* ext/socket/depend: add dependency for ancdata.o.
+
+	* ext/socket/mkconstants.rb: generate scm_optname_to_int.
+	  more constants.
+
+	* ext/socket/extconf.rb: add ancdata.o.
+
+	* ext/socket/ancdata.c: new file.  new method
+	  BasicSocket#{sendmsg,sendmsg_nonblock,recvmsg,recvmsg_nonblock}
+
+Mon Feb  2 10:57:27 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, win32/dir.h (open_dir_handle, rb_w32_opendir,
+	  move_to_next_entry, rb_w32_readdir, check_valid_dir): change backend
+	  API from A to W.
+
+Mon Feb  2 10:48:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/basicsocket.c (bsock_setsockopt): accept Socket::Option
+	  object.
+	  (bsock_getsockopt): return Socket::Option object.
+
+	* ext/socket/option.c: new file.
+
+	* ext/socket/rubysocket.h (rb_cSockOpt): declared.
+	  (sockopt_new): ditto.
+	  (Init_sockopt): ditto.
+
+	* ext/socket/init.c (Init_socket_init): call Init_sockopt.
+
+	* ext/socket/depend: add dependency for option.o
+
+	* ext/socket/mkconstants.rb: generate intern_level, intern_so_optname,
+	  intern_ip_optname, intern_ipv6_optname, intern_tcp_optname,
+	  intern_udp_optname and intern_scm_optname.
+
+	* ext/socket/extconf.rb: add option.o.
+
+Mon Feb  2 09:49:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace_each): progname is not available at
+	  initializing phase.
+
+Mon Feb  2 08:12:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/xmlrpc/server.rb (Server#serve): gets rid of hardcoded
+	  platform names.
+
+	* lib/resolv.rb (Resolv::Hosts::DefaultFileName),
+	  (Resolv::DNS::Config.default_config_hash): tries win32/resolv on
+	  mswin64 too.
+
+	* lib/rubygems/specification.rb (Gem::Specification#ruby_code):
+	  added mswin64.
+
+	* lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
+	  spawn is better to start a process in background.
+
+	* ext/extmk.rb: uses FNM_SYSCASE.
+
+	* instruby.rb: installs win32.h on mswin64 platform.
+	  [ruby-core:21722]
+
+Mon Feb  2 07:36:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace_each): now takes an iterator function.
+
+	* vm_core.h (rb_make_backtrace, rb_backtrace_each): added
+	  prototypes.
+
+	* vm_dump.c (rb_vm_bugreport), vm_eval.c (rb_backtrace): gets rid
+	  of allocating objects.  [ruby-core:21619]
+
+	* vm_eval.c (rb_backtrace_each): new function which iterates over
+	  each backtrace info.
+
+Mon Feb  2 06:51:36 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encoding): Windows' filesystem encoding is
+	  sometimes ANSI code page and sometimes OEM code page. we should check
+	  whether code page is used.
+
+Sun Feb  1 21:27:55 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_ipv4_private_p): new method.
+	  (addrinfo_ipv4_loopback_p): ditto.
+	  (addrinfo_ipv4_multicast_p): ditto.
+
+Sun Feb  1 16:10:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (Switch#summarize): strips an equal sign from
+	  short option, and fills right sides in shorter lines.
+	  [ruby-talk:326414]
+
+Sun Feb  1 05:19:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const):
+	  avoids infinite self recursion autoload.  [ruby-core:21696]
+
+Sat Jan 31 22:50:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb (assert_equal): show class in failure
+	  message if meaningful.
+
+Sat Jan 31 22:38:46 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS#each_address): don't query IPv6 address
+	  if the host has no global IPv6 address.
+
+Sat Jan 31 22:29:05 2009  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (STR2CSTR): removed.
+	  (rb_str2cstr): removed.
+
+	* object.c (rb_str2cstr): removed.
+
+Sat Jan 31 20:07:59 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_ipv6_unspecified_p): new method.
+	  (addrinfo_ipv6_loopback_p): ditto.
+	  (addrinfo_ipv6_multicast_p): ditto.
+	  (addrinfo_ipv6_linklocal_p): ditto.
+	  (addrinfo_ipv6_sitelocal_p): ditto.
+	  (addrinfo_ipv6_v4mapped_p): ditto.
+	  (addrinfo_ipv6_v4compat_p): ditto.
+	  (addrinfo_ipv6_mc_nodelocal_p): ditto.
+	  (addrinfo_ipv6_mc_linklocal_p): ditto.
+	  (addrinfo_ipv6_mc_sitelocal_p): ditto.
+	  (addrinfo_ipv6_mc_orglocal_p): ditto.
+	  (addrinfo_ipv6_mc_global_p): ditto.
+
+Sat Jan 31 19:09:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_require_safe): raises when the path to be loaded is
+	  tainted.  [ruby-dev:37843]
+
+Sat Jan 31 18:08:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (optflags): defaulted to -O3 to get rid of slug of
+	  gcc 4.3.
+
+Sat Jan 31 18:03:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (List#accept, parse_in_order): n option is no
+	  longer needed.
+
+Sat Jan 31 14:12:43 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb (Pathname#each_child): new method.
+
+Sat Jan 31 00:07:49 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb
+	  (Test::Unit::Assertions#assert_nothing_raised): suppress warning.
+	  [ruby-core:21312]
+
+Fri Jan 30 21:49:32 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb (Pathname#realdirpath): new method based on the
+	  patch in [ruby-dev:36560] by Akinori MUSHA.
+	  [ruby-dev:36290]
+
+Fri Jan 30 18:04:23 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write): limit write size to 32KB if the file
+	  seems to be console.  [ruby-core:21613]
+
+Fri Jan 30 16:12:32 2009  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/curses/curses.c (Init_curses): Curses#crmode and
+	  Curses#nocrmode changes to the module function.
+	  fix #916
+
+Fri Jan 30 14:31:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/make-snapshot (prereq): remove enc.mk from tarball because
+	  BSD make checks $(srcdir)/enc.mk and try to run $(builddir)/enc.mk.
+
+Fri Jan 30 14:11:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/depend: extract compile rules to each target for nmake.
+
+Fri Jan 30 12:59:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (RUBYDEF): depends on makefiles.
+
+	* cygwin/GNUmakefile.in (RUBYDEF): adds DATA to non-function symbols
+	  which is not marked as T.
+
+Fri Jan 30 11:03:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_respond_to): gets rid of
+	  overcounting.   [ruby-dev:37703]
+
+Fri Jan 30 02:55:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_init_by_convpath_i): make it static.
+
+Thu Jan 29 16:22:41 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* load.c (rb_feature_provided): should not calculate len by pointer
+	  subtraction because feature may be a expanded path.
+	  [ruby-core:21267]
+
+Thu Jan 29 14:12:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (BASERUBY): erases RUBYOPT at the test.
+
+	* configure.in (OBJCOPY): not used on Windows.
+
+Thu Jan 29 13:16:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/securerandom.rb (SecureRandom.uuid): uses unpacked array
+	  instead of string, because String#[] returns one length string.
+
+Thu Jan 29 12:29:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake.rb (FileUtils#rake_system): no longer needs workaround
+	  on Windows.  [ruby-core:21339]
+
+	* lib/rake/win32.rb (Rake::Win32#rake_system): ditto.
+
+	* lib/rake/win32.rb (Rake::Win32#win32_system_dir): no longer
+	  needs environment variables other than APPDATA now.
+
+	* lib/rake.rb (Rake::Application#standard_system_dir): uses
+	  platform specific definition on Windows system.
+
+Thu Jan 29 12:18:54 2009  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* lib/securerandom.rb: new method SecureRandom#uuid
+
+Thu Jan 29 11:22:19 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (inspect_sockaddr): if defined AF_INET6,
+	  perhaps can inspect IPv6 addresses if not defined INET6.
+
+	* ext/socket/socket.c (socket_s_ip_address_list): support Windows XP
+	  or later. (Win2k or earlier is still not supported)
+
+Thu Jan 29 00:24:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_run): previous change didn't resolve the
+	  problem.
+
+Wed Jan 28 22:51:12 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_run): desperately guard the variable.
+	  [ruby-core:20576]
+
+Wed Jan 28 15:24:11 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* math.c: SEGV is caused by implicit rb_to_float declaration
+	  test_complexrational.rb: [BUG] in IA-64 architecture
+
+Tue Jan 27 20:02:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (socks_connect_blocking): moved from
+	  sockssocket.c.  [ruby-dev:37834]
+
+	* sockssocket.c (socks_init): don't omit "int" type.
+
+Tue Jan 27 14:41:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
+	  non-function symbols.  [ruby-core:21582]
+
+	* win32/mkexports.rb (Exports::Mingw#each_export): ditto.
+
+Tue Jan 27 12:59:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/ripper/depend: use VPATH.
+	  If a platform doesn't support VPATH, Ruby doesn't support it:
+	  for example MSYS. [ruby-core:21570]
+
+Tue Jan 27 12:21:17 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/ripper/depend: lex.c's correct path is ../../lex.c.
+
+Tue Jan 27 11:09:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_header): checks the header depending on
+	  platform.
+
+	* lib/mkmf.rb (have_header, find_header): use try_header.
+
+	* win32/Makefile.sub (try_header): uses try_compile to get rid of
+	  slow -E option of VC.
+
+Tue Jan 27 11:03:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (distclean-enc, realclean-enc): do not call clean of
+	  enc.mk twice or more.
+
+	* enc/depend (cleanobjs): added deffile.
+
+	* lib/mkmf.rb (create_makefile): removes deffile at clean instead
+	  of distclean.
+
+	* win32/Makefile.sub (miniruby, LIBRUBY_SO): removes lib and exp
+	  files.
+
+	* win32/Makefile.sub (clean, distclean): have moved to common.mk.
+
+	* win32/rmdirs.bat: omits `not empty' message.
+
+Tue Jan 27 10:15:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (struct rb_transcoding): added ary member for debug.
+
+Tue Jan 27 10:10:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Doxyfile.in (FILE_VERSION_FILTER, INPUT_FILTER): should not use
+	  ./miniruby directly for cross compiling.
+
+Tue Jan 27 04:02:53 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/ripper/depend: fixed dependency path to lex.c.
+	  [ruby-core:21570]
+
+Tue Jan 27 03:43:34 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_any_hash): fixed performance issues with nil, true,
+	  false as hash keys.  a patch from Matthias Waechter.
+	  [ruby-core:21568]
+
+Tue Jan 27 03:23:43 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): should point correct path to
+	  ruby.h and defines.h.   [ruby-core:21569]
+
+Mon Jan 26 16:00:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_aset): fixed arguments evaluation order.
+
+Mon Jan 26 15:49:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pathname.rb (chop_basename, prepend_prefix): use o option.
+
+Sun Jan 25 16:35:44 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (socket_s_ip_address_list): renamed from
+	  socket_s_list_ip_address.  [ruby-dev:37806]
+
+Sun Jan 25 12:17:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (RUBYDEF): needs read-only section too.
+
+Sun Jan 25 12:02:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (clean-ext): condition of EXTS was inverted.
+
+Sun Jan 25 11:50:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): fixed the variables order because
+	  converter proc refers the separator.
+
+Sun Jan 25 11:25:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and
+	  parents.
+
+	* Makefile.in, win32/Makefile.sub (distclean-rdoc): added to remove
+	  temporary rdoc.
+
+	* Makefile.in, win32/Makefile.sub (clean-ext): skips non-existent
+	  directories.
+
+	* common.mk (clean, distclean): cleans rdoc.
+
+	* common.mk (clean-extout): removes extout directory.
+
+	* configure.in (RMDIRS, RMALL): added to clean extout.
+
+	* lib/fileutils.rb (FileUtils#rmdir): added :parents option.
+
+	* lib/mkmf.rb (create_makefile): cleans installed files at clean
+	  instead of distclean.
+
+	* lib/mkmf.rb (create_makefile): added clean-so and clean-rb.
+
+	* lib/mkmf.rb (def init_mkmf): added DISTCLEANDIRS.
+
+	* lib/un.rb (rmdir): added -p option.
+
+	* tool/rmdirs, win32/rmdirs.bat: removes directory and the parents.
+
+	* win32/rm.bat: added -r option.
+
+Sun Jan 25 09:09:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (join_path): use strlcat() to force link.
+
+	* dir.c (glob_helper): no strcpy() is needed since len is known.
+
+Sun Jan 25 06:44:58 2009  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_ssl.c: Server Name Indication support.
+	  new methods SSLContext#server_name_cb=, SSLSocket#hostname=.
+
+	* test/openssl/test_ssl.rb: Tests for above.
+
+Sat Jan 24 08:22:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): tools under the top source
+	  directory are not installed, so unusable outside extmk.rb.
+
+Fri Jan 23 17:24:31 2009  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* golf_prelude.rb (Enumerator#inspect): avoid warning.
+
+Fri Jan 23 15:12:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (mkintpath): new function which converts native path
+	  to format acceptable in Makefile.
+
+	* lib/mkmf.rb (configuration): leaves PATH_SEPARATOR unchanged.
+
+	* lib/mkmf.rb (configuration): converts srcdir, topdir and hdrdir.
+	  a patch by Alexey Borzenkov <snaury AT gmail.com> at
+	  [ruby-core:21448].
+
+	* lib/mkmf.rb (try_func): got rid of c-mode confusion.
+
+Fri Jan 23 13:26:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (trap_handler): also accepts symbols.  [ruby-dev:37823]
+
+Thu Jan 22 18:14:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): removes installed files under
+	  extout at distclean.
+
+Thu Jan 22 17:12:37 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI.parse): generate only key on params hash
+	  if request have only key uri parameters.
+		(ex. index.cgi?aaa&bbb=1 # params=>{:aaa=>[],:bbb=>["1"]})
+
+	* test/cgi/test_cgi_core.rb: fix test for key only params.
+
+Thu Jan 22 16:29:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/installer.rb (Gem::Installer#initialize): fixed
+	  typos.
+
+	* test/rubygems/test_gem.rb (test_self_dir): removed false
+	  assertions.
+
+	* test/rubygems/test_gem.rb (test_self_set_paths): checks if paths
+	  are included.
+
+	* test/rubygems/test_gem_commands_install_command.rb
+	  (test_execute_remote): checks diagnostic message too.
+
+	* test/rubygems/test_gem_installer.rb (load): uses Gem.ruby.
+
+	* test/rubygems/gemutilities.rb (Gem.ruby): initializes from the
+	  environment variable to run without installation.
+
+	* test/rubygems/gemutilities.rb (RubyGemTestCase#util_build_gem):
+	  creates cache directory.
+
+Thu Jan 22 16:12:51 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* revert previous revision.  it's already out-of-date.
+
+Thu Jan 22 15:54:02 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h, win32/win32.c (rb_w32_is_valid_fd): new function
+	  to validate fd.
+
+	* io.c (rb_io_initialize): check fd with above function.
+
+Thu Jan 22 14:53:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_process.rb (MANDATORY_ENVS): needs RUBYLIB to run
+	  tests without install.
+
+Thu Jan 22 12:19:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (define_final): cannot define finalizer for immediate
+	  values.  [ruby-core:21500]
+
+	* gc.c (define_final): freezes or hides internal values.
+
+Thu Jan 22 11:33:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_time_timeval): made a real prototype.  a patch from
+	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:21492].
+
+Wed Jan 21 21:43:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_ungetbyte, rb_io_ungetc): allows nil to reset EOF
+	  flag with ungetting nothing.
+
+	* ruby.c (load_file_internal): rests EOF flag to make possible to
+	  load from stdin after reading data.
+
+Wed Jan 21 17:17:18 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (ary_double_capa): a new function to expand array more
+	  aggressively.   [ruby-core:21460]
+
+	* array.c (rb_ary_store): use ary_double_capa().
+
+	* array.c (rb_ary_unshift_m): ditto.
+
+	* array.c (rb_ary_splice): ditto.
+
+Wed Jan 21 15:32:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_ungetbyte, rb_io_ungetc): clears EOF flag.
+
+Wed Jan 21 14:41:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (take_items): to_ary() raises ArgumentError if cannot to
+	  convert to Array. [ruby-dev:37797]
+
+Wed Jan 21 14:32:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (debug_lines): calls rb_intern() once.
+
+Wed Jan 21 13:58:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h (FMODE_EOF): EOF flag on TTY.
+
+	* io.c (io_set_eof): sets EOF flag for TTY.
+
+	* io.c (io_seek): clears EOF flag.
+
+	* io.c (io_fillbuf): returns EOF if already met EOF.  [ruby-dev:37798]
+
+	* io.c (io_fillbuf, io_fread, io_getpartial): sets EOF.
+
+Wed Jan 21 08:22:04 2009  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.3.1 r4532.
+	* test/minitest/*.rb: ditto.
+
+Tue Jan 20 20:16:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (socket_s_list_ip_address): new method.
+	  (sockaddr_obj): new function.
+
+	* ext/socket/rubysocket.h: include ifaddrs.h, sys/ioctl.h,
+	  sys/sockio.h, net/if.h if available.
+	  (addrinfo_new): declared.
+
+	* ext/socket/raddrinfo.c (addrinfo_new): exported.
+
+	* ext/socket/extconf.rb: check ifaddrs.h, sys/ioctl.h, sys/sockio.h,
+	  net/if.h and getifaddrs.
+
+Tue Jan 20 20:05:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (pseudo_AF_FTIP): moved from mkconstants.rb.
+
+	* ext/socket/mkconstants.rb: prepend header if -H is not given.
+
+Tue Jan 20 17:50:00 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_buf): use nkf_char.
+
+Tue Jan 20 16:17:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (ruby_Init_{Continuation_body,Fiber_as_Coroutine}): prefixed
+	  with ruby_ to export.
+
+	* ext/continuation/continuation.c, ext/fiber/fiber.c: ditto.
+
+Tue Jan 20 15:32:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (miniruby): renames and then removes, to get rid of
+	  EPERM on cygwin and mingw.
+
+	* Makefile.in ($(LIBRUBY_SO)): use wildcard option of objcopy.
+
+	* configure.in (DLDFLAGS): do not export all symbols.
+
+	* cygwin/GNUmakefile.in (RUBYDEF): rejects symbols prefixed with
+	  Init_.
+
+	* win32/mkexports.rb (Exports::Mingw): includes all symbols as
+	  well as mswin32, except for prefixed with Init_.
+
+Tue Jan 20 13:03:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (hash): fixed the tail bytes handling in the aligned
+	  access case.
+
+Tue Jan 20 09:26:05 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
+
+	* ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.
+
+Tue Jan 20 06:48:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (take_items), enum.c (enum_zip): tries to convert to
+	  array first.  [ruby-core:21442]
+
+Tue Jan 20 03:50:37 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Update nkf to 2.0.9.
+	  revert -s meaning as Shift_JIS, etc.
+
+Tue Jan 20 03:42:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (hash): fixed typo.  [ruby-dev:37791]
+
+Tue Jan 20 01:15:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (SOMAXCONN): defined.
+
+Mon Jan 19 22:31:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: use erb for generating code.
+
+Mon Jan 19 17:33:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (hash): defaulted to MurmurHash 2.0.
+
+Mon Jan 19 17:29:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h (RUBY_ALIAS_FUNCTION_TYPE): added.
+
+Mon Jan 19 17:24:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (vm_stack_dump_each): used only if debug mode.
+
+Mon Jan 19 16:32:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (hash): added MurmurHash 2.0.
+
+Mon Jan 19 14:31:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_execute_interrupts): needs
+	  rb_signal_buff_size to be declared.
+
+Mon Jan 19 13:34:25 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.c (require_libraries): reset th->parse_in_eval while
+	  loading libraries.  fixes [ruby-dev:37780]
+
+Mon Jan 19 11:46:39 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c, eval.c (rb_f_block_given_p): move definition of
+	  "iterator?" and "block_given?" to make static.
+
+	* vm.c (vm_get_ruby_level_caller_cfp): make it static.
+
+	* eval_intern.h, vm_insnhelper.c: move decl. of
+	  vm_get_ruby_level_caller_cfp()
+	  from eval_intern.h to vm_insnhelper.c.
+
+Mon Jan 19 11:27:39 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: add a prefix "rb_" to exposed functions
+	  vm_get_ruby_level_next_cfp(), rb_vm_make_env_object(),
+	  vm_stack_to_heap(), vm_make_proc(), vm_invoke_proc(),
+	  vm_get_sourceline(), vm_cref(), vm_localjump_error(),
+	  vm_make_jump_tag_but_local_jump(), vm_jump_tag_but_local_jump().
+	  This changes may affect only core because most of renamed functions
+	  require a pointer of not-exposed struct such as rb_thread_t or NODE.
+	  In short, they are core functions.
+
+	* cont.c, eval.c, eval_intern.h, load.c, proc.c, thread.c,
+	  vm_core.h, vm_dump.c, vm_eval.c, vm_exec.c, vm_insnhelper.c:
+	  ditto.
+
+Mon Jan 19 11:22:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/rubysocket.h (rb_cUNIXSocket, rb_cUNIXServer),
+	  (unixpath, unixaddr): UNIX domain sockets depend on sys/un.h.
+
+Mon Jan 19 11:02:30 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c: add a prefix "rb_vmdebug_" to
+	  vm_stack_dump_raw(), vm_stack_dump_raw_current(),
+	  vm_env_dump_raw(), vm_proc_dump_raw(), vm_stack_dump_th(),
+	  vm_debug_print_register(), vm_thread_dump_regs(),
+	  vm_debug_print_pre(), vm_debug_print_post(),
+	  vm_thread_dump_state().
+	  This change also may affect core (in fact, user of
+	  above functions may be only ko1).
+
+	* vm_core.h: ditto.
+
+	* vm_exec.h (SDR2): remove duplicate definition.
+
+Mon Jan 19 11:00:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6 only when
+	  defined, as well as addrinfo_ipv6_p().
+
+Mon Jan 19 10:43:38 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_with_gvl): suppress warnings.
+
+Mon Jan 19 10:34:32 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/depend: workaround for nmake. files in depend without
+	  paths should converted by RULE_SUBST, but mkmf.rb cannot recognize
+	  macros currently.
+
+Mon Jan 19 09:53:43 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c:
+	  rename ruby_iseq_disasm_insn() -> rb_iseq_disasm_insn().
+	  rename ruby_iseq_disasm() -> rb_iseq_disasm().
+
+	* compile.c:
+	  rename ruby_iseq_compile() -> rb_iseq_compile_node().
+	  rename ruby_iseq_translate_threaded_code() ->
+	         rb_iseq_translate_threaded_code().
+	  rename ruby_insns_name_array() -> rb_insns_name_array().
+	  rename ruby_iseq_build_from_ary() -> rb_iseq_build_from_ary().
+
+	* iseq.c, compile.c: remove ruby_insn_make_insn_table() and make
+	  static function insn_make_insn_table().
+
+	* iseq.h, ruby.c, vm.c, vm_core.h, vm_eval.c, vm_dump.c,
+	  blockinlining.c: ditto.
+	  Rename strange "ruby_" prefix to "rb_" prefix.
+	  This changes may affect only core because renamed functions
+	  require a pointer of rb_iseq_t which is not exposed.
+
+Mon Jan 19 09:21:04 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/mkconstants.rb: define macros with default value in
+	  constdefs.h if not exist them.
+
+	* ext/socket/raddrinfo.c (addrinfo_mdump, addrinfo_mload): support
+	  UNIX socket only on platforms which support it.
+
+Mon Jan 19 08:56:53 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, vm_eval.c (rb_f_local_variables): move definition from eval.c
+	  to vm_eval.c because vm_collect_local_variables_in_heap() should
+	  be static function.
+
+	* vm.c (vm_collect_local_variables_in_heap): make it static.
+
+Mon Jan 19 04:06:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_load): renamed from ruby_iseq_load, since it is
+	  for C extensions or the ruby core.  [ruby-core:21407]
+
+Mon Jan 19 03:06:22 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (str_transcode0): fix: :xml option doesn't
+	  work on str.encode([options]) form without default_internal.
+
+Sun Jan 18 16:56:46 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_inspect_sockaddr): new
+	  method AddrInfo#inspect_sockaddr.
+	  (inspect_sockaddr): extracted from addrinfo_inspect.
+	  (addrinfo_inspect): use inspect_sockaddr.
+	  (Init_addrinfo): define the new method.
+
+Sun Jan 18 16:46:37 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_ip_address): new method
+	  AddrInfo#ip_address.
+	  (addrinfo_ip_port): new method AddrInfo#ip_port.
+	  (Init_addrinfo): define the methods above.
+
+Sun Jan 18 14:29:52 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/unixsocket.c: redundant #ifdef removed.
+
+Sun Jan 18 03:33:23 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_mdump): don't use symbol.
+	  (addrinfo_mload): ditto.
+
+Sun Jan 18 03:05:20 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_mdump): new method.
+	  (addrinfo_mload): new method.
+	  (Init_addrinfo): define the method above.
+
+	* ext/socket/constants.c (constant_arg): str_to_int's first argument
+	  constified.
+
+	* ext/socket/mkconstants.rb (gen_name_to_int_decl): generated
+	  function's first argument constified.
+	  (gen_name_to_int_func_in_guard): ditto.
+	  (ipproto_to_int): generated.
+
+	* ext/socket/rubysocket.h (IS_IP_FAMILY): moved from raddrinfo.c.
+
+Sun Jan 18 01:37:50 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_getnameinfo): accept AddrInfo object.
+
+	* ext/socket/raddrinfo.c (rb_check_sockaddr_string_type): defined.
+
+	* ext/socket/rubysocket.h (rb_check_sockaddr_string_type): declared.
+
+Sat Jan 17 22:01:15 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb: new file.
+
+Sat Jan 17 19:33:48 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in (VCSUP): fixed the cases for git-svn or git.
+
+	* win32/Makefile.sub (VCSUP): ditto.
+
+	* Makefile.in (up): `cd' is necessary for git and git-svn.
+
+Sat Jan 17 19:16:16 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: generate a header file for generated
+	  functions.
+
+	* ext/socket/rubysocket.h: include constdefs.h.  don't declare
+	  generated functions.
+
+	* ext/socket/constants.c: include constdefs.c instead of constants.h.
+
+	* ext/socket/depend: dependency updated.
+
+Sat Jan 17 17:58:22 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod.
+	  [ruby-core:21383].
+
+Sat Jan 17 15:01:22 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (make_inspectname): add a res argument to
+	  suppress numeric inspectname.
+	  (init_addrinfo_getaddrinfo): call make_inspectname here.
+	  (addrinfo_firstonly_new): follow make_inspectname change.
+	  (addrinfo_list_new): ditto.
+	  (addrinfo_initialize): follow init_addrinfo_getaddrinfo change.
+
+Sat Jan 17 14:52:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: don't cause an error for duplicate names.
+
+Sat Jan 17 12:46:17 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: split files for each class.
+
+	* ext/socket/rubysocket.h: common header.
+
+	* ext/socket/basicsocket.c: new file for BasicSocket.
+
+	* ext/socket/ipsocket.c: new file for IPSocket.
+
+	* ext/socket/tcpsocket.c: new file for TCPSocket.
+
+	* ext/socket/tcpserver.c: new file for TCPServer.
+
+	* ext/socket/sockssocket.c: new file for SOCKSSocket.
+
+	* ext/socket/udpsocket.c: new file for UDPSocket.
+
+	* ext/socket/unixsocket.c: new file for UNIXSocket.
+
+	* ext/socket/unixserver.c: new file for UNIXServer.
+
+	* ext/socket/socket.c: now for Socket.
+
+	* ext/socket/raddrinfo.c: new file for AddrInfo and name resolution.
+
+	* ext/socket/constants.c: new file for constants.
+
+	* ext/socket/init.c: new file for utilities.
+
+	* ext/socket/mkconstants.rb: export *_to_int.
+
+	* ext/socket/extconf.rb: add new object files.
+
+	* ext/socket/depend: add dependencies for new files.
+
+	* ext/.document: add new files.
+
+Sat Jan 17 11:12:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_restore_0): padding size doesn't need to be large
+	  if alloca is used.  suppress warnings.
+
+Sat Jan 17 11:12:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (vm_stack_dump_each): initialized at declarations.
+
+	* vm_dump.c (rb_vm_bugreport): constified to suppress a warning.
+
+Fri Jan 16 22:30:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c: move addrinfo code.
+
+Fri Jan 16 18:51:11 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (up): tell nmake that need to run command via
+	  shell.
+
+Fri Jan 16 18:43:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): includes all rules and expand
+	  configured values from the environment to create *.inc, sets RM
+	  for ripper.c, and needs chdir if absolute path is given with
+	  -exported option.
+
+Fri Jan 16 18:26:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (VALUE): use unsigned long or long long
+	  instead of uintptr_t, since many %lx and so on are still used.
+
+Fri Jan 16 17:33:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (Makefile): set VCS and VCSUP to support `git svn'
+	  and git.
+
+	* Makefile.in, win32/Makefile.sub (up): split from common.mk.
+
+Fri Jan 16 12:24:39 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (thread_start_func_2): call ruby_cleanup() if thread is
+	  main thread.  [ruby-dev:37624]
+
+Fri Jan 16 12:27:50 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
+	  miniprelude.c, newline.c): if dependencies is newer than targets or
+	  targets don't exist, try to create targets with BASERUBY. no need to
+	  detect errors there because the absence of BASERUBY is not abnormal.
+	  after the try, if the targets still don't exist, copy them from
+	  $(srcdir).
+
+Fri Jan 16 12:15:07 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string.
+	  if not, cause compile error in using PRI?VALUE.
+
+	* win32/Makefile.sub (config.h): add SIZEOF_INTPTR_T and
+	  SIZEOF_UINTPTR_T for SIZEOF_VALUE.
+
+Fri Jan 16 11:51:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbian/pre-build (COMSPEC): should not overridden.
+
+Fri Jan 16 11:47:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_parse_in_main): fixed typo.
+
+Fri Jan 16 11:41:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_REPLACE_TYPE): does not define rb_ prefixed
+	  name if no default type is given.
+
+	* configure.in (RUBY_DEFINT): checks size.
+
+	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX):
+	  assumes usable if PRIdPTR is defined.
+
+Fri Jan 16 02:25:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_thread_execute_interrupts): if signal is already
+	  buffered, main thread should wait until timer thread delivers it.
+
+	* thread.c (timer_thread_function): should defer delivery of a signal
+	  if main thread does not yet trap a previous one.  [ruby-dev:37676]
+
+Fri Jan 16 02:05:55 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (addrinfo_s_ip): new method AddrInfo.ip.
+
+Fri Jan 16 01:42:50 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (call_trace_proc): as Matz said ([ruby-core:21183]),
+	  should skip rb_str_new2() if rb_sourcefile() returns NULL.
+	  rb_sourcefile() returns NULL if frame is toplevel of Fiber.
+	  [ruby-core:21161] [Bug #985]
+
+Fri Jan 16 01:09:37 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.c (process_options): decrement parse_in_eval to recognize
+	  parsing main or normal eval script.
+
+	* compile.c (rb_parse_in_main): return 1 if parsing main script.
+	 (if parse_in_eval is negative value, it means main script)
+
+	* parse.y (yycompile0): check rb_parse_in_main() to accumulate
+	  script text.  Bug #848 [ruby-core:20450]
+
+Fri Jan 16 00:57:34 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/debug.rb: as wanabe-san pointed out,
+	  set_trace_func should be completely final task in debug.rb.
+	  Bug #847 [ruby-core:20449]
+
+Fri Jan 16 00:27:03 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_vm_inc_const_missing_count, ruby_vm_const_missing_count):
+	  added.
+
+	* vm_insnhelper.h: ditto.
+
+	* variable.c (rb_const_get_0), insns.def: Constants should not be
+	  cached if const_missing is called.  [ruby-core:21059] [Bug #967]
+
+	* bootstraptest/test_class.rb: add a test.
+
+Fri Jan 16 00:25:09 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: btest-ruby should receive option with OPTS.
+
+Fri Jan 16 00:21:10 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
+	  miniprelude.c, newline.c): shouldn't copy when $(srcdir) != ".", too.
+	  (this is a workaround.  we need more strict check.)
+
+	* win32/Makefile.sub ($(INSNS)): shouldn't remove BASERUBY.
+
+Fri Jan 16 00:19:55 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_with_gvl): suppress warnings.
+
+Thu Jan 15 20:44:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* tool/file2lastrev.rb: RUBY_REVISION must be an integer.
+
+Thu Jan 15 15:55:31 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (enc_set_default_encoding): should not treat US-ASCII
+	  special here.  a patch from Yui NARUSE in [ruby-dev:37769].
+	  [ruby-dev:37699]
+
+Thu Jan 15 14:27:27 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* LEGAL: Added information for missing/langinfo.c
+
+Thu Jan 15 14:17:57 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (stmt): explicit error for "Object::Far += foo 1" just
+	  as "Object::Far += 1".
+
+	* parse.y (command): moved return/break/next from command_call for
+	  better error message.
+
+	* parse.y (call_args): void value check added.
+
+Thu Jan 15 13:10:58 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (COMPILERFLAG): for enc/trans/gb18030.c.
+
+Thu Jan 15 13:10:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
+	  and mswin.
+
+	* encoding.c (rb_locale_charmap): use environments on mingw and mswin.
+
+	* missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese
+	  environment uses Windows-31J derived from Shift_JIS, not EUC-JP.
+
+Thu Jan 15 12:10:39 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
+	  miniprelude.c, newline.c): copy only when $(srcdir) != pwd.
+
+Thu Jan 15 11:40:44 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (pipe_open): revert a part of previous commit. it may be a
+	  mistake.
+
+Thu Jan 15 10:45:52 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* symbian/README.SYMBIAN: symbian support added.  great appreciate
+	  to <alexandre.zavorine at symbian.com>.
+
+Thu Jan 15 00:06:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/gb18030.trans: get rid of a 1.9 feature for cross
+	  compile.  [ruby-core:21345]
+
+Wed Jan 14 23:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_locale_charmap): fallback to codepage if no
+	  locale is found.  [ruby-core:21110]
+
+	* missing/langinfo.c (nl_langinfo_codeset): returns NULL if no
+	  locale is found.
+
+Wed Jan 14 22:38:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (negative_size_allocation_error_with_gvl): abolish a warning.
+	  (negative_size_allocation_error): ditto.
+
+	* ext/openssl/ossl.c (ossl_raise): ditto.
+
+Wed Jan 14 20:05:05 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/gb18030.trans, gb18030-tbl.rb:
+	  new Chinese GB18030 transcoding (from Yoshihiro Kambayashi)
+
+	* test/ruby/test_transcode.rb: added tests for the above
+	  (from Yoshihiro Kambayashi)
+
+	* transcode_data.h, transcode.c, tool/transcode_tblgen.rb:
+	  added support for GB18030-specific 4-byte sequences
+	  (with Yoshihiro Kambayashi)
+
+Wed Jan 14 16:16:19 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/extconf.rb: check ncursesw earlier than ncurses to
+	  support UTF-8 strings.  non UTF-8 strings should be converted
+	  explicitly.  [ruby-core:21094]
+
+Wed Jan 14 14:42:30 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* cont.c: fix prototype declare of register_stack_extend
+
+Wed Jan 14 13:19:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_aspawn): should not escape with caret
+	  unless using cmd.exe.
+
+Wed Jan 14 13:09:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/extconf.rb (gai_strerror): checks if available and if
+	  returns const pointer.
+
+	* ext/socket/getaddrinfo.c (gai_strerror): defines only if non
+	  available.  [ruby-core:21328]
+
+Wed Jan 14 12:39:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.
+
+	* io.c (appendline): reformed.
+
+	* io.c (rb_io_s_pipe): reduced nest of rb_ensure of main block.
+
+Tue Jan 13 22:56:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/addrinfo.h (AI_NUMERICSERV): defined.
+	  (AI_MASK): add AI_NUMERICSERV.
+
+	* ext/socket/getaddrinfo.c (getaddrinfo): support AI_NUMERICSERV.
+
+Tue Jan 13 21:45:53 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check.
+	  Patch by Kornelius Kalnbach.  [ruby-core:20992].
+
+	* test/ostruct/test_ostruct.rb: test for inspect.
+	  Patch by Kornelius Kalnbach.  [ruby-core:20992].
+
+Tue Jan 13 21:44:30 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_reopen, rb_io_init_copy): should register fptr to pipe_list
+	  when copying pipe fptr.
+
+Tue Jan 13 21:38:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rb_getaddrinfo): use getaddrinfo with GVL if
+	  getaddrinfo.c/getnameinfo.c is used.  They are not thread safe
+	  because gethostbyname/gethostbyaddr is used.
+	  (rb_getnameinfo): ditto.
+
+	* extconf.rb: define GETADDRINFO_EMU if getaddrinfo.c/getnameinfo.c is
+	  used.
+
+Tue Jan 13 21:28:14 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* object.c (rb_obj_not_match): rdoc.
+	  Patch by Kornelius Kalnbach.  [ruby-core:20991]
+
+Tue Jan 13 18:21:44 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_close_read): call rb_io_fptr_cleanup() instead of
+	  fptr_finalize() because the fptr has special finalizer if it is a
+	  pipe.  [ruby-dev:37757] (3)
+
+Tue Jan 13 18:19:49 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686]
+	  (also see [ruby-dev:37721])
+
+Tue Jan 13 17:29:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/make_transdb.rb (converters): should not depend on the
+	  hash order for cross compile.
+
+Tue Jan 13 16:39:11 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/intern.h, thread.c, win32/Makefile.sub (rb_fdset_t,
+	  rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr, rb_fd_isset,
+	  rb_fd_select, rb_fd_ptr, rb_fd_max, HAVE_RB_FD_INIT): new type,
+	  functions, and macros for Windows.
+
+	* win32/win32.c (extract_fd, rb_w32_select): use rb_fdset_t to expand
+	  fd_array if needed.  [ruby-core:19946]
+
+	* win32/win32.c (copy_fd): new function for rb_w32_select().
+
+Tue Jan 13 12:31:54 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/file2lastrev.rb (get_revisions): fixes problem with
+	  svn on cygwin. [ruby-dev:37702].
+	  Patch by Kouhei Sutou.
+
+Tue Jan 13 11:58:04 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/input-method.rb: IRB did not prompt for MSwin32.
+	  [ruby-dev:37686].
+	  Patch by arton <artonx AT yahoo.co.jp>.
+
+Tue Jan 13 12:10:42 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
+	  on Windows.
+
+Tue Jan 13 09:49:49 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* ext/socket/socket.c: removed warning about unused variable 'rai'.
+
+Tue Jan 13 03:07:28 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
+
+Tue Jan 13 02:54:54 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: use headers instead of "netdb.h" in checking
+	  getnameinfo() and getaddrinfo() because Windows doesn't have it.
+	  [ruby-dev:37757] (1)
+
+	* ext/socket/sockport.h (SA_LEN): use sockaddr_in6 when defined AF_INET6
+	  if INET6 is not defined.  winsock2's getaddrinfo() returns
+	  sockaddr_in6 if ipv6 is available.
+
+Tue Jan 13 02:21:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (internal_cmd_match): extracted from
+	  is_internal_cmd.
+
+	* win32/win32.c (argv_size, join_argv): escapes redirection, pipe
+	  and caret punctuations with carets.
+
+	* win32/win32.c (rb_w32_aspawn): ditto, and redirections and pipe
+	  have no meanings.
+
+Tue Jan 13 02:07:38 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: use Encoding.find("locale") instead of
+	  Encoding.locale_charmap
+
+Tue Jan 13 00:57:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short
+	  sockaddr.
+	  (sock_s_unpack_sockaddr_un): ditto.
+
+Mon Jan 12 23:55:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (addrinfo_ip_unpack): new method
+	  AddrInfo#ip_unpack.
+	  (addrinfo_unix_path): new method AddrInfo#unix_path.
+	  (Init_socket): define above methods.
+
+Mon Jan 12 23:31:42 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (IS_IP_FAMILY): defined.
+	  (addrinfo_ip_p): use it.
+
+Mon Jan 12 17:23:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_nothing_raised): removes the
+	  current trace to get rid of an issue of MiniTest::Unit#location.
+
+Mon Jan 12 16:49:20 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (install): erased a garbage.
+
+Mon Jan 12 16:45:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.
+
+	* win32/win32.c (winnt_stat): gets rid of strange behavior of
+	  GetFileAttributes().  [ruby-core:21269]
+
+Mon Jan 12 12:43:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (parse_args, install): added --strip option.
+
+	* instruby.rb (install_recursive): skips the directory if matched
+	  to a no_install pattern ending with a file separator.
+
+Mon Jan 12 12:33:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: don't use bytesize because 1.9 dependent.
+	  [ruby-core:21266]
+
+Mon Jan 12 11:59:19 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (ruby_xmalloc, ruby_xrealloc, ruby_xfree):
+	  enable to use them without GVL.
+	  if GC is invoked, acquire GVL during GC.
+	  if NoMemoryError is raised, acquire GVL and raise it.
+
+Mon Jan 12 10:39:19 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: fix comment (terminology: Global VM Lock).
+
+	* thread.c (blocking_region_begin, blocking_region_end):
+	  save and clear th->blocking_region_buffer.
+
+	* thread.c (rb_thread_call_with_gvl): check if it has GVL.
+
+	* thread.c (ruby_thread_has_gvl_p): added.
+
+	* vm_core.h: add decls.
+
+Mon Jan 12 10:21:11 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c: remove unused decl.
+
+Sun Jan 11 16:53:14 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after
+	  %> bug. [ruby-dev:37751] [Bug #997]
+
+	* test/erb/test_erb.rb: ditto
+
+Sun Jan 11 09:53:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/mkconstants.rb (c_str): get rid of a 1.9 feature for
+	  cross compile.  [ruby-core:21243]
+
+Sun Jan 11 09:47:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_s_create): set nil as the value if assoc length
+	  is not enough.  [ruby-core:21249]
+
+Sat Jan 10 21:17:28 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: don't generate unintended newlines.
+
+Sat Jan 10 20:50:02 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: refactored to nest properly in statically
+	  and dynamically.
+
+Sat Jan 10 20:26:17 2009  Tanaka Akira  <akr@fsij.org>
+
+	* version.h: make version string succinct:
+	  "ruby 1.9.1p5000 (2009-01-10 trunk 21414) [i686-linux]".
+
+Sat Jan 10 19:05:13 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (cont_restore_1): should not be inlined.
+
+Fri Jan  9 21:52:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_define_const): use INT2NUM.
+
+Fri Jan  9 15:40:07 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/mkconstants.rb: define macro if default_value is passed.
+
+Fri Jan  9 13:20:08 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
+
+Fri Jan  9 12:29:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (test-sample), rubytest.rb: use runruby.rb
+
+Fri Jan  9 10:40:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some
+	  platforms need environments for shared objects.
+
+Thu Jan  8 23:19:38 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (bsock_shutdown): accept symbol/string as how.
+	  (shutdown_how_arg): new function.
+
+	* ext/socket/mkconstants.rb: generate shutdown_how_to_int.
+
+Thu Jan  8 23:16:37 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: easy code contains fewer bugs.
+
+Thu Jan  8 22:59:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (gen_name_to_int_func): generate
+	  name_to_int functions, not only body.
+
+Thu Jan  8 22:44:10 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c: don't use AI_NUMERICSERV for platforms which
+	  not define it as old Windows.
+	  [ruby-dev:37736]
+
+Thu Jan  8 17:32:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb: should not depend on a library which does not exist
+	  in 1.8.
+
+Thu Jan  8 07:52:55 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (init_unix_addrinfo): don't return a value.
+
+Thu Jan  8 07:30:52 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection.
+
+Thu Jan  8 00:31:58 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb (assert_no_match): don't count up as two
+	  assertions.
+
+Thu Jan  8 00:26:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (addrinfo_getnameinfo): use NI_DGRAM if socktype
+	  is SOCK_DGRAM.
+
+Thu Jan  8 00:16:22 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (host_str): add flags_ptr argument to specify
+	  AI_NUMERICHOST if host is numeric form.
+	  (port_str): add flags_ptr argument to specify AI_NUMERICSERV if port
+	  is numeric form.
+
+Wed Jan  7 22:24:12 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rb_cAddrInfo): new class AddrInfo.
+	  (s_recvfrom): return AddrInfo as address.
+	  (s_recvfrom_nonblock): ditto.
+	  (sock_accept): ditto.
+	  (sock_accept_nonblock): ditto.
+	  (sock_sysaccept): ditto.
+	  (bsock_send): accept AddrInfo as address argument.
+	  (sock_connect): ditto.
+	  (sock_connect_nonblock): ditto.
+	  (sock_bind): ditto.
+	  (sock_s_unpack_sockaddr_in): ditto.
+	  (sock_s_unpack_sockaddr_un): ditto.
+	  (bsock_local_address): new method BasicSocket#local_address.
+	  (bsock_remote_address): new method BasicSocket#remote_address.
+	  (addrinfo_initialize): new method AddrInfo#initialize.
+	  (addrinfo_inspect): new method AddrInfo#inspect.
+	  (addrinfo_afamily): new method AddrInfo#afamily.
+	  (addrinfo_pfamily): new method AddrInfo#pfamily.
+	  (addrinfo_socktype): new method AddrInfo#socktype.
+	  (addrinfo_protocol): new method AddrInfo#protocol.
+	  (addrinfo_to_sockaddr): new method AddrInfo#to_sockaddr.
+	  (addrinfo_canonname): new method AddrInfo#canonname.
+	  (addrinfo_ip_p): new method AddrInfo#ip?.
+	  (addrinfo_ipv4_p): new method AddrInfo#ipv4?.
+	  (addrinfo_ipv6_p): new method AddrInfo#ipv6?.
+	  (addrinfo_unix_p): new method AddrInfo#unix?.
+	  (addrinfo_getnameinfo): new method AddrInfo#getnameinfo.
+	  (addrinfo_s_getaddrinfo): new method AddrInfo.getaddrinfo.
+	  (addrinfo_s_tcp): new method AddrInfo.tcp.
+	  (addrinfo_s_udp): new method AddrInfo.udp.
+	  (addrinfo_s_unix): new method AddrInfo.unix.
+	  (Init_socket): define new class and methods.
+	  (sock_getaddrinfo): apply socktype hack regardless of ai_flags.
+	  (addrinfo_new): defined.
+	  (get_afamily): ditto.
+	  (fd_socket_addrinfo): ditto.
+	  (io_socket_addrinfo): ditto.
+	  (SockAddrStringValue): ditto.
+	  (SockAddrStringValuePtr): ditto.
+	  (sockaddr_string_value): ditto.
+	  (sockaddr_string_value_ptr): ditto.
+	  (rb_addrinfo_t): ditto.
+	  (addrinfo_mark): ditto.
+	  (addrinfo_free): ditto.
+	  (addrinfo_s_allocate): ditto.
+	  (IS_ADDRINFO): ditto.
+	  (check_addrinfo): ditto.
+	  (get_addrinfo): ditto.
+	  (alloc_addrinfo): ditto.
+	  (init_addrinfo): ditto.
+	  (addrinfo_new): ditto.
+	  (call_getaddrinfo): ditto.
+	  (init_addrinfo_getaddrinfo): ditto.
+	  (make_inspectname): ditto.
+	  (addrinfo_firstonly_new): ditto.
+	  (addrinfo_list_new): ditto.
+	  (init_unix_addrinfo): ditto.
+	  (ai_get_afamily): ditto.
+
+	* ext/socket/mkconstants.rb: generate intern_protocol_family,
+	  intern_socktype and intern_ipproto.
+
+	  [ruby-dev:37692]
+
+Wed Jan  7 22:13:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (man, gem): fixed errors.
+
+Wed Jan  7 17:14:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb: use installed libraries.  [ruby-core:21006]
+
+	* instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir):
+	  use version invariant configuration.
+
+Tue Jan  6 19:09:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_restore_0): streamlined to ensure O(1) time.  based on
+	  a patch by Brent Roman <brent AT mbari.org>.
+
+Tue Jan  6 00:34:25 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_close_before_exec): more heuristics to detect maximum fd.
+
+Mon Jan  5 17:59:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (cygwin): needs properly implemented nl_langinfo().
+	  [ruby-core:21110]
+
+	* missing/langinfo.c: added as suggested at [ruby-core:21015], from
+	  http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
+
+	* missing/langinfo.c (nl_langinfo_0): fixed typos for SJIS.
+
+Mon Jan  5 17:38:40 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* encoding.c (rb_locale_charmap): use GetConsoleCP() instead of
+	  GetACP() because external encoding should be console's one.
+
+	* encoding.c (rb_filesystem_encoding): use GetOEMCP() instead of
+	  GetACP() because VFAT/FAT32 uses OEM CP.
+
+Mon Jan  5 16:26:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encoding): use ANSI codepage for file
+	  system on cygwin.
+
+	* encoding.c (rb_locale_charmap): reverted.  [ruby-core:21110]
+
+Mon Jan  5 16:15:00 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/curses/curses.c (free_window): use xfree instead of free.
+	  [ruby-dev:37200]
+
+Mon Jan  5 15:49:45 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/gdbm/gdbm.c (rb_gdbm_fetch): remove needless cast.
+
+Mon Jan  5 12:52:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_env): use user profile folder than personal
+	  folder.
+
+Mon Jan  5 08:41:13 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_s_stat): need type check for non string values.
+	  [ruby-dev:37673]  fix: #964
+
+	* file.c (rb_file_s_size, rb_file_s_atime, rb_file_s_mtime,
+	  rb_file_s_ctime, rb_f_test): ditto.
+
+Mon Jan  5 08:17:56 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): should not add up errors on loops.
+	  [ruby-dev:37691]
+
+Mon Jan  5 07:58:37 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* random.c (rb_f_srand): update RDoc.  [ruby-core:21113]
+
+Mon Jan  5 06:39:56 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_max): max value from ... not defined for non
+	  Integer Numeric end values. [ruby-dev:37690] fix: #974
+
+Sun Jan  4 22:37:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rb_getaddrinfo): defined for address lookup without GVL.
+	  (struct getaddrinfo_arg): defined.
+	  (nogvl_getaddrinfo): defined.
+	  (rb_getnameinfo): defined for name lookup without GVL.
+	  (getnameinfo_arg): defined.
+	  (nogvl_getnameinfo): defined.
+
+Sun Jan  4 18:10:10 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/gbk.trans, gbk-tbl.rb:
+	  new Chinese GBK transcoding (from Yoshihiro Kambayashi)
+
+	* test/ruby/test_transcode.rb: added tests for the above
+	  (from Yoshihiro Kambayashi)
+
+Sun Jan  4 17:55:55 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb: added tests for GB2312
+	  (from Yoshihiro Kambayashi)
+
+	* enc/trans/chinese.trans: set valid byte patterns for
+	  GB2312 and GB12345
+
+Sun Jan  4 17:39:39 2009  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/big5.trans, big5-tbl.rb:
+	  new Chinese Big5 transcoding (from Yoshihiro Kambayashi)
+
+	* test/ruby/test_transcode.rb: added tests for the above
+	  (from Yoshihiro Kambayashi)
+
+Sun Jan  4 17:07:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems.rb (Gem.set_home, Gem.set_paths): should not create
+	  directories stealthily.  [ruby-core:20990]
+
+	* lib/rubygems.rb (Gem.find_home): expand_path deals with platform
+	  dependent environments.
+
+	* lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): ditto.
+
+	* instruby.rb (gem): creates gem directories at installation.
+
+Sun Jan  4 15:41:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encoding, rb_locale_charmap): uses
+	  codepage on cygwin.  [ruby-core:20994]
+
+Sun Jan  4 11:58:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (ruby_float_step): extracted from num_step().
+
+	* range.c (range_step): uses ruby_float_step() for float range.
+	  [ruby-dev:37691]
+
+Sun Jan  4 11:11:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): does not use both of makefile.rb and
+	  extconf.rb at the same time.
+
+	* lib/mkmf.rb (DLLIB): depends on Makefile.  [ruby-core:21096]
+
+Sun Jan  4 09:27:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (constant_arg): constified.
+
+	* ext/socket/socket.c (optname_arg): cygwin does not have
+	  IPPROTO_IPV6.
+
+	* ext/socket/mkconstants.rb (ipv6_optname_to_int): ditto.
+
+Sun Jan  4 04:33:14 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c: redundant #ifdef removed.
+
+Sun Jan  4 03:30:18 2009  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (maygvl_copy_stream_wait_read): renamed to add prefix to
+	  express GVL state.
+	  (nogvl_copy_stream_wait_write): ditto.
+	  (nogvl_copy_stream_sendfile): ditto.
+	  (maygvl_copy_stream_read): ditto.
+	  (nogvl_copy_stream_write): ditto.
+	  (nogvl_copy_stream_read_write): ditto.
+	  (nogvl_copy_stream_func): ditto.
+
+Sun Jan  4 00:30:50 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb: merged r20850, r17881, r16811, r16763, r16748, r15829,
+	  r15794 and r15698 from ruby_1_8.
+
+	* test/erb/test_erb.rb: ditto.
+
+Sat Jan  3 22:24:36 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro
+	  definition from common.mk to {Makefile.in,win32/Makefile.sub}.
+	  [ruby-dev:37678]
+
+Sat Jan  3 15:30:09 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/chinese.trans: added for transcoding EUC-CN and GB12345.
+
+	* enc/trans/GB/: ditto.
+
+Sat Jan  3 15:26:30 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/euc-cn.c: renamed from gb2312.c because GB2312 is
+	  the name of a CSS.  it's encoding name is "EUC-CN".
+
+Sat Jan  3 03:00:42 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc,
+	  known_errors.inc, miniprelude.c, newline.c): move rules from common.mk
+	  to {Makefile.in,win32/Makefile.sub} for nmake.
+	  [ruby-core:20993]
+
+Fri Jan  2 23:51:41 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.
+
+Fri Jan  2 23:36:10 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for
+	  sock_s_getaddrinfo.
+	  (sock_getaddrinfo): add socktype_hack argument.
+	  (sock_addrinfo): call sock_getaddrinfo with socktype_hack.
+	  (sock_s_getaddrinfo): call sock_getaddrinfo without socktype_hack.
+	  [ruby-dev:37674]
+
+Fri Jan  2 23:33:38 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.
+
+Fri Jan  2 22:25:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* process.c: use sigaction instead of sigset.  [ruby-core:21021]
+
+Fri Jan  2 22:22:04 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bootstraptest/test_proc.rb: suppress error message.
+
+Fri Jan  2 22:20:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_process.rb (test_wait_and_sigchild): remove debug
+	  output.
+
+Fri Jan  2 17:45:19 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: rename family_to_str to intern_family.
+	  it returns ID now.
+
+	* ext/socket/socket.c (ipaddr): use intern_family.
+
+Fri Jan  2 17:20:31 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: use ID in the values of
+	  family_to_str_hash.  family_to_str returns a VALUE.
+
+	* ext/socket/socket.c (ipaddr): follow family_to_str change.
+
+Fri Jan  2 17:01:51 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: refactored to gather stringizer
+	  description.
+
+Fri Jan  2 15:30:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: make common prefix optional.
+
+Fri Jan  2 14:59:52 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: use hash for family_to_str to avoid
+	  linear search.  lenp argument removed.
+
+	* ext/socket/socket.c (ipaddr): call family_to_str without lenp
+	  argument.
+
+Fri Jan  2 14:33:12 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (gen_int_to_name): don't compare constants
+	  in preprocessor because the constants may be enum.
+
+Fri Jan  2 14:11:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (gen_int_to_name): add lenp argument.
+
+	* ext/socket/socket.c (ipaddr): follow argument change.
+
+Fri Jan  2 10:20:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/singleton.rb: fix documentation. [ruby-core:21038]
+
+Fri Jan  2 06:43:58 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* signal.c (rb_signal_buff_size): defined for check whether signal
+	  is in the buffer or not.
+
+	* thread_pthread.c (thread_timer): don't exit the loop when signal
+	  is in the buffer. [ruby-dev:37637]
+
+Fri Jan  2 04:40:00 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: check duplicates.
+
+Fri Jan  2 02:39:08 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (optname_arg): defined.
+	  (bsock_setsockopt): use optname_arg.
+	  (bsock_getsockopt): ditto.
+
+	* ext/socket/mkconstants.rb: generate so_optname_to_int,
+	  ip_optname_to_int, ipv6_optname_to_int, tcp_optname_to_int and
+	  udp_optname_to_int.
+	  more constants.
+
+Fri Jan  2 02:08:36 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (constant_arg): extracted from family_arg.
+	  (family_arg): use constant_arg.
+	  (socktype_arg): ditto.
+	  (level_arg): ditto.
+
+Fri Jan  2 01:15:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (level_arg): defined.
+	  (bsock_setsockopt): use level_arg.
+	  (bsock_getsockopt): ditto.
+
+	* ext/socket/mkconstants.rb: generate level_to_int.
+
+Fri Jan  2 00:58:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (family_arg): accept symbols as well.
+	  (socktype_arg): ditto.
+
+Fri Jan  2 00:49:44 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_getaddrinfo): use socktype_arg.
+
+Fri Jan  2 00:12:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (family_arg): extracted from
+	  setup_domain_and_type.
+	  (socktype_arg): ditto.
+	  (udp_init): use family_arg.
+	  (sock_s_gethostbyaddr): ditto.
+	  (sock_s_getaddrinfo): ditto.
+	  (sock_s_getnameinfo): ditto.
+
+Thu Jan  1 22:27:55 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/default.mspec: fix for builddir != srcdir
+
+	* Makefile.in: ditto.
+
+Thu Jan  1 21:26:05 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_getnameinfo): use family_to_int.
+
+Thu Jan  1 21:08:34 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: check all alias possibility.
+
+Thu Jan  1 20:59:55 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: more possible aliases.
+
+Thu Jan  1 20:54:02 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: AF_ISO and AF_OSI may be aliased.
+
+Thu Jan  1 20:50:09 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* process.c (before_exec): it makes no sense for a conditional
+	  expression to return a void value.
+
+Thu Jan  1 20:47:09 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_getaddrinfo): use family_to_int.
+
+Thu Jan  1 20:17:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c: include constants.h at top.
+
+Thu Jan  1 19:53:33 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: add valp argument for family_to_int and
+	  socktype_to_int.
+
+	* ext/socket/socket.c (setup_domain_and_type): use valp argument.
+
+Thu Jan  1 19:36:57 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: generate family_to_str.
+
+	* ext/socket/socket.c (ipaddr): use family_to_str.
+
+Thu Jan  1 17:37:12 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: generate socktype_to_int.
+
+	* ext/socket/socket.c (setup_domain_and_type): use socktype_to_int.
+
+Thu Jan  1 17:26:47 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (setup_domain_and_type): initialize ptr.
+
+Thu Jan  1 17:01:50 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: refine family_to_int.
+
+Thu Jan  1 16:48:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: generate family_to_int().
+
+	* ext/socket/socket.c (setup_domain_and_type): use family_to_int.
+
+Thu Jan  1 15:08:46 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/file2lastrev.rb: supports git repositories which are cloned
+	  from a git-svn gateway.
+	  Patch by Hongli Lai. [ruby-core:21020]
+
+Thu Jan  1 16:08:11 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: generate init_constants function.
+
+	* ext/socket/socket.c (Init_socket): call init_constants.
+
+Thu Jan  1 16:03:04 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (Socket::AF_INET6): moved from socket.c.
+	  (Socket::PF_INET6): ditto.
+
+Thu Jan  1 15:27:07 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: use erb.
+
+Thu Jan  1 15:07:56 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: add -o option.
+
+	* ext/socket/depend: use mkconstants.rb with -o option.
+
+Thu Jan  1 07:42:36 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/singleton.rb: fix indentation of RDoc text.  [ruby-core:21029]
+
+Thu Jan  1 07:16:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (distclean-ext, realclean-ext): use EXTS as default.
+
+	* win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext
+	  directory.
+
+Thu Jan  1 06:56:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/file2lastrev.rb: unset PWD.
+
+Wed Dec 31 23:37:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_socketpair): yield if a block is given.
+	  (io_call_close): defined.
+	  (io_close): defined.
+	  (pair_yield): defined.
+
+Wed Dec 31 19:35:57 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/README: follows the change of directory structure in rubyspec.
+
+	* spec/default.mspec: ditto. Also follows change of mspec command.
+
+	* Makefile.in: ditto.
+
+Wed Dec 31 17:16:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): show openssl error
+	  code in EWOULDBLOCK error.
+
+Wed Dec 31 15:45:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_body): don't check to_io because
+	  Zlib::GzipWriter#to_io returns the underlying IO.
+
+Wed Dec 31 14:52:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr
+	  instead of STR2CSTR.
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
+	  (ossl_ec_group_initialize): ditto.
+
+Wed Dec 31 14:12:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_to_float): replaced by to_flo definition from
+	  math.c  [ruby-dev:37668]
+
+	* math.c (Need_Float): use rb_to_float().
+
+Wed Dec 31 13:49:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#read_nonblock):
+	  implemented.
+
+	* ext/openssl/ossl_ssl.c (rb_sys_fail_path): removed.
+	  (fcntl.h): don't include.
+	  (ossl_ssl_read_internal): defined.
+	  (ossl_ssl_read): use ossl_ssl_read_internal.
+	  (ossl_ssl_read_nonblock): use ossl_ssl_read_internal.
+	  (Init_ossl_ssl): define sysread_nonblock, instead of read_nonblock.
+
+Wed Dec 31 00:27:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_to_float): prohibit conversion from nil to float.
+	  [ruby-dev:37663]
+
+	* pack.c (pack_pack): replace all rb_Float() to rb_to_float().
+	  [ruby-dev:37663]
+
+Tue Dec 30 21:17:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: use sock_define_uconst for INADDR_*
+	  constants because Socket::INADDR_LOOPBACK should be 0x7f000001
+	  instead of -0xffffff.
+
+	* ext/socket/socket.c (sock_define_uconst): defined.
+
+Tue Dec 30 18:23:10 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.3.1 r4506.
+	* test/minitest/*.rb: ditto.
+
+Tue Dec 30 17:59:59 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c: Minor fixes and tweaks in documentation.
+
+Tue Dec 30 17:03:51 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/dl/test/test_import.rb: fix a prototype decl.
+	  pointed out by Takehiro Kubo [ruby-core:20971].
+
+Tue Dec 30 16:56:09 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_blocking_region): add a comment.
+
+	* thread.c (rb_thread_call_without_gvl): added as a alias of
+	  rb_thread_blocking_region().
+
+	* thread.c (rb_thread_call_with_gvl): added.
+
+	* vm_core.h (rb_thread_t#blocking_region_buffer): added for
+	  rb_thread_call_with_gvl().
+
+Mon Dec 29 23:41:42 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/dl/test/test_base.rb: add libc search logic.
+	  this patch is written by Takehiro Kubo.
+	  [ruby-core:20963] [Bug #932]
+
+	* ext/dl/dl.h: Add ",..." as the last argument.
+	  this patch is written by Takehiro Kubo.
+	  Bug #633 [ruby-core:19289]
+
+	* ext/dl/lib/dl/stack.rb: add add_padding() to calculate
+	  alignment.  this patch is written by Takehiro Kubo.
+	  Bug #633 [ruby-core:19289]
+
+	* ext/dl/test/test_func.rb: atof()'s return value is double.
+	  this patch is written by Takehiro Kubo.
+	  Bug #633 [ruby-core:19289]
+
+	* ext/dl/test/test_import.rb:
+	  - atof()'s return value is double.
+	  - The types of qsort's second and third argument are size_t.
+	  - fprintf()'s return value is int.
+	  this patch is written by Takehiro Kubo.
+	  Bug #633 [ruby-core:19289]
+
+Mon Dec 29 22:37:17 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* process.c (rb_waitpid): retries waitpid when EINTR.
+	  [ruby-core:19744].
+
+Mon Dec 29 23:18:52 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* bignum.c (rb_cstr_to_inum): changed an error message.
+
+	* complex.c (string_to_c_strict): ditto.
+
+	* rational.c (string_to_r_strict): ditto.
+
+Mon Dec 29 22:37:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): template f should not accept non float
+	  values.  [ruby-dev:37656]
+
+	* object.c (rb_to_float): new function to type check floats.
+
+Mon Dec 29 22:27:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* random.c (rb_f_rand): type check simplified.  strings are no
+	  longer allowed for argument.  [ruby-dev:37655]
+
+	* test/ruby/test_rand.rb (TestRand::o.to_int): need override
+	  to_int.
+
+Mon Dec 29 21:22:31 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: Infinity.numerator returns self. [experimental]
+
+	* numeric.c: Infinity.denominator returns 1. [experimental]
+
+Mon Dec 29 20:57:14 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* man/ri.1: new manpage.
+
+Mon Dec 29 20:45:25 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: floor, ceil, truncate and round accept an extra
+	  argument like Float#round. [experimental]
+
+Mon Dec 29 18:24:49 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in (distclean-local): removes Doxyfile and
+	  run.gdb at distclean'ing.
+
+Mon Dec 29 17:53:24 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* bin/erb: accepts options in more flexible styles.
+
+Mon Dec 29 17:25:17 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/erb.rb (ERB): m17n of ERB. adds rdoc.
+	  fixes #712. c.f. [ruby-dev:37516].
+
+	* lib/erb.rb (ERB::Compiler#compile): recognizes magic comments.
+	  returns a pair of compiled script and its script encoding.
+
+	* lib/erb.rb (ERB#set_eoutvar): make generated scripts return a
+	  string in correct encoding.
+
+	* lib/erb.rb (ERB#def_method): use Kernel#eval for encoding-awareness
+	  of the evaluated string.
+
+	* bin/erb.rb (ERB::Main.run): adds -E and -U options.
+	  String is no longer Enumerable.
+
+	* man/erb.1: new manpage.
+
+	* test/erb/test_erb_m17n.rb: new test case for m17n features.
+
+Mon Dec 29 18:02:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/io/wait/wait.c (io_nread): returns number of bytes available
+	  for read.  response to feature request #936 in [ruby-core:20917].
+
+Mon Dec 29 17:52:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/io/wait/wait.c (io_ready_p): updated to follow RDoc.
+
+Mon Dec 29 16:52:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (s_recvfrom_nonblock): revert r21162.
+
+Mon Dec 29 16:16:20 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_set_eval_stack, vm_set_main_stack, vm_set_top_stack):
+	  check stack overflow.  [ruby-dev:37646]
+
+Sun Dec 28 18:36:33 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/rubygems/test_gem_command.rb
+	  (test_add_option_overlapping_common_and_local_options):
+	  follows r21066.
+
+Mon Dec 29 14:50:19 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in (ext-clean): ext-clean always fails.
+
+	* ext/dl/ripper/extconf.rb: adds y.output into the clean list.
+
+Mon Dec 29 11:58:39 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_mutex_trylock): return false if Mutex owned
+	  by current thread.  [ruby-core:20943]
+
+	* thread.c (rb_mutex_lock): check dead lock (recursive lock) here.
+
+	* test/ruby/test_thread.rb: add a test.
+
+Mon Dec 29 10:58:54 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_get_path): move encoding conversion of file path
+	  from rb_scan_open_args.
+
+	* io.c (rb_scan_open_args): ditto.
+
+Mon Dec 29 07:15:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
+	  in [ruby-core:20921].
+
+Mon Dec 29 03:43:25 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.c (process_options): set th->base_block only while
+	  it is needed.  [ruby-dev:37634] [Bug #939]
+
+	* ruby.c (require_libraries): clear th->base_block before
+	  require libraries.
+
+Sun Dec 28 21:33:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ext/dl/test_base.rb: add BSD's case.
+
+Sun Dec 28 21:09:12 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/dl/lib/dl/import.rb (DL::Importer#sizeof): follows
+	  a feature change in 1.9.
+
+Sun Dec 28 21:03:07 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/dl/lib/dl/import.rb (DL::Importer#extern): adds filename and
+	  line number to module_eval'ing for readability of backtrace.
+	  (DL::Importer#bind): ditto.
+
+	* ext/dl/lib/dl/struct.rb (DL::CStructBuilder#create): ditto.
+
+Sun Dec 28 19:11:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in
+	  msvcrt.
+
+	* sprintf.c: not force to override snprintf/vsnprintf.
+	  [ruby-core:20824]
+
+Sun Dec 28 17:21:36 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rubygems/test_ext_configure_builder.rb (test_self_build_fail):
+	  Extends pattern for FreeBSD's error message.
+
+Sun Dec 28 17:10:13 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* ext/dl/test/test_dl2.rb: modify strncpy, strcpy, qsort, types.
+	  Patch by Takehiro Kubo.
+	  Bug #633 [ruby-core:19289]
+	* ext/dl/test/test_base.rb: /lib/libc.so is x86_64 binary in x86_64 architecture.
+
+Sun Dec 28 12:53:10 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* ext/dl/test/test_base.rb: use libc.dylib when the platform is darwin.
+
+Sun Dec 28 12:24:14 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (mutex_free, mutex_unlock): add qualifiers.
+
+Sun Dec 28 10:28:04 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (mutex_free): GC thread (main thread) has failed to unlock
+	  a mutex that is locked by another thread, which makes the mutex
+	  dangling in keeping_mutexes and causes [BUG] or stuck finally.
+	  Now unlocking is performed as locking thread.
+
+	* thread.c (mutex_unlock, rb_mutex_unlock, rb_mutex_unlock_all):
+	  mutex_unlock receives a thread.
+
+Sun Dec 28 05:44:44 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.3.1 r4505.
+	* test/minitest/*.rb: ditto.
+
+Sun Dec 28 00:43:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* runruby.rb: refactored to modify ENV as once.
+
+Sat Dec 27 22:41:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_info_formatting.rb (setup, teardown): uses
+	  mktmpdir and removes it after the test.
+
+	* test/cgi/test_cgi_session.rb (setup, teardown): ditto.
+
+Sat Dec 27 21:46:10 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* ext/dl/test/test_base.rb: use lib64 when the architecture is x86_64.
+
+Sat Dec 27 20:26:59 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
+	  is 2, not 0, because it will be converted to "".
+
+Sat Dec 27 19:40:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (after_exec): needs to reset before restart timer
+	  thread.
+
+	* thread.c (thread_start_func_2): stops timer thread if forked in
+	  the new thread.   [ruby-core:19385]
+
+	* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): DRY.
+
+Sat Dec 27 18:25:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_eval.c (rb_f_loop): return enumerator if no block given.
+	  [ruby-list:45747]
+
+Sat Dec 27 17:08:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (dummy_gdb_enums.special_consts): forces to load debug
+	  info on Mac OS X.
+
+	* .gdbinit (rp): added T_ZOMBIE.
+
+Sat Dec 27 16:18:02 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_frame_callee, rb_frame_caller): rb_frame_callee()
+	  should return method id on current frame.
+	  add rb_frame_caller() to get method id on parent frame.
+	  Bug #884 [ruby-dev:37446]
+
+	* eval.c (rb_f_method_name): use rb_frame_caller()
+	  instead of rb_frame_callee().
+
+Sat Dec 27 15:28:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_econv_exception): show source and destination
+	  encoding.  [ruby-dev:37285]
+
+Sat Dec 27 15:23:38 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
+	  "blockptr" to "blockargptr".
+
+Sat Dec 27 15:15:56 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (revision.h): ignores failure of file2lastrev.
+
+Sat Dec 27 15:02:38 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.c (process_options): fix to untouch th->mild_compile_error.
+	  [ruby-dev:37621], [ruby-dev:37620]
+
+Sat Dec 27 14:48:26 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.h, iseq.c (rb_iseq_new_main): add a type ISEQ_TYPE_MAIN.
+	  [ruby-dev:37619]
+
+	* compile.c (rb_dvar_defined, ruby_iseq_compile): ditto.
+
+	* iseq.c (iseq_data_to_ary, iseq_load): ditto.
+
+	* compile.c (iseq_compile_each): fix to check ip->compile_data.
+
+Sat Dec 27 14:29:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI.redirectable?): permit https redirection.
+	  patch from Roman Shterenzon.  [ruby-core:20485]
+
+Sat Dec 27 13:36:55 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (get_errinfo): return th->errinfo value
+	  if normal errinfo place (dynamic local variable) is not found.
+	  fixes Bug #732 [ruby-dev:37046].
+
+	* bootstraptest/test_proc.rb: add a test.
+
+Sat Dec 27 13:10:43 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* man/irb.1: adds -v, -h, -E and -U.
+
+Sat Dec 27 11:41:45 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method, vm_call_cfunc): use original id instead of
+	  calling id when NODE_CFUNC or NODE_BMETHOD.
+	  fixes Bug #632 [ruby-core:19282].
+
+	* vm_eval.c (vm_call0, vm_call_super): ditto.
+
+	* vm_method.c (rb_add_method, rb_alias): store original id
+	  in nd_file field of NODE_METHOD.
+
+	* test/stringio/test_stringio.rb: add a test.
+
+Sat Dec 27 09:48:54 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (Init_VM): create and define TOPLEVEL_BINDING at first.
+
+	* vm.c (vm_set_main_stack, rb_iseq_eval_main): added.
+
+	* parse.y (rb_parser_compile_file): fix to check parse_in_eval flag.
+
+	* eval.c (ruby_exec_node): use rb_iseq_eval_main()
+	  instead of rb_iseq_eval().
+
+	* iseq.c (rb_iseq_new_main), vm_core.h: added.
+	  main script (specified by -e or script name) should be run
+	  under TOPLEVEL_BINDING using Kernel#eval.  Above changes
+	  simulate Kernel#eval behaviour.  [ruby-dev:37240]
+
+	* compile.c (make_name_for_block): skip iseq except block type.
+	  this fix is needed for [ruby-dev:37240], and also fixes
+	  [ruby-dev:35392].
+
+Sat Dec 27 09:14:17 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* cont.c: rdoc for Fiber. patch by Muhammad Ali.
+	  [ruby-core:20894]
+
+Sat Dec 27 05:38:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (after_fork): ignores a termination request in the
+	  parent process.  [ruby-dev:37447]
+
+Sat Dec 27 01:52:39 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Using a more robust transcoding scheme to produce
+	  ASCII compatible inspect() messages.  [ruby-dev:37591]
+
+Fri Dec 26 18:04:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (fptr_finalize): don't allocate objects if noraise.
+	  (finish_writeconv): add noalloc argument to be able to avoid
+	  object allocation.
+	  (finish_writeconv_arg): introduced again.
+	  (finish_writeconv_sync): follow the above change.
+
+Fri Dec 26 17:04:14 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/input-method.rb (IRB::StdioInputMethod#initialize):
+	  removed a 'p' for debugging.
+
+Fri Dec 26 15:50:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::List#summarize): gives priority
+	  to latter switches.  [ruby-dev:36692]
+
+	* lib/optparse.rb (OptionParser#summarize): do not append
+	  unnecessary line terminator.
+
+Fri Dec 26 14:01:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (fptr_finalize): close the IO object even if finish_writeconv or
+	  flush is failed.
+	  (finish_writeconv): don't raise.  return errno or exception.
+	  (finish_writeconv_arg): removed.
+	  (finish_writeconv_sync): follow finish_writeconv change.
+
+	* transcode.c (rb_econv_make_exception): new function.
+
+	* include/ruby/encoding.h (rb_econv_make_exception): declared.
+
+Thu Dec 25 20:57:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (str_transcode0): set encoding when String#encode was
+	  given explicit but the same destination and source encoding.
+
+Thu Dec 25 20:01:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_s_pipe): unused variable removed.
+
+Thu Dec 25 19:35:51 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (sym_ignore): remove useless symbol.
+
+Thu Dec 25 18:36:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (pipe_close): removed.
+	  (pipe_yield): defined.
+	  (rb_io_s_pipe): use pipe_yield.
+
+Thu Dec 25 17:49:45 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (decorate_convpath): show type of escaping for
+	  xml_attr_quote or some conversions.
+
+Thu Dec 25 17:06:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_initialize): check fd validity.  [ruby-dev:36646]
+
+Thu Dec 25 16:23:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (flush_before_seek): check io_fflush result.
+	  (rb_io_check_readable): ditto.
+	  (rb_io_flush): ditto.
+	  (rb_io_fsync): ditto.
+	  (remain_size): ditto.
+	  (rb_io_write_nonblock): ditto.
+	  (finish_writeconv): ditto.
+	  (fptr_finalize): ditto.
+	  (io_reopen): ditto.
+	  (rb_io_reopen): ditto.
+	  (copy_stream_body): ditto.
+
+Thu Dec 25 15:54:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fflush): flush write buffer without write lock in
+	  finalizers.  [ruby-dev:37572]
+
+	* io.c (rb_io_fptr_finalize): clear write lock before finalizing.
+
+Thu Dec 25 15:07:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (fptr_finalize): close the IO object even if close(2) is failed.
+
+Thu Dec 25 14:51:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/parser.rb (RDoc::Parser.binary?): should read in binary mode.
+
+Thu Dec 25 14:32:23 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_method_search): fix control flow bug.
+	  (commited at r20981)
+
+Thu Dec 25 13:28:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_flush): fsync() after buffer is flushed on win32.
+	  [ruby-core:20043]
+
+Thu Dec 25 13:13:00 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_method_search): return rb_cObject if there is no
+	  super class.  [ruby-dev:37587]
+
+	* bootstraptest/test_method.rb: add tests for above.
+
+Thu Dec 25 12:49:12 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (proc_new): should use proc_dup() if block has Proc.
+
+	* vm.c (vm_make_proc_from_block): should use rb_cProc for block.
+
+	* vm.c (vm_make_proc): add an assertion.
+
+	* bootstraptest/test_proc.rb: add a test.
+
+Thu Dec 25 12:44:27 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc.
+
+Thu Dec 25 05:53:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl, id.h (ruby_method_ids): not depend on if
+	  token are defined as macros.  [ruby-dev:37553]
+
+	* template/id.h.tmpl, id.h (ruby_method_ids_check): enclosed in a
+	  struct.
+
+Thu Dec 25 01:52:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): sets native thread key.
+
+Thu Dec 25 01:09:23 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* test/readline/test_readline_history.rb: check the encoding that
+	  is in the Readline::HISTORY.
+
+Thu Dec 25 00:59:06 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* test/readline/test_readline_history.rb: did not check the
+	  encoding that is in the Readline::HISTORY. I will fix it.
+
+Wed Dec 24 22:36:06 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c, vm_dump.c: change message by rb_bug().
+
+Wed Dec 24 21:57:39 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_peephole_optimize): fix typo.
+
+Sun Dec 21 13:38:04 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block_from_c): fix to point right cfp.
+
+	* vm.c (vm_make_proc, vm_make_proc_from_block), vm_core.h:
+	  remove unused parameter cfp.
+
+	* vm_insnhelper.c, proc.c (proc_new): ditto.
+
+Wed Dec 24 20:59:12 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c (exc_equal): == method should not raise Exception.
+	  [ruby-dev:37519]
+
+	* sample/test.rb: fix test.
+
+Wed Dec 24 20:33:45 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method): use class of method defined
+	  instead of receiver's class on bmethod.  fixes [ruby-core:20786]
+
+	* bootstraptest/test_method.rb: add a test for above.
+
+	* vm_insnhelper.c (vm_setup_method): remove unused parameter klass.
+
+	* vm_insnhelper.h (CALL_METHOD): ditto.
+
+	* insns.def, vm_eval.c: ditto.
+
+Wed Dec 24 20:15:50 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/file2lastrev.rb (get_revisions): fix to ignore end of line.
+
+Wed Dec 24 13:33:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (HAVE_LONG_LONG, HAVE_OFF_T): revised for autoconf
+	  2.62 or later.
+
+Wed Dec 24 06:29:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (OBJDUMP, OBJCOPY): autoconf list is not comma
+	  separated.
+
+	* configure.in (AC_HEADER_STDC, AC_CHECK_HEADERS, AC_CHECK_FUNCS):
+	  removed duplicated checks.
+
+Wed Dec 24 03:21:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el: added comment to mention newer version
+	  bundled with Emacs 23 or later.  a patch from Phil Hagelberg
+	  <phil at hagelb.org> in [ruby-core:20838].
+
+Tue Dec 23 23:49:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_init_copy): call io_seek only if io_tell succeeds.
+
+Tue Dec 23 22:57:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork): don't propagate an error message if error
+	  buffer not given.
+
+Tue Dec 23 21:55:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork): propagate an error message from child to parent.
+	  (rb_f_exec): show details of error in child process on
+	  exception.
+	  (save_redirect_fd): add error message arguments.
+	  (run_exec_dup2): ditto.
+	  (run_exec_close): ditto.
+	  (run_exec_open): ditto.
+	  (run_exec_dup2_child): ditto.
+	  (run_exec_pgroup): ditto.
+	  (run_exec_rlimit): ditto.
+	  (rb_run_exec_options): ditto.
+	  (rb_exec): ditto.
+	  (rb_exec_atfork): ditto.
+	  (rb_spawn_internal): ditto.
+	  (rb_spawn): ditto.
+	  (rb_f_system): follow arguments change.
+	  (proc_daemon): ditto.
+	  (rb_f_spawn): show details of error in child process on exception.
+
+	* io.c (popen_exec): add error message arguments.
+	  (pipe_open): show details of error in child process on exception.
+
+	* include/ruby/intern.h (rb_run_exec_options): add error message
+	  arguments.
+	  (rb_exec): ditto.
+	  (rb_fork): ditto.
+	  (rb_spawn): ditto.
+
+	* ext/pty/pty.c (chfunc): add error message arguments.
+
+Tue Dec 23 20:28:28 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* io.c: rdoc for File::open and 1.9 feature in file modes.
+
+	* transcode.c: rdoc for String#encode
+
+Tue Dec 23 19:51:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn): deals with quoted commands.
+
+Tue Dec 23 18:44:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* strftime.c (rb_strftime): use locale insensitive functions for tr_TR
+	  locale.
+
+Tue Dec 23 17:38:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb (assert_equal): show small differences
+	  for Regexp and Float.
+
+Tue Dec 23 16:49:48 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn): support normal commands with arguments.
+
+Tue Dec 23 16:22:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_inspect): show fd number if there is no pathname.
+
+Tue Dec 23 15:48:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/file2lastrev.rb: shouldn't use single quote in shell's command
+	  line if you want to support Windows.
+
+Tue Dec 23 15:46:43 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/mathn.rb: Math.sqrt(NaN) should be NaN. [ruby-dev:37537]
+
+Tue Dec 23 15:46:47 2008  Eric Hodel  <drbrain@segment7.net>
+	* gem_prelude.rb:  Match full RubyGems behavior when a gem can't be
+	  found.
+
+Tue Dec 23 15:36:58 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/file2lastrev.rb: detects vcs directory properly on building
+	  outside of srcdir. [ruby-dev:37555] [ruby-dev:37561]
+
+Tue Dec 23 15:30:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (pipe_open): need to initialize args.
+
+Tue Dec 23 14:18:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/st.h: need to include defines.h because LONG_LONG is
+	  defined there.
+
+Tue Dec 23 13:52:05 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parser/c.rb:  Don't coalesce adjacent comment blocks.
+	  [bug#901]
+
+Tue Dec 23 12:00:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (pipe_close): fix coding style.  [ruby-dev:37554]
+
+Tue Dec 23 08:10:05 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb: Fix documentation.  [bug#827]
+
+Tue Dec 23 08:04:58 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb: Don't remove methods twice.  [bug#555]
+
+Tue Dec 23 00:16:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* sprintf.c (rb_str_format): fix buffer overflow.
+
+Mon Dec 22 19:31:19 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (revision.h): uses tool/file2lastrev.rb to support
+	  git-svn.
+
+	* version.h: changed version string as
+	  `ruby 1.9.1 (2008-12-22 patchlevel-5000 trunk 20912)
+	  [i386-darwin9.6.0]'.
+
+Mon Dec 22 16:32:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): encoding of packed string only from 'm',
+	  'M', and 'u' should be US-ASCII.  [ruby-dev:37284]
+
+	* pack.c (pack_pack): encoding of packed string only from 'U'
+	  should be UTF-8.  also upgrade US-ASCII strings to UTF-8.
+
+Mon Dec 22 15:56:49 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Doxyfile.in: new file. Template of a configuration file.
+	  Introduces C-level API reference generation with Doxygen.
+
+	* tool/file2lastrev.rb: wrapper script that abstracts subversion
+	  and git-svn.
+
+	* tool/strip-rdoc.rb: filter for preventing doxygen from processing
+	  rdoc comments.
+
+	* configure.in: (Doxyfile): Doxyfile is generated together with
+	  Makefile.
+	  (PACKAGE): configuration $(PACKAGE) is necessary for $(docdir).
+
+	* instruby.rb: adds a new install target 'capi'
+
+	* common.mk (capi): new target that generates C API documents with
+	  Doxygen.
+	  (install-capi): new target.
+	  (pre-install-capi): ditto.
+	  (do-install-capi): ditto.
+	  (post-install-capi): ditto.
+
+Mon Dec 22 21:31:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_ord): Integer#ord implemented.
+
+Mon Dec 22 21:26:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_s_pipe): IO.pipe can take a block.
+	  (pipe_close): new function.
+
+Mon Dec 22 21:08:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb (assert_nothing_raised): increment
+	  assertion count.  [ruby-dev:37480]
+
+Mon Dec 22 19:10:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (Init_native_thread): need to call
+	  ruby_thread_set_native() here.
+
+Mon Dec 22 18:00:36 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: fix wrong flag value.
+
+Mon Dec 22 15:15:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): avoid calling
+	  read_nonblock in rescue.  use retry instead.
+
+Mon Dec 22 14:35:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_external_str_new_with_enc): set ASCII-8BIT if
+	  encoding is US-ASCII and string contains 8bit characters.
+
+Mon Dec 22 12:26:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
+	  (Exports#exports): added VERSION.
+
+Mon Dec 22 12:25:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/vsnprintf.c (BSD_vfprintf): fix for test_sprintf_comb.rb, by
+	  wanabe in [ruby-dev:36935].
+
+Mon Dec 22 12:05:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (mingw): no longer uses snprintf and vsnprintf of
+	  msvcrt.  [Bug#6]
+
+	* win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): removed.
+
+	* win32/Makefile.sub (config.h): vsnprintf exists in VC7 or later.
+
+	* win32/mkexports.rb (Exports#initialize): aliases
+	  rb_w32_vsnprintf and rb_w32_snprintf for binary compatibility.
+
+	* sprintf.c (rb_str_format): uses snprintf instead of sprintf.
+
+	* numeric.c (flo_to_s, rb_num2long, rb_num2ll): ditto.
+
+Mon Dec 22 10:59:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upto): should return enumerator if called
+	  without block.  [ruby-dev:37526]
+
+Mon Dec 22 09:54:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (gettable_gen): the encoding of __FILE__ should be
+	  rb_filesystem_encoding().  [ruby-list:45733]
+
+	* parse.y (gettable_gen): __FILE__ should be ASCII-8BIT when
+	  filesystem encoding is US-ASCII and __FILE__ contains non 7bit
+	  characters.
+
+Mon Dec 22 02:54:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: temporary patch for trouble on TkAqua (> Tk8.4.9).
+
+	* ext/tk/sample/demos-jp/widget: set encoding to a demo-code string to
+	  avoid garbled text on the Code Window.
+
+Sun Dec 21 14:55:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (SPLAT_PROC): splat values by hand.
+
+Sun Dec 21 13:50:37 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* test/readline/test_readline.rb
+	  (TestReadline#test_some_characters_methods): checked encoding.
+
+Sun Dec 21 12:23:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (SPLAT_PROC): fix for regexp.  [ruby-dev:37514]
+
+Sun Dec 21 10:43:10 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* sample/test.rb: rescue exception.
+
+Sat Dec 20 18:28:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_find_1): supplements an extension for executable
+	  files on DOSish platforms.
+
+	* io.c (pipe_open): use rb_w32_aspawn() for array form.
+
+	* win32/win32.c (rb_w32_pipe_exec): no longer used.
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): deals with batch
+	  files and commands with extensions.  [ruby-core:20695]
+
+	* win32/win32.c (has_redirection): supports environment variables
+	  references.
+
+Sat Dec 20 15:34:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rake.rb (Rake::FileList#egrep): change open mode to "rb",
+	  i.e. default to binary.    [ruby-dev:37385]
+
+	* lib/rake.rb (Rake::FileList#egrep): allow specifying reading
+	  encoding, e.g. FileList['*.rb'].egrep(/require/, encoding:
+	  "ascii-8bit")
+
+	* lib/rake.rb (Rake::MultiTask): invoke_prerequisites should be
+	  private.  a patch from okkez in [ruby-dev:37399]
+
+Sat Dec 20 10:59:16 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale#initialize)
+	  initializes instance variables to suppress warnings.
+	  typo fix to ignore LoadError: [ruby-dev:37508]
+
+Fri Dec 19 17:01:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_extract_encoding_option): "internal_encoding: nil"
+	  to specify no-transcoding.  and other corner case fixed.
+	  [ruby-dev:37496]
+
+	* hash.c (rb_hash_lookup2): new function to look-up hash with
+	  default value.
+
+Fri Dec 19 15:51:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): get rid of warning on DOSISH.
+
+Fri Dec 19 07:45:37 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (exc_equal): duck typing equal to make it transitive.
+	  [ruby-dev:34808]
+
+Thu Dec 18 19:31:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/init.rb (IRB.opt_parse): (M17N) adds -U and -E as command
+	  line options. [ruby-dev:37161]. Fixes #711.
+	  improved long options.
+
+	* lib/irb/init.rb (IRB.set_encoding): new subroutine for IRB.opt_parse
+
+	* lib/irb/input-method.rb (IRB::StdioInputMethod): (M17N) regards
+	  scripts that user types as encoded in the external_encoding.
+
+	* lib/irb/input-method.rb (IRB::ReadlineInputMethod): ditto.
+
+	* lib/irb/input-method.rb (IRB::FileInputMethod): (M17N) respects
+	  magic comment.
+
+	* lib/irb/help.rb (IRB.print_usage): (M17N) respects magic comment
+	  in the resource file.
+
+	* lib/irb/lc/help-message: adds -U and -E.
+
+	* lib/irb/lc/ja/help-message: ditto. re-encoded from ISO-2022-JP into UTF-8.
+
+	* lib/irb/lc/ja/encoding_aliases.rb: new file. provides Japanese specific
+	  character encoding name table for backward compatibility.
+
+	* lib/irb/lc/ja/error.rb: re-encoded from ISO-2022-JP into UTF-8.
+	  magic comment.
+
+	* lib/irb/locale.rb: integrated with Ruby 1.9's M17N support.
+
+	* lib/irb/magic-file.rb: new file. utility to handle files with magic
+	  comment and opens in the correct encoding.
+
+	* lib/irb/ruby-lex.rb (RubyLex#each_top_level_statement): recovers
+	  character encoding for a statement after it lexed so that irb can
+	  eval the statement in correct encoding.
+
+	* lib/irb/src_encoding.rb: new file. utility.
+
+Thu Dec 18 21:12:28 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/session.rb: fix bug for ignore session_id option.
+	  report from [ruby-core:18635], [Bug #572]
+
+	* lib/cgi/core.rb: use Encoding#find when encoding set.
+
+	* test/cgi/test_cgi_session.rb: test for session_id specified.
+
+Thu Dec 18 17:00:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_aset): string key copying only happen if key is
+	  an exact instance of String, not a subclass. based on a patch
+	  from Mike Gold <mike.gold.4433 at gmail.com> in [ruby-talk:322667].
+	  [incompatible] [ruby-talk:322417]
+
+Thu Dec 18 16:48:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/optparse/version.rb: remove variable shadowing to stop
+	  warning.   [ruby-core:20612]
+
+	* lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb,
+	  lib/rinda/ring.rb, lib/racc/parser.rb,
+	  lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto.
+
+	* lib/racc/parser.rb: remove space before parentheses.
+
+	* lib/shell/command-processor.rb, lib/shell/process-controller.rb:
+	  use parentheses around arguments.
+
+	* lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb,
+	  lib/yaml/baseemitter.rb: indentation fix.
+
+	* lib/matrix.rb: small cosmetic change.
+
+Thu Dec 18 08:15:04 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/xmlrpc/server.rb:  Restricting method inspection to show only
+	  non-inherited public methods.  [ruby-core:20603]
+
+	* lib/xmlrpc/server.rb:  Fixing method inspection so it doesn't
+	  trigger XMLRPC::FaultException when used.  [ruby-core:20604]
+
+Wed Dec 17 19:39:44 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (unix_recv_io): relax msg_controllen error
+	  check for x86_64-openbsd4.4.
+
+Wed Dec 17 19:37:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/extconf.rb: check util.h for OpenBSD.
+
+	* ext/pty/pty.c: include util.h if available.  fix variable name.
+
+Wed Dec 17 19:23:28 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/matrix.rb: shut up warning. [ruby-dev:37481] [Bug #899]
+
+Wed Dec 17 15:44:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_pop_m): use enum ary_take_pos_flags.
+
+	* array.c (rb_ary_push_m): add modification check before actual
+	  operation.   [ruby-dev:37440]
+
+Wed Dec 17 15:35:39 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in (OBJDUMP, OBJCOPY):
+	  *BSD's ports and MacPorts prefix GNU binutils with 'g'.
+
+Wed Dec 17 11:39:39 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/bigdecimal/test_bigdecimal.rb (TestBigDecimal#test_hash):
+	  shut up warning.  see [ruby-dev:37437]
+
+Wed Dec 17 11:01:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_hash): gets rid of collisions between different
+	  encoding strings.  [ruby-core:20526]
+
+Wed Dec 17 09:50:19 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_metaclass.rb: removed codes for my debugging.
+	  sorry. [ruby-dev:37470]
+
+Tue Dec 16 22:55:11 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bin/testrb: set $0.
+
+Tue Dec 16 22:42:16 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): sorry, fixed wrong commit.
+
+Tue Dec 16 22:15:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of):
+	  should assert by instance_of?, not ===.  [ruby-dev:37458]
+
+	* lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of):
+	  typo fixed.
+
+Tue Dec 16 21:59:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): ALT_SEPARATOR support.
+
+Tue Dec 16 21:59:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpToString): reverted modification
+	  (that caused a bug) in r20359.  [ruby-dev:37370]
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_limit): comment update.
+	  [ruby-dev:37465]
+
+Tue Dec 16 20:34:44 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (getDevice): add nomesg argument.
+	  (get_device_once): add nomesg argument.  chmod slave tty to 0600
+	  if nomesg.  more error tests.
+	  (no_mesg): new function.
+	  (pty_open): make slave tty's mode 0600.
+
+Tue Dec 16 20:24:20 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (_parse): m17n compliant.
+
+Tue Dec 16 19:48:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/extconf.rb: check posix_openpt.
+
+	* ext/pty/pty.c (get_device_once): use posix_openpt if available.
+
+Tue Dec 16 19:43:53 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c: use strlcpy for error messages.
+
+Tue Dec 16 16:41:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): returns dispatched result.
+
+	* parse.y (primary): also in ripper, saves in_def before restoring.
+
+Tue Dec 16 12:30:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_header_ucontext_h): do not use ucontext.h on Mac
+	  OS X 10.5 or later.  merged from MacPorts.
+
+	* configure.in (ac_cv_func_daemon): daemon(3) is deprecated on Mac OS
+	  X 10.5 or later.
+
+Tue Dec 16 11:37:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (set_arg0): use strlcpy() instead of strncpy().
+
+	* load.c (rb_feature_p): ditto.
+
+	* dln.c (dln_load): ditto.
+
+Tue Dec 16 09:14:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (block_call): block should not be given to yield.
+	  [ruby-core:20583]
+
+Mon Dec 15 23:48:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (sleep_timeval): cast tv_usec to long to shut up
+	  warnings on OSX.  [ruby-dev:37449]
+
+Mon Dec 15 23:34:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (pty_open): set FMODE_SYNC and FMODE_DUPLEX.
+
+Mon Dec 15 23:29:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (process_options): revive global sub, gsub, chop, chomp
+	  only when auto looping options (-p/-n) is specified.
+	  [ruby-core:20570]
+
+Mon Dec 15 22:48:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (pty_open): new method PTY.open.
+
+Mon Dec 15 21:24:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (get_device_once): use DEVICELEN instead of
+	  sizeof SlaveName.
+
+Mon Dec 15 21:01:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (chfunc): make it static.
+
+Mon Dec 15 20:59:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (child_info): add slavename.
+	  (chfunc): use slavename.
+	  (establishShell): set slavename.
+
+Mon Dec 15 20:16:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
+	  ''\'' in such quotes.
+
+Mon Dec 15 19:07:31 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): define CANONICALIZATION_FOR_MATHN
+	  to follow r20683.
+
+Mon Dec 15 18:12:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rake/packagetask.rb (Rake::PackageTask): small document
+	  update from okkez in [ruby-dev:37443]
+
+Mon Dec 15 16:28:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg_complex): uses cfp from
+	  blockptr instead of the current cfp.  [ruby-core:20544]
+
+Mon Dec 15 14:56:59 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_metaclass.rb: new test case for metaclass hierarchy.
+
+	* class.c (make_metametaclass): new function. extracted from
+	  rb_make_metaclass.
+
+	* class.c (rb_make_metaclass): uses make_metametaclass when called for a
+	  metaclass.
+
+	* class.c (rb_singleton_class): creates a meta^(n+2)-class in
+	  addition to a meta^(n+1)-class when called for a meta^(n)-class.
+	  This is because the returned meta^(n+1) class must acts as an instance of
+	  Class, metaclass of Class, ..., meta^(n+1)-class of Class,
+	  Module, metaclass of Module, ..., meta^(n+1)-class of Module,
+	  Object, metaclass of Object, ..., meta^(n+2)-class of Object,
+	  BasicObject, metaclass of BasicObject, ..., meta^(n+2)-class of
+	  and BasicObject even when Class, Module, Object or BasicObject has
+	  not have its meta^(i)-class yet.
+
+Mon Dec 15 15:13:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too.
+	  [ruby-dev:37436]
+
+Mon Dec 15 15:02:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
+	  [ruby-core:20131]
+
+Mon Dec 15 14:39:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call0): NODE_ZSUPER supported.  [ruby-core:20480]
+
+	* vm_eval.c (vm_call_super): uses method_missing().
+
+	* vm_eval.c (method_missing): get rid of too large alloca.
+
+	* vm_eval.c (rb_call0, method_missing): uses idMethodMissing.
+
+	* vm_method.c (rb_add_method, remove_method, rb_undef): uses
+	  id__send__.
+
+	* vm_method.c (Init_eval_method): removed IDs which are defined as
+	  immediate values.
+
+Mon Dec 15 11:35:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace): defaults to script name for C functions.
+
+Mon Dec 15 11:32:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (rubylib_mangled_path, rubylib_mangled_path2): cannot use
+	  locale encoding before load path is initialized
+
+	* ruby.c (ruby_init_loadpath_safe): ditto.
+
+	* ruby.c (process_options): loads encdb so that encodings can be
+	  loaded, then associates script name and load paths with the
+	  locale encoding.
+
+Mon Dec 15 10:00:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (btest-ruby): use RUNRUBY instead of MINIRUBY to load the
+	  shared library.  [Bug #849]
+
+Sun Dec 14 22:31:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (bigmul1_karatsuba): remove temporal bignum.
+
+	* bignum.c (bigsqr): call bigmul0(x, x) because it is faster than the
+	  original bigsqr at this point.
+
+	* bignum.c (rb_big_pow): a value returned from bigsqr is already
+	  truncated.
+
+Sun Dec 14 21:13:02 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (bigmul1_karatsuba): fix comment and refactoring.
+
+Sun Dec 14 14:53:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (bigmul1_balance, bigmul1_karatsuba): remove all
+	  rb_gc_force_recycle which causes memory leak.
+
+Sun Dec 14 14:26:11 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/README: directory structure changed
+
+Sun Dec 14 09:14:37 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* reverts r20713.
+
+Sun Dec 14 12:51:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (rb_big_mul): faster multiplication by Karatsuba method and
+	  twice faster square than normal multiplication. [ruby-dev:37392]
+
+	* random.c (rb_rand_internal): used by Bignum#*.
+
+	* test/ruby/test_bignum.rb: add some tests for above.
+
+Sun Dec 14 01:35:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (forked_child): new variable.
+	  (before_exec): don't call rb_thread_stop_timer_thread if
+	  forked_child.
+	  (after_exec): reset forked_child after rb_thread_start_timer_thread.
+	  (rb_fork): set forked_child just after fork in child.
+
+	* ext/pty/pty.c (chfunc): extracted from establishShell.
+	  (establishShell): use rb_fork.
+
+	  [ruby-dev:37418]
+
+Sat Dec 13 22:17:30 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (help): describes more targets.
+	  based on a patch by Michael Klishin. [ruby-core:20523].
+
+Sat Dec 13 18:34:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_printable): wrong condition for string iteration.
+
+Sat Dec 13 16:04:48 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* encoding.c (default_external): endless recursion during
+	  loading a locale encoding on some locale.
+	  fixed by Nobuyoshi Nakada.
+
+Sat Dec 13 15:55:37 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ruby.c (process_options): fixed default_internal is nil.
+	  (closes #862)
+
+Sat Dec 13 15:52:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_equal): remove documentation error "Otherwise,
+	  compares them as strings".  [ruby-dev:37398]
+
+	* string.c (sym_inspect): quote if symbol contains non-printable
+	  characters.  [ruby-dev:37398]
+
+Sat Dec 13 14:24:38 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/enc/test_utf16.rb: feature changed in r20626.
+	  follows it.
+
+Sat Dec 13 13:41:44 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_m17n_comb.rb: feature changed in r20626.
+	  follows it.
+
+Sat Dec 13 13:03:20 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: use rb_usascii_str_new2 instead of rb_str_new2.
+
+	* rational.c: ditto.
+
+Sat Dec 13 12:48:57 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_m17n.rb: feature changed in r20626.
+	  follows it.
+
+Sat Dec 13 12:38:16 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/minitest/test.rb (MinTest::Unit#location):
+	  skips user-defined assertions as MiniTest's.
+	  e.g. for test/ruby/test_m17n.rb.
+
+Sat Dec 13 09:17:33 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.3.1 r4503.
+	* test/minitest/test_mini_test.rb: ditto.
+	* lib/miniunit/autorun.rb: added (as part of r4503).
+
+Sat Dec 13 08:35:14 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_canonicalization): renamed.
+
+	* ext/math/complex.c: followed the above change.
+
+	* rational.c (nurat_canonicalization): renamed.
+
+	* ext/math/rational.c: followed the above change.
+
+	* configure.in: defines a new macro.
+
+Sat Dec 13 01:10:03 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c
+	  (readline_s_get_completion_append_character): uses locale
+	  encoding but not ASCII-8BIT.
+
+Fri Dec 12 22:12:46 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c, rational.c: do not use RUBY_VERSION_CODE.
+
+Fri Dec 12 21:41:36 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c: r20662 reverted.
+
+Fri Dec 12 19:29:07 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* encoding.c (rb_enc_set_default_external): default_internal can be
+	  nil, but default_external cannot.
+
+	* encoding.c (rb_set_default_internal): adds rdoc.
+
+	* encoding.c (enc_find): ditto.
+
+Fri Dec 12 19:24:47 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (run, runruby, parse, gdb, gdb-ruby): you can also run
+	  other scripts than $(srcdir)/test.rb.
+
+Fri Dec 12 19:13:43 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c (readline_readline): changed the message
+	  of IOError to 'closed stdin' from 'stdin closed' if stdin was
+	  closed.
+
+Fri Dec 12 19:00:49 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c: used the ExportStringValue macro
+	  instead of the OutputStringValue macro. removed the
+	  OutputStringValue macro.
+
+Fri Dec 12 16:23:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yycompile0): ruby_eval_tree_begin is always 0 when
+	  ruby_eval_tree is 0.
+
+Fri Dec 12 14:09:55 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* encoding.c (enc_get_default_encoding): removed.
+	  Generalizing rb_default_{external,internal}_encoding seems to be
+	  difficult.
+	  default_external cannot be NULL even before detected. [ruby-dev:37390]
+
+	* encoding.c (rb_default_external_encoding): has its own
+	  implementation again.
+
+	* encoding.c (rb_default_internal_encoding): ditto.
+
+	* gem_prelude.rb: added notice.
+
+	* ruby.c (rubylib_mangled_path, rubylib_mangled_path2): uses locale
+	  encoding but not ASCII-8BIT.
+
+	* ruby.c (process_options): refers less to default_external.
+
+Fri Dec 12 11:00:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_feature_p): load path must be expanded.
+	  [ruby-dev:37388]
+
+Fri Dec 12 10:28:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_version): greps only the line that defines version.
+
+	* version.h (RUBY_VERSION_CODE, RUBY_RELEASE_CODE): removed.
+
+Fri Dec 12 10:20:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c, rational.c: do not use RUBY_VERSION_CODE.
+
+Fri Dec 12 10:19:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_string_value_ptr, rb_to_id): do not use a side
+	  effect expression in RSTRING_PTR.
+
+	* string.c (rb_str_split_m): simplified the argument of
+	  RSTRING_LEN.
+
+Thu Dec 11 23:48:00 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (sqrt): should pass nan to the original method.
+
+Thu Dec 11 21:04:04 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker.rb, lib/rss/maker/0.9.rb, lib/rss/maker/base.rb:
+	  RSS::Maker.[] returns a maker class corresponds to passed version.
+
+	* test/rss/test_maker_*.rb: add tests for RSS::Maker.[].
+
+Thu Dec 11 20:05:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_aliases_enc_i): skips default internal.
+
+Thu Dec 11 19:31:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb: extracted from lib/test/unit.rb.
+	  lib/test/unit/testcase.rb: ditto.
+	  at asakusa.rb.  [ruby-core:20014]
+
+Thu Dec 11 19:23:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_dup_many): extracted from test_dup.
+	  test in ruby subprocess.  at asakusa.rb.  [ruby-dev:35648]
+
+Thu Dec 11 19:16:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb (Pathname#=~): undefed.  at asakusa.rb.
+	  [ruby-core:19690]
+
+Thu Dec 11 13:09:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (reg_enc_error): raise EncodingCompatibilityError for
+	  encoding incompatibility.  [ruby-core:18600]
+
+	* re.c (rb_reg_prepare_enc): more consistent error message.
+	  [ruby-core:18611]
+
+Thu Dec 11 13:36:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_set_default_encoding): allowed to set default
+	  encoding.
+
+	* encoding.c (rb_locale_encoding): removed Encoding::LOCALE.
+
+	* encoding.c (rb_enc_set_default_external): ditto.
+
+	* encoding.c (rb_enc_set_default_internal): ditto.
+
+	* encoding.c (rb_enc_set_default_internal): defines internal
+	  encoding as nil.
+
+Thu Dec 11 11:11:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/st.h (size_t): needs stddef.h or stdlib.h.
+	  [ruby-core:20339]
+
+Thu Dec 11 10:25:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_bignum.rb (TestBignum#test_convert): remove
+	  platform dependent call of Process.wait.  coverage should be
+	  accomplished by other method.  [ruby-dev:36062]
+
+Thu Dec 11 10:18:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml/document.rb (REXML::Document#write): require
+	  rexml/formatters/transitive if transitive flag is on.  a patch
+	  from akira yamada in [ruby-dev:36230].  fix #553
+
+	* lib/rexml/element.rb (REXML::Element#write): ditto.
+
+	* lib/rexml/formatters/transitive.rb (REXML::Formatters::Transitive#write_element):
+	  add hack for IE.  [ruby-dev:36230]
+
+Thu Dec 11 02:37:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (domain_check): should not raise EDOM exception for NaN
+	  value if operand is also NaN.  affects acos, asin, acosh, atanh,
+	  log, log2, log10, sqrt, gamma, lgamma. [ruby-dev:37357]
+
+Thu Dec 11 02:23:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.pipeline_start): return an array of threads if a
+	  block is not given.
+
+Thu Dec 11 01:48:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_round): should be round
+	  to integer.  [ruby-dev:37355]
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divmod): division should
+	  be integer.  [incompatible] [ruby-dev:37355]
+
+Thu Dec 11 01:21:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_mutex_unlock): shut up warning.  a patch from
+	  Kazuhiro NISHIYAMA in [ruby-dev:37345]. fix #846
+
+Wed Dec 10 23:58:56 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: avoided warnings on cpp. [ruby-dev:37344]
+
+	* rational.c: ditto.
+
+Wed Dec 10 21:32:02 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker.rb (RSS::Maker.[]): add.
+	  Suggested by Akinori MUSHA. Thanks!!! [ruby-dev:37210]
+
+Wed Dec 10 12:56:32 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_rewind): If the enclosed object
+	  responds to a "rewind" method, call it; cf. [ruby-dev:37268]
+
+Wed Dec 10 12:46:52 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_next): Fix a typo: s/rewinded/rewound/.
+
+	* lib/prime.rb (Prime::OldCompatibility#each): Ditto.
+
+Wed Dec 10 11:25:53 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): raise RegexpError when encoding
+	  is dummy encoding. [ruby-dev:37091]
+
+Wed Dec 10 01:28:16 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (win32.obj): depend on headers.
+
+Tue Dec  9 18:35:35 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/single_byte.trans, cp850-tbl.rb, cp852-tbl.rb,
+	  cp855-tbl.rb, koi8-r-tbl.rb, koi8-u-tbl.rb, tis-620-tbl.rb:
+	  new single-byte transcodings (from Yoshihiro Kambayashi)
+
+	* test/ruby/test_transcode.rb: added tests for the above
+	  (from Yoshihiro Kambayashi), small cosmetic fixes
+
+Tue Dec  9 13:33:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each), gc.c (assign_heap_slot),
+	  (gc_mark_children), parse.y (vtable_alloc, vtable_free, vtable_add),
+	  proc.c (proc_to_s), thread.c (terminate_i, rb_thread_terminate_all),
+	  (thread_start_func_2, blocking_region_begin, blocking_region_end),
+	  (rb_thread_kill), thread_pthread.c (native_thread_create),
+	  (ubf_pthread_cond_signal), vm.c (check_env, thread_free), vm_dump.c
+	  (vm_env_dump_raw, vm_stack_dump_each, vm_thread_dump_state),
+	  (vm_call0): use void pointer for %p.
+
+	* cont.c (fiber_status), template/insns.inc.tmpl (ruby_vminsn_type),
+	  vm_insnhelper.h (BOP): ISO C forbids comma at end of enumerator
+	  list.
+
+	* vm_insnhelper.c (check_cfunc): use function pointer.
+
+Tue Dec  9 13:23:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c (curses_use_default_colors): add new
+	  method.  a patch from Giancarlo F Bellido
+	  <support at coaxialhost.com> in [ruby-core:20434].
+
+	* ext/curses/curses.c (curses_tabsize_set): ditto.
+
+	* ext/curses/curses.c (curses_tabsize_get): ditto.
+
+Tue Dec  9 12:08:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (rp): fixed typo for T_STRUCT.
+
+Tue Dec  9 11:50:46 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* pack.c (pack_pack): fixed [ruby-dev:37295].
+	  Array#pack always has returned an US-ASCII string when
+	  the given format ended with 'u', 'M' or 'm'.
+
+Tue Dec  9 03:21:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: fix for continued lines.  based on a patch from
+	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
+
+Tue Dec  9 00:54:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): enc.mk in snapshot is dummy and should
+	  not deal with objects.  [ruby-core:20422]
+
+Tue Dec  9 00:17:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (clean-srcs): split out from clean.
+
+Mon Dec  8 23:34:18 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
+	  just ignores '*' in these cases.
+	  [ruby-dev:37289]
+
+Mon Dec  8 18:31:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_pack): fixed length for odd length string.
+	  [ruby-dev:37283]
+
+Mon Dec  8 11:28:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): added version, copyright, usage, yydebug,
+	  syntax to --dump option.
+
+Mon Dec  8 11:15:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): source-encoding option.
+
+Mon Dec  8 10:32:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (set_option_encoding_once): dry.
+
+	* ruby.c (proc_options): checks extra argument for -E/--encoding.
+
+Sun Dec  7 23:47:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
+	  is set.  [ruby-talk:322136]
+
+Sun Dec  7 23:17:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (LIBRUBY_SO): localizes non-public symbols.
+
+	* configure.in (OBJDUMP, OBJCOPY): for dealing with binary files.
+
+Sun Dec  7 17:44:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.capture3): renamed from Open3.poutput3.
+	  (Open3.capture2): renamed from Open3.poutput2.
+	  (Open3.capture2e): renamed from Open3.poutput2e.
+
+Sun Dec  7 11:48:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.poutput3): :binmode option implemented.
+	  (Open3.poutput2): ditto.
+	  (Open3.poutput2e): ditto.
+
+Sat Dec  6 18:33:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): added RM and CP.  [ruby-dev:37288]
+
+Sat Dec  6 17:51:35 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* pack.c (pack_pack): 'u0' is not special differently from 'm0'.
+
+Sat Dec  6 14:35:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_pack): set US-ASCII and CODERANGE_7BIT
+	  when quoted-printable ('M') and base64 ('m').
+	  [ruby-dev:37284]
+
+	* pack.c (pack_unpack): ditto.
+
+Fri Dec  5 22:56:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_make_exception): single argument to raise may be
+	  string compatible object.
+
+Fri Dec  5 21:45:45 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_{to_s,inspect}): performance improvement.
+
+Fri Dec  5 21:42:44 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: inspect should not depend on to_s.
+
+Fri Dec  5 21:18:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_truncate): return
+	  integer if no optional argument given. [incompatible]
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_floor): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_ceil): ditto.
+
+Fri Dec  5 19:06:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.pipeline_start): new method.
+	  (Open3.pipeline): ditto.
+
+Fri Dec  5 18:55:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (run_exec_dup2): !save is false if Qnil.
+
+Fri Dec  5 18:07:32 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read, rb_w32_write, rb_w32_isatty): check
+	  whether fd is valid.
+
+Fri Dec  5 13:05:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_parameters): proc arguments are always optional.
+
+	* proc.c (get_proc_iseq, rb_proc_parameters): ditto.
+
+Fri Dec  5 12:38:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_sequence): uses rb_compile_warning() for
+	  warning at compilation time.
+
+Fri Dec  5 12:35:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (ruby_iseq_compile, ruby_iseq_translate_threaded_code),
+	  (ruby_insns_name_array, ruby_iseq_build_from_ary): prefixed with
+	  ruby_.
+
+	* iseq.c (ruby_iseq_load, ruby_insn_make_insn_table): ditto.
+
+Fri Dec  5 10:01:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_cmp_m): fixed rdoc.  pointed out by <Thomas
+	  C. Mitchell AT gmail.com> at [ruby-talk:321967]
+
+Fri Dec  5 07:58:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_binwrite): arg.offset should be updated after retry.
+
+Fri Dec  5 03:29:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_get_load_path): returns the load path without
+	  touching.
+
+	* load.c (rb_feature_provided): new function to return the loading
+	  path in addition to rb_provided().
+
+	* load.c (search_required): sets path if loading.
+
+	* variable.c (autoload_provided): load paths are expanded to check
+	  if loading.
+
+	* variable.c (autoload_node): keeps autoload mark while loading.
+	  [ruby-core:20235]
+
+	* variable.c (rb_const_get_0): loops while autoload mark is set.
+
+Fri Dec  5 01:37:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): ERROR_BROKEN_PIPE is not a real error
+	  at this point.
+
+	* io.c (pipe_open): use rb_w32_spawn() instead of rb_w32_pipe_exec()
+	  to use our own redirection scheme.
+
+Fri Dec  5 01:35:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_to_proc): use hidden object.
+
+Fri Dec  5 01:19:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): propagate taint status from format string to
+	  result string.
+
+Fri Dec  5 00:34:10 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (run_exec_dup2): need to sort by reverted order when
+	  restoring fds.
+
+Fri Dec  5 00:17:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_to_proc): caches Symbol procs, based on a patch from
+	  Shumpei Akai <admin AT flexfrank.net>.  [ruby-dev:37265]
+
+Thu Dec  4 23:29:34 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (waitpid): fix bug of checking child slot.
+
+	* win32/win32.c (FindChildSlotByHandle): new.
+
+Thu Dec  4 23:24:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.poutput3): new method.
+	  (Open3.poutput2): ditto.
+	  (Open3.poutput2e): ditto.
+
+Thu Dec  4 23:02:13 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/default.mspec: follows changes in rubyspec project.
+	  inherits configurations from ruby.1.9.mspec.
+
+Thu Dec  4 22:13:55 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_complex.rb: added some tests.
+
+	* test/ruby/test_rational.rb: ditto.
+
+Thu Dec  4 19:56:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.popen3): simplified.
+	  (Open3.popen_run): extracted from Open3.popen3.
+	  (Open3.popen2): new method.
+	  (Open3.popen2e): new method.
+	  (Open3.pipeline_rw): new method.
+	  (Open3.pipeline_r): new method.
+	  (Open3.pipeline_w): new method.
+	  (Open3.pipeline_run): new private method.
+
+Thu Dec  4 19:16:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (check_exec_fds): resolve cascaded child fd reference.
+
+Thu Dec  4 16:58:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rubygems/validator.rb (Gem#remove_leading_dot_dir): make
+	  this method private.  a patch from okkez in [ruby-dev:37245]
+
+Thu Dec  4 16:19:18 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read_nonblock):
+	  OpenSSL::SSL::SSLSocket should implement read_nonblock.  a patch
+	  from Aaron Patterson in [ruby-core:20277].  fix: #814 [ruby-core:20241]
+
+Thu Dec  4 16:16:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/gserver.rb: fixed type in sample code.  a report from Oleg
+	  Puchinin.
+
+Thu Dec  4 14:54:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rubygems/local_remote_options.rb (Gem#add_update_sources_option):
+	  little documentation fix.  a patch from okkez.  [ruby-dev:37271]
+
+Thu Dec  4 13:56:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c (window_getch): avoid ISPRINT() macro which
+	  has an issue with OpenSolaris.  [ruby-core:20189]
+
+	* ext/curses/curses.c (curses_getch): no ISPRINT(). [ruby-core:20294]
+
+	* signal.c (ruby_signal): EINVAL from sigaction(2) is not a bug.
+
+Thu Dec  4 11:40:56 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (inspect_enumerator): Implement #inspect.
+	  [ruby-dev:37248]-[ruby-dev:37263]
+
+Thu Dec  4 11:38:40 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* vm_method.c (rb_obj_respond_to): Remove a duplicated rdoc
+	  comment and fix a markup error.
+
+Thu Dec  4 06:04:16 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/menu.rb: TkOptionMenubutton.new fails to treat
+	  'parent' and 'variable' options on a Hash argument.
+
+Thu Dec  4 05:06:47 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix. use ::RubyVM instead of ::VM
+	  [ruby-list:45676]
+
+	* ext/tk/tcltklib.c: update RELEASE_DATE
+
+Thu Dec  4 01:37:47 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nurat_{to_s,inspect}): provides better representation
+	  for in-finite imag part.
+
+Thu Dec  4 01:22:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (f_signbit): NaN may be signed value.
+
+Wed Dec  3 23:59:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (EXEC_OPTION_DUP2_CHILD): defined.
+	  (check_exec_redirect_fd): check :in, :out and :err.
+	  (check_exec_redirect): check [:child, fd].
+	  (check_exec_fds): validate EXEC_OPTION_DUP2_CHILD array.
+	  (run_exec_dup2_child): new function.
+	  (rb_run_exec_options): call run_exec_dup2_child.
+
+Wed Dec  3 22:54:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (expr): keyword_not can continue across newline.
+	  [ruby-core:20252]
+
+Wed Dec  3 22:40:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (simple_default_value): returns simplest assignment only.
+	  [ruby-core:20237]
+
+Wed Dec  3 21:30:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (check_exec_redirect): accept :in, :out, :err as redirect
+	  target.
+
+Wed Dec  3 21:18:27 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_rational.rb: revert.
+
+Wed Dec  3 14:48:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tcltklib.c (ip_ruby_cmd, ip_invoke_with_position): must
+	  not access internal union directly.  [ruby-list:45670]
+
+Wed Dec  3 12:24:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getc, rb_io_readchar): documentation correction from
+	  Emiel van de Laar.  [ruby-core:20212]
+
+	* ext/stringio/stringio.c (strio_readchar): ditto.
+
+Wed Dec  3 09:26:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml/xpath.rb (REXML::XPath.first): apply documentation
+	  patch from Ken Bloom in [ruby-core:20213].
+
+	* lib/rexml/xpath.rb (REXML::XPath.each): ditto.
+
+Wed Dec  3 02:56:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rational.rb: add a test.
+
+Wed Dec  3 02:53:24 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_range.rb: add a test.
+
+Wed Dec  3 02:26:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_string.rb: add some tests.
+
+Wed Dec  3 02:04:21 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/pty/pty.c (Init_pty): fix typo.
+
+Tue Dec  2 19:22:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.popen3): merge hash options if given.
+
+Tue Dec  2 15:31:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): use
+	  read_nonblock instead of sysread wrapped by timeout to boost
+	  performance.  a patch from Aaron Patterson in [ruby-core:20191].
+	  fix #806
+
+Mon Dec  1 23:23:52 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* set 1.9.1-p5000 into version number. [ruby-dev:36998]
+
+Mon Dec  1 15:48:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* signal.c (register_sigaltstack): no need to define on non-sigaltstack
+	  platform.
+
+Mon Dec  1 12:00:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (rb_fiber_start): calls with exact argument number.
+	  [ruby-core:20088]
+
+Sun Nov 30 21:41:10 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* man/rake.1: new manual page
+
+Sun Nov 30 18:01:50 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_regexp.rb (TestRegexp#test_parse_curly_brace):
+	  now accepts quantifier on anchors again by r20391.
+
+Sat Nov 29 23:56:44 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* man/irb.1 (EXAMPLES): new section
+
+Sat Nov 29 19:19:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regparse.c (is_invalid_quantifier_target): Perl and old Ruby
+	  accepts quantifier on anchors.  [ruby-core:20161]
+
+Sat Nov 29 18:28:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_getaddrinfo): should have updated for
+	  Mac OS X.  a patch from Shumpei Akai in [ruby-dev:37234]
+
+Sat Nov 29 00:18:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* cont.c (fiber_alloc): separate allocation and initialization.
+	  allow subclass to override #initialize.   [ruby-core:20086]
+
+Fri Nov 28 18:31:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_getaddrinfo): refactored to remove
+	  code duplication regarding getaddrinfo.
+
+Fri Nov 28 17:52:26 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/forwardable.rb: should be usable def_single_delegator for
+	  Class and Module.
+
+Fri Nov 28 13:19:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (simple_default_value): extracts simplest default
+	  argument value.
+
+	* iseq.c (rb_iseq_parameters): returns parameter list.
+
+	* proc.c (get_proc_iseq, get_method_iseq): handles ifunc and
+	  bmethod.
+
+	* proc.c (rb_proc_parameters, rb_method_parameters): added
+	  Proc#parameters and Method#parameters.  [ruby-core:19759]
+
+Fri Nov 28 02:18:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): bigdecimal
+	  division (including modulo) should raise ZeroDivisionError as
+	  integer division. [incompatible]
+
+Fri Nov 28 00:12:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flodivmod): floating point division should raise
+	  ZeroDivisionError as integer division. [incompatible]
+
+Thu Nov 27 23:54:37 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark): still needs to check stack depth during GC.
+
+	* gc.c (stack_check): ditto.
+
+Thu Nov 27 21:41:29 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* strftime.c (rb_strftime): should add padding for %%.
+
+Thu Nov 27 16:32:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (register_sigaltstack): stores alt stack for debug
+	  purpose.
+
+Thu Nov 27 16:12:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (ruby_sigaction_t): added.
+
+Thu Nov 27 15:59:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (ruby_stack_check): no check if using sigaltstack.
+
+	* signal.c (ALT_STACK_SIZE): default minimum size is insufficient
+	  for method calls.
+
+	* signal.c (sigsegv): handles stack overflow if possible.
+
+	* thread.c (ruby_thread_stack_overflow): helper function to raise
+	  sysstack_error.
+
+	* thread_pthread.c (ruby_stack_overflowed_p): checks for stack
+	  overflow.
+
+Thu Nov 27 10:40:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should return
+	  Integer for #div operation.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should raise
+	  ZeroDivisionError if divisor is zero.  [ruby-dev:37207]
+
+Wed Nov 26 23:15:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* strftime.c (STRFTIME): use rb_strftime() recursively, instead of
+	  platform's strftime().
+
+Wed Nov 26 22:46:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpException): bigdecimal zero
+	  division should raise FloatDomainError if mode
+	  VP_EXCEPTION_ZERODIVIDE is set.  [ruby-dev:37204]
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode): should handle
+	  VP_EXCEPTION_ZERODIVIDE.
+
+Wed Nov 26 15:16:07 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/gdbm/gdbm.c (rb_gdbm_nextkey): fix memory leak.
+
+Wed Nov 26 03:17:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_r): raise exception
+	  for nan/inf conversion.  [ruby-dev:37187] fix #793
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): ditto.
+
+Wed Nov 26 03:00:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid
+	  segmentation fault caused by (insanely) long decimal values.
+	  [ruby-dev:37189] fix #794
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_to_i,
+	  BigDecimal_to_f, BigDecimal_to_s, BigDecimal_split,
+	  BigDecimal_inspect): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (VpToString): small performance
+	  improvement.
+
+Wed Nov 26 00:26:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* strftime.c (STRFTIME): should add padding for %[xXrR] etc.
+	  [ruby-dev:37185] fix: #792
+
+Tue Nov 25 16:26:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_times): taint (and untrust) status should be
+	  inherited by "ary * 0".  [ruby-dev:37024]
+
+Tue Nov 25 15:54:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* strftime.c (rb_strftime): should not swallow incomplete
+	  formatter, e.g. "%E".  [ruby-dev:37170] fix: #787
+
+	* strftime.c (rb_strftime): clear flags before processing unknown
+	  formatter, e.g. "%i".  [ruby-dev:37180]
+
+Tue Nov 25 10:35:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* strftime.c (rb_strftime): "%^P" should convert to upper case.
+	  [ruby-dev:37180]
+
+Tue Nov 25 07:51:18 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d".
+	  [ruby-dev:37168]  fix: #768
+
+	* strftime.c (rb_strftime): %s to use zero padding by default.
+	  [ruby-dev:37180]
+
+Tue Nov 25 03:37:42 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/blt/tabset.rb,
+	  ext/tk/lib/tkextlib/blt/tabnotebook.rb:
+	  fix many bugs. Now, those work properly.
+
+Tue Nov 25 03:26:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_step): treat infinite step specially.
+	  [ruby-dev:37157] fix: #781.
+
+Tue Nov 25 01:23:25 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (strftime): ignores '_' flag for %[LN].
+
+Tue Nov 25 00:08:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_fork): stops the timer thread during fork.
+	  [ruby-dev:37117]
+
+	* thread.c (rb_thread_start_timer_thread): timer thread needs
+	  system_working to be set.
+
+Mon Nov 24 23:27:28 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): The # flag should work with %a, %A, %b,
+	  %B, and %h.  [ruby-dev:37162]
+
+	* test/ruby/test_time.rb (test_strftime): ditto.
+
+Mon Nov 24 23:16:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (register_sigaltstack): should not add external
+	  variable (with some cosmetic changes).  [ruby-dev:37158]
+
+Mon Nov 24 22:57:25 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): A width specifier for %t and %n should
+	  work.  [ruby-dev:37160]
+
+	* test/ruby/test_time.rb (test_strftime): ditto.
+
+Mon Nov 24 22:07:07 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): The precision of %0N should be 9.
+	  [ruby-dev:37156]
+
+	* test/ruby/test_time.rb (test_strftime): ditto.
+
+Mon Nov 24 21:38:23 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): The default precision should be 1, not
+	  0.  [ruby-dev:37155]
+
+	* test/ruby/test_time.rb (test_strftime): ditto.
+
+Mon Nov 24 19:53:47 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (inspect): changed again.
+
+Mon Nov 24 18:35:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/time.rb: r20251 reverted.  The patched behavior do not round
+	  trip.  [ruby-core:19988]
+
+Sun Nov 23 16:04:05 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* signal.c (default_handler, Init_signal): compile error if
+	  USE_SIGALTSTACK is not defined.
+
+Sun Nov 23 00:04:14 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* signal.c (ALT_STACK_SIZE): 4KB is not enough on Mac OS X.
+	  Uses SIGSTKSZ.
+
+Sat Nov 22 21:29:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_method.rb (test_default_accessibility): test case for
+	  [ruby-dev:37124].
+
+Sat Nov 22 18:24:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_world_writable_p): should return nil for non
+	  world-writable files.
+
+Sat Nov 22 10:31:25 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:
+	  fix NameError bug.
+
+Sat Nov 22 03:41:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/pty/pty.c (get_device_once): abandon asynchronous exception
+	  that might cause serious problem if a program terminated early.
+	  asynchronous exception is a very bad thing anyway.  use
+	  Process.waitpid(pid) or PTY.check(pid) to poll program
+	  termination. if PTY.check is called with optional second
+	  argument being true, it raises an exception same as one from
+	  previous behavior.  [incompatible] fix: [ruby-core:19583]
+
+Fri Nov 21 22:24:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c (curses_escdelay_set): support ESCDELAY.  a
+	  patch from Giancarlo F Bellido <support at coaxialhost.com> in
+	  [ruby-core:19961].
+
+Fri Nov 21 22:17:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (usage): -W description updated.  [ruby-core:19858]
+
+Fri Nov 21 21:50:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (register_sigaltstack): use alternative stack for
+	  SIGSEGV to avoid uncaught stack overflow. based on a patch from
+	  Hiro Yoshioka <hyoshiok at miraclelinux.com> in [ruby-dev:37134].
+	  [ruby-dev:36993]
+
+Fri Nov 21 16:06:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm.c (thread_free): th->vm may be NULL when pthread_create
+	  failed for ENOMEM.  [ruby-dev:37095]
+
+Thu Nov 20 07:33:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/logger.rb (Logger): should handle the case that cvs/svn do
+	  not expand $Id keyword.  [ruby-core:19991]
+
+Thu Nov 20 07:27:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust
+	  indentation to shut up warning.  [ruby-core:19993]
+
+Wed Nov 19 17:48:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/rubyext.c (rb_syck_mktime): return DateTime for a value
+	  out of range of Time.   [ruby-core:19919]
+
+Wed Nov 19 14:14:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* node.h (NOEX_MODFUNC): should be include NOEX_PRIVATE.
+	  [ruby-dev:37124]
+
+Wed Nov 19 03:01:04 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: fixed fails occasionally [ruby-dev:37119].
+	  thanks, shinichiro.h.
+
+Wed Nov 19 02:39:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (Init_syserr): moved function definition itself from
+	  template/known_errors.inc.tmpl.
+
+Wed Nov 19 01:10:52 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
+	  from NaHi [ruby-dev:37110].
+
+Wed Nov 19 01:05:26 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (cont_mark, cont_capture, cont_restore_1): speed up
+	  continuation by copying only valid YARV stack.  [ruby-dev:37106]
+
+Wed Nov 19 00:03:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/time.rb: according to RFC2822, -0000 means local time, +0000
+	  means UTC.  a patch from Chun Wang.   [ruby-core:19578]
+
+Tue Nov 18 23:02:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (proc_eq): equivalence check should not done by pointer
+	  comparison, but should be based on iseq contents.   [ruby-dev:37101]
+
+Tue Nov 18 20:30:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
+	  a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in
+	  [ruby-core:19982].
+
+Tue Nov 18 16:18:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
+	  Nobuhiro IMAI at [ruby-dev:37108].
+
+Tue Nov 18 15:56:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line):
+	  use possessive match for path retrieval to avoid huge recursion
+	  for insanely long path.
+
+Tue Nov 18 15:50:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_desc): re might be NULL.
+
+	* regerror.c (onig_error_code_to_format): message updated.
+
+Tue Nov 18 09:42:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::make_switch): makes default
+	  conversion to splat.  [ruby-list:45645]
+
+Mon Nov 17 18:05:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (LIBS): fixed for disable-shared.  [ruby-dev:37103]
+
+Mon Nov 17 11:12:24 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* bin/erb: remove -K option.
+
+Mon Nov 17 02:19:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
+
+Sat Nov 15 22:46:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_regsub): returns -1 unless ascii as well as
+	  rb_enc_ascget().  [ruby-dev:37097]
+
+Sat Nov 15 22:23:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LDSHARED): do not suppress debug info if higher debug
+	  level is given, on cygwin and mingw.
+
+Fri Nov 14 20:27:46 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* README.EXT, README.EXT.ja, vm_exec.c, vm_insnhelper.c: update
+	  filenames.
+
+Thu Nov 13 11:31:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_barrier_wait): gets rid of recursive deadlock.
+
+Thu Nov 13 06:08:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that
+	  circular requires fail with deadlock.  [ruby-core:19821]
+
+Wed Nov 12 07:16:01 2008  David Flanagan  <david@think32>
+
+	* ruby.c (set_internal_encoding_once): fix typo in error string
+
+Wed Nov 12 03:30:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized
+	  versions for literal strings.
+
+Wed Nov 12 03:28:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_require_safe): destroys barrier after successfully
+	  loaded, to get rid of loading same library again.  [ruby-core:19798]
+
+	* thread.c (rb_barrier_wait): can not wait destroyed barrier.
+
+	* thread.c (rb_barrier_destroy): destroys barrier so that no longer
+	  waited.
+
+Tue Nov 11 23:02:27 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* man/ruby.1 (RUBYOPT): wrote which option can appear.
+	  (--yydebug): wrote "do not use".
+	  (--dump): wrote "do not use".
+
+Tue Nov 11 21:22:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#check_path): REL_PATH should a
+	  symbol.  [ruby-core:19805]
+
+Tue Nov 11 20:49:29 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* configure.in: fix SEGV on Mac OS X 10.5.3 with pthread.
+	  a patch from Wataru Kimura in Bug #193 [ruby-core:17333].
+
+Tue Nov 11 20:39:27 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (inspect): reverted the previous change.
+
+Tue Nov 11 17:35:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_accept): secure fd before accept because if
+	  error causes in securing, cannot restore the state of accepted
+	  socket.
+	  fixed [ruby-core:19728]
+
+Tue Nov 11 14:40:40 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb: unnecessary setup method
+	  (setup_really_needed?) removed
+
+Tue Nov 11 14:25:25 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/single_byte.trans, macgreek-tbl.rb, macroman-tbl.rb,
+	  macromania-tbl.rb, macturkish-tbl.rb, macukraine-tbl.rb,
+	  ibm437-tbl.rb, ibm852-tbl.rb, ibm855-tbl.rb, ibm857-tbl.rb,
+	  ibm860-tbl.rb, ibm861-tbl.rb, ibm862-tbl.rb, ibm863-tbl.rb,
+	  ibm865-tbl.rb, ibm866-tbl.rb, ibm869-tbl.rb, ibm775-tbl.rb:
+	  new single-byte transcodings (from Yoshihiro Kambayashi)
+
+	* test/ruby/test_transcode.rb: added tests for the above
+	  (from Yoshihiro Kambayashi)
+
+Tue Nov 11 13:20:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_r): moved from
+	  bigdecimal/util, converted into C.  [ruby-dev:36805]
+
+Tue Nov 11 07:55:57 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (inspect): changed the format.
+
+Mon Nov 10 17:34:50 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/sdbm/test_sdbm.rb (TestSDBM#test_index): Reflect the method
+	  name change from #index to #key and remove a duplicated test
+	  method.
+
+Mon Nov 10 10:50:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator.delegating_block): should not refer
+	  DelegateClass specific @delegate_dc_obj.  a patch from Erik
+	  Hollensbe in [ruby-core:19671].
+
+Mon Nov 10 09:54:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (ifs_open_socket): should retry without proto_buffer
+	  if cannot find the suitable protocol. a patch from Heesob Park.
+	  fixed [ruby-core:19713]
+
+Sun Nov  9 13:04:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_initialize_m): avoid unnecessary array
+	  allocation.
+
+Sun Nov  9 04:10:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (control_frame_dump): suppresses finished method name.
+
+Sun Nov  9 00:30:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (thread_timer): checks working flags again.
+
+Sun Nov  9 00:02:01 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/session/pstore.rb: fix indentation.
+
+Sat Nov  8 23:47:45 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/session.rb (FileStore): use marshalized data.
+
+	* test/cgi/session_dir: add a session directory in test.
+
+	* test/cgi/test_cgi_session.rb: add a test.
+
+Sat Nov  8 21:57:03 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/session.rb: remove debug code.
+
+Sat Nov  8 21:33:53 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/session.rb: fix indentation.
+
+Sat Nov  8 18:11:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#do_CONNECT):
+	  use #bytesize instead of #size.  a patch submitted from
+	  raspberry lemon in [ruby-core:18571].
+
+	* lib/webrick/httpauth/digestauth.rb, lib/webrick/httpproxy.rb,
+	  lib/webrick/httprequest.rb, lib/webrick/httpservlet/cgi_runner.rb,
+	  lib/webrick/httpservlet/abstract.rb, lib/webrick/httpresponse.rb,
+	  lib/webrick/httpservlet/cgihandler.rb, lib/webrick/utils.rb: ditto.
+
+Sat Nov  8 17:31:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_ungetc): ungetc position should
+	  not be changed from 1.8.  [ruby-core:19632]
+
+Sat Nov  8 17:15:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#make_switch): 1.9 Symbols respond
+	  to :match.  a patch from keith cascio, <keith at ucla.edu>.
+	  [ruby-core:19730]
+
+Sat Nov  8 12:10:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/gdbm/gdbm.c (fgdbm_index): make #index warn like Hash.
+	  [ruby-dev:37039]
+
+	* ext/sdbm/init.c (Init_sdbm): typo fixed.  [ruby-dev:37039]
+
+Sat Nov  8 07:07:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: detect stdio buffer pointers for uClibc.  a patch
+	  from Brian Candler <B.Candler at pobox.com> in [ruby-core:12020].
+	  [ruby-core:19713]
+
+Sat Nov  8 06:51:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_index): make #index warn like Hash.
+
+	* ext/dbm/dbm.c (fdbm_key): new method.
+
+	* ext/sdbm/init.c: ditto.
+
+Sat Nov  8 06:20:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c: curses encoding should obey locale.
+
+	* ext/curses/curses.c (curses_getch): 1.9 getch should return one
+	  character string for single byte string.  wchar_t support may
+	  follow in the future.
+
+Sat Nov  8 05:46:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h (rb_io_t): added write_lock to serialize.
+	  [ruby-core:19668]
+
+	* gc.c (gc_mark_children): mark write_lock.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): Mutex also needs to be
+	  deferred.
+
+	* io.c (io_fflush, io_binwrite, fptr_finalize): serializes writing.
+
+Sat Nov  8 05:31:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* safe.c (safe_setter): add warning for $SAFE=3.
+
+Sat Nov  8 01:48:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): do not wait never
+	  coming signal if failed to create timer thread.
+
+	* thread_pthread.c (native_cond_timedwait): returns error code.
+
+	* thread_pthread.c (thread_timer): typo fixed.
+
+Sat Nov  8 01:14:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (thread_timer, rb_thread_create_timer_thread):
+	  handshakes properly.
+
+Fri Nov  7 22:51:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* inits.c (rb_call_inits): do not repeat.
+
+Fri Nov  7 22:46:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (thread_timer): initializes mutex each time.
+
+Fri Nov  7 21:23:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_win32.c (thread_start_func_1): use already gotten stack info.
+
+Fri Nov  7 12:26:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb.rb (IRB::Irb#eval_input): remove extra  @context.prompt_i.
+	  [ruby-core:19718]
+
+Fri Nov  7 11:55:30 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* nkf.c: update to r1.188. fixes for 16bit environment.
+
+Fri Nov  7 07:43:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_timer): pthread_cond_timedwait returns ETIMEDOUT
+	  when timed out.
+
+Fri Nov  7 07:32:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb: support Rational and Complex as 1.8
+	  does.  a patch from Hiroshi Moriyama in [ruby-dev:36899].
+
+Fri Nov  7 07:12:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (thread_timer): uses pthread_cond_timedwait always
+	  instead of pthread_kill.
+
+Fri Nov  7 06:58:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (Init_String): remove Symbol#===.  [ruby-dev:37026]
+
+Fri Nov  7 04:02:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_timer): uses timedwait on cygwin.
+
+Fri Nov  7 02:00:12 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/rexml/entity.rb (unnormalized): do not call
+	  document.record_entity_expansion if document is nil.
+	  see <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502535>.
+	  Thanks, Naohisa Goto.
+
+	* test/rexml/test_document.rb: ditto.
+
+Fri Nov  7 01:24:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: binary encoding spec is no longer needed in 1.9.
+
+Thu Nov  6 22:21:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_stop_timer_thread): terminates timer thread
+	  immediately.
+
+Thu Nov  6 21:21:46 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_s_connect, fole_initialize,
+	  folevariant_initialize): check argument type of WIN32OLE.connect,
+	  WIN32OLE.new, WIN32OLE_VARIANT.new.
+
+	* test/win32ole/test_win32ole.rb (test_s_new_exc, test_s_connect_exc):
+	  ditto.
+
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_exc): ditto.
+
+	* test/win32ole/test_win32ole_method.rb: add assertion of
+	  WIN32OLE_METHOD.new.
+
+Tue Nov  4 13:08:01 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): now can specify ``-xname''
+	  instead of ``-x name''.
+
+Tue Nov  4 08:00:00 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* test/zlib/test_zlib.rb(test_readchar): compare in same type.
+
+Tue Nov  4 03:28:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_join): do not repeat self in a recursive array.
+	  [ruby-dev:37019]
+
+Tue Nov  4 01:56:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_mutex_synchronize): fixed prototype.
+
+	* thread.c (rb_mutex_synchronize): fixed function name.
+
+Mon Nov  3 16:32:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing.h: needs RUBY_EXTERN instead of extern for mswin.
+
+Mon Nov  3 13:01:13 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* array.c (rb_ary_take_first_or_last): renamed rb_ary_partial more
+	  appropriately.
+	  (ary_take_pos_flags): new enum. makes the fourth argument of
+	  rb_ary_take_first_or_last more descriptive.
+	  (rb_ary_partial): renamed rb_ary_partial0 more appropriately.
+	  takes a new parameter klass for what class to instantiate.
+
+Mon Nov  3 13:00:26 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* range.c (rb_range_beg_len): rb_raise takes C values as arguments.
+	  [BUG] ranges turned into other value in a message of RangeError.
+
+Mon Nov  3 00:36:44 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_event.rb: rename test class.
+
+	* test/win32ole/test_win32ole_variant_outarg.rb: add in order
+	  to use ADO instead of Internet Explorer.
+	  remove test/win32ole/test_win32ole_variant_with_ie.rb.
+
+	* test/win32ole/orig_data.csv: ditto.
+
+Sun Nov  2 23:08:08 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_err_in_callback.rb: add teardown.
+
+Sun Nov  2 22:12:41 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_event_free): invoke IConnectionPoint::Unadvise
+	  before invoking IConnectionPoint::Release.
+
+	* test/win32ole/test_win32ole_event.rb, test/win32ole/err_in_callback.rb,
+	  test/win32ole/test_err_in_callback.rb: Use ActiveX Data Object
+	  Library instead of InternetExplorer.
+
+Sun Nov  2 22:06:55 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* win32/Makefile.sub: add RUNRUBYOPT. [ruby-dev:37009]
+
+Sun Nov  2 16:41:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (Init_zlib): defines readbyte instead redefining
+	  readchar.
+
+Sat Nov  1 07:09:40 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb: Don't require rubygems/defaults.rb.
+
+Fri Oct 31 21:58:50 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/converter.rb (RSS::Converter): use String#encode.
+
+Fri Oct 31 21:28:14 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/webrick/httpauth/digestauth.rb
+	  (WEBrick::HTTPAuth::DigestAuth#initialize): fix typo.
+
+Fri Oct 31 18:51:42 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_array.rb (test_array_subclass): test for r20076.
+
+Fri Oct 31 18:42:19 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* array.c (ary_partial0): recovers the mistakenly changed feature at r19723.
+	  Array#[m,n] had returned an Array even for an instance of a
+	  subclass.
+
+Fri Oct 31 18:05:05 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/single_byte.trans, maccroatioan-tbl.rb,
+	  maccyrillic-tbl.rb, maciceland-tbl.rb: new single-byte
+	  transcodings (from Yoshihiro Kambayashi)
+
+	* test/ruby/test_transcode.rb: added tests for the above
+	  (from Yoshihiro Kambayashi)
+
+Fri Oct 31 12:51:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_globs): need taint check.  reported by steve
+	  <oksteev at gmail.com>
+
+Fri Oct 31 12:42:45 2008  wanabe  <s.wanabe@gmail.com>
+
+	* array.c (rb_ary_decrement_share): fix to work recycling
+	  shared-array without the following.  [ruby-dev:36991]
+
+	* array.c (ary_make_substitution): don't recycle substitution array.
+
+Fri Oct 31 12:27:52 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/default.mspec: supports that the build directory != srcdir.
+
+Fri Oct 31 11:35:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_set_default_internal): no alias "internal" if
+	  default internal is not set.  [ruby-dev:37000]
+
+Fri Oct 31 08:16:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): delays setting safe level.
+	  [ruby-dev:36997]
+
+Thu Oct 30 21:32:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_permutation): hide temporal array.
+
+Thu Oct 30 14:45:45 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/single_byte.trans: refactoring to make it easier
+	  to add more transcodings (with Yoshihiro Kambayashi)
+
+	* enc/trans/iso-8859-1-tbl.rb: new file to avoid having to
+	  treat ISO-8859-1 as special
+
+Thu Oct 30 14:10:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): templates a, A, Z should propagate encoding
+	  of original strings.  templates b, B, h, H brings ASCII-8BIT to
+	  the result.
+
+Thu Oct 30 10:34:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (moreswitches): splits option string and passes arguments.
+
+	* ruby.c (proc_options): checks if allowed in RUBYOPT.
+
+	* ruby.c (process_options): allows long style options in RUBYOPT.
+
+	* ruby.c (load_file_internal): ditto in shebang.  [ruby-dev:36979]
+
+Thu Oct 30 09:31:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_locale_encoding): makes an alias for locale.
+	  [ruby-dev:36976]
+
+	* encoding.c (rb_enc_set_default_external): ditto for external.
+
+	* encoding.c (rb_enc_set_default_internal): ditto for internal.
+
+Thu Oct 30 03:30:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (load_file_internal): should not set script encoding to
+	  ASCII-8BIT.
+
+	* ruby.c (load_file_internal): do not auto convert scripts even
+	  when default_internal is set.  [ruby-core:19579]
+
+Thu Oct 30 02:20:33 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_sort_bang): remove SEGV when replacing array with
+	  embedded one during sort.  [ruby-dev:36983]
+
+	* test/ruby/test_array.rb (test_sort!): add tests for above.
+
+Thu Oct 30 01:44:23 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb: add some tests.
+
+Thu Oct 30 01:32:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_splice): remove redundant check.
+
+Thu Oct 30 01:24:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_str_cmp): fix condition which always returned true
+	  because ENCODING_GET returns unsigned long.
+
+Thu Oct 30 01:10:32 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb (test_permutation): add a test that replaces
+	  array during permutation.
+
+Wed Oct 29 23:31:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_check_dummy_enc): new function to check dummy
+	  encoding.
+
+	* string.c (rb_str_upcase_bang): case conversion functions should
+	  not be applicable to strings in dummy encoding.  [ruby-dev:36985]
+
+Wed Oct 29 23:57:29 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_sort_bang): replacing array during sort broke
+	  invariant of array.  [ruby-dev:36983]
+
+Wed Oct 29 21:06:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_rewind): should reset fptr->readconv if it's
+	  available.
+
+	* io.c (more_char): clear readconv at EOF.
+
+	* test/ruby/test_file.rb: should not read after EOF.  use rewind
+	  instead.
+
+Wed Oct 29 20:45:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/webrick/utils.rb (start_server): provide a reference to log of
+	  webrick.
+
+	* test/webrick/test_httpproxy.rb, test/webrick/test_httpauth.rb,
+	  test/webrick/test_cgi.rb, test/webrick/test_httpserver.rb,
+	  test/webrick/test_server.rb, test/webrick/test_filehandler.rb: use
+	  webrick log as an assertion message.
+
+Wed Oct 29 16:41:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_pack): set encoding from packing string and UTF-8 for
+	  "U".  [ruby-core:19590]
+
+Wed Oct 29 15:50:00 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* complex.c (imp1, imp2): should declare type.
+	  [BUG] at IA-64
+
+Wed Oct 29 14:36:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (revision.h): have to be updated daily or by non-trivial
+	  commits.
+
+Wed Oct 29 13:18:02 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* README, README.ja: Update the portability section.
+
+Wed Oct 29 13:02:17 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (rb_cv_lib_xpg4_needed): Drop legacy FreeBSD
+	  support regarding libxpg4.  Those old versions of FreeBSD
+	  shipped with the library don't have a working pthread library
+	  anyway.
+
+Wed Oct 29 11:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (dln-a-out): cannot make shared library nor work with
+	  ELF.  [ruby-core:19571]
+
+Wed Oct 29 11:00:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_open): shouldn't seek here.
+
+	* win32/win32.c (rb_w32_write): write to the end of the file when
+	  FAPPEND is specified.
+
+Wed Oct 29 09:30:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): cache common interned IDs.
+
+Wed Oct 29 00:43:39 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: uses macro in declarations.
+
+Wed Oct 29 00:26:00 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_open): need to seek to the end of the file when
+	  O_APPEND is specified.
+
+Wed Oct 29 00:08:05 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* math.c (rb_math_{atan2,cos,cosh,hypot,log,sin,sinh,sqrt}): added.
+
+	* complex.c: follows the above change.
+
+Tue Oct 28 23:29:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (kanji_convert): output unicode chars.
+	  [ruby-dev:36957]
+
+	* ext/nkf/nkf-utf8/nkf.c (numchar_getc): increase buffer size.
+	  reported and patched at [ruby-dev:36957] by mame.
+
+Tue Oct 28 23:03:46 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/test_proc.rb: filled all patterns for testing
+	  vm_yield_setup_args.
+
+Tue Oct 28 23:05:35 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: continues to support canonicalization *unofficially*
+	  for an odd library mathn for the time being (only 1.9.x).
+	  since grand mathn must be very very special library for us.
+
+	* rational.c: ditto.
+
+	* ext/mathn/*/*: follow the above changes.
+
+Tue Oct 28 21:31:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (parser_yylex): check EOF explicitly.
+
+Tue Oct 28 20:59:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (extract_binmode): new function to extract binmode/textmode
+	  options from hash.
+
+	* io.c (rb_io_extract_modeenc): use above function.
+
+	* io.c (rb_io_s_pipe): recognize binmode/textmode options.
+
+Tue Oct 28 20:15:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (make_readconv): now can specify the size of cbuf.
+
+	* io.c (read_all, appendline, io_getc, rb_io_ungetc): follow above
+	  change.
+
+Tue Oct 28 19:00:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_pipe_exec): internal fds should be always
+	  binmode.
+
+Tue Oct 28 17:21:18 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/make-snapshot.rb: merged from ruby_1_9_1.
+
+Tue Oct 28 16:56:31 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* gem_prelude.rb: merged from ruby_1_9_1 branch.
+	  considers --program-suffix and prefix configure options.
+
+	* lib/rubygems/defaults.rb: ditto.
+
+	* test/rubygems/test_gem.rb (@default_dir_re): ditto.
+
+Tue Oct 28 16:13:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: use String#bytesize.
+
+Tue Oct 28 09:51:48 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bootstraptest/test_thread.rb: ignore some exceptions.
+	  [ruby-dev:36951]
+
+Tue Oct 28 09:19:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (RUNRUBY): now ruby requires something from
+	  gem_prelude, so need to set library path.
+
+Mon Oct 27 22:29:11 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* vm_insnhelper.c (vm_yield_setup_args): supports optional parameters.
+	  Fixed [ruby-core:19503].
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): a new function. extracted
+	  from vm_yield_setup_args.
+
+	* vm_insnhelper.c (vm_yield_setup_block_args_complex): ditto.
+
+	* test/ruby/test_proc.rb: added tests for arguments on a Proc from
+	  Kernel#proc called.
+
+Mon Oct 27 20:03:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/mathn/complex/complex.c: no need to define rb_cComplex because
+	  it's already defined at $(srcdir)/complex.c.
+
+	* ext/mathn/rational/rational.c: no need to define rb_cRational because
+	  it's already defined at $(srcdir)/rational.c.
+
+Mon Oct 27 15:58:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file): preserves $..  [ruby-dev:36937]
+
+	* io.c (argf_init): initial value of $. should be 0.
+	  see [ruby-dev:36937].
+
+Mon Oct 27 15:38:38 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/minitest/test_mini_test.rb
+	  (test_assert_raises_triggered_different): the test failed when a
+	  file path in the backtrace contains something except [\w\/\.],
+	  e.g. hyphen, Japanese characters or backslash.
+
+	* test/minitest/test_mini_test.rb
+	  (test_assert_raises_triggered_subclass): ditto.
+
+Mon Oct 27 15:32:08 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/minitest/test_mini_test.rb: fixed that r19958 made
+	  test-all fail when the ruby was built at $(srcdir).
+
+Mon Oct 27 12:04:58 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/envutil.rb: reverted the changeset 19948 because it
+	  concealed unexpected behaviours of ruby.
+
+	* test/ruby/test_io.rb: ditto.
+
+Mon Oct 27 12:02:53 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/nkf/nkf.c (rb_nkf_convert): should specify type of variable.
+
+Mon Oct 27 11:34:56 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/minitest/test_mini_test.rb (test_filter_backtrace):
+	  fixed failure on Ruby built at out of $(srcdir).
+
+	* test/minitest/test_mini_test.rb (test_Filter_backtrace_unit_starts):
+	  ditto.
+
+Mon Oct 27 10:02:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (read_all): the 3rd argument maybe Qnil.
+
+Mon Oct 27 01:29:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/nkf/test_nkf.rb: add a test for [ruby-dev:36909].
+
+Mon Oct 27 01:05:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_convert): avoid GC.
+	  reported in [ruby-dev:36909] and patched [ruby-dev:36941] by mame.
+
+Sun Oct 26 21:28:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/json/test_json.rb: remove dependency on permutation gem.
+
+Sun Oct 26 19:18:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (blocking_region_{begin,end}): declared as inline.
+
+	* util.c (freedtoa): used only when MULTIPLE_THREADS is not defined.
+
+	* win32/win32.c (rb_w32_pipe): serial is DWORD.
+
+	* ext/etc/etc.c (sGroup): getgrent may not be available.
+
+Sun Oct 26 18:11:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/wait/{extconf.rb,wait.c}: needs sys/ioctl.h for fcntl on
+	  cygwin.
+
+Sun Oct 26 18:18:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gem_prelude.rb: disables debug and verbose flags to suppress failure
+	  messages.  interpolation does not occur inside single quotes.
+
+Sun Oct 26 18:42:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems
+	  to get rid of the interference.
+
+	* test/ruby/test_io.rb (ruby): ditto.
+
+Sun Oct 26 13:30:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (read_all): use the given buffer to read when needs readconv.
+	  based on the patch by wanabe <s.wanabe AT gmail.com> at
+	  [ruby-dev:36931].
+
+Sun Oct 26 07:57:35 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*: Update to RubyGems 1.3.1 r1909.
+
+Sun Oct 26 07:35:56 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/unit.rb: Imported minitest 1.3.0 r4429.
+	* test/minitest/*: ditto.
+
+Sun Oct 26 02:16:29 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in ($MANTYPE): followed ruby.1, which had moved.
+
+	* instruby.rb (:man): ditto.
+
+	* mdoc2man.rb: fixed for the case Xr with 2 arguments.
+
+Sun Oct 26 01:42:45 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* man/irb.1: new manual page.
+
+Sun Oct 26 00:11:48 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* man/ruby.1: moved into man/. added some descriptions.
+
+	* man/goruby.1: new file.
+
+	* instruby.rb (:man): followed ruby.1.
+
+Sat Oct 25 20:05:22 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c (gc_profile_result): bug fix. The millisecond is 1/1000.
+
+Sat Oct 25 11:12:40 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ruby.c (usage): updated the description of -E option.
+
+Sat Oct 25 09:54:10 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb:  Fixed a bug in read_to_char() that would slurp
+	  whole files if the encoding was invalid.  It will now read
+	  up to 10 bytes ahead to find a valid character boundary or
+	  give up.  [ruby-core:19465]
+
+	* test/csv/test_features.rb, test/csv/test_table.rb, test/csv/test_row.rb:
+	  Loosened some tests to check for a compatible? Encoding instead
+	  of an exact Encoding.  [ruby-core:19470]
+
+Sat Oct 25 07:42:49 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc*: Update to RDoc 2.2.2 r192.
+
+Sat Oct 25 04:00:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/us_ascii.c (us_ascii_mbc_enc_len): made static.  a patch by
+	  Tadashi Saito <shiba AT mail2.accsnet.ne.jp> at [ruby-dev:36916]
+
+	* signal.c (signal_buff): made static.  a patch by Tadashi Saito
+	  <shiba AT mail2.accsnet.ne.jp> at [ruby-dev:36915]
+
+	* util.c (freedtoa): made static to get rid of name clash.  a patch by
+	  Tadashi Saito <shiba AT mail2.accsnet.ne.jp> at [ruby-dev:36913]
+
+	* util.c (ruby_dtoa): added prefix, ditto.
+
+Sat Oct 25 03:43:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lambda): need to adjust lpar_beg for both of the parser and
+	  ripper.
+
+Sat Oct 25 01:29:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/mathn/rational/rational.c: undef duplicated macro definition
+	  first to shut up the warning.
+
+	* ext/mathn/rational/rational.c (rb_rational_new_mathn): specify
+	  omitted return value.
+
+Sat Oct 25 00:14:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sample): fixed sizes and randomness.
+
+Fri Oct 24 23:04:42 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in (sitedir): considers --program-prefix and
+	  --program-suffix.
+	  (vendordir): ditto.
+	  (rubyhdrdir): ditto.
+
+	* mkconfig.rb (CONFIG["rubylibdir"]): ditto.
+
+	* win32/Makefile.sub: ditto.
+
+	* instruby.rb (:rdoc): ditto.
+
+	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): ditto.
+
+Fri Oct 24 22:59:27 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb (test_sample): add tests for size of
+	  returned array and randomness.
+
+Fri Oct 24 21:50:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* id.h, template/id.h.tmpl (enum ruby_method_ids): reordered.
+
+Fri Oct 24 21:19:45 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* ext/mathn/rational.c: change several global functions.
+
+Fri Oct 24 21:05:38 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/html.rb: allow symbolized key.
+
+	* test/cgi/test_cgi_tag_helper.rb: add a test.
+
+Fri Oct 24 20:54:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (exts): renamed to get rid of the existent directory.
+
+Fri Oct 24 20:45:41 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* ext/mathn/rational.c: change several global functions to static
+	  function.
+
+Fri Oct 24 19:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_dump): should have removed commented out
+	  unnecessary code.  [ruby-cvs:27131]
+
+Fri Oct 24 19:16:36 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* id.h (enum ruby_method_ids): ISO C forbids comma at end of
+	  enumerator list.
+
+Fri Oct 24 18:29:00 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/mathn.rb: moved into ext/mathn/rational/rational.c and
+	  ext/mathn/complex/complex.c.
+	* ext/mathn: new mathn ext-libraries.
+
+Fri Oct 24 18:21:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_array.rb (TestArray#test_join): should restore
+	  global variable after the test.  [ruby-dev:36896]
+
+	* test/ruby/test_hash.rb (TestHash#test_to_s): ditto.
+
+Fri Oct 24 17:43:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (lambda): need to adjust lpar_beg for ripper as well.
+	  [ruby-dev:36702]
+
+Fri Oct 24 16:13:12 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (read_multipart): change field value as String
+	  from StringIO or Tempfile when multipart parse except file field.
+	  add files method that can get uploaded files. [ruby-dev:36547]
+
+	* test/cgi/test_cgi_multipart.rb: fix the test for core.rb.
+
+Fri Oct 24 14:22:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ext): split out the target for extension library.
+
+	* common.mk (encs): depends on enc and trans.
+
+Fri Oct 24 10:23:24 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_signal.rb (TestSignal#test_exit_action): Thread
+	  may terminate before sysread. [ruby-dev:36835]
+
+Thu Oct 23 22:06:23 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* distruby.rb: removed. "make dist" uses tool/make-snapshot for the 1.9
+	  series. distruby.rb has been no longer used.
+
+Thu Oct 23 17:30:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_class_instance_methods): rdoc fixed.  [ruby-core:19458]
+
+Thu Oct 23 16:19:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/init.rb (IRB.load_modules): catch LoadError explicitly.
+	  a patch from Daniel Berger <Daniel.Berger at qwest.com> in
+	  [ruby-core:19451].  fix [ruby-core:19450]
+
+Thu Oct 23 16:16:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_getservbyport): check if the port range.
+	  [ruby-core:19460]
+
+Thu Oct 23 14:08:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_getservbyname): unuse unnecessary
+	  object.
+
+	* ext/socket/socket.c (sock_s_getservbyport): the port should be
+	  converted before the proto so that the #to_int of the former cannot
+	  alter the latter.
+
+Thu Oct 23 10:55:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_dump): use \u{ff} escape for UTF-8 encoding
+	  string.
+
+Thu Oct 23 09:26:22 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_getservbyport): cast to get rid of
+	  warning.
+
+Thu Oct 23 08:06:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_getservbyport): port should be
+	  network byte order.  a patch from Dave Thomas in [ruby-core:19454].
+
+Thu Oct 23 01:26:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_conv_enc_opts): new function to convert with
+	  specifying ecflags and ecopts.
+
+	* ext/zlib/zlib.c (gzfile_newstr): specify ecflags and ecopts for
+	  conversion using above function.
+
+	* ext/zlib/zlib.c (gzfile_newstr): use own rb_econv_t for dummy
+	  encoding to handling stateful encoding (e.g. iso-2022-jp).
+	  [ruby-dev:36857]
+
+	* ext/zlib/zlib.c (gzfile_getc): ditto.
+
+Thu Oct 23 01:24:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_tmpsrc): get rid of side effects.
+
+Thu Oct 23 00:10:01 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: separate data structure between rb_fiber_t and
+	  rb_context_t (rb_fiber_t includes rb_context_t).
+	  rb_fiber_t has double linked list of fibers in same threads.
+
+Wed Oct 22 17:25:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (pipe_open): remove unnecessary flush before fork.
+	  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>
+	  in [ruby-dev:36840].
+
+Wed Oct 22 16:27:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_yield_setup_args): should not drop arguments
+	  corresponding to default parameters.
+
+Wed Oct 22 14:59:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_larglist): should not allow semicolon separated local
+	  variable declarations if formal argument list is not surrounded
+	  by parentheses, mostly because semicolon outside of parentheses
+	  appears to terminate the expression.
+
+Wed Oct 22 14:52:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_external_str_new_with_enc): no implicit strlen call.
+	  [ruby-dev:36854]
+
+	* string.c (rb_external_str_new_cstr): new function to create
+	  string from external NUL terminated C string.
+
+	* string.c (rb_locale_str_new_cstr): ditto.
+
+	* ext/readline/readline.c: now use rb_locale_str_new_cstr().
+
+	* test/sdbm/test_sdbm.rb (TestSDBM#test_delete_with_block):
+	  deleted key to the block may be a copy of specified key.
+
+	* test/dbm/test_dbm.rb (TestDBM#test_delete_with_block): ditto.
+
+Wed Oct 22 13:16:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (unescape_escaped_nonascii): back out the last change on
+	  the function.  [ruby-dev:36818]
+
+Wed Oct 22 07:09:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c (rb_gzreader_ungetc): should be able to unget
+	  Fixnum.
+
+	* ext/stringio/stringio.c (strio_ungetc): should convert unget
+	  string.
+
+	* ext/stringio/stringio.c (strio_ungetbyte): new method.
+
+Wed Oct 22 05:46:25 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/vm.h: write a comment.
+
+	* common.mk: remove vm.h from any rules.
+	  vm.h is not needed on this version.
+
+	* vm_core.h: ditto.
+
+Wed Oct 22 05:39:39 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (arg_concat_gen): concat target node should be NODE_ARRAY.
+	  [ruby-core:19413]
+
+	* bootstraptest/test_method.rb: add tests.
+
+Wed Oct 22 00:29:13 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures
+	  [ruby-dev:36837].
+
+Wed Oct 22 00:22:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_external_str_new_with_enc): wrong condition to
+	  calculate strlen().
+
+	* ext/readline/readline.c: add encoding support.
+
+Tue Oct 21 23:12:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_write): should convert writing
+	  string to the encoding of the buffer.
+
+	* hash.c (rb_any_hash): typo fixed.
+
+	* ext/zlib/zlib.c (rb_gzwriter_write): oops, IO string conversion
+	  need to be done by to_s.
+
+Tue Oct 21 22:38:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (open_key_args): should adjust argc, argv in struct
+	  foreach_arg.
+
+Tue Oct 21 21:52:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c (rb_gzwriter_write): conversion should be done
+	  using to_str, not to_s.
+
+	* ext/zlib/zlib.c (rb_gzwriter_write): need proper conversion
+	  according to gz encoding.
+
+	* ext/zlib/zlib.c (rb_gzreader_ungetc): convert string encoding
+	  before unget.
+
+Tue Oct 21 21:33:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (assert_nothing_raised): raise with backtrace.
+
+Tue Oct 21 20:12:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit.rb (assert_nothing_raised): set backtrace.
+
+Tue Oct 21 18:17:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c: remove obsolete prototype macros.
+
+	* ext/zlib/zlib.c (struct gzfile): add encoding field to gzfile
+	  structure.
+
+	* ext/zlib/zlib.c (rb_gzreader_getc): now works on characters.
+
+	* ext/zlib/zlib.c (rb_gzreader_getbyte): new method to retrieve
+	  single byte.
+
+	* ext/zlib/zlib.c (rb_gzreader_readbyte): ditto.
+
+	* ext/zlib/zlib.c (rb_gzreader_each_byte): renamed from each_char
+
+	* ext/zlib/zlib.c (rb_gzreader_ungetc): allow unget strings.
+
+	* ext/zlib/zlib.c (rb_gzreader_ungetbyte): renamed from ungetc.
+
+Tue Oct 21 13:28:42 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* io.c, include/ruby/intern.h (rb_io_ascii8bit_binmode): externed.
+
+	* ext/socket/socket.c (init_sock): use rb_io_ascii8bit_binmode()
+	  instead of rb_io_binmode().
+
+Tue Oct 21 13:17:39 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* mdoc2man.rb: moved into tools/.
+
+	* instruby.rb: followed the change of mdoc2man.
+
+Tue Oct 21 11:34:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (strip_glibc_option, map_charset): check if
+	  encoding is a string.  based on the patch by Hiroshi Moriyama at
+	  [ruby-dev:36811].
+
+	* test/iconv/test_basic.rb (test_invalid_arguments): added tests.
+
+Tue Oct 21 10:40:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_file_open_internal): should initialize fmode before using.
+
+Tue Oct 21 08:56:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regparse.c (parse_char_class): CCV_SB is only for single
+	  byte.  [ruby-dev:36786]
+
+Tue Oct 21 01:49:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_extract_modeenc): plain rb/wb should set ASCII-8BIT
+	  to the external_encoding.
+
+	* io.c (rb_file_open_internal): ditto.
+
+	* io.c (NEED_WRITECONV): no conversion when the external_encoding
+	  is ASCII-8BIT.
+
+	* io.c (do_writeconv): skip ASCII-8BIT.
+
+Tue Oct 21 00:51:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_ascii8bit_binmode): renamed from rb_io_binmode.
+	  (rb_io_binmode): don't change encoding conversion.
+	  (rb_io_binmode_m): call rb_io_ascii8bit_binmode.
+
+Mon Oct 20 21:19:00 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (read_multipart): file's encoding is ascii-8bit
+	  from file field of multipart form.
+
+Mon Oct 20 20:16:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c (Init_zlib): add getbyte as an alias to getc.
+	  [ruby-dev:36801]
+
+Mon Oct 20 17:31:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (exc_equal): should not compare recursively.
+	  [ruby-dev:36796]
+
+Mon Oct 20 16:48:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/ruby.h (ExportStringValue): new macro to convert
+	  string in internal encoding to external to export.
+
+	* string.c (rb_str_export): new function to do conversion to
+	  external encoding.
+
+	* ext/sdbm/init.c: encoding conversion support.
+
+	* ext/dbm/dbm.c: ditto.
+
+Mon Oct 20 15:42:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_locale_str_new): new function to convert string
+	  from locale to internal encoding.
+
+Mon Oct 20 09:47:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/runner.rb: search srcdir/test/arg at first to find test/ruby
+	  directory when "ruby" is specified.
+
+Mon Oct 20 08:20:01 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: support Encoding.default_internal.
+
+	* ext/tk/tcltklib.c: ditto.
+
+	* ext/tk/extconf.rb: improve the strategy for searching Tcl/Tk headers.
+
+Mon Oct 20 00:57:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): call given block for
+	  filtering files.
+
+	* test/runner.rb: search srcdir/test/arg, srcdir/arg.
+
+	* bin/testrb: show usage if no files given.
+
+Sun Oct 19 21:19:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (srcs): removed ID_H_TARGET.
+
+	* tool/generic_erb.rb: always overwrites if no if-change option.
+	  sends the result to stdout if no output option.
+
+	* template/id.h.tmpl: shows which token differs.
+
+Sun Oct 19 18:15:15 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/single_byte.trans: adding WINDOWS-wwww encodings
+	  (wwww = 874/1250/1251/1253/1254/1255/1256/1257)
+	  (contributed by Yoshihiro Kambayashi)
+
+	* enc/trans/windows-wwww-tbl.rb: 8 new files
+	  (contributed by Yoshihiro Kambayashi)
+
+	* test/ruby/test_transcode.rb: added test_windows_wwww
+	  (contributed by Yoshihiro Kambayashi)
+
+Sun Oct 19 07:37:13 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (log2,cbrt,frexp,ldexp,hypot,erf,erfc,gamma,lgamma):
+	  should be also provided as module function.  [ruby-dev:36787]
+
+Sun Oct 19 07:25:08 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* keywords, lex.c.src, opt_insn_unif.def, opt_operand.def: moved rarely changed
+	  input files for code generators into defs/ directory.
+
+	* Makefile.in (lex.c): followed keywords and lex.c.src.
+
+	* common.mk (parser.o): followed keywords.
+	  (INSNS): followed opt_*.def
+
+	* tools/instruction.rb: followed opt_*.def.
+
+Sun Oct 19 12:28:01 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* test/csv/*:  Renamed tc_* files to test_* to fit in within Ruby's
+	  testing process.
+
+Sun Oct 19 00:15:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit.rb (assert_nothing_thrown): don't intern.
+
+Sat Oct 18 14:40:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_sadded): remove newly defined singleton method
+	  that should not exist after exception handling.  [ruby-dev:36569]
+
+Sat Oct 18 14:27:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (opt_block_arg): allow trailing comma after usual
+	  arguments.  not after block argument.
+
+Sat Oct 18 13:30:53 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_external_str_new): a new function to convert from
+	  external encoding to internal encoding.  if something went
+	  wrong, it returns a string with the external encoding.
+
+	* string.c (rb_external_str_new_with_enc): same as above besides
+	  you can specify the source encoding.
+
+	* ruby.c (ruby_set_argv): use rb_external_str_new()
+
+	* ruby.c (set_arg0, ruby_script): ditto.
+
+Sat Oct 18 04:08:18 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#initialize): now Tempfile.new takes
+	  keyword arguments to open().  [ruby-dev:36756]
+
+Sat Oct 18 17:10:10 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* tool/transcode-tblgen.rb: added set_valid_byte_pattern
+	  to reduce coupling between table generation script and
+	  specific encodings.
+
+	* enc/trans/single_byte.trans: using set_valid_byte_pattern
+
+Sat Oct 18 16:39:39 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c: in transcode_search_path, eliminated a warning
+	  on cygwin about pathlen potentially not being initialized
+
+Sat Oct 18 13:40:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit.rb (assert_nothing_thrown): implemented.
+
+Sat Oct 18 01:33:22 2008  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* common.mk: use added options for generic_erb.rb.
+
+Sat Oct 18 00:47:51 2008  wanabe  <s.wanabe@gmail.com>
+
+	* array.c: don't recycle shared-array while sort!.
+
+Fri Oct 17 22:04:38 2008  wanabe  <s.wanabe@gmail.com>
+
+	* array.c: recycle shared-array when it isn't referenced.
+
+Fri Oct 17 20:29:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_m): specify ARG_ENCODING_NONE instead of
+	  ARG_ENCODING_FIXED for Regexp.new("", nil, "n").  [ruby-dev:36761]
+
+	* test/ruby/test_regexp.rb (TestRegexp#test_initialize): test
+	  updated.
+
+Fri Oct 17 19:46:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/ifchange, win32/ifchange.bat: --timestamp option added.
+
+	* tool/generic_erb.rb: --timestamp, --output and --if-change options
+	  added.
+
+Fri Oct 17 18:33:12 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* array.c (ary_resize_capa): renamed RESIZE_CAPA.
+
+Fri Oct 17 18:16:51 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/bigdecimal/test_bigdecimal.rb (TestBigDecimal#test_sqrt_bigdecimal):
+	  test updated.  a patch from TAKANO Mitsuhiro <takano32 at jus.or.jp> in
+	  [ruby-dev:36736].
+
+Fri Oct 17 18:14:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (uncommon.mk): ignores failures at loading.
+
+	* test/rubygems/gemutilities.rb (RubyGemTestCase#build_rake_in):
+	  get rid of interference with other tests.
+
+Fri Oct 17 18:06:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* transcode.c (str_transcode0): String#encode without argument now
+	  behave as if :undef => :replace, :invalid => :replace specified.
+
+	* transcode.c (rb_econv_prepare_opts): should preserve options in
+	  any case.
+
+Fri Oct 17 11:48:18 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/socket.c (init_sock): sockets should be binmode.
+
+	* test/socket/test_tcp.rb (test_encoding): ditto.
+
+Fri Oct 17 10:26:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/insns2vm.rb: remove -Kn option in shebang line because it's
+	  inconsistent with -Ks commandline option in common.mk.
+
+Fri Oct 17 01:26:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_restartable0): in_pos and out_pos never be
+	  NULL, now.
+
+Fri Oct 17 00:39:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/test/unit.rb: sort the order of executing tests.
+
+Fri Oct 17 00:24:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_binmode): reset encoding conversion.
+
+Fri Oct 17 00:16:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (rb_getc, rb_io_fread, rb_io_fwrite, rb_read_pending):
+	  remove deprecated functions which do not work.  [ruby-dev:36697]
+
+Thu Oct 16 23:48:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (TESTS): removed to re-enable test for minitest.
+
+Thu Oct 16 23:37:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_set_sequence): fix memory leak.
+
+Thu Oct 16 23:27:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit.rb (assert_equal): avoid incompatible character
+	  encodings error.
+
+Thu Oct 16 23:23:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit.rb (assert_equal): failure message changed.
+
+Thu Oct 16 22:52:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit: removed test/unit.
+
+	* lib/test/unit.rb: new compatibility layer using minitest.
+
+	* bin/testrb: use above.
+
+	* test/runner.rb: ditto.
+
+Thu Oct 16 14:34:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, enc/depend (enc, trans): targets for sources.
+
+Thu Oct 16 14:30:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (lib): installs all files other than README etc.
+
+Thu Oct 16 09:48:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_m): changed the message to clarify the
+	  third option argument is now ignored.  [ruby-dev:36753]
+
+Thu Oct 16 08:14:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): no warning when default_external already
+	  set by -E.
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_rubyopt):
+	  put -K after -E to set script encoding.
+
+Thu Oct 16 06:20:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_transcode.rb (TestTranscode#test_errors):
+	  String#encode now works without any argument. [ruby-dev:36740]
+
+Wed Oct 15 23:48:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* .gdbinit (rp): REGEXP handling fixed.
+
+	* string.c (rb_str_rindex_m): need not to call rb_enc_check on
+	  regexp.
+
+	* re.c (unescape_escaped_nonascii): try ASCII-8BIT encoding for
+	  broken strings.
+
+Wed Oct 15 23:11:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (DelegateClass): restored 1.8 behavior for
+	  DelegateClass as well.  [ruby-dev:36739]
+
+Wed Oct 15 22:19:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (RESIZE_CAPA): check whether len is longer than capacity.
+
+	* array.c (rb_ary_compact_bang): resize ary before changing capacity.
+	  fixed [ruby-dev:36704]
+
+Wed Oct 15 16:57:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* version.h (RUBY_DESCRIPTION): remove unnecessary space.
+
+Tue Oct 14 23:18:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator): simplified and restored 1.8
+	  behavior.  [ruby-dev:35986]
+
+Tue Oct 14 21:50:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (TESTS): skips minitest by default, since it interferes
+	  with test/unit.
+
+Tue Oct 14 21:36:29 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (load_conv_function51932): check
+	  having IMultiLanguage2 or IMultiLanguage. [ruby-dev:36716]
+
+	* ext/win32ole/extconf.rb: ditto.
+
+Tue Oct 14 20:45:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (Init_IO): $FILENAME and $* must be read-only.  [ruby-dev:36698]
+
+	* variable.c (*_getter, *_setter, *_marker): made public.
+
+	* include/ruby/ruby.h (rb_gvar_*_{getter,setter,marker}): declared.
+
+Tue Oct 14 20:32:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/single_byte.trans (transcode_tblgen_singlebyte): renamed
+	  from transcode_tblgen_windows.
+	  (transcode_tblgen_iso8859): use transcode_tblgen_singlebyte.
+
+Tue Oct 14 19:32:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (process_options): -U should be allowed in RUBYOPT
+	  environment variable.  [ruby-dev:36720]
+
+Tue Oct 14 14:11:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): -U can be followed by other options.
+
+Tue Oct 14 13:30:30 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/single_byte.trans: added windows-1252
+
+	* enc/trans/windows-1252-tbl.rb: new file
+	  (contributed by Yoshihiro Kambayashi)
+
+	* tool/transcode-tblgen.rb: listed windows-1252 as '1byte'
+
+	* test/ruby/test_transcode.rb: added test_windows_1252
+	  (contributed by Yoshihiro Kambayashi)
+
+Tue Oct 14 12:22:32 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_variable.rb (TestVariable#test_variable): add
+	  a test of [ruby-dev:36698].
+
+Tue Oct 14 11:14:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* transcode.c (str_transcode0): should not raise error when
+	  default_internal is not set.  [ruby-core:19309]
+
+Tue Oct 14 11:14:26 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558)
+	  [ruby-dev:36631]
+
+	* test/net/pop/test_pop.rb: ditto.
+
+Tue Oct 14 09:39:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (set_internal_encoding_once): check double contradicted
+	  specification of the encoding from command line.
+
+	* ruby.c (set_external_encoding_once): ditto.
+
+Tue Oct 14 08:28:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): allow reserved word to be keyword argument.
+
+Mon Oct 13 19:07:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (token_info_pop): show source filename. [ruby-dev:36710]
+
+Mon Oct 13 08:59:08 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (load_conv_function51932): support
+	  CP51932 on cygwin and mingw32. thanks to arton.
+
+	* test/win32ole/test_win32ole.rb (test_cp51932): ditto.
+
+Mon Oct 13 07:54:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): add -U command line option to specify
+	  utf-8 as default_internal.
+
+Mon Oct 13 07:42:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* transcode.c (str_transcode0): String#encode() with no encoding
+	  specified transcode the string into Encoding.default_internal.
+	  inspired by [ruby-core:19298].
+
+Sun Oct 12 18:00:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (set_ole_codepage, ole_cp2encoding,
+	  ole_wc2mb, ole_vstr2wc, ole_mb2wc): support CP51932 (only mswin32).
+
+	* test/win32ole/test_win32ole.rb: ditto.
+
+Sun Oct 12 12:03:38 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, vm_insnhelper.h (ruby_vm_redefined_flag): apply optimization
+	  patch proposed by Paul Brannan.  [ruby-core:19171]
+
+Sun Oct 12 09:46:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime): suppressed warnings on cygwin.
+
+Sat Oct 11 19:49:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_prepare): use utf-8 encoding directly.
+
+Sat Oct 11 10:20:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (CLEANINGS): uses escaped form tabs to preventing the
+	  confusion.  [ruby-talk:317345]
+
+Sat Oct 11 08:51:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake.rb (Rake::Application#standard_exception_handling): removed
+	  unnecessary SystemExit, and exits with false instead of system
+	  dependent value.  [ruby-talk:317330]
+
+Sat Oct 11 03:54:05 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: optimize 'for' statement when one variable given.
+
+	* benchmark/bm_loop_for.rb: added.
+
+	* benchmark/bm_loop_times.rb: modified.
+
+Sat Oct 11 12:09:05 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv/csv.rb:  Added support for Encoding::default_internal.
+	* lib/csv/csv.rb:  Switched to new Hash syntax.
+
+Fri Oct 10 22:16:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (comment_at_top): needed for ripper too.
+
+Fri Oct 10 22:07:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby.h: updated macros for headers.  [ruby-core:19275]
+
+Fri Oct 10 19:21:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (magic_comment_encoding): warns when ignored.
+
+	* parse.y (parser_magic_comment): replaces '-' with '_'.
+
+	* parse.y (parser_yylex): allows magic comments indented and the
+	  second line or later.
+
+Fri Oct 10 17:26:50 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/ext/parser/parser.c (JSON_parse_string):
+	  associate encoding.
+
+Fri Oct 10 10:18:21 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/test/*: reverted back to test/unit.
+	* test/test/*: ditto
+	* lib/minitest/*: Imported minitest 1.3.0 r4333.
+
+Fri Oct 10 03:41:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): check if codepoint for %c is valid.
+	  [ruby-dev:36691]
+
+Fri Oct 10 01:55:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_names): minor improvement.
+
+Fri Oct 10 00:21:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (ParseError.filter_backtrace): removes internal
+	  backtrace.
+
+Fri Oct 10 00:11:16 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* transcode.c (rb_econv_add_converter): remove unnecessary NULL check.
+
+Thu Oct  9 23:53:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el (ruby-style-c-mode): buffer may not have file
+	  name.
+
+Thu Oct  9 23:30:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* process.c (run_exec_dup2): fix resource leak.
+
+Thu Oct  9 23:19:02 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* process.c (rb_run_exec_options): fix resource leak.
+
+Thu Oct  9 22:13:58 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_module.rb (test_remove_class_variable): add a test
+	  for Class#remove_class_variable.
+
+	* test/ruby/test_object.rb (test_remove_instance_variable): add a test
+	  for Object#remove_instance_variable.
+
+Thu Oct  9 22:04:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* variable.c (rb_mod_remove_cvar): fix r19711.
+
+Thu Oct  9 21:17:50 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/syck/syck.c (syck_lookup_sym): remove reading uninitialized
+	  variable.
+
+Thu Oct  9 16:34:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/ext/generator/extconf.rb: fix target.
+
+	* ext/json/ext/parser/extconf.rb: ditto.
+
+Thu Oct  9 14:37:59 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* include/ruby/ruby.h: embeds the elements of an array into its
+	  struct RArray for # of elements <= 3.
+
+	* array.c: ditto.
+
+	* gc.c (gc_mark_children): following the change of struct RArray.
+
+	* ext/tk/tcltklib.c (ip_ruby_cmp): ditto.
+
+	* parse.y (coverage): ditto.
+
+	* proc.c (curry): ditto.
+
+	* .gdbinit: ditto.
+
+Thu Oct  9 11:29:33 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): new instance method Encoding#names,
+	  returns its name and alias names.
+
+	* encoding.c (enc_names): defined for Encoding#names.
+
+	* encoding.c (enc_names_i): defined for enc_names.
+
+Thu Oct  9 08:47:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_thread_wait_fd_rw): should not block by select if
+	  there's only one thread living.  fixed [ruby-dev:36646].
+
+Wed Oct  8 20:59:52 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage
+	  according to Encoding.default_internal and
+	  Encoding.default_external.
+
+Wed Oct  8 17:02:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/pure/generator.rb (utf8_to_json):
+	  process each unpacked Unicode character.
+
+Wed Oct  8 15:00:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/pure/parser.rb
+	  (JSON::Pure::Parser#parse_string): force_encoding("UTF-8").
+
+Wed Oct  8 11:56:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: assert_nothing_thrown,
+	  assert_raise, assert_not_equal, assert_no_match, assert_not_nil,
+	  assert_not_same are coming back as alias.
+
+Wed Oct  8 11:18:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (autoload_delete, autoload_file): should not delete
+	  autoload table, since it may be shared with duplicated modules.
+	  [ruby-core:19181]
+
+Wed Oct  8 02:38:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_default_internal_encoding): merged a patch from
+	  Michael Selig <michael.selig at fs.com.au> in [ruby-core:18985].
+
+	* io.c (rb_io_ext_int_to_encs): ditto.
+
+	* ruby.c (proc_options): support default internal encoding in -E
+	  option.
+
+Wed Oct  8 00:03:39 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (today,now): should produce own instances.
+	  [ruby-talk:317020]
+
+Tue Oct  7 16:43:51 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/pure/generator.rb (utf8_to_json):
+	  force_encoding before gsub.
+
+Tue Oct  7 16:35:41 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/pure/generator.rb (utf8_to_json):
+	  downcase the result of Unicode escape.
+
+Mon Oct  6 16:44:52 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::QueryExtension::initialize_query): fix the
+	  condition.
+
+	* test/cgi/test_cgi_core.rb: bug fix encoding.
+	  thanks to TAKANO Mitsuhiro <takano32 at jus.or.jp> .
+
+	* test/cgi/test_cgi_multipart.rb: temporary comment in.
+
+Mon Oct  6 15:22:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_mark_children): ignores T_ZOMBIE.
+
+Mon Oct  6 12:45:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_module.rb (TestModule#_wrap_assertion): add
+	  definition.  is this really needed?
+
+	* test/ruby/test_module.rb (TestModule#test_mod_constants): should
+	  not depend on global Module constants.
+
+Mon Oct  6 12:38:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Assertions#assert_nothing_raised):
+	  should take optional message argument.
+
+Mon Oct  6 12:18:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_comparable): string comparison should be
+	  transitive.  [ruby-dev:36484]
+
+	* test/ruby/test_m17n_comb.rb (TestM17NComb#test_str_eq): test
+	  updated.
+
+Mon Oct  6 09:00:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/bigdecimal/test_bigdecimal.rb (test_sqrt_bigdecimal): test
+	  updated.  a patch from TAKANO Mitsuhiro <takano32 at jus.or.jp>
+	  in [ruby-dev:36669].
+
+Sun Oct  5 23:34:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb ($config_h): now always defines for old libraries.
+
+Sun Oct  5 23:06:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_mod_modfunc): method undefined in included module
+	  may not have nd_body.  [ruby-core:18738]
+
+Sun Oct  5 21:28:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/rational.rb: resolved conflicts of aliases.
+
+	* lib/mathn.rb: avoided some warnings.
+
+Sun Oct  5 18:51:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: remove debug code introduced by previous change.
+
+Sun Oct  5 17:49:35 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/open-uri.rb (OpenURI.open_uri): set encoding to strio.
+
+Sun Oct  5 17:39:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_set_encoding): defined for
+	  StringIO#set_encoding.
+
+Sun Oct  5 11:24:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* eval.c: come back definition of environ.
+
+Sun Oct  5 09:19:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/utf8tbl.c: update table.
+
+Sat Oct  4 22:50:14 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* dln.c: Ruby no longer supports VMS.
+
+	* error.c: ditto.
+
+	* eval.c: ditto.
+
+	* eval_intern.h: ditto.
+
+	* include/ruby/defines.h: ditto.
+
+	* include/ruby/ruby.h: ditto.
+
+	* io.c: ditto.
+
+	* process.c: ditto.
+
+	* ruby.c: ditto.
+
+	* vms/config.h: removed.
+
+	* vms/vms.h: ditto.
+
+	* vms/vmsruby_private.c: ditto.
+
+	* vms/vmsruby_private.h: ditto.
+
+Sat Oct  4 22:44:23 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* dln.c: Ruby no longer supports Windows CE.
+
+	* eval.c: ditto.
+
+	* include/ruby/defines.h: ditto.
+
+	* include/ruby/win32.h: ditto.
+
+	* ruby.c: ditto.
+
+	* strftime.c: ditto.
+
+	* win32/Makefile.sub: ditto.
+
+	* win32/win32.c: ditto.
+
+	* ext/tk/extconf.rb: ditto.
+
+	* lib/fileutils.rb: ditto.
+
+	* test/fileutils/test_fileutils.rb: ditto.
+
+	* wince/*: removed.
+
+Sat Oct  4 22:35:06 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* dln.c: Ruby no longer supports MacOS 9 or before.
+
+	* eval.c: ditto.
+
+	* eval_intern.h: ditto.
+
+	* ext/extmk.rb: ditto.
+
+	* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
+
+	* ext/tk/stubs.c: ditto.
+
+	* file.c: ditto.
+
+	* hash.c: ditto.
+
+	* include/ruby/defines.h: ditto.
+
+	* ruby.c: ditto.
+
+	* signal.c: ditto.
+
+	* vm_core.h: ditto.
+
+Sat Oct  4 22:30:28 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* dln.c: Ruby no longer supports MS-DOS.
+
+	* ext/sdbm/_sdbm.c: ditto.
+
+	* ext/sdbm/sdbm.h: ditto.
+
+	* gc.c: ditto.
+
+	* hash.c: ditto.
+
+	* include/ruby/defines.h: ditto.
+
+	* include/ruby/util.h: ditto.
+
+	* io.c: ditto.
+
+	* process.c: ditto.
+
+	* ruby.c: ditto.
+
+	* strftime.c: ditto.
+
+	* util.c: ditto.
+
+Sat Oct  4 22:14:15 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* djgpp/GNUmakefile.in: removed. Ruby no longer supports djgpp.
+
+	* djgpp/README.djgpp: ditto.
+
+	* djgpp/config.hin: ditto.
+
+	* djgpp/config.sed: ditto.
+
+	* djgpp/configure.bat: ditto.
+
+	* djgpp/mkver.sed: ditto.
+
+	* ext/Setup.dj: ditto.
+
+	* dln.c: removed djgpp supports.
+
+	* file.c: ditto.
+
+	* gc.c: ditto.
+
+	* io.c: ditto.
+
+	* process.c: ditto.
+
+	* ruby.c: ditto.
+
+	* signal.c: ditto.
+
+	* util.c: ditto.
+
+	* vm_core.h: ditto.
+
+	* lib/fileutils.rb: ditto.
+
+	* lib/mkmf.rb: ditto.
+
+	* ext/socket/socket.c: ditto.
+
+	* test/fileutils/test_fileutils.rb: ditto.
+
+	* test/ruby/test_env.rb: ditto.
+
+	* test/ruby/test_path.rb: ditto.
+
+Sat Oct  4 21:59:39 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* x68/_dtos18.c: removed. Ruby no longer supports human68k.
+
+	* x68/_round.c: ditto.
+
+	* x68/fconvert.c: ditto.
+
+	* x68/select.c: ditto.
+
+	* ext/Setup.x68: ditto.
+
+	* missing/x68.c: ditto.
+
+	* dln.c (dln_find_exe_r): removed human68k supports.
+	  (dln_find_1): ditto.
+
+	* lib/mkmf.rb: ditto.
+
+	* ext/extmk.rb (Init_ext): ditto.
+
+	* ext/socket/socket.c (init_sock): ditto.
+
+	* gc.c (GC_MALLOC_LIMIT): ditto.
+	  (rb_setjmp, rb_jmpbuf): ditto.
+	  (mark_current_machine_context): ditto.
+
+	* include/ruby/defines.h (PATH_ENV): ditto.
+
+	* io.c: ditto.
+
+	* process.c: ditto.
+
+	* ruby.c: ditto.
+
+	* test/ruby/test_env.rb: ditto.
+
+	* test/ruby/test_path.rb: ditto.
+
+	* LEGAL
+
+Sat Oct  4 19:02:36 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: no need to require the "lib/rational.rb".
+
+Sat Oct  4 19:02:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_enc_get): don't replicate encoding.
+	  [ruby-dev:36575]
+
+Sat Oct  4 18:47:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_external_encoding): defined.
+
+	* ext/stringio/stringio.c (strio_internal_encoding): defined.
+
+	* ext/stringio/stringio.c (Init_stringio): define above.
+
+Sat Oct  4 15:52:17 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/mini/test_mini_test.rb: recovered.
+	  It had been temporarily removed at r19645.
+
+	* test/mini/test_mini_mock.rb: ditto.
+
+	* test/mini/test_mini_spec.rb: ditto.
+
+	* lib/test/**/*: replaced by miniunit.
+	  miniunit had been temporarily reverted at r19643 but
+	  now recovered.
+
+Sat Oct  4 15:33:26 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (gdb-ruby): new target. it runs ruby under controlled by
+	  gdb.
+
+	* common.mk (dist): accepts RELNAME variable as the second argument of
+	  make-snapshot.rb.
+
+Sat Oct  4 12:17:46 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/irb/ext/save-history.rb: change load_history using File.expand_path. see [ruby-dev:36660]. Thanks Kouhei Sutou.
+	* lib/irb/irb/context.rb: convert string Symbol of instance variable names in IRB:Context#inspect.
+
+Fri Oct  3 22:43:04 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/dl/extconf.rb ($distcleanfiles): added callback-?.c into
+	  the distclean list.
+
+Fri Oct  3 19:33:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/pure.rb (module JSON): remove Iconv dependency.
+
+	* ext/json/lib/json/pure/generator.rb (utf8_to_json): process as
+	  binary and remove Iconv dependency.
+
+	* ext/json/lib/json/pure/parser.rb (parse_string): ditto.
+
+Fri Oct  3 14:04:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
+	  configure option support.
+
+Thu Oct  2 21:22:43 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::QueryExtension): delete MorphingBody
+	  and replace like as 1.8's in multipart reading.
+		see [ruby-dev:36443],
+	  reference from CGIAlt http://cgialt.rubyforge.org/
+
+	* test/cgi/test_cgi_multipart.rb : fixed multipart test.
+
+Thu Oct  2 20:46:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_sub_bang): fix coderange.
+
+Wed Oct  1 22:54:09 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/parsers/lightparser.rb, lib/debug.rb: remove unused when
+	  clauses.
+
+Wed Oct  1 22:43:59 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/xmlrpc, lib/rexml, test/ruby/test_array.rb,
+	  test/ruby/test_unicode_escape.rb, test/scanf/test_scanf.rb,
+	  test/rss/rss-assertions.rb: fix indentation to remove warning.
+
+Wed Oct  1 21:36:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): finalize deferred IO and Data.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): defers IO finalization.
+	  [ruby-dev:36646]
+
+Wed Oct  1 19:11:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (marshal_dump): fixed for check_dump_arg.
+
+	* marshal.c (marshal_dump): initializes dump_arg before any funcall.
+	  [ruby-dev:36648]
+
+Wed Oct  1 00:54:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_split_m): should use rb_str_subseq() which use
+	  offset and length by bytes.  [ruby-dev:36641]
+
+Wed Oct  1 00:29:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_settracefunc.rb (test_call, test_class): line number
+	  was changed at r19592.
+
+Wed Oct  1 00:20:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (check_exec_redirect): don't depend on rb_stdout and
+	  rb_stderr.
+
+Tue Sep 30 23:06:58 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/mini/test_mini_test.rb: removed.
+	  Temporarily removed the tests for miniunit because of
+	  they depend on the miniunit version of test/unit,
+	  where test/unit was temporarily reverted to the state
+	  before importing miniunit.
+
+	* test/mini/test_mini_mock.rb: ditto.
+
+	* test/mini/test_mini_spec.rb: ditto.
+
+Tue Sep 30 23:04:30 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/test/**/*: recovered.
+	  Temporarily reverts the changes of lib/test/unit/* in
+	  r19502 and r19501, in order to release 1.9.0-5.
+
+Tue Sep 30 23:00:05 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/test/unit.rb: removed.
+	  Temporarily reverts the changes of lib/test/unit/* in
+	  r19543, r19534 and r19503, in order to release 1.9.0-5.
+
+	* lib/test/unit/assertions.rb: ditto.
+
+	* lib/test/unit/deprecate.rb: ditto.
+
+	* lib/test/unit/error.rb: ditto.
+
+	* lib/test/unit/testcase.rb: ditto.
+
+Tue Sep 30 20:17:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_extract_modeenc): should honor value of the
+	  textmode: and binmode: options.
+
+Tue Sep 30 17:04:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/bigdecimal/test_bigdecimal.rb (test_sqrt_bigdecimal): wrong
+	  precision specification.  a patch from TAKANO Mitsuhiro
+	  <takano32 at jus.or.jp> in [ruby-dev:36634].
+
+Tue Sep 30 16:53:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): returns non zero.  [ruby-dev:36633]
+
+Tue Sep 30 16:52:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): add %<name>s style named argument
+	  support.  a patch from Yusuke Endoh <mame at tsg.ne.jp>
+	  in [ruby-dev:35851].
+
+	* sprintf.c (rb_str_format): add gettext style named format
+	  (%{name}) support.  inspired by [ruby-dev:35852].
+
+	* sprintf.c (GETNAMEARG): should raise KeyError exception when no
+	  named argument found.
+
+	* hash.c (rb_hash_fetch): export fetch function.
+
+Tue Sep 30 13:19:01 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_gem_installer.rb: remove extra call to setup to
+	  fix ENV['HOME'] pollution.
+
+Tue Sep 30 13:04:11 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/mini/test.rb: Updated to 1.3.0 r4257.
+	* test/mini/*: added from r4257.
+
+Tue Sep 30 07:46:07 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rdoc/test_rdoc_markup_attribute_manager.rb: Test with clean
+	  SPECIALS.
+	* test/rubygems/gemutilities.rb: Restore ENV['HOME'] after test.
+	* test/runner.rb: Pass -n argument down to miniunit.
+
+Tue Sep 30 01:02:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (token_info_push, token_info_pop): do nothing for evaled
+	  source.
+
+Tue Sep 30 00:47:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: constified.
+
+Mon Sep 29 23:32:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_subseq): don't use rb_str_drop_bytes for short
+	  string.
+
+Mon Sep 29 22:54:29 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/mathn.rb: added String#to_[rc].  moved def_canon.
+
+Mon Sep 29 20:41:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_subseq): use rb_str_drop_bytes if possible.
+
+Mon Sep 29 20:22:20 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/*.rb: imported additional tests and some adjustments.
+
+Mon Sep 29 20:13:05 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fev_initialize): initialization
+	  handler instance variable.
+
+	* test/win32ole/test_win32ole_typelib.rb (test_s_typelibs):
+	  fix the warning of shadowing outer local variable.
+
+Mon Sep 29 19:59:00 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (rescue_callback): use rb_write_error
+	  instead of fprintf.
+
+Mon Sep 29 01:51:54 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/rdoc/test_rdoc_info_formatting.rb (teardown): delete tmpdir for
+	  test.
+
+Mon Sep 29 00:30:20 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/html.rb (CGI::HtmlExtension::{radio_group, checkbox_group}):
+	  can specify the false as checked or selected value.
+	  [ruby-core:18306], [ruby-core:18307]
+
+	* test/cgi/test_cgi_tag_helper.rb: add a test.
+
+Sun Sep 28 23:08:38 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/html.rb (CGI::HtmlExtension::popup_menu):
+	  fix the calls #bytesize on array parameters. [ruby-core:18919]
+
+Sun Sep 28 22:44:26 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::parse): ignore illegal query params.
+	  [ruby-dev:36618]
+
+Sun Sep 28 22:05:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_set_sequence): check duplicated when clause.
+	  [ruby-dev:36616]
+
+Sun Sep 28 19:04:03 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/*.rb: imported a date test suite ruby 1.9 limited ed.
+
+Sun Sep 28 18:40:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mini/test.rb (MINI_DIR): loaded path is expanded.
+
+	* lib/mini/test.rb (assert_match): get rid of confusion of
+	  ruby-mode.el.
+
+Sun Sep 28 12:36:09 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_exec.c (vm_exec_core): add an UNLIKELY() hint.
+
+	* vm_insnhelper.h (BASIC_OP_UNREDEFINED_P): add a LIKELY() hint.
+
+Sun Sep 28 12:04:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_new): sets empty string to coderange 7bit.
+	  [ruby-core:18993]
+
+Sun Sep 28 09:39:48 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/mathn.rb ({Fixnum,Bignum,Float}#**): may produce complex
+	  value.
+
+Sun Sep 28 09:05:53 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv/csv.rb:  Worked around some minor encoding changes in Ruby
+	  pointed out by Nobu.
+
+Sun Sep 28 08:37:12 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/mathn.rb: a hack to provide canonicalization.  This must be
+	  temporary, but this seems to be not bad for the time being.
+
+Sat Sep 27 06:22:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake.rb (Module#rake_extension, String#ext, String#pathmap): use
+	  built-in methods.
+
+	* lib/rake.rb (String#pathmap): fixed typo in rdoc.
+
+Sat Sep 27 04:28:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rmext): preceding dots are not a part of extension.
+
+	* file.c (rb_file_s_extname): ditto.
+
+Sat Sep 27 03:15:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_jump_tag_but_local_jump): exc is not used if val is nil.
+
+Sat Sep 27 03:12:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (host_str): numeric address should be unsigned.
+	  [ruby-core:18971]
+
+Fri Sep 26 22:46:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary, brace_block): fix for line number.
+
+	* proc.c (rb_proc_location, rb_method_location): new methods
+	  {Proc,Method,UnboundMethod}#source_location.  [ruby-core:18452]
+
+Fri Sep 26 21:36:33 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (RUBY_VM_CHECK_INTS_TH): add an UNLIKELY hint.
+
+Fri Sep 26 19:33:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_str_encode): renamed from
+	  rb_str_transcode.  [ruby-dev:36593]
+	  (rb_econv_has_convpath_p): renamed from rb_transcode_convertible.
+
+	* transcode.c: follow the renaming.
+
+	* io.c: ditto.
+
+Fri Sep 26 19:01:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/bigdecimal/test_bigdecimal.rb (test_inspect): fixed CPU bit
+	  size dependent test.  pointed out by TAKANO Mitsuhiro <takano32 AT
+	  jus.or.jp>.
+
+Fri Sep 26 18:57:33 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/pathname/test_pathname.rb: Fix use of deprecated methods.
+
+Fri Sep 26 18:39:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (dist): nothing is needed to run BASERUBY.
+
+	* tool/make-snapshot: new option -archname.
+
+Fri Sep 26 18:24:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el: safe customizable variables.
+
+Fri Sep 26 17:37:18 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* include/ruby/ruby.h (rb_mPrecision): removed.
+	  Precision module was temporarily removed at r19430.
+
+Fri Sep 26 17:25:10 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (dist): Changed its dependencies and action.
+
+Fri Sep 26 17:07:04 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* error.c (Init_syserr): moved to the template.
+	  (errno_missing): removed. fixed [ruby-dev:35958].
+
+	* defs/known_errors.def: added. extracted from Init_syserr.
+
+	* templates/known_errors.inc.tmpl: added. Template for Init_syserr.
+	  c.f. [ruby-dev:35958].
+
+	* tools/generic_erb.rb: added. general purpose mapper which maps
+	  data+template into source code.
+
+	* common.mk (error.$(OBJEXT), incs, known_errors.inc):
+	  Fixed dependencies.
+
+Fri Sep 26 17:02:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thlist_signal): clears the woken thread if nothing woke.
+
+	* thread.c (rb_barrier_wait): achieves the lock if no thread was
+	  waiting yet.
+
+Fri Sep 26 12:04:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c: should include <ruby/io.h>.
+
+	* ext/io/wait/wait.c: ditto.
+
+	* ext/openssl/ossl.h: ditto.
+
+Fri Sep 26 11:34:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* variable.c (rb_define_hooked_variable): cast to get rid of compiler
+	  warnings.
+
+Fri Sep 26 11:05:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* transcode.c, include/ruby/encoding.c (rb_transcode_convertible):
+	  new function. checking the existence of converter.
+
+Fri Sep 26 10:35:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (global_variable, struct trace_var): made function
+	  members more strict.
+
+Fri Sep 26 09:55:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby{io,sig}.h: moved to include/ruby/backward.
+
+Fri Sep 26 09:47:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/rubysig.h: old macros for backward compatibility.
+
+	* thread.c (BLOCKING_REGION): rewritten using helper functions.
+
+Fri Sep 26 03:03:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* vm_eval.c (Init_vm_eval): define module_eval, class_eval and eval
+	  here for rdoc.
+
+Fri Sep 26 00:40:30 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* range.c (range_inspect): fix SEGV for cyclic range object.
+	  [ruby-core:18835]
+
+Thu Sep 25 23:59:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: dependency updated.
+
+Thu Sep 25 21:46:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_eUndefinedConversionError): renamed from
+	  rb_eConversionUndefinedError.
+	  (rb_eConverterNotFoundError): renamed from rb_eNoConverterError.
+
+Thu Sep 25 21:23:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* pack.c (pack_pack, pack_unpack): 'm0' format (base64) complies with
+	  RFC 4648.  It adds no line feed when encoding, and raise ArgumentError
+	  if the encoded string contains non-alphabet (including CR and LF).
+
+	* lib/base64.rb: added.  This provides encoding/decoding method for
+	  Base64 in standard RFC 2045, Base64 in standard RFC 4648 and ``Base 64
+	  Encoding with URL and Filename SafeAlphabet'' in RFC 4648.
+
+	* test_pack.c, test/base64/test_base64.rb: add tests for above.
+
+Thu Sep 25 21:00:32 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: fix btest-* rules [ruby-dev:36528].
+	  and remove obsolete rules.
+
+Thu Sep 25 20:27:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* class.c (rb_make_metaclass): [BUG] Fixed a bus error
+	  on the case for metaclass of a class which includes a
+	  module.
+
+Thu Sep 25 19:34:33 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/*: Update some new tests to use build_rake_in.
+	* test/rubygems/gemutilities.rb: Fix broken merge of rake detection.
+
+Thu Sep 25 19:13:12 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*: Update to RubyGems 1.3.0 r1891.
+
+Thu Sep 25 18:40:42 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* class.c (rb_make_metaclass): Made class of class of class
+	  from Class into its own eigenclass. Now meta^(n)-class
+	  hierarchy regresses infinitely, again.
+	  (This feature was decided on developer-meeting-20080922.)
+
+Thu Sep 25 16:01:07 2008  Jim Weirich  <jim@tardis.local>
+
+	* lib/rake.rb: Update rake source to version 0.8.3.  This
+	  version includes some fixes for running Rake on windows.
+	  (1) better APPDATA/HOMExxx/USERPROFILE integration for
+	  system rakefiles, (2) Better handling of the :ruby command
+	  when installed in directory containing spaces.
+
+Thu Sep 25 11:22:51 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc*: Update to RDoc 2.2.1 r185.
+
+Thu Sep 25 02:08:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_mode_enc): make it static.
+
+Thu Sep 25 01:22:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mini/test.rb (Mini::Assertions#assert_raise): fixed typo.
+
+Wed Sep 24 23:39:00 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* test/cgi/test_cgi_multipart.rb : revert last change.
+	  ( deprecated is assert_raises. )
+	* test/cgi/test_cgi_core.rb      : ditto.
+	* test/cgi/test_cgi_header.rb    : ditto.
+
+Wed Sep 24 23:12:49 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::new, CGI::{accept_charset,accept_charset=}) :
+	  accept parameters either in a hash,
+	  string as a block. add the encoding validation process.
+	* test/cgi/test_cgi_core.rb : test for query encoding check.
+
+Wed Sep 24 22:58:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_rstrip_bang): raise exception when the encoding of
+	  the string is dummy.
+
+	* string.c (rb_str_rstrip_bang): remove nul characters even if the
+	  encoding of the string is not single byte optimizable.
+	  fixed [ruby-core:18844], reported by Michael Selig.
+
+Wed Sep 24 19:01:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_rstrip_bang): workaround for VC++8 x64.
+
+Wed Sep 24 17:44:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (Init_Complex), rational.c (Init_Rational): undefines
+	  default #allocate methods which call the allocator.
+
+Wed Sep 24 17:02:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (Init_Complex), rational.c (Init_Rational): ID_ALLOCATOR
+	  differs from :allocate, and invisible in ruby level.
+
+Wed Sep 24 15:58:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_rstrip_bang): removing mixed spaces and nuls at
+	  the end of strings.  [ruby-dev:36497]
+
+Wed Sep 24 15:13:04 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* test/cgi/test_cgi_multipart.rb : test for miniunit.
+	* test/cgi/test_cgi_core.rb      : ditto.
+	* test/cgi/test_cgi_header.rb    : ditto.
+
+Wed Sep 24 14:38:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
+	  fixed [ruby-dev:36493]
+
+Wed Sep 24 11:18:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_binread): offset argument was wrongly passed to
+	  internal IO#read call.  [ruby-core:18810]
+
+Wed Sep 24 07:38:23 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm_core.h: ruby/ruby.h should be included at the very first
+	  place in an entire compilation unit, as it includes
+	  ruby/config.h
+
+Wed Sep 24 06:41:24 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/test/*: removed test/unit.
+	* lib/test/*: added miniunit.
+	* lib/mini/*: ditto.
+
+Wed Sep 24 04:45:35 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/node.h, node.h: move node.h from include path.
+	  This change stop to install node.h because of saving ABI
+	  (node.h will be changed. Extensions should not depends on
+	   this file).
+
+	* blockinlining.c, class.c, compile.c, debug.h, enum.c,
+	  gc.c, iseq.c, parse.y, ruby.c, signal.c, variable.c,
+	  vm.c, vm_core.h, vm_dump.c: ditto.
+
+	* ext/ripper/depend: ditto.
+
+Wed Sep 24 04:09:13 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: remove unused frame values.
+
+Wed Sep 24 04:07:07 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* signal.c (signal_exec): execute rb_eval_cmd() directly.
+
+Wed Sep 24 03:08:58 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/uri/mailto.rb: fix indentation.
+	* lib/uri/generic.rb: ditto.
+	* lib/yaml.rb: ditto.
+	* lib/uri/cgi/core.rb: fix indentation and ambiguous argument warning.
+
+Tue Sep 23 23:39:25 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv/csv.rb:  Improved the idea of whitespace and word characters used
+	  in substitutions during header conversion as suggested by Michael Selig.
+
+Tue Sep 23 21:50:53 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_binwrite): allocate wbuf if nosync.
+
+Tue Sep 23 21:45:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_body): use io_binwrite instead of io_fwrite.
+
+Tue Sep 23 21:31:16 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_rational2.rb: updated.
+
+	* test/ruby/test_complex2.rb: added.
+
+	* test/ruby/test_complexrational.rb: added.
+
+Tue Sep 23 21:26:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_casecmp): make the ordering consistent with
+	  String#<=>.
+
+Tue Sep 23 20:52:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_binwrite): add nosync argument.
+	  (do_writeconv): extracted from io_fwrite.
+	  (io_fwrite): add nosync argument.  use do_writeconv.
+	  (io_write): add nosync argument.
+	  (io_write_m): new function for IO#write.
+	  (rb_p): don't append record separator.
+
+Tue Sep 23 20:24:41 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* signal.c (signal_exec): fix to use rb_proc_call().
+
+Tue Sep 23 20:06:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
+	  abandon wrapping if the line contains no space.  [ruby-dev:36045]
+
+Tue Sep 23 19:38:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (subtract): check tv_sec. reported by ko1.
+
+Tue Sep 23 19:21:03 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_s_canonicalize_internal): does no apply
+	  canonicalization rule anymore.
+
+	* rational.c (nurat_s_canonicalize_internal(_no_reduce)?): ditto.
+
+	* complex.c: removed class method new! and new.
+
+	* rational.c: ditto.
+
+Tue Sep 23 19:20:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_binread): a new method to read binary chunk from a
+	  file.  [ruby-core:18674]
+
+	* io.c (open_key_args): wrong permission specified for read-open.
+
+Tue Sep 23 18:24:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* hash.c (rb_obj_is_proc): declaration moved for rdoc.
+
+Tue Sep 23 18:07:55 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk (io.o): remove dependency for vm_core.h.
+
+Tue Sep 23 17:56:44 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_blocking_region): fix typo in a document.
+
+Tue Sep 23 17:50:35 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_blocking_region): write a document.
+
+Tue Sep 23 17:14:31 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, include/ruby/intern.h (rb_thread_interrupted): added.
+
+	* io.c: use VALUE of thead instead of rb_tread_t to check interrupts.
+
+Tue Sep 23 17:05:14 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c, vm_core.h: move decl of rb_iseq_clone() to class.c.
+
+Tue Sep 23 17:02:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* debug.h (ruby_set_debug_option): declared.
+
+	* main.c: include debug.h.
+
+	* common.mk (main.$(OBJEXT)): dependency updated.
+
+Tue Sep 23 16:59:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ENVMATCH, ENVNMATCH): reduced same code.
+
+Tue Sep 23 16:55:11 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.h: fix comment and rename macro HAVE_RUBY_MVM_H to
+	  HAVE_RUBY_VM_H.
+
+Tue Sep 23 16:41:31 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/node.h, vm_core.h: move definition of
+	  RUBY_VM_METHOD_NODE to node.h.
+
+	* class.c, common.mk: remove useless inclusion.
+
+	* compile.h, iseq.h, vm_core.h: rename compile.h to iseq.h.
+	  move some definitions from vm_core.h to iseq.h.
+
+	* compile.c, iseq.c, vm.c: ditto.
+
+	* eval.c, compile.c: move some functions for parser
+	  from eval.c to compile.c.
+
+	* eval_intern.h, vm_core.h: move va_init_list() macro to
+	  vm_core.h.
+
+	* iseq.c (rb_iseq_new_top, rb_iseq_first_lineno): added.
+
+	* load.c, ruby.c: use rb_iseq_new_top() instead of
+	  rb_iseq_new() with ISEQ_TYPE_TOP constant directly.
+
+	* proc.c: use rb_iseq_first_lineno() instead of accessing
+	  iseq structure.
+
+Tue Sep 23 16:17:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/ripper/eventids2.c (token_to_eventid): supper __ENCODING__
+	  keyword.  [ruby-dev:36478]
+
+Tue Sep 23 15:30:53 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk, hash.c: remove unused inclusion.
+
+Tue Sep 23 09:52:07 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_safe.c, safe.c: rename eval_safe.c to safe.c.
+
+	* common.mk, eval.c, safe.c, inits.c: separate safe.c from eval.c and
+	  make Init_safe().
+
+Tue Sep 23 09:20:00 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: clean up
+	  - remove blockinlining.$(OBJEXT) to built
+	  - make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
+	  - make VM_CORE_H_INCLUDES variable (vm_core.h)
+	  - simplify rules.
+	  - make depends rule to output depend status using gcc -MM.
+
+	* include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
+
+	* include/ruby.h: ditto.
+
+	* load.c: add inclusion explicitly.
+
+	* enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
+	  remove useless inclusion.
+
+	* eval_intern.h: cleanup inclusion.
+
+	* vm_core.h: rb_thread_t should be defined in this file.
+
+	* vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
+
+	* vm.h, vm_exec.h: rename vm.h to vm_exec.h.
+
+	* insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
+
+	* vm.c, vm_insnhelper.c, vm_insnhelper.h:
+	  - rename vm_eval() to vm_exec_core().
+	  - rename vm_eval_body() to vm_exec().
+	  - cleanup include order.
+
+	* vm_method.c: fix comment.
+
+Tue Sep 23 09:01:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/pathname.rb (each_filename): return Enumerator if no block
+	  given.
+
+	* test/pathname/test_pathname.rb: add a test for above.
+
+Tue Sep 23 08:25:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (env_aset): allow nil value to remove an entry.
+	  [ruby-dev:36465]
+
+	* test/ruby/test_env.rb (TestEnv#test_aset): test updated.
+
+Tue Sep 23 08:07:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-keyword-end-re): emacs21 support.  a
+	  patch from Hiroshi Moriyama <hiroshi at kvd.biglobe.ne.jp> in
+	  [ruby-dev:36471].
+
+	* misc/ruby-mode.el (ruby-in-ppss-context-p): ditto.
+
+	* misc/ruby-mode.el (ruby-here-doc-end-syntax):
+
+Tue Sep 23 02:07:52 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* test/readline/test_readline_history.rb
+	  (Readline::TestHistory#test_each): checked return value.
+
+Tue Sep 23 02:05:34 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c (Init_readline): used remove_history to
+	  check offset of history if unsupported clear_history.
+
+Mon Sep 22 17:39:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#open): should return a value from the
+	  block (if given).   [ruby-core:18394]
+
+Mon Sep 22 11:17:51 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/encoding.h (enum): ISO C forbids comma at end of
+	  enumerator list
+
+Mon Sep 22 10:15:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* LEGAL: updated file names removed and added.  [ruby-dev:36426]
+
+Mon Sep 22 02:39:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (get_default_external): add description.
+
+Sun Sep 21 21:52:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* math.c (math_log): should check argc.
+
+Sun Sep 21 21:20:24 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: added two macros.
+
+	* rational.c: ditto.
+
+Sun Sep 21 18:06:38 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_s_convert): checks argc.
+
+	* rational.c (nurat_s_convert): ditto.
+
+Sun Sep 21 10:19:04 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_s_canonicalize_internal): checks exactness of
+	  imag only.
+
+	* rational.c (nurat_s_convert): accepts non real value
+	  (Rational(a,b) as a/b).
+
+	* complex.c (nucomp_s_convert): refined.
+
+Sun Sep 21 09:37:57 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv/csv.rb:  Reworked CSV's parser and generator to be m17n.  Data
+	  is now parsed in the Encoding it is in without need for translation.
+	* lib/csv/csv.rb:  Improved inspect() messages for better IRb support.
+	* lib/csv/csv.rb:  Fixed header writing bug reported by Dov Murik.
+	* lib/csv/csv.rb:  Use custom separators in parsing header Strings as
+	  suggested by Shmulik Regev.
+	* lib/csv/csv.rb:  Added a :write_headers option for outputting headers.
+	* lib/csv/csv.rb:  Handle open() calls in binary mode whenever we can to
+	  workaround a Windows issue where line-ending translation can cause an
+	  off-by-one error in seeking back to a non-zero starting position after
+	  auto-discovery for :row_sep as suggested by Robert Battle.
+	* lib/csv/csv.rb:  Improved the parser to fail faster when fed some forms
+	  of invalid CSV that can be detected without reading ahead.
+	* lib/csv/csv.rb:  Added a :field_size_limit option to control CSV's
+	  lookahead and prevent the parser from biting off more data than
+	  it can chew.
+	* lib/csv/csv.rb:  Added readers for CSV attributes:  col_sep(), row_sep(),
+	  quote_char(), field_size_limit(), converters(), unconverted_fields?(),
+	  headers(), return_headers?(), write_headers?(), header_converters(),
+	  skip_blanks?(), and force_quotes?().
+	* lib/csv/csv.rb:  Cleaned up code syntax to be more inline with
+	  Ruby 1.9 than 1.8.
+
+Sun Sep 21 07:43:16 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: an instance method image has been removed and
+	  uses "imag" instead of "image".
+
+	* complex.c: two instance method re and im are removed.
+
+	* rational.c: follows the above changes.
+
+	* include/ruby/ruby.h: ditto.
+
+	* gc.c: ditto.
+
+	* lib/cmath.rb: ditto.
+
+	* lib/mathn.rb: ditto.
+
+	* lib/complex.rb: ditto. and provides some obsolete methods.
+
+Sun Sep 21 02:48:45 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/ext/parser/parse.c: use ruby_xfree().
+
+	* ext/json/ext/parser/parse.rl: ditto.
+
+	* ext/json/ext/parser/unicode.c: ditto.
+
+Sun Sep 21 02:40:20 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: import JSON v 1.1.3.
+
+Sat Sep 20 11:43:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/optparse.rb (summarize): separator "" should output new line.
+
+Sat Sep 20 08:07:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y: strings which contain only US-ASCII don't force to have
+	  US-ASCII encoding. [ruby-dev:36400]
+
+Sat Sep 20 07:59:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_desc): Regexps of ASCII Compatible encoding may
+	  contain non-ASCII characters. So in that case its encoding
+	  must keep original encoding.
+
+Sat Sep 20 07:44:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: prec.c is removed.
+
+Fri Sep 19 22:37:25 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: uses f_(in)?exact_p macro.
+
+	* rational.c: ditto.
+
+	* bignum.c (rb_big_pow): bignum**bignum - should calculate without
+	  rational.
+
+	* lib/complex.rb: should override Math module at most once.
+
+	* lib/mathn.rb: requires 'cmath' directly.
+
+Fri Sep 19 20:48:06 2008  Yuki Sonoda  <yugui@yugui.jp>
+
+	* prec.c: removed. Precision will be redesigned and be back again.
+	  c.f. [ruby-dev:36352].
+
+	* common.mk (COMMON_OBJS): removed prec.o.
+
+	* inits.c (rb_call_inits): removed Init_Precision.
+
+	* numeric.c (Init_Numeric): removed inclusion of Precision.
+	  removed #induced_from from each class.
+
+	* rational.c: ditto.
+
+	* ext/bigdecimal/bigdecimal.c: ditto.
+
+	* lib/rdoc/known_classes.rb: removed the entry for Precision.
+
+	* test/ruby/test_prec.rb: removed.
+
+	* test/ruby/test_integer.rb: removed tests for Precision.
+
+	* test/ruby/test_fixnum.rb: ditto.
+
+	* test/ruby/test_float.rb: ditto.
+
+	* test/ruby/test_rational.rb: ditto.
+
+	* test/ruby/test_complex.rb: ditto.
+
+	* test/bigdecimal/test_bigdecimal.rb: ditto.
+
+Fri Sep 19 19:43:40 2008  Yuki Sonoda  <yugui@yugui.jp>
+
+	* common.mk : Reverts the changeset 18994.
+	  Uses the official repository of rubyspec again.
+
+Fri Sep 19 17:41:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: applied OS/2 support patch from Brendan Oakley
+	  <gentux2 at gmail.com> in [ruby-core:18707].
+
+Fri Sep 19 09:29:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dln.c: newer BeOS support.  a patch from Pete Goodeve
+	  <pete.goodeve at computer.org> in [ruby-core:18712].
+
+Fri Sep 19 03:41:25 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: fix memory violation. mentioned by mame [ruby-dev:36373]
+
+Fri Sep 19 01:07:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* regexec.c (string_cmp_ic): add text_end argument.
+	  (slow_search): call enclen with real string end.
+	  (map_search): add text_end argument.
+
+Thu Sep 18 22:54:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_to_string): comment out
+	  fragments of unused code.
+
+Thu Sep 18 22:35:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpCtoV): 1E1000...000 is interpreted as
+	  Infinity.  [ruby-dev:36159]
+
+	* ext/bigdecimal/bigdecimal.c (VpPower): Infinity ** 1 returns
+	  Infinity instead of NaN.  [ruby-dev:36159]
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests for above.
+
+Thu Sep 18 22:20:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (Init_Exception): introduce EncodingError which is a
+	  superclass for all encoding related exception classes,
+	  e.g. Encoding::CompatibilityError.  [ruby-dev:36371]
+
+	* transcode.c (Init_transcode): ditto.
+
+Thu Sep 18 21:57:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_comparable): make ascii8bit string to be
+	  compatible with any other encoding.
+
+	* string.c (rb_str_cmp): use rb_str_comparable() instead of
+	  rb_enc_compatible() since <=> is a comparison anyway.
+
+Thu Sep 18 21:37:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* grapheme cluster implementation reverted.  [ruby-dev:36375]
+
+Thu Sep 18 20:50:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake.rb (Rake::Application#standard_exception_handling):
+	  replaced magic numbers for exit status.
+
+Thu Sep 18 20:37:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::ParseError#set_backtrace): omits
+	  OptionParser internal backtraces unless debug flag is set.
+
+Thu Sep 18 20:02:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/uri/common.rb (unescape): skip '%' to make String#hex work
+	  correctly.
+
+Thu Sep 18 19:51:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (big2str_karatsuba): free internal buffer eagerly.
+	  a patch from TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com>
+	  in [ruby-dev:36217].
+
+	* bignum.c (rb_big2str0): ditto.
+
+Thu Sep 18 19:43:04 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* st.c (new_size): raise RuntimeError when st_table is too big.
+	  [ruby-dev:36354]
+
+Thu Sep 18 18:23:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (enc_arg): must take pointer argument to avoid GC
+	  problem.  StringValueCStr modifies the argument and it should be
+	  preserved while the string StringValueCStr returns is used.
+	  Since the string is used by caller, the modified argument should be
+	  hold by caller.  Actually
+	    GC.stress = true
+	    def (o=Object.new).to_str()
+	      "universal"+"_newline"
+	    end
+	    "\u3042".encode(o, "")
+	  causes curious warning:
+	    rb_define_const: invalid name `' for constant
+
+Thu Sep 18 17:32:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* transcode.c: add "Error" suffix for Encoding exception classes.
+	  a patch from Tadashi Saito <shiba at mail2.accsnet.ne.jp> in
+	  [ruby-dev:36346].
+
+	* encoding.c (Init_Encoding): rename EncodingCompatibilityError to
+	  Encoding::CompatibilityError.  [ruby-dev:36366]
+
+Thu Sep 18 17:18:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* transcode.c (enc_arg): revert last change.  too early exception
+	  raising.
+
+	* transcode.c (enc_arg): need not to take pointer argument.
+
+Sun Sep 18 02:22:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests to achieve over 90%
+	  test coverage of bigdecimal.
+
+Wed Sep 17 21:50:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_casecmp): don't use rb_enc_codepoint.
+
+Wed Sep 17 19:55:33 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_s_convert): accepts complex
+	  value (Complex(a,b) as a+bi).
+
+Wed Sep 17 19:16:47 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_io.rb (TestIO#test_dup): avoid infinite loop.
+	  [ruby-dev:36326]
+
+	* test/ruby/test_io.rb (TestIO#test_dup): remove needless open.
+	  [ruby-dev:35957]
+
+Wed Sep 17 17:44:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_extract_modeenc): process option mode: and perm: as
+	  well.
+
+	* io.c (open_key_args): move mode: and perm: related code to
+	  rb_io_extract_modeenc().
+
+Wed Sep 17 13:42:59 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/html.rb (checkbox_group,radio_group): bug fix
+	  use size instead of	bytesize.
+
+	* test/cgi/test_cgi_tag_helper.rb: test for checkbox_group,radio_group.
+
+Wed Sep 17 06:58:31 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: provides predicate real? instead of scalar?.
+
+	* complex.c: follows the above change.
+
+	* lib/cmath.rb: ditto.
+
+Wed Sep 17 01:56:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io_m17n.rb: use __FILE__ instead of /dev/null.
+	  [ruby-dev:36327]
+
+Wed Sep 17 01:33:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h (OnigEncodingTypeST): add precise_ret
+	  argument for mbc_to_code.
+	  (ONIGENC_MBC_TO_CODE): provide NULL for precise_ret.
+	  (ONIGENC_MBC_PRECISE_CODEPOINT): defined.
+
+	* include/ruby/encoding.h (rb_enc_mbc_precise_codepoint): defined.
+
+	* regenc.h (onigenc_single_byte_mbc_to_code): precise_ret argument
+	  added.
+	  (onigenc_mbn_mbc_to_code): ditto.
+
+	* regenc.c (onigenc_single_byte_mbc_to_code): precise_ret argument
+	  added.
+	  (onigenc_mbn_mbc_to_code): ditto.
+
+	* string.c (count_utf8_lead_bytes_with_word): removed.
+	  (str_utf8_nth): removed.
+	  (str_utf8_offset): removed.
+	  (str_strlen): UTF-8 codepoint oriented optimization removed.
+	  (rb_str_substr): ditto.
+	  (enc_succ_char): use rb_enc_mbc_precise_codepoint.
+	  (enc_pred_char): ditto.
+	  (rb_str_succ): ditto.
+
+	* encoding.c (rb_enc_ascget): check length with
+	  rb_enc_mbc_precise_codepoint.
+	  (rb_enc_codepoint): use rb_enc_mbc_precise_codepoint.
+
+	* regexec.c (string_cmp_ic): add text_end argument.
+	  (match_at): check end of character after exact string matches.
+
+	* enc/utf_8.c (grapheme_table): defined for extended grapheme cluster
+	  boundary.
+	  (grapheme_cmp): defined.
+	  (get_grapheme_properties): defined.
+	  (grapheme_boundary_p): defined.
+	  (MAX_BYTES_LENGTH): defined.
+	  (comb_char_enc_len): defined.
+	  (mbc_to_code0): extracted from mbc_to_code.
+	  (mbc_to_code): use mbc_to_code0.
+	  (left_adjust_combchar_head): defined.
+	  (utf_8): use a extended grapheme cluster as a unit.
+
+	* enc/unicode.c (onigenc_unicode_mbc_case_fold): use
+	  ONIGENC_MBC_PRECISE_CODEPOINT to extract codepoints.
+	  (onigenc_unicode_get_case_fold_codes_by_str): ditto.
+
+	* enc/euc_jp.c (mbc_to_code): follow mbc_to_code field change.
+	  use onigenc_mbn_mbc_to_code.
+
+	* enc/shift_jis.c (mbc_to_code): ditto.
+
+	* enc/emacs_mule.c (mbc_to_code): ditto.
+
+	* enc/gbk.c (gbk_mbc_to_code): follow mbc_to_code field and
+	  onigenc_mbn_mbc_to_code change.
+
+	* enc/cp949.c (cp949_mbc_to_code): ditto.
+
+	* enc/big5.c (big5_mbc_to_code): ditto.
+
+	* enc/euc_tw.c (euctw_mbc_to_code): ditto.
+
+	* enc/euc_kr.c (euckr_mbc_to_code): ditto.
+
+	* enc/gb18030.c (gb18030_mbc_to_code): ditto.
+
+	* enc/utf_32be.c (utf32be_mbc_to_code): follow mbc_to_code field
+	  change.
+
+	* enc/utf_16be.c (utf16be_mbc_to_code): ditto.
+
+	* enc/utf_32le.c (utf32le_mbc_to_code): ditto.
+
+	* enc/utf_16le.c (utf16le_mbc_to_code): ditto.
+
+Wed Sep 17 01:17:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (enc_arg): raise exception when unknown encoding is
+	  given.
+
+Tue Sep 16 22:23:24 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI#header): performance improvement.
+	  From CGIAlt http://cgialt.rubyforge.org/
+
+	* test/cgi/test_cgi_header.rb: exception class fixed.
+
+Tue Sep 16 22:21:33 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_concat): fix rdoc. (codepoint is integer)
+
+	* string.c (rb_str_each_codepoint): use UINT2NUM.
+
+Tue Sep 16 21:48:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_desc): Regexp#inspect should be US-ASCII.
+
+Tue Sep 16 21:33:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_crypt): orthodox crypt() sees only first two bytes
+	  of salt.
+
+Tue Sep 16 19:18:40 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_marshal_{dump,load}): preserve instance
+	  variables.
+
+	* rational.c (nurat_marshal_{dump,load}): ditto.
+
+Tue Sep 16 18:28:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_gets_m): rdoc updated.  limit counts in bytes.
+	  [ruby-core:18617]
+
+	* io.c (rb_io_readlines, rb_f_gets): ditto.
+
+	* io.c (rb_io_readbyte): rdoc updated.  [ruby-core:18617]
+
+Tue Sep 16 11:55:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_each_codepoint): add new methods, #codepoints
+	  and #each_codepoint.  a patch from Michael Selig
+	  <michael.selig at fs.com.au> in [ruby-core:18532].
+
+Tue Sep 16 11:24:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/mkconstants.rb: add new constants.  a patch from
+	  IWAMURO Motonori <deenheart+ruby at gmail.com> in [ruby-dev:36309].
+
+Tue Sep 16 09:20:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_dup): exception should be
+	  raised from IO#dup.
+
+Tue Sep 16 08:35:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_dup): this test might fail if
+	  there are any garbage IO objects.
+
+Tue Sep 16 02:02:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_buf_cat_ascii): codepoint is unsigned int.
+
+	* string.c (rb_str_concat): ditto.
+
+	* string.c (str_cat_char): ditto.
+
+	* string.c (prefix_escape): ditto.
+
+Tue Sep 16 01:47:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (single_byte_optimizable): make function inline.  based
+	  on a patch from Michael Selig <michael.selig at fs.com.au> in
+	  [ruby-core:18532].
+
+	* string.c (str_modify_keep_cr): new function act as
+	  rb_str_modify(), but don't clear coderange
+
+	* string.c (rb_str_casecmp): specialized for single byte strings.
+
+	* string.c (rb_str_splice): preserve coderange.
+
+	* string.c (rb_str_slice_bang, rb_str_reverse_bang,
+	  rb_str_upcase_bang, rb_str_downcase_bang, tr_trans,
+	  rb_str_capitalize_bang, rb_str_swapcase_bang,
+	  rb_str_delete_bang, rb_str_chop_bang, rb_str_chomp_bang,
+	  rb_str_lstrip_bang, rb_str_rstrip_bang): ditto.
+
+	* string.c (rb_str_clear): preset coderange.
+
+	* string.c (rb_str_split_m): specialized for splitting with a
+	  string.
+
+Tue Sep 16 00:57:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_quote): use rb_enc_mbcput to generate ASCII
+	  incompatible characters properly.
+
+Tue Sep 16 00:51:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (Encoding#base_encoding): removed. [ruby-dev:36270]
+
+Tue Sep 16 00:40:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (STR1_LENGTH): defined.
+	  (makeSTR1LEN): defined.
+
+	* tool/transcode-tblgen.rb: use makeSTR1LEN.  generate STR1 for 4 to
+	  259 bytes.
+
+	* transcode.c (rb_transcoding): new field: output_index.
+	  (transcode_restartable0): use STR1_LENGTH.
+
+Mon Sep 15 23:52:45 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, include/ruby/ruby.h: rename rb_register_mark_object()
+	  to rb_gc_register_mark_object().
+
+	* eval.c, vm.c: initialize vm->mark_object_ary at
+	  Init_top_self().
+
+	* bignum.c, complex.c, encoding.c, ext/win32ole/win32ole.c,
+	  io.c, load.c, marshal.c, rational.c, ruby.c, vm.c:
+	  use rb_gc_register_mark_object() instead of
+	  rb_global_variable() or rb_gc_register_address().
+
+Mon Sep 15 23:37:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_opts): don't use to_sym.
+
+Mon Sep 15 23:28:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_get_index): don't return -1.
+
+	* io.c (rb_scan_open_args): call FilePathValue before encoding
+	  conversion.
+
+Mon Sep 15 22:11:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_squeeze_bang): specialized for 7bit characters in
+	  ASCII compatible strings.
+
+	* string.c (rb_str_count): ditto.
+
+	* string.c (tr_trans): preserve 7bit/valid coderange flag.
+
+	* string.c (rb_str_squeeze_bang): preserve previous coderange value.
+
+	* string.c (rb_str_lstrip_bang): ditto.
+
+	* string.c (rb_str_rstrip_bang): ditto.
+
+	* encoding.c (rb_default_external_encoding): preserve
+	  default_external_encoding in a static variable.
+
+	* string.c (single_byte_optimizable): check coderange first, to
+	  reduce number of calling rb_enc_from_index().
+
+Mon Sep 15 20:57:00 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/matrix.rb (Matrix#eql?): fixed [ruby-dev:36298].
+	  Reported by an anonymous user.
+
+	* lib/matrix.rb (Vector#eql?): ditto.
+
+	* (Matrix#compare_by_row_vectors): takes comparison
+	  strategy as an optional parameter.
+
+	* (Vector#compare_by): ditto.
+
+Mon Sep 15 14:34:32 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (RUBY_MAX_CHAR_LEN): defined.
+
+	* encoding.c (str_cat_char): use RUBY_MAX_CHAR_LEN.
+
+Mon Sep 15 13:53:33 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): accept other than strings and
+	  regexps. [ruby-core:18595]
+
+	* encoding.c (rb_enc_get_index): works files and encodings.
+
+Mon Sep 15 13:17:21 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_eql_p): new.
+
+	* complex.c (nucomp_hash): should use hash values of the elements.
+
+	* rational.c (nurat_hash): ditto.
+
+	* hash.c (rb_any_cmp): removed an unused variable.
+
+Mon Sep 15 11:11:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder): resetsize_func and resetstate_func
+	  also returns ssize_t.
+
+	* enc/trans/iso2022.trans: follow the type change.
+
+Mon Sep 15 10:28:10 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/matrix/test_matrix.rb (setup): typo.
+	  (test_equality): misdefinition of the expected working.
+	  Reported by an anonymous user.
+	  (test_hash): added.
+
+	* test/matrix/test_vector.rb: ditto.
+
+Mon Sep 15 03:33:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h: return output functions ssize_t.
+
+	* transcode.c (transcode_restartable0): don't need to cast the result
+	  of output functions.
+
+	* enc/trans/newline.trans: follow the type change.
+
+	* enc/trans/escape.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/japanese.trans: ditto.
+
+Mon Sep 15 03:04:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h: output function takes output buffer size.
+
+	* transcode.c: give output buffer size for output functions.
+
+	* enc/trans/newline.trans: follow the type change.
+
+	* enc/trans/escape.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/japanese.trans: ditto.
+
+Mon Sep 15 02:37:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_encode): returns duplicated string if nothing
+	  changed.  [ruby-core:18578]
+
+Sun Sep 14 22:09:01 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::parse): performance improvement
+
+Sun Sep 14 18:33:32 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: trivial changes.
+
+Sun Sep 14 16:15:22 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/matrix.rb (Vector#eql?): typo of the method name as "eqn?".
+	  (Vector#eqn?): removed. Defined by mistake.
+	  Fixes [ruby-dev:36294]. Reported by weda <weda AT
+	  issp.u-tokyo.ac.jp> and an anonymous user.
+
+	* test/matrix/test_matrix.rb: added.
+
+	* test/matrix/test_vector.rb: added.
+
+Sun Sep 14 16:07:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): associates the locale encoding with $0 as
+	  well as ARGV.
+
+Sun Sep 14 13:48:03 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* object.c (Init_Object): added metameta-class initialization for
+	  BasicObject, Object, and Module.
+	  The metameta-classes of them are now the metaclass of Class, as the
+	  metameta-class of Class is.
+
+	* object.c (boot_defmetametaclass): added.
+
+Sun Sep 14 10:10:43 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (f_{add,mul,sub}): omitted some shortcuts for preserving
+	  signed zero anyway.
+
+	* complex.c (nucomp_negate): new.
+
+Sun Sep 14 04:15:16 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h (OnigEncodingTypeST): add end argument for
+	  left_adjust_char_head.
+	  (ONIGENC_LEFT_ADJUST_CHAR_HEAD): add end argument.
+	  (onigenc_get_left_adjust_char_head): ditto.
+
+	* include/ruby/encoding.h (rb_enc_left_char_head): add end argument.
+
+	* regenc.h (onigenc_single_byte_left_adjust_char_head): ditto.
+
+	* regenc.c (onigenc_get_right_adjust_char_head): follow the interface
+	  change.
+	  (onigenc_get_right_adjust_char_head_with_prev): ditto.
+	  (onigenc_get_prev_char_head): ditto.
+	  (onigenc_step_back): ditto.
+	  (onigenc_get_left_adjust_char_head): ditto.
+	  (onigenc_single_byte_code_to_mbc): ditto.
+
+	* re.c: ditto.
+
+	* string.c: ditto.
+
+	* io.c: ditto.
+
+	* regexec.c: ditto.
+
+	* enc/euc_jp.c: ditto.
+
+	* enc/cp949.c: ditto.
+
+	* enc/shift_jis.c: ditto.
+
+	* enc/gbk.c: ditto.
+
+	* enc/big5.c: ditto.
+
+	* enc/euc_tw.c: ditto.
+
+	* enc/euc_kr.c: ditto.
+
+	* enc/emacs_mule.c: ditto.
+
+	* enc/gb18030.c: ditto.
+
+	* enc/utf_8.c: ditto.
+
+	* enc/utf_16le.c: ditto.
+
+	* enc/utf_16be.c: ditto.
+
+	* enc/utf_32le.c: ditto.
+
+	* enc/utf_32be.c: ditto.
+
+Sun Sep 14 03:43:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h (ONIGENC_STEP_BACK): add end argument.
+	  (onigenc_step_back): ditto.
+
+	* regenc.c (onigenc_step_back): add end argument.
+
+	* regexec.c: follow the interface change.
+
+Sun Sep 14 03:20:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h (onigenc_get_prev_char_head): add end
+	  argument.
+
+	* include/ruby/encoding.h (rb_enc_prev_char): ditto.
+
+	* regenc.c (onigenc_get_prev_char_head): add end argument.
+
+	* regparse.c: follow the interface change.
+
+	* regexec.c: ditto.
+
+	* string.c: ditto.
+
+	* parse.y: ditto.
+
+Sun Sep 14 02:04:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h
+	  (onigenc_get_right_adjust_char_head_with_prev): add end argument.
+
+	* regenc.c (onigenc_get_right_adjust_char_head_with_prev): use end
+	  argument.
+
+	* regexec.c (forward_search_range): follow the interface change.
+
+Sun Sep 14 01:38:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h (onigenc_get_right_adjust_char_head): add
+	  end argument.
+
+	* include/ruby/encoding.h (rb_enc_right_char_head): add end argument.
+
+	* regenc.c (onigenc_get_right_adjust_char_head): use end argument.
+
+	* re.c (rb_reg_adjust_startpos): follow the interface change.
+
+	* string.c (rb_str_index): ditto.
+
+	* regexec.c (backward_search_range): ditto.
+	  (onig_search): ditto.
+
+Sun Sep 14 00:43:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/ripper/depend (ripper.o): it depends on ruby headers.
+
+Sat Sep 13 19:27:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_encoding_set): don't need argc argument.
+	  (rb_io_s_pipe): update io_encoding_set call.
+	  (rb_io_set_encoding): ditto.
+
+Sat Sep 13 18:46:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_transcoding): align state field.
+
+Sat Sep 13 18:21:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (DECORATOR_P): renamed from SUPPLEMENTAL_CONVERSION.
+
+Sat Sep 13 18:05:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (make_writeconv): use rb_enc_name.
+	  (make_readconv): ditto.
+
+	* transcode.c (rb_econv_open_opts): ditto.
+	  (econv_args): ditto.
+	  (decorate_convpath): ditto.
+	  (econv_set_replacement): ditto.
+
+Sat Sep 13 11:15:38 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/rexml/document.rb: fixed typo.
+
+Sat Sep 13 10:53:13 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: refined.
+
+	* rational.c: ditto.
+
+Sat Sep 13 03:44:52 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_prepare_opts): raise ArgumentError if
+	  a broken string is specified as a replacement.
+
+Sat Sep 13 03:31:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* iseq.c (iseq_s_compile_file): use rb_file_open_str.
+
+	* io.c (rb_file_open_generic): call validate_enc_binmode.
+	  (rb_file_open_str): call FilePathValue.
+
+Sat Sep 13 02:58:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (validate_enc_binmode): extracted from rb_io_extract_modeenc.
+	  (rb_io_extract_modeenc): use validate_enc_binmode.
+	  (io_encoding_set): call validate_enc_binmode.
+
+Sat Sep 13 02:50:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_prepare_opts): initialize *opt and return 0
+	  if opthash is nil.
+
+Sat Sep 13 02:29:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/escape.trans: transcoder name renamed to use underscore.
+
+	* transcode.c: follow the renaming.
+
+Sat Sep 13 02:12:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_init_by_convpath_i): new function.
+	  (rb_econv_init_by_convpath): new function.
+	  (econv_init): use rb_econv_init_by_convpath.
+
+Sat Sep 13 01:11:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_args): take snamev_p and dnamev_p to prevent
+	  possible GC problem.
+
+Sat Sep 13 00:38:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (enc_arg): take arg as VALUE * to prevent possible GC
+	  problem.
+
+Fri Sep 12 23:19:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_add_transcoder_at): fix loop condition.
+
+Fri Sep 12 22:39:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (decorator_names): extracted from rb_econv_open.
+	  (rb_econv_open): use decorator_names.
+	  (econv_args): extracted from econv_init.
+	  (econv_init): use econv_args.
+	  (decorate_convpath): new function.
+	  (search_convpath_i): new function.
+	  (econv_s_search_convpath): new method.
+	  (Init_transcode): new method defined.
+
+Fri Sep 12 21:55:43 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_t): new field: num_allocated.
+	  (rb_econv_alloc): extracted from
+	  rb_econv_open_by_transcoder_entries.
+	  (rb_econv_add_transcoder_at): extracted from rb_econv_decorate_at
+	  and generalized
+	  (rb_econv_open_by_transcoder_entries): use rb_econv_alloc and
+	  rb_econv_add_transcoder_at.
+	  (rb_econv_add_converter): extracted from rb_econv_decorate_at.
+	  (rb_econv_decorate_at): use rb_econv_add_converter.
+
+Fri Sep 12 21:22:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_t): new field: started.
+	  (rb_econv_open_by_transcoder_entries): initialize started field.
+	  (rb_econv_convert): set started field.
+	  (rb_econv_insert_output): ditto.
+	  (rb_econv_decorate_at): check started field instead of num_finished.
+
+Fri Sep 12 20:28:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* regenc.c (onigenc_single_byte_code_to_mbc): follow OnigEncoding
+	  change.
+
+Fri Sep 12 20:00:22 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regparse.c (parse_exp): fix resource leak.
+
+Fri Sep 12 01:21:22 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/syck/node.c (syck_replace_str2): fix wrong check to free ptr.
+
+Thu Sep 11 20:18:24 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_err_in_callback.rb (teardown): get rid
+	  of infinite loop.
+
+Thu Sep 11 19:12:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/oniguruma.h (OnigCodePoint): unsigned long to unsigned int.
+
+	* include/ruby/encoding.h (rb_enc_codepoint): ditto.
+
+	* encoding.c (rb_enc_codepoint): signed int to unsigned int.
+
+	* encoding.c (rb_enc_ascget): ditto.
+
+	* string.c (rb_str_casecmp): ditto.
+
+	* string.c (enc_succ_alnum_char): ditto.
+
+	* string.c (rb_str_inspect): ditto.
+
+	* string.c (rb_str_upcase_bang): ditto.
+
+	* string.c (rb_str_downcase_bang): ditto.
+
+	* string.c (rb_str_capitalize_bang): ditto.
+
+	* string.c (rb_str_swapcase_bang): ditto.
+
+	* string.c (struct tr): ditto.
+
+	* string.c (trnext): ditto.
+
+	* string.c (tr_trans): ditto.
+
+	* string.c (tr_setup_table): ditto.
+
+	* string.c (tr_find): ditto.
+
+	* string.c (rb_str_delete_bang): ditto.
+
+	* string.c (rb_str_squeeze_bang): ditto.
+
+	* string.c (rb_str_count): ditto.
+
+	* string.c (rb_str_split_m): ditto.
+
+	* string.c (rb_str_each_line): ditto.
+
+	* string.c (rb_str_lstrip_bang): ditto.
+
+	* string.c (rb_str_rstrip_bang): ditto.
+
+	* string.c (rb_str_intern): ditto.
+
+	* dir.c (char_casecmp): ditto.
+
+	* sprintf.c (rb_str_format): ditto.
+
+	* enc/emacs_mule.c (mbc_to_code): to be 32bit clean.
+
+	* enc/emacs_mule.c (code_to_mbc): ditto.
+
+	* enc/gb18030.c (mbc_to_code): ditto.
+
+	* enc/gb18030.c (code_to_mbc): ditto.
+
+Thu Sep 11 19:09:25 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/iconv/iconv.c: add attention for machine independent.
+
+Thu Sep 11 15:23:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivrem): adjust length for division and remainder.
+	  a patch from TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
+	  [ruby-dev:36231].
+
+Thu Sep 11 02:59:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_binwrite): extracted from io_fwrite.
+
+Thu Sep 11 02:25:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_encoding): new function.
+	  (make_encobj): new function.
+	  (econv_s_asciicompat_encoding): use make_encoding.
+	  (rb_econv_open_exc): use SUPPLEMENTAL_CONVERSION.
+	  (econv_convpath): use encoding object in the result.
+
+Thu Sep 11 02:14:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_convpath): new method.
+
+Wed Sep 10 23:00:43 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* tool/compile_prelude.rb: print "<internal:prelude>" instead of
+	  "prelude.rb" on stack trace.  [ruby-dev:36129]
+
+Wed Sep 10 21:19:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (big2str_karatsuba): remove unnecessary fixnum code.  a
+	  patch from TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
+	  [ruby-dev:36217].
+
+Wed Sep 10 21:09:32 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_err_in_callback.rb: InternetExplorer should
+	  be closed.
+
+	* test/win32ole/err_in_callback.rb: ditto.
+
+Wed Sep 10 18:25:19 2008  akira yamada  <akira@rice.p.arika.org>
+
+	* lib/uri/common.rb (URI::Parser): new class.
+
+	* lib/uri/mailto.rb, lib/uri/generic.rb: follow the above change.
+
+	* test/uri/test_parser.rb: added tests for URI::Parser.
+
+Wed Sep 10 10:35:32 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/cookie.rb (CGI::Cookie#to_s): performance improvement
+	  from http://jp.rubyist.net/magazine/?0023-Cgirb.
+
+Wed Sep 10 10:12:29 2008  akira yamada  <akira@arika.org>
+
+	* lib/sync.rb (Sync_m#sync_exclusive): fixed
+	  typo. [ruby-dev:36233] [RubyForge#11680]
+
+Wed Sep 10 01:57:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (StrSet#hash): cache hash value.
+	  (ActionMap#hash): ditto.
+
+Wed Sep 10 01:26:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (econv_after_output): renamed from
+	  econv_output_followed_by_input.
+	  (ECONV_AFTER_OUTPUT): renamed from ECONV_OUTPUT_FOLLOWED_BY_INPUT.
+
+	* transcode.c: follow the renaming.
+
+	* io.c: ditto.
+
+Wed Sep 10 01:16:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (get_replacement_character): don't return ASCII
+	  incompatible replacements.
+	  (make_replacement): don't convert the result of
+	  get_replacement_character.
+
+Wed Sep 10 01:05:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/newline.trans (rb_universal_newline): swap src_encoding
+	  and dst_encoding.
+
+	* transcode.c (rb_econv_decorate_at): call get_transcoder_entry only
+	  once.
+	  (rb_econv_binmode): follow universal_newline change.
+
+Wed Sep 10 00:01:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): rename field: writeconv_stateless to
+	  writeconv_asciicompat.
+
+	* io.c: follow the renaming.
+
+	* gc.c: ditto.
+
+Tue Sep  9 23:55:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_fwrite): raise an error if ASCII incompatible string
+	  written for text mode IO without encoding conversion.
+	  (rb_io_extract_modeenc): binmode requirement changed.
+
+Tue Sep  9 21:59:48 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi*: split cgi.rb into four files. [ruby-dev:36041]
+
+Tue Sep  9 21:17:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_DECORATOR_MASK): merge
+	  ECONV_ENCODER_MASK and ECONV_DECORATOR_MASK.
+	  (ECONV_UNIVERSAL_NEWLINE_DECORATOR): renamed from
+	  ECONV_UNIVERSAL_NEWLINE_DECODER.
+	  (ECONV_CRLF_NEWLINE_DECORATOR): renamed from
+	  ECONV_CRLF_NEWLINE_ENCODER.
+	  (ECONV_CR_NEWLINE_DECORATOR): renamed from ECONV_CR_NEWLINE_ENCODER.
+	  (ECONV_XML_TEXT_DECORATOR): renamed from ECONV_XML_TEXT_ENCODER.
+	  (ECONV_XML_ATTR_CONTENT_DECORATOR): renamed from
+	  ECONV_XML_ATTR_CONTENT_ENCODER.
+	  (ECONV_STATEFUL_DECORATOR_MASK): renamed from
+	  ECONV_STATEFUL_ENCODER_MASK.
+	  (ECONV_XML_ATTR_QUOTE_DECORATOR): renamed from
+	  ECONV_XML_ATTR_CONTENT_DECORATOR.
+
+	* io.c: follow the renaming.
+
+	* transcode.c: ditto.
+
+Tue Sep  9 20:55:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open0): make it static.
+	  (rb_econv_open): place decorators at last.
+
+Tue Sep  9 20:40:15 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/openssl/test_ssl.rb (OpenSSL#test_client_session):
+	  Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
+	  when use default SSLContext. [ruby-dev:36167]
+
+Tue Sep  9 20:34:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_t): last_trans_index removed.
+	  (rb_econv_open_by_transcoder_entries): follow the type change.
+	  (rb_econv_open0): ditto.
+	  (rb_econv_decorate_at): ditto.
+	  (rb_econv_binmode): ditto.
+	  (rb_econv_insert_output): simplified because there are no decorators
+	  at last.
+
+Tue Sep  9 20:21:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): reverse the order of decoders.
+
+Tue Sep  9 20:18:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open0): num_encoders and num_decoders removed.
+
+Tue Sep  9 03:59:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (make_writeconv): useless branch removed.
+
+Tue Sep  9 02:18:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_decorate_at_first): declared.
+	  (rb_econv_decorate_at_last): declared.
+
+	* transcode.c (rb_econv_open_by_transcoder_entries): initialize
+	  replacement_enc.  allocate outbuf for the last transcoder.
+	  (rb_econv_open0): extracted from rb_econv_open.
+	  (rb_econv_open): use rb_econv_open0 and decorate the result using
+	  rb_econv_decorate_at_first and rb_econv_decorate_at_last.
+	  (rb_econv_decorate_at): new function.
+	  (rb_econv_decorate_at_first): ditto.
+	  (rb_econv_decorate_at_last): ditto.
+	  (rb_econv_binmode): fix iteration end condition.
+	  (econv_init): don't set source_encoding_name and
+	  destination_encoding_name because they are set in rb_econv_open0.
+
+Tue Sep  9 01:10:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): make ec a local variable.
+
+Tue Sep  9 00:20:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_asciicompat_encoding): check decoder.
+
+Tue Sep  9 00:00:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_t): last_error.partial_input removed.
+
+Mon Sep  8 23:24:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_asciicompat_encoding): renamed
+	  from rb_econv_stateless_encoding to apply stateless ASCII
+	  incompatible encodings such as UTF-16BE.
+
+	* io.c (make_writeconv): use rb_econv_asciicompat_encoding.
+
+	* transcode_data.h (rb_transcoder_asciicompat_type_t): renamed from
+	  rb_transcoder_stateful_type_t.
+	  (rb_transcoder): use rb_transcoder_asciicompat_type_t.
+
+	* transcode.c: follow the type change.
+	  (asciicompat_encoding_i): renamed from stateless_encoding_i.
+	  (rb_econv_asciicompat_encoding): renamed from
+	  rb_econv_stateless_encoding.
+	  (econv_s_asciicompat_encoding): method renamed.
+
+	* tool/transcode-tblgen.rb: follow the type change.
+
+	* enc/trans/utf_16_32.trans: follow the type change.
+	  rb_from_UTF_16BE to UTF-8 is asciicompat_decoder.
+	  rb_from_UTF_16LE to UTF-8 is asciicompat_decoder.
+	  rb_from_UTF_32BE to UTF-8 is asciicompat_decoder.
+	  rb_from_UTF_32LE to UTF-8 is asciicompat_decoder.
+	  UTF-8 to rb_to_UTF_16BE is asciicompat_encoder.
+	  UTF-8 to rb_to_UTF_16LE is asciicompat_encoder.
+	  UTF-8 to rb_to_UTF_32BE is asciicompat_encoder.
+	  UTF-8 to rb_to_UTF_32LE is asciicompat_encoder.
+
+	* enc/trans/newline.trans: follow the type change.  universal newline
+	  decoder is asciicompat_converter.
+
+	* enc/trans/escape.trans: follow the type change.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/japanese.trans: ditto.
+
+Mon Sep  8 23:05:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_insert_output): "readagain" part should be
+	  after replacement.
+
+Mon Sep  8 22:30:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (dir_initialize): rename option name of Dir.open
+	  from :external_encoding to :encoding.
+
+Mon Sep  8 22:16:20 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi.rb : obsolete regex "n" option. [ruby-dev:36130]
+
+Mon Sep  8 18:13:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (getppid): typo. [ruby-dev:36202]
+
+	* process.c (get_ppid): mention the return value on Windows.
+
+Mon Sep  8 18:15:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (ArrayCode): less string substitutions.
+
+Mon Sep  8 18:13:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* vm.c (rb_mRubyVMFrozenCore): registered for GC.
+
+	* re.c (rb_reg_preprocess_dregexp): fix GC problem on MacOS X with
+	  powerpc-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc.
+	  build 5367).
+
+Mon Sep  8 18:09:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): define SIZE_MAX for VC++6/7.
+
+Mon Sep  8 17:46:09 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (filetime_to_unixtime): remove unused variable.
+	  [ruby-dev:36191]
+
+Mon Sep  8 13:47:39 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_io.rb (TestIO#test_dup): add open in block.
+	  see [ruby-dev:35957].
+
+Mon Sep  8 07:09:42 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: some adjustments.
+
+	* rational.c: ditto.
+
+Mon Sep  8 06:50:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (XLDFLAGS): added --enable-auto-import for cygwin and
+	  mingw.
+
+Mon Sep  8 02:04:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_set_replacement): renamed from
+	  rb_econv_set_replacemenet.
+
+	* transcode.c: follow the renaming.
+
+Mon Sep  8 01:10:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (transcode_tblgen): log message refined.
+
+Mon Sep  8 00:58:04 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: removed unused code.
+
+Mon Sep  8 00:04:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/iso2022.trans: upcase to iso-2022-jp.
+
+	* enc/emacs_mule.c: ditto.
+
+Sun Sep  7 23:46:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/iso2022.trans: stateless-iso-2022-jp is defined to avoid
+	  undefined conversion error between iso-2022-jp and the corresponding
+	  stateless encoding.
+
+	* enc/emacs_mule.c: replicate emacs-mule as stateless-iso-2022-jp.
+
+Sun Sep  7 20:03:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/escape.trans (hexstr): renamed from str1.
+
+Sun Sep  7 19:45:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/escape.trans: use transcode_tblgen.
+
+	* tool/transcode-tblgen.rb: generate an empty line after str1.
+
+Sun Sep  7 19:16:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (ActionMap#str_name): new method to
+	  generate a name base on string content.
+	  (ActionMap#gen_str): extracted from generate_info and use str_name.
+
+Sun Sep  7 18:28:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (ActionMap#generate_info): use a memo to
+	  avoid duplication for STR1.
+
+Sun Sep  7 18:10:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (STR1): defined for a string up to 255 bytes.
+	  (STR1_BYTEINDEX): defined.
+	  (makeSTR1): defined.
+
+	* tool/transcode-tblgen.rb: generate STR1.
+
+	* transcode.c (transcode_restartable0): interpret STR1.
+
+	* enc/trans/escape.trans (fun_so_escape_xml_chref): removed.  STR1 is
+	  used instead.
+
+Sun Sep  7 17:54:45 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* configure.in: Mac OS X's crypt(2) is broken with invalid salt.
+	  [ruby-dev:35899]
+	* string.c (rb_str_crypt): ditto.
+
+Sun Sep  7 17:29:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: o4 is usable only if the first byte is
+	  f0-f7.
+
+Sun Sep  7 12:44:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (make_writeconv): choose ASCII compatible encoding as
+	  intermediate encoding if stateful encoder exists.
+
+Sun Sep  7 12:09:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_XML_ATTR_CONTENT_ENCODER): defined.
+	  (ECONV_STATEFUL_ENCODER_MASK): defined.
+	  (ECONV_XML_ATTR_QUOTE_ENCODER): defined.
+	  (ECONV_XML_ATTR_ENCODER): removed.
+
+	* enc/trans/escape.trans (rb_escape_xml_attr_content): defined.
+	  (rb_escape_xml_attr_quote): defined.
+	  (rb_escape_xml_attr): removed.
+
+	* io.c (NEED_WRITECONV): writeconv is required if supplemental
+	  converter is used.
+	  (make_writeconv): apply stateful encoder in writeconv.
+
+	* transcode.c: follow the constant change.
+
+Sun Sep  7 07:24:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/*.el:  merged the following patches from Nathan Weizenbaum
+	  <nex342 at gmail.com>.   [ruby-core:18424]
+
+	* misc/ruby-mode.el: improve here-doc performance.
+
+	* misc/ruby-mode.el: don't crash the whole mode if the Subversion
+	  $ keyword isn't interpolated.
+
+	* misc/ruby-mode.el: don't highlight keywords when they're the
+	  beginning of non-keyword symbols.
+
+	* misc/ruby-mode.el, misc/ruby-electric.el: use regexp-opt where
+	  possible for more efficient regexps.
+
+	* misc/*.el: untabify, for internal consistency and consistency
+	  with standard Emacs elisp files.
+
+	* misc/ruby-mode.el: fix a variable-name error.
+
+	* misc/emacs-mode.el: don't set case-fold-search globally to nil;
+	  instead just set it when we need it.
+
+Sun Sep  7 06:31:51 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (file_expand_path): applied a patch from Nobuhiro Tachino
+	  in [ruby-dev:35948].  fix #491
+
+Sun Sep  7 03:37:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_block_optarg): allow default for block parameters as
+	  long as the value is primary.  a patch from Eric Mahurin
+	  <eric.mahurin at gmail.com> in [ruby-core:16880].
+
+Sun Sep  7 01:07:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): "1.upto 2 {|i| p i }" should be syntax error.
+	  [ruby-dev:36008]
+
+	* test/ruby/test_parse.rb (TestParse): update a test not to use
+	  recently fixed inconsistent syntax.
+
+Sun Sep  7 00:37:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_ERROR_HANDLER_MASK): defined.
+	  (ECONV_DECODER_MASK): defined.
+	  (ECONV_ENCODER_MASK): defined.
+
+	* io.c (make_writeconv): restrict ecflags for writeconv with
+	  ECONV_ERROR_HANDLER_MASK.
+
+Sat Sep  6 23:03:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_XML_TEXT_ENCODER): renamed from
+	  ECONV_HTML_TEXT_ENCODER.
+	  (ECONV_XML_ATTR_ENCODER): renamed from ECONV_HTML_ATTR_ENCODER.
+
+	* enc/trans/escape.trans: follow the renaming.
+
+	* transcode.c: ditto.
+
+Sat Sep  6 21:35:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/mkconstants.rb: add some IPV6 constants. [ruby-dev:36175]
+
+Sat Sep  6 20:10:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and
+	  ECONV_HTML_ATTR_ENCODER.
+
+Sat Sep  6 20:06:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_binmode): check actual transcoders.
+
+Sat Sep  6 19:54:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): fix last_tc.
+
+Sat Sep  6 19:36:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_binmode): clear newline flags in writeconv_pre_ecflags.
+
+Sat Sep  6 18:47:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (str_transcode0): check ECONV_HTML_TEXT_ENCODER and
+	  ECONV_HTML_ATTR_ENCODER.
+
+Sat Sep  6 18:38:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (allocate_converted_string): fix overflow condition.
+
+Sat Sep  6 15:06:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (sym_html): new variable.
+	  (sym_text): ditto.
+	  (sym_attr): ditto.
+	  (econv_opts): check :html=>:text and :html=>:attr.
+	  (Init_transcode): initialize the above variables.
+
+Sat Sep  6 14:46:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_HTML_TEXT_ENCODER): new constant.
+	  (ECONV_HTML_ATTR_ENCODER): ditto.
+
+	* transcode.c (rb_econv_open): check ECONV_HTML_TEXT_ENCODER and
+	  ECONV_HTML_ATTR_ENCODER.
+	  (Init_transcode): Encoding::Converter::HTML_TEXT_ENCODER and
+	  Encoding::Converter::HTML_ATTR_ENCODER defined.
+
+Sat Sep  6 14:15:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (struct trans_open_t): defined to pass num_additional.
+	  (trans_open_i): use struct trans_open_t.
+	  (rb_econv_open): ditto.
+
+Sat Sep  6 13:43:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/escape.trans (fun_so_escape_html_attr): fix return type.
+
+Sat Sep  6 12:43:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): needless branch removed.
+
+Sat Sep  6 12:38:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): test condition simplified.
+
+Sat Sep  6 12:25:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (stateless_encoding_i): ignore supplemental conversions.
+	  Encoding::Converter.stateless_encoding("html-attr-escaped") should be
+	  nil.
+
+Sat Sep  6 12:19:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/escape.trans (escape_html_attr_init): new function.
+	  (fun_so_escape_html_attr): new function.
+	  (escape_html_attr_finish): new function.
+	  (rb_escape_html_attr): use them to quote the converted result.
+
+Sat Sep  6 07:54:36 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: uses f_real_p macro.
+
+Sat Sep  6 07:27:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): fail for ASCII incompatible with
+	  newline conversion.
+
+Sat Sep  6 07:24:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_extract_modeenc): raise an error for ASCII incompatible
+	  encoding without binmode.
+
+Sat Sep  6 07:12:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivrem1): optimization by skipping zeros at the
+	  tail of digits.  a patch from TOYOFUKU Chikanobu
+	  <nobu_toyofuku at nifty.com> in [ruby-dev:36169].
+
+Sat Sep  6 06:28:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/escape.trans: new file.
+
+Sat Sep  6 06:23:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (StrSet.parse): accept upper case
+	  hexadecimal digits.
+
+Sat Sep  6 05:37:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (output_hex_charref): upcase hexadecimal digits.
+
+Sat Sep  6 05:22:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_UNDEF_HEX_CHARREF): defined.
+
+	* transcode.c (output_hex_charref): new function.
+	  (rb_econv_convert): call output_hex_charref if
+	  ECONV_UNDEF_HEX_CHARREF.
+	  (Init_transcode): Encoding::Converter::UNDEF_HEX_CHARREF added.
+
+Sat Sep  6 03:52:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_convert): use ECONV_INVALID_MASK and
+	  ECONV_UNDEF_MASK.
+
+Sat Sep  6 06:05:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/ruby.h (DBL2NUM): renamed from DOUBLE2NUM.
+	  a patch from Tadashi Saito <shiba at mail2.accsnet.ne.jp>
+	  in [ruby-dev:36102].
+
+Sat Sep  6 04:44:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (Init_Proc): add '===' operator to use procs in when
+	  clause of the case statement.  inspired by <http://www.aimred.com/news/developers/2008/08/14/unlocking_the_power_of_case_equality_proc/>.
+
+Sat Sep  6 03:18:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (allocate_converted_string): add arguments for a buffer
+	  allocated by caller.
+	  (rb_econv_insert_output): provide caller allocated buffer to
+	  allocate_converted_string.
+
+Sat Sep  6 02:58:53 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (str_transcode_enc_args): local variables renamed.
+	  (str_transcode0): ditto.
+
+Sat Sep  6 02:23:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_s_stateless_encoding): new method.
+
+Sat Sep  6 02:01:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (enc_arg): extracted from str_transcode_enc_args.
+	  (str_transcode_enc_args): use enc_arg.
+
+Fri Sep  5 20:27:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_modestr_fmode): renamed from
+	  rb_io_mode_flags.
+	  (rb_io_modestr_oflags): renamed from rb_io_mode_modenum.
+	  (rb_io_oflags_fmode): renamed from rb_io_modenum_flags.
+	  (rb_io_mode_flags): defined as a macro.
+	  (rb_io_modenum_flags): ditto.
+
+	* io.c: follow the renaming with consistency.
+
+	* process.c (check_exec_redirect): call rb_io_modestr_oflags.
+
+	* ext/pty/depend: pty.o depends on io.h.
+
+Fri Sep  5 20:12:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/newline.trans (universal_newline_finish): new function.
+
+Fri Sep  5 20:07:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_mode_modenum): moved from
+	  include/ruby/intern.h.
+
+Fri Sep  5 19:59:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (MODENUM_MAX): removed.
+
+Fri Sep  5 18:37:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (copy_stream_fallback_body): use read method unless readpartial
+	  is available.  [ruby-dev:36124]
+
+Fri Sep  5 18:16:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_create): strips glibc style option before
+	  charset mapping.  retries without options if they seemed causing
+	  error, and warns.  [ruby-dev:36147]
+
+Fri Sep  5 03:09:48 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_data_to_ary): make it static.
+
+	* thread.c (thgroup_enclose): ditto.
+
+Fri Sep  5 02:56:37 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (thread_recycle_stack_slot, thread_recycle_stack_count):
+	  make it static.
+
+Fri Sep  5 02:40:38 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_critical): removed.
+
+Fri Sep  5 01:22:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (argf_mark): mark p->encs.ecopts.
+
+Fri Sep  5 00:45:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder): rename fields:
+	  from_encoding -> src_encoding, to_encoding -> dst_encoding.
+
+	* transcode.c: follow the renaming.
+
+Fri Sep  5 00:22:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c: variables renamed for consistency.
+
+Fri Sep  5 00:05:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (encodes): make buff fixed length to avoid SEGV by
+	  ruby -e '["a"*10000000].pack("m1000000000")'
+
+Thu Sep  4 23:47:05 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode): set exception mode
+	  correctly.  In spite of BigDecimal.mode(BigDecimal::EXCEPTION_ALL,
+	  true), BigDecimal.new("NaN") did not raise an exception previously.
+
+Thu Sep  4 23:42:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_file_open_str): declared.
+
+	* io.c (rb_file_open_str): defined.
+
+	* ext/zlib/zlib.c (gzfile_s_open): use rb_file_open_str instead of
+	  rb_file_open.
+
+Thu Sep  4 23:18:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/newline.trans: record newline types met in universal
+	  newline decoder.
+
+Thu Sep  4 23:05:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/prime.rb (Prime::OldCompatibility#each): added compatibility to
+	    Ruby 1.8.7.
+	  (Prime#each): added more rdocs.
+	  (Prime#each): remembers the last value of the given block.
+
+Thu Sep  4 21:53:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_init): accept an integer as 3rd argument as well.
+
+Thu Sep  4 21:46:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (sym_partial_input): new variable.
+	  (econv_primitive_convert): accept a hash as 5th argument as well.
+
+Thu Sep  4 21:04:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (sym_universal_newline_decoder): new variable.
+	  (sym_crlf_newline_encoder): ditto.
+	  (sym_cr_newline_encoder): ditto.
+	  (econv_opts): check newline converter options.
+	  (econv_init): make 3rd argument hash/nil only.
+
+Thu Sep  4 21:03:28 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c: rename some debug functions.
+
+Thu Sep  4 20:57:54 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_check_trap_pending): added for compatibility.
+
+	* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: remove ruby/signal.h
+	  dependency.
+
+Thu Sep  4 20:30:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (PType): defined unconditionally.
+
+	* transcode.c (PType): don't define here.
+
+Thu Sep  4 20:19:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: variables renamed for consistency.
+
+Thu Sep  4 19:40:50 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c (gc_profile_record_get): to static function.
+	  (gc_profile_result): ditto.
+	  (gc_profile_report): ditto.
+
+Thu Sep  4 19:20:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_enc_t): rename flags to ecflags.
+	  (rb_io_t): rename writeconv_pre_flags to writeconv_pre_ecflags.
+	  (MakeOpenFile): follow the renaming.
+
+	* io.c: follow the renaming.
+
+Thu Sep  4 19:10:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_INVALID_IGNORE): removed because
+	  it tend to cause security problem.  If the behaviour is really
+	  required, ECONV_INVALID_REPLACE with empty string can be used.
+	  For example, CVE-2006-2313, CVE-2008-1036, [ruby-core:15645],
+	  http://unicode.org/reports/tr36/
+	  (ECONV_UNDEF_IGNORE): ditto.
+
+	* transcode.c (rb_econv_convert): follow the above change.
+	  (econv_opts): ditto.
+	  (Init_transcode): ditto.
+
+Thu Sep  4 13:22:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (struct rb_vm_struct): replaced signal staff with trap
+	  staff.
+
+	* signal.c (signal_buff): per process resource now.
+
+	* signal.c (trap_list): moved to VM.
+
+	* signal.c (rb_get_next_signal): reverted.
+
+	* signal.c (rb_trap_exit): trap_pending_list was no longer used.
+
+	* thread.c (timer_thread_function): delivers buffered per-process
+	  signals to each VMs.
+
+	* vm.c (rb_vm_mark): marks trap_list.
+
+Thu Sep  4 13:01:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (struct sysopen_struct, rb_sysopen_internal, rb_sysopen):
+	  constified.
+
+	* io.c: expanded ARGF members macros.
+
+Thu Sep  4 10:43:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/transcode-tblgen.rb (citrus_decode_mapsrc): support older 1.8.
+
+Thu Sep  4 10:33:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_next_argv, argf_set_encoding): copy struct wise.
+
+Thu Sep  4 09:46:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_scan_open_args): follow rb_str_transcode change.
+
+Thu Sep  4 08:59:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (rb_find_file): fix GC problem on Debian GNU/Linux (IA64)
+	  with gcc (GCC) 4.1.2 20061115 (prerelease) (Debian 4.1.1-21).
+	  There is no register/memory to contain load_path.  A register (r35)
+	  contains &RARRAY_PTR(load_path), (char*)load_path + 32.
+
+Thu Sep  4 03:10:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): new fields: encs.ecopts and
+	  writeconv_pre_ecopts.
+	  (MakeOpenFile): initialize them.
+
+	* include/ruby/encoding.h (rb_str_transcode): take ecopts argument.
+	  (rb_econv_flags): removed.
+	  (rb_econv_prepare_opts): declared.
+	  (rb_econv_open_opts): declared.
+
+	* io.c (make_writeconv): use rb_econv_open_opts.
+	  (make_readconv): ditto.
+	  (io_fwrite): follow rb_str_transcode change.
+	  (rb_io_extract_modeenc): use rb_econv_prepare_opts.
+	  (rb_file_open_generic): initialize encs.ecopts.
+	  (rb_file_open_internal): ditto.
+	  (rb_io_reopen): ditto.
+	  (argf_ecopts): defined.
+	  (argf_next_argv): set encs.ecopts.
+	  (io_encoding_set): use rb_econv_prepare_opts.
+	  (argf_set_encoding): set argf_ecopts.
+
+	* gc.c (gc_mark_children): mark encs.ecopts and writeconv_pre_ecopts
+	  in T_FILE.
+
+	* transcode.c (transcode_loop): take ecopts argument. use
+	  rb_econv_open_opts.
+	  (rb_econv_flags): removed.
+	  (rb_econv_prepare_opts): defined.
+	  (rb_econv_open_opts): defined.
+	  (str_transcode0): take ecopts.
+	  (str_transcode): use rb_econv_prepare_opts.
+	  (rb_str_transcode): take ecopts.
+	  (econv_init): accept hash argument.
+	  (econv_insert_output): follow rb_str_transcode change.
+
+Thu Sep  4 01:30:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_set_replacemenet): declared.
+
+	* transcode.c (rb_econv_t): new fields: replacement_str,
+	  replacement_len, replacement_enc and replacement_allocated.
+	  (get_replacement_character): make len as size_t.
+	  (rb_econv_open_by_transcoder_entries): initialize the new fields.
+	  (rb_econv_close): deallocate replacement_str if it allocated.
+	  (make_replacement): new function.
+	  (output_replacement_character): use make_replacement.
+	  (rb_econv_set_replacemenet): defined.
+	  (econv_get_replacement): new method.
+	  (econv_set_replacement): new method.
+
+Thu Sep  4 01:12:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (filetime_to_timeval): new function, split from
+	  gettimeofday().
+
+	* win32/win32.c (gettimeofday): use above function.
+
+	* win32/win32.c (filetime_to_unixtime): ditto. [ruby-dev:36135]
+
+Thu Sep  4 01:00:57 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* transcode.c (transcode_restartable0): avoid VC++6's bug.
+
+Thu Sep  4 00:26:27 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (make_writeconv): follow akr's previous commit.
+
+Thu Sep  4 00:09:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_option_t): removed.  Since
+	  rb_econv_option_t has only one field, int flags, rb_econv_option_t is
+	  replaced by int.
+
+	* include/ruby/io.h: follow the above change.
+
+	* io.c: ditto.
+
+	* transcode.c: ditto.
+
+Thu Sep  4 00:04:59 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* win32/win32.c: fix ruby/signal.h depending codes.
+
+Thu Sep  4 00:01:45 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/etc/test_etc.rb (test_getpwuid, test_getgrgid): use
+	  Process.euid and egid instead of Etc.getlogin to identify current
+	  user which may be different from a login one (e.g., su command).
+
+Wed Sep  3 23:52:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/etc/test_etc.rb: check only typical use of
+	  setpwent/getpwent/endpwent and setgrent/getgrent/endgrent.
+
+Wed Sep  3 23:33:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_transcoding): moved from transcode_data.h.
+	  (TRANSCODING_READBUF): ditto.
+	  (TRANSCODING_WRITEBUF): ditto.
+	  (TRANSCODING_STATE_EMBED_MAX): ditto.
+	  (TRANSCODING_STATE): ditto.
+
+Wed Sep  3 23:03:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): remove stateful field.
+	  add state field.
+	  (TRANSCODING_STATE): defined.
+	  (rb_transcoder): add fields: state_size, state_init_func,
+	  state_fini_func.
+	  change rb_transcoding* argument to void*.
+
+	* transcode.c (transcode_restartable0): use TRANSCODING_STATE for
+	  first arguments of transcoder functions.
+	  (rb_transcoding_open_by_transcoder): initialize state field.
+	  (rb_transcoding_close): finalize state field.
+
+	* tool/transcode-tblgen.rb: provide state size/init/fini.
+
+	* enc/trans/newline.trans (universal_newline_init): defined.
+	  (fun_so_universal_newline): take void* as a state pointer.
+	  (rb_universal_newline): provide state size/init/fini.
+	  (rb_crlf_newline): ditto.
+	  (rb_cr_newline): ditto.
+
+	* enc/trans/iso2022.trans (iso2022jp_init): defined.
+	  (fun_si_iso2022jp_to_eucjp): take void* as a state pointer.
+	  (fun_so_iso2022jp_to_eucjp): ditto.
+	  (fun_so_eucjp_to_iso2022jp): ditto.
+	  (iso2022jp_reset_sequence_size): ditto.
+	  (finish_eucjp_to_iso2022jp): ditto.
+	  (rb_ISO_2022_JP_to_EUC_JP): provide state size/init/fini.
+	  (rb_EUC_JP_to_ISO_2022_JP): ditto.
+
+	* enc/trans/utf_16_32.trans (fun_so_from_utf_16be): take void* as a
+	  state pointer.
+	  (fun_so_to_utf_16be): ditto.
+	  (fun_so_from_utf_16le): ditto.
+	  (fun_so_to_utf_16le): ditto.
+	  (fun_so_from_utf_32be): ditto.
+	  (fun_so_to_utf_32be): ditto.
+	  (fun_so_from_utf_32le): ditto.
+	  (fun_so_to_utf_32le): ditto.
+	  (rb_from_UTF_16BE): provide state size/init/fini.
+	  (rb_to_UTF_16BE): ditto.
+	  (rb_from_UTF_16LE): ditto.
+	  (rb_to_UTF_16LE): ditto.
+	  (rb_from_UTF_32BE): ditto.
+	  (rb_to_UTF_32BE): ditto.
+	  (rb_from_UTF_32LE): ditto.
+	  (rb_to_UTF_32LE): ditto.
+
+	* enc/trans/japanese.trans (fun_so_eucjp2sjis): take void* as a state
+	  pointer.
+	  (fun_so_sjis2eucjp): ditto.
+	  (rb_eucjp2sjis): provide state size/init/fini.
+	  (rb_sjis2eucjp): provide state size/init/fini.
+
+Wed Sep  3 22:31:11 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/mathn.rb (Integer): moved into prime.rb.
+	  (Prime): ditto.
+
+	* lib/prime.rb (Integer): moved from mathn.rb.
+	  (Integer.each_prime): added.
+	  (Integer#prime?): added.
+	  (Prime): moved from mathn.rb.
+	    Its implementation was rewritten. see [ruby-dev:35863].
+	    And patched by Keiju ISHITSUKA <keiju@ishitsuka.com>,
+	    see [ruby-dev:36128].
+	  (Prime.new):                     obsolete.
+	  (Prime.instance):                added.
+	  (Prime.each):                    added.
+	  (Prime.int_from_prime_division): added.
+	  (Prime.prime_division):          added.
+	  (Prime.prime?):                  added.
+	    Patch by TOYOFUKU Chikanobu
+	    <nobu_toyofuku at nifty.com> in [ruby-dev:36067].
+	  (Prime.cache):                   removed.
+	  (Prime.primes):                  removed.
+	  (Prime.primes_so_far):           removed.
+	  (Prime#int_from_prime_division): added.
+	  (Prime#prime_division):          added.
+	  (Prime#prime?):                  added.
+	  (Prime#primes):                  removed.
+	  (Prime#primes_so_far):           removed.
+	  (Prime::PseudoPrmeGenerator):    added.
+	  (Prime::EratosthenesGenerator):  added.
+	  (Prime::TrialDivisionGenerator): added.
+	  (Prime::Generator23):            added.
+	  (Prime::TrialDivision):          added.
+	    Extracted from the previous implementation of Prime
+	    by Keiju ISHITSUKA.
+	  (Prime::EratosthenesSieve):      added.
+
+	* lib/.document (prime.rb): added
+
+	* lib/README (prime.rb): added
+
+	* test/test_prime.rb: added.
+
+Wed Sep  3 21:49:00 2008  David A. Black  <dblack@rubypal.com>
+
+	* lib/scanf.rb: fixed bug involving matching literal '['
+
+	* test/scanf/test_scanf.rb: added test for scanf.rb fix
+
+Wed Sep  3 21:31:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (WORDINDEX_SHIFT_BITS): defined.
+	  (WORDINDEX2INFO): defined.
+	  (INFO2WORDINDEX): defined.
+
+	* tool/transcode-tblgen.rb: use WORDINDEX2INFO.
+
+	* transcode.c: use INFO2WORDINDEX.
+
+Wed Sep  3 21:19:51 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* golf_prelude.rb: suppress warnings when goruby -v.
+
+Wed Sep  3 21:07:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (BL_MIN_BYTE): defined.
+	  (BL_MAX_BYTE): defined.
+	  (BL_OFFSET): defined.
+	  (BL_ACTION): defined.
+	  (transcode_restartable0): use BL_MIN_BYTE, BL_MAX_BYTE and
+	  BL_ACTION.
+
+Wed Sep  3 20:58:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (BYTE_ADDR): defined.
+	  (WORD_ADDR): ditto.
+	  (BL_BASE): use BYTE_ADDR and WORD_ADDR.
+	  (BL_INFO): use WORD_ADDR.
+
+Wed Sep  3 20:47:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder): new field: byte_array_length and
+	  word_array_length.
+
+	* tool/transcode-tblgen.rb (transcode_generated_code): generate
+	  byte_array_length and word_array_length.
+
+Wed Sep  3 20:34:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (ArrayCode): new class.
+	  (ActionMap#gen_array_code): moved to ArrayCode.
+	  (ActionMap#numelt_array_code): ditto.
+	  (ActionMap#array_code_insert_at_last): ditto.
+	  (TRANSCODE_GENERATED_BYTES_CODE): use ArrayCode.
+	  (TRANSCODE_GENERATED_WORDS_CODE): ditto.
+
+Wed Sep  3 20:08:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/japanese.trans: new file.
+
+Wed Sep  3 20:04:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (ActionMap#gen_array_code): extracted from
+	  generate_lookup_node.
+	  (ActionMap#numelt_array_code): ditto.
+	  (ActionMap#array_code_insert_at_last): ditto.
+
+Wed Sep  3 20:01:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (parser_encoding_name): defined.
+	  (parser_tokadd_mbchar): show encoding in the message of
+	  "invalid multibyte char" error.
+
+Wed Sep  3 19:28:04 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_method_missing): C99.
+
+Wed Sep  3 19:18:12 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_thread.rb: fix test.
+	   [ruby-dev:35960]
+
+Wed Sep  3 17:48:32 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/make_transdb.rb: check $(srcdir)/enc/trans before
+	  enc/trans.
+
+	* enc/trans/make_transdb.rb: keep names_t.
+
+Wed Sep  3 16:54:46 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/signal.h: removed.
+
+	* common.mk, class.c, eval.c, eval_intern.h, file.c, gc.c, hash.c,
+	  io.c, process.c, signal.c: vm_core.h: ditto.
+	  Some unused external global variables are also removed.
+	 (rb_prohibit_interrupt, rb_trap_immediate, rb_trap_pending,
+	  rb_thread_critical)
+
+	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_x509store.c,
+	  ext/readline/readline.c, ext/socket/depend,
+	  ext/socket/socket.c: ditto.
+
+Wed Sep  3 00:23:25 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (vm_method_missing): copy arguments to allocated
+	  memory from machine stack.  [ruby-dev:36064]
+
+Tue Sep  2 22:20:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (base_element): removed.
+	  (BYTE_LOOKUP): removed.
+	  (BYTE_LOOKUP_BASE): don't cast.
+	  (BYTE_LOOKUP_INFO): ditto.
+	  (PType): unsigned int, instead of uintptr_t.
+	  (rb_transcoding): change type of next_field, conv_tree_start and
+	  word_array.
+
+	* tool/transcode-tblgen.rb: generate word_array as array of unsigned
+	  int.
+
+	* transcode.c (transcode_restartable0): follow the above type change.
+
+Tue Sep  2 21:22:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: add prefix for byte_array and word_array.
+
+Tue Sep  2 20:57:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/make_transdb.rb: check foo.c only if foo.trans exists.
+
+Tue Sep  2 19:19:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/make_transdb.rb: error message improved.
+
+Tue Sep  2 14:05:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/trans/utf_16_32.trans (from_UTF_8): rename from to_UTF_16BE
+	  because it was not collect.
+
+Tue Sep  2 14:00:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* enc/emacs_mule.c (svn:executable): dropped executable bit.
+
+	* enc/make_encdb.rb (svn:executable): ditto.
+
+Tue Sep  2 12:58:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (COMPILERFLAG): new compiler flag to compile
+	  enc/trans/japanese*.c.
+
+Tue Sep  2 12:37:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/japanese_euc.trans: splitted from japanese.trans to avoid
+	  compiler limitation.  reported by usa.
+
+	* enc/trans/japanese_sjis.trans: ditto.
+
+Tue Sep  2 12:31:24 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (miniruby): new target.
+
+Tue Sep  2 11:47:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (struct load_arg): data is now st_table.
+
+	* marshal.c (mark_load_arg): marks data and compat_tbl.
+
+	* marshal.c (r_object0): no need to check if reentered.
+
+	* marshal.c (marshal_load): make the wrapper with mark_load_arg.
+
+Tue Sep  2 10:49:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (gettimeofday): easier calculation. use the definition
+	  of the Gregorian calendar.
+
+Tue Sep  2 10:33:12 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (distclean-golf): moved golf_prelude.c here from
+	    distclean-local.
+	  (GOLFPRELUDE): added.
+	  (distclean-local): moved golf_prelude.c into distclean-golf.
+
+Tue Sep  2 10:09:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (gettimeofday): calc tv_sec and tv_usec from system
+	  time by myself. [ruby-dev:36084]
+
+Tue Sep  2 04:00:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (o3): prevent sign extension on 64bit environment.
+	  (o4): ditto.
+
+Tue Sep  2 03:26:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: comment removed in generated code.
+
+Tue Sep  2 03:16:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: define TRANSCODE_TABLE_INFO in generated
+	  code.  use it in rb_transcoder.
+
+	* enc/trans/newline.trans: use TRANSCODE_TABLE_INFO.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+Tue Sep  2 03:04:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: record infos and BYTE_LOOKUPs as index of
+	  word_array to avoid relocation.
+
+	* transcode.c (transcode_restartable0): add word_array to get infos
+	  and BYTE_LOOKUPs.
+
+	* transcode_data.h (BYTE_LOOKUP_INFO): change return type to
+	  uintptr_t.
+
+Tue Sep  2 02:48:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: don't need to cast offsets array.
+
+Tue Sep  2 02:36:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: record offsets array as index of
+	  byte_array to avoid relocation.
+
+	* transcode.c (transcode_restartable0): add byte_array to get offsets
+	  array.
+
+	* transcode_data.h (BYTE_LOOKUP_BASE): change return type to
+	  uintptr_t.
+	  (rb_transcoder): add fields: byte_array, word_array and word_size.
+
+	* enc/trans/newline.trans: follow rb_transcoder change.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+Tue Sep  2 02:05:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: make infos arrays and BYTE_LOOKUPs into
+	  single array.
+
+Tue Sep  2 01:47:44 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (clean-golf): added.
+	  (distclean-golf): added.
+	  (realclean-golf): added.
+	  (clean): added clean-golf.
+	  (distclean): added distclean-golf.
+	  (realclean): added realclean-golf.
+
+Tue Sep  2 01:31:45 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (realclean-local): added newline.c.
+
+Tue Sep  2 01:19:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (BYTE_LOOKUP): change to uintptr_t array.
+	  (BYTE_LOOKUP_BASE): follow the type change.
+	  (BYTE_LOOKUP_INFO): ditto.
+	  (PType): ditto.
+	  (rb_transcoding): ditto.
+
+	* tool/transcode-tblgen.rb: follow the type change.
+
+	* transcode.c: ditto.
+
+	* enc/trans/newline.trans: ditto.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+Mon Sep  1 23:32:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (BYTE_LOOKUP_BASE): abstract accessor for
+	  BYTE_LOOKUP.
+	  (BYTE_LOOKUP_INFO): ditto.
+
+	* transcode.c (transcode_restartable0): use BYTE_LOOKUP_BASE and
+	  BYTE_LOOKUP_INFO.
+
+Mon Sep  1 23:14:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: gather infos arrays and BYTE_LOOKUPs.
+
+Mon Sep  1 22:42:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/mkmf.rb (distclean): added RM_RF conftest.dSYM.
+	  Fixes distclean-ext problem on Mac OS X.
+	  (RM_RF): added.
+
+Mon Sep  1 22:37:06 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/rexml/document.rb: limit entity expansion.  Thanks, Luka
+	  Treiber, Mitja Kolsek, and Michael Koziarski.
+
+	* lib/rexml/entity.rb: ditto.
+
+	* test/rexml/test_document.rb: ditto.
+
+Mon Sep  1 22:20:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: make offsets arrays into single array.
+
+Mon Sep  1 21:46:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: gather offsets arrays at top.
+
+Mon Sep  1 21:09:04 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ./: removed rubyspec from svn:ignore subversion property.
+	  rubyspec directory is no longer used.
+
+	* spec: added mspec and rubyspec to svn:ignore.
+
+Mon Sep  1 19:37:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: ValidEncoding['eucJP-ms'] defined.
+	  "\xA2\xAF".encode("utf-8", "eucJP-ms") should raise
+	  Encoding::ConversionUndefined, not Encoding::InvalidByteSequence.
+
+Mon Sep  1 18:27:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (gettimeofday): shouldn't use mktime(3) because it's
+	  buggy about handling summer time.
+	  reported by Yoshikawa <yoshixool AT gmail.com> at [ruby-dev:36071]
+
+Mon Sep  1 17:07:23 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/euc_jp.c (euc-jp-ms): euc-jp-ms is not an alias of EUC-JP
+	  but eucJP-ms.
+
+	* enc/trans/japanese.trans (eucJP-ms): eucJP-ms is the correct
+	  name of the encoding in Ruby. [ruby-dev:36070]
+
+Mon Sep  1 16:48:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/md5/md5init.c (md5), ext/digest/rmd160/rmd160init.c
+	  (rmd160) ext/digest/sha1/sha1init.c (sha1),
+	  ext/digest/sha2/sha2init.c (sha256, sha384, sha512): constified.
+
+Mon Sep  1 15:15:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.trans: fix mapping priority.
+	  IBM extended is prior than NEC selected IBM.
+
+Mon Sep  1 14:44:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/transcode-tblgen.rb (transcode_compile_tree): use the first
+	  mapping when some mappings are given for a character.
+	  [ruby-dev:36068]
+
+	* tool/transcode-tblgen.rb: expandtab.
+
+Mon Sep  1 14:40:18 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* README.EXT (Appendix A): fixed the name of class
+	  Enumerator. Enumerable::Enumerator was renamed just
+	  Enumerator at revision 18564.
+
+	* README.EXT (Appendix A): ditto.
+
+Mon Sep  1 14:37:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/transcode-tblgen.rb: set ERB source filename for error message.
+
+Mon Sep  1 14:37:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend: transdb.c may not present.
+
+Mon Sep  1 14:25:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.trans: fix Ruby 1.8 compatibility.
+
+	* enc/trans/japanese.trans: fix mapping priority. [ruby-dev:36068]
+
+Mon Sep  1 14:24:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_transcode.rb (test_windows_31j): added.
+
+Mon Sep  1 14:00:04 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* README.EXT (Data-types): fixed for current status.
+	  (Manipulating Ruby data): mentioned some more functions.
+	  (Class/module definition): ditto.
+	  (Global variables shared between C and Ruby):
+	    fixed prototypes for the getter/setter's of global variables.
+	  (Appendix A): mentioned some more files.
+
+	* README.EXT.ja: ditto.
+
+Mon Sep  1 11:31:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (copy_stream, fu_copy_stream0, copy_file): use
+	  IO.copy_stream to get rid of extraneous conversion.
+
+Mon Sep  1 02:55:15 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* strftime.c (rb_strftime): calc timezone offset by myself if system
+	  doesn't provide timezone info.
+
+Mon Sep  1 02:48:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: change "illegal" to "invalid".
+
+Mon Sep  1 02:31:16 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (transcode_generated_code): defined for
+	  generating table at once.
+	  (transcode_tblgen): returns an empty string.
+	  (transcode_generate_node): ditto.
+
+	* enc/trans/newline.trans: use transcode_generated_code.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/single_byte.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+	* enc/trans/japanese.trans: ditto.
+
+	* enc/trans/korean.trans: ditto.
+
+Mon Sep  1 02:10:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (citrus_decode_mapsrc): print logging
+	  message on STDERR.
+
+Mon Sep  1 01:24:09 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/eucjp-tbl.rb: replace by previous Citrus maps.
+
+	* enc/trans/sjis-tbl.rb: ditto.
+
+Mon Sep  1 01:18:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/transcode-tblgen.rb: add table generator from Citrus maps.
+
+	* enc/trans/japanese.trans: use Citrus maps.
+
+	* enc/trans/CP: add maps from Citrus.
+
+	* enc/trans/JIS: ditto.
+
+	* test/ruby/test_transcode.rb: Shift_JIS and EUC-JP doesn't support
+	  IBM extended characters.
+
+Mon Sep  1 00:19:45 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (docs): removed a useless make target.
+	  tool/makedoc.rb was removed at revision 13919.
+
+Sun Aug 31 20:49:42 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (numeric_abs2): new.
+
+Sun Aug 31 18:22:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_devel?): checks if the compiler works.
+
+Sun Aug 31 18:02:41 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Temporarily uses git://github.com/yugui/rubyspec.git
+	  until specs for 1.9 is merged into
+	  git://github.com/rubyspec/rubyspec.git.
+
+Sun Aug 31 18:06:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode.c): set source_encoding and
+	  destination_encoding as encoding object.
+	  (ecerr_source_encoding): new method.
+	  (ecerr_destination_encoding): ditto.
+
+Sun Aug 31 17:58:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (Logging.log_open): opens in binary mode to get rid of
+	  extra CR.
+
+	* lib/mkmf.rb (try_func, try_var, have_struct_member),
+	  (scalar_ptr_type?, scalar_type?): use MAIN_DOES_NOTHING.
+
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): defaults to ordinary main.
+
+	* win32/Makefile.sub (config): for MAIN_DOES_NOTHING for wince.
+
+Sun Aug 31 17:30:35 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/README (How to run): added.
+
+Sun Aug 31 17:28:25 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/default.mspec (config): added.
+
+	* spec/default.mspec (target): replaced the built ruby
+	  to runruby.rb.
+	  Improved $LOAD_PATH on running specs.
+
+	* spec/default.mspec (flags): ditto.
+
+Sun Aug 31 17:16:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_econv_exception): rename instance variable names
+	  for storing encoding names.
+	  (ecerr_source_encoding_name): method renamed.
+	  (ecerr_destination_encoding_name): ditto.
+
+Sun Aug 31 16:57:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_putback): associate encoding to the result.
+
+Sun Aug 31 16:43:56 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/intern.h: rename RB_UBF_DFL to
+	  RUBY_UBF_IO and RUBY_UBF_PROCESS.
+	  Because there is no default (universal) unblocking function.
+
+	* ext/socket/socket.c, file.c, io.c, process.c, thread.c: ditto.
+
+Sun Aug 31 16:42:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_insert_output): raise ArgumentError on failure.
+
+Sun Aug 31 16:39:17 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_thread.rb: add a test.
+
+Sun Aug 31 16:34:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/single_byte.trans (us_ascii_map): don't define 8bit bytes.
+
+Sun Aug 31 14:27:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_last_error): new method.
+
+Sun Aug 31 14:17:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_convert): make two arguments,
+	  destination_byteoffset and destination_bytesize, optional.
+
+Sun Aug 31 14:12:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_econv_exception): error message simplified.
+
+Sun Aug 31 13:47:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/coverage/coverage.c (rb_mCoverage): removed unneeded static variable.
+
+	* ext/socket/socket.c (unix_recv_io): ditto.
+
+	* ext/socket/socket.c (mConst): ditto.
+
+Sun Aug 31 13:45:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for
+	  initialization of r18168.
+
+Sun Aug 31 13:42:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/eventids2.c (ripper_init_eventids2): use rb_intern_const.
+
+	* ext/ripper/tools/generate.rb (generate_eventids1): ditto.
+
+	* ext/ripper/tools/generate.rb (generate_eventids2_table): ditto.
+
+Sun Aug 31 12:56:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/mkcallback.rb (rb_dl_init_callbacks): fix indent.
+
+Sun Aug 31 11:39:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/strscan/strscan.c (strscan_do_scan): fix usecnt decrement.
+
+Sun Aug 31 04:38:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_putback): make max argument optional.
+
+Sun Aug 31 04:35:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_putback): putback from last byte.
+
+Sun Aug 31 04:27:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_putback): renamed from econv_primitive_putback.
+
+Sun Aug 31 04:22:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_insert_output): renamed from
+	  econv_primitive_insert_output.
+
+Sun Aug 31 04:20:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_econv.rb: follow econv_primitive_errinfo change.
+
+Sun Aug 31 03:44:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_errinfo): 5th element (partial_input)
+	  removed from result.
+
+Sun Aug 31 01:53:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/mkcallback.rb: split callback.h to callback-[0-9].c to reduce
+	  memory consumption on compilation.  [ruby-dev:31898]
+
+	* ext/dl/depend: add dependency for callback-[0-9].[co].
+
+Sun Aug 31 01:27:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/mkcallback.rb (foreach_proc_entry): extracted.
+	  (gencallback): ditto.
+	  (gen_push_proc_ary): ditto.
+	  (gen_push_addr_ary): ditto.
+
+Sat Aug 30 23:51:01 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_tuplebag.rb (test_has_expires_eh): fix failures
+	  [ruby-dev:35937].
+
+Sat Aug 30 23:38:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/test/test_import.rb: fix character code.
+
+	* ext/dl/test/test_func.rb: ditto.
+
+Sat Aug 30 22:23:31 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: added a static variable for nurat_to_f.
+
+Sat Aug 30 20:05:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_open, rb_w32_read, rb_w32_write): fallback to
+	  MSVCRT if text mode is specified. this case will not be used from
+	  ruby itself.
+
+Sat Aug 30 19:49:38 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): EOF is not error.
+	  ref [ruby-dev:36050]
+
+Sat Aug 30 18:17:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (struct token_info): constified.
+
+	* parse.y (token_info_get_column, token_info_has_nonspaces),
+	  (token_info_push, token_info_pop): constified.
+
+Sat Aug 30 15:43:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/openssl/ossl_config.c (Init_ossl_config): memory leak fixed.
+	  a patch <shinichiro.hamaji at gmail.com> in [ruby-dev:35880].
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
+
+	* ext/strscan/strscan.c (strscan_do_scan): ditto.
+
+Sat Aug 30 14:58:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): fix for
+	  initialization of r18168.
+
+Sat Aug 30 14:47:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/mkcallback.rb: fix continuation line detection.
+
+Sat Aug 30 14:39:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/mkcallback.rb (rb_dl_init_callbacks): avoid GC problem which
+	  is caused by 'GC.stress=true; require "dl"'.
+
+Sat Aug 30 11:54:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (token_info_push): -w warns indentation level mismatch.
+	  based on a patch from Yukina Yamano presented at RubyKaigi'07.
+	  See <http://jp.rubyist.net/RubyKaigi2007/Log0609-LT06.html> and
+	  <http://www.logic-junction.com/products/rubyend.html> (Japanese).
+
+Sat Aug 30 10:46:44 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/iconv/iconv.c: remove include pragma for "ruby/intern.h".
+
+Sat Aug 30 10:43:03 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: remove include pragma for "ruby/intern.h".
+
+Sat Aug 30 10:41:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake.rb (Rake::Application#help): fix for OPTIONAL_ARGUMENT and
+	  multiple short options.  [ruby-dev:36051]
+
+Sat Aug 30 08:59:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_file_s_absolute_path),
+	  (rb_file_absolute_path): prototyped.
+
+Sat Aug 30 08:09:36 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_compatible_p): use TYPE not BUILTIN_TYPE.
+	  [ruby-dev:36048]
+
+Sat Aug 30 07:48:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_compatible_p): add SPECIAL_CONST_P check.
+	  [ruby-dev:36048]
+
+	* test/ruby/test_m17n.rb (test_compatible): fix test.
+
+Sat Aug 30 02:48:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_freeze): update rdoc to mention RuntimeError
+	  (not TypeError any longer) would be raised.  [ruby-dev:35982]
+
+Sat Aug 30 01:55:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivmod): remove redundant code.  a patch from
+	  TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in [ruby-dev:36044].
+
+Sat Aug 30 01:37:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#initialize): remove unused constants.  a patch
+	  from Takeyuki Fujioka in [ruby-dev:36046].
+
+Fri Aug 29 22:29:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c ({nucomp,numeric}_rect): new.
+
+	* complex.c: added some aliases
+	  (::rectangular, ::rect, #rectangular, #rect, #phase,
+	  #magnitude).
+
+	* complex.c (string_to_c_internal): should not strip any null
+	  bytes.
+
+	* rational.c (string_to_r_internal): ditto.
+
+	* rational.c (i_gcd): reverted to nurat 0.0.2's one.
+
+	* numeric.c: added an alias (#magnitude).
+
+	* bignum.c: ditto.
+
+	* test/ruby/test_complex.rb: added assertions.
+
+	* test/ruby/test_rational.rb: ditto.
+
+Fri Aug 29 19:46:02 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, include/ruby/ruby.h: rename T_DEFERRED to T_ZOMBIE.
+
+Fri Aug 29 18:22:27 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_compatible_p): raise TypeError when argument is not
+	  String nor Regexp.
+
+Fri Aug 29 18:20:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_index_m): only regexp uses byte offset.
+
+	* string.c (rb_str_rindex_m): ditto.
+
+Fri Aug 29 16:48:34 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method): copy arguments to allocated
+	  memory from machine stack.  [ruby-dev:36028]
+
+	* KNOWNBUGS.rb, bootstraptest/test_method.rb: move fixed test.
+
+Fri Aug 29 12:19:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for
+	  initialization of r18168.
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): ditto.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
+
+Fri Aug 29 11:04:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): ASCII compatible string and US-ASCII
+	  regexp is compatible. [ruby-dev:36033]
+
+	* string.c (rb_str_index_m): second argument is position of character.
+	  by usa. [ruby-dev:36033]
+
+	* string.c (rb_str_rindex_m): ditto.
+
+Fri Aug 29 04:47:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read, rb_w32_write): more accurate handling
+	  of wait result.
+
+Fri Aug 29 02:59:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_finish): new method.
+
+Fri Aug 29 02:45:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_convert): new method.
+
+Fri Aug 29 02:38:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_convert): accept nil as
+	  destination_bytesize for unlimited destination size.
+
+Fri Aug 29 02:11:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_convert): accept nil as input for empty
+	  input.
+
+Fri Aug 29 02:03:56 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): supported %s and %P.
+
+	* time.c (time_strftime): ditto.
+
+	* test/ruby/test_time.rb (test_strftime): ditto.
+
+Fri Aug 29 01:57:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (sym_invalid_byte_sequence): new variable.
+	  (sym_undefined_conversion): ditto.
+	  (sym_destination_buffer_full): ditto.
+	  (sym_source_buffer_empty): ditto.
+	  (sym_finished): ditto.
+	  (sym_output_followed_by_input): ditto.
+	  (sym_incomplete_input): ditto.
+	  (econv_result_to_symbol): use above variables.
+	  (Init_transcode): initialize above variables.
+
+Fri Aug 29 00:53:40 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): fixed a bug of padding.
+
+	* test/ruby/test_time.rb: ditto.
+
+Fri Aug 29 00:19:54 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (set_pioinfo_extra): use MSVCRT's open() and close().
+
+Fri Aug 29 00:03:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* file.c (file_expand_path): check invalid access.
+
+Thu Aug 28 23:55:50 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): Time.mktime(2000).strftime("%-S") should
+	  return "0", not "".
+
+	* test/ruby/test_time.rb: ditto.
+
+Thu Aug 28 23:55:22 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_time.rb: suppress warning during test.
+
+Thu Aug 28 23:50:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_time.rb (test_strftime): make test for %a independent
+	  from local timezone.  [ruby-dev:35992]
+
+Thu Aug 28 23:39:49 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_str_shared_replace): remove corrupt noembed string
+	  which causes SEGV.  [ruby-dev:35989]
+
+Thu Aug 28 23:36:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: dependency updated.
+
+Thu Aug 28 23:28:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* KNOWNBUGS.rb: add a test.  see [ruby-dev:36028]
+
+Thu Aug 28 21:43:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_open): overlapped file
+	  I/O support.
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_pipe): overlapped pipe
+	  I/O support.
+
+	* win32/win32.c (rb_w32_read, rb_w32_write): overlapped I/O support to
+	  enable canceling I/O.
+
+	* thread_win32.c (ubf_handle): remove workaround.
+
+Thu Aug 28 20:22:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_yield_setup_args): object with to_ary should
+	  behave like array.  a patch from Yusuke Endoh  <mame at tsg.ne.jp>
+	  in [ruby-dev:35988].  [ruby-dev:35977]
+
+	* object.c (convert_type): call less rb_intern() less frequently
+	  by using cache structure.
+
+	* vm_method.c (rb_method_node): fail earlier if no method found.
+
+Thu Aug 28 19:04:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bootstraptest/test_io.rb: no need to create real file.
+
+Thu Aug 28 09:26:53 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/cgi/test_cgi_multipart.rb: add test for multipart.
+	  Patch by Takeyuki Fujioka. [ruby-dev:36014]
+	  From CGIAlt http://cgialt.rubyforge.org/
+
+Thu Aug 28 09:22:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/cgi/test_cgi_modruby.rb: add test for mod_ruby adaptor.
+	  Patch by Takeyuki Fujioka. [ruby-dev:36013]
+	  From CGIAlt http://cgialt.rubyforge.org/
+
+Thu Aug 28 09:17:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/cgi/test_cgi_header.rb: add test for CGI::Header.
+	  Patch by Takeyuki Fujioka. [ruby-dev:36010] [ruby-dev:36011]
+	  From CGIAlt http://cgialt.rubyforge.org/
+
+Thu Aug 28 02:16:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): refcnt field removed.
+	  (MakeOpenFile): refcnt initialization removed.
+
+	* io.c (rb_io_fptr_finalize): don't check refcnt.
+	  (rb_io_close_read): don't use refcnt.
+
+Thu Aug 28 00:07:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_initialize): don't accept IO object.  [ruby-dev:35895]
+
+Wed Aug 27 23:28:51 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): WIN32OLE#[] and WIN32OLE#[]=
+	  accepts number argument.
+
+	* test/win32ole/test_win32ole.rb: ditto.
+
+Wed Aug 27 14:45:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/cgi/test_cgi_core.rb: add core test.
+	  Patch by Takeyuki Fujioka. [ruby-dev:36001] [ruby-dev:36002]
+	  From CGIAlt http://cgialt.rubyforge.org/
+
+Wed Aug 27 10:34:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie): remove delegate.
+	  Patch by Takeyuki Fujioka. [ruby-dev:35995]
+
+	* test/cgi/test_cgi_cookie.rb: added for above.
+	  Patch by Takeyuki Fujioka. [ruby-dev:35996]
+	  From CGIAlt http://cgialt.rubyforge.org/
+
+Wed Aug 27 01:13:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_loop): simplified.
+
+Wed Aug 27 01:03:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_result_t): enumeration constant:
+	  econv_incomplete_input.
+
+	* io.c (finish_writeconv): check econv_incomplete_input.
+
+	* transcode.c (transcode_restartable0): return econv_incomplete_input
+	  for unexpected end of source buffer.
+	  (trans_sweep): check econv_incomplete_input.
+	  (rb_trans_conv): ditto.
+	  (rb_econv_convert0): ditto.
+	  (rb_econv_convert): ditto.
+	  (transcode_loop): ditto.
+	  (make_econv_exception): change message for econv_incomplete_input.
+	  (econv_result_to_symbol): return :incomplete_input for
+	  econv_incomplete_input.
+	  (ecerr_incomplete_input): new method.
+
+Wed Aug 27 00:05:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): rename crbuf to cbuf.
+
+	* io.c: follow the renaming.
+
+Tue Aug 26 23:52:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_elem_t): move to transcode.c
+	  (rb_econv_t): defined as an incomplete type.
+
+	* transcode.c (rb_econv_elem_t): moved from encoding.h.
+	  (rb_econv_t): complete type defined.
+
+Tue Aug 26 22:44:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (time_asctime): workaround for MSVCRT's bug.
+	  based on a patch from wanabe <s.wanabe AT gmail.com> at
+	  [ruby-dev:35831] and a suggestion by KIMURA Koichi
+	  <kbk AT kt.rim.or.jp> at [ruby-dev:35832]
+	  fixed [ruby-dev:35555]
+
+Tue Aug 26 21:53:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): disable newline conversion for ASCII
+	  incompatible encodings.
+	  (str_transcode0): don't need disable newline conversion here.
+
+Tue Aug 26 21:44:39 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_binmode): binmode is effective only once.
+
+Tue Aug 26 19:43:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_s_expand_path): new class method for class File.
+
+	* file.c (file_expand_path): add absolute_path handling (no ~user
+	  expansion).  [ruby-core:18319]
+
+Tue Aug 26 19:27:54 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/ruby/test_enum.rb (TestEnumerable#test_each_with_object):
+	  Add a test for Enumerable#each_with_object.
+
+Tue Aug 26 19:25:44 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/ruby/test_enumerator.rb (TestEnumerator#test_with_object):
+	  Add (back) the test for Enumerator#with_object.
+
+Tue Aug 26 16:16:43 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/cgi/test_cgi_tag_helper.rb: add more tests for html3.
+	  Patch by Takeyuki Fujioka. [ruby-dev:35975]
+	  From CGIAlt http://cgialt.rubyforge.org/
+
+Tue Aug 26 14:43:10 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c: Activate Enumerator#with_object and add
+	  Enumerable#each_with_object. [experimental]
+
+Tue Aug 26 14:38:32 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_initialize),
+	  test/ruby/test_enumerator.rb: Add an ability to generate an
+	  enumerator from a block. [experimental] [ruby-dev:35903]
+
+Tue Aug 26 13:25:25 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb: added test_euc_jp
+	  (contributed by Yoshihiro Kambayashi)
+
+Tue Aug 26 11:54:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/cgi/test_cgi_tag_helper.rb: added by Takeyuki Fujioka.
+	  [ruby-dev:35971]
+
+Tue Aug 26 11:33:30 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi.rb (nOE_element_def): fix error when cascade methods which
+	  don't have arguments. Patch by Takeyuki Fujioka. [ruby-dev:35964]
+
+	* lib/cgi.rb (blockquote): String#collect (this depends on
+	  String#each) is no longer exists.
+	  Patch by Takeyuki Fujioka. [ruby-dev:35946]
+
+	* lib/cgi.rb (blockquote): ditto.
+
+Tue Aug 26 03:06:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (make_writeconv): copy invalid/undef flags.
+
+Tue Aug 26 02:47:08 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (dist): tool/make-snapshot is executable.
+
+	* tool/make-snapshot (package): supported release numbers 1.9.0-x.
+
+Tue Aug 26 02:43:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): new field: writeconv_pre_opts.
+
+	* io.c (make_writeconv): initialize writeconv_pre_opts.
+	  (io_fwrite): use writeconv_pre_opts.
+
+Tue Aug 26 01:48:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: test _WIN32 for CRLF platform.  (cygwin defines O_BINARY.)
+
+Tue Aug 26 01:29:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: force CRLF handling if RUBY_TEST_CRLF_ENVIRONMENT is defined.
+	  This is only for testing.
+
+Tue Aug 26 01:26:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (str_transcode0): disable newline conversion for ASCII
+	  incompatible encoding.
+
+Tue Aug 26 00:55:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (str_transcode0): don't short cut for newline conversion.
+
+Tue Aug 26 00:36:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_fwrite): add TEXTMODE_NEWLINE_ENCODER to option for
+	  rb_str_transcode.
+
+Tue Aug 26 00:24:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_econv_exception): show readagain part for invalid
+	  byte sequence exception.  store the part as an instance variable.
+	  (ecerr_readagain_bytes): new method to access the readagain part.
+
+Tue Aug 26 00:02:49 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpMult): fix double free.
+
+Mon Aug 25 23:59:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): make last_tc NULL if there are only
+	  additional transcoders.
+	  (econv_description): extracted from rb_econv_open_exc.
+	  (rb_econv_open_exc): use econv_description.
+	  (econv_inspect): use econv_description.
+
+Mon Aug 25 23:56:42 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32.c (init_stdhandle): set binmode.
+
+Mon Aug 25 23:38:17 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb(strftime): %[LN] can print with given
+	  arbitrary precision.
+
+	* lib/date/format.rb(strftime): optional flags and filed width
+	  should also affect %[nt].
+
+Mon Aug 25 23:01:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (defined_expr): default defined? should return
+	  "expression" without evaluating the expression.  [ruby-dev:35967]
+
+Mon Aug 25 22:46:01 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_thread.rb (test_status_and_stop_p): reduce the risk
+	  of race condition.
+
+Mon Aug 25 22:39:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/irb/extend-command.rb (def_extend_command): check number of
+	  arguments.  [ruby-dev:35074]
+
+	* lib/irb/ext/multi-irb.rb (search): check if a corresponding job is
+	  found.  [ruby-dev:35074]
+
+Mon Aug 25 22:29:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_io.rb (test_dup): fix typo.  see [ruby-dev:35958]
+
+Mon Aug 25 22:02:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open_by_transcoder_entries): initialize
+	  last_error.  num_trans may be zero.
+	  (rb_econv_convert0): num_trans may be zero.
+	  (rb_econv_putbackable): ditto.
+	  (rb_econv_putback): ditto.
+	  (rb_econv_convert): input_ptr and output_ptr may be NULL.
+
+Mon Aug 25 19:05:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (defined_expr): should handle NODE_{AND,OR} as
+	  "expression".  [ruby-dev:35951]
+
+Mon Aug 25 17:36:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_io_ungetbyte): added prototype.
+
+	* io.c (rb_io_gets): use rb_io_getline_1 for unget buffer.
+
+	* ruby.c (load_file): use rb_io_ungetbyte.
+
+	* transcode.c (rb_econv_substr_append): fix for buffer overrun.
+
+	* win32/enc-setup.mak (BUILTIN_TRANSOBJS): added.
+
+Mon Aug 25 14:22:21 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* parse.y (YYSTYPE): struct RVarmap has been no longer
+	  defined.
+	  see also r11717 by matz.
+
+Mon Aug 25 10:42:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_econv_open_exc): constified.
+
+Mon Aug 25 07:10:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/emacs_mule.c: fix ctype.
+
+Mon Aug 25 00:52:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (BUILTIN_TRANSSRCS): defined.
+	  (BUILTIN_TRANSOBJS): defined.
+
+	* enc/Makefile.in (BUILTIN_TRANSES): defined.
+
+	* enc/make_encmake.rb (BUILTIN_TRANSES): defined.
+
+	* enc/depend: don't generate rules for builtin transcoders.
+
+	* common.mk (COMMONOBJS): add BUILTIN_TRANSOBJS.
+	  (enc.mk): pass BUILTIN_TRANSOBJS.
+	  (newline.c): new rule.
+	  (newline.$(OBJEXT)): new rule.
+	  (srcs): newline.c added.
+
+	* Makefile.in (BUILTIN_TRANSSRCS): defined.
+	  (BUILTIN_TRANSOBJS): defined.
+
+	* transcode.c (Init_transcode): call Init_newline.
+
+Mon Aug 25 00:11:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (declare_transcoder): arguments order changed.
+	  (rb_declare_transcoder): call declare_transcoder just once.
+
+Sun Aug 24 19:48:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_t): use rb_econv_option_t.
+
+	* transcode.c: follow the rb_econv_t change.
+
+Sun Aug 24 19:40:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_init_copy): copy encs.
+
+Sun Aug 24 19:17:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_open): add an argument: vperm.
+	  (open_key_args): call rb_io_open with perm.
+
+Sun Aug 24 19:11:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (sym_invalid): removed.
+	  (sym_undef): removed.
+	  (sym_ignore): removed.
+	  (sym_replace): removed.
+
+Sun Aug 24 19:07:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_reopen): initialize fptr->encs.opts.
+
+Sun Aug 24 18:37:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_s_pipe): accept optional hash.
+	  (rb_io_set_encoding): ditto.
+	  (rb_io_extract_modeenc): use rb_econv_opts to initialize
+	  ecopts.
+	  (rb_file_open_generic): ditto.
+	  (rb_file_open_internal): ditto.
+	  (io_encoding_set): new argument: opt.
+	  (argf_set_encoding): copy fptr->encs.opts to argf_ecopts.
+
+	* transcode.c (rb_econv_opts): accept Qnil for initialization.
+
+Sun Aug 24 18:10:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_enc_t): add opts field.
+	  (FMODE_INVALID_MASK): removed.
+	  (FMODE_INVALID_IGNORE): ditto.
+	  (FMODE_INVALID_REPLACE): ditto.
+	  (FMODE_UNDEF_MASK): ditto.
+	  (FMODE_UNDEF_IGNORE): ditto.
+	  (FMODE_UNDEF_REPLACE): ditto.
+	  (MakeOpenFile): initialize the opts field.
+
+	* io.c (make_writeconv): use the opts field.
+	  (io_fwrite): ditto.
+	  (make_readconv): ditto.
+	  (argf_ecopts): new macro.
+	  (rb_io_extract_modeenc): fill the opts field.
+	  (argf_next_argv): ditto.
+	  (rb_file_open_generic): initialize the opts field.
+	  (rb_file_open_internal): ditto.
+	  (io_encoding_set): ditto.
+	  (argf_set_encoding): ditto.
+
+Sun Aug 24 18:02:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (struct argf): use struct rb_io_enc_t.
+	  (argf_enc): follow the struct argf change.
+	  (argf_enc2): ditto.
+
+Sun Aug 24 17:36:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_str_transcode): make 3rd argument
+	  rb_econv_option_t*.
+
+	* transcode.c (transcode_loop): take rb_econv_option_t* as a argument.
+	  (str_transcode0): ditto.
+	  (str_transcode): make rb_econv_option_t and call str_transcode0 with
+	  it.
+	  (rb_str_transcode): take rb_econv_option_t*.
+
+	* io.c (io_fwrite): follow the rb_str_transcode change.
+
+Sun Aug 24 16:47:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): make enc and enc2 as struct
+	  rb_io_enc_t;
+
+	* io.c: follow the structure change.
+	  (convconfig_t): defined by rb_io_enc_t.
+
+Sun Aug 24 16:19:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_opts): declared.
+
+	* transcode.c (rb_econv_opts): defined.
+
+	* io.c (rb_io_extract_modeenc): use rb_econv_opts.
+
+Sun Aug 24 16:06:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_option_t): defined.
+	  (rb_econv_open): 3rd arg changed.
+	  (rb_econv_open_exc): ditto.
+
+	* io.c (make_writeconv): use rb_econv_option_t.
+	  (make_readconv): ditto.
+	  (rb_econv_open): take rb_econv_option_t for options.
+	  (rb_econv_open_exc): ditto.
+	  (transcode_loop): use rb_econv_option_t.
+	  (econv_init): use rb_econv_option_t.
+
+Sun Aug 24 15:43:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_substr_append): associate dst with destination
+	  encoding when dst is created.
+
+Sun Aug 24 15:21:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_str_transcode): add ecflags argument.
+
+	* transcode.c (econv_opts): extracted from str_transcode.
+	  (str_transcode_enc_args): extracted from str_transcode.
+	  (str_transcode0): extracted from str_transcode.
+	  (str_transcode): use econv_opts, str_transcode_enc_args,
+	  str_transcode0.
+	  (rb_str_transcode): call str_transcode0.
+	  (econv_primitive_insert_output): give the additional argument for
+	  rb_str_transcode.
+
+	* io.c (make_writeconv): use invalid/undef flags.
+	  (io_fwrite): ditto.
+	  (rb_scan_open_args): give the additional argument for
+	  rb_str_transcode.
+
+Sun Aug 24 13:27:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (str_transcode): check last hash only if 0 < argc.
+
+Sun Aug 24 12:22:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_substr_append): renamed from
+	  rb_econv_string.
+	  (rb_econv_str_convert): declared.
+	  (rb_econv_substr_convert): declared.
+	  (rb_econv_str_append): declared.
+
+	* io.c (io_fwrite): use rb_econv_str_convert instead of
+	  rb_econv_string.
+
+	* transcode.c (rb_econv_substr_append): renamed from rb_econv_string.
+	  (rb_econv_str_append): new function.
+	  (rb_econv_substr_convert): ditto.
+	  (rb_econv_str_convert): ditto.
+
+Sun Aug 24 12:15:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#urlencode): str[0] returns char in 1.9.
+	  Patch by Junegunn Choi [ruby-core:18368]
+
+Sun Aug 24 12:02:39 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): return NULL on error.
+
+Sun Aug 24 11:40:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_open_exc): declared.
+
+	* transcode.c (rb_eNoConverter): new exception.
+	  (rb_econv_open_exc): new function.
+	  (transcode_loop): use rb_econv_open_exc.
+
+	* io.c (make_writeconv): use rb_econv_open_exc.
+	  (make_readconv): ditto.
+
+Sun Aug 24 11:26:54 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::unescapeHTML): consider ISO-8859-1.
+	  [ruby-dev:35936]
+
+Sun Aug 24 10:55:00 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/emacs_mule.c: support Emacs/Mule internal encoding.
+
+Sun Aug 24 08:03:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (daylight, timezone): not provided as dllexport on cygwin,
+	  right now.
+
+Sun Aug 24 06:39:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::unescapeHTML): more encoding sensible unescaping.
+	  [ruby-dev:35936]
+
+Sun Aug 24 04:23:19 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_compatible_p): raise TypeError when argument is Encoding.
+
+Sat Aug 23 23:25:47 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#out): remove auto encoding conversion and set
+	  LANGUAGE. [ruby-dev:35922]
+
+Sat Aug 23 20:01:29 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_process.rb (TestProcess#test_rlimit_value):
+	  add Errno::EINVAL. [ruby-dev:35900]
+
+Sat Aug 23 18:29:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_scan_open_args): use pop_last_hash.
+
+Sat Aug 23 16:59:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (FMODE_INVALID_MASK): defined.
+	  (FMODE_INVALID_IGNORE): defined.
+	  (FMODE_INVALID_REPLACE): defined.
+	  (FMODE_UNDEF_MASK): defined.
+	  (FMODE_UNDEF_IGNORE): defined.
+	  (FMODE_UNDEF_REPLACE): defined.
+
+	* io.c (sym_invalid): defined.
+	  (sym_undef): defined.
+	  (sym_ignore): defined.
+	  (sym_replace): defined.
+	  (make_readconv): specify ECONV_INVALID_* and ECONV_UNDEF_* if
+	  FMODE_INVALID_* and FMODE_UNDEF_* is set.
+	  (rb_io_extract_modeenc): check {:invalid, :undef} => {:replace,
+	  :ignore} for FMODE_INVALID_* and FMODE_UNDEF_*.
+
+Sat Aug 23 17:06:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime): support more flags.
+
+Sat Aug 23 15:14:10 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_opts.h: enable "OPT_TRACE_INSTRUCTION" on default.
+
+Sat Aug 23 14:59:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_INVALID_MASK): defined.
+	  (ECONV_INVALID_IGNORE): defined.
+	  (ECONV_INVALID_REPLACE): defined.
+	  (ECONV_UNDEF_MASK): defined.
+	  (ECONV_UNDEF_IGNORE): defined.
+	  (ECONV_UNDEF_REPLACE): defined.
+
+	* transcode.c (INVALID_IGNORE): removed.
+	  (INVALID_REPLACE): removed.
+	  (UNDEF_IGNORE): removed.
+	  (UNDEF_REPLACE): removed.
+	  (rb_econv_convert0): renamed from rb_econv_convert.
+	  (rb_econv_convert): defined to call rb_econv_convert0 with
+	  replace/ignore behavior moved from transcode_loop.
+	  (transcode_loop): replace/ignore behavior removed.
+
+Sat Aug 23 11:23:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_extract_modeenc): check :textmode and :binmode in option
+	  hash.
+
+Sat Aug 23 10:48:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (pty_getpty): follow rb_io_t's path -> pathv change.
+
+Sat Aug 23 10:42:52 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (check_pipe_command): extracted from rb_f_open and rb_io_open.
+	  (rb_f_open): use check_pipe_command.
+	  (rb_io_open): ditto.
+
+Sat Aug 23 10:13:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (read_all): fptr->enc2 is 0 if no conversion.
+	  (rb_io_getline_fast): ditto.
+	  (io_getc): ditto.
+
+Sat Aug 23 09:45:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): remove path field and add pathv field.
+	  (MakeOpenFile): initialize pathv as Qnil.
+
+	* gc.c: mark pathv field in T_FILE.
+
+	* io.c: follow the rb_io_t field change.
+
+	* file.c: ditto.
+
+	* ext/socket/socket.c: ditto.
+
+Sat Aug 23 01:42:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (FMODE_TEXTMODE): defined.
+
+	* include/ruby/encoding.h (rb_econv_t): new field: flags.
+	  (rb_econv_binmode): declared.
+
+	* io.c (io_unread): text mode hack removed.
+	  (NEED_NEWLINE_DECODER): defined.
+	  (NEED_NEWLINE_ENCODER): defined.
+	  (NEED_READCONV): defined.
+	  (NEED_WRITECONV): defined.
+	  (TEXTMODE_NEWLINE_ENCODER): defined for windows.
+	  (make_writeconv): setup converter with TEXTMODE_NEWLINE_ENCODER for
+	  text mode.
+	  (io_fwrite): use NEED_WRITECONV.  character code conversion is
+	  disabled if fptr->writeconv_stateless is nil.
+	  (make_readconv): setup converter with
+	  ECONV_UNIVERSAL_NEWLINE_DECODER for text mode.
+	  (read_all): use NEED_READCONV.
+	  (appendline): use NEED_READCONV.
+	  (rb_io_getline_1): use NEED_READCONV.
+	  (io_getc): use NEED_READCONV.
+	  (rb_io_ungetc): use NEED_READCONV.
+	  (rb_io_binmode): OS-level text mode test removed.  call
+	  rb_econv_binmode.
+	  (rb_io_binmode_m): call rb_io_binmode_m with write_io as well.
+	  (rb_io_flags_mode): return mode string including "t".
+	  (rb_io_mode_flags): detect "t" for text mode.
+	  (rb_sysopen): always specify O_BINARY.
+
+	* transcode.c (rb_econv_open_by_transcoder_entries): initialize flags.
+	  (rb_econv_open): if source and destination encoding is
+	  both empty string, open newline converter.  last_tc will be NULL in
+	  this case.
+	  (rb_econv_encoding_to_insert_output): last_tc may be NULL now.
+	  (rb_econv_string): ditto.
+	  (output_replacement_character): ditto.
+	  (transcode_loop): ditto.
+	  (econv_init): ditto.
+	  (econv_inspect): ditto.
+	  (rb_econv_binmode): new function.
+
+Fri Aug 22 21:18:40 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_div): now behaves as quo.
+
+	* complex.c (nucomp_s_generic_p): has been removed.
+
+	* complex.c (nucomp_to_s): adopts new form.
+
+	* complex.c (nucomp_inspect): ditto.
+
+	* complex.c (string_to_c_internal): ditto and supports polar form.
+
+	* complex.c (rb_complex_polar): new.
+
+	* rational.c (nurat_to_s): do not canonicalize.
+
+	* rational.c (nurat_inspect): adopts new form.
+
+	* rational.c (string_to_r_internal): ditto.
+
+	* include/ruby/intern.h: added a declaration.
+
+	* lib/complex.rb: added an obsolete class method.
+
+	* lib/cmath.rb: use scalar? instead of generic?.
+
+Fri Aug 22 20:06:46 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#shutdown):
+	  rescue Errno::ENOTCONN and close. [ruby-dev:35896]
+
+	* test/openssl/test_ssl.rb (OpenSSL#start_server): ditto.
+	  [ruby-dev:35897]
+
+	* lib/net/imap.rb (Net::IMAP#disconnect): ditto. [ruby-dev:35898]
+
+Fri Aug 22 19:58:27 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: no need to require the "lib/rational.rb" any more.
+
+Fri Aug 22 15:47:38 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/cgi.rb: use bytesize instead of size/length.
+
+Fri Aug 22 14:28:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime): supported flags and precision for most
+	  conversions.  [ruby-dev:35906]
+
+Fri Aug 22 14:04:04 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb: test_shift_jis:
+	  fixed comment strings (see r18291)
+
+Fri Aug 22 12:41:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_pid): use PIDT2NUM.
+
+Fri Aug 22 11:36:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (dir_enc_str_new): set US-ASCII to the path
+	  when the path is 7bit string and encoding is ASCII compatible.
+
+	* dir.c (push_glob): set file system encoding when argument encoding
+	  is US-ASCII.
+
+Fri Aug 22 11:30:38 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (dir_enc_str_new): renamed from dir_enc_str.
+
+	* dir.c (dir_read): use dir_enc_str_new.
+
+	* dir.c (dir_each): ditto.
+
+	* dir.c (push_pattern): ditto.
+
+Fri Aug 22 11:29:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: remove config.h dependency.
+
+Fri Aug 22 10:52:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (gmtime_r): check if reentrant versions are available.
+
+	* time.c (IF_HAVE_GMTIME_R, ASCTIME, GMTIME, LOCALTIME): use reentrant
+	  versions if available.
+
+Fri Aug 22 05:29:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (INT2NUM): just use a simple macro on LP64.
+	  (UINT2NUM): ditto.
+
+Fri Aug 22 05:10:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_file_open_generic): take filename as a VALUE.
+	  (rb_file_open_internal): ditto.
+	  (rb_io_open): ditto.
+	  (rb_file_open): pass filename as a VALUE to rb_file_open_internal.
+	  (rb_open_file): pass filename as a VALUE to rb_file_open_generic.
+	  (open_key_args): pass filename as a VALUE to rb_io_open.
+
+Fri Aug 22 04:33:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h: fix previous change for LP64.
+
+Fri Aug 22 03:19:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (NUM2LONG): make it inline function to evaluate
+	  the argument only once.
+	  `t = Object.new; def t.*(x) p x; 0 end; p Time.at(0, t)' did print x
+	  twice.
+	  (NUM2INT): ditto.
+	  (NUM2LL): ditto.
+	  (INT2NUM): make it inline function.
+	  (LONG2NUM): ditto.
+	  (UINT2NUM): ditto.
+	  (ULONG2NUM): ditto.
+
+Fri Aug 22 03:03:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_s_sysopen): mode can be a Bignum.
+
+Fri Aug 22 02:57:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_extract_modeenc): notify coerced to caller.
+	  (rb_io_initialize): mode may be a Bignum.
+
+Fri Aug 22 02:42:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_extract_modeenc): use rb_check_to_integer to test
+	  integer.
+
+Fri Aug 22 02:25:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* iseq.c (iseq_inspect): don't raise on uninitialized object.
+	  show real class name.
+
+Fri Aug 22 02:08:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_initialize): accept hash argument.
+
+Thu Aug 21 23:51:51 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): supported %F and %<precision>N.
+	  reverted config.h to ruby.h for Windows.
+
+	* test/ruby/test_time.rb (TestTime::test_strftime): added tests
+	  for %F and %N.
+
+	* time.c: documented %F and %N.
+
+Thu Aug 21 20:23:26 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_m17n_comb.rb (TestM17NComb#test_str_crypt): add
+	  key and salt to error message.
+
+Thu Aug 21 19:20:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (rb_stat_inspect): don't raise if self is not initialized.
+
+Thu Aug 21 19:17:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (pst_pid): use rb_attr_get to avoid warning on
+	  Process::Status.allocate.pid.
+	  (pst_inspect): don't raise if self is not initialized.
+
+Thu Aug 21 19:05:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_extract_encoding_option): if internal encoding is not
+	  specified, enc is external encoding.
+
+Thu Aug 21 14:22:50 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c: include ruby/config.h instead of ruby/ruby.h.
+
+	* common.mk: removed the old rule for missing/strftime.c.
+
+Thu Aug 21 09:29:01 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c (rb_strftime): return "UTC" instead of "GMT".
+
+	* test/ruby/test_time.rb (test_strftime): ditto.
+
+Thu Aug 21 07:59:04 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/iconv/test_option.rb (test_ignore_option): skip if iconv
+	  doesn't have transliterate.
+
+	* test/iconv/test_option.rb (test_translit_option): ditto.
+
+Thu Aug 21 06:12:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
+	  single digit decimal.  [ruby-core:18355]
+
+Thu Aug 21 06:02:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_initialize_copy): Range is now a Struct.
+	  [ruby-core:18353]
+
+	* struct.c (rb_struct_init_copy): made public.
+
+Thu Aug 21 03:09:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_extract_encoding_option): enc2 is external encoding if
+	  external encoding and internal encoding is given.
+	  (pipe_open): add flags and convconfig argument to initialize
+	  fptr->{mode,enc,enc2}.
+	  (pipe_open_v): pass flags and convconfig from caller to pipe_open.
+	  (pipe_open_s): ditto.
+	  (pop_last_hash): new function.
+	  (rb_io_s_popen): use last hash as option to specify code conversion.
+	  (rb_io_open): specify flags and convconfig arguments for
+	  pipe_open_s.
+	  (rb_f_backquote): ditto.
+
+Thu Aug 21 02:27:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (prep_io): local variable renamed.
+	  (rb_io_fdopen): ditto.
+	  (prep_stdio): ditto.
+
+Thu Aug 21 01:58:59 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* configure.in: always check timezone().
+
+	* strftime.c (rb_strftime): prefer timezone/altzone rather than
+	  gettimeofday().  The second argument to gettimeofday() is ignored
+	  on Solaris.
+
+Thu Aug 21 02:03:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (open_key_args): simplified.
+
+Thu Aug 21 01:57:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (open_key_args): IO.foreach(path, rs, limit) didn't work.
+
+Thu Aug 21 01:31:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_file_sysopen_internal): unused function removed.
+	  (rb_file_sysopen): ditto.
+
+Thu Aug 21 01:09:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: use mode_t for the 3rd argument, permission, of open(2).
+
+Thu Aug 21 00:51:42 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* configure.in: removed strftime from AC_REPLACE_FUNCS().
+
+	* include/ruby/missing.h: removed prototype for strftime().
+
+	* missing/strftime.c: removed.
+
+	* time.c (time_to_s): use rb_strftime() instead of strftime(3).
+	  (time_zone): ditto.
+
+Thu Aug 21 00:49:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* strftime.c: win32 support.
+
+Thu Aug 21 00:20:05 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* strftime.c: new file.
+
+	* common.mk (COMMONOBJS): added strftime.$(OBJEXT).
+
+	* time.c (time_strftime): do not use strftime(3).  supported
+	  %L(millisecond) and %N(nanosecond).
+
+	* test/ruby/test_time.rb: added tests for %L and %N.
+
+Wed Aug 20 23:53:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_set_encoding): removed.
+	  (rb_io_open): set up encoding using new argument opt.
+	  (open_key_args): call rb_io_open with opt.  don't call
+	  io_set_encoding.
+
+Wed Aug 20 22:30:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_file_open_internal): use rb_io_flags_modenum.
+	  (rb_io_reopen): use rb_io_flags_modenum and rb_io_modenum_mode.
+	  (rb_io_stdio_file): ditto.
+
+Wed Aug 20 22:28:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_new): use the given class.
+
+	* vm.c (vm_make_proc): added an argument for the class.
+
+Wed Aug 20 22:24:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_take): get rid of extraneous iteration.
+
+Wed Aug 20 20:32:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_open_with_args): use rb_open_file instead of rb_io_open.
+
+Wed Aug 20 20:16:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_scan_open_args): extracted from rb_open_file.
+
+Wed Aug 20 19:22:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (convconfig_t): new type.
+	  (rb_io_extract_modeenc): new function.
+	  (rb_file_open_generic): new function.
+	  (rb_file_open_internal): use rb_file_open_generic.
+	  (rb_file_sysopen_internal): use rb_file_open_generic.
+	  (rb_open_file): use rb_io_extract_modeenc and rb_file_open_generic.
+	  (rb_io_open): call rb_file_open_internal instead of rb_file_open.
+
+Wed Aug 20 19:15:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (Init_IO): new constants: File::DSYNC, File::RSYNC and
+	  File::NOFOLLOW.
+
+Wed Aug 20 18:41:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_open_file): don't lookup :mode and :perm in opt.  it is
+	  useless because vmode and perm is overwritten by rb_scan_args
+	  anyway.
+
+Wed Aug 20 18:37:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (open_key_args): meaningless MEMCPY removed.
+
+Wed Aug 20 18:30:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (prep_io) [cygwin]: use FMODE_BINMODE instead of O_BINARY.
+
+Wed Aug 20 16:39:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sample): performance improvement for huge array.
+
+Wed Aug 20 12:28:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sample): get rid of infinite loop.  #455
+
+Wed Aug 20 06:09:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (FMODE_TRUNC): value changed because 0x100 is used
+	  as FMODE_NOREVLOOKUP in socket.c
+
+Wed Aug 20 05:19:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (parse_mode_enc): extracted from mode_enc.
+	  (io_extract_encoding_option): extracted from io_set_encoding.
+
+Wed Aug 20 04:17:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_flags_modenum): make it static.
+
+Wed Aug 20 03:36:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (FMODE_TRUNC): new constant.
+
+	* io.c (rb_io_mode_flags): set FMODE_TRUNC for "w".
+	  (rb_io_modenum_flags): set FMODE_TRUNC for O_TRUNC.
+	  (rb_io_flags_modenum): new function.
+	  (rb_io_mode_modenum): just use rb_io_mode_flags and
+	  rb_io_flags_modenum.
+
+Wed Aug 20 02:36:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (fopen): macro for vms removed.  fopen is not used now.
+
+Wed Aug 20 02:27:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open): fix memory leak.
+	  (rb_econv_close): ditto.
+	  fixed by shinichiro.h.  [ruby-dev:35880]
+
+Tue Aug 19 21:50:43 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_fopen): declaration removed.
+
+	* io.c (rb_fopen): unused function removed.
+
+Tue Aug 19 21:14:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (FMODE_READWRITE): define as
+	  FMODE_READABLE|FMODE_WRITABLE.
+
+Tue Aug 19 21:13:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_flags_mode): use hexadecimal in error message.
+	  (rb_io_modenum_mode): ditto.
+	  (rb_io_initialize): ditto.
+
+Tue Aug 19 18:23:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_flags_mode): add a prefix 0 to octal in error message.
+	  (rb_io_modenum_mode): ditto.
+
+Tue Aug 19 18:05:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (FMODE_*): sorted and describe the values in
+	  hexadecimal.
+
+Tue Aug 19 17:32:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): store the
+	  result of d2i_X509_NAME into DATA_PTR(self).
+
+Tue Aug 19 04:54:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake.rb (FileUtils#ruby): takes care of space containing path.
+	  [ ruby-Bugs-21591 ]
+
+Tue Aug 19 01:32:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_open_file): encoding in mode string was ignored if perm is
+	  specified.
+
+Tue Aug 19 01:02:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_open_file): don't access argv[-1] by
+	  File.allocate.instance_eval { initialize }.
+
+Tue Aug 19 00:56:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_inspect): don't raise for uninitialized Regexp.
+
+Tue Aug 19 00:34:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_check_readable): side effect for STDIN removed.
+	  (rb_io_external_encoding): ditto.
+
+Mon Aug 18 23:27:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_ungetbyte): renamed from io_ungetc.
+	  (rb_io_ungetbyte): new method.
+	  (rb_io_ungetc): push back into character buffer if enc2 is set.
+
+Mon Aug 18 22:41:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (id_encode): removed.
+
+Mon Aug 18 22:30:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (make_writeconv): if enc and enc2 is set, convert
+	  string.encoding to enc2.
+
+	* include/ruby/io.h: comment changed.
+
+Mon Aug 18 21:02:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): new fields: writeconv,
+	  writeconv_stateless and writeconv_initialized.
+	  (MakeOpenFile): initialize them.
+
+	* include/ruby/encoding.h (rb_econv_stateless_encoding): declared.
+	  (rb_econv_string): declared.
+
+	* io.c (make_writeconv): new function.
+	  (io_fwrite): use econv.
+	  (make_readconv): fix error message.
+	  (finish_writeconv): new function.
+	  (fptr_finalize): call finish_writeconv.
+	  (clear_writeconv): new function.
+	  (clear_codeconv): new function to call both clear_readconv and
+	  clear_writeconv.
+	  (rb_io_fptr_finalize): call clear_codeconv instead of
+	  clear_readconv.
+	  (mode_enc): ditto.
+	  (io_set_encoding): ditto.
+	  (argf_next_argv): ditto.
+	  (io_encoding_set): ditto.
+
+	* gc.c (gc_mark_children): mark writeconv_stateless in T_FILE.
+
+	* transcode.c (stateless_encoding_i): new function.
+	  (rb_econv_stateless_encoding): ditto.
+	  (rb_econv_string): ditto.
+
+Mon Aug 18 17:23:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (clear_readconv): extracted from rb_io_fptr_finalize.
+	  (mode_enc): call clear_readconv.
+	  (io_set_encoding): ditto.
+	  (argf_next_argv): ditto.
+	  (io_encoding_set): ditto.
+
+Mon Aug 18 16:54:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (mode_enc): modify enc and enc2 consistently.
+	  (io_set_encoding): ditto.
+	  (io_encoding_set): ditto.
+
+Mon Aug 18 13:21:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_search_path): prevent infinite loop by
+	  searching a path for self conversion.
+
+Mon Aug 18 12:45:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_enc_str): code conversion removed.
+	  (io_enc_str_converted): removed because it is identical to
+	  io_enc_str now.
+
+Mon Aug 18 12:12:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_shift_crbuf): add strp argument to append into existing
+	  string.
+	  (read_all): use econv if enc2 is set.
+	  (io_getc): follow the io_shift_crbuf change.
+
+Mon Aug 18 10:35:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_enc_str_converted): new function.
+	  (make_readconv): extracted from io_getc.
+	  (more_char): ditto.
+	  (appendline): use econv via make_readconv and more_char for code
+	  conversion.
+	  (prepare_getline_args): don't convert record separator.
+	  (rb_io_getline_1): don't use rb_io_getline_fast if enc2 is set.
+	  (io_getc): use make_readconv and more_char.
+
+Mon Aug 18 08:27:44 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* common.mk: fix error in uncommon.mk.
+
+Mon Aug 18 06:10:08 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: config.h depends config.status.
+
+Mon Aug 18 03:59:43 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (appendline): appendline cannot check character boundary.
+	  (rb_io_getline_1): relax limit until character boundary.
+
+Mon Aug 18 02:25:11 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#eof?): added lacked method.
+
+Sun Aug 17 21:50:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (prepare_getline_args): io.gets(10,nil) should cause TypeError.
+
+Sun Aug 17 15:58:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: not check config.h.
+
+	* lib/mkmf.rb (init_mkmf): add include/ruby/backward to $INCFLAGS.
+
+	* include/ruby/backward/{st,util}.h: added for backward compatibility.
+	  [ruby-dev:35811]
+
+Sun Aug 17 13:40:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_putback): new method.
+
+Sun Aug 17 13:23:53 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_putbackable): declared.
+	  (rb_econv_putback): ditto.
+
+	* transcode.c (rb_econv_putbackable): implemented.
+	  (rb_econv_putback): ditto.
+
+	* io.c (io_getc): put back bytes if possible.
+
+Sun Aug 17 12:00:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (make_econv_exception): add several instance variables
+	  to exception object.
+	  (ecerr_source_encoding): new method:
+	  Encoding::ConversionUndefined#source_encoding and
+	  Encoding::InvalidByteSequence#source_encoding.
+	  (ecerr_destination_encoding): new method:
+	  Encoding::ConversionUndefined#destination_encoding and
+	  Encoding::InvalidByteSequence#destination_encoding.
+	  (econverr_error_char): new method:
+	  Encoding::ConversionUndefined#error_char.
+	  (econverr_error_bytes): new method:
+	  Encoding::ConversionUndefined#error_bytes.
+
+Sun Aug 17 11:43:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (struct MT): packed Mersenne Twister staffs.
+
+	* random.c (struct RandSeed): packed random seed staffs.
+
+Sun Aug 17 08:38:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/iconv/test_option.rb (test_ignore_option): skip if iconv
+	  doesn't have transliterate.
+
+	* test/iconv/test_option.rb (test_translit_option): ditto.
+
+Sun Aug 17 01:29:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): new fields: readconv, crbuf, crbuf_off,
+	  crbuf_len, crbuf_capa.
+	  (MakeOpenFile): initialize them.
+
+	* io.c (io_shift_crbuf): new function.
+	  (io_getc): use econv.
+	  (rb_io_fptr_finalize): finalize readconv and crbuf.
+
+Sun Aug 17 00:02:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_check_error): declared.
+
+	* transcode.c (make_econv_exception): new function.
+	  (transcode_loop): use make_econv_exception.
+	  (rb_econv_check_error): defined.
+
+Sat Aug 16 15:23:16 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_elem_t): fields removed: from and
+	  to.
+	  (rb_econv_t): new fields: source_encoding_name and
+	  destination_encoding_name.
+
+	* transcode.c (rb_econv_open_by_transcoder_entries): initialize the
+	  new fields.
+	  (rb_econv_open): set up the new fields.
+	  (econv_inspect): use the new fields.
+
+Sat Aug 16 14:22:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_t): add fields: in_buf_start,
+	  in_data_start, in_data_end, in_buf_end and last_trans_index.
+	  (rb_econv_output): removed.
+	  (rb_econv_insert_output): declared.
+	  (rb_econv_encoding_to_insert_output): declared.
+
+	* enc/trans/newline.trans (rb_universal_newline): stateful_type
+	  changed.
+
+	* transcode.c (transcode_restartable0): initialize inchar_start,
+	  tc->recognized_len and next_table at beginning of the loop.
+	  (rb_econv_open_by_transcoder_entries): initialize new fields.
+	  (rb_econv_open): setup last_trans_index.
+	  (trans_sweep): last out_buf_start can be non-NULL now.
+	  (rb_econv_convert): check last out_buf_start and in_buf_start at
+	  first.
+	  (rb_econv_output_with_destination_encoding): removed.
+	  (econv_just_convert): removed.
+	  (rb_econv_output): removed.
+	  (econv_primitive_output): method removed.
+	  (rb_econv_encoding_to_insert_output): new function.
+	  (allocate_converted_string): new function.
+	  (rb_econv_insert_output): new function.
+	  (econv_primitive_insert_output): new method.
+	  (output_replacement_character): use rb_econv_insert_output.  unused
+	  arguments removed.
+
+Sat Aug 16 09:20:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_intern_const): tiny optimization.
+
+	* include/ruby/ruby.h (SSIZET2NUM, NUM2SSIZET, SSIZE_MAX, SSIZE_MIN):
+	  macros for ssize_t.
+
+Sat Aug 16 08:11:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder_stateful_type_t): defined.
+	  (rb_transcoder): add field: stateful_type.
+
+	* tool/transcode-tblgen.rb: generate stateful_type field as
+	  stateless_converter.
+
+	* enc/trans/iso2022.trans: follow rb_transcoder change.
+
+	* enc/trans/newline.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+Fri Aug 15 23:07:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_just_convert): extracted from rb_econv_output.
+	  (rb_econv_output): use econv_just_convert.
+	  (econv_primitive_output): new method.
+
+Fri Aug 15 19:57:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_output): add str_encoding
+	  argument.
+
+	* transcode.c (get_replacement_character): add repl_enc_ptr argument.
+	  (rb_econv_output_with_destination_encoding): renamed from
+	  rb_econv_output and make it static.
+	  (rb_econv_output): convert str and call
+	  rb_econv_output_with_destination_encoding.
+	  (output_replacement_character): follow above interface change.
+
+Fri Aug 15 19:33:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_drop_bytes): use memmove.
+
+Fri Aug 15 18:33:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_t): add error_tc in last_error.
+
+	* transcode.c (rb_econv_convert): fill error_tc.
+
+Fri Aug 15 18:10:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_t): new field: last_error.
+
+	* transcode.c (rb_trans_conv): new argument: result_position_ptr.
+	  (rb_econv_convert): fill last_error.
+	  (econv_result_to_symbol): extracted from econv_primitive_convert.
+	  (econv_primitive_errinfo): new method.
+
+Fri Aug 15 17:39:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (parse.{c,h}): creates in the dependency order.
+
+Fri Aug 15 16:59:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (exec_event_hooks): skips RubyVM::FrozenCore.
+
+	* vm.c (Init_VM): get rid of SEGV in a trace proc.
+
+Fri Aug 15 09:33:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (conv_init): check empty name.
+
+Fri Aug 15 09:03:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_init): don't create dummy encoding if
+	  rb_econv_open is failed.
+	  (make_dummy_encoding): new function extracted from make_encoding.
+	  (make_encoding): removed.
+
+Fri Aug 15 01:07:16 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk ({$(srcdir)}.y.c): escape backslash.
+
+Fri Aug 15 01:05:39 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_convert): set destination_buffer
+	  encoding.
+
+Fri Aug 15 00:52:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_output): declared.
+
+	* transcode_data.h (rb_transcoder): add resetsize_func field.
+
+	* enc/trans/iso2022.trans (iso2022jp_reset_sequence_size): defined.
+	  (rb_EUC_JP_to_ISO_2022_JP): provide resetsize_func.
+
+	* tool/transcode-tblgen.rb: set NULL for resetsize_func.
+
+	* transcode.c (rb_econv_output): new function for inserting output.
+	  (output_replacement_character): use rb_econv_output.
+	  (transcode_loop): check return value of
+	  output_replacement_character.
+
+Thu Aug 14 23:47:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ECONV_UNIVERSAL_NEWLINE_DECODER): defined.
+	  (ECONV_CRLF_NEWLINE_ENCODER): ditto.
+	  (ECONV_CR_NEWLINE_ENCODER): ditto.
+	  (ECONV_PARTIAL_INPUT): ditto.
+	  (ECONV_OUTPUT_FOLLOWED_BY_INPUT): ditto.
+
+	* transcode.c: use ECONV_* defined as above.
+
+Thu Aug 14 23:35:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c: local variable renamed.
+
+Thu Aug 14 23:22:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_econv_result_t): moved from
+	  transcode_data.h.
+	  (rb_econv_elem_t): ditto.
+	  (rb_econv_t): ditto.  source_encoding and destination_encoding field
+	  is added.
+	  (rb_econv_open): declared.
+	  (rb_econv_convert): ditto.
+	  (rb_econv_close): ditto.
+
+	* transcode.c (rb_econv_open_by_transcoder_entries): initialize
+	  source_encoding and destination_encoding field as NULL.
+	  (rb_econv_open): make it external linkage.
+	  (rb_econv_close): ditto.
+	  (rb_econv_convert): ditto.  renamed from rb_econv_conv.
+	  (make_encoding): new function.
+	  (econv_init): use make_encoding and store rb_encoding* in
+	  rb_econv_t.
+	  (econv_source_encoding): new method
+	  Encoding::Converter#source_encoding.
+	  (econv_destination_encoding): new method
+	  Encoding::Converter#destination_encoding.
+
+Thu Aug 14 22:44:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_econv_result_t): change enumeration
+	  constant's prefix: transcode_ to econv_.
+
+	* transcode.c: follow the constant prefix change.
+
+Thu Aug 14 21:34:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_init): accept Encoding object as source_encoding
+	  and destination_encoding.
+
+Thu Aug 14 21:10:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_filesystem_encoding): use default external encoding
+	  for Unix.
+
+	* dir.c (dir_initialize): don't cache fs_encoding.
+
+Thu Aug 14 20:58:57 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_open_by_transcoder_entries): renamed from
+	  rb_trans_open_by_transcoder_entries.
+
+Thu Aug 14 20:56:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_max_output): removed.
+
+Thu Aug 14 20:52:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: check unexpected actions.
+
+Thu Aug 14 20:25:52 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (transcode_invalid_byte_sequence): renamed from
+	  transcode_invalid_input.
+	  (transcode_destination_buffer_full): renamed from transcode_obuf_full.
+	  (transcode_source_buffer_empty): renamed from transcode_ibuf_empty.
+	  (rb_econv_result_t): renamed from rb_trans_result_t.
+	  (rb_econv_elem_t): renamed from rb_trans_elem_t.
+	  (rb_econv_t): renamed from rb_trans_t.
+
+	* transcode.c (UNIVERSAL_NEWLINE_DECODER): renamed from
+	  UNIVERSAL_NEWLINE.
+	  (CRLF_NEWLINE_ENCODER): renamed from CRLF_NEWLINE.
+	  (CR_NEWLINE_ENCODER): renamed from CR_NEWLINE.
+	  (rb_econv_open): renamed from rb_trans_open.
+	  (rb_econv_close): renamed from rb_trans_close.
+
+Thu Aug 14 19:41:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (load_transcoder): unused function removed.
+	  (rb_transcoding_open): ditto.
+
+Thu Aug 14 17:57:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_enc_ispunct): added.
+
+	* common.mk (COMMONOBJS), inits.c (rb_call_inits): id.c is now
+	  included from parse.c.
+
+	* id.c (Init_id), id.h (ruby_method_ids): added IDs used by VM.
+
+	* parse.y (global_symbols): added rooms for VM IDs.
+
+	* parse.y (rb_intern3, rb_id2str): single punctuation symbol is now
+	  same as char code.
+
+Thu Aug 14 17:46:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (union tmpyystype): no longer needed, since YYSTYPE is
+	  defined in parse.h now.
+
+Thu Aug 14 17:27:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* version.c (Init_version): add RUBY_ENGINE constant.
+
+Thu Aug 14 15:34:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_econv_conv): new function.  it doesn't consume
+	  input too much, even for multilevel conversion.
+	  (transcode_loop): use rb_econv_conv.
+	  (econv_primitive_convert): ditto.
+
+Thu Aug 14 15:27:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h (RUBY_ALIAS_FUNCTION): fallback definition.
+
+Thu Aug 14 15:08:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_trans_result_t): new enumeration constant:
+	  transcode_output_followed_by_input.
+
+	* transcode.c (OUTPUT_FOLLOWED_BY_INPUT): new flag.
+	  (transcode_restartable0): suspend when output followed by input if
+	  OUTPUT_FOLLOWED_BY_INPUT is specified.
+	  (trans_sweep): check OUTPUT_FOLLOWED_BY_INPUT.
+	  (rb_trans_conv): support OUTPUT_FOLLOWED_BY_INPUT.
+	  (econv_primitive_convert): return :output_followed_by_input for
+	  transcode_output_followed_by_input.
+
+Thu Aug 14 14:57:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (getrusage_time): should return the value.
+
+	* thread.c (rb_thread_priority_set): get rid of C99 feature.
+
+	* transcode.c (transcode_search_path): ditto.
+
+	* vm.c (REWIND_CFP): get rid of statement expressions.
+
+Thu Aug 14 14:13:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (Init_VM): hide FrozenCore.
+
+Thu Aug 14 12:20:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (load_transcoder): suppress warning.
+
+	* missing/vsnprintf.c (BSD_vfprintf): ditto.
+
+Thu Aug 14 12:01:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (gnumake): check for GNU make.
+
+	* Makefile.in (uncommon.mk): includes filtered common.mk.
+
+	* common.mk (parse.h): workaround for nmake.
+
+Thu Aug 14 06:09:12 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_execute_interrupts): switch event
+	  should be occur only once.
+
+Thu Aug 14 05:36:36 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: parse.h depends on parse.c.
+
+	* common.mk: hash.o depends on $(ID_H_INCLUDES).
+
+Thu Aug 14 02:45:16 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_file_exhaustive.rb (TestFileExhaustive#setup):
+	  set group of tmpdir.  [ruby-dev:35633]
+
+Thu Aug 14 15:50:30 2008  Giuseppe Bilotta  <giuseppe.bilotta@gmail.com>
+
+	* hash.c (set_default): fix rdoc.  #441
+
+Thu Aug 14 02:23:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_convert): add output_byteoffset
+	  argument.
+
+Thu Aug 14 00:43:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_gcc_function_alias): checks alias attribute.
+
+	* string.c (alias_func): replaced with RUBY_ALIAS_FUNCTION.
+
+Wed Aug 13 23:42:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (parse.h): fake rule.
+
+Wed Aug 13 23:15:58 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_thread.rb (test_list): call Thread.pass to run t1.
+	  fixed [ruby-core:18264].
+
+Wed Aug 13 23:05:51 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* string.c (alias_func): changed to 'weak, alias' from 'alias' for
+	  Mac OSX. (closes #429)
+
+Wed Aug 13 19:40:12 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: count only freed object as freelist size.
+
+Wed Aug 13 18:34:22 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* marshal.c (marshal_load): set arg.untrust properly.
+
+Wed Aug 13 17:47:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_inspect): new method.
+
+Wed Aug 13 17:35:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_restartable0): several local variables
+	  removed.
+
+Wed Aug 13 17:35:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_set_default_proc): add new method.  a patch from
+	  Giuseppe Bilotta.  #419
+
+Wed Aug 13 17:31:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_insnhelper.c (caller_setup_args): should ensure if the value
+	  from to_proc is a real Proc.
+
+Wed Aug 13 17:28:29 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* common.mk: regint.h no longer includes vm_core.h.
+
+Wed Aug 13 17:26:44 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): add fields: writebuf_off,
+	  writebuf_len and writebuf.
+	  (TRANSCODING_WRITEBUF): new macro.
+
+	* transcode.c (transcode_restartable0): output until output buffer is
+	  really full.
+	  (rb_transcoding_open_by_transcoder): initialize writebuf_len,
+	  writebuf_off and writebuf.
+	  (rb_transcoding_close): finalize writebuf.
+
+Wed Aug 13 17:18:37 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_check_ints): added.  please note that
+	  this function may cause ruby's thread switching.
+
+	* include/ruby/intern.h: ditto.
+
+	* regint.h: use rb_thread_check_ints() instead of
+	  RUBY_CHECK_INTS() directly.
+
+Wed Aug 13 17:01:36 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* golf_prelude.rb, lib/set.rb (TC_Set#test_each),
+	  test/readline/test_readline_history.rb (Readline#test_each__enumerator),
+	  test/ruby/test_array.rb (TestArray#test_collect),
+	  test/ruby/test_enumerator.rb (TestEnumerator#test_initialize):
+	  Enumerable::Enumerator is now called Enumerator.
+
+	* lib/rinda/tuplespace.rb (Rinda::TupleBag#initialize): Use
+	  enum_for instead of hardcoding Enumerable::Enumerator.
+
+Wed Aug 13 16:40:57 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, vm_core.h: add manual priority support
+	  using time slice.  if you enable USE_NATIVE_THREAD_PRIORITY
+	  macro, this mechanism is ignored.  [ruby-dev:33124]
+
+	* thread_pthread.c, thread_win32.c: ditto.
+
+	* test/ruby/test_thread.rb: fix test parameter.
+
+Wed Aug 13 16:02:14 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* object.c (rb_obj_untrusted): new method Object#untrusted?.
+	  (rb_obj_untrust): new method Object#untrust.
+	  (rb_obj_trust): new method Object#trust.
+
+	* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
+	  string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
+	  ruby.c, marshal.c: fixes for Object#untrusted?.
+
+	* test/ruby/test_module.rb, test/ruby/test_array.rb,
+	  test/ruby/test_object.rb, test/ruby/test_string.rb,
+	  test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
+	  Object#untrusted?.
+
+Wed Aug 13 16:13:58 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_m17n.rb: follow EncodingCompatibilityError.
+
+	* test/ruby/test_mixed_unicode_escapes.rb: ditto.
+
+	* test/ruby/enc/test_utf16.rb: ditto.
+
+Wed Aug 13 16:05:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_cmp): retry with right hand operand if its not a
+	  time object.  [ruby-dev:35011]
+
+Wed Aug 13 15:51:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c: Apply a temporary fix to fix build on OS X.  A real
+	  fix will follow later.
+
+Wed Aug 13 15:25:09 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (Init_Enumerator): Rename Enumerable::Enumerator to
+	  just Enumerator.
+
+Wed Aug 13 15:13:57 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* common.mk (prelude.c, golf_prelude.c): Using $(COMPILE_PRELUDE)
+	  requires $(RBCONFIG).
+
+Wed Aug 13 15:08:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_init): make flags argument optional.
+	  (econv_primitive_convert): ditto.
+
+Wed Aug 13 14:55:27 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* common.mk (realclean-local): Remove parse.h as well.
+
+	* common.mk: Add missing dependencies regarding vm_core.h, id.h,
+	  parse.c (parse.h), etc..
+
+Wed Aug 13 14:45:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/newline.trans (rb_crlf_newline): new transcoder.
+	  (rb_cr_newline): new transcoder.
+
+	* transcode.c (trans_open_i): one more extra room for input newline
+	  converter.
+	  (rb_trans_open): crlf newline and cr newline implemented.
+	  (Init_transcode): Encoding::Converter::CRLF_NEWLINE and
+	  Encoding::Converter::CR_NEWLINE defined.
+
+Wed Aug 13 14:22:16 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/newline.trans: new file.
+
+	* transcode_data.h (rb_trans_t): add last_tc field.
+
+	* transcode.c (UNIVERSAL_NEWLINE): defined.
+	  (CRLF_NEWLINE): defined.
+	  (CR_NEWLINE): defined.
+	  (rb_trans_open_by_transcoder_entries): initialize last_tc.
+	  (trans_open_i): allocate one more room for output newline converter.
+	  (rb_trans_open): universal newline implemented.
+	  (more_output_buffer): take max_output argument instead ts.
+	  (output_replacement_character): take tc argument instead of ts.
+	  (transcode_loop): use last_tc field.
+	  (econv_init): add flags argument for rb_trans_open.
+	  (Init_transcode): Encoding::Converter::UNIVERSAL_NEWLINE defined.
+
+Wed Aug 13 14:00:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (parse.c): generates parse.h together.
+
+	* id.c, id.h: use constants for parser tokens.
+
+Wed Aug 13 13:47:05 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: rewind cfp to show proper backtrace.
+	  [ruby-dev:35820]
+
+Wed Aug 13 13:09:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: fix for clean up.
+
+Wed Aug 13 11:45:51 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* vm_core.h: Declare rb_iseq_clone, which is used in class.c.
+
+Wed Aug 13 11:39:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_search_path): return the length of converter
+	  path.
+	  (load_transcoder_entry): renamed from load_transcoder.
+	  (load_transcoder): new function for loading transcoder by encoding
+	  names.
+	  (rb_transcoding_open_by_transcoder): extracted from
+	  rb_transcoding_open.
+	  (rb_transcoding_open): use load_transcoder and
+	  rb_transcoding_open_by_transcoder.
+	  (rb_trans_open_by_transcoder_entries): new function.
+	  (trans_open_i): construct entries array.
+	  (rb_trans_open): use rb_trans_open_by_transcoder_entries.
+
+Wed Aug 13 10:45:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: try to find exported directory.
+
+Wed Aug 13 10:16:35 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* doc/NEWS: Mention the Readline.vi_editing_mode?,
+	  Readline.emacs_editing_mode?, Readline::HISTORY[] and
+	  Readline::HISTORY.clear change.
+
+Wed Aug 13 08:03:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_primitive_convert): add output_size argument.
+
+Wed Aug 13 07:41:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_trans_conv): report last transcode_obuf_full.
+	  (econv_max_output): new method Encoding::Converter#max_output.
+
+Wed Aug 13 02:46:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (rb_eEncCompatError): add Exception.
+
+	* include/ruby/ruby.h: ditto.
+
+	* encoding.c (rb_enc_check): use rb_eEncCompatError.
+
+	* string.c (rb_enc_cr_str_buf_cat): ditto.
+
+	* string.c (rb_str_sub_bang): ditto.
+
+	* string.c (rb_str_hex): ditto.
+
+	* string.c (rb_str_oct): ditto.
+
+Wed Aug 13 02:36:47 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (str_transcode): fix error message.
+
+Tue Aug 12 23:42:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_cEncodingConverter): new class Encoding::Converter.
+	  (econv_free): new function.
+	  (econv_s_allocate): ditto.
+	  (econv_init): ditto.
+	  (check_econv): ditto.
+	  (econv_primitive_convert): new method.
+	  (Init_transcode): define Encoding::Converter.
+
+Tue Aug 12 23:16:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_splice_0): call rb_str_drop_bytes, not rb_str_drop.
+
+Tue Aug 12 19:11:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: fix for enc.mk.
+
+Tue Aug 12 19:08:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_drop_bytes): new function to drop first bytes.
+
+Tue Aug 12 18:58:48 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, vm_insnhelper.c (vm_define_method): move
+	  function place.
+
+Tue Aug 12 18:56:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c: more descriptive aliases of rb_str_new[2-5].
+	  [ruby-dev:35615]
+
+Tue Aug 12 18:51:29 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* gc.c (getrusage_time): Returned effective value on Windows.
+
+Tue Aug 12 18:51:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_trans_open): free ts before raise.
+
+Tue Aug 12 18:46:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): should not ignore
+	  <=> comparison.  [ruby-dev:35732]
+
+Tue Aug 12 18:43:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/make_transdb.rb: *.erb.c is not used anymore.
+
+Tue Aug 12 18:32:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_trans_elem_t): new field: from and to.
+
+	* transcode.c (trans_open_i): just record from and to.
+	  (rb_trans_open): load transcodings.
+
+Tue Aug 12 18:32:03 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c (mSyslog_open): Use of Check_SafeStr() is
+	  deprecated.
+	  (mSyslogConstants_LOG_MASK, mSyslogConstants_LOG_UPTO): Use
+	  NUM2INT() instead of FIX2INT() when the type of an given object
+	  is not determined.
+
+Tue Aug 12 18:14:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* tool/transcode-tblgen.rb (#transcode_tblgen): slight message
+	  improvement.
+
+Tue Aug 12 17:16:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (trans_open_i): check the result of rb_transcoding_open.
+
+Tue Aug 12 16:23:32 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c (gc_profile_result): use rb_str_catf.
+
+Tue Aug 12 16:13:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (TRANSCODE_ERROR): removed.
+
+	* tool/transcode-tblgen.rb: 8bit byte of ASCII-8BIT is a valid
+	  (but unique to ASCII-8BIT) character.
+
+	* transcode.c (rb_eConversionUndefined): new error.
+	  (rb_eInvalidByteSequence): ditto.
+
+Tue Aug 12 16:08:51 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: POP3Command should export @socket since POP
+	  calls #socket.
+
+Tue Aug 12 16:06:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c, util.c (quorem, nrv_alloc, dtoa): enabled floating point
+	  support.
+
+Tue Aug 12 15:52:45 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c (gc_profile_result): use sprintf.
+
+Tue Aug 12 15:37:40 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_intern): should check symbol table overflow.
+
+Tue Aug 12 15:31:04 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (send_request_with_body): Content-Length should
+	  be byte length of string. (closes #203)
+
+Tue Aug 12 15:17:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/depend: (transvpath_prefix): prefix has no extension, so replace
+	  %s with "".
+
+Tue Aug 12 15:03:43 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* test/readline/test_readline.rb (TestReadline#test_safe_level_4):
+	  tested Readline.vi_editing_mode? and Readline.emacs_editing_mode?.
+
+Tue Aug 12 14:25:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/Makefile.in (.SUFFIXES): renamed to .trans.
+
+	* enc/make_encmake.rb: added --encs and --no-encs options.
+
+	* enc/depend (TRANSVPATH): fix for nmake.
+
+Tue Aug 12 14:19:53 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/https.rb: suppress syntax warning.
+
+Tue Aug 12 14:15:51 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (Net::HTTP#initialize): initialize net/https
+	  variables to suppress syntax warning.
+
+Tue Aug 12 14:15:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fixed shadowing variable.
+
+Tue Aug 12 10:25:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_delete): Array#delete to return deleted element.
+
+Tue Aug 12 10:18:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/win32ole/test_err_in_callback.rb: do not require 'mkmf'
+	  unless WIN32OLE is defined.
+
+Tue Aug 12 07:41:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder): add resetstate_func field for
+	  resetting a state of stateful encoding.
+
+	* enc/trans/iso2022.trans (rb_EUC_JP_to_ISO_2022_JP): specify
+	  finish_eucjp_to_iso2022jp for resetstate_func.
+
+	* tool/transcode-tblgen.rb: specify NULL for resetstate_func.
+
+	* transcode.c (output_replacement_character): call resetstate_func
+	  before appending the replacement character.
+
+Tue Aug 12 07:19:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (get_replacement_character): extracted from
+	  output_replacement_character.
+
+Tue Aug 12 07:00:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder): typedef at first.
+
+Tue Aug 12 06:48:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (rb_trans_conv): find second last error.
+
+Tue Aug 12 00:43:44 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_trans_result_t): new type.
+	  (rb_trans_elem_t): new type.
+	  (rb_trans_t): new type.
+
+	* transcode.c (transcode_dispatch_cb): removed.
+	  (transcode_dispatch): removed.
+	  (rb_transcoding_result_t): moved to rb_trans_result_t in
+	  transcode_data.h.
+	  (transcode_restartable0): goto follow_info when FUNsi.
+	  (rb_transcoding_open): use get_transcoder_entry.
+	  (rb_trans_open): new function.
+	  (rb_trans_conv): ditto.
+	  (rb_trans_close): ditto.
+	  (trans_open_i): ditto.
+	  (trans_sweep): ditto.
+	  (more_output_buffer): take rb_trans_t instead of rb_transcoding as
+	  an argument.
+	  (transcode_loop): take from_encoding and to_encoding instead of tr
+	  as arguments.  use rb_trans_open/rb_trans_conv/rb_trans_close.
+	  (str_transcode): don't use transcode_dispatch.
+
+Mon Aug 11 20:37:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* iseq.c (rb_iseq_clone): should preserve cref_stack link.
+
+Mon Aug 11 20:27:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): add taint check.
+
+	* ext/dl/dl.c (rb_dl_malloc): add rb_secure(2).
+
+	* ext/dl/dl.c (rb_dl_realloc): ditto.
+
+	* ext/dl/dl.c (rb_dl_free): ditto.
+
+	* ext/dl/dl.c (rb_dl_ptr2value): ditto.
+
+Mon Aug 11 20:11:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (getrusage_time): works only if RUSAGE_SELF is defined right
+	  now.
+
+	* gc.c (gc_profile_result): C99.
+
+Mon Aug 11 18:57:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_sample): rename #choice to #sample.  in
+	  addition, sample takes optional argument, a la #first.
+
+Mon Aug 11 18:28:02 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c: added GC::Profiler.
+
+Mon Aug 11 17:26:16 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/README.ja: added API document for
+	  Readline.vi_editing_mode? and Readline.emacs_editing_mode?.
+
+	* ext/readline/extconf.rb: checked rl_editing_mode variable in
+	  Readline library.
+
+	* ext/readline/readline.c (readline_s_emacs_editing_mode_p): added
+	  Readline.emacs_editing_mode? method.
+	  (readline_s_vi_editing_mode_p): added Readline.vi_editing_mode?
+	  method.
+	  (Init_readline): ditto.
+
+Mon Aug 11 16:56:40 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* test/readline/test_readline.rb: added test for Readline's class
+	  methods.
+
+Mon Aug 11 16:39:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (clone_method): should copy cbase in cref as well.
+	  [ruby-dev:35116]
+
+	* iseq.c (iseq_mark): mark original iseq object.
+
+	* iseq.c (iseq_free): do not free internal data if they have
+	  original iseq to belong.
+
+	* iseq.c (rb_iseq_clone): a new function to clone iseq value.
+
+Mon Aug 11 16:34:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/iso2022.trans: renamed from iso2022.erb.c.
+
+	* enc/trans/single_byte.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+	* enc/trans/korean.trans: ditto.
+
+	* enc/trans/japanese.trans: ditto.
+
+	* enc/depend: follow the renaming.
+
+	* tool/build-transcode: ditto.
+
+Mon Aug 11 15:09:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
+	  rb_broken_glibc_ia64_erfc.
+	  [ruby-core:18228]
+
+Mon Aug 11 10:04:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): rename fields.
+	  readlen -> recognized_len.
+	  feedlen -> readagain_len.
+
+	* transcode.c: follow the field renaming.
+
+Sun Aug 10 22:34:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_restartable0): invalid handling simplified.
+	  (transcode_restartable): use PARTIAL_INPUT for converting buffered
+	  input.
+
+Sun Aug 10 22:24:24 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* encoding.c: include util.h.  [ruby-dev:35715]
+
+	* common.mk: ditto.
+
+Sun Aug 10 20:59:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): new field: flags.
+
+	* transcode.c (load_transcoder): extracted from transcode_dispatch_cb.
+	  (rb_transcoding_result_t): renamed from transcode_result_t.
+	  (rb_transcoding_open): new function.
+	  (rb_transcoding_convert): ditto.
+	  (rb_transcoding_close): ditto.
+	  (transcode_loop): use rb_transcoding_open, rb_transcoding_convert
+	  and rb_transcoding_close.
+	  (str_transcode): don't need rb_transcoding.
+
+Sun Aug 10 18:09:16 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: record checksum of
+	  transcode-tblgen.rb itself.
+
+Sun Aug 10 12:34:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* config.guess ({powerpc-apple,i586-pc}-haiku): re-applied r18403.
+	  [ruby-core:18110]
+
+	* config.{guess,sub}: updated to automake-1.10.1.
+
+Sun Aug 10 11:45:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/Makefile.in (make-workdir): use MAKEDIRS.
+
+	* enc/depend: makes target directory before compile/link.
+
+	* tool/transcode-tblgen.rb: creates target directory.
+
+Sun Aug 10 11:30:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c: rename my_transcoding to tc and my_transcoder to tr.
+
+Sun Aug 10 11:15:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): add feedlen field.
+
+	* transcode.c (transcode_restartable0): renamed from
+	  transcode_restartable.
+	  save input buffer into feed buffer if next character is started the
+	  point before input buffer.  for example, "\x00\xd8\x01" then "\x02"
+	  in UTF-16LE.  \x02 causes invalid and next character is started from
+	  \x01.
+	  (transcode_restartable): new function to call
+	  transcode_restartable0.  if feed buffer is not empty, convert it at
+	  first.
+
+Sun Aug 10 11:02:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (extconf): use MAKEDIRS.
+
+Sun Aug 10 09:35:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb.rb (IRB::Irb#inspect): instance_variables returns symbols
+	  instead of strings now.  [ruby-dev:34930]
+
+Sun Aug 10 09:22:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_char_start): refactored to remove readlen
+	  argument.
+	  (transcode_restartable): refactored to remove readlen variable.
+
+Sun Aug 10 08:56:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
+	  [ruby-core:18207]
+
+	* configure.in (rb_cv_missing__dtos18, rb_cv_missing_fconvert),
+	  ext/digest/md5/md5.c, ext/openssl/ossl.c (main),
+	  ext/socket/extconf.rb (ipv6, wide-getaddrinfo): main should be int.
+
+	* main.c (main), win32/winmain.c, wince/wincemain.c (WinMain): envp is
+	  no longer used so long time.  based on a patch from Peter Bowen at
+	  [ruby-core:18208]
+
+Sat Aug  9 22:05:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_loop): take destination and resize function
+	  as parameters.
+	  (more_output_buffer): ditto.
+	  (str_transcoding_resize): argument changed from rb_transcoding* to
+	  VALUE.
+	  (str_transcode): call transcode_loop with destination string and its
+	  resize function.
+
+	* transcode_data.h (rb_transcoding): move ruby_string_dest and
+	  flush_func to transcode_loop parameters.
+
+Sat Aug  9 21:29:45 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: encs depend on transdb.h
+
+Sat Aug  9 21:10:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of
+	  AC_TRY_RUN.
+
+Sat Aug  9 16:33:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): new fields: next_info and next_byte.
+
+	* transcode.c (transcode_restartable): save/restore next_info and
+	  next_byte.
+	  sync readlen and in_p when invalid.
+
+Sat Aug  9 15:10:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_restartable): my_transcoder argument removed.
+	  (transcode_loop): my_transcoder argument removed.
+
+Sat Aug  9 14:39:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): add fields for restartable
+	  transcoding.
+	  (rb_transcoder): add max_input field.
+	  from_unit_length field is renamed to input_unit_length.
+
+	* tool/transcode-tblgen.rb: generate max_input field.
+
+	* enc/trans/iso2022.erb.c: follow rb_transcoder change.
+
+	* enc/trans/utf_16_32.erb.c: ditto.
+
+	* transcode.c (PARTIAL_INPUT): new constant.
+	  (transcode_char_start): new function.
+	  (transcode_result_t): new type.
+	  (transcode_restartable): new function.
+	  (more_output_buffer): new function.
+	  (transcode_loop): use transcode_restartable.
+
+Sat Aug  9 13:35:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
+	  preprocessor directives.  a patch from Peter Bowen at
+	  [ruby-core:18211].
+
+Sat Aug  9 06:37:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/make_encdb.rb, enc/trans/make_transdb.rb: skip nonexistent
+	  directory.  [ruby-dev:35802]
+
+Sat Aug  9 01:07:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/utf_16_32.erb.c (fun_so_from_utf_32le): implemented.
+	  (fun_so_to_utf_32le): implemented.
+	  [ruby-dev:35777]
+
+Sat Aug  9 00:42:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder): from_unit_length field added.
+	  from_utf8 field removed.
+
+	* tool/transcode-tblgen.rb: generate offsets range.
+	  follow rb_transcoder change.
+
+	* transcode.c (transcode_loop): don't use from_utf8.
+	  make invalid region from_unit_length wise.
+
+	* enc/trans/iso2022.erb.c: follow rb_transcoder and
+	  transcode_generate_node change.
+
+	* enc/trans/utf_16_32.erb.c: follow rb_transcoder and
+	  transcode_generate_node change.
+	  explicit :invalid map removed.
+
+Fri Aug  8 23:29:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (TRANSCSRCS): needs rule_subst to apply.
+
+	* io.c (shutdown): not define if defined already.
+
+Fri Aug  8 22:47:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (opt_eq_func): large function to make inline.
+
+	* bcc32/Makefile.sub (config.h): cannot compile a big inline function.
+
+Fri Aug  8 21:09:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (enk.mk): give not RUBY but MINIRUBY.
+
+Fri Aug  8 17:03:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (shutdown, sched_yield, pthread_attr_setinheritsched):
+	  check for Haiku.
+
+	* eval_intern.h, io.c, thread_pthread.c: use autoconfisticated results.
+
+Fri Aug  8 16:52:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (enc.mk): mkmf.rb requires rbconfig.rb.
+
+	* common.mk (srcs-enc): renamed from transcodes.
+
+	* enc/Makefile.in (make-workdir): creates object directories.
+
+	* common.mk (encdb.h): see both $(srcdir)/enc and enc.
+
+	* enc/make_encdb.rb: ditto.
+
+	* enc/trans/make_transdb.rb: fix for the case no transdirs are given.
+
+	* enc/trans/make_transdb.rb: converts only one transcoders for each
+	  basename.
+
+Fri Aug  8 10:53:52 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: randomize source port and transaction id.
+	  CVE-2008-1447.
+
+	* lib/resolv-replace.rb (UDPSocket#bind): don't resolv host if host is
+	  "".
+
+Fri Aug  8 04:20:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: see both $(srcdir)/enc/trans and enc/trans.
+
+	* enc/trans/make_transdb.rb: ditto.
+
+Fri Aug  8 00:05:02 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/.document: added readline/readline.c.
+
+	* ext/readline/readline.c: changed Copyright. added RDoc.
+
+	* ext/readline/README.ja: fixed typo.
+
+	* ext/readline/README: contents was moved RDoc.
+
+Thu Aug  7 23:43:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoding): new field "stateful".
+	  (rb_transcoder): preprocessor and postprocessor field removed.
+	  change arguments of func_ii, func_si, func_io and func_so.
+	  new field "finish_func".
+
+	* tool/transcode-tblgen.rb: make FUNii, FUNsi and FUNio
+	  generatable.
+
+	* transcode.c (transcoder_lib_table): removed.
+	  (transcoder_table): change structure.
+	  (transcoder_key): removed because the above structure change.
+	  (make_transcoder_entry): new function.
+	  (get_transcoder_entry): ditto.
+	  (rb_register_transcoder): follow the structure change.
+	  (declare_transcoder): ditto.
+	  (transcode_search_path): new function for breadth first search to
+	  find a list of converters.
+	  (transcode_search_path_i): new function.
+	  (transcode_dispatch_cb): ditto.
+	  (transcode_dispatch): use transcode_search_path.
+	  (transcode_loop): follow the argument change.
+	  (str_transcode): preprocessor and postprocessor stuff removed.
+
+	* enc/trans/iso2022.erb.c: new file.  ISO-2022-JP conversion
+	  re-implemented.
+
+	* enc/trans/japanese.erb.c: ISO-2022-JP stuff removed.
+
+	* enc/trans/utf_16_32.erb.c: follow argument change of FUNso.
+
+	[ruby-dev:35798]
+
+Thu Aug  7 22:55:44 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/README.ja: updated API document for Readline module.
+
+Thu Aug  7 20:52:08 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
+	  is not supplied.  fixed [ruby-core:18058].
+
+Thu Aug  7 18:01:44 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-mode.el (ruby-imenu-create-index-in-block): Fix the
+	  regexp to only pick definition lines properly.  `module_function'
+	  is not a definition of a module named `_function'.
+
+Thu Aug  7 17:47:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend: add transdb.c.
+
+Thu Aug  7 16:28:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not
+	  use miniruby.
+
+Thu Aug  7 14:17:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend: removed needless explicit commands.
+
+	* lib/mkmf.rb, {bcc32,win32}/Makefile.sub (CLEANLIBS, CLEANOBJS):
+	  moved clean targets to platform makefiles.
+
+Thu Aug  7 13:12:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/getaddrinfo.c (gai_strerror): ignore only on Haiku.
+	  a patch from <zn at mbf.nifty.com>, [ruby-dev:35796].
+
+Thu Aug  7 06:31:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/process.rb (test_popen_fork): skip a test which is
+	  freeze in FreeBSD.
+
+Thu Aug  7 06:05:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* config.guess: add powerpc-apple-haiku, i586-pc-haiku.
+	  see [ruby-core:18110]
+
+Thu Aug  7 05:51:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* eval_intern.h: Add support to Haiku. see [ruby-core:18110]
+
+	* include/ruby/defines.h: ditto.
+
+	* configure.in: ditto.
+
+	* thread_pthread.c: ditto.
+
+	* io.c: ditto.
+
+	* lib/mkmf.rb: ditto.
+
+	* ext/socket/getaddrinfo.c: ditto.
+
+	* ext/socket/extconf.rb: ditto.
+
+	* ext/socket/socket.c: ditto.
+
+	* ext/socket/addrinfo.h: ditto.
+
+	* ext/socket/getnameinfo.c: ditto.
+
+Thu Aug  7 05:43:32 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: mkdir enc/trans before build tables.
+
+Thu Aug  7 05:18:30 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/depend: enc/*.c is source but enc/trans/*.c is generated.
+
+Thu Aug  7 05:14:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regenc.c (code_to_mbc): raise RangeError Integer#chr
+	  when more than 255 is given with single byte encoding.
+	  [ruby-dev:35789]
+
+Thu Aug  7 05:06:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (run_final): runs finalizers with the object terminated.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): keeps finalized objects from
+	  linking to freelist.
+
+Thu Aug  7 04:43:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/depend: for build in other than srcdir.
+
+Wed Aug  6 22:40:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (transcode_generate_node): code
+	  argument removed.
+
+Wed Aug  6 21:25:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (chain_finalized_object): deletes finalizers to be invoked from
+	  finalizer_table.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): warns when could not invoke
+	  finalizers.
+
+Wed Aug  6 20:56:43 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/depend: transcode table generation depends on
+	  tool/transcode-tblgen.rb.
+
+Wed Aug  6 20:48:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): self-referencing finalizers
+	  cannot be invoked.  [ruby-dev:35681]
+
+Wed Aug  6 20:44:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: distinguish UNDEF and INVALID.
+	  [ruby-dev:35709]
+
+	* transcode.c (transcode_loop): don't need rb_enc_mbclen now.
+
+Wed Aug  6 14:40:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (transdb.h): requires transcoders.
+
+	* enc/depend (srcs): target for transcoders.
+
+Wed Aug  6 14:04:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/depend: replace not only $(<:...) but also $<.
+
+Wed Aug  6 13:54:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): export BASERUBY.
+
+	* enc/depend: avoid GNU make'ism.
+
+Wed Aug  6 07:59:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb (ActionMap#eql?): use == to compare @map.
+
+Wed Aug  6 07:45:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: show generating tables in verbose mode.
+	  (transcode_generate_node): call ActionMap#generate_node with showing
+	  table name.
+
+	* enc/trans/utf_16_32.erb.c: use transcode_generate_node.
+
+Wed Aug  6 06:55:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): propagates fatal error and system
+	  exit to the main thread.
+
+Wed Aug  6 05:31:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_to_encoding_index, rb_to_encoding): check if the name
+	  is ascii compatible as well as Encoding.find.
+
+	* transcode.c (str_encode): no need to duplicate first.
+
+Wed Aug  6 05:08:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): reset to real class.
+
+	* file.c (rb_find_file_ext, rb_find_file): ditto.
+
+	* io.c (io_reopen): ditto.
+
+Wed Aug  6 03:56:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (transcodes), tool/build-transcode: generates transcode
+	  sources.
+
+	* enc/trans/{japanese,korean,single_byte,utf_16_32}.c: to be
+	  autogenerated now.
+
+	* enc/depend: added rules for .c from .erb.c.
+
+Tue Aug  5 20:46:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/build-transcode: new file.
+
+	* tool/transcode-tblgen.rb: new file.
+
+	* enc/trans/make_transdb.rb: exclude *.erb.c.
+
+	* enc/depend: exclude *.erb.c.
+
+	* enc/trans/utf_16_32.erb.c: new file.
+
+	* enc/trans/single_byte.erb.c: new file.
+
+	* enc/trans/japanese.erb.c: new file.
+
+	* enc/trans/korean.erb.c: new file.
+
+	* enc/trans/iso-8859-2-tbl.rb: new file.
+
+	* enc/trans/iso-8859-3-tbl.rb: new file.
+
+	* enc/trans/iso-8859-4-tbl.rb: new file.
+
+	* enc/trans/iso-8859-5-tbl.rb: new file.
+
+	* enc/trans/iso-8859-6-tbl.rb: new file.
+
+	* enc/trans/iso-8859-7-tbl.rb: new file.
+
+	* enc/trans/iso-8859-8-tbl.rb: new file.
+
+	* enc/trans/iso-8859-9-tbl.rb: new file.
+
+	* enc/trans/iso-8859-10-tbl.rb: new file.
+
+	* enc/trans/iso-8859-11-tbl.rb: new file.
+
+	* enc/trans/iso-8859-13-tbl.rb: new file.
+
+	* enc/trans/iso-8859-14-tbl.rb: new file.
+
+	* enc/trans/iso-8859-15-tbl.rb: new file.
+
+	* enc/trans/eucjp-tbl.rb: new file.
+
+	* enc/trans/sjis-tbl.rb: new file.
+
+	* enc/trans/euckr-tbl.rb: new file.
+
+	* enc/trans/utf_16_32.c: regenerated.
+
+	* enc/trans/single_byte.c: regenerated.
+
+	* enc/trans/japanese.c: regenerated.
+
+	* enc/trans/korean.c: regenerated.
+
+	[ruby-dev:35730]
+
+Tue Aug  5 18:02:53 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/io/nonblock/test_flush.rb (TestIONonblock#test_flush):
+	  rescue some exceptions. [ruby-dev:35638]
+
+Tue Aug  5 16:40:06 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
+	  fixed [ruby-core:18057].
+
+Tue Aug  5 16:38:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h, bcc32/Makefile.sub (config.h): bcc 5.8 has
+	  stdint.h.
+
+Tue Aug  5 16:13:05 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): do not refer to SSL::SSLSocket for
+	  environments without OpenSSL. fixed [ruby-dev:35755].
+
+Tue Aug  5 14:19:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_stat_mode): generalized st_mode mask.
+
+Tue Aug  5 12:43:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (retry_sendfile, retry_read): ENOSYS and EWOULDBLOCK are not
+	  defined on every platforms.
+
+Tue Aug  5 12:34:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode_data.h (TRANSCODE_ERROR): common transcode failure
+	  exception, would be changed later.
+
+	* enc/trans/japanese.c (UNSUPPORTED_MODE): unsupported mode transition
+	  exception.
+
+Tue Aug  5 03:29:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): respect overridden <=> for String and
+	  Fixnum.  [ruby-core:17708]
+
+	* include/ruby/node.h (NOEX_BASIC): basic definition method flag.
+
+	* include/ruby/intern.h, vm_method.c (rb_method_basic_definition_p):
+	  new function to check if the method is not redefined after the
+	  initialization.
+
+	* vm_method.c (rb_obj_respond_to): use rb_method_basic_definition_p.
+
+Mon Aug  4 20:39:06 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in (update-rubyspec): renamed the rubyspec directory
+	  "spec". Changed directory structure.
+
+	* Makefile.in (test-rubyspec): ditto.
+
+	* spec/README: described the structure of "spec" directory.
+
+	* spec/default.mspec: configured for Matz's Ruby Implementation.
+
+Mon Aug  4 19:21:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_tmp_new): added.
+
+	* vm_eval.c (vm_call_super): fixed typo, and get rid of too large
+	  alloca.  [ruby-core:17922]
+
+Mon Aug  4 16:48:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix
+	  up fixnum range literal in conditional as automagical line number
+	  comparison.  [ruby-core:12124], [ruby-dev:35731]
+
+Mon Aug  4 14:41:25 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP::rcptto): fix a typo. a patch from
+	  Masao Takaku <masao at nii.ac.jp>
+	  fix [ruby-dev:35489].
+
+Mon Aug  4 14:08:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (dump_ensure), process.c (run_exec_dup2),
+	  string.c (rb_str_replace), transcode.c (transcode_dispatch): fixed
+	  memory leaks.  based on patches from shinichiro.h <shinichiro.hamaji
+	  AT gmail.com> at [ruby-dev:35751].
+
+Sun Aug  3 19:32:52 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (hash2named_arg): refactoring.
+
+	* ext/win32ole/win32ole.c (ole_invoke, fole_respond_to, ev_on_event,
+	  fev_off_event): accepts Symbol argument.
+
+	* test/win32ole/test_win32ole.rb: ditto.
+
+	* test/win32ole/test_win32ole_event.rb: ditto.
+
+Sun Aug  3 10:41:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_shared_replace): fixed memory leak.  a patch from
+	  shinichiro.h <shinichiro.hamaji AT gmail.com> at [ruby-dev:35742]
+
+Sat Aug  2 22:55:41 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_err_in_callback.rb: remove temporary files.
+	  some refactoring.
+
+Sat Aug  2 15:51:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yylex): 8 and 9 in octal integer should cause compile
+	  error.  [ruby-dev:35729]
+
+Sat Aug  2 01:06:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.c: add U+FF5E to EUC-JP.
+	  [ruby-dev:35720] [ruby-dev:35722]
+
+Fri Aug  1 23:49:44 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/extconf.rb: checked to have clear_history in
+	  readline library.
+	* ext/readline/readline.c (hist_get, hist_each, Init_readline):
+	  The offset specified for the argument of history_get() might be
+	  different in GNU Readline and libedit. If use libedit, it was
+	  corrected that the computational method of the offset specified
+	  for the argument of history_get() when the Readline module was
+	  initialized was decided.
+	  (hist_get, hist_set): If use libedit, accesses first an input
+	  content in history when specifies the negative offset for the
+	  argument of history_get() or replace_history_entry(). Then
+	  checks the offset is negative in ruby.
+	  (rb_remove_history): When compiling, it corrects it to warning
+	  when libedit is used.
+	  (hist_clear, Init_readline): added Readline::HISTORY.clear
+	  method. [ruby-dev:35551]
+	* test/readline/test_readline_history.rb: added unit test for
+	  Readline::HISTORY.
+
+Fri Aug  1 23:26:45 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (transcode_loop): undefined character is replaced with
+	  only one character. [ruby-dev:35709]
+
+Fri Aug  1 23:26:22 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	Merged r16430(akr), r16431(akr), r16433(akr), r16469(nobu), and
+	r17874(akr) from ruby_1_8.
+
+	* Makefile.in (update-rubyspec): added
+
+	* Makefile.in (test-rubyspec): added
+
+Fri Aug  1 23:16:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.c: add support for CP51932,
+
+Fri Aug  1 22:59:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.c: add U+FF0C,
+
+Fri Aug  1 21:49:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/sdbm/test_sdbm.rb: add some tests.
+
+Fri Aug  1 21:36:00 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gc.c (allocate_heaps, assign_heap_slot, rb_newobj_from_heap):
+	  reset during_gc before raising NoMemoryError.
+
+Fri Aug  1 21:29:56 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (Init_BareVM): check failure of malloc().
+
+Fri Aug  1 20:55:27 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.c (to_SHIFT_JIS_EF_BF_offsets): add U+FFF3,
+	  U+FFF4, U+FFF5.
+
+	* enc/trans/japanese.c (to_SHIFT_JIS_EF_BF_infos): ditto.
+
+	* enc/trans/japanese.c (to_EUC_JP_EF_BF_infos): added.
+
+	* enc/trans/japanese.c (to_EUC_JP_EF_BF): added.
+
+	* enc/trans/japanese.c (to_EUC_JP_EF_infos): change size.
+	  [ruby-dev:35714]
+
+Fri Aug  1 18:27:15 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* parse.y (parser_yylex): removed an useless conditional, and magic
+	  comment are ignored unless at the first of line.
+
+	* test/ruby/test_m17n.rb (test_magic_comment_vim): added.
+
+	* test/ruby/test_m17n.rb (test_magic_comment_at_various_positions):
+	  added.
+
+Fri Aug  1 14:54:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_seekdir): no need to rewind to seek forward.
+
+Fri Aug  1 05:31:08 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (output_replacement_character):
+	  rename from _get_replacement_character.
+
+	* transcode.c (output_replacement_character):
+	  fix replacement on UTF-32{BE,LE}. [ruby-dev:35705]
+
+	* transcode.c (transcode_loop): ditto.
+
+	* test/ruby/test_transcode.rb (test_invalid_replace):
+	  add for above.
+
+Fri Aug  1 01:01:49 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (rb_proc_call_with_block): reduce comparison.
+
+Thu Jul 31 22:17:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpMult): prevent memory leak.
+
+Thu Jul 31 20:05:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
+	  fix option1 and 3.
+
+Thu Jul 31 19:54:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (get_replacement_character): use U+FFFD as replacement
+	  character when convert to Unicode.
+
+	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
+	  rename from test_public_review_issue_121.
+
+	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
+	  enable option2.
+
+Thu Jul 31 17:00:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (get_replacement_character): fix: invalid byte sequence
+	  is always replaced "\x00?".
+
+Thu Jul 31 16:37:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rubygems/test_gem_ext_configure_builder.rb
+	  (test_self_build_fail): remove extra newline. [ruby-dev:35704]
+
+Thu Jul 31 15:11:11 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb: added test_shift_jis
+	  (contributed by Yoshihiro Kambayashi) and
+	  test_public_review_issue_121
+	  (see http://www.unicode.org/review/pr-121.html)
+
+Thu Jul 31 13:18:30 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* include/ruby/ruby.h (struct RString): size of ary must be
+	  RSTRING_EMBED_LEN_MAX + 1.
+
+Thu Jul 31 12:23:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_unpack): upper half of hexdigits has never been used.
+
+Thu Jul 31 11:31:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/syck.h (ASSERT): fix typo at r18176.
+
+	* ext/syck/rubyext.c (rb_syck_compile): expression in ASSERT() has no
+	  effect unless debug mode.
+
+Thu Jul 31 10:51:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (ruby_iseq_disasm_insn): suppress warnings on platforms which
+	  int size differs from pointer size.
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): ditto
+
+	* ext/syck/rubyext.c (rb_syck_err_handler),
+	  (syck_default_error_handler): ditto.
+
+Thu Jul 31 02:21:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/syck/rubyext.c (rb_syck_compile): remove meaningless branch
+	  that misleads into thinking that the variable sav may be
+	  uninitialized.
+
+Thu Jul 31 01:25:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_mutex_unlock_all): mutex is no longer a ruby object.
+
+Thu Jul 31 01:18:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (magic_comment_encoding): remove meaningless null check.
+
+Thu Jul 31 01:09:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpIsRoundMode): fix tautology
+	  condition.
+
+Thu Jul 31 00:58:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_unpack): reduced static variables.
+
+Thu Jul 31 00:10:20 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (rb_proc_call_with_block): prevent null reference.
+
+Wed Jul 30 22:19:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (vtable_free): remove meaningless null check.
+
+Wed Jul 30 22:08:25 2008  Tanaka Akira  <akr@fsij.org>
+
+	* dir.c (struct dir_data): change path field char * to VALUE.
+	  (mark_dir): new function for mark path field.
+	  (free_dir): follow the path field change.
+	  (dir_s_alloc): ditto.
+	  (dir_initialize): ditto.
+	  (dir_s_open): ditto.
+	  (dir_inspect): ditto.
+	  (dir_path): return (duplicate of) the path field to preserve
+	  encoding.  [ruby-dev:35685]
+
+Wed Jul 30 22:06:56 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (sym_inspect): remove dead code.
+
+Wed Jul 30 21:32:52 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ChangeLog: fix wrong method name and add reference.
+
+Wed Jul 30 21:30:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regparse.c (name_add): fix memory leak.
+
+Wed Jul 30 21:08:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/syck/syck.c (syck_free_parser): fix memory leak by
+	  YAML::Syck.compile.
+
+	* regparse.c (parse_exp): fix memory leak at Regexp.new("x{1,1}").
+
+Wed Jul 30 17:48:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_select): recalc the rest of timeout for each
+	  iterations.  [ruby-core:18015]
+
+Tue Jul 29 23:37:37 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (io_ungetc): raise NotImplementedError when ungetc is called
+	  against dummy encoding IO.  [ruby-dev:35686]
+
+	* io.c (rb_io_getline_1): ditto when gets with delimiter is called.
+
+	* io.c (io_getc): ditto when getc is called.
+
+	* test/ruby/test_io_m17n.rb (test_terminator_stateful_conversion,
+	  test_getc_stateful_conversion, test_ungetc_stateful_conversion):
+	  these tests should raise NotImplementedError.
+
+Tue Jul 29 22:55:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_io.rb (pipe): run reader thread and writer thread.
+
+Tue Jul 29 21:38:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal): fix typo.
+
+Tue Jul 29 21:35:59 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/etc/test_etc.rb (test_passwd): age field may be string under
+	  some environments.
+
+Tue Jul 29 17:54:35 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (char_casecmp): fix: return 0 if either of characters is NUL.
+
+Tue Jul 29 13:17:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/etc/test_etc.rb (test_getpwuid): fix for users whose uid is
+	  shared.
+
+Tue Jul 29 05:37:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext, rb_find_file): explicit relative path
+	  which starts with "./" or "../" should be searched from cwd
+	  instead of load path.  [ruby-dev:35673]
+
+Tue Jul 29 02:39:46 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* math.c (math_atanh): raise EDOM on FreeBSD when atanh(1).
+
+	* math.c (math_log): ditto.
+
+	* math.c (math_log2): ditto.
+
+	* math.c (math_log10): ditto.
+
+	* test/ruby/test_math.rb: test for above.
+
+Tue Jul 29 01:41:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* dir.c (struct dir_data): intenc field removed.
+	  (dir_s_alloc): intenc initialization removed.
+	  (dir_initialize): :internal_encoding option removed.  dirname code
+	  conversion removed.
+	  (dir_enc_str): code conversion removed.
+	  [ruby-dev:35661]
+
+Mon Jul 28 21:32:17 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/: use PNG instead of zlib as binary data.
+
+Mon Jul 28 21:24:33 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.[ch] (cond_every_entry, rb_thread_cond_struct): reverted
+	  r18239 because r18245 made the changes unnecessary.
+
+	* thread.c (rb_mutex_struct): define after including thread_{pthread,
+	  win32}.c.
+
+Mon Jul 28 21:00:10 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_require.rb (test_require_too_long_filename):
+	  Kernel#require does not use dln_find_file_r (at r18242).
+
+Mon Jul 28 20:17:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_core.h: move the definition of struct rb_mutex_struct.
+
+	* thread.c: ditto.
+
+Mon Jul 28 18:58:46 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (mutex_unlock): fix typo.
+
+Mon Jul 28 18:15:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext, rb_find_file): not to split load path with
+	  path separator.  [ruby-Bugs-21356]
+
+Mon Jul 28 18:14:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (overlapped_socket_io, fcntl, rb_w32_close): must not
+	  pass a pointer to int which is smaller than st_data_t on mswin64.
+
+Mon Jul 28 16:49:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (CreateChild, overlapped_socket_io): suppress
+	  warnings.
+
+Mon Jul 28 16:06:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (MAXPATHLEN): define before use.
+
+Mon Jul 28 16:01:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.[ch] (cond_every_entry, rb_thread_cond_struct): moved
+	  the definitions from .c to .h because rb_thread_cond_struct is used
+	  in vm_core.h.
+
+Mon Jul 28 14:29:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (load_lib): use dln_find_file_r instead of dln_find_file.
+
+Mon Jul 28 00:18:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_core.h, thread.c: It is now prohibited to use Data_Get_Struct in
+	  *_free against an object that is going to be free'ed.  So, change type
+	  of thread_t#keeping_mutexes from VALUE to mutex_t.
+
+	* vm.c: remove mark to keeping_mutexes.
+
+Sun Jul 27 23:32:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and
+	  Errno::ECONNABORTED.
+
+Sun Jul 27 22:11:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bootstraptests/method.rb: increase RLIMIT_STACK size to 4M+8Kbytes
+	  because FreeBSD fails this less than that.
+
+Sun Jul 27 21:45:59 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_children, obj_free): T_DEFERRED should not be appear.
+
+	* gc.c (gc_sweep, finalize_list): fix to decrement heap_slot#limit
+	  after executing finalizer.
+
+Sun Jul 27 14:48:37 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: add a type T_DEFERRED.
+
+	* gc.c: fix deferred finalizer system.  finalize processes of
+	  T_DATA and T_FILE are executed after gc process.
+	  And fix to use BUILTIN_TYPE() instead of seeing flag.
+
+	* thread.c, vm_core.h: add RUBY_VM_SET_FINALIZER_INTERRUPT()
+	  and check interrupt_flag at rb_thread_execute_interrupts().
+
+	* thread.c (mutex_mark): fix to mark next_mutex.
+
+	* vm.c (rb_thread_mark): fix to mark keeping_mutexes.
+
+Sun Jul 27 09:15:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.h (dln_find_exe, dln_find_file): deprecated, use reentrant
+	  versions instead.
+
+Sun Jul 27 09:02:32 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb: merged from 1.8.
+
+	* test/rinda/test_rinda.rb: merged from 1.8.
+
+Sat Jul 26 22:45:18 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* sample/exyacc.rb: fixed NoMethodError(Kernel#sub!).
+	  replaced use of special variables with explicit IO
+	  operations.
+
+Sat Jul 26 21:17:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): add
+	  WIN32OLE_EVENT#handler=, WIN32OLE_EVENT#handler
+
+	* test/win32ole/test_win32ole_event.rb: ditto.
+
+Sat Jul 26 07:44:14 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (add_event_call_back): remove unused
+	  variable.
+
+Fri Jul 25 23:48:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and
+	  Data.  [ruby-dev:35578]
+
+Fri Jul 25 23:35:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#split_header_value):
+	  reduce backtrack.  based on a fix by Christian Neukirchen
+	  <chneukirchen AT gmail.com>.
+
+Fri Jul 25 21:55:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/enc/test_koi8.rb: move from test/ruby/test_koi8.rb.
+
+Fri Jul 25 21:09:32 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke, add_event_callback,
+	  rescue_callback): refactoring.
+
+Fri Jul 25 20:52:44 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/err_in_callback.rb: add test of raising
+	  exception in WIN32OLE_EVENT callback.
+
+	* test/win32ole/test_err_in_callback.rb: ditto.
+
+Fri Jul 25 20:43:57 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): add
+	  WIN32OLE_EVENT#off_event.
+
+	* test/win32ole/test_win32ole_event.rb: ditto.
+
+	* test/win32ole/test_win32ole_event.rb: some refactoring.
+
+Fri Jul 25 19:50:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regint.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
+
+Fri Jul 25 15:52:40 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_invoke_proc): skip setting safe_level if
+	  it from bmethod.  This change makes test/ruby/test_proc.rb pass.
+
+Fri Jul 25 10:00:00 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb: refactoring/cleanup of
+	  test_iso_2022_jp(_1)
+
+Fri Jul 25 04:12:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.
+	  [ruby-list:45257]
+
+Fri Jul 25 02:43:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* sample/coverage.rb: move from lib/coverage.rb because this remains in
+	  an early phase of development.
+
+Fri Jul 25 00:10:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext, rb_find_file): converts Windows style path
+	  to Cygwin path.  [ruby-dev:35647]
+
+Thu Jul 24 16:30:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (exit_handler): use st_free_table() to free socklist.
+
+	* win32/win32.c (rb_w32_pipe_exec, rb_w32_accept, rb_w32_socket,
+	  rb_w32_socketpair): should check and release fd and sockets/handles
+	  if an error occurs in rb_w32_open_osfhandle().
+
+Thu Jul 24 16:05:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (overlapped_socket_io): avoid warnings.
+
+	* thread_win32.c (ubf_handle): refactoring.
+
+Thu Jul 24 07:01:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c: got rid of improper casts.
+
+Wed Jul 23 23:19:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/socket/test_tcp.rb (test_recvfrom): replace an irrelevant test
+	  for old behavior.
+
+Wed Jul 23 21:38:16 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_marshal.rb: suppress warning during test.
+
+Wed Jul 23 21:35:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_dir.rb: suppress warning during test.
+
+Wed Jul 23 18:27:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings
+	  about constness and signedness.
+
+Wed Jul 23 17:04:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/openssl_missing.h (d2i_of_void): define for older
+	  versions.  [ruby-dev:35637]
+
+Wed Jul 23 13:53:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/curses/extconf.rb: use try_static_assert.
+
+Wed Jul 23 10:06:19 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/zlib/test_zlib.rb (TestZlibDeflate#test_params): suppress a
+	  finalizer warning.
+
+Wed Jul 23 06:25:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck: suppress warnings more.
+
+Wed Jul 23 03:19:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename):
+	  constified.
+
+Wed Jul 23 03:02:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck: suppress warnings.
+
+Wed Jul 23 00:34:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl: suppress warnings.
+
+Tue Jul 22 23:01:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/syck/rubyext.c, ext/syck/yaml2byte.c, ext/syck/emitter.c,
+	  ext/syck/syck.c, ext/syck/handler.c, ext/syck/syck.h: suppress GCC
+	  warning.
+
+Tue Jul 22 20:42:24 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): BigDecimal#<=> should
+	  return nil if an argument can't be coerced into BigDecimal.
+
+	* ext/bigdecimal/bigdecimal.h, ext/bigdecimal/bigdecimal.c
+	  (VpIsNegDoubleZero, VpItoV): comment out unused functions.
+
+Tue Jul 22 20:33:54 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/rdoc/test_rdoc_parser_ruby.rb (teardown): close tempfile.
+
+Tue Jul 22 19:38:38 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb: added two comments
+
+Tue Jul 22 18:08:34 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja: mention about FIX2LONG and NUM2LONG.
+	  see [ruby-dev:35197]
+
+Tue Jul 22 17:53:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (insn_data_to_s_detail), file.c (rb_stat_inspect),
+	  iseq.c (ruby_iseq_disasm_insn, ruby_iseq_disasm),
+	  process.c (pst_message), re.c (match_inspect): use rb_str_catf.
+
+	* dir.c (dir_inspect), iseq.c (iseq_inspect, insn_operand_intern): use
+	  rb_sprintf.
+
+	* error.c (rb_name_error, rb_raise, rb_loaderror, rb_fatal): use
+	  rb_vsprintf.
+
+Tue Jul 22 17:20:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (init_func): new function to get API's address which
+	  is often used and not supported on all Windows.
+
+	* win32/win32.c (overlapped_socket_io): shouldn't use overlapped I/O if
+	  CancelIo() is not supported.
+
+Tue Jul 22 16:47:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h, sprintf.c (rb_str_catf, rb_str_vcatf): new
+	  functions.  [ruby-dev:35597]
+
+	* string.c (rb_str_capacity): new function to return the capacity.
+
+Tue Jul 22 16:08:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (connect_blocking, socks_connect_blocking,
+	  ruby_connect): cast.
+
+Tue Jul 22 11:05:08 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481]
+
+	* test/ruby/test_process.rb: ditto.
+
+Tue Jul 22 09:51:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el: fix here-doc strings with inner quotes.  patches
+	  by Nathan Weizenbaum <nex342 AT gmail.com> from [ruby-core:17615]
+	  through [ruby-core:17910].
+
+Tue Jul 22 04:26:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_str_buf_new2): optimization for literals.
+
+	* string.c (str_buf_cat): returns VALUE.
+
+Tue Jul 22 03:34:01 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc*: Update to RDoc 2.1.0 r112.
+
+Tue Jul 22 02:51:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_str_buf_cat2, rb_str_cat2): optimization
+	  for literals.
+
+Tue Jul 22 02:50:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): fix the
+	  prototype of rb_vsprintf, and added rb_str_cat2.  [ruby-dev:35622]
+
+Mon Jul 21 17:15:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_filesystem_encoding): use locale encoding on Unix.
+	  [ruby-dev:35617]
+
+Mon Jul 21 15:29:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/vsnprintf.c (struct __sbuf, FILE): use size_t.
+
+	* sprintf.c (ruby__sfvwrite): ditto.
+
+Mon Jul 21 13:55:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): mentioned
+	  rb_sprintf and rb_vsprintf.  [ruby-dev:35611]
+
+Mon Jul 21 10:25:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (prepare_getline_args): check if rs is a string when non-nil
+	  lim is given.  [ruby-dev:35610]
+
+Mon Jul 21 04:55:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* dir.c (dir_initialize): use rb_convert_type instead of
+	  rb_check_convert_type to prevent SEGV by Dir.new(".", true).
+	  (dir_initialize): use FilePathValue before rb_enc_get(dirname) to
+	  prevent SEGV by Dir.new(0).
+
+Mon Jul 21 04:42:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_s_union): useless rb_enc_get call removed to prevent
+	  SEGV by Regexp.union("", nil).
+
+Sun Jul 20 22:50:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): NODE_POSTEXE should set each end
+	  procs only once.  [ruby-dev:35596]
+
+Sun Jul 20 16:00:37 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): use rb_protect
+	  instead of rb_rescue2. [ruby-dev:35595]
+
+Sun Jul 20 01:23:24 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.
+
+	* ext/win32ole/win32ole.c (EVENTSINK_GetIDsOfNames): return
+	  ITypeInfo::GetIDsOfNames().
+
+Sat Jul 19 09:31:35 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.
+
+	* ext/win32ole/win32ole.c: add document of inspect methods.
+
+Sat Jul 19 06:08:43 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc*: Import RDoc r104.  Various make test-all fixes.
+
+Sat Jul 19 00:27:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
+	  about 64bit positive value.
+
+Fri Jul 18 23:23:37 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): avoid cfp consistency
+	  error when exception raised in event callback.
+
+Fri Jul 18 14:52:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (socklist): table for registering socket options
+	  (currently only O_NONBLOCK).
+
+	* win32/win32.c (StartSockets, exit_handler): alloc/free socklist.
+
+	* win32/win32.c (is_socket): use socklist.
+
+	* win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
+	  register new socket to socklist.
+
+	* win32/win32.c (rb_w32_close): remove closing socket from socklist.
+
+	* win32/win32.c (fcntl): register socket options.
+
+	* win32/win32.c (overlapped_socket_io): send to/recv from socket with
+	  overlapped operation if the socket is not nonblocking mode.
+	  [experimental]
+
+	* win32/win32.c (rb_w32_send, rb_w32_sendto, rb_w32_recv,
+	  rb_w32_recvfrom): use overlapped_socket_io().
+
+	* win32/win32.c (open_ifs_socket): set overlapped mode. this is the
+	  default mode of winsock's socket(), so lacking it is an old bug.
+
+Fri Jul 18 09:44:30 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/*: Import RDoc r101.
+
+Thu Jul 17 23:45:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/rdoc/test_rdoc_c_parser.rb (teardown): close tempfile.
+
+Thu Jul 17 21:08:49 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_process.rb (test_getpriority, test_setpriority): use
+	  PRIO_PROCESS instead of PRIO_USER.
+
+Thu Jul 17 20:41:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* pack.c (pack_unpack): fix v and V with big endian.
+	  [1].pack("V").unpack("V") was [4294967296].
+
+Thu Jul 17 20:35:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* pack.c (pack_pack): fix i! with big endian.  [1].pack("i!") was
+	  "\0\0\0\0".
+
+Thu Jul 17 16:48:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): select() for connect() has
+	  mean only when the socket is non-blocking.
+
+Thu Jul 17 10:55:24 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* mkconfig.rb: Simplify expression for RDoc.
+
+Thu Jul 17 10:21:15 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
+	  fixed [ruby-dev:33683]
+
+Thu Jul 17 04:19:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): wake up joining threads.
+
+	* thread.c (sleep_forever, sleep_timeval): return when interrupted.
+	  [ruby-dev:35542]
+
+	* thread.c (timer_thread_function): restore main thread status.
+	  [ruby-core:17270]
+
+Thu Jul 17 01:27:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (appendline): remove invalid access.
+
+Wed Jul 16 18:04:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (signal_exec, trap_handler): trap accepts a string as
+	  command.  [ruby-dev:35533]
+
+Wed Jul 16 00:04:30 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): new
+	  method.
+
+	* test/ruby/test_argf.rb: use assert_in_out_err instead of
+	  EnvUtil.rubyexec.
+
+	* test/ruby/test_module.rb: ditto.
+
+	* test/ruby/test_require.rb: ditto.
+
+	* test/ruby/test_objectspace.rb: ditto.
+
+	* test/ruby/test_object.rb: ditto.
+
+	* test/ruby/test_string.rb: ditto.
+
+	* test/ruby/test_method.rb: ditto.
+
+	* test/ruby/test_variable.rb: ditto.
+
+	* test/ruby/test_io.rb: ditto.
+
+	* test/ruby/test_rubyoptions.rb: ditto.
+
+	* test/ruby/test_exception.rb: ditto.
+
+	* test/ruby/test_class.rb: ditto.
+
+	* test/ruby/test_thread.rb: ditto.
+
+Tue Jul 15 22:34:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (ruby_version): follow changes in configure.in.
+
+Tue Jul 15 21:58:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/{,tkutil/}extconf.rb: ruby/ruby.h no longer needs to be
+	  checked.
+
+	* ext/tk/{tcltklib.c,tkutil/tkutil.c}: check macros for each headers.
+
+Tue Jul 15 21:45:41 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/tk/extconf.rb, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: Do
+	  not test ruby/ruby.h, which makes OS X's gcc pick the wrong
+	  header file from Ruby.framework.
+
+Tue Jul 15 21:31:26 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (--with-ruby-version): Add a new option to specify
+	  the ruby version string for version specific directories.
+	  [ruby-dev:35490]
+
+	* mkconfig.rb: Definition of ruby_version is now determined by the
+	  configure script.
+
+Tue Jul 15 18:14:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect, s_accept): check before readable/
+	  writable by select() instead of wrapping in blocking region.
+
+	* ext/socket/socket.c (bsock_send, s_recvfrom, udp_send, unix_send_io,
+	  unix_recv_io): should check readable/writable before calling blocking
+	  functions.
+	  see [ruby-dev:35446]
+
+Tue Jul 15 18:12:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (ubf_handle): cancel blocking IO if it can (only
+	  Vista). see [ruby-dev:35446]
+
+	* win32/win32.c (errmap): add ERROR_OPERATION_ABORTED as EINTR.
+
+Mon Jul 14 20:35:21 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_event.rb (teardown): fix typo.
+
+Mon Jul 14 18:47:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (transcode_loop): constified.
+
+	* transcode.c (str_transcode): rb_str_set_len() sets a delimiter.
+
+	* transcode_data.h (rb_transcoder): constified preprocessor and
+	  postprocessor input.
+
+	* enc/trans/japanese.c: ditto.
+
+Sun Jul 13 05:37:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): typo.
+
+	* {bcc32,win32}/Makefile.sub: (SIZEOF_SIZE_T, SIZEOF_PTRDIFF_T): added.
+
+Sat Jul 12 23:54:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (LIBRUBY_DLDFLAGS): import library which created
+	  with DLL is broken. save import library which created by lib.exe and
+	  install it.
+	  fixed the problem mentioned at the postscript of [ruby-dev:35448]
+
+Sat Jul 12 23:24:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c: use PRIuSIZE.
+
+Sat Jul 12 22:41:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): fixed typo.
+
+Sat Jul 12 22:30:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (HAVE_RUBY_RUBY_H): defines macros so that
+	  extconf.rb do not need to check if headers exist under separated
+	  directory.  [ruby-dev:35437]
+
+	* include/{ruby,rubyio,rubysig}.h, include/ruby/intern.h: use
+	  "ruby/..." instead of <ruby/...>.
+
+Sat Jul 12 22:17:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (sizeof ptrdiff_t): check for size of ptrdiff_t.
+
+	* include/ruby/ruby.h (PRI?PTRDIFF, PRI?SIZE): printf conversion
+	  specifiers for ptrdiff_t and size_t/ssize_t.
+
+	* insns.def (leave), marshal.c (long_toobig), transcode.c
+	  (str_transcode), vm_dump.c (control_frame_dump, stack_dump_each),
+	  (debug_print_register, debug_print_pre): t and z length modifiers
+	  are C99.
+
+Sat Jul 12 16:02:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
+	  webrick/cookie.  [ ruby-Bugs-21139 ]
+
+Sat Jul 12 09:25:07 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_event.rb: add test
+	  for WIN32OLE_EVENT#on_event_with_outargs
+
+	* test/win32ole/test_win32ole_event.rb(teardown): calling
+	  WIN32OLE_EVENT.message_loop
+
+Sat Jul 12 01:54:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_select): shouldn't pass non-socket handle to
+	  original select().
+
+Fri Jul 11 23:05:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/zlib/test_zlib.rb: add a test for Zlib::Deflate#params.
+
+Fri Jul 11 22:58:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/zlib/zlib.c (rb_deflate_params): flush before deflateParams.
+	  [ruby-core:17675]
+
+Fri Jul 11 22:09:01 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.rb, win32/Makefile.sub (PLATFORM): use $(PLATFORM)
+	  instead of $(OS) because ENV["OS"] is used in test-all (drb).
+
+Fri Jul 11 20:51:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_wait_readable, rb_io_wait_writable): check if the file
+	  descriptor is closed.
+
+	* thread.c (rb_thread_wait_fd_rw): ditto.
+
+Fri Jul 11 16:16:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
+	  prohibit inheritance of sockets, too. [experimental]
+
+Fri Jul 11 14:39:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): the measures for Vista is no longer
+	  unnecessary.
+
+Fri Jul 11 06:16:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (process.o): depends on util.h.
+
+Fri Jul 11 05:07:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (pipe): prohibit inheritance.
+	  fixed: [ruby-dev:35421]
+
+Fri Jul 11 00:56:46 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (thread_create_core): fix GC problem.
+	  [ruby-core:17669]
+
+Thu Jul 10 22:06:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pstore.rb (PStore#transaction): return the result from the
+	  block.  [ruby-core:17718]
+
+Thu Jul 10 21:15:49 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_typelib.rb: add some illegal argument
+	  test.
+
+	* test/win32ole/test_win32ole_type.rb: ditto.
+
+	* test/win32ole/test_win32ole_event.rb: ditto.
+
+	* test/win32ole/test_win32ole_param.rb: ditto.
+
+	* test/win32ole/test_win32ole_method.rb: ditto.
+
+Thu Jul 10 19:38:35 2008  wanabe  <s.wanabe@gmail.com>
+
+	* test/ruby/envutil.rb (assert_normal_exit): r17993 revert.
+
+Thu Jul 10 18:29:41 2008  wanabe  <s.wanabe@gmail.com>
+
+	* test/ruby/envutil.rb (assert_normal_exit): finish writing script
+	  before spawn("ruby") to avoid blocking in win32.
+
+Thu Jul 10 17:20:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (insert): follow recent changes of globbing.
+
+Thu Jul 10 14:09:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/coverage/coverage.c (rb_coverage_start): return nil.
+
+Thu Jul 10 12:41:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_wait_for): fixed variable name.
+
+Thu Jul 10 12:09:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_thread_t), vm.c (rb_thread_mark), process.c
+	  (rb_last_status_get, rb_last_status_set, rb_last_status_clear):
+	  moved last_status from rb_vm_t.  [ruby-dev:35414]
+
+	* vm.c (th_init2): initialize last_status with nil.
+
+Thu Jul 10 12:09:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_wait_for): wait until timed out only when
+	  sleeping with timeout.
+
+Wed Jul  9 22:41:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (sleep_timeval): wait until timed out.  [ruby-core:17270]
+
+Wed Jul  9 20:58:16 2008  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_fill): don't raise even if length is negative.
+	  [ruby-core:17483], [ruby-core:17661]
+
+Wed Jul  9 20:18:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_va_args_macro): check for __VA_ARGS__.
+
+	* thread.c (thread_debug): show source name and line if possible.
+
+	* thread_{pthread,win32}.c (rb_thread_create_timer_thread): needs more
+	  stack for debug.
+
+Wed Jul  9 11:13:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/profiler.rb (Profiler__#print_profile): sort in the descending
+	  order of cumulative time.
+
+Wed Jul  9 11:11:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (struct glob_args, rb_glob_caller, rb_glob2, push_pattern),
+	  (glob_brace): make consistent prototypes.
+
+	* dir.c (push_glob): set enc in the caller of rb_glob_caller as well
+	  as rb_glob2.
+
+Wed Jul  9 09:12:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (options): use input_endian.
+
+Wed Jul  9 01:38:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_succ): alphabets or numerics mutually enclosing
+	  non-alphanumeric characters can carry up.  e.g., "1.999".succ should
+	  be "2.000".
+
+Wed Jul  9 00:12:31 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_set_coverages, rb_reset_coverages): enable and disable
+	  coverage measurement.
+
+	* thread.c (rb_get_coverages): rename and move from vm.c.
+
+	* vm.c (rb_vm_get_coverages): ditto.
+
+	* iseq.c (prepare_iseq_build): ditto.
+
+	* thread.c (clear_coverage): ditto.
+
+	* parse.y (coverage): ditto.
+
+	* ext/coverage/coverage.c: use above functions, add new method
+	  Coverage.start and fix rdoc .
+
+Tue Jul  8 23:02:35 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (find_default_source): bug fix when
+	  OLE object does not have default source interface.
+
+	* test/win32ole/test_win32ole_event.rb: ditto.
+
+Tue Jul  8 22:56:23 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_enable_coverages): hide coverage array by setting 0 to
+	  klass during measurement.
+
+	* parse.y (coverage, yycompile0): ditto.
+
+	* iseq.c (prepare_iseq_build): use rb_hash_lookup instead of
+	  rb_hash_aref.
+
+	* thread.c (rb_coverage_result): restore klass of coverage array
+	  and return it.
+
+	* thread.c (update_coverage): check whether its klass is 0.
+
+Tue Jul  8 22:28:25 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/debug.rb, lib/profile.rb: fix to use RubyVM.
+
+	* lib/rdoc/parsers/parse_c.rb: ditto.
+
+Tue Jul  8 21:45:22 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (rb_vm_mark): mark the last element of special_exceptions.
+
+Tue Jul  8 19:55:40 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (find_default_source): try to
+	  find COCLASS when WIN32OLE object is not COCLASS.
+
+	* test/win32ole/test_win32ole_event.rb: ditto
+
+Tue Jul  8 13:38:22 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.h: fix to skip inserting a trace insn.
+
+Tue Jul  8 11:41:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c: shouldn't use ruby object in globbing, because glob service
+	  routines are called before initializing ruby on some platforms (ex.
+	  windows).
+
+Tue Jul  8 10:08:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (Next): use rb_enc_mbclen. [ruby-dev:35390]
+
+Tue Jul  8 07:59:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (Next): use rb_enc_precise_mbclen.
+
+Tue Jul  8 02:27:23 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c: preserve encoding of strings in glob and fnmatch.
+
+	* include/ruby/ruby.h: related changes.
+
+Tue Jul  8 00:22:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_succ): limit carrying in an alphanumeric region if
+	  exists.  [ruby-dev:35094]
+
+Mon Jul  7 20:39:28 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(Init_win32ole): add
+	  WIN32OLE_TYPE#source_ole_types, WIN32OLE_TYPE#default_ole_types,
+	  WIN32OLE_TYPE#default_event_sources.
+
+	* test/win32ole/test_win32ole_type.rb: ditto.
+
+Mon Jul  7 19:45:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_dir.rb (test_chroot_nodir): add Errno::EPERM.
+
+Mon Jul  7 17:12:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
+	  IPAddr#to_range.  a patch from okkez <okkez000 AT gmail.com> in
+	  [ruby-dev:35091].
+
+Mon Jul  7 01:24:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_extname): fix for file name with spaces.
+	  [ruby-talk:307404]
+
+Mon Jul  7 00:59:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack): prior STACK_END_ADDRESS if
+	  found.  [ruby-core:17624]
+
+Sun Jul  6 23:48:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (bsock_send, s_recvfrom, ruby_connect, s_accept),
+	  (udp_send, unix_send_io, unix_recv_io): blocking region support.
+
+Sun Jul  6 18:34:35 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_type.rb (test_initialize): add
+	  more assertions.
+
+Sun Jul  6 10:12:21 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/test/unit/collector/objectspace.rb
+	  (Test::Unit::Collector::ObjectSpace::NAME): fix a typo.
+
+Sun Jul  6 00:56:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (host_str): fix type mismatch in rb_raise
+	  format and argument.
+	  (port_str): ditto.
+	  (unix_recv_io): ditto.
+	  (sock_s_unpack_sockaddr_un): ditto.
+
+Sat Jul  5 23:42:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (NUM2INT): cast to int.
+	  (FIX2INT): ditto.
+	  (NUM2UINT): cast to unsigned int.
+	  (FIX2UINT): ditto.
+
+Sat Jul  5 23:10:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_pipe): new function for handling EMFILE and ENFILE
+	  error of pipe().
+	  (UPDATE_MAXFD_PIPE): removed.
+	  (pipe_open): use rb_pipe.
+	  (rb_io_s_pipe): ditto.
+
+	* process.c (pipe_nocrash): use rb_pipe.
+
+	* include/ruby/intern.h (rb_pipe): declared.
+
+Sat Jul  5 22:22:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_initialize): NUM2INT() returns int.
+
+	* thread.c (timer_thread_function), thread_pthread.c (thread_timer),
+	  thread_win32.c (timer_thread_func), thread_{pthread,win32}.c
+	  (rb_thread_create_timer_thread): passing VM.
+
+Sat Jul  5 20:53:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_word.rb: check word installed.
+
+Sat Jul  5 16:12:54 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c: revert. before lazy sweep.
+
+Sat Jul  5 09:55:44 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE#ole_respond_to?
+
+	* test/win32ole/test_win32ole.rb: ditto.
+
+Sat Jul  5 08:48:05 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (unescape_nonascii): add has_property argument not to
+	  raise error by /\p{Hiragana}\u{3042}/ in EUC-JP script.
+	  (rb_reg_preprocess): use has_property argument to make regexp
+	  encoding fixed.
+
+Sat Jul  5 08:29:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (unescape_nonascii): make regexp fixed_encoding if \p is used.
+	  fixed [ruby-core:17279].
+
+Fri Jul  4 23:12:53 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (d2time): fix the bug of VT_DATE
+	  to String conversion when negative value.
+
+	* test/win32ole/test_win32ole_variant.rb: ditto.
+
+Fri Jul  4 22:15:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/testcase.rb: collect descendants of
+	  Test::Unit::TestCase using inherited.
+
+	* lib/test/unit/autorunner.rb: don't use ObjectSpace.each_object.
+
+	* lib/test/unit/collector/dir.rb: ditto.
+
+	* lib/test/unit/collector/objectspace.rb: ditto.
+
+	[ruby-core:17126]
+
+Fri Jul  4 20:43:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/oniguruma.h (OnigEncoding): removed auxiliary_data.
+
+	* include/ruby/encoding.h (ENC_DUMMY_P): moved dummy encoding flag to
+	  rb_encoding from Encoding instance.
+
+	* encoding.c (rb_encoding_list): list of Encoding instances.
+
+	* encoding.c (struct rb_encoding_entry): moved base encoding from
+	  instance variable.
+
+Fri Jul  4 17:51:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): proper check.
+
+Fri Jul  4 14:17:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#sendport): use divmod.  [ruby-core:17557]
+
+Fri Jul  4 11:08:37 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c (garbage_collect_force): sweep is completely ended.
+
+	* gc.c (os_obj_of): invoke garbage_collect_force() when freelist none.
+
+Fri Jul  4 05:01:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (rb_num2uint, rb_fix2uint): typo.
+
+Fri Jul  4 02:21:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): also needs checking
+	  negative value. see [ruby-dev:33683]
+
+Thu Jul  3 23:26:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* include/ruby/intern.h: remove prototypes about coverage.
+
+	* iseq.c (prepare_iseq_build): add prototype.
+
+	* parse.y (coverage): ditto.
+
+	* thread.c (clear_coverage): ditto.
+
+	* thread.c (update_coverage): use rb_sourceline.
+
+	* thread.c (rb_get_coverages): rename and move to vm.c.
+
+	* vm.c (rb_vm_get_coverages): ditto.
+
+	* ext/coverage/coverage.c: add rdoc.
+
+Thu Jul  3 21:51:21 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/coverage/coverage.c, ext/coverage/extconf.rb: eliminate
+	  COVERAGE__ and introduce coverage.so instead.  How to measure
+	  coverage: (1) require "coverage.so", (2) require or load Ruby source
+	  file, and (3) Coverage.result will return the same hash as COVERAGE__.
+	  [ruby-dev:35324]
+
+	* thread.c (rb_enable_coverages): start coverage measurement by using
+	  rb_add_event_hook.
+
+	* thread.c (rb_get_coverages): returns current results of coverage
+	  measurement.
+
+	* include/ruby/intern.h: add prototype for above two functions.
+
+	* vm_core.h, vm.c: add field of coverages to rb_vm_t.
+
+	* insns.def (trace): remove special handling for COVERAGE__.
+
+	* iseq.c (prepare_iseq_build): switch COVERAGE__ to
+	  rb_get_coverages().
+
+	* parse.y (coverage): ditto.
+
+	* thread.c (clear_coverage): ditto.
+
+	* lib/coverage.rb: use coverage.so instead of COVERAGE__.
+
+Thu Jul  3 21:20:45 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (thread_initialize): NUM2INT returns long.
+
+Thu Jul  3 21:06:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (Init_eval): typo fixed in r17833.
+
+Thu Jul  3 19:44:44 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): remove duplicate line.
+
+Thu Jul  3 16:08:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch
+	  on IA64 is broken.  erfc(10000.0) aborts.
+	  use missing/erf.c instead.
+	  http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
+
+Thu Jul  3 12:49:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
+	  'localhost.localdomain'.  [ruby-dev:35333]
+
+	* lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.
+
+Thu Jul  3 07:06:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (SET_LC_MESSAGES): LC_MESSAGES must be C.
+
+Thu Jul  3 07:02:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (Init_eval), gc.c (Init_GC), proc.c (Init_Proc): freeze
+	  messages of preallocated special exceptions also.
+
+Thu Jul  3 04:39:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_during_gc): VALUE cache is irrelevant.
+
+Thu Jul  3 01:44:01 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regint.h (GET_ALIGNMENT_PAD_SIZE, ALIGNMENT_RIGHT): cast pointer to
+	  uintptr_t instead of unsigned int.
+
+Thu Jul  3 01:23:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* sprintf.c: include ieeefp.h to refer to isinf.
+
+	* ext/bigdecimal/bigdecimal.c: ditto.
+
+	* ext/json/ext/generator/generator.c: ditto.
+
+	* rational.c: ditto.
+
+Thu Jul  3 01:01:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* missing/tgamma.c (tgamma): remove unused variable.
+
+Thu Jul  3 00:18:00 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: avoid creating Ruby object during
+	  GC. thanks to arton <artonx AT yahoo.co.jp>. [ruby-dev:35313]
+
+	* test/win32ole/test_win32ole_event.rb: ditto.
+
+Thu Jul  3 00:09:31 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
+	  yahoo.co.jp> at [ruby-dev:35313].
+
+	* include/ruby/intern.h: ditto.
+
+Wed Jul  2 09:49:10 2008  Narihiro Nakamura  <authorNari@gmail.com>
+
+	* gc.c (gc_lazy_sweep): use lazy sweep algorithm for response
+	  performance gain.
+
+	* gc.c (garbage_collect_force): mark and lazysweep invoke, after
+	  erasing all mark.
+
+	* gc.c (GC_NOT_LAZY_SWEEP): not lazy sweep flag. for debug.
+
+Wed Jul  2 03:42:44 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_settracefunc.rb: fix expected traces for
+	  RubyVM::FrozenCore's event and r17744.
+
+Wed Jul  2 03:10:41 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.h, insns.def: reduce insn operand of "trace".
+
+	* include/ruby/ruby.h: add RUBY_EVENT_COVERAGE event.
+
+Wed Jul  2 02:02:34 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c, vm.c: fix to refer to next ruby level cfp to make binding.
+
+Wed Jul  2 01:58:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* insns.def (trace): C99ism.
+
+Wed Jul  2 01:53:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* Add coverage measurement constant COVERAGE__.  This constant is not
+	  for casual use.  Usage: (1) assign {} to COVERAGE__, (2) require or
+	  load Ruby source file, and (3) COVERAGE__["sourcefilepath"] will
+	  return an array whose elements represent number of executions per
+	  line of source code.
+
+	* vm_core.h: add field of coverage array to iseq.
+
+	* iseq.c (prepare_iseq_build): ditto.
+
+	* insns.def (trace): update coverage array.
+
+	* parse.y (coverage): create and initialize coverage array.
+
+	* compile.h (ADD_TRACE): add trace instruction to update coverage
+	  array.
+
+	* thread.c (clear_coverage): delete coverage array when forking.
+	  Otherwise, double count of coverage may occur.
+
+	* lib/coverage.rb: sample coverage measurement tool.
+
+	* error.c: distinguish explicitly between parse_in_eval and
+	  mild_compile_error.
+
+	* load.c: ditto.
+
+	* vm_eval.c: ditto.
+
+Tue Jul  1 21:32:43 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/test/unit/ui/console/testrunner.rb: prevent destructive
+	  modification to $0.
+
+	* test/rubygems/gemutilities.rb (build_rake_in): move from
+	  test_gem_ext_rake_builder.rb.
+
+	* test/rubygems/test_gem_ext_rake_builder.rb: ditto.
+
+	* test/rubygems/test_gem_installer.rb: override Gem.ruby and
+	  ENV["rake"].
+
+	* test/rubygems/test_gem_uninstaller.rb: ditto.
+
+Tue Jul  1 21:13:17 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, vm.c, insns.def: call FrozenCore.set_postexe method
+	  instead to use "postexe" insn.
+
+	* id.c, id.h: add a prepared id for above.
+
+Tue Jul  1 21:09:58 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,
+	  namely inclusion of ruby.h, because _GNU_SOURCE is now defined
+	  there (if any) and socket.so requires it on Linux systems.
+
+Tue Jul  1 20:55:07 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* eval.c (rb_interrupt): trick to suppress GCC warning.
+
+	* sprintf.c (rb_str_format): ditto.
+
+Tue Jul  1 20:44:36 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/instruction.rb: RubyVM is not module.
+
+Tue Jul  1 19:31:24 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/digest/digest.c (rb_digest_instance_inspect): constified.
+
+	* variable.c (rb_path2class): field precision should have type int.
+
+Tue Jul  1 19:01:00 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/shift_jis.c (code_is_ctype): HALF WIDTH KATAKANA is
+	  a character.
+
+Tue Jul  1 17:56:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/vsnprintf.c (BSD__uqtoa): constified.
+
+Tue Jul  1 17:50:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/make_encdb.h: always add ';' at the end of line.
+
+Tue Jul  1 17:44:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (COMPILE_OPTION_FALSE), time.c (timegm_noleapsecond),
+	  thread.c (eKillSignal, eTerminateSignal),
+	  missing/vsnprintf.c (BSD_vfprintf): constified.
+
+Tue Jul  1 17:37:43 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* enc/ascii.c: ISO C does not allow extra ';' outside of a
+	  function
+
+	* enc/us_ascii.c: ditto.
+
+	* enc/utf_8.c: ditto.
+
+	* enc/big5.c: ditto.
+
+	* enc/euc_jp.c: ditto.
+
+	* enc/euc_kr.c: ditto.
+
+	* enc/euc_tw.c: ditto.
+
+	* enc/gb2312.c: ditto.
+
+	* enc/gbk.c: ditto.
+
+	* enc/iso_8859_1.c: ditto.
+
+	* enc/iso_8859_2.c: ditto.
+
+	* enc/iso_8859_3.c: ditto.
+
+	* enc/iso_8859_4.c: ditto.
+
+	* enc/iso_8859_5.c: ditto.
+
+	* enc/iso_8859_6.c: ditto.
+
+	* enc/iso_8859_7.c: ditto.
+
+	* enc/iso_8859_8.c: ditto.
+
+	* enc/iso_8859_9.c: ditto.
+
+	* enc/iso_8859_10.c: ditto.
+
+	* enc/iso_8859_11.c: ditto.
+
+	* enc/iso_8859_13.c: ditto.
+
+	* enc/iso_8859_14.c: ditto.
+
+	* enc/iso_8859_15.c: ditto.
+
+	* enc/iso_8859_16.c: ditto.
+
+	* enc/koi8_r.c: ditto.
+
+	* enc/shift_jis.c: ditto.
+
+	* enc/utf_16be.c: ditto.
+
+	* enc/utf_32be.c: ditto.
+
+	* enc/utf_32le.c: ditto.
+
+	* enc/windows_1251.c: ditto.
+
+	* process.c (run_exec_rlimit): ISO C90 forbids mixed declarations
+	  and code
+
+	* include/ruby/ruby.h (enum ruby_special_consts): ISO C forbids
+	  comma at end of enumerator list
+
+	* include/ruby/ruby.h (enum ruby_value_type): ditto.
+
+	* eval_intern.h (enum): ditto.
+
+	* vm_core.h (enum rb_thread_status): ditto.
+
+	* parse.y (enum lex_state_e): ditto.
+
+	* parse.y (enum string_type): ditto.
+
+	* process.c (enum): ditto.
+
+	* ruby.c (enum dump_flag_bits): ditto.
+
+	* ruby.c (enum disable_flag_bits): ditto.
+
+	* enc/gb18030.c (enum): ditto.
+
+Tue Jul  1 17:21:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regexec.c (stack_double): use MatchStackLimitSize atomically.
+
+	* regparse.c (onig_free_shared_cclass_table): OnigTypeCClassTable
+	  needs atomicity
+
+	* regsyntax.c: constified all predefined OnigSyntaxTypes.
+
+Tue Jul  1 16:57:44 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/st.h (struct st_table): type of bit-field
+	  'num_entries' is a GCC extension
+
+	* include/ruby/ruby.h (rb_intern): prefix __extension__ for
+	  braced-groups within expressions.
+
+	* include/ruby/intern.h (rb_usascii_str_new2): ditto.
+
+	* include/ruby/intern.h (rb_tainted_str_new2): ditto.
+
+	* include/ruby/intern.h (rb_str_new2): ditto.
+
+Tue Jul  1 15:01:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make),
+	  (Gem::Ext::Builder.run): EXIT_SUCCESS may be 0 or may not.
+
+	* test/rubygems/test_gem_ext_rake_builder.rb (build_rake_in): override
+	  Gem.ruby and ENV["rake"].
+
+	* runruby.rb: bin/rake does not exist in archdir where architecture
+	  depend script (i.e. rbconfig.rb) exists.
+
+Tue Jul  1 13:19:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_fill): check if beg is too big.
+
+Tue Jul  1 12:01:16 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def, vm.c, vm_core.h: remove some insns
+	  (undef, alias, definemethod).
+	  Call RubyVM::FrozenCore's singleton method instead.
+	  Add "putiseq" and "putspecialobject" instructions.
+
+	* id.c, id.h: add ids for above.
+
+	* tool/parse.rb: "VM" no longer exists.  Use RubyVM instead.
+
+Tue Jul  1 03:28:16 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_ext_configure_builder.rb:  Apply locale-free
+	  patch by Yusuke ENDOH.  [ruby-core:17444].
+
+	* runruby.rb: Set ENV['rake'].  Patch by Yusuke ENDOH
+	  [ruby-core:17442].
+
+Tue Jul  1 01:07:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
+	  double quotes are allowed.  [ruby-list:45140]
+
+Tue Jul  1 00:59:43 2008  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (num_coerce): call rb_Float(x) first.  don't depend on
+	  evaluation order of function arguments.
+
+Tue Jul  1 00:49:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_newobj): abort GC phase before rb_bug.
+
+Mon Jun 30 23:15:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/openssl/test_ssl.rb (start_server): shutdown TCPServer before
+	  close.
+
+Mon Jun 30 23:01:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (RUBY_H_INCLUDES): common headers which are included with
+	  ruby.h together.
+
+Mon Jun 30 22:57:50 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_settracefunc.rb (test_raise): reveal an exception
+	  hided by rescue modifier.
+
+Mon Jun 30 22:49:32 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb (test_aset): access with too big index
+	  raises not ArgumentError but IndexError now.
+
+Mon Jun 30 22:30:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb (recursive_collect): r15662 reverted.
+
+Mon Jun 30 22:27:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/stringio/stringio.c (strio_getline): fix for nil and "" as
+	  separator.  [ruby-dev:34591]
+
+Mon Jun 30 22:21:30 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (argf_each_line): pass args to each_line. [ruby-dev:34958]
+
+Mon Jun 30 22:12:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (chain_finalized_object): should not delete from finalizer
+	  table until run.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): deferred_final_list may be
+	  empty first.
+
+Mon Jun 30 18:57:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_finalize_deferred): allow object allocation in finalizers.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): ditto.
+
+Mon Jun 30 14:41:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc when
+	  USE_VALUE_CACHE is not defined (normal case).
+
+Mon Jun 30 10:28:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syslog/syslog.c (syslog_write): syslog operations should be
+	  protected from $SAFE level 4.  a patch from Keita Yamaguchi
+	  <keita.yamaguchi at gmail.com>.
+
+	* ext/syslog/syslog.c (mSyslog_close): ditto.
+
+	* ext/syslog/syslog.c (mSyslog_set_mask): ditto.
+
+Mon Jun 30 03:01:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/net/http/test_http.rb (_test_request__file): specify encoding
+	  explicitly.
+
+	* test/net/http/utils.rb: ditto.
+
+Mon Jun 30 02:31:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_utf8_encindex): defined.
+
+	* include/ruby/encoding.h (rb_utf8_encindex): ditto.
+
+Mon Jun 30 02:14:34 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, vm_core.h,vm_core.h, vm_dump.c, iseq.c: rename class name
+	  VM -> RubyVM, and rename rb_cVM -> rb_cRubyVM.
+	  "VM" is too short name for class.
+
+	* test/ruby/test_method.rb, test/ruby/test_settracefunc.rb: ditto.
+
+	* include/ruby/ruby.h: rb_cRubyVM, rb_cEnv, rb_cISeq should not be
+	  exposed.
+
+Mon Jun 30 02:10:32 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* process.c (Init_process): fix to avoid a warning.
+
+Mon Jun 30 01:52:05 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_parse.rb: remove tests for open_args.
+
+Sun Jun 29 23:01:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
+	  problem.
+
+Sun Jun 29 18:01:30 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb, lib/rss/utils.rb: merge documents from ruby_1_8.
+
+Sun Jun 29 17:44:23 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb (RSS::ListenerMixin#known_class): define to
+	  work with ruby 1.8.x too.
+
+Sun Jun 29 17:41:42 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb (RSS::Maker::RSSBase#to_feed): raise
+	  exception not return nil if RSS::Maker.make can't get required
+	  information.
+
+	* test/rss/rss-assertions.rb: follow the above change.
+
+Sun Jun 29 17:37:23 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb (RSS::Maker::RSSBase#make): require block.
+
+	* test/rss/test_maker_{0.9,1.0,2.0}.rb: follow the above change.
+
+Sun Jun 29 17:33:34 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb, lib/rss/maker/itunes.rb: don't use
+	  instance_eval to initialize variables. (speed up)
+
+Sun Jun 29 17:31:15 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
+	  0.2.4 -> 0.2.5.
+
+Sun Jun 29 11:36:20 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* dir.rb: fix resource leak.
+
+Sun Jun 29 09:43:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tmpdir.rb (@@systmpdir): prior LOCAL_APPDATA if possible, and
+	  should be clean.  based on a patch from arton <artonx AT
+	  yahoo.co.jp> at [ruby-dev:35269]
+
+Sun Jun 29 07:53:08 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
+	  some situation. [ruby-bugs-20793]
+
+Sat Jun 28 21:25:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (struct RRegexp): new field usecnt.  replace
+	  str and len by src.
+
+	* gc.c (gc_mark_children): mark src field of regexp.
+	  (obj_free): don't free str field.
+
+	* re.c (REG_BUSY): removed.
+	  (rb_reg_initialize): prohibit re-initialize regexp.
+	  (rb_reg_search): use usecnt to prevent freeing regexp currently
+	  using.  this prevents SEGV by:
+	    r = /\A((a.)*(a.)*)*b/
+	    r =~ "ab" + "\xc2\xa1".force_encoding("euc-jp")
+	    t = Thread.new { r =~ "ab"*8 + "\xc2\xa1".force_encoding("utf-8")}
+	    sleep 0.2
+	    r =~ "ab"*8 + "\xc2\xa1".force_encoding("euc-jp")
+
+Sat Jun 28 21:15:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
+	  rb_usascii_str_new2): use inline versions only for constant
+	  literals.
+
+Sat Jun 28 13:12:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
+	  fixed /tmp/apple_gem_home directory.
+
+Sat Jun 28 08:40:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: check String encoding when
+	  converting String to VT_BSTR in OLE.
+
+	* test/win32ole/test_win32ole.rb: ditto.
+
+Sat Jun 28 01:08:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_timespec): fix rounding negative float.
+
+Fri Jun 27 21:38:57 2008  Tanaka Akira  <akr@fsij.org>
+
+	* struct.c: __size__ removed.  use the length of __members__ instead.
+	  (num_members): new function.
+
+Fri Jun 27 21:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
+	  $0.  [ruby-dev:35261]
+
+	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
+
+Fri Jun 27 17:45:17 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/erb.rb: adjust line number for magic comment.
+
+	* test/erb/test_erb.rb: add tests for def_method.
+
+Fri Jun 27 14:29:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): empty not should call '!' on nil.
+	  cf [ruby-dev:35227]
+
+Fri Jun 27 14:25:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_eval_body): if thrown exception is frozen, reraise it to
+	  create a new instance.
+
+Fri Jun 27 13:29:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
+	  rb_usascii_str_new2): use with-length versions with strlen to
+	  optimize strlen, if optimized.
+
+Fri Jun 27 12:28:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/un.rb (mkmf): new command to create makefile.
+
+Fri Jun 27 11:06:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/un.rb (wait_writable): added help message.
+
+Fri Jun 27 06:52:54 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* configure.in: need a ",".
+
+	* process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro.
+
+Fri Jun 27 06:50:56 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (vm_call_super): fix to call method_missing.
+	  [ruby-core:15719], [ruby-core:17340]
+
+Fri Jun 27 00:00:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
+	  Yamaguchi <keita.yamaguchi at gmail.com>.
+
+Thu Jun 26 23:58:29 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_str_index_m, rb_str_rindex_m, rb_str_include): fix
+	  rdoc.
+
+Thu Jun 26 17:43:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_f_trace_var): should not be allowed at safe level 4.
+	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
+
+Thu Jun 26 11:04:30 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems: Update to RubyGems 1.2.0 r1824.  Incorporates patch by
+	  Yusuke ENDOH [ruby-core:17353].
+
+Thu Jun 26 00:48:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): not operand might be empty.  [ruby-dev:35227]
+
+Wed Jun 25 21:54:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): make functional-style not operator to act
+	  like function.  see <http://d.hatena.ne.jp/ku-ma-me/20080624/p1>.
+
+Wed Jun 25 15:28:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_fill): not depend on unspecified behavior at integer
+	  overflow.  reported by Vincenzo Iozzo <snagg AT openssl.it>.
+
+Wed Jun 25 13:42:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.
+
+	* lib/erb.rb (ERB::Compiler#compile): fix for broken input.
+
+Wed Jun 25 12:10:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Compiler#compile): magic comment needs LF.
+
+Wed Jun 25 09:31:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Compiler#compile): output magic comment.
+
+Tue Jun 24 22:14:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (eval_string_with_cref): preserve parse_in_eval even if
+	  exception raised.
+
+Tue Jun 24 22:09:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
+	  [ruby-bugs-20792]
+
+Tue Jun 24 17:20:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_fork_with_pthread): check after check for
+	  pthread library, and define the macro when checked only.
+
+Tue Jun 24 17:04:39 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/io/wait/extconf.rb: check sys/socket.h for cygwin.
+
+Tue Jun 24 16:51:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_reopen): remove cygwin handling because it seems to be for
+	  C's stdio.
+	  fixed [ruby-dev:35183]
+
+Tue Jun 24 11:12:33 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h, win32/win32.c (rb_w32_getppid): now support
+	  getppid() on win32 (but only Win2k or later).
+
+	* process.c (get_ppid): remove win32 special logic.
+
+Tue Jun 24 09:40:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (init_sock): socket is binmode on platforms
+	  which support binmode.
+
+Tue Jun 24 00:21:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_build_from_ary): initialize arg_opts, a patch from
+	  Adam Strzelecki <ono at java.pl> in [ruby-core:17220].
+
+Tue Jun 24 00:10:53 2008  wanabe  <s.wanabe@gmail.com>
+
+	* compile.c (iseq_build_from_ary): fix expression to obtain
+	  iseq->local_size and iseq->local_table_size.  [ruby-dev:35205]
+
+Mon Jun 23 11:31:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Rational::power2): removed incomplete method.
+	  see [ruby-dev:35195].   [ruby-core:17293]
+
+Sun Jun 22 14:16:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/extconf.rb (have_readline_func): readline on Mac OS X
+	  needs headers to detect some functions.
+
+Sun Jun 22 09:51:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_class_superclass): rdoc improvement, a patch from
+	  Gaston Ramos <ramos.gaston AT gmail.com> in [ruby-core:17371].
+
+Sun Jun 22 09:22:32 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* README.EXT: translated README.EXT.ja
+
+Sun Jun 22 00:42:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_osid, rb_w32_osver, CreateChild): XP is
+	  is different from Vista about pipe handle inheritance.
+	  fixed [ruby-core:17367], reported by Lars Christensen <larsch at
+	  belunktum.dk>
+
+Sun Jun 22 00:38:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* README.EXT.ja: add note about mark and free.
+
+Sun Jun 22 00:01:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_binmode_p, argf_binmode_p, Init_IO): new method
+	  IO#binmode? and ARGF.binmode?  [ruby-dev:35148]
+
+Sat Jun 21 17:33:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn): no longer support P_WAIT.
+
+Sat Jun 21 16:46:09 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (native_sleep): must block reentrance when accessing
+	  th->unblock.
+	  fixed [ruby-core:17341], reported by Bill Kelly <billk at cts.com>
+
+Sat Jun 21 16:29:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (call_args2, open_args): removed.
+
+	* parse.y (parser_yylex): unified warnings at space between method
+	  name and argument parenthesis.  [ruby-dev:33943]
+
+Sat Jun 21 16:21:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): get rid of overflow.
+
+Sat Jun 21 15:57:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
+	  magic comment.
+
+Sat Jun 21 15:54:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if fork works with pthread.
+
+Sat Jun 21 15:31:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: ported to ruby.
+
+	* tool/make-snapshot: fixed digests.
+
+Sat Jun 21 04:36:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/jacobian.rb (Jacobian::dfdxi):
+	  typo fixed (raize -> raise).  [ruby-list:45101]
+
+	* enumerator.c (enum_each_cons): typo in RDoc fixed.
+
+Sat Jun 21 00:45:34 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* tool/make-snapshot: do not use sha256sum; use BASERUBY instead
+
+	* common.mk (dist): use tool/make-snapshot instead
+
+Fri Jun 20 16:34:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (Init_process): Process::Status#to_int removed.
+	  (PST2INT): defined.
+	  (pst_to_s): use PST2INT.
+	  (pst_inspect): ditto.
+	  (pst_equal): ditto.
+	  (pst_bitand): ditto.
+	  (pst_rshift): ditto.
+	  (pst_wifstopped): ditto.
+	  (pst_wstopsig): ditto.
+	  (pst_wifsignaled): ditto.
+	  (pst_wtermsig): ditto.
+	  (pst_wifexited): ditto.
+	  (pst_wexitstatus): ditto.
+	  (pst_success_p): ditto.
+	  (pst_wcoredump): ditto.
+	  (rb_f_system): ditto.
+
+Fri Jun 20 15:40:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
+	  behavior at integer overflow.
+
+	* string.c (str_buf_cat): ditto.
+
+Fri Jun 20 12:39:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_detach_process): store detached process ID in the
+	  thread local storage.  moved from lib/open3.rb.
+
+Fri Jun 20 11:57:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_sub_bang): should preserve replacement points
+	  since they may be altered in the yielded block.
+
+Fri Jun 20 11:07:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_memhash): randomize hash to avoid algorithmic
+	  complexity attacks.
+	  (rb_str_hash): use rb_memhash.
+
+	* include/ruby/intern.h (rb_reset_random_seed): declared.
+
+	* thread.c (rb_thread_atfork): call rb_reset_random_seed.
+
+	* inits.c (rb_call_inits): call Init_RandomSeed at first.
+
+	* random.c (seed_initialized): defined.
+	  (fill_random_seed): extracted from random_seed.
+	  (make_seed_value): extracted from random_seed.
+	  (rb_f_rand): initialize random seed at first.
+	  (initial_seed): defined.
+	  (Init_RandomSeed): defined.
+	  (Init_RandomSeed2): defined.
+	  (rb_reset_random_seed): defined.
+	  (Init_Random): call Init_RandomSeed2.
+
+Wed Jun 18 21:52:38 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* array.c (ary_new, rb_ary_initialize, rb_ary_store,
+	  rb_ary_splice, rb_ary_times): integer overflows should be
+	  checked. based on patches from Drew Yao <ayao at apple.com>
+	  fixed CVE-2008-2726
+
+	* string.c (rb_enc_cr_str_buf_cat): fixed unsafe use of alloca,
+	  which led memory corruption. based on a patch from Drew Yao
+	  <ayao at apple.com> fixed CVE-2008-2726
+
+Fri Jun 20 03:26:00 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_f_fork): NetBSD 4.0 or later can fork.
+
+Fri Jun 20 03:19:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/testunit/collector/test_dir.rb: r15825 made it unnecessary to
+	  change String to Symbol.
+
+	* test/testunit/collector/test_objectspace.rb: ditto.
+
+Fri Jun 20 03:14:31 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*, test/rubygems/*:  Update to RubyGems 1.1.1 r1784 (pre
+	  1.2).
+
+Fri Jun 20 03:01:59 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c: try to remove false positive of deadlock detection (second
+	  trial).
+
+Fri Jun 20 02:16:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Rational::power2): typo fixed.  [ruby-core:17293]
+
+Fri Jun 20 02:11:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): should preserve last successful match
+	  data.  [ruby-dev:35182]
+
+Fri Jun 20 01:07:28 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* KNOWNBUGS.rb, bootstraptest/pending.rb: move a bug (?) to pending.
+
+Fri Jun 20 00:40:08 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (proc_new): fix to return Proc object if block is already
+	  in heap.  [ruby-core:15711]
+
+	* bootstraptest/test_proc.rb: add a test.
+
+Fri Jun 20 00:18:04 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_win32.c (native_sleep): fix to decrement sleeper count.
+
+Thu Jun 19 23:48:45 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/net/http/test_http.rb: compare encodings of two strings before
+	  comparing themself, which suppress too big error output.
+
+Thu Jun 19 23:46:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/json/ext/parser/parser.rl, ext/json/ext/parser/parser.c: JSON
+	  text SHALL be encoded in Unicode.
+
+Thu Jun 19 23:17:56 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c, thread_win32.c, vm_core.h: try to remove false positive of
+	  deadlock detection.
+
+Thu Jun 19 21:38:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): check if compile before showing message.
+
+Thu Jun 19 21:35:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: supported multiple snapshots.
+
+Thu Jun 19 20:37:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/net/pop.rb (Net::POP3#set_all_uids): speed
+	  up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047]
+
+Thu Jun 19 17:44:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/etc/etc.c (Init_etc): define constant aliases Etc::Passwd
+	  and Etc::Group.  [ruby-dev:35150]
+
+Thu Jun 19 17:37:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_alloc): specify 'inline' modifier.
+
+	* string.c (str_alloc): remove cSymbol hack that no longer
+	  necessary.
+
+	* string.c (scan_once): avoid retrieving encoding info unless
+	  necessary.
+
+Thu Jun 19 17:19:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_scan): String#scan should preserve last
+	  successful match data.  [ruby-dev:35106]
+
+Thu Jun 19 16:49:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* missing/acosh.c (atanh): should set ERANGE to errno if parameter
+	  is the boundary case. fixed [ruby-dev:35155]
+
+Thu Jun 19 16:06:01 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/tile/treeview.rb: cannot configure tags.
+
+Thu Jun 19 11:48:33 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_enumerator.rb: fix to skip "with_memo" test.
+
+Thu Jun 19 11:40:55 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_throw): fix "return" process from "lambda".
+
+	* bootstraptest/test_proc.rb: add a test.
+
+	* bootstraptest/pending.rb: add a pending bug.
+
+Thu Jun 19 00:33:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/etc/test_etc.rb: avoid infinite loop.  [ruby-dev:35158]
+
+Wed Jun 18 23:07:19 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
+	  a patch from Sylvain Joyeux in [ruby-core:12099].
+
+Wed Jun 18 21:08:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (verbose_setter, opt_W_getter): fixed prototypes.
+
+Wed Jun 18 19:20:00 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (opt_W_getter): use ruby_verbose directly instead of parameter
+	  because ruby_verbose is not a real variable, so the address of
+	  parameter is not collect.
+
+Wed Jun 18 18:31:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (errmap): add some pipe errors.
+
+	* win32/win32.c (rb_w32_write): set errno when CRT's errno is EINVAL
+	  for pipe errors.
+
+Wed Jun 18 18:09:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (poll_child_status): set EINVAL to errno when
+	  GetExitCodeProcess() fails with ERROR_INVALID_HANDLE.
+
+Wed Jun 18 15:01:18 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_open_file): fs_encoding and fname_encoding is
+	  rb_encoding *.
+	  fixed [ruby-dev:35151]
+
+Wed Jun 18 14:30:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_open_file): not rb_enc_get_index but rb_enc_get.
+
+Wed Jun 18 13:49:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (pipe): now pipe is textmode. although this
+	  change is experimental, it will be spec if no compatibility problem
+	  is reported.
+
+Wed Jun 18 12:05:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
+	  public methods only.  [ruby-core:17283]
+
+	* object.c (convert_type): ditto.
+
+	* lib/singleton.rb (Singleton#_dump): conversion method should be
+	  public.
+
+Wed Jun 18 10:18:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc.  a patch from
+	  okkez <okkez000 AT gmail.com> in [ruby-dev:35141].
+
+Wed Jun 18 08:58:16 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/*:  Fix errors for 1.9.
+
+	* gem_prelude.rb:  Only remove methods from gem_prelude.rb when
+	  loading real RubyGems.
+
+Wed Jun 18 07:03:30 2008  Eric Hodel  <drbrain@egment7.net>
+
+	* lib/rubygems/*:  Update to RubyGems r1778 (pre 1.2).
+
+Wed Jun 18 04:27:58 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* KNOWNBUGS.rb, bootstraptest/pending.rb: move pending bug.
+
+Wed Jun 18 04:24:20 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, vm_insnhelper.c: fix escape process with "break" and "return"
+	  syntax in "lambda".  [ ruby-Bugs-19304 ], [ruby-core:17164]
+
+	* KNOWNBUGS.rb, bootstraptest/test_proc.rb: add/move solved test.
+
+Wed Jun 18 01:51:10 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: cannot access class variable from
+	  singleton method.
+
+Wed Jun 18 00:03:33 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (Init_Dir): dir_foreach() takes variable argument.
+
+Tue Jun 17 23:04:24 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/net/telnet.rb:  Fixing Telnet#wairfor() which was broken by
+	  changes to the Kernel::Integer() method.  [ruby-core:17272]
+
+Tue Jun 17 23:02:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (opt_W_getter): made a hooked variable.
+
+Tue Jun 17 22:04:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enc/euc_jp.c (property_name_to_ctype): core dumped when sizeof(int)
+	  differs from sizeof(long).  [ruby-dev:35131]
+
+	* enc/shift_jis.c (property_name_to_ctype): ditto.
+
+	* enc/unicode.c (onigenc_unicode_property_name_to_ctype): ditto.
+
+Tue Jun 17 20:32:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (miniruby$(EXEEXT)): $(PREP) isn't always same as
+	  miniruby, and tests, debug, etc have no meaning when
+	  cross-compiling.
+
+Tue Jun 17 18:39:11 2008  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* common.mk: fixed dependencies on miniruby.
+
+Tue Jun 17 18:11:01 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (pipe): expand pipe buffer size.
+
+Tue Jun 17 17:07:35 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): no need to inherit handles here because
+	  spawn'ed child cannot detect that STDIN is closed.
+
+Tue Jun 17 06:32:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (dir_data): add intenc and extenc.
+
+	* dir.c (dir_s_alloc): ditto.
+
+	* dir.c (dir_initialize): now accept internal_encoding and
+	  external_encoding.
+
+	* dir.c (dir_s_open): changed for dir_initialize.
+
+	* dir.c (dir_open_dir): ditto.
+
+	* dir.c (dir_foreach): changed for dir_open_dir.
+
+	* dir.c (dir_entries): changed for dir_open_dir.
+
+	* dir.c (dir_enc_str): defined.
+
+	* dir.c (dir_path): use dir_enc_str.
+
+	* dir.c (dir_read): ditto.
+
+	* dir.c (dir_each): ditto.
+
+Tue Jun 17 06:28:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_set_encoding): defined.
+
+	* io.c (rb_open_file): convert path on Windows and Mac OS X.
+
+	* io.c (open_key_args): use io_set_encoding and now accept
+	  internal_encoding and external_encoding.
+
+Tue Jun 17 06:26:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encoding): defined.
+
+	* include/ruby/encoding.h (rb_filesystem_encoding): added.
+
+Tue Jun 17 06:24:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/syck/rubyext.c: add encoding header.
+
+Tue Jun 17 01:52:50 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: SEGV when exit.
+
+	* ext/tk/lib/tk.rb: add a check for safety to Tk.exit.
+
+	* ext/tk/sample/irbtkw.rbw: freezes when receives SIGINT.
+
+Mon Jun 16 21:58:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
+	  IO#readlines do not affect $_.  [ruby-core:17277]
+
+Mon Jun 16 18:52:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/thwait.rb (ThreadsWait): Exception2MessageMapper no longer has
+	  extend_to method.  [ruby-core:17267]
+
+Mon Jun 16 14:46:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/e2mmap.rb (E2MM.def_e2message): typo.
+
+Mon Jun 16 09:43:27 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_with_object, Init_Enumerator):
+	  Temporarily back out with_memo, for which we need a better name.
+
+Mon Jun 16 07:14:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_readline, strio_each)
+	  (strio_readlines): set lastline.  [ruby-core:17257]
+
+Mon Jun 16 01:49:39 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_f_block_given_p): fix to skip class frame.
+	  [ruby-core:14813]
+
+	* KNOWNBUGS.rb, bootstraptest/test_method.rb: move solved test.
+
+Mon Jun 16 01:48:08 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c (vm_stack_dump_raw): disable verbose debug output.
+
+Mon Jun 16 01:33:08 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, thread.c: rename global_interpreter_lock to
+	  global_vm_lock.
+
+Sun Jun 15 18:40:35 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/syck/rubyext.c (yaml_org_handler): associate encoding.
+
+	* ext/syck/rubyext.c (syck_genericresolver_node_import): ditto.
+
+Sun Jun 15 18:17:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_t), vm.c (rb_vm_mark): moved preallocated special
+	  exceptions.
+
+	* eval.c (Init_eval), gc.c (Init_GC), proc.c (Init_Proc): freeze
+	  preallocated special exceptions.
+
+	* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
+	  if it was frozen.
+
+	* gc.c (rb_memerror): raise nomem_error without backtrace if failed to
+	  make backtrace.
+
+Sat Jun 14 22:52:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
+	  read.  a patch from Arthur Schreiber at [ruby-core:17245].
+
+Sat Jun 14 16:55:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): no need to expand root path which has no
+	  short file name.  [ruby-dev:35095]
+
+Sat Jun 14 11:59:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.h (STACK_UPPER): moved from gc.c
+
+	* thread.c, thread_{pthread,win32}.c (ruby_init_stack,
+	  ruby_thread_init_stack): moved stack initialization from gc.c.
+
+Sat Jun 14 11:57:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.h (STACK_UPPER): moved from gc.c
+
+	* thread.c, thread_{pthread,win32}.c (ruby_init_stack,
+	  ruby_thread_init_stack): moved stack initialization from gc.c.
+
+Sat Jun 14 07:52:53 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (ruby_initial_gc_stress): defined.
+	  (ruby_initial_gc_stress_ptr): defined.
+
+	* debug.c (set_debug_option): use ruby_initial_gc_stress_ptr for
+	  gc_stress option.
+
+Sat Jun 14 00:09:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (ruby_gc_stress): moved to rb_objspace_t.
+
+	* gc.c (gc_stress_get, gc_stress_set): VM local attribute.
+
+	* signal.c (sigsegv): ditto.
+
+Fri Jun 13 21:55:48 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_equal_p): Rational(0,x) and 0 are equivalent,
+	  anyway.
+
+Fri Jun 13 21:26:39 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (string_to_c, nucomp_s_convert): preserve the current
+	  backref.
+
+	* rational.c (string_to_r, nurat_s_convert): ditto.
+
+	* include/ruby/intern.h (rb_match_busy): added a declaration.
+
+Fri Jun 13 18:08:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.xmlschema): don't accept decimal dot without
+	  fractional digits.  fractional digits handling simplified.
+
+Fri Jun 13 17:20:40 2008  wanabe  <s.wanabe@gmail.com>
+
+	* complex.c (string_to_c_internal): save and restore backref.
+	  fixed [ruby-dev:34991]
+
+Fri Jun 13 17:06:20 2008  wanabe  <s.wanabe@gmail.com>
+
+	* rational.c (string_to_r_internal): save and restore backref.
+	  fixed [ruby-dev:34990]
+
+Fri Jun 13 14:41:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* README.EXT.ja: update about Fixnum. reported in
+	   <http://www.tmtm.org/ja/tdiary/?date=20080611#p01>
+
+	* README.EXT.ja: describe about StringValueCStr().
+
+	* README.EXT: ditto.
+
+Fri Jun 13 14:24:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_memerror): exit with EXIT_FAILURE instead of magic number.
+
+	* gc.c (ruby_stack_check): STACK_LENGTH should be less than
+	  STACK_LEVEL_MAX.
+
+Fri Jun 13 12:55:37 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (sort_by_i): use NODE_DOT2 instead of NODE_MEMO to avoid
+	  extra calls to is_pointer_to_heap() in GC.
+
+	* enum.c (enum_zip): ditto.
+
+Fri Jun 13 00:41:58 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_thread.rb: add a test.
+
+Thu Jun 12 23:30:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (mutex_unlock): fix cond_notified consistency.
+
+Thu Jun 12 22:19:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (native_sleep): fixed previous commit.
+
+Thu Jun 12 21:59:17 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c, vm_core.h, vm.c, thread_pthread.c, thread_win32.c: add
+	  deadlock detection.  [ruby-dev:35044]
+
+	* bootstraptest/test_thread.rb: add tests for above.
+
+Thu Jun 12 21:39:55 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: refactoring.
+
+	* rational.c: ditto.
+
+Thu Jun 12 17:11:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regint.h: undefine USE_CAPTURE_HISTORY which is mentioned as
+	  unsupported in the Onigiruma document.
+
+Thu Jun 12 13:36:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (rb_intern): use rb_intern2 with strlen for
+	  constant symbols to optimize strlen.
+
+Thu Jun 12 08:47:51 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): should use io_read_encoding(), not
+	  io_input_encoding().
+
+	* io.c (rb_io_getline_1): reduce calling of io_read_encoding().
+
+	* string.c (rb_str_scan): need not to restore $~ value, so avoid
+	  pinning match object.
+
+Thu Jun 12 02:49:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/stringio/stringio.c (strio_init): rewind when reopened.
+
+Thu Jun 12 02:43:27 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_zip): ANSI style.
+
+Thu Jun 12 02:25:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_reopen): clear read buffer.
+
+Thu Jun 12 00:56:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk: check proper conditions.  [ruby-dev:35047]
+
+Wed Jun 11 23:33:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fread): bypass buffered read if reading buffer is empty.
+
+	* io.c (remain_size): do not add extra one byte.
+
+Wed Jun 11 12:15:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_normal_exit): hide stderr output
+	  when success.
+
+Wed Jun 11 09:26:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (encs): need to pass miniruby path for windows.
+
+Wed Jun 11 05:53:20 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, eval_intern.h (PASS_PASSED_BLOCK):
+	  set a VM_FRAME_FLAG_PASSED flag to skip this frame when
+	  searching ruby-level-cfp.
+
+	* eval.c, eval_intern.h, proc.c: fix to check cfp.  if there is
+	  no valid ruby-level-cfp, cause RuntimeError exception.
+	  [ruby-dev:34128]
+
+	* vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
+	  insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
+
+	* KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
+
+Wed Jun 11 05:55:31 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
+
+	* ext/tk/tcltklib.c: avoid error on a shared object.
+
+	* ext/tk/extconf.rb: support --with-tcltkversion
+
+	* ext/tk/README.tcltklib: add document about --with-tcltkversion
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb:
+	  not work on $SAFE==4
+
+	* ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9.
+
+	* ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the
+	  procedure which called at end of the timer.
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb:
+	  support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.
+
+	* ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__
+
+	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb,
+	  ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb,
+	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix.
+
+	* ext/tk/lib/tk/text.rb: typo. call a wrong method.
+
+	* ext/tk/lib/tk/itemconfig.rb: ditto.
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb,
+	  ext/tk/lib/tk/canvas.rb: support alias names of option keys.
+
+	* ext/tk/lib/tk/grid.rb: lack of module-method definitions.
+
+	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported
+	  parameter patterns of configure method.
+
+	* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
+
+	* ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
+	  pass the given block to methods of Tk::Wm module.
+
+	* ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites argument to
+	  an invalid value.
+
+	* ext/tk/lib/tk.rb: fix memory (object) leak bug.
+
+	* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.
+
+	* ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
+	  bug fix.
+
+	* ext/tk/lib/tkextlib/blt/component.rb,
+	  ext/tk/lib/tkextlib/tile/tentry.rb,
+	  ext/tk/lib/tkextlib/tile/treeview.rb: ditto.
+
+	* ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.
+
+	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget,
+	  ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb,
+	  ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb:
+	  bug fix.
+
+	* ext/tk/sample/ttk_wrapper.rb: ditto.
+
+	* ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.
+
+	* ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.
+
+	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb,
+	  ext/tk/sample/ttk_wrapper.rb: improve treating and control themes.
+	  add Tk::Tile.themes and Tk::Tile.set_theme(theme).
+
+	* ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.
+
+	* ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8)
+	  characters for headings.
+
+	* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.
+
+	* ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys.
+	  Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
+	  not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g.
+	  :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on;
+	  those are attributes of event object). It means that Ruby/Tk accepts
+	  not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but
+	  also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }".
+	  It is potentially incompatible, when user passes symbols to the
+	  arguments of the callback block (the block receives the symbols as
+	  strings). I think that is very rare case (probably, used by Ruby/Tk
+	  experts only). When causes such trouble, please give strings instead
+	  of such symbol parameters (e.g. call Symbol#to_s method).
+
+	* ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb,
+	  ext/tk/lib/tkextlib/blt/treeview.rb,
+	  ext/tk/lib/tkextlib/winico/winico.rb: ditto.
+
+	* ext/tk/tkutil/tkutil.c: strings are available on subst_tables on
+	  TkUtil::CallbackSubst class (it is useful on Ruby 1.9).
+
+	* ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb,
+	  ext/tk/lib/tkextlib/iwidgets/spinner.rb,
+	  ext/tk/lib/tkextlib/iwidgets/entryfield.rb,
+	  ext/tk/lib/tkextlib/iwidgets/calendar.rb,
+	  ext/tk/lib/tkextlib/blt/dragdrop.rb,
+	  ext/tk/lib/tkextlib/tkDND/tkdnd.rb,
+	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb,
+	  ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became
+	  unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define
+	  the constant WITH_ENCODING.
+
+	* ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names.
+
+Wed Jun 11 03:40:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/find.rb (Find#find): Return an enumerator if no block is
+	  given.
+
+Wed Jun 11 01:28:12 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/intern.h, proc.c: revert rb_proc_call() and
+	  create rb_proc_call_with_block() instead.
+
+	* include/ruby/ruby.h, eval_jump.c, thread.c, vm_insnhelper.c:
+	  rb_blockptr should not be exposed.
+
+Tue Jun 10 21:07:19 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_float.rb: add tests. [ruby-dev:35009]
+
+Tue Jun 10 20:55:57 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_s_convert): need not to initialize optional
+	  argument for rb_scan_args().
+
+Tue Jun 10 20:13:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: negate default of --without-ext if --with-ext is
+	  given.
+
+	* ext/extmk.rb: negate default of --without-ext.
+
+Tue Jun 10 17:43:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_shuffle_bang): update RDoc.  [ruby-dev:35034]
+
+Tue Jun 10 17:30:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_obj_instance_exec, rb_mod_module_exec):
+	  added prototypes.
+
+Tue Jun 10 17:00:29 2008  wanabe  <s.wanabe@gmail.com>
+
+	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
+	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
+
+Tue Jun 10 13:48:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* rational.c (nurat_s_convert): need not to initialize optional
+	  argument for rb_scan_args().
+
+Tue Jun 10 12:58:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/wait/wait.c (FIONREAD_POSSIBLE_P): suppress warnings.
+
+Tue Jun 10 12:43:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (CONST_ID_CACHE): fixed statement expression.
+
+Tue Jun 10 11:25:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (rb_argv0): revised for ext/tk.
+
+	* include/ruby/encoding.h: not to use varargs.h since requiring C89.
+
+Tue Jun 10 00:50:51 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* include/ruby/ruby.h, vm_core.h: add a type rb_blockptr.
+
+	* vm_insnhelper.c (vm_yield_with_cfunc): vm_yield_with_cfunc receives
+	  blockptr and passes it to iterating block.
+
+	* proc.c (rb_proc_call), include/ruby/intern.h: rb_proc_call receives
+	  blockptr.  "rb_proc_call(self, args, blockptr)" in C corresponds to
+	  "self.call(*args, &block)" in Ruby.
+
+	* proc.c (proc_call): pass blockptr to block that is written in C.
+
+	* proc.c (curry): receive blockptr and pass it to original proc.
+	  [ruby-core:15551]
+
+	* vm.c (invoke_block_from_c): fix for change of vm_yield_with_cfunc.
+
+	* thread.c (call_trace_proc), eval_jump.c (rb_call_end_proc): fix for
+	  change of rb_proc_call.
+
+Tue Jun 10 00:10:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (test-knownbug): give $(OPTS) for bootstraptest/runner.rb.
+
+Mon Jun  9 23:10:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (Init_stack): don't declare.  it is a macro now.
+
+Mon Jun  9 22:46:47 2008  wanabe  <s.wanabe@gmail.com>
+
+	* compile.c : treat []&&= in virtually the same way as []||=.
+	  [ruby-dev:34679]
+
+Mon Jun  9 21:17:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (clean): remove build directories.
+
+	* test_knownbug.rb -> KNOWNBUGS.rb: renamed.
+
+	* common.mk: apply above change.
+
+Mon Jun  9 21:14:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): set flags.
+
+Mon Jun  9 21:09:02 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb -> ./test_knownbug.rb: moved.
+
+	* common.mk: add a rule "test-knownbug".
+
+Mon Jun  9 21:00:32 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_s_convert): can accept Complex('i').
+	  [ruby-dev:34991]
+
+Mon Jun  9 18:25:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (CONST_ID): constant ID cache for non-gcc.
+
+	* *.c: no cache in init functions.
+
+Mon Jun  9 17:56:30 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#delete_if): Call to_a.
+	  (SortedSet#delete_if, TC_SortedSet#test_sortedset): Use super to
+	  yield elements in sorted order; [ruby-core:17144] by Arthur
+	  Schreiber.
+	  (SortedSet#each, SortedSet#each, TC_Set#test_each)
+	  (TC_SortedSet#test_sortedset): Return self; [ruby-dev:35002] by
+	  Arthur Schreiber.
+
+Mon Jun  9 17:47:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (fptr_finalize): close IO object if fd is already closed.
+	  (rb_p): call rb_io_write just once.
+
+Mon Jun  9 15:37:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (require_libraries): req_list may be NULL.  [ruby-dev:35008]
+
+Mon Jun  9 14:18:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (struct rb_vm_struct): moved src_encoding_index,
+	  ruby_debug, ruby_verbose, and rb_progname.
+
+	* ruby.c (rb_argv0): no longer used.
+
+	* ruby.c (struct cmdline_options): moved setids and req_list, and the
+	  latter is now an array, to prevent memory leak.
+
+	* ruby.c (cmdline_options_init): added.
+
+	* ruby.c (add_modules, require_libraries, init_ids, forbid_setid): use
+	  struct cmdline_options.
+
+	* vm.c (vm_init2): initialize src_encoding_index.
+
+	* vm.c: getters/setters for ruby_{debug,verbose}.
+
+Mon Jun  9 09:54:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (Init_stack): make to call ruby_init_stack.
+
+Mon Jun  9 08:12:40 2008  wanabe  <s.wanabe@gmail.com>
+
+	* vm_insnhelper.c, vm.c, proc.c : revert r17021. [ruby-dev:34997]
+
+Mon Jun  9 03:12:23 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/pending.rb: move/remove solved issues.
+
+	* bootstraptest/test_class.rb: ditto.
+
+Mon Jun  9 02:32:58 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/zlib/zlib.c (rb_deflate_init_copy): Copy buffers as well.
+	  [ruby-list:45018]
+
+Sun Jun  8 22:22:20 2008  wanabe  <s.wanabe@gmail.com>
+
+	* vm_insnhelper.c, vm.c, proc.c (proc_call): allow call method with
+	  block that both is written in C. [ruby-dev:34273] [ruby-core:15551]
+
+	*  proc.c (curry): use proc_call instead of rb_proc_call.
+	  [ruby-dev:34273] [ruby-core:15551]
+
+Sun Jun  8 21:50:27 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/zlib/test_zlib.rb: add tests to achieve over 90% test coverage
+	  of zlib.
+
+Sun Jun  8 20:12:47 2008  wanabe  <s.wanabe@gmail.com>
+
+	* vm_insnhelper.c (vm_throw): regard break as return in lambda.
+	  [ruby-dev:34646]
+
+Sun Jun  8 19:17:59 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add a build option "CALC_EXACT_MALLOC_SIZE".
+	  This option enables to calculate exact size of current
+	  allocated size by malloc().  You can access these information
+	  with GC.malloc_allocated_size and GC.malloc_allocations.
+	  This option consume additional memory as a header of each memory
+	  object.  This option also helps to find out xmalloc()/xfree()
+	  consistency.  If you get trouble with this option, some extension
+	  using "free()" instead of "xfree()".
+	  This options is disabled by default.
+
+Sun Jun  8 18:15:38 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
+	  enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
+	  io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
+	  string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
+	  vm.c, gc.c:
+	  allocated memory objects by xmalloc (ruby_xmalloc) should be
+	  freed by xfree (ruby_xfree).
+
+	* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
+	  ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
+	  ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
+	  ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
+	  ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
+	  ditto.
+
+Sun Jun  8 01:15:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* hash.c (hash_i): make Hash#hash order insensitive.
+	  (rb_hash_dup): use DUPSETUP.
+
+Sat Jun  7 23:47:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
+	  initialize_copy; [ruby-list:45016].
+
+Sat Jun  7 22:15:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
+	  SITE_DIR.  a patch from Richard Brown <rbrown AT exherbo.org> in
+	  [ruby-core:17129].
+
+Sat Jun  7 21:37:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_f_open), re.c (rb_reg_search), transcode.c (str_transcode):
+	  suppress warnings.
+
+	* util.c (quorem, rv_alloc, nrv_alloc): only used in dtoa().
+
+Sat Jun  7 16:06:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CFLAGS, CXXFLAGS): append default flags.
+
+Sat Jun  7 01:23:59 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int.
+	  fixed [ruby-dev:34979]
+
+Fri Jun  6 23:46:19 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_callee_setup_arg): check simple flag before
+	  calling setup_arg function().  this change reduce function call.
+
+Fri Jun  6 21:51:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
+
+	* ext/socket/addrinfo.h (addrinfo, getaddrinfo, getnameinfo,
+	  freehostent, freeaddrinfo): undef before define because these are
+	  macros in some versions of Windows SDK.
+
+	  merged from ruby_1_8.
+
+Fri Jun  6 18:25:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/iconv/utils.rb (default_test): override not to croak.
+
+Fri Jun  6 16:41:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
+
+Fri Jun  6 15:05:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (count_objects): clear hash after counting objects.
+
+Fri Jun  6 12:43:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_dir.rb (TestDir::test_glob): glob file names not sorted.
+
+Fri Jun  6 00:05:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.xmlschema): don't use float.  fix
+	  http://rubyforge.org/tracker/index.php?func=detail&group_id=426&atid=1698&aid=20504
+
+Thu Jun  5 23:56:18 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_gc.rb: add tests to achieve over 90% test coverage of
+	  gc.c.
+
+	* test/ruby/test_objectspace.rb: ditto.
+
+	* test/ruby/test_marshal.rb: ditto.
+
+Thu Jun  5 23:40:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gc.c (rb_objspace_alloc): this function is needed only when
+	  ENABLE_VM_OBJSPACE macro is defined.
+
+	* vm.c: ditto.
+
+Thu Jun  5 23:31:21 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/stringio/test_stringio.rb: add tests to achieve over 95% test
+	  coverage of stringio.
+
+	* test/strscan/test_stringscanner.rb: ditto for strscan.
+
+Thu Jun  5 23:25:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (ruby_finalize_0): clear trace_func after executing END
+	  procs.
+
+	* thread.c: fix typo.
+
+Thu Jun  5 22:50:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (os_obj_of): heaps may be modified in yield.
+
+Thu Jun  5 21:46:50 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* st.c (st_reverse_foreach): comment out unused function.
+
+	* util.c (dtoa): ditto.
+
+Thu Jun  5 20:30:46 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
+	  Add a null check for ssl; submitted by akira yamada
+	  in [ruby-dev:34950].
+
+	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
+	  SSL_OP_NO_TICKET is present; submitted by akira yamada
+	  in [ruby-dev:34944].
+
+	* test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
+	  workaround for the case where OpenSSL is configured with
+	  --enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
+
+Thu Jun  5 20:24:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (thread_set_trace_func_m): fix check for proc argument.
+
+Thu Jun  5 20:17:29 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/document.rb (REXML::Document:write): leaky modification
+	  trans -> transitive.  [ruby-dev:32040], r13686
+
+	* lib/rexml/text.rb (Text.check): fix check for illegal character.
+
+Thu Jun  5 14:03:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_create): find encoding without options.
+
+Thu Jun  5 07:48:32 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (hash): should be "static".
+
+Thu Jun  5 01:47:18 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_transcode.rb: add tests for iso-2022-jp.
+
+Thu Jun  5 01:27:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_process.rb: add tests.
+
+Wed Jun  4 23:10:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.
+
+Wed Jun  4 18:53:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_alloc): RDoc updated.  a patch from Gaston
+	  Ramos <ramos.gaston at gmail.com> in [ruby-core:17073].
+
+Wed Jun  4 18:36:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc.rb: massive spelling correction patch from Evan Farrar
+	  <evanfarrar at gmail.com> in [ruby-doc:1382] applied.
+
+Wed Jun  4 17:52:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_iconv): fix for length argument and now
+	  allows range.  [ruby-core:17092]
+
+Wed Jun  4 15:45:41 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_with_index, enumerator_with_memo): Fix
+	  grammo in rdoc.
+
+Wed Jun  4 13:06:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CFLAGS, CXXFLAGS): include additional flags to
+	  CFLAGS and CXXFLAGS while configuration.
+
+Tue Jun  3 23:06:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/strscan/strscan.c (strscan_scan_full, strscan_search_full): fix
+	  document.
+
+Tue Jun  3 22:37:26 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/strscan/strscan.c (strscan_exist_p): fix document.
+
+Tue Jun  3 22:33:29 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_dir.rb: add tests to achieve over 90% test coverage
+	  of dir.c.
+
+	* test/ruby/test_encoding.rb: add tests for dummy?, name_list and
+	  aliases.
+
+	* test/ruby/test_marshal.rb: add some tests.
+
+Tue Jun  3 22:25:51 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/etc/test_etc.rb: new tests for etc.
+
+Tue Jun  3 19:35:02 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_with_memo): New method: with_memo().
+
+Tue Jun  3 20:04:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (miniruby$(EXEEXT)): miniruby cannot be
+	  written by miniruby itself.
+
+Tue Jun  3 19:33:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_init_copy): Take care of
+	  initialize_copy as well as initialize.
+
+Tue Jun  3 16:06:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): fix for non-existent files and SFN of
+	  symlinks.  [ruby-talk:303736]
+
+Tue Jun  3 15:12:01 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#classify): Back out the `group_by' alias.
+	  Better think twice.
+
+Tue Jun  3 15:00:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#collect, Set#select): Back out.  I thought it
+	  was consistent but turned out to be wrong.
+
+Tue Jun  3 13:41:08 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#collect, Set#select): Override Enumerable
+	  methods and make them return a set. [ruby-core:17055]
+	  (Set#delete_if, Set#collect!, Set#reject!, Set#classify)
+	  (Set#divide, Set#delete_if): Return an enumerator if no block is
+	  given.
+	  (Set#classify): Define an alias `group_by' to override that of
+	  Enumerable.
+
+Tue Jun  3 13:35:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (run_exec_pgroup): C99 ism.
+
+Tue Jun  3 12:51:57 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_allocate, enumerator_ptr): Properly
+	  detect if the object is initialized and raise error when
+	  appropriate.
+	  (enumerator_initialize): Fix a typo in rdoc. [ruby-core:17052]
+
+Tue Jun  3 01:21:51 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_method.rb: add a test.
+
+Tue Jun  3 00:26:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* marshal.c (w_object): add a check for modification of array during
+	  its dump.
+
+Mon Jun  2 22:27:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enc/iso_8859_5.c: Large omicron should lowercase to small omicron.
+
+	* test/ruby/test_big5.rb, test/ruby/test_cp949.rb,
+	  test/ruby/test_euc_jp.rb, test/ruby/test_euc_kr.rb,
+	  test/ruby/test_euc_tw.rb, test/ruby/test_gb18030.rb,
+	  test/ruby/test_gbk.rb, test/ruby/test_iso_8859.rb,
+	  test/ruby/test_koi8.rb, test/ruby/test_shift_jis.rb,
+	  test/ruby/test_windows_1251.rb: new tests for encoding.
+
+	* test/ruby/test_utf16.rb, test/ruby/test_utf32.rb,
+	  test/ruby/test_regexp.rb: add tests.
+
+Mon Jun  2 21:56:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_file.rb: add tests for uninitialized object.
+
+	* test/ruby/test_class.rb: ditto.
+
+	* test/ruby/test_thread.rb: ditto.
+
+Mon Jun  2 21:44:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* re.c: fix SEGV by Regexp.allocate.names, Match.allocate.names, etc.
+
+	* test/ruby/test_regexp.rb: add tests for above.
+
+	* io.c: fix SEGV by IO.allocate.print, etc.
+
+	* test/ruby/test_io.rb: add tests for above.
+
+Mon Jun  2 19:17:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_argf.rb (teardown): remove renamed temporary files.
+
+Mon Jun  2 18:51:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/un.rb (wait_writable): wait until target files can be
+	  written actually.
+
+	* win32/Makefile.sub (LDSHARED_0, LINK_SO): get rid of failure of
+	  mt.exe.
+
+Mon Jun  2 16:26:17 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/delegate.rb (Delegator::MethodDelegation#respond_to):
+	  respond_to? should now take optional second argument; submitted
+	  by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
+
+Mon Jun  2 16:14:18 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops.  This
+	  change did not apply to trunk.  Backed out.
+
+Mon Jun  2 16:08:24 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
+	  where tokens are not yielded one by one.
+
+	* test/erb/test_erb.rb (TestERBCore#_test_01)
+	  (TestERBCore#test_02_safe_04): The expected value should come
+	  first for assert_equal().
+
+Mon Jun  2 13:06:38 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* mkconfig.rb: hide build path from rbconfig.rb.
+
+Mon Jun  2 08:46:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod, dtoa): initialize more variables for error
+	  handling.
+
+Mon Jun  2 04:55:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* suppress warnings on cygwin, mingw and mswin.
+
+Mon Jun  2 04:35:32 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/gb18030.c (gb18030_code_to_mbc): add 0x80000000
+	  for 4bytes character.
+
+Mon Jun  2 03:52:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (set_arg0): reverted used variable definition.
+
+Mon Jun  2 03:23:25 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/gb18030.c (gb18030_mbc_to_code): mask by 0x7FFFFFFF
+	  because OnigCodePoint will be used as 32bit signed int.
+	  Masking by 0x7FFFFFFF is ok on GB18030;
+	  Minimum 4bytes character is 0x81308130.
+
+Sun Jun  1 22:29:35 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* rational.c (string_to_r_internal): use rb_isdigit.
+
+	* marshal.c (long_toobig): use %zd.
+
+	* ruby.c (set_arg0): move unused variable definition.
+
+Sun Jun  1 12:18:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
+	  this is not int on 64bit system.
+
+	* vm_dump.c (control_frame_dump): ditto.
+
+	* vm_dump.c (stack_dump_each): ditto.
+
+	* vm_dump.c (debug_print_register): ditto.
+
+	* vm_dump.c (debug_print_pre): ditto.
+
+	* transcode.c (str_transcode): ditto.
+
+Sun Jun  1 10:32:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_normal_exit): show coredump status.
+
+Sat May 31 23:33:34 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* README, README.ja: Add a note about default C flags.
+
+Sat May 31 23:02:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (count_objects): clear given hash.
+
+Sat May 31 20:28:10 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_regexp.rb: add tests.
+
+Sat May 31 19:11:39 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_16{be,le}.c (utf16{be,le}_code_to_mbc):
+	  fix codepoint to bytes.
+
+Sat May 31 18:28:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* suppress warnings with -Wwrite-string.
+
+Sat May 31 18:26:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_delete_if): should return enumerator if no block
+	  is given.  [ruby-dev:34901]
+
+Sat May 31 15:58:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, configure.in (warnflags): defaulted to -Wall
+	  -Wno-parentheses with gcc.  [ruby-dev:34810]
+
+Sat May 31 15:17:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/mvm.h: new header file for MVM, and moved rb_vm_t and
+	  rb_thread_t from vm_core.h.
+
+Sat May 31 12:02:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_normal_exit): show pid when fail.
+
+Fri May 30 23:55:56 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_rubyoptions.rb: add a test of RUBY_DESCRIPTION.
+
+Fri May 30 22:47:17 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_regexp.rb: add tests.
+
+Fri May 30 22:40:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_signal.rb: add tests to achieve over 80% test
+	  coverage of signal.c.
+
+Fri May 30 22:28:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* signal.c (esignal_signo): fix SignalException#signo which returned
+	  nil absolutely.
+
+	* signal.c (esignal_init): always prepend "SIG" to a string that is
+	  returned by SignalException#signm.
+
+Fri May 30 22:17:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_argf.rb: rename a conflicting method name.
+
+	* test/ruby/test_string.rb: ditto.
+
+	* test/ruby/test_io.rb: ditto.
+
+Fri May 30 22:14:37 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (defined_expr): fix SEGV by defined?([1]).
+
+Fri May 30 12:18:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (prelude.c): simply depends on PREP.  [ruby-dev:34877]
+
+	* enc/make_encdb.rb, enc/trans/make_transdb.rb: ditto.
+
+Fri May 30 10:55:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (struct rb_unblock_callback), thread.c
+	  (set_unblock_function), thread_{pthread,win32}.c (native_sleep):
+	  extracted from struct rb_thread_struct.
+
+	* thread.c (reset_unblock_function): not check interrupts at leaving
+	  blocking region.  [ruby-dev:34874]
+
+Fri May 30 06:09:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_8.c: add UTF8-MAC (UTF-8-MAC).
+
+Fri May 30 04:17:13 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enum.c (enum_count, count_all_i, Init_Enumerable),
+	  array.c (rb_ary_count): If no argument or block is given, count
+	  the number of all elements.
+
+Fri May 30 03:12:18 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand):
+	  Int should be enough here.
+
+Fri May 30 02:35:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand),
+	  ext/openssl/ossl_pkey_dh.c (ossl_dh_s_generate)
+	  (ossl_dh_initialize),
+	  ext/openssl/ossl_pkey_dsa.c (ossl_dsa_s_generate),
+	  ext/openssl/ossl_rand.c (ossl_rand_bytes)
+	  (ossl_rand_pseudo_bytes, ossl_rand_egd_bytes),
+	  ext/openssl/ossl_x509store.c (ossl_x509stctx_set_error): Do not
+	  use FIX2INT() without checking the value type.  Use NUM2INT()
+	  instead; found by akr in [ruby-dev:34890].
+
+Fri May 30 02:08:20 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* signal.c (esignal_init): handle a non-integer argument correctly,
+	  allowing SignalException.new(:INT).
+
+Fri May 30 00:59:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_regexp.rb: add tests.
+
+Thu May 29 22:51:05 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_require.rb: add a test for load with wrap flag, to
+	  achieve 100% test coverage of eval_jump.c.
+
+Thu May 29 22:47:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_argf.rb: new tests for ARGF, to achieve over 85% test
+	  coverage of file.c.
+
+	* test/ruby/test_io.rb: add tests.
+
+Thu May 29 22:41:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (argf_readchar): raise EOFError, synchronizing IO#readchar.
+
+Thu May 29 22:29:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* io.c (argf_external_encoding, argf_internal_encoding): fix SEGV by
+	  ARGF.external_encoding.
+
+Thu May 29 17:52:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
+	  as WIN32.  [ruby-core:16984]
+
+Wed May 28 18:05:28 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_nitems, Init_Array): Axe Array#nitems().
+	  cf. [ruby-dev:34676]-[ruby-dev:34713]
+
+Wed May 28 17:50:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/mkexports.rb (Exports#objdump, Exports#each_line): extracted.
+
+Wed May 28 17:41:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (MKPREP): appended $(RBCONFIG).
+
+	* common.mk (enc.mk, prelude.c): not depend on $(RBCONFIG) on mswin32
+	  to get of compiling twice each time.
+
+	* win32/Makefile.sub (prelude.c): not depend on $(PREP).
+
+Wed May 28 17:37:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb (Exports::Mswin#each_export): speed up.
+
+Wed May 28 16:41:59 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_slice_bang): Call rb_ary_modify_check() at the
+	  beginning. [rubyspec]
+
+Wed May 28 16:12:44 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
+	  Set the HTTP status code to 302 if a Location header field is
+	  present and the status code is not valid as a client
+	  redirection.  cf. RFC 3875 6.2.3, 6.2.4.
+
+Wed May 28 15:53:52 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/trans/japanese.c (to_SHIFT_JIS_EF_infos): typo.
+
+Wed May 28 15:18:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/singleton.rb (SingletonClassMethods): _load should be public.
+
+Wed May 28 13:30:43 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.c: add workaround for Unicode to CP932.
+	  U+2015->0x815C, U+2225->0x8161, U+FF0D->0x817C, U+FF3C->0x815F,
+	  U+FF5E->0x8160, U+FFE0->0x8191, U+FFE1->0x8192, U+FFE2->0x81CA
+
+Wed May 28 12:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
+	  private methods too.  [ruby-dev:34671]
+
+	* object.c (convert_type): ditto.
+
+Wed May 28 08:42:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c: "%" is required before PRI?VALUE.
+
+Tue May 27 22:10:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.c (error_handle): SystemExit and SignalException throws
+	  TAG_RAISE but not TAG_FATAL.
+
+	* thread.c (rb_thread_execute_interrupts): delay interrupts during
+	  raising exceptions.  [ruby-dev:34855]
+
+Tue May 27 20:18:30 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_slice_bang): Return an empty array instead of
+	  nil when pos is valid and len is adjusted from a valid value to
+	  zero; caught by RubySpec.
+
+Tue May 27 19:12:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get
+	  rid of depending PREP with nmake.
+
+	* common.mk (encs): depends on libruby.
+
+Tue May 27 19:00:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/stringio/stringio.c (strio_each_char, Init_stringio): Add
+	  StringIO#{each_char,chars}.
+	  (Init_stringio): Fix StringIO#bytes.
+
+Tue May 27 17:54:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/stringio/stringio.c (strio_each_byte): Return self instead
+	  of nil as the rdoc says.
+
+Tue May 27 15:36:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (check_int): use PRIxVALUE format specifier.
+
+	* numeric.c (check_uint, rb_num2fix, int_chr): ditto.
+
+	* numeric.c (num_fdiv): fallback to_f should always return float
+	  result.  should not use #quo that may return rational.
+
+	* numeric.c (num_div): should raise ZeroDivisionError.
+
+	* numeric.c (fix_divide): ditto.
+
+	* test/ruby/test_numeric.rb (TestNumeric::test_divmod): avoid
+	  ZeroDivisionError in tests.
+
+Tue May 27 13:14:53 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enum.c (enum_to_a): Pass arguments through to #each().
+	  (enum_sort): Follow the enum_to_a signature change.
+	  (enum_reverse_each): Add #reverse_each().
+
+Tue May 27 13:12:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+
+Tue May 27 12:06:37 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
+
+	* file.c (file_expand_buf): shouldn't use buflen for length of string.
+
+Mon May 26 18:24:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (BUFCHECK): no resize if enough room.
+
+	* file.c (file_expand_path): use BUFCHECK.
+
+Mon May 26 17:48:42 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (struct enumerator, enumerator_init)
+	  (enumerator_init_copy, enumerator_each): Eliminate iter.
+	  (enumerator_ptr): Do not hardcode the class name.
+	  (enumerator_with_index): Delay variable initialization after
+	  RETURN_ENUMERATOR().
+
+Mon May 26 17:23:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (file_expand_path): add more space for '/'.
+
+	* file.c (file_expand_path): should reset address of p after calling
+	  rb_str_resize(). [ruby-dev:34800]
+
+Mon May 26 16:49:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-mode): use run-hooks if run-mode-hook is
+	  not available.  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>
+	  in [ruby-dev:34853].
+
+Mon May 26 16:41:35 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (ntfs_tail): filename which starts with '.' is valid.
+
+	* file.c (file_expand_path): cygwin symlink support.
+
+Mon May 26 07:15:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): rb_make_backtrace has no arguments.
+
+Mon May 26 01:17:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_normal_exit): signal description
+	  refined.
+
+Mon May 26 00:52:52 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* hash.c (env_each_key, env_each_value, env_reject_bang)
+	  (rb_env_clear, env_replace): Omit duplicated secure level check.
+
+Mon May 26 00:37:16 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* hash.c (env_each_value): Do not call env_values() twice.
+
+Sun May 25 17:54:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_compile): set local_table for
+	  ISEQ_TYPE_DEFINED_GUARD.
+
+Sun May 25 17:52:25 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_build_body): remove side effect from
+	  VM::InstructionSequence.load.
+
+Sun May 25 04:30:45 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_module.rb (remove_json_mixins): change judgment
+	  condition.
+
+Sun May 25 03:54:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_module.rb (test_ancestors, test_included_modules):
+	  ignore json mixins.
+
+Sun May 25 02:37:25 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.c: renamed from vm_method.c.  "vm_method.c" is included
+	  by "vm.c".
+
+	* vm_eval.c: added.  Some codes are moved from "eval.c"
+
+	* common.mk: fix for above changes.
+
+	* compile.c: make a vm_eval(0)
+
+	* eval.c, eval_error.c, eval_intern.h, eval_jump.c, proc.c, vm.c,
+	  id.c, id.h, vm_core.h, vm_dump.c, vm_evalbody.c, vm_insnhelper.c,
+	  blockinlining.c: fix for above changes.  and do some refactoring.
+	  this changes improve rb_yield() performance.
+
+Sat May 24 22:32:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): clear errno at the top of our own
+	  implementation of strtod(3).  [ruby-dev:34834] [ruby-dev:34839]
+
+Sat May 24 15:26:16 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_set_exception_table, NODE_WHILE, NODE_NEXT): remove
+	  special handling that decrements sp in CATCH_TYPE_NEXT for NODE_WHILE.
+
+	* vm.c (vm_eval_body), vm_insnhelper.c (vm_throw): remove unused code.
+
+Sat May 24 08:13:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (rb_str_transcode): argc is 1, and argv is &to.
+
+Fri May 23 17:55:11 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_slice_bang): Be consistent with Array#slice()
+	  and String#slice!().  Just return nil when a negative length or
+	  out of boundary index is given instead of raising an exception
+	  via internal functions.
+
+Fri May 23 16:44:34 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (Init_Enumerator): Override
+	  Enumerable::Enumerator#each_with_index with #with_index.
+
+Fri May 23 12:23:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_num_t): moved form vm.h.
+
+	* tool/instruction.rb (RubyVM::Instruction#sp_increase_c_expr),
+	  tool/instruction.rb (RubyVM::VmBodyGenerator#make_header_operands):
+	  omit unused variables.
+
+Fri May 23 08:47:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (exc_equal): == operator should be transitional.
+	  [ruby-dev:34808]
+
+	* error.c (syserr_eqq): === should be able to handle delegated
+	  objects as well.
+
+Fri May 23 06:15:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_compile_with_option): get rid of segv.
+
+Fri May 23 02:29:14 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (opt_gt|ge|lt|le): use values directly to compare.
+
+Fri May 23 01:15:09 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, eval_intern.h, include/ruby/intern.h, include/ruby/ruby.h,
+	  vm.c, vm_core.h, vm_insnhelper.c: remove pointless "const".
+
+Thu May 22 23:45:17 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (get_destination_insn, get_next_insn, get_prev_insn):
+	  peephole optimization should not ignore ISEQ_ELEMENT_ADJUST.
+
+Thu May 22 20:20:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (check_dump_arg, check_load_arg): check if reentered.
+	  [ruby-dev:34802]
+
+Thu May 22 20:14:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* iseq.c (iseq_load, iseq_data_to_ary): support
+	  ISEQ_TYPE_DEFINED_GUARD.
+
+Thu May 22 19:01:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_get_ruby_level_cfp): moved from eval_intern.h.
+
+	* vm.c (sdr, nsdr): define methods only if VMDEBUG is defined.
+
+Thu May 22 17:18:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_compact_bang): fix reallocation size.
+
+Thu May 22 15:20:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval_intern.h, vm_core.h, include/ruby/intern.h, include/ruby/ruby.h,
+	  vm.c: need to add const to prototypes, of course.
+
+Thu May 22 13:24:43 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, vm.c, vm_core.h, vm_insnhelper.c: specify "const".
+
+	* vm_opts.h: add a OPT_TOKEN_THREADED_CODE macro.
+
+Thu May 22 12:51:41 2008  Tanaka Akira  <akr@fsij.org>
+
+	* insns.def (newhash): fix a variable definition: "const k".
+
+Thu May 22 12:40:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (flatten): check if reentered.  [ruby-dev:34798]
+
+Thu May 22 11:39:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_normal_exit): capture stdout and stderr
+	  of the child process.
+
+Thu May 22 08:28:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (flatten): free memo hash table before raising exception.
+	  [ruby-dev:34789]
+
+Thu May 22 06:30:10 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* array.c (flatten): fix memory leak.
+
+Thu May 22 06:21:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_str_caseeql): added.
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index): use nkf_str_caseeql.
+
+Thu May 22 05:45:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (proc_dup): should copy safe_level from src proc
+	  properly.  a patch from Keita Yamaguchi
+	  <keita.yamaguchi at gmail.com>
+
+Thu May 22 02:46:08 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: do not use Thread#raise. [ruby-dev:34739]
+
+Thu May 22 00:30:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_require.rb: new tests for library requiring, to
+	  achieve over 90% test coverage of dln.c.
+
+	* test/ruby/test_class.rb: add tests to achieve over 90% test coverage
+	  of class.c.
+
+	* test/ruby/test_module.rb: ditto.
+
+Thu May 22 00:15:44 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm_insnhelper.c: specify "const".
+
+Wed May 21 23:20:21 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_eval.rb: fix syntax.
+
+Wed May 21 17:46:17 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index):
+	  use strcasecmp. [ruby-dev:34787]
+
+Wed May 21 16:48:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_compact_bang): avoid forceful realloc.
+
+Wed May 21 07:42:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_usascii_str_new): use rb_str_new.
+
+	* string.c (rb_enc_str_new): ditto.
+
+	* string.c (rb_usascii_str_new2): use rb_str_new2.
+
+Wed May 21 07:22:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c, include/ruby/encoding.h
+	  (rb_enc_associate, rb_enc_associate_index):
+	  returns obj. [ruby-dev:34778]
+
+Wed May 21 04:20:20 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII.
+
+	* encoding.c, include/ruby/encoding.h (rb_ascii8bit_encindex):
+	  added.
+
+	* encoding.c (rb_locale_encoding): use rb_usascii_encoding().
+
+Wed May 21 01:45:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file_exhaustive.rb (setup): workaround for Windows
+	  Vista.
+
+	* test/ruby/envutil.rb (rubyexec): now Open3.open3 is supported on
+	  Windows.
+
+	* test/ruby/test_process.rb: use ``||'' instead of ``;'' because
+	  cmd.exe not support it.
+
+Wed May 21 01:28:47 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c, include/ruby/encoding.h (rb_str_transcode):
+	  C API of encoding conversion for Ruby object.
+	  VALUE rb_str_transcode(VALUE str, VALUE to).
+
+	* transcode.c (str_encode, str_encode_bang):
+	  rename from rb_tr_transcode or rb_str_transcode_bang.
+
+Tue May 20 23:26:05 2008  Yusuke Endoh	<mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb: fix tests for 64bit CPU.
+
+Tue May 20 20:59:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (rb_nkf_convert) (nkf_enc_without_bom):
+	  reverted. nkf-utf8/nkf.c should be independent of ruby.
+
+	* ext/nkf/nkf.c (options):
+	  moved from nkf-utf8/nkf.c.
+	  override nkf's original settings for Unicode BOM.
+
+Tue May 20 13:20:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_convert), ext/nkf/nkf-utf8/nkf.c
+	  (nkf_enc_without_bom): BOM is not a part of encodings.
+
+	* ext/nkf/nkf.c (Init_nkf), ext/nkf/nkf-utf8/nkf.c (options):
+	  UTF-{16,32} without endian have no sense.
+
+Tue May 20 12:13:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options, process_options): --dump option.
+
+Tue May 20 11:36:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRI[diouxX]VALUE): printf format for VALUE.
+
+	* gc.c (assign_heap_slot): suppress a warning.
+
+Tue May 20 03:42:43 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, vm_insnhelper.c: fix cref in instance_eval
+	  and cvar_base search protocol.
+
+	* bootstraptest/test_knownbug.rb, test_eval.rb: move solved test
+	  and add new tests.
+
+	* test/ruby/test_eval.rb: fix tests for spec.
+
+Tue May 20 01:43:44 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: fix a test.
+	  "block_given?" returns true if "yield" can be used.
+
+Tue May 20 01:07:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (assignable_gen): when "self = 1" was evaluated, unnecessary
+	  error message was output, which might cause null pointer access.
+
+Tue May 20 08:38:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_enc_strlen_cr): need to set ENC_CODERANGE_7BIT if
+	  search_nonascii() fails.    [ruby-dev:34751]
+
+	* string.c (rb_str_reverse): preserve coderange info if the
+	  receiver is 7bit string.
+
+	* string.c (rb_str_reverse_bang): ditto.
+
+	* string.c (rb_str_reverse_bang): should have called
+	  single_byte_optimizable before rb_str_modify() that clears
+	  coderange info.
+
+	* string.c (tr_trans): handle single bytes more eagerly.
+
+Mon May 19 23:32:12 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block_from_c): fix call flow.
+
+Mon May 19 23:19:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regexec.c (slow_search): check the case when the length is 1.
+	  The behavior of memcmp is undefined if the third argument is 0.
+
+Mon May 19 21:07:48 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (native_thread_apply_priority):
+	  fix argument range check.  [ruby-dev:33124]
+
+Mon May 19 18:22:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type
+	  of md; pointed out by Takahiro Kambe <taca at back-street.net>
+	  in [ruby-dev:34748].
+
+Mon May 19 17:23:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regparse.c (PINC): use optimized enclen() instead of
+	  ONIGENC_MBC_ENC_LEN().
+
+	* regparse.c (PFETCH): ditto.
+
+	* regparse.c (PFETCH): small optimization.
+
+	* regexec.c (slow_search): single byte encoding optimization.
+
+	* regenc.h (enclen): avoid calling function when encoding's
+	  min_len == max_len.
+
+	* re.c (rb_reg_regsub): rb_enc_ascget() optimization for single
+	  byte encoding.
+
+	* re.c (rb_reg_search): avoid allocating new re_registers if we
+	  already have MatchData.
+
+	* re.c (match_init_copy): avoid unnecessary onig_region_free()
+	  before onig_region_copy.
+
+	* encoding.c (rb_enc_get_index): remove implicit enc_capable check
+	  each time.
+
+	* encoding.c (rb_enc_set_index): ditto.
+
+	* encoding.c (enc_compatible_p): small refactoring.
+
+	* include/ruby/encoding.h (rb_enc_dummy_p): inline
+	  rb_enc_dummy_p() and export related code.
+
+Mon May 19 14:32:03 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h: fix strange change by version.h update tool.
+
+Mon May 19 14:18:13 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: move solved tests.
+
+	* bootstraptest/test_eval.rb, test_literal.rb, test_syntax.rb,
+	  test_thread.rb: ditto.
+
+	* test/ruby/test_m17n.rb, test_proc.rb, test_sprintf.rb,
+	  test_string.rb, test/ruby/test_struct.rb: ditto.
+
+Mon May 19 13:23:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_spawn_internal): set last_status when status == -1
+	  because there is no path to set it on win32. this patch is derived
+	  from [ruby-core:16787], submitted by Luis Lavena <luislavena at
+	  gmail.com>
+
+Mon May 19 11:32:47 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, insns.def, eval.c, vm_insnhelper.c: fix CREF handling.
+	  VM value stack frame of block contains cref information.
+	 (dfp[-1] points CREF)
+
+	* compile.c, eval_intern.h, eval_method.c, load.c, proc.c,
+	  vm_dump.h, vm_core.h: ditto.
+
+	* include/ruby/ruby.h, gc.c: remove T_VALUES because of above
+	  changes.
+
+	* bootstraptest/test_eval.rb, test_knownbug.rb: move solved test.
+
+Sun May 18 22:26:51 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpservlet/filehandler.rb: should normalize path
+	  name in path_info to prevent script disclosure vulnerability on
+	  DOSISH filesystems. (fix: CVE-2008-1891)
+	  Note: NTFS/FAT filesystem should not be published by the platforms
+	  other than Windows. Pathname interpretation (including short
+	  filename) is less than perfect.
+
+	* lib/webrick/httpservlet/abstract.rb
+	  (WEBrick::HTTPServlet::AbstractServlet#redirect_to_directory_uri):
+	  should escape the value of Location: header.
+
+	* lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
+	  command line arguments.
+
+Sun May 18 02:54:46 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* pack.c (pack_pack): check errno to detect error of ruby_strtoul.
+
+	* pack.c (pack_unpack): ditto.
+
+	* test/ruby/test_pack.rb: add a test for above.
+
+Sat May 17 23:53:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): fix for short file name on Cygwin.
+
+Sat May 17 18:03:52 2008  Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+	* vm.c (Init_VM): removed the definition of Thread#initialize,
+	  which is overwritten in Init_Thread and is never used.
+
+Sat May 17 14:01:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): should not free shared pointer, and set
+	  shared.  [ruby-dev:34732]
+
+Sat May 17 12:34:54 2008  Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+	* thread_pthread.c (Init_native_thread): Kernel#.sleep used never to
+	  sleep on Mac OS X. Reported by arton <artonx AT yahoo.co.jp>.
+
+	* thread_pthread.c (native_sleep): added error checks.
+
+Sat May 17 11:29:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_extname): first dot is not an extension name.
+
+Sat May 17 03:21:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): stop memory leak.  [ruby-dev:34726]
+
+	* re.c (rb_reg_search): need to free allocated buffer in re_register.
+
+	* regexec.c (onig_region_new): more pedantic malloc check.
+
+	* regexec.c (onig_region_resize): ditto.
+
+	* regexec.c (STATE_CHECK_BUFF_INIT): ditto.
+
+	* regexec.c (onig_region_copy): use onig_region_resize.
+
+Fri May 16 12:48:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (to_flo): rb_Float() accepts even strings for input.
+
+	* complex.c (nucomp_to_f): fix wrong message.
+
+	* complex.c (nucomp_to_r): ditto.
+
+	* object.c (rb_Float): do not check NaN for error.  NaN is a part
+	  of valid float values.
+
+Thu May 15 23:36:09 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_string.rb: add tests to achieve over 90% test
+	  coverage of string.c.
+
+	* test/ruby/test_m17n.rb: ditto.
+
+	* test/ruby/test_symbol.rb: ditto.
+
+	* test/ruby/test_pack.rb: ditto.
+
+Thu May 15 23:01:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (tr_find): String#delete returned wrong result when multiple
+	  utf-8 arguments are passed.
+
+	* test/ruby/test_m17n.rb (test_delete): add a test for above.
+
+Thu May 15 22:37:56 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (ripper_warningS): now used.
+
+Thu May 15 15:33:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): support for alternative data stream
+	  and ignored trailing garbage of NTFS.
+
+	* file.c (rb_file_s_basename): ditto.
+
+	* file.c (rb_file_s_extname): ditto.
+
+Thu May 15 13:43:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): no need for forceful warning when
+	  converting to float.  overflow is a nature of float values.
+
+	* parse.y (parser_yylex): ditto.
+
+Thu May 15 13:23:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_prepare_enc): error condition was updated for non
+	  ASCII compatible strings.
+
+Thu May 15 12:19:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
+	  prototype change in openssl bundled with newer OpenBSD.
+	  a patch from Takahiro Kambe <taca at back-street.net> in
+	  [ruby-dev:34691].
+
+Wed May 14 22:09:25 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ChangeLog: fix typo.
+
+Wed May 14 21:49:14 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_object.rb: new tests to achieve over 90% test
+	  coverage of object.c, eval.c and eval_method.c.
+
+	* test/ruby/test_module.rb: ditto.
+
+	* test/ruby/test_trace.rb: ditto.
+
+	* test/ruby/test_integer.rb: ditto.
+
+	* test/ruby/test_float.rb: ditto.
+
+	* test/ruby/test_method.rb: ditto.
+
+	* test/ruby/test_variable.rb: ditto.
+
+	* test/ruby/test_eval.rb: ditto.
+
+	* test/ruby/test_exception.rb: ditto.
+
+	* test/ruby/test_class.rb: ditto.
+
+Wed May 14 12:46:37 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (insn_operand_intern): remove Qundef related code.
+
+Wed May 14 12:42:36 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_count): Override Enumerable#count for better
+	  performance.
+
+Wed May 14 11:29:06 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: add a "putcbase" instruction.
+
+	* compile.c, insns.def: fix to use putcbase instruction for
+	  class search.  Qundef should not be used.
+
+Wed May 14 07:49:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): defer calling of rb_frame_self() until it
+	  become really necessary.
+
+	* eval.c (rb_call): ditto.
+
+Wed May 14 00:55:56 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_io_m17n.rb: remove a duplicative method.
+
+	* test/ruby/test_utf16.rb: rename a conflicting method name.
+
+	* test/ruby/test_array.rb: ditto.
+
+	* test/ruby/test_file_exhaustive.rb: ditto.
+
+	* test/ruby/test_hash.rb: ditto.
+
+	* test/ruby/test_env.rb: ditto.
+
+	* test/ruby/test_fixnum.rb: ditto.
+
+	* test/ruby/test_rational.rb: ditto.
+
+Wed May 14 00:45:58 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval_method.c (rb_add_method): fix check for warning when
+	  Object#initialize is redefined. (same as 1.8)
+
+Tue May 13 23:32:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_yield): use rb_yield_values2.
+
+	* enum.c (DEFINE_ENUMFUNCS): macro to define enumerator and yielding
+	  functions.
+
+	* enum.c (enum_all_func, enum_any_func, enum_one_func,
+	  enum_none_func): reduced duplicate code.
+
+Tue May 13 15:09:38 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c: Update rdoc.
+	  (enumerator_initialize): Discourage the use.
+	  (enum_each_slice, enum_each_cons, enumerator_each)
+	  (enumerator_with_index): Add a note about a call without a block.
+
+Tue May 13 08:25:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_f_gets): re-enable rdoc.
+	  (rb_f_readline): ditto.
+	  (rb_f_readlines): ditto.
+
+Tue May 13 07:56:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cat): fixed buffer overrun reported by
+	  Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]
+
+Mon May 12 23:37:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (collect_local_variables_in_env): remove unnecessary check
+	  which causes: x=1;proc{local_variables}.call #=> []
+
+	* test/ruby/test_variable.rb: add a test for above.
+
+Mon May 12 23:05:24 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c, include/ruby/intern.h (rb_run_exec_options): externed.
+
+	* process.c (save_redirect_fd, save_env_i, save_env, run_exec_dup2,
+	  run_exec_open, run_exec_pgroup, run_exec_rlimit, rb_run_exec_options):
+	  save parent's process environments.
+
+	* process.c (rb_spawn_internal): remove calling run_exec_options()
+	  because cannot restore after spawn.
+
+	* io.c (pipe_open): ditto.
+
+	* test/ruby/test_process.rb (test_execopts_env): upcase environment
+	  variable name for case insensitive platforms.
+
+	* win32/win32.c (init_env): set USER environment variable only when
+	  USERNAME is available.
+
+Mon May 12 22:23:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/date.rb (once): use Object#object_id instead of Symbol#to_i.
+
+Mon May 12 21:34:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/envutil.rb (rubybin): return expanded rubyexe instead of
+	  expanded ruby if available.
+
+Mon May 12 20:19:55 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enum.c (grep_i): Be aware of multiple values;
+	  fix [ruby-dev:34653].
+	  (grep_iter_i): Ditto.
+	  (count_i): Ditto.
+	  (find_i): Ditto.
+	  (find_index_i): Ditto.
+	  (find_all_i): Ditto.
+	  (reject_i): Ditto.
+	  (inject_i): Ditto.
+	  (inject_op_i): Ditto.
+	  (partition_i): Ditto.
+	  (group_by_i): Ditto.
+	  (first_i): Ditto.
+	  (sort_by_i): Ditto.
+	  (all_i): Ditto.
+	  (all_iter_i): Ditto.
+	  (any_i): Ditto.
+	  (any_iter_i): Ditto.
+	  (one_i): Ditto.
+	  (one_iter_i): Ditto.
+	  (none_i): Ditto.
+	  (none_iter_i): Ditto.
+	  (min_i): Ditto.
+	  (min_ii): Ditto.
+	  (max_i): Ditto.
+	  (max_ii): Ditto.
+	  (minmax_i): Ditto.
+	  (minmax_ii): Ditto.
+	  (min_by_i): Ditto.
+	  (max_by_i): Ditto.
+	  (minmax_by_i): Ditto.
+	  (member_i): Ditto.
+	  (take_i): Ditto.
+	  (take_while_i): Ditto.
+	  (drop_i): Ditto.
+	  (drop_while_i): Ditto.
+	  (cycle_i): Ditto.
+
+	* enum.c (each_with_index): Update rdoc.  each_with_index() takes
+	  arguments that are passed through to each(), and a hash preserves
+	  key order.
+
+Mon May 12 19:05:24 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_spawn_internal): remove calling run_exec_options()
+	  because cannot restore after spawn. we'll fix this later.
+
+Mon May 12 18:16:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_spawn_internal): need to call run_exec_options() before
+	  spawn if the platform doesn't have fork. [ruby-dev:34647]
+
+Mon May 12 15:20:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (ruby_vm_xmalloc): increase malloc_increase only if malloc
+	  succeeds.  failed malloc size can be huge.  it may increase
+	  malloc_limit too big which cause less GC and memory full.
+	  (ruby_vm_xrealloc): ditto.
+	  (rb_objspace): make params.limit and params.increase size_t.
+
+Mon May 12 15:04:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_prepare_re): made non static with small refactoring.
+
+	* ext/strscan/strscan.c (strscan_do_scan): should adjust encoding
+	  before regex searching.
+
+Mon May 12 13:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}.  "defined?(a||=1)"
+	  should not operate assignment.  [ruby-dev:34645]
+
+Mon May 12 13:29:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigzero_p): check from MSB to LSB.  [ruby-dev:34649]
+
+Mon May 12 12:32:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (RUBYOPT): affected BASERUBY too.  [ruby-talk:301514]
+
+Mon May 12 12:27:55 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (assign_heap_slot): fix condition for number of objects in
+	  a heap.
+
+Mon May 12 12:24:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_to_i): really removed.  [ruby-dev:34641]
+
+Mon May 12 11:15:55 2008  Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+	* gc.c (assign_heap_slot):  put the binary search routine in order.
+
+Mon May 12 10:52:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined
+	  instead of Gem::Enable.
+
+	* gem_prelude.rb (load_full_rubygems_library, const_missing): prevent
+	  infinite recursion.  [ruby-dev:34539]
+
+Sun May 11 23:19:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (all_iter_i, any_iter_i): reduced duplicated code.
+
+Sun May 11 22:54:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb (main): leave -I options for purelib.rb
+	  untouched.
+
+	* bootstraptest/runner.rb (main): handle relative path -r options.
+
+Sun May 11 19:04:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_thread.rb: kill and join temporal threads that are
+	  created in each test.
+
+Sun May 11 17:58:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_process.rb (TestProcess#with_stdin): defined.
+	  (TestProcess#test_argv0_noarg): don't use redirect_fds.
+	  [ruby-dev:34647]
+
+Sun May 11 17:57:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (MINIRUBY): should not include extension library path.
+
+Sun May 11 14:40:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (SIZET2NUM): new macro.
+	  (NUM2SIZET): new macro.
+
+	* gc.c (struct rb_objspace): use size_t for increment, length and
+	  used for 64bit.
+	  (allocate_heaps): ditto.
+	  (assign_heap_slot): ditto.
+	  (set_heaps_increment): ditto.
+	  (gc_mark_all): ditto.
+	  (is_pointer_to_heap): ditto.
+	  (free_unused_heaps): ditto.
+	  (gc_sweep): ditto.
+	  (os_obj_of): ditto.
+	  (rb_gc_call_finalizer_at_exit): ditto.
+	  (count_objects): ditto.
+
+Sun May 11 13:14:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (thread_cleanup_func_before_exec): extracted from
+	  thread_cleanup_func not to touch pthread data.
+	  pthread_cond_destroy in forked process may cause deadlock on
+	  Debian GNU/Linux Etch on x86, x86-64 and IA64.
+	  this doesn't cause resource leak because the process will exec soon.
+	  (terminate_atfork_before_exec_i): defined.
+	  (rb_thread_atfork_before_exec): defined.
+
+	* include/ruby/intern.h (rb_thread_atfork_before_exec): declared.
+
+	* process.c (rb_exec_atfork): call rb_thread_atfork_before_exec
+	  instead of rb_thread_atfork.
+
+	* io.c (popen_exec): call rb_thread_atfork_before_exec instead of
+	  rb_thread_atfork.
+
+Sat May 10 22:14:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (tr_trans): single '^' does not mean negation.
+	  [ruby-dev:34632]
+
+	* string.c (tr_trans): should check src size, not str size.
+	  [ruby-dev:34637]
+
+	* string.c (tr_trans): should not turn on modify flag if no
+	  modification happens.  [ruby-dev:34631]
+
+Sat May 10 18:11:18 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_each_line): zero length record separator should
+	  split a string into paragraphs.  [ruby-dev:34586]
+
+	* string.c (rb_str_each_line): RDoc updated.
+
+Sat May 10 11:36:20 2008  Tanaka Akira  <akr@fsij.org>
+
+	* vm.c (env_mark): mark env->block.self.  prevent SEGV when GC occur
+	  in prepare_iseq_build with gcc version 3.4.6 [FreeBSD] 20060305 on
+	  FreeBSD/amd64.
+
+Fri May  9 19:16:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (timeofday): use monotonic clock.  based on a patch
+	  from zimbatm <zimbatm at oree.ch> in [ruby-core:16627].
+
+Fri May  9 07:47:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* cont.c (cont_restore_0): dynamic stack direction code should be
+	  consistent with static one.  [ruby-talk:301152]
+
+Fri May  9 00:03:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): operator assignment "a += b rescue c" should be
+	  parsed as "a += (b rescue c)" just like normal assignment.
+	  [ruby-talk:301000]
+
+Thu May  8 18:14:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_and): bit-wise operation should not take float
+	  values.  [ruby-dev:34612]
+
+	* bignum.c (rb_big_or): ditto.
+
+	* bignum.c (rb_big_xor): ditto.
+
+Thu May  8 17:44:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT.
+
+	* file.c (rb_find_file_ext): guard load_path from GC.
+	  gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) optimizes
+	  load_path by holding only RARRAY_LEN(load_path) and
+	  RARRAY_PTR(load_path) in registers on IA64 GNU/Linux Etch.
+
+Thu May  8 16:41:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
+	  [ruby-core:16642]
+
+Thu May  8 16:00:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): ! and ? at the bottom are no longer part
+	  of valid symbol names.  [ruby-dev:34590]
+
+Thu May  8 15:36:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (rb_gc_save_machine_context): call FLUSH_REGISTER_WINDOWS
+	  to mark the register stack from GC on another thread.
+
+Thu May  8 15:14:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): freeze temporary array.
+
+Thu May  8 13:19:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): mark stat_insn_usage only when ptr is not
+	  null.
+
+Thu May  8 10:44:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (sort_reentered): reentered check may be called from
+	  Array#sort.
+
+Thu May  8 09:51:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (sort_1, sort_2): check for reentered and if elements are
+	  accessible.  [ruby-core:16679]
+
+Thu May  8 06:43:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_find_exe_r, dln_find_file_r): reentrant versions.
+
+	* file.c (rb_find_file_ext, rb_find_file), process.c (proc_exec_v),
+	  (rb_proc_exec, proc_spawn_v, proc_spawn), ruby.c (process_options):
+	  use reentrant versions.
+
+Thu May  8 06:27:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_key_p): thread local storage stores ID.
+
+Thu May  8 01:10:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (tr_trans): should squeeze properly.  [ruby-dev:34587]
+
+	* string.c (tr_trans): had a bug in treating multi-byte character
+	  replacement.
+
+	* string.c (rb_str_delete_bang): need not to do anything for empty
+	  strings.
+
+	* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_delete): add
+	  test for empty receiver.
+
+Wed May  7 20:19:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (process_options, ruby_set_argv): set encoding of rb_argv
+	  after Init_prelude() because cannot load encoding extensions before
+	  it.
+
+Wed May  7 20:00:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (bit_coerce): float should not be a valid operand of
+	  bitwise operations.  [ruby-dev:34583]
+
+Wed May  7 19:35:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_thread_key_p): should always convert symbol to ID.
+	  [ruby-dev:34588]
+
+Wed May  7 19:30:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_divide): float division should floor() before
+	  rounding into integer.  [ruby-dev:34584]
+
+Wed May  7 18:02:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_to_i): remove obsolete method.  preparation for
+	  symbol GC.
+
+	* numeric.c (fix_to_sym): ditto.
+
+	* numeric.c (fix_id2name): ditto.
+
+Wed May  7 17:43:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_puts_ary): check recursion first.  [ruby-dev:34580]
+
+Wed May  7 17:41:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_eval_body): initialize retval.  [ruby-dev:34576]
+
+Wed May  7 13:02:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_fdiv): flo.fdiv(NaN) should result NaN.
+
+	* numeric.c (num_quo): renamed and moved from bignum.c.
+	  [ruby-dev:34582]
+
+	* bignum.c (rb_big_fdiv): update RDoc description
+
+	* rational.c (nurat_s_new_m): small refactoring.
+
+	* bignum.c (rb_big2dbl): no need for forceful warning when
+	  converting to float.  overflow is a nature of float values.
+
+Wed May  7 00:54:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
+	  a patch from Kouya <kouyataifu4 at gmail.com> in
+	  [ruby-reference-manual:762].
+
+Tue May  6 02:08:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/io/nonblock/test_flush.rb: don't set Thread.abort_on_exception.
+
+	* test/net/imap/test_imap.rb: ensure disconnecting imap to terminate
+	  receiver thread.
+
+Tue May  6 00:29:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* iseq.c (insn_operand_intern): should handle Qundef embedded in
+	  operand.  [ruby-core:16656]
+
+Tue May  6 00:00:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): should call compile_cpath() for
+	  modules as well.  [ruby-dev:34585]
+
+	* insns.def (defineclass): add undef handling.
+
+Mon May  5 23:49:40 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (defineclass): was using wrong variable.  [ruby-dev:34592]
+
+Mon May  5 20:07:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fflush): IO#flush problem within threads.  a patch from
+	  <s.wanabe at gmail.com> in [ruby-dev:34595].
+
+Mon May  5 19:58:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (defined_expr): protect some expression from
+	  segmentation fault.  a patch from wanabe <s.wanabe at gmail.com>
+	  in [ruby-dev:34593].
+
+Mon May  5 19:49:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_s_def): Struct.new(0) should not SEGV.
+	  based on the patch from wanabe <s.wanabe at gmail.com> in
+	  [ruby-dev:34594].
+
+	* struct.c (make_struct): call to_str on name object.
+
+Mon May  5 17:17:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (ruby_cleanup): wrap ruby_finalize_0 by SAVE_ROOT_JMPBUF to
+	  avoid SEGV by at_exit { Fiber.new{}.resume } on IA64.
+
+Mon May  5 12:12:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_slice_bang): should adjust length before making
+	  sub-array.
+
+Mon May  5 11:36:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_dup): should dupe corresponding information.
+	  [ruby-dev:34581]
+
+Mon May  5 11:13:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (compile_cpath): use Qundef to denote cbase lookup.
+
+	* insns.def (defineclass): Qundef is passed for cbase.
+
+	* insns.def (setconstant): ditto.
+
+	* vm_insnhelper.c (vm_check_if_namespace): use rb_inspect()
+	  instead of rb_obj_as_string() for better description.
+
+Mon May  5 02:10:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (set_heaps_increment): fix memory allocation strategy by
+	  determining heaps_inc from heaps_used, not objects_delta.
+	  (struct rb_objspace): delta removed.  change increment, length and
+	  used to long for LP64.
+	  (objects_delta): removed.
+	  (allocate_heaps): add next_heaps_length argument.
+	  (init_heap): renamed from add_heap.
+	  (garbage_collect): use heaps_increment in dont_gc.
+
+Sun May  4 21:09:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/getoptlong.rb: use $stderr instead of $deferr.
+
+Sun May  4 16:04:28 2008  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (obj2nsec): fix string argument.
+
+Sun May  4 14:29:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (rb_obj_respond_to): check the result of respond_to? method
+	  by RTEST.
+
+Sun May  4 12:57:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_each_line): return original string.
+
+Sat May  3 20:57:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_normal_exit):
+	  new method.
+
+Sat May  3 18:10:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_timespec): raise TypeError for nil and other objects
+	  which has no divmod method.
+
+Fri May  2 23:59:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (internal_read_func, internal_write_func): split from
+	  internal_io_func.
+
+Fri May  2 23:55:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* variable.c (rb_define_hooked_variable): guard *var from GC to
+	  prevent collecting argf under RUBY_DEBUG=gc_stress.
+
+Fri May  2 17:29:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): call to_int if step is not a numeric
+	  value.  [ruby-dev:34575]
+
+Fri May  2 16:10:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): do not forcefully convert steps into
+	  integers.  [ruby-dev:34571]
+
+Fri May  2 14:52:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el: move fontifying code from hook.  a patch from
+	  Phil Hagelberg <phil at hagelb.org> in [ruby-core:16636].
+
+Fri May  2 14:10:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): step may be bignum.
+
+Fri May  2 13:52:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (Init_Regexp): remove MatchData#select.  [ruby-dev:34563]
+
+Thu May  1 23:59:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_divide), numeric.c (fix_divide): check for result
+	  domain.  [ruby-dev:34559]
+
+Thu May  1 23:57:06 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/net/telnet.rb:  This patch from Brian Candler adds a FailEOF mode which
+	  can be activated to have net/telnet raise EOFError exceptions when the
+	  remote connection is closed.  The default behavior remains unchanged though.
+
+Thu May  1 23:43:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_step): check if step can be converted to an integer.
+	  [ruby-dev:34558]
+
+	* range.c (range_step): allow float step bigger than zero but less
+	  than one.  [ruby-dev:34557]
+
+Thu May  1 23:20:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_divide): return an integer for idiv.
+	  [ruby-dev:34553]
+
+Thu May  1 20:47:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_s_create): should access converted hash value.
+	  [ruby-dev:34555]
+
+Thu May  1 20:31:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_parse.rb (TestParse::test_void_expr_stmts_value):
+	  shut up warning.
+
+	* rational.c (nurat_to_f): no need for forceful warning when
+	  converting to float.  overflow is a nature of float values.
+
+Thu May  1 16:10:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_delete_if): return enumerator if no block given.
+	  [ruby-dev:34554]
+
+Wed Apr 30 21:36:40 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb (url_encode): [ruby-dev:34497] ERB::Util#url_encode
+	  bug fix. Reported by rubikitch.
+
+	* test/erb/test_erb.rb: ditto
+
+Wed Apr 30 20:11:36 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/net/telnet.rb: Fixing a bug where line endings would not be properly
 	  escaped when the two character ending was broken up into separate TCP
 	  packets.  Issue reported and patched by Brian Candler.
 
-Sun Jun 15 22:31:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 30 18:03:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_load_path), vm_core.h (rb_vm_t): moved to VM.
+
+	* load.c (rb_get_load_path): returns absolute load path.
+
+	* load.c (load_path_getter): $LOAD_PATH getter.
+
+	* file.c (rb_find_file_ext, rb_find_file), ruby.c (push_include,
+	  ruby_init_loadpath): use the accessor.
+
+	* vm.c (rb_vm_mark): mark load_path.
+
+Wed Apr 30 17:47:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* re.c (rb_reg_search): use local variable.  a patch from wanabe
 	  <s.wanabe AT gmail.com> in [ruby-dev:34537].  [ruby-dev:34492]
 
-Sun Jun 15 22:20:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Apr 30 16:10:18 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval_intern.h: specify the values of the enumeration constants
+	  explicitly.  [ruby-dev:34489]
+
+Wed Apr 30 12:32:39 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (check_exec_redirect_fd): prohibit duplex IO.
+	  (check_exec_fds): record maxhint even if close_others is not
+	  specified.
+	  (rb_exec_arg_fixup): renamed from rb_exec_arg_fix.
+
+Mon Apr 28 20:24:27 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_marshal_load): checks the given
+	  denominator. [ruby-dev:34536]
+
+Mon Apr 28 14:21:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
+	  FIXNUM_MAX to make it possible to convert to double accurately on
+	  environments with 64bit VALUE and 64bit double.
+	  It assumes FLT_RADIX is 2.
+	  fix RubyForge bug #14102.
+
+Mon Apr 28 12:48:57 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_exec_arg_addopt, rb_exec_arg_addopt): now can specify
+	  close_exec on having no fork environment (but still meaningless).
+
+Mon Apr 28 11:11:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (run_exec_options): don't call FIX2INT for nil.
+
+Mon Apr 28 11:11:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (method_name): should return symbols instead of strings.
+	  [ruby-dev:34531]
+
+Mon Apr 28 09:02:43 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_exec_arg_init): declared.
+	  (rb_exec_arg_addopt): declared.
+	  (rb_exec_arg_fix): declared.
+	  (rb_exec_initarg): removed.
+	  (rb_exec_getargs): removed.
+	  (rb_exec_initarg2): removed.
+
+	* io.c (struct popen_arg): make execarg as a pointer.
+	  (popen_exec): follow popen_arg change.
+	  (pipe_open): add eargp argument.  extract argc and argv from eargp.
+	  use rb_exec_arg_addopt to add redirect options.
+	  (pipe_open_v): set up struct rb_exec_arg.
+	  (pipe_open_s): set up struct rb_exec_arg.
+
+	* process.c (rb_exec_arg_addopt): new function extracted from
+	  check_exec_options_i.
+	  (check_exec_options_i): use rb_exec_arg_addopt.
+	  (rb_check_exec_options): opthash is always a hash now.
+	  (rb_exec_getargs): make it static.
+	  (rb_exec_fillarg): renamed from rb_exec_initarg2.  don't set up
+	  redirect_fds.
+	  (rb_exec_arg_init): new function.
+	  (rb_exec_arg_fix): new function.
+	  (rb_f_exec): use rb_exec_arg_init and rb_exec_arg_fix.  use
+	  rb_exec_arg_addopt to set close_others option.
+	  (run_exec_options): make close_others by default.
+	  (rb_spawn_internal): use rb_exec_arg_init and rb_exec_arg_fix.  use
+	  rb_exec_arg_addopt to set close_others option.
+
+Sun Apr 27 18:59:04 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_expt): use f_rational_new2. [ruby-dev:34524]
+
+Sun Apr 27 15:23:40 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_count): add a GC.count method.  This method returns
+	  a GC invoking count.
+
+Sun Apr 27 12:20:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_t), gc.c (rb_objspace, rb_newobj), vm.c
+	  (Init_BareVM): per-VM object space support, which is disabled now.
+
+	* gc.c (rb_objspace_alloc), vm.c (Init_BareVM): should not use ruby
+	  malloc here.
+
+	* gc.c (garbage_collect, etc): performance improvement by passing the
+	  reference instead of referring the global variable in each functions.
+
+Sun Apr 27 08:06:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (ruby_set_argv): ARGV should be locale encoding.
+	  [ruby-list:44861]
+
+Sun Apr 27 01:46:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.popen3w): removed.
+	  (Open3.popen3): notice wait_thr.
+
+Sun Apr 27 01:13:05 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc, test/rdoc:  Update to RDoc 2.0.0 r56.
+
+Sat Apr 26 21:30:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_hash_dup): declared.
+
+	* hash.c (rb_hash_dup): new function.
+
+	* process.c (rb_spawn_internal): don't modify option hash.
+
+Sat Apr 26 18:36:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c, signal.c, thread.c, thread_win32.c, include/ruby/intern.h:
+	  suppress warnings.
+
+Sat Apr 26 17:42:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (builtin_types), gc.c (count_objects): added Complex and
+	  Rational.
+
+Sat Apr 26 17:35:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_eNOERROR): renamed.
+
+Sat Apr 26 17:30:11 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, gc.c: remove T_BLOCK.
+
+	* include/ruby/ruby.h: re-number T_xxx.
+
+Sat Apr 26 17:31:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_cProcessTms, rb_cProcessStatus): renamed.
+
+	* error.c (builtin_types), signal.c (siglist), st.c (primes),
+	  struct.c (ref_func), time.c (months): constified.
+
+Sat Apr 26 13:00:41 2008  Tanaka Akira  <akr@fsij.org>
 
-	* sprintf.c (rb_f_sprintf): should protect temporary string from
-	  GC.   [ruby-dev:34480]
+	* lib/open3.rb: double fork is replaced by spawn with Process.detach.
+	  (Open3.popen3w): new method to access the thread returned by
+	  Process.detach.
 
-Sun Jun 15 22:18:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Apr 26 00:47:43 2008  Tanaka Akira  <akr@fsij.org>
 
-	* regex.c (re_search): string might be NULL.  [ruby-core:16478]
+	* process.c (rb_spawn_internal): new function to specify
+	  default_close_others.
+	  (rb_spawn): specify default_close_others true.
+	  (rb_f_system): call rb_spawn_internal with default_close_others as
+	  false.
 
-Sun Jun 15 22:16:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Apr 26 12:26:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_each): use INT2FIX() for fixnum values.
+
+Fri Apr 25 17:56:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (free_unused_heaps): preserve last used heap segment to
+	  reduce malloc() call.
+
+Fri Apr 25 17:54:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (HEAP_SIZE): use smaller heap segment (2K) for more chance
+	  to be freed.  based on patch from authorNari <authornari at gmail.com>.
+
+	* gc.c (rb_newobj_from_heap): eventually allocate heap segments.
+
+Fri Apr 25 15:35:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_spawn): rb_exec_initarg() returns new argc and argv in
+	  earg.
+
+Fri Apr 25 12:37:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (flatten): returns an instance of same class.
+	  [ruby-core:16554]
+
+Fri Apr 25 10:52:27 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: define mode_t for umask.
+
+	* process.c (check_exec_options_i, check_exec_fds, run_exec_options):
+	  support "close_others" only when fork(2) is available.
+
+Fri Apr 25 00:16:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: include sys/stat.h for umask.
+
+Thu Apr 24 23:25:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_env_clear): declared.
+	  (rb_io_mode_modenum): declared.
+	  (rb_close_before_exec): declared.
+	  (struct rb_exec_arg): add options and redirect_fds field.
+	  (rb_check_argv): removed.
+	  (rb_exec_initarg): declared.
+	  (rb_exec_getargs): declared.
+	  (rb_exec_initarg2): declared.
+	  (rb_fork): add third argument: fds.
+
+	* io.c (max_file_descriptor): new static variable to record maximum
+	  file descriptor ruby used.
+	  (UPDATE_MAXFD): new macro.
+	  (UPDATE_MAXFD_PIPE): new macro.
+	  (rb_io_mode_modenum): externed.
+	  (rb_sysopen): update max_file_descriptor.
+	  (rb_close_before_exec): new function.
+	  (popen_exec): redirection removed because it is done by extended
+	  spawn mechanism.
+	  (pipe_open): generate a hash for spawn options to specify
+	  redirections.
+	  (pipe_open_v): use rb_exec_getargs.
+	  (pipe_open_s): use rb_exec_getargs.
+	  (rb_io_initialize): update max_file_descriptor.
+
+	* process.c (hide_obj): new function.
+	  (check_exec_redirect_fd): new function.
+	  (check_exec_redirect): new function.
+	  (check_exec_options_i): new function.
+	  (check_exec_fds): new function.
+	  (rb_check_exec_options): new function.
+	  (check_exec_env_i): new function.
+	  (rb_check_exec_env): new function.
+	  (rb_exec_getargs): new function.
+	  (rb_exec_initarg2): new function.
+	  (rb_exec_initarg): new function.
+	  (rb_f_exec): use rb_exec_initarg.
+	  (intcmp): new function.
+	  (run_exec_dup2): new function.
+	  (run_exec_close): new function.
+	  (run_exec_open): new function.
+	  (run_exec_pgroup): new function.
+	  (run_exec_rlimit): new function.
+	  (run_exec_options): new function.
+	  (rb_exec): call run_exec_options.
+	  (move_fds_to_avoid_crash): new function.
+	  (pipe_nocrash): new function.
+	  (rb_fork): use pipe_nocrash to avoid file descriptor conflicts.
+	  (rb_spawn): use rb_exec_initarg.
+	  (rlimit_resource_name2int): extracted from rlimit_resource_type.
+	  (rlimit_type_by_hname): new function.
+	  (rlimit_type_by_lname): new function.
+	  (rlimit_resource_type): use rlimit_type_by_hname.
+	  (proc_daemon): add fds argument for rb_fork.
+
+	* hash.c (rb_env_clear): renamed from env_clear and externed.
+
+	[ruby-dev:34086]
+
+Thu Apr 24 23:00:58 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_thread.rb: fix typos.
+
+	* test/ruby/envutil.rb (rubyexec): move Open3.popen3 call into timeout
+	  block.
+
+Thu Apr 24 22:34:52 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_comparable.rb: new tests for Comparable, to achieve
+	  100% test coverage of compar.c.
+
+Thu Apr 24 17:19:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (process_options): set safe_level before loading script.
+	  [ruby-dev:34421]
+
+Thu Apr 24 14:15:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_find_1): prior files with extensions to files sans
+	  extensions.  [ruby-core:16517]
+
+Thu Apr 24 00:26:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/ri/descriptions.rb: fixed wrong class nestings.
+
+Thu Apr 24 00:20:01 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_settracefunc.rb: add a test for set_trace_func.
+
+	* test/ruby/envutil.rb: move "rubyexec" method from test_rubyoptions.rb.
+
+	* test/ruby/test_rubyoptions.rb: use rubyexec in envutil.rb.
+
+	* test/ruby/test_thread.rb: add tests to achieve over 90% test coverage
+	  of thread.c.
+
+Wed Apr 23 15:28:52 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): failed
+	  notice moved from comment to assertion message. [ruby-dev:29127]
+
+Wed Apr 23 11:49:54 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
+	  an enumerator if no block is given.
+
+Wed Apr 23 00:36:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/openssl/test_ssl.rb (start_server): add timeout to server.join.
+
+Wed Apr 23 00:18:45 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): Improve
+	  tests of Symbol#to_proc.
+
+Tue Apr 22 22:40:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/drb/drb.rb (DRb::DRbServer::check_insecure_method): should
+	  check method names by symbols, not by strings.  a patch from
+	  Kazuhiro NISHIYAMA <zn at mbf.nifty.com> in [ruby-dev:34487].
+
+Tue Apr 22 22:15:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el (ruby-style-{case,label}-indent): up list from
+	  indentation point.
+
+Tue Apr 22 21:09:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):
+	  type of content is unsigned char.
+
+	* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.
+
+	* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.
+
+	* ext/nkf//nkf.c (options): type of option is unsigned char.
+
+Tue Apr 22 20:51:58 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (z_conv): characters must be nkf_char.
+
+Tue Apr 22 19:23:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_initialize): Remove an undocumented
+	  feature (passing a block to the constructor) that's broken.
+	  This is not what I intended.
+
+Tue Apr 22 17:54:05 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm_core.h (exec_event_hooks): ``inline'' is a type modifier, not
+	  a type itself.
+
+Tue Apr 22 16:24:27 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): do not use C++ comments.
+
+Tue Apr 22 16:23:53 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in: use AC_USE_SYSTEM_EXTENSIONS.
+
+Tue Apr 22 16:23:16 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm_evalbody.c (DECL_SC_REG): use __asm__ instead.
+
+Tue Apr 22 16:18:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_evalbody.c (DECL_SC_REG): typo fixed.
+
+Tue Apr 22 15:25:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (struct timespec): needs time.h according to POSIX.
+
+Tue Apr 22 13:19:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_thread_stop_timer_thread): should clear
+	  timer_thread_id after stopping it.
+
+Tue Apr 22 13:12:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_join): remove the current thread from the join list
+	  of the target thread.
+
+Tue Apr 22 12:03:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_get_ev_const): search from the base klass if it
+	  is given.
+
+Tue Apr 22 09:58:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c: avoid warnings.
+
+Tue Apr 22 09:56:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (eaccess): workaround for recent msvcrt's behavior.
+	  [ruby-core:16460]
+
+Mon Apr 21 19:08:32 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_body): call rb_io_check_readable and
+	  rb_io_check_writable.
+
+Mon Apr 21 17:45:27 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dbm/dbm.c (fdbm_each_value, fdbm_each_key, fdbm_each_pair):
+	  GDBM#{each,each_pair,each_key,each_value}: Return an enumerator
+	  if no block is given.
+
+	* ext/gdbm/gdbm.c (fgdbm_each_value, fgdbm_each_key,
+	  fgdbm_each_pair): GDBM#{each,each_pair,each_key,each_value}:
+	  Return an enumerator if no block is given.
+
+	* ext/openssl/ossl_config.c (ossl_config_each):
+	  OpenSSL::Config#each: Return an enumerator if no block is given.
+
+	* ext/readline/readline.c (hist_each): Readline::HISTORY#each:
+	  Return an enumerator if no block is given.
+
+	* ext/sdbm/init.c (fsdbm_each_value, fsdbm_each_key,
+	  fsdbm_each_pair): SDBM#{each,each_pair,each_key,each_value}:
+	  Return an enumerator if no block is given.
+
+	* ext/stringio/stringio.c (strio_each_byte, strio_each):
+	  StringIO#{each,each_line,each_byte}: Return an enumerator if no
+	  block is given.
+
+	* ext/stringio/stringio.c (Init_stringio): Add #lines and #bytes,
+	  which are aliases to #each_line and #each_byte, respectively.
+
+	* ext/win32ole/win32ole.c (fole_each): WIN32OLE#each: Return an
+	  enumerator if no block is given.
+
+	* ext/zlib/zlib.c (rb_gzreader_each_byte, rb_gzreader_each):
+	  Zlib::GzipReader#{each,each_line,each_byte}: Return an
+	  enumerator if no block is given.
+
+	* ext/zlib/zlib.c (Init_zlib): Add Zlib::GzipReader#lines and
+	  #bytes, which are aliases to #each_line and #each_byte,
+	  respectively.
+
+Mon Apr 21 17:01:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_compile_with_option): check if src is a string.
+	  [ruby-core:16453]
+
+Mon Apr 21 16:06:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_init): preserve the method name in ID.
+
+	* enumerator.c (enumerator_each): need not to call rb_to_id().
+
+	* enumerator.c (enumerator_with_index): ditto.
+
+Mon Apr 21 11:00:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (defined_expr): capture exception during defined?
+	  evaluation.  a patch from wanabe <s.wanabe at gmail.com> in
+	  [ruby-dev:34461].  [ruby-core:16010]
+
+Mon Apr 21 10:06:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c: should include <errno.h> to refer to errno.
+
+Mon Apr 21 09:58:04 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* time.c (rb_strftime): check errno to detect strftime(3)'s error.
 	  this is workaround for recent version of MSVCRT.
 	  [ruby-dev:34456]
 
-Sun Jun 15 22:12:07 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Apr 21 08:54:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
-	  merged from 1.9.
+	* gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
 
-	* lib/yaml.rb (quick_emit): use combination of object_id and hash to
-	  identify repeated object references, since GC will reuse memory of
-	  objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698];
-	  merged from 1.9.
+Sun Apr 20 21:00:21 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Jun 15 22:09:02 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* enumerator.c, include/ruby/ruby.h: Export rb_cEnumerator.
 
-	* ext/syck/rubyext.c: Node#value defined twice.
+Sun Apr 20 20:47:50 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/yaml/: several method redefinitions causing warnings.
+	* enumerator.c: Resolve the method every time an enumeration
+	  method is run, not once when the enumerator is initialized as it
+	  was before, so that method_missing() and method (re)definition
+	  afterwards are both in effect; pointed out in: [ruby-core:16441]
+
+Sun Apr 20 15:11:00 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_rbuf_to_dst): removed.
+	  (copy_stream_fallback_body): don't bypass write method.
+	  (copy_stream_body): simplified.
+
+Sun Apr 20 15:01:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (struct iseq_compile_data): moved label_no from
+	  new_label_body().
+
+	* compile.c (iseq_set_exception_table): allocates catch_table only
+	  when entries exist.
+
+	* compile.c (struct iseq_link_element, struct iseq_insn_data): made
+	  enum for debuggers.
+
+Sun Apr 20 14:44:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): fix for splat in when and rescue.
+	  a patch from wanabe <s.wanabe AT gmail.com> in [ruby-dev:34429].
+	  [ruby-core:14537]
+
+Sun Apr 20 13:55:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_fallback): write directly (bypassing write method)
+	  if possible.
+
+Sun Apr 20 12:49:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_fallback): read directly (bypassing readpartial
+	  method) if possible.
+
+Sun Apr 20 04:45:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_body): use readpartial and write method for
+	  non-IOs such as StringIO and ARGF.
+
+Fri Apr 18 20:57:33 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_array.rb: add tests to achieve over 95% test coverage
+	  of array.c.
+
+Fri Apr 18 17:37:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_mark_locations): get rid of underflow.
+
+	* gc.c (mark_current_machine_context): check if the main thread stack
+	  position may shrink under the initialized position.  [ruby-core:16436]
+
+Thu Apr 17 22:20:52 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enc/trans/utf_16_32.c (fun_so_to_utf_16be, fun_so_to_utf_16le): add
+	  parentheses to remove warnings of gcc.
+
+	* io.c (rb_io_getc): remove unused variables.
+
+	* compile.c (NODE_NEXT, NODE_REDO): remove unused labels.
+
+	* ext/nkf/nkf.c (rb_nkf_convert): remove unused variables.
+
+	* ext/syck/rubyext.c (syck_resolver_initialize,
+	  syck_resolver_detect_implicit, syck_emitter_emit): remove unused
+	  variables.
+
+Thu Apr 17 20:12:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rubyoptions.rb (test_search): enable some assertions.
+
+	* test/ruby/test_rubyoptions.rb: flunk message in win32.
+
+Thu Apr 17 16:07:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (ruby): run in C locale.
+
+	* test/ruby/test_rubyoptions.rb (test_encoding): --encoding does not
+	  affect source code.
+
+Thu Apr 17 00:45:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_process.rb (test_rlimit_nofile): reset RLIMIT_NOFILE
+	  before exit (for gcov).
+
+	* test/ruby/test_rubyoptions.rb: new tests for option of ruby
+	  interpreter, to achieve over 95% test coverage of ruby.c.
+
+Wed Apr 16 02:40:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): preludes and parser need to run in safe
+	  level 0.  [ruby-dev:34407]
+
+Wed Apr 16 02:26:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): dln_find_file returns the pointer to a
+	  static buffer, so should copy it.  [ruby-dev:34409]
+
+Tue Apr 15 23:08:46 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/xmlrpc/client.rb: fix cookie handling. [ruby-dev:34403]
+
+	* test/xmlrpc/test_cookie.rb: add a test for the above fix.
+
+Tue Apr 15 19:20:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c: #undef rb_argv moved before #define.
+
+Tue Apr 15 18:02:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_argv): replaced with rb_get_argv().
+	  [ruby-Bugs-19514]
+
+Tue Apr 15 17:10:59 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/net/http.rb, lib/net/smtp.rb, lib/net/pop.rb: update
+	  URLs of Japanese documents.
+
+Tue Apr 15 16:45:14 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): add tests.
+
+Tue Apr 15 15:38:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-encoding-map): added shift-jis for older
+	  versions.
+
+	* misc/ruby-mode.el (ruby-mode-set-encoding):
+	  coding-system-to-mime-charset is not a standard function.
+	  [carbon-emacs:795]
+	  fix for the case that magic comment exists but coding system is
+	  absent.
+
+	* misc/ruby-mode.el (ruby-mode): use write-contents-functions or
+	  write-contents-hooks for older versions.
+
+Tue Apr 15 07:21:21 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_div): [ruby-dev:34357]
+
+	* complex.c (nucomp_abs): use hypot.
+
+	* complex.c (nucomp_quo): do not force conversion.
+
+	* test/ruby/test_complex.rb: omitted some meaningless tests.
+
+Mon Apr 14 23:25:50 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_objectspace.rb: add a test for
+	  ObjectSpace.count_objects.
+
+Mon Apr 14 22:44:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
+	  half-baked result string.
+
+	* re.c (rb_reg_search): make search reentrant.  [ruby-dev:34223]
+
+	* test/ruby/test_parse.rb (TestParse::test_global_variable):
+	  should preserve $& variable.
+
+Mon Apr 14 17:23:27 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
+	  env_reject_bang): Return an enumerator if no block is given.
+
+Mon Apr 14 14:33:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c, compile.h (compile_debug): made runtime option.
+
+	* debug.c (ruby_debug_print_indent): returns if debug_level exceeds
+	  the threshold.
+
+	* debug.c (ruby_debug_printf): printf to stderr.
+
+	* iseq.c (make_compile_option, make_compile_option_value): added
+	  debug_level option.
+
+	* vm_core.h (rb_compile_option_t): added debug_level.
+
+	* vm_core.h (struct iseq_compile_data): added node_level.
+
+Mon Apr 14 12:52:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (Init_stack): use ruby_init_stack.  [ruby-dev:34350]
+
+	* gc.c (rb_objspace_t): packed globals.  [ruby-dev:34348]
+
+	* gc.c (finalizers): removed.  [ruby-dev:34349]
+
+Mon Apr 14 11:30:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (ary_new): new integer overflow check condition.
+	  suggested by TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
+	  [ruby-dev:34156].
+
+	* array.c (rb_ary_initialize): ditto.
+
+Mon Apr 14 00:51:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_parse.rb: add tests to achieve over 95% test coverage
+	  of parse.y.
+
+Sun Apr 13 23:53:58 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enum.c (enum_cycle): Make Enumerable#cycle do a finite loop when
+	  the number of cycles is specified.
+
+	* array.c (rb_ary_cycle): Ditto for Array#cycle.
+
+Sun Apr 13 18:52:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (lock_func): should not check interrupts in
+	  blocking region.  [ruby-dev:34378]
+
+Sat Apr 12 12:41:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_exec_node, ruby_run_node), ruby.c (process_options):
+	  use iseq instead of NODE.
+
+	* gc.c (source_filenames): removed.
+
+	* include/ruby/intern.h, parse.y (yycompile, parser_mark, parser_free,
+	  ripper_initialize): rb_source_filename() is no longer used.
+
+	* compile.c, compile.h (ERROR_ARGS), parse.y (node_newnode, fixpos,
+	  parser_warn, e_option_supplied, warn_unless_e_option, range_op,
+	  cond0): nd_file is no longer used.
+
+Sat Apr 12 12:17:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* prelude.rb (require_relative): move require_relative from
+	  lib/require_relative.rb.  [ruby-core:16356]
+
+	* lib/require_relative.rb: removed.
+
+Sat Apr 12 05:55:57 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*, test/rubygems*:  Update to RubyGems 1.1.1 r1701.
+
+Sat Apr 12 03:13:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): set external encoding.
+
+	* file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
+	  copy encoding.
+
+Fri Apr 11 17:35:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (count_i): modified to shut warning up.
+
+Fri Apr 11 17:25:09 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enum.c (count_i, count_iter_i, enum_count, enum_find_index):
+	  Reduce code.
+
+Fri Apr 11 17:06:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (find_index_i): modified to shut warning up.
+
+	* enum.c (find_index_iter_i): ditto.
+
+Fri Apr 11 16:44:43 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Jun 15 22:04:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* enum.c (enum_find_index): Add support for find_index(obj);
+	  [ruby-dev:34313].
+
+	* array.c (rb_ary_index): Define find_index as an alias to index.
+
+Fri Apr 11 16:42:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/yaml/store.rb (YAML::load): modified to support empty
+	  database.
+
+Fri Apr 11 08:05:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
 	  patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
-	  in [ruby-dev:34311].
+	  in [ruby-dev:34312].
+
+Thu Apr 10 23:08:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/pstore.rb (PStore::dump, PStore::load): allow subclass
+	  overriding.  [ruby-dev:34305]
+
+	* lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
+	  add a method to support faster PStore.
+
+Thu Apr 10 20:36:45 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/rdebug.el, misc/README: Remove rdebug.el as per request
+	  from the maintainer and mention the ruby-debug project at
+	  RubyForge in README; bug#19043.
+
+Thu Apr 10 19:41:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c (rb_f_loop): Mention StopIteration in the document.
+
+Thu Apr 10 19:23:55 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_pop_m, rb_ary_shift_m): Update documents for
+	  #pop() and #shift().
+
+	* array.c (rb_ary_slice_bang): Update document.  Assigning
+	  array[*args]= nil no longer removes elements.
+
+Thu Apr 10 16:58:44 2008  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (w_object): TYPE_USERDEF assigns id for ivars first.
+	  [ruby-dev:34159] by nagachika.
+
+Thu Apr 10 15:03:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/generator.rb: removed obsolete library.  [ruby-core:16233]
+
+	* test/test_generator.rb: removed as well.  [ruby-dev:34306]
+
+	* lib/pstore.rb: replaced by Hongli Lai's faster version.
+
+Thu Apr 10 10:27:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (native_sleep): sleep_cond is initialized at
+	  creation.  [ruby-Patches-19361].
+
+Wed Apr  9 14:43:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (lock_func): optimized and checks for interrupt_flag.
+	  based on a patch from Sylvain Joyeux in [ruby-Patches-19361] and
+	  [ruby-Patches-19362].
+
+Wed Apr  9 12:12:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_thread.rb: new tests from Sylvain Joyeux in
+	  [ruby-Patches-19361].
+
+Tue Apr  8 21:36:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_mutex_sleep): ensures to re-acquire at waking up.
+	  [ruby-Patches-19361]
 
-Sun Jun 15 21:59:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr  8 11:00:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/complex.rb: remove Math first before overwriting by CMath.
+
+Tue Apr  8 10:34:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* load.c (rb_require_safe): should check fname path after $SAFE is
+	  properly set.  [ruby-dev:34268]
 
 	* re.c (rb_reg_quote): should always copy the quoting string.
 	  [ruby-core:16235]
 
-Sun Jun 15 21:27:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr  8 10:30:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (prelude.c): depends on enc/prelude.rb.
+
+	* enc/prelude.rb: fixed initial library names.
+
+Tue Apr  8 03:39:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_provided): check expanded path for relative path
+	  features, loading or loaded features are already expanded in 1.9.
+
+	* variable.c (rb_autoload_load): no needs to check if provided before
+	  rb_require_safe.  [ruby-dev:34266]
+
+Mon Apr  7 22:41:21 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: cancelled recent changes (except to remove rdiv).
+
+	* bignum.c: ditto.
+
+	* bignum.c: added rb_big_idiv.
+
+Mon Apr  7 15:51:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_init_db): moved to enc/encdb.c.
+
+	* transcode.c (init_transcoder_table): moved to enc/trans/transdb.c.
+
+	* enc/depend (enc/encdb.o enc/trans/transdb.o): depend on
+	  corresponding headers.
+
+	* common.mk (COMMONOBJS): moved transcode.o from OBJS
+
+Mon Apr  7 12:26:32 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: add a known-bug.
+
+Mon Apr  7 12:15:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_each_func): should not leave a variable
+	  uninitialized, which could cause SEGV.
+
+	* range.c (range_step): removed duplicated and unreachable code.
+
+Mon Apr  7 02:12:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_intern): need not to check if tainted.
+	  [ruby-dev:34219]
+
+Sun Apr  6 09:45:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_tell): check if closed.  [ruby-core:16223]
+
+Sat Apr  5 23:17:20 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb: new.
+
+	* lib/complex.rb: depends lib/cmath.rb.
+
+	* lib/rational.rb: added rdiv.
+
+	* complex.c: removed some math functions.
+
+Sat Apr  5 05:50:57 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_rb.rb: Fix uninitialized variable warnings.
+
+	* lib/rdoc/generator/html.rb: ditto.
+
+	* lib/rdoc/options.rb: Fix shadowed variable warning.
+
+	* lib/webrick/httprequest.rb: Fix redefined method warning.
+
+Sat Apr  5 02:13:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_cmpint): moved from compar.c, to check bignum
+	  zero.
+
+Fri Apr  4 23:24:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_memsearch_qs): wrong boundary condition.
+
+	* re.c (rb_memsearch_qs_utf8): ditto.
+
+Fri Apr  4 14:11:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_memsearch_qs): wrong boundary condition.  a patch from
+	  wanabe <s.wanabe AT gmail.com> in [ruby-dev:34248].
+
+Fri Apr  4 05:57:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
 	  @n_bytes as well.  [ruby-core:16144]
 
-Sun Jun 15 21:08:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr  4 01:59:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): add step for each iteration if begin and
+	  end are numeric.  [ruby-core:15990]
+
+Fri Apr  4 00:42:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (Init_Bignum): rdiv method removed.  [ruby-dev:34242]
+
+	* complex.c (nucomp_quo): ditto.
+
+	* numeric.c (num_rdiv): ditto.
+
+	* rational.c (nurat_div): ditto.
+
+	* complex.c (nucomp_fdiv): fdiv implementation restored.
+
+	* numeric.c (num_quo): RDoc updated.
+
+Thu Apr  3 21:51:45 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_int_check): function for DRY real check.
+
+	* complex.c (nucomp_{add,sub,mul,div,expt}): use rb_num_coerce_bin().
+
+Thu Apr  3 19:59:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass): check if cbase is a class or a module.
+	  [ruby-core:16118]
+
+Thu Apr  3 14:42:11 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (INSNS): add insns_info.inc.
+
+	* common.mk (INSNS): make incs separately for nmake.
+
+Thu Apr  3 13:20:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (endb.h, transdb.h, prelude.c): depend on $(PREP) and
+	  check if really changed.  [ruby-core:16102]
+
+	* Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
+	  (MINIOBJS, ARCHMINIOBJS): separated.
+
+Thu Apr  3 09:00:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_sequence, iseq_insns_unification,
+	  insn_data_to_s_detail): constified.
+
+	* iseq.c (insn_operand_intern, ruby_iseq_disasm_insn): ditto.
+
+	* template/{insns_info,opt_sc,optunifs}.inc.tmpl: ditto.
+
+	* tool/instruction.rb (OptUnifsIncGenerator): ditto.
+
+Thu Apr  3 08:46:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_include): add RDoc to describe that comparison
+	  for numeric is done according magnitude of values.
+	  [ruby-core:15907]
+
+Wed Apr  2 22:29:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* rational.c (nurat_int_check): function for DRY integer check.
+
+	* numeric.c (num_rdiv): should always return rational number.
+
+	* rational.c (nurat_add, nurat_sub, nurat_mul, nurat_fdiv,
+	  nurat_cmp): use rb_num_coerce_bin().
+
+	* rational.c (nurat_division): does / and rdiv.
+
+	* .gdbinit (rp): no longer use rb_p().
+
+Wed Apr  2 06:52:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* .gdbinit (rp): supports rational and complex numbers.  it's
+	  cheating since it uses rb_p().
+
+Wed Apr  2 06:24:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/node.h: add new constants for rb_call()'s scope.
+
+	* eval.c (iterate_method): use CALL_* scope constant to specify
+	  proper scope value.
+
+	* eval.c (rb_each, rb_apply, rb_funcall, rb_funcall2, rb_funcall3):
+	  ditto.
+
+Tue Apr  1 21:19:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* rational.c: need to include <float.h> just once.
+
+Tue Apr  1 16:40:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (big2dbl): more precise conversion at edge cases.
+	  [ruby-dev:34195]
+
+Tue Apr  1 14:43:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: get rid of empty expansion.
+
+	* configure.in: _setjmp is available but _longjmp is not on mingw.
+
+Tue Apr  1 09:41:22 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
+
+Tue Apr  1 07:31:58 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems* test/rubygems*: Import RubyGems 1.1.0.
+
+Tue Apr  1 03:20:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_SETJMP, RUBY_LONGJMP, RUBY_JMP_BUF): prefers
+	  _setjmp over setjmp and sigsetjmp.  [ruby-core:16023]
+	  __builtin_setjmp cannot handle a variable.
+
+	* configure.in (--with-setjmp-type): new option to override the
+	  default rule in the above.
+
+	* eval_intern.h (ruby_setjmp, ruby_longjmp), gc.c (rb_setjmp),
+	  vm_core.h (rb_jmpbuf_t): use RUBY_SETJMP, RUBY_LONGJMP and
+	  RUBY_JMP_BUF.
+
+Tue Apr  1 01:55:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
 	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]
 
-Sun Jun 15 20:54:07 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Apr  1 01:40:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: adopted the ruby's style.
+
+	* rational.c: ditto.
+
+Tue Apr  1 00:17:35 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: revert.
+
+Mon Mar 31 18:57:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc,win}32/Makefile.sub (config.h): define ssize_t.
+
+	* io.c (copy_stream_body): some platform don't have O_NOCTTY.
+
+Mon Mar 31 18:42:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check for ssize_t.  [ruby-dev:34184]
+
+Mon Mar 31 14:45:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_quo): should convert its operand to Rational.
+
+	* rational.c (string_to_r_strict): should raise TypeError.
+
+	* bignum.c (Init_Bignum): should not redefine Bignum#div.
+	  Numeric#div will do.  [ruby-dev:34066]
+
+Mon Mar 31 04:05:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_getc): set coderange while getting characters.
+
+Sun Mar 30 23:16:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (proc_dup): should copy is_lambda attribute as well.
+	  [ruby-talk:296244]
+
+Sun Mar 30 15:33:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: IO.copy_stream implemented.  [ruby-dev:33843]
+
+	* thread.c (rb_fd_select): new function.
+
+	* configure.in (sys/sendfile.h): check the header file.
+	  (sendfile): check the function.
+	  (pread): check the function.
+
+Sat Mar 29 14:18:41 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
+
+	* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets'
+	  instate/state/identify method to avoid the conflict with standard
+	  widget options. Those methods are renamed to ttk_instate/ttk_state/
+	  ttk_identify (tile_instate/tile_state/tile_identify are available
+	  too). Although I don't recommend, if you really need old methods,
+	  please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before
+	  "require 'tkextlib/tile'".
+
+	* ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
+	  is obsolete. It outputs warning. To control default widget set,
+	  use "Tk.default_widget_set = :Ttk".
+
+	* ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and
+	  __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defined
+	  as module methods of TkConfigMethod. It may help users to wrap old
+	  Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets.
+	  Ttk widgets don't have some options of standard widgets which are
+	  control the view of widgets. When set ignore-mode true, configure
+	  method tries to ignore such unknown options with no exception.
+	  Of course, it may raise other troubles on the GUI design.
+	  So, those are a little danger methods.
+
+	* ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__
+	  method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method
+	  are defined as module methods of TkItemConfigMethod as the same
+	  purpose as TkConfigMethod's ones.
+
+	* ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for
+	  wrapping old Ruby/Tk scripts (which use standard widgets) to use
+	  Ttk (Tile) widgets as default.
+
+	* ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state
+	  method instead of instate/state method.
+
+	* ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb,
+	  ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's
+	  are replaced to "instance_exec(self)".
+
+	* ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not
+	  a character code on Ruby1.9).
+
+	* ext/tk/lib/tk/variable.rb: support new style of operation argument
+	  on Tcl/Tk's 'trace' command for variables.
+
+	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix
+
+	* ext/tk/sample/demos-jp/textpeer.rb,
+	  ext/tk/sample/demos-en/textpeer.rb: new widget demo.
+
+	* ext/tk/tcltklib.c: decrease SEGV troubles (probably)
+
+	* ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9
 
-	* parse.y (yycompile): Always prepare a new array for each file's
-	  SCRIPT_LINES__ storage, instead of appending source lines every
-	  time a file is re-loaded; submitted by Rocky Bernstein in
+	* ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)
+
+	* ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command
+	  to make Tcl/Tk theme sources (based on different version of Tile
+	  extension) available.
+	  (Tk::Tile::__define_LoadImages_proc_for_compatibility__)
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
+	  (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets
+	  as toplevel widgets.
+
+	* ext/tk/lib/tkextlib/tile/style.rb: ditto.
+	  (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)
+
+	* ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get
+	  properties as a hash. metrics_hash method returns a boolean value
+	  for 'fixed' option. But metrics method returns numeric value
+	  (0 or 1) for 'fixed' option, because of backward compatibility.
+
+	* ext/tk/lib/tk/timer.rb: sometimes fail to set callback procedure.
+
+	* ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep
+	  doesn't block the eventloop. It will be better to use the method
+	  in event callbacks.
+
+	* ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.
+
+Thu Mar 27 20:44:22 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (f_lcm): removed.
+
+	* rational.c (rb_lcm, rb_gcdlcm): added.
+
+	* lib/complex.rb (gcd, lcm, gcdlcm): removed.
+
+	* lib/rational.rb (gcd, lcm, gcdlcm): ditto.
+
+Wed Mar 26 18:11:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_constants): rdoc updated.  a patch from
+	  Florian Gilcher <flo AT andersground.net> in [ruby-core:16009].
+
+Wed Mar 26 00:55:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rand.rb: add tests to achieve over 95% test coverage
+	  of random.c.
+
+Wed Mar 26 00:28:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rational.rb: add tests to achieve over 90% test
+	  coverage of rational.c.
+
+	* test/ruby/test_complex.rb: ditto for complex.c.
+
+Tue Mar 25 19:34:05 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bootstraptest/test_knownbug.rb: add tests.  [ruby-dev:34128]
+
+Tue Mar 25 19:09:04 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (ary_new): fix size check.  [ruby-dev:34123]
+
+	* array.c (rb_ary_take, rb_ary_drop): check negative size and use
+	  NUM2LONG instead of FIX2LONG.  [ruby-dev:34123]
+
+	* enum.c (enum_take, enum_drop): check negative size.
+
+	* test/ruby/test_array.rb: add tests for above.
+
+Tue Mar 25 16:32:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): checks if the word is empty.
+
+	* ruby.c (process_options): typo fixed.  [ruby-dev:34122]
+
+Tue Mar 25 15:26:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (defined_expr): false short-circuit destination label may
+	  be needed.  [ruby-talk:295296]
+
+	* compile.c (iseq_compile_each): put nil if false short-circuit is
+	  created.
+
+	* compile.c (compile_massign_opt): no need to use alloca.
+
+Mon Mar 24 19:23:52 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* parse.y (debug_lines): Always prepare a new array for each
+	  file's SCRIPT_LINES__ storage, instead of appending source lines
+	  every time a file is re-loaded; submitted by Rocky Bernstein in
 	  #18517.
 
-Sun Jun 15 20:30:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 24 10:25:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: sitearch should use target_cpu.  [ruby-core:15986]
+
+Sun Mar 23 02:51:57 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rlimit_resource_value): use NUM2RLIM.
+
+Sun Mar 23 02:28:01 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: fixed. [ruby-dev:34109]
+
+	* rational.c: ditto.
+
+Fri Mar 21 21:32:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_f_gets, rb_f_readline, rb_f_readlines): delegates to ARGF
+	  as well as puts and putc.  [ruby-dev:34100]
+
+Fri Mar 21 21:26:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
 	  [ruby-dev:29945], [ruby-dev:34095]
@@ -80,95 +38867,1759 @@ Sun Jun 15 20:30:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.
 
-Sun Jun 15 20:27:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 21 21:10:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb: Say that I am the current maintainer.
+
+	* lib/set.rb: Ditto.
+
+	* lib/shellwords.rb: Ditto.
+
+	* ext/syslog/syslog.txt: Ditto.
+
+Fri Mar 21 09:24:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (open_for_install): write block result and rewrite only
+	  if changed from existing file.
+
+Fri Mar 21 08:29:33 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_to_f): rearrangement.
+
+Fri Mar 21 06:44:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* rational.c (nurat_to_f): C99.
+
+Fri Mar 21 01:40:27 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* complex.c (nucomp_sub, nucomp_expt): call corresponding functions.
+
+Fri Mar 21 01:21:43 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* missing/tgamma.c: include config.h before math.h.  [ruby-dev:34075]
+
+Thu Mar 20 21:46:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_getline): use receiver.
+
+Thu Mar 20 21:20:19 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: some improvements (include Shin-ichiro HARA's
+	  effort).
+
+	* complex.c: some improvements.
+
+	* test/ruby/test_rational2.rb: new.
+
+Thu Mar 20 00:21:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_initialize_copy): get rid of segfault.
+
+	* io.c (argf_tell, argf_seek_m, argf_set_pos, argf_rewind,
+	  argf_fileno, argf_to_io, argf_eofl, argf_getc, argf_getbyte,
+	  argf_readchar, argf_readbyte, argf_each_line): use receiver.
+
+Wed Mar 19 23:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_putc, rb_io_puts): output directly if the receiver is
+	  rb_stdout to get rid of infinite recursion.  [ruby-dev:34059]
+
+Wed Mar 19 22:27:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c: added rb_gcd.
+
+	* complex.c: use rb_gcd.
+
+Wed Mar 19 18:37:00 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: revert.
+
+	* rational.c: revert.
+
+Wed Mar 19 17:31:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_intern.h (TH_EXEC_TAG): need not to FLUSH_REGISTER_WINDOWS.
+	  [ruby-core:15871], [ruby-dev:34088]
+
+Wed Mar 19 14:53:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (nucomp_to_s, nucomp_inspect): get rid of making
+	  unnecessary intermediate objects.
+
+	* complex.c (make_patterns, string_to_c): do not treat successive
+	  underscores as a part of numeric like as literals.  [ruby-dev:34085]
+
+	* rational.c (make_patterns, string_to_r): ditto.
+
+Wed Mar 19 14:36:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_cstr_to_inum): treat successive underscores as
+	  nondigit.  [ruby-dev:34089]
+
+Wed Mar 19 14:08:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_check_encoding): should not load autoloaded encoding
+	  directly, instead use rb_enc_find_index() which deal with alias and
+	  replica.  [ruby-core:15957]
+
+Wed Mar 19 11:49:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* regint.h (include): include ruby.h instead of defines.h and config.h.
+
+Wed Mar 19 10:17:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regint.h (CHECK_INTERRUPT_IN_MATCH_AT): add interrupt check
+	  during match.  [ruby-talk:295002]
+
+Tue Mar 18 16:24:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (literal_concat_gen): bail out at different encoding.
+
+Tue Mar 18 04:00:27 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_memsearch_ss): simple shift search.
+
+	* re.c (rb_memsearch_qs): quick search.
+
+	* re.c (rb_memsearch_qs_utf8): quick search for UTF-8 string.
+
+	* re.c (rb_memsearch_qs_utf8_hash): hash functions for above.
+
+	* re.c (rb_memsearch): use above functions.
+
+	* string.c (rb_str_index): give enc to rb_memsearch.
+
+	* include/ruby/intern.h (rb_memsearch): move to encoding.h.
+
+	* include/ruby/encoding.h (rb_memsearch): move from intern.h.
+
+	* common.mk (PREP): add dependency.
+
+Mon Mar 17 22:23:54 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_take, rb_ary_take_while, rb_ary_drop,
+	  rb_ary_drop_while): new methods. [ruby-dev:34067]
+
+	* test/ruby/test_array.rb: add tests for above.
+
+Mon Mar 17 17:11:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead
 	  of calling `run-hooks' directly to run the mode hook.  patch from
 	  Chiyuan Zhang <pluskid AT gmail.com> in [ruby-core:15915]
 
-Sun Jun 15 20:20:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 17 16:41:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: unset GREP_OPTIONS.  [ruby-core:15918]
+
+Sun Mar 16 18:07:07 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/utf_16_32.c: bug fix (some invalid UTF-8 sequences
+	  were legal)
+
+	* test/ruby/test_transcode.rb: test for above bug
+
+Sun Mar 16 17:28:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (LIBRUBY_SO): add dependency to $(BUILTIN_ENCOBJS).
+
+Sun Mar 16 08:51:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* include/ruby/intern.h: added some declarations.
+
+	* include/ruby/ruby.h: ditto.
+
+	* common.mk: added some entries.
+
+	* configure.in: added a check for signbit.
+
+	* lib/complex.rb: nearly all of core definitions have been removed.
+
+	* lib/rational.rb: ditto.
+
+	* lib/mathn.rb: some trivial adjustments.
+
+	* complex.c: new.
+
+	* rational.c: ditto.
+
+	* numeric.c (flo_{quo,rdiv}, fix_fdiv): added.
+
+	* numeric.c ({num,int}_{numerator,denominator}): ditto.
+
+	* bignum.c (rb_big_fdiv): ditto.
+
+	* numeric.c (fix_{quo,pow}): now may yield rational number.
+
+	* bignum.c (rb_big_{quo,pow}): ditto.
+
+	* numeric.c (rb_{int,flo}_induced_from): now can accept rational.
+
+	* gc.c (gc_mark_children, obj_free): now detects complex and rational.
+
+	* inits.c (rb_call_inits): now calls Init_{Complex,Rational}.
+
+	* test/ruby/test_complex.rb: new.
+
+	* test/ruby/test_rational.rb: ditto.
+
+Sat Mar 15 17:48:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_associate_index): pass unnecessary enc_capable().
+
+	* string.c (rb_str_cmp): reduce invocation of rb_enc_compatible().
+
+Fri Mar 14 17:04:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (inttypes.h): includes always if available.
+
+	* string.c, ext/digest/defs.h: moved inttypes.h to ruby.h.
+
+Fri Mar 14 16:59:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_LIB_PREFIX): fix for prefix.
+
+Fri Mar 14 16:35:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie::initialize): performance patch from
+	  Makoto Kuwata <kwa@kuwata-lab.com> in [ruby-dev:34048].
+
+Fri Mar 14 15:49:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_LIB_PREFIX): use libdir.
+
+Fri Mar 14 14:24:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/defs.h: inttypes.h is still needed.
+
+Fri Mar 14 11:34:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc,win}32/Makefile.sub: follow below changes.
+
+Fri Mar 14 11:24:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-encoding-map, ruby-use-encoding-map): added
+	  to customize.
+
+Fri Mar 14 10:37:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (int8_t, uint8_t,  int16_t,  uint16_t int32_t,
+	  uint32_t int64_t, uint64_t, int128_t, uint128_t,
+	  intptr_t, uintptr_t): check if defined.
+
+	* win32/Makefile.sub: follow configure.in.
+
+	* ext/digest/defs.h: remove checks for uint8_t, uint32_t and uint64_t.
+
+Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
+	  directives.
+
+Fri Mar 14 10:03:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (UNALIGNED_WORD_ACCESS): IA64 cannot access unaligned word.
+
+Thu Mar 13 21:00:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_slice_bang): should not use rb_ary_subseq()
+	  which shares internal pointer.  splice modifies the receiver
+	  right after subseq.  [ruby-dev:34005]
+
+	* bootstraptest/test_struct.rb: some test moved from test to shut
+	  warning up.
+
+Thu Mar 13 19:42:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc,win}32/Makefile.sub (config.h): define uint32_t.
+
+Thu Mar 13 14:14:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* trunk/configure.in (AC_CHECK_HEADERS): stdint.h is not needed to
+	  check.
+
+	* trunk/configure.in (rb_cv_type_uint32_t): unquoted.  [ruby-dev:34030]
+
+	* trunk/string.c (hash): use inttypes.h instead of stdint.h.
+
+Thu Mar 13 10:42:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_divmod): should return integer division.  [ruby-dev:34006]
+
+	* enum.c (zip_ary): wrong boundary condition.
+
+	* test/ruby/test_numeric.rb (TestNumeric::test_num2long): bit-and
+	  should not raise RangeError.
+
+Thu Mar 13 03:12:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/cmd/help.rb: should be updated for new ri structure.
+	  [ruby-core:15825]
+
+	* lib/rdoc/ri/driver.rb (RDoc::initialize): allow options to be optional.
+
+	* lib/rdoc/ri/driver.rb (RDoc::class_cache): map_dirs may be
+	  empty.
+
+	* lib/rdoc/ri/driver.rb (RDoc::get_info_for): revive get_info_for
+	  method.  maybe broken.
+
+	* lib/rdoc/ri/util.rb (RDoc::initialize): should not use RiError
+	  no more.
+
+Thu Mar 13 01:45:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (stdint.h): check if presence.
+
+	* configure.in (uint32_t): check if defined.
+
+	* string.c (hash): fix for portability.  [ruby-dev:34020]
+
+Wed Mar 12 17:33:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): fix for a mere underscore.
+
+Wed Mar 12 14:47:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (rb_thread_raised_set): use generic flags.
+
+	* eval.c (rb_longjmp): clear all raised flags.
+
+	* eval.c (stack_check): leave clearing flag to rb_longjmp.
+
+	* gc.c (rb_memerror): use thread raised flag instead of static flag.
+
+Tue Mar 11 23:38:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_combination): argument check before creating
+	  Enumerator.
+
+	* array.c (rb_ary_permutation): ditto.
+
+	* enum.c (enum_zip): optimize if all arguments are arrays.
+
+Tue Mar 11 19:48:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (fix_coerce): try conversion before type check.
 	  [ruby-core:15838]
 
-Sun Jun 15 19:56:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 11 12:39:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bignum.c (BIGZEROP): fix for longer Bignum zeros.  [ruby-Bugs-17454]
+	* common.mk (clean-local): WINMAINOBJ is Windows specific.
+
+Tue Mar 11 10:19:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (hash): replaced by MurmurHash described in
+	  <http://murmurhash.googlepages.com/>.
+
+Tue Mar 11 09:52:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_comparable): empty strings in any encoding are
+	  compatible each other.
+
+Tue Mar 11 00:46:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (usage): remove some unimportant lines to fit -h message
+	  in a page.  [ruby-dev:34018]
+
+Mon Mar 10 17:11:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_local_variables): local_variables should return an
+	  array of symbols.  [ruby-dev:34008]
+
+	* vm.c (collect_local_variables_in_env): ditto.
+
+Mon Mar 10 15:53:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* version.c (MKSTR): make US-ASCII.  [ruby-dev:34010]
+
+Mon Mar 10 02:08:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_index): if t == s + pos, the character beginning
+	  from s + pos is valid.
+
+Sun Mar  9 13:51:21 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/generator.rb: Restore missing line to #params.  Patch by
+	  Lincoln Stoll <lstoll at lstoll.net>
+
+Sun Mar  9 09:52:00 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/code_objects.rb: Remove debugging Kernel#p.  Patch by
+	  Lincoln Stoll <lstoll at lstoll.net>
+	* lib/rdoc/generator/html.rb: Fully qualify AllReferences.  Patch by
+	  Lincoln Stoll <lstoll at lstoll.net>
+	* lib/rdoc/ri/writer.rb: Fix 1.8 backwards compatibility.
+
+Sat Mar  8 18:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (isdirsep): backslash is valid path separator on cygwin too.
+
+Sat Mar  8 06:53:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (search_nonascii): Use VALUE instead of unsigned long
+	  because VALUE can be the fastest unsigned integer type.
+	  On LLP64 unsigned long isn't the fastest.
+	* string.c (str_strlen): ditto.
+	* string.c (str_utf8_nth): ditto.
+	* string.c (count_utf8_lead_bytes_with_ulong): ditto.
+
+	* string.c (count_utf8_lead_bytes_with_word): renamed.
+
+Fri Mar  7 21:27:43 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c: fix indent.
+
+Fri Mar  7 21:12:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (power_cache_init, power_cache_get_power0, Init_Bignum):
+	  delayed initializing power cache per base.  [ruby-dev:34003]
+
+Fri Mar  7 20:30:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_restore_0): fixed typo.  [ruby-core:15821]
+
+Fri Mar  7 19:56:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: rdoc added.  [ruby-Patches-9762]
+
+Thu Mar  6 17:26:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): space flag is in effect for Inf/NaN too.
+	  [ruby-dev:34002]
+
+Thu Mar  6 15:44:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): casting double to long is undefined
+	  if the integer part of double is out of the range of long.
+
+Thu Mar  6 15:11:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): ignore 0 flag for NaN and Inf.
+	  [ruby-dev:33994]
+
+Thu Mar  6 15:05:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32}/Makefile.sub (RUNRUBY): use $(PROGRAM) instead of
+	  ruby$(EXEEXT).
+	  suggested by KIMURA Koichi <kimura.koichi at canon.co.jp>.
+	  [ruby-dev:34000]
+
+Thu Mar  6 14:46:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* missing/lgamma_r.c (loggamma): return 0 for 1 and 2.
+
+	* test/ruby/test_math.rb: accept errors by functions under missing/.
+
+Thu Mar  6 14:29:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (rb_str_transcode_bang): set coderange.
+
+	* transcode.c (rb_str_transcode): use rb_str_transcode_bang.
+
+Thu Mar  6 14:00:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/missing.h (cbrt): add declaration.
+
+Thu Mar  6 11:14:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-add-log-current-method): use ruby style
+	  method name format.
+
+Thu Mar  6 11:12:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): no need of loop.
+
+Thu Mar  6 08:30:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_freeze): call rb_class_name() directly.
+	  [ruby-core:15802]
+
+Thu Mar  6 04:32:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (count_utf8_lead_bytes_with_ulong): fix shift size.
+	  [ruby-dev:33993]
+
+	* string.c (str_utf8_nth) fix wrong counting.
+
+Thu Mar  6 00:34:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): size_t returned from strlen() can be
+	  unsigned.
+
+Thu Mar  6 00:31:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (make_struct): preserve encoding of struct name.
+
+Wed Mar  5 22:49:20 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (is_utf8_lead_byte, count_utf8_lead_bytes_with_ulong):
+	  defined for UTF-8 optimization.
+
+	* string.c (str_strlen): use is_utf8_lead_byte and
+	  count_utf8_lead_bytes_with_ulong.
+
+	* string.c (str_utf8_nth) ditto.
+
+Wed Mar  5 17:53:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_flock): returns false on EAGAIN if non-blocking.
+	  [ruby-core:15795]
+
+Wed Mar  5 17:43:43 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c (transcode_loop): Adjusted detection of invalid
+	  (ill-formed) UTF-8 sequences. Fixing potential security issue, see
+	  http://www.unicode.org/versions/Unicode5.1.0/#Notable_Changes.
+
+	* test/ruby/test_transcode.rb: Added two tests for above fix.
+
+Wed Mar  5 14:00:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_to_s): avoid rb_scan_args() when no argument
+	  given.
+	* bignum.c (rb_big_to_s): ditto.
+	* enum.c (enum_first): ditto.
+	* eval_jump.c (rb_f_catch): ditto.
+	* io.c (rb_obj_display): ditto.
+	* class.c (rb_obj_singleton_methods): ditto.
+	* object.c (rb_class_initialize): ditto.
+	* random.c (rb_f_srand): ditto.
+	* range.c (range_step): ditto.
+	* re.c (rb_reg_s_last_match): ditto.
+	* string.c (rb_str_to_i): ditto.
+	* string.c (rb_str_each_line): ditto.
+	* string.c (rb_str_chomp_bang): ditto.
+	* string.c (rb_str_sum): ditto.
+
+	* string.c (str_modifiable): declare inline.
+	* string.c (str_independent): ditto.
+
+Wed Mar  5 11:50:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/debug.rb: require 'continuation' to implement "restart"
+	  command.  [ruby-dev:33992]
+
+	* lib/debug.rb (Context::debug_command): remove local variable
+	  shadowing to shut up warnings.  [ruby-dev:33992]
+
+	* lib/debug.rb (Context::display_list): ditto.
+
+	* lib/debug.rb (Context::resume): ditto.
+
+	* lib/debug.rb (Context::get_thread): no longer use #index for Hash.
 
-Sun Jun 15 19:54:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar  4 21:35:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb.rb (IRB::Irb::eval_input): SyntaxError should not be
+	  considered as IRB bug.  [ruby-dev:33991]
+
+	* lib/irb/workspace.rb (IRB::WorkSpace::filter_backtrace): should
+	  filter 'irb.rb' as well for context mode 2 and 3.
+
+Tue Mar  4 19:10:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_aset): should not copy key string when
+	  compare_by_identity is set.  [ruby-dev:33604]
+
+	* hash.c (hash_equal): two hash tables are different when internal
+	  comparison table differ.  [ruby-dev:33989]
+
+Tue Mar  4 16:29:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): disallow non digits '0o' expression.
+
+Tue Mar  4 14:35:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (open_key_args): use rb_io_open_with_args instead of rb_f_open.
+	  [ruby-core:15763]
+
+Tue Mar  4 13:41:46 2008  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (add_heap): fix previous change.  [ruby-dev:33988]
+
+Tue Mar  4 10:21:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (add_heap): use binary search to find the place to insert the
+	  new heap slot.  [ruby-dev:33983]
+
+Tue Mar  4 05:30:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (open_key_args): use rb_io_open instead of rb_f_open.
+	  [ruby-core:15746]
+
+Mon Mar  3 23:28:37 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpservlet/filehandler.rb: should normalize path
+	  separators in path_info to prevent directory traversal
+	  attacks on DOSISH platforms.
+	  reported by Digital Security Research Group [DSECRG-08-026].
+
+	* lib/webrick/httpservlet/filehandler.rb: pathnames which have
+	  not to be published should be checked case-insensitively.
+
+Mon Mar  3 17:25:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (add_heap): sort heaps array in ascending order to use
+	  binary search.
+
+	* gc.c (is_pointer_to_heap): use binary search to identify object
+	  in heaps.  works better when number of heap segments grow big.
+
+Mon Mar  3 17:15:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_regsub): remove too strict encoding check.
+	  [ruby-dev:33966]
+
+Mon Mar  3 16:14:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_any_hash): shrinks all results in Fixnum range.
+	  [ruby-core:15713]
+
+Sun Mar  2 23:03:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_ungetc): reduce redundant call.
+
+Sun Mar  2 10:13:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file): parse shebang in us-ascii.  a patch from
+	  sheepman <sheepman AT sheepman.sakura.ne.jp> in [ruby-dev:33955]
+
+Sun Mar  2 00:08:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): check for successive underscores.
+	  [ruby-dev:33952]
+
+Sat Mar  1 17:59:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (struct argf): packed ARGF stuffs.
+
+	* ruby.c (proc_options): use ruby_set_inplace_mode().
+
+Sat Mar  1 17:51:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb (recursive_collect): do not always
+	  include all test_*.rb.
+
+Sat Mar  1 14:14:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* development snapshot 1.9.0-1 released.
+
+Sat Mar  1 13:46:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* tool/make-snapshot: make prereq uses MINIRUBY.
+
+	* tool/make-snapshot: allow packaging like 1.9.0-1 by second
+	  command-line argument.
+
+Sat Mar  1 13:11:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/allpairs.rb: new file for all pairs method.
+
+	* test/ruby/test_m17n_comb.rb: use allpairs.rb to reduce test cases.
+
+	* test/ruby/test_sprintf_comb.rb: ditto.
+
+Sat Mar  1 12:34:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_inspect): use rb_str_inspect() instead of
+	  rb_str_dump().  [ruby-dev:33946]
+
+Sat Mar  1 12:15:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_method.c (rb_get_method_body): ent->method may be freed by
+	  GC.  [ruby-dev:31819]
+
+	* thread.c (remove_event_hook): should not access freed memory.
+	  [ruby-dev:31820]
+
+Sat Mar  1 10:31:19 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (read_all, rb_io_getline_fast): encoding is io_input_encoding.
+
+Sat Mar  1 10:09:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (tr_setup_table, rb_str_split_m, rb_str_chomp_bang):
+	  simplified with rb_enc_ascget().  [ruby-dev:33944]
+
+Sat Mar  1 10:01:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_coderange_scan_restartable): should not return
+	  offset in the middle of a character.
+
+	* string.c (rb_str_coderange_scan_restartable): should not return
+	  invalid cr value.
+
+Sat Mar  1 09:36:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): "%#.0o" should keep prefix where
+	  "%#.0x" should not.
+
+Sat Mar  1 02:35:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (big2str_find_n1): check integer overflow.
 
-Sun Jun 15 19:52:20 2008  Tanaka Akira  <akr@fsij.org>
+Sat Mar  1 00:29:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_dummy_p): bootstrap encodings can not be dummy.
+
+	* encoding.c (rb_enc_ascget): no needs to call rb_enc_precise_mbclen()
+	  twice.
+
+Fri Feb 29 23:14:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_chomp): test
+	  updated.
+
+Fri Feb 29 20:58:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_iterator.rb (TestIterator::test_enumerator):
+	  adjust test for zip behavior reversion.
+
+Fri Feb 29 20:25:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_chomp_bang): now works on UTF-16.
+
+	* string.c (tr_setup_table): negation should work on non ASCII
+	  compatible strings as well.
+
+	* string.c (rb_str_split_m): awk split should work on non ASCII
+	  compatible strings as well.
+
+Fri Feb 29 18:08:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_strftime): format should be ascii compatible.
+
+	* parse.y (rb_intern3): non ASCII compatible symbols.
+
+	* re.c (rb_reg_regsub): add encoding check.
+
+	* string.c (rb_str_chomp_bang): ditto.
+
+	* test/ruby/test_utf16.rb (TestUTF16::test_chomp): raises exception.
+
+Fri Feb 29 15:16:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_rpartition): calculation was done in byte indexing.
+
+	* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_start_with):
+	  allow start_with? matching on broken strings.
+
+Fri Feb 29 15:12:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (opt_block_param): command can start just after block param
+	  definition.  [ruby-list:44479]
+
+Fri Feb 29 03:22:19 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_time.rb (test_readers): fix typo.
+	  (test_strftime): "UTC" is also ok for time.gmtime.strftime("%Z").
+
+Fri Feb 29 02:50:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_new): remove encoding assumption of empty string.
+
+	* hash.c ( rb_f_getenv, env_fetch, env_inspect): result of ENV should
+	  be always ASCII-8BIT.
+
+	* object.c (nil_to_s): nil.to_s should be US-ASCII.
+
+Fri Feb 29 02:24:22 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/text.rb,
+	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: remove adhoc check
+	  of Ruby's features (use existence of some classes instead of
+	  comparing with RUBY_VERSION)
+
+	* ext/tk/lib/tk/root.rb, ext/tk/lib/tk/autoload.rb: make TkRoot
+	  (Tk::Root) unswitchable
+
+	* ext/tk/lib/multi-tk.rb: partial bug fix (still not work!!)
+
+Thu Feb 28 23:37:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): use ASCII-8BIT
+	  for charset unspecified non-text data.
+
+Thu Feb 28 22:19:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_capable): IMMEDIATE_P doesn't include Qnil and Qfalse.
+	  use SPECIAL_CONST_P.
+
+Thu Feb 28 19:45:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_find): check type of argument and convert to String
+	  if it is StringValue. [ruby-cvs:22866]
+
+Thu Feb 28 18:07:52 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): setup encoding
+	  by charset.
+	  (OpenURI::Meta#meta_add_field): call meta_setup_encoding when
+	  content-type.
+
+Thu Feb 28 15:29:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_getline_fast): scan coderange.
+
+Thu Feb 28 14:36:46 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_str_copy): removed.
+
+Thu Feb 28 13:51:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (stack_check): made flag per threads.
+
+	* thread.c (rb_thread_set_raised, rb_thread_reset_raised): prefixed.
+
+Thu Feb 28 11:43:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_flock): immediately returns on EAGAIN if
+	  non-blocking.  [ruby-core:15672]
+
+Thu Feb 28 11:23:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline_1): get rid of segfault.  [ruby-dev:33938]
+
+Thu Feb 28 11:19:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_reverse_bang): removed unused variables.
+
+	* include/ruby/encoding.h (rb_str_coderange_scan_restartable): added
+	  prototype.
+
+	* string.c (rb_str_coderange_scan_restartable, rb_str_times): removed
+	  unused variables.
+
+	* string.c (rb_str_reverse_bang): ditto
+
+	* string.c (rb_enc_str_copy): unused now.  may be used in future?
+
+Thu Feb 28 03:03:32 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/*: make default widget set
+	  switchable between Tk (standard Tcl/Tk widget set) and
+	  Ttk (Tile). Initial default widget set is Tk. Now, toplevel
+	  widget classes are removed and defined as aliases.
+	  For example, "TkButton" is an alias of the "Tk::Button" class.
+	  Those aliases are replaced when switching default widget set.
+	  "Tk.default_widget_set=" is the method for switching default
+	  widget set. "Tk.default_widget_set = :Ttk" defines Ttk (Tile)
+	  widget set as default. It means that "TkButton" denotes
+	  "Tk::Tile::Button" class. And then, "TkButton.new" creates
+	  a Tk::Tile::Button widget. Of course, you can back to use
+	  standard Tk widgets as the default widget set by calling
+	  "Tk.default_widget_set = :Tk", whenever you want. Based on
+	  the feature, you can use Ttk widget styling engine on your
+	  old Ruby/Tk application without modifying its source, if you
+	  don't use widget options unsupported on Ttk widgets (At first,
+	  call "Tk.default_widget_set = :Ttk", and next load and run
+	  your application).
+	  This is one step for supporting Tcl/Tk8.5 features.
+
+Wed Feb 27 22:55:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_coderange_scan_restartable): coderange scanning
+	  for partial read.
+
+	* io.c (read_all): set coderange when not convert encoding.
+
+Wed Feb 27 03:55:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb, enc/make_encmake.rb: load current mkmf.rb even if
+	  cross-compiling.
+
+	* ext/extmk.rb, enc/make_encmake.rb, lib/mkmf.rb: need to be 1.8
+	  compatible for cross-compiling.
+
+Tue Feb 26 16:53:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-calculate-indent): should distinguish
+	  comment and # in strings.  [ruby-dev:33874]
+
+Tue Feb 26 16:41:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (combi_len, rb_ary_product): check for overflow.
+	  [ruby-Bugs-18355]
+
+Tue Feb 26 16:38:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (recursive_cmp): compare minimal length parts.
+
+Tue Feb 26 16:06:00 2008  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_{ec,dh,dsa,rsa}.c: Remove useless warnings.
+
+	* ext/openssl/ossl_asn1.c: Simplify code.
+
+	* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
+	  Undefine #id if SSL_SESSION_get_id is not supported.
+
+Tue Feb 26 15:50:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (value_expr_gen): removed inappropriate warning.
+	  [ruby-core:15660]
+
+Tue Feb 26 15:43:42 2008  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (tokadd_escape): refactored.  [ruby-core:15657]
+
+Tue Feb 26 15:30:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_eql, rb_ary_cmp): get rid of stack overflow with
+	  self-recursive constructs.  [ruby-Bugs-18356]
+
+Tue Feb 26 01:16:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (ROBJECT_NUMIV): renamed from ROBJECT_LEN.
+	  (ROBJECT_IVPTR): renamed from ROBJECT_PTR.
+
+	* variable.c: follow the above renaming.
+
+	* object.c: ditto.
+
+	* gc.c: ditto.
+
+	* marshal.c: ditto.
+
+Mon Feb 25 17:30:29 2008  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* ext/openssl/digest.c ext/openssl/lib/openssl/digest.rb:
+	  Commit patch #9280 from Akinori MUSHA.
+	  Simplify the OpenSSL::Digest class and make use of the
+	  existing Digest framework.
+	  Enhance performance.
+
+Mon Feb 25 15:33:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (big2str_karatsuba): initialize cache if not initialized.
+
+	* bignum.c (Init_Bignum): delayed initializing cache.
+	  [ruby-dev:33930]
+
+Mon Feb 25 13:40:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (Init_process): share bignum objects for RLIM_INFINITY,
+	  RLIM_SAVED_MAX and RLIM_SAVED_CUR if they are equal.
+
+Mon Feb 25 10:41:41 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* encoding.c (Encoding#dummy): minor grammatical fixes
+	  in rdoc documentation.
+
+Mon Feb 25 00:01:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (clean-local): should be double-colon.
+
+Sun Feb 24 23:39:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, {bcc,win}32/Makefile.sub (clean-local): remove
+	  intermediate files.
+
+	* cygwin/GNUmakefile.in (clean-local): remove def file.
+
+Sun Feb 24 06:49:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (ruby_set_debug_option): separated ruby_each_words().
+
+	* util.c (ruby_each_words): extracted from ruby_set_debug_option().
+
+	* ruby.c (enable_option, disable_option): allow all for all known
+	  features.
+
+	* ruby.c (proc_options): generalized enable/disable options.
+
+	* ruby.c (ruby_init_gems): take enabled flag.  [ruby-core:14840]
+
+	* ruby.c (process_options): added --disable-rubyopt flag.
+
+	* include/ruby/util.h (ruby_each_words): prototype.
+
+Sun Feb 24 05:25:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): check if argument for -E exists.
+
+Sun Feb 24 05:09:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el (ruby-style-label-indent): fix for labels inside
+	  blocks in switch.
+
+Sun Feb 24 03:52:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (valid_filename): use O_EXCL to get rid of clobbering
+	  existing files in race conditions.
+
+Sat Feb 23 21:36:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (ole_init_cp): should return value.
+
+Sat Feb 23 20:16:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_sublen): removed.
+
+	* string.c (rb_str_reverse, rb_str_reverse_bang): use
+	  single_byte_optimizable.
+
+Sat Feb 23 19:25:18 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_copy_for_substr): renamed from
+	  rb_enc_cr_str_copy.
+
+	* string.c: use rb_enc_cr_str_copy_for_substr and keep coderange.
+
+Sat Feb 23 18:50:17 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_encoding2cp): remove US-ASCII
+	  mapping.
+
+Sat Feb 23 01:09:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rlimit_resource_type): new function.
+	  (rlimit_resource_value): new function.
+	  (proc_getrlimit): use rlimit_resource_type to accept
+	  symbol and string as resource type.
+	  (proc_setrlimit): use rlimit_resource_type and rlimit_resource_value
+	  to accept symbol and string as resource type and values.
+
+Fri Feb 22 21:12:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_copy): check string's coderange is 7bit or
+	  valid.
+
+Fri Feb 22 19:50:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (BIGZEROP): fix for longer Bignum zeros.  [ruby-Bugs-17454]
+
+Fri Feb 22 15:47:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_mbclen): return minlen instead of 1 when
+	  a character is not found properly.
+
+	* string.c (rb_enc_strlen): round up string length with fixed
+	  multibyte encoding such as UTF-32.
+	  (rb_enc_strlen_cr): ditto.
+	  (rb_str_substr): fix substring with fixed multibyte encoding.
+	  (rb_str_justify): check number of characters.
+
+Fri Feb 22 12:11:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): string of ascii incompatible encoding
+	  should be escaped and returned as US-ASCII encoding.
+
+Fri Feb 22 11:16:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_substr): copy encoding although empty string.
+
+Fri Feb 22 04:48:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_times): empty string's coderange is CODERANGE_7BIT.
+
+	* string.c (rb_str_substr): ditto.
+
+	* encoding.c (rb_enc_compatible): empty string is compatible with not
+	  only nonasciicompatible strings. [ruby-dev:33895]
+
+Thu Feb 21 17:15:15 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c: Added basic support for passing options to String#encode
+	  via a hash. Currently only one option, with one value, is supported:
+	  invalid: :ignore (dropping invalid byte sequences instead of
+	  producing an error). Option naming is not yet stable!
+
+	* test/ruby/test_transcode.rb: Added a single test for invalid: :ignore
+	  option. Not more tests because most data does not yet distinguish
+	  between INVALID and UNKNOWN.
+
+Thu Feb 21 16:35:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_unshift_m): expands enough for argc.  [ruby-dev:33880]
+
+Thu Feb 21 14:49:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_set_encoding): uses current_file after check if next
+	  input is available.
+
+Thu Feb 21 14:13:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_putc): invoke stdout method so that redefining putc
+	  may take effect.   [ruby-talk:291844]
+
+	* io.c (rb_f_puts): ditto.
+
+Thu Feb 21 11:10:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c: replace rb_enc_copy by rb_enc_cr_str_copy or
+	  rb_enc_cr_str_exact_copy.
+
+Thu Feb 21 10:35:04 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_enc_asciicompat): dummy encoding is not
+	  ascii compatible. [ruby-dev:33878]
+
+Thu Feb 21 00:01:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime
+	  load path.  [ruby-list:44600]
+
+Wed Feb 20 23:55:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_map_errno): exported.
+
+Wed Feb 20 23:28:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/readline/extconf.rb (rl_event_hook): workaround for native
+	  windows.
+
+Wed Feb 20 19:42:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_associate_index): doesn't clear coderange
+	  when new encoding equals to old one.
+
+Wed Feb 20 19:15:38 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_str_copy): added for wrapper for rb_enc_copy.
+	  this also copy coderange when ptr and len is equal.
+
+	* string.c (rb_enc_cr_str_copy): added for wrapper for rb_enc_copy.
+	  this always copy coderange.
+
+	* string.c (str_replace_shared): use rb_enc_str_copy.
+
+	* string.c (str_new3): don't rb_enc_copy because encoding is copied
+	  at str_replace_shared.
+
+Wed Feb 20 13:08:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (parse_args): added --dir-mode, --script-mode and
+	  --cmd-type options.  [ruby-dev:33816]
+
+	* instruby.rb (parse_args): added bin-arch and bin-comm to install
+	  type, for compiled files and script files.
+
+	* instruby.rb (parse_args): deal with make style command line macros,
+	  and count as long style options if prefixed with INSTALL_.
+
+	* instruby.rb (makedirs): use $dir_mode.  [ruby-dev:33805]
+
+	* instruby.rb (open_for_install): set file mode, which is now
+	  permission mode instead of access mode.
+
+	* instruby.rb (bin-comm): installs scripts with replacing shebang
+	  lines.
+
+Wed Feb 20 10:04:22 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (open_key_args): set arg->io even if no options passed.
+	  [ruby-dev:33072]
+
+Tue Feb 19 21:11:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_strlen_cr): get length with coderange scan.
+
+	* string.c (str_strlen): use rb_enc_strlen_cr. [ruby-dev:33849]
+
+Tue Feb 19 20:49:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_raise_jump): moved adjustment for control frame.
+
+Tue Feb 19 18:34:32 2008  Tanaka Akira  <akr@fsij.org>
 
 	* gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed.  [ruby-dev:33857]
 
-Sun Jun 15 19:50:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 19 14:27:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/readline/readline.c (readline_event): prevent polling.  based on
 	  a patch from error errorsson in [ruby-Bugs-17675].
 
-Sun Jun 15 19:44:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 19 11:14:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_exec_node): no thread starts inside iseq compilation.
 
-	* parse.y (yycompile): clear ruby_eval_tree_begin if parse failed.
+	* eval.c (rb_f_raise): skip current control frame.  [ruby-core:15589]
 
-Sun Jun 15 19:44:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* insns.def (opt_div): raise as the ordinary method. [ruby-core:15589]
 
-	* parse.y (yycompile): clear ruby_eval_tree_begin too before parse.
+Mon Feb 18 15:16:30 2008  Tanaka Akira  <akr@fsij.org>
 
-Sun Jun 15 19:22:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_each_line): fix newline size.
+
+Mon Feb 18 13:06:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well.
+
+Mon Feb 18 11:51:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (re_warn): defined to restore warnings for /[a-c-e]/, etc.
+
+Mon Feb 18 10:17:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
 	  [ruby-Bugs-17940]
 
-Sun Jun 15 19:20:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb 18 00:33:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_regsub): don't repeat repl twice with
+	  "X".sub!(/./, sprintf("\\%c", 255)).
+
+Sun Feb 17 23:06:55 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/cgi.rb (CGI::escapeHTML): use gsub with Hash. [ruby-dev:33828]
+
+Sun Feb 17 21:38:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (ENC_CODERANGE_AND): fix broken case. [ruby-dev:33826]
+
+	* string.c (rb_str_times): fix broken case. [ruby-dev:33826]
+
+Sun Feb 17 20:45:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_prepare_re): add enable_warning parameter.
+	  (rb_reg_adjust_startpos): disable warning by rb_reg_prepare_re.
+	  (rb_reg_search): follow rb_reg_prepare_re parameter change.
+
+Sun Feb 17 20:12:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_regexp.rb: add tests to achieve over 90% test
+	  coverage of re.c.
+
+Sun Feb 17 15:25:08 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (ENC_CODERANGE_AND): added.
+
+	* string.c (rb_str_plus, rb_str_times): keep coderange.
+
+	* parse.y (STR_NEW0) use rb_usascii_str_new.
+
+Sun Feb 17 14:07:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (str_strlen): rb_enc_strlen doesn't fail.
+
+Sun Feb 17 13:03:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (str_sublen): use rb_enc_strlen.
+
+Sun Feb 17 12:17:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/{euc_jp.c,gbk.c,iso_8859_1.c,iso_8859_11.c,iso_8859_13.c,
+	  iso_8859_2.c,iso_8859_6.c,iso_8859_7.c,iso_8859_8.c,iso_8859_9.c,
+	  shift_jis.c,windows_1251.c}: add document about encodings.
+
+	* enc/cp949.c: divided into new file.
+
+Sun Feb 17 10:59:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_quote): return US-ASCII string consistently.
+
+Sun Feb 17 09:17:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_times): reduce loop overhead.
+
+Sun Feb 17 03:37:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/re.h (struct rmatch_offset): new struct for character
+	  offsets.
+	  (struct rmatch): new struct.
+	  (struct RMatch): reference struct rmatch.
+	  (RMATCH_REGS): new macro.
+
+	* re.c (match_alloc): initialize struct rmatch.
+	  (pair_byte_cmp): new function.
+	  (update_char_offset): update character offsets.
+	  (match_init_copy): copy regexp and character offsets.
+	  (match_sublen): removed.
+	  (match_offset): use update_char_offset.
+	  (match_begin): ditto.
+	  (match_end): ditto.
+	  (rb_reg_search): make character offset updated flag false.
+	  (match_size): use RMATCH_REGS.
+	  (match_backref_number): ditto.
+	  (rb_reg_nth_defined): ditto.
+	  (rb_reg_nth_match): ditto.
+	  (rb_reg_match_pre): ditto.
+	  (rb_reg_match_post): ditto.
+	  (rb_reg_match_last): ditto.
+	  (match_array): ditto.
+	  (match_aref): ditto.
+	  (match_values_at): ditto.
+	  (match_inspect): ditto.
+
+	* string.c (rb_str_subpat_set): use RMATCH_REGS.
+	  (rb_str_sub_bang): ditto.
+	  (str_gsub): ditto.
+	  (rb_str_split_m): ditto.
+	  (scan_once): ditto.
+
+	* gc.c (obj_free): free character offsets.
+
+Sun Feb 17 03:13:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/resource.rb: made version infos confirm to OS spec.
+
+	* {bcc32,win32}/Makefile.sub (*.rc): add dependency.
+
+Sat Feb 16 20:49:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_substr): optimized for UTF-8.
+
+Sat Feb 16 18:13:53 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_compatible): check encoding incapable arguments.
+
+Sat Feb 16 20:12:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (match_inspect): avoid SEGV with MatchData.allocate.inspect.
+
+Sat Feb 16 19:04:17 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_strlen): revert r15507. [ruby-dev:33810]
+
+Sat Feb 16 18:25:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_strlen): little more optimization.
+	  (rb_enc_nth): remove needless variable 'c'.
+
+Sat Feb 16 18:00:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_compatible): empty strings are always compatible.
+
+	* string.c (rb_enc_cr_str_buf_cat): ditto.
+
+Sat Feb 16 16:14:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_enc_strlen): UTF-8 character count moved to str_strlen.
+	  (str_strlen): UTF-8 character count is only applicable for valid
+	  UTF-8 string.  [ruby-dev:33807]
+
+Sat Feb 16 13:16:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_sub_bang): stringize replacing hash values.
+	  (str_gsub): ditto.
+
+Sat Feb 16 13:01:33 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_strlen): add search_nonascii like character
+	  counter for UTF-8.
+
+Sat Feb 16 11:53:35 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_strlen): moved to string.c.
+
+	* string.c (rb_enc_strlen): use search_nonascii.
+	  (str_strlen): don't use search_nonascii.
+
+Sat Feb 16 11:45:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/require_relative.rb: check require_relative call in eval.
+
+Sat Feb 16 08:00:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (process_options): set default_external before loading
+	  libraries. [ruby-dev:33801]
+
+Sat Feb 16 05:49:54 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/iso_8859_{4,13}.c: Windows-1257 is replica of ISO-8859-13.
+
+	* string.c (single_byte_optimizable): rb_enc_mbminlen must be 1
+	  when rb_enc_mbmaxlen is 1.
+
+Sat Feb 16 03:43:18 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_nth): moved to string.c.
+
+	* string.c (rb_enc_nth): moved from string.c.  use search_nonascii
+	  for ASCII compatible string.
+	  (str_nth): wrong optimization removed to fix
+	  "a".force_encoding("EUC-JP").slice!(0,10) returns
+	  "a\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+
+Sat Feb 16 00:21:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (rb_range_beg_len): check if responds to "begin" and "end"
+	  methods for non-Range object.
+
+Fri Feb 15 20:29:42 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage
+	  according to Encoding.default_external.
+
+	* test/win32ole/test_win32ole.rb: ditto.
+
+Fri Feb 15 19:31:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/node.h (NODE_FL_NEWLINE): renamed from NODE_NEWLINE
+	  to denote its a flag.  [ruby-core:15529]
+
+Fri Feb 15 18:23:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_sub_bang, str_gsub): allows hash for replacement.
+
+Fri Feb 15 17:12:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_strlen): use search_nonascii() for performance.
+
+	* string.c (str_nth): ditto.
+
+Fri Feb 15 16:22:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (open_key_args): allow specifying both :mode and :encoding.
+
+Fri Feb 15 15:34:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_getbyte): new method.
+	  (rb_str_setbyte): new method.
+
+Fri Feb 15 15:29:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/require_relative.rb: new file.
+
+Fri Feb 15 15:23:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
 	  Daniel Luz at [ruby-Bugs-17910].
 
-Sun Jun 15 19:13:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Feb 15 10:35:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_quote): set US-ASCII for ASCII-only string.
+	  [ruby-dev:33785]
+
+Fri Feb 15 10:27:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {win,bcc}32/Makefile.sub (config.h): added HAVE_FTRUNCATE.
+	  [ruby-dev:33786]
+
+Fri Feb 15 09:44:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_compile_gen): reg_fragment_setenc might not raise an
+	  exception before rb_reg_compile.
+
+Fri Feb 15 07:37:40 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/paths.rb: Preserve compatibility with 1.8.
+
+Fri Feb 15 02:42:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ftruncate): check if available.
 
 	* file.c (rb_file_truncate): check if ftruncate instead of truncate.
 
-Sun Jun 15 19:02:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Feb 15 02:40:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (sigsetmask): check when signal semantics is not POSIX.
 
 	* signal.c (USE_TRAP_MASK): set true if sigprocmask or sigsetmask is
 	  available.
 
-Sat Jun 14 16:49:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb 14 23:56:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.c (error_print): append a newline to rest lines.
+
+	* parse.y (reg_compile_gen): appends error message from
+	  rb_reg_compile() to one from reg_fragment_setenc().
+
+Thu Feb 14 21:00:14 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_reopen): check STDIN, STDOUT and STDERR mode according to
+	  stdio streams.
+
+Thu Feb 14 16:07:40 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_math.rb: actual-expected argument ordering for
+	  test_math.rb fixed.  a patch from Tadashi Saito
+	  <shiba AT mail2.accsnet.ne.jp> in [ruby-dev:33770].
+
+Thu Feb 14 16:02:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_utime): inhibits with secure level 2 or higher.
+
+Thu Feb 14 12:30:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_preprocess_dregexp): use non-preprocessed regexp source
+	  for result.
+
+Thu Feb 14 01:43:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/timeout.rb (Timeout::timeout): made sensitive to location on the
 	  stack.  [ruby-core:15458]
 
-Fri Jun 13 13:14:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Feb 14 00:49:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/ptr.c (dlmem_each_i): typo fixed.  a patch from IKOMA
-Sun Jun 15 21:06:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* common.mk (INSTRUBY_ARGS): pass mode to install.  [ruby-dev:33766]
 
-	* class.c (clone_method): should copy cref as well.
-	  [ruby-core:15833]
+	* instruby.rb (parse_args): added --data-mode and --prog-mode options.
 
-	  Yoshiki <ikoma@mb.i-chubu.ne.jp> in [ruby-dev:33776].
+Thu Feb 14 00:02:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
-Fri Jun 13 13:13:23 2008  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* eval.c (eval): allow to eval in a binding that has a singleton method.
+	  [ruby-dev:33763]
 
-	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
-	  Submitted by Sylvain Joyeux [ruby-core:12099].
+	* test/ruby/test_proc.rb: add tests to achieve over 70% test coverage
+	  of proc.c.
+
+	* test/ruby/test_method.rb: ditto.
+
+Wed Feb 13 22:46:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb (Pathname#sub_ext): new method.  [ruby-list:44608]
+
+Wed Feb 13 21:50:32 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (proc_curry): new method. [ruby-dev:33676]
+
+	* test/ruby/test_proc.rb: add tests for above.
+
+Wed Feb 13 20:48:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (RObject): add iv_index_tbl for shortcut of
+	  RCLASS_IV_INDEX_TBL(rb_obj_class(obj)).
+	  (ROBJECT_IV_INDEX_TBL): defined.
+
+	* object.c (init_copy): initialize iv_index_tbl in struct RObject.
+
+	* variable.c (ivar_get): use ROBJECT_IV_INDEX_TBL.
+	  (rb_ivar_defined): ditto.
+	  (obj_ivar_each): ditto.
+	  (rb_obj_remove_instance_variable): ditto.
+	  (rb_ivar_set): update iv_index_tbl in struct RObject.
+
+Wed Feb 13 16:21:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb: revert r15442. 2nd argument of String#sub parse
+	  escapes. [ruby-dev:33726]
+
+	* bootstraptest/test_method.rb, enc/depend, instruby.rb, lib/mkmf.rb,
+	  mkconfig.rb: revert r15443. ditto.
+
+Wed Feb 13 11:20:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/depend: fix typo.
+
+	* lib/mkmf.rb: revert r15443. "\\1#{sep}\\2" is wrong if sep is ended
+	  with "\\".
+
+Wed Feb 13 08:57:21 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup/inline.rb:  Allow inline markup to have a leading
+	  '#' or '\', or trailing punctuation.  i.e. *#freeze?*, *\foo?*.
+
+Wed Feb 13 07:21:23 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/to_html_hyperlink.rb:  Moved linking to to_html.rb, move
+	  crossref to to_html_crossref.rb
+
+Wed Feb 13 04:15:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg_concat_gen, arg_append_gen): optimize for array push.
+
+	* parse.y (arg_concat_gen): optimize for array concat.
+
+	* parse.y (arg_add_gen): removed since identical to arg_append_gen.
+
+Tue Feb 12 21:04:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (exc_list): should use mrhs if non array.
+
+Tue Feb 12 20:32:50 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/rational.rb (floor, ceil, truncate, round): do not use
+	  definitions of Numeric.
+
+	* lib/rational.rb (to_i): should returns truncated self.
+
+	* lib/complex.rb (numerator): requires
+	  Integer#{numerator,denominator}.
+
+	* lib/complex.rb (quo): do not use definition of Numeric.
+
+	* lib/complex.rb (>, >=, <, <=, between?, div, divmod, modulo,
+	  floor, ceil, truncate, round): undef'ed.
+
+	* lib/mathn.rb (Rational#inspect): removed.
+
+Tue Feb 12 16:48:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (args, mrhs): flattens literal array splats.
+
+	* parse.y (exc_list): splat literal array.
+
+Tue Feb 12 15:27:19 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bootstraptest/runner.rb, bootstraptest/test_method.rb, enc/depend,
+	  instruby.rb, lib/mkmf.rb, lib/test/unit/util/procwrapper.rb,
+	  mkconfig.rb, sample/test.rb, template/vm.inc.tmpl,
+	  test/ruby/test_stringchar.rb: fixes around String#gsub.
+
+Tue Feb 12 15:11:47 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/pure/generator.rb,
+	  ext/json/lib/json/pure/parser.rb, ext/openssl/lib/openssl/x509.rb,
+	  ext/win32ole/sample/olegen.rb, lib/date/format.rb, lib/irb/context.rb,
+	  lib/irb/workspace.rb, lib/net/http.rb, lib/net/imap.rb,
+	  lib/rdoc/generator.rb, lib/rdoc/markup/to_html.rb,
+	  lib/rdoc/markup/to_latex.rb, lib/rdoc/parsers/parse_c.rb,
+	  lib/rdoc/ri/formatter.rb, lib/rexml/parsers/baseparser.rb,
+	  lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rss/parser.rb,
+	  lib/uri/common.rb, lib/uri/generic.rb, lib/webrick/httpresponse.rb,
+	  lib/webrick/httpservlet/filehandler.rb, lib/yaml/baseemitter.rb,
+	  lib/yaml/encoding.rb: performance tuning around String#gsub.
+
+Tue Feb 12 12:16:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_hash_cmp): lighter version of rb_str_cmp() for
+	  hash comparison function.
+
+	* hash.c (rb_any_cmp): use rb_str_hash_cmp().
+
+	* string.c (rb_str_casecmp): should return nil for incompatible
+	  comparison.
+
+Tue Feb 12 12:13:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* instruby.rb: specify file mode to install.  a patch from
+	  pegacorn  <subscriber.jp AT gmail.com> in [ruby-dev:33699].
+
+Tue Feb 12 11:38:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (rb_num_coerce_bin): add ID argument to specify
+	  caller's method name.  [ruby-dev:33663]
+
+	* numeric.c (rb_num_coerce_cmp): ditto.
+
+	* numeric.c (rb_num_coerce_relop): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (DoSomeOne): add function name argument.
+
+Tue Feb 12 10:25:02 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/rdoc.rb:  Wrap parse_files' read in version check for
+	  backwards compatibility.
+
+Tue Feb 12 10:15:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (load_file): enc must effect source encoding.
+	  [ruby-core:15496]
+
+Tue Feb 12 10:16:47 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/paths.rb:  Restore require rubygems check.
+
+Tue Feb 12 02:42:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_include): specialize single character string
+	  case (e.g. (?a ..?z).include(?x)) for performance.
+	  [ruby-core:15481]
+
+	* string.c (rb_str_upto): specialize single character case.
+
+	* string.c (rb_str_hash): omit coderange scan for performance.
+
+	* object.c (rb_check_to_integer): check Fixnum first.
+
+	* object.c (rb_to_integer): ditto.
+
+	* string.c (rb_str_equal): inline memcmp to avoid unnecessary
+	  rb_str_comparable().
+
+	* parse.y (rb_intern2): use US-ASCII encoding.
+
+	* parse.y (rb_intern_str): ditto.
+
+Mon Feb 11 17:21:18 2008  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::VERSION), test/rss/test_version.rb:
+	  0.2.3 -> 0.2.4.
+
+	* lib/rss/maker.rb, lib/rss/maker/, test/rss/test_maker_2.0.rb:
+	  fixed a bug that RSS::Maker.make("0.9")'s item doesn't make some
+	  elements if description is missed.
+	  Reported by Michael Auzenne. Thanks!!!
+
+	* lib/rss/maker/0.9.rb, test/rss/test_maker_0.9.rb:
+	  RSS::Maker.make("0.9") generates RSS 0.92 not RSS 0.91.
+
+Mon Feb 11 10:43:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (load_file): the encoding of DATA follows the source
+	  file encoding. [ruby-dev:33693]
 
-	* ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free().
-	  Slightly modified fix bassed on a patch by Sylvain Joyeux
-	  [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ]
-	  [ ruby-patches-13151 ].
+Mon Feb 11 06:50:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
-Fri Jun 13 12:10:13 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* test/ruby/test_pack.rb: fix tests for 64bit CPU.
+
+	* test/ruby/test_bignum.rb: ditto.
+
+	* test/ruby/test_file_exhaustive.rb: ditto.
+
+	* test/ruby/test_integer.rb: ditto.
+
+	* test/ruby/test_time.rb: ditto.
+
+	* test/ruby/test_numeric.rb: ditto.
+
+	* test/ruby/test_fixnum.rb: ditto.
+
+Mon Feb 11 00:18:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/benchmark.rb (Job::Benchmark#item): fix typo.
 
-Fri Jun 13 12:06:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 10 21:58:32 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (encdb, transdb): depend on $(PREP).
+
+Sun Feb 10 16:58:20 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*, test/rubygems*, gem_prelude.rb: Import RubyGems
+	  r1601.  [ruby-core:15381]
+
+Sun Feb 10 15:07:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub (MISSING): added cbrt.obj.
+
+Sun Feb 10 12:58:33 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/code_objects.rb: Make some attributes accessible for reuse.
+	* lib/rdoc/generator/html.rb: Pull out ContextUser classes and related
+	  methods for reuse.
+	* lib/rdoc/generator.rb: Move ContextUser classes to
+	  RDoc::Generator::Context for reuse.
+	* lib/rdoc/rdoc.rb: Make RDoc::RDoc initialization a little easier.
+	* lib/rdoc/options.rb: Make RDoc::Options easier to use without
+	  parsing an ARGV.
+	* lib/rdoc/markup/to_*.rb: Subclass RDoc::Markup::Formatter.
+	* lib/rdoc/markup/formatter.rb: Add RDoc::Markup::Formatter to make
+	  RDoc markup conversion easier.
+	* lib/rdoc/markup/fragments.rb: Make RDoc::Markup::ListItem easier to
+	  test.
+	* lib/rdoc/markup/to_html_hyperlink.rb: Pulled out of the HTML
+	  generator for easier reusability.
+	* lib/rdoc/markup.rb: Fix bug with labeled lists containing bullet
+	  lists.
+	* lib/rdoc/generators/html/html.rb: Fix Constant display.
+
+Sat Feb  9 23:44:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* missing/tgamma.c (tgamma): use lgamma_r if available.
+
+Sat Feb  9 23:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/extconf.rb: simplified the condition.
+
+Sat Feb  9 21:20:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_math.rb: add tests for Math.gamma, Math.lgamma and
+	  Math.cbrt, and use assert_in_delta instead of assert.
+
+Sat Feb  9 18:34:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* math.c (math_cbrt): new method Math.cbrt.
+
+	* configure.in (cbrt): check for replacement functions.
+
+	* missing/cbrt.c: new file.
+
+Sat Feb  9 17:51:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
 	  precision.  [ruby-talk:290296]
@@ -177,18 +40628,548 @@ Fri Jun 13 12:06:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/extconf.rb: ditto.  [ruby-dev:33658]
 
-Fri Jun 13 12:01:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb  9 12:06:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* missing/tgamma.c (tgamma): add error check.
+
+Sat Feb  9 11:47:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* math.c (math_gamma): add error check.
+	  (math_lgamma): ditto.
+
+Sat Feb  9 11:09:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* missing/lgamma_r.c (lgamma_r): return HUGE_VAL for non-positive
+	  integers.
+
+Sat Feb  9 10:03:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_new4): copy encoding from orig, instead of shared
+	  one.
+
+Sat Feb  9 01:01:38 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (lchmod_internal): fix warning cast from pointer to integer of
+	  different size.
+
+Sat Feb  9 00:44:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/irb.rb (IRB::Irb::eval_input): rescues Interrupt and other than
 	  SystemExit and SignalException.  [ruby-core:15359]
 
-Fri Jun 13 11:57:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Feb  8 23:51:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* missing/lgamma_r.c (lgamma_r): use smaller argument for sin function.
+
+Fri Feb  8 22:10:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI.open_http): rescue URI::InvalidURIError by
+	  URI.parse for location URI.
+
+Fri Feb  8 19:22:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (rb_str_derive): uses rb_str_subseq() for byte
+	  length.  [ruby-dev:33653]
+
+	* ext/iconv/iconv.c (iconv_convert): added toidx argument to set
+	  encoding of successfully converted string.  [ruby-dev:33221]
+
+Fri Feb  8 15:09:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (xsystem): expand macros like as make.
+
+Fri Feb  8 09:27:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/ri/driver.rb (read_yaml): remove SM* for compatibility.
+
+Fri Feb  8 00:07:24 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_hash.rb: follow the change of Hash#flatten.
+
+	* test/ruby/test_time.rb: add tests to achieve over 70% test coverage
+	  of time.c.
+
+	* test/ruby/test_prec.rb: ditto over 90% for prec.c.
+
+Thu Feb  7 19:11:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_dup): reverted unneeded change.  [ruby-dev:33634]
+
+	* string.c (rb_str_replace): makes frozen shared string before
+	  sharing.
+
+Thu Feb  7 16:33:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_reopen): don't change access mode for stdin, stdout and
+	  stderr.  [ruby-core:15360]
+
+Thu Feb  7 16:33:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_replace_shared): replaces string with sharing.
+
+	* string.c (rb_str_new4, rb_str_associate, rb_str_associated): allows
+	  associated strings shared.
+
+	* string.c (rb_str_dup, rb_str_substr, rb_str_replace): shares memory.
+	  [ruby-core:15400]
+
+Thu Feb  7 15:42:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_end_with): compares with the suffix.
+
+Thu Feb  7 15:03:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/korean.c: add support for CP949 by Park Ji-In.
+	  [ruby-dev:33626]
+
+Thu Feb  7 11:11:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* missing/lgamma_r.c (lgamma_r): some compilers don't permit dividing
+	  by literal 0.0. use const variable instead.
+
+	* {bcc32,win32,wince}/Makefile.sub (MISSING): add lgamma_r.obj and
+	  tgamma.obj.
+
+Thu Feb  7 10:39:21 2008  Tanaka Akira  <akr@fsij.org>
+
+	* math.c (math_gamma): new method Math.gamma.
+	  (math_lgamma): new method Math.lgamma.
+
+	* include/ruby/missing.h (tgamma): declared unless HAVE_TGAMMA.
+	  (lgamma_r): declared unless HAVE_LGAMMA_R.
+
+	* configure.in (tgamma): check for replacement functions.
+	  (lgamma_r): ditto.
+
+	* missing/tgamma.c: new file.  based on gamma.c from
+	  "C-gengo niyoru saishin algorithm jiten" (New Algorithm handbook
+	  in C language) (Gijyutsu hyouron sha, Tokyo, 1991)
+	  by Haruhiko Okumura.
+
+	* missing/lgamma_r.c: ditto.
+
+	* LEGAL (missing/tgamma.c): describe as public domain.
+	  (missing/lgamma_r.c): ditto.
+
+Thu Feb  7 09:05:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_enc_from_index): BINARY does not
+	  have in-bound encoding index.
+
+Thu Feb  7 04:26:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/korean.c: add EUC-KR conversion support by Park Ji-In.
+	  [ruby-dev:33621]
+
+Wed Feb  6 01:47:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_flatten): do not flatten recursively by default.
+	  [ruby-dev:33603]
+
+Wed Feb  6 00:50:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* insns.def (adjuststack): never use INC_SP with minus value because
+	  some compilers cannot deal it correctly. use DEC_SP instead.
+
+Wed Feb  6 00:48:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_hash.rb: add tests to achieve over 90% test coverage
+	  of hash.c.
+
+	* test/ruby/test_env.rb: ditto.
+
+Wed Feb  6 00:24:49 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* hash.c (env_rassoc): remove access to free'd environment on mswin32.
+
+Tue Feb  5 21:57:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (rb_call_super): pass a passed block when super is called via
+	  rb_call_super.  [ruby-dev:33598]
+
+Tue Feb  5 11:14:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR.
+
+	* lib/mkmf.rb (install_files): rejects files matching to
+	  $NONINSTALLFILES.
+
+	* lib/mkmf.rb (init_mkmf): defaults $NONINSTALLFILES to backup and
+	  temporary files.
+
+Mon Feb  4 21:52:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (DelegateClass): use define_method instead of
+	  module_eval to improve performance.  [ruby-dev:33586]
+
+Mon Feb  4 16:44:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (darwin): NSIG is not defined if _XOPEN_SOURCE > 500L.
+	  [ruby-dev:33584]
+
+Mon Feb  4 14:51:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_enc_symname2_p): support "!", "!=" and "!~".
+	  [ruby-dev:33592]
+
+Mon Feb  4 13:58:42 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator.preserved, DelegateClass.methods): extend
+	  shouldn't be delegated. [ruby-dev:32987], etc.
+
+Mon Feb  4 08:59:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::[]): no more transition
+	  extend(CGI::Value).  a patch from <tommy AT tmtm.org> in
+	  [ruby-dev:33583].
+
+Sun Feb  3 21:13:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_numeric.rb: forgot to add this (at r15360).
+
+	* test/ruby/test_file_exhaustive.rb: add tests to achieve over 80% test
+	  coverage of file.c.
+
+Sat Feb  2 20:06:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime
-	  a bit faster.  a patch from Alexander Dymo <dymo@ukrpost.ua> in
+	  a bit faster.  a patch from Alexander Dymo <dymo AT ukrpost.ua> in
 	  [ruby-core:15337].
 
-Fri Jun 13 11:50:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Feb  2 17:40:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (time_cmp): Time.<=> no longer supports comparison with
+	  numeric. [ruby-core:15332]
+
+Sat Feb  2 09:53:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (darwin): disabled fat-binary support which confuses
+	  configure much, since ``universal'' implies hidden cross-compiling.
+	  TODO: ruby and libruby.bundle might be possible to bound with `lipo'
+	  after builds for each archs.  Anyway, config.h and rbconfig.rb must
+	  be separated definitely at least.
+
+Sat Feb  2 09:28:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (limited_big_rand): fix buffer overflow when SIZEOF_BDIGITS
+	  is 2.  fixed by Kenta Murata.  [ruby-dev:33565]
+
+Fri Feb  1 21:42:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (darwin): _XOPEN_SOURCE is necessary to make ucontext_t
+	  consistent with the library implementation of MacOS X 10.5.
+	  [ruby-dev:33461]
+
+	* configure.in (darwin): ucontext on PowerPC MacOS X 10.5 is broken.
+
+Fri Feb  1 11:44:22 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb (C_ESC): use octal escape to avoid
+	  "\x09for (;;) ..." to be interpret the first character 0x9f.
+
+Thu Jan 31 23:06:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_bignum.rb: suppress warnings during test.
+
+	* test/ruby/test_enum.rb: ditto.
+
+	* test/ruby/test_integer.rb: add tests to achieve over 90% test
+	  coverage of numeric.c.
+
+	* test/ruby/test_float.rb: ditto.
+
+	* test/ruby/test_fixnum.rb: ditto.
+
+	* test/ruby/test_numeric.rb: ditto.
+
+	* test/ruby/test_pack.rb: add tests to achieve over 90% test coverage
+	  of pack.c.
+
+Thu Jan 31 17:30:42 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* marshal.c (r_object0): no need to call r_entry for immediate values.
+
+Thu Jan 31 15:46:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/ri/formatter.rb (output): add accessor.
+
+	* lib/rdoc/ri/display.rb (page): replace @formatter.output instead of
+	  $stdout.
+
+Thu Jan 31 15:06:50 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): call r_entry/r_leave to call proc when
+	  TYPE_FIXNUM, TYPE_NIL, TYPE_TRUE, TYPE_FALSE, TYPE_SYMBOL.
+
+Thu Jan 31 14:03:38 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/ri/display.rb (display_method_list, display_class_list):
+	  use @formatter.raw_print_line instead of puts.
+
+	* lib/rdoc/ri/driver.rb (select_methods): new method to collect all
+	  instance/class methods which match with passed pattern.
+
+	* lib/rdoc/ri/driver.rb (run): use class_cache's result directly
+	  instead of select_classes' because it's removed now.
+
+	* lib/rdoc/ri/driver.rb (run): search methods when passed name is not
+	  class name. [ruby-core:15309]
+
+Thu Jan 31 08:31:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ext/extmk.rb, instruby.rb): inlined $(MAKE) so that can
+	  be executed even with -n.
+
+Thu Jan 31 06:24:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_close_read): replaces fptr with the tied writer if
+	  duplex.
+
+	* io.c (rb_io_close_write): unties the tied IO for writing if duplex.
+	  [ruby-dev:33532]
+
+Thu Jan 31 02:22:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (open_key_args): allow encoding key to take two encoding
+	  names.  a patch from <rubikitch AT ruby-lang.org>.  [ruby-dev:33540]
+
+Thu Jan 31 02:15:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (dsym): allow empty symbols.  [ruby-core:15248]
+
+Thu Jan 31 00:01:51 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (select_internal): fix SEGV by `select [STDIN],nil,[STDIN]'.
+	  fixed by Petr Chromec.
+	  http://rubyforge.org/tracker/index.php?func=detail&aid=17275&group_id=426&atid=1698
+
+Wed Jan 30 17:32:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/*.c: add GB12345, UCS-{2,4}{BE,LE}.
+
+Wed Jan 30 14:32:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/ri/driver.rb (cache_file_for): shouldn't use `:' in filename.
+
+Wed Jan 30 14:27:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_succ): use wrapped character as a carry for
+	  ASCII incompatible encoding.
+
+Wed Jan 30 12:26:59 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/utf_16be.c (UTF16_IS_SURROGATE_FIRST): avoid branch.
+	  (UTF16_IS_SURROGATE_SECOND): ditto.
+	  (UTF16_IS_SURROGATE): defined.
+	  (utf16be_mbc_enc_len): validation implemented.
+
+	* enc/utf_16le.c (UTF16_IS_SURROGATE_FIRST): avoid branch.
+	  (UTF16_IS_SURROGATE_SECOND): ditto.
+	  (UTF16_IS_SURROGATE): defined.
+	  (utf16le_mbc_enc_len): validation implemented.
+
+Wed Jan 30 12:06:43 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* bignum.c (rb_cstr_to_inum): '0_2' is a valid representation.
+
+Wed Jan 30 11:57:50 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bootstraptest/runner.rb: fix -I../../hoge case.
+
+Wed Jan 30 01:25:16 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_range.rb: add tests to achieve over 90% test coverage
+	  of range.c.
+
+Wed Jan 30 00:09:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/euc_tw.c (euctw_mbc_enc_len): validation implemented.
+
+Tue Jan 29 22:58:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_enumerator.rb: add tests to achieve over 90% test
+	  coverage of enumerator.c.
+
+	* test/ruby/test_enum.rb: add for enum.c.
+
+Tue Jan 29 22:29:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enumerator.c: fix documents.
+
+Tue Jan 29 22:27:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* range.c: fix SEGV by ("a" .. "z").step(2 ** 30) { }.
+
+Tue Jan 29 21:59:16 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/euc_tw.c (euctw_islead): 0x8e is a leading byte.
+
+Tue Jan 29 21:55:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c: move object allocation out of blocking_region.
+	  [ruby-dev:33139]
+
+Tue Jan 29 20:37:36 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/make_transdb.rb: add for make transdb.h.
+
+	* dmytranscode.c: add for miniruby.
+
+	* enc/gbk.c (gbk_left_adjust_char_head, gbk_is_allowed_reverse_match):
+	  fix odd regexp match. [ruby-dev:33502]
+
+Tue Jan 29 20:17:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32}/Makefile.sub (MINIOBJS): add dmytranscode.$(OBJEXT).
+
+Tue Jan 29 19:39:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in, common.mk: fix rule for dmytranscode.o.
+
+Tue Jan 29 19:03:16 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/japanese.c (rb_to_Windows_31J): to 'Windows-31J'.
+
+	* common.mk: add rules for transdb.h.
+
+	* transcode.c (init_transcoder_table): use transdb.h.
+
+Tue Jan 29 18:05:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (encdb_{replicate,alias,dummy,declare}): define only if
+	  NO_ENCDB_H is not defined.
+
+Tue Jan 29 17:54:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/gbk.c (EncLen_gbk): too short. [ruby-dev:33497]
+
+Tue Jan 29 17:25:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dmyencoding.c, encoding.c (enc_init_db, NO_ENCDB_H):
+	  miniruby doesn't use encdb.
+
+	* common.mk: encdb.h use miniruby.
+
+Tue Jan 29 17:37:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/gb18030.c (gb18030_mbc_enc_len): validation implemented.
+
+Tue Jan 29 17:01:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/ifchange: remove $temp when unchanged.
+
+Tue Jan 29 16:59:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* insns.def (toregexp): generate a regexp from strings instead of one
+	  string.
+
+	* re.c (rb_reg_new_ary): defined for toregexp.  it concatenates
+	  strings after each string is preprocessed.
+
+	* compile.c (compile_dstr_fragments): split from compile_dstr.
+	  (compile_dstr): call compile_dstr_fragments.
+	  (compile_dregx): defined for dynamic regexp.
+	  (iseq_compile_each): use compile_dregx for dynamic regexp.
+
+	  [ruby-dev:33400]
+
+Tue Jan 29 16:25:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk, ext/extmk.rb: always make encdb.h.
+
+Tue Jan 29 12:53:39 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/gbk.c: add GBK, CP936 and CP949.
+
+	* enc/euc_kr.c: remove CP949.
+
+	* enc/euc_cn.c: remove CP936 and rename to gb2312.c
+
+	* enc/gb2312.c: GB2312 is preferred MIME name.
+
+Tue Jan 29 03:01:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (reg_fragment_setenc_gen): US-ASCII script special code.
+
+	* parse.y (reg_fragment_check_len, reg_compile_gen): no need such
+	  trick.
+	  [ruby-dev:33399]
+
+	* test/ruby/test_m17n.rb (test_regexp_usacii_literal): add tests.
+
+Tue Jan 29 01:38:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk ($(srcdir)/revision.h): no need to show ifchange execution
+	  because ifchange echos updated or unchanged.
+
+Tue Jan 29 01:26:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (up): use last changed revision.
+
+	* common.mk (up): force to update revision.h.
+
+Tue Jan 29 00:12:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): should be US-ASCII.
+
+Tue Jan 29 00:10:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-mode-set-encoding): updates magic comment.
+
+Mon Jan 28 23:47:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (rb_id2str, ripper_initialize, Init_ripper):
+	  use rb_usascii_str_new2. [ruby-dev:33449]
+
+Mon Jan 28 19:37:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (ole_cp2encoding): new function.
+
+	* ext/win32ole/win32ole.c (ole_wc2vstr, ole_variant2val, fole_missing):
+	  set encoding to result.
+
+	* ext/win32ole/win32ole.c (fole_s_set_code_page, Init_win32ole): set
+	  default encoding.
+	  [ruby-dev:33433]
+
+Mon Jan 28 11:17:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c, parse.y, re.c: use rb_ascii8bit_encoding.
+
+Mon Jan 28 17:54:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_7.h: add dummy encoding UTF-7 and its alias CP65000.
+
+Mon Jan 28 17:41:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/utf_8.c: add alias CP65001.
+
+Mon Jan 28 15:33:23 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/big5.c (big5_mbc_enc_len): validation implemented.
+
+Mon Jan 28 13:02:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/euc_kr.c (euckr_mbc_enc_len): validation implemented.
+
+Mon Jan 28 11:24:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_str_new): encoding of UTF-8 literal string in
+	  US-ASCII script is UTF-8. [ruby-dev:33406]
+
+Mon Jan 28 10:25:59 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_m17n.rb (test_magic_comment): add test.
+
+Mon Jan 28 09:34:54 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (help): use double quotes for nmake.
+
+Mon Jan 28 00:39:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_set_encode): check if encoding is ASCII compatible.
+
+Mon Jan 28 01:21:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_open_file): should check NUL in path.
 	  <http://www.rubyist.net/~matz/20080125.html#c01>.
@@ -199,60 +41180,4679 @@ Fri Jun 13 11:50:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (next_argv): ditto.
 
-	* io.c (rb_io_s_foreach): ditto.
+Sun Jan 27 23:33:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix for left justify flag.
+
+	* sprintf.c (rb_str_format): zero-precision zero bug revised.
+	  [ruby-dev:33419]
+
+Sun Jan 27 23:20:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h: precise mbclen API redesigned to avoid
+	  inline functions.
+	  (onigenc_mbclen_charfound): removed.
+	  (onigenc_mbclen_needmore): removed.
+	  (onigenc_mbclen_recover): removed.
+	  (ONIGENC_MBCLEN_CHARFOUND): removed.
+	  (ONIGENC_MBCLEN_CHARFOUND_P): defined.
+	  (ONIGENC_MBCLEN_CHARFOUND_LEN): defined.
+	  (ONIGENC_MBCLEN_INVALID): removed.
+	  (ONIGENC_MBCLEN_INVALID_P): defined.
+	  (ONIGENC_MBCLEN_NEEDMORE): removed.
+	  (ONIGENC_MBCLEN_NEEDMORE_P): defined.
+	  (ONIGENC_MBCLEN_NEEDMORE_LEN): defined.
+	  (ONIGENC_MBC_ENC_LEN): use onigenc_mbclen_approximate.
+
+	* regenc.c (onigenc_mbclen_approximate): defined.
+
+	* include/ruby/encoding.h (MBCLEN_CHARFOUND): removed.
+	  (MBCLEN_INVALID): removed.
+	  (MBCLEN_NEEDMORE): removed.
+	  (MBCLEN_CHARFOUND_P): defined.
+	  (MBCLEN_INVALID_P): defined.
+	  (MBCLEN_NEEDMORE_P): defined.
+	  (MBCLEN_CHARFOUND_LEN): defined.
+	  (MBCLEN_NEEDMORE_LEN): defined.
+
+	* encoding.c: use new API.
+
+	* re.c: ditto.
+
+	* string.c: ditto.
+
+	* parse.y: ditto.
+
+Sun Jan 27 22:55:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (value_expr_gen): reverted r12880.  [ruby-dev:33388]
+
+Sun Jan 27 22:33:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix for octal with precision.
+	  [ruby-dev:33411]
+
+Sun Jan 27 22:31:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-mode-set-encoding): automatically insert
+	  encoding magic comment.
+
+	* misc/ruby-mode.el (ruby-mode): set ruby-mode-set-encoding to buffer
+	  local before-save-hook.
+
+Sun Jan 27 19:51:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_inspect): avoid exception by
+	  "\#\xa1".force_encoding("euc-jp").inspect.
+
+Sun Jan 27 19:07:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_succ): warning suppressed.
+
+Sun Jan 27 18:18:13 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (help): show major targets.
+
+Sun Jan 27 17:54:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c: raise error when no output encoding is given.
+
+Sun Jan 27 17:20:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_succ): don't increment/decrement codepoint.
+
+Sun Jan 27 16:03:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a.
+
+Sun Jan 27 16:27:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8: update nkf.
+
+Sun Jan 27 16:25:27 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_source): set encoding as regexp encoding.
+
+Sun Jan 27 05:56:39 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_preprocess): force fixed encoding when ASCII
+	  incompatible source string.
+
+Sat Jan 26 23:46:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): zero-precision zero should be empty.
+	  [ruby-dev:33363]
+
+	* sprintf.c (rb_str_format): not prepend octal prefix to negative or
+	  zero value.  [ruby-dev:33363], [ruby-dev:33367]
+
+Sat Jan 26 23:42:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing.
+
+Sat Jan 26 19:08:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (w_object): dump string encoding in USERDEF.
+	  [ruby-dev:33401]
+
+Sat Jan 26 17:42:23 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): validate argument expr of "next"
+	  statement.
+
+	* bootstraptest/test_syntax.rb: add a test.
+
+Sat Jan 26 17:22:46 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, compile.h: fix to calculate correct stack depth
+	   at each instruction.
+
+Sat Jan 26 09:41:02 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/doctype.rb, test/rss/test_maker_itunes.rb: replace
+	  multi-byte string.
+
+	* test/json/{test_json.rb, test_json_unicode.rb}:
+	  add magic comment.
+
+Sat Jan 26 09:30:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_usascii_encindex): added prototype.
+
+	* include/ruby/intern.h (rb_usascii_str_new, rb_usascii_str_new2):
+	  ditto.
+
+Sat Jan 26 09:17:13 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when
+	  empty string (len == 0).
+
+Sat Jan 26 03:41:53 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_initialize): set default script encoding as US-ASCII.
+
+	* ruby.c (load_file): ditto.
+
+	* ruby.c (process_options): set script encoding of -e from locale
+	  except when -K is specified.
+
+	* ruby.c (load_file): set script encoding of stdin from locale except
+	  when -K is specified. [ruby-dev:33375]
+
+Sat Jan 26 02:51:06 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, compile.h: fix stack pointer issues.
+	  calculate correct stack depth at compile time.
+
+	* insns.def (emptstack): remove it and add a new insn "adjuststack".
+
+	* bootstraptest/test_knownbug.rb: move/remove fixed test.
+
+	* bootstraptest/test_syntax.rb: ditto.
+
+Sat Jan 26 00:17:18 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_usascii_new{,2}: defined.
+	  (rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
+	  string.
+
+	* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
+	  (rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
+	  use rb_str_ascii_new.
+
+	* array.c (recursive_join, inspect_ary): ditto.
+
+	* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
+	  rb_mod_to_s): ditto.
+
+	* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
+	  env_clear, env_to_s, env_inspect): ditto.
+
+	* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
+
+	* bignum.c (rb_big2str): ditto.
+
+	* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
+	  file_inspect_join, Init_file): ditto.
 
-	* io.c (rb_io_s_readlines): ditto.
+	* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
 
-	* io.c (rb_io_s_read): ditto.
+Sat Jan 26 01:35:46 2008  Tanaka Akira  <akr@fsij.org>
 
-Wed Jun 11 15:23:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (r_byte): use getbyte instead of getc.
+	  (marshal_load): ditto.
+	  [ruby-dev:33264]
+
+Sat Jan 26 00:43:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_getline_fast): don't care ASCII incompatible encoding.
+	  (prepare_getline_args): generate a newline according to IO encoding
+	  when necessary.
+	  (rb_io_getline_1): call rb_io_getline_fast only for ASCII
+	  compatible encoding.
+
+Fri Jan 25 21:49:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_buf_cat_ascii): use rb_enc_cr_str_buf_cat.
+
+Fri Jan 25 19:38:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (version.$(OBJEXT)): depends on $(srcdir)/revision.h.
+
+	* common.mk (revision.h): extracts revision number with ``svn info''.
+
+	* common.mk (up): target to update from the repository.
+
+	* Makefile.in, {win,bcc}32/Makefile.sub (IFCHANGE): tool to update a
+	  file if changed.
+
+	* tool/ifchange: for unixen.
+
+	* win32/ifchange.bat: some fix
+
+Fri Jan 25 17:12:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file): set default to ASCII-8BIT explicitly if -K
+	  option is not given.
+
+Fri Jan 25 16:31:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_str_buf_cat_ascii): declared.
+
+	* string.c (rb_str_buf_cat_ascii): defined.
+
+	* re.c (rb_reg_s_union): use rb_str_buf_cat_ascii to support ASCII
+	  incompatible encoding.
+
+Fri Jan 25 16:11:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options, load_file, rb_load_file): propagates script
+	  encoding by -K to libraries.  [ruby-dev:33156]
+
+Fri Jan 25 15:56:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (cmdline_arguments): split argc and argv from cmdline_options.
+
+	* ruby.c (process_options): not set encoding of -e option from -E
+	  option if they are not compatible.
+
+Fri Jan 25 13:15:23 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (proc_options, process_options, load_file): shouldn't effect
+	  --encoding to script encoding. [ruby-dev:33169]
+
+Fri Jan 25 10:31:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* */*.bat: set svn:mime-type to text/batch.
+
+Thu Jan 24 23:23:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* enum.c (enum_one, enum_take_while, enum_drop_while): fix documents.
+
+Thu Jan 24 21:46:24 2008  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (reg_fragment_setenc_gen): associate ASCII-8BIT only if
+	  str has only ASCII characters.
+
+Thu Jan 24 20:46:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_m17n.rb: follow to the following changes.
+
+Thu Jan 24 20:21:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parser.y (parser_str_new): automatically update string literal's
+	  encoding from US-ASCII to ASCII-8BIT when script encoding is US-ASCII
+	  and the string includes non-ascii bytes. [ruby-dev:33348]
+
+	* parser.y (reg_fragment_check_gen, reg_compile_gen): automatically
+	  update regexp literal's encoding from US-ASCII to ASCII-8BIT when
+	  script encoding is US-ASCII, the regexp has no kcode option and the
+	  regexp includes non-ascii bytes. [ruby-dev:33353]
+
+Thu Jan 24 19:36:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead
-	 object_id with printf.  [ruby-dev:33347]
+	  object_id with printf.  [ruby-dev:33347]
+
+Thu Jan 24 19:29:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (remove_sign_bits): returns pointer to the first char to
+	  be used, instead of copying.
+
+	* sprintf.c (rb_str_format): negative indicator dots should come
+	  before sign digits always.  [ruby-dev:33224]
+
+Thu Jan 24 18:19:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_enc_is_newline): parenthesized arguments.
+
+Thu Jan 24 18:14:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_reg_fixed_encoding_p): no need to treat ASCII-8BIT specially.
+
+Thu Jan 24 16:53:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): 7bit clean regexp should be US-ASCII.
+	  [ruby-dev:33346]
+
+Thu Jan 24 16:31:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_getline_fast): the end point of left_char_head()
+	  must be the last character.  [ruby-cvs:22445]
+
+Thu Jan 24 16:24:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (reg_fragment_setenc_gen): recognize regexp with option n as
+	  as ASCII-8BIT instead of US-ASCII. [ruby-dev:33339]
+
+Thu Jan 24 15:44:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (collect_bang_i): use rb_ary_store() to avoid potential
+	  memory corruption.  a patch from Yusuke Endoh <mame@tsg.ne.jp>
+	  in [ruby-dev:33328].
+
+	* array.c (ITERATE): remove unnecessary macro.
+
+	* array.c (sort_1): remove ary_sort_check().  in-place sort keep
+	  original elements even when it's modified.
+
+	* array.c (sort_2): ditto.
+
+Thu Jan 24 15:09:40 2008  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (make_time_t): revert round trip test.  [ruby-dev:33058]
+
+Thu Jan 24 11:14:56 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is
+	  not compatible with any other encoding.
+
+Thu Jan 24 07:34:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (STR_NEW0): set encoding as US-ASCII.
+
+Thu Jan 24 03:47:41 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/text.rb, lib/rubygems/open-uri.rb, lib/open-uri.rb,
+	  test/logger/test_logger.rb, test/ruby/test_regexp.rb:
+	  fix tests. [ruby-dev:33336]
+
+Thu Jan 24 03:23:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_each_line): use memchr(3) for faster newline
+	  search.
+
+	* io.c (appendline): remove unused arguments
+
+	* io.c (rb_io_getline_fast): make much simpler (and faster).
+
+Thu Jan 24 02:13:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* insns.def (expandarray): fix stack inc.  [ruby-dev:32892]
+
+	* bootstraptest/test_knownbug.rb, test_massign.rb: move a fixed test.
+
+Thu Jan 24 01:00:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.{c, h} (rb_usascii_encoding): added.
+
+	* parse.y (parser_str_new, rb_intern3): ascii only string literal is
+	  US-ASCII.
+
+	* ruby.c (proc_optionc): -Kn means ASCII-8BIT.
+
+Wed Jan 23 23:54:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* sprintf.c: fix comment.  [ruby-dev:33275]
+
+	* math.c: fix comment.  [ruby-dev:33276]
+
+Wed Jan 23 22:47:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_struct.rb: add tests to achieve over 90% test
+	  coverage of struct.c.
+
+	* test/ruby/test_sprintf.rb: ditto for sprintf.c.
+
+	* test/ruby/test_math.rb: ditto for math.c.
+
+Wed Jan 23 22:14:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/japanese.c (rb_from_Windows_31J, rb_to_Windows_31J):
+	  provisional workaround for Windows-31J.  [ruby-dev:33320]
+
+Wed Jan 23 15:25:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_strftime): copy encoding from format.  [ruby-dev:33303]
+
+Wed Jan 23 15:04:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_make_independent): should set length.
+
+	* string.c (rb_str_associate): hide associated array from ObjectSpace.
+
+	* string.c (rb_str_associated): return associated array with freezing
+	  instead of false.  [ruby-dev:33282]
+
+	* string.c (rb_str_freeze): freeze associated array together.
+
+Wed Jan 23 13:39:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_prepare_re): fix SEGV by
+	  /a/ =~ "aa".force_encoding("utf-16be").
+
+Wed Jan 23 11:53:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_mod_check, str_nth, str_offset): constified.
+
+	* string.c (rb_str_dump): dump in ASCII-8BIT always.
+
+Wed Jan 23 10:18:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_method.c (rb_export_method): set ruby_vm_redefined_flag for
+	  visibility change as well.  reported by K.Kosako in
+	  http://d.hatena.ne.jp/kkos/20080122#1201012720.
+
+Tue Jan 22 22:26:23 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_bignum.rb: change some tests because rational
+	  redefines Bignum#quo and Bignum#**.
+
+Tue Jan 22 20:58:15 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): need to output sodir rule.
+
+Tue Jan 22 19:37:16 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): lib files shouldn't depend on install
+	  dir because if the dir is newer than lib files, lib files will be
+	  always copied.
+
+Tue Jan 22 17:52:52 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/utf_16_32.c: Streamline parentheses, add more
+	  'static' qualifiers.
+
+Tue Jan 22 12:57:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in (MINIRUBY): remove -I$(EXTOUT)/$(arch) from
+	  MINIRUBY since miniruby might not be able to load DLL.
+
+	* test/ruby/test_m17n.rb: move tests from bootstrap test.
+
+	* encoding.c (enc_find): should check name if ASCII compatible.
 
-Wed Jun 11 15:00:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_end_with): should check character boundary.
+
+	* encoding.c (rb_enc_compatible): encoding must be ASCII
+	  compatible before checking ENC_CODERANGE_7BIT.
+
+	* encoding.c (rb_enc_compatible): wrong compatibility condition.
+	  [ruby-dev:33273]
+
+Tue Jan 22 09:26:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char): iterates over a shadow.
+	  [ruby-dev:33243]
+
+Tue Jan 22 08:59:52 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/formatter.rb:  Indent labeled lists like note lists.
+
+	* test/rdoc/test_rdoc_ri_overstrike_formatter.rb:  Added.
+
+	* test/rdoc/test_rdoc_ri_formatter.rb:  Added tests.
+
+Tue Jan 22 04:40:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (rb_intern3): do not call rb_enc_mbclen() if *m is
+	  ASCII.  [ruby-talk:287225]
+
+	* string.c (rb_str_each_line): use rb_enc_is_newline() to gain
+	  performance if the record separator ($/) is not modified.
+
+Tue Jan 22 01:15:51 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ChangeLog: format-time-string under C locale. [ruby-dev:33261]
+
+Tue Jan 22 00:45:12 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_bignum.rb: add tests for bignum.c.
+
+Tue Jan 22 00:30:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (big_shift): fix a bug that caused infinite loop when
+	  left shifting.
+
+Mon Jan 21 20:09:38 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (marshal_load): initialize the cache.
+
+Mon Jan 21 19:42:42 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c, enc/trans/utf_16_32.c, test/ruby/test_transcode.rb:
+	  added UTF-32BE and UTF-32LE conversions.
+
+Mon Jan 21 14:36:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_transcode): initialize transcoder in
+	  rb_transcoding.  [ruby-dev:33234]
+
+	* transcode_data.h (rb_transcoding): transcoder constified.
+
+Mon Jan 21 12:50:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
+
+Mon Jan 21 12:35:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (transcode_loop, str_transcoding_resize): use unsigned
+	  char.  [ruby-dev:33232]
+
+	* transcode_data.h (rb_transcoding, rb_transcoder): removed callback
+	  parameters.
+
+	* enc/trans/japanese.c: ditto.
+
+	* enc/trans/utf_16_32.c: parenthesized bit-or operands.
+
+Mon Jan 21 11:59:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char): move forward.  [ruby-dev:33231]
+
+Mon Jan 21 06:40:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (transcode_dispatch): constified return value.
+
+	* transcode_data.h (rb_transcoding): include pointer to rb_transcoder
+	  and auxiliary data.
+
+	* transcode_data.h (rb_transcoder): all callback functions should have
+	  their own parameters.
+
+	* enc/trans/{japanese,single_byte}.c: constified.
+
+Mon Jan 21 03:45:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char): advance offset before get next char
+	  length.  [ruby-dev:33211]
+
+Sun Jan 20 20:00:20 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c, enc/trans/utf_16_32.c, test/ruby/test_transcode.rb:
+	  added UTF-16LE conversions.
+
+	* fixed changelog for last commit
+
+Sun Jan 20 17:54:00 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* added changelog for last commit
+
+Sun Jan 20 15:08:08 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/trans/utf_16_32.c: new file, currently implementing
+	  UTF-16BE conversions only.
+
+	* test/ruby/test_transcode.rb: Added tests for UTF-16BE;
+	  made check_both_ways() use force_encoding differently.
+
+	* transcode_data.h, transcode.c: Support for more conversion
+	  functions.
+
+Sun Jan 20 13:06:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char): performance improvement, and stop if
+	  shortened in the block.  [ruby-dev:33189]
+
+Sun Jan 20 09:12:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: use -Ks when read insns.def. [ruby-dev#33185]
+
+	* parse.y: fix -e and stdin strings aren't set encoding.
+
+Sun Jan 20 05:12:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/make_encdb.rb: fix duplication check.
+
+Sun Jan 20 05:03:46 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ascii.c: remove definition of replica KOI8-U.
+
+Sun Jan 20 00:33:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/koi8_u.c: added.
+
+	* regenc.c, enc/utf_8.c, enc/unicode.c, enc/gb18030.c: add ARG_UNUSED.
+
+Sat Jan 19 22:41:39 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (coderange_scan): don't call mbclen functions for ASCII
+	  characters with ASCII compatible encoding.
+
+Sat Jan 19 21:00:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rdoc/template.rb (RDoc): defined to avoid uninitialized constant
+	  error by `./ruby test/rubygems/test_gem_server.rb'.
+
+Sat Jan 19 20:41:29 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (enc_new): don't free rb_encoding to avoid SEGV by
+	  `miniruby -e exit' on x86_64 GNU/Linux.
+
+Sat Jan 19 18:40:19 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (once): use an instance variable which points a hash
+	  as cache. [experimental]
+
+Sat Jan 19 17:21:29 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: parse's hints as an
+	  experimental function has been removed.
+
+Sat Jan 19 11:21:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (sigsetjmp): check if available.
+
+	* eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.
+
+Sat Jan 19 11:10:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: Remove wrong assumptions about Cygwin.  a patch from
 	  Corinna Vinschen in [ruby-Bugs-17018].
 
-Mon Jun  9 18:09:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jan 19 09:23:14 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_set_safe_array): should not use
+	  recursive calling.
+
+	* test/win32ole/test_win32ole_variant.rb: ditto.
+
+Sat Jan 19 08:58:47 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup: Remove ListBase and Line constants.
+
+	* lib/rdoc/ri: Allow output IO to be specified.
+
+	* test/rdoc/parser/test_parse_c.rb: Move up one level, fixed.
+
+	* test/rdoc/parser/test_rdoc_markup_attribute_manager.rb: Renamed to
+	  match new class name, updated to match new classes.
+
+	* test/rdoc/test_rdoc_ri_formatter.rb: Start of RI formatting tests.
+
+	* test/rdoc/test_rdoc_ri_attribute_manager.rb: Start of
+	  RDoc::RI::AttributeManager tests.
+
+	* test/rdoc/test_simple_markup.rb: Moved to match new class name.
+
+Sat Jan 19 08:35:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_prepare): get encoding from the first line.
+	  [ruby-dev:33168]
+
+	* ruby.c (load_file): set encoding to input with set_encoding.
+
+Sat Jan 19 03:46:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (thread_create_core): prohibit thread creation in the
+	  frozen thread group.  a patch in [ruby-dev:33176] from sheepman
+	  <sheepman AT sheepman.sakura.ne.jp>.
+
+	* thread.c (thread_create_core): should inherit ThreadGroup from
+	  the current thread.
+
+Sat Jan 19 00:37:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): set result encoding for wider width.
+
+Sat Jan 19 00:13:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (w32_wait_events): shouldn't invoke interrupt handle
+	  by timer_thread.
+
+Fri Jan 18 23:49:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_create_core): set thread group before creating
+	  thread.
+
+Fri Jan 18 20:19:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (ripper_initialize): too early to set parser->enc.
+
+Fri Jan 18 20:03:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak (BASERUBY): nmake cannot execute ruby correctly
+	  if the path of ruby.exe is quoted.
+
+	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
+	  a space will be inserted on the top of the line.
+
+Fri Jan 18 17:56:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h, insnhelper.h, thread_pthread.h, vm_core.h, vm_opts.h:
+	  prefixed include guards with RUBY.
+
+	* id.h: added include guard.
+
+	* regenc.h, regint.h, regparse.h: prefixed include guards with
+	  ONIGURUMA.
+
+Fri Jan 18 15:57:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_cleanup_func): ignore errors from destroying mutex
+	  of dead thread.  [ruby-core:15069]
+
+	* thread_pthread.c, thread_win32.c (native_thread_destroy): ditto.
+
+Fri Jan 18 15:56:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_name_list_i, rb_enc_aliases_enc_i): freeze
+	  element strings to be returned.
+
+Fri Jan 18 14:36:34 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_m17n.rb (test_str_dump): added test for
+	  String#dump. [ruby-dev:33142]
+
+Fri Jan 18 12:25:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (load_encoding): check if successfully loaded.
+
+	* encoding.c (rb_enc_find_index): use original encoding name to
+	  replicate loaded encoding instead alias.
+
+Fri Jan 18 09:43:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_char_to_option_kcode): Regexp switch `s' should mean
+	  Windows-31J, as wells as `-Ks'.
+
+Fri Jan 18 09:22:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_initialize): explicitly call rb_ascii8bit_encoding().
+
+	* parse.y (parser_prepare): lex_input may not be have encoding (e.g. IO).
+
+	* parse.y (rb_parser_compile_string): set encoding from input string.
+
+	* encoding.c (rb_enc_find_index): use ASCII-8BIT if loading known
+	  encoding failed.
+
+	* parse.y (ripper_initialize): move parser->enc initialization.
+
+	* encoding.c (rb_enc_aliases_enc_i): exclude non alias names from
+	  Encoding.aliases.
+
+	* encoding.c (rb_enc_find_index): use original encoding name to
+	  load DLL.
+
+Fri Jan 18 07:06:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (Init_IO): stdin/stdout may not be duplex.
+
+Fri Jan 18 04:27:57 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* sample/rdoc/markup/rdoc2latex.rb:  Fix for new namespacing.
+
+	* lib/rdoc/markup/to_latex.rb:  Fix namespacing.
+
+Fri Jan 18 02:02:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb (assert_valid_syntax): added.
+
+	* bootstraptest/test_knownbug.rb: added test for [ruby-list:44479]
+
+Fri Jan 18 01:48:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): check argument number to
+	  attr_reader.  [ruby-core:15120]
+
+Fri Jan 18 00:49:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_check_readable): flush tied write IO too.
+
+	* io.c (Init_IO): tie stdin with stdout.  [ruby-core:15107]
+
+Fri Jan 18 00:23:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_free): removed since rb_encoding may be used while
+	  cleanup.
+
+Fri Jan 18 00:17:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/euc_cn.c: split from enc/euc_kr.c.
+
+Fri Jan 18 00:03:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_init): use default external encoding
+	  if nothing is given.  a patch from sheepman <sheepman AT
+	  sheepman.sakura.ne.jp> in [ruby-dev:33159].
+
+Thu Jan 17 23:56:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (encdb.h): give output file name to make_encdb.rb.
+
+	* encoding.c (enc_table): simplified.
+
+	* encoding.c (enc_register_at): lazy loading.  [ruby-dev:33013]
+
+	* regenc.h (ENC_DUMMY): added.
+
+	* enc/make_encdb.rb: now emits macros only.
+
+	* enc/iso_2022_jp.h: split from encoding.c.
+
+Thu Jan 17 21:48:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_char_to_option_kcode): fixed typo.
+
+Thu Jan 17 21:01:25 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (Date::Infinity#<=>): didn't work.  A patch from
+	  Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
+	  This is a bug obviously.  However it didn't affect the library's
+	  functions.
+
+	* lib/date.rb, lib/date/format.rb: some trivial changes.
+
+Thu Jan 17 13:07:18 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_dump): preserve the encoding of source string
+	  if it is ASCII compatible.  otherwise, add '.force_encoding()'
+	  for ugly work around.  maybe we should implement some other way
+	  to keep non ASCII encoding in dumped string.  [ruby-dev:33142]
+
+Thu Jan 17 10:30:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fwrite): always flush IO on tty, even without newlines.
+	  [ruby-core:15107]
+
+Wed Jan 16 22:45:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_register_at): make own copy.  [ruby-dev:33136]
+
+Wed Jan 16 18:03:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open, rb_io_s_popen): clear temporary object to release
+	  and prevent from GC.
+
+Wed Jan 16 17:55:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (fix_quo): typo. a patch from Shin-ichiro HARA
+	  <sinara AT blade.nagaokaut.ac.jp> in [ruby-dev:33130]
+
+Wed Jan 16 17:36:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/test_delegate.rb: add new test file for delegate.rb.
+
+Wed Jan 16 16:14:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.1: Fix grammar.
+
+Wed Jan 16 15:26:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (sys_fail2): get rid of unlimited alloca.
+
+	* io.c (mode_enc, pipe_open, rb_io_s_popen): ditto.
+
+	* load.c (rb_feature_p): ditto.
+
+	* object.c (rb_cstr_to_dbl): ditto.
+
+	* io.c (mode_enc): fixed uninitialized variable.
+
+Wed Jan 16 12:51:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_str_tmp_new, rb_str_shared_replace):
+	  prototype moved.
+
+Tue Jan 15 23:52:51 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/*: add ARG_UNUSED.
+
+	* enc/koi8_u.c: added.
+
+Tue Jan 15 23:00:08 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_{16,32}{be,le}.c: remove some ARG_UNUSED.  replace struct
+	  OnigEncodingST by OnigEncoding.
+
+Tue Jan 15 22:30:43 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (ENC_REGISTER): use &OnigEncoding*.
+	  (ENCINDEX_UTF_8): renamed from ENCINDEX_UTF8.
+	  (rb_enc_init): use ENC_REGISTER.
+
+	* include/ruby/oniguruma.h (OnigEncodingUTF8, ONIG_ENCODING_UTF8):
+	  removed.
+
+	* enc/*.c: remove use of &encoding_*; use enc argument instead.
+
+Tue Jan 15 18:44:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enc/utf_8.c: remove use of ONIG_ENCODING_UTF8 altogether; use
+	  enc argument instead.
+
+Tue Jan 15 18:05:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/utf_8.c (ONIG_ENCODING_UTF8): reverted.
+
+Tue Jan 15 18:01:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (MKFILES): add dependencies.
+
+Tue Jan 15 18:00:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enc/utf_8.c (OnigEncodingDefine): encoding name should be kept
+	  unchanged.
+
+Tue Jan 15 17:53:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/utf_8.c: renamed as IANA name.
+
+	* enc/Makefile.in: ditto.
+
+Tue Jan 15 16:59:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): encoding libraries cannot be loaded until
+	  load path is set.
+
+Tue Jan 15 15:09:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/setup.mak: strip out empty lines from CPP output.
+
+Tue Jan 15 14:57:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
+	  to get rid of ./ruby.exe.
+
+	* win32/enc-setup.mak: workaround for Borland make.
+
+Tue Jan 15 14:44:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby.
+
+Tue Jan 15 13:54:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32}/Makefile.sub (RUNRUBY): need to set archdir when
+	  invoking ruby.
+
+Tue Jan 15 13:43:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (us_ascii.o): add dependencies. [ruby-dev:33111]
+
+Tue Jan 15 03:41:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
 
-Sun Jun  8 06:08:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan 15 01:28:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk: simplified dummy objects dependencies.
+
+Tue Jan 15 01:19:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (OBJS): moved encoding.o from COMMONOBJS.
+
+	* common.mk (dmyencoding.o): added.  [ruby-dev:33099]
+
+	* configure.in, {win,bcc}32/Makefile.sub (MINIOBJS): added
+	  dmyencoding.o.
+
+	* dmyencoding.c (rb_locale_charmap): returns nil for miniruby.
+
+Tue Jan 15 00:05:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (appendline): specifying limit should not generate broken
+	  byte sequence.  strings should be rounded.  [ruby-dev:33088]
+
+Mon Jan 14 23:33:02 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb (Kconv.tolocale): argument is str.
+
+Mon Jan 14 23:31:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in (setup): add -I$(EXTOUT)/$(arch) to MINIRUBY.
+
+	* bootstraptest/runner.rb (main): expand -I directory path.
+
+Mon Jan 14 23:28:10 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/enc-setup.mak (BUILTIN_ENCOBJS): depends on enc/Makefile.in.
+
+Mon Jan 14 22:48:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead
+	  of using fixed index value.
+
+	* enc/Makefile.in (encsrcdir): make US-ASCII built-in.
+
+Mon Jan 14 22:25:02 2008  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* golf_prelude.rb: Shorter method name completion.  Same method
+	  used for const missing. do_while and do_until added.  Enumerator
+	  gains all of Array's abilities. Ex:
+	    '123'.m{|i|i*2} #=> "112233"
+	    '123'.pe #=> '123'.perm*' ' #=> "123 132 213 231 312 321"
+	  base on a patch from Darren Smith <darrenks AT ml1.net>.
+
+Mon Jan 14 21:10:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enc/us_ascii.c: wrong alias name: ANSI_X3.4-1986.
+
+	* rubytest.rb: add -I#{srcdir} to load encoding DLL.
+
+Mon Jan 14 18:53:58 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: clear thread structure.
+	  (TODO: survey that child process should clear mutex or not).
+
+	* bootstraptest/test_knownbug.rb, test_thread.rb: move a fixed test.
+
+Mon Jan 14 18:43:38 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/runner.rb: add "flunk" method.
+
+	* bootstraptest/test_knownbug.rb: fix to use flunk.
+
+Mon Jan 14 18:10:59 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.h: remove dangerous assembler sentence.
+
+Mon Jan 14 18:06:37 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_locale_encoding): return US-ASCII when charmap is
+	  nil.
+
+Mon Jan 14 16:12:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/shellwords.rb: scape should be an alias to shellescape.  a
+	  patch from Masahiro Kawato <m-kawato AT mwb.biglobe.ne.jp> in
+	  [ruby-dev:33060].
+
+Mon Jan 14 16:09:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.1: a patch to describe --encoding.  a patch from Yugui
+	  <yugui AT yugui.sakura.ne.jp> in [ruby-dev:33079].
+
+	* ruby.c: ditto.
+
+Mon Jan 14 13:49:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_prepare_re): initialize error message buffer.
+	  (rb_reg_search): ditto.
+	  (rb_reg_check_preprocess): ditto.
+	  (rb_reg_new_str): ditto.
+	  (rb_enc_reg_new): ditto.
+	  (rb_reg_compile): ditto.
+	  (rb_reg_initialize_m): ditto.
+	  (rb_reg_s_union_m): ditto.
+
+Mon Jan 14 12:33:07 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup*:  Renamespace from SM::SimpleMarkup to
+	  RDoc::Markup.
+
+Mon Jan 14 10:45:45 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/ascii.c: Exchanged order of arguments for one ENC_ALIAS
+
+Mon Jan 14 09:19:07 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/time.rb: do not reference Time directly from the inside of
+	  definitions. [ruby-dev:33059]
+
+Mon Jan 14 05:44:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/*.c: add replicas and aliases.
+
+	* enc/make_encdb.h: add duplicate and undefined check.
+
+Mon Jan 14 02:03:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/oniguruma.h: remove ONIG_ENCODING_* and OnigEncoding*
+	  which are not builtin.
+
+	* regenc.{c,h} (onigenc_mb2_code_to_mbclen, onigenc_mb4_code_to_mbclen):
+	  fix prototype.
+
+	* enc/big5.c, enc/euc_kr.c, enc/euc_tw.c, enc/gb18030.c,
+	  enc/koi8_r.c, enc/windows_1251.c: imported from Oniguruma.
+
+Sun Jan 13 22:47:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/make_encdb.h: sort encoding names by original name.
+
+	* encoding.c, enc/*.c: define replicas and aliases.
+
+Sun Jan 13 20:24:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c: add documents.
+
+Sun Jan 13 18:41:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): moved initialization from encdb.h.
+
+	* enc/make_encdb.rb (enc_name_list): constified.
+
+	* enc/make_encdb.rb (enc_init_db): moved some functions to encoding.c.
+
+Sun Jan 13 13:53:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file): local variable was not initialized when -x flag
+	  is given.
+
+	* ruby.c (load_file): script files should not be affected by locale.
+	  [ruby-dev:33054]
+
+Sun Jan 13 12:01:32 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/generators*: Reorganize RDoc generators.
+
+Sun Jan 13 11:41:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (ENCINDEX_EUC_JP, ENCINDEX_SJIS): removed.
+	  (rb_enc_init): EUC-JP and Shift_JIS are not builtin now.
+
+	* enc/Makefile.in: ditto.
+
+	* common.mk: ditto.
+
+	* ruby.c (proc_options): ditto.
+
+	* enc/shift_jis.c, enc/euc_jp.c: fixes for remove from builtin.
+
+Sun Jan 13 10:21:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_table): packed all enc_table stuff.
+
+Sun Jan 13 09:58:17 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_init): revert removing SJIS.
+
+	* enc/sjis.c: move to enc/shift_jis.c, to make encoding name equal to
+	  filename for convenience of loading lib.
+
+	* enc/shift_jis.c: moved from enc/sjis.c.
+
+	* common.mk: follows enc/shift_jis.c.
+
+	* enc/Makefile.in: ditto.
+
+Sun Jan 13 09:22:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (incs): includes encdb.h.
+
+Sun Jan 13 09:17:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc,win}32/Makefile.sub (MV): use move instead of ren.  [ruby-Bugs-17019]
+
+Sun Jan 13 01:52:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enc/make_encdb.rb: should work on Ruby 1.8.  [ruby-dev:33069]
+
+	* common.mk (encdb.h): pass enc dir from outside to make_encdb.rb.
+
+Sun Jan 13 00:01:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/make_encdb.rb: added. search enc/*.c and make encoding database.
+
+	* regenc.h (ENC_REPLICATE, ENC_ALIAS): added for defining replica
+	  encoding and encoding alias.
+
+	* encoding.c (rb_enc_init): move alias definitions to enc/*.c.
+	  (rb_enc_find_index): search original of replica and alias when no
+	  encoding library.
+	  (rb_enc_name_list, rb_enc_aliases_enc_i, rb_enc_aliases_str_i,
+	   rb_enc_aliases, Encoding.name_list, Encoding.aliases): added.
+	  (Init_Encoding): init encdb.
+
+	* enc/ascii.c, enc/us_ascii.c, enc/euc_jp.c, enc/sjis.c:
+	  add replica encoding and encoding alias definition.
+
+	* common.mk (dist-clean-local): add rule for remove encdb.h.
+
+Sat Jan 12 18:27:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_define_alloc_func, rb_undef_alloc_func): should
-	  define/undef on a signleton class.  [ruby-core:09959]
+	  define/undef on a singleton class.  [ruby-core:09959]
+
+Sat Jan 12 12:44:36 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c: rdoc update.
+
+Sat Jan 12 12:01:49 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: tuning for performance.
+
+Sat Jan 12 11:29:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/test_proc.rb: fixed wrong expected result.  pointed
+	  out by Kornelius "murphy" Kalnbach <murphy AT rubychan.de> in
+	  [ruby-core:15022].
+
+Sat Jan 12 04:38:38 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (process_options): -e'script' is locale encoding by default.
+	  (load_file): ruby script from stdin is locale encoding by default.
+
+Sat Jan 12 04:31:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.
+
+Fri Jan 11 23:22:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (string.c): call rb_str_buf_append to update encoding of
+	  str1, even if str2 is empty.
+
+Fri Jan 11 20:20:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_mark): needs to mark the receiver too.  a patch from
+	  Chris Heath <chris AT heathens.co.nz> in [ruby-core:14983].
+	  [ruby-core:14885]
+
+Fri Jan 11 18:28:49 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/usage.rb: Removed.
+
+	* lib/getoptlong.rb: Update example to not use lib/rdoc/usage.rb.
+
+Fri Jan 11 18:17:10 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/driver.rb (read_yaml): Follow namespace change
+	  [ruby-core:14964].
+
+Fri Jan 11 16:55:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_append): performance improvement.
+
+Fri Jan 11 12:35:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: moved broken syscall checks from process.c etc.
+
+	* defines.h (WORDS_BIGENDIAN): honor __BIG_ENDIAN__ than the result of
+	  configure.
+
+	* lib/rdoc/options.rb (check_diagram): more precise check, darwin
+	  is not Windows but mingw is on it.
+
+Fri Jan 11 09:59:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: update to r1.163.
+
+	* ext/nkf/nkf.c: ASCII's canonical name is US-ASCII.
+
+	* ext/nkf/lib/kconv.rb (Kconv.isjis): force_encoding('BINARY').
+
+Fri Jan 11 09:23:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (set_base_encoding): must use rb_enc_dummy_p.
+
+Fri Jan 11 06:13:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_to_encoding_index, rb_to_encoding): disallow nil.
+	  [ruby-dev:33003]
+
+Fri Jan 11 01:08:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_mutex_unlock): proper error message for unlocking
+	  mutex that is not locked.  a patch from Yusuke ENDOH
+	  <mame at tsg.ne.jp> in [ruby-dev:33010].
+
+Thu Jan 10 18:00:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* prelude.rb (Mutex::synchronize): capture exception from unlock.
+	  [ruby-dev:32935]
+
+Thu Jan 10 10:15:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_encoding_set): IO.pipe("euc-jp", nil) should work as
+	  IO.pipe("euc-jp", nil).  [ruby-dev:33000]
+
+	* io.c (io_encoding_set): handle nil for v1.
+
+Thu Jan 10 02:41:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_binmode): should not alter encoding.  [ruby-dev:32918]
+
+	* io.c (io_read_encoding): need not to return ASCII-8BIT for
+	  binary IO.
+
+Wed Jan  9 22:04:17 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/mathn.rb (Prime#each): returns an enumerator if no block
+	  given. [ruby-dev:32815]
+
+Wed Jan  9 22:03:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_replicate): replica of dummy is a dummy.
+
+Wed Jan  9 20:55:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/e2mmap.rb (Exception2MessageMapper::Raise): define fail.
+	  [ruby-dev:32854]
+
+Wed Jan  9 20:35:42 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb: support X-Forwarded-* header fields.
+	  WEBrick::HTTPRequest#{host,port,request_uri} is derived having
+	  regards to X-Forwarded-Proto and X-Forwarded-Host.
+
+	* lib/webrick/httprequest.rb
+	  (WEBrick::HTTPRequest#server_name?): new method.
+	  (WEBrick::HTTPRequest#remote_ip?): new method.
+	  (WEBrick::HTTPRequest#ssl?): new method.
+
+Wed Jan  9 18:24:39 2008  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* golf_prelude.rb (Array#to_s): alias to join.
+
+	* golf_prelude.rb (FalseClass#to_s): return "".
+
+Wed Jan  9 16:59:54 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): fix self appending.
+
+Wed Jan  9 15:54:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): give priority command line encoding option
+	  to RUBYOPT, and enable -E option in RUBYOPT.
+
+	* ruby.c (load_file): deal with encoding option in shebang line if
+	  nothing in command line and RUBYOPT.
+
+Wed Jan  9 14:55:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (yycompile0): remove setting parser->enc because it is set
+	  in parser_prepare() by previous change of parser_prepare().
+
+Wed Jan  9 14:52:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat, rb_str_buf_append): deal with self
+	  appending.
+
+Wed Jan  9 14:44:57 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_prepare): set parser->enc from lex_input for ripper.
+
+Wed Jan  9 13:45:52 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (WEBrick::HTTPServer#start):
+	  :DoNotReverseLookup option had not been performed.
+
+Wed Jan  9 13:03:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange
+	  value if it's given from outside.
+
+Wed Jan  9 08:42:01 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* enum.c:  Updating the documentation of Enumerable#zip to reflect
+	  the recent changes Matz made to the method.
+
+Wed Jan  9 01:35:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/Makefile.in (BUILTIN_ENCS): UTF-{16,32}{BE,LE} are not builtin.
+
+Tue Jan  8 23:55:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_init): UTF-{16,32}{BE,LE} are not builtin.
+
+Tue Jan  8 22:33:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c, Makefile.in, include/ruby/oniguruma.h,
+	  enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}.
+
+Tue Jan  8 20:02:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win{32,ce}/Makefile.sub: merged.
+
+Tue Jan  8 19:48:15 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/driver.rb: Speed up Marshal.load. Fix bug with nested
+	  classes' methods.
+
+Tue Jan  8 19:17:29 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/*: Clean up namespacing of RI's classes.
+
+Tue Jan  8 18:05:35 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* bin/ri, lib/rdoc/ri/*: Replace with Ryan Davis' cached ri.
+
+Tue Jan  8 17:32:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_zip): honor length of the receiver, not the
+	  shortest length.  [ruby-core:14738]
+
+	* enum.c (enum_zip): returns array not enumerator for no block
+	  form.  [ruby-core:14738]
+
+	* enumerator.c (next_ii): do not ignore multiple values yielded.
+
+	* array.c (rb_ary_zip): faster version without creating generators.
+
+Tue Jan  8 15:47:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/utf{16,32}_{be,le}.c: use &OnigEncodingName(*) instead of
+	  ONIG_ENCODING_*.
+
+Tue Jan  8 15:40:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed
+	  warnings.
+
+	* regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added
+	  encoding argument.
+
+	* enc/utf{16,32}_{be,le}.c: added init functions.
+
+	* enc/utf{16,32}_{be,le}.c: imported from Oniguruma 5.9.1.
+
+Tue Jan  8 15:03:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (str_gsub): avoid appending empty pre-match substr.
+
+Tue Jan  8 13:05:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_build_from_ary), iseq.c (iseq_load): fix for format change.
+
+Tue Jan  8 07:56:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_buf_append): fix append itself.
+
+Tue Jan  8 01:13:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (STR_ENC_GET): defined.  same as rb_enc_get without
+	  enc_capable.
+	  (coderange_scan): ASCII-8BIT test refined.
+	  (rb_enc_cr_str_buf_cat): new internal function to accumulate
+	  strings with encoding.
+	  (rb_enc_str_buf_cat): use rb_enc_cr_str_buf_cat.
+	  (rb_str_buf_append): ditto
+	  (str_gsub): use rb_str_buf_append.
+	  (rb_str_hash): use ENCODING_GET.
+	  (rb_str_comparable): ditto.
+	  (rb_str_cmp): compare encoding index, not rb_encoding address.
+
+Mon Jan  7 20:37:55 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb: external encoding of
+	  tempfiles is set to "ASCII-8BIT".
+
+Mon Jan  7 19:39:50 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/template.rb:  Use ERB instead of custom template language.
+
+	* lib/rdoc/generators/template/html/old_html.rb:  Remove.
+
+	* lib/rdoc/generators/template/*: Convert to ERB.
+
+Mon Jan  7 19:11:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (Init_String): sym_match arity spec was wrong.  a patch
+	  from Hiroyuki Iwatsuki <don at na.rim.or.jp> in [ruby-dev:32957].
+
+Mon Jan  7 18:10:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (str_gsub): move rb_enc_get(str) to out of loop.
+
+Mon Jan  7 15:52:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h (OnigEncodingType): new member
+	  ruby_encoding_index to avoid linear search in rb_enc_to_index.
+
+	* include/ruby/encoding.h (rb_enc_to_index): macro defined to use
+	  ruby_encoding_index.
+
+	* encoding.c (rb_enc_to_index): removed.
+	  (enc_register_at): initialize ruby_encoding_index member.
+
+Mon Jan  7 16:10:35 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/tokenstream.rb:  Namespace under RDoc.
+
+Mon Jan  7 16:06:09 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/dot.rb:  Namespace under RDoc.
+
+	* lib/rdoc/diagram.rb:  Clean up formatting.
 
-Sun Jun  8 06:04:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan  7 15:51:35 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/options.rb:  Convert to OptionParser, clean up -h output,
+	  namespace under RDoc.
+	* lib/rdoc/*:  Namespace RDoc::Options.
+
+Mon Jan  7 15:42:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk, Makefile.in, */Makefile.sub (distclean-local): move
+	  removing rule of ext/ripper/y.output from common.mk to Makefiles
+	  that depend on platforms.
+
+Mon Jan  7 13:54:57 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_preprocess): fix fixed_enc condition.
+
+Mon Jan  7 11:51:49 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/generators/ri_generator.rb:  Merge documentation from the
+	  same class on output.  Fixes bug where documentation could
+	  disappear.
+
+	* lib/rdoc/options.rb:  Fix typo.
+
+	* lib/rdoc/generators/*: Clean up some namespacing and make RDoc
+	  consistent.
+
+Mon Jan  7 11:44:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_internal_get_index): extracted from
+	  rb_enc_get_index.
+	  (rb_enc_internal_set_index): extracted from rb_enc_associate_index
+
+	* include/ruby/encoding.h (ENCODING_SET): work over ENCODING_INLINE_MAX.
+	  (ENCODING_GET): ditto.
+	  (ENCODING_IS_ASCII8BIT): defined.
+	  (ENCODING_CODERANGE_SET): defined.
+
+	* re.c (rb_reg_fixed_encoding_p): use ENCODING_IS_ASCII8BIT.
+
+	* string.c (rb_enc_str_buf_cat): use ENCODING_IS_ASCII8BIT.
+
+	* parse.y (reg_fragment_setenc_gen): use ENCODING_IS_ASCII8BIT.
+
+	* marshal.c (has_ivars): use ENCODING_IS_ASCII8BIT.
+
+Mon Jan  7 02:14:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (coderange_scan): avoid rb_enc_to_index.
+	  (rb_enc_str_buf_cat): ditto.
+	  (str_cat_char): use rb_enc_str_buf_cat.
+	  (rb_str_inspect): ditto.
+
+Mon Jan  7 01:36:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (coderange_scan): optimize ASCII-8BIT string.
+	  (rb_enc_str_buf_cat): don't call coderange_scan if possible.
+
+Mon Jan  7 01:05:45 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/erb.rb (ERB::Revision): cut off locale dependent string in Date
+	  keyword.
+
+Mon Jan  7 00:48:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* Date keyword removed to avoid inclusion of locale dependent
+	  string.  [ruby-dev:32940]
+
+Sun Jan  6 21:14:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_initialize_str): forbid raw non ASCII character
+	  for ASCII-8BIT regexp in non ASCII-8BIT script.
+
+Sun Jan  6 18:19:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_enc_str_buf_cat): declared.
+
+	* string.c (coderange_scan): extracted from rb_enc_str_coderange.
+	  (rb_enc_str_coderange): use coderange_scan.
+	  (rb_str_shared_replace): copy encoding and coderange.
+	  (rb_enc_str_buf_cat): new function for linear complexity string
+	  accumulation with encoding.
+	  (rb_str_sub_bang): don't conflict substituted part and replacement.
+	  (str_gsub): use rb_enc_str_buf_cat.
+	  (rb_str_clear): clear coderange.
+
+	* re.c (rb_reg_regsub): use rb_enc_str_buf_cat.
+
+Sun Jan  6 17:55:44 2008  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* lib/securerandom.rb: Add Win32 support.
+
+Sun Jan  6 09:32:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: introduced some constants
+	  (for internal use) and aliases (minute and second).
+
+	* sample/cal.rb: trivial adjustments.
+
+Sun Jan  6 01:38:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_initialize_str): /\x80/n is not an error even if script
+	  encoding is EUC-JP.
+
+Sun Jan  6 00:48:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::DNS#each_address): get A record and then AAAA
+	  record. [ruby-dev:32925]
+
+Sat Jan  5 21:48:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg): it is not inlinable because
+	  alloca is used.
+
+Sat Jan  5 16:50:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): copy if old data is not empty
+	  [ruby-core:14785]
+
+Sat Jan  5 13:04:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): no need for intermediate object.
+
+Sat Jan  5 11:48:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (Init_Encoding): alias csWindows31J to Windows-31J.
+	  IE6 accepts csWindows31J but Windows-31J.
+
+Sat Jan  5 02:21:10 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (rb_intern): memorize interned ID for constant
+	  string, using gcc's __builtin_constant_p and statement expression.
+
+Sat Jan  5 02:14:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (trnext): should enable backslash escape.
+
+Sat Jan  5 01:50:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_eval): move instance_eval and instance_exec to
+	  BasicObject.  [ruby-core:14747]
+
+	* lib/delegate.rb: should preserve new methods in BasicObject.
+
+Sat Jan  5 01:46:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): update according to the last API revert.
+
+Sat Jan  5 01:30:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h, re.c (rb_reg_new): keep interface same as
+	  1.8.  [ruby-core:14583]
+
+	* include/ruby/intern.h, re.c (rb_reg_new_str): renamed, and defines
+	  HAVE_RB_REG_NEW_STR macro to tell if it is available.
+
+	* include/ruby/encoding.h (rb_enc_reg_new): added.
+
+	* insns.def (toregexp), marshal.c (r_object0): use rb_reg_new_str().
+
+	* re.c (rb_reg_regcomp, rb_reg_s_union): ditto.
+
+Fri Jan  4 23:08:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (time_arg): use converted object.  [ruby-core:14759]
 
-Sun Jun  8 06:02:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan  4 16:24:58 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/digest/lib/digest/hmac.rb (Digest::HMAC#initialize): use
+	  String#bytesize to avoid test errors on EUC-JP environment.
+
+Fri Jan  4 14:00:50 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_prepare_re): check string encoding.  Oniguruma doesn't
+	  support invalid encoding.
+
+Fri Jan  4 10:22:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_search): avoid inner loop for reverse search.
+
+	* regexec.c: unset USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
+	  which is turned on since oniguruma 5.9.1.
+
+Fri Jan  4 02:53:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/euc_jp.c: remove eucjp_ prefix.  breakpoint can be specified as
+	  euc_jp.c:mbc_enc_len.  avoid needless conflict by merge.
+
+	* enc/sjis.c: remove sjis_ prefix.
+
+	* enc/utf8.c: remove utf8_ prefix.
+
+	* enc/iso_8859_1.c: remove iso_8859_1_ prefix.
+
+	* enc/iso_8859_2.c: remove iso_8859_2_ prefix.
+
+	* enc/iso_8859_3.c: remove iso_8859_3_ prefix.
+
+	* enc/iso_8859_4.c: remove iso_8859_4_ prefix.
+
+	* enc/iso_8859_5.c: remove iso_8859_5_ prefix.
+
+	* enc/iso_8859_6.c: remove iso_8859_6_ prefix.
+
+	* enc/iso_8859_7.c: remove iso_8859_7_ prefix.
+
+	* enc/iso_8859_8.c: remove iso_8859_8_ prefix.
+
+	* enc/iso_8859_9.c: remove iso_8859_9_ prefix.
+
+	* enc/iso_8859_10.c: remove iso_8859_10_ prefix.
+
+	* enc/iso_8859_11.c: remove iso_8859_11_ prefix.
+
+	* enc/iso_8859_13.c: remove iso_8859_13_ prefix.
+
+	* enc/iso_8859_14.c: remove iso_8859_14_ prefix.
+
+	* enc/iso_8859_15.c: remove iso_8859_15_ prefix.
+
+	* enc/iso_8859_16.c: remove iso_8859_16_ prefix.
+
+Fri Jan  4 02:47:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_search): iterate onig_match for reverse mode.
+
+Fri Jan  4 01:20:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32.h: only VC6 needs extern "C++" for math.h.  [ruby-talk:285660]
+
+Fri Jan  4 00:54:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/oniguruma.h: Oniguruma 5.9.1 merged.
+
+Fri Jan  4 00:20:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_ungetc): move data in buffer if it is required to store the
+	  argument.
+
+Thu Jan  3 21:56:07 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (st_strcasecmp): declared for STRCASECMP.
+	  (st_strncasecmp): declared for STRNCASECMP.
+
+Thu Jan  3 20:24:48 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_jump.c (rb_f_catch): Restore cfp if caught thrown object.
+
+Thu Jan  3 19:45:57 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_eval.rb, test_knownbug.rb: move a fixed test.
+
+Thu Jan  3 18:39:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c: (rb_tolower, rb_toupper): body was exchanged.
+
+Thu Jan  3 17:54:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* regenc.h (onigenc_ascii_is_code_ctype): put back.
+
+Thu Jan  3 17:33:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_isalnum): defined.
+	  (rb_isalpha): ditto.
+	  (rb_isblank): ditto.
+	  (rb_iscntrl): ditto.
+	  (rb_isdigit): ditto.
+	  (rb_isgraph): ditto.
+	  (rb_islower): ditto.
+	  (rb_isprint): ditto.
+	  (rb_ispunct): ditto.
+	  (rb_isspace): ditto.
+	  (rb_isupper): ditto.
+	  (rb_isxdigit): ditto.
+	  (rb_tolower): ditto.
+	  (rb_toupper): ditto.
+
+	* include/ruby/ruby.h: don't include include/ruby/encoding.h.
+	  (rb_isascii): defined.
+	  (rb_isalnum): declared.
+	  (rb_isalpha): ditto.
+	  (rb_isblank): ditto.
+	  (rb_iscntrl): ditto.
+	  (rb_isdigit): ditto.
+	  (rb_isgraph): ditto.
+	  (rb_islower): ditto.
+	  (rb_isprint): ditto.
+	  (rb_ispunct): ditto.
+	  (rb_isspace): ditto.
+	  (rb_isupper): ditto.
+	  (rb_isxdigit): ditto.
+	  (rb_tolower): ditto.
+	  (rb_toupper): ditto.
+	  (ISASCII): simplified.
+	  (ISPRINT): ditto.
+	  (ISSPACE): ditto.
+	  (ISUPPER): ditto.
+	  (ISLOWER): ditto.
+	  (ISALNUM): ditto.
+	  (ISALPHA): ditto.
+	  (ISDIGIT): ditto.
+	  (ISXDIGIT): ditto.
+	  (TOUPPER): ditto.
+	  (TOLOWER): ditto.
+
+	* include/ruby/encoding.h (rb_isascii): removed.
+	  (rb_isalnum): ditto.
+	  (rb_isalpha): ditto.
+	  (rb_isblank): ditto.
+	  (rb_iscntrl): ditto.
+	  (rb_isdigit): ditto.
+	  (rb_isgraph): ditto.
+	  (rb_islower): ditto.
+	  (rb_isprint): ditto.
+	  (rb_ispunct): ditto.
+	  (rb_isspace): ditto.
+	  (rb_isupper): ditto.
+	  (rb_isxdigit): ditto.
+	  (rb_tolower): ditto.
+	  (rb_toupper): ditto.
+
+	* common.mk: dependency updated.
+
+Thu Jan  3 15:10:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_isascii): simplified.
+	  (rb_isalnum): call onigenc_ascii_is_code_ctype without indirect call.
+	  (rb_isalpha): ditto.
+	  (rb_isblank): ditto.
+	  (rb_iscntrl): ditto.
+	  (rb_isdigit): ditto.
+	  (rb_isgraph): ditto.
+	  (rb_islower): ditto.
+	  (rb_isprint): ditto.
+	  (rb_ispunct): ditto.
+	  (rb_isspace): ditto.
+	  (rb_isupper): ditto.
+	  (rb_isxdigit): ditto.
+
+	* include/ruby/oniguruma.h (onigenc_ascii_is_code_ctype): declaration
+	  moved from regenc.h.
+
+Thu Jan  3 14:37:17 2008  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (parser_magic_comment): use STRNCASECMP.
+	  (set_file_encoding): ditto.
+
+Thu Jan  3 11:44:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: don't mention an obsolete library, ParseDate.
+
+Thu Jan  3 11:28:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
 
-Sun Jun  8 05:59:36 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Jan  3 05:02:36 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/us_ascii.c: add us_ascii_ prefix for functions to ease
+	  setting breakpoint when debugging.
+
+	* enc/euc_jp.c: add eucjp_ prefix.
+
+	* enc/sjis.c: add sjis_ prefix.
+
+	* enc/iso_8859_1.c: add iso_8859_1_ prefix.
+
+	* enc/iso_8859_2.c: add iso_8859_2_ prefix.
+
+	* enc/iso_8859_3.c: add iso_8859_3_ prefix.
+
+	* enc/iso_8859_4.c: add iso_8859_4_ prefix.
+
+	* enc/iso_8859_5.c: add iso_8859_5_ prefix.
+
+	* enc/iso_8859_6.c: add iso_8859_6_ prefix.
+
+	* enc/iso_8859_7.c: add iso_8859_7_ prefix.
+
+Thu Jan  3 02:44:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (conv_digit): use ISDIGIT, ISLOWER and ISUPPER.
+
+Wed Jan  2 23:50:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* util.c (ruby_strtoul): "0x", "+" and "-" is not a valid integer.
+	  end of integer should be just after "0", the beginning, the
+	  beginning respectively.
+
+Wed Jan  2 15:23:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* util.c (ruby_strtoul): locale independent strtoul is implemented to
+	  avoid "i".to_i(36) cause 0 under tr_TR locale on Debian GNU/Linux
+	  4.0 (Etch).
+	  This is newly implemented, not a copy of missing/strtoul.c.
+
+	* include/ruby/ruby.h (ruby_strtoul): declared.
+	  (STRTOUL): defined to use ruby_strtoul.
+
+	* bignum.c, pack.c, ext/socket/socket.c: use STRTOUL.
+
+	* configure.in (strtoul): don't check.
+
+	* missing/strtoul.c: removed.
+
+	* include/ruby/missing.h (strtoul): removed.
+
+	* common.mk (strtoul.o): removed.
+
+	* LEGAL (missing/strtoul.c): removed.
+
+Wed Jan  2 14:41:08 2008  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (strcasecmp.o): removed.
+	  (strncasecmp.o): removed.
+
+	* include/ruby/missing.h (strcasecmp): removed.
+	  (strncasecmp): removed.
+
+Wed Jan  2 11:34:57 2008  Tanaka Akira  <akr@fsij.org>
+
+	* missing/strcasecmp.c: removed.  Ruby don't use locale dependent
+	  strcasecmp.
+
+	* missing/strncasecmp.c: ditto.
+
+	* configure.in: don't check strcasecmp and strncasecmp.
+
+	* LEGAL: missing/strcasecmp.c and missing/strncasecmp.c removed.
+
+Wed Jan  2 10:13:54 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* sample/time.rb: use Process.times instead of Time.times.
+
+Wed Jan  2 09:09:53 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* sample/goodfriday.rb: examples for date are enough.  retired.
+
+Wed Jan  2 08:58:54 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* sample/cal.rb: just updated with the newest version.
+
+Wed Jan  2 01:19:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/depend: dependency updated.
+
+Wed Jan  2 00:14:41 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: Update nkf.
+
+	* ext/nkf/nkf.c: fix documents.
+
+	* ext/nkf/lib/kconv.rb: fix documents.
+	  (Kconv.is*): use valid_encoding?.
+	  (Kconv.isjis): defined.
+
+Tue Jan  1 23:17:03 2008  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: dependency updated.
+
+Tue Jan  1 21:11:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_isascii): defined.
+	  (rb_isalnum): ditto.
+	  (rb_isalpha): ditto.
+	  (rb_isblank): ditto.
+	  (rb_iscntrl): ditto.
+	  (rb_isdigit): ditto.
+	  (rb_isgraph): ditto.
+	  (rb_islower): ditto.
+	  (rb_isprint): ditto.
+	  (rb_ispunct): ditto.
+	  (rb_isspace): ditto.
+	  (rb_isupper): ditto.
+	  (rb_isxdigit): ditto.
+	  (rb_tolower): ditto.
+	  (rb_toupper): ditto.
+
+	* include/ruby/st.h (st_strcasecmp): declared.
+	  (st_strncasecmp): ditto.
+
+	* st.c (type_strcasehash): use st_strcasecmp instead of strcasecmp.
+	  (st_strcasecmp): defined.
+	  (st_strncasecmp): ditto.
+
+	* include/ruby/ruby.h: include include/ruby/encoding.h.
+	  (ISASCII): use rb_isascii.
+	  (ISPRINT): use rb_isprint.
+	  (ISSPACE): use rb_isspace.
+	  (ISUPPER): use rb_isupper.
+	  (ISLOWER): use rb_islower.
+	  (ISALNUM): use rb_isalnum.
+	  (ISALPHA): use rb_isalpha.
+	  (ISDIGIT): use rb_isdigit.
+	  (ISXDIGIT): use rb_isxdigit.
+	  (TOUPPER): defined.
+	  (TOLOWER): ditto.
+	  (STRCASECMP): ditto.
+	  (STRNCASECMP): ditto.
+
+	* dir.c, encoding.c, file.c, hash.c, process.c, ruby.c, time.c,
+	  transcode.c, ext/readline/readline.c: use locale insensitive
+	  functions.  [ruby-core:14662]
+
+Tue Jan  1 17:50:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_mode_enc): encoding spec is not allowed in binary mode.
+	  [ruby-dev:32913]
+
+Tue Jan  1 14:41:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml: 1.9 patch from Sam Ruby mentioned in his blog:
+	  <http://intertwingly.net/blog/2007/12/31/Porting-REXML-to-Ruby-1-9>
+	  [ruby-core:14639]
+
+Tue Jan  1 14:15:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_substr): offset movement bug.  a patch from
+	  Vincent Isambart <vincent.isambart at gmail.com> in
+	  [ruby-core:14647].  [ruby-core:14644]
+
+Tue Jan  1 01:29:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_to_encoding): raises for non-nil, non-encoding,
+	  non-string object.  [ruby-core:14634]
+
+Tue Jan  1 01:04:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): rejects dummy encoding.
+
+Mon Dec 31 23:53:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options, process_options): delays finding encoding
+	  until load_path is set.
+
+Mon Dec 31 23:27:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): embeds if ptr is null.  [ruby-dev:32819]
+
+Mon Dec 31 23:17:22 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
+	  call do_XXX which correspond with request method.
+	  (WEBrick::HTTPProxyServer#do_CONNECT,do_GET,do_POST,do_HEAD): added.
+
+	* test/webrick/test_httpproxy.rb: add test for WEBrick::HTTPProxyServer.
+
+Mon Dec 31 22:53:29 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread_pthread.c (native_sleep): timespec tv_sec may overflow on
+	  some platform.  a patch from zunda <zunda616e AT yahoo.co.jp> in
+	  [ruby-dev:32904].
+
+Mon Dec 31 19:35:20 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (IS_7BIT): removed.
+	  (single_byte_optimizable): new function to test optimizationability
+	  using single byte string.
+	  (str_strlen): use single_byte_optimizable instead of
+	  is_ascii_string.
+	  (str_nth): rename argument: asc -> singlebyte.
+	  (str_offset): ditto.
+	  (rb_str_substr): use single_byte_optimizable instead of IS_7BIT.
+	  (rb_str_index): ditto.
+	  (rb_str_rindex): ditto.
+	  (rb_str_splice): ditto.
+	  (rb_str_justify): ditto.
+
+Mon Dec 31 07:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* main.c, goruby.c (RUBY_MAIN_INIT): removed.
+
+	* goruby.c (goruby_run_node): run after ruby_init_loadpath() so that
+	  require works, and protect the call.
+
+Mon Dec 31 06:50:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
+	  compiling.
+
+	* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
+	  moved.
+
+Mon Dec 31 06:08:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_enc_sprintf, rb_enc_vsprintf): prototyped.
+
+	* sprintf.c (rb_enc_sprintf, rb_enc_vsprintf): new functions to format
+	  arguments with encoding.
+
+Sun Dec 30 23:48:00 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* golf_prelude.rb (String#/): define / as split, as association of
+	  Array#*.
+
+Sun Dec 30 23:19:06 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* golf_prelude.rb (@@golf_hash): for performance improvement.
+
+Sun Dec 30 22:44:50 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (_valid_time?): I'm not sure to recommend such an
+	  expression.  but anyway it is acceptable now.  [ruby-core:14580]
+
+Sun Dec 30 21:54:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (program, yycompile0): too early to drop lex_lastline in
+	  rules.
+
+Sun Dec 30 19:23:23 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bootstraptest/test_knownbug.rb: support DOSISH.
+
+Sun Dec 30 17:43:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): registered rb_encoding differs from
+	  ONIG_ENCODINGs.
+
+Sun Dec 30 13:56:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (program): clear input strings after all process.
+
+	* parse.y (parser_nextc, parser_yylex): should not drop lex_lastline
+	  while lex_p is valid.  [ruby-dev:32896]
+
+Sun Dec 30 10:54:49 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: rm largefile.h.
+
+	* common.mk: clean golf, conf*, preludes, and so on.
+
+	* enc/depend: silent and ignore error for rm.
+
+	* enc/Makefile.in: should define prefix and exec_prefix.
+
+Sun Dec 30 06:31:11 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* encoding.c (Init_encoding): register Windows-31J and its alias.
+	  [ruby-dev:32843]
+
+	* ruby.c (proc_options): -Ks options means Windows-31J, not Shift_JIS.
+
+Sun Dec 30 06:27:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (depend_rules): need to convert `/' to `\' for windows
+	  native commands.
+
+Sun Dec 30 01:43:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/Makefile.in (DLDFLAGS): like as extensions.  [ruby-core:14567]
+
+Sat Dec 29 23:48:13 2007  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_fflush): don't retry when wbuf modified by other threads.
+
+Sat Dec 29 22:44:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_regsub): returns the given string itself if nothing
+	  changed.
+
+	* string.c (rb_str_sub_bang): keeps code-range as possible.
+
+	* string.c (str_gsub): adjusts code-range.  [ruby-core:14566]
+
+Sat Dec 29 21:54:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (clean, distclean, realclean): should include clean-enc
+	  and others.  [ruby-dev:32887]
+
+Sat Dec 29 13:29:29 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/test_knownbug.rb: add a test reported by
+	  Kazuhiro NISHIYAMA.  [ruby-dev:32819].
+	  add a test reported by Frederick Cheung.  [ruby-core:14556].
 
-	* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
-	  the issue. [ruby-dev:32677]
+	* test/ruby/test_m17n.rb (test_gsub): add a test reported by
+	  Sam Ruby.  [ruby-core:14566]
 
-Sun Jun  8 05:54:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec 29 04:46:58 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_throws):
+	  throw won't raise NameError nor ThreadError but ArgumentError on 1.9.
+	  (Test::Unit::Assertions#assert_not_throws): ditto.
+
+	* test/testunit/test_assertions.rb: add assertions for throwing some
+	  objects other than Symbol.
+
+Sat Dec 29 03:10:12 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_unread): fix typo.
+
+Sat Dec 29 02:18:45 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_unread): adhoc workaround for non-binary mode of some DOSish
+	  platforms. this is not perfect and safety, but works with most cases.
+
+Fri Dec 28 23:53:18 2007  Tanaka Akira  <akr@fsij.org>
+
+	* ext/strscan/strscan.c (str_new): new function for allocate an string
+	  with encoding propagation.
+	  (extract_range): use str_new.
+	  (extract_beg_len): ditto.
+	  (strscan_peek): ditto.
+	  (strscan_rest): ditto.
+
+Fri Dec 28 20:18:42 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* golf_prelude.rb (Object.say): derived from Perl 5.10.
+
+Fri Dec 28 19:39:34 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* encoding.c (rb_locale_encoding): should check return value from
+	  rb_locale_charmap().
+
+	* ruby.c (locale_encoding): removed.
+
+	* ruby.c (process_options): use rb_locale_encoding() instead of
+	  locale_encoding().
+
+	* ext/readline/readline.c (readline_readline): use locale encoding
+	  instead of input IO's encoding. [ruby-dev:32872]
+
+Fri Dec 28 19:29:07 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline, readline_s_set_input):
+	  use mReadline directly because self is not always same.
+
+Fri Dec 28 19:11:28 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_locale_encoding): defined.
+
+	* include/ruby/encoding.h (rb_locale_encoding): declared.
+
+Fri Dec 28 18:45:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): set encoding to result.
+
+	* ext/readline/readline.c (readline_s_set_input, Init_readline): save
+	  input IO to hidden instance variable.
+
+Fri Dec 28 01:55:04 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c (transcode_dispatch): reverted some of the changes
+	  in r14746.
+
+	* transcode.c, enc/trans/single_byte.c: Added conversions to/from
+	  US-ASCII and ASCII-8BIT (using data tables).
+
+	* enc/trans/single_byte.c: Some spacing/ordering changes due to
+	  automatic data file generation.
+
+	* transcode_data.h, transcode.c: Preliminary code for using
+	  micro-conversion functions.
+
+	* test/ruby/test_transcode.rb: Added some tests for US-ASCII and
+	  ASCII-8BIT conversions.
+
+Fri Dec 28 17:33:44 2007  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (make_time_t): verify mktime and timegm result.
+
+Fri Dec 28 16:36:33 2007  NARUSE, Yui  <naruse@airemix.com>
+
+	* lib/resolv.rb (Resolv::DNS#each_address): now returns IPv6 address.
+
+Fri Dec 28 16:10:00 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/dot/dot.rb: Move to lib/rdoc/dot.rb. Fix namespacing.
+
+	* lib/rdoc/diagram.rb: Update for 1.9.
+
+Fri Dec 28 15:38:29 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup/sample/: Move to sample/rdoc/markup directory.
+
+Fri Dec 28 15:15:12 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/irb/completion.rb: Remove garbage ("X=1").
+
+Fri Dec 28 15:12:05 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc, test/rdoc: Move RDoc tests out of lib/.
+
+Fri Dec 28 15:10:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (set_base_encoding, enc_base_encoding): renamed
+	  based_encoding as base_encoding.
+
+Fri Dec 28 13:57:49 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* golf_prelude.rb (Integer#each): use alias simply.
+
+Fri Dec 28 13:45:21 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* golf_prelude.rb (Object.const_missing): No need to delegate to
+	  superclass.  Just raise a NameError when none matches.
+
+Fri Dec 28 13:18:47 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.2 -> 0.2.3.
+
+	* lib/rss/parser.rb, test/rss/test_parser.rb: supported "-" in tag name.
+	  Reported by Ray Chen. Thanks.
+
+Fri Dec 28 13:07:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (os_obj_of): returns an enumerator if no block given.  based on
+	  a patch from Yugui <yugui AT yugui.sakura.ne.jp>.  [ruby-dev:32828]
+
+Fri Dec 28 11:46:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/ytab.sed: skip yydestruct hack unless yymsg exists, for bison
+	  1.8 series.  [ruby-dev:32825]
+
+Fri Dec 28 11:39:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* golf_prelude.rb (Object.quine): need to join because SCRIPT_LINES__[]
+	  returns an array of lines.
+
+Fri Dec 28 11:16:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* golf_prelude.rb (Object.quine): get the script itself.
+
+Fri Dec 28 10:06:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* golf_prelude.rb (Object.const_missing): Auto-complete constants.
+
+Fri Dec 28 01:55:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (transcode_dispatch): allows transcoding from/to
+	  ASCII-8BIT.
+
+Fri Dec 28 01:47:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* golf_prelude.rb (Integer): Integer is now enumerable on goruby.
+
+Fri Dec 28 01:27:47 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rdoc/rdoc.rb (parse_files): don't depend on the default external
+	  encoding.
+
+Fri Dec 28 00:01:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (golf_prelude.c): use MINIRUBY instead of BASERUBY because
+	  tool/compile_prelude.rb requires rbconfig.rb.
+
+Thu Dec 27 23:56:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: should not use the libraries under the source directory
+	  at cross compiling.
+
+Thu Dec 27 23:43:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (EXTOBJS): uses ruby.rc always for other than
+	  rubyw.exe.
+
+Thu Dec 27 22:31:37 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/commands/update_command.rb (do_rubygems_update): use
+	  portable and safely ENV operation. reported in
+	  <http://slashdot.jp/developers/comments.pl?sid=384937&cid=1273085>.
+
+Thu Dec 27 21:47:04 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* mkconfig.rb (prefix): archdir is "1.9.0", not "1.9". reported in
+	  <http://slashdot.jp/developers/comments.pl?sid=384937&cid=1273085>.
+
+Thu Dec 27 17:57:30 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y, transcode_data.h, transcode.c, lib/weakref.rb,
+	  lib/irb/ruby-lex.rb, lib/irb/lc/error.rb, enc/trans/japanese.c:
+	  change "illegal" to "invalid" in a context which doesn't against
+	  a law.
+
+Thu Dec 27 16:37:06 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_s_union): show encodings in error message.
+
+Thu Dec 27 15:25:16 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_codelen): show codepoint in error message.
+
+	* include/ruby/encoding.h (rb_enc_codelen): comment it returns
+	  positive integer.
+
+	* string.c (rb_str_concat): rb_enc_codelen doesn't return 0.
+
+Thu Dec 27 15:18:44 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_codelen): error message refined.
+
+Thu Dec 27 15:11:27 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_check): show encodings in error message.
+
+Thu Dec 27 15:02:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_casecmp): fixed using a wrong variable.
+	  [ruby-list:44402]
+
+Thu Dec 27 14:34:38 2007  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_fflush): checks wbuf modification by other threads.
+	  not perfect.  it need locks.
+
+Thu Dec 27 10:44:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c: a patch to support IRIX from Andrew
+	  Thompson <andrew@hijacked.us> in [ruby-core:14447].
+
+Thu Dec 27 02:25:45 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES
+	  occurs. this is a workaround for mswin32.
+
+Wed Dec 26 22:47:31 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
+	  Resolv::DNS::Label::Str.
+
+	* lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string
+	  is not defined, so replace to_s.
+
+	* lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by
+	  ip6.arpa.
+
+Wed Dec 26 21:27:02 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (_xmlschema): some improvements.
+
+	* lib/date/format.rb (_parse): a new hint compfunc. [experimental]
+
+Wed Dec 26 17:31:08 2007  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_fflush): check closed fptr after rb_write_internal to avoid
+	  SEGV on MacOS X.
+
+Wed Dec 26 16:10:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (Init_String): defines chars method.
+
+Wed Dec 26 14:38:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: install goruby if exists.
+
+Wed Dec 26 13:55:02 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb:  Cleaned up some code with Ruby 1.9 idioms.
+
+Wed Dec 26 13:29:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (tmpbuf): use rb_str_tmp_new().
+
+Wed Dec 26 00:57:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/ext/generator/generator.c (Init_generator): requires
+	  json/common.rb for GeneratorError, when static linked.  a patch from
+	  Kenta Murata <muraken AT gmail.com> in [ruby-dev:32789].
+
+Tue Dec 25 23:33:55 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* development version 1.9.0 released.
+
+Tue Dec 25 23:25:29 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml/node.rb (REXML::Node::indent): should initialize rv
+	  variable.  a patch from Tadayoshi Funaba <tadf AT dotrb.org> in
+	  [ruby-dev:32783].
+
+Tue Dec 25 23:16:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): encoding option in shebang and RUBYOPT did not
+	  work, do not store alloca()ed string in a parent scope struct.
+
+Tue Dec 25 22:56:52 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): keep this file.
+
+Tue Dec 25 22:55:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (TIMEZONE_VOID): typo.
+
+Tue Dec 25 22:45:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns2vm.rb: add encoding option to shebang.
+
+Tue Dec 25 22:13:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/pending.rb: add pending issue.
+
+Tue Dec 25 22:12:40 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: remove Thread.critical(=).
+
+Tue Dec 25 21:44:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: add version number.
+
+Tue Dec 25 21:32:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix stack consistency error
+	  (break is compiled to throw instead of jump insn).
+	  these problems are reported by Yusuke ENDOH <mame AT tsg.ne.jp>
+
+	* bootstraptest/test_knownbug.rb, test_syntax.rb: move fixed test.
+
+Tue Dec 25 21:32:44 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (struct parser_params): make parser_ruby_sourcefile common
+	  field.  it is used by node_newnode.
+	  new field parser_ruby_sourcefile_string for ripper.
+	  (parser_initialize): initialize parser_ruby_sourcefile in ripper.
+	  (ripper_initialize): initialize parser_ruby_sourcefile_string.
+
+Tue Dec 25 21:26:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (parse.c): depends on tool/ytab.sed.
+
+	* tool/ytab.sed: hack for bison 2.1.
+
+Tue Dec 25 20:24:58 2007  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_ssl.c: Only show a warning if the default
+	  DH callback is actually used.
+
+	* ext/openssl/ossl_rand.c: New method: random_add().
+
+Tue Dec 25 20:24:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot: argument check, and cleanup exported directory.
+
+Tue Dec 25 20:07:13 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* tool/make-snapshot: more portable.
+
+Tue Dec 25 19:01:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.h (rb_enc_mbc_to_codepoint): wrapper for
+	  ONIGENC_MBC_TO_CODE().
+
+	* string.c (rb_str_succ): deal with invalid sequence as binary.
+
+Tue Dec 25 18:40:46 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c: all methods need $SAFE < 1.
+
+	 vm.c: comment out debug functions.
+
+Tue Dec 25 18:37:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (appendline): move RS comparison to rb_io_getline_1().
+
+Tue Dec 25 18:27:51 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_each_line): don't call rb_enc_codepoint with empty
+	  string.
+
+Tue Dec 25 18:06:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_inspect): don't call rb_enc_codepoint with empty
+	  string.  fix '#'.inspect.
+
+	* encoding.c (rb_enc_codepoint): raise on empty string.
+
+Tue Dec 25 17:48:28 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm.c (rb_frame_method_id_and_class): new function to get the
+	  method id and class of the current frame.
+
+Tue Dec 25 17:32:04 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (create_makefile): Add a missing dependency on the
+	  target directory for each .rb file.  This will hopefully fix
+	  parallel make (-jN).  Tested on FreeBSD.
+
+Tue Dec 25 16:51:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/japanese.c (rb_{from,to}_{SHIFT_JIS,EUC_JP}): inversed
+	  from_encoding and to_encoding.
+
+Tue Dec 25 16:41:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* golf_prelude.rb (h): add new method for all golfers.
+
+Tue Dec 25 16:37:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/japanese.c (rb_to_EUC_JP): fixed typo.
+
+Tue Dec 25 16:34:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/depend: add dependencies. [ruby-dev:32760]
+
+Tue Dec 25 16:26:48 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, thread.c: rename is_ruby_native_thread() to
+	  ruby_native_thread_p().
+
+	* ext/tk/tcltklib.c: apply it.
+
+Tue Dec 25 16:15:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (clean-enc): clean encoding objects.
+
+Tue Dec 25 16:04:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, goruby.c, golf_prelude.rb: for golfers.
+
+	* main.c (main): hook for embedding applications.
+
+	* tool/compile_prelude.rb: can change initialize function name.
+
+Tue Dec 25 15:59:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_register): do not use based_encoding to check if
+	  dummy encoding.
+
+Tue Dec 25 15:55:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_succ): fix for string with non-alphanumeric chars.
+
+Tue Dec 25 15:42:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_external_encoding): should return nil for
+	  pass-through write IO.  [ruby-dev:32740]
+
+Tue Dec 25 15:24:57 2007  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (appendline): initialize rslen to 1 if rsptr is 0.
+	  rslen is the length of the delimiter.
+	  if only delim is given, it should be 1.
+	  [ruby-dev:32746]
+
+Tue Dec 25 15:21:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (transcode_dispatch): fix for multistep transcode.
+
+Tue Dec 25 15:07:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/trans/single_byte.c (Init_single_byte): renamed.
+
+Tue Dec 25 15:00:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_yield): when multiple values yielded from #each
+	  pack them into an array.  [ruby-dev:32708]
+
+	* enum.c: all method but all?, any?, one? and none? passed packed
+	  multiple values to the block.
+
+	* enum.c (collect_all): should pack all values.  [ruby-core:14410]
+
+Tue Dec 25 14:57:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (COMMONOBJS): transcode_data_*.c moved under enc/trans.
+
+	* transcode_data.h (rb_transcoding, rb_transcoder): prefixed.
+
+	* transcode.c (rb_register_transcoder, rb_declare_transcoder): split
+	  declaration and registration.  [ruby-dev:32704]
+
+	* transcode.c (transcode_dispatch): autoload pre-declared transcoder.
+
+	* transcode.c (str_transcode): use rb_define_dummy_encoding().
+
+	* transcode.c (Init_transcode): initialize transcoder tables.
+
+	* enc/trans/single_byte.c, enc/trans/japanese.c: moved from top.
+
+Tue Dec 25 14:20:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mkmf.rb (map_dir): should generate path including $top_srcdir.
+
+Tue Dec 25 14:09:16 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb:  Fixed test failures caused by changes to Ruby.
+
+	* test/csv/tc_serialization, test/csv/tc_csv_parsing, test/csv/tc_features:
+	  Fixed test failures caused by changes to Ruby.
+
+Tue Dec 25 14:11:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_encoding_set): missing return type.
+
+Tue Dec 25 14:03:48 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* test/rinda/test_rinda.rb (MockClock#{_forward, forward, sleep}):
+	  Change default value of n as @reso from nil.  If default value is
+	  nil, n.+ is not defined.
+
+Tue Dec 25 13:54:01 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io_m17n.rb (test_pipe): fixed.
+	  [ruby-dev:32743]
+
+Tue Dec 25 13:44:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_wait_fd_rw): should check EBADF on select().
+
+Tue Dec 25 13:30:03 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c, thread_pthread.h, thread_win32.c,
+	  thread_win32.c: make some functions static functions.
+	  a patch from Tadashi Saito <shiba AT mail2.accsnet.ne.jp>
+	  in [ruby-core:14407]
+
+Tue Dec 25 13:23:13 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io_m17n.rb (test_write_noenc): don't mix text and
+	  binary mode.  [ruby-dev:32743]
+
+Tue Dec 25 13:13:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* README.EXT.ja, dir.c, eval.c, eval_intern.h, lex.c.src,
+	  lex.c.blt, keywords, load.c, thread.c: more ANSI'ize.
+	  a patch from Tadashi Saito <shiba AT mail2.accsnet.ne.jp>
+	  in [ruby-dev:32725]
+
+Tue Dec 25 13:07:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, thread.c, cont.c: add RUBY_VM_SET_INTERRUPT(),
+	  RUBY_VM_SET_TIMER_INTERRUPT(), RUBY_VM_INTERRUPTED().
+
+	* thread.c, thread_pthread.c, thread_win32.c: fix to ignore time slice
+	  event until sleep.
+
+	* bootstraptest/test_thread.rb: add a test for time limited join test.
+
+Tue Dec 25 12:42:59 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (Init_VM): remove unused code.
+	  [ruby-dev:32732]
+
+Tue Dec 25 12:32:32 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c: Moving a static counter from inside register_transcoder()
+	  and register_functional_transcoder() to outside the functions, renaming
+	  from n to next_transcoder_position. Fixes 3) in [ruby-dev:32715].
+
+Tue Dec 25 12:22:17 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* sample/from.rb: follow Ruby 1.9 libraries.
+
+Tue Dec 25 12:21:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (method_inspect): preserve encoding of the method name.
+
+Tue Dec 25 12:07:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (BASERUBY): delayed error until BASERUBY is used.
+
+Tue Dec 25 11:48:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/README: removed obsoleted files: dbmtest.rb,
+	  getopts.test, mrshtest.rb, regx.rb.
+
+Tue Dec 25 11:45:34 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb:  Import the FasterCSV source as the new CSV class.
+
+	* test/csv/*:  Added all applicable tests from FasterCSV.
+
+Tue Dec 25 11:33:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (report_bug): uses ruby_description.
+
+Tue Dec 25 11:20:38 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix stack consistency error.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>  [ruby-dev:32720]
+
+	* bootstraptest/test_syntax.rb: add 2 tests for above.
+
+Tue Dec 25 11:14:20 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c, vm_core.h: comment out unused fields.
+
+Tue Dec 25 11:02:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: check frame is FINAL when creating env.
+	  [ruby-core:14395]
+
+	* bootstraptest/test_block.rb: add a test for above.
+
+Tue Dec 25 09:12:13 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/:  Enable RDoc debugging only with $DEBUG_RDOC.
+
+Tue Dec 25 08:37:43 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb, test/csv/test_csv.rb:  Removed in preparation for
+	  FasterCSV code import.
+
+Tue Dec 25 08:27:43 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Fix test failures.
+
+	* test/rubygems/test_gem.rb:  Fix test failure.
+
+Tue Dec 25 06:23:40 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb, test_literal.rb: move fixed test.
+
+Tue Dec 25 06:19:04 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* sample/biorhythm.rb: follow Ruby 1.9 libraries.
+
+Tue Dec 25 06:15:01 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: add dummy toplevel frame.
+
+Tue Dec 25 05:44:56 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Fix uninitialized variable warning.
+	  [ruby-talk:284582]
+
+	* lib/irb/output-method.rb:  Remove unused #foo method.
+	  [ruby-talk:284582]
+
+Tue Dec 25 05:24:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile): clear local table if node == 0.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>  [ruby-dev:32530]
+
+	* vm.c: clear VM stack.
+
+Tue Dec 25 04:23:32 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (rb_id2str): fill klass of returned string as rb_cString.
+	  some strings are allocated before rb_cString is created.
+	  This prevents a "called on terminated object" error by
+	  ObjectSpace.each_object(Module) {|m| p m.name }.
+
+Tue Dec 25 03:51:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix stack consistency bug.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
+
+Tue Dec 25 03:19:47 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* tool/make-snapshot: must create configure and lex.c.
+
+Tue Dec 25 03:16:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_pipe): now takes up to two arguments.  allow its
+	  external/internal encoding by Encoding objects.
+
+	* io.c (rb_io_set_encoding): new method to set encoding of the IO.
+
+	* io.c (argf_set_encoding): ditto.
+
+Tue Dec 25 03:08:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* pack.c (pack_pack): use NUM2LONG instead of NUM2INT.
+
+	* numeric.c (fix_lshift, fix_aref): use SIZEOF_LONG instead of
+	  SIZEOF_VALUE.
+
+	* bignum.c (big2ulong, rb_big_aref): ditto.
+
+Tue Dec 25 02:55:26 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/rexml/element.rb (REXML::Elements#each): yield in each
+	  should be called with one parameter. [ruby-dev:32708]
+
+Tue Dec 25 02:15:39 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): add a "pop" insn after break
+	  to fix stack consistency error.  [ruby-core:14385]
+
+	* bootstraptest/test_syntax.rb: add tests for above.
+
+	* bootstraptest/test_knownbug.rb: remove fixed bug.
+
+Tue Dec 25 01:54:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* id.c (Init_id): remove several unused symbols. [ruby-core:14362]
+
+	* compile.c (iseq_specialized_instruction): do not use
+	  VM_CALL_SEND_BANG flag any longer.
+
+Tue Dec 25 01:42:41 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rdoc/rdoc.rb (parse_files): interpret coding cookie.
+
+Tue Dec 25 01:38:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (method_name): preserve Symbol's encoding.
+
+	* numeric.c (fix_id2name): ditto.
+
+Tue Dec 25 01:19:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_enc_left_char_head): new utility macro.
+
+	* include/ruby/encoding.h (rb_enc_right_char_head): ditto.
+
+	* io.c (appendline): does multibyte RS search in the function.
+
+	* io.c (prepare_getline_args): RS may be nil.
+
+	* io.c (rb_io_getc): should process character based on external
+	  encoding, when transcoding required.
+
+Tue Dec 25 01:07:57 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/irb/output-method.rb: translate a comment to English to
+	  avoid mix of EUC-JP comment and UTF-8 Date keyword.
+	  svn substitute Date keyword with UTF-8 weekday on UTF-8 locale.
+
+Tue Dec 25 00:27:28 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpservley/cgihandler.rb
+	  (WEBrick::HTTPServlet::CGIHandler#do_GET): m17nized.
+
+Mon Dec 24 23:55:29 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/cgi.rb (CGI::escape): m17nized.
+	  (CGI::unescape): ditto.
+	  (CGI::escapeHTML): ditto.
+	  (CGI::unescapeHTML): ditto.
+
+Mon Dec 24 23:32:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* transcode_data_japanese.c (select_iso_2022_mode): '\e' is not valid.
+
+Mon Dec 24 23:13:09 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/rdoc/diagram.rb (RDoc::Diagram#initialize): use fileuitls
+	  instead of ftools.
+
+Mon Dec 24 23:04:57 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/ftools.rb: removed obsoleted lib.  use fileutils instead (by eban).
+
+	* lib/rdoc/rdoc.rb, lib/rdoc/generators/*, lib/rake.rb: let it use
+	  fileutils instead of ftools.
+
+	* lib/shell/command-processor.rb: removed unused references to ftools.
+
+	* lib/parsedate.rb: removed.  see [ruby-core:12535], [ruby-dev:31969].
+
+	* lib/README: updated.
+
+Mon Dec 24 23:01:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI::Buffer): use Meta ===.  [ruby-core:14295]
+
+Mon Dec 24 22:46:42 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* transcode.c: register_functional_transcoder() added.
+	  (init_transcoder_table(: register ISO-2022-JP.
+	  (str_transcode): add preprocessor and postprocessor.
+
+	* transcode_data_japanese.c: add ISO-2022-JP support.
+
+	* transcode_data.h: moved transcoder and transcoding definition from
+	  transcode.c.
+
+Mon Dec 24 20:29:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/io/nonblock/test_flush.rb: fix test for 1.9.
+
+Mon Dec 24 20:23:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/rinda/test_rinda.rb: revert last commit because this test seems
+	  to have timing problem to halt all tests.
+
+Mon Dec 24 20:18:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/rinda/test_rinda.rb: enable rinda test.
+
+Mon Dec 24 20:16:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* instruby.rb: fix rdoc install dir.
+
+Mon Dec 24 18:37:32 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_prepare_re): show regexp encoding in the error message.
+
+Mon Dec 24 18:23:32 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (rb_exc_raise): ANSI style.
+	  (rb_exc_fatal): ditto.
+	  (rb_raise_jump): ditto.
+	  (rb_jump_tag): ditto.
+	  (rb_block_given_p): ditto.
+
+	* variable.c (original_module): ditto.
+
+Mon Dec 24 18:05:09 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (Init_ISeq): disable ISeq.load() because there is no verifier.
+
+	* iseq.c, proc.c: add ISeq.disasm(method).
+
+Mon Dec 24 18:06:03 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval_method.c (Init_eval_method): extracted from Init_eval
+	  for rdoc to find rb_mod_remove_method, rb_mod_undef_method and
+	  rb_mod_alias_method.
+
+	* eval.c (Init_eval): call Init_eval_method.
+
+Mon Dec 24 17:59:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_lock): reverted.
+
+	* thread.c (rb_barrier_wait): check for recursive wait.
+
+Mon Dec 24 17:50:54 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (function_call_may_return_twice_jmp_buf): removed.
+	  (function_call_may_return_twice_false): removed.
+	  [ruby-core:14335]
+
+Mon Dec 24 17:40:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (node_name.inc, miniprelude.c, prelude.c): nmake cannot
+	  handle target vpath in other than implicit rules.
+
+Mon Dec 24 17:20:34 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/{mailread.rb,getopts.rb,parsearg.rb}: removed.
+	  see [ruby-core:12535], [ruby-dev:31969].
+
+Mon Dec 24 17:12:57 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h, random.c, array.c:
+	  change exported name.
+	  genrand_int32 -> rb_genrand_int32.
+	  genrand_real -> rb_genrand_real.
+	  [ruby-core:14335]
+
+Mon Dec 24 17:06:37 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* {lib,test}/{soap,wsdl,xsd}: removed soap4r along to the discussion
+	  at ruby-core and ruby-dev.  see [ruby-core:12535], [ruby-dev:31969].
+
+Mon Dec 24 17:06:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_feature_p): returns loading path name too.
+
+	* load.c (search_required): returns path too if feature is being
+	  loaded.  [ruby-dev:32048]  [TODO: refactoring]
+
+Mon Dec 24 16:29:12 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* sample/openssl: reviewed and remove dependency on getopts.rb.
+
+Mon Dec 24 16:18:57 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* mkconfig.rb: add teeny to CONFIG['ruby_version'].
+
+Mon Dec 24 15:55:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/compile.rb, getrev.rb, runruby.rb: remove unused tools.
+
+Mon Dec 24 15:42:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, cygwin/GNUmakefile.in, */Makefile.sub,
+	  djgpp/config.hin.: version dependent directory names now contain
+	  teeny.
+
+Mon Dec 24 15:29:13 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/serb.rb: removed.
+
+Mon Dec 24 13:55:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_proc_new), vm.c (invoke_block): removed u3.state magic.
+	  [ruby-core:14310]
+
+	* test/ruby/test_symbol.rb (test_to_proc): a test from Frederick
+	  Cheung <frederick.cheung AT gmail.com>.
+
+Mon Dec 24 13:43:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_atfork): should not leave living_threads
+	  referring freed table while allocating new table.
+
+Mon Dec 24 12:49:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, configure.in, lib/mkmf.rb, */Makefile.sub: specify
+	  compiled output file name explicitly.
+
+	* enc/Makefile.in, enc/depend: now makes compiler to put generated
+	  files under directories corresponding to the each source.
+	  enc/trans supported.
+
+	* enc/make_encmake.rb: evaluates depend file before Makefile.in so
+	  that the former can influence to CONFIG.
+
+Mon Dec 24 12:35:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win{32,ce}/Makefile.sub (MFLAGS): defaulted to -l.
+
+Mon Dec 24 12:08:10 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* /, ext/:  Add svn:ignore for OS X Xcode 3's conftest.dSYM
+	  directories.
+
+Mon Dec 24 11:56:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk: should not pass MAKEFLAGS to recursive make.
+	  + normal make: MFLAGS are set and command line options and macros
+	    are all passed silently.
+	  + GNU make: ditto, and all options and macros in MAKEFLAGS are in
+	    effect.
+	  + nmake: MFLAGS is not set and MAKEFLAGS has only options without
+	    hyphen, no macros exist in any variables.
+	  + Borland make: ditto, and command line macros cannot override
+	    macros in makefile, so passing them is vain.
+
+	* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
+	  set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
+
+Mon Dec 24 11:32:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_comparable): fixed to keep transitivity.
+	  [ruby-dev:32693]
+
+Mon Dec 24 11:20:31 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/ri_options.rb:  Fix display of GEMDIRS, make command
+	  examples match ri's name.
+
+	* lib/rdoc/ri/ri_paths.rb:  Only allow latest ri dirs in ri output.
+
+Mon Dec 24 10:49:04 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/uri/mailto.rb, lib/uri/common.rb:  Fix Regexp warnings.  Patch
+	  #16524 from Kornelius Kalnbach, [ruby-core:14302].
+
+Mon Dec 24 10:37:38 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb:  Remove methods from Gem, not QuickLoader, to fix
+	  warnings.
+
+Mon Dec 24 09:45:45 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c, transcode_data_one_byte.c, transcode_data_japanese.c:
+	  added rb_ prefix to external data symbols.
+
+Mon Dec 24 05:32:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_inject): updated documentation.  a patch from Keita
+	  Yamaguchi <keita.yamaguchi AT gmail.com> in [ruby-dev:32686].
+
+	* README.EXT: updated.  a patch from Tadashi Saito
+	  <shiba AT mail2.accsnet.ne.jp> in [ruby-core:14328].
+
+	* array.c (rb_ary_at): updated documentation. a patch from Tadashi
+	  Saito <shiba AT mail2.accsnet.ne.jp> in [ruby-core:14330].
+
+Mon Dec 24 05:13:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (tr_trans): should associate new encoding if modified.
+
+Mon Dec 24 04:04:12 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/net/http/test_https.rb: should rescue LoadError.
+
+Mon Dec 24 03:57:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c, vm.h: fix to support sparc machine.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
+
+Mon Dec 24 03:35:19 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: remove additional "-".
+
+Mon Dec 24 02:59:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_check_readable): should not fill fptr->enc always.
+	  read-write IO (e.g. socket) does not work.  [ruby-dev:32685]
+
+	* io.c (io_read_encoding): retrieve reading encoding.
+
+	* io.c (prepare_getline_args): convert RS to external encoding.
+
+	* string.c (str_new_shared): was setting embedding flag of wrong
+	  string object.  [ruby-dev:32685]
+
+	* io.c (io_enc_str): should preserve default_external encoding.
+
+	* io.c (appendline): should do multibyte aware RS search.
+
+Mon Dec 24 02:06:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_open): documentation update.
+
+	* io.c (rb_io_s_pipe): ditto.
+
+	* io.c (io_fwrite): wrong encoding destination.
+
+	* io.c (rb_io_external_encoding): should return the encoding of
+	  the file reading.
+
+	* io.c (rb_io_internal_encoding): should return the encoding of
+	  read string.
+
+Mon Dec 24 01:46:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_pipe): allow specifying read-side encoding.
+
+	* io.c (io_enc_str): wrong encoding destination.
+
+Mon Dec 24 01:03:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_comparable): comparison including broken
+	  coderange strings do not consider encoding.
+
+Mon Dec 24 00:57:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (open_key_args): IO direct methods (foreach, readlines,
+	  read) now takes keyword argument: encoding, mode, open_args.
+
+Mon Dec 24 00:52:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_read): encoding argument reverted.
+
+	* io.c (mode_enc): independent function to share code.
+
+	* io.c (rb_io_internal_encoding): new method.
+
+Mon Dec 24 00:47:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb (TestBeginEndBlock::test_endblockwarn):
+	  rename endblockwarn.rb to endblockwarn_rb to avoid unnecessary
+	  warning in make test.
+
+Sun Dec 23 23:03:13 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_codepoint): implemented to raise invalid
+	  encoding.
+
+	* include/ruby/encoding.h (rb_enc_codepoint): macro is replaced as a
+	  declaration.
+
+Sun Dec 23 19:45:22 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.httpdate): fix 2 digits year for 20xx.
+	  reported by Tadayoshi Funaba.  [ruby-dev:32687]
+
+Sun Dec 23 19:33:42 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/open-uri.rb:  Fix method redefined warning.  [ruby-core:14304]
+
+Sun Dec 23 18:31:49 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_enc_get): use rb_define_dummy_encoding.
+
+	* ext/nkf/nkf.c (Init_nkf): use rb_nkf_enc_get("ASCII").
+
+	* ext/nkf/nkf-utf8/nkf.c: Update 1.161.
+
+	* ext/nkf/nkf-utf9/config.h: default output encoding is now UTF-8.
+
+	* ext/nkf/lib/kconv.rb (Kconv.kconv): replace Encoding#name by
+	  Encoding#to_s.
+
+Sun Dec 23 18:02:52 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/gem_open_uri.rb:  Fix version check.
+
+Sun Dec 23 17:24:48 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_init): add eucJP as an alias of EUC-JP.
+
+Sun Dec 23 17:00:23 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.httpdate): use Time.utc for
+	  "day-of-week, dd-mon-yy HH::MM:SS GMT" format.
+
+Sun Dec 23 16:12:40 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Fix 1.9 warnings.
+
+Sun Dec 23 15:28:37 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems, test/rubygems:  Fix new 1.9 warnings.
+
+Sun Dec 23 14:43:10 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb:  Use require to load rubygems.rb so the correct path
+	  is in $LOADED_FEATURES on RubyGems upgrade.
+
+Sun Dec 23 11:26:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_call): use exact argument array interface.
+	  [ruby-core:14279]
+
+Sun Dec 23 11:01:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_binmode_m): removed C99ism.
+
+Sun Dec 23 10:23:23 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode_data_one_byte.c: Better (and more honest) optimization.
+
+	* transcode_data_japanese.c: First optimization step.
+
+Sun Dec 23 09:07:02 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h, encoding.c, re.c, io.c, parse.y, numeric.c,
+	  ruby.c, transcode.c, ext/nkf/nkf.c: rename rb_ascii_encoding to
+	  rb_ascii8bit_encoding.  rb_ascii_encoding is ambiguous with
+	  ASCII-8BIT and US-ASCII.
+
+Sun Dec 23 03:35:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* version.h: use patchlevel if revision is not set.
+
+	* {bcc32,win{32,ce}}/setup.mak (-version-): skip including revision.h.
+
+	* common.mk (srcs): new target to generated sources.
+
+	* common.mk (encs, ext/ripper/ripper.c): MAKEFLAGS needs -.
+
+	* enc/depend, enc/make_encmake.rb: use erb.
+
+Sun Dec 23 01:56:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_mode_enc): do not set encoding unless explicitly
+	  specified.
+
+	* io.c (rb_io_check_readable): fill fptr->enc by default_external
+	  if it's empty.
+
+	* io.c (io_enc_str): fptr->enc is always set for reading IO (by
+	  rb_io_check_readable(fptr)).
+
+Sun Dec 23 01:18:06 2007  David Flanagan  <david@davidflanagan.com>
+
+	* io.c, io.h: temporary patch to partially implement
+	  transcode-on-read and transcode-on-write
+
+Sun Dec 23 00:48:05 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: added tests for SSL.
+
+Sat Dec 22 21:10:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_genericresolver_node_import): should
+	  not set instance variable "@kind" before initializing it.
+	  [ruby-dev:32677]
+
+Sat Dec 22 19:52:23 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_objectspace.rb: fix condition.
+
+Sat Dec 22 19:17:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/probeprofiler/: removed.
+
+Sat Dec 22 19:14:38 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* process.c (rb_f_fork): Unsupport Kernel.fork() on NetBSD.
+
+Sat Dec 22 18:20:13 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (version.o): add dependency. [ruby-dev:32680]
+
+Sat Dec 22 17:45:11 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (Init_nkf): use rb_ascii_encoding() for
+	  rb_nkf_enc_get("US-ASCII").
+	  * if use rb_nkf_enc_get("US-ASCII"), ruby will crash - this is bug?
+
+Sat Dec 22 17:39:03 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb ($extmk): fixed broken condition.
+
+Sat Dec 22 17:35:59 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8.c: Update nkf.c rev:1.157.
+
+	* ext/nkf/nkf.c (rb_nkf_enc_get): replicate proper based encoding.
+
+	* ext/nkf/kconv.c (Kconv#kconv, to*): use self.encoding as from_enc
+	  when from_enc isn't given.
+
+Sat Dec 22 17:06:50 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext.build): removed.
+
+	* ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext#set_params):
+	  new method to set suitable SSL parameters.
+
+	* lib/net/pop.rb, lib/net/http.rb, lib/net/imap.rb,
+	  test/openssl/test_ssl.rb: follow above change.
+
+	* test/net/http/test_https.rb: refine error case.
+
+Sat Dec 22 16:58:49 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (encode_utf7): accept UTF-8 strings.
+
+	* lib/net/imap.rb (decode_utf7): return UTF-8 strings.
+
+Sat Dec 22 15:56:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* transcode_data_japanese: typo.
+
+Sat Dec 22 15:54:54 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* ChangeLog: Information for last patch got lost, fixed
+
+	* test/ruby/test_transcode.rb: Added simple tests for
+	  EUC-JP and Shift_JIS and tests for ASCII-only range
+
+Sat Dec 22 15:45:45 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode_data_one_byte: slightly optimized
+
+	* transcode_data_japanese: new data file for EUC-JP and SHIFT_JIS
+	  (not yet optimized; tests to follow; data from
+	  http://nkf.sourceforge.jp/ucm/{SJIS|eucJP}-nkf.ucm)
+
+	* common.mk, transcode.c: Adjusted for transcode_data_japanese
+
+Sat Dec 22 15:30:13 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* */Makefile.sub (MFLAGS): define unless defined.
+
+Sat Dec 22 15:17:40 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb ($extmk): set true only when under ext/ or tool/.
+
+Sat Dec 22 15:14:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (encs, ext/ripper/ripper.c): needs MFLAGS.
+
+	* configure.in (STRINGIZE): stringizing macro.
+
+	* include/ruby/defines.h (STRINGIZE): fallback.
+
+	* tool/make-snapshot: new file.
+
+	* version.c (ruby_description, ruby_copyright): string constants for
+	  -v option.
+
+Sat Dec 22 15:03:37 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (initialize): fixed documentation.
+
+Sat Dec 22 15:01:16 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/pop.rb (enable_ssl): use OpenSSL::SSL::SSLContext.build
+	  instead of SSLContext.new (default verify mode is now
+	  OpenSSL::SSL::VERIFY_PEER).
+
+Sat Dec 22 14:45:21 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: shouldn't freeze nil. [ruby-dev:32677]
+
+Sat Dec 22 14:27:27 2007  Tanaka Akira  <akr@fsij.org>
+
+	* regenc.c (onigenc_ascii_is_code_ctype): moved from enc/ascii.c.
+
+	* regenc.h (onigenc_ascii_is_code_ctype): declared.
+
+	* enc/ascii.c: use onigenc_ascii_is_code_ctype.
+
+	* enc/us_ascii.c: new file for US-ASCII.
+
+Sat Dec 22 14:30:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_named_capture_assign_iter): allows non-ascii names and
+	  get rid of reserved word IDs.
+
+Sat Dec 22 14:18:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_float.rb, test_sprintf.rb: fix test place.
+
+Sat Dec 22 14:17:02 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_objectspace.rb: skip frozen string.
+
+Sat Dec 22 14:02:58 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_permutation): add volatile to avoid GC problem.
+
+Sat Dec 22 11:47:42 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_obj_instance_eval): use class of immediate objects.
+
+	* test/ruby/test_eval.rb: fix a test.
+
+Sat Dec 22 11:37:06 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* encoding.c (rb_locale_charmap): win32 support.
+
+Sat Dec 22 11:31:14 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb:  Place bin dir before lib dir so gem bin stubs work.
+
+Sat Dec 22 11:05:44 2007  Jim Weirich  <jim@tardis.local>
+
+	* lib/rake.rb (Rake): Added Rake and related libraries to the
+	  source code base.
+
+Sat Dec 22 10:30:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/insns2vm.rb: moved from lib/vm/instruction.rb.
+
+Sat Dec 22 10:25:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (reg_named_capture_assign_iter): captured name should
+	  not be reserved word.  a patch from Keita Yamaguchi
+	  <keita.yamaguchi AT gmail.com> in [ruby-dev:32675].
+
+	* parse.y (reg_named_capture_assign_iter): just ignore the
+	  captures that do not have valid local variable name.
+
+Sat Dec 22 10:19:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_method_name): now __method__ and __callee__ are
+	  aliases.  [ruby-core:14244]
+
+Sat Dec 22 08:29:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_buf_append): improvement for non-broken coded
+	  strings.
+
+Sat Dec 22 06:30:04 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_fork.rb: skip if fork is not unsupported.
+
+	* bootstraptest/test_io.rb: skip if require failed.
+
+Sat Dec 22 06:09:12 2007  David Flanagan  <david@davidflanagan.com>
+
+	* io.c: fix typo in rdoc comment
+
+Sat Dec 22 05:09:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed.
+
+	* ext/nkf/nkf.c (rb_nkf_putchar): ditto.
+
+Sat Dec 22 03:54:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_ascii_encoding): renamed from previous
+	  rb_default_encoding().
+
+Sat Dec 22 02:49:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (command): block from cmd_brace_block was ignored.
+	  [ruby-dev:32644]
+
+	* re.c (rb_reg_prepare_re): stop ENCODING_NONE warning if the
+	  encoding of the str is ASCII-8BIT.
+
+Sat Dec 22 01:52:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_ungetc): avoid buffer relocation, which might cause
+	  serious problem under concurrent situation.
+
+Sat Dec 22 01:35:41 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (ARG_ENCODING_NONE): defined for /.../n option.
+	  (REG_ENCODING_NONE): ditto.
+	  (rb_char_to_option_kcode): return ARG_ENCODING_NONE for n.
+	  (rb_reg_prepare_re): warn /ascii/n =~ "non-ascii".
+	  (rb_reg_initialize): set REG_ENCODING_NONE from ARG_ENCODING_NONE.
+
+Sat Dec 22 01:23:10 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/json/test_json_addition.rb (test_core): do not use Time.now
+	  because JSON can't hold nsec.
+
+Sat Dec 22 01:10:30 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/tk/sample/tkextlib/vu/canvSticker2.rb,
+	  ext/tk/sample/demos-{en,jp}/bind.rb: fix typo. [ruby-dev:32668]
+
+Sat Dec 22 00:56:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/test.rb (valid_syntax): force_encoding input script.
+
+Fri Dec 21 23:48:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (depend_rules): suffixes list broken. fixed.
+
+Fri Dec 21 20:18:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_mul0): remove unused variable.
+
+	* bignum.c (bigdivrem): ditto.
+
+Fri Dec 21 20:13:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_catch_obj, rb_throw_obj): prototyped.
+
+	* include/ruby/intern.h (rb_fiber_alive_p): prototyped.
+
+Fri Dec 21 20:09:18 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_succ): retry increasing until valid char is found.
+
+Fri Dec 21 20:00:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_replicate): now creates first class encoding.
+
+	* encoding.c (rb_define_dummy_encoding): always based on the default
+	  encoding.
+
+	* encoding.c (rb_enc_dummy_p): check if dummy.
+
+	* encoding.c (enc_inspect): shows if dummy.
+
+	* encoding.c (Init_Encoding): added dummy? method
+
+	* include/ruby/encoding.h (ENCODING_INLINE_MAX): increased.
+
+Fri Dec 21 18:40:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* io.c: write() should be in blocking region.
+
+	* bootstraptest/test_io.rb, test_knownbug.rb: move a fixed test.
+
+Fri Dec 21 17:56:30 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: provisional support on Ruby-VM.
+
+	* ext/tk/MANUAL_tcltklib.eng, ext/tk/MANUAL_tcltklib.eucj:
+	  modify document about new functions.
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/labelframe.rb,
+	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/toplevel.rb,
+	  ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/message.rb,
+	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/text.rb,
+	  ext/tk/lib/tk/scale.rb, ext/tk/lib/tk/entry.rb,
+	  ext/tk/lib/tk/ttk_selector.rb, ext/tk/lib/tk/menu.rb,
+	  ext/tk/lib/tk/label.rb, ext/tk/lib/tk/spinbox.rb,
+	  ext/tk/lib/tk/textmark.rb, ext/tk/lib/tk/winpkg.rb,
+	  ext/tk/lib/tk/checkbutton.rb, ext/tk/lib/tk/panedwindow.rb,
+	  ext/tk/lib/tk/texttag.rb, ext/tk/lib/tk/root.rb,
+	  ext/tk/lib/tk/textimage.rb, ext/tk/lib/tk/radiobutton.rb,
+	  ext/tk/lib/tk/package.rb, ext/tk/lib/tk/macpkg.rb,
+	  ext/tk/lib/tk/composite.rb, ext/tk/lib/tk/autoload.rb,
+	  ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/button.rb,
+	  ext/tk/lib/tk/textwindow.rb,
+	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb,
+	  ext/tk/lib/tkextlib/tile/style.rb,
+	  ext/tk/lib/tkextlib/tile/tscrollbar.rb,
+	  ext/tk/lib/tkextlib/tile/tpaned.rb, ext/tk/lib/tkextlib/tile.rb,
+	  ext/tk/extconf.rb: support Tcl/Tk8.5 (partial, not complete).
+
+	* ext/tk/sample/demos-jp/widget,
+	  ext/tk/sample/demos-jp/pendulum.rb,
+	  ext/tk/sample/demos-jp/bind.rb,
+	  ext/tk/sample/tkextlib/vu/canvSticker2.rb,
+	  ext/tk/sample/demos-en/pendulum.rb,
+	  ext/tk/sample/demos-en/bind.rb: remove $KCODE and minor bug fix.
+
+Fri Dec 21 17:49:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_str_transcode_bang): returns self if no conversion.
+	  [ruby-dev:32662]
+
+Fri Dec 21 17:44:47 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*:  Update to RubyGems 1.0.1, r1581
+
+Fri Dec 21 17:32:49 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/pending.rb: renamed from featurebug.rb.
+	  This file contains bugs which is known but will not be
+	  fixed in days.
+
+Fri Dec 21 17:31:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (dummy_gdb_enums.various): added ENCODING and CODERANGE
+	  constants.
+
+	* .gdbinit: use enum constants.
+
+Fri Dec 21 17:28:17 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/featurebug.rb: added.
+
+	* bootstraptest/test_knownbug.rb: move a feature bug.
+
+Fri Dec 21 17:25:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_atfork): fix to mark thread object.
+	  [ruby-dev:32404]
+
+	* bootstraptest/test_knownbug.rb, test_fork.rb: move a fixed test.
+
+Fri Dec 21 17:07:13 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.h: extern variable should not be initialized.
+
+	* thread_pthread.c: add a parameter.
+
+Fri Dec 21 16:50:43 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (Init_Encoding): use enc_name as to_s.
+	  (enc_inspect): renamed from enc_to_s.  add "#" at beginning.
+
+Fri Dec 21 16:37:43 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/config.h (MIME_DECODE_DEFAULT, X0201_DEFAULT):
+	 defined as FALSE.  nkf and kconv don't decode MIME encoded string
+	 and don't convert JIS X 0201 Katakana.
+
+	* test/nkf/test_kconv.rb: fix tests.
+
+Fri Dec 21 16:33:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_iter_i): adjusted for rb_block_call_func.
+
+	* include/ruby/ruby.h (rb_block_call_func): function to be called back
+	  as block.
+
+Fri Dec 21 16:25:25 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk, transcode_data_iso_8859.c: renamed to
+	  transcode_data_one_byte.c.
+
+Fri Dec 21 16:10:30 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug
+	  pointed by Ryan Platte fixed(Patch to the patch from "NATORI
+	  Shin").  [ruby-talk:273360]
+
+Fri Dec 21 16:06:13 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (append_utf8): use rb_utf8_encoding() instead of
+	  rb_enc_find("utf-8").
+
+Fri Dec 21 15:59:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_init): use enc_register_at() directly.
+
+	* encoding.c (rb_utf8_encoding): returns utf-8 encoding.
+
+	* include/ruby/encoding.h (rb_utf8_encoding): prototyped.
+
+	* parse.y (UTF8_ENC): uses rb_utf8_encoding().
+
+Fri Dec 21 15:31:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_read): allow specifying encoding explicitly.
+
+	* io.c (rb_io_binmode): specifies encoding to ASCII-8BIT (binary).
+
+	* io.c (rb_io_s_read): IO should be in binary mode when offset is
+	  specified.
+
+	* encoding.c (rb_to_encoding): returns default encoding if no
+	  corresponding encoding found.
+
+Fri Dec 21 15:24:22 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (initialize): accept service name.  changed
+	  the default value of the old style +verify+ argument to true.
+
+Fri Dec 21 15:15:44 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (rb_garbage_collect): new function for debugging.
+
+Fri Dec 21 15:16:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_to_encoding_index): should return error instead of
+	  exception even if type is incorrect.
+
+Fri Dec 21 14:58:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_init_copy): prohibit cloning of
+	  generators since Fibers cannot be copied.
+
+	* enumerator.c (enumerator_init_copy): typo fixed.
+
+Fri Dec 21 14:46:07 2007  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (Init_IO): define IO::BINARY even if O_BINARY is not exist.
+
+Fri Dec 21 14:01:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_system.rb (TestSystem::valid_syntax): apply
+	  ASCII-8BIT encoding explicitly.
+
+	* re.c (rb_reg_prepare_re): add encoding name in the message.
+
+Fri Dec 21 13:54:05 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c: change "character encodings differ" error messages.
+
+Fri Dec 21 13:46:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_register): set encoding constant.
+
+	* encoding.c (rb_enc_find_index): replace non-alphanumeric chars with
+	  underscores, so that initialize function can be called.
+
+	* encoding.c (rb_enc_find_index): extension libraries have lower case
+	  names conventionally.
+
+	* ruby.c (proc_options, process_options): finds encoding after
+	  load_path is initialized.
+
+Fri Dec 21 13:10:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_external_encoding): new method.
+
+	* encoding.c (rb_enc_from_encoding): returns Qnil for NULL
+	  encoding.
+
+	* io.c (rb_io_external_encoding): should fill delayed
+	  initialization for STDIN.
+
+Fri Dec 21 13:09:11 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_locale_charmap): return nil if no locale information.
+
+Fri Dec 21 12:55:39 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/runit, lib/rubyunit.rb, test/testunit/runit: removed.
+
+Fri Dec 21 12:45:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_chomp_bang): avoid unnecessary loop using
+	  ONIGENC_LEFT_ADJUST_CHAR_HEAD().
+
+Fri Dec 21 12:32:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (Init_File): File.exists? revived.
+
+	* dir.c (Init_Dir): Dir.exists? again.
+
+Fri Dec 21 12:26:36 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: remove "illegal".
+
+Fri Dec 21 12:22:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* keywords, parse.y (__ENCODING__): represent script encoding.
+
+Fri Dec 21 12:16:50 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_is_ascii_only_p): new method ascii_only?.
+
+Fri Dec 21 12:11:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_mode_enc): set default external encoding if no
+	  encoding specified explicitly.
+
+Fri Dec 21 12:00:34 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: check langinfo.h and locale.h.
+
+	* encoding.c: use langinfo.h only if available.
+
+	* main.c: use locale.h only if available.
+
+Fri Dec 21 11:47:56 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c: include locale.h
+	  (rb_locale_charmap): new method Encoding.locale_charmap for
+	  nl_langinfo(CODESET).
+
+	* include/ruby/encoding.h (rb_locale_charmap): declared.
+
+	* main.c (main): call setlocale with LC_CTYPE.
+
+	* ruby.c (locale_encoding): use rb_locale_charmap.
+
+Fri Dec 21 11:35:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, vm_dump.c: fix typo.  Reported by Yuki Mitsui.
+
+Fri Dec 21 11:28:00 2007  Tanaka Akira  <akr@fsij.org>
+
+	* regerror.c, string.c, io.c, lib/getoptlong.rb, lib/net/imap.rb,
+	  compile.c, sprintf.c, parse.y, ext/win32ole/win32ole.c,
+	  ext/tk/sample/demos-en/entry3.rb, ext/tk/lib/tcltk.rb,
+	  ext/openssl/ossl_bn.c, numeric.c, vm.c,
+	  benchmark/bm_so_meteor_contest.rb, bignum.c, ruby.c: don't "illegal"
+	  for non law violation context.
+
+Fri Dec 21 11:23:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
+
+	* encoding.c (Init_Encoding): ISO-8859-1 is no longer a replica.
+
+	* regenc.h (OnigEncodingDefine): names of extension and encoding can
+	  differ.
+
+	* enc/Makefile.in: always shared.
+
+	* enc/depend (deffile): should not upcase.
+
+	* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: fix for Init.
+
+Fri Dec 21 09:26:48 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb: use erb.
+
+Fri Dec 21 08:07:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_next): should call next_init() if fiber
+	  is dead already. [ruby-dev:32459]
+
+Fri Dec 21 01:21:49 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLContext.build):
+	  enable CRL checking by default.
+
+Fri Dec 21 01:20:56 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/net/http.rb (Net::HTTP#connect): use
+	  OpenSSL::SSL::SSLContext.build instead of SSLContext.new (default
+	  verify mode is now OpenSSL::SSL::VERIFY_PEER).
+
+	* lib/net/https.rb: SSL parameters are defined by attr_accessor.
+
+	* test/net/http/test_https.rb: add test for HTTPS features.
+
+Fri Dec 21 01:11:37 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* io.c (select_internal): should return original value.
+
+Fri Dec 21 00:26:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (tr_trans): wrong encoding check for tree strings.
+
+	* test/ruby/test_m17n.rb (TestM17N::test_tr_s): "invalid mbstring
+	  sequence" is not an error to be tested.
+
+	* test/ruby/test_m17n.rb (TestM17N::test_tr): ditto.
+
+Thu Dec 20 19:29:07 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (initialize): the second argument is an option
+	  hash now.  use SSLContext.build to specify SSL parameters.
+
+Thu Dec 20 19:11:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (native_thread_apply_priority): check
+	  _POSIX_PRIORITY_SCHEDULING for OpenBSD.
+
+Thu Dec 20 18:33:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* configure.in: add libthr for FreeBSD.
+
+Thu Dec 20 18:17:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk, *.ci: renamed to *.c.
+
+	* eval_load.c: renamed to load.c.
+
+Thu Dec 20 17:36:01 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*:  Import RubyGems 1.0.0, r1575.
+
+Thu Dec 20 17:18:38 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c: support Proc#binding.
+
+	* sample/test.rb: add a test.
+
+Thu Dec 20 17:15:15 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* pack.c: Slight change to documentation ('character' ->
+	  'byte (C char)'). [ruby-core:13126], see also [ruby-core:13998].
+
+Thu Dec 20 17:07:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (enc.mk): depends on rbconfig.rb.
+
+	* regenc.h (OnigEncodingDefine): external encoding definition macro.
+
+	* enc/Makefile.in: fix for linking.
+
+	* enc/depend, enc/make_encmake.rb: fix for Windows.
+
+	* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: renamed.
+
+Thu Dec 20 16:42:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (find_line_no): return 0 if not found.
+
+Thu Dec 20 16:04:17 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci, vm.c, vm_core.h: change interface of
+	  vm_invoke_block() to specify block ptr.  [ruby-talk:266422]
+
+	* cont.c, eval_jump.ci, insns.def, proc.c, signal.c, thread.c:
+	  apply above change.
+
+	* bootstraptest/test_knownbug.rb: move fixed bug.
+
+	* bootstraptest/test_block.rb: ditto. and add a test.
+
+Thu Dec 20 15:47:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/iso_8859_{1..16}.c: renamed.
+
+Thu Dec 20 09:59:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_expandarray): fix sp increase place.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32581].
+
+	* bootstraptest/test_massign.rb: add a test for above.
+
+	* bootstraptest/test_syntax.rb: fix last committed test.
+
+Thu Dec 20 09:47:58 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_syntax.rb: add a test.
+
+Thu Dec 20 09:40:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each/NODE_RETURN): fix stack consistency.
+
+Thu Dec 20 09:42:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (big2str_orig): access beyond memory region cause crash
+	  on interrupt.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in
+	  [ruby-dev:32651].  [ruby-dev:32641]
+
+Thu Dec 20 09:06:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_index): wrong starting position.
+
+Thu Dec 20 06:34:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): add pop after throw as return.
+
+	* bootstraptest/test_knownbug.rb, test_syntax.rb: move resolved test.
+
+	* vm_core.h, iseq.c, compile.h: add debug output code.
+
+Thu Dec 20 04:57:18 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): remove unused retry entry.
+
+Thu Dec 20 04:15:41 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* */Makefile.sub (DEFS, RM): output to config.status.
+
+Thu Dec 20 02:59:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* common.mk (encs): create encoding directory.
+
+Thu Dec 20 02:50:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/iso8859_{1..16}.c: adjust for ruby.
+
+Thu Dec 20 02:28:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/iso8859_{1..16}.c: imported from Onigiruma 5.9.0.
+
+Thu Dec 20 02:23:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/Makefile.in (RM): added.
+
+	* enc/depend (encs): sort in alpha-numeric order.
+
+	* enc/depend (clean, distclean): added.
+
+Thu Dec 20 01:10:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): should handle upper level eval iseq
+	  from break/next, and COMPILE_ERROR() breaks only one block.
+	  [ruby-dev:31372]
+
+Thu Dec 20 00:07:36 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/drbtest.rb (test_07_public_private_protected_missing):
+	  followed current Ruby specification.
+
+Wed Dec 19 23:57:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
+	  is not needed.  [ruby-dev:32640]
+
+Wed Dec 19 22:59:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_sublen): adjust position if position is not at the
+	  head of a character.
+
+	* string.c (rb_str_chomp_bang): check if match start at the head
+	  of a character.
+
+	* string.c (rb_str_chomp_bang): wrong adjust condition.
+
+	* string.c (rb_str_rindex): comparison length should be based on
+	  bytes, not characters.
+
+	* string.c (rb_str_rindex_m): too much adjustment.
+
+	* re.c (reg_match_pos): pos adjustment should be based on
+	  characters.
+
+	* test/ruby/test_m17n.rb (TestM17N::test_str_insert): test updated
+	  to check negative offset behavior.
+
+	* string.c (rb_str_each_line): should consider rslen.
+
+	* string.c (rb_str_buf_append): should propagate encoding.
+
+	* string.c (rb_str_each_line): ditto.
+
+	* test/ruby/test_m17n.rb (TestM17N::test_str_each_line): should
+	  check encoding as well.
+
+	* test/ruby/test_m17n.rb (TestM17N::test_str_each_line): empty
+	  array can not propagate encoding;  should not check.
+
+Wed Dec 19 21:42:18 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_regsub): should set checked encoding.
+
+	* string.c (rb_str_sub_bang): applied r14212 too.
+
+Wed Dec 19 20:40:01 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (bigmul1): C99ism.
+
+	* bignum.c (bigdivrem1): need dummy return value.
+
+Wed Dec 19 19:18:06 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Updated.
+
+	* ext/nkf/nkf.c (rb_nkf_enc_get): added.
+	  (find encoding or replicate default encoding)
+
+	* ext/nkf/nkf.c (NKF::<ENCODING>): redefine encoding constant.
+
+	* ext/nkf/lib/kconv.rb (Kconv::<ENCODING>): redefined as Encoding.
+
+	* ext/nkf/lib/kconv.rb: refactoring.
+
+Wed Dec 19 19:11:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_mul0): blocking check for bigger numbers.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32632].
+
+	* bignum.c (bigdivrem): ditto.
+
+Wed Dec 19 17:34:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): remove "retry" in block.
+	  ("iter{retry}" cause syntax error)
+	  Currently, "begin; ...; rescue; iter{retry}; end" cause
+	  syntax error too.
+
+	* bootstraptest/test_jump.rb: ditto.
+
+	* lib/drb/invokemethod.rb: ditto.
+
+	* sample/drb/darrayc.rb: ditto.
+
+	* sample/test.rb: ditto.
+
+	* test/drb/drbtest.rb: ditto.
+
+	* test/ruby/test_iterator.rb: ditto.
+
+	* sample/test.rb: add a 'test' directory on the SYSTEM test.
+
+Wed Dec 19 17:12:59 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb, test_block.rb:
+	  move fixed bug.
+
+	* bootstraptest/test_m17n.rb: added.
+
+Wed Dec 19 16:59:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (errinfo_place): skip if error is Fixnum.  [ruby-dev:32608]
+
+	* bootstraptest/test_exception.rb, test_known_bug.rb: move fixed bug.
+
+Wed Dec 19 16:31:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_named_capture_assign_iter): remove C99 dependency.
+
+	* parse.y (reg_named_capture_assign_iter): get rid of creating
+	  unnecessary ID.
+
+	* parse.y (rb_enc_symname2_p): check for non-nul-terminated string.
+
+Wed Dec 19 15:37:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insnhelper.ci (vm_yield_with_cfunc): call cfunc with
+	   (argv[0], data, argc, argv) to pass all arguments.
+
+	* enumerator.c (enumerator_each_i): adapted to new calling
+	  convention.
+
+Wed Dec 19 15:13:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_justify): should propagate encoding from pad
+	  string too.
+
+Wed Dec 19 13:57:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
 	  arguments.  [ruby-dev:32631]
 
-Sun Jun  8 05:37:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Dec 19 13:22:14 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (NKF::_ENCODING): removed.
+
+	* ext/nkf/nkf.c (rb_nkf_kconv): renamed to rb_nkf_convert.
 
-	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
+	* ext/nkf/nkf.c (rb_nkf_convert): set encoding.
 
-Sun Jun  8 05:32:45 2008  Tanaka Akira  <akr@fsij.org>
+	* ext/nkf/nkf.c (rb_nkf_guess1): removed.
 
-	* gc.c (stack_end_address): use local variable address instead of
-	  __builtin_frame_address(0) to avoid SEGV on SunOS 5.11 on x86 with 
-	  gcc (GCC) 3.4.3 (csl-sol210-3_4-20050802).
+	* ext/nkf/nkf.c (rb_nkf_guess2): renamed to rb_nkf_guess.
 
-Sun Jun  8 05:24:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/nkf/nkf.c (rb_nkf_guess):
+	  guess method now returns encoding object.
+
+	* ext/nkf/nkf-utf8/nkf.c: Update to nkf 2.0.8 2007-12-19.
+
+Wed Dec 19 10:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_cstr_to_inum): an underscore succeeding after octal
+	  prefix is allowed.  [ruby-core:14139]
+
+Wed Dec 19 00:09:19 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_cstr_to_inum): wrong radix check.  a patch from
+	  Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32628].
+
+	* bignum.c (big2str_find_n1): ditto.
+
+Tue Dec 18 23:53:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): fix for segfault.  [ruby-dev:31372]
+
+Tue Dec 18 23:44:32 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/net/http/utils.rb: split TestNetHTTPUtils module from
+	  test/net/http/test_http.rb. and start HTTP server in each test case.
+
+Tue Dec 18 23:27:51 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
+	  should rescue Errno::EINVAL from TCPServer#accept. this exception
+	  might occur if the server socket is not in ready to listen.
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
+	  don't call TCPServer#close if the :ShutdownSocketWithoutClose is set.
+
+	* lib/webrick/config.rb (WEBrick::Config::General): add new parameter
+	  :ShutdownSocketWithoutClose.
+
+Tue Dec 18 22:51:47 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#shutdown):
+	  new method which calls TCPSocket#shutdown of the underlying socket.
+
+Tue Dec 18 22:11:50 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/rss/parser.rb, lib/rss/atom.rb, lib/rss/rss.rb,
+	  test/rss/rss-assertions.rb, test/rss/test_atom.rb: use
+	  pack/unpack("m") instead of base64 library.
+
+	* lib/webrick/httpproxy.rb: use delete("\n") instead of chomp/chop
+	  because the result of pack("m") might be multi-line.
+
+Tue Dec 18 22:12:35 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci, vm.c: rewrite sp manipulation around method/block
+	  invocation.  [ruby-dev:32547]
+
+Tue Dec 18 22:11:23 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/sspi.rb: use pack/unpack("m") instead of
+	  base64 library which was already removed.
+
+Tue Dec 18 21:09:23 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block): merge 2 stack overflow checks.
+
+Tue Dec 18 20:58:35 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insnhelper.ci, insns.def, object.c, vm.c, vm.h:
+	  optimize !@, != method invocation.
+
+	* id.c, id.h: ditto.
+
+	* bootstraptest/test_syntax.rb: add tests for above.
+
+Tue Dec 18 18:10:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: add issues.
+
+Tue Dec 18 20:22:44 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (arg tMATCH arg): call reg_named_capture_assign_gen if regexp
+	  literal is used.
+	  (reg_named_capture_assign_gen): assign the result of named capture
+	  into local variables.
+	  [ruby-dev:32588]
+
+	* re.c: document the assignment by named captures.
+
+Tue Dec 18 18:09:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_splice): propagate encoding.
+
+	* string.c (rb_str_subpat_set): ditto.
+
+Tue Dec 18 17:27:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_freeze): preserve frozen state of immediate
+	  values in internal hash table, a la generic_ivar.
+
+	* object.c (rb_obj_frozen_p): check immediate values too.
+
+	* variable.c (generic_ivar_set): add frozen check fro immediate
+	  values.
+
+Tue Dec 18 17:04:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_str_transcode_bang, rb_str_transcode): set new
+	  encoding even if no conversion is done because of 7bit only.
+	  [ruby-dev:32591]
+
+Tue Dec 18 15:43:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (encs, ext/ripper/ripper.c): other options must come
+	  before MAKEFLAGS in GNU make.
+
+Tue Dec 18 15:19:55 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_rb.rb: Don't call private fail anymore.
+
+Tue Dec 18 15:17:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (encs, ext/ripper/ripper.c): pass MAKEFLAGS.
+
+Tue Dec 18 14:45:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (op_tbl): remove duplication to avoid symbol aliases.
+
+Tue Dec 18 14:39:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_nth): need not to raise out-of-range exception.
+
+	* test/ruby/test_m17n.rb (TestM17N::test_str_aref_len): removed
+	  debug print.
+
+Tue Dec 18 14:05:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend: get rid of target expanded as empty for nmake.
+
+Tue Dec 18 07:56:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* proc.c (rb_obj_public_method): Object#public_method to retrieve
+	  public method object.
+
+	* proc.c (rb_mod_public_instance_method): Module#public_instance_method
+	  to retrieve public instance method from class / module.
+
+	* proc.c (mnew): visibility check added.
+
+	* eval_error.ci (rb_print_undef): add rb_ prefix.
+
+	* eval_error.ci (rb_print_undef): add visibility in the error
+	  message.
+
+Tue Dec 18 05:54:26 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/Env.rb, lib/base64.rb, lib/importenv.rb, lib/eregex.rb: removed.
+
+	* lib/ping.rb, lib/readbytes.rb: removed
+
+Tue Dec 18 02:30:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (BUILTIN_ENCS): removed.
+
+	* common.mk (enc.mk): pass BUILTIN_ENCS from command line.
+
+	* enc/depend: ditto.
+
+	* enc/make_encmake.rb: ditto.
+
+Tue Dec 18 01:46:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): need to clear output buffer to avoid
+	  broken encoding compatibility check.
+
+Tue Dec 18 01:40:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (depend_rules): inserts ruby to only headers.
+
+Tue Dec 18 01:21:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_encode_length): chomp eol style modifiers.
+
+	* parse.y (parser_magic_comment): ditto.
+
+	* parse.y (set_file_encoding): ditto.
+
+Tue Dec 18 01:15:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (encs): added dependencies.
+
+	* enc/Makefile.in, enc/depend, enc/make_encmake.rb: moved serb code.
+
+	* lib/mkmf.rb (depend_rules): now takes content string, not file name.
+
+	* win32/enc-setup.mak: overrides default target.
+
+Tue Dec 18 00:26:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): raise error if non-Unicode fixed
+	  encoding option is specified for regexp literals with \u{}
+	  escapes.
+
+	* string.c (rb_str_squeeze_bang): should squeeze multibyte
+	  characters as well.
+
+Mon Dec 17 21:41:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/enc-setup.mak: extracts BUILTIN_ENCOBJS.
+
+	* tool/compile_prelude.rb: needs srcdir.
+
+Mon Dec 17 21:24:04 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* common.mk (miniprelude.c): add -I$(srcdir).
+
+Mon Dec 17 20:53:27 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ssl_version):
+	  new method OpenSSL::SSL::SSLContext#ssl_version to wrap
+	  SSL_CTX_set_ssl_version.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_get_verify_result):
+	  new method OpenSSL::SSL::SSLSocket#verify_result to wrap
+	  SSL_get_verify_result.
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLContext.build):
+	  new method to build OpenSSL::SSL::SSLContext with Hash parameters.
+	  this method provides safety default parameters than SSLContext.new.
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL.verify_certificate_identity):
+	  new module function: pull out identity verification process
+	  from OpenSSL::SSL::SSLSocket#post_connection_check.
+
+Mon Dec 17 18:42:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (scan_once): need no encoding compatibility check.
+	  it's done inside of re_reg_search().
+
+	* string.c (rb_str_split_m): ditto.
+
+	* re.c (rb_reg_regsub): ditto.
+
+Mon Dec 17 17:50:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_index): check if substring is broken.
+
+	* string.c (rb_str_rindex): ditto.
+
+	* string.c (rb_str_succ): should carry over.
+
+Mon Dec 17 17:47:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (encs): new target to compile external encodings.
+
+	* enc/Makefile.in: became a serb template.
+
+	* enc/make_encmake.rb: creates enc.mk from enc/Makefile.in using serb.
+
+	* lib/mkmf.rb (relative_from): moved from ext/extmk.rb.
+
+	* lib/mkmf.rb ($extmk): true if under to top source directory, not
+	  only ext.
+
+	* lib/mkmf.rb (depend_rules): extracted from create_makefile.
+
+	* tool/serb.rb (serb): splitted from tool/compile_prelude.rb.
+
+Mon Dec 17 17:32:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (MAKEFILES): removed enc/Makefile.
+
+	* configure.in (EXTERNAL_ENCOBJS, ENCSOS): removed.
+
+	* enc/Makefile.in (BUILTIN_ENCS): includes .c suffix.
+
+	* enc/depend: splitted from Makefile.in.
+
+	* {bcc32,win32,wince}/setup.mak (-encs-): extracts BUILTIN_ENCOBJS.
+
+Mon Dec 17 17:07:53 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_enc_str_asciionly_p): use rb_enc_str_coderange.
+
+Mon Dec 17 16:39:25 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_enc_str_coderange): set ENC_CODERANGE_BROKEN using
+	  rb_enc_precise_mbclen.
+	  (rb_str_valid_encoding_p): just check coderange is
+	  ENC_CODERANGE_BROKEN or not.
+
+Mon Dec 17 16:04:16 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#gets): added second
+	  optional argument to specify maximum length limit.
+
+Mon Dec 17 16:02:30 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb, lib/webrick/cgi.rb: Request-Line or
+	  header fields should be read with maximum length. [ruby-talk:231745]
+
+Mon Dec 17 14:03:39 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (ENC_CODERANGE_VALID): rename from
+	  ENC_CODERANGE_8BIT.
+
+	* string.c (rb_enc_str_coderange): follow the renaming.
+
+Mon Dec 17 13:56:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (tr_find): wrong condition fixed.
+
+	* sprintf.c (rb_str_format): check encoding based on result, not
+	  the format string.
+
+	* string.c (rb_str_upto): add encoding check.
+
+Mon Dec 17 12:21:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (RUNRUBY): added RUNRUBYOPT.
+
+Mon Dec 17 11:38:59 2007  Tanaka Akira  <akr@fsij.org>
+
+	* thread_win32.ci (native_thread_create): initialize
+	  th->machine_stack_maxsize as rb_gc_stack_maxsize.
+
+Sun Dec 16 17:07:35 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c (transcode_loop): removed special case (-1)
+	  for undefined conversions.
+
+	* transcode_data_iso_8859.c: Changed from character constants
+	  ('\xC2') to integer constants (0xC2) for shorter files and
+	  better readability; eliminated duplicated tables; changed
+	  from -1 offset to actual UNDEF entry (not yet distinguishing
+	  UNDEF and ILLEGAL correctly).
+
+	* test/ruby/test_transcode.rb: added a test for UNDEF conversion.
+
+Sun Dec 16 14:51:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (MAKEFILES): should be enc/Makefile, not GNUmakefile.
+	  [ruby-dev:32609]
+
+	* configure.in (BUILTIN_ENCS): removed escapes for OpenBSD.
+
+Sat Dec 15 23:58:46 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_pair.rb (SSLPair#ssl_pair): join the thread, even
+	  on an error.
+
+Sat Dec 15 23:50:31 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc/webrick_testing.rb: join webrick server thread.
+
+Sat Dec 15 22:27:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (BUILTIN_ENCS): splitted command line instead of
+	  semicolons for Solaris.
+
+Sat Dec 15 21:38:24 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/timeout.rb: join the background thread to make sure it is dead.
+
+Sat Dec 15 20:20:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (enc/Makefile): add external encoding objects list.
+
+	* common.mk (BUILTIN_ENCOBJS): renamed from ENCOBJS.
+
+	* configure.in (BUILTIN_ENCS): [] needs to be enclosed because of m4.
+
+	* Makefile.in (BUILTIN_ENCOBJS): substituted by autoconf.
+
+	* enc/Makefile.in: new file to compile external encoding sources.
+
+	* encoding.c (rb_enc_find_index): auto-load external encoding objects
+	  as "ext/ENCODING_NAME".  [ruby-dev:32606]
+
+Sat Dec 15 13:04:30 2007  Tanaka Akira  <akr@fsij.org>
+
+	* vm_core.h (rb_thread_t): new member machine_stack_maxsize and
+	  machine_register_stack_maxsize.
+
+	* gc.c (rb_gc_stack_maxsize): new global variable for the thread size
+	  of the main thread.
+	  (STACK_LEVEL_MAX): use machine_stack_maxsize of current thread.
+	  (ruby_stack_check): check IA64 register stack.
+	  (ruby_set_stack_size): set rb_gc_stack_maxsize.
+	  (Init_stack): set rb_gc_stack_maxsize.
+
+	* thread_pthread.ci (native_thread_create): initialize
+	  th->machine_stack_maxsize and th->machine_register_stack_maxsize.
+
+	* vm.c (Init_BareVM): initialize th->machine_stack_maxsize and
+	  th->machine_register_stack_maxsize.
+
+	* thread_win32.ci (native_thread_create): initialize
+	  th->machine_stack_maxsize.  not tested.  just a guess at all.
+
+	[ruby-dev:32604]
+
+Sat Dec 15 12:58:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_register, rb_enc_replicate, rb_enc_alias): check
+	  if already registered.
+
+Sat Dec 15 01:57:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc/options.rb (Options::parse): do not access $KCODE any
+	  longer.  [ruby-core:14079]
+
+	* lib/irb/init.rb (IRB::IRB.parse_opts): ditto.
+
+	* lib/cgi.rb (CGI::CGI): ditto.
+
+Fri Dec 14 18:18:31 2007  Tanaka Akira  <akr@fsij.org>
+
+	* thread_pthread.ci (native_thread_create): twice the stack size.
+	  512KB is not enough to complete test-all on Debian GNU/Linux on
+	  IA64.
+
+Fri Dec 14 16:10:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_p): RDoc update.  a patch from murphy <murphy AT rubychan.de>.
+	  [ruby-core:14010]
+
+Fri Dec 14 16:06:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cmp): encoding aware comparison.
+
+	* string.c (rb_str_casecmp): ditto.
+
+Fri Dec 14 15:25:30 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c (encoding_equal): new function.
+
+	* transcode.c (str_transcode, transcode_dispatch): added two-step
+	  conversion logic via UTF-8.
+
+	* transcode.c: some minor formatting fixes
+
+	* transcode_data.h, transcode_data_iso_8859.c: Shortened
+	  extremely frequently used macros to shorten file length.
+
+	* test/ruby/test_transcode.rb: Fixed name of test class;
+	  added setup method to ensure all necessary encodings exist;
+	  split tests into more test methods; added tests; fixed ordering
+	  of arguments in assert_equal to have expected result first.
+
+Fri Dec 14 13:47:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ruby.imp): fix for circular dependency.  a patch from
+	  Yutaka Kanemoto <kinpoco AT gmail.com> in [ruby-dev:32590].
+
+	* regint.h, st.c, ext/json/ext/generator/generator.c: suppress
+	  warnings on AIX.
+
+Fri Dec 14 12:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
 	  and its type.
@@ -266,286 +45866,3213 @@ Sun Jun  8 05:24:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/readline/extconf.rb: should use have_func for functions instead
 	  of have_var.
 
-Sun Jun  8 05:08:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 14 10:25:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/e2mmap.rb (Exception2MessageMapper::E2MM.Raise): $! no
+	  longer modifiable in 1.9.
+
+Fri Dec 14 08:17:24 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (rb_protect): restore root_jmpbuf even if proc exits by
+	  break such as dbm.delete_if { break }.
+
+Fri Dec 14 02:55:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_nth): direct jump if string is 7bit only.  great
+	  performance boost for worst case.
+
+	* string.c (str_strlen): direct size if string is 7bit only.
+
+Fri Dec 14 02:29:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): 1st argument (typically the
+	  receiver) would have higher priority in encoding detection.
+
+Fri Dec 14 02:05:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_synchronized): should check if initialized.
+	  [ruby-dev:32585]
+
+Fri Dec 14 00:54:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): embedded string may override encoding
+	  of the regular expression.
+
+	* re.c (rb_reg_initialize): fix encoding of regular expression if
+	  embedded string has its own encoding specified.
+
+Thu Dec 13 22:16:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): encoding should never fall back
+	  to ASCII-8BIT unless both encodings are ASCII-8BIT.
+
+Thu Dec 13 20:31:28 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_shared_replace): make str noembed after free.
+
+Thu Dec 13 20:09:09 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (rb_protect): restore root_jmpbuf to avoid SEGV by
+	  'IO.pipe; [].each.next' with gcc version 3.3.5 (Debian 1:3.3.5-13)
+	  on IA64.
+
+Thu Dec 13 17:51:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_split_m): need not to check encoding if regexp
+	  is empty.
+
+	* string.c (rb_str_justify): associate encoding of original to the
+	  result.
+
+	* string.c (rb_str_chomp_bang): need to check encoding of record
+	  separator.
+
+	* string.c (str_gsub): should copy encoding to the result.
+
+	* sprintf.c (rb_str_format): ditto.
+
+	* string.c (rb_str_succ): should not enter infinite loop for
+	  non-ASCII, non-alphanumeric character at the bottom.
+
+Thu Dec 13 17:03:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): should swap encoding indexes too.
+
+Thu Dec 13 16:41:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): should not judge compatibility
+	  based on rb_enc_asciicompat().
+
+Thu Dec 13 13:09:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/io.h (MakeOpenFile): fptr->enc should be
+	  initialized to zero.  [ruby-dev:32569]
+
+Thu Dec 13 08:56:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_getc): use default external encoding if fptr->enc is
+	  not set.  [ruby-dev:32565]
+
+	* lib/rubygems/package.rb (Gem::TarReader::Entry::rewind): typo fixed.
+	  [ruby-dev:32565]
+
+Thu Dec 13 08:24:16 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): should associate default external encoding.
+
+	* io.c (io_read): should NOT associate default external encoding.
+
+Wed Dec 12 23:22:58 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c, regerror.c, string.c, parse.y, ruby.c, file.c:
+	  use capital letter for \xHH notation.  [ruby-dev:32511]
+
+Wed Dec 12 22:21:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_mode_enc): allow specifying external encoding in
+	  open mode, e.g. open(path, "r:utf-8").
+
+Wed Dec 12 21:26:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_method.ci (rb_alias): no need to skip aliasing when new
+	  equals to old.  [ruby-core:13990]
+
+Wed Dec 12 16:34:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_check_readable): set default external encoding to
+	  STDIN.
+
+	* io.c (io_enc_str): associate encoding to output string.
+
+Wed Dec 12 12:44:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (expr): 'not' and '!' should act as conditional
+	  expression.   [ruby-dev:32548]
+
+Wed Dec 12 12:11:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_regsub): should copy encoding.
+
+	* string.c (rb_str_sub_bang, str_gsub): should check and copy encoding
+	  to be replaced.
+
+Tue Dec 11 23:04:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): RDoc update.  a patch from Gary Wright
+	  <radar2002 AT gmail.com>.  [ruby-core:13998]
+
+	* pack.c (pack_unpack): ditto.
+
+Tue Dec 11 16:37:47 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_ascget): renamed from rb_enc_get_ascii.
+
+	* include/ruby/encoding.h: follow the renaming.
+
+	* re.c: ditto.
+
+Tue Dec 11 16:19:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, */Makefile.sub (CP, MV): added.
+
+	* common.mk (.y.c): not discard the old target until successfully
+	  created.
+
+Tue Dec 11 15:20:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): singleton_method_{added,removed,undefined}
+	  hooks should be defined for BasicObject.  [ruby-dev:32531]
+
+	* eval.c (Init_eval): method_missing should be defined for all
+	  objects; moved to BasicObject.
+
+Tue Dec 11 14:27:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (transcode_loop): get rid of SEGV at sequence can not be
+	  converted.
+
+	* transcode.c (rb_str_transcode_bang): copy encoding.  [ruby-dev:32532]
+
+	* test/ruby/test_transcode.rb: added tests from Martin Duerst <duerst
+	  AT it.aoyama.ac.jp>.  [ruby-dev:32532]
+
+Tue Dec 11 12:05:51 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_get_ascii): add an argument to provide the
+	  length of the returned character.
+
+	* include/ruby/encoding.h (rb_enc_get_ascii): add the argument.
+
+	* re.c (rb_reg_expr_str): modify rb_enc_get_ascii call.
+	  (rb_reg_quote): ditto.
+	  (rb_reg_regsub): ditto.
+
+Tue Dec 11 09:40:21 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/oniguruma.h (ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE):
+	  parenthesize an argument.
+
+Tue Dec 11 02:23:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_method_missing): RDoc update patch from Hugh Sasse
+	  <hgs AT dmu.ac.uk>.  [ruby-core:12932]
+
+Tue Dec 11 01:51:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP::get): now supports gzip
+	  content-encoding.  a patch from Hugh Sasse <hgs AT dmu.ac.uk>.
+	  [ruby-core:13451]
+
+Tue Dec 11 01:21:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (shadowing_lvar_gen): no duplicate error for "_".
+
+Mon Dec 10 22:08:47 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_slice_bang): If an invalid range is given, do
+	  not raise an exception but return nil just like slice() does.
+
+Mon Dec 10 21:47:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_transcode): allow non-registered encodings.
+	  [ruby-dev:32520]
+
+Mon Dec 10 21:00:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_slice_bang): should return nil if position out
+	  of range.  a patch from Akinori MUSHA <knu AT iDaemons.org>.
+	  [ruby-dev:32518]
+
+Mon Dec 10 19:02:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_match): should calculate offset by converted
+	  operand.  [ruby-cvs:21416]
+
+Mon Dec 10 18:28:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME
+	  regular expression.  a patch from Ueda Satoshi
+	  <s-ueda AT livedoor.jp>.  [ruby-dev:32514]
+
+Mon Dec 10 17:46:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_tmp_new): creates hidden temporary buffer.
+
+	* transcode.c (transcoding): added a pointer to function to flush.
+
+	* transcode.c (transcode_loop): do not use string internal.
+	  [ruby-dev:32512]
+
+	* transcode.c (str_transcode): allow Encoding objects.
+
+	* transcode_data.h (BYTE_LOOKUP): use actual struct name.
+
+Mon Dec 10 16:52:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_insert): should not add length in bytes to index in
+	  chars.
+
+Mon Dec 10 14:33:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_public_send): rename invoke_method to public_send.
+	  it now invokes public method only no matter how it's called.
+
+Mon Dec 10 14:00:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* transcode.c: new file to provide encoding conversion features.
+	  code contributed by Martin Duerst.
+
+Mon Dec 10 13:50:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_search): return byte offset.  [ruby-dev:32452]
+
+	* re.c (rb_reg_match, rb_reg_match2, rb_reg_match_m): convert byte
+	  offset to char index.
+
+	* string.c (rb_str_index): return byte offset.  [ruby-dev:32472]
+
+	* string.c (rb_str_split_m): calculate in byte offset.
+
+Mon Dec 10 09:56:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm1_neq.rb, bm_vm1_not.rb: added.
+
+Mon Dec 10 07:48:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): wrong token was generated.  [ruby-dev:32498]
+
+	* object.c (rb_obj_not_match): wrong test.
+
+Mon Dec 10 06:44:47 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_expr_str): use \xHH instead of \OOO.
+
+	* regerror.c (to_ascii): ditto.
+	  (onig_snprintf_with_pattern): ditto.
+	  (onig_snprintf_with_pattern): ditto.
+
+	* string.c (rb_str_inspect): ditto.
+	  (rb_str_dump): ditto.
+
+	* parse.y (parser_yylex): ditto.
+
+	* ruby.c (proc_options): ditto.
+
+	* file.c (rb_f_test): ditto.
+
+	[ruby-dev:32495]
+
+Mon Dec 10 06:41:00 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_names): new method Regexp#names.
+	  (rb_reg_named_captures): new method Regexp#named_captures
+	  (match_regexp): new method MatchData#regexp.
+	  (match_names): new method MatchData#names.
+
+	* lib/pp.rb (MatchData#pretty_print): show names of named captures.
+
+	[ruby-dev:32493]
+
+Mon Dec 10 01:35:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (expr): redefinable not (!) operator.
+
+	* parse.y (arg): ditto.
+
+	* object.c (rb_obj_not): new method "!".
+
+	* object.c (rb_obj_not_equal): new method "!=".
+
+	* object.c (rb_obj_not_match): new method "!~".
+
+Sun Dec  9 22:31:36 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_s_last_match): accept named capture's name.
+
+Sun Dec  9 15:57:53 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (match_backref_number): new function for converting a backref
+	  name/number to an integer.
+	  (match_offset): use match_backref_number.
+	  (match_begin): ditto.
+	  (match_end): ditto.
+	  (name_to_backref_number): raise IndexError instead of RuntimeError.
+	  (match_inspect): show capture index.
+
+Sun Dec  9 14:59:15 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h (CHECK_STACK_OVERFLOW): reserve frame size.
+	  [ruby-dev:32485]
+
+Sun Dec  9 14:38:25 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_thread_mark): use rb_gc_mark_maybe() for
+	  VM stack specified by mark_stack_len.  [ruby-dev:32462]
+
+	* insnhelper.ci: clear vm stack extended by opt value.
+
+Sun Dec  9 14:08:47 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (FilePathStringValue): defined.  similar to
+	  FilePathValue but no taint check.
+
+	* file.c (rb_get_path_no_checksafe): implementation of
+	  FilePathStringValue.
+	  (rb_file_s_basename): use FilePathStringValue.
+	  (rb_file_s_dirname): ditto.
+	  (rb_file_s_extname): ditto.
+	  (rb_file_s_split): ditto.
+	  (rb_file_join): ditto.
+
+	* dir.c (file_s_fnmatch): ditto.
+
+Sun Dec  9 12:49:34 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (append_utf8): check unicode range.
+
+Sun Dec  9 12:39:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/cgi.rb (read_multipart): exclude blanks from header values.
 	  [ruby-list:44327]
 
-Sun Jun  8 05:02:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Dec  9 12:18:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing
-	  preceeding 0s.  [ruby-core:13873]
+	* file.c (rb_get_path): use the original object if to_path method is
+	  not defined.  [ruby-dev:32473]
 
-Sun Jun  8 04:58:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_f_open): call to_open on non-string objects, instead of
+	  to_str.  [ruby-dev:32473]
 
-	* eval.c (error_print): put newline unless multiple line message ends
-	  with a newline.  [ruby-dev:32429]
+Sun Dec  9 12:12:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Jun  8 04:55:26 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+	* string.c (tr_find): returns true if no characters to be removed is
+	  specified.
+
+Sun Dec  9 12:03:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_magic_comment): delimits with a semicolon.
+
+Sun Dec  9 11:29:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (tr_trans): get rid of segfaults when has multibytes but
+	  source sets have no multibytes.
+
+Sun Dec  9 04:01:28 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_mbclen): return 1 if underlying implementation
+	  returns a length longer than e-p.
+	  (rb_enc_precise_mbclen): return needmore if underlying
+	  implementation returns a length longer than e-p.
+
+Sat Dec  8 17:59:40 2007  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (posix_signal): return value.
+
+Sat Dec  8 17:22:16 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/openssl/test_pkcs7.rb: Remove redundant module namespace.
+
+Sat Dec  8 17:07:10 2007  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (proc_options): make rb_raise format as a string literal to
+	  avoid warning.
+
+Sat Dec  8 16:18:16 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_check_preprocess): new function for validating regexp
+	  fragment.
+
+	* parse.y (regexp): invoke reg_fragment_check.
+	  (reg_fragment_check): defined.
+	  (reg_fragment_check_gen): defined.
+
+Sat Dec  8 11:06:29 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_mbclen): make it never fail.
+	  (rb_enc_nth): don't check the return value of rb_enc_mbclen.
+	  (rb_enc_strlen): ditto.
+	  (rb_enc_precise_mbclen): return needmore(1) if e <= p.
+	  (rb_enc_get_ascii): new function for extracting ASCII character.
+
+	* include/ruby/encoding.h (rb_enc_get_ascii): declared.
+
+	* include/ruby/regex.h (ismbchar): removed.
+
+	* re.c (rb_reg_expr_str): use rb_enc_get_ascii.
+	  (unescape_escaped_nonascii): use rb_enc_precise_mbclen to determine
+	  the termination of escaped non-ASCII character.
+	  (unescape_nonascii): use rb_enc_precise_mbclen.
+	  (rb_reg_quote): use rb_enc_get_ascii.
+	  (rb_reg_regsub): use rb_enc_get_ascii.
+
+	* string.c (rb_str_reverse) don't check the return value of
+	  rb_enc_mbclen.
+	  (rb_str_split_m): don't call rb_enc_mbclen with e <= p.
+
+	* parse.y (is_identchar): use ISASCII.
+	  (parser_ismbchar): removed.
+	  (parser_precise_mbclen): new macro.
+	  (parser_isascii): new macro.
+	  (parser_tokadd_mbchar): use parser_precise_mbclen to check invalid
+	  character precisely.
+	  (parser_tokadd_string): use parser_isascii.
+	  (parser_yylex): ditto.
+	  (is_special_global_name): don't call is_identchar with e <= p.
+	  (rb_enc_symname_p): ditto.
+
+	  [ruby-dev:32455]
+
+	* ext/tk/sample/tkextlib/vu/canvSticker2.rb: remove coding cookie
+	  because the encoding is not UTF-8.  [ruby-dev:32475]
+
+Fri Dec  7 20:21:35 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/net/ftptls.rb, ext/openssl/lib/net/telnets.rb:
+	  half-finished libraries are discontinued.
+
+Fri Dec  7 15:44:40 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb: use Hash for recursion check as inspect.
+
+Fri Dec  7 15:04:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (flatten): some performance improvements, based on a patch
+	  from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-core:13877].
+	  [ruby-core:13851]
+
+	* thread.c (rb_exec_recursive): use Hash instead of Array for
+	  performance improvement.  [ruby-core:13898]
+
+	* thread.c (recursive_pop): use object ID.
+
+Thu Dec  6 19:52:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): typo fixed ("!" -> "|") in the ripper code.
+
+Thu Dec  6 19:48:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): tUPLUS no longer works as identity operation any
+	  more.  inspired by [ruby-talk:265532].
+
+Thu Dec  6 18:22:11 2007  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_enc_precise_mbclen): new function for mbclen with
+	  validation.
+
+	* include/ruby/encoding.h (rb_enc_precise_mbclen): declared.
+	  (MBCLEN_CHARFOUND): new macro.
+	  (MBCLEN_INVALID): new macro.
+	  (MBCLEN_NEEDMORE): new macro.
+
+	* include/ruby/oniguruma.h (OnigEncodingTypeST): replace mbc_enc_len
+	  by precise_mbc_enc_len.
+	  (ONIGENC_PRECISE_MBC_ENC_LEN): new macro.
+	  (ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND): new macro.
+	  (ONIGENC_CONSTRUCT_MBCLEN_INVALID): new macro.
+	  (ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE): new macro.
+	  (ONIGENC_MBCLEN_CHARFOUND): new macro.
+	  (ONIGENC_MBCLEN_INVALID): new macro.
+	  (ONIGENC_MBCLEN_NEEDMORE): new macro.
+	  (ONIGENC_MBC_ENC_LEN): use ONIGENC_PRECISE_MBC_ENC_LEN.
+
+	* enc/euc_jp.c: validation implemented.
+
+	* enc/sjis.c: ditto.
+
+	* enc/utf8.c: ditto.
+
+	* string.c (rb_str_inspect): use rb_enc_precise_mbclen for invalid
+	  encoding.
+	  (rb_str_valid_encoding_p): new method String#valid_encoding?.
+
+	* io.c (rb_io_getc): use rb_enc_precise_mbclen.
+
+	[ruby-dev:32438]
+
+Thu Dec  6 01:37:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regparse.c (i_apply_case_fold): fix for negative character class.  a
+	  patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-core:13884].
+
+Thu Dec  6 01:00:38 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_s_list): support NetBSD/Citrus iconv.
+
+Wed Dec  5 16:18:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_proc_s_new): call initialize.  [ruby-core:13824]
+
+	* proc.c (rb_proc_location): return file name and line number where
+	  the proc is defined.
+
+	* thread.c (thread_s_new): call initialize.  [ruby-core:13835]
+
+	* thread.c (thread_initialize): split initialize method.
+
+Wed Dec  5 15:25:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern3): fix to changing encoding to default, and
+	  uncommented r13835, which is rare but not impossible.
+
+Wed Dec  5 15:15:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (step_i, range_step): support non-fixnum steps.
+	  [ruby-talk:282100]
+
+Wed Dec  5 14:25:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix typo.
+
+Wed Dec  5 13:41:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yycompile): get rid of tracing while parsing.
+	  [ruby-dev:31351]
+
+	* thread.c (ruby_suppress_tracing): added a new parameter, which
+	  directs to call func always.
+
+Tue Dec  4 19:56:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_convert): should not set encoding unless
+	  the target encoding is supported.  [ruby-dev:32451]
+
+Tue Dec  4 17:34:17 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb (tojis, tosjis, toeuc, toutf8):
+	  set encoding. [ruby-dev:32447]
+
+Tue Dec  4 17:07:25 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/json.rb, lib/json/*: moved to ext/json/lib.
+
+Tue Dec  4 16:34:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_create): achieve target encoding.
+
+	* ext/iconv/iconv.c (iconv_convert, iconv_finish, iconv_iconv,
+	  iconv_conv): set result string encoding.  [ruby-dev:32446]
+
+	* ext/iconv/iconv.c (iconv_initialize, iconv_s_open): set encoding to
+	  Iconv instance.
+
+Tue Dec  4 14:34:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): reverted c flag.
+
+Tue Dec  4 11:23:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_cstr_to_inum): trailing spaces may exist at squeezing
+	  preceding 0s.  [ruby-core:13873]
+
+Mon Dec  3 11:51:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/Win32API/*: removed or moved to ext/dl/win32.
+
+	* ext/dl/win32/*: new. [ruby-dev:32387]
+
+Sun Dec  2 22:08:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_mbchar): fix for ASCII chars.  [ruby-dev:32432]
+
+	* parse.y (parser_parse_string, parser_here_document): prevent false
+	  error messages.
+
+Sun Dec  2 20:43:22 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (unescape_escaped_nonascii): fix mbclen argument.
+
+Sun Dec  2 15:47:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_mbchar): check insufficient multibyte char.
+	  [ruby-dev:32429]
+
+Sun Dec  2 15:42:16 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.1 -> 0.2.2.
+
+	* lib/rss/maker/itunes.rb: fixed new_itunes_category.
+	* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
+	  of consistency.
+
+	* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
+	  needless UTF-8 characters.
+
+Sun Dec  2 15:18:37 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_callee_setup_arg): fix error message.
+	  [ruby-dev:32430]
+
+Sun Dec  2 09:12:48 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (regexp): fix /#{}\xa1\xa2/e to be EUC-JP.
+	  (reg_fragment_setenc_gen): extracted from reg_compile_gen.
+
+Sun Dec  2 01:39:51 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_uv_to_utf8): declared.
+
+	* re.c (rb_reg_preprocess): new function for dynamic regexp with
+	  \u{} such as Regexp.new("\\u{6666}").
+	  (rb_reg_prepare_re): preprocess regexp for recompiling.
+	  (read_escaped_byte): new function.
+	  (unescape_escaped_nonascii): new function.
+	  (append_utf8): new function.
+	  (unescape_unicode_list): new function.
+	  (unescape_unicode_bmp): new function.
+	  (unescape_nonascii): new function.
+	  (rb_reg_initialize): preprocess regexp.
+
+	* pack.c (rb_uv_to_utf8): renamed from uv_to_utf8.
+
+	* parse.y (STR_NEW3): take func instead of has8 and hasmb.
+	  (parser_str_new): use default coderange mechanism except for regexp.
+	  (parser_tokadd_utf8): copy regexp source as-is.
+	  (parser_read_escape): UTF-8 stuff removed.
+	  (parser_tokadd_escape): has8bit and hasmb removed.
+	  (parser_tokadd_string): fix 8-bit single byte character with \u.
+	  (parser_parse_string): has8bit and hasmb removed.
+	  (parser_here_document): has8bit and hasmb removed.
+	  (parser_yylex): call parser_tokadd_utf8 instead of read_escape for
+	  UTF-8 character.
+
+Wed Dec  2 01:00:07 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
-	Merged 14070 from trunk.
-	
 	* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
 	  pressing control-c in the controlling terminal or sending SIGTERM stops
 	  the XML-RPC server.
 
-Sun Jun  8 04:49:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec  1 23:04:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c: rename primary_encoding -> default_external (encoding).
+
+Sat Dec  1 19:52:57 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (Time#to_datetime): use nsec instead of usec.
+
+	* lib/date.rb (DateTime#to_time): second minute as an argument to
+	  Time::utc contains fractional part in rational; hence Time
+	  object may keep resolution at most nanosecond.
+
+Sat Dec  1 14:36:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: move fixed bugs.
+
+	* test/ruby/test_sprintf.rb: ditto.
+
+	* test/yaml/test_yaml.rb: ditto.
+
+Sat Dec  1 13:24:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_yield_with_cfunc): fix to passing argc on third
+	  parameter of IFUNC.  [ruby-dev:32329]
+
+	* enumerator.c: fix to pass exact number of argument.
+
+	* eval.c (rb_yield_values2): added.
+
+	* include/ruby/ruby.h: ditto.
+
+	* bootstraptest/test_knownbug.rb: move a fixed test.
 
-	* parse.y (newline_node): set line from outermost node before removing
-	  NODE_BEGIN.  [ruby-dev:32406]
+	* bootstraptest/test_block.rb: ditto.
 
-Sun Jun  8 04:37:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec  1 10:45:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_open): use to_open for every non-string object.  path
+	  object may use method_missing.
+
+Sat Dec  1 09:44:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (concatarray, splatarray): use to_a instead of
+	  to_splat.
+
+	* insnhelper.ci (caller_setup_args): ditto.
+
+Sat Dec  1 03:34:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (newline_node): always remove NODE_BEGIN.
+
+Fri Nov 30 23:48:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (ruby_signal): use SA_SIGINFO if available.
+	  [ ruby-Patches-6418 ]
+
+Fri Nov 30 22:52:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (trap_signm): SIGVTALRM no longer used for green
+	  thread.  [ruby-talk:281318]
+
+	* signal.c (ruby_sig_finalize): do not install SIG_DFL handler if
+	  previous handler is sighandler().
+
+Fri Nov 30 21:02:15 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/json.rb, lib/json/add/{core.rb, rails.rb},
+	  test/json/test_json_rails.rb: additional files of JSON 1.1.2.
+	  [ruby-dev:32405]
+
+Fri Nov 30 19:33:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/rubyext.c (rb_syck_mktime): avoid segmentation fault.
+	  [ruby-core:13735]
+
+Fri Nov 30 19:05:55 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_count): precise argument number check.
+
+	* enum.c (enum_count): return Enumerator if no block given.
+
+Fri Nov 30 16:42:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_take_while): returns Enumerator if no block given.
+
+	* enum.c (enum_drop_while): ditto.
+
+Thu Nov 29 16:59:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt): remove unnecessary NODE_BEGIN.  [ruby-core:13814]
 
-Sun Jun  8 04:16:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov 29 06:45:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_eql): recursive comparison should be based on
+	  eql?  [ruby-core:13803]
+
+Wed Nov 28 18:08:00 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json, lib/json, test/json: Update to JSON 1.1.2.
+	  (RubyForge#15447)
+
+	* math.c: fix typo.
+
+Wed Nov 28 16:29:35 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_invoke_block): should splat args.
+	  [ruby-dev:32392]
+
+	* test/ruby/test_yield.rb: add tests for above.
+
+Wed Nov 28 14:43:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
+	  get rid of mixing $LDFLAGS and $ARCH_FLAG.
+
+	* lib/mkmf.rb (configuration): ditto.
+
+	* lib/mkmf.rb (create_makefile): support for extensions which has no
+	  shared object.
+
+Wed Nov 28 02:42:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (big2str_find_n1): removed extraneous element.
+	  [ruby-dev:32351], [ruby-dev:32365]
+
+	* bignum.c (big2str_find_n1): returns necessary digits now.
+
+	* sprintf.c (remove_sign_bits): extends sign bit first.
+
+Tue Nov 27 15:53:43 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): "when *[],1" dumps core.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32350]
+
+	* bootstraptest/test_syntax.rb: add a test for above.
+
+Tue Nov 27 15:40:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): "a[*b] += 1" dumps core.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32354]
+
+	* bootstraptest/test_syntax.rb: add a test for above.
+
+Tue Nov 27 12:47:23 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def: change return value of "defined?"
+	  for $&, $1, ... .  If such variables are defined,
+	  return "global-variable".
+
+	* test/ruby/test_defined.rb: add tests.
+
+	* bootstraptest/test_syntax.rb: fix a test.
+
+Tue Nov 27 11:54:46 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: fix typo.
+
+Tue Nov 27 11:23:20 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test_beginendblock.rb: add loop to wait signal.
+	  [ruby-dev:32332]
+
+Tue Nov 27 11:14:57 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h, encoding.c, re.c, string.c, parse.y:
+	  rename ENC_CODERANGE_SINGLE to ENC_CODERANGE_7BIT.
+	  rename ENC_CODERANGE_MULTI to ENC_CODERANGE_8BIT.
+	  Because single byte 8bit character, such as Shift_JIS 1byte katakana,
+	  is represented by ENC_CODERANGE_MULTI even if it is not multi byte.
+
+Tue Nov 27 10:45:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_method_missing): fix stack trace.
+
+	* bootstraptest/test_knownbug.rb: move solved tests.
+
+	* bootstraptest/test_method.rb, test/ruby/test_regexp.rb: ditto.
+
+Tue Nov 27 09:57:42 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c: fix to allow dsym for alias/undef.
+	  [ruby-dev:32355]
+
+	* bootstraptest/test_method.rb: add tests for above.
+
+Mon Nov 26 23:18:46 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/extserv.rb (initialize, stop_service): synchronize with
+	  ExtServManager.
+
+	* test/drb/test_drb.rb (TestDRbEval): ignored.
+
+Mon Nov 26 17:32:16 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (Init_Regexp): new method Regexp#fixed_encoding?
+	  [ruby-dev:32361]
+
+Mon Nov 26 13:28:14 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/complex.rb: be able to create Complex(0, -0.0). [ruby-list:44268]
+
+Mon Nov 26 11:24:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_fixed_encoding_p): extracted from rb_reg_prepare_re and
+	  rb_reg_s_union.
+	  (rb_reg_s_union): refactored.
+
+Mon Nov 26 10:44:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_read_internal, rb_sysopen_internal): remove C99 dependency.
+
+Sun Nov 25 22:21:35 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h (rb_enc_str_asciionly_p): declared.
+	  (rb_enc_str_asciicompat_p): defined.
+
+	* re.c (rb_reg_initialize_str): use rb_enc_str_asciionly_p.
+	  (rb_reg_quote): return ascii-8bit string if the argument is
+	  ascii-only to generate encoding generic regexp if possible.
+	  (rb_reg_s_union): fix encoding handling.  [ruby-dev:32094]
+
+	* string.c (rb_enc_str_asciionly_p): defined.
+
+Sun Nov 25 12:12:03 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb: Import fast-loading gem_prelude.rb from RubyGems.
+
+	* lib/rubygems*: Import RubyGems r1516.
+
+Sat Nov 24 23:25:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_eval.rb (TestEval::test_instance_eval_cvar):
+	  updated not to modify class variable of Object class.
+
+Fri Nov 23 17:34:24 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* io.c: add rb_read_internal() as blocking function.
+
+Fri Nov 23 17:33:39 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: fix comment.
+
+Fri Nov 23 17:26:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: move solved tests.
+
+	* bootstraptest/test_io.rb, test_marshal.rb, test_objectspace.rb:
+	  ditto.
+
+	* test/ruby/test_integer.rb, test_regexp.rb: ditto.
+
+Fri Nov 23 15:59:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* struct.c (rb_struct_alloc_noinit): new function.
+	  (rb_struct_define_without_accessor): add allocator to the arguments.
+
+	* range.c (range_alloc): re-introduced using rb_struct_alloc_noinit.
+
+Fri Nov 23 15:27:43 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (REG_CASESTATE): unused macro removed.
+	  (rb_reg_prepare_re): check encoding difference.
+	  (rb_reg_initialize): check 8bit byte.
+
+	* parse.y (parser_tokadd_escape): fix has8bit.
+
+	  [ruby-dev:32113]
+
+Fri Nov 23 15:16:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_f_global_variables): variable names should not
+	  duplicate.  [ruby-dev:32344]
+
+Fri Nov 23 13:34:08 2007  Tanaka Akira  <akr@fsij.org>
+
+	* struct.c (rb_struct_define_without_accessor): new function.
+
+	* range.c (range_alloc): removed.
+	  (Init_Range): use rb_struct_define_without_accessor.
+
+	  based on [ruby-dev:32327].
+
+Fri Nov 23 11:01:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (match_begin): should return offset by character.
+	  [ruby-dev:32331]
+
+	* re.c (match_end): ditto.
+
+	* re.c (rb_reg_search): ditto.
+
+Fri Nov 23 10:44:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (defined_expr): defined(method(x)) dumped core.  a
+	  patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32335]
+
+Wed Nov 21 18:03:49 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: fix to recycle thread data (VM stack).
+
+	* thread.c: ditto.
+
+	* benchmark/bm_vm3_thread_create_join.rb: add loop count.
+
+Wed Nov 21 18:02:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: add path to trunk/lib if driver runner is
+	  in build directory.
+
+Wed Nov 21 16:39:21 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/fileutils/fileasserts.rb (assert_equal_timestamp): new assert
+	  to test tv_sec only for filestamp resolution portability.
+	  (assert_same_entry): use assert_same_entry for mtime comparison.
+
+Wed Nov 21 14:55:13 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_permutation): add gc guard codes.
+
+Wed Nov 21 11:16:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insnhelper.ci (vm_search_normal_superclass): rename function.
+
+	* insnhelper.ci (vm_search_superclass): ditto.
+
+	* proc.c (struct METHOD): rename rklass -> rclass.
+
+Wed Nov 21 03:12:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_system): returns nil on execution failure.
+	  [ruby-core:13715]
+
+Wed Nov 21 01:04:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
+
+Tue Nov 20 21:46:46 2007  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_mload): ignore invalid digits in submicro.
+
+Tue Nov 20 20:33:32 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: rename RFloat#double_value -> float_value.
+
+	* numeric.c, parse.y: ditto.
+
+Tue Nov 20 19:36:21 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.h, vm_core.h: decl of rb_gc_save_machine_context()
+	  should be at vm_core.h.
+
+	* include/ruby/ruby.h, intern.h: remove type rb_thread_t.
+
+	* include/ruby/intern.h: change rb_unblock_function_t,
+	  rb_unblock_function_t.
+
+	* file.c, process.c: apply above changes.
+
+	* thread.c, thread_pthread.ci, thread_win32.ci: ditto.
+
+	* io.c: support blocking open (2). [ruby-core:13614]
+
+Tue Nov 20 17:10:11 2007  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_close_on_exec_p): new method IO#close_on_exec?.
+	  (rb_io_set_close_on_exec): new method IO#close_on_exec=.
+	  [ruby-dev:32323]
+
+Tue Nov 20 16:24:31 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (gc_mark_children): obj->as.file.fptr may be 0 for T_FILE.
+
+Tue Nov 20 15:09:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_read_escape): has8bit flag may be set with control
+	  escape.  [ruby-core:13722]
+
+	* parse.y (parser_prepare): set begging after BOM if exists.
+	  [ruby-core:13718]
+
+Tue Nov 20 14:55:37 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*: Update to RubyGems 0.9.5.
+
+Tue Nov 20 13:00:44 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h win32/win32.c (rb_w32_pipe_exec): use dual fd
+	  instead of socketpair when mode is RDWR.
+
+	* io.c (pipe_open): pass &write_fd to rb_w32_pipe_exec().
+
+	* io.c (popen_redirect): define only when HAVE_FORK.
+
+Tue Nov 20 12:12:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (rb_io_t): add tied_io_for_writing member.
+
+	* io.c: use tied_io_for_writing for duplex popen.
+
+	* gc.c: mark tied_io_for_writing.
+
+	* common.mk: gc.o depends io.h.
+
+	  [ruby-dev:32205]
+
+Tue Nov 20 11:59:33 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/drb/test_drb.rb: rename TestRubyYield to TestDRbRubyYield to
+	  avoid name crash with test/ruby/test_yield.rb.
+	  TestRuby18Yield is renamed to TestDRbRuby18Yield too.
+
+Tue Nov 20 03:24:42 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/extservm.rb: merged from ruby_1_8 branch.
+
+	* lib/drb/acl.rb: ditto.
+
+	* lib/drb/ssl.rb: ditto.
+
+	* lib/drb/unix.rb: ditto.
+
+	* lib/drb/drb.rb: ditto.
+
+	* lib/drb/observer.rb: ditto.
+
+	* lib/drb/invokemethod.rb: ditto.
+
+	* test/drb/test_drbssl.rb: ditto.
+
+	* test/drb/test_drb.rb: ditto.
+
+	* test/drb/drbtest.rb: ditto.
+
+	* test/drb/test_drbunix.rb: ditto.
+
+Tue Nov 20 00:52:46 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/fileutils/fileasserts.rb (assert_equal_time): show nsec if
+	  assertion fails but time.to_s equals.
+	  (assert_same_entry): use assert_equal_time.
+
+	* test/fileutils/test_fileutils.rb (test_install): use
+	  assert_equal_time.
+
+Mon Nov 19 18:46:49 2007  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (utime_internal): fallback utimensat to utimes.
+
+Mon Nov 19 17:51:27 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: check struct timespec, clock_gettime, utimensat,
+	  struct stat.st_atim,
+	  struct stat.st_atimespec,
+	  struct stat.st_atimensec,
+	  struct stat.st_mtim,
+	  struct stat.st_mtimespec,
+	  struct stat.st_mtimensec,
+	  struct stat.st_ctim,
+	  struct stat.st_ctimespec,
+	  struct stat.st_ctimensec.
+
+	* include/ruby/missing.h: provide struct timespec if not available.
+
+	* time.c: support nanosecond-resolution using struct timespec.
+	  (time_nsec): new method: Time#nsec and Time#tv_nsec.
+
+	* include/ruby/intern.h: provide rb_time_nano_new.
+
+	* file.c (utime_internal): use utimensat if available.
+	  (rb_file_s_utime): refactored.
+	  (rb_f_test): use stat_atime, stat_mtime, stat_ctime.
+	  (rb_stat_cmp): check tv_nsec.
+	  (stat_atimespec): new function.
+	  (stat_atime): ditto.
+	  (stat_mtimespec): ditto.
+	  (stat_mtime): ditto.
+	  (stat_ctimespec): ditto.
+	  (stat_ctime): ditto.
+	  (rb_stat_atime): use stat_atime.
+	  (rb_file_s_atime): ditto.
+	  (rb_file_atime): ditto.
+	  (rb_stat_mtime): use stat_mtime.
+	  (rb_file_s_mtime): ditto.
+	  (rb_file_mtime): ditto.
+	  (rb_file_ctime): use stat_ctime.
+	  (rb_file_s_ctime): ditto.
+	  (rb_stat_ctime): ditto.
+
+	* variable.c (rb_copy_generic_ivar): clear clone's instance variables
+	  if obj has no instance variable.
+
+	* marshal.c (w_object): dump instance variables of generated string
+	  for TYPE_USERDEF, even if original object has instance variables.
+
+	* lib/time.rb (Time#xmlschema): use nsec instead of usec.
 
-	* eval.c (rb_alias): do not call hook functions until initialization
-	  finishes.  [ruby-talk:279538]
+	[ruby-dev:32306]
 
-Sun Jun  8 04:14:16 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon Nov 19 17:48:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_class_superclass): should not raise exception for
+	  BasicObject.  [ruby-Bugs-15668]
+
+Mon Nov 19 16:04:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_permutation): gives all permutations of elements
+	  if no argument given.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
+	  [ruby-dev:32309]
+
+Mon Nov 19 02:44:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): alias and undef accept dsyms as well
+	  as literals.  [ruby-dev:32308]
+
+Mon Nov 19 02:31:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_method.ci (rb_add_method): no redefinition warning for undef.
+
+Mon Nov 19 01:53:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_read_escape): disallow control and meta modifiers
+	  for non-ASCII characters.  [ruby-core:13685]
+
+Sun Nov 18 20:47:41 2007  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (mark_dump_arg): it may be called after dump_ensure.
+
+Sun Nov 18 18:27:47 2007  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_minus): fix Time.at(2**60+1) - Time.at(2**60).
+
+Sun Nov 18 17:28:49 2007  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_arg): show actual year in 2-3 digits year warning.
+	  (time_mdump): show actual year in "year too big to marshal" error.
+
+Sun Nov 18 14:03:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_method.ci (rb_alias): do not call hook functions until
+	  initialization finishes.  [ruby-talk:279538]
+
+Sun Nov 18 09:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
+
+Sun Nov 18 05:19:46 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/mkmf.rb (have_struct_member): define HAVE_type_member.
+
+Sat Nov 17 23:51:29 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
 
-Sun Jun  8 03:59:31 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Nov 17 23:21:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): should clear parser->tokp as well.
+	  [ruby-dev:32250]
+
+	* parse.y: remove NEED_ASSOC that break test_parser_events.
+
+	* parse.y (parser_yylex): should not decrement line numbers at the
+	  end of file.
+
+	* file.c (rb_find_file_ext): search .rb files first through in the
+	  loadpath.
+
+Fri Nov 16 23:31:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_odd_p): new method added.  a patch from Tadashi
+	  Saito <shiba AT mail2.accsnet.ne.jp>.  [ruby-dev:32305]
+
+	* bignum.c (rb_big_even_p): ditto.
+
+Fri Nov 16 17:41:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (Document-class): moved the simplest example to
+	  the top.
+
+	* ext/iconv/iconv.c (iconv_s_iconv): Document-method: needs class
+	  prefix for class method.  [ruby-core:13542]
+
+	* ext/iconv/iconv.c (iconv_iconv): also instance method needs to be
+	  qualified.
+
+Fri Nov 16 16:26:57 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* include/ruby/ruby.h: added some declarations for event hooks.
+
+	* lib/profile.rb: set VM::InstructionSequence.compile_option.
+
+Fri Nov 16 11:16:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb (String#is_binary_data?): use Integer#fdiv.
+
+Fri Nov 16 03:36:01 2007  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c: Node#value defined twice.
+
+	* lib/yaml/: several method redefinitions causing warnings.
+
+Fri Nov 16 03:01:00 2007  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit.
+
+Fri Nov 16 02:51:59 2007  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb (quick_emit): use combination of object_id and hash to
+	  identify repeated object references, since GC will reuse memory of
+	  objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698]
+
+Thu Nov 15 19:49:03 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/curses/extconf.rb: check macro if cannot find func.
 	  [ruby-list:44224]
 
-Sun Jun  8 03:52:53 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Nov 15 18:04:06 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path
+	  environment.
+
+Thu Nov 15 17:28:21 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb: absolute path may not start with a slash.
+	  pointed by usa.
+
+Thu Nov 15 17:07:54 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb: fix first substitution.
+	  use constant for prefix.
+	  pointed by Richard Kilmer.
+
+Thu Nov 15 14:29:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (prereq): added auto generated sources.  [ruby-dev:32280]
+
+Thu Nov 15 12:31:13 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb: use constant for prefix.
+
+Thu Nov 15 12:24:39 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb: use simple template system for source
+	  code generation.
+
+Thu Nov 15 12:19:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore::restore): use
 	  lockfile for exclusive locks.  a patch from <tommy AT tmtm.org>.
 	  [ruby-dev:32296]
 
-Sun Jun  8 03:49:15 2008  Tanaka Akira  <akr@fsij.org>
+Thu Nov 15 12:14:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* tool/compile_prelude.rb (c_esc): need to escape closing brace.
+
+Thu Nov 15 11:52:16 2007  Tanaka Akira  <akr@fsij.org>
+
+	* tool/compile_prelude.rb: adjust RbConfig::CONFIG paths relative
+	  to the installation path.
+
+Thu Nov 15 11:25:20 2007  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (usage): fix typo on --disable-gems option.
+	  pointed by Richard Kilmer.
+
+Wed Nov 14 16:16:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/net/http/test_https_proxy.rb
+	  (HTTPSProxyTest::test_https_proxy_authentication): initialize
+	  local variable 't' first.  [ruby-dev:32253]
+
+Wed Nov 14 15:39:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/socket/test_socket.rb: update not to use 1.8 assignment to
+	  external local variable in the block parameters.  [ruby-dev:32251]
+
+	* test/strscan/test_stringscanner.rb: avoid $KCODE, and use
+	  String#force_encoding().  [ruby-dev:32251]
+
+Wed Nov 14 14:04:42 2007  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk, Makefile.in: rename prelude.c to miniprelude.c.
+	  rename ext_prelude.c to prelude.c
+
+	* win32/Makefile.sub: ditto.
+
+	* bcc32/Makefile.sub: ditto.
+
+Wed Nov 14 07:09:48 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c, compile.c, compile.h, debug.c, debug.h,
+	  id.c, insnhelper.h, insns.def, thread.c, thread_pthread.ci,
+	  thread_pthread.h, thread_win32.ci, thread_win32.h, vm.h,
+	  vm_dump.c, vm_evalbody.ci, vm_opts.h: fix comments and
+	  copyright year.
+
+Wed Nov 14 07:07:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/makedocs.rb, template/insnstbl.html: removed.
+
+Wed Nov 14 02:50:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (parse.c): dependency also needs vpath.
+
+	* common.mk (node_name.inc, prelude.c): VPATH in nmake does not
+	  work for targets of explicit rules.
+
+Wed Nov 14 02:11:38 2007  Tanaka Akira  <akr@fsij.org>
 
 	* missing/isinf.c (isinf): don't define if the macro is defined.
 
-Sun Jun  8 03:42:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: no need to set ac_cv_func_isinf=yes on non-gcc
+	  solaris.
+
+Wed Nov 14 01:34:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (round): fallback definition.
 
 	* numeric.c (flo_divmod, flo_round): use round() always.
 	  [ruby-dev:32269]
 
-Sun Jun  8 03:42:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov 14 00:33:49 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: introduce 2 macros:
+	  RFLOAT_VALUE(v), DOUBLE2NUM(dbl).
+	  Rename RFloat#value -> RFloat#double_value.
+	  Do not touch RFloat#double_value directly.
+
+	* bignum.c, insns.def, marshal.c, math.c, numeric.c, object.c,
+	  pack.c, parse.y, process.c, random.c, sprintf.c, string.c,
+	  time.c: apply above changes.
+
+	* ext/dl/mkcallback.rb, ext/json/ext/generator/generator.c:
+	  ditto.
+
+Wed Nov 14 00:15:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/ytab.sed: get rid of GNU sed feature.  a patch from Laurent
+	  Sansonetti <laurent.sansonetti AT gmail.com> in [ruby-core:13470].
+
+Tue Nov 13 21:41:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (parse.c), ext/ripper/depend (ripper.c): process after
+	  bison with sed.  [ruby-dev:32204]
+
+	* ruby.c (proc_options): use yydebug in cmdline_options.
+
+	* ruby.c (process_options): set yydebug flag of parser.
+
+	* parse.y (yydebug): moved into struct parser_params.
+
+	* parse.y (rb_parser_get_yydebug, rb_parser_set_yydebug): parser
+	  generic methods.
+
+	* */Makefile.sub (parse.c): moved to common.mk.
+
+	* tool/ytab.sed: comment out yydebug definition, and substitute
+	  yyerror with parser_yyerror.
+
+Tue Nov 13 16:33:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (flodivmod): work around for infinity.
 
 	* numeric.c (flo_divmod): work around for platforms have no round().
 	  [ruby-dev:32247]
 
-Sun Jun  8 03:42:10 2008  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+Tue Nov 13 15:26:33 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lex.c.blt: moved from lex.c.
+
+	* lex.c.src: copied from keywords.  This is the source of lex.c.blt.
+
+	* Makefile.in (lex.c): use lex.c.blt if keywords is same as lex.c.src.
+
+	* win32/Makefile.sub (lex.c): re-introduce copy rule.
+
+	* bcc32/Makefile.sub (lex.c): ditto.
+
+	* wince/Makefile.sub (lex.c): ditto.
+
+Tue Nov 13 15:21:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_specialized_instruction): check argc.
+
+Tue Nov 13 14:44:32 2007  why the lucky stiff  <why@ruby-lang.org>
+
+	* test/yaml/test_yaml.rb: fixed the failing YAML Struct test
+	  at ko1's request.
+
+Tue Nov 13 02:57:04 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
 	* numeric.c (flo_divmod): round to the nearest integer.
 	  [ ruby-Bugs-14540 ]
 
-Sun Jun  8 03:28:53 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov 13 00:36:16 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_settracefunc.rb: fixed tests for set_trace_func.
+
+Mon Nov 12 19:47:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (call_trace_proc): should return value.
+
+Mon Nov 12 19:45:18 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc,win}32/Makefile.sub (miniruby): use $(COMMONOBJS) and $(DMYEXT)
+	  instead of $(LIBRUBY_A).
+
+Mon Nov 12 18:32:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc,win}32/Makefile.sub (MINIOBJS): added prelude.$(OBJEXT).
+
+Mon Nov 12 17:13:23 2007  Tanaka Akira  <akr@fsij.org>
+
+	* Makefile.in, common.mk: add prelude.o to MINIOBJS.
+
+Mon Nov 12 16:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): rdoc about srcprefix.  a patch from
+	  Daniel Berger <djberg96 AT gmail.com> in [ruby-core:13378].
+
+Mon Nov 12 16:48:09 2007  Tanaka Akira  <akr@fsij.org>
+
+	* Makefile.in, common.mk: add ext_prelude.o to OBJS.
+
+Mon Nov 12 13:57:39 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (MINIDLNOBJS): removed.
+	  (MINIOBJS): set to dln.o if dmydln.o is not used.
+
+	* Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS.
+
+Mon Nov 12 13:53:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): handle stringified
+	  symbols properly using ruby-forward-string.
+
+Mon Nov 12 12:17:59 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (MINIDLNOBJS): defined.
+
+	* Makefile.in (miniruby): use MINIDLNOBJS and COMMONOBJS instead of
+	  MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.
+
+Sun Nov 11 20:32:45 2007  Tanaka Akira  <akr@fsij.org>
+
+	* {win32,wince,bcc32}/Makefile.sub: delete lex.c rule.
+
+Sun Nov 11 19:40:52 2007  Tanaka Akira  <akr@fsij.org>
+
+	* Makefile.in (lex.c): simplified.
+
+Sun Nov 11 18:31:48 2007  Tanaka Akira  <akr@fsij.org>
+
+	* Makefile.in (lex.c): touch lex.c if gperf failed but lex.c exists.
+	  Although this may cause non-updated lex.c,
+	  svn co may generate keywords newer than lex.c especially on
+	  a file system which can record fractional mtime such as XFS.
+
+Sun Nov 11 17:32:46 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* insnhelper.ci (vm_call_method): pass mn->nd_clss to
+	  vm_call_cfunc() instead of klass.
+
+	* vm.c (rb_thread_method_id_and_klass): traverse parent_iseq.
+
+	* thread.c (call_trace_proc): use rb_thread_method_id_and_klass().
+
+Sun Nov 11 16:54:25 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lex.c: renamed from lex.c.blt.
+
+	* Makefile.in (lex.c): use find command to check mtime.
+
+Sun Nov 11 05:34:13 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* bin/gem: Add forgotten gem command.
+
+Sat Nov 10 23:50:31 2007  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (tr_trans): cast to unsigned char after dereference
+	  a pointer to a char to avoid SEGV with "\377".tr("a", "b").
+	  on FreeBSD/amd64.
+
+Sat Nov 10 23:08:53 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in, common.mk, Makefile.in: don't generate
+	  libminiruby-static.a.
+
+Sat Nov 10 19:46:54 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in, common.mk, Makefile.in: generate libminiruby-static.a
+	  which contains prelude.o for miniruby.
+
+Sat Nov 10 18:10:07 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gem_prelude.rb: new file for gem libraries.  currently empty.
+
+	* common.mk: generate ext_prelude.c by prelude.rb and gem_prelude.rb.
+	  ruby (not miniruby) is linked with ext_prelude.o instead of
+	  prelude.o.
+
+	* inits.c (rb_call_inits): don't call Init_prelude.
+
+	* ruby.c: support --disable-gems option.
+	  (ruby_init_gems): new function to define Gem::Enable and
+	  invoke Init_prelude.
+	  (process_options): call ruby_init_gems just after
+	  ruby_init_loadpath.
+
+	* tool/compile_prelude.rb: support multiple files.
+
+Sat Nov 10 17:27:55 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* thread.c (call_trace_proc): don't call ID2SYM() for ID_ALLOCATOR
+	  to avoid SEGV.
+
+Sat Nov 10 16:37:07 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems: Import RubyGems revision 1493.
+
+	* lib/rubygems.rb: ditto.
+
+	* lib/ubygems.rb: ditto.
+
+	* lib/rbconfig/datadir.rb: ditto.
+
+	* test/rubygems: ditto.
+
+Sat Nov 10 16:34:21 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/soap/property.rb: Don't override Enumerable#inject for 1.9.
+
+Sat Nov 10 14:43:30 2007  David Flanagan  <davidflanagan@ruby-lang.org>
+
+	* parse.y: use ASCII encoding for string literals that are
+	  7-bit clean, fixing regression from my previous patch
+
+Sat Nov 10 13:18:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc32,win32}/Makefile.sub: vendor_ruby support.
+
+Fri Nov  9 23:33:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_nextc): added single line read forward buffer.
+
+	* parse.y (parser_yylex): adjust line number for fluent interface.
+
+Fri Nov  9 22:04:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.h (FRAME_MAGIC_MASK_BITS): bits of FRAME_MAGIC_MASK.
+
+	* insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): use shift operations.
+
+Fri Nov  9 21:46:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (eval): should be volatile value for GC.
+
+Fri Nov  9 17:48:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (locale_encoding): guesstimate encoding from environment
+	  variables.  [ruby-core:13315]
+
+	* ruby.c (process_options): set primary encoding from environment.
+
+Fri Nov  9 16:51:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_each_byte): should update rbuf_off and rbuf_len for
+	  each iteration.  [ruby-dev:31659][ruby-dev:32192]
+
+	* variable.c (rb_cvar_set): cvar assignment obey same rule to cvar
+	  reference.  [ruby-dev:32192]
+
+Fri Nov  9 15:52:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
+	  is no longer in FL_USERS flags.
+
+Fri Nov  9 15:20:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_squeeze_bang): initialize squeezing table if no
+	  arguments given.
+
+Fri Nov  9 13:57:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (each_with_index_i): use rb_yield_values() for
+	  compatibility with Enumerator#with_index().  a patch from Yusuke
+	  ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32195]
+
+Fri Nov  9 13:45:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_iterator.rb (TestIterator::IterTest::each):
+	  #each_pair is now alias to #each.  [ruby-dev:32192]
+
+	* test/ruby/test_iterator.rb (TestIterator::test_assoc_yield):
+	  ditto
+
+Fri Nov  9 12:56:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_load.c (loaded_feature_path): check with type of given feature.
+
+Fri Nov  9 12:43:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_basicinstructions.rb: updated for new class
+	  behavior.  [ruby-dev:32192]
+
+	* encoding.c (enc_name): Encoding should not rely on ENCODING in
+	  the FL_USERS flags.
+
+	* encoding.c (rb_enc_from_encoding): do not call rb_enc_associate
+	  for encoding itself.
+
+	* encoding.c (enc_register_at): ditto.
+
+	* marshal.c (r_ivar): do not set real instance variable for
+	  encoding data associated.
+
+Fri Nov  9 10:43:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (send_internal): use self in the previous frame to check for
+	  protected methods.  [ruby-core:13254]
+
+	* insnhelper.ci (vm_call_method): send! method has gone.
+
+Fri Nov  9 10:38:13 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* marshal.c (w_object): should be SPECIAL_CONST_P() instead of
+	  IMMEDIATE_P().
+
+Fri Nov  9 10:29:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_invoke_method): check if invoked in function style.
+	  [ruby-core:13245]
+
+	* insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): stores and returns VM
+	  calling flags.
+
+	* vm.c (rb_vm_cfunc_funcall_p): returns if the current method is
+	  invoked in function style.
+
+Fri Nov  9 10:10:21 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: add rb_context_t#type.
+
+Fri Nov  9 10:05:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.c (set_arg0): fix breaking environ bugs.
+
+Fri Nov  9 07:26:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* random.c: update MT URL.[ruby-core:13305].
+
+Thu Nov  8 17:09:55 2007  David Flanagan  <davidflanagan@ruby-lang.org>
+
+	* object.c: improve docs for Object.tap
+
+	* ChangeLog: fix bogus dates on my previous entries
+
+Thu Nov  8 15:13:56 2007 David Flanagan <davidflanagan@ruby-lang.org>
+
+	* parse.y: fix segfault with \x escapes in regexps
+	  delete unused #if 0 code regions from previous patch
+
+Thu Nov  8 12:12:10 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_read_escape): remove C99/gcc-ism.
+
+Thu Nov  8 07:54:22 2007 David Flanagan <davidflanagan@ruby-lang.org>
+
+	* parse.y: patch, based on Nobu's, work to support \u escapes
+	           also modifications for better coderange detection
+
+	* test/ruby/test_unicode_escapes.rb: test cases
+
+	* test/ruby/test_mixed_unicode_escapes.rb: mixed encoding test cases
+
+Thu Nov  8 07:14:37 2007 David Flanagan <davidflanagan@ruby-lang.org>
+
+	* parse.y (rb_intern3): commented out broken code that prevented
+	  correct interning of multi-byte symbols.  Without this patch
+	  :x==:x is false when x is a multi-byte character.
+
+Thu Nov  8 07:04:31 2007 David Flanagan <davidflanagan@ruby-lang.org>
+
+	* string.c (tr_setup_table, tr_trans): fix test failures
+	  in test/ruby/test_string.rb
+
+Wed Nov  7 15:07:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_each_with_index): make different arrays at each
+	  iteration.  [ruby-dev:32181]
+
+Wed Nov  7 05:17:24 2007  David Flanagan <davidflanagan@ruby-lang.org>
+
+	* eval.c: fix typo in invoke_method documentation
+
+Wed Nov  7 03:52:26 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_product): core dumped with non array arguments.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32180]
+
+Wed Nov  7 03:32:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
 	  nkf conversion.  a patch from <moonwolf AT moonwolf.com>.
 	  [ruby-dev:32183]
 
-Sun Jun  8 03:07:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov  7 02:59:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_each_index): should return meaningful value.
+
+Tue Nov  6 16:37:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_load.c (loaded_feature_path): need to expand relative paths.
+
+	* eval_load.c (rb_feature_p): check if the feature is loading with
+	  load path.  [ruby-dev:31932]
+
+	* eval_load.c (load_lock): check the result of barrier waiting.
+
+	* thread.c (rb_barrier_wait): check if owned by the current thread.
+
+	* thread.c (rb_barrier_release): ditto.
+
+Mon Nov  5 08:01:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_eval): move #send to Kernel module from BasicObject.
+
+Mon Nov  5 05:17:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
 	  option with very long argument.  a patch from Kobayashi Noritada
 	  <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
 
-Sun Jun  8 03:04:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Nov  5 01:20:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (call_args): remove "parenthesize argument(s) for future
+	  version" warning.  when I added this warning, I had a plan to
+	  reimplement the parser that is simpler than the current one.
+	  since we abandoned the plan, warning no longer required.
+
+Mon Nov  5 01:02:56 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTPHeader#initialize): provide default
+	  User-Agent to fix 500 error on some corrupted HTTP servers.
+	  [ruby-core:13135]
+
+Mon Nov  5 00:32:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_send): allow send/__send__ to call methods of all
+	  visibility again.  we no longer provide __send, __send!.
+
+	* eval.c (rb_invoke_method): new method to honor private
+	  visibility.  if it's invoked in a function call style, it calls
+	  private methods as well (previous 1.9 send behavior).
+
+Mon Nov  5 00:24:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: vendor_ruby support.
+
+	* configure.in (RUBY_LIB): duplicated.
+
+Mon Nov  5 00:01:33 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_quote): quote \v as well.
+
+Sun Nov  4 23:51:59 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_initialize_m): use StringValuePtr instead of
+	  StringValueCStr because \0 exists when Regexp.new("\0").
+
+Sun Nov  4 08:11:19 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (count_objects): count TOTAL.
+
+Sun Nov  4 03:58:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (tr_setup_table): use C array for characters that fit
+	  in a byte to gain performance.
+
+	* string.c (rb_str_delete_bang): ditto.
+
+	* string.c (rb_str_squeeze_bang): ditto.
+
+	* string.c (rb_str_count): ditto.
+
+	* string.c (tr_trans): ditto.
+
+Sun Nov  4 00:06:40 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (count_objects): ObjectSpace.count_objects implemented.
+	  [ruby-core:12301]
+
+Sat Nov  3 22:49:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_each_pair): make Hash#each to be alias to
+	  Hash#each_pair for compatibility and clarity.
+
+	* hash.c (env_each_pair): ditto.
+
+Sat Nov  3 22:41:05 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: --with-vendor-hdrdir implemented.
+
+	* lib/mkmf.rb: check --vendor argument.
+
+	* README.EXT: explain --vendor option for extconf.rb
+
+	* README.EXT.ja: ditto.
+
+Sat Nov  3 20:30:48 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: --with-vendordir implemented.
+
+	* mkconfig.rb: add config to vendorlibdir and vendorarchdir.
+
+	* instruby.rb: make vendor library directories.
+
+	* ruby.c: insert vendor library directories into load path.
+
+Fri Nov  2 20:55:49 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/content.rb, lib/rss/content/, lib/rss/maker/content.rb,
+	  test/rss/test_content.rb, test/rss/test_maker_content.rb,
+	  test/rss/rss-testcase.rb (RSS::TestCase): supported
+	  content:encoded with RSS 2.0.
+	  Suggested by Sam Lown. Thanks.
+
+Fri Nov  2 20:47:04 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
+
+Thu Nov  1 21:56:45 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (Init_Exception): make NameError to be subclass of
+	  StandardError again.
+
+	* error.c (Init_Exception): make SecurityError to be subclass of
+	  Exception, since it's too important to be handled implicitly.
+
+Thu Nov  1 14:51:39 2007 David Flanagan <davidflanagan@ruby-lang.org>
+	* enum.c (take_while_i, drop_while_i) add RTEST to handle nil return
+
+Thu Nov  1 02:12:50 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (prereq): update the path of prelude.c.
+
+	* common.mk (prelude.c): rollback a part of r13675, because it is not
+	  documented and causes build error.
+
+Thu Nov  1 01:52:23 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enum.c (enum_drop): fix typo.
+
+Thu Nov  1 01:51:01 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_core.h (ruby_current_thread): RUBY_EXTERN'ed for probeprofiler.
+
+Thu Nov  1 00:46:30 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/configure.bat, setup.mak: now can recognize OS even if
+	  the ``--target'' option of configure is omitted.
+
+	* win32/README.win32: update the descriptions about compiler.
+
+Wed Oct 31 03:13:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_take_while): separate with-block form.
+
+	* enum.c (drop_while_i): ditto.
+
+	* enum.c (enum_butfirst): abandon butfirst method.  reverted.
+
+Tue Oct 30 10:03:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_butfirst): add a new method to iterates over
+	  elements but first n.  RDoc need to be updated.
+
+	* enumerator.c (Init_Enumerator): remove unnecessary symbol
+	  initialization.
+
+Mon Oct 29 18:42:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (bvar): block-local variable can shadow outer variable.
+	  [ruby-core:13036]
+
+Mon Oct 29 17:58:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_substr): performance improvement.  [ruby-dev:31806]
+
+Mon Oct 29 17:20:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_replicate): new function to replicate encoding.
+
+	* encoding.c (enc_based_encoding): Encoding#base_encoding returns
+	  based encoding of replica.
+
+Mon Oct 29 17:18:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): ASCII encoding is compatible with
+	  ASCII-compatible encoding, even for non-string objects.
+
+Sun Oct 28 21:50:02 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: :redirect option implemented to disable redirects.
+	  (OpenURI::HTTPRedirect): new exception class for redirection.
+
+Fri Oct 26 17:38:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (int_chr): take an optional encoding parameter.
+	  [ruby-core:12816]
+
+Fri Oct 26 17:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_pow): returns 1.0 for 0**0.0.
 
 	* numeric.c (fix_pow): returns infinity for 0**-1.  [ruby-dev:32084]
 
-Sun Jun  8 02:58:19 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+Fri Oct 26 15:00:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for
+	  labels inside switch block.
 
-	Merged 13781 from trunk.
+Fri Oct 26 05:48:57 2007  David Flanagan <davidflanagan@ruby-lang.org>
+	* array.c: raise IndexError for negative length in rb_ary_fill
+
+Wed Oct 25 07:12:03 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
 	  addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
 
-Wed Oct 25 06:46:21 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 13779 from trunk.
+Wed Oct 25 06:34:11 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
 	  pattern case insensitive. [ruby-Bugs-10746]
 
-Sun Jun  8 02:55:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Oct 26 04:21:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/pop.rb (Net::POP3::do_start): type fixed.  a patch from
+	  Dan Zwell <dzwell AT zwell.net> in [ruby-core:12941].
+
+Fri Oct 26 01:48:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_assoc): check and convert inner arrays (assocs)
+	  using #to_ary.
+
+	* hash.c (rb_hash_s_create): check and convert argument hash
+	  using #to_hash.
+
+	* hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
+	  hash conversion.
+
+Thu Oct 25 16:46:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): dot at the head of the line denote line
+	  continuation from previous one to support fluent interface.
+	  [experimental]
+
+	* misc/ruby-mode.el (ruby-calculate-indent): support fluent dot.
+
+Thu Oct 25 14:19:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_tell, rb_io_seek): check errno too.  [ruby-dev:32093]
 
-Sun Jun  8 01:53:50 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+Thu Oct 25 13:59:53 2007 David Flanagan <davidflanagan@ruby-lang.org>
+
+	* parse.y (parser_tokspace): increment tokidx
+	  fixes test failure at [test/ruby/test_stringchar.rb:72]
+
+Thu Oct 25 09:49:49 2007  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
+	  scheme. [ruby-dev:31896]
 
-	Merged 13767, 13768, 13769, and 13770 from trunk.
+Wed Oct 25 06:23:14 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/xmlrpc/parser.rb (XMLRPC::Convert::dateTime): Fixing a bug that
 	  caused time zone conversion to fail for some ISO 8601 date formats.
 	  [ruby-Bugs-12677]
 
+Wed Oct 25 04:59:28 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
 	  the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
 
+Wed Oct 25 04:46:53 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
 	  message for Content-Type check failures. [ruby-core:12163]
 
+Wed Oct 25 03:45:08 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
 	* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
 	  Making Content-Type checks case insensitive. [ruby-Bugs-3367]
 
-Sun Jun  8 01:50:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 24 17:09:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokspace): make space in token buffer.
+
+	* parse.y (parser_yylex): fix encoding of single character literal.
+
+Tue Oct 23 13:44:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (call_args2): nd_head of NODE_BLOCK_PASS should be a list.
+	  [ruby-core:12850]
+
+Tue Oct 23 10:42:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): encoding set by command line option takes
+	  priority over the encoding in the source, as the primary encoding.
+
+Mon Oct 22 19:24:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): allow space after -E (encoding) option.
+
+Mon Oct 22 11:03:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_check_encoding): returns index now.
+
+	* encoding.c (rb_enc_compatible): check if two objects have compatible
+	  encodings.
+
+	* encoding.c (enc_compatible_p): added Encoding.compatible?.
+
+	* include/ruby/encoding.h (rb_enc_compatible): prototype.
+
+Sun Oct 21 18:29:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_default, rb_enc_primary): return pointers to
+	  rb_encoding of default and primary respectively.  [ruby-core:12795]
+
+	* encoding.c (set_primary_encoding): removed primary_encoding setter.
+
+Sat Oct 20 13:17:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_cycle): hide temporary array from ObjectSpace.
+	  [ruby-core:12762]
+
+Sat Oct 20 11:49:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_get_path): returns frozen string.
+
+	* file.c (rb_file_s_chown, rb_file_s_lchown): use uid_t and gid_t.
+
+Fri Oct 19 20:08:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_id_encoding): returns ID "encoding".
+
+	* marshal.c (w_encoding): dump encoding name.
+
+	* marshal.c (r_ivar): load encoding.
+
+Fri Oct 19 16:41:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_regx_options, reg_compile_gen): relaxened encoding
+	  matching rule.
+
+	* re.c (rb_reg_initialize): always set encoding of Regexp.
+
+	* re.c (rb_reg_initialize_str): fix encoding for non 7bit-clean
+	  strings.
+
+	* re.c (rb_reg_initialize_m): use ascii encoding for 'n' option.
+
+Fri Oct 19 11:09:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): set primary encoding from the parser
+	  always.  [ruby-core:12758]
+
+	* ruby.c (load_file): should not discard the parser parameter.
+
+Fri Oct 19 10:55:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_last): removed unused variables.
+
+Thu Oct 18 17:08:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_find_index): update RDoc.  a patch from David Flanagan
+	  <david AT davidflanagan.com> in [ruby-core:12710].
+
+	* enum.c (enum_take, enum_drop): ditto.
+
+	* enum.c (enum_cycle): should not cause infinite loop for empty
+	  arrays.  [ruby-core:12710]
+
+	* range.c (Init_Range): typo fixed.
+
+Thu Oct 18 16:39:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): more
+	  duck typed.  better performance on JRuby.
+	  http://headius.blogspot.com/2007/10/another-performance-discovery-rexml.html
+
+Thu Oct 18 09:33:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_first): takes first n element if argument is
+	  given.  [ruby-core:12697]
+
+	* range.c (range_last): returns last n elements if argument is
+	  given.
+
+	* array.c (rb_ary_subseq, rb_ary_last): export.
+
+Wed Oct 17 17:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): fixed reversed condition.  [ruby-core:12722]
+
+Wed Oct 17 13:54:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_s_union): the last check was not complete.
+
+Wed Oct 17 11:30:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_from_encoding, rb_enc_register): associate index
+	  to self.
+
+	* encoding.c (enc_capable): Encoding objects are encoding capable.
+
+	* re.c (rb_reg_s_union): check if encoding matching by exact encoding
+	  objects.
+
+Wed Oct 17 06:18:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_alias, rb_enc_find_index): changed
+	  enc_table_alias to a name-to-index hash.
+
+	* encoding.c (rb_enc_init): use upper case names for aliases to use as
+	  constant names.
+
+	* encoding.c (enc_find): allow symbols.
+
+	* encoding.c (Init_Encoding): define encoding constants.
+
+	* st.c (strcasehash): fix wrong code range condition.
+
+Wed Oct 17 05:07:18 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_primary_encoding): added Encoding.primary_encoding.
+
+	* parse.y (rb_parser_encoding): added.
+
+	* ruby.c (proc_options): added -E and --encoding options.
+
+	* ruby.c (process_options): set primary encoding from command line
+	  option if set, or source encoding.
+
+	* include/ruby/encoding.h (rb_enc_from_encoding,
+	  rb_get_primary_encoding, rb_set_primary_encoding): prototypes.
+
+	* include/ruby/node.h (rb_parser_encoding): prototype.
+
+Wed Oct 17 03:37:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_desc): set encoding.
+
+	* re.c (rb_reg_s_union): check encodings.
+
+	* enc/utf8.c (utf8_code_to_mbclen): 0xfe and 0xff are valid Unicode to
+	  be encoded to 2bytes in UTF-8.  [ruby-core:12700]
+
+Wed Oct 17 02:50:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_ord): use encoding.
+
+Wed Oct 17 01:57:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_m): allow binary encoding option.
+	  [ruby-dev:32083]
+
+Tue Oct 16 19:48:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_s_union): check for encoding of original object.
+
+Tue Oct 16 18:28:51 2007  Tanaka Akira  <akr@fsij.org>
+
+	* debug.c: use enum for constants for gdb if possible.
+
+Tue Oct 16 18:20:10 2007  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c, debug.c: move debug enum and constants to debug.c.
+
+Tue Oct 16 18:16:15 2007  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (RUBY_ENCODING_SHIFT): added as enum.
+
+	* .gdbinit (rp): show encoding and coderange for strings.
+
+Tue Oct 16 14:48:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_regx_options): check if regexp encoding option
+	  matches to current encoding.
+
+	* re.c (char_to_option, rb_char_to_option_kcode): 'n' is not kcode
+	  option now.
+
+	* re.c (rb_reg_to_s, rb_reg_error_desc): copy encoding rather than
+	  append as an option.
+
+	* re.c (make_regexp, rb_reg_prepare_re): use encoding of Regexp and
+	  String instead of kcode.
+
+	* re.c (rb_reg_initialize): set fixed option if none is set.
+
+	* re.c (rb_reg_regcomp): ditto.
+
+	* re.c (rb_reg_equal): check if encodings are equal.
+
+	* re.c (rb_reg_initialize_m): encoding option is obsolete.
+
+	* re.c (rb_kcode, rb_get_kcode, rb_set_kcode): removed.
+
+	* re.c (Init_Regexp): removed Regexp#kcode method.
+
+	* ruby.c (proc_options): allow long encoding name.
+
+Tue Oct 16 14:03:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_s_union): encoding of all regexp objects should
+	  match.  [ruby-dev:32076]
+
+Tue Oct 16 13:49:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (enc_to_s): rename function.
+
+Tue Oct 16 13:25:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_new4): should copy encoding.  a patch from NARUSE,
+	  Yui <naruse AT airemix.com>.  [ruby-dev:32076]
+
+Tue Oct 16 01:31:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_inject): RDoc update.  a patch from David Flanagan
+	  <david AT davidflanagan.com> in [ruby-core:12710].
+
+Tue Oct 16 01:25:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): define #to_s to show encoding name
+	  in to_s representation as well as #inspect.
+
+Mon Oct 15 13:24:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): should be number but not rounding factor.
+	  [ruby-dev:32060]
+
+Mon Oct 15 11:45:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (r_bytes0): refined length check.  [ruby-dev:32059]
 
-Sun Jun  8 01:50:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct 15 10:24:19 2007  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (pst_to_s): returns a string such as "pid 10220 exit 1"
+	  instead of "256".  [ruby-dev:32053]
+	  (pst_inspect): change format
+	  "#<Process::Status: pid=10220,exited(1)>" to
+	  "#<Process::Status: pid 10220 exit 1>".
+
+Mon Oct 15 09:58:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (r_bytes0): check if source has enough data.
 	  [ruby-dev:32054]
 
-Sun Jun  8 01:41:19 2008  Tanaka Akira  <akr@fsij.org>
+Mon Oct 15 01:15:09 2007  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/socket.c (s_accept_nonblock): make accepted fd
 	  nonblocking.  [ruby-talk:274079]
 
-Sun Jun  8 01:36:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 14 17:31:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_obj_encoding): rdoc update.  a patch from David
+	  Flanagan <david AT davidflanagan.com>.  [ruby-core:12664]
+
+	* encoding.c (enc_dump, enc_load): marshaling feature.  a patch from
+	  David Flanagan.  [ruby-core:12665]
+
+	* encoding.c (Init_Encoding): undefine allocator of Encoding.
+	  [ruby-core:12665], [ruby-core:12666]
+
+	* test/ruby/test_encoding.rb: tests for Encoding from David Flanagan
+	  [ruby-core:12665]
+
+Sun Oct 14 11:09:09 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb (PP::PPMethods#pp_hash): don't sort keys because hash is
+	  ordered.
+	  (ENV.pretty_print): call pp_hash with sorted hash.
+
+Sun Oct 14 04:08:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (AC_SYS_LARGEFILE): keep results also in command
 	  options, to vail out of mismatch.  [ruby-list:44114]
 
 	* mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
 
-Sun Jun  8 01:31:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 14 03:55:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/mkexports.rb: deal with __fastcall name decorations.
 	  [ruby-list:44111]
 
-Sun Jun  8 01:27:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 14 02:20:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_cEncoding): new Encoding class.
+
+	* encoding.c (rb_to_encoding, rb_to_encoding_index): helper functions.
+
+	* encoding.c (rb_obj_encoding): return Encoding object now.
+
+	* gc.c (garbage_collect): mark Encoding objects.
+
+	* inits.c (rb_call_inits): call Init_Encoding.
+
+	* string.c (rb_str_force_encoding): accept Encoding object as well as
+	  encoding name.
+
+	* include/ruby/encoding.h (rb_to_encoding_index, rb_to_encoding):
+	  prototypes.
+
+Sun Oct 14 01:03:30 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI.open_http): fix :ssl_ca_cert option.
+
+Sat Oct 13 21:23:21 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (foletype_s_ole_classes,
+	  foletype_s_typelibs): refactoring.
+
+	* test/win32ole/test_win32ole_type.rb: add some test.
+
+	* ext/win32ole/win32ole.c (Init_win32ole): change method name
+	  WIN32OLE_TYPELIB.ole_types from WIN32OLE_TYPELIB.ole_classes.
+
+	* test/win32ole/test_win32ole_typelib.rb: ditto.
+
+	* test/win32ole/test_folderitem2_invokeverb.rb: check create
+	  shortcut string more strictly (This test is invoked in Japanese
+	  Windows environment).
+
+Sat Oct 13 09:11:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (set_file_encoding): case-insensitive search, a patch from
+	  David Flanagan <david AT davidflanagan.com> [ruby-core:12629]
+
+Sat Oct 13 09:02:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]
 
-Sun Jun  8 01:15:50 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Oct 13 00:17:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/http.rb, lib/open-uri.rb: remove
-	  Net::HTTP#enable_post_connection_check.  [ruby-dev:31960]
+	* lib/rexml/document.rb (REXML::Document::write): leaky
+	  modification trans -> transitive.  [ruby-dev:32040]
 
-	* lib/net/imap.rb: hostname should be verified against server's
-	  indentity as persented in the server's certificate. [ruby-dev:31960]
+Sat Oct 13 00:00:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
+	* parse.y: encoding specifier should work if the line matches
+	  /coding[:=] ?/, a la Python PEP-263, so that VIM comments like
+	  "# vim: set fileencoding=<encoding name>" should be recognized.
 
-Thu Jun  5 16:21:16 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Oct 12 15:04:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (make_cmdvector): adjust escaped successive
-	  double-quote handling. (merge from trunk)
+	* parse.y (magic_comments): add "encoding" as same as "coding".
 
-Thu Jun  5 12:26:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (set_file_encoding): special file encoding handling.
 
-	* win32/win32.c (init_env): initialize HOME and USER environment
-	  variables unless set. [ruby-core:12328] (merge from trunk)
+	* parse.y (parser_yylex): ditto.
 
-	* win32/win32.c (NtInitialize, getlogin): ditto.
+Fri Oct 12 12:44:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
-	  library for SH* functions on mswin32 and mingw32.
+	* array.c (rb_ary_combination): fixed memory corruption due to too
+	  small memory allocation
 
-Thu Jun  5 12:22:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_product): accessing out of memory bounds.
+	  condition fixed.
 
-	* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
-	  [ruby-dev:31911]
+Fri Oct 12 11:22:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jun  4 16:41:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* re.c (match_values_at): make #select to be alias to #values_at
+	  to adapt RDoc description.  [ruby-core:12588]
 
-	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
-	  objects.  [ruby-Bugs-14228]
+Thu Oct 11 21:10:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jun  3 16:15:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/node.h (NOEX_LOCAL): remove unused local visibility.
 
-	* parse.y (yyerror): limit error message length.  [ruby-dev:31848]
+	* class.c (ins_methods_push): ditto.
 
-	* regex.c (re_mbc_startpos): separated from re_adjust_startpos.
+	* class.c (rb_class_local_methods): method removed.
 
-Tue Jun  3 15:45:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Oct 11 14:29:31 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
-	  [ruby-dev:31810]
+	* */Makefile.sub (COMMON_MACROS): workaround for old SDK's bug.
+	  [ruby-core:12584]
 
-Wed Jun  4 19:16:40 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Oct 11 06:35:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (remove_method): should not remove undef place holder.
-	  [ruby-dev:31817]
+	* Makefile.in, */Makefile.sub (VPATH): add enc directory.
 
-Tue Jun  3 15:22:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk (ENCOBJS): encoding objects.
 
-	* process.c (struct rb_exec_arg): proc should be a VALUE.
+	* enc: directory for encodings.
 
-	* process.c (rb_f_exec): suppress a warning.
+Thu Oct 11 00:04:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-       * process.c (rb_detach_process): cast for the platforms where size of
-         pointer differs from size of int.
+	* include/ruby/oniguruma.h (OnigEncodingTypeST): add OnigEncoding
+	  parameter to every function members.
 
-       * process.c (rb_f_exec, rb_f_system): should not exceptions after
-         fork.  [ruby-core:08262]
+	* include/ruby/oniguruma.h (OnigEncodingTypeST): add auxiliary
+	  data member to provide user defined data for an encoding.
 
-Wed May 21 01:32:56 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Oct 10 23:32:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  name in path_info to prevent script disclosure vulnerability on
-	  DOSISH filesystems. (fix: CVE-2008-1891)
-	  Note: NTFS/FAT filesystem should not be published by the platforms
-	  other than Windows. Pathname interpretation (including short
-	  filename) is less than perfect.
+	* re.c (rb_reg_s_quote): no longer takes optional second argument
+	  that has never been documented.
 
-	* lib/webrick/httpservlet/abstract.rb
-	  (WEBrick::HTTPServlet::AbstracServlet#redirect_to_directory_uri):
-	  should escape the value of Location: header.
+Wed Oct 10 15:39:04 2007  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
-	  command line arguments.
+	* encoding.c (rb_enc_init): don't alias iso-8859-1 to ascii.
 
-Sun May 18 01:57:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ascii.c (OnigEncodingASCII): change the name US-ASCII to ASCII-8BIT.
 
-	* file.c (isdirsep): backslash is valid path separator on cygwin too.
-	  backported from 1.8 HEAD.
+Wed Oct 10 14:31:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May 17 23:53:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_enc_str_coderange): fixed check for non-ascii.
 
-	* file.c (file_expand_path): fix for short file name on Cygwin.
+Tue Oct  9 21:35:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May 17 23:50:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_permutation, rb_ary_combination): missing type
+	  names.
 
-	* file.c (OpenFile): prevent conflict on Windows.
+	* array.c (rb_ary_permutation): used buffer should be t1.
 
-	* file.c (USE_NTFS): fixed merge miss.
+	* array.c (rb_ary_permutation): use frozen shared hidden array.
+	  [ruby-dev:31985]
 
-Sat May 17 12:36:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct  9 16:58:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* file.c (file_expand_path): rb_str_set_len is not backported.
+	* array.c: remove to_a completely.
 
-Sat May 17 12:15:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (tmpbuf): keep DRY to clear klass of temporary objects.
 
-	* file.c (file_expand_path): support for alternative data stream
-	  and ignored trailing garbages of NTFS.
+Tue Oct  9 16:33:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* file.c (rb_file_s_basename): ditto.
+	* array.c (rb_ary_permutation, rb_ary_combination, rb_ary_product):
+	  hide internal buffer objects.  [ruby-dev:31982]
 
-	* file.c (rb_file_s_extname): ditto.
+Tue Oct  9 16:00:32 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Mon Mar  3 23:34:13 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (parser_read_escape, parser_tokadd_escape): check code range.
+	  [ruby-dev:31980]
 
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  separators in path_info to prevent directory traversal attacks
-	  on DOSISH platforms.
-	  reported by Digital Security Research Group [DSECRG-08-026].
+Tue Oct  9 15:40:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/webrick/httpservlet/filehandler.rb: pathnames which have
-	  not to be published should be checked case-insensitively.
+	* parse.y (STR_NEW3): check for if single byte sequence.
+
+Mon Oct  8 20:06:29 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/net/imap.rb, lib/net/smtp.rb, lib/net/pop.rb: hostname should
+	  be verified against server's identity as presented in the server's
+	  certificate. [ruby-dev:31960]
 
-Mon Dec  3 08:13:52 2007  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
+
+Sun Oct  7 22:37:47 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rss/test_taxonomy.rb, test/rss/test_parser_1.0.rb,
 	  test/rss/test_image.rb, test/rss/rss-testcase.rb: ensured
 	  declaring XML namespaces.
 
-Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>  
+Sun Oct  7 22:00:01 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/node.h: make node flags as VALUE type.
+	  enum ruby_node_flags removed.
+
+	* ruby.c: define RUBY_NODE_* as const for gdb.
+
+Sun Oct  7 18:57:12 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h: enum ruby_value_flags removed.  [ruby-dev:31959]
+
+	* ruby.c: define RUBY_FL_* as const VALUE for gdb.
+
+Sun Oct  7 17:50:14 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/net/http.rb: remove enable_post_connection_check flag.
+
+	* lib/open-uri.rb: ditto.
+
+Sun Oct  7 15:48:40 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (opt_eq): fix to use rb_str_equal().
+
+Sat Oct  6 23:14:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_to_i): update RDoc since base can be any value
+	  between 2 and 36.  [ruby-talk:272879]
+
+Sat Oct  6 16:24:02 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (cont_free): check Fiber or Continuation.
+
+	* bootstraptest/test_knownbug.rb: remove a fixed test.
+
+Sat Oct  6 14:56:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_register): returns new index or -1 if failed.
+
+	* encoding.c (rb_enc_alias): check if original name is registered.
+
+	* encoding.c (rb_enc_init): register in same order as kcode options in
+	  re.c.  added new aliases.
+
+	* string.c (rb_str_force_encoding): check if valid encoding name.
+
+Sat Oct  6 14:32:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (opt_eq): get rid of gcc bug.
+
+Sat Oct  6 02:34:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/defines.h: no longer provide DEFAULT_KCODE.
+
+Fri Oct  5 21:24:59 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_s_union_m): Regexp.union accepts single argument which
+	  is an array of patterns.  [ruby-list:44084]
+
+Fri Oct  5 16:42:27 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_not_match): new method.
+
+Fri Oct  5 16:15:52 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: Turn on --enable-pthread by default for FreeBSD
+	  5.2.1-RELEASE and later, and remove pthread support for older
+	  versions which has never worked perfectly.
+
+Fri Oct  5 16:11:50 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* time.c (time_to_s): Fix documentation.  Time format changed.
+
+Fri Oct  5 04:02:39 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
+	  code optimization.
+
+Fri Oct  5 03:25:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr
+	  comparable.
+
+	* lib/ipaddr.rb (succ): Implement IPAddr#succ.  You can now create
+	  a range between two IPAddr's, which (Range) object is
+	  enumerable.
+
+	* lib/ipaddr.rb (to_range): A new method to create a Range object
+	  for the (network) address.
+
+Fri Oct  5 03:14:45 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (coerce_other): Support type coercion and make &,
+	  |, == and include? accept a string or an integer instead of an
+	  IPAddr object as the argument.
+
+	* lib/ipaddr.rb (initialize): Give better error messages.
+
+	* lib/ipaddr.rb: Improve documentation.
+
+Thu Oct  4 20:45:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (Init_process): win32 has our own WNOHANG definition, so
+	  remove unnecessary #ifdef guard.
+
+Thu Oct  4 20:17:19 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (rb_ary_permutation, rb_ary_product): support non C99
+	  compilers.
+
+Thu Oct  4 17:33:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (kcode_setter): Perl-ish global variable `$=' no longer
+	  effective.
+
+	* io.c (Init_IO): remove obsolete variables: $defout, $deferr.
+
+	* re.c (Init_Regexp): remove obsolete const alias: MatchingData.
+
+	* time.c (Init_Time): remove obsolete Time::times.
+
+	* re.c (ignorecase_setter): change warning message.
+
+	* re.c (ignorecase_getter): now gives warning.
+
+	* string.c (rb_str_cmp_m): update RDoc document.
+
+	* re.c (kcode_setter): restore erroneously removed setter.
+
+Thu Oct  4 16:28:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_obj_encoding): returns encoding of the given object.
+
+	* parse.y (reg_compile_gen): copy encoding from source string if
+	  non-empty.
+
+	* re.c (Init_Regexp): new method Regexp#encoding.
+
+	* string.c (str_encoding): moved to encoding.c
+
+Thu Oct  4 15:49:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_permutation): remove C99 dependency.
+	  [ruby-dev:31934]
+
+	* array.c (rb_ary_product): ditto.
+
+Wed Oct  3 23:37:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/nkf/nkf.c, bin/ri, bin/irb: fixed typos in doc and comments.
+	  a patch from Eugene Ossintsev  <eugoss AT gmail.com>.
+	  [ruby-core:12375]
+
+Wed Oct  3 17:56:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: enable specify label to executable.
+	  (-e "ruby1::/path/to/ruby1; ruby2::/path/to/ruby2; ...")
+
+Wed Oct  3 16:58:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_str_new, parser_yylex, rb_intern3): set code-range
+	  bits.
+
+	* parse.y (parser_tokadd_string): check code-range.
+
+	* parse.y (parser_parse_string, parser_here_document): ditto.
+
+	* parse.y (parser_set_encode): check if valid encoding.
+
+Wed Oct  3 15:43:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_cvar_set): check whether class variable is
+	  defined in superclasses.  root classes have higher priority.
+	  removes lower class variable entry from IV_TBL (if it's defined
+	  in classes, not modules).
+
+	* variable.c (rb_cvar_get): ditto.
+
+Wed Oct  3 10:06:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_process_options): push frame with program name.
+	  [ruby-core:12351]
+
+Tue Oct  2 20:16:55 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (init_env): refactoring. remove unused code.
+
+Tue Oct  2 12:30:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_product): generalized product, now takes
+	  arbitrary number of arrays.  a patch from David Flanagan
+	  <david AT davidflanagan.com>.  [ruby-core:12346]
+
+Tue Oct  2 08:25:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_permutation): implementation contributed from
+	  David Flanagan.  [ruby-core:12344]
+
+	* array.c (rb_ary_combination): RDoc update to clarify.  a patch
+	  from David Flanagan.  [ruby-core:12344]
+
+	* array.c (rb_ary_permutation): small dirty hack by Matz to avoid
+	  arrays on stack.
+
+Tue Oct  2 07:01:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (proc_dup): proc->block.proc should be self.
+
+	* bootstraptest/test_knownbug.rb, test_method.rb:
+	  move a fixed test.
+
+Mon Oct  1 16:17:44 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/test_method.rb: use assert_normal_exit to test
+	  [ruby-dev:31818].
+
+Mon Oct  1 15:57:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (id2ref): skip ICLASS.
+
+Mon Oct  1 15:29:35 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_normal_exit): use `` instead of
+	  system.
+
+Mon Oct  1 15:17:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (id2ref): T_VALUES is less than T_BLOCK.  [ruby-dev:31911]
+
+Mon Oct  1 10:58:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (require_libraries): use require method instead of calling
+	  rb_require directly.  [ruby-dev:31322]
+
+Mon Oct  1 10:52:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_options), ruby.c (proc_options, process_options): not
+	  call exit(2) directly.  [ruby-dev:31912]
+
+	* eval.c (ruby_run_node): deal with direct exit code.
+
+Sun Sep 30 17:12:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_append): always set encoding, and coderange
+	  cache bits.
+
+	* include/ruby/encoding.h (ENC_CODERANGE_SET): fixed a bug not to
+	  set cache bits.
+
+Sun Sep 30 11:52:11 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (pretty): don't show beginning empty line.
+
+Sun Sep 30 11:32:34 2007  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c: use #ifdef for test LONG_LONG_VALUE.
+
+Sun Sep 30 04:30:55 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: use SIZEOF_LONG instead of SIZEOF_ULONG which is not
+	  defined.
+
+Sun Sep 30 04:03:43 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (Init_Regexp): test DEFAULT_KCODE in C code because
+	  KCODE_EUC, etc. are enum.
+
+Sun Sep 30 00:55:40 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* variable.c (obj_ivar_each): get rid of warning.
+
+Sat Sep 29 17:45:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* main.c (main): use platform-independent per-process initialization.
+	  [ruby-dev:31900]
+
+	* ruby.c (ruby_sysinit): new function for per-process initialization.
+
+	* include/ruby/ruby.h (RUBY_GLOBAL_SETUP): toplevel setup declaration.
+
+	* include/ruby/win32.h, win32/mkexports.rb: alias NtInitialize
+	  ruby_sysinit.
+
+	* win32/win32.c (rb_w32_sysinit): renamed from NtInitialize.
+
+Sat Sep 29 17:31:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_combination): new method to give all combination
+	  of elements from an array.  [ruby-list:42671]
+
+	* array.c (rb_ary_product): a new method to get all combinations
+	  of elements from two arrays.  can be extended to combinations of
+	  n-arrays, e.g. a.product(b,c,d).  anyone volunteer?
+
+	* array.c (rb_ary_permutation): empty function body to calculate
+	  permutations of array elements.  need volunteer.
+
+Sat Sep 29 17:14:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_leave): move proc invocation from r_entry() to
+	  avoid potential crash.
+
+Sat Sep 29 12:28:08 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_normal_exit): new method.
+
+	* bootstraptest/test_knownbug.rb: add test for Marshal.load.
+
+Sat Sep 29 10:12:20 2007  Tanaka Akira  <akr@fsij.org>
+
+	* variable.c (rb_ivar_set): fix class instance variable.
+
+	* object.c (rb_class_real): cl argument may be 0.
+
+Sat Sep 29 09:12:02 2007  Tanaka Akira  <akr@fsij.org>
+
+	* object.c (rb_class_real): use BUILTIN_TYPE instead of TYPE.
+	  access flags directly instead of FL_TEST.
+	  they are enough because cl argument is a class.
+
+Sat Sep 29 08:57:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (strcasecmp): needed for type_strcasehash.
+
+Sat Sep 29 06:47:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (struct cmdline_options): static variables packed.
+
+Sat Sep 29 05:29:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_fdopen): create IO object from fd.
+
+	* parse.y (yycompile): use encoding of the source as default.
+
+	* ruby.c (proc_options, load_file): ditto.
+
+Sat Sep 29 04:27:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_alias): allow encodings multiple aliases.
+
+	* encoding.c (rb_enc_find_index): search the encoding which has the
+	  given name and return its index if found, or -1.
+
+	* st.c (type_strcasehash): case-insensitive string hash type.
+
+	* string.c (rb_str_force_encoding): force encoding of self.  this name
+	  comes from [ruby-dev:31894] by Martin Duerst.  [ruby-dev:31744]
+
+	* include/ruby/encoding.h (rb_enc_find_index, rb_enc_associate_index):
+	  prototyped.
+
+	* include/ruby/encoding.h (rb_enc_isctype): direct interface to ctype.
+
+	* include/ruby/st.h (st_init_strcasetable): prototyped.
+
+Sat Sep 29 03:53:26 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: Thread local storage should be fiber local.
+
+	* bootstraptest/test_knownbug.rb, test/ruby/test_fiber.rb:
+	  move a fixed test.
+
+Fri Sep 28 23:15:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insnhelper.ci (vm_call_method): allow send! to call protected
+	  methods as well.  [ruby-core:12280]
+
+Fri Sep 28 22:33:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_so_fasta.rb: added.
+
+	* benchmark/bm_so_k_nucleotide.rb: added.
+
+	* benchmark/bm_so_reverse_complement.rb: added.
+
+	* benchmark/make_fasta_output.rb: added.
+
+	* benchmark/prepare_so_k_nucleotide.rb: added.
+
+	* benchmark/prepare_so_reverse_complement.rb: added.
+
+Fri Sep 28 19:14:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix notations.
+
+	* benchmark/bm_loop_whileloop.rb: ditto.
+
+	* benchmark/bm_loop_whileloop2.rb: ditto.
+
+	* benchmark/bm_app_uri.rb: added.
+
+	* benchmark/bm_vm1_ivar_set.rb: ditto.
+
+	* benchmark/bm_so_binary_trees.rb: added from Computer Language
+	  Benchmarks Game (http://shootout.alioth.debian.org/).
+
+	* benchmark/bm_so_fannkuch.rb: ditto.
+
+	* benchmark/bm_so_mandelbrot.rb: ditto.
+
+	* benchmark/bm_so_meteor_contest.rb: ditto.
+
+	* benchmark/bm_so_nbody.rb: ditto.
+
+	* benchmark/bm_so_nsieve.rb: ditto.
+
+	* benchmark/bm_so_nsieve_bits.rb: ditto.
+
+	* benchmark/bm_so_partial_sums.rb: ditto.
+
+	* benchmark/bm_so_pidigits.rb: ditto.
+
+	* benchmark/bm_so_spectralnorm.rb: ditto.
+
+Fri Sep 28 16:22:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_core.h (rb_vm_struct): fix typo: bufferd -> buffered.
+
+Fri Sep 28 15:47:48 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix to output benchmark results
+	  to file "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}".
+
+	* benchmark/bm_io_file_create.rb: remove useless codes.
+
+	* benchmark/bm_vm2_eval.rb: added.
+
+Fri Sep 28 15:05:24 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h: export rb_ivar_foreach.
+
+	* include/ruby/ruby.h: modify struct RObject and RClass for optimizing
+	  T_OBJECT space.  [ruby-dev:31853]
+	  (ROBJECT_LEN, ROBJECT_PTR)
+	  (RCLASS_IV_TBL, RCLASS_M_TBL, RCLASS_SUPER, RCLASS_IV_INDEX_TBL)
+	  (RMODULE_IV_TBL, RMODULE_M_TBL, RMODULE_SUPER): abstract accessor
+	  defined.
+
+	* variable.c: support the modified RObject and RClass.
+
+	* object.c: ditto.
+
+	* class.c: ditto.
+
+	* gc.c: ditto.
+
+	* marshal.c: ditto.
+
+	* eval_method.ci: use the abstract accessor.
+
+	* insns.def: ditto.
+
+	* proc.c: ditto.
+
+	* struct.c: ditto.
+
+	* eval.c: ditto.
+
+	* error.c: ditto.
+
+	* vm.c: ditto.
+
+	* insnhelper.ci: ditto.
+
+	* ext/digest/digest.c: ditto.
+
+Fri Sep 28 13:20:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline_fast, rb_io_getline_1): set encoding to the
+	  result string, as well as getc.
+
+Fri Sep 28 12:51:42 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_erb.rb: added.
+
+	* benchmark/bm_io_file_(create|read|write).rb: added.
+
+Fri Sep 28 12:49:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix file selection algorithm.
+
+Fri Sep 28 02:05:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_comparable): need not to check asciicompat here.
+
+	* encoding.c (rb_enc_check): ditto.
+
+	* string.c (rb_enc_str_coderange): tuned a bit; no broken check.
+
+	* encoding.c (rb_enc_check): new encoding comparison criteria.
+
+Thu Sep 27 17:36:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/REAMDE.win32: follow recent changes.
+
+Thu Sep 27 16:01:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix to output some helpful messages.
+
+Thu Sep 27 15:44:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: added.
+
+	* common.mk: fix to use above driver.
+
+	* benchmark/prepare_so_count_words.rb: added.
+
+	* benchmark/bm_so_count_words.rb: fix benchmark process.
+
+Thu Sep 27 15:42:34 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/fiber/fiber.c: modify prototype declaration.
+	  [ruby-core:12247]
+
+Thu Sep 27 09:42:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (strings, xstring, regexp, dsym): empty strings have
+	  US-ASCII encoding.
+
+Thu Sep 27 07:39:13 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_finish): new method.
+
+	* bootstraptest/test_knownbug.rb: add test for [ruby-dev:31866] using
+	  assert_finish.
+
+Thu Sep 27 04:46:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_associate_index): deal with ASCII compatible
+	  flags.
+
+	* encoding.c (rb_enc_check): allow ASCII compatible strings.
+
+	* parse.y (rb_intern_str): use ASCII encoding for ASCII string.
+
+	* string.c (rb_enc_str_coderange): check for code-range.
+
+	* string.c (rb_str_modify): clear code-range flags.
+
+	* string.c (rb_str_hash, rb_str_eql): ASCII compatible strings are
+	  comparable.
+
+	* include/ruby/encoding.h: added code-range flags.
+
+Thu Sep 27 04:40:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_mark_set): new function to mark keys.
+
+	* marshal.c (struct dump_arg, struct load_arg): added wrappers to mark
+	  data and compat_tbl entries.  [ruby-dev:31870]
+
+Thu Sep 27 03:17:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_waitpid): no needs to poll.  [ruby-dev:31871]
+
+Wed Sep 26 20:11:46 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: remove a fixed test.
+
+Wed Sep 26 20:00:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: move fixed tests.
+
+	* bootstraptest/test_method.rb: ditto.
+
+	* test/ruby/test_io.rb: ditto.
+
+Wed Sep 26 19:36:26 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (eval): fix to check stack overflow.
+	  [ruby-dev:31850]
+
+	* eval_intern.h, vm.h: move CHECK_STACK_OVERFLOW() macro.
+
+Wed Sep 26 19:27:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_throw): fix to move increment point.
+	  [ruby-dev:31840]
+
+Wed Sep 26 19:23:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: Fiber as SemiCoroutine on default. [ruby-core:12146]
+
+	* ext/fiber/fiber.c: enable Fiber#transfer.
+
+Wed Sep 26 18:38:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_check): check for ASCII-compatibilities.
+
+	* parse.y (parser_tokadd_string, parser_parse_string,
+	  parser_here_document, parser_yylex): set encoding to US-ASCII.
+
+	* parse.y (rb_enc_symname_p): check if valid with encoding.
+
+	* parse.y (rb_intern3): let symbols have encoding.
+
+	* string.c (rb_str_hash): add encoding index.
+
+	* string.c (rb_str_comparable, rb_str_equal, rb_str_eql): check if
+	  compatible encoding.
+
+	* string.c (sym_inspect): made encoding aware.
+
+	* insns.def (opt_eq): compare with encoding.
+
+	* include/ruby/encoding.h (rb_enc_asciicompat): check if ASCII
+	  compatible.
+
+	* include/ruby/encoding.h (rb_enc_get_index): added prototype.
+
+	* include/ruby/intern.h (rb_str_comparable, rb_str_equal): ditto.
+
+Wed Sep 26 15:01:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_method.ci (rb_get_alloc_func): cast to suppress a warning.
+
+	* eval_method.ci (remove_method): local variable to be initialized.
+
+Wed Sep 26 08:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
+	  objects.  [ruby-Bugs-14228]
+
+Wed Sep 26 05:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yyerror): limit error message length.
+	  [ruby-dev:31848]
+
+Tue Sep 25 15:11:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_ungetc): reallocate internal buffer if pushing data
+	  excess capacity.  [ruby-dev:31650]
+
+Tue Sep 25 13:43:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_method.ci (remove_method): should not remove undef place
+	  holder.  [ruby-dev:31816], [ruby-dev:31817]
+
+Tue Sep 25 09:51:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_longjmp): source file information may be NULL.
+	  [ruby-dev:31849]
+
+	* eval.c (ruby_finalize_0): clear trace_func before finalization.
+
+Mon Sep 24 22:36:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_equal): should handle recursive array.
+
+	* hash.c (hash_equal): should handle recursive hash.
+
+Mon Sep 24 22:14:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/weakref.rb (WeakRef): remove debug print.  [ruby-dev:31799]
+
+	* hash.c (hash_i): avoid too frequent hash conflict where key and
+	  value are same.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
+	  [ruby-dev:31802]
+
+Mon Sep 24 17:56:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/strscan/strscan.c (strscan_initialize, strscan_getch): use the
+	  encoding of the target string instead of setting to StringScanner
+	  instance.  [ruby-dev:31831]
+
+Mon Sep 24 16:52:11 2007  Urabe Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/net/http.rb: fix typo.
+
+Mon Sep 24 06:49:15 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/net/http.rb: an SSL verification (the server hostname should
 	  be matched with its certificate's commonName) is added.
@@ -559,59 +49086,339 @@ Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/lib/openssl/ssl.c
 	  (OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
 
-Sun Sep 23 07:49:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep 23 09:05:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c, intern.h, ext/thread/thread.c: should not free queue while
-	  any live threads are waiting.  [ruby-dev:30653]
+	* gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
+	  [ruby-dev:31810]
 
-Sun Sep 23 06:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep 23 08:58:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_init): separate from strio_initialize
-	  to share with strio_reopen properly.  [ruby-Bugs-13919]
+	* eval_method.ci (rb_attr): should not use alloca for unknown size
+	  input.  [ruby-dev:31818]
+
+	* parse.y (rb_intern_str): prevent str from optimization.
+
+Sun Sep 23 06:16:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_method.ci (remove_method): check for undefined method.
+	  [ruby-dev:31816]
 
 Sun Sep 23 05:42:35 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* lib/rdoc/options.rb (Options::check_diagram): dot -V output
 	  changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
 
-Wed Sep 19 11:13:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Sep 22 06:02:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bignum.c (bigtrunc): RBIGNUM(x)->len may be zero.  out of bound
-	  access.  [ruby-dev:31404]
+	* lib/optparse.rb (OptionParser::List::summarize): use each_line if
+	  defined rather than each.  [ruby-Patches-14096]
+
+Sat Sep 22 05:19:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_init): separate from strio_initialize
+	  to share with strio_reopen properly.  [ruby-Bugs-13919]
+
+Fri Sep 21 14:51:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_mark_rest): copy just used part.
+
+	* gc.c (gc_mark_children): mark u1 and u2 of NODE_ARGSCAT.
+
+	* gc.c (os_obj_of): hide T_VALUES too.  [ruby-dev:31804]
+
+	* gc.c (run_final): freeze temporary argument array.
+
+Fri Sep 21 04:58:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el (ruby-style-label-indent): fix for function top
+	  level labels.
+
+Fri Sep 21 02:11:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_match_m): evaluate a block if match.  it would make
+	  condition statement much shorter, if no else clause is needed.
+
+	* string.c (rb_str_match_m): ditto.
+
+Fri Sep 21 02:02:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (hash_equal): should call rb_eql when argument eql is set.
+
+Thu Sep 20 17:28:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (popen_exec), process.c (rb_spawn): stop other threads before
+	  exec.  [ruby-core:08262]
+
+Tue Sep 18 22:08:42 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/matrix.rb: fix a coerce bug of Vector. [ruby-core: 12190]
+
+Mon Sep 17 21:06:03 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTP::GenericRequest#initialize): check path is
+	  not nil. [ruby-dev:31149]
+
+Mon Sep 17 21:00:51 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (ripper): rename event: arglist_* -> args_*.
+
+	* parse.y (ripper): rename event: restparam -> rest_param.
+
+	* parse.y (ripper): rename event: constpath_* -> const_path_*.
+
+	* parse.y (ripper): rename event: topconst_* -> top_const_*.
+
+	* parse.y (ripper): rename event: iter_block -> method_add_block.
+
+	* parse.y (ripper): support block local parameter declaration.
+
+	* parse.y (ripper): introduce new macro params_new.
+
+	* ext/ripper/lib/ripper/sexp.rb: should not dispose event
+	  arguments whose name ends with "_new" but arity != 0.
+
+Sat Sep 15 23:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (struct parser_params): common members in the parser and
+	  ripper must be placed at each same location.
+
+Sat Sep 15 18:25:15 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* string.c (rb_str_rstrip_bang): fixed too much rstrip. [ruby-dev:31786]
+
+Sat Sep 15 17:32:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_initialize): set default encoding.  [ruby-dev:31787]
+
+	* ruby.c (load_file): make new parse instance after processing shebang
+	  line options.
+
+Sat Sep 15 17:04:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_associate_index, rb_enc_get_index): check if
+	  object is encoding capable.  [ruby-dev:31780]
+
+	* string.c (rb_str_subpat_set): check for if the argument is a String.
+
+Sat Sep 15 13:31:21 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss.rb, lib/rss/, test/rss/:
+	  - 0.1.9 -> 0.2.0.
+	  - supported Slash module.
+
+Fri Sep 14 22:20:01 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fev_unadvise): no needs to reset
+	  event handlers.
 
-Mon Sep 17 05:24:13 2007  Sylvain Joyeux <sylvain.joyeux@m4x.org>
+Fri Sep 14 17:28:32 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/thread/thread.c (lock_mutex): should take care of threads
-	  not waiting any longer; there cases of a thread raising
-	  exceptions. [ ruby-Bugs-11901 ]
+	* test/ruby/test_io.rb: tests which cause SEGV should not be
+	  added.
 
-	* test/thread/test_thread.rb (test_mutex_exception_handling):
-	  test for above.
+	* bootstraptest/test_knownbug.rb: add above test to known bug.
 
-Mon Sep 17 05:01:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep 14 16:24:04 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* runruby.rb: fix incomplete backport r12339.
+	* insnhelper.ci (vm_expandarray): assignment should be placed
+	  after creating new array.
 
-Mon Sep 17 04:56:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep 14 16:17:30 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* test/thread/test_thread.rb (test_local_barrier),
-	  test/thread/lbtest.rb: test for [ruby-dev:30653].
+	* bootstraptest/runner.rb: add a stress test (-s).
 
-Mon Sep 17 04:52:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep 14 16:14:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.h, eval_intern.h: move some macros to eval_intern.h.
+
+	* eval_jump.ci (rb_f_throw): fix to use NEW_THROW_OBJECT().
+
+	* eval.c (rb_f_loop): remove additional macro.
+
+Fri Sep 14 16:12:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_expandarray): should be volatile value for GC.
+
+Thu Sep 13 15:42:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): inline cache entries are overwritten
+	  in iseq_build_body().
+
+Thu Sep 13 14:00:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (brace_block): should use compstmt.  patch submitted by
+	  Kirill A. Shutemov <k.shutemov AT gmail.com>  [ruby-core:12154].
+
+Thu Sep 13 13:47:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id2str): fixed typo.
+
+Wed Sep 12 23:12:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.c (proc_options): -W should be allowed in RUBYOPT
 	  environment variable.  [ruby-core:12118]
 
-Mon Sep 17 04:37:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep 12 15:19:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_s_sysopen): should not use alloca for unknown size
+	  input.  [ruby-dev:31775]
+
+	* parse.y (rb_id2str): ditto.
+
+	* marshal.c (w_float): use snprintf instead of sprintf.
+
+Tue Sep 11 17:28:00 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
+	  suffix for a temporary file name.
+
+	* lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
+	  names less predictable by including a random string.
+	  [inspired by: akr]
+
+Tue Sep 11 17:25:59 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb: Add shellescape() and shelljoin().
+
+	* lib/shellwords.rb: Rename shellwords() to shellsplit() and make
+	  the former an alias to the latter.
+
+	* lib/shellwords.rb: Add escape(), split(), join() as class
+	  methods, which are aliases to their respective long names
+	  prefixed with `shell'.
+
+	* lib/shellwords.rb: Add String#shellescape(), String#shellsplit()
+	  and Array#shelljoin() for convenience.
+
+Mon Sep 10 15:48:31 2007  Tanaka Akira  <akr@fsij.org>
+
+	* range.c: represent initialized state using EXCL instead of FL_USER3.
+
+	* range.c (range_dumper): make uninitialized range dumpable.
+	  (range_loader): make uninitialized range loadable.
+
+Mon Sep 10 13:44:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_cycle): avoid infinite loop for empty array.
+	  based on a patch from David Flanagan.  [ruby-core:12085]
+
+Mon Sep 10 01:21:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object0): struct allocation first to check if a
+	  class is a struct.  compatibility check should come next.
+
+Mon Sep 10 01:05:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
 
-Fri Sep  7 17:06:16 2007  Vincent Isambart <vincent.isambart@gmail.com>
+Sun Sep  9 08:57:27 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (_strptime): now also attaches an element
+	  which denotes leftover substring if exists.
+
+Sun Sep  9 01:59:08 2007  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (r_object0): check T_STRUCT type for structs.
+
+Sun Sep  9 01:17:05 2007  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (r_object0): don't call user-defined initialize for
+	  T_STRUCT objects.
+
+	* include/ruby/intern.h (rb_struct_initialize): declared.
+
+	* struct.c (rb_struct_initialize): export.
+
+Sat Sep  8 23:55:56 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval_method.ci (rb_get_alloc_func): new function to get allocation
+	  function.
+
+	* include/ruby/intern.h (rb_alloc_func_t): declared.
+	  (rb_define_alloc_func): declared.
+	  (rb_marshal_define_compat): declared.
+
+	* range.c: use T_STRUCT for Range.
+
+	* inits.c: move Init_marshal() prior to Init_Range() because
+	  Init_Range calls rb_marshal_define_compat which needs
+	  marshal's compat_allocator_tbl initialized.
+
+	* marshal.c: support marshal format compatibility layer designed for
+	  marshaling T_STRUCT Range using T_OBJECT format.
+	  (rb_marshal_define_compat): defined.
+
+	[ruby-dev:31710]
+
+Sat Sep  8 10:05:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_s_members): check if __members__ is an
+	  array to prevent segmentation fault.  [ruby-dev:31759]
+
+Sat Sep  8 09:33:09 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (str[fp]time): now check specifications more
+	  strictly.
+
+Sat Sep  8 02:56:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw
+	  now raise ArgumentError exception.
+
+Sat Sep  8 02:45:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_s_members): should raise TypeError instead
+	  of call rb_bug().  [ruby-dev:31709]
+
+	* marshal.c (r_object0): no nil check require any more.
+
+Sat Sep  8 01:46:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c (rb_thread_start_0): should unset time_thread_alive_p.
-	  [ruby-talk:257219], [ruby-core:11542], [ruby-dev:31253]
+	* regenc.c, regenc.h (onigenc_single_byte_mbc_enc_len): should take
+	  two arguments. [ruby-dev:31754]
 
-Fri Sep  7 16:39:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep  7 00:58:16 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: fix typo.
+
+Fri Sep  7 00:28:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_getc): forgot to commit rb_enc_mbclen() fix.
+
+	* ext/stringio/stringio.c (strio_getc): rb_enc_mbclen() fix.
+
+	* ext/stringio/stringio.c (strio_ungetc): ditto.
+
+Thu Sep  6 22:57:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_::copy): prevent self copy of
+	  directories.
+
+	* lib/fileutils.rb (FileUtils::fu_each_src_dest0): use try_convert.
+
+	* lib/fileutils.rb (FileUtils::fu_update_option): ditto.
+
+Thu Sep  6 21:36:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/oniguruma.h (OnigEncodingTypeST): add end parameter
+	  to mbc_enc_len.
+
+	* euc_jp.c (mbc_enc_len), sjis.c (mbc_enc_len),
+	  utf8.c (utf8_mbc_enc_len): ditto.
+
+	* encoding.c (rb_enc_mbclen): add end parameter.
+
+Thu Sep  6 21:31:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_cycle): typo in rdoc.  a patch from Yugui
+	  <yugui@yugui.sakura.ne.jp>.  [ruby-dev:31748]
+
+Thu Sep  6 12:42:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_succ, rb_str_chop_bang, rb_str_chop): m17n support.
+	  [ruby-dev:31734]
+
+Wed Sep  5 22:02:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_subseq): need integer overflow check.
 	  [ruby-dev:31736]
@@ -623,39 +49430,1045 @@ Fri Sep  7 16:39:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_splice): integer overflow for length.
 	  [ruby-dev:31739]
 
-Fri Sep  7 16:33:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Sep  4 20:43:44 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_EVENT#unadvise.
+
+	* test/win32ole/test_win32ole_event.rb: ditto.
+
+Mon Sep  3 15:37:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (vm.o): depends on st.h too.
+
+Sun Sep  2 23:38:29 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/st.h (struct st_table): make num_entries bitfield
+	  instead of num_bins for speed.  num_entries has less access.
+
+Sun Sep  2 00:37:57 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (_parse): improved parsing of ordinal dates.
+
+	* lib/date/format.rb (_parse): use named character classes in some
+	  regular expressions.
+
+Sat Sep  1 23:44:26 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_jump.ci (rb_f_throw): wrap tag and TAG_THROW in a NODE_MEMO
+	  node to make throw instruction to work well.
+
+Sat Sep  1 20:56:07 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (struct RBignum): embed digits in RBignum for
+	  small bignums.
+
+	* bignum.c: RBignum embedded digits implemented.
+
+	* include/ruby/intern.h: declare rb_big_resize.
+
+	* gc.c: don't free embedded digits.
+
+	* numeric.c: replace direct bignum field accessor by abstract field
+	  accessor such as RBIGNUM(val)->sign to RBIGNUM_SIGN(val).
+
+	* sprintf.c: ditto.
+
+	* compar.c: ditto.
+
+	* marshal.c: ditto.
+
+	* random.c: ditto.
+
+	* .gdbinit: support embedded small bignums.
+
+	[ruby-dev:31689]
+
+Sat Sep  1 19:59:43 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_event_free): IConnectionPoint should be
+	  released.
+
+	* ext/win32ole/win32ole.c (EVENTSINK_Destructor): ITypeInfo should be
+	  released.
+
+	* ext/win32ole/win32ole.c (fev_initialize): refactoring.
+
+Sat Sep  1 16:26:09 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/socket/test_tcp.rb (test_recvfrom): same as mswin32 on mswin64.
+
+Sat Sep  1 14:24:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_numcmp, st_numhash): use st_data_t instead of long, because
+	  the former may be larger than the latter.
+
+	* include/ruby/st.h (CHAR_BIT): get rid of magic number.
+
+	* include/ruby/st.h (rb_index_t): use st_data_t for the platforms it
+	  is larger than int.
+
+Sat Sep  1 10:43:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_jump.ci (rb_f_catch): generate new tag object if no argument is
+	  given.  backported from MatzRuby.  [ruby-dev:31609]
+
+	* eval_jump.ci (rb_catch): call #catch without arguments if tag
+	  string is NULL.
+
+	* eval_jump.ci (rb_f_throw): allow throwing non-symbol object.
+
+	* eval_jump.ci (rb_catch_obj): new function to wait throw with arbitrary
+	  object.
+
+	* eval_jump.ci (rb_throw_obj): new function to throw arbitrary object.
+
+	* variable.c (check_autoload_table): prevent multiple calls from
+	  RSTRING_PTR().
+
+Fri Aug 31 07:12:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (SQRT_LONG_MAX): use SIZEOF_LONG instead of SIZEOF_VALUE
+	  because SIZEOF_VALUE > SIZEOF_LONG on some platforms.
+
+Fri Aug 31 04:18:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_norm_arg, f_arg_item): not croak already erred names.
+	  [ruby-dev:31687]
+
+	* parse.y (assignable_gen): ignore already erred names.
+
+	* parse.y (shadowing_lvar_gen): always make new block local variable
+	  when shadowing outer local variable.  [ruby-dev:31507]
+
+Thu Aug 30 19:40:33 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* regenc.h: check RUBY_EXTERN before including config.h and defines.h
+
+	* common.mk: update header dependency.
+
+Thu Aug 30 14:06:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_obj_define_method): reverted.  [ruby-talk:266637]
+
+Thu Aug 30 13:49:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: initialize $top_srcdir always.  [ruby-dev:31682]
+
+	* lib/mkmf.rb (try_const, have_const): check for a const is defined.
+	  [ruby-core:04422]
+
+Thu Aug 30 08:00:12 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h: declare rb_hash_tbl.
+
+	* include/ruby/ruby.h (RHash): delay st_table allocation.
+	  rename tbl field to ntbl to detect direct reference to the st_table
+	  as a compile error.
+	  (RHASH_TBL): abstract accessor defined.
+	  (RHASH_ITER_LEV): ditto.
+	  (RHASH_IFNONE): ditto.
+	  (RHASH_SIZE): ditto.
+	  (RHASH_EMPTY_P): ditto.
+	  (hash_alloc0, hash_alloc): unified because hash_alloc doesn't
+	  allocate st_table now.
+
+	* hash.c: delay st_table allocation.
+
+	* gc.c: replace tbl by ntbl.
+
+	* array.c: replace direct field accessor by abstract field accessor
+	  such as RHASH(hash)->tbl to RHASH_TBL(hash).
+
+	* marshal.c: ditto.
+
+	* insns.def: ditto.
+
+	* ext/iconv/iconv.c: ditto.
+
+	* ext/json/ext/generator/generator.c: ditto.
+
+	* ext/json/ext/parser/parser.c: ditto.
+
+	* ext/json/ext/parser/parser.rl: ditto.
+
+	* ext/syck/rubyext.c: ditto.
+
+	* ext/tk/tkutil/tkutil.c: ditto.
+
+	[ruby-dev:31678]
+
+Wed Aug 29 18:36:06 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: add :ftp_active_mode option.  [ruby-dev:31677]
+
+Wed Aug 29 14:55:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): should not use mbclen2() which has broken API.
+
+	* re.c: remove rb_reg_mbclen2().
+
+Wed Aug 29 12:48:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (aref_args): args may not be a list.  [ruby-dev:31592]
+
+Wed Aug 29 11:30:10 2007  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/st.h (struct st_table): add entries_packed 1-bit
+	  bitfield.  decrease num_bins 1-bit.
+
+	* st.c: pack numhash which have 5 or less entries in bins.
+	  (st_init_table_with_size): setup entries_packed flag.
+	  (st_clear): support packed mode.
+	  (st_lookup): ditto.
+	  (st_insert): ditto.
+	  (st_add_direct): ditto.
+	  (st_copy): ditto.
+	  (st_delete): ditto.
+	  (st_foreach): ditto.
+	  (st_reverse_foreach): ditto.
+	  (unpack_entries): new function for converting to unpacked mode.
+
+	[ruby-list:43954]
+
+Wed Aug 29 10:46:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* include/ruby/defines.h (flush_register_windows): call "ta 0x03"
 	  even on Linux/Sparc.  [ruby-dev:31674]
 
-Fri Sep  7 16:09:39 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Tue Aug 28 19:16:00 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_type_progid): progid getted by
+	  ProgIDFromCLSID should be freed by CoTaskMemFree. Thanks, arton.
+
+	* test/win32ole/test_win32ole.rb (test_raise_message): set negative
+	  compareMode value to raise WIN32OLERuntimeError.
+
+	* test/win32ole/test_win32ole_type.rb (test_implemented_ole_types):
+	  support some environment which returns IShellDispatch5 instead
+	  of IShellDispatch.
+
+Tue Aug 28 15:42:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_subseq): retrieve substring based on byte offset.
+
+	* string.c (rb_str_rindex_m): was confusing character offset and
+	  byte offset.
+
+Tue Aug 28 14:23:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key, 
-	  reg_get_val, ole_wc2mb): fix the bug. Thanks, arton. 
+	* string.c (rb_str_splice_0): should check to modify.  [ruby-dev:31665]
+
+Tue Aug 28 14:21:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_prepare): set parser encode too when BOM exists.
+
+Tue Aug 28 00:51:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: fix Mutex to be interruptable lock.
+
+	* thread_win32.ci, thread_win32.h, thread_pthread.ci, thread_pthread.h:
+	  prepare native_cond_*() which are based on pthread_cond_*() spec.
+
+	* prelude.rb: fix Mutex#synchronize method.
+
+	* vm_core.h, include/ruby/intern.h: change unblock function interface
+	  (to pass some user data).
+
+	* file.c, process.c: ditto.
+
+	* benchmark/bm_vm2_mutex.rb: add a benchmark for mutex.
+
+	* benchmark/bm_vm3_thread_mutex.rb: add a benchmark for mutex
+	  with contention.
+
+	* benchmark/run.rb: fix to remove ENV['RUBYLIB'] for matzruby.
+
+	* test/ruby/test_thread.rb: add a test.
+
+	* common.mk: fix benchmark options.
+
+Mon Aug 27 23:14:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_rstrip_bang): wrong strip point.  [ruby-dev:31652]
+
+	* string.c (rb_str_each_line): should swallow sequence of newlines
+	  if rs (optional argument) is an empty string.  [ruby-dev:31652]
+
+Mon Aug 27 22:39:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_codelen): raises invalid sequence exception
+	  if ONIGENC_CODE_TO_MBCLEN() returns zero.  [ruby-dev:31661]
+
+	* encoding.c (rb_enc_mbclen): check invalid sequence.
+
+Mon Aug 27 20:27:59 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
 	  [ruby-dev:31576]
 
-Fri Sep  7 15:50:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/win32ole/test_win32ole_type.rb (test_initialize):
+	  remove duplicate assertions.
+
+Mon Aug 27 19:10:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getlogin): update documentation to note
+	  security issue.  [ruby-Bugs-11821]
+
+Mon Aug 27 15:56:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_encoding): return the encoding of a Symbol.
+
+Mon Aug 27 15:33:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (IEEE_BIG_ENDIAN): use configured value.  [ruby-dev:31623]
+
+	* util.c (Llong): set to LONG_LONG if available.
+
+Mon Aug 27 13:11:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (tr_trans): wrong condition for mbmaxlen==1 strings.
+	  [ruby-dev:31652]
+
+Mon Aug 27 00:41:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_each_byte): caused infinite loop.  [ruby-dev:31652]
+
+	* io.c (rb_io_getc): should return nil at EOF, not EOFError.
+
+	* lib/delegate.rb (SimpleDelegator::__setobj__): use raise
+	  argument to specify backtrace.
+
+	* test/ruby/test_fnmatch.rb (TestFnmatch::bracket_test):
+	  String#include? no longer works for Fixnum.  use #chr.
+	  [ruby-dev:31652]
+
+Sun Aug 26 12:27:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: fix to remove Fiber.new until fiber.so is not loaded.
+
+	* test/ruby/test_continuation.rb: fix to use resume.
+
+Sun Aug 26 06:51:46 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_wc2mb, reg_enum_key): allocate
+	  buffer should be NULL terminated.
+
+Sun Aug 26 06:04:13 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_setup_method): reorder code for branch prediction.
+
+Sun Aug 26 05:54:49 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_call_method): fix to relaxant safe level check
+	  ($SAFE > 2).  [ruby-core:11998]
+
+	* bootstraptest/test_method.rb: add tests for above.
+
+Sun Aug 26 05:52:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_fiber.rb: fix to require 'continuation'.
+
+Sat Aug 25 23:52:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_next): message changed.
+
+Sat Aug 25 23:22:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/encoding.h: remove unused rb_enc_ismbchar().
+
+Sat Aug 25 22:50:14 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_event_free, EVENTSINK_Destructor,
+	  fev_initialize): remove the connection ole_event_free and
+	  EVENTSINK_Destructor.
+
+Sat Aug 25 17:52:06 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (mnew): should preserve noex as safe_level.
+	* string.c, include/ruby/intern.h: export rb_str_length().
 
-	* eval.c (rb_call0): tighten security check condition..
+	* insns.def: use rb_str_length() in opt_length.
 
-Fri Sep  7 15:43:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 25 17:48:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: rename FIBER_STACK_SIZE to FIBER_VM_STACK_SIZE.
+
+Sat Aug 25 17:05:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (swallow): removed condition using an unset variable.
+
+	* parse.y, re.c: re-applied revision 13092.
+
+	* string.c (rb_str_splice): return from void function.
+
+	* include/ruby/encoding.h (rb_enc_str_new): prototype added.
+
+Sat Aug 25 11:45:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c: provide basic features for M17N.
+
+	* parse.y: encoding aware parsing.
+
+	* parse.y (pragma_encoding): encoding specification pragma.
+
+	* parse.y (rb_intern3): encoding specified symbols.
+
+	* string.c (rb_str_length): length based on characters.
+	  for older behavior, bytesize method added.
+
+	* string.c (rb_str_index_m): index based on characters.  rindex as
+	  well.
+
+	* string.c (succ_char): encoding aware succeeding string.
+
+	* string.c (rb_str_reverse): reverse based on characters.
+
+	* string.c (rb_str_inspect): encoding aware string description.
+
+	* string.c (rb_str_upcase_bang): encoding aware case conversion.
+	  downcase, capitalize, swapcase as well.
+
+	* string.c (rb_str_tr_bang): tr based on characters.  delete,
+	  squeeze, tr_s, count as well.
+
+	* string.c (rb_str_split_m): split based on characters.
+
+	* string.c (rb_str_each_line): encoding aware each_line.
+
+	* string.c (rb_str_each_char): added.  iteration based on
+	  characters.
+
+	* string.c (rb_str_strip_bang): encoding aware whitespace
+	  stripping.  lstrip, rstrip as well.
+
+	* string.c (rb_str_justify): encoding aware justifying (ljust,
+	  rjust, center).
+
+	* string.c (str_encoding): get encoding attribute from a string.
+
+	* re.c (rb_reg_initialize): encoding aware regular expression
+
+	* sprintf.c (rb_str_format): formatting (i.e. length count) based
+	  on characters.
+
+	* io.c (rb_io_getc): getc to return one-character string.
+	  for older behavior, getbyte method added.
+
+	* ext/stringio/stringio.c (strio_getc): ditto.
+
+	* io.c (rb_io_ungetc): allow pushing arbitrary string at the
+	  current reading point.
+
+	* ext/stringio/stringio.c (strio_ungetc): ditto.
+
+	* ext/strscan/strscan.c: encoding support.
+
+Sat Aug 25 10:59:19 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: separate Continuation and Fiber from core.
+
+	* ext/continuation/*, ext/fiber/*: ditto.
+
+	* include/ruby/ruby.h: remove rb_cFiber.
+
+	* include/ruby/intern.h: add the rb_fiber_new() declaration.
+
+	* enumerator.c (next_init): fix to use rb_fiber_new().
+
+	* test/ruby/test_enumerator.rb: remove next? tests.
+
+	* test/ruby/test_continuation.rb: add a require 'continuation'.
+
+	* test/ruby/test_fiber.rb: add a require 'fiber'.
+
+Sat Aug 25 10:20:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (prelude.o): depends on vm_core.h now.
+
+	* common.mk (prelude.c): depends on tool/compile_prelude.rb too.
+
+	* common.mk (prereq): updates all auto-generated sources.
+
+	* tool/compile_prelude.rb: separated dynamic and static portions.
+
+Sat Aug 25 10:05:17 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* prelude.rb: add Thread.exclusive.  This class method
+	  is different from 1.8's.  Thread.exclusive only does
+	  synchronize with VM global mutex.
+
+Sat Aug 25 09:39:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_s_try_convert): more document description.
+
+	* re.c (rb_reg_s_try_convert): typo fixed.
+
+Sat Aug 25 08:54:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* id.h, id.c: remove idFuncall.
+
+	* compile.c (iseq_specialized_instruction): ditto.
+
+Sat Aug 25 08:47:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/compile_prelude.rb: fix to include "vm_core.h".
+
+Sat Aug 25 03:49:14 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/sentence.rb (Sentence): include Enumerable.
+	  (Sentence#each): defined.
+
+	* test/ruby/test_assignment.rb: use Sentence#expand.
+
+Sat Aug 25 03:08:57 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* prelude.rb: fix Mutex#synchronize definition.
+
+Sat Aug 25 02:08:45 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_s_try_convert): a new class method to convert
+	  object or nil if it's not target-type.  this mechanism is used
+	  to convert types in the C implemented methods.
+
+	* hash.c (rb_hash_s_try_convert): ditto.
+
+	* io.c (rb_io_s_try_convert): ditto.
+
+	* re.c (rb_reg_s_try_convert): ditto.
+
+	* string.c (rb_str_s_try_convert): ditto.
+
+Sat Aug 25 00:49:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_loop_generator.rb: added.
+
+Sat Aug 25 00:22:31 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* prelude.rb: added.  run this script on startup.
+
+	* tool/compile_prelude.rb: compile prelude.rb to C string.
+	  (prelude.rb -> prelude.c)
+
+	* common.mk: fix to build with prelude.c.
+
+	* inits.c (rb_call_inits): ditto.
+
+	* thread.c (Init_Thread): move definition of Mutex#synchronize
+	  to prelude.rb.
+
+Sat Aug 25 00:08:43 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_massign_opt): fix to skip massign optimization
+	  with global variables.
+
+	* bootstraptest/test_massign.rb: add some tests for above.
+
+Fri Aug 24 18:42:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_dir.rb (TestDir::setup): ?c now makes a string.
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
+	  initialize @workdir to stop warning.
+
+Fri Aug 24 18:30:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/drb/drb.rb (DRb::DRbServer::InvokeMethod::perform_without_block):
+	  replace funcall by send!.  other files in the distribution as well.
+
+Fri Aug 24 17:06:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_send_bang): abandon the name funcall for private
+	  aware method call.
+
+Fri Aug 24 15:27:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_next): stop pre-fetching.
+
+	* enumerator.c (Init_Enumerator): remove next? method.
+
+Fri Aug 24 15:14:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_loop): now handles StopIteration exception.
+
+Thu Aug 23 20:31:31 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: optimize simple massign.
+
+Thu Aug 23 20:02:25 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (reg_get_value): use RegQueryValueEx instead
+	  of RegQueryValueEx.
+
+	* ext/win32ole/win32ole.c (typelib_file_from_clsid): fix the bug
+	  that the function always returns Qnil.
+
+	* test/win32ole/test_win32ole_type.rb (test_initialize): add some test.
+
+Thu Aug 23 17:25:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (group_member): check if presents.
+
+	* configure.in (XCFLAGS): add _GNU_SOURCE on linux.
+
+	* file.c (group_member): use system routine if available.
+
+	* process.c: moved _GNU_SOURCE macro to Makefile.
+
+Thu Aug 23 16:59:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_massign), insnhelper.ci (vm_throw): not use C99
+	  comment.
+
+	* cont.c (rb_cont_call, fiber_switch, rb_fiber_resume, rb_fiber_yield):
+	  suppress warnings.
+
+	* cont.c (rb_fiber_start): change on non-volatile variable between
+	  setjmp and longjmp may not has an effect.
+
+	* enumerator.c (sym_call): initialize first.
+
+	* enumerator.c (enum_iter): typedefed.
+
+	* enumerator.c (next_i): suppress a warning.
+
+Thu Aug 23 16:04:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def, parse.y: fix massign order.  This change
+	  causes performance problem.  Try vm1_swap benchmark.
+	  [ruby-dev:31522]
+
+	* insns.def, insnhelper.ci: move process body of expandarray insn to
+	  vm_expandarray().
+
+	* bootstraptest/test_knownbug.rb, bootstraptest/test_massign.rb:
+	  move a solved test.
+
+Thu Aug 23 15:51:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_norm_arg): ripper has no shadowing check.
+
+	* parse.y (f_block_arg): dispatch blkarg_mark.
+
+Thu Aug 23 15:48:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (make_masgn_lhs, iseq_compile_each): fixed indent.
+
+	* compile.c (iseq_translate_threaded_code),
+	  vm_evalbody.ci (get_insns_address_table),
+	  template/vmtc.inc.tmpl (insns_address_table): constified.
+
+	* vm_evalbody.ci (vm_eval),
+	  template/insns_info.inc.tmpl (insn_stack_increase, insn_ret_num):
+	  suppress warnings.
+
+Thu Aug 23 13:19:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_norm_arg): check also nested arguments.  [ruby-dev:31502]
+
+Thu Aug 23 00:06:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c: updated for ANSI C only.  applied a patch from
+	  <snakagawa AT infoteria.co.jp>.  [ruby-dev:31591]
+
+Thu Aug 23 00:04:45 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/strtod.c: removed.  [ruby-dev:31588]
+
+	* LEGAL: updated.
+
+Wed Aug 22 15:59:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb:
+	  fix typo of filename (test_knownbug.rb).
+
+Wed Aug 22 14:04:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb: added.  This file will contain
+	  test cases which point out known bug.  If bug is fixed, tests
+	  should move to the suitable place.
+
+	* bootstraptest/test_massign.rb: move a test which show known bug
+	  to test_knownbug.rb.
+
+Wed Aug 22 13:02:26 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (in_temporary_working_directory):
+	  don't remove the directory specified by --dir.
+
+Wed Aug 22 05:51:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): replaced by the implementation by David
+	  M. Gay inspired by William D. Clinger's paper "How to Read Floating
+	  Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
+	  a patch from Satoshi Nakagawa <snakagawa AT infoteria.co.jp>.
+	  [ruby-dev:31582]
+
+	* test/ruby/test_float.rb (TestFloat::test_float): add test for
+	  precision.
+
+Wed Aug 22 03:51:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: add Fiber#resume and Fiber.yield.
+	  and Fiber::Core class to realize Coroutine.
+
+	* include/ruby/intern.h: declare rb_fiber_yield(), rb_fiber_resume().
+
+	* enumerator.c: use above api.
+
+	* test/ruby/test_fiber.rb: fix and add tests for above changes.
+
+Tue Aug 21 21:09:48 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
+	  suggested by knu.  [ruby-dev:31568]
+
+Tue Aug 21 15:00:23 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* st.c (st_clear): reset num_entries too.
+
+Tue Aug 21 13:57:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (st_foreach_func, rb_foreach_func): typedefed.
+
+	* hash.c (rb_hash_clear): use st_clear() unless iterating.
+
+	* st.c (struct st_table_entry): add new members, fore and back, to
+	  iterate in inserted order.
+
+	* include/ruby/st.h (struct st_table): ditto.
+
+Tue Aug 21 04:09:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm2_case.rb: add a new benchmark.
+	  YARV optimize case/when syntax.  If every conditions
+	  are literal (such as Symbol, Fixnum, String), dispatch
+	  calc order will be O(1).
+
+Tue Aug 21 04:08:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_enumerator.rb: fix last commit.
+
+Tue Aug 21 03:59:32 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test_enumerator.rb (enum_test): fix to return sorted
+	  array (for Hash test).
+
+Tue Aug 21 03:55:20 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* enumerator.c (next_i): fix to return with Fiber#yield at
+	  the end of each block.  [ruby-dev:31470]
+
+	* enumerator.c (enumerator_next_p): call init_next if not
+	  initialized.  [ruby-dev:31514]
+
+	* test/ruby/test_enumerator.rb: add tests for Enumerator.
+
+Mon Aug 20 23:28:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (Init_String): remove Symbol.intern and Symbol#dump.
+	  [ruby-dev:31525]
+
+	* dir.c (dir_foreach): return Enumerator if no block given.
+	  [ruby-dev:31525]
+
+	* io.c (rb_io_s_foreach): argument count check before making
+	  Enumerator.  [ruby-dev:31525]
+
+Mon Aug 20 23:17:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (struct rb_thread_struct): removed first_func_arg and
+	  reuse first_args instead.
+
+Sun Aug 19 13:31:40 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c: use VALGRIND_MAKE_MEM_UNDEFINED to detect use of collected
+	  objects if valgrind is available.  It cannot detect first 2 words
+	  because they are used as the free list.
+
+Sun Aug 19 13:13:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each/NODE_RESBODY): fix to add
+	  additional nop to prevent tailcall optimization.
+
+	* vm_opts.h: clean up comments.
+
+Sun Aug 19 12:58:39 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_call_bmethod): fix to propagate information
+	  that this proc is "from Method".  [ruby-dev:31490]
+
+	* proc.c (method_proc, rb_mod_define_method): ditto.
+
+	* vm.c (vm_invoke_proc_core): removed.
+
+	* vm_core.h: ditto.
+
+Sun Aug 19 12:36:11 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/sentence.rb: new method Sentence().
+
+Sun Aug 19 12:32:39 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_callee_setup_arg): fix to mark enough VM stack.
+	  [ruby-dev:31492]
+
+Sat Aug 18 19:02:34 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_yield.rb (TestYieldGen): relax array size check
+	  in nested parameters.
+	  [ruby-dev:31485]
+
+Sat Aug 18 17:44:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/tk/tcltklib.c (Init_tcltklib): use rb_set_end_proc().
 
-Fri Sep  7 15:42:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 18 17:40:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (is_ruby_native_thread): check properly.  [ruby-dev:31166]
+
+Sat Aug 18 16:44:15 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_call_bmethod),
+	  vm.c (vm_invoke_proc_core): fix to do not restore
+	  $SAFE when proc invoked by bmethod.
+
+	* vm_core.h: ditto.
+
+Sat Aug 18 16:44:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.ci (ruby_error_print): call error_print.
+
+	* eval_jump.ci, process.c (rb_exit, rb_f_exit, rb_f_abort): moved.
+
+Sat Aug 18 15:59:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (detach_process_watcher): should not pass the pointer
 	  to an auto variable to the thread to be created.  pointed and
 	  fix by KUBO Takehiro <kubo at jiubao.org>  [ruby-dev:30618]
 
-Fri Sep  7 15:40:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 18 15:52:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insnhelper.ci (vm_send_optimize): use MEMMOVE to shift values inside
+	  an array.
+
+Sat Aug 18 15:45:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insnhelper.ci (vm_yield_setup_args): rsize and psize should not be
+	  negative.
+
+Sat Aug 18 14:35:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insnhelper.ci (vm_callee_setup_arg, vm_send_optimize,
+	  vm_yield_setup_args): bulk copy for arguments.
+
+Sat Aug 18 13:55:58 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix to allow self.x=
+	  if x= is private.
+
+	* bootstraptest/test_method.rb: add a test for above.
+
+Sat Aug 18 14:05:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_compile_gen): obtain error info from errinfo.
+
+	* re.c (rb_reg_error_desc): make RegexpError for initialization error.
+
+	* re.c (rb_reg_compile): return nil and set errinfo if error.
+
+Sat Aug 18 13:23:01 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c: $! should not be writable.
+
+	* eval.c (rb_rubylevel_errinfo): added.  rb_errinfo() returns
+	  rb_thread_t#errinfo.  rb_rubylevel_errinfo() returns $! value.
+
+Sat Aug 18 13:14:40 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_callee_setup_arg): fix to check arguments
+	  correctly. [ruby-dev:31472]
+
+Sat Aug 18 13:13:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_exception.rb: add escape character ("\") for
+	  editors.
+
+Sat Aug 18 12:42:50 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_yield.rb (TestYieldGen): add test for yielding to
+	  lambda using lambda parameter passing emulator.
+
+Sat Aug 18 12:24:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
 	  comment lines first.
 
-Wed Aug 22 12:40:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 18 11:44:59 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_set_arguments), insnhelper.ci
+	  (vm_callee_setup_arg, vm_yield_setup_args):
+	  fix to cause raise on "lambda{|a|}.call(1, 2)".
+	  [ruby-dev:31464]
+
+	* bootstraptest/test_block.rb: add tests for above.
+
+Sat Aug 18 01:12:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (frame_func_id): return proper method ID.
+
+Fri Aug 17 22:43:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): massign should return rvalue(s).
+
+Fri Aug 17 22:10:19 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_basicinstructions.rb: fix old tests.
+	  class variables should be inherited.
+
+Fri Aug 17 21:20:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_call), eval_method.ci (rb_add_method, rb_alias),
+	  insnhelper.ci (vm_call_method): fix to save safelevel for
+	  method node.
+
+	* include/ruby/node.h: ditto.
+
+	* bootstraptest/test_method.rb: add a test for above.
+
+Fri Aug 17 16:02:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_terminate_all): fix to ignore
+	  exceptions.
+
+	* thread.c (thread_start_func_2): fix
+	  abort_on_exception process.  [ruby-dev:31394]
+
+Fri Aug 17 14:38:36 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (in_temporary_working_directory): use
+	  Dir.mktmpdir to create and remove temporary directory.
+	  (Dir.mktmpdir): define if not available.
+	  [ruby-dev:31431]
+
+Fri Aug 17 03:07:37 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix throw insn option of next.
+
+Fri Aug 17 01:25:23 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_set_arguments), insnhelper.ci
+	  (vm_callee_setup_arg, vm_yield_setup_args): fix
+	  block parameter problems. [ruby-dev:31437], [ruby-dev:31440]
+
+	* bootstraptest/test_block.rb: add a test of [ruby-dev:31440].
+
+Fri Aug 17 01:24:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (ruby_iseq_disasm): fix to show arg_simple value.
+
+Fri Aug 17 01:21:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (throw): insert a RUBY_VM_CHECK_INTS(). [ruby-dev:31361]
+
+Thu Aug 16 20:40:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigtrunc): RBIGNUM(x)->len may be zero.  out of bound
+	  access.  [ruby-dev:31404]
+
+	* sprintf.c (rb_str_format): small float should not call
+	  rb_dbl2big().
+
+Thu Aug 16 22:10:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix next/redo stack consistency.
+	  [ruby-dev:31373]
+
+	* bootstraptest/test_syntax.rb: add tests for above.
+
+	* sample/test.rb: fix to use __FILE__ instead of $0 to know basedir.
+
+Thu Aug 16 21:14:06 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (BASERUBY): need AC_SUBST.  [ruby-dev:31438]
+
+Thu Aug 16 19:18:26 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/sentence.rb: Sentence class implemented
+	  based on sentgen.rb
+
+	* test/ruby/sentgen.rb: removed.
+
+	* test/ruby/test_assignment.rb: use sentence.rb.
+
+	* test/ruby/test_yield.rb: block parameter passing emulator
+	  implemented.
+
+Thu Aug 16 16:48:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (BASERUBY): check if base ruby is runnable first.
+	  [ruby-core:11900]
+
+Thu Aug 16 16:46:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (aix): enable shared by default.
+
+	* configure.in (aix): for 64bit-mode AIX.  [ruby-dev:31401]
+	  + use CC for LDSHARED if non-gcc,
+	  + moved -G option from *LDFLAGS to LDSHARED,
+	  + set -brtl only in XLDFLAGS.
+
+Thu Aug 16 13:06:08 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_lshift): make shift offset long type.
+	  (big_rshift): ditto.
+	  (rb_big_lshift): ditto.
+	  (big_rshift): ditto.
+	  [ruby-dev:31434]
+
+Thu Aug 16 06:29:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_readpartial): argf_forward needs argc and argv.
+
+Thu Aug 16 02:47:39 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_m_yield): added.  use this function
+	  for Fiber#yield instead of rb_fiber_yield.
+
+Thu Aug 16 00:36:52 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb (Dir.mktmpdir): new method.  [ruby-dev:31416]
+
+Wed Aug 15 18:57:30 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (os_live_obj): fix to skip T_VALUES.
+
+	* sample/test.rb: add an ObjectSpace test.
+
+Wed Aug 15 16:49:04 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* inits.c (rb_call_inits): change initializing order.
+	  [ruby-dev:31420]
+
+Wed Aug 15 16:44:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (ARGF_FORWARD): wrongly compares with current_file with
+	  rb_stdout.  should be rb_stdin.  [ruby-cvs:20177]
+
+Wed Aug 15 14:59:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_initialize, argf_each_line, argf_each_byte): suppress
+	  warnings.
+
+Wed Aug 15 14:22:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: remove "//" type comment.
+
+Wed Aug 15 13:42:15 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: fix rules around f_margs.  "make test" passes all tests.
+
+	* bootstraptest/test_block.rb: add some tests for above.
+
+Wed Aug 15 13:50:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* hash.c (rb_hash_delete_key): delete the entry without calling block.
 
@@ -664,27 +50477,348 @@ Wed Aug 22 12:40:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* hash.c (delete_if_i): use rb_hash_delete_key() so that the block
 	  isn't called twice.  [ruby-core:11556]
 
-Sun Arg 12 03:56:30 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Aug 15 13:39:25 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug.
-	  the thread is started too early. [ruby-talk:264062] 
+	* process.c (proc_geteuid): fix strange conversion.  [ruby-dev:31417]
 
-	* test/rinda/test_rinda.rb: ditto.
+Wed Aug 15 01:05:55 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_check): don't call newtest.
+	  (assert_equal): call newtest.
+	  (assert_match): ditto.
+
+Tue Aug 14 21:43:39 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (assert_check): new method.
+	  (assert_match): new method.
+	  (assert_equal): use assert_check.
+	  (pretty): give failure description as an argument.
+
+	* bootstraptest/test_exception.rb: use assert_match to describe the
+	  test for [ruby-dev:31407].  [ruby-dev:31412]
+
+Tue Aug 14 19:53:15 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (Init_Proc), eval.c (Init_eval), eval_intern.h: move
+	  init place of exception_error.
+
+	* inits.c: ditto.
+
+	* eval.c (Init_eval): set exception_error#throwed_state as TAG_FATAL.
+	  [ruby-dev:31407]
+
+	* bootstraptest/test_exception.rb: add a test for above.
+
+Tue Aug 14 19:51:20 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: change test order (test -> btest).
+
+Tue Aug 14 00:04:27 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: 0.1.8 -> 0.1.9.
+
+	* test/rss/test_version.rb: followed the above change.
+
+	* lib/rss/parser.rb: fixed a bug that handles unintended elements.
+	  Thanks to Takuo Yonezawa. [ruby-list:43841]
+
+Mon Aug 13 17:23:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_clear_trace_func, rb_thread_stop_timer_thread):
+	  declarations for forward references.
+
+	* eval.c (rb_longjmp, eval): use local variable.
+
+	* eval.c (rb_longjmp): string object not to be optimized.
+
+Mon Aug 13 13:21:58 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: make ftp passive mode to avoid NAT problem.
+	  [ruby-dev:31377]
+
+Mon Aug 13 09:18:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getc): should returns
+	  one-character string.
+
+	* ext/stringio/stringio.c: remove unnecessary prototypes.
+
+	* ext/stringio/stringio.c (strio_getbyte): new method.
+
+	* ext/stringio/stringio.c (strio_readbyte): new method.
+
+	* ext/stringio/stringio.c (strio_ungetc): should take a string as
+	  an input.
+
+Mon Aug 13 08:19:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_close): always close via method.
+
+	* io.c (Init_IO): remove obsolete Kernel#getc.
+
+Mon Aug 13 05:03:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_raise): check if target thread is
+	  thrown by another thread or not.  [ruby-dev:31371]
+
+	* bootstraptest/test_thread.rb: add a test for above.
+
+Mon Aug 13 04:35:30 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_peephole_optimize): fix peephole optimization
+	  bug. [ruby-dev:31360]
+
+	* bootstraptest/test_syntax.rb: add a test for above.
+
+Mon Aug 13 04:02:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c (debug_print_pre): fix to show control frame count.
+
+	* insns.def (opt_call_c_function): fix operand type.
+
+	* lib/vm/instruction.rb: ditto.
+
+	* insnhelper.ci (vm_push_frame, vm_pop_frame): fix to show
+	  control stack status on if VMDEBUG == 2.
+
+	* vm.h: add a comment about VMDEBUG.
 
-Wed Aug 22 12:31:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* iseq.c (find_prev_line_no): fix to skip bug report if
+	  line is not found.
+
+	* lib/vm/instruction.rb: fix to use build_string() on
+	  source code generators.
+
+Mon Aug 13 03:57:32 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* template/yasmdata.rb.tmpl: fix type and name.
+
+Sat Aug 11 23:27:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_each_line): should use #each_line, not #each.
+
+	* io.c (argf_each_line): simplified.
+
+	* io.c (argf_getline): should handle non T_FILE object in ARGV.
+
+	* io.c (argf_each_byte): each_byte should yield bytes not
+	  one-character strings.  [ruby-dev:31374]
+
+Sat Aug 11 07:24:55 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: reverted some wrongly erased "o" options
+	  (pointed out by nobu).
+
+Sat Aug 11 00:01:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): not re-raise to main thread if it is
+	  joining the current thread.
+
+Fri Aug 10 23:54:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_create_core): inherit the priority of creating
+	  thread.  submitted at [ruby-core:11873] by David Flanagan <david AT
+	  davidflanagan.com>.  [ruby-core:11876]
+
+Fri Aug 10 05:12:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): let abort_on_exception work.
+	  [ruby-core:11873]
+
+Fri Aug 10 04:47:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (internal_id_gen): internal ID must be bigger than
+	  tLAST_TOKEN.
+
+Thu Aug  9 16:04:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): check if rhs has value before assignment instead
+	  inside node_assign_gen().  [ruby-dev:31293]
+
+	* parse.y (call_bin_op_gen, call_uni_op_gen): split call_op_gen.
+
+Thu Aug  9 14:01:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_marg_list): renamed from f_marg_head.
+
+	* parse.y (f_margs): allow multiple mandatory arguments after a splat.
+	  [ruby-dev:31153]
+
+Thu Aug  9 02:02:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_cycle): typo fixed.  a patch from Kazuhiro
+	  NISHIYAMA <zn AT mbf.nifty.com>.  [ruby-dev:31362]
+
+Wed Aug  8 19:17:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): no longer check
+	  HAVE_RB_IO_STDIO_FILE.
+
+Wed Aug  8 15:52:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_next_p): should check correctly even when
+	  e.next has not been called before.
+
+	* enumerator.c (enumerator_next): raise StopIteration (name taken
+	  from Python) instead of IndexError.
+
+	* enum.c (enum_zip): catch StopIteration exception.
+
+	* enumerator.c (enumerator_with_index): return Enumerator if no
+	  block is given.
+
+	* test/ruby/test_iterator.rb (TestIterator::test_enumerator): add
+	  test for enumerators.
+
+Wed Aug  8 11:48:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): should not use RTEST for non-VALUE.
+
+Wed Aug  8 11:25:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): should preserve sign mark.
+
+Wed Aug  8 11:02:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (btest-miniruby, test-sample): split the test target
+	  so that -k option works.
+
+Tue Aug  7 14:58:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (establishShell): handshaking before close slave
+	  device.  [ruby-talk:263410]
+
+	* ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): constified.
+
+	* ext/pty/pty.c (SlaveName): removed static buffer.
+
+	* ext/pty/expect_sample.rb: support for autologin.
+
+Tue Aug  7 13:58:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (ruby_special_consts): added RUBY_SPECIAL_SHIFT.
+
+	* .gdbinit: some improvements.
+
+Tue Aug  7 13:28:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (node_name.inc): use $? instead of $< for nmake.
+	  [ruby-dev:31356]
+
+Tue Aug  7 12:45:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
 	  [ruby-Bugs-12859]
 
-Wed Aug 22 12:30:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug  7 12:31:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): fix for win32 platforms.
+
+Tue Aug  7 02:58:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): make Bignum#to_s even faster.  a patch
+	  from Kenta Murata <muraken AT gmail.com>.  [ruby-dev:31354]
+
+Tue Aug  7 01:42:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_zip): zip no longer converts arguments into
+	  arrays, uses enumerators.
+
+Tue Aug  7 01:27:47 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* cont.c (rb_fiber_yield): change argument ordering.  export.
+
+	* cont.c (rb_fiber_current): export
+
+	* include/ruby/intern.h: export several functions from cont.c.
+
+	* enumerator.c (enumerator_next): new method to implement external
+	  iterator (generator) using fiber.
+
+	* enumerator.c (enumerator_next_p): new method to check whether
+	  any element is left in the generator sequence.
+
+	* enumerator.c (enumerator_rewind): a new method to rewind the
+	  generator sequence.
+
+Tue Aug  7 01:15:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_cycle): new method to cycle enumerable forever.
+
+Tue Aug  7 00:05:38 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* irb/ruby-lex.rb: support for '\c'. [ruby-talk:263508]
+
+Mon Aug  6 20:29:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci, insns.def: move some statements to functions.
+
+	* vm.c, vm.h, vm_evalbody.ci: fix include/typedef places.
+
+Mon Aug  6 18:41:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/vm/instruction.rb (make_header_analysys): fix last commit.
+
+Mon Aug  6 18:33:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/vm/instruction.rb (make_header_analysys): add to separate
+	  header addition process.
+
+Mon Aug  6 17:36:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
 
-Wed Aug 22 12:29:36 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Aug  6 16:57:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* sample/test.rb: fix to output file name if it contains
+	  invalid syntax.
+
+Mon Aug  6 16:41:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (value_expr_gen): fix to cause "void value expression"
+	  when jump expression such as "next" are shown on value_expr().
+	  [ruby-dev:31119]
+
+	* bootstraptest/test_syntax.rb: fix to above change.
+
+Mon Aug  6 14:36:30 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: fix a f_marg rule. [ruby-dev:31160]
 
-	* lib/README: fixed a typo.
+Mon Aug  6 14:29:30 2007  Koichi Sasada  <ko1@atdot.net>
 
-Wed Aug 22 12:13:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bootstraptest/runner.rb (assert_equal): add additional
+	  message parameter.
+
+Mon Aug  6 13:34:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (INSNS): not chdir to srcdir.
+
+	* common.mk (node_name.inc): auto-generate node name list.
+
+	* iseq.c (ruby_node_name): ditto.
+
+	* iseq.c (iseq_s_compile_option_get, Init_ISeq): added a new
+	  method VM::InstructionSequence::compile_option.
+
+	* lib/vm/instruction.rb (RubyVM::SourceCodeGenerator): --destdir
+	  option.
+
+	* tool/node_name.rb: to auto-generate node name list.
+
+Sun Aug  5 11:51:39 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss, sample/rss, test/rss:
+	- 0.1.7 -> 0.1.8.
+	- supported <itunes:XXX>.
+	- reverted backward incompatibility API changes introduced 0.1.7.
+
+Sun Aug  5 04:56:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open_v, pipe_open_s): separate array and string
+	  cases.  [ruby-dev:31344]
+
+Fri Aug  3 11:05:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): save all CONFIG values.
 
@@ -694,20 +50828,78 @@ Wed Aug 22 12:13:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/extmk.rb: remove rdoc at clean, and installed list file at
 	  distclean, respectively.
 
-Wed Aug 22 11:49:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  3 07:09:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: more verbose message.  [ruby-Bugs-12766]
+
+	* lib/mkmf.rb (have_type): suppress a warning with -Wall.
+
+	* lib/mkmf.rb (find_type): new method.
+
+Fri Aug  3 00:00:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (big2str_table): base cannot be 0 or 1.
+
+Thu Aug  2 23:42:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_compile_gen): set error if failed to compile regexp
+	  literal.  [ruby-dev:31336]
+
+	* re.c (option_to_str, arg_kcode, opt_kcode): options conversion
+	  between int and string.
+
+	* re.c (rb_reg_compile): should not use regexp which could not get
+	  initialized.  [ruby-dev:31333]
+	  return error message to let the parser know it.
+
+	* re.c (rb_reg_compile): append regexp options to error message.
+	  [ruby-dev:31334]
+
+Thu Aug  2 22:05:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): faster Bignum#to_s using Karatsuba
+	  algorithm.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
+	  in [ruby-dev:31312], slightly modified by Kenta Murata
+	  <muraken AT gmail.com> in [ruby-dev:31339].
+
+Thu Aug  2 13:46:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): should not check positional number as
 	  width.  [ruby-core:11838]
 
-Wed Aug 22 11:47:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Aug  1 12:40:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* generic.rb (URI::Generic::merge_path): behave as RFC 3986.
+	  [ruby-talk:252052]
+
+Tue Jul 31 23:38:09 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (_parse): now interprets slashed numerical
+	  dates as a big endian (except dd/mm/yyyy). [experimental]
+
+Mon Jul 30 11:16:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_aref): check for Bignum index range.
-	 [ruby-dev:31271]
+	  [ruby-dev:31271]
+
+Sat Jul 28 09:35:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/digest/lib/digest.rb (Digest::self.const_missing): avoid
+	  infinite recursive const_missing call.  [ruby-talk:262193]
+
+Thu Jul 26 20:40:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_eqq): call_super() in === does not work well
+	  since Enumerable#=== has different behavior.  [ruby-dev:31296]
+
+Thu Jul 26 13:57:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 22 11:41:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dln.c (load_1, dln_find_1): constified.
 
 	* dln.c (conv_to_posix_path): removed.
 
+	* ruby.c (usage): constified.
+
 	* ruby.c (rubylib_mangled_path, rubylib_mangled_path2): return
 	  VALUE instead of a pointer to static buffer.
 
@@ -716,26 +50908,158 @@ Wed Aug 22 11:41:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (ruby_init_loadpath): not convert built-in paths.
 
-Wed Aug 22 11:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul 24 10:37:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_f_p): return nil if no argument.  [ruby-dev:31285]
+
+Tue Jul 24 01:05:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regint.h (USE_MATCH_RANGE_IS_COMPLETE_RANGE): undef to achieve old
+	  rindex behavior.  [ruby-dev:31265]
+
+Mon Jul 23 18:37:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/oniguruma.h: upgrade to Oniguruma 5.9.0.  fixes
+	  some memory violation.  [ruby-dev:31070]
+
+Sun Jul 22 20:09:49 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (Date._parse): now accepts some new
+	  hints. [experimental]
+
+	* lib/parsedate.rb: followed the changes on
+	  lib/date/format.rb. [experimental]
+
+Sun Jul 22 16:06:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (is_ruby_native_thread): made an int function as
+	  well as version 1.8.
+
+	* include/ruby/ruby.h (is_ruby_native_thread): moved prototype
+	  from intern.h as well as version 1.8.
+
+Sun Jul 22 14:33:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_rename): deleted code to get rid of a bug of
+	  old Cygwin.
+
+	* file.c (rb_file_truncate): added prototype of GetLastError()
+	  on cygwin.  [ruby-dev:31239]
+
+	* include/ruby/intern.h (is_ruby_native_thread): prototype.
+
+	* missing/strftime.c (strftime): fix printf format and actual
+	  arguments.
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): ditto.
+
+	* ext/tk/tcltklib.c (ip_finalize): ditto.
+
+	* ext/win32ole/win32ole.c (lcid_installed): ditto.
 
-	* intern.h (is_ruby_native_thread): removed since declared as an int
-	  function in ruby.h already.
+	* ext/socket/getnameinfo.c: include stdio.h always.
 
-Wed Aug 22 11:00:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 21 21:39:12 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb (Date._parse): now can take some
+	  hints (its aim must be mainly determination of endianness of
+	  date). [experimental]
+
+	* lib/date.rb, lib/date/format.rb (Date._parse): now completes
+	  truncated year as default action. [experimental]
+
+	* lib/date.rb, lib/date/format.rb: added ::iso8601, ::rfc3339,
+	  ::xmlschema, ::rfc2822, ::httpdate, ::jisx0301, #xmlschema,
+	  #httpdate. [experimental]
+
+Sat Jul 21 17:48:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk: inverted rules order.
+
+	* thread_win32.ci (w32_create_thread): bcc does not have
+	  _beginthreadex().
+
+	* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
+	  only if extconf.h is created.
+
+	* bcc32/Makefile.sub: headers have moved.
+
+	* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
+	  support.
+
+	* bcc32/setup.mak: check runtime version.
+
+	* win32/win32.c (rb_w32_open_osfhandle): prototype has changed
+	  in bcc 5.82.
+
+	* {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
+
+	* win32/resource.rb: include patchlevel number.
+
+Sat Jul 21 12:06:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
 
-Wed Aug 22 10:57:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 21 01:45:03 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (Date._parse): completes calendar week based year.
+
+	* lib/date/format.rb (Date._parse): detects year of ordinal date in
+	  extended format.
+
+Fri Jul 20 16:30:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_sequence): raise SyntaxError instead of rb_bug
+	  since this function can be called from VM::InstructionSequence.load.
+
+	* compile.c (insn_set_sc_state, iseq_set_sequence_stackcaching): ditto.
+
+Fri Jul 20 16:11:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c, compile.h (DECL_ANCHOR, INIT_ANCHOR): split not to
+	  initialize aggregations with dynamic values.  [ruby-talk:259306]
+
+	* eval.c (rb_protect): not to initialize aggregations with dynamic
+	  values.  [ruby-talk:259306]
+
+	* gc.c (mark_current_machine_context): ditto.
+
+	* thread.c (thgroup_list, call_trace_func): ditto.
+
+	* vm.c (vm_init_redefined_flag): ditto.
+
+Fri Jul 20 15:22:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/openssl/ossl_config.c (ossl_config_set_section): do not
 	  initialize aggregations with dynamic values.  [ruby-talk:259306]
 
-Wed Aug 22 10:55:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 20 10:39:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt, mlhs_node, lhs, arg, var_ref): return dummy
+	  NODE_BEGIN after errors.  [ruby-dev:31100], [ruby-dev:31118]
+
+	* parse.y (remove_begin): keep empty NODE_BEGIN, instead of null.
+	  [ruby-dev:31252], [ruby-dev:31263]
+
+Fri Jul 20 09:50:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb (get_result_string): check $?.coredump?
+	  first.
+
+	* bootstraptest/runner.rb (cleanup_coredump, check_coredump): see
+	  stackdump file too.
+
+Thu Jul 19 20:39:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (get_backtrace): check the result more.
+	* parse.y (value_expr_gen): warn for empty expression ().
+	  [ruby-dev:31252]
+
+Thu Jul 19 19:24:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.ci (get_backtrace): check the result more.
 	  [ruby-dev:31261] [ruby-bugs-12398]
 
-Wed Aug 22 10:36:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 19 14:38:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_lshift, rb_big_rshift): separated functions
 	  to get rid of infinite recursion.  fixed calculation in edge
@@ -743,35 +51067,57 @@ Wed Aug 22 10:36:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (rb_fix_lshift, rb_fix_rshift): ditto.
 
-Wed Aug 22 10:29:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 18 16:57:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_pow): refine overflow check.  [ruby-dev:31242]
 
-Wed Aug 22 10:26:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul 18 09:19:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* time.c (time_succ): Time#succ should return a time object in the
-	  same timezone mode to the original.  [ruby-talk:260256]
+	* parse.y (rb_parser_append_print, rb_parser_while_loop): moved check
+	  for node to the head.
 
-Wed Aug 22 10:24:00 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (proc_options): do nothing for -p/-n options if tree is null.
+	  submitted by Yusuke ENDOH <mame AT tsg.ne.jp> at [ruby-dev:31243].
 
-	* numeric.c (fix_pow): integer power calculation: 0**n => 0, 
-	  1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
+Wed Jul 18 08:47:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
-	  suite.  pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
+	* time.c (time_succ): Time#succ should return a time object in the
+	  same timezone mode to the original.  [ruby-talk:260256]
 
-Wed Aug 22 10:23:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 16 23:07:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/base64.rb (Base64::b64encode): should not specify /o option
 	  for regular expression.  [ruby-dev:31221]
 
-Wed Aug 22 10:20:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 16 22:57:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): make %u behave like %d for negative
+	  values, since decimal format does not work with preceding dots.
+	  [ruby-core:11575]
+
+Mon Jul 16 18:29:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_rindex_m): accept string-like object convertible
+	  with #to_str method, as well as rb_str_index_m.  [ruby-core:11692]
+
+Mon Jul 16 07:17:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (getspecial): lfp_svar_get() requires int for special
+	  global variables.
+
+Mon Jul 16 05:45:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): more checks for format argument.
 	  [ruby-core:11569], [ruby-core:11570], [ruby-core:11571],
 	  [ruby-core:11573]
 
-Wed Aug 22 10:13:45 2007  pegacorn  <subscriber.jp AT gmail.com>
+Mon Jul 16 00:26:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): removed invariant variable.  [ruby-dev:31236]
+
+Sun Jul 15 22:24:37 2007  pegacorn  <subscriber.jp AT gmail.com>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): adjust format.  [ruby-dev:31222]
 
 	* ext/digest/digest.c (rb_digest_instance_update,
 	  rb_digest_instance_finish, rb_digest_instance_reset,
@@ -795,185 +51141,1787 @@ Wed Aug 22 10:13:45 2007  pegacorn  <subscriber.jp AT gmail.com>
 
 	* win32/win32.c: include mbstring.h for _mbspbrk().  [ruby-dev:31232]
 
-	* win32.h (rb_w32_getcwd): prototype added.  [ruby-dev:31232]
+	* include/ruby/win32.h (rb_w32_getcwd): prototype added.
+	  [ruby-dev:31232]
+
+Sun Jul 15 21:07:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 22 10:11:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bigtrunc): do not empty Bignum.  [ruby-dev:31229]
+
+Sun Jul 15 19:05:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_cstr_to_inum): check leading non-digits.
 	  [ruby-core:11691]
 
-Wed Aug 22 10:07:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 15 04:42:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bignum.c (rb_big_neg): SIGNED_VALUE isn't in 1.8.
+	* bignum.c (get2comp): do nothing for empty Bignum.  [ruby-dev:31225]
 
-	* bignum.c (bigtrunc): do not empty Bignum.  [ruby-dev:31229]
+Sat Jul 14 22:49:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_pow): integer power calculation: 0**n => 0,
+	  1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
+
+	* test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
+	  suite.  pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
+
+Sat Jul 14 18:46:35 2007  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: add --with-valgrind.
+
+	* gc.h (SET_MACHINE_STACK_END): new macro to replace
+	  rb_gc_set_stack_end.  it find out accurate stack boundary by
+	  asm using gcc on x86.
+
+	* thread.c (rb_gc_set_stack_end): don't define if asm-version
+	  SET_MACHINE_STACK_END is available.
+
+	* gc.c (mark_current_machine_context): extracted from garbage_collect.
+	  it use SET_MACHINE_STACK_END to not scan out of stack area.
+	  it notify conservative GC information to valgrind if
+	  --with-valgrind.
+
+Sat Jul 14 14:04:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (sort_by_cmp): check if reentered.  [ruby-dev:24291]
+
+Sat Jul 14 11:08:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/json/ext/generator/generator.c (check_max_nesting): wrong
+	  format specifier.  a patch from pegacorn <subscriber.jp AT gmail.com>.
+	  [ruby-dev:31217]
+
+Sat Jul 14 02:27:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_pow): overflow detection using FIT_SQRT_LONG().
+	  [ruby-dev:31215]
+
+Sat Jul 14 02:05:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (opt_div): LONG2FIX() may not work for corner cases,
+	  use LONG2NUM() instead.  [ruby-dev:31210]
+
+Sat Jul 14 00:34:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_round): should not return false, but self.
+	  [ruby-dev:31212]
+
+Fri Jul 13 18:31:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/intern.h: remove unused function declarations.
+
+	* include/ruby/ruby.h: ditto.
+
+Fri Jul 13 17:32:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Aug 22 10:02:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* vm.c (vm_free): clear free'ed living_threads field.
+	  [ruby-dev:31163]
 
-	* numeric.c (fix_pow): 0**2 should not raise floating point
-	  exception.  [ruby-dev:31216]
+	* insns.def (opt_succ): use cast to shut a warning up.
 
-Wed Aug 22 10:01:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 13 16:10:00 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): use ENV.to_hash to access
+	  http_proxy environment variable to avoid case insensitive
+	  environment search.
+
+Fri Jul 13 15:02:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (CreateChild): enclose command line except for
 	  command.com which can not handle quotes.  [ruby-talk:258939]
 
-Wed Aug 22 09:58:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 13 11:33:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_max, range_min): return nil for empty set as well as
+	  1.8 and Enumerable.  [ruby-dev:31198]
+
+Fri Jul 13 11:28:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (bvar): semicolon was lost for ripper description.
+	  [ruby-dev:31140]
+
+Fri Jul 13 11:25:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (program, stmt, primary): reduced duplicated code.
+
+	* parse.y (dsym): convert also literals containing NUL to
+	  symbol.
+
+	* parse.y (debug_lines): use rb_hash_lookup() to get rid of
+	  call of Hash#default.
+
+	* parse.y (ripper_warningS): unused in ripper right now.
+
+Fri Jul 13 10:33:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_flatten_bang): check argument if valid
+	  integer.  [ruby-dev:31197]
+
+Fri Jul 13 10:10:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
 	  ::CONFIG which is an alias of MAKEFILE_CONFIG.
 
-Wed Aug 22 09:55:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 12 21:38:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* insns.def (opt_succ): use LONG_MAX as maximum Fixnum VALUE.
+	  [ruby-dev:31199]
+
+Thu Jul 12 18:42:18 2007  Tanaka Akira  <akr@fsij.org>
+
+	* range.c (range_max): use FIX2LONG instead of FIX2INT to avoid
+	  RangeError by ((-0x80000001)...(-0x80000001)).max on LP64.
+
+	* insns.def (opt_plus): use FIX2LONG instead of FIX2INT to avoid
+	  RangeError by 0x3fffffffffffffff+1 on LP64.
+
+	* insns.def (opt_succ): don't use 0x80000000 which assumes 32bit VALUE.
+	  use FIX2LONG instead of FIX2INT.
+	  [ruby-dev:31190]
+
+Thu Jul 12 17:03:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* struct.c (rb_struct_init_copy): disallow changing the size.
 	  [ruby-dev:31168]
 
-Wed Aug 22 09:54:28 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Jul 12 12:58:21 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c: remove "yarv" prefix.
+
+	* array.c, numeric.c: ditto.
+
+	* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
+
+	* yarvcore.c: removed.
+
+	* yarvcore.h: renamed to core.h.
+
+	* cont.c, debug.c, error.c, process.c, signal.c : ditto.
+
+	* ext/probeprofiler/probeprofiler.c: ditto.
+
+	* id.c, id.h: added.
+
+	* inits.c: ditto.
+
+	* compile.c: rename internal functions.
+
+	* compile.h: fix debug flag.
+
+	* eval.c, object.c, vm.c: remove ruby_top_self.
+	  use rb_vm_top_self() instead.
+
+	* eval_intern.h, eval_load: ditto.
+
+	* gc.c: rename yarv_machine_stack_mark() to
+	  rb_gc_mark_machine_stack().
+
+	* insnhelper.h: remove unused macros.
+
+	* iseq.c: add iseq_compile() to create iseq object
+	  from source string.
+
+	* proc.c: rename a internal function.
+
+	* template/insns.inc.tmpl: remove YARV prefix.
+
+	* thread.c: use rb_iseq_eval() and rb_str_new2().
+
+	* vm.c (rb_iseq_eval): added.
+
+	* vm.c: move some functions from yarvcore.c.
+
+	* vm_dump.c: fix to remove compiler warning.
+
+Thu Jul 12 12:24:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (opt_succ): fixed typo.  [ruby-dev:31189]
+
+Thu Jul 12 10:30:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): moved prototye from thread_*.ci.
+
+	* thread_pthread.ci (thread_start_func_2): not use a directive
+	  inside a macro argument.  [ruby-talk:258763]
+
+	* thread.c (thread_join): pthread_t may not be pointer.
+
+	* thread_pthread.ci (ubf_select_each): ditto.
+
+Thu Jul 12 05:32:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (FIX2ULONG): drop sign bit for LLP64 platform.
+
+Tue Jul 10 19:34:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c (rb_hash_lookup): added.  this function is similar to
+	  rb_hash_aref(), but doesn't call Hash#default when no entry
+	  exists.
+
+	* include/ruby/intern.h: ditto.
+
+	* insnhelper.ci (lfp_svar_get): use rb_hash_lookup().
 
-	* random.c: documentation fix.  srand(0) initializes PRNG with '0',
-	  not with random_seed.
+Tue Jul 10 19:16:28 2007  Koichi Sasada  <ko1@atdot.net>
 
-Wed Aug 22 09:53:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c, insnhelper.ci, vm.c: change cref index (-1 -> 2).
+
+Tue Jul 10 18:49:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (exec_under): add proper casts.
+
+Tue Jul 10 16:58:16 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, insnhelper.ci: fix svar interface.
+
+	* compile.c (iseq_compile_each), yarvcore.h: fix to use new
+	  svar interface for flip flop.
+
+	* eval.c: ditto.
+
+	* insns.def: ditto.
+
+	* include/ruby/intern.h: remove "rb_svar()" declaration.
+
+Tue Jul 10 16:52:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (rb_iseq_compile): formatted if/else to switch statement.
+
+Tue Jul 10 15:57:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/test_flip.rb: new test for flip-flop operator.
+
+Tue Jul 10 14:50:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
 
-Wed Aug 22 09:46:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul  9 02:17:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): sign bit extension should not be done
-	  if FPLUS flag is specified.  [ruby-list:39224]
+	* cont.c (cont_restore_1): workaround for x64-mswin64's SEH.
+
+Sun Jul  8 02:08:53 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/json.rb, lib/json/, ext/json/: import JSON 1.1.1
+
+Sat Jul  7 21:59:29 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb (PP::PPMethods#pp_hash): sort condition changed:
+	  all keys have a same class which is kind of Comparable.
+
+Sat Jul  7 17:12:37 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: use rb_bug() instead of rb_compile_error().
+
+Sat Jul  7 16:12:48 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: fix node construction (around f_margs).
+	  [ruby-dev:31143]
+
+	* bootstraptest/test_block.rb: add a test for above.
+
+	* insnhelper.ci: fix indent.
+
+Sat Jul  7 15:36:50 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb (PP::PPMethods#pp_hash): sort if
+	  all keys are strings, symbols or integers.
+
+Sat Jul  7 15:30:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_yield_setup_args), vm.c, insns.def:
+	  fix to pass nil as block parameter to yielded block.
+	  [ruby-dev:31147]
+
+	* bootstraptest/test_block.rb: add a test for above.
+
+Fri Jul  6 19:55:10 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb.rb: typo. Thanks, Giles Bowkett.
+
+	* lib/irb/completion.rb: support Ruby1.9 changing return value
+	  String to Symbol for Object#methods, etc. [ruby-dev:31148].
+
+Fri Jul  6 18:20:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/runner.rb: fix load path.
+
+	* common.mk: fix "test" rule to run with "btest".
+
+	* rubytest.rb, sample/test.rb: fix to show tests progress.
+
+Fri Jul  6 15:37:48 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_iterator.rb: fix test to 1.9 spec.
+
+Fri Jul  6 15:21:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_interrupt): suppress a gcc's officious warning.
+
+Fri Jul  6 14:57:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (keyword_to_name): constified.
+
+	* ext/ripper/eventids2.c (token_to_eventid): ditto.
+
+Fri Jul  6 14:50:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb: added --quiet option.
+
+Fri Jul  6 14:35:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_marg): wrap f_norm_arg assignment node with NODE_LIST.
+	  [ruby-dev:31141]
+
+Fri Jul  6 12:15:01 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/sentgen.rb: new file.
+
+	* test/ruby/test_assignment.rb: tests implemented using assignment
+	  generator and emulator.
+
+Fri Jul  6 03:06:58 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: remove unused code.
 
-Wed Aug 22 09:41:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* compile.c (compile_massign): fix to invoke to_splat on
+	  splat rhs (example: *a = *nil). [ruby-dev:31136]
 
-	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
-	  [ruby-core:11562]
+	* bootstraptest/test_massign.rb: add tests for above.
 
-Wed Aug 22 09:40:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compile.c (iseq_compile_each): disable excess optimization.
+	  [ruby-dev:31126]
 
-	* parse.y (yylex): return non-valid token for an invalid
-	  instance/class variable name.  a patch from from Yusuke ENDOH
+Fri Jul  6 02:08:25 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: fix to invoke nil.to_splat on NODE_ARGSCAT.
+	  [ruby-dev:31138].
+
+	* bootstraptest/test_literal.rb: add tests for above.
+
+Thu Jul  5 19:45:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h: rename rb_control_frame_t#magic to flag.
+
+	* vm.h: add VM_FRAME_TYPE() and VM_FRAME_FLAG().
+
+	* cont.c, insnhelper.ci, insns.def, vm.c, vm_dump.c,
+	  vm_evalbody.ci, yarvcore.c: apply above changes.
+
+Thu Jul  5 19:16:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_basicinstructions.rb: remove an assertion using
+	  unsupported hash literal (such as {1, 2}).
+
+	* test/ruby/test_hash.rb: ditto.
+
+Thu Jul  5 19:12:22 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c: Qfalse is VALUE, not pointer.
+
+Thu Jul  5 18:42:01 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): add break catch point.
+
+	* insns.def (throw): support correct "break" and "return".
+	  this commit achieve that "make test" passes all tests.
+
+	* vm.c: ditto.
+
+Thu Jul  5 18:44:12 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (mlhs_basic): use mlhs_post after tSTAR.
+	  [ruby-dev:31109]
+
+Thu Jul  5 18:27:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
+	  eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
+	  yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
+	  ruby_nerrs): purge global variables.
+
+	* ruby.c (proc_options): moved do_print and do_loop options
+	  handling from ruby_process_options().
+
+Thu Jul  5 16:37:34 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (int_pow): fix previous nubu's commit.
+
+	* test/ruby/test_fixnum.rb: new test.
+
+Thu Jul  5 15:56:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (int_pow): even number multiplication never be negative.
+
+Thu Jul  5 10:42:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/{node,ruby}.h, ruby.c: added enum constants for gdb
+	  support.  [ruby-dev:31066]
+
+	* .gdbinit: some improvements.
+
+Thu Jul  5 10:13:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (global_symbols.last_id): reduce unused ID numbers.
+
+	* include/ruby/st.h, st.c (st_init_table, st_init_table_with_size):
+	  constified.
+
+Wed Jul  4 23:36:27 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/webrick/httpauth/authenticator.rb
+	  (WEBrick::HTTPAuth::Authenticator#check_scheme): auth-scheme must be
+	  treated as a case-insensitive token according to RFC 2617 section 1.2.
+
+Wed Jul  4 18:30:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (mlhs_inner): new rule.  [ruby-dev:31132]
+
+Wed Jul  4 05:11:57 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (set_relation): added.
+
+Wed Jul  4 04:58:30 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (caller_setup_args): fix to show correct class
+	  on an error message (ex: m(&1)). [ruby-dev:31101]
+
+Wed Jul  4 04:30:32 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_array, iseq_compile_each): fix about array
+	  generation in void context. [ruby-dev:31102]
+
+	* bootstraptest/test_literal.rb: add a test for above.
+
+Wed Jul  4 04:07:00 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_array): ignore NODE_ZARRAY.
+	  [ruby-dev:31110]
+
+	* bootstraptest/test_method.rb: add a test for above.
+
+Wed Jul  4 04:04:02 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.h: fix debug print level.
+
+Wed Jul  4 03:52:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): support v[&b]= type method call.
+	  [ruby-dev:31094]
+
+	* bootstraptest/test_method.rb: add a test for above.
+
+Wed Jul  4 03:43:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_massign): fix massign compilation
+	  (example: a, *v, (*x) = ...).  [ruby-dev:31107]
+
+	* bootstraptest/test_massign.rb: add tests for above.
+
+Tue Jul  3 23:12:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/onigiruma.h (ONIG_EXTERN): use RUBY_EXTERN if defined.
+
+	* regenc.h: include ruby/defines.h.
+
+	* regint.h: x64-mswin64 support.
+
+Tue Jul  3 13:47:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (cont_save_machine_stack): clear saved_thread.machine_stack*.
+
+Mon Jul  2 21:45:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: rename iseq_translate_direct_threaded_code()
+	  to iseq_translate_threaded_code().
+
+	* eval_intern.h, yarvcore.h: mv EXEC_EVENT_HOOK() and
+	  exec_event_hooks() to yarvcore.h.
+
+	* insnhelper.ci, vm.c: mv yarv_finish_insn_seq to vm.c.
+
+	* insns.def (opt_call_c_function): fix to use RESTORE_REGS().
+
+	* iseq.c (rb_iseq_build_for_ruby2cext): fix to allocate iseq.
+
+Mon Jul  2 11:59:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass): suppress a warning.
+
+	* insns.def (opt_call_c_function): should raise the thrown exception
+	  instead of returning it.
+
+Mon Jul  2 08:53:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h, yarvcore.h: move declaration of sysstack_error
+	  to yarvcore.h.
+
+	* iseq.c: fix symbol name (:toplevel -> :top).
+
+	* lib/vm/instruction.rb, template/vm.inc.tmpl: replaceable
+	  current file name.
+
+Mon Jul  2 05:29:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, iseq.c: fix iseq some of load/store process.
+
+Mon Jul  2 03:09:36 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, compile.c, insnhelper.ci, iseq.c, vm.c:
+	  rename structure names and field names.
+
+	* insnhelper.h, insns.def: add GET_CONST_INLINE_CACHE().
+
+	* iseq.c: add rb_iseq_build_for_ruby2cext().
+
+	* yarvcore.h, vm.h: move declaration of rb_insn_func_t
+	  to yarvcore.h.
+
+Sun Jul  1 03:25:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.h, vm.h: some refactoring.
+	  remove useless comments, etc.
+
+Sun Jul  1 03:02:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h: some refactoring on rb_iseq_t.
+	  rename some variable names, add comments, etc.
+
+	* compile.c, iseq.c, proc.c, vm.c: ditto.
+
+Sun Jul  1 02:57:57 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.h: rename insn_func_type to rb_insn_func_type.
+
+	* vm_evalbody.ci: ditto.
+
+	* insns.def: add opt_call_native_compiled instruction
+	  instead of opt_call_native_compiled.
+
+Sat Jun 30 00:17:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): return non-valid token for an invalid
+	  instance/class variable name.  a patch from Yusuke ENDOH
 	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
 
-Wed Aug 22 09:39:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 29 23:38:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmts): fix for ripper.
+
+Fri Jun 29 21:55:48 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: fix to show line number of blank block.
+	  [ruby-dev:31093]
+
+Fri Jun 29 20:51:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/cgi/session.rb (create_new_id): don't cut off md5.hexdigest to
+	  follow Ruby 1.8.
+
+Fri Jun 29 17:10:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.h: constified.
+
+	* debug.c (ruby_set_debug_option): separated from main.c.
+
+	* gc.c (ruby_gc_stress), signal.c (ruby_enable_coredump): prefixed.
+
+Fri Jun 29 16:39:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (proc_new): fix to return a proc object
+	  which block is contained ([ruby-dev:31056]).
+
+Fri Jun 29 15:43:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_pow): get rid of division by zero.  reported by
+	  Yusuke ENDOH <mame AT tsg.ne.jp> [ruby-dev:31040]
+
+	* numeric.c (int_round): do nothing when rounding by zeroth digit.
+	  check underflow.  [ruby-dev:31043]
+
+Fri Jun 29 15:32:00 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* configure.in: add fastcall attribute check.
+
+Fri Jun 29 14:51:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (assoc_list): remove expanded hash literal (no splat).
+
+	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::EOFError): adapt
+	  to new syntax.
+
+Fri Jun 29 14:48:18 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/insns2vm.rb, lib/vm/instruction.rb: move process body
+	  to lib/vm/instruction.rb.
+
+	* common.mk: fix aotc rule.
+	  experimental. bin/ruby2cext is not added yet.
+
+Fri Jun 29 11:23:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
-	  patch from from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
+	  patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
+
+Thu Jun 28 23:29:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (assoc_list): odd number check only for NODE_ARRAY.
+	  [ruby-dev:31082]
+
+Thu Jun 28 22:24:33 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* win32/Makefile.sub: define FUNC_FASTCALL macro.
+
+	* vm.h: fix to use FUNC_FASTCALL macro.
+	  TODO: add FUNC_FASTCALL macro by configure.
+
+Thu Jun 28 19:38:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: fix to remove -Wall warnings on gcc.
+
+	* compile.c (make_name_with_str): removed. use rb_sprintf() instead.
+
+Thu Jun 28 18:53:01 2007  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_hash): fix hash area.
+
+Thu Jun 28 15:00:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getline): local variable to be
+	  initialized.  [ruby-dev:31077]
+
+Thu Jun 28 11:30:39 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (rb_obj_id): use SIGNED_VALUE instead of long.
+
+Thu Jun 28 05:01:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk (run.gdb): fix to load $(srcdir)/.gdbinit
+
+	* vm.c (rb_vm_set_finish_env): add a cast.
+
+	* vm.h: support __fastcall for MSVC.
+
+Thu Jun 28 02:12:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/runner.rb: fix to untouch $:.
+
+Thu Jun 28 02:03:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (setup_args): change parameter type.
+
+Thu Jun 28 02:03:39 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (rb_intern2): unconstify cast.
+
+Thu Jun 28 01:44:31 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (rb_intern2): don't allocate a string object at first.
+	  [ruby-dev:31064]
+
+Thu Jun 28 01:24:02 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/runner.rb: fix to show file name.
+
+	* bootstraptest/test_*.rb: add bootstrap tests.
+
+Thu Jun 28 01:22:15 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/node.h, parse.y, gc.c, iseq.c: remove NODE_CREF.
+
+Thu Jun 28 01:19:43 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix popped backref and others.
+	  ([ruby-dev:31068]).
+
+	* compile.c (iseq_compile_each): remove needless statements.
+
+Wed Jun 27 23:51:33 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c: remove unused functions.
+
+Wed Jun 27 20:46:05 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h, win32/Makefile.sub, win32/configure.bat,
+	  win32/mkexports.rb, win32/setup.mak, win32/win32.c: import
+	  x64-mswin64 port.
+
+Wed Jun 27 20:31:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_translate_direct_threaded_code): fix prototype
+	  function name.
+
+	* vm.h: add correct cast.
+
+Wed Jun 27 17:08:42 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_evalbody.ci: support OPT_CALL_THREADED_CODE.
+
+	* insns.def, vm.c, vm.h: ditto.
+
+	* vm.h: add VM_CFP_CNT() and VM_SP_CNT().
+
+Wed Jun 27 04:23:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix type error.
+
+Wed Jun 27 03:26:15 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_massign), insns.def (expandarray): support
+	  postarg with massign (a, *b, c = ...).
+
+	* bootstraptest/test_massign.rb: add tests for above.
+
+	* compile.h: fix debug macro names.
+
+Wed Jun 27 00:18:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_clear): need to check STR_EMBED_P() before
+	  free()ing memory.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
+	  [ruby-dev:31062]
+
+Tue Jun 26 16:39:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_getgroups): use GIDT2NUM for rb_gid_t.
+
+Tue Jun 26 16:28:24 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_wait_fd_rw): terminate fdset.
+
+Tue Jun 26 16:26:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* regint.h: IL32LLP64 support.
+
+Tue Jun 26 16:22:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (ruby_node_name): update node names.
+
+Tue Jun 26 15:21:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h: IL32LLP64 support.
+
+	* bignum.c (bigfixize, rb_cstr_to_inum): ditto.
+
+	* insns.def (opt_plus, opt_minus, opt_mult): ditto.
+
+Tue Jun 26 15:04:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_s_new): revert initializing VM stack.
+
+	* yarvcore.c (th_init2): ditto.
+
+	* vm.c, vm.h: fix to stop using Qundef on VM stack.  According to
+	  this change, VM stack should not include Qundef value.
+
+	* insns.def (putundef): removed.
+
+	* compile.c (iseq_compile_each): ditto.
+
+	* eval.c (eval): fix spacing.
+
+Tue Jun 26 04:03:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_yield_with_cfunc), proc.c: fix Method#to_proc
+	  to return lambda Proc ([ruby-dev:31021], [ruby-dev:31037]).
+
+Tue Jun 26 03:46:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_s_new): fix to clear rb_thread_t#tag.
+	  [ruby-dev:30995]
+
+Tue Jun 26 03:38:31 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_s_new), yarvcore.c (th_init2): fix to clear
+	  VM stack ([ruby-dev:31046]).
+
+Tue Jun 26 03:15:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: rename setup_arg() to setup_args().
+	  fix to use setup_args() at processing NODE_YIELD.
+
+Tue Jun 26 02:50:24 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (setup_arg): support kind of "m(*ary, x)" method call.
+	  ([ruby-dev:31048]).
+
+Tue Jun 26 00:28:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci, vm.c: complete block parameter support.
+	  post arguments, optional arguments, block argument.
+
+	* compile.c, parse.y: fix {|a|} parameter.
+
+	* insnshelper.ci, insns.def: revert caller_setup_args() option
+	  (need_block_check) parameter.
+
+Mon Jun 25 20:18:44 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (RVALUE): in RVALUE and RBasic, flags must be the same type.
+
+Mon Jun 25 18:02:55 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/pty/extconf.rb: skip wince and win64.
+
+Mon Jun 25 17:59:32 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/node.h (NODE_LMASK, nd_line): shouldn't use int and/or
+	  long carelessly.
+
+Mon Jun 25 11:36:35 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.h: add RUBY_ prefix to debug macros.
+
+	* cont.c, proc.c, yarvcore.c,
+
+	* gc.c: define ruby_gc_debug_indent variable to debug mark/free.
+
+	* vm.c, insnhelper.ci: rename some functions to vm_* or rb_vm_*.
+	  move some functions, definitions, declarations to suitable files.
+
+	* eval.c, yarvcore.h, eval_error.ci, insnhelper.ci: ditto.
+
+Mon Jun 25 09:45:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.ci, eval_jump.ci, eval_method.ci, eval_safe.ci: c-mode.
+
+Mon Jun 25 05:27:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c: remove ruby_current_node and change eval() prototype.
+	  fix to use rb_sourcefile/line() instead of ruby_sourcefile/line.
+
+	* error.c, eval_error.ci, eval_load.c, eval_safe.ci, gc.c,
+	  include/ruby/intern.h, parse.y, process.c, ruby.c: ditto.
+
+	* vm.c: fix spaces.
 
-Wed Aug 22 09:38:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jun 25 04:20:14 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* process.c (proc_exec_v, rb_proc_exec): preserve errno.
+	* eval_*.h: rename to eval_*.ci.
 
-Wed Aug 22 09:00:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk: ditto.
 
-	* eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured
+	* eval_error.ci: remove ruby_set_current_source().
+
+	* error.c, eval.c, ruby.c: ditto.
+
+	* eval_safe.c, proc.c: remove unused macros.
+
+Mon Jun 25 03:37:20 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (caller_setup_args): add need_block_check option.
+
+	* insns.def: ditto.
+
+	* yarvcore.h: add GetCoreDataFromValue().
+
+Mon Jun 25 02:14:30 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* call_cfunc.ci: removed.
+
+	* insnhelper.ci: added. this function includes all functions that
+	  vm insns need.
+
+	* common.mk: ditto.
+
+	* insnhelper.h, vm.h, vm.c: move some declaration.
+
+	* gc.h: remove GC_CHECK() macro because GC.stress is more useful.
+
+	* compile.c, iseq.c, vm_dump: ditto.
+
+	* gc.h, thread.c: move a prototype declaration.
+
+	* debug.c, debug.h: rename some functions.
+
+	* compile.h: ditto.
+
+Mon Jun 25 00:45:02 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (invokesuper): fix error message.
+
+Mon Jun 25 00:14:13 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: some refactoring.
+	  * rename th_* to vm_*.
+	  * remove unused variables functions.
+	  * add prototypes.
+
+	* blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
+	  eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
+	  proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
+	  vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
+
+Sun Jun 24 22:32:00 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.h (rb_add_method): fix to check 0.
+
+Sun Jun 24 22:00:17 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insn_send.ci: removed.
+
+	* common.mk: ditto.
+
+	* vm.c (vm_call_bmethod), isnsn.def: added.  fix to use this
+	  function instead of using goto.
+
+	* vm.c (vm_call_bmethod): renamed from th_invoke_bmethod().
+
+	* vm.c (vm_method_missing): renamed from eval_method_missing().
+
+	* vm_evalbody.ci: remove tmp_* variables.
+
+	* insnhelper.h: add some macros.
+
+	* insns.def: forbid zsuper from method defined by define_method().
+
+	* test/ruby/test_super.rb: ditto.
+
+Sun Jun 24 20:01:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_macro.def: removed.
+
+	* insn_send.ci: added.  this file includes send instruction body.
+
+	* common.mk: ditto.
+
+	* insns.def: ditto.
+
+	* tool/insns2vm.rb: ditto.
+
+	* vm.c: ditto.
+
+Sun Jun 24 19:30:37 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.h (RESTORE_REGS): add do/while(0) around macro.
+
+	* vm.c, vm_macro.def: remove macro_eval_invoke_func() and
+	  add vm_setup_method().  use it instead.
+
+Sun Jun 24 19:02:33 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, vm_macro.def : remove macro_eval_invoke_cfunc() and
+	  add vm_call_cfunc().
+
+Sun Jun 24 17:54:13 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm.c: add/fix stack overflow check.
+
+Sun Jun 24 17:28:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.h: change CHECK_STACK_OVERFLOW() to throw exception.
+
+	* vm.c (caller_setup_arg), vm_macro.def: remove
+	  macro_eval_setup_send_arguments and add caller_setup_arg().
+
+	* insns.def: ditto.
+
+	* bootstraptest/test_method.rb: add splat arg tests.
+
+Sun Jun 24 16:35:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_to_s): used a variable before initialized.
+
+Sun Jun 24 16:05:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (callee_setup_arg): added.  support correct post arg.
+
+	* vm_macro.def (macro_eval_invoke_func): fix to use
+	  callee_setup_arg.
+
+	* compile.c (set_arguments): adjust for above changes.
+
+	* compile.c (iseq_compile_each): ditto.
+
+	* iseq.c (ruby_iseq_disasm): ditto.
+
+	* yarvcore.h: add rb_iseq_t#post_arg_start and arg_size.
+
+	* bootstraptest/test_method.rb: add post arg tests.
+
+Sun Jun 24 16:10:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_to_s): suppress warning, and reduced duplicated code.
+
+Sun Jun 24 15:33:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/runner.rb: set default directory to
+	  '/tmp/bootstraptest.tmpwd' and add --dir option.
+	  fix to output driver and target information.
+
+	* common.mk: fix to run btest on BASERUBY and
+	  add OPTS to pass option ("make btest OPTS=...").
+
+Sun Jun 24 03:05:00 2007  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_minmax): fix SEGV by [].minmax.
+
+Sat Jun 23 17:18:19 2007  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (match_inspect): MatchData#inspect implemented.
+
+Sat Jun 23 15:00:16 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_minmax): new method to get the minimum and maximum
+	  values from the enumerable at once.
+
+	* enum.c (enum_minmax_by): ditto.
+
+Sat Jun 23 01:25:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_assoc): new method.
+
+	* hash.c (rb_hash_rassoc): ditto.
+
+	* hash.c (rb_hash_flatten): ditto.
+
+Fri Jun 22 23:55:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upto): add optional argument to specify
+	  exclusiveness.
+
+	* range.c (range_step): use String#upto with optional argument.
+
+	* range.c (range_each): ditto.
+
+Fri Jun 22 19:55:51 2007  Tanaka Akira  <akr@fsij.org>
+
+	* proc.c (proc_to_s): revert the change from %p to %lx at YARV
+	  merge time.
+
+Fri Jun 22 19:33:49 2007  Tanaka Akira  <akr@fsij.org>
+
+	* proc.c (proc_to_s): show is_lambda.
+
+Thu Jun 21 20:36:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_sort): remove hash specific implementation.
+
+Thu Jun 21 20:28:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_select): returns new hash, not assoc array.
+	  [ruby-core:11504]
+
+	* hash.c (env_select): ditto.
+
+Thu Jun 21 23:08:19 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (rb_intern2): ID_JUNK test based on len, not by NUL.
+
+Thu Jun 21 19:42:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* yarvcore.c (rb_thread_mark): mark also thrown_errinfo.
+
+Thu Jun 21 17:13:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern2): name may not be NUL-terminated.
+
+Wed Jun 20 08:27:57 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval_error.h (error_print): show full stacktrace on
+	  non-SystemStackError.
+
+Wed Jun 20 04:45:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern2): use rb_intern2 to intern without trailing
+	  equal sign.
+
+	* parse.y (rb_intern2, ripper_id2sym): fixed indent.
+
+Tue Jun 19 10:55:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_load.c (load_ext, rb_require_safe): pass VALUE instead of
+	  pointer.  [ruby-Bugs-11659]
+
+Mon Jun 18 08:47:54 2007  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* ext/openssl/{extconf.rb,ossl_ssl_session.c}:
+	  Fix ruby-Bugs-11513.
+
+	* ext/openssl/ossl_pkey_ec.c
+	  New methods EC::Point.[eql,make_affine!,invert!,on_curve?,infinity?]
+	  By default output the same key form as the openssl command.
+
+	* ext/openssl/ossl_rand.c
+	  New method Random.status?
+
+	* test/openssl/test_ec.rb
+	  New tests.
+
+Mon Jun 18 17:04:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_load.c (rb_require_safe, ruby_init_ext): load with ruby level
+	  cfp.  [ruby-core:10779]
+
+	* eval_intern.h, vm.c (rb_vm_call_cfunc): new function to call a
+	  function with ruby level cfp.
+
+Mon Jun 18 16:57:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yycompile): disable trace while creating ruby_debug_lines.
+	  [ruby-talk:253586]
+
+	* thread.c (ruby_suppress_tracing): new function to call a function
+	  with suppressing trace.
+
+	* lib/debug.rb, lib/tracer.rb: for YARV.
+
+Mon Jun 18 13:54:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occurred
 	  in at_exit blocks.  [ruby-core:11263]
 
-Wed Aug 22 08:52:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jun 18 02:49:16 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (env_mark): fix to mark block.proc.
+
+	* vm.c (th_make_proc_from_block): set created proc to block->proc.
+
+Mon Jun 18 02:48:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c (vm_stack_dump_raw): hide VM stack trace.
+
+Mon Jun 18 02:43:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* signal.c (sigsegv): clear gc_stress flag on SEGV.
+
+Mon Jun 18 01:14:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* variable.c (rb_path2class): get rid of dangling pointer caused by
 	  optimized out value.
 
-Wed Aug 22 08:51:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* variable.c (rb_global_entry, rb_f_untrace_var, rb_alias_variable,
+	  rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
+	  generic_ivar_defined, generic_ivar_remove, rb_mark_generic_ivar,
+	  rb_free_generic_ivar, rb_copy_generic_ivar,
+	  rb_obj_instance_variables): suppress warnings.
+
+Sun Jun 17 11:11:07 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (rb_method_missing): avoid a warning "too many arguments
+	  for format string" on "./ruby -ve 'def m() super end; m'".
+
+Sat Jun 16 22:24:17 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (garbage_collect): re-introduce ruby_current_node marking code.
+	  [ruby-dev:31005]
+
+Sat Jun 16 21:37:43 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (gc_sweep): re-introduce heap extension strategy change.
+	  [ruby-dev:31005]
+
+Fri Jun 15 22:59:37 2007  Tanaka Akira  <akr@fsij.org>
+
+	* .gdbinit: new file to ease debugging using gdb.
+
+Fri Jun 15 22:33:55 2007  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (default_handler): func argument removed.
+	  (trap_handler): support SYSTEM_DEFAULT.  call default_handler
+	  internally.
+	  (sig_trap): don't call default_handler.
+	  [ruby-dev:30999]
+
+Fri Jun 15 22:33:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (realclean): separate local and ext.
+
+	* ext/extmk.rb: not remove unrelated directories.
+
+Fri Jun 15 20:50:02 2007  Tanaka Akira  <akr@fsij.org>
+
+	* keywords: enclose C code in declaration section by %{ and %} to
+	  avoid extra semicolon after #ifdef RIPPER.
+	  pointed by eban.
+
+Fri Jun 15 18:56:52 2007  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (trap_handler): trap("SIGSEGV", "DEFAULT") may cause wrong
+	  trap error because SIG_DFL may be zero.
+
+Fri Jun 15 15:55:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (setconstant, toregexp): fix to mark object correctly.
+
+Fri Jun 15 13:24:18 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c: exchange semantics of Hash#each and Hash#each_pair.
+	  pointed out by [ruby-dev:30997].
+
+	* test/ruby/test_iterator.rb: ditto.
+
+	* test/ruby/test_yield.rb: ditto.
+
+Fri Jun 15 12:38:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_iterator.rb: remove debug code (GC.stress=true).
+
+Fri Jun 15 12:25:33 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (th_yield_setup_args): |v| should work as |v,|.
+	  ex) def m;yield 1, 2; end; m{|v| p v} #=> 1
+
+	* parse.y: apply above change for "for" statement.
+
+	* test/ruby/test_assignment.rb: ditto
+
+	* test/ruby/test_basicinstructions.rb: ditto.
+
+	* test/ruby/test_iterator.rb: ditto.
+
+	* test/ruby/test_yield.rb: ditto.
+
+	* compile.c (iseq_compile_each): fix debug.
+
+Fri Jun 15 12:22:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (ruby_finalize_1): rb_thread_t#errinfo should be clear with
+	  Qnil.
+
+Fri Jun 15 12:20:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_cont_call): forbid cross fiber continuation call.
+
+	* test/ruby/test_fiber.rb: ditto.
 
-	* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
-	  fixed [ruby-bugs:PR#5489].
+Fri Jun 15 12:14:07 2007  Koichi Sasada  <ko1@atdot.net>
 
-Wed Aug 22 08:49:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* sample/test.rb: fix to show line information whether test succeeds.
+
+Thu Jun 14 17:16:05 2007  Tanaka Akira  <akr@fsij.org>
+
+	* eval_load.c (Init_load): delay allocating an array for rb_load_path
+	  to avoid GC problem in very early stage.
+	  (RUBY_GC_STRESS causes GC in such stage.)
+
+	* variable.c (rb_gc_mark_global_tbl): rb_global_tbl may be 0 in
+	  very early stage.
+
+	* thread.c (thread_cleanup_func) [IA64]: clear register stack position.
+	  (thread_start_func_2) [IA64]: record the beginning of register
+	  stack using extra argument.
+	  (rb_gc_save_machine_context) [IA64]: record the end of register
+	  stack.
+
+	* gc.c [IA64] (SET_STACK_END): record the end of register stack.
+	  (garbage_collect) [IA64]: use recorded register stack area for
+	  GC marking.
+	  (yarv_machine_stack_mark) [IA64]: GC mark from the register stack
+	  area.
+
+	* yarvcore.c [IA64] (rb_gc_register_stack_start): defined.
+	  (Init_VM): store th->self on stack to fix GC problem.
+	  (Init_yarv) [IA64]: initialize the beginning of register stack.
+
+	* yarvcore.h (struct rb_thread_struct) [IA64]: new members for
+	  register stack area.
+
+	* thread_pthread.ci (thread_start_func_1) [IA64]: call
+	  thread_start_func_2 with the end of register stack.
+
+	* cont.c (struct rb_context_struct) [IA64]: new members for register
+	  stack area.
+	  (cont_mark) [IA64]: GC mark from register stack area.
+	  (cont_free) [IA64]: free saved register stack.
+	  (cont_save_machine_stack) [IA64]: record the position and contents
+	  of the register stack.
+	  (cont_capture): store cont->self on stack to fix GC problem.
+	  (cont_restore_1) [IA64]: restore the register stack.
+	  [IA64] (register_stack_extend): new function.
+	  (cont_restore_0) [IA64]: call register_stack_extend instead of
+	  cont_restore_1.
+
+	[ruby-dev:30982]
+
+Thu Jun 14 17:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
+	  extensions.  [ruby-dev:30972]
+
+Thu Jun 14 14:40:42 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb: document updated.
+	  suggested by NaHi.  [ruby-dev:30966]
+
+Wed Jun 13 22:42:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (garbage_collect): update IA64 register stack code.
+	  [ruby-dev:30971]
+
+Wed Jun 13 06:05:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (darwin): prohibit loading extension libraries to
 	  miniruby.
 
-Wed Aug 22 08:34:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 12 21:50:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_kill_thread): renamed in order to get rid of conflict
-	  with a BeOS system function.  [ruby-core:10830]
+	* parse.y (call_args): no allow splat after assocs.  takes
+	  consistency over compatibility.
 
-Wed Aug 22 08:32:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (call_args2): ditto
 
-	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
-	  clash.
-Wed Aug 22 08:27:53 2007  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Jun 12 14:53:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/imap.rb (ResponseParser#next_token): fixed
-	  error message. (backported from HEAD)
+	* lib/mkmf.rb (Logging.quiet, Logging.message): added quiet flag and
+	  use it.  [ruby-core:10909]
 
-	* lib/net/imap.rb (ResponseParser#parse_error): fixed
-	  the condition not to refer @token.symbol unexpectedly.
-	  Thanks, Dick Monahan. (backported from HEAD)
+	* lib/mkmf.rb (find_header): use header names in the message.
 
-Wed Aug 22 08:26:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 10 18:37:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* marshal.c (w_extended): erroneous check condition when dump
-	  method is defined.  [ruby-core:10646]
+	* ext/probeprofiler/probeprofiler.c: clean warnings.
+
+Sun Jun 10 18:32:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/isinf.c, missing/dup2.c, missing/strtod.c, missing/x68.c,
+	  missing/alloca.c: use "ruby/config.h".
+
+Sun Jun 10 17:49:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (install_recursive): should check parent directories of
+	  the destination.  [ruby-dev:30947]
+
+Sun Jun 10 16:59:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (do_block, brace_block): fix line numbers.  [ruby-dev:30831]
 
-Mon Jun 18 11:29:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 10 16:57:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* intern.h, ext/thread/thread.c: moved prototype of rb_thread_status()
-	  to get rid of error in C++.  [ruby-list:43615]
+	* instruby.rb (install_recursive): add :glob option rather than
+	  using FNM_DOTMACH.
+
+	* instruby.rb (ext-comm): make header directory first.
+
+Sun Jun 10 16:10:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb: typo.
+
+Sun Jun 10 16:07:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (install_recursive): skip .svn directories.
+
+Sun Jun 10 15:44:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): rubyhdrdir was missing.
+
+Sun Jun 10 15:26:36 2007  Tanaka Akira  <akr@fsij.org>
+
+	* Makefile.in: use --output-file for gperf to not leave lex.c.tmp.
+
+Sun Jun 10 15:11:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.
+
+	* ext/extmk.rb: prepend also topdir to mflags at last.
 
 Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
 	  get rid of invoking shell.  [ruby-dev:30942]
 
-Sat Jun  9 10:40:00 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sun Jun 10 12:56:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby: moved public headers.
+
+	* instruby.rb (install_recursive): skip backup files.
+
+	* instruby.rb (ext-comm): install only current platform headers.
+
+Sun Jun 10 10:42:04 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb: renamed from lib/secrand.rb.
+	  suggested by NaHi.  [ruby-dev:30934]
+
+Sat Jun  9 06:40:05 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/secrand.rb: rename SecRand() to SecRand.random_number.
+	  suggested by NaHi.  [ruby-dev:30934]
+
+Fri Jun  8 16:34:20 2007  Tanaka Akira  <akr@fsij.org>
+
+	* ext/zlib/zlib.c (gzfile_s_open): use FilePathValue to support
+	  to_path.
+
+Fri Jun  8 16:11:00 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_jump.h: th->errinfo should clear with nil.
+
+Fri Jun  8 14:53:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (call_args): allow splat argument after unpacked
+	  assocs like 1.8 does.
+
+	* parse.y (call_args): ditto.
+
+Fri Jun  8 14:26:18 2007  Tanaka Akira  <akr@fsij.org>
 
-	* stable version 1.8.6-p36 released.
+	* lib/secrand.rb: new file for secure random interface.
 
-Fri Jun  8 17:50:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/cgi/session.rb: use secrand for generating cookies.
 
-	* eval.c (rb_thread_cancel_timer): fix undefined function
+Fri Jun  8 12:44:37 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed May 30 05:17:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* {win32,wince}/Makefile.sub: add lex.c rule.
 
-	* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
-	  [ruby-dev:30836]
+Fri Jun  8 11:54:18 2007  Tanaka Akira  <akr@fsij.org>
 
-Wed May 30 04:29:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lex.c.blt: moved from lex.c.
 
-	* eval.c (thread_timer): timer thread should not receive any
-	  signals.  submitted by Sylvain Joyeux.  [ruby-core:08546]
+	* Makefile.in: use lex.c.blt if gperf is not available.
+	  [ruby-list:8212], [ruby-list:8214], [ruby-list:24667],
+	  [ruby-talk:120857], [ruby-dev:28102]
+
+Thu Jun  7 21:38:39 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_execute_interrupts): invoke ensure when
+	  main thread exits.
+
+Thu Jun  7 19:02:48 2007  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb: call original "method" method instead of redefined one.
+
+Thu Jun  7 17:20:57 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (prepare_iseq_build): freeze filename and name string.
+
+	* variable.c: freeze class name string.
+
+Thu Jun  7 12:48:33 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (cont_restore_1): fix to check root fiber [ruby-dev:30911].
+
+	* test/ruby/test_fiber.rb: add a test.
+
+Thu Jun  7 07:24:36 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/json/common.rb: Ponder offering parse! method.
+
+	* lib/json/editor.rb: be a bit more robust while loading data.
+
+	* ext/json/ext/{generator,parser}/extconf.rb:
+	  add a have_header directive for st.h
+
+	* test/json: fix some tests.
+
+Thu Jun  7 03:29:18 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test_fiber.rb: add a test (Continuation and Fiber).
+
+Thu Jun  7 03:17:24 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (cont_new): add debug message.
+
+	* cont.c (cont_restore_1): copy stack information from fiber.
+
+	* cont.c (rb_fiber_s_new): fix to mark created fiber.
+
+	* test/ruby/test_fiber.rb: add some tests around Thread and Fiber.
+
+	* yarvcore.c (thread_free): fix to skip freeing stack if root fiber
+	  is available.
+
+Thu Jun  7 01:03:20 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h, eval.c (ruby_init): remove POP_TAG_INIT().
+
+	* cont.c (rb_fiber_start): remove zero-clearing tag.
+
+Wed Jun  6 20:23:46 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (invokeblock): fix of splat argument.
+	  (splat same as normal method dispatch)
+
+Wed Jun  6 16:27:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* insns.def: fixed indentation.
+
+Wed Jun  6 10:58:23 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_yield): fix to check Qundef.
+
+Wed Jun  6 10:57:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_continuation.rb: add a test for last commit.
+
+Wed Jun  6 10:55:42 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_cont_call): forbid calling dead fiber with
+	  Continuation#call.
+
+Wed Jun  6 10:50:01 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix around yield arguments
+	  (with NODE_ARGSCAT).
+
+Wed Jun  6 02:50:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_start): clear th->tag and check error to fix
+	  [ruby-dev:30888] and [ruby-dev:30889].
+
+	* eval_intern.h: fix rb_fiber_start() prototype.
+
+	* test/ruby/test_fiber.rb: add tests for above.
+
+Wed Jun  6 02:40:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* insnhelper.h, insns.def (DEC_SP): shouldn't use unary minus operator
+	  in pointer operation. some compilers (such as VC++8 x64) cannot deal
+	  it with expected way.
+
+Wed Jun  6 02:19:48 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (new_yield), compile.c (iseq_compile_each): fix
+	  passing parameter.
+
+	* eval.c, eval_jump.h: simplify rb_yield*.
+
+	* proc.c (proc_mark): fix to mark proc->block.proc.
+
+	* proc.c (Init_Proc): add Proc#lambda?
+
+	* test/ruby/test_lambda.rb: add some tests.
+
+	* vm.c (invoke_block): fix to check lambda block or not.
+
+	* vm.c (th_yield_setup_args): fix to check arguments size
+	  when lambda block.
+
+Tue Jun  5 16:30:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_p): returns arguments to intervene.  [ruby-dev:29736]
+
+Tue Jun  5 14:07:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (invokeblock): check block is created by lambda
+	  or Proc.new.
+
+	* vm.c (block_proc_is_lambda): added.
+
+Tue Jun  5 14:47:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/pp.rb (PP::PPMethods::seplist): revert last change to work
+	  around wrapper bug.  [ruby-dev:30840]
+
+Tue Jun  5 14:11:15 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (kanji_convert): Fix guess fallback.
+
+Tue Jun  5 13:32:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
+	  pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
+	  thread_pthread.ci, thread_win32.ci: fixed indentation.
+
+	* call_cfunc.ci: protoized.
+
+	* thread_win32.ci: fixed typo.
+
+Tue Jun  5 13:17:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* call_cfunc.ci, compile.c, dir.c, eval.c, eval_jump.h, numeric.c,
+	  pack.c, re.c, thread.c, thread_win32.ci, vm.c, vm_dump.c: fixed
+	  indentation.
+
+Mon Jun  4 21:15:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/json.rb, lib/json, ext/json, test/json:
+	  import JSON library.
+
+	* ext/nkf: import nkf.c rev:1.124
+	  Support CP10001.
+
+Mon Jun  4 20:52:58 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_round): should not just truncate.
+
+Sat Jun  2 16:48:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (Fiber#pass): rename to Fiber#yield.  Block parameter
+	  of fiber body receive first yield values.
+	  e.g.: Fiber.new{|x| p x}.yield(:ok) #=> :ok
+
+	* cont.c: rename rb_context_t#retval to rb_context_t#value.
+
+	* test/ruby/test_fiber.rb: ditto.
+
+Sat Jun  2 16:45:21 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (Init_Proc): remove a line break.
+
+Sat Jun  2 01:27:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_round): small optimization to handle bignums.
+
+Fri Jun  1 13:02:35 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* insnhelper.h (INC_SP): shouldn't cast ``x'' to unsigned type because
+	  it might be a negative value.
+
+	* insnhelper.h, insns.def: shouldn't use unary minus operator in index
+	  operator. some compilers (such as VC++8 x64) cannot deal it with
+	  expected way.
+
+Fri Jun  1 11:33:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_round): should convert self to Float.
+	  [ruby-dev:30860]
+
+Fri Jun  1 02:01:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_round): now takes optional argument to specify
+	  number of digits, like round() in Python/PHP.
+
+	* numeric.c (num_round): ditto.
+
+Fri Jun  1 01:58:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (each_with_index_i): should work well with continuation.
+	  a patch from sheepman <sheepman AT sheepman.sakura.ne.jp>.
+	  [ruby-dev:30846]
+
+Thu May 31 17:27:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/benchmark.rb (Benchmark::Job::item): avoid modifying the
+	  argument unintentionally.  [ruby-talk:253676]
+
+Wed May 30 14:43:00 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (cont_capture): store all local variables in heap
+	  ([ruby-dev:30832]).
+
+	* vm.c (th_stack_to_heap): added.
+
+	* test/ruby/test_continuation.rb: add a test for above.
+
+	* eval_intern.h (th_get_ruby_level_cfp): fix to clean code.
+
+Wed May 30 13:32:34 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (ResponseParser#next_token): fixed
+	  error message.
+
+	* lib/net/imap.rb (ResponseParser#parse_error): fixed
+	  the condition not to refer to @token.symbol unexpectedly.
+	  Thanks, Dick Monahan.
+
+Wed May 30 13:24:33 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
+	  responses for some FTP servers.
 
 Wed May 30 04:18:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_eval_cmd): just return if no exceptions.
 	  [ruby-dev:30820]
 
-Tue May 29 11:01:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 30 02:14:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (interrupt_init): needs to pass nil for Interrupt.
+	  [ruby-core:11038]
+
+	* signal.c (trap): fixed segfaults.  [ruby-dev:30830]
+
+Wed May 30 00:50:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_source_filename, obj_free): suppress warnings.
+
+	* gc.c (garbage_collect, yarv_machine_stack_mark): fixed typo.
+	  http://bugs.debian.org/426267
 
-	* win32/win32.c (rb_w32_opendir): store attributes of the second
-	  entries or later too.
+Wed May 30 00:24:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (open_args, arg_ambiguous, parser_warning): should not use
+	  rb_warning in the parser.
+
+Tue May 29 12:31:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_opendir): removed duplicated code.
+
+Tue May 29 10:55:24 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: fix bug around Continuation and Fiber.
+
+	* test/ruby/test_continuation.rb: add tests for Continuation.
+
+Tue May 29 10:54:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_opendir, rb_w32_readdir): eliminate magic
 	  numbers.
 
-Thu Jun  7 20:10:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 28 10:27:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c: fixed a function name.
+
+Mon May 28 03:56:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: support Fiber.  Check test/ruby/test_fiber.rb for detail.
+	  Fiber is known as "Micro Thread", "Coroutine", and other terms.
+	  At this time, only Fiber#pass is supported to change context.
+	  I want to know more suitable method name/API for Fiber (... do you
+	  know more suitable class name instead of Fiber?) as "suspend/resume",
+	  "call", "yield", "start/kick/stop/restart", ....
+
+	* eval.c, eval_intern.h, thread.c, yarvcore.c, yarvcore.h: ditto.
+
+Sat May 26 00:38:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_exec_internal): do nothing if no code.
+
+	* compile.c (rb_iseq_compile): check node if NULL before check
+	  nd_type.  [ruby-talk:252956]
+
+Sat May 26 00:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+	  skip tests for exitstatus and termsig on the platforms where
+	  signals not supported.
+
+Fri May 25 16:04:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* yarvcore.c (Init_VM): wrap already initialized structs to use
+	  it directly.
+
+Fri May 25 11:09:47 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* regint.h (include): on some platform, defines.h redefines
+	  SIZE_OF_LONG_LONG so shouldn't re-include config.h after included
+	  defines.h.
+
+	* regint.h (vsnprintf): ruby on windows already have vsnprintf macro.
+
+Thu May 24 12:07:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: check across trap violation.
+
+	* eval.c, yarvcore.h: ditto.
+
+Thu May 24 11:46:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, yarvcore.c: fix to mark VM structure on startup.
 
-	* eval.c, intern.h, ext/thread/thread.c: should not free queue
-	  while any live threads are waiting.
-	  [ruby-dev:30653]
+	* yarvcore.h: disable USE_CACHED_VALUE.
 
-Thu Jun  7 14:53:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Thu May 24 01:54:53 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (method_inspect): show proper class name.
-	  [ruby-talk:248647], Thanks Calamitas.
+	* cont.c: support callcc which everyone love.
+	  incomplete. please give me bug reports.
 
-Sun May 27 05:24:56 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* common.mk, inits.c, thread.c: ditto.
 
-	* runruby.rb: eliminate uninitialized variable.
-	  [ruby-core:11255]
+	* yarvcore.c: export thread_mark().
 
-Sun May 27 05:19:03 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* yarvcore.h: disable value cache option.
 
-	* eval.c (mnew): call of super via a method object should work again.
-	  [ruby-talk:248647], Thanks Calamitas.
+	* eval_intern.h: set th_get_ruby_level_cfp to inline.
 
-	* test/ruby/test_method.rb (TestMethod::test_method_super): test for
-	  above fix.
+Wed May 23 15:39:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed May 23 07:29:53 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* common.mk: add a rule for regsyntax.c.
 
-	* process.c (proc_exec_v): terminate timer thread in advance.
-	  [ruby-dev:30581], Thanks H. Holon.
+Wed May 23 10:31:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* oniguruma.h: updated to Oniguruma 5.7.0.
+
+	* regsyntax.c, unicode.c: new files along with Oniguruma 5.x.
 
 Wed May 23 06:51:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
@@ -986,35 +52934,374 @@ Wed May 23 05:49:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  load path to get rid of load pre-installed extensions/libraries.
 	  [ruby-core:11017]
 
-Wed May 23 06:14:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 22 16:37:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (set_arg0): support RSTRING_LEN on HP-UX.  a patch from
+	  WATANABE Tetsuya <Tetsuya.WATANABE AT nifty.com>.  [ruby-dev:30806]
+
+Mon May 21 13:40:00 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, vm_macro.def: support tail call optimization
+	  (on default, this feature is not enabled).
+
+	* iseq.c, compile.c, vm_opts.h: add "tailcall_optimization"
+	  option.
+
+	* sample/test.rb (test_ok): fix to adjust tailcall stack layout.
+
+	* insns.def, vm.c, compile.c, yarvcore.c, yarvcore.h:
+	  add opt_gt, opt_le instructions.
+
+Mon May 21 03:34:06 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: CRAM-MD5 authentication did not work.
+	  [ruby-dev:30770]
+
+Sat May 19 10:26:01 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (Date._parse): detects some OFX dates
+	  (Of course not fully).
+
+Sat May 19 03:08:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_inject): minor improvement.  [ruby-dev:30792]
+
+	* enum.c (one_i): no needs to iterate once the result became false.
+
+	* enum.c (enum_one): fix for an example.
+
+	* enum.c (one_iter_i, none_iter_i): DRY.;
+
+Sat May 19 01:07:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_inject): it is now can work without block.  you
+	  have to specify two argument method name as the first argument.
+
+	* enum.c (Init_Enumerable): reduce is new alias to inject.
+
+Sat May 19 01:05:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (Init_File): method definition mismatch.
+
+Fri May 18 16:44:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (Init_File): add to_path method to File objects.
+
+Fri May 18 11:12:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (DllMain, ruby_init_loadpath): use DLL instance handle given
+	  to DllMain instead of VirtualQuery so that loadpath becomes relative
+	  from the DLL on WinCE too.
+
+Thu May 17 17:03:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (move_to_next_entry): loc also must move forward.
-	  [ruby-talk:251987]
+	* misc/ruby-style.el (ruby-style-label-indent): for yacc rules.
 
-Wed May 23 05:55:04 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu May 17 13:30:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_arg): remove typo from ripper description.
+
+Thu May 17 13:23:38 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y, compile.c (set_arguments): fix to support in-paren
+	  parameter (ex: def foo((a, b))).
+
+Thu May 17 13:01:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (ruby_iseq_disasm): fix to show post arg info.
+
+Thu May 17 12:56:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* debug.c (ruby_debug_node): fix to show node line.
+
+Wed May 16 21:48:44 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb (Logger::Application): remove meaningless logdev
+	  attribute and added logger attribute instead.  [ruby-core:11143]
+	  also added Logger#formatter rdoc comment.
+
+Tue May 15 16:40:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb (test_endblockwarn): now parser
+	  warnings emit source names and line numbers.
+
+Tue May 15 15:01:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (init_stdhandle): stderr should be without buffering,
 	  but mswin32 use buffering when stderr is not connected to tty.
 
-Wed May 23 05:35:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 14 02:12:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
+	* array.c (rb_ary_zip): a.zip(b,c) should return an array, not
+	  enumerator.
+
+	* array.c (rb_ary_zip): a.zip(b,c) should return array with size
+	  truncated to the size of its shortest argument array.
+	  [incompatible]
 
-Wed May 23 05:17:33 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon May 14 01:54:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_choice): should return nil when the array is
+	  empty.
+
+Sat May 12 18:26:36 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (tokens): forgot to add strip. [ruby-core:11120]
+
+	* test/net/http/test_http.rb: test Net::HTTP.post_form.
+
+Fri May 11 15:27:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_data_to_ary): internal IDs must not be exposed.
+	  [ruby-core:11073]
+
+	* parse.y (internal_id_gen): now returns scope local ID instead of
+	  global one.
+
+Thu May 10 15:15:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_super.rb: add tests.
+
+Thu May 10 15:14:05 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
 
-Wed May 23 05:10:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 10 15:09:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (POINTER_P): pointer may be larger than long.
+
+	* parse.y (vtable_size, vtable_included, vtable_tblcpy,
+	  vtable_to_tbl): constified.
+
+Thu May 10 10:13:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_thread_priority): rdoc fix; the initial value is
+	* thread.c (rb_thread_priority): rdoc fix; the initial value is
 	  inherited from the creating thread.  [ruby-core:10607]
 
-Wed May 23 04:22:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May  9 12:28:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (Init_Bignum), numeric.c (Init_Numeric): added fdiv as
+	  aliases of quo.  [ruby-dev:30771]
+
+Tue May  8 23:39:09 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (Date._parse): revised treatment of
+	  hyphened/separatorless dates.
+
+	* lib/date/format.rb: some trivial adjustments.
+
+Tue May  8 20:23:07 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: reverted.
+
+Tue May  8 19:32:18 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/rational.rb: fix high-precision Rationals cannot be
+	  converted to Floats. [ruby-Bugs:10502], [ruby-core:11069],
+	  [ruby-dev:30743]
+
+Mon May  7 10:59:55 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/image.rb, test/rss/test_image.rb: fixed Image module
+	  namespace URI. reported by Dmitry Borodaenko. Thanks.
+
+Sun May  6 18:44:11 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (Net::HTTP.post_form): allow an Array of String
+	  for pairs argument. [ruby-Bugs:10340]
+
+	* lib/net/http.rb (Net::HTTP#set_form_data): ditto.
+
+Sun May  6 17:54:36 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: Connection header field might include both of
+	  "keep-alive" token and "close" token. [ruby-core:10818]
+
+Sat May  5 16:26:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/date/format.rb (Format::Bag#method_missing): get rid of
+	  modifying original argument.  [ruby-core:11090]
+
+Thu May  3 22:20:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, defines.h, eval_load.c (rb_feature_p, rb_provided,
+	  search_required, rb_require_safe), ext/extmk.rb: Fix
+	  a bug where a statically linked extension cannot be autoloaded.
+	  [ruby-dev:30023] / [ruby-dev:30239]
+
+	* thread.c: added an internal class, Barrier.
+
+	* thread.c: copied rdocs from fastthread.
+
+	* yarvcore.h (struct rb_vm_struct): moved loading_table from global.
+
+Thu May  3 18:10:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_evalbody.ci, insns.def, vm.c, tool/insns2vm.rb (rb_num_t):
+	  renamed to get rid of name clash.  [ruby-dev:30504]
+
+	* yarvcore.c (ruby_thread_init): ditto.
+
+Wed May  2 18:52:58 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, yarvcore.h, yarvcore.c, insns.def: fix to mark VM stack
+	  in correct range.
+
+Wed May  2 17:13:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_quo): now calculate in integer.  [ruby-dev:30753]
+
+Wed May  2 15:14:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.h: add redefine checks ([ruby-dev:30751]).
+
+Wed May  2 11:22:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: use Qtrue instead of 2.
+
+	* vm.c, insns.def: support "lambda" calling convention.
+
+Wed May  2 06:46:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c, parse.y, ruby.h (rb_compile_warn, rb_compile_warning): warn
+	  for compilation.  the parser should no longer use rb_warn() and
+	  rb_warning().  [ruby-dev:30121]
+
+Wed May  2 05:45:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assoc): result of assoc_new needs to be an assoc.
+
+Wed May  2 05:40:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): improvement by calculating from MSB and using
+	  factorization.  <http://yowaken.dip.jp/tdiary/20070426.html#p01>
+
+Tue May  1 18:45:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* sample/test.rb: import matzruby's sample/test.rb.
+
+Tue May  1 17:46:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_choice): a new method to choose an element
+	  randomly from an array.
+
+	* array.c (rb_ary_choice): fixed mistake from RDoc.
+
+Tue May  1 13:59:18 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (proc_arity): fix an arity bug ([ruby-core:11060]).
+
+Tue May  1 13:12:49 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, compile.c (set_arguments): support post arguments.
+
+	* test/ruby/test_method.rb: add tests for above.
+
+	* test/ruby/test_proc.rb: ditto.
+
+	* proc.c: fix an arity bug ([ruby-core:11029]).
+
+	* vm.c, vm.h, insns.def, vm_dump.h: fix bmethod process.
+
+	* vm.c: support block argument on block parameter.
+
+Fri Apr 27 17:05:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (int_pow): bugfix of overflow detection.
+
+	* numeric.c (int_pow): rb_big_pow() may return other than Bignum.
+
+Fri Apr 27 01:51:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: support multiple splat (e.g, [a, *b, *c, e, *f]).
+
+Fri Apr 27 00:03:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
+
+Thu Apr 26 17:31:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): reduce multiplying for even number.
+
+	* numeric.c (int_pow): calculate power in Fixnum as possible.
+	  [ruby-dev:30726]
+
+Thu Apr 26 17:18:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y: fixes for ripper.
+
+	* parse.y (primary): reduced duplicated code.
+
+	* parse.y (f_arg_item): should not override by meaningless value.
+
+	* parse.y (f_arg, assocs): should not use $$ before assigned.
+
+	* parse.y (assoc_list): dispatch assoclist_from_args for assocs as
+	  well as args.
+
+	* parse.y (assoc): return assoc if dispatched result is $1.
+
+Thu Apr 26 13:54:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el: new file.  C/C++ style for ruby source code.
+
+Wed Apr 25 19:49:16 2007  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (unix_send_io, unix_recv_io): use CMSG_DATA to
+	  align file descriptor appropriately.
+
+Wed Apr 25 15:23:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (NtInitialize, exit_handler): add initializing and
+	  cleanup of critical section object for select.
+
+	* win32/win32.c (do_select): block reentrance.
+
+	* win32/win32.c (rb_w32_select): 0 sec polling of socket. this is
+	  workaround because winsock cannot do select at same socket at the
+	  same time by two or more threads.
+
+Wed Apr 25 14:10:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/probeprofiler/probeprofiler.c: fix function name and
+	  return value.
+
+Wed Apr 25 12:42:40 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h: remove rb_control_frame_t#callee_id.
+
+	* vm_macro.def: ditto.
+
+	* eval_intern.h (exec_event_hooks): fix to check event flags
+
+	* eval_intern.h (EXEC_EVENT_HOOK): fix to re-check event flags.
+
+	* ext/probeprofiler : added.  this profiler is sampling based
+	  profiler.
+
+	* vm.c: add rb_thread_current_status() API for probeprofiler.
+
+	* thread.c (rb_thread_execute_interrupts): add comments.
+
+Wed Apr 25 10:36:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (PUSH_TAG): no argument now.
+
+	* eval.c, eval_error.h, eval_jump.h, eval_load.c, proc.c, thread.c:
+	  ditto.
+
+	* thread.c (alloc_event_hook, rb_thread_remove_event_hook): should
+	  return value.
+
+Tue Apr 24 09:33:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
 	  [ruby-talk:248288]
 
-Wed May 23 03:50:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Apr 23 22:14:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb ($ruby): add extout directory to include path.
+	  [ruby-core:11003]
 
 	* lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
 	  directory.
@@ -1024,16 +53311,99 @@ Wed May 23 03:50:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
 
-Wed May 23 03:33:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 20 16:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
+	  it is done by libpathflag in mkmf.rb.
+
+Fri Apr 20 12:27:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: fix to override conv proc.
+
+Fri Apr 20 12:21:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): fixed access to out of bound, and inverted
+	  the order of errinfos.
+
+Fri Apr 20 10:33:23 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h: add prototypes of rb_sourceline() and
+	  rb_sourcefile().
+
+Fri Apr 20 02:37:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): re-send signal.  [ruby-dev:30516]
+
+	* eval_error.h (error_handle): no message when exiting by signal.
+
+	* intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
+
+	* signal.c (esignal_init): takes a signal number and an optional
+	  signal name.
+
+	* signal.c (interrupt_init): pass SIGINT always.
+
+	* signal.c (ruby_default_signal): invoke system default signal
+	  handler.
+
+	* signal.c (rb_f_kill): use NUM2PIDT instead of NUM2INT.
+
+	* signal.c (rb_signal_exec, trap): handle SIGTERM.  [ruby-dev:30505]
+
+	* thread.c (rb_thread_signal_raise): now takes signal number instead
+	  of signal name.
+
+	* thread.c (rb_thread_signal_exit): since rb_make_exception() calls
+	  #exception method, rb_class_new_instance() is not needed here.
+
+	* yarvcore.h (struct rb_vm_struct), eval_jump.h (terminate_process):
+	  exit_code is no longer stored in VM.
+
+Thu Apr 19 18:37:49 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, node.h, thread.c, yarvcore.[ch], eval_intern.h:
+	  support set_trace_func (incomplete.  id and klass
+	  don't be passed).  And support Thread#set_trace_func
+	  which hook only specified thread and Thread#add_trace_func
+	  which add new trace func instead of replace old one.
+	  C level API was modified.  See thread.c (logic) and
+	  yarvcore.h (data structures).
+
+	* vm.c, vm_macro.def: add hook points.
+
+	* compile.c, insns.def: fix "trace" instruction.
+
+	* iseq.c, vm_macro.h: add compile option "trace_instruction".
+
+	* test/ruby/test_settracefunc.rb: hook "c-return" of set_trace_func.
+
+Thu Apr 19 20:57:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (symbol): symbols should be followed by EXPR_ENDARG.
+
+	* parse.y (dsym): ditto.
 
-	* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
-	  ensures Thread.critical to be false.  [ruby-talk:248300]
+	* parse.y (parser_yylex): strings should be followed by
+	  EXPR_ENDARG.
 
-Wed May 23 03:25:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (parser_yylex): ditto for numbers.
+
+	* parse.y (parser_yylex): EXPR_ENDARG after ']' and '}'.
+
+Thu Apr 19 17:46:36 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/optparse.rb: fix to override conv proc.
+
+Wed Apr 18 10:41:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* util.c (ruby_strtod): exponent is radix 10.  [ruby-talk:248272]
 
-Wed May 23 03:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 18 02:50:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* yarvcore.c (th_init2): push initial blockptr value for
+	  rb_block_given_p() outside ruby_exec().  [ruby-core:10923]
+
+Wed Apr 18 02:30:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (LDFLAGS): prepend -L. instead appending it to
 	  XLDFLAGS.  [ruby-core:10933]
@@ -1041,132 +53411,413 @@ Wed May 23 03:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* configure.in (Makefile): remove $U for automake from MISSING.
 	  [ruby-talk:248171]
 
-Wed May 23 02:09:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Apr 16 22:56:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/pty/expect_sample.rb: avoid symbolic link representation for
+	  expect.  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
+	  [ruby-dev:30714]
+
+Mon Apr 16 22:51:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample: replace TRUE, FALSE with true, false respectively.
+	  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
+	  [ruby-dev:30713]
+
+Mon Apr 16 17:08:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (make_switch): do not clobber converter if pattern
+	  has no convert method.  reported by sheepman in [ruby-dev:30709].
+
+Mon Apr 16 16:49:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_seek): consistent behavior with
+	  IO#seek.  patch by sheepman in [ruby-dev:30710].
+
+Mon Apr 16 16:34:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): should set command_start after block
+	  starting "do"s and braces.  [ruby-core:10916]
+
+Mon Apr 16 10:51:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_each_with_index): each_with_index to forward
+	  arguments to each.  [ruby-core:10921]
+
+Mon Apr 16 10:43:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_arg): should allow to specify 24:00.
+	  [ruby-core:10915]
+
+Sun Apr 15 09:12:54 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: added some zone names.
+
+	* lib/date/format.rb (_parse): now interprets doted numerical
+	  dates as a big endian (except dd.mm.yyyy).
+
+Thu Apr 12 17:13:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (mutex_try_lock): check and set owner thread.
+
+	* thread_pthread.ci: fix to show error code in error message.
+
+Thu Apr 12 17:11:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_rescue2): restore cfp ([ruby-dev:30582]).
 
-	* eval.c (rb_yield_0): should not clear state on TAG_NEXT when
-	  it's invoked from within lambda body.  [ruby-talk:248136]
+Thu Apr 12 16:06:48 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (proc_invoke): handle TAG_NEXT which would be caused by
-	  next in the lambda body as well.
+	* eval.c (rb_protect): restore cfp ([ruby-dev:30671]).
 
-Wed May 23 01:55:49 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Apr 12 16:04:31 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): check node->nd_state == 1, not !0.
+
+Wed Apr 11 16:35:16 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch] (rb_w32_enter_critical, rb_w32_leave_critical): no
+	  need to reject reentrance. removed.
+
+	* rubysig.h (RUBY_CRITICAL): follow above changes.
+
+	* rubysig.h (TRAP_BEG, TRAP_END): no need to save errno.
+
+Tue Apr 10 17:02:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
 	  before calling original fclose()/close().
 
-Wed May 23 01:42:29 2007  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Apr 10 16:14:22 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.ci (w32_wait_events): check whether interrupt_event is
+	  valid handle or not.
+
+	* thread_win32.ci (native_thread_destroy): clear interrupt_event when
+	  close it.
+
+Tue Apr 10 15:53:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_pthread.ci (native_thread_create): initialize sleep_cond.
+	  fixed: [ruby-dev:30675]
+
+Mon Apr  9 18:48:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (do_select): ubf_select() is not necessary. interrupt is
+	  checked in the loop.
+
+Mon Apr  9 18:27:26 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (do_select): use ubf_select() as UBF on windows.
+
+	* win32/win32.c (do_select): shouldn't call catch_interrupt() here.
+	  fixed: [ruby-dev:30674], reported by wanabe.
+
+Mon Apr  9 09:24:32 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (disconnect): call shutdown for
 	  SSLSocket. Thanks, Technorama Ltd.
 
-Wed May 23 01:28:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Apr  8 13:28:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (defined_expr): test arguments of NODE_CALL and so
+	  on as well as NODE_ATTRASGN.  [ruby-core:10886]
+
+Fri Apr  6 10:56:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_get_group): get rid of
+	  warning. we are aware of it.
+
+Fri Apr  6 04:00:24 2007  Technorama Ltd.  <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_{bn,x509{attr,cert,name,store}}.c:
+	  Add documentation.
+
+Thu Apr  5 17:59:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (defined_expr): support for assignment.
+	  [ruby-core:10867]
+
+	* compile.h (ADD_CATCH_ENTRY): removed temporary variable.
+
+Thu Apr  5 15:13:34 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_alloc): should
+	  return value.
+
+Thu Apr  5 14:58:49 2007  Technorama Ltd. <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_pkcs5.c: New module.
+
+	* ext/openssl/ossl_{cipher,digest,pkcs7,pkcs12}.c:
+	  Remove redundant module namespace.
+
+	* ext/openssl/lib/openssl/{cipher,digest}.rb
+	  Add backwards compatible classes for rearranged classes.
+
+	* ext/openssl/ossl_{pkcs7,pkcs12}.c: Add documentation.
+
+Thu Apr  5 00:42:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (rb_notimplement), io.c (pipe_open): removed definite
 	  articles and UNIX manual section from messages.  [ruby-dev:30690]
 
+Wed Apr  4 17:09:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): refined the message of NotImplementedError.
+	  [ruby-dev:30685]
+
+Wed Apr  4 12:29:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c (rb_notimplement): should show the name of this func,
+	  not callee.
+
+Wed Apr  4 10:18:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (popen_exec): should not close close-on-exec FDs.
+	  [ruby-dev:30679]
+
 	* io.c (pipe_open): raise NotImplementedError for command "-" on
 	  platforms where fork(2) is not available.  [ruby-dev:30681]
 
-Wed May 23 00:03:42 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Apr  4 04:17:18 2007  Technorama Ltd. <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_ssl.c: Add documentation.
+
+Tue Apr  3 16:22:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/extconf.rb: check for functions added in 1.9.
+
+	* ext/openssl/ruby_missing.h: check per features instead by
+	  checking version code.  [ruby-core:10845]
+
+Tue Apr  3 16:02:44 2007  Technorama Ltd. <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_bn.c: More documentation.
+
+	* ext/openssl/lib/ossl_{pkey,pkey_ec}.[ch]: Add elliptic curves.
+
+Tue Apr  3 15:50:41 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
 	  windows) doesn't set fromlen if the socket is connection-oriented.
 	  reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
 
-Sat Mar 24 23:40:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr  3 09:36:55 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* node.h (struct rb_thread.locals): explicit as struct.
-	  [ruby-core:10585]
+	* ext/openssl/ruby_missing.h: need to include version.h to check
+	  RUBY_VERSION_CODE.
 
-	* eval.c, node.h (enum rb_thread_status, struct rb_thread,
-	  rb_curr_thread, rb_main_thread): prefixed.  [ruby-core:10586]
+Mon Apr  3 07:10:12 2007  Technorama Ltd. <oss-ruby@technorama.net>
 
-	* file.c (chompdirsep): made an unprefixed name static.
+	* ext/openssl/ossl_{ssl.[ch],ssl_session.c},
+	  ext/openssl/lib/openssl/lib/openssl/ssl.rb:
+	  New SSL::Session class.  Add session cb's, getter/setters,
+	  config, and statistics methods.
 
-	* io.c (io_fread): ditto.
+Mon Apr  3 04:00:23 2007  Technorama Ltd. <oss-ruby@technorama.net>
 
-Tue May 22 23:27:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/{ossl.[ch],ossl_pkey.c} Add documentation.
 
-	* eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
-	  block.  [ruby-core:10609]
+	* ext/openssl/ossl_hmac.c Add reset method.
 
-	* test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
-	  test for exit in END block.  [ruby-core:10760]
+	* ext/openssl/ossl_cipher.c (Cipher#update) Take additional
+	  buffer argument.
 
-	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
-	  test for signal in END block.
+	* ext/openssl/{ossl_bio.c,ossl_ssl.c,ruby_missing.h}
+	  compatibility with 1.8.
+
+Mon Apr  2 21:55:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (throw), thread.c, yarvcore.h (throwed_errinfo): fixed
+	  typo.
+
+Fri Mar 30 11:46:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by
+	  wanabe [ruby-dev:30672]
+
+	* win32/win32.c (init_env, insert, rb_w32_get_environ): use strdup
+	  instead of malloc + strlcpy. suggested by nobu [ruby-dev:30673]
+
+Fri Mar 30 02:29:04 2007  Technorama  <oss-ruby@technorama.net>
+
+	* ext/openssl/ossl_{bn,cipher,digest,hmac,rand,pkey_{dh,dsa,rsa}}.c:
+	  Add Documentation for various methods.
 
-Tue May 22 23:14:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/lib/openssl/cipher.rb: Ditto
 
-	* eval.c (rb_provided): check for extension library if SOEXT is
-	  explicitly given.  [ruby-dev:30657]
+	* ext/openssl/ossl_bn.c: add lshift! and rshift! methods.
 
-Tue May 22 21:29:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl_digest.c: GetDigestPtr() also accept a string.
+
+Fri Mar 23 11:28:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (init_env, insert, cmdglob, rb_w32_cmdvector,
+	  rb_w32_opendir, rb_w32_readdir, rb_w32_strerror, rb_w32_stati64,
+	  rb_w32_get_environ): use strlcpy() and strlcat().
+
+	* win32/win32.c (rb_w32_opendir): use realloc() instead of xrealloc().
+
+	* win32/win32.c (rb_w32_closedir): check NULL before free pointers.
+
+Fri Mar 23 00:24:52 2007  Keiju Ishitsuka <keiju@ruby-lang.org>
+
+	* lib/shell: commit miss(support for ruby 1.9(YARV) thread model).
+
+Thu Mar 22 13:32:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (LIBS): remove an unnecessary library.
+
+Thu Mar 22 10:27:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_bignum.rb (test_to_s): add tests for Bignum#to_s.
+
+Wed Mar 21 20:38:06 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* marshal.c (w_short, w_long, w_object): get rid of VC++ warnings.
+
+Wed Mar 21 20:05:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
+	  proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
+	  debug.c, debug.h: merge half-baked-1.9 changes.  The biggest change
+	  is to change node structure around NODE_SCOPE, NODE_ARGS.  Every
+	  scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
+	  represents more details of arguments information.  I'll write a
+	  document about detail of node structure.
+
+Wed Mar 21 17:04:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big2str0): round up for the most significant digit.
 	  [ruby-core:10686]
 
-Tue May 22 20:53:02 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar 21 08:20:00 2007  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* test/testunit/collector/test_dir.rb: Fixed test/unit tests that
+	  were breaking due to Module#public_instance_methods now
+	  returning a Symbol instead of a String.
+
+	* test/testunit/collector/test_objectspace.rb: Ditto.
+
+Tue Mar 20 22:54:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_extended): erroneous check condition when dump
+	  method is defined.  [ruby-core:10646]
 
-	* ext/thread/thread.c (remove_one): Preserve List invariants;
-	  submitted by: MenTaLguY <mental AT rydia.net>
-	  in [ruby-core:10598] and [ruby-bugs:PR#9388].
+Tue Mar 20 21:36:47 2007  Keiju Ishitsuka <keiju@ruby-lang.org>
 
-Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/shell.rb, lib/shell: support for ruby 1.9(YARV) thread model.
+
+Tue Mar 20 16:36:08 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* distruby.rb: Add zip generation.
 
-Fri Mar 16 21:48:11 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar 20 16:20:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_callee_name): add __method__ and __callee__ again.
+	  __callee__ need to rework to adopt YARV.  [ruby-core:10671]
+
+Tue Mar 20 11:09:00 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: Revise rdoc.
+
+	* lib/set.rb (Set#freeze, Set#taint, Set#untaint): Implement
+	  Set#freeze, Set#taint, and Set#untaint; requested by: Dan
+	  Hutchings <dan AT moltoagitato.com> in [ruby-bugs:PR#9359].
+
+Tue Mar 20 09:13:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
-	  submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30554].
+	* process.c (rb_fork): flush stdouts always before fork(2).
+	  fixed: [ruby-dev:30612]
 
-Fri Mar 16 18:28:06 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar 20 01:38:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
-	  always returning the (real) group entry of the running process;
-	  reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
-	  in [ruby-dev:30586].
+	* thread.c (thread_start_func_2): store the result of first_func
+	  as well as first_proc.
 
-Fri Mar 16 16:33:58 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* thread.c (thread_create_core): block is not used if first_func
+	  is given.
 
-	* ext/thread/thread.c (unlock_mutex_inner): Make sure that the
-	  given mutex is actually owned by the caller; submitted by:
-	  Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
+Mon Mar 19 16:58:52 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Mar 16 16:21:35 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* missing/{strlcat,strlcpy}.c, missing.h: new functions.
 
-	* ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
-	  ConditionVariable#wait that occurs when two threads that are
-	  trying to access the condition variable are also in concurrence
-	  for the given mutex; submitted by: Sylvain Joyeux
-	  <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
-	  in [ruby-core:10598].
+	* LEGAL: add copyright notice about above files.
 
-Fri Mar 16 16:17:27 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* configure.in: check whether strlcat and strlcpy are exist or not.
 
-	* test/thread/test_thread.rb: Add a test script for the `thread'
-	  library.  This should result in failure as of now with
-	  ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
-	  m4x.org> in [ruby-core:10598].
+	* {bcc32,win32,wince}/Makefile.sub: use above files.
+
+Mon Mar 19 14:12:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/matrix.rb (Matrix::inverse_from): adding partial pivoting to
+	  the Gauss-Jordan algorithm, making it stable.  a patch from
+	  Peter Vanbroekhoven.  [ruby-core:10641]
+
+Mon Mar 19 12:13:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regparse.c, etc.: K&R to ANSI code cleanup patch from Stefan
+	  Huehner <stefan at huehner.org>.  [ruby-core:10543]
+
+Mon Mar 19 11:27:13 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
+
+Sun Mar 18 08:31:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/dir.h, win32/win32.c (rb_w32_opendir, rb_w32_readdir,
+	  rb_w32_closedir): get rid of possible buffer-overflows.
+
+Sat Mar 17 19:10:39 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss, test/rss:
+	- supported Atom.
+	- bumped version 0.1.6 to 0.1.7.
+	* sample/rss/convert.rb: added new sample.
+
+Fri Mar 16 22:32:20 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: change default verification mode from
+	  VERIFY_PEER to VERIFY_NONE because most POPS server does not have
+	  true certification.
+
+Fri Mar 16 22:19:24 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize,
+	  a little bit supporting ActiveX control. [ruby-talk:241188]
+
+Fri Mar 16 22:16:58 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: merge Ruby-SSPI patch contributed by Justin
+	  Bailey.
+
+	* ext/Win32API/lib/win32/sspi.rb: new file.
 
 Wed Mar 14 12:30:00 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
 
 	* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
 	  treated as ("-0.31") not as ("0.31").
 
-Tue Mar 13 04:04:04 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar 13 19:04:30 2007  Keiju Ishitsuka <keiju@ruby-lang.org>
+
+	* lib/sync.rb: support for ruby 1.9(YARV) thread model.
+
+Tue Mar 13 09:25:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (clear-installed-list): separated from install-prereq.
+
+Tue Mar 13 07:23:20 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* stable version 1.8.6 released.
+	* lib/monitor.rb (mon_try_enter): call @mon_muetx.try_lock.
+	  Thanks, Keiju ISHITSUKA. [ruby-dev:30507]
 
-Tue Mar 13 02:54:17 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar 13 02:42:58 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
 	  assumption any more; submitted by MIYASAKA Masaru <alkaid AT
 	  coral.ocn.ne.jp> in [ruby-dev:30537].
 
-Mon Mar 12 11:07:44 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Mar 12 10:53:28 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
 	  externally defined modules; submitted by Technorama
@@ -1192,232 +53843,263 @@ Mon Mar 12 11:07:44 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
 
-Mon Mar 12 01:23:50 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Mar 11 18:42:01 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
-	  This might not be very right but it is commonly used in other
-	  parts of the code; submitted by sheepman <sheepman AT
-	  sheepman.sakura.ne.jp> in [ruby-dev:30532].
+	* misc/ruby-mode.el (ruby-block-end-re): Support for the
+	  experimental ';;' terminator had been dropped.
 
-	* ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
+Sun Mar 11 05:45:46 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
-	  DL::Importable::Internal::callback): Avoid race condition for an
-	  instance variable; submitted by sheepman <sheepman AT
-	  sheepman.sakura.ne.jp> in [ruby-dev:30530].
+	* misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
+	  interface based on rubydb3x.el; submitted by Martin Nordholts
+	  <enselic AT gmail.com> in [ruby-bugs:PR#9023].
 
-Sun Mar 11 19:04:29 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sat Mar 10 07:20:28 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* misc/README: Add a note about ruby-electric.el. 
+	* ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB#library_name,
+	  WIN32OLE_TYPELIB#visible?.
 
-	* misc/ruby-mode.el (ruby-non-block-do-re): Fix
-	  ruby-non-block-do-re. [ruby-core:03719]
+	* test/win32ole/test_win32ole_typelib.rb: ditto.
 
-	* misc/inf-ruby.el: Synchronize the comment section with trunk.
+Thu Mar  8 09:17:59 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
-	  interface based on rubydb3x.el; submitted by Martin Nordholts
-	  <enselic AT gmail.com> in [ruby-bugs:PR#9023].
+	* compile.c: iseq_compile -> rb_iseq_compile.
 
-Sun Mar 11 17:51:46 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* iseq.c: ditto.
 
-	* ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
-	  function is found in the function table before trying to call
-	  it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30524].
+	* intern.h: provide function prototype of Init_jump.
 
-Sun Mar 11 17:30:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval_jump.h (Init_jump): declare function type.
 
-	* eval.c (error_handle): no message when exiting by signal.
+	* thread.c: platform-dependent functions should be surrounded by #ifdef.
 
-	* eval.c (ruby_cleanup): re-send signal.  [ruby-dev:30516]
+	* iseq.c (iseq_data_to_ary): remove unused variable.
 
-	* eval.c (rb_thread_interrupt): instantiate SignalException.
+	* compile.c (set_arguments): ditto.
 
-	* eval.c (rb_thread_signal_raise): now takes signal number instead
-	  of signal name.
+	* thread.c (set_unblock_function): ditto.
 
-	* intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
+	* thread_pthread.ci: reduce printf warning.
 
-	* signal.c (esignal_init): takes a signal number and an optional
-	  signal name.
+	* vm_dump.c: ditto.
 
-	* signal.c (interrupt_init): pass SIGINT always.
+Tue Mar  6 16:35:04 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
-	* signal.c (ruby_default_signal): invoke system default signal
-	  handler.
+	* lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
 
-	* signal.c (rb_signal_exec, trap): handle SIGTERM.  [ruby-dev:30505]
+Tue Mar  6 11:53:25 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Tue Mar  6 19:03:42 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/tk/sample/irbtkw.rbw: fails to exit process.
 
-	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
-	  Digest::MD5.
+Tue Mar  6 10:23:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
+	* runruby.rb: added --pure (turned on by default) and --debugger
+	  options.
 
-	* lib/shell/process-controller.rb: fix thread synchronization
-	  problem for [ruby-dev:30477].
+Mon Mar  5 09:19:33 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
-	  Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
-	  moriq.com> in [ruby-dev:30500].
+	* lib/timeout.rb (Timeout.timeout): should return the block value
+	  always.
 
-	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
+	* lib/timeout.rb (Timeout.timeout): should yield sec argument
+	  always.
 
-	* time.c (time_to_s): Back out the format changes; discussed
-	  in [ruby-dev:30495].
+	* lib/timeout.rb (Timeout.timeout): fix document.
 
-	* ext/tk/sample/irbtkw.rbw: fails to exit process.
+Mon Mar  5 09:16:40 2007  Minero Aoki  <aamine@loveruby.net>
 
-Mon Mar  5 20:26:10 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/net/smtp.rb: support automatic STARTTLS.
 
-	* time.c (time_to_s): Correct the wrong format which did not
-	  really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
-	  iij.ad.jp> in [ruby-dev:30487].
+	* lib/net/smtp.rb: check server advertisement.
 
-Sun Mar  4 23:53:27 2007  Minero Aoki  <aamine@loveruby.net>
+	* lib/net/smtp.rb: introduce new class SMTP::Response.
 
-	* lib/fileutils.rb (mv): could not move a directory between
-	  different filesystems. [ruby-dev:30411]
+	* lib/net/smtp.rb (getok): should not use sprintf.
 
-Sun Mar  4 23:46:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/smtp.rb (get_response): ditto.
 
-	* file.c (rb_file_s_utime): allow nil to set the current time.
+	* lib/net/protocol.rb: reduce syntax warning on 1.9.
 
-	* lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
-	  options.  fixed: [ruby-talk:219037]
+Mon Mar  5 07:13:28 2007  Minero Aoki  <aamine@loveruby.net>
 
-Sun Mar  4 23:19:00 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/net/smtp.rb: reconstruct SMTPS/STARTTLS interface.  New
+	  interface is incompatible from current 1.9 interface at all.
 
-	* util.c (push_element): should return a int value.
+	* lib/net/smtp.rb: All SSL-related class methods are removed; use
+	  instance methods instead.
 
-Sun Mar  4 01:06:55 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/net/smtp.rb: rename methods: *ssl -> *tls (with alias
+	  "ssl").
 
-	* lib/set.rb (Set#^, Set#&): Correct documentation.  Those methods
-	  return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
-	  mangabrain.de>.
+	* lib/net/smtp.rb: rename methods: *tls -> *starttls.
 
-Sat Mar  3 21:41:31 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Mar  5 01:36:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
-	  submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
-	  [ruby-list:43218].
-	  cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
+	* parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
+	  indentation broken at YARV merger.
 
-Sat Mar  3 19:07:05 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Mar  4 23:41:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/thread/thread.c (push_list): Use ALLOC().
+	* file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and
+	  rb_gid_t instead of int.
 
-	* ext/thread/thread.c (rb_mutex_alloc): Ditto.
+	* file.c (rb_stat_s_utime): fixed a commit miss for the platforms
+	  where utimes() does not exist.
 
-	* ext/thread/thread.c (rb_condvar_alloc): Ditto.
+	* lib/fileutils.rb (touch): ditto.
 
-Sat Mar  3 18:56:40 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Mar  4 14:46:56 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* NEWS: Add a note for String#intern.
+	* util.c (push_element): should return a int value.
 
-Sat Mar  3 18:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Mar  4 01:01:25 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* eval.c (rb_provided): return true only for features loaded from
-	  .rb files, and not search actual library type.  [ruby-dev:30414]
+	* lib/set.rb (Set#^, Set#&): Correct documentation.  Those methods
+	  return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
+	  mangabrain.de>.
+
+Sat Mar  3 22:54:33 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (touch): last #touch change causes error when
+	  :mtime option was not given.
 
-	* eval.c (rb_feature_p): check loading_tbl if the given ext is
-	  empty.  [ruby-dev:30452]
+Sat Mar  3 22:51:29 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (rb_feature_p): fix possible buffer overrun.
+	* lib/fileutils.rb (mv): could not move directory between
+	  different file systems. [ruby-dev:30411]
 
-Sat Mar  3 16:30:39 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sat Mar  3 22:37:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
-	  local_tbl region from getting freed many times; submitted by
-	  Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in
-	  [ruby-dev:30460].
+	* file.c (rb_file_s_utime): allow nil to set the current time.
 
-	* eval.c (proc_invoke): Ditto.
+	* lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
+	  options.  fixed: [ruby-talk:219037]
 
-	* gc.c (obj_free): Ditto.
+Sat Mar  3 15:52:26 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* parse.y (top_local_setup_gen): Ditto.
+	* object.c (instance_variable_get): Restore rdoc markups lost in
+	  the last commit.
 
-Sat Mar  3 16:09:27 2007  Akinori MUSHA  <knu@iDaemons.org>
+Fri Mar  2 21:17:14 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (get_ptr_of_variant, ole_set_safe_array,
+	  ole_val2ptr_variant, ole_val2olevariantdata, ole_variant2val,
+	  ): fix some bugs of WIN32OLE_VARIANT.new when variant type is
+	  VT_ARRAY|VT_BSTR or VT_BYREF.
+
+	* ext/win32ole/win32ole.c (folevariant_s_array, folevariant_initialize):
+	  WIN32OLE_VARIANT#[], WIN32OLE_VARIANT#[]=, WIN32OLE_VARIANT#value=
+	  is defined as instance method of WIN32OLE_VARIANT.
+
+	* test/win32ole/test_win32ole_variant.rb: add some test for
+	  VT_ARRAY, VT_BYREF variant type.
+
+Fri Mar  2 07:58:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_obj_ivar_set): RDoc updated according to a
 	  suggestion from Brian Candler <B.Candler AT pobox.com>.
 	  [ruby-core:10469]
 
-Sat Mar  3 15:41:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  1 21:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
-	  empty.  [ruby-dev:30452]
-
-Thu Mar  1 04:08:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* mkconfig.rb (patchlevel): read from version.h.
+	  empty.  [ruby-dev:30455]
 
-Thu Mar  1 03:42:09 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Mar  1 02:55:25 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
 	  Digest::Base subclasses, which was unintentionally made
 	  impossible while restructuring Digest classes.
 
-Wed Feb 28 22:10:55 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Mar  1 02:05:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0.  This is way too old
-	  NEWS.
+	* mkconfig.rb (patchlevel): read from version.h.
 
-	* NEWS: Add NEWS, a document file to keep user visible feature
-	  changes between releases.
+Wed Feb 28 21:15:00 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
 
 	* missing/flock.c: workaround for MinGW.
 
+Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* pack.c (pack_unpack): properly ignore non-base64 octets such as
+	  UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
+	  to fix [ruby-core:10437]
+
+Wed Feb 28 18:31:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
 	* ext/openssl/extconf.rb: no need to check unistd.h and sys/time.h.
 	  they are already checked at configure.
 	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
 
+Wed Feb 28 18:23:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
 	* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
 	  should be the first elements of library paths list.
 	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
 
+Wed Feb 28 10:33:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, configure.in, */Makefile.sub (THREAD_MODEL): system
+	  specific thread model.
+
+	* compile.h, regint.h, vm.h, array.c: removed unnecessary #include.
+
+Wed Feb 28 04:03:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (take_i): small cosmetic / documentation patch from
+	  Tadashi Saito <shiba AT mail2.accsnet.ne.jp>. [ruby-dev:30446]
+
+Wed Feb 28 01:20:18 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
 	* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
 	  target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
 
+Wed Feb 28 00:08:11 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
 	* mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
 
 	* common.mk: new target dist
 
 	* distruby.rb: new file
 
-	* configure.in (--enable-auto-image-base): avoid the neccessity to
+Tue Feb 27 22:18:45 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (--enable-auto-image-base): avoid the necessity to
 	  rebase the shared libs as much as possible;
 	  submitted by Corinna Vinschen <spam at vinschen.de> in
 	  [ruby-talk:240964].
 
-Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* pack.c (pack_unpack): properly ignore non-base64 octets such as
-	  UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
-	  to fix [ruby-core:10437]
-
-Tue Feb 27 21:50:10 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Feb 27 21:36:47 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
 
+Tue Feb 27 21:33:04 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
 	* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
 
-Tue Feb 27 20:49:19 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Feb 27 20:35:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (error.c, process.c): depend on yarvcore.h and rubysig.h.
+
+Tue Feb 27 19:26:31 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
+	  rb_nkf_guess2): Silence warnings regarding char * vs. unsigned
+	  char * mismatch; submitted by Lyle Johnson
+	  <lyle.johnson@gmail.com> in [ruby-core:10416].
+
+Tue Feb 27 19:15:01 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
 	  by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
 
-	* regex.c (calculate_must_string, slow_search, re_search): Silence
-	  warnings regarding char * vs. unsigned char * mismatch;
-	  submitted by Lyle Johnson <lyle.johnson@gmail.com>
-	  in [ruby-core:10416].
+Tue Feb 27 18:59:42 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto.
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_load): Silence warnings
+	  regarding char * vs. unsigned char * mismatch; submitted by Lyle
+	  Johnson <lyle.johnson@gmail.com> in [ruby-core:10416].
 
 	* ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
 
@@ -1426,61 +54108,321 @@ Tue Feb 27 20:49:19 2007  Akinori MUSHA  <knu@iDaemons.org>
 	* ext/digest/digest.c (rb_digest_base_finish,
 	  rb_digest_base_update): Ditto.
 
-	* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
-	  rb_nkf_guess2): Ditto.
+Tue Feb 27 18:12:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
-	  Eliminate rb_thread_critical switching where unnecessary;
-	  implied by shugo in [ruby-dev:30412].
+	* enum.c (enum_take): new method.  [ruby-dev:30407]
 
-	* ext/thread/thread.c (set_critical): Merge in
-	  thread_exclusive_ensure().
+	* enum.c (enum_drop): ditto.
 
-	* ext/thread/thread.c: Consistently use 0 and 1 for
-	  rb_thread_critical values.
+Tue Feb 27 07:47:24 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/thread/thread.c: Use xmalloc()/xfree() instead of
-	  malloc()/free(); pointed out by shugo in [ruby-dev:30412].
+	* yarvcore.h, vm.h: rename th_invoke_yield() to th_yield().
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
-	  Initialize @workdir properly to silence a warning under -w.
-	  Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
+	* blockinlining.c: ditto.
 
-Sun Feb 25 02:50:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* eval.c: ditto.
 
-	* defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
-	  which is necessary for dir.c to compile on djgpp and emx.
+	* vm.c, insns.def: rename th_invoke_yield_cfunc()
+	  to th_yield_with_cfunc().
 
-Sat Feb 24 17:04:01 2007   Tadayoshi Funaba  <tadf@dotrb.org>
+	* yarvcore.h, yarvcore.c: rename theYarvVM to ruby_current_vm and
+	  yarvCurrentThread to ruby_current_thread.  remove yarvVMArray.
 
-	* lib/date/format.rb: updated based on date2 4.0.3.
+Tue Feb 27 00:45:23 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_optimization.rb: restore method before calling
+	  assert_equal.
+
+Mon Feb 26 00:58:39 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h: add rb_thread_t#top_wrapper, top_self.
+
+	* eval_load.c (rb_load): support eval in wrapper module
+	  (load(file, true)).
+
+	* eval.c: ditto.
+
+	* eval_jump.h: ditto.
+
+	* iseq.c: ditto.
+
+	* vm.c: ditto.
+
+	* yarvcore.c: ditto.
+
+	* insns.def: add a empty line.
+
+Mon Feb 26 00:54:36 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: change "gdb" rule.  You can debug miniruby with
+	  $(srcdir)/test.rb on gdb by this rule (type "make gdb").
+	  If you write break points to "breakpoints.gdb" on $srcdir,
+	  gdb runs with this file.
+
+Sun Feb 25 11:46:58 2007  Koichi Sasada  <ko1@atdot.net>
 
-Sat Feb 24 17:01:02 2007  Minero Aoki  <aamine@loveruby.net>
+	* win32/Makefile.sub: enable -Zi (debug) option.
+
+Sun Feb 25 11:38:40 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.h: define RUBY_VM macro and remove NATIVETHREAD* macros.
+
+	* intern.h: ditto.
+
+	* signal.c (posix_signal): remove unused function
+	  posix_nativethread_signal().
+
+Sun Feb 25 11:31:13 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_run): fix to ANSI style.
+
+Sun Feb 25 11:09:16 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest/runner.rb: show source code in error message.
+
+Sun Feb 25 09:39:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h:
+	  rename:
+	    rb_iseq_t#file_name -> filename
+	    rb_iseq_t#local_tbl -> local_table
+	  add:
+	    rb_iseq_t#local_table_size
+
+	* compile.c: separate local_table_size and local_size
+	  (local variable size)
+
+	* blockinlining.c: apply above rename.
+
+	* compile.h: ditto.
+
+	* eval.c: ditto.
+
+	* iseq.c: ditto.
+
+	* proc.c: ditto.
+
+	* vm.c: ditto.
+
+	* vm_dump.c: ditto.
+
+Sun Feb 25 10:27:17 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest/runner.rb: add lib/ to load path.
+
+Sat Feb 25 10:16:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* rubyio.h (HAVE_RB_IO_T): macro to tell if rb_io_t is defined.
+
+Sat Feb 24 19:39:16 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* common.mk: new target "btest", to run bootstraptests.
+
+Sat Feb 24 19:30:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
+	  renamed from OpenFile.
+
+	* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
+	  ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
+	  ext/readline/readline.c, ext/socket/socket.c: ditto.
+
+Sat Feb 24 19:28:23 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest/runner.rb: new option -v,--verbose.
+
+Sat Feb 24 18:55:50 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* yarvtest/test_method.rb: removed (merged to bootstraptest).
+
+	* yarvtest/test_class.rb: ditto.
+
+Sat Feb 24 18:44:39 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest/test_class.rb: new file.
+
+	* bootstraptest/test_method.rb: add tests.
+
+Sat Feb 24 18:44:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h (rb_thread_blocking_region): add prototype.
+
+	* file.c (rb_thread_flock, rb_file_flock): use UBF feature.
+
+	* process.c (rb_waitpid_blocking, rb_waitpid): use UBF feature.
+
+	* thread.c (rb_thread_debug): added runtime debugging flag.
+
+	* thread.c (BLOCKING_REGION): restore previous UBF.
+
+	* thread.c (rb_thread_blocking_region): default UBF to interrupt
+	  in system dependent way by RB_UBF_DFL.
+	  + ubf_select() on posix system
+	  + ubf_handle() on Win32
+	  + none on cygwin
+
+	* thread_win32.ci (rb_w32_wait_events_blocking): blocking version.
+
+	* win32/win32.c (waitpid): use rb_w32_wait_events_blocking().
+
+Sat Feb 24 17:45:48 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (f_arg, opt_f_block_arg): ripper should export VALUE.
+
+Sat Feb 24 16:52:55 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest/runner.rb: fix syntax error.
+
+Sat Feb 24 16:51:09 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest/runner.rb: new option --help.
+
+Sat Feb 24 16:47:33 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest: new test suite.
+
+	* bootstraptest/runner.rb: new file.
+
+	* bootstraptest/test_literal.rb: new file.
+
+	* bootstraptest/test_method.rb: new file.
+
+Sat Feb 24 16:29:15 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (StartSocket): remove unnecessary code.
+
+Sat Feb 24 16:04:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (struct local_vars): remove unused nofree member from
+	  struct.
+
+	* parse.y (parser_free): ditto.
+
+Sat Feb 24 15:57:19 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/thread.rb (ConditionVariable#broadcast): use Mutex
+	  instead of Thread.exclusive.
+
+	* lib/monitor.rb (MonitorMixin#mon_exit): unset @mon_owner
+	  before calling Mutex#unlock.
+
+Sat Feb 24 15:51:45 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (program): remove useless assignment to reduce warning.
+
+Sat Feb 24 15:41:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (lambda): remove unused clause from the rule to stop
+	  warning.
+
+Sat Feb 24 15:41:22 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/thread.rb: do not redefine Mutex#synchronize.
+
+Sat Feb 24 15:14:02 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb: rewritten using Mutex/ConditionVariable.
+
+Sat Feb 24 13:25:32 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/soap/mapping/factory.rb: catch up with spec changes (return
+	  Symbols instead of Strings).
+
+	* lib/soap/mapping/mapping.rb: ditto.
+
+Sat Feb 24 10:49:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y, node.h, compile.c: change node tree structure.  a purpose
+	  of this change is to unify argument structure of method and block.
+	  this change prohibits duplicate block parameter name.
+	  new argument information:
+	    NODE_ARGS	  [m: int, o: NODE_OPT_ARG, ->]
+	    NODE_ARGS_AUX [r: ID, b: ID, ->]
+	    NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
+	  optarg information:
+	    NODE_OPT_ARGS [idx, expr, ->]
+
+	* vm_macro.def: ditto.
+
+	* gc.c: ditto.
+
+	* iseq.c: ditto.
+
+	* compile.h: fix debug function name.
+
+	* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
+
+	* test/ruby/test_lambda.rb: disable test temporarily.
+
+Sat Feb 24 10:46:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/testunit/test_testcase.rb: catch up with current instance
+	  variable spec.
+
+Sat Feb 24 10:32:59 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: change vm_macro.def rule.
+
+Sat Feb 24 10:38:05 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
 	  rb_gc_mark.  Thanks Tomoyuki Chikanaga. [ruby-dev:30405]
 
-Sat Feb 24 16:53:09 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Feb 24 07:31:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* signal.c (sighandler): need to tell to be interrupted to main
-	  context when handler is installed.
+	* ext/win32ole/win32ole.c: add WIN32OLE_VARIANT.array,
+	  WIN32OLE_VARIANT#value=, refactoring.
 
-	* win32/win32.[ch] (rb_win32_interrupted): new function to listen
-	  interrupt.
+	* test/win32ole/test_win32ole_variant.rb: add some test for
+	  WIN32OLE_VARIANT.array, WIN32OLE_VARIANT#value=.
 
-	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
-	  workaround. [ruby-core:10259]
+Fri Feb 23 18:37:55 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* win32/win32.c (NtInitialize): call above function.
+	* test/ruby/test_yield.rb: new test.
 
-Fri Feb 23 13:04:43 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* yarvtest/test_yield.rb: removed (moved to test_yield.rb).
 
-	* numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
-	  suggested in
-	  http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
-	  [ruby-talk:240223]
+Fri Feb 23 18:27:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (rb_thread_polling): check interrupts here.
+
+	* thread_win32.ci (w32_wait_events): rename from w32_wait_event(), and
+	  now receive multiple event handles.
+
+	* win32/win32.c (wait_events, rb_w32_main_context): removed.
+
+	* thread_win32.ci (rb_w32_wait_events): new function.
+
+	* thread_win32.ci, win32/win32.c (rb_w32_sleep, rb_w32_Sleep): move
+	  from win32/win32.c to thread_win32.ci, and use w32_wait_events().
+
+Fri Feb 23 18:13:22 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_optimization.rb: new test (merges test_opts.rb).
+
+	* yarvtest/test_opts.rb: removed.
+
+Fri Feb 23 16:59:39 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_assignment.rb: merge yarvtest/test_massign.
+
+	* yarvtest/test_massign.rb: removed (merged to
+	  test_assignment.rb).
+
+Fri Feb 23 15:58:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* signal.c (sighandler): need to re-install sighandler on some
+	  platforms.
+
+Fri Feb 23 15:05:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Feb 23 12:47:13 2007  James Edward Gray II  <james@grayproductions.net>
+	* win32/win32.c (set_pioinfo_extra): simplified.
+
+Fri Feb 23 14:23:20 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_literal.rb: new test.
+
+Fri Feb 23 12:40:12 2007  James Edward Gray II  <james@grayproductions.net>
 
 	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): Make the
 	  Content-Length parameter optional for responses in
@@ -1490,22 +54432,130 @@ Fri Feb 23 12:47:13 2007  James Edward Gray II  <james@grayproductions.net>
 	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Add DateTime
 	  support to xmlrpc; approved by the maintainer.
 
-Mon Feb 19 18:33:30 2007  Akinori MUSHA  <knu@iDaemons.org>
+Fri Feb 23 12:24:46 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (lambda): add ripper event.  This fixes bus error on
+	  "make test-all".
+
+	* ext/ripper/extconf.rb: do not stop build.
+
+Fri Feb 23 12:16:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: remove dyna_check_gen() prototype.
+
+Fri Feb 23 11:41:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,
+	  object.c, string.c, variable.c, vm_macro.def: revert private
+	  instance variable feature, which is postponed until next major
+	  release.
+
+	* marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
+	  8th version.
+
+Fri Feb 23 10:53:21 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* thread_pthread.ci (native_mutex_lock): do not call
+	  pthread_mutex_trylock().
+
+Fri Feb 23 10:31:16 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* dln.c: use dlopen on Mac OS X 10.3 or later.
+
+Fri Feb 23 10:03:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_ord): need not to check string length;  ord
+	  returns a codepoint for the first character in the string.
+
+Wed Feb 21 22:29:45 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* numeric.c (fix_equal): A bit more optimization.
+
+Wed Feb 21 17:40:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_equal): remove FIX2LONG() to optimize.  suggested
+	  in http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
+	  [ruby-talk:240223]
+
+	* numeric.c (fix_cmp): ditto.
+
+Wed Feb 21 09:14:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_load.c (rb_require_safe): should restore safe level.
+
+Tue Feb 20 21:19:29 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (installed_code_page_proc,
+	  ole_variant2val): small refactoring.
+
+Tue Feb 20 15:11:42 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, vm.c, yarvcore.h: move definition of rb_call_super() to
+	  vm.c from eval.c.  change th_call_super() to static function.
+
+Tue Feb 20 15:08:25 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/io/nonblock/test_flush.rb: YARV doesn't raise any errors if
+	  another thread close IO object which current thread is blocking with.
+
+Tue Feb 20 15:03:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (do_select, rb_thread_wait_fd_rw): raise sys error if
+	  errno is not 0 and EBADF.
+
+Mon Feb 19 22:15:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_REPLACE_TYPE): cache convertible type info.
+
+	* intern.h (rb_detach_process): use rb_pid_t instead of pid_t.
+
+	* ruby.h (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM, NUM2GIDT):
+	  defaulted to conversion using long.
+
+Mon Feb 19 17:14:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
 	  message for #peeraddr. a patch from Sam Roberts
 	  <sroberts at uniserve.com>.  [ruby-core:10366]
 
-Mon Feb 19 18:27:42 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Feb 18 22:56:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
-	  load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
-	  a bug where a statically linked extension cannot be autoloaded.
-	  [ruby-dev:30023] / [ruby-dev:30239]
+	* ext/etc/etc.c (etc_getgrgid): missed to replace a macro.
+
+Sun Feb 18 19:33:00 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: updated based on date2 4.0.3.
 
-Thu Feb 15 20:31:07 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Feb 18 13:11:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/uri/ftp.rb: Revert the previous change pending discussion.
+	* configure.in (pid_t, uid_t, gid_t): check if defined.
+
+	* intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
+	  rb_{pid,uid,gid}_t instead of plain int.  [ruby-dev:30376]
+
+	* ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
+	  NUM2GIDT): moved to configure.in.
+
+Fri Feb 16 21:34:33 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* object.c (rb_obj_ivar_set/get/defined): fix to check :@_v/C id.
+
+	* test/testunit/test_testcase.rb: fix to use instance_variable_get()
+	  to access @_result.
+
+Fri Feb 16 20:59:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* intern.h: add a prototype of rb_sym_to_s().
+
+Fri Feb 16 19:24:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (math_log): update document to mention second optional
+	  argument for logarithm base.
+
+Fri Feb 16 19:19:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (mrhs): need to append by arg_append().
+	  [ruby-talk:239385]
 
 Fri Feb 16 11:18:21 2007  Eric Hodel  <drbrain@segment7.net>
 
@@ -1514,30 +54564,108 @@ Fri Feb 16 11:18:21 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
 
-Thu Feb 15 18:10:09 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (glob_helper): Fix the function declaration.
+Thu Feb 15 20:48:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Feb 15 16:55:33 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
+	  workaround. [ruby-core:10259]
 
-	* version.h: Branch off ruby_1_8_6 from ruby_1_8 in preparation
-	  for the forthcoming 1.8.6 release.
+	* win32/win32.c (NtInitialize): call above function.
 
-Thu Feb 15 16:44:14 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Feb 15 16:25:54 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/uri/generic.rb (URI::Generic::userinfo): Considering how
 	  `scheme://user:@...', `scheme://:password@...' and
 	  `scheme://:@...' are parsed, an empty user name or password
 	  should be allowed and represented as it is.
 
-Thu Feb 15 11:46:05 2007  KIMURA Koichi  <hogemuta@gmail.com>
+Thu Feb 15 01:52:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.(c|h), yarvcore.(c|h) (yarvGlobalStateVersion): rename to
+	  ruby_vm_global_state_version.
+
+Thu Feb 15 01:50:26 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/fileutils/test_fileutils.rb (check_singleton): fix to use
+	  symbol instead of string.
+
+	* test/io/nonblock/test_flush.rb: enable tests.
+
+	* test/xmlrpc/test_webrick_server.rb: ditto.
+
+Thu Feb 15 01:43:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/delegate.rb: catch up with class local variable (@_v) spec.
+
+	* lib/singleton.rb: ditto.
+
+Wed Feb 14 22:52:43 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): VC++6 does not
+	  support VT_I8, VT_UI8.
+
+Wed Feb 14 22:10:21 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* configure.in: change stack limit to 2MB from 32MB.
+
+	* win32/Makefile.sub: ditto.
+
+Wed Feb 14 21:39:36 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
+	  autoloads for sha2 classes in favor of handling in
+	  const_missing(), to work around a problem exposed on OS X.
+
+Wed Feb 14 21:19:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.ci (native_thread_create): adjust 4KB (page size)
+	  alignment.
+
+Wed Feb 14 21:12:36 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.ci (CHECK_ERR): call rb_bug()
+	  instead of printf() and exit().
+
+Wed Feb 14 16:48:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/date/format.rb (Date::Format::Bag::method_missing): need not
+	  to use instance variables corresponding each method; use Hash
+	  instead.
 
-	* dir.c, win32/win32.c, win32/dir.h, ruby.h, intern.h: Bring
-	  encoding aware globbing support in from trunk.  Dir.[] and
-	  Dir.glob() can now take many patterns in an array.  Minor fixes
-	  will follow.
+Wed Feb 14 13:12:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Feb 15 11:00:26 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* re.c (reg_operand): allow symbols to be operands for regular
+	  expression matches.
+
+	* string.c (Init_String): allow Symbol#===.
+
+	* lib/date/format.rb (Date::Format::Bag::to_hash): string
+	  added prefixes.
+
+Wed Feb 14 12:58:38 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (do_select): fix to iterate select().
+	  on cygwin/mswin32, iterate in unblocking region.
+
+	* thread.c (rb_thread_select): don't iterate on this function.
+	  (iterate in do_select).
+
+Wed Feb 14 11:39:18 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (set_unblock_function): fix function interface.
+
+Wed Feb 14 11:12:02 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_load.c, yarvcore.h: use rb_vm_t#loaded_features instead of
+	  rb_features (global variable).
+
+	* yarvcore.c: mark rb_vm_t#loaded_features.
+
+Wed Feb 14 08:46:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compile.c (defined_expr): no longer distinguish ordinary local
+	  variables and in-block local variables in defined? value.
+
+Wed Feb 14 03:14:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic::userinfo): should support
 	  empty password.  [ruby-core:10290]
@@ -1545,147 +54673,644 @@ Thu Feb 15 11:00:26 2007  Akinori MUSHA  <knu@iDaemons.org>
 	* lib/uri/generic.rb (URI::Generic::set_password): password can be
 	  cleared by nil.  [ruby-core:10290]
 
-	* lib/uri/common.rb (escape): regard second string argument as a
-	  character set properly. [ruby-dev:27692]
+Wed Feb 14 03:10:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/uri/ftp.rb: Attempt to conform to RFC 1738 with regard to
-	  relative/absolute paths.
+	* parse.y (struct local_vars): no need to warn out-of-scope
+	  variables; remove dnames member from struct.
 
-	* lib/uri: Lovely RDOC patches from mathew (metaATpoboxDOTcom).
+Wed Feb 14 03:04:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Feb 15 10:57:38 2007  Tietew  <tietew@tietew.net>>
+	* parse.y: RVarmap no longer used as yytype; removed.
 
-	* lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
-	  unescaped ampersand.  a patch from Tietew
-	  <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
-	  fixed: [ruby-dev:30289]
+	* parse.y (dyna_push_gen): no longer need return value.
 
-Thu Feb 15 10:48:40 2007  MenTaLguY  <mental@rydia.net>
+	* parse.y (dyna_pop_gen): no longer need argument.
 
-	* ext/thread/thread.c: Handle interrupted waits correctly.
-	  [ruby-bugs:PR#8663]
+	* parse.y (local_push_gen): initialize nofree.
 
-Wed Feb 14 19:22:15 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Feb 14 00:30:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
-	  autoloads for sha2 classes in favor of handling in
-	  const_missing(), to work around a problem exposed on OS X.
+	* ext/socket/socket.c (init_unixsock): path may contain NUL for
+	  abstract unix sockets.  [ruby-core:10288]
 
 Tue Feb 13 02:21:12 2007  Sam Roberts  <sroberts@uniserve.com>
 
 	* io.c (rb_f_syscall): Fix buffer overflow with syscall
 	  arguments.  [ruby-bugs:PR#8541]
 
-Sun Feb 11 07:46:45 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Feb 12 13:57:30 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
-	  a quoted-string in a Content-Disposition value.
+	* ext/win32ole/win32ole.c (ole_variant2val): support VT_I8, VT_UI8.
 
-Sun Feb 11 06:27:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Feb 12 11:48:52 2007  Kouhei Sutou  <kou@cozmixng.org>
 
-	* configure.in, ext/thread/extconf.rb, lib/thread.rb: Add a
-	  configure option `--disable-fastthread', to choose the original,
-	  pure ruby version of the "thread" library instead of the new,
-	  much faster implementation in ext/thread.
+	* lib/rss/dublincore.rb, lib/rss/maker/dublincore.rb: dc_rightses
+	  -> dc_rights_list. dc_rightses still exists for backward
+	  compatibility. [ruby-core:8350]
 
-Sun Feb 11 06:22:20 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/rss/test_maker_dc.rb: added tests for dc_rights_list.
 
-	* ext/Setup: Add thread except for platforms without threads
-	  support.
+Sun Feb 11 22:40:17 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_ptrtype2val): ole_type, ole_type_detail
+	  should not return "VARIANT,VARIANT".
 
-Sun Feb 11 06:15:16 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Feb 11 22:11:05 2007  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/thread/lib/thread.rb: Add a replacement of thread.rb that
-	  loads this extension.
+	* lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#initialize):
+	  kept backward compatibility.
 
-Sun Feb 11 05:39:47 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Feb 11 22:10:08 2007  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/thread.rb: Remove an ineffective part of the code.
+	* lib/rss/parser.rb (RSS::ListenerMixin#start_else_element): used
+	  const_defined? instead of constants.include?.
 
-Sun Feb 11 05:32:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Feb 11 18:47:14 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/thread/thread.c (rb_thread_exclusive): Implement
-	  Thread.exclusive.
+	* ext/win32ole/win32ole.c (ole_val2olevariantdata):
+	  WIN32OLE_VARIANT#new accepts nil when variant type is VT_ARRAY.
 
-Sun Feb 11 05:26:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/win32ole/test_win32ole_variant.rb: ditto.
 
-	* ext/thread/thread.c: Get rid of use of a dummy function.
+	* ext/win32ole/win32ole.c: small refactoring.
 
-Sun Feb 11 01:45:31 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun Feb 11 07:42:25 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
+	  a quoted-string in a Content-Disposition value.
 
-	* ext/thread/thread.c (Init_thread): Define missing aliases:
-	  Queue#enq and SizedQueue#enq.
+Sat Feb 10 20:21:29 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Sat Feb 10 09:27:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* ext/win32ole/win32ole.c: add WIN32OLE#ole_query_interface.
+	  thanks to Mikael Pahmp.
 
-	* ext/win32ole/win32ole.c (ole_variant2val): fix compile error
-	  on VC++.
+	* test/win32ole/test_win32ole.rb: ditto.
 
-Sat Feb 10 07:41:52 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Feb 10 17:46:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
-	  SAFEARRAY pointer is NULL.
+	* common.mk: targets which depend on yarvcore.h now depend on
+	  rubysig.h too.
+
+	* yarvcore.h (rb_vm_t): use rb_atomic_t instead of int.
 
 Sat Feb 10 00:13:11 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: fix typo (TkConfigMethod::__confinfo_cmd,
 	  __conv_keyonly_opts).
 
-Fri Feb  9 20:44:53 2007  Akinori MUSHA  <knu@iDaemons.org>
+Fri Feb  9 12:33:40 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/thread: Make style fixes (mostly de-K&R'ism) to match the
-	  rest of the source code.
+	* thread_win32.ci (w32_show_error_message): renamed to w32_error.
+	  this function do rb_bug().
 
-	* ext/thread: Make USE_MEM_POOLS an extconf option.
+	* thread_win32.ci (w32_set_event, w32_reset_event, w32_close_handle,
+	  w32_resume_thread): added. fix to use these functions instead calling
+	  win32api directly.
 
-Fri Feb  9 20:43:01 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* thread_win32.ci (w32_create_thread): create suspend thread
+	  (caller must call w32_resume_thread()).
 
-	* ext/thread: Import the "fastthread" implementation by MenTaLguY
-	  in the original form.  This module is not hooked into the build
-	  yet since it needs some style fixes and adjustments.
+Fri Feb  9 11:03:40 2007  Koichi Sasada  <ko1@atdot.net>
 
-Fri Feb  9 15:46:09 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/ruby/test_readpartial.rb: tests are working on mswin32/cygwin.
 
-	* ext/bigdecimal: Synchronize with trunk.  Better function
-	  prototypes, removal of a useless method `!=', and document
-	  updates.
+Fri Feb  9 05:08:17 2007  Koichi Sasada  <ko1@atdot.net>
 
-Tue Feb 06 22:06:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+	* thread.c, thread_pthread.ci, thread_win32.ci (thread_start_func_1):
+	  move cleanup function to thread_start_func_2().
 
-        * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
-          imported nkf 2007-01-28.
-          * Fixed: can't decode MIME encode JIS string.
-          * Fixed: Fullwitdh-halfwidth conversion.
-          * Support DoCoMo's and Softbank's EMOJI
-          * Support CP932, CP5022x, eucJP-ms UDC
-          * Support UTF-32 encoding
-          * Support beyond BMP
-          [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]
+	* thread.c, thread_pthread.ci, thread_win32.ci:
+	  add more destruct functions.
+	  (native_thread_destroy() and native_mutex_destroy())
 
-Wed Jan 31 14:52:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* thread_pthread.ci, thread_pthread.h: make native_mutex_* functions
+	  (check error, etc), it's not macro any more.
+
+	* thread_win32.ci (thread_start_func_1): store some values before
+	  running thread (to release these after running thread).
+
+	* thread_win32.ci (native_thread_create): fix spaces.
+
+Thu Feb  8 22:44:04 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_set_safe_array, ole_variant2val,
+	  ole_val_ary2variant_ary): fix WIN32OLE_VARIANT.new bug when
+	  1st argument is empty array, and when 2nd argument is
+	  VT_ARRAY|VT_BYREF.
+
+	* test/win32ole/test_win32ole_variant.rb: ditto.
+
+Thu Feb  8 22:39:09 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvtest/yarvtest.rb: check target command names.
+
+Thu Feb  8 22:31:45 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_clone.rb: fix to current spec
+	  (Module should not be occur many times in ancestors).
+
+Thu Feb  8 22:26:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_string.rb: ("foo" == :foo) and ("foo" === :foo)
+	  should be false.
+
+	* ChangeLog: fix last messages.
+
+Thu Feb  8 22:24:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_module.rb: fix to use Symbol instead of String.
+
+	* test/ruby/test_module.rb: remove space before argument parentheses.
+
+Thu Feb  8 22:02:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/marshaltestlib.rb: eval(sym) -> eval(sym.to_s)
+
+Thu Feb  8 21:35:16 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_propertyputref.rb (setup): fix typo.
+
+	* test/win32ole/test_win32ole_event.rb: should not use
+	  InternetExplorer.gohome to test.
+
+Thu Feb  8 21:02:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (GVL_UNLOCK_RANGE): rename to BLOCKING_REGION().
+
+	* thread.c (rb_thread_run_parallel): rename to
+	  rb_thread_blocking_region().
+
+Thu Feb  8 15:48:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, thread.c: fix to use pthread on cygwin.
+
+	* yarvcore.h, thread.c: move GVL_UNLOCK_BEGIN() and GVL_UNLOCK_END()
+	  from yarvcore.h to thread.c.
+
+	* thread.c: change GVL_UNLOCK_RANGE() arguments
+	  (adding ubf as 2nd argument).
+
+	* thread.c: fix to use polling in select on cygwin and mswin32.
+
+	* thread.c, thread_pthread.ci, thread_win32.ci, yarvcore.h:
+	  rename:
+	  * rb_thread_t#interrupt_function -> unblock_function
+	  * rb_interrupt_function_t -> rb_unblock_function
+	  * some interrupt function name -> ubf_*
+	  * yarv_* -> *
+
+Thu Feb  8 16:08:02 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: fix to use RUNRUBY instead of BASERUBY if possible.
+
+	* common.mk ($(INSNS) rule): remove $(PROGRAM) first.
+
+Thu Feb  8 15:43:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* process.c: fix to use rb_status_line_set/get/clear().
+
+	* eval_intern.h: fix line break.
+
+Thu Feb  8 15:00:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
+	  eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
+	  thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
+	  vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
+	  fix typo (rb_thead_t -> rb_thread_t).
+
+	* eval_intern.h: remove unused definitions.
+
+	* common.mk: fix around vm_opts.h path
+	  and remove harmful argument passed to insns2vm.rb.
+
+Thu Feb  8 03:11:47 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
+	  unescaped ampersand.  a patch from Tietew
+	  <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
+	  fixed: [ruby-dev:30289]
+
+Wed Feb  7 23:25:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (specific_eval): suppress warning.
+
+	* thread_win32.h: undefine _WIN32 on cygwin.  [ruby-dev:30303]
+
+Wed Feb  7 22:41:34 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h: remove UNSUPPORTED() macro.
+
+	* thread.c: fix to define Continuation methods
+	  (they only do rb_notimplement()).
+
+Wed Feb  7 22:33:58 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h, yarvcore.h: remove unused macro definition.
+
+Wed Feb  7 22:30:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c: fixed to use ANSI function style.
+
+Wed Feb  7 09:35:32 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* this commit is a result of refactoring. only renaming functions,
+	  moving definitions place, add/remove prototypes, deleting
+	  unused variables and removing yarv.h.
+	  This commit doesn't change any behavior of ruby/vm.
+
+	* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
+
+	* error.c, eval_intern.h: include yarvcore.h instead yarv.h
+
+	* rename some functions:
+	  * debug.[ch]: debug_*() -> ruby_debug_*()
+	  * iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
+	  * iseq.c: node_name() -> ruby_node_name()
+	  * vm.c: yarv_check_redefinition_opt_method() ->
+	          rb_vm_check_redefinition_opt_method()
+
+	* some refactoring with checking -Wall.
+
+	* array.c: remove rb_ary_ptr() (unused) and remove unused
+	  local variables.
+
+	* object.c: add a prototype of rb_mod_module_exec().
+
+	* eval_intern.h (ruby_cref): set it inline.
+
+	* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
+
+	* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
+
+	* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
+
+	* thread.c: remove raw_gets() function (unused) and fix some format
+	  mismatch (format mismatches have remained yet. this is todo).
+
+	* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
+
+	* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
+
+	* vm.c (rb_svar, rb_backref_get, rb_backref_get,
+	  rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
+
+	* vm.c (yarv_init_redefined_flag): add a prototype and rename
+	  yarv_opt_method_table to vm_opt_method_table.
+
+	* vm.c (rb_thread_eval): moved from yarvcore.c.
+
+	* yarvcore.c: remove unused global variables and fix to use nsdr().
+
+Wed Feb  7 03:39:32 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c, compile.c, compile.h, error.c, eval.c,
+	  eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
+	  eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
+	  process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
+	  vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
+	  yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
+	  * yarv_*_t -> rb_*_t
+	  * yarv_*_struct -> rb_*_struct
+	  * yarv_tag -> rb_vm_tag
+	  * YARV_* -> RUBY_VM_*
+
+	* proc.c, vm.c: move functions about env object creation
+	  from proc.c to vm.c.
+
+	* proc.c, yarvcore.c: fix rb_cVM initialization place.
+
+	* inits.c: change Init_ISeq() order (after Init_VM).
+
+	* ruby.h, proc.c: change declaration place of rb_cEnv
+	  from proc.c to ruby.c.
+
+Tue Feb  6 22:06:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
+	  imported nkf 2007-01-28.
+	  * Fixed: can't decode MIME encode JIS string.
+	  * Fixed: Fullwidth-halfwidth conversion.
+	  * Support DoCoMo's and Softbank's EMOJI
+	  * Support CP932, CP5022x, eucJP-ms UDC
+	  * Support UTF-32 encoding
+	  * Support beyond BMP
+	  [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]
+
+Tue Feb  6 20:36:19 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, lib/rss/parser.rb: followed current Ruby
+	  specification. [ruby-dev:30274]
+
+Tue Feb  6 20:29:44 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, lib/rss/parser.rb: removed needless code for
+	  backward compatibility.
+
+Tue Feb  6 18:43:17 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb: moved fixes for EPIPE to the correct
+	  place. [ruby-core:10204]
+
+Tue Feb  6 16:38:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_opts.h: set properties:
+	  svn:keywords:  Author Date Id Revision
+	  svn:eol-style: native
+
+Tue Feb  6 15:55:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (ivar_i): need to support class local instance
+	  variables.
+
+Tue Feb  6 15:44:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): fix setting is_local flag.
+
+	* yarvtest/test_class.rb: add a test for class local instance variable.
+
+Tue Feb  6 14:15:34 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def: remove (get|set)instancevariable2 and add a
+	  operand is_local to (get|set)instancevariable.
+
+	* yarvtest/test_class.rb: add a test for class local instance variable.
+
+	* parse.y (rb_decompose_ivar2): remove unused variable oid.
+
+	* tool/insns2vm.rb: remove needless require.
+
+Tue Feb  6 11:18:41 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb: check the control connection on EPIPE.
+	  Thanks, Simon Williams. [ruby-core:9547]
+
+Tue Feb  6 11:03:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* complement last commit.
+
+	* common.mk (*.inc): use VPATH.
 
-	* eval.c (rb_iterate): need to PUSH_ITER in proper order.
-	  [ruby-core:10125]
+	* vm_opts.h: renamed from vm_opts.h.base.
+
+Tue Feb  6 10:02:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/insns2vm.rb: use vm_opts.h in VPATH.
+
+Tue Feb  6 03:47:58 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c: support Binding#eval.
+
+	* yarvtest/test_eval.rb: add a test for above change.
+
+Tue Feb  6 03:13:33 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c: refactoring (remove K&R style, move Binding stuffs from
+	  Init_Proc() to Init_Binding()).
+
+Tue Feb  6 01:07:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* intern.h: prepare rb_last_status_get() and rb_last_status_set().
+	  Use these functions instead of rb_last_status ([ruby-dev:30264]).
+
+	* process.c: define above functions.
+
+	* ext/pty/pty.c: use above functions.
+
+	* io.c (pipe_finalize): ditto.
+
+	* process.c: ditto.
+
+Mon Feb  5 21:26:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.h: add a prototype of rb_id2str().
+
+Mon Feb  5 21:06:50 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_thread.c, common.mk: remove eval_thread.c.
+
+	* yarvcore.c: rename cYarvThread to rb_cThread.
+
+	* gc.c: remove YARV_* prefix.
+
+	* gc.h: add an include guard and prototype of rb_gc_set_stack_end().
+
+	* inits.c: fix to ANSI prototype style and reorder Init_*().
+
+	* io.c (pipe_finalize): TODO: comment out last_status.
+
+	* process.c, yarvcore.h: fix to use yarv_vm_t#last_status instead of
+	  rb_last_status and make last_status_get() to access $?.
+
+	* yarvcore.c (vm_mark): mark yarv_vm_t#last_status.
+
+	* ruby.h: add declarations of rb_cISeq and rb_cVM.
+
+	* thread.c: move eval_thread.c codes to thread.c and remove yarv_*
+	  function prefix.
+
+	* thread.c (thread_start_func_2): use yarv_thread_t#first_func if
+	  it is not null.
+
+	* vm.c: fix copyright year.
+
+	* yarvcore.c (Init_vm): rename to Init_VM().
+
+Mon Feb  5 04:09:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_frame_callee): check if prev_cfp can be accessible.
+	  a patch from Yoshinori Sano <yoshinori.sano at gmail.com> in
+	  [ruby-dev:30252].  solves [ruby-dev:30200] and [ruby-core:9856].
+
+Sun Feb  4 20:34:41 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/rss-assertions.rb: removed needless code for backward
+	  compatibility.
+
+Sun Feb  4 02:22:59 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Remove a debug
+	  print.
+
+Sat Feb  3 23:51:58 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (rb_compose_ivar2): function to create a new ivar2
+	  symbol from a symbol and a class.  back-ported from matzruby.
+
+	* parse.y (rb_decompose_ivar2): reverse function of
+	  rb_compose_ivar2().
+
+	* marshal.c (w_symbol): support class local instance variables.
+
+	* marshal.c (r_object0): ditto.
+
+	* compile.c (defined_expr): ditto.
+
+	* compile.c (iseq_compile_each): ditto.
+
+	* insns.def: add two new instructions: getinstancevariable2 and
+	  setinstancevariable2.
+
+Sat Feb  3 23:21:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (setclassvariable): remove unnecessary operand.
+
+	* compile.c (iseq_compile_each): ditto.
+
+	* common.mk (insns_info.inc): add dependency for insns_info.inc.
+
+Sat Feb  3 14:32:58 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_val2olevariantdata, ole_val2variant):
+	  fix the bug of WIN32OLE_VARIANT.new when variant type is
+	  VT_ARRAY.
+
+	* ext/win32ole/sample/excel1.rb: rewrite using WIN32OLE_VARIANT.
+
+	* test/win32ole/test_win32ole.rb: add some test.
+
+	* test/win32ole/test_win32ole_variant.rb: ditto.
+
+Sat Feb  3 03:35:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, */Makefile.sub, common.mk (vmasm): generalized.
+
+	* common.mk (runruby, benchmark, benchmark-each, tbench): use
+	  PROGRAM for the file to be built.
+
+	* proc.c (yarv_proc_alloc): needs return.
+
+	* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
+	  eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
+	  insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
+	  range.c, ruby.h, signal.c, thread.c, thread_win32.ci, vm.c,
+	  vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
+	  fixed indents and non-C90 comments.
+
+	* regenc.h: revert to before YARV.
+
+	* lib/mkmf.rb (create_makefile): make object files depend on
+	  extconf.h even if depend file exists.
+
+Fri Feb  2 23:39:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* common.mk (bin): add more dependency.  a patch from Tadashi
+	  Saito <shiba at mail2.accsnet.ne.jp>.  [ruby-dev:30245]
+
+Fri Feb  2 18:44:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (setclassvariable): remove warn argument.
+
+Fri Feb  2 18:36:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* common.mk (compile.$(OBJEXT)): add config.h to vm.c and
+	  compile.c.
+
+Fri Feb  2 18:27:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: remove duplicated global variables rb_cProc and
+	  rb_cBinding.  [ruby-dev:30242]
+
+Fri Feb  2 00:13:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (SYMBOL_P): make Symbol immediate again for performance.
+
+	* string.c: redesign symbol methods.
+
+Thu Feb  1 23:25:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id2str): store Strings for operator symbols.
+	  [ruby-dev:30235]
+
+Thu Feb  1 21:04:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (assignable_gen): no need to generate NODE_CVDECL.
+
+	* compile.c (iseq_compile_each): no NODE_CVDECL.
+
+Thu Feb  1 20:53:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm.c (eval_get_cvar_base): destination for class variable access
+	  is now strictly innermost surrounding class or module.  warned
+	  if accessed from toplevel.
+
+	* variable.c (rb_cvar_get): new class variable look-up scheme:
+	  1) look up in the class.  2) if the class is singleton attached
+	  to a class (i.e. metaclass) then start look up in the attached
+	  class and its ancestors. 3) otherwise, look-up in ancestors of
+	  the class.
+
+	* eval.c (cvar_cbase): destination for class variable access is
+	  the class/module that holds the method, or cbase outside of
+	  methods.
+
+Thu Feb  1 20:31:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_cvar_set): remove warn argument.
+
+Wed Jan 31 14:52:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
 	  add new test.  [ruby-core:10125]
 
-Tue Jan 30 14:58:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 30 17:01:21 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* string.c (rb_str_sub_bang): calling rb_str_modify() should be just
 	  before actually modifying the string.
 	  fixed: [ruby-dev:30211] (originally reported by zunda)
 
+Tue Jan 30 13:24:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_pred): add Integer#pred corresponding
+	  Integer#succ.  [RCR#5]
+
 Tue Jan 30 12:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: autoconf 2.61 support.  [ruby-core:10016]
 
-Sat Jan 27 15:20:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jan 29 23:52:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* tool/compile.rb: replace YARVCore by VM class.
+
+Mon Jan 29 17:52:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/date/format.rb (Date::Format::Bag::method_missing): add
+	  prefix to avoid making t class-local instance variable.
+
+Mon Jan 29 21:32:37 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE.locale=, WIN32OLE.locale,
+	  WIN32OLE_VARIANT#vartype.
+
+	* test/win32ole/test_win32ole.rb: add test for WIN32OLE.locale=,
+	  WIN32OLE.locale.
+
+	* test/win32ole/test_win32ole_variant.rb: add test for
+	  WIN32OLE_VARIANT#vartype.
+
+Mon Jan 29 14:14:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* tool/parse.rb: replace YARVCore by VM class.
+	  http://d.hatena.ne.jp/ysano2005/20070128
+
+Sun Jan 28 08:41:49 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* parse.y (dyna_var_lookup): should not alter dvar->val not to
-	  destroy living value.  [ruby-core:10076]
+	* ext/win32ole/win32ole.c: refactoring.
 
-	* parse.y (dyna_init): ditto.
+Sat Jan 27 18:36:33 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_val2olevariantdata): bug fix.
+	  WIN32OLE_VARIANT.new check that 1st argument should T_ARRAY
+	  when variant type is VT_ARRAY.
+
+	* test/win32ole/test_win32ole_variant.rb: add some test.
+
+Fri Jan 26 23:55:56 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: bug fix of WIN32OLE_VARIANT when variant
+	  type is VT_BYREF|VT_VARIANT.
+
+	* test/win32ole/test_win32ole_variant_with_ie.rb: ditto.
 
 Fri Jan 26 12:03:39 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -1702,62 +55327,195 @@ Fri Jan 26 12:03:39 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/scrollable.rb: change primary name of modules
 	  [ruby-dev:30080].
 
+Fri Jan 26 07:48:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_init_copy): need to copy internal
+	  structure on clone and dup.  [ruby-dev:30192]
+
+Wed Jan 24 20:34:51 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/ruby/test_iterator.rb: removed a needless workaround.
+
 Wed Jan 24 18:05:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
 	  regexp font-lock bug.  [ruby-talk:235758]
 
-Tue Jan 23 11:02:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
- 	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::read_line):
-
 Tue Jan 23 18:26:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): use == instead
 	  of ===.  [ruby-dev:30176]
 
-Tue Jan 23 10:48:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jan 23 15:39:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* hash.c: added documentation for Hash about how it uses eql? and
-	  hash methods for the keys.  [ruby-core:09995]
+	* Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
+	  setup.mak}: add --with-baseruby configure option.
 
 Mon Jan 22 14:57:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c: fix errors in socket sample code.
 	  [ruby-core:09992]
 
-Sat Jan 13 23:54:48 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Jan 20 21:05:18 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/win32ole/win32ole.c (ole_free, ole_type_free,
-	  olemethod_free, olevariable_free, oleparam_free,
-	  ole_event_free): fix memory leak.  [ruby-core:09846]
+	* ext/win32ole/win32ole.c (fole_s_set_code_page): WIN32OLE.codepage=
+	  accepts installed codepage.
 
-Fri Jan 12 11:13:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/win32ole/test_win32ole.rb (test_s_codepage_changed): ditto.
 
-	* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
-	  convert uid/gid from VALUE. (backport of r11521)
+Sat Jan 20 11:18:49 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Wed Jan 10 18:57:57 2007  Minero Aoki  <aamine@loveruby.net>
+	* ext/win32ole/win32ole.c (ole_invoke, ole_invoke2, ole_propertyput):
+	  modify WIN32OLERuntimeError message.
 
-	* ext/strscan/strscan.c (strscan_do_scan): should set kcode option
-	  before match. [ruby-dev:29914]
+	* test/win32ole/test_win32ole.rb: ditto.
 
-	* test/strscan/test_stringscanner.rb: test it.
+Sat Jan 20 06:45:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* re.c: export kcode_set_option and kcode_reset_option (with "rb_"
-	  prefix).
+	* eval_proc.c (method_receiver): add new method to get the bound
+	  receiver of the method object.  [ruby-talk:234949]
 
-	* intern.h: ditto.
+	* eval_proc.c (method_name): new method to get the name of a
+	  method.
+
+	* eval_proc.c (method_owner): a new method to get the class or
+	  module that defines the method.
+
+Fri Jan 19 17:12:23 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_VARIANT::Empty,
+	  WIN32OLE_VARIANT::Null, WIN32OLE_VARIANT::Nothing.
+
+	* test/win32ole/test_win32ole_variant.rb: ditto.
+
+	* test/win32ole/test_nil2vtempty.rb(test_openSchema): ditto.
+
+Fri Jan 19 06:53:38 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (olevariant_free): fix memory leak.
+
+	* ext/win32ole/win32ole.c (ole_val2olevariantdata):
+	  WIN32OLE_VARIANT.new accepts nil as first argument for some VARIANT
+	  TYPE.
+
+	* test/win32ole/test_win32ole_variant.rb: ditto.
+
+Wed Jan 17 17:31:28 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* some refactoring around yarvcore and proc.
+
+	* eval_proc.c: renamed to proc.c.
+
+	* common.mk: ditto.
+
+	* yarvcore.h, yarvcore.c: rename or remove some global variables
+	  removed: mYarvCore, mYarvInsns
+	  renamed: cYarvISeq -> rb_cISeq,
+	           cYarvProc -> rb_cProc, cYarvBinding -> rb_cBinding
+	  ::YarvCore module is removed and ::YarvCore::VM class becomes ::VM.
+	  And change/remove some functions which added with YARV.
+
+	* compile.c: ditto.
+
+	* eval.c: ditto.
+
+	* iseq.c: ditto.
+
+	* vm.c: ditto.
+
+	* inits.c: rename Init_yarvcore to Init_vm.
+
+	* yarvcore.c, proc.c: move some functions and initialization
+	  from yarvcore.c to proc.c.
+
+	* intern.h, proc.c: add global function rb_binding_new(void).
+
+Tue Jan 16 17:49:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (eval_search_super_klass): rename to search_super_klass() and
+	  use it by th_call_super().
 
-Tue Jan  9 17:45:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* insns.def: ditto.
+
+Tue Jan 16 17:48:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: fix ruby script path.
+
+Tue Jan 16 17:39:44 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block): fix to specify self.
+
+Tue Jan 16 12:12:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* env.h: removed
+
+Tue Jan 16 12:00:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_proc.c (rb_proc_new): added.
+
+	* string.c (sym_to_proc): supported.
+
+	* vm.c (invoke_block, th_invoke_yield, th_invoke_proc): fix to support
+	  rb_proc_new.
+
+	* yarvcore.c: add a test code.
+
+Sat Jan 13 23:24:59 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_free, ole_type_free,
+	  olemethod_free, olevariable_free, oleparam_free,
+	  ole_event_free): fix memory leak.  [ruby-core:09846]
+
+Wed Jan 10 00:10:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_replace): use ptr and len of orig instead of
+	  shared.  fixed: [ruby-dev:30116]
+
+Tue Jan  9 17:48:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_find_file): should not call fpath_check() with NULL.
 	  fixed: [ruby-core:09867]
 
+Tue Jan  9 12:29:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
+	  convert uid/gid from VALUE.
+
+	* ext/etc/etc.c (etc_getpwuid): ditto.
+
 Tue Jan  9 03:54:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_upto): String#upto from empty string makes
-	  inifinite loop.  [ruby-core:09864]
+	  infinite loop.  [ruby-core:09864]
+
+	* string.c (rb_str_upto): use RSTRING_LEN().
+
+Sun Jan  7 18:36:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_stop_timer_thread(), rb_thread_reset_timer_thread(),
+	  rb_thread_start_timer_thread()): added.
+
+	* thread_pthread.ci: add a native_thread_join() and move
+	  rb_thread_reset_timer_thread() definition to thread.c.
+
+	* thread_win32.ci: ditto
+
+	* process.c: fix before_exec(), after_exec() to stop timer thread
+	  (and restart timer thread if exec failed).  and fix to reset
+	  timer thread information when forked child process starts
+	  (to fix [ruby-core:09822]).
+
+Sun Jan  7 18:28:17 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: add a "compare" rule and fix MATZRUBY variable
+
+Sun Jan  7 17:47:16 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole.rb: add test for WIN32OLE#[],
+	  WIN32OLE#[]=.
+
+	* ext/win32ole/win32ole.c: update comment for rdoc of
+	  WIN32OLE#[] and WIN32OLE#[]=.
 
 Sun Jan  7 12:13:26 2007  Eric Hodel  <drbrain@segment7.net>
 
@@ -1772,36 +55530,330 @@ Sun Jan  7 10:32:12 2007  Eric Hodel  <drbrain@segment7.net>
 	* test/rdoc/parsers/test_parse_c.rb:
 	  Test RDoc::C_Parser#do_classes and Rdoc::C_Parser#find_class_comment.
 
-Sun Jan  7 09:33:02 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Jan  7 09:31:18 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb: updated based on date2 4.0.1.
 
+Sat Jan  6 18:46:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline_fast, rb_io_getline): increase lineno
+	  when met the delimiter or EOF.  fixed: [ruby-dev:30081]
+
+	* io.c (prepare_getline_args, rb_io_getline_1): split
+	  preparation of arguments and reading.  [ruby-dev:30085]
+
+Sat Jan  6 13:48:36 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (send): fix to optimize send() with Symbol.
+
+	* yarvtest/test_method.rb: add another test.
+
+Sat Jan  6 13:43:55 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: add PHONY dependency to some rules
+
+Sat Jan  6 11:50:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_read): fix wrong replacement.  [ruby-dev:30070]
+
+Sat Jan  6 09:10:52 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: support direct method dispatch with "send" or "funcall".
+	  This means that "obj.send :m" skips "BasicObject#send" invocation
+	  (method frame creation, etc) and "obj.m" invokes directly.
+	  If you make backtrace, there are no entries of "send" method.
+
+	* compile.c (iseq_specialized_instruction): fix to support above
+
+	* eval.c: ditto (remove "static" from rb_f_send and rb_f_funcall
+
+	* yarvcore.c: ditto (add a external IDs for compiler)
+
+	* yarvcore.h: ditto (add a VM_CALL_SEND_BIT macro)
+
+	* yarvtest/test_method.rb: add tests for above changes
+
+	* eval.c: remove unused "Kernel#send" declaration
+
+Sat Jan  6 08:29:17 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): add
+	  WIN32OLE::VARIANT::VT_EMPTY, WIN32OLE::VARIANT::VT_NULL
+
+	* test/win32ole/test_win32ole_variant_m.rb (test_variant): ditto.
+
+Sat Jan  6 03:49:22 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb: change option format
+
+	* common.mk: ditto
+
+Fri Jan  5 22:21:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_pentomino.rb: use Array#dup instead of
+	  Array#clone
+
+	* benchmark/bmx_temp.rb: removed
+
+	* benchmark/run.rb: use run.rb instead of run_rite.rb
+
+	* common.mk: ditto
+
+	* benchmark/run_rite.rb: removed
+
+	* common.mk: use $(srcdir)/test.rb to run a test program
+	  with "make run"
+
+	* benchmark/bmx_temp.rb: removed and
+	  set svn:ignore (bmx_*.rb) to benchmark/
+
+	* test.rb: set svn:ignore
+
+Fri Jan  5 21:03:08 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvtest/yarvtest.rb: fix to compare results
+
+Fri Jan  5 20:52:56 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, compile.h: add ADD_CALL_RECEIVER() macro.
+
+	* insns.def (send): use GET_SELF() direct if FCALL.
+
+	* eval.c (rb_f_send): check method dispatch type to permit
+	  invoking private method when dispatch type is FCALL/VCALL
+
+	* insns.def (opt_ltlt): remove useless statement.
+
+	* vm.h: remove unused macros.
+
+Fri Jan  5 20:50:31 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run_rite.rb: fix to use readlines instead of
+	  read(...).lines (because 1.8 doesn't have String#lines).
+
+Fri Jan  5 20:28:19 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_win32.ci (rb_thread_reset_timer_thread):
+	  added ([ruby-dev:30086]).
+
+Fri Jan  5 20:20:36 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: add .SUFFIXES rule
+
+Fri Jan  5 15:58:15 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.h (rb_alias): fix to check search result
+
+Fri Jan  5 13:59:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.h (rb_add_method): fix to check old_node
+
+Fri Jan  5 12:03:07 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each, set_block_local_tbl):
+	  support NODE_LAMBDA (partly).
+
+	* sample/test.rb: restore test of NODE_LAMBDA
+
+	* test/ruby/test_lambda.rb: ditto
+
+Fri Jan  5 12:31:23 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* thread_pthread.ci (native_sleep): fix tv_nsec overflow.
+
+Thu Jan  4 20:01:29 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: rename yarv-test-[all/each] to compare-test[/-each].
+	  purpose of "compare-test" rule is to compare ruby (trunk) and
+	  matzruby (branches/matzruby) binary in miniruby level.  MATZRUBY
+	  parameter means an path to miniruby of matzruby binary.  to do this
+	  comparison test, you should build matzruby branch.
+
+	* yarvtest/yarvtest.rb: fix to use command line option as
+	  command names to be compared.
+
+	* yarvtest/runner.rb: remove a debug output.
+
+Thu Jan  4 19:12:27 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: fix to use test.rb script in build directory.
+	  ($(srcdir)/test.rb -> test.rb)
+
+Thu Jan  4 17:28:05 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#initialize):
+	  Arrays could not be modified in its each block. [ruby-dev:30063]
+
+Thu Jan  4 16:57:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* yarv_version.h: removed.
+
+	* common.mk: remove yarv_version.h from rules
+
+	* yarvcore.h (Init_yarvcore): remove useless constants
+
+Thu Jan  4 17:00:06 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (Init_ossl_asn1):
+	  OpenSSL::ASN1::ASN1Data#value,#tag,#tag_class and
+	  OpenSSL::ASN1::BitString#unused_bits should be public.
+
+Thu Jan  4 13:45:10 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.ci: fix last changes around PTHREAD_STACK_MIN.
+
+Thu Jan  4 13:42:47 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: restore changes.
+
+Thu Jan  4 10:33:54 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.ci: fix to skip using PTHREAD_STACK_MIN.
+	  [ruby-dev:30063]
+
+Thu Jan  4 10:30:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run_rite.rb (bm): fix to use lines.
+
+Wed Jan  3 18:49:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_getline): lineno update condition was wrong.
+	  [ruby-dev:30065]
+
+	* io.c (rb_io_getline_fast): ditto.
+
 Wed Jan  3 11:36:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (ruby_dup): start GC on ENOMEM as well.
 
+Tue Jan  2 10:29:54 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c: fix to compile on YARV
+	  ruby_errinfo -> rb_errinfo()
+
+Mon Jan  1 08:07:06 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/tk/tcltklib.c: fix to compile on YARV
+	  ruby_errinfo -> rb_errinfo(),
+	  ruby_safe_level -> rb_safe_level().
+
+Mon Jan  1 07:57:17 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/drb/test_drbssl.rb: fix to skip drb tests.
+
 Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/parsers/c_parser.rb: Make Rdoc accessible.  Update constant
 	  value information.
 
-Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
-
 	* ext/bigdecimal/bigdecimal.c: Update constant comments to provide
 	  values for RDoc.
 
 Mon Jan  1 06:05:55 2007  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts):
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants):
 	  Allow RDoc comment to give friendly value for rb_define_const.  Patch
 	  by Daniel Berger <djberg96 at gmail.com>, [ruby-patches-7499].
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts): Fix
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants): Fix
 	  whitespace handling in constant comments.
 
-Sun Dec 31 00:31:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Jan  1 00:00:00 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* Merge YARV
+
+Sun Dec 31 16:22:48 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c: Fix Array#reject.
+
+Sun Dec 31 00:46:25 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date2.rb: removed.
+
+Sun Dec 31 00:15:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 4.0.
 
+Sat Dec 30 04:38:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_each_with_index): reuse array for yield parameters.
+
+	* enum.c (enum_min, enum_max): ditto.
+
+Sat Dec 30 04:25:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_inject): reuse array for yield parameters.
+
+Sat Dec 30 02:54:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_gets): accepts limit argument.
+
+	* ext/stringio/stringio.c (strio_readline, strio_each,
+	  strio_readlines): ditto.
+
+Sat Dec 30 02:22:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getline): add limit capability.
+
+	* io.c (rb_io_gets_m): accepts limit argument.  [ruby-talk:231563]
+
+	* io.c (rb_io_readline, rb_io_readlines, rb_io_each_line, argf_getline):
+	  ditto.
+
+	* io.c (appendline): add limit capability.
+
+	* io.c (rb_io_getline_fast, rb_io_getline): ditto.
+
+	* io.c (rb_io_getline): small refactoring for DRY.
+
+	* io.c (rb_io_s_foreach, rb_io_s_readlines): small refactoring.
+
+Thu Dec 28 15:27:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie::initialize): use Array() again.
+	  [ruby-core:09781]
+
+Wed Dec 27 20:52:32 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: remove WIN32OLE::PROPERTY class.
+
+	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
+
+Wed Dec 27 10:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_Array): returns 1-element array if the argument
+	  does not have to_ary nor to_a.
+
+Tue Dec 26 21:02:14 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_folderitem2_invokeverb.rb: The argument
+	  of Shell.NameSpace should not be file path.
+
+Tue Dec 26 06:13:08 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/bigdecimal/bigdecimal.c: remove useless method
+	  BigDecimal#!=. [ruby-dev:30050]
+
+Thu Dec 21 15:37:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_slice_bang): rdoc description bug fixed.
+	  [ruby-core:09754]
+
+Wed Dec 20 12:54:31 2006  Koichi Sasada  <ko1@atdot.net>
+
+	* Convert CVS repository to Subversion repository.
+
+Mon Dec 18 08:36:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie::initialize): Array(string) no longer
+	  works.  [ruby-core:09738]
+
+Fri Dec 15 00:19:53 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (COMPILE_RULES): latter rule has higher priority.
+
+	* lib/mkmf.rb (create_makefile): remove static library before update,
+	  to get rid of sludge of Borland tlib.exe.
+
 Thu Dec 14 18:29:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/readline/readline.c: NetBSD editline does not have
@@ -1814,7 +55866,11 @@ Thu Dec 14 18:20:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/irb/locale.rb (IRB::Locale::puts): typo fixed.  a patch from
 	  NAKAMURA Usaku <usa@ruby-lang.org>.  [ruby-dev:30012]
 
-Mon Dec 11 11:58:36 2006  Akinori MUSHA  <knu@iDaemons.org>
+Tue Dec 12 23:33:53 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (Switch#parse_arg, Switch#conv_arg): splat failures.
+
+Mon Dec 11 11:51:10 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/sha2/lib/sha2.rb: Moved one level up from under
 	  the superfluous subdirectory digest/.
@@ -1835,82 +55891,131 @@ Sat Dec  9 21:39:24 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sat Dec  9 11:22:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/irb/locale.rb (IRB::Locale::search_file): ues File.exist?
+	* lib/irb/locale.rb (IRB::Locale::search_file): use File.exist?
 	  instead of File.exists?.  a patch from Yutaka Kanemoto
 	  <kinpoco at gmail.com> in [ruby-dev:30000].
 
+Fri Dec  8 18:11:18 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/optparse.rb: cannot put :nodoc: before method definition.
+	  put after it.
+
+Fri Dec  8 17:00:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bin/rdoc: use File.exist? instead of File.exists?.
+
+Thu Dec  7 23:50:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): new method Dir.exist?(path).
+	  [ruby-core:09663]
+
+	* file.c (Init_File): remove File.exists?; use File.exist?
+	  instead.
+
+	* file.c: rename functions to test_* to rb_file_*_p.
+
 Thu Dec  7 09:29:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/weakref.rb (WeakRef::__setobj__): should support
 	  marshaling.  [ruby-talk:228508]
 
-	* lib/delegate.rb (Delegator::marshal_load): need to call
-	  __setobj__.
-
-Wed Dec  6 23:56:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Dec  6 23:58:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, common.mk (NULLCMD): moved for platforms that empty
 	  command does not run.  fixed: [ruby-dev:29994]
 
-Wed Dec  6 17:17:26 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* win32/win32.c (init_stdhandle): redirect unopened IOs to NUL.
+	  [ruby-core:09572]
 
-	* configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
+Tue Dec  5 19:01:42 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (SITE_DIR): fixed to empty RUBY_SITE_LIB in config.h on
 	  NetBSD.  fixed: [ruby-dev:29358]
 
+Tue Dec  5 18:38:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/matrix.rb (Matrix::rank): use quo method to avoid integer
+	  division problem.  [ruby-core:09644]
+
+	* lib/matrix.rb (Matrix::rank_e): ditto.
+
 Tue Dec  5 00:59:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
 	  self assignment operator, not regex.  [ruby-talk:227324]
 
+Tue Dec  5 00:19:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h, object.c, variable.c (rb_mod_constants): added an optional
+	  flag to search ancestors, which is defaulted to true, as well as
+	  const_defined? and const_get.  [ruby-dev:29989]
+
+Mon Dec  4 23:49:28 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (install_recursive): get rid of warning.
+
+	* lib/optparse.rb (CompletingHash#match): get rid of splat failure.
+
+Mon Dec  4 19:16:39 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb: Do alias << update.
+
 Mon Dec  4 10:48:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h (OFFT2NUM): use LONG2NUM() if sizeof(long) equals to
 	  sizeof(off_t).
 
-Mon Dec  4 10:43:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (dyna_init_gen): dvar initialization only if dvar is
-	  assigned inner block.  [ruby-talk:227402]
-
-Mon Dec  4 08:32:49 2006  Shugo Maeda  <shugo@ruby-lang.org>
+Mon Dec  4 08:32:25 2006  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
 	  boundary. JVN#84798830
 
+Sun Dec  3 16:16:53 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb: Fix problems with update
+	  timing. [Reported by: oss-ruby@technorama.net]
+
+Sat Dec  2 07:33:53 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::FormData::<<):
+	  HTTPUtils::parse_header() takes a string.  [ruby-dev:29931]
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header):
+	  String does no longer have each method.
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_form_data):
+	  ditto.
+
 Sat Dec  2 07:09:04 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be
 	  subclass of OpenSSL::OpenSSLError. [ruby-dev:29980]
 
-Fri Dec  1 17:01:49 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
-	  merge from trunk.
-
 Fri Dec  1 16:31:53 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
 	  [ruby-talk: 227408]
 
-Mon Nov 27 17:18:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov 28 17:25:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): need not to truncate string if no
-	  width specifier given for %s.  [ruby-dev:29952]
+	* array.c (ary_iter_check): should check modification (size
+	  change) during iteration.
 
-Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* array.c (rb_ary_initialize, rb_ary_shift, rb_ary_unshift,
+	  rb_ary_splice, rb_ary_reverse, rb_ary_sort, rb_ary_delete,
+	  rb_ary_delete_at, rb_ary_reject_bang, rb_ary_replace,
+	  rb_ary_clear, rb_ary_fill, rb_ary_uniq_bang, rb_ary_compact,
+	  rb_ary_shuffle): add iteration check.
 
-	* version.h: addition of RUBY_PATCHLEVEL.
-	* version.c: ditto.
-
-Fri Nov 24 10:17:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Nov 27 09:00:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (bignorm): avoid segmentation.  a patch from Hiroyuki
-	  Ito <ZXB01226@nifty.com>.  [ruby-list:43012]
+	* string.c (rb_str_ord): typo fixed.  reported from Kornelius
+	  Kalnbach <murphy@rubychan.de>.  [ruby-core:09621]
 
-Thu Nov 23 10:38:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-	* eval.c (rb_mod_define_method): set implicit visibility only when
-	  it's called for the target class (ruby_cbase).
+	* version.h: addition of RUBY_PATCHLEVEL.
+	* version.c: ditto.
 
 Wed Nov 22 16:00:49 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -1922,28 +56027,57 @@ Wed Nov 22 16:00:49 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/tkutil/extconf.rb: able to be called manually
 	  [ruby-talk:225950].
 
+Sat Nov 18 23:39:20 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_tap): a new method.  [ruby-talk:224013]
+
 Wed Nov 15 23:22:54 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (test_grpowned, rb_stat_grpowned): should honor
 	  supplementary group IDs.  [ruby-core:09546]
 
-Thu Nov  9 03:15:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov  7 18:35:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (BEGIN_CALLARGS): ruby_block may be NULL even when
-	  ITER_PRE.
-
-Tue Nov  7 18:34:34 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest/hmac.rb: Keep this out of the 1.8 tree
-	  until we reach a consensus that HMAC should be put under Digest.
+	* eval.c (formal_assign): need to pack rest arg information in
+	  argc.
 
 Tue Nov  7 18:05:01 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/itemconfig.rb: minor bug fix.
 
-Mon Nov  6 20:11:20 2006  Kouhei Sutou  <kou@cozmixng.org>
+Tue Nov  7 17:52:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_include_module): revert duplicate inclusion of
+	  modules.  [ruby-dev:29793]
+
+Tue Nov  7 17:18:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_missing): update old argument adjustment.
+
+Tue Nov  7 16:41:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/0.9.rb (RSS::Rss): removed needless include.
+	* eval.c (when_check): need to splat for NODE_ARGSCAT as well.
+	  [ruby-dev:29860]
+
+Mon Nov  6 22:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (Init_String): remove duplicated definition of
+	  Symbol#to_s.
+
+Mon Nov  6 18:54:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (svalue_to_avalue): need to splat but no error.
+
+	* eval.c: new macros - YIELD_CALL, YIELD_VALUES.
+
+	* eval.c (rb_yield_values): specify YIELD_VALUES.
+
+	* eval.c (rb_yield_0): use new macros.
+
+	* eval.c (proc_invoke): slightly modified to separate YIELD_CALL
+	  and YIELD_VALUES from YIELD_ARY_ARGS.
+
+	* object.c (Init_Object): add nil.to_splat => [].
 
 Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -1951,9 +56085,9 @@ Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  fix on 'itemconfiginfo' method, and modify to make it easy to
 	  override 'itemconfiginfo' method.
 
-	* ext/tk/lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
+	* ext/tk/lib/tkextlib/tile/treeview.rb: support Tile 0.7.8.
 
-	* ext/tk/lib/tkextlib/version.rb : [new] add Tk::Tkextlib_RELEASE_DATE
+	* ext/tk/lib/tkextlib/version.rb: [new] add Tk::Tkextlib_RELEASE_DATE
 	  to get the information from scripts.
 
 	* ext/tk/lib/tk.rb: load 'tkextlib/version.rb', and update RELEASE_DATE
@@ -1970,14 +56104,17 @@ Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  real console. IRB works on a text widget without I/O blocking. That
 	  is, thread switching on IRB will work properly, even if on Windows.
 
-Sun Nov  5 19:53:49 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Nov  6 00:42:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg_dup_check): vid may be nameless internal id.
+
+Sun Nov  5 19:52:19 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: updated based on date2 3.9.7.
 
-Sat Nov  4 13:13:57 2006  Shugo Maeda  <shugo@ruby-lang.org>
+Sat Nov  4 13:09:31 2006  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
-	  (backported from HEAD)
 
 Fri Nov  3 00:16:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -1985,17 +56122,49 @@ Fri Nov  3 00:16:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  for AIX.  a patch from Yutaka Kanemoto <kinpoco AT gmail.com>.
 	  [ruby-dev:29744]
 
-Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov  2 14:19:44 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-	* parse.y (primary): should set NODE even when compstmt is NULL.
-	  merge from trunk. fixed: [ruby-dev:29732]
+	* lib/set.rb (Set#^): Fix XOR operation against a container that
+	  holds duplicate values. [ruby-core:9372]
 
-Thu Nov  2 14:48:30 2006  Akinori MUSHA  <knu@iDaemons.org>
+Thu Nov  2 10:00:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/set.rb (Set#^): Fix XOR operation against a container that
-	  holds duplicate values. [issue: #6444]
+	* string.c: class Symbol is no longer subclass of String. also
+	  covers [ruby-core:09366]
+
+Thu Nov  2 08:21:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Symbol should
+	  come earlier than String.
+
+	* lib/soap/mapping/rubytypeFactory.rb (RubytypeFactory::obj2soap):
+	  ditto.
+
+	* lib/set.rb (TC_Set::test_s_new): strings are no longer
+	  Enumerable
+
+	* lib/soap/property.rb (Property::load): ditto.
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto.
+
+	* lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto.
+
+Thu Nov  2 09:08:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c: revert lfree shift/unshift boost patch to avoid unknown
+	  memory error.
+
+Wed Nov  1 23:24:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (struct RArray): revert embedding ptr in RVALUE.
+
+	* array.c: ditto.
+
+Wed Nov  1 23:01:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Nov  1 02:41:38 2006  Akinori MUSHA  <knu@iDaemons.org>
+	* string.c (hash): use Bob Jenkins' hash algorithm.
+
+Wed Nov  1 02:22:31 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
 	  optimization.
@@ -2008,8 +56177,6 @@ Wed Nov  1 01:05:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 	* eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.
 	  fixed: [ruby-list:42928]
 
-	* test/ruby/test_super.rb: add tests to check above bug.
-
 Tue Oct 31 17:03:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_dup): duplicate the class of original time.
@@ -2018,6 +56185,11 @@ Tue Oct 31 17:03:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/time.rb (Time::make_time, Time::rfc2822, Time::httpdate):
 	  should respect subclasses.  [ruby-core:09357]
 
+Tue Oct 31 16:25:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (ary_shared_first): should address offset after
+	  ary_shared_array().  [ruby-core:09358]
+
 Mon Oct 30 23:40:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in (miniruby): add XLDFLAGS.
@@ -2029,7 +56201,7 @@ Mon Oct 30 23:40:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
 	  rb_w32_get_environ): not to use GC before initialization.
 
-Mon Oct 30 19:29:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct 30 19:28:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* bignum.c (rb_big2str0): use better approximation.
 
@@ -2042,61 +56214,95 @@ Mon Oct 30 12:34:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_eval): fix commit miss.  [ruby-dev:29707]
 
-Mon Oct 30 12:20:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): a bug in length adjustment.
-
 Mon Oct 30 11:15:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sprintf.c (rb_str_format): should preserve leading zero
 	  information for negative %b and %x.  [ruby-talk:221347]
 
-Thu Oct 26 21:05:58 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Oct 29 19:51:31 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* regexec.c: invalid offset value was used in STATE_CHECK_BUFF_INIT().
+
+Sat Oct 28 20:13:18 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* oniguruma.h: Version 4.4.5
+
+	* regint.h: ditto.
+
+	* regerror.c: ditto.
+
+	* regexec.c: ditto.
+
+	* regcomp.c ditto.
+
+	* regparse.c ditto.
+
+Sat Oct 28 07:56:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object0): missing break.  [ruby-core:09345]
+
+Fri Oct 27 17:30:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enum_each_cons): move RETURN_ENUMERATOR() after
+	  argument check.
+
+Thu Oct 26 21:05:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
 	  (fix http://bugs.debian.org/394336)
 
 	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
 
-Thu Oct 26 15:21:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct 26 15:23:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c: remove by_slice and by_cons.
+
+Thu Oct 26 15:12:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/digest/digest.c (Init_digest): typo.
 
-Wed Oct 25 17:23:28 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest, test/digest/test_digest.rb: Merge from trunk:
-	  - Introduce versioning in Digest::Base API, and prefix C
-	    constants with RUBY_ and C type names with rb_ to avoid name
-	    clash in writing extensions.
-	  - Introduce Digest::Class and Digest::Instance for ease of
-	    implementing subclasses and add-ons.
-	  - Digest::Instance module requires and assumes that any instance
-	    be resettable and clonable.  An instance method #new() is
-	    added so digest instances work just like digest classes.
-	  - The constructor does no longer take an initial string to feed;
-	    digest() and hexdigest() now do, instead.  This allows digest
-	    classes to take their own hashing parameters.
-	  - Make some changes to digest() and hexdigest() class methods,
-	    which now take extra arguments, which are passed through to
-	    the constructor in an internal call.
-	  - Add #digest_length/size/length() and #block_length(),
-	  - Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
-	    SHA384 and SHA512, hoping this module would make a decent
-	    example of a digest subclass written in Ruby.
-	  - Rip BubbleBabble support out of the base class and have a
-	    separate module named digest/bubblebabble.
-	  - Remove RD documents in favor of newly written and embedded
-	    RDoc documentation.
-
-Wed Oct 25 08:03:23 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Oct 25 17:16:05 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/digest/test_digest_hmac.rb: added.
+
+Wed Oct 25 16:34:31 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/test.sh: make this script work again.
+
+Wed Oct 25 07:59:42 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb: updated based on date2 3.9.6.
 	  [ruby-core:09323]
 
-Sun Oct 22 14:48:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 25 00:58:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/mkexports.rb, win32/resource.rb: use unique variable names.
 
-	* signal.c (ruby_signal): don't set SA_RESTART.  a backport from
-	  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]
+Tue Oct 24 19:18:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_by_slice): new method added.
+
+	* enumerator.c (enumerator_by_cons): ditto.
+
+Tue Oct 24 18:56:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enum_each_slice, enum_each_cons): returns
+	  Enumerable::Enumerator if no block is given.  [ruby-dev:29246]
+
+	* enumerator.c: remove methods: enum_with_index, enum_slice,
+	  enum_cons.  [ruby-dev:29246]
+
+Tue Oct 24 18:51:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_zip): add RETURN_ENUMERATOR() to zip method.
+
+Mon Oct 23 04:30:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object0): use return value from proc given as the
+	  second argument to Marshal#load() to allow value replacement in
+	  the restoring data.
+
+Sun Oct 22 14:48:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* signal.c (Init_signal): avoid duplicated installation of SIGCHLD
 	  handler.
@@ -2106,14 +56312,57 @@ Sun Oct 22 16:47:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* string.c (rb_str_substr): should be infected with only original
 	  string, but not the shared string.  fixed: [ruby-core:09152]
 
-	* string.c (rb_str_new4): keep shared string untainted when orignal
+	* string.c (rb_str_new4): keep shared string untainted when original
 	  string is tainted.  fixed: [ruby-dev:29672]
 
+Sun Oct 22 07:55:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upcase, rb_str_downcase, rb_str_downcase,
+	  rb_str_upcase_bang, rb_str_downcase_bang, rb_str_swapcase_bang):
+	  add RDoc description that case conversion to be effective only
+	  in ASCII region.
+
 Sun Oct 22 05:20:34 2006  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
 	* configure.in: alloca is broken; use C_ALLOCA instead.
 	  [ruby-dev:29416]
 
+Sat Oct 21 17:50:40 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest.rb: Follow the framework updates.
+
+Fri Oct 20 22:00:43 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb: Complete half-boiled updates.
+
+	* ext/digest/sha2/lib/digest/sha2.rb: Fix #initialize_clone().
+
+Fri Oct 20 20:28:37 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest: Prefix C constants with RUBY_ and C type names with
+	  rb_ to avoid name clash in writing extensions.
+
+	* ext/digest: Introduce Digest::Class and Digest::Instance for
+	  ease of implementing subclasses and add-ons, inspired by
+	  gotoyuzo.
+
+	* ext/digest: The Digest::Instance module now requires and assumes
+	  that any instance be resettable and clonable, and add some
+	  convenient instance methods such as "new()", for creating a new
+	  copy, parameter taking "digest()" and "hexdigest()", for instant
+	  calculation.  These methods make digest instances work just like
+	  digest classes.
+
+	* ext/digest/sha2/lib/digest/sha2.rb:
+	  Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
+	  SHA384 and SHA512, hoping this module would make a decent
+	  example of a digest subclass written in Ruby.
+
+	* ext/digest/lib/digest.rb: Adjust autoload entries for SHA2
+	  classes.
+
+	* ext/digest/lib/digest/hmac.rb: Follow the framework updates.
+
 Fri Oct 20 10:47:43 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
@@ -2140,10 +56389,39 @@ Wed Oct 18 23:02:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
 	  [ruby-talk:219248]
 
+Wed Oct 18 13:25:50 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_each_line): String#lines now works when a block
+	  is given.  in other words, lines become an alias to each_line.
+	  [ruby-core:09218]
+
+	* string.c (rb_str_each_byte): ditto for bytes in place of lines.
+
 Wed Oct 18 00:55:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_yylex): use particular enums.  [ruby-core:09221]
 
+Tue Oct 17 22:03:08 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/erb.rb: String#each was removed, use #each_line instead.
+
+Tue Oct 17 12:27:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (ary_shared_array): should set NOEMBED flag for a copied
+	  array.
+
+Tue Oct 17 08:04:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_lines): now takes optional argument for the
+	  line separator.
+
+	* io.c (rb_io_lines, rb_io_bytes): new methods.
+
+Mon Oct 16 23:33:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_unshift_m): a bug in lfree shift length
+	  calculation.
+
 Mon Oct 16 08:30:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: *OBJS are not needed for extension libraries.
@@ -2151,6 +56429,11 @@ Mon Oct 16 08:30:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* {bcc32,wince,win32}/Makefile.sub (config.status): fixed typo,
 	  missing comma.
 
+Mon Oct 16 00:44:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_unpack): execute block if given with unpacked value
+	  instead of creating an array.  an idea from Tim Bray.
+
 Sun Oct 15 01:03:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base
@@ -2170,16 +56453,49 @@ Sat Oct 14 23:25:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  contain format specifiers.  a patch from Akinori MUSHA <knu at
 	  iDaemons.org>.  [ruby-dev:29657]
 
+	* regparse.c (onig_rb_warning, onig_rb_warn): ditto.
+
 	* ext/bigdecimal/bigdecimal.c (VpException): ditto.
 
 	* ext/dl/handle.c (rb_dlhandle_initialize): ditto.
 
 	* ext/gdbm/gdbm.c (rb_gdbm_fatal): ditto.
 
-Sat Oct 14 08:24:45 2006  Akinori MUSHA  <knu@iDaemons.org>
+Sat Oct 14 08:15:42 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/digest/lib/digest/hmac: Back out the addition of digest/hmac
-	  for now because the API is too premature for a stable branch.
+	* ext/digest/digest.c, ext/digest/digest.h,
+	  ext/digest/md5/md5init.c, ext/digest/rmd160/rmd160init.c,
+	  ext/digest/sha1/sha1init.c, ext/digest/sha2/sha2init.c:
+	  Introduce API versioning.
+
+	* ext/digest/digest.c, ext/digest/digest.h,
+	  ext/digest/md5/md5init.c, ext/digest/rmd160/rmd160init.c,
+	  ext/digest/sha1/sha1init.c, ext/digest/sha2/sha2init.c: Remove
+	  the constants DIGEST_LENGTH and BLOCK_LENGTH and turn them into
+	  instance methods digest_length() and block_length().  Class
+	  methods with the same names are also provided, which take extra
+	  parameters for a digest method.
+
+	* ext/digest/lib/digest/hmac.rb: Completely redesign the somewhat
+	  bizarre API, now that Digest classes can take hashing
+	  parameters.
+
+Sat Oct 14 05:54:05 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c: Improve RDoc documentation further more.
+
+Sat Oct 14 04:33:33 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c: Improve RDoc documentation.
+
+	* ext/digest/digest.c (Init_digest, rb_digest_base_s_digest,
+	  rb_digest_base_s_hexdigest): Make Digest::Base::digest() and
+	  Digest::Base::hexdigest() take extra arguments, which are passed
+	  through to the constructor in an internal call.
+
+	* ext/digest/bubblebabble/bubblebabble.c
+	  (rb_digest_base_s_bubblebabble): Ditto for
+	  Digest::Base::bubblebabble().
 
 Sat Oct 14 00:55:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -2188,20 +56504,58 @@ Sat Oct 14 00:55:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* bcc32/configure.bat: get rid of a quirk of Borland make, which
 	  sets empty macro in command line to "1".
 
-Fri Oct 13 22:50:43 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Fri Oct 13 22:49:02 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: updated based on date2 3.9.5.
 
-Fri Oct 13 22:33:28 2006  Minero Aoki  <aamine@loveruby.net>
+Fri Oct 13 21:00:01 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest.rb (Digest): Try to auto-load non-standard
+	  digest modules when a specified digest class is missing.
+
+	* ext/digest/lib/digest.rb: Define Digest(name) for ease of
+	  dynamically selecting a hashing algorithm.
+
+Fri Oct 13 20:53:37 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (Init_digest): Digest::Base.new() does no
+	  longer take an initial string to feed.  This change allows
+	  subclasses to take hashing parameters.  A statement such as
+	  ``md = Digest::MD5.new(s)'' can be easily rewritten as
+	  ``md = Digest::MD5.new << s'' or
+	  ``md = Digest::MD5.new.update(s)''.
+
+Fri Oct 13 20:51:55 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c, ext/digest/md5/md5init.c,
+	  ext/digest/rmd160/rmd160init.c, ext/digest/sha1/sha1init.c,
+	  ext/digest/sha2/sha2init.c: Add RDoc documentation.
 
-	* lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is
-	  default in Ruby 1.8.  This line is wrongly removed in last commit.
+	* ext/digest/digest.txt, ext/digest/digest.txt.ja: Removed in
+	  favor of embedded RDoc documentation.
+
+Fri Oct 13 20:38:12 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/bubblebabble, ext/digest/digest.c: Rip BubbleBabble
+	  support out of the base class and have a separate module named
+	  digest/bubblebabble.
+
+Fri Oct 13 19:53:59 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_equal): Again, should call
+	  digest() of a subclass instead of the one defined in the base
+	  class.
 
 Fri Oct 13 18:19:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c: Class#inherited RDoc added.  a patch from Daniel
 	  Berger <djberg96 at gmail.com>  [ruby-core:08942]
 
+Fri Oct 13 02:42:00 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_equal): Should call digest()
+	  of a subclass instead of the one defined in the base class.
+
 Fri Oct 13 02:30:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): prepend
@@ -2218,6 +56572,13 @@ Fri Oct 13 01:48:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/date.rb (Date::self.complete_hash): need to check if g is
 	  nil before dereference.  [ruby-core:09116]
 
+Fri Oct 13 01:05:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_partition): RDoc update.  a patch from
+	  Mauricio Fernandez <mfp at acm.org>.  [ruby-core:09160]
+
+	* hash.c (rb_hash_compare_by_id): ditto.
+
 Fri Oct 13 00:34:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_mod_cvar_defined): wrong id check.  a patch from
@@ -2227,29 +56588,102 @@ Fri Oct 13 00:34:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_mod_cvar_set): ditto.
 
-Wed Oct 11 22:21:41 2006  Akinori MUSHA  <knu@iDaemons.org>
+Thu Oct 12 22:58:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/digest: Merge from trunk; metadata location changed,
-	  Digest::Base#reset() added, Digest::Base#equal() changed, and
-	  digest/hmac added with some modifications made for ruby 1.8.
+	* hash.c (rb_hash_compare_by_id): somehow we lost renaming from
+	  Hash#identical.  [ruby-core:09163]
 
-Tue Oct 10 17:24:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct 12 18:25:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
-	  copy command instead of install. use -run install.
+	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): need to handle new
+	  character literal (1 char string).
+
+	* lib/mkmf.rb: shut up some warnings from tk's extconf.rb.
+
+Thu Oct 12 02:15:24 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb: Make use of String#bytes.
+
+Thu Oct 12 02:12:31 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (get_digest_base_metadata): Use an instance
+	  variable of a class object instead of a class variable for
+	  metadata.  This change is only crucial for ruby 1.8 because
+	  class variables are inherited to subclasses prior to 1.9, but
+	  applying it also to 1.9 will assure compatibilities.
+
+	* ext/digest/md5/md5init.c (Init_md5): Ditto.
+
+	* ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
+
+	* ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
+
+	* ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
+
+Wed Oct 11 21:36:47 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_alloc,
+	  rb_digest_base_equal): Simplify the equality check and just
+	  compare resulted digests since state-level equality should
+	  not be so significant.
+
+	* ext/digest/digest.h: Ditto.
+
+	* ext/digest/*/*.[ch]: Ditto.
+
+Wed Oct 11 17:11:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_obj_define_method): add half boiled RDoc document.
+
+Wed Oct 11 16:57:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Oct 10 16:49:16 2006  Akinori MUSHA  <knu@iDaemons.org>
+	* array.c (rb_ary_replace): should shift lfree pointer before
+	  calling xfree.
+
+Wed Oct 11 15:07:42 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb: Add digest/hmac, which implements
+	  HMAC keyed-hashing algorithm.
+
+Wed Oct 11 15:03:55 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_reset): Do not make
+	  recursive calls, but call initialize() when reset() is not
+	  defined in a subclass.
+
+Wed Oct 11 14:56:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/digest/sha1/sha1ossl.h: libssl 0.9.8c-3 defines no
+	  SHA_BLOCK_LENGTH.
+
+Wed Oct 11 14:03:31 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_reset, Init_digest): Add
+	  Digest::Base#reset.
+
+	* ext/digest/digest.h: Update the header comment.
+
+	* ext/digest/md5/md5ossl.h, ext/digest/md5/md5init.c (Init_md5):
+	  Define DIGEST_LENGTH and BLOCK_LENGTH.
+
+	* ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
+
+	* ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
+
+	* ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
+
+	* ext/digest/depend, ext/digest/extconf.rb: Use $INSTALLFILES
+	  rather than adding make targets. [Pointed out by: nobu]
+
+Tue Oct 10 16:39:08 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new):
 	  Perform StringValue() checks properly.
 
-	* ext/digest/digest.c: Use RSTRING_{PTR,LEN} macros.
-
-Tue Oct 10 13:49:53 2006  Akinori MUSHA  <knu@iDaemons.org>
+Tue Oct 10 13:21:21 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/digest: Merge from trunk; apply all changes since the
-	  initial import, except for the removal of compatibility stub
-	  libraries (md5.rb and sha1.rb).
+	* ext/digest/sha1/depend, ext/digest/sha2/depend: Remove obsolete
+	  dependencies.
 
 Mon Oct  9 23:46:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -2258,6 +56692,11 @@ Mon Oct  9 23:46:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/open3.rb, lib/ping.rb: ditto.
 
+Mon Oct  9 23:40:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb, lib/fileutils.rb, lib/mkmf.rb, lib/optparse.rb,
+	  lib/shellwords.rb: get rid of shadowing outer local variable.
+
 Mon Oct  9 22:56:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/encoding.rb (REXML::Encoding::check_encoding): spaces
@@ -2265,6 +56704,11 @@ Mon Oct  9 22:56:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser): ditto.
 
+Mon Oct  9 01:56:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_obj_define_method): add new method
+	  Kernel#define_singleton_method.  [ruby-list:42851]
+
 Sat Oct  7 23:53:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_scan): small documentation fix.
@@ -2275,15 +56719,95 @@ Sat Oct  7 23:44:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* bignum.c (rb_big_rshift): a bug in right shift of negative
 	  bignums.  [ruby-core:09020]
 
+Sat Oct  7 23:33:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (formal_assign): packed post splat arguments may conflict
+	  with normal arguments.  [ruby-core:09021]
+
+	* eval.c (rb_call0): ditto.
+
+Sat Oct  7 11:53:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_initialize): since module_eval no longer passes
+	  self, use module_exec instead.  fixed: [ruby-dev:29637]
+
 Sat Oct  7 00:27:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* class.c (rb_include_module): remove unnecessary check.
 	  [ruby-talk:218402]
 
-Fri Oct  6 04:30:30 2006  Akinori MUSHA  <knu@iDaemons.org>
+Fri Oct  6 15:19:59 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/depend: Fix header installation when the build
+	  directory is different from srcdir. [Pointed out by: eban]
+
+Fri Oct  6 09:56:31 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
+	  copy command instead of install. use -run install.
+
+Fri Oct  6 06:53:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): small refactoring.
+
+	* parse.y (bparam_item): fixed bugs in handling parenthesized LHS.
+
+Fri Oct  6 04:47:07 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/depend: Install digest.h.
+
+Fri Oct  6 04:27:40 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/md5.rb, ext/digest/lib/sha1.rb: Remove those
+	  compatibility stub libraries.
 
 	* sample/openssl/c_rehash.rb: Use digest/md5 instead of obsolete md5.
 
+Fri Oct  6 04:09:51 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c: Make hexdigest() always call digest() internally.
+
+	* ext/digest/digest.c: Add bubblebabble().
+
+Fri Oct  6 02:38:42 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c: Allow subclassing in Ruby.
+
+Fri Oct  6 02:06:10 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (hexdigest_str_new): Add a string size check.
+
+Thu Oct  5 19:28:35 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.[ch]: Since the argument order of
+	  hash_final_func_t was inconsistent with others, change it and
+	  rename to hash_finish_func_t to avoid confusion.
+
+	* ext/digest/digest.[ch]: Remove and eliminate the use of
+	  hash_end_func_t.  Implement hexdigest conversion in the base
+	  class.
+
+	* ext/digest/md5/md5.c, ext/digest/md5/md5.h,
+	  ext/digest/md5/md5init.c, ext/digest/md5/md5ossl.c,
+	  ext/digest/md5/md5ossl.h: Remove MD5_End() and change
+	  MD5_Final() to MD5_Finish().
+
+	* ext/digest/rmd160/depend, ext/digest/rmd160/extconf.rb,
+	  ext/digest/rmd160/rmd160.c, ext/digest/rmd160/rmd160.h,
+	  ext/digest/rmd160/rmd160hl.c, ext/digest/rmd160/rmd160init.c,
+	  ext/digest/rmd160/rmd160ossl.c, ext/digest/rmd160/rmd160ossl.h:
+	  Remove unused functions RMD160_End(), RMD160_File(),
+	  RMD160_Data() and change RMD160_Final() to RMD160_Finish().
+
+	* ext/digest/sha1/extconf.rb, ext/digest/sha1/sha1.c,
+	  ext/digest/sha1/sha1.h, ext/digest/sha1/sha1hl.c,
+	  ext/digest/sha1/sha1init.c, ext/digest/sha1/sha1ossl.c,
+	  ext/digest/sha1/sha1ossl.h: Likewise.
+
+	* ext/digest/sha2/extconf.rb, ext/digest/sha2/sha2.c,
+	  ext/digest/sha2/sha2.h, ext/digest/sha2/sha2hl.c,
+	  ext/digest/sha2/sha2init.c: Likewise.
+
 Wed Oct  4 18:47:25 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: bugfix and update
@@ -2294,15 +56818,45 @@ Wed Oct  4 17:25:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_call): check protected visibility based on real self,
 	  not ruby_frame->self.  [ruby-talk:217822]
 
+Wed Oct  4 15:46:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (block_param): should interpret single parenthesized
+	  left hand side expression.
+
 Wed Oct  4 08:52:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/optparse/test_getopts.rb: changed the class name of test case
 	  to get rid of conflict with test_optparse.rb.
 
-Tue Oct  3 23:32:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct  3 21:04:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (dyna_in_block): inline using macro.
 
-	* lib/test/unit/testcase.rb (Test::Unit::TestCase.suite): test name
-	  must be string.  fixed: [ruby-core:08978]
+	* parse.y (mlhs): simplifies the rule a bit.
+
+	* parse.y (block_param): restrict block parameters to be local
+	  variables only.
+
+	* test/ruby/test_iterator.rb (TestIterator::test_nested_iterator):
+	  update test suite to conform the last change.
+
+Tue Oct  3 02:31:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (splat_value): use "to_splat" instead of "to_ary" to
+	  prepare splat values as an array.
+
+	* array.c (Init_Array): define to_splat.
+
+	* range.c (range_to_splat): new method.
+
+	* enumerator.c (enumerator_to_splat): ditto.
+
+Tue Oct  3 01:36:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_lines): returns an Enumerator instead of an
+	  array of lines.
+
+	* string.c (rb_str_bytes): a new method.
 
 Mon Oct  2 23:47:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -2314,7 +56868,7 @@ Mon Oct  2 23:47:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
 	  load expanded path.  fixed: [ruby-dev:29621]
 
-Mon Oct  2 15:49:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct  2 15:47:55 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* instruby.rb: batfile should be CRLF'ed.
 
@@ -2338,10 +56892,15 @@ Sun Oct  1 23:12:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#make_switch): pass arguments directly.
 
-Sat Sep 30 15:12:25 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Sep 30 15:11:26 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.4.
 
+Fri Sep 29 13:18:24 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest.rb (Digest): Require digest.so and fix the
+	  breakage.  Point out by NAKAMURA Usaku in [ruby-dev:29619].
+
 Fri Sep 29 12:11:04 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* jcode.rb (succ!): call original succ! if $KCODE == 'n'.
@@ -2366,22 +56925,60 @@ Thu Sep 28 23:59:31 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  win32 regardless if it is implemented.  Provisional fix for
 	  [ruby-core:08917].
 
-Thu Sep 28 20:53:16 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Sep 28 20:49:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/tmpdir.rb: use return value of getdir.call for length.
 
+Wed Sep 27 22:08:16 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/md5/md5init.c (Init_md5): Now that we have digest.rb,
+	  require "digest" rather than "digest.so".
+
+	* ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
+
+	* ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
+
+	* ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
+
+Wed Sep 27 21:21:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_startwith): rename startwith? to start_with?,
+	  endwith? to endwith?, respectively.  [ruby-talk:216685]
+
+Wed Sep 27 13:29:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::TagMaker::nOE_element_def): replace to_s by
+	  join.  some other methods as well.  [ruby-dev:29613]
+
 Wed Sep 27 01:04:49 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (try_func): check function pointer first and macro next.
 
 	* lib/mkmf.rb (have_type): simplified with typedef and sizeof.
 
+Wed Sep 27 00:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_shift): shift/unshift performance boost patch,
+	  based on the patch from Eric Mahurin <eric_mahurin at yahoo.com>.
+	  [ruby-core:05861]
+
+	* array.c (rb_ary_unshift_m): ditto.
+
+	* array.c (ary_make_shared): ditto.
+
+	* array.c (RESIZE_CAPA): ditto.
+
+	* array.c (rb_ary_free): new function to free memory.  code moved
+	  from gc.c.
+
+	* string.c (rb_str_free): ditto.
+
 Tue Sep 26 23:57:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#getopts): use strings as key.
 	  fixed: [ruby-dev:29614]
 
-Tue Sep 26 15:31:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Sep 26 15:29:55 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {win32,wince}/Makefile.sub (CPP): check predefined value.
 
@@ -2391,13 +56988,38 @@ Tue Sep 26 07:55:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  body is shared.  a patch from Kent Sibilev <ksruby at gmail.com>.
 	  [ruby-core:08922]
 
+Mon Sep 25 23:10:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (rb_push_glob): need not to check by FilePathValue().
+	  [ruby-dev:29599]
+
+	* dir.c (dir_globs): ditto.
+
 Mon Sep 25 22:26:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_path_end): skip root directory.  fixed: [ruby-core:08913]
 
+	* lib/mkmf.rb (rm_f): get rid of NUL.
+
 	* lib/mkmf.rb (init_mkmf): set default $LDFLAGS.  Patch by Michal
 	  Suchanek <hramrach at centrum.cz>.  [ruby-talk:216256]
 
+Mon Sep 25 15:06:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/test.rb: "print nil" now prints empty string.
+
+	* test/ruby/test_system.rb (TestSystem::test_system): ditto.
+
+Mon Sep 25 11:26:25 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (recursive_hash): remove unused local variable.
+
+	* parse.y (parser_yylex): ditto.
+
+	* parse.y (rb_gc_mark_symbols): fix unmatched prototype .
+
+	* file.c (rb_get_path): check NUL byte in the path string.
+
 Mon Sep 25 08:14:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_shift): should clear shifting top element.
@@ -2411,19 +57033,25 @@ Mon Sep 25 08:11:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* random.c (rb_f_rand): RDoc typo fix.  a patch from Frederick
 	  Cheung <fred at 82ask.com>.  [ruby-talk:216047]
 
+Sun Sep 24 21:19:24 2006  Guy Decoux  <ts@moulon.inra.fr>
+
+	* gc.c (gc_mark_children): NODE_POSTEXE holds Ruby VALUE.
+	  [ruby-core:08912]
+
 Sun Sep 24 22:28:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* runruby.rb: extension library scripts moved into common directory.
 
-Sun Sep 24 14:59:50 2006  Tanaka Akira  <akr@fsij.org>
+Sun Sep 24 12:10:04 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* node.h (struct thread): ia64 support is broken by sandbox patch.
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
 
-Sun Sep 24 12:11:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Sep 24 06:55:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
+	* io.c (rb_io_print): no special handling for nil as well as puts.
+	  fixed: [ruby-dev:29586]
 
-Sat Sep 23 23:24:57 2006  why the lucky stiff  <why@ruby-lang.org>
+Sun Sep 24 06:25:53 2006  why the lucky stiff  <why@ruby-lang.org>
 
 	* eval.c (rb_thread_save_context, rb_thread_restore_context):
 	  sandbox hook to save and restore sandbox state.
@@ -2432,7 +57060,7 @@ Sat Sep 23 23:24:57 2006  why the lucky stiff  <why@ruby-lang.org>
 
 	* eval.c (rb_thread_kill_bang): Thread#kill! uses the above flag
 	  to circumvent ensure, in order to prevent endless loops.
-	  [ruby-core:08768]
+	  contributed by MenTaLguY. [ruby-core:08768]
 
 	* eval.c (rb_thread_kill): fix Thread#kill docs, which returns
 	  the thread object in all cases.
@@ -2447,14 +57075,40 @@ Sat Sep 23 21:34:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
 	  may be empty.  a patch from Jamis Buck <jamis at 37signals.com>.
 
+Sat Sep 23 20:54:28 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* oniguruma.h: Version 4.4.4
+
+	* regexec.c: ditto.
+
+	* regcomp.c ditto.
+
 Sat Sep 23 08:35:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/ri/ri_options.rb: prevent NameError.  [ruby-dev:29597]
 
-Sat Sep 23 01:04:20 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Sep 23 01:02:57 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.2.
 
+Fri Sep 22 18:07:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_partition): no need to call rb_call_super(),
+	  since String is no longer includes Enumerable.
+
+Fri Sep 22 17:33:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_eql): new method to be used by Hash.
+
+	* hash.c (rb_hash_hash): ditto.
+
+Fri Sep 22 06:53:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_hash): use rb_memhash().
+
+	* numeric.c (flo_hash): simplified.  klass need not to affect
+	  resulting hash value.
+
 Fri Sep 22 02:06:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* .cvsignore: ignore timestamp files and installed list file.
@@ -2463,6 +57117,11 @@ Fri Sep 22 01:36:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb: include FileUtils unconditionally.
 
+Fri Sep 22 00:36:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (Init_Numeric): fix_odd_p and fix_even_p are for Fixnum.
+	  patch from Ondrej Bilka <neleai at seznam.cz>.  [ruby-core:08904]
+
 Thu Sep 21 22:56:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (no-install): not install rdoc actually.
@@ -2473,14 +57132,51 @@ Thu Sep 21 22:56:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: expand ruby executable names.
 
+Thu Sep 21 20:19:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_new3): embed shorter strings more eagerly.
+
+Thu Sep 21 17:44:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_startwith): a new method to check if a string
+	  starts with given prefix.
+
+	* string.c (rb_str_endwith): the opposite of String#startwith?.
+
+Thu Sep 21 16:29:02 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* rubytest.rb: use each_line instead of each.
+
+Thu Sep 21 15:06:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_odd_p): a new method to check even or odd.
+	  [RCR#337]
+
+	* numeric.c (int_even_p): ditto.
+
 Thu Sep 21 13:55:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/etc/etc.c (etc_getpwuid): uid integer should be wraped in
+	* ext/etc/etc.c (etc_getpwuid): uid integer should be wrapped in
 	  uid_t value.  [ruby-core:08897]
 
 	* ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
 	  'int' type.
 
+Thu Sep 21 10:07:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_partition): RDoc typo fixed.  [ruby-core:08898]
+
+	* string.c (rb_str_rpartition): fixed separation seek bug.
+
+Thu Sep 21 09:38:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_lines): new method to split a string into lines.
+
+	* string.c (Init_String): Strings are no longer Enumerable.  use
+	  each_line or lines method explicitly.
+
+	* string.c (Init_String): remove each method. use each_lines.
+
 Wed Sep 20 23:17:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (pre-install-doc): create data directory before install.
@@ -2489,7 +57185,19 @@ Wed Sep 20 23:17:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (install_dirs): remove extra slash.
 
-Wed Sep 20 09:53:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Sep 20 22:41:45 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_mul): typo again.  patch from Tadashi Saito
+	  <shiba at mail2.accsnet.ne.jp>.  fixed: [ruby-core:08893]
+
+Wed Sep 20 19:32:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_partition): a new method to separate the string
+	  by a separator.  taken from Python 2.5.
+
+	* string.c (rb_str_rpartition): ditto.
+
+Wed Sep 20 09:49:40 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define
 	  this macro to install.
@@ -2497,7 +57205,7 @@ Wed Sep 20 09:53:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 Wed Sep 20 09:43:10 2006  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb: allow extra spaces in responses.
-	  Thanks, Tom Soderlund. (backported from HEAD)
+	  Thanks, Tom Soderlund.
 
 Wed Sep 20 09:25:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -2505,13 +57213,6 @@ Wed Sep 20 09:25:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  Adolphs <futzilogik at users dot sourceforge dot net>.
 	  [ruby-doc:1223]
 
-Tue Sep 19 01:28:00 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: backport from HEAD (rev 1.71).
-
-	* lib/fileutils.rb (FileUtils.cp_r): new option
-	  :remove_destination.
-
 Tue Sep 19 00:42:15 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (rb_obj_ivar_defined, rb_mod_cvar_defined): new methods,
@@ -2523,6 +57224,42 @@ Tue Sep 19 00:42:15 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  defined.  fixed: [ruby-dev:29554]
 	  -- This didn't fix anything.
 
+Tue Sep 19 00:07:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_eql): fail early to gain performance.
+
+	* string.c (sym_hash): cache hash value in aux.shared if possible.
+
+	* gc.c (rb_obj_id): no need to treat symbols specially.
+
+	* lib/fileutils.rb (FileUtils::FileUtils): singleton_methods() no
+	  longer return an array of strings, but of symbols.
+
+	* lib/delegate.rb (DelegateClass): ditto.
+
+Mon Sep 18 15:29:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_glob): restore GC protection volatile variable.
+	  [ruby-dev:29588]
+
+	* re.c (rb_reg_regcomp): ditto.
+
+Mon Sep 18 12:16:48 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_mul): get rid of shift overflow.
+
+Mon Sep 18 10:47:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_glob): remove unused variable.
+
+	* math.c (math_log): ditto.
+
+	* re.c (rb_reg_regcomp): ditto.
+
+	* eval.c (break_jump): ditto.
+
+	* eval.c (rb_thread_yield_0): remove unused function.
+
 Sun Sep 17 23:44:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/rdoc.rb (RDoc::RDoc#document): scan only files modified
@@ -2536,11 +57273,18 @@ Sun Sep 17 17:42:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/generators/ri_generator.rb: do not chdir twice.
 
-Sat Sep 16 23:14:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Sep 17 10:42:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_mul): fixed typo.  fixed: [ruby-core:08885]
 
-	* ext/pty/pty.c (establishShell): remove remaining unused line.
+Sat Sep 16 19:47:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Sep 16 16:40:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* README.EXT: should mention new macros: RSTRING_PTR, RSTRING_LEN,
+	  RARRAY_PTR, RARRAY_LEN.
+
+	* README.EXT.ja: ditto.
+
+Sat Sep 16 16:39:23 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, common.in, instruby.rb, ext/extmk.rb, lib/mkmf.rb:
 	  use instruby.rb to install extensions instead of ext/extmk.rb.
@@ -2555,10 +57299,54 @@ Sat Sep 16 16:40:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/pty.c (freeDevice): not used.
 
-	* ext/pty/pty.c (get_device_once): removed garbage right brace.
-
 	* lib/mkmf.rb (checking_for): improved the messages.
 
+Sat Sep 16 11:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (ary_shared_first): should create embedded copies
+	  instead of sharing memory region for smaller arrays.
+
+Sat Sep 16 09:37:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (inspect_struct): do not display a class name for
+	  anonymous struct.  The member fields are sufficient.
+
+Fri Sep 15 20:22:15 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-8/nkf.c: imported nkf 2.0.8 rev.110.
+	  * Fix: check_bom cuts \xfe\xff\xXX\xXX of UTF-32LE.
+	  * Add support --ic=UTF-32.
+	  * Fix: can't guess UTF-16 and UTF-32.
+	  * Fix: can't decode beyond BMP of UTF-16LE.
+
+	* ext/nkf/nkf.c (guess): Support UTF-32.
+
+	* ext/nkf/lib/kconv.rb (kconv): Support UTF-32.
+
+	* ext/nkf/lib/kconv.rb (to_utf32): new method.
+
+Fri Sep 15 05:23:24 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-8/nkf.c: imported nkf 2.0.8 2006-09-15.
+	  Add support for U+10000 - U+10FFFF
+	  Add support UTF-32
+
+Fri Sep 15 00:03:07 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/digest/lib/digest.rb (Digest::Base.file): open a file in binary
+	  mode.  suggested by Kazuhiro NISHIYAMA.  [ruby-dev:29579]
+
+Thu Sep 14 17:21:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_mul): avoid bignum multiplication as far as
+	  possible.  a patch from Ondrej Bilka <neleai at seznam.cz>.
+	  [ruby-core:08825]
+
+Thu Sep 14 16:34:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_intern): allow zero length symbols.
+	  [ruby-core:08861]
+
 Thu Sep 14 16:11:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_intern): raise SecurityError only when $SAFE
@@ -2567,7 +57355,27 @@ Thu Sep 14 16:11:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* parse.y (rb_interned_p): new function to check if a string is
 	  already interned.
 
-	* object.c (str_to_id): use rb_str_intern().
+	* string.c (str_to_id): use rb_str_intern().
+
+Thu Sep 14 14:37:45 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/digest/lib/digest.rb (Digest::Base.file): new method.
+	  [ruby-dev:29572]
+
+Thu Sep 14 08:30:02 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/digest/digest.c (rb_digest_base_inspect): new method.
+	  [ruby-dev:29573]
+
+Thu Sep 14 01:13:56 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
+	  [ruby-dev:29569]
+
+Thu Sep 14 01:02:25 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/digest/lib/digest.rb: new file.
+	  [ruby-dev:28689]
 
 Wed Sep 13 18:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -2584,28 +57392,74 @@ Wed Sep 13 16:43:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_intern): prohibit interning tainted string.
 
-Wed Sep 13 01:14:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Sep 13 01:14:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#getopts): works with pre-registered
 	  options.  [ruby-core:08826]
 
-Sun Sep 10 20:27:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Tue Sep 12 03:58:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_compare_by_identity): rename Hash#identical to
+	  Hash#compare_by_identity.
+
+Mon Sep 11 16:52:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_identical): a new method to make a hash to
+	  compare keys by their identity.
+
+	* hash.c (rb_hash_identical_p): new method to tell if a hash is
+	  identical or not.
+
+	* st.c (st_numcmp, st_numhash): export hash type functions.
+
+Mon Sep 11 11:42:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml/source.rb (REXML::Source::encoding): should not
+	  convert the body twice.  [ruby-core:08828]
+
+	* lib/rexml/encoding.rb (REXML::Encoding::encoding):
+	  Encoding#encoding= to return boolean value to tell if the body
+	  is really converted or not.
+
+	* lib/rexml/encoding.rb (REXML::Encoding::encoding): Specific
+	  conversion library (e.g. rexml/encodings/UTF-16.rb) to have
+	  higher preceding.
+
+	* lib/rexml/encodings/UTF-16.rb (REXML::Encoding::decode_utf16):
+	  UTF-16#decode_utf16 should work strings without BOM.
+
+Mon Sep 11 07:39:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_equal): "sym == str" should compare them as
+	  strings.  [ruby-dev:29554]
+
+Sun Sep 10 22:59:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (parse_args): remove splat.
+
+Sun Sep 10 20:25:30 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.1.
 
-Tue Jan 10 09:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep 10 09:41:29 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (stack_extend): fixed prototype.
+	* file.c: ISPRINT() needs ctype.h
+
+Sun Sep 10 09:19:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: splat parsed arguments.
+
+Tue Jan 10 09:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_require_safe): prevent extension from loading twice.
 	  fixed: [ruby-dev:29523]
 
-Sat Sep  9 23:50:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Sep  9 23:55:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (rb_big_mul0): bignum multiplication without
-	  normalization.
+	* file.c (rb_f_test): test(0) should not have any special
+	  meaning.  [ruby-dev:29425]
 
-	* bignum.c (rb_big_pow): use rb_big_mul0().  [ruby-dev:29547]
+	* file.c (rb_f_test): properer error message.
 
 Sat Sep  9 14:08:38 2006  Eric Hodel  <drbrain@segment7.net>
 
@@ -2617,18 +57471,29 @@ Sat Sep  9 04:55:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/pstore.rb: open all in binary mode, and get rid of the quirk of
 	  msvcrt.  fixed: [ruby-dev:29518]
 
-Sat Sep  9 04:54:42 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep  9 04:47:45 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
 
 	* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
 	  warnings with $VERBOSE.
 
-	* ext/extmk.rb: Proc#call does not pass the block in 1.8.
+	* win32/resource.rb: only file which has more than one icon is DLL.
+
+Fri Sep  8 16:53:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_alloc): should allocate a String object, even when
+	  asked to allocate a Symbol object.  [ruby-dev:29529]
+
+Fri Sep  8 16:36:27 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/resource.rb: add more info.
+	* ext/extmk.rb (extmake): follow Array#to_s.
+
+	* lib/mkmf.rb (create_makefile): ditto.
+
+	* win32/resource.rb: ditto.
 
-Fri Sep  8 10:03:59 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Sep  8 10:00:12 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookies): new
 	  method to parse multiple cookies per Set-Cookie header.
@@ -2640,33 +57505,62 @@ Fri Sep  8 08:59:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
 	  name transform.
 
-Fri Sep  8 01:33:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep  8 08:25:39 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: suppress `assigning void value' warning.
+
+Fri Sep  8 01:16:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (Init_Array): #to_s to be an alias to #inspect.
+	  [ruby-dev:29520]
+
+	* hash.c (Init_Hash): ditto.
+
+	* lib/mkmf.rb (create_makefile): replace "print array" by
+	  "print *array".
+
+	* mkconfig.rb: ditto.
 
-	* ruby.h (RSTRING_PTR): add migration macro.
+Thu Sep  7 21:02:56 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ruby.h (RARRAY_PTR): ditto.
+	* object.c (nil_to_s): returns the empty string again.
+	  [ruby-dev:29520]
 
 Thu Sep  7 23:27:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (path_check_0, fpath_check): disable path check on cygwin.
 	  [ruby-talk:213074]
 
-Wed Sep 06 12:05:19 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Sep  7 02:03:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp
-	  [ruby-dev:29344]
+	* time.c (time_to_s): adopt new date format using digits
+	  e.g. "2006-09-07 02:03:45 +9000".
+
+Thu Sep  7 01:54:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_equal): override.  check equivalence.
+
+Wed Sep  6 13:25:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (symbols_i): need to initialize early-created symbols.
+	  [ruby-dev:29496]
+
+Wed Sep  6 12:05:19 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505]
 
+Tue Sep  5 22:06:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tcltklib.c: use rb_ary_new3() since RARRAY_LEN() is not l-value.
+
+	* ext/tk/tkutil/tkutil.c: use RARRAY_PTR() and RARRAY_LEN() and etc.
+	  fixed: [ruby-dev:29473]
+
 Tue Sep  5 06:47:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (time_to_s): variable declaration after an execution
 	  statement.
 
-Tue Sep  5 05:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_hash): improve collision.  fixed: [ruby-dev:29352]
-
 Tue Sep  5 05:49:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (path_check_0): check if sticky bit is set on parent
@@ -2693,7 +57587,7 @@ Mon Sep  4 21:43:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/dbm/extconf.rb: create makefile according to the result of check
 	  for dbm header.  fixed: [ruby-dev:29445]
 
-Mon Sep  4 21:42:35 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Sep  4 21:39:42 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.
 
@@ -2701,21 +57595,37 @@ Mon Sep  4 21:14:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (time_strftime): include nul character.  fixed: [ruby-dev:29422]
 
-Mon Sep  4 16:29:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Sep  4 16:39:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::out): specify -x option for nkf.
+
+	* lib/cgi.rb (CGI::out): should not convert utf-8 implicitly using
+	  NKF.  it is too Japanese centric.
+
+Mon Sep  4 14:23:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dbm/extconf.rb (db_check): remove debug print.
 
-	* lib/cgi.rb (CGI::out): specify -m0 -x option for nkf.
-	  [ruby-dev:29284]
+Mon Sep  4 06:46:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Sep  4 16:13:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (rb_id2sym): intern if id is attrset_id.
+	  [ruby-dev:29420] [ruby-dev:29447]
 
-	* io.c (pipe_open): command name should not contain null bytes.
-	  [ruby-dev:29421]
+Mon Sep  4 01:25:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* process.c (proc_spawn): ditto.
+	* eval.c (rb_f_local_variables): list symbols.
 
-	* process.c (proc_spawn_n): ditto.
+	* struct.c (rb_struct_s_members_m): ditto.
 
-	* process.c (rb_f_system): ditto.
+	* variable.c (ivar_i): ditto.
+
+	* variable.c (gvar_i): ditto.
+
+	* variable.c (cv_i): ditto.
+
+Sun Sep  3 20:47:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.h (SYMBOL_P): Qnil and Qfalse are not Symbol.
 
 Sun Sep  3 15:32:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -2731,95 +57641,279 @@ Sun Sep  3 04:40:42 2006  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/socket.c: include arpa/inet.h if available.
 
-Sun Sep  3 02:34:55 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Sep  2 23:59:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (Init_String): undef Symbol#new.
+
+	* struct.c (rb_struct_s_def): wrong symbol detection.
+
+Sat Sep  2 23:59:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_to_id): a bug caused by premature optimization.
+
+Sat Sep  2 23:53:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): move symbol related code to string.c
+
+	* string.c (Init_String): Symbol as subclass of String.
+
+	* parse.y (rb_intern2): handle symbol as strings.
+
+	* string.c (str_new): substring of symbols are mere strings, not
+	  symbols.
 
-	* lib/drb/unix.rb (DRbUNIXSocket#close): don't get path if client mode.
-	  [ruby-dev:29417]
+Sat Sep  2 23:37:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Sep  3 01:45:17 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ruby.h (struct RArray): embed small arrays.
+	  (RARRAY_LEN): defined for accessing array members.
+	  (RARRAY_PTR): ditto.
 
-	* lib/drb/acl.rb (ACLEntry#initialize): examine whether '*' is
-	  included before IPAddr.new. [ruby-dev:29406]
+	* array.c: use RARRAY_LEN and RARRAY_PTR.
 
 Sat Sep  2 13:23:01 2006  Tanaka Akira  <akr@fsij.org>
 
 	* common.mk (ia64.o): use the compiler driver to assemble ia64.s
 	  to use appropriate ABI.
 
-Sat Sep  2 03:36:22 2006  Tanaka Akira  <akr@fsij.org>
+Sat Sep  2 12:06:35 2006  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* common.mk, configure.in, defines.h, eval.c, gc.c, main.c,
-	  numeric.c, ruby.h, ia64.s: backport IA64 HP-UX support.
+	* lib/soap/generator.rb (SOAP::SOAPGenerator#encode_tag): do not dump
+	  XML attribute which value is nil.  value "" and nil both were dumped
+	  as 'attr="value"'.  [ruby-dev:29395]
+
+Sat Sep  2 12:00:32 2006  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/csv.rb (CSV::IOReader#initialize): use String#[](pos, len)
+	  instead of String#[](idx) to check utf BOM.  follows String#[](idx)
+	  behavior change of 1.9.
+
+Sat Sep  2 11:47:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should handle when in else clause.  a patch
+	  from Eric Hodel <drbrain at segment7.net>.  [ruby-core:08662]
+
+	* parse.y (primary): wrap with NODE_CASE.  [ruby-core:08663]
+
+Fri Sep  1 22:07:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (RSTRING_EMBED_LEN_MASK): uses 5 bits to support 64bit
+	  environment.  [ruby-dev:29369]
+
+Fri Sep  1 22:02:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_resize): should copy embedded string to
+	  malloc'ed buffer.  a patch from <nobu at ruby-lang.org> in
+	  [ruby-dev:29369].  fixed: [ruby-dev:29368]
+
+	* string.c (rb_str_ord): use %ld specifier since STRING_LEN() is a
+	  long.  [ruby-dev:29369]
+
+Fri Sep  1 21:41:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (socks_init): typo fixed.  a patch from Sven
+	  Klemm <sven at c3d2.de>.  [ruby-core:08770]
+
+Fri Sep  1 14:22:42 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* array.c (rb_ary_shuffle): RDoc fixed.
 
 Fri Sep  1 13:52:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work
 	  on Tcl/Tk8.x.
 
-Thu Aug 31 12:46:55 2006  why the lucky stiff  <why@ruby-lang.org>
+Fri Sep  1 09:32:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex::getc): should not push nil into
+	  reading buffer (@readed).  reported in
+	  <http://jarp.does.notwork.org/diary/200608c.html#200608311>.
+
+Thu Aug 31 23:59:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): follow nil.to_s.
+
+Thu Aug 31 20:50:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): follow nil.to_s.
+
+	* win32/resource.rb: ditto.
+
+Thu Aug 31 20:21:47 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (search_required): use RSTRING_PTR and RSTRING_STR.
+
+	* file.c (test_identical, rb_file_s_truncate): ditto.
+
+	* io.c (pipe_open, rb_io_reopen): ditto.
+
+	* object.c (nil_plus): ditto.
+
+	* process.c (proc_spawn_n, rb_spawn): ditto.
+
+	* util.c (ruby_add_suffix): ditto.
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): ditto.
+
+	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): ditto.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): ditto.
+
+	* ext/tk/stubs.c, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: ditto.
+
+	* ext/win32ole/win32ole.c (ole_val2olevariantdata): ditto.
+
+Thu Aug 31 18:23:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (struct RString): embed small strings.
+	  (RSTRING_LEN): defined for accessing string members.
+	  (RSTRING_PTR): ditto.
+
+	* string.c: use RSTRING_LEN and RSTRING_PTR.
+
+Thu Aug 31 17:16:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_shuffle_bang): new method.
+
+	* array.c (rb_ary_shuffle): ditto.
+
+	* random.c (genrand_real): ditto.
+
+	* random.c (genrand_int32): export the function.
+
+	* random.c (Init_Random): initialize random seed at the
+	  beginning.
+
+Thu Aug 31 13:12:06 2006  why the lucky stiff  <why@ruby-lang.org>
 
 	* eval.c (ruby_init): rename top_cref to ruby_top_cref and export,
 	  along with ruby_cref, for use by the sandbox. [ruby-core:08762]
 
 	* node.h: ditto.
 
+Wed Aug 30 12:01:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_hash): improve collision.
+
+	* string.c (rb_memhash): new generic function to calculate hash value
+	  for memory chunk.
+
 Tue Aug 29 19:10:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* hash.c (rb_hash_s_create): fixed memory leak, based on the patch
 	  by Kent Sibilev <ksruby at gmail.com>.  fixed: [ruby-talk:211233]
 
-Mon Aug 28 11:36:02 2006  Eric Hodel  <drbrain@segment7.net>
+Mon Aug 28 11:29:46 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/rdoc/parsers/parse_rb.rb: Fix typo.  Submitted by
-	  <calamitas at gmail.com>.  [ruby-core:08724]
+	* eval.c, parse.y: Revert.
+	* ext/.document: Add digest.c.
+	* ext/digest/digest.c: Make RDoc show up.
+	* ext/io/wait.c: Fix call-seq in RDoc.
 
-Mon Aug 28 07:53:44 2006  Eric Hodel  <drbrain@segment7.net>
+Mon Aug 28 08:03:20 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
-	  Submitted by Kent Sibilev <ksruby at gmail.com>.  [ruby-core:08392].
+	* ext/.document: Add C files with RDoc.
+	* ext/digest/digest.c: Convert to RDoc.
+	* ext/io/wait.c: ditto.
+	* lib/rdoc/parsers/parse_rb.rb: Fix typo.  Submitted by
+	  <calamitas at gmail.com>.  [ruby-core:08724]
 
-Mon Aug 28 07:25:45 2006  Eric Hodel  <drbrain@segment7.net>
+Mon Aug 28 07:21:47 2006  Eric Hodel  <drbrain@segment7.net>
 
 	* file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
 	  ruby-Bugs-5529.  [ruby-core:08725]
 
-Sat Aug 26 08:07:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Aug 27 21:41:23 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* oniguruma.h: Version 4.4.0
+
+	* regint.h: ditto.
+
+	* regparse.h: ditto.
+
+	* regexec.c: ditto.
+
+	* regcomp.c ditto.
+
+	* regparse.c: ditto.
+
+Sat Aug 26 08:03:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.8.2.
 
-Fri Aug 25 22:32:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 25 21:15:22 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
 
-	* lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
-	  be set with the accessor.  fixed: [ruby-list:42737]
+	* common.mk: add regint.h and oniguruma.h to dependence.
+
+	* ext/strscan/depend: ditto.
 
-Fri Aug 25 17:15:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug 25 20:35:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* stable version 1.8.5 released.
+	* test/wsdl/document/echo.rb: removed.
+
+	* test/wsdl/document/test_rpc.rb: remove echo.rb after test.
+	  [ruby-dev:29337]
 
 Fri Aug 25 17:02:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (gc_sweep): typo fixed.
 
+Fri Aug 25 16:05:50 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (sym_call): check if the receiver is given.
+
+Fri Aug 25 01:10:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_Integer): Integer(nil) should raise TypeError.
+	  [ruby-talk:210205]
+
+	* object.c (nil_to_s): no longer returns empty string but "nil".
+	  [ruby-talk:210205]
+
+	* lib/mkmf.rb: avoid COMMON_HEADERS being nil.
+
+Wed Aug 23 00:25:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
+	  be set with the accessor.  fixed: [ruby-list:42737]
+
+Tue Aug 22 19:21:00 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: parameter `to_addrs' might be an Array,
+	  .flatten is required. [ruby-dev:29316]
+
 Tue Aug 22 18:47:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_method):
 	  rdoc documents C module methods as instance methods. a patch in
 	  [ruby-core:08536].
 
-Sat Aug 19 14:15:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Aug 22 12:35:57 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for
+	  euc-jp [ruby-dev:29344]
 
-	* win32/Makefile.sub (config.status): include winsock2.h instead of
-	  winsock.h when --with-winsock2 is specified.
-	  fixed: [ruby-dev:29296]
+Sun Aug 20 11:46:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_step): also return an enumerator object if no block
+	  is given.
+
+Sat Aug 19 16:47:51 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (hash2named_arg): accept hash argument
+	  of symbol key.
+
+	* test/win32ole/test_win32ole.rb
+	  ditto.
 
 Sat Aug 19 11:28:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_rename): use errno if set properly.
 	  fixed: [ruby-dev:29293]
 
-Sat Aug 19 11:09:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug 18 01:05:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (then): remove semicolon warning.  [ruby-dev:29299]
+	* lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode.  a
+	  patch from Fujioka <fuj at rabbix.jp>.  [ruby-dev:29284]
 
 Thu Aug 17 19:15:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -2830,30 +57924,98 @@ Thu Aug 17 14:47:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb: added rdoc by Daniel Berger.  [ruby-core:08177]
 
-Thu Aug 17 00:39:05 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Aug 16 17:46:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_byte): IO#getc returns one byte string now.
+	  fixed: [ruby-dev:29255]
 
-	* lib/rinda/ring.rb (do_reply): Fix for RingServer fails to find a
-	  TupleSpace when TupleSpace resides in the same ruby process with
-	  RingServer. a patch from Kent Sibilev. [ruby-core:08453]
+Wed Aug 16 17:22:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (pre-install-local): remove unnecessary code.
+	  [ruby-dev:29249]
 
 Wed Aug 16 11:45:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
 	  get rid of bogus implementations on Mac OS X.
 
-Tue Aug 15 19:10:18 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
-	  broken class-level documentation.
-
 Wed Aug 16 11:09:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (set_arg0): fill argv other than the first with an empty
 	  string instead of NULL.
 
-Wed Aug 16 11:08:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug 15 11:21:08 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: support SMTP/SSL.  Thanks Kazuhiro NISHIYAMA.
+
+	* lib/net/smtp.rb: new method SMTP.use_ssl?
+
+	* lib/net/smtp.rb: new method SMTP.enable_ssl.
+
+	* lib/net/smtp.rb: new method SMTP.disable_ssl.
+
+	* lib/net/smtp.rb: new method SMTP.default_ssl_port.
+
+	* lib/net/smtp.rb: new method SMTP.default_tls_port.
+
+	* lib/net/smtp.rb: now SMTP#enable_tls accepts a SSLContext
+	  object, instead of a verity and cert.  [FEATURE CHANGE]
+
+	* lib/net/smtp.rb: new method SMTP.ssl_context.
+
+	* lib/net/smtp.rb: new method SMTP.default_ssl_context.
+
+	* lib/net/smtp.rb: export SMTP.authenticate.
+
+	* lib/net/smtp.rb: export SMTP.auth_plain.
+
+	* lib/net/smtp.rb: export SMTP.auth_login.
+
+	* lib/net/smtp.rb: export SMTP.auth_cram_md5.
+
+	* lib/net/smtp.rb: export SMTP.starttls.
+
+	* lib/net/smtp.rb: export SMTP.helo.
+
+	* lib/net/smtp.rb: export SMTP.ehlo.
+
+	* lib/net/smtp.rb: export SMTP.mailfrom.
+
+	* lib/net/smtp.rb: export SMTP.rcptto.
+
+	* lib/net/smtp.rb: export SMTP.rcptto_list.
+
+	* lib/net/smtp.rb: export SMTP.data.
+
+	* lib/net/smtp.rb: export SMTP.quit.
+
+Sat Aug 12 22:33:06 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* string.c (String#split): Describe grouping behavior.  Patch by Jan
+	  Svitok <jan.svitok at gmail.com>.  [ruby-core:08603]
+
+Sun Aug 13 12:08:02 2006  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.h: removed an excess macro.  fixed: [ruby-dev:29258]
+	* ext/socket/socket.c: ANSIfied.  [ruby-core:08601]
+
+Sat Aug 12 15:55:32 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, bcc32/Makefile.sub, win32/Makefile.sub, win32/dir.h,
+	  win32/win32.c, win32/win32.h: large file support for win32.
+
+Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
+	  ignore C function prototypes.  Patch by Tilman Sauerbeck
+	  <tilman at code-monkey.de>.  [ruby-core:8574]
+	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+	  documented.
+
+Wed Aug  9 16:53:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP::auth_cram_md5): use ord to retrieve
+	  bytes from strings.  a patch from WATANABE Tetsuya
+	  <Tetsuya.WATANABE at nifty.com>.  [ruby-dev:29240]
 
 Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -2861,17 +58023,23 @@ Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  RDoc.  a patch from Eric Hodel <drbrain at segment7.net>.
 	  [ruby-core:08522]
 
-Tue Aug  8 11:32:54 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Aug  8 19:26:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder::get_string):
+	  affected by str[0] returns 1 char string.  [ruby-dev:29223]
 
-	* Makefile.in, common.mk, configure.in: fix for platforms without
-	  rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
-	  [ruby-dev:29215]
+	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder::get_labels):
+	  ditto.
+
+Tue Aug  8 12:28:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg): allow newlines before ternary colon.  [ruby-dev:29189]
 
 Mon Aug  7 17:56:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
 	  ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
-	  incluion of config.h to pacify AIX.  a patch from Yutaka
+	  inclusion of config.h to pacify AIX.  a patch from Yutaka
 	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29197]
 
 Mon Aug  7 15:55:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -2888,33 +58056,58 @@ Mon Aug  7 14:37:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Mon Aug  7 12:05:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* dln.c, eval.c, gc.c, regex.c, ruby.h: shut up AIX alloca
-	  warning.  a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
+	* dln.c, eval.c, gc.c, ruby.h: shut up AIX alloca warning.
+	  a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
 	  [ruby-dev:29191]
 
-Sun Aug  6 20:40:41 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Aug  6 20:34:24 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
 
+Sun Aug  6 17:12:12 2006  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_reopen): STDERR.reopen(open("/dev/tty", "w")) should not
+	  clear FMODE_PREP in STDERR.
+
+Sat Aug  5 22:53:41 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* oniguruma.h: Version 4.2.2
+
+	* regint.h: ditto.
+
+	* regparse.h: ditto.
+
+	* regexec.c: ditto.
+
+	* regcomp.c ditto.
+
+	* regerror.c: ditto.
+
+	* regparse.c: ditto.
+
 Sat Aug  5 17:07:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (top_local_setup): local_vars[-1] should point
 	  ruby_scope itself to protect local_tbl from garbage collection.
 	  [ruby-dev:29049]
 
-Sat Aug  5 13:54:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Aug  5 13:49:43 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (str[fp]time): "%\n" means "\n".
 
-Fri Aug  4 15:21:00 2006  Eric Hodel  <drbrain@segment7.net>
+Fri Aug  4 12:13:22 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* lib: Merge RDoc and .document from HEAD.
+	* lib: Clean up files for RDoc.
+	* lib/.document: Include most of the standard library in RDoc
+	  generation.
+	* lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
+	  Submitted by <ksruby at gmail.com>.  [ruby-core:08392].
 	* lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
 
-Fri Aug  4 19:13:41 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Fri Aug  4 18:59:49 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
 	* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
-	  [ruby-core: 7122].
+	  [ruby-core: 7122]. and support for ruby1.8.X
 
 Fri Aug  4 14:02:14 2006  James Edward Gray II  <james@grayproductions.net>
 
@@ -2927,15 +58120,22 @@ Fri Aug  4 13:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* pack.c (pack_pack): check argument overrun for 'P'.  based on a
 	  patch by rucila <rucila at yahoo.cojp>.  fixed: [ruby-dev:29182]
 
-Tue Aug  1 17:44:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  4 02:42:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (init_stdhandle): assign standard file handles.
+	* sprintf.c (rb_str_format): a bug in %c type check.
+
+Fri Aug  4 01:28:19 2006  Tanaka Akira  <akr@fsij.org>
 
-Tue Aug  1 12:24:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (io_reopen): STDERR.reopen(File.open("/dev/null", "w")) should
+	  not fclose stderr.
 
-	* eval.c (Init_Binding): fix old commit miss.
+Thu Aug  3 15:16:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jul 31 17:08:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* range.c (range_include): should always call Enumerable#include?
+	  (not #===) for non numeric end points.  [ruby-core:08477]
+	  [ruby-core:08496]
+
+Mon Jul 31 16:51:40 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (exit_handler): new function; release winsock and
 	  environment work area.
@@ -2946,7 +58146,7 @@ Mon Jul 31 17:08:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
 	  of GetEnvironmentVariable(), because the latter cannot distinguish
-	  wheather a null environment variable exists or not.
+	  whether a null environment variable exists or not.
 	  fixed: [ruby-talk:205123]
 
 Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
@@ -2955,18 +58155,18 @@ Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
 	  setrlimit may fail with EINVAL.
 	  reported by MIYAMUKO Katsuyuki.  [ruby-dev:29174]
 
-Mon Jul 31 13:38:22 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
-	  for the value of IPv6 address in the Host: header field.
-
 Mon Jul 31 09:22:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h: use ifdef (or defined) for macro constants that may or
 	  may not be defined to shut up gcc's -Wundef warnings.
 	  [ruby-core:08447]
 
-Sun Jul 30 23:26:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 31 13:38:13 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
+	  for the value of IPv6 address in the Host: header field.
+
+Sun Jul 30 23:26:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_call0): trace call/return of method defined from block.
 	  fixed: [ruby-core:08329]
@@ -2988,9 +58188,33 @@ Sat Jul 29 01:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  statement back before the comment block.  a patch from Hugh
 	  Sasse <hgs at dmu.ac.uk>.  [ruby-core:08422]
 
-Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 28 17:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* time.c (time_to_s): fixed format mismatch.
+	* ext/curses/curses.c (NUM2CH, CH2FIX): use single char strings.
+
+Fri Jul 28 14:09:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): fixed typo in cache look-up.  [ruby-dev:29167]
+
+Fri Jul 28 10:41:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): a bug in method cache look-up.
+	  http://www.rubyist.net/~matz/20060720.html#c04
+
+Fri Jul 28 10:19:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): documentation update patch from Jacob
+	  Fugal <lukfugl at gmail.com>.  [ruby-core:08418]
+
+Fri Jul 28 09:41:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_to_s): fixed typo.  [ruby-dev:29162]
+
+Fri Jul 28 00:26:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (domain_check): ANSI style function arguments
+
+	* math.c (math_log): too few argument to domain_check().
 
 Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -3003,6 +58227,10 @@ Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* math.c (math_sqrt): fix documentation flaw.
 
+Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_to_s): fixed format mismatch.
+
 Thu Jul 27 18:12:12 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* time.c: need to declare time_utc_offset.
@@ -3012,23 +58240,19 @@ Thu Jul 27 17:01:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* io.c (io_close): always calls "close" method of the receiver.
 	  [ruby-core:6911] [ruby-core:8112]
 
-Thu Jul 27 16:49:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_to_s): use +0900 style timezone string for local time.
-	  [ruby-dev:29143]
-
 Thu Jul 27 16:41:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
 	  Solaris compiler.  [ruby-core:08114]
 
+	* time.c (time_to_s): use +0900 style timezone string for local time.
+	  [ruby-dev:29143]
+
 Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: add support for as and ASFLAGS.  [ruby-dev:29138]
 
-Wed Jul 26 22:13:45 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: sync with HEAD (rev 1.132).
+Wed Jul 26 21:59:33 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/http.rb (Net::HTTP#post, request_post, request): should
 	  set Content-Type: x-www-form-urlencoded by default.
@@ -3042,21 +58266,37 @@ Wed Jul 26 22:13:45 2006  Minero Aoki  <aamine@loveruby.net>
 	* lib/net/http.rb (Net::HTTPHeader#type_params): wrongly failed
 	  when there's no Content-Type.
 
-Wed Jul 26 18:35:38 2006  Minero Aoki  <aamine@loveruby.net>
+Wed Jul 26 18:38:13 2006  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/strscan/strscan.c: sync with HEAD (rev 1.25).
+	* ext/strscan/strscan.c (strscan_do_scan): always return nil if
+	  p->curr exceeds string size.
 
-	* ext/strscan/strscan.c (strscan_do_scan):
-	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
+Wed Jul 26 18:33:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_eval): rename #invoke_method and
+	  #invoke_functional_method to __send and __send! respectively.
+
+	* eval.c (remove_method): prohibit removing __send and __send!.
+
+	* eval.c (rb_undef): prohibit undef'ing  __send and __send!.
+
+	* eval.c (rb_eval): prohibit redefining  __send and __send!.
+
+	* lib/delegate.rb (Delegator): preserve __send.
 
 Wed Jul 26 18:14:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/pty.c (getDevice): retry once after GC on failure.
 	  [ruby-core:08282]
 
+Wed Jul 26 17:43:20 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c (strscan_do_scan):
+	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
+
 Wed Jul 26 17:28:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
+	* sprintf.c (rb_str_format): prepend ".." to %u for negative bignum,
 	  but not "-".  fixed: [ruby-core:08167]
 
 Wed Jul 26 16:39:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -3074,11 +58314,7 @@ Wed Jul 26 01:02:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: suppress warnings by automake 1.8 or later.
 
-Tue Jul 25 00:30:06 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
-
-Tue Jul 25 14:49:51 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul 25 14:46:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): typo.
 
@@ -3091,13 +58327,6 @@ Mon Jul 24 22:03:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (backtrace): skip frames successive on node and method name.
 
-Mon Jul 24 17:55:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_system): add security check.  [ruby-talk:202947]
-
-	* process.c (rb_f_system): move signal right before fork to avoid
-	  signal handler intervention.
-
 Mon Jul 24 15:51:52 2006  Tanaka Akira  <akr@fsij.org>
 
 	* ext/readline/readline.c (readline_readline): rl_deprep_term_function
@@ -3113,36 +58342,61 @@ Sun Jul 23 22:59:49 2006  Tanaka Akira  <akr@fsij.org>
 	* test/socket/test_unix.rb: disabled on cygwin.
 	  reported by Kouhei Yanagita.  [ruby-dev:29080]
 
+Fri Jul 21 23:57:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): script is never used while recursing.
+
 Fri Jul 21 21:21:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_call0): include funcalled methods in caller list.
 	  fixed: [ruby-core:08290]
 
+Fri Jul 21 17:52:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): "9_e8" should consider "_e8" as
+	  trailing garbage so that it should return 9.0.  [ruby-dev:29088]
+
 Fri Jul 21 12:11:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter before
 	  prepending destdir on DOSISH.
 
+Fri Jul 21 04:17:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): try local method look-up first for fcall, then
+	  normal method look-up.  [ruby-talk:202564]
+
+	* eval.c (rb_get_method_body): save local method cache separately.
+
+	* eval.c (search_method): export info whether method is local or
+	  not.
+
+Thu Jul 20 20:27:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_attr): make Module#attr to be an alias to
+	  attr_reader.  [RCR#331]
+
 Thu Jul 20 15:07:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h: export classes/modules to implement sandbox.
 	  [ruby-core:08283]
 
-Thu Jul 20 00:06:29 2006  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Wed Jul 19 19:40:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/irb/completion.rb: support for completion of numeric
-    	  number. [ruby-dev: 29038]
+	* eval.c (rb_yield_0): should check args_args before lambda
+	  argument check.  [ruby-dev:29029]
 
-Wed Jul 19 23:53:05 2006  Kouhei Sutou  <kou@cozmixng.org>
+Tue Jul 18 23:53:59 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/rss/parser.rb, lib/rss/utils.rb: added documents.
+	* process.c (rb_f_system): shouldn't block SIGCHLD if it's not
+	  exist.
 
 Tue Jul 18 22:10:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* process.c (rb_f_system): block SIGCHLD during the process
 	  execution, like glibc system(3) does.  [ruby-talk:202361]
 
-Tue Jul 18 23:12:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul 18 23:10:43 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (open_ifs_socket): should not use plain malloc.
 
@@ -3153,6 +58407,11 @@ Tue Jul 18 18:05:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* test/ruby/test_float.rb (TestFloat::test_strtod): update test to
 	  conform strtod change.
 
+Tue Jul 18 16:52:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (yield_under_i): argument should be passed in avalue
+	  form.  [ruby-dev:29044]
+
 Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_unpack): propagate association array to copied
@@ -3164,6 +58423,15 @@ Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_pack): taint 'p' packed strings.
 
+Tue Jul 18 15:19:07 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* intern.h (st_foreach_safe): fix prototype.
+
+	* node.h (NODE_LMASK): bigger than long on LLP64.
+
+	* missing/vsnprintf.c (BSD__uqtoa): new function to support LLP64.
+	  all changes are derived from [ruby-dev:29045]
+
 Tue Jul 18 14:03:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/webrick/httpserver.rb (WEBrick::HTTPServer::unmount): remove
@@ -3179,7 +58447,7 @@ Tue Jul 18 10:53:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 Mon Jul 18 00:43:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* util.c (ruby_strtod): stop at dot not followed by digits.
-	  fixed: [ruby-dev:29035]
+	  fixed: [ruby-dev:29036]
 
 Tue Jul 18 00:01:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -3190,23 +58458,23 @@ Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
 	  bug of cygwin 1.5.20.
 
+Mon Jul 17 22:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/io/wait/wait.c (io_ready_p): protoize.
+
 Mon Jul 17 13:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (define_swapx): should not use plain malloc.
 
+	* ext/curses/curses.c (curses_getmouse): ditto.
+
 Mon Jul 17 12:58:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW.
 
-Sat Jul 15 23:50:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 17 11:47:35 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c (rb_require_safe): wait for another thread requiring the same
-	  feature.  fixed: [ruby-core:08229]
-
-Sat Jul 15 01:27:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (has_magic): glob names contain alphabets to enable case fold
-	  search also for directories.  fixed: [ruby-talk:201917]
+	* st.c: still need to include config.h on some platforms.
 
 Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -3214,8 +58482,6 @@ Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  malloc/calloc, to detect memory allocation failure.  see
 	  <http://www.nongnu.org/failmalloc/>.
 
-	* gc.c (rb_memerror): should not raise empty nomem_error.
-
 Fri Jul 14 13:08:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
@@ -3227,10 +58493,6 @@ Fri Jul 14 02:30:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/monitor.rb: document patch from Hugh Sasse <hgs at dmu.ac.uk>.
 	  [ruby-core:08205]
 
-Fri Jul 14 01:09:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (then): error in warning action.
-
 Fri Jul 14 00:10:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_pop): may cause realloc oscillation.  a patch
@@ -3242,15 +58504,23 @@ Thu Jul 13 22:23:56 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
 	  option database for the widget class which includes TkComposite.
 
-Thu Jul 13 20:32:19 2006  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jul 13 00:40:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (FIX2LONG): returns integer of size of VALUE.
+	  [ruby-dev:29024]
+
+	* ruby.h (FIX2ULONG): ditto.
 
-	* lib/rss/parser.rb: updated documents by a patch from
-	  Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
+Wed Jul 12 20:05:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jul 12 13:54:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (f_args): allow post mandatory arguments after optional
+	  arguments.  [ruby-dev:29014]
 
-	* parse.y (then): we'd like to reserve colon here for the future.
-	  warning added.
+	* parse.y (new_args_gen): allow post_args without rest_args.
+
+	* eval.c (formal_assign): ditto.
+
+	* parse.y (new_args_gen): check post argument duplication.
 
 Tue Jul 11 20:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -3265,10 +58535,42 @@ Tue Jul 11 18:00:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: security fix.
 
-Tue Jul 11 17:33:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul 11 17:28:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* string.c (rb_str_dump): need to extend len for \b.
 
+Tue Jul 11 15:29:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_int2big): use SIGNED_VALUE.  [ruby-dev:29019]
+
+	* bignum.c (rb_int2inum, rb_uint2inum): use VALUE sized integer.
+
+	* bignum.c (rb_big2long, rb_big2ulong): ditto.
+
+	* numeric.c (rb_num2long, rb_num2ulong): ditto.
+
+	* numeric.c (check_int, check_uint): ditto.
+
+	* bignum.c (rb_quad_pack): typo fixed.
+
+Tue Jul 11 13:40:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bignorm): sizeof(long) may be smaller than
+	  sizeof(VALUE).  [ruby-dev:29013]
+
+	* ruby.h (FIXNUM_MAX): fixnum may be bigger than long.
+
+	* ruby.h (SIGNED_VALUE): signed integer of size of VALUE.
+
+Mon Jul 10 23:37:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/soap/rpc/proxy.rb (Proxy::Operation::response_doc): remove
+	  splat star from return statements.
+
+	* lib/soap/rpc/proxy.rb (Proxy::Operation::response_obj): retrieve
+	  the first value from the result array if response has only one
+	  value.
+
 Mon Jul 10 22:00:00 2006  Shigeo Kobayashi  <shigek@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c: Allows '_' to appear within
@@ -3312,17 +58614,52 @@ Mon Jul 10 18:46:52 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-jp/widget: ditto.
 
-Mon Jul 10 13:58:40 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Jul 10 17:32:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler. RE-backport from 1.9.
+	* sample/test.rb: update test suites.
 
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
+	* test/ruby/test_assignment.rb (TestAssignment::test_yield): ditto.
 
-	* eval.c (ruby_native_thread_kill): ditto.
+	* test/ruby/test_iterator.rb (TestIterator::test_itertest): ditto.
 
-Mon Jul 10 10:54:14 2006  Ryan Davis  <ryand@zenspider.com>
+Mon Jul 10 14:43:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): remove erroneously restored prot_tag->blkid
+	  initialization.  [ruby-dev:28997]  [ruby-dev:29000]
+
+Mon Jul 10 13:58:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* signal.c (install_nativethread_sighandler): commented out.
+
+Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_clear_cache_for_remove): clear entries for included
+	  module.  fixed: [ruby-core:08180]
+
+Mon Jul 10 02:22:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): should not overwrite block information in
+	  current frame.  [ruby-dev:28957]
+
+	* eval.c (rb_yield_0): retrieve proper block object from the frame
+	  record.
+
+	* eval.c (proc_alloc): return preserved block object if it's
+	  available.
+
+Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.h (st_data_t): use pointer sized integer for st_data_t.
+	  [ruby-dev:28988]
+
+Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
+
+	* lib/mkmf.rb (create_makefile): prevent substitution of macro
+	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
+
+Sun Jul  9 07:58:48 2006  Ryan Davis  <ryand-ruby@zenspider.com>
 
 	* lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
 	  Morikawa including new file suffixes, function support, public
@@ -3342,44 +58679,33 @@ Mon Jul 10 10:54:14 2006  Ryan Davis  <ryand@zenspider.com>
 
 	* lib/pp.rb: minor clarification on exception.
 
-Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul  9 00:54:11 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_clear_cache_for_undef): clear entries for included
-	  module.  fixed: [ruby-core:08180]
+	* eval.c (next_jump): deal with destination of next.
+	  fixed: [ruby-core:08169]
 
-Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul  7 17:49:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* st.h (st_data_t): use pointer sized integer for st_data_t.
-	  [ruby-dev:28988]
+	* string.c (rb_str_ord): extract lower byte.  fixed: [ruby-dev:28980]
 
-Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/jcode.rb (String#succ!): fix for 1.9.  fixed: [ruby-dev:28979]
 
-	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
+Fri Jul  7 14:05:03 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): prevent substitution of macro
-	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
-
-Sun Jul  9 00:54:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (next_jump): deal with destination of next.
-	  fixed: [ruby-core:08169]
+	* win32/Makefile.sub (config.h): define FUNC_STDCALL/FUNC_CDECL.
+	  from [ruby-dev:28970].
 
 Fri Jul  7 00:38:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* hash.c (rb_hash_default): should not call default procedure if
 	  no key is given.  [ruby-list:42541]
 
-Fri Jul  7 00:29:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_mload): a patch from Daniel Berger
-	  <Daniel.Berger at qwest.com>.  [ruby-core:08128]
-
-Thu Jul  6 22:21:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul  6 23:30:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
 	  HZ and CLK_TCK.  fixed: [ruby-talk:200293]
 
-Thu Jul  6 22:17:21 2006  Minero Aoki  <aamine@loveruby.net>
+Thu Jul  6 21:50:06 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
 
@@ -3389,11 +58715,35 @@ Thu Jul  6 22:17:21 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/racc/parser.rb: update coding style.
 
+Wed Jul  5 05:28:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (block_param): should allow block argument after splat
+	  and post splat args.
+
+Wed Jul  5 01:12:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_lambda.rb (TestLambdaParameters::test_lambda_as_iterator):
+	  -> style block no longer available.  [ruby-dev:28958]
+
+Tue Jul  4 21:48:56 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (proc_options): suppress warning on DOSISH.
+
+Tue Jul  4 15:12:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): should not set prot_tag->blkid since it would
+	  never catch breaks at this level.  [ruby-dev:28922]
+
+Tue Jul  4 04:48:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c: ruby 1.9 HEAD 64 bit warnings clean up from
+	  <ville.mattila at stonesoft.com>.   [ruby-core:08120]
+
 Mon Jul  3 19:04:38 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c (ip_make_menu_embeddable): help to make a menu
 	  widget embeddable (pack, grid, and so on) like as a general widget.
-	  However, an embeddable menu may require to be definied some event
+	  However, an embeddable menu may require to be defined some event
 	  bindings for general use.
 
 	* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
@@ -3411,6 +58761,15 @@ Mon Jul  3 14:42:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  from int, and sys/types.h needs to be included before grp.h.
 	  fixed: [ruby-dev:28938]
 
+Mon Jul  3 10:44:01 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (popen_exec): close file descriptors other than standard I/Os.
+	  fixed: [ruby-dev:28924]
+
+Mon Jul  3 05:15:29 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/openssl/test_asn1.c: String#[]= doesn't accept Integer.
+
 Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_inspect): encode \b (\010) for escape.
@@ -3418,15 +58777,34 @@ Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_dump): ditto.
 
-Sun Jul  2 19:17:56 2006  Minero Aoki  <aamine@loveruby.net>
+Sun Jul  2 19:03:30 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/racc/cparse/cparse.c: sync with original code, rev 1.7.
+
+	* ext/racc/cparse/cparse.c: must require version.h to get
+	  RUBY_VERSION_CODE.
+
+Sun Jul  2 18:42:27 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/racc/cparse/cparse.c: sync with original source code, rev
+	  1.6.
+
+	* ext/racc/cparse/cparse.c: do not use rb_iterate to give a block
+	  to the method, use rb_block_call instead. [ruby-dev:28445]
 
-	* ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
+Sun Jul  2 11:22:03 2006  Tanaka Akira  <akr@m17n.org>
 
-	* ext/racc/cparse/cparse.c: use rb_catch instead of rb_iterate.
-	  Giving a block to a Ruby-level method by rb_iterate is obsolete on
-	  Ruby 1.9.  Note that current cparse.c still includes one
-	  rb_iterate call on Ruby 1.8, but it is not a problem (at least
-	  just now).
+	* io.c (io_reopen): STDOUT.reopen(filename, "w+") didn't work.
+	  (rb_io_reopen): STDOUT.reopen(File.open(filename, "w+")) didn't work.
+
+Sat Jul  1 23:55:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (PUSH_FRAME): initialize frame->self.  [ruby-dev:28911]
+
+Sat Jul  1 17:00:42 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/webrick/utils.rb: use Proc#yield instead of Proc#call.
+	  [ruby-dev:28914]
 
 Sat Jul  1 15:15:49 2006  Tanaka Akira  <akr@m17n.org>
 
@@ -3442,6 +58820,34 @@ Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* configure.in: -shared patch from Andrew Morrow
 	  <andrew.c.morrow at gmail.com>.  [ruby-core:08100]
 
+Fri Jun 30 19:35:41 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils._escape): should
+	  use String#ord to get ascii code from the one-character string.
+	  [ruby-dev:28901]
+
+Thu Jun 29 23:56:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark_children): a bug in NODE_BLOCK_PASS marking.
+	  [ruby-dev:28908]
+
+Thu Jun 29 23:04:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: use ARGSPUSH instead of ARGSCAT to prevent too much
+	  splat expansion.
+
+	* eval.c (when_check): need to handle ARGSPUSH as well.
+
+	* eval.c (block_orphan): lambda and proc from method are always
+	  orphan.
+
+	* gc.c (gc_mark_children): proper marking for NODE_LAMBDA.
+
+Thu Jun 29 22:47:30 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (SETUP_ARGS0): avoid GC problem.
+	  [ruby-dev:28902]
+
 Thu Jun 29 18:58:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): fix patch
@@ -3452,16 +58858,51 @@ Thu Jun 29 18:00:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/bigdecimal/bigdecimal.c: add RDoc document.  a patch from
 	  mathew <meta at pobox.com>.   [ruby-core:07050]
 
-Wed Jun 28 15:47:14 2006  Eric Hodel  <drbrain@segment7.net>
+Wed Jun 28 14:53:09 2006  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
 	  [ruby-core:08087]
 
+Wed Jun 28 23:23:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): underscores should appear only
+	  between digits.  [ruby-dev:28891]
+
 Wed Jun 28 19:04:34 2006  Tanaka Akira  <akr@m17n.org>
 
 	* test/socket/test_unix.rb: test_seqpacket_pair removed.
 	  [ruby-dev:28846]
 
+Wed Jun 28 13:51:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (when_check): arbitrary values are allowed after splats.
+	  fixed: [ruby-dev:28879]
+
+Wed Jun 28 09:16:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): remove meaningless else-only case statement
+	  syntax.
+
+Wed Jun 28 08:08:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): problem to handle else part.  [ruby-dev:28873]
+
+Wed Jun 28 01:48:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): support splat in when expression list.
+	  [ruby-dev:28822]
+
+	* eval.c (when_check): a new auxiliary function for case match.
+
+	* eval.c (when_cond): ditto.
+
+Wed Jun 28 01:05:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): should not skip '_' at the beginning
+	  of a string.  [ruby-dev:28830]
+
+	* bignum.c (rb_cstr_to_inum): ditto.
+
 Tue Jun 27 23:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c: RDoc update for =~ method.  a patch from Alex Young
@@ -3474,6 +58915,17 @@ Tue Jun 27 22:47:18 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] sometimes fail to convert
 	  a tcl string to a ruby object if the tcl string includes "\n".
 
+Tue Jun 27 20:05:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (pipe_open): backout unnecessary fix on 2006-06-26.
+	  [ruby-dev:28865]
+
+	* eval.c (rb_yield_0): exact argument number check now done only
+	  for lambda Proc.
+
+	* eval.c (rb_yield_0): add check for number of arguments, if
+	  there's one lambda block parameter.
+
 Tue Jun 27 16:04:05 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
@@ -3486,297 +58938,246 @@ Tue Jun 27 11:36:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
 	  so on.  [ruby-talk:199102]
 
-Mon Jun 26 13:37:27 2006  Eric Hodel  <drbrain@segment7.net>
+Tue Jun 27 10:46:53 2006  Tanaka Akira  <akr@m17n.org>
 
-	* lib/rdoc: Merge from HEAD.
-	  Add options to limit the ri search path.
+	* eval.c (rb_yield_0): avoid core dump.  [ruby-dev:28840]
 
-Tue Jun 27 00:54:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jun 26 11:03:00 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* util.c (powersOf10): constified.
+	* lib/rdoc/ri: Add options to limit the ri search path.
+
+Tue Jun 27 01:31:59 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c (bsock_recv_nonblock): new method
+	  BasicSocket#recv_nonblock.
+	  (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
+	  IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
+	  (unix_recvfrom_nonblock): removed.
+	  UNIXSocket#recvfrom_nonblock is removed.
+
+Tue Jun 27 00:52:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/eventids2.c (token_assoc): added tCHAR, which is not
+	  under 256 now.  fixed: [ruby-dev:28832]
+
+Mon Jun 26 23:42:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (call_trace_func): no check for argument number of the
+	  callback.  fixed: [ruby-dev:28812]
 
 Mon Jun 26 18:37:44 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
 	  deleted on callback.
 
+Mon Jun 26 15:40:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_accept): revert to avoid ambiguity of
+	  argument evaluation order.  [ruby-dev:28861]
+
+	* ext/socket/socket.c (sock_accept_nonblock): ditto.
+
 Mon Jun 26 10:47:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (pipe_open): avoid closing uninitialized file descriptors.
 	  a patch from <tommy at tmtm.org> [ruby-dev:28600]
 
-Mon Jun 26 09:56:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
-
 Sun Jun 25 23:02:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
 
-Sat Jun 24 06:35:00 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c: revert last change.
+Sun Jun 25 17:44:16 2006  Tanaka Akira  <akr@m17n.org>
 
-	* ruby.h: ditto.
+	* parse.y (paren_args): wrap $2 by escape_Qundef because it may be
+	  Qundef.  [ruby-dev:28843]
 
-	* eval.c: ditto.
+Sun Jun 25 17:18:33 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
-	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
-
-Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
+	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
+	  method of word. [ruby-Bugs#3237]
 
-	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
-	  [ruby-dev:28778]
+	* test/win32ole/test_word.rb: ditto.
 
-Wed Jun 21 21:28:32 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Jun 24 23:48:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/date.rb (jd_to_commercial): now works fine even if in
-	  mathn-ized context.
+	* parse.y: replace terminal token names with more descriptive
+	  name, i.e. kEND to keyword_end.  [ruby-list:42477]
 
-Wed Jun 21 17:32:31 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Jun 24 23:37:41 2006  Tanaka Akira  <akr@m17n.org>
 
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler (backport from 1.9).
+	* eval.c (rb_eval): use rb_ary_new2 instead of rb_ary_new4 to avoid
+	  GC problem.
+	  (rb_yield_values): use rb_ary_new2 instead of rb_ary_new4.
 
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
+	* array.c (rb_ary_new4): don't set len as n if contents is not
+	  initialized.  make it safe with GC.
 
-	* eval.c (ruby_native_thread_kill): ditto.
+	  [ruby-dev:28826]
 
-Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 23 23:35:32 2006  Tanaka Akira  <akr@m17n.org>
 
-	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
-	  and Time processing.  [ruby-core:08033]
+	* ruby.h, lib/drb/drb.rb, lib/drb/invokemethod.rb: remove Values class.
+	  [ruby-dev:28805]
 
-Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 23 17:27:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (yylex, reswords): modifier token is no longer returned in
-	  fname state.  [ruby-dev:28775]
+	* eval.c (rb_block_pass): removed.
 
-Wed Jun 21 01:12:46 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (rb_thread_start_1): use rb_proc_yield() instead of
+	  rb_block_pass().  fixed: [ruby-dev:28794]
 
-	* lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
-	  supported date type.
+Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jun 20 22:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
+	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
 
-	* test/rss/test_parser.rb: split parser tests into ...
-	* test/rss/test_parser_1.0.rb: ... RSS 1.0 parsing tests and ...
-	* test/rss/test_parser_2.0.rb: ... RSS 2.0 parsing tests.
+Thu Jun 22 11:47:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jun 20 21:19:06 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* variable.c (rb_mod_name): returns nil for anonymous modules.
+	  [ruby-talk:198440]
 
-	* lib/rss/rss.rb: provided default RSS::Element#children.
+Thu Jun 22 10:31:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/0.9.rb: used default RSS::Element#children.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
+	* string.c (rb_str_aref): "abc"[3] should not return an empty
+	  string but nil.  [ruby-dev:28786]
 
-Tue Jun 20 21:04:33 2006  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
 
-	* lib/rss/rss.rb: provided default RSS::Element#_tags.
+	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
+	  [ruby-dev:28778]
 
-	* lib/rss/0.9.rb: used default RSS::Element#_tags.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
+Wed Jun 21 21:20:31 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Tue Jun 20 20:47:07 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* lib/date.rb (jd_to_commercial): now works fine even if in
+	  mathn-ized context.
 
-	* lib/rss/rss.rb: hide RSS::Element.install_model.
-	  (RSS::Element.install_have_child_element,
-	   RSS::Element.install_have_children_element,
-	   RSS::Element.install_text_element,
-	   RSS::Element.install_date_element): call
-	  RSS::Element.install_model internally.
+Wed Jun 21 17:29:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/rss/0.9.rb: followed new API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* ext/socket/getaddrinfo.c (freeaddrinfo, get_name): fixed typo.
 
-Tue Jun 20 20:18:05 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/tk/tcltklib.c (tcl_eval, tcl_global_eval): ditto.
 
-	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
+	* ext/zlib/zlib.c (rscheck): constified.
 
-	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
-	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
+Wed Jun 21 17:18:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/cipher.rb:
-	  - add constants AES128, AES192, AES256. [ruby-dev:28610]
-	  - reimplement without eval()
+	* lib/pp.rb (PP::PPMethods::seplist): should have preserved
+	  original reference to the array.  [ruby-dev:28747]
 
-	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
+Wed Jun 21 14:35:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
-	  features.
+	* parse.y (block_param): do not use multiple assignment for a sole
+	  block parameter.  [ruby-dev:28710]
 
-	* sample/openssl/cipher.rb: rewrite all.
+	* eval.c (rb_yield_0): pass a raw yielded value to a sole block
+	  parameter if a value is passed by yield.
 
-Sat Jun 19 11:21:46 2006  Eric Hodel  <drbrain@segment7.net>
+	* eval.c (proc_invoke): args may not be an array.
 
-	* lib/test/unit/assertions.rb: Merge RDoc from HEAD.
+	* eval.c (rb_proc_yield): pass original value without wrapping
+	  it in an array.
 
-Tue Jun 20 01:06:57 2006  Kouhei Sutou  <kou@cozmixng.org>
+Wed Jun 21 14:06:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/rss.rb:
-	  - cleanup validation mechanism. Now, #XXX_validation is
-	    needless.
-	  - changed internal variable name RSS::Element::MODEL to
-	    RSS::Element::MODELS.
-	  - RSS::Element.install_model requires uri.
+	* parse.y (method_call): remove (fn)(args) style lambda
+	  invocation, add fn.(args) instead.
 
-	* lib/rss/0.9.rb: followed new validation API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
+	  and Time processing.  [ruby-core:08033]
 
-	* ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
+Wed Jun 21 03:01:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
-	  imported nkf 2.0.7.
+	* eval.c, file.c, etc.: code-cleanup patch from Stefan Huehner
+	  <stefan at huehner.org>.  [ruby-core:08029]
 
-Mon Jun 19 22:31:59 2006  Kouhei Sutou  <kou@cozmixng.org>
+Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/rss.rb:
-	  - provided default #to_s as RSS::Element#to_s.
-	  - removed RSS::Element#other_element.
-	  - RSS::Element#tag requires attributes as Hash instead of Array.
+	* parse.y (reswords): modifier token is no longer returned in fname
+	  state.  fixed: [ruby-dev:28775]
 
-	* lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+Tue Jun 20 23:28:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/2.0.rb: removed #other_element.
+	* ext/extmk.rb (parse_args): provisional catch-up for the recent changes.
 
-Mon Jun 19 22:09:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* lib/optparse.rb (OptionParser::List#summarize, OptionParser#order!): ditto.
 
-	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
-	  method of word. [ruby-Bugs#3237]
+Tue Jun 20 11:07:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/win32ole/tests/test_word.rb: ditto.
+	* eval.c (proc_invoke): intercept break and return from lambda
+	  Proc objects.  [ruby-dev:28742]
 
-	* ext/win32ole/tests/testall.rb: ditto.
+	* eval.c (proc_invoke): remove unnecessary YIELD_PROC_CALL flag.
 
-Mon Jun 19 00:02:17 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (YIELD_EXACT_ARGS): renamed from YIELD_LAMBDA_CALL, which
+	  is no longer related to the behavior turned on by this flag.
 
-	* lib/rss/rss.rb: automatically detected attributes.
+	* eval.c (return_jump): no need to care about PROT_YIELD.
 
-	* lib/rss/0.9.rb: removed #_attrs.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* eval.c (break_jump): no jump to toplevel PROT_THREAD tag.
 
-	* lib/rss/parser.rb: followed new internal API.
+	* eval.c (rb_yield_0): fix confusion between lambda (which is a
+	  property of a proc) and pcall (which depends on whether it's
+	  called via yield or call).
 
-Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_thread_yield): no need to specify YIELD_LAMBDA_CALL.
 
-	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
+	* eval.c (rb_block_pass): update blkid in prot_tag.
 
-Sun Jun 18 22:36:13 2006  Kouhei Sutou  <kou@cozmixng.org>
+Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rss/rss.rb: RSS::Element#initialize accepts initial
-	  attributes.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	  * ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
 
-	* lib/rss/utils.rb: added Utils.element_initialize_arguments? to
-	  detect backward compatibility initial arguments.
+	  * ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
+	    imported nkf 2.0.7.
 
-	* lib/rss/parser.rb: user initial attributes to initialize
-	  RSS::Element.
+Mon Jun 19 17:02:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jun 18 18:24:42 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* sample/test.rb (proc_return3): return within non lambda block
+	  should terminate surrounding method.  [ruby-dev:28741]
 
-	* lib/rss/converter.rb: use NKF for Uconv fallback.
+Mon Jun 19 13:22:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jun 18 18:22:04 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/socket/socket.c (unix_sysaccept): typo fixed.
 
-	* test/rss/test_image.rb: shared name space configuration.
+	* ext/socket/socket.c (sock_connect): remove an unused local
+	  variable tmpaddr.
 
-Sun Jun 18 18:13:25 2006  Kouhei Sutou  <kou@cozmixng.org>
+Mon Jun 19 02:10:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/rss.rb: improved ignore_unknown_element
-	  handling. RSS::NotExpectedTagError provides tag URI.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* ext/socket/socket.c (tcp_accept_nonblock): forgot to remove
+	  abandoned hacks.  [ruby-dev:28740]
 
-	* test/rss/rss-assertions.rb: checked URI of not expected tag too.
-	* test/rss/test_parser.rb: ditto.
+Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Sun Jun 18 18:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
 
-	* lib/rss/rss.rb: changed empty namespace URI representation to ""
-	  from nil.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
+Sun Jun 18 20:28:43 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Sun Jun 18 18:03:50 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/win32ole/win32ole.c (fole_methods): The return value
+	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
 
-	* lib/rss/parser.rb: removed a guard for requiring open-uri.
+	* ext/win32ole/win32ole.c (fole_put_methods): The return value
+	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
 
-Sun Jun 18 18:01:26 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* test/win32ole/test_ole_methods.rb: ditto.
 
-	* lib/rss/rss.rb: fixed typo: except -> expect
-	* lib/rss/parser.rb: ditto.
-	* test/rss/rss-assertions.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
+	* ext/win32ole/win32ole.c (ole_propertyput): support
+	  PROPERTYPUTREF. [ruby-talk:183042]
 
-Sun Jun 18 17:52:39 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* test/win32ole/test_propertyputref.rb: ditto.
 
-	* lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+Sat Jun 17 23:42:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
-	* test/rss/test_2.0.rb: ditto.
+	* eval.c (Init_eval): add aliases invoke_method and
+	  invoke_functional_method corresponding send and funcall
+	  respectively.  [ruby-talk:197512]
 
-Sun Jun 18 00:49:11 2006  Tanaka Akira  <akr@m17n.org>
+	* parse.y (parser_yylex): returns the most typical keyword token
+	  on EXPR_FNAME.  [ruby-core:7995]
 
-	* ext/socket/socket.c (bsock_recv_nonblock): new method
-	  BasicSocket#recv_nonblock.
-	  (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
-	  IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
-	  (unix_recvfrom_nonblock): removed.
-	  UNIXSocket#recvfrom_nonblock is removed.
+	* ext/socket/socket.c: protoize.
 
 Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -3785,227 +59186,147 @@ Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sat Jun 17 14:53:32 2006  Tanaka Akira  <akr@m17n.org>
 
-	* lib/pathname.rb: backport from 1.9.
-	  (Kernel#Pathname): new method.
-
-Sat Jun 17 10:30:41 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
-
-	* lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
-	  [ruby-talk:197284]
-
-	  We can convert RSS version easily like the following:
-	    rss10 = RSS::Parser.parse(File.read("1.0.rdf"))
-	    File.open("2.0.rss", "w") {|f| f.print(rss10.to_xml("2.0"))}
+	* lib/pathname.rb (Kernel#Pathname): new method.
 
-	* test/rss/test_1.0.rb: added #to_xml test.
-	* test/rss/test_2.0.rb: ditto.
-
-	* test/rss/rss-testcase.rb: added some helper methods that
-	  generates sample RSS 2.0.
-
-	* sample/rss/convert.rb: added a sample script to convert RSS format.
-
-Sat Jun 17 10:23:22 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (Kernel#funcall): removed.
-	* lib/rss/parser.rb (Kernel.URI): removed.
-
-	* lib/rss/maker/: supported
-	    xxx.new_yyy do |yyy|
-	      yyy.zzz = zzz
-	      ...
-	    end
-	  style and this style became the style of the recommendation.
+Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
 
-	  Old style
-	    yyy = xxx.new_yyy
-	    yyy.zzz = zzz
-	    ...
-	  is supported too but this style isn't recommended.
-	  [ruby-talk:197284]
+	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
+	  string.
 
-	* test/rss/test_*maker*.rb: used new recommended style.
+Fri Jun 16 01:41:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jun 17 09:03:47 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (rb_proc_arity): get rid of segfault for mere splat.
 
-	* lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
+	* gc.c (gc_mark_children): NODE_BLOCK_PASS needs u3 to be marked.
 
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
-	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
+Thu Jun 15 22:06:56 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/trackback.rb: added TrackBack prefix.
-	* lib/rss/maker/trackback.rb: ditto.
+	* parse.y (then): remove ':' from 'then' and 'do' rules.
 
-	* lib/rss/rss.rb : removed needless argument 'prefix'.
-	* lib/rss/parser.rb: ditto.
-
-	* lib/rss/1.0.rb: added rdf:Bag.
+Wed Jun 14 18:00:20 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/rss/taxonomy.rb: implemented taxonomy module.
-	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
+	* enum.c (enum_any): Documentation typo.
 
-	* lib/rss/1.0.rb: added convenience method 'resources'.
-	* lib/rss/taxonomy.rb: ditto.
-	* test/rss/rss-assertions.rb: added test for 'resources'.
-	* test/rss/test_taxonomy.rb: ditto.
+Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/rss/rss.rb: fixed a indentation bug.
-	* lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
-	* test/rss/test_taxonomy.rb: added a #to_s test.
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
+	  warnings when -q is set.
 
-	* lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
-	  Maker.
-	* lib/rss/taxonomy.rb: supported RSS Maker.
-	* lib/rss/maker.rb: added taxonomy module support.
+Wed Jun 14 16:11:37 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/rss/rss.rb: adjusted to other element API.
-	* lib/rss/1.0.rb: adjusted to other element API but backward
-	  compatibility is reserved.
-	* lib/rss/0.9.rb: ditto.
+	* eval.c (rb_f_method_name, rb_f_callee_name): document typo.
 
-	* test/rss/test_maker_taxo.rb: added test case for taxonomy module
-	  for RSS Maker.
-	* test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
+Wed Jun 14 15:19:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/rss/test_setup_maker_1.0.rb: added backward compatibility
-	  test.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
+	* hash.c (env_aset): raise TypeError on nil with more descriptive
+	  message.  [ruby-core:07990]
 
-	* test/rss/rss-testcase.rb: added convenience method for setting
-	  up taxo:topic.
-	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
+Tue Jun 13 17:22:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* sample/rss/blend.rb: followed new API.
+	* ext/socket/socket.c (Init_socket): remove obsolete constants:
+	  IPsocket, TCPsocket, SOCKSsocket, TCPserver, UDPsocket,
+	  UNIXsocket, UNIXserver.
 
-	* lib/rss/taxonomy.rb: changed class or module prefix to
-	  Taxonomy from Taxo.
-	* lib/rss/maker/taxonomy.rb: ditto.
+Tue Jun 13 09:07:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/rss/test_taxonomy.rb: use #reject directory.
+	* eval.c (formal_assign): post splat arguments should have had
+	  higher priority than optional arguments, since they are
+	  mandatory.  [ruby-dev:28715]
 
-	* lib/rss/: use #__send__ instead of #send.
-	* test/rss/: ditto.
+	* eval.c (VIS_MASK): broken. should be 15.  [ruby-dev:28715]
 
-	* lib/rss/parser.rb: added entity handling type predicate.
-	* lib/rss/rexmlparser.rb: ditto.
-	* lib/rss/xmlparser.rb: ditto.
-	* lib/rss/xmlscanner.rb: ditto.
+	* io.c (argf_getc): should return one-character string.
+	  [ruby-dev:28715]
 
-	* lib/rss/xmlscanner.rb: more robust entity handling.
+	* io.c (rb_io_readchar): ditto.
 
-	* test/rss/test_parser.rb: added an entity handling test.
+Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/rss/test_2.0.rb: added RSS 2.0 tests.
-	* test/rss/rss-assertions.rb: extended XML stylesheet assertion.
-	* lib/rss/0.9.rb: added initialize method.
-	* test/rss/test_1.0.rb: cleanup.
+	* object.c (sym_call): disallow to call private methods.
 
-	* lib/rss/image.rb: added Image prefix.
-	* lib/rss/maker/image.rb: ditto.
+	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
+	  parser.
 
-	* lib/rss/rss.rb: improved type conversion.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
+Sun Jun 11 09:56:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/rss/test_2.0.rb: added type conversion tests.
-	* test/rss/test_accessor.rb: ditto.
-	* test/rss/test_to_s.rb: ditto.
-	* test/rss/test_syndication.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
-	* test/rss/test_setup_maker_1.0.rb: ditto.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_maker_sy.rb: ditto.
-	* test/rss/test_maker_image.rb: ditto.
-	* test/rss/test_maker_2.0.rb: ditto.
-	* test/rss/test_maker_0.9.rb: ditto.
-	* test/rss/test_image.rb: ditto.
+	* win32/win32.h (write): not need to define on bcc.
 
-	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
+Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/rss/rss-assertions.rb: improved type conversion assertions.
+	* lib/optparse.rb (OptionParser#getopts): new methods.
 
-	* lib/rss/rss.rb: added backward compatibility codes.
-	* lib/rss/parser.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
-	* test/rss/test_2.0.rb: ditto.
+Sun Jun 11 07:27:11 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
+	* lib/rdoc/ri/ri_writer.rb: use String#ord.
 
-	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
-	  string.
+Sun Jun 11 04:38:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jun 17 00:23:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (sym_to_proc): imported Symbol#to_proc from ActiveSupport.
 
-	* parse.y (reswords): kDO_BLOCK was missing.  fixed: [ruby-core:7995]
+Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jun 17 00:02:15 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
+	  fixed: raize -> raise.  [ruby-talk:196608]
 
-	* ext/win32ole/win32ole.c (ole_propertyput): support
-	  PROPERTYPUTREF. [ruby-talk:183042]
+Sat Jun 10 17:49:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/win32ole/tests/test_propertyputref.rb: ditto.
+	* string.c (rb_str_ord): new method.
 
-Thu Jun 15 23:02:47 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* parse.y (rbracket): allow optional newline before closing
+	  brackets.
 
-	* ext/win32ole/win32ole.c (fole_methods): The return value
-	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
+Sat Jun 10 15:12:29 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (fole_put_methods): The return value
-	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
+	* eval.c (rb_f_method_name, rb_f_callee_name): new functions.
+	  new global method `__method__' and `__callee__'.
 
-	* ext/win32ole/tests/test_ole_methods.rb: ditto.
+Sat Jun 10 10:13:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/win32ole/tests/testall.rb : ditto.
+	* lib/getoptlong.rb (GetoptLong#set_options): receive arguments
+	  as Array.
 
-Wed Jun 14 18:23:28 2006  Eric Hodel  <drbrain@segment7.net>
+	* lib/irb/slex.rb: use Proc#yield.
 
-	* enum.c (enum_any): Documentation typo.
+	* lib/rdoc/markup/simple_markup/inline.rb: follow the new behavior
+	  of String#[].
 
-Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
+	* lib/rdoc/ri/ri_writer.rb: ditto.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
-	  warnings when -q is set.
+Sat Jun 10 08:17:23 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jun 14 23:03:53 2006  Tanaka Akira  <akr@m17n.org>
+	* math.c (log2): may be a macro.
 
-	* configure.in: check sizeof(rlim_t).
-	  check setrlimit.
+	* parse.y (args, block_param, f_args): pass f_post_arg to #params.
 
-	* process.c (proc_getrlimit): new method Process.getrlimit.
-	  (proc_setrlimit): new method Process.setrlimit.
+	* util.c (powersOf10): constified.
 
-	* ruby.h (NUM2ULL): new macro.
+	* ext/readline/readline.c: include extconf.h first.
 
-Mon Jun 12 22:25:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/ripper/eventids2.c: removed tLAMBDA_ARG.
 
-	* sprintf.c (rb_f_sprintf): adjust precision length to prevent
-	  splitting multi-byte characters.  [ruby-list:42389]
+	* ext/tk/tcltklib.c (lib_fromUTF8_core): removed conflict.
 
-Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/tkutil/tkutil.c (cbsubst_get_subst_arg): rb_id2name() is
+	  defined as const now.
 
-	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
-	  parser.
+	* ext/win32ole/win32ole.c (fole_missing): ditto.
 
-Sun Jun 11 10:00:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/mkmf.rb (create_makefile): force to create extconf header.
 
-	* win32/win32.h (write): not need to define on bcc.
+	* lib/optparse.rb (order!): use Proc#yield.
 
-Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 10 06:53:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/optparse.rb (OptionParser#getopts): new methods.
+	* eval.c (CALLARGS): remove last semicolon. C90 compiler doesn't
+	  allow any lines (even if they're empty) within variable
+	  declarations.
 
-Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun  9 09:56:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
-	  fixed: raize -> raise.  [ruby-talk:196608]
+	* sprintf.c (rb_str_format): allow %c to print one character
+	  string (e.g. ?x).
 
-Thu Jun  8 14:19:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jun  8 14:00:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
 	  use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
@@ -4015,43 +59336,25 @@ Wed Jun  7 16:22:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
 	  basename and pid.  [ruby-talk:196272]
 
-Wed Jun  7 14:53:04 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (errmap): add some winsock errors.
-
-Wed Jun  7 11:34:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in: add new configure option `--with-winsock2' for mingw.
-
-	* win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
-	  instead of in CPPFLAGS.
+Wed Jun  7 16:16:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/extconf.rb: determine whether to use winsock2 or not
-	  by using with_config.
+	* parse.y (do_block): remove -> style block.
 
-Wed Jun  7 10:45:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (parser_yylex): remove tLAMBDA_ARG.
 
-	* win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
-	  new configure option `--with-winsock2'.
+Wed Jun  7 14:51:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/win32.c (StartSockets): ditto.
-
-	* ext/socket/extconf.rb: ditto.
-
-	* win32/win32.c (open_ifs_socket): new function.
-
-	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
-	  instead of socket().
-	  ifs socket support is backported from trunk.
+	* win32/win32.c (errmap): add some winsock errors.
 
 Wed Jun  7 09:14:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_call0): binding for the return event hook should have
 	  consistent scope.  [ruby-core:07928]
 
-	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
-	  event_hooks.	no guarantee for arbitrary hook deletion.
-	  [ruby-dev:28632]
+Tue Jun  6 23:25:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): return behavior should depend whether it
+	  is surrounded by a lambda or a mere block.
 
 Mon Jun  5 18:12:12 2006  Tanaka Akira  <akr@m17n.org>
 
@@ -4065,12 +59368,21 @@ Sun Jun  4 20:40:19 2006  Tanaka Akira  <akr@m17n.org>
 	* ext/socket/socket.c: fix sockaddr_un handling.
 	  [ruby-dev:28677]
 
-Fri Jun  2 22:08:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jun  3 23:53:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (formal_assign): handles post splat arguments.
 
-	* lib/forwardable.rb: RDoc typo fix from Jan Svitok
-	  <jan.svitok at gmail.com>.  [ruby-core:07943]
+	* eval.c (rb_call0): ditto.
 
-Fri Jun  2 19:02:09 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Jun  3 13:10:41 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (strhash): use FNV-1a hash.
+
+Fri Jun  2 20:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): removed experimental ';;' terminator.
+
+Fri Jun  2 19:00:40 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: use create_header.
 
@@ -4099,23 +59411,83 @@ Thu Jun  1 19:12:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
 	  no longer has special meanings.  fixed: [ruby-list:42311]
 
-Thu Jun  1 16:14:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jun  1 17:55:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_node_arity): should be aware of post splat arguments.
+
+	* eval.c (rb_proc_arity): ditto.
+
+Thu Jun  1 16:17:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
 	  if the length of the cwd is longer than MAX_PATH.
 	  fixed [ruby-list:42335]
 
-Thu Jun  1 11:29:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jun  1 16:07:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_args): syntax rule enhanced to support arguments
+	  after the splat.
+
+	* parse.y (mlhs_basic): ditto for multiple assignments
+
+	* parse.y (block_param): ditto for block parameters.
+
+	* parse.y (f_post_arg): mandatory formal arguments after the splat
+	  argument.
+
+	* parse.y (new_args_gen): generate nodes for mandatory formal
+	  arguments after the splat argument.
+
+	* eval.c (rb_eval): dispatch mandatory formal arguments after the
+	  splat argument.
+
+Thu Jun  1 11:33:32 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_getcwd): set errno if not set.
 	  fixed [ruby-list:42346]
 
-Sat May 27 11:29:46 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+Thu Jun  1 00:45:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (args): allow more than one splat in the argument list.
+
+Wed May 31 18:38:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (method_call): allow aref [] to accept all kind of
+	  method argument, including assocs, splat, and block argument.
+
+	* eval.c (SETUP_ARGS0): prepare block argument as well.
+
+Tue May 30 18:13:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
+
+Mon May 29 22:40:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (error_line): print receivers true/false/nil specially.
+
+	* eval.c (rb_proc_yield): handles parameters in yield semantics.
+
+	* eval.c (nil_yield): gives LocalJumpError to denote no block
+	  error.
+
+	* io.c (rb_io_getc): now takes one-character string.
+
+Sat May 27 22:46:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): save and restore block in the current frame.
+	  fixed: [ruby-core:07833], [ruby-talk:191639]
+
+Sat May 27 11:29:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): remove extinit files if no statically linked
 	  extensions.
 
-Fri May 26 09:05:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+Fri May 26 19:56:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
+	  hashing algorithm.
+
+Fri May 26 09:05:11 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.h, lib/mkmf.rb (create_header): clear command line options for
 	  macros moved to extconf.h.
@@ -4130,7 +59502,7 @@ Fri May 26 09:05:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
 
-Thu May 25 01:52:07 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+Thu May 25 01:52:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (pkg_config): particular config commands support.
 
@@ -4144,23 +59516,27 @@ Thu May 25 01:52:07 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* win32/setup.mak: suffix OS name by runtime version.
 
-Wed May 24 23:52:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+Wed May 24 23:52:11 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_install_sh): ignore dummy install-sh.
 	  [ruby-talk:193876]
 
-Wed May 24 03:10:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed May 24 17:55:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
+	* string.c (rb_str_aref): str[0] now returns 1 character string,
+	  instead of a fixnum.	[Ruby2]
 
-Mon May 22 17:54:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (parser_yylex): ?c now returns 1 character string,
+	  instead of a fixnum.	[Ruby2]
 
-	* ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
-	  instead of rb_io_read_pending.
-	  [ruby-dev:28663]
+	* string.c (rb_str_aset): no longer support fixnum insertion.
 
-Mon May 22 17:30:04 2006  Tanaka Akira  <akr@m17n.org>
+Wed May 24 03:10:44 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb
+	  (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
+
+Mon May 22 16:32:03 2006  Tanaka Akira  <akr@m17n.org>
 
 	* rubyio.h (rb_io_set_nonblock): declared.
 
@@ -4169,7 +59545,8 @@ Mon May 22 17:30:04 2006  Tanaka Akira  <akr@m17n.org>
 	  (io_read_nonblock): new method: IO#read_nonblock.
 	  (io_write_nonblock): new method: IO#write_nonblock.
 
-	* ext/socket/socket.c
+	* ext/socket/socket.c (s_accept): retry for EWOULDBLOCK.
+	  revert [ruby-talk:113807].
 	  (sock_connect_nonblock): new method: Socket#connect_nonblock.
 	  (sock_accept_nonblock): new method: Socket#accept_nonblock.
 	  (sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
@@ -4186,6 +59563,33 @@ Mon May 22 13:38:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (ev_const_get): should support constant access from
 	  within instance_eval().  [ruby-dev:28327]
 
+Sun May 21 09:50:31 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* regexec.c: add STK_NULL_CHECK_END to IS_TO_VOID_TARGET().
+	  [ruby-list:42234]
+
+Thu May 18 22:37:20 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/config.rb (WEBrick::Config::HTTP): add new parameters,
+	  :InputBufferSize and :OutputBufferSize.
+
+	* lib/webrick/utils.rb (WEBrick::Utils.timeout): add new timeout
+	  method. this implementation is expected to be compatible with
+	  timeout.rb and faster than timeout.rb.
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#_read_data):
+	  Timeout.timeout is replaced by WEBrick::Utils.timeout.
+
+	* lib/webrick/httprequest.rb: WEBrick::HTTPRequest::BUFSIZE is
+	  replaced by config[:InputBufferSize].
+
+	* lib/webrick/httpresposne.rb: WEBrick::HTTPResponse::BUFSIZE is
+	  replaced by config[:OutputBufferSize].
+
+	* lib/webrick/server.rb: get rid of unnecessary require.
+
+	* test/webrick/test_utils.rb: test for WEBrick::Utils.timeout.
+
 Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_timeval): should round for usec floating
@@ -4193,24 +59597,21 @@ Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_add): ditto.
 
-Thu May 18 17:11:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
-	  <fuj at rabbix.jp>.  [ruby-dev:28649]
-
-Thu May 18 00:42:12 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+Thu May 18 00:42:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
 
 Wed May 17 17:55:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (sys_warning): should not call a vararg function
-	  rb_sys_warning() indirectly.  [ruby-core:07886]
+	  rb_sys_warning() indirectly.	[ruby-core:07886]
 
-Wed May 17 08:17:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 16 17:23:19 2006  Shin-ichiro HARA  <sinara@blade.nagaokaut.ac.jp>
 
-	* util.c (ruby_strtod): try to reduce errors using powersOf10
-	  table.  [ruby-dev:28644]
+	* numeric.c (flo_divmod): the first element of Float#divmod should
+	  be an integer. [ruby-dev:28589]
+
+	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
 
 Tue May 16 15:34:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -4228,6 +59629,10 @@ Tue May 16 09:20:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
 
+Mon May 15 21:37:12 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* re.c (rb_reg_prepare_re): don't use onig_recompile().
+
 Mon May 15 17:42:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
@@ -4241,40 +59646,85 @@ Sat May 13 16:14:05 2006  Tanaka Akira  <akr@m17n.org>
 	  (Struct#pretty_print_cycle): ditto.
 	  [ruby-core:7865]
 
+Fri May 12 15:54:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
+	  event_hooks.	no guarantee for arbitrary hook deletion.
+	  [ruby-dev:28632]
+
 Thu May 11 19:57:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* util.c (ruby_strtod): differ addition to minimize error.
 	  [ruby-dev:28619]
 
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
+Thu May 11 18:30:11 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
+	* ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): should return
+	  value. [ruby-dev:28627]
 
 Thu May 11 18:10:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* util.c (ruby_strtod): should not raise ERANGE when the input
 	  string does not have any digits.  [ruby-dev:28629]
 
+Wed May 10 23:40:21 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* oniguruma.h: Version 4.0.3
+
+	* regexec.c: ditto.
+
+Mon May  8 09:10:31 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
+
+	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
+	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_init): refine warning message.
+
+	* ext/openssl/lib/openssl/cipher.rb: reimplement without eval() and
+	  add constants AES128, AES192, AES256. [ruby-dev:28610]
+
+	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
+
+	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
+	  features.
+
+	* sample/openssl/cipher.rb: rewrite all.
+
 Sun May  7 03:09:51 2006  Stephan Maka  <stephan@spaceboyz.net>
 
 	* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP#initialize):
 	  Use AF_INET6 for nameservers containing colons.
 
+Sat May  6 23:40:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): should restore old ruby_frame->block.
+	  thanks to ts <decoux at moulon.inra.fr>.  [ruby-core:07833]
+	  also fix [ruby-dev:28614] as well.
+
 Sat May  6 00:38:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* signal.c (trap): sig should be less then NSIG.  Coverity found
 	  this bug.  a patch from Kevin Tew <tewk at tewk.com>.
 	  [ruby-core:07823]
 
+Thu May  4 22:13:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (math_log2): add new method inspired by
+	  [ruby-talk:191237].
+
+	* math.c (math_log): add optional base argument to Math::log().
+	  [ruby-talk:191308]
+
 Thu May  4 02:24:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
-	  uninitialized array element.  a patch from Pat Eyler
+	  uninitialized array element.	a patch from Pat Eyler
 	  <rubypate at gmail.com>.  [ruby-core:07809]
 
 	* array.c (rb_ary_fill): initialize local variables first.  a
-	  patch from Pat Eyler <rubypate at gmail.com>.  [ruby-core:07810]
+	  patch from Pat Eyler <rubypate at gmail.com>.	 [ruby-core:07810]
 
 	* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
 	  type_tag.  a patch from Pat Eyler <rubypate at gmail.com>.
@@ -4286,17 +59736,17 @@ Wed May  3 02:12:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  check from Sam Roberts <sroberts at uniserve.com>.
 	  [ruby-core:07691]
 
-Mon May  1 12:23:19 2006    <sinara@blade.nagaokaut.ac.jp>
+Mon May  1 17:58:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* numeric.c (num_div): use floor rather than rb_Integer().
-	  [ruby-dev:28589]
+	* ext/win32ole/win32ole.c (add_event_call_back): should not
+	  delete event handler when the event name is not entried.
 
-	* numeric.c (flo_divmod): the first element of Float#divmod should
-	  be an integer. [ruby-dev:28589]
+Mon May  1 08:32:10 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
+	* ext/win32ole/win32ole.c (ole_param_ole_type): should return
+	  "unknown type" string when ITypeInfo::GetFuncDesc failed.
 
-Sat Apr 29 22:42:08 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Apr 29 22:43:37 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
 	  flag. [ruby-core:07785]
@@ -4306,8 +59756,6 @@ Fri Apr 28 10:53:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* util.c (ruby_strtod): should not cut off 18 digits for no
 	  reason.  [ruby-core:07796]
 
-	* util.c (ruby_strtod): fixed wrong conversion.
-
 Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_fill): internalize local variable "beg" to
@@ -4316,7 +59764,12 @@ Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Wed Apr 26 16:59:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_unpack): now supports CRLF newlines.  a patch from
-	  <tommy at tmtm.org>.  [ruby-dev:28601]
+	  <tommy at tmtm.org>.	[ruby-dev:28601]
+
+Wed Apr 26 16:55:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* applied code clean-up patch from Stefan Huehner
+	  <stefan at huehner.org>.  [ruby-core:07764]
 
 Tue Apr 25 18:00:05 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -4329,22 +59782,21 @@ Tue Apr 25 07:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  squeezing character sequence (i.e. a character) as well.  thanks
 	  to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
 
-Tue Apr 25 00:08:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should check if c is not a
-	  multibyte character.  a patch from KIMURA Koichi
-	  <kimura.koichi at canon.co.jp>.  [ruby-dev:28598]
-
 Fri Apr 21 15:19:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
-	  [ruby-core:07744] and memory leak.
+	* ext/tk/tcltklib.c (lib_eventloop_ensure): avoid dereferencing
+	  freed pointer [ruby-core:07744] and memory leak.
 
 Fri Apr 21 12:14:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c: document update patch from Sam Roberts
 	  <sroberts at uniserve.com>.  [ruby-core:07701]
 
+Thu Apr 20 08:43:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Integer): need not to remove gcd2.  a patch from
+	  NARUSE, Yui <naruse at airemix.com>.	[ruby-dev:28570]
+
 Wed Apr 19 13:55:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (arg): too much NEW_LIST()
@@ -4356,8 +59808,6 @@ Wed Apr 19 11:57:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
 	  [ruby-dev:28585]
 
-	* parse.y (list_concat): revert last change.
-
 	* parse.y (arg): use NODE_ARGSCAT for placeholder.
 
 Wed Apr 19 11:13:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -4370,11 +59820,6 @@ Wed Apr 19 10:13:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* variable.c (rb_const_set): raise error when no target klass is
 	  supplied.  [ruby-dev:28582]
 
-Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (list_concat): should not modify nodes other than
-	  NODE_ARRAY.  [ruby-dev:28583]
-
 Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
@@ -4385,19 +59830,6 @@ Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
 
-Tue Apr 18 00:11:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: block_unique should be 1, not frame_unique.
-	  [ruby-dev:28577]
-
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
-	  ignore C function prototypes.  Patch by Tilman Sauerbeck
-	  <tilman at code-monkey.de>.  [ruby-core:8574]
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
-
 Mon Apr 10 01:03:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* prec.c (prec_prec_f): documentation patch from
@@ -4412,10 +59844,30 @@ Sat Apr  8 02:12:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* README.EXT: update symbol description.  [ruby-talk:188104]
 
+Sat Apr  8 18:06:28 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_METHOD#inspect,
+	  WIN32OLE_PARAM#inspect.
+
+	* test/win32ole/test_win32ole_method.rb: ditto.
+
+	* add test/win32ole/test_win32ole_param.rb.
+
+Fri Apr  7 22:11:30 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(foletypelib_initialize): WIN32OLE_TYPELIB.new
+	  accepts OLE file.
+
+	* test/win32ole/test_win32ole_typelib.rb(test_initialize): ditto.
+
 Thu Apr  6 23:28:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* COPYING: explicitly note GPLv2.  [ruby-talk:187922]
 
+Thu Apr  6 16:43:06 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* intern.h (rb_obj_instance_exec, rb_mod_module_exec): add declaration.
+
 Thu Apr  6 11:18:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
@@ -4439,27 +59891,51 @@ Thu Apr  6 01:04:47 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
 	  variables.
 
-Wed Mar 29 20:54:44 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Wed Apr  5 00:22:54 2006  Tanaka Akira  <akr@m17n.org>
 
-	* ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
-	  multi arguments.
+	* lib/pathname.rb: use a subclass for instantiation except
+	  methods take pathname argument.  suggested by Evan Phoenix.
+	  [ruby-core:7618]
 
-	* ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
+Tue Apr  4 22:15:41 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Mar 29 10:07:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y: remove some obsolete syntax rules (unparenthesized
+	  method calls in argument list).
 
-	* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
-	  e2w_conv): support C90 compiler.
+Sat Apr  1 15:11:27 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Wed Mar 29 06:48:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/win32ole/win32ole.c: add WIN32OLE_TYPE#inspect,
+	  WIN32OLE_VARIABLE#inspect
 
-	* eval.c (backtrace): reports aliased method names in a generated
-	  backtrace.  a patch from "U.Nakamura" <usa at garbagecollect.jp>.
-	  [ruby-dev:28471]
+	* remove ext/win32ole/tests/testOLEVARIABLE.rb, testOLETYPE.rb
+	  testOLETYPELIB.rb.
 
-Mon Mar 27 22:19:09 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+	* testall.rb: ditto.
 
-	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c, config.h}: imported nkf 2.0.6.
+	* add test/win32ole
+
+Fri Mar 31 14:24:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_with_index): removed suspicious return
+	  statement.
+
+Wed Mar 29 23:06:48 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): change the behavior of
+	  WIN32OLE#[], WIN32OLE#[]=. These methods invoke DISPID_VALUE.
+
+	* ext/win32ole/sample/excel2.rb: ditto.
+
+	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
+
+Wed Mar 29 10:11:31 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
+	  e2w_conv): support C90 compiler.
+
+Mon Mar 27 22:45:37 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: imported nkf 2.0.6.
 	  * Add --ic / --oc option and mapping tables.
 	  * Add fallback option.
 	  * Add --no-best-fit-chars option.
@@ -4470,6 +59946,12 @@ Mon Mar 27 22:19:09 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 	* ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
 	  Note that Kconv.to* still imply -X.
 
+	* ext/nkf/test.rb: Removed.  Obsolete by test/nkf.
+
+	* ext/.document: enabled documents in nkf and kconv
+
+	* ext/nkf/nkf.c, ext/nkf/lib/kconv.rb: Add rdoc.
+
 Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_call0): insecure calling should be checked for non
@@ -4478,53 +59960,125 @@ Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_alias): should preserve the current safe level as
 	  well as method definition.
 
-Fri Mar 24 23:14:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Mar 26 22:02:51 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* re.c: refactoring for options.
+
+	* parse.y: ditto.
+
+Fri Mar 24 21:11:02 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* re.c (match_aref): RDoc description updated.
 
-	* eval.c (yield_under_i): pass self again for instance_eval().
-	  [ruby-dev:28466]
+	* string.c (rb_str_sub): ditto.
+
+	* string.c (rb_str_gsub): ditto.
 
 Fri Mar 24 17:20:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* process.c (rb_f_sleep): remove description about SIGALRM which
-	  is not valid on the current implementation.  [ruby-dev:28464]
+	* process.c (rb_f_sleep): remove RDoc description about SIGALRM
+	  which is not valid on the current implementation. [ruby-dev:28464]
+
+Thu Mar 23 21:40:47 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* re.c (rb_reg_regsub): prohibit \1, \2 ...\9 in replaced string
+	  for named regex pattern.
+
+Thu Mar 23 21:06:23 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* oniguruma.h: Version 4.0.2
+
+	* regparse.c: ditto.
+
+	* regcomp.c ditto.
+
+	* regerror.c: ditto.
 
 Thu Mar 23 10:47:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (method_missing): should support argument splat in
-	  super.  [ruby-talk:185438]
+	  super.  a bug in combination of super, splat and
+	  method_missing.  [ruby-talk:185438]
+
+Thu Mar 23 00:01:32 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* re.c (rb_reg_regsub): add back reference by name \k<name> in
+	  replace string.
+
+	* re.h: add regexp argument to rb_reg_regsub().
+
+	* string.c (rb_str_sub_bang): ditto.
+
+	* string.c (str_gsub): ditto.
+
+Tue Mar 21 22:14:01 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* re.c (match_alloc): initialize member regexp.
+
+	* re.c (match_aref): add String and Symbol argument. [ruby-dev:28448]
+
+	* re.h: add member regexp to RMatch.
+
+	* gc.c (gc_mark_children): add gc_mark() to regexp member.
 
 Mon Mar 20 12:05:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: Solaris SunPro compiler -rapth patch from
 	  <kuwa at labs.fujitsu.com>.  [ruby-dev:28443]
 
+Mon Mar 20 11:12:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (folevariant_value): could not compile
+	  with C90 compiler.
+
 Mon Mar 20 09:40:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: remove enable_rpath=no for Solaris.
 	  [ruby-dev:28440]
 
-Fri Mar 17 19:08:49 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Mar 19 09:46:30 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
-	  [ruby-core:07571]
+	* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
+	  of converting	 OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
+	  String object.
 
-Wed Mar 15 16:54:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/win32ole/win32ole.c (folevariant_value): ditto.
+
+	* ext/win32ole/tests/testOLEVARIANT.rb: ditto.
+
+Wed Mar 15 16:51:11 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): support libraries without *.so.
 
-Wed Mar 15 16:35:43 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Mar 15 16:39:29 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
 	  "rb_str_new(0, 0)" to make empty string.
 
-Sat Mar 11 14:24:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Mar 12 17:02:10 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(ole_val2olevariantdata): support VT_ARRAY in
+	  WIN32OLE_VARIANT.new().
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
-	  space before argument parenthesis.  [ruby-talk:183630]
+	* ext/win32ole/tests/testOLEVARIANT.rb: ditto.
+
+	* ext/win32ole/tests/testOLEPARAM.rb: test method name should not be
+	  duplicated.
+
+Sat Mar 11 14:24:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.1: a clarification patch from David Lutterkort
 	  <dlutter at redhat.com>.  [ruby-core:7508]
 
+Sun Mar  5 18:40:58 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: do not repeat command options.
+
+Sun Mar  5 18:35:03 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (send_request_with_body): #content_type never
+	  return false, use #main_type instead. [ruby-core:07476]
+
 Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (id2ref): fix symbol test.
@@ -4532,84 +60086,112 @@ Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
 Sat Mar  4 01:08:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
-	  directories.  a patch from Eric Hodel <drbrain at segment7.net>.
+	  directories.	a patch from Eric Hodel <drbrain at segment7.net>.
 	  [ruby-core:07423]
 
-Thu Mar  2 19:44:18 2006  Tanaka Akira  <akr@m17n.org>
+Fri Mar  3 17:59:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* gc.c: align VALUE with sizeof(RVALUE) globally.
-	  (is_pointer_to_heap): check alignment out of loop.
-	  (id2ref): avoid collision between symbols and objects.
-	  (rb_obj_id): ditto.  moved from object.c.
-	  [ruby-talk:178364] [ruby-core:7305]
+	* eval.c (rb_clear_cache_by_class): clearing wrong cache.
+
+Fri Mar  3 21:22:42 2006  Tanaka Akira  <akr@m17n.org>
+
+	* lib/fileutils.rb (FileUtils.cp_r): implement :remove_destination
+	  option.
+
+	* ext/extmk.rb: use :remove_destination to install extension libraries
+	  to avoid SEGV.  [ruby-dev:28417]
+
+Fri Mar  3 14:41:04 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/dl/.cvsignore: ignore callback.h.
+
+	* ext/ripper/.cvsignore: ignore eventids2table.c.
+
+	* ext/socket/.cvsignore: ignore constants.h.
 
 Thu Mar  2 18:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_thread_fd_writable): should not re-schedule output
 	  from KILLED thread (must be error printing).
 
-Thu Mar  2 17:57:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Mar  2 09:12:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_flatten_bang): allow specifying recursion
+	  level.  [ruby-talk:182170]
+
+	* array.c (rb_ary_flatten): ditto.
+
+Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (add_heap): a heap_slots may overflow.  a patch from Stefan
+	  Weil <weil at mail.berlios.de>.
+
+Wed Mar  1 17:13:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): use separate cache for fcall/vcall
+	  invocation.
+
+	* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
+	  functions.
+
+	* eval.c (rb_mod_local): a new method to specify newly added
+	  visibility "local".
+
+	* eval.c (search_method): search for local methods which are
+	  visible only from the current class.
+
+	* class.c (rb_class_local_methods): a method to list local methods.
+
+Thu Mar  2 17:54:45 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
 	  [ruby-core:7474]
 
-Thu Mar  2 12:59:14 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Mar  2 14:12:26 2006  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c: align VALUE with sizeof(RVALUE) globally.
+	  (is_pointer_to_heap): check alignment out of loop.
+	  (id2ref): avoid collision between symbols and objects.
+	  (rb_obj_id): ditto.  moved from object.c.
+	  [ruby-talk:178364] [ruby-core:7305]
+
+Thu Mar  2 12:55:16 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
 	  stat() didn't treat daylight saving time property on WinNT.
 	  [ruby-talk:182100]
 
-Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (add_heap): heap_slots may overflow.  a patch from Stefan
-	  Weil <weil at mail.berlios.de>.
-
-Wed Mar  1 00:24:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Mar  1 00:15:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
 	  merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.
 	  [ruby-talk:181631] [ruby-dev:28404]
 
-Tue Feb 28 09:32:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Feb 28 19:32:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/drb/extservm.rb (invoke_service_command): cannot invoke command
-	  if command name is quoted on mswin32. [ruby-dev:28400]
+	* object.c (Init_Object): add BasicObject class as a top level
+	  BlankSlate class.
 
 Mon Feb 27 00:19:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h (SYM2ID): should not cast to signed long.
 	  [ruby-core:07414]
 
-Fri Feb 24 20:07:23 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri Feb 24 20:21:38 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/drbtest.rb (add_service_command): quote pathnames in the
 	  server's command line for space contained directory names.
 	  Thanks, arton. [ruby-dev:28386]
 
-Fri Feb 24 12:11:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Feb 24 12:10:07 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
 	  It's for VC++8.
 
-Fri Feb 24 11:33:52 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
-
-Fri Feb 24 11:19:58 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (time_new_internal): add prototype to tell the compiler
-	  arugments types.
+Fri Feb 24 11:17:45 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
 
-Fri Feb 24 08:19:16 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test.rb: Removed.  Obsolete by test/nkf.
-
-	* ext/.document: enabled documents in nkf and kconv
-
-	* ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
-
 Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
@@ -4617,30 +60199,84 @@ Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	  ex: 10000.times { "" << "." * 529671; GC.start } # crash
 	  [ruby-dev:28230]
 
-Thu Feb 23 13:20:28 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Feb 23 13:23:03 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
 
-Tue Feb 21 02:18:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Feb 22 21:16:55 2006  Tanaka Akira  <akr@m17n.org>
 
-	* configure.in (mingw): have link.  [ruby-list:41838]
+	* lib/pathname.rb (Pathname#each_filename): use split_names properly.
 
-	* win32/Makefile.sub (config.h): ditto.
+Wed Feb 22 16:24:05 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_cgi.rb: should support platforms which search
+	  library path from the interpreter's path.
+	  And, support test without install incidentally.
+
+Wed Feb 22 14:21:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bignorm): x may not be a bignum.  [ruby-dev:28367]
+
+Wed Feb 22 09:22:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_alloc): add proper check for creation of a lambda
+	  without a block.
 
 Tue Feb 21 02:07:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (f_arglist): should set command_start = Qtrue for
 	  command body.  [ruby-talk:180648]
 
-Mon Feb 20 17:37:26 2006  Tanaka Akira  <akr@m17n.org>
+Mon Feb 20 22:30:17 2006  Tanaka Akira  <akr@m17n.org>
+
+	* mkconfig.rb: alias Config to RbConfig for compatibility.
+
+Mon Feb 20 18:21:41 2006  Tanaka Akira  <akr@m17n.org>
 
-	* mkconfig.rb: alias RbConfig for Config.
+	* io.c (rb_io_reopen): flush before reopening a file.
+	  reported by Mathieu Bouchard.  [ruby-core:7396]
+
+Mon Feb 20 17:29:50 2006  Tanaka Akira  <akr@m17n.org>
+
+	* mkconfig.rb: generate RbConfig instead of Config.
+
+	* instruby.rb, rubytest.rb, runruby.rb, bcc32/Makefile.sub,
+	  ext/extmk.rb, ext/dl/extconf.rb, ext/iconv/charset_alias.rb,
+	  lib/mkmf.rb, lib/rdoc/ri/ri_paths.rb,
+	  lib/webrick/httpservlet/cgihandler.rb,
+	  test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb,
+	  test/ruby/envutil.rb, test/soap/calc/test_calc_cgi.rb,
+	  test/soap/header/test_authheader_cgi.rb, test/soap/ssl/test_ssl.rb,
+	  win32/mkexports.rb, win32/resource.rb: Use RbConfig instead of
+	  Config.
+
+Mon Feb 20 13:46:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/find.rb: should raise ENOENT if root entry does not exist,
+	  without opening it. [ruby-dev:28345]
 
 Mon Feb 20 12:27:53 2006  Kent Sibilev  <ksruby@gmail.com>
 
 	* lib/rational.rb (Integer::gcd): small typo fix.
 	  [ruby-core:07395]
 
+Mon Feb 20 10:03:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_get_0): Object should have been the lowest
+	  in const lookup precedence.  [ruby-dev:28343]
+
+Mon Feb 20 09:17:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator): should not delegate "funcall".
+
+Mon Feb 20 09:13:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler):
+	  qualify the access for Config constant.  [ruby-dev:28338]
+
+	* lib/resolv.rb (Resolv::DNS::Resource::IN::A): qualify
+	  ClassValue.  [ruby-dev:28338]
+
 Mon Feb 20 01:05:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rational.rb (Integer::gcd): replaced by gcd4 in
@@ -4651,6 +60287,13 @@ Mon Feb 20 00:57:02 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
 	  [ruby-dev:28339]
 
+Mon Feb 20 00:13:49 2006  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: add :ssl_verify_mode option.
+	  suggested by Will Glynn.
+
+	* lib/open-uri.rb: add :ssl_ca_cert option.
+
 Sun Feb 19 04:46:29 2006  Guy Decoux  <ts@moulon.inra.fr>
 
 	* eval.c: initial value for block_unique must be 1.
@@ -4666,17 +60309,44 @@ Sat Feb 18 23:58:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sample/rtags.rb: ditto.
 
-Sat Feb 18 12:18:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Feb 18 21:16:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_eval): RDoc description updated.  a
+	  patch from Ozgur Murat Homurlu <ozgurmurath at gmail.com>.
+	  [ruby-core:07381]
+
+Sat Feb 18 01:01:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb (FileUtils::fu_world_writable): make it
-	  private.  [ruby-core:07383]
+	* variable.c (rb_const_get_0): skip ruby_wrapper in const search
+	  to give it lower priority (just above Object).  need not to
+	  change rb_const_defined_0() since it's only a precedence matter;
+	  they are defined anyway.
 
 Sat Feb 18 00:22:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/tracer.rb: merged a minor clarification patch from Daniel
 	  Berger <Daniel.Berger at qwest.com>.  [ruby-core:07376]
 
-Fri Feb 17 11:18:42 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Feb 17 17:30:20 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ev_const_get): simplified using rb_const_get_fallback().
+
+	* eval.c (ev_const_defined): adopt to ev_const_get() using
+	  rb_const_defined_fallback().
+
+	* variable.c (rb_const_get_fallback): new function to implement
+	  constant search.
+
+	* variable.c (rb_const_defined_fallback): new function to
+	  implement constant definition check.
+
+	* variable.c (rb_const_get_0): adopt to new behavior.  constants
+	  are looked up in the order of: current class, super classes (but
+	  Object), lexically external classes/modules, and Object.
+
+	* variable.c (rb_const_defined_0): ditto.
+
+Fri Feb 17 11:20:53 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
 
@@ -4691,11 +60361,6 @@ Fri Feb 17 09:39:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_thread_wait_for): sleep should always sleep for
 	  specified amount of time.  [ruby-talk:180067]
 
-Thu Feb 16 01:10:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (backtrace): frame->orig_func may not be initialized.
-	  [ruby-core:07367]
-
 Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
@@ -4707,6 +60372,10 @@ Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_eval): honor visibility on OP_ASGN1 and
 	  OP_ASGN2. [ruby-core:07366]
 
+Wed Feb 15 15:20:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (error_line): remove void control path.  [ruby-dev:28335]
+
 Wed Feb 15 10:09:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (yield_under_i): should not pass self as an argument to
@@ -4717,17 +60386,32 @@ Wed Feb 15 09:20:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_obj_instance_eval): should be no singleton classes for
 	  true, false, and nil.  [ruby-dev:28186]
 
+Tue Feb 14 20:26:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_each): return self if no block is
+	  given.  [yarv-dev:882]
+
 Tue Feb 14 18:48:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (DMETHOD_P): accessing wrong frame.  [ruby-dev:28181]
 
 	* eval.c (proc_invoke): preserve FRAME_DMETH flag.
 
-Tue Feb 14 15:13:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Feb 14 15:15:22 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/zlib/zlib.c: suppress warning on test/zlib. [ruby-dev:28323]
+
+Tue Feb 14 13:47:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_utime): drop read-only attribute before
+	  changing file time.
 
-	* ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
+Tue Feb 14 13:38:01 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Feb 14 14:01:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/Makefile.sub (config.h): should define HAVE_LONG_LONG with
+	  VC++8.
+
+Tue Feb 14 11:42:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* time.c (search_time_t): support non 32bit time_t environments.
 
@@ -4735,35 +60419,40 @@ Tue Feb 14 14:01:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
 
-	* win32/win32.c (rb_w32_utime): drop read-only attribute before
-	  changing file time.
+Mon Feb 13 18:01:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	  all changes are backported from CVS HEAD.
+	* eval.c (copy_node_scope): remove duplicated semicolons at end.
+	  a patch from KIMURA Koichi <kimura.koichi at canon.co.jp>.
+	  [ruby-dev:28332]
 
-Tue Feb 14 11:21:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (VIS_MODE): remove unnecessary argument.
+	  [ruby-dev:28332]
 
-	* io.c (argf_forward): should not use frame->argv.
-	  [ruby-core:07358]
+Mon Feb 13 13:49:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Feb 13 18:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (parser_parse_string): mention "regexp" in a error
+	  message.  a patch from Mauricio Fernandez <mfp at acm.org>
+	  [ruby-core:07340]
 
-	* eval.c (rb_call0): argument update propagation.  [ruby-dev:28044]
+Mon Feb 13 00:01:32 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
 
-	* env.h: remove argv member from struct FRAME.
+	* oniguruma.h: Version 4.0.1
 
-Mon Feb 13 13:27:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regparse.c (onig_free_shared_cclass_table): fix memory leaks.
 
-	* eval.c (eval): should push class from binding if supplied.
-	  [ruby-core:07347]
+	* regcomp.c (optimize_node_left): change from IS_POSIXLINE() to IS_MULTILINE().
 
-Mon Feb 13 00:04:00 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* regint.h: rename ANCHOR_ANYCHAR_STAR_PL to ANCHOR_ANYCHAR_STAR_ML.
 
-	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
-	  change <%='s behavior. (backported 1.15 - 1.16)
+	* regparse.h: ditto.
+
+	* regexec.c: ditto.
 
-Sat Feb 11 02:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Feb 11 21:57:29 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* eval.c (eval): no need to push ruby_class.  [ruby-dev:28176]
+	* ext/win32ole/win32ole.c: add WIN32OLE.create_guid.
+
+	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
 
 Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -4771,39 +60460,76 @@ Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  instance_eval for objects cannot have singleton classes,
 	  e.g. fixnums and symbols).  [ruby-dev:28178]
 
-Tue Feb  7 23:03:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Feb 10 12:31:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should support NODE_ZSUPER in NODE_ITER.
+	  [ruby-dev:28326]
+
+	* eval.c (ZSUPER_ARGS): support macro.
+
+Wed Feb  8 10:26:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
+	  invoking finalizers.
+
+	* gc.c (rb_gc_finalize_deferred): ditto.
+
+Tue Feb  7 23:03:13 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/zlib/zlib.c: should not access ruby objects in finalizer.
 	  [ruby-dev:28286]
 
+Tue Feb  7 18:42:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_write_error2): use fwrite(3) if rb_stderr is not
+	  updated or is already freed.  [ruby-dev:28313]
+
 Mon Feb  6 16:02:51 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
 	  In such situation, flock() should return 0.
 
-Mon Feb  6 00:41:08 2006  Tanaka Akira  <akr@m17n.org>
+Mon Feb  6 14:36:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (error_line): include the class name of a surrounding
+	  method in error position description.
+
+Mon Feb  6 00:14:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_find_index): a new method Enumerable#find_index.
+	  [ruby-talk:178495]
+
+Sun Feb  5 23:29:31 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ruby.h (struct RStruct): embed 3 or less elements structs.
+	  (RSTRUCT_LEN): defined for accessing struct members.
+	  (RSTRUCT_PTR): ditto.
 
-	* ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
-	  compatibility with ruby 1.9.
+	* struct.c: use RSTRUCT_LEN and RSTRUCT_PTR.
+	  (struct_alloc): allocate small structs in embedded format.
+	  (rb_struct_init_copy): ditto.
 
-Sun Feb  5 21:05:34 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* gc.c (gc_mark_children): use RSTRUCT_LEN and RSTRUCT_PTR.
+	  (obj_free): ditto.
+
+	* marshal.c (w_object): use RSTRUCT_LEN and RSTRUCT_PTR.
+
+Sun Feb  5 21:01:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* numeric.c (fix_to_s): removed workaround for radix 2. Historically,
 	  rb_fix2str could only handle radix 8, 10, 16. (Rev1.37) But for now,
 	  it can handle radix 2..36. [ruby-Bugs#3438] [ruby-core:7300]
 
-Sun Feb  5 18:55:08 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: imported from trunk, rev 1.129
+Sun Feb  5 18:49:00 2006  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
-	  compatibility.
+	* lib/net/http.rb (add_field, get_fields): keep 1.8.2
+	  compatibility.  This patch is contributed by Rob Pitt.
 
-	* lib/net/https.rb: imported from trunk, rev 1.3.
+Sun Feb  5 16:33:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
+	* lib/mkmf.rb (create_makefile): Kernel#sub! was removed on HEAD.
 
-Sun Feb  5 14:22:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Feb  5 14:26:54 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/pstore.rb: should return default value if name is not found.
 	  [ruby-core:7304]
@@ -4815,42 +60541,68 @@ Sat Feb  4 22:51:43 2006  Tanaka Akira  <akr@m17n.org>
 	* eval.c: apply the FreeBSD getcontext/setcontext workaround
 	  only before FreeBSD 7-CURRENT.
 
-Sat Feb  4 21:19:23 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Feb  4 21:10:06 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
 	  In such situation, flock() should return 0.
 
-Sat Feb  4 15:56:37 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Feb  4 15:52:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
 	  sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
 
-Fri Feb  3 15:06:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Feb  4 15:02:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* oniguruma.h: merge Oniguruma 4.0.0  [ruby-dev:28290]
+
+Fri Feb  3 19:25:53 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ruby.h: fixed prototype.
+
+	* ext/syck/rubyext.c: defined symbol ID as global variable as others.
+
+Fri Feb  3 17:57:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: unify ruby_class (for method definition) and ruby_cbase
+	  (for constant reference).
+
+Fri Feb  3 15:02:10 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc
 	  even if skip == 0. This causes buffer overrun.
 	  (ex: YAML.load('--- "..' + '\x82\xA0' * 511 + '"'))
 
-Thu Feb  2 23:51:18 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Feb  3 00:01:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
-	  emitter's marker. if marker points to the end of buffer, this causes
+	  emitter's marker. if marker points to the end of buffer, this is
 	  buffer overrun. (ex: YAML.dump("." * 12288))
 
+Thu Feb  2 17:13:01 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#get_tk): added
+	  support of :'string' style Symbol.
+
 Thu Feb  2 16:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* eval.c (rb_call0): use TMP_ALLOC() instead of allocating
+	  a temporary array object.
+
 	* eval.c (eval): need not to protect $SAFE value.
 	  [ruby-core:07177]
 
+	* error.c (Init_Exception): change NameError to direct subclass of
+	  Exception so that default rescue do not handle it silently.
+
 Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
 
-	* configure.in: The isinf is not regognized by autoconf
+	* configure.in: The isinf is not recognized by autoconf
 	  library guesser on solaris 10. [ruby-core:7138]
 
 Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
-	  where they are supported. modifing environ variable seems to
+	  where they are supported. modifying environ variable seems to
 	  segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
 
 	* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
@@ -4868,17 +60620,36 @@ Tue Jan 31 11:58:51 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
 	  last commit. Now it will return a proper object.
 
-Tue Jan 31 00:10:26 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jan 31 08:07:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_upto): return an enumerator if no block is
+	  attached to the method.
+
+	* numeric.c (int_downto): ditto.
+
+	* numeric.c (int_dotimes): ditto.
+
+	* enum.c (enum_first): new method Enumerable#first to take first n
+	  elements from an enumerable.
+
+	* enum.c (enum_group_by): new method Enumerable#group_by that
+	  groups enumerable values according to their block values.
+
+Tue Jan 31 00:08:22 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
 	  ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
 
-Sat Jan 28 07:56:57 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jan 28 07:49:30 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/usage.rb: support "a:0:33" style caller[-1]. In this case
 	  file name is "a:0". I don't know this really happens though...
 	  [ruby-Bugs:3344]
 
+Thu Jan 26 15:55:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c: turn on do_not_reverse_lookup by default.
+
 Wed Jan 25 22:29:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
@@ -4902,13 +60673,7 @@ Sun Jan 22 20:03:35 2006  Tanaka Akira  <akr@m17n.org>
 	  FreeBSD/i386 getcontext/setcontext bug.
 	  [ruby-dev:28263]
 
-Sat Jan 21 00:36:47 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
-	  before gcc 4.0.3.
-	  [ruby-dev:28247]
-
-Thu Jan 19 22:21:23 2006  Minero Aoki  <aamine@loveruby.net>
+Thu Jan 19 22:19:18 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (mv): should remove file after copying.
 	  [ruby-dev:28223]
@@ -4922,32 +60687,34 @@ Wed Jan 18 23:37:06 2006  Tanaka Akira  <akr@m17n.org>
 	  reported by Pav Lucistnik and Marius Strobl.
 	  http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
 
-Tue Jan 17 11:32:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 17 23:59:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get, rb_mod_const_defined): added optional
+	  flag to search ancestors, which is defaulted to true.
+	  fixed: [ruby-talk:175899]
+
+	* eval.c (rb_mod_method_defined): ditto.
+
+Tue Jan 17 11:31:47 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/setup.mak (MAKE): workaround for nmake 8.
 
-Tue Jan 17 11:10:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 17 11:06:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
-	  for nmake 8.
+	* win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8.
 
-Mon Jan 16 10:26:23 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jan 16 10:13:38 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item):
 	  should output complex key mark even if map's key is empty seq/map.
 	  [ruby-core:7129]
 
-Sat Jan 14 05:37:06 2006  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
-	  for DragonFly BSD 1.4.0.
-
-Sat Jan 14 03:43:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jan 14 03:38:54 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
 	  sizeof(void*).
 
-Fri Jan 13 19:14:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jan 13 19:26:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/diagram.rb:
 	    - properly quote bare element attributes
@@ -4969,23 +60736,15 @@ Thu Jan 12 11:53:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  [new feature] support 'command' option which is called just before
 	  popping up the balloon help.
 
-Wed Jan 11 15:00:00 2006  Ville Mattila  <mulperi@iki.fi>
+Wed Jan 11 00:12:29 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* io.c (READ_PENDING*): Support solaris 64-bit environments.
-	  Solaris defines a opaque FILE struct when compiling 64 bit
-	  binaries. This means that we dont have access to _ptr etc.
-	  members anymore. The solution by Steven Lumos is to define
-	  FILE64 that has needed members available. I've modified
-	  the origanal patch a bit so that it compiles both with gcc
-	  and now free sun studio 11 compiler and both amd64 and sparc.
-	  NOTE! We have to 64 bit solaris FILE structure time to time
-	  otherwise we'll get breakage.
-	  [ruby-core:7106]
+	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
+	  change <%='s behavior.
 
 Tue Jan 10 19:42:33 2006  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (garbage_collect): mark ruby_current_node.
-	  if an exception is raised in a finalizer called written in C by
+	  if an exception is raised in a finalizer written in C called by
 	  rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
 	  collected ruby_current_node and mark_source_filename may corrupt
 	  memory.
@@ -5008,37 +60767,68 @@ Tue Jan 10 12:00:48 2006  Aaron Schrab  <aaron @nospam@ schrab.com>
 	* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
 	  Symbols broken. [ruby-Bugs:2535]
 
-Mon Jan  9 19:54:35 2006  arton  <artonx@yahoo.co.jp>
+Tue Jan 10 07:26:52 2006  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c (gc_stress): renamed from always_gc and enabled by default.
+	  (gc_stress_get): new function for GC.stress.
+	  (gc_stress_set): new function for GC.stress=.
+
+Mon Jan  9 19:58:56 2006  arton  <artonx@yahoo.co.jp>
 
 	* ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
 	  http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
 
-Mon Jan  9 14:17:12 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jan  9 14:25:00 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
 	  (VisualC++6) so use -O2b2xg- if  $(MSC_VER) < 1400. [ruby-core:7040]
 
-Mon Jan  9 14:17:12 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
+Mon Jan  9 14:25:00 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
 
 	* lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
 
+Sun Jan  8 14:15:27 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (GCC_VERSION_BEFORE): check __INTEL_COMPILER.
+	  Intel C++ Compiler defines __GNUC__.
+	  http://www.intel.com/software/products/compilers/clin/docs/ug_cpp/lin1077.htm
+
 Sat Jan  7 15:40:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (singleton): get rid of segfault on syntax error.
 	  fixed: [ruby-core:07070]
 
-Fri Jan  6 10:16:20 2006  Steven Lumos  <steven@lumos.us>
+Sat Jan  7 06:24:18 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_fd_isset): compare the result of FD_ISSET with 0 to
+	  avoid FreeBSD bug.  FreeBSD defines FD_ISSET as just a bitmap of
+	  unsigned long.  So returning the value from rb_fd_isset discards
+	  upper 32bits on LP64 environment.
+	  http://www.freebsd.org/cgi/query-pr.cgi?pr=ia64/91421
+
+Fri Jan  6 02:20:18 2006  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in: don't force getcontext on IA64.
+
+	* eval.c (ruby_setjmp): add an argument for just before getcontext.
+	  (THREAD_SAVE_CONTEXT): call rb_thread_save_context just
+	  before getcontext.
+	  [ruby-dev:28205]
+
+Sun Jan  1 15:28:46 2006  Tanaka Akira  <akr@m17n.org>
 
-	* io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
-	  [ruby-core:7057]
-	  (READ_DATA_PENDING_COUNT): ditto.
-	  (READ_DATA_PENDING_PTR): ditto.
+	* missing.h (isinf): avoid macro expansion
+	  "extern int isinf(double);" to
+	  "extern int ((sizeof(double)==sizeof(float))?_Isinff(double):_Isinf(double));" on
+	  HP-UX.
 
-Sun Jan  1 17:07:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Jan  1 14:42:54 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_seekdir): should not segfault even if passed
-	  the location which rb_w32_telldir didn't return. [ruby-core:7035]
-	  (I think HEAD implementation is better. but binary compatibility)
+	  the location which rb_w32_telldir didn't return. (and should change
+	  `bits' position) [ruby-core:7035]
+
+	* win32/dir.h: ditto. (stores `loc' instead of `bitpos')
 
 	* test/ruby/test_dir.rb: added.
 
@@ -5047,26 +60837,41 @@ Sat Dec 31 22:57:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_thread_save_context): should not recycle scope object used
 	  in a thread.  fixed: [ruby-dev:28177]
 
+Sat Dec 31 19:50:38 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c: attribute name was truncated with Rev1.64.
+
+Sat Dec 31 11:53:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/generator.rb: (Generator#initialize): should kill @loop_thread
+	  before starting new thread. (occurs when called via Generator#rewind)
+	  [ruby-dev:28184]
+
 Fri Dec 30 18:22:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (garbage_collect): mark objects refered from aborting threads.
+	* gc.c (garbage_collect): mark objects referred from aborting threads.
 	  [ruby-dev:28190]
 
 	* win32/Makefile.sub: VC++8 support.
 
-Fri Dec 30 14:24:53 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Dec 30 15:17:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* dir.c (glob_helper): do not use TRUE for djgpp.
+	* lib/generator.rb (Generator#initialize): ensured to stop @loop_thread.
+	  Mr. Tanaka pointed out one Thread.pass is not enough. [ruby-dev:28185]
 
-Fri Dec 30 04:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Dec 30 12:20:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* file.c (eaccess): workaround for VC++8 runtime.
+	* lib/generator.rb (Generator#initialize): fixed dead lock. this occurred
+	  when end? was called before @loop_thread was stopped. [ruby-core:7029]
 
-	* win32/win32.c (ioinfo): VC++8 support.
+Fri Dec 30 01:04:52 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/generator.rb: should work with another thread. (more robust code)
+	  [ruby-dev:28177]
 
 Thu Dec 29 23:59:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
+	* eval.c (rb_gc_mark_threads): keep unmarked threads which won't wake
 	  up alone, and mark threads in the loading table.  [ruby-dev:28154]
 
 	* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
@@ -5077,23 +60882,87 @@ Thu Dec 29 17:02:07 2005  Tanaka Akira  <akr@m17n.org>
 	* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
 	  "miniruby".  [ruby-dev:28140]
 
+Thu Dec 29 14:35:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_define_method): should save safe_level in the
+	  proc object.  [ruby-dev:28146]
+
+Thu Dec 29 11:22:34 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/generator.rb: reimplemented Generator class with Thread instead of
+	  callcc, in order to fix memory leak. [ruby-dev:28142]
+
+Wed Dec 28 14:10:05 2005  Tanaka Akira  <akr@m17n.org>
+
+	* ia64.s: remove .pred.safe_across_calls directive.
+	  reported by WATANABE Tetsuya.  [ruby-dev:28141]
+
+Wed Dec 28 01:32:39 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (struct thread): add bstr_max.
+	  (rb_thread_save_context): use realloc instead of REALLOC_N
+	  to avoid GC.
+
+Tue Dec 27 23:59:53 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (CompletingHash#match): fix for 1.9.
+
 Tue Dec 27 16:59:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/drb/drbtest.rb (DRbService::self.ext_service): increase
 	  timeout limit.  a patch from Kazuhiro NISHIYAMA
 	  <zn at mbf.nifty.com>. [ruby-dev:28132]
 
-Tue Dec 27 08:29:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Dec 27 14:17:55 2005  Tanaka Akira  <akr@m17n.org>
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
-	  treat wildcard character in commonName. [ruby-dev:28121]
+	* configure.in: define IA64 for portability.  (HP aC++/ANSI C doesn't
+	  define __ia64__.)
+	  don't check libunwind stuff.
+	  check __libc_ia64_register_backing_store_base.
 
-Mon Dec 26 22:32:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* defines.h: declare rb_ia64_bsp and rb_ia64_flushrs.
+	  (flush_register_windows): call rb_ia64_flushrs on IA64.
 
-	* eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
-	  NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
-	  NODE_UNDEF and NODE_ALIAS.
-	  backported from trunk.  fixed: [ruby-dev:28105]
+	* ia64.s: new file for IA64.
+	  it is separated from C program files because
+	  Intel C++ Compiler for IA64 doesn't support inline assembly.
+
+	* common.mk (ia64.$(OBJEXT)): new target.
+
+	* ruby.h (RUBY_INIT_STACK): defined.
+	  (ruby_init_stack): declared for RUBY_INIT_STACK.
+
+	* main.c (main): precedes RUBY_INIT_STACK before ruby_init.
+
+	* gc.c (rb_gc_register_stack_start): new global variable on IA64.
+	  (garbage_collect): simplify register stack marking code.
+	  don't use libunwind.
+	  (Init_stack): initialize rb_gc_register_stack_start.
+	  (ruby_init_stack): new function for RUBY_INIT_STACK.
+
+	* eval.c (struct thread): add bstr_pos member for original position of
+	  register stack.
+	  (rb_thread_save_context): simplify register stack saving code.
+	  don't use libunwind.
+	  (rb_thread_restore_context_0): new function.  moved from
+	  rb_thread_restore_context except the stack position checking code.
+	  don't use libunwind for IA64 register stack.
+	  (register_stack_extend): new function.
+	  (stack_extend): make it self-recursive with
+	  the stack position checking code in old rb_thread_restore_context.
+	  (rb_thread_restore_context): just call stack_extend.
+	  (flush_register_windows): removed.
+
+	  [ruby-dev:28127]
+
+Tue Dec 27 14:09:39 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* process.c: new method Process.exec. [ruby-dev:28107]
+
+Tue Dec 27 08:22:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_check):
+	  treat wildcard character in commonName. [ruby-dev:28121]
 
 Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -5106,23 +60975,20 @@ Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  Joel VanderWerf <vjoel at path.berkeley.edu>.
 	  [ruby-talk:165285] [ruby-core:6995]
 
-Sat Dec 24 18:58:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.4 released.
-
 Fri Dec 23 10:30:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/digest/sha2/sha2.c (ULL): support AIX C.  a patch from
 	  Kailden <kailden at gmail.com>.  [ruby-core:06984]
 
-Wed Dec 21 16:53:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Dec 21 16:47:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (w32_io_info): should return handle because FileIndex is
 	  valid only while file is open. [ruby-dev:28088]
 
-Wed Dec 21 14:53:26 2005  Tanaka Akira  <akr@m17n.org>
+Wed Dec 21 12:12:21 2005  Tanaka Akira  <akr@m17n.org>
 
-	* lib/pathname.rb (test_kernel_open): use File.identical?.
+	* test/pathname/test_pathname.rb (test_kernel_open): use
+	  File.identical?.
 	  [ruby-talk:171804]
 
 Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -5130,36 +60996,102 @@ Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (eval_under_i): evaluate source in caller's frame.
 	  [ruby-dev:28076]
 
-	* eval.c (rb_call_super): use original method name on exception.
-	  [ruby-dev:28078]
+Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
 
-Tue Dec 20 13:11:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
+	  with previous Ruby versions, documents are no longer headless.
 
-	* ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
-	  [ruby-dev:27839]
+Tue Dec 20 12:33:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
-	  NULL or not before S_FREE.
+	* ext/syck/rubyext.c (syck_node_transform): ruby object holding
+	  explicitly freed SyckNode caused SEGV. [ruby-dev:28067]
+
+	... I think syck GC problem was solved now!
+
+Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_f_backquote): fix a GC problem on
+	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
+
+Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (XCFLAGS): separated as well as win32/Makefile.sub.
+
+	* main.c (always_gc): dllimport is required for VC to import a DLL
+	  symbol.  fixed: [ruby-dev:28051]
+
+	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
+
+Mon Dec 19 23:09:24 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert
 	  in gram.c to insert node from rb_syck_bad_anchor_handler into
 	  SyckParser's hash table. if GC occurs in st_insert, it's not under
 	  SyckParser's mark system yet. so RString can be released wrongly.
-	  [ruby-dev:28057]
 
-Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
+	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
+	  NULL or not before S_FREE.
 
-	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
-	  with previous Ruby versions, documents are no longer headless.
+	* ext/syck/rubyext.c (syck_parser_assign_io): rb_check_string_type can
+	  return new RString. if so, it becomes unreachable from GC after
+	  returns syck_parser_assign_io, and can be freed by GC. (dangling
+	  in syck io system) so extends its life time till syck_parse is called.
 
-Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/syck/rubyext.c (syck_parser_s_alloc): always allocates bonus,
+	  so no need to check if NULL, and "volatile VALUE hash"
+	  is not needed. (bonus->port was not protected in syck_emitter_reset)
 
-	* io.c (rb_f_backquote): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
+	* ext/syck/rubyext.c (syck_mark_parser): ditto.
 
-Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/syck/rubyext.c (syck_parser_load): ditto.
 
-	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
+	* ext/syck/rubyext.c (syck_parser_load_documents): ditto.
+
+	* ext/syck/rubyext.c (syck_emitter_s_alloc): ditto.
+
+	* ext/syck/rubyext.c (syck_mark_emitter): ditto.
+
+	* ext/syck/rubyext.c (syck_emitter_reset): ditto.
+
+	* ext/syck/rubyext.c (syck_scalar_value_set): "should set newly
+	  allocated memory instead of RString's internal storage" stuff again.
+	  by this, should call syck_free_node instead of rb_syck_free_node.
+
+	* ext/syck/rubyext.c (syck_node_type_id_set): ditto.
+
+	... I believe syck GC problem was solved by this.
+
+Mon Dec 19 12:20:59 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): activate only
+	  before gcc 4.0.3 on SPARC and IA64.
+
+Mon Dec 19 11:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c: sorry, I reverted my "should set newly
+	  allocated memory instead of RString's internal storage" stuff.
+	  node allocated in rubyext.c seems to be freed by rb_syck_free_node
+	  not syck_free_node, and it won't free data.str->ptr and type_id.
+
+	 (I still think this is unsafe because RString(foo)->ptr becomes
+	  dangling pointer when RString is modified or freed, but anyway
+	  I misunderstood, so go back to original code for now)
+
+Sat Dec 17 21:50:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c (syck_emitter_reset): should initialize
+	  emitter->bonus->oid. otherwise rb_gc_mark crashes.
+
+	* ext/syck/rubyext.c (syck_mark_parser): should mark anchor nodes
+	  because they hold ruby objects. (ie: rb_syck_bad_anchor_handler)
+
+Sat Dec 17 11:00:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/rubyext.c (rb_syck_compile): avoid potential memory
+	  leak.
+
+	* ext/syck/rubyext.c (syck_set_ivars): avoid potential memory
+	  leak by explicit symbol allocation.
 
 Sat Dec 17 03:57:01 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -5171,10 +61103,35 @@ Sat Dec 17 03:30:23 2005  Tanaka Akira  <akr@m17n.org>
 	* eval.c (bmcall): fix a GC problem by tail call on
 	  IA64 with gcc 4.0.3 20051216 (prerelease).
 
-Fri Dec 16 00:54:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Dec 16 17:53:45 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c (rb_syck_compile): fixed memory leak.
+
+	* ext/syck/rubyext.c: should protect global variable from GC.
+
+Fri Dec 16 11:44:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c (syck_resolver_tagurize): fixed memory leak.
+
+	* ext/syck/rubyext.c (syck_node_type_id_set): should set newly
+	  allocated memory instead of RString's internal storage.
+
+	* ext/syck/rubyext.c (syck_scalar_value_set): ditto.
+
+	... these fixes won't fix [ruby-dev:27839]. more work is needed.
+
+Fri Dec 16 04:38:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* signal.c (Init_signal): revert C++ style comment.
-	  [ruby-dev:28041]
+	* lib/delegate.rb (Delegator::method_missing): should delegate
+	  block as well.
+
+Thu Dec 15 19:57:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::MorphingBody): fix criteria to
+	  use Tempfile.  A fix from Zev Blut <rubyzbibd at ubit.com>.
+	  [ruby-core:06076]
+
+	* string.c: remove global functions work on $_.
 
 Thu Dec 15 12:35:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -5186,10 +61143,18 @@ Thu Dec 15 01:33:31 2005  Tanaka Akira  <akr@m17n.org>
 	* ext/zlib/zlib.c (zstream_run): fix a GC problem by tail call on
 	  x86_64 with gcc 4.0.3 20051111 (prerelease) (Debian 4.0.2-4)
 
-Wed Dec 14 12:11:46 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Dec 14 23:50:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb (find_class_comment): fix for class
+	  document with prototypes.  [ruby-core:06863]
+
+Wed Dec 14 23:39:53 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (has_magic): glob names contain alphabets to enable case fold
+	  search.  [ruby-dev:27735]
 
-	* test/gdbm/test_gdbm.rb: specify pid for the argument of
-	  Process.wait.  workaround for Cygwin.
+	* dir.c (Init_Dir): FNM_SYSCASE which is default case fold flag.
+	  [ruby-dev:23296]
 
 Wed Dec 14 12:01:26 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -5213,11 +61178,18 @@ Tue Dec 13 00:08:09 2005  Tanaka Akira  <akr@m17n.org>
 	* sprintf.c (rb_str_format): fix a GC problem.
 	  [ruby-dev:28001]
 
-Mon Dec 12 15:54:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec 12 15:51:22 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_ssl.rb (test_parallel): call GC.start to close
 	  unused files. [ruby-dev:27981]
 
+Mon Dec 12 09:58:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_cover): new method Range#cover? added.  the
+	  method name might be changed.  thanks to takano32 at
+	  http://www.rubyist.net/~matz/20051210.html#c08 for name
+	  suggestion.  [ruby-talk:167182]
+
 Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
@@ -5227,11 +61199,38 @@ Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  be called before actual variable initialization.
 	  [ruby-dev:27986]
 
+Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
+	  (see ext/tk/ChangeLog.tkextlib).
+
+	* ext/tk/sample/scrollframe.rb: add a new sample.
+
+Sun Dec 11 22:07:58 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb (test_remote_array_and_hash): pseudo remote
+	  objects are protected against GC. [ruby-dev:27911]
+
+Sat Dec 10 01:06:06 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/matrix.rb: add Matrix#determinant_e, Matrix#rank_e.
+	  [ruby-dev:27820] and related thread.
+
+Sat Dec 10 00:31:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (calling_scope_t): gave names to magic numbers for rb_call().
+	  [ruby-dev:27978]
+
 Fri Dec  9 23:31:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rexml/encoding.rb (encoding=): give priority to particular
 	  conversion to iconv.  [ruby-core:06520]
 
+Fri Dec  9 23:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_include): return false unless included in numeric
+	  range.  fixed: [ruby-dev:27975]
+
 Thu Dec  8 02:07:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (umethod_bind): adjust invoking class for module method.
@@ -5246,6 +61245,15 @@ Wed Dec  7 17:10:27 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
 
+Wed Dec  7 16:39:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_include): use discrete membership for non Numeric
+	  values, for example, String.
+
+	* numeric.c (num_scalar_p): new method. [ruby-dev:27936]
+
+	* lib/complex.rb (Complex#scalar?): ditto.
+
 Wed Dec  7 15:31:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sprintf.c (rb_str_format): integer overflow check added.
@@ -5273,11 +61281,22 @@ Wed Dec  7 01:02:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-en/menu.rb: ditto.
 
+Tue Dec  6 16:48:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (ruby_xmalloc2): change check condition for integer
+	  overflow.  [ruby-dev:27399]
+
+	* gc.c (ruby_xrealloc2): ditto.
+
 Tue Dec  6 16:37:57 2005  Yuya Nishida  <yuya@j96.org>
 
 	* eval.c (exec_under): avoid accessing ruby_frame->prev.
 	  [ruby-dev:27948]
 
+Fri Dec  2 19:06:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (Compare): should not fold double byte alphabet on win9x.
+
 Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_funcall2): allow to call protected methods.
@@ -5285,6 +61304,9 @@ Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Wed Nov 30 23:52:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* parse.y (struct parser_params): fields common to ripper must be
+	  placed at each same offset.
+
 	* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
 	  fixed: [ruby-dev:27896]
 
@@ -5293,23 +61315,51 @@ Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
 	  expression.   [ruby-dev:27868]
 
-Mon Nov 28 18:55:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 29 23:57:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (struct parser_params): heap must be placed at same offset
+	  also in ripper.y.  fixed: [ruby-dev:27846]
+
+	* parse.y (yycompile): prevent vparser from tail call optimization.
+	  fixed: [ruby-dev:27851]
+
+	* parse.y (parser_mark): value needs to be marked.
+	  fixed: [ruby-dev:27845]
+
+Tue Nov 29 22:45:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/observer.rb (notify_observers): follow change of observer.rb.
+	  fixed: [ruby-core:6796]
+
+Mon Nov 28 20:24:22 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (PP::PPMethods#object_address_group): mask an address with
+	  word size.
+
+	* lib/pp.rb (PP::PPMethods#object_address_group): adjust address format.
+
+Mon Nov 28 18:55:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/socket.c (init_inetsock_internal): remove setting
 	  SO_REUSEADDR option on server socket on Cygwin.
 	  fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
 
-Mon Nov 28 13:08:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Nov 28 13:11:45 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
 	  error message on bccwin32 + winsock)
 
-Mon Nov 28 09:21:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Nov 28 09:15:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/mkmf.rb (create_makefile): should not change sodir with
-	  dir.gsub!. (bccwin32 failed to install third party exntesions)
+	  dir.gsub!. (bccwin32 failed to install third party extensions)
 	  [ruby-dev:27834]
 
+Sun Nov 27 05:37:20 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb: use File.basename to decompose pathnames.
+	  experimental Windows support.
+
 Sun Nov 27 00:56:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/wsdl/xmlSchema/complexContent.rb: missing
@@ -5319,23 +61369,103 @@ Sat Nov 26 19:57:45 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* dln.c (conv_to_posix_path): should initialize posix.
 
-Thu Nov 24 21:05:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 25 20:34:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/xmlrpc/datetime.rb (DateTime::to_a): comparison with non
+	  array-convertible object must return false.
+
+Fri Nov 25 14:34:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_max): treat end exclusion without iteration if
+	  the end value is an integer.  [ruby-talk:167433]
+
+Fri Nov 25 12:52:57 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: added backward compatibility codes.
+	* lib/rss/parser.rb: ditto.
+	* test/rss/test_parser.rb: ditto.
+	* test/rss/test_2.0.rb: ditto.
+
+	* test/rss/test_content.rb: use #__send__ instead of #funcall for
+	  no private method.
+
+Fri Nov 25 12:39:56 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: improved type conversion.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/syndication.rb: ditto.
+
+	* test/rss/test_2.0.rb: added type conversion tests.
+	* test/rss/test_accessor.rb: ditto.
+	* test/rss/test_to_s.rb: ditto.
+	* test/rss/test_syndication.rb: ditto.
+	* test/rss/test_setup_maker_2.0.rb: ditto.
+	* test/rss/test_setup_maker_1.0.rb: ditto.
+	* test/rss/test_setup_maker_0.9.rb: ditto.
+	* test/rss/test_maker_sy.rb: ditto.
+	* test/rss/test_maker_image.rb: ditto.
+	* test/rss/test_maker_2.0.rb: ditto.
+	* test/rss/test_maker_0.9.rb: ditto.
+	* test/rss/test_image.rb: ditto.
+
+	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
+
+	* test/rss/rss-assertions.rb: improved type conversion assertions.
+
+Fri Nov 25 10:38:20 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/image.rb: added Image prefix.
+
+	* lib/rss/maker/image.rb: ditto.
+
+Fri Nov 25 10:33:02 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_2.0.rb: added RSS 2.0 tests.
+
+	* test/rss/rss-assertions.rb: extended XML stylesheet assertion.
+
+	* lib/rss/0.9.rb: added initialize method.
+
+	* test/rss/test_1.0.rb: cleanup.
+
+Fri Nov 25 10:29:48 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in (AC_CHECK_FUNCS): need to check link().
-	  fixed: [ruby-dev:27814]
+	* range.c (range_min): use <=> comparison rather than iteration.
+	  [ruby-talk:167420]
 
-Thu Nov 24 01:22:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* range.c (range_max): ditto.
+
+Thu Nov 24 01:31:44 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (w32_io_info): CreateFile failed on Win9x if file was already
 	  opened. (FILE_SHARE_READ was needed, but actually I don't understand
 	  the flags of CreateFile well...)
 
+Wed Nov 23 23:52:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_div): use floor rather than rb_Integer().
+	  [ruby-dev:27674]
+
+Wed Nov 23 22:34:15 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb: added entity handling type predicate.
+	* lib/rss/rexmlparser.rb: ditto.
+	* lib/rss/xmlparser.rb: ditto.
+	* lib/rss/xmlscanner.rb: ditto.
+
+	* lib/rss/xmlscanner.rb: more robust entity handling.
+
+	* test/rss/test_parser.rb: added an entity handling test.
+
 Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
 	  [Tk8.5 feature].
 
-	* ext/tk/lib/tk/text.rb: supports new indices modifires on a Text
+	* ext/tk/lib/tk/text.rb: supports new indices modifiers on a Text
 	  widget [Tk8.5 feature].
 
 	* ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
@@ -5345,7 +61475,7 @@ Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
 	  feature].
 
-Wed Nov 23 18:55:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Nov 23 18:52:45 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (w32_io_info): should not call GetFileInformationByHandle
 	  for pipe.
@@ -5354,15 +61484,61 @@ Wed Nov 23 18:55:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (w32_io_info): now can identify directory on WinNT.
 
+Wed Nov 23 18:46:53 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/: use #__send__ instead of #send.
+	* test/rss/: ditto.
+
+Wed Nov 23 18:32:56 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_taxonomy.rb: use #reject directory.
+
+Wed Nov 23 18:26:00 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/taxonomy.rb: changed class or module prefix to
+	  Taxonomy from Taxo.
+	* lib/rss/maker/taxonomy.rb: ditto.
+
+Wed Nov 23 18:21:11 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
+	  Maker.
+	* lib/rss/taxonomy.rb: supported RSS Maker.
+	* lib/rss/maker.rb: added taxonomy module support.
+
+	* lib/rss/rss.rb: adjusted to other element API.
+	* lib/rss/1.0.rb: adjusted to other element API but backward
+	  compatibility is reserved.
+	* lib/rss/0.9.rb: ditto.
+
+	* test/rss/test_maker_taxo.rb: added test case for taxonomy module
+	  for RSS Maker.
+	* test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
+
+	* test/rss/test_setup_maker_1.0.rb: added backward compatibility
+	  test.
+	* test/rss/test_setup_maker_0.9.rb: ditto.
+	* test/rss/test_setup_maker_2.0.rb: ditto.
+
+	* test/rss/rss-testcase.rb: added convenience method for setting
+	  up taxo:topic.
+	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
+
+	* sample/rss/blend.rb: followed new API.
+
+Wed Nov 23 17:42:24 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: fixed a indentation bug.
+
+	* lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
+
+	* test/rss/test_taxonomy.rb: added a #to_s test.
+
 Wed Nov 23 03:40:49 2005  Guy Decoux  <ts@moulon.inra.fr>
 
 	* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
 	  [ruby-core:06721]
 
-Wed Nov 23 11:01:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* intern.h, file.c: failed to compile on windows.
-
 Wed Nov 23 07:26:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
@@ -5394,14 +61570,14 @@ Tue Nov 22 18:36:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
 
-Tue Nov 22 14:46:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 22 14:36:54 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
 
 	* test/ruby/test_path.rb (test_dirname, test_basename): follow new
 	  spec. and add new tests.
 
-Tue Nov 22 13:18:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Nov 22 13:30:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
 	  p Dir.glob('*') should work on WinNT. (implemented our own
@@ -5430,6 +61606,11 @@ Mon Nov 21 16:03:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/setup.mk: findstr doesn't exist on win9x.
 	  fixed: [ruby-dev:27756]
 
+Sun Nov 20 21:39:27 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* regparse.c (fetch_token_in_cc): tok->escaped should be
+	  initialized.  [ruby-dev:27763]
+
 Sun Nov 20 22:34:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
@@ -5440,6 +61621,10 @@ Sat Nov 19 19:57:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
 	  [ruby-core:06661]
 
+Sat Nov 19 08:19:38 2005  Zach Dennis  <zdennis@mktec.com>
+
+	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
+
 Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
@@ -5449,7 +61634,7 @@ Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
 
-Fri Nov 18 17:57:08 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 18 18:07:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_file_s_dirname): should use skipprefix for UNC path.
 	  pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
@@ -5470,7 +61655,7 @@ Fri Nov 18 17:35:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/namespace.rb: ditto.
 
-Fri Nov 18 17:26:06 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 18 16:47:33 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_file_s_dirname): added checks for some patterns with drive
 	  letter. fixed: [ruby-dev:27738]
@@ -5478,11 +61663,37 @@ Fri Nov 18 17:26:06 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 	* test/ruby/test_path.rb (test_dirname): added tests for above
 	  patterns.
 
-Fri Nov 18 12:18:02 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Nov 18 12:19:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
 	  returns true on VisualC++6.
 
+Thu Nov 17 17:58:00 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/1.0.rb: added convenience method 'resources'.
+
+	* lib/rss/taxonomy.rb: ditto.
+
+	* test/rss/rss-assertions.rb: added test for 'resources'.
+
+	* test/rss/test_taxonomy.rb: ditto.
+
+Thu Nov 17 17:53:30 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/taxonomy.rb: implemented taxonomy module.
+
+	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
+
+Thu Nov 17 17:40:19 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/1.0.rb: added rdf:Bag.
+
+Thu Nov 17 13:52:00 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: removed needless argument 'prefix'.
+
+	* lib/rss/parser.rb: ditto.
+
 Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (static-ruby): overridable.
@@ -5492,12 +61703,24 @@ Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (RUBY, RUBYW): overridable.
 
-Tue Nov 15 23:46:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Nov 16 01:29:31 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/trackback.rb: added TrackBack prefix.
+
+	* lib/rss/maker/trackback.rb: ditto.
+
+Wed Nov 16 01:26:13 2005  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/find.rb (Find::find): should not ignore symbolic links to
-	  non-existing files.  [ruby-talk:165866]
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
+
+	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
 
-Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Nov 15 23:54:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_load_ok): eaccess() returns 0 on success.
+	  fixed: [ruby-dev:27713]
+
+Tue Nov 15 16:36:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c (rb_ary_fill): previous commit disabled this usage:
 
@@ -5505,9 +61728,17 @@ Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
 
 	  previous commit has the advantage of early garbage collection, but
-	  potensially this would break some script. so I reverted behavior.
+	  potentially this would break some script. so I reverted behavior.
+
+Tue Nov 15 16:15:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (file_load_ok): use eaccess() instead of actually opening
+	  the file.  [ruby-talk:156378]
 
-Tue Nov 15 16:04:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/jcode.rb (String::reverse): add new methods.
+	  [ruby-list:41245]
+
+Tue Nov 15 15:49:34 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c (rb_ary_fill): tail elements were vanished when the middle
 	  part of array was filled. (ie: [0,1,2,3,4].fill(-1,2,1) => [0,1,-1])
@@ -5529,33 +61760,71 @@ Mon Nov 14 17:36:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* array.c (rb_ary_first): RDoc update from Daniel Berger
 	  <djberg96@yahoo.com>.  [ruby-core:06577].
 
-Fri Nov 11 10:31:44 2005  Zach Dennis  <zdennis@mktec.com>
+Sun Nov 13 10:55:24 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
+	* lib/uri/common.rb (escape): regard second argument as a
+	  character set. [ruby-dev:27692]
+
+Sat Nov 12 08:36:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, eval.c, intern.h: check fd_mask type.
+
+	* configure.in (socketpair): need to be checked.
+
+Fri Nov 11 19:53:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* eval.c, intern.h: failed to compile where NFDBITS is defined but
+	  howmany() is not defined. [ruby-dev:27680]
+
+	* io.c (is_socket): failed to compile where S_ISSOCK is not defined.
+
+	* io.c (pipe_open): failed to compile where socketpair is not supported.
 
 Fri Nov 11 08:20:56 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in (OUTFLAG): keep trailing spaces.  [ruby-dev:27666]
 
-	* mkconfig.rb: substitution refereces added.
+	* mkconfig.rb: substitution references added.
 
-Fri Nov 11 07:44:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Nov 11 07:39:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
 	  EINVAL, and this causes error in test/fileutils.)
 
-	* file.c: overwride chown(2) and fchown(2) on BeOS. (these functions
+	* file.c: override chown(2) and fchown(2) on BeOS. (these functions
 	  should not change user/group id if -1 is passed as corresponding
 	  argument, and this causes error in test/fileutils too)
 	  [ruby-dev:27672]
 
-	* file.c (rb_file_s_link): checks HAVE_LINK.
+Thu Nov 10 21:05:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/shellwords.rb: fix for blank but not empty string.
+	  fixed: [ruby-dev:27663]
+
+Wed Nov  9 08:39:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/shellwords.rb: refactored.  [ruby-core:06581]
+
+Tue Nov  8 17:35:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* intern.h, eval.c (rb_thread_signal_raise): constified.
+
+	* signal.c: cosmetic change.
 
 Tue Nov  8 15:32:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
 	  [ruby-dev:27560] [ruby-core:4627]
 
+Mon Nov  7 20:54:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c: iconvctl() support.  [EXPERIMENTAL]
+
+Mon Nov  7 16:23:23 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl.h: need to include winsock2.h before including
+	  windows.h by some openssl headers.
+
 Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
@@ -5566,7 +61835,7 @@ Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tkutil/tkutil.c: ditto.
 
-Mon Nov  7 00:06:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Nov  7 00:06:12 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
 
@@ -5575,7 +61844,7 @@ Sun Nov  6 23:39:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
 	  bug of underlying library.
 
-Sun Nov  6 21:46:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Nov  6 21:43:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
 	  interpreter after initialization is done. [ruby-dev:27638]
@@ -5585,21 +61854,33 @@ Sun Nov  6 20:13:27 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
 	  buffer size is less than required.  fixed: [ruby-dev:27634]
 
+Sat Nov  5 13:42:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, cygwin/GNUmakefile.in (mingw): use def file to alias
+	  symbols.  [ruby-dev:27532]
+
+	* bcc32/mkexports.rb, win32/mkexports.rb: make aliases in DLL.
+
+	* win32/win32.c, win32/win32.h: replace symbols only when RUBY_EXPORT
+	  is defined.
+
+Thu Nov  3 07:57:39 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/open-uri.rb (open_loop): find_proxy should return nil when
+	  proxy does not exist. [ruby-dev:27630]
+
 Wed Nov  2 20:25:28 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
 	  for Win32.
 
-Wed Nov  2 20:14:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib: merge into ext/tk and remove.
-
 Wed Nov  2 19:03:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
-	  ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
+	* ext/tk/tcltklib.c (ip_rbUpdateObjCmd, ip_rb_threadUpdateObjCmd):
+	  passed improper flags to DoOneEvent().
 
-	* ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
+	* ext/tk/tkutil/tkutil.c: use rb_obj_respond_to() instead of
+	  rb_respond_to().
 
 Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -5609,7 +61890,7 @@ Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (exec_under): frame during eval should preserve external
 	  information.
 
-Tue Nov  1 10:50:17 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Nov  1 10:48:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: should check ERR_peek_last_error().
 	  [ruby-dev:27597]
@@ -5621,19 +61902,14 @@ Mon Oct 31 17:34:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* configure.in: use proper option for Sun linker. A patch from
 	  Shinya Kuwamura <kuwa at labs.fujitsu.com>.  [ruby-dev:27603]
 
-Mon Oct 31 11:27:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
-	  skip on Win32/DOS platforms.
-
-Mon Oct 31 05:49:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Oct 31 05:46:08 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
 	  not be empty. [ruby-talk:161220]
 
 	* test/openssl/test_cipher.rb: add test for Cipher#update("").
 
-Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Oct 31 05:38:26 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpservlet/cgihandler.rb
 	  (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
@@ -5645,17 +61921,14 @@ Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
 	  test/webrick/webrick.cgi: add some test for cookie.
 
-Mon Oct 31 03:19:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_readline): type check.
-	  [ruby-core:6089]
+Mon Oct 31 02:33:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (fix_rshift): RDoc fix.  [ruby-core:6351]
 
 	* util.h (strtod): add #undef for platforms defines strtod()
 	  macro.   [ruby-dev:27563]
 
-Mon Oct 31 02:35:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Oct 31 02:31:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* test/ruby/test_float.rb (test_precision): test by assert_in_delta.
 	  [ruby-dev:27575]
@@ -5667,25 +61940,33 @@ Sat Oct 29 01:58:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/fcntl/fcntl.c: ditto.
 
+Sat Oct 29 16:56:03 2005  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: added seven predicates sunday? to saturday?.
+
+	* lib/date.rb: added two methods {prev,next}_month,
+	  that are almost same as << and >>.
+
+Thu Oct 27 20:34:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_allocate): allow subclassing.
+
 Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (scan_once): wrong condition to use mbclen2().
 	  [ruby-dev:27535]
 
-Wed Oct 26 09:27:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Oct 27 11:53:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* missing.h, missing/memcmp.c, missing/memmove.c:
+	  ANSI compatible interface.
+
+Wed Oct 26 09:15:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/implicit.c (syck_type_id_to_uri): should return
 	  newly allocated memory. otherwise, type_id will be freed
 	  twice. [ruby-dev:27384] [ruby-core:6385]
 
-Wed Oct 26 09:04:51 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
-	  values have VALUE type. there is an environment where sizeof(VALUE)
-	  != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
-	  and received by 64bit integer (VALUE), upper bits may have garbage value.
-	  [ruby-dev:27513]
-
 Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_EXTERN): macro to export symbols in shared
@@ -5696,6 +61977,14 @@ Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
 
+Tue Oct 25 20:06:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
+	  values have VALUE type. there is an environment where sizeof(VALUE)
+	  != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
+	  and received by 64bit integer (VALUE), upper bits may have garbage value.
+	  [ruby-dev:27513]
+
 Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rational.rb: applied documentation patch from Gavin Sinclair
@@ -5704,12 +61993,22 @@ Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
 	  in irb auto-indentation mode.  [ruby-core:06358]
 
+Tue Oct 25 14:21:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* gc.c (garbage_collect): sorry, previous commit was incorrect.
+	  [ruby-core:6386]
+
+Tue Oct 25 13:40:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* gc.c (garbage_collect): return now whether there're rooms for new
+	  objects, rather than whether GC run. fixed: [ruby-core:6376]
+
 Tue Oct 25 02:12:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
 	  reduce redundant backtrack.  [ruby-talk:161771]
 
-Tue Oct 25 00:27:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Oct 25 00:35:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/*: RDoc documentation from Eric Hodel
 	  <drbrain@segment7.net> added.
@@ -5719,11 +62018,19 @@ Mon Oct 24 21:14:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
 	  [ruby-core:06247]
 
-Mon Oct 24 20:49:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct 24 20:38:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
 	  fixed: [ruby-list:40058], [ruby-dev:27479]
 
+Mon Oct 24 11:01:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
+	  typo fixed.  [ruby-talk:162187]
+
+	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
+	  ditto.  [ruby-core:06359]
+
 Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
@@ -5732,15 +62039,18 @@ Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
 	  ditto.  [ruby-core:06359]
 
-Sun Oct 23 21:50:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/matrix.rb (Matrix::initialize): use funcall instead of send
+	  to allow private methods to be called.  A report from
+	  Jean-Claude Arbaut <jcarbaut@laposte.net>.  [ruby-core:06359]
+
+Mon Oct 24 00:41:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/enumerator/enumerator.c: applied documentation patch from
-	  James Edward Gray II <james@grayproductions.net>.
-	  [ruby-core:06348]
+	* time.c (time_sunday): added predicate methods for the days of the
+	  week.  [ruby-list:41340]
 
 Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
+	* ext/tk/extconf.rb: improve messages [ruby-core:06325].
 
 	* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
 	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
@@ -5767,6 +62077,16 @@ Sat Oct 22 23:54:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
 	  options.  [ruby-dev:27449]
 
+Sat Oct 22 14:25:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* util.[hc] (ruby_add_suffix): constified.
+
+	* util.[hc] (ruby_scan_{oct,hex}): fixed typo. (renamed from
+	  scan_{oct,hex})
+
+	* util.c: almostly ANSI styled. (except for functions depending on
+	  macro and K&R technique)
+
 Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
@@ -5777,7 +62097,20 @@ Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* time.c (rb_strftime): removed meaningless volatile modifiers, and
 	  concatenate successive nul characters at once.  [ruby-dev:27472]
 
-Fri Oct 21 19:21:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/tk/lib/tk/font.rb, ext/tk/lib/tkextlib/ICONS/icons.rb,
+	  ext/tk/sample/tkextlib/treectrl/demo.rb, lib/net/imap.rb,
+	  lib/rss/parser.rb, test/rss/test_content.rb,
+	  test/rss/test_dublincore.rb, test/rss/test_syndication.rb,
+	  test/rss/test_trackback.rb, test/ruby/test_eval.rb,
+	  test/socket/test_socket.rb, test/socket/test_udp.rb:
+	  Object#fcall was renamed as Object#funcall.
+
+Sat Oct 22 10:08:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* missing.h, missing/*.c: SUSv3 compatible strcasecmp and strncasecmp,
+	  ANSI compatible strtol and strtoul, and ANSI styled other functions.
+
+Fri Oct 21 19:16:08 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
 
@@ -5785,7 +62118,27 @@ Fri Oct 21 17:49:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bin/erb (ERB::Main::run): typo fixed.  [ruby-core:06337]
 
-Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Oct 21 15:42:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* intern.h, struct.c (rb_struct_iv_get): constified.
+
+	* marshal.c: avoid one VC++6 warning for implicit conversion
+	  from int to char.
+
+	* ruby.h: ANSI styled.
+
+	* bcc32/Makefile.sub (HAVE_HYPOT): added.
+
+	* ext/socket/extconf.rb: BeOS is only one platform should call
+	  closesocket, so check __BEOS__ macro directly. (I was worried
+	  accidently HAVE_CLOSESOCKET is defined on windows again because
+	  it has it)
+
+	* ext/socket/{getaddrinfo.c,socket.c}: ditto.
+
+	... these are all cosmetic changes.
+
+Fri Oct 21 15:23:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bignum.c (bignew_1): convertion from `int' to `char' discards
 	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
@@ -5795,7 +62148,26 @@ Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* time.c: should use LONG_LONG instead of `long long'.
 
-Thu Oct 20 09:37:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Oct 20 22:22:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parser.y (struct parser_params): parser never modify input string.
+
+	* ext/ripper/tools/preproc.rb (prelude): do not append surplus
+	  newlines to fix line numbers.
+
+Thu Oct 20 11:41:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* class.c, eval.c, hash.c, st.c, variable.c: changed /* ??? */ stuff
+	  protoize generated to ANYARGS.
+
+Thu Oct 20 11:18:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* eval.c, file.c, ruby.c: removed strchr, strrchr, strstr definition
+	  because they are defined in missing.h.
+
+	* missing.h, missing/strchr.c, missing/strstr.c: ANSI styled.
+
+Thu Oct 20 09:36:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/mkmf.rb (create_makefile): Borland make seems not to allow
 	  empty dependency list. If this change is not good, please correct
@@ -5806,20 +62178,13 @@ Thu Oct 20 07:55:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (create_makefile): get rid of a restriction
 	  of Borland make.  fixed: [ruby-dev:27460]
 
-Thu Oct 20 00:13:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubysig.h (CHECK_INTS): fix typo.
+	* ext/ripper/depend: ditto.
 
 Wed Oct 19 23:58:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): do not create unnecessary empty
 	  directories.  fixed: [ruby-dev:27451]
 
-Wed Oct 19 19:26:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
-	  fixed: [ruby-dev:27439]
-
 Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_join): elements may contain null pointer strings.
@@ -5827,27 +62192,33 @@ Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c, gc.c, time.c: made internal symbols static.  [ruby-dev:27435]
+	* enumerator.c, eval.c, gc.c, parse.y, regparse.c, sjis.c, time.c:
+	  made internal symbols static.  [ruby-dev:27435]
+
+Tue Oct 18 10:58:27 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/depend, ext/dl/extconf.rb, ext/socket/depend,
+	  ext/socket/extconf.rb: shouldn't define DESTCLEANFILES in depend,
+	  use $distcleanfiles in extconf.rb.
 
-Wed Oct 19 01:27:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/Makefile.sub (distclean-local): should remove .config.h.time.
 
-	* regex.c (re_compile_pattern): numeric literal inside character class
-	  disabled succeeding backtrack.  fixed: [ruby-list:41328]
+Mon Oct 17 09:42:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Mon Oct 17 21:18:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* mkconfig.rb: fixup configure_args for mswin32 configure.
 
-	* parse.y (parser_heap): byacc never free parser stack.
-	  fixed: [ruby-dev:27428]
+	* win32/configure.bat (srcdir, target): ditto.
 
-Mon Oct 17 16:04:47 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct 17 05:01:50 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
+	* env.h: move struct METHOD and struct BLOCK from eval.c to
+	  support NodeWrap and ParseTree.
 
 Sun Oct 16 22:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: omit non-existing directories.
 
-Sun Oct 16 14:30:05 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Oct 16 14:40:54 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
 	  tuple. fixed: [ruby-list:41227]
@@ -5865,20 +62236,48 @@ Sun Oct 16 03:38:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_thread_schedule): clear rb_thread_critical.
 	  [ruby-core:04039]
 
-Sat Oct 15 19:56:38 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Oct 16 00:13:14 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/configure.bat: remove unnecessary line which prevents
+	  creating Makefile.
+
+Sat Oct 15 23:52:07 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb: (getbinaryfile): allow nil for localfile, and
+	  returns retrieved data if localfile is nil.
+
+	* lib/net/ftp.rb: (gettextfile): ditto.
+
+Sat Oct 15 19:51:29 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* bin/erb: typo fixed, again. thanks, Doug Kearns.
 
-Fri Oct 14 22:08:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Oct 14 23:09:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (MKFILES): update MKFILES if configure files get
+	  changed.
+
+	* win32/configure.bat, win32/setup.mak (configure_args): store
+	  arguments to configure files.
+
+Fri Oct 14 22:05:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (ioctl): should set errno.
 
-Fri Oct 14 16:57:32 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Oct 14 16:39:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
 	  It is harmful to permit the access to ~/public_html by default.
 	  suggested by Hiroyuki Iwatsuki.
 
+Fri Oct 14 04:58:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_exec): create instance_exec and
+	  module_exec which pass arguments to the block.
+
+	* eval.c (rb_f_funcall): rename fcall to funcall to follow
+	  tradition.
+
 Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (HEAPCNT): bison allocates indivisible size.
@@ -5887,7 +62286,7 @@ Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* io.c, pack.c, ext/syck/rubyext.c, ext/syck/syck.h, missing/isinf.c:
 	  get rid of warnings.  fixed: [ruby-core:06247]
 
-Wed Oct 12 12:52:57 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Oct 12 12:51:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl.c (Init_openssl): should call
 	  OpenSSL_add_ssl_algorithms().
@@ -5898,6 +62297,15 @@ Wed Oct 12 11:08:54 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Tue Oct 11 21:41:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* configure.in (RUBY_FUNC_ATTRIBUTE): check prefixed attribute form
+	  first.  [ruby-dev:27398]
+
+	* array.c, enum.c, eval.c, util.c: safer function pointer usage.
+	  fixed: [ruby-core:06143]
+
+	* util.h (qsort): removed the definition incompatible to ANSI.
+	  fixed: [ruby-core:06147]
+
 	* eval.c (rb_obj_respond_to): check if obj responds to the given
 	  method with the given visibility.  [ruby-dev:27408]
 
@@ -5908,33 +62316,66 @@ Tue Oct 11 00:01:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* st.c (st_free_table): do not call free() but xfree().
 	  [ruby-core:06205]
 
-Sat Oct  8 20:04:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Oct  8 19:49:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (Init_Binding): add Binding#dup method.  [yarv-dev:666]
 
+	* io.c (rb_io_init_copy): clear PREP flag for copied IO.
+	  fixed: [ruby-dev:27371]
+
 	* parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
 	  heap.  [ruby-list:41199]
 
+	* parse.y (ripper_initialize): use rb_respond_to().
+
+	* ext/ripper/depend (check): get rid of re-generating ripper.y always.
+
 	* ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
 
+	* ext/nkf/lib/kconv.rb (Kconv.conv): get rid of nil.to_a.
+
+	* lib/scanf.rb (Scanf::FormatSpecifier#letter, #width): use matched
+	  substring directly.
+
+	* test/ruby/test_assignment.rb, test/ruby/test_iterator.rb: followed
+	  change of sample/test.rb.
+
+	* test/net/http/test_http.rb: removed superfluous splatting stars.
+
+Fri Oct  7 16:41:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (splat_value): call rb_Array() to convert svalue to
+	  values.  [ruby-dev:27397]
+
 Fri Oct  7 09:54:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
 	  not be parsed correctly.  A patch from August Z. Flatby
 	  (augustzf) in [ruby-Patches-2595].  [ruby-core:06183]
 
-Thu Oct  6 20:12:16 2005  Minero Aoki  <aamine@loveruby.net>
+Thu Oct  6 22:51:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_Array): Array() to raise error for objects without
+	  to_ary, nor to_a.
+
+	* object.c (nil_to_a): revert NilClass#to_a.
+
+Thu Oct  6 20:10:38 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/strscan/strscan.c (strscan_free): remove useless code.
 	  [ruby-dev:26368] [ruby-dev:27389]
-	  (backported from trunk, rev 1.22)
+
+Thu Oct  6 01:02:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (rb_range_beg_len): should return Qfalse for non-range
+	  object.
 
 Wed Oct  5 04:42:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
 	  servlet on "/".
 
-Wed Oct  5 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Oct  5 04:06:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
 	  of "join".
@@ -5943,14 +62384,31 @@ Mon Oct  3 00:04:00 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* pack.c (EXTEND16): [ruby-dev:27383]
 
+Sat Oct  1 23:55:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (do_select, rb_w32_select): brush up.
+
+Sat Oct  1 12:57:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* bignum.c (rb_big_rand): removed.  [ruby-dev:25405]
+
+Sat Oct  1 01:46:51 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI.open_loop): prohibit multiple proxy
+	  options.
+
 Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
 
-	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
+	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): abolish sizeof(FILE).
 	  [ruby-dev:27317]
 
+Thu Sep 29 10:15:14 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (:proxy_http_basic_authentication): new option.
+
 Thu Sep 29 07:22:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* evalc. (rb_f_send): underscores need to be escaped.
+	* eval.c (rb_f_send): underscores need to be escaped.
 	  fixed by Doug Kearns.  [ruby-core:06053]
 
 Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -5961,38 +62419,21 @@ Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* variable.c (rb_autoload_load): now return true if autoload
 	  succeeded.  fixed: [ruby-dev:27331]
 
-Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (apply2files): add prototype.
+Wed Sep 28 23:40:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_stat_inspect): constified.
 
-	* class.c (rb_mod_init_copy, rb_class_init_copy), file.c (rb_stat_init_copy),
-	  numeric.c (num_init_copy), object.c (rb_obj_init_copy, Init_Object),
-	  re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
-	  undocumented.
-
-Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb: document update from James Edward Gray II
-	  <james@grayproductions.net>.  [ruby-core:06027]
-
-Wed Sep 28 15:14:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Sep 28 15:12:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
-	  refer the value of QUERY_STRING. [ruby-list:41186]
+	  refer to the value of QUERY_STRING. [ruby-list:41186]
 
 	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=):
 	  add new method.
 
 Wed Sep 28 10:45:44 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
-	  [ruby-dev:27335].
-
-Wed Sep 28 08:12:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (read_buffered_data): check if reached EOF.  fixed: [ruby-dev:27334]
+	* ext/tk/tcltklib.c: cannot compile with Tcl/Tk8.0.x [ruby-dev:27335].
 
 Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -6003,7 +62444,7 @@ Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
 
-Wed Sep 28 03:23:35 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Sep 28 03:16:41 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* rubysig.h: fixed build problem with --enable-pthread on platforms
 	  which don't have setitimer().
@@ -6013,15 +62454,38 @@ Mon Sep 26 22:32:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (set_trace_func): add rb_secure(4) to prevent adding
 	  tracing function.
 
-Sun Sep 25 12:05:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Sep 26 20:59:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* parse.y: changed to ANSI function style.
+
+Sun Sep 25 12:02:04 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* bin/erb: typo fixed.
 
+Sun Sep 25 11:54:11 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
+	  up method. Tabs converted to spaces.
+
+Sun Sep 25 09:34:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* parse.y: replaced `foo _((boo))' with `foo(boo)'.
+
+Sun Sep 25 08:19:53 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rss/test_content.rb, test/rss/test_syndication.rb: use fcall
+	  instead of send in order to override visibility.
+
 Sun Sep 25 01:46:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-calculate-indent): arrange deep-indent
 	  closing parenthesis at same column as the opening.
 
+Sun Sep 25 01:33:41 2005  Tanaka Akira  <akr@m17n.org>
+
+	* process.c (proc_setrlimit): make the third argument (rlim_max)
+	  optional.
+
 Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-expr-beg): deal with heredoc separately.
@@ -6031,20 +62495,37 @@ Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  level for continuous line inside parentheses.
 	  http://nabeken.tdiary.net/20050915.html#p02
 
-Sun Sep 25 00:18:11 2005  Tanaka Akira  <akr@m17n.org>
+Sat Sep 24 21:19:39 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
+	* ext/strscan/strscan.c: document enhancement.
+
+	* ext/strscan/strscan.c: update copyright year.
+
+	* ext/strscan/strscan.c: update coding style.
+
+Sat Sep 24 20:20:05 2005  Minero Aoki  <aamine@loveruby.net>
 
-Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
+	* test/net/http/test_http.rb (teardown): Net::HTTP.version_1_1 breaks
+	  many other tests; ensure that Net::HTTP is version 1.2 after test.
+	  [ruby-dev:27312]
+
+Sat Sep 24 11:44:28 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/net/http/test_http.rb: new file.
+
+Sat Sep 24 08:54:05 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (cd): no longer accept :noop option, related
-	  code is useless (backported from trunk, rev 1.67).
-	  [ruby-core:05858] [ruby-Bugs:2494]
+	  code is useless. [ruby-core:05858] [ruby-Bugs:2494]
+
+Sat Sep 24 08:30:00 2005  Tanaka Akira  <akr@m17n.org>
 
-Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
+	* lib/pathname.rb (Pathname#sub): new method.
+
+Sat Sep 24 08:29:36 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
-	  DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
+	  DryRun. [ruby-core:05954]
 
 	* test/fileutils/test_nowrite.rb: test it.
 
@@ -6052,32 +62533,163 @@ Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* test/fileutils/test_verbose.rb: new file.
 
+Sat Sep 24 07:59:01 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* sample/ripper/colorize.rb: removed (replaced by ruby2html.rb).
+
+	* sample/ripper/ruby2html.rb: added.
+
+Sat Sep 24 06:35:15 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper: no longer generates .rb files.
+
+	* parse.y (Init_ripper): ripper_init_eventids*() takes 1 argument,
+	  self (class Ripper).
+
+	* ext/ripper/depend: target removed: `lib/ripper/core.rb'.
+
+	* ext/ripper/depend: new target `eventids2table.c'.
+
+	* ext/ripper/depend: new target `check'.
+
+	* ext/ripper/eventids2.c: include eventids2table.c.
+
+	* ext/ripper/eventids2.c: initialize SCANNER_EVENT_TABLE.
+
+	* ext/ripper/extconf.rb: update $cleanfiles list.
+
+	* ext/ripper/tools/generate.rb: no longer generate ripper/core.rb.
+
+	* ext/ripper/tools/generate.rb: new mode `check'.
+
+	* ext/ripper/tools/generate.rb: new mode `eventids2table'.
+
+	* ext/ripper/lib/ripper/core.rb.in: removed.
+
+	* ext/ripper/lib/ripper/core.rb: added.
+
+	* ext/ripper/lib/ripper/filter.rb: update copyright year.
+
+	* ext/ripper/lib/ripper/lexer.rb: ditto.
+
+	* ext/ripper/lib/ripper/sexp.rb: ditto.
+
 Sat Sep 24 02:40:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb: document update from James Edward Gray II
 	  <james@grayproductions.net>.  [ruby-core:05942]
 
-Thu Sep 22 23:36:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep 24 02:05:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_daemon): should restrict execution on levels
+	  higher than $SAFE=2.  suggested by URABE Shyouhei
+	  <shyouhei@ice.uec.ac.jp>.
+
+Fri Sep 23 20:10:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/tools/generate.rb, ext/ripper/tools/preproc.rb: StringIO
+	  is not available for miniruby.  fixed: [ruby-dev:27307]
+
+Fri Sep 23 17:36:48 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
+	  [ruby-dev:27133]
+
+Fri Sep 23 16:27:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/forwardable.rb: replaced by new implementation from
+	  <Daniel.Berger@qwest.com>.  [ruby-core:05899]
+
+Fri Sep 23 07:07:47 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ripper/depend: use --output option instead of redirect;
+	  nmake does not remove a target when the target file is created by
+	  redirect. [ruby-dev:26466]
+
+	* test/ripper/tools/preproc.rb: new option --output.
+
+Fri Sep 23 06:57:52 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ripper/tools/generate.rb: check parser event arity.
+
+	* test/ripper/tools/generate.rb: detect crash of parser-event-IDs
+	  and scanner-event-IDs.
+
+Fri Sep 23 06:01:30 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_file.rb: check File#chown(nil,nil).
+	  [ruby-dev:27140]
+
+Fri Sep 23 05:57:23 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper: refactoring code generation tools. [ruby-dev:27247]
+	  [ruby-dev:27273]
+
+	* ext/ripper/depend: use generate.rb.
+
+	* ext/ripper/lib/ripper/core.rb: removed.
+
+	* ext/ripper/tools/generate-eventids1.rb: removed (code moved to
+	  generate.rb).
+
+	* ext/ripper/tools/generate-ripper_rb.rb: removed (code moved to
+	  generate.rb).
+
+	* ext/ripper/tools/list-parse-event-ids.rb: removed (code moved to
+	  generate.rb).
+
+	* ext/ripper/tools/list-scan-event-ids.rb: removed (code moved to
+	  generate.rb).
+
+	* ext/ripper/lib/ripper/core.rb: removed.
+
+	* ext/ripper: refactoring tests. [ruby-dev:27273]
+
+	* ext/ripper/test/check-event-arity.rb: removed (code moved to
+	  tools/generate.rb).
+
+	* ext/ripper/test/check-event-coverage.rb: removed (code moved to
+	  test/ripper/test_parser_events.rb).
+
+	* ext/ripper/test/check-scanner-event-coverage.rb: removed (code
+	  moved to test/ripper/test_scanner_events.rb).
+
+	* ext/ripper/test/list-called-events.rb: removed.
+
+	* ext/ripper/test/src_rb: removed.
+
+	* ext/ripper/test/validate.rb: removed.
+
+	* test/ripper/test_scanner_events.rb: check event coverage.
+
+	* ext/ripper/lib/ripper/core.rb.in: update copyright year.
+
+Thu Sep 22 23:40:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (find_executable0): default path if environment is not
 	  set.  [ruby-dev:27281]
 
-Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* ext/ripper/extconf.rb (have_command): replaced with find_executable.
+
+Thu Sep 22 17:31:48 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* test/readline/test_readline.rb (TestReadline::replace_stdio):
 	  merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
+	  (merged from ruby_1_8 branch)
 
 Wed Sep 21 23:30:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): generalized nmake dependent code.
 
-Wed Sep 21 09:07:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep 21 14:16:30 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/ripper/depend (SUFFIXES): no longer needed.
 
-	* stable version 1.8.3 released.
+	* ext/ripper/depend (c): avoid nmake problem. fixed [ruby-dev:27191]
 
 Wed Sep 21 08:52:25 2005  why the lucky stiff  <why@ruby-lang.org>
 
-	* ext/syck/token.c: correctly compute identation of a block
+	* ext/syck/token.c: correctly compute indentation of a block
 	  scalar's parent node. [ruby-talk:150620]
 
 Wed Sep 21 08:20:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -6094,19 +62706,18 @@ Wed Sep 21 02:44:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* file.c (path_check_0): disallow sticky world writable directory
 	  in PATH (and $LOAD_PATH).  [ruby-dev:27226]
 
-	* file.c (fpath_check): typo fixed.
+Wed Sep 21 00:32:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 20 22:29:49 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* numeric.c (fix_idiv): 1.div(1.0) should return integer value.
+	  [ruby-dev:27235]
 
-	* test/wsdl/simpletype/rpc/test_rpc.rb, test/wsdl/ref/test_ref.rb,
-	  test/wsdl/any/test_any.rb test/soap/wsdlDriver/test_calc.rb:
-	  suppress deliberate warnings with $VERBOSE = nil.
-
-Tue Sep 20 21:26:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 20 22:25:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
 	  is not available.  fixed: [ruby-dev:27187]
 
+	* file.c (rb_stat_inspect): protoized function pointer.
+
 Tue Sep 20 18:23:04 2005  Tanaka Akira  <akr@m17n.org>
 
 	* eval.c (thread_mark): mark th->last_status.  [ruby-dev:27179]
@@ -6126,27 +62737,22 @@ Tue Sep 20 17:48:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
 
-Tue Sep 20 17:34:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep 20 17:26:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* test/webrick/test_cgi.rb: set ENV["PATH"] to CGIEnvPath on
 	  windows. bcc32's runtime is not installed into system directory,
 	  so it cannot be found without this setting. [ruby-dev:27166]
 
-Tue Sep 20 17:10:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
-	  test_s_open_error test to detect duplicate open.
-	  [ruby-dev:27202]
-
-Tue Sep 20 17:08:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep 20 17:14:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
 	  [ruby-dev:27185]
 
-Tue Sep 20 16:53:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Sep 20 17:10:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/readline/test_readline.rb (TestReadline::replace_stdio):
-	  BSD seek support from [ruby-dev:25223].  fixed: [ruby-dev:27150]
+	* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
+	  test_s_open_error test to detect duplicate open.
+	  [ruby-dev:27202]
 
 Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
 
@@ -6164,49 +62770,57 @@ Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
 	* ext/syck/rubyext.c: loading of binary-typed nodes.  prevent
 	  emission of plain strings that look like symbols, but which aren't.
 
-Tue Sep 20 05:50:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep 20 05:48:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* test/xmlrpc/test_webrick_server.rb (setup_http_server):
 	  should not include 'webrick/https' unless 'use_ssl' because
 	  it fails where openssl is not installed.
 
+Tue Sep 20 01:24:45 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (splat_value): use to_a to splat non Array object.
+
+	* object.c (nil_to_a): remove nil.to_a.  [experimental]
+
+Tue Sep 20 01:01:41 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Fixnum): remove debug print.
+
+	* lib/rational.rb (Rational): ditto.
+
 Tue Sep 20 00:34:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_close): call rb_io_close() directly if io is a T_FILE
 	  object.  [ruby-dev:27156]
 
-Mon Sep 19 19:09:08 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Sep 19 18:58:10 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
-	  (backport from trunk, rev 1.208)
 
-Mon Sep 19 18:35:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Sep 19 18:29:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
-	  [ruby-dev:27151]
+	* file.c (file_expand_path): allow pathnames to expand.
+	  [ruby-dev:27152]
 
-Mon Sep 19 14:17:04 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Sep 19 15:12:15 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/syck/emitter.c (syck_emit): passing an int* value to the
-	  long* parameter causes unaligned access on LP64 systems.
-	  [ruby-dev:27161]
+	* ext/ripper/depend: do not make ripper/core.rb. [ruby-dev:26462]
 
-Mon Sep 19 13:44:03 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon Sep 19 14:49:19 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
-	  [ruby-dev:27133]
+	* ext/ripper/eventids2.c: add prefix `t' to tLAMBDA-related lexer
+	  events.
 
-Mon Sep 19 10:36:06 2005  Minero Aoki  <aamine@loveruby.net>
+	* ext/ripper/lib/ripper/core.rb: updated.
 
-	* lib/fileutils.rb (cp_r): default is :dereference_root=>true for
-	  backward compatibility. [ruby-dev:27145]
+Mon Sep 19 14:39:46 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* test/fileutils/test_fileutils.rb (test_cp_r): test it.
+	* parse.y (do_block): do_block event dispatches 2 args.
+	  [ruby-dev:26964]
 
-Mon Sep 19 09:57:39 2005  Minero Aoki  <aamine@loveruby.net>
+	* ext/ripper/lib/ripper/core.rb: updated.
 
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
-	  (again) [ruby-dev:27145]
+	* ext/ripper/tools/list-parser-event-ids.rb: check arity mismatch.
 
 Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
@@ -6218,43 +62832,23 @@ Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
 	  key flag.
 
-Mon Sep 19 06:41:32 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: backported from trunk (rev 1.65):
-
-	* lib/fileutils.rb (rm_r): new option :secure.
-
-	* lib/fileutils.rb (rm_rf): new option :secure.
-
-	* lib/fileutils.rb: new method #remove_entry_secure.
+	* test/openssl/test_pkey_rsa.rb: add test about private detection.
 
-	* lib/fileutils.rb (cd): remove option :noop.
+Mon Sep 19 06:38:03 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
-
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
-
-	* lib/fileutils.rb: new method #remove_entry.
-
-	* lib/fileutils.rb: new method #chmod_R.
-
-	* lib/fileutils.rb: new method #chown.
-
-	* lib/fileutils.rb: new method #chown_R.
+	* lib/fileutils.rb: method renaming: collect_methods ->
+	  collect_method.
 
-	* lib/fileutils.rb: new method .commands.
+Mon Sep 19 05:58:59 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/fileutils.rb: new method .options.
-
-	* lib/fileutils.rb: new method .have_option?.
-
-	* lib/fileutils.rb: new method .options_of.
+	* lib/fileutils.rb: use module_function instead of single extend.
 
-	* lib/fileutils.rb: new method .collect_method.
+	* test/fileutils/test_fileutils.rb: test existence of singleton
+	  methods.
 
-	* lib/fileutils.rb: use module_function instead of single extend.
+Mon Sep 19 05:32:41 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+	* lib/fileutils.rb (remove_entry_secure): does not use chdir(2).
 
 Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -6266,13 +62860,24 @@ Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
 	  which is full.  [ruby-dev:27132]
 
 	* io.c (rb_io_syswrite): wrap the write system call by
-	  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
-	  full.  [ruby-dev:27134]
+	  TRAP_BEG/TRAP_END to run signal handler in syswrite method.
+	  [ruby-dev:27134]
+
+Mon Sep 19 01:07:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (Init_Numeric): should define Fixnum#div.
+	  [ruby-dev:27129]
+
+	* file.c (rb_thread_flock): wrap flock(2) by TRAP_BEG and
+	  TRAP_END.  [ruby-dev:27122]
 
-Mon Sep 19 03:02:08 2005  Tanaka Akira  <akr@m17n.org>
+	* file.c (rb_file_join): call FilePathValue() to all Pathnames to
+	  join.  [ruby-dev:27127]
 
-	* io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
-	  enable signals when writing to a pipe which is full.
+	* file.c (rb_get_path): call StringValueCStr() to ensure no nul
+	  bytes in path strings.
+
+	* gc.c (garbage_collect): need value for return.  [ruby-dev:27127]
 
 Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
 
@@ -6290,6 +62895,10 @@ Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
 
 	* test/yaml/test_yaml.rb: remove outdated tests.
 
+Sun Sep 18 01:10:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (garbage_collect): return false if no GC run.
+
 Sat Sep 17 23:25:04 2005  sheepman  <sheepman@sheepman.sakura.ne.jp>
 
 	* lib/mathn.rb (Rational::inspect): should preserve original
@@ -6300,6 +62909,79 @@ Sat Sep 17 23:20:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
 	  cookie name.  [ruby-talk:156140]
 
+	* test/socket/test_tcp.rb (TestTCPSocket::test_recvfrom): typo
+	  fixed.  [ruby-dev:27123]
+
+Sat Sep 17 20:58:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_select): fixed deadlock bug.
+	  because select(2) modifies its fd_set arguments, it must be
+	  restored sometimes.
+
+	* win32/win32.c (rb_w32_select): performance improvement when
+	 'always readable/writable handles' and sockets are passed.
+	  sockets should be polled every time.
+
+	    require "net/http"
+
+	    Thread.new {
+	      loop do
+		STDOUT.write(".") # busy on console (this is worst case though)
+	      end
+	    }
+
+	    # socket operation took long time. (sometimes timed out)
+	    Net::HTTP.start("www.ruby-lang.org") do |http|
+		http.get("/cgi-bin/cvsweb.cgi/ruby/array.c?rev=1.179")
+	    end
+
+Sat Sep 17 14:54:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/test_readpartial.rb (test_open_pipe, test_with_stdio):
+	  these tests are working now, so turned on. (windows)
+
+Sat Sep 17 14:18:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_select): I hope performance problem was
+	  solved.
+
+Sat Sep 17 13:45:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_select): console support is back.
+	  but still has performance problem because I loosely took 1 second
+	  for wait time. I'll fix it later. (The reason I drastically changed
+	  the code is that I wanted to implement the fileset management as
+	  single function, and I was worried that if pipe or console
+	  was always available, socket may not be processed any time)
+
+Sat Sep 17 11:24:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_select): select for socket didn't work.
+	  this caused deadlock in drb test. this happened because GetFileType
+	  for socket handle returns FILE_TYPE_PIPE. Of course, it's not a
+	  pipe. So socket handle didn't reach winsock's select function.
+
+	* win32/win32.c (rb_w32_select): read for pipe was still blocked
+	  even if writer handle was closed.
+
+	    r,w = IO.pipe
+
+	    Thread.new {
+	      sleep 3; puts "------- 1"
+	      w.puts("foo")
+	      sleep 3; puts "------- 2"
+	      w.puts("boo")
+	      sleep 3; puts "------- 3"
+	      w.close
+	    }
+
+	    until r.eof? # should break by w.close but didn't.
+	      puts r.gets
+	    end
+
+	* win32/win32.c (rb_w32_select): temporary reverted console support
+	  but it'll be back soon.
+
 Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
@@ -6323,14 +63005,14 @@ Sat Sep 17 08:35:39 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
 
-Fri Sep 16 23:09:20 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Sep 17 08:02:53 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (ole_search_event_at): bug fix
-	  in ext/win32ole/sample/ienavi.rb.
+	* lib/net/imap.rb: supported DIGEST-MD5.  Thanks, Mathieu Arnold.
 
-	* ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
+	* lib/net/imap.rb: use fcall instead of send.  Thanks, Satoru
+	  Takabayashi.
 
-Fri Sep 16 22:41:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep 16 22:45:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_extname): empty string for path name ending with a
 	  period.  fixed: [ruby-core:05651]
@@ -6338,6 +63020,19 @@ Fri Sep 16 22:41:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* file.c (rb_file_join): smarter behavior at edge cases.
 	  fixed: [ruby-core:05706]
 
+	* gc.c (rb_memerror, ruby_xmalloc, ruby_xrealloc, rb_newobj): just
+	  abandon if no memory available, when interpreter is not running.
+	  [ruby-dev:27104]
+
+	* gc.c (garbage_collect): return whether GC could run.
+
+	* dir.c (rb_push_glob): fix delimiter bug.  fixed: [ruby-dev:27105]
+
+	* dir.c (dir_s_aref, dir_s_glob): allow multiple patterns.
+	  [ruby-dev:27110]
+
+	* win32/win32.c (cmdglob): enable brace expansion.
+
 Fri Sep 16 18:34:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/syck/node.c (syck_replace_str): was using return from the
@@ -6353,12 +63048,12 @@ Fri Sep 16 12:02:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
 	  comment (//).  [ruby-core:05793]
 
-Fri Sep 16 00:14:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Sep 16 00:17:03 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/logger/test_logger.rb: unintentionally overwritten changes by
 	  Usa.  reverted.
 
-Fri Sep 16 00:06:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Sep 16 00:03:11 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
 	  $stdout.binmode.
@@ -6372,17 +63067,17 @@ Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * SOAP
 
 	    * allow to configure an envelope namespace of SOAP request. (#124)
-	   	TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
-	  	@client.options["soap.envelope.requestnamespace"] =
+		TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
+		@client.options["soap.envelope.requestnamespace"] =
 		  TemporaryNamespace
-	 	@client.options["soap.envelope.responsenamespace"] =
+		@client.options["soap.envelope.responsenamespace"] =
 		  TemporaryNamespace
 		@client.do_proc(...)
 
-	    * let SOAP request XML indent space configuable.  see
+	    * let SOAP request XML indent space configurable.  see
 	      "soap.envelope.no_indent" option. (#130)
 
-	    * let external CES configuable.
+	    * let external CES configurable.
 	      ex. client["soap.mapping.external_ces"] = 'SJIS'.  $KCODE is used
 	      by default. (#133)
 		external CES ::= CES used in Ruby object of client and server
@@ -6391,7 +63086,7 @@ Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	    * add iso-8859-1 external CES support. (#106)
 
 	    * fixed illegal 'qualified' handling of elements.  it caused
-	      ASP.NET inteoperability problem. (#144)
+	      ASP.NET interoperability problem. (#144)
 
 	    * added 'soap.envelope.use_numeric_character_reference' (boolean)
 	      option to let query XML use numeric character reference in XML,
@@ -6423,7 +63118,7 @@ Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	    * Array of an element which has simpleType causes a crash. (#128)
 
-	    * prarmeterOrder may not contain return part so it can be shorter
+	    * parameterOrder may not contain return part so it can be shorter
 	      than parts size.  Thanks to Hugh.  (#139)
 
 	  * Samples
@@ -6447,45 +63142,62 @@ Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	    * updated deprecated method usage.  (#138)
 
-Thu Sep 15 23:02:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.h (rb_w32_stat): added prototype.
-
-Thu Sep 15 22:35:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Sep 15 22:40:27 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_signal.rb (test_exit_action): skip the test using
 	  fork on fork-less platforms.
 
+Thu Sep 15 13:54:33 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: add :read_timeout option.
+	  [ruby-core:4848]
+
 Thu Sep 15 11:39:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
 	  TkDialogObj#name raises an exception. [ruby-talk:156109]
 
-Thu Sep 15 01:39:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Sep 15 11:01:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
-	  up method. Tabs converted to spaces.
+	* win32/win32.c (rb_w32_pipe_exec): remove unnecessary CloseHandle().
+
+	* win32/win32.c (extract_console_fd, peek_console): new functions.
+
+	* win32/win32.c (rb_w32_select): check consoles by polling them.
 
 Thu Sep 15 00:18:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
 	  readpartial.  [ruby-talk:127641]
 
+Wed Sep 14 23:28:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (collect_file_fd): rename from extract_file_fd.
+
+	* win32/win32.c (extract_pipe_fd, peek_pipe): new functions.
+
+	* win32/win32.c (rb_w32_select): check pipes by polling them.
+
 Wed Sep 14 22:40:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (ruby_glob): glob function not using ruby exception system.
 
-Wed Sep 14 01:26:03 2005  Minero Aoki  <aamine@loveruby.net>
+Wed Sep 14 17:24:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c: changed `foo (*bar)_((boo))' to `foo (*bar)(boo)`.
 
-	* lib/net/https.rb: backported from trunk, rev 1.3.
-	  [ruby-dev:25673] (again), [ruby-dev:26617] (again),
-	  [ruby-dev:27062]
+	* enumerator.c, eval.c, gc.c, intern.h, io.c, process.c, ruby.c,
+	  ruby.h, signal.c: ditto.
 
-	* ext/openssl/lib/net/https.rb: removed.
+Wed Sep 14 15:06:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/openssl/lib/net/protocols.rb: removed.
+	* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
 
-	* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
+	* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
+	  gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
+	  node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
+	  rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
+	  util.c, util.h, variable.c: ditto.
 
 Tue Sep 13 22:09:40 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
@@ -6506,19 +63218,20 @@ Tue Sep 13 21:47:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
 	  fixed: [ruby-dev:26881]
 
-Tue Sep 13 16:26:45 2005  Minero Aoki  <aamine@loveruby.net>
+Tue Sep 13 20:24:37 2005  Tanaka Akira  <akr@m17n.org>
 
-	* lib/net/http.rb: backported from trunk, rev 1.128.
-	  [ruby-dev:25673] [ruby-dev:26617]
+	* ruby.h (PRINTF_ARGS): new macro for printf style argument checking.
 
-	* lib/net/protocol.rb: backported from trunk, rev 1.78.
+Tue Sep 13 15:41:29 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/net/protocol.rb: new method #old_open to support net/smtp
-	  and net/pop.
+	* lib/net/http.rb: wrote documentation of HTTPRequest/HTTPResponse
+	  classes.
 
-	* lib/net/smtp.rb: use #old_open.
+Tue Sep 13 14:27:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/net/pop.rb: ditto.
+	* string.c, missing.h: failed to build on powerpc-apple-darwin7.9.0
+	  because of crypt argument's constness mismatch. (I hope this works)
+	  (http://mput.dip.jp/autobuild/ruby-trunk/log/20050913T110001.gz)
 
 Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
 
@@ -6534,12 +63247,12 @@ Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
 	  continue support of Object#to_yaml_type.
 
 	* ext/syck/rubyext.c: new emitter code.  yaml_new and yaml_initialize
-	  get called, should they be present.  consolidated all the diaspora of internal
-	  node types into the family below YAML::Syck::Node -- Map,
+	  get called, should they be present.  consolidated all the diaspora of 	  internal node types into the family below YAML::Syck::Node -- Map,
 	  Seq, Scalar -- all of whom are SyckNode structs pointing to
-	  Ruby data.  moved Object#yaml_new into the node_import and made it the
-	  default behavior.  the target_class is always called wih yaml_new, prepended
-	  a parameter, which is the klass.  loaded nodes through GenericResolver show their style.
+	  Ruby data.  moved Object#yaml_new into the node_import and made it
+	  the default behavior.  the target_class is always called with
+	  yaml_new, prepended a parameter, which is the klass.  loaded nodes
+	  through GenericResolver show their style.
 	  new Resolver#tagurize converts type ids to taguris.
 
 	* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
@@ -6558,36 +63271,112 @@ Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/syck.h: reflect block_styles and new node functions.
 
+Tue Sep 13 08:09:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (new_ostruct_member): Object#send no longer call
+	  private methods.  [ruby-dev:27044]
+
+	* test/rss/test_dublincore.rb, test/rss/test_trackback.rb,
+	  test/ruby/test_eval.rb, test/socket/test_socket.rb: ditto.
+
+	* test/ruby/test_lambda (test_call_with_block): lambda makes new scope
+	  for formal block parameter.
+
+Tue Sep 13 01:17:45 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_save_safe_level): no need to restrict safe level
+	  memoize in $SAFE>=3.  [ruby-dev:27050]
+
+Tue Sep 13 00:02:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (apply2files): stricter callback definition.
+
+	* file.c (rb_path_check): constified.
+
 Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
-	  to avoid a bug of PKCS7_enctypt() (only if ext/openssl is
+	  to avoid a bug of PKCS7_encrypt() (only if ext/openssl is
 	  compiled with OpenSSL-0.9.7d or earlier versions).
 	  http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
 
+Mon Sep 12 20:32:00 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.[hc] (rb_w32_argv_size, ...): reverted my latest change
+	  to avoid incompatible pointer warning. (mingw32)
+
+Mon Sep 12 19:58:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dln.c: avoid warning of const to non-const convertion.
+	  [ruby-dev:27041]
+
+	* eval.c, io.c, ruby.c: ditto.
+
+Mon Sep 12 19:26:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c: moved to ANSI function style from K&R function style.
+	  (used protoize on windows, so still K&R remains on #ifdef part of
+	   other platforms. And  `foo _((boo))' stuff is still there)
+	   [ruby-dev:26975]
+
+	* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
+	  enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
+	  io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
+	  prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
+	  regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
+	  sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
+	  version.c: ditto.
+
 Mon Sep 12 14:03:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/dbm/test_dbm.rb: remove locking test, which may not be
 	  supported on some platforms.  [ruby-dev:27030]
 
-Mon Sep 12 10:45:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Sep 11 23:23:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
-	  from Takahiro Kambe <taca at back-street.net>.  [ruby-dev:27023]
+	* lib/net/imap.rb (starttls): supported the STARTTLS command.
 
-Sun Sep 11 22:05:51 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Sep 11 22:18:07 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* bin/erb (ERB::Main#run): set ERB#filename so that it is used
 	  when reporting syntax/runtime errors. Tabs converted to spaces.
 
-Sat Sep 10 10:17:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Sep 10 22:34:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c, bignum.c: protoize.
+
+Sat Sep 10 00:23:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (splat_value): simpler and consistent array conversion
+	  for argument splat.  [yarv-dev:599]
+
+Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_times): make empty strings to keep taintness,
+	  and a little improvement.  [ruby-dev:26900]
+
+	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
+	  characters in command line option.  fixed: [ruby-talk:155369]
+
+	* ext/iconv/iconv.c: protoized.
+
+Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* merged a patch from Takahiro Kambe <taca at back-street.net> to
+	  support DragonFly BSD.  [ruby-dev:26984]
+
+Thu Sep  8 13:14:57 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+
+	* missing/strchr.c (strrchr): fixed a bug in detecting NUL in a
+	  string.  [ruby-dev:26985]
+
+Wed Sep  7 17:29:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id):
 	  OpenSSL::Engine.by_id calls given block before calling
 	  ENGINE_init (block parameter is the return value of this method
 	  itself).  this functionality is useful to load dynamic shared
-	  engines. the following code is a sample of loading a key using
-	  OpenSC PKCS #11 module.
+	  engines.
 
 		require "openssl"
 		pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
@@ -6602,9 +63391,9 @@ Sat Sep 10 10:17:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  OpenSSL::Engine#ctrl_cmd. it wraps ENGINE_ctrl_cmd_string.
 
 	* ext/openssl/ossl_engine.c (ossl_engine_get_cmds): new method
-	  OpenSSL::Engine#cmds. it returms engine command definitions.
+	  OpenSSL::Engine#cmds. it returns engine command definitions.
 
-Sat Sep 10 10:09:47 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Sep  7 15:48:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
 
@@ -6617,64 +63406,6 @@ Sat Sep 10 10:09:47 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_pkcs7.rb: new file.
 
-Sat Sep 10 10:05:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
-	  the argument is a DER string if Base64 decoding failed.
-
-	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
-
-	* test/openssl/test_ns_spki.rb: add new file.
-
-Sat Sep 10 09:56:24 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
-	  these features are enabled if this library is compiled with
-	  OpenSSL 0.9.8 or later.
-
-	* test/openssl/test_digest.rb: add test for new digests.
-
-Sat Sep 10 09:51:30 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
-	  to get last error on the current thread. And should report
-	  errors on the stack while OpenSSL.debug is true.
-
-	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
-	  this library.
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
-
-	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
-	  of unused variable.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
-	  set @time to avoid warning.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
-	  X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
-	  wrapped functions failed.
-
-	* test/openssl/test_x509store.rb: add test for errors.
-
-Fri Sep  9 22:13:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): prohibit calling tainted method (>2) when
-	  $SAFE == 0.
-
-Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_times): make empty strings to keep taintness,
-	  and a little improvement.  [ruby-dev:26900]
-
-	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
-	  characters in command line option.  fixed: [ruby-talk:155369]
-
-Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* merged a patch from Takahiro Kambe <taca at back-street.net> to
-	  support DragonFly BSD.  [ruby-dev:26984]
-
 Wed Sep  7 12:55:08 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb: abolish mod === tempfile to avoid a problem
@@ -6688,6 +63419,15 @@ Wed Sep  7 10:45:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_thread_terminated): show backtrace before propagate
 	  exceptions to main thread.
 
+Wed Sep  7 09:21:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.[hc] (rb_w32_utime): constified.
+
+	* win32/win32.h (rb_w32_stat): added prototype.
+
+	* win32/win32.[hc] (rb_w32_argv_size,rb_w32_join_argv,rb_w32_aspawn):
+	  changed `char *const *' to `const char *const *'. (constify string)
+
 Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
@@ -6706,37 +63446,62 @@ Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
 	  char*.  fixed: [ruby-core:05470]
 
-Wed Sep  7 08:32:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep  7 08:32:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
-	  sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
-	  description.  [ruby-dev:26965]
+	* string.c (rb_str_times): should taint empty strings as well.
 
-	* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
-	  mode (-v/-w); backported from 1.9.  [ruby-dev:26963]
+	* object.c (Init_Object): make class_variable_{get,set} public.
+	  [ruby-dev:26965]
+
+Mon Sep  5 22:28:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt, mlhs_node, lhs, arg, method_call): aref_args might be
+	  nothing.  fixed: [ruby-dev:26952]
+
+	* ext/ripper/eventids2.c: added new tokens.  fixed: [ruby-dev:26952]
 
 Mon Sep  5 17:03:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* lib/find.rb: should raise ENOENT if root entry does not exist.
+	  [ruby-list:41054]
+
 	* lib/ostruct.rb: a patch from Florian Gross <florgro at gmail.com>
 	  merged to allow recursive inspect (and to_s) for OpenStruct.
 	  [ruby-core:05532]
 
+Mon Sep  5 08:20:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/observer.rb: a patch from nornagon <nornagon at gmail.com>
+	  merged to allow arbitrary names for update methods.
+	  [ruby-core:05416]
+
 Mon Sep  5 07:01:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
 	  should clear data from the buffer which already been output.
 
-Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep  4 15:01:35 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
+	* parse.y (f_arg): Ripper should not do semantic check.
+	  [ruby-dev:26948]
 
-Fri Sep  2 03:29:00 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Sat Sep  3 23:52:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
-	  [ruby-dev:26872], [ruby-dev: 26920]
+	* eval.c (rb_f_fcall): new method to avoid inefficiency of
+	  obj.instance_eval{send(...)} tricks.
 
-	* lib/irb/locale.rb: support to print help message when OS locale is
-	  ja_JP.utf-8. [ruby-dev:26872]
+Sat Sep  3 13:59:31 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#descend): Pathname.new("./a/b/c").descend
+	  didn't yield "."
+	  (Pathname#ascend): ditto.
+
+Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_arg): f_norm_arg is a VALUE in ripper, not an ID.
+	  fixed: [ruby-dev:26942]
+
+	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
 
 Thu Sep  1 17:11:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -6751,21 +63516,32 @@ Thu Sep  1 14:12:45 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  to support '-namespace' option of 'interp invokehidden' command
 	  on Tcl8.5.
 
-Wed Aug 31 14:43:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 31 14:41:30 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (OPTFLAGS): default global optimization to
 	  disabled for all VC++ versions.  fixed: [ruby-dev:26897]
 
-Wed Aug 31 11:35:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
-	  file.
-
-Wed Aug 31 10:30:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Aug 31 10:36:09 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* process.c (proc_detach, proc_setmaxgroups): missing argument type
 	  declaration. (I recommend ANSI-style function)
 
+Wed Aug 31 06:59:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_scan): already String#scan behaves differently
+	  regarding if block is given.
+
+Tue Aug 30 23:49:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c, dir.c, enum.c, hash.c, io.c, range.c, string.c, struct.c:
+	  let enumerable methods return Enumerator.  [ruby-dev:26924]
+
+	* intern.h (RETURN_ENUMERATOR): utility macro for enumerable methods.
+
+Tue Aug 30 23:25:45 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/debug.rb: no need to restart at exit.
+
 Tue Aug 30 23:20:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_rescue2): initialization miss.  fixed: [ruby-dev:26917]
@@ -6783,45 +63559,127 @@ Tue Aug 30 19:34:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
 	  error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
 
-Mon Aug 29 19:54:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Aug 30 16:19:40 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/init.rb: bug fix. [ruby-dev: 26920]
+
+Tue Aug 30 16:13:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_count): new method.  [ruby-dev:26895]
+
+Tue Aug 30 12:45:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_send): do not call private methods if the receiver
+	  is specified.  [ruby-talk:153672]
+
+Mon Aug 29 19:47:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
 
 	* lib/rdoc/usage.rb: support the case when non-ruby code exists before
 	  shebang. (this is needed when ri.bat is executed on windows)
 
-Mon Aug 29 17:48:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 29 18:58:05 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/init.rb: make IRB -I option that is same behavior for ruby.
+	  [ruby-dev:26872]
+
+	* lib/irb/locale.rb: support to print help message when OS locale is
+	  ja_JP.utf-8. [ruby-dev:26872]
 
-	* eval.c (method_arity): should return proper arity value.
-	  [ruby-dev:26390]
+Mon Aug 29 01:43:05 2005  Tanaka Akira  <akr@m17n.org>
 
-Mon Aug 29 01:19:57 2005  Tanaka Akira  <akr@m17n.org>
+	* lib/pathname.rb (Pathname#descend): new method.
+	  (Pathname#ascend): ditto.
 
-	* lib/time.rb (Time.parse): extract fractional seconds using
-	  Date._parse.  [ruby-talk:153859]
+Mon Aug 29 00:35:09 2005  Tanaka Akira  <akr@m17n.org>
 
-Sat Aug 27 20:20:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/time.rb: require 'date/format' instead of 'parsedate'.
+	  (Time.parse): extract fractional seconds using Date._parse.
+	  (Time.strptime): extract fractional seconds using Date._strptime.
+	  [ruby-talk:153859]
+
+Sat Aug 27 20:13:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
 	  by Reyn Vlietstra.
 
-	* ext/curses/curses.c: chtype in curses is not `char', rahter `long'.
+	* ext/curses/curses.c: chtype in curses is not `char', rather `long'.
 	  [ruby-Bugs:2298]
 
 	* ext/curses/view.rb: String =~ String is deprecated.
 
-Wed Aug 24 10:53:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Aug 25 15:48:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/win32ole/win32ole.c: suppress warnings. (win32)
+
+Wed Aug 24 11:01:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/logger/test_logger.rb (test_shifting_size): should close log
 	  device before unlink, since some platform cannot unlink opened
 	  file.
 
-Sun Aug 21 00:13:27 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Aug 23 06:07:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
+	  these features are enabled if this library is compiled with
+	  OpenSSL 0.9.8 or later.
+
+	* test/openssl/test_digest.rb: add test for new digests.
+
+Tue Aug 23 05:47:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): try to decode
+	  the argument as a string.
+
+	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
+	  set @time to avoid warning.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
+	  X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
+	  wrapped functions fails.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
+
+	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
+	  of unused variable.
+
+	* test/openssl/test_ns_spki.rb: add new file.
+
+	* test/openssl/test_x509store.rb: add test for error.
+
+Tue Aug 23 01:11:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* sprintf.c (ruby__sfvwrite): should move `buf' to the end of
+	  `result'. [ruby-dev:26859]
+
+Mon Aug 22 23:51:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: ONIG_OPTION_CAPTURE_GROUP conflicts with
+	  RE_OPTION_ONCE.  [ruby-dev:26852]
+
+Mon Aug 22 20:11:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/vsnprintf.c (BSD__sprint): needs to call vwrite function
+	  pointer.  fixed: [ruby-dev:26854]
+
+Sat Aug 20 23:55:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): update paren_nest for brackets [].
+
+Sun Aug 21 00:10:23 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add
 	  a workaround for importing an WSDL whose path begins with drive
 	  letter.  [ruby-dev:26242]
 
+Sat Aug 20 22:05:25 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* regexec.c (code_is_in_cclass_node): check code size.
+	  [ruby-dev:26840]
+
 Sat Aug 20 22:37:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/logger.rb (write, shift_log?, shift_log): file shifting race
@@ -6834,23 +63692,25 @@ Fri Aug 19 18:13:39 2005  Tanaka Akira  <akr@m17n.org>
 	* lib/time.rb (Time.apply_offset): fix a problem with last day of
 	  month.  reported by Lucas Nussbaum.  [ruby-talk:152866]
 
-Thu Aug 18 12:46:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
-	  I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
-	  [ruby-dev:26806]
+Thu Aug 18 11:05:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
+	* win32/win32.c (socketpair_internal): need to call open_ifs_socket()
+	  to create sockets instead of winsock's socket().
+	  fixed: [yarv-dev:581]
 
 Wed Aug 17 23:58:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* object.c (rb_to_integer): argument constified.
-
 	* eval.c (terminate_process): take String message.
 
 	* eval.c (rb_thread_switch): propagate the exception caused thread
 	  termination directly.  fixed: [ruby-core:05552]
 
+Wed Aug 17 21:20:05 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb: ensure that symbol_to_option is private_class_method
+	  and all other methods are module_function
+	  fixed: [ruby-dev:26808]
+
 Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_add_method): preserve safe level in the environment
@@ -6859,6 +63719,19 @@ Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_call0): restore preserved safe level in the method
 	  execution.
 
+	* parse.y (lambda): need separate block variable stack
+	  manipulation and lpar_beg maintenance.  based on a patch found
+	  in [ruby-core:05551] from Mauricio Fernandez <mfp at acm.org>.
+
+	* parse.y (parser_yylex): adjust lpar_beg after tLAMBEG and
+	  kDO_LAMBDA. [ruby-core:05551]
+
+Mon Aug 15 07:24:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h (rb_check_to_integer): add declaration.
+
+	* object.c (rb_to_integer, rb_check_to_integer): argument constified.
+
 Mon Aug 15 00:38:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_rescue2): reduce PUSH_TAG() as well as NODE_RESCUE.
@@ -6866,6 +63739,27 @@ Mon Aug 15 00:38:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* range.c (range_check, range_init): reduce useless exceptions.
 
+Mon Aug 15 00:34:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yycompile): remove unreachable code.  [yarv-dev:570]
+
+Sat Aug 13 22:16:12 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (remove_entry_secure): forgot final chdir.
+
+Sat Aug 13 22:07:49 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (remove_entry_secure): uses chdir(2) and check
+	  if current directory is correct. [ruby-dev:26100] [ruby-dev:26226]
+
+Sat Aug 13 21:11:05 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_VARIANT class.
+
+	* ext/win32ole/tests/testall.rb: ditto.
+
+	* ext/win32ole/tests/testOLEVARIANT.rb: ditto.
+
 Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_block_pass): distinguish current block from others.
@@ -6874,10 +63768,30 @@ Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_set_string): disallow nil.
 	  http://www.rubyist.net/~nobu/t/20050811.html#c05
 
+Sat Aug 13 08:01:59 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb: Kconv.kconv is now alias of Kconv.conv
+	* ext/nkf/lib/kconv.rb: remove nkf dependent symbols from SYMBOL_TO_OPTION
+
+Fri Aug 12 17:06:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_larglist): allow optional arguments even when
+	  parentheses are omitted.  based on Nobu's patch from
+	  http://www.rubyist.net/~nobu/t/20050805.html
+
+	* parse.y (parser_yylex): update & maintain lpar_beg for detect
+	  lambda parameters.
+
 Thu Aug 11 23:29:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c: keep holding string after closed.
 
+Thu Aug 11 20:48:40 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+
+	* numeric.c (fix_equal, fix_cmp, fix_gt, fix_ge, fix_lt, fix_le):
+	  reduce coercing when a method knows about a operand type.
+	  [ruby-dev:26789]
+
 Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss: fixed sort bug. [ruby-list:41018]
@@ -6902,6 +63816,33 @@ Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
 	  (RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
 	  tests for RSS::Maker::ItemsBase#do_sort.
 
+Wed Aug 10 12:01:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb: simplifies Delegator classes; SimpleDelegator
+	  now uses method_missing for all methods.
+
+Wed Aug 10 10:38:50 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_mul0): multiply two numbers (x, y) without
+	  normalizing the result.  x should be a big number.
+	  [ruby-dev:26778]
+
+	* bignum.c (rb_big_pow): use rb_big_mul0() instead of
+	  rb_big_mul().
+
+	* array.c (rb_ary_or, rb_ary_and, rb_ary_plus, rb_ary_diff):
+	  revert the change on 2005-08-03.  Set operation on other item
+	  should have in separate methods.
+
+	* parse.y (shadowing_lvar_gen): warn when arguments shadows
+	  external local variables.
+
+	* parse.y (f_opt): optional arguments should not clobber external
+	  local variables.
+
+	* parse.y (f_rest_arg): rest arguments should not clobber external
+	  local variables.
+
 Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
@@ -6913,9 +63854,19 @@ Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/blt/component.rb: ditto.
 
+Tue Aug  9 21:53:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (formal_assign): let default values override
+	  arguments to zsuper.  fixed: [ruby-dev:26743]
+
+Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+
+	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
+	  [ruby-dev:26778]
+
 Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
+	* ext/tk/tcltklib.c: remove dangerous 'rb_jump_tag's.
 
 	* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
 	  help to convert option values between ruby and tcl.
@@ -6938,28 +63889,56 @@ Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
 	  configure options.
 
-Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+Tue Aug  9 08:24:05 2005  Mauricio Fernandez  <mfp@acm.org>
 
-	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
-	  [ruby-dev:26778]
+	* parse.y (f_block_arg), eval.c (rb_yield_0): deal with dynamic
+	  variable lambda arguments.  [ruby-core:05540]
+
+Mon Aug  8 22:13:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (assign): deal with new block argument.
+	  fixed: [ruby-core:05536]
 
-Mon Aug  8 20:43:02 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (rb_node_arity): follow change of NODE_ARGS.
+	  fixed: [ruby-dev:26761]
+
+Mon Aug  8 21:28:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/test_fnmatch.rb: separated from test_file.rb.
+
+Mon Aug  8 20:40:35 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/ruby/test_method.rb: added.  [ruby-dev:26761]
 
-Sun Aug  7 23:50:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Aug  8 01:26:37 2005  Mauricio Fernandez  <mfp@acm.org>
 
-	* test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
+	* parse.y (f_larglist): mistake in syntax rule.  [ruby-core:05535]
 
-Sun Aug  7 01:31:15 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon Aug  8 05:16:55 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
-	  only one event handler.
+	* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
+	  to get last error on the current thread. And should report
+	  if errors are on the stack while OpenSSL.debug is true.
 
-	* ext/win32ole/tests/testOLEEVENT.rb: ditto.
+	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
+	  this library.
 
-	* ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
-	  test_ole_type_detail method.
+Mon Aug  8 05:15:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpproxy.rb (HTTPProxyServer#initialize),
+	  lib/webrick/httpserver.rb (HTTPServer#initialize),
+	  lib/webrick/httpservlet/cgihandler.rb (CGIHandler#initialize),
+	  lib/webrick/httpservlet/erbhandler.rb (ERBHandler#initialize),
+	  lib/webrick/httpservlet/filehandler.rb(DefaultFileHandler#initialize):
+	  super (called with no arguments) takes default value of optional
+	  arguments. [ruby-dev:26743]
+
+	* lib/webrick/httputils.rb: add a media-type "text/html" for .xhtml.
+
+Sun Aug  7 23:52:39 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_super.rb: added optional arg tests.  [ruby-dev:26743]
+	  the tests expects 1.8 behavior at this time.
 
 Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -6970,35 +63949,60 @@ Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
 	  {variable,textvariable} function.
 
-	* ext/tk/lib/tk/variable.rb: retains backward conpatibility.
+	* ext/tk/lib/tk/variable.rb: retains backward compatibility.
 
-Fri Aug  5 12:50:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Aug  5 12:48:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
+	* ext/tk/tcltklib.c: fixed memory leak when tk_funcall raised
 	  exception. (copies argv into heap in tk_funcall instead of
 	  caller)
 
-Fri Aug  5 12:42:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Aug  5 12:36:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): need to convert path separetor
+	* lib/mkmf.rb (create_makefile): need to convert path separator
 	  before invoking install command.
 
-Fri Aug  5 00:27:04 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Aug  5 08:08:05 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (return_jump): fix "can't across thread" error message
+	  when no thread associated.
+	  http://www.namikilab.tuat.ac.jp/~sasada/diary/200507.html#d31
+
+Fri Aug  5 00:25:12 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
+	* ext/tk/tcltklib.c: refactoring - extract ruby string <->
 	  tcl object conversion as get_str_from_obj and get_obj_from_str.
 
 Fri Aug  5 00:19:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* enumerator.c (Init_Enumerator): provided features should have
+	  extensions.
+
+	* eval.c (rb_feature_p): returns type of the feature instead of
+	  extension.
+
+	* eval.c (search_required): ruby library should be prior to statically
+	  linked extensions.  fixed: [ruby-dev:26711]
+
+	* eval.c (formal_assign): returns position of rest arguments variable.
+
+	* parse.y (f_rest_arg): use anonymous variable for rest arguments.
+	  fixed: [ruby-dev:26647]
+
 	* extmk.rb (extmake): needs to be wrapped in an Array.
 
+Thu Aug  4 20:03:18 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+
+	* numeric.c (Init_Numeric): do not share implementation among
+	  Fixnum#/ and Fixnum#div.  [ruby-core:05531]
+
 Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
+	* ext/tk/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
 
-	* ext/tcltklib/tcltklib.c: add nativethread consistency check.
+	* ext/tk/tcltklib.c: add nativethread consistency check.
 
-	* ext/tcltklib/stubs.c: ditto.
+	* ext/tk/stubs.c: ditto.
 
 	* ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
 	  when Tcl is 7.6 or 8.0.
@@ -7010,12 +64014,17 @@ Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/toplevel.rb: ditto.
 
-	* ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
+	* ext/tk/lib/tkextlib/SUPPORT_STATUS: update RELEASE_DATE
+
+Thu Aug  4 13:30:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_div): should not convert the result into
+	  integer.  [ruby-core:05524]
 
 Thu Aug  4 08:03:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): should not modify $mflags for each
-	  extentions.
+	  extensions.
 
 Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -7026,47 +64035,84 @@ Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
 
+Thu Aug  4 00:24:59 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c: replacing is no longer needed.
+
 Wed Aug  3 21:59:16 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
-	  TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
+	  TkVariable retrieved from TkVariable.new_hash.ref. [ruby-dev:26721]
+
+Wed Aug  3 12:40:28 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+
+	* numeric.c (fix_plus): reduce coercing when a method knows about
+	  a operand type.  [ruby-dev:26723]
+
+	* numeric.c (fix_minus, fix_mul, fix_quo, fix_div, fix_mod,
+	  fix_divmod, fix_pow): ditto.
+
+	* bignum.c (rb_big_div, rb_big_modulo): export to reduce
+	  coercing.
+
+Wed Aug  3 10:13:52 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in, {bcc32,win32,wince}/Makefile.sub (HAVE_SNPRINTF,
+	  HAVE_VSNPRINTF): use win32/win32.c's implementation instead of
+	  missing/vsnprintf.c's.
+
+	* win32/win32.[ch] (rb_w32_snprintf, rb_w32_vsnprintf): reverted.
+
+Wed Aug  3 10:05:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check vsnprintf() and snprintf().
+
+	* sprintf.c, missing/vsnprintf.c: made vsnprintf() and snprintf()
+	  private.  fixed: [ruby-dev:26651]
 
 Wed Aug  3 08:22:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
 	  changes at 2004-09-07.  [ruby-dev:26656]
 
-Tue Aug  2 10:20:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Aug  3 06:53:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_or): wraps the operand in an array if it is not
+	  an array.  [ruby-talk:150495] [EXPERIMENTAL]
 
-	* ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
+	* array.c (rb_ary_and, rb_ary_plus, rb_ary_diff): ditto.
+
+Tue Aug  2 10:23:12 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
 	  Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
 
-	* ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
+	* ext/tk/tcltklib.c: use ip_{get,set,unset}_variable2_core from
 	  ip_{get,set,unset}_variable.
 
-	* ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
+	* ext/tk/tcltklib.c: replaced Tcl_Panic with rb_bug.
 
-Tue Aug  2 01:41:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Aug  2 01:40:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/ping.rb (Ping.pingecho): should rescue StandardError.
 	  [ruby-dev:26677]
 
-Mon Aug  1 19:09:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug  1 19:02:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
+	* ext/tk/tcltklib.c: refactoring - replaced rb_ivar_defined &
 	  rb_ivar_get with single rb_attr_get call.
 
-Mon Aug  1 18:45:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug  1 18:44:08 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
+	* ext/tk/tcltklib.c (Tcl_GetStringResult): refactoring - define
 	  alternative macro on Tcl7.x or earlier.
 
-Mon Aug  1 13:57:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug  1 13:53:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
+	* ext/tk/tcltklib.c (deleted_ip): refactoring - interpreter
 	  deletion check. [ruby-dev:26664]
 
-Mon Aug  1 01:17:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Aug  1 01:08:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (check_insecure_method): use private_methods and
 	  protected_methods instead of respond_to? to check method visibility.
@@ -7076,86 +64122,206 @@ Mon Aug  1 01:17:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/ut_drb.rb: ditto.
 
-Mon Aug  1 00:07:32 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-	* lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
+Sat Jul 30 18:49:44 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_TYPE#ole_typelib,
+	  WIN32OLE_TYPE#implemented_ole_types.
+
+	* ext/win32ole/tests/testOLETYPE.rb: ditto.
+
+Fri Jul 29 16:12:02 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/context.rb: fix `irb --readline` option. [ruby-dev:40955]
 
 Fri Jul 29 09:59:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* eval.c (rb_call0): fix calling zsuper from a method with anonymous
+	  rest argument.  [ruby-dev:26639]
+
 	* eval.c (rb_yield_0): push yielded node instead of yielding.
 	  fixed: [yarv-dev:549]
 
+Thu Jul 28 21:49:17 2005  IWATSUKI Hiroyuki  <don@na.rim.or.jp>
+
+	* parse.y (rb_parser_end_seen_p): exclude from ripper.
+	  <http://moonrock.jp/~don/d/200507.html#d28_t2>
+
+	* sprintf.c (clearerr): remove standard macro before re-definition.
+	  <http://moonrock.jp/~don/d/200507.html#d28_t3>
+
 Thu Jul 28 18:09:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
+	* ext/tk/stubs.c: When --enable-tcltk-stubs, the initialize
 	  routine creates a Tcl/Tk interpreter and deletes it. However,
 	  init cost of Tk's MainWindow is not so small. And that makes it
 	  impossible to use libraries written with Tcl functions only on
 	  an environment without a graphical display. This changes support
-	  delaying initalization of Tk_Stubs until the script needs Tk.
+	  delaying initialization of Tk_Stubs until the script needs Tk.
 
-	* ext/tcltklib/stubs.h: New file. Define prototypes and return
-	  codes of functions on stubs.c.
+	* ext/tk/stubs.h: New file. Define prototypes and return codes of
+	  functions on stubs.c.
 
-	* ext/tcltklib/tcltklib.c: Support delaying initalization of
-	  Tk_Stubs until the script needs Tk.
+	* ext/tk/tcltklib.c: Support delaying initialization of Tk_Stubs
+	  until the script needs Tk.
 
-	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors
-	  on initialization.
+	* ext/tk/tcltklib.c: Show friendly error messages for errors on
+	  initialization.
 
-	* ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
+	* ext/tk/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
 	  exiting and $DEBUG is true. (Not fix. If you know the reason of
 	  why, please fix it.)
 
-	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
-	  encoding.
+	* ext/tk/tkutil/tkutil.c (ary2list, ary2list2): bug fix on handling
+	  of encoding.
 
 	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  don't work propery.
+	  don't work properly.
 
 	* ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk.
+
 	* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the
 	  object for an element of a Tcl's array variable.
 
+Thu Jul 28 17:23:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_larglist): allow block argument in lambda parameter
+	  list without parenthesis.
+
+Thu Jul 28 17:14:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (each_i): typo fixed.  [ruby-dev:26622]
+
+Thu Jul 28 15:04:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_arg): better argument name duplication check
+
+	* parse.y (new_args_gen): factored out name duplication check for
+	  optional and rest arguments.
+
+	* parse.y (new_bv_gen): allow shadowing outer local variables;
+	  warning remains.
+
+Thu Jul 28 13:46:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_warningS): the argument was omitted.
+	  [ruby-dev:26621]
+
+Thu Jul 28 11:30:57 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_larglist): allow bv_decl at the end of lambda
+	  argument list.  [EXPERIMENTAL]
+
+	* parse.y (new_bv_gen): allow local variable shadowing, with
+	  warning in verbose mode.
+
 Wed Jul 27 23:23:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (obj_free): make message format consistent with one from
 	  gc_mark().  [ruby-talk:149668]
 
+	* sprintf.c (quad_t): prepare quad_t as well.  [ruby-talk:149668]
+
 Wed Jul 27 22:11:37 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin: removed. because the plugin
 	  is imported in the tDiary plugin packages.
 
+Wed Jul 27 19:11:53 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (cd): follow :noop option change. (This patch
+	  is contributed by Doug Kearns)
+
+Wed Jul 27 16:25:59 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (lambda): Perl6 style -> lambda expression. [NEW]
+	  [VERY EXPERIMENTAL]
+
+Wed Jul 27 10:43:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (id2ref): must not assign pointers to long int.  use
+	  LONG_LONG instead if SIZEOF_LONG < SIZEOF_VOIDP.
+	  [ruby-talk:149645]
+
+	* ruby.h: use LONG_LONG to simplify the change.
+	  [ruby-talk:149645]
+
 Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_each): rewinddir(3) before iteration.
 	  [ruby-talk:149628]
 
-Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Jul 27 02:34:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_throw): replace all '0x%lx' by '%p'.
+	  [ruby-talk:149553]
+
+	* missing/vsnprintf.c (BSD_vfprintf): '%p' need to handle 64bit
+	  size pointer.  [ruby-talk:149553]
+
+Tue Jul 26 22:41:28 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/lib/ripper/sexp.rb: new method Ripper.sexp_raw.
 
-	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before
+	* ext/ripper/lib/ripper/sexp.rb (Ripper.sexp): returns more
+	  readable tree.  This is suggested by Kirill A. Shutemov.
+
+Tue Jul 26 22:05:12 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: merge a patch contributed by Daniel Berger,
+	  with some modification. (RubyForge #2128)
+
+Tue Jul 26 18:11:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h: support LLP64 model.  [ruby-talk:149524]
+
+Tue Jul 26 12:57:40 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/openssl_missing.c: include <openssl/engine.h> before
 	  <openssl/x509_vfy.h> to avoid compilation error of mswin32.
 	  suggested by NAKAMURA Usaku.
 
+Mon Jul 25 23:48:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch]: (rb_w32_vsnprintf, rb_w32_snprintf): removed.
+
 Mon Jul 25 21:30:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* common.mk: Borland MAKE doesn't look for file names which have paths
+	  from VPATH.  fixed: [ruby-dev:26604]
+
+	* ruby.h (NORETURN, DEPRECATED): moved just after config.h.
+
+	* {win32,wince}/Makefile.sub: vsnprintf() is in missing now.
+
 	* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
 	  source to XCFLAGS.
 
+Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
+
 Mon Jul 25 13:45:18 2005  NAJIMA Hiroki  <najima@mickey.ai.kyutech.ac.jp>
 
 	* io.c: check HAVE_SYS_IOCTL_H before including the header.
 	  [ruby-dev:26610]
 
-Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
-
-Sat Jul 23 16:49:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Jul 23 16:48:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
 	  OPENSSL_NO_STATIC_ENGINE.
 
+Sat Jul 23 11:46:30 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_fd_select): the all three fd_sets must be long enough for
+	  select.  fixed: [ruby-talk:149059]
+
+Sat Jul 23 10:01:41 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_vsprintf, rb_sprintf): new functions return new String,
+	  using missing/vsnprintf.c.  [ruby-dev:26580]
+
+	*  missing/vsnprintf.c: made the output changeable.
+
 Fri Jul 22 21:06:08 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
 
 	* bignum.c (rb_big_eq): reduce isnan().  [ruby-dev:26600]
@@ -7188,12 +64354,12 @@ Fri Jul 22 14:37:43 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
-	  and gc_disable when raise ArgumentError.
+	* ext/tk/tkutil/tkutil.c (tk_conv_args): forget to revert
+	  thread_critical and gc_disable when raise ArgumentError.
 
 	* ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
+	* ext/tk/tcltklib.c: add TclTkIp#has_mainwindow? method.
 
 	* ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
 
@@ -7225,11 +64391,17 @@ Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/multi-tk.rb: fail to control a slave IP when Tk.mainloop
 	  runs on the IP.
 
-Wed Jul 20 19:20:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jul 21 01:00:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c,config.h}:
+	  import 1.76
+	  [ruby-dev:26592] nkf constification
+
+Wed Jul 20 19:18:52 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (S_ISREG): need to define S_ISREG before it is used first.
 
-Wed Jul 20 18:40:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 18:33:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* io.c (wsplit_p): patch for the environment where
 	  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
@@ -7243,9 +64415,9 @@ Wed Jul 20 18:07:11 2005  Tanaka Akira  <akr@m17n.org>
 Wed Jul 20 10:04:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* variable.c (rb_class_path): need to adjust snprintf() len for
-	  teminating NUL.  [ruby-dev:26581]
+	  terminating NUL.  [ruby-dev:26581]
 
-Wed Jul 20 04:01:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 03:58:52 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
 	  so reverted.
@@ -7253,7 +64425,7 @@ Wed Jul 20 04:01:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
 	  on windows.
 
-Wed Jul 20 03:16:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 03:12:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/socket/socket.c: should not undef close() on win32.
 	  it's defined to rb_w32_close(), otherwise handle leaks.
@@ -7269,19 +64441,22 @@ Tue Jul 19 22:47:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* error.c (syserr_initialize): add 1 byte for snprintf() size for
 	  NUL at the end.  [ruby-dev:26574]
 
-Tue Jul 19 16:39:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jul 19 17:16:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (trap): remove sigexit(); handle "EXIT" via sig_exec().
+	  [ruby-dev:26440]
 
 	* io.c (rb_io_inspect): replace sprintf() with "%s" format all
 	  over the place by snprintf() to avoid integer overflow.
 
-Tue Jul 19 14:08:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jul 19 14:10:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
+	* ext/tk/tcltklib.c: rbtk_eventloop_depth is used as int.
 
-	* ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
+	* ext/tk/tcltklib.c: rbtk_pending_exception is tested with
 	  NIL_P, so should assign Qnil instead of 0 (Qfalse).
 
-	* ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
+	* ext/tk/tcltklib.c (ip_invoke_real): fixed memory leak when
 	  ip is deleted.
 
 Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -7290,33 +64465,50 @@ Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  returns a string even if the default value type of the TkVariable
 	  object is not "string".
 
-Mon Jul 18 21:40:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jul 18 21:39:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* eval.c (rb_call0): make the pointer to NODE volatile
 	  instead of NODE itself.
 
 Mon Jul 18 14:32:21 2005  Tanaka Akira  <akr@m17n.org>
 
-	* eval.c (rb_call0): make body volatile to avoid optimization problem.
+	* eval.c (rb_call0): make body volatile to avoid possible optimization
+	  problem.
 	  [ruby-dev:26195]
 
 Mon Jul 18 12:23:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/io/wait/wait.c: wrong backport from trunk.  fixed: [ruby-dev:26562]
+	* ext/io/wait/wait.c: wrong backport from trunk, and compile error on
+	  platforms fd_set is not a bit set.  fixed: [ruby-dev:26562]
 
 Mon Jul 18 09:36:25 2005  Tanaka Akira  <akr@m17n.org>
 
 	* rubyio.h (FMODE_WSPLIT, FMODE_WSPLIT_INITIALIZED): new constant.
 
 	* io.c (wsplit_p): new function.
-	  (io_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
+	  (io_fflush): split writing data by PIPE_BUF if wsplit_p is true in
 	  multi-threaded mode.
+	  (io_fwrite): ditto.
 	  [ruby-dev:26540]
 
+Mon Jul 18 05:00:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: import nkf.c 1.73
+	  fix: TestKconv 1F
+
 Sun Jul 17 13:46:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
 
+Sat Jul 16 23:43:16 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (Init_Enumerator): wrong argument specs.
+	  [ruby-core:05481]
+
+Sat Jul 16 15:52:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.[hc]: constified socket functions. [ruby-dev:26553]
+
 Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_c.rb (handle_class_module): handle a
@@ -7327,23 +64519,25 @@ Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/rdoc/parsers/parse_c.rb (find_call_seq): allow :nodoc: modifier
 	  in C.  [ruby-core:04572]
 
-Fri Jul 15 18:00:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jul 15 23:20:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
-	  failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
+	* enumerator.c (Init_Enumerator): use an internal directly.
 
-Fri Jul 15 07:58:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jul 15 07:58:10 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
 	  sockets should be non-blocking mode. [ruby-dev:26405]
 
 	* lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
-	  should call sock.read repeatedly until the preferred size data
-	  is obtained.
+Fri Jul 15 00:11:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enumeratorize): create new enumerator for current method if
+	  no block is given.
 
-Thu Jul 14 18:27:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* enumerator.c: moved from ext/enumerator.
+
+Thu Jul 14 18:27:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_strerror): should return correct message
 	  for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
@@ -7355,7 +64549,11 @@ Thu Jul 14 00:45:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* LEGAL (ext/nkf/nkf-utf8): updated from nkf1.7 to nkf-utf8.
 
-Wed Jul 13 19:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 13 22:44:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y: remove static variables.  [ruby-dev:26530]
+
+Wed Jul 13 19:36:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
 	  if file or directory already exists. (bcc32) [ruby-dev:26508]
@@ -7368,7 +64566,7 @@ Wed Jul 13 19:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 Wed Jul 13 12:40:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: TclTkLib.do_one_event doesn't work.
+	* ext/tk/tcltklib.c: TclTkLib.do_one_event doesn't work.
 
 	* ext/tk/lib/tk.rb: Tk.thread_update is available.
 
@@ -7376,16 +64574,30 @@ Tue Jul 12 23:32:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb: keep curdir unexpanded.
 
+Mon Jul 11 23:50:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c, intern.h (rb_proc_call, rb_obj_method, rb_method_call):
+	  export.
+
+	* ext/enumerator/enumerator.c (enumerator_with_index): [EXPERIMENTAL]
+	  added a new method Enumerator#with_index.  [ruby-talk:147728]
+
 Mon Jul 11 08:31:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* regex.c (read_special): fix parsing backslashes following \c in
+	* regparse.c (fetch_escaped_value): mask values following \c in
 	  regexp.  fixed: [ruby-dev:26500]
 
-Mon Jul 11 02:53:00 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
+	  WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
+	  no further used by the XML-RPC library).
+
+Mon Jul 11 02:50:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  mistook in merging the patch of [ruby-dev:26235] at
-	  revision 1.4.2.6.
+	  mistook to merge the patch of [ruby-dev:26235] at
+	  revision 1.11.
 
 Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -7393,18 +64605,12 @@ Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
 	  avoid unlink a directory by root.
 	  cf. [ruby-dev:26237]
 
-Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
-	  WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
-		no further used by the XML-RPC library).
-
 Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/debug.rb (debug_command): added a deficient format specifier.
 	  fixed: [ruby-core:05419]
 
-Sat Jul  9 21:28:46 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Jul  9 22:02:37 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
 	  in Ruby and C by INT2NUM and NUM2INT.
@@ -7429,6 +64635,36 @@ Fri Jul  8 15:45:04 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* test/rss/test_parser.rb (RSS::TestParser#test_category20):
 	  adjusted test case.
 
+Wed Jul  6 18:45:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_pattern_match): now returns nil.
+	  [ruby-core:05391]
+
+Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/svr.rb: service can be stopped by ill-behaved client; use
+	  tsvr.rb instead.
+
+Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
+	  be public domain.  reverted BSD implementation.
+
+Wed Jul  6 11:15:21 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (open_ifs_socket): new function.
+
+	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
+	  instead of socket().
+	  all changes are derived from [ruby-core:5388].
+
+Wed Jul  6 00:15:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c,config.h}:
+	  imported nkf.c 1.70 (support UTF-8-MAC)
+
+	* ext/nkf/lib/kconv.rb: add :utf8mac and :internalunicode
+
 Tue Jul  5 23:44:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb: expand source library path.
@@ -7445,19 +64681,19 @@ Tue Jul  5 15:15:10 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tkutil.c: fix typo.
 
-Tue Jul  5 14:51:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Jul  5 14:52:56 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
+	* ext/tk/tcltklib.c: bug fix on treating Unicode strings.
 
-	* ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
+	* ext/tk/tcltklib.c: add methods to treat encoding mode.
 
-	* ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
+	* ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding,
 	  encoding_system, and so on.
 
-	* ext/tcltklib/MANUAL.euc: ditto.
+	* ext/tk/MANUAL_tcltklib.eucj: ditto.
 
-	* ext/tk/tkutil.c: fail to create a Tcl's list string from an
-	  array including multiple kind of encoded strings.
+	* ext/tk/tkutil/tkutil.c: fail to create a Tcl's list string from
+	  an array including multiple kind of encoded strings.
 
 	* ext/tk/lib/tk.rb: ditto.
 
@@ -7483,17 +64719,11 @@ Tue Jul  5 14:51:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
 	  should be UTF-8 strings.
 
-Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul  4 19:29:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* sample/svr.rb: service can be stopped by ill-behaved client; use
-	  tsvr.rb instead.
+	* lib/set.rb: test change to follow revision 1.28. (duck typing?)
 
-Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
-	  be public domain.  reverted BSD implementation.
-
-Mon Jul  4 11:15:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jul  4 11:23:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
 	  which using fork on fork-less platforms.
@@ -7516,11 +64746,18 @@ Sat Jul  2 17:06:23 2005  Tanaka Akira  <akr@m17n.org>
 
 	* eval.c (flush_register_windows): new function.
 
-Fri Jul  1 17:48:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h (NOINLINE): move up to be effective in defines.h.
 
-	* bignum.c (get2comp): revert all prior changes, and calculate
-	  proper 2's complement for negative numbers.  backported from
-	  HEAD.
+Sat Jul  2 15:19:41 2005  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in: check select_large_fdset.
+
+	* eval.c: use select_large_fdset to support large file descriptors
+	  on Solaris.  [ruby-dev:26404]
+
+Fri Jul  1 17:55:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_neg): may be accessing bogus pointer value.
 
 Fri Jul  1 15:50:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
@@ -7560,7 +64797,13 @@ Fri Jul  1 00:18:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/delegate.rb (Delegator::respond_to): respond_to? must check
 	  destination object.  [ruby-talk:146894]
 
+Thu Jun 30 23:52:12 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (trap): non-string trap hander was ignored.
+	  fixed: [ruby-dev:26417]
+
 Thu Jun 30 19:00:21 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
 	* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
 	  for [ruby-dev:26410]. And support a numeric form of 0d99999.
 
@@ -7574,46 +64817,76 @@ Thu Jun 30 15:13:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_eval): pre-evaluate argument for unambiguous
 	  evaluation order.  [ruby-dev:26383]
 
+Thu Jun 30 14:48:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/net/http.rb (Net::HTTP#connect, Net::HTTP#request): should
+	  not send proxy username and password to origin servers.
+	  [ruby-dev:25673]
+
+	* lib/net/http.rb (Net::HTTP::ProxyDelta#edit_path): should not
+	  send HTTPS scheme URL to origine servers. [ruby-dev:25689]
+
 Thu Jun 30 09:53:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (Delegator::method_missing): forward unknown
 	  method to the destination.  suggested by
 	  <christophe.poucet@gmail.com>.  [ruby-talk:146776]
 
+Wed Jun 29 00:03:20 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* regparse.c (fetch_token): avoid warning of unused goto tag.
+	  [ruby-dev:26389]
+
 Tue Jun 28 21:59:29 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
+	* dir.c, eval.c, parse.y, process.c, ruby.c: avoid warning "unused
 	  variable" [ruby-dev:26387]
 
-Sat Jun 25 17:15:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* dir.c (glob_helper): avoid warning "enumeration value `RECURSIVE'
+	  not handled in switch" [ruby-dev:26392]
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
-	  discard if key=val pair is empty. patch from Gary Wright.
+Tue Jun 28 01:52:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb: add Kconv::VERSION
+	* ext/nkf/lib/kconv.rb (conv): can process arrayed options
+	* ext/nkf/nkf-utf8/nkf.c: imported Revision 1.69
+	* ext/nkf/nkf-utf8/utf8tbl.c: imported Revision 1.9
 
 Sat Jun 25 23:30:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* process.c (detach_process_watcher): terminate process watcher
 	  thread right after rb_waitpid() succeed.  [ruby-talk:146430]
 
+Sat Jun 25 17:12:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
+	  discard if key=val pair is empty. patch from Gary Wright.
+
 Sat Jun 25 15:49:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enum.c (enum_min, enum_max): do not ignore nil as the first element.
+	* enum.c (enum_min, enum_max, enum_min_by, enum_max_by): do not ignore
+	  nil as the first element.
 
-Sat Jun 25 14:40:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun 25 15:13:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
-	  which contained each elements twice. [ruby-dev:26358]
+	* lib/set.rb (Set#==): [ruby-dev:25206] (ported from ruby_1_8 branch)
 
-Fri Jun 25 05:06:47 2005  Michael Neumann  <mneumann@ruby-lang.org>
+Sat Jun 25 11:37:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
+	* ext/nkf/lib/kconv.rb: remove constants
+	  Iconv_Shift_JIS, Uconv_EUC_JP, Iconv_UTF8
+	* ext/nkf/lib/kconv.rb: add module functions to Kconv
+	  conv, {eucjp, shiftjis, utf8}?, guess_as_symbol
+	* ext/nkf/lib/kconv.rb: add instance methods to String
+	  conv, {eucjp, shiftjis, utf8}?
+	* ext/nkf/lib/kconv.rb: add aliases Kconv.to_* and String#to_*
 
 Fri Jun 24 17:00:00 2005  Shigeo Kobayashi  <shigeo@tinyforest.jp>
 
 	* ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
 	  (u-tokyo.ac.jp) applied to fix rounding bug.
 
-Fri Jun 24 13:06:45 2005  akira yamada  <akira@ruby-lang.org>
+Fri Jun 24 13:17:45 2005  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
 	  replaced some existent domain name with "example.com".
@@ -7650,7 +64923,7 @@ Mon Jun 20 18:44:04 2005  Tanaka Akira  <akr@m17n.org>
 	  because setjmp is not enough to fix getcontext and SPARC register
 	  window problem.
 
-Mon Jun 20 16:48:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jun 20 17:15:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
 
@@ -7663,7 +64936,7 @@ Mon Jun 20 16:48:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.{ch} (unlink): hook runtime function to change
 	  file attribute before unlinking.
-	  fixed: [ruby-dev:26360]
+	  merge from 1.8, see [ruby-dev:26360]
 
 Mon Jun 20 02:15:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -7677,6 +64950,17 @@ Mon Jun 20 01:26:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
 	  compiler warnings. suggested by Michal Rokos.
 
+Sun Jun 20 00:22:02 2005  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* lib/xmlrpc/utils.rb: Patch by Nobuhiro IMAI fixes the following
+	  problem: Default value modification on
+	  Module#public_instance_methods (false -> true) breaks
+	  s.add_handler(XMLRPC::iPIMethods("sample"), MyHandler.new) style
+	  security protection.
+
+	* lib/xmlrpc/client.rb: Aliased XMLRPC::Client#new2 as
+	  XMLRPC::Client#new_from_uri, and #new3 as #new_from_hash.
+
 Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (run_final): reduce unnecessary object allocation during
@@ -7685,15 +64969,30 @@ Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
 	  be cleared before calling them.  fixed: [ruby-talk:145790]
 
+Sat Jun 18 01:15:36 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): do not set
+	  rl_{in,out}stream.
+
+	* ext/readline/readline.c (readline_s_set_input): new method.
+
+	* ext/readline/readline.c (readline_s_set_output): new method.
+
+	* lib/irb/input-method.rb: set Readline.input and Readline.output.
+
 Fri Jun 17 13:01:40 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/time.rb (Time.parse): fix previous leap seconds support.
 	  (Time.rfc2822): ditto.
 	  (Time.xmlschema): ditto.
 
-Thu Jun 16 15:06:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 16 15:41:32 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (load_file): '!' is already read. reported by gotoyuzo.
 
-	* ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
+Thu Jun 16 15:09:38 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
 	  was missing.
 
 Thu Jun 16 13:34:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -7709,10 +65008,14 @@ Thu Jun 16 12:53:24 2005  Tanaka Akira  <akr@m17n.org>
 	  (Time.rfc2822): ditto.
 	  (Time.xmlschema): ditto.
 
-Thu Jun 16 08:29:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 16 00:13:41 2005  Tanaka Akira  <akr@m17n.org>
 
-	* ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
-	  fixed memory leak. [ruby-Bugs-2034]
+	* lib/resolv.rb (Resolv::DNS::Resource#ttl): new attribute.
+	  (Resolv::DNS::Resource#==): ignore @ttl.
+	  (Resolv::DNS::Resource#hash): ditto.
+	  (Resolv::DNS::Message::MessageDecoder#get_rr): save TTL in a
+	  Resource object.
+	  based on [ruby-core:5190] by Eric Hodel.
 
 Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -7723,13 +65026,13 @@ Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Tue Jun 14 02:02:43 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) &
-	  _define_attribute_aliases(hash) to get substitution-argument from
+	* ext/tk/tkutil/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...)
+	  & _define_attribute_aliases(hash) to get substitution-argument from
 	  attributes (e.g. subst_arg(:x,:y,:num,:button) --> "%x %y %b %b ").
 
 	* ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
 
-Mon Jun 13 13:01:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jun 13 13:03:08 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
 
@@ -7752,11 +65055,20 @@ Mon Jun 13 01:20:02 2005  Tanaka Akira  <akr@m17n.org>
 	* eval.c (rb_gc_mark_threads): curr_thread may not be part of the
 	  thread list.  [ruby-dev:26312]
 
+Sat Jun 11 22:34:44 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: missing arg_paren event.  This patch is contributed by
+	  Mitchell N Charity.
+
+Fri Jun 10 23:55:17 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
+
 Fri Jun 10 23:35:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* missing/mkdir.c: remove. [ruby-core:05177]
 
-Fri Jun 10 22:54:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 10 22:54:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* missing.h: fd_set stuffs need sys/types.h.  fixed: [ruby-core:05179]
 
@@ -7780,20 +65092,47 @@ Thu Jun  9 19:55:41 2005  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
 
+Thu Jun  9 18:24:16 2005  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in, eval.c, gc.c: use libunwind only on HP-UX.
+	  [ruby-dev:26297]
+
+Thu Jun  9 14:46:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (env_aset): do not treat nil as key-removing value.
+	  [ruby-list:40865]
+
+	* parse.y (method_call): allow aref expression ([]) to take a
+	  block.
+
+	* parse.y (block_dup_check): a function to check duplication of
+	  a block argument and an actual block.
+
 Thu Jun  9 11:55:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (SimpleDelegator::__setobj__): need check for
 	  recursive delegation.  [ruby-core:04940]
 
+Thu Jun  9 11:50:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb: add underscore aliases CGI::escape_html,
+	  CGI::unescape_html, CGI::escape_element, CGI::unescape_element.
+	  [ruby-core:05058]
+
 Wed Jun  8 18:47:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
 
+Wed Jun  8 12:25:59 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_nitems): add the block feature to Array#nitems.
+	  suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
+	  [ruby-talk:134083].
+
 Wed Jun  8 11:11:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (get2comp): calculate proper 2's complement for
-	  negative numbers.  a bug in normalizing negative numbers
-	  reported from Honda Hiroki <hhonda@ipflex.com>.
+	* bignum.c (get2comp): revert all prior changes, and calculate
+	  proper 2's complement for negative numbers.
 
 Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -7804,6 +65143,15 @@ Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (backtrace): skip successive frames sharing same node.
 
+Wed Jun  8 01:27:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bignorm): fixed a bug in normalizing negative numbers
+	  reported from Honda Hiroki <hhonda@ipflex.com>.  normalizing
+	  should not trim leading zeros from negative numbers.
+
+	* bignum.c (rb_cstr_to_inum): must remove leading zeros for this
+	  case.
+
 Wed Jun  8 00:15:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
@@ -7829,37 +65177,55 @@ Tue Jun  7 19:34:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Tue Jun  7 18:39:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/thread.rb: RDoc documentation from Eric Hodel
-	  <drbrain at segment7.net> added.  [ruby-core:05148]
+	  <drbrain@segment7.net> added.  [ruby-core:05148]
 
 Tue Jun  7 18:30:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
 	  fixed: [ruby-dev:26294]
 
-Tue Jun  7 17:39:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun  7 17:20:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* object.c (rb_mod_cvar_get): Module#class_variable_get(): back
-	  ported from CVS HEAD.  [ruby-talk:144741]
+	* parse.y (parser_yylex): allow ';;' to be block terminator in
+	  place of 'end'.  [highly experimental]
 
-	* object.c (rb_mod_cvar_set): Module#class_variable_set().
-	  [ruby-talk:144741]
+	* misc/ruby-mode.el (ruby-block-end-re): allow ';;' to be a
+	  negative indent trigger.  [highly experimental]
+
+	* parse.y (parser_yylex): small error fixed.
+
+Tue Jun  7 16:45:49 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): "respond_to?:foo" should be interpreted
+	  as "respond_to? :foo" at the command level.  [ruby-talk:144303]
 
 Tue Jun  7 16:32:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
 	  not verbose mode (-v/-w).  [ruby-core:05123]
 
+	* sprintf.c (rb_f_sprintf): warn always on verbose mode.
+
 Tue Jun  7 10:30:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
 	  delegated by master-ip.
 
+Mon Jun  6 16:35:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/ripper/depend: add .y to .SUFFIXES for nmake.
+
 Sun Jun  5 23:00:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/console.rb: create console when required
 
 	* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
 
+Sun Jun  5 10:23:52 2005  Tanaka Akira  <akr@m17n.org>
+
+	* signal.c (ruby_signal): don't set SA_RESTART.
+	  [ruby-dev:26276]
+
 Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
 
 	* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
@@ -7869,15 +65235,61 @@ Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
 	* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
 	  modification to use test/unit.
 
+Fri Jun  3 23:23:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h (rb_fdset_t): deal with fd bit sets over FD_SETSIZE.
+	  fixed: [ruby-dev:26187]
+
+	* eval.c (rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr,
+	  rb_fd_isset, rb_fd_copy): ditto.
+
+	* io.c (rb_io_wait_readable, rb_io_wait_writable, rb_f_select): ditto.
+
+	* ext/io/wait/wait.c (io_wait): ditto.
+
+	* ext/socket/socket.c (wait_connectable, unix_recv_io): ditto.
+
 Fri Jun  3 14:06:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: fix typo.
 
-Wed Jun  1 11:32:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun  2 23:42:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y: pragma support on ripper.  [ruby-dev:26266]
+
+Thu Jun  2 00:02:16 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* struct.c: accessing >10 member caused segmentation fault.
+	  [ruby-dev:26247]
+
+	* test/ruby/test_struct.rb: test it.
+
+Wed Jun  1 11:30:09 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: can use single quote character in DESTDIR.
 	  [ruby-dev:26205]
 
+	* bcc32/Makefile.sub: Dir.glob in 1.9 doesn't treat \ as path separator.
+	  [ruby-dev:26254]
+
+Wed Jun  1 00:11:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (method_call): new experiment: "(expr)(args...)" to
+	  invoke "expr.call(args...)".  [EXPERIMENTAL]
+
+Tue May 31 23:43:41 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (command): revert implicit "call" for local variables.
+
+Tue May 31 15:52:45 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
+	  break the loop if the socket reached to EOF. [ruby-talk:142285]
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): send response
+	  without reading the whole request body if keep-alive is diabled.
+	  [experimental]
+
 Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
@@ -7889,12 +65301,12 @@ Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: ditto.
 
-Sat May 28 16:40:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat May 28 16:39:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_x509store.rb: add test for expired CRL
 	  and refine some assertions.
 
-Sat May 28 05:15:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat May 28 05:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
 	  not set internal flag directry.
@@ -7910,22 +65322,41 @@ Fri May 27 16:32:04 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 	* lib/mkmf.rb: use the semicolon as the path separator
 	  in the environment of MSYS.  fixed: [ruby-dev:26232]
 
-Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu May 26 20:31:21 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
+	* lib/fileutils.rb (remove_entry_secure): add documentation.
 
-Wed May 25 22:52:42 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/fileutils.rb (remove_entry_secure): should not invoke
+	  unlink(2) against a directory.
 
-	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
-	  (backported from HEAD)
+Thu May 26 08:29:19 2005  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+
+	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
+	  for VMS port are added.
+
+	* eval.c (ruby_init): change to call VMS private intialization routine.
+
+Thu May 26 07:39:07 2005  Minero Aoki  <aamine@loveruby.net>
 
-Wed May 25 21:55:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/fileutils.rb (rm_r): use lchown(2), not chown(2).
+	  [ruby-dev:26226]
 
-	* ext/readline/readline.c: supported libedit. (backported from HEAD)
+	* lib/fileutils.rb (cd): remove :noop option. (feature change)
+
+	* lib/fileutils.rb (cp_r): should copy symlink as symlink, for
+	  also tree root. (feature change)
+
+	* lib/fileutils.rb (cp_r): new option :dereference_root.
 
-	* ext/readline/extconf.rb: ditto.
+	* lib/fileutils.rb: new method remove_entry.
 
-	* test/readline/test_readline.rb: ditto.
+	* lib/fileutils.rb: new method remove_entry_secure.
+
+	* lib/fileutils.rb: add documentation.
+
+Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
 
 Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -7967,6 +65398,10 @@ Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
 
+Wed May 25 19:48:12 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (rm_r): does chown(2). [ruby-dev:26199]
+
 Wed May 25 12:59:48 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
@@ -7982,17 +65417,17 @@ Tue May 24 16:57:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ruby.c (require_libraries): caused SEGV when continuation jumped
 	  in to the required library code.
 
-Tue May 24 11:56:25 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue May 24 17:45:59 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/getopts.rb: should warn only if verbose mode.
-	  fixed: [ruby-dev:26201]
+	* test/readline/test_readline.rb: do not test libedit.
+	  fixed: [ruby-dev:26217]
 
 Tue May 24 06:45:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
 	  literals to be matched non-greedy.
 
-Tue May 24 00:34:32 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue May 24 00:39:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/soap/calc: method name 'set' was able to crash with a class Set.
 	  [ruby-dev:26210]
@@ -8000,11 +65435,16 @@ Tue May 24 00:34:32 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* test/wsdl/document/test_rpc.rb: dateTime comparison failed under
 	  TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
 
-Mon May 23 16:24:05 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon May 23 16:23:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
+	* ext/tk/extconf.rb: Framework support on MacOS X Tiger.
 
-	* ext/tcltklib/README.1st: add description of Framework support options.
+	* ext/tk/README.tcltklib: add description of Framework support options.
+
+Mon May 23 15:07:34 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub ($(PROGRAM)): add dependency on $(LIBRUBY_SO).
+	  [experimental]
 
 Mon May 23 12:21:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -8097,41 +65537,79 @@ Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
 
-Sat May 21 10:24:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun May 22 12:30:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h, parse.y (ruby_pragma): removed.  fixed: [ruby-dev:26198]
+
+	* parse.y (parser_pragma): pragma name was ignored.
+
+Sun May 22 02:39:57 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (rm_r): new option :secure to avoid
+	  time-to-check-to-time-to-use security problem.  [ruby-dev:26100]
+
+	* lib/fileutils.rb (remove_file, remove_dir): try chmod(700) only
+	  on Windows.
+
+	* lib/fileutils.rb: does not depend on find.rb.
+
+	* lib/fileutils.rb: new method chmod_R.
+
+	* lib/fileutils.rb (chown_R): did not work.
+
+Sat May 21 10:23:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: tds files were not deleted when DESTDIR
 	  included '\' path delimiter. [ruby-dev:26193]
 
-Thu May 19 19:04:29 2005  speakillof  <speakillof@yahoo.co.jp>
+Fri May 20 15:52:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
-	  swapped. [ruby-core:4772]
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  return 2 items if completion_proc returns only 1 item (for libedit).
+
+Fri May 20 01:24:33 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/extconf.rb: check rl_vi_editing_mode() and
+	  rl_emacs_editing_mode().
+
+Thu May 19 23:33:09 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c: supported libedit. fixed: [ruby-core:4858]
+
+	* ext/readline/extconf.rb: added new option --enable-libedit.
+
+	* test/readline/test_readline.rb: added assertions for
+	  Readline::HISTORY.
+
+	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
 
 Wed May 18 23:42:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (exc_exception): reverted to call Exception#initialize
 	  directly.  fixed: [ruby-dev:26177]
 
-Wed May 18 23:39:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 18 17:38:51 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* dir.c (glob_helper): get rid of using String.  [ruby-dev:26180]
+	* dir.c (glob_helper): check whether path is "" before calling
+	  do_opendir.  [ruby-dev:26183]
 
-	* dir.c (push_braces): should skip balanced braces.
+Wed May 18 13:40:48 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
-	  intialization back.  [ruby-dev:26180]
+	* win32/win32.c (NtInitialize): fix typo.
 
-Tue May 17 15:31:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed May 18 11:07:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
-	  break the loop if the socket reached to EOF. [ruby-talk:142285]
+	* dir.c (glob_helper): get rid of using String.  [ruby-dev:26180]
 
-Tue May 17 11:52:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
+	  intialization back.  [ruby-dev:26180]
+
+Tue May 17 11:49:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (unixtime_to_filetime): use localtime() instead of
 	  gmtime() when using FileLocalTimeToFileTime().
 
-Mon May 16 22:28:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 16 22:42:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
 	  to get rid of redefinition warnings on mingw.
@@ -8139,7 +65617,12 @@ Mon May 16 22:28:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* class.c (rb_class_init_copy): singleton class is disallowed to copy,
 	  from its definition.  fixed: [ruby-talk:142749]
 
-Mon May 16 08:52:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* parse.y (pragma_encoding): add prototype to suppress false warning
+	  by VC.
+
+	* process.c (proc_spawn_v): use rb_w32_aspawn on Win32.
+
+Mon May 16 03:29:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.{h,c}: define rb_[pgu]id_t.
 
@@ -8149,7 +65632,7 @@ Mon May 16 00:21:02 2005  Tanaka Akira  <akr@m17n.org>
 	  Errno::EISDIR because EISDIR is not portable.
 	  [ruby-core:5001]
 
-Sun May 15 22:11:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun May 15 22:28:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
 	  [ruby-dev:26164]
@@ -8174,7 +65657,7 @@ Sat May 14 23:59:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
 	  Execption#initialize.  fixed: [ruby-talk:142593]
 
-Sat May 14 23:57:26 2005  Erik Huelsmann  <ehuels@gmail.com>
+Sat May 14 23:56:41 2005  Erik Huelsmann  <ehuels@gmail.com>
 
 	* configure.in: Check for the availability of pid_t, gid_t and uid_t and
 	  remove AC_TYPE_UID_T.  fixed: [ruby-core:04745]
@@ -8199,6 +65682,16 @@ Sat May 14 23:57:26 2005  Erik Huelsmann  <ehuels@gmail.com>
 
 	* wince/sys/types.h: Remove definitions of {p,g,u}id_t.
 
+Sat May 14 11:47:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h (ruby_pragma): prototype.  [ruby-core:04881]
+
+	* parse.y (parser_pragma): parse Emacsen hack.
+
+	* parse.y (parser_prepare): deal with specific syntax at the top.
+
+	* ruby.c (load_file): read the first line iff it started with shebang.
+
 Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: keep srcdir unexpanded.
@@ -8210,87 +65703,45 @@ Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  also INSTALL_PROG and INSTALL_DATA system dependent.
 	  fixed: [ruby-core:04931]
 
-Fri May 13 17:54:39 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* variable.c (generic_ivar_get): rb_attr_get should not warn.
-	  [ruby-dev:26010]
-
-Fri May 13 12:28:43 2005  Daniel Berger  <djberge@qwest.com>
-
-	* array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
-
-	* test/ruby/test_array.rb: add test for find_all.
-
-Fri May 13 11:29:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri May 13 23:32:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (unknown_node): add volatile directive to prototype.
 
-Thu May 12 17:08:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
-
-	* io.c (rb_io_eof, io_fread, appendline, swallow, rb_io_each_byte)
-	  (rb_io_getc, rb_getc): call clearerr before getc to avoid
-	  stdio incompatibility.
-
-Thu May 12 16:52:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri May 13 17:50:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/rdoc/parsers/parse_c.rb: more readability for mixing
-	  progress "c..." and warning message.
+	* variable.c (generic_ivar_get): rb_attr_get should not warn.
+	  [ruby-dev:26010]
 
-Thu May 12 16:31:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu May 12 17:41:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
 
-Thu May 12 16:15:01 2005  Tanaka Akira  <akr@m17n.org>
+Thu May 12 16:50:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): don't rely EOF flag.
-	  [ruby-talk:141527]
+	* lib/rdoc/parsers/parse_c.rb: more readability for mixing
+	  progress "c..." and warning message.
 
-Thu May 12 15:56:20 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+Thu May 12 15:50:56 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
 
 	* lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
 	  [ruby-core:4341]
 
-Thu May 12 13:47:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/drb/test_drb{ssl,unix}.rb: can test drb
-	  before install. (backported from HEAD) [ruby-dev:26146]
-
 Thu May 12 09:53:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* version.c (ruby_show_version): flush for non-tty stdout.
 
-Thu May 12 09:07:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
-	  before install. (backported from HEAD) [ruby-Bugs-1672]
-
 Thu May 12 01:23:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
-	  parser.  fixed: [ruby-dev:26113]
-
 	* eval.c (unknown_node): ignore broken NODE to get rid of accessing
 	  possibly inaccessible address.  fixed: [ruby-dev:26122]
 	  should emit more useful information like [ruby-dev:26126], though.
 
-Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
-	  and WEBrick::CGI#config. (backported from HEAD)
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
-	  not use String#split("/"). (backported from HEAD)
-
 Wed May 11 15:58:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (break_jump): break should not cross functions.
 	  [ruby-list:40818]
 
-Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed May 11 10:41:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/tempfile.rb (Tempfile#unlink): fixed typo.
 
@@ -8303,7 +65754,12 @@ Sun May  8 23:17:47 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: fix typo.
 
-Sun May  8 16:52:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun May  8 21:00:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* hash.c (Init_Hash): remove custom "hash" and "eql?".
+	  (ported from 1.8) [ruby-dev:26132]
+
+Sun May  8 16:50:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
 	  [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
@@ -8312,11 +65768,54 @@ Sat May  7 22:58:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (have_var): no libs argument is given.
 
-Sun May  1 09:58:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May  6 08:08:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c:rb_hash_hash_i() should be static.  [ruby-core:04815]
+
+	* re.c should include regint.h for declarations of oniguruma
+	  functions.  [ruby-core:04815]
+
+Sun May  1 09:15:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (process_sflag): replace '-' in variable names with '_'.
 	  [ruby-dev:26107]
 
+	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
+	  parser.  fixed: [ruby-dev:26113]
+
+Sat Apr 30 11:59:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_FUNC_ATTRIBUTE): check for function attribute.
+	  [ruby-dev:26109]
+
+	* eval.c, gc.c: moved noinline to configure.in.
+
+	* rubyio.h (DEPRECATED): moved to configure.in.
+
+	* ruby.h (DEPRECATED, NOINLINE): default definition.
+
+	* win{32,ce}/Makefile.sub (config.h): deprecated and noinline for
+	  __declspec() are available for VC++7 or later.
+
+Sat Apr 30 06:57:39 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
+	  and WEBrick::CGI#config.  these are necessary to use an instance of
+	  WEBrick::CGI as the first argument of HTTPServlet#get_instance.
+	  (suggested by Tatsuki Sugiura)
+
+	* lib/webrick/cgi.rb
+	  (WEBrick::CGI#initalize): set a dummy to @config[:ServerSoftware]
+	  if SERVER_SOFTWARE environment variable is not given.
+	  (WEBrick::CGI#start): req.path_info must be a String.
+	  (WEBrick::CGI::Socket#request_line): treat REQUEST_METHOD, PATH_INFO
+	  and SCRIPT_NAME to run in console.
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
+	  not use String#split("/"). it removes trailing empty path component.
+
+Thu Apr 28 08:21:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
 	* ruby.c (set_arg0): use also environment variable space for setting
 	  $0.  [ruby-core:04774]
 
@@ -8327,23 +65826,46 @@ Wed Apr 27 23:42:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Tue Apr 26 22:58:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
+	* ext/tk/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
 	  command when can't get information of target command.
 
+Mon Apr 25 13:54:55 2005  speakillof  <speakillof@yahoo.co.jp>
+
+	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
+	  swapped. [ruby-core:4772]
+
 Mon Apr 25 01:18:43 2005  Tanaka Akira  <akr@m17n.org>
 
-	* regex.c: declare rb_warn to have variadic argument.  [ruby-core:4751]
+	* oniguruma.h (OnigWarnFunc): add a variadic argument.
+	  [ruby-core:4751]
 
-Sat Apr 23 19:45:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Apr 23 19:49:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
+	* ext/tk/tcltklib.c (ip_RubyExitCommand): exit with status code
 	  via TclTkIp#_eval didn't work. [ruby-talk:139390]
 
-Fri Apr 22 16:41:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Apr 23 11:45:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_provided): should check also path name to be loaded.
+	  fixed: [ruby-dev:26093]
+
+Fri Apr 22 16:55:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/tcltklib.c (ip_set_exc_message): fixed memory leak.
 
-	* ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
+	* ext/tk/tcltklib.c: eTkCallbackReturn was not initialized.
 
-	* ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
+Thu Apr 21 06:45:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_incpush_expand, proc_options): expand relative path
+	  given with -I option.  [ruby-dev:26090]
+
+	* configure.in, lib/mkmf.rb, {bcc32,win32,wince}/Makefile.sub: improve
+	  C++ support.  [ruby-dev:26089]
+
+Thu Apr 21 01:53:09 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: add rdoc.
 
 Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -8357,7 +65879,7 @@ Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Wed Apr 20 23:22:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Makefile.in, common.mk: miniruby depens on MINIOBJS.
+	* Makefile.in, common.mk: miniruby depends on MINIOBJS.
 
 	* dmydln.c (dln_load): dummy function to raise LoadError.
 
@@ -8368,6 +65890,21 @@ Wed Apr 20 23:01:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/ifchange.bat: delete testing files.
 
+Wed Apr 20 22:54:54 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: new method Net::HTTP.post_form.
+
+	* lib/net/http.rb: new method Net::HTTPHeader#set_form_data and
+	  its alias #form_data=.
+
+	* lib/net/http.rb: Net::HTTPHeader#add_header -> add_field
+	  (adjustted to Ruby 1.8).
+
+Wed Apr 20 10:53:30 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_rb.rb (lex_init): use IRB module.
+	  [ruby-core:04737]
+
 Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
@@ -8375,18 +65912,33 @@ Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bcc32/setup.mak: make configuration variables overridable.
 
-Wed Apr 20 04:15:27 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
-
 Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
 
-Tue Apr 19 00:06:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 19 23:02:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (search_required): deal with features with path too.
+
+	* intern.h (rb_file_expand_path): prototype.  fixed: [ruby-dev:26082]
+
+Tue Apr 19 08:38:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (search_required, rb_require_safe): expand path in
+	  rb_features.  [ruby-dev:26079]
+
+	* file.c (rb_find_file_ext): return absolute path.
 
 	* ext/extmk.rb: expand path for ext/**/extconf.rb.
 
+	* eval.c (search_required): handle static linked extensions.
+
+Mon Apr 18 15:37:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_attr): attribute name check added.
+
+	* numeric.c (flo_plus): small typo fix.
+
 Mon Apr 18 11:25:14 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
@@ -8413,7 +65965,7 @@ Sat Apr 16 15:27:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: purge autoconf value variables.
 
-Sat Apr 16 10:36:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Apr 16 10:33:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
 	  still have restriction on DESTDIR ("", "/", "e:")
@@ -8424,18 +65976,55 @@ Sat Apr 16 03:59:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/openssl_missing.h: ditto.
 
-Thu Apr 14 19:18:30 2005  Minero Aoki  <aamine@loveruby.net>
+Fri Apr 15 22:40:19 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE.codepage=
+
+	* ext/win32ole/tests/testOLETYPELIB.rb: correct expected message.
+
+Fri Apr 15 22:04:07 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
+	  to VT_EMPTY.
+
+Thu Apr 14 19:05:06 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper] (regexp): dispatch regexp option.
+	  [ruby-Bugs:1688]
+
+	* ext/ripper/lib/core.rb: regenerated (interface changed).
+
+Thu Apr 14 18:59:43 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (remove_file): ignore exceptions caused by
 	  chmod.
 
 	* lib/fileutils.rb (remove_dir): try to get rights to rmdir.
-	  [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
+	  [ruby-Bugs:1502]
+
+Thu Apr 14 18:51:02 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb, lib/irb/slex.rb: bug fix of [ruby-Bugs-1745]
+
+	* lib/irb/ext/loader.rb, lib/irb/ext/save-history.rb:
+	  fix location of @RCS_ID
 
-Thu Apr 14 16:57:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/irb/cmd/help.rb: a lost of release IRB 0.9.5.
 
-	* bcc32/Makefile.sub: failed to remove debug information files.
-	  fixed: [ruby-dev:26034]
+Thu Apr 14 15:10:30 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/notifier.rb, lib/irb/output-method.rb, lib/irb/ext/history.rb
+	  fixed warning of 'ruby -w'
+
+Thu Apr 14 05:35:45 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* doc/irb/irb.rd.ja: a lost  of release IRB 0.9.5.
+
+	* lib/irb/slex.rb: bug fix by [ruby-core:04707].
+
+Thu Apr 14 00:20:31 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* bin/irb lib/irb.rb lib/irb/...: IRB 0.9.5.
 
 Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -8444,33 +66033,44 @@ Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* lib/rss/rss.rb (RSS::Element#converter): fixed converter
 	  transmission bug.
 
+Wed Apr 13 22:12:16 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#order!): call handlers iff matches
+	  non-switch.
+
 Wed Apr 13 21:20:35 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (mingw32): extract msvcr*.dll from objdump result.
 
-Wed Apr 13 20:24:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 13 19:25:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (mingw32): use actual runtime DLL name as ruby DLL
 	  name and default load path.
 
 	* win32/Makefile.sub, win32/setup.mak: ditto.
 
+Tue Apr 12 19:30:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#make_switch, OptionParser#order!):
+	  added non-option and end-of-args handler.  [ruby-talk:136878]
+	  [EXPERIMENTAL]
+
 Tue Apr 12 15:33:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
+	* ext/tk/tcltklib.c (ip_finalize): better modification than the
 	  previous commit [ruby-dev:26029].
 
 Tue Apr 12 12:38:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
+	* ext/tk/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
 	  modifies the argument string to eval.
 
 Tue Apr 12 02:21:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
+	* ext/tk/tcltklib.c (ip_finalize): add existence check of
 	  Tcl commands before calling Tcl_GlobalEval().
 
-Mon Apr 11 23:47:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Apr 11 23:36:04 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
 	  loaded, the object is tainted.
@@ -8483,28 +66083,13 @@ Mon Apr 11 22:18:23 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Mon Apr 11 20:11:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
-	  when exit on Tcl/Tk8.3.x.
+	* ext/tk/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV when exit
+	  on Tcl/Tk8.3.x.
 
-Mon Apr 11 15:26:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Apr 11 15:24:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
 
-Mon Apr 11 12:09:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* {bcc32,win32,wince}/Makefile.sub: ri data was not installed
-	  into correct path. [ruby-dev:26011]
-
-	* bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
-
-Sun Apr 10 10:12:42 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
-	  to VT_EMPTY.
-
-	* ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
-	  message string "Unknown" => "unknown".
-
 Sat Apr  9 18:20:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/image.rb: support to create TkImage object without
@@ -8524,75 +66109,41 @@ Sat Apr  9 14:42:29 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* sample/rss/tdiary_plugin/rss-recent.rb: supported configuration
 	  via Web browser.
 
-Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss: backoported from HEAD.
-
-	* lib/rss: refactored.
-	  - gave a name to 'x'.
-	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
-
-
-	* lib/rss/parser.rb: @@setter -> @@setters.
-
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.register_uri)
-	  (RSS::BaseListener.uri_registered?)
-	  (RSS::BaseListener.install_get_text_element):
-	  swapped the first argument and the second argument.
-
-	* lib/rss/taxonomy.rb: swapped the first argument and the second
-	  argument for RSS::BaseListener.install_get_text_element.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/content.rb: ditto.
-
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.install_setter)
-	  (RSS::BaseListener.register_uri): changed fallback way.
-
-	* lib/rss/parser.rb: added class name registry for complex model
-	  elements. (ex. have childlen elements, have some attributes and
-	  a child element and so on.)
-
-
-	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
-	* lib/rss/maker/dublincore.rb: ditto.
+Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/maker/image.rb: supproted new Dublin Core API.
+	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
+	  Config::CONFIG.
 
+	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
+	  macro reference.
 
-	* lib/rss/maker/base.rb: added default current_element implementation.
+Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
+	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
+	  [ruby-dev:25992]
 
-	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
-	  moved to RSS::Utils.
+Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
-	  moved from RSS::TrackBackUtils.
+	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
 
+	* lib/mkmf.rb (configuration, create_makefile): ditto.
 
-	* lib/rss/maker/image.rb: fixed invalid argument of
-	  add_need_initialize_variable bug.
-	* lib/rss/maker/trackback.rb: ditto.
+	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
 
+Thu Apr  7 17:24:17 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
+	* eval.c (rb_call0): "return" event hook should be always executed
+	  if event_hooks is set.
 
-	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
-	  for date value.
+Thu Apr  7 14:33:09 2005  Kouhei Sutou  <kou@cozmixng.org>
 
+	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
+	  and #dc_date=.
 
-	* test/test_dublincore.rb: added tests for plural accessor and
-	  multiple Dublin Core items.
+Thu Apr  7 11:49:53 2005  Kouhei Sutou  <kou@cozmixng.org>
 
-	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
-	  values.
+	* lib/rss/maker/dublincore.rb: _really_ supported multiple Dublin
+	  Core items.
 
 	* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
 	  an assertion for testing multiple Dublin Core items.
@@ -8600,9 +66151,18 @@ Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
 	  for making multiple Dublin Core items.
 
-	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
-	  and #dc_date=.
+Wed Apr  6 16:06:30 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
+	* test/ruby/test_env.rb (test_key): should test ENV.key instead of
+	  ENV.index. [ruby-dev:25994]
+
+Tue Apr  5 16:01:12 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/*: refactored.
+	  - gave a name to 'x'.
+	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
+
+Tue Apr  5 15:45:33 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin/rss-recent.rb:
 	  new option: @options['rss-recent.use-image-link']:
@@ -8611,54 +66171,42 @@ Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
 	  0.0.5 -> 0.0.6.
 
-Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
-	  Config::CONFIG.
+Tue Apr  5 15:15:26 2005  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
-	  macro reference.
-
-Fri Apr  8 18:26:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
 
-	* ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts.
-	  - SSLContext#client_cert_cb=(aProc). it is called when a client
-	    certificate is requested by a server and no certificate was not
-	    set for the SSLContext. it must return an Array which includes
-	    OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
-	  - SSLContext#tmp_dh_callback=(aProc). it is called in key
-	    exchange with DH algorithm. it must return an OpenSSL::PKey::DH
-	    object.
+	* lib/rss/parser.rb: added class name registry for complex model
+	  elements. (ex. have childlen elements, have some attributes and
+	  a child element and so on.)
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
-	  argument if it's nil.
+	* lib/rss/maker/base.rb: added default current_element implementation.
 
-	* ext/openssl/ossl_pkey.c
-	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
-	  (DupPrivPKeyPtr): new function.
+	* lib/rss/maker/dublincore.rb: supported multiple Dublin Core
+	  items.
 
-	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
-
-	* ext/openssl/ossl_pkey.h: ditto.
+	* lib/rss/maker/image.rb: supproted new Dublin Core API.
 
-Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
+	  moved to RSS::Utils.
 
-	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
-	  [ruby-dev:25992]
+	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
+	  moved from RSS::TrackBackUtils.
 
-Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/maker/image.rb: fixed invalid argument of
+	  add_need_initialize_variable bug.
 
-	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
+	* lib/rss/maker/trackback.rb: ditto.
 
-	* lib/mkmf.rb (configuration, create_makefile): ditto.
+	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
 
-	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
+	  for date value.
 
-Thu Apr  7 17:43:25 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* test/test_dublincore.rb: added tests for plural accessor and
+	  multiple Dublin Core items.
 
-	* eval.c (rb_call0): "return" event hook should be always executed
-	  if event_hooks is set.  fixed: [ruby-core:04662]
-	  (backported from HEAD)
+	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
+	  values.
 
 Mon Apr  4 23:17:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -8673,11 +66221,6 @@ Mon Apr  4 10:26:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/lib/tk/dialog.rb: fixed typo.
 
-Sun Apr  3 17:16:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
-	  (backported from HEAD)
-
 Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (CP, INSTALL): get rid of less portable options.
@@ -8685,8 +66228,8 @@ Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (configuration, create_makefile): correct configuration
 	  variable.
 
-	* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
-	  config.status for backward compatibility.  fixed: [ruby-core:04649]
+	* wince/configure.bat, wince/setup.mak: add prefix, extstatic and
+	  rdoc options.
 
 	* lib/mkmf.rb (create_makefile): ensure library directories get made
 	  before copying libraries there.
@@ -8705,6 +66248,11 @@ Sat Apr  2 16:59:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
 	  'TkWarningObj'
 
+Sat Apr  2 13:23:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* hash.c (env_key): ENV.index is deprecated as well as Hash#index.
+	  use ENV.key instead. [ruby-dev:25974]
+
 Sat Apr  2 02:19:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
@@ -8721,12 +66269,39 @@ Thu Mar 31 22:23:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* README.EXT, README.EXT.ja (Appendix C): utility functions.
 
-Thu Mar 31 14:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Mar 31 14:08:43 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
 	  value. [ruby-dev:25971]
 
-Thu Mar 31 08:25:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar 31 11:07:50 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb: @@setter -> @@setters.
+
+	* lib/rss/parser.rb
+	  (RSS::BaseListener.register_uri)
+	  (RSS::BaseListener.uri_registered?)
+	  (RSS::BaseListener.install_get_text_element):
+	  swapped the first argument and the second argument.
+
+	* lib/rss/taxonomy.rb: swapped the first argument and the second
+	  argument for RSS::BaseListener.install_get_text_element.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/syndication.rb: ditto.
+	* lib/rss/dublincore.rb: ditto.
+	* lib/rss/parser.rb: ditto.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/content.rb: ditto.
+
+Thu Mar 31 11:00:36 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb
+	  (RSS::BaseListener.install_setter)
+	  (RSS::BaseListener.register_uri): changed fallback way.
+
+Thu Mar 31 08:25:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (RUBYOPT): clear for the environment RubyGems installed.
 
@@ -8740,21 +66315,10 @@ Thu Mar 31 06:00:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  error even if the specified engine could not be loaded. (Dynamic
 	  engines don't have fixed name to load.)
 
-Thu Mar 31 00:18:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/ifchange.bat, win32/rm.bat: backported from HEAD.
-
-Wed Mar 30 23:44:50 2005  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* Makefile.in, */Makefile.sub, */configure.bat,
-	  cygwin/GNUmakefile.in, common.mk, configure.in, ext/extmk.rb,
-	  lib/mkmf.rb, instruby.rb, runruby.rb: backport extout.
-	  [ruby-dev:25963]
-
 Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
-	  create a Tcl/Tk's console window.
+	* ext/tk/tcltklib.c: add TclTkIp#_create_console() method to create
+	  a Tcl/Tk's console window.
 
 	* ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
 
@@ -8768,12 +66332,12 @@ Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkextlib/**: ditto.
 
-Tue Mar 29 22:11:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Mar 29 22:20:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
 	  [ruby-dev:25961]
 
-Mon Mar 28 23:40:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Mar 29 00:04:57 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
 	  extract method DRbObject.prepare_backtrace. add DRb.regist_server,
@@ -8782,15 +66346,23 @@ Mon Mar 28 23:40:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/gw.rb: ditto.
 
-Mon Mar 28 20:43:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 28 20:53:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
+	* ext/extmk.rb (extract_makefile): nothing to be removed when no file
+	  was deleted.
+
+	* ext/extmk.rb (extmake): restore srcdir.
 
 Mon Mar 28 08:39:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
 	  arguments.  (pointed out by NaHi)
 
+Sun Mar 27 00:56:58 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (remove_file): ignore Errno::E* if force option
+	  is set. [ruby-dev:25944]
+
 Sat Mar 26 22:51:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
@@ -8846,30 +66418,25 @@ Thu Mar 24 23:10:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (check_sizeof): refine logging messages.
 
-Thu Mar 24 03:57:48 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Mar 23 19:08:10 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/utils.rb (WEBrick::Utils.create_listeners):
 	  - should raise ArgumentError if no port is specified.
 	  - even if the specified port is 0, all TCPServers should be
-	  initialized with the port given to the first one.
+	    initialized with the port given to the first one.
 
 	* lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
 	  parameter is 0, it should be updated with the port number which
-	  actually listened.
-
-Wed Mar 23 00:35:10 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_settracefunc.rb (test_event): added tests for
-	  "class" and "end" and "raise".
+	  ectually listened.
 
-Tue Mar 22 22:40:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Mar 23 16:12:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* eval.c (rb_call0): check event_hooks instead of trace_func.
+	* parse.y (primary): fix lineno of rescue and ensure.
 
-Tue Mar 22 17:30:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Mar 23 00:39:05 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* eval.c (rb_add_event_hook): new function to add a hook function for
-	  interpreter events. (backported form HEAD)
+	* test/ruby/test_settracefunc.rb (test_event): added tests for
+	  "class" and "end" and "raise".
 
 Sun Mar 20 22:51:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -8896,28 +66463,42 @@ Thu Mar 17 17:42:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (inspect_struct): ditto.
 
-Wed Mar 16 23:36:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Mar 16 23:39:13 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_settracefunc.rb: added test for c-return.
+
+Wed Mar 16 22:57:43 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* eval.c (rb_call0): call_cfunc() should be protected.
 
-	* test/ruby/test_settracefunc.rb: added test for c-return.
+	* eval.c (rb_add_event_hook): use K&R style.
+
+	* eval.c (rb_remove_event_hook): ditto.
 
-Wed Mar 16 22:20:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Mar 16 22:03:15 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* object.c (str_to_id): fixed typo.
+	* eval.c (rb_add_event_hook): new function to add a hook function for
+	  interpreter events.
 
 Wed Mar 16 18:08:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_call0): reorganize "return" event post.
 
+	* eval.c (return_jump): no need to post "return" event here.
+
 Tue Mar 15 23:49:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
 	  Iconv::Failure.
 
-Tue Mar 15 16:38:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Mar 15 23:12:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (recursive_check, recursive_push): more restrictive check.
+	  fixed: [ruby-dev:25916]
+
+Tue Mar 15 16:38:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()
+	* ext/tk/tkutil/tkutil.c (ary2list): give wrong arguments to hash2kv()
 
 Mon Mar 14 19:39:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -8933,7 +66514,8 @@ Mon Mar 14 12:21:03 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Mon Mar 14 08:14:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* object.c (str_to_id): warn for NUL containing strings.
+	* object.c (str_to_id): raise ArgumentError for NUL containing
+	  strings.
 
 Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -8953,14 +66535,37 @@ Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-jp/tcolor: ditto.
 
-Sun Mar 13 10:04:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Mar 13 22:19:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (recursive_pop): raise TypeError instead of fatal error.
+	  fixed: [ruby-dev:25843]
+
+Sun Mar 13 10:09:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
 
-Thu Mar 10 19:12:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun Mar 13 02:32:54 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
-	  handler when exit from a recursive called eventloop
+	* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): should get DH
+	  parameter from the current SSL object.
+
+Sun Mar 13 02:09:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo.
+	  patch from IWATSUKI Hiroyuki. [ruby-dev:25867]
+
+	* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto.
+	  (ossl_call_tmp_dh_callback): ditto
+
+Fri Mar 11 03:24:59 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): wrong var node was set for NODE_LAMBDA.
+	  [ruby-core:04555]
+
+Thu Mar 10 19:10:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c (lib_eventloop_ensure): mis-delete a timer handler
+	  when exit from a recursive called eventloop
 
 	* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
 	  realtime operation
@@ -8981,18 +66586,48 @@ Thu Mar 10 08:10:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* re.c (make_regexp): need to free internal regexp structure when
 	  compilation fails.  [ruby-talk:133228]
 
-Wed Mar  9 20:25:58 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Mar 10 01:08:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (bv_decl): remove initialize rule from block local
+	  variable declaration.
+
+Wed Mar  9 23:55:34 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (PP::PPMethods#guard_inspect_key): support
+	  __recursive_key__.  [ruby-dev:25821]
+
+Wed Mar  9 19:42:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c: OpenSSL::SSL::SSLContexts suports callbacks:
+	  - SSLContext#client_cert_cb is a Proc. it is called when a client
+	    certificate is requested by a server and no certificate was yet
+	    set for the SSLContext. it must return an Array which includes
+	    OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
+	  - SSLContext#tmp_dh_callback is called in key exchange with DH
+	    algorithm. it must return an OpenSSL::PKey::DH object.
+
+	* ext/openssl/ossl_ssl.c:
+	  (ossl_sslctx_set_ciphers): ignore the argument if it's nil.
+	  (ossl_start_ssl, ossl_ssl_write): call rb_sys_fail if errno isn't 0.
+	  [ruby-dev:25831]
+
+	* ext/openssl/ossl_pkey.c
+	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
+	  (DupPrivPKeyPtr): new function.
+
+	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
-	  rb_sys_fail if errno isn't 0. [ruby-dev:25831]
+	* ext/openssl/ossl_pkey.h: ditto.
 
 	* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
 
-Wed Mar  9 15:46:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Mar  9 18:09:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
-	  restore @token if accept failure. suggested by Dominique Brezinski.
-	  [ruby-core:04518]
+	* parse.y (gettable_gen): warns if VCALL name is used as
+	  out-of-scope block local variable.  [EXPERIMENTAL]
+
+	* parse.y (opt_bv_decl): add explicit block local variable
+	  declaration.  raises error for name conflicts.  [EXPERIMENTAL]
 
 Wed Mar  9 13:37:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -9005,9 +66640,10 @@ Tue Mar  8 18:16:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  sample supports to use a text widget as if it is a I/O stream (such
 	  like as StringIO class).
 
-Tue Mar  8 13:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Mar  8 13:39:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
+	* ext/socket/mkconstants.rb: workaround for some of 4.4BSD-Lite
+	  derived OSs.
 
 Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -9015,161 +66651,277 @@ Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
 	  [ruby-doc:824]
 
-Tue Mar  8 01:27:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Mar  8 10:48:53 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (rb_exec_recursive): declaration should precede statements
+	  before C99.
+
+Tue Mar  8 10:05:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (errno_missing): Errno.const_missing to allow references
+	  to SyscallError exceptions not defined on the platform.
+	  [ruby-core:04522]
+
+	* error.c (Init_syserr): Errno::NOERROR(0) for fallback exception.
+
+Tue Mar  8 01:19:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
 	  fixed: [ruby-dev:25828]
 
-Mon Mar  7 21:35:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Mar  7 21:29:40 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
+	  restore @token if accept failure. suggested by Dominique Brezinski.
+	  [ruby-core:04518]
 
 	* sample/webrick/httpsd.rb: fix typo in comment. suggested by
 	  Kazuhiko Shiozaki.
 
+Mon Mar  7 21:01:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_require_safe): get actual path string under safe level
+	  when requested.  fixed: [ruby-dev:25815]
+
+Mon Mar  7 16:46:02 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
+	  ossl_ssl_write): need to set errno on Win32 platform.
+
 Mon Mar  7 14:55:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (block_pass): should not push unique number if a block is
 	  not an orphan.  [ruby-dev:25808]
 
-Wed Feb 16 02:55:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Mar  7 14:13:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
-	  ossl_ssl_write):
-	  - need to set errno on Win32 platform.
-	  - should call rb_sys_fail instead of rasing SSLError if
-	    SSL_ERROR_SYSCALL occured.
-	  - should wait for that the underlying IO become readable or
-	    writable if the error was SSL_ERROR_WANT_READ or
-	    SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
+	  should set @eof and @rbuffer.
+
+Mon Mar  7 10:28:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (inspect_obj): unintended space removal.
+	  [ruby-dev:25810]
+
+	* eval.c (rb_exec_recursive): should not use NODE in disclosed
+	  context.  [ruby-dev:25812]
+
+	* io.c (rb_f_open): need not to check if to_open value is a
+	  T_FILE.  [ruby-dev:25812]
+
+Mon Mar  7 01:21:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil/tkutil.c: follow the change of st.c (committed
+	  at Fri, 4 Mar 2005 15:47:47 +0900 by matz)
+
+Mon Mar  7 00:01:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
+
+Sun Mar  6 13:04:10 2005  Dee Zsombor  <zsombor@ruby-lang.org>
+
+	* misc/ruby-electric.el: added.
+	* misc/Readme: updated.
+
+Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
+
+	* lib/pp.rb: rdoced.  [ruby-core:4490]
+
+Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
+	  may return nil.  [ruby-talk:129826]
+	  reported by Daniel Berger.
+
+Sun Mar  6 06:34:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl): should wait for that
+	  the underlying IO become readable or writable if the error was
+	  SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): ditto.
 
 	* ext/openssl/lib/openssl/buffering.rb
-	  (Buffering#initialize): should set @eof and @rbuffer.
-	  (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
 	  (Buffering#consume_rbuf): pointless eof flag resetting is deleted.
 	  (Buffering#read): should return an empty string if the specified
 	  size is zero.
 	  (Buffering#readpartial): new method.
 	  (Buffering#readline): fix typo.
 	  (Buffering#getc): return the first character of string correctly.
-	  (Buffering#each): fix typo.  suggested by Brian Ollenberger.
 	  (Buffering#readchar): fix typo.
 	  (Buffering#eof?): should read again it the input buffer is empty.
 	  (Buffering#do_write): should rescue Errno::EAGAIN.
 	  (Buffering#puts): use "\n" as the output field separator.
 
-	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
-	  underlying IO.
-
 	* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
 
 	* text/openssl/test_pair.rb: test for IO like methods.
 
 	* test/ruby/ut_eof.rb: test about empty file.
 
-Mon Mar  7 10:22:06 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Mar  5 17:48:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/un.rb: should use OptionParser. (backported form HEAD)
+	* dir.c (rb_glob): fixed mismatch of argument.
 
-Mon Mar  7 09:18:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dir.c (fnmatch): removed unnecessary code. (by string.c 1.219)
 
-	* string.c (rb_str_cmp_m): should not return false but nil.
-	  fixed: [ruby-dev:25811]
+	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.117)
 
-Mon Mar  7 01:22:14 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Mar  5 16:50:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/tkutil.c: remove the some codes which depend on the
-	  difference between Ruby1.8 and 1.9, because st.c on Ruby1.9
-	  was changed.
+	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
 
-Mon Mar  7 00:01:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
+	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
 
-Sun Mar  6 16:41:33 2005  Minero Aoki  <aamine@loveruby.net>
+	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
 
-	* lib/net/http.rb: HTTPHeader holds its header fields as an array
-	  (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
+Sat Mar  5 12:52:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/net/http/test_httpheader.rb: new file.
+	* lib/mkmf.rb (create_makefile): allow putting spaces between target
+	  and colon in depend file.
 
-Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
+Sat Mar  5 02:41:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/pp.rb: rdoced.  [ruby-core:4490]
+	* file.c (eaccess): workaround for VC++8 runtime.
 
-Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
+	* win32/win32.c (ioinfo): VC++8 support.
 
-	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
-	  may return nil.  [ruby-talk:129826]
-	  reported by Daniel Berger.
+Fri Mar  4 19:39:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Mar  5 18:06:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
+	  also locally defined modules.
 
-	* dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
-	  String#clear, so [ruby-dev:24749] didn't affect it)
+	* ext/iconv/iconv.c: rdocified.
 
-	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
+	* ext/strscan/strscan.c: moved misplaced rdoc.
 
-Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Mar  4 16:11:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
+	* eval.c (rb_exec_recursive): matched the declaration to prototype.
 
-	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
+	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
+	  window_color_set().
 
-Fri Mar  4 19:39:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/tcltklib.c: fixed commit mistakes.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
-	  also locally defined modules.
+Fri Mar  4 12:45:17 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
 
-	* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
+	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
+	  [ruby-core:4296]
 
-	* ext/strscan/strscan.c: moved misplaced rdoc.
+	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
+	  in the "simple" parser. [ruby-core:4301]
+
+Fri Mar  4 12:45:17 2005  Charles Mills  <cmills@freeshell.org>
 
-Fri Mar  4 15:58:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rdoc/parsers/parse_c.rb: adds support for constants
+	  (rb_define_const), accessors (rb_define_attr), and makes a
+	  couple fixes. [ruby-core:4307]
+
+Fri Mar  4 12:45:17 2005  Florian Gross  <florgro@gmail.com>
+
+	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
+	  [ruby-core:4302]
 
-	* lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
-	  getopts.rb, parsearg.rb, importenv.rb as well.
+Fri Mar  4 12:45:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Mar  4 11:17:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
+	  rb_exec_recursive() in eval.c.
 
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
-	  warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
+	* eval.c (rb_exec_recursive): new function.
 
-	* ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
+	* array.c (rb_ary_join): use rb_exec_recursive().
+
+	* array.c (rb_ary_inspect, rb_ary_hash): ditto.
+
+	* file.c (rb_file_join): ditto.
+
+	* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
+
+	* io.c (rb_io_puts): ditto.
+
+	* object.c (rb_obj_inspect): ditto
+
+	* struct.c (rb_struct_inspect): ditto.
 
 Fri Mar  4 10:15:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/set.rb (SortedSet::setup): a hack to shut up warning.
 	  [ruby-talk:132866]
 
+Fri Mar  4 09:37:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (install-nodoc, pre-install-doc, post-install-doc):
+	  fix some omissions.
+
+Fri Mar  4 08:09:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/time.rb (Time::strptime): add new function.  inspired by
+	  [ruby-talk:132815].
+
+	* lib/parsedate.rb (ParseDate::strptime): ditto.
+
 Fri Mar  4 07:07:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
 
-Thu Mar  3 23:49:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar  3 23:24:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
 
+Thu Mar  3 18:47:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub (config.h): check if affected
+	  when makefiles are modified.
+
+	* {bcc32,win32,wince}/Makefile.sub (config.status): add variables
+	  for tests.
+
+	* win32/ifchange.bat: try to update a file only if modified.
+
+	* win32/resource.rb: more descriptions.
+
+	* common.mk: add {pre,post}-install targets.
+
+	* instruby.rb (install?): install particular part.
+
+	* bcc32/Makefile.sub (post-install-ext): remove debug information
+	  files after installation.
+
+	* ext/tk/tcltklib.c (ip_rbUpdateCommand, ip_rb_threadUpdateCommand):
+	  get rid of warnings with Tcl/Tk 8.3 or former.
+
 Thu Mar  3 11:49:51 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin/rss-recent.rb: added site information.
 
-Wed Mar  2 19:53:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar  2 19:53:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/extmk.rb (parse_args): add DESTDIR only when not directed
-	  already.  fixed: [ruby-dev:25781]
+	* ext/extmk.rb (parse_args): return false if nothing matched.
 
-Wed Mar  2 17:14:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Mar  2 17:15:08 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
+	* ext/tk/tcltklib.c (lib_eventloop_core): fix typo
 
-Wed Mar  2 16:00:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Mar  2 16:59:50 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling
-	  to avoid SEGV trouble.
-	  [KNOWN BUG] When supports pthread and running multiple Tk
-	  interpreters, an interrupt signal causes SEGV frequently. That
-	  may be a trouble of Ruby's signal handler.
+	* eval.c (ruby_native_thread_kill): call pthread_kill() to send a
+	  signal to ruby's native thread
 
-	* ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
+	* ruby.h: add definition of ruby_native_thread_kill()
+
+	* signal.c (sigsend_to_ruby_thread): send the signal to ruby's
+	  native thread ([ruby-dev:25744], [ruby-dev:25754]), and set
+	  signal mask to the current native thread
+
+Wed Mar  2 16:03:08 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: enforce thread-check and exception-handling to
+	  avoid SEGV trouble.
+
+	* ext/tk/tkutil/tkutil.c: fix a bug on converting a SJIS string array
 	  to a Tcl's list string.
 
 	* ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
@@ -9211,17 +66963,58 @@ Wed Mar  2 16:00:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-*/widget: add entries of animation demos.
 
-Tue Mar  1 00:47:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Mar  2 12:21:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): [EXPERIMENTAL] NODE_LAMBDA implemented.
+	  [ruby-dev:25780]
+
+	* node.h (NODE_LAMBDA): for literal Proc object.
+
+	* parse.y (expr): interpret mere do...end block as proc object.
 
-	* test/rinda/test_rinda.rb: backport from CVS_HEAD. use
-	  MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
+	* parse.y (primary): ditto, for brace block.
 
-Tue Mar  1 00:34:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Mar  1 21:16:54 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* regcomp.c (optimize_node_left): uninitialized member
+	  (OptEnv.backrefed_status) was used. [ruby-dev:25778]
+
+Tue Mar  1 16:50:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regparse.c: move st_*_strend() functions from st.c.  fixed some
+	  potential memory leaks.
+
+Tue Mar  1 00:40:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
 
 	* test/rinda/test_rinda.rb: ditto.
 
+Mon Feb 28 23:10:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/socket/socket.c (Init_socket): IPv6 is not supported although
+	  AF_INET6 is defined on bcc32. (rev1.108 again)
+
+	* ext/socket/mkconstants.rb: ditto.
+
+Mon Feb 28 21:55:49 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* ext/strscan/strscan.c (strscan_s_allocate):
+	  use onig_region_init().
+
+	* ext/strscan/strscan.c (adjust_registers_to_matched):
+	  use onig_region_set().
+
+Mon Feb 28 15:12:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/socket/socket.c (Init_socket): ported more Socket::Constants
+	  from ruby_1_8, and made it easy to add new constants.
+	  [ruby-dev:25771]
+
+	* ext/socket/depend: ditto.
+
+	* ext/socket/mkconstants.rb: ditto. (added)
+
 Mon Feb 28 11:42:23 2005  Ian Macdonald  <ian@caliban.org>
 
 	* exception error messages updated.  [ruby-core:04497]
@@ -9232,6 +67025,27 @@ Mon Feb 28 09:03:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  constants.  Patch from Sam Roberts <sroberts@uniserve.com>.
 	  [ruby-core:04409]
 
+Sun Feb 27 05:55:38 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: fix typo. [ruby-core:04494]
+
+Sat Feb 26 16:58:20 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* parse.y, re.c, regex.h, LEGAL, ext/strscan/strscan.c:
+	  remove oniggnu.h (GNU regex API).
+
+Wed Feb 23 22:08:16 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* st.c, st.h: imported additional file changes on
+	  Oniguruma 3.7.0.
+
+Wed Feb 23 21:45:29 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c,
+	  regenc.c, regenc.h, regerror.c, regexec.c, regint.h,
+	  regparse.c, regparse.h, sjis.c, utf8.c: imported Oni Guruma
+	  3.7.0.
+
 Wed Feb 23 15:04:32 2005  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
@@ -9244,27 +67058,53 @@ Wed Feb 23 08:00:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_unshift_m): ditto.
 
-Wed Feb 23 01:57:46 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Feb 23 01:53:29 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (initialize): handle certs correctly. Thanks,
-	  NABEYA Kenichi. (backported from CVS HEAD)
+	  NABEYA Kenichi.
 
-Tue Feb 22 07:25:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb 23 00:37:34 2005  Kouhei Sutou  <kou@cozmixng.org>
 
-	* parse.y (parser_yylex): identfier after dot must not be a variable.
+	* lib/mkmf.rb (mkmf_failed): fixed typo.
 
-Mon Feb 21 10:04:49 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Feb 22 23:52:45 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
+	* configure.in, lib/mkmf.rb: use simple commands if available.
 
-	* win32/win32.[ch] (fcntl): ditto.
+	* mkconfig.rb: remove autoconf internal variables from rbconfig.rb.
 
-	* win32/win32.c (rb_w32_connect): support nonblocking mode.
+	* lib/mkmf.rb (create_makefile): substitute implicit rules in depend
+	  file.
 
-	* ext/socket/socket.c (wait_connectable, ruby_connect): support
-	  nonblocking connect on various platforms.
-	  all changes are backported from CVS HEAD. [ruby-core:3154],
-	  [ruby-core:4364].
+	* {bcc32,win32,wince}/Makefile.sub (COMPILE_RULES, RULE_SUBST):
+	  include $(topdir) and $(hdrdir) to search path.
+
+Tue Feb 22 23:51:45 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
+
+Tue Feb 22 23:50:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (ruby_signal, ruby_nativethread_signal): must be valid as
+	  expressions, not only statements.
+
+Tue Feb 22 12:54:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): update curr_thread before raising
+	  TAG_THREAD.  [ruby-dev:25712]
+
+Tue Feb 22 07:24:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): identifier after dot must not be a variable.
+
+Mon Feb 21 18:31:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* signal.c: Standard signal handlers ignore signals on non-Ruby native
+	  threads. When a handler is entried with ruby_signal() (like as the
+	  standard signal handlers), the handler for the signal is marked as
+	  it cannot accept non-Ruby native threads. If a handler can treat all
+	  signals on all native threads, please use ruby_nativethread_signal()
+	  to entry it.
 
 Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -9272,7 +67112,7 @@ Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
 	  re-implemented according to RFC 1738.
 	  reported by Guillaume Marcais.  [ruby-talk:131650]
 
-Sat Feb 19 18:11:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 19 18:46:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
 	  [ruby-dev:25722]
@@ -9284,7 +67124,16 @@ Sat Feb 19 13:52:02 2005  Tanaka Akira  <akr@m17n.org>
 	* lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
 	  after connection is made.
 
-Sat Feb 19 01:32:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Feb 19 13:31:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extract_makefile): remove no longer existing installed
+	  files.
+
+	* lib/mkmf.rb (install_dirs): return installation directory list.
+
+	* lib/mkmf.rb (create_makefile): reverted wrongly removed lines.
+
+Sat Feb 19 01:28:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
 	  [ruby-dev:25685]
@@ -9301,16 +67150,42 @@ Fri Feb 18 17:14:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
 	  of StandardError class, not Exception class.  [ruby-core:04429]
 
-Thu Feb 17 20:11:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Feb 18 04:06:41 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (fcall_gen): lvar(arg) will be evaluated as
+	  lvar.call(arg) when lvar is a defined local variable. [new]
+
+Thu Feb 17 22:15:34 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* ext/strscan/strscan.c: calls Oniguruma API directly.
+
+Thu Feb 17 21:53:12 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* common.mk, LEGAL: remove reggnu.c.
+
+Thu Feb 17 21:53:12 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* gc.c, re.c: now ruby calls Oniguruma API directly, bypassing
+	  GNU compatible APIs.
+
+Thu Feb 17 20:09:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
 
-Thu Feb 17 20:11:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb 17 20:09:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/digest/test_digest.rb: separate test case for each algorithms.
 	  [ruby-dev:25412]
 
-Thu Feb 17 11:54:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Thu Feb 17 14:31:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_class_initialize): call inherited method before
+	  calling initializing block.
+
+	* eval.c (rb_thread_start_1): initialize newly pushed frame.
+	  fixed: [ruby-dev:25707]
+
+Thu Feb 17 13:46:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 	* lib/test/unit/collector.rb (collect_file): now deletes paths added
 	  to $LOAD_PATH instead of restoring it verbatim.
@@ -9328,38 +67203,43 @@ Thu Feb 17 04:21:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
 	  fixed: [ruby-core:04444]
 
-Thu Feb 17 00:09:45 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Feb 17 00:31:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
-	  [ruby-dev:25238]
+	* test/drb/test_drb.rb, ut_safe1.rb: port from 1.8
 
-	* test/drb/test_drb.rb: add method DRbService.ext_service, move
-	  TestDRbReusePort to new file [ruby-dev:25238]
+Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/drb/test_drb.rb: ditto.
+	* eval.c (is_defined): NODE_IASGN is an assignment.
 
-	* test/drb/test_drbssl.rb: ditto.
+Wed Feb 16 23:54:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/drb/test_drbunix.rb: ditto.
+	* eval.c (rb_thread_start_1): outer block variables wasn't linked to
+	  threads.  fixed: [ruby-dev:25700]
 
-	* test/drb/ut_drb.rb: reduce sleep.
+Wed Feb 16 15:11:43 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::Nonblock#initialize):
+	  native win32 platform doesn't have F_GETFL.
 
-	* eval.c (is_defined): NODE_IASGN is an assignment.
+Wed Feb 16 02:47:45 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Wed Feb 16 23:34:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): should
+	  call rb_sys_fail instead of raising SSLError if SSL_ERROR_SYSCALL
+	  occurred.
 
-	* lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#fill_rbuff):
+	  should rescue Errno::EAGAIN.
 
-	* lib/drb/extserv.rb: ditto.
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#each): fix typo.
+	  suggested by Brian Ollenberger.
+
+	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
+	  underlying IO.
 
-Wed Feb 16 17:07:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Feb 15 22:14:34 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
 
-	* ext/tk/tkutil.c: Follow the change of st.c (st_foreach)
-	  [ruby-list:40623].
-	  Sometimes mis-convert from a Ruby's Array of SJIS Strings, which
-	  includes some kind of SJIS characters, to a Tcl's UTF8 list string.
+	* ext/readline/readline.c (Readline.readline): use rl_outstream
+	  and rl_instream.  [ruby-dev:25699]
 
 Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -9369,13 +67249,14 @@ Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
 Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/ssl.rb
-	 (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
+	  (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
 
-Mon Feb 14 00:40:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Feb 14 00:10:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
+	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
+	  config[:safe_level] ([druby-ja:120])
 
-	* test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
+	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
 
 Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -9388,22 +67269,43 @@ Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rss/: added tests for the convenient methods.
 
-Sun Feb 13 22:43:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
-	  config[:safe_level] ([druby-ja:120])
+Sun Feb 13 23:12:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
+	* eval.c (rb_thread_start_0): restore prot_tag before rewinding.
 
 Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
 	  to the value of status header field. ([ruby-dev:40617])
 
-Sun Feb 13 00:52:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Feb 13 11:38:40 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regparse.c (type_cclass_hash): (Thanks Nobu) fixed
+	  overrun. ([ruby-dev:25676]).
+
+Sun Feb 13 10:53:08 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* oniggnu.h, oniguruma.h, regcomp.c, st.c: imported
+	  Oni Guruma 3.6.0.
+
+Sun Feb 13 01:33:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/erb.rb (ERB::Util.h, u): make it module_function.
 
+Sat Feb 12 22:17:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (TAG_THREAD): to start a new thread.
+
+	* eval.c (ruby_init, ruby_options, ruby_cleanup, rb_protect,
+	  rb_load_protect, rb_thread_start_0): make thread anchor.
+
+	* eval.c (proc_alloc): clone proc object if klass is not Proc or
+	  created in different thread.
+
+	* eval.c (rb_block_pass): call a function with a block.  [new]
+
+	* eval.c (rb_f_throw): raise NameError in main thread.
+
 Sat Feb 12 17:29:19 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
@@ -9413,6 +67315,10 @@ Sat Feb 12 15:07:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* random.c (rand_init): suppress warning.
 
+Sat Feb 12 14:10:24 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI.open_http): reject userinfo explicitly.
+
 Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb: support https if the platform provides CA
@@ -9420,10 +67326,10 @@ Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
 
 Sat Feb 12 06:18:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
-	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
+	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
 	  [ruby-dev:25675]
 
-Fri Feb 11 17:40:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Feb 11 17:37:50 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
 	  new method OpenSSL::X509::Store#set_default_paths.
@@ -9445,68 +67351,108 @@ Fri Feb 11 04:54:13 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
 
 	* lib/rdoc/generators/ri_generator.rb: ditto.
 
-Thu Feb 10 11:14:17 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Feb 10 13:52:42 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
+	* configure.in, win32/Makefile.sub (LIBS, COMMON_HEADERS): use
+	  winsock2 on mswin32/mingw.
 
-	* ext/socket/extconf.rb (sockaddr_storage): remove workaround for
-	  mswin32.
+	* ext/socket/extconf.rb: ditto.
 
-Thu Feb 10 10:29:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/win32.c (StartSockets): ditto.
 
-	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
-	  window_color_set().
+	* win32/win32.h: ditto.
+
+Thu Feb 10 12:09:16 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extract_makefile): default to true if not compiled
+	  previously.
+
+	* ext/extmk.rb (extmake): create dummy makefile if extconf failed.
+
+Thu Feb 10 12:07:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_stdhandle): assign standard file handles.
+
+	* bcc32/Makefile.sub (COMMON_LIBS): add libraries included in
+	  import32.lib.
+
+	* lib/mkmf.rb (create_makefile): restrict prefixing with srcdir to
+	  rule lines, add search path to implicit rules, and set Borland make
+	  special macros for search path.
+
+	* win32/win32.c, win32/win32.h (read): avoid a BCC runtime bug.
 
 Thu Feb 10 00:47:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (make_struct): fixed: [ruby-core:04402]
 
+Wed Feb  9 16:33:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (wait_connectable): fixed wrong condition.
+
+Wed Feb  9 14:42:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
+	* eval.c (scope_dup): add volatile not to optimize tbl.
+
+Wed Feb  9 10:02:02 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/tk/make-tkutil, ext/tk/tkutil/subconf.rb: no longer used.
+
+	* ext/tk/tkutil/extconf.rb: need to compile tkutil. [ruby-dev:25607]
+
 Wed Feb  9 08:07:08 2005  Paul Duncan  <pabs@pablotron.org>
 
 	* ext/curses/curses.c (window_color_set): [ruby-core:04393]
 
-Tue Feb  8 23:51:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Feb  8 23:48:36 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
 	  [druby-ja:117]
 
+Tue Feb  8 22:38:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* keywords, parse.y: separate EXPR_VALUE from EXPR_BEG.
+	  fixed: [ruby-core:04310], [ruby-core:04368]
+
 Tue Feb  8 13:06:12 2005  Sam Roberts  <sroberts@uniserve.com>
 
 	* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
 	  [ruby-talk:130092]
 
-Tue Feb  8 09:30:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
-
 Tue Feb  8 00:19:02 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
 	  (Resolv::DNS::Name#inspect): ditto.
 	  Suggested by Sam Roberts.  [ruby-talk:129086]
 
+Mon Feb  7 23:14:11 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (io_getc): flush rb_stdout before read from stdin, which is
+	  connected to a tty.  [ruby-core:4378]
+
+	* rubyio.h (FMODE_TTY): renamed from FMODE_LINEBUF.
+
 Mon Feb  7 10:06:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c: [ruby-doc:818]
 
-Mon Feb  7 01:56:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
-	  rbconfig.rb. (backported from CVS HEAD)
+Mon Feb  7 02:13:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
 	  definition of struct sockaddr_storage, but socket.c doesn't
 	  include it because this version of ruby still has binary level
 	  compatibility with winsock1.
 
-	* lib/mkmf.rb (create_makefile): should support header files in
-	  depend file.
+Mon Feb  7 01:22:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb  7 01:21:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/extmk.rb (extract_makefile): extract previously collected
+	  informations from existing Makefile.
 
 	* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
 	  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]
 
+	* ext/tk/extconf.rb: separate tkutil configuration.
+
 	* lib/mkmf.rb ($extmk): check if under ext directory.
 
 	* lib/mkmf.rb (Logging.postpone): allow recursive operation.
@@ -9523,31 +67469,25 @@ Mon Feb  7 01:21:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (dir_config): accept arrays of directory names as
 	  default values.
 
-	* mkconfig.rb: no longer embed srcdir and compile_dir into
-	  rbconfig.rb.
-
-	* lib/mkmf.rb (create_makefile): fix unbalanced parens.
+	* lib/mkmf.rb (with_cppflags, with_cflags, with_ldflags): keep flags
+	  modified if the block returned true.
 
-Sun Feb  6 19:23:01 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Feb  6 19:20:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* eval.c (stack_extend): add prototype because VC++8 doesn't
 	  accept __declspec(noinline) with K&R style function definitions.
-	  (backported from CVS HEAD)
 
-Sun Feb  6 14:14:26 2005  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Feb  6 13:56:19 2005  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb (new_with_hash): changed messages of exception.
 
 	* lib/date/format.rb (str[fp]time): undocumented conversion
 	  specifications %[1-3] are now deprecated.
 
-Sun Feb  6 12:20:11 2005  Akinori MUSHA  <knu@iDaemons.org>
+Sun Feb  6 11:27:37 2005  Tanaka Akira  <akr@m17n.org>
 
-	* bignum.c (rb_big2ulong_pack): One too many arguments are passed
-	  to big2ulong().
-
-	* re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
-	  arguments are passed to rb_reg_initialize().
+	* ext/dl/dl.c (Init_dl): function declaration should precede
+	  statements before C99.
 
 Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -9559,7 +67499,28 @@ Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
 	  (Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
 	  based on [ruby-talk:129732] by Sam Roberts.
 
-Fri Feb  4 00:30:45 2005  Kouhei Sutou  <kou@cozmixng.org>
+Sat Feb  5 02:24:06 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ripper/test_scanner_events.rb: fix test.
+
+Fri Feb  4 18:44:35 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/lib/ripper/lexer.rb: last Lexer fix was incomplete;
+	  test all green.
+
+Fri Feb  4 15:57:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (open_args): fix too verbose warnings for the space
+	  before argument parentheses.  [ruby-dev:25492]
+
+	* parse.y (parser_yylex): ditto.
+
+Fri Feb  4 14:33:25 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/lib/ripper/filter.rb: ripper/tokenizer ->
+	  ripper/lexer. [ruby-dev:25632]
+
+Fri Feb  4 00:24:15 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss: supported Image module.
 	  http://web.resource.org/rss/1.0/modules/image/
@@ -9572,6 +67533,19 @@ Thu Feb  3 23:42:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
 	  extended portion.  [ruby-dev:25626]
 
+Thu Feb  3 16:12:57 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_yylex): the first expression in the parentheses
+	  should not be a command.  [ruby-dev:25492]
+
+Thu Feb  3 03:31:20 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: follow original v 1.57
+
+	* ext/nkf/nkf-utf8/utf8tbl.c: follow original v 1.8
+
+	* ext/nkf/nkf-utf8/config.h: follow original v 1.7
+
 Wed Feb  2 23:52:53 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
 
 	* ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
@@ -9591,18 +67565,49 @@ Wed Feb  2 21:56:01 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/trackback.rb: ditto.
 
-Tue Feb  1 22:48:48 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Feb  2 03:30:58 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/lib/ripper/tokenizer.rb -> lexer.rb.
+
+	* ext/ripper/lib/ripper/lexer.rb: new method Ripper.slice.
+	  [experimental]
+
+	* ext/ripper/lib/ripper/sexp.rb: new file. [experimental]
+
+	* ext/ripper/lib/ripper.rb: require ripper/lexer and ripper/sexp.
+
+Tue Feb  1 21:49:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
 	  _dump.
 
 Tue Feb  1 00:20:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* Makefile.in, configure.in: made EXTOUT configurable.
+
+	* ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style.
+
+	* lib/mkmf.rb: make extensions in depth order.  [ruby-dev:25522]
+
 	* configure.in (aix): fix linker flags on AIX.  [ruby-talk:125460]
 
-Mon Jan 31 13:33:21 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Jan 31 13:16:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: add invalid namespace check
+	* ext/tk/extconf.rb: add tkutil configuration step (remove old schema)
+
+	* ext/tk/depend: remove the information of tkutil
+
+	* ext/tk/make-tkutil: sub-part of Makefile to compile tkutil
+
+	* ext/tk/tkutil/tkutil.c: move tkutil.c to subdirectory
+
+	* ext/tk/tkutil/subconf.rb: configuration file for tkutil.c
+
+	* ext/tk/tkutil/depend: ditto
+
+Mon Jan 31 13:13:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: add invalid namespace check
 
 	* ext/tk/lib/multi-tk.rb: add invalid_namespace? method
 
@@ -9612,11 +67617,22 @@ Mon Jan 31 10:29:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
 
+Mon Jan 31 09:44:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): remove Object#type.  [ruby-core:04335]
+
 Sat Jan 29 09:42:12 2005  Sam Roberts  <sroberts@uniserve.com>
 
 	* lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
 	  resource record for specifying location of services.
 
+Sat Jan 29 00:10:33 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* ascii.c, euc_jp.c, hash.c, oniggnu.h, oniguruma.h, regcomp.c,
+	  regenc.c, regenc.h, regerror.c, regexec.c, reggnu.c, regint.h,
+	  regparse.c, regparse.h, sjis.c, st.c, st.h, utf8.c: imported
+	  Oni Guruma 3.5.4.
+
 Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
@@ -9626,33 +67642,60 @@ Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
 	  (Resolv::DNS::Config#lazy_initialize): ditto.
 	  Suggested by Sam Roberts.
 
+Thu Jan 27 17:15:03 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/tk/extconf.rb: support new tk scheme on bccwin32.
+	  fixed: [ruby-dev:25546]
+
 Thu Jan 27 13:18:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* st.c (st_foreach): report success/failure by return value.
 	  [ruby-Bugs-1396]
 
-Thu Jan 27 00:15:29 2005  Minero Aoki  <aamine@loveruby.net>
+Thu Jan 27 00:12:19 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* test/fileutils/test_fileutils.rb (setup): support BSD-style
-	  directory group inheritance. (backport from HEAD, rev 1.32)
+	* test/fileutils/test_fileutils.rb (setup): support BSD style
+	  directory group inheritance (again).
+
+Thu Jan 27 00:02:40 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb (setup): support BSD style
+	  directory group inheritance. [ruby-dev:25440]
 
 	* test/fileutils/fileasserts.rb (assert_same_entry): show entry
-	  difference. (backport from HEAD, rev 1.4)
+	  difference.
+
+Wed Jan 26 17:12:50 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: forgot to initialize parser struct.  [ruby-dev:25492]
+
+	* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
+	  [ruby-talk:127711]
+
+Wed Jan 26 14:12:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/Setup*: remove tcltklib.
 
-Wed Jan 26 23:09:11 2005  Minero Aoki  <aamine@loveruby.net>
+Wed Jan 26 12:45:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
-	  prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
+	* ext/tk/extconf.rb: support new tk scheme on mswin32.
+	 fixed: [ruby-dev:25535]
 
-Wed Jan 26 10:51:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jan 26 10:45:19 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (flock_winnt, flock_win95): unlock file even if
-	  LOCK_NB is specified. (backported from CVS HEAD)
+	  LOCK_NB is specified.
 
-Tue Jan 25 17:11:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 25 23:10:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ruby.c (proc_options): correct -T option in RUBYOPT. (backported
-	  from CVS HEAD)
+	* ext/tk: merge tcltklib for Ruby/Tk installation control
+
+	* ext/tcltklib: remove
+
+Tue Jan 25 17:05:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (proc_options): correct -T option in RUBYOPT.
+	  fixed: [ruby-dev:25512]
 
 Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -9691,31 +67734,17 @@ Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
 	  [ruby-dev:25479]
 
-Mon Jan 24 15:44:25 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+Mon Jan 24 16:00:53 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
-	  [ruby-core:4296]
-
-	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
-	  in the "simple" parser. [ruby-core:4301]
-
-Mon Jan 24 15:44:25 2005  Charles Mills  <cmills@freeshell.org>
-
-	* lib/rdoc/parsers/parse_c.rb: adds support for constants
-	  (rb_define_const), accessors (rb_define_attr), and makes a
-	  couple fixes. [ruby-core:4307]
-
-Mon Jan 24 15:44:25 2005  Florian Gro  <florgro@gmail.com>
-
-	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
-	  [ruby-core:4302]
+	* ext/nkf/lib/kconv.rb (guess_old): not use NKF.guess_old
+	  but NKF.guess1. fixed: [ruby-dev:25491]
 
 Mon Jan 24 15:44:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* document updates - [ruby-core:04296], [ruby-core:04301],
 	  [ruby-core:04302], [ruby-core:04307]
 
-Sun Jan 23 12:41:16 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Jan 23 12:38:01 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
 	  capitalized name (such as KeywordSearchRequest in AWS) is defined as
@@ -9731,65 +67760,62 @@ Sun Jan 23 05:24:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
 	  GetOCSPReq at first.
 
-Sat Jan 22 23:09:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Jan 22 22:59:08 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
 
-Sat Jan 22 22:35:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Jan 22 22:27:28 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
 
-Fri Jan 21 23:58:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
-	  [ruby-talk:127511]
-
 Fri Jan 21 20:07:02 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
 	  reported by Sam Roberts.  [ruby-talk:127133]
 
+Fri Jan 21 17:09:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (decode_utf7): use pack("U*") to encode UTF-8.
+
+	* lib/net/imap.rb (encode_utf7): use unpack("U*") to decode UTF-8.
+
+	* test/net/imap/test_imap.rb: added tests for Net::IMAP.
+
 Fri Jan 21 16:58:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (rb_push_glob): should work for NUL delimited patterns.
 
+	* dir.c (rb_glob2): should aware of offset in the pattern.
+
 Fri Jan 21 13:58:37 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
-	  (backported from CVS HEAD)
 
-Fri Jan 21 09:30:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubyio.h (rb_eof_error): should mark as NORETURN. (backported
-	  from CVS HEAD)
-
-Fri Jan 21 00:31:36 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jan 21 00:37:09 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
 	  "local variable 'size' used without having been initialized".
 
-Thu Jan 20 19:03:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
-
-	* win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
-	  $EXTOBJS.
-	  fixed: [ruby-core:04290] (backported from CVS HEAD)
-
 Thu Jan 20 11:42:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_new4): should propagate taintedness.
 
+	* env.h: rename member names in struct FRAME; last_func -> callee,
+	  orig_func -> this_func, last_class -> this_class.
+
 	* struct.c (rb_struct_set): use original method name, not callee
 	  name, to retrieve member slot.  [ruby-core:04268]
 
 	* time.c (time_strftime): protect from format modification from GC
 	  finalizers.
 
-Wed Jan 19 18:06:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jan 20 02:01:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): remove rb_obj_id_obsolete()
+
+Wed Jan 19 18:02:19 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
-	  (backported from CVS HEAD)
 
 Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -9797,32 +67823,6 @@ Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
 	  domain and search directive without an argument.
 	  reported by Sam Roberts.  [ruby-talk:126781]
 
-Tue Jan 18 15:03:05 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
-	  of :SSLEnable is false.
-
-	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
-	  don't allow changing its mode.
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
-	  should delete trailing LF from the result of pack("m*").
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
-	  - should delete trailing LF from the result of pack("m*").
-	  - clear Request-Line not to send the response by HTTPServer#run.
-
-	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
-	  refine regexp (and change the name of a local variable).
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
-	  new method to escape URI path component.
-
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
-	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
-
-	* test/webrick/*, sample/webrick/httpproxy.rb: add new file.
-
 Mon Jan 17 23:33:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (aix): fix typo.  [ruby-talk:126401]
@@ -9851,48 +67851,63 @@ Sat Jan 15 14:57:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ruby.c (proc_options): ignore trailing CRs at the end of short
 	  options as well as long options.  fixed: [ruby-core:04232]
 
-Sat Jan 15 13:35:16 2005  Kouhei Sutou  <kou@cozmixng.org>
+Sat Jan 15 13:44:22 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
 
 	* lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
 
-Thu Jan 13 04:48:53 2005  Tanaka Akira  <akr@m17n.org>
+Wed Jan 12 12:29:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_fread): don't warn nonblocking behavior by default.
+	* eval.c (rb_mod_define_method): incomplete subclass check.
+	  [ruby-dev:25464]
 
-Wed Jan 12 00:36:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c (rb_make_metaclass): class of metaclasses should be
+	  plain Class.  [ruby-list:40524]
 
-	* object.c (rb_class_superclass): superclass of singleton class also
-	  should be a singleton class.  fixed: [ruby-list:40519]
+Tue Jan 11 20:58:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jan 11 09:44:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* io.c (remain_size): use buffered data instead of unreading to avoid
+	  inconsistency of text mode.  fixed: [ruby-dev:25446]
+
+Tue Jan 11 09:37:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* numeric.c (Init_Numeric): turn off floating point exceptions
 	  on bcc32. "1e300".to_f had crashed by overflow.
 
-Tue Jan 11 03:10:10 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Jan 10 15:28:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* lib/fileutils.rb (copy_entry): could not copy symbolic link.
-	  [ruby-talk:125733]
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
+	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
 
-	* lib/fileutils.rb (copy_stream): use read/write instead of
-	  sysread/syswrite.
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
+	  new method to escape URI path component.
+
+	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
+	  of :SSLEnable is false.
 
-Mon Jan 10 23:08:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/webrick/{test_cgi.rb,webrick.cgi}: new file.
 
-	* variable.c (rb_autoload): hide internal data from ruby level.
-	  fixed: [ruby-dev:25435], [ruby-list:40498]
+	* test/webrick/utils.rb: require "webrick/https.h".
 
 Mon Jan 10 01:22:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (rb_data_object_alloc): klass may be NULL.
 	  [ruby-list:40498]
 
-Sun Jan  9 03:12:58 2005  Tanaka Akira  <akr@m17n.org>
+Sun Jan  9 14:12:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (io_fread): warn nonblocking behavior.
-	  (io_readpartial): new method IO#readpartial.
+	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
+
+Sun Jan  9 04:08:40 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/webrick/test_server.rb (test_daemon): delete an assertion
+	  which has possibility to fail by race condition.
+
+Sun Jan  9 03:22:46 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb (test_copy_entry): copy_entry
+	  copies only file type, not mtime. [ruby-dev:25383]
 
 Sat Jan  8 04:38:47 2005  why the lucky stiff  <why@ruby-lang.org>
 
@@ -9903,17 +67918,33 @@ Fri Jan  7 21:12:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
 	* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
 	  [ruby-dev:25426]
 
+Fri Jan  7 20:01:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
+	  should delete trailing LF from the result of pack("m*").
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
+	  - should delete trailing LF from the result of pack("m*").
+	  - clear Request-Line not to send the response by HTTPServer#run.
+
+	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
+	  refine regexp (and change the name of a local variable).
+
+	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
+	  don't allow changing its mode.
+
+	* test/webrick/*, sample/webrick/httpproxy.rb: add new files.
+
 Fri Jan  7 18:03:35 2005  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (mark_locations_array): avoid core dump with -O3.
 	  [ruby-dev:25424]
 
-Thu Jan  6 20:31:07 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jan  6 20:29:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/zlib/zlib.c (zstream_end): should return value. (backported
-	  from CVS HEAD)
+	* ext/zlib/zlib.c (zstream_end): should return value.
 
-Thu Jan  6 19:55:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jan  6 19:59:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_close): didn't close socket handle.
 	  [ruby-dev:25414]
@@ -9921,7 +67952,7 @@ Thu Jan  6 19:55:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
 	  never set EMFILE.
 
-Thu Jan  6 17:14:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jan  6 17:22:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* random.c (random_seed): O_NONBLOCK isn't defined on some
 	  platforms. [ruby-dev:25417]
@@ -9935,6 +67966,11 @@ Thu Jan  6 07:58:28 2005  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
 	  in path names on DOS machines. (thanks to Johan Nilsson)
 
+Thu Jan  6 00:02:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: use MockClock.sleep instead of Kernel.sleep
+	  [ruby-dev:25387]
+
 Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
 
 	* random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
@@ -9942,21 +67978,19 @@ Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
 
 	* random.c (random_seed): refined.
 
-Wed Jan  5 12:49:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_initialize): Thread objects cannot be initialized
-	  again.  fixed: [ruby-core:04067]
+Wed Jan  5 16:39:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-Wed Jan  5 10:48:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (BITSTACK_POP): workaround for bcc32 compiler's bug.
+	  shift assignment operator '>>=' for __int64 in struct may
+	  generate collapsed code. [ruby-dev:25342]
 
-	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
-	  longer. (backported from CVS HEAD)
+	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
+	  [ruby-dev:25306]
 
-	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
-	  interface. (backported from CVS HEAD)
+Wed Jan  5 12:49:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
-	  HEAD)
+	* eval.c (rb_thread_initialize): Thread objects cannot be initialized
+	  again.  fixed: [ruby-core:04067]
 
 Wed Jan  5 02:30:11 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -9976,10 +68010,10 @@ Tue Jan  4 23:25:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* bignum.c (rb_big_rand): should return positive random number.
 	  [ruby-dev:25401]
 
-Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+Tue Jan  4 21:25:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
-	  random bignums.  [ruby-dev:25396]
+	* test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use
+	  DRbService.ext_service. reduce sleep.
 
 Mon Jan  3 14:01:54 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -9991,7 +68025,21 @@ Mon Jan  3 11:37:42 2005  Tanaka Akira  <akr@m17n.org>
 	* random.c (random_seed): use /dev/urandom if available.
 	  [ruby-dev:25392]
 
-Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+
+	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
+	  random bignums.  [ruby-dev:25396]
+
+Mon Jan  3 11:03:37 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/test_drb.rb: move TestDRbReusePort to new file.
+	  [ruby-dev:25238]
+
+	* test/drb/drbtest.rb: change timeout.
+
+	* test/drb/ignore_test_drb.rb: new file.
+
+Mon Jan  3 07:27:46 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
 	  raise NotImplementedError if password is encrypted by digest
@@ -10007,6 +68055,46 @@ Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/webrick/test_httpauth.rb: new file.
 
+Sun Jan  2 15:42:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: add lazy stop_service.
+
+	* lib/drb/extserv.rb: ditto.
+
+Sun Jan  2 01:17:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/drbtest.rb: add method DRbService.ext_service.
+
+	* test/drb/test_drb.rb: ditto.
+
+	* test/drb/test_drbssl.rb: ditto.
+
+Sat Jan  1 20:23:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (argf_readpartial): new method ARGF.readpartial.
+	  (io_getpartial): extracted from io_readpartial.
+	  (io_readpartial): call io_getpartial.
+
+Sat Jan  1 17:44:54 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (each_capitalized): should join header field
+	  value.  This patch is contributed sheepman [ruby-list:40478]
+
+	* test/net/http/test_httpheader.rb: test it.
+
+Sat Jan  1 16:21:29 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (copy_stream): use read/write instead of
+	  sysread/syswrite, which allows duck typing. [ruby-dev:25369]
+
+	* lib/fileutils.rb (copy_stream): does NOT support nonblocking IO.
+	  [ruby-dev:25370]
+
+	* lib/fileutils.rb (copy_entry): could not copy symlink.
+
+	* test/fileutils/test_fileutils.rb: test copy_entry, copy_file,
+	  copy_stream.
+
 Sat Jan  1 04:20:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
@@ -10018,8 +68106,29 @@ Sat Jan  1 01:13:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Dec 31 14:10:43 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
-	  if heading contains formatting.
+	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
+	  Fix problem if heading contains formatting.
+
+Fri Dec 31 00:08:02 2004  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in (HAVE_RLIM_T): removed because not used.
+
+Thu Dec 30 22:45:39 2004  Tanaka Akira  <akr@m17n.org>
+
+	* rubyio.h: don't deprecate rb_read_check.
+
+	* io.c (STDIO_READ_DATA_PENDING): reverted from old READ_DATA_PENDING
+	  to check stdio read buffer.
+	  (rb_read_check): use STDIO_READ_DATA_PENDING.
+	  (rb_read_pending): ditto.
+	  (rb_getc): ditto.
+
+Thu Dec 30 05:39:35 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: eliminate unused members in struct parser_params.
+	  [ruby-dev:25258] (again)
+
+	* parse.y: make parser_new() static.
 
 Thu Dec 30 00:41:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -10037,6 +68146,11 @@ Tue Dec 28 22:31:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* string.c (rb_str_justify): create buffer string after argument type
 	  conversion.  fixed: [ruby-dev:25341]
 
+Tue Dec 28 17:18:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/net/telnet.rb (preprocess): remove NULL unless binmode.
+	  fixed: [ruby-list:40320]
+
 Tue Dec 28 15:41:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
@@ -10057,90 +68171,57 @@ Tue Dec 28 13:35:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
 
-Tue Dec 28 12:26:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
-	  install-nodoc, install-doc): rdoc support for mswin32.
-
-	* win32/configure.bat (--enable-install-doc, --disable-install-doc):
-	  ditto.
-
 Mon Dec 27 20:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
 
 	* ext/tk/lib/multi-tk.rb: ditto
 
-Mon Dec 27 16:55:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec 27 16:54:05 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
 	  rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
 
-Mon Dec 27 16:29:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_justify): [ruby-dev:25341]
+Mon Dec 27 15:29:12 2004  Minero Aoki  <aamine@loveruby.net>
 
-Mon Dec 27 15:47:48 2004  Minero Aoki  <aamine@loveruby.net>
+	* test/fileutils/test_fileutils.rb (cp_r): tested wrong file name.
+	  [ruby-dev:25339]
 
-	* test/fileutils/fileasserts.rb: sync with HEAD.
-
-	* test/fileutils/test_fileutils.rb: ditto.
-
-	* test/fileutils/test_nowrite.rb: ditto.
-
-Mon Dec 27 15:21:07 2004  Minero Aoki  <aamine@loveruby.net>
+Mon Dec 27 15:15:18 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (mv): should raise error when moving a
 	  directory to the (empty) directory. [ruby-talk:124368]
-	  (backport from HEAD 1.48)
 
 	* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
-	  platforms. (backport from HEAD 1.48)
-
-Sat Dec 25 11:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  platforms.
 
-	* stable version 1.8.2 released.
+Mon Dec 27 14:36:20 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Dec 25 04:23:49 2004  Minero Aoki  <aamine@loveruby.net>
+	* process.c (NUM2RLIM, RLIM2NUM): Without SIZEOF_RLIM_T is not error.
+	  fixed: [ruby-dev:25346]
 
-	* lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
-	  permission. (backportted from HEAD, 1.47)
+Sun Dec 26 16:21:39 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/fileutils.rb (traverse, remove_dir): untaint trasted
-	  objects. (backportted from HEAD, 1.46)
+	* lib/net/imap.rb (Net::IMAP::PlainAuthenticator): added a new class
+	  to support the PLAIN authentication mechanism. Thanks, Benjamin
+	  Stiglitz.
 
 Sat Dec 25 01:28:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c: cancel io_reopen() change on Dec. 24th.
-
-	* dln.c: use <dlfcn.h> for NetBSD.  [ruby-dev:25313]
-
-	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
-
-Fri Dec 24 23:51:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
-	  [ruby-dev:25306]
-
-	* win32/win32.[ch]: ditto.
+	* io.c (rb_f_select): [ruby-dev:25312]
 
 Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
 
-Fri Dec 24 18:39:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
-	  [ruby-dev:25306]
-
-Fri Dec 24 02:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 24 03:06:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
 	  special IO ports.  [ruby-dev:25225]
 
-Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (next_argv): reduce use of stdio.
 
-	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
 
@@ -10161,11 +68242,20 @@ Fri Dec 24 01:21:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
 
-Thu Dec 23 23:36:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Dec 23 23:43:24 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* process.c (proc_setgroups): check if the argument lenght is
+	* process.c (proc_setgroups): check if the argument length is
 	  modified.  fixed: [ruby-dev:25285]
 
+	* process.c (SIZEOF_RLIM_T): err if size of rlim_t is not set.
+
+Thu Dec 23 19:08:41 2004  Tanaka Akira  <akr@m17n.org>
+
+	* rubyio.h: rename FMODE_UNSEEKABLE to FMODE_DUPLEX.
+
+	* io.c (io_check_tty): extracted function to set FMODE_LINEBUF and
+	  FMODE_DUPLEX.
+
 Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
@@ -10177,10 +68267,6 @@ Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
 
-Thu Dec 23 09:38:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen): restore exact mode.  fixed: [ruby-core:04003]
-
 Thu Dec 23 00:16:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (bsdi): use $(CC) for LDSHARED.  fixed [ruby-dev:25270]
@@ -10195,41 +68281,49 @@ Wed Dec 22 08:34:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
 	  all argument conversion.  fixed: [ruby-dev:25271]
 
-Wed Dec 22 00:08:01 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Dec 21 16:15:21 2004  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb: use "" instead of "." if prefix argument is
+	  nil in proxy methods. nil is default value.
+
+	* test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
+	  use threads instead of forking. this should fix issue #1208
+	  (http://rubyforge.org/tracker/?func=detail&atid=1698&aid=1208&group_id=426).
+	  removed testing of SSL enabled servlet as this hangs.
+
+Wed Dec 22 00:05:10 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
 
-Tue Dec 21 22:07:33 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Dec 21 22:07:41 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): use rb_str_new4
+	  to avoid SEGV.
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
 	  ossl_asn1_decode_all): temporary value should be marked volatile.
 
-Tue Dec 21 14:40:02 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Dec 21 12:42:34 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): use rb_str_new4 to avoid SEGV.
-	  fix [ruby-dev:25261]
+	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode):
+	  use rb_str_new4 to avoid SEGV. fix [ruby-dev:25261]
 
 	* test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
 
-Tue Dec 21 12:22:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen): keep duplex pipe in correct mode for exception
-	  safeness.  fixed: [ruby-dev:25152]
-
 Tue Dec 21 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
 
-Tue Dec 21 00:53:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Dec 20 22:52:29 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
+	* added samples for the previous soap4r's commit.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
+Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
+	* gc.c (set_stack_end): gcc noinline attribute is available since
+	  gcc-3.1.
 
-Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Dec 20 22:40:31 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* added files:
 	  * lib/soap/mapping/wsdl*.rb
@@ -10243,8 +68337,6 @@ Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * test/soap/*
 	  * test/wsdl/*
 	  * test/xsd/*
-	  * sample/soap/*
-	  * sample/sdl/*
 
 	* summary
 	  * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2
@@ -10258,12 +68350,14 @@ Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * HTTP client/server gzipped content encoding support.
 
 	  * improved WSDL schema definition support; still is far from
-	    complete, but is making step by step improovement.
+	    complete, but is making step by step improvement.
 
-Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
+Mon Dec 20 14:45:19 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* gc.c (stack_end_address): gcc noinline attribute is available since
-	  gcc-3.1.
+	* lib/net/https.rb: delete descriptions about key_file and cert_file.
+	  fixed: [ruby-dev:25243]
+
+	* ext/openssl/lib/net/telnets.rb: ditto.
 
 Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -10275,21 +68369,14 @@ Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/panedwindow.rb: ditto
 
-Mon Dec 20 12:47:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
-	  doc and code about SSLContext#{key_file,cert_file}.
-	  fixed: [ruby-dev:25243]
-
-Mon Dec 20 12:42:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Dec 20 13:51:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_fwrite): workaround for MSVCRT's bug.
-	  fixed: [ruby-core:03982]
+	* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
 
-Mon Dec 20 11:21:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 20 10:51:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_io_eof): check if closed before clearerr().
-	  fixed: [ruby-dev:25251]
+	* parse.y (special_local_set): prevent the parser object from GC.
+	  fixed: [ruby-dev:25252]
 
 Mon Dec 20 03:30:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -10300,40 +68387,10 @@ Mon Dec 20 01:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (make_struct): [ruby-dev:25249]
 
-Mon Dec 20 00:28:20 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
-
-	* lib/rexml/encodings/SHIFT_JIS.rb: ditto.
-
-Sun Dec 19 17:19:48 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec 20 00:16:54 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/openssl/ossl_x509store.c
-	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
-	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
-
-	* test/openssl/ossl_x509store.rb: test certificate validity times.
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
-	  second argument to specify the output format (see also
-	  X509_NAME_print_ex).
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
-	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
-	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
-	  new module to provide the parse for RFC2253 DN format.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
-	  new method to parse RFC2253 DN format.
-
-	* test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
-
-	* text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
-	  while EADDRINUSE is raised.
-
-	* all changes in this entry are backport from 1.9.
+	* lib/rexml/encodings/SHIFT_JIS.rb: fixed LoadError bug.
+	  [ruby-core:3958]
 
 Sun Dec 19 17:24:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -10355,7 +68412,7 @@ Sat Dec 18 16:36:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
 	  disallow interrupt by type conversion.  fixed: [ruby-dev:25226]
 
-Sat Dec 18 15:16:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Dec 18 15:09:02 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/webrick/httpauth.rb,
 	  lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
@@ -10366,10 +68423,12 @@ Sat Dec 18 10:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_open_dir): new function.  [ruby-dev:25242]
 
-Fri Dec 17 18:07:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* io.c (rb_f_open): add type check for return value from to_open.
+
+Fri Dec 17 16:44:26 2004  Tanaka Akira  <akr@m17n.org>
 
-	* test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
-	  fixed: [ruby-dev:25218]
+	* configure.in (ac_cv_sizeof_rlim_t): set 8 for BSD/OS.
+	  Reported by OHARA Shigeki.  [ruby-dev:25236]
 
 Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -10407,45 +68466,27 @@ Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
 	  embedded window
 
-Fri Dec 17 13:50:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
-	  for VMS port are added.
-
-	* eval.c (ruby_init): change to call VMS private intialization routine.
-
 Fri Dec 17 13:33:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session#initialize): control adding
 	  session_id hidden fields.  fixed: [ruby-talk:123850]
 
-Thu Dec 16 23:25:25 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri Dec 17 00:01:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
-	  [druby-ja:101]
+	* eval.c (rb_proc_arity, rb_node_arity, rb_mod_method_arity,
+	  rb_obj_method_arity): new functions to obtain method arity.
+	  [ruby-dev:25143]
 
-	* test/drb/test_drb.rb: adjust and reduce sleep (backported from
-	  CVS HEAD.)
+Thu Dec 16 23:31:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec 16 18:44:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/mkmf.rb (create_makefile): create RUBYARCHDIR also when no extension
+	  is installed.  fixed: [ruby-dev:25215]
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
-	  for reading request till data arrive. [ruby-talk:121068]
+Thu Dec 16 22:36:57 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
-	  should log about all accepted socket. [ruby-core:03962]
+	* test/drb/test_drb.rb: adjust and reduce sleep.
 
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
-	  "%%" and "%u" are supported. [webricken:135]
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#check_filename):
-	  :NondisclosureName is acceptable if it is Enumerable.
-
-	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
-	  default value of :NondisclosureName is [".ht*", "*~"].
-
-Thu Dec 16 18:36:52 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Dec 16 18:37:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl.c (ossl_raise): refine message format.
 
@@ -10484,55 +68525,64 @@ Thu Dec 16 16:03:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: ditto
 
-Thu Dec 16 03:14:28 2004  Minero Aoki  <aamine@loveruby.net>
+Thu Dec 16 04:02:28 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/net/http.rb (basic_encode): return value of pack('m') may
-	  include multiple CR/LFs.  Backported from main trunk (rev 1.112).
-	  [ruby-dev:25212]
+	* ext/ripper/extconf.rb: bison is not needed if ripper.c exists.
+	  [ruby-dev:25191]
 
-Thu Dec 16 00:33:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Dec 16 03:27:10 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* hash.c (Init_Hash): remove custom "hash" and "eql?".
+	* lib/net/http.rb: remove junk.
 
-Wed Dec 15 18:57:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Dec 16 00:57:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/set.rb (Set::eql): wrong definition.  [ruby-dev:25207]
+	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
 
-Wed Dec 15 18:48:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Dec 16 00:43:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* ext/curses/curses.c (window_subwin): call NUM2INT() before
-	  GetWINDOW(). (backported from CVS HEAD)
+	* lib/drb/drb.rb: changed default binded address family to use an
+	  available address family of host name. [druby-ja:101]
 
-Wed Dec 15 17:03:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/drb/ssl.rb: ditto
 
-	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
-	  isatty because it never sets errno. (backported from CVS HEAD)
+Wed Dec 15 17:47:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
+	  should log about all accepted socket. [ruby-core:03962]
+
+	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
+	  "%%" and "%u" are supported. [webricken:135]
 
-Wed Dec 15 15:39:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#check_filename):
+	  :NondisclosureName is acceptable if it is Enumerable.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
-	  (rollback the previous commit).
+	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
+	  default value of :NondisclosureName is [".ht*", "*~"].
 
 Wed Dec 15 16:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_obj_id_obsolete): warn always.
 
-	* eval.c (rb_enable_super): ditto.
-
 Wed Dec 15 15:31:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/set.rb (Set#==): [ruby-dev:25206]
 
-Wed Dec 15 14:22:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Dec 15 14:32:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
-	  fixed: [ruby-core:03959]
 
 Wed Dec 15 10:30:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
 
-Tue Dec 14 17:10:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Dec 14 19:17:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* utf8.c (utf8_is_mbc_ambiguous): [ruby-talk:123561]
+
+	* utf8.c (utf8_mbc_to_normalize): ditto.
+
+Tue Dec 14 17:08:15 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_close): need to reset osfhnd().
 
@@ -10546,27 +68596,36 @@ Tue Dec 14 12:36:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/cgi/session.rb (CGI::Session::initialize): generate new
 	  session if given session_id does not exist.  [ruby-list:40368]
 
+Tue Dec 14 08:47:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_eval): should mark ruby_eval_tree.  [ruby-dev:25189]
+
 Mon Dec 13 18:13:52 2004  Tanaka Akira  <akr@m17n.org>
 
-	* gc.c (stack_end_address): new function to obtain stack end address.
-	  stack_end_address calls __builtin_frame_address(0) to obtain the
-	  frame pointer of a stack frame of stack_end_address.  The address
-	  is the stack pointer of the caller's stack frame.
-	  (SET_STACK_END): use stack_end_address.
+	* gc.c (set_stack_end): new function to obtain stack end address.
+	  set_stack_end obtains a stack end address by an address of local
+	  variable in the function.
+	  (SET_STACK_END, STACK_END): use set_stack_end.  don't use alloca.
 	  This makes the conservative garbage collector to scan a stack frame
 	  of the garbage_collect function itself.  This is required because
 	  callee-save registers may be stored in the frame.
 	  [ruby-dev:25158]
 
+Mon Dec 13 02:45:51 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses/curses.c (window_subwin): call NUM2INT() before
+	  GetWINDOW(). fixed: [ruby-dev:25161]
+
 Mon Dec 13 00:58:02 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (cleanpath_aggressive): make it private.
 	  (cleanpath_conservative): ditto.
 	  Suggested by Daniel Berger.  [ruby-core:3914]
 
-Sun Dec 12 20:06:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Dec 12 21:32:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/drb/drb.rb: backported from CVS HEAD.
+	* test/ruby/test_super.rb (TestSuper#test_define_method): now methods
+	  from procs can call super.
 
 Sun Dec 12 10:35:10 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -10578,14 +68637,7 @@ Sun Dec 12 10:14:03 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
 	  explicitly given on the command line.
 
-Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
-	  (see ext/tk/ChangeLog.tkextlib).
-
-	* ext/tk/sample/scrollframe.rb: add a new sample.
-
-Sat Dec 11 20:12:21 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Dec 11 21:10:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
 	  [ruby-list:40390]
@@ -10594,41 +68646,27 @@ Sat Dec 11 20:12:21 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/ut_drb.rb: ditto.
 
-Sat Dec 11 15:38:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/jcode.rb (String::succ): [ruby-dev:25156]
-
-Sat Dec 11 12:41:55 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (run_trap_eval): prototype; avoid VC++ warnings.
-
-	* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
+Sat Dec 11 13:08:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c: need to include dln.h.
+	* sample/optparse/subcommand.rb: a sample for sub commands like
+	  cvs.  contributed by Minero Aoki.
 
-Sat Dec 11 00:10:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_reopen): [ruby-dev:25150]
-
-Fri Dec 10 08:39:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 10 08:39:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/socket/socket.c (sock_listen): get OpenFile just before calling
-	  listen(2).  fixed: [ruby-dev:25149]
-
-Thu Dec  9 17:00:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
+	  listen(2).
 
-Thu Dec  9 16:31:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Dec  9 16:28:35 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/sdbm/init.c (GetDBM): typo.
 
-Thu Dec  9 16:05:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+Thu Dec  9 16:21:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* defines.h: change path of vms.h
-	* vms/vms.h: delete reference for snprintf()
-	* vms/config.h: new file
-	* vms/config.h_in: deleted
+	* lib/webrick/cgi.rb (WEBrick::CGI#setup_header): avoid
+	  SecurityError. [ruby-dev:24970]
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
+	  for reading request till data arrive. [ruby-talk:121068]
 
 Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -10637,6 +68675,10 @@ Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_dump): not escape # which isn't a substitution.
 
+Thu Dec  9 12:31:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (pipe_open): should set prog if argc != 0.
+
 Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
@@ -10645,6 +68687,11 @@ Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/gdbm/gdbm.c: ditto.
 
+Thu Dec  9 10:19:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/socket/test_socket.rb (test_setsockopt): use SO_LINGER instead
+	  of SO_BINDTODEVICE.  fixed: [ruby-dev:25133]
+
 Thu Dec  9 03:08:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when
@@ -10699,44 +68746,174 @@ Wed Dec  8 23:54:29 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Typo
 	  meant that h2 tag was invisible.
 
-Wed Dec  8 21:56:31 2004  Kouhei Sutou  <kou@cozmixng.org>
+Wed Dec  8 22:10:02 2004  Tanaka Akira  <akr@m17n.org>
 
-	* lib/rss, test/rss, sample/rss: backported from CVS HEAD.
+	* rubyio.h, io.c, ext/dl/dl.c, ext/pty/pty.c, ext/socket/socket.c:
+	  create FILE object only when required: popen(3) and DL's IO#to_ptr.
+	  [ruby-dev:25122]
 
-Wed Dec  8 14:31:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_io_binmode): use setmode for Human68k.  [ruby-dev:25121]
+
+Wed Dec  8 20:13:06 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* process.c (rb_spawn): support for DJGPP.
 
-	* io.c (io_fwrite): change dereference for cosmetic reason.
+	* lib/mkmf.rb (VPATH): specify the implicit path separator for DJGPP.
+
+Wed Dec  8 17:48:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): merge Guy Decoux's argument preserve
+	  patch in [ruby-core:03874].
+
+Wed Dec  8 17:37:33 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_pipe_exec): need to close original socket
+	  handle.
+
+Wed Dec  8 14:31:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): [ruby-dev:25104]
 
-Tue Dec  7 19:08:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+Wed Dec  8 13:49:46 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
+	* win32/win32.c (rb_w32_pipe_exec): must close original handle
+	  before exec. fixed: [ruby-dev:25112]
+
+Wed Dec  8 11:46:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string_content): get rid of segfault at empty evstr.
+	  fixed: [ruby-dev:25113]
+
+Wed Dec  8 03:26:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_bio.c (ossl_obj2bio): should not use fptr->f.
+	  [ruby-dev:25101]
+
+Wed Dec  8 03:26:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* runruby.rb: prepend LIBRUBY_SO to LD_PRELOAD as well as rubytest.rb.
+
+Wed Dec  8 01:35:44 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (is_socket): reorder of function definitions.
+
+Wed Dec  8 00:44:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (pipe_open): win32 bidirectional pipe support.
+
+	* win32/win32.[ch] (rb_w32_pipe_exec): ditto.
+
+	* win32/win32.[ch] (socketpair): new function. POSIX socketpair
+	  emulation.
+
+	* win32/win32.c (socketpair_internal): ditto.
+
+Wed Dec  8 00:25:07 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_version.rb: added version check test.
+	  [ruby-dev:25053]
+
+Tue Dec  7 15:40:38 2004  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (io_fwrite): avoid context switch before writing to stderr.
+	  [ruby-dev:25080]
+
+	* rubyio.h: refine deprecated declaration.
+
+	* configure.in, file.c, io.c: remove useless check: fseeko, etc.
+
+Tue Dec  7 13:42:07 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
+	  longer.
+
+	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
+	  interface.
+
+	* win32/win32.[ch] (rb_w32_rmdir): new function.
 
 Tue Dec  7 00:27:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* process.c (proc_setgroups): [ruby-dev:25081]
 
+Mon Dec  6 23:07:57 2004  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in: check -lsocket for socketpair and shutdown.
+	  reported by Ville Mattila.  [ruby-core:03903]
+
+Mon Dec  6 23:00:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (ac_cv_sizeof_rlim_t): setup for DJGPP.
+
+	* io.c (is_socket, shutdown): define dummy macros for DJGPP.
+
+	* process.c: use SIZEOF_RLIM_T instead of HAVE_RLIM_T for DJGPP.
+
+Mon Dec  6 21:19:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (is_socket): fix typos. [ruby-core:03900]
+
+Mon Dec  6 20:13:28 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (is_socket): new function.
+
+	* io.c (rb_io_close_read, rb_io_close_write): use is_socket().
+
+	* io.c (rb_io_fptr_finalize): need to check fptr->f before calling
+	  rb_io_fptr_cleanup().
+
+	* io.c (pipe_open): win32 pipe support (experimental).
+
+	* win32/win32.[ch] (rb_w32_pipe_exec): return file descriptors
+	  instead of FILE structure objects.
+
+	* win32/win32.[ch] (rb_w32_is_socket): new function.
+
+Mon Dec  6 19:40:40 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* Makefile.in (.y.c): simplify the rule.
+
 Mon Dec  6 18:08:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (rb_reg_eqq): document fix.  [ruby-talk:122541]
 
-Mon Dec  6 17:19:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec  6 17:49:30 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (run_trap_eval): add prototype for Microsoft compiler.
+
+Mon Dec  6 17:32:38 2004  Tanaka Akira  <akr@m17n.org>
+
+	* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
+	  ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
+	  Use own buffering mechanism instead of stdio.  [ruby-dev:25056]
+
+	* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
+	  EOF flag removed.
+
+Mon Dec  6 17:15:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/socket/test_socket.rb (TestBasicSocket#test_setsockopt):
+	  BasicSocket#setsockopt dumps core.  [ruby-dev:25039]
 
-	* rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
-	  (backported from CVS HEAD)  [ruby-dev:24993]
+	* test/socket/test_tcp.rb (TestTCPSocket#test_recvfrom):
+	  TCPSocket#recvfrom dumps core.  [ruby-dev:24705]
 
-Mon Dec  6 10:18:17 2004  Dave Thomas  <dave@pragprog.com>
+	* test/socket/test_udp.rb (TestUDPSocket#test_connect):
+	  UDPSocket#connect dumps core.  [ruby-dev:25045]
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
-	  Oops - 1.8 doesn't have String#clear
+	* test/socket/test_udp.rb (TestUDPSocket#test_bind):
+	  UDPSocket#bind dumps core.  [ruby-dev:25057]
 
 Mon Dec  6 09:59:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* io.c (io_fread): take VALUE argument.
+
 	* ext/socket/socket.c (sock_connect): use rb_str_new4().
 	  [ruby-dev:25052]
 
-Mon Dec  6 01:42:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_yield_0): [ruby-dev:25051]
+
+Mon Dec  6 01:32:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
 	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
@@ -10757,6 +68934,11 @@ Sun Dec  5 19:39:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/optparse.rb (OptionParser#order!): ignore case only for long
 	  option.  [ruby-dev:25048]
 
+Sun Dec  5 00:54:32 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* mkconfig.rb: setup library paths before requiring library.
+	  [ruby-core:03892]
+
 Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_write): remove rb_str_locktmp().  [ruby-dev:25050]
@@ -10780,10 +68962,29 @@ Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
 	  is redefined.  [ruby-talk:122482]
 
-Sat Dec  4 14:54:52 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Dec  4 21:29:05 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: (In previous commit) new method chown.
+
+	* lib/fileutils.rb: (In previous commit) new method chown_R.
 
-	* eval.c (proc_invoke): use volatile `tmp' rather than `args'.
-	  [ruby-core:03882]
+	* lib/fileutils.rb: (In previous commit) new method chmod_R
+	  wrongly added.  Removed now.
+
+Sat Dec  4 20:45:52 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir, mkdir_p): should chmod explicitly.
+	  [ruby-core:03881]
+
+Sat Dec  4 18:54:09 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: removed empty lines from output.
+
+Sat Dec  4 18:49:09 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.1 -> 0.1.2
+
+	* lib/rss/rss.rb: #item=/#set_item and so on are obsolete.
 
 Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -10797,48 +68998,13 @@ Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
 	   The lines before :section: are removed, and identical lines at the end are
 	   also removed if present.
 
-Sat Dec  4 03:33:45 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
-
-	* test/readline/test_readline.rb: added tests for readline.
-	  (backported from CVS HEAD)
-
-Sat Dec  4 02:24:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c: add constant NKF::VERSION
-
-	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
-
-	* ext/nkf/test.rb(mime_out2): add --no-cp932
-
-	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
-
 Sat Dec  4 00:35:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
 
-Fri Dec  3 18:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/ostruct.rb: 1.9 marshaling support back-ported.
-	  [ruby-core:03871]
-
-Fri Dec  3 13:45:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): copy arguments to frame.argv.
-	  [ruby-core:03861]
-
-Fri Dec  3 12:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.h: fix prototypes.
-
-Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (convert_type): use rb_respond_to() again.
-	  [ruby-dev:25021]
+Fri Dec  3 12:25:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
-	  [ruby-dev:25021]
+	* st.h: fix prototype for C++.
 
 Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -10858,6 +69024,25 @@ Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-jp/widget: ditto.
 
+Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): prepare to pass a block from "call" method
+	  to a Proc generated by Method#to_proc.  [ruby-dev:25031]
+
+	* eval.c (rb_yield_0): actually passes a block given to "call".
+
+	* object.c (convert_type): use rb_respond_to() again.  this fix is
+	  based on [ruby-dev:25021]
+
+	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
+	  [ruby-dev:25021]
+
+Thu Dec  2 15:13:53 2004  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* test/xmlrpc/test_parser.rb, test/xmlrpc/data/*.expected: Expected
+	  values are now stored in YAML instead of using #inspect. This fixes
+	  false hash order.
+
 Fri Dec  3 00:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_file_initialize): [ruby-dev:25032]
@@ -10870,12 +69055,16 @@ Thu Dec  2 16:41:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_callcc, rb_cont_call): prohibit calling from different
 	  signal contexts.  [ruby-dev:25022]
 
+Thu Dec  2 10:45:02 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/readline/test_readline.rb: fix for NetBSD.
+
 Thu Dec  2 09:57:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/ostruct.rb (OpenStruct::Marshaler): OpenStruct can be
 	  marshaled again.  [ruby-core:03862]
 
-Thu Dec  2 09:30:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Dec  2 09:30:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (thread_mark): mark thread group.  [ruby-dev:25020]
 
@@ -10885,35 +69074,56 @@ Thu Dec  2 07:57:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_ctl): [ruby-dev:25019]
 
+Wed Dec  1 06:13:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c: add constant NKF::VERSION
+
+	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
+
+	* ext/nkf/test.rb: add --no-cp932
+
+	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
+
 Wed Dec  1 02:21:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* signal.c (sighandler): call handler immediately only for default
 	  handlers.  [ruby-dev:25003]
 
-Tue Nov 30 23:38:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov 30 23:49:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): errno should be preserved for rb_sys_fail() when
+	  fork failed.
+
+Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
 
+	* eval.c (rb_eval): should check previous frame for ZSUPER.
+
 	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]  (backported from CVS HEAD)
+	  [ruby-dev:24996]
 
 	* io.c (io_readpartial): ditto.
 
 	* io.c (io_read): ditto.
 
-Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov 30 14:58:33 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
+	* instruby.rb (install): add arguments explicitly to "super".
 
-	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]
+Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_read): ditto.
+	* eval.c (PUSH_FRAME): flags should have been initialized.
 
-Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_eval): [ruby-core:03856]
 
 	* io.c (rb_io_sysread): use temporary lock.  [ruby-dev:24992]
 
+Tue Nov 30 00:12:57 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regparse.c: now handles many alternatives (over 500000)
+	  in regexp. [ruby-dev:24773]
+
 Mon Nov 29 16:06:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_write): insufficiently filled string
@@ -10931,10 +69141,19 @@ Mon Nov 29 15:22:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
 	  not supported.
 
+Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): must not use FILE after fclose().
+	  [ruby-dev:24985]
+
+Mon Nov 29 13:13:13 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): push back the last space before next
+	  loop because CharNext() eats it.
+
 Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* object.c (convert_type): direct call conversion methods for the
-	  performance.  [ruby-core:03845]
+	* object.c (convert_type): [ruby-core:03845]
 
 	* eval.c (rb_funcall_rescue): new function.
 
@@ -10942,30 +69161,57 @@ Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_Integer): ditto.
 
+	* eval.c (get_backtrace): no conversion for nil.
+
 	* parse.y (reduce_nodes): empty body should return nil.
 
-	* string.c (rb_str_aset): the original string should not be
-	  affected by modifying duplicated string.  [ruby-dev:24981]
+Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
 
-Mon Nov 29 13:57:38 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (rb_io_check_writable): call io_seek regardless of
+	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
 
-	* win32/win32.c (CreateChild): search executable file if no program
-	  name given. (backported from CVS HEAD)
+Sun Nov 28 15:57:58 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/rss.rb (RSS::Element#tag): not use block_given? for
+	  working with ruby 1.6 again.
 
-	* io.c (fptr_finalize): must not use FILE after fclose().
-	  [ruby-dev:24985]
+	* lib/rss/{0.9,2.0,trackback}.rb, lib/rss/maker/base.rb:
+	  undef -> remove_method for working with ruby 1.6 again.
 
-Mon Nov 29 13:16:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Nov 28 15:51:40 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* win32/win32.c (CreateChild): push back the last space before next
-	  loop because CharNext() eats it.
+	* lib/rss/rss.rb (RSS::NotSetError): added.
 
-Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
+	* lib/rss/maker/{1.0,0.9,2.0}.rb: changed RSS Maker to raise
+	  RSS::NotSetError if required values of maker.channel are not
+	  set. [ruby-talk:120061]
 
-	* io.c (rb_io_check_writable): call io_seek regardless of
-	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
+	* test/rss/test_maker_{1.0,0.9,2.0}.rb: changed tests to check RSS
+	  Maker raises or not.
+
+Sun Nov 28 12:14:47 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regparse.c (fetch_token): fixed test failure on HP-UX ia64
+	  ([ruby-dev:24859]).
+
+Sun Nov 28 12:08:15 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regparse.c, test/ruby/test_regexp.rb: fixed problem with UTF-8
+	  characters that have U+00FE or invalid characters.
+
+Sun Nov 28 12:07:04 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regexec.c, test/ruby/test_regexp.rb: fixed segmentation fault
+	  ([ruby-dev:24887]).
+
+Sun Nov 28 12:05:48 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regcomp.c, regint.h: fixed PLATFORM_UNALIGNED_WORD_ACCESS
+	  problem ([ruby-dev:24802] and [ruby-core:3733])
+
+Sat Nov 27 23:43:39 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_initialize): [ruby-dev:24972]
 
 Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
 
@@ -10977,10 +69223,36 @@ Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
 	  (rb_io_fwrite): wrapper for io_fwrite now.
 	  (io_write): call io_fwrite instead of rb_io_fwrite.
 
+Sat Nov 27 17:43:21 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/{0.9,1.0,2.0,trackback,xml-stylesheet}.rb: added
+	  #setup_maker.
+
+	* test/rss/test_setup_maker_*.rb: added tests for #setup_maker.
+
+	* lib/rss/maker/base.rb(RSS::Maker::Items#max_size=): supported
+	  output item size limitation.
+
+	* sample/rss/blend.rb: added sample for RSS Maker.
+
+Sat Nov 27 17:41:35 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/0.9.rb: supported RSS::Maker.make("0.91"). Now,
+	  "0.9" is just alias of "0.91."
+
+	* test/rss/test_maker_0.9.rb: make("0.9") -> maker("0.91").
+
+	* test/rss/test_to_s.rb: ditto.
+
+Sat Nov 27 17:21:30 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/list_description.rb: untabified.
+
+	* sample/rss/rss_recent.rb: ditto.
+
 Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>
 
-	* lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
-	  now a instance method.  [ruby-core:03832]
+	* lib/cgi/session.rb (CGI::Session::initialize): [ruby-core:03832]
 
 Sat Nov 27 09:41:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -10998,8 +69270,18 @@ Fri Nov 26 18:02:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath
 
+Fri Nov 26 14:29:39 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_initialize): uninitialized fd was checked to see open
+	  mode.  [ruby-dev:24963]
+
+	* io.c (rb_io_initialize): uninitialized fd was used.  [ruby-dev:24962]
+
 Fri Nov 26 13:49:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* io.c (rb_io_initialize): should retrieve flags from copying file
+	  descriptor. [ruby-dev:24961]
+
 	* eval.c (method_missing): raise TypeError for classes do not
 	  have allocators.  [ruby-core:03752]
 
@@ -11021,12 +69303,17 @@ Thu Nov 25 20:14:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
 	  threads should be also processed.  [ruby-talk:121320]
 
-Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov 25 18:06:37 2004  Tanaka Akira  <akr@m17n.org>
 
-	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
+	* configure.in: AC_CHECK_SIZEOF(rlim_t) to include stdio.h to fix
+	  problem with autoconf 2.52 or earlier.
+	  revert AC_PREREQ to 2.50.
+	  [ruby-core:3809]
 
 Thu Nov 25 07:59:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* configure.in: AC_PREREQ(2.53) [ruby-core:03800]
+
 	* io.c (read_all): stringify non-nil buffer argument, and always
 	  taint the result.  [ruby-dev:24955]
 
@@ -11057,13 +69344,12 @@ Tue Nov 23 00:10:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_seek): use NUM2OFFT().
 
-	* misc/ruby-mode.el (ruby-non-block-do-re): should not match words
-	  start with block keyword and underscore.  [ruby-core:03719]
+	* misc/ruby-mode.el (ruby-non-block-do-re): [ruby-core:03719]
 
 Mon Nov 22 22:33:02 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
-	  of variables or constants when oarsing 'require'
+	  of variables or constants when parsing 'require'
 
 Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -11073,7 +69359,7 @@ Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Sat Nov 20 23:57:33 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/README (et al): Add a new directive, :section:, and
-	  change the output format to accomodate. :section: allows to to
+	  change the output format to accommodate. :section: allows to to
 	  group together methods, attributes, constants, etc under
 	  headings in the output. If used, a table of contents is
 	  generated.
@@ -11088,9 +69374,25 @@ Sat Nov 20 23:55:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_splice): should place index wrapping after
 	  possible modification.  [ruby-dev:24940]
 
-Sat Nov 20 13:26:03 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Nov 20 23:25:12 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* io.c (rb_io_getline): f.gets("") did not work. [ruby-core:03771]
 
-	* ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
+	* test/ruby/test_io.rb (test_gets_rs): test it.
+
+Sat Nov 20 22:55:09 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/runner.rb (CROSS_COMPILING): need to require rbconfig.rb before
+	  using CROSS_COMPILNG.
+
+Sat Nov 20 20:42:42 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/depend: fix ripper.o dependency.
+
+Sat Nov 20 17:48:29 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (io_reopen): work around problem with Cygwin fseeko
+	  returning ESPIPE.
 
 Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
 
@@ -11098,6 +69400,11 @@ Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/test.rb: add test for mime encode/decode
 
+Sat Nov 20 01:45:04 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/xmlrpc/test_webrick_server.rb: move `requrie "webrick/https"'
+	  into #setup_http_server method to avoid soap test errors.
+
 Sat Nov 20 01:37:34 2004  Johan Holmberg  <holmberg@iar.se>
 
 	* eval.c (error_print): nicer traceback at interrupt.
@@ -11108,6 +69415,66 @@ Sat Nov 20 00:07:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (str_gsub): internal buffer should not be listed by
 	  ObjectSpace.each_object() by String#gsub.  [ruby-dev:24931]
 
+Fri Nov 19 22:44:43 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb: better support for -p/-x option.
+
+Fri Nov 19 17:46:56 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Image#have_required_values):
+	  changed /rss/channel/image to be optional. [ruby-Bugs:1047]
+
+	* test/rss/test_maker_0.9.rb: added tests for the above.
+
+Fri Nov 19 17:18:17 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.0 -> 0.1.1.
+
+	* lib/rss: #to_s used #tag.
+
+	* test/rss/test_to_s.rb: added.
+
+	* lib/rss/maker.rb (RSS::Maker.make): changed API. It's not
+	  received modules which is used as the second argument.
+
+	* lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#alternate):
+	  changed return value type which is not String but Boolean.
+
+	* lib/rss/2.0.rb (RSS::Rss::Channel#ttl): changed return value
+	  type which is not String but Integer.
+
+	* lib/rss/0.9.rb (RSS::Rss::Channel): <skipDays> has <day>s and
+	  <skipHours> has <hour>s.
+
+	* lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Channel): ditto.
+
+	* lib/rss/0.9.rb (RSS::Rss::Channel::Item): <item> has <category>s.
+
+	* lib/rss/maker/2.0.rb (RSS::Maker::Rss20::Channel::Item): ditto.
+
+	* lib/rss/2.0.rb (RSS::Rss::Channel): <channel> has <category>s.
+
+	* lib/rss/maker/2.0.rb (RSS::Maker::RSS20::Channel): ditto.
+
+	* lib/rss/trackback.rb: parent element has <trackback:about>s.
+
+	* lib/rss/maker/trackback.rb: ditto.
+
+Fri Nov 19 11:10:16 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb: add support for directory name
+	  with -p/-x options.
+
+	* test/testunit/collector/test_dir.rb: ditto.
+
+	* lib/xmlrpc/datetime.rb (XMLRPC::DateTime#==): should use Array()
+	  instead of to_a.
+
+Fri Nov 19 10:32:36 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_s_set_completion_append_character):
+	  accept nil.  [ruby-core:03765]
+
 Fri Nov 19 01:20:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
@@ -11119,12 +69486,37 @@ Fri Nov 19 00:59:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (str_gsub): internal buffer should not be listed by
 	  ObjectSpace.each_object().  [ruby-dev:24919]
 
+Thu Nov 18 23:42:36 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/depend: Never regenerate lib/ripper/core.rb
+	  automatically. [ruby-dev:24911]
+
+Thu Nov 18 20:47:24 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
+	  isatty because it never sets errno.
+
 Thu Nov 18 18:41:08 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* test/ruby/test_stringchar.rb (test_bang): added.
 
 	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang)
-	  (rb_str_swapcase_bang): missing rb_str_modify().  [ruby-dev:24915]
+	  (rb_str_swapcase_bang): missing rb_str_modify().
+
+Thu Nov 18 17:05:01 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_rest_arg): store rest args into invisible local variable
+	  in order to get rid of SEGV at ZSUPER.  [ruby-dev:24913]
+
+Thu Nov 18 15:39:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_f_getenv): prohibit for $SAFE=4. [ruby-dev:24908]
+
+Thu Nov 18 14:58:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c: check $SAFE.
+
+	* test/readline/test_readline.rb: added tests for readline.
 
 Thu Nov 18 00:21:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -11145,10 +69537,15 @@ Thu Nov 18 10:10:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_initialize): allow Fixnum as mode as
 	  well as IO.new does.  [ruby-dev:24896]
 
-Wed Nov 17 23:42:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Nov 17 23:47:30 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/ruby/test_settracefunc.rb: added.  [ruby-dev:24884]
 
+Wed Nov 17 18:59:16 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* process.c (proc_getrlimit, proc_setrlimit): add rb_secure(2) to
+	  methods of Process.{getrlimit,setrlimit}
+
 Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (newline_node): should not use FL_SET. [ruby-dev:24874]
@@ -11158,28 +69555,65 @@ Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* node.h (NODE_NEWLINE): remove unused bit to utilize flag field
 	  in nodes.
 
-Wed Nov 17 13:09:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Nov 17 13:05:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (rb_push_glob): fix overrun.  [ruby-dev:24886]
 
-	* {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
-	  before running test. [ruby-core:03756]
+Wed Nov 17 11:48:17 2004  Michael Neumann  <mneumann@ruby-lang.org>
 
-Wed Nov 17 04:33:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/xmlrpc/parser.rb, test/xmlrpc/test_features.rb: fixed "assigning
+	  to constants" warnings
 
-	* pack.c: all features are backport from 1.9. [ruby-dev:24826]
+Wed Nov 17 09:38:18 2004  Johan Holmberg  <holmberg@iar.se>
 
-	* bignum.c (rb_big2ulong_pack): new function to pack Bignums.
+	* re.c (rb_reg_initialize_m): should raise exception instead of
+	  compile error.  [ruby-core:03755]
 
 Wed Nov 17 03:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_splice): move rb_str_modify() after
 	  StringValue(), which may alter the receiver.  [ruby-dev:24878]
 
+	* error.c (rb_error_frozen): now raise RuntimeError instead of
+	  TypeError.
+
+Tue Nov 16 21:22:47 2004  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* lib/xmlrpc/server.rb (CGIServer): fixed bug when client sends
+	  "Content-typ: text/xml; ..."
+
 Tue Nov 16 23:45:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (flo_divmod): protect float values from GC by
 	  assignment to local variables.  [ruby-dev:24873]
 
-Tue Nov 16 16:30:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 16 14:31:54 2004  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* test/xmlrpc/*: imported and refactored original test cases.
+
+	* test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
+	  added test case that starts up a WEBrick XML-RPC server and performs
+	  some tests on it (both http and https servers are started).
+
+	* lib/xmlrpc/create.rb (XMLWriter::each_installed_writer),
+	  lib/xmlrpc/parser.rb (XMLParser::each_installed_parser):
+	  added methods to simply original test cases
+
+	* lib/xmlrpc/parser.rb, lib/xmlrpc/datetime.rb: applied patch by
+	  MoonWolf <moonwolf@moonwolf.com> to allow parsing datetime.iso8601
+	  (e.g. 20041105T01:15:23Z).
+
+	* lib/xmlrpc/server.rb: fixed issue #998
+	  (http://rubyforge.org/tracker/?func=detail&atid=1700&aid=998&group_id=426)
+
+	* lib/xmlrpc/create.rb, lib/xmlrpc/utils.rb: when marshalling/loading
+	  user-defined data structures, use Class#allocate instead of defining
+	  an empty #initialize method. module XMLRPC::Marshallable is now only
+	  used for tagging.
+
+	* lib/xmlrpc/.document, lib/xmlrpc/README.rdoc: added howto
+
+Tue Nov 16 16:26:12 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
 	  config.status to force updating them.
@@ -11189,6 +69623,15 @@ Tue Nov 16 16:20:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_read): position was ignored when a
 	  buffer was passed.  http://www.yo.rim.or.jp/~nov/d/?date=20041116#p03
 
+Tue Nov 16 13:35:54 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): add
+	  new option --exclude (-x) to skip some tests. [ruby-core:3363],
+	  [ruby-dev:24865]
+
+	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir.exclude):
+	  ditto.
+
 Tue Nov 16 11:19:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): use
@@ -11202,32 +69645,72 @@ Tue Nov 16 01:41:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* array.c (rb_ary_update): pedantic check to detect
 	  rb_ary_to_ary() to modify the receiver.  [ruby-dev:24861]
 
-Mon Nov 15 13:50:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Nov 15 18:58:05 2004  Tanaka Akira  <akr@m17n.org>
 
-	* string.c (rb_str_justify): typo fixed.  [ruby-dev:24851]
+	* configure.in: check rlim_t more portably. [ruby-core:3735]
 
 Mon Nov 15 11:50:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
 	  operator symbols.  [ruby-talk:120177]
 
+Mon Nov 15 08:58:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_Proc): make proc as an alias to Proc.new.
+	  [ruby-dev:24848]
+
+Mon Nov 15 00:46:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): lambda{}.call(1) should raise exception.
+	  [ruby-talk:120253]
+
+Mon Nov 15 00:33:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_clear): avoid revealing NULL pointer.
+	  [ruby-dev:24766]
+
+	* string.c (str_gsub): add paranoid check. [ruby-dev:24827]
+
+	* string.c (str_mod_check): check frozen status as well.
+	  [ruby-dev:24801]
+
+Sun Nov 14 18:59:03 2004  Tanaka Akira  <akr@m17n.org>
+
+	* process.c (proc_getrlimit): new function for Process.getrlimit.
+	  (proc_setrlimit): new function for Process.setrlimit.
+	  [ruby-dev:24834]
+
+	* configure.in: check rlim_t and its size.  check setrlimit.
+
+	* ruby.h (NUM2ULL): new macro.
+
 Sun Nov 14 13:27:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/pp.rb (PP#object_address_group): remove odd number of 'f'
 	  prefixed to negative address.
 
-Sun Nov 14 08:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Nov 14 10:48:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Integer::gcd2): faster implementation by
+	  <erlercw@siu.edu>. [ruby-talk:120232]
+
+Sun Nov 14 08:46:33 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/logger/test_logger.rb: Logger just expects
 	  Logger#datetime_format to be used for Time#strftime independently of
 	  locale. [ruby-dev:24828]
 
-Fri Nov 12 15:03:26 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 12 17:32:07 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bcc32/README.bcc32, win32/README.win32: need bison instead of
+	  byacc.
+
+Fri Nov 12 15:15:06 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* eval.c (ruby_options): now we cannot call rb_glob() before
 	  ruby_init(), so call rb_w32_cmdvector() at ruby_options().
 
-	* win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
+	* win32/win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
 	  export it.
 
 Fri Nov 12 14:08:01 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -11241,21 +69724,15 @@ Fri Nov 12 00:31:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/gdbm/gdbm.c (fgdbm_store): StringValue() may alter string
 	  pointer.  [ruby-dev:24783]
 
-Thu Nov 11 17:36:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov 11 17:58:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* dir.c (rb_globi): also should call back via rb_glob_caller().
-	  [ruby-dev:24775]
+	* dir.c (rb_glob): should have called rb_glob_caller().
+	  [ruby-dev:24773]
 
-Thu Nov 11 16:47:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov 11 16:56:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
-	  only File#truncate, not behaviour of seek(2).
-
-Thu Nov 11 09:41:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (push_braces): was confusing VALUE and char*.
-
-	* dir.c (rb_push_glob): Dir.glob should have called its block.
+	  only File#truncate, not behavior of seek(2).
 
 Thu Nov 11 01:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -11269,6 +69746,10 @@ Wed Nov 10 22:49:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (DelegateClass::dup): ditto.
 
+Wed Nov 10 19:47:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): path is a string object now.
+
 Wed Nov 10 12:31:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* README.EXT (Example): extconf.rb is indispensable now.
@@ -11280,10 +69761,22 @@ Wed Nov 10 03:33:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/tile/style.rb: bug fix
 
+Tue Nov  9 22:24:07 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf: original nkf.c rev:1.38
+
+	* ext/nkf/nkf.c: fix bug: can't parse long-name options
+
+	* ext/nkf/test.rb: fix bug: mime tests fail
+
 Tue Nov  9 14:27:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
 
+Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
+
 Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (rb_glob2): do not allocate buffer from heap to avoid
@@ -11297,15 +69790,7 @@ Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (fnmatch): p or s may be NULL.  [ruby-dev:24749]
 
-Tue Nov  9 00:53:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* regex.c (slow_match): avoid GCC 3.4.x warnings.
-
-Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
-
-Mon Nov  8 23:38:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Nov  9 00:36:26 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
 	  [ruby-dev:24743]
@@ -11318,7 +69803,7 @@ Mon Nov  8 22:20:19 2004  Dave Thomas  <dave@pragprog.com>
 
 Mon Nov  8 00:14:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* configure.in: add setup for mignw32 cross compiling.
+	* configure.in: add setup for mingw32 cross compiling.
 	  [ruby-talk:119413]
 
 Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -11336,13 +69821,14 @@ Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib: ditto.
 
-Sat Nov  6 14:58:44 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Nov  6 20:40:16 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: rename WIN32OLE#ole_obj_help to
+	  WIN32OLE#ole_type. alias ole_obj_help to ole_type.
 
-	* lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
-	  :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
-	  ruby 1.9 feature)
+	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
 
-Sat Nov  6 11:31:04 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Nov  6 11:18:59 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb (_parse): checks whether zone was given.
 
@@ -11351,6 +69837,10 @@ Sat Nov  6 00:46:27 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
 	  locking.  [ruby-dev:24727]
 
+Fri Nov  5 19:07:16 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf: follow CVS Head of original nkf.
+
 Fri Nov  5 18:12:42 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into
@@ -11377,23 +69867,43 @@ Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (gc_mark): stricter GC stack check.
 
-Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark): stricter GC stack check.
-
 Fri Nov  5 08:34:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
 	  [ruby-dev:24708]
 
+	* ext/socket/socket.c (s_recvfrom): buffer modification check.
+	  [ruby-dev:24708]
+
+Thu Nov  4 23:54:21 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regexec.c, regparse.c, regint.h: fixed conflicts between
+	  vendor branch.
+
+Thu Nov  4 23:41:55 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c,
+	  regenc.c, regenc.h, regerror.c, regexec.c, reggnu.c,
+	  regint.h, regparse.c, regparse.h, sjis.c, utf8.c:
+	  imported Oni Guruma 3.4.0.
+
+	* parse.y, re.c: Now mbclen() takes unsigned char as
+	  its argument.
+
 Thu Nov  4 21:25:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): string modify check no longer based on
 	  tmplock.  [ruby-dev:24706]
 
-Thu Nov  4 19:27:46 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov  4 21:13:48 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(typelib_file_from_typelib): search "win16"
+	  entry to get library path.
 
-	* io.c (rb_f_open): fix typo.
+	* ext/win32ole/win32ole.c(oletypelib_path): ditto.
+
+	* ext/win32ole/win32ole.c(ole_typedesc2val): add VT_LPWSTR, VT_LPSTR,
+	  VT_ERROR case.
 
 Thu Nov  4 15:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -11411,10 +69921,6 @@ Thu Nov  4 03:11:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
 	  [ruby-dev:24705]
 
-Wed Nov  3 22:32:12 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c: On NetBSD don't use setruid() and setrgid().
-
 Wed Nov  3 22:24:17 2004  Daigo Moriwaki  <techml@sgtpepper.net>
 
 	* lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
@@ -11429,11 +69935,7 @@ Wed Nov  3 17:19:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_or): ditto.
 
-Wed Nov  3 17:13:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* io.c (pipe_open): fix compile error
-
-Wed Nov  3 16:58:07 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Nov  3 17:02:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: support to use different Tcl commands between
 	  configure and configinfo
@@ -11449,33 +69951,55 @@ Wed Nov  3 16:58:07 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib: some bug fixes (see ext/tk/ChangeLog.tkextlib)
 
-Wed Nov  3 16:30:41 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Nov  3 15:38:28 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/nkf: follow nkf 2.0.4
+	* test/rss/*.rb: removed tab width configuration headers.
 
-Wed Nov  3 15:53:34 2004  Kouhei Sutou  <kou@cozmixng.org>
+	* test/rss/test_maker_{0.9,1.0}.rb: sort -> do_sort.
 
-	* test/rss/test_maker_*.rb: added tests for RSS Maker.
+	* lib/rss/maker/*.rb: changed API to RSS version independence.
+
+	* lib/rss/maker/base.rb
+	  (RSS::Maker::XMLStyleSheets::XMLStyleSheet): checked required
+	  (pseudo) attributes.
+
+	* lib/rss/maker/base.rb (RSS::Maker::Items): sort -> do_sort.
 
-	* lib/rss/maker.rb: added RSS Maker.
+	* lib/rss/rss.rb (RSS::BaseModel.install_date_element): avoided
+	  warning.
 
-	* lib/rss/maker/*.rb: ditto.
+	* lib/rss/0.9.rb (RSS::Rss#textinput): added convenience method.
 
 Tue Nov  2 16:35:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/enumerator/enumerator.c (each_cons_i): pass copy of an
 	  internal consequent array.  [ruby-talk:118691]
 
-Tue Nov  2 16:05:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov  2 14:54:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* process.c (rb_f_fork): need to flush stdout and stderr before
-	  fork(2).  [ruby-talk:117715]
+	* io.c (pipe_open): need to set cmd if argc == 0 (win32).
 
 Tue Nov  2 01:20:09 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* io.c (pipe_open): IO.popen should take array as 1st argument for
+	  a command line.  [ruby-dev:24678]
+
 	* eval.c (proc_invoke): nail down dyna_var node when Proc object
 	  or continuation is created.  [ruby-dev:24671]
 
+	* io.c (rb_io_s_popen): do not expand argv array.  [ruby-dev:24670]
+
+Mon Nov  1 22:25:56 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb: changed xml-stylesheet's API of RSS Maker
+	  like to item's one.
+
+	* lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#guess_type): fixed
+	  regular expression bug.
+
+	* test/rss/test_maker_xml-stylesheet.rb: updated tests for
+	  xml-stylesheet.
+
 Mon Nov  1 13:59:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
@@ -11487,15 +70011,29 @@ Mon Nov  1 13:59:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* README.EXT, README.EXT.ja: remove MANIFEST stuff.
 
-Mon Nov  1 01:14:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Nov  1 11:52:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* io.c (rb_f_open): create copy of popen specifier.  [ruby-dev:24656]
+	* io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662]
+
+Mon Nov  1 11:46:19 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Nov  1 00:36:48 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* process.c (rb_f_exec): should check whether prog is NULL.
 
-	* main.c (_stklen): move to gc.c.
+Mon Nov  1 09:37:19 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-Sun Oct 31 00:22:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rss/maker.rb: added entry point of RSS Maker.
+
+Mon Nov  1 03:14:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_get_method_body): store ICLASS in the cache.
+	  [ruby-core:03672]
+
+	* eval.c (rb_provided): should return true for loading library
+	  too for autoloading.  [ruby-core:03655]
+
+Mon Nov  1 01:14:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_open): create copy of popen specifier.  [ruby-dev:24656]
 
 	* string.c (rb_str_locktmp): lock string temporarily.
 
@@ -11508,15 +70046,54 @@ Sun Oct 31 00:22:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (read_all): ditto.
 
+Sun Oct 31 23:37:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c: on NetBSD don't use setruid() and setrgid().
+
+Sun Oct 31 23:12:10 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/*.rb: added RSS Maker.
+
+	* test/rss/test_maker_*.rb: added tests for RSS Maker.
+
+Sun Oct 31 16:58:12 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE.codepage, WIN32OLE.codepage=.
+
+	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
+
+Sun Oct 31 14:35:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: add "\075?UTF-8?Q?" for Gmail.
+
+Sun Oct 31 14:18:56 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: emit lexer-event values to the parser
+	  (still incomplete).
+
+Sat Oct 30 15:24:41 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB class. add
+	  WIN32OLE#ole_typelib method.
+
+	* ext/win32ole/tests/testOLETYPELIB.rb: add WIN32OLE_TYPELIB class.
+
 Sat Oct 30 06:53:24 2004  Peter Vanbroekhoven  <peter.vanbroekhoven@cs.kuleuven.ac.be>
 
 	* eval.c (rb_eval): NODE_XSTR should pass copy of literal string.
 
 Sat Oct 30 00:19:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* array.c (rb_ary_update): a[n,m]=nil no longer works as element
+	  deletion.
+
 	* enum.c (enum_sort_by): protect continuation jump in.
 	  [ruby-dev:24642]
 
+	* eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
+	  NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
+	  NODE_UNDEF and NODE_ALIAS.
+
 Fri Oct 29 21:27:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_check_initialized): new function to check uninitialized
@@ -11524,6 +70101,26 @@ Fri Oct 29 21:27:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
 
+Fri Oct 29 19:05:33 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf: follow nkf2.0.
+
+Fri Oct 29 17:18:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (ripper_s_allocate): add prototype for Microsoft compiler.
+
+	* range.c (range_step, range_each): need cast.
+
+Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
+	  line after opening heredoc identifier.  [ruby-dev:24635]
+
+Fri Oct 29 11:35:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_parser_append_print, rb_parser_while_loop): body node
+	  can be empty.  [ruby-dev:24628]
+
 Fri Oct 29 10:00:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_thread_start_0): forget to free some memory chunks.
@@ -11538,32 +70135,20 @@ Thu Oct 28 08:42:02 2004  Tanaka Akira  <akr@m17n.org>
 	  (argf_read): call argf_forward with argv argument.
 	  [ruby-dev:24624]
 
-Thu Oct 28 23:32:54 2004  akira yamada  <akira@ruby-lang.org>
-
-	* ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
-	  z->input isn't nil.
-
-Thu Oct 28 23:19:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: prefer relative path.  [ruby-talk:93037]
-
-Wed Oct 27 18:49:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gc.c: prototype; rb_io_fptr_finalize() doesn't return any value
-	  at this version.
-
-Wed Oct 27 17:27:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_sweep): recover ruby_in_compile variable.
-
 Wed Oct 27 09:17:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (str_gsub): use a string object for exception safeness.
 	  [ruby-dev:24601]
 
-Tue Oct 26 23:52:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 27 07:38:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* node.h (NODE_TYPESHIFT): allow 4 more bits for line numbers.
+	  [ruby-talk:117841]
+
+	* ruby.h (FL_ABLE): nodes are not subject for flag operations.
 
-	* io.c (rb_io_getline): rs modification check should not interfere in the loop.
+	* io.c (ARGF_FORWARD): should have specified argv explicitly,
+	  since we no longer have frame->argv saved.  [ruby-dev:24602]
 
 Tue Oct 26 23:30:39 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -11585,16 +70170,6 @@ Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
 	  arguments, unless (digit)$ style used.
 
-Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
-
-	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
-	  performance.  [ruby-talk:117701]
-
-Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
-	  arguments, unless (digit)$ style used.
-
 Mon Oct 25 18:35:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* win32/win32.c (isUNCRoot): should check NUL after '.'.
@@ -11606,11 +70181,16 @@ Mon Oct 25 08:03:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (get_backtrace): ignore illegal backtrace.  [ruby-dev:24587]
 
-Sun Oct 24 00:41:09 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 24 00:40:50 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
 	  frozen shared string to avoid outside modification.  [ruby-dev:24580]
 
+Sat Oct 23 23:40:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_fptr_finalize): leave stdin/stdout/stderr open in
+	  interpreter termination.  [ruby-dev:24579]
+
 Sat Oct 23 22:18:32 2004  Guy Decoux  <ts@moulon.inra.fr>
 
 	* eval.c (frame_free): Guy Decoux solved the leak problem.
@@ -11654,6 +70234,10 @@ Thu Oct 21 19:06:15 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
 	  ensure to close @body. (http://bugs.debian.org/277520)
 
+Thu Oct 21 13:11:31 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (pipe_open): variable name "fpw" is conflicted.
+
 Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_alias): should warn on method discarding.
@@ -11662,11 +70246,21 @@ Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
 	  string buffer by clearing klass.  [ruby-dev:24548]
 
+	* parse.y (lex_getline): should not touch ruby_debug_lines if
+	  RIPPER is defined.  [ruby-dev:24547]
+
 Wed Oct 20 19:45:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]
 
-	* backport all SEGV bug fixes from CVS HEAD.  [ruby-dev:24536]
+Wed Oct 20 12:42:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline): rs modification check should not interfere
+	  in the loop.
+
+Wed Oct 20 10:31:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (lex_getline): should update ruby_debug_lines.
 
 Wed Oct 20 04:17:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -11688,13 +70282,23 @@ Wed Oct 20 01:37:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (ruby_exec): stack marking position may be higher than
 	  expected.  thanks to Guy Decoux.  [ruby-core:03527]
 
+Wed Oct 20 00:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (search_required): required name must not be changed before
+	  loading.  [ruby-dev:24492]
+
+Tue Oct 19 23:59:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_require_safe): provide the feature after loaded.
+	  [ruby-list:40085]
+
 Tue Oct 19 22:43:12 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_attr): If
 	  we come across 'attr' in a context where it isn't
 	  followed by a symbol, just issue a warning.
 
-Tue Oct 19 20:41:37 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Tue Oct 19 20:32:50 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole.c(ole_invoke): retrieve the result value when
 	  retrying the IDispatch::invoke.
@@ -11714,15 +70318,7 @@ Tue Oct 19 17:24:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/zlib/zlib.c (zstream_expand_buffer): hide internal string
 	  buffer by clearing klass.  [ruby-dev:24510]
 
-Tue Oct 19 16:12:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c: backport from CVS HEAD
-
-Tue Oct 19 08:54:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h, object.c (rb_class_inherited_p): export.
-
-Tue Oct 19 08:46:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct 19 08:47:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_upto): method result must be checked.  [ruby-dev:24504]
 
@@ -11733,60 +70329,20 @@ Mon Oct 18 23:37:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* marshal.c (r_object0): check inheritance by the internal function.
 	  [ruby-dev:24515]
 
-Mon Oct 18 15:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* range.c (range_step, range_each): need cast.
+Mon Oct 18 11:29:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
-	  line after opening heredoc identifier.  [ruby-dev:24635]
+	* io.c (rb_io_flags_mode, rb_io_mode_flags): distinguish whether file
+	  not existing is created.  [ruby-dev:24505]
 
 Mon Oct 18 07:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_truncate): discard read buffer before truncation.
 	  [ruby-dev:24197]
 
-Mon Oct 18 02:11:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Oct 18 01:56:03 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* lib/webrick/config.rb (WEBrick::Config::General): add default values:
-	  - WEBrick::Config[:DoNotReverseLookup]
-	  - WEBrick::Config[:RequestCallback] (it used as an alias of
-	    :RequestHandler in WEBrick::HTTPServer#run)
-	  - WEBrick::Config::FileHandler[:AcceptableLanguages]
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#set_filename): search files
-	  having suffix of language-name which Accept-Language header field
-	  includes if :AcceptableLanguages options is present.
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
-	  search servlet correspond to the suffix of filename.
-
-	* lib/webrick/httprequest.rb: add attributes access methods: accept,
-	  accept_charset, accept_encoding, accept_language, content_length
-	  and content_type.
-
-	* lib/webrick/httpresponse.rb: add attribute access methods:
-	  content_length, content_length=, content_type and content_type=.
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
-	  use the second suffix to detect media type. (the first suffix
-	  may be a language name.)
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_qvalues):
-	  add method to parse Accept header field. it returns an Array of
-	  values sorted by the qvalues.
-
-Mon Oct 18 02:04:11 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): new
-	  method to register virtual hosting servers.
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call
-	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
-	  is set.  [ruby-core:02357]
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#initialize):
+	  initial value of accpet-* should be array.
 
 Mon Oct 18 00:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -11800,7 +70356,7 @@ Sun Oct 17 23:03:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
 
-Sun Oct 17 13:05:04 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Oct 17 12:53:46 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
 	* ext/win32ole/win32ole.c (fole_get_methods): ditto.
@@ -11823,6 +70379,21 @@ Sat Oct 16 13:34:56 2004  Kouhei Sutou  <kou@cozmixng.org>
 	* lib/rss: supported prety print.
 	* test/rss/test_1.0.rb: added test for calculating default indent size.
 
+Sat Oct 16 10:56:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): install-rb is needed for statically
+	  linked extensions.  [ruby-dev:24491]
+
+Fri Oct 15 18:07:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509store.c
+	  (ossl_x509stctx_initialize): setup OpenSSL::X509::StoreContext with
+	  ossl_x509stctx_* functions instead of X509_STORE_CTX_*.
+	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
+	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
+
+	* test/openssl/ossl_x509store.rb: test certificate validity times.
+
 Fri Oct 15 18:04:35 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
@@ -11833,13 +70404,60 @@ Fri Oct 15 12:43:09 2004  Tanaka Akira  <akr@m17n.org>
 	* eval.c (Init_stack): make prototype declaration consistent with
 	  the definition in gc.c.
 
-Thu Oct 14 14:34:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Oct 14 13:33:59 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: added link to Tutorial.
+
+Tue Oct 12 21:22:50 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/config.rb:
+	  add WEBrick::Config::FileHandler[:AcceptableLanguages].
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#set_filename): search files
+	  having suffix of language-name which Accept-Language header field
+	  includes if :AcceptableLanguages options is present.
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
+	  search servlet correspond to the suffix of filename.
+
+	* lib/webrick/httprequest.rb: add attributes access methods: accept,
+	  accept_charset, accept_encoding, accept_language, content_length
+	  and content_type.
+
+	* lib/webrick/httpresponse.rb: add attribute access methods:
+	  content_length, content_length=, content_type and content_type=.
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
+	  use the second suffix to detect media type. (the first suffix
+	  may be a language name.)
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_qvalues):
+	  add method to parse Accept header field. it returns an Array of
+	  values sorted by the qvalues.
+
+Tue Oct 12 15:05:32 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* io.c (MODE_BINMODE, MODE_BINARY): fixed reversed condition.
 
-Thu Oct 14 13:33:59 2004  Kouhei Sutou  <kou@cozmixng.org>
+Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/rss.rb: added link to Tutorial.
+	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
+	  avoid mode string modification.  [ruby-dev:24454]
+
+	* io.c (rb_io_getline_fast): should take delim as unsigned char to
+	  distinguish EOF and '\377'.  [ruby-dev:24460]
+
+	* io.c (rb_io_getline): add check for RS modification.
+	  [ruby-dev:24461]
+
+	* enum.c (enum_sort_by): use qsort() directly instead using
+	  rb_iterate().  [ruby-dev:24462]
+
+	* enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
+	  prevent access to recycled object (via continuation for
+	  example).  [ruby-dev:24463]
 
 Mon Oct 11 13:48:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -11850,6 +70468,16 @@ Sun Oct 10 12:32:08 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Allow 'require'
 	  to be used as a variable name
 
+Sun Oct 10 02:49:14 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/lib/ripper/filter.rb: require ripper/tokenizer.
+
+	* ext/ripper/lib/ripper/filter.rb (parse): argument is optional.
+
+Sun Oct 10 02:43:13 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: \n between two comments disappeared.
+
 Sat Oct  9 21:23:37 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/converter.rb: changed to try to use Iconv for default
@@ -11862,6 +70490,19 @@ Sat Oct  9 19:50:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* io.c (rb_io_getline): should not treat char as negative value.
 	  [ruby-dev:24460]
 
+Sat Oct  9 00:25:39 2004  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_fread): rb_thread_wait_fd() was lost.
+	  [ruby-dev:24457]
+
+Fri Oct  8 21:36:56 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_traverse): return value of Dir.entries is
+	  reliable. (pass $SAFE=1)
+
+	* lib/fileutils.rb (remove_dir): return value of Dir.foreach is
+	  reliable. (pass $SAFE=1)
+
 Fri Oct  8 09:49:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_pack): pointer modification check before each
@@ -11921,7 +70562,19 @@ Wed Oct  6 09:21:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]
 
-Mon Oct  4 14:04:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct  5 09:53:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_fopen): mode string copy at the lowest level.
+
+	* io.c (rb_io_flags_mode): requires output buffer no more.  no
+	  allocation needed.
+
+	* array.c (rb_ary_index): takes a block to compare items in an
+	  array.  [ruby-talk:113069] [Ruby2]
+
+	* array.c (rb_ary_rindex): ditto.
+
+Mon Oct  4 14:03:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
 	  while GC.  [ruby-dev:24408]
@@ -11933,16 +70586,21 @@ Mon Oct  4 12:53:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/image.rb: bug fix
 
-Sun Oct  3 21:20:03 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Sun Oct  3 21:16:05 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (TEXT_REGEXP): allow 8-bit characters for the german
-	  version of Microsoft Exchange Server. (backported from HEAD)
+	  version of Microsoft Exchange Server.
 
 	* lib/net/imap.rb (RTEXT_REGEXP): ditto.
 
 	* lib/net/imap.rb (CTEXT_REGEXP): ditto.
 
-Sat Oct  2 20:34:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Oct  2 20:34:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (local_vars): moved to struct parser_params.
+	  [ruby-dev:24391]
+
+	* parser.y (stmts): remove suspicious NODE_BEGIN.  [ruby-dev:24390]
 
 	* node.h (NEW_DVAR): extra semicolon.
 
@@ -11964,9 +70622,6 @@ Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (specific_eval): defer pointer retrieval to prevent
 	  unsafe sourcefile string modification.  [ruby-dev:24382]
 
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
-
 	* string.c (rb_str_sum): wrong cast caused wrong result.
 	  [ruby-dev:24385]
 
@@ -11978,24 +70633,6 @@ Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
 
-Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
-	  avoid mode string modification.  [ruby-dev:24454]
-
-	* io.c (rb_io_getline_fast): should take delim as unsigned char to
-	  distinguish EOF and '\377'.  [ruby-dev:24460]
-
-	* io.c (rb_io_getline): add check for RS modification.
-	  [ruby-dev:24461]
-
-	* enum.c (enum_sort_by): use qsort() directly instead using
-	  rb_iterate().  [ruby-dev:24462]
-
-	* enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
-	  prevent access to recycled object (via continuation for
-	  example).  [ruby-dev:24463]
-
 Fri Oct  1 11:40:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
@@ -12040,6 +70677,18 @@ Wed Sep 29 10:58:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* enum.c (sort_by_i): internally used object must not be changed
 	  outside.  [ruby-dev:24368]
 
+Mon Sep 27 21:25:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_call0): invoke finalizers periodically.
+
+	* gc.c (gc_sweep): defer running finalizers.  [ruby-dev:24354]
+
+	* gc.c (rb_gc_finalize_deferred): run deferred finalizers.
+
+Mon Sep 27 15:01:59 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: missing ';'.
+
 Mon Sep 27 13:46:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* intern.h, struct.c (rb_struct_s_members, rb_struct_members): public
@@ -12049,9 +70698,34 @@ Mon Sep 27 13:46:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* array.c (rb_ary_delete): comparison may change the capacity.
+	  [ruby-dev:24348]
+
+	* array.c (rb_ary_fill): fill should honor length argument.
+	  [ruby-dev:24346]
+
+	* array.c (rb_ary_replace): should not use ptr from shared array.
+	  [ruby-dev:24345]
+
 	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
 	  [ruby-talk:113807]
 
+Sun Sep 26 08:05:10 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: provides {Time,Date,DateTime}#to_{time,date,datetime}.
+
+	* sample/cal.rb: uses getoptlong instead of getopts.
+
+Sat Sep 25 18:39:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (flatten): element size might change during comparison.
+	  [ruby-dev:24343]
+
+Sat Sep 25 01:52:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_s_members): wrong call of struct_members.
+	  [ruby-dev:24333]
+
 Fri Sep 24 16:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (proc_invoke): propagate DVAR_DONT_RECYCLE on termination
@@ -12059,6 +70733,11 @@ Fri Sep 24 16:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Sep 24 08:29:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* parse.y (rb_parser_append_print): should handle prelude.
+	  [llama@u01.gate0]
+
+	* parse.y (rb_parser_while_loop): ditto.
+
 	* array.c (rb_ary_subseq): original object might be modified after
 	  sharing data creation.  [ruby-dev:24327]
 
@@ -12069,6 +70748,22 @@ Fri Sep 24 08:29:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* struct.c (struct_members): always check struct size and size of
 	  members list in the class.  [ruby-dev:24320]
 
+Thu Sep 23 19:48:14 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/Makefile.dev: removed.
+
+	* ext/ripper/ripper.rb.in: moved to lib/ripper/core.rb.in.
+
+	* ext/ripper/lib/ripper/core.rb: new file.
+
+	* ext/ripper/lib/ripper/core.rb.in: new file.
+
+	* ext/ripper/tools/generate-ripper_rb.rb: change comment.
+
+	* test/ripper/*.rb: on__scan event removed.
+
+	* test/ripper/*.rb: event name is changed: on__XXX -> on_XXX.
+
 Thu Sep 23 09:29:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_sub_bang): check if string is not modified
@@ -12077,23 +70772,50 @@ Thu Sep 23 09:29:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* hash.c (rb_hash_rehash): replace st_foreach() by its deep
 	  checking counterpart.  [ruby-dev:24310]
 
+Wed Sep 22 14:21:54 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: on__scan event removed.
+
+	* parse.y [ripper]: event name is changed: on__XXX -> on_XXX.
+
+	* ext/ripper/eventids2.c: ditto.
+
+	* ext/ripper/ripper.rb.in: ditto.
+
+	* ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
+
+	* ext/ripper/lib/ripper/tokenizer: ditto.
+
+	* ext/ripper/lib/ripper/filter: new file.
+
+	* sample/ripper/colorize.rb: new file.
+
+	* sample/ripper/strip-comment.rb: new file.
+
+Wed Sep 22 13:50:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (hash_alloc): was using tbl pointer without
+	  initialization.
+
 Wed Sep 22 13:38:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* hash.c (rb_hash_rehash): add iteration check.  [ruby-dev:24301]
 
 	* st.c (st_foreach): add deep check.
 
-Wed Sep 22 13:06:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* hash.c (rb_hash_fetch): returns KeyError instead of IndexError.
 
-	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
-	  merge from HEAD.
+	* hash.c (env_fetch): ditto.
 
-Wed Sep 22 00:11:12 2004  Dave Thomas  <dave@pragprog.com>
+Wed Sep 22 13:02:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* process.c: Add documentation for fork()
+	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
 
 Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* parse.y: remove global variables ruby_eval_tree and
+	  ruby_eval_tree_begin.
+
 	* array.c (rb_ary_collect_bang): element size might change during
 	  comparison.  [ruby-dev:24300]
 
@@ -12101,13 +70823,116 @@ Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_eql): ditto. [ruby-dev:24300]
 
-Tue Sep 21 18:29:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep 22 00:11:12 2004  Dave Thomas  <dave@pragprog.com>
 
-	* array.c (rb_ary_equal): merge miss.
+	* process.c: Add documentation for fork()
+
+Tue Sep 21 18:29:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_uniq_bang): element size might change during
 	  comparison.  [ruby-dev:24298]
 
+Mon Sep 20 17:46:51 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/lib/ripper/tokenizer.rb: fix typo.
+
+Mon Sep 20 17:38:43 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ripper/test_scanner_events.rb: tokens must be reordered.
+
+	* ext/ripper/lib/ripper/tokenizer.rb: ditto.
+
+Mon Sep 20 16:58:16 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: do not delay dispatching.
+
+	* ext/ripper/lib/ripper/tokenizer.rb: sort tokens by right order.
+
+Mon Sep 20 15:17:47 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/lib/ripper/tokenizer.rb: new file.
+
+Mon Sep 20 15:13:52 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ripper/test_scanner_events.rb: test #lineno and #column.
+
+Mon Sep 20 14:50:17 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: delayed heredocument events should be
+	  dispatched after EOF.
+
+Mon Sep 20 14:39:42 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: adjust lineno and columns for multi-line
+	  strings.
+
+	* parse.y [ripper]: delay heredocument events until seeing
+	  end-of-line.
+
+	* parse.y [ripper]: event on__heredoc_contentn ->
+	  on__tstring_content.
+
+	* ext/ripper/eventids2.c: ditto.
+
+	* ext/ripper/lib/ripper.rb: sync with eventids2.c.
+
+	* test/ripper/test_scanner_events.rb: test it.
+
+	* ext/ripper/tools/generate-ripper_rb.rb: show basename of input.
+
+	* ext/ripper/Makefile.dev: support objdir build.
+
+Mon Sep 20 13:22:55 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: remove Ripper#pos.
+
+	* parse.y [ripper]: Ripper#column should return the column of the
+	  current token.
+
+Mon Sep 20 12:02:41 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: unify old_lex_p and token_head.
+
+	* test/ripper/test_scanner_events.rb: now \r\n is saved correctly.
+
+	* parse.y: new macro lex_goto_eol() for next change.
+
+Mon Sep 20 11:01:55 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: adjust line number for heredoc.  [ruby-dev:24272]
+
+Mon Sep 20 04:49:22 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/ripper.rb.in: new const Ripper::PARSER_EVENT_TABLE.
+
+	* ext/ripper/ripper.rb.in: new const Ripper::SCANNER_EVENT_TABLE.
+
+	* ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
+
+Mon Sep 20 04:13:00 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ripper/test_scanner_events.rb: test spaces before heredoc
+	  mark.
+
+Mon Sep 20 03:46:54 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: spaces before heredoc marker was lost.
+	  [ruby-dev:24272]
+
+	* keywords: rb_reserved_word() should be defined only in ruby
+	  core.  [ruby-dev:24272]
+
+	* lex.c: sync with keywords.
+
+	* ext/ripper/ripper.rb.in (parse): fix typo.
+
+	* ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
+
+Mon Sep 20 03:37:59 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/zlib/zlib.c (gzfile_read_raw): call readpartial at first.
+	  (Zlib::GzipReader#readpartial): new method.
+
 Mon Sep 20 00:24:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* enum.c (enum_sort_by): do not use qsort directly.  use
@@ -12149,15 +70974,23 @@ Sat Sep 18 14:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  direcotry or within block.  thanks to Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:03446]
 
-Fri Sep 17 20:20:27 2004  Minero Aoki  <aamine@loveruby.net>
+Fri Sep 17 20:29:33 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y: add prototypes for Microsoft compiler.
+
+	* ext/ripper/depend (parse.obj): lex.c exists at hdrdir.
 
-	* lib/fileutils.rb (mkdir_p): backport from CVS HEAD 1.45. [ruby-core:03420]
+	* {bcc32,win32,wince}/Makefile.sub (YACC, YFLAGS, parse.c):
+	  use bison.
 
 Fri Sep 17 17:11:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_delete): element comparison might change array
 	  size. [ruby-dev:24273]
 
+	* parse.y: make ruby parser reentrant. merge ripper parser to the
+	  real one.  this change makes ruby require bison.
+
 	* file.c (rb_file_truncate): clear stdio buffer before truncating
 	  the file.  [ruby-dev:24191]
 
@@ -12185,7 +71018,7 @@ Fri Sep 17 15:01:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkoptdb-safeTk.rb: ditto
 
-Thu Sep 16 18:12:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Sep 16 18:12:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
 	  to request.user attribute.
@@ -12214,6 +71047,44 @@ Tue Sep 14 23:45:44 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::TextFormatter.for):
 	  Add Eric Hodel's simpleformatter.
 
+Tue Sep 14 22:11:08 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: Add rdoc.
+
+Tue Sep 14 20:24:49 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: space event is on__sp, not on__lwsp.
+	  [ruby-dev:24257]
+
+	* ext/ripper/eventids2.c: ditto.
+
+	* ext/ripper/lib/ripper.rb: ditto.
+
+	* ext/ripper/depend (ripper.o): No action is needed.
+	  [ruby-dev:24260]
+
+	* ext/ripper/depend: Borland make does not accept pipes in
+	  Makefile rules. [ruby-dev:24589]
+
+	* ext/ripper/depend: separate rules for developpers.
+
+	* ext/ripper/Makefile.dev: new file.
+
+	* ext/ripper/MANIFEST: add Makefile.dev.
+
+	* ext/ripper/tools/generate-eventids1.rb: read from file, not
+	  stdin.
+
+	* ext/ripper/extconf.rb: clean ripper.E.
+
+	* ext/ripper/tools/generate-ripper_rb.rb: #include ids1/ids2
+	  function was lost.
+
+	* ext/ripper/tools/generate-ripper_rb.rb: SCANNER_EVENTS wrongly
+	  contained parser events.
+
+	* ext/ripper/lib/ripper.rb: ditto.
+
 Tue Sep 14 16:59:37 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: fix SEGV
@@ -12224,9 +71095,21 @@ Tue Sep 14 16:59:37 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/safe-tk.rb: new sample script
 
-Tue Sep 14 00:15:15 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Mon Sep 13 21:33:40 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/zlib/zlib.c: backported from HEAD.
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
+	  second argument to specify the output format (see also
+	   X509_NAME_print_ex).
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
+	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
+	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
+	  new module to provide the parse for RFC2253 DN format.
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
+	  new method to parse RFC2253 DN format.
 
 Mon Sep 13 19:16:33 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
@@ -12237,10 +71120,92 @@ Mon Sep 13 16:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_master and new_slave accept
 	  safe-level value argument
 
-Mon Sep 13 10:20:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Sep 13 10:48:37 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_getpid): don't need to use _getpid() on
+	  mswin32 and mingw32.
+
+Mon Sep 13 10:22:05 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* object.c (nil_inspect): fix typo.
 
+Mon Sep 13 09:29:58 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/depend: (nmake hack) prepend "./" to ripper.c to
+	  avoid {$(srcdir)}.
+
+Mon Sep 13 06:43:42 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper/tools/list-parse-event-ids.rb: does not use getopts.
+
+	* ext/ripper/tools/list-scan-event-ids.rb: ditto.
+
+Mon Sep 13 02:42:28 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/Setup: add ripper.
+
+	* ext/Setup.atheos: ditto.
+
+	* ext/Setup.dj: ditto.
+
+	* ext/Setup.emx: ditto.
+
+	* ext/Setup.nt: ditto.
+
+	* ext/Setup.x68: ditto.
+
+Mon Sep 13 02:26:31 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/ripper: ripper extension added.
+
+	* ext/ripper/MANIFEST: new file.
+
+	* ext/ripper/README: new file.
+
+	* ext/ripper/depend: new file.
+
+	* ext/ripper/extconf.rb: new file.
+
+	* ext/ripper/eventids2.c: new file.
+
+	* ext/ripper/ripper.rb.in: new file.
+
+	* ext/ripper/lib/ripper.rb: new file.
+
+	* ext/ripper/test/check-event-arity.rb: new file.
+
+	* ext/ripper/test/check-event-coverage.sh: new file.
+
+	* ext/ripper/test/check-scanner-event-coverage.rb: new file.
+
+	* ext/ripper/test/list-called-events.rb: new file.
+
+	* ext/ripper/test/src_rb: new file.
+
+	* ext/ripper/test/validate.rb: new file.
+
+	* ext/ripper/tools/generate-eventids1.rb: new file.
+
+	* ext/ripper/tools/generate-param-macros.rb: new file.
+
+	* ext/ripper/tools/generate-ripper_rb.rb: new file.
+
+	* ext/ripper/tools/list-parse-event-ids.rb: new file.
+
+	* ext/ripper/tools/list-scan-event-ids.rb: new file.
+
+	* ext/ripper/tools/preproc.rb: new file.
+
+	* ext/ripper/tools/strip.rb: new file.
+
+	* test/ripper: ripper tests added.
+
+	* test/ripper/dummyparser.rb: new file.
+
+	* test/ripper/test_parser_events.rb: new file.
+
+	* test/ripper/test_scanner_events.rb: new file.
+
 Mon Sep 13 01:03:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: improve control of preserv/release tcltkip
@@ -12249,7 +71214,19 @@ Mon Sep 13 01:03:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tkutil.c: fix(?) SEGV
 
-Sun Sep 12 23:46:23 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Sep 13 00:22:53 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: fix file header.
+
+Mon Sep 13 00:20:39 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: ripper merged.
+
+	* lex.c: ditto.
+
+	* keywords: ditto.
+
+Sun Sep 12 23:53:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
 	  returns NULL.)
@@ -12261,7 +71238,6 @@ Sun Sep 12 02:41:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and
 	  allow_ruby_exit=
 
-
 	* ext/tk/lib/multi-tk.rb: ditto.
 
 	* ext/tk/lib/remote-tk.rb: ditto.
@@ -12282,11 +71258,25 @@ Sat Sep 11 16:09:46 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging.
 
-Fri Sep 10 20:20:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Sep 10 20:18:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
 	  pointer conversion.
 
+Fri Sep 10 19:16:24 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: bccwin32 port starts to use RTL dll.
+	  (need to rebuild all) [ruby-dev:24138]
+
+	* win32/win32.{h,c}: ditto.
+
+Fri Sep 10 15:55:59 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir_p): should pass mode argument to
+	  Dir.mkdir. [ruby-dev:24242]
+
+	* test/fileutils/test_fileutils.rb: test it.
+
 Fri Sep 10 02:43:54 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/kilmer.rb: James Buck's
@@ -12328,9 +71318,16 @@ Tue Sep  7 15:17:49 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/socket/socket.c (ruby_connect): break immediately if a
 	  socket is non-blocking.  [ruby-talk:111654]
 
-Mon Sep  6 11:08:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep  7 12:48:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
+	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
+
+	* win32/win32.[ch] (fcntl): ditto.
+
+	* win32/win32.c (rb_w32_connect): support nonblocking mode.
+
+	* ext/socket/socket.c (wait_connectable, ruby_connect): support
+	  nonblocking connect on various platforms.
 
 Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -12338,9 +71335,13 @@ Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  exception occurred within a block.  a patch was given from Johan
 	  Holmberg <holmberg at iar.se>.  [ruby-core:03292]
 
+Mon Sep  6 10:57:40 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
+
 Mon Sep  6 07:51:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (cvar_cbase): singletons should refer outer cvar scope.
+	* eval.c (cvar_cbase): singletons should refer to outer cvar scope.
 	  [ruby-dev:24223]
 
 	* eval.c (rb_load): should preserve previous ruby_wrapper value.
@@ -12371,18 +71372,20 @@ Fri Sep  3 02:12:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Fri Sep  3 01:54:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* ext/extmk.rb (extmake): extact target prefix from Makefiles.
+
 	* ext/extmk.rb: already built-in libraries satisfy dependencies.
 	  [ruby-dev:24028]
 
-Thu Sep  2 11:36:20 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Sep  1 21:16:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* eval.c (rb_obj_instance_eval): backported from HEAD.
+	* ext/tk/lib/tk/spinbox.rb: fix typo
 
-Wed Sep  1 21:18:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Sep  1 19:28:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk/spinbox.rb: fix typo
+	* process.c (rb_proc_exec): label cannot precede variable declarations.
 
-Tue Aug 31 18:24:04 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Aug 31 18:20:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/tkutil.c (cbsubst_init): fix memory leak
 
@@ -12397,6 +71400,10 @@ Tue Aug 31 12:30:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (del_root): fix SEGV
 
+Mon Aug 30 21:50:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* object.c: Add RDoc for Module.included.
+
 Mon Aug 30 23:11:06 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
@@ -12406,19 +71413,10 @@ Mon Aug 30 22:40:30 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments
 
-Mon Aug 30 21:50:14 2004  Dave Thomas  <dave@pragprog.com>
-
-	* object.c: Add RDoc for Module.included.
-
 Mon Aug 30 15:10:46 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
 
-Mon Aug 30 11:29:35 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143]
-	  merge from HEAD.
-
 Sun Aug 29 14:08:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
@@ -12430,27 +71428,49 @@ Sat Aug 28 23:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* bignum.c (rb_big_and): protect parameters from GC.
 	  [ruby-talk:110664]
 
+Fri Aug 27 12:13:50 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/stringio/stringio.c (Init_stringio): add StringIO#readpartial as
+	  an alias for StringIO#sysread.
+
+Fri Aug 27 10:14:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_proc_exec): strip trailing spaces.  [ruby-dev:24143]
+
+	* win32/win32.c (CreateChild): ditto.
+
 Thu Aug 26 04:38:29 2004  Dave Thomas  <dave@pragprog.com>
 
 	* eval.c (return_jump): Minor typo in error message. Now reads
 	  "return can't jump across threads".
 
-Tue Aug 24 17:30:00 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Aug 25 15:18:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp): Exception#to_str is no longer defined.
+
+Wed Aug 25 11:39:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (exc_equal): exceptions are equal if they share same
+	  class, message and backtrace. [ruby-talk:110354]
+
+	* error.c (name_err_mesg_equal): ditto.
+
+Tue Aug 24 16:41:48 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
-	  use a session id as a filename. (backported from HEAD)
+	  use a session id as a filename.
 
 	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
 
 	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
-	  Dir::tmpdir. (backported from HEAD)
+	  Dir::tmpdir.
 
-Tue Aug 24 14:40:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Aug 24 14:32:17 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
-	  session id after check. (backported from HEAD)
+	  session id after check.
 
-Tue Aug 24 09:09:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Aug 24 08:57:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
 	  functions may replace the pointer indicated by the first argument.
@@ -12459,7 +71479,12 @@ Tue Aug 24 09:09:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
 
-Mon Aug 23 14:04:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Aug 23 12:43:32 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/resolv.rb (Config.default_config_hash): when multiple domains
+	  are set, Win32::Resolv.get_resolv_info returns Array.
+
+Sun Aug 22 16:27:38 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c (ossl_ssl_read):
 	  - should return an empty string if specified length to read is 0.
@@ -12475,12 +71500,7 @@ Mon Aug 23 14:04:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/buffering.rb: should not use select.
 
-Mon Aug 23 12:40:56 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/resolv.rb (Config.default_config_hash): when multiple domains
-	  are set, Win32::Resolv.get_resolv_info returns Array.
-
-Sun Aug 22 01:15:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Aug 22 01:10:36 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
 	  should call :ProxyContentHandler before finishing CONNECT.
@@ -12492,6 +71512,15 @@ Sat Aug 21 06:41:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
 	  uniformly.  [ruby-dev:24118]
 
+Fri Aug 20 14:49:42 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_check_writable): no need to check read buffer if
+	  already changed to write mode.
+
+Fri Aug 20 11:46:43 2004  UENO Katsuhiro  <katsu@blue.sky.or.jp>
+
+	* ext/zlib/zlib.c: GzipReader#ungetc caused crc error.
+
 Thu Aug 19 16:29:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
@@ -12505,17 +71534,15 @@ Thu Aug 19 15:15:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* dir.c (free_dir): fix memory leak.  reported by yamamoto
 	  madoka.
 
-Thu Aug 19 11:00:00 2004  Akiyoshi, Masamichi  <masamichi.akiyoshi@hp.com>
+Thu Aug 19 09:19:27 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* dln.c (dln_load): Modify to call lib$find_image_symbol for VMS.
-	* io.c (rb_io_fwrite): Use fputc() for VMS non-stream file.
+	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
+	  library for SH* functions on mswin32 and mingw32.
 
-Thu Aug 19 06:07:45 2004  why the lucky stiff  <why@ruby-lang.org>
+	* wince/Makefile.sub (LIBS): need to link ceshell library for SH*
+	  functions on mswince.
 
-	* ext/syck/token.c: re2c no longer compiled with bit vectors.  caused
-	  problems for non-ascii characters. [ruby-core:03280]
-	* ext/syck/implicit.c: ditto.
-	* ext/syck/bytecode.c: ditto.
+Thu Aug 19 03:07:00 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
 	  fixed problem with extra line feeds at end of folding, whitespace
@@ -12524,9 +71551,9 @@ Thu Aug 19 06:07:45 2004  why the lucky stiff  <why@ruby-lang.org>
 	* lib/yaml/rubytypes.rb: subtelties in handling strings with
 	  non-printable characters and odd whitespace patterns.
 
-Wed Aug 18 23:41:33 2004  Minero Aoki  <aamine@loveruby.net>
+Wed Aug 18 23:44:20 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
+	* lib/net/protocol.rb (rbuf_fill): OpenSSL::SSLSocket has its own
 	  buffer, select(2) might not work. [ruby-dev:24072]
 
 Wed Aug 18 17:10:12 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
@@ -12539,6 +71566,17 @@ Wed Aug 18 12:52:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_obj_instance_eval): evaluates under special singleton
 	  classes as for special constants.
 
+Wed Aug 18 11:22:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_env): initialize HOME and USER environment
+	  variables unless set.
+
+Wed Aug 18 10:17:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (bind_eval): new method. [RCR 251]
+
+	* string.c (rb_str_clear): new method. [ruby-dev:24104]
+
 Tue Aug 17 17:20:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_reopen): should clear allocated OpenFile.  pointed
@@ -12549,23 +71587,19 @@ Tue Aug 17 01:36:32 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
 	  parsing so RDoc::usage plays better with OptionParser.
 
-Sat Aug 14 13:09:10 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: backport from CVS HEAD (rev1.44).
-
-	* lib/fileutils.rb: cp_r should copy symlink itself, except cp_r
-	  root.
-
-	* lib/fileutils.rb: new option mv :force.
-
-	* lib/fileutils.rb: new module FileUtils::DryRun.
-
 Sat Aug 14 02:48:16 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/usage.rb: Added. Allows command line programs
 	  to report usage using their initial RDoc comment.
 
-Fri Aug 13 13:23:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Aug 14 01:25:48 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/token.c: re2c no longer compiled with bit vectors.  caused
+	  problems for non-ascii characters. [ruby-core:03280]
+	* ext/syck/implicit.c: ditto.
+	* ext/syck/bytecode.c: ditto.
+
+Fri Aug 13 12:55:20 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
 	  fix regex for range-spec.
@@ -12574,15 +71608,44 @@ Fri Aug 13 13:23:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  (WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
 	  multipart/byteranges response was broken.
 
+	* lib/xmlrpc/server.rb: refine example code.
+
+Thu Aug 12 10:54:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* rubyio.h (rb_eof_error): should mark as NORETURN.
+
+	* win32/win32.c (make_cmdvector): adjust escaped successive
+	  double-quote handling.
+
+Thu Aug 12 01:53:10 2004  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (read_buffered_data): extracted from rb_io_fread.
+	  (io_readpartial): new method IO#readpartial.
+	  [ruby-dev:24055]
+
+Wed Aug 11 17:17:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
+
+Mon Aug  9 15:03:20 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
 	* lib/webrick/httpservlet/erbhandler.rb
 	  (WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
 	  by suffix of script filename.
 
-	* lib/xmlrpc/server.rb: refine example code.
+Mon Aug  9 12:51:43 2004  Dave Thomas  <dave@pragprog.com>
 
-Wed Aug 11 17:17:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* dir.c (dir_s_glob): Roll in Austin Ziegler's Dir.glob and
+	  fnmatch updates.
 
-	* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
+Mon Aug  9 06:33:06 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (cp_r): copies symlink to symlink, except
+	  root entries of cp_r.
+
+	* lib/fileutils.rb: new method FileUtils.copy_entry.
+
+	* test/fileutils/test_fileutils.rb: more cp_r tests.
 
 Sun Aug  8 00:43:31 2004  why the lucky stiff  <why@ruby-lang.org>
 
@@ -12594,21 +71657,38 @@ Sun Aug  8 00:43:31 2004  why the lucky stiff  <why@ruby-lang.org>
 	  collections.  plain scalars are trimmed if indentation follows in
 	  an ambiguous flow collection.
 
+Sat Aug  7 03:08:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_daemon): new method.  should be modified for
+	  platforms without /dev/null.
+
 Sat Aug  7 00:50:01 2004  Tanaka Akira  <akr@m17n.org>
 
 	* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
 
-Tue Aug  3 13:49:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Aug  4 13:26:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_bytes0): optimize out read(0). [ruby-talk:108276]
+
+Tue Aug  3 13:49:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/namespace.rb: bug fix
 
 	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
 
+Mon Aug  2 23:33:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/test_file.rb (test_fnmatch): added more tests.
+
 Mon Aug  2 18:04:21 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/msgcat.rb (set_translation): bug fix (fail to set
 	  trans_str to the same as src_str when trans_str is not given.)
 
+Mon Aug  2 17:40:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (blk_free): fixed serious memory leak. [ruby-dev:24013]
+
 Mon Aug  2 11:53:06 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
@@ -12619,15 +71699,21 @@ Mon Aug  2 11:48:29 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Allow '.'s in
 	  variable names to support SWIG generated files (Hans Fugal)
 
-Sat Jul 31 17:40:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 31 23:08:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): stupid mistakes fixed. [ruby-dev:24006]
+
+Sat Jul 31 17:39:47 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial,
 	  ruby-calculate-indent, ruby-move-to-block, ruby-forward-sexp,
 	  ruby-backward-sexp): keywords must match word-wise.
 
-Sat Jul 31 05:47:37 2004  why the lucky stiff  <why@ruby-lang.org>
+Sat Jul 31 13:37:51 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
+	* eval.c (is_defined): avoid unnecessary method invocations.
+
+Sat Jul 31 05:35:37 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/rubytypes.rb: exceptions were using an older
 	  YAML.object_maker. [ruby-core:03080]
@@ -12636,9 +71722,10 @@ Sat Jul 31 05:47:37 2004  why the lucky stiff  <why@ruby-lang.org>
 	  handline CR-LFs.  "\000" was showing up on folded blocks which
 	  stopped at EOF.
 
-	* ext/syck/token.c: re2c compiled with bit vectors now.
-	* ext/syck/implicit.c: ditto.
-	* ext/syck/bytecode.c: ditto.
+Sat Jul 31 01:25:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): call is_defined() before invoking
+	  rb_eval().  [ruby-talk:107867]
 
 Fri Jul 30 16:10:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -12656,8 +71743,26 @@ Wed Jul 28 18:59:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/cgi.rb (CGI::initialize): remove at_exit code for CGI_PARAMS
 	  and CGI_COOKIES.  they will no longer be used.
 
+Wed Jul 28 15:44:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): should call rb_call_super() directly for
+	  visibility overriding.  [ruby-dev:23989]
+
 Wed Jul 28 01:04:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* env.h: remove argv from ruby_frame.
+
+	* eval.c (rb_eval): no more copy on write.
+
+	* eval.c (assign): ditto.
+
+	* eval.c (rb_call0): can receive *rest by specifying negative
+	  argc.  (-1 means 0 arg and *rest, -2 means 1 arg and *rest...)
+
+	* eval.c (rb_call0): properly set frame's argc counter.
+
+	* gc.c (rb_gc_mark_frame): need not to mark frame's argv
+
 	* gc.c (run_final): wrong order of data. [ruby-dev:23984]
 
 Tue Jul 27 07:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -12678,11 +71783,13 @@ Mon Jul 26 11:22:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
 	  escape space.
 
-Sun Jul 25 11:05:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Jul 25 10:56:28 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.{h,c} (rb_w32_{f,fd,fs}open): workaround for bcc32's
 	  {f,fd,fs}open bug. set errno EMFILE and EBADF. [ruby-dev:23963]
 
+	* test/drb/drbtest.rb: fix method duplication.
+
 Sat Jul 24 13:32:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (rb_range_beg_len): returns Qnil only when "beg" points
@@ -12693,37 +71800,24 @@ Fri Jul 23 16:40:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* gc.c (define_final): should not disclose NODE* to Ruby world.
 	  [ruby-dev:23957]
 
-Fri Jul 23 09:03:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Jul 23 08:52:22 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/net/imap.rb (disconnected?): new method. (backported from HEAD)
+	* lib/net/imap.rb (disconnected?): new method.
 
 Thu Jul 22 16:41:54 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore#update): sets the
-	 permission of the session data file to 0600.
+	  permission of the session data file to 0600.
 
 	* lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
 	  ditto.
 
-Thu Jul 22 00:02:21 2004  Masahiro Kitajima  <katonbo@katontech.com>
-
-	* process.c (rb_f_system): not need to call last_status_set() any
-	  longer on _WIN32.
-
-Tue Jul 20 09:15:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on BeOS.
-
-Mon Jul 19 01:15:07 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jul 19 00:53:46 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpservlet/cgihandler.rb
 	  (WEBrick::HTTPServlet::CGIhandler#do_GET): set SystemRoot environment
 	  variable to CGI process on Windows native platforms. [ruby-dev:23936]
 
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIhandler#do_GET): use $?.exitstatus and
-	  refine log message.
-
 Sun Jul 18 16:14:29 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
@@ -12733,18 +71827,19 @@ Sun Jul 18 08:13:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): remove extra sign digit.
 
-Sun Jul 18 03:21:42 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (range): use NULL instead of 0.
+Sun Jul 18 03:19:14 2004  Akinori MUSHA  <knu@iDaemons.org>
 
-	* dir.c (range): get rid of a gcc 3.4 warning.
+	* dir.c (bracket): use NULL instead of 0.
 
-Sun Jul 18 03:12:11 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Sun Jul 18 02:35:30 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (receive_responses): return if a LOGOUT response
-	  received. (backported from HEAD)
+	  received.
+
+Sat Jul 17 23:59:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
 	* lib/net/imap.rb (send_string_data): wait command continuation
-	  requests before sending octet data of literals. (backported from HEAD)
+	  requests before sending octet data of literals.
 
 Sat Jul 17 23:54:59 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -12758,6 +71853,14 @@ Sat Jul 17 18:29:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt): not to show same error messages twice.
 
+Sat Jul 17 14:18:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_match_m): String#match should also take
+	  optional argument.  [ruby-core:03205]
+
+	* re.c (rb_reg_match_m): add optional second argugment "pos" to
+	  specify match start point.  [ruby-core:03203]
+
 Sat Jul 17 13:13:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not
@@ -12765,7 +71868,7 @@ Sat Jul 17 13:13:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sat Jul 17 05:26:27 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
+	* lib/rdoc/diagram.rb: Incorporate Micheal Neumann's
 	  client-side imagemao patch
 
 Sat Jul 17 01:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -12778,24 +71881,6 @@ Fri Jul 16 22:30:28 2004  Michael Neumann  <mneumann@ntecs.de>
 	* file.c (rb_stat_dev_major): new methods File::Stat#dev_major and
 	  #dev_minor. [ruby-core:03195]
 
-Fri Jul 16 15:23:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (return_jump, break_jump): raise unexpceted local jump
-	  exception directly.  [ruby-dev:23740]
-
-	* lib/base64.rb (Deprecated): super in bound method calls original
-	  name method in stable version.  [ruby-dev:23916]
-
-Fri Jul 16 11:31:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/test/unit/ui/{fox,gtk,gtk2}/testrunner.rb: remove
-	  garbage (patch from akira yamada) [ruby-dev:23911]
-
-Fri Jul 16 11:20:00 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
-	  "%f" or etc on MSVCRT platforms. (backported from HEAD)
-
 Fri Jul 16 11:17:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
@@ -12815,13 +71900,19 @@ Thu Jul 15 23:53:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 Thu Jul 15 22:59:48 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* ext/readline/extconf.rb: added dir_config for curses, ncurses,
-	  termcap. (backported from HEAD)
+	  termcap.
 
-Thu Jul 15 20:29:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jul 15 20:44:46 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* class.c, error.c, eval.c, intern.h, object.c, variable.c:
-	  do not set path if it is a singleton class.  [ruby-dev:22588]
-	  (backport from 1.9)
+	* class.c: rdoc patch
+
+Thu Jul 15 14:12:34 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
+
+	* ext/syck/token.c: re2c compiled with bit vectors now.
+	* ext/syck/implicit.c: ditto.
+	* ext/syck/bytecode.c: ditto.
 
 Thu Jul 15 10:15:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -12847,8 +71938,12 @@ Thu Jul 15 10:15:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkextlib/: add samples of Iwidget and TkTable
 
+Wed Jul 14 23:49:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_min_by): new method Enum#min_by.  added Enum#max_by
+	  as well.
 
-Wed Jul 14 18:08:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Jul 14 18:05:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
 	  argument. [ruby-dev:23891]
@@ -12856,14 +71951,14 @@ Wed Jul 14 18:08:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* test/openssl/test_x509store.rb: prune tests for CRL checking
 	  unless X509::V_FLAG_CRL_CHECK is defined.
 
-Wed Jul 14 12:29:07 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 14 12:20:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strtod): should not convert string in the form of
 	  "-I.FE-X" which both "I" and "F" are ommitted. [ruby-dev:23883]
 
 	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
 
-Wed Jul 14 00:31:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 14 00:33:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c: rdoc patch. merged patch from Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:3170]
@@ -12878,7 +71973,7 @@ Tue Jul 13 19:39:12 2004  akira yamada  <akira@ruby-lang.org>
 
 	* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
 
-Tue Jul 13 15:51:45 2004  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 13 15:48:56 2004  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
 	   extmk mode.
@@ -12890,14 +71985,14 @@ Tue Jul 13 00:50:48 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
 
-Mon Jul 12 21:20:36 2004  Dave Thomas  <dave@pragprog.com>
+Mon Jul 12 21:20:51 2004  Dave Thomas  <dave@pragprog.com>
 
 	* html_generator.rb: Support hyperlinks of the form {any text}[xxx]
 	  as well as stuff[xxx]
 
 Sat Jul 10 09:30:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* test/soap/marshal/test_struct.rb: use qualified build-tin class name
+	* test/soap/marshal/test_struct.rb: use qualified built-in class name
 	  (::Struct) to avoid name crash.
 
 Sat Jul 10 04:21:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -12912,7 +72007,7 @@ Sat Jul 10 04:21:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  function of Tk::ValidateConfigure to define validatecommand
 	  methods easier
 
-Fri Jul  9 22:36:36 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jul  9 22:18:59 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c, enum.c, pack.c: rdoc patch from Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:3132] [ruby-core:3136]
@@ -12932,36 +72027,33 @@ Fri Jul  9 14:28:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Fri Jul  9 01:47:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib : bug fix
-	* ext/tk/lib/tkextlib/itcl : add [incr Tcl] support
-	* ext/tk/lib/tkextlib/itk  : add [incr Tk] support
-	* ext/tk/lib/tkextlib/iwidgets : midway point of [incr Widgets] support
-	* ext/tk/sample/tkextlib/iwidgets : very simple examples of
+	* ext/tk/lib: bug fix
+	* ext/tk/lib/tkextlib/itcl: add [incr Tcl] support
+	* ext/tk/lib/tkextlib/itk: add [incr Tk] support
+	* ext/tk/lib/tkextlib/iwidgets: midway point of [incr Widgets] support
+	* ext/tk/sample/tkextlib/iwidgets: very simple examples of
 	  [incr Widgets]
 
-Thu Jul  8 22:52:19 2004  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jul  8 19:27:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
-	  validation and validation which disregard order of elements.
-	* test/rss/test_parser.rb: added tests for RSS 0.9x/2.0
-	  validation.
-	* test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
-	  name.
+	* configure.in (rb_cv_stack_end_address): detect stack end address
+	  variable supplied by system.  [ruby-core:03115]
+
+	* gc.c (Init_stack): use system provided address if possible.
 
 Thu Jul  8 00:05:23 2004  akira yamada  <akira@ruby-lang.org>
 
 	* lib/tempfile.rb (Tempfile::initialize): got out code of
 	  generating tmpname.  [ruby-dev:23832][ruby-dev:23837]
 
-Wed Jul  7 15:53:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_match): raise TypeError when both arguments are
-	  strings. [ruby-dev:22869] (backported from HEAD)
+Wed Jul  7 02:31:41 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* string.c (rb_str_match2): removed.
-
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
-	  wince/Makefile.sub (string.c): now not depend on version.h.
+	* lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
+	  validation and validation which disregard order of elements.
+	* test/rss/test_parser.rb: added tests for RSS 0.9x/2.0
+	  validation.
+	* test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
+	  name.
 
 Wed Jul  7 00:48:34 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
@@ -12970,7 +72062,7 @@ Wed Jul  7 00:48:34 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Tue Jul  6 18:38:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib : improve framework of developping Tcl/Tk extension
+	* ext/tk/lib: improve framework of developping Tcl/Tk extension
 	  wrappers
 
 Mon Jul  5 23:56:42 2004  Kouhei Sutou  <kou@cozmixng.org>
@@ -12989,7 +72081,7 @@ Mon Jul  5 09:02:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0()
 	  is a set of bit flags.  [ruby-dev:23859]
 
-Mon Jul  5 01:27:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jul  5 01:20:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
 	  the socket whose last-access-time is oldest. (and add new one)
@@ -12999,12 +72091,10 @@ Sun Jul  4 12:24:50 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb: added copyright header.
 
-Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Jul  3 22:25:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* added files
-	  * lib/soap/attachment.rb
-	  * lib/soap/header
-	  * lib/soap/mimemessage.rb
+	* added files:
+	  * lib/soap/header/*
 	  * lib/soap/rpc/httpserver.rb
 	  * lib/wsdl/soap/cgiStubCreator.rb
 	  * lib/wsdl/soap/classDefCreator.rb
@@ -13018,36 +72108,29 @@ Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * lib/wsdl/xmlSchema/enumeration.rb
 	  * lib/wsdl/xmlSchema/simpleRestriction.rb
 	  * lib/wsdl/xmlSchema/simpleType.rb
-	  * lib/xsd/codegen
+	  * lib/xsd/codegen/*
 	  * lib/xsd/codegen.rb
-	  * sample/soap/authheader
-	  * sample/soap/raa2.4
-	  * sample/soap/ssl
-	  * sample/soap/swa
+	  * sample/soap/authheader/*
+	  * sample/soap/raa2.4/*
+	  * sample/soap/ssl/*
+	  * sample/soap/swa/*
 	  * sample/soap/whois.rb
-	  * sample/soap/calc/samplehttpd.conf
-	  * sample/soap/exchange/samplehttpd.conf
-	  * sample/soap/sampleStruct/samplehttpd.conf
-	  * sample/wsdl/raa2.4
-	  * sample/wsdl/googleSearch/samplehttpd.conf
-	  * test/openssl/_test_ssl.rb
-	  * test/soap/header
-	  * test/soap/ssl
-	  * test/soap/struct
-	  * test/soap/swa
-	  * test/soap/wsdlDriver
+	  * sample/wsdl/raa2.4/*
+	  * test/soap/header/*
+	  * test/soap/ssl/*
+	  * test/soap/struct/*
+	  * test/soap/swa/*
+	  * test/soap/wsdlDriver/*
 	  * test/wsdl/multiplefault.wsdl
-	  * test/wsdl/simpletype
+	  * test/wsdl/simpletype/*
 	  * test/wsdl/test_multiplefault.rb
 
-	* modified files
+	* modified files:
 	  * lib/soap/baseData.rb
 	  * lib/soap/element.rb
 	  * lib/soap/generator.rb
-	  * lib/soap/marshal.rb
 	  * lib/soap/netHttpClient.rb
 	  * lib/soap/parser.rb
-	  * lib/soap/processor.rb
 	  * lib/soap/property.rb
 	  * lib/soap/soap.rb
 	  * lib/soap/streamHandler.rb
@@ -13062,7 +72145,6 @@ Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * lib/soap/mapping/wsdlRegistry.rb
 	  * lib/soap/rpc/cgistub.rb
 	  * lib/soap/rpc/driver.rb
-	  * lib/soap/rpc/element.rb
 	  * lib/soap/rpc/proxy.rb
 	  * lib/soap/rpc/router.rb
 	  * lib/soap/rpc/soaplet.rb
@@ -13079,26 +72161,12 @@ Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * lib/wsdl/xmlSchema/schema.rb
 	  * lib/xsd/datatypes.rb
 	  * lib/xsd/qname.rb
-	  * sample/soap/calc/httpd.rb
-	  * sample/soap/exchange/httpd.rb
-	  * sample/soap/sampleStruct/httpd.rb
 	  * sample/soap/sampleStruct/server.rb
 	  * sample/wsdl/amazon/AmazonSearch.rb
 	  * sample/wsdl/amazon/AmazonSearchDriver.rb
-	  * sample/wsdl/googleSearch/httpd.rb
-	  * test/soap/test_basetype.rb
 	  * test/soap/test_property.rb
-	  * test/soap/test_streamhandler.rb
-	  * test/soap/calc/test_calc.rb
-	  * test/soap/calc/test_calc2.rb
 	  * test/soap/calc/test_calc_cgi.rb
-	  * test/soap/helloworld/test_helloworld.rb
 	  * test/wsdl/test_emptycomplextype.rb
-	  * test/wsdl/axisArray/test_axisarray.rb
-	  * test/wsdl/datetime/test_datetime.rb
-	  * test/wsdl/raa/test_raa.rb
-	  * test/xsd/test_xmlschemaparser.rb
-	  * test/xsd/test_xsd.rb
 
 	* summary
 	  * add SOAP Header mustUnderstand support.
@@ -13113,34 +72181,33 @@ Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	  * add WSDL simpleType support to restrict lexical value space.
 
-	  * add SOAP with Attachment support.
-
 Sat Jul  3 17:19:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/tk/lib/tkextlib/tkDND.rb: fix syntax error.
 
-Thu Jul  1 23:15:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul  1 18:36:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* lib/pstore.rb (transaction): safer backup scheme.  [ruby-list:39102]
+	* ext/tk/lib/tcltklib: bug fix
 
-	* lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
-	  [ruby-dev:23157]
+	* ext/tk/lib/tk: bug fix and add Tcl/Tk extension support libraries
 
-	* lib/pstore.rb (transaction): allow overriding dump and load.
-	  [ruby-dev:23567]
+Thu Jul  1 18:31:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/pstore.rb (PStore#transaction): get rid of opening in write mode
 	  when read only transaction.  [ruby-dev:23842]
 
-	* lib/yaml/store.rb: follow lib/pstore.rb's change.
+Thu Jul  1 00:44:42 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Thu Jul  1 18:36:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
+	  re-implemnt (the arguments for this method is ).
 
-	* ext/tk/lib/tcltklib : bug fix
+	* ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
+	  OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
 
-	* ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries
+	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
+	  OpenSSL::Cipher::Cipher#key_len=.
 
-Thu Jul  1 11:59:45 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Jun 30 19:48:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: check for EVP_CIPHER_CTX_copy, ENGINE_add,
 	  EVP_CIPHER_CTX_set_padding, EVP_CipherFinal_ex, EVP_CipherInit_ex,
@@ -13152,23 +72219,17 @@ Thu Jul  1 11:59:45 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
 	  OpenSSL 0.9.6.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
-	  re-implemnt (the arguments for this method is ).
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
-	  OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
-
 	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc, ossl_cipher_initialize,
-	  ossl_cipher_copy, ossl_cipher_reset ossl_cipher_final,
-	  ossl_cipher_set_key, ossl_cipher_set_iv): replace all EVP_CipherInit
-	  and EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
+	  ossl_cipher_copy, ossl_cipher_reset, ossl_cipher_encrypt,
+	  ossl_cipher_decrypt, ossl_cipher_final, ossl_cipher_set_key,
+	  ossl_cipher_set_iv): replace all EVP_CipherInit and
+	  EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
 	  and EVP_CIPHER_CTX_init should only be called once.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
-	  OpenSSL::Cipher::Cipher#key_len=.
+	* ext/openssl/ossl_cipher.c (ossl_cipher_set_padding): check for
+	  EVP_CIPHER_CTX_set_padding.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new
-	  finction; print warning for Cipher#<<.
+	* ext/openssl/ossl_cipher.c (Init_ossl_cipher): Cipher#<< is deprecated.
 
 	* ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
 	  EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
@@ -13186,50 +72247,16 @@ Thu Jul  1 11:59:45 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* test/openssl/test_cipher.rb, test/openssl/test_digest.rb,
 	  test/openssl/test_hmac.rb: new file.
 
-Thu Jul  1 04:08:30 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
-	  workaround for the versions earlier than OpenSSL-0.9.7.
-
-Thu Jul  1 03:33:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
-	  empty pkey object if no argument is passed. [ruby-talk:103328]
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
+Wed Jun 30 16:59:39 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
-	  OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
-	  OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
-	  OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
-
-	* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
-	  OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
-	  OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
-	  OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
-	  OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
-
-Thu Jul  1 03:16:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
-	  to specify a string to be written.
-
-	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
-	  take optional second argument to specify a string to be written.
-
-	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
-	  refine regexp for end-of-line.
-
-	* ext/opnessl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SocketForwarder#listen): fix typo.
+	* test/ruby/test_file.rb (test_fnmatch): some tests for File.fnmatch
+	  are added.
 
 Wed Jun 30 11:38:51 2004  Mikael Brockman  <phubuh@phubuh.org>
 
 	* parse.y (primary): should not be NULL.  [ruby-core:03098]
 
-Wed Jun 30 02:53:24 2004  why the lucky stiff  <why@ruby-lang.org>
+Wed Jun 30 02:41:10 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/rubyext.c (syck_emitter_new): set buffer after
 	  Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
@@ -13249,80 +72276,107 @@ Mon Jun 28 14:57:56 2004  Jeff Mitchell  <quixoticsycophant@yahoo.com>
 	* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
 	  DOSISH compilers.  [ruby-core:03107]
 
-Mon Jun 28 00:30:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Jun 28 00:35:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
 
-Sun Jun 27 22:39:51 2004  Kouhei Sutou  <kou@cozmixng.org>
+Sun Jun 27 22:36:47 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin/rss-recent.rb: supported Hiki.
 
-Sun Jun 27 12:19:46 2004  Kouhei Sutou  <kou@cozmixng.org>
+Sat Jun 26 15:17:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* {lib,sample,test}/rss: added RSS Parser. [ruby-dev:23780]
+	* variable.c (rb_mod_class_variables): class variables are no longer
+	  inherited.  [ruby-dev:23808]
 
-Sat Jun 26 11:07:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 26 11:07:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (aix): -b must come at the start of the command line,
 	  and -e must not appear while testing libraries.  [ruby-talk:104501]
 
-	* lib/mkmf.rb (dir_config): quote directory names if necessary.
-	  [ruby-talk:104505]
+	* lib/mkmf.rb (find_header, dir_config): quote directory names if
+	  necessary.  [ruby-talk:104505]
 
-Fri Jun 25 15:33:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 26 00:13:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
-
-	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
+	* io.c (rb_fopen, rb_fdopen, rb_io_reopen): setvbuf() may return
+	  positive value on failure.  [ruby-dev:23792]
 
-Fri Jun 25 08:31:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 25 18:07:15 2004  Michal Rokos  <michal@ruby-lang.org>
 
-	* eval.c (rb_thread_atfork): remove "fork terminates thread"
-	  warning.  [ruby-dev:23768]
+	* gc.c: bring back _stklen for DJGPP [ruby-core:3084]
 
-	* object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
-	  [ruby-core:02786][ruby-core:03067]
+Fri Jun 25 15:33:01 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
-	  should give us packed address, not struct sockaddr.
-	  [ruby-core:03053]
+	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
 
-Fri Jun 25 02:04:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Jun 25 01:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
-	  including version.h. [ruby-talk:104456] (backported from HEAD)
+	  including version.h. [ruby-talk:104456]
 
 Thu Jun 24 14:23:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_fread): return already read data when system call is
 	  interrupted.  [ruby-talk:97206]
 
-Thu Jun 24 01:32:43 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Jun 24 01:25:21 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* version.h: added declarations of ruby_version,
 	  ruby_release_date, ruby_platform.
-	  (backported from HEAD)
 
-Wed Jun 23 22:23:37 2004  Dave Thomas  <dave@pragprog.com>
+Thu Jun 24 01:07:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
+	  should give us packed address, not struct sockaddr.
+	  [ruby-core:03053]
+
+Wed Jun 23 22:19:10 2004  Dave Thomas  <dave@pragprog.com>
 
 	* ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem
 	  with OS X not returning 'from' parameter to recvfrom for
 	  connection-oriented sockets.
 
+Wed Jun 23 22:16:16 2004  Michal Rokos  <michal@ruby-lang.org>
+
+	* io.c: io_seek()'s retval should be checked [ruby-core:03045]
+
+Wed Jun 23 21:48:27 2004  Michal Rokos  <michal@ruby-lang.org>
+
+	* time.c: Fix indentation.
+
+	* main.c: Remove _stklen, and _CRT_glob. Move _stacksize for
+	  __human68k__ to gc.c where the others are.
+
+	* gc.c: put _stacksize in place and clean the #ifdefs macros.
+
+Wed Jun 23 17:37:54 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: added new option --ssl.
+
 Wed Jun 23 01:45:27 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
 	  Fix problem with the 'r' being dropped from %r{xxx}
 
-Wed Jun 23 00:20:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jun 23 00:10:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
 	  CRs and LFs. (doesn't depend on CR+LF) [ruby-dev:23749]
 
 Wed Jun 23 00:00:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* eval.c (return_jump, break_jump): raise unexpected local jump
+	  exception directly.  [ruby-dev:23740]
+
 	* io.c (rb_io_initialize): should check fcntl result.  [ruby-dev:23742]
 
+Tue Jun 22 23:35:43 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): support FZERO and FSPACE with NaN/Inf.
+
+	* test/ruby/test_sprintf.rb (test_nan, test_inf): add tests.
+
 Tue Jun 22 21:11:36 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
@@ -13333,21 +72387,56 @@ Tue Jun 22 21:11:36 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 	* ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
 	  before CR.
 
-Tue Jun 22 16:47:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Jun 22 19:24:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
-	  Thanks, Rutger Nijlunsing.
+	* sprintf.c (rb_f_sprintf): unify output of NaN, Inf and -Inf with
+	  "%f" or etc on all platform. [ruby-dev:23704], [ruby-dev:23747]
+
+Tue Jun 22 15:28:12 2004  Michal Rokos  <michal@ruby-lang.org>
+
+	* compar.c: Remove explicit NIL_P() checks since rb_cmpint() does it
+	  again in the exactly same manner.
+
+Tue Jun 22 01:32:40 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Mon Jun 21 10:19:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
+	  empty pkey object if no argument is passed. [ruby-talk:103328]
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
+	  OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
+	  OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
+	  OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
+
+	* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
+	  OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
+	  OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
+	  OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
+	  OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
+
+Mon Jun 21 09:24:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_opendir): use FindFirstFile()/FindNextFile()/
-	  FindClose() instead of _findfirst()/_findnext()/_findclose().
-	  merge from HEAD.
+	* win32/win32.c (rb_w32_opendir): should set errno if error occurs
+	  when calling OS API.
 
-Sat Jun 19 13:24:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 20 21:12:54 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (binary=): send TYPE commands only once.
+
+Sat Jun 19 13:27:01 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (method_call): allow changing $SAFE.  [ruby-dev:23713]
 
+	* eval.c (proc_set_safe_level, proc_invoke, rb_mod_define_method): not
+	  set $SAFE for methods defined from Proc.  [ruby-dev:23697]
+
+Sat Jun 19 01:10:12 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/tdiary_plugin/rss-recent.rb: added more information.
+
 Fri Jun 18 23:12:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
@@ -13358,10 +72447,27 @@ Wed Jun 16 23:05:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* object.c (rb_mod_freeze): prepare string representation before
 	  freezing. [ruby-talk:103646]
 
-Wed Jun 16 16:04:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jun 16 19:57:24 2004  Michal Rokos  <michal@ruby-lang.org>
+
+	* test/ruby/test_array.rb: extend testcase to check #first, #last,
+	  #shift, #unshift, #pop, #push
+
+Wed Jun 16 16:05:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_new): move alloc behind checks.  [ruby-core:02982]
+
+	* array.c (rb_ary_pop_m, rb_ary_shift_m): take arg to behave as push
+	  and unshift.
+
+	* array.c (rb_ary_first, rb_ary_last): make shared array for result
+	  array, and correct doc for Array#first(n) and Array#last(n)
 
-	* object.c (rb_mod_le): singleton class inherits Class rather than its
-	  object's class.  [ruby-dev:23690]
+	* array.c (rb_ary_select): not accept any arg.
+
+Wed Jun 16 16:03:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_class_inherited_p): singleton class inherits Class
+	  rather than its object's class.  [ruby-dev:23690]
 
 Wed Jun 16 16:01:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -13396,31 +72502,36 @@ Sun Jun 13 00:23:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/menubar?.rb: [add] sample of menu_spec usage
 
+Sat Jun 12 14:15:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c: RDOC for File::FNM_CASEFOLD was missed.
+
 Sat Jun 12 11:15:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (target_os): strip -gnu suffix on Linux.
 
-Fri Jun 11 17:08:21 2004  Akinori MUSHA  <knu@iDaemons.org>
+Fri Jun 11 22:08:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* config.guess: Restore a wrongly removed hyphen.
+	* array.c: remove #indexes, #indices.
 
-Fri Jun 11 14:30:08 2004  Akinori MUSHA  <knu@iDaemons.org>
+	* hash.c: ditto.
 
-	* config.guess: Attempt to avoid system name change on
-	  Darwin platforms also.
+	* ext/dbm/dbm.c: remove #indexes, #indices, "values_at" warning
+	  from #select.
 
-Fri Jun 11 14:22:45 2004  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/gdbm/gdbm.c: ditto.
+
+	* ext/sdbm/init.c: ditto.
 
-	* config.guess, config.sub: Attempt to avoid system name change on
-	  Linux platforms.  We have been using "linux" instead of
-	  "linux-gnu" on this branch.
+	* ext/dbm/dbm.c (Init_dbm): set VERSION constant as "unknown" when
+	  DB_VERSION_STRING is not available.
 
 Thu Jun 10 19:19:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
 	  [ruby-talk:103062]
 
-Wed Jun  9 18:04:14 2004  akira yamada  <akira@ruby-lang.org>
+Wed Jun  9 16:09:01 2004  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic::merge,
 	  URI::Generic::route_from): accepts non-hierarchical URI.
@@ -13429,12 +72540,18 @@ Wed Jun  9 18:04:14 2004  akira yamada  <akira@ruby-lang.org>
 	* test/uri/test_generic.rb (TestGeneric::test_route,
 	  TestGeneric::test_merge): added tests for above changes.
 
-Wed Jun  9 17:39:37 2004  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jun  9 15:39:55 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: Add support for DragonFly BSD.
+
+Wed Jun  9 15:07:06 2004  Akinori MUSHA  <knu@iDaemons.org>
 
 	* config.guess, config.sub: Update to a more recent version as of
 	  2004-01-20.
 
-	* configure.in: Add support for DragonFly BSD.
+Wed Jun  9 11:20:05 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c: remove unused functions and variables.
 
 Wed Jun  2 20:16:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -13452,82 +72569,43 @@ Fri May 28 11:20:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]
 
-Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
 
-	* lib/logger.rb: leading 0 padding of timestamp usec part.
+	* lib/pathname.rb (Pathname#initialize): fix pathname initialization
+	  by pathname.
 
-	* lib/csv.rb (CSV.parse): [CAUTION] behavior changed.  in the past,
-	  CSV.parse accepts a filename to be read-opened (it was just a
-	  shortcut of CSV.open(filename, 'r')).  now CSV.parse accepts a
-	  string or a stream to be parsed e.g.
-	  CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']]
+Thu May 27 20:02:09 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/csv.rb: CSV::Row and CSV::Cell are deprecated.  these classes
-	  are removed in the future.  in the new csv.rb, row is represented
-	  as just an Array.  since CSV::Row was a subclass of Array, it won't
-	  hurt almost all programs except one which depended CSV::Row#match.
-	  and a cell is represented as just a String or nil(NULL).  this
-	  change will cause widespread destruction.
+	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
 
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.is_null       # using Cell#is_null
-		    p "(NULL)"
-		  else
-		    p cell.data         # using Cell#data
-		  end
-		end
-	      end
+Thu May 27 15:54:02 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
-	    must be just;
+	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
+	  Thanks, Rutger Nijlunsing.
 
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.nil?
-		    p "(NULL)"
-		  else
-		    p cell
-		  end
-		end
-	      end
+Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/csv.rb: [CAUTION] record separator(CR, LF, CR+LF) behavior
-	  change.  CSV.open, CSV.parse, and CSV,generate now do not force
-	  opened file binmode.  formerly it set binmode explicitly.
+	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
+	  add errno checking.  [ruby-dev:23627]
 
-	  with CSV.open, binmode of opened file depends the given mode
-	  parameter "r", "w", "rb", and "wb".  CSV.parse and CSV.generate open
-	  file with "r" and "w".
+	* io.c (rb_io_fwrite): should check if errno == ENOENT, too.
 
-	  setting mode properly is user's responsibility now.
+Thu May 27 11:25:03 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* lib/csv.rb: accepts String as a fs (field separator/column separator)
-	  and rs (record separator/row separator)
+	* test/csv/test_csv.rb: illegal require module name (../lib/csv.rb).
+
+Wed May 26 23:12:13 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/csv.rb (CSV.read, CSV.readlines): added.  works as IO.read and
 	  IO.readlines in CSV format.
 
-	* lib/csv.rb: added CSV.foreach(path, rs = nil, &block).  CSV.foreach
-	  now does not handle "| cmd" as a path different from IO.foreach.
-	  needed?
-
-	* test/csv/test_csv.rb: updated.
-
-	* test/ruby/test_float.rb: added test_strtod to test Float("0").
-
-Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#initialize): refine pathname initialization
-	  by pathname.
-
-Thu May 27 20:22:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
-
-Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/csv.rb (CSV.parse): [CAUTION] behavior changed.  in the past,
+	  CSV.parse accepts a filename to be read-opened (it was just a
+	  shortcut of CSV.open(filename, 'r')).  now CSV.parse accepts a
+	  string or a stream to be parsed e.g.
+	  CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']]
 
-	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
-	  add errno checking.  [ruby-dev:23627]
+	* test/csv/test_csv.rb: follow above changes.
 
 Wed May 26 14:19:42 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -13558,16 +72636,33 @@ Wed May 26 00:00:00 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
 
-	* lib/yaml.rb: added rdoc to beginning of lib.
+Tue May 25 11:54:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a block
+	  to a Proc.  [ruby-dev:23533]
+
+	* parse.y (block_par, block_var): ditto.
+
+Tue May 25 01:50:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
+	  workaround for the versions earlier than OpenSSL-0.9.7.
 
 Mon May 24 10:46:26 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers
 	  must be absolute URIs
 
-Sat May 22 12:00:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun May 23 04:53:50 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/pstore.rb (transaction): allow overriding dump and load.
+	  [ruby-dev:23567]
+
+	* lib/yaml/store.rb: follow lib/pstore.rb's change.
+
+Sat May 22 11:54:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* MANIFEST: add new encodings in rexml.
+	* MANIFEST: add test/openssl/test_x509store.rb.
 
 	* ext/tk/MANIFEST: add recent files.
 
@@ -13581,6 +72676,12 @@ Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_parameters):
 	  Add ()'s around parameters that don't have them
 
+Fri May 21 02:21:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/csv.rb: fixed a few bugs around multi char record/field separator.
+
+	* test/csv/test_csv.rb: added boundary test for above feature.
+
 Thu May 20 17:02:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (check_sizeof): define result size.  [ruby-core:02911]
@@ -13588,10 +72689,6 @@ Thu May 20 17:02:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (create_header): macro name should not include equal
 	  sign.
 
-Thu May 20 15:59:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
-
 Thu May 20 14:35:52 2004  Tanaka Akira  <akr@m17n.org>
 
 	* ext/socket/socket.c: check SCM_RIGHTS macro addition to
@@ -13612,20 +72709,100 @@ Thu May 20 12:34:39 2004  Dave Thomas  <dave@pragprog.com>
 Thu May 20 12:22:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (have_type): do not check pointer to incomplete type,
-	  which always get compiled.  [ruby-list:39683]
+	  which always get compiled.
+	  [ruby-list:39683]
+
+Wed May 19 23:45:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 19 11:09:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* test/inlinetest.rb (InlineTest::loadtest): requiring library with
+	  replaced $0 can make $0 == __FILE__ block be evaluated twice.
+
+	* test/ruby/envutil.rb (EnvUtil::rubybin): give priority to
+	  environment variable.  [ruby-dev:23538]
+
+Wed May 19 11:08:10 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: change permition of TkObject#tk_send from
 	  private to public
 
+Wed May 19 02:29:36 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: support TRACE.
+
+Wed May 19 02:21:53 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: do not use class variables.
+
+Tue May 18 21:21:43 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/csv.rb: writes lines with "\n" when row separator is not given.
+	  formerly it was "\r\n".
+
+	* lib/csv.rb: [CAUTION] API change
+
+	  * CSV::Row removed.  a row is represented as just an Array.  since
+	    CSV::Row was a subclass of Array, it won't hurt almost all programs
+	    except one which depended CSV::Row#match.
+
+	  * CSV::Cell removed.  a cell is represented as just a String or
+	    nil(NULL).  this change will cause widespread destruction.
+
+	      CSV.open("foo.csv", "r") do |row|
+		row.each do |cell|
+		  if cell.is_null       # Cell#is_null
+		    p "(NULL)"
+		  else
+		    p cell.data		# Cell#data
+		  end
+		end
+	      end
+
+	    must be just;
+
+	      CSV.open("foo.csv", "r") do |row|
+		row.each do |cell|
+		  if cell.nil?
+		    p "(NULL)"
+		  else
+		    p cell
+		  end
+		end
+	      end
+
+	* lib/csv.rb: [CAUTION] record separator(CR, LF, CR+LF) behavior
+	  change.  CSV.open, CSV.parse, and CSV,generate now do not force
+	  opened file binmode.  formerly it set binmode explicitly.
+
+	  with CSV.open, binmode of opened file depends the given mode
+	  parameter "r", "w", "rb", and "wb".  CSV.parse and CSV.generate open
+	  file with "r" and "w".
+
+	  setting mode properly is user's responsibility now.
+
+	* lib/csv.rb: accepts String as a fs (field separator/column separator)
+	  and rs (record separator/row separator)
+
+	* lib/csv.rb: added CSV.foreach(path, rs = nil, &block).  CSV.foreach
+	  now does not handle "| cmd" as a path different from IO.foreach.
+	  needed?
+
+	* test/csv/test_csv.rb: updated.
+
+Tue May 18 14:24:20 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb: added rdoc to beginning of lib.
+
 Tue May 18 14:00:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* node.h (NEW_DSTR): adjust list length.
 
 	* parse.y (literal_concat): ditto.
 
-Mon May 17 16:14:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue May 18 09:30:25 2004  SASADA Koichi  <ko1@atdot.net>
+
+	* eval.c (rb_method_node): search cache entry first.
+
+Mon May 17 16:04:06 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
 	  instead of "0.0e+00". [ruby-dev:23480]
@@ -13642,13 +72819,43 @@ Mon May 17 10:13:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (sock_s_getnameinfo): ditto.
 
-Mon May 17 01:15:23 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb: removed fallback to pure Ruby parser.
+Mon May 17 00:36:21 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/baseemitter.rb (indent_text): was forcing a mod value
 	  of zero at times, which kept some blocks from getting indentation.
 
+Mon May 17 00:07:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/drb/drb.rb: Cosmetic documentation changes.
+
+Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/dbm/dbm.c (fdbm_initialize): accept optional 3rd argument to
+	  specify an open flag.
+	  (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
+	  and DBM::NEWDB.
+
+Sat May 15 17:52:24 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/test_float.rb(test_strtod): Add test for signed 0.000...1
+
+Sat May 15 14:20:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/syck/depend: add ruby's headers.
+
+Sat May 15 13:38:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/MANIFEST, ext/syck/depend: new file.
+
+	* lib/yaml/rubytypes.rb: range of exponential floats.  [ruby-core:02824]
+
+	* test/yaml/test_yaml.rb: tests for strings start with colon and some
+	  round trip.
+
+Sat May 15 12:04:58 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb: removed fallback to pure Ruby parser.
+
 	* lib/yaml/baseemitter.rb (node_text): rewriting folded scalars.
 
 	* ext/syck/syck.h: reports style of scalars now, be they plain, block
@@ -13665,33 +72872,9 @@ Mon May 17 01:15:23 2004  why the lucky stiff  <why@ruby-lang.org>
 	* ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
 	  if scalar style is plain.
 
-	* ext/syck/rubyext.c (yaml_org_handler): some empty strings were
-	  loaded as symbols.
-
 	* test/yaml/test_yaml.rb (test_perl_regexp): updated test to
 	  match new regexp serialization.
 
-Mon May 17 00:03:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/drb/drb.rb: Cosmetic documentation changes.
-
-Sun May 16 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
-	  RDoc operation), and added file-level comment.
-
-Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
-
-	* ext/dbm/dbm.c (fdbm_initialize): accept optional 3rd argument to
-	  specify an open flag.
-	  (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
-	  and DBM::NEWDB.
-
-Sun May 16 13:10:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
-	  generating warnings, many were on private methods).
-
 Sat May 15 01:41:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (eval): forgot to restore $SAFE value before evaluating
@@ -13707,18 +72890,27 @@ Fri May 14 22:08:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_new4): should not reuse frozen shared string if
 	  the original is not an instance of String. [ruby-talk:100193]
 
-Fri May 14 18:39:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri May 14 21:29:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_mdump): preserve GMT bit in the marshal data.
+	  [ruby-talk:100213]
+
+Fri May 14 18:37:49 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/canvas.rb: improve coords support for canvas
+	  items. Now, supports all of the followings.
+	       TkcLine.new(c, 0, 0, 100, 100, :fill=>'red')
+	       TkcLine.new(c, [0, 0, 100, 100], :fill=>'red')
+	       TkcLine.new(c, [0, 0], [100, 100], :fill=>'red')
+	       TkcLine.new(c, [[0, 0], [100, 100]], :fill=>'red')
+	       TkcLine.new(c, :coords=>[0, 0, 100, 100], :fill=>'red')
+	       TkcLine.new(c, :coords=>[[0, 0], [100, 100]], :fill=>'red')
 
-	* ext/tk/lib/tk/canvas.rb: improve coords support for canvas items.
-	  Now, supports all of the followings.
-	    TkcLine.new(c, 0, 0, 100, 100, :fill=>'red')
-	    TkcLine.new(c, [0, 0, 100, 100], :fill=>'red')
-	    TkcLine.new(c, [0, 0], [100, 100], :fill=>'red')
-	    TkcLine.new(c, [[0, 0], [100, 100]], :fill=>'red')
-	    TkcLine.new(c, :coords=>[0, 0, 100, 100], :fill=>'red')
-	    TkcLine.new(c, :coords=>[[0, 0], [100, 100]], :fill=>'red')
+Fri May 14 13:30:39 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-Fri May 14 12:11:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* test/ruby/test_float.rb: Add test for util.c revision 1.42.
+
+Fri May 14 12:13:46 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
 	 [ruby-dev:23498]
@@ -13728,15 +72920,10 @@ Thu May 13 15:47:30 2004  akira yamada  <akira@ruby-lang.org>
 	* lib/net/telnet.rb (Net::Telnet::login): "options" can specify
 	  regexps for login prompt and/or password prompt.
 
-Thu May 13 14:23:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* hash.c (delete_if_i): use st_delete_safe() (via
-	  rb_hash_delete()) instead of returning ST_DELETE.
-	  backport from HEAD.  [ruby-dev:23487]
-
-Thu May 13 13:01:30 2004  akira yamada  <akira@ruby-lang.org>
+Thu May 13 14:17:57 2004  why the lucky stiff  <why@ruby-lang.org>
 
-	* lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
+	* ext/syck/rubyext.c (yaml_org_handler): some empty strings were
+	  loaded as symbols.
 
 Thu May 13 11:04:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -13768,6 +72955,15 @@ Wed May 12 11:51:08 2004  Dave Thomas  <dave@pragprog.com>
 
 	* class.c (rb_obj_singleton_methods): fix rdoc
 
+Tue May 11 07:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): do not protect exception during receiver
+	  evaluation.
+
+Mon May 10 22:28:14 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb (each_crlf_line): remove junk line.
+
 Mon May 10 21:44:42 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/html_generator.rb: Change scheme for
@@ -13786,44 +72982,82 @@ Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb: Hack to search parents
 	  for unqualified constant names.
 
-Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
+Mon May 10 01:18:15 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/rdoc/generators/html_generator.rb: Hack to search parents
-	  for unqualified constant names.
+	* lib/net/pop.rb (logging): append "\n".
+
+Sun May  9 23:38:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/net/ftp.rb: ported documentation improvement from 1.8 branch
 
-Sun May  9 22:37:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* lib/net/imap.rb:   ditto
+
+	* lib/net/pop.rb:    ditto
+
+	* lib/net/smtp.rb:   ditto
 
-	* lib/net/ftp.rb: improved documentation
-	* lib/net/imap.rb: ditto
-	* lib/net/pop.rb: ditto
-	* lib/net/smtp.rb: ditto
 	* lib/net/telnet.rb: ditto
 
+Sun May  9 23:34:51 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_float.rb: added test_strtod to test Float("0").
+
+Sun May  9 13:24:24 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/yaml/store.rb: use FileUtils::copy.
+
+Sun May  9 12:34:26 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regex.c: removed unused file.
+
+Sat May  8 10:53:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_open): open should not ignore block when "to_open"
+	  method is used.  [ruby-dev:23478]
+
+Fri May  7 22:07:39 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mv): new option `force'. [ruby-talk:99457]
+
+	* lib/fileutils.rb: new method for command option reflection:
+	  FileUtils.commands, .options, .have_option?, .options_of,
+	  .collect_methods.
+
+	* lib/fileutils.rb: module Verbose, NoWrite, DryRun do not have
+	  option flags @fileutils_verbose and @fileutils_noop, they make no
+	  sense.
+
 Fri May  7 21:50:21 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
 	  multiple arguments to 'include'
 
-Fri May  7 21:31:56 2004  Minero Aoki  <aamine@loveruby.net>
+Fri May  7 21:03:51 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
 	  [ruby-core:02843]
 
-Fri May  7 11:25:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* test/fileutils/test_fileutils.rb (mkdir): test "\n" in path.
+
+Fri May  7 20:53:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_modify): typo fixed. [ruby-dev:23473]
+
+Fri May  7 11:17:27 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strtod): "0.0000000000000000001" should be converted
 	  to 1.0e-19 instead of 0.0. (leading zeros aren't significant digits)
 	  [ruby-talk:99318] [ruby-dev:23465]
 
-Fri May  7 10:00:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
-
-Thu May  6 22:13:17 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu May  6 22:27:32 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
 	  hostname.
 
+Thu May  6 22:09:29 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
+
 Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
@@ -13837,6 +73071,15 @@ Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
 	* ext/syck/gram.c: fixed transfer methods on structs, broke it
 	  last commit.
 
+Thu May  6 14:38:02 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (rb_push_glob): simplified code (not change behavior)
+
+Thu May  6 13:32:44 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: get rid of side effect of Config.expand, patched by
+	  <tttt01@infoseek.jp>  (ruby-bugs:PR#597)
+
 Thu May  6 11:40:28 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (string): accept NIL.
@@ -13849,16 +73092,13 @@ Thu May  6 01:59:04 2004  Dave Thomas  <dave@pragprog.com>
 	  Don't include the &block parameter if we have explicit
 	  yield parameters.
 
-Wed May  5 03:40:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed May  5 03:52:31 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/ring.rb: use recv instead of recvfrom.
 
-Tue May  4 23:52:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Wed May  5 00:38:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/gserver.rb: documented
-
-Tue May  4 23:46:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
 	* lib/xmlrpc/README.txt: introduced for documentation purposes
 
 Mon May  3 09:47:24 2004  Dave Thomas  <dave@pragprog.com>
@@ -13866,6 +73106,10 @@ Mon May  3 09:47:24 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
 	  Fix parsing bug if yield called within 1 line block
 
+Sun May  2 21:56:48 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb (rm_f, rm_r): test :force flag.
+
 Sun May  2 01:04:38 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib, ext/tk: renewal Ruby/Tk
@@ -13874,11 +73118,26 @@ Fri Apr 30 20:08:41 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* time.c (SIZEOF_TIME_T): support SIZEOF_TIME_T == SIZEOF_INT.
 
-Tue Apr 27 13:12:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Apr 28 01:26:11 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* oniguruma.h, regparse.c: imported Oni Guruma 2.2.8.
+
+Wed Apr 28 01:16:23 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 
-	* eval.c (rb_eval): too many line trace call. (ruby-bugs PR#1320)
+	* oniguruma.h, regparse.c: imported Oni Guruma 2.2.7.
 
-Tue Apr 27 08:41:28 2004  why the lucky stiff  <why@ruby-lang.org>
+Tue Apr 27 14:43:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk: LIBURUBY_A is needed for extconf.rb even when
+	  cross-compiling.
+
+Tue Apr 27 13:33:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (string_content): turn off NODE_NEWLINE flag to avoid
+	  unnecessary line trace for inlined expression.
+	  (ruby-bugs PR#1320)
+
+Tue Apr 27 08:15:13 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/rubytypes.rb: passing Range tests.
 
@@ -13906,32 +73165,33 @@ Mon Apr 26 21:40:09 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/code_objects.rb (RDoc::Context::add_alias): Only alias
 	  to instance methods.
 
+Sun Apr 25 18:26:23 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (ac_cv_func_fork): set to no on DJGPP.
+
+Sat Apr 24 14:32:03 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* re.c: applied stack error handling patch. [ruby-dev:23431]
+
 Sat Apr 24 10:38:31 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
 	  Fix bug where consecutive headings are merged.
 
-Fri Apr 23 23:26:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 23 23:24:47 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb: $hdrdir should not contain macros for backward
+	* lib/mkmf.rb: $hdrdir should not contain macros, for backward
 	  compatibility.  [bruby-dev:28]
 
-	* version.c (ruby_show_copyright): obtain copyright year from
-	  RUBY_RELEASE_YEAR.
-
-	* win32/resource.rb: ditto.
-
-	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
-	  include them.
-
-	* win32/resource.rb: include winver.h for older WindowsCE.
+	* lib/mkmf.rb (create_makefile): in the case of extout, just copy
+	  script files, without comparison.
 
 Fri Apr 23 16:38:46 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb: sync taint/freeze flag between
 	  a pathname object and its internal string object.
 
-Fri Apr 23 14:52:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 23 14:52:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt, arg, aref_args): should not make sole splat into
 	  array, in aref_args other than aref with op_asgn.
@@ -13941,7 +73201,18 @@ Fri Apr 23 14:14:38 2004  Tanaka Akira  <akr@m17n.org>
 	* lib/resolv.rb: don't use Regexp#source to embed regexps.
 	  [ruby-dev:23432]
 
-Thu Apr 22 04:15:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 22 18:25:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, ext/extmk.rb: make ext and .ext get removed by distclean.
+
+Thu Apr 22 10:07:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* */Makefile.sub (distclean-local): should remove $(RBCONFIG).
+
+Thu Apr 22 04:17:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_mod_define_method): allow binding methods to modules.
+	  [ruby-dev:23410]
 
 	* parse.y (aref_args): should pass expanded list.  [ruby-core:02793]
 
@@ -13953,7 +73224,7 @@ Thu Apr 22 01:12:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
 	  search.  [ruby-talk:97342]
 
-Wed Apr 21 22:57:27 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Apr 21 23:04:42 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
 
@@ -13962,6 +73233,44 @@ Wed Apr 21 20:05:00 2004  Tanaka Akira  <akr@m17n.org>
 	* lib/open-uri.rb (URI::HTTP#proxy_open): set Host: field explicitly.
 	  [ruby-list:39542]
 
+Wed Apr 21 18:39:46 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: merge SMTP-TLS patch.  This patch is
+	  contributed by Daniel Hob. [ruby-core:02789]
+
+Wed Apr 21 18:23:45 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: change coding style: def m( a ) -> def m(a).
+
+Wed Apr 21 18:01:47 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: do not use class variables.
+
+	* lib/net/pop.rb (do_start): ensure to clean up connection when
+	  authentication failed.
+
+Wed Apr 21 17:23:59 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTP#connect): CONNECT must precede SSL connect.
+	  [ruby-dev:23379]
+
+	* lib/net/http.rb (HTTP.new): class variables are not inherited
+	  now.
+
+Wed Apr 21 15:56:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/ui/console/testrunner.rb (test_started): restore $0
+	  after changing process title.  [ruby-talk:97426]
+
+Wed Apr 21 10:18:06 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* process.c(rb_spawn): fix SEGV at "p system('command line here')"
+	 (may happen only in bccwin32) [ruby-dev:23380]
+
+Mon Apr 19 20:58:44 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c: Updated RDocs.
+
 Mon Apr 19 18:11:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* hash.c (rb_hash_equal): returns true if two hashes have same set
@@ -13970,107 +73279,132 @@ Mon Apr 19 18:11:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* hash.c (rb_hash_eql): returns true if two hashes are equal and
 	  have same default values.
 
-Mon Apr 19 08:19:58 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+Mon Apr 19 08:19:11 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
 
-	* dln.c, io.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb, lib/date.rb,
-	  lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb, lib/matrix.rb,
-	  lib/monitor.rb, lib/set.rb, lib/thwait.rb, lib/timeout.rb,
-	  lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb, lib/net/ftp.rb,
-	  lib/net/http.rb, lib/net/imap.rb, lib/net/telnet.rb,
-	  lib/racc/parser.rb, lib/rinda/rinda.rb, lib/rinda/tuplespace.rb,
-	  lib/shell/command-processor.rb, lib/soap/rpc/soaplet.rb,
-	  lib/test/unit/testcase.rb, lib/test/unit/testsuite.rb: typo fix.
+	* dln.c, io.c, pack.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb,
+	  lib/date.rb, lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb,
+	  lib/matrix.rb, lib/monitor.rb, lib/set.rb, lib/thwait.rb,
+	  lib/timeout.rb, lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb,
+	  lib/net/ftp.rb, lib/net/http.rb, lib/net/imap.rb, lib/net/pop.rb,
+	  lib/net/telnet.rb, lib/racc/parser.rb, lib/rinda/rinda.rb,
+	  lib/rinda/tuplespace.rb, lib/shell/command-processor.rb,
+	  lib/soap/rpc/soaplet.rb, lib/test/unit/testcase.rb,
+	  lib/test/unit/testsuite.rb: typo fix.
 
 Mon Apr 19 08:14:18 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
 	  #ifdef HAVE_PROTOTYPES
 
-Fri Apr 16 22:33:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* ext/iconv/iconv.c: nearly finished RDoc comments.
-
 Fri Apr 16 17:04:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_equal): always returns true or false, never
 	  returns nil. [ruby-dev:23404]
 
-Fri Apr 16 08:27:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 16 12:38:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/drb/drb.rb (DRb::DRbUnknown::initialize): Exception#to_str is
+	  deprecated.
+
+	* lib/drb/drb.rb (DRb::DRbServer::InvokeMethod::perform): multiple
+	  value class changed.
+
+	* lib/drb/invokemethod.rb (DRb::DRbServer::InvokeMethod18Mixin::block_yield):
+	  ditto.
+
+Fri Apr 16 08:27:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: skip linking when libraries to be preloaded not
 	  compiled.  [ruby-list:39561]
 
-Thu Apr 15 23:21:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 15 19:57:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (pst_success_p): new method Process::Status#success?.
 	  [ruby-dev:23385]
 
+	* rubytest.rb: do nothing while cross-compiling, return status in
+	  system independent style.
+
+Thu Apr 15 19:26:54 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (rb_push_glob): Dir.glob() should return nil if block is given.
+	  (http://www.ruby-lang.org/ja/man/index.cgi?cmd=view;name=Dir)
+
+	* dir.c (push_braces): Dir.glob() should handle '{ }' nested more than
+	  3 times.
+
+	* dir.c (push_braces, rb_push_glob): Dir.glob() should handle escaped
+	  '{' and '}' and ','.
+
+	  [ruby-dev:23376]
+
 Thu Apr 15 17:12:13 2004  Tanaka Akira  <akr@m17n.org>
 
 	* ext/gdbm/gdbm.c (Init_gdbm): define GDBM::READER, GDBM::WRITER,
 	  GDBM::WRCREAT and GDBM::NEWDB.
 	  (fgdbm_initialize): use specified read/write flag.
 
+Wed Apr 14 13:06:09 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+
+	* array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
+	  process.c, re.c, string.c: typos in RDoc comments.  [ruby-core:02783]
+
 Wed Apr 14 11:29:56 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* numeric.c (flo_eq): workaround for bcc32's bug.
 	  (ruby-bugs-ja:PR#594)
 
-Wed Apr 14 13:06:35 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
-
-	* array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
-	  process.c, re.c, string.c: typos in RDoc comments.  [ruby-core:02783]
-
 Wed Apr 14 11:06:38 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::scan): Changed
 	  behavior of :enddoc: -- it now unconditionally terminates
 	  processing of the current file.
 
-Wed Apr 14 11:03:22 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Apr 14 10:57:40 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* defines.h: include <net/socket.h> to get fd_set definition in BeOS.
 
-Tue Apr 13 23:06:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Apr 13 23:00:55 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb: change pattern matching.
 	  a === b -> a == b || a === b. [druby-ja:98]
 
 	* test/rinda/test_rinda.rb: ditto.
 
-Tue Apr 13 19:54:29 2004  Minero Aoki  <aamine@loveruby.net>
+Tue Apr 13 21:50:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/http.rb: should not overwrite HTTP request header.
-	  [ruby-list:39543]
+	* bcc32/Makefile.sub (PHONY): Borland make disallows empty command
+	  rules.
 
-Tue Apr 13 01:30:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Tue Apr 13 17:55:16 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
-	* ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
+	* lib/net/http.rb (begin_transport): should not overwrite HTTP
+	  request header. [ruby-list:39543]
 
-Mon Apr 12 19:11:29 2004  Eric Hodel  <drbrain@segment7.net>
+Tue Apr 13 16:48:00 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* gc.c (rb_gc_copy_finalizer): typo.  [ruby-core:02774]
+	* lib/net/pop.rb: merge POP3S patch.  This patch is contributed by
+	  Daniel Hobe.
 
-Mon Apr 12 18:52:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr 13 02:56:29 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
-	  a value.
+	* common.mk: changed the order of ascii.c alphabetically.
 
-Mon Apr 12 10:43:47 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Apr 12 19:11:21 2004  Eric Hodel  <drbrain@segment7.net>
 
-	* dir.c (rb_glob2, rb_glob, rb_globi, push_globs, push_braces,
-	  rb_push_glob): fix memory leak. (leaked when block was interrupted)
+	* gc.c (rb_gc_copy_finalizer): typo.  [ruby-core:02774]
 
-Mon Apr 12 10:27:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Apr 12 18:45:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* bcc32/Makefile.sub: backport SIZEOF_TIME_T definition from 1.9.
+	* ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
+	  a value.
 
-	* win32/Makefile.sub: ditto.
+Mon Apr 12 10:39:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* wince/Makefile.sub: ditto.
+	* dir.c (rb_glob2, rb_glob, push_globs, push_braces, rb_push_glob):
+	  fix memory leak. (leaked when block was interrupted)
 
-Sun Apr 11 19:12:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Apr 11 19:10:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (require_libraries): restore source file/line after
 	  statically linked extensions initialized.  [ruby-dev:23357]
@@ -14091,7 +73425,73 @@ Sat Apr 10 00:00:19 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
 	  with \_cat_<b>dog</b>
 
-Wed Apr  7 00:19:50 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri Apr  9 17:05:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (has_magic, find_dirsep): incomplete '[' matches no character
+	  in Dir.glob. (follows File.fnmatch's behavior)
+
+	* dir.c (fnmatch_helper): incomplete escape is ignored in File.fnmatch.
+	  (follows Dir.glob's behavior)
+
+	* dir.c (find_dirsep): '/' between '[' and ']' is ignored in Dir.glob.
+	  (follows File.fnmatch with File::FNM_PATHNAME 's behavior)
+
+	* dir.c (find_dirsep): escaped slash '\/' loses its meaning as
+	  directory separator in Dir.glob.
+
+	  [ruby-dev:23291]
+
+Thu Apr  8 20:25:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): skip uncompiled extensions.
+
+	* lib/mkmf.rb (create_makefile): emit no rules for static library if
+	  $static is nil, e.g., outside of ext/.
+
+	* lib/test/unit/ui/console/testrunner.rb (test_started): show test
+	  name via $0.
+
+	* runruby.rb: set environments to use the compiled binary.
+
+	* test/runner.rb: do nothing while cross-compiling.
+
+	* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to
+	  know ruby binary, and restore $: after require.
+
+	* test/ruby/envutil.rb: give priority to RUBY environment variable to
+	  use just compiled binary and libraries.
+
+Thu Apr  8 19:03:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_binmode): inverted condition.  [ruby-dev:23349]
+
+Thu Apr  8 18:22:00 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_s_list): return encoding list if no block
+	  is given.  [ruby-dev:23063]
+
+Wed Apr  7 15:29:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): use NUM2INT() instead of num2i32().
+
+Wed Apr  7 12:32:02 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb, lib/rss/1.0.rb: accepted rdf:resource or
+	  resource attribute in rdf:li.
+	* test/rss/test_parser.rb: added test for above change.
+
+	* lib/rss/dublincore.rb: reverted style.
+
+	* lib/rss/xmlparser.rb: normalized XMLParser class hierarchy.
+
+Wed Apr  7 10:43:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.mk, */Makefile.sub (ext/extinit.o): OUTFLAG
+	  doesn't work for object files on VC.
+
+	* */Makefile.sub (config.h): need SIZEOF_TIME_T now.
+
+Wed Apr  7 00:24:34 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb: fix hash tuple bug.
 
@@ -14101,6 +73501,12 @@ Wed Apr  7 00:19:50 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 Tue Apr  6 18:24:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* file.c (rb_get_path): get path string via "to_path" method if
+	  path object is not a string. [Ruby2]
+
+	* gc.c (rb_gc_call_finalizer_at_exit): do not free threads in the
+	  exit finalizers.
+
 	* io.c (rb_io_reopen): should use rb_io_check_io().
 
 Tue Apr  6 16:46:09 2004  Tanaka Akira  <akr@m17n.org>
@@ -14111,49 +73517,82 @@ Tue Apr  6 16:46:09 2004  Tanaka Akira  <akr@m17n.org>
 	  (time_plus): use time_add.
 	  (time_minus): use time_add.
 
-Tue Apr  6 13:21:30 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Apr  6 13:11:48 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (raise_socket_error): never return.
 
 	* ext/socket/socket.c (make_hostent): must return value.
 
-Tue Apr  6 00:05:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Apr  6 00:14:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (Init_Exception): remove Exception#to_str. [Ruby2]
+
+	* eval.c (error_print): should no call "to_str" anymore use
+	  "message" method instead.
+
+	* io.c (rb_f_open): Kernel#open() calls "to_open" if the first
+	  argument responds to it. [Ruby2]
+
+Tue Apr  6 00:13:43 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb: add require 'drb/drb'
 
-Mon Apr  5 08:18:23 2004  Dave Thomas  <dave@pragprog.com>
+Mon Apr  5 22:25:32 2004  Tanaka Akira  <akr@m17n.org>
 
-	* lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
-	  references work properly.
+	* test/zlib/test_zlib.rb: new file.
+	  (TestZlibGzipWriter#test_new_nil): test for [ruby-dev:23228].
 
-Sun Apr  4 20:33:42 2004  Minero Aoki  <aamine@loveruby.net>
+Mon Apr  5 22:16:23 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (Init_load): make $LOADED_FEATURES built-in.
-	  [ruby-dev:23299]
+	* parse.y (assoc_list): {a: 1, b: 2} should be allowed.
+	  [ruby-dev:23328]
 
-	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
+Mon Apr  5 19:43:40 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 
-	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
+	* regexec.c: imported Oni Guruma 2.2.6.
+
+Mon Apr  5 19:39:10 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regparse.c, oniguruma.h: imported Oni Guruma 2.2.6.
+
+Mon Apr  5 12:12:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (raise_socket_error): some platforms don't have
+	  EAI_SYSTEM.
+
+Mon Apr  5 08:18:23 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
+	  references work properly.
 
 Sun Apr  4 14:01:20 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/options.rb (Options::parse): Allow multiple -x options to RDoc.
-	  Fix bug where files weren't being excluded properly
+	* lib/rdoc/options.rb (Options::parse): Allow multiple -x options to
+	  RDoc. Fix bug where files weren't being excluded properly
 
-Sat Apr  3 17:11:05 2004  why the lucky stiff  <why@ruby-lang.org>
+Sat Apr  3 09:36:38 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/syck.h: version 0.43.
 
+Sat Apr  3 08:28:47 2004  why the lucky stiff  <why@ruby-lang.org>
+
 	* ext/syck/lib/gram.c: allow root-level inline collections.
-	 [ruby-talk:94922]
+	  [ruby-talk:94922]
 
 	* lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
-	 [ruby-talk:94930]
+	  [ruby-talk:94930]
 
-	* ext/syck/bytecode.c: turn off default implicit typing.
+Fri Apr  2 19:28:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/implicit.c: detect base60 integers.
+	* bcc32/Makefile.sub (OUTFLAG): needed for static-linked-ext.
 
-	* ext/syck/rubyext.c: handle base60, as well as hex and octal
-	  with commas.  implicit typing of ruby symbols.
+Fri Apr  2 18:00:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): extract necessary variables for static link
+	  from Makefile.
+
+	* lib/mkmf.rb (create_makefile): save preload and libpath for next
+	  compile.
 
 Fri Apr  2 17:27:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -14172,8 +73611,20 @@ Fri Apr  2 14:35:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (block_pass): should generate unique identifier of the
 	  pushing block.  [ruby-talk:96363]
 
+Fri Apr  2 11:36:20 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (Init_load): make $LOADED_FEATURES built-in.
+	  [ruby-dev:23299]
+
+	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
+
+	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
+
 Fri Apr  2 07:31:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* ext/socket/socket.c: mistakingly removed do_not_reverse_lookup.
+	  [ruby-list:39475]
+
 	* ext/socket/socket.c (make_hostent): fix memory leak, based on
 	  the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.
 
@@ -14198,14 +73649,6 @@ Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  be empty).  Instance of URI have instance_variables but it must be
 	  llowed whenever original mapping is allowed or not.
 
-	* lib/xsd/datatypes.rb: check the smallest positive non-zero
-	  single-precision float exactly instead of packing with "f".
-	  [ruby-talk:88822]
-
-	* lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
-	  [ruby-dev:22588]
-	  c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
-
 Wed Mar 31 19:06:23 2004  Tanaka Akira  <akr@m17n.org>
 
 	* time.c (year_leap_p): new function.
@@ -14213,7 +73656,7 @@ Wed Mar 31 19:06:23 2004  Tanaka Akira  <akr@m17n.org>
 	  (search_time_t): use timegm_noleapsecond instead of
 	  mktime for first guess.
 
-Wed Mar 31 12:04:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 31 12:05:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/delegate.rb (DelegateClass): define internal methods of the
 	  result class, but not metaclass of the caller.  [ruby-talk:96156]
@@ -14222,12 +73665,44 @@ Wed Mar 31 12:04:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.h: missing.h is now prerequisite to intern.h.
 
+Wed Mar 31 11:17:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): raises RangeError if uv is out of UTF8 value
+	  range.  [ruby-dev:23281]
+
+	* io.c (rb_io_binmode): stdio buffer should be empty when calling
+	  IO#binmode.  [ruby-talk:96155]
+
 Tue Mar 30 20:25:34 2004  Tanaka Akira  <akr@m17n.org>
 
 	* time.c (search_time_t): limit guess range by mktime if it is
 	  available.  [ruby-dev:23274]
 
-Sun Mar 28 14:16:59 2004  Minero Aoki  <aamine@loveruby.net>
+Tue Mar 30 18:19:00 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): fix SEGV at retry in iterator's receiver.
+	  [ruby-dev:23227]
+
+Mon Mar 29 20:17:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_exec): follow older behavior if close-on-exec is not
+	  available.
+
+	* process.c (rb_fork): protect from exceptions while waiting failed
+	  process, if status is given.
+
+Sun Mar 28 16:25:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (clean-local, distclean-local): remove
+	  work files.
+
+	* win32/Makefile.sub (clean-local): ditto.
+
+Sun Mar 28 14:23:02 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: def m( arg ) -> def m(arg).
+
+Sun Mar 28 14:09:13 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/pop.rb (auth): failed when account/password include "%".
 	  [ruby-talk:95933]
@@ -14241,16 +73716,46 @@ Sat Mar 27 10:40:48 2004  Tanaka Akira  <akr@m17n.org>
 	* (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods
 	  instead of PrettyPrint.
 
-Thu Mar 25 23:28:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Mar 27 01:47:09 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: trim tail space of each line.  no user visible change.
 
-	* time.c (time_overflow_p): backport 1.9 usec overflow function.
-	  (ruby-bugs PR#1307)
+	* lib/rss/dublincore.rb: fixed class definition mismatch.
+
+	* sample/openssl/gen_csr.rb: fixed wrong usage text.
 
 Thu Mar 25 23:15:24 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
 	  Add --version option
 
+Thu Mar 25 21:45:00 2004  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: Bug in + and - reported by Bret Jolly
+	  fixed.
+
+Thu Mar 25 21:01:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* version.c (ruby_show_copyright): obtain copyright year from
+	  RUBY_RELEASE_YEAR.
+
+	* win32/resource.rb: ditto.
+
+Thu Mar 25 19:37:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
+	  include them.
+
+	* win32/resource.rb: include winver.h for older WindowsCE.
+
+Thu Mar 25 14:01:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, */Makefile.sub (lib, dll): phony targets.
+
+	* configure.in (ruby, miniruby): ditto.
+
+	* cygwin/GNUmakefile.in (rubyw): ditto.
+
 Thu Mar 25 04:16:18 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
@@ -14267,7 +73772,7 @@ Thu Mar 25 02:00:18 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/template/html/one_page_html.rb (Page):
 	  Fix to work with C modules.
 
-Wed Mar 24 21:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Wed Mar 24 20:49:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
 	* lib/uri/common.rb: Ditto.
@@ -14277,17 +73782,13 @@ Wed Mar 24 21:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 	* lib/uri/https.rb: Ditto.
 	* lib/uri/ldap.rb: Ditto.
 	* lib/uri/mailto.rb: Ditto.
-	  (All backported from 1.9)
 
-Wed Mar 24 18:48:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 24 18:48:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
 	  DESTDIR after installed.
 
-	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
-	  nmake/bmake. [ruby-list:39388]
-
-	* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
+	* lib/mkmf.rb (dummy_makefile): default file lists to be cleaned.
 
 Wed Mar 24 12:32:56 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -14304,18 +73805,86 @@ Wed Mar 24 11:11:26 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
 	  Allow non-RDoc templates by putting a slash in the template name
 
-Mon Mar 22 16:19:57 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Mar 24 10:05:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ruby.1: add -width option to .Bl for old groff.
+	* lib/tempfile.rb (Tempfile::_close): should not clear @tmpname
+	  until the file is really removed. [ruby-core:02684]
+
+Wed Mar 24 04:12:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_cvar_get): new method Module#class_variable_get.
+
+	* object.c (rb_mod_cvar_set): ditto (Module#class_variable_set).
+
+Tue Mar 23 17:45:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_atfork): 1.9 warns no more for thread
+	  termination.  [ruby-dev:23212]
+
+Tue Mar 23 14:46:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):
+	  separate files under directories due to directory separator.
+
+	* */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be
+	  removed.
+
+	* win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit
+	  rules.
+
+	* cygwin/GNUmakefile.in: some mingw stuffs were missed.
+
+	* lib/mkmf.rb (create_makefile): Borland make wrongly removes braces
+	  from command lines.
+
+	* bcc32/Makefile.sub: needs bcc32/mkexports.rb.
+
+Mon Mar 22 08:21:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, */Makefile.sub, common.mk: extract common portions.
+
+	* Makefile.in, cygwin/GNUmakefile.in, */Makefile.sub (RBCONFIG):
+	  separated time stamp file for rbconfig.rb.
+
+	* configure.in: append common.mk to Makefile.
+
+	* mkconfig.rb: keep mtime of rbconfig.rb if unchanged.
+
+	* win32/rm.bat: remove multiple files.
+
+	* wince/mkconfig_wce.rb: use fake.rb instead.
+
+Sun Mar 21 22:17:35 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host):
+	  sort @virtual_hosts in address, port, host order.
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
+	  hostname should not be match if :ServerAlias is not given.
 
 Sun Mar 21 21:11:16 2004  Keiju Ishitsuka  <keiju@ishitsuka.com>
 
 	* lib/shell/*: bug fix for Shell#system(command_line_string).
 
-Sat Mar 20 20:57:10 2004  David Black  <dblack@wobblini.net>
+Sun Mar 21 21:04:42 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.1: add -width option to .Bl for old groff.
+
+Sun Mar 21 18:57:37 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/scanf.rb: Backported 1.9 branch
-	  modifications/corrections to 1.8 branch
+	* test/rss/*: Test::Unit::TestCase -> RSS::TestCase and
+	  Test::Unit::Assertions -> RSS::Assertions.
+
+Sun Mar 21 18:48:20 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/{rss,dublincore,syndication}.rb: handled W3CDTF correctly.
+
+Sun Mar 21 18:15:29 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_xml-stylesheet.rb: added tests for xml-stylesheet.
+
+	* lib/rss/xml-stylesheet.rb: added xml-stylesheet parsing
+	  function.
 
 Sat Mar 20 23:51:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
@@ -14325,58 +73894,164 @@ Sat Mar 20 23:51:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 	* eval.c (rb_f_raise): should not clear backtrace information if
 	  exception object already have one.
 
+Sat Mar 20 21:21:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb: rm -rf $extout, not extout.
+
 Sat Mar 20 15:25:36 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
 	  page background to white.
 
-Sat Mar 20 09:52:33 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Mar 20 09:33:36 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
 	  part of second minute that follows a comma or a full stop.
 
+Fri Mar 19 21:06:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (assoc_list): allow {sym: val} style Hash. [Ruby2]
+	  this change is done by Nobuyoshi Nakada <nobu@ruby-lang.org>.
+
+Fri Mar 19 15:15:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_cvar_set): class variables become private to the
+	  particular class/module. [Ruby2]
+
+	* variable.c (rb_cvar_get): ditto.
+
+	* variable.c (rb_cvar_defined): ditto.
+
+Fri Mar 19 11:31:32 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb ($beos, $solaris): add OS flags.
+
+	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
+	   nmake/bmake. [ruby-list:39388]
+
+	* lib/mkmf.rb (CLEANLIBS, CLEANOBJS): should remove *.exp with *.so.
+
 Fri Mar 19 01:55:57 2004  Mauricio Fernandez  <batsman.geo@yahoo.com>
 
 	* io.c (rb_io_sync): need not to check writable. [ruby-core:02674]
 
-Thu Mar 18 21:44:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Mar 18 19:47:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* instruby.rb, rubytest.rb: do not depend on srcdir.
+
+Thu Mar 18 18:50:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/drb/drb.rb: backport drb.rb 1.16.
+	* mkconfig.rb: no longer embed srcdir and compile_dir into
+	  rbconfig.rb.
 
-Fri Mar 18 17:49:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb, lib/mkmf.rb: obtain top_srcdir and topdir from library
+	  paths.
 
-	* struct.c (make_struct): allow const_id for accessor names.
-	  [ruby-core:04585]
+Thu Mar 18 17:46:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* eval.c (rb_attr): check if attribute name is local_id or
-	  const_id.
+	* lib/drb/drb.rb: do not undef :to_a.
 
 Thu Mar 18 16:22:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (proc_eq): avoid false positive by using scope and
 	  dyna_vars.  no longer use frame.uniq.
 
-Wed Mar 17 14:44:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (proc_arity): arity is now defined as number of
+	  parameters that would not be ignored. i.e. Proc.new{}.arity
+	  returns zero.  update test suites too.
+
+Thu Mar 18 15:27:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: remove specialized version of rb_Array().  use simple
+	  one defined in object.c.
+
+	* object.c (Init_Object): remove Kernel#to_a.
+
+	* enum.c (enum_zip): use "to_a" instead of "to_ary".
+
+Wed Mar 17 00:22:03 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 
-	* dir.c (range): fix possible "\0" overrun. (in case of "\0-")
+	* oniguruma.h: imported Oniguruma 2.2.5.
+	* regparse.c: ditto.
+
+Tue Mar 16 11:14:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (fnmatch_helper): File.fnmatch('\.', '.') should return true.
+	  (Rev1.112 lost compatiblity)
+
+	* dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
+	  should return true. (Rev1.112 lost compatiblity)
+
+	* dir.c (fnmatch): File.fnmatch('**/.boo', '.foo/.boo',
+	  File::FNM_PATHNAME) should return false because of leading period.
+
+Mon Mar 15 17:01:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (exc_initialize): calling 'to_str' each time just for
+	  type checking is too heavy.  [ruby-core:02661]
+
+Mon Mar 15 10:14:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SocketForwarder):
+	  add do_not_reverse_lookup.
 
 Mon Mar 15 07:39:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_yield_0): should not re-submit TAG_BREAK if this
 	  yield is not break destination. [ruby-dev:23197]
 
-Sat Mar 13 14:28:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Mar 14 22:07:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main
-	  trunk)
+	* eval.c (rb_thread_raise): err at unstarted thread.  (PR#1302)
 
-	* test/drb/test_drbunix.rb: ditto.
+Sat Mar 13 14:56:32 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
+
+	* test/drb/ut_eval.rb: ditto.
 
-Wed Mar 10 22:28:09 2004  Minero Aoki  <aamine@loveruby.net>
+	* test/drb/ut_large.rb: ditto.
+
+	* test/drb/ut_safe1.rb: ditto.
+
+	* test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
+
+Fri Mar 12 23:52:56 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (fnmatch): directory recursion '**/' can be used with
+	  File::FNM_PATHNAME. [ruby-dev:22901]
+
+	* dir.c (fnmatch, fnmatch_helper): only '/' is accepted as path
+	  separator even in DOSISH environment. [ruby-dev:22974]
+	  [ruby-list:39337]
+
+	* dir.c (fnmatch_helper): faster '*' matching.
+
+Fri Mar 12 20:19:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_noreturn): default for platforms not support
+	  prototypes.
+
+	* ruby.c (ruby_init_loadpath): buffer for path name should have
+	  MAXPATHLEN.
+
+	* lib/mkmf.rb (configuration): include topdir and hdrdir in VPATH.
+
+	* lib/mkmf.rb (create_makefile): default dependency rule.
+
+Fri Mar 12 07:35:36 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/config.rb (WEBrick::Config::General): add
+	  :DoNotReverseLookup.
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call
+	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
+	  is set.  [ruby-code:02357]
+
+Wed Mar 10 22:26:25 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (remove_dir): should handle symlink correctly.
 	  This patch is contributed by Christian Loew.  [ruby-talk:94635]
-	  (Backport from main trunk)
 
 Wed Mar 10 16:28:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -14387,54 +74062,337 @@ Wed Mar 10 16:28:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_yield_0): set exit_value for block break.
 
-Wed Mar 10 15:58:43 2004  Ryan Davis  <ryand@zenspider.com>
+Wed Mar 10 16:00:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_s_def): Struct::new executes block with
+	  generated struct class. [ruby-talk:02606]
+
+Wed Mar 10 15:58:43 2004  Ryan Davis  <ryand-ruby@zenspider.com>
 
 	* eval.c (eval): Only print backtrace if generating the backtrace
 	  doesn't generate an exception.  [ruby-core:02621]
 
+Wed Mar 10 10:15:16 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (opt_W_getter): get rid of warning.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
+	  fixed dependency.
+
 Tue Mar  9 13:04:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_ungetc): raise IOError instead of calling
 	  rb_sys_fail().  [ruby-talk:23181]
 
-Mon Mar  8 19:32:28 2004  akira yamada  <akira@ruby-lang.org>
+Tue Mar  9 10:03:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
+	  replaced regex.c entry with Oniguruma files.
+
+Tue Mar  9 01:09:46 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* Makefile.in: replaced regex.c entry with Oniguruma files.
+
+Mon Mar  8 23:16:07 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: HTTPHeader did not initialized correctly.
+
+	* lib/net/http.rb (connect): does same debug output.
+
+Mon Mar  8 21:38:18 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (add_header): remove warning. [ruby-dev:23170]
+
+Mon Mar  8 21:09:39 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (range): Cancel change for incomplete '['. More discussion
+	  is needed.
+
+Mon Mar  8 19:35:13 2004  akira yamada  <akira@arika.org>
 
 	* lib/uri/common.rb (URI::REGEXP::PATTERN::HOSTPORT): (?:#{PORT})
 	  -> (?::#{PORT}).  [ruby-dev:23170]
 
-Mon Mar  8 15:31:41 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Mar  8 15:03:24 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (range): treat incomplete '[' as ordinary character (like
-	  has_magic does).
+	  has_magic does). fix buffer overrun at incomplete escape like '[\'.
 
-	* dir.c (range):  Cancel above change. More discussion is needed.
+Mon Mar  8 13:35:32 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Sun Mar  7 22:37:46 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* regparse.c (parse_exp): need to separate initialization for bcc32.
+	  [ruby-dev:23169]
 
-	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
+	* oniguruma.h (ONIG_EXTERN): check __GNUC__ instead of __CYGWIN__.
 
-	* test/drb/ut_eval.rb: ditto.
+Mon Mar  8 01:05:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* test/drb/ut_large.rb: ditto.
+	* lib/webrick/config.rb (WEBrick::Config::HTTP): rename :RequestHander
+	  to :RequestCallback and add new option :ServerAlias.
 
-	* test/drb/ut_safe1.rb: ditto.
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): use
+	  :RequestCallback and warn if :RequestHandler is in server's option.
 
-	* test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should print
+	  error message for WEBrick::HTTPSataus::Error.
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
+	  lookup for hostname from :ServerAlias if the req.host is not match
+	  to :ServerName.
+
+	* lib/webrick/httpservlet.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
+	  use $?.exitstatus and refine log message.
 
 Sun Mar  7 16:22:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* Makefile.in (lex.c): use $? instead of $<.
 
-Fri Mar  5 00:54:14 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
+	  [ruby-dev:23157]
+
+Sun Mar  7 05:34:42 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: HTTPHeader keeps its header fields as an array.
+
+	* lib/net/http.rb: new method HTTPHeader#add_header, get_fields.
+
+	* lib/net/http.rb: new method HTTPHeader#content_length=.
+
+	* lib/net/http.rb: new method HTTPHeader#content_type, main_type,
+	  sub_type, type_params, content_type=, set_content_type.
+
+	* lib/net/http.rb (HTTPHeader#basic_encode): result of pack(m) may
+	  contain multiple LFs.
+
+Sun Mar  7 03:11:00 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: new method Net::HTTPRequest#body(=).
+
+	* lib/net/http.rb: new method Net::HTTPRequest#body_stream(=).
+
+Sun Mar  7 02:06:07 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: spin off https code again.
+
+	* lib/net/https.rb: new file.
+
+	* ext/openssl/lib/net/https.rb: removed.  moved to net/https with
+	  slight modifications.
+
+	* ext/openssl/lib/net/protocols.rb: removed.  merged with net/http.
+
+	* lib/net/protocol.rb: new class BufferedIO.
+
+	* lib/net/protocol.rb: InternetMessageIO < BufferedIO.
+
+	* lib/net/protocol.rb: BufferedIO.new takes an IO.
+
+	* lib/net/smtp.rb: follow InternetMessageIO's change.
+
+	* lib/net/pop.rb: ditto.
+
+Sun Mar  7 00:55:03 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: remove method: InternetMessageIO#address,
+	  port, ip_address, read_timeout(=), socket.
+
+	* lib/net/protocol.rb: simplify code.
+
+	* lib/net/protocol.rb: apply latest coding style.
+
+Sat Mar  6 15:15:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/strscan/depend: depends on re.h and regex.h.
+
+	* ext/strscan/strscan.c: no version check needed.
+
+	* ext/strscan/strscan.c (strscan_init_copy): struct re_registers must
+	  not be bitwise copied.
+
+Sat Mar  6 11:14:33 2004  David Black  <dblack@wobblini.net>
+
+	* lib/scanf.rb: refixed the previous fix in IO#block_scanf
+
+Sat Mar  6 10:49:40 2004  David Black  <dblack@wobblini.net>
+
+	* lib/scanf.rb: fixed a logic glitch in IO#block_scanf
+
+Sat Mar  6 02:00:19 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: net/https is merged.
 
-	* lib/test/unit.rb: MOve RDoc documentation so that you can
+	* ext/openssl/lib/net/https.rb: ditto.
+
+Sat Mar  6 00:39:21 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* oniggnu.h: imported from Oniguruma library.
+	* oniguruma.h: ditto.
+	* regcomp.c: ditto.
+	* regenc.c: ditto.
+	* regenc.h: ditto.
+	* regerror.c: ditto.
+	* regex.c: ditto.
+	* regexec.c: ditto.
+	* reggnu.c: ditto.
+	* regint.h: ditto.
+	* regparse.c: ditto.
+	* regparse.h: ditto.
+	* ascii.c: ditto.
+	* euc_jp.c: ditto.
+	* sjis.c: ditto.
+	* utf8.c: ditto.
+
+	* MANIFEST: added Oniguruma files listed above.
+
+	* LEGAL: added Oniguruma license.
+
+	* regex.h: now includes oniggnu.h.
+
+	* re.c: applied Oniguruma patch.
+
+Fri Mar  5 23:13:08 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: support WebDAV methods, PROPPATCH, LOCK,
+	  UNLOCK, OPTIONS, PROPFIND, DELETE, MOVE, COPY, MKCOL.
+	  This patch is contributed by Tatsuki Sugiura.
+
+Fri Mar  5 20:58:37 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: Net::HTTPResponse#response is obsolete.
+	  [ruby-core:02592]
+
+	* lib/net/http.rb: Net::HTTPResponse#header is obsolete.
+
+	* lib/net/http.rb: Net::HTTPResponse#read_header is obsolete.
+
+Fri Mar  5 20:10:57 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: new method StringScanner#initialize_copy
+	  to allow #dup and #clone.
+
+	* test/strscan/test_strscan.rb: test StringScanner#dup.
+
+Fri Mar  5 19:42:09 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTPResponse#to_ary): should return an object
+	  which does not respond to #to_ary.  It causes infinite loop in
+	  puts. [ruby-core:02578]
+
+Fri Mar  5 00:51:35 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/test/unit.rb: Move RDoc documentation so that you can
 	  now say 'ri Test::Unit'
 
-Tue Mar  2 12:32:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar  4 22:31:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in: miniruby is not needed for cross compile.
+
+	* configure.in (PREP): miniruby for native compile.
+
+Thu Mar  4 11:46:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
+	  detach server processes to get rid of zombies.
+
+Thu Mar  4 10:41:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (T_MASK): save 1 bit in flags bits by shifting T_xxx
+	  values.
+
+Thu Mar  4 08:08:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c: get rid of warnings.
+
+	* lib/rss/taxonomy.rb: ditto.
+
+	* lib/rdoc/ri/ri_formatter.rb: ditto.
+
+	* test/ruby/test_assignment.rb: ditto.
+
+Thu Mar  4 01:17:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/ri_display.rb (DefaultDisplay::page): wait until the
+	  pager terminates.
+
+Wed Mar  3 13:10:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_hash): new method. [ruby-talk:93968]
+
+	* eval.c (proc_eq): do not compare dyna_vars.
+
+	* eval.c (proc_hash): new method.
+
+	* eval.c (rb_yield_0): protect break/return from within orphan (or
+	  lambda) Proc object.
+
+Wed Mar  3 09:52:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb ($topdir): use compile_dir only when not installed yet.
+	  [ruby-talk:94098]
+
+Wed Mar  3 01:18:52 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/converter.rb: handled Uconv::Error.
+
+	* lib/rss/dublincore.rb: DublincoreModel -> DublinCoreModel
+
+Wed Mar  3 00:59:30 2004  David Black  <dblack@wobblini.net>
+
+	* lib/scanf.rb: soak_up_spaces only ungetc's non-space last
+	  character
+
+	* lib/scanf.rb: IO#block_scanf now returns partial last iteration
+	  array if format string matches partly
+
+Tue Mar  2 16:30:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): erred program name should be reported by
+	  exceptions, instead of the first argument.
+
+	* process.c (rb_spawn): ditto.
+
+	* process.c (proc_spawn_v): use first argument as program name.
+
+	* win32/win32.c (rb_w32_aspawn): ditto.
+
+	* win32/win32.c (CreateChild): search executable file if no program
+	  name given.
+
+	* lib/drb/extservm.rb (invoke_service_command): use Process.spawn.
+	  [ruby-dev:23103]
+
+	* lib/rdoc/ri/ri_display.rb (setup_pager): use IO.popen.
+	  [ruby-dev:23086], [ruby-dev:23103]
+
+	* lib/rdoc/diagram.rb (convert_to_png): ditto.
+
+	* lib/rdoc/generators/chm_generator.rb (compile_project): ditto.
+
+Tue Mar  2 12:24:03 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
 	  defined? NORETURN. [ruby-dev:23100]
 
+Tue Mar  2 11:28:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_iterator.rb (test_ljump): cannot use
+	  assert_nothing_raised due to passing block.
+
+Tue Mar  2 06:23:14 2004  David Black  <dblack@wobblini.net>
+
+	* lib/scanf.rb: fixed Kernel#scanf to propagate code block
+
+Mon Mar  1 23:25:40 2004  David Black  <dblack@wobblini.net>
+
+	* lib/scanf.rb: Partial fix so STDIN#scanf works with new
+	 STDIN#pos behavior
+
+Mon Mar  1 19:42:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/setup.mak: configure's default is "--enable-install-doc"
+
+	* win32/setup.mak: ditto.
+
 Mon Mar  1 12:24:10 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
@@ -14445,38 +74403,105 @@ Sun Feb 29 23:14:53 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
 	  Handle :nodoc: on singleton classes.
 
-Sat Feb 28 10:58:49 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 28 21:50:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bcc32/Makefile.sub, bcc32/README.bcc32, bcc32/configure.bat,
+	  bcc32/setup.mak: new configure scheme. use ``configure --prefix=dir''
+	  instead of ``make DESTDIR=dir install''.
+	  --with-static-linked-ext support on bccwin32. [ruby-dev:23034]
+
+Sat Feb 28 21:50:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/setup.mak: "configure --disable-install-doc" is now working.
+
+	* win32/setup.mak: ditto.
+
+Sat Feb 28 15:09:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/configure.bat: append missing label ":exit".
+
+	* bcc32/configure.bat: fix typo.
+
+Sat Feb 28 10:31:03 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* MANIFEST: add test_erb.rb
 
 	* lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
 	  if both filename and safe_level given. [ruby-dev:23050]
 
-Fri Feb 27 01:00:09 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 28 01:08:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): should not allow symbol for invalid global
+	  variable (e.g. `:$-)`). [ruby-core:02518]
+
+Fri Feb 27 20:37:09 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): no orphan block check is needed when pcall
+	  is true.
+
+	* eval.c (localjump_destination): update localjump condition.
+
+Fri Feb 27 02:10:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (localjump_destination): lambda should not interfere
+	  return from the yielded block.
+
+Fri Feb 27 00:53:49 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default
 
-Wed Feb 25 21:16:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb 26 12:15:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (make_cmdvector): adjust successive double-quote
+	  handling.
+
+Thu Feb 26 09:42:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (delete_if_i): use st_delete_safe() (via
+	  rb_hash_delete()) instead of returning ST_DELETE.
+
+Thu Feb 26 02:35:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_f_exec): get rid of SEGV when exec failed for command
+	  in single string.
+
+Wed Feb 25 21:17:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (obj_free), io.c (rb_io_fptr_finalize), rubyio.h (OpenFile):
+	  sharing OpenFile.
+
+	* io.c (rb_io_initialize): accept IO instance.  [ruby-dev:22195]
+
+Wed Feb 25 21:16:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (with_destdir): should return the given argument if no
 	  DESTDIR is given.
 
 	* instruby.rb: use path name expansion of cmd.exe.
 
-Wed Feb 25 09:35:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Feb 25 20:44:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* error.c (NameError::Message): new class for lazy evaluation of
-	  message to ensure replaced before marshalling. merge from HEAD.
-	  (ruby-bugs-ja:PR#588)
+	* lib/cgi-lib.rb, lib/getopts.rb, lib/importenv.rb, lib/parsearg.rb:
+	  warn with caller position.
 
-	* eval.c (rb_method_missing): use NameError::Message. merge from
-	  HEAD. (ruby-bugs-ja:PR#588)
+	* test/rss/test_content.rb, test/rss/test_dublincore.rb,
+	  test/rss/test_syndication.rb, test/rss/test_trackback.rb: use cgi
+	  instead of cgi-lib.
 
-Tue Feb 24 18:59:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Feb 24 18:42:03 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (glob_helper): '**/' should not match leading period
 	  unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
 
+Tue Feb 24 18:03:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_file.rb (test_fnmatch): test for dir.c:1.108.
+
+Tue Feb 24 17:07:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (fnmatch): File.fnmatch with File::FNM_PATHNAME was broken
+	  for the pattern including '*' followed by '/'.
+
 Tue Feb 24 13:22:21 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better
@@ -14494,11 +74519,6 @@ Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
 	  class variables in code listings
 
-Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
-	  class variables in code listings
-
 Tue Feb 24 06:32:27 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle
@@ -14527,88 +74547,164 @@ Tue Feb 24 03:45:06 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_config.c (Init_ossl_config): include Enumerable.
 
-Mon Feb 23 09:16:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb 23 09:09:44 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (parse_args): use optparse instead of getopts.
 
 	* instruby.rb (DOSISH): embedded path in batch files should not be
 	  prefixed by DESTDIR.  [ruby-core:02186]
 
-Sun Feb 22 09:54:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb 22 14:58:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: $extstatic is Array or nil now.  [ruby-talk:93383]
 
-	* re.c: corrected documentation format (again)
+	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: terminate options.
 
-Sun Feb 22 09:43:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
+
+Sun Feb 22 13:05:37 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
+
+Sun Feb 22 12:58:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: use optparse instead of getopts.
+
+	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: ditto.
+
+Sun Feb 22 09:51:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* re.c: corrected documentation format (rb_reg_initialize_m)
 
-Sat Feb 21 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Feb 21 22:41:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* ext/zlib/zlib.c: documented, but needs more effort.
 
-Sat Feb 21 11:12:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 21 14:33:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: prefer relative path.  [ruby-talk:93037]
+
+Sat Feb 21 11:12:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* missing/os2.c, missing/x68.c: typo fix.  pointed out by greentea.
 
+Fri Feb 20 19:11:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (OpenStruct#initialize_copy): should not share
+	  members.  [ruby-dev:22966]
+
 Fri Feb 20 18:59:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/init.rb (IRB::IRB.parse_opts): add -I option to
 	  irb. [ruby-dev:39243]
 
-Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
+Fri Feb 20 12:55:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
-	  Support visibility modifiers for attributes
+	* io.c (pipe_open): fix typo.
+
+	* win32/win32.c (CreateChild): first argument to CreateProcess() must
+	  have path, not just basename.
 
 Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
 	  Support visibility modifiers for attributes
 
+Thu Feb 19 22:39:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/ostruct.rb: documented
+
 Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
 	  DRb.start_service could handle this.
 
-Thu Feb 19 22:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 19 22:24:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* lib/ostruct.rb: documented
+	* lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
+	  [ruby-dev:22588]
+	  c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
 
-Thu Feb 19 21:28:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 19 18:08:18 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* ext/strscan/strscan.c: improved documentation
 
-Thu Feb 19 03:10:52 2004  Minero Aoki  <aamine@loveruby.net>
+Thu Feb 19 18:08:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c, win32/win32.h: fixed prototypes.
+
+	* win32/win32.c (wait): same as waitpid() with -1.
+
+Thu Feb 19 02:34:28 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::include_file):
+	  Only strip comment markers if all lines start with comments.
+
+Thu Feb 19 03:05:49 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: StringScanner#restsize is obsolete;
+	  use #rest_size instead.
 
-	* ext/strscan/strscan.c: synchronized with main trunk (rev 1.11).
+	* ext/strscan/strscan.c: StringScanner#matchedsize is obsolete;
+	  use #matched_size instead.
 
-Thu Feb 19 02:30:34 2004  Minero Aoki  <aamine@loveruby.net>
+Thu Feb 19 02:42:19 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/strscan/strscan.c: documentation checked.
+	* ext/strscan/strscan.c: don't use rb_eval_string, it defines
+	  classes under the module when required in module clauses.
+	  [ruby-dev:22951]
+
+Thu Feb 19 02:37:28 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: merge documentation from 1.8 branch.
+	  Thanks Gavin Sinclair.
+
+Thu Feb 19 00:20:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/cgi-lib.rb:   deprecated after 1.8.1
+
+	* lib/getopts.rb:   ditto
+
+	* lib/importenv.rb: ditto
+
+	* lib/parsearg.rb:  ditto
 
 Thu Feb 19 00:11:05 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
 	  Strip extraneous space from filenames in :include:
 
-Wed Feb 18 22:52:00 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Feb 18 22:53:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
+	* lib/drb/unix.rb: remove O_NONBLOCk, thanks \ay
 
-Wed Feb 18 22:47:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Wed Feb 18 22:42:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* ext/strscan/strscan.c: documented
+	* test/rinda/test_rinda.rb: improt test_rinda.rb
 
 Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/*: should not depend on $KCODE.
 
+Wed Feb 18 18:07:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_sprintf.rb: added tests.
+
 Wed Feb 18 17:18:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/win32ole/win32ole.c: need to include <olectl.h> on Cygwin.
 
 Wed Feb 18 10:40:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* sprintf.c (rb_f_sprintf): sign bit extension should not be done
+	  if FPLUS flag is specified.  [ruby-list:39224]
+
 	* sprintf.c (rb_f_sprintf): do not prepend dots for negative
-	  numbers if FZERO is specified.  [ruby-list:39218]
+	  numbers if FZERO is specified.  [ruby-dev:39218]
+
+Wed Feb 18 10:23:34 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): clean up.
 
 Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
 
@@ -14617,6 +74713,11 @@ Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
 
 Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
+	* test/soap/marshal/test_marshal.rb, test/ruby/test_marshal.rb: do $:
+	  trick to share the testcase test/ruby/marshaltestlib.rb.
+
+Tue Feb 17 23:13:23 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
 	* test/ruby/marshaltestlib.rb: common marshal testcase added.
 
 	* test/ruby/test_marshal.rb: use above testsuite.
@@ -14625,108 +74726,282 @@ Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/soap/marshal/cmarshal.rb: removed (not used).
 
-Tue Feb 17 10:51:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Feb 17 19:34:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+	* ext/extmk.rb (extmake): $extout_prefix doesn't vary for libraries.
 
-Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
+	* ext/extmk.rb (extmake): remove compile directory if empty.
 
-	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
-	  to NODE_LIT.  [ruby-dev:22920]
+	* ext/extmk.rb (parse_args) lib/mkmf.rb (create_makefile): move
+	  initialization of $extout_prefix from lib/mkmf.rb.  [ruby-dev:22928]
 
-Tue Feb 17 01:24:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/extmk.rb: clear ext and extout directory when cleaning.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
-	  STACK_GROW_DIRECTION. [ruby-dev:22910]
+	* lib/mkmf.rb (CLEANLIBS): should be under $(arch) directory.
 
-	* bcc32/Makefile.sub (config.h): add newer checks.
+Tue Feb 17 18:02:10 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
+	* ext/strscan/strscan.c: ScanError may be (wrongly) garbage
+	  collected. (thanks Gavin Sinclair)
+
+	* ext/strscan/strscan.c: move ::ScanError to StringScanner::Error.
+	  ::ScanError is also defined for backward compatibility.
 
-Tue Feb 17 00:38:10 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ext/strscan/strscan.c: #peep is obsolete, use #peek.
 
-	* lib/rinda/tuplespace.rb: TupleSpace#initialize, stop doubling timeout
+	* ext/strscan/strscan.c: #empty? is obsolete, use #eos?.
 
-Tue Feb 17 00:18:03 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ext/strscan/strscan.c: #clear is obsolete, use #terminate.
 
-	* test/rinda/test_rinda.rb: import test_rinda.rb
+	* ext/strscan/strscan.c: #getbyte is obsolete, use #get_byte.
 
-Tue Feb 17 00:14:30 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Feb 17 12:12:47 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (parse_args): delay expanding $(extout) until invoking
+	  make.
+
+	* lib/mkmf.rb (CLEANLIBS): should remove files have specific
+	  extensions.
 
-	* bcc32/Makefile.sub: avoid warning "Redefinition of macro
-	  'HAVE_GETLOGIN'".
+Tue Feb 17 11:33:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vms/config.h_in: ditto.
+	* lib/rss/rexmlparser.rb: REXML version may be 4 digits.
+
+Tue Feb 17 10:45:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+
+Tue Feb 17 07:48:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rexml/encodings/SHIFT_JIS: wrong library name.
+
+Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
+	  to NODE_LIT.  [ruby-dev:22920]
+
+Tue Feb 17 01:20:57 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: new module FileUtils::DryRun.
 
 Mon Feb 16 23:28:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/csv.rb: document reduction.  [ruby-core:02429]
 
-Mon Feb 16 22:08:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* test/yaml/test_yaml.rb: added 0..1 test with "0".."1" on display.
+	  it should be defined that the specification about what kind of Range
+	  is supported in ruby's custom type in YAML.
+
+Mon Feb 16 22:22:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/generator.rb: corrected doc format
+
 	* lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
+
 	* lib/rinda/tuplespace.rb: ditto
 
-Mon Feb 16 20:41:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	  [Note: rinda files actually committed Wed Feb 18 07:27:00 2004]
+
+Mon Feb 16 20:28:52 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: show more warnings. (refering to mingw)
 
 	* bcc32/setup.mak: ditto.
 
-Mon Feb 16 13:39:44 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Feb 16 18:35:58 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): should create *.pdb on ext/,
+	  not .ext/.
+
+	* win32/Makefile.sub (config.status): convert the name of import
+	  library.
+
+	* lib/mkmf.rb (create_makefile): now don't need to remove
+	  $(TARGET).lib.
+
+Mon Feb 16 15:45:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check functions, fork spawnv.
+
+	* io.c (rb_io_s_popen): accept argv not only single command line.
+
+	* process.c (rb_proc_exec_n): export.
+
+	* process.c (rb_check_argv): check if arguments are safe to invoke.
+
+	* process.c (rb_fork): retry to fork.
+
+	* process.c (rb_spawn): spawn child process asynchronously.
 
-	* dir.c (rb_glob, rb_globi): add const.
+	* process.c (rb_f_system): raise an exception if the command could not
+	  execute.
 
-	* ruby.h: ditto.
+	* win32/win32.c (rb_w32_argv_size): count necessary size for joined
+	  arguments.
+
+	* win32/win32.c (rb_w32_join_argv): join arguments with quoting.
+
+	* win32/win32.c (rb_w32_pipe_exec, rb_w32_spawn, rb_w32_aspawn):
+	  accept program name adding to command line.
+
+Mon Feb 16 15:18:33 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/racc/parser.rb: add note for Racc full package.
+
+Mon Feb 16 15:13:01 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/racc/cparse/README: new file.
 
-Mon Feb 16 02:16:33 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/racc/cparse/MANIFEST: add README.
+
+Mon Feb 16 12:29:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_s_list): new method Iconv.list
+	  (libiconv only).
+
+Mon Feb 16 10:29:52 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (CompareImpl): File.fnmatch and Dir.glob get better performance
+	  in Win32. This is achived by calling downcase() for single-byte
+	  characters. (CharLower() is slower than downcase())
+
+Mon Feb 16 02:14:29 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: should warn suspicious pointer conversion.
 
 	* bcc32/setup.mak: ditto.
 
-Sun Feb 15 19:06:42 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Feb 15 20:56:22 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (push_braces): remove wrong const. [ruby-dev:22891]
+
+Sun Feb 15 20:41:15 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* lib/rinda/tuplespace.rb: TupleSpace#read(tpl, 0), raise
-	  RequestExpiredError if not found.
+	* sample/soap/calc/httpd.rb, sample/soap/exchange/httpd.rb,
+	  sample/soap/sampleStruct/httpd.rb, sample/wsdl/googleSearch/httpd.rb:
+	  use soap/property instead of getopts for configuring DocumentRoot
+	  and port# of httpd.  see samplehttpd.conf below.
 
-Sun Feb 15 15:56:46 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* sample/soap/calc/samplehttpd.conf,
+	  sample/soap/exchange/samplehttpd.conf,
+	  sample/soap/sampleStruct/samplehttpd.conf,
+	  sample/wsdl/googleSearch/samplehttpd.conf: added.
+
+Sun Feb 15 19:13:33 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb: read(tpl,0), raise RequestExpiredError
+	  if not found.
+
+Sun Feb 15 15:48:57 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
 	  Thanks, arton.
 
+Sun Feb 15 15:23:29 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ruby.h, dir.c (rb_glob): add const.
+
 Sun Feb 15 01:46:05 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
 	  [ruby-dev:22870]
 
-Sat Feb 14 11:29:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 14 23:59:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: use fileutils.rb instead of ftools.rb.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
+	  STACK_GROW_DIRECTION.
+
+	* bcc32/Makefile.sub (config.h): add newer checks.
+
+	* wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
+
+Sat Feb 14 23:26:27 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/un.rb: use OptionParser instead of getopts.
+
+Sat Feb 14 11:28:14 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* sample/drb/*: import lib/drb/sample
 
-Sat Feb 14 11:08:23 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 14 11:14:12 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: add pretty_print, thanks gotoken.
 
-Fri Feb 13 12:35:08 2004  Minero Aoki  <aamine@loveruby.net>
+Fri Feb 13 21:51:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/fileutils.rb: slighly improved documentation (sync with 1.8)
+
+Fri Feb 13 19:57:01 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_trackback.rb: added tests for TrackBack with RSS
+	  2.0.
+
+	* test/rss/common.rb: added methods make RSS 2.0.
+
+	* lib/rss/trackback.rb: TrackBack API is decided.
+
+	* lib/rss/rss.rb: RSS::VERSION 0.0.7 -> 0.0.8.
+
+	* lib/rss/parser.rb, lib/rss/rss.rb: replaced $DEBUG by RSS::DEBUG.
+
+	* lib/rss/2.0.rb: removed RSS 2.0 URI. Because RSS 2.0 doesn't
+	  have URI.
+
+Fri Feb 13 14:41:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: en-bugged at last commit (Feb 11 23:24:22 2004)
+
+Fri Feb 13 12:26:37 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: rescue SystemCallError instead
+	  of EINVAL.  File.link may raise EACCES on network file systems.
 
-	* test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
-	  EACCES on Windows.
+Fri Feb 13 05:18:58 2004  Minero Aoki  <aamine@loveruby.net>
 
-Thu Feb 12 21:45:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on
+	  Win9x. [ruby-dev:22713]
+
+Thu Feb 12 21:49:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/ftools.rb: documented
 
-Thu Feb 12 21:25:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 12 21:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/base64.rb: added and tidied documentation
 
-	* lib/base64.rb: backported from HEAD (modularised and documented)
+Thu Feb 12 20:45:01 2004  Minero Aoki  <aamine@loveruby.net>
 
-Thu Feb 12 20:31:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/protocol.rb (WriteAdapater#puts): must append "\n" to
+	  the string, don't prepend. (ruby-bugs:PR#1280)
+
+Thu Feb 12 20:31:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
 	  directives in DOS line-ending files at all.
 
+Thu Feb 12 15:23:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rparen): ignore preceding newlines to right parentheses.
+	  (ruby-bugs:PR#1221) [ruby-dev:22858]
+
+Thu Feb 12 14:17:43 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set ac_cv_func_link to yes to enable link() on MinGW.
+	  [ruby-dev:22241]
+
+Thu Feb 12 13:32:49 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (link): raise NotImplementedError on Win9X.
+	  contributed by Tietew. [ruby-dev:22713]
+
+	* win32/win32.c, win32/win32.h (link): add const.
+
+Thu Feb 12 09:56:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/lib/tk.rb (TkComm::tk_split_list): suppress a warning.
+
 Thu Feb 12 02:23:56 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb: use assert_raise instead of assert_raises.
@@ -14738,26 +75013,91 @@ Thu Feb 12 02:23:56 2004  Tanaka Akira  <akr@m17n.org>
 	* lib/tsort.rb: ditto.
 	  use TSortHash and TSortArray instead of Hash and Array in test.
 
-Wed Feb 11 20:01:12 2004  akira yamada  <akira@ruby-lang.org>
+Wed Feb 11 23:24:22 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: properly treat a Tcl/Tk's string with escaping
+	  special characters.
+
+Tue Feb 10 20:49:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (method_proc): return bound Proc object.  [ruby-dev:22854]
+
+	* eval.c (rb_mod_define_method): bind method body itself for Method
+	  object.
+
+	* node.h (NODE_DMETHOD): deprecated.
+
+	* object.c (rb_class_inherited_p): export.
+
+Tue Feb 10 16:43:50 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (umethod_bind): purge unused check.  [ruby-dev:22850]
+
+Tue Feb 10 14:33:08 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_match): raise TypeError when both arguments are
+	  strings. [ruby-dev:22851]
+
+	* string.c (rb_str_match2): removed.
+
+	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
+	  wince/Makefile.sub (string.c): now not depend on version.h.
+
+Mon Feb  9 17:46:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub, configure.in,
+	  runruby.rb: run rdoc, test and so on with compiled extension
+	  libraries.  [ruby-dev:22688]
+
+	* ext/extmk.rb, lib/mkmf.rb: make extension libraries in separated
+	  directory, similar to the actual directory structure.
+
+	* lib/fileutils.rb (FileUtils.copy_file): use the mode of the original
+	  file to create new file.
+
+	* lib/rdoc/ri/ri_paths.rb (RI::Paths::SYSDIR): get rid of unexpected
+	  influence by environment variable.
+
+	* bcc32/configure.bat, win32/configure.bat: add install-doc options.
+
+	* win32/win32.c, win32/win32.h (rb_w32_fstat): fix Borland C runtime
+	  bug which returns wrong mode.  [ruby-dev:22846]
+
+Mon Feb  9 16:30:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (detach_process_watcher): return the last status.
+	  [ruby-dev:22841]
+
+Sun Feb  8 16:46:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
+	  sign for higher heap areas.
+
+Sun Feb  8 16:18:27 2004  akira yamada  <akira@ruby-lang.org>
+
+	* test/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
+	  added tests.
+
+Sun Feb  8 15:51:57 2004  akira yamada  <akira@ruby-lang.org>
 
 	* test/ruby/test_file.rb (TestFile::test_fnmatch): added tests for
 	  File.fnmatch. [ruby-dev:22815][ruby-dev:22819]
 
-	* test/ruby/test_proc.rb (TestProc::test_eq): added a
-	  test.  [ruby-dev:22599]
+Sun Feb  8 15:41:45 2004  akira yamada  <akira@ruby-lang.org>
 
-	* test/ruby/test_proc.rb (TestProc::test_eq): added tests for
-	   Proc#==.  [ruby-dev:22592], [ruby-dev:22601]
+	* test/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
+	  added tests. [ruby-core:02306] [ruby-core:02311]
 
-Tue Feb 10 16:43:56 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb  8 14:24:35 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (umethod_bind): purge unused check.  [ruby-dev:22850]
+	* lib/net/http.rb (HTTP#request): should not overwrite Connection
+	  header. (ruby-bugs:PR#1274)
 
-Mon Feb  9 17:16:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sun Feb  8 10:11:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
+	* dir.c (glob_helper): Dir.glob('**/') did not work. [ruby-dev:22832]
 
-Mon Feb  9 13:00:55 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Feb  8 00:29:26 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
 	  [ruby-dev:22815]
@@ -14765,10 +75105,14 @@ Mon Feb  9 13:00:55 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	* dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
 	  [ruby-dev:22819]
 
-Sun Feb  8 16:46:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c: Did some styles (no change to behavior)
 
-	* lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
-	  sign for higher heap areas.
+Sat Feb  7 19:56:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/init.rb (IRB.rc_files): yield possible rc file names.
+
+	* lib/irb/input-method.rb (IRB::ReadlineInputMethod::initialize):
+	  load and save history automatically.  [ruby-core:02352]
 
 Fri Feb  6 22:48:16 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -14785,6 +75129,27 @@ Fri Feb  6 22:22:50 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
 	  variable which is defined in the test.
 
+Fri Feb  6 18:54:18 2004  akira yamada  <akira@ruby-lang.org>
+
+	* test/ruby/test_proc.rb (TestProc::test_eq): added a
+	  test.  [ruby-dev:22599]
+
+Fri Feb  6 18:26:00 2004  akira yamada  <akira@ruby-lang.org>
+
+	* test/ruby/test_proc.rb (TestProc::test_eq): added tests for
+	  Proc#==.  [ruby-dev:22592], [ruby-dev:22601]
+
+Fri Feb  6 10:12:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (bsock_do_not_reverse_lookup): control reverse
+	  lookup for every instance.  [ruby-core:02346]
+
+Fri Feb  6 09:15:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/extend-command.rb: add irb_help command.  [ruby-talk:91610]
+
+	* lib/irb/cmd/help.rb (IRB::ExtendCommand::Help): show RDoc.
+
 Fri Feb  6 00:48:37 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/prettyprint.rb (PrettyPrint#first?): obsoleted.
@@ -14801,6 +75166,10 @@ Thu Feb  5 23:56:55 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/set.rb (Set#pretty_print): use seplist.
 
+Wed Feb  4 22:39:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_stat_mode): should not sign-expand, so backout.
+
 Wed Feb  4 02:12:06 2004  Tanaka Akira  <akr@m17n.org>
 
 	* file.c (test_l): fix wrong method name in document.
@@ -14811,19 +75180,37 @@ Wed Feb  4 02:12:06 2004  Tanaka Akira  <akr@m17n.org>
 	  (test_sgid): ditto.
 	  (test_sticky): ditto.
 
+Tue Feb  3 22:36:25 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/2.0.rb, lib/rss/content.rb, lib/rss/dublincore.rb,
+	  lib/rss/rss.rb, lib/rss/syndication.rb: removed warnings.
+
+	* lib/rss/converter.rb: removed handling load error of nkf.
+
+	* test/rss/test_syndication.rb, test/rss/test_trackback.rb,
+	  test/rss/test_dublincore.rb, test/rss/test_content.rb: replaced
+	  'require "rss/parser"' by 'require "rss/1.0"'.
+
+	* test/rss/test_parser.rb, test/rss/test_accessor.rb: removed
+	  'require "rss/parser"'.
+
+Tue Feb  3 11:23:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reduce_nodes): remove tail returns.  [ruby-talk:90934]
+
 Tue Feb  3 08:04:57 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
 
-Mon Feb  2 19:33:49 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: backport from 1.9 for Interix.
+Mon Feb  2 22:06:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* dln.c (dln_load): ditto.
+	* parse.y (block_append, new_evstr, void_expr0): remove no longer used
+	  labels.
 
-Mon Feb  2 13:31:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Feb  2 18:45:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/net/http.rb (canonical_each): fix merge miss.
+	* dln.c (dln_load): don't specify RTLD_GLOBAL on Interix,
+	  because it caused SEGV when running runner.rb.
 
 Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
 
@@ -14845,12 +75232,14 @@ Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
 	  (UDPSocket#send): recognize 3 arguments form.  try all addresses on
 	  4 arguments form.
 
-Sun Feb  1 18:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb  1 23:00:00 2004  Shigeo Kobayashi  <shigek@ruby-lang.org>
 
-	* lib/net/http.rb: merged coding style changes from HEAD.
+	* ext/bigdecimal.c: Bug in BigDecimal("1e#{n}").add BigDecimal('.5'),n)
+	  reported and fixed by Javier Goizueta.
 
-Sun Feb  1 16:15:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb  1 18:21:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
+	  From ruby_1_8 branch:
 	* lib/test/unit.rb: rearranged documentation for RDoc's sake.
 	* lib/matrix.rb: improved documentation.
 	* lib/net/http.rb: slight documentation formatting improvement.
@@ -14861,27 +75250,32 @@ Sun Feb  1 05:30:06 2004  Tanaka Akira  <akr@m17n.org>
 	 raise an errror on non-http proxy URI.
 	 (OpenURI::Buffer#<<): make a tempfile binmode.  [ruby-talk:90793]
 
-Sat Jan 31 09:20:32 2004  NAKAMURA, Hiroshi  <nakahiro@sairon.co.jp>
+Sun Feb  1 00:57:41 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* sample/openssl/gen_csr.rb: wrong usage string.
+	* lib/rss/parser.rb (RSS::Parser): added @@default_parser. Used
+	  XML parser became selectable.
+	* test/rss/test_parser.rb: added tests for
+	  RSS::Parser.default_parser.
 
-Sat Jan 31 01:00:32 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Jan 31 02:28:15 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
-	  "parts" attribute of soap:body element in WSDL.
+	* configure.in (RPATHFLAG): set to -Wl,-R like NetBSD on Interix.
 
-	* lib/wsdl/xmlSchema/schema.rb: friendly warning message for
-	  simpleType element which is not supported for now.
+Sat Jan 31 01:09:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* lib/soap/mapping/factory.rb: deleted unused methods.
+	* lib/logger.rb: leading 0 padding of timestamp usec part.
 
-	* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
-	  string <-> Ruby class name matching.
+Fri Jan 30 18:53:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
-	  files.
+	* re.c (KR_REHASH): wrong hash value on sizeof(long) > sizeof(int).
+
+Thu Jan 29 23:11:57 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Jan 29 23:56:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* configure.in (DLEXT2): removed.  Ruby does not treat
+	  ".dll" as a extension library anymore.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub (DLEXT2):
+	  ditto.
 
 	* util.c (mblen): fix overrun.  [ruby-dev:22672]
 
@@ -14890,36 +75284,83 @@ Thu Jan 29 22:41:53 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
 	  THis means you can write "see f1[link:files/f1_rb.html]".
 
-Thu Jan 29 15:33:23 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jan 29 22:24:47 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
-	  second argument. it expected to be a Hash not an Integer.
+	* sample/openssl/gen_csr.rb: follow OpenSSL::X509::Name change.
+	  ASN.1 type of subject DN elements were wrong.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
-	  function for OpenSSL::X509::Name#add_entry.
+Thu Jan 29 22:19:51 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): append ASN.1
-	  tag number to each element of return value.
+	* test/*: remove $: trick.  [ruby-dev:22763]  use test/runner.rb to
+	  run test.
 
-	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
-	  OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
+Thu Jan 29 19:28:16 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
-	  second argument takes OBJECT_TYPE_TEMPLATE by default.
+	* lib/net/http.rb (Request#initialize): reject only when a path is
+	  empty. [ruby-dev:22771]
+
+Thu Jan 29 18:54:08 2004  H.Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (glob_helper): infinite loop bug in win32 code.
+	  [ruby-dev:22770]
+
+Thu Jan 29 17:03:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
+	  [ruby-dev:22761]
+
+Thu Jan 29 11:32:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/rss/test_*: do $: trick while searching a module in the current
+	  directory.
+
+	* test/xsd/test_xmlschemaparser.rb, test/wsdl/test_emptycomplextype.rb,
+	  test/soap/helloworld/test_helloworld.rb,
+	  test/soap/calc/{test_calc.rb,test_calc2.rb}: do File.expand_path
+	  before using __FILE__.
+
+	* test/yaml/test_yaml.rb: assert_equals -> assert_equal.
 
-	* sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
+Thu Jan 29 01:56:02 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c: usec round-tripping skew. [ruby-core:2305]
+
+	* lib/yaml/rubytypes.rb: character Range now round-trips. [ruby-core:2306]
+
+	* test/yaml/test_yaml.rb: add Time and Range tests.
+
+Thu Jan 29 00:00:46 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss: rss/parser.rb is always required.
+
+Wed Jan 28 15:09:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rss/*.rb: remove "test/" prefix.
+
+Wed Jan 28 13:07:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
+
+Wed Jan 28 12:43:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rss: rss library imported. [ruby-dev:22726]
 
 Wed Jan 28 04:29:41 2004  Eric Schwartz  <emschwar@fc.hp.com>
 
 	* lib/cgi/session.rb: use LOCK_SH to read, and a few other
 	  improvements.  [ruby-core:02328]
 
-Tue Jan 27 11:09:29 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
+Tue Jan 27 15:00:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el: better support for general delimited
+	  strings.  [ruby-dev:22695]
+
+Tue Jan 27 11:04:40 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
 
 	* ext/socket/socket.c (s_recvfrom): sending length should be an
 	  invariant while retrying on EAGAIN.  [ruby-talk:89962]
 
-Tue Jan 27 10:35:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 27 10:31:28 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/win32ole/win32ole.c (set_argv): fix condition.
 
@@ -14928,31 +75369,26 @@ Tue Jan 27 02:26:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httputils.rb (WEBrick:HTTPUtils::parse_header):
 	  refine regex for header-name.
 
-Tue Jan 27 00:30:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub: rollback.
-
 Mon Jan 26 22:53:04 2004  Dave Thomas  <dave@pragprog.com>
 
 	* io.c: Remove documentation references to $defout.
 
-Mon Jan 26 15:11:47 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sample/exyacc.rb: escape '}' to avoid warning.
-
 Mon Jan 26 14:41:46 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* lib/weakref.rb (WeakRef::initialize): set up @__id before
+	  calling "super".
+
 	* lib/delegate.rb (Delegator::initialize): preserve
 	  singleton_method_added method [ruby-dev:22685]
 
 	* lib/delegate.rb (Delegator::initialize): use Kernel::raise
 	  instead of mere raise.  [ruby-dev:22681]
 
-Mon Jan 26 12:47:17 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Jan 26 12:45:23 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
 
-Mon Jan 26 11:35:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan 26 11:30:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
 	  (ruby-bugs:PR#1256)
@@ -14960,18 +75396,112 @@ Mon Jan 26 11:35:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/win32ole/win32ole.c (set_argv): set real arguments to
 	  WIN32OLE::ARGV.  [ruby-list:39073]
 
+Sun Jan 25 18:25:26 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): third
+	  argument become optional.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
+
+	* ext/openssl/ossl_x509name.c (Init_x509name): emailAddress and
+	  domainComponent should be IA5String.
+
+Sun Jan 25 01:45:38 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): support
+	  virtual host.
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): add
+	  new method to register virtual hosting server.
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server): add
+	  new method to lookup virtual hosting server.
+
+Sat Jan 24 13:06:26 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
+	  second argument. it expected to be a Hash not an Integer.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
+	  function for OpenSSL::X509::Name#add_entry.
+
+	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
+	  OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
+	  second argument takes OBJECT_TYPE_TEMPLATE by default.
+
+Fri Jan 23 02:26:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (num2i32): pack should not raise RangeError.
+	  [ruby-dev:22654]
+
+	* pack.c (pack_pack): do not auto convert nil to zero.
+
 Thu Jan 22 22:54:53 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (BEG_REGEXP): allow 8-bit characters in quoted
 	  strings for Novell GroupWise Internet Agent.
+
 	* lib/net/imap.rb (DATA_REGEXP): ditto.
 
-Thu Jan 22 16:21:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 22 18:35:49 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/e2mmap.rb (VERSION): remove unnecessary version checking.
+
+Thu Jan 22 16:21:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (string_content): reset lexical states at the beginning of
 	  string contents.  [ruby-list:39061]
 
-Wed Jan 21 21:55:51 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Jan 22 08:08:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (opt_rescue): use NODE_ERRINFO() instead of
+	  NODE_GVAR("$!"), to avoid confusion from variable aliasing.
+	  [ruby-talk:90074]
+
+	* version.c (Init_version): remove obsolete constants VERSION
+	  etc.  [ruby-dev:22643]
+
+Thu Jan 22 01:46:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (newline_node): do not use NODE_NEWLINE node anymore,
+	  use NEWLINE flag instead.
+
+Thu Jan 22 01:12:12 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* missing/os2.c (chdir, getcwd):
+	  use _chdir2 and _getcwd2 supporting multiple drives in OS/2 with EMX.
+
+Thu Jan 22 00:33:52 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* configure.in: check availability of link(). [ruby-dev:22237]
+	* file.c (rb_file_s_link): raise an exception when link() is unavailable.
+	* missing/os2.c (link): removed. File#link isn't supported.
+	* bcc32/Makefile.sub: define HAVE_LINK to enable link(). [ruby-dev:22241]
+	* win32/Makefile.sub: ditto.
+
+Thu Jan 22 00:26:25 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* ChangeLog: typo: RUBY_MBCHAR_MAX was RUBY_MBCHAR_MAXSIZE.
+
+Thu Jan 22 00:12:51 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* defines.h: define RUBY_MBCHAR_MAX instead of MB_CUR_MAX.
+	* dir.c (Next, emx_mblen): use RUBY_MBCHAR_MAX for mblen().
+	* file.c (CharNext): ditto.
+	* ruby.c (translate_char): ditto.
+	* util.c (__crt0_glob_function): ditto.
+
+Thu Jan 22 00:10:01 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/base64.rb: :nodoc: the Deprecated module
+
+Wed Jan 21 23:52:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: Interix(SFU) support.
+
+Wed Jan 21 23:03:45 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
 	* lib/drb/extserv.rb: typo
@@ -14984,21 +75514,28 @@ Wed Jan 21 17:57:56 2004  Shugo Maeda  <shugo@ruby-lang.org>
 	* lib/net/imap.rb (ensure_nz_number): show a detailed error
 	  message.
 
-Wed Jan 21 16:44:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 21 16:44:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (merge_libs): squeeze successive same libraries.
 	  [ruby-dev:22652]
 
-Wed Jan 21 16:01:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 21 16:10:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/base64.rb: enclosed in a module.  [ruby-core:02285]
+
+Wed Jan 21 16:01:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/digest/rmd160/extconf.rb: have_library appends found library.
 
 Wed Jan 21 11:36:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* ext/socket/socket.c (sock_gethostbyname): returns host if
+	  ai_canonname is NULL. (ruby-bugs PR#1243)
+
 	* parse.y (block_append): update nd_end for "real" head node.
 	  [ruby-list:39058]
 
-Tue Jan 20 14:48:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jan 20 14:48:28 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
 	  of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
@@ -15018,25 +75555,57 @@ Tue Jan 20 13:22:39 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/English.rb: Document English.rb.
 
-Tue Jan 20 02:49:22 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jan 20 04:41:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/extconf.rb: add check for OpenSSL version.
-	  [ruby-list:39054]
+	* test/ruby/test_marshal.rb (MarshalTestLib::test_exception): test
+	  for [ruby-dev:22604].
+
+	* test/ruby/test_marshal.rb (MarshalTestLibtest_singleton): test
+	  for [ruby-dev:22588].
 
 Tue Jan 20 02:38:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* marshal.c (w_class): should not dump singleton class.
 	  [ruby-dev:22631]
 
-Tue Jan 20 01:31:36 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Jan 20 02:49:22 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for OpenSSL version.
+	  [ruby-list:39054]
+
+Mon Jan 19 23:56:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (lineno): typo fix(FIX2INT -> INT2FIX).
+	* error.c (name_err_mesg_to_str): inverted condition for result of
+	  inspection.  [ruby-dev:22628]
 
-Mon Jan 19 21:53:38 2004  akira yamada  <akira@ruby-lang.org>
+Mon Jan 19 22:24:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* io.c, re.c, string.c, time.c: fixed up positions of RDocs.
+	* sample/exyacc.rb: escape '}' to avoid warning.
+
+	* lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
 
-Mon Jan 19 07:09:20 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Jan 19 21:28:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/defs.h, win32/win3.c, win32/win32.h, file.c: remove
+	  useless casts for Borland C.
+
+Mon Jan 19 17:39:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (NameError::message): internal use only.
+
+	* eval.c (rb_method_missing): use hidden constant.
+
+Mon Jan 19 16:30:53 2004  akira yamada  <akira@ruby-lang.org>
+
+	* test/ruby/test_time.rb: added tests for [ruby-dev:22614] and
+	  [ruby-dev:22617].
+
+Mon Jan 19 13:09:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb, win32/Makefile.sub, win32/configure.bat,
+	  win32/setup.mak: --with-static-linked-ext support on mswin32.
+
+Mon Jan 19 06:49:07 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: zone was wrong when it was behind UTC.
 	  Thanks Mark J. Reed.
@@ -15046,10 +75615,53 @@ Mon Jan 19 07:09:20 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* sample/cal.rb: added a class, anyway.
 
+Mon Jan 19 01:08:39 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c, error.c, eval.c, intern.h, object.c, variable.c:
+	  do not set path if it is a singleton class.  [ruby-dev:22588]
+
+	* lib/cgi.rb (CGI::QueryExtension): give extended string, not a
+	  delegater object.
+
+Sun Jan 18 23:59:44 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/charset_alias.rb: prefer us_EN locale encodings or
+	  former.  [ruby-dev:22609]
+
+	* ext/iconv/iconv.c (iconv_create): raise InvalidEncoding
+	  exception when EINVAL.
+
+Sun Jan 18 23:16:34 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c, error.c, file.c, io.c, numeric.c, object.c, re.c, struct.c,
+	  time.c: marked init_copy functions nodoc.
+
 Sun Jan 18 20:47:35 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ruby.c: use translate_char() on Cygwin.
 
+Sun Jan 18 20:00:16 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
+	  "parts" attribute of soap:body element in WSDL.
+
+	* lib/wsdl/xmlSchema/schema.rb: friendly warning message for
+	  simpleType element which is not supported for now.
+
+	* test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
+	  files.
+
+Sun Jan 18 16:46:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_overflow_p): should return results.  [ruby-dev:22614]
+
+Sun Jan 18 12:07:24 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* test/ruby/test_time.rb: new test case to test Time#[+-].
+
+	* time.c (time_plus, time_minus): fix RangeError for a negative
+	  argument in environments whose time_t is unsigned. [ruby-dev:22608]
+
 Sun Jan 18 02:33:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
@@ -15059,59 +75671,136 @@ Sun Jan 18 00:23:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* marshal.c (class2path): check anonymous class/module before
 	  checking referable, and allow singleton classes.
 
+Sat Jan 17 23:58:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (NameError::Message): new class for lazy evaluation of
+	  message to ensure replaced before marshalling.  [ruby-dev:22604]
+
+	* eval.c (rb_method_missing): use NameError::Message.
+
+Sat Jan 17 21:49:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/time.rb (test_rfc2822, test_rfc3339, test_encode_xmlschema):
+	  should not expect that all platforms handle negative time_t value.
+
+Fri Jan 16 23:53:09 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (proc_eq): compare also arguments and environment
+	  (including local variables).  [ruby-dev:22590]
+
 Fri Jan 16 14:33:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (class2path): get class path and check referable.
 	  [ruby-dev:22588]
 
-Fri Jan 16 09:52:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_eq): Proc with empty body may not be equal.
-	  [ruby-dev:22590]
-
-Thu Jan 15 13:03:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 15 12:58:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (argf_read): do not append EOF.  (ruby-bugs-ja:PR#585)
 
 	* io.c (rb_io_fwrite): ad-hockery hack to get rid of HP-UX stdio
 	  weird behavior.  [ruby-dev:22424]
 
-Wed Jan 14 13:31:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 14 21:13:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/inlinetest.rb (InlineTest::eval_part): eval under the top
+	  level environment.
+
+Wed Jan 14 17:54:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/inlinetest.rb (InlineTest::loadtest): require instead of
+	  load, to get rid of multiple loading.
+
+Wed Jan 14 13:30:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
 
-Tue Jan 13 18:54:28 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Jan 14 09:32:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/logger.rb(Logger#msg2str): no special treatment for the object
-	  which responds to :to_str.  commited at 2004-01-11T21:46:27 by
-	  gsinclair.
+	* MANIFEST: add test/net/test_httpheader.rb. (commit miss?)
 
-	* lib/logger.rb(LogDevice#initialize): remove type checking if the
-	  given object is a String.  Kernel.open handles it correctly.
-	  commited at 2004-01-11T21:46:27 by gsinclair.
+Wed Jan 14 00:58:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/logger/test_logger.rb: follow above change (ArgumentError ->
-	  TypeError.)  follow above commit.
+	* eval.c (Init_Proc): move SystemStackError from under
+	  StandardError to Exception.  [ruby-talk:89782]
+
+Tue Jan 13 18:03:02 2004  Ian Macdonald  <ian@caliban.org>
+
+	* file.c (rb_stat_wr, rb_stat_ww): New functions
+	  implementing new methods (File::Stat#world_readable?,
+	  File::Stat#world_writable?).
 
-Tue Jan 13 14:27:13 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Jan 13 16:53:25 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c: omission of Date library code caused
+	  test suite failure. [ruby-core:2251]
+
+Tue Jan 13 16:50:03 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: use $0 as the default application class name.
+
+Tue Jan 13 14:48:00 2004  Ian Macdonald  <ian@caliban.org>
+
+	* lib/pathname.rb: New methods (Pathname#world_readable?,
+	  Pathname#world_writable?).
+
+Tue Jan 13 14:48:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): allow no "when" case. [ruby-dev:22578]
+
+	* ruby.h (rb_class_of): reduce branch. [ruby-dev:22577]
+
+	* ruby.h (rb_type): ditto.
+
+Tue Jan 13 14:26:59 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* lib/test/unit/ui/testrunnerutilities.rb (TestRunnerUtilities):
 	  moved run method which allows output level.  [ruby-dev:22554]
 
+Tue Jan 13 13:04:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/test_*.rb: Pathname#parent -> Pathname#dirname.
+
+Tue Jan 13 11:38:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/yaml/test_yaml.rb (YAML_Unit_Tests::test_spec_type_{int,float}):
+	  fix syntax error.
+
+Tue Jan 13 07:52:40 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/bytecode.c: turn off default implicit typing.
+
+	* ext/syck/implicit.c: detect base60 integers.
+
+	* ext/syck/rubyext.c: handle base60, as well as hex and octal
+	  with commas.  implicit typing of ruby symbols.
+
+	* test/yaml/test_yaml.rb: add test.
+
 Tue Jan 13 04:29:52 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff):
 	  Show fully-qualified class names in class list.
 
+Tue Jan 13 01:24:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (test_wr): Rdoc fix.  [ruby-core:02225]
+
 Tue Jan 13 01:04:37 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
 	  incorporating DESTDIR in the rdoc installation.
 
-Mon Jan 12 23:27:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan 12 23:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (primary): fix position after FCALL.  [ruby-dev:22574]
 
+Mon Jan 12 18:00:11 2004  Ian Macdonald  <ian@caliban.org>
+
+	* file.c (test_wr, test_ww): New functions implementing new
+	  methods (File::world_readable?, File::world_writable?).
+
+	* file.c (S_IRUGO, S_IGUGO): New macros.
+
 Mon Jan 12 12:07:22 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
@@ -15129,29 +75818,22 @@ Mon Jan 12 12:07:22 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
 	  HTML formats need explicit line breaks.
 
-Mon Jan 12 11:46:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
-	  quotes.  [ruby-dev:22564]
-
-	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
-
-	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
-
 Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
 	  generation support to ri (Elliot Hughes)
 
-Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
+Sun Jan 11 23:54:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
-	  generation support to ri (Elliot Hughes)
+	* env.h (ruby_frame, ruby_scope, ruby_in_eval, ruby_class,
+	  ruby_dyna_vars): export.  [ruby-dev:22566]
 
-Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
+Sun Jan 11 02:35:53 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
-	  Also accept command line options via the 'RI' environment variable.
+	* ext/socket/socket.c (make_hostent): a bug in brace position.
+
+	* configure.in: install rdoc by default. if you do not want to
+	  install rdoc, specify --disable-install-doc.
 
 Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -15172,7 +75854,49 @@ Sat Jan 10 01:54:50 2004  Eric Sunshine  <sunshine@sunshineco.com>
 	  correctly on Rhapsody when -arch compiler flag was used (via
 	  configure's --enable-fat-binary option).
 
-Fri Jan  9 10:05:14 2004  Siena.  <siena@faculty.chiba-u.jp>
+Sat Jan 10 23:01:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
+	  quotes.  [ruby-dev:22564]
+
+	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
+
+	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
+
+Sat Jan 10 22:46:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_inspect): new method, Dir#inspect.  [ruby-dev:22562]
+
+Fri Jan  9 17:36:51 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (make_hostent): getaddrinfo(3) on BSD do not
+	  fill ai_canonname if serv is not supplied.  (ruby-bugs PR#1243)
+
+Fri Jan  9 13:14:59 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb: do not ignore exceptions(LoadError
+	  and SystemExitError) while loading a testcase.  smell of bug.
+
+	* test/testunit/collector/test_dir.rb: add new test of the LoadError.
+
+	* test/drb/{test_drbssl.rb,test_drbunix.rb}: do not define testcase if
+	  openssl is not installed.
+
+	* test/testunit/collector/test_dir.rb: assert_raises -> assert_raise.
+
+Fri Jan  9 11:52:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* rubysig.h: <errno.h> is needed to use errno which may be a macro.
+
+Fri Jan  9 11:20:24 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* ext/extmk.rb (extmake): should not reduce necessary libraries.
+	  [ruby-dev:22440]
+
+	* lib/mkmf.rb (merge_libs): merge libraries according to
+	  dependency.
+
+Fri Jan  9 10:05:23 2004  Siena.  <siena@faculty.chiba-u.jp>
 
 	* lib/mkmf.rb (libpathflag): use single quotes.  [ruby-dev:22440]
 
@@ -15182,7 +75906,7 @@ Thu Jan  8 23:49:21 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 	  rdoc documentation, you need to run configure with
 	  --enable-install-doc.
 
-Thu Jan  8 21:29:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jan  8 21:17:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
 	  public key only.
@@ -15196,6 +75920,10 @@ Thu Jan  8 21:29:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
 	  OpenSSL::PKey::RSA#to_der.
 
+Thu Jan  8 18:25:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): should not recurse in exceptional status.
+
 Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
@@ -15205,15 +75933,58 @@ Thu Jan  8 11:20:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* eval.c, object.c, process.c, re.c: don't use C++ style comments.
 
-Thu Jan  8 04:36:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jan  8 08:46:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c (yaml_org_handler): lazy-load Date for
+	  static-ext.
+
+Thu Jan  8 07:06:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: preserve order in Setup.  [ruby-dev:22503]
+
+	* ext/extmk.rb: move dependent libraries just after depended
+	  libraries.
+
+	* ext/digest/*/extconf.rb: depend on digest.
+
+Thu Jan  8 04:36:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI#initialize): should create
 	  @config[:Logger] if it was not given.
 
+Wed Jan  7 22:28:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): fix memory leak.
+
+Wed Jan  7 21:15:07 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
 	* sample/webrick/*: new files.
 
 	* MANIFEST: add sample/webrick/*
 
+Wed Jan  7 20:51:51 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/net/test_httpheader.rb: new file.
+
+	* MANIFEST: add test/net/test_httpheader.rb.
+
+Wed Jan  7 20:42:06 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTPHeader#content_length): should return nil
+	  unless header exists. [ruby-dev:22519]
+
+Wed Jan  7 14:26:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb (TkPanedWindow): use epath for embedded windows.
+
+	* ext/tk/lib/tktext.rb: use epath for embedded windows.
+
+	* ext/tk/lib/tkcanvas.rb: use epath for window items.
+
+Wed Jan  7 14:24:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/{attachment.rb,mimemessage.rb}: added from soap4r/1.5.2.
+
 Wed Jan  7 13:00:18 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_driver.rb: Fix problem where ri was
@@ -15237,16 +76008,71 @@ Tue Jan  6 22:13:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_mod_modfunc): should break if m has no super class.
 	  [ruby-dev:22498]
 
-Tue Jan  6 21:55:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan  6 21:51:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (fptr_finalize): should save errno just after failure.
 	  [ruby-dev:22492]
 
+Tue Jan  6 20:51:10 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb(Logger#msg2str): no special treatment for the object
+	  which responds to :to_str.
+
+	* lib/logger.rb(LogDevice#initialize): remove type checking if the
+	  given object is a String.  Kernel.open handles it correctly.
+
+	* test/logger/test_logger.rb: follow above change (ArgumentError ->
+	  TypeError.)
+
 Tue Jan  6 14:53:14 2004  Dave Thomas  <dave@pragprog.com>
 
 	* bin/ri: split out the display side, making it pluggable. Added
 	  new ri_driver and ri_display files in lib/rdoc/ri.
 
+Tue Jan  6 11:29:43 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/inlinetest.rb, test/{test_generator.rb,test_ipaddr.rb,
+	  test_pathname.rb,test_pp.rb,test_prettyprint.rb,test_set.rb,
+	  test_time.rb,test_tsort.rb: added.
+
+Tue Jan  6 09:38:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* import soap4r/1.5.2;
+
+	* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
+	  introduce SOAPExternalReference class as a referenct to SOAPEnvelope
+	  external content.
+
+	* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
+	  with Attachments) support code by Jamie Herre.
+
+	* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
+	  streamHandler.rb,wsdlDriver.rb}: SwA support.
+
+	* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
+	  soaplet.rb}: SwA support and refactoring.
+
+	* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
+	  SOAPReference#initialize signature change.
+
+	* lib/soap/mapping/factory.rb: deleted unused methods.
+
+	* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
+	  string <-> Ruby class name matching.
+
+	* lib/xsd/datatypes.rb: check the smallest positive non-zero
+	  single-precision float exactly instead of packing with "f".
+	  [ruby-talk:88822]
+
+	* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
+	  1.4e-45.  1.4e-45 is smaller than 2 ** -149...
+
+	* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
+	  test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
+
+	* test/soap/test_streamhandler.rb: revert to the previous test that
+	  warns "basic_auth unsupported under net/http".
+
 Tue Jan  6 06:37:53 2004  Dave Thomas  <dave@pragprog.com>
 
 	* bin/rdoc: Add --ri-system switch
@@ -15267,6 +76093,45 @@ Tue Jan  6 00:04:40 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
 	  fix parsing if there are braces in a method parameter list
 
+Tue Jan  6 01:01:04 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/dir.h, win32/win32.c: fix patch miss.
+
+	* win32/Makefile.sub: fix file dependency.
+
+Mon Jan  5 20:32:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/logger.rb: enhanced documentation.
+
+Mon Jan  5 18:58:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
+	  [ruby-dev:22486]
+
+	* pack.c (pack_unpack): unpack requires big endian offet (OFF16B
+	  and OFF32B).  The patch is from Minero Aoki in [ruby-dev:22489]
+
+	* pack.c (OFF16B): add big-endian offset again.
+
+Mon Jan  5 03:00:53 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_pack.rb: new test test_unpack_N.
+
+Mon Jan  5 01:47:53 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): remove duplicated object files
+	  from $objs on DOSISH platforms.
+
+Sat Jan  3 02:44:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* rubysig.h (TRAP_END): preserve errno before switching context.
+	  [ruby-core:02137]
+
+Sat Jan  3 01:18:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
+	  [ruby-dev:22476]
+
 Fri Jan  2 14:54:11 2004  Dave Thomas  <dave@pragprog.com>
 
 	* bin/ri: Add new --classes option, and arrange for
@@ -15285,10 +76150,23 @@ Fri Jan  2 01:50:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* io.c (argf_eof): ARGF.eof? should not have any side effect.
 	  [ruby-dev:22469]
 
+Thu Jan  1 09:03:20 2004  Dave Thomas  <dave@pragprog.com>
+
+	* bin/ri (report_class_stuff): Fix problem with ambiguous nested
+	  classes not matching.
+
 Wed Dec 31 17:25:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (argf_each_byte): should return self.  [ruby-dev:22465]
 
+Wed Dec 31 15:05:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/pathname.rb: Corrected small coding error.
+
+Wed Dec 31 15:00:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/pathname.rb: Completed documentation.
+
 Wed Dec 31 11:20:34 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Make
@@ -15324,21 +76202,23 @@ Tue Dec 30 12:30:30 2003  Dave Thomas  <dave@pragprog.com>
 	  class and a method have the same name, finding Xxx.abc was trying
 	  to find 'abc' in method 'Xxx', not class 'Xxx'.
 
-
 Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
-	  Handle undoing nesting of yield parameters correctly for:
+	  Handle undoing nsting of yield parameters correctly for:
 
-	  def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
+	    def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
 
+Tue Dec 30 07:30:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
+	* lib/pathname.rb: Added documentation.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
-	  Handle undoing nesting of yield parameters correctly for:
+Mon Dec 29 20:08:17 2003  Minero Aoki  <aamine@loveruby.net>
 
-	    def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
+	* lib/net/http.rb (GenericRequest#initialize): check if path
+	  begins with '/'.
+
+	* lib/net/http.rb: def m( arg ) -> def m(arg)
 
 Mon Dec 29 12:51:02 2003  Dave Thomas  <dave@pragprog.com>
 
@@ -15352,10 +76232,25 @@ Mon Dec 29 05:05:51 2003  Dave Thomas  <dave@pragprog.com>
 
 	* struct.c, random: Add RDoc comments
 
+Mon Dec 29 02:25:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/optparse.rb: Improved documentation.
+
 Mon Dec 29 02:20:54 2003  Dave Thomas  <dave@pragprog.com>
 
 	* eval.c: Add RDoc for class Proc, Method, UnboundMethod
 
+Mon Dec 29 02:20:26 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: fix install directory if destdir and compile_dir are
+	  not in the same drive.
+
+	* ext/extmk.rb: ditto. [ruby-list:39009]
+
+	* win32/Makefile.sub, win32/README.win32, win32/configure.bat,
+	  win32/setup.mak: new configure scheme. use ``configure --prefix=dir''
+	  instead of ``nmake DESTDIR=dir install''.
+
 Mon Dec 29 00:41:44 2003  Dave Thomas  <dave@pragprog.com>
 
 	* math.c: Add RDoc comments
@@ -15389,7 +76284,7 @@ Sun Dec 28 03:50:05 2003  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_override_comment):
 	  Escape method names used in regexp
 
-Sun Dec 28 01:46:02 2003  Dave Thomas  <dave@pragprog.com>
+Sun Dec 28 01:46:02 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
 
 	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
 	  Add support for rules in 'ri' output.
@@ -15407,27 +76302,27 @@ Sun Dec 28 01:05:31 2003  Dave Thomas  <dave@pragprog.com>
 
 	* marshal.c, signal.c: RDoc collemts added by Elliott Hughes
 
-Sun Dec 28 00:48:47 2003  Dave Thomas  <dave@pragprog.com>
+Sun Dec 28 00:46:25 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
-	  Some source files use lower case class or module names
-	  when naming the Init_XXX function in C.
+	  Some Ruby source uses lower-case class names for the
+	  Init_Xxx C function name.
 
 Sat Dec 27 23:41:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in: fix "test: too many arguments" error.
 
-Sat Dec 27 15:32:19 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
+Sat Dec 27 15:32:40 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
 
-	* time.c: RDoc comments added
+	* time.c: Add RDoc comments for Time class.
 
-Sat Dec 27 15:07:57 2003  Dave Thomas  <dave@pragprog.com>
+Sat Dec 27 15:07:26 2003  Dave Thomas  <dave@pragprog.com>
 
 	* object.c: Add RDoc comments for Symbol class.
 
-Sat Dec 27 14:42:30 2003  Dave Thomas  <dave@pragprog.com>
+Sat Dec 27 14:39:53 2003  Dave Thomas  <dave@pragprog.com>
 
-	* numeric.c: Add RDoc comments.
+	* numeric.c (Init_Numeric): Add RDoc comments.
 
 Sat Dec 27 00:44:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -15445,7 +76340,7 @@ Fri Dec 26 23:02:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* io.c (rb_io_getline): should return nil when read_all gives
 	  empty string, even when nil rs is specified. [ruby-core:02077]
 
-Fri Dec 26 18:50:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 26 18:33:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: check if getcontext and setcontext are available.
 
@@ -15455,14 +76350,26 @@ Fri Dec 26 16:40:53 2003  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (PathnameTest#test_plus): add 2 assertions.
 
-Fri Dec 26 09:26:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Dec 26 14:05:13 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_pack.rb: new test test_pack_N.
+
+Fri Dec 26 12:53:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_pack): add sign check for 'i', and 'l'.
 	  [ruby-dev:22427]
 
 	* bignum.c (rb_quad_pack): add range check for 'quad int'.
 
-Thu Dec 25 22:39:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Dec 26 10:58:58 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* MANIFEST: add vms/config.h and remove vms/config.h_in.
+
+Fri Dec 26 10:42:00 2003  AKIYOSHI, Masamichi  <masamichi.akiyoshi@hp.com>
+
+	* io.c: [VMS] "rfm=stmlf" is specified for open() and fopen().
+
+Thu Dec 25 22:29:53 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* string.c (rb_str_update): don't return any value.
 
@@ -17238,6 +78145,7 @@ Sat Nov  8 13:49:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* configure.in: improvement of pthread check
 
 Sat Nov  8 13:28:46 2003  Takaaki Tateishi  <ttate@ttsky.net>
+
 	* ext/dl/sym.c: Add DL.win32_last_error and DL.last_error.
 	  Thanks, Kaoru Shirai.
 
@@ -17311,10 +78219,10 @@ Wed Nov  5 22:55:16 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
 
-	* ext/tk/lib/tktext.rb : add TkText#text_copy, text_cut, text_paste
+	* ext/tk/lib/tktext.rb: add TkText#text_copy, text_cut, text_paste
 	  to support Tcl/Tk8.4's tk_textCopy, tk_textCut, tk_textPaste
 
-	* ext/tk/lib/tk.rb : add TkMenu#set_focus support Tcl/Tk's
+	* ext/tk/lib/tk.rb: add TkMenu#set_focus support Tcl/Tk's
 	  tk_menuSetFocus
 
 Wed Nov  5 17:33:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -17726,11 +78634,6 @@ Mon Oct 20 09:45:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/debug.rb (debug_command): remove debug print.
 
-Wed Oct 20 00:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (search_required): required name must not be changed before
-	  loading.  [ruby-dev:24492]
-
 Sun Oct 19 13:12:30 2003  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
@@ -17888,10 +78791,10 @@ Wed Oct 15 05:05:53 2003  Akinori MUSHA  <knu@iDaemons.org>
 
 Wed Oct 15 04:31:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
+	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb:
 	  new demo-scripts
 
-	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
+	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget:
 	  add entries for 'entry3.rb'
 
 Wed Oct 15 04:31:47 2003  Akinori MUSHA  <knu@iDaemons.org>
@@ -18287,12 +79190,6 @@ Mon Oct  6 22:59:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/csv/test_csv.rb: add tests for above change.
 
-Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
-
-	* ext/socket/socket.c (thread_read_select): restored.
-
 Mon Oct  6 16:23:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (w_object): wrong method name in the message.
@@ -18322,6 +79219,10 @@ Mon Oct  6 09:19:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
 
+	* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
+
+	* ext/socket/socket.c (thread_read_select): restored.
+
 	* lib/pathname.rb: version information is added in document.
 
 Sun Oct  5 23:07:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -18714,35 +79615,6 @@ Thu Oct  2 00:21:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* test/soap/calc/*: give httpd config param "CGIInterpreter".
 	  "/usr/bin/env ruby" thing does not work under non-Unix boxes.
 
-Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_byte): retrieve pointer from string value for each
-	  time.  [ruby-dev:24404]
-
-	* marshal.c (r_bytes0): ditto.
-
-	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
-
-	* io.c (io_read): should freeze all reading buffer.
-	  [ruby-dev:24400]
-
-	* string.c (rb_str_sum): should use bignums when bits is greater
-	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
-
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
-
-	* string.c (rb_str_sum): wrong cast caused wrong result.
-	  [ruby-dev:24385]
-
-	* enum.c (enum_sort_by): hide temporary array from
-	  ObjectSpace.each_object.  [ruby-dev:24386]
-
-	* string.c (rb_str_sum): check was done with false pointer.
-	  [ruby-dev:24383]
-
-	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
-
 Thu Oct  2 00:25:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* signal.c (ruby_signal_name): adjust to the prototype.
@@ -18906,20 +79778,6 @@ Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* test/fileutils/test_nowrite.rb: ditto.
 
-Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_delete): comparison may change the capacity.
-	  [ruby-dev:24348]
-
-	* array.c (rb_ary_fill): fill should honor length argument.
-	  [ruby-dev:24346]
-
-	* array.c (rb_ary_replace): should not use ptr from shared array.
-	  [ruby-dev:24345]
-
-	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
-	  [ruby-talk:113807]
-
 Sat Sep 27 04:57:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/ruby/test_file.rb: new file.  only asserts unlink-before-close
@@ -19250,8 +80108,6 @@ Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (struct tag): dst should be VALUE.
 
-Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
 	* eval.c (localjump_destination): stop at the scope where the current
 	  block was created.  [ruby-dev:21353]
 
@@ -19323,7 +80179,7 @@ Sun Sep  7 16:08:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
 
-	* ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
+	* ext/tk/lib/*.rb: Ruby/Tk works at $SAFE == 4
 
 Sat Sep  6 02:26:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
@@ -19542,7 +80398,7 @@ Tue Sep  2 14:02:19 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
 
-	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
+	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb}:
 	  bug fix and improvement of font control
 
 Tue Sep  2 09:51:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -19643,17 +80499,17 @@ Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* process.c: deny handling IDs during evaluating the block given to
 	  the Process::{UID,GID}.switch method
 
-	* ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
+	* ext/tcltklib/tcltklib.c: some methods have no effect if on slave-IP
 
-	* ext/tcltklib/tcltklib.c : can create a interpreter without Tk
+	* ext/tcltklib/tcltklib.c: can create a interpreter without Tk
 
-	* ext/tcltklib/tcltklib.c : bug fix on handling exceptions
+	* ext/tcltklib/tcltklib.c: bug fix on handling exceptions
 
-	* ext/tcltklib/MANUAL.euc : modify
+	* ext/tcltklib/MANUAL.euc: modify
 
-	* ext/tk/lib/tk.rb : freeze some core modules
+	* ext/tk/lib/tk.rb: freeze some core modules
 
-	* ext/tk/lib/multi-tk.rb : more secure
+	* ext/tk/lib/multi-tk.rb: more secure
 
 	* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
 	  Tk's list
@@ -19661,9 +80517,9 @@ Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
 
 	* ext/tk/lib/tk.rb, ext/tk/lib/tkfont.rb, ext/tk/lib/tkcanvas.rb,
-	  ext/tk/lib/tktext.rb : fix bug of font handling
+	  ext/tk/lib/tktext.rb: fix bug of font handling
 
-	* ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
+	* ext/tk/lib/tkfont.rb: TkFont.new() accepts compound fonts
 
 Thu Aug 28 22:07:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -19827,7 +80683,12 @@ Tue Aug 19 23:20:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
 
 	* ext/bigdecimal/lib/bigdecimal/math.rb: E implemented.
 
-Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Aug 19 11:19:33 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* io.c (next_argv): should not call GetOpenFile() if rb_stdout is
+	  not a IO (T_FILE).
+
+Tue Aug 19 07:47:10 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
 
@@ -19848,11 +80709,6 @@ Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
 	  socket if SSLSocket raises error.
 
-Tue Aug 19 11:19:33 2003  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* io.c (next_argv): should not call GetOpenFile() if rb_stdout is
-	  not a IO (T_FILE).
-
 Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
@@ -19941,7 +80797,7 @@ Fri Aug 15 23:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
 
 	* ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
 
-Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 15 12:01:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (HUGE_ST_INO): check whether struct stat.st_ino
 	  is larger than long.  [ruby-dev:21194]
@@ -20075,6 +80931,7 @@ Tue Aug 12 02:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (THREAD_ALLOC): initialize IA64 members.
 
 Mon Aug 11 22:31:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
 	* lib/debug.rb(debug_command): inspection command should inspect
 	  resulting value even if it's nil.  [ruby-dev:21180] by OMAE, jun
 	  <jun66j5@ybb.ne.jp>.
@@ -20264,7 +81121,7 @@ Tue Aug  5 15:47:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Tue Aug  5 10:04:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (str_new4): ptr may refer null_str.
+	* string.c (str_new4): ptr may refer to null_str.
 
 Mon Aug  4 17:25:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -20275,9 +81132,10 @@ For the changes before 1.8.0, see doc/ChangeLog-1.8.0
 Local variables:
 add-log-time-format: (lambda ()
   (let* ((time (current-time))
+	 (system-time-locale "C")
 	 (diff (+ (cadr time) 32400))
 	 (lo (% diff 65536))
-	 (hi  (+ (car time) (/ diff 65536))))
+	 (hi (+ (car time) (/ diff 65536))))
   (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
 indent-tabs-mode: t
 tab-width: 8
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
new file mode 100644
index 0000000000..5c0e4d5156
--- /dev/null
+++ b/KNOWNBUGS.rb
@@ -0,0 +1,16 @@
+#
+# This test file concludes tests which point out known bugs.
+# So all tests will cause failure.
+#
+
+assert_normal_exit %q{
+  open("tst-remove-load.rb", "w") {|f|
+    f << <<-'End'
+      module Kernel
+        remove_method :load
+      end
+      raise
+    End
+  }
+  load "tst-remove-load.rb"
+}, '[ruby-dev:40234] [ruby-core:27959]', :timeout => 1
diff --git a/LEGAL b/LEGAL
index 908eb270f5..3ddf571175 100644
--- a/LEGAL
+++ b/LEGAL
@@ -5,34 +5,59 @@ All the files in this distribution are covered under either the Ruby's
 license (see the file COPYING) or public-domain except some files
 mentioned below.
 
-regex.[ch]:
-
-  These files are under LGPL.  Treat them as LGPL says. (See the file
-  LGPL for details)
-
-    Extended regular expression matching and search library.
-    Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
-
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.
-
-    The GNU C Library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with the GNU C Library; see the file LGPL.  If not,
-    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.  */
-
-    Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-    Last change: May 21, 1993 by t^2
-    removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp>
-    Perl5 extension added by matz <matz@caelum.co.jp>
-    UTF-8 extension added Jan 16 1999 by Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
+include/ruby/oniguruma.h:
+regcomp.c:
+regenc.[ch]:
+regerror.c:
+regexec.c:
+regint.h:
+regparse.[ch]:
+enc/ascii.c
+enc/big5.c
+enc/cp949.c
+enc/emacs_mule.c
+enc/encdb.c
+enc/euc_jp.c
+enc/euc_kr.c
+enc/euc_tw.c
+enc/gb18030.c
+enc/gb2312.c
+enc/gbk.c
+enc/iso_8859_1.c
+enc/iso_8859_10.c
+enc/iso_8859_11.c
+enc/iso_8859_13.c
+enc/iso_8859_14.c
+enc/iso_8859_15.c
+enc/iso_8859_16.c
+enc/iso_8859_2.c
+enc/iso_8859_3.c
+enc/iso_8859_4.c
+enc/iso_8859_5.c
+enc/iso_8859_6.c
+enc/iso_8859_7.c
+enc/iso_8859_8.c
+enc/iso_8859_9.c
+enc/koi8_r.c
+enc/koi8_u.c
+enc/shift_jis.c
+enc/unicode.c
+enc/us_ascii.c
+enc/utf_16be.c
+enc/utf_16le.c
+enc/utf_32be.c
+enc/utf_32le.c
+enc/utf_8.c
+enc/windows_1251.c
+
+Oniguruma  ----   (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
+
+http://www.geocities.jp/kosako3/oniguruma/
+http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
+
+   When this software is partly used or it is distributed with Ruby, 
+   this of Ruby follows the license of Ruby.
 
 configure:
 
@@ -43,9 +68,8 @@ configure:
     This configure script is free software; the Free Software Foundation
     gives unlimited permission to copy, distribute and modify it.
 
-config.guess:
-config.sub:
-parse.c:
+tool/config.guess:
+tool/config.sub:
 
   As long as you distribute these files with the file configure, they
   are covered under the Ruby's license.
@@ -72,6 +96,58 @@ parse.c:
     configuration script generated by Autoconf, you may include it under
     the same distribution terms that you use for the rest of that program.
 
+parse.c:
+
+  This file is licensed under the GPL, but is incorporated into Ruby and 
+  redistributed under the terms of the Ruby license, as permitted by the
+  exception to the GPL below.
+
+     Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+     Free Software Foundation, Inc.
+
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.  */
+
+  /* As a special exception, you may create a larger work that contains
+     part or all of the Bison parser skeleton and distribute that work
+     under terms of your choice, so long as that work isn't itself a
+     parser generator using the skeleton or a modified version thereof
+     as a parser skeleton.  Alternatively, if you modify or redistribute
+     the parser skeleton itself, you may (at your option) remove this
+     special exception, which will cause the skeleton and the resulting
+     Bison output files to be licensed under the GNU General Public
+     License without this special exception.
+
+     This special exception was added by the Free Software Foundation in
+     version 2.2 of Bison.  */
+
+util.c (partly):
+
+    Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose without fee is hereby granted, provided that this entire notice
+    is included in all copies of any software which is or includes a copy
+    or modification of this software and in all copies of the supporting
+    documentation for such software.
+
+    THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
+    REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+    OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+
 util.c (partly):
 win32/win32.[ch]:
 
@@ -83,6 +159,32 @@ win32/win32.[ch]:
     You may distribute under the terms of either the GNU General Public
     License or the Artistic License, as specified in the perl README file.
 
+util.c (partly):
+
+   Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
 random.c
 
   This file is under the new-style BSD license.
@@ -131,7 +233,6 @@ random.c
     email: matumoto@math.keio.ac.jp
 
 st.[ch]:
-x68/*:
 missing/alloca.c:
 missing/dup2.c:
 missing/finite.c:
@@ -140,51 +241,16 @@ missing/isinf.c:
 missing/isnan.c:
 missing/memcmp.c:
 missing/memmove.c:
-missing/strcasecmp.c:
 missing/strchr.c:
-missing/streror.c:
-missing/strftime.c:
-missing/strncasecmp.c:
 missing/strstr.c:
 missing/strtol.c:
 ext/digest/sha1/sha1.[ch]:
 
   These files are all under public domain.
 
-missing/strtod.c:
-
-  This file will not be used on most platforms depending on how the
-  configure script results.  In any case you must not receive any fee
-  with the file itself.
-
-    Copyright (c) 1988-1993 The Regents of the University of California.
-    Copyright (c) 1994 Sun Microsystems, Inc.
-
-    Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without
-    fee is hereby granted, provided that the above copyright
-    notice appear in all copies.  The University of California
-    makes no representations about the suitability of this
-    software for any purpose.  It is provided "as is" without
-    express or implied warranty.
-
-missing/strtoul.c:
-
-  This file will not be used on most platforms depending on how the
-  configure script results.  In any case you must not receive any fee
-  with the file itself.
-
-    Copyright 1988 Regents of the University of California
-
-    Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without
-    fee is hereby granted, provided that the above copyright
-    notice appear in all copies.  The University of California
-    makes no representations about the suitability of this
-    software for any purpose.  It is provided "as is" without
-    express or implied warranty.
-
 missing/erf.c:
+missing/tgamma.c:
+missing/lgamma_r.c:
 missing/crypt.c:
 missing/vsnprintf.c:
 
@@ -226,6 +292,47 @@ missing/vsnprintf.c:
     From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     paragraph 3 above is now null and void.
 
+missing/strlcat.c
+missing/strlcpy.c
+
+  These files are under the new-style BSD license.
+
+   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+   THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+missing/langinfo.c
+
+  This file is from http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
+  Ruby uses a modified version. The file contains the following
+  author/copyright notice:
+
+  Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11
+  Permission to use, copy, modify, and distribute this software
+  for any purpose and without fee is hereby granted. The author
+  disclaims all warranties with regard to this software.
+
 ext/digest/md5/md5.[ch]:
 
   These files are under the following license.  Ruby uses modified
@@ -264,18 +371,7 @@ ext/digest/rmd160/rmd160.[ch]:
     Copyright (c) Katholieke Universiteit Leuven
     1996, All Rights Reserved
 
-ext/digest/rmd160/rmd160hl.c:
-ext/digest/sha1/sha1hl.c:
-
-  These files are under the beer-ware license.
-
-    "THE BEER-WARE LICENSE" (Revision 42):
-    <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
-    can do whatever you want with this stuff. If we meet some day, and you think
-    this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
-
 ext/digest/sha2/sha2.[ch]:
-ext/digest/sha2/sha2hl.c:
 
   These files are under the new-style BSD license.
 
diff --git a/LGPL b/LGPL
deleted file mode 100644
index b1e3f5a263..0000000000
--- a/LGPL
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/Makefile.in b/Makefile.in
index 314e1ed256..c3d3de9495 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,17 +1,25 @@
 SHELL = /bin/sh
 NULLCMD = :
+RUNCMD = $(SHELL)
+CHDIR = @CHDIR@
+exec = exec
 
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
-VPATH = $(srcdir):$(srcdir)/missing
+top_srcdir = $(srcdir)
+hdrdir = $(srcdir)/include
 
 CC = @CC@
-YACC = @YACC@
+CPP = @CPP@
+YACC = bison
 PURIFY =
 AUTOCONF = autoconf
 @SET_MAKE@
 MKFILES = @MAKEFILES@
+BASERUBY = @BASERUBY@
+TEST_RUNNABLE = @TEST_RUNNABLE@
+DOXYGEN = @DOXYGEN@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -24,18 +32,28 @@ datadir = @datadir@
 arch = @arch@
 sitearch = @sitearch@
 sitedir = @sitedir@
+ruby_version = @ruby_version@
 
 TESTUI = console
 TESTS =
-RDOCTARGET = @RDOCTARGET@
+INSTALLDOC = @INSTALLDOC@
+DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
 
 EXTOUT = @EXTOUT@
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+arch_hdrdir = $(EXTOUT)/include/$(arch)
+VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing
 
 empty =
 OUTFLAG = @OUTFLAG@$(empty)
-CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
+COUTFLAG = @COUTFLAG@$(empty)
+ARCH_FLAG = @ARCH_FLAG@
+CFLAGS = @CFLAGS@
+cflags = @cflags@
+optflags = @optflags@
+debugflags = @debugflags@
+warnflags = @warnflags@
+XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = 
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
@@ -43,18 +61,24 @@ EXTLIBS =
 LIBS = @LIBS@ $(EXTLIBS)
 MISSING = @LIBOBJS@ @ALLOCA@
 LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
+DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG)
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
-MINIOBJS = @MINIOBJS@
+ARCHMINIOBJS = @MINIOBJS@
+BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
+BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
+BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
 
+RUBY_BASE_NAME=@RUBY_BASE_NAME@
+RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
 EXEEXT = @EXEEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@
+RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
+XRUBY = @XRUBY@
 
 #### End of system configuration section. ####
 
@@ -70,23 +94,43 @@ LIBRUBYARG    = @LIBRUBYARG@
 LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 
+THREAD_MODEL  = @THREAD_MODEL@
+
 PREP          = @PREP@
 ARCHFILE      = @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@
+SET_LC_MESSAGES = env LC_MESSAGES=C
 
+MAKEDIRS      = @MKDIR_P@
+CP            = cp
+MV            = mv
 RM            = rm -f
+RMDIRS        = @RMDIRS@
+RMALL         = @RMALL@
 NM            = @NM@
 AR            = @AR@
 ARFLAGS       = rcu
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@
+IFCHANGE      = $(srcdir)/tool/ifchange
+SET_LC_MESSAGES = env LC_MESSAGES=C
+OBJDUMP       = @OBJDUMP@
+OBJCOPY       = @OBJCOPY@
+VCS           = @VCS@
+VCSUP         = @VCSUP@
 
 OBJEXT        = @OBJEXT@
+ASMEXT        = S
+DLEXT         = @DLEXT@
 MANTYPE	      = @MANTYPE@
 
 INSTALLED_LIST= .installed.list
+
+MKMAIN_CMD    = mkmain.sh
+
+SRC_FILE      = $<
 #### End of variables
 
 all:
@@ -97,8 +141,8 @@ all:
 .NOEXPORT:
 
 miniruby$(EXEEXT):
-		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
+		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
@@ -115,30 +159,19 @@ $(LIBRUBY_A):
 $(LIBRUBY_SO):
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+		-$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' -L '@EXPORT_PREFIX@*_threadptr_*' $@
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake.rb:	Makefile
-		@echo ' \
-		class Object; \
-		  CROSS_COMPILING = RUBY_PLATFORM; \
-		  remove_const :RUBY_PLATFORM; \
-		  remove_const :RUBY_VERSION; \
-		  RUBY_PLATFORM = "@arch@"; \
-		  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
-		end; \
-		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
-		  class File; \
-		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\"; \
-		  end; \
-		end; \
-		' > $@
-
-Makefile:	$(srcdir)/Makefile.in
-
-$(MKFILES): config.status $(srcdir)/common.mk
+fake: $(arch)-fake.rb
+$(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in
+		@./config.status --file=$@:$(srcdir)/template/fake.rb.in
+		@chmod +x $@
+
+Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
+
+$(MKFILES): config.status
 		MAKE=$(MAKE) $(SHELL) ./config.status
 		@{ \
 		    echo "all:; -@rm -f conftest.mk"; \
@@ -148,33 +181,139 @@ $(MKFILES): config.status $(srcdir)/common.mk
 		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
 		{ echo "Makefile updated, restart."; exit 1; }
 
-config.status:	$(srcdir)/configure
-		MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
+uncommon.mk: $(srcdir)/common.mk
+		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
 
-$(srcdir)/configure: $(srcdir)/configure.in
-		cd $(srcdir) && $(AUTOCONF)
-
-lex.c: keywords
-	@-$(RM) $@
-	gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@ || \
-	cp "$(srcdir)/$@" .
+config.status:	$(srcdir)/configure $(srcdir)/enc/Makefile.in
+	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
+	set $(SHELL) ./config.status --recheck; \
+	exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
 
-.y.c:
-	$(YACC) $<
-	sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
-	rm -f y.tab.c
+$(srcdir)/configure: $(srcdir)/configure.in
+	$(CHDIR) $(srcdir) && exec $(AUTOCONF)
+
+incs: id.h
+
+# Things which should be considered:
+# * with gperf v.s. without gperf
+# * committers may have various versions of gperf
+# * ./configure v.s. ../ruby/configure
+# * GNU make v.s. HP-UX make	# HP-UX make invokes the action if lex.c and keywords has same mtime.
+# * svn checkout generate a file with mtime as current time
+# * ext4 and XFS has a mtime with fractional part
+lex.c: defs/keywords
+	@\
+	if cmp -s $(srcdir)/defs/lex.c.src $?; then \
+	  set -x; \
+	  $(CP) $(srcdir)/lex.c.blt $@; \
+	else \
+	  set -x; \
+	  gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
+	  $(MV) $@.tmp $@ && \
+	  $(CP) $? $(srcdir)/defs/lex.c.src && \
+	  $(CP) $@ $(srcdir)/lex.c.blt; \
+	fi
+
+NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p
+
+enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
+	$(MAKEDIRS) $(@D)
+	@set +e; \
+	if cmp -s $(?:.kwd=.src) $?; then \
+	  set -x; \
+	  $(CP) $(?:.kwd=.h.blt) $@; \
+	else \
+	  trap '$(RM) $@-1.h $@-2.h' 0 && \
+	  set -x; \
+	  sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
+	  gperf $(NAME2CTYPE_OPTIONS) < $? > $@-2.h && \
+	  diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
+	  $(MV) $@.tmp $@ && \
+	  $(CP) $? $(?:.kwd=.src) && \
+	  $(CP) $@ $(?:.kwd=.h.blt); \
+	fi
 
 .c.@OBJEXT@:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
 
 .s.@OBJEXT@:
 	$(AS) $(ASFLAGS) -o $@ $<
 
+.c.S:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
+
+.c.i:
+	$(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
+
 clean-local::
-	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
 
 distclean-local::
-	@$(RM) ext/config.cache $(RBCONFIG)
+	@$(RM) ext/config.cache $(RBCONFIG) Doxyfile
+	@-$(RM) run.gdb
+	@-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
+	@-$(RMDIRS) $(arch_hdrdir)/ruby
+
+distclean-rdoc:
+	@$(RMALL) $(RDOCOUT:/=\)
+
+clean-ext distclean-ext realclean-ext::
+	@if [ -d ext ]; then \
+	    cd ext; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
+	    test "$$#" = 0 && set .; \
+	    set dummy `for dir in "$$@"; do \
+	        find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
+	    done`; shift; \
+	    cd ..; \
+	    for dir in "$$@"; do \
+	        echo $(@:-ext=)ing "$$dir"; \
+	        (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
+	        case "$@" in \
+	        *distclean-ext*|*realclean-ext*) \
+		    $(RMDIRS) "ext/$$dir";; \
+	        esac; \
+	    done \
+	fi
+
+distclean-ext realclean-ext::
+	@-rmdir ext 2> /dev/null || true
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
+
+up::
+	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
+
+update-mspec:
+	@$(CHDIR) $(srcdir); \
+	if [ -d spec/mspec ]; then \
+	  cd spec/mspec; \
+	  echo updating mspec ...; \
+	  exec git pull; \
+	else \
+	  echo retrieving mspec ...; \
+	  exec git clone $(MSPEC_GIT_URL) spec/mspec; \
+	fi
+
+update-rubyspec: update-mspec
+	@$(CHDIR) $(srcdir); \
+	if [ -d spec/rubyspec ]; then \
+	  cd spec/rubyspec; \
+	  echo updating rubyspec ...; \
+	  exec git pull; \
+	else \
+	  echo retrieving rubyspec ...; \
+	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
+	fi
+
+test-rubyspec:
+	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
+	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+
+INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
+	  vmtc.inc vm.inc
+
+$(INSNS): $(srcdir)/insns.def vm_opts.h \
+	  $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
+	  $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
+	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
diff --git a/NEWS b/NEWS
index de1dafb533..3b22bbfd10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,115 +1,509 @@
+# -*- rd -*-
 = NEWS
 
 This document is a list of user visible feature changes made between
-releases excluding bug fixes.
+releases except for bug fixes.
 
 Note that each entry is kept so brief that no reason behind or
 reference information is supplied with.  For a full list of changes
 with all sufficient information, see the ChangeLog file.
 
-== Changes with Ruby 1.8.5
-
-=== New platforms/build tools support
-
-* IA64 HP-UX
-
-* Visual C++ 8 SP1
-
-* autoconf 2.6x
-
+== Changes since the 1.9.1 release
 === Library updates (outstanding ones only)
 
-* date
-
-  * Updated based on date2 4.0.3.
-
-* digest
-
-  * New internal APIs for C and Ruby.
-
-  * Support for autoloading.
-
-  * See below for new features and compatibility issues.
-
-* nkf
-
-  * Updated based on nkf as of 2007-01-28.
-
-* tk
-
-  * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
-    (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
-    but it is an alias name.
-
-  * Updated Tile extension support based on Tile 0.7.8.
-
-  * Support --without-X11 configure option for non-X11 versions of
-    Tcl/Tk (e.g. Tcl/Tk Aqua).
-
-  * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
-    about STDIN blocking on Windows.
-
-=== New methods and features
-
 * builtin classes
 
-  * New method: Kernel#instance_variable_defined?
-
-  * New method: Module#class_variable_defined?
+  * Array
+    * new methods:
+      * Array#keep_if
+      * Array#repeated_combination
+      * Array#repeated_permutation
+      * Array#rotate
+      * Array#rotate!
+      * Array#select!
+      * Array#sort_by!
+
+    * extended method:
+      * Array#{uniq,uniq!,product} can take a block.
+
+  * Complex
+    * new method:
+      * Complex#rationalize
+
+  * Dir
+    * new method:
+      * Dir.home
+
+  * Encoding
+    * new encodings:
+      * Big5
+      * Big5-UAO
+      * ISO-2022-JP-KDDI
+      * SJIS-DoCoMo
+      * SJIS-KDDI
+      * SJIS-SoftBank
+      * UTF8-DoCoMo
+      * UTF8-KDDI
+      * UTF8-SoftBank
+
+    * new method:
+      * ascii_compatible?
+
+  * Enumerable
+    * new methods:
+      * Enumerable#chunk
+      * Enumerable#collect_concat
+      * Enumerable#each_entry
+      * Enumerable#flat_map
+      * Enumerable#slice_before
+
+  * Enumerator
+    * new methods:
+      * Enumerator#peek
+      * Enumerator#next_values
+      * Enumerator#peek_values
+      * Enumerator#feed
+      * StopIteration#result
+
+    * extended method:
+      * #with_index accepts an optional argument that specifies the
+        index number to start with, defaulted to 0.
+
+    * incompatible changes:
+      * #rewind now calls the "rewind" method of the enclosed object
+        if defined.
+      * #next doesn't clear the position at end.
+
+  * ENV
+    * Uses locale's encoding
+    * ENV.[]= raises Errno::{EINVAL,ENOMEM} etc. on failure.
+    * new methods:
+      * ENV.keep_if
+      * ENV.select!
+
+  * Float
+    * new constants:
+      * Float::INFINITY
+      * Float::NAN
+    * new method:
+      * Float#rationalize
+
+  * File
+    * new methods:
+      * File.realpath
+      * File.realdirpath
+
+  * GC::Profiler
+    * new method:
+      * GC::Profiler.total_time
+
+  * Hash
+    * new methods:
+      * Hash#keep_if
+      * Hash#select!
+
+  * IO
+    * new methods:
+      * IO#autoclose=
+      * IO#autoclose?
+      * IO#fdatasync
+      * IO#codepoints
+      * IO#each_codepoint
+
+    * extended method:
+      * IO.pipe can take a block.
+
+    * new modules:
+      * IO::WaitReadable
+      * IO::WaitWritable
+        They are used to extend non-blocking exceptions.
+
+  * Integer
+    * new method:
+      * Integer#rationalize
+
+  * Kernel
+    * new methods:
+      * Kernel#respond_to_missing?
+      * Kernel#singleton_class
+      * Kernel#require_relative
+
+    * extended method:
+      * Kernel#respond_to? can be used to detect methods not implemented.
+        For example, Process.respond_to?(:fork) returns false on Windows.
+
+    * incompatible changes:
+      * Kernel#instance_eval yields the receiver.
+
+      * Kernel#exec
+      * Kernel#spawn
+      * Kernel#system
+      * Kernel#` (`...`)
+        ..etc.
+
+        On Windows, the current directory is no longer implicitly
+        prepended to the default command search path, just like other
+        platforms.
+
+  * MatchData
+    * new method:
+      * MatchData#==
+
+  * Method
+    * new method:
+      * Method#parameters
+
+  * NilClass
+    * new method:
+      * NilClass#rationalize
+
+  * Object
+    * extended methods:
+      * Float() supports hexadecimal floating point format.
+      * printf() supports %a/%A format.
+
+  * Proc
+    * new method:
+      * Proc#parameters
+    * extended method:
+      * Proc#source_location returns location even if receiver is a method
+        defined by attr_reader / attr_writer / attr_accessor.
+
+  * Process
+    * extended method:
+      * Process.spawn accepts [:child, FD] for a redirect target.
+
+  * Random (new class to generate pseudo-random numbers)
+
+  * Rational
+    * new method:
+      * Rational#rationalize
+
+  * String
+    * extended methods:
+      * string[regexp, name] is supported for named capture.
+
+  * Thread
+    * new methods:
+      * Thread#add_trace_func
+      * Thread#set_trace_func
+
+  * Time
+    * extended features:
+      * time_t restriction is removed to represent before 1901 and after 2038.
+        Proleptic Gregorian calendar is used for old dates.
+      * Time.new have optional arguments to specify date with time offset.
+      * Time#getlocal, Time#localtime have optional time offset argument.
+
+    * new methods:
+      * Time#to_r
+      * Time#subsec
+      * Time#round
+
+    * incompatible change:
+      * The year argument of Time.{utc,gm,local,mktime} is now interpreted as
+        the value itself.  For example, Time.utc(99) means the year 99 AD,
+        not 1999 AD.
+
+  * UnboundMethod
+    * new method:
+      * UnboundMethod#parameters
 
-  * New feature: Dir::glob() can now take an array of glob patterns.
 
 * digest
+  * new methods:
+    * Digest::Class.base64digest
+    * Digest::Instance#base64digest
+    * Digest::Instance#base64digest!
 
-  * New digest class methods: file
+  * Digest::HMAC (digest/hmac) has been marked as deprecated because
+    it was unintentional for the experimental library to be included
+    in the final release of 1.9.1.  Please use OpenSSL::HMAC instead.
 
-  * New digest instance methods: clone, reset, new,
-    inspect, digest_length (alias size or length),
-    block_length()
+* rss
 
-  * New library: digest/bubblebabble
+  * 0.2.4 -> 0.2.7.
 
-  * New function: Digest(name)
+  * RSS::Maker.make
+    * raise an exception not returns nil for invalid feed making.
+    * requires block.
 
-* fileutils
+  * RSS::Maker.[]
+    * new method to return maker class.
+
+  * RSS::Maker.supported?(version)
+    * new method to check whether given version is supported.
+
+  * RSS::Maker: item.guid.permanent_link?
+    * new alias of item.guid.isPermaLink
+  * RSS::Maker: item.guid.permanent_link=
+    * new alias of item.guid.isPermaLink=
 
-  * New option for FileUtils.cp_r(): :remove_destination
+* DL
+  * Now uses libffi as a backend if avaiable.
+    It means DL works fine on more platforms.
 
-* thread
+* Fiddle
+  * A lightweight wrapper for libffi.
 
-  * Replaced with much faster mutex implementation in C.
-    The former implementation is available with a
-    configure option `--disable-fastthread'.
+* YAML
+  * Now uses libyaml as a backend if available.
+    It means YAML library supports new standards for YAML.
 
-* webrick
+* Psych
+  * A wrapper for libyaml.
+
+* JSON
+  * Update to JSON 1.1.9
+
+* REXML
+
+  * REXML::Document.entity_expansion_limit=
+
+    New method to set the entity expansion limit. By default the limit is
+    set to 10000.  See the following URL for details.
+
+    http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+
+* RDoc
+
+  * Updated to RDoc 2.5.8
+
+* RubyGems
+
+  * Updated to RubyGems 1.3.7
+
+* logger
+
+  * imported upstream version (logger/1.2.7)
+    * do not raise an exception even if log writing failed.
+    * do not raise ShiftingError if an aged file already exists.
+      (no ShiftingError will be raised from 1.2.7, just warn() instead)
+
+* matrix
+  * API change to adhere strictly to mathematical definitions:
+    * Matrices must now be rectangular.
+    * trace, regular?, singular? are defined only for square matrices
+    * support for empty matrices
+    * all integer matrices now have the right determinant (also an integer)
+
+  * Matrix and Vector include Enumerable.
+
+  * new methods:
+    * Matrix.build
+    * Matrix.empty
+    * Matrix#conj
+    * Matrix#conjugate
+    * Matrix#each
+    * Matrix#each_with_index
+    * Matrix#empty?
+    * Matrix#imag
+    * Matrix#imaginary
+    * Matrix#real
+    * Matrix#real?
+    * Matrix#rect
+    * Matrix#rectangular
+
+* net/http
+  * merged net/https.
+
+* open3
+  * new methods:
+    * Open3.popen2
+    * Open3.popen2e
+    * Open3.capture3
+    * Open3.capture2
+    * Open3.capture2e
+    * Open3.pipeline_rw
+    * Open3.pipeline_r
+    * Open3.pipeline_w
+    * Open3.pipeline_start
+    * Open3.pipeline
+
+* pty
+  * new methods:
+    * PTY.open
+    * PTY.check
+  * deprecated methods:
+    * protect_signal
+    * reset_signal
+
+* openssl
+  * new methods:
+    * OpenSSL::Buffering#read_nonblock
+    * OpenSSL::Buffering#write_nonblock
+    * OpenSSL::SSL::SSLSocket#connect_nonblock
+    * OpenSSL::SSL::SSLSocket#accept_nonblock
+
+* scanf
+  * support %a/%A format.
+
+
+* socket
+
+  * incompatible changes:
+    * Socket#{recvfrom,recvfrom_nonblock,accept,accept_nonblock,sysaccept}
+      returns a sender address as Addrinfo object instead of a binary sockaddr string.
+      Addrinfo#to_s returns the old binary sockaddr string.
+    * BasicSocket#getsockopt returns Socket::Option object instead of a binary string.
+      Socket::Option#to_s returns the old binary string.
+    * Socket.do_not_reverse_lookup is turned on by default now.
+
+  * new class:
+    * Addrinfo
+    * Socket::Option
+    * Socket::AncillaryData
+
+  * new methods:
+    * Socket.ip_address_list
+    * Socket.tcp
+    * Socket.tcp_server_loop
+    * Socket.tcp_server_sockets
+    * Socket.udp_server_sockets
+    * Socket.udp_server_loop_on
+    * Socket.udp_server_loop
+    * Socket.unix
+    * Socket.unix_server_loop
+    * Socket.unix_server_socket
+    * Socket.accept_loop
+    * Socket#ipv6only!
+    * BasicSocket#local_address
+    * BasicSocket#remote_address
+    * BasicSocket#connect_address
+    * BasicSocket#sendmsg
+    * BasicSocket#sendmsg_nonblock
+    * BasicSocket#recvmsg
+    * BasicSocket#recvmsg_nonblock
+    * BasicSocket#getpeereid
+
+  * extended methods:
+    * Socket.new's 3rd argument is optional now.
+    * Socket.pair's 3rd argument is optional now.
+    * Socket.pair and UNIXSocket.pair can take a block.
+    * BasicSocket#send, UDPSocket#send, Socket.getnameinfo, Socket#bind, and
+      Socket#{connect,connect_nonblock} accepts an Addrinfo object as sockaddr.
+    * BasicSocket#getsockopt accepts a Socket::Option object.
+    * Socket.getaddrinfo and IPSocket#{addr,peeraddr} accept an optional
+      argument to turn reverse lookup on/off.
+
+    * constant names can be accepted as well as constant values.
+      i.e. Socket.new(:PF_INET, :SOCK_STREAM, 0)
+      The constant names can be specified without the prefix.
+      i.e. Socket.new(:INET, :STREAM, 0)
+      * protocol/address family
+      * socket type
+      * socket option protocol level
+      * socket option name
+      * shutdown's argument
+
+* stringio
+  * new methods:
+    * StringIO#read_nonblock
+    * StringIO#write_nonblock
+* pathname
+  * new methods:
+    * Pathname#binread
+    * Pathname#realdirpath
+    * Pathname#each_child
+
+  * extended methods:
+    * Pathname#realpath and Pathname#realdirpath takes optional basedir
+      argument.
+
+* Readline
+  * new methods:
+    * Readline.set_screen_size
+    * Readline.get_screen_size
+
+  * extended methods:
+    * Readline.completion_proc= accepts nil.
+      nil means to use default completion proc.
+
+* set
+  * new methods:
+    * Set#keep_if
+    * Set#select!
+
+* time
+  * incompatible changes:
+    * Time.parse raises ArgumentError when no date information.
 
-  * New method: WEBrick::Cookie.parse_set_cookies()
+* thread
+  * extended method:
+    * ConditionVariable#wait takes timeout argument.
+
+* securerandom
+  * new methods:
+    * SecureRandom.urlsafe_base64
+
+* URI
+  * new methods:
+    * URI.encode_www_form
+    * URI.decode_www_form
+    * URI.encode_www_form_component
+    * URI.decode_www_form_component
+  * Obsoleted methods:
+    * URI.decode
+    * URI.encode
+    * URI.escape
+    * URI.unescape
+
+* etc
+  * new methods:
+    * Etc::Passwd.each
+    * Etc::Group.each
+
+* zlib
+  * new methods:
+    * Zlib::GzipFile#path
+    * Zlib.#adler32_combine
+    * Zlib.#crc32_combine
+
+* rbconfig
+  * new methods:
+    * RbConfig.ruby
+
+=== Language changes
+
+* Regexp properties (\p{}) names now ignore underscores, spaces, and case, so
+  \p{ol chiki} is the same as \p{Ol_Chiki}
+* Regexps now support Unicode 5.2 (new characters and scripts)
+* \d, \s, and \w are now ASCII only; use POSIX bracket classes and \p{} for
+  Unicode semantics
+* $: no longer includes the current directory, use require_relative
+* Symbol with an invalid encoding is forbidden to exist.
+
+=== Compilation options
+
+* --program-prefix and --program-suffix no longer act on the shared object
+  names nor paths to libraries.
+
+  use --with-rubylibprefix='${libruby}/${RUBY_INSTALL_NAME}' and
+  --with-soname='${RUBY_INSTALL_NAME}' for the same result as Ruby 1.9.1.
+
+* --with-arch is added for universal binary, instead of
+  --enable-fat-binary option.
 
 === Compatibility issues (excluding feature bug fixes)
 
-* builtin classes
-
-  * String#intern now raises SecurityError when $SAFE level is greater
-    than zero.
-
-* fileutils
-
-  * A minor implementation change breaks Rake <=0.7.1.
-    Updating Rake to 0.7.2 fixes the problem.
-
-* digest
-
-  * The constructor does no longer take an initial
-    string to feed; digest() and hexdigest() now do,
-    instead.  The following examples show how to
-    migrate:
-
-      # Before
-      md = Digest::MD5.new("string")
-      # After (works with any version)
-      md = Digest::MD5.new.update("string")
-        
-      # Before
-      hd = Digest::MD5.new("string").hexdigest
-      # After (works with any version)
-      hd = Digest::MD5.hexdigest("string")
+  * Enumerator#rewind
+  * Socket#recvfrom
+  * Socket#recvfrom_nonblock
+  * Socket#accept
+  * Socket#accept_nonblock
+  * Socket#sysaccept
+  * BasicSocket#getsockopt
+  * Time.utc
+  * Time.gm
+  * Time.local
+  * Time.mktime
+  * Time.parse
+  * --program-prefix and --program-suffix
+  * --enable-fat-binary
+  * $:
+
+    See above.
+
+  * Digest::HMAC
+
+    Deprecated.  See above.
diff --git a/README b/README
index cf836415ad..4a032c4308 100644
--- a/README
+++ b/README
@@ -16,8 +16,9 @@ Perl).  It is simple, straight-forward, and extensible.
   + Iterators and Closures
   + Garbage Collection
   + Dynamic Loading of Object files(on some architecture)
-  + Highly Portable(works on many UNIX machines, and on DOS,
-    Windows, Mac, BeOS etc.)
+  + Highly Portable (works on many Unix-like/POSIX compatible platforms
+    as well as Windows, Mac OS X, BeOS etc.)
+    cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms
 
 
 * How to get Ruby
@@ -26,11 +27,6 @@ The Ruby distribution files can be found in the following FTP site:
 
   ftp://ftp.ruby-lang.org/pub/ruby/
 
-The latest source code of this version series can be checked out
-through SVN with the following command:
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
 The trunk of the Ruby source tree can be checked out with the
 following command:
 
@@ -70,6 +66,10 @@ This is what you need to do to compile and install Ruby:
 
   2. Run ./configure, which will generate config.h and Makefile.
 
+     Some C compiler flags may be added by default depending on your
+     environment.  Specify optflags=.. and warnflags=.. as necessary
+     to override them.
+
   3. Edit defines.h if you need.  Usually this step will not be needed.
 
   4. Remove comment mark(#) before the module names from ext/Setup (or
@@ -89,11 +89,41 @@ This is what you need to do to compile and install Ruby:
 
   7. Run 'make install'
 
+     This command will create following directories and install files
+     onto them.
+
+       * ${DESTDIR}${prefix}/bin
+       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib
+       * ${DESTDIR}${prefix}/lib/ruby
+       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib/ruby/site_ruby
+       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
+       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/share/man/man1
+       * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
+
+     If Ruby's API version is `x.y.z', the ((|${MAJOR}|)) is `x', the
+     ((|${MINOR}|)) is `y', and the ((|${TEENY}|)) is `z'.
+
+     NOTE: teeny of the API version may be different from one of
+     Ruby's program version
+
      You may have to be a super user to install ruby.
 
 If you fail to compile ruby, please send the detailed error report with
 the error log and machine/OS type, to help others.
 
+DO NOT LINK Ruby WITH A LIBRARY WHOSE LICENSE IS NOT COMPATIBLE WITH Ruby
+License (see COPYING).
+For example, currently you cannot link with readline6, which is under GPLv3.
+
 
 * Copying
 
diff --git a/README.EXT b/README.EXT
index 2fc2fd606a..72dba58c5d 100644
--- a/README.EXT
+++ b/README.EXT
@@ -31,10 +31,12 @@ The Ruby interpreter has the following data types:
 	T_STRING	string
 	T_REGEXP	regular expression
 	T_ARRAY		array
-	T_FIXNUM	Fixnum(31bit integer)
 	T_HASH		associative array
 	T_STRUCT	(Ruby) structure
 	T_BIGNUM	multi precision integer
+	T_FIXNUM	Fixnum(31bit or 63bit integer)
+	T_COMPLEX       complex number
+	T_RATIONAL      rational number
 	T_FILE		IO
 	T_TRUE		true
 	T_FALSE		false
@@ -46,9 +48,8 @@ In addition, there are several other types used internally:
 	T_ICLASS
 	T_MATCH
 	T_UNDEF
-	T_VARMAP
-	T_SCOPE
 	T_NODE
+	T_ZOMBIE
 
 Most of the types are represented by C structures.
 
@@ -78,7 +79,8 @@ There is the data-type check function
 
   void Check_Type(VALUE value, int type)
 
-which raises an exception if the VALUE does not have the type specified.
+which raises an exception if the VALUE does not have the type
+specified.
 
 There are also faster check macros for fixnums and nil.
 
@@ -87,42 +89,53 @@ There are also faster check macros for fixnums and nil.
 
 1.3 Convert VALUE into C data
 
-The data for type T_NIL, T_FALSE, T_TRUE are nil, true, false
+The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true
 respectively.  They are singletons for the data type.
-
-The T_FIXNUM data is a 31bit length fixed integer (63bit length on
-some machines), which can be converted to a C integer by using the
-FIX2INT() macro.  There is also NUM2INT() which converts any Ruby
-numbers into C integers.  The NUM2INT() macro includes a type check, so
-an exception will be raised if the conversion failed.  NUM2DBL() can
-be used to retrieve the double float value in the same way.
-
-In version 1.7 or later it is recommended that you use the new macros
+The equivalent C constants are: Qnil, Qfalse, Qtrue.
+Note that Qfalse is false in C also (i.e. 0), but not Qnil.
+
+The T_FIXNUM data is a 31bit or 63bit length fixed integer.
+This size is depend on the size of long: if long is 32bit then
+T_FIXNUM is 31bit, if long is 64bit then T_FIXNUM is 63bit.
+T_FIXNUM can be converted to a C integer by using the
+FIX2INT() macro or FIX2LONG().  Though you have to check that the
+data is really FIXNUM before using them, they are faster.  FIX2LONG()
+never raises exceptions, but FIX2INT() raises RangeError if the
+result is bigger or smaller than the size of int.
+There are also NUM2INT() and NUM2LONG() which converts any Ruby
+numbers into C integers.  These macros includes a type check,
+so an exception will be raised if the conversion failed.  NUM2DBL()
+can be used to retrieve the double float value in the same way.
+
+You can use the macros
 StringValue() and StringValuePtr() to get a char* from a VALUE.
 StringValue(var) replaces var's value with the result of "var.to_str()".
 StringValuePtr(var) does same replacement and returns char*
-representation of var.  These macros will skip the replacement if var is
-a String.  Notice that the macros take only the lvalue as their
+representation of var.  These macros will skip the replacement if var
+is a String.  Notice that the macros take only the lvalue as their
 argument, to change the value of var in place.
 
-In version 1.6 or earlier, STR2CSTR() was used to do the same thing
-but now it is deprecated in version 1.7, because STR2CSTR() has a risk
-of a dangling pointer problem in the to_str() impliclit conversion.
+You can also use the macro named StringValueCStr(). This is just
+like StringValuePtr(), but always add nul character at the end of
+the result. If the result contains nul character, this macro causes
+the ArgumentError exception.
+StringValuePtr() doesn't guarantee the existence of a nul at the end
+of the result, and the result may contain nul.
 
 Other data types have corresponding C structures, e.g. struct RArray
-for T_ARRAY etc. The VALUE of the type which has the corresponding structure
-can be cast to retrieve the pointer to the struct.  The casting macro
-will be of the form RXXXX for each data type; for instance, RARRAY(obj). 
-See "ruby.h".
+for T_ARRAY etc. The VALUE of the type which has the corresponding
+structure can be cast to retrieve the pointer to the struct.  The
+casting macro will be of the form RXXXX for each data type; for
+instance, RARRAY(obj).  See "ruby.h".
 
-For example, `RSTRING(str)->len' is the way to get the size of the
-Ruby String object.  The allocated region can be accessed by
-`RSTRING(str)->ptr'.  For arrays, use `RARRAY(ary)->len' and
-`RARRAY(ary)->ptr' respectively.
+There are some accessing macros for structure members, for example
+`RSTRING_LEN(str)' to get the size of the Ruby String object.  The
+allocated region can be accessed by `RSTRING_PTR(str)'.  For arrays,
+use `RARRAY_LEN(ary)' and `RARRAY_PTR(ary)' respectively.
 
 Notice: Do not change the value of the structure directly, unless you
-are responsible for the result.  This ends up being the cause of interesting
-bugs.
+are responsible for the result.  This ends up being the cause of
+interesting bugs.
 
 1.4 Convert C data into VALUE
 
@@ -152,9 +165,10 @@ range, but is a bit slower.
 
 1.5 Manipulating Ruby data
 
-As I already mentioned, it is not recommended to modify an object's internal
-structure.  To manipulate objects, use the functions supplied by the Ruby
-interpreter. Some (not all) of the useful functions are listed below:
+As I already mentioned, it is not recommended to modify an object's
+internal structure.  To manipulate objects, use the functions supplied
+by the Ruby interpreter. Some (not all) of the useful functions are
+listed below:
 
  String functions
 
@@ -163,6 +177,7 @@ interpreter. Some (not all) of the useful functions are listed below:
     Creates a new Ruby string.
 
   rb_str_new2(const char *ptr)
+  rb_str_new_cstr(const char *ptr)
 
     Creates a new Ruby string from a C string.  This is equivalent to
     rb_str_new(ptr, strlen(ptr)).
@@ -173,13 +188,41 @@ interpreter. Some (not all) of the useful functions are listed below:
     sources should be tainted.
 
   rb_tainted_str_new2(const char *ptr)
+  rb_tainted_str_new_cstr(const char *ptr)
 
     Creates a new tainted Ruby string from a C string.
 
+  rb_sprintf(const char *format, ...)
+  rb_vsprintf(const char *format, va_list ap)
+
+    Creates a new Ruby string with printf(3) format.
+
   rb_str_cat(VALUE str, const char *ptr, long len)
 
     Appends len bytes of data from ptr to the Ruby string.
 
+  rb_str_cat2(VALUE str, const char* ptr)
+
+    Appends C string ptr to Ruby string str.  This function is
+    equivalent to rb_str_cat(str, ptr, strlen(ptr)).
+
+  rb_str_catf(VALUE str, const char* format, ...)
+  rb_str_vcatf(VALUE str, const char* format, va_list ap)
+
+    Appends C string format and successive arguments to Ruby string
+    str according to a printf-like format.  These functions are
+    equivalent to rb_str_cat2(str, rb_sprintf(format, ...)) and
+    rb_str_cat2(str, rb_vsprintf(format, ap)), respectively.
+
+  rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
+  
+    Creates a new Ruby string with the specified encoding.
+     
+  rb_usascii_str_new(const char *ptr, long len)
+  rb_usascii_str_new_cstr(const char *ptr)
+
+    Creates a new Ruby string with encoding US-ASCII.
+
  Array functions
 
   rb_ary_new()
@@ -199,17 +242,35 @@ interpreter. Some (not all) of the useful functions are listed below:
 
     Creates an n-element array from a C array.
 
+  rb_ary_to_ary(VALUE obj)
+
+    Converts the object into an array.
+    Equivalent to Object#to_ary.
+
+ There are many functions to operate an array.
+ They may dump core if other types are given.
+
+  rb_ary_aref(argc, VALUE *argv, VALUE ary)
+
+    Equivaelent to Array#[].
+
+  rb_ary_entry(VALUE ary, long offset)
+
+    ary[offset]
+
+  rb_ary_subseq(VALUE ary, long beg, long len)
+
+    ary[beg, len]
+
   rb_ary_push(VALUE ary, VALUE val)
   rb_ary_pop(VALUE ary)
   rb_ary_shift(VALUE ary)
   rb_ary_unshift(VALUE ary, VALUE val)
 
-    Array operations.  The first argument to each functions must be an 
-    array.  They may dump core if other types are given.
 
 2. Extending Ruby with C
 
-2.1 Addding new features to Ruby
+2.1 Adding new features to Ruby
 
 You can add new features (classes, methods, etc.) to the Ruby
 interpreter.  Ruby provides APIs for defining the following things:
@@ -264,15 +325,23 @@ will be called like:
 where obj is the receiver, and args is the Ruby array containing
 actual arguments.
 
-There are two more functions to define methods.  One is to define
-private methods:
+There are some more functions to define methods. One takes an ID
+as the name of method to be defined. See 2.2.2 for IDs.
+
+  void rb_define_method_id(VALUE klass, ID name, 
+                           VALUE (*func)(ANYARGS), int argc)
+
+There are two functions to define private/protected methods:
 
   void rb_define_private_method(VALUE klass, const char *name, 
 			        VALUE (*func)(), int argc)
+  void rb_define_protected_method(VALUE klass, const char *name, 
+			          VALUE (*func)(), int argc)
 
-The other is to define module functions, which are private AND singleton
-methods of the module.  For example, sqrt is the module function
-defined in Math module.  It can be called in the following way:
+At last, rb_define_module_function defines a module functions,
+which are private AND singleton methods of the module.
+For example, sqrt is the module function defined in Math module.
+It can be called in the following way:
 
   Math.sqrt(4)
 
@@ -286,7 +355,7 @@ To define module functions, use:
   void rb_define_module_function(VALUE module, const char *name, 
 				 VALUE (*func)(), int argc)
 
-Oh, in addition, function-like methods, which are private methods defined
+In addition, function-like methods, which are private methods defined
 in the Kernel module, can be defined using:
 
   void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
@@ -295,13 +364,17 @@ To define an alias for the method,
 
   void rb_define_alias(VALUE module, const char* new, const char* old);
 
+To define a reader/writer for an attribute,
+
+  void rb_define_attr(VALUE klass, const char *name, int read, int write)
+
 To define and undefine the `allocate' class method,
 
   void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
   void rb_undef_alloc_func(VALUE klass);
 
-func have to take the klass as the argument and return a newly
-allocated instance.  This instance should be empty as possible,
+func has to take the klass as the argument and return a newly
+allocated instance.  This instance should be as empty as possible,
 without any expensive (including external) resources.
 
 2.1.3 Constant definition
@@ -328,14 +401,26 @@ evaluate the string as Ruby program.  This function will do the job:
 Evaluation is done under the current context, thus current local variables
 of the innermost method (which is defined by Ruby) can be accessed.
 
+Note that the evaluation can raise an exception. There is a safer 
+function:
+
+  VALUE rb_eval_string_protect(const char *str, int *state)
+
+It returns nil when an error occur. Moreover, *state is zero if str was
+successfully evaluated, or nonzero otherwise.
+
+
 2.2.2 ID or Symbol
 
-You can invoke methods directly, without parsing the string.  First I need
-to explain about ID.  ID is the integer number to represent Ruby's
-identifiers such as variable names.  The Ruby data type corresponding to ID
-is Symbol.  It can be accessed from Ruby in the form:
+You can invoke methods directly, without parsing the string.  First I
+need to explain about ID.  ID is the integer number to represent
+Ruby's identifiers such as variable names.  The Ruby data type
+corresponding to ID is Symbol.  It can be accessed from Ruby in the
+form:
 
  :Identifier
+or
+ :"any kind of string"
 
 You can get the ID value from a string within C code by using
 
@@ -366,8 +451,8 @@ specified by the symbol mid.
 2.2.4 Accessing the variables and constants
 
 You can access class variables and instance variables using access
-functions.  Also, global variables can be shared between both environments.
-There's no way to access Ruby's local variables.
+functions.  Also, global variables can be shared between both
+environments.  There's no way to access Ruby's local variables.
 
 The functions to access/modify instance variables are below:
 
@@ -386,7 +471,8 @@ See 2.1.3 for defining new constant.
 
 3.1 Ruby constants that C can be accessed from C
 
-The following Ruby constants can be referred from C.
+As stated in section 1.3,
+the following Ruby constants can be referred from C.
 
   Qtrue
   Qfalse
@@ -416,23 +502,30 @@ function below.
 You can defined hooked variables.  The accessor functions (getter and
 setter) are called on access to the hooked variables.
 
-  void rb_define_hooked_variable(constchar *name, VALUE *var,
+  void rb_define_hooked_variable(const char *name, VALUE *var,
 				 VALUE (*getter)(), void (*setter)())
 
 If you need to supply either setter or getter, just supply 0 for the
 hook you don't need.  If both hooks are 0, rb_define_hooked_variable()
 works just like rb_define_variable().
 
-  void rb_define_virtual_variable(const char *name,
-				  VALUE (*getter)(), void (*setter)())
+The prototypes of the getter and setter functions are as follows:
+
+  VALUE (*getter)(ID id, VALUE *var);
+  void (*setter)(VALUE val, ID id, VALUE *var);
 
-This function defines a Ruby global variable without a corresponding C
+
+Also you can define a Ruby global variable without a corresponding C
 variable.  The value of the variable will be set/get only by hooks.
 
+  void rb_define_virtual_variable(const char *name,
+				  VALUE (*getter)(), void (*setter)())
+
 The prototypes of the getter and setter functions are as follows:
 
-  (*getter)(ID id, void *data, struct global_entry* entry);
-  (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
+  VALUE (*getter)(ID id);
+  void (*setter)(VALUE val, ID id);
+
 
 3.3 Encapsulate C data into a Ruby object
 
@@ -448,6 +541,10 @@ function to free the pointer allocation.  If this is -1, the pointer
 will be just freed.  The functions mark and free will be called from
 garbage collector.
 
+These mark / free functions are invoked during GC execution.  No
+object allocations are allowed during it, so do not allocate ruby
+objects inside them.
+
 You can allocate and wrap the structure in one step.
 
   Data_Make_Struct(klass, type, mark, free, sval)
@@ -501,7 +598,8 @@ the library.
 Here's the example of an initializing function.
 
 --
-Init_dbm()
+void
+Init_dbm(void)
 {
     /* define DBM class */
     cDBM = rb_define_class("DBM", rb_cObject);
@@ -535,8 +633,8 @@ struct dbmdata {
 obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
 --
 
-This code wraps the dbmdata structure into a Ruby object.  We avoid wrapping
-DBM* directly, because we want to cache size information.
+This code wraps the dbmdata structure into a Ruby object.  We avoid
+wrapping DBM* directly, because we want to cache size information.
 
 To retrieve the dbmdata structure from a Ruby object, we define the
 following macro:
@@ -556,8 +654,7 @@ methods with a fixed number of arguments receive arguments like this:
 
 --
 static VALUE
-fdbm_delete(obj, keystr)
-    VALUE obj, keystr;
+fdbm_delete(VALUE obj, VALUE keystr)
 {
 	:
 }
@@ -571,10 +668,7 @@ arguments like this:
 
 --
 static VALUE
-fdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+fdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
 	:
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -589,16 +683,17 @@ argument is the C array of the method arguments, and the third
 argument is the receiver of the method.
 
 You can use the function rb_scan_args() to check and retrieve the
-arguments.  For example, "11" means that the method requires at least one
-argument, and at most receives two arguments.
+arguments.  The third argument is a string that specifies how to
+capture method arguments and assign them to the following VALUE
+references.
+
 
-Methods with an arbitrary number of arguments can receive arguments
-by Ruby's array, like this:
+The following is an example of a method that takes arguments by Ruby's
+array:
 
 --
 static VALUE
-fdbm_indexes(obj, args)
-    VALUE obj, args;
+thread_initialize(VALUE thread, VALUE args)
 {
 	:
 }
@@ -662,6 +757,11 @@ Try generating the Makefile by:
 
   ruby extconf.rb
 
+If the library should be installed under vendor_ruby directory
+instead of site_ruby directory, use --vendor option as follows.
+
+  ruby extconf.rb --vendor
+
 You don't need this step if you put the extension library under the ext
 directory of the ruby source tree.  In that case, compilation of the
 interpreter will do this step for you.
@@ -691,53 +791,120 @@ Appendix A. Ruby source files overview
 
 ruby language core
 
-  class.c
-  error.c
-  eval.c
-  gc.c
-  object.c
+  class.c         : classes and modules
+  error.c         : exception classes and exception mechanism
+  gc.c            : memory management
+  load.c          : library loading
+  object.c        : objects
+  variable.c      : variables and constants
+
+ruby syntax parser
   parse.y
-  variable.c
+    -> parse.c    : automatically generated
+  keywords        : reserved keywords
+    -> lex.c      : automatically generated
+
+ruby evaluator (a.k.a. YARV)
+  compile.c
+  eval.c
+  eval_error.c
+  eval_jump.c
+  eval_safe.c
+  insns.def           : definition of VM instructions
+  iseq.c              : implementation of VM::ISeq
+  thread.c            : thread management and context swiching
+  thread_win32.c      : thread implementation
+  thread_pthread.c    : ditto
+  vm.c
+  vm_dump.c
+  vm_eval.c
+  vm_exec.c
+  vm_insnhelper.c
+  vm_method.c
+
+  opt_insns_unif.def  : instruction unification
+  opt_operand.def     : definitions for optimization
+
+    -> insn*.inc      : automatically generated
+    -> opt*.inc       : automatically generated
+    -> vm.inc         : automatically generated
+
+regular expression engine (oniguruma)
+  regex.c
+  regcomp.c
+  regenc.c
+  regerror.c
+  regexec.c
+  regparse.c
+  regsyntax.c
 
 utility functions
 
-  dln.c
-  regex.c
-  st.c
-  util.c
+  debug.c       : debug symbols for C debuggger
+  dln.c         : dynamic loading
+  st.c          : general purpose hash table
+  strftime.c    : formatting times
+  util.c        : misc utilities
 
 ruby interpreter implementation
 
   dmyext.c
+  dmydln.c 
+  dmyencoding.c
+  id.c
   inits.c
   main.c
   ruby.c
   version.c
 
+  gem_prelude.rb
+  prelude.rb
+
+
 class library
 
-  array.c
-  bignum.c
-  compar.c
-  dir.c
-  enum.c
-  file.c
-  hash.c
-  io.c
-  marshal.c
-  math.c
-  numeric.c
-  pack.c
-  prec.c
-  process.c
-  random.c
-  range.c
-  re.c
-  signal.c
-  sprintf.c
-  string.c
-  struct.c
-  time.c
+  array.c       : Array
+  bignum.c      : Bignum
+  compar.c      : Comparable
+  complex.c     : Complex
+  cont.c        : Fiber, Continuation
+  dir.c         : Dir
+  enum.c        : Enumerable
+  enumerator.c  : Enumerator
+  file.c        : File
+  hash.c        : Hash
+  io.c          : IO
+  marshal.c     : Marshal
+  math.c        : Math
+  numeric.c     : Numeric, Integer, Fixnum, Float
+  pack.c        : Array#pack, String#unpack
+  proc.c        : Binding, Proc
+  process.c     : Process
+  random.c      : random number
+  range.c       : Range
+  rational.c    : Rational
+  re.c          : Regexp, MatchData
+  signal.c      : Signal
+  sprintf.c     : 
+  string.c      : String
+  struct.c      : Struct
+  time.c        : Time
+
+  defs/knwon_errors.def  : Errno::* exception classes
+    -> known_errors.inc  : automatically generated
+
+multilingualization
+  encoding.c    : Encoding
+  transcode.c   : Encoding::Converter
+  enc/*.c       : encoding classes
+  enc/trans/*   : codepoint mapping tables
+
+goruby interpreter implementation
+  
+  goruby.c
+  golf_prelude.rb     : goruby specific libraries.
+    -> golf_prelude.c : automatically generated
+
 
 Appendix B. Ruby extension API reference
 
@@ -793,10 +960,17 @@ void Check_SafeStr(VALUE value)
 
 ** Data type conversion
 
-FIX2INT(value)
-INT2FIX(i)
-NUM2INT(value)
-INT2NUM(i)
+FIX2INT(value), INT2FIX(i)
+FIX2LONG(value), LONG2FIX(l)
+NUM2INT(value), INT2NUM(i)
+NUM2UINT(value), UINT2NUM(ui)
+NUM2LONG(value), LONG2NUM(l)
+NUM2ULONG(value), ULONG2NUM(ul)
+NUM2LL(value), LL2NUM(ll)
+NUM2ULL(value), ULL2NUM(ull)
+NUM2OFFT(value), OFFT2NUM(off)
+NUM2SIZET(value), SIZET2NUM(size)
+NUM2SSIZET(value), SSIZET2NUM(ssize)
 NUM2DBL(value)
 rb_float_new(f)
 StringValue(value)
@@ -909,11 +1083,42 @@ Defines a singleton method.  Arguments are same as rb_define_method().
 
  rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
 
-Retrieve argument from argc, argv.  The fmt is the format string for
-the arguments, such as "12" for 1 non-optional argument, 2 optional
-arguments.  If `*' appears at the end of fmt, it means the rest of
-the arguments are assigned to the corresponding variable, packed in
-an array.
+Retrieve argument from argc and argv to given VALUE references
+according to the format string.  The format can be described in ABNF
+as follows:
+
+--
+scan-arg-spec  := param-arg-spec [block-arg-spec]
+
+param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / pre-opt-post-arg-spec
+pre-arg-spec   := num-of-leading-mandatory-args [num-of-optional-args]
+post-arg-spec  := sym-for-variable-length-args [num-of-trailing-mandatory-args]
+pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args num-of-trailing-mandatory-args
+block-arg-spec := sym-for-block-arg
+
+num-of-leading-mandatory-args  := DIGIT ; The number of leading
+                                        ; mandatory arguments
+num-of-optional-args           := DIGIT ; The number of optional
+                                        ; arguments
+sym-for-variable-length-args   := "*"   ; Indicates that variable
+                                        ; length arguments are
+                                        ; captured as a ruby array
+num-of-trailing-mandatory-args := DIGIT ; The number of trailing
+                                        ; mandatory arguments
+sym-for-block-arg              := "&"   ; Indicates that an iterator
+                                        ; block should be captured if
+                                        ; given
+--
+
+For example, "12" means that the method requires at least one
+argument, and at most receives three (1+2) arguments.  So, the format
+string must be followed by three variable references, which are to be
+assigned to captured arguments.  For omitted arguments, variables are
+set to Qnil.  NULL can be put in place of a variable reference, which
+means the corresponding captured argument(s) should be just dropped.
+
+The number of given arguments, excluding an iterator block, is
+returned.
 
 ** Invoking Ruby method
 
@@ -958,28 +1163,56 @@ Sets the value of the instance variable.
 
 ** Control Structure
 
- VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
+ VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv,
+		     VALUE (*func) (ANYARGS), VALUE data2)
+
+Calls a method on the recv, with the method name specified by the
+symbol mid, with argc arguments in argv, supplying func as the
+block. When func is called as the block, it will receive the value
+from yield as the first argument, and data2 as the second argument.
+When yielded with multiple values (in C, rb_yield_values(),
+rb_yield_values2() and rb_yield_splat()), data2 is packed as an Array,
+whereas yielded values can be gotten via argc/argv of the third/fourth
+arguments.
+
+ [OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
 
 Calls the function func1, supplying func2 as the block.  func1 will be
 called with the argument arg1.  func2 receives the value from yield as
 the first argument, arg2 as the second argument.
  
+When rb_iterate is used in 1.9, func1 has to call some Ruby-level method.
+This function is obsolete since 1.9; use rb_block_call instead.
+
  VALUE rb_yield(VALUE val)
 
 Evaluates the block with value val.
 
- VALUE rb_rescue(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
+ VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
 
 Calls the function func1, with arg1 as the argument.  If an exception
 occurs during func1, it calls func2 with arg2 as the argument.  The
 return value of rb_rescue() is the return value from func1 if no
 exception occurs, from func2 otherwise.
 
- VALUE rb_ensure(VALUE (*func1)(), void *arg1, void (*func2)(), void *arg2)
+ VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
 
 Calls the function func1 with arg1 as the argument, then calls func2
 with arg2 if execution terminated.  The return value from
-rb_ensure() is that of func1.
+rb_ensure() is that of func1 when no exception occured.
+
+ VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state)
+
+Calls the function func with arg as the argument.  If no exception
+occured during func, it returns the result of func and *state is zero.
+Otherwise, it returns Qnil and sets *state to nonzero.  If state is
+NULL, it is not set in both cases.
+
+ void rb_jump_tag(int state)
+
+Continues the exception caught by rb_protect() and rb_eval_string_protect().
+state must be the returned value from those functions.  This function
+never return to the caller.
 
 ** Exceptions and Errors
 
@@ -1033,7 +1266,7 @@ Specifies the name of the script ($0).
 
 ** Hooks for the Interpreter Events
 
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events)
+ void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
 
 Adds a hook function for the specified interpreter events.
 events should be Or'ed value of:
@@ -1050,13 +1283,57 @@ events should be Or'ed value of:
 
 The definition of rb_event_hook_func_t is below:
 
- typedef void (*rb_event_hook_func_t)(rb_event_t event, NODE *node,
+ typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
  				      VALUE self, ID id, VALUE klass)
 
+The third argument `data' to rb_add_event_hook() is passed to the hook
+function as the second argument, which was the pointer to the current
+NODE in 1.8.  See RB_EVENT_HOOKS_HAVE_CALLBACK_DATA below.
+
  int rb_remove_event_hook(rb_event_hook_func_t func)
 
 Removes the specified hook function.
 
+** Macros for the Compatibilities
+
+Some macros to check API compatibilities are available by default.
+
+ NORETURN_STYLE_NEW
+
+Means that NORETURN macro is functional style instead of prefix.
+
+ HAVE_RB_DEFINE_ALLOC_FUNC
+
+Means that function rb_define_alloc_func() is provided, that means the
+allocation framework is used.  This is same as the result of
+have_func("rb_define_alloc_func", "ruby.h").
+
+ HAVE_RB_REG_NEW_STR
+
+Means that function rb_reg_new_str() is provided, that creates Regexp
+object from String object.  This is same as the result of
+have_func("rb_reg_new_str", "ruby.h").
+
+ HAVE_RB_IO_T
+
+Means that type rb_io_t is provided.
+
+ USE_SYMBOL_AS_METHOD_NAME
+
+Means that Symbols will be returned as method names, e.g.,
+Module#methods, #singleton_methods and so on.
+
+ HAVE_RUBY_*_H
+
+Defined in ruby.h and means correspoinding header is available.  For
+instance, when HAVE_RUBY_ST_H is defined you should use ruby/st.h not
+mere st.h.
+
+ RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
+
+Means that rb_add_event_hook() takes the third argument `data', to be
+passed to the given event hook function.
+
 Appendix C. Functions Available in extconf.rb
 
 These functions are available in extconf.rb:
@@ -1120,7 +1397,7 @@ this method, the compilation will not be done.
  find_executable(bin, path)
 
 Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories.  If path is nil or omitted, environment varialbe PATH
+directories.  If path is nil or omitted, environment variable PATH
 will be used.  Returns the path name of the command if it is found,
 otherwise nil.
 
@@ -1149,7 +1426,7 @@ Returns an array of the added directories ([include_dir, lib_dir]).
  pkg_config(pkg)
 
 Obtains the information for pkg by pkg-config command.  The actual
-command name can be overriden by --with-pkg-config command line
+command name can be overridden by --with-pkg-config command line
 option.
 
 /*
diff --git a/README.EXT.ja b/README.EXT.ja
index 30c4d520ba..dae0d24b43 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -35,10 +35,12 @@ Ruby�ˤϥ桼�����Ȥ���ǽ���Τ���ʲ��Υ����פ�����ޤ���
 	T_STRING	ʸ����
 	T_REGEXP	����ɽ��
 	T_ARRAY		����
-	T_FIXNUM	Fixnum(31bitĹ����)
 	T_HASH		Ϣ������
 	T_STRUCT	(Ruby��)��¤��
 	T_BIGNUM	¿��Ĺ����
+	T_FIXNUM	Fixnum(31bit�ޤ���63bitĹ����)
+	T_COMPLEX	ʣ�ǿ�
+	T_RATIONAL	ͭ����
 	T_FILE		������
 	T_TRUE		��
 	T_FALSE		��
@@ -50,9 +52,8 @@ Ruby�ˤϥ桼�����Ȥ���ǽ���Τ���ʲ��Υ����פ�����ޤ���
 	T_ICLASS
 	T_MATCH
 	T_UNDEF
-	T_VARMAP
-	T_SCOPE
 	T_NODE
+	T_ZOMBIE
 
 �ۤȤ�ɤΥ����פ�C�ι�¤�ΤǼ�������Ƥ��ޤ���
 
@@ -95,28 +96,40 @@ FIXNUM��NIL�˴ؤ��ƤϤ���®��Ƚ�̥ޥ������Ѱդ���Ƥ��ޤ���
 
 1.3 VALUE��C�Υǡ������Ѵ�����
 
-�ǡ��������פ�T_NIL, T_FALSE, T_TRUE�Ǥ�������ǡ����Ϥ��줾
-��nil, false, true�Ǥ������Υǡ��������פΥ��֥������ȤϤҤ�
+�ǡ��������פ�T_NIL��T_FALSE��T_TRUE�Ǥ�������ǡ����Ϥ��줾
+��nil��false��true�Ǥ������Υǡ��������פΥ��֥������ȤϤҤ�
 �Ĥ��Ĥ���¸�ߤ��ޤ���
 
-�ǡ��������פ�T_FIXNUM�λ��������31bit�Υ����������������
-����FIXNUM��C���������Ѵ����뤿��ˤϥޥ�����FIX2INT()�פ��
-���ޤ������줫�顤FIXNUM�˸¤餺Ruby�Υǡ������������Ѵ�����
-��NUM2INT()�פȤ����ޥ���������ޤ������Υޥ����ϥǡ�������
-�פΥ����å�̵���ǻȤ��ޤ�(�������Ѵ��Ǥ��ʤ����ˤ��㳰��
-ȯ������)��Ʊ�ͤ˥����å�̵���ǻȤ����Ѵ��ޥ�����double��
-���Ф���NUM2DBL()�פ�����ޤ���
-
-char* ����Ф���硢version 1.6 �����Ǥϡ�STR2CSTR()�פ�
-�����ޥ�����ȤäƤ��ޤ������������ to_str() �ˤ����ۤ�
-���Ѵ���̤� GC ������ǽ�������뤿�ᡢversion 1.7 �ʹߤǤ�
-obsolete �Ȥʤꡢ����� StringValue() �� StringValuePtr()
-��Ȥ�����侩���Ƥ��ޤ���StringValue(var) �� var �� String
- �Ǥ���в��⤻���������Ǥʤ���� var �� var.to_str() �η�̤�
-�֤�������ޥ�����StringValuePtr(var) ��Ʊ�ͤ� var ���֤�����
-�Ƥ��� var ��ʸ����ɽ�����Ф��� char* ���֤��ޥ����Ǥ���var ��
-���Ƥ�ľ���֤����������������Τǡ�var �� lvalue �Ǥ���ɬ�פ�
-����ޤ���
+�ǡ��������פ�T_FIXNUM�λ��������31bit�ޤ���63bit�Υ�������
+���������Ǥ���long�Υ�������32bit�Υץ�åȥե�����Ǥ����
+31bit�ˡ�long�Υ�������64bit�Υץ�åȥե�����Ǥ����63bit
+�ˤʤ�ޤ�. FIXNUM �� C ���������Ѵ����뤿��ˤϥޥ���
+��FIX2INT()�פޤ��ϡ�FIX2LONG()�פ�Ȥ��ޤ��������Υޥ���
+����Ѥ���ݤˤϻ����˥ǡ��������פ�FIXNUM�Ǥ��뤳�Ȥ��ǧ��
+��ɬ�פ�����ޤ��������Ū��®���Ѵ���Ԥ����Ȥ��Ǥ��ޤ�����
+������FIX2LONG()�פ��㳰��ȯ�����ޤ��󤬡���FIX2INT()�פ���
+����̤�int�Υ������˼��ޤ�ʤ����ˤ��㳰��ȯ�����ޤ���
+���줫�顤FIXNUM�˸¤餺Ruby�Υǡ������������Ѵ�����
+��NUM2INT()�פ���ӡ�NUM2LONG()�פȤ����ޥ���������ޤ�����
+���Υޥ����ϥޥ����ϥǡ��������פΥ����å�̵���ǻȤ��ޤ�
+(�������Ѵ��Ǥ��ʤ����ˤ��㳰��ȯ������)��Ʊ�ͤ˥����å�̵
+�ǻȤ����Ѵ��ޥ�����double����Ф���NUM2DBL()�פ�����ޤ���
+
+char* ����Ф���硤 StringValue() �� StringValuePtr() 
+��Ȥ��ޤ���
+StringValue(var) �� var �� String 
+�Ǥ���в��⤻���������Ǥʤ���� var �� var.to_str() �η��
+���֤�������ޥ�����StringValuePtr(var) ��Ʊ�ͤ� var ��
+String ���֤������Ƥ��� var �ΥХ�����ɽ�����Ф��� char* ��
+�֤��ޥ����Ǥ���var �����Ƥ�ľ���֤����������������Τǡ�
+var �� lvalue �Ǥ���ɬ�פ�����ޤ���
+�ޤ���StringValuePtr() ��������� StringValueCStr() �Ȥ�����
+�����⤢��ޤ���StringValueCStr(var) �� var �� String ���֤�
+�����Ƥ��� var ��ʸ����ɽ�����Ф��� char* ���֤��ޤ����֤���
+��ʸ����������ˤ� nul ʸ�����ղä���ޤ����ʤ�������� nul
+ʸ�����ޤޤ����� ArgumentError ��ȯ�����ޤ���
+������StringValuePtr() �Ǥϡ������� nul ʸ���������ݾڤϤʤ���
+����� nul ʸ�����ޤޤ�Ƥ����ǽ���⤢��ޤ���
 
 ����ʳ��Υǡ��������פ��б�����C�ι�¤�Τ�����ޤ����б���
 �빽¤�ΤΤ���VALUE�Ϥ��Τޤޥ��㥹��(���Ѵ�)����й�¤�Τ�
@@ -129,10 +142,11 @@ obsolete �Ȥʤꡢ����� StringValue() �� StringValuePtr()
 ruby.h�ǤϹ�¤�Τإ��㥹�Ȥ���ޥ������RXXXXX()��(������ʸ
 ���ˤ������)�Ȥ���̾�����󶡤���Ƥ��ޤ�(��: RSTRING())��
 
-�㤨�С�ʸ����str��Ĺ�������뤿��ˤϡ�RSTRING(str)->len�פ�
-����ʸ����str��char*�Ȥ������뤿��ˤϡ�RSTRING(str)->ptr��
-�Ȥ��ޤ�������ξ��ˤϡ����줾���RARRAY(ary)->len�ס�
-��RARRAY(ary)->ptr�פȤʤ�ޤ���
+��¤�Τ���ǡ�������Ф��ޥ������󶡤���Ƥ��ޤ���ʸ����
+str��Ĺ�������뤿��ˤϡ�RSTRING_LEN(str)�פȤ���ʸ����str��
+char*�Ȥ������뤿��ˤϡ�RSTRING_PTR(str)�פȤ��ޤ��������
+���ˤϡ����줾���RARRAY_LEN(ary)�ס���RARRAY_PTR(ary)�פ�
+�ʤ�ޤ���
 
 Ruby�ι�¤�Τ�ľ�ܥ�������������˵���Ĥ��ʤ���Фʤ�ʤ���
 �Ȥϡ������ʸ����ι�¤�Τ���Ȥϻ��Ȥ�������ǡ�ľ���ѹ���
@@ -165,7 +179,8 @@ FIXNUM�˴ؤ��Ƥ��Ѵ��ޥ������ͳ����ɬ�פ�����ޤ���C������
 ����VALUE���Ѵ�����ޥ����ϰʲ��Τ�Τ�����ޤ���ɬ�פ˱���
 �ƻȤ�ʬ���Ƥ���������
 
-  INT2FIX()	��Ȥ�������31bit����˼��ޤ뼫���������
+  INT2FIX()	��Ȥ�������31bit�ޤ���63bit����˼��ޤ뼫��
+		�������
   INT2NUM()	Ǥ�դ���������VALUE��
 
 INT2NUM()��������FIXNUM���ϰϤ˼��ޤ�ʤ���硤Bignum���Ѵ�
@@ -187,11 +202,13 @@ Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
     ������Ruby��ʸ������������롥
 
   rb_str_new2(const char *ptr)
+  rb_str_new_cstr(const char *ptr)
 
     C��ʸ���󤫤�Ruby��ʸ������������롥���δؿ��ε�ǽ��
     rb_str_new(ptr, strlen(ptr))��Ʊ���Ǥ��롥
 
   rb_tainted_str_new(const char *ptr, long len)
+  rb_tainted_str_new_cstr(const char *ptr)
 
     �����ޡ������ղä��줿������Ruby��ʸ������������롥����
     ����Υǡ����˴�Ť�ʸ����ˤϱ����ޡ������ղä����٤�
@@ -201,10 +218,39 @@ Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
 
     C��ʸ���󤫤�����ޡ������ղä��줿Ruby��ʸ������������롥
 
+  rb_sprintf(const char *format, ...)
+  rb_vsprintf(const char *format, va_list ap)
+
+    C��ʸ����format��³��������printf(3)�Υե����ޥåȤˤ������ä�
+    ��������Ruby��ʸ������������롥
+
   rb_str_cat(VALUE str, const char *ptr, long len)
 
     Ruby��ʸ����str��len�Х��Ȥ�ʸ����ptr���ɲä��롥
 
+  rb_str_cat2(VALUE str, const char* ptr)
+
+    Ruby��ʸ����str��C��ʸ����ptr���ɲä��롥���δؿ��ε�ǽ��
+    rb_str_cat(str, ptr, strlen(ptr))��Ʊ���Ǥ��롥
+
+  rb_str_catf(VALUE str, const char* format, ...)
+  rb_str_vcatf(VALUE str, const char* format, va_list ap)
+
+    C��ʸ����format��³��������printf(3)�Υե����ޥåȤˤ������ä�
+    ��������Ruby��ʸ����str���ɲä��롥���δؿ��ε�ǽ�ϡ����줾��
+    rb_str_cat2(str, rb_sprintf(format, ...)) ��
+    rb_str_cat2(str, rb_vsprintf(format, ap)) ��Ʊ���Ǥ��롥
+
+  rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
+  
+    ���ꤵ�줿���󥳡��ǥ��󥰤�Ruby��ʸ�������������.
+     
+  rb_usascii_str_new(const char *ptr, long len)
+  rb_usascii_str_new_cstr(const char *ptr)
+
+    ���󥳡��ǥ��󥰤�US-ASCII��Ruby��ʸ�������������.
+
+
  ������Ф���ؿ�
 
   rb_ary_new()
@@ -224,14 +270,32 @@ Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
 
     �����Ϳ����n���Ǥ�������������롥
 
+  rb_ary_to_ary(VALUE obj)
+
+    ���֥������Ȥ�������Ѵ�����.
+    Object#to_ary��Ʊ���Ǥ���.
+
+ ¾�ˤ����������ؿ���¿������. ������
+ ����ary��������Ϥ��ʤ���Фʤ�ʤ�. ����ʤ���
+ �������Ǥ�.
+
+  rb_ary_aref(argc, VALUE *argv, VALUE ary)
+
+    Array#[]��Ʊ��.
+
+  rb_ary_entry(VALUE ary, long offset)
+
+    ary[offset]
+
+  rb_ary_subseq(VALUE ary, long beg, long len)
+
+    ary[beg, len]
+
   rb_ary_push(VALUE ary, VALUE val)
   rb_ary_pop(VALUE ary)
   rb_ary_shift(VALUE ary)
   rb_ary_unshift(VALUE ary, VALUE val)
 
-    Array��Ʊ̾�Υ᥽�åɤ�Ʊ��Ư���򤹤�ؿ�����1������ɬ��
-    ����Ǥʤ���Фʤ�ʤ���
-
 2��Ruby�ε�ǽ��Ȥ�
 
 ����Ū��Ruby�ǽ񤱤뤳�Ȥ�C�Ǥ�񤱤ޤ���Ruby���Τ�Τ�C�ǵ�
@@ -294,19 +358,26 @@ argc����λ��ϰ����ο��ǤϤʤ�����������ꤷ�����Ȥˤʤ�ޤ���
 argc��-1�λ��ϰ����������������Ϥ���ޤ���argc��-2�λ��ϰ�
 ����Ruby������Ȥ����Ϥ���ޤ���
 
-�᥽�åɤ��������ؿ��Ϥ⤦��Ĥ���ޤ����ҤȤĤ�private��
-���åɤ��������ؿ��ǡ�������rb_define_method()��Ʊ���Ǥ���
+�᥽�åɤ��������ؿ��Ϥޤ������Ĥ�����ޤ�. �ҤȤĤϥ᥽�å�
+̾�Ȥ���ID����ޤ�. ID�ˤĤ��Ƥ�2.2.2�򻲾�.
+
+  void rb_define_method_id(VALUE klass, ID name, 
+                           VALUE (*func)(ANYARGS), int argc)
+
+private/protected�ʥ᥽�åɤ��������դ��Ĥδؿ�������ޤ�.
 
   void rb_define_private_method(VALUE klass, const char *name, 
 				VALUE (*func)(), int argc)
+  void rb_define_protected_method(VALUE klass, const char *name, 
+			          VALUE (*func)(), int argc)
 
 private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
 �ɤǤ���
 
-�⤦�ҤȤĤϥ⥸�塼��ؿ�����������ΤǤ����⥸�塼��ؿ�
-�Ȥϥ⥸�塼����ðۥ᥽�åɤǤ��ꡤƱ����private�᥽�åɤ�
-�⤢���ΤǤ�����򤢤����Math�⥸�塼���sqrt()�ʤɤ�����
-���ޤ������Υ᥽�åɤ�
+�Ǹ�ˡ� rb_define_module�ؿ��ϥ⥸�塼��ؿ���������ޤ���
+�⥸�塼��ؿ��Ȥϥ⥸�塼����ðۥ᥽�åɤǤ��ꡤƱ����
+private�᥽�åɤǤ⤢���ΤǤ�����򤢤����Math�⥸�塼��
+��sqrt()�ʤɤ��������ޤ������Υ᥽�åɤ�
 
   Math.sqrt(4)
 
@@ -327,20 +398,24 @@ private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
   void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
 
 
-�᥽�åɤ���̾��������뤿��δؿ��ϰʲ����̤�Ǥ���
+�᥽�åɤ���̾��������뤿��δؿ��ϰʲ����̤�Ǥ���
 
   void rb_define_alias(VALUE module, const char* new, const char* old);
 
+°���μ���������᥽�åɤ��������ˤ�
+
+  void rb_define_attr(VALUE klass, const char *name, int read, int write)
+
 ���饹�᥽�å�allocate������������������ꤹ�뤿��δؿ���
-�ʲ����̤�Ǥ���
+�ʲ����̤�Ǥ���
 
   void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
   void rb_undef_alloc_func(VALUE klass);
 
-func�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
-�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡣤��Υ��󥹥��󥹤ϡ�������
-�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
-���褤�Ǥ��礦��
+func�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
+�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡥤��Υ��󥹥��󥹤ϡ�������
+�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
+���褤�Ǥ��礦��
 
 2.1.3 ������
 
@@ -374,16 +449,26 @@ C����Ruby�ε�ǽ��ƤӽФ���äȤ��ñ����ˡ�Ȥ��ơ�ʸ�����
 ����ɾ���ϸ��ߤδĶ��ǹԤ��ޤ����Ĥޤꡤ���ߤΥ��������ѿ�
 �ʤɤ�����Ѥ��ޤ���
 
+ɾ�����㳰��ȯ�����뤫�⤷��ʤ����Ȥ����դ��ޤ��礦. ������
+�ʴؿ��⤢��ޤ�.
+
+  VALUE rb_eval_string_protect(const char *str, int *state)
+
+���δؿ��ϥ��顼��ȯ�������nil���֤��ޤ��������ơ��������ˤ�
+*state�ϥ����ˡ�����ʤ����󥼥��ˤʤ�ޤ���
+
+
 2.2.2 ID�ޤ��ϥ���ܥ�
 
 C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ����Ȥ�Ǥ���
 �����������ˡ�Ruby���󥿥ץ꥿��ǥ᥽�åɤ��ѿ�̾����ꤹ��
 ���˻Ȥ��Ƥ���ID�ˤĤ����������Ƥ����ޤ��礦��
 
-ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
-���֥������ȤȤ��ƥ���ܥ�(Symbol)�����ꡤ
+ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby����Ǥ�
 
  :���̻�
+�ޤ���
+ :"Ǥ�դ�ʸ����"
 
 �ǥ��������Ǥ��ޤ���C���餳�����������뤿��ˤϴؿ�
 
@@ -394,14 +479,6 @@ ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
 
   rb_to_id(VALUE symbol)
 
-ID���饷��ܥ�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
-
-  VALUE ID2SYM(ID id)
-
-����ܥ뤫��ID�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
-
-  ID SYM2ID(VALUE symbol)
-
 2.2.3 C����Ruby�Υ᥽�åɤ�ƤӽФ�
 
 C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ�����ˤϰʲ�
@@ -483,11 +560,17 @@ C��Ruby������ѿ���Ȥäƾ����ͭ�Ǥ��ޤ�����ͭ�Ǥ������
 �����ѿ������Ȥ��줿���ˤϴؿ�getter�����ѿ����ͤ����åȤ���
 �����ˤϴؿ�setter���ƤФ�롥hook����ꤷ�ʤ�����getter��
 setter��0����ꤷ�ޤ���
-
 # getter��setter��0�ʤ��rb_define_variable()��Ʊ���ˤʤ롥
 
-���줫�顤C�δؿ��ˤ�äƼ¸������Ruby������ѿ����������
-�ؿ�������ޤ���
+getter��setter�λ��ͤϼ����̤�Ǥ���
+
+  VALUE (*getter)(ID id, VALUE *var);
+  void (*setter)(VALUE val, ID id, VALUE *var);
+
+
+���줫�顤�б�����C���ѿ�������ʤ�Ruby������ѿ����������
+���Ȥ�Ǥ��ޤ�. �����ѿ����ͤϥեå��ؿ��Τߤˤ�äƼ���������
+����ޤ�.
 
   void rb_define_virtual_variable(const char *name,
 				  VALUE (*getter)(), void (*setter)())
@@ -497,8 +580,8 @@ getter�����ѿ����ͤ����åȤ��줿���ˤ�setter���ƤФ�ޤ���
 
 getter��setter�λ��ͤϰʲ����̤�Ǥ���
 
-  (*getter)(ID id, void *data, struct global_entry* entry);
-  (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
+  (*getter)(ID id);
+  (*setter)(VALUE val, ID id);
 
 3.3 C�Υǡ�����Ruby���֥������Ȥˤ���
 
@@ -525,6 +608,11 @@ free�Ϥ��ι�¤�Τ��⤦���פˤʤä����˸ƤФ��ؿ��Ǥ�������
 �ؿ��������١������쥯������ƤФ�ޤ������줬-1�ξ��ϡ�ñ
 ��˳�������ޤ���
 
+mark�����free�ؿ���GC�¹���˸ƤӽФ���ޤ�.
+�ʤ�, GC�¹����Ruby���֥������ȤΥ������������϶ػߤ����
+��. ��ä�, mark�����free�ؿ���Ruby���֥������ȤΥ���������
+���ϹԤ�ʤ��Ǥ�������.
+
 C�ι�¤�Τγ�����Data���֥������Ȥ�������Ʊ���˹Ԥ��ޥ�����
 ���ưʲ��Τ�Τ��󶡤���Ƥ��ޤ���
 
@@ -584,7 +672,8 @@ Ruby�ϳ�ĥ�饤�֥�������ɤ�����ˡ�Init_�饤�֥��̾�פ�
 �����Ԥ��ޤ���dbm.c����������Ѥ��ޤ���
 
 --
-Init_dbm()
+void
+Init_dbm(void)
 {
     /* DBM���饹��������� */
     cDBM = rb_define_class("DBM", rb_cObject);
@@ -646,8 +735,7 @@ fdbm_delete()�Ϥ��Τ褦�ˤʤäƤ��ޤ���
 
 --
 static VALUE
-fdbm_delete(obj, keystr)
-    VALUE obj, keystr;
+fdbm_delete(VALUE obj, VALUE keystr)
 {
 	:
 }
@@ -663,10 +751,7 @@ fdbm_delete(obj, keystr)
 
 --
 static VALUE
-fdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+fdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
 	:
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -681,22 +766,17 @@ fdbm_s_open(argc, argv, klass)
 �����ޤ���
 
 ���������Ϳ����줿��������Ϥ��뤿��δؿ���open()�Ǥ�Ȥ�
-��Ƥ���rb_scan_args()�Ǥ�����3�����˻��ꤷ���ե����ޥåȤ�
-��������4�ѿ��ʹߤ˻��ꤷ���ѿ����ͤ��������Ƥ���ޤ�������
-�ե����ޥåȤϡ���1ʸ���ܤ���ά�Ǥ��ʤ������ο�����2ʸ���ܤ�
-��ά�Ǥ�������ο�����3ʸ���ܤ��б�������̵꤬�����ޤ�ΰ�
-�������뤫�ɤ����򼨤�"*"�Ǥ���2ʸ���ܤ�3ʸ���ܤϾ�ά�Ǥ���
-����dbm.c����Ǥϡ��ե����ޥåȤ�"11"�Ǥ����顤�����Ϻ���1��
-�ǡ�2�Ĥޤǵ������Ȥ�����̣�ˤʤ�ޤ�����ά����Ƥ������
-�ѿ����ͤ�nil(C����Υ�٥�Ǥ�Qnil)�ˤʤ�ޤ���
-
-Ruby������ǰ������������Τ�indexes������ޤ��������Ϥ�
-���Ǥ���
+��Ƥ���rb_scan_args()�Ǥ�����3�����˻��ꤷ���ե����ޥåȤ˽�
+������4�ѿ��ʹߤ˻��ꤷ��VALUE�ؤλ��Ȥ��ͤ��������Ƥ����
+����
+
+
+������Ruby������Ȥ��Ƽ������᥽�åɤ���ˤ�
+Thread#initialize������ޤ��������Ϥ����Ǥ���
 
 --
 static VALUE
-fdbm_indexes(obj, args)
-    VALUE obj, args;
+thread_initialize(VALUE thread, VALUE args)
 {
 	:
 }
@@ -735,9 +815,9 @@ Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
   $LDFLAGS: ��󥯻����ɲ�Ū�˻��ꤹ��ե饰(-L�ʤ�)
   $objs: ��󥯤���륪�֥������ȥե�����̾�Υꥹ��
 
-���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
-�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
-��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
+���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
+�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
+��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
 
 �饤�֥��򥳥�ѥ��뤹���郎·�鷺�����Υ饤�֥��򥳥�
 �ѥ��뤷�ʤ����ˤ�create_makefile��ƤФʤ����Makefile����
@@ -765,6 +845,12 @@ Makefile��ºݤ��������뤿��ˤ�
 
 �Ȥ��Ƥ���������
 
+site_ruby �ǥ��쥯�ȥ�Ǥʤ���
+vendor_ruby �ǥ��쥯�ȥ�˥��󥹥ȡ��뤹����ˤ�
+�ʲ��Τ褦�� --vendor ���ץ�����ä��Ƥ���������
+
+  ruby extconf.rb --vendor
+
 �ǥ��쥯�ȥ��ext�ʲ����Ѱդ������ˤ�Ruby���Τ�make�λ���
 ��ưŪ��Makefile����������ޤ��Τǡ����Υ��ƥåפ����פǤ���
 
@@ -807,53 +893,119 @@ Ruby�Υ������Ϥ����Ĥ���ʬ�ह�뤳�Ȥ�����ޤ������Τ�������
 
 Ruby����Υ���
 
-  class.c
-  error.c
+  class.c         : ���饹�ȥ⥸�塼��
+  error.c         : �㳰���饹���㳰����
+  gc.c            : �����ΰ����
+  load.c          : �饤�֥��Υ�����
+  object.c        : ���֥�������
+  variable.c      : �ѿ������
+
+Ruby�ι�ʸ���ϴ�
+  parse.y         : ������ϴ�ȹ�ʸ���
+    -> parse.c    : ��ư����
+  keywords        : ͽ���
+    -> lex.c      : ��ư����
+
+Ruby��ɾ���� (�̾�YARV)
+  compile.c
   eval.c
-  gc.c
-  object.c
-  parse.y
-  variable.c
+  eval_error.c
+  eval_jump.c
+  eval_safe.c
+  insns.def           : ���۵���������
+  iseq.c              : VM::ISeq�μ���
+  thread.c            : ����åɴ����ȥ���ƥ������ڤ��ؤ�
+  thread_win32.c      : ����åɼ���
+  thread_pthread.c    : Ʊ��
+  vm.c
+  vm_dump.c
+  vm_eval.c
+  vm_exec.c
+  vm_insnhelper.c
+  vm_method.c
+
+  opt_insns_unif.def  : ̿��ͻ��
+  opt_operand.def     : ��Ŭ���Τ�������
+
+    -> insn*.inc      : ��ư����
+    -> opt*.inc       : ��ư����
+    -> vm.inc         : ��ư����
+
+����ɽ�����󥸥� (����)
+  regex.c
+  regcomp.c
+  regenc.c
+  regerror.c
+  regexec.c
+  regparse.c
+  regsyntax.c
 
 �桼�ƥ���ƥ��ؿ�
 
-  dln.c
-  regex.c
-  st.c
-  util.c
+  debug.c       : C�ǥХå��ѤΥǥХå�����ܥ�
+  dln.c         : ưŪ�����ǥ���
+  st.c          : ���ѥϥå���ɽ
+  strftime.c    : ��������
+  util.c        : ����¾�Υ桼�ƥ���ƥ�
 
 Ruby���ޥ�ɤμ���
 
   dmyext.c
+  dmydln.c
+  dmyencoding.c
+  id.c
   inits.c
   main.c
   ruby.c
   version.c
 
+  gem_prelude.rb
+  prelude.rb
+
 ���饹�饤�֥��
 
-  array.c
-  bignum.c
-  compar.c
-  dir.c
-  enum.c
-  file.c
-  hash.c
-  io.c
-  marshal.c
-  math.c
-  numeric.c
-  pack.c
-  prec.c
-  process.c
-  random.c
-  range.c
-  re.c
-  signal.c
-  sprintf.c
-  string.c
-  struct.c
-  time.c
+  array.c       : Array
+  bignum.c      : Bignum
+  compar.c      : Comparable
+  complex.c     : Complex
+  cont.c        : Fiber, Continuation
+  dir.c         : Dir
+  enum.c        : Enumerable
+  enumerator.c  : Enumerator
+  file.c        : File
+  hash.c        : Hash
+  io.c          : IO
+  marshal.c     : Marshal
+  math.c        : Math
+  numeric.c     : Numeric, Integer, Fixnum, Float
+  pack.c        : Array#pack, String#unpack
+  proc.c        : Binding, Proc
+  process.c     : Process
+  random.c      : ���
+  range.c       : Range
+  rational.c    : Rational
+  re.c          : Regexp, MatchData
+  signal.c      : Signal
+  sprintf.c     : 
+  string.c      : String
+  struct.c      : Struct
+  time.c        : Time
+
+  defs/knwon_errors.def  : �㳰���饹 Errno::*
+    -> known_errors.inc  : ��ư����
+
+¿���첽
+  encoding.c    : Encoding
+  transcode.c   : Encoding::Converter
+  enc/*.c       : ���󥳡��ǥ��󥰥��饹��
+  enc/trans/*   : �����ɥݥ�����б�ɽ
+
+goruby���ޥ�ɤμ���
+  
+  goruby.c
+  golf_prelude.rb      : goruby��ͭ�Υ饤�֥��
+    -> golf_prelude.c  : ��ư����
+
 
 Appendix B. ��ĥ�Ѵؿ���ե����
 
@@ -911,10 +1063,17 @@ void Check_SafeStr(VALUE value)
 
 ** ���Ѵ�
 
-FIX2INT(value)
-INT2FIX(i)
-NUM2INT(value)
-INT2NUM(i)
+FIX2INT(value), INT2FIX(i)
+FIX2LONG(value), LONG2FIX(l)
+NUM2INT(value), INT2NUM(i)
+NUM2UINT(value), UINT2NUM(ui)
+NUM2LONG(value), LONG2NUM(l)
+NUM2ULONG(value), ULONG2NUM(ul)
+NUM2LL(value), LL2NUM(ll)
+NUM2ULL(value), ULL2NUM(ull)
+NUM2OFFT(value), OFFT2NUM(off)
+NUM2SIZET(value), SIZET2NUM(size)
+NUM2SSIZET(value), SSIZET2NUM(ssize)
 NUM2DBL(value)
 rb_float_new(f)
 StringValue(value)
@@ -1018,13 +1177,38 @@ rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int a
 
 rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
 
-  argc, argv������Ϳ����줿������ʬ�򤹤롥fmt��ɬ�ܰ����ο�, 
-  �ղð����ο�, �Ĥ�ΰ��������뤫����ꤹ��ʸ�����, "����
-  ����*"�Ȥ��������Ǥ��롥 2 ���ܤο�����"*"�Ϥ��줾���ά��
-  ǽ�Ǥ��롥ɬ�ܰ�������Ĥ�ʤ�����0����ꤹ�롥��3������
-  �ߤ��ѿ��ؤΥݥ��󥿤�, �����������Ǥ������ѿ��˳�Ǽ����롥
-  �ղð������б����������Ϳ�����Ƥ��ʤ������ѿ���Qnil��
-  ��������롥
+  argc, argv������Ϳ����줿���ꤵ�줿�ե����ޥåȤ˽��äư�
+  ����ʬ�򤷡�³��VALUE�ؤλ��Ȥ˥��åȤ��ޤ������Υե����ޥ�
+  �Ȥϡ�ABNF�ǵ��Ҥ���Ȱʲ����̤�Ǥ���
+
+--
+scan-arg-spec  := param-arg-spec [block-arg-spec]
+
+param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / pre-opt-post-arg-spec
+pre-arg-spec   := num-of-leading-mandatory-args [num-of-optional-args]
+post-arg-spec  := sym-for-variable-length-args [num-of-trailing-mandatory-args]
+pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args num-of-trailing-mandatory-args
+block-arg-spec := sym-for-block-arg
+
+num-of-leading-mandatory-args  := DIGIT ; ��Ƭ���֤�����ά��ǽ�ʰ����ο�
+num-of-optional-args           := DIGIT ; ³�����֤�����ά��ǽ�ʰ����ο�
+sym-for-variable-length-args   := "*"   ; ³�����֤�������Ĺ������
+                                        ; Ruby������Ǽ������뤿��λ���
+num-of-trailing-mandatory-args := DIGIT ; ��ü���֤�����ά��ǽ�ʰ����ο�
+sym-for-block-arg              := "&"   ; ���ƥ졼���֥��å���������뤿���
+                                        ; ����
+--
+
+  �ե����ޥåȤ�"12"�ξ�硤�����Ϻ���1�Ĥǡ�3��(1+2)�ޤǵ���
+  ���Ȥ�����̣�ˤʤ�ޤ������äơ��ե����ޥå�ʸ�����³��
+  ��3�Ĥ�VALUE�ؤλ��Ȥ��֤�ɬ�פ�����ޤ��������ˤϼ�������
+  �ѿ������åȤ���ޤ����ѿ��ؤλ��Ȥ������NULL����ꤹ��
+  ���Ȥ�Ǥ������ξ��ϼ��������������ͤϼΤƤ��ޤ����ʤ���
+  ��ά��ǽ��������ά���줿�����ѿ����ͤ�nil(C����Υ�٥�Ǥ�
+  Qnil)�ˤʤ�ޤ���
+
+  �֤��ͤ�Ϳ����줿�����ο��Ǥ������ƥ졼���֥��å��Ͽ�����
+  ����
 
 ** Ruby�᥽�åɸƤӽФ�
 
@@ -1051,12 +1235,12 @@ char *rb_id2name(ID id)
 
 char *rb_class2name(VALUE klass)
 
-  ���饹��̾�����֤�(�ǥХå���)�����饹��̾��������ʤ����ˤ�, 
-  ������̤ä�̾������ĥ��饹��̾�����֤���
+  ���饹��̾�����֤�(�ǥХå���)�����饹��̾��������ʤ�����
+  ��, ������̤ä�̾������ĥ��饹��̾�����֤���
 
 int rb_respond_to(VALUE obj, ID id)
 
-  obj��id�Ǽ������᥽�åɤ���Ĥ��ɤ������֤���
+  obj��id�Ǽ������᥽�åɤ���Ĥ��ɤ������֤���
 
 ** ���󥹥����ѿ�
 
@@ -1073,12 +1257,26 @@ VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
 
 ** ���湽¤
 
-VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+VALUE rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv,
+		    VALUE (*func) (ANYARGS), VALUE data2)
+
+  func��֥��å��Ȥ������ꤷ��obj��쥷���С�argc��argv�����
+  �Ȥ���mid�᥽�åɤ�ƤӽФ���func����������yield���줿�͡�
+  ���������data2�������롥ʣ�����ͤ�yield���줿���(C�Ǥ�
+  rb_yield_values()��rb_yield_values2(), rb_yield_splat())��
+  data2��Array�Ȥ��ƥѥå�����Ƥ��롥�軰, ��Ͱ�����argc��
+  argv�ˤ�ä�yield���줿�ͤ���Ф����Ȥ��Ǥ��롥
+
+[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
 
   func2��֥��å��Ȥ������ꤷ, func1�򥤥ƥ졼���Ȥ��ƸƤ֡� 
   func1�ˤ� arg1�������Ȥ����Ϥ���, func2�ˤ���1�����˥��ƥ졼
   ������Ϳ����줿��, ��2������arg2���Ϥ���롥
  
+  1.9��rb_iterate��Ȥ�����, func1�����Ruby��٥�Υ᥽�å�
+  ��ƤӽФ��ʤ���Фʤ�ʤ�.
+  1.9��obsolete�Ȥʤä�. �����rb_block_call���Ѱդ��줿.
+
 VALUE rb_yield(VALUE val)
 
   val���ͤȤ��ƥ��ƥ졼���֥��å���ƤӽФ���
@@ -1096,6 +1294,18 @@ VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, void (*func2)(), VALUE arg2)
   ȯ�����Ƥ�) func2��arg2������Ȥ��Ƽ¹Ԥ��롥����ͤ�func1
   ������ͤǤ���(�㳰��ȯ�������������ʤ�)��
 
+VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state)
+
+  �ؿ�func��arg������Ȥ��Ƽ¹Ԥ�, �㳰��ȯ�����ʤ���Ф�����
+  ���ͤ��֤����㳰��ȯ����������, *state����0�򥻥åȤ���
+  Qnil���֤���
+
+void rb_jump_tag(int state)
+
+  rb_protect()��rb_eval_string_protect()����ª���줿�㳰���
+  �����롥state�Ϥ����δؿ������֤��줿�ͤǤʤ���Фʤ�ʤ���
+  ���δؿ���ľ�ܤθƤӽФ��������ʤ���
+
 ** �㳰�����顼
 
 void rb_warning(const char *fmt, ...)
@@ -1145,6 +1355,77 @@ void ruby_script(char *name)
 
   Ruby�Υ�����ץ�̾($0)�����ꤹ�롥
 
+** ���󥿥ץ꥿�Υ��٥�ȤΥեå�
+
+ void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
+
+���ꤵ�줿���󥿥ץ꥿�Υ��٥�Ȥ��Ф���եå��ؿ����ɲä��ޤ���
+events�ϰʲ����ͤ�or�Ǥʤ���Фʤ�ޤ���:
+
+	RUBY_EVENT_LINE
+	RUBY_EVENT_CLASS
+	RUBY_EVENT_END
+	RUBY_EVENT_CALL
+	RUBY_EVENT_RETURN
+	RUBY_EVENT_C_CALL
+	RUBY_EVENT_C_RETURN
+	RUBY_EVENT_RAISE
+	RUBY_EVENT_ALL
+
+rb_event_hook_func_t������ϰʲ����̤�Ǥ�:
+
+ typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
+ 				      VALUE self, ID id, VALUE klass)
+
+rb_add_event_hook() ����3���� data �ϡ��եå��ؿ�����2������
+�����Ϥ���ޤ��������1.8�Ǥϸ��ߤ�NODE�ؤΥݥ��󥿤Ǥ�������
+���� RB_EVENT_HOOKS_HAVE_CALLBACK_DATA �⻲�Ȥ��Ƥ���������
+
+ int rb_remove_event_hook(rb_event_hook_func_t func)
+
+���ꤵ�줿�եå��ؿ��������ޤ���
+
+** �ߴ����Τ���Υޥ���
+
+API�θߴ���������å����뤿��˰ʲ��Υޥ������ǥե���Ȥ��������Ƥ��ޤ���
+
+NORETURN_STYLE_NEW
+
+  NORETURN �ޥ������ؿ����ޥ����Ȥ����������Ƥ��뤳�Ȥ��̣���롥
+
+HAVE_RB_DEFINE_ALLOC_FUNC
+
+  rb_define_alloc_func() �ؿ����󶡤���Ƥ��뤳�ȡ��Ĥޤ�
+  allocation framework ���Ȥ��뤳�Ȥ��̣���롥
+  have_func("rb_define_alloc_func", "ruby.h")
+  �η�̤�Ʊ����
+
+HAVE_RB_REG_NEW_STR
+
+  String���֥������Ȥ���Regexp���֥������Ȥ���
+  rb_reg_new_str() �ؿ����󶡤���Ƥ��뤳�Ȥ��̣���롥
+  have_func("rb_reg_new_str", "ruby.h").
+  �η�̤�Ʊ����
+
+HAVE_RB_IO_T
+
+  rb_io_t �����󶡤���Ƥ��뤳�Ȥ��̣���롥
+
+USE_SYMBOL_AS_METHOD_NAME
+
+  �᥽�å�̾���֤��᥽�åɡ�Module#methods, #singleton_methods
+  �ʤɤ�Symbol���֤����Ȥ��̣���롥
+
+HAVE_RUBY_*_H
+
+  ruby.h ���������Ƥ��롥�б�����إå����󶡤���Ƥ��뤳��
+  ���̣���롥���Ȥ��С�HAVE_RUBY_ST_H ���������Ƥ������
+  ñ�ʤ� st.h �ǤϤʤ� ruby/st.h ����Ѥ��롥
+
+RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
+
+  rb_add_event_hook() ���եå��ؿ����Ϥ� data ����3�����Ȥ���
+  ������뤳�Ȥ��̣���롥
 
 Appendix C. extconf.rb�ǻȤ���ؿ�����
 
@@ -1169,10 +1450,10 @@ find_library(lib, func, path...)
 
 have_func(func, header)
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƴؿ�func��¸�ߤ������
-  �����롥func��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
-  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
-  �����ؿ���¸�ߤ����true���֤���
+  �إå��ե�����header�򥤥󥯥롼�ɤ��ƴؿ�func��¸�ߤ����
+  �å����롥func��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�Τ�
+  ������ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ�
+  �������ؿ���¸�ߤ����true���֤���
 
 have_var(var, header)
 
@@ -1223,7 +1504,8 @@ find_executable(command, path)
 
 with_config(withval[, default=nil])
 
-  ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ�����ͤ����롥
+  ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ������
+  �����롥
 
 enable_config(config, *defaults)
 disable_config(config, *defaults)
@@ -1232,8 +1514,9 @@ disable_config(config, *defaults)
   --disable-<config>�ǻ��ꤵ�줿�����ͤ����롥
   --enable-<config>�����ꤵ��Ƥ�������true��
   --disable-<config>�����ꤵ��Ƥ�������false���֤���
-  �ɤ������ꤵ��Ƥ��ʤ����ϡ��֥��å��Ĥ��ǸƤӽФ���Ƥ������
-  *defaults��yield������̡��֥��å��ʤ��ʤ�*defaults���֤���
+  �ɤ������ꤵ��Ƥ��ʤ����ϡ��֥��å��Ĥ��ǸƤӽФ����
+  �������*defaults��yield������̡��֥��å��ʤ��ʤ�
+  *defaults���֤���
 
 dir_config(target[, default_dir])
 dir_config(target[, default_include, default_lib])
@@ -1242,8 +1525,8 @@ dir_config(target[, default_include, default_lib])
   --with-<target>-lib�Τ����줫�ǻ��ꤵ���ǥ��쥯�ȥ��
   $CFLAGS �� $LDFLAGS ���ɲä��롥--with-<target>-dir=/path��
   --with-<target>-include=/path/include --with-<target>-lib=/path/lib
-  �������Ǥ��롥�ɲä��줿 include �ǥ��쥯�ȥ�� lib �ǥ��쥯�ȥ��
-  ������֤��� ([include_dir, lib_dir])
+  �������Ǥ��롥�ɲä��줿 include �ǥ��쥯�ȥ�� lib �ǥ���
+  ���ȥ��������֤��� ([include_dir, lib_dir])
 
 pkg_config(pkg)
 
diff --git a/README.ja b/README.ja
index df8cfc03f4..dd7f67ca59 100644
--- a/README.ja
+++ b/README.ja
@@ -20,9 +20,9 @@ Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
   + ���ƥ졼���ȥ���������
   + �����١������쥯��
   + �����ʥߥå������ǥ��� (�������ƥ�����ˤ��)
-  + �ܿ������⤤��¿����UNIX���ư�������Ǥʤ���DOS��Windows��
-    Mac��BeOS�ʤɤξ�Ǥ�ư��
-
+  + �ܿ������⤤��¿����Unix-like/POSIX�ߴ��ץ�åȥե�������
+    ư�������Ǥʤ���Windows�� Mac OS X��BeOS�ʤɤξ�Ǥ�ư��
+    cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatformsJa
 
 * ����ˡ
 
@@ -34,10 +34,6 @@ Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
 
 ** Subversion��
 
-�ܥ֥�����Ruby�κǿ��Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
 ��ȯ��ü�Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
 
   $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
@@ -92,6 +88,10 @@ Ruby��ĥ�⥸�塼��ˤĤ����ä��礦ruby-ext�᡼��󥰥ꥹ�Ȥ�
 
   2. configure��¹Ԥ���Makefile�ʤɤ���������
 
+     �Ķ��ˤ�äƤϥǥե���Ȥ�C����ѥ����ѥ��ץ�����դ�
+     �ޤ���configure���ץ����� optflags=.. warnflags=.. ��
+     �Ǿ�񤭤Ǥ��ޤ���
+
   3. (ɬ�פʤ��)defines.h���Խ�����
 
      ¿ʬ��ɬ��̵���Ȼפ��ޤ���
@@ -116,6 +116,32 @@ Ruby��ĥ�⥸�塼��ˤĤ����ä��礦ruby-ext�᡼��󥰥ꥹ�Ȥ�
 
   7. make install
 
+     �ʲ��Υǥ��쥯�ȥ���äơ������˥ե�����򥤥󥹥ȡ�
+     �뤷�ޤ���
+
+       * ${DESTDIR}${prefix}/bin
+       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib
+       * ${DESTDIR}${prefix}/lib/ruby
+       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib/ruby/site_ruby
+       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
+       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+       * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
+       * ${DESTDIR}${prefix}/share/man/man1
+       * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
+
+     Ruby��API�С������`x.y.z'�Ǥ���С�((|${MAJOR}|))��
+     `x'�ǡ�((|${MINOR}|))��`y'��((|${TEENY}|))��`z'�Ǥ���
+
+     ����: API�С�������teeny�ϡ�Ruby�ץ������ΥС�����
+     ��Ȥϰۤʤ뤳�Ȥ�����ޤ���
+
      root�Ǻ�Ȥ���ɬ�פ����뤫�⤷��ޤ���
 
 �⤷������ѥ�����˥��顼��ȯ���������ˤϥ��顼�Υ����ȥ�
@@ -130,15 +156,14 @@ UNIX�Ǥ����configure���ۤȤ�ɤκ��ۤ�ۼ����Ƥ����Ϥ���
 ���Ȥ��ݡ��Ȥ���С����Ǥ��뤫���Τ�ޤ���
 
 �������ƥ�����ˤ�äȤ��¸����Τ�GC���Ǥ���Ruby��GC���о�
-�Υ������ƥ����㤬setjmp()�ˤ�ä����ƤΥ쥸������ jmp_buf��
-��Ǽ���뤳�Ȥȡ�jmp_buf�ȥ����å���32bit���饤����Ȥ����
-���뤳�Ȥ��ꤷ�Ƥ��ޤ����ä����Ԥ���Ω���ʤ������б�����
-��˺���Ǥ��礦����Ԥβ������Ū��ñ�ǡ�gc.c�ǥ����å���
-�ޡ������Ƥ�����ʬ�˥��饤����ȤΥХ��ȿ��������餷�ƥޡ�
-�����륳���ɤ��ɲä�������ǺѤߤޤ�����defined(THINK_C)�פ�
-����Ƥ�����ʬ�򻲹ͤˤ��Ƥ�������
-
-# �ºݤˤ�Ruby��Think C�Ǥϥ���ѥ���Ǥ��ޤ���
+�Υ������ƥ����㤬setjmp()�ޤ���getcontext()�ˤ�ä����ƤΥ�
+��������jmp_buf��ucontext_t�˳�Ǽ���뤳�Ȥȡ�jmp_buf��
+ucontext_t�ȥ����å���32bit���饤����Ȥ���Ƥ��뤳�Ȥ���
+���Ƥ��ޤ����ä����Ԥ���Ω���ʤ������б������˺���Ǥ���
+������Ԥβ������Ū��ñ�ǡ�gc.c�ǥ����å���ޡ������Ƥ���
+��ʬ�˥��饤����ȤΥХ��ȿ��������餷�ƥޡ������륳���ɤ�
+�ɲä�������ǺѤߤޤ�����defined(__mc68000__)�פǳ���Ƥ�
+����ʬ�򻲹ͤˤ��Ƥ���������
 
 �쥸����������ɥ������CPU�Ǥϡ��쥸����������ɥ��򥹥���
 ���˥ե�å��夹�륢����֥饳���ɤ��ɲä���ɬ�פ����뤫����
diff --git a/ToDo b/ToDo
index b55e399edf..7e5ef523a8 100644
--- a/ToDo
+++ b/ToDo
@@ -2,6 +2,10 @@ Language Spec.
 
 - Class#allocate - basicNew
 - class Foo::Bar<Baz .. end, module Boo::Bar .. end
+- raise exception by `` error
+- a +1 to be a+1, not a(+1).
+- clarify evaluation order of operator argument (=~, .., ...)
+- :symbol => value hash in the form of {symbol: value, ...} ??
 * operator !! for rescue. ???
 * objectify characters
 * ../... outside condition invokes operator method too.
@@ -14,7 +18,6 @@ Language Spec.
 * def Class#method .. end ??
 * def Foo::Bar::baz() .. end ??
 * I18N (or M17N) script/string/regexp
-* Fixnum 0 as false ????
 * discourage use of symbol variables (e.g. $/, etc.) in manual
 * discourage use of Perlish features by giving warnings.
 * non confusing in-block local variable (is it possible?)
@@ -22,12 +25,9 @@ Language Spec.
   + variables appears within block may have independent values.
 * Regexp: make /o thread safe.
 * decide whether begin with rescue or ensure make do..while loop.
-* a +1 to be a+1, not a(+1).
 * unify == and eql? again
 * to_i returns nil if str contains no digit.
-* raise exception by `` error
 * jar like combined library package. -> RubyGems?
-* resumable Exception via Exception#resume.
 * method combination, e.g. before, after, around, etc.
 * .. or something like defadvice in Emacs.
 * property - for methods, or for objects in general.
@@ -35,8 +35,6 @@ Language Spec.
 * selector namespace - something like generic-flet in CLOS, to help RubyBehavior
 * private instance variable (as in Python?) @_foo in class Foo => @_Foo_foo
 * warn/error "bare word" method, like "foo",  you should type "foo()"
-* clarify evaluation order of operator argument (=~, .., ...)
-* :symbol => value hash in the form of {symbol: value, ...} ??
 
 Hacking Interpreter
 
@@ -83,7 +81,7 @@ Standard Libraries
 - use Mersenne Twister RNG for random.
 - deprecate Array#indexes, and Array#indices.
 - remove dependency on MAXPATHLEN.
-* String#scanf(?)
+- String#scanf(?)
 * Object#fmt(?)
 * Time::strptime
 * Integer[num], Float[num];  Fixnum[num]?
@@ -117,7 +115,7 @@ Extension Libraries
 
 Ruby Libraries
 
-* urllib.rb, nttplib.rb, etc.
+- urllib.rb, nttplib.rb, etc.
 * format like perl's
 
 Tools
diff --git a/array.c b/array.c
index fbca3c193e..60f3f5646b 100644
--- a/array.c
+++ b/array.c
@@ -3,28 +3,32 @@
   array.c -
 
   $Author$
-  $Date$
   created at: Fri Aug  6 09:46:12 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "util.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/util.h"
+#include "ruby/st.h"
+
+#ifndef ARRAY_DEBUG
+# define NDEBUG
+#endif
+#include <assert.h>
 
 VALUE rb_cArray;
+
 static ID id_cmp;
 
 #define ARY_DEFAULT_SIZE 16
+#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
 
 void
-rb_mem_clear(mem, size)
-    register VALUE *mem;
-    register long size;
+rb_mem_clear(register VALUE *mem, register long size)
 {
     while (size--) {
 	*mem++ = Qnil;
@@ -32,134 +36,311 @@ rb_mem_clear(mem, size)
 }
 
 static inline void
-memfill(mem, size, val)
-    register VALUE *mem;
-    register long size;
-    register VALUE val;
+memfill(register VALUE *mem, register long size, register VALUE val)
 {
     while (size--) {
 	*mem++ = val;
     }
 }
 
-#define ARY_TMPLOCK  FL_USER1
+# define ARY_SHARED_P(ary) \
+    (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
+     FL_TEST(ary,ELTS_SHARED)!=0)
+# define ARY_EMBED_P(ary) \
+    (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
+     FL_TEST(ary, RARRAY_EMBED_FLAG)!=0)
+
+#define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
+#define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
+#define ARY_EMBED_PTR(a) (assert(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
+#define ARY_EMBED_LEN(a) \
+    (assert(ARY_EMBED_P(a)), \
+     (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
+	 (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
+
+#define ARY_OWNS_HEAP_P(a) (!FL_TEST(a, ELTS_SHARED|RARRAY_EMBED_FLAG))
+#define FL_SET_EMBED(a) do { \
+    assert(!ARY_SHARED_P(a)); \
+    assert(!OBJ_FROZEN(a)); \
+    FL_SET(a, RARRAY_EMBED_FLAG); \
+} while (0)
+#define FL_UNSET_EMBED(ary) FL_UNSET(ary, RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
+#define FL_SET_SHARED(ary) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    FL_SET(ary, ELTS_SHARED); \
+} while (0)
+#define FL_UNSET_SHARED(ary) FL_UNSET(ary, ELTS_SHARED)
+
+#define ARY_SET_PTR(ary, p) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RARRAY(ary)->as.heap.ptr = (p); \
+} while (0)
+#define ARY_SET_EMBED_LEN(ary, n) do { \
+    long tmp_n = n; \
+    assert(ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
+    RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
+} while (0)
+#define ARY_SET_HEAP_LEN(ary, n) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    RARRAY(ary)->as.heap.len = n; \
+} while (0)
+#define ARY_SET_LEN(ary, n) do { \
+    if (ARY_EMBED_P(ary)) { \
+        ARY_SET_EMBED_LEN(ary, n); \
+    } \
+    else { \
+        ARY_SET_HEAP_LEN(ary, n); \
+    } \
+    assert(RARRAY_LEN(ary) == n); \
+} while (0)
+#define ARY_INCREASE_PTR(ary, n) do  { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RARRAY(ary)->as.heap.ptr += n; \
+} while (0)
+#define ARY_INCREASE_LEN(ary, n) do  { \
+    assert(!OBJ_FROZEN(ary)); \
+    if (ARY_EMBED_P(ary)) { \
+        ARY_SET_EMBED_LEN(ary, RARRAY_LEN(ary)+n); \
+    } \
+    else { \
+        RARRAY(ary)->as.heap.len += n; \
+    } \
+} while (0)
+
+#define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? RARRAY_EMBED_LEN_MAX : \
+		       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : RARRAY(ary)->as.heap.aux.capa)
+#define ARY_SET_CAPA(ary, n) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(!ARY_SHARED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RARRAY(ary)->as.heap.aux.capa = (n); \
+} while (0)
+
+#define ARY_SHARED(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared)
+#define ARY_SET_SHARED(ary, value) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(ARY_SHARED_P(ary)); \
+    assert(ARY_SHARED_ROOT_P(value)); \
+    RARRAY(ary)->as.heap.aux.shared = (value); \
+} while (0)
+#define RARRAY_SHARED_ROOT_FLAG FL_USER5
+#define ARY_SHARED_ROOT_P(ary) (FL_TEST(ary, RARRAY_SHARED_ROOT_FLAG))
+#define ARY_SHARED_NUM(ary) \
+    (assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)
+#define ARY_SET_SHARED_NUM(ary, value) do { \
+    assert(ARY_SHARED_ROOT_P(ary)); \
+    RARRAY(ary)->as.heap.aux.capa = (value); \
+} while (0)
+#define FL_SET_SHARED_ROOT(ary) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    FL_SET(ary, RARRAY_SHARED_ROOT_FLAG); \
+} while (0)
+
+static void
+ary_resize_capa(VALUE ary, long capacity)
+{
+    assert(RARRAY_LEN(ary) <= capacity);
+    assert(!OBJ_FROZEN(ary));
+    assert(!ARY_SHARED_P(ary));
+    if (capacity > RARRAY_EMBED_LEN_MAX) {
+        if (ARY_EMBED_P(ary)) {
+            long len = ARY_EMBED_LEN(ary);
+            VALUE *ptr = ALLOC_N(VALUE, (capacity));
+            MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len);
+            FL_UNSET_EMBED(ary);
+            ARY_SET_PTR(ary, ptr);
+            ARY_SET_HEAP_LEN(ary, len);
+        }
+        else {
+            REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, (capacity));
+        }
+        ARY_SET_CAPA(ary, (capacity));
+    }
+    else {
+        if (!ARY_EMBED_P(ary)) {
+            long len = RARRAY_LEN(ary);
+            VALUE *ptr = RARRAY_PTR(ary);
+            if (len > capacity) len = capacity;
+            MEMCPY(RARRAY(ary)->as.ary, ptr, VALUE, len);
+            FL_SET_EMBED(ary);
+            ARY_SET_LEN(ary, len);
+            xfree(ptr);
+        }
+    }
+}
+
+static void
+ary_double_capa(VALUE ary, long min)
+{
+    long new_capa = ARY_CAPA(ary) / 2;
+
+    if (new_capa < ARY_DEFAULT_SIZE) {
+	new_capa = ARY_DEFAULT_SIZE;
+    }
+    if (new_capa >= ARY_MAX_SIZE - min) {
+	new_capa = (ARY_MAX_SIZE - min) / 2;
+    }
+    new_capa += min;
+    ary_resize_capa(ary, new_capa);
+}
+
+static void
+rb_ary_decrement_share(VALUE shared)
+{
+    if (shared) {
+	long num = ARY_SHARED_NUM(shared) - 1;
+	if (num == 0) {
+	    rb_ary_free(shared);
+	    rb_gc_force_recycle(shared);
+	}
+	else if (num > 0) {
+	    ARY_SET_SHARED_NUM(shared, num);
+	}
+    }
+}
+
+static void
+rb_ary_unshare(VALUE ary)
+{
+    VALUE shared = RARRAY(ary)->as.heap.aux.shared;
+    rb_ary_decrement_share(shared);
+    FL_UNSET_SHARED(ary);
+}
 
 static inline void
-rb_ary_modify_check(ary)
-    VALUE ary;
+rb_ary_unshare_safe(VALUE ary)
+{
+    if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
+	rb_ary_unshare(ary);
+    }
+}
+
+static VALUE
+rb_ary_increment_share(VALUE shared)
+{
+    long num = ARY_SHARED_NUM(shared);
+    if (num >= 0) {
+	ARY_SET_SHARED_NUM(shared, num + 1);
+    }
+    return shared;
+}
+
+static void
+rb_ary_set_shared(VALUE ary, VALUE shared)
+{
+    rb_ary_increment_share(shared);
+    FL_SET_SHARED(ary);
+    ARY_SET_SHARED(ary, shared);
+}
+
+static inline void
+rb_ary_modify_check(VALUE ary)
 {
     if (OBJ_FROZEN(ary)) rb_error_frozen("array");
-    if (FL_TEST(ary, ARY_TMPLOCK))
-	rb_raise(rb_eRuntimeError, "can't modify array during iteration");
-    if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
+    if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
 }
 
 static void
-rb_ary_modify(ary)
-    VALUE ary;
+rb_ary_modify(VALUE ary)
 {
-    VALUE *ptr;
-
     rb_ary_modify_check(ary);
-    if (FL_TEST(ary, ELTS_SHARED)) {
-	ptr = ALLOC_N(VALUE, RARRAY(ary)->len);
-	FL_UNSET(ary, ELTS_SHARED);
-	RARRAY(ary)->aux.capa = RARRAY(ary)->len;
-	MEMCPY(ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
-	RARRAY(ary)->ptr = ptr;
+    if (ARY_SHARED_P(ary)) {
+        long len = RARRAY_LEN(ary);
+        if (len <= RARRAY_EMBED_LEN_MAX) {
+            VALUE *ptr = ARY_HEAP_PTR(ary);
+            VALUE shared = ARY_SHARED(ary);
+            FL_UNSET_SHARED(ary);
+            FL_SET_EMBED(ary);
+            MEMCPY(ARY_EMBED_PTR(ary), ptr, VALUE, len);
+            rb_ary_decrement_share(shared);
+            ARY_SET_EMBED_LEN(ary, len);
+        }
+        else {
+            VALUE *ptr = ALLOC_N(VALUE, len);
+            MEMCPY(ptr, RARRAY_PTR(ary), VALUE, len);
+            rb_ary_unshare(ary);
+            ARY_SET_CAPA(ary, len);
+            ARY_SET_PTR(ary, ptr);
+        }
     }
 }
 
 VALUE
-rb_ary_freeze(ary)
-    VALUE ary;
+rb_ary_freeze(VALUE ary)
 {
     return rb_obj_freeze(ary);
 }
 
 /*
  *  call-seq:
- *     array.frozen?  -> true or false
+ *     ary.frozen?  -> true or false
  *
  *  Return <code>true</code> if this array is frozen (or temporarily frozen
  *  while being sorted).
  */
 
 static VALUE
-rb_ary_frozen_p(ary)
-    VALUE ary;
+rb_ary_frozen_p(VALUE ary)
 {
     if (OBJ_FROZEN(ary)) return Qtrue;
-    if (FL_TEST(ary, ARY_TMPLOCK)) return Qtrue;
     return Qfalse;
 }
 
-static VALUE ary_alloc _((VALUE));
 static VALUE
-ary_alloc(klass)
-    VALUE klass;
+ary_alloc(VALUE klass)
 {
     NEWOBJ(ary, struct RArray);
     OBJSETUP(ary, klass, T_ARRAY);
-
-    ary->len = 0;
-    ary->ptr = 0;
-    ary->aux.capa = 0;
+    FL_SET_EMBED((VALUE)ary);
+    ARY_SET_EMBED_LEN((VALUE)ary, 0);
 
     return (VALUE)ary;
 }
 
 static VALUE
-ary_new(klass, len)
-    VALUE klass;
-    long len;
+ary_new(VALUE klass, long capa)
 {
-    VALUE ary = ary_alloc(klass);
+    VALUE ary;
 
-    if (len < 0) {
+    if (capa < 0) {
 	rb_raise(rb_eArgError, "negative array size (or size too big)");
     }
-    if (len > 0 && len * sizeof(VALUE) <= len) {
+    if (capa > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    if (len == 0) len++;
-    RARRAY(ary)->ptr = ALLOC_N(VALUE, len);
-    RARRAY(ary)->aux.capa = len;
+    ary = ary_alloc(klass);
+    if (capa > RARRAY_EMBED_LEN_MAX) {
+        FL_UNSET_EMBED(ary);
+        ARY_SET_PTR(ary, ALLOC_N(VALUE, capa));
+        ARY_SET_CAPA(ary, capa);
+        ARY_SET_HEAP_LEN(ary, 0);
+    }
 
     return ary;
 }
 
 VALUE
-rb_ary_new2(len)
-    long len;
+rb_ary_new2(long capa)
 {
-    return ary_new(rb_cArray, len);
+    return ary_new(rb_cArray, capa);
 }
 
 
 VALUE
-rb_ary_new()
+rb_ary_new(void)
 {
-    return rb_ary_new2(ARY_DEFAULT_SIZE);
+    return rb_ary_new2(RARRAY_EMBED_LEN_MAX);
 }
 
-#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
 
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_ary_new3(long n, ...)
-#else
-rb_ary_new3(n, va_alist)
-    long n;
-    va_dcl
-#endif
 {
     va_list ar;
     VALUE ary;
@@ -167,63 +348,153 @@ rb_ary_new3(n, va_alist)
 
     ary = rb_ary_new2(n);
 
-    va_init_list(ar, n);
+    va_start(ar, n);
     for (i=0; i<n; i++) {
-	RARRAY(ary)->ptr[i] = va_arg(ar, VALUE);
+	RARRAY_PTR(ary)[i] = va_arg(ar, VALUE);
     }
     va_end(ar);
 
-    RARRAY(ary)->len = n;
+    ARY_SET_LEN(ary, n);
     return ary;
 }
 
 VALUE
-rb_ary_new4(n, elts)
-    long n;
-    const VALUE *elts;
+rb_ary_new4(long n, const VALUE *elts)
 {
     VALUE ary;
 
     ary = rb_ary_new2(n);
     if (n > 0 && elts) {
-	MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
+	MEMCPY(RARRAY_PTR(ary), elts, VALUE, n);
+	ARY_SET_LEN(ary, n);
     }
 
-    /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
-    RARRAY(ary)->len = n;
-
     return ary;
 }
 
 VALUE
-rb_assoc_new(car, cdr)
-    VALUE car, cdr;
+rb_ary_tmp_new(long capa)
 {
-    VALUE ary;
+    return ary_new(0, capa);
+}
 
-    ary = rb_ary_new2(2);
-    RARRAY(ary)->ptr[0] = car;
-    RARRAY(ary)->ptr[1] = cdr;
-    RARRAY(ary)->len = 2;
+void
+rb_ary_free(VALUE ary)
+{
+    if (ARY_OWNS_HEAP_P(ary)) {
+	xfree(ARY_HEAP_PTR(ary));
+    }
+}
 
-    return ary;
+size_t
+rb_ary_memsize(VALUE ary)
+{
+    if (ARY_OWNS_HEAP_P(ary)) {
+	return RARRAY(ary)->as.heap.aux.capa * sizeof(VALUE);
+    }
+    else {
+	return 0;
+    }
+}
+
+static inline void
+ary_discard(VALUE ary)
+{
+    rb_ary_free(ary);
+    RBASIC(ary)->flags |= RARRAY_EMBED_FLAG;
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK;
 }
 
 static VALUE
-to_ary(ary)
-    VALUE ary;
+ary_make_shared(VALUE ary)
+{
+    assert(!ARY_EMBED_P(ary));
+    if (ARY_SHARED_P(ary)) {
+	return ARY_SHARED(ary);
+    }
+    else if (ARY_SHARED_ROOT_P(ary)) {
+	return ary;
+    }
+    else if (OBJ_FROZEN(ary)) {
+	ary_resize_capa(ary, ARY_HEAP_LEN(ary));
+	FL_SET_SHARED_ROOT(ary);
+	ARY_SET_SHARED_NUM(ary, 1);
+	return ary;
+    }
+    else {
+	NEWOBJ(shared, struct RArray);
+	OBJSETUP(shared, 0, T_ARRAY);
+        FL_UNSET_EMBED(shared);
+
+        ARY_SET_LEN((VALUE)shared, RARRAY_LEN(ary));
+        ARY_SET_PTR((VALUE)shared, RARRAY_PTR(ary));
+	FL_SET_SHARED_ROOT(shared);
+	ARY_SET_SHARED_NUM((VALUE)shared, 1);
+	FL_SET_SHARED(ary);
+	ARY_SET_SHARED(ary, (VALUE)shared);
+	OBJ_FREEZE(shared);
+	return (VALUE)shared;
+    }
+}
+
+
+static VALUE
+ary_make_substitution(VALUE ary)
+{
+    if (RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX) {
+        VALUE subst = rb_ary_new2(RARRAY_LEN(ary));
+        MEMCPY(ARY_EMBED_PTR(subst), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
+        ARY_SET_EMBED_LEN(subst, RARRAY_LEN(ary));
+        return subst;
+    }
+    else {
+        return rb_ary_increment_share(ary_make_shared(ary));
+    }
+}
+
+VALUE
+rb_assoc_new(VALUE car, VALUE cdr)
+{
+    return rb_ary_new3(2, car, cdr);
+}
+
+static VALUE
+to_ary(VALUE ary)
 {
     return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
 VALUE
-rb_check_array_type(ary)
-    VALUE ary;
+rb_check_array_type(VALUE ary)
 {
     return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
-static VALUE rb_ary_replace _((VALUE, VALUE));
+/*
+ *  call-seq:
+ *     Array.try_convert(obj) -> array or nil
+ *
+ *  Try to convert <i>obj</i> into an array, using +to_ary+ method.
+ *  Returns converted array or +nil+ if <i>obj</i> cannot be converted
+ *  for any reason. This method can be used to check if an argument is an
+ *  array.
+ *
+ *     Array.try_convert([1])   #=> [1]
+ *     Array.try_convert("1")   #=> nil
+ *
+ *     if tmp = Array.try_convert(arg)
+ *       # the argument is an array
+ *     elsif tmp = String.try_convert(arg)
+ *       # the argument is a string
+ *     end
+ *
+ */
+
+static VALUE
+rb_ary_s_try_convert(VALUE dummy, VALUE ary)
+{
+    return rb_check_array_type(ary);
+}
 
 /*
  *  call-seq:
@@ -244,43 +515,45 @@ static VALUE rb_ary_replace _((VALUE, VALUE));
  *     Array.new
  *     Array.new(2)
  *     Array.new(5, "A")
- * 
+ *
  *     # only one copy of the object is created
  *     a = Array.new(2, Hash.new)
  *     a[0]['cat'] = 'feline'
  *     a
  *     a[1]['cat'] = 'Felix'
  *     a
- * 
+ *
  *     # here multiple copies are created
  *     a = Array.new(2) { Hash.new }
  *     a[0]['cat'] = 'feline'
  *     a
- * 
+ *
  *     squares = Array.new(5) {|i| i*i}
  *     squares
- * 
+ *
  *     copy = Array.new(squares)
  */
 
 static VALUE
-rb_ary_initialize(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 {
     long len;
     VALUE size, val;
 
     rb_ary_modify(ary);
-    if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
-	RARRAY(ary)->len = 0;
+    if (argc == 0) {
+	if (ARY_OWNS_HEAP_P(ary) && RARRAY_PTR(ary)) {
+	    xfree(RARRAY_PTR(ary));
+	}
+        rb_ary_unshare_safe(ary);
+        FL_SET_EMBED(ary);
+	ARY_SET_EMBED_LEN(ary, 0);
 	if (rb_block_given_p()) {
 	    rb_warning("given block not used");
 	}
 	return ary;
     }
-
+    rb_scan_args(argc, argv, "02", &size, &val);
     if (argc == 1 && !FIXNUM_P(size)) {
 	val = rb_check_array_type(size);
 	if (!NIL_P(val)) {
@@ -293,13 +566,11 @@ rb_ary_initialize(argc, argv, ary)
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
-    if (len > 0 && len * (long)sizeof(VALUE) <= len) {
+    if (len > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    if (len > RARRAY(ary)->aux.capa) {
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
-	RARRAY(ary)->aux.capa = len;
-    }
+    rb_ary_modify(ary);
+    ary_resize_capa(ary, len);
     if (rb_block_given_p()) {
 	long i;
 
@@ -308,20 +579,19 @@ rb_ary_initialize(argc, argv, ary)
 	}
 	for (i=0; i<len; i++) {
 	    rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
-	    RARRAY(ary)->len = i + 1;
+	    ARY_SET_LEN(ary, i + 1);
 	}
     }
     else {
-	memfill(RARRAY(ary)->ptr, len, val);
-	RARRAY(ary)->len = len;
+	memfill(RARRAY_PTR(ary), len, val);
+	ARY_SET_LEN(ary, len);
     }
-
     return ary;
 }
 
 
-/* 
-* Returns a new array populated with the given objects. 
+/*
+* Returns a new array populated with the given objects.
 *
 *   Array.[]( 1, 'a', /^A/ )
 *   Array[ 1, 'a', /^A/ ]
@@ -329,65 +599,113 @@ rb_ary_initialize(argc, argv, ary)
 */
 
 static VALUE
-rb_ary_s_create(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE ary = ary_alloc(klass);
-
-    if (argc > 0) {
-	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
-	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+    VALUE ary = ary_new(klass, argc);
+    if (argc > 0 && argv) {
+        MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
+        ARY_SET_LEN(ary, argc);
     }
-    RARRAY(ary)->len = RARRAY(ary)->aux.capa = argc;
 
     return ary;
 }
 
 void
-rb_ary_store(ary, idx, val)
-    VALUE ary;
-    long idx;
-    VALUE val;
+rb_ary_store(VALUE ary, long idx, VALUE val)
 {
     if (idx < 0) {
-	idx += RARRAY(ary)->len;
+	idx += RARRAY_LEN(ary);
 	if (idx < 0) {
-	    rb_raise(rb_eIndexError, "index %ld out of array",
-		    idx - RARRAY(ary)->len);
+	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+		     idx - RARRAY_LEN(ary), -RARRAY_LEN(ary));
 	}
     }
+    else if (idx >= ARY_MAX_SIZE) {
+	rb_raise(rb_eIndexError, "index %ld too big", idx);
+    }
 
     rb_ary_modify(ary);
-    if (idx >= RARRAY(ary)->aux.capa) {
-	long new_capa = RARRAY(ary)->aux.capa / 2;
+    if (idx >= ARY_CAPA(ary)) {
+	ary_double_capa(ary, idx);
+    }
+    if (idx > RARRAY_LEN(ary)) {
+	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary),
+		     idx-RARRAY_LEN(ary) + 1);
+    }
 
-	if (new_capa < ARY_DEFAULT_SIZE) {
-	    new_capa = ARY_DEFAULT_SIZE;
-	}
-	new_capa += idx;
-	if (new_capa * (long)sizeof(VALUE) <= new_capa) {
-	    rb_raise(rb_eArgError, "index too big");
-	}
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, new_capa);
-	RARRAY(ary)->aux.capa = new_capa;
+    if (idx >= RARRAY_LEN(ary)) {
+	ARY_SET_LEN(ary, idx + 1);
     }
-    if (idx > RARRAY(ary)->len) {
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
-		     idx-RARRAY(ary)->len + 1);
+    RARRAY_PTR(ary)[idx] = val;
+}
+
+static VALUE
+ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
+{
+    assert(offset >= 0);
+    assert(len >= 0);
+    assert(offset+len <= RARRAY_LEN(ary));
+
+    if (len <= RARRAY_EMBED_LEN_MAX) {
+        VALUE result = ary_alloc(klass);
+        MEMCPY(ARY_EMBED_PTR(result), RARRAY_PTR(ary) + offset, VALUE, len);
+        ARY_SET_EMBED_LEN(result, len);
+        return result;
     }
+    else {
+        VALUE shared, result = ary_alloc(klass);
+        FL_UNSET_EMBED(result);
+
+        shared = ary_make_shared(ary);
+        ARY_SET_PTR(result, RARRAY_PTR(ary));
+        ARY_SET_LEN(result, RARRAY_LEN(ary));
+        rb_ary_set_shared(result, shared);
+
+        ARY_INCREASE_PTR(result, offset);
+        ARY_SET_LEN(result, len);
+        return result;
+    }
+}
+
+static VALUE
+ary_make_shared_copy(VALUE ary)
+{
+    return ary_make_partial(ary, rb_obj_class(ary), 0, RARRAY_LEN(ary));
+}
+
+enum ary_take_pos_flags
+{
+    ARY_TAKE_FIRST = 0,
+    ARY_TAKE_LAST = 1
+};
+
+static VALUE
+ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
+{
+    VALUE nv;
+    long n;
+    long offset = 0;
 
-    if (idx >= RARRAY(ary)->len) {
-	RARRAY(ary)->len = idx + 1;
+    rb_scan_args(argc, argv, "1", &nv);
+    n = NUM2LONG(nv);
+    if (n > RARRAY_LEN(ary)) {
+	n = RARRAY_LEN(ary);
+    }
+    else if (n < 0) {
+	rb_raise(rb_eArgError, "negative array size");
     }
-    RARRAY(ary)->ptr[idx] = val;
+    if (last) {
+	offset = RARRAY_LEN(ary) - n;
+    }
+    return ary_make_partial(ary, rb_cArray, offset, n);
 }
 
+static VALUE rb_ary_push_1(VALUE ary, VALUE item);
+
 /*
  *  call-seq:
- *     array << obj            -> array
- *  
+ *     ary << obj            -> ary
+ *
  *  Append---Pushes the given object on to the end of this array. This
  *  expression returns the array itself, so several appends
  *  may be chained together.
@@ -398,248 +716,262 @@ rb_ary_store(ary, idx, val)
  */
 
 VALUE
-rb_ary_push(ary, item)
-    VALUE ary;
-    VALUE item;
+rb_ary_push(VALUE ary, VALUE item)
+{
+    rb_ary_modify(ary);
+    return rb_ary_push_1(ary, item);
+}
+
+static VALUE
+rb_ary_push_1(VALUE ary, VALUE item)
 {
-    rb_ary_store(ary, RARRAY(ary)->len, item);
+    long idx = RARRAY_LEN(ary);
+
+    if (idx >= ARY_CAPA(ary)) {
+	ary_double_capa(ary, idx);
+    }
+    RARRAY_PTR(ary)[idx] = item;
+    ARY_SET_LEN(ary, idx + 1);
     return ary;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.push(obj, ... )   -> array
- *  
+ *     ary.push(obj, ... )   -> ary
+ *
  *  Append---Pushes the given object(s) on to the end of this array. This
  *  expression returns the array itself, so several appends
  *  may be chained together.
  *
  *     a = [ "a", "b", "c" ]
- *     a.push("d", "e", "f")  
+ *     a.push("d", "e", "f")
  *             #=> ["a", "b", "c", "d", "e", "f"]
  */
 
 static VALUE
-rb_ary_push_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
 {
+    rb_ary_modify(ary);
     while (argc--) {
-	rb_ary_push(ary, *argv++);
+	rb_ary_push_1(ary, *argv++);
     }
     return ary;
 }
 
+VALUE
+rb_ary_pop(VALUE ary)
+{
+    long n;
+    rb_ary_modify_check(ary);
+    if (RARRAY_LEN(ary) == 0) return Qnil;
+    if (ARY_OWNS_HEAP_P(ary) &&
+	RARRAY_LEN(ary) * 3 < ARY_CAPA(ary) &&
+	ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
+    {
+	ary_resize_capa(ary, RARRAY_LEN(ary) * 2);
+    }
+    n = RARRAY_LEN(ary)-1;
+    ARY_SET_LEN(ary, n);
+    return RARRAY_PTR(ary)[n];
+}
+
 /*
  *  call-seq:
- *     array.pop  -> obj or nil
- *  
- *  Removes the last element from <i>self</i> and returns it, or
+ *     ary.pop    -> obj or nil
+ *     ary.pop(n) -> new_ary
+ *
+ *  Removes the last element from +self+ and returns it, or
  *  <code>nil</code> if the array is empty.
- *     
- *     a = [ "a", "m", "z" ]
- *     a.pop   #=> "z"
- *     a       #=> ["a", "m"]
+ *
+ *  If a number _n_ is given, returns an array of the last n elements
+ *  (or less) just like <code>array.slice!(-n, n)</code> does.
+ *
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.pop     #=> "d"
+ *     a.pop(2)  #=> ["b", "c"]
+ *     a         #=> ["a"]
  */
 
-VALUE
-rb_ary_pop(ary)
-    VALUE ary;
+static VALUE
+rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
 {
-    rb_ary_modify_check(ary);
-    if (RARRAY(ary)->len == 0) return Qnil;
-    if (!FL_TEST(ary, ELTS_SHARED) &&
-	    RARRAY(ary)->len * 2 < RARRAY(ary)->aux.capa &&
-	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
-	RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+    VALUE result;
+
+    if (argc == 0) {
+	return rb_ary_pop(ary);
     }
-    return RARRAY(ary)->ptr[--RARRAY(ary)->len];
+
+    rb_ary_modify_check(ary);
+    result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
+    ARY_INCREASE_LEN(ary, -RARRAY_LEN(result));
+    return result;
 }
 
-static VALUE
-ary_make_shared(ary)
-    VALUE ary;
+VALUE
+rb_ary_shift(VALUE ary)
 {
-    if (!FL_TEST(ary, ELTS_SHARED)) {
-	NEWOBJ(shared, struct RArray);
-	OBJSETUP(shared, rb_cArray, T_ARRAY);
+    VALUE top;
 
-	shared->len = RARRAY(ary)->len;
-	shared->ptr = RARRAY(ary)->ptr;
-	shared->aux.capa = RARRAY(ary)->aux.capa;
-	RARRAY(ary)->aux.shared = (VALUE)shared;
-	FL_SET(ary, ELTS_SHARED);
-	OBJ_FREEZE(shared);
-	return (VALUE)shared;
+    rb_ary_modify_check(ary);
+    if (RARRAY_LEN(ary) == 0) return Qnil;
+    top = RARRAY_PTR(ary)[0];
+    if (!ARY_SHARED_P(ary)) {
+	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
+	    MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
+            ARY_INCREASE_LEN(ary, -1);
+	    return top;
+	}
+        assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */
+
+	RARRAY_PTR(ary)[0] = Qnil;
+	ary_make_shared(ary);
     }
-    else {
-	return RARRAY(ary)->aux.shared;
+    else if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
+	RARRAY_PTR(ary)[0] = Qnil;
     }
+    ARY_INCREASE_PTR(ary, 1);		/* shift ptr */
+    ARY_INCREASE_LEN(ary, -1);
+
+    return top;
 }
 
 /*
  *  call-seq:
- *     array.shift   ->   obj or nil
- *  
- *  Returns the first element of <i>self</i> and removes it (shifting all
+ *     ary.shift    -> obj or nil
+ *     ary.shift(n) -> new_ary
+ *
+ *  Returns the first element of +self+ and removes it (shifting all
  *  other elements down by one). Returns <code>nil</code> if the array
  *  is empty.
- *     
+ *
+ *  If a number _n_ is given, returns an array of the first n elements
+ *  (or less) just like <code>array.slice!(0, n)</code> does.
+ *
  *     args = [ "-m", "-q", "filename" ]
- *     args.shift   #=> "-m"
- *     args         #=> ["-q", "filename"]
+ *     args.shift     #=> "-m"
+ *     args           #=> ["-q", "filename"]
+ *
+ *     args = [ "-m", "-q", "filename" ]
+ *     args.shift(2)  #=> ["-m", "-q"]
+ *     args           #=> ["filename"]
  */
 
-VALUE
-rb_ary_shift(ary)
-    VALUE ary;
+static VALUE
+rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE top;
+    VALUE result;
+    long n;
 
-    rb_ary_modify_check(ary);
-    if (RARRAY(ary)->len == 0) return Qnil;
-    top = RARRAY(ary)->ptr[0];
-    if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE && !FL_TEST(ary, ELTS_SHARED)) {
-	MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
-    }
-    else {
-	if (!FL_TEST(ary, ELTS_SHARED)) {
-	    RARRAY(ary)->ptr[0] = Qnil;
-	}
-	ary_make_shared(ary);
-	RARRAY(ary)->ptr++;		/* shift ptr */
+    if (argc == 0) {
+	return rb_ary_shift(ary);
     }
-    RARRAY(ary)->len--;
-
-    return top;
-}
 
-VALUE
-rb_ary_unshift(ary, item)
-    VALUE ary, item;
-{
-    rb_ary_modify(ary);
-    if (RARRAY(ary)->len == RARRAY(ary)->aux.capa) {
-	long capa_inc = RARRAY(ary)->aux.capa / 2;
-	if (capa_inc < ARY_DEFAULT_SIZE) {
-	    capa_inc = ARY_DEFAULT_SIZE;
+    rb_ary_modify_check(ary);
+    result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
+    n = RARRAY_LEN(result);
+    if (ARY_SHARED_P(ary)) {
+	if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
+	    rb_mem_clear(RARRAY_PTR(ary), n);
 	}
-	RARRAY(ary)->aux.capa += capa_inc;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+        ARY_INCREASE_PTR(ary, n);
     }
+    else {
+	MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n);
+    }
+    ARY_INCREASE_LEN(ary, -n);
 
-    /* sliding items */
-    MEMMOVE(RARRAY(ary)->ptr + 1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
-
-    RARRAY(ary)->len++;
-    RARRAY(ary)->ptr[0] = item;
-
-    return ary;
+    return result;
 }
 
 /*
  *  call-seq:
- *     array.unshift(obj, ...)  -> array
- *  
- *  Prepends objects to the front of <i>array</i>.
- *  other elements up one.
- *     
+ *     ary.unshift(obj, ...)  -> ary
+ *
+ *  Prepends objects to the front of +self+,
+ *  moving other elements upwards.
+ *
  *     a = [ "b", "c", "d" ]
  *     a.unshift("a")   #=> ["a", "b", "c", "d"]
  *     a.unshift(1, 2)  #=> [ 1, 2, "a", "b", "c", "d"]
  */
 
 static VALUE
-rb_ary_unshift_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
 {
-    long len = RARRAY(ary)->len;
+    long len;
 
+    rb_ary_modify(ary);
     if (argc == 0) return ary;
-
-    /* make rooms by setting the last item */
-    rb_ary_store(ary, len + argc - 1, Qnil);
+    if (ARY_CAPA(ary) <= (len = RARRAY_LEN(ary)) + argc) {
+	ary_double_capa(ary, len + argc);
+    }
 
     /* sliding items */
-    MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
-    MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
-    
+    MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len);
+    MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
+    ARY_INCREASE_LEN(ary, argc);
+
     return ary;
 }
 
+VALUE
+rb_ary_unshift(VALUE ary, VALUE item)
+{
+    return rb_ary_unshift_m(1,&item,ary);
+}
+
 /* faster version - use this if you don't need to treat negative offset */
 static inline VALUE
-rb_ary_elt(ary, offset)
-    VALUE ary;
-    long offset;
+rb_ary_elt(VALUE ary, long offset)
 {
-    if (RARRAY(ary)->len == 0) return Qnil;
-    if (offset < 0 || RARRAY(ary)->len <= offset) {
+    if (RARRAY_LEN(ary) == 0) return Qnil;
+    if (offset < 0 || RARRAY_LEN(ary) <= offset) {
 	return Qnil;
     }
-    return RARRAY(ary)->ptr[offset];
+    return RARRAY_PTR(ary)[offset];
 }
 
 VALUE
-rb_ary_entry(ary, offset)
-    VALUE ary;
-    long offset;
+rb_ary_entry(VALUE ary, long offset)
 {
     if (offset < 0) {
-	offset += RARRAY(ary)->len;
+	offset += RARRAY_LEN(ary);
     }
     return rb_ary_elt(ary, offset);
 }
 
-static VALUE
-rb_ary_subseq(ary, beg, len)
-    VALUE ary;
-    long beg, len;
+VALUE
+rb_ary_subseq(VALUE ary, long beg, long len)
 {
-    VALUE klass, ary2, shared;
-    VALUE *ptr;
+    VALUE klass;
 
-    if (beg > RARRAY(ary)->len) return Qnil;
+    if (beg > RARRAY_LEN(ary)) return Qnil;
     if (beg < 0 || len < 0) return Qnil;
 
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
-	len = RARRAY(ary)->len - beg;
-	if (len < 0)
-	    len = 0;
+    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
+	len = RARRAY_LEN(ary) - beg;
     }
     klass = rb_obj_class(ary);
     if (len == 0) return ary_new(klass, 0);
 
-    shared = ary_make_shared(ary);
-    ptr = RARRAY(ary)->ptr;
-    ary2 = ary_alloc(klass);
-    RARRAY(ary2)->ptr = ptr + beg;
-    RARRAY(ary2)->len = len;
-    RARRAY(ary2)->aux.shared = shared;
-    FL_SET(ary2, ELTS_SHARED);
-
-    return ary2;
+    return ary_make_partial(ary, klass, beg, len);
 }
 
-/* 
+/*
  *  call-seq:
- *     array[index]                -> obj      or nil
- *     array[start, length]        -> an_array or nil
- *     array[range]                -> an_array or nil
- *     array.slice(index)          -> obj      or nil
- *     array.slice(start, length)  -> an_array or nil
- *     array.slice(range)          -> an_array or nil
+ *     ary[index]                -> obj     or nil
+ *     ary[start, length]        -> new_ary or nil
+ *     ary[range]                -> new_ary or nil
+ *     ary.slice(index)          -> obj     or nil
+ *     ary.slice(start, length)  -> new_ary or nil
+ *     ary.slice(range)          -> new_ary or nil
  *
  *  Element Reference---Returns the element at _index_,
  *  or returns a subarray starting at _start_ and
  *  continuing for _length_ elements, or returns a subarray
  *  specified by _range_.
  *  Negative indices count backward from the end of the
- *  array (-1 is the last element). Returns nil if the index
+ *  array (-1 is the last element). Returns +nil+ if the index
  *  (or starting index) are out of range.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
@@ -658,22 +990,16 @@ rb_ary_subseq(ary, beg, len)
  */
 
 VALUE
-rb_ary_aref(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_aref(int argc, VALUE *argv, VALUE ary)
 {
     VALUE arg;
     long beg, len;
 
     if (argc == 2) {
-	if (SYMBOL_P(argv[0])) {
-	    rb_raise(rb_eTypeError, "Symbol as array index");
-	}
 	beg = NUM2LONG(argv[0]);
 	len = NUM2LONG(argv[1]);
 	if (beg < 0) {
-	    beg += RARRAY(ary)->len;
+	    beg += RARRAY_LEN(ary);
 	}
 	return rb_ary_subseq(ary, beg, len);
     }
@@ -685,11 +1011,8 @@ rb_ary_aref(argc, argv, ary)
     if (FIXNUM_P(arg)) {
 	return rb_ary_entry(ary, FIX2LONG(arg));
     }
-    if (SYMBOL_P(arg)) {
-	rb_raise(rb_eTypeError, "Symbol as array index");
-    }
     /* check if idx is Range */
-    switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) {
+    switch (rb_range_beg_len(arg, &beg, &len, RARRAY_LEN(ary), 0)) {
       case Qfalse:
 	break;
       case Qnil:
@@ -700,15 +1023,13 @@ rb_ary_aref(argc, argv, ary)
     return rb_ary_entry(ary, NUM2LONG(arg));
 }
 
-/* 
+/*
  *  call-seq:
- *     array.at(index)   ->   obj  or nil
+ *     ary.at(index)   ->   obj  or nil
  *
  *  Returns the element at _index_. A
- *  negative index counts from the end of _self_.  Returns +nil+
+ *  negative index counts from the end of +self+.  Returns +nil+
  *  if the index is out of range. See also <code>Array#[]</code>.
- *  (<code>Array#at</code> is slightly faster than <code>Array#[]</code>,
- *  as it does not accept ranges and so on.)
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.at(0)     #=> "a"
@@ -716,101 +1037,75 @@ rb_ary_aref(argc, argv, ary)
  */
 
 static VALUE
-rb_ary_at(ary, pos)
-    VALUE ary, pos;
+rb_ary_at(VALUE ary, VALUE pos)
 {
     return rb_ary_entry(ary, NUM2LONG(pos));
 }
 
 /*
  *  call-seq:
- *     array.first   ->   obj or nil
- *     array.first(n) -> an_array
+ *     ary.first     ->   obj or nil
+ *     ary.first(n)  ->   new_ary
  *
  *  Returns the first element, or the first +n+ elements, of the array.
  *  If the array is empty, the first form returns <code>nil</code>, and the
  *  second form returns an empty array.
  *
  *     a = [ "q", "r", "s", "t" ]
- *     a.first    #=> "q"
- *     a.first(1) #=> ["q"]
- *     a.first(3) #=> ["q", "r", "s"]
+ *     a.first     #=> "q"
+ *     a.first(2)  #=> ["q", "r"]
  */
 
 static VALUE
-rb_ary_first(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_first(int argc, VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	if (RARRAY(ary)->len == 0) return Qnil;
-	return RARRAY(ary)->ptr[0];
+	if (RARRAY_LEN(ary) == 0) return Qnil;
+	return RARRAY_PTR(ary)[0];
     }
     else {
-	VALUE nv, result;
-	long n, i;
-
-	rb_scan_args(argc, argv, "01", &nv);
-	n = NUM2LONG(nv);
-	if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
-	result = rb_ary_new2(n);
-	for (i=0; i<n; i++) {
-	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
-	}
-	return result;
+	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
     }
 }
 
 /*
  *  call-seq:
- *     array.last     ->  obj or nil
- *     array.last(n)  ->  an_array
- *  
- *  Returns the last element(s) of <i>self</i>. If the array is empty,
+ *     ary.last     ->  obj or nil
+ *     ary.last(n)  ->  new_ary
+ *
+ *  Returns the last element(s) of +self+. If the array is empty,
  *  the first form returns <code>nil</code>.
- *     
- *     [ "w", "x", "y", "z" ].last   #=> "z"
+ *
+ *     a = [ "w", "x", "y", "z" ]
+ *     a.last     #=> "z"
+ *     a.last(2)  #=> ["y", "z"]
  */
 
-static VALUE
-rb_ary_last(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+VALUE
+rb_ary_last(int argc, VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	if (RARRAY(ary)->len == 0) return Qnil;
-	return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
+	if (RARRAY_LEN(ary) == 0) return Qnil;
+	return RARRAY_PTR(ary)[RARRAY_LEN(ary)-1];
     }
     else {
-	VALUE nv, result;
-	long n, i;
-
-	rb_scan_args(argc, argv, "01", &nv);
-	n = NUM2LONG(nv);
-	if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
-	result = rb_ary_new2(n);
-	for (i=RARRAY(ary)->len-n; n--; i++) {
-	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
-	}
-	return result;
+	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
     }
 }
 
 /*
  *  call-seq:
- *     array.fetch(index)                    -> obj
- *     array.fetch(index, default )          -> obj
- *     array.fetch(index) {|index| block }   -> obj
- *  
+ *     ary.fetch(index)                    -> obj
+ *     ary.fetch(index, default )          -> obj
+ *     ary.fetch(index) {|index| block }   -> obj
+ *
  *  Tries to return the element at position <i>index</i>. If the index
  *  lies outside the array, the first form throws an
  *  <code>IndexError</code> exception, the second form returns
  *  <i>default</i>, and the third form returns the value of invoking
  *  the block, passing in the index. Negative values of <i>index</i>
  *  count from the end of the array.
- *     
+ *
  *     a = [ 11, 22, 33, 44 ]
  *     a.fetch(1)               #=> 22
  *     a.fetch(-1)              #=> 44
@@ -819,10 +1114,7 @@ rb_ary_last(argc, argv, ary)
  */
 
 static VALUE
-rb_ary_fetch(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
 {
     VALUE pos, ifnone;
     long block_given;
@@ -836,40 +1128,61 @@ rb_ary_fetch(argc, argv, ary)
     idx = NUM2LONG(pos);
 
     if (idx < 0) {
-	idx +=  RARRAY(ary)->len;
+	idx +=  RARRAY_LEN(ary);
     }
-    if (idx < 0 || RARRAY(ary)->len <= idx) {
+    if (idx < 0 || RARRAY_LEN(ary) <= idx) {
 	if (block_given) return rb_yield(pos);
 	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "index %ld out of array", idx);
+	    rb_raise(rb_eIndexError, "index %ld outside of array bounds: %ld...%ld",
+			idx - (idx < 0 ? RARRAY_LEN(ary) : 0), -RARRAY_LEN(ary), RARRAY_LEN(ary));
 	}
 	return ifnone;
     }
-    return RARRAY(ary)->ptr[idx];
+    return RARRAY_PTR(ary)[idx];
 }
 
 /*
  *  call-seq:
- *     array.index(obj)   ->  int or nil
- *  
- *  Returns the index of the first object in <i>self</i> such that is 
- *  <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
- *  no match is found.
- *     
+ *     ary.index(obj)           ->  int or nil
+ *     ary.index {|item| block} ->  int or nil
+ *     ary.index                ->  an_enumerator
+ *
+ *  Returns the index of the first object in +self+ such that is
+ *  <code>==</code> to <i>obj</i>. If a block is given instead of an
+ *  argument, returns first object for which <em>block</em> is true.
+ *  Returns <code>nil</code> if no match is found.
+ *  See also <code>Array#rindex</code>.
+ *
+ *  If neither block nor argument is given, an enumerator is returned instead.
+ *
  *     a = [ "a", "b", "c" ]
- *     a.index("b")   #=> 1
- *     a.index("z")   #=> nil
+ *     a.index("b")        #=> 1
+ *     a.index("z")        #=> nil
+ *     a.index{|x|x=="b"}  #=> 1
+ *
+ *  This is an alias of <code>#find_index</code>.
  */
 
 static VALUE
-rb_ary_index(ary, val)
-    VALUE ary;
-    VALUE val;
+rb_ary_index(int argc, VALUE *argv, VALUE ary)
 {
+    VALUE val;
     long i;
 
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	if (rb_equal(RARRAY(ary)->ptr[i], val))
+    if (argc == 0) {
+	RETURN_ENUMERATOR(ary, 0, 0);
+	for (i=0; i<RARRAY_LEN(ary); i++) {
+	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+		return LONG2NUM(i);
+	    }
+	}
+	return Qnil;
+    }
+    rb_scan_args(argc, argv, "1", &val);
+    if (rb_block_given_p())
+	rb_warn("given block not used");
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	if (rb_equal(RARRAY_PTR(ary)[i], val))
 	    return LONG2NUM(i);
     }
     return Qnil;
@@ -877,144 +1190,127 @@ rb_ary_index(ary, val)
 
 /*
  *  call-seq:
- *     array.rindex(obj)    ->  int or nil
- *  
- *  Returns the index of the last object in <i>array</i> 
- *  <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
- *  no match is found.
- *     
+ *     ary.rindex(obj)           ->  int or nil
+ *     ary.rindex {|item| block} ->  int or nil
+ *     ary.rindex                ->  an_enumerator
+ *
+ *  Returns the index of the last object in +self+
+ *  <code>==</code> to <i>obj</i>. If a block is given instead of an
+ *  argument, returns first object for which <em>block</em> is
+ *  true, starting from the last object.
+ *  Returns <code>nil</code> if no match is found.
+ *  See also <code>Array#index</code>.
+ *
+ *  If neither block nor argument is given, an enumerator is returned instead.
+ *
  *     a = [ "a", "b", "b", "b", "c" ]
- *     a.rindex("b")   #=> 3
- *     a.rindex("z")   #=> nil
+ *     a.rindex("b")        #=> 3
+ *     a.rindex("z")        #=> nil
+ *     a.rindex{|x|x=="b"}  #=> 3
  */
 
 static VALUE
-rb_ary_rindex(ary, val)
-    VALUE ary;
-    VALUE val;
+rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
 {
-    long i = RARRAY(ary)->len;
+    VALUE val;
+    long i = RARRAY_LEN(ary);
 
-    while (i--) {
-	if (i > RARRAY(ary)->len) {
-	    i = RARRAY(ary)->len;
-	    continue;
+    if (argc == 0) {
+	RETURN_ENUMERATOR(ary, 0, 0);
+	while (i--) {
+	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i])))
+		return LONG2NUM(i);
+	    if (i > RARRAY_LEN(ary)) {
+		i = RARRAY_LEN(ary);
+	    }
 	}
-	if (rb_equal(RARRAY(ary)->ptr[i], val))
+	return Qnil;
+    }
+    rb_scan_args(argc, argv, "1", &val);
+    if (rb_block_given_p())
+	rb_warn("given block not used");
+    while (i--) {
+	if (rb_equal(RARRAY_PTR(ary)[i], val))
 	    return LONG2NUM(i);
+	if (i > RARRAY_LEN(ary)) {
+	    i = RARRAY_LEN(ary);
+	}
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     array.indexes( i1, i2, ... iN )   -> an_array
- *     array.indices( i1, i2, ... iN )   -> an_array
- *  
- *  Deprecated; use <code>Array#values_at</code>.
- */
-
-static VALUE
-rb_ary_indexes(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    VALUE new_ary;
-    long i;
-
-    rb_warn("Array#%s is deprecated; use Array#values_at", rb_id2name(rb_frame_last_func()));
-    new_ary = rb_ary_new2(argc);
-    for (i=0; i<argc; i++) {
-	rb_ary_push(new_ary, rb_ary_aref(1, argv+i, ary));
-    }
-
-    return new_ary;
-}
-
 VALUE
-rb_ary_to_ary(obj)
-    VALUE obj;
+rb_ary_to_ary(VALUE obj)
 {
-    if (TYPE(obj) == T_ARRAY) {
-	return obj;
-    }
-    if (rb_respond_to(obj, rb_intern("to_ary"))) {
-	return rb_convert_type(obj, T_ARRAY, "Array", "to_ary");
-    }
+    VALUE tmp = rb_check_array_type(obj);
+
+    if (!NIL_P(tmp)) return tmp;
     return rb_ary_new3(1, obj);
 }
 
 static void
-rb_ary_splice(ary, beg, len, rpl)
-    VALUE ary;
-    long beg, len;
-    VALUE rpl;
+rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 {
     long rlen;
 
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
     if (beg < 0) {
-	beg += RARRAY(ary)->len;
+	beg += RARRAY_LEN(ary);
 	if (beg < 0) {
-	    beg -= RARRAY(ary)->len;
-	    rb_raise(rb_eIndexError, "index %ld out of array", beg);
+	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+		     beg - RARRAY_LEN(ary), -RARRAY_LEN(ary));
 	}
     }
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
-	len = RARRAY(ary)->len - beg;
+    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
+	len = RARRAY_LEN(ary) - beg;
     }
 
-    if (NIL_P(rpl)) {
+    if (rpl == Qundef) {
 	rlen = 0;
     }
     else {
 	rpl = rb_ary_to_ary(rpl);
-	rlen = RARRAY(rpl)->len;
+	rlen = RARRAY_LEN(rpl);
     }
     rb_ary_modify(ary);
-
-    if (beg >= RARRAY(ary)->len) {
+    if (beg >= RARRAY_LEN(ary)) {
+	if (beg > ARY_MAX_SIZE - rlen) {
+	    rb_raise(rb_eIndexError, "index %ld too big", beg);
+	}
 	len = beg + rlen;
-	if (len >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
-	    RARRAY(ary)->aux.capa = len;
+	if (len >= ARY_CAPA(ary)) {
+	    ary_double_capa(ary, len);
 	}
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, beg - RARRAY(ary)->len);
+	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
 	if (rlen > 0) {
-	    MEMCPY(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+	    MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
 	}
-	RARRAY(ary)->len = len;
+	ARY_SET_LEN(ary, len);
     }
     else {
 	long alen;
 
-	if (beg + len > RARRAY(ary)->len) {
-	    len = RARRAY(ary)->len - beg;
-	}
-
-	alen = RARRAY(ary)->len + rlen - len;
-	if (alen >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, alen);
-	    RARRAY(ary)->aux.capa = alen;
+	alen = RARRAY_LEN(ary) + rlen - len;
+	if (alen >= ARY_CAPA(ary)) {
+	    ary_double_capa(ary, alen);
 	}
 
 	if (len != rlen) {
-	    MEMMOVE(RARRAY(ary)->ptr + beg + rlen, RARRAY(ary)->ptr + beg + len,
-		    VALUE, RARRAY(ary)->len - (beg + len));
-	    RARRAY(ary)->len = alen;
+	    MEMMOVE(RARRAY_PTR(ary) + beg + rlen, RARRAY_PTR(ary) + beg + len,
+		    VALUE, RARRAY_LEN(ary) - (beg + len));
+	    ARY_SET_LEN(ary, alen);
 	}
 	if (rlen > 0) {
-	    MEMMOVE(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
 	}
     }
 }
 
-/* 
+/*
  *  call-seq:
- *     array[index]         = obj                     ->  obj
- *     array[start, length] = obj or an_array or nil  ->  obj or an_array or nil
- *     array[range]         = obj or an_array or nil  ->  obj or an_array or nil
+ *     ary[index]         = obj                      ->  obj
+ *     ary[start, length] = obj or other_ary or nil  ->  obj or other_ary or nil
+ *     ary[range]         = obj or other_ary or nil  ->  obj or other_ary or nil
  *
  *  Element Assignment---Sets the element at _index_,
  *  or replaces a subarray starting at _start_ and
@@ -1023,11 +1319,10 @@ rb_ary_splice(ary, beg, len, rpl)
  *  the current capacity of the array, the array grows
  *  automatically. A negative indices will count backward
  *  from the end of the array. Inserts elements if _length_ is
- *  zero. If +nil+ is used in the second and third form,
- *  deletes elements from _self_. An +IndexError+ is raised if a
- *  negative index points past the beginning of the array. See also
+ *  zero. An +IndexError+ is raised if a negative index points
+ *  past the beginning of the array. See also
  *  <code>Array#push</code>, and <code>Array#unshift</code>.
- * 
+ *
  *     a = Array.new
  *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
  *     a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
@@ -1035,38 +1330,31 @@ rb_ary_splice(ary, beg, len, rpl)
  *     a[0, 2] = "?"               #=> ["?", 2, nil, "4"]
  *     a[0..2] = "A"               #=> ["A", "4"]
  *     a[-1]   = "Z"               #=> ["A", "Z"]
- *     a[1..-1] = nil              #=> ["A"]
+ *     a[1..-1] = nil              #=> ["A", nil]
+ *     a[1..-1] = []               #=> ["A"]
  */
 
 static VALUE
-rb_ary_aset(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 {
     long offset, beg, len;
 
     if (argc == 3) {
-	if (SYMBOL_P(argv[0])) {
-	    rb_raise(rb_eTypeError, "Symbol as array index");
-	}
-	if (SYMBOL_P(argv[1])) {
-	    rb_raise(rb_eTypeError, "Symbol as subarray length");
-	}
-	rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
+	rb_ary_modify_check(ary);
+	beg = NUM2LONG(argv[0]);
+	len = NUM2LONG(argv[1]);
+	rb_ary_splice(ary, beg, len, argv[2]);
 	return argv[2];
     }
     if (argc != 2) {
 	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
     }
+    rb_ary_modify_check(ary);
     if (FIXNUM_P(argv[0])) {
 	offset = FIX2LONG(argv[0]);
 	goto fixnum;
     }
-    if (SYMBOL_P(argv[0])) {
-	rb_raise(rb_eTypeError, "Symbol as array index");
-    }
-    if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
+    if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
 	/* check if idx is Range */
 	rb_ary_splice(ary, beg, len, argv[1]);
 	return argv[1];
@@ -1080,31 +1368,29 @@ fixnum:
 
 /*
  *  call-seq:
- *     array.insert(index, obj...)  -> array
- *  
+ *     ary.insert(index, obj...)  -> ary
+ *
  *  Inserts the given values before the element with the given index
  *  (which may be negative).
- *     
+ *
  *     a = %w{ a b c d }
  *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
  *     a.insert(-2, 1, 2, 3)   #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
  */
 
 static VALUE
-rb_ary_insert(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_insert(int argc, VALUE *argv, VALUE ary)
 {
     long pos;
 
-    if (argc == 1) return ary;
     if (argc < 1) {
 	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
     }
+    rb_ary_modify_check(ary);
+    if (argc == 1) return ary;
     pos = NUM2LONG(argv[0]);
     if (pos == -1) {
-	pos = RARRAY(ary)->len;
+	pos = RARRAY_LEN(ary);
     }
     if (pos < 0) {
 	pos++;
@@ -1115,53 +1401,60 @@ rb_ary_insert(argc, argv, ary)
 
 /*
  *  call-seq:
- *     array.each {|item| block }   ->   array
- *  
- *  Calls <i>block</i> once for each element in <i>self</i>, passing that
+ *     ary.each {|item| block }   -> ary
+ *     ary.each                   -> an_enumerator
+ *
+ *  Calls <i>block</i> once for each element in +self+, passing that
  *  element as a parameter.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.each {|x| print x, " -- " }
- *     
+ *
  *  produces:
- *     
+ *
  *     a -- b -- c --
  */
 
 VALUE
-rb_ary_each(ary)
-    VALUE ary;
+rb_ary_each(VALUE ary)
 {
     long i;
 
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	rb_yield(RARRAY(ary)->ptr[i]);
+    RETURN_ENUMERATOR(ary, 0, 0);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	rb_yield(RARRAY_PTR(ary)[i]);
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.each_index {|index| block }  ->  array
- *  
+ *     ary.each_index {|index| block }  -> ary
+ *     ary.each_index                   -> an_enumerator
+ *
  *  Same as <code>Array#each</code>, but passes the index of the element
  *  instead of the element itself.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *
  *     a = [ "a", "b", "c" ]
  *     a.each_index {|x| print x, " -- " }
- *     
+ *
  *  produces:
- *     
+ *
  *     0 -- 1 -- 2 --
  */
 
 static VALUE
-rb_ary_each_index(ary)
-    VALUE ary;
+rb_ary_each_index(VALUE ary)
 {
     long i;
+    RETURN_ENUMERATOR(ary, 0, 0);
 
-    for (i=0; i<RARRAY(ary)->len; i++) {
+    for (i=0; i<RARRAY_LEN(ary); i++) {
 	rb_yield(LONG2NUM(i));
     }
     return ary;
@@ -1169,29 +1462,31 @@ rb_ary_each_index(ary)
 
 /*
  *  call-seq:
- *     array.reverse_each {|item| block } 
- *  
- *  Same as <code>Array#each</code>, but traverses <i>self</i> in reverse
+ *     ary.reverse_each {|item| block }   -> ary
+ *     ary.reverse_each                   -> an_enumerator
+ *
+ *  Same as <code>Array#each</code>, but traverses +self+ in reverse
  *  order.
- *     
+ *
  *     a = [ "a", "b", "c" ]
  *     a.reverse_each {|x| print x, " " }
- *     
+ *
  *  produces:
- *     
+ *
  *     c b a
  */
 
 static VALUE
-rb_ary_reverse_each(ary)
-    VALUE ary;
+rb_ary_reverse_each(VALUE ary)
 {
-    long len = RARRAY(ary)->len;
+    long len;
 
+    RETURN_ENUMERATOR(ary, 0, 0);
+    len = RARRAY_LEN(ary);
     while (len--) {
-	rb_yield(RARRAY(ary)->ptr[len]);
-	if (RARRAY(ary)->len < len) {
-	    len = RARRAY(ary)->len;
+	rb_yield(RARRAY_PTR(ary)[len]);
+	if (RARRAY_LEN(ary) < len) {
+	    len = RARRAY_LEN(ary);
 	}
     }
     return ary;
@@ -1199,286 +1494,266 @@ rb_ary_reverse_each(ary)
 
 /*
  *  call-seq:
- *     array.length -> int
- *  
- *  Returns the number of elements in <i>self</i>. May be zero.
- *     
+ *     ary.length -> int
+ *
+ *  Returns the number of elements in +self+. May be zero.
+ *
  *     [ 1, 2, 3, 4, 5 ].length   #=> 5
  */
 
 static VALUE
-rb_ary_length(ary)
-    VALUE ary;
+rb_ary_length(VALUE ary)
 {
-    return LONG2NUM(RARRAY(ary)->len);
+    long len = RARRAY_LEN(ary);
+    return LONG2NUM(len);
 }
 
 /*
  *  call-seq:
- *     array.empty?   -> true or false
- *  
- *  Returns <code>true</code> if <i>self</i> array contains no elements.
- *     
+ *     ary.empty?   -> true or false
+ *
+ *  Returns <code>true</code> if +self+ contains no elements.
+ *
  *     [].empty?   #=> true
  */
 
 static VALUE
-rb_ary_empty_p(ary)
-    VALUE ary;
+rb_ary_empty_p(VALUE ary)
 {
-    if (RARRAY(ary)->len == 0)
+    if (RARRAY_LEN(ary) == 0)
 	return Qtrue;
     return Qfalse;
 }
 
-VALUE
-rb_ary_dup(ary)
-    VALUE ary;
+static VALUE
+rb_ary_dup_setup(VALUE ary)
 {
-    VALUE dup = rb_ary_new2(RARRAY(ary)->len);
-
+    VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
+    int is_embed = ARY_EMBED_P(dup);
     DUPSETUP(dup, ary);
-    MEMCPY(RARRAY(dup)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
-    RARRAY(dup)->len = RARRAY(ary)->len;
+    if (is_embed) FL_SET_EMBED(dup);
+    ARY_SET_LEN(dup, RARRAY_LEN(ary));
     return dup;
 }
 
-extern VALUE rb_output_fs;
-
-static VALUE
-inspect_join(ary, arg)
-    VALUE ary;
-    VALUE *arg;
+VALUE
+rb_ary_dup(VALUE ary)
 {
-    return rb_ary_join(arg[0], arg[1]);
+    VALUE dup = rb_ary_dup_setup(ary);
+    MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
+    return dup;
 }
 
 VALUE
-rb_ary_join(ary, sep)
-    VALUE ary, sep;
+rb_ary_resurrect(VALUE ary)
 {
-    long len = 1, i;
-    int taint = Qfalse;
-    VALUE result, tmp;
+    return rb_ary_new4(RARRAY_LEN(ary), RARRAY_PTR(ary));
+}
+
+extern VALUE rb_output_fs;
 
-    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
+static void ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result);
+
+static VALUE
+recursive_join(VALUE obj, VALUE argp, int recur)
+{
+    VALUE *arg = (VALUE *)argp;
+    VALUE ary = arg[0];
+    VALUE sep = arg[1];
+    VALUE result = arg[2];
 
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = rb_check_string_type(RARRAY(ary)->ptr[i]);
-	len += NIL_P(tmp) ? 10 : RSTRING(tmp)->len;
+    if (recur) {
+	rb_raise(rb_eArgError, "recursive array join");
     }
-    if (!NIL_P(sep)) {
-	StringValue(sep);
-	len += RSTRING(sep)->len * (RARRAY(ary)->len - 1);
+    else {
+	ary_join_1(obj, ary, sep, 0, result);
     }
-    result = rb_str_buf_new(len);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = RARRAY(ary)->ptr[i];
-	switch (TYPE(tmp)) {
+    return Qnil;
+}
+
+static void
+ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
+{
+    long i;
+    VALUE val;
+
+    for (i=0; i<max; i++) {
+	val = RARRAY_PTR(ary)[i];
+	if (i > 0 && !NIL_P(sep))
+	    rb_str_buf_append(result, sep);
+	rb_str_buf_append(result, val);
+	if (OBJ_TAINTED(val)) OBJ_TAINT(result);
+	if (OBJ_UNTRUSTED(val)) OBJ_TAINT(result);
+    }
+}
+
+static void
+ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result)
+{
+    VALUE val, tmp;
+
+    for (; i<RARRAY_LEN(ary); i++) {
+	if (i > 0 && !NIL_P(sep))
+	    rb_str_buf_append(result, sep);
+
+	val = RARRAY_PTR(ary)[i];
+	switch (TYPE(val)) {
 	  case T_STRING:
+	  str_join:
+	    rb_str_buf_append(result, val);
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
+	    obj = val;
+	  ary_join:
+	    if (val == ary) {
+		rb_raise(rb_eArgError, "recursive array join");
 	    }
 	    else {
-		VALUE args[2];
+		VALUE args[3];
 
-		args[0] = tmp;
+		args[0] = val;
 		args[1] = sep;
-		tmp = rb_protect_inspect(inspect_join, ary, (VALUE)args);
+		args[2] = result;
+		rb_exec_recursive(recursive_join, obj, (VALUE)args);
 	    }
 	    break;
 	  default:
-	    tmp = rb_obj_as_string(tmp);
+	    tmp = rb_check_string_type(val);
+	    if (!NIL_P(tmp)) {
+		val = tmp;
+		goto str_join;
+	    }
+	    tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_ary");
+	    if (!NIL_P(tmp)) {
+		obj = val;
+		val = tmp;
+		goto ary_join;
+	    }
+	    val = rb_obj_as_string(val);
+	    goto str_join;
 	}
-	if (i > 0 && !NIL_P(sep))
-	    rb_str_buf_append(result, sep);
-	rb_str_buf_append(result, tmp);
-	if (OBJ_TAINTED(tmp)) taint = Qtrue;
     }
+}
+
+VALUE
+rb_ary_join(VALUE ary, VALUE sep)
+{
+    long len = 1, i;
+    int taint = FALSE;
+    int untrust = FALSE;
+    VALUE val, tmp, result;
+
+    if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
+    if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = TRUE;
+    if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = TRUE;
 
+    if (!NIL_P(sep)) {
+	StringValue(sep);
+	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
+    }
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	val = RARRAY_PTR(ary)[i];
+	tmp = rb_check_string_type(val);
+
+	if (NIL_P(tmp) || tmp != val) {
+	    result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
+	    if (taint) OBJ_TAINT(result);
+	    if (untrust) OBJ_UNTRUST(result);
+	    ary_join_0(ary, sep, i, result);
+	    ary_join_1(ary, ary, sep, i, result);
+	    return result;
+	}
+
+	len += RSTRING_LEN(tmp);
+    }
+
+    result = rb_str_buf_new(len);
     if (taint) OBJ_TAINT(result);
+    if (untrust) OBJ_UNTRUST(result);
+    ary_join_0(ary, sep, RARRAY_LEN(ary), result);
+
     return result;
 }
 
 /*
  *  call-seq:
- *     array.join(sep=$,)    -> str
- *  
+ *     ary.join(sep=$,)    -> str
+ *
  *  Returns a string created by converting each element of the array to
  *  a string, separated by <i>sep</i>.
- *     
+ *
  *     [ "a", "b", "c" ].join        #=> "abc"
  *     [ "a", "b", "c" ].join("-")   #=> "a-b-c"
  */
 
 static VALUE
-rb_ary_join_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE sep;
 
     rb_scan_args(argc, argv, "01", &sep);
     if (NIL_P(sep)) sep = rb_output_fs;
-    
-    return rb_ary_join(ary, sep);
-}
-
-/*
- *  call-seq:
- *     array.to_s -> string
- *  
- *  Returns _self_<code>.join</code>.
- *     
- *     [ "a", "e", "i", "o" ].to_s   #=> "aeio"
- *
- */
-
-VALUE
-rb_ary_to_s(ary)
-    VALUE ary;
-{
-    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    
-    return rb_ary_join(ary, rb_output_fs);
-}
-
-static ID inspect_key;
-
-struct inspect_arg {
-    VALUE (*func)();
-    VALUE arg1, arg2;
-};
-
-static VALUE
-inspect_call(arg)
-    struct inspect_arg *arg;
-{
-    return (*arg->func)(arg->arg1, arg->arg2);
-}
-
-static VALUE
-get_inspect_tbl(create)
-    int create;
-{
-    VALUE inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
-
-    if (NIL_P(inspect_tbl)) {
-	if (create) {
-	  tbl_init:
-	    inspect_tbl = rb_ary_new();
-	    rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
-	}
-    }
-    else if (TYPE(inspect_tbl) != T_ARRAY) {
-	rb_warn("invalid inspect_tbl value");
-	if (create) goto tbl_init;
-	rb_thread_local_aset(rb_thread_current(), inspect_key, Qnil);
-	return Qnil;
-    }
-    return inspect_tbl;
-}
-
-static VALUE
-inspect_ensure(obj)
-    VALUE obj;
-{
-    VALUE inspect_tbl;
-
-    inspect_tbl = get_inspect_tbl(Qfalse);
-    if (!NIL_P(inspect_tbl)) {
-	rb_ary_pop(inspect_tbl);
-    }
-    return 0;
-}
-
-VALUE
-rb_protect_inspect(func, obj, arg)
-    VALUE (*func)(ANYARGS);
-    VALUE obj, arg;
-{
-    struct inspect_arg iarg;
-    VALUE inspect_tbl;
-    VALUE id;
-
-    inspect_tbl = get_inspect_tbl(Qtrue);
-    id = rb_obj_id(obj);
-    if (rb_ary_includes(inspect_tbl, id)) {
-	return (*func)(obj, arg);
-    }
-    rb_ary_push(inspect_tbl, id);
-    iarg.func = func;
-    iarg.arg1 = obj;
-    iarg.arg2 = arg;
-
-    return rb_ensure(inspect_call, (VALUE)&iarg, inspect_ensure, obj);
-}
 
-VALUE
-rb_inspecting_p(obj)
-    VALUE obj;
-{
-    VALUE inspect_tbl;
-
-    inspect_tbl = get_inspect_tbl(Qfalse);
-    if (NIL_P(inspect_tbl)) return Qfalse;
-    return rb_ary_includes(inspect_tbl, rb_obj_id(obj));
+    return rb_ary_join(ary, sep);
 }
 
 static VALUE
-inspect_ary(ary)
-    VALUE ary;
+inspect_ary(VALUE ary, VALUE dummy, int recur)
 {
     int tainted = OBJ_TAINTED(ary);
+    int untrust = OBJ_UNTRUSTED(ary);
     long i;
     VALUE s, str;
 
+    if (recur) return rb_tainted_str_new2("[...]");
     str = rb_str_buf_new2("[");
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	s = rb_inspect(RARRAY(ary)->ptr[i]);
-	if (OBJ_TAINTED(s)) tainted = Qtrue;
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	s = rb_inspect(RARRAY_PTR(ary)[i]);
+	if (OBJ_TAINTED(s)) tainted = TRUE;
+	if (OBJ_UNTRUSTED(s)) untrust = TRUE;
 	if (i > 0) rb_str_buf_cat2(str, ", ");
 	rb_str_buf_append(str, s);
     }
     rb_str_buf_cat2(str, "]");
     if (tainted) OBJ_TAINT(str);
+    if (untrust) OBJ_UNTRUST(str);
     return str;
 }
 
 /*
  *  call-seq:
- *     array.inspect  -> string
+ *     ary.to_s -> string
+ *     ary.inspect  -> string
  *
- *  Create a printable version of <i>array</i>.
+ *  Creates a string representation of +self+.
  */
 
 static VALUE
-rb_ary_inspect(ary)
-    VALUE ary;
+rb_ary_inspect(VALUE ary)
+{
+    if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new2("[]");
+    return rb_exec_recursive(inspect_ary, ary, 0);
+}
+
+VALUE
+rb_ary_to_s(VALUE ary)
 {
-    if (RARRAY(ary)->len == 0) return rb_str_new2("[]");
-    if (rb_inspecting_p(ary)) return rb_str_new2("[...]");
-    return rb_protect_inspect(inspect_ary, ary, 0);
+    return rb_ary_inspect(ary);
 }
 
 /*
  *  call-seq:
- *     array.to_a     -> array
- *  
- *  Returns _self_. If called on a subclass of Array, converts
+ *     ary.to_a     -> ary
+ *
+ *  Returns +self+. If called on a subclass of Array, converts
  *  the receiver to an Array object.
  */
 
 static VALUE
-rb_ary_to_a(ary)
-    VALUE ary;
+rb_ary_to_a(VALUE ary)
 {
     if (rb_obj_class(ary) != rb_cArray) {
-	VALUE dup = rb_ary_new2(RARRAY(ary)->len);
+	VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
 	rb_ary_replace(dup, ary);
 	return dup;
     }
@@ -1487,267 +1762,446 @@ rb_ary_to_a(ary)
 
 /*
  *  call-seq:
- *     array.to_ary -> array
- *  
- *  Returns _self_.
+ *     ary.to_ary -> ary
+ *
+ *  Returns +self+.
  */
 
 static VALUE
-rb_ary_to_ary_m(ary)
-    VALUE ary;
+rb_ary_to_ary_m(VALUE ary)
 {
     return ary;
 }
 
+static void
+ary_reverse(p1, p2)
+    VALUE *p1, *p2;
+{
+    while (p1 < p2) {
+	VALUE tmp = *p1;
+	*p1++ = *p2;
+	*p2-- = tmp;
+    }
+}
+
 VALUE
-rb_ary_reverse(ary)
-    VALUE ary;
+rb_ary_reverse(VALUE ary)
 {
     VALUE *p1, *p2;
-    VALUE tmp;
 
     rb_ary_modify(ary);
-    if (RARRAY(ary)->len > 1) {
-	p1 = RARRAY(ary)->ptr;
-	p2 = p1 + RARRAY(ary)->len - 1;	/* points last item */
-
-	while (p1 < p2) {
-	    tmp = *p1;
-	    *p1++ = *p2;
-	    *p2-- = tmp;
-	}
+    if (RARRAY_LEN(ary) > 1) {
+	p1 = RARRAY_PTR(ary);
+	p2 = p1 + RARRAY_LEN(ary) - 1;	/* points last item */
+	ary_reverse(p1, p2);
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.reverse!   -> array 
- *  
- *  Reverses _self_ in place.
- *     
+ *     ary.reverse!   -> ary
+ *
+ *  Reverses +self+ in place.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.reverse!       #=> ["c", "b", "a"]
  *     a                #=> ["c", "b", "a"]
  */
 
 static VALUE
-rb_ary_reverse_bang(ary)
-    VALUE ary;
+rb_ary_reverse_bang(VALUE ary)
 {
     return rb_ary_reverse(ary);
 }
 
 /*
  *  call-seq:
- *     array.reverse -> an_array
- *  
- *  Returns a new array containing <i>self</i>'s elements in reverse order.
- *     
+ *     ary.reverse -> new_ary
+ *
+ *  Returns a new array containing +self+'s elements in reverse order.
+ *
  *     [ "a", "b", "c" ].reverse   #=> ["c", "b", "a"]
  *     [ 1 ].reverse               #=> [1]
  */
 
 static VALUE
-rb_ary_reverse_m(ary)
-    VALUE ary;
+rb_ary_reverse_m(VALUE ary)
+{
+    VALUE dup = rb_ary_dup_setup(ary);
+    long len = RARRAY_LEN(ary);
+
+    if (len > 0) {
+	VALUE *p1 = RARRAY_PTR(ary);
+	VALUE *p2 = RARRAY_PTR(dup) + len - 1;
+	do *p2-- = *p1++; while (--len > 0);
+    }
+    return dup;
+}
+
+static inline long
+rotate_count(long cnt, long len)
+{
+    return (cnt < 0) ? (len - (~cnt % len) - 1) : (cnt % len);
+}
+
+VALUE
+rb_ary_rotate(VALUE ary, long cnt)
+{
+    rb_ary_modify(ary);
+
+    if (cnt != 0) {
+	VALUE *ptr = RARRAY_PTR(ary);
+	long len = RARRAY_LEN(ary);
+
+	if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) {
+	    --len;
+	    if (cnt < len) ary_reverse(ptr + cnt, ptr + len);
+	    if (--cnt > 0) ary_reverse(ptr, ptr + cnt);
+	    if (len > 0) ary_reverse(ptr, ptr + len);
+	    return ary;
+	}
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ary.rotate!(cnt=1) -> ary
+ *
+ *  Rotates +self+ in place so that the element at +cnt+ comes first,
+ *  and returns +self+.  If +cnt+ is negative then it rotates in
+ *  counter direction.
+ *
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.rotate!        #=> ["b", "c", "d", "a"]
+ *     a                #=> ["b", "c", "d", "a"]
+ *     a.rotate!(2)     #=> ["d", "a", "b", "c"]
+ *     a.rotate!(-3)    #=> ["a", "b", "c", "d"]
+ */
+
+static VALUE
+rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
+{
+    long n = 1;
+
+    switch (argc) {
+      case 1: n = NUM2LONG(argv[0]);
+      case 0: break;
+      default: rb_scan_args(argc, argv, "01", NULL);
+    }
+    rb_ary_rotate(ary, n);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ary.rotate([n = 1]) -> new_ary
+ *
+ *  Returns new array by rotating +self+, whose first element is the
+ *  element at +cnt+ in +self+.  If +cnt+ is negative then it rotates
+ *  in counter direction.
+ *
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.rotate         #=> ["b", "c", "d", "a"]
+ *     a                #=> ["a", "b", "c", "d"]
+ *     a.rotate(2)      #=> ["c", "d", "a", "b"]
+ *     a.rotate(-3)     #=> ["b", "c", "d", "a"]
+ */
+
+static VALUE
+rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 {
-    return rb_ary_reverse(rb_ary_dup(ary));
+    VALUE rotated, *ptr, *ptr2;
+    long len, cnt = 1;
+
+    switch (argc) {
+      case 1: cnt = NUM2LONG(argv[0]);
+      case 0: break;
+      default: rb_scan_args(argc, argv, "01", NULL);
+    }
+
+    len = RARRAY_LEN(ary);
+    rotated = rb_ary_dup_setup(ary);
+    if (len > 0) {
+	cnt = rotate_count(cnt, len);
+	ptr = RARRAY_PTR(ary);
+	ptr2 = RARRAY_PTR(rotated);
+	len -= cnt;
+	MEMCPY(ptr2, ptr + cnt, VALUE, len);
+	MEMCPY(ptr2 + len, ptr, VALUE, cnt);
+    }
+    return rotated;
 }
 
 struct ary_sort_data {
     VALUE ary;
-    VALUE *ptr;
-    long len;
+    int opt_methods;
+    int opt_inited;
 };
 
-static void
-ary_sort_check(data)
-    struct ary_sort_data *data;
+enum {
+    sort_opt_Fixnum,
+    sort_opt_String,
+    sort_optimizable_count
+};
+
+#define STRING_P(s) (TYPE(s) == T_STRING && CLASS_OF(s) == rb_cString)
+
+#define SORT_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(sort_opt_,type))
+#define SORT_OPTIMIZABLE(data, type) \
+    ((data->opt_inited & SORT_OPTIMIZABLE_BIT(type)) ? \
+     (data->opt_methods & SORT_OPTIMIZABLE_BIT(type)) : \
+     ((data->opt_inited |= SORT_OPTIMIZABLE_BIT(type)), \
+      rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
+      (data->opt_methods |= SORT_OPTIMIZABLE_BIT(type))))
+
+static VALUE
+sort_reentered(VALUE ary)
 {
-    if (RARRAY(data->ary)->ptr != data->ptr || RARRAY(data->ary)->len != data->len) {
-	rb_raise(rb_eArgError, "array modified during sort");
+    if (RBASIC(ary)->klass) {
+	rb_raise(rb_eRuntimeError, "sort reentered");
     }
+    return Qnil;
 }
 
 static int
-sort_1(a, b, data)
-    VALUE *a, *b;
-    struct ary_sort_data *data;
+sort_1(const void *ap, const void *bp, void *dummy)
 {
-    VALUE retval = rb_yield_values(2, *a, *b);
+    struct ary_sort_data *data = dummy;
+    VALUE retval = sort_reentered(data->ary);
+    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    n = rb_cmpint(retval, *a, *b);
-    ary_sort_check(data);
+    retval = rb_yield_values(2, a, b);
+    n = rb_cmpint(retval, a, b);
+    sort_reentered(data->ary);
     return n;
 }
 
 static int
-sort_2(ap, bp, data)
-    VALUE *ap, *bp;
-    struct ary_sort_data *data;
+sort_2(const void *ap, const void *bp, void *dummy)
 {
-    VALUE retval;
-    VALUE a = *ap, b = *bp;
+    struct ary_sort_data *data = dummy;
+    VALUE retval = sort_reentered(data->ary);
+    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    if (FIXNUM_P(a) && FIXNUM_P(b)) {
+    if (FIXNUM_P(a) && FIXNUM_P(b) && SORT_OPTIMIZABLE(data, Fixnum)) {
 	if ((long)a > (long)b) return 1;
 	if ((long)a < (long)b) return -1;
 	return 0;
     }
-    if (TYPE(a) == T_STRING) {
-	if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
+    if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) {
+	return rb_str_cmp(a, b);
     }
 
     retval = rb_funcall(a, id_cmp, 1, b);
     n = rb_cmpint(retval, a, b);
-    ary_sort_check(data);
+    sort_reentered(data->ary);
 
     return n;
 }
 
-static VALUE
-sort_internal(ary)
-    VALUE ary;
-{
-    struct ary_sort_data data;
-
-    data.ary = ary;
-    data.ptr = RARRAY(ary)->ptr; data.len = RARRAY(ary)->len;
-    qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
-	  rb_block_given_p()?sort_1:sort_2, &data);
-    return ary;
-}
-
-static VALUE
-sort_unlock(ary)
-    VALUE ary;
-{
-    FL_UNSET(ary, ARY_TMPLOCK);
-    return ary;
-}
-
 /*
  *  call-seq:
- *     array.sort!                   -> array
- *     array.sort! {| a,b | block }  -> array 
- *  
- *  Sorts _self_. Comparisons for
+ *     ary.sort!                   -> ary
+ *     ary.sort! {| a,b | block }  -> ary
+ *
+ *  Sorts +self+. Comparisons for
  *  the sort will be done using the <code><=></code> operator or using
  *  an optional code block. The block implements a comparison between
  *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
  *  <code>Enumerable#sort_by</code>.
- *     
+ *
  *     a = [ "d", "a", "e", "c", "b" ]
  *     a.sort                    #=> ["a", "b", "c", "d", "e"]
  *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
  */
 
 VALUE
-rb_ary_sort_bang(ary)
-    VALUE ary;
+rb_ary_sort_bang(VALUE ary)
 {
     rb_ary_modify(ary);
-    if (RARRAY(ary)->len > 1) {
-	FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
-	rb_ensure(sort_internal, ary, sort_unlock, ary);
+    assert(!ARY_SHARED_P(ary));
+    if (RARRAY_LEN(ary) > 1) {
+	VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
+	struct ary_sort_data data;
+
+	RBASIC(tmp)->klass = 0;
+	data.ary = tmp;
+	data.opt_methods = 0;
+	data.opt_inited = 0;
+	ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
+		   rb_block_given_p()?sort_1:sort_2, &data);
+
+        if (ARY_EMBED_P(tmp)) {
+            assert(ARY_EMBED_P(tmp));
+            if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
+                rb_ary_unshare(ary);
+            }
+            FL_SET_EMBED(ary);
+            MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp));
+            ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
+        }
+        else {
+            assert(!ARY_EMBED_P(tmp));
+            if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
+                assert(!ARY_EMBED_P(ary));
+                FL_UNSET_SHARED(ary);
+                ARY_SET_CAPA(ary, ARY_CAPA(tmp));
+            }
+            else {
+                assert(!ARY_SHARED_P(tmp));
+                if (ARY_EMBED_P(ary)) {
+                    FL_UNSET_EMBED(ary);
+                }
+                else if (ARY_SHARED_P(ary)) {
+                    /* ary might be destructively operated in the given block */
+                    rb_ary_unshare(ary);
+                }
+                else {
+                    xfree(ARY_HEAP_PTR(ary));
+                }
+                ARY_SET_PTR(ary, RARRAY_PTR(tmp));
+                ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp));
+                ARY_SET_CAPA(ary, ARY_CAPA(tmp));
+            }
+            /* tmp was lost ownership for the ptr */
+            FL_UNSET(tmp, FL_FREEZE);
+            FL_SET_EMBED(tmp);
+            ARY_SET_EMBED_LEN(tmp, 0);
+            FL_SET(tmp, FL_FREEZE);
+	}
+        /* tmp will be GC'ed. */
+        RBASIC(tmp)->klass = rb_cArray;
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.sort                   -> an_array 
- *     array.sort {| a,b | block }  -> an_array 
- *  
- *  Returns a new array created by sorting <i>self</i>. Comparisons for
+ *     ary.sort                   -> new_ary
+ *     ary.sort {| a,b | block }  -> new_ary
+ *
+ *  Returns a new array created by sorting +self+. Comparisons for
  *  the sort will be done using the <code><=></code> operator or using
  *  an optional code block. The block implements a comparison between
  *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
  *  <code>Enumerable#sort_by</code>.
- *     
+ *
  *     a = [ "d", "a", "e", "c", "b" ]
  *     a.sort                    #=> ["a", "b", "c", "d", "e"]
  *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
  */
 
 VALUE
-rb_ary_sort(ary)
-    VALUE ary;
+rb_ary_sort(VALUE ary)
 {
     ary = rb_ary_dup(ary);
     rb_ary_sort_bang(ary);
     return ary;
 }
 
+
+static VALUE
+sort_by_i(VALUE i)
+{
+    return rb_yield(i);
+}
+
+/*
+ *  call-seq:
+ *     ary.sort_by! {| obj | block }    -> ary
+ *     ary.sort_by!                     -> an_enumerator
+ *
+ *  Sorts +self+ in place using a set of keys generated by mapping the
+ *  values in +self+ through the given block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ */
+
+static VALUE
+rb_ary_sort_by_bang(VALUE ary)
+{
+    VALUE sorted;
+
+    RETURN_ENUMERATOR(ary, 0, 0);
+    rb_ary_modify(ary);
+    sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0);
+    rb_ary_replace(ary, sorted);
+    return ary;
+}
+
+
 /*
  *  call-seq:
- *     array.collect {|item| block }  -> an_array
- *     array.map     {|item| block }  -> an_array
- *  
- *  Invokes <i>block</i> once for each element of <i>self</i>. Creates a 
+ *     ary.collect {|item| block }  -> new_ary
+ *     ary.map     {|item| block }  -> new_ary
+ *     ary.collect                  -> an_enumerator
+ *     ary.map                      -> an_enumerator
+ *
+ *  Invokes <i>block</i> once for each element of +self+. Creates a
  *  new array containing the values returned by the block.
  *  See also <code>Enumerable#collect</code>.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     a = [ "a", "b", "c", "d" ]
  *     a.collect {|x| x + "!" }   #=> ["a!", "b!", "c!", "d!"]
  *     a                          #=> ["a", "b", "c", "d"]
  */
 
 static VALUE
-rb_ary_collect(ary)
-    VALUE ary;
+rb_ary_collect(VALUE ary)
 {
     long i;
     VALUE collect;
 
-    if (!rb_block_given_p()) {
-	return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
-    }
-
-    collect = rb_ary_new2(RARRAY(ary)->len);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
+    RETURN_ENUMERATOR(ary, 0, 0);
+    collect = rb_ary_new2(RARRAY_LEN(ary));
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i]));
     }
     return collect;
 }
 
-/* 
+
+/*
  *  call-seq:
- *     array.collect! {|item| block }   ->   array
- *     array.map!     {|item| block }   ->   array
+ *     ary.collect! {|item| block }   -> ary
+ *     ary.map!     {|item| block }   -> ary
+ *     ary.collect                    -> an_enumerator
+ *     ary.map                        -> an_enumerator
  *
- *  Invokes the block once for each element of _self_, replacing the
+ *  Invokes the block once for each element of +self+, replacing the
  *  element with the value returned by _block_.
  *  See also <code>Enumerable#collect</code>.
- *   
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     a = [ "a", "b", "c", "d" ]
  *     a.collect! {|x| x + "!" }
  *     a             #=>  [ "a!", "b!", "c!", "d!" ]
  */
 
 static VALUE
-rb_ary_collect_bang(ary)
-    VALUE ary;
+rb_ary_collect_bang(VALUE ary)
 {
     long i;
 
+    RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_modify(ary);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i]));
     }
     return ary;
 }
 
 VALUE
-rb_values_at(obj, olen, argc, argv, func)
-    VALUE obj;
-    long olen;
-    int argc;
-    VALUE *argv;
-    VALUE (*func) _((VALUE,long));
+rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
 {
     VALUE result = rb_ary_new2(argc);
     long beg, len, i, j;
@@ -1774,15 +2228,15 @@ rb_values_at(obj, olen, argc, argv, func)
     return result;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.values_at(selector,... )  -> an_array
+ *     ary.values_at(selector,... )  -> new_ary
  *
  *  Returns an array containing the elements in
- *  _self_ corresponding to the given selector(s). The selectors
- *  may be either integer indices or ranges. 
+ *  +self+ corresponding to the given selector(s). The selectors
+ *  may be either integer indices or ranges.
  *  See also <code>Array#select</code>.
- * 
+ *
  *     a = %w{ a b c d e f }
  *     a.values_at(1, 3, 5)
  *     a.values_at(1, 3, 5, 7)
@@ -1791,36 +2245,37 @@ rb_values_at(obj, olen, argc, argv, func)
  */
 
 static VALUE
-rb_ary_values_at(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
 {
-    return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
+    return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
 }
 
+
 /*
  *  call-seq:
- *     array.select {|item| block } -> an_array
- *  
- *  Invokes the block passing in successive elements from <i>array</i>,
+ *     ary.select {|item| block } -> new_ary
+ *     ary.select                 -> an_enumerator
+ *
+ *  Invokes the block passing in successive elements from +self+,
  *  returning an array containing those elements for which the block
  *  returns a true value (equivalent to <code>Enumerable#select</code>).
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     a = %w{ a b c d e f }
  *     a.select {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
  */
 
 static VALUE
-rb_ary_select(ary)
-    VALUE ary;
+rb_ary_select(VALUE ary)
 {
     VALUE result;
     long i;
 
-    result = rb_ary_new2(RARRAY(ary)->len);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
+    RETURN_ENUMERATOR(ary, 0, 0);
+    result = rb_ary_new2(RARRAY_LEN(ary));
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
 	    rb_ary_push(result, rb_ary_elt(ary, i));
 	}
     }
@@ -1829,14 +2284,76 @@ rb_ary_select(ary)
 
 /*
  *  call-seq:
- *     array.delete(obj)            -> obj or nil 
- *     array.delete(obj) { block }  -> obj or nil
- *  
- *  Deletes items from <i>self</i> that are equal to <i>obj</i>. If
+ *     ary.select! {|item| block } -> new_ary or nil
+ *     ary.select!                 -> an_enumerator
+ *
+ *  Invokes the block passing in successive elements from
+ *  +self+, deleting elements for which the block returns a
+ *  false value. It returns +self+ if changes were made,
+ *  otherwise it returns <code>nil</code>.
+ *  See also <code>Array#keep_if</code>
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ */
+
+static VALUE
+rb_ary_select_bang(VALUE ary)
+{
+    long i1, i2;
+
+    RETURN_ENUMERATOR(ary, 0, 0);
+    rb_ary_modify(ary);
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
+	VALUE v = RARRAY_PTR(ary)[i1];
+	if (!RTEST(rb_yield(v))) continue;
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, v);
+	}
+	i2++;
+    }
+
+    if (RARRAY_LEN(ary) == i2) return Qnil;
+    if (i2 < RARRAY_LEN(ary))
+	ARY_SET_LEN(ary, i2);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ary.keep_if {|item| block } -> ary
+ *     ary.keep_if                 -> an_enumerator
+ *
+ *  Deletes every element of +self+ for which <i>block</i> evaluates
+ *  to false.
+ *  See also <code>Array#select!</code>
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = %w{ a b c d e f }
+ *     a.keep_if {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
+ */
+
+static VALUE
+rb_ary_keep_if(VALUE ary)
+{
+    RETURN_ENUMERATOR(ary, 0, 0);
+    rb_ary_select_bang(ary);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ary.delete(obj)            -> obj or nil
+ *     ary.delete(obj) { block }  -> obj or nil
+ *
+ *  Deletes items from +self+ that are equal to <i>obj</i>.
+ *  If any items are found, returns <i>obj</i>.   If
  *  the item is not found, returns <code>nil</code>. If the optional
  *  code block is given, returns the result of <i>block</i> if the item
- *  is not found.
- *     
+ *  is not found.  (To remove <code>nil</code> elements and
+ *  get an informative return value, use #compact!)
+ *
  *     a = [ "a", "b", "b", "b", "c" ]
  *     a.delete("b")                   #=> "b"
  *     a                               #=> ["a", "c"]
@@ -1845,22 +2362,24 @@ rb_ary_select(ary)
  */
 
 VALUE
-rb_ary_delete(ary, item)
-    VALUE ary;
-    VALUE item;
+rb_ary_delete(VALUE ary, VALUE item)
 {
+    VALUE v = item;
     long i1, i2;
 
-    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
-	VALUE e = RARRAY(ary)->ptr[i1];
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
+	VALUE e = RARRAY_PTR(ary)[i1];
 
-	if (rb_equal(e, item)) continue;
+	if (rb_equal(e, item)) {
+	    v = e;
+	    continue;
+	}
 	if (i1 != i2) {
 	    rb_ary_store(ary, i2, e);
 	}
 	i2++;
     }
-    if (RARRAY(ary)->len == i2) {
+    if (RARRAY_LEN(ary) == i2) {
 	if (rb_block_given_p()) {
 	    return rb_yield(item);
 	}
@@ -1868,24 +2387,21 @@ rb_ary_delete(ary, item)
     }
 
     rb_ary_modify(ary);
-    if (RARRAY(ary)->len > i2) {
-	RARRAY(ary)->len = i2;
-	if (i2 * 2 < RARRAY(ary)->aux.capa &&
-	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
-	    RARRAY(ary)->aux.capa = i2 * 2;
+    if (RARRAY_LEN(ary) > i2) {
+	ARY_SET_LEN(ary, i2);
+	if (i2 * 2 < ARY_CAPA(ary) &&
+	    ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
+	    ary_resize_capa(ary, i2*2);
 	}
     }
 
-    return item;
+    return v;
 }
 
 VALUE
-rb_ary_delete_at(ary, pos)
-    VALUE ary;
-    long pos;
+rb_ary_delete_at(VALUE ary, long pos)
 {
-    long i, len = RARRAY(ary)->len;
+    long len = RARRAY_LEN(ary);
     VALUE del;
 
     if (pos >= len) return Qnil;
@@ -1895,23 +2411,22 @@ rb_ary_delete_at(ary, pos)
     }
 
     rb_ary_modify(ary);
-    del = RARRAY(ary)->ptr[pos];
-    for (i = pos + 1; i < len; i++, pos++) {
-	RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
-    }
-    RARRAY(ary)->len = pos;
+    del = RARRAY_PTR(ary)[pos];
+    MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE,
+	    RARRAY_LEN(ary)-pos-1);
+    ARY_INCREASE_LEN(ary, -1);
 
     return del;
 }
 
 /*
  *  call-seq:
- *     array.delete_at(index)  -> obj or nil
- *  
+ *     ary.delete_at(index)  -> obj or nil
+ *
  *  Deletes the element at the specified index, returning that element,
  *  or <code>nil</code> if the index is out of range. See also
  *  <code>Array#slice!</code>.
- *     
+ *
  *     a = %w( ant bat cat dog )
  *     a.delete_at(2)    #=> "cat"
  *     a                 #=> ["ant", "bat", "dog"]
@@ -1919,28 +2434,21 @@ rb_ary_delete_at(ary, pos)
  */
 
 static VALUE
-rb_ary_delete_at_m(ary, pos)
-    VALUE ary, pos;
+rb_ary_delete_at_m(VALUE ary, VALUE pos)
 {
     return rb_ary_delete_at(ary, NUM2LONG(pos));
 }
 
 /*
  *  call-seq:
- *     array.slice!(index)         -> obj or nil
- *     array.slice!(start, length) -> sub_array or nil
- *     array.slice!(range)         -> sub_array or nil 
- *  
+ *     ary.slice!(index)         -> obj or nil
+ *     ary.slice!(start, length) -> new_ary or nil
+ *     ary.slice!(range)         -> new_ary or nil
+ *
  *  Deletes the element(s) given by an index (optionally with a length)
- *  or by a range. Returns the deleted object, subarray, or
- *  <code>nil</code> if the index is out of range. Equivalent to:
- *     
- *     def slice!(*args)
- *       result = self[*args]
- *       self[*args] = nil
- *       result
- *     end
- *     
+ *  or by a range. Returns the deleted object (or objects), or
+ *  <code>nil</code> if the index is out of range.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.slice!(1)     #=> "b"
  *     a               #=> ["a", "c"]
@@ -1951,28 +2459,51 @@ rb_ary_delete_at_m(ary, pos)
  */
 
 static VALUE
-rb_ary_slice_bang(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
 {
     VALUE arg1, arg2;
-    long pos, len;
+    long pos, len, orig_len;
 
-    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
-	pos = NUM2LONG(arg1);
-	len = NUM2LONG(arg2);
+    rb_ary_modify_check(ary);
+    if (argc == 2) {
+	pos = NUM2LONG(argv[0]);
+	len = NUM2LONG(argv[1]);
       delete_pos_len:
+	if (len < 0) return Qnil;
+	orig_len = RARRAY_LEN(ary);
 	if (pos < 0) {
-	    pos = RARRAY(ary)->len + pos;
+	    pos += orig_len;
+	    if (pos < 0) return Qnil;
+	}
+	else if (orig_len < pos) return Qnil;
+	if (orig_len < pos + len) {
+	    len = orig_len - pos;
 	}
-	arg2 = rb_ary_subseq(ary, pos, len);
-	rb_ary_splice(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
+	if (len == 0) return rb_ary_new2(0);
+	arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
+	RBASIC(arg2)->klass = rb_obj_class(ary);
+	rb_ary_splice(ary, pos, len, Qundef);
 	return arg2;
     }
 
-    if (!FIXNUM_P(arg1) && rb_range_beg_len(arg1, &pos, &len, RARRAY(ary)->len, 1)) {
-	goto delete_pos_len;
+    if (argc != 1) {
+	/* error report */
+	rb_scan_args(argc, argv, "11", NULL, NULL);
+    }
+    arg1 = argv[0];
+
+    if (!FIXNUM_P(arg1)) {
+	switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
+	  case Qtrue:
+	    /* valid range */
+	    goto delete_pos_len;
+	  case Qnil:
+	    /* invalid range */
+	    return Qnil;
+	  default:
+	    /* not a range */
+	    break;
+	}
     }
 
     return rb_ary_delete_at(ary, NUM2LONG(arg1));
@@ -1980,48 +2511,57 @@ rb_ary_slice_bang(argc, argv, ary)
 
 /*
  *  call-seq:
- *     array.reject! {|item| block }  -> array or nil
- *  
+ *     ary.reject! {|item| block }  -> ary or nil
+ *     ary.reject!                  -> an_enumerator
+ *
  *  Equivalent to <code>Array#delete_if</code>, deleting elements from
- *  _self_ for which the block evaluates to true, but returns
- *  <code>nil</code> if no changes were made. Also see
- *  <code>Enumerable#reject</code>.
+ *  +self+ for which the block evaluates to true, but returns
+ *  <code>nil</code> if no changes were made.
+ *  See also <code>Enumerable#reject</code> and <code>Array#delete_if</code>.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  */
 
 static VALUE
-rb_ary_reject_bang(ary)
-    VALUE ary;
+rb_ary_reject_bang(VALUE ary)
 {
     long i1, i2;
 
+    RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_modify(ary);
-    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
-	VALUE v = RARRAY(ary)->ptr[i1];
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
+	VALUE v = RARRAY_PTR(ary)[i1];
 	if (RTEST(rb_yield(v))) continue;
 	if (i1 != i2) {
 	    rb_ary_store(ary, i2, v);
 	}
 	i2++;
     }
-    if (RARRAY(ary)->len == i2) return Qnil;
-    if (i2 < RARRAY(ary)->len)
-	RARRAY(ary)->len = i2;
 
+    if (RARRAY_LEN(ary) == i2) return Qnil;
+    if (i2 < RARRAY_LEN(ary))
+	ARY_SET_LEN(ary, i2);
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.reject {|item| block }  -> an_array
- *  
- *  Returns a new array containing the items in _self_
+ *     ary.reject {|item| block }  -> new_ary
+ *     ary.reject                  -> an_enumerator
+ *
+ *  Returns a new array containing the items in +self+
  *  for which the block is not true.
+ *  See also <code>Array#delete_if</code>
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  */
 
 static VALUE
-rb_ary_reject(ary)
-    VALUE ary;
+rb_ary_reject(VALUE ary)
 {
+    RETURN_ENUMERATOR(ary, 0, 0);
     ary = rb_ary_dup(ary);
     rb_ary_reject_bang(ary);
     return ary;
@@ -2029,116 +2569,134 @@ rb_ary_reject(ary)
 
 /*
  *  call-seq:
- *     array.delete_if {|item| block }  -> array
- *  
- *  Deletes every element of <i>self</i> for which <i>block</i> evaluates
- *  to <code>true</code>.
- *     
+ *     ary.delete_if {|item| block }  -> ary
+ *     ary.delete_if                  -> an_enumerator
+ *
+ *  Deletes every element of +self+ for which <i>block</i> evaluates
+ *  to true.
+ *  See also <code>Array#reject!</code>
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.delete_if {|x| x >= "b" }   #=> ["a"]
  */
 
 static VALUE
-rb_ary_delete_if(ary)
-    VALUE ary;
+rb_ary_delete_if(VALUE ary)
 {
+    RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_reject_bang(ary);
     return ary;
 }
 
+static VALUE
+take_i(VALUE val, VALUE *args, int argc, VALUE *argv)
+{
+    if (args[1]-- == 0) rb_iter_break();
+    if (argc > 1) val = rb_ary_new4(argc, argv);
+    rb_ary_push(args[0], val);
+    return Qnil;
+}
+
+static VALUE
+take_items(VALUE obj, long n)
+{
+    VALUE result = rb_check_array_type(obj);
+    VALUE args[2];
+
+    if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
+    result = rb_ary_new2(n);
+    args[0] = result; args[1] = (VALUE)n;
+    rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args);
+    return result;
+}
+
+
 /*
  *  call-seq:
- *     array.zip(arg, ...)                   -> an_array
- *     array.zip(arg, ...) {| arr | block }  -> nil
- *  
+ *     ary.zip(arg, ...)                   -> new_ary
+ *     ary.zip(arg, ...) {| arr | block }  -> nil
+ *
  *  Converts any arguments to arrays, then merges elements of
- *  <i>self</i> with corresponding elements from each argument. This
+ *  +self+ with corresponding elements from each argument. This
  *  generates a sequence of <code>self.size</code> <em>n</em>-element
  *  arrays, where <em>n</em> is one more that the count of arguments. If
  *  the size of any argument is less than <code>enumObj.size</code>,
- *  <code>nil</code> values are supplied. If a block given, it is
+ *  <code>nil</code> values are supplied. If a block is given, it is
  *  invoked for each output array, otherwise an array of arrays is
  *  returned.
- *     
+ *
  *     a = [ 4, 5, 6 ]
  *     b = [ 7, 8, 9 ]
- *     
  *     [1,2,3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
  *     [1,2].zip(a,b)         #=> [[1, 4, 7], [2, 5, 8]]
  *     a.zip([1,2],[8])       #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
  */
 
 static VALUE
-rb_ary_zip(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_zip(int argc, VALUE *argv, VALUE ary)
 {
     int i, j;
     long len;
-    VALUE result;
+    VALUE result = Qnil;
 
+    len = RARRAY_LEN(ary);
     for (i=0; i<argc; i++) {
-	argv[i] = to_ary(argv[i]);
+	argv[i] = take_items(argv[i], len);
     }
-    if (rb_block_given_p()) {
-	for (i=0; i<RARRAY(ary)->len; i++) {
-	    VALUE tmp = rb_ary_new2(argc+1);
-
-	    rb_ary_push(tmp, rb_ary_elt(ary, i));
-	    for (j=0; j<argc; j++) {
-		rb_ary_push(tmp, rb_ary_elt(argv[j], i));
-	    }
-	    rb_yield(tmp);
-	}
-	return Qnil;
+    if (!rb_block_given_p()) {
+	result = rb_ary_new2(len);
     }
-    len = RARRAY(ary)->len;
-    result = rb_ary_new2(len);
-    for (i=0; i<len; i++) {
+
+    for (i=0; i<RARRAY_LEN(ary); i++) {
 	VALUE tmp = rb_ary_new2(argc+1);
 
 	rb_ary_push(tmp, rb_ary_elt(ary, i));
 	for (j=0; j<argc; j++) {
 	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
 	}
-	rb_ary_push(result, tmp);
+	if (NIL_P(result)) {
+	    rb_yield(tmp);
+	}
+	else {
+	    rb_ary_push(result, tmp);
+	}
     }
     return result;
 }
 
 /*
  *  call-seq:
- *     array.transpose -> an_array
- *  
- *  Assumes that <i>self</i> is an array of arrays and transposes the
+ *     ary.transpose -> new_ary
+ *
+ *  Assumes that +self+ is an array of arrays and transposes the
  *  rows and columns.
- *     
+ *
  *     a = [[1,2], [3,4], [5,6]]
  *     a.transpose   #=> [[1, 3, 5], [2, 4, 6]]
  */
 
 static VALUE
-rb_ary_transpose(ary)
-    VALUE ary;
+rb_ary_transpose(VALUE ary)
 {
     long elen = -1, alen, i, j;
     VALUE tmp, result = 0;
 
-    alen = RARRAY(ary)->len;
+    alen = RARRAY_LEN(ary);
     if (alen == 0) return rb_ary_dup(ary);
     for (i=0; i<alen; i++) {
 	tmp = to_ary(rb_ary_elt(ary, i));
 	if (elen < 0) {		/* first element */
-	    elen = RARRAY(tmp)->len;
+	    elen = RARRAY_LEN(tmp);
 	    result = rb_ary_new2(elen);
 	    for (j=0; j<elen; j++) {
 		rb_ary_store(result, j, rb_ary_new2(alen));
 	    }
 	}
-	else if (elen != RARRAY(tmp)->len) {
-	    rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
-		     RARRAY(tmp)->len, elen);
+	else if (elen != RARRAY_LEN(tmp)) {
+	    rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)",
+		     RARRAY_LEN(tmp), elen);
 	}
 	for (j=0; j<elen; j++) {
 	    rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
@@ -2149,75 +2707,96 @@ rb_ary_transpose(ary)
 
 /*
  *  call-seq:
- *     array.replace(other_array)  -> array
- *  
- *  Replaces the contents of <i>self</i> with the contents of
- *  <i>other_array</i>, truncating or expanding if necessary.
- *     
+ *     ary.replace(other_ary)  -> ary
+ *
+ *  Replaces the contents of +self+ with the contents of
+ *  <i>other_ary</i>, truncating or expanding if necessary.
+ *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.replace([ "x", "y", "z" ])   #=> ["x", "y", "z"]
  *     a                              #=> ["x", "y", "z"]
  */
 
-static VALUE
-rb_ary_replace(copy, orig)
-    VALUE copy, orig;
+VALUE
+rb_ary_replace(VALUE copy, VALUE orig)
 {
-    VALUE shared;
-
-    rb_ary_modify(copy);
+    rb_ary_modify_check(copy);
     orig = to_ary(orig);
     if (copy == orig) return copy;
-    shared = ary_make_shared(orig);
-    if (RARRAY(copy)->ptr && !FL_TEST(copy, ELTS_SHARED))
-	free(RARRAY(copy)->ptr);
-    RARRAY(copy)->ptr = RARRAY(orig)->ptr;
-    RARRAY(copy)->len = RARRAY(orig)->len;
-    RARRAY(copy)->aux.shared = shared;
-    FL_SET(copy, ELTS_SHARED);
 
+    if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
+        VALUE *ptr;
+        VALUE shared = 0;
+
+        if (ARY_OWNS_HEAP_P(copy)) {
+            xfree(RARRAY_PTR(copy));
+        }
+        else if (ARY_SHARED_P(copy)) {
+            shared = ARY_SHARED(copy);
+            FL_UNSET_SHARED(copy);
+        }
+        FL_SET_EMBED(copy);
+        ptr = RARRAY_PTR(orig);
+        MEMCPY(RARRAY_PTR(copy), ptr, VALUE, RARRAY_LEN(orig));
+        if (shared) {
+            rb_ary_decrement_share(shared);
+        }
+        ARY_SET_LEN(copy, RARRAY_LEN(orig));
+    }
+    else {
+        VALUE shared = ary_make_shared(orig);
+        if (ARY_OWNS_HEAP_P(copy)) {
+            xfree(RARRAY_PTR(copy));
+        }
+        else {
+            rb_ary_unshare_safe(copy);
+        }
+        FL_UNSET_EMBED(copy);
+        ARY_SET_PTR(copy, RARRAY_PTR(orig));
+        ARY_SET_LEN(copy, RARRAY_LEN(orig));
+        rb_ary_set_shared(copy, shared);
+    }
     return copy;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.clear    ->  array
+ *     ary.clear    -> ary
  *
- *  Removes all elements from _self_.
+ *  Removes all elements from +self+.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.clear    #=> [ ]
  */
 
 VALUE
-rb_ary_clear(ary)
-    VALUE ary;
+rb_ary_clear(VALUE ary)
 {
     rb_ary_modify(ary);
-    RARRAY(ary)->len = 0;
-    if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
-	RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
+    ARY_SET_LEN(ary, 0);
+    if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
+	ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.fill(obj)                                -> array
- *     array.fill(obj, start [, length])              -> array
- *     array.fill(obj, range )                        -> array
- *     array.fill {|index| block }                    -> array
- *     array.fill(start [, length] ) {|index| block } -> array
- *     array.fill(range) {|index| block }             -> array
- *  
- *  The first three forms set the selected elements of <i>self</i> (which
+ *     ary.fill(obj)                                -> ary
+ *     ary.fill(obj, start [, length])              -> ary
+ *     ary.fill(obj, range )                        -> ary
+ *     ary.fill {|index| block }                    -> ary
+ *     ary.fill(start [, length] ) {|index| block } -> ary
+ *     ary.fill(range) {|index| block }             -> ary
+ *
+ *  The first three forms set the selected elements of +self+ (which
  *  may be the entire array) to <i>obj</i>. A <i>start</i> of
  *  <code>nil</code> is equivalent to zero. A <i>length</i> of
  *  <code>nil</code> is equivalent to <i>self.length</i>. The last three
  *  forms fill the array with the value of the block. The block is
  *  passed the absolute index of each element to be filled.
- *     
+ *  Negative values of <i>start</i> count from the end of the array.
+ *
  *     a = [ "a", "b", "c", "d" ]
  *     a.fill("x")              #=> ["x", "x", "x", "x"]
  *     a.fill("z", 2, 2)        #=> ["x", "x", "z", "z"]
@@ -2227,18 +2806,15 @@ rb_ary_clear(ary)
  */
 
 static VALUE
-rb_ary_fill(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 {
     VALUE item, arg1, arg2;
     long beg = 0, end = 0, len = 0;
     VALUE *p, *pend;
-    int block_p = Qfalse;
+    int block_p = FALSE;
 
     if (rb_block_given_p()) {
-	block_p = Qtrue;
+	block_p = TRUE;
 	rb_scan_args(argc, argv, "02", &arg1, &arg2);
 	argc += 1;		/* hackish */
     }
@@ -2248,34 +2824,36 @@ rb_ary_fill(argc, argv, ary)
     switch (argc) {
       case 1:
 	beg = 0;
-	len = RARRAY(ary)->len;
+	len = RARRAY_LEN(ary);
 	break;
       case 2:
-	if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
+	if (rb_range_beg_len(arg1, &beg, &len, RARRAY_LEN(ary), 1)) {
 	    break;
 	}
 	/* fall through */
       case 3:
 	beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
 	if (beg < 0) {
-	    beg = RARRAY(ary)->len + beg;
+	    beg = RARRAY_LEN(ary) + beg;
 	    if (beg < 0) beg = 0;
 	}
-	len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
+	len = NIL_P(arg2) ? RARRAY_LEN(ary) - beg : NUM2LONG(arg2);
 	break;
     }
     rb_ary_modify(ary);
-    end = beg + len;
-    if (end < 0) {
+    if (len < 0) {
+        return ary;
+    }
+    if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) {
 	rb_raise(rb_eArgError, "argument too big");
     }
-    if (end > RARRAY(ary)->len) {
-	if (end >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
-	    RARRAY(ary)->aux.capa = end;
+    end = beg + len;
+    if (RARRAY_LEN(ary) < end) {
+	if (end >= ARY_CAPA(ary)) {
+	    ary_resize_capa(ary, end);
 	}
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
-	RARRAY(ary)->len = end;
+	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), end - RARRAY_LEN(ary));
+	ARY_SET_LEN(ary, end);
     }
 
     if (block_p) {
@@ -2284,12 +2862,12 @@ rb_ary_fill(argc, argv, ary)
 
 	for (i=beg; i<end; i++) {
 	    v = rb_yield(LONG2NUM(i));
-	    if (i>=RARRAY(ary)->len) break;
-	    RARRAY(ary)->ptr[i] = v;
+	    if (i>=RARRAY_LEN(ary)) break;
+	    RARRAY_PTR(ary)[i] = v;
 	}
     }
     else {
-	p = RARRAY(ary)->ptr + beg;
+	p = RARRAY_PTR(ary) + beg;
 	pend = p + len;
 	while (p < pend) {
 	    *p++ = item;
@@ -2298,62 +2876,61 @@ rb_ary_fill(argc, argv, ary)
     return ary;
 }
 
-/* 
+/*
  *  call-seq:
- *     array + other_array   -> an_array
+ *     ary + other_ary   -> new_ary
  *
  *  Concatenation---Returns a new array built by concatenating the
  *  two arrays together to produce a third array.
- * 
+ *
  *     [ 1, 2, 3 ] + [ 4, 5 ]    #=> [ 1, 2, 3, 4, 5 ]
  */
 
 VALUE
-rb_ary_plus(x, y)
-    VALUE x, y;
+rb_ary_plus(VALUE x, VALUE y)
 {
     VALUE z;
     long len;
 
     y = to_ary(y);
-    len = RARRAY(x)->len + RARRAY(y)->len;
+    len = RARRAY_LEN(x) + RARRAY_LEN(y);
     z = rb_ary_new2(len);
-    MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
-    MEMCPY(RARRAY(z)->ptr + RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
-    RARRAY(z)->len = len;
+    MEMCPY(RARRAY_PTR(z), RARRAY_PTR(x), VALUE, RARRAY_LEN(x));
+    MEMCPY(RARRAY_PTR(z) + RARRAY_LEN(x), RARRAY_PTR(y), VALUE, RARRAY_LEN(y));
+    ARY_SET_LEN(z, len);
     return z;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.concat(other_array)   ->  array
+ *     ary.concat(other_ary)   -> ary
+ *
+ *  Appends the elements of <i>other_ary</i> to +self+.
  *
- *  Appends the elements in other_array to _self_.
- *  
  *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
  */
 
 
 VALUE
-rb_ary_concat(x, y)
-    VALUE x, y;
+rb_ary_concat(VALUE x, VALUE y)
 {
+    rb_ary_modify_check(x);
     y = to_ary(y);
-    if (RARRAY(y)->len > 0) {
-	rb_ary_splice(x, RARRAY(x)->len, 0, y);
+    if (RARRAY_LEN(y) > 0) {
+	rb_ary_splice(x, RARRAY_LEN(x), 0, y);
     }
     return x;
 }
 
 
-/* 
+/*
  *  call-seq:
- *     array * int     ->    an_array
- *     array * str     ->    a_string
+ *     ary * int     -> new_ary
+ *     ary * str     -> new_string
  *
  *  Repetition---With a String argument, equivalent to
  *  self.join(str). Otherwise, returns a new array
- *  built by concatenating the _int_ copies of _self_.
+ *  built by concatenating the _int_ copies of +self+.
  *
  *
  *     [ 1, 2, 3 ] * 3    #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
@@ -2362,11 +2939,10 @@ rb_ary_concat(x, y)
  */
 
 static VALUE
-rb_ary_times(ary, times)
-    VALUE ary, times;
+rb_ary_times(VALUE ary, VALUE times)
 {
-    VALUE ary2, tmp;
-    long i, len;
+    VALUE ary2, tmp, *ptr, *ptr2;
+    long i, t, len;
 
     tmp = rb_check_string_type(times);
     if (!NIL_P(tmp)) {
@@ -2374,29 +2950,36 @@ rb_ary_times(ary, times)
     }
 
     len = NUM2LONG(times);
-    if (len == 0) return ary_new(rb_obj_class(ary), 0);
+    if (len == 0) {
+	ary2 = ary_new(rb_obj_class(ary), 0);
+	goto out;
+    }
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative argument");
     }
-    if (LONG_MAX/len < RARRAY(ary)->len) {
+    if (ARY_MAX_SIZE/len < RARRAY_LEN(ary)) {
 	rb_raise(rb_eArgError, "argument too big");
     }
-    len *= RARRAY(ary)->len;
+    len *= RARRAY_LEN(ary);
 
     ary2 = ary_new(rb_obj_class(ary), len);
-    RARRAY(ary2)->len = len;
+    ARY_SET_LEN(ary2, len);
 
-    for (i=0; i<len; i+=RARRAY(ary)->len) {
-	MEMCPY(RARRAY(ary2)->ptr+i, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    ptr = RARRAY_PTR(ary);
+    ptr2 = RARRAY_PTR(ary2);
+    t = RARRAY_LEN(ary);
+    for (i=0; i<len; i+=t) {
+	MEMCPY(ptr2+i, ptr, VALUE, t);
     }
+  out:
     OBJ_INFECT(ary2, ary);
 
     return ary2;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.assoc(obj)   ->  an_array  or  nil
+ *     ary.assoc(obj)   -> new_ary  or  nil
  *
  *  Searches through an array whose elements are also arrays
  *  comparing _obj_ with the first element of each contained array
@@ -2415,17 +2998,15 @@ rb_ary_times(ary, times)
  */
 
 VALUE
-rb_ary_assoc(ary, key)
-    VALUE ary, key;
+rb_ary_assoc(VALUE ary, VALUE key)
 {
     long i;
     VALUE v;
 
-    for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = RARRAY(ary)->ptr[i];
-	if (TYPE(v) == T_ARRAY &&
-	    RARRAY(v)->len > 0 &&
-	    rb_equal(RARRAY(v)->ptr[0], key))
+    for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	v = rb_check_array_type(RARRAY_PTR(ary)[i]);
+	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
+	    rb_equal(RARRAY_PTR(v)[0], key))
 	    return v;
     }
     return Qnil;
@@ -2433,38 +3014,50 @@ rb_ary_assoc(ary, key)
 
 /*
  *  call-seq:
- *     array.rassoc(key) -> an_array or nil
- *  
+ *     ary.rassoc(obj) -> new_ary or nil
+ *
  *  Searches through the array whose elements are also arrays. Compares
- *  <em>key</em> with the second element of each contained array using
+ *  _obj_ with the second element of each contained array using
  *  <code>==</code>. Returns the first contained array that matches. See
  *  also <code>Array#assoc</code>.
- *     
+ *
  *     a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
  *     a.rassoc("two")    #=> [2, "two"]
  *     a.rassoc("four")   #=> nil
  */
 
 VALUE
-rb_ary_rassoc(ary, value)
-    VALUE ary, value;
+rb_ary_rassoc(VALUE ary, VALUE value)
 {
     long i;
     VALUE v;
 
-    for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = RARRAY(ary)->ptr[i];
+    for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	v = RARRAY_PTR(ary)[i];
 	if (TYPE(v) == T_ARRAY &&
-	    RARRAY(v)->len > 1 &&
-	    rb_equal(RARRAY(v)->ptr[1], value))
+	    RARRAY_LEN(v) > 1 &&
+	    rb_equal(RARRAY_PTR(v)[1], value))
 	    return v;
     }
     return Qnil;
 }
 
-/* 
+static VALUE
+recursive_equal(VALUE ary1, VALUE ary2, int recur)
+{
+    long i;
+
+    if (recur) return Qtrue; /* Subtle! */
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
+	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+	    return Qfalse;
+    }
+    return Qtrue;
+}
+
+/*
  *  call-seq:
- *     array == other_array   ->   bool
+ *     ary == other_ary   ->   bool
  *
  *  Equality---Two arrays are equal if they contain the same number
  *  of elements and if each element is equal to (according to
@@ -2477,11 +3070,8 @@ rb_ary_rassoc(ary, value)
  */
 
 static VALUE
-rb_ary_equal(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_equal(VALUE ary1, VALUE ary2)
 {
-    long i;
-
     if (ary1 == ary2) return Qtrue;
     if (TYPE(ary2) != T_ARRAY) {
 	if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
@@ -2489,9 +3079,18 @@ rb_ary_equal(ary1, ary2)
 	}
 	return rb_equal(ary2, ary1);
     }
-    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+    if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2);
+}
+
+static VALUE
+recursive_eql(VALUE ary1, VALUE ary2, int recur)
+{
+    long i;
+
+    if (recur) return Qtrue; /* Subtle! */
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
+	if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
 	    return Qfalse;
     }
     return Qtrue;
@@ -2499,74 +3098,76 @@ rb_ary_equal(ary1, ary2)
 
 /*
  *  call-seq:
- *     array.eql?(other)  -> true or false
+ *     ary.eql?(other)  -> true or false
  *
- *  Returns <code>true</code> if _array_ and _other_ are the same object,
+ *  Returns <code>true</code> if +self+ and _other_ are the same object,
  *  or are both arrays with the same content.
  */
 
 static VALUE
-rb_ary_eql(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_eql(VALUE ary1, VALUE ary2)
 {
-    long i;
-
     if (ary1 == ary2) return Qtrue;
     if (TYPE(ary2) != T_ARRAY) return Qfalse;
-    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
-	    return Qfalse;
+    if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2);
+}
+
+static VALUE
+recursive_hash(VALUE ary, VALUE dummy, int recur)
+{
+    long i;
+    st_index_t h;
+    VALUE n;
+
+    h = rb_hash_start(RARRAY_LEN(ary));
+    if (recur) {
+	h = rb_hash_uint(h, NUM2LONG(rb_hash(rb_cArray)));
     }
-    return Qtrue;
+    else {
+	for (i=0; i<RARRAY_LEN(ary); i++) {
+	    n = rb_hash(RARRAY_PTR(ary)[i]);
+	    h = rb_hash_uint(h, NUM2LONG(n));
+	}
+    }
+    h = rb_hash_end(h);
+    return LONG2FIX(h);
 }
 
 /*
  *  call-seq:
- *     array.hash   -> fixnum
+ *     ary.hash   -> fixnum
  *
  *  Compute a hash-code for this array. Two arrays with the same content
  *  will have the same hash code (and will compare using <code>eql?</code>).
  */
 
 static VALUE
-rb_ary_hash(ary)
-    VALUE ary;
+rb_ary_hash(VALUE ary)
 {
-    long i, h;
-    VALUE n;
-
-    h = RARRAY(ary)->len;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	h = (h << 1) | (h<0 ? 1 : 0);
-	n = rb_hash(RARRAY(ary)->ptr[i]);
-	h ^= NUM2LONG(n);
-    }
-    return LONG2FIX(h);
+    return rb_exec_recursive_outer(recursive_hash, ary, 0);
 }
 
 /*
  *  call-seq:
- *     array.include?(obj)   -> true or false
- *  
+ *     ary.include?(obj)   -> true or false
+ *
  *  Returns <code>true</code> if the given object is present in
- *  <i>self</i> (that is, if any object <code>==</code> <i>anObject</i>),
+ *  +self+ (that is, if any object <code>==</code> <i>anObject</i>),
  *  <code>false</code> otherwise.
- *     
+ *
  *     a = [ "a", "b", "c" ]
  *     a.include?("b")   #=> true
  *     a.include?("z")   #=> false
  */
 
 VALUE
-rb_ary_includes(ary, item)
-    VALUE ary;
-    VALUE item;
+rb_ary_includes(VALUE ary, VALUE item)
 {
     long i;
-    
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	if (rb_equal(RARRAY(ary)->ptr[i], item)) {
+
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	if (rb_equal(RARRAY_PTR(ary)[i], item)) {
 	    return Qtrue;
 	}
     }
@@ -2574,13 +3175,32 @@ rb_ary_includes(ary, item)
 }
 
 
-/* 
+static VALUE
+recursive_cmp(VALUE ary1, VALUE ary2, int recur)
+{
+    long i, len;
+
+    if (recur) return Qundef;	/* Subtle! */
+    len = RARRAY_LEN(ary1);
+    if (len > RARRAY_LEN(ary2)) {
+	len = RARRAY_LEN(ary2);
+    }
+    for (i=0; i<len; i++) {
+	VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
+	if (v != INT2FIX(0)) {
+	    return v;
+	}
+    }
+    return Qundef;
+}
+
+/*
  *  call-seq:
- *     array <=> other_array   ->  -1, 0, +1
+ *     ary <=> other_ary   ->  -1, 0, +1 or nil
  *
  *  Comparison---Returns an integer (-1, 0,
  *  or +1) if this array is less than, equal to, or greater than
- *  other_array.  Each object in each array is compared
+ *  <i>other_ary</i>.  Each object in each array is compared
  *  (using <=>). If any value isn't
  *  equal, then that inequality is the return value. If all the
  *  values found are equal, then the return is based on a
@@ -2588,86 +3208,120 @@ rb_ary_includes(ary, item)
  *  ``equal'' according to <code>Array#<=></code> if and only if they have
  *  the same length and the value of each element is equal to the
  *  value of the corresponding element in the other array.
- *  
+ *
  *     [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
  *     [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
  *
  */
 
 VALUE
-rb_ary_cmp(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_cmp(VALUE ary1, VALUE ary2)
 {
-    long i, len;
+    long len;
+    VALUE v;
 
-    ary2 = to_ary(ary2);
-    len = RARRAY(ary1)->len;
-    if (len > RARRAY(ary2)->len) {
-	len = RARRAY(ary2)->len;
-    }
-    for (i=0; i<len; i++) {
-	VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
-	if (v != INT2FIX(0)) {
-	    return v;
-	}
-    }
-    len = RARRAY(ary1)->len - RARRAY(ary2)->len;
+    ary2 = rb_check_array_type(ary2);
+    if (NIL_P(ary2)) return Qnil;
+    if (ary1 == ary2) return INT2FIX(0);
+    v = rb_exec_recursive_paired(recursive_cmp, ary1, ary2, ary2);
+    if (v != Qundef) return v;
+    len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2);
     if (len == 0) return INT2FIX(0);
     if (len > 0) return INT2FIX(1);
     return INT2FIX(-1);
 }
 
 static VALUE
-ary_make_hash(ary1, ary2)
-    VALUE ary1, ary2;
+ary_add_hash(VALUE hash, VALUE ary)
 {
-    VALUE hash = rb_hash_new();
     long i;
 
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	rb_hash_aset(hash, RARRAY_PTR(ary)[i], Qtrue);
     }
-    if (ary2) {
-	for (i=0; i<RARRAY(ary2)->len; i++) {
-	    rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
+    return hash;
+}
+
+static inline VALUE
+ary_tmp_hash_new(void)
+{
+    VALUE hash = rb_hash_new();
+
+    RBASIC(hash)->klass = 0;
+    return hash;
+}
+
+static VALUE
+ary_make_hash(VALUE ary)
+{
+    VALUE hash = ary_tmp_hash_new();
+    return ary_add_hash(hash, ary);
+}
+
+static VALUE
+ary_add_hash_by(VALUE hash, VALUE ary)
+{
+    long i;
+
+    for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	VALUE v = rb_ary_elt(ary, i), k = rb_yield(v);
+	if (rb_hash_lookup2(hash, k, Qundef) == Qundef) {
+	    rb_hash_aset(hash, k, v);
 	}
     }
     return hash;
 }
 
-/* 
+static VALUE
+ary_make_hash_by(VALUE ary)
+{
+    VALUE hash = ary_tmp_hash_new();
+    return ary_add_hash_by(hash, ary);
+}
+
+static inline void
+ary_recycle_hash(VALUE hash)
+{
+    if (RHASH(hash)->ntbl) {
+	st_table *tbl = RHASH(hash)->ntbl;
+	RHASH(hash)->ntbl = 0;
+	st_free_table(tbl);
+    }
+}
+
+/*
  *  call-seq:
- *     array - other_array    -> an_array
+ *     ary - other_ary    -> new_ary
  *
  *  Array Difference---Returns a new array that is a copy of
  *  the original array, removing any items that also appear in
- *  other_array. (If you need set-like behavior, see the
+ *  <i>other_ary</i>. (If you need set-like behavior, see the
  *  library class Set.)
  *
  *     [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  #=>  [ 3, 3, 5 ]
  */
 
 static VALUE
-rb_ary_diff(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
     volatile VALUE hash;
     long i;
 
-    hash = ary_make_hash(to_ary(ary2), 0);
+    hash = ary_make_hash(to_ary(ary2));
     ary3 = rb_ary_new();
 
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
+	if (st_lookup(RHASH_TBL(hash), RARRAY_PTR(ary1)[i], 0)) continue;
 	rb_ary_push(ary3, rb_ary_elt(ary1, i));
     }
+    ary_recycle_hash(hash);
     return ary3;
 }
 
-/* 
+/*
  *  call-seq:
- *     array & other_array
+ *     ary & other_ary      -> new_ary
  *
  *  Set Intersection---Returns a new array
  *  containing elements common to the two arrays, with no duplicates.
@@ -2677,168 +3331,221 @@ rb_ary_diff(ary1, ary2)
 
 
 static VALUE
-rb_ary_and(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_and(VALUE ary1, VALUE ary2)
 {
     VALUE hash, ary3, v, vv;
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
-	    RARRAY(ary1)->len : RARRAY(ary2)->len);
-    hash = ary_make_hash(ary2, 0);
+    ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ?
+	    RARRAY_LEN(ary1) : RARRAY_LEN(ary2));
+    hash = ary_make_hash(ary2);
+
+    if (RHASH_EMPTY_P(hash))
+        return ary3;
 
-    for (i=0; i<RARRAY(ary1)->len; i++) {
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
 	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+	if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
+    ary_recycle_hash(hash);
 
     return ary3;
 }
 
-/* 
+/*
  *  call-seq:
- *     array | other_array     ->  an_array
+ *     ary | other_ary     -> new_ary
  *
  *  Set Union---Returns a new array by joining this array with
- *  other_array, removing duplicates.
+ *  <i>other_ary</i>, removing duplicates.
  *
  *     [ "a", "b", "c" ] | [ "c", "d", "a" ]
  *            #=> [ "a", "b", "c", "d" ]
  */
 
 static VALUE
-rb_ary_or(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_or(VALUE ary1, VALUE ary2)
 {
     VALUE hash, ary3;
     VALUE v, vv;
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
-    hash = ary_make_hash(ary1, ary2);
+    ary3 = rb_ary_new2(RARRAY_LEN(ary1)+RARRAY_LEN(ary2));
+    hash = ary_add_hash(ary_make_hash(ary1), ary2);
 
-    for (i=0; i<RARRAY(ary1)->len; i++) {
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
 	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+	if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
-    for (i=0; i<RARRAY(ary2)->len; i++) {
+    for (i=0; i<RARRAY_LEN(ary2); i++) {
 	v = vv = rb_ary_elt(ary2, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+	if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
+    ary_recycle_hash(hash);
     return ary3;
 }
 
+static int
+push_value(st_data_t key, st_data_t val, st_data_t ary)
+{
+    rb_ary_push((VALUE)ary, (VALUE)val);
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
- *     array.uniq! -> array or nil
- *  
- *  Removes duplicate elements from _self_.
+ *     ary.uniq! -> ary or nil
+ *
+ *  Removes duplicate elements from +self+.
  *  Returns <code>nil</code> if no changes are made (that is, no
  *  duplicates are found).
- *     
+ *
  *     a = [ "a", "a", "b", "b", "c" ]
  *     a.uniq!   #=> ["a", "b", "c"]
  *     b = [ "a", "b", "c" ]
  *     b.uniq!   #=> nil
+ *     c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
+ *     c.uniq! {|s| s[/^\w+/]}  #=> [ "a:def", "b:abc", "c:jkl" ]
  */
 
 static VALUE
-rb_ary_uniq_bang(ary)
-    VALUE ary;
+rb_ary_uniq_bang(VALUE ary)
 {
-    VALUE hash, v, vv;
+    VALUE hash, v;
     long i, j;
 
-    hash = ary_make_hash(ary, 0);
-
-    if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
-	return Qnil;
+    rb_ary_modify_check(ary);
+    if (RARRAY_LEN(ary) <= 1)
+        return Qnil;
+    if (rb_block_given_p()) {
+	hash = ary_make_hash_by(ary);
+	if (RARRAY_LEN(ary) == (i = RHASH_SIZE(hash))) {
+	    return Qnil;
+	}
+	ARY_SET_LEN(ary, 0);
+	if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
+	    rb_ary_unshare(ary);
+	    FL_SET_EMBED(ary);
+	}
+	ary_resize_capa(ary, i);
+	st_foreach(RHASH_TBL(hash), push_value, ary);
     }
-    for (i=j=0; i<RARRAY(ary)->len; i++) {
-	v = vv = rb_ary_elt(ary, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_store(ary, j++, v);
+    else {
+	hash = ary_make_hash(ary);
+	if (RARRAY_LEN(ary) == (long)RHASH_SIZE(hash)) {
+	    return Qnil;
+	}
+	for (i=j=0; i<RARRAY_LEN(ary); i++) {
+	    st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
+	    if (st_delete(RHASH_TBL(hash), &vv, 0)) {
+		rb_ary_store(ary, j++, v);
+	    }
 	}
+	ARY_SET_LEN(ary, j);
     }
-    RARRAY(ary)->len = j;
+    ary_recycle_hash(hash);
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.uniq   -> an_array
- *  
- *  Returns a new array by removing duplicate values in <i>self</i>.
- *     
+ *     ary.uniq   -> new_ary
+ *
+ *  Returns a new array by removing duplicate values in +self+.
+ *
  *     a = [ "a", "a", "b", "b", "c" ]
  *     a.uniq   #=> ["a", "b", "c"]
+ *     c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
+ *     c.uniq {|s| s[/^\w+/]}  #=> [ "a:def", "b:abc", "c:jkl" ]
  */
 
 static VALUE
-rb_ary_uniq(ary)
-    VALUE ary;
+rb_ary_uniq(VALUE ary)
 {
-    ary = rb_ary_dup(ary);
-    rb_ary_uniq_bang(ary);
-    return ary;
+    VALUE hash, uniq, v;
+    long i;
+
+    if (RARRAY_LEN(ary) <= 1)
+        return rb_ary_dup(ary);
+    if (rb_block_given_p()) {
+	hash = ary_make_hash_by(ary);
+	uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
+	st_foreach(RHASH_TBL(hash), push_value, uniq);
+    }
+    else {
+	hash = ary_make_hash(ary);
+	uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
+	for (i=0; i<RARRAY_LEN(ary); i++) {
+	    st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
+	    if (st_delete(RHASH_TBL(hash), &vv, 0)) {
+		rb_ary_push(uniq, v);
+	    }
+	}
+    }
+    ary_recycle_hash(hash);
+
+    return uniq;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.compact!    ->   array  or  nil
+ *     ary.compact!    -> ary  or  nil
  *
- *  Removes +nil+ elements from array.
- *  Returns +nil+ if no changes were made.
+ *  Removes +nil+ elements from the array.
+ *  Returns +nil+ if no changes were made, otherwise returns
+ *  </i>ary</i>.
  *
  *     [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
  *     [ "a", "b", "c" ].compact!           #=> nil
  */
 
 static VALUE
-rb_ary_compact_bang(ary)
-    VALUE ary;
+rb_ary_compact_bang(VALUE ary)
 {
     VALUE *p, *t, *end;
+    long n;
 
     rb_ary_modify(ary);
-    p = t = RARRAY(ary)->ptr;
-    end = p + RARRAY(ary)->len;
-    
+    p = t = RARRAY_PTR(ary);
+    end = p + RARRAY_LEN(ary);
+
     while (t < end) {
 	if (NIL_P(*t)) t++;
 	else *p++ = *t++;
     }
-    if (RARRAY(ary)->len == (p - RARRAY(ary)->ptr)) {
+    n = p - RARRAY_PTR(ary);
+    if (RARRAY_LEN(ary) == n) {
 	return Qnil;
     }
-    RARRAY(ary)->len = RARRAY(ary)->aux.capa = (p - RARRAY(ary)->ptr);
-    REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    ARY_SET_LEN(ary, n);
+    if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
+	ary_resize_capa(ary, n * 2);
+    }
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.compact     ->  an_array
+ *     ary.compact     -> new_ary
  *
- *  Returns a copy of _self_ with all +nil+ elements removed.
+ *  Returns a copy of +self+ with all +nil+ elements removed.
  *
  *     [ "a", nil, "b", nil, "c", nil ].compact
  *                       #=> [ "a", "b", "c" ]
  */
 
 static VALUE
-rb_ary_compact(ary)
-    VALUE ary;
+rb_ary_compact(VALUE ary)
 {
     ary = rb_ary_dup(ary);
     rb_ary_compact_bang(ary);
@@ -2847,146 +3554,964 @@ rb_ary_compact(ary)
 
 /*
  *  call-seq:
- *     array.nitems -> int
- *  
- *  Returns the number of non-<code>nil</code> elements in _self_.
- *  May be zero.
- *     
- *     [ 1, nil, 3, nil, 5 ].nitems   #=> 3
+ *     ary.count      -> int
+ *     ary.count(obj) -> int
+ *     ary.count { |item| block }  -> int
+ *
+ *  Returns the number of elements.  If an argument is given, counts
+ *  the number of elements which equals to <i>obj</i>.  If a block is
+ *  given, counts the number of elements yielding a true value.
+ *
+ *     ary = [1, 2, 4, 2]
+ *     ary.count             #=> 4
+ *     ary.count(2)          #=> 2
+ *     ary.count{|x|x%2==0}  #=> 3
+ *
  */
 
 static VALUE
-rb_ary_nitems(ary)
-    VALUE ary;
+rb_ary_count(int argc, VALUE *argv, VALUE ary)
 {
     long n = 0;
-    VALUE *p, *pend;
 
-    p = RARRAY(ary)->ptr;
-    pend = p + RARRAY(ary)->len;
+    if (argc == 0) {
+	VALUE *p, *pend;
+
+	if (!rb_block_given_p())
+	    return LONG2NUM(RARRAY_LEN(ary));
 
-    while (p < pend) {
-	if (!NIL_P(*p)) n++;
-	p++;
+	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
+	    if (RTEST(rb_yield(*p))) n++;
+	}
+    }
+    else {
+	VALUE obj, *p, *pend;
+
+	rb_scan_args(argc, argv, "1", &obj);
+	if (rb_block_given_p()) {
+	    rb_warn("given block not used");
+	}
+	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
+	    if (rb_equal(*p, obj)) n++;
+	}
     }
+
     return LONG2NUM(n);
 }
 
-static long
-flatten(ary, idx, ary2, memo)
-    VALUE ary;
-    long idx;
-    VALUE ary2, memo;
+static VALUE
+flatten(VALUE ary, int level, int *modified)
 {
-    VALUE id;
-    long i = idx;
-    long n, lim = idx + RARRAY(ary2)->len;
-
-    id = rb_obj_id(ary2);
-    if (rb_ary_includes(memo, id)) {
-	rb_raise(rb_eArgError, "tried to flatten recursive array");
-    }
-    rb_ary_push(memo, id);
-    rb_ary_splice(ary, idx, 1, ary2);
-    while (i < lim) {
-	VALUE tmp;
-
-	tmp = rb_check_array_type(rb_ary_elt(ary, i));
-	if (!NIL_P(tmp)) {
-	    n = flatten(ary, i, tmp, memo);
-	    i += n; lim += n;
+    long i = 0;
+    VALUE stack, result, tmp, elt;
+    st_table *memo;
+    st_data_t id;
+
+    stack = ary_new(0, ARY_DEFAULT_SIZE);
+    result = ary_new(0, RARRAY_LEN(ary));
+    memo = st_init_numtable();
+    st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
+    *modified = 0;
+
+    while (1) {
+	while (i < RARRAY_LEN(ary)) {
+	    elt = RARRAY_PTR(ary)[i++];
+	    tmp = rb_check_array_type(elt);
+	    if (RBASIC(result)->klass) {
+		rb_raise(rb_eRuntimeError, "flatten reentered");
+	    }
+	    if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
+		rb_ary_push(result, elt);
+	    }
+	    else {
+		*modified = 1;
+		id = (st_data_t)tmp;
+		if (st_lookup(memo, id, 0)) {
+		    st_free_table(memo);
+		    rb_raise(rb_eArgError, "tried to flatten recursive array");
+		}
+		st_insert(memo, id, (st_data_t)Qtrue);
+		rb_ary_push(stack, ary);
+		rb_ary_push(stack, LONG2NUM(i));
+		ary = tmp;
+		i = 0;
+	    }
+	}
+	if (RARRAY_LEN(stack) == 0) {
+	    break;
 	}
-	i++;
+	id = (st_data_t)ary;
+	st_delete(memo, &id, 0);
+	tmp = rb_ary_pop(stack);
+	i = NUM2LONG(tmp);
+	ary = rb_ary_pop(stack);
     }
-    rb_ary_pop(memo);
 
-    return lim - idx - 1;	/* returns number of increased items */
+    st_free_table(memo);
+
+    RBASIC(result)->klass = rb_class_of(ary);
+    return result;
 }
 
 /*
  *  call-seq:
- *     array.flatten! -> array or nil
- *  
- *  Flattens _self_ in place.
+ *     ary.flatten!        -> ary or nil
+ *     ary.flatten!(level) -> array or nil
+ *
+ *  Flattens +self+ in place.
  *  Returns <code>nil</code> if no modifications were made (i.e.,
- *  <i>array</i> contains no subarrays.)
- *     
+ *  <i>ary</i> contains no subarrays.)  If the optional <i>level</i>
+ *  argument determines the level of recursion to flatten.
+ *
  *     a = [ 1, 2, [3, [4, 5] ] ]
  *     a.flatten!   #=> [1, 2, 3, 4, 5]
  *     a.flatten!   #=> nil
  *     a            #=> [1, 2, 3, 4, 5]
+ *     a = [ 1, 2, [3, [4, 5] ] ]
+ *     a.flatten!(1) #=> [1, 2, 3, [4, 5]]
  */
 
 static VALUE
-rb_ary_flatten_bang(ary)
-    VALUE ary;
+rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
 {
-    long i = 0;
-    int mod = 0;
-    VALUE memo = Qnil;
+    int mod = 0, level = -1;
+    VALUE result, lv;
 
-    while (i<RARRAY(ary)->len) {
-	VALUE ary2 = RARRAY(ary)->ptr[i];
-	VALUE tmp;
+    rb_scan_args(argc, argv, "01", &lv);
+    rb_ary_modify_check(ary);
+    if (!NIL_P(lv)) level = NUM2INT(lv);
+    if (level == 0) return Qnil;
 
-	tmp = rb_check_array_type(ary2);
-	if (!NIL_P(tmp)) {
-	    if (NIL_P(memo)) {
-		memo = rb_ary_new();
-	    }
-	    i += flatten(ary, i, tmp, memo);
-	    mod = 1;
-	}
-	i++;
+    result = flatten(ary, level, &mod);
+    if (mod == 0) {
+	ary_discard(result);
+	return Qnil;
     }
-    if (mod == 0) return Qnil;
+    if (!(mod = ARY_EMBED_P(result))) rb_obj_freeze(result);
+    rb_ary_replace(ary, result);
+    if (mod) ARY_SET_EMBED_LEN(result, 0);
+
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.flatten -> an_array
- *  
+ *     ary.flatten -> new_ary
+ *     ary.flatten(level) -> new_ary
+ *
  *  Returns a new array that is a one-dimensional flattening of this
  *  array (recursively). That is, for every element that is an array,
- *  extract its elements into the new array.
- *     
+ *  extract its elements into the new array.  If the optional
+ *  <i>level</i> argument determines the level of recursion to flatten.
+ *
  *     s = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
  *     a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
- *     a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+ *     a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+ *     a = [ 1, 2, [3, [4, 5] ] ]
+ *     a.flatten(1)              #=> [1, 2, 3, [4, 5]]
  */
 
 static VALUE
-rb_ary_flatten(ary)
-    VALUE ary;
+rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
+{
+    int mod = 0, level = -1;
+    VALUE result, lv;
+
+    rb_scan_args(argc, argv, "01", &lv);
+    if (!NIL_P(lv)) level = NUM2INT(lv);
+    if (level == 0) return ary_make_shared_copy(ary);
+
+    result = flatten(ary, level, &mod);
+    OBJ_INFECT(result, ary);
+
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     ary.shuffle!        -> ary
+ *
+ *  Shuffles elements in +self+ in place.
+ */
+
+
+static VALUE
+rb_ary_shuffle_bang(VALUE ary)
+{
+    VALUE *ptr;
+    long i = RARRAY_LEN(ary);
+
+    rb_ary_modify(ary);
+    ptr = RARRAY_PTR(ary);
+    while (i) {
+	long j = (long)(rb_genrand_real()*i);
+	VALUE tmp = ptr[--i];
+	ptr[i] = ptr[j];
+	ptr[j] = tmp;
+    }
+    return ary;
+}
+
+
+/*
+ *  call-seq:
+ *     ary.shuffle -> new_ary
+ *
+ *  Returns a new array with elements of this array shuffled.
+ *
+ *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
+ *     a.shuffle                 #=> [2, 3, 1]
+ */
+
+static VALUE
+rb_ary_shuffle(VALUE ary)
 {
     ary = rb_ary_dup(ary);
-    rb_ary_flatten_bang(ary);
+    rb_ary_shuffle_bang(ary);
+    return ary;
+}
+
+
+/*
+ *  call-seq:
+ *     ary.sample        -> obj
+ *     ary.sample(n)     -> new_ary
+ *
+ *  Choose a random element or +n+ random elements from the array. The elements
+ *  are chosen by using random and unique indices into the array in order to
+ *  ensure that an element doesn't repeat itself unless the array already
+ *  contained duplicate elements. If the array is empty the first form returns
+ *  <code>nil</code> and the second form returns an empty array.
+ *
+ */
+
+
+static VALUE
+rb_ary_sample(int argc, VALUE *argv, VALUE ary)
+{
+    VALUE nv, result, *ptr;
+    long n, len, i, j, k, idx[10];
+
+    len = RARRAY_LEN(ary);
+    if (argc == 0) {
+	if (len == 0) return Qnil;
+	i = len == 1 ? 0 : (long)(rb_genrand_real()*len);
+	return RARRAY_PTR(ary)[i];
+    }
+    rb_scan_args(argc, argv, "1", &nv);
+    n = NUM2LONG(nv);
+    if (n < 0) rb_raise(rb_eArgError, "negative sample number");
+    ptr = RARRAY_PTR(ary);
+    len = RARRAY_LEN(ary);
+    if (n > len) n = len;
+    switch (n) {
+      case 0: return rb_ary_new2(0);
+      case 1:
+	return rb_ary_new4(1, &ptr[(long)(rb_genrand_real()*len)]);
+      case 2:
+	i = (long)(rb_genrand_real()*len);
+	j = (long)(rb_genrand_real()*(len-1));
+	if (j >= i) j++;
+	return rb_ary_new3(2, ptr[i], ptr[j]);
+      case 3:
+	i = (long)(rb_genrand_real()*len);
+	j = (long)(rb_genrand_real()*(len-1));
+	k = (long)(rb_genrand_real()*(len-2));
+	{
+	    long l = j, g = i;
+	    if (j >= i) l = i, g = ++j;
+	    if (k >= l && (++k >= g)) ++k;
+	}
+	return rb_ary_new3(3, ptr[i], ptr[j], ptr[k]);
+    }
+    if ((size_t)n < sizeof(idx)/sizeof(idx[0])) {
+	VALUE *ptr_result;
+	long sorted[sizeof(idx)/sizeof(idx[0])];
+	sorted[0] = idx[0] = (long)(rb_genrand_real()*len);
+	for (i=1; i<n; i++) {
+	    k = (long)(rb_genrand_real()*--len);
+	    for (j = 0; j < i; ++j) {
+		if (k < sorted[j]) break;
+		++k;
+	    }
+	    memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
+	    sorted[j] = idx[i] = k;
+	}
+	result = rb_ary_new2(n);
+	ptr_result = RARRAY_PTR(result);
+	for (i=0; i<n; i++) {
+	    ptr_result[i] = ptr[idx[i]];
+	}
+    }
+    else {
+	VALUE *ptr_result;
+	result = rb_ary_new4(len, ptr);
+	ptr_result = RARRAY_PTR(result);
+	RB_GC_GUARD(ary);
+	for (i=0; i<n; i++) {
+	    j = (long)(rb_genrand_real()*(len-i)) + i;
+	    nv = ptr_result[j];
+	    ptr_result[j] = ptr_result[i];
+	    ptr_result[i] = nv;
+	}
+    }
+    ARY_SET_LEN(result, n);
+
+    return result;
+}
+
+
+/*
+ *  call-seq:
+ *     ary.cycle(n=nil) {|obj| block }  -> nil
+ *     ary.cycle(n=nil)                 -> an_enumerator
+ *
+ *  Calls <i>block</i> for each element repeatedly _n_ times or
+ *  forever if none or +nil+ is given.  If a non-positive number is
+ *  given or the array is empty, does nothing.  Returns +nil+ if the
+ *  loop has finished without getting interrupted.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *
+ *     a = ["a", "b", "c"]
+ *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
+ *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
+ *
+ */
+
+static VALUE
+rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
+{
+    long n, i;
+    VALUE nv = Qnil;
+
+    rb_scan_args(argc, argv, "01", &nv);
+
+    RETURN_ENUMERATOR(ary, argc, argv);
+    if (NIL_P(nv)) {
+        n = -1;
+    }
+    else {
+        n = NUM2LONG(nv);
+        if (n <= 0) return Qnil;
+    }
+
+    while (RARRAY_LEN(ary) > 0 && (n < 0 || 0 < n--)) {
+        for (i=0; i<RARRAY_LEN(ary); i++) {
+            rb_yield(RARRAY_PTR(ary)[i]);
+        }
+    }
+    return Qnil;
+}
+
+#define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
+#define tmpbuf_discard(s) (rb_str_resize((s), 0L), RBASIC(s)->klass = rb_cString)
+#define tmpary(n) rb_ary_tmp_new(n)
+#define tmpary_discard(a) (ary_discard(a), RBASIC(a)->klass = rb_cArray)
+
+/*
+ * Recursively compute permutations of r elements of the set [0..n-1].
+ * When we have a complete permutation of array indexes, copy the values
+ * at those indexes into a new array and yield that array.
+ *
+ * n: the size of the set
+ * r: the number of elements in each permutation
+ * p: the array (of size r) that we're filling in
+ * index: what index we're filling in now
+ * used: an array of booleans: whether a given index is already used
+ * values: the Ruby array that holds the actual values to permute
+ */
+static void
+permute0(long n, long r, long *p, long index, char *used, VALUE values)
+{
+    long i,j;
+    for (i = 0; i < n; i++) {
+	if (used[i] == 0) {
+	    p[index] = i;
+	    if (index < r-1) {             /* if not done yet */
+		used[i] = 1;               /* mark index used */
+		permute0(n, r, p, index+1, /* recurse */
+			 used, values);
+		used[i] = 0;               /* index unused */
+	    }
+	    else {
+		/* We have a complete permutation of array indexes */
+		/* Build a ruby array of the corresponding values */
+		/* And yield it to the associated block */
+		VALUE result = rb_ary_new2(r);
+		VALUE *result_array = RARRAY_PTR(result);
+		const VALUE *values_array = RARRAY_PTR(values);
+
+		for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
+		ARY_SET_LEN(result, r);
+		rb_yield(result);
+		if (RBASIC(values)->klass) {
+		    rb_raise(rb_eRuntimeError, "permute reentered");
+		}
+	    }
+	}
+    }
+}
+
+/*
+ *  call-seq:
+ *     ary.permutation { |p| block }          -> ary
+ *     ary.permutation                        -> an_enumerator
+ *     ary.permutation(n) { |p| block }       -> ary
+ *     ary.permutation(n)                     -> an_enumerator
+ *
+ * When invoked with a block, yield all permutations of length <i>n</i>
+ * of the elements of <i>ary</i>, then return the array itself.
+ * If <i>n</i> is not specified, yield all permutations of all elements.
+ * The implementation makes no guarantees about the order in which
+ * the permutations are yielded.
+ *
+ * If no block is given, an enumerator is returned instead.
+ *
+ * Examples:
+ *
+ *     a = [1, 2, 3]
+ *     a.permutation.to_a     #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ *     a.permutation(1).to_a  #=> [[1],[2],[3]]
+ *     a.permutation(2).to_a  #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
+ *     a.permutation(3).to_a  #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ *     a.permutation(0).to_a  #=> [[]] # one permutation of length 0
+ *     a.permutation(4).to_a  #=> []   # no permutations of length 4
+ */
+
+static VALUE
+rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
+{
+    VALUE num;
+    long r, n, i;
+
+    n = RARRAY_LEN(ary);                  /* Array length */
+    RETURN_ENUMERATOR(ary, argc, argv);   /* Return enumerator if no block */
+    rb_scan_args(argc, argv, "01", &num);
+    r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
+
+    if (r < 0 || n < r) {
+	/* no permutations: yield nothing */
+    }
+    else if (r == 0) { /* exactly one permutation: the zero-length array */
+	rb_yield(rb_ary_new2(0));
+    }
+    else if (r == 1) { /* this is a special, easy case */
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	}
+    }
+    else {             /* this is the general case */
+	volatile VALUE t0 = tmpbuf(n,sizeof(long));
+	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t1 = tmpbuf(n,sizeof(char));
+	char *used = (char*)RSTRING_PTR(t1);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	RBASIC(ary0)->klass = 0;
+
+	MEMZERO(used, char, n); /* initialize array */
+
+	permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
+	tmpbuf_discard(t0);
+	tmpbuf_discard(t1);
+	RBASIC(ary0)->klass = rb_cArray;
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ary.combination(n) { |c| block }    -> ary
+ *     ary.combination(n)                  -> an_enumerator
+ *
+ * When invoked with a block, yields all combinations of length <i>n</i>
+ * of elements from <i>ary</i> and then returns <i>ary</i> itself.
+ * The implementation makes no guarantees about the order in which
+ * the combinations are yielded.
+ *
+ * If no block is given, an enumerator is returned instead.
+ *
+ * Examples:
+ *
+ *     a = [1, 2, 3, 4]
+ *     a.combination(1).to_a  #=> [[1],[2],[3],[4]]
+ *     a.combination(2).to_a  #=> [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]]
+ *     a.combination(3).to_a  #=> [[1,2,3],[1,2,4],[1,3,4],[2,3,4]]
+ *     a.combination(4).to_a  #=> [[1,2,3,4]]
+ *     a.combination(0).to_a  #=> [[]] # one combination of length 0
+ *     a.combination(5).to_a  #=> []   # no combinations of length 5
+ *
+ */
+
+static VALUE
+rb_ary_combination(VALUE ary, VALUE num)
+{
+    long n, i, len;
+
+    n = NUM2LONG(num);
+    RETURN_ENUMERATOR(ary, 1, &num);
+    len = RARRAY_LEN(ary);
+    if (n < 0 || len < n) {
+	/* yield nothing */
+    }
+    else if (n == 0) {
+	rb_yield(rb_ary_new2(0));
+    }
+    else if (n == 1) {
+	for (i = 0; i < len; i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	}
+    }
+    else {
+	volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
+	long *stack = (long*)RSTRING_PTR(t0);
+	volatile VALUE cc = tmpary(n);
+	VALUE *chosen = RARRAY_PTR(cc);
+	long lev = 0;
+
+	MEMZERO(stack, long, n);
+	stack[0] = -1;
+	for (;;) {
+	    chosen[lev] = RARRAY_PTR(ary)[stack[lev+1]];
+	    for (lev++; lev < n; lev++) {
+		chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
+	    }
+	    rb_yield(rb_ary_new4(n, chosen));
+	    if (RBASIC(t0)->klass) {
+		rb_raise(rb_eRuntimeError, "combination reentered");
+	    }
+	    do {
+		if (lev == 0) goto done;
+		stack[lev--]++;
+	    } while (stack[lev+1]+n == len+lev+1);
+	}
+    done:
+	tmpbuf_discard(t0);
+	tmpary_discard(cc);
+    }
+    return ary;
+}
+
+/*
+ * Recursively compute repeated permutations of r elements of the set
+ * [0..n-1].
+ * When we have a complete repeated permutation of array indexes, copy the
+ * values at those indexes into a new array and yield that array.
+ *
+ * n: the size of the set
+ * r: the number of elements in each permutation
+ * p: the array (of size r) that we're filling in
+ * index: what index we're filling in now
+ * values: the Ruby array that holds the actual values to permute
+ */
+static void
+rpermute0(long n, long r, long *p, long index, VALUE values)
+{
+    long i, j;
+    for (i = 0; i < n; i++) {
+	p[index] = i;
+	if (index < r-1) {              /* if not done yet */
+	    rpermute0(n, r, p, index+1, values); /* recurse */
+	}
+	else {
+	    /* We have a complete permutation of array indexes */
+	    /* Build a ruby array of the corresponding values */
+	    /* And yield it to the associated block */
+	    VALUE result = rb_ary_new2(r);
+	    VALUE *result_array = RARRAY_PTR(result);
+	    const VALUE *values_array = RARRAY_PTR(values);
+
+	    for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
+	    ARY_SET_LEN(result, r);
+	    rb_yield(result);
+	    if (RBASIC(values)->klass) {
+		rb_raise(rb_eRuntimeError, "repeated permute reentered");
+	    }
+	}
+    }
+}
+
+/*
+ *  call-seq:
+ *     ary.repeated_permutation(n) { |p| block } -> ary
+ *     ary.repeated_permutation(n)               -> an_enumerator
+ *
+ * When invoked with a block, yield all repeated permutations of length
+ * <i>n</i> of the elements of <i>ary</i>, then return the array itself.
+ * The implementation makes no guarantees about the order in which
+ * the repeated permutations are yielded.
+ *
+ * If no block is given, an enumerator is returned instead.
+ *
+ * Examples:
+ *
+ *     a = [1, 2]
+ *     a.repeated_permutation(1).to_a  #=> [[1], [2]]
+ *     a.repeated_permutation(2).to_a  #=> [[1,1],[1,2],[2,1],[2,2]]
+ *     a.repeated_permutation(3).to_a  #=> [[1,1,1],[1,1,2],[1,2,1],[1,2,2],
+ *                                     #    [2,1,1],[2,1,2],[2,2,1],[2,2,2]]
+ *     a.repeated_permutation(0).to_a  #=> [[]] # one permutation of length 0
+ */
+
+static VALUE
+rb_ary_repeated_permutation(VALUE ary, VALUE num)
+{
+    long r, n, i;
+
+    n = RARRAY_LEN(ary);                  /* Array length */
+    RETURN_ENUMERATOR(ary, 1, &num);      /* Return enumerator if no block */
+    r = NUM2LONG(num);                    /* Permutation size from argument */
+
+    if (r < 0) {
+	/* no permutations: yield nothing */
+    }
+    else if (r == 0) { /* exactly one permutation: the zero-length array */
+	rb_yield(rb_ary_new2(0));
+    }
+    else if (r == 1) { /* this is a special, easy case */
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	}
+    }
+    else {             /* this is the general case */
+	volatile VALUE t0 = tmpbuf(r, sizeof(long));
+	long *p = (long*)RSTRING_PTR(t0);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	RBASIC(ary0)->klass = 0;
+
+	rpermute0(n, r, p, 0, ary0); /* compute and yield repeated permutations */
+	tmpbuf_discard(t0);
+	RBASIC(ary0)->klass = rb_cArray;
+    }
     return ary;
 }
 
+static void
+rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
+{
+    long j;
+    if (rest > 0) {
+	for (; index < n; ++index) {
+	    p[r-rest] = index;
+	    rcombinate0(n, r, p, index, rest-1, values);
+	}
+    }
+    else {
+	VALUE result = rb_ary_new2(r);
+	VALUE *result_array = RARRAY_PTR(result);
+	const VALUE *values_array = RARRAY_PTR(values);
+
+	for (j = 0; j < r; ++j) result_array[j] = values_array[p[j]];
+	ARY_SET_LEN(result, r);
+	rb_yield(result);
+	if (RBASIC(values)->klass) {
+	    rb_raise(rb_eRuntimeError, "repeated combination reentered");
+	}
+    }
+}
+
+/*
+ *  call-seq:
+ *     ary.repeated_combination(n) { |c| block } -> ary
+ *     ary.repeated_combination(n)               -> an_enumerator
+ *
+ * When invoked with a block, yields all repeated combinations of
+ * length <i>n</i> of elements from <i>ary</i> and then returns
+ * <i>ary</i> itself.
+ * The implementation makes no guarantees about the order in which
+ * the repeated combinations are yielded.
+ *
+ * If no block is given, an enumerator is returned instead.
+ *
+ * Examples:
+ *
+ *     a = [1, 2, 3]
+ *     a.repeated_combination(1).to_a  #=> [[1], [2], [3]]
+ *     a.repeated_combination(2).to_a  #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
+ *     a.repeated_combination(3).to_a  #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
+ *                                     #    [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
+ *     a.repeated_combination(4).to_a  #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
+ *                                     #    [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
+ *                                     #    [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
+ *     a.repeated_combination(0).to_a  #=> [[]] # one combination of length 0
+ *
+ */
+
+static VALUE
+rb_ary_repeated_combination(VALUE ary, VALUE num)
+{
+    long n, i, len;
+
+    n = NUM2LONG(num);                 /* Combination size from argument */
+    RETURN_ENUMERATOR(ary, 1, &num);   /* Return enumerator if no block */
+    len = RARRAY_LEN(ary);
+    if (n < 0) {
+	/* yield nothing */
+    }
+    else if (n == 0) {
+	rb_yield(rb_ary_new2(0));
+    }
+    else if (n == 1) {
+	for (i = 0; i < len; i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	}
+    }
+    else if (len == 0) {
+	/* yield nothing */
+    }
+    else {
+	volatile VALUE t0 = tmpbuf(n, sizeof(long));
+	long *p = (long*)RSTRING_PTR(t0);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	RBASIC(ary0)->klass = 0;
+
+	rcombinate0(len, n, p, 0, n, ary0); /* compute and yield repeated combinations */
+	tmpbuf_discard(t0);
+	RBASIC(ary0)->klass = rb_cArray;
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ary.product(other_ary, ...)                -> new_ary
+ *     ary.product(other_ary, ...) { |p| block }  -> ary
+ *
+ *  Returns an array of all combinations of elements from all arrays,
+ *  The length of the returned array is the product of the length
+ *  of +self+ and the argument arrays.
+ *  If given a block, <i>product</i> will yield all combinations
+ *  and return +self+ instead.
+ *
+ *
+ *     [1,2,3].product([4,5])     #=> [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
+ *     [1,2].product([1,2])       #=> [[1,1],[1,2],[2,1],[2,2]]
+ *     [1,2].product([3,4],[5,6]) #=> [[1,3,5],[1,3,6],[1,4,5],[1,4,6],
+ *                                #     [2,3,5],[2,3,6],[2,4,5],[2,4,6]]
+ *     [1,2].product()            #=> [[1],[2]]
+ *     [1,2].product([])          #=> []
+ */
+
+static VALUE
+rb_ary_product(int argc, VALUE *argv, VALUE ary)
+{
+    int n = argc+1;    /* How many arrays we're operating on */
+    volatile VALUE t0 = tmpary(n);
+    volatile VALUE t1 = tmpbuf(n, sizeof(int));
+    VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */
+    int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */
+    VALUE result = Qnil;      /* The array we'll be returning, when no block given */
+    long i,j;
+    long resultlen = 1;
+
+    RBASIC(t0)->klass = 0;
+    RBASIC(t1)->klass = 0;
+
+    /* initialize the arrays of arrays */
+    ARY_SET_LEN(t0, n);
+    arrays[0] = ary;
+    for (i = 1; i < n; i++) arrays[i] = Qnil;
+    for (i = 1; i < n; i++) arrays[i] = to_ary(argv[i-1]);
+
+    /* initialize the counters for the arrays */
+    for (i = 0; i < n; i++) counters[i] = 0;
+
+    /* Otherwise, allocate and fill in an array of results */
+    if (rb_block_given_p()) {
+	/* Make defensive copies of arrays; exit if any is empty */
+	for (i = 0; i < n; i++) {
+	    if (RARRAY_LEN(arrays[i]) == 0) goto done;
+	    arrays[i] = ary_make_shared_copy(arrays[i]);
+	}
+    }
+    else {
+	/* Compute the length of the result array; return [] if any is empty */
+	for (i = 0; i < n; i++) {
+	    long k = RARRAY_LEN(arrays[i]), l = resultlen;
+	    if (k == 0) {
+		result = rb_ary_new2(0);
+		goto done;
+	    }
+	    resultlen *= k;
+	    if (resultlen < k || resultlen < l || resultlen / k != l) {
+		rb_raise(rb_eRangeError, "too big to product");
+	    }
+	}
+	result = rb_ary_new2(resultlen);
+    }
+    for (;;) {
+	int m;
+	/* fill in one subarray */
+	VALUE subarray = rb_ary_new2(n);
+	for (j = 0; j < n; j++) {
+	    rb_ary_push(subarray, rb_ary_entry(arrays[j], counters[j]));
+	}
+
+	/* put it on the result array */
+	if(NIL_P(result)) {
+	    FL_SET(t0, FL_USER5);
+	    rb_yield(subarray);
+	    if (! FL_TEST(t0, FL_USER5)) {
+		rb_raise(rb_eRuntimeError, "product reentered");
+	    }
+	    else {
+		FL_UNSET(t0, FL_USER5);
+	    }
+	}
+	else {
+	    rb_ary_push(result, subarray);
+	}
+
+	/*
+	 * Increment the last counter.  If it overflows, reset to 0
+	 * and increment the one before it.
+	 */
+	m = n-1;
+	counters[m]++;
+	while (counters[m] == RARRAY_LEN(arrays[m])) {
+	    counters[m] = 0;
+	    /* If the first counter overlows, we are done */
+	    if (--m < 0) goto done;
+	    counters[m]++;
+	}
+    }
+done:
+    tmpary_discard(t0);
+    tmpbuf_discard(t1);
+
+    return NIL_P(result) ? ary : result;
+}
+
+/*
+ *  call-seq:
+ *     ary.take(n)               -> new_ary
+ *
+ *  Returns first n elements from <i>ary</i>.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.take(3)             #=> [1, 2, 3]
+ *
+ */
+
+static VALUE
+rb_ary_take(VALUE obj, VALUE n)
+{
+    long len = NUM2LONG(n);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "attempt to take negative size");
+    }
+    return rb_ary_subseq(obj, 0, len);
+}
 
-/* Arrays are ordered, integer-indexed collections of any object. 
- * Array indexing starts at 0, as in C or Java.  A negative index is 
- * assumed to be relative to the end of the array---that is, an index of -1 
- * indicates the last element of the array, -2 is the next to last 
- * element in the array, and so on. 
+/*
+ *  call-seq:
+ *     ary.take_while {|arr| block }   -> new_ary
+ *     ary.take_while                  -> an_enumerator
+ *
+ *  Passes elements to the block until the block returns +nil+ or +false+,
+ *  then stops iterating and returns an array of all prior elements.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.take_while {|i| i < 3 }   #=> [1, 2]
+ *
+ */
+
+static VALUE
+rb_ary_take_while(VALUE ary)
+{
+    long i;
+
+    RETURN_ENUMERATOR(ary, 0, 0);
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+    }
+    return rb_ary_take(ary, LONG2FIX(i));
+}
+
+/*
+ *  call-seq:
+ *     ary.drop(n)               -> new_ary
+ *
+ *  Drops first n elements from <i>ary</i>, and returns rest elements
+ *  in an array.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.drop(3)             #=> [4, 5, 0]
+ *
+ */
+
+static VALUE
+rb_ary_drop(VALUE ary, VALUE n)
+{
+    VALUE result;
+    long pos = NUM2LONG(n);
+    if (pos < 0) {
+	rb_raise(rb_eArgError, "attempt to drop negative size");
+    }
+
+    result = rb_ary_subseq(ary, pos, RARRAY_LEN(ary));
+    if (result == Qnil) result = rb_ary_new();
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     ary.drop_while {|arr| block }   -> new_ary
+ *     ary.drop_while                  -> an_enumerator
+ *
+ *  Drops elements up to, but not including, the first element for
+ *  which the block returns +nil+ or +false+ and returns an array
+ *  containing the remaining elements.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
+ *
+ */
+
+static VALUE
+rb_ary_drop_while(VALUE ary)
+{
+    long i;
+
+    RETURN_ENUMERATOR(ary, 0, 0);
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+    }
+    return rb_ary_drop(ary, LONG2FIX(i));
+}
+
+
+
+/* Arrays are ordered, integer-indexed collections of any object.
+ * Array indexing starts at 0, as in C or Java.  A negative index is
+ * assumed to be relative to the end of the array---that is, an index of -1
+ * indicates the last element of the array, -2 is the next to last
+ * element in the array, and so on.
  */
 
 void
-Init_Array()
+Init_Array(void)
 {
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
     rb_define_alloc_func(rb_cArray, ary_alloc);
     rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
+    rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 1);
     rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
     rb_define_method(rb_cArray, "initialize_copy", rb_ary_replace, 1);
 
-    rb_define_method(rb_cArray, "to_s", rb_ary_to_s, 0);
     rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
+    rb_define_alias(rb_cArray,  "to_s", "inspect");
     rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
     rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
     rb_define_method(rb_cArray, "frozen?",  rb_ary_frozen_p, 0);
@@ -3004,8 +4529,8 @@ Init_Array()
     rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
     rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
     rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
-    rb_define_method(rb_cArray, "pop", rb_ary_pop, 0);
-    rb_define_method(rb_cArray, "shift", rb_ary_shift, 0);
+    rb_define_method(rb_cArray, "pop", rb_ary_pop_m, -1);
+    rb_define_method(rb_cArray, "shift", rb_ary_shift_m, -1);
     rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1);
     rb_define_method(rb_cArray, "insert", rb_ary_insert, -1);
     rb_define_method(rb_cArray, "each", rb_ary_each, 0);
@@ -3014,20 +4539,24 @@ Init_Array()
     rb_define_method(rb_cArray, "length", rb_ary_length, 0);
     rb_define_alias(rb_cArray,  "size", "length");
     rb_define_method(rb_cArray, "empty?", rb_ary_empty_p, 0);
-    rb_define_method(rb_cArray, "index", rb_ary_index, 1);
-    rb_define_method(rb_cArray, "rindex", rb_ary_rindex, 1);
-    rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
-    rb_define_method(rb_cArray, "indices", rb_ary_indexes, -1);
+    rb_define_method(rb_cArray, "find_index", rb_ary_index, -1);
+    rb_define_method(rb_cArray, "index", rb_ary_index, -1);
+    rb_define_method(rb_cArray, "rindex", rb_ary_rindex, -1);
     rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
     rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
     rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
+    rb_define_method(rb_cArray, "rotate", rb_ary_rotate_m, -1);
+    rb_define_method(rb_cArray, "rotate!", rb_ary_rotate_bang, -1);
     rb_define_method(rb_cArray, "sort", rb_ary_sort, 0);
     rb_define_method(rb_cArray, "sort!", rb_ary_sort_bang, 0);
+    rb_define_method(rb_cArray, "sort_by!", rb_ary_sort_by_bang, 0);
     rb_define_method(rb_cArray, "collect", rb_ary_collect, 0);
     rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
     rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
     rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
     rb_define_method(rb_cArray, "select", rb_ary_select, 0);
+    rb_define_method(rb_cArray, "select!", rb_ary_select_bang, 0);
+    rb_define_method(rb_cArray, "keep_if", rb_ary_keep_if, 0);
     rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
     rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
     rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at_m, 1);
@@ -3059,10 +4588,23 @@ Init_Array()
     rb_define_method(rb_cArray, "uniq!", rb_ary_uniq_bang, 0);
     rb_define_method(rb_cArray, "compact", rb_ary_compact, 0);
     rb_define_method(rb_cArray, "compact!", rb_ary_compact_bang, 0);
-    rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
-    rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, 0);
-    rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
+    rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1);
+    rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1);
+    rb_define_method(rb_cArray, "count", rb_ary_count, -1);
+    rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
+    rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
+    rb_define_method(rb_cArray, "sample", rb_ary_sample, -1);
+    rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1);
+    rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
+    rb_define_method(rb_cArray, "combination", rb_ary_combination, 1);
+    rb_define_method(rb_cArray, "repeated_permutation", rb_ary_repeated_permutation, 1);
+    rb_define_method(rb_cArray, "repeated_combination", rb_ary_repeated_combination, 1);
+    rb_define_method(rb_cArray, "product", rb_ary_product, -1);
+
+    rb_define_method(rb_cArray, "take", rb_ary_take, 1);
+    rb_define_method(rb_cArray, "take_while", rb_ary_take_while, 0);
+    rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
+    rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
 
     id_cmp = rb_intern("<=>");
-    inspect_key = rb_intern("__inspect_key__");
 }
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index b5546104d0..24941e7150 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -3,9 +3,19 @@
 SHELL = $(COMSPEC)
 MKFILES = Makefile
 
+!ifndef MFLAGS
+MFLAGS=-
+!endif
+
 #### Start of system configuration section. ####
+!ifndef OS
 OS = bccwin32
-RT = $(OS)
+!endif
+!if !defined(RT)
+!error RT not defined.  Retry from configure pass.
+!endif
+
+arch = $(ARCH)-$(OS)
 
 ## variables may be overridden by $(compile_dir)/Makefile
 !ifndef srcdir
@@ -23,7 +33,7 @@ RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
 RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
 !endif
 !ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
 !endif
 !ifndef icondirs
 !ifdef ICONDIRS
@@ -36,7 +46,6 @@ iconinc=-I$(icondirs: = -I)
 !endif
 ###############
 
-VPATH = $(srcdir):$(srcdir)/missing
 .SUFFIXES: .y
 
 !ifndef CC
@@ -49,15 +58,21 @@ CPP = cpp32
 RC = brcc32
 !endif
 !ifndef YACC
-YACC = byacc
+YACC = bison
 !endif
 !ifndef AR
 AR = tlib
 !endif
+!ifndef BASERUBY
+BASERUBY = ruby
+!endif
 
 PURIFY =
 AUTOCONF = autoconf
+IFCHANGE = $(srcdir:/=\)\win32\ifchange.bat
 RM = $(srcdir:/=\)\win32\rm.bat
+CP = copy > nul
+MV = move > nul
 
 !if !defined(PROCESSOR_ARCHITECTURE)
 PROCESSOR_ARCHITECTURE = x86
@@ -94,14 +109,11 @@ exec_prefix = $(prefix)
 libdir = $(exec_prefix)/lib
 !endif
 !if !defined(datadir)
-datadir = /share
+datadir = $(prefix)/share
 !endif
 !ifndef EXTOUT
 EXTOUT = .ext
 !endif
-!ifndef RIDATADIR
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-!endif
 !ifndef TESTUI
 TESTUI = console
 !endif
@@ -109,13 +121,24 @@ TESTUI = console
 TESTS =
 !endif
 !ifndef RDOCTARGET
-RDOCTARGET = install-nodoc
+RDOCTARGET = install-doc
 !endif
 
 OUTFLAG       = -o
+COUTFLAG      = -o
 !ifndef CFLAGS
 CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
 !endif
+!ifndef DEFS
+DEFS =
+!endif
+!ifndef CPPFLAGS
+CPPFLAGS =
+!endif
+CPPFLAGS = $(DEFS) $(CPPFLAGS)
+!ifndef CXXFLAGS
+CXXFLAGS = $(CFLAGS)
+!endif
 !ifndef LDFLAGS
 LDFLAGS = -S:$(STACK)
 !endif
@@ -129,15 +152,15 @@ EXTLIBS =
 MEMLIB =
 !endif
 LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj crypt.obj erf.obj win32.obj
+MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj
 
 !ifndef STACK
 STACK = 0x2000000
 !endif
 
-XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
+XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
 
-ARFLAGS = /a
+ARFLAGS = /a /p32
 LD = ilink32 -q -Gn
 LDSHARED  = $(LD)
 XLDFLAGS  = -Tpe c0x32.obj
@@ -153,8 +176,8 @@ EXEEXT = .exe
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
 RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
-RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
+RUNRUBY = .\$(PROGRAM) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
 
 ORGLIBPATH = $(LIB)
 
@@ -164,32 +187,43 @@ LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
 LIBRUBY_SO    = $(RUBY_SO_NAME).dll
 LIBRUBY       = $(RUBY_SO_NAME).lib
 LIBRUBYARG    = $(LIBRUBY)
+THREAD_MODEL  = win32
 
 PREP          = miniruby$(EXEEXT)
 
 OBJEXT        = obj
+ASMEXT        = asm
 
 INSTALLED_LIST= .installed.list
 
+MKMAIN_CMD    = mkmain.bat
+
+SRC_FILE      = $(<:\=/)
+
 WINMAINOBJ    = winmain.$(OBJEXT)
-MINIOBJS      = dmydln.$(OBJEXT)
+ARCHMINIOBJS  = dmydln.$(OBJEXT)
+
+arch_hdrdir = $(EXTOUT)/include/$(arch)
+hdrdir = $(srcdir)/include
+VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(srcdir)/win32
 
-.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
+.path.c = .;$(srcdir);$(srcdir)/enc;$(srcdir)/win32;$(srcdir)/missing
+.path.ci = $(srcdir)
+.path.inc = .;$(srcdir)
+.path.def = .;$(srcdir)
+.path.h = .;$(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
 .path.y = $(srcdir)
 .path. = $(srcdir)
 
 .c.obj:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
+	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:/=\)
+
+.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -S $(<:\=/)
 
 .rc.res:
 	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
 
-.y.c:
-	$(YACC) $(YFLAGS) $(<:\=/)
-	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
-	@del y.tab.c
-
 all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
 
 ruby: $(PROGRAM)
@@ -197,8 +231,17 @@ rubyw: $(WPROGRAM)
 
 !include $(srcdir)/common.mk
 
-PHONY: Makefile
+$(MKFILES): $(srcdir)/bcc32/Makefile.sub $(srcdir)/bcc32/configure.bat $(srcdir)/bcc32/setup.mak
+	$(COMSPEC) /C $(srcdir:/=\)\bcc32\configure.bat $(configure_args)
+	@echo $(MKFILES) should be updated, re-run $(MAKE).
+	@$(MAKE) > nul -q -f &&|
+PHONY: nul
+	@exit
+|
+
+PHONY: nul
 
+RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h
 CONFIG_H = ./.config.h.time
 
 config: config.status
@@ -206,23 +249,30 @@ config: config.status
 config.status: $(CONFIG_H)
 
 $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
-	@$(srcdir:/=\)\win32\ifchange.bat config.h &&|
+	@if not exist $(arch_hdrdir:/=\) md $(arch_hdrdir:/=\)
+	@if not exist $(arch_hdrdir:/=\)\ruby md $(arch_hdrdir:/=\)\ruby
+	@$(IFCHANGE) $(RUBY_CONFIG_H:/=\) &&|
+\#define NO_BIG_INLINE 1
 \#define HAVE_SYS_TYPES_H 1
 \#define HAVE_SYS_STAT_H 1
 \#define HAVE_STDLIB_H 1
 \#define HAVE_STRING_H 1
 \#define HAVE_MEMORY_H 1
+\#define HAVE_LONG_LONG 1
 \#define HAVE_OFF_T 1
 \#define SIZEOF_INT 4
 \#define SIZEOF_SHORT 2
 \#define SIZEOF_LONG 4
 \#define SIZEOF_LONG_LONG 0
 \#define SIZEOF___INT64 8
-\#define SIZEOF_OFF_T 4
+\#define SIZEOF_OFF_T 8
 \#define SIZEOF_VOIDP 4
 \#define SIZEOF_FLOAT 4
 \#define SIZEOF_DOUBLE 8
 \#define SIZEOF_TIME_T 4
+\#define SIZEOF_RLIM_T 0
+\#define SIZEOF_SIZE_T 4
+\#define SIZEOF_PTRDIFF_T 4
 \#define HAVE_PROTOTYPES 1
 \#define TOKEN_PASTE(x,y) x\#\#y
 \#define HAVE_STDARG_PROTOTYPES 1
@@ -238,6 +288,32 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define rb_pid_t int
 \#define HAVE_STRUCT_STAT_ST_RDEV 1
 \#define HAVE_ST_RDEV 1
+!if $(BORLANDC) < 0x0580
+\#define int8_t signed char
+\#define uint8_t unsigned char
+\#define int16_t short
+\#define uint16_t unsigned short
+\#define int32_t int
+\#define uint32_t unsigned int
+\#define int64_t __int64
+\#define uint64_t unsigned __int64
+\#define ssize_t int
+!endif
+\#define HAVE_INT8_T 1
+\#define HAVE_UINT8_T 1
+\#define SIZEOF_INT8_T 1
+\#define HAVE_INT16_T 1
+\#define HAVE_UINT16_T 1
+\#define SIZEOF_INT32_T 2
+\#define HAVE_INT32_T 1
+\#define HAVE_UINT32_T 1
+\#define SIZEOF_INT32_T 4
+\#define HAVE_INT64_T 1
+\#define HAVE_UINT64_T 1
+\#define SIZEOF_INT64_T 8
+\#define HAVE_INTPTR_T 1
+\#define HAVE_UINTPTR_T 1
+\#define HAVE_SSIZE_T 1
 \#define GETGROUPS_T int
 \#define RETSIGTYPE void
 \#define HAVE_ALLOCA 1
@@ -253,6 +329,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define HAVE_STRTOD 1
 \#define HAVE_STRTOL 1
 \#define HAVE_STRTOUL 1
+\#define HAVE_SNPRINTF 1
+\#define HAVE_VSNPRINTF 1
 \#define HAVE_ISNAN 1
 \#define HAVE_FINITE 1
 \#define HAVE_HYPOT 1
@@ -260,7 +338,10 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define HAVE_WAITPID 1
 \#define HAVE_FSYNC 1
 \#define HAVE_GETCWD 1
-\#define HAVE_CHSIZE 1
+\#define HAVE_TRUNCATE 1
+\#define HAVE_FTRUNCATE 1
+\#define HAVE_FSEEKO 1
+\#define HAVE_FTELLO 1
 \#define HAVE_TIMES 1
 \#define HAVE_FCNTL 1
 \#define HAVE_LINK 1
@@ -272,19 +353,19 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define RSHIFT(x,y) ((x)>>(int)y)
 \#define FILE_COUNT level
 \#define FILE_READPTR curp
+\#define RUBY_SETJMP(env) setjmp(env)
+\#define RUBY_LONGJMP(env,val) longjmp(env,val)
+\#define RUBY_JMP_BUF jmp_buf
 \#define inline __inline
 \#define NEED_IO_SEEK_BETWEEN_RW 1
 \#define STACK_GROW_DIRECTION -1
 \#define DEFAULT_KCODE KCODE_NONE
+\#define LOAD_RELATIVE 1
 \#define DLEXT ".so"
-\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
+\#define RUBY_LIB_PREFIX "/lib/ruby"
 \#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
 |
-	@exit > $@
+	@exit > $(@:/=\)
 
 config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
 	@echo Creating $@
@@ -294,13 +375,14 @@ s,@SHELL@,$$(COMSPEC),;t t
 s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
+s,@DEFS@,$(DEFS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,,;t t
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,,;t t
+s,@prefix@,$(prefix),;t t
 s,@program_transform_name@,s,,,,;t t
 s,@bindir@,$${exec_prefix}/bin,;t t
 s,@sbindir@,$${exec_prefix}/sbin,;t t
@@ -314,6 +396,7 @@ s,@includedir@,$${prefix}/include,;t t
 s,@oldincludedir@,/usr/include,;t t
 s,@infodir@,$${prefix}/info,;t t
 s,@mandir@,$${prefix}/man,;t t
+s,@ridir@,$${prefix}/share/ri,;t t
 s,@build@,$(CPU)-pc-$(OS),;t t
 s,@build_alias@,$(CPU)-$(OS),;t t
 s,@build_cpu@,$(CPU),;t t
@@ -331,14 +414,17 @@ s,@target_vendor@,pc,;t t
 s,@target_os@,$(OS),;t t
 s,@CC@,$(CC),;t t
 s,@CPP@,cpp32,;t t
+s,@CXX@,$$(CC),;t t
+s,@LD@,$(LD),;t t
 s,@YACC@,$(YACC),;t t
 s,@RANLIB@,,;t t
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
+s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
-s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
+s,@LIBOBJS@, $(MISSING),;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
 s,@EXEEXT@,.exe,;t t
@@ -378,23 +464,30 @@ s,@SOLIBS@,$(SOLIBS),;t t
 s,@DLDLIBS@,$(DLDLIBS),;t t
 s,@ENABLE_SHARED@,yes,;t t
 s,@OUTFLAG@,$(OUTFLAG),;t t
+s,@COUTFLAG@,$(COUTFLAG),;t t
 s,@CPPOUTFILE@,,;t t
 s,@LIBPATHFLAG@, -L"%s",;t t
 s,@RPATHFLAG@,,;t t
 s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
-s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
+s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS:/=\), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE:/=\), $$(RESFILE:/=\),;t t
+s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
+s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
 s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
 s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
 s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
 s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
 s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
+s,@cleanlibs@,$$*.tds,;t t
+s,@cleanobjs@,$$*-$$(arch).def $$*.il? $$*.lib,;t t
 s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
 s,@EXPORT_PREFIX@,_,;t t
 s,@arch@,$(ARCH)-$(OS),;t t
 s,@sitearch@,$(ARCH)-$(OS),;t t
 s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
+s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
+s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
+s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
+s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
 s,@configure_args@,--enable-shared $(configure_args),;t t
 s,@configure_input@,$$configure_input,;t t
 s,@srcdir@,$(srcdir),;t t
@@ -403,7 +496,7 @@ s,@top_srcdir@,$(srcdir),;t t
 
 miniruby$(EXEEXT):
 		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS)
+		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS:/=\) $(DMYEXT),$@,nul,$(LIBS)
 
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
@@ -428,13 +521,16 @@ $(LIBRUBY): $(LIBRUBY_SO)
 $(RUBYDEF):	$(LIBRUBY_A) $(PREP)
 		$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
 
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
 			-rubyw_name=$(RUBYW_INSTALL_NAME) \
 			-so_name=$(RUBY_SO_NAME) \
 			. $(icondirs) $(srcdir)/win32
 
+lex.c: {$(srcdir)}lex.c.blt
+	copy "$(?:/=\)" $@
+
 post-install-bin::
 	@$(NULLCMD)
 post-install-lib::
@@ -449,18 +545,27 @@ post-install-doc::
 	@$(NULLCMD)
 
 clean-local::
-		@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
+		@$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
 		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
+		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
 
 distclean-local::
 		@$(RM) ext\config.cache $(RBCONFIG:/=\)
-		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
 		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 
+clean-ext distclean-ext realclean-ext::
+		@for /R ext %I in (.) do @if exist %I\Makefile ( \
+		    echo $(@:-ext=)ing %~nI & \
+		    cd %I & \
+		    $(MAKE) $(MFLAGS) $(@:-ext=) & \
+		    cd %CD% \
+		)
+
 ext/extinit.obj: ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
 main.$(OBJEXT): win32.h
+ascii.$(OBJEXT): win32.h
 array.$(OBJEXT): win32.h
 bignum.$(OBJEXT): win32.h
 class.$(OBJEXT): win32.h
@@ -469,6 +574,7 @@ dir.$(OBJEXT): dir.h win32.h
 dln.$(OBJEXT): win32.h
 enum.$(OBJEXT): win32.h
 error.$(OBJEXT): win32.h
+euc_jp.$(OBJEXT): win32.h
 eval.$(OBJEXT): win32.h
 file.$(OBJEXT): win32.h
 gc.$(OBJEXT): win32.h
@@ -486,14 +592,21 @@ prec.$(OBJEXT): win32.h
 random.$(OBJEXT): win32.h
 range.$(OBJEXT): win32.h
 re.$(OBJEXT): win32.h
-regex.$(OBJEXT): win32.h
+regcomp.$(OBJEXT): win32.h
+regenc.$(OBJEXT): win32.h
+regerror.$(OBJEXT): win32.h
+regexec.$(OBJEXT): win32.h
+reggnu.$(OBJEXT): win32.h
+regparse.$(OBJEXT): win32.h
 ruby.$(OBJEXT): win32.h
 signal.$(OBJEXT): win32.h
+sjis.$(OBJEXT): win32.h
 sprintf.$(OBJEXT): win32.h
 st.$(OBJEXT): win32.h
 string.$(OBJEXT): win32.h
 struct.$(OBJEXT): win32.h
 time.$(OBJEXT): win32.h
+utf_8.$(OBJEXT): win32.h
 util.$(OBJEXT): win32.h
 variable.$(OBJEXT): win32.h
 version.$(OBJEXT): win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
index c27a1261f1..cd33eec0a1 100644
--- a/bcc32/README.bcc32
+++ b/bcc32/README.bcc32
@@ -16,7 +16,7 @@
      * ilink32
 
 (3) If you want to build from CVS source, following commands are required.
-     * byacc ((<URL:http://gnuwin32.sourceforge.net/packages/byacc.htm>))
+     * bison ((<URL:http://gnuwin32.sourceforge.net/packages/bison.htm>))
      * sed   ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
 
 (4) We strongly recommend to build ruby on C++Builder, to link following files.
@@ -30,7 +30,13 @@
 == How to compile and install
 
 (1) Execute bcc32\configure.bat on your build directory.
-     ex. c:\ruby-1.6.7>bcc32\configure.bat
+     ex. c:\src\ruby> bcc32\configure.bat
+    You can specify the target platform as an argument.
+    For example, run `((%configure i686-bccwin32%))'
+    You can also specify the install directory.
+    For example, run `((%configure --prefix=<install_directory>%))'
+    Default of the install directory is /usr .
+    The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'.
      
 (2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
     if you want to change the name of the executable files. 
@@ -41,20 +47,7 @@
 
 (4) Run `((%make test%))'
 
-(5) Run `((%make DESTDIR=<install_directory> install%))'
-
-    This command will create following directories and install files onto them.
-      * <install_directory>\bin
-      * <install_directory>\lib
-      * <install_directory>\lib\ruby
-      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
-      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
-      * <install_directory>\lib\ruby\site_ruby
-      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
-      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
-      * <install_directory>\man\man1
-    If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
-    The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
+(5) Run `((%make install%))'
 
 (6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
     usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
@@ -90,10 +83,10 @@ in Japanese, but you can download at least.
 
     C:
     cd \ruby
-    bcc32\configure
+    bcc32\configure --prefix=/usr/local
     make
     make test
-    make DESTDIR=/usr/local install
+    make install
 
 * Build on the relative directory from the ruby source directory and CPU type 
   i386.
@@ -108,10 +101,10 @@ in Japanese, but you can download at least.
     cd \ruby
     mkdir bccwin32
     cd bccwin32
-    ..\bcc32\configure target i386-bccwin32
+    ..\bcc32\configure --prefix=/usr/local
     make
     make test
-    make DESTDIR=/usr/local install
+    make install
 
 * Build on the different drive.
 
@@ -122,10 +115,10 @@ in Japanese, but you can download at least.
 
     D:
     cd D:\build\ruby
-    C:\src\ruby\bcc32\configure
+    C:\src\ruby\bcc32\configure --prefix=C:/usr/local
     make
     make test
-    make DESTDIR=C:/usr/local install
+    make install
 
 == Bugs
 
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 143ad947f0..8cdfc64b03 100755
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -6,70 +6,120 @@
 echo> ~tmp~.mak ####
 echo>> ~tmp~.mak conf = %0
 echo>> ~tmp~.mak $(conf:\=/): nul
-echo>> ~tmp~.mak 	@del ~tmp~.mak
+echo>> ~tmp~.mak 	@del ~setup~.mak
 echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \
+if exist pathlist.tmp del pathlist.tmp
+if exist confargs.mk del confargs.mk
 :loop
 if "%1" == "" goto :end
 if "%1" == "--prefix" goto :prefix
+if "%1" == "prefix" goto :prefix
 if "%1" == "--srcdir" goto :srcdir
 if "%1" == "srcdir" goto :srcdir
 if "%1" == "--target" goto :target
 if "%1" == "target" goto :target
 if "%1" == "--with-static-linked-ext" goto :extstatic
 if "%1" == "--program-suffix" goto :suffix
-if "%1" == "--program-name" goto :progname
+if "%1" == "RUBY_SUFFIX" goto :suffix
+if "%1" == "--program-name" goto :installname
+if "%1" == "--install-name" goto :installname
+if "%1" == "RUBY_INSTALL_NAME" goto :installname
+if "%1" == "--so-name" goto :soname
+if "%1" == "RUBY_SO_NAME" goto :soname
 if "%1" == "--enable-install-doc" goto :enable-rdoc
 if "%1" == "--disable-install-doc" goto :disable-rdoc
 if "%1" == "--extout" goto :extout
+if "%1" == "EXTOUT" goto :extout
+if "%1" == "--with-baseruby" goto :baseruby
+if "%1" == "BASERUBY" goto :baseruby
+if "%1" == "--path" goto :path
 if "%1" == "-h" goto :help
 if "%1" == "--help" goto :help
-  echo>> ~tmp~.mak 	"%1" \
+  echo>>confargs.tmp 	%1 \
   shift
 goto :loop
 :srcdir
-  echo>> ~tmp~.mak 	-D"srcdir=%2" \
+  echo>> ~tmp~.mak 	-Dsrcdir=%2 \
+  echo>>confargs.tmp 	--srcdir=%2 \
   shift
   shift
 goto :loop
 :prefix
-  echo>> ~tmp~.mak 	-D"prefix=%2" \
+  echo>> ~tmp~.mak 	-Dprefix=%2 \
+  echo>>confargs.tmp 	%1=%2 \
   shift
   shift
 goto :loop
 :suffix
-  echo>> ~tmp~.mak 	-D"RUBY_SUFFIX=%2" \
+  echo>>confargs.mk !ifndef RUBY_SUFFIX
+  echo>>confargs.mk RUBY_SUFFIX = %2
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1=%2 \
   shift
   shift
 goto :loop
 :installname
-  echo>> ~tmp~.mak 	-D"RUBY_INSTALL_NAME=%2" \
+  echo>>confargs.mk !ifndef RUBY_INSTALL_NAME
+  echo>>confargs.mk RUBY_INSTALL_NAME = %2
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1=%2 \
   shift
   shift
 goto :loop
 :soname
-  echo>> ~tmp~.mak 	-D"RUBY_SO_NAME=%2" \
+  echo>>confargs.mk !ifndef RUBY_SO_NAME
+  echo>>confargs.mk RUBY_SO_NAME = %2
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1=%2 \
   shift
   shift
 goto :loop
 :target
-  echo>> ~tmp~.mak 	"%2" \
+  echo>> ~tmp~.mak 	%2 \
+  echo>>confargs.tmp 	--target=%2 \
   shift
   shift
 goto :loop
 :extstatic
-  echo>> ~tmp~.mak 	-D"EXTSTATIC=static" \
+  echo>>confargs.mk !ifndef EXTSTATIC
+  echo>>confargs.mk EXTSTATIC = static
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1 \
   shift
 goto :loop
 :enable-rdoc
-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-doc" \
+  echo>>confargs.mk !ifndef RDOCTARGET
+  echo>>confargs.mk RDOCTARGET = install-doc
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1 \
   shift
 goto :loop
 :disable-rdoc
-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-nodoc" \
+  echo>>confargs.mk !ifndef RDOCTARGET
+  echo>>confargs.mk RDOCTARGET = install-nodoc
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1 \
   shift
 goto :loop
 :extout
-  echo>> ~tmp~.mak 	-D"EXTOUT=%2" \
+  echo>>confargs.mk !ifndef EXTOUT
+  echo>>confargs.mk EXTOUT = %2
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1=%2 \
+  shift
+  shift
+goto :loop
+:baseruby
+  echo>>confargs.mk !ifndef BASERUBY
+  echo>>confargs.mk BASERUBY = %2
+  echo>>confargs.mk !endif
+  echo>>confargs.tmp 	%1=%2 \
+  shift
+  shift
+goto :loop
+:path
+  echo>>pathlist.tmp %2;\
+  echo>>confargs.tmp 	%1=%2 \
   shift
   shift
 goto :loop
@@ -82,11 +132,32 @@ goto :loop
   echo System types:
   echo   --target=TARGET         configure for TARGET [i386-bccwin32]
   echo Optional Package:
+  echo   --with-baseruby=RUBY    use RUBY as baseruby [ruby]
   echo   --with-static-linked-ext link external modules statically
   echo   --enable-install-doc    install rdoc indexes during install
+  del *.tmp
   del ~tmp~.mak
 goto :exit
 :end
-echo>> ~tmp~.mak 	-Dbcc32dir="$(@D)"
-make -s -f ~tmp~.mak
+echo>> ~tmp~.mak 	-Dbcc32dir=$(@D)
+if not exist confargs.tmp goto :noconfargs
+    echo>>confargs.mk configure_args = \
+    type>>confargs.mk confargs.tmp
+    echo.>>confargs.mk
+    echo>>confargs.mk ####
+:noconfargs
+if not exist pathlist.tmp goto :nopathlist
+    echo>>confargs.mk pathlist = \
+    type>>confargs.mk pathlist.tmp
+    echo.>>confargs.mk
+    echo>>confargs.mk ####
+    echo>>confargs.mk PATH = $(pathlist:;=/bin;)$(PATH)
+    echo>>confargs.mk INCLUDE = $(pathlist:;=/include;)
+    echo>>confargs.mk LIB = $(pathlist:;=/lib;)
+:nopathlist
+if exist confargs.mk copy confargs.mk ~setup~.mak > nul
+type>>~setup~.mak ~tmp~.mak
+del *.tmp > nul
+del ~tmp~.mak > nul
+make -s -f ~setup~.mak
 :exit
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
index dc523e2541..888ab2e2a6 100755
--- a/bcc32/mkexports.rb
+++ b/bcc32/mkexports.rb
@@ -1,27 +1,26 @@
 #!./miniruby -s
 
-$name = $library = $description = nil
+$:.unshift(File.expand_path("../..", __FILE__))
+require 'win32/mkexports'
 
-SYM = {}
-STDIN.reopen(open("nul"))
-ARGV.each do |obj|
-  IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
-    next unless /(?:PUBDEF|PUBD32)/ =~ l
-    SYM[$1] = true if /'(.*?)'/ =~ l
+class Exports::Bcc < Exports
+  def forwarding(internal, export)
+    internal[/\A_?/]+export
   end
-end
 
-exports = []
-if $name
-  exports << "Name " + $name
-elsif $library
-  exports << "Library " + $library
-end
-exports << "Description " + $description.dump if $description
-exports << "EXPORTS" << SYM.keys.sort
+  def each_line(objs, &block)
+    objs.each do |obj|
+      opt = /\.(?:so|dll)\z/i =~ obj ? "-ee" : "-oiPUBDEF -oiPUBD32"
+      IO.foreach("|tdump -q #{opt} #{obj.tr('/', '\\')} < nul", &block)
+    end
+  end
 
-if $output
-  open($output, 'w') {|f| f.puts exports.join("\n")}
-else
-  puts exports.join("\n")
+  def each_export(objs)
+    objdump(objs) do |l|
+      next unless /(?:PUBDEF|PUBD32|EXPORT)/ =~ l
+      yield $1 if /'(.*?)'/ =~ l
+    end
+    yield "_strcasecmp", "_stricmp"
+    yield "_strncasecmp", "_strnicmp"
+  end
 end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index b7a2539d0a..e5b4ee8f44 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -15,7 +15,7 @@ prefix = /usr
 OS = bccwin32
 RT = $(OS)
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -30,7 +30,9 @@ i586-$(OS): -prologue- -i586- -epilogue-
 i686-$(OS): -prologue- -i686- -epilogue-
 alpha-$(OS): -prologue- -alpha- -epilogue-
 
--prologue-: nul
+-prologue-: -basic-vars- -version- -system-vars-
+
+-basic-vars-: nul
 	@echo Creating $(MAKEFILE)
 	@type > $(MAKEFILE) &&|
 \#\#\# Makefile for ruby $(OS) \#\#\#
@@ -40,36 +42,79 @@ $(BANG)endif
 $(BANG)ifndef prefix
 prefix = $(prefix:\=/)
 $(BANG)endif
-$(BANG)ifndef EXTSTATIC
-EXTSTATIC = $(EXTSTATIC)
-$(BANG)endif
-!if defined(RDOCTARGET)
-$(BANG)ifndef RDOCTARGET
-RDOCTARGET = $(RDOCTARGET)
-$(BANG)endif
+$(BANG)if !defined(BASERUBY)
+!if defined(BASERUBY)
+BASERUBY = $(BASERUBY)
+!endif
+|
+!if !defined(BASERUBY)
+	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
 !endif
-!if defined(EXTOUT)
-$(BANG)ifndef EXTOUT
-EXTOUT = $(EXTOUT)
+	@type >> $(MAKEFILE) &&|
 $(BANG)endif
+|
+!if exist(confargs.mk)
+	@type confargs.mk >> $(MAKEFILE)
+	@del confargs.mk
 !endif
+
+-system-vars-: -runtime- -bormm-
+
+-bormm-: nul
+	@-ilink32 -q -Gn -x usebormm.lib > nul
+	@-if exist usebormm.tds $(APPEND) MEMLIB = usebormm.lib
+	@if exist usebormm.* del usebormm.*
+
+-osname-: nul
+	@echo OS =  >>$(MAKEFILE)
+
+-runtime-: nul
+	type > conftest.c &&|
+\#include <stdio.h>
+int main(){printf("");return 0;}
 |
-	@type > usebormm.bat &&|
-@echo off
-ilink32 -Gn -x usebormm.lib > nul
-if exist usebormm.tds echo MEMLIB = usebormm.lib
+	bcc32 conftest.c cw32i.lib > nul
+	tdump conftest.exe < nul > conftest.i
+	grep "^Imports from CC" conftest.i > conftest.c
+	cpp32 -P- -DFile=\# -DImports=RTNAME -Dfrom== conftest.c > nul
+	$(MAKE) > nul -DBANG=$(BANG) -f &&|
+-runtime-: nul
+$(BANG)include conftest.i
+RT = $$(RTNAME:.DLL=)
+OS = $$(RT:CC32=)
+-runtime-:
+	del conftest.*
+$(BANG)if "$$(OS)" == "50"
+	echo OS = bccwin32 >> $(MAKEFILE)
+$(BANG)else
+	echo OS = bccwin32_$$(OS) >> $(MAKEFILE)
+$(BANG)endif
 |
-	@usebormm.bat >> $(MAKEFILE)
-	@del usebormm.*
+	@echo RT = $$(OS) >> $(MAKEFILE)
 
+-version-: nul
 	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
+\#define RUBY_REVISION 0
 \#include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
 TEENY = RUBY_VERSION_TEENY
+
+BORLANDC = __BORLANDC__
 |
-	@type $(MAKEFILE).i >> $(MAKEFILE)
+	@$(MAKE) > nul -DBANG=$(BANG) -f &&,
+-version-: nul
+$(BANG)include $(MAKEFILE)
+$(BANG)include $(MAKEFILE).i
+-version-:
 	@del $(MAKEFILE).i
+	@type >> $(MAKEFILE) &&|
+MAJOR = $$(MAJOR)
+MINOR = $$(MINOR)
+TEENY = $$(TEENY)
+BORLANDC = $$(BORLANDC)
+|
+,
 
 -generic-: nul
 !if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
@@ -84,7 +129,6 @@ $(BANG)ifndef PROCESSOR_LEVEL
 PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
 $(BANG)endif
 !endif
-
 |
 !endif
 
@@ -114,11 +158,14 @@ $(BANG)endif
 	@$(APPEND) PROCESSOR_LEVEL = 6
 	@$(APPEND) !endif
 
+-epilogue-: -encs-
+
+-encs-: nul
+	@$(MAKE) -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE)
+
 -epilogue-: nul
 	@type >> $(MAKEFILE) &&|
 
-\# OS = $(OS)
-\# RT = $(RT)
 \# RUBY_INSTALL_NAME = ruby
 \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
 \# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
@@ -129,5 +176,4 @@ $(BANG)endif
 \# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
 $(BANG)include $$(srcdir)/bcc32/Makefile.sub
 |
-	@$(srcdir:/=\)\win32\rm.bat config.h config.status
 	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/benchmark/bm_app_answer.rb b/benchmark/bm_app_answer.rb
new file mode 100644
index 0000000000..3cd8a8fd37
--- /dev/null
+++ b/benchmark/bm_app_answer.rb
@@ -0,0 +1,15 @@
+def ack(m, n)
+  if m == 0 then
+    n + 1
+  elsif n == 0 then
+    ack(m - 1, 1)
+  else
+    ack(m - 1, ack(m, n - 1))
+  end
+end
+
+def the_answer_to_life_the_universe_and_everything
+  (ack(3,7).to_s.split(//).inject(0){|s,x| s+x.to_i}.to_s + "2" ).to_i
+end
+
+answer = the_answer_to_life_the_universe_and_everything
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
new file mode 100644
index 0000000000..e58b7a34a1
--- /dev/null
+++ b/benchmark/bm_app_erb.rb
@@ -0,0 +1,26 @@
+#
+# Create many HTML strings with ERB.
+#
+
+require 'erb'
+
+data = DATA.read
+max = 5_000
+title = "hello world!"
+content = "hello world!\n" * 10
+
+max.times{
+  ERB.new(data).result(binding)
+}
+
+__END__
+
+<html>
+  <head> <%= title %> </head>
+  <body>
+    <h1> <%= title %> </h1>
+    <p>
+      <%= content %>
+    </p>
+  </body>
+</html>
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/bm_app_factorial.rb
new file mode 100644
index 0000000000..a5a5de0426
--- /dev/null
+++ b/benchmark/bm_app_factorial.rb
@@ -0,0 +1,11 @@
+def fact(n)
+  if(n > 1)
+    n * fact(n-1)
+  else
+    1
+  end
+end
+
+8.times{
+  fact(5000)
+}
+\ No newline at end of file
diff --git a/benchmark/bm_app_fib.rb b/benchmark/bm_app_fib.rb
new file mode 100644
index 0000000000..34a7b2e725
--- /dev/null
+++ b/benchmark/bm_app_fib.rb
@@ -0,0 +1,10 @@
+def fib n
+  if n < 3
+    1
+  else
+    fib(n-1) + fib(n-2)
+  end
+end
+
+fib(34)
+
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
new file mode 100644
index 0000000000..a0dcf5e874
--- /dev/null
+++ b/benchmark/bm_app_mandelbrot.rb
@@ -0,0 +1,23 @@
+require 'complex'
+
+def mandelbrot? z
+  i = 0
+  while i<100
+    i+=1
+    z = z * z
+    return false if z.abs > 2
+  end
+  true
+end
+
+ary = []
+
+(0..100).each{|dx|
+  (0..100).each{|dy|
+    x = dx / 50.0
+    y = dy / 50.0
+    c = Complex(x, y)
+    ary << c if mandelbrot?(c)
+  }
+}
+
diff --git a/benchmark/bm_app_pentomino.rb b/benchmark/bm_app_pentomino.rb
new file mode 100644
index 0000000000..59c63f358e
--- /dev/null
+++ b/benchmark/bm_app_pentomino.rb
@@ -0,0 +1,259 @@
+#!/usr/local/bin/ruby
+# This program is contributed by Shin Nishiyama
+
+
+# modified by K.Sasada
+
+NP = 5
+ROW = 8 + NP
+COL = 8
+
+$p = []
+$b = []
+$no = 0
+
+def piece(n, a, nb)
+  nb.each{|x|
+    a[n] = x
+    if n == NP-1
+      $p << [a.sort]
+    else
+      nbc=nb.dup
+      [-ROW, -1, 1, ROW].each{|d|
+        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
+          nbc << x+d
+        end
+      }
+      nbc.delete x
+      piece(n+1,a[0..n],nbc)
+    end
+  }
+end
+
+def kikaku(a)
+  a.collect {|x| x - a[0]}
+end
+def ud(a)
+  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
+end
+def rl(a)
+  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
+end
+def xy(a)
+  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
+end
+
+def mkpieces
+  piece(0,[],[0])
+  $p.each do |a|
+    a0 = a[0]
+    a[1] = ud(a0)
+    a[2] = rl(a0)
+    a[3] = ud(rl(a0))
+    a[4] = xy(a0)
+    a[5] = ud(xy(a0))
+    a[6] = rl(xy(a0))
+    a[7] = ud(rl(xy(a0)))
+    a.sort!
+    a.uniq!
+  end
+  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
+end
+
+def mkboard
+  (0...ROW*COL).each{|i|
+    if i % ROW >= ROW-NP
+      $b[i] = -2
+    else
+      $b[i] = -1
+    end
+    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
+  }
+end
+
+def pboard
+  return # skip print
+  print "No. #$no\n"
+  (0...COL).each{|i|
+    print "|"
+    (0...ROW-NP).each{|j|
+      x = $b[i*ROW+j]
+      if x < 0
+        print "..|"
+      else
+        printf "%2d|",x+1
+      end
+    }
+    print "\n"
+  }
+  print "\n"
+end
+
+$pnum=[]
+def setpiece(a,pos)
+  if a.length == $p.length then
+    $no += 1
+    pboard
+    return
+  end
+  while $b[pos] != -1
+    pos += 1
+  end
+  ($pnum - a).each do |i|
+    $p[i].each do |x|
+      f = 0
+      x.each{|s|
+        if $b[pos+s] != -1
+          f=1
+          break
+        end
+      }
+      if f == 0 then
+        x.each{|s|
+          $b[pos+s] = i
+        }
+        a << i
+        setpiece(a.dup, pos)
+        a.pop
+        x.each{|s|
+          $b[pos+s] = -1
+        }
+      end
+    end
+  end
+end
+
+mkpieces
+mkboard
+$p[4] = [$p[4][0]]
+$pnum = (0...$p.length).to_a
+setpiece([],0)
+
+
+__END__
+
+# original
+
+NP = 5
+ROW = 8 + NP
+COL = 8
+
+$p = []
+$b = []
+$no = 0
+
+def piece(n,a,nb)
+  for x in nb
+    a[n] = x
+    if n == NP-1
+      $p << [a.sort]
+    else
+      nbc=nb.dup
+      for d in [-ROW, -1, 1, ROW]
+        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
+          nbc << x+d
+        end
+      end
+      nbc.delete x
+      piece(n+1,a[0..n],nbc)
+    end
+  end
+end
+
+def kikaku(a)
+  a.collect {|x| x - a[0]}
+end
+def ud(a)
+  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
+end
+def rl(a)
+  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
+end
+def xy(a)
+  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
+end
+
+def mkpieces
+  piece(0,[],[0])
+  $p.each do |a|
+    a0 = a[0]
+    a[1] = ud(a0)
+    a[2] = rl(a0)
+    a[3] = ud(rl(a0))
+    a[4] = xy(a0)
+    a[5] = ud(xy(a0))
+    a[6] = rl(xy(a0))
+    a[7] = ud(rl(xy(a0)))
+    a.sort!
+    a.uniq!
+  end
+  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
+end
+
+def mkboard
+  for i in 0...ROW*COL
+    if i % ROW >= ROW-NP
+      $b[i] = -2
+    else
+      $b[i] = -1
+    end
+    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
+  end
+end
+
+def pboard
+  print "No. #$no\n"
+  for i in 0...COL
+    print "|"
+    for j in 0...ROW-NP
+      x = $b[i*ROW+j]
+      if x < 0
+        print "..|"
+      else
+        printf "%2d|",x+1
+      end
+    end
+    print "\n"
+  end
+  print "\n"
+end
+
+$pnum=[]
+def setpiece(a,pos)
+  if a.length == $p.length then
+    $no += 1
+    pboard
+    return
+  end
+  while $b[pos] != -1
+    pos += 1
+  end
+  ($pnum - a).each do |i|
+    $p[i].each do |x|
+      f = 0
+      for s in x do
+        if $b[pos+s] != -1
+          f=1
+          break
+        end
+      end
+      if f == 0 then
+        for s in x do
+          $b[pos+s] = i
+        end
+        a << i
+        setpiece(a.dup, pos)
+        a.pop
+        for s in x do
+          $b[pos+s] = -1
+        end
+      end
+    end
+  end
+end
+
+mkpieces
+mkboard
+$p[4] = [$p[4][0]]
+$pnum = (0...$p.length).to_a
+setpiece([],0)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb
new file mode 100644
index 0000000000..01d2ae3219
--- /dev/null
+++ b/benchmark/bm_app_raise.rb
@@ -0,0 +1,8 @@
+i=0
+while i<300000
+  i+=1
+  begin
+    raise
+  rescue
+  end
+end
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb
new file mode 100644
index 0000000000..c6ef817263
--- /dev/null
+++ b/benchmark/bm_app_strconcat.rb
@@ -0,0 +1,5 @@
+i=0
+while i<500000
+  "#{1+1} #{1+1} #{1+1}"
+  i+=1
+end
diff --git a/benchmark/bm_app_tak.rb b/benchmark/bm_app_tak.rb
new file mode 100644
index 0000000000..efe5380f4e
--- /dev/null
+++ b/benchmark/bm_app_tak.rb
@@ -0,0 +1,13 @@
+
+def tak x, y, z
+  unless y < x
+    z
+  else
+    tak( tak(x-1, y, z),
+         tak(y-1, z, x),
+         tak(z-1, x, y))
+  end
+end
+
+tak(18, 9, 0)
+
diff --git a/benchmark/bm_app_tarai.rb b/benchmark/bm_app_tarai.rb
new file mode 100644
index 0000000000..4c146f5ccf
--- /dev/null
+++ b/benchmark/bm_app_tarai.rb
@@ -0,0 +1,10 @@
+def tarai( x, y, z )
+  if x <= y
+  then y
+  else tarai(tarai(x-1, y, z),
+             tarai(y-1, z, x),
+             tarai(z-1, x, y))
+  end
+end
+
+tarai(12, 6, 0)
diff --git a/benchmark/bm_app_uri.rb b/benchmark/bm_app_uri.rb
new file mode 100644
index 0000000000..586edfd5dc
--- /dev/null
+++ b/benchmark/bm_app_uri.rb
@@ -0,0 +1,8 @@
+require 'uri'
+
+100_000.times{
+  uri = URI.parse('http://www.ruby-lang.org')
+  uri.scheme
+  uri.host
+  uri.port
+}
diff --git a/benchmark/bm_io_file_create.rb b/benchmark/bm_io_file_create.rb
new file mode 100644
index 0000000000..7adbe9ea5e
--- /dev/null
+++ b/benchmark/bm_io_file_create.rb
@@ -0,0 +1,13 @@
+#
+# Create files
+#
+
+max = 50_000
+file = './tmpfile_of_bm_io_file_create'
+
+max.times{
+  f = open(file, 'w')
+  f.close#(true)
+}
+File.unlink(file)
+
diff --git a/benchmark/bm_io_file_read.rb b/benchmark/bm_io_file_read.rb
new file mode 100644
index 0000000000..2b4212db76
--- /dev/null
+++ b/benchmark/bm_io_file_read.rb
@@ -0,0 +1,15 @@
+#
+# Seek and Read file.
+#
+
+require 'tempfile'
+
+max = 20_000
+str = "Hello world!  " * 1000
+f = Tempfile.new('yarv-benchmark')
+f.write str
+
+max.times{
+  f.seek 0
+  f.read
+}
diff --git a/benchmark/bm_io_file_write.rb b/benchmark/bm_io_file_write.rb
new file mode 100644
index 0000000000..3cec58c6ae
--- /dev/null
+++ b/benchmark/bm_io_file_write.rb
@@ -0,0 +1,14 @@
+#
+# Seek and Write file.
+#
+
+require 'tempfile'
+
+max = 20_000
+str = "Hello world!  " * 1000
+f = Tempfile.new('yarv-benchmark')
+
+max.times{
+  f.seek 0
+  f.write str
+}
diff --git a/benchmark/bm_loop_for.rb b/benchmark/bm_loop_for.rb
new file mode 100644
index 0000000000..0fc4cc1511
--- /dev/null
+++ b/benchmark/bm_loop_for.rb
@@ -0,0 +1,3 @@
+for i in 1..30_000_000
+  #
+end
diff --git a/benchmark/bm_loop_generator.rb b/benchmark/bm_loop_generator.rb
new file mode 100644
index 0000000000..d3375c744c
--- /dev/null
+++ b/benchmark/bm_loop_generator.rb
@@ -0,0 +1,14 @@
+max = 600000
+
+if defined? Fiber
+  gen = (1..max).each
+  loop do
+    gen.next
+  end
+else
+  require 'generator'
+  gen = Generator.new((0..max))
+  while gen.next?
+    gen.next
+  end
+end
diff --git a/benchmark/bm_loop_times.rb b/benchmark/bm_loop_times.rb
new file mode 100644
index 0000000000..521f72ad1a
--- /dev/null
+++ b/benchmark/bm_loop_times.rb
@@ -0,0 +1 @@
+30_000_000.times{|e|}
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
new file mode 100644
index 0000000000..43d35e1131
--- /dev/null
+++ b/benchmark/bm_loop_whileloop.rb
@@ -0,0 +1,4 @@
+i=0
+while i<30_000_000 # benchmark loop 1
+  i+=1
+end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
new file mode 100644
index 0000000000..e514989661
--- /dev/null
+++ b/benchmark/bm_loop_whileloop2.rb
@@ -0,0 +1,4 @@
+i=0
+while i< 6_000_000 # benchmark loop 2
+  i+=1
+end
diff --git a/benchmark/bm_so_ackermann.rb b/benchmark/bm_so_ackermann.rb
new file mode 100644
index 0000000000..7db5be9050
--- /dev/null
+++ b/benchmark/bm_so_ackermann.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: ackermann-ruby.code,v 1.4 2004/11/13 07:40:41 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+def ack(m, n)
+    if m == 0 then
+        n + 1
+    elsif n == 0 then
+        ack(m - 1, 1)
+    else
+        ack(m - 1, ack(m, n - 1))
+    end
+end
+
+NUM = 9
+ack(3, NUM)
+
+
diff --git a/benchmark/bm_so_array.rb b/benchmark/bm_so_array.rb
new file mode 100644
index 0000000000..2b8fce8f99
--- /dev/null
+++ b/benchmark/bm_so_array.rb
@@ -0,0 +1,23 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: ary-ruby.code,v 1.4 2004/11/13 07:41:27 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Paul Brannan and Mark Hubbart
+
+n = 9000 # Integer(ARGV.shift || 1)
+
+x = Array.new(n)
+y = Array.new(n, 0)
+
+n.times{|bi|
+  x[bi] = bi + 1
+}
+
+(0 .. 999).each do |e|
+  (n-1).step(0,-1) do |bi|
+    y[bi] += x.at(bi)
+  end
+end
+# puts "#{y.first} #{y.last}"
+
+
diff --git a/benchmark/bm_so_binary_trees.rb b/benchmark/bm_so_binary_trees.rb
new file mode 100644
index 0000000000..6a26465578
--- /dev/null
+++ b/benchmark/bm_so_binary_trees.rb
@@ -0,0 +1,57 @@
+# The Computer Language Shootout Benchmarks
+# http://shootout.alioth.debian.org
+#
+# contributed by Jesse Millikan
+
+# disable output
+def STDOUT.write_ *args
+end
+
+def item_check(tree)
+ if tree[0] == nil
+  tree[1]
+ else
+  tree[1] + item_check(tree[0]) - item_check(tree[2])
+ end
+end
+
+def bottom_up_tree(item, depth)
+ if depth > 0
+  item_item = 2 * item
+  depth -= 1
+  [bottom_up_tree(item_item - 1, depth), item, bottom_up_tree(item_item, depth)]
+ else
+  [nil, item, nil]
+ end
+end
+
+max_depth = 12 # 16 # ARGV[0].to_i
+min_depth = 4
+
+max_depth = min_depth + 2 if min_depth + 2 > max_depth
+
+stretch_depth = max_depth + 1
+stretch_tree = bottom_up_tree(0, stretch_depth)
+
+puts "stretch tree of depth #{stretch_depth}\t check: #{item_check(stretch_tree)}"
+stretch_tree = nil
+
+long_lived_tree = bottom_up_tree(0, max_depth)
+
+min_depth.step(max_depth + 1, 2) do |depth|
+ iterations = 2**(max_depth - depth + min_depth)
+
+ check = 0
+
+ for i in 1..iterations
+  temp_tree = bottom_up_tree(i, depth)
+  check += item_check(temp_tree)
+
+  temp_tree = bottom_up_tree(-i, depth)
+  check += item_check(temp_tree)
+ end
+
+ puts "#{iterations * 2}\t trees of depth #{depth}\t check: #{check}"
+end
+
+puts "long lived tree of depth #{max_depth}\t check: #{item_check(long_lived_tree)}"
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb
new file mode 100644
index 0000000000..82629688b7
--- /dev/null
+++ b/benchmark/bm_so_concatenate.rb
@@ -0,0 +1,18 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: strcat-ruby.code,v 1.4 2004/11/13 07:43:28 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
+
+STUFF = "hello\n"
+i=0
+while i<10
+  i+=1
+  hello = ''
+  400000.times do |e|
+    hello << STUFF
+  end
+end
+# puts hello.length
+
+
diff --git a/benchmark/bm_so_count_words.rb b/benchmark/bm_so_count_words.rb
new file mode 100644
index 0000000000..65f6337a4a
--- /dev/null
+++ b/benchmark/bm_so_count_words.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Paul Brannan
+
+input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
+
+nl = nw = nc = 0
+while true
+  tmp = input.read(4096) or break
+  data = tmp << (input.gets || "")
+  nc += data.length
+  nl += data.count("\n")
+  ((data.strip! || data).tr!("\n", " ") || data).squeeze!
+  nw += data.count(" ") + 1
+end
+# STDERR.puts "#{nl} #{nw} #{nc}"
+
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb
new file mode 100644
index 0000000000..d8b461290c
--- /dev/null
+++ b/benchmark/bm_so_exception.rb
@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: except-ruby.code,v 1.4 2004/11/13 07:41:33 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+$HI = 0
+$LO = 0
+NUM = 250000 # Integer(ARGV[0] || 1)
+
+
+class Lo_Exception < Exception
+  def initialize(num)
+    @value = num
+  end
+end
+
+class Hi_Exception < Exception
+  def initialize(num)
+    @value = num
+  end
+end
+
+def some_function(num)
+  begin
+    hi_function(num)
+  rescue
+    print "We shouldn't get here, exception is: #{$!.type}\n"
+  end
+end
+
+def hi_function(num)
+  begin
+    lo_function(num)
+  rescue Hi_Exception
+    $HI = $HI + 1
+  end
+end
+
+def lo_function(num)
+  begin
+    blowup(num)
+  rescue Lo_Exception
+    $LO = $LO + 1
+  end
+end
+
+def blowup(num)
+  if num % 2 == 0
+    raise Lo_Exception.new(num)
+  else
+    raise Hi_Exception.new(num)
+  end
+end
+
+
+i = 1
+max = NUM+1
+while i < max
+  i+=1
+  some_function(i+1)
+end
diff --git a/benchmark/bm_so_fannkuch.rb b/benchmark/bm_so_fannkuch.rb
new file mode 100644
index 0000000000..a214f2e205
--- /dev/null
+++ b/benchmark/bm_so_fannkuch.rb
@@ -0,0 +1,45 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+# Contributed by Sokolov Yura
+# Modified by Ryan Williams
+
+def fannkuch(n)
+   maxFlips, m, r, check = 0, n-1, n, 0
+   count = (1..n).to_a
+   perm = (1..n).to_a
+
+   while true
+      if check < 30
+         puts "#{perm}"
+         check += 1
+      end
+
+      while r != 1
+         count[r-1] = r
+         r -= 1
+      end
+
+      if perm[0] != 1 and perm[m] != n
+         perml = perm.clone #.dup
+         flips = 0
+         while (k = perml.first ) != 1
+            perml = perml.slice!(0, k).reverse + perml
+            flips += 1
+         end
+         maxFlips = flips if flips > maxFlips
+      end
+      while true
+         if r==n then return maxFlips end
+         perm.insert r,perm.shift
+         break if (count[r] -= 1) > 0
+         r += 1
+      end
+   end
+end
+
+def puts *args
+end
+
+N = 10 # (ARGV[0] || 1).to_i
+puts "Pfannkuchen(#{N}) = #{fannkuch(N)}"
+
diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb
new file mode 100644
index 0000000000..3f759ba7ae
--- /dev/null
+++ b/benchmark/bm_so_fasta.rb
@@ -0,0 +1,81 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+# Contributed by Sokolov Yura
+
+$last = 42.0
+def gen_random (max,im=139968,ia=3877,ic=29573)
+    (max * ($last = ($last * ia + ic) % im)) / im
+end
+
+alu =
+   "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
+   "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
+   "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
+   "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
+   "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
+   "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
+   "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
+
+iub = [
+    ["a", 0.27],
+    ["c", 0.12],
+    ["g", 0.12],
+    ["t", 0.27],
+
+    ["B", 0.02],
+    ["D", 0.02],
+    ["H", 0.02],
+    ["K", 0.02],
+    ["M", 0.02],
+    ["N", 0.02],
+    ["R", 0.02],
+    ["S", 0.02],
+    ["V", 0.02],
+    ["W", 0.02],
+    ["Y", 0.02],
+]
+homosapiens = [
+    ["a", 0.3029549426680],
+    ["c", 0.1979883004921],
+    ["g", 0.1975473066391],
+    ["t", 0.3015094502008],
+]
+
+def make_repeat_fasta(id, desc, src, n)
+    puts ">#{id} #{desc}"
+    v = nil
+    width = 60
+    l = src.length
+    s = src * ((n / l) + 1)
+    s.slice!(n, l)
+    puts(s.scan(/.{1,#{width}}/).join("\n"))
+end
+
+def make_random_fasta(id, desc, table, n)
+    puts ">#{id} #{desc}"
+    rand, v = nil,nil
+    width = 60
+    chunk = 1 * width
+    prob = 0.0
+    table.each{|v| v[1]= (prob += v[1])}
+    for i in 1..(n/width)
+        puts((1..width).collect{
+            rand = gen_random(1.0)
+            table.find{|v| v[1]>rand}[0]
+        }.join)
+    end
+    if n%width != 0
+        puts((1..(n%width)).collect{
+            rand = gen_random(1.0)
+            table.find{|v| v[1]>rand}[0]
+        }.join)
+    end
+end
+
+
+n = (ARGV[0] or 250_000).to_i
+
+make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
+make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
+make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
+
diff --git a/benchmark/bm_so_k_nucleotide.rb b/benchmark/bm_so_k_nucleotide.rb
new file mode 100644
index 0000000000..dadab3e79c
--- /dev/null
+++ b/benchmark/bm_so_k_nucleotide.rb
@@ -0,0 +1,48 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org
+#
+# contributed by jose fco. gonzalez
+# modified by Sokolov Yura
+
+seq = String.new
+
+def frecuency( seq,length )
+    n, table = seq.length - length + 1, Hash.new(0)
+    f, i = nil, nil
+    (0 ... length).each do |f|
+        (f ... n).step(length) do |i|
+            table[seq[i,length]] += 1
+        end
+    end
+    [n,table]
+
+end
+
+def sort_by_freq( seq,length )
+    n,table = frecuency( seq,length )
+    a, b, v = nil, nil, nil
+    table.sort{|a,b| b[1] <=> a[1]}.each do |v|
+        puts "%s %.3f" % [v[0].upcase,((v[1]*100).to_f/n)]
+    end
+    puts
+end
+
+def find_seq( seq,s )
+    n,table = frecuency( seq,s.length )
+    puts "#{table[s].to_s}\t#{s.upcase}"
+end
+
+input = open(File.join(File.dirname($0), 'fasta.output.100000'), 'rb')
+
+line = input.gets while line !~ /^>THREE/
+line = input.gets
+
+while (line !~ /^>/) & line do
+    seq << line.chomp
+    line = input.gets
+end
+
+[1,2].each {|i| sort_by_freq( seq,i ) }
+
+%w(ggt ggta ggtatt ggtattttaatt ggtattttaatttatagt).each{|s| find_seq( seq,s) }
+
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb
new file mode 100644
index 0000000000..3652288881
--- /dev/null
+++ b/benchmark/bm_so_lists.rb
@@ -0,0 +1,47 @@
+#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
+
+NUM = 100
+SIZE = 10000
+
+def test_lists()
+  # create a list of integers (Li1) from 1 to SIZE
+  li1 = (1..SIZE).to_a
+  # copy the list to li2 (not by individual items)
+  li2 = li1.dup
+  # remove each individual item from left side of li2 and
+  # append to right side of li3 (preserving order)
+  li3 = Array.new
+  while (not li2.empty?)
+    li3.push(li2.shift)
+  end
+  # li2 must now be empty
+  # remove each individual item from right side of li3 and
+  # append to right side of li2 (reversing list)
+  while (not li3.empty?)
+    li2.push(li3.pop)
+  end
+  # li3 must now be empty
+  # reverse li1 in place
+  li1.reverse!
+  # check that first item is now SIZE
+  if li1[0] != SIZE then
+    p "not SIZE"
+    0
+  else
+    # compare li1 and li2 for equality
+    if li1 != li2 then
+      return(0)
+    else
+      # return the length of the list
+      li1.length
+    end
+  end
+end
+
+i = 0
+while i<NUM
+  i+=1
+  result = test_lists()
+end
+
+result
diff --git a/benchmark/bm_so_mandelbrot.rb b/benchmark/bm_so_mandelbrot.rb
new file mode 100644
index 0000000000..76331c64b8
--- /dev/null
+++ b/benchmark/bm_so_mandelbrot.rb
@@ -0,0 +1,57 @@
+#  The Computer Language Benchmarks Game
+#  http://shootout.alioth.debian.org/
+#
+#  contributed by Karl von Laudermann
+#  modified by Jeremy Echols
+
+size = 600 # ARGV[0].to_i
+
+puts "P4\n#{size} #{size}"
+
+ITER = 49                           # Iterations - 1 for easy for..in looping
+LIMIT_SQUARED = 4.0                 # Presquared limit
+
+byte_acc = 0
+bit_num = 0
+
+count_size = size - 1               # Precomputed size for easy for..in looping
+
+# For..in loops are faster than .upto, .downto, .times, etc.
+for y in 0..count_size
+  for x in 0..count_size
+    zr = 0.0
+    zi = 0.0
+    cr = (2.0*x/size)-1.5
+    ci = (2.0*y/size)-1.0
+    escape = false
+
+    # To make use of the for..in code, we use a dummy variable,
+    # like one would in C
+    for dummy in 0..ITER
+      tr = zr*zr - zi*zi + cr
+      ti = 2*zr*zi + ci
+      zr, zi = tr, ti
+
+      if (zr*zr+zi*zi) > LIMIT_SQUARED
+        escape = true
+        break
+      end
+    end
+
+    byte_acc = (byte_acc << 1) | (escape ? 0b0 : 0b1)
+    bit_num += 1
+
+    # Code is very similar for these cases, but using separate blocks
+    # ensures we skip the shifting when it's unnecessary, which is most cases.
+    if (bit_num == 8)
+      print byte_acc.chr
+      byte_acc = 0
+      bit_num = 0
+    elsif (x == count_size)
+      byte_acc <<= (8 - bit_num)
+      print byte_acc.chr
+      byte_acc = 0
+      bit_num = 0
+    end
+  end
+end
diff --git a/benchmark/bm_so_matrix.rb b/benchmark/bm_so_matrix.rb
new file mode 100644
index 0000000000..0f274ad06c
--- /dev/null
+++ b/benchmark/bm_so_matrix.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: matrix-ruby.code,v 1.4 2004/11/13 07:42:14 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+n = 60 #Integer(ARGV.shift || 1)
+
+size = 30
+
+def mkmatrix(rows, cols)
+    count = 1
+    mx = Array.new(rows)
+    (0 .. (rows - 1)).each do |bi|
+        row = Array.new(cols, 0)
+        (0 .. (cols - 1)).each do |j|
+            row[j] = count
+            count += 1
+        end
+        mx[bi] = row
+    end
+    mx
+end
+
+def mmult(rows, cols, m1, m2)
+    m3 = Array.new(rows)
+    (0 .. (rows - 1)).each do |bi|
+        row = Array.new(cols, 0)
+        (0 .. (cols - 1)).each do |j|
+            val = 0
+            (0 .. (cols - 1)).each do |k|
+                val += m1.at(bi).at(k) * m2.at(k).at(j)
+            end
+            row[j] = val
+        end
+        m3[bi] = row
+    end
+    m3
+end
+
+m1 = mkmatrix(size, size)
+m2 = mkmatrix(size, size)
+mm = Array.new
+n.times do
+    mm = mmult(size, size, m1, m2)
+end
+# puts "#{mm[0][0]} #{mm[2][3]} #{mm[3][2]} #{mm[4][4]}"
+
+
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
new file mode 100644
index 0000000000..99cf6a91cc
--- /dev/null
+++ b/benchmark/bm_so_meteor_contest.rb
@@ -0,0 +1,564 @@
+#!/usr/bin/env ruby
+#
+# The Computer Language Shootout
+#   http://shootout.alioth.debian.org
+#   contributed by Kevin Barnes (Ruby novice)
+
+# PROGRAM:  the main body is at the bottom.
+#   1) read about the problem here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
+#   2) see how I represent a board as a bitmask by reading the blank_board comments
+#   3) read as your mental paths take you
+
+def print *args
+end
+
+# class to represent all information about a particular rotation of a particular piece
+class Rotation
+  # an array (by location) containing a bit mask for how the piece maps at the given location.
+  # if the rotation is invalid at that location the mask will contain false
+  attr_reader :start_masks
+
+  # maps a direction to a relative location.  these differ depending on whether it is an even or
+  # odd row being mapped from
+  @@rotation_even_adder = { :west => -1, :east => 1, :nw => -7, :ne => -6, :sw => 5, :se => 6 }
+  @@rotation_odd_adder = { :west => -1, :east => 1, :nw => -6, :ne => -5, :sw => 6, :se => 7 }
+
+  def initialize( directions )
+    @even_offsets, @odd_offsets = normalize_offsets( get_values( directions ))
+
+    @even_mask = mask_for_offsets( @even_offsets)
+    @odd_mask = mask_for_offsets( @odd_offsets)
+
+    @start_masks = Array.new(60)
+
+    # create the rotational masks by placing the base mask at the location and seeing if
+    # 1) it overlaps the boundries and 2) it produces a prunable board.  if either of these
+    # is true the piece cannot be placed
+    0.upto(59) do | offset |
+      mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
+      if (blank_board & mask == 0 && !prunable(blank_board | mask, 0, true)) then
+        imask = compute_required( mask, offset)
+        @start_masks[offset] = [ mask, imask, imask | mask ]
+      else
+        @start_masks[offset] = false
+      end
+    end
+  end
+
+  def compute_required( mask, offset )
+    board = blank_board
+    0.upto(offset) { | i | board |= 1 << i }
+    board |= mask
+    return 0 if (!prunable(board | mask, offset))
+    board = flood_fill(board,58)
+    count = 0
+    imask = 0
+    0.upto(59) do | i |
+      if (board[i] == 0) then
+        imask |= (1 << i)
+        count += 1
+      end
+    end
+    (count > 0 && count < 5) ? imask : 0
+  end
+
+  def flood_fill( board, location)
+    return board if (board[location] == 1)
+    board |= 1 << location
+    row, col = location.divmod(6)
+    board = flood_fill( board, location - 1) if (col > 0)
+    board = flood_fill( board, location + 1) if (col < 4)
+    if (row % 2 == 0) then
+      board = flood_fill( board, location - 7) if (col > 0 && row > 0)
+      board = flood_fill( board, location - 6) if (row > 0)
+      board = flood_fill( board, location + 6) if (row < 9)
+      board = flood_fill( board, location + 5) if (col > 0 && row < 9)
+    else
+      board = flood_fill( board, location - 5) if (col < 4 && row > 0)
+      board = flood_fill( board, location - 6) if (row > 0)
+      board = flood_fill( board, location + 6) if (row < 9)
+      board = flood_fill( board, location + 7) if (col < 4 && row < 9)
+    end
+    board
+  end
+
+  # given a location, produces a list of relative locations covered by the piece at this rotation
+  def offsets( location)
+    if is_even( location) then
+      @even_offsets.collect { | value | value + location }
+    else
+      @odd_offsets.collect { | value | value + location }
+    end
+  end
+
+  # returns a set of offsets relative to the top-left most piece of the rotation (by even or odd rows)
+  # this is hard to explain. imagine we have this partial board:
+  #   0 0 0 0 0 x        [positions 0-5]
+  #    0 0 1 1 0 x       [positions 6-11]
+  #   0 0 1 0 0 x        [positions 12-17]
+  #    0 1 0 0 0 x       [positions 18-23]
+  #   0 1 0 0 0 x        [positions 24-29]
+  #    0 0 0 0 0 x       [positions 30-35]
+  #       ...
+  # The top-left of the piece is at position 8, the
+  # board would be passed as a set of positions (values array) containing [8,9,14,19,25] not necessarily in that
+  # sorted order.  Since that array starts on an odd row, the offsets for an odd row are: [0,1,6,11,17] obtained
+  # by subtracting 8 from everything.  Now imagine the piece shifted up and to the right so it's on an even row:
+  #   0 0 0 1 1 x        [positions 0-5]
+  #    0 0 1 0 0 x       [positions 6-11]
+  #   0 0 1 0 0 x        [positions 12-17]
+  #    0 1 0 0 0 x       [positions 18-23]
+  #   0 0 0 0 0 x        [positions 24-29]
+  #    0 0 0 0 0 x       [positions 30-35]
+  #       ...
+  # Now the positions are [3,4,8,14,19] which after subtracting the lowest value (3) gives [0,1,5,11,16] thus, the
+  # offsets for this particular piece are (in even, odd order) [0,1,5,11,16],[0,1,6,11,17] which is what
+  # this function would return
+  def normalize_offsets( values)
+    min = values.min
+    even_min = is_even(min)
+    other_min = even_min ? min + 6 : min + 7
+    other_values = values.collect do | value |
+      if is_even(value) then
+        value + 6 - other_min
+      else
+        value + 7 - other_min
+      end
+    end
+    values.collect! { | value | value - min }
+
+    if even_min then
+      [values, other_values]
+    else
+      [other_values, values]
+    end
+  end
+
+  # produce a bitmask representation of an array of offset locations
+  def mask_for_offsets( offsets )
+    mask = 0
+    offsets.each { | value | mask = mask + ( 1 << value ) }
+    mask
+  end
+
+  # finds a "safe" position that a position as described by a list of directions can be placed
+  # without falling off any edge of the board.  the values returned a location to place the first piece
+  # at so it will fit after making the described moves
+  def start_adjust( directions )
+    south = east = 0;
+    directions.each do | direction |
+      east += 1 if ( direction == :sw || direction == :nw || direction == :west )
+      south += 1 if ( direction == :nw || direction == :ne )
+    end
+    south * 6 + east
+  end
+
+  # given a set of directions places the piece (as defined by a set of directions) on the board at
+  # a location that will not take it off the edge
+  def get_values ( directions )
+    start = start_adjust(directions)
+    values = [ start ]
+    directions.each do | direction |
+      if (start % 12 >= 6) then
+        start += @@rotation_odd_adder[direction]
+      else
+        start += @@rotation_even_adder[direction]
+      end
+      values += [ start ]
+    end
+
+    # some moves take you back to an existing location, we'll strip duplicates
+    values.uniq
+  end
+end
+
+# describes a piece and caches information about its rotations to as to be efficient for iteration
+# ATTRIBUTES:
+#   rotations -- all the rotations of the piece
+#   type -- a numeic "name" of the piece
+#   masks -- an array by location of all legal rotational masks (a n inner array) for that location
+#   placed -- the mask that this piece was last placed at (not a location, but the actual mask used)
+class Piece
+  attr_reader :rotations, :type, :masks
+  attr_accessor :placed
+
+  # transform hashes that change one direction into another when you either flip or rotate a set of directions
+  @@flip_converter = { :west => :west, :east => :east, :nw => :sw, :ne => :se, :sw => :nw, :se => :ne }
+  @@rotate_converter = { :west => :nw, :east => :se, :nw => :ne, :ne => :east, :sw => :west, :se => :sw }
+
+  def initialize( directions, type )
+    @type = type
+    @rotations = Array.new();
+    @map = {}
+
+    generate_rotations( directions )
+    directions.collect! { | value | @@flip_converter[value] }
+    generate_rotations( directions )
+
+    # creates the masks AND a map that returns [location, rotation] for any given mask
+    # this is used when a board is found and we want to draw it, otherwise the map is unused
+    @masks = Array.new();
+    0.upto(59) do | i |
+      even = true
+      @masks[i] = @rotations.collect do | rotation |
+        mask = rotation.start_masks[i]
+        @map[mask[0]] = [ i, rotation ] if (mask)
+        mask || nil
+      end
+      @masks[i].compact!
+    end
+  end
+
+  # rotates a set of directions through all six angles and adds a Rotation to the list for each one
+  def generate_rotations( directions )
+    6.times do
+      rotations.push( Rotation.new(directions))
+      directions.collect! { | value | @@rotate_converter[value] }
+    end
+  end
+
+  # given a board string, adds this piece to the board at whatever location/rotation
+  # important: the outbound board string is 5 wide, the normal location notation is six wide (padded)
+  def fill_string( board_string)
+    location, rotation = @map[@placed]
+    rotation.offsets(location).each do | offset |
+      row, col = offset.divmod(6)
+      board_string[ row*5 + col, 1 ] = @type.to_s
+    end
+  end
+end
+
+# a blank bit board having this form:
+#
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    1 1 1 1 1 1
+#
+# where left lest significant bit is the top left and the most significant is the lower right
+# the actual board only consists of the 0 places, the 1 places are blockers to keep things from running
+# off the edges or bottom
+def blank_board
+  0b111111100000100000100000100000100000100000100000100000100000100000
+end
+
+def full_board
+  0b111111111111111111111111111111111111111111111111111111111111111111
+end
+
+# determines if a location (bit position) is in an even row
+def is_even( location)
+  (location % 12) < 6
+end
+
+# support function that create three utility maps:
+#  $converter -- for each row an array that maps a five bit row (via array mapping)
+#                to the a a five bit representation of the bits below it
+#  $bit_count -- maps a five bit row (via array mapping) to the number of 1s in the row
+#  @@new_regions -- maps a five bit row (via array mapping) to an array of "region" arrays
+#                   a region array has three values the first is a mask of bits in the region,
+#                   the second is the count of those bits and the third is identical to the first
+#                   examples:
+#                           0b10010 => [ 0b01100, 2, 0b01100 ], [ 0b00001, 1, 0b00001]
+#                           0b01010 => [ 0b10000, 1, 0b10000 ], [ 0b00100, 1, 0b00100 ], [ 0b00001, 1, 0b00001]
+#                           0b10001 => [ 0b01110, 3, 0b01110 ]
+def create_collector_support
+  odd_map = [0b11, 0b110, 0b1100, 0b11000, 0b10000]
+  even_map = [0b1, 0b11, 0b110, 0b1100, 0b11000]
+
+  all_odds = Array.new(0b100000)
+  all_evens = Array.new(0b100000)
+  bit_counts = Array.new(0b100000)
+  new_regions = Array.new(0b100000)
+  0.upto(0b11111) do | i |
+    bit_count = odd = even = 0
+    0.upto(4) do | bit |
+      if (i[bit] == 1) then
+        bit_count += 1
+        odd |= odd_map[bit]
+        even |= even_map[bit]
+      end
+    end
+    all_odds[i] = odd
+    all_evens[i] = even
+    bit_counts[i] = bit_count
+    new_regions[i] = create_regions( i)
+  end
+
+  $converter = []
+  10.times { | row | $converter.push((row % 2 == 0) ? all_evens : all_odds) }
+  $bit_counts = bit_counts
+  $regions = new_regions.collect { | set | set.collect { | value | [ value, bit_counts[value], value] } }
+end
+
+# determines if a board is punable, meaning that there is no possibility that it
+# can be filled up with pieces.  A board is prunable if there is a grouping of unfilled spaces
+# that are not a multiple of five.  The following board is an example of a prunable board:
+#    0 0 1 0 0
+#     0 1 0 0 0
+#    1 1 0 0 0
+#     0 1 0 0 0
+#    0 0 0 0 0
+#       ...
+#
+# This board is prunable because the top left corner is only 3 bits in area, no piece will ever fit it
+# parameters:
+#   board -- an initial bit board (6 bit padded rows, see blank_board for format)
+#   location -- starting location, everything above and to the left is already full
+#   slotting -- set to true only when testing initial pieces, when filling normally
+#               additional assumptions are possible
+#
+# Algorithm:
+#    The algorithm starts at the top row (as determined by location) and iterates a row at a time
+#    maintainng counts of active open areas (kept in the collector array) each collector contains
+#    three values at the start of an iteration:
+#          0: mask of bits that would be adjacent to the collector in this row
+#          1: the number of bits collected so far
+#          2: a scratch space starting as zero, but used during the computation to represent
+#             the empty bits in the new row that are adjacent (position 0)
+#  The exact procedure is described in-code
+def prunable( board, location, slotting = false)
+  collectors = []
+  # loop accross the rows
+  (location / 6).to_i.upto(9) do | row_on |
+    # obtain a set of regions representing the bits of the curent row.
+    regions = $regions[(board >> (row_on * 6)) & 0b11111]
+    converter = $converter[row_on]
+
+    # track the number of collectors at the start of the cycle so that
+    # we don't compute against newly created collectors, only existing collectors
+    initial_collector_count = collectors.length
+
+    # loop against the regions.  For each region of the row
+    # we will see if it connects to one or more existing collectors.
+    # if it connects to 1 collector, the bits from the region are added to the
+    # bits of the collector and the mask is placed in collector[2]
+    # If the region overlaps more than one collector then all the collectors
+    # it overlaps with are merged into the first one (the others are set to nil in the array)
+    # if NO collectors are found then the region is copied as a new collector
+    regions.each do | region |
+      collector_found = nil
+      region_mask = region[2]
+      initial_collector_count.times do | collector_num |
+        collector = collectors[collector_num]
+        if (collector) then
+          collector_mask = collector[0]
+          if (collector_mask & region_mask != 0) then
+            if (collector_found) then
+              collector_found[0] |= collector_mask
+              collector_found[1] += collector[1]
+              collector_found[2] |= collector[2]
+              collectors[collector_num] = nil
+            else
+              collector_found = collector
+              collector[1] += region[1]
+              collector[2] |= region_mask
+            end
+          end
+        end
+      end
+      if (collector_found == nil) then
+        collectors.push(Array.new(region))
+      end
+    end
+
+    # check the existing collectors, if any collector overlapped no bits in the region its [2] value will
+    # be zero.  The size of any such reaason is tested if it is not a muliple of five true is returned since
+    # the board is prunable.  if it is a multiple of five it is removed.
+    # Collector that are still active have a new adjacent value [0] set based n the matched bits
+    # and have [2] cleared out for the next cycle.
+    collectors.length.times do | collector_num |
+      collector = collectors[collector_num]
+      if (collector) then
+        if (collector[2] == 0) then
+          return true if (collector[1] % 5 != 0)
+          collectors[collector_num] = nil
+        else
+          # if a collector matches all bits in the row then we can return unprunable early for the
+          # follwing reasons:
+          #    1) there can be no more unavailable bits bince we fill from the top left downward
+          #    2) all previous regions have been closed or joined so only this region can fail
+          #    3) this region must be good since there can never be only 1 region that is nuot
+          #       a multiple of five
+          # this rule only applies when filling normally, so we ignore the rule if we are "slotting"
+          # in pieces to see what configurations work for them (the only other time this algorithm is used).
+          return false if (collector[2] == 0b11111 && !slotting)
+          collector[0] = converter[collector[2]]
+          collector[2] = 0
+        end
+      end
+    end
+
+    # get rid of all the empty converters for the next round
+    collectors.compact!
+  end
+  return false if (collectors.length <= 1) # 1 collector or less and the region is fine
+  collectors.any? { | collector | (collector[1] % 5) != 0 } # more than 1 and we test them all for bad size
+end
+
+# creates a region given a row mask.  see prunable for what a "region" is
+def create_regions( value )
+  regions = []
+  cur_region = 0
+  5.times do | bit |
+    if (value[bit] == 0) then
+      cur_region |= 1 << bit
+    else
+      if (cur_region != 0 ) then
+        regions.push( cur_region)
+        cur_region = 0;
+      end
+    end
+  end
+  regions.push(cur_region) if (cur_region != 0)
+  regions
+end
+
+# find up to the counted number of solutions (or all solutions) and prints the final result
+def find_all
+  find_top( 1)
+  find_top( 0)
+  print_results
+end
+
+# show the board
+def print_results
+  print "#{@boards_found} solutions found\n\n"
+  print_full_board( @min_board)
+  print "\n"
+  print_full_board( @max_board)
+  print "\n"
+end
+
+# finds solutions.  This special version of the main function is only used for the top level
+# the reason for it is basically to force a particular ordering on how the rotations are tested for
+# the first piece.  It is called twice, first looking for placements of the odd rotations and then
+# looking for placements of the even locations.
+#
+# WHY?
+#   Since any found solution has an inverse we want to maximize finding solutions that are not already found
+#   as an inverse.  The inverse will ALWAYS be 3 one of the piece configurations that is exactly 3 rotations away
+#   (an odd number).  Checking even vs odd then produces a higher probability of finding more pieces earlier
+#   in the cycle.  We still need to keep checking all the permutations, but our probability of finding one will
+#   diminsh over time.  Since we are TOLD how many to search for this lets us exit before checking all pieces
+#   this bennifit is very great when seeking small numbers of solutions and is 0 when looking for more than the
+#   maximum number
+def find_top( rotation_skip)
+  board = blank_board
+  (@pieces.length-1).times do
+    piece = @pieces.shift
+    piece.masks[0].each do | mask, imask, cmask |
+      if ((rotation_skip += 1) % 2 == 0) then
+        piece.placed = mask
+        find( 1, 1, board | mask)
+      end
+    end
+    @pieces.push(piece)
+  end
+  piece = @pieces.shift
+  @pieces.push(piece)
+end
+
+# the normail find routine, iterates through the available pieces, checks all rotations at the current location
+# and adds any boards found.  depth is acheived via recursion.  the overall approach is described
+# here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
+# parameters:
+#  start_location -- where to start looking for place for the next piece at
+#  placed -- number of pieces placed
+#  board -- current state of the board
+#
+# see in-code comments
+def find( start_location, placed, board)
+  # find the next location to place a piece by looking for an empty bit
+  while board[start_location] == 1
+    start_location += 1
+  end
+
+  @pieces.length.times do
+    piece = @pieces.shift
+    piece.masks[start_location].each do | mask, imask, cmask |
+      if ( board & cmask == imask) then
+        piece.placed = mask
+        if (placed == 9) then
+          add_board
+        else
+          find( start_location + 1, placed + 1, board | mask)
+        end
+      end
+    end
+    @pieces.push(piece)
+  end
+end
+
+# print the board
+def print_full_board( board_string)
+  10.times do | row |
+    print " " if (row % 2 == 1)
+    5.times do | col |
+      print "#{board_string[row*5 + col,1]} "
+    end
+    print "\n"
+  end
+end
+
+# when a board is found we "draw it" into a string and then flip that string, adding both to
+# the list (hash) of solutions if they are unique.
+def add_board
+  board_string = "99999999999999999999999999999999999999999999999999"
+  @all_pieces.each {  | piece | piece.fill_string( board_string ) }
+  save( board_string)
+  save( board_string.reverse)
+end
+
+# adds a board string to the list (if new) and updates the current best/worst board
+def save( board_string)
+  if (@all_boards[board_string] == nil) then
+    @min_board = board_string if (board_string < @min_board)
+    @max_board = board_string if (board_string > @max_board)
+    @all_boards.store(board_string,true)
+    @boards_found += 1
+
+    # the exit motif is a time saver.  Ideally the function should return, but those tests
+    # take noticable time (performance).
+    if (@boards_found == @stop_count) then
+      print_results
+      exit(0)
+    end
+  end
+end
+
+
+##
+## MAIN BODY :)
+##
+create_collector_support
+@pieces = [
+  Piece.new( [ :nw, :ne, :east, :east ], 2),
+  Piece.new( [ :ne, :se, :east, :ne ], 7),
+  Piece.new( [ :ne, :east, :ne, :nw ], 1),
+  Piece.new( [ :east, :sw, :sw, :se ], 6),
+  Piece.new( [ :east, :ne, :se, :ne ], 5),
+  Piece.new( [ :east, :east, :east, :se ], 0),
+  Piece.new( [ :ne, :nw, :se, :east, :se ], 4),
+  Piece.new( [ :se, :se, :se, :west ], 9),
+  Piece.new( [ :se, :se, :east, :se ], 8),
+  Piece.new( [ :east, :east, :sw, :se ], 3)
+  ];
+
+@all_pieces = Array.new( @pieces)
+
+@min_board = "99999999999999999999999999999999999999999999999999"
+@max_board = "00000000000000000000000000000000000000000000000000"
+@stop_count = ARGV[0].to_i || 2089
+@all_boards = {}
+@boards_found = 0
+
+find_all ######## DO IT!!!
+
diff --git a/benchmark/bm_so_nbody.rb b/benchmark/bm_so_nbody.rb
new file mode 100644
index 0000000000..d6c5bb9e61
--- /dev/null
+++ b/benchmark/bm_so_nbody.rb
@@ -0,0 +1,148 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org
+#
+# Optimized for Ruby by Jesse Millikan
+# From version ported by Michael Neumann from the C gcc version,
+# which was written by Christoph Bauer.
+
+SOLAR_MASS = 4 * Math::PI**2
+DAYS_PER_YEAR = 365.24
+
+def _puts *args
+end
+
+class Planet
+ attr_accessor :x, :y, :z, :vx, :vy, :vz, :mass
+
+ def initialize(x, y, z, vx, vy, vz, mass)
+  @x, @y, @z = x, y, z
+  @vx, @vy, @vz = vx * DAYS_PER_YEAR, vy * DAYS_PER_YEAR, vz * DAYS_PER_YEAR
+  @mass = mass * SOLAR_MASS
+ end
+
+ def move_from_i(bodies, nbodies, dt, i)
+  while i < nbodies
+   b2 = bodies[i]
+   dx = @x - b2.x
+   dy = @y - b2.y
+   dz = @z - b2.z
+
+   distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
+   mag = dt / (distance * distance * distance)
+   b_mass_mag, b2_mass_mag = @mass * mag, b2.mass * mag
+
+   @vx -= dx * b2_mass_mag
+   @vy -= dy * b2_mass_mag
+   @vz -= dz * b2_mass_mag
+   b2.vx += dx * b_mass_mag
+   b2.vy += dy * b_mass_mag
+   b2.vz += dz * b_mass_mag
+   i += 1
+  end
+
+  @x += dt * @vx
+  @y += dt * @vy
+  @z += dt * @vz
+ end
+end
+
+def energy(bodies)
+  e = 0.0
+  nbodies = bodies.size
+
+  for i in 0 ... nbodies
+    b = bodies[i]
+    e += 0.5 * b.mass * (b.vx * b.vx + b.vy * b.vy + b.vz * b.vz)
+    for j in (i + 1) ... nbodies
+      b2 = bodies[j]
+      dx = b.x - b2.x
+      dy = b.y - b2.y
+      dz = b.z - b2.z
+      distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
+      e -= (b.mass * b2.mass) / distance
+    end
+  end
+  e
+end
+
+def offset_momentum(bodies)
+  px, py, pz = 0.0, 0.0, 0.0
+
+  for b in bodies
+    m = b.mass
+    px += b.vx * m
+    py += b.vy * m
+    pz += b.vz * m
+  end
+
+  b = bodies[0]
+  b.vx = - px / SOLAR_MASS
+  b.vy = - py / SOLAR_MASS
+  b.vz = - pz / SOLAR_MASS
+end
+
+BODIES = [
+  # sun
+  Planet.new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0),
+
+  # jupiter
+  Planet.new(
+    4.84143144246472090e+00,
+    -1.16032004402742839e+00,
+    -1.03622044471123109e-01,
+    1.66007664274403694e-03,
+    7.69901118419740425e-03,
+    -6.90460016972063023e-05,
+    9.54791938424326609e-04),
+
+  # saturn
+  Planet.new(
+    8.34336671824457987e+00,
+    4.12479856412430479e+00,
+    -4.03523417114321381e-01,
+    -2.76742510726862411e-03,
+    4.99852801234917238e-03,
+    2.30417297573763929e-05,
+    2.85885980666130812e-04),
+
+  # uranus
+  Planet.new(
+    1.28943695621391310e+01,
+    -1.51111514016986312e+01,
+    -2.23307578892655734e-01,
+    2.96460137564761618e-03,
+    2.37847173959480950e-03,
+    -2.96589568540237556e-05,
+    4.36624404335156298e-05),
+
+  # neptune
+  Planet.new(
+    1.53796971148509165e+01,
+    -2.59193146099879641e+01,
+    1.79258772950371181e-01,
+    2.68067772490389322e-03,
+    1.62824170038242295e-03,
+    -9.51592254519715870e-05,
+    5.15138902046611451e-05)
+]
+
+init = 200_000 # ARGV[0]
+n = Integer(init)
+
+offset_momentum(BODIES)
+
+puts "%.9f" % energy(BODIES)
+
+nbodies = BODIES.size
+dt = 0.01
+
+n.times do
+  i = 0
+  while i < nbodies
+    b = BODIES[i]
+    b.move_from_i(BODIES, nbodies, dt, i + 1)
+    i += 1
+  end
+end
+
+puts "%.9f" % energy(BODIES)
diff --git a/benchmark/bm_so_nested_loop.rb b/benchmark/bm_so_nested_loop.rb
new file mode 100644
index 0000000000..a0513f8c47
--- /dev/null
+++ b/benchmark/bm_so_nested_loop.rb
@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: nestedloop-ruby.code,v 1.4 2004/11/13 07:42:22 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# from Avi Bryant
+
+n = 16 # Integer(ARGV.shift || 1)
+x = 0
+n.times do
+    n.times do
+        n.times do
+            n.times do
+                n.times do
+                    n.times do
+                        x += 1
+                    end
+                end
+            end
+        end
+    end
+end
+# puts x
+
+
diff --git a/benchmark/bm_so_nsieve.rb b/benchmark/bm_so_nsieve.rb
new file mode 100644
index 0000000000..a65cc78233
--- /dev/null
+++ b/benchmark/bm_so_nsieve.rb
@@ -0,0 +1,35 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# contributed by Glenn Parker, March 2005
+# modified by Evan Phoenix, Sept 2006
+
+def sieve(m)
+  flags = Flags.dup[0,m]
+  count = 0
+  pmax = m - 1
+  p = 2
+  while p <= pmax
+    unless flags[p].zero?
+      count += 1
+      mult = p
+      while mult <= pmax
+        flags[mult] = 0
+        mult += p
+      end
+    end
+    p += 1
+  end
+  count
+end
+
+n = 9 # (ARGV[0] || 2).to_i
+Flags = ("\x1" * ( 2 ** n * 10_000)).unpack("c*")
+
+n.downto(n-2) do |exponent|
+  break if exponent < 0
+  m = (1 << exponent) * 10_000
+  # m = (2 ** exponent) * 10_000
+  count = sieve(m)
+  printf "Primes up to %8d %8d\n", m, count
+end
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
new file mode 100644
index 0000000000..019b8b6382
--- /dev/null
+++ b/benchmark/bm_so_nsieve_bits.rb
@@ -0,0 +1,42 @@
+#!/usr/bin/ruby
+#
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# nsieve-bits in Ruby
+# Contributed by Glenn Parker, March 2005
+
+CharExponent = 3
+BitsPerChar = 1 << CharExponent
+LowMask = BitsPerChar - 1
+
+def sieve(m)
+  items = "\xFF" * ((m / BitsPerChar) + 1)
+  masks = ""
+  BitsPerChar.times do |b|
+    masks << (1 << b).chr
+  end
+
+  count = 0
+  pmax = m - 1
+  2.step(pmax, 1) do |p|
+    if items[p >> CharExponent][p & LowMask] == 1
+      count += 1
+      p.step(pmax, p) do |mult|
+	a = mult >> CharExponent
+	b = mult & LowMask
+	items[a] -= masks[b] if items[a][b] != 0
+      end
+    end
+  end
+  count
+end
+
+n = 9 # (ARGV[0] || 2).to_i
+n.step(n - 2, -1) do |exponent|
+  break if exponent < 0
+  m = 2 ** exponent * 10_000
+  count = sieve(m)
+  printf "Primes up to %8d %8d\n", m, count
+end
+
diff --git a/benchmark/bm_so_object.rb b/benchmark/bm_so_object.rb
new file mode 100644
index 0000000000..e8607c7199
--- /dev/null
+++ b/benchmark/bm_so_object.rb
@@ -0,0 +1,56 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: objinst-ruby.code,v 1.4 2004/11/13 07:42:25 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Aristarkh Zagorodnikov
+
+class Toggle
+    def initialize(start_state)
+        @bool = start_state
+    end
+
+    def value
+        @bool
+    end
+
+    def activate
+        @bool = !@bool
+        self
+    end
+end
+
+class NthToggle < Toggle
+    def initialize(start_state, max_counter)
+        super start_state
+        @count_max = max_counter
+        @counter = 0
+    end
+
+    def activate
+        @counter += 1
+        if @counter >= @count_max
+            @bool = !@bool
+            @counter = 0
+        end
+        self
+    end
+end
+
+n = 1500000 # (ARGV.shift || 1).to_i
+
+toggle = Toggle.new 1
+5.times do
+    toggle.activate.value ? 'true' : 'false'
+end
+n.times do
+    toggle = Toggle.new 1
+end
+
+ntoggle = NthToggle.new 1, 3
+8.times do
+    ntoggle.activate.value ? 'true' : 'false'
+end
+n.times do
+    ntoggle = NthToggle.new 1, 3
+end
+
diff --git a/benchmark/bm_so_partial_sums.rb b/benchmark/bm_so_partial_sums.rb
new file mode 100644
index 0000000000..630b45cb8d
--- /dev/null
+++ b/benchmark/bm_so_partial_sums.rb
@@ -0,0 +1,31 @@
+n = 2_500_000 # (ARGV.shift || 1).to_i
+
+alt = 1.0 ; s0 = s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = 0.0
+
+1.upto(n) do |d|
+  d = d.to_f ; d2 = d * d ; d3 = d2 * d ; ds = Math.sin(d) ; dc = Math.cos(d)
+
+  s0 += (2.0 / 3.0) ** (d - 1.0)
+  s1 += 1.0 / Math.sqrt(d)
+  s2 += 1.0 / (d * (d + 1.0))
+  s3 += 1.0 / (d3 * ds * ds)
+  s4 += 1.0 / (d3 * dc * dc)
+  s5 += 1.0 / d
+  s6 += 1.0 / d2
+  s7 += alt / d
+  s8 += alt / (2.0 * d - 1.0)
+
+  alt = -alt
+end
+
+if false
+  printf("%.9f\t(2/3)^k\n", s0)
+  printf("%.9f\tk^-0.5\n", s1)
+  printf("%.9f\t1/k(k+1)\n", s2)
+  printf("%.9f\tFlint Hills\n", s3)
+  printf("%.9f\tCookson Hills\n", s4)
+  printf("%.9f\tHarmonic\n", s5)
+  printf("%.9f\tRiemann Zeta\n", s6)
+  printf("%.9f\tAlternating Harmonic\n", s7)
+  printf("%.9f\tGregory\n", s8)
+end
diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb
new file mode 100644
index 0000000000..c7d6fbfb4d
--- /dev/null
+++ b/benchmark/bm_so_pidigits.rb
@@ -0,0 +1,92 @@
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# contributed by Gabriele Renzi
+
+class PiDigitSpigot
+
+    def initialize()
+        @z = Transformation.new 1,0,0,1
+        @x = Transformation.new 0,0,0,0
+        @inverse = Transformation.new 0,0,0,0
+    end
+
+    def next!
+        @y = @z.extract(3)
+        if safe? @y
+            @z = produce(@y)
+            @y
+        else
+            @z = consume @x.next!()
+            next!()
+        end
+    end
+
+    def safe?(digit)
+        digit == @z.extract(4)
+    end
+
+    def produce(i)
+        @inverse.qrst(10,-10*i,0,1).compose(@z)
+    end
+
+    def consume(a)
+        @z.compose(a)
+    end
+end
+
+
+class Transformation
+    attr_reader :q, :r, :s, :t
+    def initialize (q, r, s, t)
+        @q,@r,@s,@t,@k = q,r,s,t,0
+    end
+
+    def next!()
+        @q = @k = @k + 1
+        @r = 4 * @k + 2
+        @s = 0
+        @t = 2 * @k + 1
+        self
+    end
+
+    def extract(j)
+        (@q * j + @r) / (@s * j + @t)
+    end
+
+    def compose(a)
+        self.class.new( @q * a.q,
+                        @q * a.r + r * a.t,
+                        @s * a.q + t * a.s,
+                        @s * a.r + t * a.t
+                    )
+    end
+
+    def qrst *args
+        initialize *args
+        self
+    end
+
+
+end
+
+
+WIDTH = 10
+n = 2_500 # Integer(ARGV[0])
+j = 0
+
+digits = PiDigitSpigot.new
+
+while n > 0
+    if n >= WIDTH
+        WIDTH.times {print digits.next!}
+        j += WIDTH
+    else
+        n.times {print digits.next!}
+        (WIDTH-n).times {print " "}
+        j += n
+    end
+    puts "\t:"+j.to_s
+    n -= WIDTH
+end
+
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb
new file mode 100644
index 0000000000..83c0d6d380
--- /dev/null
+++ b/benchmark/bm_so_random.rb
@@ -0,0 +1,20 @@
+# from http://www.bagley.org/~doug/shootout/bench/random/random.ruby
+
+IM = 139968.0
+IA = 3877.0
+IC = 29573.0
+
+$last = 42.0
+
+def gen_random(max)
+  (max * ($last = ($last * IA + IC) % IM)) / IM
+end
+
+N = 1000000
+
+i=0
+while i<N
+  i+=1
+  gen_random(100.0)
+end
+# "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_reverse_complement.rb b/benchmark/bm_so_reverse_complement.rb
new file mode 100644
index 0000000000..82ea666994
--- /dev/null
+++ b/benchmark/bm_so_reverse_complement.rb
@@ -0,0 +1,30 @@
+#!/usr/bin/ruby
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# Contributed by Peter Bjarke Olsen
+# Modified by Doug King
+
+seq=Array.new
+
+def revcomp(seq)
+  seq.reverse!.tr!('wsatugcyrkmbdhvnATUGCYRKMBDHVN','WSTAACGRYMKVHDBNTAACGRYMKVHDBN')
+  stringlen=seq.length
+  0.step(stringlen-1,60) {|x| print seq.slice(x,60) , "\n"}
+end
+
+input = open(File.join(File.dirname($0), 'fasta.output.2500000'), 'rb')
+
+while input.gets
+  if $_ =~ />/
+    if seq.length != 0
+      revcomp(seq.join)
+      seq=Array.new
+    end
+    puts $_
+  else
+    $_.sub(/\n/,'')
+    seq.push $_
+  end
+end
+revcomp(seq.join)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb
new file mode 100644
index 0000000000..dbe2bfa63d
--- /dev/null
+++ b/benchmark/bm_so_sieve.rb
@@ -0,0 +1,24 @@
+# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
+num = 40
+count = i = j = 0
+flags0 = Array.new(8192,1)
+k = 0
+while k < num
+  k+=1
+  count = 0
+  flags = flags0.dup
+  i = 2
+  while i<8192
+    i+=1
+    if flags[i]
+      # remove all multiples of prime: i
+      j = i*i
+      while j < 8192
+        j += i
+        flags[j] = nil
+      end
+      count += 1
+    end
+  end
+end
+count
diff --git a/benchmark/bm_so_spectralnorm.rb b/benchmark/bm_so_spectralnorm.rb
new file mode 100644
index 0000000000..6b97206689
--- /dev/null
+++ b/benchmark/bm_so_spectralnorm.rb
@@ -0,0 +1,50 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+# Contributed by Sokolov Yura
+
+def eval_A(i,j)
+	return 1.0/((i+j)*(i+j+1)/2+i+1)
+end
+
+def eval_A_times_u(u)
+        v, i = nil, nil
+	(0..u.length-1).collect { |i|
+                v = 0
+		for j in 0..u.length-1
+			v += eval_A(i,j)*u[j]
+                end
+                v
+        }
+end
+
+def eval_At_times_u(u)
+	v, i = nil, nil
+	(0..u.length-1).collect{|i|
+                v = 0
+		for j in 0..u.length-1
+			v += eval_A(j,i)*u[j]
+                end
+                v
+        }
+end
+
+def eval_AtA_times_u(u)
+	return eval_At_times_u(eval_A_times_u(u))
+end
+
+n = 500 # ARGV[0].to_i
+
+u=[1]*n
+for i in 1..10
+        v=eval_AtA_times_u(u)
+        u=eval_AtA_times_u(v)
+end
+vBv=0
+vv=0
+for i in 0..n-1
+        vBv += u[i]*v[i]
+        vv += v[i]*v[i]
+end
+
+str = "%0.9f" % (Math.sqrt(vBv/vv)), "\n"
+# print str
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb
new file mode 100644
index 0000000000..2dc4e72be5
--- /dev/null
+++ b/benchmark/bm_vm1_block.rb
@@ -0,0 +1,10 @@
+def m
+  yield
+end
+
+i=0
+while i<30000000 # while loop 1
+  i+=1
+  m{
+  }
+end
+\ No newline at end of file
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
new file mode 100644
index 0000000000..3e395d9478
--- /dev/null
+++ b/benchmark/bm_vm1_const.rb
@@ -0,0 +1,8 @@
+Const = 1
+
+i = 0
+while i<30000000 # while loop 1
+  i+= 1
+  j = Const
+  k = Const
+end
diff --git a/benchmark/bm_vm1_ensure.rb b/benchmark/bm_vm1_ensure.rb
new file mode 100644
index 0000000000..c3b71ead5a
--- /dev/null
+++ b/benchmark/bm_vm1_ensure.rb
@@ -0,0 +1,11 @@
+i=0
+while i<30000000 # benchmark loop 1
+  i+=1
+  begin
+    begin
+    ensure
+    end
+  ensure
+  end
+end
+
diff --git a/benchmark/bm_vm1_ivar.rb b/benchmark/bm_vm1_ivar.rb
new file mode 100644
index 0000000000..4de833a316
--- /dev/null
+++ b/benchmark/bm_vm1_ivar.rb
@@ -0,0 +1,8 @@
+@a = 1
+
+i = 0
+while i<30000000 # while loop 1
+  i+= 1
+  j = @a
+  k = @a
+end
diff --git a/benchmark/bm_vm1_ivar_set.rb b/benchmark/bm_vm1_ivar_set.rb
new file mode 100644
index 0000000000..c8076c6ab6
--- /dev/null
+++ b/benchmark/bm_vm1_ivar_set.rb
@@ -0,0 +1,6 @@
+i = 0
+while i<30_000_000 # while loop 1
+  i+= 1
+  @a = 1
+  @b = 2
+end
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb
new file mode 100644
index 0000000000..2d7d7f0b52
--- /dev/null
+++ b/benchmark/bm_vm1_length.rb
@@ -0,0 +1,9 @@
+a = 'abc'
+b = [1, 2, 3]
+i=0
+while i<30000000 # while loop 1
+  i+=1
+  a.length
+  b.length
+end
+
diff --git a/benchmark/bm_vm1_neq.rb b/benchmark/bm_vm1_neq.rb
new file mode 100644
index 0000000000..212f056c6e
--- /dev/null
+++ b/benchmark/bm_vm1_neq.rb
@@ -0,0 +1,8 @@
+i = 0
+obj1 = Object.new
+obj2 = Object.new
+
+while i<30000000 # while loop 1
+  i+= 1
+  obj1 != obj2
+end
diff --git a/benchmark/bm_vm1_not.rb b/benchmark/bm_vm1_not.rb
new file mode 100644
index 0000000000..f139fed8be
--- /dev/null
+++ b/benchmark/bm_vm1_not.rb
@@ -0,0 +1,7 @@
+i = 0
+obj = Object.new
+
+while i<30000000 # while loop 1
+  i+= 1
+  !obj
+end
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb
new file mode 100644
index 0000000000..0c98d00e0d
--- /dev/null
+++ b/benchmark/bm_vm1_rescue.rb
@@ -0,0 +1,7 @@
+i=0
+while i<30000000 # while loop 1
+  i+=1
+  begin
+  rescue
+  end
+end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb
new file mode 100644
index 0000000000..c843ee3d97
--- /dev/null
+++ b/benchmark/bm_vm1_simplereturn.rb
@@ -0,0 +1,9 @@
+def m
+  return 1
+end
+i=0
+while i<30000000 # while loop 1
+  i+=1
+  m
+end
+
diff --git a/benchmark/bm_vm1_swap.rb b/benchmark/bm_vm1_swap.rb
new file mode 100644
index 0000000000..a565b6f6dc
--- /dev/null
+++ b/benchmark/bm_vm1_swap.rb
@@ -0,0 +1,8 @@
+a = 1
+b = 2
+i=0
+while i<30000000 # while loop 1
+  i+=1
+  a, b = b, a
+end
+
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb
new file mode 100644
index 0000000000..e29c11200f
--- /dev/null
+++ b/benchmark/bm_vm2_array.rb
@@ -0,0 +1,5 @@
+i=0
+while i<6000000 # benchmark loop 2
+  i+=1
+  a = [1,2,3,4,5,6,7,8,9,10]
+end
diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb
new file mode 100644
index 0000000000..1ec34ad692
--- /dev/null
+++ b/benchmark/bm_vm2_case.rb
@@ -0,0 +1,14 @@
+i=0
+while i<6000000 # while loop 2
+  case :foo
+  when :bar
+    raise
+  when :baz
+    raise
+  when :boo
+    raise
+  when :foo
+    i+=1
+  end
+end
+
diff --git a/benchmark/bm_vm2_eval.rb b/benchmark/bm_vm2_eval.rb
new file mode 100644
index 0000000000..375dccc00e
--- /dev/null
+++ b/benchmark/bm_vm2_eval.rb
@@ -0,0 +1,6 @@
+i=0
+while i<6000000 # benchmark loop 2
+  i+=1
+  eval("1")
+end
+
diff --git a/benchmark/bm_vm2_method.rb b/benchmark/bm_vm2_method.rb
new file mode 100644
index 0000000000..cc94b8ab3d
--- /dev/null
+++ b/benchmark/bm_vm2_method.rb
@@ -0,0 +1,9 @@
+def m
+  nil
+end
+
+i=0
+while i<6000000 # benchmark loop 2
+  i+=1
+  m; m; m; m; m; m; m; m;
+end
diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb
new file mode 100644
index 0000000000..9ec1a0f136
--- /dev/null
+++ b/benchmark/bm_vm2_mutex.rb
@@ -0,0 +1,9 @@
+require 'thread'
+
+m = Mutex.new
+
+i=0
+while i<6000000 # benchmark loop 2
+  i+=1
+  m.synchronize{}
+end
diff --git a/benchmark/bm_vm2_poly_method.rb b/benchmark/bm_vm2_poly_method.rb
new file mode 100644
index 0000000000..ac9953ce5f
--- /dev/null
+++ b/benchmark/bm_vm2_poly_method.rb
@@ -0,0 +1,20 @@
+class C1
+  def m
+    1
+  end
+end
+class C2
+  def m
+    2
+  end
+end
+
+o1 = C1.new
+o2 = C2.new
+
+i=0
+while i<6000000 # benchmark loop 2
+  o = (i % 2 == 0) ? o1 : o2
+  o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+  i+=1
+end
diff --git a/benchmark/bm_vm2_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb
new file mode 100644
index 0000000000..856ba9b161
--- /dev/null
+++ b/benchmark/bm_vm2_poly_method_ov.rb
@@ -0,0 +1,20 @@
+class C1
+  def m
+    1
+  end
+end
+class C2
+  def m
+    2
+  end
+end
+
+o1 = C1.new
+o2 = C2.new
+
+i=0
+while i<6000000 # benchmark loop 2
+  o = (i % 2 == 0) ? o1 : o2
+#  o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+  i+=1
+end
diff --git a/benchmark/bm_vm2_proc.rb b/benchmark/bm_vm2_proc.rb
new file mode 100644
index 0000000000..0bd05b9544
--- /dev/null
+++ b/benchmark/bm_vm2_proc.rb
@@ -0,0 +1,14 @@
+def m &b
+  b
+end
+
+pr = m{
+  a = 1
+}
+
+i=0
+while i<6000000 # benchmark loop 2
+  i+=1
+  pr.call
+end
+
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb
new file mode 100644
index 0000000000..44f6ed402e
--- /dev/null
+++ b/benchmark/bm_vm2_regexp.rb
@@ -0,0 +1,6 @@
+i=0
+str = 'xxxhogexxx'
+while i<6000000 # benchmark loop 2
+  /hoge/ =~ str
+  i+=1
+end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb
new file mode 100644
index 0000000000..c20dbdd26c
--- /dev/null
+++ b/benchmark/bm_vm2_send.rb
@@ -0,0 +1,12 @@
+class C
+  def m
+  end
+end
+
+o = C.new
+
+i=0
+while i<6000000 # benchmark loop 2
+  i+=1
+  o.__send__ :m
+end
diff --git a/benchmark/bm_vm2_super.rb b/benchmark/bm_vm2_super.rb
new file mode 100644
index 0000000000..70c86b376f
--- /dev/null
+++ b/benchmark/bm_vm2_super.rb
@@ -0,0 +1,20 @@
+
+class C
+  def m
+    1
+  end
+end
+
+class CC < C
+  def m
+    super()
+  end
+end
+
+obj = CC.new
+
+i = 0
+while i<6000000 # benchmark loop 2
+  obj.m
+  i+=1
+end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb
new file mode 100644
index 0000000000..e12bd2ade0
--- /dev/null
+++ b/benchmark/bm_vm2_unif1.rb
@@ -0,0 +1,8 @@
+i = 0
+def m a, b
+end
+
+while i<6000000 # benchmark loop 2
+  i+=1
+  m 100, 200
+end
diff --git a/benchmark/bm_vm2_zsuper.rb b/benchmark/bm_vm2_zsuper.rb
new file mode 100644
index 0000000000..3a75960403
--- /dev/null
+++ b/benchmark/bm_vm2_zsuper.rb
@@ -0,0 +1,20 @@
+i = 0
+
+class C
+  def m a
+    1
+  end
+end
+
+class CC < C
+  def m a
+    super
+  end
+end
+
+obj = CC.new
+
+while i<6000000 # benchmark loop 2
+  obj.m 10
+  i+=1
+end
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb
new file mode 100755
index 0000000000..7db9829d44
--- /dev/null
+++ b/benchmark/bm_vm3_gc.rb
@@ -0,0 +1,7 @@
+#! /usr/bin/ruby
+5000.times do
+  100.times do
+    {"xxxx"=>"yyyy"}
+  end
+  GC.start
+end
diff --git a/benchmark/bm_vm3_thread_create_join.rb b/benchmark/bm_vm3_thread_create_join.rb
new file mode 100644
index 0000000000..325a66d587
--- /dev/null
+++ b/benchmark/bm_vm3_thread_create_join.rb
@@ -0,0 +1,6 @@
+i=0
+while i<100_000 # benchmark loop 3
+  i+=1
+  Thread.new{
+  }.join
+end
diff --git a/benchmark/bm_vm3_thread_mutex.rb b/benchmark/bm_vm3_thread_mutex.rb
new file mode 100644
index 0000000000..649f1fddac
--- /dev/null
+++ b/benchmark/bm_vm3_thread_mutex.rb
@@ -0,0 +1,18 @@
+require 'thread'
+m = Mutex.new
+r = 0
+max = 1000
+(1..max).map{
+  Thread.new{
+    i=0
+    while i<max
+      i+=1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb
new file mode 100644
index 0000000000..0b4b219ca2
--- /dev/null
+++ b/benchmark/bmx_temp.rb
@@ -0,0 +1,9 @@
+def m
+  nil
+end
+
+i=0
+while i<800000 # benchmark loop 2
+  i+=1
+  m; m; m; m; m; m; m; m;
+end
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
new file mode 100644
index 0000000000..687dec26f1
--- /dev/null
+++ b/benchmark/driver.rb
@@ -0,0 +1,251 @@
+#
+# Ruby Benchmark driver
+#
+
+first = true
+
+begin
+  require 'optparse'
+rescue LoadError
+  if first
+    first = false
+    $:.unshift File.join(File.dirname(__FILE__), '../lib')
+    retry
+  else
+    raise
+  end
+end
+
+require 'benchmark'
+require 'pp'
+
+class BenchmarkDriver
+  def self.benchmark(opt)
+    driver = self.new(opt[:execs], opt[:dir], opt)
+    begin
+      driver.run
+    ensure
+      driver.show_results
+    end
+  end
+
+  def output *args
+    puts(*args)
+    @output and @output.puts(*args)
+  end
+
+  def message *args
+    output(*args) if @verbose
+  end
+
+  def message_print *args
+    if @verbose
+      print(*args)
+      STDOUT.flush
+      @output and @output.print(*args)
+    end
+  end
+
+  def progress_message *args
+    unless STDOUT.tty?
+      STDERR.print(*args) 
+      STDERR.flush
+    end
+  end
+
+  def initialize execs, dir, opt = {}
+    @execs = execs.map{|e|
+      e.strip!
+      next if e.empty?
+
+      if /(.+)::(.+)/ =~ e
+        # ex) ruby-a::/path/to/ruby-a
+        v = $1.strip
+        e = $2
+      else
+        v =  `#{e} -v`.chomp
+        v.sub!(/ patchlevel \d+/, '')
+      end
+      [e, v]
+    }.compact
+
+    @dir = dir
+    @repeat = opt[:repeat] || 1
+    @repeat = 1 if @repeat < 1
+    @pattern = opt[:pattern] || nil
+    @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
+    @output = opt[:output] ? open(opt[:output], 'w') : nil
+    @loop_wl1 = @loop_wl2 = nil
+    @opt = opt
+
+    # [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...]
+    @results = []
+
+    if @verbose
+      @start_time = Time.now
+      message @start_time
+      @execs.each_with_index{|(e, v), i|
+        message "target #{i}: #{v}"
+      }
+    end
+  end
+
+  def show_results
+    output
+
+    if @verbose
+      message '-----------------------------------------------------------'
+      message 'raw data:'
+      message
+      message PP.pp(@results, "", 79)
+      message
+      message "Elapesed time: #{Time.now - @start_time} (sec)"
+    end
+
+    output '-----------------------------------------------------------'
+    output 'benchmark results:'
+
+    if @verbose and @repeat > 1
+      output "minimum results in each #{@repeat} measurements."
+    end
+
+    output "name\t#{@execs.map{|(e, v)| v}.join("\t")}"
+    @results.each{|v, result|
+      rets = []
+      s = nil
+      result.each_with_index{|e, i|
+        r = e.min
+        case v
+        when /^vm1_/
+          if @loop_wl1
+            r -= @loop_wl1[i]
+            s = '*'
+          end
+        when /^vm2_/
+          if @loop_wl2
+            r -= @loop_wl2[i]
+            s = '*'
+          end
+        end
+        rets << sprintf("%.3f", r)
+      }
+      output "#{v}#{s}\t#{rets.join("\t")}"
+    }
+  end
+
+  def files
+    flag = {}
+    vm1 = vm2 = wl1 = wl2 = false
+    @files = Dir.glob(File.join(@dir, 'bm*.rb')).map{|file|
+      next if @pattern && /#{@pattern}/ !~ File.basename(file)
+      case file
+      when /bm_(vm[12])_/, /bm_loop_(whileloop2?).rb/
+        flag[$1] = true
+      end
+      file
+    }.compact
+
+    if flag['vm1'] && !flag['whileloop']
+      @files << File.join(@dir, 'bm_loop_whileloop.rb')
+    elsif flag['vm2'] && !flag['whileloop2']
+      @files << File.join(@dir, 'bm_loop_whileloop2.rb')
+    end
+
+    @files.sort!
+    progress_message "total: #{@files.size * @repeat} trial(s) (#{@repeat} trial(s) for #{@files.size} benchmark(s))\n"
+    @files
+  end
+
+  def run
+    files.each_with_index{|file, i|
+      @i = i
+      r = measure_file(file)
+
+      if /bm_loop_whileloop.rb/ =~ file
+        @loop_wl1 = r[1].map{|e| e.min}
+      elsif /bm_loop_whileloop2.rb/ =~ file
+        @loop_wl2 = r[1].map{|e| e.min}
+      end
+    }
+  end
+
+  def measure_file file
+    name = File.basename(file, '.rb').sub(/^bm_/, '')
+    prepare_file = File.join(File.dirname(file), "prepare_#{name}.rb")
+    load prepare_file if FileTest.exist?(prepare_file)
+
+    if @verbose
+      output
+      output '-----------------------------------------------------------'
+      output name
+      output
+      output File.read(file)
+      output
+    end
+
+    result = [name]
+    result << @execs.map{|(e, v)|
+      (0...@repeat).map{
+        message_print "#{v}\t"
+        progress_message '.'
+
+        m = measure(e, file)
+        message "#{m}"
+        m
+      }
+    }
+    @results << result
+    result
+  end
+
+  def measure executable, file
+    cmd = "#{executable} #{file}"
+    m = Benchmark.measure{
+      `#{cmd}`
+    }
+
+    if $? != 0
+      raise "Benchmark process exited with abnormal status (#{$?})"
+    end
+
+    m.real
+  end
+end
+
+if __FILE__ == $0
+  opt = {
+    :execs => ['ruby'],
+    :dir => './',
+    :repeat => 1,
+    :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
+  }
+
+  parser = OptionParser.new{|o|
+    o.on('-e', '--executables [EXECS]',
+         "Specify benchmark one or more targets. (exec1; exec2; exec3, ...)"){|e|
+      opt[:execs] = e.split(/;/)
+    }
+    o.on('-d', '--directory [DIRECTORY]', "Benchmark suites directory"){|d|
+      opt[:dir] = d
+    }
+    o.on('-p', '--pattern [PATTERN]', "Benchmark name pattern"){|p|
+      opt[:pattern] = p
+    }
+    o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
+      opt[:repeat] = n.to_i
+    }
+    o.on('-o', '--output-file [FILE]', "Output file"){|o|
+      opt[:output] = o
+    }
+    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
+      opt[:quiet] = q
+    }
+    o.on('-v', '--verbose'){|v|
+      opt[:verbose] = v
+    }
+  }
+
+  parser.parse!(ARGV)
+  BenchmarkDriver.benchmark(opt)
+end
+
diff --git a/benchmark/make_fasta_output.rb b/benchmark/make_fasta_output.rb
new file mode 100644
index 0000000000..b6d787ae27
--- /dev/null
+++ b/benchmark/make_fasta_output.rb
@@ -0,0 +1,19 @@
+# prepare 'fasta.output'
+
+def prepare_fasta_output n
+  filebase = File.join(File.dirname($0), 'fasta.output')
+  script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+  file = "#{filebase}.#{n}"
+
+  unless FileTest.exist?(file)
+    STDERR.puts "preparing #{file}"
+
+    open(file, 'w'){|f|
+      ARGV[0] = n
+      $stdout = f
+      load script
+      $stdout = STDOUT
+    }
+  end
+end
+
diff --git a/benchmark/other-lang/ack.pl b/benchmark/other-lang/ack.pl
new file mode 100644
index 0000000000..201e22ddfa
--- /dev/null
+++ b/benchmark/other-lang/ack.pl
@@ -0,0 +1,11 @@
+use integer;
+
+sub Ack {
+    return $_[0] ? ($_[1] ? Ack($_[0]-1, Ack($_[0], $_[1]-1))
+		    : Ack($_[0]-1, 1))
+	: $_[1]+1;
+}
+
+my $NUM = 9;
+$NUM = 1 if ($NUM < 1);
+my $ack = Ack(3, $NUM);
diff --git a/benchmark/other-lang/ack.py b/benchmark/other-lang/ack.py
new file mode 100644
index 0000000000..9968e7cfcf
--- /dev/null
+++ b/benchmark/other-lang/ack.py
@@ -0,0 +1,16 @@
+import sys
+sys.setrecursionlimit(5000000)
+
+def Ack(M, N):
+    if (not M):
+        return( N + 1 )
+    if (not N):
+        return( Ack(M-1, 1) )
+    return( Ack(M-1, Ack(M, N-1)) )
+
+def main():
+    NUM = 9
+    sys.setrecursionlimit(10000)
+    Ack(3, NUM)
+
+main()
diff --git a/benchmark/other-lang/ack.rb b/benchmark/other-lang/ack.rb
new file mode 100644
index 0000000000..7451bed6c4
--- /dev/null
+++ b/benchmark/other-lang/ack.rb
@@ -0,0 +1,12 @@
+def ack(m, n)
+    if m == 0 then
+        n + 1
+    elsif n == 0 then
+        ack(m - 1, 1)
+    else
+        ack(m - 1, ack(m, n - 1))
+    end
+end
+
+NUM = 9
+ack(3, NUM)
diff --git a/benchmark/other-lang/ack.scm b/benchmark/other-lang/ack.scm
new file mode 100644
index 0000000000..a80b73ba55
--- /dev/null
+++ b/benchmark/other-lang/ack.scm
@@ -0,0 +1,7 @@
+(define (ack m n)
+  (cond ((zero? m) (+ n 1))
+	((zero? n) (ack (- m 1) 1))
+	(else      (ack (- m 1) (ack m (- n 1))))))
+
+(ack 3 9)
+
diff --git a/benchmark/other-lang/eval.rb b/benchmark/other-lang/eval.rb
new file mode 100644
index 0000000000..3875927389
--- /dev/null
+++ b/benchmark/other-lang/eval.rb
@@ -0,0 +1,66 @@
+
+Bench = %w(
+  loop
+  ack
+  fib
+  tak
+  fact
+)
+
+Lang = <<EOP.map{|l| l.strip}
+  ruby-cyg
+  ../../../test6/miniruby
+  perl
+  python
+  gosh
+EOP
+
+Bench.replace ['loop2']
+Lang.replace ['ruby-cyg']
+
+Ext = %w(
+  .rb
+  .rb
+  .pl
+  .py
+  .scm
+)
+
+p Bench
+p Lang
+
+require 'benchmark'
+
+def bench cmd
+  m = Benchmark.measure{
+    #p cmd
+    system(cmd)
+  }
+  [m.utime, m.real]
+end
+
+Result = []
+Bench.each{|b|
+  r = []
+  Lang.each_with_index{|l, idx|
+    cmd = "#{l} #{b}#{Ext[idx]}"
+    r << bench(cmd)
+  }
+  Result << r
+}
+
+require 'pp'
+# utime
+puts Lang.join("\t")  
+Bench.each_with_index{|b, bi|
+  print b, "\t"
+  puts Result[bi].map{|e| e[0]}.join("\t")
+}
+
+# rtime
+puts Lang.join("\t")  
+Bench.each_with_index{|b, bi|
+  print b, "\t"
+  puts Result[bi].map{|e| e[1]}.join("\t")
+}
+
diff --git a/benchmark/other-lang/fact.pl b/benchmark/other-lang/fact.pl
new file mode 100644
index 0000000000..a9b0b69cdf
--- /dev/null
+++ b/benchmark/other-lang/fact.pl
@@ -0,0 +1,13 @@
+sub fact{
+  my $n = @_[0];
+  if($n < 2){
+    return 1;
+  }
+  else{
+    return $n * fact($n-1);
+  }
+}
+
+for($i=0; $i<10000; $i++){
+  &fact(100);
+}
diff --git a/benchmark/other-lang/fact.py b/benchmark/other-lang/fact.py
new file mode 100644
index 0000000000..01593965d9
--- /dev/null
+++ b/benchmark/other-lang/fact.py
@@ -0,0 +1,18 @@
+#import sys
+#sys.setrecursionlimit(1000)
+
+def factL(n):
+	r = 1
+	for x in range(2, n):
+		r *= x
+	return r
+
+def factR(n):
+	if n < 2:
+		return 1
+	else:
+		return n * factR(n-1)
+
+for i in range(10000):
+	factR(100)
+
diff --git a/benchmark/other-lang/fact.rb b/benchmark/other-lang/fact.rb
new file mode 100644
index 0000000000..7e97b22b39
--- /dev/null
+++ b/benchmark/other-lang/fact.rb
@@ -0,0 +1,13 @@
+def fact(n)
+  if n < 2
+    1
+  else
+    n * fact(n-1)
+  end
+end
+
+i=0
+while i<10000
+  i+=1
+  fact(100)
+end
diff --git a/benchmark/other-lang/fact.scm b/benchmark/other-lang/fact.scm
new file mode 100644
index 0000000000..c98a7fedd3
--- /dev/null
+++ b/benchmark/other-lang/fact.scm
@@ -0,0 +1,8 @@
+(define (fact n)
+        (if (< n 2)
+            1
+          (* n (fact (- n 1)))))
+
+(dotimes (i 10000)
+  (fact 100))
+
diff --git a/benchmark/other-lang/fib.pl b/benchmark/other-lang/fib.pl
new file mode 100644
index 0000000000..a46f666d1e
--- /dev/null
+++ b/benchmark/other-lang/fib.pl
@@ -0,0 +1,11 @@
+sub fib{
+  my $n = $_[0];
+  if($n < 3){
+    return 1;
+  }
+  else{
+    return fib($n-1) + fib($n-2);
+  }
+};
+
+&fib(34);
diff --git a/benchmark/other-lang/fib.py b/benchmark/other-lang/fib.py
new file mode 100644
index 0000000000..45f2bceb8d
--- /dev/null
+++ b/benchmark/other-lang/fib.py
@@ -0,0 +1,7 @@
+def fib(n):
+  if n < 3:
+    return 1
+  else:
+    return fib(n-1) + fib(n-2)
+
+fib(34)
diff --git a/benchmark/other-lang/fib.rb b/benchmark/other-lang/fib.rb
new file mode 100644
index 0000000000..ec587eabe0
--- /dev/null
+++ b/benchmark/other-lang/fib.rb
@@ -0,0 +1,9 @@
+def fib n
+  if n < 3
+    1
+  else
+    fib(n-1) + fib(n-2)
+  end
+end
+
+fib(34)
diff --git a/benchmark/other-lang/fib.scm b/benchmark/other-lang/fib.scm
new file mode 100644
index 0000000000..2fc4e225bd
--- /dev/null
+++ b/benchmark/other-lang/fib.scm
@@ -0,0 +1,7 @@
+(define (fib n)
+        (if (< n 3)
+            1
+          (+ (fib (- n 1)) (fib (- n 2)))))
+
+(fib 34)
+
diff --git a/benchmark/other-lang/loop.pl b/benchmark/other-lang/loop.pl
new file mode 100644
index 0000000000..2777490aaa
--- /dev/null
+++ b/benchmark/other-lang/loop.pl
@@ -0,0 +1,3 @@
+for($i=0; $i<30000000; $i++){
+}
+
diff --git a/benchmark/other-lang/loop.py b/benchmark/other-lang/loop.py
new file mode 100644
index 0000000000..003749bf3a
--- /dev/null
+++ b/benchmark/other-lang/loop.py
@@ -0,0 +1,2 @@
+for i in xrange(30000000):
+	pass
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb
new file mode 100644
index 0000000000..d43cef61f3
--- /dev/null
+++ b/benchmark/other-lang/loop.rb
@@ -0,0 +1,4 @@
+i=0
+while i<30000000
+  i+=1
+end
diff --git a/benchmark/other-lang/loop.scm b/benchmark/other-lang/loop.scm
new file mode 100644
index 0000000000..3364f7e679
--- /dev/null
+++ b/benchmark/other-lang/loop.scm
@@ -0,0 +1 @@
+(dotimes (x 30000000))
diff --git a/benchmark/other-lang/loop2.rb b/benchmark/other-lang/loop2.rb
new file mode 100644
index 0000000000..df8fffc1ff
--- /dev/null
+++ b/benchmark/other-lang/loop2.rb
@@ -0,0 +1 @@
+30000000.times{}
diff --git a/benchmark/other-lang/tak.pl b/benchmark/other-lang/tak.pl
new file mode 100644
index 0000000000..7e748a67c6
--- /dev/null
+++ b/benchmark/other-lang/tak.pl
@@ -0,0 +1,11 @@
+sub tak {
+    local($x, $y, $z) = @_;
+    if (!($y < $x)) {
+	return $z;
+    } else {
+	return &tak(&tak($x - 1, $y, $z),
+		    &tak($y - 1, $z, $x),
+		    &tak($z - 1, $x, $y));
+    }
+}
+&tak(18, 9, 0);
diff --git a/benchmark/other-lang/tak.py b/benchmark/other-lang/tak.py
new file mode 100644
index 0000000000..04f3f6829c
--- /dev/null
+++ b/benchmark/other-lang/tak.py
@@ -0,0 +1,8 @@
+def tak(x, y, z):
+	if not(y<x):
+		return z
+	else:
+		return tak(tak(x-1, y, z),
+		           tak(y-1, z, x),
+		           tak(z-1, x, y))
+tak(18, 9, 0)
diff --git a/benchmark/other-lang/tak.rb b/benchmark/other-lang/tak.rb
new file mode 100644
index 0000000000..efe5380f4e
--- /dev/null
+++ b/benchmark/other-lang/tak.rb
@@ -0,0 +1,13 @@
+
+def tak x, y, z
+  unless y < x
+    z
+  else
+    tak( tak(x-1, y, z),
+         tak(y-1, z, x),
+         tak(z-1, x, y))
+  end
+end
+
+tak(18, 9, 0)
+
diff --git a/benchmark/other-lang/tak.scm b/benchmark/other-lang/tak.scm
new file mode 100644
index 0000000000..52a7629ee5
--- /dev/null
+++ b/benchmark/other-lang/tak.scm
@@ -0,0 +1,10 @@
+(define (tak x y z)
+        (if (not (< y x))
+            z
+          (tak (tak (- x 1) y z)
+               (tak (- y 1) z x)
+               (tak (- z 1) x y))))
+
+(tak 18 9 0)
+
+
diff --git a/benchmark/prepare_so_count_words.rb b/benchmark/prepare_so_count_words.rb
new file mode 100644
index 0000000000..ee2138cdb2
--- /dev/null
+++ b/benchmark/prepare_so_count_words.rb
@@ -0,0 +1,15 @@
+# prepare 'wc.input'
+
+def prepare_wc_input
+  wcinput = File.join(File.dirname($0), 'wc.input')
+  wcbase  = File.join(File.dirname($0), 'wc.input.base')
+  unless FileTest.exist?(wcinput)
+    data = File.read(wcbase)
+    13.times{
+      data << data
+    }
+    open(wcinput, 'w'){|f| f.write data}
+  end
+end
+
+prepare_wc_input
diff --git a/benchmark/prepare_so_k_nucleotide.rb b/benchmark/prepare_so_k_nucleotide.rb
new file mode 100644
index 0000000000..f28f4460a1
--- /dev/null
+++ b/benchmark/prepare_so_k_nucleotide.rb
@@ -0,0 +1,2 @@
+require File.join(File.dirname(__FILE__), 'make_fasta_output')
+prepare_fasta_output(100_000)
diff --git a/benchmark/prepare_so_reverse_complement.rb b/benchmark/prepare_so_reverse_complement.rb
new file mode 100644
index 0000000000..7f089109de
--- /dev/null
+++ b/benchmark/prepare_so_reverse_complement.rb
@@ -0,0 +1,2 @@
+require File.join(File.dirname(__FILE__), 'make_fasta_output')
+prepare_fasta_output(2_500_000)
diff --git a/benchmark/report.rb b/benchmark/report.rb
new file mode 100644
index 0000000000..7aa852fc85
--- /dev/null
+++ b/benchmark/report.rb
@@ -0,0 +1,79 @@
+#
+# YARV benchmark driver
+#
+
+require 'yarvutil'
+require 'benchmark'
+require 'rbconfig'
+
+def exec_command type, file, w
+  <<-EOP
+  $DRIVER_PATH = '#{File.dirname($0)}'
+  $LOAD_PATH.replace $LOAD_PATH | #{$LOAD_PATH.inspect}
+  require 'benchmark'
+  require 'yarvutil'
+#  print '#{type}'
+  begin
+    puts Benchmark.measure{
+      #{w}('#{file}')
+    }.utime
+  rescue Exception => exec_command_error_variable
+    puts "\t" + exec_command_error_variable.message
+  end
+  EOP
+end
+
+def benchmark cmd
+  rubybin = ENV['RUBY'] || RbConfig.ruby
+    
+  IO.popen(rubybin, 'r+'){|io|
+    io.write cmd
+    io.close_write
+    return io.gets
+  }
+end
+
+def ruby_exec file
+  prog = exec_command 'ruby', file, 'load'
+  benchmark prog
+end
+
+def yarv_exec file
+  prog = exec_command 'yarv', file, 'YARVUtil.load_bm'
+  benchmark prog
+end
+
+$wr = $wy = nil
+
+def measure bench
+  file = File.dirname($0) + "/bm_#{bench}.rb"
+  r = ruby_exec(file).to_f
+  y = yarv_exec(file).to_f
+  puts "#{bench}\t#{r}\t#{y}"
+end
+
+def measure2
+  r = ruby_exec.to_f
+  y = yarv_exec.to_f
+  puts r/y
+end
+
+if $0 == __FILE__
+  %w{
+    whileloop
+    whileloop2
+    times
+    const
+    method
+    poly_method
+    block
+    rescue
+    rescue2
+  }.each{|bench|
+    measure bench
+  }
+end
+
+
+
+
diff --git a/benchmark/run.rb b/benchmark/run.rb
new file mode 100644
index 0000000000..6ef2943642
--- /dev/null
+++ b/benchmark/run.rb
@@ -0,0 +1,127 @@
+#
+# Ruby benchmark driver
+#
+
+require 'benchmark'
+require 'rbconfig'
+
+$matzrubyonly = false
+$rubyonly = false
+
+$results  = []
+
+# prepare 'wc.input'
+def prepare_wc_input
+  wcinput = File.join(File.dirname($0), 'wc.input')
+  wcbase  = File.join(File.dirname($0), 'wc.input.base')
+  unless FileTest.exist?(wcinput)
+    data = File.read(wcbase)
+    13.times{
+      data << data
+    }
+    open(wcinput, 'w'){|f| f.write data}
+  end
+end
+
+prepare_wc_input
+
+def bm file
+  prog = File.readlines(file).map{|e| e.rstrip}.join("\n")
+  return if prog.empty?
+
+  /[a-z]+_(.+)\.rb/ =~ file
+  bm_name = $1
+  puts '-----------------------------------------------------------' unless $rubyonly || $matzrubyonly
+  puts "#{bm_name}: "
+  
+  
+puts <<EOS unless $matzrubyonly || $rubyonly
+#{prog}
+--
+EOS
+  begin
+    result = [bm_name]
+    result << matzruby_exec(file) unless $rubyonly
+    result << ruby_exec(file) unless $matzrubyonly
+    $results << result
+
+  rescue Exception => e
+    puts
+    puts "** benchmark failure: #{e}"
+    puts e.backtrace
+  end
+end
+
+def benchmark file, bin
+  m = Benchmark.measure{
+    `#{bin} #{$opts} #{file}`
+  }
+  sec = '%.3f' % m.real
+  puts " #{sec}"
+  sec
+end
+
+def ruby_exec file
+  print 'ruby'
+  benchmark file, $ruby_program
+end
+
+def matzruby_exec file
+  print 'matz'
+  rubylib = ENV['RUBYLIB']
+  ENV['RUBYLIB'] = ''
+  r = benchmark file, $matzruby_program
+  ENV['RUBYLIB'] = rubylib
+  r
+end
+
+if $0 == __FILE__
+  ARGV.each{|arg|
+    case arg
+    when /\A--ruby=(.+)/
+      $ruby_program = $1
+    when /\A--matzruby=(.+)/
+      $matzruby_program = $1
+    when /\A--opts=(.+)/
+      $opts = $1
+    when /\A(-r|--only-ruby)\z/
+      $rubyonly = true
+    when /\A(-m|--only-matzruby)\z/
+      $matzrubyonly = true
+    end
+  }
+  ARGV.delete_if{|arg|
+    /\A-/ =~ arg
+  }
+  
+  puts "MatzRuby:"
+  system("#{$matzruby_program} -v")
+  puts "Ruby:"
+  system("#{$ruby_program} -v")
+  puts
+
+  if ARGV.empty?
+    Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
+      bm file
+    }
+  else
+    ARGV.each{|file|
+      Dir.glob(File.join(File.dirname(__FILE__), file + '*')){|ef|
+        # file = "#{File.dirname(__FILE__)}/#{file}.rb"
+        bm ef
+      }
+    }
+  end
+
+  puts
+  puts "-- benchmark summary ---------------------------"
+  $results.each{|res|
+    print res.shift, "\t"
+    (res||[]).each{|result|
+      /([\d\.]+)/ =~ result
+      print $1 + "\t" if $1
+    }
+    puts
+  }
+end
+
diff --git a/benchmark/runc.rb b/benchmark/runc.rb
new file mode 100644
index 0000000000..97c5cef045
--- /dev/null
+++ b/benchmark/runc.rb
@@ -0,0 +1,27 @@
+#
+#
+#
+
+require 'benchmark'
+require 'rbconfig'
+
+$rubybin = ENV['RUBY'] || RbConfig.ruby
+
+def runfile file
+  puts file
+  file = File.join(File.dirname($0), 'contrib', file)
+  Benchmark.bm{|x|
+    x.report('ruby'){
+      system("#{$rubybin} #{file}")
+    }
+    x.report('yarv'){
+      system("#{$rubybin} -rite -I.. #{file}")
+    }
+  }
+end
+
+ARGV.each{|file|
+  runfile file
+}
+
+
diff --git a/benchmark/wc.input.base b/benchmark/wc.input.base
new file mode 100644
index 0000000000..41143fbac0
--- /dev/null
+++ b/benchmark/wc.input.base
@@ -0,0 +1,25 @@
+Subject:      Re: Who was Izchak Miller?
+From:         "Jane D. Anonymous" <nobody@yale.edu>
+Date:         1996/04/28
+Message-Id:   <4lv7bc$oh@news.ycc.yale.edu>
+References:   <317C405E.5DFA@panix.com> <4lk6vl$gde@ns.oar.net>
+To:           75176.2330@compuserve.com
+Content-Type: text/plain; charset=us-ascii
+Organization: Yale University
+X-Url:        news:4lk6vl$gde@ns.oar.net
+Mime-Version: 1.0
+Newsgroups:   rec.games.roguelike.nethack
+X-Mailer:     Mozilla 1.1N (Macintosh; I; 68K)
+
+Hello there, Izchak Miller was my father.  When I was younger I spent 
+many a night, hunched over the keyboard with a cup of tea, playing 
+nethack with him and my brother.  my dad was a philosopher with a strong 
+weakness for fantasy/sci fi.  I remember when he started to get involved 
+with the Nethack team- my brother's Dungeons and Dragons monster book 
+found a regular place beside my dad's desk. it's nice to see him living 
+on in the game he loved so much :-).  
+                                                                  Tamar Miller
+
+The following is a really long word of 5000 characters:
+
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
diff --git a/bignum.c b/bignum.c
index e3d531ceaf..fdbd300660 100644
--- a/bignum.c
+++ b/bignum.c
@@ -3,20 +3,22 @@
   bignum.c -
 
   $Author$
-  $Date$
   created at: Fri Jun 10 00:48:55 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
+#include "ruby/util.h"
 
 #include <math.h>
+#include <float.h>
 #include <ctype.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
+#include <assert.h>
 
 VALUE rb_cBignum;
 
@@ -24,45 +26,124 @@ VALUE rb_cBignum;
 #define USHORT _USHORT
 #endif
 
-#define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
+#define BDIGITS(x) (RBIGNUM_DIGITS(x))
 #define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
 #define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
-#define DIGSPERLONG ((unsigned int)(SIZEOF_LONG/SIZEOF_BDIGITS))
+#define DIGSPERLONG (SIZEOF_LONG/SIZEOF_BDIGITS)
 #if HAVE_LONG_LONG
-# define DIGSPERLL ((unsigned int)(SIZEOF_LONG_LONG/SIZEOF_BDIGITS))
+# define DIGSPERLL (SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
 #endif
 #define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
 #define BIGDN(x) RSHIFT(x,BITSPERDIG)
 #define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
 #define BDIGMAX ((BDIGIT)-1)
 
-#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || \
+#define BIGZEROP(x) (RBIGNUM_LEN(x) == 0 || \
 		     (BDIGITS(x)[0] == 0 && \
-		      (RBIGNUM(x)->len == 1 || bigzero_p(x))))
+		      (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
 
-static int bigzero_p(VALUE);
 static int
-bigzero_p(x)
-    VALUE x;
+bigzero_p(VALUE x)
 {
     long i;
-    for (i = 0; i < RBIGNUM(x)->len; ++i) {
-	if (BDIGITS(x)[i]) return 0;
+    BDIGIT *ds = BDIGITS(x);
+
+    for (i = RBIGNUM_LEN(x) - 1; 0 <= i; i--) {
+	if (ds[i]) return 0;
     }
     return 1;
 }
 
+int
+rb_bigzero_p(VALUE x)
+{
+    return BIGZEROP(x);
+}
+
+int
+rb_cmpint(VALUE val, VALUE a, VALUE b)
+{
+    if (NIL_P(val)) {
+	rb_cmperr(a, b);
+    }
+    if (FIXNUM_P(val)) {
+        long l = FIX2LONG(val);
+        if (l > 0) return 1;
+        if (l < 0) return -1;
+        return 0;
+    }
+    if (TYPE(val) == T_BIGNUM) {
+	if (BIGZEROP(val)) return 0;
+	if (RBIGNUM_SIGN(val)) return 1;
+	return -1;
+    }
+    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
+    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
+    return 0;
+}
+
+#define RBIGNUM_SET_LEN(b,l) \
+    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+     (void)(RBASIC(b)->flags = \
+	    (RBASIC(b)->flags & ~RBIGNUM_EMBED_LEN_MASK) | \
+	    ((l) << RBIGNUM_EMBED_LEN_SHIFT)) : \
+     (void)(RBIGNUM(b)->as.heap.len = (l)))
+
+static void
+rb_big_realloc(VALUE big, long len)
+{
+    BDIGIT *ds;
+    if (RBASIC(big)->flags & RBIGNUM_EMBED_FLAG) {
+	if (RBIGNUM_EMBED_LEN_MAX < len) {
+	    ds = ALLOC_N(BDIGIT, len);
+	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX);
+	    RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big);
+	    RBIGNUM(big)->as.heap.digits = ds;
+	    RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG;
+	}
+    }
+    else {
+	if (len <= RBIGNUM_EMBED_LEN_MAX) {
+	    ds = RBIGNUM(big)->as.heap.digits;
+	    RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
+	    RBIGNUM_SET_LEN(big, len);
+	    if (ds) {
+		MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
+		xfree(ds);
+	    }
+	}
+	else {
+	    if (RBIGNUM_LEN(big) == 0) {
+		RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
+	    }
+	    else {
+		REALLOC_N(RBIGNUM(big)->as.heap.digits, BDIGIT, len);
+	    }
+	}
+    }
+}
+
+void
+rb_big_resize(VALUE big, long len)
+{
+    rb_big_realloc(big, len);
+    RBIGNUM_SET_LEN(big, len);
+}
+
 static VALUE
-bignew_1(klass, len, sign)
-    VALUE klass;
-    long len;
-    int sign;
+bignew_1(VALUE klass, long len, int sign)
 {
     NEWOBJ(big, struct RBignum);
     OBJSETUP(big, klass, T_BIGNUM);
-    big->sign = sign?1:0;
-    big->len = len;
-    big->digits = ALLOC_N(BDIGIT, len);
+    RBIGNUM_SET_SIGN(big, sign?1:0);
+    if (len <= RBIGNUM_EMBED_LEN_MAX) {
+	RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
+	RBIGNUM_SET_LEN(big, len);
+    }
+    else {
+	RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
+	RBIGNUM(big)->as.heap.len = len;
+    }
 
     return (VALUE)big;
 }
@@ -70,21 +151,26 @@ bignew_1(klass, len, sign)
 #define bignew(len,sign) bignew_1(rb_cBignum,len,sign)
 
 VALUE
-rb_big_clone(x)
-    VALUE x;
+rb_big_new(long len, int sign)
+{
+    return bignew(len, sign != 0);
+}
+
+VALUE
+rb_big_clone(VALUE x)
 {
-    VALUE z = bignew_1(CLASS_OF(x), RBIGNUM(x)->len, RBIGNUM(x)->sign);
+    long len = RBIGNUM_LEN(x);
+    VALUE z = bignew_1(CLASS_OF(x), len, RBIGNUM_SIGN(x));
 
-    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, RBIGNUM(x)->len);
+    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, len);
     return z;
 }
 
 /* modify a bignum by 2's complement */
 static void
-get2comp(x)
-    VALUE x;
+get2comp(VALUE x)
 {
-    long i = RBIGNUM(x)->len;
+    long i = RBIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
     BDIGIT_DBL num;
 
@@ -95,51 +181,56 @@ get2comp(x)
 	num += ds[i];
 	ds[i++] = BIGLO(num);
 	num = BIGDN(num);
-    } while (i < RBIGNUM(x)->len);
+    } while (i < RBIGNUM_LEN(x));
     if (num != 0) {
-	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
+	rb_big_resize(x, RBIGNUM_LEN(x)+1);
 	ds = BDIGITS(x);
-	ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
+	ds[RBIGNUM_LEN(x)-1] = 1;
     }
 }
 
 void
-rb_big_2comp(x)			/* get 2's complement */
-    VALUE x;
+rb_big_2comp(VALUE x)			/* get 2's complement */
 {
     get2comp(x);
 }
 
-static VALUE
-bigtrunc(x)
-    VALUE x;
+static inline VALUE
+bigtrunc(VALUE x)
 {
-    long len = RBIGNUM(x)->len;
+    long len = RBIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
 
     if (len == 0) return x;
     while (--len && !ds[len]);
-    RBIGNUM(x)->len = ++len;
+    if (RBIGNUM_LEN(x) > len+1) {
+	rb_big_resize(x, len+1);
+    }
     return x;
 }
 
-static VALUE
+static inline VALUE
 bigfixize(VALUE x)
 {
-    long len = RBIGNUM(x)->len;
+    long len = RBIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
 
-    if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
+    if (len == 0) return INT2FIX(0);
+    if ((size_t)(len*SIZEOF_BDIGITS) <= sizeof(long)) {
 	long num = 0;
+#if 2*SIZEOF_BDIGITS > SIZEOF_LONG
+	num = (long)ds[0];
+#else
 	while (len--) {
-	    num = BIGUP(num) + ds[len];
+	    num = (long)(BIGUP(num) + ds[len]);
 	}
+#endif
 	if (num >= 0) {
-	    if (RBIGNUM(x)->sign) {
+	    if (RBIGNUM_SIGN(x)) {
 		if (POSFIXABLE(num)) return LONG2FIX(num);
 	    }
 	    else {
-		if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
+		if (NEGFIXABLE(-num)) return LONG2FIX(-num);
 	    }
 	}
     }
@@ -156,15 +247,13 @@ bignorm(VALUE x)
 }
 
 VALUE
-rb_big_norm(x)
-    VALUE x;
+rb_big_norm(VALUE x)
 {
     return bignorm(x);
 }
 
 VALUE
-rb_uint2big(n)
-    unsigned long n;
+rb_uint2big(VALUE n)
 {
     BDIGIT_DBL num = n;
     long i = 0;
@@ -180,13 +269,12 @@ rb_uint2big(n)
 
     i = DIGSPERLONG;
     while (--i && !digits[i]) ;
-    RBIGNUM(big)->len = i+1;
+    RBIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
 VALUE
-rb_int2big(n)
-    long n;
+rb_int2big(SIGNED_VALUE n)
 {
     long neg = 0;
     VALUE big;
@@ -197,33 +285,132 @@ rb_int2big(n)
     }
     big = rb_uint2big(n);
     if (neg) {
-	RBIGNUM(big)->sign = 0;
+	RBIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
 
 VALUE
-rb_uint2inum(n)
-    unsigned long n;
+rb_uint2inum(VALUE n)
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_uint2big(n);
 }
 
 VALUE
-rb_int2inum(n)
-    long n;
+rb_int2inum(SIGNED_VALUE n)
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_int2big(n);
 }
 
-#ifdef HAVE_LONG_LONG
+#if SIZEOF_LONG % SIZEOF_BDIGITS != 0
+# error unexpected SIZEOF_LONG : SIZEOF_BDIGITS ratio
+#endif
 
+/*
+ * buf is an array of long integers.
+ * buf is ordered from least significant word to most significant word.
+ * buf[0] is the least significant word and
+ * buf[num_longs-1] is the most significant word.
+ * This means words in buf is little endian.
+ * However each word in buf is native endian.
+ * (buf[i]&1) is the least significant bit and
+ * (buf[i]&(1<<(SIZEOF_LONG*CHAR_BIT-1))) is the most significant bit
+ * for each 0 <= i < num_longs.
+ * So buf is little endian at whole on a little endian machine.
+ * But buf is mixed endian on a big endian machine.
+ */
 void
-rb_quad_pack(buf, val)
-    char *buf;
-    VALUE val;
+rb_big_pack(VALUE val, unsigned long *buf, long num_longs)
+{
+    val = rb_to_int(val);
+    if (num_longs == 0)
+        return;
+    if (FIXNUM_P(val)) {
+        long i;
+        long tmp = FIX2LONG(val);
+        buf[0] = (unsigned long)tmp;
+        tmp = tmp < 0 ? ~0L : 0;
+        for (i = 1; i < num_longs; i++)
+            buf[i] = (unsigned long)tmp;
+        return;
+    }
+    else {
+        long len = RBIGNUM_LEN(val);
+        BDIGIT *ds = BDIGITS(val), *dend = ds + len;
+        long i, j;
+        for (i = 0; i < num_longs && ds < dend; i++) {
+            unsigned long l = 0;
+            for (j = 0; j < DIGSPERLONG && ds < dend; j++, ds++) {
+                l |= ((unsigned long)*ds << (j * BITSPERDIG));
+            }
+            buf[i] = l;
+        }
+        for (; i < num_longs; i++)
+            buf[i] = 0;
+        if (RBIGNUM_NEGATIVE_P(val)) {
+            for (i = 0; i < num_longs; i++) {
+                buf[i] = ~buf[i];
+            }
+            for (i = 0; i < num_longs; i++) {
+                buf[i]++;
+                if (buf[i] != 0)
+                    return;
+            }
+        }
+    }
+}
+
+/* See rb_big_pack comment for endianness of buf. */
+VALUE
+rb_big_unpack(unsigned long *buf, long num_longs)
+{
+    while (2 <= num_longs) {
+        if (buf[num_longs-1] == 0 && (long)buf[num_longs-2] >= 0)
+            num_longs--;
+        else if (buf[num_longs-1] == ~0UL && (long)buf[num_longs-2] < 0)
+            num_longs--;
+        else
+            break;
+    }
+    if (num_longs == 0)
+        return INT2FIX(0);
+    else if (num_longs == 1)
+        return LONG2NUM((long)buf[0]);
+    else {
+        VALUE big;
+        BDIGIT *ds;
+        long len = num_longs * DIGSPERLONG;
+        long i;
+        big = bignew(len, 1);
+        ds = BDIGITS(big);
+        for (i = 0; i < num_longs; i++) {
+            unsigned long d = buf[i];
+#if SIZEOF_LONG == SIZEOF_BDIGITS
+            *ds++ = d;
+#else
+            int j;
+            for (j = 0; j < DIGSPERLONG; j++) {
+                *ds++ = BIGLO(d);
+                d = BIGDN(d);
+            }
+#endif
+        }
+        if ((long)buf[num_longs-1] < 0) {
+            get2comp(big);
+            RBIGNUM_SET_SIGN(big, 0);
+        }
+        return bignorm(big);
+    }
+}
+
+#define QUAD_SIZE 8
+
+#if SIZEOF_LONG_LONG == QUAD_SIZE && SIZEOF_BDIGITS*2 == SIZEOF_LONG_LONG
+
+void
+rb_quad_pack(char *buf, VALUE val)
 {
     LONG_LONG q;
 
@@ -232,26 +419,25 @@ rb_quad_pack(buf, val)
 	q = FIX2LONG(val);
     }
     else {
-	long len = RBIGNUM(val)->len;
+	long len = RBIGNUM_LEN(val);
 	BDIGIT *ds;
 
-	if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
-	    rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
+	if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS) {
+	    len = SIZEOF_LONG_LONG/SIZEOF_BDIGITS;
+	}
 	ds = BDIGITS(val);
 	q = 0;
 	while (len--) {
 	    q = BIGUP(q);
 	    q += ds[len];
 	}
-	if (!RBIGNUM(val)->sign) q = -q;
+	if (!RBIGNUM_SIGN(val)) q = -q;
     }
     memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
 }
 
 VALUE
-rb_quad_unpack(buf, sign)
-    const char *buf;
-    int sign;
+rb_quad_unpack(const char *buf, int sign)
 {
     unsigned LONG_LONG q;
     long neg = 0;
@@ -281,22 +467,32 @@ rb_quad_unpack(buf, sign)
 
     i = DIGSPERLL;
     while (i-- && !digits[i]) ;
-    RBIGNUM(big)->len = i+1;
+    RBIGNUM_SET_LEN(big, i+1);
 
     if (neg) {
-	RBIGNUM(big)->sign = 0;
+	RBIGNUM_SET_SIGN(big, 0);
     }
     return bignorm(big);
 }
 
 #else
 
-#define QUAD_SIZE 8
+static int
+quad_buf_complement(char *buf, size_t len)
+{
+    size_t i;
+    for (i = 0; i < len; i++)
+        buf[i] = ~buf[i];
+    for (i = 0; i < len; i++) {
+        buf[i]++;
+        if (buf[i] != 0)
+            return 0;
+    }
+    return 1;
+}
 
 void
-rb_quad_pack(buf, val)
-    char *buf;
-    VALUE val;
+rb_quad_pack(char *buf, VALUE val)
 {
     long len;
 
@@ -305,39 +501,29 @@ rb_quad_pack(buf, val)
     if (FIXNUM_P(val)) {
 	val = rb_int2big(FIX2LONG(val));
     }
-    len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
+    len = RBIGNUM_LEN(val) * SIZEOF_BDIGITS;
     if (len > QUAD_SIZE) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
+        len = QUAD_SIZE;
     }
     memcpy(buf, (char*)BDIGITS(val), len);
-    if (!RBIGNUM(val)->sign) {
-	len = QUAD_SIZE;
-	while (len--) {
-	    *buf = ~*buf;
-	    buf++;
-	}
+    if (RBIGNUM_NEGATIVE_P(val)) {
+        quad_buf_complement(buf, QUAD_SIZE);
     }
 }
 
 #define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
 
 VALUE
-rb_quad_unpack(buf, sign)
-    const char *buf;
-    int sign;
+rb_quad_unpack(const char *buf, int sign)
 {
     VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
 
     memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
     if (sign && BNEG(buf)) {
-	long len = QUAD_SIZE;
 	char *tmp = (char*)BDIGITS(big);
 
-	RBIGNUM(big)->sign = 0;
-	while (len--) {
-	    *tmp = ~*tmp;
-	    tmp++;
-	}
+	RBIGNUM_SET_SIGN(big, 0);
+        quad_buf_complement(tmp, QUAD_SIZE);
     }
 
     return bignorm(big);
@@ -346,10 +532,7 @@ rb_quad_unpack(buf, sign)
 #endif
 
 VALUE
-rb_cstr_to_inum(str, base, badcheck)
-    const char *str;
-    int base;
-    int badcheck;
+rb_cstr_to_inum(const char *str, int base, int badcheck)
 {
     const char *s = str;
     char *end;
@@ -361,23 +544,20 @@ rb_cstr_to_inum(str, base, badcheck)
     VALUE z;
     BDIGIT *zds;
 
+#undef ISDIGIT
+#define ISDIGIT(c) ('0' <= (c) && (c) <= '9')
 #define conv_digit(c) \
     (!ISASCII(c) ? -1 : \
-     isdigit(c) ? ((c) - '0') : \
-     islower(c) ? ((c) - 'a' + 10) : \
-     isupper(c) ? ((c) - 'A' + 10) : \
+     ISDIGIT(c) ? ((c) - '0') : \
+     ISLOWER(c) ? ((c) - 'a' + 10) : \
+     ISUPPER(c) ? ((c) - 'A' + 10) : \
      -1)
 
     if (!str) {
 	if (badcheck) goto bad;
 	return INT2FIX(0);
     }
-    if (badcheck) {
-	while (ISSPACE(*str)) str++;
-    }
-    else {
-	while (ISSPACE(*str) || *str == '_') str++;
-    }
+    while (ISSPACE(*str)) str++;
 
     if (str[0] == '+') {
 	str++;
@@ -448,7 +628,7 @@ rb_cstr_to_inum(str, base, badcheck)
 	break;
       default:
 	if (base < 2 || 36 < base) {
-	    rb_raise(rb_eArgError, "illegal radix %d", base);
+	    rb_raise(rb_eArgError, "invalid radix %d", base);
 	}
 	if (base <= 32) {
 	    len = 5;
@@ -458,8 +638,15 @@ rb_cstr_to_inum(str, base, badcheck)
 	}
 	break;
     }
-    if (*str == '0') {		/* squeeze preceeding 0s */
-	while (*++str == '0');
+    if (*str == '0') {		/* squeeze preceding 0s */
+	int us = 0;
+	while ((c = *++str) == '0' || c == '_') {
+	    if (c == '_') {
+		if (++us >= 2)
+		    break;
+	    } else
+		us = 0;
+	}
 	if (!(c = *str) || ISSPACE(c)) --str;
     }
     c = *str;
@@ -470,10 +657,10 @@ rb_cstr_to_inum(str, base, badcheck)
     }
     len *= strlen(str)*sizeof(char);
 
-    if (len <= (sizeof(VALUE)*CHAR_BIT)) {
-	unsigned long val = strtoul((char*)str, &end, base);
+    if ((size_t)len <= (sizeof(long)*CHAR_BIT)) {
+	unsigned long val = STRTOUL(str, &end, base);
 
-	if (*end == '_') goto bigparse;
+	if (str < end && *end == '_') goto bigparse;
 	if (badcheck) {
 	    if (end == str) goto bad; /* no number */
 	    while (*end && ISSPACE(*end)) end++;
@@ -489,7 +676,7 @@ rb_cstr_to_inum(str, base, badcheck)
 	}
 	else {
 	    VALUE big = rb_uint2big(val);
-	    RBIGNUM(big)->sign = sign;
+	    RBIGNUM_SET_SIGN(big, sign);
 	    return bignorm(big);
 	}
     }
@@ -502,10 +689,11 @@ rb_cstr_to_inum(str, base, badcheck)
     for (i=len;i--;) zds[i]=0;
     while ((c = *str++) != 0) {
 	if (c == '_') {
-	    if (badcheck) {
-		if (nondigit) goto bad;
-		nondigit = c;
+	    if (nondigit) {
+		if (badcheck) goto bad;
+		break;
 	    }
+	    nondigit = c;
 	    continue;
 	}
 	else if ((c = conv_digit(c)) < 0) {
@@ -534,7 +722,7 @@ rb_cstr_to_inum(str, base, badcheck)
 	while (*str && ISSPACE(*str)) str++;
 	if (*str) {
 	  bad:
-	    rb_invalid_str(s, "Integer");
+	    rb_invalid_str(s, "Integer()");
 	}
     }
 
@@ -542,10 +730,7 @@ rb_cstr_to_inum(str, base, badcheck)
 }
 
 VALUE
-rb_str_to_inum(str, base, badcheck)
-    VALUE str;
-    int base;
-    int badcheck;
+rb_str_to_inum(VALUE str, int base, int badcheck)
 {
     char *s;
     long len;
@@ -555,10 +740,10 @@ rb_str_to_inum(str, base, badcheck)
 	s = StringValueCStr(str);
     }
     else {
-	s = RSTRING(str)->ptr;
+	s = RSTRING_PTR(str);
     }
     if (s) {
-	len = RSTRING(str)->len;
+	len = RSTRING_LEN(str);
 	if (s[len]) {		/* no sentinel somehow */
 	    char *p = ALLOCA_N(char, len+1);
 
@@ -567,14 +752,13 @@ rb_str_to_inum(str, base, badcheck)
 	    s = p;
 	}
     }
-    return rb_cstr_to_inum(s, base, badcheck); 
+    return rb_cstr_to_inum(s, base, badcheck);
 }
 
 #if HAVE_LONG_LONG
 
-VALUE
-rb_ull2big(n)
-    unsigned LONG_LONG n;
+static VALUE
+rb_ull2big(unsigned LONG_LONG n)
 {
     BDIGIT_DBL num = n;
     long i = 0;
@@ -590,13 +774,12 @@ rb_ull2big(n)
 
     i = DIGSPERLL;
     while (i-- && !digits[i]) ;
-    RBIGNUM(big)->len = i+1;
+    RBIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
-VALUE
-rb_ll2big(n)
-    LONG_LONG n;
+static VALUE
+rb_ll2big(LONG_LONG n)
 {
     long neg = 0;
     VALUE big;
@@ -607,113 +790,222 @@ rb_ll2big(n)
     }
     big = rb_ull2big(n);
     if (neg) {
-	RBIGNUM(big)->sign = 0;
+	RBIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
 
 VALUE
-rb_ull2inum(n)
-    unsigned LONG_LONG n;
+rb_ull2inum(unsigned LONG_LONG n)
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_ull2big(n);
 }
 
 VALUE
-rb_ll2inum(n)
-    LONG_LONG n;
+rb_ll2inum(LONG_LONG n)
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_ll2big(n);
 }
 
 #endif  /* HAVE_LONG_LONG */
- 
+
 VALUE
-rb_cstr2inum(str, base)
-    const char *str;
-    int base;
+rb_cstr2inum(const char *str, int base)
 {
     return rb_cstr_to_inum(str, base, base==0);
 }
 
 VALUE
-rb_str2inum(str, base)
-    VALUE str;
-    int base;
+rb_str2inum(VALUE str, int base)
 {
     return rb_str_to_inum(str, base, base==0);
 }
 
 const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-VALUE
-rb_big2str0(x, base, trim)
-    VALUE x;
-    int base;
-    int trim;
+
+static VALUE bigsqr(VALUE x);
+static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp);
+
+#define POW2_P(x) (((x)&((x)-1))==0)
+
+static inline int
+ones(register unsigned long x)
 {
-    volatile VALUE t;
-    BDIGIT *ds;
-    long i, j, hbase;
-    VALUE ss;
-    char *s;
+#if SIZEOF_LONG == 8
+# define MASK_55 0x5555555555555555UL
+# define MASK_33 0x3333333333333333UL
+# define MASK_0f 0x0f0f0f0f0f0f0f0fUL
+#else
+# define MASK_55 0x55555555UL
+# define MASK_33 0x33333333UL
+# define MASK_0f 0x0f0f0f0fUL
+#endif
+    x -= (x >> 1) & MASK_55;
+    x = ((x >> 2) & MASK_33) + (x & MASK_33);
+    x = ((x >> 4) + x) & MASK_0f;
+    x += (x >> 8);
+    x += (x >> 16);
+#if SIZEOF_LONG == 8
+    x += (x >> 32);
+#endif
+    return (int)(x & 0x7f);
+#undef MASK_0f
+#undef MASK_33
+#undef MASK_55
+}
+
+static inline unsigned long
+next_pow2(register unsigned long x)
+{
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+#if SIZEOF_LONG == 8
+    x |= x >> 32;
+#endif
+    return x + 1;
+}
+
+static inline int
+floor_log2(register unsigned long x)
+{
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+#if SIZEOF_LONG == 8
+    x |= x >> 32;
+#endif
+    return (int)ones(x) - 1;
+}
+
+static inline int
+ceil_log2(register unsigned long x)
+{
+    return floor_log2(x) + !POW2_P(x);
+}
+
+#define LOG2_KARATSUBA_DIGITS 7
+#define KARATSUBA_DIGITS (1L<<LOG2_KARATSUBA_DIGITS)
+#define MAX_BIG2STR_TABLE_ENTRIES 64
+
+static VALUE big2str_power_cache[35][MAX_BIG2STR_TABLE_ENTRIES];
+
+static void
+power_cache_init(void)
+{
+    int i, j;
+    for (i = 0; i < 35; ++i) {
+	for (j = 0; j < MAX_BIG2STR_TABLE_ENTRIES; ++j) {
+	    big2str_power_cache[i][j] = Qnil;
+	}
+    }
+}
+
+static inline VALUE
+power_cache_get_power0(int base, int i)
+{
+    if (NIL_P(big2str_power_cache[base - 2][i])) {
+	big2str_power_cache[base - 2][i] =
+	    i == 0 ? rb_big_pow(rb_int2big(base), INT2FIX(KARATSUBA_DIGITS))
+		   : bigsqr(power_cache_get_power0(base, i - 1));
+	rb_gc_register_mark_object(big2str_power_cache[base - 2][i]);
+    }
+    return big2str_power_cache[base - 2][i];
+}
+
+static VALUE
+power_cache_get_power(int base, long n1, long* m1)
+{
+    int i, m;
+    long j;
+    VALUE t;
+
+    if (n1 <= KARATSUBA_DIGITS)
+	rb_bug("n1 > KARATSUBA_DIGITS");
+
+    m = ceil_log2(n1);
+    if (m1) *m1 = 1 << m;
+    i = m - LOG2_KARATSUBA_DIGITS;
+    if (i >= MAX_BIG2STR_TABLE_ENTRIES)
+	i = MAX_BIG2STR_TABLE_ENTRIES - 1;
+    t = power_cache_get_power0(base, i);
+
+    j = KARATSUBA_DIGITS*(1 << i);
+    while (n1 > j) {
+	t = bigsqr(t);
+	j *= 2;
+    }
+    return t;
+}
+
+/* big2str_muraken_find_n1
+ *
+ * Let a natural number x is given by:
+ * x = 2^0 * x_0 + 2^1 * x_1 + ... + 2^(B*n_0 - 1) * x_{B*n_0 - 1},
+ * where B is BITSPERDIG (i.e. BDIGITS*CHAR_BIT) and n_0 is
+ * RBIGNUM_LEN(x).
+ *
+ * Now, we assume n_1 = min_n \{ n | 2^(B*n_0/2) <= b_1^(n_1) \}, so
+ * it is realized that 2^(B*n_0) <= {b_1}^{2*n_1}, where b_1 is a
+ * given radix number. And then, we have n_1 <= (B*n_0) /
+ * (2*log_2(b_1)), therefore n_1 is given by ceil((B*n_0) /
+ * (2*log_2(b_1))).
+ */
+static long
+big2str_find_n1(VALUE x, int base)
+{
+    static const double log_2[] = {
+	1.0,              1.58496250072116, 2.0,
+	2.32192809488736, 2.58496250072116, 2.8073549220576,
+	3.0,              3.16992500144231, 3.32192809488736,
+	3.4594316186373,  3.58496250072116, 3.70043971814109,
+	3.8073549220576,  3.90689059560852, 4.0,
+	4.08746284125034, 4.16992500144231, 4.24792751344359,
+	4.32192809488736, 4.39231742277876, 4.4594316186373,
+	4.52356195605701, 4.58496250072116, 4.64385618977472,
+	4.70043971814109, 4.75488750216347, 4.8073549220576,
+	4.85798099512757, 4.90689059560852, 4.95419631038688,
+	5.0,              5.04439411935845, 5.08746284125034,
+	5.12928301694497, 5.16992500144231
+    };
+    long bits;
+
+    if (base < 2 || 36 < base)
+	rb_bug("invalid radix %d", base);
 
     if (FIXNUM_P(x)) {
-	return rb_fix2str(x, base);
+	bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
     }
-    i = RBIGNUM(x)->len;
-    if (BIGZEROP(x)) {
-	return rb_str_new2("0");
+    else if (BIGZEROP(x)) {
+	return 0;
     }
-    if (i >= LONG_MAX/SIZEOF_BDIGITS/CHAR_BIT) {
+    else if (RBIGNUM_LEN(x) >= LONG_MAX/BITSPERDIG) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
     }
-    j = SIZEOF_BDIGITS*CHAR_BIT*i;
-    switch (base) {
-      case 2: break;
-      case 3:
-	j = j * 53L / 84 + 1;
-	break;
-      case 4: case 5: case 6: case 7:
-	j = (j + 1) / 2;
-	break;
-      case 8: case 9:
-	j = (j + 2) / 3;
-	break;
-      case 10: case 11: case 12: case 13: case 14: case 15:
-	j = j * 28L / 93 + 1;
-	break;
-      case 16: case 17: case 18: case 19: case 20: case 21:
-      case 22: case 23: case 24: case 25: case 26: case 27:
-      case 28: case 29: case 30: case 31:
-	j = (j + 3) / 4;
-	break;
-      case 32: case 33: case 34: case 35: case 36:
-	j = (j + 4) / 5;
-	break;
-      default:
-	rb_raise(rb_eArgError, "illegal radix %d", base);
-	break;
+    else {
+	bits = BITSPERDIG*RBIGNUM_LEN(x);
     }
-    j++;			/* space for sign */
 
-    hbase = base * base;
-#if SIZEOF_BDIGITS > 2
-    hbase *= hbase;
-#endif
+    return (long)ceil(bits/log_2[base - 2]);
+}
 
-    t = rb_big_clone(x);
-    ds = BDIGITS(t);
-    ss = rb_str_new(0, j+1);
-    s = RSTRING(ss)->ptr;
+static long
+big2str_orig(VALUE x, int base, char* ptr, long len, long hbase, int trim)
+{
+    long i = RBIGNUM_LEN(x), j = len;
+    BDIGIT* ds = BDIGITS(x);
 
-    s[0] = RBIGNUM(x)->sign ? '+' : '-';
-    while (i && j > 1) {
+    while (i && j > 0) {
 	long k = i;
 	BDIGIT_DBL num = 0;
 
-	while (k--) {
+	while (k--) {               /* x / hbase */
 	    num = BIGUP(num) + ds[k];
 	    ds[k] = (BDIGIT)(num / hbase);
 	    num %= hbase;
@@ -721,23 +1013,93 @@ rb_big2str0(x, base, trim)
 	if (trim && ds[i-1] == 0) i--;
 	k = SIZEOF_BDIGITS;
 	while (k--) {
-	    s[--j] = ruby_digitmap[num % base];
+	    ptr[--j] = ruby_digitmap[num % base];
 	    num /= base;
-	    if (!trim && j <= 1) break;
+	    if (j <= 0) break;
 	    if (trim && i == 0 && num == 0) break;
 	}
     }
-    if (trim) {while (s[j] == '0') j++;}
-    i = RSTRING(ss)->len - j;
-    if (RBIGNUM(x)->sign) {
-	memmove(s, s+j, i);
-	RSTRING(ss)->len = i-1;
+    if (trim) {
+	while (j < len && ptr[j] == '0') j++;
+	MEMMOVE(ptr, ptr + j, char, len - j);
+	len -= j;
+    }
+    return len;
+}
+
+static long
+big2str_karatsuba(VALUE x, int base, char* ptr,
+		  long n1, long len, long hbase, int trim)
+{
+    long lh, ll, m1;
+    VALUE b, q, r;
+
+    if (BIGZEROP(x)) {
+	if (trim) return 0;
+	else {
+	    memset(ptr, '0', len);
+	    return len;
+	}
+    }
+
+    if (n1 <= KARATSUBA_DIGITS) {
+	return big2str_orig(x, base, ptr, len, hbase, trim);
+    }
+
+    b = power_cache_get_power(base, n1, &m1);
+    bigdivmod(x, b, &q, &r);
+    lh = big2str_karatsuba(q, base, ptr, (len - m1)/2,
+			   len - m1, hbase, trim);
+    rb_big_resize(q, 0);
+    ll = big2str_karatsuba(r, base, ptr + lh, m1/2,
+			   m1, hbase, !lh && trim);
+    rb_big_resize(r, 0);
+
+    return lh + ll;
+}
+
+VALUE
+rb_big2str0(VALUE x, int base, int trim)
+{
+    int off;
+    VALUE ss, xx;
+    long n1, n2, len, hbase;
+    char* ptr;
+
+    if (FIXNUM_P(x)) {
+	return rb_fix2str(x, base);
+    }
+    if (BIGZEROP(x)) {
+	return rb_usascii_str_new2("0");
+    }
+
+    if (base < 2 || 36 < base)
+	rb_raise(rb_eArgError, "invalid radix %d", base);
+
+    n2 = big2str_find_n1(x, base);
+    n1 = (n2 + 1) / 2;
+    ss = rb_usascii_str_new(0, n2 + 1); /* plus one for sign */
+    ptr = RSTRING_PTR(ss);
+    ptr[0] = RBIGNUM_SIGN(x) ? '+' : '-';
+
+    hbase = base*base;
+#if SIZEOF_BDIGITS > 2
+    hbase *= hbase;
+#endif
+    off = !(trim && RBIGNUM_SIGN(x)); /* erase plus sign if trim */
+    xx = rb_big_clone(x);
+    RBIGNUM_SET_SIGN(xx, 1);
+    if (n1 <= KARATSUBA_DIGITS) {
+	len = off + big2str_orig(xx, base, ptr + off, n2, hbase, trim);
     }
     else {
-	memmove(s+1, s+j, i);
-	RSTRING(ss)->len = i;
+	len = off + big2str_karatsuba(xx, base, ptr + off, n1,
+				      n2, hbase, trim);
     }
-    s[RSTRING(ss)->len] = '\0';
+    rb_big_resize(xx, 0);
+
+    ptr[len] = '\0';
+    rb_str_resize(ss, len);
 
     return ss;
 }
@@ -745,16 +1107,16 @@ rb_big2str0(x, base, trim)
 VALUE
 rb_big2str(VALUE x, int base)
 {
-    return rb_big2str0(x, base, Qtrue);
+    return rb_big2str0(x, base, 1);
 }
 
 /*
  *  call-seq:
- *     big.to_s(base=10)   =>  string
- *  
+ *     big.to_s(base=10)   ->  string
+ *
  *  Returns a string containing the representation of <i>big</i> radix
  *  <i>base</i> (2 through 36).
- *     
+ *
  *     12345654321.to_s         #=> "12345654321"
  *     12345654321.to_s(2)      #=> "1011011111110110111011110000110001"
  *     12345654321.to_s(8)      #=> "133766736061"
@@ -763,87 +1125,84 @@ rb_big2str(VALUE x, int base)
  */
 
 static VALUE
-rb_big_to_s(argc, argv, x)
-    int argc;
-    VALUE *argv;
-    VALUE x;
+rb_big_to_s(int argc, VALUE *argv, VALUE x)
 {
-    VALUE b;
     int base;
 
-    rb_scan_args(argc, argv, "01", &b);
     if (argc == 0) base = 10;
-    else base = NUM2INT(b);
+    else {
+	VALUE b;
+
+	rb_scan_args(argc, argv, "01", &b);
+	base = NUM2INT(b);
+    }
     return rb_big2str(x, base);
 }
 
-static unsigned long
-big2ulong(x, type)
-    VALUE x;
-    char *type;
+static VALUE
+big2ulong(VALUE x, const char *type, int check)
 {
-    long len = RBIGNUM(x)->len;
+    long len = RBIGNUM_LEN(x);
     BDIGIT_DBL num;
     BDIGIT *ds;
 
-    if (len > SIZEOF_LONG/SIZEOF_BDIGITS)
-	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+    if (len > DIGSPERLONG) {
+	if (check)
+	    rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+	len = DIGSPERLONG;
+    }
     ds = BDIGITS(x);
     num = 0;
     while (len--) {
 	num = BIGUP(num);
 	num += ds[len];
     }
-    return num;
+    return (VALUE)num;
 }
 
-unsigned long
-rb_big2ulong_pack(x)   
-    VALUE x;  
-{   
-    unsigned long num = big2ulong(x, "unsigned long");
-    if (!RBIGNUM(x)->sign) {
-	return -num;
+VALUE
+rb_big2ulong_pack(VALUE x)
+{
+    VALUE num = big2ulong(x, "unsigned long", FALSE);
+    if (!RBIGNUM_SIGN(x)) {
+	return (VALUE)(-(SIGNED_VALUE)num);
     }
     return num;
-}  
+}
 
-unsigned long
-rb_big2ulong(x)
-    VALUE x;
+VALUE
+rb_big2ulong(VALUE x)
 {
-    unsigned long num = big2ulong(x, "unsigned long");
+    VALUE num = big2ulong(x, "unsigned long", TRUE);
 
-    if (!RBIGNUM(x)->sign) {
-	if ((long)num < 0) {
+    if (!RBIGNUM_SIGN(x)) {
+	if ((SIGNED_VALUE)num < 0) {
 	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 	}
-	return -num;
+	return (VALUE)(-(SIGNED_VALUE)num);
     }
     return num;
 }
 
-long
-rb_big2long(x)
-    VALUE x;
+SIGNED_VALUE
+rb_big2long(VALUE x)
 {
-    unsigned long num = big2ulong(x, "long");
+    VALUE num = big2ulong(x, "long", TRUE);
 
-    if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
+    if ((SIGNED_VALUE)num < 0 &&
+	(RBIGNUM_SIGN(x) || (SIGNED_VALUE)num != LONG_MIN)) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
     }
-    if (!RBIGNUM(x)->sign) return -(long)num;
+    if (!RBIGNUM_SIGN(x)) return -(SIGNED_VALUE)num;
     return num;
 }
 
 #if HAVE_LONG_LONG
 
 static unsigned LONG_LONG
-big2ull(x, type)
-    VALUE x;
-    char *type;
+big2ull(VALUE x, const char *type)
 {
-    long len = RBIGNUM(x)->len;
+    long len = RBIGNUM_LEN(x);
     BDIGIT_DBL num;
     BDIGIT *ds;
 
@@ -859,34 +1218,32 @@ big2ull(x, type)
 }
 
 unsigned LONG_LONG
-rb_big2ull(x)
-    VALUE x;
+rb_big2ull(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "unsigned long long");
 
-    if (!RBIGNUM(x)->sign) return -num;
+    if (!RBIGNUM_SIGN(x))
+	return (VALUE)(-(SIGNED_VALUE)num);
     return num;
 }
 
 LONG_LONG
-rb_big2ll(x)
-    VALUE x;
+rb_big2ll(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "long long");
 
-    if ((LONG_LONG)num < 0 && (RBIGNUM(x)->sign
+    if ((LONG_LONG)num < 0 && (RBIGNUM_SIGN(x)
 			       || (LONG_LONG)num != LLONG_MIN)) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
     }
-    if (!RBIGNUM(x)->sign) return -(LONG_LONG)num;
+    if (!RBIGNUM_SIGN(x)) return -(LONG_LONG)num;
     return num;
 }
 
 #endif  /* HAVE_LONG_LONG */
 
 static VALUE
-dbl2big(d)
-    double d;
+dbl2big(double d)
 {
     long i = 0;
     BDIGIT c;
@@ -918,62 +1275,126 @@ dbl2big(d)
 }
 
 VALUE
-rb_dbl2big(d)
-    double d;
+rb_dbl2big(double d)
 {
     return bignorm(dbl2big(d));
 }
 
-double
-rb_big2dbl(x)
-    VALUE x;
+static int
+nlz(BDIGIT x)
+{
+    BDIGIT y;
+    int n = BITSPERDIG;
+#if BITSPERDIG > 64
+    y = x >> 64; if (y) {n -= 64; x = y;}
+#endif
+#if BITSPERDIG > 32
+    y = x >> 32; if (y) {n -= 32; x = y;}
+#endif
+#if BITSPERDIG > 16
+    y = x >> 16; if (y) {n -= 16; x = y;}
+#endif
+    y = x >>  8; if (y) {n -=  8; x = y;}
+    y = x >>  4; if (y) {n -=  4; x = y;}
+    y = x >>  2; if (y) {n -=  2; x = y;}
+    y = x >>  1; if (y) {return n - 2;}
+    return n - x;
+}
+
+static double
+big2dbl(VALUE x)
 {
     double d = 0.0;
-    long i = RBIGNUM(x)->len;
-    BDIGIT *ds = BDIGITS(x);
+    long i = (bigtrunc(x), RBIGNUM_LEN(x)), lo = 0, bits;
+    BDIGIT *ds = BDIGITS(x), dl;
 
-    while (i--) {
-	d = ds[i] + BIGRAD*d;
+    if (i) {
+	bits = i * BITSPERDIG - nlz(ds[i-1]);
+	if (bits > DBL_MANT_DIG+DBL_MAX_EXP) {
+	    d = HUGE_VAL;
+	}
+	else {
+	    if (bits > DBL_MANT_DIG+1)
+		lo = (bits -= DBL_MANT_DIG+1) / BITSPERDIG;
+	    else
+		bits = 0;
+	    while (--i > lo) {
+		d = ds[i] + BIGRAD*d;
+	    }
+	    dl = ds[i];
+	    if (bits && (dl & (1UL << (bits %= BITSPERDIG)))) {
+		int carry = dl & ~(~(BDIGIT)0 << bits);
+		if (!carry) {
+		    while (i-- > 0) {
+			if ((carry = ds[i]) != 0) break;
+		    }
+		}
+		if (carry) {
+		    dl &= (BDIGIT)~0 << bits;
+		    dl += (BDIGIT)1 << bits;
+		    if (!dl) d += 1;
+		}
+	    }
+	    d = dl + BIGRAD*d;
+	    if (lo) {
+		if (lo > INT_MAX / BITSPERDIG)
+		    d = HUGE_VAL;
+		else if (lo < INT_MIN / BITSPERDIG)
+		    d = 0.0;
+		else
+		    d = ldexp(d, (int)(lo * BITSPERDIG));
+	    }
+	}
     }
+    if (!RBIGNUM_SIGN(x)) d = -d;
+    return d;
+}
+
+double
+rb_big2dbl(VALUE x)
+{
+    double d = big2dbl(x);
+
     if (isinf(d)) {
-	rb_warn("Bignum out of Float range");
-	d = HUGE_VAL;
+	rb_warning("Bignum out of Float range");
+	if (d < 0.0)
+	    d = -HUGE_VAL;
+	else
+	    d = HUGE_VAL;
     }
-    if (!RBIGNUM(x)->sign) d = -d;
     return d;
 }
 
 /*
  *  call-seq:
  *     big.to_f -> float
- *  
+ *
  *  Converts <i>big</i> to a <code>Float</code>. If <i>big</i> doesn't
  *  fit in a <code>Float</code>, the result is infinity.
- *     
+ *
  */
 
 static VALUE
-rb_big_to_f(x)
-    VALUE x;
+rb_big_to_f(VALUE x)
 {
-    return rb_float_new(rb_big2dbl(x));
+    return DBL2NUM(rb_big2dbl(x));
 }
 
 /*
  *  call-seq:
- *     big <=> numeric   => -1, 0, +1
- *  
+ *     big <=> numeric   -> -1, 0, +1 or nil
+ *
  *  Comparison---Returns -1, 0, or +1 depending on whether <i>big</i> is
  *  less than, equal to, or greater than <i>numeric</i>. This is the
  *  basis for the tests in <code>Comparable</code>.
- *     
+ *
  */
 
-static VALUE
-rb_big_cmp(x, y)
-    VALUE x, y;
+VALUE
+rb_big_cmp(VALUE x, VALUE y)
 {
-    long xlen = RBIGNUM(x)->len;
+    long xlen = RBIGNUM_LEN(x);
+    BDIGIT *xds, *yds;
 
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -984,40 +1405,156 @@ rb_big_cmp(x, y)
 	break;
 
       case T_FLOAT:
-	return rb_dbl_cmp(rb_big2dbl(x), RFLOAT(y)->value);
+	{
+	    double a = RFLOAT_VALUE(y);
+
+	    if (isinf(a)) {
+		if (a > 0.0) return INT2FIX(-1);
+		else return INT2FIX(1);
+	    }
+	    return rb_dbl_cmp(rb_big2dbl(x), a);
+	}
 
       default:
-	return rb_num_coerce_cmp(x, y);
+	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
     }
 
-    if (RBIGNUM(x)->sign > RBIGNUM(y)->sign) return INT2FIX(1);
-    if (RBIGNUM(x)->sign < RBIGNUM(y)->sign) return INT2FIX(-1);
-    if (xlen < RBIGNUM(y)->len)
-	return (RBIGNUM(x)->sign) ? INT2FIX(-1) : INT2FIX(1);
-    if (xlen > RBIGNUM(y)->len)
-	return (RBIGNUM(x)->sign) ? INT2FIX(1) : INT2FIX(-1);
+    if (RBIGNUM_SIGN(x) > RBIGNUM_SIGN(y)) return INT2FIX(1);
+    if (RBIGNUM_SIGN(x) < RBIGNUM_SIGN(y)) return INT2FIX(-1);
+    if (xlen < RBIGNUM_LEN(y))
+	return (RBIGNUM_SIGN(x)) ? INT2FIX(-1) : INT2FIX(1);
+    if (xlen > RBIGNUM_LEN(y))
+	return (RBIGNUM_SIGN(x)) ? INT2FIX(1) : INT2FIX(-1);
+
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
 
-    while(xlen-- && (BDIGITS(x)[xlen]==BDIGITS(y)[xlen]));
+    while(xlen-- && (xds[xlen]==yds[xlen]));
     if (-1 == xlen) return INT2FIX(0);
-    return (BDIGITS(x)[xlen] > BDIGITS(y)[xlen]) ?
-	(RBIGNUM(x)->sign ? INT2FIX(1) : INT2FIX(-1)) :
-	    (RBIGNUM(x)->sign ? INT2FIX(-1) : INT2FIX(1));
+    return (xds[xlen] > yds[xlen]) ?
+	(RBIGNUM_SIGN(x) ? INT2FIX(1) : INT2FIX(-1)) :
+	    (RBIGNUM_SIGN(x) ? INT2FIX(-1) : INT2FIX(1));
+}
+
+static VALUE
+big_op(VALUE x, VALUE y, int op)
+{
+    VALUE rel;
+    int n;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+      case T_BIGNUM:
+	rel = rb_big_cmp(x, y);
+	break;
+
+      case T_FLOAT:
+	{
+	    double a = RFLOAT_VALUE(y);
+
+	    if (isinf(a)) {
+		if (a > 0.0) rel = INT2FIX(-1);
+		else rel = INT2FIX(1);
+		break;
+	    }
+	    rel = rb_dbl_cmp(rb_big2dbl(x), a);
+	    break;
+	}
+
+      default:
+	{
+	    ID id = 0;
+	    switch (op) {
+		case 0: id = '>'; break;
+		case 1: id = rb_intern(">="); break;
+		case 2: id = '<'; break;
+		case 3: id = rb_intern("<="); break;
+	    }
+	    return rb_num_coerce_relop(x, y, id);
+	}
+    }
+
+    if (NIL_P(rel)) return Qfalse;
+    n = FIX2INT(rel);
+
+    switch (op) {
+	case 0: return n >  0 ? Qtrue : Qfalse;
+	case 1: return n >= 0 ? Qtrue : Qfalse;
+	case 2: return n <  0 ? Qtrue : Qfalse;
+	case 3: return n <= 0 ? Qtrue : Qfalse;
+    }
+    return Qundef;
+}
+
+/*
+ * call-seq:
+ *   big > real  ->  true or false
+ *
+ * Returns <code>true</code> if the value of <code>big</code> is
+ * greater than that of <code>real</code>.
+ */
+
+static VALUE
+big_gt(VALUE x, VALUE y)
+{
+    return big_op(x, y, 0);
+}
+
+/*
+ * call-seq:
+ *   big >= real  ->  true or false
+ *
+ * Returns <code>true</code> if the value of <code>big</code> is
+ * greater than or equal to that of <code>real</code>.
+ */
+
+static VALUE
+big_ge(VALUE x, VALUE y)
+{
+    return big_op(x, y, 1);
+}
+
+/*
+ * call-seq:
+ *   big < real  ->  true or false
+ *
+ * Returns <code>true</code> if the value of <code>big</code> is
+ * less than that of <code>real</code>.
+ */
+
+static VALUE
+big_lt(VALUE x, VALUE y)
+{
+    return big_op(x, y, 2);
+}
+
+/*
+ * call-seq:
+ *   big <= real  ->  true or false
+ *
+ * Returns <code>true</code> if the value of <code>big</code> is
+ * less than or equal to that of <code>real</code>.
+ */
+
+static VALUE
+big_le(VALUE x, VALUE y)
+{
+    return big_op(x, y, 3);
 }
 
 /*
  *  call-seq:
- *     big == obj  => true or false
- *  
+ *     big == obj  -> true or false
+ *
  *  Returns <code>true</code> only if <i>obj</i> has the same value
  *  as <i>big</i>. Contrast this with <code>Bignum#eql?</code>, which
  *  requires <i>obj</i> to be a <code>Bignum</code>.
- *     
+ *
  *     68719476736 == 68719476736.0   #=> true
  */
 
-static VALUE
-rb_big_eq(x, y)
-    VALUE x, y;
+VALUE
+rb_big_eq(VALUE x, VALUE y)
 {
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -1026,10 +1563,10 @@ rb_big_eq(x, y)
       case T_BIGNUM:
 	break;
       case T_FLOAT:
-        {
+	{
 	    volatile double a, b;
 
-	    a = RFLOAT(y)->value;
+	    a = RFLOAT_VALUE(y);
 	    if (isnan(a)) return Qfalse;
 	    b = rb_big2dbl(x);
 	    return (a == b)?Qtrue:Qfalse;
@@ -1037,309 +1574,809 @@ rb_big_eq(x, y)
       default:
 	return rb_equal(y, x);
     }
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
-    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
+    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
+    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  *  call-seq:
- *     big.eql?(obj)   => true or false
- *  
+ *     big.eql?(obj)   -> true or false
+ *
  *  Returns <code>true</code> only if <i>obj</i> is a
  *  <code>Bignum</code> with the same value as <i>big</i>. Contrast this
  *  with <code>Bignum#==</code>, which performs type conversions.
- *     
+ *
  *     68719476736.eql?(68719476736.0)   #=> false
  */
 
 static VALUE
-rb_big_eql(x, y)
-    VALUE x, y;
+rb_big_eql(VALUE x, VALUE y)
 {
     if (TYPE(y) != T_BIGNUM) return Qfalse;
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
-    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
+    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
+    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    -big   =>  other_big
+ *    -big   ->  integer
  *
- * Unary minus (returns a new Bignum whose value is 0-big)
+ * Unary minus (returns an integer whose value is 0-big)
  */
 
-static VALUE
-rb_big_uminus(x)
-    VALUE x;
+VALUE
+rb_big_uminus(VALUE x)
 {
     VALUE z = rb_big_clone(x);
 
-    RBIGNUM(z)->sign = !RBIGNUM(x)->sign;
+    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
 
     return bignorm(z);
 }
 
 /*
  * call-seq:
- *     ~big  =>  integer
+ *     ~big  ->  integer
  *
  * Inverts the bits in big. As Bignums are conceptually infinite
  * length, the result acts as if it had an infinite number of one
  * bits to the left. In hex representations, this is displayed
  * as two periods to the left of the digits.
- *  
+ *
  *   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
  */
 
 static VALUE
-rb_big_neg(x)
-    VALUE x;
+rb_big_neg(VALUE x)
 {
     VALUE z = rb_big_clone(x);
-    long i;
     BDIGIT *ds;
+    long i;
 
-    if (!RBIGNUM(x)->sign) get2comp(z);
+    if (!RBIGNUM_SIGN(x)) get2comp(z);
     ds = BDIGITS(z);
-    i = RBIGNUM(x)->len;
-    if (!i) return INT2FIX(~0);
-    while (i--) ds[i] = ~ds[i];
-    RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
-    if (RBIGNUM(x)->sign) get2comp(z);
+    i = RBIGNUM_LEN(x);
+    if (!i) return INT2FIX(~(SIGNED_VALUE)0);
+    while (i--) {
+	ds[i] = ~ds[i];
+    }
+    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(z));
+    if (RBIGNUM_SIGN(x)) get2comp(z);
 
     return bignorm(z);
 }
 
+static void
+bigsub_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
+{
+    BDIGIT_DBL_SIGNED num;
+    long i;
+
+    for (i = 0, num = 0; i < yn; i++) {
+	num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    while (num && i < xn) {
+	num += xds[i];
+	zds[i++] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    while (i < xn) {
+	zds[i] = xds[i];
+	i++;
+    }
+    assert(i <= zn);
+    while (i < zn) {
+	zds[i++] = 0;
+    }
+}
+
 static VALUE
-bigsub(x, y)
-    VALUE x, y;
+bigsub(VALUE x, VALUE y)
 {
     VALUE z = 0;
-    BDIGIT *zds;
-    BDIGIT_DBL_SIGNED num;
-    long i = RBIGNUM(x)->len;
-    
+    long i = RBIGNUM_LEN(x);
+    BDIGIT *xds, *yds;
+
     /* if x is larger than y, swap */
-    if (RBIGNUM(x)->len < RBIGNUM(y)->len) {
+    if (RBIGNUM_LEN(x) < RBIGNUM_LEN(y)) {
 	z = x; x = y; y = z;	/* swap x y */
     }
-    else if (RBIGNUM(x)->len == RBIGNUM(y)->len) {
+    else if (RBIGNUM_LEN(x) == RBIGNUM_LEN(y)) {
+	xds = BDIGITS(x);
+	yds = BDIGITS(y);
 	while (i > 0) {
 	    i--;
-	    if (BDIGITS(x)[i] > BDIGITS(y)[i]) {
+	    if (xds[i] > yds[i]) {
 		break;
 	    }
-	    if (BDIGITS(x)[i] < BDIGITS(y)[i]) {
+	    if (xds[i] < yds[i]) {
 		z = x; x = y; y = z;	/* swap x y */
 		break;
 	    }
 	}
     }
 
-    z = bignew(RBIGNUM(x)->len, z==0);
+    z = bignew(RBIGNUM_LEN(x), z==0);
+    bigsub_core(BDIGITS(x), RBIGNUM_LEN(x),
+		BDIGITS(y), RBIGNUM_LEN(y),
+		BDIGITS(z), RBIGNUM_LEN(z));
+
+    return z;
+}
+
+static VALUE bigadd_int(VALUE x, long y);
+
+static VALUE
+bigsub_int(VALUE x, long y0)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long xn;
+    BDIGIT_DBL_SIGNED num;
+    long i, y;
+
+    y = y0;
+    xds = BDIGITS(x);
+    xn = RBIGNUM_LEN(x);
+
+    z = bignew(xn, RBIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-    for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) { 
-	num += (BDIGIT_DBL_SIGNED)BDIGITS(x)[i] - BDIGITS(y)[i];
+#if SIZEOF_BDIGITS == SIZEOF_LONG
+    num = (BDIGIT_DBL_SIGNED)xds[0] - y;
+    if (xn == 1 && num < 0) {
+	RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+	zds[0] = (BDIGIT)-num;
+	return bignorm(z);
+    }
+    zds[0] = BIGLO(num);
+    num = BIGDN(num);
+    i = 1;
+#else
+    num = 0;
+    for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+	num += (BDIGIT_DBL_SIGNED)xds[i] - BIGLO(y);
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
-    } 
-    while (num && i < RBIGNUM(x)->len) {
-	num += BDIGITS(x)[i];
+	y = BIGDN(y);
+    }
+#endif
+    while (num && i < xn) {
+	num += xds[i];
 	zds[i++] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (i < RBIGNUM(x)->len) {
-	zds[i] = BDIGITS(x)[i];
+    while (i < xn) {
+	zds[i] = xds[i];
 	i++;
     }
-    
-    return z;
+    if (num < 0) {
+	z = bigsub(x, rb_int2big(y0));
+    }
+    return bignorm(z);
 }
 
 static VALUE
-bigadd(x, y, sign)
-    VALUE x, y;
-    int sign;
+bigadd_int(VALUE x, long y)
 {
     VALUE z;
+    BDIGIT *xds, *zds;
+    long xn, zn;
     BDIGIT_DBL num;
-    long i, len;
+    long i;
 
-    sign = (sign == RBIGNUM(y)->sign);
-    if (RBIGNUM(x)->sign != sign) {
-	if (sign) return bigsub(y, x);
-	return bigsub(x, y);
-    }
+    xds = BDIGITS(x);
+    xn = RBIGNUM_LEN(x);
 
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	len = RBIGNUM(x)->len + 1;
-        z = x; x = y; y = z;
+    if (xn < 2) {
+	zn = 3;
     }
     else {
-	len = RBIGNUM(y)->len + 1;
+	zn = xn + 1;
     }
-    z = bignew(len, sign);
+    z = bignew(zn, RBIGNUM_SIGN(x));
+    zds = BDIGITS(z);
+
+#if SIZEOF_BDIGITS == SIZEOF_LONG
+    num = (BDIGIT_DBL)xds[0] + y;
+    zds[0] = BIGLO(num);
+    num = BIGDN(num);
+    i = 1;
+#else
+    num = 0;
+    for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+	num += (BDIGIT_DBL)xds[i] + BIGLO(y);
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+	y = BIGDN(y);
+    }
+#endif
+    while (num && i < xn) {
+	num += xds[i];
+	zds[i++] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    if (num) zds[i++] = (BDIGIT)num;
+    else while (i < xn) {
+	zds[i] = xds[i];
+	i++;
+    }
+    assert(i <= zn);
+    while (i < zn) {
+	zds[i++] = 0;
+    }
+    return bignorm(z);
+}
+
+static void
+bigadd_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
+{
+    BDIGIT_DBL num = 0;
+    long i;
 
-    len = RBIGNUM(x)->len;
-    for (i = 0, num = 0; i < len; i++) {
-	num += (BDIGIT_DBL)BDIGITS(x)[i] + BDIGITS(y)[i];
-	BDIGITS(z)[i] = BIGLO(num);
+    if (xn > yn) {
+	BDIGIT *tds;
+	tds = xds; xds = yds; yds = tds;
+	i = xn; xn = yn; yn = i;
+    }
+
+    i = 0;
+    while (i < xn) {
+	num += (BDIGIT_DBL)xds[i] + yds[i];
+	zds[i++] = BIGLO(num);
 	num = BIGDN(num);
     }
-    len = RBIGNUM(y)->len;
-    while (num && i < len) {
-	num += BDIGITS(y)[i];
-	BDIGITS(z)[i++] = BIGLO(num);
+    while (num && i < yn) {
+	num += yds[i];
+	zds[i++] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (i < len) {
-	BDIGITS(z)[i] = BDIGITS(y)[i];
+    while (i < yn) {
+	zds[i] = yds[i];
 	i++;
     }
-    BDIGITS(z)[i] = (BDIGIT)num;
+    if (num) zds[i++] = (BDIGIT)num;
+    assert(i <= zn);
+    while (i < zn) {
+	zds[i++] = 0;
+    }
+}
+
+static VALUE
+bigadd(VALUE x, VALUE y, int sign)
+{
+    VALUE z;
+    long len;
+
+    sign = (sign == RBIGNUM_SIGN(y));
+    if (RBIGNUM_SIGN(x) != sign) {
+	if (sign) return bigsub(y, x);
+	return bigsub(x, y);
+    }
+
+    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
+	len = RBIGNUM_LEN(x) + 1;
+    }
+    else {
+	len = RBIGNUM_LEN(y) + 1;
+    }
+    z = bignew(len, sign);
+
+    bigadd_core(BDIGITS(x), RBIGNUM_LEN(x),
+		BDIGITS(y), RBIGNUM_LEN(y),
+		BDIGITS(z), RBIGNUM_LEN(z));
 
     return z;
 }
 
 /*
  *  call-seq:
- *     big + other  => Numeric
+ *     big + other  -> Numeric
  *
  *  Adds big and other, returning the result.
  */
 
 VALUE
-rb_big_plus(x, y)
-    VALUE x, y;
+rb_big_plus(VALUE x, VALUE y)
 {
+    long n;
+
     switch (TYPE(y)) {
       case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	/* fall through */
+	n = FIX2LONG(y);
+	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	    if (n < 0) {
+		n = -n;
+	    }
+	    return bigsub_int(x, n);
+	}
+	if (n < 0) {
+	    n = -n;
+	}
+	return bigadd_int(x, n);
+
       case T_BIGNUM:
 	return bignorm(bigadd(x, y, 1));
 
       case T_FLOAT:
-	return rb_float_new(rb_big2dbl(x) + RFLOAT(y)->value);
+	return DBL2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, '+');
     }
 }
 
 /*
  *  call-seq:
- *     big - other  => Numeric
+ *     big - other  -> Numeric
  *
  *  Subtracts other from big, returning the result.
  */
 
 VALUE
-rb_big_minus(x, y)
-    VALUE x, y;
+rb_big_minus(VALUE x, VALUE y)
 {
+    long n;
+
     switch (TYPE(y)) {
       case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	/* fall through */
+	n = FIX2LONG(y);
+	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	    if (n < 0) {
+		n = -n;
+	    }
+	    return bigadd_int(x, n);
+	}
+	if (n < 0) {
+	    n = -n;
+	}
+	return bigsub_int(x, n);
+
       case T_BIGNUM:
 	return bignorm(bigadd(x, y, 0));
 
       case T_FLOAT:
-	return rb_float_new(rb_big2dbl(x) - RFLOAT(y)->value);
+	return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, '-');
     }
 }
 
-VALUE
-rb_big_mul0(x, y)
-    VALUE x, y;
+static long
+big_real_len(VALUE x)
 {
-    long i, j;
-    BDIGIT_DBL n = 0;
-    VALUE z;
-    BDIGIT *zds;
+    long i = RBIGNUM_LEN(x);
+    BDIGIT *xds = BDIGITS(x);
+    while (--i && !xds[i]);
+    return i + 1;
+}
 
-    if (FIXNUM_P(x)) x = rb_int2big(FIX2LONG(x));
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
+static VALUE
+bigmul1_single(VALUE x, VALUE y)
+{
+    BDIGIT_DBL n;
+    VALUE z = bignew(2, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    BDIGIT *xds, *yds, *zds;
 
-      case T_BIGNUM:
-	break;
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
+    zds = BDIGITS(z);
 
-      case T_FLOAT:
-	return rb_float_new(rb_big2dbl(x) * RFLOAT(y)->value);
+    n = (BDIGIT_DBL)xds[0] * yds[0];
+    zds[0] = BIGLO(n);
+    zds[1] = (BDIGIT)BIGDN(n);
 
-      default:
-	return rb_num_coerce_bin(x, y);
-    }
+    return z;
+}
 
-    j = RBIGNUM(x)->len + RBIGNUM(y)->len + 1;
-    z = bignew(j, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
+static VALUE
+bigmul1_normal(VALUE x, VALUE y)
+{
+    long xl = RBIGNUM_LEN(x), yl = RBIGNUM_LEN(y), i, j = xl + yl + 1;
+    BDIGIT_DBL n = 0;
+    VALUE z = bignew(j, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    BDIGIT *xds, *yds, *zds;
+
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
     zds = BDIGITS(z);
     while (j--) zds[j] = 0;
-    for (i = 0; i < RBIGNUM(x)->len; i++) {
-	BDIGIT_DBL dd = BDIGITS(x)[i]; 
+    for (i = 0; i < xl; i++) {
+	BDIGIT_DBL dd;
+	dd = xds[i];
 	if (dd == 0) continue;
 	n = 0;
-	for (j = 0; j < RBIGNUM(y)->len; j++) {
-	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * BDIGITS(y)[j];
+	for (j = 0; j < yl; j++) {
+	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * yds[j];
 	    n = zds[i + j] + ee;
 	    if (ee) zds[i + j] = BIGLO(n);
 	    n = BIGDN(n);
 	}
 	if (n) {
-	    zds[i + j] = n;
+	    zds[i + j] = (BDIGIT)n;
 	}
     }
+    rb_thread_check_ints();
+    return z;
+}
+
+static VALUE bigmul0(VALUE x, VALUE y);
+
+/* balancing multiplication by slicing larger argument */
+static VALUE
+bigmul1_balance(VALUE x, VALUE y)
+{
+    VALUE z, t1, t2;
+    long i, xn, yn, r, n;
+    BDIGIT *yds, *zds, *t1ds;
+
+    xn = RBIGNUM_LEN(x);
+    yn = RBIGNUM_LEN(y);
+    assert(2 * xn <= yn);
+
+    z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    t1 = bignew(xn, 1);
+
+    yds = BDIGITS(y);
+    zds = BDIGITS(z);
+    t1ds = BDIGITS(t1);
+
+    for (i = 0; i < xn + yn; i++) zds[i] = 0;
+
+    n = 0;
+    while (yn > 0) {
+	r = xn > yn ? yn : xn;
+	MEMCPY(t1ds, yds + n, BDIGIT, r);
+	RBIGNUM_SET_LEN(t1, r);
+	t2 = bigmul0(x, t1);
+	bigadd_core(zds + n, RBIGNUM_LEN(z) - n,
+		    BDIGITS(t2), big_real_len(t2),
+		    zds + n, RBIGNUM_LEN(z) - n);
+	yn -= r;
+	n += r;
+    }
 
     return z;
 }
 
+/* split a bignum into high and low bignums */
+static void
+big_split(VALUE v, long n, volatile VALUE *ph, volatile VALUE *pl)
+{
+    long hn = 0, ln = RBIGNUM_LEN(v);
+    VALUE h, l;
+    BDIGIT *vds = BDIGITS(v);
+
+    if (ln > n) {
+	hn = ln - n;
+	ln = n;
+    }
+
+    while (--hn && !vds[hn + ln]);
+    h = bignew(hn += 2, 1);
+    MEMCPY(BDIGITS(h), vds + ln, BDIGIT, hn - 1);
+    BDIGITS(h)[hn - 1] = 0; /* margin for carry */
+
+    while (--ln && !vds[ln]);
+    l = bignew(ln += 2, 1);
+    MEMCPY(BDIGITS(l), vds, BDIGIT, ln - 1);
+    BDIGITS(l)[ln - 1] = 0; /* margin for carry */
+
+    *pl = l;
+    *ph = h;
+}
+
+/* multiplication by karatsuba method */
+static VALUE
+bigmul1_karatsuba(VALUE x, VALUE y)
+{
+    long i, n, xn, yn, t1n, t2n;
+    VALUE xh, xl, yh, yl, z, t1, t2, t3;
+    BDIGIT *zds;
+
+    xn = RBIGNUM_LEN(x);
+    yn = RBIGNUM_LEN(y);
+    n = yn / 2;
+    big_split(x, n, &xh, &xl);
+    if (x == y) {
+	yh = xh; yl = xl;
+    }
+    else big_split(y, n, &yh, &yl);
+
+    /* x = xh * b + xl
+     * y = yh * b + yl
+     *
+     * Karatsuba method:
+     *   x * y = z2 * b^2 + z1 * b + z0
+     *   where
+     *     z2 = xh * yh
+     *     z0 = xl * yl
+     *     z1 = (xh + xl) * (yh + yl) - z2 - z0
+     *
+     *  ref: http://en.wikipedia.org/wiki/Karatsuba_algorithm
+     */
+
+    /* allocate a result bignum */
+    z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    zds = BDIGITS(z);
+
+    /* t1 <- xh * yh */
+    t1 = bigmul0(xh, yh);
+    t1n = big_real_len(t1);
+
+    /* copy t1 into high bytes of the result (z2) */
+    MEMCPY(zds + 2 * n, BDIGITS(t1), BDIGIT, t1n);
+    for (i = 2 * n + t1n; i < xn + yn; i++) zds[i] = 0;
+
+    if (!BIGZEROP(xl) && !BIGZEROP(yl)) {
+	/* t2 <- xl * yl */
+	t2 = bigmul0(xl, yl);
+	t2n = big_real_len(t2);
+
+	/* copy t2 into low bytes of the result (z0) */
+	MEMCPY(zds, BDIGITS(t2), BDIGIT, t2n);
+	for (i = t2n; i < 2 * n; i++) zds[i] = 0;
+    }
+    else {
+	t2 = Qundef;
+	t2n = 0;
+
+	/* copy 0 into low bytes of the result (z0) */
+	for (i = 0; i < 2 * n; i++) zds[i] = 0;
+    }
+
+    /* xh <- xh + xl */
+    if (RBIGNUM_LEN(xl) > RBIGNUM_LEN(xh)) {
+	t3 = xl; xl = xh; xh = t3;
+    }
+    /* xh has a margin for carry */
+    bigadd_core(BDIGITS(xh), RBIGNUM_LEN(xh),
+		BDIGITS(xl), RBIGNUM_LEN(xl),
+		BDIGITS(xh), RBIGNUM_LEN(xh));
+
+    /* yh <- yh + yl */
+    if (x != y) {
+	if (RBIGNUM_LEN(yl) > RBIGNUM_LEN(yh)) {
+	    t3 = yl; yl = yh; yh = t3;
+	}
+	/* yh has a margin for carry */
+	bigadd_core(BDIGITS(yh), RBIGNUM_LEN(yh),
+		    BDIGITS(yl), RBIGNUM_LEN(yl),
+		    BDIGITS(yh), RBIGNUM_LEN(yh));
+    }
+    else yh = xh;
+
+    /* t3 <- xh * yh */
+    t3 = bigmul0(xh, yh);
+
+    i = xn + yn - n;
+    /* subtract t1 from t3 */
+    bigsub_core(BDIGITS(t3), big_real_len(t3), BDIGITS(t1), t1n, BDIGITS(t3), big_real_len(t3));
+
+    /* subtract t2 from t3; t3 is now the middle term of the product */
+    if (t2 != Qundef) bigsub_core(BDIGITS(t3), big_real_len(t3), BDIGITS(t2), t2n, BDIGITS(t3), big_real_len(t3));
+
+    /* add t3 to middle bytes of the result (z1) */
+    bigadd_core(zds + n, i, BDIGITS(t3), big_real_len(t3), zds + n, i);
+
+    return z;
+}
+
+/* efficient squaring (2 times faster than normal multiplication)
+ * ref: Handbook of Applied Cryptography, Algorithm 14.16
+ *      http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
+ */
+static VALUE
+bigsqr_fast(VALUE x)
+{
+    long len = RBIGNUM_LEN(x), i, j;
+    VALUE z = bignew(2 * len + 1, 1);
+    BDIGIT *xds = BDIGITS(x), *zds = BDIGITS(z);
+    BDIGIT_DBL c, v, w;
+
+    for (i = 2 * len + 1; i--; ) zds[i] = 0;
+    for (i = 0; i < len; i++) {
+	v = (BDIGIT_DBL)xds[i];
+	if (!v) continue;
+	c = (BDIGIT_DBL)zds[i + i] + v * v;
+	zds[i + i] = BIGLO(c);
+	c = BIGDN(c);
+	v *= 2;
+	for (j = i + 1; j < len; j++) {
+	    w = (BDIGIT_DBL)xds[j];
+	    c += (BDIGIT_DBL)zds[i + j] + BIGLO(v) * w;
+	    zds[i + j] = BIGLO(c);
+	    c = BIGDN(c);
+	    if (BIGDN(v)) c += w;
+	}
+	if (c) {
+	    c += (BDIGIT_DBL)zds[i + len];
+	    zds[i + len] = BIGLO(c);
+	    c = BIGDN(c);
+	}
+	if (c) zds[i + len + 1] += (BDIGIT)c;
+    }
+    return z;
+}
+
+#define KARATSUBA_MUL_DIGITS 70
+
+
+/* determine whether a bignum is sparse or not by random sampling */
+static inline VALUE
+big_sparse_p(VALUE x)
+{
+    long c = 0, n = RBIGNUM_LEN(x);
+    unsigned long rb_rand_internal(unsigned long i);
+
+    if (          BDIGITS(x)[rb_rand_internal(n / 2) + n / 4]) c++;
+    if (c <= 1 && BDIGITS(x)[rb_rand_internal(n / 2) + n / 4]) c++;
+    if (c <= 1 && BDIGITS(x)[rb_rand_internal(n / 2) + n / 4]) c++;
+
+    return (c <= 1) ? Qtrue : Qfalse;
+}
+
+#if 0
+static void
+dump_bignum(VALUE x)
+{
+    long i;
+    printf("0x0");
+    for (i = RBIGNUM_LEN(x); i--; ) {
+	printf("_%08x", BDIGITS(x)[i]);
+    }
+    puts("");
+}
+#endif
+
+static VALUE
+bigmul0(VALUE x, VALUE y)
+{
+    long xn, yn;
+
+    xn = RBIGNUM_LEN(x);
+    yn = RBIGNUM_LEN(y);
+
+    /* make sure that y is longer than x */
+    if (xn > yn) {
+	VALUE t;
+	long tn;
+	t = x; x = y; y = t;
+	tn = xn; xn = yn; yn = tn;
+    }
+    assert(xn <= yn);
+
+    /* normal multiplication when x is small */
+    if (xn < KARATSUBA_MUL_DIGITS) {
+      normal:
+	if (x == y) return bigsqr_fast(x);
+	if (xn == 1 && yn == 1) return bigmul1_single(x, y);
+	return bigmul1_normal(x, y);
+    }
+
+    /* normal multiplication when x or y is a sparse bignum */
+    if (big_sparse_p(x)) goto normal;
+    if (big_sparse_p(y)) return bigmul1_normal(y, x);
+
+    /* balance multiplication by slicing y when x is much smaller than y */
+    if (2 * xn <= yn) return bigmul1_balance(x, y);
+
+    /* multiplication by karatsuba method */
+    return bigmul1_karatsuba(x, y);
+}
+
 /*
  *  call-seq:
- *     big * other  => Numeric
+ *     big * other  -> Numeric
  *
  *  Multiplies big and other, returning the result.
  */
 
 VALUE
-rb_big_mul(x, y)
-    VALUE x, y;
+rb_big_mul(VALUE x, VALUE y)
 {
-    return bignorm(rb_big_mul0(x, y));
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      case T_FLOAT:
+	return DBL2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
+
+      default:
+	return rb_num_coerce_bin(x, y, '*');
+    }
+
+    return bignorm(bigmul0(x, y));
+}
+
+struct big_div_struct {
+    long nx, ny;
+    BDIGIT *yds, *zds;
+    VALUE stop;
+};
+
+static VALUE
+bigdivrem1(void *ptr)
+{
+    struct big_div_struct *bds = (struct big_div_struct*)ptr;
+    long nx = bds->nx, ny = bds->ny;
+    long i, j, nyzero;
+    BDIGIT *yds = bds->yds, *zds = bds->zds;
+    BDIGIT_DBL t2;
+    BDIGIT_DBL_SIGNED num;
+    BDIGIT q;
+
+    j = nx==ny?nx+1:nx;
+    for (nyzero = 0; !yds[nyzero]; nyzero++);
+    do {
+	if (bds->stop) return Qnil;
+	if (zds[j] ==  yds[ny-1]) q = (BDIGIT)BIGRAD-1;
+	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
+	if (q) {
+           i = nyzero; num = 0; t2 = 0;
+	    do {			/* multiply and subtract */
+		BDIGIT_DBL ee;
+		t2 += (BDIGIT_DBL)yds[i] * q;
+		ee = num - BIGLO(t2);
+		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		if (ee) zds[j - ny + i] = BIGLO(num);
+		num = BIGDN(num);
+		t2 = BIGDN(t2);
+	    } while (++i < ny);
+	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
+	    while (num) {		/* "add back" required */
+		i = 0; num = 0; q--;
+		do {
+		    BDIGIT_DBL ee = num + yds[i];
+		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		    if (ee) zds[j - ny + i] = BIGLO(num);
+		    num = BIGDN(num);
+		} while (++i < ny);
+		num--;
+	    }
+	}
+	zds[j] = q;
+    } while (--j >= ny);
+    return Qnil;
 }
 
 static void
-bigdivrem(x, y, divp, modp)
-    VALUE x, y;
-    VALUE *divp, *modp;
+rb_big_stop(void *ptr)
 {
-    long nx = RBIGNUM(x)->len, ny = RBIGNUM(y)->len;
+    VALUE *stop = (VALUE*)ptr;
+    *stop = Qtrue;
+}
+
+static VALUE
+bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
+{
+    struct big_div_struct bds;
+    long nx = RBIGNUM_LEN(x), ny = RBIGNUM_LEN(y);
     long i, j;
-    VALUE yy, z;
+    VALUE z, yy, zz;
     BDIGIT *xds, *yds, *zds, *tds;
     BDIGIT_DBL t2;
-    BDIGIT_DBL_SIGNED num;
     BDIGIT dd, q;
 
     if (BIGZEROP(y)) rb_num_zerodiv();
+    xds = BDIGITS(x);
     yds = BDIGITS(y);
-    if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
+    if (nx < ny || (nx == ny && xds[nx - 1] < yds[ny - 1])) {
 	if (divp) *divp = rb_int2big(0);
 	if (modp) *modp = x;
-	return;
+	return Qnil;
     }
-    xds = BDIGITS(x);
     if (ny == 1) {
 	dd = yds[0];
 	z = rb_big_clone(x);
@@ -1350,23 +2387,23 @@ bigdivrem(x, y, divp, modp)
 	    zds[i] = (BDIGIT)(t2 / dd);
 	    t2 %= dd;
 	}
-	RBIGNUM(z)->sign = RBIGNUM(x)->sign==RBIGNUM(y)->sign;
+	RBIGNUM_SET_SIGN(z, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
 	if (modp) {
-	    *modp = rb_uint2big((unsigned long)t2);
-	    RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
+	    *modp = rb_uint2big((VALUE)t2);
+	    RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
 	}
 	if (divp) *divp = z;
-	return;
+	return Qnil;
     }
-    z = bignew(nx==ny?nx+2:nx+1, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
+    z = bignew(nx==ny?nx+2:nx+1, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
     zds = BDIGITS(z);
     if (nx==ny) zds[nx+1] = 0;
     while (!yds[ny-1]) ny--;
 
     dd = 0;
     q = yds[ny-1];
-    while ((q & (1<<(BITSPERDIG-1))) == 0) {
-	q <<= 1;
+    while ((q & (BDIGIT)(1UL<<(BITSPERDIG-1))) == 0) {
+	q <<= 1UL;
 	dd++;
     }
     if (dd) {
@@ -1380,6 +2417,7 @@ bigdivrem(x, y, divp, modp)
 	    t2 = BIGDN(t2);
 	}
 	yds = tds;
+	RB_GC_GUARD(y) = yy;
 	j = 0;
 	t2 = 0;
 	while (j<nx) {
@@ -1395,45 +2433,29 @@ bigdivrem(x, y, divp, modp)
 	while (j--) zds[j] = xds[j];
     }
 
-    j = nx==ny?nx+1:nx;
-    do {
-	if (zds[j] ==  yds[ny-1]) q = BIGRAD-1;
-	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
-	if (q) {
-	    i = 0; num = 0; t2 = 0;
-	    do {			/* multiply and subtract */
-		BDIGIT_DBL ee;
-		t2 += (BDIGIT_DBL)yds[i] * q;
-		ee = num - BIGLO(t2);
-		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		if (ee) zds[j - ny + i] = BIGLO(num);
-		num = BIGDN(num);
-		t2 = BIGDN(t2);
-	    } while (++i < ny);
-	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
-	    while (num) {		/* "add back" required */
-		i = 0; num = 0; q--;
-		do {
-		    BDIGIT_DBL ee = num + yds[i];
-		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		    if (ee) zds[j - ny + i] = BIGLO(num);
-		    num = BIGDN(num);
-		} while (++i < ny);
-		num--;
-	    }
-	}
-	zds[j] = q;
-    } while (--j >= ny);
+    bds.nx = nx;
+    bds.ny = ny;
+    bds.zds = zds;
+    bds.yds = yds;
+    bds.stop = Qfalse;
+    if (nx > 10000 || ny > 10000) {
+	rb_thread_blocking_region(bigdivrem1, &bds, rb_big_stop, &bds.stop);
+    }
+    else {
+	bigdivrem1(&bds);
+    }
+
     if (divp) {			/* move quotient down in z */
-	*divp = rb_big_clone(z);
-	zds = BDIGITS(*divp);
+	*divp = zz = rb_big_clone(z);
+	zds = BDIGITS(zz);
 	j = (nx==ny ? nx+2 : nx+1) - ny;
 	for (i = 0;i < j;i++) zds[i] = zds[i+ny];
-	RBIGNUM(*divp)->len = i;
+	if (!zds[i-1]) i--;
+	RBIGNUM_SET_LEN(zz, i);
     }
     if (modp) {			/* normalize remainder */
-	*modp = rb_big_clone(z);
-	zds = BDIGITS(*modp);
+	*modp = zz = rb_big_clone(z);
+	zds = BDIGITS(zz);
 	while (--ny && !zds[ny]); ++ny;
 	if (dd) {
 	    t2 = 0; i = ny;
@@ -1444,40 +2466,31 @@ bigdivrem(x, y, divp, modp)
 		t2 = BIGUP(q);
 	    }
 	}
-	RBIGNUM(*modp)->len = ny;
-	RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
+	if (!zds[ny-1]) ny--;
+	RBIGNUM_SET_LEN(zz, ny);
+	RBIGNUM_SET_SIGN(zz, RBIGNUM_SIGN(x));
     }
+    return z;
 }
 
 static void
-bigdivmod(x, y, divp, modp)
-    VALUE x, y;
-    VALUE *divp, *modp;
+bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 {
     VALUE mod;
 
     bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
+    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y) && !BIGZEROP(mod)) {
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
-    else {
-	if (divp) *divp = *divp;
-	if (modp) *modp = mod;
+    else if (modp) {
+	*modp = mod;
     }
 }
 
-/*
- *  call-seq:
- *     big / other     => Numeric
- *     big.div(other)  => Numeric
- *
- *  Divides big by other, returning the result.
- */
 
 static VALUE
-rb_big_div(x, y)
-    VALUE x, y;
+rb_big_divide(VALUE x, VALUE y, ID op)
 {
     VALUE z;
 
@@ -1490,10 +2503,18 @@ rb_big_div(x, y)
 	break;
 
       case T_FLOAT:
-	return rb_float_new(rb_big2dbl(x) / RFLOAT(y)->value);
+	{
+	    double div = rb_big2dbl(x) / RFLOAT_VALUE(y);
+	    if (op == '/') {
+		return DBL2NUM(div);
+	    }
+	    else {
+		return rb_dbl2big(div);
+	    }
+	}
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, op);
     }
     bigdivmod(x, y, &z, 0);
 
@@ -1502,16 +2523,43 @@ rb_big_div(x, y)
 
 /*
  *  call-seq:
- *     big % other         => Numeric
- *     big.modulo(other)   => Numeric
+ *     big / other     -> Numeric
+ *
+ * Performs division: the class of the resulting object depends on
+ * the class of <code>numeric</code> and on the magnitude of the
+ * result.
+ */
+
+VALUE
+rb_big_div(VALUE x, VALUE y)
+{
+    return rb_big_divide(x, y, '/');
+}
+
+/*
+ *  call-seq:
+ *     big.div(other)  -> integer
+ *
+ * Performs integer division: returns integer value.
+ */
+
+VALUE
+rb_big_idiv(VALUE x, VALUE y)
+{
+    return rb_big_divide(x, y, rb_intern("div"));
+}
+
+/*
+ *  call-seq:
+ *     big % other         -> Numeric
+ *     big.modulo(other)   -> Numeric
  *
  *  Returns big modulo other. See Numeric.divmod for more
  *  information.
  */
 
-static VALUE
-rb_big_modulo(x, y)
-    VALUE x, y;
+VALUE
+rb_big_modulo(VALUE x, VALUE y)
 {
     VALUE z;
 
@@ -1524,7 +2572,7 @@ rb_big_modulo(x, y)
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, '%');
     }
     bigdivmod(x, y, 0, &z);
 
@@ -1533,16 +2581,15 @@ rb_big_modulo(x, y)
 
 /*
  *  call-seq:
- *     big.remainder(numeric)    => number
- *  
+ *     big.remainder(numeric)    -> number
+ *
  *  Returns the remainder after dividing <i>big</i> by <i>numeric</i>.
- *     
+ *
  *     -1234567890987654321.remainder(13731)      #=> -6966
  *     -1234567890987654321.remainder(13731.24)   #=> -9906.22531493148
  */
 static VALUE
-rb_big_remainder(x, y)
-    VALUE x, y;
+rb_big_remainder(VALUE x, VALUE y)
 {
     VALUE z;
 
@@ -1555,37 +2602,22 @@ rb_big_remainder(x, y)
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, rb_intern("remainder"));
     }
     bigdivrem(x, y, 0, &z);
 
     return bignorm(z);
 }
 
-static VALUE big_lshift _((VALUE, unsigned long));
-static VALUE big_rshift _((VALUE, unsigned long));
-
-static VALUE big_shift(x, n)
-    VALUE x;
-    int n;
-{
-    if (n < 0)
-	return big_lshift(x, (unsigned int)n);
-    else if (n > 0)
-	return big_rshift(x, (unsigned int)n);
-    return x;
-}
-
 /*
  *  call-seq:
- *     big.divmod(numeric)   => array
- *  
+ *     big.divmod(numeric)   -> array
+ *
  *  See <code>Numeric#divmod</code>.
- *     
+ *
  */
 VALUE
-rb_big_divmod(x, y)
-    VALUE x, y;
+rb_big_divmod(VALUE x, VALUE y)
 {
     VALUE div, mod;
 
@@ -1598,54 +2630,148 @@ rb_big_divmod(x, y)
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, rb_intern("divmod"));
     }
     bigdivmod(x, y, &div, &mod);
 
     return rb_assoc_new(bignorm(div), bignorm(mod));
 }
 
+static int
+bdigbitsize(BDIGIT x)
+{
+    int size = 1;
+    int nb = BITSPERDIG / 2;
+    BDIGIT bits = (~0 << nb);
+
+    if (!x) return 0;
+    while (x > 1) {
+	if (x & bits) {
+	    size += nb;
+	    x >>= nb;
+	}
+	x &= ~bits;
+	nb /= 2;
+	bits >>= nb;
+    }
+
+    return size;
+}
+
+static VALUE big_lshift(VALUE, unsigned long);
+static VALUE big_rshift(VALUE, unsigned long);
+
+static VALUE
+big_shift(VALUE x, long n)
+{
+    if (n < 0)
+	return big_lshift(x, (unsigned long)-n);
+    else if (n > 0)
+	return big_rshift(x, (unsigned long)n);
+    return x;
+}
+
+static VALUE
+big_fdiv(VALUE x, VALUE y)
+{
+#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
+    VALUE z;
+    long l, ex, ey;
+    int i;
+
+    bigtrunc(x);
+    l = RBIGNUM_LEN(x) - 1;
+    ex = l * BITSPERDIG;
+    ex += bdigbitsize(BDIGITS(x)[l]);
+    ex -= 2 * DBL_BIGDIG * BITSPERDIG;
+    if (ex) x = big_shift(x, ex);
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+      case T_BIGNUM: {
+	bigtrunc(y);
+	l = RBIGNUM_LEN(y) - 1;
+	ey = l * BITSPERDIG;
+	ey += bdigbitsize(BDIGITS(y)[l]);
+	ey -= DBL_BIGDIG * BITSPERDIG;
+	if (ey) y = big_shift(y, ey);
+      bignum:
+	bigdivrem(x, y, &z, 0);
+	l = ex - ey;
+#if SIZEOF_LONG > SIZEOF_INT
+	{
+	    /* Visual C++ can't be here */
+	    if (l > INT_MAX) return DBL2NUM(INFINITY);
+	    if (l < INT_MIN) return DBL2NUM(0.0);
+	}
+#endif
+	return DBL2NUM(ldexp(big2dbl(z), (int)l));
+      }
+      case T_FLOAT:
+	y = dbl2big(ldexp(frexp(RFLOAT_VALUE(y), &i), DBL_MANT_DIG));
+	ey = i - DBL_MANT_DIG;
+	goto bignum;
+    }
+    rb_bug("big_fdiv");
+    /* NOTREACHED */
+}
+
 /*
  *  call-seq:
- *     big.quo(numeric) -> float
- *  
+  *     big.fdiv(numeric) -> float
+ *
  *  Returns the floating point result of dividing <i>big</i> by
  *  <i>numeric</i>.
- *     
- *     -1234567890987654321.quo(13731)      #=> -89910996357705.5
- *     -1234567890987654321.quo(13731.24)   #=> -89909424858035.7
- *     
+ *
+ *     -1234567890987654321.fdiv(13731)      #=> -89910996357705.5
+ *     -1234567890987654321.fdiv(13731.24)   #=> -89909424858035.7
+ *
  */
 
-static VALUE
-rb_big_quo(x, y)
-    VALUE x, y;
+
+VALUE
+rb_big_fdiv(VALUE x, VALUE y)
 {
-    double dx = rb_big2dbl(x);
-    double dy;
+    double dx, dy;
 
+    dx = big2dbl(x);
     switch (TYPE(y)) {
       case T_FIXNUM:
 	dy = (double)FIX2LONG(y);
+	if (isinf(dx))
+	    return big_fdiv(x, y);
 	break;
 
       case T_BIGNUM:
 	dy = rb_big2dbl(y);
+	if (isinf(dx) || isinf(dy))
+	    return big_fdiv(x, y);
 	break;
 
       case T_FLOAT:
-	dy = RFLOAT(y)->value;
+	dy = RFLOAT_VALUE(y);
+	if (isnan(dy))
+	    return y;
+	if (isinf(dx))
+	    return big_fdiv(x, y);
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
     }
-    return rb_float_new(dx / dy);
+    return DBL2NUM(dx / dy);
+}
+
+static VALUE
+bigsqr(VALUE x)
+{
+    return bigtrunc(bigmul0(x, x));
 }
 
 /*
  *  call-seq:
- *     big ** exponent   #=> numeric
+ *     big ** exponent   -> numeric
  *
  *  Raises _big_ to the _exponent_ power (which may be an integer, float,
  *  or anything that will coerce to a number). The result may be
@@ -1657,16 +2783,17 @@ rb_big_quo(x, y)
  */
 
 VALUE
-rb_big_pow(x, y)
-    VALUE x, y;
+rb_big_pow(VALUE x, VALUE y)
 {
     double d;
-    long yy;
-    
+    SIGNED_VALUE yy;
+
     if (y == INT2FIX(0)) return INT2FIX(1);
     switch (TYPE(y)) {
       case T_FLOAT:
-	d = RFLOAT(y)->value;
+	d = RFLOAT_VALUE(y);
+	if ((!RBIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
+	    return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
 	break;
 
       case T_BIGNUM:
@@ -1676,48 +2803,102 @@ rb_big_pow(x, y)
 
       case T_FIXNUM:
 	yy = FIX2LONG(y);
-	if (yy > 0) {
-	    VALUE z = x;
+
+	if (yy < 0)
+	    return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
+	else {
+	    VALUE z = 0;
+	    SIGNED_VALUE mask;
 	    const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
 
-	    if ((RBIGNUM(x)->len > BIGLEN_LIMIT) ||
-		(RBIGNUM(x)->len > BIGLEN_LIMIT / yy)) {
+	    if ((RBIGNUM_LEN(x) > BIGLEN_LIMIT) ||
+		(RBIGNUM_LEN(x) > BIGLEN_LIMIT / yy)) {
 		rb_warn("in a**b, b may be too big");
 		d = (double)yy;
 		break;
 	    }
-	    for (;;) {
-		yy -= 1;
-		if (yy == 0) break;
-		while (yy % 2 == 0) {
-		    yy /= 2;
-		    x = rb_big_mul0(x, x);
-		    bigtrunc(x);
+	    for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
+		if (z) z = bigsqr(z);
+		if (yy & mask) {
+		    z = z ? bigtrunc(bigmul0(z, x)) : x;
 		}
-		z = rb_big_mul0(z, x);
-		bigtrunc(z);
 	    }
 	    return bignorm(z);
 	}
-	d = (double)yy;
+	/* NOTREACHED */
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y);
+	return rb_num_coerce_bin(x, y, rb_intern("**"));
     }
-    return rb_float_new(pow(rb_big2dbl(x), d));
+    return DBL2NUM(pow(rb_big2dbl(x), d));
+}
+
+static inline VALUE
+bit_coerce(VALUE x)
+{
+    while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) {
+	if (TYPE(x) == T_FLOAT) {
+	    rb_raise(rb_eTypeError, "can't convert Float into Integer");
+	}
+	x = rb_to_int(x);
+    }
+    return x;
+}
+
+static VALUE
+bigand_int(VALUE x, long y)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long xn, zn;
+    long i;
+    char sign;
+
+    if (y == 0) return INT2FIX(0);
+    sign = (y > 0);
+    xds = BDIGITS(x);
+    zn = xn = RBIGNUM_LEN(x);
+#if SIZEOF_BDIGITS == SIZEOF_LONG
+    if (sign) {
+	y &= xds[0];
+	return LONG2NUM(y);
+    }
+#endif
+
+    z = bignew(zn, RBIGNUM_SIGN(x) || sign);
+    zds = BDIGITS(z);
+
+#if SIZEOF_BDIGITS == SIZEOF_LONG
+    i = 1;
+    zds[0] = xds[0] & y;
+#else
+    {
+	BDIGIT_DBL num = y;
+
+	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+	    zds[i] = xds[i] & BIGLO(num);
+	    num = BIGDN(num);
+	}
+    }
+#endif
+    while (i < xn) {
+	zds[i] = sign?0:xds[i];
+	i++;
+    }
+    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    return bignorm(z);
 }
 
 /*
  * call-seq:
- *     big & numeric   =>  integer
+ *     big & numeric   ->  integer
  *
  * Performs bitwise +and+ between _big_ and _numeric_.
  */
 
 VALUE
-rb_big_and(xx, yy)
-    VALUE xx, yy;
+rb_big_and(VALUE xx, VALUE yy)
 {
     volatile VALUE x, y, z;
     BDIGIT *ds1, *ds2, *zds;
@@ -1725,33 +2906,33 @@ rb_big_and(xx, yy)
     char sign;
 
     x = xx;
-    y = rb_to_int(yy);
+    y = bit_coerce(yy);
+    if (!RBIGNUM_SIGN(x)) {
+	x = rb_big_clone(x);
+	get2comp(x);
+    }
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+	return bigand_int(x, FIX2LONG(y));
     }
-    if (!RBIGNUM(y)->sign) {
+    if (!RBIGNUM_SIGN(y)) {
 	y = rb_big_clone(y);
 	get2comp(y);
     }
-    if (!RBIGNUM(x)->sign) {
-	x = rb_big_clone(x);
-	get2comp(x);
-    }
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	l1 = RBIGNUM(y)->len;
-	l2 = RBIGNUM(x)->len;
+    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
+	l1 = RBIGNUM_LEN(y);
+	l2 = RBIGNUM_LEN(x);
 	ds1 = BDIGITS(y);
 	ds2 = BDIGITS(x);
-	sign = RBIGNUM(y)->sign;
+	sign = RBIGNUM_SIGN(y);
     }
     else {
-	l1 = RBIGNUM(x)->len;
-	l2 = RBIGNUM(y)->len;
+	l1 = RBIGNUM_LEN(x);
+	l2 = RBIGNUM_LEN(y);
 	ds1 = BDIGITS(x);
 	ds2 = BDIGITS(y);
-	sign = RBIGNUM(x)->sign;
+	sign = RBIGNUM_SIGN(x);
     }
-    z = bignew(l2, RBIGNUM(x)->sign || RBIGNUM(y)->sign);
+    z = bignew(l2, RBIGNUM_SIGN(x) || RBIGNUM_SIGN(y));
     zds = BDIGITS(z);
 
     for (i=0; i<l1; i++) {
@@ -1760,20 +2941,55 @@ rb_big_and(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?0:ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    return bignorm(z);
+}
+
+static VALUE
+bigor_int(VALUE x, long y)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long xn, zn;
+    long i;
+    char sign;
+
+    sign = (y >= 0);
+    xds = BDIGITS(x);
+    zn = xn = RBIGNUM_LEN(x);
+    z = bignew(zn, RBIGNUM_SIGN(x) && sign);
+    zds = BDIGITS(z);
+
+#if SIZEOF_BDIGITS == SIZEOF_LONG
+    i = 1;
+    zds[0] = xds[0] | y;
+#else
+    {
+	BDIGIT_DBL num = y;
+
+	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+	    zds[i] = xds[i] | BIGLO(num);
+	    num = BIGDN(num);
+	}
+    }
+#endif
+    while (i < xn) {
+	zds[i] = sign?xds[i]:(BDIGIT)(BIGRAD-1);
+	i++;
+    }
+    if (!RBIGNUM_SIGN(z)) get2comp(z);
     return bignorm(z);
 }
 
 /*
  * call-seq:
- *     big | numeric   =>  integer
+ *     big | numeric   ->  integer
  *
  * Performs bitwise +or+ between _big_ and _numeric_.
  */
 
 VALUE
-rb_big_or(xx, yy)
-    VALUE xx, yy;
+rb_big_or(VALUE xx, VALUE yy)
 {
     volatile VALUE x, y, z;
     BDIGIT *ds1, *ds2, *zds;
@@ -1781,56 +2997,90 @@ rb_big_or(xx, yy)
     char sign;
 
     x = xx;
-    y = rb_to_int(yy);
+    y = bit_coerce(yy);
+
+    if (!RBIGNUM_SIGN(x)) {
+	x = rb_big_clone(x);
+	get2comp(x);
+    }
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+	return bigor_int(x, FIX2LONG(y));
     }
-    if (!RBIGNUM(y)->sign) {
+    if (!RBIGNUM_SIGN(y)) {
 	y = rb_big_clone(y);
 	get2comp(y);
     }
-    if (!RBIGNUM(x)->sign) {
-	x = rb_big_clone(x);
-	get2comp(x);
-    }
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	l1 = RBIGNUM(y)->len;
-	l2 = RBIGNUM(x)->len;
+    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
+	l1 = RBIGNUM_LEN(y);
+	l2 = RBIGNUM_LEN(x);
 	ds1 = BDIGITS(y);
 	ds2 = BDIGITS(x);
-	sign = RBIGNUM(y)->sign;
+	sign = RBIGNUM_SIGN(y);
     }
     else {
-	l1 = RBIGNUM(x)->len;
-	l2 = RBIGNUM(y)->len;
+	l1 = RBIGNUM_LEN(x);
+	l2 = RBIGNUM_LEN(y);
 	ds1 = BDIGITS(x);
 	ds2 = BDIGITS(y);
-	sign = RBIGNUM(x)->sign;
+	sign = RBIGNUM_SIGN(x);
     }
-    z = bignew(l2, RBIGNUM(x)->sign && RBIGNUM(y)->sign);
+    z = bignew(l2, RBIGNUM_SIGN(x) && RBIGNUM_SIGN(y));
     zds = BDIGITS(z);
 
     for (i=0; i<l1; i++) {
 	zds[i] = ds1[i] | ds2[i];
     }
     for (; i<l2; i++) {
-	zds[i] = sign?ds2[i]:(BIGRAD-1);
+	zds[i] = sign?ds2[i]:(BDIGIT)(BIGRAD-1);
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
-
+    if (!RBIGNUM_SIGN(z)) get2comp(z);
     return bignorm(z);
 }
 
+static VALUE
+bigxor_int(VALUE x, long y)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long xn, zn;
+    long i;
+    char sign;
+
+    sign = (y >= 0) ? 1 : 0;
+    xds = BDIGITS(x);
+    zn = xn = RBIGNUM_LEN(x);
+    z = bignew(zn, !(RBIGNUM_SIGN(x) ^ sign));
+    zds = BDIGITS(z);
+
+#if SIZEOF_BDIGITS == SIZEOF_LONG
+    i = 1;
+    zds[0] = xds[0] ^ y;
+#else
+    {
+	BDIGIT_DBL num = y;
+
+	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+	    zds[i] = xds[i] ^ BIGLO(num);
+	    num = BIGDN(num);
+	}
+    }
+#endif
+    while (i < xn) {
+	zds[i] = sign?xds[i]:~xds[i];
+	i++;
+    }
+    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    return bignorm(z);
+}
 /*
  * call-seq:
- *     big ^ numeric   =>  integer
+ *     big ^ numeric   ->  integer
  *
  * Performs bitwise +exclusive or+ between _big_ and _numeric_.
  */
 
 VALUE
-rb_big_xor(xx, yy)
-    VALUE xx, yy;
+rb_big_xor(VALUE xx, VALUE yy)
 {
     volatile VALUE x, y;
     VALUE z;
@@ -1839,35 +3089,36 @@ rb_big_xor(xx, yy)
     char sign;
 
     x = xx;
-    y = rb_to_int(yy);
+    y = bit_coerce(yy);
+
+    if (!RBIGNUM_SIGN(x)) {
+	x = rb_big_clone(x);
+	get2comp(x);
+    }
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+	return bigxor_int(x, FIX2LONG(y));
     }
-    if (!RBIGNUM(y)->sign) {
+    if (!RBIGNUM_SIGN(y)) {
 	y = rb_big_clone(y);
 	get2comp(y);
     }
-    if (!RBIGNUM(x)->sign) {
-	x = rb_big_clone(x);
-	get2comp(x);
-    }
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	l1 = RBIGNUM(y)->len;
-	l2 = RBIGNUM(x)->len;
+    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
+	l1 = RBIGNUM_LEN(y);
+	l2 = RBIGNUM_LEN(x);
 	ds1 = BDIGITS(y);
 	ds2 = BDIGITS(x);
-	sign = RBIGNUM(y)->sign;
+	sign = RBIGNUM_SIGN(y);
     }
     else {
-	l1 = RBIGNUM(x)->len;
-	l2 = RBIGNUM(y)->len;
+	l1 = RBIGNUM_LEN(x);
+	l2 = RBIGNUM_LEN(y);
 	ds1 = BDIGITS(x);
 	ds2 = BDIGITS(y);
-	sign = RBIGNUM(x)->sign;
+	sign = RBIGNUM_SIGN(x);
     }
-    RBIGNUM(x)->sign = RBIGNUM(x)->sign?1:0;
-    RBIGNUM(y)->sign = RBIGNUM(y)->sign?1:0;
-    z = bignew(l2, !(RBIGNUM(x)->sign ^ RBIGNUM(y)->sign));
+    RBIGNUM_SET_SIGN(x, RBIGNUM_SIGN(x)?1:0);
+    RBIGNUM_SET_SIGN(y, RBIGNUM_SIGN(y)?1:0);
+    z = bignew(l2, !(RBIGNUM_SIGN(x) ^ RBIGNUM_SIGN(y)));
     zds = BDIGITS(z);
 
     for (i=0; i<l1; i++) {
@@ -1876,7 +3127,7 @@ rb_big_xor(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:~ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM_SIGN(z)) get2comp(z);
 
     return bignorm(z);
 }
@@ -1884,23 +3135,22 @@ rb_big_xor(xx, yy)
 static VALUE
 check_shiftdown(VALUE y, VALUE x)
 {
-    if (!RBIGNUM(x)->len) return INT2FIX(0);
-    if (RBIGNUM(y)->len > SIZEOF_LONG / SIZEOF_BDIGITS) {
-	return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(-1);
+    if (!RBIGNUM_LEN(x)) return INT2FIX(0);
+    if (RBIGNUM_LEN(y) > SIZEOF_LONG / SIZEOF_BDIGITS) {
+	return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(-1);
     }
     return Qnil;
 }
 
 /*
  * call-seq:
- *     big << numeric   =>  integer
+ *     big << numeric   ->  integer
  *
  * Shifts big left _numeric_ positions (right if _numeric_ is negative).
  */
 
 VALUE
-rb_big_lshift(x, y)
-    VALUE x, y;
+rb_big_lshift(VALUE x, VALUE y)
 {
     long shift;
     int neg = 0;
@@ -1915,35 +3165,33 @@ rb_big_lshift(x, y)
 	    break;
 	}
 	else if (TYPE(y) == T_BIGNUM) {
-	    if (!RBIGNUM(y)->sign) {
+	    if (!RBIGNUM_SIGN(y)) {
 		VALUE t = check_shiftdown(y, x);
 		if (!NIL_P(t)) return t;
 		neg = 1;
 	    }
-	    shift = big2ulong(y, "long", Qtrue);
+	    shift = big2ulong(y, "long", TRUE);
 	    break;
 	}
 	y = rb_to_int(y);
     }
 
-    if (neg) return big_rshift(x, shift);
-    return big_lshift(x, shift);
+    x = neg ? big_rshift(x, shift) : big_lshift(x, shift);
+    return bignorm(x);
 }
 
 static VALUE
-big_lshift(x, shift)
-    VALUE x;
-    unsigned long shift;
+big_lshift(VALUE x, unsigned long shift)
 {
     BDIGIT *xds, *zds;
     long s1 = shift/BITSPERDIG;
-    int s2 = shift%BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
     VALUE z;
     BDIGIT_DBL num = 0;
     long len, i;
 
-    len = RBIGNUM(x)->len;
-    z = bignew(len+s1+1, RBIGNUM(x)->sign);
+    len = RBIGNUM_LEN(x);
+    z = bignew(len+s1+1, RBIGNUM_SIGN(x));
     zds = BDIGITS(z);
     for (i=0; i<s1; i++) {
 	*zds++ = 0;
@@ -1955,19 +3203,18 @@ big_lshift(x, shift)
 	num = BIGDN(num);
     }
     *zds = BIGLO(num);
-    return bignorm(z);
+    return z;
 }
 
 /*
  * call-seq:
- *     big >> numeric   =>  integer
+ *     big >> numeric   ->  integer
  *
  * Shifts big right _numeric_ positions (left if _numeric_ is negative).
  */
 
 VALUE
-rb_big_rshift(x, y)
-    VALUE x, y;
+rb_big_rshift(VALUE x, VALUE y)
 {
     long shift;
     int neg = 0;
@@ -1982,54 +3229,52 @@ rb_big_rshift(x, y)
 	    break;
 	}
 	else if (TYPE(y) == T_BIGNUM) {
-	    if (RBIGNUM(y)->sign) {
+	    if (RBIGNUM_SIGN(y)) {
 		VALUE t = check_shiftdown(y, x);
 		if (!NIL_P(t)) return t;
 	    }
 	    else {
 		neg = 1;
 	    }
-	    shift = big2ulong(y, "long", Qtrue);
+	    shift = big2ulong(y, "long", TRUE);
 	    break;
 	}
 	y = rb_to_int(y);
     }
 
-    if (neg) return big_lshift(x, shift);
-    return big_rshift(x, shift);
+    x = neg ? big_lshift(x, shift) : big_rshift(x, shift);
+    return bignorm(x);
 }
 
 static VALUE
-big_rshift(x, shift)
-    VALUE x;
-    unsigned long shift;
+big_rshift(VALUE x, unsigned long shift)
 {
     BDIGIT *xds, *zds;
     long s1 = shift/BITSPERDIG;
-    int s2 = shift%BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
     VALUE z;
     BDIGIT_DBL num = 0;
     long i, j;
     volatile VALUE save_x;
 
-    if (s1 > RBIGNUM(x)->len) {
-	if (RBIGNUM(x)->sign)
+    if (s1 > RBIGNUM_LEN(x)) {
+	if (RBIGNUM_SIGN(x))
 	    return INT2FIX(0);
 	else
 	    return INT2FIX(-1);
     }
-    if (!RBIGNUM(x)->sign) {
+    if (!RBIGNUM_SIGN(x)) {
 	save_x = x = rb_big_clone(x);
 	get2comp(x);
     }
     xds = BDIGITS(x);
-    i = RBIGNUM(x)->len; j = i - s1;
+    i = RBIGNUM_LEN(x); j = i - s1;
     if (j == 0) {
-	if (RBIGNUM(x)->sign) return INT2FIX(0);
+	if (RBIGNUM_SIGN(x)) return INT2FIX(0);
 	else return INT2FIX(-1);
     }
-    z = bignew(j, RBIGNUM(x)->sign);
-    if (!RBIGNUM(x)->sign) {
+    z = bignew(j, RBIGNUM_SIGN(x));
+    if (!RBIGNUM_SIGN(x)) {
 	num = ((BDIGIT_DBL)~0) << BITSPERDIG;
     }
     zds = BDIGITS(z);
@@ -2038,48 +3283,48 @@ big_rshift(x, shift)
 	zds[j] = BIGLO(num);
 	num = BIGUP(xds[i]);
     }
-    if (!RBIGNUM(x)->sign) {
+    if (!RBIGNUM_SIGN(x)) {
 	get2comp(z);
     }
-    return bignorm(z);
+    return z;
 }
 
 /*
  *  call-seq:
  *     big[n] -> 0, 1
- *  
+ *
  *  Bit Reference---Returns the <em>n</em>th bit in the (assumed) binary
  *  representation of <i>big</i>, where <i>big</i>[0] is the least
  *  significant bit.
- *     
+ *
  *     a = 9**15
  *     50.downto(0) do |n|
  *       print a[n]
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     000101110110100000111000011110010100111100010111001
- *     
+ *
  */
 
 static VALUE
-rb_big_aref(x, y)
-    VALUE x, y;
+rb_big_aref(VALUE x, VALUE y)
 {
     BDIGIT *xds;
     BDIGIT_DBL num;
-    unsigned long shift;
+    VALUE shift;
     long i, s1, s2;
 
     if (TYPE(y) == T_BIGNUM) {
-	if (!RBIGNUM(y)->sign)
+	if (!RBIGNUM_SIGN(y))
 	    return INT2FIX(0);
-	if (RBIGNUM(bigtrunc(y))->len > SIZEOF_LONG/SIZEOF_BDIGITS) {
+	bigtrunc(y);
+	if (RBIGNUM_LEN(y) > DIGSPERLONG) {
 	  out_of_range:
-	    return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(1);
+	    return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
 	}
-	shift = big2ulong(y, "long", Qfalse);
+	shift = big2ulong(y, "long", FALSE);
     }
     else {
 	i = NUM2LONG(y);
@@ -2089,8 +3334,8 @@ rb_big_aref(x, y)
     s1 = shift/BITSPERDIG;
     s2 = shift%BITSPERDIG;
 
-    if (s1 >= RBIGNUM(x)->len) goto out_of_range;
-    if (!RBIGNUM(x)->sign) {
+    if (s1 >= RBIGNUM_LEN(x)) goto out_of_range;
+    if (!RBIGNUM_SIGN(x)) {
 	xds = BDIGITS(x);
 	i = 0; num = 1;
 	while (num += ~xds[i], ++i <= s1) {
@@ -2107,23 +3352,18 @@ rb_big_aref(x, y)
 
 /*
  * call-seq:
- *   big.hash   => fixnum
+ *   big.hash   -> fixnum
  *
  * Compute a hash based on the value of _big_.
  */
 
 static VALUE
-rb_big_hash(x)
-    VALUE x;
+rb_big_hash(VALUE x)
 {
-    long i, len, key;
-    BDIGIT *digits;
+    st_index_t hash;
 
-    key = 0; digits = BDIGITS(x); len = RBIGNUM(x)->len;
-    for (i=0; i<len; i++) {
-	key ^= *digits++;
-    }
-    return LONG2FIX(key);
+    hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*RBIGNUM_LEN(x)) ^ RBIGNUM_SIGN(x);
+    return INT2FIX(hash);
 }
 
 /*
@@ -2131,8 +3371,7 @@ rb_big_hash(x)
  */
 
 static VALUE
-rb_big_coerce(x, y)
-    VALUE x, y;
+rb_big_coerce(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
 	return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
@@ -2151,61 +3390,70 @@ rb_big_coerce(x, y)
 /*
  *  call-seq:
  *     big.abs -> aBignum
- *  
+ *
  *  Returns the absolute value of <i>big</i>.
- *     
+ *
  *     -1234567890987654321.abs   #=> 1234567890987654321
  */
 
 static VALUE
-rb_big_abs(x)
-    VALUE x;
+rb_big_abs(VALUE x)
 {
-    if (!RBIGNUM(x)->sign) {
+    if (!RBIGNUM_SIGN(x)) {
 	x = rb_big_clone(x);
-	RBIGNUM(x)->sign = 1;
+	RBIGNUM_SET_SIGN(x, 1);
     }
     return x;
 }
 
-VALUE
-rb_big_rand(max, rand_buf)
-    VALUE max;
-    double *rand_buf;
-{
-    VALUE v;
-    long len = RBIGNUM(max)->len;
-
-    if (BIGZEROP(max)) {
-	return rb_float_new(rand_buf[0]);
-    }
-    v = bignew(len,1);
-    len--;
-    BDIGITS(v)[len] = BDIGITS(max)[len] * rand_buf[len];    
-    while (len--) {
-	BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
-    }
-
-    return v;
-}
-
 /*
  *  call-seq:
  *     big.size -> integer
- *  
+ *
  *  Returns the number of bytes in the machine representation of
  *  <i>big</i>.
- *     
+ *
  *     (256**10 - 1).size   #=> 12
  *     (256**20 - 1).size   #=> 20
  *     (256**40 - 1).size   #=> 40
  */
 
 static VALUE
-rb_big_size(big)
-    VALUE big;
+rb_big_size(VALUE big)
+{
+    return LONG2FIX(RBIGNUM_LEN(big)*SIZEOF_BDIGITS);
+}
+
+/*
+ *  call-seq:
+ *     big.odd? -> true or false
+ *
+ *  Returns <code>true</code> if <i>big</i> is an odd number.
+ */
+
+static VALUE
+rb_big_odd_p(VALUE num)
+{
+    if (BDIGITS(num)[0] & 1) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     big.even? -> true or false
+ *
+ *  Returns <code>true</code> if <i>big</i> is an even number.
+ */
+
+static VALUE
+rb_big_even_p(VALUE num)
 {
-    return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
+    if (BDIGITS(num)[0] & 1) {
+	return Qfalse;
+    }
+    return Qtrue;
 }
 
 /*
@@ -2215,19 +3463,19 @@ rb_big_size(big)
  *  Fixnum. When a calculation involving
  *  Bignum objects returns a result that will fit in a
  *  Fixnum, the result is automatically converted.
- *     
+ *
  *  For the purposes of the bitwise operations and <code>[]</code>, a
  *  Bignum is treated as if it were an infinite-length
  *  bitstring with 2's complement representation.
- *     
+ *
  *  While Fixnum values are immediate, Bignum
  *  objects are not---assignment and parameter passing work with
  *  references to objects, not the objects themselves.
- *     
+ *
  */
 
 void
-Init_Bignum()
+Init_Bignum(void)
 {
     rb_cBignum = rb_define_class("Bignum", rb_cInteger);
 
@@ -2239,11 +3487,11 @@ Init_Bignum()
     rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
     rb_define_method(rb_cBignum, "/", rb_big_div, 1);
     rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
-    rb_define_method(rb_cBignum, "div", rb_big_div, 1);
+    rb_define_method(rb_cBignum, "div", rb_big_idiv, 1);
     rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
     rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
     rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
-    rb_define_method(rb_cBignum, "quo", rb_big_quo, 1);
+    rb_define_method(rb_cBignum, "fdiv", rb_big_fdiv, 1);
     rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
     rb_define_method(rb_cBignum, "&", rb_big_and, 1);
     rb_define_method(rb_cBignum, "|", rb_big_or, 1);
@@ -2255,9 +3503,19 @@ Init_Bignum()
 
     rb_define_method(rb_cBignum, "<=>", rb_big_cmp, 1);
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
+    rb_define_method(rb_cBignum, ">", big_gt, 1);
+    rb_define_method(rb_cBignum, ">=", big_ge, 1);
+    rb_define_method(rb_cBignum, "<", big_lt, 1);
+    rb_define_method(rb_cBignum, "<=", big_le, 1);
+    rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
     rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1);
     rb_define_method(rb_cBignum, "hash", rb_big_hash, 0);
     rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
     rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
+    rb_define_method(rb_cBignum, "magnitude", rb_big_abs, 0);
     rb_define_method(rb_cBignum, "size", rb_big_size, 0);
+    rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0);
+    rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
+
+    power_cache_init();
 }
diff --git a/bin/erb b/bin/erb
index a6fcd5370c..6b92ac2284 100755
--- a/bin/erb
+++ b/bin/erb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002 Masatoshi SEKI 
+# Copyright (c) 1999-2000,2002 Masatoshi SEKI
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
 require 'erb'
@@ -12,18 +12,28 @@ class ERB
       arg = self.shift
       return nil if arg == '--'
       if arg =~ /^-(.)(.*)/
-        return arg if $1 == '-'
-        raise 'unknown switch "-"' if $2.index('-')
-        self.unshift "-#{$2}" if $2.size > 0
+        if $1 == '-'
+          arg, @maybe_arg = arg.split(/=/, 2)
+          return arg
+        end
+        raise 'unknown switch "-"' if $2[0] == ?- and $1 != 'T'
+        if $2.size > 0
+          self.unshift "-#{$2}"
+          @maybe_arg = $2
+        else
+          @maybe_arg = nil
+        end
         "-#{$1}"
       else
         self.unshift arg
         nil
       end
     end
-    
+
     def ARGV.req_arg
-      self.shift || raise('missing argument')
+      (@maybe_arg || self.shift || raise('missing argument')).tap {
+        @maybe_arg = nil
+      }
     end
 
     def trim_mode_opt(trim_mode, disable_percent)
@@ -67,25 +77,16 @@ class ERB
           when '-T'                        # trim mode
             arg = ARGV.req_arg
             if arg == '-'
-              trim_mode = arg 
+              trim_mode = arg
               next
             end
             raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
             trim_mode = arg.to_i
-          when '-K'                        # KCODE
+          when '-E', '--encoding'
             arg = ARGV.req_arg
-            case arg.downcase
-            when 'e', '-e', 'euc'
-              $KCODE = 'EUC'
-            when 's', '-s', 'sjis'
-              $KCODE = 'SJIS'
-            when 'u', '-u', 'utf8'
-              $KCODE = 'UTF8'
-            when 'n', '-n', 'none'
-              $KCODE = 'NONE'
-            else
-              raise "invalid KCODE #{arg.dump}"
-            end
+            set_encoding(*arg.split(/:/, 2))
+          when '-U'
+            set_encoding(Encoding::UTF_8, Encoding::UTF_8)
           when '-P'
             disable_percent = true
           when '--help'
@@ -96,22 +97,24 @@ class ERB
         end
       rescue                               # usage
         STDERR.puts $!.to_s
-        STDERR.puts File.basename($0) + 
+        STDERR.puts File.basename($0) +
           " [switches] [inputfile]"
         STDERR.puts <<EOU
   -x               print ruby script
   -n               print ruby script with line number
   -v               enable verbose mode
   -d               set $DEBUG to true
-  -r [library]     load a library
-  -K [kcode]       specify KANJI code-set
-  -S [safe_level]  set $SAFE (0..4)
-  -T [trim_mode]   specify trim_mode (0..2, -)
+  -r library       load a library
+  -S safe_level    set $SAFE (0..4)
+  -E ex[:in]       set default external/internal encodings
+  -U               set default encoding to UTF-8.
+  -T trim_mode     specify trim_mode (0..2, -)
   -P               ignore lines which start with "%"
 EOU
         exit 1
       end
 
+      $<.set_encoding(Encoding::ASCII_8BIT, nil)
       src = $<.read
       filename = $FILENAME
       exit 2 unless src
@@ -120,10 +123,8 @@ EOU
       erb.filename = filename
       if output
         if number
-          l = 1
-          for line in erb.src
-            puts "%3d %s"%[l, line]
-            l += 1
+          erb.src.each_line.with_index do |line, l|
+            puts "%3d %s"%[l+1, line]
           end
         else
           puts erb.src
@@ -133,6 +134,19 @@ EOU
       end
     end
     module_function :run
+
+    def set_encoding(extern, intern = nil)
+      verbose, $VERBOSE = $VERBOSE, nil
+      Encoding.default_external = extern unless extern.nil? || extern.empty?
+      Encoding.default_internal = intern unless intern.nil? || intern.empty?
+      [$stdin, $stdout, $stderr].each do |io|
+        io.set_encoding(extern, intern)
+      end
+    ensure
+      $VERBOSE = verbose
+    end
+    module_function :set_encoding
+    class << self; private :set_encoding; end
   end
 end
 
diff --git a/bin/gem b/bin/gem
new file mode 100755
index 0000000000..14c3d3c480
--- /dev/null
+++ b/bin/gem
@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems'
+require 'rubygems/gem_runner'
+require 'rubygems/exceptions'
+
+required_version = Gem::Requirement.new ">= 1.8.6"
+
+unless required_version.satisfied_by? Gem.ruby_version then
+  abort "Expected Ruby Version #{required_version}, is #{Gem.ruby_version}"
+end
+
+args = ARGV.clone
+
+begin
+  Gem::GemRunner.new.run args
+rescue Gem::SystemExitException => e
+  exit e.exit_code
+end
+
diff --git a/bin/irb b/bin/irb
index f277bc4b69..6c8465c802 100644..100755
--- a/bin/irb
+++ b/bin/irb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 #
-#   irb.rb - intaractive ruby
-#   	$Release Version: 0.9.5 $
+#   irb.rb - interactive ruby
+#   	$Release Version: 0.9.6 $
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 0000000000..c9e95da611
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#++
+
+begin
+  require 'rake'
+rescue LoadError
+  require 'rubygems'
+  require 'rake'
+end
+Rake.application.run
diff --git a/bin/rdoc b/bin/rdoc
index fe619137fd..8fafd01b0f 100644..100755
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -8,60 +8,28 @@
 #
 #  $Revision$
 
-## Transitional Hack ####
-#
-#  RDoc was initially distributed independently, and installed
-#  itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
-#
-#  Now that RDoc is part of the distribution, it's installed into
-#  <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
-#  search path. This means that if you have previously installed RDoc,
-#  and then install from ruby-lang, you'll pick up the old one by
-#  default. This hack checks for the condition, and readjusts the
-#  search path if necessary.
-
-def adjust_for_existing_rdoc(path)
-  
-  $stderr.puts %{
-  It seems as if you have a previously-installed RDoc in
-  the directory #{path}.
-
-  Because this is now out-of-date, you might want to consider
-  removing the directories:
-
-    #{File.join(path, "rdoc")}
-
-  and
-
-    #{File.join(path, "markup")}
-
-  }
-
-  # Move all the site_ruby directories to the end
-  p $:
-  $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
-  p $:
-end
-
-$:.each do |path|
-  if /site_ruby/ =~ path 
-    rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
-    if File.exists?(rdoc_path)
-      adjust_for_existing_rdoc(path)
-      break
-    end
-  end
-end
-
-## End of Transitional Hack ##
-
-
 require 'rdoc/rdoc'
 
 begin
   r = RDoc::RDoc.new
-  r.document(ARGV)
-rescue RDoc::RDocError => e
-  $stderr.puts e.message
-  exit(1)
+  r.document ARGV
+rescue SystemExit
+  raise
+rescue Exception => e
+  if $DEBUG_RDOC then
+    $stderr.puts e.message
+    $stderr.puts "#{e.backtrace.join "\n\t"}"
+    $stderr.puts
+  elsif Interrupt === e then
+    $stderr.puts
+    $stderr.puts 'Interrupted'
+  else
+    $stderr.puts "uh-oh! RDoc had a problem:"
+    $stderr.puts e.message
+    $stderr.puts
+    $stderr.puts "run with --debug for full backtrace"
+  end
+
+  exit 1
 end
+
diff --git a/bin/ri b/bin/ri
index fb3e00eda3..243557403c 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,49 +1,5 @@
 #!/usr/bin/env ruby
-# usage:
-#
-#   ri  name...
-#
-# where name can be 
-#
-#   Class | Class::method | Class#method | Class.method | method
-#
-# All names may be abbreviated to their minimum unbiguous form. If a name
-# _is_ ambiguous, all valid options will be listed.
-#
-# The form '.' method matches either class or instance methods, while 
-# #method matches only instance and ::method matches only class methods.
-#
-#
-# == Installing Documentation
-#
-# 'ri' uses a database of documentation built by the RDoc utility.
-# 
-# So, how do you install this documentation on your system?
-# It depends on how you installed Ruby.
-#
-# <em>If you installed Ruby from source files</em> (that is, if it some point
-# you typed 'make' during the process :), you can install the RDoc
-# documentation yourself. Just go back to the place where you have 
-# your Ruby source and type
-#
-#    make install-doc
-#
-# You'll probably need to do this as a superuser, as the documentation
-# is installed in the Ruby target tree (normally somewhere under 
-# <tt>/usr/local</tt>.
-#
-# <em>If you installed Ruby from a binary distribution</em> (perhaps
-# using a one-click installer, or using some other packaging system),
-# then the team that produced the package probably forgot to package
-# the documentation as well. Contact them, and see if they can add
-# it to the next release.
-#
 
+require 'rdoc/ri/driver'
 
-require 'rdoc/ri/ri_driver'
-
-######################################################################
-
-ri = RiDriver.new
-ri.process_args
-
+RDoc::RI::Driver.run ARGV
diff --git a/bin/testrb b/bin/testrb
index ff49cb5466..e4eb9099b3 100755
--- a/bin/testrb
+++ b/bin/testrb
@@ -1,5 +1,14 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-  abort r.options.banner + " tests..."
-exit r.run
+Test::Unit.setup_argv {|files|
+  if files.empty?
+    puts "Usage: testrb [options] tests..."
+    exit 1
+  end
+  if files.size == 1
+    $0 = File.basename(files[0])
+  else
+    $0 = files.to_s
+  end
+  files
+}
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
new file mode 100644
index 0000000000..744c0adac1
--- /dev/null
+++ b/bootstraptest/pending.rb
@@ -0,0 +1,39 @@
+assert_equal 'A', %q{
+  class A
+    @@a = 'A'
+    def a=(x)
+      @@a = x
+    end
+    def a
+      @@a
+    end
+  end
+
+  B = A.dup
+  B.new.a = 'B'
+  A.new.a
+}, '[ruby-core:17019]'
+
+assert_equal 'ok', %q{
+  def m
+    lambda{
+      proc{
+        return :ng1
+      }
+    }.call.call
+    :ng2
+  end
+
+  begin
+    m()
+  rescue LocalJumpError
+    :ok
+  end
+}
+
+assert_normal_exit %q{
+  r = Range.allocate
+  def r.<=>(o) true end
+  r.instance_eval { initialize r, r }
+  r.inspect
+}
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
new file mode 100755
index 0000000000..9d98afcb89
--- /dev/null
+++ b/bootstraptest/runner.rb
@@ -0,0 +1,398 @@
+"exec" "${RUBY-ruby}" "-x" "$0" "$@"; true # -*- mode: ruby; coding: utf-8 -*-
+#!./ruby
+# $Id$
+
+# NOTE:
+# Never use optparse in this file.
+# Never use test/unit in this file.
+# Never use Ruby extensions in this file.
+
+begin
+  require 'fileutils'
+  require 'tmpdir'
+rescue LoadError
+  $:.unshift File.join(File.dirname(__FILE__), '../lib')
+  retry
+end
+
+if !Dir.respond_to?(:mktmpdir)
+  # copied from lib/tmpdir.rb
+  def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+    case prefix_suffix
+    when nil
+      prefix = "d"
+      suffix = ""
+    when String
+      prefix = prefix_suffix
+      suffix = ""
+    when Array
+      prefix = prefix_suffix[0]
+      suffix = prefix_suffix[1]
+    else
+      raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+    end
+    tmpdir ||= Dir.tmpdir
+    t = Time.now.strftime("%Y%m%d")
+    n = nil
+    begin
+      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+      path << "-#{n}" if n
+      path << suffix
+      Dir.mkdir(path, 0700)
+    rescue Errno::EEXIST
+      n ||= 0
+      n += 1
+      retry
+    end
+
+    if block_given?
+      begin
+        yield path
+      ensure
+        FileUtils.remove_entry_secure path
+      end
+    else
+      path
+    end
+  end
+end
+
+def main
+  @ruby = File.expand_path('miniruby')
+  @verbose = false
+  dir = nil
+  quiet = false
+  tests = nil
+  ARGV.delete_if {|arg|
+    case arg
+    when /\A--ruby=(.*)/
+      @ruby = $1
+      @ruby.gsub!(/^([^ ]*)/){File.expand_path($1)}
+      @ruby.gsub!(/(\s+-I\s*)((?!(?:\.\/)*-(?:\s|\z))\S+)/){$1+File.expand_path($2)}
+      @ruby.gsub!(/(\s+-r\s*)(\.\.?\/\S+)/){$1+File.expand_path($2)}
+      true
+    when /\A--sets=(.*)/
+      tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb").sort
+      puts tests.map {|path| File.basename(path) }.inspect
+      true
+    when /\A--dir=(.*)/
+      dir = $1
+      true
+    when /\A(--stress|-s)/
+      $stress = true
+    when /\A(-q|--q(uiet))\z/
+      quiet = true
+      true
+    when /\A(-v|--v(erbose))\z/
+      @verbose = true
+    when /\A(-h|--h(elp)?)\z/
+      puts(<<-End)
+Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
+        --sets=NAME,NAME,...        Name of test sets.
+        --dir=DIRECTORY             Working directory.
+                                    default: /tmp/bootstraptestXXXXX.tmpwd
+    -s, --stress                    stress test.
+    -v, --verbose                   Output test name before exec.
+    -q, --quiet                     Don\'t print header message.
+    -h, --help                      Print this message and quit.
+End
+      exit true
+    else
+      false
+    end
+  }
+  if tests and not ARGV.empty?
+    $stderr.puts "--tests and arguments are exclusive"
+    exit false
+  end
+  tests ||= ARGV
+  tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
+  pathes = tests.map {|path| File.expand_path(path) }
+
+  unless quiet
+    puts Time.now
+    if defined?(RUBY_DESCRIPTION)
+      puts "Driver is #{RUBY_DESCRIPTION}"
+    elsif defined?(RUBY_PATCHLEVEL)
+      puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}#{RUBY_PLATFORM}) [#{RUBY_PLATFORM}]"
+    else
+      puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    end
+    puts "Target is #{`#{@ruby} -v`.chomp}"
+    puts
+    $stdout.flush
+  end
+
+  in_temporary_working_directory(dir) {
+    exec_test pathes
+  }
+end
+
+def exec_test(pathes)
+  @count = 0
+  @error = 0
+  @errbuf = []
+  @location = nil
+  pathes.each do |path|
+    $stderr.print "\n#{File.basename(path)} "
+    load File.expand_path(path)
+  end
+  $stderr.puts
+  if @error == 0
+    if @count == 0
+      $stderr.puts "No tests, no problem"
+    else
+      $stderr.puts "PASS all #{@count} tests"
+    end
+    exit true
+  else
+    @errbuf.each do |msg|
+      $stderr.puts msg
+    end
+    $stderr.puts "FAIL #{@error}/#{@count} tests failed"
+    exit false
+  end
+end
+
+def assert_check(testsrc, message = '', opt = '')
+  $stderr.puts "\##{@count} #{@location}" if @verbose
+  result = get_result_string(testsrc, opt)
+  check_coredump
+  faildesc = yield(result)
+  if !faildesc
+    $stderr.print '.'
+  else
+    $stderr.print 'F'
+    error faildesc, message
+  end
+rescue Exception => err
+  $stderr.print 'E'
+  error err.message, message
+end
+
+def assert_equal(expected, testsrc, message = '')
+  newtest
+  assert_check(testsrc, message) {|result|
+    if expected == result
+      nil
+    else
+      desc = "#{result.inspect} (expected #{expected.inspect})"
+      pretty(testsrc, desc, result)
+    end
+  }
+end
+
+def assert_match(expected_pattern, testsrc, message = '')
+  newtest
+  assert_check(testsrc, message) {|result|
+    if expected_pattern =~ result
+      nil
+    else
+      desc = "#{expected_pattern.inspect} expected to be =~\n#{result.inspect}"
+      pretty(testsrc, desc, result)
+    end
+  }
+end
+
+def assert_not_match(unexpected_pattern, testsrc, message = '')
+  newtest
+  assert_check(testsrc, message) {|result|
+    if unexpected_pattern !~ result
+      nil
+    else
+      desc = "#{unexpected_pattern.inspect} expected to be !~\n#{result.inspect}"
+      pretty(testsrc, desc, result)
+    end
+  }
+end
+
+def assert_valid_syntax(testsrc, message = '')
+  newtest
+  assert_check(testsrc, message, '-c') {|result|
+    result if /Syntax OK/ !~ result
+  }
+end
+
+def assert_normal_exit(testsrc, *rest)
+  opt = {}
+  opt = rest.pop if Hash === rest.last
+  message, ignore_signals = rest
+  message ||= ''
+  timeout = opt[:timeout]
+  newtest
+  $stderr.puts "\##{@count} #{@location}" if @verbose
+  faildesc = nil
+  filename = make_srcfile(testsrc)
+  old_stderr = $stderr.dup
+  timeout_signaled = false
+  begin
+    $stderr.reopen("assert_normal_exit.log", "w")
+    io = IO.popen("#{@ruby} -W0 #{filename}")
+    pid = io.pid
+    th = Thread.new {
+      io.read
+      io.close
+      $?
+    }
+    if !th.join(timeout)
+      Process.kill :KILL, pid
+      timeout_signaled = true
+    end
+    status = th.value
+  ensure
+    $stderr.reopen(old_stderr)
+    old_stderr.close
+  end
+  if status.signaled?
+    signo = status.termsig
+    signame = Signal.list.invert[signo]
+    unless ignore_signals and ignore_signals.include?(signame)
+      sigdesc = "signal #{signo}"
+      if signame
+        sigdesc = "SIG#{signame} (#{sigdesc})"
+      end
+      if timeout_signaled
+        sigdesc << " (timeout)"
+      end
+      faildesc = pretty(testsrc, "killed by #{sigdesc}", nil)
+      stderr_log = File.read("assert_normal_exit.log")
+      if !stderr_log.empty?
+        faildesc << "\n" if /\n\z/ !~ faildesc
+        stderr_log << "\n" if /\n\z/ !~ stderr_log
+        stderr_log.gsub!(/^.*\n/) { '| ' + $& }
+        faildesc << stderr_log
+      end
+    end
+  end
+  if !faildesc
+    $stderr.print '.'
+    true
+  else
+    $stderr.print 'F'
+    error faildesc, message
+    false
+  end
+rescue Exception => err
+  $stderr.print 'E'
+  error err.message, message
+  false
+end
+
+def assert_finish(timeout_seconds, testsrc, message = '')
+  newtest
+  $stderr.puts "\##{@count} #{@location}" if @verbose
+  faildesc = nil
+  filename = make_srcfile(testsrc)
+  io = IO.popen("#{@ruby} -W0 #{filename}")
+  pid = io.pid
+  waited = false
+  tlimit = Time.now + timeout_seconds
+  while Time.now < tlimit
+    if Process.waitpid pid, Process::WNOHANG
+      waited = true
+      break
+    end
+    sleep 0.1
+  end
+  if !waited
+    Process.kill(:KILL, pid)
+    Process.waitpid pid
+    faildesc = pretty(testsrc, "not finished in #{timeout_seconds} seconds", nil)
+  end
+  io.close
+  if !faildesc
+    $stderr.print '.'
+  else
+    $stderr.print 'F'
+    error faildesc, message
+  end
+rescue Exception => err
+  $stderr.print 'E'
+  error err.message, message
+end
+
+def flunk(message = '')
+  newtest
+  $stderr.print 'F'
+  error message, ''
+end
+
+def pretty(src, desc, result)
+  src = src.sub(/\A.*\n/, '')
+  (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
+end
+
+INDENT = 27
+
+def adjust_indent(src)
+  untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, '   ')
+end
+
+def untabify(str)
+  str.gsub(/^\t+/) {' ' * (8 * $&.size) }
+end
+
+def make_srcfile(src)
+  filename = 'bootstraptest.tmp.rb'
+  File.open(filename, 'w') {|f|
+    f.puts "GC.stress = true" if $stress
+    f.puts "print(begin; #{src}; end)"
+  }
+  filename
+end
+
+def get_result_string(src, opt = '')
+  if @ruby
+    filename = make_srcfile(src)
+    begin
+      `#{@ruby} -W0 #{opt} #{filename}`
+    ensure
+      raise CoreDumpError, "core dumped" if $? and $?.coredump?
+    end
+  else
+    eval(src).to_s
+  end
+end
+
+def newtest
+  @location = File.basename(caller(2).first)
+  @count += 1
+  cleanup_coredump
+end
+
+def error(msg, additional_message)
+  @errbuf.push "\##{@count} #{@location}: #{msg}  #{additional_message}"
+  @error += 1
+end
+
+def in_temporary_working_directory(dir)
+  if dir
+    Dir.mkdir dir
+    Dir.chdir(dir) {
+      yield
+    }
+  else
+    Dir.mktmpdir(["bootstraptest", ".tmpwd"]) {|d|
+      Dir.chdir(d) {
+        yield
+      }
+    }
+  end
+end
+
+def cleanup_coredump
+  FileUtils.rm_f 'core'
+  FileUtils.rm_f Dir.glob('core.*')
+  FileUtils.rm_f @ruby+'.stackdump' if @ruby
+end
+
+class CoreDumpError < StandardError; end
+
+def check_coredump
+  if File.file?('core') or not Dir.glob('core.*').empty? or
+      (@ruby and File.exist?(@ruby+'.stackdump'))
+    raise CoreDumpError, "core dumped"
+  end
+end
+
+main
diff --git a/bootstraptest/test_attr.rb b/bootstraptest/test_attr.rb
new file mode 100644
index 0000000000..721a847145
--- /dev/null
+++ b/bootstraptest/test_attr.rb
@@ -0,0 +1,36 @@
+assert_equal 'ok', %q{
+  module M
+    class A
+      class << self
+        attr_accessor :at
+        def workflow_rule
+          yield self
+        end
+
+        def eval_str(str)
+          eval(str)
+        end
+      end
+    end
+  end
+  begin
+    M::A.eval_str(<<-END)
+    workflow_rule do |r|
+      r.at 1
+    end
+    END
+  rescue ArgumentError => e
+    print "ok"
+  end
+}, '[ruby-core:14641]'
+
+assert_equal %{ok}, %{
+  class A
+    attr :m
+  end
+  begin
+    A.new.m(3)
+  rescue ArgumentError => e
+    print "ok"
+  end
+}, '[ruby-core:15120]'
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
new file mode 100644
index 0000000000..b781fdb7e9
--- /dev/null
+++ b/bootstraptest/test_autoload.rb
@@ -0,0 +1,78 @@
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  ZZZ.ok
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  require "./zzz.rb"
+  ZZZ.ok
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  proc{$SAFE=4; ZZZ.ok}.call
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  require "./zzz.rb"
+  proc{$SAFE=4; ZZZ.ok}.call
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
+  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
+  module M; end
+  Thread.new{M.instance_eval('$SAFE=4; ZZZ.new.hoge')}.value
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
+  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
+  module M; end
+  Thread.new{$SAFE=4; M.instance_eval('ZZZ.new.hoge')}.value
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
+  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
+  Thread.new{$SAFE=4; eval('ZZZ.new.hoge')}.value
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
+  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
+  module M; end
+  Thread.new{eval('$SAFE=4; ZZZ.new.hoge')}.value
+}
+
+assert_equal 'okok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  t1 = Thread.new {ZZZ.ok}
+  t2 = Thread.new {ZZZ.ok}
+  [t1.value, t2.value].join
+}
+
+assert_finish 5, %q{
+  autoload :ZZZ, File.expand_path(__FILE__)
+  begin
+    ZZZ
+  rescue NameError
+  end
+}, '[ruby-core:21696]'
+
+assert_equal 'A::C', %q{
+  open("zzz.rb", "w") {}
+  class A
+    autoload :C, "./zzz"
+    class C
+    end
+    C
+  end
+}
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
new file mode 100644
index 0000000000..ce7f00b033
--- /dev/null
+++ b/bootstraptest/test_block.rb
@@ -0,0 +1,567 @@
+assert_equal %q{1}, %q{
+  1.times{
+    begin
+      a = 1
+    ensure
+      foo = nil
+    end
+  }
+}
+assert_equal %q{2}, %q{
+  [1,2,3].find{|x| x == 2}
+}
+assert_equal %q{2}, %q{
+  class E
+    include Enumerable
+    def each(&block)
+      [1, 2, 3].each(&block)
+    end
+  end
+  E.new.find {|x| x == 2 }
+}
+assert_equal %q{6}, %q{
+  sum = 0
+  for x in [1, 2, 3]
+    sum += x
+  end
+  sum
+}
+assert_equal %q{15}, %q{
+  sum = 0
+  for x in (1..5)
+    sum += x
+  end
+  sum
+}
+assert_equal %q{0}, %q{
+  sum = 0
+  for x in []
+    sum += x
+  end
+  sum
+}
+assert_equal %q{1}, %q{
+  ans = []
+  1.times{
+    for n in 1..3
+      a = n
+      ans << a
+    end
+  }
+}
+assert_equal %q{1..3}, %q{
+  ans = []
+  for m in 1..3
+    for n in 1..3
+      a = [m, n]
+      ans << a
+    end
+  end
+}
+assert_equal %q{[1, 2, 3]}, %q{
+  (1..3).to_a
+}
+assert_equal %q{[4, 8, 12]}, %q{
+  (1..3).map{|e|
+    e * 4
+  }
+}
+assert_equal %q{[1, 2, 3]}, %q{
+  class C
+    include Enumerable
+    def each
+      [1,2,3].each{|e|
+        yield e
+      }
+    end
+  end
+  
+  C.new.to_a
+}
+assert_equal %q{[4, 5, 6]}, %q{
+  class C
+    include Enumerable
+    def each
+      [1,2,3].each{|e|
+        yield e
+      }
+    end
+  end
+  
+  C.new.map{|e|
+    e + 3
+  }
+}
+assert_equal %q{100}, %q{
+  def m
+    yield
+  end
+  def n
+    yield
+  end
+
+  m{
+    n{
+      100
+    }
+  }
+}
+assert_equal %q{20}, %q{
+  def m
+    yield 1
+  end
+  
+  m{|ib|
+    m{|jb|
+      i = 20
+    }
+  }
+}
+assert_equal %q{2}, %q{
+  def m
+    yield 1
+  end
+  
+  m{|ib|
+    m{|jb|
+      ib = 20
+      kb = 2
+    }
+  }
+}
+assert_equal %q{3}, %q{
+  def iter1
+    iter2{
+      yield
+    }
+  end
+  
+  def iter2
+    yield
+  end
+  
+  iter1{
+    jb = 2
+    iter1{
+      jb = 3
+    }
+    jb
+  }
+}
+assert_equal %q{2}, %q{
+  def iter1
+    iter2{
+      yield
+    }
+  end
+  
+  def iter2
+    yield
+  end
+  
+  iter1{
+    jb = 2
+    iter1{
+      jb
+    }
+    jb
+  }
+}
+assert_equal %q{2}, %q{
+  def m
+    yield 1
+  end
+  m{|ib|
+    ib*2
+  }
+}
+assert_equal %q{92580}, %q{
+  def m
+    yield 12345, 67890
+  end
+  m{|ib,jb|
+    ib*2+jb
+  }
+}
+assert_equal %q{[10, nil]}, %q{
+  def iter
+    yield 10
+  end
+
+  a = nil
+  [iter{|a|
+    a
+  }, a]
+}
+assert_equal %q{21}, %q{
+  def iter
+    yield 10
+  end
+
+  iter{|a|
+    iter{|a|
+      a + 1
+    } + a
+  }
+}
+assert_equal %q{[10, 20, 30, 40, nil, nil, nil, nil]}, %q{
+  def iter
+    yield 10, 20, 30, 40
+  end
+
+  a = b = c = d = nil
+  iter{|a, b, c, d|
+    [a, b, c, d]
+  } + [a, b, c, d]
+}
+assert_equal %q{[10, 20, 30, 40, nil, nil]}, %q{
+  def iter
+    yield 10, 20, 30, 40
+  end
+
+  a = b = nil
+  iter{|a, b, c, d|
+    [a, b, c, d]
+  } + [a, b]
+}
+assert_equal %q{[1]}, %q{
+  $a = []
+  
+  def iter
+    yield 1
+  end
+  
+  def m
+    x = iter{|x|
+      $a << x
+      y = 0
+    }
+  end
+  m
+  $a
+}
+assert_equal %q{[1, [2]]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|a, *b|
+    [a, b]
+  }
+}
+assert_equal %q{[[1, 2]]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|*a|
+    [a]
+  }
+}
+assert_equal %q{[1, 2, []]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|a, b, *c|
+    [a, b, c]
+  }
+}
+assert_equal %q{[1, 2, nil, []]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|a, b, c, *d|
+    [a, b, c, d]
+  }
+}
+assert_equal %q{1}, %q{
+  def m
+    yield
+  end
+  m{
+    1
+  }
+}
+assert_equal %q{15129}, %q{
+  def m
+    yield 123
+  end
+  m{|ib|
+    m{|jb|
+      ib*jb
+    }
+  }
+}
+assert_equal %q{2}, %q{
+  def m a
+    yield a
+  end
+  m(1){|ib|
+    m(2){|jb|
+      ib*jb
+    }
+  }
+}
+assert_equal %q{9}, %q{
+  sum = 0
+  3.times{|ib|
+    2.times{|jb|
+      sum += ib + jb
+    }}
+  sum
+}
+assert_equal %q{10}, %q{
+  3.times{|bl|
+    break 10
+  }
+}
+assert_equal %q{[1, 2]}, %q{
+  def iter
+    yield 1,2,3
+  end
+
+  iter{|i, j|
+    [i, j]
+  }
+}
+assert_equal %q{[1, nil]}, %q{
+  def iter
+    yield 1
+  end
+
+  iter{|i, j|
+    [i, j]
+  }
+}
+
+assert_equal '0', %q{
+def m()
+end
+m {|(v0,*,(*)),|}
+m {|(*v0,(*)),|}
+m {|(v0,*v1,(*)),|}
+m {|((v0,*v1,v2)),|}
+m {|(v0,*v1,v2),|}
+m {|(v0,*v1,(v2)),|}
+m {|((*),*v0,v1),|}
+m {|((v0),*v1,v2),|}
+m {|(v0,v1,*v2,v3),|}
+m {|v0,(v1,*v2,v3),|}
+m {|(v0,*v1,v2),v3,|}
+m {|(v0,*v1,v2)|}
+m {|(v0,*v1,v2),&v3|}
+m {|(v0,*v1,v2),*|}
+m {|(v0,*v1,v2),*,&v3|}
+m {|*,(v0,*v1,v2)|}
+m {|*,(v0,*v1,v2),&v3|}
+m {|v0,*,(v1,*v2,v3)|}
+m {|v0,*,(v1,*v2,v3),&v4|}
+m {|(v0,*v1,v2),*,v3|}
+m {|(v0,*v1,v2),*,v3,&v4|}
+m {|(v0, *v1, v2)|}
+m {|(*,v)|}
+0
+}, "block parameter (shouldn't SEGV: [ruby-dev:31143])"
+
+assert_equal 'nil', %q{
+  def m
+    yield
+  end
+  m{|&b| b}.inspect
+}, '[ruby-dev:31147]'
+
+assert_equal 'nil', %q{
+  def m()
+    yield
+  end
+  m {|(v,(*))|}.inspect
+}, '[ruby-dev:31160]'
+
+assert_equal 'nil', %q{
+  def m()
+    yield
+  end
+  m {|(*,a,b)|}.inspect
+}, '[ruby-dev:31153]'
+
+assert_equal 'nil', %q{
+  def m()
+    yield
+  end
+  m {|((*))|}.inspect
+}
+
+assert_equal %q{[1, 1, [1, nil], [1, nil], [1, nil], [1, nil], [1, 1], 1, [1, nil], [1, nil], [1, nil], [1, nil], [[1, 1], [1, 1]], [1, 1], [1, 1], [1, 1], [1, nil], [1, nil], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[1, 1], [1, 1]], [[1, 1], [1, 1]], [[1, 1], [1, 1]], [1, 1], [1, 1], [[[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[1, 1], [1, 1]], [[1, 1], [1, 1]]]}, %q{
+def m(ary = [])
+  yield(ary)
+end
+
+$ans = []
+o = 1
+5.times{
+  v,(*) = o; $ans << o
+  m(o){|(v,(*))| $ans << v}
+  ((x, y)) = o; $ans << [x, y]
+  m(o){|((x, y))| $ans << [x, y]}
+  (((x, y))) = o; $ans << [x, y]
+  m(o){|(((x, y)))| $ans << [x, y]}
+  o = [o, o]
+}; $ans
+}
+
+assert_equal '0', %q{
+  def m()
+    yield [0]
+  end
+  m {|*,v| v}.inspect
+}, '[ruby-dev:31437]'
+assert_equal '[0]', %q{
+  def m
+    yield [0]
+  end
+  m{|v, &b| v}.inspect
+}, '[ruby-dev:31440]'
+assert_equal 'ok', %q{
+  begin
+    lambda{|a|}.call(1, 2)
+  rescue ArgumentError
+    :ok
+  else
+    :ng
+  end
+}, '[ruby-dev:31464]'
+assert_equal 'ok', %q{
+  begin
+    lambda{|&b|}.call(3)
+  rescue ArgumentError
+    :ok
+  else
+    :ng
+  end
+}, '[ruby-dev:31472]'
+assert_equal 'ok', %q{
+  class C
+    def each
+      yield [1,2]
+      yield 1,2
+    end
+  end
+  vs1 = []
+  C.new.each {|*v| vs1 << v }
+  vs2 = []               
+  C.new.to_enum.each {|*v| vs2 << v }
+  vs1 == vs2 ? :ok : :ng
+}, '[ruby-dev:32329]'
+
+assert_normal_exit %q{
+  e = [1,2,3].each
+  10000.times {
+    e = [e].each
+  }
+  Thread.new { GC.start }.join
+}, '[ruby-dev:32604]'
+
+
+assert_equal '[nil, []]', %q{
+  def m() yield nil,[] end
+  l = lambda {|*v| v}
+  GC.stress=true
+  r = m(&l)      
+  GC.stress=false
+  r.inspect             
+}, '[ruby-dev:32567]'
+
+assert_equal NilClass.to_s, %q{
+  r = false; 1.times{|&b| r = b}; r.class
+}
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:foo) do |arg, &block|
+      if block then block.call else arg end
+    end
+  end
+  C.new.foo("ng") {"ok"}
+}, '[ruby-talk:266422]'
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:xyz) do |o, k, &block|
+      block.call(o, k)
+    end
+  end
+  C.new.xyz("o","k") {|o, k| o+k}
+}, '[ruby-core:20544]'
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:xyz) do |*args, &block|
+      block.call(*args)
+    end
+  end
+  C.new.xyz("o","k") {|*args| args.join("")}
+}, '[ruby-core:20544]'
+
+assert_equal 'ok', %q{
+  STDERR.reopen(STDOUT)
+  class C
+    define_method(:foo) do |&block|
+      block.call if block
+    end
+    result = "ng"
+    new.foo() {result = "ok"}
+    result
+  end
+}
+
+assert_equal "ok", %q{
+  class Bar
+    def bar; :ok; end
+  end
+  def foo
+    yield(Bar.new) if block_given?
+  end
+  foo(&:bar)
+}, '[ruby-core:14279]'
+
+assert_normal_exit %q{
+  class Controller
+    def respond_to(&block)
+      responder = Responder.new
+      block.call(responder)
+      responder.respond
+    end
+    def test_for_bug
+      respond_to{|format|
+        format.js{
+          puts "in test"
+          render{|obj|
+            puts obj
+          }
+        }
+      }
+    end
+    def render(&block)
+      puts "in render"
+    end
+  end
+
+  class Responder
+    def method_missing(symbol, &block)
+      puts "enter method_missing"
+      @response = Proc.new{
+        puts 'in method missing'
+        block.call
+      }
+      puts "leave method_missing"
+    end
+    def respond
+      @response.call
+    end
+  end
+  t = Controller.new
+  t.test_for_bug
+}, '[ruby-core:14395]'
+
diff --git a/bootstraptest/test_class.rb b/bootstraptest/test_class.rb
new file mode 100644
index 0000000000..664dd2f166
--- /dev/null
+++ b/bootstraptest/test_class.rb
@@ -0,0 +1,159 @@
+# class
+assert_equal 'true',    %q( class C; end
+                            Object.const_defined?(:C) )
+assert_equal 'Class',   %q( class C; end
+                            C.class )
+assert_equal 'C',       %q( class C; end
+                            C.name )
+assert_equal 'C',       %q( class C; end
+                            C.new.class )
+assert_equal 'C',       %q( class C; end
+                            C.new.class.name )
+assert_equal 'Class',   %q( class C; end
+                            C.new.class.class )
+
+# inherited class
+assert_equal 'true',    %q( class A; end
+                            class C < A; end
+                            Object.const_defined?(:C) )
+assert_equal 'Class',   %q( class A; end
+                            class C < A; end
+                            C.class )
+assert_equal 'C',       %q( class A; end
+                            class C < A; end
+                            C.name )
+assert_equal 'C',       %q( class A; end
+                            class C < A; end
+                            C.new.class )
+assert_equal 'C',       %q( class A; end
+                            class C < A; end
+                            C.new.class.name )
+assert_equal 'Class',   %q( class A; end
+                            class C < A; end
+                            C.new.class.class )
+
+# module
+assert_equal 'true',    %q( module M; end
+                            Object.const_defined?(:M) )
+assert_equal 'Module',  %q( module M; end
+                            M.class )
+assert_equal 'M',       %q( module M; end
+                            M.name )
+assert_equal 'C',       %q( module M; end
+                            class C; include M; end
+                            C.new.class )
+
+# nested class
+assert_equal 'A::B',    %q( class A; end
+                            class A::B; end
+                            A::B )
+assert_equal 'A::B',    %q( class A; end
+                            class A::B; end
+                            A::B.name )
+assert_equal 'A::B',    %q( class A; end
+                            class A::B; end
+                            A::B.new.class )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            A::B.new.class.class )
+assert_equal 'A::B::C', %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C )
+assert_equal 'A::B::C', %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.name )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.class )
+assert_equal 'A::B::C', %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.new.class )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.new.class.class )
+assert_equal 'A::B2',   %q( class A; end
+                            class A::B; end
+                            class A::B2 < A::B; end
+                            A::B2 )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            class A::B2 < A::B; end
+                            A::B2.class )
+
+# reopen
+assert_equal 'true',    %q( class C; end;  c1 = ::C
+                            class C; end;  c2 = ::C
+                            c1.equal?(c2) )
+assert_equal '1',       %q( class C; end
+                            class A; end
+                            begin class C < A; end; rescue TypeError; 1 end )
+assert_equal '1',       %q( class C; end
+                            begin module C; end; rescue TypeError; 1 end )
+assert_equal '1',       %q( C = 1   # [yarv-dev:782]
+                            begin class C; end; rescue TypeError; 1 end )
+assert_equal '1',       %q( C = 1   # [yarv-dev:800]
+                            begin module C; end; rescue TypeError; 1 end )
+
+# colon2, colon3
+assert_equal '1',       %q( class A; end;  A::C = 1;  A::C )
+assert_equal '1',       %q( A = 7;  begin A::C = 7; rescue TypeError; 1 end )
+assert_equal '1',       %q( begin 7::C = 7; rescue TypeError; 1 end )
+assert_equal 'C',       %q( class A; class ::C; end end;  C )
+assert_equal 'Class',   %q( class A; class ::C; end end;  C.class )
+assert_equal 'OK',      %q( class A; ::C = "OK"; end;  C )
+assert_equal 'String',  %q( class A; ::C = "OK"; end;  C.class )
+
+# class/module dup
+assert_equal 'Class',   %q( class C; end;  C.dup.class )
+assert_equal 'Module',  %q( module M; end;  M.dup.class )
+
+
+assert_equal "ok", %q{
+  module Foo
+  end
+
+  begin
+    def foo(&b)
+      Foo.module_eval &b
+    end
+    foo{
+      def bar
+      end
+    }
+    bar()
+  rescue NameError
+    :ok
+  end
+}, '[ruby-core:14378]'
+
+assert_equal '3', %q{
+  $i = 0
+  class C
+    def self.const_missing *args
+      $i+=1
+    end
+  end
+
+  3.times{
+    C::FOO
+  }
+  $i
+}
+
+assert_match /::C\z/, %q{
+  c = nil
+  Module.new{|m| c = class m::C; name; end}
+  c
+}, '[ruby-dev:38456]'
+
+assert_normal_exit %q{
+  s = Symbol.dup
+  class << s
+  end
+  s.allocate.to_s
+}, '[ruby-core:30843]'
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
new file mode 100644
index 0000000000..9ae50a6d30
--- /dev/null
+++ b/bootstraptest/test_eval.rb
@@ -0,0 +1,321 @@
+assert_equal %q{ok}, %q{
+  def m
+    a = :ok
+    $b = binding
+  end
+  m
+  eval('a', $b)
+}
+assert_equal %q{[:ok, :ok2]}, %q{
+  def m
+    a = :ok
+    $b = binding
+  end
+  m
+  eval('b = :ok2', $b)
+  eval('[a, b]', $b)
+}
+assert_equal %q{[nil, 1]}, %q{
+  $ans = []
+  def m
+    $b = binding
+  end
+  m
+  $ans << eval(%q{
+    $ans << eval(%q{
+      a
+    }, $b)
+    a = 1
+  }, $b)
+  $ans
+}
+assert_equal %q{C}, %q{
+  Const = :top
+  class C
+    Const = :C
+    def m
+      binding
+    end
+  end
+  eval('Const', C.new.m)
+}
+assert_equal %q{top}, %q{
+  Const = :top
+  a = 1
+  class C
+    Const = :C
+    def m
+      eval('Const', TOPLEVEL_BINDING)
+    end
+  end
+  C.new.m
+}
+assert_equal %q{:ok
+ok}, %q{
+  class C
+    $b = binding
+  end
+  eval %q{
+    def m
+      :ok
+    end
+  }, $b
+  p C.new.m
+}
+assert_equal %q{ok}, %q{
+  b = proc{
+    a = :ok
+    binding
+  }.call
+  a = :ng
+  eval("a", b)
+}
+assert_equal %q{C}, %q{
+  class C
+    def foo
+      binding
+    end
+  end
+  C.new.foo.eval("self.class.to_s")
+}
+assert_equal %q{1}, %q{
+  eval('1')
+}
+assert_equal %q{1}, %q{
+  eval('a=1; a')
+}
+assert_equal %q{1}, %q{
+  a = 1
+  eval('a')
+}
+assert_equal %q{ok}, %q{
+  __send__ :eval, %{
+    :ok
+  }
+}
+assert_equal %q{ok}, %q{
+  1.__send__ :instance_eval, %{
+    :ok
+  }
+}
+assert_equal %q{1}, %q{
+  1.instance_eval{
+    self
+  }
+}
+assert_equal %q{foo}, %q{
+  'foo'.instance_eval{
+    self
+  }
+}
+assert_equal %q{1}, %q{
+  class Fixnum
+    Const = 1
+  end
+  1.instance_eval %{
+    Const
+  }
+}
+assert_equal %q{top}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  C.module_eval{
+    Const
+  }
+}
+assert_equal %q{C}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  C.class_eval %{
+    def m
+      Const
+    end
+  }
+  C.new.m
+}
+assert_equal %q{C}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  C.class_eval{
+    def m
+      Const
+    end
+  }
+  C.new.m
+}
+assert_equal %q{[:top, :C, :top, :C]}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  $nest = false
+  $ans = []
+  def m
+    $ans << Const
+    C.module_eval %{
+      $ans << Const
+      Boo = false unless defined? Boo
+      unless $nest
+        $nest = true
+        m
+      end
+    }
+  end
+  m
+  $ans
+}
+assert_equal %q{[10, main]}, %q{
+  $nested = false
+  $ans = []
+  $pr = proc{
+    $ans << self
+    unless $nested
+      $nested = true
+      $pr.call
+    end
+  }
+  class C
+    def initialize &b
+      10.instance_eval(&b)
+    end
+  end
+  C.new(&$pr)
+  $ans
+}
+
+%w[break next redo].each do |keyword|
+  assert_match %r"Can't escape from eval with #{keyword}\z", %{
+    begin
+      eval "0 rescue #{keyword}"
+    rescue SyntaxError => e
+      e.message
+    end
+  }, '[ruby-dev:31372]'
+end
+
+assert_normal_exit %q{
+  STDERR.reopen(STDOUT)
+  class Foo
+     def self.add_method
+       class_eval("def some-bad-name; puts 'hello' unless @some_variable.some_function(''); end")
+     end
+  end
+  Foo.add_method
+}, '[ruby-core:14556] reported by Frederick Cheung'
+
+assert_equal 'ok', %q{
+  class Module
+    def my_module_eval(&block)
+      module_eval(&block)
+    end
+  end
+  class String
+    Integer.my_module_eval do
+      def hoge; end
+    end
+  end
+  if Integer.instance_methods(false).map{|m|m.to_sym}.include?(:hoge) &&
+     !String.instance_methods(false).map{|m|m.to_sym}.include?(:hoge)
+    :ok
+  else
+    :ng
+  end
+}, "[ruby-dev:34236]"
+
+assert_equal 'ok', %q{
+  begin
+    eval("class nil::Foo; end")
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+
+assert_equal 'ok', %q{
+  begin
+    0.instance_eval { def m() :m end }
+    1.m
+    :ng
+  rescue Exception
+    :ok
+  end
+}, '[ruby-dev:34579]'
+
+assert_equal 'ok', %q{
+  begin
+    12.instance_eval { @@a }
+  rescue NameError
+    :ok
+  end
+}, '[ruby-core:16794]'
+
+assert_equal 'ok', %q{
+  begin
+    12.instance_exec { @@a }
+  rescue NameError
+    :ok
+  end
+}, '[ruby-core:16794]'
+
+assert_equal 'ok', %q{
+  begin
+    nil.instance_eval {
+      def a() :a end
+    }
+  rescue TypeError
+    :ok
+  end
+}, '[ruby-core:16796]'
+
+assert_equal 'ok', %q{
+  begin
+    nil.instance_exec {
+      def a() :a end
+    }
+  rescue TypeError
+    :ok
+  end
+}, '[ruby-core:16796]'
+
+assert_normal_exit %q{
+  eval("", method(:proc).call {}.binding)
+}
+
+assert_equal "", %q{
+  b = binding
+  10.times{
+    eval('', b)
+  }
+  begin
+    eval('1.times{raise}', b)
+  rescue => e
+    e.message
+  end
+}, '[ruby-dev:35392]'
+
+assert_equal "[:x]", %q{
+  def kaboom!
+    yield.eval("local_variables")
+  end
+
+  for x in enum_for(:kaboom!)
+    binding
+  end
+}, '[ruby-core:25125]'
+
+assert_normal_exit %q{
+  hash = {}
+  ("aaaa".."matz").each_with_index do |s, i|
+    hash[s] = i
+  end
+  begin
+    eval "class C; @@h = #{hash.inspect}; end"
+  rescue SystemStackError
+  end
+}, '[ruby-core:25714]'
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
new file mode 100644
index 0000000000..33154a546d
--- /dev/null
+++ b/bootstraptest/test_exception.rb
@@ -0,0 +1,416 @@
+assert_equal %q{2}, %q{
+  begin
+    1+1
+  ensure
+    2+2
+  end
+}
+assert_equal %q{4}, %q{
+  begin
+    1+1
+    begin
+      2+2
+    ensure
+      3+3
+    end
+  ensure
+    4+4
+  end
+}
+assert_equal %q{4}, %q{
+  begin
+    1+1
+    begin
+      2+2
+    ensure
+      3+3
+    end
+  ensure
+    4+4
+    begin
+      5+5
+    ensure
+      6+6
+    end
+  end
+}
+assert_equal %q{NilClass}, %q{
+  a = nil
+  1.times{|e|
+    begin
+    rescue => err
+    end
+    a = err.class
+  }
+  a
+}
+assert_equal %q{RuntimeError}, %q{
+  a = nil
+  1.times{|e|
+    begin
+      raise
+    rescue => err
+    end
+    a = err.class
+  }
+  a
+}
+assert_equal %q{}, %q{
+  $!
+}
+assert_equal %q{FOO}, %q{
+  begin
+    raise "FOO"
+  rescue
+    $!
+  end
+}
+assert_equal %q{FOO}, %q{
+  def m
+    $!
+  end
+  begin
+    raise "FOO"
+  rescue
+    m()
+  end
+}
+assert_equal %q{[#<RuntimeError: BAR>, #<RuntimeError: FOO>]}, %q{
+  $ans = []
+  def m
+    $!
+  end
+  begin
+    raise "FOO"
+  rescue
+    begin
+      raise "BAR"
+    rescue
+      $ans << m()
+    end
+    $ans << m()
+  end
+  $ans
+}
+assert_equal %q{[#<RuntimeError: FOO>, #<RuntimeError: FOO>]}, %q{
+  $ans = []
+  def m
+    $!
+  end
+  
+  begin
+    begin
+      raise "FOO"
+    ensure
+      $ans << m()
+    end
+  rescue
+    $ans << m()
+  end
+}
+assert_equal %q{[nil]}, %q{
+  $ans = []
+  def m
+    $!
+  end
+  def m2
+    1.times{
+      begin
+        return
+      ensure
+        $ans << m
+      end
+    }
+  end
+  m2
+  $ans
+}
+assert_equal %q{ok}, %q{
+  begin
+    raise
+  rescue
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  begin
+    raise
+  rescue
+    :ok
+  ensure
+    :ng
+  end
+}
+assert_equal %q{RuntimeError}, %q{
+  begin
+    raise
+  rescue => e
+    e.class
+  end
+}
+assert_equal %q{ng}, %q{
+  begin
+    raise
+  rescue StandardError
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+assert_equal %q{c}, %q{
+  begin
+    begin
+      raise "a"
+    rescue
+      raise "b"
+    ensure
+      raise "c"
+    end
+  rescue => e
+    e.message
+  end
+}
+assert_equal %q{33}, %q{
+  def m a, b
+    a + b
+  end
+  m(1, begin
+         raise
+       rescue
+         2
+       end) +
+  m(10, begin
+         raise
+       rescue
+         20
+       ensure
+         30
+       end)
+}
+assert_equal %q{3}, %q{
+  def m a, b
+    a + b
+  end
+  m(begin
+      raise
+    rescue
+      1
+    end,
+    begin
+      raise
+    rescue
+      2
+    end)
+}
+assert_equal %q{ok3}, %q{
+  class E1 < Exception
+  end
+  
+  def m
+    yield
+  end
+  
+  begin
+    begin
+      begin
+        m{
+          raise
+        }
+      rescue E1
+        :ok2
+      ensure
+      end
+    rescue
+      :ok3
+    ensure
+    end
+  rescue E1
+    :ok
+  ensure
+  end
+}
+assert_equal %q{7}, %q{
+  $i = 0
+  def m
+    iter{
+      begin
+        $i += 1
+        begin
+          $i += 2
+          break
+        ensure
+          
+        end
+      ensure
+        $i += 4
+      end
+      $i = 0
+    }
+  end
+  
+  def iter
+    yield
+  end
+  m
+  $i
+}
+assert_equal %q{10}, %q{
+  $i = 0
+  def m
+    begin
+      $i += 1
+      begin
+        $i += 2
+        return
+      ensure
+        $i += 3
+      end
+    ensure
+      $i += 4
+    end
+    p :end
+  end
+  m
+  $i
+}
+assert_equal %q{1}, %q{
+  begin
+    1
+  rescue
+    2
+  end
+}
+assert_equal %q{4}, %q{
+  begin
+    1
+    begin
+      2
+    rescue
+      3
+    end
+    4
+  rescue
+    5
+  end
+}
+assert_equal %q{3}, %q{
+  begin
+    1
+  rescue
+    2
+  else
+    3
+  end
+}
+assert_equal %q{2}, %q{
+  begin
+    1+1
+  rescue
+    2+2
+  ensure
+    3+3
+  end
+   }
+assert_equal %q{2}, %q{
+  begin
+    1+1
+  rescue
+    2+2
+  ensure
+    3+3
+  end
+   }
+assert_equal %q{6}, %q{
+  begin
+    1+1
+  rescue
+    2+2
+  else
+    3+3
+  ensure
+    4+4
+  end
+   }
+assert_equal %q{12}, %q{
+ begin
+   1+1
+   begin
+     2+2
+   rescue
+     3+3
+   else
+     4+4
+   end
+ rescue
+   5+5
+ else
+   6+6
+ ensure
+   7+7
+ end
+   }
+assert_equal %q{ok}, %q{ # 
+  proc{
+    begin
+      raise
+      break
+    rescue
+      :ok
+    end
+  }.call
+}
+assert_equal %q{}, %q{
+  proc do
+    begin
+      raise StandardError
+      redo
+    rescue StandardError
+    end
+  end.call
+}
+
+##
+assert_match /undefined method `foo\'/, %q{#`
+  STDERR.reopen(STDOUT)
+  class C
+    def inspect
+      bar {}
+    end
+    
+    def bar
+      raise
+    ensure
+    end
+  end
+  C.new.foo
+}, "[ruby-dev:31407]"
+
+assert_equal 'nil', %q{
+  doit = false
+  exc = nil
+  t = Thread.new {
+    begin
+      doit = true
+      sleep 10
+    ensure
+      exc = $!
+    end
+  }
+  Thread.pass until doit
+  t.kill
+  t.join
+  exc.inspect
+}, '[ruby-dev:32608]'
+
+assert_equal 'exception class/object expected', %q{
+  class ZeroDivisionError
+    def self.new(message)
+      42
+    end
+  end
+  begin
+    1/0
+  rescue Exception => e
+    e.message
+  end
+}, '[ruby-core:24767]'
diff --git a/bootstraptest/test_finalizer.rb b/bootstraptest/test_finalizer.rb
new file mode 100644
index 0000000000..22a16b1220
--- /dev/null
+++ b/bootstraptest/test_finalizer.rb
@@ -0,0 +1,8 @@
+assert_normal_exit %q{
+a1,a2,b1,b2=Array.new(4){""}
+ObjectSpace.define_finalizer(b2,proc{})
+ObjectSpace.define_finalizer(b1,proc{b1.inspect})
+
+ObjectSpace.define_finalizer(a2,proc{a1.inspect})
+ObjectSpace.define_finalizer(a1,proc{})
+}, '[ruby-dev:35778]'
diff --git a/bootstraptest/test_flip.rb b/bootstraptest/test_flip.rb
new file mode 100644
index 0000000000..ff194868b2
--- /dev/null
+++ b/bootstraptest/test_flip.rb
@@ -0,0 +1 @@
+assert_equal %q{E}, %q{$_ = "E"; eval("nil if true..~/^E/",nil,"-e"); $_}
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
new file mode 100644
index 0000000000..84ef216421
--- /dev/null
+++ b/bootstraptest/test_flow.rb
@@ -0,0 +1,525 @@
+assert_equal %q{[1, 2, 4, 5, 6, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each{; $a << 2
+    break; $a << 3
+  }; $a << 4
+  begin; $a << 5
+  ensure; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 6, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  begin; $a << 2
+    [1,2].each do; $a << 3
+      break; $a << 4
+    end; $a << 5
+  ensure; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{ok}, %q{
+  ["a"].inject("ng"){|x,y|
+    break :ok
+  }
+}
+assert_equal %q{ok}, %q{
+  unless ''.respond_to? :lines
+    class String
+      def lines
+        self
+      end
+    end
+  end
+  
+  ('a').lines.map{|e|
+    break :ok
+  }
+}
+assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
+  ["a"].inject("ng"){|x,y|; $a << 2
+    break :ok; $a << 3
+  }; $a << 4
+; $a << 5
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
+  ('a'..'b').map{|e|; $a << 2
+    break :ok; $a << 3
+  }; $a << 4
+; $a << 5
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+    end; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 9, 10]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    begin; $a << 5
+    ensure; $a << 6
+      break; $a << 7
+    end; $a << 8
+  end; $a << 9
+; $a << 10
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    begin; $a << 5
+      raise; $a << 6
+    ensure; $a << 7
+      break; $a << 8
+    end; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    begin; $a << 5
+      raise; $a << 6
+    rescue; $a << 7
+      break; $a << 8
+    end; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      raise StandardError; $a << 4
+    ensure; $a << 5
+      break; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      raise StandardError; $a << 4
+    rescue; $a << 5
+      break; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 6, 8, 10, 11]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      begin; $a << 4
+        break; $a << 5
+      ensure; $a << 6
+      end; $a << 7
+    ensure; $a << 8
+    end; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      begin; $a << 8
+        raise; $a << 9
+      rescue; $a << 10
+        break; $a << 11
+      end; $a << 12
+    end; $a << 13
+  end; $a << 14
+; $a << 15
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      1.times{; $a << 8
+        begin; $a << 9
+          raise; $a << 10
+        rescue; $a << 11
+          break; $a << 12
+        end; $a << 13
+      }; $a << 14
+    end; $a << 15
+  end; $a << 16
+; $a << 17
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      begin; $a << 8
+        raise; $a << 9
+      ensure; $a << 10
+        break; $a << 11
+      end; $a << 12
+    end; $a << 13
+  end; $a << 14
+; $a << 15
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      1.times{; $a << 8
+        begin; $a << 9
+          raise; $a << 10
+        ensure; $a << 11
+          break; $a << 12
+        end; $a << 13
+      }; $a << 14
+    end; $a << 15
+  end; $a << 16
+; $a << 17
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  while true; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+      break; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 99]}, %q{
+$a = [];
+begin; ; $a << 1
+  while true; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+      raise; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 6, 8, 9, 10, 11]}, %q{$a = []; begin;  ; $a << 1
+  begin; $a << 2
+    [1,2].each do; $a << 3
+      begin; $a << 4
+        break; $a << 5
+      ensure; $a << 6
+      end; $a << 7
+    end; $a << 8
+  ensure; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 4, 99]}, %q{$a = []; begin; ; $a << 1
+  begin; $a << 2
+    raise StandardError; $a << 3
+  ensure; $a << 4
+  end; $a << 5
+; $a << 6
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4]}, %q{$a = []; begin;  ; $a << 1
+  begin; $a << 2
+  ensure; $a << 3
+  end ; $a << 4
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 99]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+      raise StandardError; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{3}, %q{
+  def m a, b
+    a + b
+  end
+  m(1,
+    while true
+      break 2
+    end
+    )
+}
+assert_equal %q{4}, %q{
+  def m a, b
+    a + b
+  end
+  m(1,
+    (i=0; while i<2
+       i+=1
+       class C
+         next 2
+       end
+     end; 3)
+    )
+}
+assert_equal %q{34}, %q{
+  def m a, b
+    a+b
+  end
+  m(1, 1.times{break 3}) +
+  m(10, (1.times{next 3}; 20))
+}
+assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class C; $a << 3
+      break; $a << 4
+    end; $a << 5
+  }; $a << 6
+; $a << 7
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class A; $a << 3
+      class B; $a << 4
+        break; $a << 5
+      end; $a << 6
+    end; $a << 7
+  }; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 2, 3, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class C; $a << 3
+      next; $a << 4
+    end; $a << 5
+  }; $a << 6
+; $a << 7
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 2, 3, 4, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class C; $a << 3
+      class D; $a << 4
+        next; $a << 5
+      end; $a << 6
+    end; $a << 7
+  }; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
+  while true; $a << 2
+    class C; $a << 3
+      break; $a << 4
+    end; $a << 5
+  end; $a << 6
+; $a << 7
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  while true; $a << 2
+    class C; $a << 3
+      class D; $a << 4
+        break; $a << 5
+      end; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 3, 4, 5, 3, 4, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    class C; $a << 5
+      next 10; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{1}, %q{
+  1.times{
+    while true
+      class C
+        begin
+          break
+        ensure
+          break
+        end
+      end
+    end
+  }
+}
+assert_equal %q{[1, 2, 3, 5, 2, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      next; $a << 4
+    ensure; $a << 5
+    end; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 6, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  o = "test"; $a << 2
+  def o.test(a); $a << 3
+    return a; $a << 4
+  ensure; $a << 5
+  end; $a << 6
+  o.test(123); $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 4, 7, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  def m1 *args; $a << 2
+    ; $a << 3
+  end; $a << 4
+  def m2; $a << 5
+    m1(:a, :b, (return 1; :c)); $a << 6
+  end; $a << 7
+  m2; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 8, 2, 3, 4, 5, 9, 10]}, %q{$a = []; begin; ; $a << 1
+  def m(); $a << 2
+    begin; $a << 3
+      2; $a << 4
+    ensure; $a << 5
+      return 3; $a << 6
+    end; $a << 7
+  end; $a << 8
+  m; $a << 9
+; $a << 10
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 3, 11, 4, 5, 6, 7, 12, 13]}, %q{$a = []; begin; ; $a << 1
+  def m2; $a << 2
+  end; $a << 3
+  def m(); $a << 4
+    m2(begin; $a << 5
+         2; $a << 6
+       ensure; $a << 7
+         return 3; $a << 8
+       end); $a << 9
+    4; $a << 10
+  end; $a << 11
+  m(); $a << 12
+; $a << 13
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 16, 2, 3, 4, 5, 6, 7, 10, 11, 17, 18]}, %q{$a = []; begin; ; $a << 1
+  def m; $a << 2
+    1; $a << 3
+    1.times{; $a << 4
+      2; $a << 5
+      begin; $a << 6
+        3; $a << 7
+        return; $a << 8
+        4; $a << 9
+      ensure; $a << 10
+        5; $a << 11
+      end; $a << 12
+      6; $a << 13
+    }; $a << 14
+    7; $a << 15
+  end; $a << 16
+  m(); $a << 17
+; $a << 18
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[:ok, :ok2, :last]}, %q{
+  a = []
+  i = 0
+  begin
+    while i < 1
+      i+=1
+      begin
+        begin
+          next
+        ensure
+          a << :ok
+        end
+      ensure
+        a << :ok2
+      end
+    end
+  ensure
+    a << :last
+  end
+  a
+}
+assert_equal %q{[:ok, :ok2, :last]}, %q{
+  a = []
+  i = 0
+  begin
+    while i < 1
+      i+=1
+      begin
+        begin
+          break
+        ensure
+          a << :ok
+        end
+      ensure
+        a << :ok2
+      end
+    end
+  ensure
+    a << :last
+  end
+  a
+}
+assert_equal %q{[:ok, :ok2, :last]}, %q{
+  a = []
+  i = 0
+  begin
+    while i < 1
+      if i>0
+        break
+      end
+      i+=1
+      begin
+        begin
+          redo
+        ensure
+          a << :ok
+        end
+      ensure
+        a << :ok2
+      end
+    end
+  ensure
+    a << :last
+  end
+  a
+}
+assert_equal %Q{ENSURE\n}, %q{
+  def test
+    while true
+      return
+    end
+  ensure
+    puts("ENSURE")
+  end
+  test
+}, '[ruby-dev:37967]'
+
+[['[ruby-core:28129]', %q{
+  class Bug2728
+    include Enumerable
+    define_method(:dynamic_method) do
+      "dynamically defined method"
+    end
+    def each
+      begin
+        yield :foo
+      ensure
+        dynamic_method
+      end
+    end
+  end
+  e = Bug2728.new
+}]].each do |bug, src|
+  assert_equal "foo", src + %q{e.detect {true}}, bug
+  assert_equal "true", src + %q{e.any? {true}}, bug
+  assert_equal "false", src + %q{e.all? {false}}, bug
+  assert_equal "true", src + %q{e.include?(:foo)}, bug
+end
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
new file mode 100644
index 0000000000..384294727f
--- /dev/null
+++ b/bootstraptest/test_fork.rb
@@ -0,0 +1,69 @@
+assert_equal '0', %q{
+  begin
+    GC.stress = true
+    pid = fork {}
+    Process.wait pid
+    $?.to_i
+  rescue NotImplementedError
+    0
+  end
+}, '[ruby-dev:32404]'
+
+assert_finish 10, %q{
+  begin
+    children = (1..10).map{
+      Thread.start{fork{}}.value
+    }
+    while !children.empty? and pid = Process.wait
+      children.delete(pid)
+    end
+  rescue NotImplementedError
+  end
+}, '[ruby-core:22158]'
+
+assert_normal_exit(<<'End', '[ruby-dev:37934]')
+  Thread.new { sleep 1; Thread.kill Thread.main }
+  Process.setrlimit(:NPROC, 1)
+  fork {}
+End
+
+assert_equal 'ok', %q{
+  begin
+    if pid1 = fork
+      sleep 1
+      Process.kill("USR1", pid1)
+      _, s = Process.wait2(pid1)
+      s.success? ? :ok : :ng
+    else
+      if pid2 = fork
+        trap("USR1") { Time.now.to_s }
+        Process.wait2(pid2)
+      else
+        sleep 2
+      end
+      exit 0
+    end
+  rescue NotImplementedError
+    :ok
+  end
+}, '[ruby-core:28924]'
+
+assert_equal '[1, 2]', %q{
+  a = []
+  trap(:INT) { a.push(1) }
+  trap(:TERM) { a.push(2) }
+  pid = $$
+  begin
+    fork do
+      sleep 0.5
+      Process.kill(:INT, pid)
+      Process.kill(:TERM, pid)
+    end
+
+    sleep 1
+    a.sort
+  rescue NotImplementedError
+    [1, 2]
+  end
+}, '[ruby-dev:44005] [Ruby 1.9 - Bug #4950]'
+
diff --git a/bootstraptest/test_gc.rb b/bootstraptest/test_gc.rb
new file mode 100644
index 0000000000..eb68c9845e
--- /dev/null
+++ b/bootstraptest/test_gc.rb
@@ -0,0 +1,34 @@
+assert_normal_exit %q{
+a = []
+ms = "a".."k"
+("A".."Z").each do |mod|
+  mod = eval("module #{mod}; self; end")
+  ms.each do |meth|
+    iseq = RubyVM::InstructionSequence.compile("module #{mod}; def #{meth}; end; end")
+    GC.stress = true
+    iseq.eval
+    GC.stress = false
+  end
+  o = Object.new.extend(mod)
+  ms.each do |meth|
+    o.send(meth)
+  end
+end
+}, '[ruby-dev:39453]'
+
+assert_normal_exit %q{
+a = []
+ms = "a".."k"
+("A".."Z").each do |mod|
+  mod = eval("module #{mod}; self; end")
+  ms.each do |meth|
+    GC.stress = true
+    mod.module_eval {define_method(meth) {}}
+    GC.stress = false
+  end
+  o = Object.new.extend(mod)
+  ms.each do |meth|
+    o.send(meth)
+  end
+end
+}, '[ruby-dev:39453]'
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
new file mode 100644
index 0000000000..7304aebc26
--- /dev/null
+++ b/bootstraptest/test_io.rb
@@ -0,0 +1,106 @@
+assert_finish 5, %q{
+  r, w = IO.pipe
+  t1 = Thread.new { r.sysread(1) }
+  t2 = Thread.new { r.sysread(1) }
+  sleep 0.1
+  w.write "a"
+  sleep 0.1
+  w.write "a"
+}, '[ruby-dev:31866]'
+
+assert_finish 10, %q{
+  begin
+    require "io/nonblock"
+    require "timeout"
+    timeout(3) do
+      r, w = IO.pipe
+      w.nonblock?
+      w.nonblock = true
+      w.write_nonblock("a" * 100000)
+      w.nonblock = false
+      t1 = Thread.new { w.write("b" * 4096) }
+      t2 = Thread.new { w.write("c" * 4096) }
+      sleep 0.5
+      r.sysread(4096).length
+      sleep 0.5
+      r.sysread(4096).length
+      t1.join
+      t2.join
+    end
+  rescue LoadError, TimeoutError, NotImplementedError
+  end
+}, '[ruby-dev:32566]'
+
+assert_finish 1, %q{
+  r, w = IO.pipe
+  Thread.new {
+  w << "ab"
+  sleep 0.1
+  w << "ab"
+  }
+  r.gets("abab")
+}
+
+assert_equal 'ok', %q{
+  require 'tmpdir'
+  begin
+    tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
+    rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
+  rescue Errno::EEXIST
+    retry
+  end
+  save = STDIN.dup
+  STDIN.reopen(rw)
+  STDIN.reopen(save)
+  rw.close
+  File.unlink(tmpname)
+  :ok
+}
+
+assert_equal 'ok', %q{
+  require 'tmpdir'
+  begin
+    tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
+    rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
+  rescue Errno::EEXIST
+    retry
+  end
+  save = STDIN.dup
+  STDIN.reopen(rw)
+  STDIN.print "a"
+  STDIN.reopen(save)
+  rw.close
+  File.unlink(tmpname)
+  :ok
+}
+
+assert_normal_exit %q{
+  ARGF.set_encoding "foo"
+}
+
+10.times do
+  assert_normal_exit %q{
+    at_exit { p :foo }
+
+    megacontent = "abc" * 12345678
+    #File.open("megasrc", "w") {|f| f << megacontent }
+
+    Thread.new { sleep rand*0.2; Process.kill(:INT, $$) }
+
+    r1, w1 = IO.pipe
+    r2, w2 = IO.pipe
+    t1 = Thread.new { w1 << megacontent; w1.close }
+    t2 = Thread.new { r2.read; r2.close }
+    IO.copy_stream(r1, w2) rescue nil
+    w2.close
+    r1.close
+    t1.join
+    t2.join
+  }, 'megacontent-copy_stream', ["INT"], :timeout => 10 or break
+end
+
+assert_normal_exit %q{
+  r, w = IO.pipe
+  STDOUT.reopen(w)
+  STDOUT.reopen(__FILE__, "r")
+}, '[ruby-dev:38131]'
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
new file mode 100644
index 0000000000..c53d83591e
--- /dev/null
+++ b/bootstraptest/test_jump.rb
@@ -0,0 +1,308 @@
+assert_equal %q{ok}, %q{
+  def m
+    :ng1
+    mm{
+      yield
+    }
+    :ng2
+  end
+
+  def mm
+    :ng3
+    yield
+    :ng4
+  end
+
+  m{
+    break :ok
+  }
+}
+assert_equal %q{ok}, %q{
+  3.times{
+    break :ok
+  }
+}
+assert_equal %q{}, %q{
+  catch(:foo){
+    throw :foo
+  }
+}
+assert_equal %q{false}, %q{
+  catch(:foo){
+    throw :foo, false
+  }
+}
+assert_equal %q{}, %q{
+  catch(:foo){
+    throw :foo, nil
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    throw :foo, :ok
+  }
+}
+assert_equal %q{}, %q{
+  catch(:foo){
+    1.times{
+      throw :foo
+    }
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    1.times{
+      throw :foo, :ok
+    }
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    catch(:bar){
+      throw :foo, :ok
+    }
+    :ng
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    catch(:bar){
+      1.times{
+        throw :foo, :ok
+      }
+    }
+    :ng
+  }
+}
+assert_equal %q{2}, %q{
+  module Enumerable
+    def all_?
+      self.each{|e|
+        unless yield(e)
+          return false
+        end
+      }
+      true
+    end
+  end
+
+  xxx = 0
+  [1,2].each{|bi|
+    [3,4].each{|bj|
+      [true, nil, true].all_?{|be| be}
+      break
+    }
+    xxx += 1
+  }
+  xxx
+}
+assert_equal %q{ok}, %q{
+  def m
+    yield
+  end
+  
+  m{
+    begin
+    ensure
+      break :ok
+    end
+  }
+}
+assert_equal %q{ok}, %q{
+  def m
+    yield
+    :ok
+  end
+  i=0
+  m{
+    if i>10
+      i*i
+    else
+      i+=1
+      next
+    end
+  }
+}
+assert_equal %q{ok}, %q{
+  def m
+    yield
+  end
+
+  m{
+    next :ok
+  }
+}
+assert_equal %q{131}, %q{
+  def m
+    yield + 10
+  end
+  i=0
+  m{
+    if i>10
+      i*i
+    else
+      i+=1
+      redo
+    end
+  }
+}
+assert_equal %q{ok}, %q{
+begin
+  eval %q{
+    1.times{
+      retry
+    }
+  }
+rescue SyntaxError
+  :ok
+end
+}
+assert_equal %q{3}, %q{
+  def m
+    return 3
+  end
+  m
+}
+assert_equal %q{ok}, %q{
+  def m
+    :ng1
+    mm{
+      return :ok
+    }
+    :ng2
+  end
+
+  def mm
+    :ng3
+    yield
+    :ng4
+  end
+  m
+}
+assert_equal %q{100}, %q{
+  $i = 0
+  def m
+    begin
+      iter{
+        return
+      }
+    ensure
+      $i = 100
+    end
+  end
+  
+  def iter
+    yield
+  end
+  m
+  $i
+}
+assert_equal %q{ok}, %q{
+  def m
+    begin
+      raise
+    rescue
+      return :ok
+    end
+    :ng
+  end
+  m
+}
+assert_equal %q{1}, %q{
+  def m
+    begin
+      raise
+    rescue
+      return 1
+    end
+  end
+  
+  m
+}
+assert_equal %q{1}, %q{
+  def m
+    begin
+      #
+    ensure
+      return 1
+    end
+  end
+  
+  m
+}
+assert_equal 'ok', %q{
+  begin
+    catch {|t| throw t, :ok }
+  rescue ArgumentError
+    :ng
+  end
+}, '[ruby-dev:31609]'
+
+assert_equal "1", %q{
+  catch do |t|
+    begin
+      throw t, 1
+      2
+    ensure
+      3
+    end
+  end
+}, "[ruby-dev:31698]"
+
+assert_normal_exit %q{
+  f = 0
+  1.times do
+    begin
+      f += 1
+    ensure
+      redo unless f > 2
+    end
+  end
+}
+
+assert_normal_exit %q{
+  -> do
+    1.times do
+      begin
+        raise
+      rescue
+        return
+      end
+    end
+  end.call
+}
+
+assert_normal_exit %q{
+  while true
+    begin
+      raise
+      next
+    rescue
+    end
+    break
+  end
+}, '[ruby-core:28172]'
+
+assert_equal "true", %q{
+  class Object
+    def return_eigenclass
+      class << self
+        return self
+      end
+    end
+  end
+  s = "foo"
+  s.return_eigenclass == class << s; self; end
+}, '[ruby-core:21379]'
+
+assert_equal "true", %q{
+  class Object
+    def yield_eigenclass
+      class << self
+        yield self
+      end
+    end
+  end
+  s = "foo"
+  s.yield_eigenclass {|c| c == class << s; self; end }
+}, '[ruby-dev:40975]'
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
new file mode 100644
index 0000000000..ab028e2c1e
--- /dev/null
+++ b/bootstraptest/test_literal.rb
@@ -0,0 +1,202 @@
+# empty program
+assert_equal '',                ''
+assert_equal '',                ' '
+assert_equal '',                "\n"
+
+# special const
+assert_equal 'true',            'true'
+assert_equal 'TrueClass',       'true.class'
+assert_equal 'false',           'false'
+assert_equal 'FalseClass',      'false.class'
+assert_equal '',                'nil'
+assert_equal 'nil',             'nil.inspect'
+assert_equal 'NilClass',        'nil.class'
+assert_equal 'sym',             ':sym'
+assert_equal ':sym',            ':sym.inspect'
+assert_equal 'Symbol',          ':sym.class'
+assert_equal '1234',            '1234'
+assert_equal 'Fixnum',          '1234.class'
+assert_equal '1234',            '1_2_3_4'
+assert_equal 'Fixnum',          '1_2_3_4.class'
+assert_equal '18',              '0x12'
+assert_equal 'Fixnum',          '0x12.class'
+assert_equal '15',              '0o17'
+assert_equal 'Fixnum',          '0o17.class'
+assert_equal '5',               '0b101'
+assert_equal 'Fixnum',          '0b101.class'
+assert_equal '123456789012345678901234567890', '123456789012345678901234567890'
+assert_equal 'Bignum',          '123456789012345678901234567890.class'
+assert_equal '2.0',             '2.0'
+assert_equal 'Float',           '1.3.class'
+
+# self
+assert_equal 'main',            'self'
+assert_equal 'Object',          'self.class'
+
+# string literal
+assert_equal 'a',               '?a'
+assert_equal 'String',          '?a.class'
+assert_equal 'A',               '?A'
+assert_equal 'String',          '?A.class'
+assert_equal "\n",              '?\n'
+assert_equal 'String',          '?\n.class'
+assert_equal ' ',               '?\ '
+assert_equal 'String',          '?\ .class'
+assert_equal 'string',          "'string'"
+assert_equal 'string',          '"string"'
+assert_equal 'string',          '%(string)'
+assert_equal 'string',          '%q(string)'
+assert_equal 'string',          '%Q(string)'
+assert_equal 'string string',   '"string string"'
+assert_equal ' ',               '" "'
+assert_equal "\0",              '"\0"'
+assert_equal "\1",              '"\1"'
+assert_equal "3",               '"\x33"'
+assert_equal "\n",              '"\n"'
+
+# dynamic string literal
+assert_equal '2',               '"#{1 + 1}"'
+assert_equal '16',              '"#{2 ** 4}"'
+assert_equal 'string',          's = "string"; "#{s}"'
+
+# dynamic symbol literal
+assert_equal 'a3c',             ':"a#{1+2}c"'
+assert_equal ':a3c',            ':"a#{1+2}c".inspect'
+assert_equal 'Symbol',          ':"a#{1+2}c".class'
+
+# xstring
+assert_equal "foo\n",           %q(`echo foo`)
+assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
+
+# regexp
+assert_equal '',                '//.source'
+assert_equal 'Regexp',          '//.class'
+assert_equal '0',               '// =~ "a"'
+assert_equal '0',               '// =~ ""'
+assert_equal 'a',               '/a/.source'
+assert_equal 'Regexp',          '/a/.class'
+assert_equal '0',               '/a/ =~ "a"'
+assert_equal '0',               '/test/ =~ "test"'
+assert_equal '',                '/test/ =~ "tes"'
+assert_equal '0',               're = /test/; re =~ "test"'
+assert_equal '0',               'str = "test"; /test/ =~ str'
+assert_equal '0',               're = /test/; str = "test"; re =~ str'
+
+# dynacmi regexp
+assert_equal 'regexp',          %q(/re#{'ge'}xp/.source)
+assert_equal 'Regexp',          %q(/re#{'ge'}xp/.class)
+
+# array
+assert_equal 'Array',           '[].class'
+assert_equal '0',               '[].size'
+assert_equal '0',               '[].length'
+assert_equal '[]',              '[].inspect'
+assert_equal 'Array',           '[0].class'
+assert_equal '1',               '[3].size'
+assert_equal '[3]',             '[3].inspect'
+assert_equal '3',               'a = [3]; a[0]'
+assert_equal 'Array',           '[1,2].class'
+assert_equal '2',               '[1,2].size'
+assert_equal '[1, 2]',           '[1,2].inspect'
+assert_equal 'Array',           '[1,2,3,4,5].class'
+assert_equal '5',               '[1,2,3,4,5].size'
+assert_equal '[1, 2, 3, 4, 5]', '[1,2,3,4,5].inspect'
+assert_equal '1',               'a = [1,2]; a[0]'
+assert_equal '2',               'a = [1,2]; a[1]'
+assert_equal 'Array',           'a = [1 + 2, 3 + 4, 5 + 6]; a.class'
+assert_equal '[3, 7, 11]',      'a = [1 + 2, 3 + 4, 5 + 6]; a.inspect'
+assert_equal '7',               'a = [1 + 2, 3 + 4, 5 + 6]; a[1]'
+assert_equal '1',               '([0][0] += 1)'
+assert_equal '1',               '([2][0] -= 1)'
+assert_equal 'Array',           'a = [obj = Object.new]; a.class'
+assert_equal '1',               'a = [obj = Object.new]; a.size'
+assert_equal 'true',            'a = [obj = Object.new]; a[0] == obj'
+assert_equal '5',               'a = [1,2,3]; a[1] = 5; a[1]'
+assert_equal 'bar',             '[*:foo];:bar'
+assert_equal '[1, 2]',          'def nil.to_a; [2]; end; [1, *nil]'
+assert_equal '[1, 2]',          'def nil.to_a; [1, 2]; end; [*nil]'
+assert_equal '[0, 1, {2=>3}]',  '[0, *[1], 2=>3]', "[ruby-dev:31592]"
+
+
+# hash
+assert_equal 'Hash',            '{}.class'
+assert_equal '{}',              '{}.inspect'
+assert_equal 'Hash',            '{1=>2}.class'
+assert_equal '{1=>2}',          '{1=>2}.inspect'
+assert_equal '2',               'h = {1 => 2}; h[1]'
+assert_equal '0',               'h = {1 => 2}; h.delete(1); h.size'
+assert_equal '',                'h = {1 => 2}; h.delete(1); h[1]'
+assert_equal '2',               'h = {"string" => "literal", "goto" => "hell"}; h.size'
+assert_equal 'literal', 'h = {"string"=>"literal", "goto"=>"hell"}; h["string"]'
+assert_equal 'hell', 'h = {"string"=>"literal", "goto"=>"hell"}; h["goto"]'
+
+# range
+assert_equal 'Range',           '(1..2).class'
+assert_equal '1..2',            '(1..2).inspect'
+assert_equal '1',               '(1..2).begin'
+assert_equal '2',               '(1..2).end'
+assert_equal 'false',           '(1..2).exclude_end?'
+assert_equal 'Range',           'r = 1..2; r.class'
+assert_equal '1..2',            'r = 1..2; r.inspect'
+assert_equal '1',               'r = 1..2; r.begin'
+assert_equal '2',               'r = 1..2; r.end'
+assert_equal 'false',           'r = 1..2; r.exclude_end?'
+assert_equal 'Range',           '(1...3).class'
+assert_equal '1...3',           '(1...3).inspect'
+assert_equal '1',               '(1...3).begin'
+assert_equal '3',               '(1...3).end'
+assert_equal 'true',            '(1...3).exclude_end?'
+assert_equal 'Range',           'r = (1...3); r.class'
+assert_equal '1...3',           'r = (1...3); r.inspect'
+assert_equal '1',               'r = (1...3); r.begin'
+assert_equal '3',               'r = (1...3); r.end'
+assert_equal 'true',            'r = (1...3); r.exclude_end?'
+assert_equal 'Range',           'r = (1+2 .. 3+4); r.class'
+assert_equal '3..7',            'r = (1+2 .. 3+4); r.inspect'
+assert_equal '3',               'r = (1+2 .. 3+4); r.begin'
+assert_equal '7',               'r = (1+2 .. 3+4); r.end'
+assert_equal 'false',           'r = (1+2 .. 3+4); r.exclude_end?'
+assert_equal 'Range',           'r = (1+2 ... 3+4); r.class'
+assert_equal '3...7',           'r = (1+2 ... 3+4); r.inspect'
+assert_equal '3',               'r = (1+2 ... 3+4); r.begin'
+assert_equal '7',               'r = (1+2 ... 3+4); r.end'
+assert_equal 'true',            'r = (1+2 ... 3+4); r.exclude_end?'
+assert_equal 'Range',           'r = ("a".."c"); r.class'
+assert_equal '"a".."c"',        'r = ("a".."c"); r.inspect'
+assert_equal 'a',               'r = ("a".."c"); r.begin'
+assert_equal 'c',               'r = ("a".."c"); r.end'
+
+assert_equal 'String',          '__FILE__.class'
+assert_equal 'Fixnum',          '__LINE__.class'
+
+###
+
+assert_equal 'ok', %q{
+  # this cause "called on terminated object".
+  ObjectSpace.each_object(Module) {|m| m.name.inspect }
+  :ok
+}
+
+assert_normal_exit %q{
+  begin
+    r = 0**-1
+    r + r
+  rescue
+  end
+}, '[ruby-dev:34524]'
+
+assert_normal_exit %q{
+  begin
+    r = Marshal.load("\x04\bU:\rRational[\ai\x06i\x05")
+    r + r
+  rescue
+  end
+}, '[ruby-dev:34536]'
+
+assert_equal 'ok', %q{
+  "#{}""#{}ok"
+}, '[ruby-dev:38968]'
+
+assert_equal 'ok', %q{
+  "#{}o""#{}k""#{}"
+}, '[ruby-core:25284]'
diff --git a/bootstraptest/test_load.rb b/bootstraptest/test_load.rb
new file mode 100644
index 0000000000..e63c93a8f4
--- /dev/null
+++ b/bootstraptest/test_load.rb
@@ -0,0 +1,27 @@
+assert_equal 'ok', %q{
+  open("require-lock-test.rb", "w") {|f|
+    f.puts "sleep 0.1"
+    f.puts "module M"
+    f.puts "end"
+  }
+  $:.unshift Dir.pwd
+  vs = (1..2).map {|i|
+    Thread.start {
+      require "require-lock-test"
+      M
+    }
+  }.map {|t| t.value }
+  vs[0] == M && vs[1] == M ? :ok : :ng
+}, '[ruby-dev:32048]'
+
+assert_equal 'ok', %q{
+  %w[a a/foo b].each {|d| Dir.mkdir(d)}
+  open("b/foo", "w") {|f| f.puts "$ok = :ok"}
+  $:.replace(%w[a b])
+  begin
+    load "foo"
+    $ok
+  rescue => e
+    e.message
+  end
+}, '[ruby-dev:38097]'
diff --git a/bootstraptest/test_marshal.rb b/bootstraptest/test_marshal.rb
new file mode 100644
index 0000000000..7e34176169
--- /dev/null
+++ b/bootstraptest/test_marshal.rb
@@ -0,0 +1,5 @@
+
+assert_normal_exit %q{
+  Marshal.load(Marshal.dump({"k"=>"v"}), lambda {|v| v})
+}
+
diff --git a/bootstraptest/test_massign.rb b/bootstraptest/test_massign.rb
new file mode 100644
index 0000000000..0f63dd424a
--- /dev/null
+++ b/bootstraptest/test_massign.rb
@@ -0,0 +1,183 @@
+assert_equal '[[1], 2, 3]', '*v1, (a, b) = [1,[2, 3]]; [v1, a, b]'
+assert_equal '[[1], 2, 3]', '*v1,(*), (a, b) = [1,:x,[2, 3]]; [v1, a, b]'
+
+assert_equal '[]',          '*a = *nil; a'
+assert_equal '[nil]',       '*a = nil; a'
+assert_equal '2',           'a, a = 1, 2; a', "[ruby-dev:31522]"
+assert_equal '[1, 2]',      'a, b = 1, 2'
+assert_equal '[1, 2]', %q{
+  ans = []
+  trace_var(:$a){|v| ans << v}
+  trace_var(:$b){|v| ans << v}
+  $a, $b = 1, 2
+  ans
+}
+
+assert_equal 'ok', %q{
+  r = :ok
+  :ng.tap {|(r)|}
+  r
+}, '[ruby-dev:31507]'
+
+=begin
+# generated by this script:
+
+3.times{|i|
+  8.times{|e|
+    ary = (0...e).to_a
+    a,b,c,d,e,f = nil
+    vals = %w(a b c d e f)
+    vals[i] = '*' + vals[i]
+    program = "#{vals.join(", ")} = *ary"
+    eval(program)
+    ans = [a,b,c,d,e,f]
+    puts %Q{
+      assert_equal "#{ans.inspect}", %q{
+        ary = #{ary.inspect}
+        #{program}; [a, b, c, d, e, f]
+      }}
+  }
+}
+=end
+
+      assert_equal "[[], nil, nil, nil, nil, nil]", %q{
+        ary = []
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, nil, nil, nil, nil]", %q{
+        ary = [0]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, nil, nil, nil]", %q{
+        ary = [0, 1]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, 2, nil, nil]", %q{
+        ary = [0, 1, 2]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, 2, 3, nil]", %q{
+        ary = [0, 1, 2, 3]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, 2, 3, 4]", %q{
+        ary = [0, 1, 2, 3, 4]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[0], 1, 2, 3, 4, 5]", %q{
+        ary = [0, 1, 2, 3, 4, 5]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[0, 1], 2, 3, 4, 5, 6]", %q{
+        ary = [0, 1, 2, 3, 4, 5, 6]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[nil, [], nil, nil, nil, nil]", %q{
+        ary = []
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], nil, nil, nil, nil]", %q{
+        ary = [0]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, nil, nil, nil]", %q{
+        ary = [0, 1]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, 2, nil, nil]", %q{
+        ary = [0, 1, 2]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, 2, 3, nil]", %q{
+        ary = [0, 1, 2, 3]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, 2, 3, 4]", %q{
+        ary = [0, 1, 2, 3, 4]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [1], 2, 3, 4, 5]", %q{
+        ary = [0, 1, 2, 3, 4, 5]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [1, 2], 3, 4, 5, 6]", %q{
+        ary = [0, 1, 2, 3, 4, 5, 6]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[nil, nil, [], nil, nil, nil]", %q{
+        ary = []
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, nil, [], nil, nil, nil]", %q{
+        ary = [0]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], nil, nil, nil]", %q{
+        ary = [0, 1]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], 2, nil, nil]", %q{
+        ary = [0, 1, 2]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], 2, 3, nil]", %q{
+        ary = [0, 1, 2, 3]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], 2, 3, 4]", %q{
+        ary = [0, 1, 2, 3, 4]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [2], 3, 4, 5]", %q{
+        ary = [0, 1, 2, 3, 4, 5]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [2, 3], 4, 5, 6]", %q{
+        ary = [0, 1, 2, 3, 4, 5, 6]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+
+#
+assert_equal 'ok', %q{
+  a,s=[],"aaa"
+  300.times { a<<s; s=s.succ }
+  eval <<-END__
+  GC.stress=true
+  Fiber.new do
+    #{ a.join(",") },*zzz=1
+  end.resume
+  END__
+  :ok
+}, '[ruby-dev:32581]'
+
+assert_equal 'ok', %q{
+  while true
+    *, z = 1
+    break
+  end
+  :ok
+}, '[ruby-dev:32892]'
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
new file mode 100644
index 0000000000..8d0db6e478
--- /dev/null
+++ b/bootstraptest/test_method.rb
@@ -0,0 +1,1182 @@
+# regular argument
+assert_equal '1',       'def m() 1 end; m()'
+assert_equal '1',       'def m(a) a end; m(1)'
+assert_equal '[1, 2]',  'def m(a,b) [a, b] end; m(1,2)'
+assert_equal '[1, 2, 3]', 'def m(a,b,c) [a, b, c] end; m(1,2,3)'
+assert_equal 'wrong number of arguments (1 for 0)', %q{
+  def m; end
+  begin
+    m(1)
+  rescue => e
+    e.message
+  end
+}
+
+assert_equal 'wrong number of arguments (0 for 1)', %q{
+  def m a; end
+  begin
+    m
+  rescue => e
+    e.message
+  end
+}
+
+# default argument
+assert_equal '1',       'def m(x=1) x end; m()'
+assert_equal '1',       'def m(x=7) x end; m(1)'
+assert_equal '1',       'def m(a,x=1) x end; m(7)'
+assert_equal '1',       'def m(a,x=7) x end; m(7,1)'
+assert_equal '1',       'def m(a,b,x=1) x end; m(7,7)'
+assert_equal '1',       'def m(a,b,x=7) x end; m(7,7,1)'
+assert_equal '1',       'def m(a,x=1,y=1) x end; m(7)'
+assert_equal '1',       'def m(a,x=1,y=1) y end; m(7)'
+assert_equal '1',       'def m(a,x=7,y=1) x end; m(7,1)'
+assert_equal '1',       'def m(a,x=7,y=1) y end; m(7,1)'
+assert_equal '1',       'def m(a,x=7,y=7) x end; m(7,1,1)'
+assert_equal '1',       'def m(a,x=7,y=7) y end; m(7,1,1)'
+
+# rest argument
+assert_equal '[]',      'def m(*a) a end; m().inspect'
+assert_equal '[1]',     'def m(*a) a end; m(1).inspect'
+assert_equal '[1, 2]',  'def m(*a) a end; m(1,2).inspect'
+assert_equal '[]',      'def m(x,*a) a end; m(7).inspect'
+assert_equal '[1]',     'def m(x,*a) a end; m(7,1).inspect'
+assert_equal '[1, 2]',  'def m(x,*a) a end; m(7,1,2).inspect'
+assert_equal '[]',      'def m(x,y,*a) a end; m(7,7).inspect'
+assert_equal '[1]',     'def m(x,y,*a) a end; m(7,7,1).inspect'
+assert_equal '[1, 2]',  'def m(x,y,*a) a end; m(7,7,1,2).inspect'
+assert_equal '[]',      'def m(x,y=7,*a) a end; m(7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,*a) a end; m(7,7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,*a) a end; m(7,7,7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7,7).inspect'
+assert_equal '1',       'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
+assert_equal '1',       'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
+assert_equal '1',       'def m(x,y,z=7,zz=7,*a) zz end; m(7,7,7,1).inspect'
+
+# block argument
+assert_equal 'Proc',    'def m(&block) block end; m{}.class'
+assert_equal 'nil',     'def m(&block) block end; m().inspect'
+assert_equal 'Proc',    'def m(a,&block) block end; m(7){}.class'
+assert_equal 'nil',     'def m(a,&block) block end; m(7).inspect'
+assert_equal '1',       'def m(a,&block) a end; m(1){}'
+assert_equal 'Proc',    'def m(a,b=nil,&block) block end; m(7){}.class'
+assert_equal 'nil',     'def m(a,b=nil,&block) block end; m(7).inspect'
+assert_equal 'Proc',    'def m(a,b=nil,&block) block end; m(7,7){}.class'
+assert_equal '1',       'def m(a,b=nil,&block) b end; m(7,1){}'
+assert_equal 'Proc',    'def m(a,b=nil,*c,&block) block end; m(7){}.class'
+assert_equal 'nil',     'def m(a,b=nil,*c,&block) block end; m(7).inspect'
+assert_equal '1',       'def m(a,b=nil,*c,&block) a end; m(1).inspect'
+assert_equal '1',       'def m(a,b=1,*c,&block) b end; m(7).inspect'
+assert_equal '1',       'def m(a,b=7,*c,&block) b end; m(7,1).inspect'
+assert_equal '[1]',     'def m(a,b=7,*c,&block) c end; m(7,7,1).inspect'
+
+# splat
+assert_equal '1',       'def m(a) a end; m(*[1])'
+assert_equal '1',       'def m(x,a) a end; m(7,*[1])'
+assert_equal '1',       'def m(x,y,a) a end; m(7,7,*[1])'
+assert_equal '1',       'def m(a,b) a end; m(*[1,7])'
+assert_equal '1',       'def m(a,b) b end; m(*[7,1])'
+assert_equal '1',       'def m(x,a,b) b end; m(7,*[7,1])'
+assert_equal '1',       'def m(x,y,a,b) b end; m(7,7,*[7,1])'
+assert_equal '1',       'def m(a,b,c) a end; m(*[1,7,7])'
+assert_equal '1',       'def m(a,b,c) b end; m(*[7,1,7])'
+assert_equal '1',       'def m(a,b,c) c end; m(*[7,7,1])'
+assert_equal '1',       'def m(x,a,b,c) a end; m(7,*[1,7,7])'
+assert_equal '1',       'def m(x,y,a,b,c) a end; m(7,7,*[1,7,7])'
+
+# hash argument
+assert_equal '1',       'def m(h) h end; m(7=>1)[7]'
+assert_equal '1',       'def m(h) h end; m(7=>1).size'
+assert_equal '1',       'def m(h) h end; m(7=>1, 8=>7)[7]'
+assert_equal '2',       'def m(h) h end; m(7=>1, 8=>7).size'
+assert_equal '1',       'def m(h) h end; m(7=>1, 8=>7, 9=>7)[7]'
+assert_equal '3',       'def m(h) h end; m(7=>1, 8=>7, 9=>7).size'
+assert_equal '1',       'def m(x,h) h end; m(7, 7=>1)[7]'
+assert_equal '1',       'def m(x,h) h end; m(7, 7=>1, 8=>7)[7]'
+assert_equal '1',       'def m(x,h) h end; m(7, 7=>1, 8=>7, 9=>7)[7]'
+assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1)[7]'
+assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7)[7]'
+assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7, 9=>7)[7]'
+
+# block argument
+assert_equal '1',       %q(def m(&block) mm(&block) end
+                           def mm() yield 1 end
+                           m {|a| a })
+assert_equal '1',       %q(def m(x,&block) mm(x,&block) end
+                           def mm(x) yield 1 end
+                           m(7) {|a| a })
+assert_equal '1',       %q(def m(x,y,&block) mm(x,y,&block) end
+                           def mm(x,y) yield 1 end
+                           m(7,7) {|a| a })
+
+# recursive call
+assert_equal '1',       %q(def m(n) n == 0 ? 1 : m(n-1) end; m(5))
+
+# instance method
+assert_equal '1',       %q(class C; def m() 1 end end;  C.new.m)
+assert_equal '1',       %q(class C; def m(a) a end end;  C.new.m(1))
+assert_equal '1',       %q(class C; def m(a = 1) a end end;  C.new.m)
+assert_equal '[1]',     %q(class C; def m(*a) a end end;  C.new.m(1).inspect)
+assert_equal '1',       %q( class C
+                              def m() mm() end
+                              def mm() 1 end
+                            end
+                            C.new.m )
+
+# singleton method (const)
+assert_equal '1',       %q(class C; def C.m() 1 end end;  C.m)
+assert_equal '1',       %q(class C; def C.m(a) a end end;  C.m(1))
+assert_equal '1',       %q(class C; def C.m(a = 1) a end end;  C.m)
+assert_equal '[1]',     %q(class C; def C.m(*a) a end end;  C.m(1).inspect)
+assert_equal '1',       %q(class C; end; def C.m() 1 end;  C.m)
+assert_equal '1',       %q(class C; end; def C.m(a) a end;  C.m(1))
+assert_equal '1',       %q(class C; end; def C.m(a = 1) a end;  C.m)
+assert_equal '[1]',     %q(class C; end; def C.m(*a) a end;  C.m(1).inspect)
+assert_equal '1',       %q(class C; def m() 7 end end; def C.m() 1 end;  C.m)
+assert_equal '1',       %q( class C
+                              def C.m() mm() end
+                              def C.mm() 1 end
+                            end
+                            C.m )
+
+# singleton method (lvar)
+assert_equal '1',       %q(obj = Object.new; def obj.m() 1 end;  obj.m)
+assert_equal '1',       %q(obj = Object.new; def obj.m(a) a end;  obj.m(1))
+assert_equal '1',       %q(obj = Object.new; def obj.m(a=1) a end;  obj.m)
+assert_equal '[1]',     %q(obj = Object.new; def obj.m(*a) a end;  obj.m(1))
+assert_equal '1',       %q(class C; def m() 7 end; end
+                           obj = C.new
+                           def obj.m() 1 end
+                           obj.m)
+
+# inheritance
+assert_equal '1',       %q(class A; def m(a) a end end
+                           class B < A; end
+                           B.new.m(1))
+assert_equal '1',       %q(class A; end
+                           class B < A; def m(a) a end end
+                           B.new.m(1))
+assert_equal '1',       %q(class A; def m(a) a end end
+                           class B < A; end
+                           class C < B; end
+                           C.new.m(1))
+
+# include
+assert_equal '1',       %q(class A; def m(a) a end end
+                           module M; end
+                           class B < A; include M; end
+                           B.new.m(1))
+assert_equal '1',       %q(class A; end
+                           module M; def m(a) a end end
+                           class B < A; include M; end
+                           B.new.m(1))
+
+# alias
+assert_equal '1',       %q( def a() 1 end
+                            alias m a
+                            m() )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias m a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias :m a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias m :a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias :m :a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias m a
+                              undef a
+                            end
+                            C.new.m )
+
+# undef
+assert_equal '1',       %q( class C
+                              def m() end
+                              undef m
+                            end
+                            begin C.new.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class A
+                              def m() end
+                            end
+                            class C < A
+                              def m() end
+                              undef m
+                            end
+                            begin C.new.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class A; def a() end end   # [yarv-dev:999]
+                            class B < A
+                              def b() end
+                              undef a, b
+                            end
+                            begin B.new.a; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class A; def a() end end   # [yarv-dev:999]
+                            class B < A
+                              def b() end
+                              undef a, b
+                            end
+                            begin B.new.b; rescue NoMethodError; 1 end )
+
+assert_equal '3',  %q{
+  def m1
+    1
+  end
+  alias m2 m1
+  alias :"#{'m3'}" m1
+  m1 + m2 + m3
+}, '[ruby-dev:32308]'
+assert_equal '1', %q{
+  def foobar
+  end
+  undef :"foo#{:bar}"
+  1
+}, '[ruby-dev:32308]'
+assert_equal '1', %q{
+  def foobar
+    1
+  end
+  alias :"bar#{:baz}" :"foo#{:bar}"
+  barbaz
+}, '[ruby-dev:32308]'
+
+# private
+assert_equal '1',       %q( class C
+                              def m() mm() end
+                              def mm() 1 end
+                              private :mm
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def m() 7 end
+                              private :m
+                            end
+                            begin C.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class C
+                              def C.m() mm() end
+                              def C.mm() 1 end
+                              private_class_method :mm
+                            end
+                            C.m )
+assert_equal '1',       %q( class C
+                              def C.m() 7 end
+                              private_class_method :m
+                            end
+                            begin C.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class C; def m() 1 end end
+                            C.new.m   # cache
+                            class C
+                              alias mm m; private :mm
+                            end
+                            C.new.m
+                            begin C.new.mm; 7; rescue NoMethodError; 1 end )
+
+# nested method
+assert_equal '1',       %q( class C
+                              def m
+                                def mm() 1 end
+                              end
+                            end
+                            C.new.m
+                            C.new.mm )
+assert_equal '1',       %q( class C
+                              def m
+                                def mm() 1 end
+                              end
+                            end
+                            instance_eval "C.new.m; C.new.mm" )
+
+# method_missing
+assert_equal ':m',      %q( class C
+                              def method_missing(mid, *args) mid end
+                            end
+                            C.new.m.inspect )
+assert_equal ':mm',     %q( class C
+                              def method_missing(mid, *args) mid end
+                            end
+                            C.new.mm.inspect )
+assert_equal '[1, 2]',  %q( class C
+                              def method_missing(mid, *args) args end
+                            end
+                            C.new.m(1,2).inspect )
+assert_equal '1',       %q( class C
+                              def method_missing(mid, *args) yield 1 end
+                            end
+                            C.new.m {|a| a })
+assert_equal 'nil',     %q( class C
+                              def method_missing(mid, *args, &block) block end
+                            end
+                            C.new.m.inspect )
+
+# send
+assert_equal '1',       %q( class C; def m() 1 end end;
+                            C.new.__send__(:m) )
+assert_equal '1',       %q( class C; def m() 1 end end;
+                            C.new.send(:m) )
+assert_equal '1',       %q( class C; def m(a) a end end;
+                            C.new.send(:m,1) )
+assert_equal '1',       %q( class C; def m(a,b) a end end;
+                            C.new.send(:m,1,7) )
+assert_equal '1',       %q( class C; def m(x,a=1) a end end;
+                            C.new.send(:m,7) )
+assert_equal '1',       %q( class C; def m(x,a=7) a end end;
+                            C.new.send(:m,7,1) )
+assert_equal '[1, 2]',  %q( class C; def m(*a) a end end;
+                            C.new.send(:m,1,2).inspect )
+assert_equal '1',       %q( class C; def m() 7 end; private :m end
+                            begin C.new.public_send(:m); rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class C; def m() 1 end; private :m end
+                            C.new.send(:m) )
+
+# with block
+assert_equal '[[:ok1, :foo], [:ok2, :foo, :bar]]',
+%q{
+  class C
+    def [](a)
+      $ary << [yield, a]
+    end
+    def []=(a, b)
+      $ary << [yield, a, b]
+    end
+  end
+
+  $ary = []
+  C.new[:foo, &lambda{:ok1}]
+  C.new[:foo, &lambda{:ok2}] = :bar
+  $ary
+}
+
+# with
+assert_equal '[:ok1, [:ok2, 11]]', %q{
+  class C
+    def []
+      $ary << :ok1
+      10
+    end
+    def []=(a)
+      $ary << [:ok2, a]
+    end
+  end
+  $ary = []
+  C.new[]+=1
+  $ary
+}
+
+# splat and block arguments
+assert_equal %q{[[[:x, :y, :z], NilClass], [[1, :x, :y, :z], NilClass], [[1, 2, :x, :y, :z], NilClass], [[:obj], NilClass], [[1, :obj], NilClass], [[1, 2, :obj], NilClass], [[], Proc], [[1], Proc], [[1, 2], Proc], [[], Proc], [[1], Proc], [[1, 2], Proc], [[:x, :y, :z], Proc], [[1, :x, :y, :z], Proc], [[1, 2, :x, :y, :z], Proc]]}, %q{
+def m(*args, &b)
+  $result << [args, b.class]
+end
+$result = []
+ary = [:x, :y, :z]
+obj = :obj
+b = Proc.new{}
+
+m(*ary)
+m(1,*ary)
+m(1,2,*ary)
+m(*obj)
+m(1,*obj)
+m(1,2,*obj)
+m(){}
+m(1){}
+m(1,2){}
+m(&b)
+m(1,&b)
+m(1,2,&b)
+m(*ary,&b)
+m(1,*ary,&b)
+m(1,2,*ary,&b)
+$result
+}
+
+# post test
+assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4)}
+
+assert_equal %q{[1, 2, 3, :o2, [], 4, 5, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5)}
+
+assert_equal %q{[1, 2, 3, 4, [], 5, 6, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6)}
+
+assert_equal %q{[1, 2, 3, 4, [5], 6, 7, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)}
+
+assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4){}}
+
+assert_equal %q{[1, 2, 3, :o2, [], 4, 5, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5){}}
+
+assert_equal %q{[1, 2, 3, 4, [], 5, 6, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6){}}
+
+assert_equal %q{[1, 2, 3, 4, [5], 6, 7, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11){}}
+
+assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, x, y]
+end
+; m(1, 2, 3, 4)}
+
+assert_equal %q{[1, 2, 3, :o2, [], 4, 5, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, x, y]
+end
+; m(1, 2, 3, 4, 5)}
+
+assert_equal %q{[1, 2, 3, 4, [], 5, 6, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, x, y]
+end
+; m(1, 2, 3, 4, 5, 6)}
+
+
+#
+# super
+#
+=begin
+# below programs are generated by this program:
+
+BASE = <<EOS__
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; <TEST>; super; end; end
+EOS__
+
+tests = {
+%q{
+  def m
+} => %q{
+  C1.new.m
+},
+#
+%q{
+  def m a
+} => %q{
+  C1.new.m 1
+},
+%q{
+  def m a
+    a = :a
+} => %q{
+  C1.new.m 1
+},
+#
+%q{
+  def m a, o=:o
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+},
+%q{
+  def m a, o=:o
+    a = :a
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+},
+%q{
+  def m a, o=:o
+    o = :x
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+},
+#
+%q{
+  def m a, *r
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+},
+%q{
+  def m a, *r
+    r = [:x, :y]
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+},
+#
+%q{
+  def m a, o=:o, *r
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+  C1.new.m 1, 2, 3, 4
+},
+#
+%q{
+  def m a, o=:o, *r, &b
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+  C1.new.m 1, 2, 3, 4
+  C1.new.m(1){}
+  C1.new.m(1, 2){}
+  C1.new.m(1, 2, 3){}
+  C1.new.m(1, 2, 3, 4){}
+},
+#
+"def m(m1, m2, o1=:o1, o2=:o2, p1, p2)" =>
+%q{
+C1.new.m(1,2,3,4)
+C1.new.m(1,2,3,4,5)
+C1.new.m(1,2,3,4,5,6)
+},
+#
+"def m(m1, m2, *r, p1, p2)" =>
+%q{
+C1.new.m(1,2,3,4)
+C1.new.m(1,2,3,4,5)
+C1.new.m(1,2,3,4,5,6)
+C1.new.m(1,2,3,4,5,6,7)
+C1.new.m(1,2,3,4,5,6,7,8)
+},
+#
+"def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)" =>
+%q{
+C1.new.m(1,2,3,4)
+C1.new.m(1,2,3,4,5)
+C1.new.m(1,2,3,4,5,6)
+C1.new.m(1,2,3,4,5,6,7)
+C1.new.m(1,2,3,4,5,6,7,8)
+C1.new.m(1,2,3,4,5,6,7,8,9)
+},
+
+###
+}
+
+
+tests.each{|setup, methods| setup = setup.dup; setup.strip!
+  setup = BASE.gsub(/<TEST>/){setup}
+  methods.split(/\n/).each{|m| m = m.dup; m.strip!
+    next if m.empty?
+    expr = "#{setup}; #{m}"
+    result = eval(expr)
+    puts "assert_equal %q{#{result.inspect}}, %q{\n#{expr}}"
+    puts
+  }
+}
+
+=end
+
+assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
+; C1.new.m(1,2,3,4)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6)}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1, 2, 3, 4}
+
+assert_equal %q{[:C0_m, [:a]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a
+    a = :a; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7,8)}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1, 2, 3, 4}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1){}}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1, 2){}}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1, 2, 3){}}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1, 2, 3, 4){}}
+
+assert_equal %q{[:C0_m, [1, :x]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    o = :x; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, :x]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    o = :x; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [:a, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    a = :a; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [:a, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    a = :a; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r
+    r = [:x, :y]; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r
+    r = [:x, :y]; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r
+    r = [:x, :y]; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7,8)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8, 9]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7,8,9)}
+
+assert_equal %q{[:C0_m, [1]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, []]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m; super; end; end
+; C1.new.m}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:ok, :ok, :ok, :ok, :ok, :ok, :ng, :ng]}, %q{
+  $ans = []
+  class Foo
+    def m
+    end
+  end
+
+  c1 = c2 = nil
+
+  lambda{
+    $SAFE = 4
+    c1 = Class.new{
+      def m
+      end
+    }
+    c2 = Class.new(Foo){
+      alias mm m
+    }
+  }.call
+
+  def test
+    begin
+      yield
+    rescue SecurityError
+      $ans << :ok
+    else
+      $ans << :ng
+    end
+  end
+
+  o1 = c1.new
+  o2 = c2.new
+  
+  test{o1.m}
+  test{o2.mm}
+  test{o1.send :m}
+  test{o2.send :mm}
+  test{o1.public_send :m}
+  test{o2.public_send :mm}
+  test{o1.method(:m).call}
+  test{o2.method(:mm).call}
+  $ans
+}
+
+assert_equal 'ok', %q{
+  class C
+    def x=(n)
+    end
+    def m
+      self.x = :ok
+    end
+  end
+  C.new.m
+}
+
+assert_equal 'ok', %q{
+  proc{
+    $SAFE = 1
+    class C
+      def m
+        :ok
+      end
+    end
+  }.call
+  C.new.m
+}, '[ruby-core:11998]'
+
+assert_equal 'ok', %q{
+  proc{
+    $SAFE = 2
+    class C
+      def m
+        :ok
+      end
+    end
+  }.call
+  C.new.m
+}, '[ruby-core:11998]'
+
+assert_equal 'ok', %q{
+  proc{
+    $SAFE = 3
+    class C
+      def m
+        :ng
+      end
+    end
+  }.call
+  begin
+    C.new.m
+  rescue SecurityError
+    :ok
+  end
+}, '[ruby-core:11998]'
+
+assert_equal 'ok', %q{
+  class B
+    def m() :fail end
+  end
+  class C < B
+    undef m
+    begin
+      remove_method :m
+    rescue NameError
+    end
+  end
+  begin
+    C.new.m
+  rescue NameError
+    :ok
+  end
+}, '[ruby-dev:31816], [ruby-dev:31817]'
+
+assert_normal_exit %q{
+  begin
+    Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
+    # FreeBSD fails this less than 4M + 8K bytes.
+  rescue Exception
+    exit
+  end
+  class C
+    attr "a" * (10*1024*1024)
+  end
+}, '[ruby-dev:31818]'
+
+assert_equal 'ok', %q{
+  class Module
+    def define_method2(name, &block)
+      define_method(name, &block)
+    end
+  end
+  class C
+    define_method2(:m) {|x, y| :fail }
+  end
+  begin
+    C.new.m([1,2])
+  rescue ArgumentError
+    :ok
+  end
+}
+
+assert_not_match /method_missing/, %q{
+  STDERR.reopen(STDOUT)
+  variable_or_mehtod_not_exist
+}
+
+assert_equal '[false, false, false, false, true, true]', %q{
+  class C
+    define_method(:foo) {
+      block_given?
+    }
+  end
+
+  C.new.foo {}
+
+  class D
+    def foo
+      D.module_eval{
+        define_method(:m1){
+          block_given?
+        }
+      }
+    end
+    def bar
+      D.module_eval{
+        define_method(:m2){
+          block_given?
+        }
+      }
+    end
+  end
+
+  D.new.foo
+  D.new.bar{}
+  [C.new.foo, C.new.foo{}, D.new.m1, D.new.m1{}, D.new.m2, D.new.m2{}]
+}, '[ruby-core:14813]'
+
+assert_equal 'ok', %q{
+  class Foo
+    define_method(:foo) do |&b|
+      b.call
+    end
+  end
+  Foo.new.foo do
+    break :ok
+  end
+}, '[ruby-dev:36028]'
+
+assert_equal '[1, 2, [3, 4]]', %q{
+  def regular(a, b, *c)
+    [a, b, c]
+  end
+  regular(*[], 1, *[], *[2, 3], *[], 4) 
+}, '[ruby-core:19413]'
+
+assert_equal '[1, [:foo, 3, 4, :foo]]', %q{
+  def regular(a, *b)
+    [a, b]
+  end
+  a = b = [:foo]
+  regular(1, *a, *[3, 4], *b)
+}
+
+assert_equal '["B", "A"]', %q{
+  class A
+    def m
+      'A'
+    end
+  end
+
+  class B < A
+    define_method(:m) do    
+      ['B', super()]
+    end
+  end
+
+  class C < B
+  end
+
+  C.new.m
+}
+
+assert_equal 'ok', %q{
+  module Foo
+    def foo
+      begin
+        super
+      rescue NoMethodError
+        :ok
+      end
+    end
+    module_function :foo
+  end
+  Foo.foo
+}, '[ruby-dev:37587]'
+
+assert_equal 'Object#foo', %q{
+  class Object
+    def self.foo
+      "Object.foo"
+    end
+    def foo
+      "Object#foo"
+    end
+  end
+
+  module Foo
+    def foo
+      begin
+        super
+      rescue NoMethodError
+        :ok
+      end
+    end
+    module_function :foo
+  end
+  Foo.foo
+}, '[ruby-dev:37587]'
+
+assert_normal_exit %q{
+  class BasicObject
+    remove_method :method_missing
+  end
+  begin
+    "a".lalala!
+  rescue NoMethodError => e
+    e.message == "undefined method `lalala!' for \"a\":String" ? :ok : :ng
+  end
+}, '[ruby-core:22298]'
+
+assert_equal 'ok', %q{
+  "hello"[0] ||= "H"
+  "ok"
+}
+
+assert_equal 'ok', %q{
+  "hello"[0, 1] ||= "H"
+  "ok"
+}
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:foo) do
+      C.class_eval { remove_method(:foo) }
+      super()
+    end
+  end
+  begin
+    C.new.foo
+  rescue NoMethodError
+    'ok'
+  end
+}
+assert_equal 'ok', %q{
+  [0][0, &proc{}] += 21
+  'ok'
+}, '[ruby-core:30534]'
+
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
new file mode 100644
index 0000000000..486d5aff73
--- /dev/null
+++ b/bootstraptest/test_objectspace.rb
@@ -0,0 +1,34 @@
+assert_normal_exit %q{
+  eval("", TOPLEVEL_BINDING)
+  minobj = ObjectSpace.to_enum(:each_object).min_by {|a| a.object_id }
+  maxobj = ObjectSpace.to_enum(:each_object).max_by {|a| a.object_id }
+  (((minobj.object_id-100)..(minobj.object_id+100))+
+   ((maxobj.object_id-100)..(maxobj.object_id+100))).each {|id|
+    begin
+      o = ObjectSpace._id2ref(id)
+    rescue RangeError
+      next
+    end
+    o.inspect if defined?(o.inspect)
+  }
+}, '[ruby-dev:31911]'
+
+assert_normal_exit %q{
+  ary = (1..10).to_a
+  ary.permutation(2) {|x|
+    if x == [1,2]
+      ObjectSpace.each_object(String) {|s|
+        s.clear if !s.frozen? && (s.length == 40 || s.length == 80)
+      }
+    end
+  }
+}, '[ruby-dev:31982]'
+
+assert_normal_exit %q{
+  ary = (1..100).to_a
+  ary.permutation(2) {|x|
+    if x == [1,2]
+      ObjectSpace.each_object(Array) {|o| o.clear if o == ary && o.object_id != ary.object_id }
+    end
+  }
+}, '[ruby-dev:31985]'
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
new file mode 100644
index 0000000000..28a23777a3
--- /dev/null
+++ b/bootstraptest/test_proc.rb
@@ -0,0 +1,431 @@
+assert_equal %q{[1, 2, 3]}, %q{
+  def getproc &b
+    b
+  end
+  
+  def m
+    yield
+  end
+  
+  m{
+    i = 1
+    m{
+      j = 2
+      m{
+        k = 3
+        getproc{
+          [i, j, k]
+        }
+      }
+    }
+  }.call
+}
+assert_equal %q{7}, %q{
+  def make_proc(&b)
+    b
+  end
+  
+  def make_closure
+    a = 0
+    make_proc{
+      a+=1
+    }
+  end
+  
+  cl = make_closure
+  cl.call + cl.call * cl.call
+}
+assert_equal %q{ok}, %q{
+  class C
+    def foo
+      :ok
+    end
+  end
+  
+  def block
+    C.method(:new).to_proc
+  end
+  b = block()
+  b.call.foo
+}
+assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{
+  def proc &b
+    b
+  end
+  
+  pr = []
+  proc{|i_b|
+    p3 = proc{|j_b|
+      pr << proc{|k_b|
+        [i_b, j_b, k_b]
+      }
+    }
+    p3.call(1)
+    p3.call(2)
+  }.call(0)
+  
+  pr[0].call(:last).concat pr[1].call(:last)
+}
+assert_equal %q{12}, %q{
+  def iter
+    yield
+  end
+  
+  def getproc &b
+    b
+  end
+  
+  iter{
+    bvar = 3
+    getproc{
+      bvar2 = 4
+      bvar * bvar2
+    }
+  }.call
+}
+assert_equal %q{200}, %q{
+  def iter
+    yield
+  end
+  
+  def getproc &b
+    b
+  end
+  
+  loc1 = 0
+  pr1 = iter{
+    bl1 = 1
+    getproc{
+      loc1 += 1
+      bl1  += 1
+      loc1 + bl1
+    }
+  }
+  
+  pr2 = iter{
+    bl1 = 1
+    getproc{
+      loc1 += 1
+      bl1  += 1
+      loc1 + bl1
+    }
+  }
+  
+  pr1.call; pr2.call
+  pr1.call; pr2.call
+  pr1.call; pr2.call
+  (pr1.call + pr2.call) * loc1
+}
+assert_equal %q{[1, 2]}, %q{
+  def proc(&pr)
+    pr
+  end
+  
+  def m
+    a = 1
+    m2{
+      a
+    }
+  end
+  
+  def m2
+    b = 2
+    proc{
+      [yield, b]
+    }
+  end
+  
+  pr = m
+  x = ['a', 1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,]
+  pr.call
+}
+assert_equal %q{1}, %q{
+  def proc(&pr)
+    pr
+  end
+  
+  def m
+    a = 1
+    m2{
+      a
+    }
+  end
+  
+  def m2
+    b = 2
+    proc{
+      [yield, b]
+    }
+    100000.times{|x|
+      "#{x}"
+    }
+    yield
+  end
+  m
+}
+assert_equal %q{[:C, :C]}, %q{
+  Const = :top
+  class C
+    Const = :C
+    $pr = proc{
+      (1..2).map{
+        Const
+      }
+    }
+  end
+  $pr.call
+}
+assert_equal %q{top}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  pr = proc{
+    Const
+  }
+  C.class_eval %q{
+    pr.call
+  }
+}
+assert_equal %q{1}, %q{
+  def m(&b)
+    b
+  end
+
+  m{|e_proctest| e_proctest}.call(1)
+}
+assert_equal %q{12}, %q{
+  def m(&b)
+    b
+  end
+
+  m{|e_proctest1, e_proctest2|
+    a = e_proctest1 * e_proctest2 * 2
+    a * 3
+  }.call(1, 2)
+}
+assert_equal %q{[[], [1], [1, 2], [1, 2, 3]]}, %q{
+  [
+  Proc.new{|*args| args}.call(),
+  Proc.new{|*args| args}.call(1),
+  Proc.new{|*args| args}.call(1, 2),
+  Proc.new{|*args| args}.call(1, 2, 3),
+  ]
+}
+assert_equal %q{[[nil, []], [1, []], [1, [2]], [1, [2, 3]]]}, %q{
+  [
+  Proc.new{|a, *b| [a, b]}.call(),
+  Proc.new{|a, *b| [a, b]}.call(1),
+  Proc.new{|a, *b| [a, b]}.call(1, 2),
+  Proc.new{|a, *b| [a, b]}.call(1, 2, 3),
+  ]
+}
+assert_equal %q{0}, %q{
+  pr = proc{
+    $SAFE
+  }
+  $SAFE = 1
+  pr.call
+}
+assert_equal %q{[1, 0]}, %q{
+  pr = proc{
+    $SAFE += 1
+  }
+  [pr.call, $SAFE]
+}
+assert_equal %q{1}, %q{
+  def m(&b)
+    b
+  end
+  m{1}.call
+}
+assert_equal %q{3}, %q{
+  def m(&b)
+    b
+  end
+
+  m{
+    a = 1
+    a + 2
+  }.call
+}
+assert_equal %Q{ok\n}, %q{
+  class A; def get_block; proc {puts "ok"} end end
+  block = A.new.get_block
+  GC.start
+  block.call
+}, '[ruby-core:14885]'
+
+assert_equal 'ok', %q{
+  a = lambda {|x, y, &b| b }
+  b = a.curry[1]
+  if b.call(2){} == nil
+    :ng
+  else
+    :ok
+  end
+}, '[ruby-core:15551]'
+
+assert_equal 'ok', %q{
+  lambda {
+    break :ok
+    :ng
+  }.call
+}, '[ruby-dev:34646]'
+
+assert_equal %q{[:bar, :foo]}, %q{
+  def foo
+    klass = Class.new do
+      define_method(:bar) do
+        return :bar
+      end
+    end
+    [klass.new.bar, :foo]
+  end
+  foo
+}, "[ ruby-Bugs-19304 ]"
+
+assert_equal 'ok', %q{
+   $x = :ok
+   def def7(x, y)
+      x[y]
+      $x = :ng
+   end
+   def test_def7
+      def7(lambda {|x| x.call}, Proc.new {return})
+      $x = :ng
+   end
+   test_def7
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  lambda { a = lambda { return }; $x = :ng; a[]; $x = :ok }.call
+  $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  lambda { a = lambda { break }; $x = :ng; a[]; $x = :ok }.call
+  $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  def def8
+    $x = :ng
+    lambda { a = Proc.new { return }; a[]}.call
+    $x = :ok
+  end
+  def8
+  $x
+}, '[ruby-core:17164]'
+
+
+assert_equal 'ok', %q{
+   def def9
+      lambda {|a| $x = :ok; a[]; $x = :ng }.call(Proc.new { return })
+      $x = :ng
+   end
+   def9
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+   def def10
+     $x = :ng
+     lambda { 1.times { return } }.call
+     $x = :ok
+   end
+   $x = :ok
+   def10
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+   def def11
+      yield
+   end
+   begin
+      lambda { def11 { return } }.call
+   rescue LocalJumpError
+      :ng
+   else
+      :ok
+   end
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+   def def12
+      b = Proc.new { $x = :ng; lambda { return }.call; $x = :ok }.call
+   end
+   def12
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  def m
+    pr = proc{
+      proc{
+        return :ok
+      }
+    }.call
+    pr.call
+    :ng
+  end
+  m()
+}
+
+assert_equal 'ok', %q{
+  class Foo
+    def call_it
+      p = Proc.new
+      p.call
+    end
+  end
+
+  def give_it
+    proc { :ok }
+  end
+
+  f = Foo.new
+  a_proc = give_it
+  f.call_it(&give_it())
+}, '[ruby-core:15711]'
+
+assert_equal 'foo!', %q{
+  class FooProc < Proc
+    def initialize
+      @foo = "foo!"
+    end
+
+    def bar
+      @foo
+    end
+  end
+
+  def bar
+    FooProc.new &lambda{
+      p 1
+    }
+  end
+
+  fp = bar(&lambda{
+    p 2
+  })
+
+  fp.bar
+}, 'Subclass of Proc'
+
+assert_equal 'ok', %q{
+  o = Object.new
+  def o.write(s); end
+  $stderr = o
+  at_exit{
+    print $!.message
+  }
+  raise "ok"
+}
+
diff --git a/bootstraptest/test_struct.rb b/bootstraptest/test_struct.rb
new file mode 100644
index 0000000000..a65964d5f9
--- /dev/null
+++ b/bootstraptest/test_struct.rb
@@ -0,0 +1,5 @@
+assert_equal 'Struct::Foo', %q{
+  Struct.instance_eval { const_set(:Foo, nil) }
+  Struct.new("Foo")
+  Struct::Foo
+}
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
new file mode 100644
index 0000000000..ae1488353e
--- /dev/null
+++ b/bootstraptest/test_syntax.rb
@@ -0,0 +1,902 @@
+assert_equal %q{4}, %q{1 && 2 && 3 && 4}
+assert_equal %q{}, %q{1 && nil && 3 && 4}
+assert_equal %q{}, %q{1 && 2 && 3 && nil}
+assert_equal %q{false}, %q{1 && 2 && 3 && false}
+assert_equal %q{4}, %q{1 and 2 and 3 and 4}
+assert_equal %q{}, %q{1 and nil and 3 and 4}
+assert_equal %q{}, %q{1 and 2 and 3 and nil}
+assert_equal %q{false}, %q{1 and 2 and 3 and false}
+assert_equal %q{}, %q{nil && true}
+assert_equal %q{false}, %q{false && true}
+assert_equal %q{}, %q{
+  case 1
+  when 2
+    :ng
+  end}
+assert_equal %q{ok}, %q{
+  case 1
+  when 10,20,30
+    :ng1
+  when 1,2,3
+    :ok
+  when 100,200,300
+    :ng2
+  else
+    :elseng
+  end}
+assert_equal %q{elseok}, %q{
+  case 123
+  when 10,20,30
+    :ng1
+  when 1,2,3
+    :ng2
+  when 100,200,300
+    :ng3
+  else
+    :elseok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when /testx/
+    :ng1
+  when /test/
+    :ok
+  when /tetxx/
+    :ng2
+  else
+    :ng_else
+  end
+}
+assert_equal %q{ok}, %q{
+  case Object.new
+  when Object
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case Object
+  when Object.new
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when 'te'
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when 'te'
+    :ng
+  when 'test'
+    :ok
+  end
+}
+assert_equal %q{ng}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when /te/
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when /test/
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{100}, %q{
+  def test(arg)
+    case 1
+    when 2
+      3
+    end
+    return arg
+  end
+  
+  test(100)
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 1
+  when *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 3
+  when *ary
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 1
+  when :x, *ary
+    :ok
+  when :z
+    :ng1
+  else
+    :ng2
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 3
+  when :x, *ary
+    :ng1
+  when :z
+    :ng2
+  else
+    :ok
+  end
+}
+assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep]}, %q{
+
+  def make_perm ary, num
+    if num == 1
+      ary.map{|e| [e]}
+    else
+      base = make_perm(ary, num-1)
+      res  = []
+      base.each{|b|
+        ary.each{|e|
+          res << [e] + b
+        }
+      }
+      res
+    end
+  end
+  
+  def each_test
+    conds = make_perm(['fv', 'tv'], 3)
+    bangs = make_perm(['', '!'], 3)
+    exprs = make_perm(['and', 'or'], 3)
+    ['if', 'unless'].each{|syn|
+      conds.each{|cs|
+        bangs.each{|bs|
+          exprs.each{|es|
+            yield(syn, cs, bs, es)
+          }
+        }
+      }
+    }
+  end
+  
+  fv = false
+  tv = true
+  
+  $ans = []
+  each_test{|syn, conds, bangs, exprs|
+    c1, c2, c3 = conds
+    bang1, bang2, bang3 = bangs
+    e1, e2 = exprs
+    eval %Q{
+      #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
+        $ans << :then
+      else
+        $ans << :false
+      end
+    }
+  }
+
+  each_test{|syn, conds, bangs, exprs|
+    c1, c2, c3 = conds
+    bang1, bang2, bang3 = bangs
+    e1, e2 = exprs
+    eval %Q{
+      #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
+        $ans << :then
+      end
+      $ans << :sep
+    }
+  }
+  $ans
+}
+assert_equal %q{}, %q{
+  defined?(m)
+}
+assert_equal %q{method}, %q{
+  def m
+  end
+  defined?(m)
+}
+assert_equal %q{}, %q{
+  defined?(a.class)
+}
+assert_equal %q{method}, %q{
+  a = 1
+  defined?(a.class)
+}
+assert_equal %q{["method", "method", "method", "method", nil, nil, "method", "method", "method", nil]}, %q{
+  class C
+    def test
+      [defined?(m1()), defined?(self.m1), defined?(C.new.m1),
+       defined?(m2()), defined?(self.m2), defined?(C.new.m2),
+       defined?(m3()), defined?(self.m3), defined?(C.new.m3)]
+    end
+    def m1
+    end
+    private
+    def m2
+    end
+    protected
+    def m3
+    end
+  end
+  C.new.test + [defined?(C.new.m3)]
+}
+assert_equal %q{[nil, nil, nil, nil, "global-variable", "global-variable", nil, nil]}, %q{
+  $ans = [defined?($1), defined?($2), defined?($3), defined?($4)]
+  /(a)(b)/ =~ 'ab'
+  $ans + [defined?($1), defined?($2), defined?($3), defined?($4)]
+}
+assert_equal %q{nilselftruefalse}, %q{
+  defined?(nil) + defined?(self) +
+    defined?(true) + defined?(false)
+}
+assert_equal %q{}, %q{
+  defined?(@a)
+}
+assert_equal %q{instance-variable}, %q{
+  @a = 1
+  defined?(@a)
+}
+assert_equal %q{}, %q{
+  defined?(@@a)
+}
+assert_equal %q{class variable}, %q{
+  @@a = 1
+  defined?(@@a)
+}
+assert_equal %q{}, %q{
+  defined?($a)
+}
+assert_equal %q{global-variable}, %q{
+  $a = 1
+  defined?($a)
+}
+assert_equal %q{}, %q{
+  defined?(C_definedtest)
+}
+assert_equal %q{constant}, %q{
+  C_definedtest = 1
+  defined?(C_definedtest)
+}
+assert_equal %q{}, %q{
+  defined?(::C_definedtest)
+}
+assert_equal %q{constant}, %q{
+  C_definedtest = 1
+  defined?(::C_definedtest)
+}
+assert_equal %q{}, %q{
+  defined?(C_definedtestA::C_definedtestB::C_definedtestC)
+}
+assert_equal %q{constant}, %q{
+  class C_definedtestA
+    class C_definedtestB
+      C_definedtestC = 1
+    end
+  end
+  defined?(C_definedtestA::C_definedtestB::C_definedtestC)
+}
+assert_equal %q{30}, %q{
+  sum = 0
+  30.times{|ib|
+    if ib % 10 == 0 .. true
+      sum += ib
+    end
+  }
+  sum
+}
+assert_equal %q{63}, %q{
+  sum = 0
+  30.times{|ib|
+    if ib % 10 == 0 ... true
+      sum += ib
+    end
+  }
+  sum
+}
+assert_equal %q{[["NUM", "Type: NUM\n"], ["NUM", "123\n"], ["NUM", "456\n"], ["NUM", "Type: ARP\n"], ["NUM", "aaa\n"], ["NUM", "bbb\n"], ["NUM", "\f\n"], ["ARP", "Type: ARP\n"], ["ARP", "aaa\n"], ["ARP", "bbb\n"]]}, %q{
+  t = nil
+  unless ''.respond_to? :lines
+    class String
+      def lines
+        self
+      end
+    end
+  end
+  ary = []
+"this must not print
+Type: NUM
+123
+456
+Type: ARP
+aaa
+bbb
+\f
+this must not print
+hoge
+Type: ARP
+aaa
+bbb
+".lines.each{|l|
+    if (t = l[/^Type: (.*)/, 1])..(/^\f/ =~ l)
+      ary << [t, l]
+    end
+  }
+  ary
+}
+assert_equal %q{1}, %q{if true  then 1 ; end}
+assert_equal %q{}, %q{if false then 1 ; end}
+assert_equal %q{1}, %q{if true  then 1 ; else; 2; end}
+assert_equal %q{2}, %q{if false then 1 ; else; 2; end}
+assert_equal %q{}, %q{if true  then   ; elsif true then ; 1 ; end}
+assert_equal %q{1}, %q{if false then   ; elsif true then ; 1 ; end}
+assert_equal %q{}, %q{unless true  then 1 ; end}
+assert_equal %q{1}, %q{unless false then 1 ; end}
+assert_equal %q{2}, %q{unless true  then 1 ; else; 2; end}
+assert_equal %q{1}, %q{unless false then 1 ; else; 2; end}
+assert_equal %q{1}, %q{1 if true}
+assert_equal %q{}, %q{1 if false}
+assert_equal %q{}, %q{1 if nil}
+assert_equal %q{}, %q{1 unless true}
+assert_equal %q{1}, %q{1 unless false}
+assert_equal %q{1}, %q{1 unless nil}
+assert_equal %q{1}, %q{1 || 2 || 3 || 4}
+assert_equal %q{1}, %q{1 || false || 3 || 4}
+assert_equal %q{2}, %q{nil || 2 || 3 || 4}
+assert_equal %q{2}, %q{false || 2 || 3 || 4}
+assert_equal %q{false}, %q{nil || false || nil || false}
+assert_equal %q{1}, %q{1 or 2 or 3 or 4}
+assert_equal %q{1}, %q{1 or false or 3 or 4}
+assert_equal %q{2}, %q{nil or 2 or 3 or 4}
+assert_equal %q{2}, %q{false or 2 or 3 or 4}
+assert_equal %q{false}, %q{nil or false or nil or false}
+assert_equal %q{elseng}, %q{
+  case
+  when 1==2, 2==3
+    :ng1
+  when false, 4==5
+    :ok
+  when false
+    :ng2
+  else
+    :elseng
+  end
+}
+assert_equal %q{ok}, %q{
+  case
+  when nil, nil
+    :ng1
+  when 1,2,3
+    :ok
+  when false, false
+    :ng2
+  else
+    :elseng
+  end
+}
+assert_equal %q{elseok}, %q{
+  case
+  when nil
+    :ng1
+  when false
+    :ng2
+  else
+    :elseok
+  end}
+assert_equal %q{}, %q{
+  case
+  when 1
+  end
+}
+assert_equal %q{ok}, %q{
+  r = nil
+  ary = []
+  case
+  when false
+    r = :ng1
+  when false, false
+    r = :ng2
+  when *ary
+    r = :ng3
+  when false, *ary
+    r = :ng4
+  when true, *ary
+    r = :ok
+  end
+  r
+}
+assert_equal %q{ok}, %q{
+  ary = []
+  case
+  when false, *ary
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, nil]
+  case
+  when *ary
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, nil]
+  case
+  when *ary
+    :ng
+  when true
+    :ok
+  else
+    :ng2
+  end
+}
+assert_equal %q{ng}, %q{
+  ary = [false, nil]
+  case
+  when *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, true]
+  case
+  when *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, true]
+  case
+  when false, false
+  when false, *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{}, %q{
+  i = 0
+  while i < 10
+    i+=1
+  end}
+assert_equal %q{10}, %q{
+  i = 0
+  while i < 10
+    i+=1
+  end; i}
+assert_equal %q{}, %q{
+  i = 0
+  until i > 10
+    i+=1
+  end}
+assert_equal %q{11}, %q{
+  i = 0
+  until i > 10
+    i+=1
+  end; i}
+assert_equal %q{1}, %q{
+  i = 0
+  begin
+    i+=1
+  end while false
+  i
+}
+assert_equal %q{1}, %q{
+  i = 0
+  begin
+    i+=1
+  end until true
+  i
+}
+def assert_syntax_error expected, code, message = ''
+  assert_equal "#{expected}",
+    "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end', message
+end
+assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]'
+assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]'
+assert_syntax_error "syntax error, unexpected tSTAR, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
+assert_syntax_error "`@0' is not allowed as an instance variable name", %q{@0..0}, '[ruby-dev:31095]'
+assert_syntax_error "identifier $00 is not valid to get", %q{$00..0}, '[ruby-dev:31100]'
+assert_syntax_error "identifier $00 is not valid to set", %q{0..$00=1}
+assert_equal %q{0}, %q{[*0];0}, '[ruby-dev:31102]'
+assert_syntax_error "syntax error, unexpected ')'", %q{v0,(*,v1,) = 0}, '[ruby-dev:31104]'
+assert_equal %q{1}, %q{
+  class << (ary=[]); def []; 0; end; def []=(x); super(0,x);end;end; ary[]+=1
+}, '[ruby-dev:31110]'
+assert_syntax_error "Can't set variable $1", %q{0..$1=1}, '[ruby-dev:31118]'
+assert_valid_syntax %q{1.times{1+(1&&next)}}, '[ruby-dev:31119]'
+assert_valid_syntax %q{x=-1;loop{x+=1&&redo if (x+=1).zero?}}, '[ruby-dev:31119]'
+assert_syntax_error %q{syntax error, unexpected $end}, %q{!}, '[ruby-dev:31243]'
+assert_equal %q{[nil]}, %q{[()]}, '[ruby-dev:31252]'
+assert_equal %q{true}, %q{!_=()}, '[ruby-dev:31263]'
+assert_equal 'ok', %q{while true; redo; end if 1 == 2; :ok}, '[ruby-dev:31360]'
+assert_equal 'ok', %q{
+  1.times {
+    begin
+    ensure
+      next
+    end
+  }; :ok
+}, '[ruby-dev:31373]'
+assert_equal 'ok', %q{
+  flag = false
+  1.times {
+    next if flag
+    flag = true
+    begin
+    ensure
+      redo
+    end
+  }; :ok
+}, '[ruby-dev:31373]'
+
+assert_equal 'ok', %q{
+  1.times{
+    p(1, (next; 2))
+  }; :ok
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         next
+       end)
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         p(1, (next; 2))
+       end)
+}
+# redo
+assert_equal 'ok', %q{
+  i = 0
+  1.times{
+    break if i>1
+    i+=1
+    p(1, (redo; 2))
+  }; :ok
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         redo
+       end)
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         p(1, (redo; 2))
+       end)
+}
+assert_equal '1', %q{
+  a = [0]
+  a[*a]+=1
+}
+assert_equal '2', %q{
+  ary = [0]
+  case 1
+  when *ary, 1
+    1
+  end +
+  case
+  when *ary
+    1
+  end
+}
+
+assert_match /invalid multibyte char/, %q{
+  STDERR.reopen(STDOUT)
+  eval("\"\xf0".force_encoding("utf-8"))
+}, '[ruby-dev:32429]'
+
+# method ! and !=
+assert_equal 'true', %q{!false}
+assert_equal 'true', %q{1 == 1}
+assert_equal 'true', %q{1 != 2}
+assert_equal 'true', %q{
+  class C; def !=(obj); true; end; end
+  C.new != 1
+}
+assert_equal 'true', %q{
+  class C; def !@; true; end; end
+  !C.new
+}
+assert_normal_exit %q{
+  eval "while true; return; end rescue p $!"
+}, '[ruby-dev:31663]'
+assert_equal '1', %q{
+  def bar
+    raise
+  end
+
+  def foo
+    1.times{
+      begin
+        return bar
+      rescue
+        :ok
+      end
+    }
+  end
+
+  foo
+}
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    next if counter != 0
+    break
+  end
+  :ok
+}, '[ruby-core:14385]'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    next if counter != 0
+    break :ok
+  end # direct
+}, '[ruby-core:14385]'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    "#{next}"
+  end
+  :ok
+}, 'reported by Yusuke ENDOH'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    next 
+    redo
+  end
+  :ok
+}, 'reported by Yusuke ENDOH'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    next 
+    "#{ redo }"
+  end
+  :ok
+}, 'reported by Yusuke ENDOH'
+
+assert_normal_exit %q{
+  begin
+    raise
+  rescue
+    counter = 2
+    while true
+      counter -= 1
+      break if counter == 0
+      next
+      retry
+    end
+  end
+}, 'reported by Yusuke ENDOH'
+
+assert_normal_exit %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    next
+    "#{ break }"
+  end
+}, 'reported by Yusuke ENDOH'
+
+assert_normal_exit %q{
+  counter = 2
+  while true
+    counter -= 1
+    next if counter != 0
+    "#{ break }"
+  end
+}, 'reported by Yusuke ENDOH'
+
+assert_equal 'ok', %q{
+  1.times do
+    [
+      1, 2, 3, 4, 5, 6, 7, 8,
+      begin
+        false ? next : p
+        break while true
+      end
+    ]
+  end
+  :ok
+}, '[ruby-dev:32882]'
+
+assert_equal "1\n2\n", %q{
+  i = 0
+  while i<2
+    i += 1
+    next p(i)
+  end
+}
+
+assert_valid_syntax('1.times {|i|print (42),1;}', '[ruby-list:44479]')
+
+assert_equal 'ok', %q{
+  def a() end
+  begin
+    if defined?(a(1).a)
+      :ng
+    else
+      :ok
+    end
+  rescue
+    :ng
+  end
+}, '[ruby-core:16010]'
+
+assert_equal 'ok', %q{
+  def a() end
+  begin
+    if defined?(a::B)
+      :ng
+    else
+      :ok
+    end
+  rescue
+    :ng
+  end
+}, '[ruby-core:16010]'
+
+assert_normal_exit %q{
+  defined? C && 0
+}
+
+assert_normal_exit %q{
+  class C
+    def m
+      defined?(super())
+    end
+  end
+  C.new.m
+}
+
+assert_equal 'ok', %q{
+  class X < RuntimeError;end
+  x = [X]
+  begin
+   raise X
+  rescue *x
+   :ok
+  end
+}, '[ruby-core:14537]'
+
+assert_equal 'ok', %q{
+  a = [false]
+  (a[0] &&= true) == false ? :ok : :ng
+}, '[ruby-dev:34679]'
+
+assert_normal_exit %q{
+  a = []
+  100.times {|i| a << i << nil << nil }
+  p a.compact!
+}
+
+assert_equal 'ok', %q{
+  "#{}""#{}ok"
+}, '[ruby-dev:38968]'
+
+
+assert_equal 'ok', %q{
+  "o" "#{}k"
+}, '[ruby-dev:38980]'
+
+bug2415 = '[ruby-core:26961]'
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x(a=1, b, *rest); nil end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x@; nil end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x(a = 0.times do
+              def y(a=1, b, *rest); nil; end
+            end)
+        nil
+      end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x(a = 0.times do
+              def x@; nil; end
+            end)
+        nil
+      end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  a {
+    b {|c.d| }
+    e
+  }
+}, '[ruby-dev:39861]'
+
+bug1240 = '[ruby-core:22637]'
+assert_valid_syntax('x y { "#{}".z { } }', bug1240)
+assert_valid_syntax('x y { "#{}".z do end }', bug1240)
+
+assert_valid_syntax('y "#{a 1}" do end', '[ruby-core:29579]')
+assert_normal_exit %q{
+  def foo(&block)
+    yield
+  end
+
+  foo do
+    s = defined?(raise + 1)
+    Class
+  end
+}, '[ruby-core:30293]'
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
new file mode 100644
index 0000000000..2494cccbf3
--- /dev/null
+++ b/bootstraptest/test_thread.rb
@@ -0,0 +1,454 @@
+# Thread and Fiber
+
+assert_equal %q{ok}, %q{
+  Thread.new{
+  }.join
+  :ok
+}
+assert_equal %q{ok}, %q{
+  Thread.new{
+    :ok
+  }.value
+}
+assert_equal %q{20100}, %q{
+  v = 0
+  (1..200).map{|i|
+    Thread.new{
+      i
+    }
+  }.each{|t|
+    v += t.value
+  }
+  v
+}
+assert_equal %q{5000}, %q{
+  5000.times{|e|
+    (1..2).map{
+      Thread.new{
+      }
+    }.each{|e|
+      e.join()
+    }
+  }
+}
+assert_equal %q{5000}, %q{
+  5000.times{|e|
+    (1..2).map{
+      Thread.new{
+      }
+    }.each{|e|
+      e.join(1000000000)
+    }
+  }
+}
+assert_equal %q{5000}, %q{
+  5000.times{
+    t = Thread.new{}
+    while t.alive?
+      Thread.pass
+    end
+  }
+}
+assert_equal %q{100}, %q{
+  100.times{
+    Thread.new{loop{Thread.pass}}
+  }
+}
+assert_equal %q{ok}, %q{
+  Thread.new{
+    :ok
+  }.join.value
+}
+assert_equal %q{ok}, %q{
+  begin
+    Thread.new{
+      raise "ok"
+    }.join
+  rescue => e
+    e
+  end
+}
+assert_equal %q{ok}, %q{
+  ans = nil
+  t = Thread.new{
+    begin
+      sleep 0.5
+    ensure
+      ans = :ok
+    end
+  }
+  Thread.pass
+  t.kill
+  t.join
+  ans
+}
+assert_equal %q{ok}, %q{
+  t = Thread.new{
+    sleep
+  }
+  sleep 0.1
+  t.raise
+  begin
+    t.join
+    :ng
+  rescue
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  t = Thread.new{
+    loop{}
+  }
+  Thread.pass
+  t.raise
+  begin
+    t.join
+    :ng
+  rescue
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  t = Thread.new{
+  }
+  Thread.pass
+  t.join
+  t.raise # raise to exited thread
+  begin
+    t.join
+    :ok
+  rescue
+    :ng
+  end
+}
+assert_equal %q{run}, %q{
+  t = Thread.new{
+    loop{}
+  }
+  st = t.status
+  t.kill
+  st
+}
+assert_equal %q{sleep}, %q{
+  t = Thread.new{
+    sleep
+  }
+  sleep 0.1
+  st = t.status
+  t.kill
+  st
+}
+assert_equal %q{false}, %q{
+  t = Thread.new{
+  }
+  t.kill
+  sleep 0.1
+  t.status
+}
+assert_equal %q{[ThreadGroup, true]}, %q{
+  ptg = Thread.current.group
+  Thread.new{
+    ctg = Thread.current.group
+    [ctg.class, ctg == ptg]
+  }.value
+}
+assert_equal %q{[1, 1]}, %q{
+  thg = ThreadGroup.new
+
+  t = Thread.new{
+    thg.add Thread.current
+    sleep
+  }
+  sleep 0.1
+  [thg.list.size, ThreadGroup::Default.list.size]
+}
+assert_equal %q{true}, %q{
+  thg = ThreadGroup.new
+
+  t = Thread.new{sleep 5}
+  thg.add t
+  thg.list.include?(t)
+}
+assert_equal %q{[true, nil, true]}, %q{
+  /a/ =~ 'a'
+  $a = $~
+  Thread.new{
+    $b = $~
+    /b/ =~ 'b'
+    $c = $~
+  }.join
+  $d = $~
+  [$a == $d, $b, $c != $d]
+}
+assert_equal %q{11}, %q{
+  Thread.current[:a] = 1
+  Thread.new{
+    Thread.current[:a] = 10
+    Thread.pass
+    Thread.current[:a]
+  }.value + Thread.current[:a]
+}
+assert_normal_exit %q{
+begin
+  100.times do |i|
+    begin
+      th = Thread.start(Thread.current) {|u| u.raise }
+      raise
+    rescue
+    ensure
+      th.join
+    end
+  end
+rescue
+end
+}, '[ruby-dev:31371]'
+
+assert_equal 'true', %{
+  t = Thread.new { loop {} }
+  begin
+    pid = fork {
+      exit t.status != "run"
+    }
+    Process.wait pid
+    $?.success?
+  rescue NotImplementedError
+    true
+  end
+}
+
+assert_equal 'ok', %{
+  open("zzz.rb", "w") do |f|
+    f.puts <<-END
+      begin
+        Thread.new { fork { GC.start } }.join
+        pid, status = Process.wait2
+        $result = status.success? ? :ok : :ng
+      rescue NotImplementedError
+        $result = :ok
+      end
+    END
+  end
+  require "./zzz.rb"
+  $result
+}
+
+assert_finish 3, %{
+  th = Thread.new {sleep 2}
+  th.join(1)
+  th.join
+}
+
+assert_finish 3, %{
+  require 'timeout'
+  th = Thread.new {sleep 2}
+  begin
+    Timeout.timeout(1) {th.join}
+  rescue Timeout::Error
+  end
+  th.join
+}
+
+assert_normal_exit %q{
+  STDERR.reopen(STDOUT)
+  exec "/"
+}
+
+assert_normal_exit %q{
+  (0..10).map {
+    Thread.new {
+     10000.times {
+        Object.new.to_s
+      }
+    }
+  }.each {|t|
+    t.join
+  }
+}
+
+assert_equal 'ok', %q{
+  def m
+    t = Thread.new { while true do // =~ "" end }
+    sleep 0.1
+    10.times {
+      if /((ab)*(ab)*)*(b)/ =~ "ab"*7
+        return :ng if !$4
+        return :ng if $~.size != 5
+      end
+    }
+    :ok
+  ensure
+    Thread.kill t
+  end
+  m
+}, '[ruby-dev:34492]'
+
+assert_normal_exit %q{
+  at_exit { Fiber.new{}.resume }
+}
+
+assert_normal_exit %q{
+  g = enum_for(:local_variables)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = enum_for(:block_given?)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = enum_for(:binding)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = "abc".enum_for(:scan, /./)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = Module.enum_for(:new)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  Fiber.new(&Object.method(:class_eval)).resume("foo")
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  Thread.new("foo", &Object.method(:class_eval)).join
+}, '[ruby-dev:34128]'
+
+assert_equal 'ok', %q{
+  begin
+    Thread.new { Thread.stop }
+    Thread.stop
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+
+assert_equal 'ok', %q{
+  begin
+    m1, m2 = Mutex.new, Mutex.new
+    Thread.new { m1.lock; sleep 1; m2.lock }
+    m2.lock; sleep 1; m1.lock
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock }; sleep 1; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock }; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock }.join; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock; sleep 2 }
+  sleep 1; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock; sleep 2; m.unlock }
+  sleep 1; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  t = Thread.new {`echo`}
+  t.join
+  $? ? :ng : :ok
+}, '[ruby-dev:35414]'
+
+assert_equal 'ok', %q{
+  begin
+    10000.times { Thread.new(true) {|x| x == false } }
+  rescue NoMemoryError, StandardError
+  end
+  :ok
+}
+
+assert_equal 'ok', %{
+  open("zzz.rb", "w") do |f|
+    f.puts <<-END
+      begin
+        m = Mutex.new
+        Thread.new { m.lock; sleep 1 }
+        sleep 0.3
+        parent = Thread.current
+        Thread.new do
+          sleep 0.3
+          begin
+            fork { GC.start }
+          rescue Exception
+            parent.raise $!
+          end
+        end
+        m.lock
+        pid, status = Process.wait2
+        $result = status.success? ? :ok : :ng
+      rescue NotImplementedError
+        $result = :ok
+      end
+    END
+  end
+  require "./zzz.rb"
+  $result
+}
+
+assert_finish 3, %q{
+  require 'thread'
+
+  lock = Mutex.new
+  cond = ConditionVariable.new
+  t = Thread.new do
+    lock.synchronize do
+      cond.wait(lock)
+    end
+  end
+
+  begin
+    pid = fork do
+      # Child
+      STDOUT.write "This is the child process.\n"
+      STDOUT.write "Child process exiting.\n"
+    end
+    Process.waitpid(pid)
+  rescue NotImplementedError
+  end
+}, '[ruby-core:23572]'
+
+assert_equal 'ok', %q{
+  begin
+    Process.waitpid2(fork {sleep 1})[1].success? ? 'ok' : 'ng'
+  rescue NotImplementedError
+    'ok'
+  end
+}
+
+assert_equal 'foo', %q{
+  f = proc {|s| /#{ sleep 1; s }/o }
+  [ Thread.new {            f.call("foo"); nil },
+    Thread.new { sleep 0.5; f.call("bar"); nil },
+  ].each {|t| t.join }
+  GC.start
+  f.call.source
+}
diff --git a/class.c b/class.c
index 106f796140..3711950f0a 100644
--- a/class.c
+++ b/class.c
@@ -3,48 +3,117 @@
   class.c -
 
   $Author$
-  $Date$
   created at: Tue Aug 10 15:05:44 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "rubysig.h"
-#include "node.h"
-#include "st.h"
+/*!
+ * \defgroup class Classes and their hierarchy.
+ * \par Terminology
+ * - class: same as in Ruby.
+ * - singleton class: class for a particular object
+ * - eigenclass: = singleton class
+ * - metaclass: class of a class. metaclass is a kind of singleton class.
+ * - metametaclass: class of a metaclass.
+ * - meta^(n)-class: class of a meta^(n-1)-class.
+ * - attached object: A singleton class knows its unique instance.
+ *   The instance is called the attached object for the singleton class.
+ * \{
+ */
+
+#include "ruby/ruby.h"
+#include "ruby/st.h"
+#include "method.h"
+#include "vm_core.h"
 #include <ctype.h>
 
 extern st_table *rb_class_tbl;
+static ID id_attached;
+
+/**
+ * Allocates a struct RClass for a new class.
+ *
+ * \param flags     initial value for basic.flags of the returned class.
+ * \param klass     the class of the returned class.
+ * \return          an uninitialized Class object.
+ * \pre  \p klass must refer \c Class class or an ancestor of Class.
+ * \pre  \code (flags | T_CLASS) != 0  \endcode
+ * \post the returned class can safely be \c #initialize 'd.
+ *
+ * \note this function is not Class#allocate.
+ */
+static VALUE
+class_alloc(VALUE flags, VALUE klass)
+{
+    rb_classext_t *ext = ALLOC(rb_classext_t);
+    NEWOBJ(obj, struct RClass);
+    OBJSETUP(obj, klass, flags);
+    obj->ptr = ext;
+    RCLASS_IV_TBL(obj) = 0;
+    RCLASS_M_TBL(obj) = 0;
+    RCLASS_SUPER(obj) = 0;
+    RCLASS_IV_INDEX_TBL(obj) = 0;
+    return (VALUE)obj;
+}
+
 
+/*!
+ * A utility function that wraps class_alloc.
+ *
+ * allocates a class and initializes safely.
+ * \param super     a class from which the new class derives.
+ * \return          a class object.
+ * \pre  \a super must be a class.
+ * \post the metaclass of the new class is Class.
+ */
 VALUE
-rb_class_boot(super)
-    VALUE super;
+rb_class_boot(VALUE super)
 {
-    NEWOBJ(klass, struct RClass);
-    OBJSETUP(klass, rb_cClass, T_CLASS);
+    VALUE klass = class_alloc(T_CLASS, rb_cClass);
 
-    klass->super = super;
-    klass->iv_tbl = 0;
-    klass->m_tbl = 0;		/* safe GC */
-    klass->m_tbl = st_init_numtable();
+    RCLASS_SUPER(klass) = super;
+    RCLASS_M_TBL(klass) = st_init_numtable();
 
     OBJ_INFECT(klass, super);
     return (VALUE)klass;
 }
 
-VALUE
-rb_class_new(super)
-    VALUE super;
+
+/*!
+ * Ensures a class can be derived from super.
+ *
+ * \param super a reference to an object.
+ * \exception TypeError if \a super is not a Class or \a super is a singleton class.
+ */
+void
+rb_check_inheritable(VALUE super)
 {
-    Check_Type(super, T_CLASS);
+    if (TYPE(super) != T_CLASS) {
+	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
+		 rb_obj_classname(super));
+    }
+    if (RBASIC(super)->flags & FL_SINGLETON) {
+	rb_raise(rb_eTypeError, "can't make subclass of singleton class");
+    }
     if (super == rb_cClass) {
 	rb_raise(rb_eTypeError, "can't make subclass of Class");
     }
-    if (FL_TEST(super, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
-    }
+}
+
+
+/*!
+ * Creates a new class.
+ * \param super     a class from which the new class derives.
+ * \exception TypeError \a super is not inheritable.
+ * \exception TypeError \a super is the Class class.
+ */
+VALUE
+rb_class_new(VALUE super)
+{
+    Check_Type(super, T_CLASS);
+    rb_check_inheritable(super);
     return rb_class_boot(super);
 }
 
@@ -53,51 +122,58 @@ struct clone_method_data {
     VALUE klass;
 };
 
+VALUE rb_iseq_clone(VALUE iseqval, VALUE newcbase);
+
 static int
-clone_method(mid, body, data)
-    ID mid;
-    NODE *body;
-    struct clone_method_data *data;
+clone_method(ID mid, const rb_method_entry_t *me, struct clone_method_data *data)
 {
-    NODE *fbody = body->nd_body;
-
-    if (fbody && nd_type(fbody) == NODE_SCOPE) {
-	VALUE cref = data->klass ?
-	    (VALUE)NEW_NODE(NODE_CREF,data->klass,0,fbody->nd_rval) :
-	    fbody->nd_rval;
-	fbody = NEW_NODE(NODE_SCOPE, fbody->nd_tbl, cref, fbody->nd_next);
+    VALUE newiseqval;
+    if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) {
+	rb_iseq_t *iseq;
+	newiseqval = rb_iseq_clone(me->def->body.iseq->self, data->klass);
+	GetISeqPtr(newiseqval, iseq);
+	rb_add_method(data->klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
+	RB_GC_GUARD(newiseqval);
+    }
+    else {
+	rb_method_entry_set(data->klass, mid, me, me->flag);
     }
-    st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
     return ST_CONTINUE;
 }
 
 /* :nodoc: */
 VALUE
-rb_mod_init_copy(clone, orig)
-    VALUE clone, orig;
+rb_mod_init_copy(VALUE clone, VALUE orig)
 {
     rb_obj_init_copy(clone, orig);
     if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
-	RBASIC(clone)->klass = RBASIC(orig)->klass;
-	RBASIC(clone)->klass = rb_singleton_class_clone(clone);
+	RBASIC(clone)->klass = rb_singleton_class_clone(orig);
+	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
     }
-    RCLASS(clone)->super = RCLASS(orig)->super;
-    if (RCLASS(orig)->iv_tbl) {
+    RCLASS_SUPER(clone) = RCLASS_SUPER(orig);
+    if (RCLASS_IV_TBL(orig)) {
 	ID id;
 
-	RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
-	id = rb_intern("__classpath__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
-	id = rb_intern("__classid__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+	if (RCLASS_IV_TBL(clone)) {
+	    st_free_table(RCLASS_IV_TBL(clone));
+	}
+	RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(orig));
+	CONST_ID(id, "__classpath__");
+	st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
+	CONST_ID(id, "__classid__");
+	st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
     }
-    if (RCLASS(orig)->m_tbl) {
+    if (RCLASS_M_TBL(orig)) {
 	struct clone_method_data data;
 
-	data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
-	data.klass = (VALUE)clone;
-
-	st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
+	if (RCLASS_M_TBL(clone)) {
+	    extern void rb_free_m_table(st_table *tbl);
+	    rb_free_m_table(RCLASS_M_TBL(clone));
+	}
+	data.tbl = RCLASS_M_TBL(clone) = st_init_numtable();
+	data.klass = clone;
+	st_foreach(RCLASS_M_TBL(orig), clone_method,
+		   (st_data_t)&data);
     }
 
     return clone;
@@ -105,10 +181,12 @@ rb_mod_init_copy(clone, orig)
 
 /* :nodoc: */
 VALUE
-rb_class_init_copy(clone, orig)
-    VALUE clone, orig;
+rb_class_init_copy(VALUE clone, VALUE orig)
 {
-    if (RCLASS(clone)->super != 0) {
+    if (orig == rb_cBasicObject) {
+	rb_raise(rb_eTypeError, "can't copy the root class");
+    }
+    if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
 	rb_raise(rb_eTypeError, "already initialized class");
     }
     if (FL_TEST(orig, FL_SINGLETON)) {
@@ -118,17 +196,16 @@ rb_class_init_copy(clone, orig)
 }
 
 VALUE
-rb_singleton_class_clone(obj)
-    VALUE obj;
+rb_singleton_class_clone(VALUE obj)
 {
     VALUE klass = RBASIC(obj)->klass;
 
     if (!FL_TEST(klass, FL_SINGLETON))
 	return klass;
     else {
+	struct clone_method_data data;
 	/* copy singleton(unnamed) class */
-	NEWOBJ(clone, struct RClass);
-	OBJSETUP(clone, 0, RBASIC(klass)->flags);
+	VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
 
 	if (BUILTIN_TYPE(obj) == T_CLASS) {
 	    RBASIC(clone)->klass = (VALUE)clone;
@@ -137,74 +214,182 @@ rb_singleton_class_clone(obj)
 	    RBASIC(clone)->klass = rb_singleton_class_clone(klass);
 	}
 
-	clone->super = RCLASS(klass)->super;
-	clone->iv_tbl = 0;
-	clone->m_tbl = 0;
-	if (RCLASS(klass)->iv_tbl) {
-	    clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
-	}
-	{
-	    struct clone_method_data data;
-
-	    data.tbl = clone->m_tbl = st_init_numtable();
-	    switch (TYPE(obj)) {
-	      case T_CLASS:
-	      case T_MODULE:
-		data.klass = obj;
-		break;
-	      default:
-		data.klass = 0;
-		break;
-	    }
-
-	    st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
+	RCLASS_SUPER(clone) = RCLASS_SUPER(klass);
+	if (RCLASS_IV_TBL(klass)) {
+	    RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(klass));
 	}
+	RCLASS_M_TBL(clone) = st_init_numtable();
+	data.tbl = RCLASS_M_TBL(clone);
+	data.klass = (VALUE)clone;
+	st_foreach(RCLASS_M_TBL(klass), clone_method,
+		   (st_data_t)&data);
 	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
 	FL_SET(clone, FL_SINGLETON);
 	return (VALUE)clone;
     }
 }
 
+/*!
+ * Attach a object to a singleton class.
+ * @pre \a klass is the singleton class of \a obj.
+ */
 void
-rb_singleton_class_attached(klass, obj)
-    VALUE klass, obj;
+rb_singleton_class_attached(VALUE klass, VALUE obj)
 {
     if (FL_TEST(klass, FL_SINGLETON)) {
-	if (!RCLASS(klass)->iv_tbl) {
-	    RCLASS(klass)->iv_tbl = st_init_numtable();
+	if (!RCLASS_IV_TBL(klass)) {
+	    RCLASS_IV_TBL(klass) = st_init_numtable();
 	}
-	st_insert(RCLASS(klass)->iv_tbl, rb_intern("__attached__"), obj);
+	st_insert(RCLASS_IV_TBL(klass), id_attached, obj);
     }
 }
 
-VALUE
-rb_make_metaclass(obj, super)
-    VALUE obj, super;
+
+
+#define METACLASS_OF(k) RBASIC(k)->klass
+
+/*!
+ * whether k is a meta^(n)-class of Class class
+ * @retval 1 if \a k is a meta^(n)-class of Class class (n >= 0)
+ * @retval 0 otherwise
+ */
+#define META_CLASS_OF_CLASS_CLASS_P(k)  (METACLASS_OF(k) == k)
+
+
+/*!
+ * ensures \a klass belongs to its own eigenclass.
+ * @return the eigenclass of \a klass
+ * @post \a klass belongs to the returned eigenclass.
+ *       i.e. the attached object of the eigenclass is \a klass.
+ * @note this macro creates a new eigenclass if necessary.
+ */
+#define ENSURE_EIGENCLASS(klass) \
+ (rb_ivar_get(METACLASS_OF(klass), id_attached) == klass ? METACLASS_OF(klass) : make_metaclass(klass))
+
+
+/*!
+ * Creates a metaclass of \a klass
+ * \param klass     a class
+ * \return          created metaclass for the class
+ * \pre \a klass is a Class object
+ * \pre \a klass has no singleton class.
+ * \post the class of \a klass is the returned class.
+ * \post the returned class is meta^(n+1)-class when \a klass is a meta^(n)-klass for n >= 0
+ */
+static inline VALUE
+make_metaclass(VALUE klass)
+{
+    VALUE super;
+    VALUE metaclass = rb_class_boot(Qundef);
+
+    FL_SET(metaclass, FL_SINGLETON);
+    rb_singleton_class_attached(metaclass, klass);
+
+    if (META_CLASS_OF_CLASS_CLASS_P(klass)) {
+	METACLASS_OF(klass) = METACLASS_OF(metaclass) = metaclass;
+    }
+    else {
+	VALUE tmp = METACLASS_OF(klass); /* for a meta^(n)-class klass, tmp is meta^(n)-class of Class class */
+	METACLASS_OF(klass) = metaclass;
+	METACLASS_OF(metaclass) = ENSURE_EIGENCLASS(tmp);
+    }
+
+    super = RCLASS_SUPER(klass);
+    while (RB_TYPE_P(super, T_ICLASS)) super = RCLASS_SUPER(super);
+    RCLASS_SUPER(metaclass) = super ? ENSURE_EIGENCLASS(super) : rb_cClass;
+
+    OBJ_INFECT(metaclass, RCLASS_SUPER(metaclass));
+
+    return metaclass;
+}
+
+/*!
+ * Creates a singleton class for \a obj.
+ * \pre \a obj must not a immediate nor a special const.
+ * \pre \a obj must not a Class object.
+ * \pre \a obj has no singleton class.
+ */
+static inline VALUE
+make_singleton_class(VALUE obj)
 {
-    VALUE klass = rb_class_boot(super);
+    VALUE orig_class = RBASIC(obj)->klass;
+    VALUE klass = rb_class_boot(orig_class);
+
     FL_SET(klass, FL_SINGLETON);
     RBASIC(obj)->klass = klass;
     rb_singleton_class_attached(klass, obj);
-    if (BUILTIN_TYPE(obj) == T_CLASS && FL_TEST(obj, FL_SINGLETON)) {
-	RBASIC(klass)->klass = klass;
-	RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
+
+    METACLASS_OF(klass) = METACLASS_OF(rb_class_real(orig_class));
+    return klass;
+}
+
+
+static VALUE
+boot_defclass(const char *name, VALUE super)
+{
+    extern st_table *rb_class_tbl;
+    VALUE obj = rb_class_boot(super);
+    ID id = rb_intern(name);
+
+    rb_name_class(obj, id);
+    st_add_direct(rb_class_tbl, id, obj);
+    rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
+    return obj;
+}
+
+void
+Init_class_hierarchy(void)
+{
+    id_attached = rb_intern("__attached__");
+
+    rb_cBasicObject = boot_defclass("BasicObject", 0);
+    rb_cObject = boot_defclass("Object", rb_cBasicObject);
+    rb_cModule = boot_defclass("Module", rb_cObject);
+    rb_cClass =  boot_defclass("Class",  rb_cModule);
+
+    rb_const_set(rb_cObject, rb_intern("BasicObject"), rb_cBasicObject);
+    RBASIC(rb_cClass)->klass
+	= RBASIC(rb_cModule)->klass
+	= RBASIC(rb_cObject)->klass
+	= RBASIC(rb_cBasicObject)->klass
+	= rb_cClass;
+}
+
+
+/*!
+ * \internal
+ * Creates a new *singleton class* for an object.
+ *
+ * \pre \a obj has no singleton class.
+ * \note DO NOT USE the function in an extension libraries. Use \ref rb_singleton_class.
+ * \param obj     An object.
+ * \param unused  ignored.
+ * \return        The singleton class of the object.
+ */
+VALUE
+rb_make_metaclass(VALUE obj, VALUE unused)
+{
+    if (BUILTIN_TYPE(obj) == T_CLASS) {
+	return make_metaclass(obj);
     }
     else {
-	VALUE metasuper = RBASIC(rb_class_real(super))->klass;
-
-	/* metaclass of a superclass may be NULL at boot time */
-	if (metasuper) {
-	    RBASIC(klass)->klass = metasuper;
-	}
+	return make_singleton_class(obj);
     }
-
-    return klass;
 }
 
+
+/*!
+ * Defines a new class.
+ * \param id     ignored
+ * \param super  A class from which the new class will derive. NULL means \c Object class.
+ * \return       the created class
+ * \throw TypeError if super is not a \c Class object.
+ *
+ * \note the returned class will not be associated with \a id.
+ *       You must explicitly set a class name if necessary.
+ */
 VALUE
-rb_define_class_id(id, super)
-    ID id;
-    VALUE super;
+rb_define_class_id(ID id, VALUE super)
 {
     VALUE klass;
 
@@ -215,31 +400,43 @@ rb_define_class_id(id, super)
     return klass;
 }
 
-void
-rb_check_inheritable(super)
-    VALUE super;
-{
-    if (TYPE(super) != T_CLASS) {
-	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
-		 rb_obj_classname(super));
-    }
-    if (RBASIC(super)->flags & FL_SINGLETON) {
-	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
-    }
-}
 
+/*!
+ * Calls Class#inherited.
+ * \param super  A class which will be called #inherited.
+ *               NULL means Object class.
+ * \param klass  A Class object which derived from \a super
+ * \return the value \c Class#inherited's returns
+ * \pre Each of \a super and \a klass must be a \c Class object.
+ */
 VALUE
-rb_class_inherited(super, klass)
-    VALUE super, klass;
+rb_class_inherited(VALUE super, VALUE klass)
 {
+    ID inherited;
     if (!super) super = rb_cObject;
-    return rb_funcall(super, rb_intern("inherited"), 1, klass);
+    CONST_ID(inherited, "inherited");
+    return rb_funcall(super, inherited, 1, klass);
 }
 
+
+
+/*!
+ * Defines a top-level class.
+ * \param name   name of the class
+ * \param super  a class from which the new class will derive.
+ *               NULL means \c Object class.
+ * \return the created class
+ * \throw TypeError if the constant name \a name is already taken but
+ *                  the constant is not a \c Class.
+ * \throw NameError if the class is already defined but the class can not
+ *                  be reopened because its superclass is not \a super.
+ * \post top-level constant named \a name refers the returned class.
+ *
+ * \note if a class named \a name is already defined and its superclass is
+ *       \a super, the function just returns the defined class.
+ */
 VALUE
-rb_define_class(name, super)
-    const char *name;
-    VALUE super;
+rb_define_class(const char *name, VALUE super)
 {
     VALUE klass;
     ID id;
@@ -250,8 +447,8 @@ rb_define_class(name, super)
 	if (TYPE(klass) != T_CLASS) {
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
-	if (rb_class_real(RCLASS(klass)->super) != super) {
-	    rb_name_error(id, "%s is already defined", name);
+	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
 	}
 	return klass;
     }
@@ -267,55 +464,86 @@ rb_define_class(name, super)
     return klass;
 }
 
+
+/*!
+ * Defines a class under the namespace of \a outer.
+ * \param outer  a class which contains the new class.
+ * \param name   name of the new class
+ * \param super  a class from which the new class will derive.
+ *               NULL means \c Object class.
+ * \return the created class
+ * \throw TypeError if the constant name \a name is already taken but
+ *                  the constant is not a \c Class.
+ * \throw NameError if the class is already defined but the class can not
+ *                  be reopened because its superclass is not \a super.
+ * \post top-level constant named \a name refers the returned class.
+ *
+ * \note if a class named \a name is already defined and its superclass is
+ *       \a super, the function just returns the defined class.
+ */
 VALUE
-rb_define_class_under(outer, name, super)
-    VALUE outer;
-    const char *name;
-    VALUE super;
+rb_define_class_under(VALUE outer, const char *name, VALUE super)
+{
+    return rb_define_class_id_under(outer, rb_intern(name), super);
+}
+
+
+/*!
+ * Defines a class under the namespace of \a outer.
+ * \param outer  a class which contains the new class.
+ * \param id     name of the new class
+ * \param super  a class from which the new class will derive.
+ *               NULL means \c Object class.
+ * \return the created class
+ * \throw TypeError if the constant name \a name is already taken but
+ *                  the constant is not a \c Class.
+ * \throw NameError if the class is already defined but the class can not
+ *                  be reopened because its superclass is not \a super.
+ * \post top-level constant named \a name refers the returned class.
+ *
+ * \note if a class named \a name is already defined and its superclass is
+ *       \a super, the function just returns the defined class.
+ */
+VALUE
+rb_define_class_id_under(VALUE outer, ID id, VALUE super)
 {
     VALUE klass;
-    ID id;
 
-    id = rb_intern(name);
     if (rb_const_defined_at(outer, id)) {
 	klass = rb_const_get_at(outer, id);
 	if (TYPE(klass) != T_CLASS) {
-	    rb_raise(rb_eTypeError, "%s is not a class", name);
+	    rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
 	}
-	if (rb_class_real(RCLASS(klass)->super) != super) {
-	    rb_name_error(id, "%s is already defined", name);
+	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+	    rb_name_error(id, "%s is already defined", rb_id2name(id));
 	}
 	return klass;
     }
     if (!super) {
 	rb_warn("no super class for `%s::%s', Object assumed",
-		rb_class2name(outer), name);
+		rb_class2name(outer), rb_id2name(id));
     }
     klass = rb_define_class_id(id, super);
-    rb_set_class_path(klass, outer, name);
+    rb_set_class_path_string(klass, outer, rb_id2str(id));
     rb_const_set(outer, id, klass);
     rb_class_inherited(super, klass);
+    rb_gc_register_mark_object(klass);
 
     return klass;
 }
 
 VALUE
-rb_module_new()
+rb_module_new(void)
 {
-    NEWOBJ(mdl, struct RClass);
-    OBJSETUP(mdl, rb_cModule, T_MODULE);
+    VALUE mdl = class_alloc(T_MODULE, rb_cModule);
 
-    mdl->super = 0;
-    mdl->iv_tbl = 0;
-    mdl->m_tbl = 0;
-    mdl->m_tbl = st_init_numtable();
+    RCLASS_M_TBL(mdl) = st_init_numtable();
 
     return (VALUE)mdl;
 }
 
 VALUE
-rb_define_module_id(id)
-    ID id;
+rb_define_module_id(ID id)
 {
     VALUE mdl;
 
@@ -326,8 +554,7 @@ rb_define_module_id(id)
 }
 
 VALUE
-rb_define_module(name)
-    const char *name;
+rb_define_module(const char *name)
 {
     VALUE module;
     ID id;
@@ -347,14 +574,16 @@ rb_define_module(name)
 }
 
 VALUE
-rb_define_module_under(outer, name)
-    VALUE outer;
-    const char *name;
+rb_define_module_under(VALUE outer, const char *name)
+{
+    return rb_define_module_id_under(outer, rb_intern(name));
+}
+
+VALUE
+rb_define_module_id_under(VALUE outer, ID id)
 {
     VALUE module;
-    ID id;
 
-    id = rb_intern(name);
     if (rb_const_defined_at(outer, id)) {
 	module = rb_const_get_at(outer, id);
 	if (TYPE(module) == T_MODULE)
@@ -364,27 +593,26 @@ rb_define_module_under(outer, name)
     }
     module = rb_define_module_id(id);
     rb_const_set(outer, id, module);
-    rb_set_class_path(module, outer, name);
+    rb_set_class_path_string(module, outer, rb_id2str(id));
+    rb_gc_register_mark_object(module);
 
     return module;
 }
 
 static VALUE
-include_class_new(module, super)
-    VALUE module, super;
+include_class_new(VALUE module, VALUE super)
 {
-    NEWOBJ(klass, struct RClass);
-    OBJSETUP(klass, rb_cClass, T_ICLASS);
+    VALUE klass = class_alloc(T_ICLASS, rb_cClass);
 
     if (BUILTIN_TYPE(module) == T_ICLASS) {
 	module = RBASIC(module)->klass;
     }
-    if (!RCLASS(module)->iv_tbl) {
-	RCLASS(module)->iv_tbl = st_init_numtable();
+    if (!RCLASS_IV_TBL(module)) {
+	RCLASS_IV_TBL(module) = st_init_numtable();
     }
-    klass->iv_tbl = RCLASS(module)->iv_tbl;
-    klass->m_tbl = RCLASS(module)->m_tbl;
-    klass->super = super;
+    RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
+    RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
+    RCLASS_SUPER(klass) = super;
     if (TYPE(module) == T_ICLASS) {
 	RBASIC(klass)->klass = RBASIC(module)->klass;
     }
@@ -398,17 +626,16 @@ include_class_new(module, super)
 }
 
 void
-rb_include_module(klass, module)
-    VALUE klass, module;
+rb_include_module(VALUE klass, VALUE module)
 {
     VALUE p, c;
     int changed = 0;
 
     rb_frozen_class_p(klass);
-    if (!OBJ_TAINTED(klass)) {
+    if (!OBJ_UNTRUSTED(klass)) {
 	rb_secure(4);
     }
-    
+
     if (TYPE(module) != T_MODULE) {
 	Check_Type(module, T_MODULE);
     }
@@ -416,30 +643,30 @@ rb_include_module(klass, module)
     OBJ_INFECT(klass, module);
     c = klass;
     while (module) {
-	int superclass_seen = Qfalse;
+	int superclass_seen = FALSE;
 
-	if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl)
+	if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
 	    rb_raise(rb_eArgError, "cyclic include detected");
 	/* ignore if the module included already in superclasses */
-	for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
+	for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
 	    switch (BUILTIN_TYPE(p)) {
 	      case T_ICLASS:
-		if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
+		if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
 		    if (!superclass_seen) {
-			c = p;	/* move insertion point */
+			c = p;  /* move insertion point */
 		    }
 		    goto skip;
 		}
 		break;
 	      case T_CLASS:
-		superclass_seen = Qtrue;
+		superclass_seen = TRUE;
 		break;
 	    }
 	}
-	c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);
+	c = RCLASS_SUPER(c) = include_class_new(module, RCLASS_SUPER(c));
 	changed = 1;
       skip:
-	module = RCLASS(module)->super;
+	module = RCLASS_SUPER(module);
     }
     if (changed) rb_clear_cache();
 }
@@ -447,28 +674,27 @@ rb_include_module(klass, module)
 /*
  *  call-seq:
  *     mod.included_modules -> array
- *  
+ *
  *  Returns the list of modules included in <i>mod</i>.
- *     
+ *
  *     module Mixin
  *     end
- *     
+ *
  *     module Outer
  *       include Mixin
  *     end
- *     
+ *
  *     Mixin.included_modules   #=> []
  *     Outer.included_modules   #=> [Mixin]
  */
 
 VALUE
-rb_mod_included_modules(mod)
-    VALUE mod;
+rb_mod_included_modules(VALUE mod)
 {
     VALUE ary = rb_ary_new();
     VALUE p;
 
-    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
+    for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    rb_ary_push(ary, RBASIC(p)->klass);
 	}
@@ -478,11 +704,11 @@ rb_mod_included_modules(mod)
 
 /*
  *  call-seq:
- *     mod.include?(module)    => true or false
- *  
+ *     mod.include?(module)    -> true or false
+ *
  *  Returns <code>true</code> if <i>module</i> is included in
  *  <i>mod</i> or one of <i>mod</i>'s ancestors.
- *     
+ *
  *     module A
  *     end
  *     class B
@@ -496,14 +722,12 @@ rb_mod_included_modules(mod)
  */
 
 VALUE
-rb_mod_include_p(mod, mod2)
-    VALUE mod;
-    VALUE mod2;
+rb_mod_include_p(VALUE mod, VALUE mod2)
 {
     VALUE p;
 
     Check_Type(mod2, T_MODULE);
-    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
+    for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    if (RBASIC(p)->klass == mod2) return Qtrue;
 	}
@@ -514,26 +738,25 @@ rb_mod_include_p(mod, mod2)
 /*
  *  call-seq:
  *     mod.ancestors -> array
- *  
+ *
  *  Returns a list of modules included in <i>mod</i> (including
  *  <i>mod</i> itself).
- *     
+ *
  *     module Mod
  *       include Math
  *       include Comparable
  *     end
- *     
+ *
  *     Mod.ancestors    #=> [Mod, Comparable, Math]
  *     Math.ancestors   #=> [Math]
  */
 
 VALUE
-rb_mod_ancestors(mod)
-    VALUE mod;
+rb_mod_ancestors(VALUE mod)
 {
     VALUE p, ary = rb_ary_new();
 
-    for (p = mod; p; p = RCLASS(p)->super) {
+    for (p = mod; p; p = RCLASS_SUPER(p)) {
 	if (FL_TEST(p, FL_SINGLETON))
 	    continue;
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
@@ -550,13 +773,10 @@ rb_mod_ancestors(mod)
 #define VISI_CHECK(x,f) (VISI(x) == (f))
 
 static int
-ins_methods_push(name, type, ary, visi)
-    ID name;
-    long type;
-    VALUE ary;
-    long visi;
+ins_methods_push(ID name, long type, VALUE ary, long visi)
 {
     if (type == -1) return ST_CONTINUE;
+
     switch (visi) {
       case NOEX_PRIVATE:
       case NOEX_PROTECTED:
@@ -568,77 +788,65 @@ ins_methods_push(name, type, ary, visi)
 	break;
     }
     if (visi) {
-	rb_ary_push(ary, rb_str_new2(rb_id2name(name)));
+	rb_ary_push(ary, ID2SYM(name));
     }
     return ST_CONTINUE;
 }
 
 static int
-ins_methods_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_i(ID name, long type, VALUE ary)
 {
     return ins_methods_push(name, type, ary, -1); /* everything but private */
 }
 
 static int
-ins_methods_prot_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_prot_i(ID name, long type, VALUE ary)
 {
     return ins_methods_push(name, type, ary, NOEX_PROTECTED);
 }
 
 static int
-ins_methods_priv_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_priv_i(ID name, long type, VALUE ary)
 {
     return ins_methods_push(name, type, ary, NOEX_PRIVATE);
 }
 
 static int
-ins_methods_pub_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_pub_i(ID name, long type, VALUE ary)
 {
     return ins_methods_push(name, type, ary, NOEX_PUBLIC);
 }
 
 static int
-method_entry(key, body, list)
-    ID key;
-    NODE *body;
-    st_table *list;
+method_entry(ID key, const rb_method_entry_t *me, st_table *list)
 {
     long type;
 
-    if (key == ID_ALLOCATOR) return ST_CONTINUE;
+    if (key == ID_ALLOCATOR) {
+	return ST_CONTINUE;
+    }
+
     if (!st_lookup(list, key, 0)) {
-	if (!body->nd_body) type = -1; /* none */
-	else type = VISI(body->nd_noex);
+	if (UNDEFINED_METHOD_ENTRY_P(me)) {
+	    type = -1; /* none */
+	}
+	else {
+	    type = VISI(me->flag);
+	}
 	st_add_direct(list, key, type);
     }
     return ST_CONTINUE;
 }
 
 static VALUE
-class_instance_method_list(argc, argv, mod, func)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-    int (*func) _((ID, long, VALUE));
+class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func) (ID, long, VALUE))
 {
     VALUE ary;
     int recur;
     st_table *list;
 
     if (argc == 0) {
-	recur = Qtrue;
+	recur = TRUE;
     }
     else {
 	VALUE r;
@@ -647,10 +855,10 @@ class_instance_method_list(argc, argv, mod, func)
     }
 
     list = st_init_numtable();
-    for (; mod; mod = RCLASS(mod)->super) {
-	st_foreach(RCLASS(mod)->m_tbl, method_entry, (st_data_t)list);
+    for (; mod; mod = RCLASS_SUPER(mod)) {
+	st_foreach(RCLASS_M_TBL(mod), method_entry, (st_data_t)list);
 	if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
-	if (FL_TEST(mod, FL_SINGLETON)) continue;
+	if (obj && FL_TEST(mod, FL_SINGLETON)) continue;
 	if (!recur) break;
     }
     ary = rb_ary_new();
@@ -662,15 +870,15 @@ class_instance_method_list(argc, argv, mod, func)
 
 /*
  *  call-seq:
- *     mod.instance_methods(include_super=true)   => array
- *  
- *  Returns an array containing the names of public instance methods in
- *  the receiver. For a module, these are the public methods; for a
- *  class, they are the instance (not singleton) methods. With no
+ *     mod.instance_methods(include_super=true)   -> array
+ *
+ *  Returns an array containing the names of the public and protected instance
+ *  methods in the receiver. For a module, these are the public and protected methods;
+ *  for a class, they are the instance (not singleton) methods. With no
  *  argument, or with an argument that is <code>false</code>, the
  *  instance methods in <i>mod</i> are returned, otherwise the methods
  *  in <i>mod</i> and <i>mod</i>'s superclasses are returned.
- *     
+ *
  *     module A
  *       def method1()  end
  *     end
@@ -680,139 +888,213 @@ class_instance_method_list(argc, argv, mod, func)
  *     class C < B
  *       def method3()  end
  *     end
- *     
- *     A.instance_methods                #=> ["method1"]
- *     B.instance_methods(false)         #=> ["method2"]
- *     C.instance_methods(false)         #=> ["method3"]
+ *
+ *     A.instance_methods                #=> [:method1]
+ *     B.instance_methods(false)         #=> [:method2]
+ *     C.instance_methods(false)         #=> [:method3]
  *     C.instance_methods(true).length   #=> 43
  */
 
 VALUE
-rb_class_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_i);
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_i);
 }
 
 /*
  *  call-seq:
- *     mod.protected_instance_methods(include_super=true)   => array
- *  
+ *     mod.protected_instance_methods(include_super=true)   -> array
+ *
  *  Returns a list of the protected instance methods defined in
  *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
  *  methods of any ancestors are included.
  */
 
 VALUE
-rb_class_protected_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_prot_i);
 }
 
 /*
  *  call-seq:
- *     mod.private_instance_methods(include_super=true)    => array
- *  
+ *     mod.private_instance_methods(include_super=true)    -> array
+ *
  *  Returns a list of the private instance methods defined in
  *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
  *  methods of any ancestors are included.
- *     
+ *
  *     module Mod
  *       def method1()  end
  *       private :method1
  *       def method2()  end
  *     end
- *     Mod.instance_methods           #=> ["method2"]
- *     Mod.private_instance_methods   #=> ["method1"]
+ *     Mod.instance_methods           #=> [:method2]
+ *     Mod.private_instance_methods   #=> [:method1]
  */
 
 VALUE
-rb_class_private_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_priv_i);
 }
 
 /*
  *  call-seq:
- *     mod.public_instance_methods(include_super=true)   => array
- *  
+ *     mod.public_instance_methods(include_super=true)   -> array
+ *
  *  Returns a list of the public instance methods defined in <i>mod</i>.
  *  If the optional parameter is not <code>false</code>, the methods of
  *  any ancestors are included.
  */
 
 VALUE
-rb_class_public_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
+{
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_pub_i);
+}
+
+/*
+ *  call-seq:
+ *     obj.methods    -> array
+ *
+ *  Returns a list of the names of methods publicly accessible in
+ *  <i>obj</i>. This will include all the methods accessible in
+ *  <i>obj</i>'s ancestors.
+ *
+ *     class Klass
+ *       def kMethod()
+ *       end
+ *     end
+ *     k = Klass.new
+ *     k.methods[0..9]    #=> [:kMethod, :freeze, :nil?, :is_a?,
+ *                        #    :class, :instance_variable_set,
+ *                        #    :methods, :extend, :__send__, :instance_eval]
+ *     k.methods.length   #=> 42
+ */
+
+VALUE
+rb_obj_methods(int argc, VALUE *argv, VALUE obj)
+{
+  retry:
+    if (argc == 0) {
+	VALUE args[1];
+
+	args[0] = Qtrue;
+	return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_i);
+    }
+    else {
+	VALUE recur;
+
+	rb_scan_args(argc, argv, "1", &recur);
+	if (RTEST(recur)) {
+	    argc = 0;
+	    goto retry;
+	}
+	return rb_obj_singleton_methods(argc, argv, obj);
+    }
+}
+
+/*
+ *  call-seq:
+ *     obj.protected_methods(all=true)   -> array
+ *
+ *  Returns the list of protected methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+VALUE
+rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj)
+{
+    return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_prot_i);
+}
+
+/*
+ *  call-seq:
+ *     obj.private_methods(all=true)   -> array
+ *
+ *  Returns the list of private methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+VALUE
+rb_obj_private_methods(int argc, VALUE *argv, VALUE obj)
+{
+    return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_priv_i);
+}
+
+/*
+ *  call-seq:
+ *     obj.public_methods(all=true)   -> array
+ *
+ *  Returns the list of public methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+VALUE
+rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
+    return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_pub_i);
 }
 
 /*
  *  call-seq:
- *     obj.singleton_methods(all=true)    => array
- *  
+ *     obj.singleton_methods(all=true)    -> array
+ *
  *  Returns an array of the names of singleton methods for <i>obj</i>.
  *  If the optional <i>all</i> parameter is true, the list will include
  *  methods in modules included in <i>obj</i>.
- *     
+ *  Only public and protected singleton methods are returned.
+ *
  *     module Other
  *       def three() end
  *     end
- *     
+ *
  *     class Single
  *       def Single.four() end
  *     end
- *     
+ *
  *     a = Single.new
- *     
+ *
  *     def a.one()
  *     end
- *     
+ *
  *     class << a
  *       include Other
  *       def two()
  *       end
  *     end
- *     
- *     Single.singleton_methods    #=> ["four"]
- *     a.singleton_methods(false)  #=> ["two", "one"]
- *     a.singleton_methods         #=> ["two", "one", "three"]
+ *
+ *     Single.singleton_methods    #=> [:four]
+ *     a.singleton_methods(false)  #=> [:two, :one]
+ *     a.singleton_methods         #=> [:two, :one, :three]
  */
 
 VALUE
-rb_obj_singleton_methods(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
 {
     VALUE recur, ary, klass;
     st_table *list;
 
-    rb_scan_args(argc, argv, "01", &recur);
     if (argc == 0) {
 	recur = Qtrue;
     }
+    else {
+	rb_scan_args(argc, argv, "01", &recur);
+    }
     klass = CLASS_OF(obj);
     list = st_init_numtable();
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
-	st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
-	klass = RCLASS(klass)->super;
+	st_foreach(RCLASS_M_TBL(klass), method_entry, (st_data_t)list);
+	klass = RCLASS_SUPER(klass);
     }
     if (RTEST(recur)) {
 	while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
-	    st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
-	    klass = RCLASS(klass)->super;
+	    st_foreach(RCLASS_M_TBL(klass), method_entry, (st_data_t)list);
+	    klass = RCLASS_SUPER(klass);
 	}
     }
     ary = rb_ary_new();
@@ -822,67 +1104,119 @@ rb_obj_singleton_methods(argc, argv, obj)
     return ary;
 }
 
+/*!
+ * \}
+ */
+/*!
+ * \defgroup defmethod Defining methods
+ * There are some APIs to define a method from C.
+ * These API takes a C function as a method body.
+ *
+ * \par Method body functions
+ * Method body functions must return a VALUE and
+ * can be one of the following form:
+ * <dl>
+ * <dt>Fixed number of parameters</dt>
+ * <dd>
+ *     This form is a normal C function, excepting it takes
+ *     a receiver object as the first argument.
+ *
+ *     \code
+ *     static VALUE my_method(VALUE self, VALUE x, VALUE y);
+ *     \endcode
+ * </dd>
+ * <dt>argc and argv style</dt>
+ * <dd>
+ *     This form takes three parameters: \a argc, \a argv and \a self.
+ *     \a self is the receiver. \a argc is the number of arguments.
+ *     \a argv is a pointer to an array of the arguments.
+ *
+ *     \code
+ *     static VALUE my_method(int argc, VALUE *argv, VALUE self);
+ *     \endcode
+ * </dd>
+ * <dt>Ruby array style</dt>
+ * <dd>
+ *     This form takes two parameters: self and args.
+ *     \a self is the receiver. \a args is an Array object which
+ *     contains the arguments.
+ *
+ *     \code
+ *     static VALUE my_method(VALUE self, VALUE args);
+ *     \endcode
+ * </dd>
+ *
+ * \par Number of parameters
+ * Method defining APIs takes the number of parameters which the
+ * method will takes. This number is called \a argc.
+ * \a argc can be:
+ * <dl>
+ * <dt>zero or positive number</dt>
+ * <dd>This means the method body function takes a fixed number of parameters</dd>
+ * <dt>-1</dt>
+ * <dd>This means the method body function is "argc and argv" style.</dd>
+ * <dt>-2</dt>
+ * <dd>This means the method body function is "self and args" style.</dd>
+ * </dl>
+ * \{
+ */
+
 void
-rb_define_method_id(klass, name, func, argc)
-    VALUE klass;
-    ID name;
-    VALUE (*func)();
-    int argc;
+rb_define_method_id(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
+    rb_add_method_cfunc(klass, mid, func, argc, NOEX_PUBLIC);
 }
 
 void
-rb_define_method(klass, name, func, argc)
-    VALUE klass;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    ID id = rb_intern(name);
-    int ex = NOEX_PUBLIC;
-
-
-    rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PUBLIC);
 }
 
 void
-rb_define_protected_method(klass, name, func, argc)
-    VALUE klass;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_protected_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PROTECTED);
 }
 
 void
-rb_define_private_method(klass, name, func, argc)
-    VALUE klass;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PRIVATE);
 }
 
 void
-rb_undef_method(klass, name)
-    VALUE klass;
-    const char *name;
+rb_undef_method(VALUE klass, const char *name)
 {
-    rb_add_method(klass, rb_intern(name), 0, NOEX_UNDEF);
+    rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, NOEX_UNDEF);
 }
 
+/*!
+ * \}
+ */
+/*!
+ * \addtogroup class
+ * \{
+ */
+
 #define SPECIAL_SINGLETON(x,c) do {\
     if (obj == (x)) {\
 	return c;\
     }\
 } while (0)
 
-VALUE
-rb_singleton_class(obj)
-    VALUE obj;
+
+/*!
+ * \internal
+ * Returns the singleton class of \a obj. Creates it if necessary.
+ *
+ * \note DO NOT expose the returned singleton class to
+ *       outside of class.c.
+ *       Use \ref rb_singleton_class instead for
+ *       consistency of the metaclass hierarchy.
+ */
+static VALUE
+singleton_class_of(VALUE obj)
 {
     VALUE klass;
 
@@ -896,165 +1230,258 @@ rb_singleton_class(obj)
 	rb_bug("unknown immediate %ld", obj);
     }
 
-    DEFER_INTS;
     if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
-	rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) {
+	rb_ivar_get(RBASIC(obj)->klass, id_attached) == obj) {
 	klass = RBASIC(obj)->klass;
     }
     else {
 	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
     }
+
     if (OBJ_TAINTED(obj)) {
 	OBJ_TAINT(klass);
     }
     else {
 	FL_UNSET(klass, FL_TAINT);
     }
+    if (OBJ_UNTRUSTED(obj)) {
+	OBJ_UNTRUST(klass);
+    }
+    else {
+	FL_UNSET(klass, FL_UNTRUSTED);
+    }
     if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
-    ALLOW_INTS;
 
     return klass;
 }
 
+
+/*!
+ * Returns the singleton class of \a obj. Creates it if necessary.
+ *
+ * \param obj an arbitrary object.
+ * \throw TypeError if \a obj is a Fixnum or a Symbol.
+ * \return the singleton class.
+ *
+ * \post \a obj has its own singleton class.
+ * \post if \a obj is a class,
+ *       the returned singleton class also has its own
+ *       singleton class in order to keep consistency of the
+ *       inheritance structure of metaclasses.
+ * \note a new singleton class will be created
+ *       if \a obj does not have it.
+ * \note the singleton classes for nil, true and false are:
+ *       NilClass, TrueClass and FalseClass.
+ */
+VALUE
+rb_singleton_class(VALUE obj)
+{
+    VALUE klass = singleton_class_of(obj);
+
+    /* ensures an exposed class belongs to its own eigenclass */
+    if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass);
+
+    return klass;
+}
+
+/*!
+ * \}
+ */
+
+/*!
+ * \addtogroup defmethod
+ * \{
+ */
+
+/*!
+ * Defines a singleton method for \a obj.
+ * \param obj    an arbitrary object
+ * \param name   name of the singleton method
+ * \param func   the method body
+ * \param argc   the number of parameters, or -1 or -2. see \ref defmethod.
+ */
 void
-rb_define_singleton_method(obj, name, func, argc)
-    VALUE obj;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_define_method(rb_singleton_class(obj), name, func, argc);
+    rb_define_method(singleton_class_of(obj), name, func, argc);
 }
 
+
+
+/*!
+ * Defines a module function for \a module.
+ * \param module  an module or a class.
+ * \param name    name of the function
+ * \param func    the method body
+ * \param argc    the number of parameters, or -1 or -2. see \ref defmethod.
+ */
 void
-rb_define_module_function(module, name, func, argc)
-    VALUE module;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_module_function(VALUE module, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
     rb_define_private_method(module, name, func, argc);
     rb_define_singleton_method(module, name, func, argc);
 }
 
+
+/*!
+ * Defines a global function
+ * \param name    name of the function
+ * \param func    the method body
+ * \param argc    the number of parameters, or -1 or -2. see \ref defmethod.
+ */
 void
-rb_define_global_function(name, func, argc)
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), int argc)
 {
     rb_define_module_function(rb_mKernel, name, func, argc);
 }
 
+
+/*!
+ * Defines an alias of a method.
+ * \param klass  the class which the original method belongs to
+ * \param name1  a new name for the method
+ * \param name2  the original name of the method
+ */
 void
-rb_define_alias(klass, name1, name2)
-    VALUE klass;
-    const char *name1, *name2;
+rb_define_alias(VALUE klass, const char *name1, const char *name2)
 {
     rb_alias(klass, rb_intern(name1), rb_intern(name2));
 }
 
+/*!
+ * Defines (a) public accessor method(s) for an attribute.
+ * \param klass  the class which the attribute will belongs to
+ * \param name   name of the attribute
+ * \param read   a getter method for the attribute will be defined if \a read is non-zero.
+ * \param write  a setter method for the attribute will be defined if \a write is non-zero.
+ */
 void
-rb_define_attr(klass, name, read, write)
-    VALUE klass;
-    const char *name;
-    int read, write;
+rb_define_attr(VALUE klass, const char *name, int read, int write)
+{
+    rb_attr(klass, rb_intern(name), read, write, FALSE);
+}
+
+int
+rb_obj_basic_to_s_p(VALUE obj)
 {
-    rb_attr(klass, rb_intern(name), read, write, Qfalse);
+    const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"));
+    if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC &&
+	me->def->body.cfunc.func == rb_any_to_s)
+	return 1;
+    return 0;
 }
 
-#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
 
 int
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
-#else
-rb_scan_args(argc, argv, fmt, va_alist)
-    int argc;
-    const VALUE *argv;
-    const char *fmt;
-    va_dcl
-#endif
 {
-    int n, i = 0;
+    int i;
     const char *p = fmt;
     VALUE *var;
     va_list vargs;
-
-    va_init_list(vargs, fmt);
-
-    if (*p == '*') goto rest_arg;
+    int f_var = 0, f_block = 0;
+    int n_lead = 0, n_opt = 0, n_trail = 0, n_mand;
+    int argi = 0;
 
     if (ISDIGIT(*p)) {
-	n = *p - '0';
-	if (n > argc)
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
-	for (i=0; i<n; i++) {
-	    var = va_arg(vargs, VALUE*);
-	    if (var) *var = argv[i];
+	n_lead = *p - '0';
+	p++;
+	if (ISDIGIT(*p)) {
+	    n_opt = *p - '0';
+	    p++;
+	    if (ISDIGIT(*p)) {
+		n_trail = *p - '0';
+		p++;
+		goto block_arg;
+	    }
 	}
+    }
+    if (*p == '*') {
+	f_var = 1;
 	p++;
+	if (ISDIGIT(*p)) {
+	    n_trail = *p - '0';
+	    p++;
+	}
     }
-    else {
-	goto error;
+  block_arg:
+    if (*p == '&') {
+	f_block = 1;
+	p++;
     }
+    if (*p != '\0') {
+	rb_fatal("bad scan arg format: %s", fmt);
+    }
+    n_mand = n_lead + n_trail;
 
-    if (ISDIGIT(*p)) {
-	n = i + *p - '0';
-	for (; i<n; i++) {
-	    var = va_arg(vargs, VALUE*);
-	    if (argc > i) {
-		if (var) *var = argv[i];
-	    }
-	    else {
-		if (var) *var = Qnil;
-	    }
+    if (argc < n_mand)
+	goto argc_error;
+
+    va_start(vargs, fmt);
+
+    /* capture leading mandatory arguments */
+    for (i = n_lead; i-- > 0; ) {
+	var = va_arg(vargs, VALUE *);
+	if (var) *var = argv[argi];
+	argi++;
+    }
+    /* capture optional arguments */
+    for (i = n_opt; i-- > 0; ) {
+	var = va_arg(vargs, VALUE *);
+	if (argi < argc - n_trail) {
+	    if (var) *var = argv[argi];
+	    argi++;
+	}
+	else {
+	    if (var) *var = Qnil;
 	}
-	p++;
     }
-
-    if(*p == '*') {
-      rest_arg:
-	var = va_arg(vargs, VALUE*);
-	if (argc > i) {
-	    if (var) *var = rb_ary_new4(argc-i, argv+i);
-	    i = argc;
+    /* capture variable length arguments */
+    if (f_var) {
+	int n_var = argc - argi - n_trail;
+
+	var = va_arg(vargs, VALUE *);
+	if (0 < n_var) {
+	    if (var) *var = rb_ary_new4(n_var, &argv[argi]);
+	    argi += n_var;
 	}
 	else {
 	    if (var) *var = rb_ary_new();
 	}
-	p++;
     }
-
-    if (*p == '&') {
-	var = va_arg(vargs, VALUE*);
+    /* capture trailing mandatory arguments */
+    for (i = n_trail; i-- > 0; ) {
+	var = va_arg(vargs, VALUE *);
+	if (var) *var = argv[argi];
+	argi++;
+    }
+    /* capture iterator block */
+    if (f_block) {
+	var = va_arg(vargs, VALUE *);
 	if (rb_block_given_p()) {
 	    *var = rb_block_proc();
 	}
 	else {
 	    *var = Qnil;
 	}
-	p++;
     }
     va_end(vargs);
 
-    if (*p != '\0') {
-	goto error;
-    }
-
-    if (argc > i) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i);
-    }
+    if (argi < argc)
+	goto argc_error;
 
     return argc;
 
-  error:
-    rb_fatal("bad scan arg format: %s", fmt);
-    return 0;
+  argc_error:
+    if (0 < n_opt)
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d..%d%s)",
+		 argc, n_mand, n_mand + n_opt, f_var ? "+" : "");
+    else
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d%s)",
+		 argc, n_mand, f_var ? "+" : "");
 }
+
+/*!
+ * \}
+ */
diff --git a/common.mk b/common.mk
index f751fecfb5..e572825d68 100644
--- a/common.mk
+++ b/common.mk
@@ -2,29 +2,45 @@ bin: $(PROGRAM) $(WPROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-RUBYOPT       =
+.SUFFIXES: .inc .h .c .y .i
+
+RUBYLIB       = -
+RUBYOPT       = -
+
+SPEC_GIT_BASE = git://github.com/rubyspec
+MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
+RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
 
 STATIC_RUBY   = static-ruby
 
 EXTCONF       = extconf.rb
 RBCONFIG      = ./.rbconfig.time
 LIBRUBY_EXTS  = ./.libruby-with-ext.time
+REVISION_H    = ./.revision.time
 RDOCOUT       = $(EXTOUT)/rdoc
+ID_H_TARGET   = -id.h-
 
 DMYEXT	      = dmyext.$(OBJEXT)
-MAINOBJ	      = main.$(OBJEXT)
+NORMALMAINOBJ = main.$(OBJEXT)
+MAINOBJ       = $(NORMALMAINOBJ)
 EXTOBJS	      = 
 DLDOBJS	      = $(DMYEXT)
+MINIOBJS      = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT)
+ENC_MK        = enc.mk
 
-OBJS	      = array.$(OBJEXT) \
+COMMONOBJS    = array.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
+		complex.$(OBJEXT) \
 		dir.$(OBJEXT) \
-		dln.$(OBJEXT) \
+		dln_find.$(OBJEXT) \
 		enum.$(OBJEXT) \
+		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
 		eval.$(OBJEXT) \
+		load.$(OBJEXT) \
+		proc.$(OBJEXT) \
 		file.$(OBJEXT) \
 		gc.$(OBJEXT) \
 		hash.$(OBJEXT) \
@@ -32,35 +48,71 @@ OBJS	      = array.$(OBJEXT) \
 		io.$(OBJEXT) \
 		marshal.$(OBJEXT) \
 		math.$(OBJEXT) \
+		node.$(OBJEXT) \
 		numeric.$(OBJEXT) \
 		object.$(OBJEXT) \
 		pack.$(OBJEXT) \
 		parse.$(OBJEXT) \
 		process.$(OBJEXT) \
-		prec.$(OBJEXT) \
 		random.$(OBJEXT) \
 		range.$(OBJEXT) \
+		rational.$(OBJEXT) \
 		re.$(OBJEXT) \
-		regex.$(OBJEXT) \
+		regcomp.$(OBJEXT) \
+		regenc.$(OBJEXT) \
+		regerror.$(OBJEXT) \
+		regexec.$(OBJEXT) \
+		regparse.$(OBJEXT) \
+		regsyntax.$(OBJEXT) \
 		ruby.$(OBJEXT) \
+		safe.$(OBJEXT) \
 		signal.$(OBJEXT) \
 		sprintf.$(OBJEXT) \
 		st.$(OBJEXT) \
+		strftime.$(OBJEXT) \
 		string.$(OBJEXT) \
 		struct.$(OBJEXT) \
 		time.$(OBJEXT) \
+		transcode.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
-		version.$(OBJEXT) \
+		compile.$(OBJEXT) \
+		debug.$(OBJEXT) \
+		iseq.$(OBJEXT) \
+		vm.$(OBJEXT) \
+		vm_dump.$(OBJEXT) \
+		thread.$(OBJEXT) \
+		cont.$(OBJEXT) \
+		$(BUILTIN_ENCOBJS) \
+		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
 
+EXPORTOBJS    = dln.$(OBJEXT) \
+		encoding.$(OBJEXT) \
+		version.$(OBJEXT) \
+		$(COMMONOBJS)
+
+OBJS          = $(EXPORTOBJS) prelude.$(OBJEXT)
+
+GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
+
+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
+PRELUDES      = prelude.c miniprelude.c
+GOLFPRELUDES = golf_prelude.c
+
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--extout="$(EXTOUT)" \
-		--make="$(MAKE)" \
 		--mflags="$(MFLAGS)" \
 		--make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
-INSTRUBY_ARGS =	$(SCRIPT_ARGS) --installed-list $(INSTALLED_LIST)
+EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
+		--make-flags="MINIRUBY='$(MINIRUBY)'" --
+INSTRUBY      =	$(MINIRUBY) $(srcdir)/tool/rbinstall.rb
+INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
+		--data-mode=$(INSTALL_DATA_MODE) \
+		--prog-mode=$(INSTALL_PROG_MODE) \
+		--installed-list $(INSTALLED_LIST)
+INSTALL_PROG_MODE = 0755
+INSTALL_DATA_MODE = 0644
 
 PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
 			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
@@ -68,17 +120,51 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
 TESTSDIR      = $(srcdir)/test
 TESTWORKDIR   = testwork
 
-all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
-	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
+TESTRUN_SCRIPT = $(srcdir)/test.rb
+
+BOOTSTRAPRUBY = $(BASERUBY)
+
+COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
+
+all: main docs
+
+main: encs exts
+	@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
+
+exts: $(MKMAIN_CMD)
+
+$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
+	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
+
 prog: $(PROGRAM) $(WPROGRAM)
 
-miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
+loadpath: $(PREP) PHONY
+	$(MINIRUBY) -e 'p $$:'
+
+$(PREP): $(MKFILES)
+
+miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)
+
+GORUBY = go$(RUBY_INSTALL_NAME)
+golf: $(LIBRUBY) $(GOLFOBJS) PHONY
+	$(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
+capi: doc/capi/.timestamp PHONY
+doc/capi/.timestamp: Doxyfile $(PREP) 
+	@$(MAKEDIRS) doc/capi
+	@$(DOXYGEN)
+	$(MINIRUBY) -e 'File.open("doc/capi/.timestamp", "w"){|f| f.puts(Time.now)}'
+
+Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
+	$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
+	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
+
+program: $(PROGRAM)
 
 $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
 
 $(LIBRUBY_A):	$(OBJS) $(DMYEXT) $(ARCHFILE)
 
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
 
 $(LIBRUBY_EXTS):
 	@exit > $@
@@ -87,224 +173,323 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 	@$(RM) $@
 	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
-ruby.imp: $(OBJS)
-	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(EXPORTOBJS)
+	@$(NM) -Pgp $(EXPORTOBJS) | \
+	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \
+	sort -u -o $@
 
-install: install-nodoc $(RDOCTARGET)
-install-all: install-nodoc install-doc
+install: install-$(INSTALLDOC)
+docs: $(DOCTARGETS)
+
+install-all: docs pre-install-all do-install-all post-install-all
+pre-install-all:: pre-install-local pre-install-ext pre-install-doc
+do-install-all: $(PROGRAM)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
+post-install-all:: post-install-local post-install-ext post-install-doc
+	@$(NULLCMD)
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
 pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc: 
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+do-install-nodoc: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
 post-install-nodoc:: post-install-local post-install-ext
 
 install-local: pre-install-local do-install-local post-install-local
 pre-install-local:: pre-install-bin pre-install-lib pre-install-man
-do-install-local:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+do-install-local: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
 post-install-local:: post-install-bin post-install-lib post-install-man
 
 install-ext: pre-install-ext do-install-ext post-install-ext
 pre-install-ext:: pre-install-ext-arch pre-install-ext-comm
-do-install-ext:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext
+do-install-ext: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
 post-install-ext:: post-install-ext-arch post-install-ext-comm
 
 install-arch: pre-install-arch do-install-arch post-install-arch
 pre-install-arch:: pre-install-bin pre-install-ext-arch
-do-install-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+do-install-arch: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
 post-install-arch:: post-install-bin post-install-ext-arch
 
 install-comm: pre-install-comm do-install-comm post-install-comm
 pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man
-do-install-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+do-install-comm: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
 post-install-comm:: post-install-lib post-install-ext-comm post-install-man
 
 install-bin: pre-install-bin do-install-bin post-install-bin
 pre-install-bin:: install-prereq
-do-install-bin:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin
+do-install-bin: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
 post-install-bin::
 	@$(NULLCMD)
 
 install-lib: pre-install-lib do-install-lib post-install-lib
 pre-install-lib:: install-prereq
-do-install-lib:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib
+do-install-lib: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
 post-install-lib::
 	@$(NULLCMD)
 
 install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
 pre-install-ext-comm:: install-prereq
-do-install-ext-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-comm
+do-install-ext-comm: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
 post-install-ext-comm::
 	@$(NULLCMD)
 
 install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch
 pre-install-ext-arch:: install-prereq
-do-install-ext-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-arch
+do-install-ext-arch: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
 post-install-ext-arch::
 	@$(NULLCMD)
 
 install-man: pre-install-man do-install-man post-install-man
 pre-install-man:: install-prereq
-do-install-man:
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+do-install-man: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
 post-install-man::
 	@$(NULLCMD)
 
+install-capi: capi pre-install-capi do-install-capi post-install-capi
+pre-install-capi:: install-prereq
+do-install-capi: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=capi
+post-install-capi::
+	@$(NULLCMD)
+
 what-where: no-install
-no-install: no-install-nodoc no-install-doc
+no-install: no-install-$(INSTALLDOC)
 what-where-all: no-install-all
-no-install-all: no-install-nodoc
+no-install-all: pre-no-install-all dont-install-all post-no-install-all
+pre-no-install-all:: pre-no-install-local pre-no-install-ext pre-no-install-doc
+dont-install-all: $(PROGRAM)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
+post-no-install-all:: post-no-install-local post-no-install-ext post-no-install-doc
+	@$(NULLCMD)
 
 what-where-nodoc: no-install-nodoc
 no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
 pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
-dont-install-nodoc: 
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+dont-install-nodoc:  $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
 post-no-install-nodoc:: post-no-install-local post-no-install-ext
 
 what-where-local: no-install-local
 no-install-local: pre-no-install-local dont-install-local post-no-install-local
 pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man
-dont-install-local:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+dont-install-local: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
 post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
 
 what-where-ext: no-install-ext
 no-install-ext: pre-no-install-ext dont-install-ext post-no-install-ext
 pre-no-install-ext:: pre-no-install-ext-arch pre-no-install-ext-comm
-dont-install-ext:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext
+dont-install-ext: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
 post-no-install-ext:: post-no-install-ext-arch post-no-install-ext-comm
 
 what-where-arch: no-install-arch
 no-install-arch: pre-no-install-arch dont-install-arch post-no-install-arch
 pre-no-install-arch:: pre-no-install-bin pre-no-install-ext-arch
-dont-install-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+dont-install-arch: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
 post-no-install-arch:: post-no-install-lib post-no-install-man post-no-install-ext-arch
 
 what-where-comm: no-install-comm
 no-install-comm: pre-no-install-comm dont-install-comm post-no-install-comm
 pre-no-install-comm:: pre-no-install-lib pre-no-install-ext-comm pre-no-install-man
-dont-install-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+dont-install-comm: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
 post-no-install-comm:: post-no-install-lib post-no-install-ext-comm post-no-install-man
 
 what-where-bin: no-install-bin
 no-install-bin: pre-no-install-bin dont-install-bin post-no-install-bin
 pre-no-install-bin:: install-prereq
-dont-install-bin:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin
+dont-install-bin: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
 post-no-install-bin::
 	@$(NULLCMD)
 
 what-where-lib: no-install-lib
 no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib
 pre-no-install-lib:: install-prereq
-dont-install-lib:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib
+dont-install-lib: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
 post-no-install-lib::
 	@$(NULLCMD)
 
 what-where-ext-comm: no-install-ext-comm
 no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm
 pre-no-install-ext-comm:: install-prereq
-dont-install-ext-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-comm
+dont-install-ext-comm: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
 post-no-install-ext-comm::
 	@$(NULLCMD)
 
 what-where-ext-arch: no-install-ext-arch
 no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch
 pre-no-install-ext-arch:: install-prereq
-dont-install-ext-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-arch
+dont-install-ext-arch: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
 post-no-install-ext-arch::
 	@$(NULLCMD)
 
 what-where-man: no-install-man
 no-install-man: pre-no-install-man dont-install-man post-no-install-man
 pre-no-install-man:: install-prereq
-dont-install-man:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+dont-install-man: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
 post-no-install-man::
 	@$(NULLCMD)
 
 install-doc: rdoc pre-install-doc do-install-doc post-install-doc
 pre-install-doc:: install-prereq
 do-install-doc: $(PROGRAM)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-install-doc::
 	@$(NULLCMD)
 
-rdoc: $(PROGRAM) PHONY
+rdoc: PHONY main
 	@echo Generating RDoc documentation
-	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
+	$(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
+nodoc: PHONY
 
 what-where-doc: no-install-doc
 no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
 pre-no-install-doc:: install-prereq
-dont-install-doc::
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+dont-install-doc:: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-no-install-doc::
 	@$(NULLCMD)
 
-install-prereq:
-	@exit > $(INSTALLED_LIST)
+CLEAR_INSTALLED_LIST = clear-installed-list
 
-clean: clean-ext clean-local
-clean-local::
-	@$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-clean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean
+install-prereq: $(CLEAR_INSTALLED_LIST) PHONY
 
-distclean: distclean-ext distclean-local
-distclean-local:: clean-local
-	@$(RM) $(MKFILES) config.h rbconfig.rb
-	@$(RM) config.cache config.log config.status
-	@$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP)
-distclean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean
+clear-installed-list: PHONY
+	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
-realclean:: distclean
-	@$(RM) parse.c lex.c
+clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
+clean-local:: PHONY
+	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
+	@$(RM) *.inc y.tab.c y.output encdb.h transdb.h
+clean-ext:: PHONY
+clean-golf: PHONY
+	@$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
+clean-rdoc: PHONY
+clean-extout: PHONY
+	@-$(RMDIRS) $(EXTOUT)/$(arch)
+
+distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
+distclean-local:: clean-local
+	@$(RM) $(MKFILES) rbconfig.rb yasmdata.rb encdb.h
+	@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
+	@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
+distclean-ext:: PHONY
+distclean-golf: clean-golf
+	@$(RM) $(GOLFPRELUDES)
+distclean-rdoc: PHONY
+distclean-extout: clean-extout
+	@-$(RMDIRS) $(EXTOUT)
+
+realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
+realclean-local:: distclean-local
+	@$(RM) parse.c parse.h lex.c newline.c revision.h id.h
+realclean-ext::
+realclean-golf: distclean-golf
+realclean-extout: distclean-extout
+
+clean-enc distclean-enc realclean-enc:
+	@echo $(@:-enc=ing) encodings
+	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
 
 check: test test-all
-
-test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
-	@$(MINIRUBY) $(srcdir)/rubytest.rb
-
-test-all:
-	$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
-
-extconf:
-	$(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)"
+check-ruby: test test-ruby
+
+btest: miniruby$(EXEEXT) $(TEST_RUNNABLE)-btest
+no-btest: PHONY
+yes-btest: PHONY
+	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
+
+btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-btest-ruby
+no-btest-ruby: PHONY
+yes-btest-ruby: PHONY
+	@$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
+
+test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-test-sample
+no-test-sample: PHONY
+yes-test-sample: PHONY
+	@$(RUNRUBY) $(srcdir)/tool/rubytest.rb
+
+test-knownbugs: test-knownbug
+test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) $(TEST_RUNNABLE)-test-knownbug
+no-test-knownbug: PHONY
+yes-test-knownbug: PHONY
+	-$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
+
+test: test-sample btest-ruby test-knownbug
+
+test-all: $(TEST_RUNNABLE)-test-all
+no-test-all: PHONY
+yes-test-all: PHONY
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
+
+test-ruby: $(TEST_RUNNABLE)-test-ruby
+no-test-ruby: PHONY
+yes-test-ruby: PHONY
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" ruby
+
+extconf: $(PREP)
+	$(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
-	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
+$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
+	@$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
+encs: enc trans
+encs enc trans: $(ENC_MK) $(LIBRUBY) $(PREP)
+	$(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
+
+enc: {$(VPATH)}encdb.h
+trans: {$(VPATH)}transdb.h
+
+$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
+	$(srcdir)/lib/mkmf.rb $(RBCONFIG)
+	$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS)
+
 .PRECIOUS: $(MKFILES)
 
+.PHONY: PHONY all fake prereq incs srcs preludes help
 .PHONY: test install install-nodoc install-doc dist
+.PHONY: loadpath golf capi rdoc install-prereq clear-installed-list
+.PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
+.PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
+.PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
+.PHONY: check test test-all btest btest-ruby test-sample test-knownbug
+.PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
+.PHONY: update-mspec update-rubyspec test-rubyspec
 
 PHONY:
 
-{$(VPATH)}parse.c: parse.y
+{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
+parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
+
+{$(srcdir)}.y.c:
+	$(YACC) -d $(YFLAGS) -o y.tab.c $(SRC_FILE)
+	sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
+	@$(MV) $@.new $@
+	sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse\.y/d" y.tab.h > $(@:.c=.h).new
+	@$(IFCHANGE) $(@:.c=.h) $(@:.c=.h).new
+	@$(RM) y.tab.c y.tab.h
 
 acosh.$(OBJEXT): {$(VPATH)}acosh.c
-alloca.$(OBJEXT): {$(VPATH)}alloca.c
+alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h
 crypt.$(OBJEXT): {$(VPATH)}crypt.c
 dup2.$(OBJEXT): {$(VPATH)}dup2.c
 erf.$(OBJEXT): {$(VPATH)}erf.c
@@ -313,134 +498,353 @@ flock.$(OBJEXT): {$(VPATH)}flock.c
 memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
 memmove.$(OBJEXT): {$(VPATH)}memmove.c
 mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-vsnprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
-strcasecmp.$(OBJEXT): {$(VPATH)}strcasecmp.c
-strncasecmp.$(OBJEXT): {$(VPATH)}strncasecmp.c
 strchr.$(OBJEXT): {$(VPATH)}strchr.c
 strdup.$(OBJEXT): {$(VPATH)}strdup.c
 strerror.$(OBJEXT): {$(VPATH)}strerror.c
-strftime.$(OBJEXT): {$(VPATH)}strftime.c
 strstr.$(OBJEXT): {$(VPATH)}strstr.c
 strtod.$(OBJEXT): {$(VPATH)}strtod.c
 strtol.$(OBJEXT): {$(VPATH)}strtol.c
-strtoul.$(OBJEXT): {$(VPATH)}strtoul.c
 nt.$(OBJEXT): {$(VPATH)}nt.c
-x68.$(OBJEXT): {$(VPATH)}x68.c
 os2.$(OBJEXT): {$(VPATH)}os2.c
 dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
 ia64.$(OBJEXT): {$(VPATH)}ia64.s
 	$(CC) $(CFLAGS) -c $<
 
-# when I use -I., there is confliction at "OpenFile" 
-# so, set . into environment varible "include"
-win32.$(OBJEXT): {$(VPATH)}win32.c
+win32.$(OBJEXT): {$(VPATH)}win32.c $(RUBY_H_INCLUDES)
 
 ###
 
-array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h {$(VPATH)}st.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
-compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h
-dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h
-dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
-  config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h
+RUBY_H_INCLUDES    = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
+		     {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h
+ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
+ID_H_INCLUDES      = {$(VPATH)}id.h
+VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}vm_opts.h \
+	             {$(VPATH)}thread_$(THREAD_MODEL).h \
+		     {$(VPATH)}node.h {$(VPATH)}method.h $(ID_H_INCLUDES)
+
+array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
+class.$(OBJEXT): {$(VPATH)}class.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES)
+complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES)
+dir.$(OBJEXT): {$(VPATH)}dir.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES)
+dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}dln.h $(RUBY_H_INCLUDES)
+dln_find.$(OBJEXT): {$(VPATH)}dln_find.c {$(VPATH)}dln.h $(RUBY_H_INCLUDES)
+dmydln.$(OBJEXT): {$(VPATH)}dmydln.c dln.$(OBJEXT)
 dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}util.h
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}st.h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
-file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
-  {$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h
-hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
-inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h  {$(VPATH)}util.h \
-  {$(VPATH)}env.h
-main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \
-  {$(VPATH)}missing.h
-object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h
-pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \
-  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
-prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h
-random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-regex.$(OBJEXT): {$(VPATH)}regex.c config.h {$(VPATH)}regex.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
-signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
-string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}regenc.h {$(VPATH)}util.h $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}encoding.c
+encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}regenc.h {$(VPATH)}util.h
+enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
   {$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
-version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}version.h
-
-dist: $(PROGRAM)
-	$(RUNRUBY) $(srcdir)/distruby.rb
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES)
+error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}debug.h
+eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h {$(VPATH)}vm.h \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_error.c \
+  {$(VPATH)}eval_jump.c {$(VPATH)}debug.h {$(VPATH)}gc.h {$(VPATH)}iseq.h
+load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
+  {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}dln.h {$(VPATH)}debug.h
+file.$(OBJEXT): {$(VPATH)}file.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}dln.h
+gc.$(OBJEXT): {$(VPATH)}gc.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}gc.h {$(VPATH)}io.h {$(VPATH)}eval_intern.h {$(VPATH)}util.h \
+  {$(VPATH)}debug.h
+hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
+inits.$(OBJEXT): {$(VPATH)}inits.c $(RUBY_H_INCLUDES)
+io.$(OBJEXT): {$(VPATH)}io.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h
+main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
+  {$(VPATH)}node.h
+marshal.$(OBJEXT): {$(VPATH)}marshal.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}util.h
+math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES)
+node.$(OBJEXT): {$(VPATH)}node.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES)
+numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}util.h $(ENCODING_H_INCLUDES)
+object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
+pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}encoding.h \
+  {$(VPATH)}oniguruma.h
+parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
+  $(ENCODING_H_INCLUDES) $(ID_H_INCLUDES) {$(VPATH)}regenc.h \
+  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
+  {$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
+  {$(VPATH)}parse.h
+proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
+  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}debug.h
+process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}util.h {$(VPATH)}io.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES)
+range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES)
+rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES)
+re.$(OBJEXT): {$(VPATH)}re.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}regint.h {$(VPATH)}regenc.h
+regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}regparse.h \
+  {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h \
+  $(RUBY_H_INCLUDES)
+regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+regerror.$(OBJEXT): {$(VPATH)}regerror.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+regexec.$(OBJEXT): {$(VPATH)}regexec.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+regparse.$(OBJEXT): {$(VPATH)}regparse.c {$(VPATH)}regparse.h \
+  {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h \
+  $(RUBY_H_INCLUDES)
+regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+ruby.$(OBJEXT): {$(VPATH)}ruby.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}eval_intern.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}dln.h {$(VPATH)}debug.h
+safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h {$(VPATH)}vsnprintf.c $(ENCODING_H_INCLUDES)
+st.$(OBJEXT): {$(VPATH)}st.c {$(VPATH)}config.h {$(VPATH)}defines.h \
+  {$(VPATH)}st.h {$(VPATH)}ruby.h {$(VPATH)}missing.h {$(VPATH)}intern.h
+strftime.$(OBJEXT): {$(VPATH)}strftime.c {$(VPATH)}ruby.h \
+  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
+  {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}timev.h
+string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES)
+struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES)
+thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
+  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}debug.h {$(VPATH)}thread_$(THREAD_MODEL).c
+transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}transcode_data.h
+cont.$(OBJEXT): {$(VPATH)}cont.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}gc.h {$(VPATH)}eval_intern.h \
+  {$(VPATH)}debug.h
+time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}timev.h
+util.$(OBJEXT): {$(VPATH)}util.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
+variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \
+  {$(VPATH)}oniguruma.h
+version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h
+dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
+
+compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
+  {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \
+  {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc
+iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
+  {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h
+vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
+  {$(VPATH)}eval_intern.h $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_method.c {$(VPATH)}vm_eval.c \
+  {$(VPATH)}vm_insnhelper.c {$(VPATH)}vm_insnhelper.h {$(VPATH)}vm_exec.c \
+  {$(VPATH)}vm_exec.h {$(VPATH)}insns.def {$(VPATH)}vmtc.inc \
+  {$(VPATH)}vm.inc {$(VPATH)}insns.inc {$(VPATH)}debug.h
+vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_intern.h \
+  {$(VPATH)}util.h {$(VPATH)}debug.h
+id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES)
+miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}debug.h {$(VPATH)}node.h
+
+ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
+  {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
+us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h \
+  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
+unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \
+  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}st.h {$(VPATH)}ruby.h \
+  {$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}enc/unicode/name2ctype.h
+
+utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
+  {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
+
+newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
+	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
+newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \
+  {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
+  {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h
+
+INSNS2VMOPT = --srcdir="$(srcdir)"
+
+{$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl
+
+{$(VPATH)}opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl
+
+{$(VPATH)}optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl
+
+{$(VPATH)}optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl
+
+{$(VPATH)}insns.inc: $(srcdir)/template/insns.inc.tmpl
+
+{$(VPATH)}insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl
+
+{$(VPATH)}vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
+
+{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
+
+srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c srcs-ext srcs-enc
+
+EXT_SRCS = $(srcdir)/ext/ripper/ripper.c
+
+srcs-ext: $(EXT_SRCS)
+
+srcs-enc: $(ENC_MK)
+	$(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+
+incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
+      $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h
+
+insns: $(INSNS)
+
+id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
+	$(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
+		$(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
+
+node_name.inc: {$(VPATH)}node.h
+	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
+
+encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
+	$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
+
+transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
+	$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
+
+known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
+	$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
+
+miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
+	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
+	   $(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \
+	   $(PRELUDE_SCRIPTS) $(PREP)
+	$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
+
+golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
+	$(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
+
+prereq: incs srcs preludes
+
+preludes: {$(VPATH)}miniprelude.c
+preludes: {$(srcdir)}golf_prelude.c
+
+$(srcdir)/revision.h:
+	@exit > $@
+
+$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+	@-$(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > "$(srcdir)/revision.tmp"
+	@$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" "$(srcdir)/revision.tmp"
+
+$(EXT_SRCS):
+	$(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. RUBY="$(BASERUBY)"
+
+##
+
+run: miniruby$(EXEEXT) PHONY
+	$(MINIRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
+
+runruby: $(PROGRAM) PHONY
+	$(RUNRUBY) $(TESTRUN_SCRIPT)
+
+parse: miniruby$(EXEEXT) PHONY
+	$(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
+
+COMPARE_RUBY = $(BASERUBY)
+ITEM = 
+OPTS = 
+
+benchmark: $(PROGRAM) PHONY
+	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
+	            --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
+
+benchmark-each: $(PROGRAM) PHONY
+	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
+	            --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
+
+tbench: $(PROGRAM) PHONY
+	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
+	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
+
+run.gdb:
+	echo b ruby_debug_breakpoint           > run.gdb
+	echo '# handle SIGINT nostop'         >> run.gdb
+	echo '# handle SIGPIPE nostop'        >> run.gdb
+	echo '# b rb_longjmp'                 >> run.gdb
+	echo source $(srcdir)/breakpoints.gdb >> run.gdb
+	echo source $(srcdir)/.gdbinit        >> run.gdb
+	echo run                              >> run.gdb
+
+gdb: miniruby$(EXEEXT) run.gdb PHONY
+	gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
+
+gdb-ruby: $(PROGRAM) run.gdb PHONY
+	gdb -x run.gdb --quiet --args $(PROGRAM) $(TESTRUN_SCRIPT)
+
+dist:
+	$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
+
+up::
+	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
+
+info: info-program info-libruby_a info-libruby_so info-arch
+info-program:
+	@echo PROGRAM=$(PROGRAM)
+info-libruby_a:
+	@echo LIBRUBY_A=$(LIBRUBY_A)
+info-libruby_so:
+	@echo LIBRUBY_SO=$(LIBRUBY_SO)
+info-arch:
+	@echo arch=$(arch)
+
+help: PHONY
+	@echo "                Makefile of Ruby"
+	@echo ""
+	@echo "targets:"
+	@echo "  all (default):   builds all of below"
+	@echo "  miniruby:        builds only miniruby"
+	@echo "  encs:            builds encodings"
+	@echo "  exts:            builds extensions"
+	@echo "  main:            builds encodings, extensions and ruby"
+	@echo "  docs:            builds documents"
+	@echo "  run:             runs test.rb by miniruby"
+	@echo "  runruby:         runs test.rb by ruby you just built"
+	@echo "  gdb:             runs test.rb by miniruby under gdb"
+	@echo "  gdb-ruby:        runs test.rb by ruby under gdb"
+	@echo "  check:           equals make test test-all"
+	@echo "  test:            ruby core tests"
+	@echo "  test-all:        all ruby tests"
+	@echo "  test-rubyspec    run RubySpec test suite"
+	@echo "  update-rubyspec  update local copy of RubySpec"
+	@echo "  benchmark        benchmark this ruby and COMPARE_RUBY"
+	@echo "  install:         install all ruby distributions"
+	@echo "  install-nodoc:   install without rdoc"
+	@echo "  clean:           clean built objects"
+	@echo "  golf:            for golfers"
+	@echo ""
+	@echo "see DeveloperHowto for more detail: "
+	@echo "  http://redmine.ruby-lang.org/wiki/ruby/DeveloperHowto"
diff --git a/compar.c b/compar.c
index 1488b2c65d..65def78484 100644
--- a/compar.c
+++ b/compar.c
@@ -3,39 +3,20 @@
   compar.c -
 
   $Author$
-  $Date$
   created at: Thu Aug 26 14:39:48 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 VALUE rb_mComparable;
 
 static ID cmp;
 
-int
-rb_cmpint(val, a, b)
-    VALUE val, a, b;
-{
-    if (NIL_P(val)) {
-	rb_cmperr(a, b);
-    }
-    if (FIXNUM_P(val)) return FIX2INT(val);
-    if (TYPE(val) == T_BIGNUM) {
-	if (RBIGNUM(val)->sign) return 1;
-	return -1;
-    }
-    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
-    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
-    return 0;
-}
-
 void
-rb_cmperr(x, y)
-    VALUE x, y;
+rb_cmperr(VALUE x, VALUE y)
 {
     const char *classname;
 
@@ -50,37 +31,33 @@ rb_cmperr(x, y)
 	     rb_obj_classname(x), classname);
 }
 
-#define cmperr() (rb_cmperr(x, y), Qnil)
-
 static VALUE
-cmp_eq(a)
-    VALUE *a;
+cmp_eq(VALUE *a)
 {
     VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
 
-    if (NIL_P(c)) return Qnil;
+    if (NIL_P(c)) return Qfalse;
     if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
-cmp_failed()
+cmp_failed(void)
 {
-    return Qnil;
+    return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj == other    => true or false
- *  
+ *     obj == other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns 0. Also returns true if
  *  _obj_ and _other_ are the same object.
  */
 
 static VALUE
-cmp_equal(x, y)
-    VALUE x, y;
+cmp_equal(VALUE x, VALUE y)
 {
     VALUE a[2];
 
@@ -92,99 +69,89 @@ cmp_equal(x, y)
 
 /*
  *  call-seq:
- *     obj > other    => true or false
- *  
+ *     obj > other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns 1.
  */
 
 static VALUE
-cmp_gt(x, y)
-    VALUE x, y;
+cmp_gt(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) > 0) return Qtrue;
     return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj >= other    => true or false
- *  
+ *     obj >= other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns 0 or 1.
  */
 
 static VALUE
-cmp_ge(x, y)
-    VALUE x, y;
+cmp_ge(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) >= 0) return Qtrue;
     return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj < other    => true or false
- *  
+ *     obj < other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns -1.
  */
 
 static VALUE
-cmp_lt(x, y)
-    VALUE x, y;
+cmp_lt(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) < 0) return Qtrue;
     return Qfalse;
 }
 
-
 /*
  *  call-seq:
- *     obj <= other    => true or false
- *  
+ *     obj <= other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns -1 or 0.
  */
 
 static VALUE
-cmp_le(x, y)
-    VALUE x, y;
+cmp_le(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) <= 0) return Qtrue;
     return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj.between?(min, max)    => true or false
- *  
+ *     obj.between?(min, max)    -> true or false
+ *
  *  Returns <code>false</code> if <i>obj</i> <code><=></code>
  *  <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
  *  <i>max</i> is greater than zero, <code>true</code> otherwise.
- *     
+ *
  *     3.between?(1, 5)               #=> true
  *     6.between?(1, 5)               #=> false
  *     'cat'.between?('ant', 'dog')   #=> true
  *     'gnu'.between?('ant', 'dog')   #=> false
- *     
+ *
  */
 
 static VALUE
-cmp_between(x, min, max)
-    VALUE x, min, max;
+cmp_between(VALUE x, VALUE min, VALUE max)
 {
     if (RTEST(cmp_lt(x, min))) return Qfalse;
     if (RTEST(cmp_gt(x, max))) return Qfalse;
@@ -196,11 +163,13 @@ cmp_between(x, min, max)
  *  may be ordered. The class must define the <code><=></code> operator,
  *  which compares the receiver against another object, returning -1, 0,
  *  or +1 depending on whether the receiver is less than, equal to, or
- *  greater than the other object. <code>Comparable</code> uses
+ *  greater than the other object. If the other object is not comparable
+ *  then the <code><=></code> operator should return nil.
+ *  <code>Comparable</code> uses
  *  <code><=></code> to implement the conventional comparison operators
  *  (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
  *  and <code>></code>) and the method <code>between?</code>.
- *     
+ *
  *     class SizeMatters
  *       include Comparable
  *       attr :str
@@ -214,23 +183,26 @@ cmp_between(x, min, max)
  *         @str
  *       end
  *     end
- *     
+ *
  *     s1 = SizeMatters.new("Z")
  *     s2 = SizeMatters.new("YY")
  *     s3 = SizeMatters.new("XXX")
  *     s4 = SizeMatters.new("WWWW")
  *     s5 = SizeMatters.new("VVVVV")
- *     
+ *
  *     s1 < s2                       #=> true
  *     s4.between?(s1, s3)           #=> false
  *     s4.between?(s3, s5)           #=> true
  *     [ s3, s2, s5, s4, s1 ].sort   #=> [Z, YY, XXX, WWWW, VVVVV]
- *     
+ *
  */
 
 void
-Init_Comparable()
+Init_Comparable(void)
 {
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
     rb_mComparable = rb_define_module("Comparable");
     rb_define_method(rb_mComparable, "==", cmp_equal, 1);
     rb_define_method(rb_mComparable, ">", cmp_gt, 1);
diff --git a/compile.c b/compile.c
new file mode 100644
index 0000000000..1e8c09c929
--- /dev/null
+++ b/compile.c
@@ -0,0 +1,5496 @@
+/**********************************************************************
+
+  compile.c - ruby node tree -> VM instruction sequence
+
+  $Author$
+  created at: 04/01/01 03:42:15 JST
+
+  Copyright (C) 2004-2007 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+
+#define USE_INSN_STACK_INCREASE 1
+#include "vm_core.h"
+#include "iseq.h"
+#include "insns.inc"
+#include "insns_info.inc"
+
+#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
+#define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
+
+typedef struct iseq_link_element {
+    enum {
+	ISEQ_ELEMENT_NONE   = INT2FIX(0x00),
+	ISEQ_ELEMENT_LABEL  = INT2FIX(0x01),
+	ISEQ_ELEMENT_INSN   = INT2FIX(0x02),
+	ISEQ_ELEMENT_ADJUST = INT2FIX(0x03)
+    } type;
+    struct iseq_link_element *next;
+    struct iseq_link_element *prev;
+} LINK_ELEMENT;
+
+typedef struct iseq_link_anchor {
+    LINK_ELEMENT anchor;
+    LINK_ELEMENT *last;
+} LINK_ANCHOR;
+
+typedef struct iseq_label_data {
+    LINK_ELEMENT link;
+    int label_no;
+    int position;
+    int sc_state;
+    int set;
+    int sp;
+} LABEL;
+
+typedef struct iseq_insn_data {
+    LINK_ELEMENT link;
+    enum ruby_vminsn_type insn_id;
+    int line_no;
+    int operand_size;
+    int sc_state;
+    VALUE *operands;
+} INSN;
+
+typedef struct iseq_adjust_data {
+    LINK_ELEMENT link;
+    LABEL *label;
+    int line_no;
+} ADJUST;
+
+struct ensure_range {
+    LABEL *begin;
+    LABEL *end;
+    struct ensure_range *next;
+};
+
+struct iseq_compile_data_ensure_node_stack {
+    NODE *ensure_node;
+    struct iseq_compile_data_ensure_node_stack *prev;
+    struct ensure_range *erange;
+};
+
+/**
+ * debug function(macro) interface depend on CPDEBUG
+ * if it is less than 0, runtime option is in effect.
+ *
+ * debug level:
+ *  0: no debug output
+ *  1: show node type
+ *  2: show node important parameters
+ *  ...
+ *  5: show other parameters
+ * 10: show every AST array
+ */
+
+#ifndef CPDEBUG
+#define CPDEBUG 0
+#endif
+
+#if CPDEBUG >= 0
+#define compile_debug CPDEBUG
+#else
+#define compile_debug iseq->compile_data->option->debug_level
+#endif
+
+NORETURN(PRINTF_ARGS(void rb_compile_bug(const char*, int, const char*, ...), 3, 4));
+
+#if CPDEBUG
+
+#define compile_debug_print_indent(level) \
+    ruby_debug_print_indent(level, compile_debug, gl_node_level * 2)
+
+#define debugp(header, value) (void) \
+  (compile_debug_print_indent(1) && \
+   ruby_debug_print_value(1, compile_debug, header, value))
+
+#define debugi(header, id)  (void) \
+  (compile_debug_print_indent(1) && \
+   ruby_debug_print_id(1, compile_debug, header, id))
+
+#define debugp_param(header, value)  (void) \
+  (compile_debug_print_indent(1) && \
+   ruby_debug_print_value(1, compile_debug, header, value))
+
+#define debugp_verbose(header, value)  (void) \
+  (compile_debug_print_indent(2) && \
+   ruby_debug_print_value(2, compile_debug, header, value))
+
+#define debugp_verbose_node(header, value)  (void) \
+  (compile_debug_print_indent(10) && \
+   ruby_debug_print_value(10, compile_debug, header, value))
+
+#define debug_node_start(node)  ((void) \
+  (compile_debug_print_indent(1) && \
+   (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)node), gl_node_level)), \
+   gl_node_level++)
+
+#define debug_node_end()  gl_node_level --;
+
+#else
+
+static inline ID
+r_id(ID id)
+{
+    return id;
+}
+
+static inline VALUE
+r_value(VALUE value)
+{
+    return value;
+}
+
+#define debugi(header, id)                 r_id(id)
+#define debugp(header, value)              r_value(value)
+#define debugp_verbose(header, value)      r_value(value)
+#define debugp_verbose_node(header, value) r_value(value)
+#define debugp_param(header, value)        r_value(value)
+#define debug_node_start(node)             ((void)0)
+#define debug_node_end()                   ((void)0)
+#endif
+
+#if CPDEBUG > 1 || CPDEBUG < 0
+PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
+#define debugs if (compile_debug_print_indent(1)) ruby_debug_printf
+#define debug_compile(msg, v) ((void)(compile_debug_print_indent(1) && fputs(msg, stderr)), (v))
+#else
+#define debugs                             if(0)printf
+#define debug_compile(msg, v) (v)
+#endif
+
+
+/* create new label */
+#define NEW_LABEL(l) new_label_body(iseq, l)
+
+#define iseq_filename(iseq) \
+  (((rb_iseq_t*)DATA_PTR(iseq))->filename)
+
+#define iseq_filepath(iseq) \
+  (((rb_iseq_t*)DATA_PTR(iseq))->filepath)
+
+#define NEW_ISEQVAL(node, name, type, line_no)       \
+  new_child_iseq(iseq, node, name, 0, type, line_no)
+
+#define NEW_CHILD_ISEQVAL(node, name, type, line_no)       \
+  new_child_iseq(iseq, node, name, iseq->self, type, line_no)
+
+/* add instructions */
+#define ADD_SEQ(seq1, seq2) \
+  APPEND_LIST(seq1, seq2)
+
+/* add an instruction */
+#define ADD_INSN(seq, line, insn) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, BIN(insn), 0))
+
+/* add an instruction with label operand */
+#define ADD_INSNL(seq, line, insn, label) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) \
+           new_insn_body(iseq, line, BIN(insn), 1, (VALUE)label))
+
+/* add an instruction with some operands (1, 2, 3, 5) */
+#define ADD_INSN1(seq, line, insn, op1) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) \
+           new_insn_body(iseq, line, BIN(insn), 1, (VALUE)op1))
+
+#define ADD_INSN2(seq, line, insn, op1, op2) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) \
+           new_insn_body(iseq, line, BIN(insn), 2, (VALUE)op1, (VALUE)op2))
+
+#define ADD_INSN3(seq, line, insn, op1, op2, op3) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) \
+           new_insn_body(iseq, line, BIN(insn), 3, (VALUE)op1, (VALUE)op2, (VALUE)op3))
+
+/* Specific Insn factory */
+#define ADD_SEND(seq, line, id, argc) \
+  ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(0))
+
+#define ADD_CALL_RECEIVER(seq, line) \
+  ADD_INSN(seq, line, putnil)
+
+#define ADD_CALL(seq, line, id, argc) \
+  ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
+
+#define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \
+  ADD_SEND_R(seq, line, id, argc, block, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
+
+#define ADD_SEND_R(seq, line, id, argc, block, flag) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) \
+           new_insn_send(iseq, line, \
+                         (VALUE)id, (VALUE)argc, (VALUE)block, (VALUE)flag))
+
+#define ADD_TRACE(seq, line, event) \
+  do { \
+      if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
+	  (line) != iseq->compile_data->last_coverable_line) { \
+	  RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
+	  iseq->compile_data->last_coverable_line = (line); \
+	  ADD_INSN1(seq, line, trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
+      } \
+      if (iseq->compile_data->option->trace_instruction) { \
+	  ADD_INSN1(seq, line, trace, INT2FIX(event)); \
+      } \
+  }while(0);
+
+/* add label */
+#define ADD_LABEL(seq, label) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) label)
+
+#define ADD_ADJUST(seq, line, label) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) new_adjust_body(iseq, label, line))
+
+#define ADD_ADJUST_RESTORE(seq, label) \
+  ADD_ELEM(seq, (LINK_ELEMENT *) new_adjust_body(iseq, label, -1))
+
+#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc)		\
+    (rb_ary_push(iseq->compile_data->catch_table_ary,		\
+		 rb_ary_new3(5, type,				\
+			     (VALUE)(ls) | 1, (VALUE)(le) | 1,	\
+			     iseqv, (VALUE)(lc) | 1)))
+
+/* compile node */
+#define COMPILE(anchor, desc, node) \
+  (debug_compile("== " desc "\n", \
+                 iseq_compile_each(iseq, anchor, node, 0)))
+
+/* compile node, this node's value will be popped */
+#define COMPILE_POPED(anchor, desc, node)    \
+  (debug_compile("== " desc "\n", \
+                 iseq_compile_each(iseq, anchor, node, 1)))
+
+/* compile node, which is popped when 'poped' is true */
+#define COMPILE_(anchor, desc, node, poped)  \
+  (debug_compile("== " desc "\n", \
+                 iseq_compile_each(iseq, anchor, node, poped)))
+
+#define OPERAND_AT(insn, idx) \
+  (((INSN*)(insn))->operands[idx])
+
+#define INSN_OF(insn) \
+  (((INSN*)(insn))->insn_id)
+
+/* error */
+#define COMPILE_ERROR(strs)                        \
+{                                                  \
+  VALUE tmp = GET_THREAD()->errinfo;               \
+  if (compile_debug) rb_compile_bug strs;          \
+  GET_THREAD()->errinfo = iseq->compile_data->err_info;  \
+  rb_compile_error strs;                           \
+  iseq->compile_data->err_info = GET_THREAD()->errinfo; \
+  GET_THREAD()->errinfo = tmp;                     \
+  ret = 0;                                         \
+  break;                                           \
+}
+
+#define ERROR_ARGS ruby_sourcefile, nd_line(node),
+
+
+#define COMPILE_OK 1
+#define COMPILE_NG 0
+
+
+/* leave name uninitialized so that compiler warn if INIT_ANCHOR is
+ * missing */
+#define DECL_ANCHOR(name) \
+  LINK_ANCHOR *name, name##_body__ = {{0,},}
+#define INIT_ANCHOR(name) \
+  (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
+
+#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC(obj)->klass = 0;} while (0)
+
+#include "optinsn.inc"
+#if OPT_INSTRUCTIONS_UNIFICATION
+#include "optunifs.inc"
+#endif
+
+/* for debug */
+#if CPDEBUG < 0
+#define ISEQ_ARG iseq,
+#define ISEQ_ARG_DECLARE rb_iseq_t *iseq,
+#else
+#define ISEQ_ARG
+#define ISEQ_ARG_DECLARE
+#endif
+
+#if CPDEBUG
+#define gl_node_level iseq->compile_data->node_level
+#if 0
+static void debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor);
+#endif
+#endif
+
+static void dump_disasm_list(LINK_ELEMENT *elem);
+
+static int insn_data_length(INSN *iobj);
+static int insn_data_line_no(INSN *iobj);
+static int calc_sp_depth(int depth, INSN *iobj);
+
+static void ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem);
+
+static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...);
+static LABEL *new_label_body(rb_iseq_t *iseq, long line);
+static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line);
+
+static int iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * n, int);
+static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+
+static int iseq_set_local_table(rb_iseq_t *iseq, ID *tbl);
+static int iseq_set_exception_local_table(rb_iseq_t *iseq);
+static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node);
+
+static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_set_exception_table(rb_iseq_t *iseq);
+static int iseq_set_optargs_table(rb_iseq_t *iseq);
+
+/*
+ * To make Array to LinkedList, use link_anchor
+ */
+
+static void
+verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
+{
+#if CPDEBUG
+    int flag = 0;
+    LINK_ELEMENT *list, *plist;
+
+    if (!compile_debug) return;
+
+    list = anchor->anchor.next;
+    plist = &anchor->anchor;
+    while (list) {
+	if (plist != list->prev) {
+	    flag += 1;
+	}
+	plist = list;
+	list = list->next;
+    }
+
+    if (anchor->last != plist && anchor->last != 0) {
+	flag |= 0x70000;
+    }
+
+    if (flag != 0) {
+	rb_bug("list verify error: %08x (%s)", flag, info);
+    }
+#endif
+}
+#if CPDEBUG < 0
+#define verify_list(info, anchor) verify_list(iseq, info, anchor)
+#endif
+
+/*
+ * elem1, elem2 => elem1, elem2, elem
+ */
+static void
+ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
+{
+    elem->prev = anchor->last;
+    anchor->last->next = elem;
+    anchor->last = elem;
+    verify_list("add", anchor);
+}
+#if CPDEBUG < 0
+#define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, anchor, elem)
+#endif
+
+static int
+iseq_add_mark_object(rb_iseq_t *iseq, VALUE v)
+{
+    if (!SPECIAL_CONST_P(v)) {
+	rb_ary_push(iseq->mark_ary, v);
+    }
+    return COMPILE_OK;
+}
+
+#define ruby_sourcefile		RSTRING_PTR(iseq->filename)
+
+static int
+iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
+{
+    if (!SPECIAL_CONST_P(v)) {
+	rb_ary_push(iseq->compile_data->mark_ary, v);
+    }
+    return COMPILE_OK;
+}
+
+VALUE
+rb_iseq_compile_node(VALUE self, NODE *node)
+{
+    DECL_ANCHOR(ret);
+    rb_iseq_t *iseq;
+    INIT_ANCHOR(ret);
+    GetISeqPtr(self, iseq);
+
+    if (node == 0) {
+	COMPILE(ret, "nil", node);
+	iseq_set_local_table(iseq, 0);
+    }
+    else if (nd_type(node) == NODE_SCOPE) {
+	/* iseq type of top, method, class, block */
+	iseq_set_local_table(iseq, node->nd_tbl);
+	iseq_set_arguments(iseq, ret, node->nd_args);
+
+	switch (iseq->type) {
+	  case ISEQ_TYPE_BLOCK: {
+	    LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0);
+	    LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0);
+
+	    ADD_LABEL(ret, start);
+	    COMPILE(ret, "block body", node->nd_body);
+	    ADD_LABEL(ret, end);
+
+	    /* wide range catch handler must put at last */
+	    ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start);
+	    ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, 0, end);
+	    break;
+	  }
+	  case ISEQ_TYPE_CLASS: {
+	    ADD_TRACE(ret, FIX2INT(iseq->line_no), RUBY_EVENT_CLASS);
+	    COMPILE(ret, "scoped node", node->nd_body);
+	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_END);
+	    break;
+	  }
+	  case ISEQ_TYPE_METHOD: {
+	    ADD_TRACE(ret, FIX2INT(iseq->line_no), RUBY_EVENT_CALL);
+	    COMPILE(ret, "scoped node", node->nd_body);
+	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
+	    break;
+	  }
+	  default: {
+	    COMPILE(ret, "scoped node", node->nd_body);
+	    break;
+	  }
+	}
+    }
+    else {
+	switch (iseq->type) {
+	  case ISEQ_TYPE_METHOD:
+	  case ISEQ_TYPE_CLASS:
+	  case ISEQ_TYPE_BLOCK:
+	  case ISEQ_TYPE_EVAL:
+	  case ISEQ_TYPE_MAIN:
+	  case ISEQ_TYPE_TOP:
+	    rb_compile_error(ERROR_ARGS "compile/should not be reached: %s:%d",
+			     __FILE__, __LINE__);
+	    break;
+	  case ISEQ_TYPE_RESCUE:
+	    iseq_set_exception_local_table(iseq);
+	    COMPILE(ret, "rescue", node);
+	    break;
+	  case ISEQ_TYPE_ENSURE:
+	    iseq_set_exception_local_table(iseq);
+	    COMPILE_POPED(ret, "ensure", node);
+	    break;
+	  case ISEQ_TYPE_DEFINED_GUARD:
+	    iseq_set_local_table(iseq, 0);
+	    COMPILE(ret, "defined guard", node);
+	    break;
+	  default:
+	    rb_bug("unknown scope");
+	}
+    }
+
+    if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) {
+	ADD_INSN2(ret, 0, getdynamic, INT2FIX(2), INT2FIX(0));
+	ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ );
+    }
+    else {
+	ADD_INSN(ret, iseq->compile_data->last_line, leave);
+    }
+
+    return iseq_setup(iseq, ret);
+}
+
+int
+rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
+{
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+    extern const void **rb_vm_get_insns_address_table(void);
+#if OPT_DIRECT_THREADED_CODE
+    const void * const *table = rb_vm_get_insns_address_table();
+#else
+    const void * const *table = rb_vm_get_insns_address_table();
+#endif
+    unsigned long i;
+
+    iseq->iseq_encoded = ALLOC_N(VALUE, iseq->iseq_size);
+    MEMCPY(iseq->iseq_encoded, iseq->iseq, VALUE, iseq->iseq_size);
+
+    for (i = 0; i < iseq->iseq_size; /* */ ) {
+	int insn = (int)iseq->iseq_encoded[i];
+	int len = insn_len(insn);
+	iseq->iseq_encoded[i] = (VALUE)table[insn];
+	i += len;
+    }
+#else
+    iseq->iseq_encoded = iseq->iseq;
+#endif
+    return COMPILE_OK;
+}
+
+/*********************************************/
+/* definition of data structure for compiler */
+/*********************************************/
+
+static void *
+compile_data_alloc(rb_iseq_t *iseq, size_t size)
+{
+    void *ptr = 0;
+    struct iseq_compile_data_storage *storage =
+	iseq->compile_data->storage_current;
+
+    if (storage->pos + size > storage->size) {
+	unsigned long alloc_size = storage->size * 2;
+
+      retry:
+	if (alloc_size < size) {
+	    alloc_size *= 2;
+	    goto retry;
+	}
+	storage->next = (void *)ALLOC_N(char, alloc_size +
+					sizeof(struct
+					       iseq_compile_data_storage));
+	storage = iseq->compile_data->storage_current = storage->next;
+	storage->next = 0;
+	storage->pos = 0;
+	storage->size = alloc_size;
+	storage->buff = (char *)(&storage->buff + 1);
+    }
+
+    ptr = (void *)&storage->buff[storage->pos];
+    storage->pos += size;
+    return ptr;
+}
+
+static INSN *
+compile_data_alloc_insn(rb_iseq_t *iseq)
+{
+    return (INSN *)compile_data_alloc(iseq, sizeof(INSN));
+}
+
+static LABEL *
+compile_data_alloc_label(rb_iseq_t *iseq)
+{
+    return (LABEL *)compile_data_alloc(iseq, sizeof(LABEL));
+}
+
+static ADJUST *
+compile_data_alloc_adjust(rb_iseq_t *iseq)
+{
+    return (ADJUST *)compile_data_alloc(iseq, sizeof(ADJUST));
+}
+
+/*
+ * elem1, elemX => elem1, elem2, elemX
+ */
+static void
+INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+{
+    elem2->next = elem1->next;
+    elem2->prev = elem1;
+    elem1->next = elem2;
+    if (elem2->next) {
+	elem2->next->prev = elem2;
+    }
+}
+
+#if 0 /* unused */
+/*
+ * elemX, elem1 => elemX, elem2, elem1
+ */
+static void
+INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+{
+    elem2->prev = elem1->prev;
+    elem2->next = elem1;
+    elem1->prev = elem2;
+    if (elem2->prev) {
+	elem2->prev->next = elem2;
+    }
+}
+#endif
+
+/*
+ * elemX, elem1, elemY => elemX, elem2, elemY
+ */
+static void
+REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+{
+    elem2->prev = elem1->prev;
+    elem2->next = elem1->next;
+    if (elem1->prev) {
+	elem1->prev->next = elem2;
+    }
+    if (elem1->next) {
+	elem1->next->prev = elem2;
+    }
+}
+
+static void
+REMOVE_ELEM(LINK_ELEMENT *elem)
+{
+    elem->prev->next = elem->next;
+    if (elem->next) {
+	elem->next->prev = elem->prev;
+    }
+}
+
+static LINK_ELEMENT *
+FIRST_ELEMENT(LINK_ANCHOR *anchor)
+{
+    return anchor->anchor.next;
+}
+
+#if 0 /* unused */
+static LINK_ELEMENT *
+LAST_ELEMENT(LINK_ANCHOR *anchor)
+{
+  return anchor->last;
+}
+#endif
+
+static LINK_ELEMENT *
+POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *elem = anchor->last;
+    anchor->last = anchor->last->prev;
+    anchor->last->next = 0;
+    verify_list("pop", anchor);
+    return elem;
+}
+#if CPDEBUG < 0
+#define POP_ELEMENT(anchor) POP_ELEMENT(iseq, anchor)
+#endif
+
+#if 0 /* unused */
+static LINK_ELEMENT *
+SHIFT_ELEMENT(LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *elem = anchor->anchor.next;
+    if (elem) {
+	anchor->anchor.next = elem->next;
+    }
+    return elem;
+}
+#endif
+
+#if 0 /* unused */
+static int
+LIST_SIZE(LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *elem = anchor->anchor.next;
+    int size = 0;
+    while (elem) {
+	size += 1;
+	elem = elem->next;
+    }
+    return size;
+}
+#endif
+
+static int
+LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
+{
+    if (anchor->anchor.next == 0) {
+	return 1;
+    }
+    else {
+	return 0;
+    }
+}
+
+/*
+ * anc1: e1, e2, e3
+ * anc2: e4, e5
+ *#=>
+ * anc1: e1, e2, e3, e4, e5
+ * anc2: e4, e5 (broken)
+ */
+static void
+APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+{
+    if (anc2->anchor.next) {
+	anc1->last->next = anc2->anchor.next;
+	anc2->anchor.next->prev = anc1->last;
+	anc1->last = anc2->last;
+    }
+    verify_list("append", anc1);
+}
+#if CPDEBUG < 0
+#define APPEND_LIST(anc1, anc2) APPEND_LIST(iseq, anc1, anc2)
+#endif
+
+/*
+ * anc1: e1, e2, e3
+ * anc2: e4, e5
+ *#=>
+ * anc1: e4, e5, e1, e2, e3
+ * anc2: e4, e5 (broken)
+ */
+static void
+INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+{
+    if (anc2->anchor.next) {
+	LINK_ELEMENT *first = anc1->anchor.next;
+	anc1->anchor.next = anc2->anchor.next;
+	anc1->anchor.next->prev = &anc1->anchor;
+	anc2->last->next = first;
+	if (first) {
+	    first->prev = anc2->last;
+	}
+	else {
+	    anc1->last = anc2->last;
+	}
+    }
+
+    verify_list("append", anc1);
+}
+#if CPDEBUG < 0
+#define INSERT_LIST(anc1, anc2) INSERT_LIST(iseq, anc1, anc2)
+#endif
+
+#if 0 /* unused */
+/*
+ * anc1: e1, e2, e3
+ * anc2: e4, e5
+ *#=>
+ * anc1: e4, e5
+ * anc2: e1, e2, e3
+ */
+static void
+SWAP_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+{
+    LINK_ANCHOR tmp = *anc2;
+
+    /* it has bug */
+    *anc2 = *anc1;
+    *anc1 = tmp;
+
+    verify_list("swap1", anc1);
+    verify_list("swap2", anc2);
+}
+#if CPDEBUG < 0
+#define SWAP_LIST(anc1, anc2) SWAP_LIST(iseq, anc1, anc2)
+#endif
+
+static LINK_ANCHOR *
+REVERSE_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc)
+{
+    LINK_ELEMENT *first, *last, *elem, *e;
+    first = &anc->anchor;
+    elem = first->next;
+    last = anc->last;
+
+    if (elem != 0) {
+	anc->anchor.next = last;
+	anc->last = elem;
+    }
+    else {
+	/* null list */
+	return anc;
+    }
+    while (elem) {
+	e = elem->next;
+	elem->next = elem->prev;
+	elem->prev = e;
+	elem = e;
+    }
+
+    first->next = last;
+    last->prev = first;
+    anc->last->next = 0;
+
+    verify_list("reverse", anc);
+    return anc;
+}
+#if CPDEBUG < 0
+#define REVERSE_LIST(anc) REVERSE_LIST(iseq, anc)
+#endif
+#endif
+
+#if CPDEBUG && 0
+static void
+debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
+    printf("----\n");
+    printf("anch: %p, frst: %p, last: %p\n", &anchor->anchor,
+	   anchor->anchor.next, anchor->last);
+    while (list) {
+	printf("curr: %p, next: %p, prev: %p, type: %d\n", list, list->next,
+	       list->prev, FIX2INT(list->type));
+	list = list->next;
+    }
+    printf("----\n");
+
+    dump_disasm_list(anchor->anchor.next);
+    verify_list("debug list", anchor);
+}
+#if CPDEBUG < 0
+#define debug_list(anc) debug_list(iseq, anc)
+#endif
+#endif
+
+static LABEL *
+new_label_body(rb_iseq_t *iseq, long line)
+{
+    LABEL *labelobj = compile_data_alloc_label(iseq);
+
+    labelobj->link.type = ISEQ_ELEMENT_LABEL;
+    labelobj->link.next = 0;
+
+    labelobj->label_no = iseq->compile_data->label_no++;
+    labelobj->sc_state = 0;
+    labelobj->sp = -1;
+    return labelobj;
+}
+
+static ADJUST *
+new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
+{
+    ADJUST *adjust = compile_data_alloc_adjust(iseq);
+    adjust->link.type = ISEQ_ELEMENT_ADJUST;
+    adjust->link.next = 0;
+    adjust->label = label;
+    adjust->line_no = line;
+    return adjust;
+}
+
+static INSN *
+new_insn_core(rb_iseq_t *iseq, int line_no,
+	      int insn_id, int argc, VALUE *argv)
+{
+    INSN *iobj = compile_data_alloc_insn(iseq);
+    /* printf("insn_id: %d, line: %d\n", insn_id, line_no); */
+
+    iobj->link.type = ISEQ_ELEMENT_INSN;
+    iobj->link.next = 0;
+    iobj->insn_id = insn_id;
+    iobj->line_no = line_no;
+    iobj->operands = argv;
+    iobj->operand_size = argc;
+    iobj->sc_state = 0;
+    return iobj;
+}
+
+static INSN *
+new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
+{
+    VALUE *operands = 0;
+    va_list argv;
+    if (argc > 0) {
+	int i;
+	va_init_list(argv, argc);
+	operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+	for (i = 0; i < argc; i++) {
+	    VALUE v = va_arg(argv, VALUE);
+	    operands[i] = v;
+	}
+	va_end(argv);
+    }
+    return new_insn_core(iseq, line_no, insn_id, argc, operands);
+}
+
+static INSN *
+new_insn_send(rb_iseq_t *iseq, int line_no,
+	      VALUE id, VALUE argc, VALUE block, VALUE flag)
+{
+    INSN *iobj = 0;
+    VALUE *operands =
+      (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 5);
+    operands[0] = id;
+    operands[1] = argc;
+    operands[2] = block;
+    operands[3] = flag;
+    operands[4] = INT2FIX(iseq->ic_size++);
+    iobj = new_insn_core(iseq, line_no, BIN(send), 5, operands);
+    return iobj;
+}
+
+static VALUE
+new_child_iseq(rb_iseq_t *iseq, NODE *node,
+	       VALUE name, VALUE parent, VALUE type, int line_no)
+{
+    VALUE ret;
+
+    debugs("[new_child_iseq]> ---------------------------------------\n");
+    ret = rb_iseq_new_with_opt(node, name, iseq_filename(iseq->self), iseq_filepath(iseq->self), INT2FIX(line_no),
+			       parent, type, iseq->compile_data->option);
+    debugs("[new_child_iseq]< ---------------------------------------\n");
+    iseq_add_mark_object(iseq, ret);
+    return ret;
+}
+
+static int
+iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+    /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
+
+    if (compile_debug > 5)
+	dump_disasm_list(FIRST_ELEMENT(anchor));
+
+    debugs("[compile step 3.1 (iseq_optimize)]\n");
+    iseq_optimize(iseq, anchor);
+
+    if (compile_debug > 5)
+	dump_disasm_list(FIRST_ELEMENT(anchor));
+
+    if (iseq->compile_data->option->instructions_unification) {
+	debugs("[compile step 3.2 (iseq_insns_unification)]\n");
+	iseq_insns_unification(iseq, anchor);
+	if (compile_debug > 5)
+	    dump_disasm_list(FIRST_ELEMENT(anchor));
+    }
+
+    if (iseq->compile_data->option->stack_caching) {
+	debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n");
+	iseq_set_sequence_stackcaching(iseq, anchor);
+	if (compile_debug > 5)
+	    dump_disasm_list(FIRST_ELEMENT(anchor));
+    }
+
+    debugs("[compile step 4.1 (iseq_set_sequence)]\n");
+    iseq_set_sequence(iseq, anchor);
+    if (compile_debug > 5)
+	dump_disasm_list(FIRST_ELEMENT(anchor));
+
+    debugs("[compile step 4.2 (iseq_set_exception_table)]\n");
+    iseq_set_exception_table(iseq);
+
+    debugs("[compile step 4.3 (set_optargs_table)] \n");
+    iseq_set_optargs_table(iseq);
+
+    debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
+    rb_iseq_translate_threaded_code(iseq);
+
+    if (compile_debug > 1) {
+	VALUE str = rb_iseq_disasm(iseq->self);
+	printf("%s\n", StringValueCStr(str));
+	fflush(stdout);
+    }
+    debugs("[compile step: finish]\n");
+
+    return 0;
+}
+
+static int
+iseq_set_exception_local_table(rb_iseq_t *iseq)
+{
+    ID id_dollar_bang;
+
+    CONST_ID(id_dollar_bang, "#$!");
+    iseq->local_table = (ID *)ALLOC_N(ID, 1);
+    iseq->local_table_size = 1;
+    iseq->local_size = iseq->local_table_size + 1;
+    iseq->local_table[0] = id_dollar_bang;
+    return COMPILE_OK;
+}
+
+static int
+get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id)
+{
+    int i;
+
+    for (i = 0; i < iseq->local_table_size; i++) {
+	if (iseq->local_table[i] == id) {
+	    return i;
+	}
+    }
+    return -1;
+}
+
+static int
+get_local_var_idx(rb_iseq_t *iseq, ID id)
+{
+    int idx = get_dyna_var_idx_at_raw(iseq->local_iseq, id);
+
+    if (idx < 0) {
+	rb_bug("get_local_var_idx: %d", idx);
+    }
+
+    return idx;
+}
+
+static int
+get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
+{
+    int lv = 0, idx = -1;
+
+    while (iseq) {
+	idx = get_dyna_var_idx_at_raw(iseq, id);
+	if (idx >= 0) {
+	    break;
+	}
+	iseq = iseq->parent_iseq;
+	lv++;
+    }
+
+    if (idx < 0) {
+	rb_bug("get_dyna_var_idx: -1");
+    }
+
+    *level = lv;
+    *ls = iseq->local_size;
+    return idx;
+}
+
+static int
+iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
+{
+    debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
+
+    if (node_args) {
+	NODE *node_aux = node_args->nd_next;
+	NODE *node_opt = node_args->nd_opt;
+	ID rest_id = 0;
+	int last_comma = 0;
+	ID block_id = 0;
+	NODE *node_init = 0;
+
+	if (nd_type(node_args) != NODE_ARGS) {
+	    rb_bug("iseq_set_arguments: NODE_ARGS is expected, but %s",
+		   ruby_node_name(nd_type(node_args)));
+	}
+
+	/*
+         * new argument information:
+         *   NODE_ARGS     [m: int,  o: NODE_OPT_ARG, ->]
+         *   NODE_ARGS_AUX [r: ID,   b: ID,           ->]
+         *   NODE_ARGS_AUX [Pst: id, Plen: int,       init: NODE*]
+         *  optarg information:
+         *   NODE_OPT_ARGS [idx,     expr,            next ->]
+	 *  init arg:
+	 *   NODE_AND(m_init, p_init)
+	 *  if "r" is 1, it's means "{|x,|}" type block parameter.
+	 */
+
+	iseq->argc = (int)node_args->nd_frml;
+	debugs("  - argc: %d\n", iseq->argc);
+
+	if (node_aux) {
+	    rest_id = node_aux->nd_rest;
+	    if (rest_id == 1) {
+		last_comma = 1;
+		rest_id = 0;
+	    }
+	    block_id = (ID)node_aux->nd_body;
+	    node_aux = node_aux->nd_next;
+
+	    if (node_aux) {
+		ID post_start_id = node_aux->nd_pid;
+		iseq->arg_post_start = get_dyna_var_idx_at_raw(iseq, post_start_id);
+		iseq->arg_post_len = (int)node_aux->nd_plen;
+		node_init = node_aux->nd_next;
+	    }
+	}
+
+	if (node_opt) {
+	    NODE *node = node_opt;
+	    LABEL *label;
+	    VALUE labels = rb_ary_tmp_new(1);
+	    int i = 0, j;
+
+	    while (node) {
+		label = NEW_LABEL(nd_line(node));
+		rb_ary_push(labels, (VALUE)label | 1);
+		ADD_LABEL(optargs, label);
+		COMPILE_POPED(optargs, "optarg", node->nd_body);
+		node = node->nd_next;
+		i += 1;
+	    }
+
+	    /* last label */
+	    label = NEW_LABEL(nd_line(node_args));
+	    rb_ary_push(labels, (VALUE)label | 1);
+	    ADD_LABEL(optargs, label);
+	    i += 1;
+
+	    iseq->arg_opts = i;
+	    iseq->arg_opt_table = ALLOC_N(VALUE, i);
+	    MEMCPY(iseq->arg_opt_table, RARRAY_PTR(labels), VALUE, i);
+	    for (j = 0; j < i; j++) {
+		iseq->arg_opt_table[j] &= ~1;
+	    }
+	    rb_ary_clear(labels);
+	}
+	else {
+	    iseq->arg_opts = 0;
+	}
+
+	if (node_init) {
+	    if (node_init->nd_1st) { /* m_init */
+		COMPILE_POPED(optargs, "init arguments (m)", node_init->nd_1st);
+	    }
+	    if (node_init->nd_2nd) { /* p_init */
+		COMPILE_POPED(optargs, "init arguments (p)", node_init->nd_2nd);
+	    }
+	}
+
+	if (rest_id) {
+	    iseq->arg_rest = get_dyna_var_idx_at_raw(iseq, rest_id);
+
+	    if (iseq->arg_rest == -1) {
+		rb_bug("arg_rest: -1");
+	    }
+
+	    if (iseq->arg_post_start == 0) {
+		iseq->arg_post_start = iseq->arg_rest + 1;
+	    }
+	}
+
+	if (block_id) {
+	    iseq->arg_block = get_dyna_var_idx_at_raw(iseq, block_id);
+	}
+
+	if (iseq->arg_opts != 0 || iseq->arg_post_len != 0 ||
+	    iseq->arg_rest != -1 || iseq->arg_block != -1) {
+	    iseq->arg_simple = 0;
+
+	    /* set arg_size: size of arguments */
+	    if (iseq->arg_block != -1) {
+		iseq->arg_size = iseq->arg_block + 1;
+	    }
+	    else if (iseq->arg_post_len) {
+		iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
+	    }
+	    else if (iseq->arg_rest != -1) {
+		iseq->arg_size = iseq->arg_rest + 1;
+	    }
+	    else if (iseq->arg_opts) {
+		iseq->arg_size = iseq->argc + iseq->arg_opts - 1;
+	    }
+	    else {
+		iseq->arg_size = iseq->argc;
+	    }
+	}
+	else {
+	    iseq->arg_simple = 1;
+	    iseq->arg_size = iseq->argc;
+	}
+
+	if (iseq->type == ISEQ_TYPE_BLOCK) {
+	    if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 && iseq->arg_rest == -1) {
+		if (iseq->argc == 1 && last_comma == 0) {
+		    /* {|a|} */
+		    iseq->arg_simple |= 0x02;
+		}
+	    }
+	}
+    }
+    else {
+	iseq->arg_simple = 1;
+    }
+
+    return COMPILE_OK;
+}
+
+static int
+iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
+{
+    int size;
+
+    if (tbl) {
+	size = (int)*tbl;
+	tbl++;
+    }
+    else {
+	size = 0;
+    }
+
+    if (size > 0) {
+	iseq->local_table = (ID *)ALLOC_N(ID, size);
+	MEMCPY(iseq->local_table, tbl, ID, size);
+    }
+
+    iseq->local_size = iseq->local_table_size = size;
+    iseq->local_size += 1;
+    /*
+      if (lfp == dfp ) { // top, class, method
+	  dfp[-1]: svar
+      else {             // block
+          dfp[-1]: cref
+      }
+     */
+
+    debugs("iseq_set_local_table: %d, %d\n", iseq->local_size, iseq->local_table_size);
+    return COMPILE_OK;
+}
+
+static int
+cdhash_cmp(VALUE val, VALUE lit)
+{
+    if (val == lit) return 0;
+    if (SPECIAL_CONST_P(lit)) {
+	return val != lit;
+    }
+    if (SPECIAL_CONST_P(val) || BUILTIN_TYPE(val) != BUILTIN_TYPE(lit)) {
+	return -1;
+    }
+    if (BUILTIN_TYPE(lit) == T_STRING) {
+	return rb_str_hash_cmp(lit, val);
+    }
+    return !rb_eql(lit, val);
+}
+
+static st_index_t
+cdhash_hash(VALUE a)
+{
+    if (SPECIAL_CONST_P(a)) return (st_index_t)a;
+    if (TYPE(a) == T_STRING) return rb_str_hash(a);
+    {
+	VALUE hval = rb_hash(a);
+	return (st_index_t)FIX2LONG(hval);
+    }
+}
+
+static const struct st_hash_type cdhash_type = {
+    cdhash_cmp,
+    cdhash_hash,
+};
+
+/**
+  ruby insn object array -> raw instruction sequence
+ */
+static int
+iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+    LABEL *lobj;
+    INSN *iobj;
+    struct iseq_insn_info_entry *insn_info_table;
+    LINK_ELEMENT *list;
+    VALUE *generated_iseq;
+
+    int k, pos, sp, stack_max = 0, line = 0;
+
+    /* set label position */
+    list = FIRST_ELEMENT(anchor);
+    k = pos = 0;
+    while (list) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		iobj = (INSN *)list;
+		line = iobj->line_no;
+		pos += insn_data_length(iobj);
+		k++;
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		lobj = (LABEL *)list;
+		lobj->position = pos;
+		lobj->set = TRUE;
+		break;
+	    }
+	  case ISEQ_ELEMENT_NONE:
+	    {
+		/* ignore */
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)list;
+		if (adjust->line_no != -1) {
+		    pos += 2 /* insn + 1 operand */;
+		    k++;
+		}
+		break;
+	    }
+	  default:
+	    dump_disasm_list(FIRST_ELEMENT(anchor));
+	    dump_disasm_list(list);
+	    rb_compile_error(RSTRING_PTR(iseq->filename), line,
+			     "error: set_sequence");
+	    break;
+	}
+	list = list->next;
+    }
+
+    /* make instruction sequence */
+    generated_iseq = ALLOC_N(VALUE, pos);
+    insn_info_table = ALLOC_N(struct iseq_insn_info_entry, k);
+    iseq->ic_entries = ALLOC_N(struct iseq_inline_cache_entry, iseq->ic_size);
+    MEMZERO(iseq->ic_entries, struct iseq_inline_cache_entry, iseq->ic_size);
+
+    list = FIRST_ELEMENT(anchor);
+    k = pos = sp = 0;
+
+    while (list) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		int j, len, insn;
+		const char *types;
+		VALUE *operands;
+
+		iobj = (INSN *)list;
+
+		/* update sp */
+		sp = calc_sp_depth(sp, iobj);
+		if (sp > stack_max) {
+		    stack_max = sp;
+		}
+
+		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
+		operands = iobj->operands;
+		insn = iobj->insn_id;
+		generated_iseq[pos] = insn;
+		types = insn_op_types(insn);
+		len = insn_len(insn);
+
+		/* operand check */
+		if (iobj->operand_size != len - 1) {
+		    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
+		    dump_disasm_list(list);
+		    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
+				     "operand size miss! (%d for %d)",
+				     iobj->operand_size, len - 1);
+		    xfree(generated_iseq);
+		    xfree(insn_info_table);
+		    return 0;
+		}
+
+		for (j = 0; types[j]; j++) {
+		    char type = types[j];
+		    /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
+		    switch (type) {
+		      case TS_OFFSET:
+			{
+			    /* label(destination position) */
+			    lobj = (LABEL *)operands[j];
+			    if (!lobj->set) {
+				rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
+						 "unknown label");
+			    }
+			    if (lobj->sp == -1) {
+				lobj->sp = sp;
+			    }
+			    generated_iseq[pos + 1 + j] =
+				lobj->position - (pos + len);
+			    break;
+			}
+		      case TS_CDHASH:
+			{
+			    /*
+			     * [obj, label, ...]
+			     */
+			    int i;
+			    VALUE lits = operands[j];
+			    VALUE map = rb_hash_new();
+			    RHASH_TBL(map)->type = &cdhash_type;
+
+			    for (i=0; i < RARRAY_LEN(lits); i+=2) {
+				VALUE obj = rb_ary_entry(lits, i);
+				VALUE lv  = rb_ary_entry(lits, i+1);
+				lobj = (LABEL *)(lv & ~1);
+
+				if (!lobj->set) {
+				    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
+						     "unknown label");
+				}
+				if (!st_lookup(rb_hash_tbl(map), obj, 0)) {
+				    rb_hash_aset(map, obj, INT2FIX(lobj->position - (pos+len)));
+				}
+				else {
+				    rb_compile_warning(RSTRING_PTR(iseq->filename), iobj->line_no,
+						       "duplicated when clause is ignored");
+				}
+			    }
+			    hide_obj(map);
+			    generated_iseq[pos + 1 + j] = map;
+			    iseq_add_mark_object(iseq, map);
+			    break;
+			}
+		      case TS_LINDEX:
+		      case TS_DINDEX:
+		      case TS_NUM:	/* ulong */
+			generated_iseq[pos + 1 + j] = FIX2INT(operands[j]);
+			break;
+		      case TS_ISEQ:	/* iseq */
+			{
+			    VALUE v = operands[j];
+			    rb_iseq_t *block = 0;
+			    if (v) {
+				GetISeqPtr(v, block);
+			    }
+			    generated_iseq[pos + 1 + j] = (VALUE)block;
+			    break;
+			}
+		      case TS_VALUE:	/* VALUE */
+			{
+			    VALUE v = operands[j];
+			    generated_iseq[pos + 1 + j] = v;
+			    /* to mark ruby object */
+			    iseq_add_mark_object(iseq, v);
+			    break;
+			}
+		      case TS_IC: /* inline cache */
+			{
+			    int ic_index = FIX2INT(operands[j]);
+			    IC ic = &iseq->ic_entries[ic_index];
+			    if (UNLIKELY(ic_index >= iseq->ic_size)) {
+				rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d",
+				       ic_index, iseq->ic_size);
+			    }
+			    generated_iseq[pos + 1 + j] = (VALUE)ic;
+			    break;
+			}
+		      case TS_ID: /* ID */
+			generated_iseq[pos + 1 + j] = SYM2ID(operands[j]);
+			break;
+		      case TS_GENTRY:
+			{
+			    struct rb_global_entry *entry =
+				(struct rb_global_entry *)(operands[j] & (~1));
+			    generated_iseq[pos + 1 + j] = (VALUE)entry;
+			}
+			break;
+		      default:
+			rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
+					 "unknown operand type: %c", type);
+			xfree(generated_iseq);
+			xfree(insn_info_table);
+			return 0;
+		    }
+		}
+		insn_info_table[k].line_no = iobj->line_no;
+		insn_info_table[k].position = pos;
+		insn_info_table[k].sp = sp;
+		pos += len;
+		k++;
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		lobj = (LABEL *)list;
+		if (lobj->sp == -1) {
+		    lobj->sp = sp;
+		}
+		else {
+		    sp = lobj->sp;
+		}
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)list;
+		int orig_sp = sp;
+
+		if (adjust->label) {
+		    sp = adjust->label->sp;
+		}
+		else {
+		    sp = 0;
+		}
+
+		if (adjust->line_no != -1) {
+		    if (orig_sp - sp > 0) {
+			insn_info_table[k].line_no = adjust->line_no;
+			insn_info_table[k].position = pos;
+			insn_info_table[k].sp = sp;
+			k++;
+			generated_iseq[pos++] = BIN(adjuststack);
+			generated_iseq[pos++] = orig_sp - sp;
+		    }
+		    else if (orig_sp - sp == 0) {
+			/* jump to next insn */
+			insn_info_table[k].line_no = adjust->line_no;
+			insn_info_table[k].position = pos;
+			insn_info_table[k].sp = sp;
+			k++;
+			generated_iseq[pos++] = BIN(jump);
+			generated_iseq[pos++] = 0;
+		    }
+		    else {
+			rb_bug("iseq_set_sequence: adjust bug");
+		    }
+		}
+		break;
+	    }
+	  default:
+	    /* ignore */
+	    break;
+	}
+	list = list->next;
+    }
+
+#if 0 /* XXX */
+    /* this check need dead code elimination */
+    if (sp != 1) {
+	rb_bug("SP is not 0 on %s (%d)\n", RSTRING_PTR(iseq->name), sp);
+    }
+#endif
+
+    iseq->iseq = (void *)generated_iseq;
+    iseq->iseq_size = pos;
+    iseq->insn_info_table = insn_info_table;
+    iseq->insn_info_size = k;
+    iseq->stack_max = stack_max;
+
+    return COMPILE_OK;
+}
+
+static int
+label_get_position(LABEL *lobj)
+{
+    return lobj->position;
+}
+
+static int
+label_get_sp(LABEL *lobj)
+{
+    return lobj->sp;
+}
+
+static int
+iseq_set_exception_table(rb_iseq_t *iseq)
+{
+    VALUE *tptr, *ptr;
+    int tlen, i;
+    struct iseq_catch_table_entry *entry;
+
+    tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary);
+    tptr = RARRAY_PTR(iseq->compile_data->catch_table_ary);
+
+    iseq->catch_table = tlen ? ALLOC_N(struct iseq_catch_table_entry, tlen) : 0;
+    iseq->catch_table_size = tlen;
+
+    for (i = 0; i < tlen; i++) {
+	ptr = RARRAY_PTR(tptr[i]);
+	entry = &iseq->catch_table[i];
+	entry->type = ptr[0] & 0xffff;
+	entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
+	entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
+	entry->iseq = ptr[3];
+
+	/* register iseq as mark object */
+	if (entry->iseq != 0) {
+	    iseq_add_mark_object(iseq, entry->iseq);
+	}
+
+	/* stack depth */
+	if (ptr[4]) {
+	    LABEL *lobj = (LABEL *)(ptr[4] & ~1);
+	    entry->cont = label_get_position(lobj);
+	    entry->sp = label_get_sp(lobj);
+
+	    /* TODO: Dirty Hack!  Fix me */
+	    if (entry->type == CATCH_TYPE_RESCUE ||
+		entry->type == CATCH_TYPE_BREAK ||
+		entry->type == CATCH_TYPE_NEXT) {
+		entry->sp--;
+	    }
+	}
+	else {
+	    entry->cont = 0;
+	}
+    }
+
+    iseq->compile_data->catch_table_ary = 0;	/* free */
+    return COMPILE_OK;
+}
+
+/*
+ * set optional argument table
+ *   def foo(a, b=expr1, c=expr2)
+ *   =>
+ *    b:
+ *      expr1
+ *    c:
+ *      expr2
+ */
+static int
+iseq_set_optargs_table(rb_iseq_t *iseq)
+{
+    int i;
+
+    if (iseq->arg_opts != 0) {
+	for (i = 0; i < iseq->arg_opts; i++) {
+	    iseq->arg_opt_table[i] =
+		label_get_position((LABEL *)iseq->arg_opt_table[i]);
+	}
+    }
+    return COMPILE_OK;
+}
+
+static LINK_ELEMENT *
+get_destination_insn(INSN *iobj)
+{
+    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
+    LINK_ELEMENT *list;
+
+    list = lobj->link.next;
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	    break;
+	}
+	list = list->next;
+    }
+    return list;
+}
+
+static LINK_ELEMENT *
+get_next_insn(INSN *iobj)
+{
+    LINK_ELEMENT *list = iobj->link.next;
+
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	    return list;
+	}
+	list = list->next;
+    }
+    return 0;
+}
+
+static LINK_ELEMENT *
+get_prev_insn(INSN *iobj)
+{
+    LINK_ELEMENT *list = iobj->link.prev;
+
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	    return list;
+	}
+	list = list->prev;
+    }
+    return 0;
+}
+
+static int
+iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
+{
+    INSN *iobj = (INSN *)list;
+  again:
+    if (iobj->insn_id == BIN(jump)) {
+	INSN *niobj, *diobj, *piobj;
+	/*
+	 *  useless jump elimination:
+	 *     jump LABEL1
+	 *     ...
+	 *   LABEL1:
+	 *     jump LABEL2
+	 *
+	 *   => in this case, first jump instruction should jump to
+	 *      LABEL2 directly
+	 */
+	diobj = (INSN *)get_destination_insn(iobj);
+	niobj = (INSN *)get_next_insn(iobj);
+
+	if (diobj == niobj) {
+	    /*
+	     *   jump LABEL
+	     *  LABEL:
+	     * =>
+	     *   LABEL:
+	     */
+	    REMOVE_ELEM(&iobj->link);
+	}
+	else if (iobj != diobj && diobj->insn_id == BIN(jump)) {
+	    if (OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
+		OPERAND_AT(iobj, 0) = OPERAND_AT(diobj, 0);
+		goto again;
+	    }
+	}
+	else if (diobj->insn_id == BIN(leave)) {
+	    /*
+	     *  jump LABEL
+	     *  ...
+	     * LABEL:
+	     *  leave
+	     * =>
+	     *  leave
+	     *  ...
+	     * LABEL:
+	     *  leave
+	     */
+	    INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave),
+					diobj->operand_size, diobj->operands);
+	    INSN *popiobj = new_insn_core(iseq, iobj->line_no,
+					  BIN(pop), 0, 0);
+	    /* replace */
+	    REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj);
+	    INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj);
+	    iobj = popiobj;
+	}
+	/*
+	 * useless jump elimination (if/unless destination):
+	 *   if   L1
+	 *   jump L2
+	 * L1:
+	 *   ...
+	 * L2:
+	 *
+	 * ==>
+	 *   unless L2
+	 * L1:
+	 *   ...
+	 * L2:
+	 */
+	else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
+		 (piobj->insn_id == BIN(branchif) ||
+		  piobj->insn_id == BIN(branchunless))) {
+	    if (niobj == (INSN *)get_destination_insn(piobj)) {
+		piobj->insn_id = (piobj->insn_id == BIN(branchif))
+		  ? BIN(branchunless) : BIN(branchif);
+		OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0);
+		REMOVE_ELEM(&iobj->link);
+	    }
+	}
+    }
+
+    if (iobj->insn_id == BIN(branchif) ||
+	iobj->insn_id == BIN(branchunless)) {
+	/*
+	 *   if L1
+	 *   ...
+	 * L1:
+	 *   jump L2
+	 * =>
+	 *   if L2
+	 */
+	INSN *nobj = (INSN *)get_destination_insn(iobj);
+	if (nobj->insn_id == BIN(jump)) {
+	    OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0);
+	}
+    }
+
+    if (do_tailcallopt && iobj->insn_id == BIN(leave)) {
+	/*
+	 *  send ...
+	 *  leave
+	 * =>
+	 *  send ..., ... | VM_CALL_TAILCALL_BIT, ...
+	 *  leave # unreachable
+	 */
+	INSN *piobj = (INSN *)get_prev_insn((INSN *)list);
+
+	if (piobj->insn_id == BIN(send) &&
+	    piobj->operands[2] == 0 /* block */
+	    ) {
+	    piobj->operands[3] = FIXNUM_OR(piobj->operands[3], VM_CALL_TAILCALL_BIT);
+	}
+    }
+    return COMPILE_OK;
+}
+
+static int
+insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
+{
+    int i, old_opsize = iobj->operand_size;
+
+    iobj->insn_id = insn_id;
+    iobj->operand_size = insn_len(insn_id) - 1;
+    /* printf("iobj->operand_size: %d\n", iobj->operand_size); */
+
+    if (iobj->operand_size > old_opsize) {
+	iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size);
+    }
+
+    for (i=0; i<iobj->operand_size; i++) {
+	iobj->operands[i] = INT2FIX(iseq->ic_size++);
+    }
+
+    return COMPILE_OK;
+}
+
+static int
+iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
+{
+    if (iobj->insn_id == BIN(send)) {
+	ID mid = SYM2ID(OPERAND_AT(iobj, 0));
+	int argc = FIX2INT(OPERAND_AT(iobj, 1));
+	VALUE block = OPERAND_AT(iobj, 2);
+	VALUE flag = OPERAND_AT(iobj, 3);
+
+	/* TODO: should be more sophisticated search */
+	if (block == 0 && flag == INT2FIX(0)) {
+	    if (argc == 0) {
+		if (mid == idLength) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_length));
+		}
+		else if (mid == idSize) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_size));
+		}
+		else if (mid == idSucc) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_succ));
+		}
+		else if (mid == idNot) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_not));
+		}
+	    }
+	    else if (argc == 1) {
+		if (0) {
+		}
+		else if (mid == idPLUS) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_plus));
+		}
+		else if (mid == idMINUS) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_minus));
+		}
+		else if (mid == idMULT) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_mult));
+		}
+		else if (mid == idDIV) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_div));
+		}
+		else if (mid == idMOD) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_mod));
+		}
+		else if (mid == idEq) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_eq));
+		}
+		else if (mid == idNeq) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_neq));
+		}
+		else if (mid == idLT) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_lt));
+		}
+		else if (mid == idLE) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_le));
+		}
+		else if (mid == idGT) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_gt));
+		}
+		else if (mid == idGE) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_ge));
+		}
+		else if (mid == idLTLT) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_ltlt));
+		}
+		else if (mid == idAREF) {
+		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_aref));
+		}
+	    }
+	}
+    }
+    return COMPILE_OK;
+}
+
+static int
+iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *list;
+    const int do_peepholeopt = iseq->compile_data->option->peephole_optimization;
+    const int do_tailcallopt = iseq->compile_data->option->tailcall_optimization;
+    const int do_si = iseq->compile_data->option->specialized_instruction;
+    const int do_ou = iseq->compile_data->option->operands_unification;
+    list = FIRST_ELEMENT(anchor);
+
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN) {
+	    if (do_peepholeopt) {
+		iseq_peephole_optimize(iseq, list, do_tailcallopt);
+	    }
+	    if (do_si) {
+		iseq_specialized_instruction(iseq, (INSN *)list);
+	    }
+	    if (do_ou) {
+		insn_operands_unification((INSN *)list);
+	    }
+	}
+	list = list->next;
+    }
+    return COMPILE_OK;
+}
+
+#if OPT_INSTRUCTIONS_UNIFICATION
+static INSN *
+new_unified_insn(rb_iseq_t *iseq,
+		 int insn_id, int size, LINK_ELEMENT *seq_list)
+{
+    INSN *iobj = 0;
+    LINK_ELEMENT *list = seq_list;
+    int i, argc = 0;
+    VALUE *operands = 0, *ptr = 0;
+
+
+    /* count argc */
+    for (i = 0; i < size; i++) {
+	iobj = (INSN *)list;
+	argc += iobj->operand_size;
+	list = list->next;
+    }
+
+    if (argc > 0) {
+	ptr = operands =
+	    (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+    }
+
+    /* copy operands */
+    list = seq_list;
+    for (i = 0; i < size; i++) {
+	iobj = (INSN *)list;
+	MEMCPY(ptr, iobj->operands, VALUE, iobj->operand_size);
+	ptr += iobj->operand_size;
+	list = list->next;
+    }
+
+    return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands);
+}
+#endif
+
+/*
+ * This scheme can get more performance if do this optimize with
+ * label address resolving.
+ * It's future work (if compile time was bottle neck).
+ */
+static int
+iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+#if OPT_INSTRUCTIONS_UNIFICATION
+    LINK_ELEMENT *list;
+    INSN *iobj, *niobj;
+    int id, k;
+    intptr_t j;
+
+    list = FIRST_ELEMENT(anchor);
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN) {
+	    iobj = (INSN *)list;
+	    id = iobj->insn_id;
+	    if (unified_insns_data[id] != 0) {
+		const int *const *entry = unified_insns_data[id];
+		for (j = 1; j < (intptr_t)entry[0]; j++) {
+		    const int *unified = entry[j];
+		    LINK_ELEMENT *li = list->next;
+		    for (k = 2; k < unified[1]; k++) {
+			if (li->type != ISEQ_ELEMENT_INSN ||
+			    ((INSN *)li)->insn_id != unified[k]) {
+			    goto miss;
+			}
+			li = li->next;
+		    }
+		    /* matched */
+		    niobj =
+			new_unified_insn(iseq, unified[0], unified[1] - 1,
+					 list);
+
+		    /* insert to list */
+		    niobj->link.prev = (LINK_ELEMENT *)iobj->link.prev;
+		    niobj->link.next = li;
+		    if (li) {
+			li->prev = (LINK_ELEMENT *)niobj;
+		    }
+
+		    list->prev->next = (LINK_ELEMENT *)niobj;
+		    list = (LINK_ELEMENT *)niobj;
+		    break;
+		  miss:;
+		}
+	    }
+	}
+	list = list->next;
+    }
+#endif
+    return COMPILE_OK;
+}
+
+#if OPT_STACK_CACHING
+
+#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)]
+#define SC_NEXT(insn)       sc_insn_next[insn]
+
+#include "opt_sc.inc"
+
+static int
+insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
+{
+    int nstate;
+    int insn_id;
+
+    insn_id = iobj->insn_id;
+    iobj->insn_id = SC_INSN(insn_id, state);
+    nstate = SC_NEXT(iobj->insn_id);
+
+    if (insn_id == BIN(jump) ||
+	insn_id == BIN(branchif) || insn_id == BIN(branchunless)) {
+	LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
+
+	if (lobj->sc_state != 0) {
+	    if (lobj->sc_state != nstate) {
+		dump_disasm_list((LINK_ELEMENT *)iobj);
+		dump_disasm_list((LINK_ELEMENT *)lobj);
+		printf("\n-- %d, %d\n", lobj->sc_state, nstate);
+		rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
+				 "insn_set_sc_state error\n");
+		return 0;
+	    }
+	}
+	else {
+	    lobj->sc_state = nstate;
+	}
+	if (insn_id == BIN(jump)) {
+	    nstate = SCS_XX;
+	}
+    }
+    else if (insn_id == BIN(leave)) {
+	nstate = SCS_XX;
+    }
+
+    return nstate;
+}
+
+static int
+label_set_sc_state(LABEL *lobj, int state)
+{
+    if (lobj->sc_state != 0) {
+	if (lobj->sc_state != state) {
+	    state = lobj->sc_state;
+	}
+    }
+    else {
+	lobj->sc_state = state;
+    }
+
+    return state;
+}
+
+
+#endif
+
+static int
+iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+#if OPT_STACK_CACHING
+    LINK_ELEMENT *list;
+    int state, insn_id;
+
+    /* initialize */
+    state = SCS_XX;
+    list = FIRST_ELEMENT(anchor);
+    /* dump_disasm_list(list); */
+
+    /* for each list element */
+    while (list) {
+      redo_point:
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		INSN *iobj = (INSN *)list;
+		insn_id = iobj->insn_id;
+
+		/* dump_disasm_list(list); */
+
+		switch (insn_id) {
+		  case BIN(nop):
+		    {
+			/* exception merge point */
+			if (state != SCS_AX) {
+			    INSN *rpobj =
+				new_insn_body(iseq, 0, BIN(reput), 0);
+
+			    /* replace this insn */
+			    REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj);
+			    list = (LINK_ELEMENT *)rpobj;
+			    goto redo_point;
+			}
+			break;
+		    }
+		  case BIN(swap):
+		    {
+			if (state == SCS_AB || state == SCS_BA) {
+			    state = (state == SCS_AB ? SCS_BA : SCS_AB);
+
+			    REMOVE_ELEM(list);
+			    list = list->next;
+			    goto redo_point;
+			}
+			break;
+		    }
+		  case BIN(pop):
+		    {
+			switch (state) {
+			  case SCS_AX:
+			  case SCS_BX:
+			    state = SCS_XX;
+			    break;
+			  case SCS_AB:
+			    state = SCS_AX;
+			    break;
+			  case SCS_BA:
+			    state = SCS_BX;
+			    break;
+			  case SCS_XX:
+			    goto normal_insn;
+			  default:
+			    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
+					     "unreachable");
+			}
+			/* remove useless pop */
+			REMOVE_ELEM(list);
+			list = list->next;
+			goto redo_point;
+		    }
+		  default:;
+		    /* none */
+		}		/* end of switch */
+	      normal_insn:
+		state = insn_set_sc_state(iseq, iobj, state);
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		LABEL *lobj;
+		lobj = (LABEL *)list;
+
+		state = label_set_sc_state(lobj, state);
+	    }
+	  default:
+	    break;
+	}
+	list = list->next;
+    }
+#endif
+    return COMPILE_OK;
+}
+
+
+
+static int
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int *cntp)
+{
+    NODE *list = node->nd_next;
+    VALUE lit = node->nd_lit;
+    int cnt = 0;
+
+    debugp_param("nd_lit", lit);
+    if (!NIL_P(lit)) {
+	hide_obj(lit);
+	cnt++;
+	ADD_INSN1(ret, nd_line(node), putobject, lit);
+    }
+
+    while (list) {
+	COMPILE(ret, "each string", list->nd_head);
+	cnt++;
+	list = list->nd_next;
+    }
+    *cntp = cnt;
+
+    return COMPILE_OK;
+}
+
+static int
+compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
+{
+    int cnt;
+    compile_dstr_fragments(iseq, ret, node, &cnt);
+    ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt));
+    return COMPILE_OK;
+}
+
+static int
+compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
+{
+    int cnt;
+    compile_dstr_fragments(iseq, ret, node, &cnt);
+    ADD_INSN2(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt));
+    return COMPILE_OK;
+}
+
+static int
+compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
+			 LABEL *then_label, LABEL *else_label)
+{
+    switch (nd_type(cond)) {
+      case NODE_AND:
+	{
+	    LABEL *label = NEW_LABEL(nd_line(cond));
+	    compile_branch_condition(iseq, ret, cond->nd_1st, label,
+				     else_label);
+	    ADD_LABEL(ret, label);
+	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
+				     else_label);
+	    break;
+	}
+      case NODE_OR:
+	{
+	    LABEL *label = NEW_LABEL(nd_line(cond));
+	    compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
+				     label);
+	    ADD_LABEL(ret, label);
+	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
+				     else_label);
+	    break;
+	}
+      case NODE_LIT:		/* NODE_LIT is always not true */
+      case NODE_TRUE:
+      case NODE_STR:
+	/* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
+	ADD_INSNL(ret, nd_line(cond), jump, then_label);
+	break;
+      case NODE_FALSE:
+      case NODE_NIL:
+	/* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
+	ADD_INSNL(ret, nd_line(cond), jump, else_label);
+	break;
+      default:
+	COMPILE(ret, "branch condition", cond);
+	ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
+	ADD_INSNL(ret, nd_line(cond), jump, then_label);
+	break;
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
+	       VALUE opt_p, int poped)
+{
+    NODE *node = node_root;
+    int len = (int)node->nd_alen, line = (int)nd_line(node), i=0;
+    DECL_ANCHOR(anchor);
+
+    INIT_ANCHOR(anchor);
+    if (nd_type(node) != NODE_ZARRAY) {
+	while (node) {
+	    if (nd_type(node) != NODE_ARRAY) {
+		rb_bug("compile_array: This node is not NODE_ARRAY, but %s",
+		       ruby_node_name(nd_type(node)));
+	    }
+
+	    i++;
+	    if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
+		opt_p = Qfalse;
+	    }
+	    COMPILE_(anchor, "array element", node->nd_head, poped);
+	    node = node->nd_next;
+	}
+    }
+
+    if (len != i) {
+	if (0) {
+	    rb_bug("node error: compile_array (%d: %d-%d)",
+		   (int)nd_line(node_root), len, i);
+	}
+	len = i;
+    }
+
+    if (opt_p == Qtrue) {
+	if (!poped) {
+	    VALUE ary = rb_ary_tmp_new(len);
+	    node = node_root;
+	    while (node) {
+		rb_ary_push(ary, node->nd_head->nd_lit);
+		node = node->nd_next;
+	    }
+	    OBJ_FREEZE(ary);
+	    iseq_add_mark_object_compile_time(iseq, ary);
+	    ADD_INSN1(ret, nd_line(node_root), duparray, ary);
+	}
+    }
+    else {
+	if (!poped) {
+	    ADD_INSN1(anchor, line, newarray, INT2FIX(len));
+	}
+	APPEND_LIST(ret, anchor);
+    }
+    return len;
+}
+
+static VALUE
+compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, VALUE opt_p)
+{
+    return compile_array_(iseq, ret, node_root, opt_p, 0);
+}
+
+static VALUE
+case_when_optimizable_literal(NODE * node)
+{
+    switch (nd_type(node)) {
+      case NODE_LIT: {
+	VALUE v = node->nd_lit;
+	if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
+	    return v;
+	}
+	break;
+      }
+      case NODE_STR:
+	return node->nd_lit;
+    }
+    return Qfalse;
+}
+
+static VALUE
+when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, VALUE special_literals)
+{
+    while (vals) {
+	VALUE lit;
+	NODE* val;
+
+	val = vals->nd_head;
+
+	if (special_literals &&
+	    (lit = case_when_optimizable_literal(val)) != Qfalse) {
+	    rb_ary_push(special_literals, lit);
+	    rb_ary_push(special_literals, (VALUE)(l1) | 1);
+	}
+	else {
+	    special_literals = Qfalse;
+	}
+
+	COMPILE(cond_seq, "when cond", val);
+	ADD_INSN1(cond_seq, nd_line(val), topn, INT2FIX(1));
+	ADD_SEND(cond_seq, nd_line(val), ID2SYM(idEqq), INT2FIX(1));
+	ADD_INSNL(cond_seq, nd_line(val), branchif, l1);
+	vals = vals->nd_next;
+    }
+    return special_literals;
+}
+
+static int
+compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_ATTRASGN: {
+	INSN *iobj;
+	VALUE dupidx;
+
+	COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
+	POP_ELEMENT(ret);        /* pop pop insn */
+	iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
+
+	dupidx = iobj->operands[1];
+	dupidx = FIXNUM_INC(dupidx, 1);
+	iobj->operands[1] = dupidx;
+
+	ADD_INSN1(ret, nd_line(node), topn, dupidx);
+	ADD_ELEM(ret, (LINK_ELEMENT *)iobj);
+	ADD_INSN(ret, nd_line(node), pop);	/* result */
+	ADD_INSN(ret, nd_line(node), pop);	/* rhs    */
+	break;
+      }
+      case NODE_MASGN: {
+	DECL_ANCHOR(anchor);
+	INIT_ANCHOR(anchor);
+	COMPILE_POPED(anchor, "nest masgn lhs", node);
+	REMOVE_ELEM(FIRST_ELEMENT(anchor));
+	ADD_SEQ(ret, anchor);
+	break;
+      }
+      default: {
+	DECL_ANCHOR(anchor);
+	INIT_ANCHOR(anchor);
+	COMPILE_POPED(anchor, "masgn lhs", node);
+	REMOVE_ELEM(FIRST_ELEMENT(anchor));
+	ADD_SEQ(ret, anchor);
+      }
+    }
+
+    return COMPILE_OK;
+}
+
+static void
+compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
+{
+    if (lhsn) {
+	compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
+	compile_massign_lhs(iseq, ret, lhsn->nd_head);
+    }
+}
+
+static int
+compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+		    NODE *rhsn, NODE *orig_lhsn)
+{
+    VALUE mem[64];
+    const int memsize = numberof(mem);
+    int memindex = 0;
+    int llen = 0, rlen = 0;
+    int i;
+    NODE *lhsn = orig_lhsn;
+
+#define MEMORY(v) { \
+    int i; \
+    if (memindex == memsize) return 0; \
+    for (i=0; i<memindex; i++) { \
+	if (mem[i] == (v)) return 0; \
+    } \
+    mem[memindex++] = (v); \
+}
+
+    if (rhsn == 0 || nd_type(rhsn) != NODE_ARRAY) {
+	return 0;
+    }
+
+    while (lhsn) {
+	NODE *ln = lhsn->nd_head;
+	switch (nd_type(ln)) {
+	  case NODE_LASGN:
+	    MEMORY(ln->nd_vid);
+	    break;
+	  case NODE_DASGN:
+	  case NODE_DASGN_CURR:
+	  case NODE_IASGN:
+	  case NODE_IASGN2:
+	  case NODE_CVASGN:
+	    MEMORY(ln->nd_vid);
+	    break;
+	  default:
+	    return 0;
+	}
+	lhsn = lhsn->nd_next;
+	llen++;
+    }
+
+    while (rhsn) {
+	if (llen <= rlen) {
+	    COMPILE_POPED(ret, "masgn val (popped)", rhsn->nd_head);
+	}
+	else {
+	    COMPILE(ret, "masgn val", rhsn->nd_head);
+	}
+	rhsn = rhsn->nd_next;
+	rlen++;
+    }
+
+    if (llen > rlen) {
+	for (i=0; i<llen-rlen; i++) {
+	    ADD_INSN(ret, nd_line(orig_lhsn), putnil);
+	}
+    }
+
+    compile_massign_opt_lhs(iseq, ret, orig_lhsn);
+    return 1;
+}
+
+static int
+compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
+{
+    NODE *rhsn = node->nd_value;
+    NODE *splatn = node->nd_args;
+    NODE *lhsn = node->nd_head;
+    int lhs_splat = (splatn && (VALUE)splatn != (VALUE)-1) ? 1 : 0;
+
+    if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
+	int llen = 0;
+	DECL_ANCHOR(lhsseq);
+
+	INIT_ANCHOR(lhsseq);
+
+	while (lhsn) {
+	    compile_massign_lhs(iseq, lhsseq, lhsn->nd_head);
+	    llen += 1;
+	    lhsn = lhsn->nd_next;
+	}
+
+	COMPILE(ret, "normal masgn rhs", rhsn);
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+
+	ADD_INSN2(ret, nd_line(node), expandarray,
+		  INT2FIX(llen), INT2FIX(lhs_splat));
+	ADD_SEQ(ret, lhsseq);
+
+	if (lhs_splat) {
+	    if (nd_type(splatn) == NODE_POSTARG) {
+		/*a, b, *r, p1, p2 */
+		NODE *postn = splatn->nd_2nd;
+		NODE *restn = splatn->nd_1st;
+		int num = (int)postn->nd_alen;
+		int flag = 0x02 | (((VALUE)restn == (VALUE)-1) ? 0x00 : 0x01);
+
+		ADD_INSN2(ret, nd_line(splatn), expandarray,
+			  INT2FIX(num), INT2FIX(flag));
+
+		if ((VALUE)restn != (VALUE)-1) {
+		    compile_massign_lhs(iseq, ret, restn);
+		}
+		while (postn) {
+		    compile_massign_lhs(iseq, ret, postn->nd_head);
+		    postn = postn->nd_next;
+		}
+	    }
+	    else {
+		/* a, b, *r */
+		compile_massign_lhs(iseq, ret, splatn);
+	    }
+	}
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_colon2(rb_iseq_t *iseq, NODE * node,
+	       LINK_ANCHOR *pref, LINK_ANCHOR *body)
+{
+    switch (nd_type(node)) {
+      case NODE_CONST:
+	debugi("compile_colon2 - colon", node->nd_vid);
+	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
+	break;
+      case NODE_COLON3:
+	debugi("compile_colon2 - colon3", node->nd_mid);
+	ADD_INSN(body, nd_line(node), pop);
+	ADD_INSN1(body, nd_line(node), putobject, rb_cObject);
+	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+	break;
+      case NODE_COLON2:
+	compile_colon2(iseq, node->nd_head, pref, body);
+	debugi("compile_colon2 - colon2", node->nd_mid);
+	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+	break;
+      default:
+	COMPILE(pref, "const colon2 prefix", node);
+	break;
+    }
+    return COMPILE_OK;
+}
+
+static VALUE
+compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
+{
+    if (nd_type(cpath) == NODE_COLON3) {
+	/* toplevel class ::Foo */
+	ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
+	return Qfalse;
+    }
+    else if (cpath->nd_head) {
+	/* Bar::Foo */
+	COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
+	return Qfalse;
+    }
+    else {
+	/* class at cbase Foo */
+	ADD_INSN1(ret, nd_line(cpath), putspecialobject,
+		  INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+	return Qtrue;
+    }
+}
+
+static int
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+	     NODE *node, LABEL **lfinish, VALUE needstr)
+{
+    const char *estr = 0;
+    enum node_type type;
+
+    switch (type = nd_type(node)) {
+
+	/* easy literals */
+      case NODE_NIL:
+	estr = "nil";
+	break;
+      case NODE_SELF:
+	estr = "self";
+	break;
+      case NODE_TRUE:
+	estr = "true";
+	break;
+      case NODE_FALSE:
+	estr = "false";
+	break;
+
+      case NODE_ARRAY:{
+	NODE *vals = node;
+
+	do {
+	    defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
+
+	    if (!lfinish[1]) {
+		lfinish[1] = NEW_LABEL(nd_line(node));
+	    }
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	} while ((vals = vals->nd_next) != NULL);
+      }
+      case NODE_STR:
+      case NODE_LIT:
+      case NODE_ZARRAY:
+      case NODE_AND:
+      case NODE_OR:
+      default:
+	estr = "expression";
+	break;
+
+	/* variables */
+      case NODE_LVAR:
+      case NODE_DVAR:
+	estr = "local-variable";
+	break;
+
+      case NODE_IVAR:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_IVAR),
+		  ID2SYM(node->nd_vid), needstr);
+	return 1;
+
+      case NODE_GVAR:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_GVAR),
+		  ID2SYM(node->nd_entry->id), needstr);
+	return 1;
+
+      case NODE_CVAR:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CVAR),
+		  ID2SYM(node->nd_vid), needstr);
+	return 1;
+
+      case NODE_CONST:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
+		  ID2SYM(node->nd_vid), needstr);
+	return 1;
+      case NODE_COLON2:
+	if (!lfinish[1]) {
+	    lfinish[1] = NEW_LABEL(nd_line(node));
+	}
+	defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
+	ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+
+	if (rb_is_const_id(node->nd_mid)) {
+	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	else {
+	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	return 1;
+      case NODE_COLON3:
+	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
+	ADD_INSN3(ret, nd_line(node), defined,
+		  INT2FIX(DEFINED_CONST), ID2SYM(node->nd_mid), needstr);
+	return 1;
+
+	/* method dispatch */
+      case NODE_CALL:
+      case NODE_VCALL:
+      case NODE_FCALL:
+      case NODE_ATTRASGN:{
+	int self = TRUE;
+
+	switch (type) {
+	  case NODE_ATTRASGN:
+	    if (node->nd_recv == (NODE *)1) break;
+	  case NODE_CALL:
+	    self = FALSE;
+	    break;
+	  default:
+	    /* through */;
+	}
+	if (!lfinish[1]) {
+	    lfinish[1] = NEW_LABEL(nd_line(node));
+	}
+	if (node->nd_args) {
+	    defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	}
+	if (!self) {
+	    LABEL *lstart = NEW_LABEL(nd_line(node));
+	    LABEL *lend = NEW_LABEL(nd_line(node));
+	    VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(),
+					     rb_str_concat(rb_str_new2
+							   ("defined guard in "),
+							   iseq->name),
+					     ISEQ_TYPE_DEFINED_GUARD, 0);
+
+	    defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+
+	    ADD_LABEL(ret, lstart);
+	    COMPILE(ret, "defined/recv", node->nd_recv);
+	    ADD_LABEL(ret, lend);
+	    ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	else {
+	    ADD_INSN(ret, nd_line(node), putself);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_FUNC),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	return 1;
+      }
+
+      case NODE_YIELD:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_YIELD), 0,
+		  needstr);
+	return 1;
+
+      case NODE_BACK_REF:
+      case NODE_NTH_REF:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_REF),
+		  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
+		  needstr);
+	return 1;
+
+      case NODE_SUPER:
+      case NODE_ZSUPER:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0,
+		  needstr);
+	return 1;
+
+      case NODE_OP_ASGN1:
+      case NODE_OP_ASGN2:
+      case NODE_OP_ASGN_OR:
+      case NODE_OP_ASGN_AND:
+      case NODE_MASGN:
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:
+      case NODE_GASGN:
+      case NODE_IASGN:
+      case NODE_CDECL:
+      case NODE_CVDECL:
+      case NODE_CVASGN:
+	estr = "assignment";
+	break;
+    }
+
+    if (estr != 0) {
+	if (needstr != Qfalse) {
+	    VALUE str = rb_str_new2(estr);
+	    hide_obj(str);
+	    ADD_INSN1(ret, nd_line(node), putstring, str);
+	    iseq_add_mark_object_compile_time(iseq, str);
+	}
+	else {
+	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
+	}
+	return 1;
+    }
+    return 0;
+}
+
+#define BUFSIZE 0x100
+
+static VALUE
+make_name_for_block(rb_iseq_t *iseq)
+{
+    int level = 1;
+    rb_iseq_t *ip = iseq;
+
+    if (iseq->parent_iseq != 0) {
+	while (ip->local_iseq != ip) {
+	    if (ip->type == ISEQ_TYPE_BLOCK) {
+		level++;
+	    }
+	    ip = ip->parent_iseq;
+	}
+    }
+
+    if (level == 1) {
+	return rb_sprintf("block in %s", RSTRING_PTR(ip->name));
+    }
+    else {
+	return rb_sprintf("block (%d levels) in %s", level, RSTRING_PTR(ip->name));
+    }
+}
+
+static void
+push_ensure_entry(rb_iseq_t *iseq,
+		  struct iseq_compile_data_ensure_node_stack *enl,
+		  struct ensure_range *er, NODE *node)
+{
+    enl->ensure_node = node;
+    enl->prev = iseq->compile_data->ensure_node_stack;	/* prev */
+    enl->erange = er;
+    iseq->compile_data->ensure_node_stack = enl;
+}
+
+static void
+add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
+		 LABEL *lstart, LABEL *lend)
+{
+    struct ensure_range *ne =
+	compile_data_alloc(iseq, sizeof(struct ensure_range));
+
+    while (erange->next != 0) {
+	erange = erange->next;
+    }
+    ne->next = 0;
+    ne->begin = lend;
+    ne->end = erange->end;
+    erange->end = lstart;
+
+    erange->next = ne;
+}
+
+static void
+add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
+{
+    struct iseq_compile_data_ensure_node_stack *enlp =
+	iseq->compile_data->ensure_node_stack;
+    struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
+    DECL_ANCHOR(ensure);
+
+    INIT_ANCHOR(ensure);
+    while (enlp) {
+	if (enlp->erange != 0) {
+	    DECL_ANCHOR(ensure_part);
+	    LABEL *lstart = NEW_LABEL(0);
+	    LABEL *lend = NEW_LABEL(0);
+	    INIT_ANCHOR(ensure_part);
+
+	    add_ensure_range(iseq, enlp->erange, lstart, lend);
+
+	    iseq->compile_data->ensure_node_stack = enlp->prev;
+	    ADD_LABEL(ensure_part, lstart);
+	    COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
+	    ADD_LABEL(ensure_part, lend);
+	    ADD_SEQ(ensure, ensure_part);
+	}
+	else {
+	    if (!is_return) {
+		break;
+	    }
+	}
+	enlp = enlp->prev;
+    }
+    iseq->compile_data->ensure_node_stack = prev_enlp;
+    ADD_SEQ(ret, ensure);
+}
+
+static VALUE
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned long *flag)
+{
+    VALUE argc = INT2FIX(0);
+    int nsplat = 0;
+    DECL_ANCHOR(arg_block);
+    DECL_ANCHOR(args_splat);
+
+    INIT_ANCHOR(arg_block);
+    INIT_ANCHOR(args_splat);
+    if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
+	COMPILE(arg_block, "block", argn->nd_body);
+	*flag |= VM_CALL_ARGS_BLOCKARG_BIT;
+	argn = argn->nd_head;
+    }
+
+  setup_argn:
+    if (argn) {
+	switch (nd_type(argn)) {
+	  case NODE_SPLAT: {
+	    COMPILE(args, "args (splat)", argn->nd_head);
+	    argc = INT2FIX(1);
+	    nsplat++;
+	    *flag |= VM_CALL_ARGS_SPLAT_BIT;
+	    break;
+	  }
+	  case NODE_ARGSCAT:
+	  case NODE_ARGSPUSH: {
+	    int next_is_array = (nd_type(argn->nd_head) == NODE_ARRAY);
+	    DECL_ANCHOR(tmp);
+
+	    INIT_ANCHOR(tmp);
+	    COMPILE(tmp, "args (cat: splat)", argn->nd_body);
+	    if (next_is_array && nsplat == 0) {
+		/* none */
+	    }
+	    else {
+		if (nd_type(argn) == NODE_ARGSCAT) {
+		    ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse);
+		}
+		else {
+		    ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
+		}
+	    }
+	    INSERT_LIST(args_splat, tmp);
+	    nsplat++;
+	    *flag |= VM_CALL_ARGS_SPLAT_BIT;
+
+	    if (next_is_array) {
+		argc = INT2FIX(compile_array(iseq, args, argn->nd_head, Qfalse) + 1);
+		POP_ELEMENT(args);
+	    }
+	    else {
+		argn = argn->nd_head;
+		goto setup_argn;
+	    }
+	    break;
+	  }
+	  case NODE_ARRAY: {
+	    argc = INT2FIX(compile_array(iseq, args, argn, Qfalse));
+	    POP_ELEMENT(args);
+	    break;
+	  }
+	  default: {
+	    rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn)));
+	  }
+	}
+    }
+
+    if (nsplat > 1) {
+	int i;
+	for (i=1; i<nsplat; i++) {
+	    ADD_INSN(args_splat, nd_line(args), concatarray);
+	}
+    }
+
+    if (!LIST_SIZE_ZERO(args_splat)) {
+	ADD_SEQ(args, args_splat);
+    }
+
+    if (*flag & VM_CALL_ARGS_BLOCKARG_BIT) {
+	ADD_SEQ(args, arg_block);
+    }
+    return argc;
+}
+
+
+/**
+  compile each node
+
+  self:  InstructionSequence
+  node:  Ruby compiled node
+  poped: This node will be poped
+ */
+static int
+iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
+{
+    enum node_type type;
+
+    if (node == 0) {
+	if (!poped) {
+	    debugs("node: NODE_NIL(implicit)\n");
+	    ADD_INSN(ret, iseq->compile_data->last_line, putnil);
+	}
+	return COMPILE_OK;
+    }
+
+    iseq->compile_data->last_line = (int)nd_line(node);
+    debug_node_start(node);
+
+    type = nd_type(node);
+
+    if (node->flags & NODE_FL_NEWLINE) {
+	ADD_TRACE(ret, nd_line(node), RUBY_EVENT_LINE);
+    }
+
+    switch (type) {
+      case NODE_BLOCK:{
+	while (node && nd_type(node) == NODE_BLOCK) {
+	    COMPILE_(ret, "BLOCK body", node->nd_head,
+		     (node->nd_next == 0 && poped == 0) ? 0 : 1);
+	    node = node->nd_next;
+	}
+	if (node) {
+	    COMPILE_(ret, "BLOCK next", node->nd_next, poped);
+	}
+	break;
+      }
+      case NODE_IF:{
+	DECL_ANCHOR(cond_seq);
+	DECL_ANCHOR(then_seq);
+	DECL_ANCHOR(else_seq);
+	LABEL *then_label, *else_label, *end_label;
+
+	INIT_ANCHOR(cond_seq);
+	INIT_ANCHOR(then_seq);
+	INIT_ANCHOR(else_seq);
+	then_label = NEW_LABEL(nd_line(node));
+	else_label = NEW_LABEL(nd_line(node));
+	end_label = NEW_LABEL(nd_line(node));
+
+	compile_branch_condition(iseq, cond_seq, node->nd_cond,
+				 then_label, else_label);
+	COMPILE_(then_seq, "then", node->nd_body, poped);
+	COMPILE_(else_seq, "else", node->nd_else, poped);
+
+	ADD_SEQ(ret, cond_seq);
+
+	ADD_LABEL(ret, then_label);
+	ADD_SEQ(ret, then_seq);
+	ADD_INSNL(ret, nd_line(node), jump, end_label);
+
+	ADD_LABEL(ret, else_label);
+	ADD_SEQ(ret, else_seq);
+
+	ADD_LABEL(ret, end_label);
+
+	break;
+      }
+      case NODE_CASE:{
+	NODE *vals;
+	NODE *tempnode = node;
+	LABEL *endlabel, *elselabel;
+	DECL_ANCHOR(head);
+	DECL_ANCHOR(body_seq);
+	DECL_ANCHOR(cond_seq);
+	VALUE special_literals = rb_ary_tmp_new(1);
+
+	INIT_ANCHOR(head);
+	INIT_ANCHOR(body_seq);
+	INIT_ANCHOR(cond_seq);
+	if (node->nd_head == 0) {
+	    COMPILE_(ret, "when", node->nd_body, poped);
+	    break;
+	}
+	COMPILE(head, "case base", node->nd_head);
+
+	node = node->nd_body;
+	type = nd_type(node);
+
+	if (type != NODE_WHEN) {
+	    COMPILE_ERROR((ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type)));
+	}
+
+	endlabel = NEW_LABEL(nd_line(node));
+	elselabel = NEW_LABEL(nd_line(node));
+
+	ADD_SEQ(ret, head);	/* case VAL */
+
+	while (type == NODE_WHEN) {
+	    LABEL *l1;
+
+	    l1 = NEW_LABEL(nd_line(node));
+	    ADD_LABEL(body_seq, l1);
+	    ADD_INSN(body_seq, nd_line(node), pop);
+	    COMPILE_(body_seq, "when body", node->nd_body, poped);
+	    ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
+
+	    vals = node->nd_head;
+	    if (vals) {
+		switch (nd_type(vals)) {
+		  case NODE_ARRAY:
+		    special_literals = when_vals(iseq, cond_seq, vals, l1, special_literals);
+		    break;
+		  case NODE_SPLAT:
+		  case NODE_ARGSCAT:
+		  case NODE_ARGSPUSH:
+		    special_literals = 0;
+		    COMPILE(cond_seq, "when/cond splat", vals);
+		    ADD_INSN1(cond_seq, nd_line(vals), checkincludearray, Qtrue);
+		    ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
+		    break;
+		  default:
+		    rb_bug("NODE_CASE: unknown node (%s)",
+			   ruby_node_name(nd_type(vals)));
+		}
+	    }
+	    else {
+		rb_bug("NODE_CASE: must be NODE_ARRAY, but 0");
+	    }
+
+	    node = node->nd_next;
+	    if (!node) {
+		break;
+	    }
+	    type = nd_type(node);
+	}
+	/* else */
+	if (node) {
+	    ADD_LABEL(cond_seq, elselabel);
+	    ADD_INSN(cond_seq, nd_line(node), pop);
+	    COMPILE_(cond_seq, "else", node, poped);
+	    ADD_INSNL(cond_seq, nd_line(node), jump, endlabel);
+	}
+	else {
+	    debugs("== else (implicit)\n");
+	    ADD_LABEL(cond_seq, elselabel);
+	    ADD_INSN(cond_seq, nd_line(tempnode), pop);
+	    if (!poped) {
+		ADD_INSN(cond_seq, nd_line(tempnode), putnil);
+	    }
+	    ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel);
+	}
+
+	if (special_literals) {
+	    ADD_INSN(ret, nd_line(tempnode), dup);
+	    ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch,
+		      special_literals, elselabel);
+	    iseq_add_mark_object_compile_time(iseq, special_literals);
+	}
+
+	ADD_SEQ(ret, cond_seq);
+	ADD_SEQ(ret, body_seq);
+	ADD_LABEL(ret, endlabel);
+	break;
+      }
+      case NODE_WHEN:{
+	NODE *vals;
+	NODE *val;
+	NODE *orig_node = node;
+	LABEL *endlabel;
+	DECL_ANCHOR(body_seq);
+
+	INIT_ANCHOR(body_seq);
+	endlabel = NEW_LABEL(nd_line(node));
+
+	while (node && nd_type(node) == NODE_WHEN) {
+	    LABEL *l1 = NEW_LABEL(nd_line(node));
+	    ADD_LABEL(body_seq, l1);
+	    COMPILE_(body_seq, "when", node->nd_body, poped);
+	    ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
+
+	    vals = node->nd_head;
+	    if (!vals) {
+		rb_bug("NODE_WHEN: must be NODE_ARRAY, but 0");
+	    }
+	    switch (nd_type(vals)) {
+	      case NODE_ARRAY:
+		while (vals) {
+		    val = vals->nd_head;
+		    COMPILE(ret, "when2", val);
+		    ADD_INSNL(ret, nd_line(val), branchif, l1);
+		    vals = vals->nd_next;
+		}
+		break;
+	      case NODE_SPLAT:
+	      case NODE_ARGSCAT:
+	      case NODE_ARGSPUSH:
+		ADD_INSN(ret, nd_line(vals), putnil);
+		COMPILE(ret, "when2/cond splat", vals);
+		ADD_INSN1(ret, nd_line(vals), checkincludearray, Qfalse);
+		ADD_INSN(ret, nd_line(vals), pop);
+		ADD_INSNL(ret, nd_line(vals), branchif, l1);
+		break;
+	      default:
+		rb_bug("NODE_WHEN: unknown node (%s)",
+		       ruby_node_name(nd_type(vals)));
+	    }
+	    node = node->nd_next;
+	}
+	/* else */
+	COMPILE_(ret, "else", node, poped);
+	ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
+
+	ADD_SEQ(ret, body_seq);
+	ADD_LABEL(ret, endlabel);
+
+	break;
+      }
+      case NODE_OPT_N:
+      case NODE_WHILE:
+      case NODE_UNTIL:{
+	LABEL *prev_start_label = iseq->compile_data->start_label;
+	LABEL *prev_end_label = iseq->compile_data->end_label;
+	LABEL *prev_redo_label = iseq->compile_data->redo_label;
+	int prev_loopval_popped = iseq->compile_data->loopval_popped;
+
+	struct iseq_compile_data_ensure_node_stack enl;
+
+	LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(nd_line(node));	/* next  */
+	LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(nd_line(node));	/* redo  */
+	LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(nd_line(node));	/* break */
+	LABEL *end_label = NEW_LABEL(nd_line(node));
+
+	LABEL *next_catch_label = NEW_LABEL(nd_line(node));
+	LABEL *tmp_label = NULL;
+
+	iseq->compile_data->loopval_popped = 0;
+	push_ensure_entry(iseq, &enl, 0, 0);
+
+	if (type == NODE_OPT_N || node->nd_state == 1) {
+	    ADD_INSNL(ret, nd_line(node), jump, next_label);
+	}
+	else {
+	    tmp_label = NEW_LABEL(nd_line(node));
+	    ADD_INSNL(ret, nd_line(node), jump, tmp_label);
+	}
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_LABEL(ret, next_catch_label);
+	ADD_INSN(ret, nd_line(node), pop);
+	ADD_INSNL(ret, nd_line(node), jump, next_label);
+	if (tmp_label) ADD_LABEL(ret, tmp_label);
+
+	ADD_LABEL(ret, redo_label);
+	COMPILE_POPED(ret, "while body", node->nd_body);
+	ADD_LABEL(ret, next_label);	/* next */
+
+	if (type == NODE_WHILE) {
+	    compile_branch_condition(iseq, ret, node->nd_cond,
+				     redo_label, end_label);
+	}
+	else if (type == NODE_UNTIL) {
+	    /* untile */
+	    compile_branch_condition(iseq, ret, node->nd_cond,
+				     end_label, redo_label);
+	}
+	else {
+	    ADD_CALL_RECEIVER(ret, nd_line(node));
+	    ADD_CALL(ret, nd_line(node), ID2SYM(idGets), INT2FIX(0));
+	    ADD_INSNL(ret, nd_line(node), branchif, redo_label);
+	    /* opt_n */
+	}
+
+	ADD_LABEL(ret, end_label);
+
+	if (node->nd_state == Qundef) {
+	    /* ADD_INSN(ret, nd_line(node), putundef); */
+	    rb_bug("unsupported: putundef");
+	}
+	else {
+	    ADD_INSN(ret, nd_line(node), putnil);
+	}
+
+	ADD_LABEL(ret, break_label);	/* break */
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+
+	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label,
+			0, break_label);
+	ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, 0,
+			next_catch_label);
+	ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, 0,
+			iseq->compile_data->redo_label);
+
+	iseq->compile_data->start_label = prev_start_label;
+	iseq->compile_data->end_label = prev_end_label;
+	iseq->compile_data->redo_label = prev_redo_label;
+	iseq->compile_data->loopval_popped = prev_loopval_popped;
+	iseq->compile_data->ensure_node_stack = iseq->compile_data->ensure_node_stack->prev;
+	break;
+      }
+      case NODE_ITER:
+      case NODE_FOR:{
+	VALUE prevblock = iseq->compile_data->current_block;
+	LABEL *retry_label = NEW_LABEL(nd_line(node));
+	LABEL *retry_end_l = NEW_LABEL(nd_line(node));
+	ID mid = 0;
+
+	ADD_LABEL(ret, retry_label);
+	if (nd_type(node) == NODE_FOR) {
+	    COMPILE(ret, "iter caller (for)", node->nd_iter);
+
+	    iseq->compile_data->current_block =
+		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
+				  ISEQ_TYPE_BLOCK, nd_line(node));
+
+	    mid = idEach;
+	    ADD_SEND_R(ret, nd_line(node), ID2SYM(idEach), INT2FIX(0),
+		       iseq->compile_data->current_block, INT2FIX(0));
+	}
+	else {
+	    iseq->compile_data->current_block =
+		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
+				  ISEQ_TYPE_BLOCK, nd_line(node));
+	    COMPILE(ret, "iter caller", node->nd_iter);
+	}
+	ADD_LABEL(ret, retry_end_l);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+
+	iseq->compile_data->current_block = prevblock;
+
+	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
+
+	break;
+      }
+      case NODE_BREAK:{
+	unsigned long level = 0;
+
+	if (iseq->compile_data->redo_label != 0) {
+	    /* while/until */
+	    LABEL *splabel = NEW_LABEL(0);
+	    ADD_LABEL(ret, splabel);
+	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
+	    COMPILE_(ret, "break val (while/until)", node->nd_stts, iseq->compile_data->loopval_popped);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+
+	    if (!poped) {
+		ADD_INSN(ret, nd_line(node), putnil);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_BLOCK) {
+	  break_by_insn:
+	    /* escape from block */
+	    COMPILE(ret, "break val (block)", node->nd_stts);
+	    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
+	    if (poped) {
+		ADD_INSN(ret, nd_line(node), pop);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
+	  break_in_eval:
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with break"));
+	}
+	else {
+	    rb_iseq_t *ip = iseq->parent_iseq;
+	    while (ip) {
+		if (!ip->compile_data) {
+		    ip = 0;
+		    break;
+		}
+
+		level++;
+		if (ip->compile_data->redo_label != 0) {
+		    level = 0x8000;
+		    if (ip->compile_data->loopval_popped == 0) {
+			/* need value */
+			level |= 0x4000;
+		    }
+		    goto break_by_insn;
+		}
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
+		    level <<= 16;
+		    goto break_by_insn;
+		}
+		else if (ip->type == ISEQ_TYPE_EVAL) {
+		    goto break_in_eval;
+		}
+
+		ip = ip->parent_iseq;
+	    }
+	    COMPILE_ERROR((ERROR_ARGS "Invalid break"));
+	}
+	break;
+      }
+      case NODE_NEXT:{
+	unsigned long level = 0;
+
+	if (iseq->compile_data->redo_label != 0) {
+	    LABEL *splabel = NEW_LABEL(0);
+	    debugs("next in while loop\n");
+	    ADD_LABEL(ret, splabel);
+	    COMPILE(ret, "next val/valid syntax?", node->nd_stts);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
+	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+	    if (!poped) {
+		ADD_INSN(ret, nd_line(node), putnil);
+	    }
+	}
+	else if (iseq->compile_data->end_label) {
+	    LABEL *splabel = NEW_LABEL(0);
+	    debugs("next in block\n");
+	    ADD_LABEL(ret, splabel);
+	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
+	    COMPILE(ret, "next val", node->nd_stts);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+
+	    if (!poped) {
+		ADD_INSN(ret, nd_line(node), putnil);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
+	  next_in_eval:
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with next"));
+	}
+	else {
+	    rb_iseq_t *ip;
+	    ip = iseq;
+	    while (ip) {
+		if (!ip->compile_data) {
+		    ip = 0;
+		    break;
+		}
+
+		level = 0x8000 | 0x4000;
+		if (ip->compile_data->redo_label != 0) {
+		    /* while loop */
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_EVAL) {
+		    goto next_in_eval;
+		}
+
+		ip = ip->parent_iseq;
+	    }
+	    if (ip != 0) {
+		COMPILE(ret, "next val", node->nd_stts);
+		ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
+
+		if (poped) {
+		    ADD_INSN(ret, nd_line(node), pop);
+		}
+	    }
+	    else {
+		COMPILE_ERROR((ERROR_ARGS "Invalid next"));
+	    }
+	}
+	break;
+      }
+      case NODE_REDO:{
+	if (iseq->compile_data->redo_label) {
+	    LABEL *splabel = NEW_LABEL(0);
+	    debugs("redo in while");
+	    ADD_LABEL(ret, splabel);
+	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->redo_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+	    if (!poped) {
+		ADD_INSN(ret, nd_line(node), putnil);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
+	  redo_in_eval:
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with redo"));
+	}
+	else if (iseq->compile_data->start_label) {
+	    LABEL *splabel = NEW_LABEL(0);
+
+	    debugs("redo in block");
+	    ADD_LABEL(ret, splabel);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
+	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+
+	    if (!poped) {
+		ADD_INSN(ret, nd_line(node), putnil);
+	    }
+	}
+	else {
+	    rb_iseq_t *ip;
+	    unsigned long level;
+	    level = 0x8000 | 0x4000;
+	    ip = iseq;
+	    while (ip) {
+		if (!ip->compile_data) {
+		    ip = 0;
+		    break;
+		}
+
+		if (ip->compile_data->redo_label != 0) {
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_EVAL) {
+		    goto redo_in_eval;
+		}
+
+		ip = ip->parent_iseq;
+	    }
+	    if (ip != 0) {
+		ADD_INSN(ret, nd_line(node), putnil);
+		ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
+
+		if (poped) {
+		    ADD_INSN(ret, nd_line(node), pop);
+		}
+	    }
+	    else {
+		COMPILE_ERROR((ERROR_ARGS "Invalid redo"));
+	    }
+	}
+	break;
+      }
+      case NODE_RETRY:{
+	if (iseq->type == ISEQ_TYPE_RESCUE) {
+	    ADD_INSN(ret, nd_line(node), putnil);
+	    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x04) /* TAG_RETRY */ );
+
+	    if (poped) {
+		ADD_INSN(ret, nd_line(node), pop);
+	    }
+	}
+	else {
+	    COMPILE_ERROR((ERROR_ARGS "Invalid retry"));
+	}
+	break;
+      }
+      case NODE_BEGIN:{
+	COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped);
+	break;
+      }
+      case NODE_RESCUE:{
+	LABEL *lstart = NEW_LABEL(nd_line(node));
+	LABEL *lend = NEW_LABEL(nd_line(node));
+	LABEL *lcont = NEW_LABEL(nd_line(node));
+	VALUE rescue = NEW_CHILD_ISEQVAL(
+	    node->nd_resq,
+	    rb_str_concat(rb_str_new2("rescue in "), iseq->name),
+	    ISEQ_TYPE_RESCUE, nd_line(node));
+
+	ADD_LABEL(ret, lstart);
+	COMPILE(ret, "rescue head", node->nd_head);
+	ADD_LABEL(ret, lend);
+	if (node->nd_else) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	    COMPILE(ret, "rescue else", node->nd_else);
+	}
+	ADD_INSN(ret, nd_line(node), nop);
+	ADD_LABEL(ret, lcont);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+
+	/* register catch entry */
+	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont);
+	ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, 0, lstart);
+	break;
+      }
+      case NODE_RESBODY:{
+	NODE *resq = node;
+	NODE *narg;
+	LABEL *label_miss, *label_hit;
+
+	while (resq) {
+	    label_miss = NEW_LABEL(nd_line(node));
+	    label_hit = NEW_LABEL(nd_line(node));
+
+	    narg = resq->nd_args;
+	    if (narg) {
+		switch (nd_type(narg)) {
+		  case NODE_ARRAY:
+		    while (narg) {
+			COMPILE(ret, "rescue arg", narg->nd_head);
+			ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
+			ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
+			ADD_INSNL(ret, nd_line(node), branchif, label_hit);
+			narg = narg->nd_next;
+		    }
+		    break;
+		  case NODE_SPLAT:
+		  case NODE_ARGSCAT:
+		  case NODE_ARGSPUSH:
+		    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
+		    COMPILE(ret, "rescue/cond splat", narg);
+		    ADD_INSN1(ret, nd_line(node), checkincludearray, Qtrue);
+		    ADD_INSN(ret, nd_line(node), swap);
+		    ADD_INSN(ret, nd_line(node), pop);
+		    ADD_INSNL(ret, nd_line(node), branchif, label_hit);
+		    break;
+		  default:
+		    rb_bug("NODE_RESBODY: unknown node (%s)",
+			   ruby_node_name(nd_type(narg)));
+		}
+	    }
+	    else {
+		ADD_INSN1(ret, nd_line(node), putobject,
+			  rb_eStandardError);
+		ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
+		ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
+		ADD_INSNL(ret, nd_line(node), branchif, label_hit);
+	    }
+	    ADD_INSNL(ret, nd_line(node), jump, label_miss);
+	    ADD_LABEL(ret, label_hit);
+	    COMPILE(ret, "resbody body", resq->nd_body);
+	    if (iseq->compile_data->option->tailcall_optimization) {
+		ADD_INSN(ret, nd_line(node), nop);
+	    }
+	    ADD_INSN(ret, nd_line(node), leave);
+	    ADD_LABEL(ret, label_miss);
+	    resq = resq->nd_head;
+	}
+	break;
+      }
+      case NODE_ENSURE:{
+	DECL_ANCHOR(ensr);
+	VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr,
+					 rb_str_concat(rb_str_new2
+						       ("ensure in "),
+						       iseq->name),
+					 ISEQ_TYPE_ENSURE, nd_line(node));
+	LABEL *lstart = NEW_LABEL(nd_line(node));
+	LABEL *lend = NEW_LABEL(nd_line(node));
+	LABEL *lcont = NEW_LABEL(nd_line(node));
+	struct ensure_range er;
+	struct iseq_compile_data_ensure_node_stack enl;
+	struct ensure_range *erange;
+
+	INIT_ANCHOR(ensr);
+	COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
+
+	er.begin = lstart;
+	er.end = lend;
+	er.next = 0;
+	push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
+
+	ADD_LABEL(ret, lstart);
+	COMPILE_(ret, "ensure head", node->nd_head, poped);
+	ADD_LABEL(ret, lend);
+	if (ensr->anchor.next == 0) {
+	    ADD_INSN(ret, nd_line(node), nop);
+	}
+	else {
+	    ADD_SEQ(ret, ensr);
+	}
+	ADD_LABEL(ret, lcont);
+
+	erange = iseq->compile_data->ensure_node_stack->erange;
+	while (erange) {
+	    ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
+			    ensure, lcont);
+	    erange = erange->next;
+	}
+
+	iseq->compile_data->ensure_node_stack = enl.prev;
+	break;
+      }
+
+      case NODE_AND:
+      case NODE_OR:{
+	LABEL *end_label = NEW_LABEL(nd_line(node));
+	COMPILE(ret, "nd_1st", node->nd_1st);
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+	if (type == NODE_AND) {
+	    ADD_INSNL(ret, nd_line(node), branchunless, end_label);
+	}
+	else {
+	    ADD_INSNL(ret, nd_line(node), branchif, end_label);
+	}
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
+	ADD_LABEL(ret, end_label);
+	break;
+      }
+
+      case NODE_MASGN:{
+	compile_massign(iseq, ret, node, poped);
+	break;
+      }
+
+      case NODE_LASGN:{
+	ID id = node->nd_vid;
+	int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+
+	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
+	COMPILE(ret, "rvalue", node->nd_value);
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+	ADD_INSN1(ret, nd_line(node), setlocal, INT2FIX(idx));
+
+	break;
+      }
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:{
+	int idx, lv, ls;
+	COMPILE(ret, "dvalue", node->nd_value);
+	debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid) ? rb_id2name(node->nd_vid) : "*"));
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+
+	idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+
+	if (idx < 0) {
+	    rb_bug("NODE_DASGN(_CURR): unknown id (%s)", rb_id2name(node->nd_vid));
+	}
+
+	ADD_INSN2(ret, nd_line(node), setdynamic,
+		  INT2FIX(ls - idx), INT2FIX(lv));
+	break;
+      }
+      case NODE_GASGN:{
+	COMPILE(ret, "lvalue", node->nd_value);
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+	ADD_INSN1(ret, nd_line(node), setglobal,
+		  (((long)node->nd_entry) | 1));
+	break;
+      }
+      case NODE_IASGN:
+      case NODE_IASGN2:{
+	COMPILE(ret, "lvalue", node->nd_value);
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+	ADD_INSN2(ret, nd_line(node), setinstancevariable,
+		  ID2SYM(node->nd_vid), INT2FIX(iseq->ic_size++));
+	break;
+      }
+      case NODE_CDECL:{
+	COMPILE(ret, "lvalue", node->nd_value);
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+
+	if (node->nd_vid) {
+	    ADD_INSN1(ret, nd_line(node), putspecialobject,
+		      INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+	    ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid));
+	}
+	else {
+	    compile_cpath(ret, iseq, node->nd_else);
+	    ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_else->nd_mid));
+	}
+	break;
+      }
+      case NODE_CVASGN:{
+	COMPILE(ret, "cvasgn val", node->nd_value);
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+	ADD_INSN1(ret, nd_line(node), setclassvariable,
+		  ID2SYM(node->nd_vid));
+	break;
+      }
+      case NODE_OP_ASGN1: {
+	DECL_ANCHOR(args);
+	VALUE argc;
+	unsigned long flag = 0;
+	ID id = node->nd_mid;
+	int boff = 0;
+
+	/*
+	 * a[x] (op)= y
+	 *
+	 * nil       # nil
+	 * eval a    # nil a
+	 * eval x    # nil a x
+	 * dupn 2    # nil a x a x
+	 * send :[]  # nil a x a[x]
+	 * eval y    # nil a x a[x] y
+	 * send op   # nil a x ret
+	 * setn 3    # ret a x ret
+	 * send []=  # ret ?
+	 * pop       # ret
+	 */
+
+	/*
+	 * nd_recv[nd_args->nd_body] (nd_mid)= nd_args->nd_head;
+	 * NODE_OP_ASGN nd_recv
+	 *              nd_args->nd_head
+	 *              nd_args->nd_body
+	 *              nd_mid
+	 */
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), putnil);
+	}
+	COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
+	switch (nd_type(node->nd_args->nd_head)) {
+	  case NODE_ZARRAY:
+	    argc = INT2FIX(0);
+	    break;
+	  case NODE_BLOCK_PASS:
+	    boff = 1;
+	  default:
+	    INIT_ANCHOR(args);
+	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag);
+	    ADD_SEQ(ret, args);
+	}
+	ADD_INSN1(ret, nd_line(node), dupn, FIXNUM_INC(argc, 1 + boff));
+	ADD_SEND_R(ret, nd_line(node), ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
+
+	if (id == 0 || id == 1) {
+	    /* 0: or, 1: and
+	       a[x] ||= y
+
+	       unless/if a[x]
+	       a[x]= y
+	       else
+	       nil
+	       end
+	    */
+	    LABEL *label = NEW_LABEL(nd_line(node));
+	    LABEL *lfin = NEW_LABEL(nd_line(node));
+
+	    ADD_INSN(ret, nd_line(node), dup);
+	    if (id == 0) {
+		/* or */
+		ADD_INSNL(ret, nd_line(node), branchif, label);
+	    }
+	    else {
+		/* and */
+		ADD_INSNL(ret, nd_line(node), branchunless, label);
+	    }
+	    ADD_INSN(ret, nd_line(node), pop);
+
+	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
+	    if (!poped) {
+		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
+	    }
+	    if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+		ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
+		if (boff > 0) {
+		    ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(3));
+		    ADD_INSN(ret, nd_line(node), swap);
+		    ADD_INSN(ret, nd_line(node), pop);
+		}
+		ADD_INSN(ret, nd_line(node), concatarray);
+		if (boff > 0) {
+		    ADD_INSN1(ret, nd_line(node), setn, INT2FIX(3));
+		    ADD_INSN(ret, nd_line(node), pop);
+		    ADD_INSN(ret, nd_line(node), pop);
+		}
+		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
+			   argc, Qfalse, LONG2FIX(flag));
+	    }
+	    else {
+		if (boff > 0)
+		    ADD_INSN(ret, nd_line(node), swap);
+		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
+			   FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
+	    }
+	    ADD_INSN(ret, nd_line(node), pop);
+	    ADD_INSNL(ret, nd_line(node), jump, lfin);
+	    ADD_LABEL(ret, label);
+	    if (!poped) {
+		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
+	    }
+	    ADD_INSN1(ret, nd_line(node), adjuststack, FIXNUM_INC(argc, 2+boff));
+	    ADD_LABEL(ret, lfin);
+	}
+	else {
+	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
+	    ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1));
+	    if (!poped) {
+		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
+	    }
+	    if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+		ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
+		if (boff > 0) {
+		    ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(3));
+		    ADD_INSN(ret, nd_line(node), swap);
+		    ADD_INSN(ret, nd_line(node), pop);
+		}
+		ADD_INSN(ret, nd_line(node), concatarray);
+		if (boff > 0) {
+		    ADD_INSN1(ret, nd_line(node), setn, INT2FIX(3));
+		    ADD_INSN(ret, nd_line(node), pop);
+		    ADD_INSN(ret, nd_line(node), pop);
+		}
+		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
+			   argc, Qfalse, LONG2FIX(flag));
+	    }
+	    else {
+		if (boff > 0)
+		    ADD_INSN(ret, nd_line(node), swap);
+		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
+			   FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
+	    }
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+
+	break;
+      }
+      case NODE_OP_ASGN2:{
+	ID atype = node->nd_next->nd_mid;
+	LABEL *lfin = NEW_LABEL(nd_line(node));
+	LABEL *lcfin = NEW_LABEL(nd_line(node));
+	/*
+	  class C; attr_accessor :c; end
+	  r = C.new
+	  r.a &&= v # asgn2
+
+	  eval r    # r
+	  dup       # r r
+	  eval r.a  # r o
+
+	  # or
+	  dup       # r o o
+	  if lcfin  # r o
+	  pop       # r
+	  eval v    # r v
+	  swap      # v r
+	  topn 1    # v r v
+	  send a=   # v ?
+	  jump lfin # v ?
+
+	  lcfin:      # r o
+	  swap      # o r
+
+	  lfin:       # o ?
+	  pop       # o
+
+	  # and
+	  dup       # r o o
+	  unless lcfin
+	  pop       # r
+	  eval v    # r v
+	  swap      # v r
+	  topn 1    # v r v
+	  send a=   # v ?
+	  jump lfin # v ?
+
+	  # others
+	  eval v    # r o v
+	  send ??   # r w
+	  send a=   # w
+
+	*/
+
+	COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv);
+	ADD_INSN(ret, nd_line(node), dup);
+	ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_vid),
+		 INT2FIX(0));
+
+	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
+	    ADD_INSN(ret, nd_line(node), dup);
+	    if (atype == 0) {
+		ADD_INSNL(ret, nd_line(node), branchif, lcfin);
+	    }
+	    else {
+		ADD_INSNL(ret, nd_line(node), branchunless, lcfin);
+	    }
+	    ADD_INSN(ret, nd_line(node), pop);
+	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
+	    ADD_INSN(ret, nd_line(node), swap);
+	    ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
+	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
+		     INT2FIX(1));
+	    ADD_INSNL(ret, nd_line(node), jump, lfin);
+
+	    ADD_LABEL(ret, lcfin);
+	    ADD_INSN(ret, nd_line(node), swap);
+
+	    ADD_LABEL(ret, lfin);
+	    ADD_INSN(ret, nd_line(node), pop);
+	    if (poped) {
+		/* we can apply more optimize */
+		ADD_INSN(ret, nd_line(node), pop);
+	    }
+	}
+	else {
+	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
+	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid),
+		     INT2FIX(1));
+	    if (!poped) {
+		ADD_INSN(ret, nd_line(node), swap);
+		ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
+	    }
+	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
+		     INT2FIX(1));
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_OP_ASGN_AND:
+      case NODE_OP_ASGN_OR:{
+	LABEL *lfin = NEW_LABEL(nd_line(node));
+	LABEL *lassign;
+
+	if (nd_type(node) == NODE_OP_ASGN_OR) {
+	    LABEL *lfinish[2];
+	    lfinish[0] = lfin;
+	    lfinish[1] = 0;
+	    defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
+	    lassign = lfinish[1];
+	    if (!lassign) {
+		lassign = NEW_LABEL(nd_line(node));
+	    }
+	    ADD_INSNL(ret, nd_line(node), branchunless, lassign);
+	}
+	else {
+	    lassign = NEW_LABEL(nd_line(node));
+	}
+
+	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
+	ADD_INSN(ret, nd_line(node), dup);
+
+	if (nd_type(node) == NODE_OP_ASGN_AND) {
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfin);
+	}
+	else {
+	    ADD_INSNL(ret, nd_line(node), branchif, lfin);
+	}
+
+	ADD_INSN(ret, nd_line(node), pop);
+	ADD_LABEL(ret, lassign);
+	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
+	ADD_LABEL(ret, lfin);
+
+	if (poped) {
+	    /* we can apply more optimize */
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_CALL:
+      case NODE_FCALL:
+      case NODE_VCALL:{		/* VCALL: variable or call */
+	/*
+	  call:  obj.method(...)
+	  fcall: func(...)
+	  vcall: func
+	*/
+	DECL_ANCHOR(recv);
+	DECL_ANCHOR(args);
+	ID mid = node->nd_mid;
+	VALUE argc;
+	unsigned long flag = 0;
+	VALUE parent_block = iseq->compile_data->current_block;
+	iseq->compile_data->current_block = Qfalse;
+
+	INIT_ANCHOR(recv);
+	INIT_ANCHOR(args);
+#if SUPPORT_JOKE
+	if (nd_type(node) == NODE_VCALL) {
+	    if (mid == idBitblt) {
+		ADD_INSN(ret, nd_line(node), bitblt);
+		break;
+	    }
+	    else if (mid == idAnswer) {
+		ADD_INSN(ret, nd_line(node), answer);
+		break;
+	    }
+	}
+	/* only joke */
+	{
+	    ID goto_id;
+	    ID label_id;
+	    VALUE label;
+	    VALUE label_sym;
+
+	    CONST_ID(goto_id, "__goto__");
+	    CONST_ID(label_id, "__label__");
+
+	    if (nd_type(node) == NODE_FCALL &&
+		(mid == goto_id || mid == label_id)) {
+		if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
+		    SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
+
+		    label_sym = label = node->nd_args->nd_head->nd_lit;
+		    if ((label =
+			 rb_hash_aref(iseq->compile_data,
+				      label_sym)) == Qnil) {
+			rb_hash_aset(iseq->compile_data, label_sym,
+				     label = NEW_LABEL(nd_line(node)));
+		    }
+		}
+		else {
+		    rb_bug("invalid goto/label format");
+		}
+
+
+		if (mid == goto_id) {
+		    ADD_INSNL(ret, nd_line(node), jump, label);
+		}
+		else {
+		    ADD_LABEL(ret, label);
+		}
+		break;
+	    }
+	}
+#endif
+	/* receiver */
+	if (type == NODE_CALL) {
+	    COMPILE(recv, "recv", node->nd_recv);
+	}
+	else if (type == NODE_FCALL || type == NODE_VCALL) {
+	    ADD_CALL_RECEIVER(recv, nd_line(node));
+	}
+
+	/* args */
+	if (nd_type(node) != NODE_VCALL) {
+	    argc = setup_args(iseq, args, node->nd_args, &flag);
+	}
+	else {
+	    argc = INT2FIX(0);
+	}
+
+	ADD_SEQ(ret, recv);
+	ADD_SEQ(ret, args);
+
+	debugp_param("call args argc", argc);
+	debugp_param("call method", ID2SYM(mid));
+
+	switch (nd_type(node)) {
+	  case NODE_VCALL:
+	    flag |= VM_CALL_VCALL_BIT;
+	    /* VCALL is funcall, so fall through */
+	  case NODE_FCALL:
+	    flag |= VM_CALL_FCALL_BIT;
+	}
+
+	ADD_SEND_R(ret, nd_line(node), ID2SYM(mid),
+		   argc, parent_block, LONG2FIX(flag));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_SUPER:
+      case NODE_ZSUPER:{
+	DECL_ANCHOR(args);
+	VALUE argc;
+	unsigned long flag = 0;
+	VALUE parent_block = iseq->compile_data->current_block;
+
+	INIT_ANCHOR(args);
+	iseq->compile_data->current_block = Qfalse;
+	if (nd_type(node) == NODE_SUPER) {
+	    argc = setup_args(iseq, args, node->nd_args, &flag);
+	}
+	else {
+	    /* NODE_ZSUPER */
+	    int i;
+	    rb_iseq_t *liseq = iseq->local_iseq;
+
+	    argc = INT2FIX(liseq->argc);
+
+	    /* normal arguments */
+	    for (i = 0; i < liseq->argc; i++) {
+		int idx = liseq->local_size - i;
+		ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
+	    }
+
+	    if (!liseq->arg_simple) {
+		if (liseq->arg_opts) {
+		    /* optional arguments */
+		    int j;
+		    for (j = 0; j < liseq->arg_opts - 1; j++) {
+			int idx = liseq->local_size - (i + j);
+			ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
+		    }
+		    i += j;
+		    argc = INT2FIX(i);
+		}
+
+		if (liseq->arg_rest != -1) {
+		    /* rest argument */
+		    int idx = liseq->local_size - liseq->arg_rest;
+		    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
+		    argc = INT2FIX(liseq->arg_rest + 1);
+		    flag |= VM_CALL_ARGS_SPLAT_BIT;
+		}
+
+		if (liseq->arg_post_len) {
+		    /* post arguments */
+		    int post_len = liseq->arg_post_len;
+		    int post_start = liseq->arg_post_start;
+
+		    if (liseq->arg_rest != -1) {
+			int j;
+			for (j=0; j<post_len; j++) {
+			    int idx = liseq->local_size - (post_start + j);
+			    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
+			}
+			ADD_INSN1(args, nd_line(node), newarray, INT2FIX(j));
+			ADD_INSN (args, nd_line(node), concatarray);
+			/* argc is setteled at above */
+		    }
+		    else {
+			int j;
+			for (j=0; j<post_len; j++) {
+			    int idx = liseq->local_size - (post_start + j);
+			    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
+			}
+			argc = INT2FIX(post_len + post_start);
+		    }
+		}
+	    }
+	}
+
+	/* dummy receiver */
+	ADD_INSN1(ret, nd_line(node), putobject,
+		  nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
+	ADD_SEQ(ret, args);
+	ADD_INSN3(ret, nd_line(node), invokesuper,
+		  argc, parent_block, LONG2FIX(flag));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_ARRAY:{
+	compile_array_(iseq, ret, node, Qtrue, poped);
+	break;
+      }
+      case NODE_ZARRAY:{
+	if (!poped) {
+	    ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(0));
+	}
+	break;
+      }
+      case NODE_VALUES:{
+	NODE *n = node;
+	while (n) {
+	    COMPILE(ret, "values item", n->nd_head);
+	    n = n->nd_next;
+	}
+	ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(node->nd_alen));
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_HASH:{
+	DECL_ANCHOR(list);
+	VALUE size = 0;
+	int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY;
+
+	INIT_ANCHOR(list);
+	switch (type) {
+	  case NODE_ARRAY:{
+	    compile_array(iseq, list, node->nd_head, Qfalse);
+	    size = OPERAND_AT(POP_ELEMENT(list), 0);
+	    ADD_SEQ(ret, list);
+	    break;
+	  }
+	  case NODE_ZARRAY:
+	    size = INT2FIX(0);
+	    break;
+
+	  default:
+	    rb_bug("can't make hash with this node: %s", ruby_node_name(type));
+	}
+
+	ADD_INSN1(ret, nd_line(node), newhash, size);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_RETURN:{
+	rb_iseq_t *is = iseq;
+
+	if (is) {
+	    if (is->type == ISEQ_TYPE_TOP) {
+		COMPILE_ERROR((ERROR_ARGS "Invalid return"));
+	    }
+	    else {
+		LABEL *splabel = 0;
+
+		if (is->type == ISEQ_TYPE_METHOD) {
+		    splabel = NEW_LABEL(0);
+		    ADD_LABEL(ret, splabel);
+		    ADD_ADJUST(ret, nd_line(node), 0);
+		}
+
+		COMPILE(ret, "return nd_stts (return val)", node->nd_stts);
+
+		if (is->type == ISEQ_TYPE_METHOD) {
+		    add_ensure_iseq(ret, iseq, 1);
+		    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
+		    ADD_INSN(ret, nd_line(node), leave);
+		    ADD_ADJUST_RESTORE(ret, splabel);
+
+		    if (!poped) {
+			ADD_INSN(ret, nd_line(node), putnil);
+		    }
+		}
+		else {
+		    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x01) /* TAG_RETURN */ );
+		    if (poped) {
+			ADD_INSN(ret, nd_line(node), pop);
+		    }
+		}
+	    }
+	}
+	break;
+      }
+      case NODE_YIELD:{
+	DECL_ANCHOR(args);
+	VALUE argc;
+	unsigned long flag = 0;
+
+	INIT_ANCHOR(args);
+	if (iseq->type == ISEQ_TYPE_TOP) {
+	    COMPILE_ERROR((ERROR_ARGS "Invalid yield"));
+	}
+
+	if (node->nd_head) {
+	    argc = setup_args(iseq, args, node->nd_head, &flag);
+	}
+	else {
+	    argc = INT2FIX(0);
+	}
+
+	ADD_SEQ(ret, args);
+	ADD_INSN2(ret, nd_line(node), invokeblock, argc, LONG2FIX(flag));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_LVAR:{
+	if (!poped) {
+	    ID id = node->nd_vid;
+	    int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+
+	    debugs("id: %s idx: %d\n", rb_id2name(id), idx);
+	    ADD_INSN1(ret, nd_line(node), getlocal, INT2FIX(idx));
+	}
+	break;
+      }
+      case NODE_DVAR:{
+	int lv, idx, ls;
+	debugi("nd_vid", node->nd_vid);
+	if (!poped) {
+	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+	    if (idx < 0) {
+		rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid));
+	    }
+	    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(ls - idx), INT2FIX(lv));
+	}
+	break;
+      }
+      case NODE_GVAR:{
+	ADD_INSN1(ret, nd_line(node), getglobal,
+		  (((long)node->nd_entry) | 1));
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_IVAR:{
+	debugi("nd_vid", node->nd_vid);
+	if (!poped) {
+	    ADD_INSN2(ret, nd_line(node), getinstancevariable,
+		      ID2SYM(node->nd_vid), INT2FIX(iseq->ic_size++));
+	}
+	break;
+      }
+      case NODE_CONST:{
+	debugi("nd_vid", node->nd_vid);
+
+	if (iseq->compile_data->option->inline_const_cache) {
+	    LABEL *lend = NEW_LABEL(nd_line(node));
+	    int ic_index = iseq->ic_size++;
+
+	    ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
+	    ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
+	    ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+	    ADD_LABEL(ret, lend);
+	}
+	else {
+	    ADD_INSN(ret, nd_line(node), putnil);
+	    ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
+	}
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_CVAR:{
+	if (!poped) {
+	    ADD_INSN1(ret, nd_line(node), getclassvariable,
+		      ID2SYM(node->nd_vid));
+	}
+	break;
+      }
+      case NODE_NTH_REF:{
+        if (!poped) {
+	    ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~'  */,
+		      INT2FIX(node->nd_nth << 1));
+	}
+	break;
+      }
+      case NODE_BACK_REF:{
+	if (!poped) {
+	    ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~' */,
+		      INT2FIX(0x01 | (node->nd_nth << 1)));
+	}
+	break;
+      }
+      case NODE_MATCH:
+      case NODE_MATCH2:
+      case NODE_MATCH3:{
+	DECL_ANCHOR(recv);
+	DECL_ANCHOR(val);
+
+	INIT_ANCHOR(recv);
+	INIT_ANCHOR(val);
+	switch(nd_type(node)) {
+	  case NODE_MATCH:
+	    ADD_INSN1(recv, nd_line(node), putobject, node->nd_lit);
+	    ADD_INSN2(val, nd_line(node), getspecial, INT2FIX(0),
+		      INT2FIX(0));
+	    break;
+	  case NODE_MATCH2:
+	    COMPILE(recv, "receiver", node->nd_recv);
+	    COMPILE(val, "value", node->nd_value);
+	    break;
+	  case NODE_MATCH3:
+	    COMPILE(recv, "receiver", node->nd_value);
+	    COMPILE(val, "value", node->nd_recv);
+	    break;
+	}
+
+	if (iseq->compile_data->option->specialized_instruction) {
+	    /* TODO: detect by node */
+	    if (recv->last == recv->anchor.next &&
+		INSN_OF(recv->last) == BIN(putobject) &&
+		nd_type(node) == NODE_MATCH2) {
+		ADD_SEQ(ret, val);
+		ADD_INSN1(ret, nd_line(node), opt_regexpmatch1,
+			  OPERAND_AT(recv->last, 0));
+	    }
+	    else {
+		ADD_SEQ(ret, recv);
+		ADD_SEQ(ret, val);
+		ADD_INSN(ret, nd_line(node), opt_regexpmatch2);
+	    }
+	}
+	else {
+	    ADD_SEQ(ret, recv);
+	    ADD_SEQ(ret, val);
+	    ADD_SEND(ret, nd_line(node), ID2SYM(idEqTilde), INT2FIX(1));
+	}
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_LIT:{
+	debugp_param("lit", node->nd_lit);
+	if (!poped) {
+	    ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
+	}
+	break;
+      }
+      case NODE_STR:{
+	debugp_param("nd_lit", node->nd_lit);
+	if (!poped) {
+	    OBJ_FREEZE(node->nd_lit);
+	    ADD_INSN1(ret, nd_line(node), putstring, node->nd_lit);
+	}
+	break;
+      }
+      case NODE_DSTR:{
+	compile_dstr(iseq, ret, node);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_XSTR:{
+	OBJ_FREEZE(node->nd_lit);
+	ADD_CALL_RECEIVER(ret, nd_line(node));
+	ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
+	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_DXSTR:{
+	ADD_CALL_RECEIVER(ret, nd_line(node));
+	compile_dstr(iseq, ret, node);
+	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_EVSTR:{
+	COMPILE(ret, "nd_body", node->nd_body);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	else {
+	    ADD_INSN(ret, nd_line(node), tostring);
+	}
+	break;
+      }
+      case NODE_DREGX:{
+	compile_dregx(iseq, ret, node);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_DREGX_ONCE:{
+	/* TODO: once? */
+	LABEL *lend = NEW_LABEL(nd_line(node));
+	int ic_index = iseq->ic_size++;
+
+	ADD_INSN2(ret, nd_line(node), onceinlinecache, lend, INT2FIX(ic_index));
+	ADD_INSN(ret, nd_line(node), pop);
+
+	compile_dregx(iseq, ret, node);
+
+	ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+	ADD_LABEL(ret, lend);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_ARGSCAT:{
+	if (poped) {
+	    COMPILE(ret, "argscat head", node->nd_head);
+	    ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+	    ADD_INSN(ret, nd_line(node), pop);
+	    COMPILE(ret, "argscat body", node->nd_body);
+	    ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	else {
+	    COMPILE(ret, "argscat head", node->nd_head);
+	    COMPILE(ret, "argscat body", node->nd_body);
+	    ADD_INSN(ret, nd_line(node), concatarray);
+	}
+	break;
+      }
+      case NODE_ARGSPUSH:{
+	if (poped) {
+	    COMPILE(ret, "arsgpush head", node->nd_head);
+	    ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+	    ADD_INSN(ret, nd_line(node), pop);
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
+	}
+	else {
+	    COMPILE(ret, "arsgpush head", node->nd_head);
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
+	    ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
+	    ADD_INSN(ret, nd_line(node), concatarray);
+	}
+	break;
+      }
+      case NODE_SPLAT:{
+	COMPILE(ret, "splat", node->nd_head);
+	ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_DEFN:{
+	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
+				    rb_str_dup(rb_id2str(node->nd_mid)),
+				    ISEQ_TYPE_METHOD, nd_line(node));
+
+	debugp_param("defn/iseq", iseqval);
+
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
+	ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
+	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_method), INT2FIX(3));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+
+	debugp_param("defn", iseqval);
+	break;
+      }
+      case NODE_DEFS:{
+	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
+				    rb_str_dup(rb_id2str(node->nd_mid)),
+				    ISEQ_TYPE_METHOD, nd_line(node));
+
+	debugp_param("defs/iseq", iseqval);
+
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	COMPILE(ret, "defs: recv", node->nd_recv);
+	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
+	ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
+	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_singleton_method), INT2FIX(3));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_ALIAS:{
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	COMPILE(ret, "alias arg1", node->u1.node);
+	COMPILE(ret, "alias arg2", node->u2.node);
+	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_method_alias), INT2FIX(3));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_VALIAS:{
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u1.id));
+	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u2.id));
+	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_variable_alias), INT2FIX(2));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_UNDEF:{
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	COMPILE(ret, "undef arg", node->u2.node);
+	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_undef_method), INT2FIX(2));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_CLASS:{
+	VALUE iseqval =
+	    NEW_CHILD_ISEQVAL(
+		node->nd_body,
+		rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+		ISEQ_TYPE_CLASS, nd_line(node));
+	compile_cpath(ret, iseq, node->nd_cpath);
+	COMPILE(ret, "super", node->nd_super);
+	ADD_INSN3(ret, nd_line(node), defineclass,
+		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(0));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_MODULE:{
+	VALUE iseqval = NEW_CHILD_ISEQVAL(
+	    node->nd_body,
+	    rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+	    ISEQ_TYPE_CLASS, nd_line(node));
+
+	compile_cpath(ret, iseq, node->nd_cpath);
+	ADD_INSN (ret, nd_line(node), putnil); /* dummy */
+	ADD_INSN3(ret, nd_line(node), defineclass,
+		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(2));
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_SCLASS:{
+	ID singletonclass;
+	VALUE iseqval =
+	    NEW_ISEQVAL(node->nd_body, rb_str_new2("singletonclass"),
+			ISEQ_TYPE_CLASS, nd_line(node));
+
+	COMPILE(ret, "sclass#recv", node->nd_recv);
+	ADD_INSN (ret, nd_line(node), putnil);
+	CONST_ID(singletonclass, "singletonclass");
+	ADD_INSN3(ret, nd_line(node), defineclass,
+		  ID2SYM(singletonclass), iseqval, INT2FIX(1));
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_COLON2:{
+	if (rb_is_const_id(node->nd_mid)) {
+	    /* constant */
+	    LABEL *lend = NEW_LABEL(nd_line(node));
+	    int ic_index = iseq->ic_size++;
+
+	    DECL_ANCHOR(pref);
+	    DECL_ANCHOR(body);
+
+	    INIT_ANCHOR(pref);
+	    INIT_ANCHOR(body);
+	    compile_colon2(iseq, node, pref, body);
+	    if (LIST_SIZE_ZERO(pref)) {
+		if (iseq->compile_data->option->inline_const_cache) {
+		    ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
+		}
+		else {
+		    ADD_INSN(ret, nd_line(node), putnil);
+		}
+
+		ADD_SEQ(ret, body);
+
+		if (iseq->compile_data->option->inline_const_cache) {
+		    ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+		    ADD_LABEL(ret, lend);
+		}
+	    }
+	    else {
+		ADD_SEQ(ret, pref);
+		ADD_SEQ(ret, body);
+	    }
+	}
+	else {
+	    /* function call */
+	    ADD_CALL_RECEIVER(ret, nd_line(node));
+	    COMPILE(ret, "colon2#nd_head", node->nd_head);
+	    ADD_CALL(ret, nd_line(node), ID2SYM(node->nd_mid),
+		     INT2FIX(1));
+	}
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_COLON3:{
+	LABEL *lend = NEW_LABEL(nd_line(node));
+	int ic_index = iseq->ic_size++;
+
+	  debugi("colon3#nd_mid", node->nd_mid);
+
+	/* add cache insn */
+	if (iseq->compile_data->option->inline_const_cache) {
+	    ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+
+	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
+	ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+
+	if (iseq->compile_data->option->inline_const_cache) {
+	    ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+	    ADD_LABEL(ret, lend);
+	}
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_DOT2:
+      case NODE_DOT3:{
+	VALUE flag = type == NODE_DOT2 ? INT2FIX(0) : INT2FIX(1);
+	COMPILE(ret, "min", (NODE *) node->nd_beg);
+	COMPILE(ret, "max", (NODE *) node->nd_end);
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	else {
+	    ADD_INSN1(ret, nd_line(node), newrange, flag);
+	}
+	break;
+      }
+      case NODE_FLIP2:
+      case NODE_FLIP3:{
+	LABEL *lend = NEW_LABEL(nd_line(node));
+	LABEL *lfin = NEW_LABEL(nd_line(node));
+	LABEL *ltrue = NEW_LABEL(nd_line(node));
+	VALUE key = rb_sprintf("flipflag/%s-%p-%d",
+			       RSTRING_PTR(iseq->name), (void *)iseq,
+			       iseq->compile_data->flip_cnt++);
+
+	hide_obj(key);
+	iseq_add_mark_object_compile_time(iseq, key);
+	ADD_INSN2(ret, nd_line(node), getspecial, key, INT2FIX(0));
+	ADD_INSNL(ret, nd_line(node), branchif, lend);
+
+	/* *flip == 0 */
+	COMPILE(ret, "flip2 beg", node->nd_beg);
+	ADD_INSN(ret, nd_line(node), dup);
+	ADD_INSNL(ret, nd_line(node), branchunless, lfin);
+	if (nd_type(node) == NODE_FLIP3) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	    ADD_INSN1(ret, nd_line(node), setspecial, key);
+	    ADD_INSNL(ret, nd_line(node), jump, lfin);
+	}
+	else {
+	    ADD_INSN1(ret, nd_line(node), setspecial, key);
+	}
+
+	/* *flip == 1 */
+	ADD_LABEL(ret, lend);
+	COMPILE(ret, "flip2 end", node->nd_end);
+	ADD_INSNL(ret, nd_line(node), branchunless, ltrue);
+	ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
+	ADD_INSN1(ret, nd_line(node), setspecial, key);
+
+	ADD_LABEL(ret, ltrue);
+	ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
+
+	ADD_LABEL(ret, lfin);
+	break;
+      }
+      case NODE_SELF:{
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), putself);
+	}
+	break;
+      }
+      case NODE_NIL:{
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), putnil);
+	}
+	break;
+      }
+      case NODE_TRUE:{
+	if (!poped) {
+	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
+	}
+	break;
+      }
+      case NODE_FALSE:{
+	if (!poped) {
+	    ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
+	}
+	break;
+      }
+      case NODE_ERRINFO:{
+	if (!poped) {
+	    if (iseq->type == ISEQ_TYPE_RESCUE) {
+		ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
+	    }
+	    else {
+		rb_iseq_t *ip = iseq;
+		int level = 0;
+		while (ip) {
+		    if (ip->type == ISEQ_TYPE_RESCUE) {
+			break;
+		    }
+		    ip = ip->parent_iseq;
+		    level++;
+		}
+		if (ip) {
+		    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(level));
+		}
+		else {
+		    ADD_INSN(ret, nd_line(node), putnil);
+		}
+	    }
+	}
+	break;
+      }
+      case NODE_DEFINED:{
+	if (!poped) {
+	    LABEL *lfinish[2];
+	    lfinish[0] = NEW_LABEL(nd_line(node));
+	    lfinish[1] = 0;
+	    ADD_INSN(ret, nd_line(node), putnil);
+	    defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
+	    ADD_INSN(ret, nd_line(node), swap);
+	    ADD_INSN(ret, nd_line(node), pop);
+	    if (lfinish[1]) {
+		ADD_LABEL(ret, lfinish[1]);
+	    }
+	    ADD_LABEL(ret, lfinish[0]);
+	}
+	break;
+      }
+      case NODE_POSTEXE:{
+	LABEL *lend = NEW_LABEL(nd_line(node));
+	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
+	int ic_index = iseq->ic_size++;
+
+	ADD_INSN2(ret, nd_line(node), onceinlinecache, lend, INT2FIX(ic_index));
+	ADD_INSN(ret, nd_line(node), pop);
+
+	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, nd_line(node), putiseq, block);
+	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_set_postexe), INT2FIX(1));
+
+	ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+	ADD_LABEL(ret, lend);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_DSYM:{
+	compile_dstr(iseq, ret, node);
+	if (!poped) {
+	    ADD_SEND(ret, nd_line(node), ID2SYM(idIntern), INT2FIX(0));
+	}
+	else {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      case NODE_ATTRASGN:{
+	DECL_ANCHOR(recv);
+	DECL_ANCHOR(args);
+	unsigned long flag = 0;
+	VALUE argc;
+
+	INIT_ANCHOR(recv);
+	INIT_ANCHOR(args);
+	argc = setup_args(iseq, args, node->nd_args, &flag);
+
+	if (node->nd_recv == (NODE *) 1) {
+	    flag |= VM_CALL_FCALL_BIT;
+	    ADD_INSN(recv, nd_line(node), putself);
+	}
+	else {
+	    COMPILE(recv, "recv", node->nd_recv);
+	}
+
+	debugp_param("argc", argc);
+	debugp_param("nd_mid", ID2SYM(node->nd_mid));
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), putnil);
+	    ADD_SEQ(ret, recv);
+	    ADD_SEQ(ret, args);
+
+	    if (flag & VM_CALL_ARGS_BLOCKARG_BIT) {
+		ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
+		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 3));
+		ADD_INSN (ret, nd_line(node), pop);
+	    }
+	    else {
+		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 1));
+	    }
+	}
+	else {
+	    ADD_SEQ(ret, recv);
+	    ADD_SEQ(ret, args);
+	}
+	ADD_SEND_R(ret, nd_line(node), ID2SYM(node->nd_mid), argc, 0, LONG2FIX(flag));
+	ADD_INSN(ret, nd_line(node), pop);
+
+	break;
+      }
+      case NODE_OPTBLOCK:{
+	/* for optimize */
+	LABEL *redo_label = NEW_LABEL(0);
+	LABEL *next_label = NEW_LABEL(0);
+
+	iseq->compile_data->start_label = next_label;
+	iseq->compile_data->redo_label = redo_label;
+
+	ADD_LABEL(ret, redo_label);
+	COMPILE_(ret, "optblock body", node->nd_head, 1 /* pop */ );
+	ADD_LABEL(ret, next_label);
+	ADD_INSN(ret, 0, opt_checkenv);
+	break;
+      }
+      case NODE_PRELUDE:{
+	COMPILE_POPED(ret, "prelude", node->nd_head);
+	COMPILE_(ret, "body", node->nd_body, poped);
+	break;
+      }
+      case NODE_LAMBDA:{
+	/* compile same as lambda{...} */
+	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
+	VALUE argc = INT2FIX(0);
+	ADD_CALL_RECEIVER(ret, nd_line(node));
+	ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block);
+
+	if (poped) {
+	    ADD_INSN(ret, nd_line(node), pop);
+	}
+	break;
+      }
+      default:
+	rb_bug("iseq_compile_each: unknown node: %s", ruby_node_name(type));
+	return COMPILE_NG;
+    }
+
+    debug_node_end();
+    return COMPILE_OK;
+}
+
+/***************************/
+/* instruction information */
+/***************************/
+
+static int
+insn_data_length(INSN *iobj)
+{
+    return insn_len(iobj->insn_id);
+}
+
+static int
+calc_sp_depth(int depth, INSN *insn)
+{
+    return insn_stack_increase(depth, insn->insn_id, insn->operands);
+}
+
+static int
+insn_data_line_no(INSN *iobj)
+{
+    return insn_len(iobj->line_no);
+}
+
+static VALUE
+insn_data_to_s_detail(INSN *iobj)
+{
+    VALUE str = rb_sprintf("%-16s", insn_name(iobj->insn_id));
+
+    if (iobj->operands) {
+	const char *types = insn_op_types(iobj->insn_id);
+	int j;
+
+	for (j = 0; types[j]; j++) {
+	    char type = types[j];
+	    printf("str: %"PRIxVALUE", type: %c\n", str, type);
+
+	    switch (type) {
+	      case TS_OFFSET:	/* label(destination position) */
+		{
+		    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
+		    rb_str_catf(str, "<L%03d>", lobj->label_no);
+		    break;
+		}
+		break;
+	      case TS_ISEQ:	/* iseq */
+		{
+		    rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
+		    VALUE val = Qnil;
+		    if (iseq) {
+			val = iseq->self;
+		    }
+		    rb_str_concat(str, rb_inspect(val));
+		}
+		break;
+	      case TS_LINDEX:
+	      case TS_DINDEX:
+	      case TS_NUM:	/* ulong */
+	      case TS_VALUE:	/* VALUE */
+		rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
+		break;
+	      case TS_ID:	/* ID */
+		rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
+		break;
+	      case TS_GENTRY:
+		{
+		    struct rb_global_entry *entry = (struct rb_global_entry *)
+		      (OPERAND_AT(iobj, j) & (~1));
+		    rb_str_cat2(str, rb_id2name(entry->id));
+		}
+	      case TS_IC:	/* method cache */
+		rb_str_catf(str, "<ic:%d>", FIX2INT(OPERAND_AT(iobj, j)));
+		break;
+	      case TS_CDHASH:	/* case/when condition cache */
+		rb_str_cat2(str, "<ch>");
+		break;
+	      default:{
+		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
+	      }
+	    }
+	    if (types[j + 1]) {
+		rb_str_cat2(str, ", ");
+	    }
+	}
+    }
+    return str;
+}
+
+static void
+dump_disasm_list(struct iseq_link_element *link)
+{
+    int pos = 0;
+    INSN *iobj;
+    LABEL *lobj;
+    VALUE str;
+
+    printf("-- raw disasm--------\n");
+
+    while (link) {
+	switch (link->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		iobj = (INSN *)link;
+		str = insn_data_to_s_detail(iobj);
+		printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str),
+		       insn_data_line_no(iobj));
+		pos += insn_data_length(iobj);
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		lobj = (LABEL *)link;
+		printf("<L%03d>\n", lobj->label_no);
+		break;
+	    }
+	  case ISEQ_ELEMENT_NONE:
+	    {
+		printf("[none]\n");
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)link;
+		printf("adjust: [label: %d]\n", adjust->label->label_no);
+		break;
+	    }
+	  default:
+	    /* ignore */
+	    rb_raise(rb_eSyntaxError, "dump_disasm_list error: %ld\n", FIX2LONG(link->type));
+	}
+	link = link->next;
+    }
+    printf("---------------------\n");
+}
+
+VALUE
+rb_insns_name_array(void)
+{
+    VALUE ary = rb_ary_new();
+    int i;
+    for (i = 0; i < numberof(insn_name_info); i++) {
+	rb_ary_push(ary, rb_obj_freeze(rb_str_new2(insn_name_info[i])));
+    }
+    return rb_obj_freeze(ary);
+}
+
+static LABEL *
+register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
+{
+    LABEL *label = 0;
+    st_data_t tmp;
+    obj = rb_convert_type(obj, T_SYMBOL, "Symbol", "to_sym");
+
+    if (st_lookup(labels_table, obj, &tmp) == 0) {
+	label = NEW_LABEL(0);
+	st_insert(labels_table, obj, (st_data_t)label);
+    }
+    else {
+	label = (LABEL *)tmp;
+    }
+    return label;
+}
+
+static VALUE
+get_exception_sym2type(VALUE sym)
+{
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+    VALUE sym_inspect;
+    static VALUE symRescue, symEnsure, symRetry;
+    static VALUE symBreak, symRedo, symNext;
+
+    if (symRescue == 0) {
+	symRescue = ID2SYM(rb_intern("rescue"));
+	symEnsure = ID2SYM(rb_intern("ensure"));
+	symRetry  = ID2SYM(rb_intern("retry"));
+	symBreak  = ID2SYM(rb_intern("break"));
+	symRedo   = ID2SYM(rb_intern("redo"));
+	symNext   = ID2SYM(rb_intern("next"));
+    }
+
+    if (sym == symRescue) return CATCH_TYPE_RESCUE;
+    if (sym == symEnsure) return CATCH_TYPE_ENSURE;
+    if (sym == symRetry)  return CATCH_TYPE_RETRY;
+    if (sym == symBreak)  return CATCH_TYPE_BREAK;
+    if (sym == symRedo)   return  CATCH_TYPE_REDO;
+    if (sym == symNext)   return CATCH_TYPE_NEXT;
+    sym_inspect = rb_inspect(sym);
+    rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
+	     StringValuePtr(sym_inspect));
+    return 0;
+}
+
+static int
+iseq_build_exception(rb_iseq_t *iseq, struct st_table *labels_table,
+		     VALUE exception)
+{
+    int i;
+
+    for (i=0; i<RARRAY_LEN(exception); i++) {
+	VALUE v, type, *ptr, eiseqval;
+	LABEL *lstart, *lend, *lcont;
+	int sp;
+
+	RB_GC_GUARD(v) = rb_convert_type(RARRAY_PTR(exception)[i], T_ARRAY,
+					 "Array", "to_ary");
+	if (RARRAY_LEN(v) != 6) {
+	    rb_raise(rb_eSyntaxError, "wrong exception entry");
+	}
+	ptr  = RARRAY_PTR(v);
+	type = get_exception_sym2type(ptr[0]);
+	if (ptr[1] == Qnil) {
+	    eiseqval = 0;
+	}
+	else {
+	    eiseqval = rb_iseq_load(ptr[1], iseq->self, Qnil);
+	}
+
+	lstart = register_label(iseq, labels_table, ptr[2]);
+	lend   = register_label(iseq, labels_table, ptr[3]);
+	lcont  = register_label(iseq, labels_table, ptr[4]);
+	sp     = NUM2INT(ptr[5]);
+
+	ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
+    }
+    return COMPILE_OK;
+}
+
+static struct st_table *
+insn_make_insn_table(void)
+{
+    struct st_table *table;
+    int i;
+    table = st_init_numtable();
+
+    for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
+	st_insert(table, ID2SYM(rb_intern(insn_name(i))), i);
+    }
+
+    return table;
+}
+
+static int
+iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
+		VALUE body, struct st_table *labels_table)
+{
+    /* TODO: body should be frozen */
+    VALUE *ptr = RARRAY_PTR(body);
+    long i, len = RARRAY_LEN(body);
+    int j;
+    int line_no = 0;
+    /*
+     * index -> LABEL *label
+     */
+    static struct st_table *insn_table;
+
+    if (insn_table == 0) {
+	insn_table = insn_make_insn_table();
+    }
+
+    for (i=0; i<len; i++) {
+	VALUE obj = ptr[i];
+
+	if (SYMBOL_P(obj)) {
+	    LABEL *label = register_label(iseq, labels_table, obj);
+	    ADD_LABEL(anchor, label);
+	}
+	else if (FIXNUM_P(obj)) {
+	    line_no = NUM2INT(obj);
+	}
+	else if (TYPE(obj) == T_ARRAY) {
+	    VALUE *argv = 0;
+	    int argc = RARRAY_LENINT(obj) - 1;
+	    VALUE insn_id;
+	    VALUE insn;
+
+	    insn = (argc < 0) ? Qnil : RARRAY_PTR(obj)[0];
+	    if (st_lookup(insn_table, insn, &insn_id) == 0) {
+		/* TODO: exception */
+		RB_GC_GUARD(insn) = rb_inspect(insn);
+		rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
+				 "unknown instruction: %s", RSTRING_PTR(insn));
+	    }
+
+	    if (argc != insn_len(insn_id)-1) {
+		rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
+				 "operand size mismatch");
+	    }
+
+	    if (argc > 0) {
+		argv = compile_data_alloc(iseq, sizeof(VALUE) * argc);
+		for (j=0; j<argc; j++) {
+		    VALUE op = rb_ary_entry(obj, j+1);
+		    switch (insn_op_type(insn_id, j)) {
+		      case TS_OFFSET: {
+			LABEL *label = register_label(iseq, labels_table, op);
+			argv[j] = (VALUE)label;
+			break;
+		      }
+		      case TS_LINDEX:
+		      case TS_DINDEX:
+		      case TS_NUM:
+			(void)NUM2INT(op);
+			argv[j] = op;
+			break;
+		      case TS_VALUE:
+			argv[j] = op;
+			iseq_add_mark_object(iseq, op);
+			break;
+		      case TS_ISEQ:
+			{
+			    if (op != Qnil) {
+				if (TYPE(op) == T_ARRAY) {
+				    argv[j] = rb_iseq_load(op, iseq->self, Qnil);
+				}
+				else if (CLASS_OF(op) == rb_cISeq) {
+				    argv[j] = op;
+				}
+				else {
+				    rb_raise(rb_eSyntaxError, "ISEQ is required");
+				}
+				iseq_add_mark_object(iseq, argv[j]);
+			    }
+			    else {
+				argv[j] = 0;
+			    }
+			}
+			break;
+		      case TS_GENTRY:
+			op = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym");
+			argv[j] = (VALUE)rb_global_entry(SYM2ID(op));
+			break;
+		      case TS_IC:
+			argv[j] = op;
+			if (NUM2INT(op) >= iseq->ic_size)
+			    iseq->ic_size = NUM2INT(op) + 1;
+			break;
+		      case TS_ID:
+			argv[j] = rb_convert_type(op, T_SYMBOL,
+						  "Symbol", "to_sym");
+			break;
+		      case TS_CDHASH:
+			{
+			    int i;
+			    op = rb_convert_type(op, T_ARRAY, "Array", "to_ary");
+			    op = rb_ary_dup(op);
+			    for (i=0; i<RARRAY_LEN(op); i+=2) {
+				VALUE sym = rb_ary_entry(op, i+1);
+				LABEL *label =
+				  register_label(iseq, labels_table, sym);
+				rb_ary_store(op, i+1, (VALUE)label | 1);
+			    }
+			    argv[j] = op;
+			    iseq_add_mark_object_compile_time(iseq, op);
+			}
+			break;
+		      default:
+			rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type(insn_id, j));
+		    }
+		}
+	    }
+	    ADD_ELEM(anchor,
+		     (LINK_ELEMENT*)new_insn_core(iseq, line_no,
+						  (enum ruby_vminsn_type)insn_id, argc, argv));
+	}
+	else {
+	    rb_raise(rb_eTypeError, "unexpected object for instruction");
+	}
+    }
+    st_free_table(labels_table);
+    iseq_setup(iseq, anchor);
+    return COMPILE_OK;
+}
+
+#define CHECK_ARRAY(v)   rb_convert_type(v, T_ARRAY, "Array", "to_ary")
+#define CHECK_STRING(v)  rb_convert_type(v, T_STRING, "String", "to_str")
+#define CHECK_SYMBOL(v)  rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym")
+static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;}
+
+VALUE
+rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
+			 VALUE exception, VALUE body)
+{
+    int i;
+    ID *tbl;
+    struct st_table *labels_table = st_init_numtable();
+
+    DECL_ANCHOR(anchor);
+
+    INIT_ANCHOR(anchor);
+
+    iseq->local_table_size = RARRAY_LENINT(locals);
+    iseq->local_table = tbl = (ID *)ALLOC_N(ID, iseq->local_table_size);
+    iseq->local_size = iseq->local_table_size + 1;
+
+    for (i=0; i<RARRAY_LEN(locals); i++) {
+	VALUE lv = RARRAY_PTR(locals)[i];
+	tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
+    }
+
+    /* args */
+    if (FIXNUM_P(args)) {
+	iseq->arg_size = iseq->argc = FIX2INT(args);
+	iseq->arg_simple = 1;
+    }
+    else {
+	int i = 0;
+	VALUE argc = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_opt_labels = CHECK_ARRAY(rb_ary_entry(args, i++));
+	VALUE arg_post_len = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_post_start = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_rest = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_block = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_simple = CHECK_INTEGER(rb_ary_entry(args, i++));
+
+	iseq->argc = FIX2INT(argc);
+	iseq->arg_rest = FIX2INT(arg_rest);
+	iseq->arg_post_len = FIX2INT(arg_post_len);
+	iseq->arg_post_start = FIX2INT(arg_post_start);
+	iseq->arg_block = FIX2INT(arg_block);
+	iseq->arg_opts = RARRAY_LENINT(arg_opt_labels);
+	iseq->arg_opt_table = (VALUE *)ALLOC_N(VALUE, iseq->arg_opts);
+
+	if (iseq->arg_block != -1) {
+	    iseq->arg_size = iseq->arg_block + 1;
+	}
+	else if (iseq->arg_post_len) {
+	    iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
+	}
+	else if (iseq->arg_rest != -1) {
+	    iseq->arg_size = iseq->arg_rest + 1;
+	}
+	else {
+	    iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
+	}
+
+	for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) {
+	    iseq->arg_opt_table[i] =
+	      (VALUE)register_label(iseq, labels_table,
+				    rb_ary_entry(arg_opt_labels, i));
+	}
+
+	iseq->arg_simple = NUM2INT(arg_simple);
+    }
+
+    /* exception */
+    iseq_build_exception(iseq, labels_table, exception);
+
+    /* body */
+    iseq_build_body(iseq, anchor, body, labels_table);
+    return iseq->self;
+}
+
+/* for parser */
+
+int
+rb_dvar_defined(ID id)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_iseq_t *iseq;
+    if (th->base_block && (iseq = th->base_block->iseq)) {
+	while (iseq->type == ISEQ_TYPE_BLOCK ||
+	       iseq->type == ISEQ_TYPE_RESCUE ||
+	       iseq->type == ISEQ_TYPE_ENSURE ||
+	       iseq->type == ISEQ_TYPE_EVAL ||
+	       iseq->type == ISEQ_TYPE_MAIN
+	       ) {
+	    int i;
+
+	    for (i = 0; i < iseq->local_table_size; i++) {
+		if (iseq->local_table[i] == id) {
+		    return 1;
+		}
+	    }
+	    iseq = iseq->parent_iseq;
+	}
+    }
+    return 0;
+}
+
+int
+rb_local_defined(ID id)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_iseq_t *iseq;
+
+    if (th->base_block && th->base_block->iseq) {
+	int i;
+	iseq = th->base_block->iseq->local_iseq;
+
+	for (i=0; i<iseq->local_table_size; i++) {
+	    if (iseq->local_table[i] == id) {
+		return 1;
+	    }
+	}
+    }
+    return 0;
+}
+
+int
+rb_parse_in_eval(void)
+{
+    return GET_THREAD()->parse_in_eval > 0;
+}
+
+int
+rb_parse_in_main(void)
+{
+    return GET_THREAD()->parse_in_eval < 0;
+}
diff --git a/complex.c b/complex.c
new file mode 100644
index 0000000000..cbbc3b17ce
--- /dev/null
+++ b/complex.c
@@ -0,0 +1,1978 @@
+/*
+  complex.c: Coded by Tadayoshi Funaba 2008,2009
+
+  This implementation is based on Keiju Ishitsuka's Complex library
+  which is written in ruby.
+*/
+
+#include "ruby.h"
+#include <math.h>
+
+#define NDEBUG
+#include <assert.h>
+
+#define ZERO INT2FIX(0)
+#define ONE INT2FIX(1)
+#define TWO INT2FIX(2)
+
+VALUE rb_cComplex;
+
+static ID id_abs, id_abs2, id_arg, id_cmp, id_conj, id_convert,
+    id_denominator, id_divmod, id_eqeq_p, id_expt, id_fdiv,  id_floor,
+    id_idiv, id_imag, id_inspect, id_negate, id_numerator, id_quo,
+    id_real, id_real_p, id_to_f, id_to_i, id_to_r, id_to_s;
+
+#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
+
+#define binop(n,op) \
+inline static VALUE \
+f_##n(VALUE x, VALUE y)\
+{\
+    return rb_funcall(x, op, 1, y);\
+}
+
+#define fun1(n) \
+inline static VALUE \
+f_##n(VALUE x)\
+{\
+    return rb_funcall(x, id_##n, 0);\
+}
+
+#define fun2(n) \
+inline static VALUE \
+f_##n(VALUE x, VALUE y)\
+{\
+    return rb_funcall(x, id_##n, 1, y);\
+}
+
+#define math1(n) \
+inline static VALUE \
+m_##n(VALUE x)\
+{\
+    return rb_funcall(rb_mMath, id_##n, 1, x);\
+}
+
+#define math2(n) \
+inline static VALUE \
+m_##n(VALUE x, VALUE y)\
+{\
+    return rb_funcall(rb_mMath, id_##n, 2, x, y);\
+}
+
+#define PRESERVE_SIGNEDZERO
+
+inline static VALUE
+f_add(VALUE x, VALUE y)
+{
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
+	return x;
+    else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
+	return y;
+#endif
+    return rb_funcall(x, '+', 1, y);
+}
+
+inline static VALUE
+f_cmp(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y)) {
+	long c = FIX2LONG(x) - FIX2LONG(y);
+	if (c > 0)
+	    c = 1;
+	else if (c < 0)
+	    c = -1;
+	return INT2FIX(c);
+    }
+    return rb_funcall(x, id_cmp, 1, y);
+}
+
+inline static VALUE
+f_div(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(y) && FIX2LONG(y) == 1)
+	return x;
+    return rb_funcall(x, '/', 1, y);
+}
+
+inline static VALUE
+f_gt_p(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) > FIX2LONG(y));
+    return rb_funcall(x, '>', 1, y);
+}
+
+inline static VALUE
+f_lt_p(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) < FIX2LONG(y));
+    return rb_funcall(x, '<', 1, y);
+}
+
+binop(mod, '%')
+
+inline static VALUE
+f_mul(VALUE x, VALUE y)
+{
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y)) {
+	long iy = FIX2LONG(y);
+	if (iy == 0) {
+	    if (FIXNUM_P(x) || TYPE(x) == T_BIGNUM)
+		return ZERO;
+	}
+	else if (iy == 1)
+	    return x;
+    }
+    else if (FIXNUM_P(x)) {
+	long ix = FIX2LONG(x);
+	if (ix == 0) {
+	    if (FIXNUM_P(y) || TYPE(y) == T_BIGNUM)
+		return ZERO;
+	}
+	else if (ix == 1)
+	    return y;
+    }
+#endif
+    return rb_funcall(x, '*', 1, y);
+}
+
+inline static VALUE
+f_sub(VALUE x, VALUE y)
+{
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
+	return x;
+#endif
+    return rb_funcall(x, '-', 1, y);
+}
+
+fun1(abs)
+fun1(abs2)
+fun1(arg)
+fun1(conj)
+fun1(denominator)
+fun1(floor)
+fun1(imag)
+fun1(inspect)
+fun1(negate)
+fun1(numerator)
+fun1(real)
+fun1(real_p)
+
+fun1(to_f)
+fun1(to_i)
+fun1(to_r)
+fun1(to_s)
+
+fun2(divmod)
+
+inline static VALUE
+f_eqeq_p(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
+    return rb_funcall(x, id_eqeq_p, 1, y);
+}
+
+fun2(expt)
+fun2(fdiv)
+fun2(idiv)
+fun2(quo)
+
+inline static VALUE
+f_negative_p(VALUE x)
+{
+    if (FIXNUM_P(x))
+	return f_boolcast(FIX2LONG(x) < 0);
+    return rb_funcall(x, '<', 1, ZERO);
+}
+
+#define f_positive_p(x) (!f_negative_p(x))
+
+inline static VALUE
+f_zero_p(VALUE x)
+{
+    switch (TYPE(x)) {
+      case T_FIXNUM:
+	return f_boolcast(FIX2LONG(x) == 0);
+      case T_BIGNUM:
+	return Qfalse;
+      case T_RATIONAL:
+      {
+	  VALUE num = RRATIONAL(x)->num;
+
+	  return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
+      }
+    }
+    return rb_funcall(x, id_eqeq_p, 1, ZERO);
+}
+
+#define f_nonzero_p(x) (!f_zero_p(x))
+
+inline static VALUE
+f_one_p(VALUE x)
+{
+    switch (TYPE(x)) {
+      case T_FIXNUM:
+	return f_boolcast(FIX2LONG(x) == 1);
+      case T_BIGNUM:
+	return Qfalse;
+      case T_RATIONAL:
+      {
+	  VALUE num = RRATIONAL(x)->num;
+	  VALUE den = RRATIONAL(x)->den;
+
+	  return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
+			    FIXNUM_P(den) && FIX2LONG(den) == 1);
+      }
+    }
+    return rb_funcall(x, id_eqeq_p, 1, ONE);
+}
+
+inline static VALUE
+f_kind_of_p(VALUE x, VALUE c)
+{
+    return rb_obj_is_kind_of(x, c);
+}
+
+inline static VALUE
+k_numeric_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cNumeric);
+}
+
+inline static VALUE
+k_integer_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cInteger);
+}
+
+inline static VALUE
+k_fixnum_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cFixnum);
+}
+
+inline static VALUE
+k_bignum_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cBignum);
+}
+
+inline static VALUE
+k_float_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cFloat);
+}
+
+inline static VALUE
+k_rational_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cRational);
+}
+
+inline static VALUE
+k_complex_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cComplex);
+}
+
+#define k_exact_p(x) (!k_float_p(x))
+#define k_inexact_p(x) k_float_p(x)
+
+#define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x))
+#define k_exact_one_p(x) (k_exact_p(x) && f_one_p(x))
+
+#define get_dat1(x) \
+    struct RComplex *dat;\
+    dat = ((struct RComplex *)(x))
+
+#define get_dat2(x,y) \
+    struct RComplex *adat, *bdat;\
+    adat = ((struct RComplex *)(x));\
+    bdat = ((struct RComplex *)(y))
+
+inline static VALUE
+nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
+{
+    NEWOBJ(obj, struct RComplex);
+    OBJSETUP(obj, klass, T_COMPLEX);
+
+    obj->real = real;
+    obj->imag = imag;
+
+    return (VALUE)obj;
+}
+
+static VALUE
+nucomp_s_alloc(VALUE klass)
+{
+    return nucomp_s_new_internal(klass, ZERO, ZERO);
+}
+
+#if 0
+static VALUE
+nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE real, imag;
+
+    switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
+      case 1:
+	if (!k_numeric_p(real))
+	    real = f_to_i(real);
+	imag = ZERO;
+	break;
+      default:
+	if (!k_numeric_p(real))
+	    real = f_to_i(real);
+	if (!k_numeric_p(imag))
+	    imag = f_to_i(imag);
+	break;
+    }
+
+    return nucomp_s_new_internal(klass, real, imag);
+}
+#endif
+
+inline static VALUE
+f_complex_new_bang1(VALUE klass, VALUE x)
+{
+    assert(!k_complex_p(x));
+    return nucomp_s_new_internal(klass, x, ZERO);
+}
+
+inline static VALUE
+f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
+{
+    assert(!k_complex_p(x));
+    assert(!k_complex_p(y));
+    return nucomp_s_new_internal(klass, x, y);
+}
+
+#ifdef CANONICALIZATION_FOR_MATHN
+#define CANON
+#endif
+
+#ifdef CANON
+static int canonicalization = 0;
+
+void
+nucomp_canonicalization(int f)
+{
+    canonicalization = f;
+}
+#endif
+
+inline static void
+nucomp_real_check(VALUE num)
+{
+    switch (TYPE(num)) {
+      case T_FIXNUM:
+      case T_BIGNUM:
+      case T_FLOAT:
+      case T_RATIONAL:
+	break;
+      default:
+	if (!k_numeric_p(num) || !f_real_p(num))
+	    rb_raise(rb_eTypeError, "not a real");
+    }
+}
+
+inline static VALUE
+nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
+{
+#ifdef CANON
+#define CL_CANON
+#ifdef CL_CANON
+    if (k_exact_zero_p(imag) && canonicalization)
+	return real;
+#else
+    if (f_zero_p(imag) && canonicalization)
+	return real;
+#endif
+#endif
+    if (f_real_p(real) && f_real_p(imag))
+	return nucomp_s_new_internal(klass, real, imag);
+    else if (f_real_p(real)) {
+	get_dat1(imag);
+
+	return nucomp_s_new_internal(klass,
+				     f_sub(real, dat->imag),
+				     f_add(ZERO, dat->real));
+    }
+    else if (f_real_p(imag)) {
+	get_dat1(real);
+
+	return nucomp_s_new_internal(klass,
+				     dat->real,
+				     f_add(dat->imag, imag));
+    }
+    else {
+	get_dat2(real, imag);
+
+	return nucomp_s_new_internal(klass,
+				     f_sub(adat->real, bdat->imag),
+				     f_add(adat->imag, bdat->real));
+    }
+}
+
+/*
+ * call-seq:
+ *    Complex.rect(real[, imag])         ->  complex
+ *    Complex.rectangular(real[, imag])  ->  complex
+ *
+ * Returns a complex object which denotes the given rectangular form.
+ */
+static VALUE
+nucomp_s_new(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE real, imag;
+
+    switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
+      case 1:
+	nucomp_real_check(real);
+	imag = ZERO;
+	break;
+      default:
+	nucomp_real_check(real);
+	nucomp_real_check(imag);
+	break;
+    }
+
+    return nucomp_s_canonicalize_internal(klass, real, imag);
+}
+
+inline static VALUE
+f_complex_new1(VALUE klass, VALUE x)
+{
+    assert(!k_complex_p(x));
+    return nucomp_s_canonicalize_internal(klass, x, ZERO);
+}
+
+inline static VALUE
+f_complex_new2(VALUE klass, VALUE x, VALUE y)
+{
+    assert(!k_complex_p(x));
+    return nucomp_s_canonicalize_internal(klass, x, y);
+}
+
+/*
+ * call-seq:
+ *    Complex(x[, y])  ->  numeric
+ *
+ * Returns x+i*y;
+ */
+static VALUE
+nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
+{
+    return rb_funcall2(rb_cComplex, id_convert, argc, argv);
+}
+
+#define imp1(n) \
+extern VALUE rb_math_##n(VALUE x);\
+inline static VALUE \
+m_##n##_bang(VALUE x)\
+{\
+    return rb_math_##n(x);\
+}
+
+#define imp2(n) \
+extern VALUE rb_math_##n(VALUE x, VALUE y);\
+inline static VALUE \
+m_##n##_bang(VALUE x, VALUE y)\
+{\
+    return rb_math_##n(x, y);\
+}
+
+imp2(atan2)
+imp1(cos)
+imp1(cosh)
+imp1(exp)
+imp2(hypot)
+
+#define m_hypot(x,y) m_hypot_bang(x,y)
+
+extern VALUE rb_math_log(int argc, VALUE *argv);
+
+static VALUE
+m_log_bang(VALUE x)
+{
+    return rb_math_log(1, &x);
+}
+
+imp1(sin)
+imp1(sinh)
+imp1(sqrt)
+
+static VALUE
+m_cos(VALUE x)
+{
+    if (f_real_p(x))
+	return m_cos_bang(x);
+    {
+	get_dat1(x);
+	return f_complex_new2(rb_cComplex,
+			      f_mul(m_cos_bang(dat->real),
+				    m_cosh_bang(dat->imag)),
+			      f_mul(f_negate(m_sin_bang(dat->real)),
+				    m_sinh_bang(dat->imag)));
+    }
+}
+
+static VALUE
+m_sin(VALUE x)
+{
+    if (f_real_p(x))
+	return m_sin_bang(x);
+    {
+	get_dat1(x);
+	return f_complex_new2(rb_cComplex,
+			      f_mul(m_sin_bang(dat->real),
+				    m_cosh_bang(dat->imag)),
+			      f_mul(m_cos_bang(dat->real),
+				    m_sinh_bang(dat->imag)));
+    }
+}
+
+#if 0
+static VALUE
+m_sqrt(VALUE x)
+{
+    if (f_real_p(x)) {
+	if (f_positive_p(x))
+	    return m_sqrt_bang(x);
+	return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x)));
+    }
+    else {
+	get_dat1(x);
+
+	if (f_negative_p(dat->imag))
+	    return f_conj(m_sqrt(f_conj(x)));
+	else {
+	    VALUE a = f_abs(x);
+	    return f_complex_new2(rb_cComplex,
+				  m_sqrt_bang(f_div(f_add(a, dat->real), TWO)),
+				  m_sqrt_bang(f_div(f_sub(a, dat->real), TWO)));
+	}
+    }
+}
+#endif
+
+inline static VALUE
+f_complex_polar(VALUE klass, VALUE x, VALUE y)
+{
+    assert(!k_complex_p(x));
+    assert(!k_complex_p(y));
+    return nucomp_s_canonicalize_internal(klass,
+					  f_mul(x, m_cos(y)),
+					  f_mul(x, m_sin(y)));
+}
+
+/*
+ * call-seq:
+ *    Complex.polar(abs[, arg])  ->  complex
+ *
+ * Returns a complex object which denotes the given polar form.
+ */
+static VALUE
+nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE abs, arg;
+
+    switch (rb_scan_args(argc, argv, "11", &abs, &arg)) {
+      case 1:
+	nucomp_real_check(abs);
+	arg = ZERO;
+	break;
+      default:
+	nucomp_real_check(abs);
+	nucomp_real_check(arg);
+	break;
+    }
+    return f_complex_polar(klass, abs, arg);
+}
+
+/*
+ * call-seq:
+ *    cmp.real  ->  real
+ *
+ * Returns the real part.
+ */
+static VALUE
+nucomp_real(VALUE self)
+{
+    get_dat1(self);
+    return dat->real;
+}
+
+/*
+ * call-seq:
+ *    cmp.imag       ->  real
+ *    cmp.imaginary  ->  real
+ *
+ * Returns the imaginary part.
+ */
+static VALUE
+nucomp_imag(VALUE self)
+{
+    get_dat1(self);
+    return dat->imag;
+}
+
+/*
+ * call-seq:
+ *    -cmp  ->  complex
+ *
+ * Returns negation of the value.
+ */
+static VALUE
+nucomp_negate(VALUE self)
+{
+  get_dat1(self);
+  return f_complex_new2(CLASS_OF(self),
+			f_negate(dat->real), f_negate(dat->imag));
+}
+
+inline static VALUE
+f_addsub(VALUE self, VALUE other,
+	 VALUE (*func)(VALUE, VALUE), ID id)
+{
+    if (k_complex_p(other)) {
+	VALUE real, imag;
+
+	get_dat2(self, other);
+
+	real = (*func)(adat->real, bdat->real);
+	imag = (*func)(adat->imag, bdat->imag);
+
+	return f_complex_new2(CLASS_OF(self), real, imag);
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      (*func)(dat->real, other), dat->imag);
+    }
+    return rb_num_coerce_bin(self, other, id);
+}
+
+/*
+ * call-seq:
+ *    cmp + numeric  ->  complex
+ *
+ * Performs addition.
+ */
+static VALUE
+nucomp_add(VALUE self, VALUE other)
+{
+    return f_addsub(self, other, f_add, '+');
+}
+
+/*
+ * call-seq:
+ *    cmp - numeric  ->  complex
+ *
+ * Performs subtraction.
+ */
+static VALUE
+nucomp_sub(VALUE self, VALUE other)
+{
+    return f_addsub(self, other, f_sub, '-');
+}
+
+/*
+ * call-seq:
+ *    cmp * numeric  ->  complex
+ *
+ * Performs multiplication.
+ */
+static VALUE
+nucomp_mul(VALUE self, VALUE other)
+{
+    if (k_complex_p(other)) {
+	VALUE real, imag;
+
+	get_dat2(self, other);
+
+	real = f_sub(f_mul(adat->real, bdat->real),
+		     f_mul(adat->imag, bdat->imag));
+	imag = f_add(f_mul(adat->real, bdat->imag),
+		     f_mul(adat->imag, bdat->real));
+
+	return f_complex_new2(CLASS_OF(self), real, imag);
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      f_mul(dat->real, other),
+			      f_mul(dat->imag, other));
+    }
+    return rb_num_coerce_bin(self, other, '*');
+}
+
+inline static VALUE
+f_divide(VALUE self, VALUE other,
+	 VALUE (*func)(VALUE, VALUE), ID id)
+{
+    if (k_complex_p(other)) {
+	int flo;
+	get_dat2(self, other);
+
+	flo = (k_float_p(adat->real) || k_float_p(adat->imag) ||
+	       k_float_p(bdat->real) || k_float_p(bdat->imag));
+
+	if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) {
+	    VALUE r, n;
+
+	    r = (*func)(bdat->imag, bdat->real);
+	    n = f_mul(bdat->real, f_add(ONE, f_mul(r, r)));
+	    if (flo)
+		return f_complex_new2(CLASS_OF(self),
+				      (*func)(self, n),
+				      (*func)(f_negate(f_mul(self, r)), n));
+	    return f_complex_new2(CLASS_OF(self),
+				  (*func)(f_add(adat->real,
+						f_mul(adat->imag, r)), n),
+				  (*func)(f_sub(adat->imag,
+						f_mul(adat->real, r)), n));
+	}
+	else {
+	    VALUE r, n;
+
+	    r = (*func)(bdat->real, bdat->imag);
+	    n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r)));
+	    if (flo)
+		return f_complex_new2(CLASS_OF(self),
+				      (*func)(f_mul(self, r), n),
+				      (*func)(f_negate(self), n));
+	    return f_complex_new2(CLASS_OF(self),
+				  (*func)(f_add(f_mul(adat->real, r),
+						adat->imag), n),
+				  (*func)(f_sub(f_mul(adat->imag, r),
+						adat->real), n));
+	}
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      (*func)(dat->real, other),
+			      (*func)(dat->imag, other));
+    }
+    return rb_num_coerce_bin(self, other, id);
+}
+
+#define rb_raise_zerodiv() rb_raise(rb_eZeroDivError, "divided by 0")
+
+/*
+ * call-seq:
+ *    cmp / numeric     ->  complex
+ *    cmp.quo(numeric)  ->  complex
+ *
+ * Performs division.
+ *
+ * For example:
+ *
+ *     Complex(10.0) / 3  #=> (3.3333333333333335+(0/1)*i)
+ *     Complex(10)   / 3  #=> ((10/3)+(0/1)*i)  # not (3+0i)
+ */
+static VALUE
+nucomp_div(VALUE self, VALUE other)
+{
+    return f_divide(self, other, f_quo, id_quo);
+}
+
+#define nucomp_quo nucomp_div
+
+/*
+ * call-seq:
+ *    cmp.fdiv(numeric)  ->  complex
+ *
+ * Performs division as each part is a float, never returns a float.
+ *
+ * For example:
+ *
+ *     Complex(11,22).fdiv(3)  #=> (3.6666666666666665+7.333333333333333i)
+ */
+static VALUE
+nucomp_fdiv(VALUE self, VALUE other)
+{
+    return f_divide(self, other, f_fdiv, id_fdiv);
+}
+
+inline static VALUE
+f_reciprocal(VALUE x)
+{
+    return f_quo(ONE, x);
+}
+
+/*
+ * call-seq:
+ *    cmp ** numeric  ->  complex
+ *
+ * Performs exponentiation.
+ *
+ * For example:
+ *
+ *     Complex('i') ** 2             #=> (-1+0i)
+ *     Complex(-8) ** Rational(1,3)  #=> (1.0000000000000002+1.7320508075688772i)
+ */
+static VALUE
+nucomp_expt(VALUE self, VALUE other)
+{
+    if (k_exact_zero_p(other))
+	return f_complex_new_bang1(CLASS_OF(self), ONE);
+
+    if (k_rational_p(other) && f_one_p(f_denominator(other)))
+	other = f_numerator(other); /* c14n */
+
+    if (k_complex_p(other)) {
+	get_dat1(other);
+
+	if (k_exact_zero_p(dat->imag))
+	    other = dat->real; /* c14n */
+    }
+
+    if (k_complex_p(other)) {
+	VALUE r, theta, nr, ntheta;
+
+	get_dat1(other);
+
+	r = f_abs(self);
+	theta = f_arg(self);
+
+	nr = m_exp_bang(f_sub(f_mul(dat->real, m_log_bang(r)),
+			      f_mul(dat->imag, theta)));
+	ntheta = f_add(f_mul(theta, dat->real),
+		       f_mul(dat->imag, m_log_bang(r)));
+	return f_complex_polar(CLASS_OF(self), nr, ntheta);
+    }
+    if (k_fixnum_p(other)) {
+	if (f_gt_p(other, ZERO)) {
+	    VALUE x, z;
+	    long n;
+
+	    x = self;
+	    z = x;
+	    n = FIX2LONG(other) - 1;
+
+	    while (n) {
+		long q, r;
+
+		while (1) {
+		    get_dat1(x);
+
+		    q = n / 2;
+		    r = n % 2;
+
+		    if (r)
+			break;
+
+		    x = f_complex_new2(CLASS_OF(self),
+				       f_sub(f_mul(dat->real, dat->real),
+					     f_mul(dat->imag, dat->imag)),
+				       f_mul(f_mul(TWO, dat->real), dat->imag));
+		    n = q;
+		}
+		z = f_mul(z, x);
+		n--;
+	    }
+	    return z;
+	}
+	return f_expt(f_reciprocal(self), f_negate(other));
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	VALUE r, theta;
+
+	if (k_bignum_p(other))
+	    rb_warn("in a**b, b may be too big");
+
+	r = f_abs(self);
+	theta = f_arg(self);
+
+	return f_complex_polar(CLASS_OF(self), f_expt(r, other),
+			       f_mul(theta, other));
+    }
+    return rb_num_coerce_bin(self, other, id_expt);
+}
+
+/*
+ * call-seq:
+ *    cmp == object  ->  true or false
+ *
+ * Returns true if cmp equals object numerically.
+ */
+static VALUE
+nucomp_eqeq_p(VALUE self, VALUE other)
+{
+    if (k_complex_p(other)) {
+	get_dat2(self, other);
+
+	return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
+			  f_eqeq_p(adat->imag, bdat->imag));
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
+    }
+    return f_eqeq_p(other, self);
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_coerce(VALUE self, VALUE other)
+{
+    if (k_numeric_p(other) && f_real_p(other))
+	return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
+    if (TYPE(other) == T_COMPLEX)
+	return rb_assoc_new(other, self);
+
+    rb_raise(rb_eTypeError, "%s can't be coerced into %s",
+	     rb_obj_classname(other), rb_obj_classname(self));
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *    cmp.abs        ->  real
+ *    cmp.magnitude  ->  real
+ *
+ * Returns the absolute part of its polar form.
+ */
+static VALUE
+nucomp_abs(VALUE self)
+{
+    get_dat1(self);
+
+    if (f_zero_p(dat->real)) {
+	VALUE a = f_abs(dat->imag);
+	if (k_float_p(dat->real) && !k_float_p(dat->imag))
+	    a = f_to_f(a);
+	return a;
+    }
+    if (f_zero_p(dat->imag)) {
+	VALUE a = f_abs(dat->real);
+	if (!k_float_p(dat->real) && k_float_p(dat->imag))
+	    a = f_to_f(a);
+	return a;
+    }
+    return m_hypot(dat->real, dat->imag);
+}
+
+/*
+ * call-seq:
+ *    cmp.abs2  ->  real
+ *
+ * Returns square of the absolute value.
+ */
+static VALUE
+nucomp_abs2(VALUE self)
+{
+    get_dat1(self);
+    return f_add(f_mul(dat->real, dat->real),
+		 f_mul(dat->imag, dat->imag));
+}
+
+/*
+ * call-seq:
+ *    cmp.arg    ->  float
+ *    cmp.angle  ->  float
+ *    cmp.phase  ->  float
+ *
+ * Returns the angle part of its polar form.
+ */
+static VALUE
+nucomp_arg(VALUE self)
+{
+    get_dat1(self);
+    return m_atan2_bang(dat->imag, dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.rect         ->  array
+ *    cmp.rectangular  ->  array
+ *
+ * Returns an array; [cmp.real, cmp.imag].
+ */
+static VALUE
+nucomp_rect(VALUE self)
+{
+    get_dat1(self);
+    return rb_assoc_new(dat->real, dat->imag);
+}
+
+/*
+ * call-seq:
+ *    cmp.polar  ->  array
+ *
+ * Returns an array; [cmp.abs, cmp.arg].
+ */
+static VALUE
+nucomp_polar(VALUE self)
+{
+    return rb_assoc_new(f_abs(self), f_arg(self));
+}
+
+/*
+ * call-seq:
+ *    cmp.conj       ->  complex
+ *    cmp.conjugate  ->  complex
+ *
+ * Returns the complex conjugate.
+ */
+static VALUE
+nucomp_conj(VALUE self)
+{
+    get_dat1(self);
+    return f_complex_new2(CLASS_OF(self), dat->real, f_negate(dat->imag));
+}
+
+#if 0
+/* :nodoc: */
+static VALUE
+nucomp_true(VALUE self)
+{
+    return Qtrue;
+}
+#endif
+
+/*
+ * call-seq:
+ *    cmp.real?  ->  false
+ *
+ * Returns false.
+ */
+static VALUE
+nucomp_false(VALUE self)
+{
+    return Qfalse;
+}
+
+#if 0
+/* :nodoc: */
+static VALUE
+nucomp_exact_p(VALUE self)
+{
+    get_dat1(self);
+    return f_boolcast(k_exact_p(dat->real) && k_exact_p(dat->imag));
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_inexact_p(VALUE self)
+{
+    return f_boolcast(!nucomp_exact_p(self));
+}
+#endif
+
+extern VALUE rb_lcm(VALUE x, VALUE y);
+
+/*
+ * call-seq:
+ *    cmp.denominator  ->  integer
+ *
+ * Returns the denominator (lcm of both denominator, real and imag).
+ *
+ * See numerator.
+ */
+static VALUE
+nucomp_denominator(VALUE self)
+{
+    get_dat1(self);
+    return rb_lcm(f_denominator(dat->real), f_denominator(dat->imag));
+}
+
+/*
+ * call-seq:
+ *    cmp.numerator  ->  numeric
+ *
+ * Returns the numerator.
+ *
+ * For example:
+ *
+ *        1   2       3+4i  <-  numerator
+ *        - + -i  ->  ----
+ *        2   3        6    <-  denominator
+ *
+ *    c = Complex('1/2+2/3i')  #=> ((1/2)+(2/3)*i)
+ *    n = c.numerator          #=> (3+4i)
+ *    d = c.denominator        #=> 6
+ *    n / d                    #=> ((1/2)+(2/3)*i)
+ *    Complex(Rational(n.real, d), Rational(n.imag, d))
+ *                             #=> ((1/2)+(2/3)*i)
+ * See denominator.
+ */
+static VALUE
+nucomp_numerator(VALUE self)
+{
+    VALUE cd;
+
+    get_dat1(self);
+
+    cd = f_denominator(self);
+    return f_complex_new2(CLASS_OF(self),
+			  f_mul(f_numerator(dat->real),
+				f_div(cd, f_denominator(dat->real))),
+			  f_mul(f_numerator(dat->imag),
+				f_div(cd, f_denominator(dat->imag))));
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_hash(VALUE self)
+{
+    st_index_t v, h[2];
+    VALUE n;
+
+    get_dat1(self);
+    n = rb_hash(dat->real);
+    h[0] = NUM2LONG(n);
+    n = rb_hash(dat->imag);
+    h[1] = NUM2LONG(n);
+    v = rb_memhash(h, sizeof(h));
+    return LONG2FIX(v);
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_eql_p(VALUE self, VALUE other)
+{
+    if (k_complex_p(other)) {
+	get_dat2(self, other);
+
+	return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
+			  (CLASS_OF(adat->imag) == CLASS_OF(bdat->imag)) &&
+			  f_eqeq_p(self, other));
+
+    }
+    return Qfalse;
+}
+
+inline static VALUE
+f_signbit(VALUE x)
+{
+    switch (TYPE(x)) {
+      case T_FLOAT: {
+	double f = RFLOAT_VALUE(x);
+	return f_boolcast(!isnan(f) && signbit(f));
+      }
+    }
+    return f_negative_p(x);
+}
+
+inline static VALUE
+f_tpositive_p(VALUE x)
+{
+    return f_boolcast(!f_signbit(x));
+}
+
+static VALUE
+f_format(VALUE self, VALUE (*func)(VALUE))
+{
+    VALUE s, impos;
+
+    get_dat1(self);
+
+    impos = f_tpositive_p(dat->imag);
+
+    s = (*func)(dat->real);
+    rb_str_cat2(s, !impos ? "-" : "+");
+
+    rb_str_concat(s, (*func)(f_abs(dat->imag)));
+    if (!rb_isdigit(RSTRING_PTR(s)[RSTRING_LEN(s) - 1]))
+	rb_str_cat2(s, "*");
+    rb_str_cat2(s, "i");
+
+    return s;
+}
+
+/*
+ * call-seq:
+ *    cmp.to_s  ->  string
+ *
+ * Returns the value as a string.
+ */
+static VALUE
+nucomp_to_s(VALUE self)
+{
+    return f_format(self, f_to_s);
+}
+
+/*
+ * call-seq:
+ *    cmp.inspect  ->  string
+ *
+ * Returns the value as a string for inspection.
+ */
+static VALUE
+nucomp_inspect(VALUE self)
+{
+    VALUE s;
+
+    s = rb_usascii_str_new2("(");
+    rb_str_concat(s, f_format(self, f_inspect));
+    rb_str_cat2(s, ")");
+
+    return s;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_marshal_dump(VALUE self)
+{
+    VALUE a;
+    get_dat1(self);
+
+    a = rb_assoc_new(dat->real, dat->imag);
+    rb_copy_generic_ivar(a, self);
+    return a;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_marshal_load(VALUE self, VALUE a)
+{
+    get_dat1(self);
+    Check_Type(a, T_ARRAY);
+    dat->real = RARRAY_PTR(a)[0];
+    dat->imag = RARRAY_PTR(a)[1];
+    rb_copy_generic_ivar(self, a);
+    return self;
+}
+
+/* --- */
+
+VALUE
+rb_complex_raw(VALUE x, VALUE y)
+{
+    return nucomp_s_new_internal(rb_cComplex, x, y);
+}
+
+VALUE
+rb_complex_new(VALUE x, VALUE y)
+{
+    return nucomp_s_canonicalize_internal(rb_cComplex, x, y);
+}
+
+VALUE
+rb_complex_polar(VALUE x, VALUE y)
+{
+    return f_complex_polar(rb_cComplex, x, y);
+}
+
+static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
+
+VALUE
+rb_Complex(VALUE x, VALUE y)
+{
+    VALUE a[2];
+    a[0] = x;
+    a[1] = y;
+    return nucomp_s_convert(2, a, rb_cComplex);
+}
+
+/*
+ * call-seq:
+ *    cmp.to_i  ->  integer
+ *
+ * Returns the value as an integer if possible.
+ */
+static VALUE
+nucomp_to_i(VALUE self)
+{
+    get_dat1(self);
+
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+	VALUE s = f_to_s(self);
+	rb_raise(rb_eRangeError, "can't convert %s into Integer",
+		 StringValuePtr(s));
+    }
+    return f_to_i(dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.to_f  ->  float
+ *
+ * Returns the value as a float if possible.
+ */
+static VALUE
+nucomp_to_f(VALUE self)
+{
+    get_dat1(self);
+
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+	VALUE s = f_to_s(self);
+	rb_raise(rb_eRangeError, "can't convert %s into Float",
+		 StringValuePtr(s));
+    }
+    return f_to_f(dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.to_r  ->  rational
+ *
+ * Returns the value as a rational if possible.
+ */
+static VALUE
+nucomp_to_r(VALUE self)
+{
+    get_dat1(self);
+
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+	VALUE s = f_to_s(self);
+	rb_raise(rb_eRangeError, "can't convert %s into Rational",
+		 StringValuePtr(s));
+    }
+    return f_to_r(dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.rationalize([eps])  ->  rational
+ *
+ * Returns the value as a rational if possible.  An optional argument
+ * eps is always ignored.
+ */
+static VALUE
+nucomp_rationalize(int argc, VALUE *argv, VALUE self)
+{
+    rb_scan_args(argc, argv, "01", NULL);
+    return nucomp_to_r(self);
+}
+
+/*
+ * call-seq:
+ *    nil.to_c  ->  (0+0i)
+ *
+ * Returns zero as a complex.
+ */
+static VALUE
+nilclass_to_c(VALUE self)
+{
+    return rb_complex_new1(INT2FIX(0));
+}
+
+/*
+ * call-seq:
+ *    num.to_c  ->  complex
+ *
+ * Returns the value as a complex.
+ */
+static VALUE
+numeric_to_c(VALUE self)
+{
+    return rb_complex_new1(self);
+}
+
+static VALUE comp_pat0, comp_pat1, comp_pat2, a_slash, a_dot_and_an_e,
+    null_string, underscores_pat, an_underscore;
+
+#define WS "\\s*"
+#define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)"
+#define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?"
+#define DENOMINATOR DIGITS
+#define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?"
+#define NUMBERNOS NUMERATOR "(?:\\/" DENOMINATOR ")?"
+#define PATTERN0 "\\A" WS "(" NUMBER ")@(" NUMBER ")" WS
+#define PATTERN1 "\\A" WS "([-+])?(" NUMBER ")?[iIjJ]" WS
+#define PATTERN2 "\\A" WS "(" NUMBER ")(([-+])(" NUMBERNOS ")?[iIjJ])?" WS
+
+static void
+make_patterns(void)
+{
+    static const char comp_pat0_source[] = PATTERN0;
+    static const char comp_pat1_source[] = PATTERN1;
+    static const char comp_pat2_source[] = PATTERN2;
+    static const char underscores_pat_source[] = "_+";
+
+    if (comp_pat0) return;
+
+    comp_pat0 = rb_reg_new(comp_pat0_source, sizeof comp_pat0_source - 1, 0);
+    rb_gc_register_mark_object(comp_pat0);
+
+    comp_pat1 = rb_reg_new(comp_pat1_source, sizeof comp_pat1_source - 1, 0);
+    rb_gc_register_mark_object(comp_pat1);
+
+    comp_pat2 = rb_reg_new(comp_pat2_source, sizeof comp_pat2_source - 1, 0);
+    rb_gc_register_mark_object(comp_pat2);
+
+    a_slash = rb_usascii_str_new2("/");
+    rb_gc_register_mark_object(a_slash);
+
+    a_dot_and_an_e = rb_usascii_str_new2(".eE");
+    rb_gc_register_mark_object(a_dot_and_an_e);
+
+    null_string = rb_usascii_str_new2("");
+    rb_gc_register_mark_object(null_string);
+
+    underscores_pat = rb_reg_new(underscores_pat_source,
+				 sizeof underscores_pat_source - 1, 0);
+    rb_gc_register_mark_object(underscores_pat);
+
+    an_underscore = rb_usascii_str_new2("_");
+    rb_gc_register_mark_object(an_underscore);
+}
+
+#define id_match rb_intern("match")
+#define f_match(x,y) rb_funcall(x, id_match, 1, y)
+
+#define id_aref rb_intern("[]")
+#define f_aref(x,y) rb_funcall(x, id_aref, 1, y)
+
+#define id_post_match rb_intern("post_match")
+#define f_post_match(x) rb_funcall(x, id_post_match, 0)
+
+#define id_split rb_intern("split")
+#define f_split(x,y) rb_funcall(x, id_split, 1, y)
+
+#define id_include_p rb_intern("include?")
+#define f_include_p(x,y) rb_funcall(x, id_include_p, 1, y)
+
+#define id_count rb_intern("count")
+#define f_count(x,y) rb_funcall(x, id_count, 1, y)
+
+#define id_gsub_bang rb_intern("gsub!")
+#define f_gsub_bang(x,y,z) rb_funcall(x, id_gsub_bang, 2, y, z)
+
+static VALUE
+string_to_c_internal(VALUE self)
+{
+    VALUE s;
+
+    s = self;
+
+    if (RSTRING_LEN(s) == 0)
+	return rb_assoc_new(Qnil, self);
+
+    {
+	VALUE m, sr, si, re, r, i;
+	int po;
+
+	m = f_match(comp_pat0, s);
+	if (!NIL_P(m)) {
+	  sr = f_aref(m, INT2FIX(1));
+	  si = f_aref(m, INT2FIX(2));
+	  re = f_post_match(m);
+	  po = 1;
+	}
+	if (NIL_P(m)) {
+	    m = f_match(comp_pat1, s);
+	    if (!NIL_P(m)) {
+		sr = Qnil;
+		si = f_aref(m, INT2FIX(1));
+		if (NIL_P(si))
+		    si = rb_usascii_str_new2("");
+		{
+		    VALUE t;
+
+		    t = f_aref(m, INT2FIX(2));
+		    if (NIL_P(t))
+			t = rb_usascii_str_new2("1");
+		    rb_str_concat(si, t);
+		}
+		re = f_post_match(m);
+		po = 0;
+	    }
+	}
+	if (NIL_P(m)) {
+	    m = f_match(comp_pat2, s);
+	    if (NIL_P(m))
+		return rb_assoc_new(Qnil, self);
+	    sr = f_aref(m, INT2FIX(1));
+	    if (NIL_P(f_aref(m, INT2FIX(2))))
+		si = Qnil;
+	    else {
+		VALUE t;
+
+		si = f_aref(m, INT2FIX(3));
+		t = f_aref(m, INT2FIX(4));
+		if (NIL_P(t))
+		    t = rb_usascii_str_new2("1");
+		rb_str_concat(si, t);
+	    }
+	    re = f_post_match(m);
+	    po = 0;
+	}
+	r = INT2FIX(0);
+	i = INT2FIX(0);
+	if (!NIL_P(sr)) {
+	    if (f_include_p(sr, a_slash))
+		r = f_to_r(sr);
+	    else if (f_gt_p(f_count(sr, a_dot_and_an_e), INT2FIX(0)))
+		r = f_to_f(sr);
+	    else
+		r = f_to_i(sr);
+	}
+	if (!NIL_P(si)) {
+	    if (f_include_p(si, a_slash))
+		i = f_to_r(si);
+	    else if (f_gt_p(f_count(si, a_dot_and_an_e), INT2FIX(0)))
+		i = f_to_f(si);
+	    else
+		i = f_to_i(si);
+	}
+	if (po)
+	    return rb_assoc_new(rb_complex_polar(r, i), re);
+	else
+	    return rb_assoc_new(rb_complex_new2(r, i), re);
+    }
+}
+
+static VALUE
+string_to_c_strict(VALUE self)
+{
+    VALUE a = string_to_c_internal(self);
+    if (NIL_P(RARRAY_PTR(a)[0]) || RSTRING_LEN(RARRAY_PTR(a)[1]) > 0) {
+	VALUE s = f_inspect(self);
+	rb_raise(rb_eArgError, "invalid value for convert(): %s",
+		 StringValuePtr(s));
+    }
+    return RARRAY_PTR(a)[0];
+}
+
+#define id_gsub rb_intern("gsub")
+#define f_gsub(x,y,z) rb_funcall(x, id_gsub, 2, y, z)
+
+/*
+ * call-seq:
+ *    str.to_c  ->  complex
+ *
+ * Returns a complex which denotes the string form.  The parser
+ * ignores leading whitespaces and trailing garbage.  Any digit
+ * sequences can be separated by an underscore.  Returns zero for null
+ * or garbage string.
+ *
+ * For example:
+ *
+ *    '9'.to_c           #=> (9+0i)
+ *    '2.5'.to_c         #=> (2.5+0i)
+ *    '2.5/1'.to_c       #=> ((5/2)+0i)
+ *    '-3/2'.to_c        #=> ((-3/2)+0i)
+ *    '-i'.to_c          #=> (0-1i)
+ *    '45i'.to_c         #=> (0+45i)
+ *    '3-4i'.to_c        #=> (3-4i)
+ *    '-4e2-4e-2i'.to_c  #=> (-400.0-0.04i)
+ *    '-0.0-0.0i'.to_c   #=> (-0.0-0.0i)
+ *    '1/2+3/4i'.to_c    #=> ((1/2)+(3/4)*i)
+ *    'ruby'.to_c        #=> (0+0i)
+ */
+static VALUE
+string_to_c(VALUE self)
+{
+    VALUE s, a, backref;
+
+    backref = rb_backref_get();
+    rb_match_busy(backref);
+
+    s = f_gsub(self, underscores_pat, an_underscore);
+    a = string_to_c_internal(s);
+
+    rb_backref_set(backref);
+
+    if (!NIL_P(RARRAY_PTR(a)[0]))
+	return RARRAY_PTR(a)[0];
+    return rb_complex_new1(INT2FIX(0));
+}
+
+static VALUE
+nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE a1, a2, backref;
+
+    rb_scan_args(argc, argv, "11", &a1, &a2);
+
+    if (NIL_P(a1) || (argc == 2 && NIL_P(a2)))
+	rb_raise(rb_eTypeError, "can't convert nil into Complex");
+
+    backref = rb_backref_get();
+    rb_match_busy(backref);
+
+    switch (TYPE(a1)) {
+      case T_FIXNUM:
+      case T_BIGNUM:
+      case T_FLOAT:
+	break;
+      case T_STRING:
+	a1 = string_to_c_strict(a1);
+	break;
+    }
+
+    switch (TYPE(a2)) {
+      case T_FIXNUM:
+      case T_BIGNUM:
+      case T_FLOAT:
+	break;
+      case T_STRING:
+	a2 = string_to_c_strict(a2);
+	break;
+    }
+
+    rb_backref_set(backref);
+
+    switch (TYPE(a1)) {
+      case T_COMPLEX:
+	{
+	    get_dat1(a1);
+
+	    if (k_exact_zero_p(dat->imag))
+		a1 = dat->real;
+	}
+    }
+
+    switch (TYPE(a2)) {
+      case T_COMPLEX:
+	{
+	    get_dat1(a2);
+
+	    if (k_exact_zero_p(dat->imag))
+		a2 = dat->real;
+	}
+    }
+
+    switch (TYPE(a1)) {
+      case T_COMPLEX:
+	if (argc == 1 || (k_exact_zero_p(a2)))
+	    return a1;
+    }
+
+    if (argc == 1) {
+	if (k_numeric_p(a1) && !f_real_p(a1))
+	    return a1;
+	/* expect raise exception for consistency */
+	if (!k_numeric_p(a1))
+	    return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c");
+    }
+    else {
+	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
+	    (!f_real_p(a1) || !f_real_p(a2)))
+	    return f_add(a1,
+			 f_mul(a2,
+			       f_complex_new_bang2(rb_cComplex, ZERO, ONE)));
+    }
+
+    {
+	VALUE argv2[2];
+	argv2[0] = a1;
+	argv2[1] = a2;
+	return nucomp_s_new(argc, argv2, klass);
+    }
+}
+
+/* --- */
+
+/*
+ * call-seq:
+ *    num.real  ->  self
+ *
+ * Returns self.
+ */
+static VALUE
+numeric_real(VALUE self)
+{
+    return self;
+}
+
+/*
+ * call-seq:
+ *    num.imag       ->  0
+ *    num.imaginary  ->  0
+ *
+ * Returns zero.
+ */
+static VALUE
+numeric_imag(VALUE self)
+{
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *    num.abs2  ->  real
+ *
+ * Returns square of self.
+ */
+static VALUE
+numeric_abs2(VALUE self)
+{
+    return f_mul(self, self);
+}
+
+#define id_PI rb_intern("PI")
+
+/*
+ * call-seq:
+ *    num.arg    ->  0 or float
+ *    num.angle  ->  0 or float
+ *    num.phase  ->  0 or float
+ *
+ * Returns 0 if the value is positive, pi otherwise.
+ */
+static VALUE
+numeric_arg(VALUE self)
+{
+    if (f_positive_p(self))
+	return INT2FIX(0);
+    return rb_const_get(rb_mMath, id_PI);
+}
+
+/*
+ * call-seq:
+ *    num.rect  ->  array
+ *
+ * Returns an array; [num, 0].
+ */
+static VALUE
+numeric_rect(VALUE self)
+{
+    return rb_assoc_new(self, INT2FIX(0));
+}
+
+/*
+ * call-seq:
+ *    num.polar  ->  array
+ *
+ * Returns an array; [num.abs, num.arg].
+ */
+static VALUE
+numeric_polar(VALUE self)
+{
+    return rb_assoc_new(f_abs(self), f_arg(self));
+}
+
+/*
+ * call-seq:
+ *    num.conj       ->  self
+ *    num.conjugate  ->  self
+ *
+ * Returns self.
+ */
+static VALUE
+numeric_conj(VALUE self)
+{
+    return self;
+}
+
+/*
+ * call-seq:
+ *    flo.arg    ->  0 or float
+ *    flo.angle  ->  0 or float
+ *    flo.phase  ->  0 or float
+ *
+ * Returns 0 if the value is positive, pi otherwise.
+ */
+static VALUE
+float_arg(VALUE self)
+{
+    if (isnan(RFLOAT_VALUE(self)))
+	return self;
+    if (f_tpositive_p(self))
+	return INT2FIX(0);
+    return rb_const_get(rb_mMath, id_PI);
+}
+
+/*
+ * A complex number can be represented as a paired real number with
+ * imaginary unit; a+bi.  Where a is real part, b is imaginary part
+ * and i is imaginary unit.  Real a equals complex a+0i
+ * mathematically.
+ *
+ * In ruby, you can create complex object with Complex, Complex::rect,
+ * Complex::polar or to_c method.
+ *
+ *    Complex(1)           #=> (1+0i)
+ *    Complex(2, 3)        #=> (2+3i)
+ *    Complex.polar(2, 3)  #=> (-1.9799849932008908+0.2822400161197344i)
+ *    3.to_c               #=> (3+0i)
+ *
+ * You can also create complex object from floating-point numbers or
+ * strings.
+ *
+ *    Complex(0.3)         #=> (0.3+0i)
+ *    Complex('0.3-0.5i')  #=> (0.3-0.5i)
+ *    Complex('2/3+3/4i')  #=> ((2/3)+(3/4)*i)
+ *    Complex('1@2')       #=> (-0.4161468365471424+0.9092974268256817i)
+ *
+ *    0.3.to_c             #=> (0.3+0i)
+ *    '0.3-0.5i'.to_c      #=> (0.3-0.5i)
+ *    '2/3+3/4i'.to_c      #=> ((2/3)+(3/4)*i)
+ *    '1@2'.to_c           #=> (-0.4161468365471424+0.9092974268256817i)
+ *
+ * A complex object is either an exact or an inexact number.
+ *
+ *    Complex(1, 1) / 2    #=> ((1/2)+(1/2)*i)
+ *    Complex(1, 1) / 2.0  #=> (0.5+0.5i)
+ */
+void
+Init_Complex(void)
+{
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
+    assert(fprintf(stderr, "assert() is now active\n"));
+
+    id_abs = rb_intern("abs");
+    id_abs2 = rb_intern("abs2");
+    id_arg = rb_intern("arg");
+    id_cmp = rb_intern("<=>");
+    id_conj = rb_intern("conj");
+    id_convert = rb_intern("convert");
+    id_denominator = rb_intern("denominator");
+    id_divmod = rb_intern("divmod");
+    id_eqeq_p = rb_intern("==");
+    id_expt = rb_intern("**");
+    id_fdiv = rb_intern("fdiv");
+    id_floor = rb_intern("floor");
+    id_idiv = rb_intern("div");
+    id_imag = rb_intern("imag");
+    id_inspect = rb_intern("inspect");
+    id_negate = rb_intern("-@");
+    id_numerator = rb_intern("numerator");
+    id_quo = rb_intern("quo");
+    id_real = rb_intern("real");
+    id_real_p = rb_intern("real?");
+    id_to_f = rb_intern("to_f");
+    id_to_i = rb_intern("to_i");
+    id_to_r = rb_intern("to_r");
+    id_to_s = rb_intern("to_s");
+
+    rb_cComplex = rb_define_class("Complex", rb_cNumeric);
+
+    rb_define_alloc_func(rb_cComplex, nucomp_s_alloc);
+    rb_undef_method(CLASS_OF(rb_cComplex), "allocate");
+
+#if 0
+    rb_define_private_method(CLASS_OF(rb_cComplex), "new!", nucomp_s_new_bang, -1);
+    rb_define_private_method(CLASS_OF(rb_cComplex), "new", nucomp_s_new, -1);
+#else
+    rb_undef_method(CLASS_OF(rb_cComplex), "new");
+#endif
+
+    rb_define_singleton_method(rb_cComplex, "rectangular", nucomp_s_new, -1);
+    rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1);
+    rb_define_singleton_method(rb_cComplex, "polar", nucomp_s_polar, -1);
+
+    rb_define_global_function("Complex", nucomp_f_complex, -1);
+
+    rb_undef_method(rb_cComplex, "%");
+    rb_undef_method(rb_cComplex, "<");
+    rb_undef_method(rb_cComplex, "<=");
+    rb_undef_method(rb_cComplex, "<=>");
+    rb_undef_method(rb_cComplex, ">");
+    rb_undef_method(rb_cComplex, ">=");
+    rb_undef_method(rb_cComplex, "between?");
+    rb_undef_method(rb_cComplex, "div");
+    rb_undef_method(rb_cComplex, "divmod");
+    rb_undef_method(rb_cComplex, "floor");
+    rb_undef_method(rb_cComplex, "ceil");
+    rb_undef_method(rb_cComplex, "modulo");
+    rb_undef_method(rb_cComplex, "remainder");
+    rb_undef_method(rb_cComplex, "round");
+    rb_undef_method(rb_cComplex, "step");
+    rb_undef_method(rb_cComplex, "truncate");
+    rb_undef_method(rb_cComplex, "i");
+
+#if 0 /* NUBY */
+    rb_undef_method(rb_cComplex, "//");
+#endif
+
+    rb_define_method(rb_cComplex, "real", nucomp_real, 0);
+    rb_define_method(rb_cComplex, "imaginary", nucomp_imag, 0);
+    rb_define_method(rb_cComplex, "imag", nucomp_imag, 0);
+
+    rb_define_method(rb_cComplex, "-@", nucomp_negate, 0);
+    rb_define_method(rb_cComplex, "+", nucomp_add, 1);
+    rb_define_method(rb_cComplex, "-", nucomp_sub, 1);
+    rb_define_method(rb_cComplex, "*", nucomp_mul, 1);
+    rb_define_method(rb_cComplex, "/", nucomp_div, 1);
+    rb_define_method(rb_cComplex, "quo", nucomp_quo, 1);
+    rb_define_method(rb_cComplex, "fdiv", nucomp_fdiv, 1);
+    rb_define_method(rb_cComplex, "**", nucomp_expt, 1);
+
+    rb_define_method(rb_cComplex, "==", nucomp_eqeq_p, 1);
+    rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1);
+
+    rb_define_method(rb_cComplex, "abs", nucomp_abs, 0);
+    rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0);
+    rb_define_method(rb_cComplex, "abs2", nucomp_abs2, 0);
+    rb_define_method(rb_cComplex, "arg", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "angle", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "phase", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "rectangular", nucomp_rect, 0);
+    rb_define_method(rb_cComplex, "rect", nucomp_rect, 0);
+    rb_define_method(rb_cComplex, "polar", nucomp_polar, 0);
+    rb_define_method(rb_cComplex, "conjugate", nucomp_conj, 0);
+    rb_define_method(rb_cComplex, "conj", nucomp_conj, 0);
+#if 0
+    rb_define_method(rb_cComplex, "~", nucomp_conj, 0); /* gcc */
+#endif
+
+    rb_define_method(rb_cComplex, "real?", nucomp_false, 0);
+#if 0
+    rb_define_method(rb_cComplex, "complex?", nucomp_true, 0);
+    rb_define_method(rb_cComplex, "exact?", nucomp_exact_p, 0);
+    rb_define_method(rb_cComplex, "inexact?", nucomp_inexact_p, 0);
+#endif
+
+    rb_define_method(rb_cComplex, "numerator", nucomp_numerator, 0);
+    rb_define_method(rb_cComplex, "denominator", nucomp_denominator, 0);
+
+    rb_define_method(rb_cComplex, "hash", nucomp_hash, 0);
+    rb_define_method(rb_cComplex, "eql?", nucomp_eql_p, 1);
+
+    rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
+    rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
+
+    rb_define_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
+    rb_define_method(rb_cComplex, "marshal_load", nucomp_marshal_load, 1);
+
+    /* --- */
+
+    rb_define_method(rb_cComplex, "to_i", nucomp_to_i, 0);
+    rb_define_method(rb_cComplex, "to_f", nucomp_to_f, 0);
+    rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0);
+    rb_define_method(rb_cComplex, "rationalize", nucomp_rationalize, -1);
+    rb_define_method(rb_cNilClass, "to_c", nilclass_to_c, 0);
+    rb_define_method(rb_cNumeric, "to_c", numeric_to_c, 0);
+
+    make_patterns();
+
+    rb_define_method(rb_cString, "to_c", string_to_c, 0);
+
+    rb_define_private_method(CLASS_OF(rb_cComplex), "convert", nucomp_s_convert, -1);
+
+    /* --- */
+
+    rb_define_method(rb_cNumeric, "real", numeric_real, 0);
+    rb_define_method(rb_cNumeric, "imaginary", numeric_imag, 0);
+    rb_define_method(rb_cNumeric, "imag", numeric_imag, 0);
+    rb_define_method(rb_cNumeric, "abs2", numeric_abs2, 0);
+    rb_define_method(rb_cNumeric, "arg", numeric_arg, 0);
+    rb_define_method(rb_cNumeric, "angle", numeric_arg, 0);
+    rb_define_method(rb_cNumeric, "phase", numeric_arg, 0);
+    rb_define_method(rb_cNumeric, "rectangular", numeric_rect, 0);
+    rb_define_method(rb_cNumeric, "rect", numeric_rect, 0);
+    rb_define_method(rb_cNumeric, "polar", numeric_polar, 0);
+    rb_define_method(rb_cNumeric, "conjugate", numeric_conj, 0);
+    rb_define_method(rb_cNumeric, "conj", numeric_conj, 0);
+
+    rb_define_method(rb_cFloat, "arg", float_arg, 0);
+    rb_define_method(rb_cFloat, "angle", float_arg, 0);
+    rb_define_method(rb_cFloat, "phase", float_arg, 0);
+
+    rb_define_const(rb_cComplex, "I",
+		    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
+}
+
+/*
+Local variables:
+c-file-style: "ruby"
+End:
+*/
diff --git a/config.guess b/config.guess
deleted file mode 100644
index dd1688b7b5..0000000000
--- a/config.guess
+++ /dev/null
@@ -1,1459 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-06-11'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
deleted file mode 100644
index 506d3ab77f..0000000000
--- a/config.sub
+++ /dev/null
@@ -1,1537 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-06-11'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=-linux
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure.in b/configure.in
index 56bc83d12d..52b9320d09 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,31 @@
 dnl Process this file with autoconf to produce a configure script.
+dnl {
 AC_INIT()
+AC_CONFIG_AUX_DIR(tool)
 
-AC_PREREQ(2.58)
+AC_PREREQ(2.60)
+
+AC_DEFUN([RUBY_PREREQ_AC],
+	[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), [-1],
+		AC_MSG_ERROR([Autoconf version ]$1[ or higher is required]$2))])
+
+dnl environment section {
+
+AC_ARG_WITH(baseruby,
+	AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
+	[
+		AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)])
+	],
+	[
+		BASERUBY="ruby"
+	])
+test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
+    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+AC_SUBST(BASERUBY)
 
 AC_DEFUN([RUBY_MINGW32],
-[case "$host_os" in
-cygwin*)
+[AS_CASE(["$host_os"],
+[cygwin*], [
 AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
 [AC_TRY_CPP([
 #ifndef __MINGW32__
@@ -14,8 +34,10 @@ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
 ], rb_cv_mingw32=yes,rb_cv_mingw32=no)
 rm -f conftest*])
 test "$rb_cv_mingw32" = yes && target_os="mingw32"
-  ;;
-esac])
+  ])
+AS_CASE(["$target_os"], [mingw*msvc], [
+target_os="`echo ${target_os} | sed 's/msvc$//'`"
+  ])])
 
 AC_DEFUN([RUBY_CPPOUTFILE],
 [AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
@@ -44,128 +66,229 @@ fi
 GNU_LD=$rb_cv_prog_gnu_ld
 AC_SUBST(GNU_LD)])
 
-rb_version=`grep RUBY_VERSION $srcdir/version.h`
-MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'`
-MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'`
-TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'`
+eval `sed -n 's/^#define RUBY_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/version.h`
+for v in MAJOR MINOR TEENY; do
+    if eval "test \"\$$v\" = ''"; then
+	AC_MSG_ERROR(could not determine $v number from version.h)
+    fi
+done
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(TEENY)
+RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h`
+AC_SUBST(RUBY_PROGRAM_VERSION)
+RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h`
+AC_SUBST(RUBY_RELEASE_DATE)
+if test "$MAJOR" = "1"; then
+  AC_DEFINE(CANONICALIZATION_FOR_MATHN)
+fi
 dnl checks for alternative programs
-AC_ARG_WITH(gcc, [  --without-gcc           never use gcc], [
-	case $withval in
-	no)	: ${CC=cc}
-		;;
-	yes)	: ${CC=gcc}
-		;;
-	*)	CC=$withval
-		;;
-	esac])
+AC_ARG_WITH(gcc,
+	AS_HELP_STRING([--without-gcc], [never use gcc]),
+	[
+	AS_CASE([$withval],
+	    [no],  [: ${CC=cc}],
+	    [yes], [: ${CC=gcc}],
+	           [CC=$withval])])
 dnl If the user switches compilers, we can't believe the cache
 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
 then
   AC_MSG_ERROR(cached CC is different -- throw away $cache_file
 (it is also a good idea to do 'make clean' before compiling))
 fi
+test -z "$CC" || ac_cv_prog_CC="$CC"
 
 if test "$program_prefix" = NONE; then
   program_prefix=
 fi
+RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
+AC_SUBST(RUBY_BASE_NAME)
+AC_SUBST(RUBYW_BASE_NAME)
+
 AC_CANONICAL_TARGET
 target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
 ac_install_sh='' # unusable for extension libraries.
 
-dnl checks for fat-binary
-AC_ARG_ENABLE(fat-binary,
-       [  --enable-fat-binary=ARCHS
-                          build an Apple/NeXT Multi Architecture Binary (MAB);
+AC_DEFUN([RUBY_APPEND_OPTION],
+	[# RUBY_APPEND_OPTION($1, $2)
+	AS_CASE([" [$]{$1-} "],
+	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="[$]$1 $2"])])
+AC_DEFUN([RUBY_APPEND_OPTIONS],
+	[{ for rb_opt in $2; do # RUBY_APPEND_OPTIONS($1, $2)
+	AS_CASE([" [$]{$1-} "],
+	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ $1="[$]$1 [$]{rb_opt}"])
+	done; }])
+AC_DEFUN([RUBY_PREPEND_OPTION],
+	[# RUBY_PREPEND_OPTION($1, $2)
+	AS_CASE([" [$]{$1-} "],
+	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="$2 [$]$1"])])
+AC_DEFUN([RUBY_PREPEND_OPTIONS],
+	[{ unset rb_opts; for rb_opt in $2; do # RUBY_PREPEND_OPTIONS($1, $2)
+	AS_CASE([" [$]{rb_opts} [$]{$1-} "],
+	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ rb_opts="[$]{rb_opts}[$]{rb_opt} "])
+	done
+	$1="[$]{rb_opts}[$]$1"; }])
+
+AC_ARG_WITH(arch,
+ 	AS_HELP_STRING([--with-arch=ARCHS],
+		       [build an Apple/NeXT Multi Architecture Binary (MAB);
                           ARCHS is a comma-delimited list of architectures for
-                          which to build; if ARCHS is omitted, then the package
-                          will be built for all architectures supported by the
-                          platform ("ppc" for MacOS/X and Darwin; "ppc,i386"
-                          for Rhapsody; "m68k,i386,sparc" for OpenStep;
-                          "m68k,i386,sparc,hppa" for NextStep); if this option
-                          is disabled or omitted entirely, then the package
-                          will be built only for the target platform],
-       [fat_binary=$enableval], [fat_binary=no])
-if test "$fat_binary" != no; then
+                          which to build; if this option is disabled or omitted
+			  entirely, then the package will be built only for the
+			  target platform]),
+       [target_archs="$withval"], [unset target_archs])
+
+AC_DEFUN([RUBY_DEFAULT_ARCH], [
+AC_MSG_CHECKING([arch option])
+AS_CASE([$1],
+	[*64],        [ARCH_FLAG=-m64],
+	[[i[3-6]86]], [ARCH_FLAG=-m32],
+	[AC_MSG_ERROR(unknown target architecture: $target_archs)]
+	)
+AC_MSG_RESULT([$ARCH_FLAG])
+])
 
+AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
+# RUBY_UNIVERSAL_ARCH begin
+test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
+test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
+unset ARCH_FLAG universal_binary universal_archnames
+if test ${target_archs+set}; then
     AC_MSG_CHECKING([target architectures])
-
-    # Respect TARGET_ARCHS setting from environment if available.
-    if test -z "$TARGET_ARCHS"; then
-	# Respect ARCH given to --enable-fat-binary if present.
-	if test "$fat_binary" != yes; then
-	    TARGET_ARCHS=`echo "$fat_binary" | tr ',' ' '`
-	else
-	    # Choose a default set of architectures based upon platform.
-	    case "$target_os" in
-	    darwin*)
-		TARGET_ARCHS="ppc"
-		;;
-	    rhapsody*)
-		TARGET_ARCHS="ppc i386"
-		;;
-	    openstep*)
-		TARGET_ARCHS="m68k i386 sparc"
-		;;
-	    nextstep*)
-		TARGET_ARCHS="m68k i386 sparc hppa"
-		;;
-	    *)
-		TARGET_ARCHS=`arch`
-	    esac
-	fi
-    fi
-
-    AC_MSG_RESULT([$TARGET_ARCHS])
-
+    target_archs=`echo $target_archs | tr , ' '`
     # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
-    ARCH_FLAG=
-    for archs in $TARGET_ARCHS 
+    for archs in $target_archs
     do
-        ARCH_FLAG="$ARCH_FLAG -arch $archs"
+	AS_CASE([",$universal_binary,"],[*",$archs,"*], [],[
+	    cpu=`$SHELL "$ac_aux_dir/config.sub" "${archs}-${target_os}" 2>&1` || {
+	        AC_MSG_RESULT([failed])
+		AC_MSG_ERROR([$cpu])
+	    }
+	    cpu=`echo $cpu | sed 's/-.*-.*//'`
+	    universal_binary="${universal_binary+$universal_binary,}$cpu"
+	    universal_archnames="${universal_archnames} ${archs}=${cpu}"
+	    ARCH_FLAG="${ARCH_FLAG+$ARCH_FLAG }-arch $archs"
+	    ])
     done
-    AC_DEFINE(NEXT_FAT_BINARY)
+    target_archs="$universal_binary"
+    unset universal_binary
+    AS_CASE(["$target_archs"],
+      [*,*], [universal_binary=yes],
+             [unset universal_archnames])
+    AC_MSG_RESULT([$target_archs])
+
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
+    if test "${universal_binary-no}" = yes; then
+	RUBY_PREREQ_AC(2.63, [ to compile universal binary])
+	AC_SUBST(try_header,try_compile)
+	target_cpu=universal
+	real_cross_compiling=$cross_compiling
+    else
+	if test x"$target_cpu" != x"${target_archs}"; then
+	    echo 'int main(){return 0;}' > conftest.c
+	    if $CC $CFLAGS $ARCH_FLAG conftest.c > /dev/null 2>&1; then
+		rm -f conftest.* a.out
+	    else
+		RUBY_DEFAULT_ARCH("$target_archs")
+	    fi
+	fi
+	target_cpu=${target_archs}
+    fi
+    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
+    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
+    CFLAGS="$CFLAGS ${ARCH_FLAG}"
+    LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
+else
+    if test x"$target_alias" = x; then
+	AS_CASE(["$target_os"],
+	  [darwin*], [
+	    AC_MSG_CHECKING([for real target cpu])
+	    target=`echo $target | sed "s/^$target_cpu-/-/"`
+	    target_cpu=`$CC -E - 2>/dev/null <<EOF |
+#ifdef __x86_64__
+"processor-name=x86_64"
+#endif
+#ifdef __i386__
+"processor-name=i386"
+#endif
+#ifdef __ppc__
+"processor-name=powerpc"
+#endif
+#ifdef __ppc64__
+"processor-name=powerpc64"
+#endif
+EOF
+	    sed -n 's/^"processor-name=\(.*\)"/\1/p'`
+	    target="$target_cpu${target}"
+	    AC_MSG_RESULT([$target_cpu])
+	    ])
+    fi
+    target_archs="$target_cpu"
 fi
-
-case $target_cpu in
-  i?86) frame_address=yes;;
-  *)    frame_address=no;;
-esac
-AC_ARG_ENABLE(frame-address,
-       [  --enable-frame-address  use GCC __builtin_frame_address(). ],
-       [frame_address=$enableval])
-if test $frame_address = yes; then
-    AC_DEFINE(USE_BUILTIN_FRAME_ADDRESS)
+if test "${target_archs}" != "${rb_cv_target_archs-${target_archs}}"; then
+    AC_MSG_ERROR([target arch(s) has changed from ${rb_cv_target_archs-nothing} to ${target_archs}])
+else
+    rb_cv_target_archs=${target_archs}
 fi
+# RUBY_UNIVERSAL_ARCH end
+])
+
+AC_ARG_ENABLE(load-relative,
+       AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
+       [load_relative=$enableval])
 
 AC_ARG_PROGRAM
 
 dnl Checks for programs.
 
+cflagspat=
+test -z "$optflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "$debugflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "warnflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+if test -z "${CFLAGS+set}"; then
+    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+    orig_cflags="$cflags"
+    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
+fi
+if test -z "${CXXFLAGS+set}"; then
+    cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+    orig_cxxflags="$cxxflags"
+    cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
+fi
+
 if test x"${build}" != x"${host}"; then
   AC_CHECK_TOOL(CC, gcc)
 fi
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_GCC_TRADITIONAL
+AC_SUBST(GCC)
 if test "$GCC" = yes; then
     linker_flag=-Wl,
+    : ${optflags=-O3}
+    AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
 else
     linker_flag=
 fi
+test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
 
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
 
 : ${OUTFLAG='-o '}
+: ${COUTFLAG=${OUTFLAG}}
 AC_SUBST(OUTFLAG)
+AC_SUBST(COUTFLAG)
 
 RUBY_MINGW32
-
-AC_PROG_YACC
-if test "$YACC" = "yacc"; then
-  AC_DEFINE([OLD_YACC])
+RUBY_UNIVERSAL_ARCH
+if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then
+    RUBY_DEFAULT_ARCH("$target_cpu")
 fi
 
 AC_CHECK_TOOL(RANLIB, ranlib, :)
@@ -178,60 +301,140 @@ AC_CHECK_TOOL(AS, as)
 ASFLAGS=$ASFLAGS
 AC_SUBST(ASFLAGS)
 
-case "$target_os" in
-cygwin*|mingw*)
+AS_CASE(["$target_os"],[cygwin*|mingw*], [ac_cv_prog_ac_ct_OBJCOPY=":"])
+
+# BSD's ports and MacPorts prefix GNU binutils with 'g'
+AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump])
+AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
+
+AS_CASE(["$target_os"],
+[cygwin*|mingw*], [
     AC_CHECK_TOOL(NM, nm)
     AC_CHECK_TOOL(WINDRES, windres)
     AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
     target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-    case "$target_os" in
-    mingw*)
+    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
+    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
+    AS_CASE(["$target_os"],
+    [mingw*], [
 	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
-	AC_CHECK_TOOL(OBJDUMP, objdump)
 	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
-	AC_TRY_LINK([#include <stdio.h>],
+	AC_TRY_LINK([@%:@include <stdio.h>],
 		    [FILE* volatile f = stdin; return 0;],
 		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
 				   tr A-Z a-z |
 				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
 		    [rb_cv_msvcrt=msvcrt])
 	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
-	AC_ARG_WITH(winsock2,
-		[  --with-winsock2         link winsock2 (MinGW only)], [
-		case $withval in
-		yes) with_winsock2=yes;;
-		*)   with_winsock2=no;;
-		esac], [with_winsock2=no])
-	if test "$with_winsock2" = yes; then
-	  AC_DEFINE(USE_WINSOCK2)
-	fi
-    esac
+    ])
     : ${enable_shared=yes}
-    ;;
-aix*)
-    AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)
-    ;;
-hiuxmpp*)
-    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
-    AC_DEFINE(__HIUX_MPP__)
-    ;;
-esac
+    ],
+[aix*],     [AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)],
+[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
 
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
+if test "x$MKDIR_P" = "x -d"; then
+  if test x"$as_mkdir_p" != xfalse; then
+    MKDIR_P='mkdir -p'
+    echo "use 'mkdir -p' as MKDIR_P"
+  else
+    AC_MSG_ERROR([mkdir -p is required])
+  fi
+fi
+MAKEDIRS="$MKDIR_P"
+AC_SUBST(MAKEDIRS)
+
+AC_CHECK_TOOL(DOT, dot)
+AC_CHECK_TOOL(DOXYGEN, doxygen)
+if test x"$DOXYGEN" = x; then
+    CAPITARGET=nodoc
+else
+    CAPITARGET=capi
+fi
+AC_SUBST(CAPITARGET)
 
 # checks for UNIX variants that set C preprocessor variables
-AC_AIX
-AC_MINIX
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
-if $as_mkdir_p; then
-  AC_SUBST(MAKEDIRS, ['mkdir -p'])
+AC_SUBST(RMDIRS, ['$(top_srcdir)/tool/rmdirs'])
+AC_SUBST(RMALL, ['rm -fr'])
+
+AC_MSG_CHECKING([for cd using phisical directory])
+rm -fr conf$$.dir
+mkdir conf$$.dir &&
+(cd conf$$.dir && mkdir src build && cd src &&
+$as_ln_s ../build . > /dev/null 2>&1 && cd build &&
+for chdir in 'cd -P' 'PWD= cd'; do
+    /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break
+done)
+if test -e conf$$.dir/src/cdcmd; then
+    read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
 else
-  AC_SUBST(MAKEDIRS, ['install -d'])
+    CHDIR=cd
 fi
+rm -fr conf$$.dir
+AC_MSG_RESULT([$CHDIR])
+AC_SUBST(CHDIR)
+
+dnl }
+dnl compiler section {
+
+AC_DEFUN(RUBY_TRY_CFLAGS, [
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="[$]CFLAGS $1"
+    AC_MSG_CHECKING([whether ]$1[ is accepted])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+	[$2
+	AC_MSG_RESULT(yes)],
+	[$3
+	AC_MSG_RESULT(no)])
+    CFLAGS="$save_CFLAGS"
+    save_CFLAGS=
+])
+
+AC_DEFUN(RUBY_TRY_LDFLAGS, [
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="[$]LDFLAGS $1"
+    AC_MSG_CHECKING([whether $1 is accepted])
+    AC_TRY_LINK([$4], [$5],
+	[$2
+	AC_MSG_RESULT(yes)],
+	[$3
+	AC_MSG_RESULT(no)])
+    LDFLAGS="$save_LDFLAGS"
+    save_LDFLAGS=
+])
+
+if test "$GCC:${warnflags+set}:no" = yes::no; then
+    for wflag in -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings \
+		 -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long; do
+	RUBY_TRY_CFLAGS($wflag, [warnflags="${warnflags+$warnflags }$wflag"])
+    done
+    AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag=-Wextra],
+                             [wflag=-Wall])
+    RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
+fi
+if test "$GCC" = ""; then
+    AS_CASE(["$target_os"],[aix*],[warnflags="-qinfo=por"])
+fi
+if test "$GCC" = yes; then
+    if test "$visibility_option" = yes; then
+	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
+    else
+	RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no])
+    fi
+    test "$visibility_option" = no || OBJCOPY=:
+fi
+
+test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
+test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
 
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
@@ -241,23 +444,159 @@ mv confdefs.h largefile.h
 mv confdefs1.h confdefs.h
 cat largefile.h >> confdefs.h
 
+AS_CASE(["$target_os"],[mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8])
+
 AC_CHECK_TYPES([long long, off_t])
 
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
-AC_CHECK_SIZEOF(__int64, 0)
-AC_CHECK_SIZEOF(off_t, 0)
-AC_CHECK_SIZEOF(void*, 4)
-AC_CHECK_SIZEOF(float, 4)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_SIZEOF(time_t, 0)
-
-for id in pid_t gid_t uid_t; do
-    AC_CHECK_TYPE($id, [typ=$id], [typ=int])
-    AC_DEFINE_UNQUOTED(rb_$id, $typ)
-done
+AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
+    [test "$universal_binary" = yes && cross_compiling=yes
+    AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
+	[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
+
+dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
+AC_DEFUN([RUBY_CHECK_SIZEOF],
+[m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then])
+AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [
+    unset AS_TR_SH(ac_cv_sizeof_$1)
+    rbcv_var="
+typedef m4_bpatsubst([$1], [\..*]) ac__type_sizeof_;
+static ac__type_sizeof_ *rbcv_ptr;
+@%:@define AS_TR_CPP(SIZEOF_$1) sizeof((*rbcv_ptr)[]m4_bmatch([$1], [\.], .m4_bpatsubst([$1], [^[^.]*\.])))
+"
+    m4_ifval([$2], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
+    for t in $2; do
+	AC_COMPILE_IFELSE(
+	    [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([$4]
+		[$rbcv_var]),
+		[AS_TR_CPP(SIZEOF_$1) == sizeof($t)])], [
+		AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t)
+		break])
+    done
+    }])
+    unset cond
+    m4_ifval([$3], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
+    for s in 32 64 128; do
+	for t in $3; do
+	    cond="${cond}
+@%:@${cond+el}if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})"
+	    hdr="AC_INCLUDES_DEFAULT([$4
+@%:@if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})
+@%:@ define AS_TR_CPP(HAVE_$1) 1
+@%:@else
+@%:@ define AS_TR_CPP(HAVE_$1) 0
+@%:@endif])"
+	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr], [!AS_TR_CPP(HAVE_$1)])], [continue])
+	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
+				[$rbcv_var],
+				[AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ([$[s / rb_cv_char_bit]]))])],
+		[AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"])
+	done
+    done
+    }])
+    m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
+    #(
+    [SIZEOF_*]);;
+    #(
+    *)])
+    test "$universal_binary" = yes && cross_compiling=yes
+    AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
+[${cond+$cond
+@%:@else}
+$rbcv_var
+${cond+@%:@endif}
+@%:@ifndef AS_TR_CPP(SIZEOF_$1)
+@%:@define AS_TR_CPP(SIZEOF_$1) 0
+@%:@endif], [t=0])
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling
+    if test ${t-0} != 0; then
+	AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
+    fi
+    m4_ifval([$2][$3], [;; esac])
+    : ${AS_TR_SH(ac_cv_sizeof_$1)=0}
+])
+{
+    unset cond
+    for t in ${AS_TR_SH(ac_cv_sizeof_$1)-}; do
+	AS_CASE(["$t"],
+	[[[0-9]*|SIZEOF_*]], [
+	    ${cond+echo "@%:@else"}
+	    echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]"
+	    break
+	    ],
+	[
+	    s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']`
+	    echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)"
+	    echo "@%:@define AS_TR_CPP(SIZEOF_$1) [$[s / rb_cv_char_bit]]"
+	    cond=1
+	    ])
+    done
+    ${cond+echo "@%:@endif"}
+} >> confdefs.h
+m4_bmatch([$1], [\.], [], [else
+AC_CHECK_SIZEOF([$1], 0, [$4])
+fi])
+])
+
+RUBY_CHECK_SIZEOF(int, [], [ILP])
+RUBY_CHECK_SIZEOF(short)
+RUBY_CHECK_SIZEOF(long, [int], [ILP LP])
+RUBY_CHECK_SIZEOF(long long)
+RUBY_CHECK_SIZEOF(__int64)
+RUBY_CHECK_SIZEOF(off_t)
+RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
+RUBY_CHECK_SIZEOF(float)
+RUBY_CHECK_SIZEOF(double)
+RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
+
+dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
+AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
+    AC_CHECK_TYPE([$1], [n=[$1]], [n=[$2]], [$4])
+    AC_CACHE_CHECK([for convertible type of [$1]], rb_cv_[$1]_convertible, [
+	u= t=
+	AS_CASE(["$n "],
+	  [*" signed "*], [ ],
+	  [*" unsigned "*], [
+	    u=U],
+	  [
+	    AC_COMPILE_IFELSE(
+		[AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])], [($n)-1 > 0])],
+		[u=U])])
+	if test x"$t" = x; then
+	    for t in "long long" long int short; do
+		test -n "$u" && t="unsigned $t"
+		AC_COMPILE_IFELSE(
+		    [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])]
+			[typedef $n rbcv_conftest_target_type;
+			typedef $t rbcv_conftest_replace_type;
+			extern rbcv_conftest_target_type rbcv_conftest_var;
+			extern rbcv_conftest_replace_type rbcv_conftest_var;
+			extern rbcv_conftest_target_type rbcv_conftest_func(void);
+			extern rbcv_conftest_replace_type rbcv_conftest_func(void);
+			], [sizeof(rbcv_conftest_target_type) == sizeof(rbcv_conftest_replace_type)])],
+		    [n="$t"; break])
+	    done
+	fi
+	AS_CASE([" $n "],
+	  [*" long long "*], [
+	    t=LL],
+	  [*" long "*], [
+	    t=LONG],
+	  [
+	    t=INT])
+	rb_cv_[$1]_convertible=${u}${t}])
+    test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes" && n="$1"
+    AC_DEFINE_UNQUOTED(rb_[$1], $n)
+    AC_DEFINE_UNQUOTED([$3]2NUM[(v)], [${rb_cv_[$1]_convertible}2NUM(v)])
+    AC_DEFINE_UNQUOTED(NUM2[$3][(v)], [NUM2${rb_cv_[$1]_convertible}(v)])
+    AC_DEFINE_UNQUOTED(PRI_[$3]_PREFIX,
+	["`echo ${rb_cv_[$1]_convertible} | sed ['s/^U//;s/[^L].*//;y/L/l/']`"])
+])
+RUBY_REPLACE_TYPE(pid_t, int, PIDT)
+RUBY_REPLACE_TYPE(uid_t, int, UIDT)
+RUBY_REPLACE_TYPE(gid_t, int, GIDT)
+RUBY_REPLACE_TYPE(time_t, [], TIMET, [@%:@include <time.h>])
+RUBY_REPLACE_TYPE(dev_t, [int long "long long"], DEVT)
 
 AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
   [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@@ -278,6 +617,41 @@ else
   AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
 fi
 
+AC_CACHE_CHECK(stringization, rb_cv_stringization, [
+  rb_cv_stringization=no
+  for string in "#expr" '"expr"'; do
+    AC_COMPILE_IFELSE([
+      AC_LANG_BOOL_COMPILE_TRY([
+#define STRINGIZE0(expr) $string
+#define STRINGIZE(expr) STRINGIZE0(expr)
+#undef real_test_for_stringization
+#define test_for_stringization -.real_test_for_stringization.-
+const char stringized[[]] = STRINGIZE(test_for_stringization);
+], [sizeof(stringized) == 32])],
+      [rb_cv_stringization="$string"; break],
+      [rb_cv_stringization=no])
+  done]
+)
+AC_DEFINE(STRINGIZE(expr),STRINGIZE0(expr))
+if test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"; then
+  AC_DEFINE_UNQUOTED(STRINGIZE0(expr),$rb_cv_stringization)
+  AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1)
+fi
+
+AC_CACHE_CHECK([string literal concatenation],
+  rb_cv_string_literal_concatenation, [
+  AC_COMPILE_IFELSE([
+    AC_LANG_BOOL_COMPILE_TRY([
+const char concatenated_literal[[]] = "literals" "to"
+  "be" "concatenated.";
+], [sizeof(concatenated_literal) == 26])],
+    [rb_cv_string_literal_concatenation=yes],
+    [rb_cv_string_literal_concatenation=no])]
+)
+if test "$rb_cv_string_literal_concatenation" = no; then
+  AC_DEFINE(NO_STRING_LITERAL_CONCATENATION,1)
+fi
+
 AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg,
   [AC_TRY_COMPILE([
 #include <stdarg.h>
@@ -296,6 +670,27 @@ if test "$rb_cv_stdarg" = yes; then
   AC_DEFINE(HAVE_STDARG_PROTOTYPES)
 fi
 
+AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
+  [AC_TRY_COMPILE([@%:@define FOO(a, ...) foo(a, @%:@@%:@__VA_ARGS__)],
+  [FOO(1);FOO(1,2);FOO(1,2,3);],
+  rb_cv_va_args_macro=yes,
+  rb_cv_va_args_macro=no)])
+if test "$rb_cv_va_args_macro" = yes; then
+  AC_DEFINE(HAVE_VA_ARGS_MACRO)
+fi
+
+AC_DEFUN([RUBY_DEFINE_IF], [dnl
+    m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
+@%:@if $1
+EOH
+])dnl
+AC_DEFINE_UNQUOTED($2, $3)
+    m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
+@%:@endif /* $1 */
+EOH
+])dnl
+])dnl
+
 AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
 m4_ifval([$2], dnl
   [AS_VAR_PUSHDEF([attrib],[$2])], dnl
@@ -305,6 +700,7 @@ m4_ifval([$3], dnl
   [AS_VAR_PUSHDEF([rbcv],[$3])], dnl
   [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
 )dnl
+m4_ifval([$4], [rbcv_cond=[$4]; test "$rbcv_cond" || unset rbcv_cond])
 AC_CACHE_CHECK(for [$1] function attribute, rbcv,
 [rbcv=x
 if test "${ac_c_werror_flag+set}"; then
@@ -314,9 +710,14 @@ else
 fi
 ac_c_werror_flag=yes
 for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do
+  m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"})
   AC_TRY_COMPILE(
-    [#define ]attrib[(x) $mac
-    ]attrib[(void conftest_attribute_check(void));], [],
+    m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond})
+[@%:@define ]attrib[(x) $mac]
+m4_ifval([$4],${rbcv_cond+[@%:@else]}
+${rbcv_cond+[@%:@define ]attrib[(x) x]}
+${rbcv_cond+[@%:@endif]})
+    attrib[(void conftest_attribute_check(void));], [],
     [rbcv="$mac"; break])
 done
 if test "${rb_c_werror_flag+set}"; then
@@ -325,14 +726,38 @@ else
   unset ac_c_werror_flag
 fi
 ])
-AC_DEFINE_UNQUOTED(attrib[(x)], $rbcv)
+if test "$rbcv" != x; then
+    RUBY_DEFINE_IF([${rbcv_cond}], attrib[(x)], $rbcv)
+fi
 AS_VAR_POPDEF([attrib])
 AS_VAR_POPDEF([rbcv])
 ])
 
 RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
+RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED)
 RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
 
+if_i386=${universal_binary+[defined __i386__]}
+RUBY_FUNC_ATTRIBUTE(stdcall,  [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(cdecl,    [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(fastcall, [], [], ${if_i386})
+
+if test "$GCC" = yes; then
+    AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
+	[rb_cv_gcc_function_alias=no
+	for a in alias weak,alias; do
+	    AC_TRY_LINK([void foo(void) {}
+		void bar(void) __attribute__(($a("foo")));], [bar()],
+		[rb_cv_gcc_function_alias=$a; break])
+	done])
+    if test "$rb_cv_gcc_function_alias" != no; then
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)],
+			   [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));])
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
+			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
+    fi
+fi
+
 AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
 [rb_cv_ruby_extern=no
 for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
@@ -342,48 +767,161 @@ for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
 done])
 test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern)
 
-XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
+RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
+
+dnl }
+dnl header and library section {
 
 dnl Check whether we need to define sys_nerr locally
 AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
 #include <errno.h>])
 
-dnl whether link libc_r or not
-AC_ARG_WITH(libc_r, 
-	[  --with-libc_r           link libc_r if possible (FreeBSD only)], [
-	case $withval in
-	yes) with_libc_r=yes;;
-	*)   with_libc_r=no;;
-	esac], [with_libc_r=no])
+AC_ARG_ENABLE(win95,
+	AS_HELP_STRING([--enable-win95], [enable Windows 95 series support]),
+  [AS_CASE(["$enableval"],[yes|no],[enable_win95=$enableval],[unset enable_win95])])
 
-AC_ARG_ENABLE(pthread,
-       [  --enable-pthread        use pthread library.],
-       [enable_pthread=$enableval], [enable_pthread=no])
+AS_CASE(["$target_os"],
+[freebsd*], [
+  AC_CACHE_CHECK([whether pthread should be enabled by default],
+    rb_cv_enable_pthread_default,
+    [AC_TRY_CPP([
+#include <osreldate.h>
+#if __FreeBSD_version < 502102
+#error pthread should be disabled on this platform
+#endif
+      ],
+      rb_cv_enable_pthread_default=yes,
+      rb_cv_enable_pthread_default=no)])
+  enable_pthread=$rb_cv_enable_pthread_default
+  ],
+[mingw*], [
+  enable_pthread=no
+  ],
+[
+  enable_pthread=yes
+  ])
 
-AC_ARG_ENABLE(fastthread,
-       [  --disable-fastthread    do not use the fastthread mutex], [
-	: handled by ext/thread/extconf.rb
-        ])
+AC_ARG_ENABLE(pthread,
+       AS_HELP_STRING([--enable-pthread], [obsolete, and ignored]))
 
 dnl Checks for libraries.
-case "$target_os" in
-nextstep*)	;;
-openstep*)	;;
-rhapsody*)	;;
-darwin*)	LIBS="-lobjc $LIBS";;
-hpux*)		LIBS="-lm $LIBS"
-		ac_cv_c_inline=no;;
-human*)		ac_cv_func_getpgrp_void=yes
-		ac_cv_func_setitimer=no
-		;;
-beos*)		ac_cv_func_link=no;;
-cygwin*)	;;
-mingw*)		if test "$with_winsock2" = yes; then
-		  LIBS="-lws2_32 $LIBS"
+AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
+
+AS_CASE(["$target_os"],
+[solaris*], [
+		AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
+		LIBS="-lm $LIBS"
+		],
+[nextstep*], [	],
+[openstep*], [	],
+[rhapsody*], [	],
+[darwin*], [	RUBY_PREPEND_OPTION(LIBS, -lobjc)
+		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE)
+		AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
+		AC_TRY_CPP([#include <AvailabilityMacros.h>
+		    #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
+		    #error pre OS X 10.4
+		    [!<===== pre OS X 10.4 =====>]
+		    #endif
+		    ],
+		    [macosx_10_5=yes], [macosx_10_5=no])
+		AC_MSG_RESULT($macosx_10_5)
+		if test $macosx_10_5 = yes; then
+		    ac_cv_header_ucontext_h=no
 		else
-		  LIBS="-lwsock32 $LIBS"
+		    AC_DEFINE(BROKEN_SETREUID, 1)
+		    AC_DEFINE(BROKEN_SETREGID, 1)
+		fi
+		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
+		ac_cv_lib_crypt_crypt=no
+		ac_cv_func_fdatasync=no # Mac OS 10.6 wrongly reports it has fdatasync
+                AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
+                    [AC_TRY_RUN([
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+int
+main()
+{
+    int i;
+    for (i = 0; i < 128*128; i++) {
+	char salt[2], buf[256], *s;
+	salt[0] = 0x80 | (i & 0x7f);
+	salt[1] = 0x80 | (i >> 7);
+	strcpy(buf, crypt("", salt));
+	if (strcmp(buf, s = crypt("", salt))) {
+#if 0
+	    printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
+		   buf+2, s+2);
+#endif
+	    return 1;
+	}
+    }
+    return 0;
+}
+],
+	            rb_cv_broken_crypt=no,
+	            rb_cv_broken_crypt=yes,
+	            rb_cv_broken_crypt=yes)])
+                if test "$rb_cv_broken_crypt" = yes; then
+                  AC_DEFINE(BROKEN_CRYPT, 1)
+                fi
+		],
+[hpux*], [	LIBS="-lm $LIBS"
+		ac_cv_c_inline=no],
+[human*], [	ac_cv_func_getpgrp_void=yes
+		ac_cv_func_setitimer=no
+		AC_CHECK_LIB(signal, _harderr)
+		AC_CHECK_LIB(hmem, hmemset)
+		AC_CHECK_FUNCS(select)
+		AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
+		   rb_cv_missing__dtos18,
+		[AC_TRY_RUN([
+#include <stdio.h>
+int
+main()
+{
+   char buf[256];
+   sprintf(buf, "%g", 1e+300);
+   return (strcmp (buf, "1e+300") ? 0 : 1);
+}
+],
+		rb_cv_missing__dtos18=yes, rb_cv_missing__dtos18=no, rb_cv_missing__dtos18=no)])
+		if test "$rb_cv_missing__dtos18" = yes; then
+		    AC_DEFINE(MISSING__DTOS18)
 		fi
-		LIBS="-lshell32 $LIBS"
+		AC_CACHE_CHECK(whether PD libc fconvert fail to round,
+			       rb_cv_missing_fconvert,
+		[AC_TRY_RUN([
+#include <stdio.h>
+#include <math.h>
+int
+main()
+{
+  char buf[256];
+  sprintf(buf, "%f", log(exp(1.0)));
+  return (strcmp (buf, "1.000000") ? 0 : 1);
+}
+],
+		rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no)])
+		if test "$rb_cv_missing_fconvert" = yes; then
+		    AC_DEFINE(MISSING_FCONVERT)
+		fi
+		],
+[beos*|haiku*], [
+		ac_cv_func_link=no
+		ac_cv_func_sched_yield=no
+		ac_cv_func_pthread_attr_setinheritsched=no
+		AS_CASE(["$target_os"],
+		[beos*], [ ac_cv_header_net_socket_h=yes],
+		[haiku*], [ ac_cv_func_shutdown=no])
+		LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
+		],
+[cygwin*], [	ac_cv_header_langinfo_h=yes
+		AC_LIBOBJ([langinfo])
+		],
+[mingw*], [	LIBS="-lshell32 -lws2_32 $LIBS"
 		ac_cv_header_a_out_h=no
 		ac_cv_header_pwd_h=no
 		ac_cv_header_utime_h=no
@@ -393,16 +931,17 @@ mingw*)		if test "$with_winsock2" = yes; then
 		ac_cv_header_sys_select_h=no
 		ac_cv_header_sys_time_h=no
 		ac_cv_header_sys_times_h=no
+		ac_cv_header_sys_socket_h=no
 		ac_cv_func_times=yes
 		ac_cv_func_waitpid=yes
 		ac_cv_func_fsync=yes
-		ac_cv_func_vsnprintf=yes
 		ac_cv_func_seekdir=yes
 		ac_cv_func_telldir=yes
 		ac_cv_func_isinf=yes
 		ac_cv_func_isnan=yes
 		ac_cv_func_finite=yes
 		ac_cv_func_link=yes
+		ac_cv_func_fseeko=yes
 		ac_cv_lib_crypt_crypt=no
 		ac_cv_func_getpgrp_void=no
 		ac_cv_func_setpgrp_void=yes
@@ -410,88 +949,82 @@ mingw*)		if test "$with_winsock2" = yes; then
 		ac_cv_lib_dl_dlopen=no
 		rb_cv_binary_elf=no
 		rb_cv_negative_time_t=no
-		enable_pthread=no
 		ac_cv_func_fcntl=yes
-		;;
-os2-emx*)	LIBS="-lm $LIBS"
-		ac_cv_lib_dir_opendir=no;;
-msdosdjgpp*)	LIBS="-lm $LIBS"
+		ac_cv_func_flock=yes
+		rb_cv_large_fd_select=yes
+		AC_LIBOBJ([langinfo])
+		: ${enable_win95=maybe}
+		],
+[os2-emx*], [	LIBS="-lm $LIBS"
+		ac_cv_lib_dir_opendir=no],
+[msdosdjgpp*], [
+		LIBS="-lm $LIBS"
 		ac_cv_func_getpgrp_void=yes
 		ac_cv_func_setitimer=no
-                ac_cv_sizeof_rlim_t=4
+		ac_cv_sizeof_rlim_t=4
+		ac_cv_func_fork=no
 		ac_cv_func_setrlimit=no
-		;;
-bsdi*)          LIBS="-lm $LIBS"
-                ac_cv_sizeof_rlim_t=8;;
-freebsd*)	LIBS="-lm $LIBS"
-		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
-		  rb_cv_lib_xpg4_needed,
-		  [AC_TRY_CPP([
-#include <osreldate.h>
-#if __FreeBSD_version < 400020 || \
-   (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
-#error needs libxpg4
-#endif
-		   ],
-		   rb_cv_lib_xpg4_needed=no,
-		   rb_cv_lib_xpg4_needed=yes,
-		   rb_cv_lib_xpg4_needed=yes)])
-		if test "$rb_cv_lib_xpg4_needed" = yes; then
-			AC_CHECK_LIB(xpg4, setlocale)
-		fi
-		if test "$with_libc_r" = yes; then
-			AC_CACHE_CHECK([whether libc_r is supplementary to libc],
-			  rb_cv_supplementary_lib_c_r,
-			  [AC_TRY_CPP([
-#include <osreldate.h>
-#if 500016 <= __FreeBSD_version
-#error libc_r is supplementary to libc
-#endif
-			   ],
-			   rb_cv_supplementary_lib_c_r=no,
-			   rb_cv_supplementary_lib_c_r=yes,
-			   rb_cv_supplementary_lib_c_r=yes)])
-			if test "$rb_cv_supplementary_lib_c_r" = yes; then
-			   MAINLIBS="-lc_r $MAINLIBS"
-			fi
-		fi
-		;;
-dragonfly*)	LIBS="-lm $LIBS"
-		;;
-bow)		ac_cv_func_setitimer=no
-		;;
-superux*)     ac_cv_func_setitimer=no
-              ;;
-solaris*2.1*) if test -z "$GCC"; then
-	           ac_cv_func_isinf=yes
-              fi
-              LIBS="-lm $LIBS"
-              ;;
-*) LIBS="-lm $LIBS";;
-esac
+		ac_cv_header_sys_socket_h=no
+		],
+[bsdi*], [	LIBS="-lm $LIBS"
+		AC_DEFINE(BROKEN_SETREUID, 1)
+		AC_DEFINE(BROKEN_SETREGID, 1)
+                ac_cv_sizeof_rlim_t=8],
+[freebsd*], [	LIBS="-lm $LIBS"
+		ac_cv_func_getpeername=no
+		ac_cv_func_getsockname=no
+		ac_cv_func_shutdown=no
+		ac_cv_func_close=no
+		],
+[dragonfly*], [	LIBS="-lm $LIBS"
+		],
+[bow], [	ac_cv_func_setitimer=no
+		],
+[superux*], [	ac_cv_func_setitimer=no
+		],
+[	LIBS="-lm $LIBS"])
 AC_CHECK_LIB(crypt, crypt)
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+AC_CHECK_LIB(socket, socketpair)	# SunOS/Solaris
+AC_CHECK_LIB(rt, clock_gettime)	# GNU/Linux
+if test "${enable_win95}" = maybe; then
+    AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
+fi
+if test "${enable_win95}" = yes; then
+    AC_DEFINE(WIN95)
+    LIBS="-lunicows $LIBS"
+fi
 
-case "$target_cpu" in
-alpha*)		case "$target_os"::"$GCC" in
-		*::yes)	CFLAGS="-mieee $CFLAGS" ;;   # gcc
-		osf*)   CFLAGS="-ieee $CFLAGS" ;;    # ccc
-		esac ;;
-esac
+AS_CASE(["$target_cpu"],
+[alpha*], [AS_CASE(["$target_os"::"$GCC"],
+		[*::yes],  # gcc
+			[CFLAGS="-mieee $CFLAGS"],
+		[osf*],    # ccc
+			[CFLAGS="-ieee $CFLAGS"],
+		)])
+
+ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
+if test "$ac_cv_header_net_socket_h" = yes; then
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=no}
+else
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
+fi
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
-AC_HEADER_STDC
+dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
+AC_HEADER_STDBOOL
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
+AC_CHECK_HEADERS(limits.h sys/file.h sys/ioctl.h sys/syscall.h\
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
-		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
-		 sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
-		 ucontext.h intrinsics.h)
+		 syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
+		 sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h \
+		 ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \
+		 net/socket.h sys/socket.h)
 
 dnl Check additional types.
-AC_CHECK_SIZEOF(rlim_t, 0, [
+RUBY_CHECK_SIZEOF(rlim_t, [int long "long long"], [], [
   #ifdef HAVE_SYS_TYPES_H
   # include <sys/types.h>
   #endif
@@ -507,44 +1040,223 @@ AC_CHECK_SIZEOF(rlim_t, 0, [
   #include <stdio.h>
 ])
 
-dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
+RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
+RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>])
 AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
 AC_STRUCT_ST_RDEV
+RUBY_CHECK_SIZEOF([struct stat.st_size], [int long "long long"], [], [@%:@include <sys/stat.h>])
+if test "$ac_cv_member_struct_stat_st_blocks" = yes; then
+    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"], [], [@%:@include <sys/stat.h>])
+fi
+AC_CHECK_MEMBERS([struct stat.st_atim])
+AC_CHECK_MEMBERS([struct stat.st_atimespec])
+AC_CHECK_MEMBERS([struct stat.st_atimensec])
+AC_CHECK_MEMBERS([struct stat.st_mtim])
+AC_CHECK_MEMBERS([struct stat.st_mtimespec])
+AC_CHECK_MEMBERS([struct stat.st_mtimensec])
+AC_CHECK_MEMBERS([struct stat.st_ctim])
+AC_CHECK_MEMBERS([struct stat.st_ctimespec])
+AC_CHECK_MEMBERS([struct stat.st_ctimensec])
+
+AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif])
+
+AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@ include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@ include <sys/time.h>
+@%:@endif])
+
+AC_CACHE_VAL([rb_cv_large_fd_select],
+    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no])])
+if test "$rb_cv_large_fd_select" = yes; then
+    AC_DEFINE(HAVE_RB_FD_INIT, 1)
+fi
+
+dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
+AC_DEFUN([RUBY_DEFINT], [dnl
+AC_CACHE_CHECK([for $1], [rb_cv_type_$1],
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])
+typedef $1 t; int s = sizeof(t) == 42;])],
+   [rb_cv_type_$1=yes],
+   [AS_CASE([m4_bmatch([$2], [^[1-9][0-9]*$], $2, [$ac_cv_sizeof_]AS_TR_SH($2))],
+    ["1"], [ rb_cv_type_$1="m4_if([$3], [], [signed ], [$3 ])char"],
+    ["$ac_cv_sizeof_short"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])short"],
+    ["$ac_cv_sizeof_int"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])int"],
+    ["$ac_cv_sizeof_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long"],
+    ["$ac_cv_sizeof_long_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long long"],
+    ["$ac_cv_sizeof___int64"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64"],
+    [ rb_cv_type_$1=no])])])
+if test "${rb_cv_type_$1}" != no; then
+    AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)
+    if test "${rb_cv_type_$1}" = yes; then
+	m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [AC_INCLUDES_DEFAULT([$4])])],
+			[RUBY_CHECK_SIZEOF([$1], [$2], [], [AC_INCLUDES_DEFAULT([$4])])])
+    else
+	AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
+	AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1]))
+    fi
+fi
+])
+
+RUBY_DEFINT(int8_t, 1)
+RUBY_DEFINT(uint8_t, 1, unsigned)
+RUBY_DEFINT(int16_t, 2)
+RUBY_DEFINT(uint16_t, 2, unsigned)
+RUBY_DEFINT(int32_t, 4)
+RUBY_DEFINT(uint32_t, 4, unsigned)
+RUBY_DEFINT(int64_t, 8)
+RUBY_DEFINT(uint64_t, 8, unsigned)
+RUBY_DEFINT(int128_t, 16)
+RUBY_DEFINT(uint128_t, 16, unsigned)
+RUBY_DEFINT(intptr_t, void*)
+RUBY_DEFINT(uintptr_t, void*, unsigned)
+RUBY_DEFINT(ssize_t, size_t, [], [@%:@include <sys/types.h>])	dnl may differ from int, so not use AC_TYPE_SSIZE_T.
+
+AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
+[rb_cv_stack_end_address=no
+for addr in __libc_stack_end _SEND; do
+  AC_TRY_LINK(
+    [extern void *$addr;],
+    [if (!$addr) return 1;],
+    [rb_cv_stack_end_address="$addr"; break])
+done])
+if test $rb_cv_stack_end_address != no; then
+  AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
+fi
 
 dnl Checks for library functions.
 AC_TYPE_GETGROUPS
 AC_TYPE_SIGNAL
-case "${target_cpu}-${target_os}" in
-powerpc-darwin*)
+AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
+[powerpc-darwin*], [
   AC_LIBSOURCES(alloca.c)
   AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
   AC_DEFINE(C_ALLOCA)
   AC_DEFINE_UNQUOTED(alloca, alloca)
-  ;;
-*)
+  ],
+[universal-darwin*:*ppc*], [
+  AC_LIBSOURCES(alloca.c)
+  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+  RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
+  RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
+  ],
+[
   AC_FUNC_ALLOCA
-  ;;
-esac
+  ])
 AC_FUNC_MEMCMP
-AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(ftello)
-AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
-		 strchr strstr strtoul crypt flock vsnprintf\
-		 isnan finite isinf hypot acosh erf)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
-	      truncate ftruncate chsize times utimes fcntl lockf lstat symlink link\
-	      readlink setitimer setruid seteuid setreuid setresuid\
-	      setproctitle setrgid setegid setregid setresgid issetugid pause\
-	      lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
-	      getgroups setgroups getpriority getrlimit setrlimit sysconf\
-	      group_member dlopen sigprocmask\
-	      sigaction _setjmp setsid telldir seekdir fchmod\
-	      mktime timegm gettimeofday\
-	      cosh sinh tanh round setuid setgid setenv unsetenv)
+
+# http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
+# Debian GNU/Linux Etch's libc6.1 2.3.6.ds1-13etch5 has this problem.
+# Debian GNU/Linux Lenny's libc6.1 2.7-10 has no problem.
+AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_cv_broken_glibc_ia64_erfc,
+  [AC_TRY_RUN([
+#include <math.h>
+int
+main()
+{
+   erfc(10000.0);
+   return 0;
+}
+],
+	rb_cv_broken_glibc_ia64_erfc=no,
+	rb_cv_broken_glibc_ia64_erfc=yes,
+	rb_cv_broken_glibc_ia64_erfc=no)])
+AS_CASE([$rb_cv_broken_glibc_ia64_erfc],[yes],[ac_cv_func_erf=no])
+
+AS_CASE(["$target_os"],[freebsd*],[
+	 AC_DEFINE(BROKEN_CLOSE)
+	 AC_REPLACE_FUNCS(close)
+	 ])
+AC_REPLACE_FUNCS(dup2 memmove strerror\
+		 strchr strstr crypt flock\
+		 isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \
+                 strlcpy strlcat)
+AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
+  [AC_TRY_LINK([
+#include <math.h>
+], [int v = signbit(-0.0);],
+	rb_cv_have_signbit=yes,
+	rb_cv_have_signbit=no)])
+if test "$rb_cv_have_signbit" = yes; then
+  AC_DEFINE(HAVE_SIGNBIT)
+else
+  AC_LIBOBJ([signbit])
+fi
+AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall __syscall chroot getcwd eaccess\
+	      truncate ftruncate ftello chsize times utimes utimensat fcntl lockf lstat\
+	      truncate64 ftruncate64 ftello64 fseeko fseeko64 \
+	      link symlink readlink readdir_r fsync fdatasync fchown\
+	      setitimer setruid seteuid setreuid setresuid setproctitle socketpair\
+	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
+	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
+	      getpriority getrlimit setrlimit sysconf close\
+	      dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp\
+	      setsid telldir seekdir fchmod cosh sinh tanh log2 round\
+	      setuid setgid daemon select_large_fdset setenv unsetenv\
+              mktime timegm gmtime_r clock_gettime gettimeofday\
+              pread sendfile shutdown sigaltstack)
+
+AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
+  [AC_TRY_COMPILE([
+#include <stdlib.h>
+], [int v = unsetenv("foo");],
+	rb_cv_unsetenv_return_value=yes,
+	rb_cv_unsetenv_return_value=no)])
+if test "$rb_cv_unsetenv_return_value" = no; then
+  AC_DEFINE(VOID_UNSETENV)
+fi
+
+AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
+[AC_TRY_LINK([@%:@include <setjmp.h>
+    jmp_buf jb; void t(v) int v; {__builtin_longjmp(jb, v);}],
+    [__builtin_setjmp(jb);],
+    [ac_cv_func___builtin_setjmp=yes],
+    [ac_cv_func___builtin_setjmp=no])
+])
+
+test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
+
+AC_MSG_CHECKING(for setjmp type)
+AC_ARG_WITH(setjmp-type,
+	AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
+	[
+	AS_CASE([$withval],
+	[__builtin_setjmp], [ setjmp_prefix=__builtin_],
+	[_setjmp], [ setjmp_prefix=_],
+	[sigsetjmp], [ setjmp_prefix=sig],
+	[setjmp], [ setjmp_prefix=],
+	[''], [ unset setjmp_prefix],
+	[   AC_MSG_ERROR(invalid setjmp type: $withval)])], [unset setjmp_prefix])
+if test ${setjmp_prefix+set}; then
+    if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp = no; then
+	AC_MSG_ERROR(${setjmp_prefix}setjmp is not available)
+    fi
+elif test "$ac_cv_func___builtin_setjmp" = yes; then
+    setjmp_prefix=__builtin_
+elif test "$ac_cv_func__setjmp" = yes; then
+    setjmp_prefix=_
+elif test "$ac_cv_func_sigsetjmp" = yes; then
+    AS_CASE([$target_os],[solaris*|cygwin*],[setjmp_prefix=],[setjmp_prefix=sig])
+else
+    setjmp_prefix=
+fi
+if test x$setjmp_prefix = xsig; then
+    setjmp_sigmask=yes
+else
+    unset setjmp_sigmask
+fi
+AC_MSG_RESULT(${setjmp_prefix}setjmp)
+AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp(env${setjmp_sigmask+,0})])
+AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp(env,val)])
+AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
+
 AC_ARG_ENABLE(setreuid,
-       [  --enable-setreuid       use setreuid()/setregid() according to need even if obsolete.],
+       AS_HELP_STRING([--enable-setreuid], [use setreuid()/setregid() according to need even if obsolete]),
        [use_setreuid=$enableval])
 if test "$use_setreuid" = yes; then
     AC_DEFINE(USE_SETREUID)
@@ -562,45 +1274,51 @@ fi
 AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
   [AC_TRY_LINK([#include <time.h>
   int i;],
-  	[i = daylight;],
+	[i = daylight;],
 	rb_cv_have_daylight=yes,
 	rb_cv_have_daylight=no)])
 if test "$rb_cv_have_daylight" = yes; then
   AC_DEFINE(HAVE_DAYLIGHT)
 fi
 AC_DEFUN([RUBY_CHECK_VARTYPE], [dnl
-AC_CACHE_CHECK([for external $1], rb_cv_var_$1,
-  [rb_cv_var_$1=no
-  AC_TRY_COMPILE([#define _XOPEN_SOURCE 1
-    $2
-    const volatile void *volatile t;],
+AC_CACHE_CHECK([for external $1], AS_TR_SH(rb_cv_var_$1),
+  [AS_TR_SH(rb_cv_var_$1)=no
+  AC_TRY_COMPILE([
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 1
+#endif
+$2
+;
+const volatile void *volatile t;],
     [t = &(&$1)[0];],
     [for t in $3; do
-      AC_TRY_COMPILE([#define _XOPEN_SOURCE 1
-        $2
-        extern $t $1;
-        const volatile void *volatile t;],
+      AC_TRY_COMPILE([
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 1
+#endif
+$2
+;
+extern $t $1;
+const volatile void *volatile t;],
         [t = &(&$1)[0];],
-        [rb_cv_var_$1=$t; break])
+        [AS_TR_SH(rb_cv_var_$1)=$t; break])
     done])])
-if test "[$rb_cv_var_]$1" != no; then
-  AC_DEFINE([HAVE_VAR_]m4_toupper($1))
-  AC_DEFINE_UNQUOTED([TYPEOF_VAR_]m4_toupper($1), $rb_cv_var_$1)
+if test "${AS_TR_SH(rb_cv_var_$1)}" != no; then
+  AC_DEFINE(AS_TR_CPP(HAVE_VAR_$1))
+  AC_DEFINE_UNQUOTED(AS_TR_CPP(TYPEOF_VAR_$1), ${AS_TR_SH(rb_cv_var_$1)})
 fi])
-RUBY_CHECK_VARTYPE(timezone, [#include <time.h>], [long int])
-RUBY_CHECK_VARTYPE(altzone, [#include <time.h>], [long int])
-if test "$rb_cv_var_timezone" = no; then
-  AC_CHECK_FUNCS(timezone)
-  if test "$ ac_cv_func_timezone" = yes; then
-    AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-      [AC_TRY_COMPILE([#include <time.h>],
-	[(void)timezone(0, 0);],
-	[rb_cv_func_timezone_void=no],
-	[rb_cv_func_timezone_void=yes])]
-    )
-    if test $rb_cv_func_timezone_void = yes; then
-      AC_DEFINE(TIMEZONE_VOID)
-    fi
+RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
+RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
+AC_CHECK_FUNCS(timezone)
+if test "$ac_cv_func_timezone" = yes; then
+  AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
+    [AC_TRY_COMPILE([@%:@include <time.h>],
+      [(void)timezone(0, 0);],
+      [rb_cv_func_timezone_void=no],
+      [rb_cv_func_timezone_void=yes])]
+  )
+  if test $rb_cv_func_timezone_void = yes; then
+    AC_DEFINE(TIMEZONE_VOID)
   fi
 fi
 
@@ -642,6 +1360,48 @@ if test "$rb_cv_negative_time_t" = yes; then
   AC_DEFINE(NEGATIVE_TIME_T)
 fi
 
+# [ruby-dev:40910] overflow of time on FreeBSD
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
+AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
+  [AC_TRY_RUN([
+#include <time.h>
+
+void
+check(time_t t1)
+{
+    struct tm *tm;
+    time_t t2;
+    tm = localtime(&t1);
+    if (!tm)
+	return; /* overflow detected.  ok. */
+    t2 = mktime(tm);
+    if (t1 == t2)
+        return; /* round-trip.  ok. */
+    exit(1);
+}
+
+int
+main()
+{
+    time_t t;
+    if (~(time_t)0 <= 0) {
+        t = (((time_t)1) << (sizeof(time_t) * 8 - 2));
+        t |= t - 1;
+    }
+    else {
+        t = ~(time_t)0;
+    }
+    check(t);
+    return 0;
+}
+],
+	rb_cv_localtime_overflow=yes,
+	rb_cv_localtime_overflow=no,
+	rb_cv_localtime_overflow=yes)])
+if test "$rb_cv_localtime_overflow" = no; then
+  AC_DEFINE(LOCALTIME_OVERFLOW_PROBLEM)
+fi
+
 if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
    AC_DEFINE(POSIX_SIGNAL)
 else
@@ -675,7 +1435,7 @@ main()
 fi
 
 AC_FUNC_GETPGRP
-AC_FUNC_SETPGRP  
+AC_FUNC_SETPGRP
 
 AC_C_BIGENDIAN
 AC_C_CONST
@@ -699,27 +1459,19 @@ if test x"$target_cpu" = xia64; then
 fi
 
 AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
-    [AC_TRY_RUN([
-int
-main()
-{
-  if (-1==(-1>>1))
-    return 0;
-  return 1;
-}
-],
+    [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))])],
 	rb_cv_rshift_sign=yes,
-	rb_cv_rshift_sign=no,
-	rb_cv_rshift_sign=yes)])
+	rb_cv_rshift_sign=no)])
 if test "$rb_cv_rshift_sign" = yes; then
-  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)y))
+  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)(y)))
 else
-  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>y) : (x)>>y))
+  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
 fi
 
-AC_MSG_CHECKING(read count field in FILE structures)
-AC_CACHE_VAL(rb_cv_fcnt,
-[for fcnt in	dnl
+test "$rb_cv_fcnt" = "not found" && rb_cv_fcnt="not found (OK if using GNU libc)"
+AC_CACHE_CHECK([read count field in FILE structures], rb_cv_fcnt,
+[rb_cv_fcnt="not found (OK if using GNU libc)"
+for fcnt in	dnl
      _cnt	dnl
      __cnt	dnl
      _r		dnl
@@ -729,24 +1481,20 @@ AC_CACHE_VAL(rb_cv_fcnt,
     AC_TRY_COMPILE([#include <stdio.h>
 ],
 	[FILE *f = stdin; f->$fcnt = 0;],
-	rb_cv_fcnt="$fcnt"; break,
-	rb_cv_fcnt="not found")
+	[rb_cv_fcnt="$fcnt"; break])
 done])
-if test "$rb_cv_fcnt" = "not found"; then
-  AC_MSG_RESULT([not found(OK if using GNU libc)])
-else
-  AC_MSG_RESULT($rb_cv_fcnt)
-  AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)
-fi
+AS_CASE("$rb_cv_fcnt",
+	["not found"*], [rb_cv_fcnt="not found"],
+ 	[AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)])
 
-AC_MSG_CHECKING(read buffer ptr field in FILE structures)
-AC_CACHE_VAL(rb_cv_frptr,
+AC_CACHE_CHECK([read buffer ptr field in FILE structures], rb_cv_frptr,
 [for frptr in	dnl
      _IO_read_ptr dnl
      _ptr	dnl
      __ptr	dnl
      bufpos	dnl
      _p	dnl
+     __bufpos	dnl
 ; do
     AC_TRY_COMPILE([#include <stdio.h>
 ],
@@ -754,108 +1502,29 @@ AC_CACHE_VAL(rb_cv_frptr,
 	rb_cv_frptr="$frptr"; break,
 	rb_cv_frptr="not found")
 done])
-if test "$rb_cv_frptr" = "not found"; then
-  AC_MSG_RESULT([not found])
-else
-  AC_MSG_RESULT($rb_cv_frptr)
+if test "$rb_cv_frptr" != "not found"; then
   AC_DEFINE_UNQUOTED(FILE_READPTR, $rb_cv_frptr)
 
   if test "$rb_cv_fcnt" = "not found"; then
-    AC_MSG_CHECKING(read buffer end field in FILE structures)
-    AC_CACHE_VAL(rb_cv_frend,
+    AC_CACHE_CHECK([read buffer end field in FILE structures], rb_cv_frend,
     [for frend in	dnl
          _IO_read_end	dnl
          bufread 	dnl
+         __bufread 	dnl
     ; do
         AC_TRY_COMPILE([#include <stdio.h>
     ],
-  	[FILE *f = stdin; char buf[256]; f->$frend = buf;],
-  	rb_cv_frend="$frend"; break,
-  	rb_cv_frend="not found")
+	[FILE *f = stdin; char buf[256]; f->$frend = buf;],
+	rb_cv_frend="$frend"; break,
+	rb_cv_frend="not found")
     done])
-    if test "$rb_cv_frend" = "not found"; then
-      AC_MSG_RESULT([not found])
-    else
-      AC_MSG_RESULT($rb_cv_frend)
+    if test "$rb_cv_frend" != "not found"; then
       AC_DEFINE_UNQUOTED(FILE_READEND, $rb_cv_frend)
     fi
   fi
 fi
 
-AC_DEFUN([RUBY_CHECK_IO_NEED],
-[AC_CACHE_CHECK(whether need to [$1], [$2],
-    [AC_TRY_RUN([
-#include <stdio.h>
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-#define before_seek(f) ]ifelse(index($2,flush_before_seek),-1,[fflush(f)],[(f,0)])[
-#define reset_rw(f) ]ifelse(index($2,seek_between_rw),-1,[do_seek(f,SEEK_CUR)],[(f,0)])[
-#define do_seek(f, w) (before_seek(f), fseek(f,0,w))
-
-char *fn = "conftest.dat";
-char *wombat = "wombat\n";
-char *koara = "koara\n";
-char *kangaroo = "kangaroo\n";
-
-int main()
-{
-    char buf[BUFSIZ];
-    FILE *f;
-    int r = 1;
-
-    if (!(f = fopen(fn, "w+"))) return 1;
-    fputs(wombat, f);
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    reset_rw(f);
-    fputs(koara, f);
-    fputs(kangaroo, f);
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    reset_rw(f);
-    fputc('X', f);
-    reset_rw(f);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara+1)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || buf[0] != 'X' || strcmp(buf+1, koara+1)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    r = 0;
-  fail:
-    fclose(f);
-    unlink(fn);
-    return r;
-}
-], [$2]=no, [$2]=yes, [$2]=[$3])])])
-RUBY_CHECK_IO_NEED(seek between R/W, rb_cv_need_io_seek_between_rw, yes)
-if test "$rb_cv_need_io_seek_between_rw" = yes; then
-  AC_DEFINE(NEED_IO_SEEK_BETWEEN_RW, 1)
-fi
-dnl RUBY_CHECK_IO_NEED(flush before seek, rb_cv_need_io_flush_before_seek, no)
-dnl if test "$rb_cv_need_io_flush_before_seek" = yes; then
-dnl   AC_DEFINE(NEED_IO_FLUSH_BEFORE_SEEK, 1)
-dnl fi
-
-AC_CACHE_CHECK([whether st_ino is huge], rb_cv_huge_st_ino,
-[AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([
-#include <sys/stat.h>
-struct stat test_stat;
-], [sizeof(test_stat.st_ino)>sizeof(long)])],
-rb_cv_huge_st_ino=yes,
-rb_cv_huge_st_ino=no)
-])
-if test $rb_cv_huge_st_ino = yes; then
-  AC_DEFINE(HUGE_ST_INO)
-fi
+RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
 
 if test "$ac_cv_func_sysconf" = yes; then
   AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
@@ -873,12 +1542,13 @@ if test "$ac_cv_func_sysconf" = yes; then
   RUBY_CHECK_SYSCONF(CLK_TCK)
 fi
 
-case "$target_cpu" in
-m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
-hppa*) rb_cv_stack_grow_dir=+1;;
-esac
-AC_CACHE_CHECK(stack growing direction, rb_cv_stack_grow_dir,
-  [AC_TRY_RUN([
+AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [
+    AC_CACHE_CHECK(stack growing direction on $1, rb_cv_stack_grow_dir_$1, [
+AS_CASE(["$1"],
+[m68*|x86*|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
+[hppa*], [ $2=+1],
+[
+  AC_TRY_RUN([
 /* recurse to get rid of inlining */
 static int
 stack_growup_p(addr, n)
@@ -895,12 +1565,44 @@ int main()
     int x;
     return stack_growup_p(&x, 10);
 }
-], rb_cv_stack_grow_dir=-1, rb_cv_stack_grow_dir=+1, rb_cv_stack_grow_dir=0)])
-AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
+], $2=-1, $2=+1, $2=0)
+  ])
+eval rb_cv_stack_grow_dir_$1=\$$2])
+eval $2=\$rb_cv_stack_grow_dir_$1])
+if test "${universal_binary-no}" = yes ; then
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    save_LDFLAGS="$LDFLAGS" new_ldflags=`echo "$LDFLAGS" | sed "s|$archflagpat"'||'`
+    stack_dir=
+    for archs in ${universal_archnames}; do
+	archs=`echo $archs | sed 's/=.*//'`
+	CFLAGS="$new_cflags -arch $archs"
+	LDFLAGS="$new_ldflags -arch $archs"
+	RUBY_STACK_GROW_DIRECTION($archs, dir)
+	if test x$stack_dir = x; then
+	    stack_dir=$dir
+	elif test x$stack_dir != x$dir; then
+	    stack_dir=no
+	fi
+    done
+    CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"
+    if test x$stack_dir = xno; then
+	for archs in ${universal_archnames}; do
+	    archs=`echo $archs | sed 's/=.*//'`
+	    eval dir=\$rb_cv_stack_grow_dir_$archs
+	    RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
+	done
+    else
+	AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir)
+    fi
+else
+    RUBY_STACK_GROW_DIRECTION($target_cpu, dir)
+    AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir)
+fi
 
 if test x"$enable_pthread" = xyes; then
-    for pthread_lib in pthread pthreads c c_r; do
- 	AC_CHECK_LIB($pthread_lib, pthread_kill,
+    for pthread_lib in thr pthread pthreads c c_r root; do
+	AC_CHECK_LIB($pthread_lib, pthread_kill,
 		     rb_with_pthread=yes, rb_with_pthread=no)
 	if test "$rb_with_pthread" = "yes"; then break; fi
     done
@@ -908,20 +1610,19 @@ if test x"$enable_pthread" = xyes; then
 	AC_DEFINE(_REENTRANT)
 	AC_DEFINE(_THREAD_SAFE)
 	AC_DEFINE(HAVE_LIBPTHREAD)
-	case $pthread_lib in
-	c)
-	    ;;
-	c_r)
-	    MAINLIBS="-pthread $MAINLIBS"
-	    ;;
-	*)
-      	    LIBS="-l$pthread_lib $LIBS"
-	    ;;
-	esac
+	AC_CHECK_HEADERS(pthread_np.h)
+	AS_CASE([$pthread_lib],
+	[c],    [],
+	[root], [],
+	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
+	        [LIBS="-l$pthread_lib $LIBS"])
     else
 	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
     fi
-    AC_CHECK_FUNCS(nanosleep)
+    AC_CHECK_FUNCS(nanosleep sched_yield pthread_attr_setinheritsched \
+	pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
+	pthread_get_stackaddr_np pthread_get_stacksize_np \
+	thr_stksegment pthread_stackseg_np pthread_getthrds_np)
     if test x"$ac_cv_func_nanosleep" = xno; then
        AC_CHECK_LIB(rt, nanosleep)
        if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
@@ -935,62 +1636,113 @@ if test x"$ac_cv_header_ucontext_h" = xyes; then
     fi
 fi
 
-dnl default value for $KANJI
-DEFAULT_KCODE="KCODE_NONE"
+if test "$ac_cv_func_fork" = "yes" -a "$rb_with_pthread" = "yes"; then
+    AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
+	[AC_TRY_RUN([
+#include <stdlib.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+void *
+thread_func(void *dmy)
+{
+    return dmy;
+}
+
+int
+use_threads(void)
+{
+    pthread_t tid;
+    if (pthread_create(&tid, 0, thread_func, 0) != 0) {
+	return -1;
+    }
+    if (pthread_join(tid, 0) != 0) {
+	return -1;
+    }
+    return 0;
+}
 
-AC_ARG_WITH(default-kcode, 
-	[  --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)], 
-	[case $withval in
-	utf8) DEFAULT_KCODE="KCODE_UTF8";;
-	euc)  DEFAULT_KCODE="KCODE_EUC";;
-	sjis) DEFAULT_KCODE="KCODE_SJIS";;
-	none) DEFAULT_KCODE="KCODE_NONE";;
-        *)    AC_MSG_WARN($withval is not valid kcode; ignored);;
-	esac])
-AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
+int
+main(int argc, char *argv[])
+{
+    pid_t pid;
+    if (use_threads()) return EXIT_FAILURE;
+    pid = fork();
+
+    if (pid) {
+	int loc;
+	sleep(1);
+	if (waitpid(pid, &loc, WNOHANG) == 0) {
+	    kill(pid, SIGKILL);
+	    return EXIT_FAILURE;
+	}
+        if (!WIFEXITED(loc) || WEXITSTATUS(loc) != EXIT_SUCCESS)
+           return EXIT_FAILURE;
+    }
+    else {
+	if (use_threads()) return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+}],
+	rb_cv_fork_with_pthread=yes,
+	rb_cv_fork_with_pthread=no,
+	rb_cv_fork_with_pthread=yes)])
+    test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
+fi
+
+AC_CHECK_FUNCS(backtrace)
+
+AC_ARG_WITH(valgrind,
+        AS_HELP_STRING([--with-valgrind],[enable valgrind memcheck support]),
+        [AC_CHECK_HEADERS(valgrind/memcheck.h)])
+
+dnl }
+dnl runtime section {
 
 dnl wheather use dln_a_out or not
-AC_ARG_WITH(dln-a-out, 
-	[  --with-dln-a-out        use dln_a_out if possible], [
-	case $withval in
-	yes) with_dln_a_out=yes;;
-	*)   with_dln_a_out=no;;
-	esac], [with_dln_a_out=no])
+AC_ARG_WITH(dln-a-out,
+	AS_HELP_STRING([--with-dln-a-out], [use dln_a_out if possible]),
+	[
+	AS_CASE([$withval],
+	[yes], [
+	    if test "$enable_shared" = yes; then
+		AC_MSG_ERROR(dln_a_out can not make shared library)
+	    fi
+	    with_dln_a_out=yes],
+	[
+	    with_dln_a_out=no])], [with_dln_a_out=no])
 
 AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_RUN([
-/* Test for whether ELF binaries are produced */
-#include <fcntl.h>
-#include <stdlib.h>
-main() {
-	char buffer[4];
-	int i=open("conftest",O_RDONLY);
-	if(i==-1)
-		exit(1); /* fail */
-	if(read(i,&buffer[0],4)<4)
-		exit(1); /* fail */
-	if(buffer[0] != 127 || buffer[1] != 'E' ||
-           buffer[2] != 'L' || buffer[3] != 'F')
-		exit(1); /* fail */
-	exit(0); /* succeed (yes, it's ELF) */
-}
-],
-rb_cv_binary_elf=yes,
-rb_cv_binary_elf=no,
-rb_cv_binary_elf=yes)])
+[AC_TRY_LINK([],[], [
+AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"],
+['^?ELF'*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+rb_cv_binary_elf=no)])
 
 if test "$rb_cv_binary_elf" = yes; then
   AC_DEFINE(USE_ELF)
+  if test "$with_dln_a_out" = yes; then
+    AC_MSG_ERROR(dln_a_out does not work with ELF)
+  fi
 fi
 
-case "$target_os" in
-linux* | gnu* | k*bsd*-gnu | bsdi*)
+AS_CASE(["$target_os"],
+[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu], [
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
     else
 	LDFLAGS="$LDFLAGS -rdynamic"
-    fi;;
-esac
+    fi])
 LIBEXT=a
 
 AC_SUBST(DLDFLAGS)dnl
@@ -999,159 +1751,201 @@ AC_SUBST(ARCH_FLAG)dnl
 AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl
 AC_SUBST(LDSHARED)dnl
+AC_SUBST(LDSHAREDXX)dnl
 AC_SUBST(DLEXT)dnl
 AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L"%s"'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
   rb_cv_dlopen=unknown
   AC_MSG_CHECKING(whether OS depend dynamic link works)
   if test "$GCC" = yes; then
-    case "$target_os" in
-    nextstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
-    *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
-    esac
+    AS_CASE(["$target_os"],
+    [nextstep*|openstep*|rhapsody*|darwin*], [
+      # The -fno-common is needed if we wish to embed the Ruby interpreter
+      # into a plugin module of some project (as opposed to embedding it
+      # within the project's application).  The -I/usr/local/include is
+      # needed because CPP as discovered by configure (cc -E -traditional)
+      # fails to consult /usr/local/include by default.  This causes
+      # mkmf.rb's have_header() to fail if the desired resource happens to be
+      # installed in the /usr/local tree.
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
+    [human*|bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*], [ ],
+    [
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
   else
-    case "$target_os" in
-	hpux*)		CCDLFLAGS="$CCDLFLAGS +Z";;
-	solaris*|irix*)	CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
-	sunos*)		CCDLFLAGS="$CCDLFLAGS -PIC" ;;
-	esix*|uxpds*)   CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
-	*)		: ${CCDLFLAGS=""} ;;
-    esac
+    AS_CASE(["$target_os"],
+	[hpux*],          [CCDLFLAGS="$CCDLFLAGS +Z"],
+	[solaris*|irix*], [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	[sunos*],         [CCDLFLAGS="$CCDLFLAGS -PIC"],
+	[esix*|uxpds*],   [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	                  [: ${CCDLFLAGS=""}])
   fi
 
-  case "$target_os" in
-	hpux*)		DLDFLAGS="$DLDFLAGS -E"
+
+  AC_ARG_ENABLE(rpath,
+       AS_HELP_STRING([--disable-rpath], [embed run path into extension libraries]),
+       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
+  if test "$enable_rpath" = yes; then
+    RPATHFLAG=" ${linker_flag}-R%1\$-s"
+  fi
+
+  AS_CASE(["$target_os"],
+	[hpux*], [	DLDFLAGS="$DLDFLAGS -E"
 			: ${LDSHARED='ld -b'}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
 			: ${LIBPATHENV=SHLIB_PATH}
-			rb_cv_dlopen=yes;;
-	solaris*) 	if test "$GCC" = yes; then
-                          : ${LDSHARED='$(CC) -shared'}
-			   if test "$rb_cv_prog_gnu_ld" = yes; then
-	 		       LDFLAGS="$LDFLAGS -Wl,-E"
-			   fi
+			if test "$rb_cv_prog_gnu_ld" = no; then
+			    RPATHFLAG=' +b %1$-s'
+			fi
+			rb_cv_dlopen=yes],
+	[solaris*], [ 	if test "$GCC" = yes; then
+			    : ${LDSHARED='$(CC) -shared'}
+			    if test "$rb_cv_prog_gnu_ld" = yes; then
+				LDFLAGS="$LDFLAGS -Wl,-E"
+			    fi
 			else
-			   : ${LDSHARED='ld -G'}
+			    : ${LDSHARED='ld -G'}
 			fi
-			rb_cv_dlopen=yes;;
-	sunos*) 	: ${LDSHARED='ld -assert nodefinitions'}
-			rb_cv_dlopen=yes;;
-	irix*)		: ${LDSHARED='ld -shared'}
-			rb_cv_dlopen=yes;;
-	sysv4*) 	: ${LDSHARED='ld -G'}
-			rb_cv_dlopen=yes;;
-        nto-qnx*)       : ${LDSHARED="qcc -shared"}
-                        rb_cv_dlopen=yes ;;
-	esix*|uxpds*) 	: ${LDSHARED="ld -G"}
-			rb_cv_dlopen=yes ;;
-	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
-			rb_cv_dlopen=yes ;;
-	bsdi3*) 	case "$CC" in
-			*shlicc*)	: ${LDSHARED="$CC -r"}
-					rb_cv_dlopen=yes ;;
-			esac ;;
-	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
-			: ${LDSHARED='${CC} -shared'}
+			rb_cv_dlopen=yes],
+	[sunos*], [	: ${LDSHARED='ld -assert nodefinitions'}
+			rb_cv_dlopen=yes],
+	[irix*], [	: ${LDSHARED='ld -shared'}
+			rb_cv_dlopen=yes],
+	[sysv4*], [	: ${LDSHARED='ld -G'}
+			rb_cv_dlopen=yes],
+	[nto-qnx*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[esix*|uxpds*], [ : ${LDSHARED="ld -G"}
+			rb_cv_dlopen=yes],
+	[osf*], [	: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
+			rb_cv_dlopen=yes],
+	[bsdi3*], [	AS_CASE(["$CC"],
+			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
+					rb_cv_dlopen=yes])],
+	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
+			: ${LDSHARED='$(CC) -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
 			fi
-			rb_cv_dlopen=yes ;;
-	interix*) 	: ${LDSHARED="$CC -shared"}
+			rb_cv_dlopen=yes],
+	[interix*], [	: ${LDSHARED='$(CC) -shared'}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			LIBPATHFLAG=" -L'%1\$-s'"
-			rb_cv_dlopen=yes ;;
-	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
+			LIBPATHFLAG=" -L%1\$-s"
+			rb_cv_dlopen=yes],
+	[freebsd*|dragonfly*], [
+			: ${LDSHARED='$(CC) -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -rdynamic"
 			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
 			else
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
 			fi
-			rb_cv_dlopen=yes ;;
-	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+			rb_cv_dlopen=yes],
+	[openbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-E"
 			fi
-			rb_cv_dlopen=yes ;;
-	nextstep*)	: ${LDSHARED='cc -r -nostdlib'}
+			rb_cv_dlopen=yes],
+	[nextstep*], [	: ${LDSHARED='$(CC) -r -nostdlib'}
 			LDFLAGS="$LDFLAGS -u libsys_s"
-			rb_cv_dlopen=yes ;;
-	openstep*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
+			rb_cv_dlopen=yes],
+	[openstep*], [	: ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'}
 			: ${LDFLAGS=""}
-			rb_cv_dlopen=yes ;;
-	rhapsody*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
+			rb_cv_dlopen=yes],
+	[rhapsody*], [	: ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'}
 			: ${LDFLAGS=""}
-			rb_cv_dlopen=yes ;;
-	darwin*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
+			rb_cv_dlopen=yes],
+	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
+			: ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"}
 			: ${LDFLAGS=""}
 			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
-			rb_cv_dlopen=yes ;;
-        aix*)           if test "$GCC" = yes; then
-			    : ${LDSHARED='$(CC) -shared'}
-			else
-			    : ${LDSHARED='/usr/ccs/bin/ld'}
+			# /usr/local/include is always searched for
+			# some reason, but /usr/local/lib is not.
+			hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'`
+			if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null | fgrep -q "$hdr"; then
+			    $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' ||
+			    echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' ||
+			    LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
 			fi
-			DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
-			LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
-			XLDFLAGS="${linker_flag}-bE:ruby.imp"
-                        : ${ARCHFILE="ruby.imp"}
+			rb_cv_dlopen=yes],
+        [aix*], [	: ${LDSHARED='$(CC)'}
+			LDSHARED="$LDSHARED ${linker_flag}-G"
+			DLDFLAGS='-eInit_$(TARGET)'
+			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
+			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
+			: ${ARCHFILE="ruby.imp"}
                         TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
                         TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-                        : ${LIBPATHENV=SHLIB_PATH}
-                        rb_cv_dlopen=yes ;;
-	human*)		: ${DLDFLAGS=''}
+			: ${LIBPATHENV=SHLIB_PATH}
+			RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
+			rb_cv_dlopen=yes],
+	[human*], [	: ${DLDFLAGS=''}
 			: ${LDSHARED=''}
 			: ${LDFLAGS=''}
 			: ${LINK_SO='ar cru $@ $(OBJS)'}
-			rb_cv_dlopen=yes ;;
-	beos*) 		case "$target_cpu" in
-			  powerpc*)
+			rb_cv_dlopen=yes],
+	[beos*], [	AS_CASE(["$target_cpu"],
+			  [powerpc*], [
 			    : ${LDSHARED="ld -xms"}
 			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
-                            ;;
-			  i586*)
+			    LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
+			    ],
+			  [i586*], [
+			    : ${LDSHARED="ld -shared"}
+			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lbe -lroot"
+			    LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
+			    ])
+			: ${LIBPATHENV=LIBRARY_PATH}
+			rb_cv_dlopen=yes],
+	[haiku*], [	AS_CASE(["$target_cpu"],
+			  [powerpc*], [
+			    : ${LDSHARED="ld -xms"}
+			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+                            ],
+			  [i586*], [
 			    : ${LDSHARED="ld -shared"}
 			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
-			    ;;
-			esac
+			    ])
 			: ${LIBPATHENV=LIBRARY_PATH}
-			rb_cv_dlopen=yes ;;
-	nto-qnx*)	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			rb_cv_dlopen=yes ],
+	[nto-qnx*], [	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
 			: ${LDSHARED='ld -Bshareable -x'}
 			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
-			rb_cv_dlopen=yes;;
-	cygwin*|mingw*)	: ${LDSHARED="${CC} -shared -s"}
-			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
-			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
+			rb_cv_dlopen=yes],
+	[cygwin*|mingw*], [
+			: ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'}
+			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
+			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
 			: ${LIBPATHENV=""}
-			rb_cv_dlopen=yes ;;
-	hiuxmpp)	: ${LDSHARED='ld -r'} ;;
-	atheos*) 	: ${LDSHARED="$CC -shared"}
-			rb_cv_dlopen=yes ;;
-	os2-emx*)	LDFLAGS="$LDFLAGS -Zbsd-signals"
-			;;
-	*) 		: ${LDSHARED='ld'} ;;
-  esac
+			rb_cv_dlopen=yes],
+	[hiuxmpp], [	: ${LDSHARED='ld -r'}],
+	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[os2-emx*], [	LDFLAGS="$LDFLAGS -Zomf"
+			],
+	[ 	: ${LDSHARED='ld'}])
   AC_MSG_RESULT($rb_cv_dlopen)
-
-  AC_ARG_ENABLE(rpath,
-       [  --disable-rpath         embed run path into extension libraries.],
-       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
-  if test "$enable_rpath" = yes; then
-    LIBPATHFLAG=" -L'%1\$-s'"
-    RPATHFLAG=" ${linker_flag}-R'%1\$-s'"
-  fi
 fi
+if test "${LDSHAREDXX}" = ""; then
+    AS_CASE(["${LDSHARED}"],
+	[*'$(CC)'*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'`
+	    ],
+	[*'${CC}'*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'`
+	    ],
+	[*$CC*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"`
+	    ],
+	[ld" "*], [
+	    ])
+fi
+AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
+
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
 AC_SUBST(RPATHFLAG)
@@ -1167,7 +1961,7 @@ if test "$ac_cv_header_a_out_h" = yes; then
 #define USE_DLN_A_OUT
 #include "dln.c"
 ],
-	[], 
+	[],
 	rb_cv_dln_a_out=yes,
 	rb_cv_dln_a_out=no)])
     if test "$rb_cv_dln_a_out" = yes; then
@@ -1186,114 +1980,76 @@ if test "$dln_a_out_works" = yes; then
   DLEXT=so
   CCDLFLAGS=
 else
-  case "$target_os" in
-    hpux*)	DLEXT=sl;;
-    nextstep*|openstep*|rhapsody*|darwin*)
-		DLEXT=bundle;;
-    os2-emx*)	DLEXT=dll;;
-    cygwin*|mingw*)
-		DLEXT=so DLEXT2=dll;;
-    *)		DLEXT=so;;
-  esac
+  AS_CASE(["$target_os"],
+    [hpux*], [
+	DLEXT=sl],
+    [nextstep*|openstep*|rhapsody*|darwin*], [
+	RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend])
+	DLEXT=bundle],
+    [os2-emx*], [
+	LOAD_RELATIVE=1
+	DLEXT=dll],
+    [cygwin*|mingw*|*djgpp*], [
+	LOAD_RELATIVE=1
+	DLEXT=so],
+    [
+	DLEXT=so])
 fi
+if test "$rb_cv_dlopen:$load_relative" = yes:yes; then
+    AC_CHECK_FUNCS(dladdr)
+    if test "$ac_cv_func_dladdr" = yes; then
+	LOAD_RELATIVE=1
+    else
+	unset load_relative
+    fi
+fi
+
 len=2 # .rb
 n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
 n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
 AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
 test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
 test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
+AC_SUBST(DLEXT)
 
-AC_SUBST(STRIP)dnl
 if test "$with_dln_a_out" = yes; then
   STRIP=true
 else
-  STRIP=strip
-fi
-
-case "$target_os" in
-  linux* | gnu* | k*bsd*-gnu)
-	STRIP='strip -S -x';;
-  nextstep*)
-	STRIP='strip -A -n';;
-  openstep*)
-	STRIP='strip -A -n';;
-  rhapsody*)
-	STRIP='strip -A -n';;
-  darwin*)
-	STRIP='strip -A -n';;
-esac
+  AC_CHECK_TOOL(STRIP, strip, :)dnl
+fi
 
+AS_CASE(["$target_os"],
+  [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
+	STRIP="$STRIP -S -x"],
+  [nextstep* | openstep* | rhapsody* | darwin*], [
+	STRIP="$STRIP -A -n"])
+
+AC_ARG_WITH(ext,
+            AC_HELP_STRING([--with-ext=EXTS],
+                           [pass to --with-ext option of extmk.rb]))
+AC_ARG_WITH(out-ext,
+            AC_HELP_STRING([--with-out-ext=EXTS],
+                           [pass to --without-ext option of extmk.rb]))
 EXTSTATIC=
 AC_SUBST(EXTSTATIC)dnl
 AC_ARG_WITH(static-linked-ext,
-	    [  --with-static-linked-ext link external modules statically],
-            [case $withval in
-	     yes) STATIC=
-		  EXTSTATIC=static;;
-	     *)	;;
-	     esac])
-
-case "$target_os" in
-  human*)
-    AC_CHECK_LIB(signal, _harderr)
-    AC_CHECK_LIB(hmem, hmemset)
-    AC_CHECK_FUNCS(select)
-    AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
-		   rb_cv_missing__dtos18,
-    [AC_TRY_RUN(
-changequote(<<, >>)dnl
-<<
-#include <stdio.h>
-main ()
-{
-   char buf[256];
-   sprintf (buf, "%g", 1e+300);
-   exit (strcmp (buf, "1e+300") ? 0 : 1);
-}
->>,
-changequote([, ])dnl
-rb_cv_missing__dtos18=yes, rb_cv_missing__dtos18=no, rb_cv_missing__dtos18=no)])
-    if test "$rb_cv_missing__dtos18" = yes; then
-      AC_DEFINE(MISSING__DTOS18)
-    fi
-    AC_CACHE_CHECK(whether PD libc fconvert fail to round,
-		   rb_cv_missing_fconvert,
-    [AC_TRY_RUN(
-changequote(<<, >>)dnl
-<<
-#include <stdio.h>
-#include <math.h>
-main ()
-{
-  char buf[256];
-  sprintf (buf, "%f", log(exp(1.0)));
-  exit (strcmp (buf, "1.000000") ? 0 : 1);
-}
->>,
-changequote([, ])dnl
-rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no)])
-    if test "$rb_cv_missing_fconvert" = yes; then
-      AC_DEFINE(MISSING_FCONVERT)
-    fi
-    AC_LIBOBJ([x68.o])
-    CFLAGS="$CFLAGS -fansi-only"
-    XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
-    EXEEXT=.x
-    OBJEXT=o
+	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
+            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static])])
+
+AS_CASE(["$target_os"],
+  [human*], [
     setup=Setup.x68
-    ;;
+    ],
   dnl OS/2 environment w/ Autoconf 2.1x for EMX
-  os2-emx)
-    AC_LIBOBJ([os2])
+  [os2-emx], [
     setup=Setup.emx
-    ;;
-  *djgpp*)
+    ],
+  [*djgpp*], [
     setup=Setup.dj
-    ;;
-  *)
+    ],
+  [
     setup=Setup
-    ;;
-esac
+    ])
 
 AC_SUBST(setup)
 
@@ -1301,23 +2057,26 @@ if test "$prefix" = NONE; then
   prefix=$ac_default_prefix
 fi
 
-#if test "$fat_binary" != no ; then
-#  CFLAGS="$CFLAGS $ARCH_FLAG"
-#fi
-
 if test x"$cross_compiling" = xyes; then
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
-  PREP=fake.rb
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`pwd` "-r'$(arch)-fake'
+  PREP='$(arch)-fake.rb'
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  XRUBY='$(MINIRUBY)'
+  TEST_RUNNABLE=no
 else
-  MINIRUBY='./miniruby$(EXEEXT)'
+  MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
+  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
   PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+  RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
+  XRUBY='$(RUNRUBY)'
+  TEST_RUNNABLE=yes
 fi
+AC_SUBST(TEST_RUNNABLE)
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
 AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
+AC_SUBST(XRUBY)
+AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1326,16 +2085,18 @@ LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
 LIBRUBYARG='$(LIBRUBYARG_STATIC)'
 SOLIBS=
 
-case "$target_os" in
-  cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*|beos*|haiku*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*], [
     : ${DLDLIBS=""}
-    ;;
-  *)
+    ],
+  [
     DLDLIBS="$DLDLIBS -lc"
-    ;;
-esac
+    ])
+
+AC_ARG_WITH(soname,
+	AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
+	[RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
 
-RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'
 LIBRUBY_LDSHARED=$LDSHARED
 LIBRUBY_DLDFLAGS=$DLDFLAGS
 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
@@ -1343,34 +2104,40 @@ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
 ENABLE_SHARED=no
 
 AC_ARG_ENABLE(shared,
-       [  --enable-shared         build a shared library for Ruby. ],
+       AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
        [enable_shared=$enableval])
+LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
+libprefix='$(libdir)'
+LIBRUBY_RELATIVE=no
 if test "$enable_shared" = 'yes'; then
   LIBRUBY='$(LIBRUBY_SO)'
-  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
   LIBRUBYARG='$(LIBRUBYARG_SHARED)'
-  CFLAGS="$CFLAGS $CCDLFLAGS"
+  test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
   ENABLE_SHARED=yes
   if test "$rb_cv_binary_elf" = yes; then
     SOLIBS='$(LIBS)'
   fi
-  case "$target_os" in
-    sunos4*)
+  AS_CASE(["$target_os"],
+    [sunos4*], [
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	;;
-    linux* | gnu* | k*bsd*-gnu | atheos*)
+	],
+    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	;;
-    freebsd*|dragonfly*)
+	if test "$load_relative" = yes; then
+	    LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../lib'"
+	    LIBRUBY_RELATIVE=yes
+	fi
+	],
+    [freebsd*|dragonfly*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
 	if test "$rb_cv_binary_elf" != "yes" ; then
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
 	    LIBRUBY_ALIASES=''
 	fi
-	;;
-    netbsd*)
+	],
+    [netbsd*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
@@ -1379,12 +2146,12 @@ if test "$enable_shared" = 'yes'; then
 	else	# a.out platforms
 	   LIBRUBY_ALIASES=""
 	fi
- 	;;
-    openbsd*)
+	],
+    [openbsd*], [
 	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-	;;
-    solaris*)
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+	],
+    [solaris*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
@@ -1392,157 +2159,256 @@ if test "$enable_shared" = 'yes'; then
 	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
 	fi
 	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
- 	;;
-    hpux*)
+	],
+    [hpux*], [
 	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
-	;;
-    aix*)
-	LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
+	],
+    [aix*], [
+	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS"
 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
 	SOLIBS='-lm -lc'
-	;;
-    beos*)
-	case "$target_cpu" in
-	powerpc*)
+	],
+    [beos*], [
+	AS_CASE(["$target_cpu"],
+	[powerpc*], [
 	    LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
-	    ;;
-	esac
-	;;
-    darwin*)
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
-	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
-	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
-	;;
-    interix*)
+	    ])
+	],
+    [darwin*], [
+	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
+	if test "$load_relative" = yes; then
+	    libprefix='@executable_path/../lib'
+	    LIBRUBY_RELATIVE=yes
+	fi
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
+	if test "$visibility_option" = ld; then
+	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
+	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
+	fi
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).dylib'
+	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
+	],
+    [interix*], [
 	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
-	;;
-    *)
-	;;
-  esac
+	])
 fi
 if test "$enable_rpath" = yes; then
-    LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
+    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
+    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
+    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
+    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
 fi
+AC_SUBST(LIBRUBY_RELATIVE)
 
 LDFLAGS="-L. $LDFLAGS"
 AC_SUBST(ARCHFILE)
 
+if test "$EXEEXT" = .exe; then
+    EXECUTABLE_EXTS='".exe",".com",".cmd",".bat"'
+    AC_DEFINE_UNQUOTED(EXECUTABLE_EXTS, $EXECUTABLE_EXTS)
+    EXECUTABLE_EXTS=`echo $EXECUTABLE_EXTS | tr -d '"' | tr , ' '`
+    AC_SUBST(EXECUTABLE_EXTS)
+fi
+
+dnl }
+dnl build section {
+
 dnl build rdoc index if requested
 RDOCTARGET=""
 AC_ARG_ENABLE(install-doc,
-       [  --enable-install-doc    build and install rdoc indexes during install ],
-       [install_doc=$enableval], [install_doc=no])
+       AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
+       [install_doc=$enableval], [install_doc=yes])
 if test "$install_doc" != no; then
-   RDOCTARGET="install-doc"
+    RDOCTARGET="rdoc"
+else
+    RDOCTARGET="nodoc"
+    CAPITARGET="nodoc"
 fi
 AC_SUBST(RDOCTARGET)
 
-case "$target_os" in
-    linux*)
-	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
-	;;
-    netbsd*)
-    	CFLAGS="$CFLAGS -pipe"
-	;;
-    nextstep*|openstep*)
-	# The -fno-common is needed if we wish to embed the Ruby interpreter
-	# into a plugin module of some project (as opposed to embedding it
-	# within the project's application).  The -I/usr/local/include is
-	# needed because CPP as discovered by configure (cc -E -traditional)
-	# fails to consult /usr/local/include by default.  This causes
-	# mkmf.rb's have_header() to fail if the desired resource happens to be
-	# installed in the /usr/local tree.
-    	CFLAGS="$CFLAGS -pipe -fno-common"
-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-	;;
-    rhapsody*)
-    	CFLAGS="$CFLAGS -pipe -no-precomp -fno-common"
-	;;
-    darwin*)
-    	CFLAGS="$CFLAGS -pipe -fno-common"
-	MINIOBJS=dmydln.o
-	;;
-    os2-emx)
-    	CFLAGS="$CFLAGS -DOS2 -Zmts"
+AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
+AC_SUBST(INSTALLDOC)
+
+if test "$rb_with_pthread" = "yes"; then
+    THREAD_MODEL=pthread
+fi
+MINIDLNOBJ=dmydln.o
+AS_CASE(["$target_os"],
+    [linux*], [
+	],
+    [netbsd*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	],
+    [nextstep*|openstep*], [
+	RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
+	],
+    [rhapsody*], [
+	RUBY_APPEND_OPTIONS(CFLAGS, -pipe -no-precomp)
+	],
+    [darwin*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	],
+    [human*], [
+	AC_LIBOBJ([x68.o])
+	CFLAGS="$CFLAGS -fansi-only"
+	XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
+	EXEEXT=.x
+	OBJEXT=o
+	],
+    [os2-emx], [
+	AC_LIBOBJ([os2])
+    	CFLAGS="$CFLAGS -DOS2"
 	LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
 	LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
 	LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
-	;;
-    osf*)
+	],
+    [osf*], [
 	if test "$GCC" != "yes" ; then
 	  # compile something small: taint.c is fine for this.
 	  # the main point is the '-v' flag of 'cc'.
-	  case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
-	  */gemc_cc*)   # we have the new DEC GEM CC
+	  AS_CASE(["`cc -v -I. -c main.c -o /tmp/main.o 2>&1`"],
+	  [*/gemc_cc*], [   # we have the new DEC GEM CC
                         CFLAGS="$CFLAGS -oldc"
-                        ;;
-          *)            # we have the old MIPS CC
-                        ;;
-          esac
+                        ],
+          [            # we have the old MIPS CC
+                        ])
 	  # cleanup
 	  rm -f /tmp/main.o
 	  CFLAGS="$CFLAGS -std"
 	fi
-	;;
-    beos*)
-	case "$target_cpu" in
-	powerpc*)
-	    CFLAGS="$CFLAGS -relax_pointers"
-	    ;;
-	esac
-	;;
-    cygwin*|mingw*)
-	case "$target_os" in
-	cygwin*)
+	],
+    [beos*], [
+	AS_CASE(["$target_cpu"],[powerpc*], [CFLAGS="$CFLAGS -relax_pointers"])
+	CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
+	],
+    [cygwin*|mingw*], [
+	RUBY_SO_NAME="${RUBY_SO_NAME}${MAJOR}${MINOR}${TEENY}"
+	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+	AS_CASE(["$target_os"],
+	[cygwin*], [
 	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
-		LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
+		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'.dll
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
 	    fi
-	    ;;
-	mingw*)
-	    RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
+	    ],
+	[mingw*], [
+	    RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
 	    if test x"$enable_shared" = xyes; then
 		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
-		LIBRUBY='lib$(LIBRUBY_SO).a'
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
 	    fi
+	    EXPORT_PREFIX=' '
+	    DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)'
 	    AC_LIBOBJ([win32])
 	    COMMON_LIBS=m
 #	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
-	    COMMON_HEADERS="windows.h winsock.h"
-	    ;;
-	esac
-	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+	    COMMON_HEADERS="winsock2.h windows.h"
+	    THREAD_MODEL=win32
+	    ])
 	LIBRUBY_ALIASES=''
 	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
 	SOLIBS='$(LIBS)'
-	if test x"$enable_shared" = xno; then
+	if test x"$enable_shared" = xyes; then
+	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
+	else
 	    LIBRUBY_SO=dummy
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
-	MINIOBJS=dmydln.o
-	;;
-    hpux*)
-	case "$YACC" in
-	  *yacc*)
+	],
+    [hpux*], [
+	AS_CASE(["$YACC"],[*yacc*], [
 	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
 	    YACC="$YACC -Nl40000 -Nm40000"
-	    ;;
-	esac
-	MINIOBJS=dmydln.o
-	;;
-    *)
-	;;
-esac
-
-case "$build_os" in
-  *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
-esac
+	])],
+    [*msdosdjgpp*], [
+	FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in
+	])
+MINIOBJS="$MINIDLNOBJ"
+
+AS_CASE(["$THREAD_MODEL"],
+[pthread], [AC_CHECK_HEADERS(pthread.h)],
+[win32],   [],
+[""],      [AC_MSG_ERROR(thread model is missing)],
+           [AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
+
+AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
+    AC_MSG_CHECKING([for if ${MAKE-make} is GNU make])
+    mkdir conftest.dir
+    echo "all:; @echo yes" > conftest.dir/GNUmakefile
+    echo "all:; @echo no" > conftest.dir/Makefile
+    gnumake=`(cd conftest.dir; ${MAKE-make})`
+    rm -fr conftest.dir
+    AS_CASE(["$gnumake"],
+    [*yes*], [
+	echo "include Makefile" > GNUmakefile
+	echo "-include uncommon.mk" >> GNUmakefile
+	gnumake=yes],
+    [
+	gnumake=no])
+    AC_MSG_RESULT($gnumake)
+])
+
+if test "${universal_binary-no}" = yes ; then
+    AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
+    mv confdefs.h confdefs1.h
+    : > confdefs.h
+    AC_TRY_COMPILE([@%:@if defined __`echo ${universal_archnames} |
+    sed 's/=[^ ]*//g;s/ /__ || defined __/g'`__
+@%:@else
+@%:@error
+>>>>>><<<<<<
+@%:@endif], [],
+[
+    rb_cv_architecture_macros=yes
+    mv -f confdefs1.h confdefs.h
+], [
+    rb_cv_architecture_macros=no
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    for archs in ${universal_archnames}; do
+	cpu=${archs#*=}
+	archs=${archs%=*}
+	CFLAGS="$new_cflags -arch $archs"
+	archs="__${archs}__"
+	AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
+	AC_TRY_COMPILE([@%:@ifndef ${archs}
+@%:@error
+@%:@endif], [], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+    done
+    mv -f confdefs1.h confdefs.h
+    AC_MSG_ERROR([failed])
+    ])])
+fi
 
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
+test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
+if test -n "${cflags+set}"; then
+    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
+fi
+if test -n "${cxxflags+set}"; then
+    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'`
+fi
+if test "${ARCH_FLAG}"; then
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CFLAGS=`echo "$CFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
+    LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
+fi
+AC_SUBST(cppflags, [])dnl
+AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(optflags)dnl
+AC_SUBST(debugflags)dnl
+AC_SUBST(warnflags)dnl
 AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
 AC_SUBST(LIBRUBY_LDSHARED)
@@ -1567,6 +2433,7 @@ AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
 AC_SUBST(MINIOBJS)
+AC_SUBST(THREAD_MODEL)
 
 MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
 MAKEFILES="`echo $MAKEFILES`"
@@ -1580,92 +2447,195 @@ ri_suffix=
 test "$program_suffix" != NONE &&
   ri_suffix=$program_suffix
 
-RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
-case "$target_os" in
-  cygwin*|mingw*)
-    RUBYW_INSTALL_NAME="${ri_prefix}rubyw${ri_suffix}"
-    rubyw_install_name="$RUBYW_INSTALL_NAME"
-    ;;
-esac
-case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_LIB_PREFIX="/lib/ruby"
-    ;;
-  *)
-    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-    ;;
-esac
-RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*], [
+    RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
+    rubyw_install_name='$(RUBYW_INSTALL_NAME)'
+    ])
+
+rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
+AC_ARG_WITH(rubylibprefix,
+	    AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
+	    [rubylibprefix=$withval])
+RUBY_LIB_PREFIX=`eval echo \\"${rubylibprefix}\\"`
+AC_SUBST(rubylibprefix)
+
+RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'`
+ridir='${datarootdir}/${RI_BASE_NAME}'
+AC_ARG_WITH(ridir,
+	    AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]),
+	    [ridir=$withval])
+RIDIR=`eval echo \\"${ridir}\\"`
+AC_SUBST(ridir)
+AC_SUBST(RI_BASE_NAME)
+
+AC_ARG_WITH(ruby-version,
+	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
+            [ruby_version=$withval],
+            [ruby_version=full])
+unset RUBY_LIB_VERSION
+unset RUBY_LIB_VERSION_STYLE
+AS_CASE(["$ruby_version"],
+  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
+  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
+if test ${RUBY_LIB_VERSION_STYLE+set}; then
+    {
+    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+    echo '#define STRINGIZE(x) x'
+    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
+    echo '#include "version.h"'
+    echo 'ruby_version=RUBY_LIB_VERSION'
+    } > conftest.c
+    ruby_version="`$CPP -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+    eval $ruby_version
+else
+    RUBY_LIB_VERSION="\"${ruby_version}\""
+fi
 
 AC_ARG_WITH(sitedir,
-	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
+	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
             [sitedir=$withval],
-            [sitedir='${prefix}/lib/ruby/site_ruby'])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
-case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
-  *)
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
-esac
-RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
-
-AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+            [sitedir='${rubylibprefix}/site_ruby'])
+dir="${sitedir}"
+until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
+    dir="${SITE_DIR}"
+done
+
+AC_ARG_WITH(vendordir,
+	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
+            [vendordir=$withval],
+            [vendordir='${rubylibprefix}/vendor_ruby'])
+dir="${vendordir}"
+until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
+    dir="${VENDOR_DIR}"
+done
+
+if test "${LOAD_RELATIVE+set}"; then
+    AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
+    RUBY_EXEC_PREFIX=""
+    RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+    RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+    RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+else
+    RUBY_EXEC_PREFIX="`eval echo \\"$exec_prefix/\\" | sed 's|^NONE/|'"$prefix"'/|;s|/$||'`"
+    RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+    RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+    RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+fi
+
+pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
+AS_CASE(["$RUBY_SITE_LIB_PATH"],
+  ["$RUBY_LIB_PREFIX/"*], [
+    RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
+    ],
+  [
+    RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
+    ])
+AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
+  ["$RUBY_LIB_PREFIX/"*], [
+    RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
+    ],
+  [
+    RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
+    ])
+pat=`echo "$RUBY_EXEC_PREFIX/" | tr -c '\012' .`'\(.*\)'
+AS_CASE(["$RUBY_LIB_PREFIX"],
+  ["$RUBY_EXEC_PREFIX/"*], [
+    RUBY_LIB_PREFIX='RUBY_EXEC_PREFIX"/'"`expr \"$RUBY_LIB_PREFIX\" : \"$pat\"`"'"'
+    ],
+  [
+    RUBY_LIB_PREFIX="\"${RUBY_LIB_PREFIX}\""
+    ])
+
+if test ${RUBY_LIB_VERSION_STYLE+set}; then
+    AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE)
+else
+    AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION])
+fi
+AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
+AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX})
+AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH})
+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH})
 
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
+AC_SUBST(ruby_version)dnl
 AC_SUBST(sitedir)dnl
+AC_SUBST(vendordir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
 
-if test "$fat_binary" != no ; then
-    arch="fat-${target_os}"
-
-    AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-
-    AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
-                 "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
+if test "${universal_binary-no}" = yes ; then
+    arch="universal-${target_os}"
+    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
+	AC_TRY_COMPILE([const char arch[] = __ARCHITECTURE__;], [puts(arch);],
+	     [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
+    if test "${rb_cv_architecture_available}" = yes; then
+	AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
+    else
+	for archs in ${universal_archnames}; do
+	    cpu=`echo $archs | sed 's/.*=//'`
+	    archs=`echo $archs | sed 's/=.*//'`
+	    RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
+	done
+    fi
+    ints='long int'
+    test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
+    AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
+    AC_SUBST(UNIVERSAL_INTS, "${ints}")
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
+    AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS)
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
 else
     arch="${target_cpu}-${target_os}"
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
 fi
 
-case "$target_os" in
-  mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
-  *) sitearch="${arch}" ;;
-esac
-
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+unset sitearch
+AS_CASE(["$target_os"],[mingw*],[sitearch="$target_cpu-$rb_cv_msvcrt"])
+test ${sitearch+set} && AC_DEFINE_UNQUOTED(RUBY_SITEARCH, "${sitearch}")
 
 AC_ARG_WITH(search-path,
-		[  --with-search-path=DIR specify the additional search path],
+		AS_HELP_STRING([--with-search-path=DIR], [specify the additional search path]),
 		[search_path=$withval])
 if test "$search_path" != ""; then
     AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
 fi
 
+AC_ARG_WITH(rubyhdrdir,
+	    AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
+	    [rubyhdrdir=$withval],
+	    [rubyhdrdir='${includedir}/${RUBY_BASE_NAME}-${ruby_version}'])
+
+AC_ARG_WITH(sitehdrdir,
+	    AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitehdrdir=$withval],
+	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
+
+AC_ARG_WITH(vendorhdrdir,
+	    AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorhdrdir=$withval],
+	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
+
+AC_SUBST(rubyhdrdir)dnl
+AC_SUBST(sitehdrdir)dnl
+AC_SUBST(vendorhdrdir)dnl
+
+AC_ARG_WITH(opt-dir,
+	AS_HELP_STRING([--with-opt-dir=DIR], [add optional headers and libraries DIR]))
+
 AC_ARG_WITH(mantype,
-		[  --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
+	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
 		[
-			case "$withval" in
-			man|doc)
-				MANTYPE=$withval
-				;;
-			*)
-				AC_MSG_ERROR(invalid man type: $withval)
-				;;
-			esac
+			AS_CASE(["$withval"],
+			[man|doc], [MANTYPE=$withval],
+			[AC_MSG_ERROR(invalid man type: $withval)])
 		])
 if test -z "$MANTYPE"; then
 	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
-	if ${NROFF} -mdoc ${srcdir}/ruby.1 >/dev/null 2>&1; then
+	if ${NROFF} -mdoc ${srcdir}/man/ruby.1 >/dev/null 2>&1; then
 		MANTYPE=doc
 	else
 		MANTYPE=man
@@ -1673,20 +2643,66 @@ if test -z "$MANTYPE"; then
 fi
 AC_SUBST(MANTYPE)
 
-if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
-  echo "config.h unchanged"
-else
-  echo "creating config.h"
-  tr -d '\015' < confdefs.h > config.h
-fi
+arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
+AS_MKDIR_P("${arch_hdrdir}")
+config_h="${arch_hdrdir}/config.h"
+tr -d '\015' < confdefs.h | grep -v "^#define PACKAGE_" |
+${srcdir}/tool/ifchange "${config_h}" -
 tr -d '\015' < largefile.h > confdefs.h
+rm largefile.h
+
+BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_ENCOBJS=
+for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done
+AC_SUBST(BUILTIN_ENCOBJS)
+
+BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_TRANSSRCS=
+BUILTIN_TRANSOBJS=
+for e in $BUILTIN_TRANSES; do
+  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS `basename $e .trans`"'.c';
+  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS `basename $e .trans`"'.$(OBJEXT)';
+done
+AC_SUBST(BUILTIN_TRANSSRCS)
+AC_SUBST(BUILTIN_TRANSOBJS)
+
+PACKAGE=$RUBY_BASE_NAME
+AC_SUBST(PACKAGE)
+AC_MSG_RESULT($PACKAGE library version = $ruby_version)
+
+AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
 
 AC_CONFIG_FILES($FIRSTMAKEFILE)
 AC_CONFIG_FILES(Makefile, [{
-	sed '/^MISSING/s/\$U\././g' Makefile
+	if test -d "$srcdir/.svn"; then
+	    VCS='svn'
+	    VCSUP='$(VCS) up $(SVNUPOPTIONS)'
+	elif test -d "$srcdir/.git/svn"; then
+	    VCS='git svn'
+	    VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
+	elif test -d "$srcdir/.git"; then
+	    VCS='git'
+	    VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
+	else
+	    VCS='echo cannot'
+	    VCSUP='$(VCS)'
+	fi
+	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
-	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
-	sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
-      } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
-[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
+	if test "$gnumake" != yes; then
+	    echo ['$(MKFILES): $(srcdir)/common.mk']
+	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+	else
+	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
+	fi
+    } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
+	${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
+	echo 'ruby: $(PROGRAM);' >> Makefile],
+[EXEEXT='$EXEEXT' gnumake='$gnumake'])
 AC_OUTPUT
+dnl }
+dnl }
diff --git a/cont.c b/cont.c
new file mode 100644
index 0000000000..e6f6b6dabc
--- /dev/null
+++ b/cont.c
@@ -0,0 +1,1140 @@
+/**********************************************************************
+
+  cont.c -
+
+  $Author$
+  created at: Thu May 23 09:03:43 2007
+
+  Copyright (C) 2007 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+#include "vm_core.h"
+#include "gc.h"
+#include "eval_intern.h"
+
+#define CAPTURE_JUST_VALID_VM_STACK 1
+
+enum context_type {
+    CONTINUATION_CONTEXT = 0,
+    FIBER_CONTEXT = 1,
+    ROOT_FIBER_CONTEXT = 2
+};
+
+typedef struct rb_context_struct {
+    enum context_type type;
+    VALUE self;
+    int argc;
+    VALUE value;
+    VALUE *vm_stack;
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    size_t vm_stack_slen;  /* length of stack (head of th->stack) */
+    size_t vm_stack_clen;  /* length of control frames (tail of th->stack) */
+#endif
+    VALUE *machine_stack;
+    VALUE *machine_stack_src;
+#ifdef __ia64
+    VALUE *machine_register_stack;
+    VALUE *machine_register_stack_src;
+    int machine_register_stack_size;
+#endif
+    rb_thread_t saved_thread;
+    rb_jmpbuf_t jmpbuf;
+    size_t machine_stack_size;
+} rb_context_t;
+
+enum fiber_status {
+    CREATED,
+    RUNNING,
+    TERMINATED
+};
+
+typedef struct rb_fiber_struct {
+    rb_context_t cont;
+    VALUE prev;
+    enum fiber_status status;
+    struct rb_fiber_struct *prev_fiber;
+    struct rb_fiber_struct *next_fiber;
+} rb_fiber_t;
+
+static const rb_data_type_t cont_data_type, fiber_data_type;
+static VALUE rb_cContinuation;
+static VALUE rb_cFiber;
+static VALUE rb_eFiberError;
+
+#define GetContPtr(obj, ptr)  \
+    TypedData_Get_Struct(obj, rb_context_t, &cont_data_type, ptr)
+
+#define GetFiberPtr(obj, ptr)  do {\
+    TypedData_Get_Struct(obj, rb_fiber_t, &fiber_data_type, ptr); \
+    if (!ptr) rb_raise(rb_eFiberError, "uninitialized fiber"); \
+} while(0)
+
+NOINLINE(static VALUE cont_capture(volatile int *stat));
+
+void rb_thread_mark(rb_thread_t *th);
+#define THREAD_MUST_BE_RUNNING(th) do { \
+	if (!th->tag) rb_raise(rb_eThreadError, "not running thread");	\
+    } while (0)
+
+static void
+cont_mark(void *ptr)
+{
+    RUBY_MARK_ENTER("cont");
+    if (ptr) {
+	rb_context_t *cont = ptr;
+	rb_gc_mark(cont->value);
+	rb_thread_mark(&cont->saved_thread);
+
+	if (cont->vm_stack) {
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+	    rb_gc_mark_locations(cont->vm_stack,
+				 cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
+#else
+	    rb_gc_mark_localtion(cont->vm_stack,
+				 cont->vm_stack, cont->saved_thread.stack_size);
+#endif
+	}
+
+	if (cont->machine_stack) {
+	    rb_gc_mark_locations(cont->machine_stack,
+				 cont->machine_stack + cont->machine_stack_size);
+	}
+#ifdef __ia64
+	if (cont->machine_register_stack) {
+	    rb_gc_mark_locations(cont->machine_register_stack,
+				 cont->machine_register_stack + cont->machine_register_stack_size);
+	}
+#endif
+    }
+    RUBY_MARK_LEAVE("cont");
+}
+
+static void
+cont_free(void *ptr)
+{
+    RUBY_FREE_ENTER("cont");
+    if (ptr) {
+	rb_context_t *cont = ptr;
+	RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); fflush(stdout);
+	RUBY_FREE_UNLESS_NULL(cont->machine_stack);
+#ifdef __ia64
+	RUBY_FREE_UNLESS_NULL(cont->machine_register_stack);
+#endif
+	RUBY_FREE_UNLESS_NULL(cont->vm_stack);
+
+	/* free rb_cont_t or rb_fiber_t */
+	ruby_xfree(ptr);
+    }
+    RUBY_FREE_LEAVE("cont");
+}
+
+static size_t
+cont_memsize(const void *ptr)
+{
+    const rb_context_t *cont = ptr;
+    size_t size = 0;
+    if (cont) {
+	size = sizeof(*cont);
+	if (cont->vm_stack) {
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+	    size_t n = (cont->vm_stack_slen + cont->vm_stack_clen);
+#else
+	    size_t n = cont->saved_thread.stack_size;
+#endif
+	    size += n * sizeof(*cont->vm_stack);
+	}
+
+	if (cont->machine_stack) {
+	    size += cont->machine_stack_size * sizeof(*cont->machine_stack);
+	}
+#ifdef __ia64
+	if (cont->machine_register_stack) {
+	    size += cont->machine_register_stack_size * sizeof(*cont->machine_register_stack);
+	}
+#endif
+    }
+    return size;
+}
+
+static void
+fiber_mark(void *ptr)
+{
+    RUBY_MARK_ENTER("cont");
+    if (ptr) {
+	rb_fiber_t *fib = ptr;
+	rb_gc_mark(fib->prev);
+	cont_mark(&fib->cont);
+    }
+    RUBY_MARK_LEAVE("cont");
+}
+
+static void
+fiber_link_join(rb_fiber_t *fib)
+{
+    VALUE current_fibval = rb_fiber_current();
+    rb_fiber_t *current_fib;
+    GetFiberPtr(current_fibval, current_fib);
+
+    /* join fiber link */
+    fib->next_fiber = current_fib->next_fiber;
+    fib->prev_fiber = current_fib;
+    current_fib->next_fiber->prev_fiber = fib;
+    current_fib->next_fiber = fib;
+}
+
+static void
+fiber_link_remove(rb_fiber_t *fib)
+{
+    fib->prev_fiber->next_fiber = fib->next_fiber;
+    fib->next_fiber->prev_fiber = fib->prev_fiber;
+}
+
+static void
+fiber_free(void *ptr)
+{
+    RUBY_FREE_ENTER("fiber");
+    if (ptr) {
+	rb_fiber_t *fib = ptr;
+
+	if (fib->cont.type != ROOT_FIBER_CONTEXT &&
+	    fib->cont.saved_thread.local_storage) {
+	    st_free_table(fib->cont.saved_thread.local_storage);
+	}
+	fiber_link_remove(fib);
+
+	cont_free(&fib->cont);
+    }
+    RUBY_FREE_LEAVE("fiber");
+}
+
+static size_t
+fiber_memsize(const void *ptr)
+{
+    const rb_fiber_t *fib = ptr;
+    size_t size = 0;
+    if (ptr) {
+	size = sizeof(*fib);
+	if (fib->cont.type != ROOT_FIBER_CONTEXT) {
+	    size += st_memsize(fib->cont.saved_thread.local_storage);
+	}
+	size += cont_memsize(&fib->cont);
+    }
+    return size;
+}
+
+static void
+cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
+{
+    size_t size;
+    rb_thread_t *sth = &cont->saved_thread;
+
+    SET_MACHINE_STACK_END(&th->machine_stack_end);
+#ifdef __ia64
+    th->machine_register_stack_end = rb_ia64_bsp();
+#endif
+
+    if (th->machine_stack_start > th->machine_stack_end) {
+	size = cont->machine_stack_size = th->machine_stack_start - th->machine_stack_end;
+	cont->machine_stack_src = th->machine_stack_end;
+    }
+    else {
+	size = cont->machine_stack_size = th->machine_stack_end - th->machine_stack_start;
+	cont->machine_stack_src = th->machine_stack_start;
+    }
+
+    if (cont->machine_stack) {
+	REALLOC_N(cont->machine_stack, VALUE, size);
+    }
+    else {
+	cont->machine_stack = ALLOC_N(VALUE, size);
+    }
+
+    FLUSH_REGISTER_WINDOWS;
+    MEMCPY(cont->machine_stack, cont->machine_stack_src, VALUE, size);
+
+#ifdef __ia64
+    rb_ia64_flushrs();
+    size = cont->machine_register_stack_size = th->machine_register_stack_end - th->machine_register_stack_start;
+    cont->machine_register_stack_src = th->machine_register_stack_start;
+    if (cont->machine_register_stack) {
+	REALLOC_N(cont->machine_register_stack, VALUE, size);
+    }
+    else {
+	cont->machine_register_stack = ALLOC_N(VALUE, size);
+    }
+
+    MEMCPY(cont->machine_register_stack, cont->machine_register_stack_src, VALUE, size);
+#endif
+
+    sth->machine_stack_start = sth->machine_stack_end = 0;
+#ifdef __ia64
+    sth->machine_register_stack_start = sth->machine_register_stack_end = 0;
+#endif
+}
+
+static const rb_data_type_t cont_data_type = {
+    "continuation",
+    cont_mark, cont_free, cont_memsize,
+};
+
+static void
+cont_init(rb_context_t *cont, rb_thread_t *th)
+{
+    /* save thread context */
+    cont->saved_thread = *th;
+    cont->saved_thread.local_storage = 0;
+    cont->saved_thread.machine_stack_start = cont->saved_thread.machine_stack_end = 0;
+}
+
+static rb_context_t *
+cont_new(VALUE klass)
+{
+    rb_context_t *cont;
+    volatile VALUE contval;
+    rb_thread_t *th = GET_THREAD();
+
+    THREAD_MUST_BE_RUNNING(th);
+    contval = TypedData_Make_Struct(klass, rb_context_t, &cont_data_type, cont);
+    cont->self = contval;
+    cont_init(cont, th);
+    return cont;
+}
+
+void rb_vm_stack_to_heap(rb_thread_t *th);
+
+static VALUE
+cont_capture(volatile int *stat)
+{
+    rb_context_t *cont;
+    rb_thread_t *th = GET_THREAD(), *sth;
+    volatile VALUE contval;
+
+    THREAD_MUST_BE_RUNNING(th);
+    rb_vm_stack_to_heap(th);
+    cont = cont_new(rb_cContinuation);
+    contval = cont->self;
+    sth = &cont->saved_thread;
+
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    cont->vm_stack_slen = th->cfp->sp + th->mark_stack_len - th->stack;
+    cont->vm_stack_clen = th->stack + th->stack_size - (VALUE*)th->cfp;
+    cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
+    MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
+    MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
+#else
+    cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
+    MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
+#endif
+    sth->stack = 0;
+
+    cont_save_machine_stack(th, cont);
+
+    if (ruby_setjmp(cont->jmpbuf)) {
+	VALUE value;
+
+	value = cont->value;
+	if (cont->argc == -1) rb_exc_raise(value);
+	cont->value = Qnil;
+	*stat = 1;
+	return value;
+    }
+    else {
+	*stat = 0;
+	return cont->self;
+    }
+}
+
+NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
+
+static void
+cont_restore_1(rb_context_t *cont)
+{
+    rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
+
+    /* restore thread context */
+    if (cont->type == CONTINUATION_CONTEXT) {
+	/* continuation */
+	VALUE fib;
+
+	th->fiber = sth->fiber;
+	fib = th->fiber ? th->fiber : th->root_fiber;
+
+	if (fib) {
+	    rb_fiber_t *fcont;
+	    GetFiberPtr(fib, fcont);
+	    th->stack_size = fcont->cont.saved_thread.stack_size;
+	    th->stack = fcont->cont.saved_thread.stack;
+	}
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
+	MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
+	       cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
+#else
+	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
+#endif
+    }
+    else {
+	/* fiber */
+	th->stack = sth->stack;
+	th->stack_size = sth->stack_size;
+	th->local_storage = sth->local_storage;
+	th->fiber = cont->self;
+    }
+
+    th->cfp = sth->cfp;
+    th->safe_level = sth->safe_level;
+    th->raised_flag = sth->raised_flag;
+    th->state = sth->state;
+    th->status = sth->status;
+    th->tag = sth->tag;
+    th->protect_tag = sth->protect_tag;
+    th->errinfo = sth->errinfo;
+    th->first_proc = sth->first_proc;
+
+    /* restore machine stack */
+#ifdef _M_AMD64
+    {
+	/* workaround for x64 SEH */
+	jmp_buf buf;
+	setjmp(buf);
+	((_JUMP_BUFFER*)(&cont->jmpbuf))->Frame =
+	    ((_JUMP_BUFFER*)(&buf))->Frame;
+    }
+#endif
+    if (cont->machine_stack_src) {
+	FLUSH_REGISTER_WINDOWS;
+	MEMCPY(cont->machine_stack_src, cont->machine_stack,
+	       VALUE, cont->machine_stack_size);
+    }
+
+#ifdef __ia64
+    if (cont->machine_register_stack_src) {
+	MEMCPY(cont->machine_register_stack_src, cont->machine_register_stack,
+	       VALUE, cont->machine_register_stack_size);
+    }
+#endif
+
+    ruby_longjmp(cont->jmpbuf, 1);
+}
+
+NORETURN(NOINLINE(static void cont_restore_0(rb_context_t *, VALUE *)));
+
+#ifdef __ia64
+#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
+#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
+static volatile int C(a), C(b), C(c), C(d), C(e);
+static volatile int C(f), C(g), C(h), C(i), C(j);
+static volatile int C(k), C(l), C(m), C(n), C(o);
+static volatile int C(p), C(q), C(r), C(s), C(t);
+#if 0
+{/* the above lines make cc-mode.el confused so much */}
+#endif
+int rb_dummy_false = 0;
+NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *, VALUE *)));
+static void
+register_stack_extend(rb_context_t *cont, VALUE *vp, VALUE *curr_bsp)
+{
+    if (rb_dummy_false) {
+        /* use registers as much as possible */
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+    }
+    if (curr_bsp < cont->machine_register_stack_src+cont->machine_register_stack_size) {
+        register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
+    }
+    cont_restore_0(cont, vp);
+}
+#undef C
+#undef E
+#endif
+
+static void
+cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
+{
+    if (cont->machine_stack_src) {
+#ifdef HAVE_ALLOCA
+#define STACK_PAD_SIZE 1
+#else
+#define STACK_PAD_SIZE 1024
+#endif
+	VALUE space[STACK_PAD_SIZE];
+
+#if !STACK_GROW_DIRECTION
+	if (addr_in_prev_frame > &space[0]) {
+	    /* Stack grows downward */
+#endif
+#if STACK_GROW_DIRECTION <= 0
+	    volatile VALUE *const end = cont->machine_stack_src;
+	    if (&space[0] > end) {
+# ifdef HAVE_ALLOCA
+		volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
+		space[0] = *sp;
+# else
+		cont_restore_0(cont, &space[0]);
+# endif
+	    }
+#endif
+#if !STACK_GROW_DIRECTION
+	}
+	else {
+	    /* Stack grows upward */
+#endif
+#if STACK_GROW_DIRECTION >= 0
+	    volatile VALUE *const end = cont->machine_stack_src + cont->machine_stack_size;
+	    if (&space[STACK_PAD_SIZE] < end) {
+# ifdef HAVE_ALLOCA
+		volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
+		space[0] = *sp;
+# else
+		cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
+# endif
+	    }
+#endif
+#if !STACK_GROW_DIRECTION
+	}
+#endif
+    }
+    cont_restore_1(cont);
+}
+#ifdef __ia64
+#define cont_restore_0(cont, vp) register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
+#endif
+
+/*
+ *  Document-class: Continuation
+ *
+ *  Continuation objects are generated by
+ *  <code>Kernel#callcc</code>. They hold a return address and execution
+ *  context, allowing a nonlocal return to the end of the
+ *  <code>callcc</code> block from anywhere within a program.
+ *  Continuations are somewhat analogous to a structured version of C's
+ *  <code>setjmp/longjmp</code> (although they contain more state, so
+ *  you might consider them closer to threads).
+ *
+ *  For instance:
+ *
+ *     arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
+ *     callcc{|$cc|}
+ *     puts(message = arr.shift)
+ *     $cc.call unless message =~ /Max/
+ *
+ *  <em>produces:</em>
+ *
+ *     Freddie
+ *     Herbie
+ *     Ron
+ *     Max
+ *
+ *  This (somewhat contrived) example allows the inner loop to abandon
+ *  processing early:
+ *
+ *     callcc {|cont|
+ *       for i in 0..4
+ *         print "\n#{i}: "
+ *         for j in i*5...(i+1)*5
+ *           cont.call() if j == 17
+ *           printf "%3d", j
+ *         end
+ *       end
+ *     }
+ *     print "\n"
+ *
+ *  <em>produces:</em>
+ *
+ *     0:   0  1  2  3  4
+ *     1:   5  6  7  8  9
+ *     2:  10 11 12 13 14
+ *     3:  15 16
+ */
+
+/*
+ *  call-seq:
+ *     callcc {|cont| block }   ->  obj
+ *
+ *  Generates a <code>Continuation</code> object, which it passes to the
+ *  associated block. Performing a <em>cont</em><code>.call</code> will
+ *  cause the <code>callcc</code> to return (as will falling through the
+ *  end of the block). The value returned by the <code>callcc</code> is
+ *  the value of the block, or the value passed to
+ *  <em>cont</em><code>.call</code>. See class <code>Continuation</code>
+ *  for more details. Also see <code>Kernel::throw</code> for
+ *  an alternative mechanism for unwinding a call stack.
+ */
+
+static VALUE
+rb_callcc(VALUE self)
+{
+    volatile int called;
+    volatile VALUE val = cont_capture(&called);
+
+    if (called) {
+	return val;
+    }
+    else {
+	return rb_yield(val);
+    }
+}
+
+static VALUE
+make_passing_arg(int argc, VALUE *argv)
+{
+    switch(argc) {
+      case 0:
+	return Qnil;
+      case 1:
+	return argv[0];
+      default:
+	return rb_ary_new4(argc, argv);
+    }
+}
+
+/*
+ *  call-seq:
+ *     cont.call(args, ...)
+ *     cont[args, ...]
+ *
+ *  Invokes the continuation. The program continues from the end of the
+ *  <code>callcc</code> block. If no arguments are given, the original
+ *  <code>callcc</code> returns <code>nil</code>. If one argument is
+ *  given, <code>callcc</code> returns it. Otherwise, an array
+ *  containing <i>args</i> is returned.
+ *
+ *     callcc {|cont|  cont.call }           #=> nil
+ *     callcc {|cont|  cont.call 1 }         #=> 1
+ *     callcc {|cont|  cont.call 1, 2, 3 }   #=> [1, 2, 3]
+ */
+
+static VALUE
+rb_cont_call(int argc, VALUE *argv, VALUE contval)
+{
+    rb_context_t *cont;
+    rb_thread_t *th = GET_THREAD();
+    GetContPtr(contval, cont);
+
+    if (cont->saved_thread.self != th->self) {
+	rb_raise(rb_eRuntimeError, "continuation called across threads");
+    }
+    if (cont->saved_thread.protect_tag != th->protect_tag) {
+	rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
+    }
+    if (cont->saved_thread.fiber) {
+	rb_fiber_t *fcont;
+	GetFiberPtr(cont->saved_thread.fiber, fcont);
+
+	if (th->fiber != cont->saved_thread.fiber) {
+	    rb_raise(rb_eRuntimeError, "continuation called across fiber");
+	}
+    }
+
+    cont->argc = argc;
+    cont->value = make_passing_arg(argc, argv);
+
+    cont_restore_0(cont, &contval);
+    return Qnil; /* unreachable */
+}
+
+/*********/
+/* fiber */
+/*********/
+
+/*
+ *  Document-class: Fiber
+ *
+ *  Fibers are primitives for implementing light weight cooperative
+ *  concurrency in Ruby. Basically they are a means of creating code blocks
+ *  that can be paused and resumed, much like threads. The main difference
+ *  is that they are never preempted and that the scheduling must be done by
+ *  the programmer and not the VM.
+ *
+ *  As opposed to other stackless light weight concurrency models, each fiber
+ *  comes with a small 4KB stack. This enables the fiber to be paused from deeply
+ *  nested function calls within the fiber block.
+ *
+ *  When a fiber is created it will not run automatically. Rather it must be
+ *  be explicitly asked to run using the <code>Fiber#resume</code> method.
+ *  The code running inside the fiber can give up control by calling
+ *  <code>Fiber.yield</code> in which case it yields control back to caller
+ *  (the caller of the <code>Fiber#resume</code>).
+ *
+ *  Upon yielding or termination the Fiber returns the value of the last
+ *  executed expression
+ *
+ *  For instance:
+ *
+ *    fiber = Fiber.new do
+ *      Fiber.yield 1
+ *      2
+ *    end
+ *
+ *    puts fiber.resume
+ *    puts fiber.resume
+ *    puts fiber.resume
+ *
+ *  <em>produces</em>
+ *
+ *    1
+ *    2
+ *    FiberError: dead fiber called
+ *
+ *  The <code>Fiber#resume</code> method accepts an arbitrary number of
+ *  parameters, if it is the first call to <code>resume</code> then they
+ *  will be passed as block arguments. Otherwise they will be the return
+ *  value of the call to <code>Fiber.yield</code>
+ *
+ *  Example:
+ *
+ *    fiber = Fiber.new do |first|
+ *      second = Fiber.yield first + 2
+ *    end
+ *
+ *    puts fiber.resume 10
+ *    puts fiber.resume 14
+ *    puts fiber.resume 18
+ *
+ *  <em>produces</em>
+ *
+ *    12
+ *    14
+ *    FiberError: dead fiber called
+ *
+ */
+
+#define FIBER_VM_STACK_SIZE (4 * 1024)
+
+static const rb_data_type_t fiber_data_type = {
+    "fiber",
+    fiber_mark, fiber_free, fiber_memsize,
+};
+
+static VALUE
+fiber_alloc(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &fiber_data_type, 0);
+}
+
+static rb_fiber_t*
+fiber_t_alloc(VALUE fibval)
+{
+    rb_fiber_t *fib;
+    rb_thread_t *th = GET_THREAD();
+
+    THREAD_MUST_BE_RUNNING(th);
+    fib = ALLOC(rb_fiber_t);
+    memset(fib, 0, sizeof(rb_fiber_t));
+    fib->cont.self = fibval;
+    fib->cont.type = FIBER_CONTEXT;
+    cont_init(&fib->cont, th);
+    fib->prev = Qnil;
+    fib->status = CREATED;
+
+    DATA_PTR(fibval) = fib;
+
+    return fib;
+}
+
+static VALUE
+fiber_init(VALUE fibval, VALUE proc)
+{
+    rb_fiber_t *fib = fiber_t_alloc(fibval);
+    rb_context_t *cont = &fib->cont;
+    rb_thread_t *th = &cont->saved_thread;
+
+
+    /* initialize cont */
+    cont->vm_stack = 0;
+
+    th->stack = 0;
+    th->stack_size = 0;
+
+    fiber_link_join(fib);
+
+    th->stack_size = FIBER_VM_STACK_SIZE;
+    th->stack = ALLOC_N(VALUE, th->stack_size);
+
+    th->cfp = (void *)(th->stack + th->stack_size);
+    th->cfp--;
+    th->cfp->pc = 0;
+    th->cfp->sp = th->stack + 1;
+    th->cfp->bp = 0;
+    th->cfp->lfp = th->stack;
+    *th->cfp->lfp = 0;
+    th->cfp->dfp = th->stack;
+    th->cfp->self = Qnil;
+    th->cfp->flag = 0;
+    th->cfp->iseq = 0;
+    th->cfp->proc = 0;
+    th->cfp->block_iseq = 0;
+    th->cfp->me = 0;
+    th->tag = 0;
+    th->local_storage = st_init_numtable();
+
+    th->first_proc = proc;
+
+    MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
+
+    return fibval;
+}
+
+/* :nodoc: */
+static VALUE
+rb_fiber_init(VALUE fibval)
+{
+    return fiber_init(fibval, rb_block_proc());
+}
+
+VALUE
+rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
+{
+    return fiber_init(fiber_alloc(rb_cFiber), rb_proc_new(func, obj));
+}
+
+static VALUE
+return_fiber(void)
+{
+    rb_fiber_t *fib;
+    VALUE curr = rb_fiber_current();
+    GetFiberPtr(curr, fib);
+
+    if (fib->prev == Qnil) {
+	rb_thread_t *th = GET_THREAD();
+
+	if (th->root_fiber != curr) {
+	    return th->root_fiber;
+	}
+	else {
+	    rb_raise(rb_eFiberError, "can't yield from root fiber");
+	}
+    }
+    else {
+	VALUE prev = fib->prev;
+	fib->prev = Qnil;
+	return prev;
+    }
+}
+
+VALUE rb_fiber_transfer(VALUE fib, int argc, VALUE *argv);
+
+static void
+rb_fiber_terminate(rb_fiber_t *fib)
+{
+    VALUE value = fib->cont.value;
+    fib->status = TERMINATED;
+    rb_fiber_transfer(return_fiber(), 1, &value);
+}
+
+void
+rb_fiber_start(void)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_fiber_t *fib;
+    rb_context_t *cont;
+    rb_proc_t *proc;
+    int state;
+
+    GetFiberPtr(th->fiber, fib);
+    cont = &fib->cont;
+
+    TH_PUSH_TAG(th);
+    if ((state = EXEC_TAG()) == 0) {
+	int argc;
+	VALUE *argv, args;
+	GetProcPtr(cont->saved_thread.first_proc, proc);
+	args = cont->value;
+	argv = (argc = cont->argc) > 1 ? RARRAY_PTR(args) : &args;
+	cont->value = Qnil;
+	th->errinfo = Qnil;
+	th->local_lfp = proc->block.lfp;
+	th->local_svar = Qnil;
+
+	fib->status = RUNNING;
+	cont->value = rb_vm_invoke_proc(th, proc, proc->block.self, argc, argv, 0);
+    }
+    TH_POP_TAG();
+
+    if (state) {
+	if (state == TAG_RAISE) {
+	    th->thrown_errinfo = th->errinfo;
+	}
+	else {
+	    th->thrown_errinfo =
+	      rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
+	}
+	RUBY_VM_SET_INTERRUPT(th);
+    }
+
+    rb_fiber_terminate(fib);
+    rb_bug("rb_fiber_start: unreachable");
+}
+
+static rb_fiber_t *
+root_fiber_alloc(rb_thread_t *th)
+{
+    rb_fiber_t *fib;
+
+    /* no need to allocate vm stack */
+    fib = fiber_t_alloc(fiber_alloc(rb_cFiber));
+    fib->cont.type = ROOT_FIBER_CONTEXT;
+    fib->prev_fiber = fib->next_fiber = fib;
+
+    return fib;
+}
+
+VALUE
+rb_fiber_current(void)
+{
+    rb_thread_t *th = GET_THREAD();
+    if (th->fiber == 0) {
+	/* save root */
+	rb_fiber_t *fib = root_fiber_alloc(th);
+	th->root_fiber = th->fiber = fib->cont.self;
+    }
+    return th->fiber;
+}
+
+static VALUE
+fiber_store(rb_fiber_t *next_fib)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_fiber_t *fib;
+
+    if (th->fiber) {
+	GetFiberPtr(th->fiber, fib);
+	fib->cont.saved_thread = *th;
+    }
+    else {
+	/* create current fiber */
+	fib = root_fiber_alloc(th);
+	th->root_fiber = th->fiber = fib->cont.self;
+    }
+
+    cont_save_machine_stack(th, &fib->cont);
+
+    if (ruby_setjmp(fib->cont.jmpbuf)) {
+	/* restored */
+	GetFiberPtr(th->fiber, fib);
+	if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
+	return fib->cont.value;
+    }
+    else {
+	return Qundef;
+    }
+}
+
+static inline VALUE
+fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
+{
+    VALUE value;
+    rb_fiber_t *fib;
+    rb_context_t *cont;
+    rb_thread_t *th = GET_THREAD();
+
+    GetFiberPtr(fibval, fib);
+    cont = &fib->cont;
+
+    if (cont->saved_thread.self != th->self) {
+	rb_raise(rb_eFiberError, "fiber called across threads");
+    }
+    else if (cont->saved_thread.protect_tag != th->protect_tag) {
+	rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
+    }
+    else if (fib->status == TERMINATED) {
+	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
+	if (th->fiber != fibval) {
+	    GetFiberPtr(th->fiber, fib);
+	    if (fib->status != TERMINATED) rb_exc_raise(value);
+	    fibval = th->root_fiber;
+	}
+	else {
+	    fibval = fib->prev;
+	    if (NIL_P(fibval)) fibval = th->root_fiber;
+	}
+	GetFiberPtr(fibval, fib);
+	cont = &fib->cont;
+	cont->argc = -1;
+	cont->value = value;
+	cont_restore_0(cont, &value);
+    }
+
+    if (is_resume) {
+	fib->prev = rb_fiber_current();
+    }
+
+    cont->argc = argc;
+    cont->value = make_passing_arg(argc, argv);
+
+    if ((value = fiber_store(fib)) == Qundef) {
+	cont_restore_0(cont, &value);
+	rb_bug("rb_fiber_resume: unreachable");
+    }
+
+    RUBY_VM_CHECK_INTS();
+
+    return value;
+}
+
+VALUE
+rb_fiber_transfer(VALUE fib, int argc, VALUE *argv)
+{
+    return fiber_switch(fib, argc, argv, 0);
+}
+
+VALUE
+rb_fiber_resume(VALUE fibval, int argc, VALUE *argv)
+{
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
+
+    if (fib->prev != Qnil) {
+	rb_raise(rb_eFiberError, "double resume");
+    }
+
+    return fiber_switch(fibval, argc, argv, 1);
+}
+
+VALUE
+rb_fiber_yield(int argc, VALUE *argv)
+{
+    return rb_fiber_transfer(return_fiber(), argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     fiber.alive? -> true or false
+ *
+ *  Returns true if the fiber can still be resumed (or transferred to).
+ *  After finishing execution of the fiber block this method will always
+ *  return false.
+ */
+VALUE
+rb_fiber_alive_p(VALUE fibval)
+{
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
+    return fib->status != TERMINATED ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     fiber.resume(args, ...) -> obj
+ *
+ *  Resumes the fiber from the point at which the last <code>Fiber.yield</code>
+ *  was called, or starts running it if it is the first call to
+ *  <code>resume</code>. Arguments passed to resume will be the value of
+ *  the <code>Fiber.yield</code> expression or will be passed as block
+ *  parameters to the fiber's block if this is the first <code>resume</code>.
+ *
+ *  Alternatively, when resume is called it evaluates to the arguments passed
+ *  to the next <code>Fiber.yield</code> statement inside the fiber's block
+ *  or to the block value if it runs to completion without any
+ *  <code>Fiber.yield</code>
+ */
+static VALUE
+rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
+{
+    return rb_fiber_resume(fib, argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     fiber.transfer(args, ...) -> obj
+ *
+ *  Transfer control to another fiber, resuming it from where it last
+ *  stopped or starting it if it was not resumed before. The calling
+ *  fiber will be suspended much like in a call to <code>Fiber.yield</code>.
+ *
+ *  The fiber which receives the transfer call is treats it much like
+ *  a resume call. Arguments passed to transfer are treated like those
+ *  passed to resume.
+ *
+ *  You cannot resume a fiber that transferred control to another one.
+ *  This will cause a double resume error. You need to transfer control
+ *  back to this fiber before it can yield and resume.
+ */
+static VALUE
+rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fib)
+{
+    return rb_fiber_transfer(fib, argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     Fiber.yield(args, ...) -> obj
+ *
+ *  Yields control back to the context that resumed the fiber, passing
+ *  along any arguments that were passed to it. The fiber will resume
+ *  processing at this point when <code>resume</code> is called next.
+ *  Any arguments passed to the next <code>resume</code> will be the
+ *  value that this <code>Fiber.yield</code> expression evaluates to.
+ */
+static VALUE
+rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass)
+{
+    return rb_fiber_yield(argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     Fiber.current() -> fiber
+ *
+ *  Returns the current fiber. You need to <code>require 'fiber'</code>
+ *  before using this method. If you are not running in the context of
+ *  a fiber this method will return the root fiber.
+ */
+static VALUE
+rb_fiber_s_current(VALUE klass)
+{
+    return rb_fiber_current();
+}
+
+
+
+/*
+ *  Document-class: FiberError
+ *
+ *  Raised when an invalid operation is attempted on a Fiber, in
+ *  particular when attempting to call/resume a dead fiber,
+ *  attempting to yield from the root fiber, or calling a fiber across
+ *  threads.
+ *
+ *     fiber = Fiber.new{}
+ *     fiber.resume #=> nil
+ *     fiber.resume #=> FiberError: dead fiber called
+ */
+
+void
+Init_Cont(void)
+{
+    rb_cFiber = rb_define_class("Fiber", rb_cObject);
+    rb_define_alloc_func(rb_cFiber, fiber_alloc);
+    rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
+    rb_define_singleton_method(rb_cFiber, "yield", rb_fiber_s_yield, -1);
+    rb_define_method(rb_cFiber, "initialize", rb_fiber_init, 0);
+    rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
+}
+
+void
+ruby_Init_Continuation_body(void)
+{
+    rb_cContinuation = rb_define_class("Continuation", rb_cObject);
+    rb_undef_alloc_func(rb_cContinuation);
+    rb_undef_method(CLASS_OF(rb_cContinuation), "new");
+    rb_define_method(rb_cContinuation, "call", rb_cont_call, -1);
+    rb_define_method(rb_cContinuation, "[]", rb_cont_call, -1);
+    rb_define_global_function("callcc", rb_callcc, 0);
+}
+
+void
+ruby_Init_Fiber_as_Coroutine(void)
+{
+    rb_define_method(rb_cFiber, "transfer", rb_fiber_m_transfer, -1);
+    rb_define_method(rb_cFiber, "alive?", rb_fiber_alive_p, 0);
+    rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
+}
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 03208df11c..025f460c9c 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,14 +1,16 @@
 include Makefile
+-include uncommon.mk
 
 ENABLE_SHARED=@ENABLE_SHARED@
-DLLWRAP = @DLLWRAP@ --target=@target_os@
+DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
+WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED
 
 ifeq (@target_os@,cygwin)
-  DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
+  DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
 else
   DLL_BASE_NAME := $(RUBY_SO_NAME)
   DLLWRAP += -mno-cygwin
-  VPATH += $(srcdir)/win32
+  VPATH := $(VPATH):$(srcdir)/win32
 endif
 
 ifneq ($(ENABLE_SHARED),yes)
@@ -26,8 +28,9 @@ endif
 
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
+EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
+RUBYDEF = $(DLL_BASE_NAME).def
 
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
@@ -36,9 +39,9 @@ $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 
 %.res.@OBJEXT@: %.rc
-	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+	$(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG)
+$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
 	  -so_name=$(DLL_BASE_NAME) \
@@ -60,15 +63,22 @@ $(RUBY_EXP): $(LIBRUBY_A)
 GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 
 ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32/win32.h
+$(OBJS) $(MAINOBJ): win32.h
+
+dir.$(OBJEXT) win32.$(OBJEXT): win32/dir.h
 endif
 
+$(LIBRUBY_SO): $(RUBYDEF)
+
+$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
+	$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
+
+clean-local::
+	@$(RM) $(RUBYDEF)
+
 ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
-	@NM@ --extern --defined $(LIBRUBY_A) | \
-	  $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
-	@DLLWRAP@ -s --def=rubydll.def -o $@
-	@rm -f rubydll.def
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
+	@DLLWRAP@ -s --def=$(RUBYDEF) -o $@
 endif
 
 clean-local::
diff --git a/debug.c b/debug.c
new file mode 100644
index 0000000000..02fa9292a2
--- /dev/null
+++ b/debug.c
@@ -0,0 +1,164 @@
+/**********************************************************************
+
+  debug.c -
+
+  $Author$
+  created at: 04/08/25 02:31:54 JST
+
+  Copyright (C) 2004-2007 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+#include "ruby/util.h"
+#include "debug.h"
+#include "eval_intern.h"
+#include "vm_core.h"
+#include "id.h"
+
+/* for gdb */
+const union {
+    enum ruby_special_consts    special_consts;
+    enum ruby_value_type        value_type;
+    enum ruby_tag_type          tag_type;
+    enum node_type              node_type;
+    enum ruby_method_ids        method_ids;
+    enum {
+        RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX,
+        RUBY_ENCODING_SHIFT = ENCODING_SHIFT,
+        RUBY_ENC_CODERANGE_MASK    = ENC_CODERANGE_MASK,
+        RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN,
+        RUBY_ENC_CODERANGE_7BIT    = ENC_CODERANGE_7BIT,
+        RUBY_ENC_CODERANGE_VALID   = ENC_CODERANGE_VALID,
+        RUBY_ENC_CODERANGE_BROKEN  = ENC_CODERANGE_BROKEN,
+        RUBY_FL_MARK        = FL_MARK,
+        RUBY_FL_RESERVED    = FL_RESERVED,
+        RUBY_FL_FINALIZE    = FL_FINALIZE,
+        RUBY_FL_TAINT       = FL_TAINT,
+        RUBY_FL_UNTRUSTED   = FL_UNTRUSTED,
+        RUBY_FL_EXIVAR      = FL_EXIVAR,
+        RUBY_FL_FREEZE      = FL_FREEZE,
+        RUBY_FL_SINGLETON   = FL_SINGLETON,
+        RUBY_FL_USER0       = FL_USER0,
+        RUBY_FL_USER1       = FL_USER1,
+        RUBY_FL_USER2       = FL_USER2,
+        RUBY_FL_USER3       = FL_USER3,
+        RUBY_FL_USER4       = FL_USER4,
+        RUBY_FL_USER5       = FL_USER5,
+        RUBY_FL_USER6       = FL_USER6,
+        RUBY_FL_USER7       = FL_USER7,
+        RUBY_FL_USER8       = FL_USER8,
+        RUBY_FL_USER9       = FL_USER9,
+        RUBY_FL_USER10      = FL_USER10,
+        RUBY_FL_USER11      = FL_USER11,
+        RUBY_FL_USER12      = FL_USER12,
+        RUBY_FL_USER13      = FL_USER13,
+        RUBY_FL_USER14      = FL_USER14,
+        RUBY_FL_USER15      = FL_USER15,
+        RUBY_FL_USER16      = FL_USER16,
+        RUBY_FL_USER17      = FL_USER17,
+        RUBY_FL_USER18      = FL_USER18,
+        RUBY_FL_USHIFT      = FL_USHIFT,
+        RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
+        RUBY_NODE_TYPEMASK  = NODE_TYPEMASK,
+        RUBY_NODE_LSHIFT    = NODE_LSHIFT,
+        RUBY_NODE_FL_NEWLINE   = NODE_FL_NEWLINE
+    } various;
+} ruby_dummy_gdb_enums;
+
+const VALUE RUBY_FL_USER19    = FL_USER19;
+const SIGNED_VALUE RUBY_NODE_LMASK = NODE_LMASK;
+const VALUE RUBY_ENCODING_MASK  = ENCODING_MASK;
+
+int
+ruby_debug_print_indent(int level, int debug_level, int indent_level)
+{
+    if (level < debug_level) {
+	fprintf(stderr, "%*s", indent_level, "");
+	fflush(stderr);
+	return TRUE;
+    }
+    return FALSE;
+}
+
+void
+ruby_debug_printf(const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
+    va_end(ap);
+}
+
+VALUE
+ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj)
+{
+    if (level < debug_level) {
+	VALUE str;
+	str = rb_inspect(obj);
+	fprintf(stderr, "DBG> %s: %s\n", header,
+		obj == (VALUE)(SIGNED_VALUE)-1 ? "" : StringValueCStr(str));
+	fflush(stderr);
+    }
+    return obj;
+}
+
+void
+ruby_debug_print_v(VALUE v)
+{
+    ruby_debug_print_value(0, 1, "", v);
+}
+
+ID
+ruby_debug_print_id(int level, int debug_level, const char *header, ID id)
+{
+    if (level < debug_level) {
+	fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id));
+	fflush(stderr);
+    }
+    return id;
+}
+
+NODE *
+ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node)
+{
+    if (level < debug_level) {
+	fprintf(stderr, "DBG> %s: %s (%u)\n", header,
+		ruby_node_name(nd_type(node)), nd_line(node));
+    }
+    return (NODE *)node;
+}
+
+void
+ruby_debug_breakpoint(void)
+{
+    /* */
+}
+
+#ifdef RUBY_DEBUG_ENV
+static void
+set_debug_option(const char *str, int len, void *arg)
+{
+#define SET_WHEN(name, var) do {	    \
+	if (len == sizeof(name) - 1 &&	    \
+	    strncmp(str, name, len) == 0) { \
+	    extern int var;	    \
+	    var = 1;		    \
+	    return;			    \
+	}				    \
+    } while (0)
+    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr);
+    SET_WHEN("core", ruby_enable_coredump);
+#if defined _WIN32 && defined _MSC_VER && _MSC_VER >= 1400
+    SET_WHEN("rtc_error", ruby_w32_rtc_error);
+#endif
+    fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+}
+
+void
+ruby_set_debug_option(const char *str)
+{
+    ruby_each_words(str, set_debug_option, 0);
+}
+#endif
diff --git a/debug.h b/debug.h
new file mode 100644
index 0000000000..d5670651a4
--- /dev/null
+++ b/debug.h
@@ -0,0 +1,36 @@
+/**********************************************************************
+
+  debug.h - YARV Debug function interface
+
+  $Author$
+  created at: 04/08/25 02:33:49 JST
+
+  Copyright (C) 2004-2007 Koichi Sasada
+
+**********************************************************************/
+
+#ifndef RUBY_DEBUG_H
+#define RUBY_DEBUG_H
+
+#include "ruby/ruby.h"
+#include "node.h"
+
+#define dpv(h,v) ruby_debug_print_value(-1, 0, h, v)
+#define dp(v)    ruby_debug_print_value(-1, 0, "", v)
+#define dpi(i)   ruby_debug_print_id(-1, 0, "", i)
+#define dpn(n)   ruby_debug_print_node(-1, 0, "", n)
+
+#define bp()     ruby_debug_breakpoint()
+
+VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE v);
+ID    ruby_debug_print_id(int level, int debug_level, const char *header, ID id);
+NODE *ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node);
+int   ruby_debug_print_indent(int level, int debug_level, int indent_level);
+void  ruby_debug_breakpoint(void);
+void  ruby_debug_gc_check_func(void);
+
+#ifdef RUBY_DEBUG_ENV
+void ruby_set_debug_option(const char *str);
+#endif
+
+#endif /* RUBY_DEBUG_H */
diff --git a/defines.h b/defines.h
deleted file mode 100644
index 6b1fd68740..0000000000
--- a/defines.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/************************************************
-
-  defines.h -
-
-  $Author$
-  $Date$
-  created at: Wed May 18 00:21:44 JST 1994
-
-************************************************/
-#ifndef DEFINES_H
-#define DEFINES_H
-
-#define RUBY
-
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-
-#undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-
-#ifdef __cplusplus
-#define ANYARGS ...
-#else
-#define ANYARGS
-#endif
-
-#define xmalloc ruby_xmalloc
-#define xcalloc ruby_xcalloc
-#define xrealloc ruby_xrealloc
-#define xfree ruby_xfree
-
-void *xmalloc _((long));
-void *xcalloc _((long,long));
-void *xrealloc _((void*,long));
-void xfree _((void*));
-
-#if SIZEOF_LONG_LONG > 0
-# define LONG_LONG long long
-#elif SIZEOF___INT64 > 0
-# define HAVE_LONG_LONG 1
-# define LONG_LONG __int64
-# undef SIZEOF_LONG_LONG
-# define SIZEOF_LONG_LONG SIZEOF___INT64
-#endif
-
-#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned LONG_LONG
-# define BDIGIT_DBL_SIGNED LONG_LONG
-#elif SIZEOF_INT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS SIZEOF_SHORT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#else
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#endif
-
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
-#define DOSISH 1
-#ifndef _WIN32_WCE
-# define DOSISH_DRIVE_LETTER
-#endif
-#endif
-
-/* define RUBY_USE_EUC/SJIS for default kanji-code */
-#ifndef DEFAULT_KCODE
-#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
-#define DEFAULT_KCODE KCODE_SJIS
-#else
-#define DEFAULT_KCODE KCODE_EUC
-#endif
-#endif
-
-#ifdef __NeXT__
-/* NextStep, OpenStep, Rhapsody */
-#ifndef S_IRUSR
-#define S_IRUSR 0000400        /* read permission, owner */
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 0000040        /* read permission, group */
-#endif
-#ifndef S_IROTH
-#define S_IROTH 0000004        /* read permission, other */
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR 0000200        /* write permission, owner */
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 0000020        /* write permission, group */
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 0000002        /* write permission, other */
-#endif
-#ifndef S_IXUSR
-#define S_IXUSR 0000100        /* execute/search permission, owner */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0000010        /* execute/search permission, group */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0000001        /* execute/search permission, other */
-#endif
-#ifndef S_IRWXU
-#define S_IRWXU 0000700        /* read, write, execute permissions, owner */
-#endif
-#ifndef S_IRWXG
-#define S_IRWXG 0000070        /* read, write, execute permissions, group */
-#endif
-#ifndef S_IRWXO
-#define S_IRWXO 0000007        /* read, write, execute permissions, other */
-#endif
-#ifndef S_ISBLK
-#define S_ISBLK(mode)  (((mode) & (0170000)) == (0060000))
-#endif
-#ifndef S_ISCHR
-#define S_ISCHR(mode)  (((mode) & (0170000)) == (0020000))
-#endif
-#ifndef S_ISDIR
-#define S_ISDIR(mode)  (((mode) & (0170000)) == (0040000))
-#endif
-#ifndef S_ISFIFO
-#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000))
-#endif
-#ifndef S_ISREG
-#define S_ISREG(mode)  (((mode) & (0170000)) == (0100000))
-#endif
-/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
-   result in a different endian.  Instead trust __BIG_ENDIAN__ and
-   __LITTLE_ENDIAN__ which are set correctly by -arch. */
-#undef WORDS_BIGENDIAN
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN
-#endif
-#ifndef __APPLE__
-/* NextStep, OpenStep (but not Rhapsody) */
-#ifndef GETPGRP_VOID
-#define GETPGRP_VOID 1
-#endif
-#ifndef WNOHANG
-#define WNOHANG 01
-#endif
-#ifndef WUNTRACED
-#define WUNTRACED 02
-#endif
-#ifndef X_OK
-#define X_OK 1
-#endif
-#endif /* __APPLE__ */
-#endif /* NeXT */
-
-#ifdef _WIN32
-#include "win32/win32.h"
-#endif
-
-#if defined(__VMS)
-#include "vms.h"
-#endif
-
-#if defined(__BEOS__)
-#include <net/socket.h> /* intern.h needs fd_set definition */
-#endif
-
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#endif
-
-#ifndef EXTERN
-#define EXTERN RUBY_EXTERN	/* deprecated */
-#endif
-
-#ifndef RUBY_MBCHAR_MAXSIZE
-#define RUBY_MBCHAR_MAXSIZE INT_MAX
-        /* MB_CUR_MAX will not work well in C locale */
-#endif
-
-#if defined(sparc) || defined(__sparc__)
-static inline void
-flush_register_windows(void)
-{
-    asm
-#ifdef __GNUC__
-	volatile
-#endif
-# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
-	("flushw")
-# else
-	("ta  0x03")
-# endif /* trap always to flush register windows if we are on a Sparc system */
-	;
-}
-#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
-#elif defined(__ia64)
-void *rb_ia64_bsp(void);
-void rb_ia64_flushrs(void);
-#  define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
-#else
-#  define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif
-
-#if defined(DOSISH)
-#define PATH_SEP ";"
-#elif defined(riscos)
-#define PATH_SEP ","
-#else
-#define PATH_SEP ":"
-#endif
-#define PATH_SEP_CHAR PATH_SEP[0]
-
-#if defined(__human68k__)
-#define PATH_ENV "path"
-#else
-#define PATH_ENV "PATH"
-#endif
-
-#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
-#define ENV_IGNORECASE
-#endif
-
-#ifndef DLEXT_MAXLEN
-#define DLEXT_MAXLEN 4
-#endif
-
-#ifndef RUBY_PLATFORM
-#define RUBY_PLATFORM "unknown-unknown"
-#endif
-
-#endif
diff --git a/defs/keywords b/defs/keywords
new file mode 100644
index 0000000000..1b5719aa85
--- /dev/null
+++ b/defs/keywords
@@ -0,0 +1,53 @@
+%{
+struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word(const char *, unsigned int);
+#ifndef RIPPER
+static const struct kwtable *reserved_word(const char *, unsigned int);
+#define rb_reserved_word(str, len) reserved_word(str, len)
+%}
+
+struct kwtable;
+%%
+__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
+__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
+__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
+BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
+END, {keyword_END, keyword_END}, EXPR_END
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME
+and, {keyword_and, keyword_and}, EXPR_VALUE
+begin, {keyword_begin, keyword_begin}, EXPR_BEG
+break, {keyword_break, keyword_break}, EXPR_MID
+case, {keyword_case, keyword_case}, EXPR_VALUE
+class, {keyword_class, keyword_class}, EXPR_CLASS
+def, {keyword_def, keyword_def}, EXPR_FNAME
+defined?, {keyword_defined, keyword_defined}, EXPR_ARG
+do, {keyword_do, keyword_do}, EXPR_BEG
+else, {keyword_else, keyword_else}, EXPR_BEG
+elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
+end, {keyword_end, keyword_end}, EXPR_END
+ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
+false, {keyword_false, keyword_false}, EXPR_END
+for, {keyword_for, keyword_for}, EXPR_VALUE
+if, {keyword_if, modifier_if}, EXPR_VALUE
+in, {keyword_in, keyword_in}, EXPR_VALUE
+module, {keyword_module, keyword_module}, EXPR_VALUE
+next, {keyword_next, keyword_next}, EXPR_MID
+nil, {keyword_nil, keyword_nil}, EXPR_END
+not, {keyword_not, keyword_not}, EXPR_ARG
+or, {keyword_or, keyword_or}, EXPR_VALUE
+redo, {keyword_redo, keyword_redo}, EXPR_END
+rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
+retry, {keyword_retry, keyword_retry}, EXPR_END
+return, {keyword_return, keyword_return}, EXPR_MID
+self, {keyword_self, keyword_self}, EXPR_END
+super, {keyword_super, keyword_super}, EXPR_ARG
+then, {keyword_then, keyword_then}, EXPR_BEG
+true, {keyword_true, keyword_true}, EXPR_END
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME
+unless, {keyword_unless, modifier_unless}, EXPR_VALUE
+until, {keyword_until, modifier_until}, EXPR_VALUE
+when, {keyword_when, keyword_when}, EXPR_VALUE
+while, {keyword_while, modifier_while}, EXPR_VALUE
+yield, {keyword_yield, keyword_yield}, EXPR_ARG
+%%
+#endif
diff --git a/defs/known_errors.def b/defs/known_errors.def
new file mode 100644
index 0000000000..3cebe90a8e
--- /dev/null
+++ b/defs/known_errors.def
@@ -0,0 +1,145 @@
+EPERM
+ENOENT
+ESRCH
+EINTR
+EIO
+ENXIO
+E2BIG
+ENOEXEC
+EBADF
+ECHILD
+EAGAIN
+ENOMEM
+EACCES
+EFAULT
+ENOTBLK
+EBUSY
+EEXIST
+EXDEV
+ENODEV
+ENOTDIR
+EISDIR
+EINVAL
+ENFILE
+EMFILE
+ENOTTY
+ETXTBSY
+EFBIG
+ENOSPC
+ESPIPE
+EROFS
+EMLINK
+EPIPE
+EDOM
+ERANGE
+EDEADLK
+ENAMETOOLONG
+ENOLCK
+ENOSYS
+ENOTEMPTY
+ELOOP
+EWOULDBLOCK
+ENOMSG
+EIDRM
+ECHRNG
+EL2NSYNC
+EL3HLT
+EL3RST
+ELNRNG
+EUNATCH
+ENOCSI
+EL2HLT
+EBADE
+EBADR
+EXFULL
+ENOANO
+EBADRQC
+EBADSLT
+EDEADLOCK
+EBFONT
+ENOSTR
+ENODATA
+ETIME
+ENOSR
+ENONET
+ENOPKG
+EREMOTE
+ENOLINK
+EADV
+ESRMNT
+ECOMM
+EPROTO
+EMULTIHOP
+EDOTDOT
+EBADMSG
+EOVERFLOW
+ENOTUNIQ
+EBADFD
+EREMCHG
+ELIBACC
+ELIBBAD
+ELIBSCN
+ELIBMAX
+ELIBEXEC
+EILSEQ
+ERESTART
+ESTRPIPE
+EUSERS
+ENOTSOCK
+EDESTADDRREQ
+EMSGSIZE
+EPROTOTYPE
+ENOPROTOOPT
+EPROTONOSUPPORT
+ESOCKTNOSUPPORT
+EOPNOTSUPP
+EPFNOSUPPORT
+EAFNOSUPPORT
+EADDRINUSE
+EADDRNOTAVAIL
+ENETDOWN
+ENETUNREACH
+ENETRESET
+ECONNABORTED
+ECONNRESET
+ENOBUFS
+EISCONN
+ENOTCONN
+ESHUTDOWN
+ETOOMANYREFS
+ETIMEDOUT
+ECONNREFUSED
+EHOSTDOWN
+EHOSTUNREACH
+EALREADY
+EINPROGRESS
+ESTALE
+EUCLEAN
+ENOTNAM
+ENAVAIL
+EISNAM
+EREMOTEIO
+EDQUOT
+ECANCELED
+EKEYEXPIRED
+EKEYREJECTED
+EKEYREVOKED
+EMEDIUMTYPE
+ENOKEY
+ENOMEDIUM
+ENOTRECOVERABLE
+EOWNERDEAD
+ERFKILL
+EAUTH
+EBADRPC
+EDOOFUS
+EFTYPE
+ENEEDAUTH
+ENOATTR
+ENOTSUP
+EPROCLIM
+EPROCUNAVAIL
+EPROGMISMATCH
+EPROGUNAVAIL
+ERPCMISMATCH
+EIPSEC
diff --git a/defs/lex.c.src b/defs/lex.c.src
new file mode 100644
index 0000000000..1b5719aa85
--- /dev/null
+++ b/defs/lex.c.src
@@ -0,0 +1,53 @@
+%{
+struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word(const char *, unsigned int);
+#ifndef RIPPER
+static const struct kwtable *reserved_word(const char *, unsigned int);
+#define rb_reserved_word(str, len) reserved_word(str, len)
+%}
+
+struct kwtable;
+%%
+__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
+__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
+__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
+BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
+END, {keyword_END, keyword_END}, EXPR_END
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME
+and, {keyword_and, keyword_and}, EXPR_VALUE
+begin, {keyword_begin, keyword_begin}, EXPR_BEG
+break, {keyword_break, keyword_break}, EXPR_MID
+case, {keyword_case, keyword_case}, EXPR_VALUE
+class, {keyword_class, keyword_class}, EXPR_CLASS
+def, {keyword_def, keyword_def}, EXPR_FNAME
+defined?, {keyword_defined, keyword_defined}, EXPR_ARG
+do, {keyword_do, keyword_do}, EXPR_BEG
+else, {keyword_else, keyword_else}, EXPR_BEG
+elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
+end, {keyword_end, keyword_end}, EXPR_END
+ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
+false, {keyword_false, keyword_false}, EXPR_END
+for, {keyword_for, keyword_for}, EXPR_VALUE
+if, {keyword_if, modifier_if}, EXPR_VALUE
+in, {keyword_in, keyword_in}, EXPR_VALUE
+module, {keyword_module, keyword_module}, EXPR_VALUE
+next, {keyword_next, keyword_next}, EXPR_MID
+nil, {keyword_nil, keyword_nil}, EXPR_END
+not, {keyword_not, keyword_not}, EXPR_ARG
+or, {keyword_or, keyword_or}, EXPR_VALUE
+redo, {keyword_redo, keyword_redo}, EXPR_END
+rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
+retry, {keyword_retry, keyword_retry}, EXPR_END
+return, {keyword_return, keyword_return}, EXPR_MID
+self, {keyword_self, keyword_self}, EXPR_END
+super, {keyword_super, keyword_super}, EXPR_ARG
+then, {keyword_then, keyword_then}, EXPR_BEG
+true, {keyword_true, keyword_true}, EXPR_END
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME
+unless, {keyword_unless, modifier_unless}, EXPR_VALUE
+until, {keyword_until, modifier_until}, EXPR_VALUE
+when, {keyword_when, keyword_when}, EXPR_VALUE
+while, {keyword_while, modifier_while}, EXPR_VALUE
+yield, {keyword_yield, keyword_yield}, EXPR_ARG
+%%
+#endif
diff --git a/defs/opt_insn_unif.def b/defs/opt_insn_unif.def
new file mode 100644
index 0000000000..1ac613dbea
--- /dev/null
+++ b/defs/opt_insn_unif.def
@@ -0,0 +1,29 @@
+#
+# a definition of instruction unification
+#
+#
+
+__END__
+
+putobject putobject
+putobject putstring
+putobject setlocal
+putobject setdynamic
+
+putstring putstring
+putstring putobject
+putstring setlocal
+putstring setdynamic
+
+# putnil end
+
+dup setlocal
+
+# from tarai
+getlocal getlocal
+# getlocal send
+
+# from tak, ackermann
+getlocal putobject
+
+
diff --git a/defs/opt_operand.def b/defs/opt_operand.def
new file mode 100644
index 0000000000..5ca1d74028
--- /dev/null
+++ b/defs/opt_operand.def
@@ -0,0 +1,59 @@
+#
+# configration file for operand union optimization
+#
+# format:
+#   [insn name] op1, op2 ...
+#
+#  wildcard: *
+#
+
+__END__
+
+getlocal 2
+getlocal 3
+getlocal 4
+
+setlocal 2
+setlocal 3
+setlocal 4
+
+getdynamic *, 0
+getdynamic 1, 0
+getdynamic 2, 0
+getdynamic 3, 0
+getdynamic 4, 0
+
+setdynamic *, 0
+setdynamic 1, 0
+setdynamic 2, 0
+setdynamic 3, 0
+setdynamic 4, 0
+
+putobject INT2FIX(0)
+putobject INT2FIX(1)
+putobject Qtrue
+putobject Qfalse
+
+# CALL
+send *, *, Qfalse, 0, *
+send *, 0, Qfalse, 0, *
+send *, 1, Qfalse, 0, *
+send *, 2, Qfalse, 0, *
+send *, 3, Qfalse, 0, *
+
+# FCALL
+send *, *, Qfalse, 0x04, *
+send *, 0, Qfalse, 0x04, *
+send *, 1, Qfalse, 0x04, *
+send *, 2, Qfalse, 0x04, *
+send *, 3, Qfalse, 0x04, *
+
+# VCALL
+send *, 0, Qfalse, 0x0c, *
+
+
+__END__
+
+
+
+
diff --git a/dir.c b/dir.c
index 0dd12ffd7d..0339697279 100644
--- a/dir.c
+++ b/dir.c
@@ -3,16 +3,16 @@
   dir.c -
 
   $Author$
-  $Date$
   created at: Wed Jan  5 09:51:01 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -56,23 +56,25 @@ char *getenv();
 #endif
 
 #ifndef HAVE_STRING_H
-char *strchr _((char*,char));
+char *strchr(char*,char);
 #endif
 
 #include <ctype.h>
 
-#include "util.h"
+#include "ruby/util.h"
 
 #if !defined HAVE_LSTAT && !defined lstat
 #define lstat stat
 #endif
 
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-#   define CASEFOLD_FILESYSTEM 1
-# else
-#   define CASEFOLD_FILESYSTEM 0
-# endif
+/* define system APIs */
+#ifdef _WIN32
+#undef chdir
+#define chdir(p) rb_w32_uchdir(p)
+#undef mkdir
+#define mkdir(p, m) rb_w32_umkdir(p, m)
+#undef rmdir
+#define rmdir(p) rb_w32_urmdir(p)
 #endif
 
 #define FNM_NOESCAPE	0x01
@@ -88,102 +90,25 @@ char *strchr _((char*,char));
 #define FNM_NOMATCH	1
 #define FNM_ERROR	2
 
-#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
-#define compare(c1, c2) (((unsigned char)(c1)) - ((unsigned char)(c2)))
-
-/* caution: in case *p == '\0'
-   Next(p) == p + 1 in single byte environment
-   Next(p) == p     in multi byte environment
-*/
-#if defined(CharNext)
-# define Next(p) CharNext(p)
-#elif defined(DJGPP)
-# define Next(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
-#elif defined(__EMX__)
-# define Next(p) ((p) + emx_mblen(p))
-static inline int
-emx_mblen(const char *p)
-{
-    int n = mblen(p, RUBY_MBCHAR_MAXSIZE);
-    return (n < 0) ? 1 : n;
-}
-#endif
-
-#ifndef Next /* single byte environment */
-# define Next(p) ((p) + 1)
-# define Inc(p) (++(p))
-# define Compare(p1, p2) (compare(downcase(*(p1)), downcase(*(p2))))
-#else /* multi byte environment */
-# define Inc(p) ((p) = Next(p))
-# define Compare(p1, p2) (CompareImpl(p1, p2, nocase))
-static int
-CompareImpl(const char *p1, const char *p2, int nocase)
-{
-    const int len1 = Next(p1) - p1;
-    const int len2 = Next(p2) - p2;
-#ifdef _WIN32
-    char buf1[10], buf2[10]; /* large enough? */
-#endif
-
-    if (len1 < 0 || len2 < 0) {
-	rb_fatal("CompareImpl: negative len");
-    }
-
-    if (len1 == 0) return  len2;
-    if (len2 == 0) return -len1;
-
-#ifdef _WIN32
-    if (nocase && rb_w32_iswinnt()) {
-	if (len1 > 1) {
-	    if (len1 >= sizeof(buf1)) {
-		rb_fatal("CompareImpl: too large len");
-	    }
-	    memcpy(buf1, p1, len1);
-	    buf1[len1] = '\0';
-	    CharLower(buf1);
-	    p1 = buf1; /* trick */
-	}
-	if (len2 > 1) {
-	    if (len2 >= sizeof(buf2)) {
-		rb_fatal("CompareImpl: too large len");
-	    }
-	    memcpy(buf2, p2, len2);
-	    buf2[len2] = '\0';
-	    CharLower(buf2);
-	    p2 = buf2; /* trick */
-	}
-    }
-#endif
-    if (len1 == 1)
-	if (len2 == 1)
-	    return compare(downcase(*p1), downcase(*p2));
-	else {
-	    const int ret = compare(downcase(*p1), *p2);
-	    return ret ? ret : -1;
-	}
-    else
-	if (len2 == 1) {
-	    const int ret = compare(*p1, downcase(*p2));
-	    return ret ? ret : 1;
-	}
-	else {
-	    const int ret = memcmp(p1, p2, len1 < len2 ? len1 : len2);
-	    return ret ? ret : len1 - len2;
-	}
-}
-#endif /* environment */
+# define Next(p, e, enc) (p + rb_enc_mbclen(p, e, enc))
+# define Inc(p, e, enc) ((p) = Next(p, e, enc))
 
 static char *
-bracket(p, s, flags)
-    const char *p; /* pattern (next to '[') */
-    const char *s; /* string */
-    int flags;
+bracket(
+    const char *p, /* pattern (next to '[') */
+    const char *pend,
+    const char *s, /* string */
+    const char *send,
+    int flags,
+    rb_encoding *enc)
 {
     const int nocase = flags & FNM_CASEFOLD;
     const int escape = !(flags & FNM_NOESCAPE);
-
+    unsigned int c1, c2;
+    int r;
     int ok = 0, not = 0;
 
+    if (p >= pend) return NULL;
     if (*p == '!' || *p == '^') {
 	not = 1;
 	p++;
@@ -195,20 +120,43 @@ bracket(p, s, flags)
 	    t1++;
 	if (!*t1)
 	    return NULL;
-	p = Next(t1);
+	p = t1 + (r = rb_enc_mbclen(t1, pend, enc));
+	if (p >= pend) return NULL;
 	if (p[0] == '-' && p[1] != ']') {
 	    const char *t2 = p + 1;
+	    int r2;
 	    if (escape && *t2 == '\\')
 		t2++;
 	    if (!*t2)
 		return NULL;
-	    p = Next(t2);
-	    if (!ok && Compare(t1, s) <= 0 && Compare(s, t2) <= 0)
+	    p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
+	    if (ok) continue;
+	    if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
+		(r2 <= (send-s) && memcmp(t2, s, r) == 0)) {
 		ok = 1;
+		continue;
+	    }
+	    c1 = rb_enc_codepoint(s, send, enc);
+	    if (nocase) c1 = rb_enc_toupper(c1, enc);
+	    c2 = rb_enc_codepoint(t1, pend, enc);
+	    if (nocase) c2 = rb_enc_toupper(c2, enc);
+	    if (c1 < c2) continue;
+	    c2 = rb_enc_codepoint(t2, pend, enc);
+	    if (nocase) c2 = rb_enc_toupper(c2, enc);
+	    if (c1 > c2) continue;
 	}
-	else
-	    if (!ok && Compare(t1, s) == 0)
+	else {
+	    if (ok) continue;
+	    if (r <= (send-s) && memcmp(t1, s, r) == 0) {
 		ok = 1;
+		continue;
+	    }
+	    if (!nocase) continue;
+	    c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc);
+	    c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc);
+	    if (c1 != c2) continue;
+	}
+	ok = 1;
     }
 
     return ok == not ? NULL : (char *)p + 1;
@@ -224,10 +172,11 @@ bracket(p, s, flags)
 #define RETURN(val) return *pcur = p, *scur = s, (val);
 
 static int
-fnmatch_helper(pcur, scur, flags)
-    const char **pcur; /* pattern */
-    const char **scur; /* string */
-    int flags;
+fnmatch_helper(
+    const char **pcur, /* pattern */
+    const char **scur, /* string */
+    int flags,
+    rb_encoding *enc)
 {
     const int period = !(flags & FNM_DOTMATCH);
     const int pathname = flags & FNM_PATHNAME;
@@ -238,7 +187,11 @@ fnmatch_helper(pcur, scur, flags)
     const char *stmp = 0;
 
     const char *p = *pcur;
+    const char *pend = p + strlen(p);
     const char *s = *scur;
+    const char *send = s + strlen(s);
+
+    int r;
 
     if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
 	RETURN(FNM_NOMATCH);
@@ -261,16 +214,16 @@ fnmatch_helper(pcur, scur, flags)
 	    if (ISEND(s))
 		RETURN(FNM_NOMATCH);
 	    p++;
-	    Inc(s);
+	    Inc(s, send, enc);
 	    continue;
 
 	  case '[': {
 	    const char *t;
 	    if (ISEND(s))
 		RETURN(FNM_NOMATCH);
-	    if (t = bracket(p + 1, s, flags)) {
+	    if ((t = bracket(p + 1, pend, s, send, flags, enc)) != 0) {
 		p = t;
-		Inc(s);
+		Inc(s, send, enc);
 		continue;
 	    }
 	    goto failed;
@@ -283,16 +236,26 @@ fnmatch_helper(pcur, scur, flags)
 	    RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
 	if (ISEND(p))
 	    goto failed;
-	if (Compare(p, s) != 0)
+	r = rb_enc_precise_mbclen(p, pend, enc);
+	if (!MBCLEN_CHARFOUND_P(r))
+	    goto failed;
+	if (r <= (send-s) && memcmp(p, s, r) == 0) {
+	    p += r;
+	    s += r;
+	    continue;
+	}
+	if (!nocase) goto failed;
+	if (rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc) !=
+	    rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc))
 	    goto failed;
-	Inc(p);
-	Inc(s);
+	p += r;
+	Inc(s, send, enc);
 	continue;
 
       failed: /* try next '*' position */
 	if (ptmp && stmp) {
 	    p = ptmp;
-	    Inc(stmp); /* !ISEND(*stmp) */
+	    Inc(stmp, send, enc); /* !ISEND(*stmp) */
 	    s = stmp;
 	    continue;
 	}
@@ -301,11 +264,15 @@ fnmatch_helper(pcur, scur, flags)
 }
 
 static int
-fnmatch(p, s, flags)
-    const char *p; /* pattern */
-    const char *s; /* string */
-    int flags;
+fnmatch(
+    const char *pattern,
+    rb_encoding *enc,
+    const char *string,
+    int flags)
 {
+    const char *p = pattern;
+    const char *s = string;
+    const char *send = s + strlen(string);
     const int period = !(flags & FNM_DOTMATCH);
     const int pathname = flags & FNM_PATHNAME;
 
@@ -319,8 +286,8 @@ fnmatch(p, s, flags)
 		ptmp = p;
 		stmp = s;
 	    }
-	    if (fnmatch_helper(&p, &s, flags) == 0) {
-		while (*s && *s != '/') Inc(s);
+	    if (fnmatch_helper(&p, &s, flags, enc) == 0) {
+		while (*s && *s != '/') Inc(s, send, enc);
 		if (*p && *s) {
 		    p++;
 		    s++;
@@ -331,7 +298,7 @@ fnmatch(p, s, flags)
 	    }
 	    /* failed : try next recursion */
 	    if (ptmp && stmp && !(period && *stmp == '.')) {
-		while (*stmp && *stmp != '/') Inc(stmp);
+		while (*stmp && *stmp != '/') Inc(stmp, send, enc);
 		if (*stmp) {
 		    p = ptmp;
 		    stmp++;
@@ -343,39 +310,65 @@ fnmatch(p, s, flags)
 	}
     }
     else
-	return fnmatch_helper(&p, &s, flags);
+	return fnmatch_helper(&p, &s, flags, enc);
 }
 
 VALUE rb_cDir;
 
 struct dir_data {
     DIR *dir;
-    char *path;
+    VALUE path;
+    rb_encoding *enc;
 };
 
 static void
-free_dir(dir)
-    struct dir_data *dir;
+dir_mark(void *ptr)
+{
+    struct dir_data *dir = ptr;
+    rb_gc_mark(dir->path);
+}
+
+static void
+dir_free(void *ptr)
 {
+    struct dir_data *dir = ptr;
     if (dir) {
 	if (dir->dir) closedir(dir->dir);
-	if (dir->path) free(dir->path);
     }
-    free(dir);
+    xfree(dir);
 }
 
-static VALUE dir_close _((VALUE));
+static size_t
+dir_memsize(const void *ptr)
+{
+    return ptr ? sizeof(struct dir_data) : 0;
+}
+
+static const rb_data_type_t dir_data_type = {
+    "dir",
+    dir_mark, dir_free, dir_memsize
+};
+
+static VALUE dir_close(VALUE);
+
+#define GlobPathValue(str, safe) \
+    /* can contain null bytes as separators */	\
+    (!RB_TYPE_P(str, T_STRING) ?		\
+     FilePathValue(str) :			\
+     (check_safe_glob(str, safe),		\
+      check_glob_encoding(str), (str)))
+#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0)
+#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding()))
 
-static VALUE dir_s_alloc _((VALUE));
 static VALUE
-dir_s_alloc(klass)
-    VALUE klass;
+dir_s_alloc(VALUE klass)
 {
     struct dir_data *dirp;
-    VALUE obj = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dirp);
+    VALUE obj = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dirp);
 
     dirp->dir = NULL;
-    dirp->path = NULL;
+    dirp->path = Qnil;
+    dirp->enc = NULL;
 
     return obj;
 }
@@ -387,36 +380,58 @@ dir_s_alloc(klass)
  *  Returns a new directory object for the named directory.
  */
 static VALUE
-dir_initialize(dir, dirname)
-    VALUE dir, dirname;
+dir_initialize(int argc, VALUE *argv, VALUE dir)
 {
     struct dir_data *dp;
+    rb_encoding  *fsenc;
+    VALUE dirname, opt;
+    static VALUE sym_enc;
 
-    SafeStringValue(dirname);
-    Data_Get_Struct(dir, struct dir_data, dp);
+    if (!sym_enc) {
+	sym_enc = ID2SYM(rb_intern("encoding"));
+    }
+    fsenc = rb_filesystem_encoding();
+
+    rb_scan_args(argc, argv, "11", &dirname, &opt);
+
+    if (!NIL_P(opt)) {
+        VALUE v, enc=Qnil;
+        opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
+
+        v = rb_hash_aref(opt, sym_enc);
+        if (!NIL_P(v)) enc = v;
+
+	if (!NIL_P(enc)) {
+	    fsenc = rb_to_encoding(enc);
+	}
+    }
+
+    GlobPathValue(dirname, FALSE);
+
+    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp);
     if (dp->dir) closedir(dp->dir);
-    if (dp->path) free(dp->path);
     dp->dir = NULL;
-    dp->path = NULL;
-    dp->dir = opendir(RSTRING(dirname)->ptr);
+    dp->path = Qnil;
+    dp->enc = fsenc;
+    dp->dir = opendir(RSTRING_PTR(dirname));
     if (dp->dir == NULL) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    dp->dir = opendir(RSTRING(dirname)->ptr);
+	    dp->dir = opendir(RSTRING_PTR(dirname));
 	}
 	if (dp->dir == NULL) {
-	    rb_sys_fail(RSTRING(dirname)->ptr);
+	    rb_sys_fail(RSTRING_PTR(dirname));
 	}
     }
-    dp->path = strdup(RSTRING(dirname)->ptr);
+    dp->path = rb_str_dup_frozen(dirname);
 
     return dir;
 }
 
 /*
  *  call-seq:
- *     Dir.open( string ) => aDir
- *     Dir.open( string ) {| aDir | block } => anObject
+ *     Dir.open( string ) -> aDir
+ *     Dir.open( string ) {| aDir | block } -> anObject
  *
  *  With no block, <code>open</code> is a synonym for
  *  <code>Dir::new</code>. If a block is present, it is passed
@@ -424,15 +439,13 @@ dir_initialize(dir, dirname)
  *  the block, and <code>Dir::open</code> returns the value of the
  *  block.
  */
-
 static VALUE
-dir_s_open(klass, dirname)
-    VALUE klass, dirname;
+dir_s_open(int argc, VALUE *argv, VALUE klass)
 {
     struct dir_data *dp;
-    VALUE dir = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dp);
+    VALUE dir = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dp);
 
-    dir_initialize(dir, dirname);
+    dir_initialize(argc, argv, dir);
     if (rb_block_given_p()) {
 	return rb_ensure(rb_yield, dir, dir_close, dir);
     }
@@ -441,52 +454,48 @@ dir_s_open(klass, dirname)
 }
 
 static void
-dir_closed()
+dir_closed(void)
 {
     rb_raise(rb_eIOError, "closed directory");
 }
 
-static void
-dir_check(dir)
-    VALUE dir;
+static struct dir_data *
+dir_check(VALUE dir)
 {
-    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
+    struct dir_data *dirp;
+    if (!OBJ_UNTRUSTED(dir) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: operation on trusted Dir");
     rb_check_frozen(dir);
+    dirp = rb_check_typeddata(dir, &dir_data_type);
+    if (!dirp->dir) dir_closed();
+    return dirp;
 }
 
-#define GetDIR(obj, dirp) do {\
-    dir_check(dir);\
-    Data_Get_Struct(obj, struct dir_data, dirp);\
-    if (dirp->dir == NULL) dir_closed();\
-} while (0)
+#define GetDIR(obj, dirp) (dirp = dir_check(obj))
+
 
 /*
  *  call-seq:
- *     dir.inspect => string
+ *     dir.inspect -> string
  *
  *  Return a string describing this Dir object.
  */
 static VALUE
-dir_inspect(dir)
-    VALUE dir;
+dir_inspect(VALUE dir)
 {
     struct dir_data *dirp;
 
-    GetDIR(dir, dirp);
-    if (dirp->path) {
-	char *c = rb_obj_classname(dir);
-	int len = strlen(c) + strlen(dirp->path) + 4;
-	VALUE s = rb_str_new(0, len);
-	snprintf(RSTRING_PTR(s), len+1, "#<%s:%s>", c, dirp->path);
-	return s;
+    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
+    if (!NIL_P(dirp->path)) {
+	const char *c = rb_obj_classname(dir);
+	return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(dirp->path));
     }
     return rb_funcall(dir, rb_intern("to_s"), 0, 0);
 }
 
 /*
  *  call-seq:
- *     dir.path => string or nil
+ *     dir.path -> string or nil
  *
  *  Returns the path parameter passed to <em>dir</em>'s constructor.
  *
@@ -494,19 +503,64 @@ dir_inspect(dir)
  *     d.path   #=> ".."
  */
 static VALUE
-dir_path(dir)
-    VALUE dir;
+dir_path(VALUE dir)
 {
     struct dir_data *dirp;
 
-    GetDIR(dir, dirp);
-    if (!dirp->path) return Qnil;
-    return rb_str_new2(dirp->path);
+    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
+    if (NIL_P(dirp->path)) return Qnil;
+    return rb_str_dup(dirp->path);
 }
 
+#if defined HAVE_READDIR_R
+# define READDIR(dir, enc, entry, dp) (readdir_r(dir, entry, &(dp)) == 0 && dp != 0)
+#elif defined _WIN32
+# define READDIR(dir, enc, entry, dp) ((dp = rb_w32_readdir_with_enc(dir, enc)) != 0)
+#else
+# define READDIR(dir, enc, entry, dp) ((dp = readdir(dir)) != 0)
+#endif
+#if defined HAVE_READDIR_R
+# define IF_HAVE_READDIR_R(something) something
+#else
+# define IF_HAVE_READDIR_R(something) /* nothing */
+#endif
+
+#if defined SIZEOF_STRUCT_DIRENT_TOO_SMALL
+# include <limits.h>
+# define NAME_MAX_FOR_STRUCT_DIRENT 255
+# if defined NAME_MAX
+#  if NAME_MAX_FOR_STRUCT_DIRENT < NAME_MAX
+#   undef  NAME_MAX_FOR_STRUCT_DIRENT
+#   define NAME_MAX_FOR_STRUCT_DIRENT NAME_MAX
+#  endif
+# endif
+# if defined _POSIX_NAME_MAX
+#  if NAME_MAX_FOR_STRUCT_DIRENT < _POSIX_NAME_MAX
+#   undef  NAME_MAX_FOR_STRUCT_DIRENT
+#   define NAME_MAX_FOR_STRUCT_DIRENT _POSIX_NAME_MAX
+#  endif
+# endif
+# if defined _XOPEN_NAME_MAX
+#  if NAME_MAX_FOR_STRUCT_DIRENT < _XOPEN_NAME_MAX
+#   undef  NAME_MAX_FOR_STRUCT_DIRENT
+#   define NAME_MAX_FOR_STRUCT_DIRENT _XOPEN_NAME_MAX
+#  endif
+# endif
+# define DEFINE_STRUCT_DIRENT \
+  union { \
+    struct dirent dirent; \
+    char dummy[offsetof(struct dirent, d_name) + \
+	       NAME_MAX_FOR_STRUCT_DIRENT + 1]; \
+  }
+# define STRUCT_DIRENT(entry) ((entry).dirent)
+#else
+# define DEFINE_STRUCT_DIRENT struct dirent
+# define STRUCT_DIRENT(entry) (entry)
+#endif
+
 /*
  *  call-seq:
- *     dir.read => string or nil
+ *     dir.read -> string or nil
  *
  *  Reads the next entry from <em>dir</em> and returns it as a string.
  *  Returns <code>nil</code> at the end of the stream.
@@ -517,17 +571,16 @@ dir_path(dir)
  *     d.read   #=> "config.h"
  */
 static VALUE
-dir_read(dir)
-    VALUE dir;
+dir_read(VALUE dir)
 {
     struct dir_data *dirp;
     struct dirent *dp;
+    IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
 
     GetDIR(dir, dirp);
     errno = 0;
-    dp = readdir(dirp->dir);
-    if (dp) {
-	return rb_tainted_str_new(dp->d_name, NAMLEN(dp));
+    if (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
+	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
     else if (errno == 0) {	/* end of stream */
 	return Qnil;
@@ -540,11 +593,14 @@ dir_read(dir)
 
 /*
  *  call-seq:
- *     dir.each { |filename| block }  => dir
+ *     dir.each { |filename| block }  -> dir
+ *     dir.each                       -> an_enumerator
  *
  *  Calls the block once for each entry in this directory, passing the
  *  filename of each entry as a parameter to the block.
  *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     d = Dir.new("testdir")
  *     d.each  {|x| puts "Got #{x}" }
  *
@@ -556,25 +612,27 @@ dir_read(dir)
  *     Got main.rb
  */
 static VALUE
-dir_each(dir)
-    VALUE dir;
+dir_each(VALUE dir)
 {
     struct dir_data *dirp;
     struct dirent *dp;
+    IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
 
+    RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
-    for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
-	rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
+    while (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
+	rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc));
 	if (dirp->dir == NULL) dir_closed();
     }
     return dir;
 }
 
+#ifdef HAVE_TELLDIR
 /*
  *  call-seq:
- *     dir.pos => integer
- *     dir.tell => integer
+ *     dir.pos -> integer
+ *     dir.tell -> integer
  *
  *  Returns the current position in <em>dir</em>. See also
  *  <code>Dir#seek</code>.
@@ -585,24 +643,23 @@ dir_each(dir)
  *     d.tell   #=> 12
  */
 static VALUE
-dir_tell(dir)
-    VALUE dir;
+dir_tell(VALUE dir)
 {
-#ifdef HAVE_TELLDIR
     struct dir_data *dirp;
     long pos;
 
     GetDIR(dir, dirp);
     pos = telldir(dirp->dir);
     return rb_int2inum(pos);
+}
 #else
-    rb_notimplement();
+#define dir_tell rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_SEEKDIR
 /*
  *  call-seq:
- *     dir.seek( integer ) => dir
+ *     dir.seek( integer ) -> dir
  *
  *  Seeks to a particular location in <em>dir</em>. <i>integer</i>
  *  must be a value returned by <code>Dir#tell</code>.
@@ -615,24 +672,22 @@ dir_tell(dir)
  *     d.read                   #=> ".."
  */
 static VALUE
-dir_seek(dir, pos)
-    VALUE dir, pos;
+dir_seek(VALUE dir, VALUE pos)
 {
     struct dir_data *dirp;
-    off_t p = NUM2OFFT(pos);
+    long p = NUM2LONG(pos);
 
     GetDIR(dir, dirp);
-#ifdef HAVE_SEEKDIR
     seekdir(dirp->dir, p);
     return dir;
+}
 #else
-    rb_notimplement();
+#define dir_seek rb_f_notimplement
 #endif
-}
 
 /*
  *  call-seq:
- *     dir.pos( integer ) => integer
+ *     dir.pos( integer ) -> integer
  *
  *  Synonym for <code>Dir#seek</code>, but returns the position
  *  parameter.
@@ -645,8 +700,7 @@ dir_seek(dir, pos)
  *     d.read                   #=> ".."
  */
 static VALUE
-dir_set_pos(dir, pos)
-    VALUE dir, pos;
+dir_set_pos(VALUE dir, VALUE pos)
 {
     dir_seek(dir, pos);
     return pos;
@@ -654,7 +708,7 @@ dir_set_pos(dir, pos)
 
 /*
  *  call-seq:
- *     dir.rewind => dir
+ *     dir.rewind -> dir
  *
  *  Repositions <em>dir</em> to the first entry.
  *
@@ -664,12 +718,11 @@ dir_set_pos(dir, pos)
  *     d.read     #=> "."
  */
 static VALUE
-dir_rewind(dir)
-    VALUE dir;
+dir_rewind(VALUE dir)
 {
     struct dir_data *dirp;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
+    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(dir)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
     }
     GetDIR(dir, dirp);
@@ -679,7 +732,7 @@ dir_rewind(dir)
 
 /*
  *  call-seq:
- *     dir.close => nil
+ *     dir.close -> nil
  *
  *  Closes the directory stream. Any further attempts to access
  *  <em>dir</em> will raise an <code>IOError</code>.
@@ -688,8 +741,7 @@ dir_rewind(dir)
  *     d.close   #=> nil
  */
 static VALUE
-dir_close(dir)
-    VALUE dir;
+dir_close(VALUE dir)
 {
     struct dir_data *dirp;
 
@@ -701,11 +753,11 @@ dir_close(dir)
 }
 
 static void
-dir_chdir(path)
-    VALUE path;
+dir_chdir(VALUE path)
 {
-    if (chdir(RSTRING(path)->ptr) < 0)
-	rb_sys_fail(RSTRING(path)->ptr);
+    path = rb_str_encode_ospath(path);
+    if (chdir(RSTRING_PTR(path)) < 0)
+	rb_sys_fail(RSTRING_PTR(path));
 }
 
 static int chdir_blocking = 0;
@@ -717,11 +769,10 @@ struct chdir_data {
 };
 
 static VALUE
-chdir_yield(args)
-    struct chdir_data *args;
+chdir_yield(struct chdir_data *args)
 {
     dir_chdir(args->new_path);
-    args->done = Qtrue;
+    args->done = TRUE;
     chdir_blocking++;
     if (chdir_thread == Qnil)
 	chdir_thread = rb_thread_current();
@@ -729,8 +780,7 @@ chdir_yield(args)
 }
 
 static VALUE
-chdir_restore(args)
-    struct chdir_data *args;
+chdir_restore(struct chdir_data *args)
 {
     if (args->done) {
 	chdir_blocking--;
@@ -743,8 +793,8 @@ chdir_restore(args)
 
 /*
  *  call-seq:
- *     Dir.chdir( [ string] ) => 0
- *     Dir.chdir( [ string] ) {| path | block }  => anObject
+ *     Dir.chdir( [ string] ) -> 0
+ *     Dir.chdir( [ string] ) {| path | block }  -> anObject
  *
  *  Changes the current working directory of the process to the given
  *  string. When called without an argument, changes the directory to
@@ -781,16 +831,13 @@ chdir_restore(args)
  *     /var/spool/mail
  */
 static VALUE
-dir_s_chdir(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 {
     VALUE path = Qnil;
 
     rb_secure(2);
     if (rb_scan_args(argc, argv, "01", &path) == 1) {
-	SafeStringValue(path);
+	FilePathValue(path);
     }
     else {
 	const char *dist = getenv("HOME");
@@ -810,9 +857,9 @@ dir_s_chdir(argc, argv, obj)
 	struct chdir_data args;
 	char *cwd = my_getcwd();
 
-	args.old_path = rb_tainted_str_new2(cwd); free(cwd);
+	args.old_path = rb_tainted_str_new2(cwd); xfree(cwd);
 	args.new_path = path;
-	args.done = Qfalse;
+	args.done = FALSE;
 	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
     }
     dir_chdir(path);
@@ -820,10 +867,25 @@ dir_s_chdir(argc, argv, obj)
     return INT2FIX(0);
 }
 
+VALUE
+rb_dir_getwd(void)
+{
+    char *path;
+    VALUE cwd;
+
+    rb_secure(4);
+    path = my_getcwd();
+    cwd = rb_tainted_str_new2(path);
+    rb_enc_associate(cwd, rb_filesystem_encoding());
+
+    xfree(path);
+    return cwd;
+}
+
 /*
  *  call-seq:
- *     Dir.getwd => string
- *     Dir.pwd => string
+ *     Dir.getwd -> string
+ *     Dir.pwd -> string
  *
  *  Returns the path to the current working directory of this process as
  *  a string.
@@ -832,38 +894,28 @@ dir_s_chdir(argc, argv, obj)
  *     Dir.getwd           #=> "/tmp"
  */
 static VALUE
-dir_s_getwd(dir)
-    VALUE dir;
+dir_s_getwd(VALUE dir)
 {
-    char *path;
-    VALUE cwd;
-
-    rb_secure(4);
-    path = my_getcwd();
-    cwd = rb_tainted_str_new2(path);
-
-    free(path);
-    return cwd;
+    return rb_dir_getwd();
 }
 
-static void check_dirname _((volatile VALUE *));
 static void
-check_dirname(dir)
-    volatile VALUE *dir;
+check_dirname(volatile VALUE *dir)
 {
     char *path, *pend;
 
-    SafeStringValue(*dir);
     rb_secure(2);
-    path = RSTRING(*dir)->ptr;
+    FilePathValue(*dir);
+    path = RSTRING_PTR(*dir);
     if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
 	*dir = rb_str_new(path, pend - path);
     }
 }
 
+#if defined(HAVE_CHROOT)
 /*
  *  call-seq:
- *     Dir.chroot( string ) => 0
+ *     Dir.chroot( string ) -> 0
  *
  *  Changes this process's idea of the file system root. Only a
  *  privileged process may make this call. Not available on all
@@ -871,25 +923,23 @@ check_dirname(dir)
  *  information.
  */
 static VALUE
-dir_s_chroot(dir, path)
-    VALUE dir, path;
+dir_s_chroot(VALUE dir, VALUE path)
 {
-#if defined(HAVE_CHROOT) && !defined(__CHECKER__)
     check_dirname(&path);
 
-    if (chroot(RSTRING(path)->ptr) == -1)
-	rb_sys_fail(RSTRING(path)->ptr);
+    path = rb_str_encode_ospath(path);
+    if (chroot(RSTRING_PTR(path)) == -1)
+	rb_sys_fail(RSTRING_PTR(path));
 
     return INT2FIX(0);
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define dir_s_chroot rb_f_notimplement
 #endif
-}
 
 /*
  *  call-seq:
- *     Dir.mkdir( string [, integer] ) => 0
+ *     Dir.mkdir( string [, integer] ) -> 0
  *
  *  Makes a new directory named by <i>string</i>, with permissions
  *  specified by the optional parameter <i>anInteger</i>. The
@@ -901,10 +951,7 @@ dir_s_chroot(dir, path)
  *
  */
 static VALUE
-dir_s_mkdir(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 {
     VALUE path, vmode;
     int mode;
@@ -917,45 +964,47 @@ dir_s_mkdir(argc, argv, obj)
     }
 
     check_dirname(&path);
-    if (mkdir(RSTRING(path)->ptr, mode) == -1)
-	rb_sys_fail(RSTRING(path)->ptr);
+    path = rb_str_encode_ospath(path);
+    if (mkdir(RSTRING_PTR(path), mode) == -1)
+	rb_sys_fail(RSTRING_PTR(path));
 
     return INT2FIX(0);
 }
 
 /*
  *  call-seq:
- *     Dir.delete( string ) => 0
- *     Dir.rmdir( string ) => 0
- *     Dir.unlink( string ) => 0
+ *     Dir.delete( string ) -> 0
+ *     Dir.rmdir( string ) -> 0
+ *     Dir.unlink( string ) -> 0
  *
  *  Deletes the named directory. Raises a subclass of
  *  <code>SystemCallError</code> if the directory isn't empty.
  */
 static VALUE
-dir_s_rmdir(obj, dir)
-    VALUE obj, dir;
+dir_s_rmdir(VALUE obj, VALUE dir)
 {
     check_dirname(&dir);
-    if (rmdir(RSTRING(dir)->ptr) < 0)
-	rb_sys_fail(RSTRING(dir)->ptr);
+    dir = rb_str_encode_ospath(dir);
+    if (rmdir(RSTRING_PTR(dir)) < 0)
+	rb_sys_fail(RSTRING_PTR(dir));
 
     return INT2FIX(0);
 }
 
-static void
-sys_warning_1(mesg)
-    const char* mesg;
+static VALUE
+sys_warning_1(VALUE mesg)
 {
-    rb_sys_warning("%s", mesg);
+    rb_sys_warning("%s", (const char *)mesg);
+    return Qnil;
 }
 
-#define GLOB_VERBOSE	(1UL << (sizeof(int) * CHAR_BIT - 1))
+#define GLOB_VERBOSE	(1U << (sizeof(int) * CHAR_BIT - 1))
 #define sys_warning(val) \
-    (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
+    (void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0))
 
 #define GLOB_ALLOC(type) (type *)malloc(sizeof(type))
 #define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
+#define GLOB_FREE(ptr) free(ptr)
 #define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
 
 /*
@@ -998,17 +1047,14 @@ do_opendir(const char *path, int flags)
 
 /* Return nonzero if S has any special globbing chars in it.  */
 static int
-has_magic(s, flags)
-    const char *s;
-    int flags;
+has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const int nocase = flags & FNM_CASEFOLD;
 
-    register const char *p = s;
     register char c;
 
-    while (c = *p++) {
+    while (p < pend && (c = *p++) != 0) {
 	switch (c) {
 	  case '*':
 	  case '?':
@@ -1025,7 +1071,7 @@ has_magic(s, flags)
 		return 1;
 	}
 
-	p = Next(p-1);
+	p = Next(p-1, pend, enc);
     }
 
     return 0;
@@ -1033,15 +1079,14 @@ has_magic(s, flags)
 
 /* Find separator in globbing pattern. */
 static char *
-find_dirsep(const char *s, int flags)
+find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
 
-    register const char *p = s;
     register char c;
     int open = 0;
 
-    while (c = *p++) {
+    while ((c = *p++) != 0) {
 	switch (c) {
 	  case '[':
 	    open = 1;
@@ -1061,7 +1106,7 @@ find_dirsep(const char *s, int flags)
 	    continue;
 	}
 
-	p = Next(p-1);
+	p = Next(p-1, pend, enc);
     }
 
     return (char *)p-1;
@@ -1069,9 +1114,9 @@ find_dirsep(const char *s, int flags)
 
 /* Remove escaping backslashes */
 static void
-remove_backslashes(p)
-    char *p;
+remove_backslashes(char *p, rb_encoding *enc)
 {
+    register const char *pend = p + strlen(p);
     char *t = p;
     char *s = p;
 
@@ -1083,7 +1128,7 @@ remove_backslashes(p)
 	    s = ++p;
 	    if (!*p) break;
 	}
-	Inc(p);
+	Inc(p, pend, enc);
     }
 
     while (*p++);
@@ -1104,31 +1149,41 @@ struct glob_pattern {
 static void glob_free_pattern(struct glob_pattern *list);
 
 static struct glob_pattern *
-glob_make_pattern(const char *p, int flags)
+glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 {
     struct glob_pattern *list, *tmp, **tail = &list;
     int dirsep = 0; /* pattern is terminated with '/' */
 
-    while (*p) {
+    while (p < e && *p) {
 	tmp = GLOB_ALLOC(struct glob_pattern);
 	if (!tmp) goto error;
 	if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
 	    /* fold continuous RECURSIVEs (needed in glob_helper) */
-	    do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
+	    do { p += 3; while (*p == '/') p++; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
 	    tmp->type = RECURSIVE;
 	    tmp->str = 0;
 	    dirsep = 1;
 	}
 	else {
-	    const char *m = find_dirsep(p, flags);
-	    char *buf = GLOB_ALLOC_N(char, m-p+1);
+	    const char *m = find_dirsep(p, e, flags, enc);
+	    int magic = has_magic(p, m, flags, enc);
+	    char *buf;
+
+	    if (!magic && *m) {
+		const char *m2;
+		while (!has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) &&
+		       *m2) {
+		    m = m2;
+		}
+	    }
+	    buf = GLOB_ALLOC_N(char, m-p+1);
 	    if (!buf) {
-		free(tmp);
+		GLOB_FREE(tmp);
 		goto error;
 	    }
 	    memcpy(buf, p, m-p);
 	    buf[m-p] = '\0';
-	    tmp->type = has_magic(buf, flags) ? MAGICAL : PLAIN;
+	    tmp->type = magic ? MAGICAL : PLAIN;
 	    tmp->str = buf;
 	    if (*m) {
 		dirsep = 1;
@@ -1165,8 +1220,8 @@ glob_free_pattern(struct glob_pattern *list)
 	struct glob_pattern *tmp = list;
 	list = list->next;
 	if (tmp->str)
-	    free(tmp->str);
-	free(tmp);
+	    GLOB_FREE(tmp->str);
+	GLOB_FREE(tmp);
     }
 }
 
@@ -1174,20 +1229,25 @@ static char *
 join_path(const char *path, int dirsep, const char *name)
 {
     long len = strlen(path);
-    char *buf = GLOB_ALLOC_N(char, len+strlen(name)+(dirsep?1:0)+1);
+    long len2 = strlen(name)+(dirsep?1:0)+1;
+    char *buf = GLOB_ALLOC_N(char, len+len2);
 
     if (!buf) return 0;
     memcpy(buf, path, len);
     if (dirsep) {
-	strcpy(buf+len, "/");
-	len++;
+	buf[len++] = '/';
     }
-    strcpy(buf+len, name);
+    buf[len] = '\0';
+    strlcat(buf+len, name, len2);
     return buf;
 }
 
 enum answer { YES, NO, UNKNOWN };
 
+#ifndef S_ISDIR
+#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
 #ifndef S_ISLNK
 #  ifndef S_IFLNK
 #    define S_ISLNK(m) (0)
@@ -1196,43 +1256,36 @@ enum answer { YES, NO, UNKNOWN };
 #  endif
 #endif
 
-#ifndef S_ISDIR
-#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
-#endif
-
 struct glob_args {
-    void (*func) _((const char*, VALUE));
-    const char *c;
-    VALUE v;
+    void (*func)(const char *, VALUE, void *);
+    const char *path;
+    VALUE value;
+    rb_encoding *enc;
 };
 
-static VALUE glob_func_caller _((VALUE));
-
 static VALUE
-glob_func_caller(val)
-    VALUE val;
+glob_func_caller(VALUE val)
 {
     struct glob_args *args = (struct glob_args *)val;
 
-    (*args->func)(args->c, args->v);
+    (*args->func)(args->path, args->value, args->enc);
     return Qnil;
 }
 
-#define glob_call_func(func, path, arg) (*func)(path, arg)
-
-static int glob_helper _((const char *, int, enum answer, enum answer, struct glob_pattern **, struct glob_pattern **, int, ruby_glob_func *, VALUE));
+#define glob_call_func(func, path, arg, enc) (*func)(path, arg, enc)
 
 static int
-glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
-    const char *path;
-    int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
-    enum answer exist; /* Does 'path' indicate an existing entry? */
-    enum answer isdir; /* Does 'path' indicate a directory or a symlink to a directory? */
-    struct glob_pattern **beg;
-    struct glob_pattern **end;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+glob_helper(
+    const char *path,
+    int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
+    enum answer exist, /* Does 'path' indicate an existing entry? */
+    enum answer isdir, /* Does 'path' indicate a directory or a symlink to a directory? */
+    struct glob_pattern **beg,
+    struct glob_pattern **end,
+    int flags,
+    ruby_glob_func *func,
+    VALUE arg,
+    rb_encoding *enc)
 {
     struct stat st;
     int status = 0;
@@ -1247,19 +1300,19 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 	    p = p->next;
 	}
 	switch (p->type) {
-	case PLAIN:
+	  case PLAIN:
 	    plain = 1;
 	    break;
-	case MAGICAL:
+	  case MAGICAL:
 	    magical = 1;
 	    break;
-	case MATCH_ALL:
+	  case MATCH_ALL:
 	    match_all = 1;
 	    break;
-	case MATCH_DIR:
+	  case MATCH_DIR:
 	    match_dir = 1;
 	    break;
-	case RECURSIVE:
+	  case RECURSIVE:
 	    rb_bug("continuous RECURSIVEs");
 	}
     }
@@ -1286,14 +1339,14 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 	    }
 	}
 	if (match_all && exist == YES) {
-	    status = glob_call_func(func, path, arg);
+	    status = glob_call_func(func, path, arg, enc);
 	    if (status) return status;
 	}
 	if (match_dir && isdir == YES) {
 	    char *tmp = join_path(path, dirsep, "");
 	    if (!tmp) return -1;
-	    status = glob_call_func(func, tmp, arg);
-	    free(tmp);
+	    status = glob_call_func(func, tmp, arg, enc);
+	    GLOB_FREE(tmp);
 	    if (status) return status;
 	}
     }
@@ -1302,10 +1355,12 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 
     if (magical || recursive) {
 	struct dirent *dp;
-	DIR *dirp = do_opendir(*path ? path : ".", flags);
+	DIR *dirp;
+	IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
+	dirp = do_opendir(*path ? path : ".", flags);
 	if (dirp == NULL) return 0;
 
-	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
+	while (READDIR(dirp, enc, &STRUCT_DIRENT(entry), dp)) {
 	    char *buf = join_path(path, dirsep, dp->d_name);
 	    enum answer new_isdir = UNKNOWN;
 
@@ -1314,7 +1369,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 		break;
 	    }
 	    if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
-		&& fnmatch("*", dp->d_name, flags) == 0) {
+		&& fnmatch("*", rb_usascii_encoding(), dp->d_name, flags) == 0) {
 #ifndef _WIN32
 		if (do_lstat(buf, &st, flags) == 0)
 		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
@@ -1327,6 +1382,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 
 	    new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
 	    if (!new_beg) {
+		GLOB_FREE(buf);
 		status = -1;
 		break;
 	    }
@@ -1339,14 +1395,15 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 		    p = p->next; /* 0 times recursion */
 		}
 		if (p->type == PLAIN || p->type == MAGICAL) {
-		    if (fnmatch(p->str, dp->d_name, flags) == 0)
+		    if (fnmatch(p->str, enc, dp->d_name, flags) == 0)
 			*new_end++ = p->next;
 		}
 	    }
 
-	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end, flags, func, arg);
-	    free(buf);
-	    free(new_beg);
+	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end,
+				 flags, func, arg, enc);
+	    GLOB_FREE(buf);
+	    GLOB_FREE(new_beg);
 	    if (status) break;
 	}
 
@@ -1364,59 +1421,57 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 	    if (*cur) {
 		char *buf;
 		char *name;
-		name = GLOB_ALLOC_N(char, strlen((*cur)->str) + 1);
+		size_t len = strlen((*cur)->str) + 1;
+		name = GLOB_ALLOC_N(char, len);
 		if (!name) {
 		    status = -1;
 		    break;
 		}
-		strcpy(name, (*cur)->str);
-		if (escape) remove_backslashes(name);
+		memcpy(name, (*cur)->str, len);
+		if (escape) remove_backslashes(name, enc);
 
 		new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
 		if (!new_beg) {
-		    free(name);
+		    GLOB_FREE(name);
 		    status = -1;
 		    break;
 		}
 		*new_end++ = (*cur)->next;
 		for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
-		    if (*cur2 && fnmatch((*cur2)->str, name, flags) == 0) {
+		    if (*cur2 && fnmatch((*cur2)->str, enc, name, flags) == 0) {
 			*new_end++ = (*cur2)->next;
 			*cur2 = 0;
 		    }
 		}
 
 		buf = join_path(path, dirsep, name);
-		free(name);
+		GLOB_FREE(name);
 		if (!buf) {
-		    free(new_beg);
+		    GLOB_FREE(new_beg);
 		    status = -1;
 		    break;
 		}
-		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg, new_end, flags, func, arg);
-		free(buf);
-		free(new_beg);
+		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg,
+				     new_end, flags, func, arg, enc);
+		GLOB_FREE(buf);
+		GLOB_FREE(new_beg);
 		if (status) break;
 	    }
 	}
 
-	free(copy_beg);
+	GLOB_FREE(copy_beg);
     }
 
     return status;
 }
 
 static int
-ruby_glob0(path, flags, func, arg)
-    const char *path;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
 {
     struct glob_pattern *list;
     const char *root, *start;
     char *buf;
-    int n;
+    size_t n;
     int status;
 
     start = root = path;
@@ -1433,90 +1488,75 @@ ruby_glob0(path, flags, func, arg)
     MEMCPY(buf, start, char, n);
     buf[n] = '\0';
 
-    list = glob_make_pattern(root, flags);
+    list = glob_make_pattern(root, root + strlen(root), flags, enc);
     if (!list) {
-	free(buf);
+	GLOB_FREE(buf);
 	return -1;
     }
-    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg);
+    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc);
     glob_free_pattern(list);
-    free(buf);
+    GLOB_FREE(buf);
 
     return status;
 }
 
 int
-ruby_glob(path, flags, func, arg)
-    const char *path;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg);
+    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
+		      rb_ascii8bit_encoding());
 }
 
-static int rb_glob_caller _((const char *, VALUE));
-
 static int
-rb_glob_caller(path, a)
-    const char *path;
-    VALUE a;
+rb_glob_caller(const char *path, VALUE a, void *enc)
 {
     int status;
     struct glob_args *args = (struct glob_args *)a;
 
-    args->c = path;
+    args->path = path;
     rb_protect(glob_func_caller, a, &status);
     return status;
 }
 
 static int
-rb_glob2(path, flags, func, arg)
-    const char *path;
-    int flags;
-    void (*func) _((const char *, VALUE));
-    VALUE arg;
+rb_glob2(const char *path, int flags,
+	 void (*func)(const char *, VALUE, void *), VALUE arg,
+	 rb_encoding* enc)
 {
     struct glob_args args;
 
     args.func = func;
-    args.v = arg;
+    args.value = arg;
+    args.enc = enc;
 
     if (flags & FNM_SYSCASE) {
 	rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
     }
 
-    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args,
+		      enc);
 }
 
 void
-rb_glob(path, func, arg)
-    const char *path;
-    void (*func) _((const char*, VALUE));
-    VALUE arg;
+rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
 {
-    int status = rb_glob2(path, 0, func, arg);
+    int status = rb_glob2(path, 0, func, arg, rb_ascii8bit_encoding());
     if (status) GLOB_JUMP_TAG(status);
 }
 
-static void push_pattern _((const char* path, VALUE ary));
 static void
-push_pattern(path, ary)
-    const char *path;
-    VALUE ary;
+push_pattern(const char *path, VALUE ary, void *enc)
 {
-    rb_ary_push(ary, rb_tainted_str_new2(path));
+    rb_ary_push(ary, rb_external_str_new_with_enc(path, strlen(path), enc));
 }
 
-int
-ruby_brace_expand(str, flags, func, arg)
-    const char *str;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+static int
+ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
+		  rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const char *p = str;
+    const char *pend = p + strlen(p);
     const char *s = p;
     const char *lbrace = 0, *rbrace = 0;
     int nest = 0, status = 0;
@@ -1532,11 +1572,12 @@ ruby_brace_expand(str, flags, func, arg)
 	if (*p == '\\' && escape) {
 	    if (!*++p) break;
 	}
-	Inc(p);
+	Inc(p, pend, enc);
     }
 
     if (lbrace && rbrace) {
-	char *buf = GLOB_ALLOC_N(char, strlen(s) + 1);
+	size_t len = strlen(s) + 1;
+	char *buf = GLOB_ALLOC_N(char, len);
 	long shift;
 
 	if (!buf) return -1;
@@ -1552,17 +1593,17 @@ ruby_brace_expand(str, flags, func, arg)
 		if (*p == '\\' && escape) {
 		    if (++p == rbrace) break;
 		}
-		Inc(p);
+		Inc(p, pend, enc);
 	    }
 	    memcpy(buf+shift, t, p-t);
-	    strcpy(buf+shift+(p-t), rbrace+1);
-	    status = ruby_brace_expand(buf, flags, func, arg);
+	    strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
+	    status = ruby_brace_expand(buf, flags, func, arg, enc);
 	    if (status) break;
 	}
-	free(buf);
+	GLOB_FREE(buf);
     }
     else if (!lbrace && !rbrace) {
-	status = (*func)(s, arg);
+	status = (*func)(s, arg, enc);
     }
 
     return status;
@@ -1574,84 +1615,84 @@ struct brace_args {
     int flags;
 };
 
-static int glob_brace _((const char *, VALUE));
 static int
-glob_brace(path, val)
-    const char *path;
-    VALUE val;
+glob_brace(const char *path, VALUE val, void *enc)
 {
     struct brace_args *arg = (struct brace_args *)val;
 
-    return ruby_glob0(path, arg->flags, arg->func, arg->value);
+    return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
 }
 
 static int
-ruby_brace_glob0(str, flags, func, arg)
-    const char *str;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg,
+		 rb_encoding* enc)
 {
     struct brace_args args;
 
     args.func = func;
     args.value = arg;
     args.flags = flags;
-    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args);
+    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc);
 }
 
 int
-ruby_brace_glob(str, flags, func, arg)
-    const char *str;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg);
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg,
+			    rb_ascii8bit_encoding());
+}
+
+int
+ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
+{
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg, enc);
 }
 
 static int
-push_glob(VALUE ary, const char *str, int flags)
+push_glob(VALUE ary, VALUE str, int flags)
 {
     struct glob_args args;
+    rb_encoding *enc = rb_enc_get(str);
 
+    if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
     args.func = push_pattern;
-    args.v = ary;
-    return ruby_brace_glob0(str, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+    args.value = ary;
+    args.enc = enc;
+
+    RB_GC_GUARD(str);
+    return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
+			    rb_glob_caller, (VALUE)&args, enc);
 }
 
 static VALUE
-rb_push_glob(str, flags) /* '\0' is delimiter */
-    VALUE str;
-    int flags;
+rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
 {
     long offset = 0;
     VALUE ary;
 
+    GlobPathValue(str, TRUE);
     ary = rb_ary_new();
-    SafeStringValue(str);
 
     while (offset < RSTRING_LEN(str)) {
-	int status = push_glob(ary, RSTRING(str)->ptr + offset, flags);
 	char *p, *pend;
+	int status;
+	p = RSTRING_PTR(str) + offset;
+	status = push_glob(ary, rb_enc_str_new(p, strlen(p), rb_enc_get(str)),
+			   flags);
 	if (status) GLOB_JUMP_TAG(status);
 	if (offset >= RSTRING_LEN(str)) break;
-	p = RSTRING(str)->ptr + offset;
 	p += strlen(p) + 1;
-	pend = RSTRING(str)->ptr + RSTRING_LEN(str);
+	pend = RSTRING_PTR(str) + RSTRING_LEN(str);
 	while (p < pend && !*p)
 	    p++;
-	offset = p - RSTRING(str)->ptr;
+	offset = p - RSTRING_PTR(str);
     }
 
     return ary;
 }
 
 static VALUE
-dir_globs(argc, argv, flags)
-    long argc;
-    VALUE *argv;
-    int flags;
+dir_globs(long argc, VALUE *argv, int flags)
 {
     VALUE ary = rb_ary_new();
     long i;
@@ -1659,8 +1700,8 @@ dir_globs(argc, argv, flags)
     for (i = 0; i < argc; ++i) {
 	int status;
 	VALUE str = argv[i];
-	StringValue(str);
-	status = push_glob(ary, RSTRING(str)->ptr, flags);
+	GlobPathValue(str, TRUE);
+	status = push_glob(ary, str, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }
 
@@ -1669,27 +1710,27 @@ dir_globs(argc, argv, flags)
 
 /*
  *  call-seq:
- *     Dir[ array ]                 => array
- *     Dir[ string [, string ...] ] => array
+ *     Dir[ array ]                 -> array
+ *     Dir[ string [, string ...] ] -> array
  *
  *  Equivalent to calling
- *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and 
+ *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and
  *  <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
  *
  */
 static VALUE
 dir_s_aref(int argc, VALUE *argv, VALUE obj)
- {
+{
     if (argc == 1) {
 	return rb_push_glob(argv[0], 0);
     }
     return dir_globs(argc, argv, 0);
- }
+}
 
 /*
  *  call-seq:
- *     Dir.glob( pattern, [flags] ) => array
- *     Dir.glob( pattern, [flags] ) {| filename | block }  => nil
+ *     Dir.glob( pattern, [flags] ) -> array
+ *     Dir.glob( pattern, [flags] ) {| filename | block }  -> nil
  *
  *  Returns the filenames found by expanding <i>pattern</i> which is
  *  an +Array+ of the patterns or the pattern +String+, either as an
@@ -1705,10 +1746,13 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *                          match all files beginning with
  *                          <code>c</code>; <code>*c</code> will match
  *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
+ *                          <code>\*c\*</code> will match all files that
  *                          have <code>c</code> in them (including at
  *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
+ *                          <code>/ .* /x</code> in regexp. Note, this
+ *                          will not match Unix-like hidden files (dotfiles).
+ *                          In order to include those in the match results,
+ *                          you must use something like "{*,.*}".
  *  <code>**</code>::       Matches directories recursively.
  *  <code>?</code>::        Matches any one character. Equivalent to
  *                          <code>/.{1}/</code> in regexp.
@@ -1723,6 +1767,9 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *                          Equivalent to pattern alternation in
  *                          regexp.
  *  <code>\</code>::        Escapes the next metacharacter.
+ *                          Note that this means you cannot use backslash in windows
+ *                          as part of a glob, i.e. Dir["c:\\foo*"] will not work
+ *                          use Dir["c:/foo*"] instead
  *
  *     Dir["config.?"]                     #=> ["config.h"]
  *     Dir.glob("config.?")                #=> ["config.h"]
@@ -1734,23 +1781,20 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *
  *     rbfiles = File.join("**", "*.rb")
  *     Dir.glob(rbfiles)                   #=> ["main.rb",
- *                                              "lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
+ *                                         #    "lib/song.rb",
+ *                                         #    "lib/song/karaoke.rb"]
  *     libdirs = File.join("**", "lib")
  *     Dir.glob(libdirs)                   #=> ["lib"]
  *
  *     librbfiles = File.join("**", "lib", "**", "*.rb")
  *     Dir.glob(librbfiles)                #=> ["lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
+ *                                         #    "lib/song/karaoke.rb"]
  *
  *     librbfiles = File.join("**", "lib", "*.rb")
  *     Dir.glob(librbfiles)                #=> ["lib/song.rb"]
  */
 static VALUE
-dir_s_glob(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+dir_s_glob(int argc, VALUE *argv, VALUE obj)
 {
     VALUE str, rflags, ary;
     int flags;
@@ -1777,27 +1821,26 @@ dir_s_glob(argc, argv, obj)
 }
 
 static VALUE
-dir_open_dir(path)
-    VALUE path;
+dir_open_dir(int argc, VALUE *argv)
 {
-    VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
+    VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
+    struct dir_data *dirp;
 
-    if (TYPE(dir) != T_DATA ||
-	RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Dir)",
-		 rb_obj_classname(dir));
-    }
+    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
     return dir;
 }
 
 
 /*
  *  call-seq:
- *     Dir.foreach( dirname ) {| filename | block }  => nil
+ *     Dir.foreach( dirname ) {| filename | block }  -> nil
+ *     Dir.foreach( dirname )                        -> an_enumerator
  *
  *  Calls the block once for each entry in the named directory, passing
  *  the filename of each entry as a parameter to the block.
  *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     Dir.foreach("testdir") {|x| puts "Got #{x}" }
  *
  *  <em>produces:</em>
@@ -1809,19 +1852,19 @@ dir_open_dir(path)
  *
  */
 static VALUE
-dir_foreach(io, dirname)
-    VALUE io, dirname;
+dir_foreach(int argc, VALUE *argv, VALUE io)
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    RETURN_ENUMERATOR(io, argc, argv);
+    dir = dir_open_dir(argc, argv);
     rb_ensure(dir_each, dir, dir_close, dir);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     Dir.entries( dirname ) => array
+ *     Dir.entries( dirname ) -> array
  *
  *  Returns an array containing all of the filenames in the given
  *  directory. Will raise a <code>SystemCallError</code> if the named
@@ -1831,19 +1874,18 @@ dir_foreach(io, dirname)
  *
  */
 static VALUE
-dir_entries(io, dirname)
-    VALUE io, dirname;
+dir_entries(int argc, VALUE *argv, VALUE io)
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    dir = dir_open_dir(argc, argv);
     return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
 /*
  *  call-seq:
- *     File.fnmatch( pattern, path, [flags] ) => (true or false)
- *     File.fnmatch?( pattern, path, [flags] ) => (true or false)
+ *     File.fnmatch( pattern, path, [flags] ) -> (true or false)
+ *     File.fnmatch?( pattern, path, [flags] ) -> (true or false)
  *
  *  Returns true if <i>path</i> matches against <i>pattern</i> The
  *  pattern is not a regular expression; instead it follows rules
@@ -1874,31 +1916,31 @@ dir_entries(io, dirname)
  *  parameters. The same glob pattern and flags are used by
  *  <code>Dir::glob</code>.
  *
- *     File.fnmatch('cat',       'cat')        #=> true  : match entire string
- *     File.fnmatch('cat',       'category')   #=> false : only match partial string
- *     File.fnmatch('c{at,ub}s', 'cats')       #=> false : { } isn't supported
+ *     File.fnmatch('cat',       'cat')        #=> true  # match entire string
+ *     File.fnmatch('cat',       'category')   #=> false # only match partial string
+ *     File.fnmatch('c{at,ub}s', 'cats')       #=> false # { } isn't supported
  *
- *     File.fnmatch('c?t',     'cat')          #=> true  : '?' match only 1 character
- *     File.fnmatch('c??t',    'cat')          #=> false : ditto
- *     File.fnmatch('c*',      'cats')         #=> true  : '*' match 0 or more characters
- *     File.fnmatch('c*t',     'c/a/b/t')      #=> true  : ditto
- *     File.fnmatch('ca[a-z]', 'cat')          #=> true  : inclusive bracket expression
- *     File.fnmatch('ca[^t]',  'cat')          #=> false : exclusive bracket expression ('^' or '!')
+ *     File.fnmatch('c?t',     'cat')          #=> true  # '?' match only 1 character
+ *     File.fnmatch('c??t',    'cat')          #=> false # ditto
+ *     File.fnmatch('c*',      'cats')         #=> true  # '*' match 0 or more characters
+ *     File.fnmatch('c*t',     'c/a/b/t')      #=> true  # ditto
+ *     File.fnmatch('ca[a-z]', 'cat')          #=> true  # inclusive bracket expression
+ *     File.fnmatch('ca[^t]',  'cat')          #=> false # exclusive bracket expression ('^' or '!')
  *
- *     File.fnmatch('cat', 'CAT')                     #=> false : case sensitive
- *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  : case insensitive
+ *     File.fnmatch('cat', 'CAT')                     #=> false # case sensitive
+ *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  # case insensitive
  *
- *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false : wildcard doesn't match '/' on FNM_PATHNAME
- *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false : ditto
- *     File.fnmatch('[/]', '/', File::FNM_PATHNAME)  #=> false : ditto
+ *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false # wildcard doesn't match '/' on FNM_PATHNAME
+ *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false # ditto
+ *     File.fnmatch('[/]', '/', File::FNM_PATHNAME)  #=> false # ditto
  *
- *     File.fnmatch('\?',   '?')                       #=> true  : escaped wildcard becomes ordinary
- *     File.fnmatch('\a',   'a')                       #=> true  : escaped ordinary remains ordinary
- *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  : FNM_NOESACPE makes '\' ordinary
- *     File.fnmatch('[\?]', '?')                       #=> true  : can escape inside bracket expression
+ *     File.fnmatch('\?',   '?')                       #=> true  # escaped wildcard becomes ordinary
+ *     File.fnmatch('\a',   'a')                       #=> true  # escaped ordinary remains ordinary
+ *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  # FNM_NOESACPE makes '\' ordinary
+ *     File.fnmatch('[\?]', '?')                       #=> true  # can escape inside bracket expression
  *
- *     File.fnmatch('*',   '.profile')                      #=> false : wildcard doesn't match leading
- *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)  #=> true    period by default.
+ *     File.fnmatch('*',   '.profile')                      #=> false # wildcard doesn't match leading
+ *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)  #=> true  # period by default.
  *     File.fnmatch('.*',  '.profile')                      #=> true
  *
  *     rbfiles = '**' '/' '*.rb' # you don't have to do like this. just write in single string.
@@ -1922,10 +1964,7 @@ dir_entries(io, dirname)
  *     File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
  */
 static VALUE
-file_s_fnmatch(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
 {
     VALUE pattern, path;
     VALUE rflags;
@@ -1937,14 +1976,39 @@ file_s_fnmatch(argc, argv, obj)
 	flags = 0;
 
     StringValue(pattern);
-    StringValue(path);
+    FilePathStringValue(path);
 
-    if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
+    if (fnmatch(RSTRING_PTR(pattern), rb_enc_get(pattern), RSTRING_PTR(path),
+		flags) == 0)
 	return Qtrue;
 
     return Qfalse;
 }
 
+VALUE rb_home_dir(const char *user, VALUE result);
+
+/*
+ *  call-seq:
+ *    Dir.home()       -> "/home/me"
+ *    Dir.home("root") -> "/root"
+ *
+ *  Returns the home directory of the current user or the named user
+ *  if given.
+ */
+static VALUE
+dir_s_home(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE user;
+    const char *u = 0;
+
+    rb_scan_args(argc, argv, "01", &user);
+    if (!NIL_P(user)) {
+	SafeStringValue(user);
+	u = StringValueCStr(user);
+    }
+    return rb_home_dir(u, rb_str_new(0, 0));
+}
+
 /*
  *  Objects of class <code>Dir</code> are directory streams representing
  *  directories in the underlying file system. They provide a variety of
@@ -1957,19 +2021,21 @@ file_s_fnmatch(argc, argv, obj)
  *  (<code>.</code>).
  */
 void
-Init_Dir()
+Init_Dir(void)
 {
     rb_cDir = rb_define_class("Dir", rb_cObject);
 
     rb_include_module(rb_cDir, rb_mEnumerable);
 
     rb_define_alloc_func(rb_cDir, dir_s_alloc);
-    rb_define_singleton_method(rb_cDir, "open", dir_s_open, 1);
-    rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, 1);
-    rb_define_singleton_method(rb_cDir, "entries", dir_entries, 1);
+    rb_define_singleton_method(rb_cDir, "open", dir_s_open, -1);
+    rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, -1);
+    rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1);
 
-    rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
+    rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
     rb_define_method(rb_cDir,"path", dir_path, 0);
+    rb_define_method(rb_cDir,"to_path", dir_path, 0);
+    rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
     rb_define_method(rb_cDir,"read", dir_read, 0);
     rb_define_method(rb_cDir,"each", dir_each, 0);
     rb_define_method(rb_cDir,"rewind", dir_rewind, 0);
@@ -1987,9 +2053,12 @@ Init_Dir()
     rb_define_singleton_method(rb_cDir,"rmdir", dir_s_rmdir, 1);
     rb_define_singleton_method(rb_cDir,"delete", dir_s_rmdir, 1);
     rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
+    rb_define_singleton_method(rb_cDir,"home", dir_s_home, -1);
 
     rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
     rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
+    rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1); /* in file.c */
+    rb_define_singleton_method(rb_cDir,"exists?", rb_file_directory_p, 1); /* in file.c */
 
     rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
     rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
diff --git a/distruby.rb b/distruby.rb
deleted file mode 100644
index 613da0eb9c..0000000000
--- a/distruby.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!./miniruby
-
-if RUBY_PATCHLEVEL.zero?
-	dirname = sprintf 'ruby-%s', RUBY_VERSION
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
-else
-	dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
-end
-tgzname = dirname + '.tar.gz'
-tbzname = dirname + '.tar.bz2'
-zipname = dirname + '.zip'
-repos   = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
-
-STDERR.puts 'exporting sources...'
-system 'svn',  'export',  '-q', repos, dirname
-Dir.chdir dirname do
-	STDERR.puts 'generating configure...'
-	system 'autoconf'
-	system 'rm', '-rf', 'autom4te.cache'
-
-	STDERR.puts 'generating parse.c...'
-	system 'bison', '-y', '-o', 'parse.c', 'parse.y'
-end
-
-STDERR.puts 'generating tarballs...'
-ENV['GZIP'] = '-9'
-system 'tar', 'chofzp', tgzname, dirname
-system 'tar', 'chojfp', tbzname, dirname
-system 'zip', '-q9r', zipname, dirname
-
-require 'digest/md5'
-require 'digest/sha2'
-for name in [tgzname, tbzname, zipname] do
-	open name, 'rb' do |fp|
-		str = fp.read
-		md5 = Digest::MD5.hexdigest str
-		sha = Digest::SHA256.hexdigest str
-		printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
-				 name, md5,
-				 name, sha,
-				 name, str.size
-	end
-end
-
-
-
-# 
-# Local Variables:
-# mode: ruby
-# code: utf-8
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# fill-column: 79
-# default-justification: full
-# End:
-# vi: ts=3 sw=3
-
diff --git a/djgpp/GNUmakefile.in b/djgpp/GNUmakefile.in
deleted file mode 100644
index 0a7e1fb131..0000000000
--- a/djgpp/GNUmakefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include Makefile
-VPATH = $(srcdir) $(srcdir)/missing
diff --git a/djgpp/README.djgpp b/djgpp/README.djgpp
deleted file mode 100644
index f1f413a478..0000000000
--- a/djgpp/README.djgpp
+++ /dev/null
@@ -1,21 +0,0 @@
-* How to compile and install on djgpp
-
-This is what you need to do to compile and install Ruby:
-
-  1. Run configure.bat, which will generate config.h and Makefile
-     (GNU sed required).
-     Message like this is normal:
-       sed.exe: can't read 123456789: No such file or directory (ENOENT)
-
-  2. Edit defines.h if you need.  Probably this step will not need.
-
-  3. Remove comment mark(#) before the module names from ext/Setup.dj (or
-     add module names if not present).
-
-  4. Run make.
-
-  5. Optionally, run 'make test' to check whether the compiled Ruby
-     interpreter works well.  If you see the message "test succeeded",
-     your ruby works as it should (hopefully).
-
-  6. Run 'make install'
diff --git a/djgpp/config.hin b/djgpp/config.hin
deleted file mode 100644
index 8ee427c92f..0000000000
--- a/djgpp/config.hin
+++ /dev/null
@@ -1,114 +0,0 @@
-
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define USE_BUILTIN_FRAME_ADDRESS 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_LONG_LONG 1
-#define HAVE_OFF_T 1
-#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
-#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF___INT64 0
-#define SIZEOF_OFF_T 4
-#define SIZEOF_VOIDP 4
-#define SIZEOF_FLOAT 4
-#define SIZEOF_DOUBLE 8
-#define HAVE_PROTOTYPES 1
-#define TOKEN_PASTE(x,y) x##y
-#define HAVE_STDARG_PROTOTYPES 1
-#define NORETURN(x) x __attribute__ ((noreturn))
-#define HAVE_DECL_SYS_NERR 1
-#define HAVE_DIRENT_H 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_WAIT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_SYS_FILE_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_SYS_FCNTL_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TIMES_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_PWD_H 1
-#define HAVE_UTIME_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_DIRECT_H 1
-#define HAVE_SYS_RESOURCE_H 1
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-#define HAVE_ST_BLKSIZE 1
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-#define HAVE_ST_RDEV 1
-#define GETGROUPS_T gid_t
-#define RETSIGTYPE void
-#define HAVE_ALLOCA 1
-#define HAVE_DUP2 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MKDIR 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_STRERROR 1
-#define HAVE_STRFTIME 1
-#define HAVE_STRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOUL 1
-#define HAVE_ISINF 1
-#define HAVE_ISNAN 1
-#define HAVE_FINITE 1
-#define HAVE_HYPOT 1
-#define HAVE_ACOSH 1
-#define HAVE_FMOD 1
-#define HAVE_WAITPID 1
-#define HAVE_FSYNC 1
-#define HAVE_TRUNCATE 1
-#define HAVE_CHSIZE 1
-#define HAVE_TIMES 1
-#define HAVE_UTIMES 1
-#define HAVE_FCNTL 1
-#define HAVE_SYMLINK 1
-#define HAVE_SETITIMER 1
-#define HAVE_PAUSE 1
-#define HAVE_GETPGRP 1
-#define HAVE_SETPGID 1
-#define HAVE_GETGROUPS 1
-#define HAVE_GETRLIMIT 1
-#define HAVE_SIGPROCMASK 1
-#define HAVE_SIGACTION 1
-#define HAVE_SETSID 1
-#define HAVE_TELLDIR 1
-#define HAVE_SEEKDIR 1
-#define HAVE_MKTIME 1
-#define HAVE_COSH 1
-#define HAVE_SINH 1
-#define HAVE_TANH 1
-#define HAVE_STRUCT_TM_TM_ZONE 1
-#define HAVE_TM_ZONE 1
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
-#define POSIX_SIGNAL 1
-#define GETPGRP_VOID 1
-#define SETPGRP_VOID 1
-#define RSHIFT(x,y) ((x)>>(int)y)
-#define FILE_COUNT _cnt
-#define FILE_READPTR _ptr
-#define NEED_IO_FLUSH_BETWEEN_RW 1
-#define DEFAULT_KCODE KCODE_NONE
-#define DLEXT ".so"
-#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
-#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
-#define RUBY_PLATFORM "i386-msdosdjgpp"
-#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
-#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
diff --git a/djgpp/config.sed b/djgpp/config.sed
deleted file mode 100644
index 1805789520..0000000000
--- a/djgpp/config.sed
+++ /dev/null
@@ -1,128 +0,0 @@
-/^SHELL/s,/bin/sh,$(COMSPEC),
-;s%/bin/rm%rm%
-;s%|| true%%
-;/\/dev\/null/ {
-;s,/dev/null 2>&1, nul,
-;s,2> /dev/null,,
-;}
-;/^config.status/ {
-;    N;N;N;N;N;d
-;}
-:t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@srcdir@,.,g;t t
-s,@top_srcdir@,..,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,,;t t
-s,@PACKAGE_TARNAME@,,;t t
-s,@PACKAGE_VERSION@,,;t t
-s,@PACKAGE_STRING@,,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/dev/env/DJDIR,;t t
-s%@program_transform_name@%s,^,,%;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,i586-pc-msdosdjgpp,;t t
-s,@host_alias@,i586-pc-msdosdjgpp,;t t
-s,@target_alias@,i386-msdosdjgpp,;t t
-s,@DEFS@,,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,-lm ,;t t
-s,@MAJOR@,1,;t t
-s,@MINOR@,7,;t t
-s,@TEENY@,3,;t t
-s,@build@,i586-pc-msdosdjgpp,;t t
-s,@build_cpu@,i586,;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,msdosdjgpp,;t t
-s,@host@,i586-pc-msdosdjgpp,;t t
-s,@host_cpu@,i586,;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,msdosdjgpp,;t t
-s,@target@,i386-pc-msdosdjgpp,;t t
-s,@target_cpu@,i386,;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,msdosdjgpp,;t t
-s,@CC@,gcc,;t t
-s,@ac_ct_CC@,,;t t
-s,@CFLAGS@,-Os,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,o,;t t
-s,@CPP@,gcc -E,;t t
-s,@EGREP@,grep -E,;t t
-s,@GNU_LD@,yes,;t t
-s,@CPPOUTFILE@,-o conftest.i,;t t
-s,@OUTFLAG@,-o ,;t t
-s,@YACC@,bison -y,;t t
-s,@RANLIB@,ranlib,;t t
-s,@ac_ct_RANLIB@,,;t t
-s,@AR@,ar,;t t
-s,@ac_ct_AR@,,;t t
-s,@NM@,,;t t
-s,@ac_ct_NM@,,;t t
-s,@WINDRES@,,;t t
-s,@ac_ct_WINDRES@,,;t t
-s,@DLLWRAP@,,;t t
-s,@ac_ct_DLLWRAP@,,;t t
-s,@LN_S@,ln -s,;t t
-s,@SET_MAKE@,,;t t
-s,@LIBOBJS@,crypt.o flock.o vsnprintf.o,;t t
-s,@ALLOCA@,,;t t
-s,@XCFLAGS@,,;t t
-s,@XLDFLAGS@, -L.,;t t
-s,@DLDFLAGS@,,;t t
-s,@STATIC@,,;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,ld,;t t
-s,@DLEXT@,so,;t t
-s,@DLEXT2@,,;t t
-s,@LIBEXT@,a,;t t
-s,@LINK_SO@,,;t t
-s,@LIBPATHFLAG@, -L%s,;t t
-s,@STRIP@,strip,;t t
-s,@EXTSTATIC@,,;t t
-s,@setup@,Setup.dj,;t t
-s,@MINIRUBY@,./miniruby,;t t
-s,@PREP@,,;t t
-s,@ARCHFILE@,,;t t
-s,@LIBRUBY_LDSHARED@,ld,;t t
-s,@LIBRUBY_DLDFLAGS@,,;t t
-s,@RUBY_INSTALL_NAME@,ruby,;t t
-s,@rubyw_install_name@,,;t t
-s,@RUBYW_INSTALL_NAME@,,;t t
-s,@RUBY_SO_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@LIBRUBY_A@,lib$(RUBY_INSTALL_NAME).a,;t t
-s,@LIBRUBY_SO@,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY),;t t
-s,@LIBRUBY_ALIASES@,lib$(RUBY_SO_NAME).so,;t t
-s,@LIBRUBY@,$(LIBRUBY_A),;t t
-s,@LIBRUBYARG@,-l$(RUBY_INSTALL_NAME),;t t
-s,@SOLIBS@,,;t t
-s,@DLDLIBS@,-lc,;t t
-s,@ENABLE_SHARED@,no,;t t
-s,@MAINLIBS@,,;t t
-s,@COMMON_LIBS@,,;t t
-s,@COMMON_MACROS@,,;t t
-s,@COMMON_HEADERS@,,;t t
-s,@EXPORT_PREFIX@,,;t t
-s,@MAKEFILES@,Makefile,;t t
-s,@arch@,i386-msdosdjgpp,;t t
-s,@sitearch@,i386-msdosdjgpp,;t t
-s,@sitedir@,${prefix}/lib/ruby/site_ruby,;t t
-s,@configure_args@,,;t t
-/^,THIS_IS_DUMMY_PATTERN_/i\
-ac_given_srcdir=.
diff --git a/djgpp/configure.bat b/djgpp/configure.bat
deleted file mode 100755
index e6a5d79d4a..0000000000
--- a/djgpp/configure.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-if exist configure.bat cd ..
-if exist djgpp\version.sed goto exist
-  sed -n -f djgpp\mkver.sed < version.h > djgpp\version.sed
-:exist
-set _conv_=-f djgpp\config.sed -f djgpp\version.sed
-sed %_conv_% < Makefile.in > Makefile
-sed %_conv_% < djgpp\config.hin > config.h
-echo LFN check > 12345678
-sed -n /LFN/d 123456789 > nul
-if errorlevel 2 goto LFN
-    copy missing\vsnprintf.c missing\vsnprint.c > nul
-    copy djgpp\config.sed config.sta > nul
-goto end
-:LFN
-    copy djgpp\config.sed config.status > nul
-:end
-set _conv_=
-del 12345678
-echo Now you must run a make.
diff --git a/djgpp/mkver.sed b/djgpp/mkver.sed
deleted file mode 100644
index f29b9ddd3e..0000000000
--- a/djgpp/mkver.sed
+++ /dev/null
@@ -1 +0,0 @@
-/RUBY_VERSION /s/^.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/s,@MAJOR@,\1,;s,@MINOR@,\2,;s,@TEENY@,\3,/p
diff --git a/dln.c b/dln.c
index ae12758d19..438d263080 100644
--- a/dln.c
+++ b/dln.c
@@ -3,26 +3,30 @@
   dln.c -
 
   $Author$
-  $Date$
   created at: Tue Jan 18 17:05:06 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
+#ifdef RUBY_EXPORT
+#include "ruby/ruby.h"
+#define dln_notimplement rb_notimplement
+#define dln_memerror rb_memerror
+#define dln_exit rb_exit
+#define dln_loaderror rb_loaderror
+#else
+#define dln_notimplement --->>> dln not implemented <<<---
+#define dln_memerror abort
+#define dln_exit exit
+static void dln_loaderror(const char *format, ...);
+#endif
 #include "dln.h"
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 
-#ifdef __CHECKER__
-#undef HAVE_DLOPEN
-#undef USE_DLN_A_OUT
-#undef USE_DLN_DLOPEN
-#endif
-
 #ifdef USE_DLN_A_OUT
 char *dln_argv0;
 #endif
@@ -43,8 +47,10 @@ void *xcalloc();
 void *xrealloc();
 #endif
 
+#define free(x) xfree(x)
+
 #include <stdio.h>
-#if defined(_WIN32) || defined(__VMS)
+#if defined(_WIN32)
 #include "missing/file.h"
 #endif
 #include <sys/types.h>
@@ -69,53 +75,54 @@ void *xrealloc();
 char *getenv();
 #endif
 
-#if defined(__VMS)
-#pragma builtins
-#include <dlfcn.h>
-#endif
-
-#ifdef __MACOS__
-# include <TextUtils.h>
-# include <CodeFragments.h>
-# include <Aliases.h>
-# include "macruby_private.h"
+#if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
+# if defined(HAVE_DLOPEN)
+   /* Mac OS X with dlopen (10.3 or later) */
+#  define MACOSX_DLOPEN
+# else
+#  define MACOSX_DYLD
+# endif
 #endif
 
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__HAIKU__)
 # include <image.h>
 #endif
 
-#ifndef NO_DLN_LOAD
+#ifndef dln_loaderror
+static void
+dln_loaderror(const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
+    va_end(ap);
+    abort();
+}
+#endif
 
-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__) && !defined(_UNICOSMP)
+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(MACOSX_DYLD) && !defined(_UNICOSMP)
 /* dynamic load with dlopen() */
 # define USE_DLN_DLOPEN
 #endif
 
 #ifndef FUNCNAME_PATTERN
-# if defined(__hp9000s300) ||  (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__)
+# if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
 #  define FUNCNAME_PATTERN "_Init_%s"
 # else
 #  define FUNCNAME_PATTERN "Init_%s"
 # endif
 #endif
 
-static int
-init_funcname_len(buf, file)
-    char **buf;
-    const char *file;
+static size_t
+init_funcname_len(char **buf, const char *file)
 {
     char *p;
     const char *slash;
-    int len;
+    size_t len;
 
     /* Load the file as an object one */
     for (slash = file-1; *file; file++) /* Find position of last '/' */
-#ifdef __MACOS__
-	if (*file == ':') slash = file;
-#else
 	if (*file == '/') slash = file;
-#endif
 
     len = strlen(FUNCNAME_PATTERN) + strlen(slash + 1);
     *buf = xmalloc(len);
@@ -129,13 +136,13 @@ init_funcname_len(buf, file)
 }
 
 #define init_funcname(buf, file) do {\
-    int len = init_funcname_len(buf, file);\
+    size_t len = init_funcname_len(buf, file);\
     char *tmp = ALLOCA_N(char, len+1);\
     if (!tmp) {\
 	free(*buf);\
-	rb_memerror();\
+	dln_memerror();\
     }\
-    strcpy(tmp, *buf);\
+    strlcpy(tmp, *buf, len + 1);\
     free(*buf);\
     *buf = tmp;\
 } while (0)
@@ -175,8 +182,8 @@ static int dln_init_p = 0;
 
 #define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
 
-#include "util.h"
-#include "st.h"
+#include "ruby/util.h"
+#include "ruby/st.h"
 
 static st_table *sym_tbl;
 static st_table *undef_tbl;
@@ -184,10 +191,7 @@ static st_table *undef_tbl;
 static int load_lib();
 
 static int
-load_header(fd, hdrp, disp)
-    int fd;
-    struct exec *hdrp;
-    long disp;
+load_header(int fd, struct exec *hdrp, long disp)
 {
     int size;
 
@@ -257,10 +261,7 @@ static int reloc_r_length[] = {
 #endif
 
 static struct relocation_info *
-load_reloc(fd, hdrp, disp)
-     int fd;
-     struct exec *hdrp;
-     long disp;
+load_reloc(int fd, struct exec *hdrp, long disp)
 {
     struct relocation_info *reloc;
     int size;
@@ -283,10 +284,7 @@ load_reloc(fd, hdrp, disp)
 }
 
 static struct nlist *
-load_sym(fd, hdrp, disp)
-    int fd;
-    struct exec *hdrp;
-    long disp;
+load_sym(int fd, struct exec *hdrp, long disp)
 {
     struct nlist * buffer;
     struct nlist * sym;
@@ -327,9 +325,7 @@ load_sym(fd, hdrp, disp)
 }
 
 static st_table *
-sym_hash(hdrp, syms)
-    struct exec *hdrp;
-    struct nlist *syms;
+sym_hash(struct exec *hdrp, struct nlist *syms)
 {
     st_table *tbl;
     struct nlist *sym = syms;
@@ -349,17 +345,16 @@ sym_hash(hdrp, syms)
 }
 
 static int
-dln_init(prog)
-    const char *prog;
+dln_init(const char *prog)
 {
-    char *file;
+    char *file, fbuf[MAXPATHLEN];
     int fd;
     struct exec hdr;
     struct nlist *syms;
 
     if (dln_init_p == 1) return 0;
 
-    file = dln_find_exe(prog, NULL);
+    file = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf));
     if (file == NULL || (fd = open(file, O_RDONLY)) < 0) {
 	dln_errno = errno;
 	return -1;
@@ -424,11 +419,7 @@ dln_init(prog)
 }
 
 static long
-load_text_data(fd, hdrp, bss, disp)
-    int fd;
-    struct exec *hdrp;
-    int bss;
-    long disp;
+load_text_data(int fd, struct exec *hdrp, int bss, long disp)
 {
     int size;
     unsigned char* addr;
@@ -462,27 +453,26 @@ load_text_data(fd, hdrp, bss, disp)
 }
 
 static int
-undef_print(key, value)
-    char *key, *value;
+undef_print(char *key, char *value)
 {
     fprintf(stderr, "  %s\n", key);
     return ST_CONTINUE;
 }
 
 static void
-dln_print_undef()
+dln_print_undef(void)
 {
     fprintf(stderr, " Undefined symbols:\n");
     st_foreach(undef_tbl, undef_print, NULL);
 }
 
 static void
-dln_undefined()
+dln_undefined(void)
 {
     if (undef_tbl->num_entries > 0) {
 	fprintf(stderr, "dln: Calling undefined function\n");
 	dln_print_undef();
-	rb_exit(1);
+	dln_exit(1);
     }
 }
 
@@ -500,10 +490,7 @@ struct undef {
 
 static st_table *reloc_tbl = NULL;
 static void
-link_undef(name, base, reloc)
-    const char *name;
-    long base;
-    struct relocation_info *reloc;
+link_undef(const char *name, long base, struct relocation_info *reloc)
 {
     static int u_no = 0;
     struct undef *obj;
@@ -536,10 +523,7 @@ struct reloc_arg {
 };
 
 static int
-reloc_undef(no, undef, arg)
-    int no;
-    struct undef *undef;
-    struct reloc_arg *arg;
+reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
 {
     int datum;
     char *address;
@@ -600,9 +584,7 @@ reloc_undef(no, undef, arg)
 }
 
 static void
-unlink_undef(name, value)
-    const char *name;
-    long value;
+unlink_undef(const char *name, long value)
 {
     struct reloc_arg arg;
 
@@ -617,10 +599,7 @@ struct indr_data {
 };
 
 static int
-reloc_repl(no, undef, data)
-    int no;
-    struct undef *undef;
-    struct indr_data *data;
+reloc_repl(int no, struct undef *undef, struct indr_data *data)
 {
     if (strcmp(data->name0, undef->name) == 0) {
 	free(undef->name);
@@ -631,12 +610,9 @@ reloc_repl(no, undef, data)
 #endif
 
 static int
-load_1(fd, disp, need_init)
-    int fd;
-    long disp;
-    const char *need_init;
+load_1(int fd, long disp, const char *need_init)
 {
-    static char *libc = LIBC_NAME;
+    static const char *libc = LIBC_NAME;
     struct exec hdr;
     struct relocation_info *reloc = NULL;
     long block = 0;
@@ -805,7 +781,7 @@ load_1(fd, disp, need_init)
 		}
 	    } /* end.. look it up */
 	    else { /* is static */
-		switch (R_SYMBOL(rel)) { 
+		switch (R_SYMBOL(rel)) {
 		  case N_TEXT:
 		  case N_DATA:
 		    datum = block;
@@ -915,10 +891,7 @@ load_1(fd, disp, need_init)
 
 static int target_offset;
 static int
-search_undef(key, value, lib_tbl)
-    const char *key;
-    int value;
-    st_table *lib_tbl;
+search_undef(const char *key, int value, st_table *lib_tbl)
 {
     long offset;
 
@@ -932,13 +905,13 @@ struct symdef {
     int lib_offset;
 };
 
-char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
+const char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
 
 static int
-load_lib(lib)
-    const char *lib;
+load_lib(const char *lib)
 {
-    char *path, *file;
+    char *path, *file, fbuf[MAXPATHLEN];
+    char *envpath = 0;
     char armagic[SARMAG];
     int fd, size;
     struct ar_hdr ahdr;
@@ -968,8 +941,10 @@ load_lib(lib)
     /* if path is still NULL, use "." for path. */
     path = getenv("DLN_LIBRARY_PATH");
     if (path == NULL) path = dln_librrb_ary_path;
+    else path = envpath = strdup(path);
 
-    file = dln_find_file(lib, path);
+    file = dln_find_file_r(lib, path, fbuf, sizeof(fbuf));
+    if (envpath) free(envpath);
     fd = open(file, O_RDONLY);
     if (fd == -1) goto syserr;
     size = read(fd, armagic, SARMAG);
@@ -1073,8 +1048,7 @@ load_lib(lib)
 }
 
 static int
-load(file)
-    const char *file;
+load(const char *file)
 {
     int fd;
     int result;
@@ -1099,8 +1073,7 @@ load(file)
 }
 
 void*
-dln_sym(name)
-    const char *name;
+dln_sym(const char *name)
 {
     struct nlist *sym;
 
@@ -1112,12 +1085,7 @@ dln_sym(name)
 #endif /* USE_DLN_A_OUT */
 
 #ifdef USE_DLN_DLOPEN
-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
-#  include <nlist.h>
-#  include <link.h>
-# else
-#  include <dlfcn.h>
-# endif
+# include <dlfcn.h>
 #endif
 
 #ifdef __hpux
@@ -1141,7 +1109,7 @@ dln_sym(name)
 #endif
 #endif
 #else
-#ifdef __APPLE__
+#ifdef MACOSX_DYLD
 #include <mach-o/dyld.h>
 #endif
 #endif
@@ -1150,17 +1118,9 @@ dln_sym(name)
 #include <windows.h>
 #endif
 
-#ifdef _WIN32_WCE
-#undef FormatMessage
-#define FormatMessage FormatMessageA
-#undef LoadLibrary
-#define LoadLibrary LoadLibraryA
-#undef GetProcAddress
-#define GetProcAddress GetProcAddressA
-#endif
-
+#if ! defined _AIX
 static const char *
-dln_strerror()
+dln_strerror(void)
 {
 #ifdef USE_DLN_A_OUT
     char *strerror();
@@ -1208,79 +1168,49 @@ dln_strerror()
     return message;
 #endif
 }
-
+#endif
 
 #if defined(_AIX) && ! defined(_IA64)
 static void
 aix_loaderror(const char *pathname)
 {
-    char *message[8], errbuf[1024];
-    int i,j;
-
-    struct errtab { 
-	int errnum;
-	char *errstr;
-    } load_errtab[] = {
-	{L_ERROR_TOOMANY,	"too many errors, rest skipped."},
-	{L_ERROR_NOLIB,		"can't load library:"},
-	{L_ERROR_UNDEF,		"can't find symbol in library:"},
-	{L_ERROR_RLDBAD,
-	     "RLD index out of range or bad relocation type:"},
-	{L_ERROR_FORMAT,	"not a valid, executable xcoff file:"},
-	{L_ERROR_MEMBER,
-	     "file not an archive or does not contain requested member:"},
-	{L_ERROR_TYPE,		"symbol table mismatch:"},
-	{L_ERROR_ALIGN,		"text alignment in file is wrong."},
-	{L_ERROR_SYSTEM,	"System error:"},
-	{L_ERROR_ERRNO,		NULL}
-    };
-
-#define LOAD_ERRTAB_LEN	(sizeof(load_errtab)/sizeof(load_errtab[0]))
+  char *message[1024], errbuf[1024];
+  int i;
 #define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1)
-
-    snprintf(errbuf, 1024, "load failed - %s ", pathname);
-
-    if (!loadquery(1, &message[0], sizeof(message))) 
-	ERRBUF_APPEND(strerror(errno));
-    for(i = 0; message[i] && *message[i]; i++) {
-	int nerr = atoi(message[i]);
-	for (j=0; j<LOAD_ERRTAB_LEN; j++) {
-           if (nerr == load_errtab[i].errnum && load_errtab[i].errstr)
-		ERRBUF_APPEND(load_errtab[i].errstr);
-	}
-	while (isdigit(*message[i])) message[i]++; 
-	ERRBUF_APPEND(message[i]);
-	ERRBUF_APPEND("\n");
+  snprintf(errbuf, sizeof(errbuf), "load failed - %s. ", pathname);
+
+  if (loadquery(L_GETMESSAGES, &message[0], sizeof(message)) != -1) {
+    ERRBUF_APPEND("Please issue below command for detailed reasons:\n\t");
+    ERRBUF_APPEND("/usr/sbin/execerror ruby ");
+    for (i=0; message[i]; i++) {
+      ERRBUF_APPEND("\"");
+      ERRBUF_APPEND(message[i]);
+      ERRBUF_APPEND("\" ");
     }
-    errbuf[strlen(errbuf)-1] = '\0';	/* trim off last newline */
-    rb_loaderror(errbuf);
-    return;
+    ERRBUF_APPEND("\n");
+  } else {
+    ERRBUF_APPEND(strerror(errno));
+    ERRBUF_APPEND("[loadquery failed]");
+  }
+  dln_loaderror("%s", errbuf);
 }
 #endif
 
-#if defined(__VMS)
-#include <starlet.h>
-#include <rms.h>
-#include <stsdef.h>
-#include <unixlib.h>
-#include <descrip.h>
-#include <lib$routines.h>
-
-static char *vms_filespec;
-static int vms_fileact(char *filespec, int type);
-static long vms_fisexh(long *sigarr, long *mecarr);
+#if defined(DLN_NEEDS_ALT_SEPARATOR) && DLN_NEEDS_ALT_SEPARATOR
+#define translit_separator(src) do { \
+	char *tmp = ALLOCA_N(char, strlen(src) + 1), *p = tmp, c; \
+	do { \
+	    *p++ = ((c = *file++) == '/') ? DLN_NEEDS_ALT_SEPARATOR : c; \
+	} while (c); \
+	src = tmp; \
+    } while (0)
+#else
+#define translit_separator(str) (void)(str)
 #endif
 
-#endif /* NO_DLN_LOAD */
-
 void*
-dln_load(file)
-    const char *file;
+dln_load(const char *file)
 {
-#ifdef NO_DLN_LOAD
-    rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
-#else
-
 #if !defined(_AIX) && !defined(NeXT)
     const char *error = 0;
 #define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
@@ -1292,12 +1222,12 @@ dln_load(file)
     void (*init_fct)();
     char *buf;
 
-    if (strlen(file) >= MAXPATHLEN) rb_loaderror("filename too long");
+    if (strlen(file) >= MAXPATHLEN) dln_loaderror("filename too long");
 
     /* Load the file as an object one */
     init_funcname(&buf, file);
 
-    strcpy(winfile, file);
+    strlcpy(winfile, file, sizeof(winfile));
 
     /* Load file */
     if ((handle = LoadLibrary(winfile)) == NULL) {
@@ -1306,7 +1236,7 @@ dln_load(file)
     }
 
     if ((init_fct = (void(*)())GetProcAddress(handle, buf)) == NULL) {
-	rb_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
+	dln_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
     }
 
     /* Call the init code */
@@ -1324,6 +1254,7 @@ dln_load(file)
     char *buf;
     /* Load the file as an object one */
     init_funcname(&buf, file);
+    translit_separator(file);
 
 #ifdef USE_DLN_DLOPEN
 #define DLN_DEFINED
@@ -1347,7 +1278,12 @@ dln_load(file)
 	    goto failed;
 	}
 
-	init_fct = (void(*)())dlsym(handle, buf);
+	init_fct = (void(*)())(VALUE)dlsym(handle, buf);
+#if defined __SYMBIAN32__
+	if (init_fct == NULL) {
+	    init_fct = (void(*)())dlsym(handle, "1"); /* Some Symbian versions do not support symbol table in DLL, ordinal numbers only */
+	}
+#endif
 	if (init_fct == NULL) {
 	    error = DLN_ERROR();
 	    dlclose(handle);
@@ -1371,14 +1307,14 @@ dln_load(file)
 	lib = shl_load(file, flags, 0);
 	if (lib == NULL) {
 	    extern int errno;
-	    rb_loaderror("%s - %s", strerror(errno), file);
+	    dln_loaderror("%s - %s", strerror(errno), file);
 	}
 	shl_findsym(&lib, buf, TYPE_PROCEDURE, (void*)&init_fct);
 	if (init_fct == NULL) {
 	    shl_findsym(&lib, buf, TYPE_UNDEFINED, (void*)&init_fct);
 	    if (init_fct == NULL) {
 		errno = ENOSYM;
-		rb_loaderror("%s - %s", strerror(ENOSYM), file);
+		dln_loaderror("%s - %s", strerror(ENOSYM), file);
 	    }
 	}
 	(*init_fct)();
@@ -1403,11 +1339,11 @@ dln_load(file)
     }
 #endif /* _AIX */
 
-#if defined(NeXT) || defined(__APPLE__)
+#if defined(NeXT) || defined(MACOSX_DYLD)
 #define DLN_DEFINED
 /*----------------------------------------------------
    By SHIROYAMA Takayuki Psi@fortune.nest.or.jp
- 
+
    Special Thanks...
     Yu tomoak-i@is.aist-nara.ac.jp,
     Mi hisho@tasihara.nest.or.jp,
@@ -1422,30 +1358,30 @@ dln_load(file)
 	char *object_files[2] = {NULL, NULL};
 
 	void (*init_fct)();
-	
+
 	object_files[0] = (char*)file;
-	
+
 	s = NXOpenFile(2,NX_WRITEONLY);
 
 	/* Load object file, if return value ==0 ,  load failed*/
 	if(rld_load(s, NULL, object_files, NULL) == 0) {
 	    NXFlush(s);
 	    NXClose(s);
-	    rb_loaderror("Failed to load %.200s", file);
+	    dln_loaderror("Failed to load %.200s", file);
 	}
 
 	/* lookup the initial function */
 	if(rld_lookup(s, buf, &init_address) == 0) {
 	    NXFlush(s);
 	    NXClose(s);
-	    rb_loaderror("Failed to lookup Init function %.200s", file);
+	    dln_loaderror("Failed to lookup Init function %.200s", file);
 	}
 
 	NXFlush(s);
 	NXClose(s);
 
 	/* Cannot call *init_address directory, so copy this value to
-	   funtion pointer */
+	   function pointer */
 	init_fct = (void(*)())init_address;
 	(*init_fct)();
 	return (void*)init_address;
@@ -1463,15 +1399,15 @@ dln_load(file)
 	dyld_result = NSCreateObjectFileImageFromFile(file, &obj_file);
 
 	if (dyld_result != NSObjectFileImageSuccess) {
-	    rb_loaderror("Failed to load %.200s", file);
+	    dln_loaderror("Failed to load %.200s", file);
 	}
 
 	NSLinkModule(obj_file, file, NSLINKMODULE_OPTION_BINDNOW);
 
 	/* lookup the initial function */
 	if(!NSIsSymbolNameDefined(buf)) {
-	    rb_loaderror("Failed to lookup Init function %.200s",file);
-	}	
+	    dln_loaderror("Failed to lookup Init function %.200s",file);
+	}
 	init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
 	(*init_fct)();
 
@@ -1480,19 +1416,20 @@ dln_load(file)
 #endif /* rld or dyld */
 #endif
 
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__HAIKU__)
 # define DLN_DEFINED
     {
       status_t err_stat;  /* BeOS error status code */
-      image_id img_id;    /* extention module unique id */
-      void (*init_fct)(); /* initialize function for extention module */
+      image_id img_id;    /* extension module unique id */
+      void (*init_fct)(); /* initialize function for extension module */
 
-      /* load extention module */
+      /* load extension module */
       img_id = load_add_on(file);
       if (img_id <= 0) {
-	rb_loaderror("Failed to load %.200s", file);
+	dln_loaderror("Failed to load add_on %.200s error_code=%x",
+	  file, img_id);
       }
-      
+
       /* find symbol for module initialize function. */
       /* The Be Book KernelKit Images section described to use
 	 B_SYMBOL_TYPE_TEXT for symbol of function, not
@@ -1505,357 +1442,38 @@ dln_load(file)
       if (err_stat != B_NO_ERROR) {
 	char real_name[MAXPATHLEN];
 
-	strcpy(real_name, buf);
-	strcat(real_name, "__Fv");
+	strlcpy(real_name, buf, MAXPATHLEN);
+	strlcat(real_name, "__Fv", MAXPATHLEN);
         err_stat = get_image_symbol(img_id, real_name,
 				    B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
       }
 
       if ((B_BAD_IMAGE_ID == err_stat) || (B_BAD_INDEX == err_stat)) {
 	unload_add_on(img_id);
-	rb_loaderror("Failed to lookup Init function %.200s", file);
+	dln_loaderror("Failed to lookup Init function %.200s", file);
       }
       else if (B_NO_ERROR != err_stat) {
 	char errmsg[] = "Internal of BeOS version. %.200s (symbol_name = %s)";
 	unload_add_on(img_id);
-	rb_loaderror(errmsg, strerror(err_stat), buf);
+	dln_loaderror(errmsg, strerror(err_stat), buf);
       }
 
       /* call module initialize function. */
       (*init_fct)();
       return (void*)img_id;
     }
-#endif /* __BEOS__*/
-
-#ifdef __MACOS__
-# define DLN_DEFINED
-    {
-      OSErr err;
-      FSSpec libspec;
-      CFragConnectionID connID;
-      Ptr mainAddr;
-      char errMessage[1024];
-      Boolean isfolder, didsomething;
-      Str63 fragname;
-      Ptr symAddr;
-      CFragSymbolClass class;
-      void (*init_fct)();
-      char fullpath[MAXPATHLEN];
-
-      strcpy(fullpath, file);
-
-      /* resolve any aliases to find the real file */
-      c2pstr(fullpath);
-      (void)FSMakeFSSpec(0, 0, fullpath, &libspec);
-      err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
-      if (err) {
-	  rb_loaderror("Unresolved Alias - %s", file);
-      }
-
-      /* Load the fragment (or return the connID if it is already loaded */
-      fragname[0] = 0;
-      err = GetDiskFragment(&libspec, 0, 0, fragname, 
-			    kLoadCFrag, &connID, &mainAddr,
-			    errMessage);
-      if (err) {
-	  p2cstr(errMessage);
-	  rb_loaderror("%s - %s",errMessage , file);
-      }
-
-      /* Locate the address of the correct init function */
-      c2pstr(buf);
-      err = FindSymbol(connID, buf, &symAddr, &class);
-      if (err) {
-	  rb_loaderror("Unresolved symbols - %s" , file);
-      }
-      init_fct = (void (*)())symAddr;
-      (*init_fct)();
-      return (void*)init_fct;
-    }
-#endif /* __MACOS__ */
-
-#if defined(__VMS)
-#define DLN_DEFINED
-    {
-	long status;
-	void (*init_fct)();
-	char *fname, *p1, *p2;
-
-	$DESCRIPTOR(fname_d, "");
-	$DESCRIPTOR(image_d, "");
-	$DESCRIPTOR(buf_d, "");
-
-	decc$to_vms(file, vms_fileact, 0, 0);
-
-	fname = (char *)__alloca(strlen(file)+1);
-	strcpy(fname,file);
-	if (p1 = strrchr(fname,'/'))
-	    fname = p1 + 1;
-	if (p2 = strrchr(fname,'.'))
-	    *p2 = '\0';
-
-	fname_d.dsc$w_length  = strlen(fname);
-	fname_d.dsc$a_pointer = fname;
-	image_d.dsc$w_length  = strlen(vms_filespec);
-	image_d.dsc$a_pointer = vms_filespec;
-	buf_d.dsc$w_length    = strlen(buf);
-	buf_d.dsc$a_pointer   = buf;
-
-	lib$establish(vms_fisexh);
-
-	status = lib$find_image_symbol (
-		     &fname_d,
-		     &buf_d, 
-		     &init_fct, 
-		     &image_d);
-
-	lib$establish(0);
-
-	if (status == RMS$_FNF) {
-	    error = dln_strerror();
-	    goto failed;
-	} else if (!$VMS_STATUS_SUCCESS(status)) {
-	    error = DLN_ERROR();
-	    goto failed;
-	}
-
-	/* Call the init code */
-	(*init_fct)();
-
-	return 1;
-    }
-#endif /* __VMS */
+#endif /* __BEOS__ || __HAIKU__ */
 
 #ifndef DLN_DEFINED
-    rb_notimplement();
+    dln_notimplement();
 #endif
 
 #endif /* USE_DLN_A_OUT */
 #endif
 #if !defined(_AIX) && !defined(NeXT)
   failed:
-    rb_loaderror("%s - %s", error, file);
+    dln_loaderror("%s - %s", error, file);
 #endif
 
-#endif /* NO_DLN_LOAD */
     return 0;			/* dummy return */
 }
-
-static char *dln_find_1();
-
-char *
-dln_find_exe(fname, path)
-    const char *fname;
-    const char *path;
-{
-    if (!path) {
-	path = getenv(PATH_ENV);
-    }
-
-    if (!path) {
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__)
-	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
-#else
-	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
-#endif
-    }
-    return dln_find_1(fname, path, 1);
-}
-
-char *
-dln_find_file(fname, path)
-    const char *fname;
-    const char *path;
-{
-#ifndef __MACOS__
-    if (!path) path = ".";
-    return dln_find_1(fname, path, 0);
-#else
-    if (!path) path = ".";
-    return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, 0));
-#endif
-}
-
-static char fbuf[MAXPATHLEN];
-
-static char *
-dln_find_1(fname, path, exe_flag)
-    char *fname;
-    char *path;
-    int exe_flag;		/* non 0 if looking for executable. */
-{
-    register char *dp;
-    register char *ep;
-    register char *bp;
-    struct stat st;
-#ifdef __MACOS__
-    const char* mac_fullpath;
-#endif
-
-    if (!fname) return fname;
-    if (fname[0] == '/') return fname;
-    if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
-      return fname;
-    if (exe_flag && strchr(fname, '/')) return fname;
-#ifdef DOSISH
-    if (fname[0] == '\\') return fname;
-# ifdef DOSISH_DRIVE_LETTER
-    if (strlen(fname) > 2 && fname[1] == ':') return fname;
-# endif
-    if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
-      return fname;
-    if (exe_flag && strchr(fname, '\\')) return fname;
-#endif
-
-    for (dp = path;; dp = ++ep) {
-	register int l;
-	int i;
-	int fspace;
-
-	/* extract a component */
-	ep = strchr(dp, PATH_SEP[0]);
-	if (ep == NULL)
-	    ep = dp+strlen(dp);
-
-	/* find the length of that component */
-	l = ep - dp;
-	bp = fbuf;
-	fspace = sizeof fbuf - 2;
-	if (l > 0) {
-	    /*
-	    **	If the length of the component is zero length,
-	    **	start from the current directory.  If the
-	    **	component begins with "~", start from the
-	    **	user's $HOME environment variable.  Otherwise
-	    **	take the path literally.
-	    */
-
-	    if (*dp == '~' && (l == 1 ||
-#if defined(DOSISH)
-			       dp[1] == '\\' || 
-#endif
-			       dp[1] == '/')) {
-		char *home;
-
-		home = getenv("HOME");
-		if (home != NULL) {
-		    i = strlen(home);
-		    if ((fspace -= i) < 0)
-			goto toolong;
-		    memcpy(bp, home, i);
-		    bp += i;
-		}
-		dp++;
-		l--;
-	    }
-	    if (l > 0) {
-		if ((fspace -= l) < 0)
-		    goto toolong;
-		memcpy(bp, dp, l);
-		bp += l;
-	    }
-
-	    /* add a "/" between directory and filename */
-	    if (ep[-1] != '/')
-		*bp++ = '/';
-	}
-
-	/* now append the file name */
-	i = strlen(fname);
-	if ((fspace -= i) < 0) {
-	  toolong:
-	    fprintf(stderr, "openpath: pathname too long (ignored)\n");
-	    *bp = '\0';
-	    fprintf(stderr, "\tDirectory \"%s\"\n", fbuf);
-	    fprintf(stderr, "\tFile \"%s\"\n", fname);
-	    goto next;
-	}
-	memcpy(bp, fname, i + 1);
-
-#if defined(DOSISH)
-	if (exe_flag) {
-	    static const char extension[][5] = {
-#if defined(MSDOS)
-		".com", ".exe", ".bat",
-#if defined(DJGPP)
-		".btm", ".sh", ".ksh", ".pl", ".sed",
-#endif
-#elif defined(__EMX__) || defined(_WIN32)
-		".exe", ".com", ".cmd", ".bat",
-/* end of __EMX__ or _WIN32 */
-#else
-		".r", ".R", ".x", ".X", ".bat", ".BAT",
-/* __human68k__ */
-#endif
-	    };
-	    int j;
-
-	    for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) {
-		if (fspace < strlen(extension[j])) {
-		    fprintf(stderr, "openpath: pathname too long (ignored)\n");
-		    fprintf(stderr, "\tDirectory \"%.*s\"\n", (int) (bp - fbuf), fbuf);
-		    fprintf(stderr, "\tFile \"%s%s\"\n", fname, extension[j]);
-		    continue;
-		}
-		strcpy(bp + i, extension[j]);
-#ifndef __MACOS__
-		if (stat(fbuf, &st) == 0)
-		    return fbuf;
-#else
-		if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf))
-		    return mac_fullpath;
-
-#endif
-	    }
-	    goto next;
-	}
-#endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */
-
-#ifndef __MACOS__
-	if (stat(fbuf, &st) == 0) {
-	    if (exe_flag == 0) return fbuf;
-	    /* looking for executable */
-	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
-		return fbuf;
-	}
-#else
-	if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) {
-	    if (exe_flag == 0) return mac_fullpath;
-	    /* looking for executable */
-	    if (stat(mac_fullpath, &st) == 0) {
-		if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0)
-		    return mac_fullpath;
-	    }
-	}
-#endif
-
-      next:
-	/* if not, and no other alternatives, life is bleak */
-	if (*ep == '\0') {
-	    return NULL;
-	}
-
-	/* otherwise try the next component in the search path */
-    }
-}
-
-#if defined(__VMS)
-
-/* action routine for decc$to_vms */
-static int vms_fileact(char *filespec, int type)
-{
-    if (vms_filespec)
-	free(vms_filespec);
-    vms_filespec = malloc(strlen(filespec)+1);
-    strcpy(vms_filespec, filespec);
-    return 1;
-}
-
-/* exception handler for LIB$FIND_IMAGE_SYMBOL */
-static long vms_fisexh(long *sigarr, long *mecarr)
-{
-    sys$unwind(1, 0);
-    return 1;
-}
-
-#endif /* __VMS */
diff --git a/dln.h b/dln.h
index 182cf9f9f4..47ff3eaf59 100644
--- a/dln.h
+++ b/dln.h
@@ -3,10 +3,9 @@
   dln.h -
 
   $Author$
-  $Date$
   created at: Wed Jan 19 16:53:09 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
@@ -29,12 +28,14 @@
 # define _(args) ()
 #endif
 
-char *dln_find_exe _((const char*,const char*));
-char *dln_find_file _((const char*,const char*));
+DEPRECATED(char *dln_find_exe(const char*,const char*));
+DEPRECATED(char *dln_find_file(const char*,const char*));
+char *dln_find_exe_r(const char*,const char*,char*,size_t);
+char *dln_find_file_r(const char*,const char*,char*,size_t);
 
 #ifdef USE_DLN_A_OUT
 extern char *dln_argv0;
 #endif
 
-void *dln_load _((const char*));
+void *dln_load(const char*);
 #endif
diff --git a/dln_find.c b/dln_find.c
new file mode 100644
index 0000000000..728ace86d3
--- /dev/null
+++ b/dln_find.c
@@ -0,0 +1,304 @@
+/**********************************************************************
+
+  dln.c -
+
+  $Author$
+  created at: Tue Jan 18 17:05:06 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifdef RUBY_EXPORT
+#include "ruby/ruby.h"
+#define dln_notimplement rb_notimplement
+#define dln_memerror rb_memerror
+#define dln_exit rb_exit
+#define dln_loaderror rb_loaderror
+#else
+#define dln_notimplement --->>> dln not implemented <<<---
+#define dln_memerror abort
+#define dln_exit exit
+static void dln_loaderror(const char *format, ...);
+#endif
+#include "dln.h"
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef USE_DLN_A_OUT
+char *dln_argv0;
+#endif
+
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#ifndef xmalloc
+void *xmalloc();
+void *xcalloc();
+void *xrealloc();
+#endif
+
+#define free(x) xfree(x)
+
+#include <stdio.h>
+#if defined(_WIN32)
+#include "missing/file.h"
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifndef S_ISDIR
+#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef _WIN32
+char *getenv();
+#endif
+
+static char *dln_find_1(const char *fname, const char *path, char *buf, size_t size, int exe_flag);
+
+char *
+dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
+{
+    char *envpath = 0;
+
+    if (!path) {
+	path = getenv(PATH_ENV);
+	if (path) path = envpath = strdup(path);
+    }
+
+    if (!path) {
+#if defined(_WIN32)
+	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
+#else
+	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
+#endif
+    }
+    buf = dln_find_1(fname, path, buf, size, 1);
+    if (envpath) free(envpath);
+    return buf;
+}
+
+char *
+dln_find_file_r(const char *fname, const char *path, char *buf, size_t size)
+{
+    if (!path) path = ".";
+    return dln_find_1(fname, path, buf, size, 0);
+}
+
+static char fbuf[MAXPATHLEN];
+
+char *
+dln_find_exe(const char *fname, const char *path)
+{
+    return dln_find_exe_r(fname, path, fbuf, sizeof(fbuf));
+}
+
+char *
+dln_find_file(const char *fname, const char *path)
+{
+    return dln_find_file_r(fname, path, fbuf, sizeof(fbuf));
+}
+
+static char *
+dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
+	   int exe_flag /* non 0 if looking for executable. */)
+{
+    register const char *dp;
+    register const char *ep;
+    register char *bp;
+    struct stat st;
+    size_t i, fspace;
+#ifdef DOSISH
+    static const char extension[][5] = {
+	EXECUTABLE_EXTS,
+    };
+    size_t j;
+    int is_abs = 0, has_path = 0;
+    const char *ext = 0;
+#endif
+    const char *p = fname;
+
+    static const char pathname_too_long[] = "openpath: pathname too long (ignored)\n\
+\tDirectory \"%.*s\"\n\tFile \"%s\"\n";
+#define PATHNAME_TOO_LONG() fprintf(stderr, pathname_too_long, (int)(bp - fbuf), fbuf, fname)
+
+#define RETURN_IF(expr) if (expr) return (char *)fname;
+
+    RETURN_IF(!fname);
+#ifdef DOSISH
+# ifndef CharNext
+# define CharNext(p) ((p)+1)
+# endif
+# ifdef DOSISH_DRIVE_LETTER
+    if (((p[0] | 0x20) - 'a') < 26  && p[1] == ':') {
+	p += 2;
+	is_abs = 1;
+    }
+# endif
+    switch (*p) {
+      case '/': case '\\':
+	is_abs = 1;
+	p++;
+    }
+    has_path = is_abs;
+    while (*p) {
+	switch (*p) {
+	  case '/': case '\\':
+	    has_path = 1;
+	    ext = 0;
+	    p++;
+	    break;
+	  case '.':
+	    ext = p;
+	    p++;
+	    break;
+	  default:
+	    p = CharNext(p);
+	}
+    }
+    if (ext) {
+	for (j = 0; STRCASECMP(ext, extension[j]); ) {
+	    if (++j == sizeof(extension) / sizeof(extension[0])) {
+		ext = 0;
+		break;
+	    }
+	}
+    }
+    ep = bp = 0;
+    if (!exe_flag) {
+	RETURN_IF(is_abs);
+    }
+    else if (has_path) {
+	RETURN_IF(ext);
+	i = p - fname;
+	if (i + 1 > size) goto toolong;
+	fspace = size - i - 1;
+	bp = fbuf;
+	ep = p;
+	memcpy(fbuf, fname, i + 1);
+	goto needs_extension;
+    }
+    p = fname;
+#endif
+
+    if (*p == '.' && *++p == '.') ++p;
+    RETURN_IF(*p == '/');
+    RETURN_IF(exe_flag && strchr(fname, '/'));
+
+#undef RETURN_IF
+
+    for (dp = path;; dp = ++ep) {
+	register size_t l;
+
+	/* extract a component */
+	ep = strchr(dp, PATH_SEP[0]);
+	if (ep == NULL)
+	    ep = dp+strlen(dp);
+
+	/* find the length of that component */
+	l = ep - dp;
+	bp = fbuf;
+	fspace = size - 2;
+	if (l > 0) {
+	    /*
+	    **	If the length of the component is zero length,
+	    **	start from the current directory.  If the
+	    **	component begins with "~", start from the
+	    **	user's $HOME environment variable.  Otherwise
+	    **	take the path literally.
+	    */
+
+	    if (*dp == '~' && (l == 1 ||
+#if defined(DOSISH)
+			       dp[1] == '\\' ||
+#endif
+			       dp[1] == '/')) {
+		char *home;
+
+		home = getenv("HOME");
+		if (home != NULL) {
+		    i = strlen(home);
+		    if (fspace < i)
+			goto toolong;
+		    fspace -= i;
+		    memcpy(bp, home, i);
+		    bp += i;
+		}
+		dp++;
+		l--;
+	    }
+	    if (l > 0) {
+		if (fspace < l)
+		    goto toolong;
+		fspace -= l;
+		memcpy(bp, dp, l);
+		bp += l;
+	    }
+
+	    /* add a "/" between directory and filename */
+	    if (ep[-1] != '/')
+		*bp++ = '/';
+	}
+
+	/* now append the file name */
+	i = strlen(fname);
+	if (fspace < i) {
+	  toolong:
+	    PATHNAME_TOO_LONG();
+	    goto next;
+	}
+	fspace -= i;
+	memcpy(bp, fname, i + 1);
+
+#if defined(DOSISH)
+	if (exe_flag && !ext) {
+	  needs_extension:
+	    for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) {
+		if (fspace < strlen(extension[j])) {
+		    PATHNAME_TOO_LONG();
+		    continue;
+		}
+		strlcpy(bp + i, extension[j], fspace);
+		if (stat(fbuf, &st) == 0)
+		    return fbuf;
+	    }
+	    goto next;
+	}
+#endif /* _WIN32 or __EMX__ */
+
+	if (stat(fbuf, &st) == 0) {
+	    if (exe_flag == 0) return fbuf;
+	    /* looking for executable */
+	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
+		return fbuf;
+	}
+      next:
+	/* if not, and no other alternatives, life is bleak */
+	if (*ep == '\0') {
+	    return NULL;
+	}
+
+	/* otherwise try the next component in the search path */
+    }
+}
diff --git a/dmydln.c b/dmydln.c
index 09ea06806c..2c8aacc06a 100644
--- a/dmydln.c
+++ b/dmydln.c
@@ -1,2 +1,7 @@
-#define NO_DLN_LOAD 1
-#include "dln.c"
+#include "ruby/ruby.h"
+
+void*
+dln_load(const char *file)
+{
+    rb_loaderror("this executable file can't load extension libraries");
+}
diff --git a/dmyencoding.c b/dmyencoding.c
new file mode 100644
index 0000000000..1bd1106e69
--- /dev/null
+++ b/dmyencoding.c
@@ -0,0 +1,2 @@
+#define NO_LOCALE_CHARMAP 1
+#include "encoding.c"
diff --git a/dmyext.c b/dmyext.c
index 4120d493c3..4d273f7faf 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -1,4 +1,4 @@
 void
-Init_ext()
+Init_ext(void)
 {
 }
diff --git a/dmyversion.c b/dmyversion.c
new file mode 100644
index 0000000000..279c6ea95a
--- /dev/null
+++ b/dmyversion.c
@@ -0,0 +1,2 @@
+#define NO_INITIAL_LOAD_PATH 1
+#include "version.c"
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
index d168a50f80..e16c7f4f20 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -10516,6 +10516,11 @@ Thu Jan 17 16:21:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (block_pass): should allow block argument relay even in
 	  the tainted mode.
 
+Thu Jan 17 09:43:05 2002  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* misc/ruby-mode.el (ruby-add-log-current-method): New function
+	for `add-log-current-defun-function'.
+
 Thu Jan 17 04:51:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c: support subclassing by proper "initialize"
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
new file mode 100644
index 0000000000..c9d32916cf
--- /dev/null
+++ b/doc/ChangeLog-YARV
@@ -0,0 +1,6917 @@
+# $Id: ChangeLog 590 2006-12-31 09:02:34Z ko1 $
+#
+# YARV ChangeLog
+#  from Mon, 03 May 2004 01:24:19 +0900
+#
+
+Sun Dec 31 18:01:50 2006  Koichi Sasada  <ko1@atdot.net>
+
+	* bin/* : ruby/trunk/bin 11437
+
+
+Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : remove old Kernel#funcall definition
+
+
+2006-12-30(Sat) 07:59:26 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* catch up ruby/trunk 11437
+
+	* eval_intern.h : reorder tag initialization
+
+	* eval.c : fix to support __send!, funcall and prohibit funcall as
+	send
+
+	* eval_error.h, eval_jump.h, eval_safe.h : fix prototypes
+
+	* eval_method.h, vm.c : check re-definition at rb_add_method()
+
+	* yarvcore.h : fix typo
+
+	* compile.c : fix white spaces
+
+	* lib/delegate.rb : fix to support __send, ...
+
+	* lib/getoptlong.rb : fix to work on YARV
+
+	* lib/rss/parser.rb : use __send! instead of __send__
+
+	* sample/test.rb : comment out codes which use |&b| type block parameter
+
+	* ext/ripper/extconf.rb : turn off
+
+	* test/ripper/test_files.rb, test_parser_events.rb,
+	test_scanner_events.rb : fix to check it has ripper module
+
+	* vm_dump.c : remove showing file path length limitation
+
+	* yarvtest/test_eval.rb : use __send! instead of __send__
+
+
+2006-12-19(Tue) 11:46:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* doc/* : added
+
+	* ext/openssl : added
+
+	* ext/ripper : added
+
+	* test/openssl : added
+
+	* test/ripper : added
+
+	* misc : added
+
+	* rb/ -> tool/ : renamed
+
+	* common.mk : fixed for above change
+
+	* ruby_doc/* : move to topdir
+
+	* sample/* : added
+
+	* test2.rb : removed
+
+
+2006-12-15(Fri) 09:42:46 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : remove obsolete codes
+
+	* insns.def : fix a comment of getconstant
+
+
+2006-12-13(Wed) 16:26:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c, compile.c, compile.h, debug.c, debug.h,
+	insnhelper.h, insns.def, iseq.c, thread.c, thread_pthread.ci,
+	thread_pthread.h, thread_win32.ci, thread_win32.h, vm.c, vm.h,
+	vm_dump.c, vm_evalbody.ci,  vm_opts.h.base,  yarv.h, 
+	yarv_version.h, yarvcore.c, yarvcore.h :
+	add a header includes copyright
+
+
+2006-12-12(Tue) 13:13:32 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb : add PREFETCH() statement
+
+	* vm.h : ditto
+
+	* yarvcore.h : fix LIKELY(x) and
+	remove main_thread_val field from yarv_vm_t
+
+	* yarvcore.c : ditto
+
+	* thread.c : support fork
+
+	* eval_thread.c : ditto
+
+	* process.c : ditto
+
+	* signal.c : ditto
+
+	* test/ruby/test_signal.rb : 
+
+	* thread_pthread.ci : rename timer thread functions
+
+	* thread_win32.ci : ditto
+
+
+2006-11-10(Fri) 21:29:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix to compile arguments
+
+	* insns.def : fix to duplicate first array value on concatarray
+	instruction
+
+	* yarvtest/test_bin.rb : add a test for above change
+
+	* sample/test.rb : fix to catch up Ruby HEAD (fix to remove test about
+	module duplicate)
+
+
+2006-11-10(Fri) 12:49:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_macro.def : fix to inherit visibility on
+	NODE_SUPER method invocation
+
+
+2006-11-10(Fri) 09:13:46 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c : revert module duplicate inclusion
+
+	* parse.y : catch up current Ruby HEAD
+
+	* node.h : ditto
+
+	* compile.c : ditto
+
+	* gc.c : ditto
+
+	* iseq.c : ditto
+
+	* eval_thread.c : define Continuation (null class)
+
+	* vm_dump.c : fix to output backtrae to stderr
+
+	* yarvtest/test_block.rb : remove unsupported test
+
+	* yarvtest/test_class.rb : add a test about super
+
+	* yarvtest/test_syntax.rb : add a test about case/when
+
+
+2006-11-09(Thu) 10:22:59 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* call_cfunc.h -> call_cfunc.ci : renamed
+
+	* vm_evalbody.h, vm_evalbody.ci : ditto
+
+	* thread_pthread.h, thread_pthread.ci : separate declaration and
+	implementation
+
+	* thread_win32.h, thread_win32.ci : ditto
+
+	* thread.c : use *.ci instead of *.c as implementation
+
+	* vm.c : ditto
+
+	* common.mk : fix rules for above changes
+
+
+2006-11-08(Wed) 17:23:23 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c : show C level backtrace (pointer only) with
+	backtrace() function (glibc feature)
+
+	* configure.in : ditto
+
+	* yarvcore.c : add NSDR method (show C level backtrace)
+
+	* error.c : fix indent
+
+
+2006-11-07(Tue) 13:17:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_set_errinfo) : added
+
+	* ruby.h : ditto
+
+	* version.h : fix version number
+
+	* lib/webrick/utils.rb : fix to remove Thread.critical
+
+	* ext/dbm, dl, gdbm, iconv, io, pty, sdbm : added
+
+	* test/dbm, gdbm, io, logger, net, readline, sdbm, soap, 
+	  webrick, win32ole, wsdl, xsd : added
+
+
+2006-11-06(Mon) 22:32:18 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c : import Ruby HEAD
+
+	* ext/socket/extconf.rb : ditto
+
+	* ext/socket/socket.c : ditto
+
+	* gc.c : ditto
+
+	* lib/date.rb : ditto
+
+	* lib/net/imap.rb : ditto
+
+	* lib/rss/0.9.rb : ditto
+
+	* lib/set.rb : ditto
+
+	* lib/soap/mapping/rubytypeFactory.rb : ditto
+
+	* lib/soap/mimemessage.rb : ditto
+
+	* lib/soap/property.rb : ditto
+
+	* lib/webrick/httprequest.rb : ditto
+
+	* lib/webrick/httputils.rb : ditto
+
+	* lib/xmlrpc/create.rb : ditto
+
+	* lib/xsd/codegen/gensupport.rb : ditto
+
+	* object.c : ditto
+
+	* ruby.h : ditto
+
+	* string.c : ditto
+
+	* version.h : ditto
+
+	* rb/ir.rb : fix to use "diffs" directory
+
+	* vm_dump.c : add "const"
+
+
+2006-11-06(Mon) 16:36:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_proc.c : remove "static" from external global variables
+
+	* eval_thread.c : ditto
+
+	* array.c : fix indent
+
+	* insns.def : add a suitable cast
+
+	* vm_macro.def : allow scalar value on splat arguments
+
+	* yarvtest/test_block.rb : fix to synchronize Ruby HEAD
+
+	* rb/insns2vm.rb : remove String#each for 1.9
+
+	* template/vm.inc.tmpl : ditto (remove String#each_with_index)
+
+
+2006-11-06(Mon) 13:22:34 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c : fixed GC debugging outputs
+
+	* rb/parse.rb : fixed output format
+
+
+2006-11-04(Sat) 09:46:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix to duplicate "#{'foo'}" string
+
+	* yarvtest/test_bin.rb : add a test for above
+
+	* ext/readline/readline.c : import Ruby HEAD
+
+	* keywords : ditto
+
+	* lex.c : ditto
+
+	* parse.y : ditto
+
+	* lib/mkmf.rb : ditto
+
+	* test/ruby/test_hash.rb : fix to current specification
+
+	* test/ruby/test_string.rb : ditto
+
+
+2006-11-03(Fri) 20:58:36 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/nkf/nkf-utf8/utf8tbl.h : missed to add
+
+	* configure.in : import ruby HEAD
+
+	* test/ruby/test_array.rb : ditto
+
+	* test/ruby/test_assignment.rb : ditto
+
+	* test/ruby/test_clone.rb : ditto
+
+	* test/socket/test_socket.rb : ditto
+
+	* test/socket/test_unix.rb : ditto
+
+	* test/strscan/test_stringscanner.rb : ditto
+
+	* test/testunit/collector/test_dir.rb : ditto
+
+
+2006-11-03(Fri) 20:22:24 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c : import current ruby HEAD and apply API changes
+	This version has some known bugs
+
+	* bignum.c : ditto
+
+	* blockinlining.c : ditto
+
+	* class.c : ditto
+
+	* compile.c : ditto
+
+	* dir.c : ditto
+
+	* dln.c : ditto
+
+	* enum.c : ditto
+
+	* enumerator.c : ditto
+
+	* error.c : ditto
+
+	* eval.c : ditto
+
+	* eval_error.h : ditto
+
+	* eval_jump.h : ditto
+
+	* eval_load.c : ditto
+
+	* eval_proc.c : ditto
+
+	* ext/*
+
+	* file.c : ditto
+
+	* gc.c : ditto
+
+	* hash.c : ditto
+
+	* insns.def : ditto
+
+	* instruby.rb : ditto
+
+	* intern.h : ditto
+
+	* io.c : ditto
+
+	* iseq.c : ditto
+
+	* lib/*
+
+	* marshal.c : ditto
+
+	* math.c : ditto
+
+	* missing/vsnprintf.c : ditto
+
+	* mkconfig.rb : ditto
+
+	* node.h : ditto
+
+	* numeric.c : ditto
+
+	* object.c : ditto
+
+	* oniguruma.h : ditto
+
+	* pack.c : ditto
+
+	* parse.y : ditto
+
+	* prec.c : ditto
+
+	* process.c : ditto
+
+	* random.c : ditto
+
+	* range.c : ditto
+
+	* rb/ir.rb : ditto
+
+	* re.c : ditto
+
+	* regcomp.c : ditto
+
+	* regerror.c : ditto
+
+	* regexec.c : ditto
+
+	* regint.h : ditto
+
+	* regparse.c : ditto
+
+	* regparse.h : ditto
+
+	* ruby.c : ditto
+
+	* ruby.h : ditto
+
+	* rubytest.rb : ditto
+
+	* runruby.rb : ditto
+
+	* sample/test.rb : ditto
+
+	* signal.c : ditto
+
+	* sprintf.c : ditto
+
+	* st.c : ditto
+
+	* st.h : ditto
+
+	* string.c : ditto
+
+	* struct.c : ditto
+
+	* test/*
+
+	* thread.c : ditto
+
+	* time.c : ditto
+
+	* util.c : ditto
+
+	* variable.c : ditto
+
+	* version.h : ditto
+
+	* vm.c : ditto
+
+	* vm_dump.c : ditto
+
+	* vm_macro.def : ditto
+
+	* win32/*
+
+
+2006-10-31(Tue) 22:47:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y : fix NEWHEAP bugs (import HEAD)
+
+	* ruby.c, intern.h, yarvcore.c (rb_load_file) : change to
+	return parsed node pointer
+
+	* rb/ir.rb : add check mode
+
+
+2006-09-01(Fri) 22:05:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix a bug of peephole optimization and enable
+	regexp optimization
+
+
+2006-08-21(Mon) 05:27:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/mathn.rb : remove "remove_method :gcd2"
+
+	* opt_insn_unif.def : unset opt setting
+
+	* opt_operand.def : ditto
+
+
+2006-08-18(Fri) 17:55:31 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add dependency of yarvcore.h to thread.o
+
+	* gc.c : change comment line
+
+	* thread.c : remove some line break
+
+	* yarvcore.c : reoder initialize sequence to mark main thread
+
+
+2006-08-18(Fri) 16:51:34 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : add a support for cache values per thread
+
+	* yarvcore.c : ditto
+
+	* gc.c : ditto
+
+	* thread.c : move a expression after acquiring lock
+
+	* compile.c : add a cast to remove warning
+
+
+2006-08-18(Fri) 02:07:45 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix to return rhs value on ATTRASGIN
+
+	* insns.def (setn) : add insn setn
+
+	* yarvtest/test_bin.rb : add tests for above
+
+
+2006-08-17(Thu) 22:46:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : clear callee_id ([yarv-dev:1073])
+
+
+2006-08-17(Thu) 22:14:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.h : fix error message
+
+
+2006-08-17(Thu) 12:23:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : change initilize routine order ([yarv-dev:1067])
+
+	* yarvcore.c (Init_yarv) : init th->machine_stack_start
+
+	* thread_pthread.h : add malloc value check ([yarv-dev:1066])
+
+	* insns.def (opt_eq) : fix typo ([yarv-dev:1072])
+
+	* yarvtest/test_opts.rb : add a test for above
+
+	* yarvtest/test_class.rb : add a test for last commit
+
+
+2006-08-17(Thu) 11:02:16 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (clone_method) : check undef-ed method ([yarv-dev:1068])
+
+
+2006-08-15(Tue) 15:07:43 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix opt_plus routine ([yarv-dev-en:149])
+
+	* yarvtest/test_opts.rb : add tests for above
+
+
+2006-08-06(Sun) 06:24:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : fix build rule (build only ruby binary when benchmark)
+
+	* yarvcore.[ch] : fix and add yarv_iseq_new_with_* API
+
+	* blockinlining.c : ditto
+
+	* compile.c : ditto
+
+	* compile.h : ditto
+
+	* iseq.c : ditto
+
+	* eval_method.h : check redefinition for specialized instruction
+
+	* insnhelper.h : ditto
+
+	* insns.def : ditto
+
+	* vm.c : ditto
+
+	* vm.h : ditto
+
+	* numeric.c : add Fixnum#succ
+
+	* thread.c : remove duplicated method Thread#current
+
+	* yarvcore.c : remove duplicated method Proc#clone
+
+	* yarvtest/test_opts.rb : added
+
+
+2006-07-20(Thu) 04:10:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix [yarv-dev:1041] problem (raise TypeError)
+
+	* eval.c : rb_funcall2 send as NOEX_PRIVATE and check scope
+
+
+2006-07-20(Thu) 03:38:46 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : fix [yarv-dev:1040] bug
+
+
+2006-07-18(Tue) 18:45:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* some files : set property "svn:eol-style" as native
+
+
+2006-07-18(Tue) 18:35:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+        * gc.h : fix a static function name
+
+        * vm.c : remove Japanese comments
+
+        * yarvcore.c : add a comment
+
+	* some files : set property "svn:eol-style" as native
+
+
+2006-07-18(Tue) 16:48:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : remove unused code
+
+	* compile.c : add checking value
+
+	* iseq.c : ditto
+
+	* yarvcore.c : fix yarv_th_eval prototype declaration
+
+	* yarvtest/yarvtest.rb : use compile instead of parse method
+
+
+2006-07-12(Wed) 15:18:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarv_version.h : 0.4.1
+
+	* Changes : ditto
+
+
+2006-07-12(Wed) 13:38:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+        * eval.c : fix indent
+
+        * gc.h : fix syntax bug
+
+        * thread_pthread.h : vanish warnning message
+
+        * iseq.c : ditto
+
+        * compile.c : ditto
+
+        * thread.c : ditto
+
+        * vm.c : ditto
+
+        * yarvcore.c : prohibit tail call optimization to mark 
+	iseq object
+
+        * yarvcore.h : add some allocator function declaration
+
+        * yarvtest/test_eval.rb : remove output
+
+
+2006-07-12(Wed) 05:01:23 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : undef alloc funcs
+
+	* eval_proc.c : ditto (use factory faction)
+
+	* thread.c : ditto
+
+	* vm.c : ditto
+
+	* iseq.c : fix compile option creation
+
+	* rb/allload.rb : use compile_file method
+
+	* rb/compile.rb : ditto
+
+	* rb/parse.rb : ditto
+
+	* template/insnstbl.html : hide mail addr
+
+
+2006-07-11(Tue) 21:34:29 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_dir.rb: new test test_JVN_13947696.
+
+
+2006-07-11(Tue) 21:26:41 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_alias.rb: new test test_JVN_83768862.
+
+
+2006-07-11(Tue) 11:33:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix compile error on C90
+
+
+2006-07-11(Tue) 10:40:23 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* disasm.c : removed
+
+	* iseq.c : added
+
+	* common.mk : ditto
+
+	* blockinlining.c : Get*Val => Get*Ptr
+
+	* eval.c : ditto
+
+	* yarvcore.c : ditto
+
+	* eval_proc.c : ditto
+
+	* vm_dump.c : ditto
+
+	* vm_macro.def : ditto
+
+	* signal.c : ditto
+
+	* vm.c : ditto
+
+	* thread.c : ditto
+
+	* compile.c : rename local variable insnobj => iobj
+
+	* compile.c : support yarv_compile_option_t
+
+	* gc.h : added
+
+	* insns.def : use OPT_CHECKED_RUN instead of IGNORE_OPTIMIZE
+
+	* rb/compile.rb : use compile option
+
+	* template/optinsn.inc.tmpl : fix function name
+
+	* vm_opts.h.base : change macros
+
+	* rb/insns2vm.rb : ditto
+
+	* yarv.h : fix yarvcore_eval_parsed parameter type
+
+	* yarvcore.c : fix some interfaces (functions)
+
+	* yarvcore.h : add a type yarv_compile_option_t
+
+
+2006-07-06(Thu) 13:45:20 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/yasm.rb : pass builder object if block arity == 1
+
+
+2006-07-05(Wed) 11:23:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/yasm.rb : fix method name
+
+	* vm.c (th_set_top_stack) : check toplevel or not
+
+
+2006-07-04(Tue) 20:05:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/compile.rb : added
+
+	* yarvtest/yarvtest.rb : disable load/store test
+
+
+2006-07-04(Tue) 18:17:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix some bugs about load iseq data
+
+	* disasm.c : ditto (store)
+
+	* eval.c (rb_f_local_variables) : fix bugs
+
+	* insns.def : fix otp_ltlt condition bug
+
+	* vm.c : ditto
+
+	* yarvcore.c : rename some functions
+
+	* yarvtest/yarvtest.rb : add iseq load/store tests
+	(to enable this, remove comment)
+
+
+2006-07-03(Mon) 01:54:23 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_thread.c : add parameter "th" to thread_set_raised
+
+	* yarvcore.h : ditto
+
+	* eval_intern.h : ditto
+
+	* eval.c : ditto
+
+	* eval_error.h : declare with ANSI style
+
+	* disasm.c : rename iseq_iseq2simpledata() to iseq_data_to_ary
+
+	* lib/yasm.rb : rename Instruction#to_simpledata to
+	Instruction#to_a
+
+	* yarvcore.c : ditto
+
+	* vm.c : fix bug (Proc.new{|*args| p args}.call(1) #=> 1)
+
+	* yarvtest/test_proc.rb : add a tests for above
+
+
+2006-06-21(Wed) 09:19:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : remove yarv_iseq_t#catch_table_ary and
+	add yarv_iseq_t#compile_data#catch_table_ary
+
+	* compile.h : ditto
+
+	* yarvcore.c : ditto
+
+	* yarvcore.h : ditto
+
+	* eval_thread.c : remove unused code
+
+	* thread.c : add rb_gc_mark_threads() (from eval_thread.c)
+
+
+2006-05-31(Wed) 21:26:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+        * parse.y : prohibit tail call optimization to mark vparsr
+	object
+
+
+2006-05-25(Thu) 15:37:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c : support NEW_ATTRASGN node
+
+	* class.c : skip undefined method to collect ([yarv-dev:999])
+
+	* yarvtest/test_class.rb : add a test for above
+
+	* compile.c : fix opt_regexpmatch1 condition
+
+	* lib/monitor.rb : fix [yarv-dev:1009]
+
+	* rb/insns2vm.rb : fix typo
+
+	* thread.c : prohibit unlock by not mutex owner thread
+
+	* vm_opts.h.base : change default option
+
+
+2006-05-18(Thu) 16:00:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* intern.h : fix prototype declarations for last re.c change
+
+
+2006-05-18(Thu) 12:12:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/runruby.rb : added
+
+	* thread.c (rb_thread_alone) : check if vm->living_threads
+	is available
+
+
+2006-05-18(Thu) 12:05:35 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* signal.c : not mask SIGSEGV
+
+	* thread.c : fix debug output on Win32
+
+	* thread.c, thread_pthread.h : add some debug prints
+
+	* yarvcore.c : mark machine registers on thread_mark
+
+
+2006-05-17(Wed) 18:09:20 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (sys_warning): should not call a vararg function
+	  rb_sys_warning() indirectly.  [ruby-core:07886]
+
+
+2006-05-17(Wed) 16:41:41 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): should not allow modifying literal
+	  regexps.  frozen check moved from rb_reg_initialize_m as well.
+
+	* re.c (rb_reg_initialize): should not modify untainted objects in
+	  safe levels higher than 3.
+
+	* re.c (rb_memcmp): type change from char* to const void*.
+
+	* dir.c (dir_close): should not close untainted dir stream.
+
+	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
+
+
+2006-05-07(Sun) 21:06:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c : remove Mutex#unlock_and_stop and add Mutex#sleep
+
+	* lib/monitor.rb : ditto
+
+	* lib/thread.rb : ditto
+
+	* thread_pthread.h : fix stack size
+
+	* thread_win32.h : fix sleep
+
+	* yarvcore.h : disable to use get/setcontext
+
+	* lib/webrick/server.rb : add experimental implementation 
+	using thraeds pool
+
+
+2006-05-05(Fri) 13:59:00 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_signal.rb : disable a test
+
+	* thread.c : do trylock before lock on mutex_lock
+
+	* thread_win32.h : use CriticalSection instead of Mutex
+
+
+2006-05-05(Fri) 03:03:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : vtune rule make run test.rb
+
+	* disasm.c : fix syntax errors (on VC)
+
+	* yarvcore.c : ditto
+
+	* lib/thread.rb : Mutex#synchronize is defined here
+
+	* lib/*.rb : ditto
+
+	* signal.c : separate pthread or not
+
+	* thread.c : support lightweight wakeup
+
+	* thread_pthread.h : ditto
+
+	* thread_win32.h : ditto
+
+	* yarvcore.h : ditto
+
+	* yarvtest/test_thread.rb : restore last change
+
+
+2006-05-04(Thu) 18:11:43 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_thread.c : remove rb_thread_interrupt
+
+	* intern.h : ditto
+
+	* signal.c : change signal transfer route
+
+	* thread.c : ditto
+
+	* thread_pthread.h : ditto
+
+	* thread_win32.h : ditto
+
+	* yarv.h : support GET_VM()
+
+	* yarvcore.h : change yarv_thread_t/yarv_vm_t structure
+
+	* yarvtest/test_thread.rb : decrease threads to test
+
+
+2006-05-04(Thu) 00:26:18 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.h : experimental support of thread cache
+
+
+2006-04-25(Tue) 22:30:14 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : remove struct yarv_cmethod_info, add
+	data structure for profiling and extend yarv_control_frame_t
+
+	* vm.c : make pop_frame() and apply above change
+
+	* eval.c : ditto
+
+	* vm_dump.c : ditto
+
+	* vm_macro.def : ditto
+
+	* insns.def (leave): use pop_frame() instead of
+	POP_CONTROL_STACK_FRAME() macro
+
+	* insnhelper.h : remove some macros
+
+	* yarvcore.c : change th_set_top_stack() prototype
+
+
+2006-04-18(Tue) 18:37:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, disasm.c : support export/import exception
+	information
+
+	* yarvcore.h : change "struct catch_table_entry" member variable
+	order
+
+
+2006-04-13(Thu) 17:11:30 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* bignum.c : import ruby 1.9 HEAD (Ruby 1.9.0 2006-04-08)
+
+	* dir.c : ditto
+
+	* enumerator.c : ditto
+
+	* ext/.document : ditto
+
+	* ext/extmk.rb : ditto
+
+	* ext/nkf/lib/kconv.rb : ditto
+
+	* ext/nkf/nkf-utf8/nkf.c : ditto
+
+	* ext/nkf/nkf-utf8/utf8tbl.c : ditto
+
+	* ext/nkf/nkf.c : ditto
+
+	* ext/nkf/test.rb : ditto
+
+	* ext/socket/.cvsignore : ditto
+
+	* ext/win32ole/sample/excel2.rb : ditto
+
+	* ext/win32ole/tests/testOLEMETHOD.rb : ditto
+
+	* ext/win32ole/tests/testOLEPARAM.rb : ditto
+
+	* ext/win32ole/tests/testOLETYPE.rb : ditto
+
+	* ext/win32ole/tests/testOLETYPELIB.rb : ditto
+
+	* ext/win32ole/tests/testOLEVARIABLE.rb : ditto
+
+	* ext/win32ole/tests/testOLEVARIANT.rb : ditto
+
+	* ext/win32ole/tests/testWIN32OLE.rb : ditto
+
+	* ext/win32ole/tests/testall.rb : ditto
+
+	* ext/win32ole/win32ole.c : ditto
+
+	* gc.c : ditto
+
+	* instruby.rb : ditto
+
+	* io.c : ditto
+
+	* lib/delegate.rb : ditto
+
+	* lib/fileutils.rb : ditto
+
+	* lib/find.rb : ditto
+
+	* lib/irb/ruby-lex.rb : ditto
+
+	* lib/mkmf.rb : ditto
+
+	* lib/net/http.rb : ditto
+
+	* lib/open-uri.rb : ditto
+
+	* lib/pathname.rb : ditto
+
+	* lib/rational.rb : ditto
+
+	* lib/rdoc/parsers/parse_rb.rb : ditto
+
+	* lib/rdoc/ri/ri_paths.rb : ditto
+
+	* lib/resolv.rb : ditto
+
+	* lib/test/unit/collector/objectspace.rb : ditto
+
+	* lib/webrick/httpservlet/cgihandler.rb : ditto
+
+	* math.c : ditto
+
+	* mkconfig.rb : ditto
+
+	* object.c : ditto
+
+	* oniguruma.h : ditto
+
+	* pack.c : ditto
+
+	* parse.y : ditto
+
+	* re.c : ditto
+
+	* re.h : ditto
+
+	* regcomp.c : ditto
+
+	* regerror.c : ditto
+
+	* regparse.c : ditto
+
+	* ruby.h : ditto
+
+	* rubytest.rb : ditto
+
+	* runruby.rb : ditto
+
+	* string.c : ditto
+
+	* test/digest/test_digest.rb : ditto
+
+	* test/pathname/test_pathname.rb : ditto
+
+	* test/ruby/envutil.rb : ditto
+
+	* test/ruby/test_float.rb : ditto
+
+	* test/ruby/test_pack.rb : ditto
+
+	* time.c : ditto
+
+	* util.c : ditto
+
+	* version.h : ditto
+
+	* win32/mkexports.rb : ditto
+
+	* win32/resource.rb : ditto
+
+	* win32/win32.c : ditto
+
+
+2006-04-11(Tue) 11:26:53 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/yasm.rb : move to lib/yasm.rb
+
+
+2006-04-09(Sun) 03:04:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : change to accept method iseq object when loading from
+	simple data
+
+	* yarvcore.c : add a debug output
+
+	* rb/yasm.rb : change some interfaces
+
+
+2006-04-07(Fri) 20:25:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix miss about range of catch "next"
+
+	* eval.c : add braces
+
+
+2006-04-07(Fri) 11:09:43 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : fix some make rules
+
+	* insns.def : rename some instructions name
+
+	* rb/insns2vm.rb : change some operand type name
+
+	* vm_evalbody.h : ditto
+
+	* template/insns.inc.tmpl : add YARV_MAX_INSTRUCTION_SIZE macro
+
+	* compile.c, disasm.c, yarvcore.c : support load/store iseq from/to simple
+	data structure such as array, literals, and so on
+
+	* rb/yasm.rb : supported
+
+	* vm.c : change interface of eval_define_method
+
+	* yarvcore.h : remove unused externals
+
+
+2006-03-08(Wed) 10:31:29 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/delegate.rb (DelegateClass): do not delegate #send and
+	  #funcall.
+
+
+2006-02-27(Mon) 22:39:17 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/thread.rb: last commit causes busy loop, revert it. [yarv-dev:990]
+
+	* lib/thread.rb: non_block=true wrongly caused ThreadError.
+
+
+2006-02-27(Mon) 21:33:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : fix to display command line
+
+	* compile.c : fix comparison between a pointer and 0
+
+	* debug.c : fix to output stder
+
+	* disasm.c : add debug function
+
+	* vm_dump.c : ditto
+
+	* eval_proc.c : fix to skip class definition
+
+	* ruby.h : fix T_VALUE to T_VALUES
+
+	* gc.c : ditto
+
+	* node.h : fix prototypes
+
+	* vm.c : add VM_DEBUG macro
+
+	* vm.c : fix compile error on VC++
+
+	* vm.c : fix to inherit last lfp[0] on th_set_finish_env
+
+	* vm.c : fix to add one svar location for any frame
+
+	* vm_macro.def : ditto
+
+	* yarvcore.h : add YARV_CLASS_SPECIAL_P() and YARV_BLOCK_PTR_P()
+
+	* rdoc/ : removed
+
+	* insns.def : fix to propagete throw state
+
+
+2006-02-27(Mon) 13:54:47 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/syslog: imported from Ruby CVS trunk HEAD.
+
+	* ext/racc: ditto.
+
+
+2006-02-27(Mon) 12:47:10 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: follow coding style change.
+
+
+2006-02-27(Mon) 11:53:07 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/README: imported from Ruby CVS trunk HEAD.
+
+	* lib/gserver.rb: ditto.
+
+	* lib/readbytes.rb: ditto.
+
+	* lib/parsearg.rb: ditto.
+
+	* lib/racc: ditto.
+
+	* lib/rinda: ditto.
+
+
+2006-02-27(Mon) 11:27:19 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/thread.rb (Queue#pop): faster code. [yarv-dev:973]
+
+	* lib/thread.rb (Queue#pop): avoid to push same thread in to
+	  @waiting.
+
+
+2006-02-23(Thu) 23:32:53 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/open3.rb: imported from Ruby CVS trunk HEAD (rev 1.12).
+
+
+2006-02-23(Thu) 15:10:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : support rb_frame_self()
+
+	* eval_intern.h (th_get_ruby_level_cfp) : return 0 if no cfp
+
+	* eval_load.c : comment out scope set
+
+	* yarvcore.c : fix to initialize/free process of iseq
+
+	* vm.c (th_invoke_proc) : fix to set special cref always
+
+	* yarvtest/test_proc.rb : add a test for above
+
+
+2006-02-22(Wed) 23:33:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add rule "runruby"
+
+	* eval_thread.c : remove obsolete comment
+
+	* eval.c : remove unused functions
+
+	* signal.c : ditto
+
+	* gc.c : add rb_register_mark_object() and use it
+
+	* eval_load.c : ditto
+
+	* eval_proc.c : ditto
+
+	* ext/etc/etc.c : ditto
+
+	* ext/win32ole/win32ole.c : ditto
+
+	* ruby.h : ditto
+
+	* yarvcore.h : ditto
+
+	* thread.c : add rb_thread_run_parallel()
+
+	* yarvcore.c : change bootstrap
+
+
+2006-02-22(Wed) 19:27:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/win32ole/.cvsignore : removed
+
+	* ext/win32ole/.document : ditto
+
+
+2006-02-22(Wed) 18:17:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : set Binding as YARVCore::VM::Binding
+
+
+2006-02-22(Wed) 12:54:45 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* ChangeLog : remove needless line
+
+
+2006-02-22(Wed) 12:49:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rubysig.h : remove CHECK_INTS
+
+	* eval.c : ditto
+
+	* eval_load.c : ditto
+
+	* ext/readline/readline.c : ditto
+
+	* thread.c : ditto
+
+	* win32/win32.c : ditto
+
+	* yarv_version.h : 0.4.0
+
+	* Changes : ditto
+
+
+2006-02-22(Wed) 11:36:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test.rb : removed
+
+
+2006-02-22(Wed) 11:12:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* README : renewed
+
+	* version.c : fixed version message
+
+	* yarvext/ : removed
+
+
+2006-02-22(Wed) 10:33:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/.document : imported from Ruby 1.9 HEAD
+
+	* .document : ditto
+
+	* ext/.document : ditto
+
+	* lib/ftools.rb : ditto
+
+	* lib/rdoc/ : ditto
+
+	* eval_thread.c : remove unused functions
+
+	* process.c : ditto
+
+	* rb/insns2vm.rb : compare modified date of vm_opts.h and
+	vm_opts.h.base
+
+	* ruby.h : rename RValue to RValues
+
+	* gc.c : ditto
+
+	* vm.c : ditto
+
+
+2006-02-22(Wed) 06:32:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* configure.in : remove last commit
+
+
+2006-02-22(Wed) 06:18:53 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* configure.in : add default program prefix "-yarv"
+
+
+2006-02-22(Wed) 06:11:36 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : change default rule (same as HEAD)
+
+	* configure : removed
+
+	* eval.c : remove last commit
+
+	* vm.c : fix stack traverse
+
+	* yarvcore.c : initialize top of control frame
+
+	* version.c : 2.0
+
+	* version.h : ditto
+
+
+2006-02-22(Wed) 04:50:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : change to rewind C level control frame
+
+	* vm.c : change to initialize cfp#proc and fix comparison of
+	cfp and limit_cfp
+
+	* yarvcore.c : remove last commit
+
+
+2006-02-22(Wed) 03:25:56 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : initialize each stack of thread
+
+
+2006-02-22(Wed) 00:02:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c : fix synchornize return value ([yarv-dev:957])
+	and some synchornization error
+
+	* thread_pthread.h : add debug helper function
+
+
+2006-02-21(Tue) 20:54:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : fix place of rb_thread_terminate_all()
+
+	* eval_thread.c : remove unused functions
+
+	* yarv.h : remove GET_VM()
+
+	* eval_jump.h : ditto
+
+	* insns.def : ditto
+
+	* vm_dump.c : 
+
+	* intern.h : change rb_thread_signal_raise/exit interface
+
+	* signal.c : ditto
+
+	* thread.c : ditto
+
+	* test/ruby/test_beginendblock.rb : use block with IO.popen
+
+	* thread_pthread.h : fix interrupt process
+
+	* thread_win32.h : ditto
+
+	* yarvcore.c : fix thread free process
+
+	* yarvcore.h : remove yarv_vm_t#thread_critical, etc
+
+
+2006-02-21(Tue) 12:42:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_thread.c : remove unused function rb_thread_schedule()
+
+	* thread.c : rename yarv_thread_schedule to rb_thread_schedule()
+
+	* thread.c, eval.c : fix to terminate all thread and barrier at
+	eval.c#ruby_cleanup()
+
+	* thread_win32.h : remove native_thread_cleanup()
+
+	* thread_pthread.h : ditto
+
+	* yarvcore.c : ditto
+
+	* yarvtest/test_thread.rb : separete assersions to tests
+
+
+2006-02-21(Tue) 02:13:33 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_arglist): should set command_start = Qtrue for
+	  command body.  [ruby-talk:180648]
+
+
+2006-02-20(Mon) 20:41:07 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c : fix to synchronize signal_thread_list access
+	and fix typo
+
+
+2006-02-20(Mon) 17:54:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_proc.c : remove unused Binding functions and
+	set is_lambda of Proc used define_method
+
+	* yarvcore.c : support Proc#dup/clone, Binding#dup/clone
+
+	* sample/test.rb : remove unsupport features (Proc as Binding)
+
+
+2006-02-20(Mon) 16:28:59 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add a dependency to vm.c on eval_intern.h
+
+	* eval_intern.h : fix to initialize tag->tag
+
+	* yarvtest/test_jump.rb : add tests for above
+
+	* eval_jump.h : use local variable
+
+
+2006-02-20(Mon) 15:13:24 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm3_thread_create_join.rb : added
+
+	* test/yaml/test_yaml.rb : imported from Ruby CVS trunk HEAD
+
+
+2006-02-20(Mon) 14:49:46 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/yaml.rb: imported from Ruby CVS trunk HEAD.
+
+	* lib/yaml: ditto.
+
+	* ext/syck: ditto.
+
+
+2006-02-20(Mon) 13:58:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support block parameter which is NODE_ATTRASGN
+
+	* yarvtest/test_block.rb : add tests for above
+
+	* compile.c : fix NODE_DASGN_CURR level check
+
+	* compile.c : fix "||=" (at firtst, check "defined? val")
+
+	* compile.c : fix NODE_MATCH3 (permute receiver and argument)
+
+	* yarvtest/test_bin.rb : add tests for above
+
+	* eval.c : add rb_each()
+
+	* test/ruby/test_signal.rb : increment a timeout value
+
+	* thread.c, yarvcore.h : fix "join" flow
+
+	* thread_pthread.h : ditto
+
+	* thread_win32.h : ditto
+
+	* yarvtest/test_thread.rb : add a test for above
+
+	* vm.h, vm.c, vm_dump.c, insns.def : add FRAME_MAGIC_LAMBDA and
+	support return from lambda (especially retrun from method defined
+	by "define_method")
+
+	* yarvtest/test_method.rb : add a test for above
+
+	* yarvcore.c : remove unused functions
+
+
+2006-02-20(Mon) 11:22:31 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_eval.rb: now Object#funcall is defined.
+
+
+2006-02-20(Mon) 11:04:32 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/irb/lc/ja/CVS: removed.
+
+
+2006-02-20(Mon) 10:55:59 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/mutex_m.rb: imported from Ruby CVS trunk HEAD.
+
+	* lib/observer.rb: ditto.
+
+	* lib/wsdl: ditto.
+
+	* lib/monitor.rb: ditto (removing Thread.critical=).
+
+	* lib/xsd: ditto.
+
+	* lib/soap: ditto.
+
+	* lib/drb.rb: ditto.
+
+	* lib/drb: ditto.
+
+
+2006-02-20(Mon) 10:49:31 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* yarvcore.c (Init_yarvcore): fix typo (duo -> dup).
+
+
+2006-02-19(Sun) 01:27:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : "return" from lambda{} break block
+
+	* eval.c : Unsupport Proc as Binding
+
+	* test/ruby/test_eval.rb : apply above changes
+
+	* yarvcore.c : remove unused function yarv_yield_values()
+
+
+2006-02-18(Sat) 03:19:36 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, insns.def : fix passing value when thread killed
+
+	* yarvtest/test_thread.rb : add tests for above
+
+
+2006-02-19(Sun) 01:19:42 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/thread.rb (SizedQueue): didn't work.  This patch was
+	  contributed by yukimizake. [yarv-dev:916]
+
+
+2006-02-18(Sat) 03:19:36 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, insns.def : fix passing value when thread killed
+
+	* yarvtest/test_thread.rb : add tests for above
+
+
+2006-02-18(Sat) 02:40:18 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm.c, vm_macro.def : change BMETHOD algorithm
+	([yarv-dev:914])
+
+	* yarvtest/test_class.rb : add a test for above
+
+
+2006-02-17(Fri) 23:59:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, yarv.h : change th_invoke_proc() interface
+
+	* eval_proc.c : ditto
+
+	* signal.c : ditto
+
+	* thread.c : ditto
+
+	* yarvcore.c : ditto
+
+	* vm_macro.def : ditto and fix NODE_BMETHOD call
+
+	* vm.c : change name ("th_set_env()" to "push_frame()") and
+	change interface
+
+	* insns.def : ditto
+
+	* eval.c : remove proc_jump_error()
+
+	* benchmark/bm_app_answer.rb : added
+
+	* vm_opts.h.base : add optimize option
+
+
+2006-02-17(Fri) 13:37:57 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, ruby.h : add rb_errinfo()
+
+	* eval_error.h (error_pos) : fix process order
+
+	* bin/erb : imported from ruby 1.9
+
+	* bin/irb : ditto
+
+	* bin/rdoc : ditto
+
+	* bin/ri : ditto
+
+	* bin/testrb : ditto
+
+	* ext/curses/.cvsignore : ditto
+
+	* ext/curses/curses.c : ditto
+
+	* ext/curses/depend : ditto
+
+	* ext/curses/extconf.rb : ditto
+
+	* ext/curses/hello.rb : ditto
+
+	* ext/curses/mouse.rb : ditto
+
+	* ext/curses/rain.rb : ditto
+
+	* ext/curses/view.rb : ditto
+
+	* ext/curses/view2.rb : ditto
+
+	* ext/fcntl/.cvsignore : ditto
+
+	* ext/fcntl/depend : ditto
+
+	* ext/fcntl/extconf.rb : ditto
+
+	* ext/fcntl/fcntl.c : ditto
+
+	* ext/readline/README : ditto
+
+	* ext/readline/README.ja : ditto
+
+	* ext/readline/depend : ditto
+
+	* ext/readline/extconf.rb : ditto
+
+	* ext/readline/readline.c : ditto
+
+	* ext/win32ole/.document : ditto
+
+	* ext/zlib/doc/zlib.rd : ditto
+
+	* ext/zlib/extconf.rb : ditto
+
+	* ext/zlib/zlib.c : ditto
+
+	* lib/cgi/.document : ditto
+
+	* lib/cgi/session.rb : ditto
+
+	* lib/cgi/session/pstore.rb : ditto
+
+	* lib/shell/builtin-command.rb : ditto
+
+	* lib/shell/command-processor.rb : ditto
+
+	* lib/shell/error.rb : ditto
+
+	* lib/shell/filter.rb : ditto
+
+	* lib/shell/process-controller.rb : ditto
+
+	* lib/shell/system-command.rb : ditto
+
+	* lib/shell/version.rb : ditto
+
+	* lib/xmlrpc/.document : ditto
+
+	* lib/xmlrpc/README.rdoc : ditto
+
+	* lib/xmlrpc/README.txt : ditto
+
+	* lib/xmlrpc/base64.rb : ditto
+
+	* lib/xmlrpc/client.rb : ditto
+
+	* lib/xmlrpc/config.rb : ditto
+
+	* lib/xmlrpc/create.rb : ditto
+
+	* lib/xmlrpc/datetime.rb : ditto
+
+	* lib/xmlrpc/httpserver.rb : ditto
+
+	* lib/xmlrpc/marshal.rb : ditto
+
+	* lib/xmlrpc/parser.rb : ditto
+
+	* lib/xmlrpc/server.rb : ditto
+
+	* lib/xmlrpc/utils.rb : ditto
+
+	* rdoc/README : ditto
+
+	* rdoc/code_objects.rb : ditto
+
+	* rdoc/diagram.rb : ditto
+
+	* rdoc/dot/dot.rb : ditto
+
+	* rdoc/generators/chm_generator.rb : ditto
+
+	* rdoc/generators/html_generator.rb : ditto
+
+	* rdoc/generators/ri_generator.rb : ditto
+
+	* rdoc/generators/template/chm/chm.rb : ditto
+
+	* rdoc/generators/template/html/hefss.rb : ditto
+
+	* rdoc/generators/template/html/html.rb : ditto
+
+	* rdoc/generators/template/html/kilmer.rb : ditto
+
+	* rdoc/generators/template/html/old_html.rb : ditto
+
+	* rdoc/generators/template/html/one_page_html.rb : ditto
+
+	* rdoc/generators/template/xml/rdf.rb : ditto
+
+	* rdoc/generators/template/xml/xml.rb : ditto
+
+	* rdoc/generators/xml_generator.rb : ditto
+
+	* rdoc/markup/sample/rdoc2latex.rb : ditto
+
+	* rdoc/markup/sample/sample.rb : ditto
+
+	* rdoc/markup/simple_markup.rb : ditto
+
+	* rdoc/markup/simple_markup/fragments.rb : ditto
+
+	* rdoc/markup/simple_markup/inline.rb : ditto
+
+	* rdoc/markup/simple_markup/lines.rb : ditto
+
+	* rdoc/markup/simple_markup/preprocess.rb : ditto
+
+	* rdoc/markup/simple_markup/to_flow.rb : ditto
+
+	* rdoc/markup/simple_markup/to_html.rb : ditto
+
+	* rdoc/markup/simple_markup/to_latex.rb : ditto
+
+	* rdoc/markup/test/AllTests.rb : ditto
+
+	* rdoc/markup/test/TestInline.rb : ditto
+
+	* rdoc/markup/test/TestParse.rb : ditto
+
+	* rdoc/options.rb : ditto
+
+	* rdoc/parsers/parse_c.rb : ditto
+
+	* rdoc/parsers/parse_f95.rb : ditto
+
+	* rdoc/parsers/parse_rb.rb : ditto
+
+	* rdoc/parsers/parse_simple.rb : ditto
+
+	* rdoc/parsers/parserfactory.rb : ditto
+
+	* rdoc/rdoc.rb : ditto
+
+	* rdoc/ri/ri_cache.rb : ditto
+
+	* rdoc/ri/ri_descriptions.rb : ditto
+
+	* rdoc/ri/ri_display.rb : ditto
+
+	* rdoc/ri/ri_driver.rb : ditto
+
+	* rdoc/ri/ri_formatter.rb : ditto
+
+	* rdoc/ri/ri_options.rb : ditto
+
+	* rdoc/ri/ri_paths.rb : ditto
+
+	* rdoc/ri/ri_reader.rb : ditto
+
+	* rdoc/ri/ri_util.rb : ditto
+
+	* rdoc/ri/ri_writer.rb : ditto
+
+	* rdoc/template.rb : ditto
+
+	* rdoc/tokenstream.rb : ditto
+
+	* rdoc/usage.rb : ditto
+
+	* test/xmlrpc/data/bug_bool.expected : ditto
+
+	* test/xmlrpc/data/bug_bool.xml : ditto
+
+	* test/xmlrpc/data/bug_cdata.expected : ditto
+
+	* test/xmlrpc/data/bug_cdata.xml : ditto
+
+	* test/xmlrpc/data/bug_covert.expected : ditto
+
+	* test/xmlrpc/data/bug_covert.xml : ditto
+
+	* test/xmlrpc/data/datetime_iso8601.xml : ditto
+
+	* test/xmlrpc/data/fault.xml : ditto
+
+	* test/xmlrpc/data/value.expected : ditto
+
+	* test/xmlrpc/data/value.xml : ditto
+
+	* test/xmlrpc/data/xml1.expected : ditto
+
+	* test/xmlrpc/data/xml1.xml : ditto
+
+	* test/xmlrpc/test_datetime.rb : ditto
+
+	* test/xmlrpc/test_features.rb : ditto
+
+	* test/xmlrpc/test_marshal.rb : ditto
+
+	* test/xmlrpc/test_parser.rb : ditto
+
+	* test/xmlrpc/test_webrick_server.rb : ditto
+
+	* test/xmlrpc/webrick_testing.rb : ditto
+
+	* test/zlib/test_zlib.rb : ditto
+
+
+2006-02-17(Fri) 09:41:35 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (sleep_timeval): sleep should always sleep for
+	  specified amount of time.  [ruby-talk:180067]
+
+
+2006-02-17(Fri) 02:20:32 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_safe.h, ruby.h : remove ruby_safe_level and add
+	rb_safe_level() and rb_set_safe_level_force()
+
+	* eval.c : use above functions
+
+	* eval_jump.h : ditto
+
+	* eval_load.c : ditto
+
+	* eval_method.h : ditto
+
+	* eval_proc.c : ditto
+
+	* eval_thread.c : ditto
+
+	* gc.c : ditto
+
+	* signal.c : ditto
+
+	* variable.c : ditto
+
+	* ext/win32ole/win32ole.c : ditto
+
+	* vm.c (th_invoke_proc) : save and restore safe level
+
+	* yarvtest/test_proc.rb : add tests for above
+
+	* thread.c : remove unused functions
+
+
+2006-02-17(Fri) 01:08:23 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : remove a setspecial second unused operand
+
+	* eval_load.c : remove unused variable th
+
+	* eval_proc.c, yarvcore.c : remove some functions from eval_proc.c
+	and move to yarvcore.c
+
+	* insns.def : fix to delete warnings
+
+	* sample/test.rb : comment out Proc#clone tests
+
+	* version.c : add constant RUBY_VM_DATE
+
+	* vm.c : fix some functions
+
+
+2006-02-16(Thu) 22:58:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm.c : use th_yield_setup_args at yield and Proc#call
+
+
+2006-02-16(Thu) 19:51:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix analysis of block parameter
+
+	* disasm.c : remove rb_bug() (temporarily)
+
+	* insns.def, vm.c : fix passing block parameter
+
+	* sample/test.rb : add "Proc = YARVCore::VM::Proc"
+
+	* test/ruby/test_readpartial.rb : disable on mswin32
+
+	* test/socket/test_tcp.rb : ditto
+
+	* thread.c : fix syntax error (for non GCC)
+
+
+2006-02-15(Wed) 22:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.h : move rb_clear_cache_by_id position
+
+	* thread.c : fix Thread#kill
+
+	* test/ruby/test_readpartial.rb : enable tests except cygwin version
+
+	* test/ruby/test_signal.rb : ditto and enable timeout
+
+
+2006-02-15(Wed) 22:13:29 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/runit: forgot to commit.
+
+
+2006-02-15(Wed) 22:12:25 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/weakref.rb: do not use Thread.critical=.
+
+	* lib/singleton.rb: ditto.
+
+	* lib/timeout.rb: ditto.
+
+	* lib/thread.rb: ditto.
+
+	* test/inlinetest.rb: forgot to commit.
+
+
+2006-02-15(Wed) 21:34:17 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/test_pp.rb: imported from Ruby CVS trunk HEAD.
+
+	* test/test_shellwords.rb: ditto.
+
+	* test/test_set.rb: ditto.
+
+	* test/test_time.rb: ditto.
+
+	* test/test_ipaddr.rb: ditto.
+
+	* test/test_prettyprint.rb: ditto.
+
+	* test/test_tsort.rb: ditto.
+
+	* test/strscan: ditto.
+
+	* test/testunit: ditto.
+
+
+2006-02-15(Wed) 20:03:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.h : duplicate NODE_METHOD at make an alias
+
+	* yarvtest/test_method.rb : add a test for above
+
+
+2006-02-15(Wed) 19:48:59 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/rss: imported from Ruby CVS trunk HEAD.
+
+
+2006-02-15(Wed) 19:47:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c, vm.c : remove methoddef, singletonmethoddef
+	instructions and make new insn definemethod
+
+	* yarvcore.c : set toplevel visibility to private
+
+
+2006-02-15(Wed) 17:39:16 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h : 
+
+	* eval_jump.h, vm.c : localjump_error() and jump_tag_but_local_jump()
+	move to th_localjump_error and th_jump_tag_but_local_jump at vm.c
+
+	* eval.c : ditto
+
+	* eval_load.c : ditto
+
+	* insns.def : ditto
+
+	* vm.c : ditto
+
+	* vm.c (th_make_jump_tag_but_local_jump) : added
+
+	* opt_insn_unif.def : fix indnet (revert change)
+
+	* opt_operand.def : ditto
+
+	* rb/insns2vm.rb : fix error message
+
+	* thread.c : raise exception at join if illegal local jump
+
+
+2006-02-15(Wed) 14:21:45 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ChangeLog: add local variables line to support Emacs.
+
+	* eval.c (rb_obj_instance_exec): add new method from 1.9.
+
+	* eval.c (rb_mod_module_exec): ditto.
+
+	* eval.c (yield_under_i): should not pass self as an argument to
+	  the block for instance_eval.  [ruby-core:07364]
+
+	* eval.c (rb_obj_instance_eval): should be no singleton classes for
+	  true, false, and nil.  [ruby-dev:28186]
+
+
+2006-02-14(Tue) 19:30:20 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c : fix indent
+
+	* eval.c : fix block_given
+
+	* gc.c : add STACK_START and use it as a substitute for
+	rb_gc_stack_start
+
+	* vm.c : fix to raise error if th_yield doesn't have block given
+
+	* yarvcore.c : fix to skip iseq mark array at ObjectSpace.each_object
+
+
+2006-02-14(Tue) 18:15:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* configure.in : enable pthread by deafult
+
+	* ascii.c : import ruby 1.9 HEAD
+
+	* bignum.c : ditto
+
+	* compar.c : ditto
+
+	* configure : ditto
+
+	* defines.h : ditto
+
+	* dln.c : ditto
+
+	* dln.h : ditto
+
+	* enum.c : ditto
+
+	* enumerator.c : ditto
+
+	* euc_jp.c : ditto
+
+	* ext/win32ole/tests/testWIN32OLE.rb : ditto
+
+	* ext/win32ole/win32ole.c : ditto
+
+	* file.c : ditto
+
+	* hash.c : ditto
+
+	* io.c : ditto
+
+	* lex.c : ditto
+
+	* lib/irb/init.rb : ditto
+
+	* lib/rexml/document.rb : ditto
+
+	* main.c : ditto
+
+	* marshal.c : ditto
+
+	* math.c : ditto
+
+	* missing.h : ditto
+
+	* object.c : ditto
+
+	* oniguruma.h : ditto
+
+	* pack.c : ditto
+
+	* process.c : ditto
+
+	* random.c : ditto
+
+	* range.c : ditto
+
+	* rb/ir.rb : ditto
+
+	* re.c : ditto
+
+	* regcomp.c : ditto
+
+	* regenc.c : ditto
+
+	* regenc.h : ditto
+
+	* regerror.c : ditto
+
+	* regexec.c : ditto
+
+	* regint.h : ditto
+
+	* regparse.c : ditto
+
+	* regparse.h : ditto
+
+	* ruby.c : ditto
+
+	* ruby.h : ditto
+
+	* rubyio.h : ditto
+
+	* sjis.c : ditto
+
+	* sprintf.c : ditto
+
+	* st.c : ditto
+
+	* st.h : ditto
+
+	* struct.c : ditto
+
+	* test/ruby/envutil.rb : ditto
+
+	* test/ruby/test_struct.rb : ditto
+
+	* time.c : ditto
+
+	* utf8.c : ditto
+
+	* util.c : ditto
+
+	* util.h : ditto
+
+	* version.h : ditto
+
+	* win32/Makefile.sub : ditto
+
+	* win32/win32.c : ditto
+
+
+2006-02-14(Tue) 16:40:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, eval_proc.c : fix rb_proc_arity
+
+	* eval.c : declare funcall same as send (temporarily)
+
+	* lib/thread.rb : added
+
+	* test/pathname/test_pathname.rb : imported from ruby 1.9
+
+	* test/scanf/data.txt : ditto
+
+	* test/scanf/test_scanf.rb : ditto
+
+	* test/scanf/test_scanfblocks.rb : ditto
+
+	* test/scanf/test_scanfio.rb : ditto
+
+	* test/socket/test_socket.rb : ditto
+
+	* test/socket/test_tcp.rb : ditto
+
+	* test/socket/test_udp.rb : ditto
+
+	* test/socket/test_unix.rb : ditto
+
+	* test/stringio/test_stringio.rb : ditto
+
+	* test/uri/test_common.rb : ditto
+
+	* test/uri/test_ftp.rb : ditto
+
+	* test/uri/test_generic.rb : ditto
+
+	* test/uri/test_http.rb : ditto
+
+	* test/uri/test_ldap.rb : ditto
+
+	* test/uri/test_mailto.rb : ditto
+
+
+2006-02-14(Tue) 15:59:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c : Change Thread.critical warnning message
+
+	* lib/webrick.rb : imported from ruby 1.9
+
+	* lib/webrick/accesslog.rb : ditto
+
+	* lib/webrick/cgi.rb : ditto
+
+	* lib/webrick/compat.rb : ditto
+
+	* lib/webrick/config.rb : ditto
+
+	* lib/webrick/cookie.rb : ditto
+
+	* lib/webrick/htmlutils.rb : ditto
+
+	* lib/webrick/httpauth.rb : ditto
+
+	* lib/webrick/httpauth/authenticator.rb : ditto
+
+	* lib/webrick/httpauth/basicauth.rb : ditto
+
+	* lib/webrick/httpauth/digestauth.rb : ditto
+
+	* lib/webrick/httpauth/htdigest.rb : ditto
+
+	* lib/webrick/httpauth/htgroup.rb : ditto
+
+	* lib/webrick/httpauth/htpasswd.rb : ditto
+
+	* lib/webrick/httpauth/userdb.rb : ditto
+
+	* lib/webrick/httpproxy.rb : ditto
+
+	* lib/webrick/httprequest.rb : ditto
+
+	* lib/webrick/httpresponse.rb : ditto
+
+	* lib/webrick/https.rb : ditto
+
+	* lib/webrick/httpserver.rb : ditto
+
+	* lib/webrick/httpservlet.rb : ditto
+
+	* lib/webrick/httpservlet/abstract.rb : ditto
+
+	* lib/webrick/httpservlet/cgi_runner.rb : ditto
+
+	* lib/webrick/httpservlet/cgihandler.rb : ditto
+
+	* lib/webrick/httpservlet/erbhandler.rb : ditto
+
+	* lib/webrick/httpservlet/filehandler.rb : ditto
+
+	* lib/webrick/httpservlet/prochandler.rb : ditto
+
+	* lib/webrick/httpstatus.rb : ditto
+
+	* lib/webrick/httputils.rb : ditto
+
+	* lib/webrick/httpversion.rb : ditto
+
+	* lib/webrick/log.rb : ditto
+
+	* lib/webrick/server.rb : ditto
+
+	* lib/webrick/ssl.rb : ditto
+
+	* lib/webrick/utils.rb : ditto
+
+	* lib/webrick/version.rb : ditto
+
+
+2006-02-14(Tue) 14:55:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : support "defined?($1)", ...
+
+	* yarvtest/test_syntax.rb : add a test for above
+
+	* rb/makedocs.rb : fix template directory path
+
+	* vm.c : fix to handle break from proc
+
+
+2006-02-14(Tue) 12:42:59 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : fix rb_iterate hook
+
+	* yarvtest/test_block.rb : add a tests for above
+
+	* vm.c : remove unused comment
+
+
+2006-02-14(Tue) 12:01:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : fix to check passed block at block_given_p
+
+	* eval_proc.c : fix to pass block at Method#call
+
+	* runruby.rb : fix to apply ruby
+
+	* test/runner.rb : GC.stress (comment out)
+
+	* vm.c : fix indnet
+
+
+2006-02-14(Tue) 08:04:33 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/tempfile.rb: use Mutex instead of Thread.critical.
+
+	* lib/rss/dublincore.rb: |x,| -> |x,_| to avoid YARV bug (tmp).
+
+	* lib/rexml: imported from ruby CVS trunk HEAD.
+
+	* test/digest: ditto.
+
+	* test/fileutils: ditto.
+
+	* test/ostruct: ditto.
+
+	* test/erb: ditto.
+
+	* test/optparse: ditto.
+
+	* test/ruby/test_signal.rb: turn off a test to avoid unknown error
+	  (tmp).
+
+
+2006-02-14(Tue) 07:52:03 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/digest: imported from ruby CVS trunk HEAD.
+
+	* test/fileutils: ditto.
+
+	* test/ostruct: ditto.
+
+	* test/erb: ditto.
+
+	* test/optparse: ditto.
+
+
+2006-02-14(Tue) 06:26:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, parse.y : support BEGIN{} (remove local scope)
+
+	* test/ruby/beginmainend.rb : fix to apply YARV's specification
+
+	* test/ruby/test_beginendblock.rb : enable BEGIN{} test
+
+	* signal.c : exit at double segv
+
+	* insns.def (preexe) : remove instruction "preexe"
+
+
+2006-02-14(Tue) 05:53:56 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (ruby_cleanup): th->errinfo contains a NODE while
+	  break'ing, check it before refering klass.
+
+
+2006-02-14(Tue) 05:45:07 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix stack calc of send
+
+	* sample/test.rb : remove SEGV causing code
+
+
+2006-02-14(Tue) 02:24:21 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_module.rb: list order is not a matter.
+
+	* test/csv: imported from ruby CVS trunk HEAD.
+
+
+2006-02-14(Tue) 02:06:25 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_beginendblock.rb: unlock tests.
+
+	* test/ruby/beginmainend.rb: new file (imported from ruby CVS
+	  trunk HEAD).
+
+	* test/ruby/endblockwarn.rb: new file (imported from ruby CVS
+	  trunk HEAD).
+
+	* test/ruby/test_file.rb: new file (imported from ruby CVS trunk
+	  HEAD).
+
+
+2006-02-14(Tue) 01:42:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c : fix include file positon
+
+	* test/ruby/test_signal.rb : skip test_exit_action on cygwin
+
+
+2006-02-14(Tue) 01:36:57 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_class.rb: new file (imported from rubicon).
+
+
+2006-02-14(Tue) 01:32:23 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_module.rb: ignore PP mixins.
+
+
+2006-02-14(Tue) 01:24:56 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_lambda.rb: removed (->(){...} syntax is
+	  obsolete).
+
+
+2006-02-14(Tue) 01:20:54 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_module.rb: import many tests from rubicon.
+
+
+2006-02-14(Tue) 01:06:57 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix to avoid stack consistency error
+
+	* yarvtest/test_exception.rb : add a test for above
+
+
+2006-02-14(Tue) 00:42:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, vm_macro.def : rename VM_CALL_SUPER to VM_CALL_SUPER_BIT
+
+	* insns.def (send) : set a flag of super as fcall
+
+	* yarvtest/test_class.rb : add a test for above
+
+
+2006-02-14(Tue) 00:31:24 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_eval.rb: fix typo.
+
+	* test/ruby/test_signal.rb: unlock tests.
+
+
+2006-02-13(Mon) 23:53:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm_macro.def : fix NODE_ZSUPER dispatch and
+	fix error message when super without suitable method ([yarv-dev:846])
+
+	* yarvcore.h : add VM_CALL_SUPER definition
+
+	* yarvtest/test_method.rb : add a test of Module#private_class_method
+
+
+2006-02-13(Mon) 22:49:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : traverse all iseq to find super method ([yarv-dev:859])
+
+	* yarvtest/test_class.rb : add a test for above
+
+	* yarvcore.c : add clear iseq->defined_method_id
+
+	* signal.c : fix to prohibit double segv handler kicked
+
+
+2006-02-13(Mon) 22:09:12 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_DECL, NODE_CLASS with NODE_CLON3 prefix
+
+	* yarvtest/test_class.rb : add tests for above
+
+
+2006-02-13(Mon) 21:20:57 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix indent
+
+	* compile.c : fix to prohibit "redo" from eval expression
+
+
+2006-02-13(Mon) 20:36:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : fix constant search bug ([yarv-dev:788])
+
+	* yarvtest/test_class.rb : add a test of [yarv-dev:788]
+
+
+2006-02-13(Mon) 18:09:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_clone.rb : enable tests with Class#clone
+
+	* test/ruby/test_marshal.rb : ditto
+
+
+2006-02-13(Mon) 17:42:37 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c : support Class#clone
+
+	* compile.c, insns.def : remove popcref
+
+	* yarvcore.h, vm.c, insns.def : remove yarv_thread_t#cref_stack
+
+	* eval.c, eval_intern.h, eval_load.c : ditto
+
+	* yarvtest/test_class.rb : add tests for singleton class
+
+	* gc.c : remove "FRAME *" unused variable
+
+	* insnhelper.h : fix COPY_CREF
+
+	* rb/mklog.rb : add default message
+
+	* vm_macro.def : support NODE_ZSUPER as method type
+
+
+2006-02-13(Mon) 00:11:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c : refoctoring with CFLAGS+=-Wunused
+
+	* eval.c : ditto
+
+	* eval_intern.h : ditto
+
+	* eval_load.c : ditto
+
+	* eval_method.h : ditto
+
+	* eval_proc.c : ditto
+
+	* eval_thread.c : ditto
+
+	* insns.def : ditto
+
+	* parse.y : ditto
+
+	* thread.c : ditto
+
+	* vm.c : ditto
+
+
+2006-02-13(Mon) 02:32:34 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_const.rb: show better message.
+
+	* test/ruby/test_eval.rb: ditto.
+
+	* test/ruby/test_module.rb: new file.
+
+
+2006-02-12(Sun) 22:22:35 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c : revert last commit
+
+	* ascii.c : ditto 
+
+	* bignum.c : ditto 
+
+	* class.c : ditto 
+
+	* compar.c : ditto 
+
+	* defines.h : ditto 
+
+	* dir.c : ditto 
+
+	* dln.c : ditto 
+
+	* dln.h : ditto 
+
+	* enum.c : ditto 
+
+	* enumerator.c : ditto 
+
+	* error.c : ditto 
+
+	* euc_jp.c : ditto 
+
+	* file.c : ditto 
+
+	* gc.c : ditto 
+
+	* hash.c : ditto 
+
+	* intern.h : ditto 
+
+	* io.c : ditto 
+
+	* lex.c : ditto 
+
+	* main.c : ditto 
+
+	* marshal.c : ditto 
+
+	* math.c : ditto 
+
+	* missing.h : ditto 
+
+	* node.h : ditto 
+
+	* numeric.c : ditto 
+
+	* object.c : ditto 
+
+	* oniguruma.h : ditto 
+
+	* pack.c : ditto 
+
+	* prec.c : ditto 
+
+	* process.c : ditto 
+
+	* random.c : ditto 
+
+	* range.c : ditto 
+
+	* rb/mklog.rb : ditto 
+
+	* re.c : ditto 
+
+	* regcomp.c : ditto 
+
+	* regenc.c : ditto 
+
+	* regenc.h : ditto 
+
+	* regerror.c : ditto 
+
+	* regex.h : ditto 
+
+	* regexec.c : ditto 
+
+	* regint.h : ditto 
+
+	* regparse.c : ditto 
+
+	* regparse.h : ditto 
+
+	* ruby.c : ditto 
+
+	* ruby.h : ditto 
+
+	* rubyio.h : ditto 
+
+	* rubysig.h : ditto 
+
+	* signal.c : ditto 
+
+	* sjis.c : ditto 
+
+	* sprintf.c : ditto 
+
+	* st.c : ditto 
+
+	* st.h : ditto 
+
+	* string.c : ditto 
+
+	* struct.c : ditto 
+
+	* time.c : ditto 
+
+	* utf8.c : ditto 
+
+	* util.c : ditto 
+
+	* util.h : ditto 
+
+	* variable.c : ditto 
+
+	* version.c : ditto 
+
+
+2006-02-12(Sun) 21:33:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c : fix to ruby's indent
+
+	* ascii.c : ditto
+
+	* bignum.c : ditto
+
+	* blockinlining.c : ditto
+
+	* call_cfunc.h : ditto
+
+	* class.c : ditto
+
+	* compar.c : ditto
+
+	* compile.c : ditto
+
+	* compile.h : ditto
+
+	* debug.c : ditto
+
+	* debug.h : ditto
+
+	* defines.h : ditto
+
+	* dir.c : ditto
+
+	* disasm.c : ditto
+
+	* dln.c : ditto
+
+	* dln.h : ditto
+
+	* enum.c : ditto
+
+	* enumerator.c : ditto
+
+	* error.c : ditto
+
+	* euc_jp.c : ditto
+
+	* eval.c : ditto
+
+	* eval_error.h : ditto
+
+	* eval_intern.h : ditto
+
+	* eval_jump.h : ditto
+
+	* eval_load.c : ditto
+
+	* eval_method.h : ditto
+
+	* eval_proc.c : ditto
+
+	* eval_safe.h : ditto
+
+	* eval_thread.c : ditto
+
+	* file.c : ditto
+
+	* gc.c : ditto
+
+	* hash.c : ditto
+
+	* insnhelper.h : ditto
+
+	* insns.def : ditto
+
+	* intern.h : ditto
+
+	* io.c : ditto
+
+	* lex.c : ditto
+
+	* main.c : ditto
+
+	* marshal.c : ditto
+
+	* math.c : ditto
+
+	* missing.h : ditto
+
+	* node.h : ditto
+
+	* numeric.c : ditto
+
+	* object.c : ditto
+
+	* oniguruma.h : ditto
+
+	* opt_insn_unif.def : ditto
+
+	* opt_operand.def : ditto
+
+	* pack.c : ditto
+
+	* prec.c : ditto
+
+	* process.c : ditto
+
+	* random.c : ditto
+
+	* range.c : ditto
+
+	* re.c : ditto
+
+	* re.h : ditto
+
+	* regcomp.c : ditto
+
+	* regenc.c : ditto
+
+	* regenc.h : ditto
+
+	* regerror.c : ditto
+
+	* regex.h : ditto
+
+	* regexec.c : ditto
+
+	* regint.h : ditto
+
+	* regparse.c : ditto
+
+	* regparse.h : ditto
+
+	* ruby.c : ditto
+
+	* ruby.h : ditto
+
+	* rubyio.h : ditto
+
+	* rubysig.h : ditto
+
+	* signal.c : ditto
+
+	* sjis.c : ditto
+
+	* sprintf.c : ditto
+
+	* st.c : ditto
+
+	* st.h : ditto
+
+	* string.c : ditto
+
+	* struct.c : ditto
+
+	* test.rb : ditto
+
+	* thread.c : ditto
+
+	* thread_pthread.h : ditto
+
+	* thread_win32.h : ditto
+
+	* time.c : ditto
+
+	* utf8.c : ditto
+
+	* util.c : ditto
+
+	* util.h : ditto
+
+	* variable.c : ditto
+
+	* version.c : ditto
+
+	* vm.c : ditto
+
+	* vm.h : ditto
+
+	* vm_dump.c : ditto
+
+	* vm_evalbody.h : ditto
+
+	* vm_macro.def : ditto
+
+	* yarv.h : ditto
+
+	* yarv_version.h : ditto
+
+	* yarvcore.c : ditto
+
+	* yarvcore.h : ditto
+
+
+2006-02-12(Sun) 15:53:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/abbrev.rb : added
+
+	* lib/base64.rb : ditto
+
+	* lib/cgi-lib.rb : ditto
+
+	* lib/csv.rb : ditto
+
+	* lib/date2.rb : ditto
+
+	* lib/eregex.rb : ditto
+
+	* lib/ipaddr.rb : ditto
+
+	* lib/irb.rb : ditto
+
+	* lib/irb/cmd/chws.rb : ditto
+
+	* lib/irb/cmd/fork.rb : ditto
+
+	* lib/irb/cmd/help.rb : ditto
+
+	* lib/irb/cmd/load.rb : ditto
+
+	* lib/irb/cmd/nop.rb : ditto
+
+	* lib/irb/cmd/pushws.rb : ditto
+
+	* lib/irb/cmd/subirb.rb : ditto
+
+	* lib/irb/completion.rb : ditto
+
+	* lib/irb/context.rb : ditto
+
+	* lib/irb/ext/change-ws.rb : ditto
+
+	* lib/irb/ext/history.rb : ditto
+
+	* lib/irb/ext/loader.rb : ditto
+
+	* lib/irb/ext/math-mode.rb : ditto
+
+	* lib/irb/ext/multi-irb.rb : ditto
+
+	* lib/irb/ext/save-history.rb : ditto
+
+	* lib/irb/ext/tracer.rb : ditto
+
+	* lib/irb/ext/use-loader.rb : ditto
+
+	* lib/irb/ext/workspaces.rb : ditto
+
+	* lib/irb/extend-command.rb : ditto
+
+	* lib/irb/frame.rb : ditto
+
+	* lib/irb/help.rb : ditto
+
+	* lib/irb/init.rb : ditto
+
+	* lib/irb/input-method.rb : ditto
+
+	* lib/irb/lc/error.rb : ditto
+
+	* lib/irb/lc/help-message : ditto
+
+	* lib/irb/lc/ja/CVS/Entries : ditto
+
+	* lib/irb/lc/ja/CVS/Repository : ditto
+
+	* lib/irb/lc/ja/CVS/Root : ditto
+
+	* lib/irb/lc/ja/error.rb : ditto
+
+	* lib/irb/lc/ja/help-message : ditto
+
+	* lib/irb/locale.rb : ditto
+
+	* lib/irb/notifier.rb : ditto
+
+	* lib/irb/output-method.rb : ditto
+
+	* lib/irb/ruby-lex.rb : ditto
+
+	* lib/irb/ruby-token.rb : ditto
+
+	* lib/irb/slex.rb : ditto
+
+	* lib/irb/version.rb : ditto
+
+	* lib/irb/workspace.rb : ditto
+
+	* lib/irb/ws-for-case-2.rb : ditto
+
+	* lib/irb/xmp.rb : ditto
+
+	* lib/jcode.rb : ditto
+
+	* lib/logger.rb : ditto
+
+	* lib/mailread.rb : ditto
+
+	* lib/mathn.rb : ditto
+
+	* lib/parsedate.rb : ditto
+
+	* lib/pathname.rb : ditto
+
+	* lib/ping.rb : ditto
+
+	* lib/pstore.rb : ditto
+
+	* lib/resolv-replace.rb : ditto
+
+	* lib/resolv.rb : ditto
+
+	* lib/rss.rb : ditto
+
+	* lib/rss/0.9.rb : ditto
+
+	* lib/rss/1.0.rb : ditto
+
+	* lib/rss/2.0.rb : ditto
+
+	* lib/rss/content.rb : ditto
+
+	* lib/rss/converter.rb : ditto
+
+	* lib/rss/dublincore.rb : ditto
+
+	* lib/rss/image.rb : ditto
+
+	* lib/rss/maker.rb : ditto
+
+	* lib/rss/maker/0.9.rb : ditto
+
+	* lib/rss/maker/1.0.rb : ditto
+
+	* lib/rss/maker/2.0.rb : ditto
+
+	* lib/rss/maker/base.rb : ditto
+
+	* lib/rss/maker/content.rb : ditto
+
+	* lib/rss/maker/dublincore.rb : ditto
+
+	* lib/rss/maker/image.rb : ditto
+
+	* lib/rss/maker/syndication.rb : ditto
+
+	* lib/rss/maker/taxonomy.rb : ditto
+
+	* lib/rss/maker/trackback.rb : ditto
+
+	* lib/rss/parser.rb : ditto
+
+	* lib/rss/rexmlparser.rb : ditto
+
+	* lib/rss/rss.rb : ditto
+
+	* lib/rss/syndication.rb : ditto
+
+	* lib/rss/taxonomy.rb : ditto
+
+	* lib/rss/trackback.rb : ditto
+
+	* lib/rss/utils.rb : ditto
+
+	* lib/rss/xml-stylesheet.rb : ditto
+
+	* lib/rss/xmlparser.rb : ditto
+
+	* lib/rss/xmlscanner.rb : ditto
+
+	* lib/rubyunit.rb : ditto
+
+	* lib/scanf.rb : ditto
+
+	* lib/shell.rb : ditto
+
+	* lib/singleton.rb : ditto
+
+	* lib/tsort.rb : ditto
+
+	* lib/weakref.rb : ditto
+
+	* eval_jump.c : removed
+
+
+2006-02-12(Sun) 15:39:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y : fix to remove including env.h
+
+	* yarvtest/test_exception.rb : fix syntax (add 'end')
+
+
+2006-02-12(Sun) 15:14:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* env.h : removed
+
+	* common.mk : remove env.h dependency
+
+	* compile.c, eval_intern.h : remove include env.h
+
+	* vm.c : ditto
+
+	* ruby.h, gc.c, error.c : remove T_SCOPE, T_VARMAP
+
+	* parse.y, eval.c : use rb_parse_in_eval() instead of ruby_in_eval
+
+	* yarvcore.c, yarvcore.h : add a prase_in_eval member to yarv_thread_t
+
+	* insns.def : add push value to throw instruction
+	for stack consistency
+
+	* yarvtest/test_exception.rb : add a test for above
+
+	* test/ruby/test_gc.rb : fix typo
+
+
+2006-02-12(Sun) 05:05:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, eval_intern.h, eval_load.c, eval_proc.c, node.h,
+	insnhelper.h, insns.def, vm.c, yarvcore.c, yarvcore.h : 
+	change cref data structure and unify ruby_class and ruby_cbase
+	and some refoctoring
+
+
+2006-02-11(Sat) 23:41:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (methoddef) : fix method declaration in method
+
+	* thread.c : Thread.critical to show warning (no effect)
+
+
+2006-02-11(Sat) 20:20:18 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix [yarv-dev:831]
+
+	* yarvtest/test_class.rb : add a test for above
+
+
+2006-02-11(Sat) 14:29:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/mklog.rb : use svk
+
+	* error.c : remove newline
+
+	* eval.c (rb_block_call) : added
+
+	* eval_thread.c : remove some unused functions, comments
+
+	* thread.c : add comments (move from eval_thread.c) and support Mutex
+
+	* thread.c (rb_thread_select) : supported
+
+	* thread_pthread.h (native_mutex_trylock) : added (macro)
+
+	* thread_win32.h (native_mutex_trylock) : added
+
+	* yarvcore.c : remove unused code
+
+	* array.c : import ruby 1.9
+
+	* compar.c : ditto
+
+	* dln.c : ditto
+
+	* enum.c : ditto
+
+	* enumerator.c : ditto
+
+	* ext/digest/digest.c : ditto
+
+	* ext/digest/digest.h : ditto
+
+	* ext/digest/sha2/sha2.c : ditto
+
+	* ext/etc/etc.c : ditto
+
+	* ext/win32ole/win32ole.c : ditto
+
+	* hash.c : ditto
+
+	* intern.h : ditto
+
+	* io.c : ditto
+
+	* main.c : ditto
+
+	* missing.h : ditto
+
+	* missing/flock.c : ditto
+
+	* missing/isinf.c : ditto
+
+	* missing/vsnprintf.c : ditto
+
+	* lib/cgi.rb : ditto
+
+	* lib/complex.rb : ditto
+
+	* lib/delegate.rb : ditto
+
+	* lib/erb.rb : ditto
+
+	* lib/fileutils.rb : ditto
+
+	* lib/matrix.rb : ditto
+
+	* lib/mkmf.rb : ditto
+
+	* lib/optparse.rb : ditto
+
+	* lib/ostruct.rb : ditto
+
+	* lib/pp.rb : ditto
+
+	* lib/timeout.rb : ditto
+
+	* lib/tmpdir.rb : ditto
+
+	* lib/test/unit/autorunner.rb : ditto
+
+	* node.h : ditto
+
+	* object.c : ditto
+
+	* parse.y : ditto
+
+	* ruby.c : ditto
+
+	* sample/test.rb : ditto
+
+	* sprintf.c : ditto
+
+	* st.c : ditto
+
+	* test/ruby/test_whileuntil.rb : ditto
+
+	* test/runner.rb : ditto
+
+	* time.c : ditto
+
+	* lib/net/.document : added
+
+	* lib/net/ftp.rb : ditto
+
+	* lib/net/http.rb : ditto
+
+	* lib/net/https.rb : ditto
+
+	* lib/net/imap.rb : ditto
+
+	* lib/net/pop.rb : ditto
+
+	* lib/net/protocol.rb : ditto
+
+	* lib/net/smtp.rb : ditto
+
+	* lib/net/telnet.rb : ditto
+
+	* lib/open-uri.rb : ditto
+
+
+2006-02-10(Fri) 08:07:34 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def, yarvcore.h : support defined?(private_method) and
+	defined?(protected_method) (separate DEFINE_METHOD / DEFINE_FUNC)
+
+	* yarvtest/test_syntax.rb : add a test for above
+
+	* compile.c (iseq_compile_each) : fix NODE_RETURN bug
+	(double ensure invoke)
+
+	* yarvtest/test_flow.rb : add a test for above
+
+	* eval.c (get_errinfo) : fix to search $!
+
+	* yarvtest/test_exception.rb : add tests for above
+
+	* eval_safe.h : support $SAFE
+
+	* ext/socket/socket.c : import ruby 1.9
+
+	* gc.c (gc_mark_children) : fix making T_VALUE
+
+	* test/ruby/test_gc.rb : use GC.stress
+
+	* signal.c (sighandler) : send interrupt signal if thread blocked
+
+	* test/ruby/test_proc.rb : remove assert false
+
+	* test/ruby/test_readpartial.rb : change fail message
+
+	* test/ruby/test_signal.rb : remove assert false
+
+	* thread.c (thread_start_func_2) : set local_lfp/local_svar
+	at thread creation
+
+	* thread_pthread.h : export native_thread_interrupt
+
+	* thread_win32.h : export native_thread_interrupt
+
+	* version.h : import ruby 1.9
+
+	* vm.c (lfp_svar), yarvcore.h : fix to use Thread local svar
+
+	* yarvtest/test_thread.rb : add a test for above
+
+	* win32/Makefile.sub : import ruby 1.9
+
+	* win32/dir.h : ditto
+
+	* win32/setup.mak : ditto
+
+	* win32/win32.c : ditto
+
+	* yarvtest/yarvtest.rb : fix to remove using ARGV
+
+
+2006-02-10(Fri) 01:04:58 +0900  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
+	  invoking finalizers.
+
+	* gc.c (rb_gc_finalize_deferred): ditto.
+
+
+2006-02-08(Wed) 23:17:44 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_proc.rb: method names were wrongly duplicated.
+
+
+2006-02-08(Wed) 21:30:01 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/nkf: added (imported from ruby CVS trunk HEAD).
+
+	* ext/nkf/depend: new file (rev 1.5).
+
+	* ext/nkf/extconf.rb: new file (rev 1.2).
+
+	* ext/nkf/nkf.c: new file (rev 1.12).
+
+	* ext/nkf/test.rb: new file (rev 1.7).
+
+	* ext/nkf/nkf-utf8/nkf.c: new file (rev 1.17).
+
+	* ext/nkf/nkf-utf8/config.h: new file (rev 1.4).
+
+	* ext/nkf/nkf-utf8/utf8tbl.c: new file (rev 1.6).
+
+	* ext/nkf/lib/kconv.rb: new file (rev 1.13).
+
+	* test/nkf: added (imported from ruby CVS trunk HEAD).
+
+	* test/nkf/test_kconv.rb: new file (rev 1.1).
+
+	* test/nkf/test_nkf.rb: new file (rev 1.1).
+
+
+2006-02-08(Wed) 21:07:36 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/find.rb: new file (imported from ruby CVS trunk HEAD,
+	  rev 1.15).
+
+
+2006-02-07(Tue) 17:58:18 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : support BEGIN{} and add preexe instruction
+
+	* insns.def : fix getspecial/setspecial instructions
+	to catch up svar change
+
+	* test/ruby/test_system.rb : remove stopper
+
+	* thread.c (rb_thread_fd_writable) : add a debug output
+
+	* thread.c (rb_thread_wait_fd) : add a debug output
+
+	* vm.c (lfp_svar) : refactoring and fix some problems
+
+	* vm_dump.c (yarv_bug) : add branch
+
+	* yarv.h : remove unused declarations
+
+	* yarvcore.c (vm_free) : VM object should not free by GC
+
+
+2006-02-07(Tue) 14:42:25 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, eval_load.c : remove rb_thread_start_1()
+
+	* eval.c : fix some prototypes and indents
+
+	* eval_thread.c, thread.c : move some functions
+	from eval_thread.c to thread.c
+
+	* signal.c (sighandler) : add line braek in error message
+
+	* yarvcore.c, yarvcore.h, thread.c : support ThreadGroup
+
+	* ruby.h, gc.c, vm.c : make new basic type RValue and T_VALUE.
+	RValue includes three values in itself.  RValue is used as
+	svar
+
+
+2006-02-06(Mon) 23:51:41 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_hash.rb: import many tests from rubicon.
+
+
+2006-02-04(Sat) 18:36:41 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_array.rb: import many tests from rubicon.
+
+
+2006-02-04(Sat) 17:47:44 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_signal.rb (test_exit_action): lib/timeout.rb is
+	  not implemented yet.
+
+
+2006-02-04(Sat) 17:42:31 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_readpartial.rb: lib/timeout.rb is not implemented
+	  yet.
+
+
+2006-02-04(Sat) 16:22:38 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_pipe.rb: remove useless require.
+
+	* test/ruby/test_signal.rb: turn off the test case which causes
+	  segmentation fault (tmp).
+
+
+2006-02-04(Sat) 08:19:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add dependency to yarvcore.h on signal.o
+
+	* compile.c (iseq_compile_each) : fix [yarv-dev:795] problem
+	(prohibit "break", "next" jump from eval)
+
+	* eval.c : fix indent
+
+	* eval_thread.c, thread.c : remove some functions and move to thread.c
+
+	* insns.def, vm.c : fix [yarv-dev:799] and [yarv-dev:800]
+
+	* yarvtest/test_class.rb : add a test for above
+
+	* test/ruby/test_gc.rb : remove GC.debug_flag control
+
+	* test/ruby/test_readpartial.rb : disable
+
+	* test/ruby/test_signal.rb : disable
+
+	* thread.c : fix thread_debug() and many bugs
+
+	* thread.c (yarv_thread_s_new) : move living_threads setting
+
+	* thread.c (yarv_thread_join) : fix
+
+	* thread_pthread.h : add type native_thread_data_t (dummy)
+	and support interrupt blocking thread
+
+	* thread_pthread.h (native_thread_apply_priority) : added
+
+	* thread_win32.h : add type native_thread_data_t (dummy)
+	and support interrupt blocking thread
+
+	* yarvcore.h : use win32 thread system on cygwin and fix
+	some struct members
+
+	* yarvtest/test_thread.rb : added
+
+
+2006-02-03(Fri) 00:08:09 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_string.rb: import many tests from rubicon.
+
+
+2006-02-02(Thu) 23:20:13 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/envutil.rb: new file (imported from ruby trunk HEAD).
+
+	* test/ruby/marshaltestlib.rb: ditto.
+
+	* test/ruby/test_array.rb: ditto.
+
+	* test/ruby/test_beginendblock.rb: ditto.
+
+	* test/ruby/test_clone.rb: ditto.
+
+	* test/ruby/test_dir.rb: ditto.
+
+	* test/ruby/test_env.rb: ditto.
+
+	* test/ruby/test_file.rb: ditto.
+
+	* test/ruby/test_float.rb: ditto.
+
+	* test/ruby/test_fnmatch.rb: ditto.
+
+	* test/ruby/test_hash.rb: ditto.
+
+	* test/ruby/test_io.rb: ditto.
+
+	* test/ruby/test_marshal.rb: ditto.
+
+	* test/ruby/test_math.rb: ditto.
+
+	* test/ruby/test_pack.rb: ditto.
+
+	* test/ruby/test_path.rb: ditto.
+
+	* test/ruby/test_pipe.rb: ditto.
+
+	* test/ruby/test_rand.rb: ditto.
+
+	* test/ruby/test_range.rb: ditto.
+
+	* test/ruby/test_readpartial.rb: ditto.
+
+	* test/ruby/test_regexp.rb: ditto.
+
+	* test/ruby/test_settracefunc.rb: ditto.
+
+	* test/ruby/test_signal.rb: ditto.
+
+	* test/ruby/test_sprintf.rb: ditto.
+
+	* test/ruby/test_string.rb: ditto.
+
+	* test/ruby/test_stringchar.rb: ditto.
+
+	* test/ruby/test_struct.rb: ditto.
+
+	* test/ruby/test_symbol.rb: ditto.
+
+	* test/ruby/test_system.rb: ditto.
+
+	* test/ruby/test_time.rb: ditto.
+
+	* test/ruby/ut_eof.rb: ditto.
+
+
+2006-02-02(Thu) 22:53:44 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_proc.rb: test [yarv-dev:777].
+
+
+2006-02-01(Wed) 03:51:39 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c : add GC.debug_flag= method
+
+	* insns.def : support method definition in method
+
+	* yarvtest/test_method.rb : add tests for above
+
+
+2006-01-29(Sun) 11:40:26 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_proc.c (proc_alloc) : fix [yarv-dev:777]
+
+	* yarvtest/test_proc.rb : add a test for above
+
+	* insns.def : fix [yarv-dev:782] and add YARV_CHECK_INTS()
+
+	* yarvtest/test_class.rb : add a test for above
+
+	* thread_win32.h : fix [yarv-dev-en:23]
+
+	* vm.c (th_call0) : add YARV_CHECK_INTS()
+
+
+2006-01-09(Mon) 11:56:34 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* yarvcore.h: add prototype (remove warning).
+
+	* vm.c (th_invoke_proc): make save variables volatile.
+
+	* eval.c (eval): initialize local variables (remove warnings).
+
+	* eval_thread.c (rb_exec_recursive): ditto.
+
+	* yarvcore.c (thread_mark): ditto.
+
+	* vm.c (th_invoke_proc): ditto.
+
+	* eval.c: remove useless prototypes.
+
+
+2006-01-09(Mon) 10:25:12 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* eval_thread.c: rb_thread_join is required to build ruby on
+	  Linux.
+
+	* compile.c: unify coding style.
+
+	* yarvcore.c: ditto.
+
+
+2006-01-06(Fri) 09:21:34 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* vm.c: coding style change only.
+
+
+2006-01-04(Wed) 14:12:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (ruby_init), eval_intern.h : use POP_TAG_INIT() at bootstrap
+
+	* eval_thread.c : remove unused functions and comments
+
+	* intern.h : expose rb_make_exception()
+
+	* signal.c : support signal
+
+	* thread.c (yarv_thread_execute_interrupts) : added
+
+	* thread_pthread.h (thread_timer) : set interrupt_flag of
+	current runnning threads
+
+	* vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
+	occurres
+
+	* yarv.h : add yarv_set_current_running_thread_raw() for bootstrap
+
+	* yarvcore.c : add yarv_segv() and segv() method for test
+
+	* yarvcore.c (Init_yarvcore) : set yarv_thread_t#running_thread
+
+	* yarvcore.h : fix yarv_thread_t members
+
+
+2006-01-03(Tue) 22:25:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* disasm.c (insn_operand_intern) : fix to add child iseq
+
+	* eval.c, gc.c : remove obsolete static variables (ruby_scope,
+	ruby_dyna_vars, ruby_frame)
+
+	* eval.c (rb_mod_s_constants) : use ruby_cref()
+
+	* eval.c (eval) : use th_restore_klass()
+
+	* eval_proc.c (rb_f_binding) : use th_store_klass()
+
+	* insns.def (concatarray) : fix insn ([expr, *nil] => [expr])
+
+	* vm.c (th_set_env), insnhelper.h : remove macro
+
+	* vm.c (eval_get_cvar_base) : use get_cref
+
+	* vm.c (th_make_proc) : use th_store_klass()
+
+	* vm_macro.def (macro_eval_invoke_func) : fix option args size
+
+	* vm_macro.def (macro_eval_invoke_func) : raise stack overflow error
+
+	* yarvcore.h : add yarv_stored_klass_t type
+
+	* yarvcore.c : fix mark functions around yarv_stored_klass_t
+
+
+2006-01-01(Sun) 05:14:26 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/benchmark.rb: new file (imported from original ruby, rev
+	  1.10).
+
+
+2006-01-01(Sun) 03:51:10 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* yarvcore.c: add prototype.
+
+	* re.c: remove warning: long -> unsigned long.
+
+	* debug.c: adjust coding style.
+
+	* yarv.h: ditto.
+
+
+2006-01-01(Sun) 03:43:33 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* variable.c: add prototype.
+
+	* eval.c: ditto.
+
+	* eval_load.c: ditto.
+
+
+2006-01-01(Sun) 02:41:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add address analyse to vtune rule
+
+	* rb/vtlh.rb : added for above
+
+	* rb/insns2vm.rb, template/vm.inc.tmpl : insert #line directive
+	to reference above
+
+	* vm_macro.def (macro_eval_invoke_cfunc) : fix indent
+
+	* yarvtest/test_method.rb : fix indent, spacing
+	and add a test for alias
+
+
+2005-12-31(Sat) 12:42:05 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add Intel VTune rule (make vtune)
+
+	* eval.c, yarvcore.h : fix to remove yarv_thread_t#local_*
+
+	* parse.y (top_local_init_gen) : fix a problem ([yarv-dev:765])
+
+	* yarvtest/test_eval.rb : add a test for above
+
+	* vm.c (thread_eval) :remove unused function
+
+	* yarvcore.c (Init_yarvcore) : remove YARVCore::Thread::eval method
+
+	* yarvcore.c (thread_eval) : remove unused function
+
+
+2005-12-31(Sat) 06:05:00 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (eval_search_super_klass) : pass block to method missing
+
+	* vm_macro.def (macro_eval_invoke_method) : ditto
+
+	* yarvtest/test_method.rb : add a test for above
+
+
+2005-12-31(Sat) 03:11:14 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (eval), eval_proc.c (rb_f_binding) : save klass, etc to
+	binding and use it at eval
+
+	* eval_intern.h : ditto
+
+	* yarvtest/test_eval.rb : add tests for above
+
+	* yarvcore.c (th_get_special_cref) : added
+
+	* yarvcore.h : add a prototype of above
+
+	* vm.c (th_get_cref) : refactoring
+
+	* vm.c (eval_get_ev_const) : fix SEGV at A::B (A is not class/module)
+	([yarv-dev:758])
+
+	* yarvtest/test_bin.rb : add a test for above
+
+	* rb/mklog.rb : use external diff command and show function name
+
+
+2005-12-30(Fri) 19:07:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, yarvcore.h, eval.c, eval_proc.c : support
+	Ruby's Binding
+
+	* yarvcore.c : support TOPLEVEL_BINDING
+
+	* yarvtest/test_eval.rb : add tests for above
+
+
+2005-12-30(Fri) 13:12:28 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_eval.rb: more tests for
+	  module_eval/instance_eval.
+
+
+2005-12-30(Fri) 05:06:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add dependency (yarvcore.h) for gc.c
+
+	* eval.c, eval_intern.h, eval_load.c, eval_method.h,
+	insns.def, insnhelper.h, vm.c, yarvcore.c, yarvcore.h :
+	re-write class reference
+
+	* yarvtest/test_eval.rb : added
+
+	* yarvtest/test_proc.rb : 
+
+
+2005-12-29(Thu) 12:27:12 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, yarvcore.h :
+	remvoe needless yarv_iseq_t#rewind_frame_size
+
+
+2005-12-29(Thu) 11:17:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add dependency to test-all rule
+
+	* eval.c (rb_sourceline), vm.c (th_get_sourceline) :
+	fix to skip process if iseq is ifunc
+
+	* test/ruby/test_lambda.rb : assert(fail, ...) instead of assert_fail
+
+	* test/ruby/test_proc.rb : ditto
+
+	* vm_dump.c : fix stack dump (iseq name)
+
+	* vm_macro.def : store proc (block proc) to cfp#proc for GC mark
+
+	* yarvcore.c : mark above on thread_mark
+
+	* eval.c (exec_under) : replace block#self ([yarv-dev:751])
+
+
+2005-12-29(Thu) 01:56:46 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : fix setting of Proc cref ([yarv-dev:741])
+
+	* yarvcore.c : fix indent
+
+
+2005-12-29(Thu) 00:17:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* disasm.c : show (block) local variable simple (not as symbol)
+
+	* gc.c : fix syntax error
+
+
+2005-12-28(Wed) 23:35:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (method_entry) : fixed for undefed method ([yarv-dev:743])
+
+	* compile.c : fix errinfo dvar id (#$!)
+	and fix NODE_ERRINFO compilation
+
+	* eval_proc.c, yarvcore.c : support YARVCore::VM::Proc.new
+
+	* insns.def : remove useless TODO comments
+
+	* insns.def : fix to use strict array conversion on
+	checkarrayinclude
+
+	* insns.def : fix defined?(yield) ([yarv-dev:744])
+
+	* yarvcore.h : change yarv_iseq_t layout
+
+
+2005-12-28(Wed) 16:49:55 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_eval.rb: add TODO comment.
+
+	* test/ruby/test_iterator.rb: rename YARVCore::VM::Proc -> Proc
+	  (tmp).
+
+	* test/ruby/test_lambda.rb: use assert_fail.
+
+	* test/ruby/test_proc.rb: ditto.
+
+
+2005-12-28(Wed) 16:28:35 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_clone.rb: removed (tmp).
+
+	* test/ruby/test_eval.rb: define missing method Object#funcall
+	  (tmp).
+
+	* test/ruby/test_lambda.rb: turn off tests for "->".
+
+	* test/ruby/test_proc.rb: turn off tests for |&b|.
+
+	* test/ruby/test_proc.rb: turn off tests for $SAFE setter.
+
+
+2005-12-28(Wed) 15:31:46 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix calculation of stack_max
+
+	* eval.c (rb_iter) : fix block/retry handling
+
+	* yarvtest/test_flow.rb : add tests for above
+
+	* insns.def : fix block passing on super (super(&nil))
+
+	* vm_macro.def, insns.def : fix convert method of object to array
+
+	* yarvtest/test_method.rb : fix a test for above
+
+	* vm.c : fix backtrace generate algorithm
+
+
+2005-12-28(Wed) 10:36:45 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, compile.h : refactoring (remove self passing, etc)
+
+	* disasm.c : support showing ID of method/dynamic local variables
+
+	* rb/allload.rb : add verbose version (it's enable by $DEBUG)
+
+	* template/insns.inc.tmpl, template/insns_info.inc.tmpl,
+	template/minsns.inc.tmpl, template/opt_sc.inc.tmpl,
+	template/optinsn.inc.tmpl, template/optunifs.inc.tmpl,
+	template/vmtc.inc.tmpl : fix a comment
+
+	* variable.c (mod_av_set) : fix to clear inline cache ([yarv-dev:720])
+
+	* eval_method.h : fix to clear inline method cache
+
+	* vm.c, rb/insns2vm.rb, template/insns_info.inc.tmpl, compile.c,
+	insns.def, vm_evalbody.h, vm_macro.def :
+	fix operands types (ulong -> num_t, ...)
+
+	* vm_macro.def : fix to check SPECIAL_CONST_P() at splat array
+	([yarv-dev:722])
+
+	* yarvcore.c : fix to throw syntax error
+
+	* yarvcore.h, eval.c, eval_error.h, eval_jump.h :
+	add yarv_vm_t#exit_code to fix problem at cleanup ([yarv-dev:723])
+
+	* insns.def : fix to invoke zsuper in method defined by define_method
+	([yarv-dev:704])
+
+	* yarvtest/test_class.rb : add tests for above
+
+	* yarvtest/test_method.rb : fix comments
+
+
+2005-12-27(Tue) 01:52:07 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c, intern.h, insns.def : expose rb_ary_replace and use it
+	in insns.def
+
+	* eval.c : fix to use SCOPE_* to NOEX_*
+
+	* eval_intern.h : remove SCOPE_*
+	and fix SCOPE_TEST() and SCOPE_SET(f)
+
+	* eval_load.c : save and store klass and visibility
+	at require and load
+
+	* eval_method.h : fix undefed method node ([yarv-dev-en:8])
+
+	* eval_proc.c : fix define_method ([yarv-dev:704])
+
+	* insnhelper.h, vm.h : remove GET_VM_STATE_VERSION(),
+	INC_VM_STATE_VERSION() and move these to vm.h
+
+	* insns.def : supportintg visibility
+
+	* node.h : remove NOEX_RECV
+
+	* variable.c, vm.c : add rb_vm_change_state() and use it in
+	remove_const
+
+	* vm.c, insns.def, yarvcore.h, yarvcore.c : add eval_push_cref(),
+	eval_pop_cref() and th_cref_init to manage current visibility
+
+	* yarv.h : add a prototype of rb_vm_change_state()
+
+	* yarvcore.h, insns.def : add defined_method_id and support
+	super in define_method scope
+
+	* yarvtest/test_class.rb : add tests for above
+
+
+2005-12-26(Mon) 20:44:38 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_basicinstructions.rb: new file.
+
+
+2005-12-26(Mon) 08:40:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (eval_get_ev_const) : fix to skip nil
+
+
+2005-12-26(Mon) 08:27:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.h : fix GET_CVAR_EV_KLASS [yarv-dev:703]
+
+
+2005-12-26(Mon) 07:51:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : add emptstack insn for all NODE_RETURN
+	and optimize it if it's not needed
+
+	* yarvtest/test_flow.rb : add a test for above
+
+
+2005-12-26(Mon) 07:08:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, gc.c : add "gc_debug_flag" to debug gc
+
+	* insns.def : add emptstack
+
+	* compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl :
+	change interface of insn_stack_increase
+
+	* compile.c : fix return from ensure in method [yarv-dev:702]
+
+	* yarvtest/test_flow.rb : add tests for above
+
+
+2005-12-26(Mon) 02:15:02 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_alias.rb: do not use unimplemented defined?.
+
+
+2005-12-26(Mon) 02:00:11 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* test/runner.rb: new file.
+
+	* test/ruby/test_alias.rb: new file.
+
+	* test/ruby/test_clone.rb: new file.
+
+	* test/ruby/test_eval.rb: new file.
+
+	* test/ruby/test_iterator.rb: new file.
+
+	* test/ruby/test_lambda.rb: new file.
+
+	* test/ruby/test_proc.rb: new file.
+
+	* test/ruby/test_super.rb: new file.
+
+	* test/ruby/test_assignment.rb: new file.
+
+	* test/ruby/test_bignum.rb: new file.
+
+	* test/ruby/test_call.rb: new file.
+
+	* test/ruby/test_case.rb: new file.
+
+	* test/ruby/test_condition.rb: new file.
+
+	* test/ruby/test_const.rb: new file.
+
+	* test/ruby/test_defined.rb: new file.
+
+	* test/ruby/test_exception.rb: new file.
+
+	* test/ruby/test_gc.rb: new file.
+
+	* test/ruby/test_ifunless.rb: new file.
+
+	* test/ruby/test_method.rb: new file.
+
+	* test/ruby/test_trace.rb: new file.
+
+	* test/ruby/test_variable.rb: new file.
+
+	* test/ruby/test_whileuntil.rb: new file.
+
+
+2005-12-25(Sun) 07:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c, compile.c : fix block inlining
+
+	* rb/insns2vm.rb : fix to support tracing stack depth
+	with operands unification
+
+	* vm_dump.c : fix to print Qundef on stack dump
+
+
+2005-12-25(Sun) 01:45:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl : 
+	trace stack depth at compile time
+	and use it  as cont_sp for exception handling
+
+	* yarvtest/test_exception.rb : add tests for above
+
+	* yarvtest/test_flow.rb : ditto
+
+	* Merry Xmas :)
+
+
+2005-12-24(Sat) 19:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, compile.h : fix ADD_CATCH_ENTRY and add LABEL#sp
+
+	* eval_jump.h : fix catch to remove illegal error
+
+
+2005-12-24(Sat) 09:05:23 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_method.h : change data structure for RClass#m_tbl
+
+	* class.c, eval.c, eval_proc.c : fix for above changes
+
+	* node.h, gc.c : change NODE_FBODY, NODE_METHOD members
+	for above changes
+
+	* insns.def : support private/protected visibility
+
+	* vm_macro.def : ditto
+
+	* vm.c : ditto
+
+	* thread.c : fix typo
+
+	* thread_pthread.h : fix typo
+
+	* thread_win32.h : fix typo
+
+	* eval.c, yarvcore.h : add yarv_thread_t#method_missing_reason
+	to pass method_missing reason and use it to build error message
+
+	* compile.c : use ADD_CALL instead of ADD_SEND for
+	NODE_X(D)STR, NODE_CONST (func)
+
+
+2005-12-22(Thu) 02:45:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarv_version.h, Changes : 0.3.3
+
+
+2005-12-20(Tue) 04:04:45 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix self::Const access
+
+	* yarvtest/test_bin.rb : add a test for above
+
+
+2005-12-20(Tue) 01:52:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix to expand VALUES value
+
+	* yarvtest/test_massign.rb : add a test for above
+
+
+2005-12-20(Tue) 01:32:35 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, insnhelper.h : fix cvar in singleton method/class
+
+	* yarvtest/test_bin.rb : add tests for above
+
+
+2005-12-20(Tue) 01:03:34 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, yarvcore.h : support all defined?() syntax
+
+	* compile.c : fix NODE_COLON2 
+
+	* yarvtest/test_bin.rb : add or fix tests for above
+
+	* win32/* : update all
+
+
+2005-12-17(Sat) 10:46:08 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* vm_macro.def: fix printf type mismatch for LP64 system (again).
+
+	* parse.y: introduce descriptive macro for special values of
+	  lvtbl->dvars.
+
+
+2005-12-17(Sat) 09:39:27 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* vm_macro.def (macro_eval_invoke_method): fix printf type mismatch
+	  for LP64 system.
+
+
+2005-12-14(Wed) 03:49:40 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : change rescue/ensure iseq name
+
+	* eval.c, intern.h : fix a prototype
+
+	* insns.def, yarvcore.h : add trace_function
+
+	* vm.c : fix deadly bug (illegal pointer cast)
+
+	* vm_dump.c : remove unused local variables
+
+	* vm_macro.def : add parameter size check
+
+	* yarvtest/test_bin.rb : comment out 2 assertions
+
+
+2005-12-13(Tue) 03:55:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_proc.c : fix indent
+
+	* insns.def : fix getspecial instruction to return nil
+	if no entry
+
+	* yarvtest/test_syntax.rb : add a test for above
+
+	* lib/un.rb : added
+
+	* template/*.tmpl : fix typo
+
+
+2005-12-13(Mon) 01:38:17 +0900  Minero Aoki  <aamine@loveruby.net>
+
+	* yarv.h: add prototypes.
+
+	* intern.h: ditto.
+
+	* eval.c: ditto.
+
+	* debug.c: ditto.
+
+	* thread_pthread.h: fix printf type mismatch for LP64 system
+	  (Linux/AMD64).
+
+	* variable.c: ditto.
+
+	* object.c: ditto.
+
+	* gc.c: ditto.
+
+	* process.c: ditto.
+
+	* error.c: ditto.
+
+	* vm.c: ditto.
+
+	* vm.h: ditto.
+
+	* vm_dump.c: ditto.
+
+	* disasm.c: ditto.
+
+	* marshal.c: ditto.
+
+	* eval_thread.c: ditto.
+
+
+2005-12-11(Sun) 22:00:34 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : call "inherited" method when a class is inherited
+
+	* yarvcore.h : fix yarv_iseq_t field layout
+
+	* common.mk : add dependence on yarvcore.h to eval*.o files
+
+	* compile.c : fix NODE_POSTEXE logic
+
+	* insnhelper.h : use GC_GUARDED_PTR_REF instead of magic number
+
+	* eval_proc.c : fix indent
+
+	* configure : re-autoconf
+
+
+2005-12-10(Sat) 03:57:20 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : fix blockinlining.o build rule
+
+	* insns.def : remove logic for zsuper
+
+	* template/optinsn.inc.tmpl : 
+
+	* vm.c : remove thread_yield_light_prepare, thread_yield_light_invoke
+
+	* compile.c : support NODE_ZSUPER with optargs, restarg
+
+	* yarvtest/test_class.rb : add tests for above
+
+
+2005-12-09(Fri) 01:13:37 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c, numeric.c, range.c : add prototype of
+	block inlining function
+
+	* blockinlining.c, vm_opts.h.base : add block inlining flag 
+
+	* common.mk, debug.h, debug.c : add debug_breakpoint() for gdb
+
+	* compile.c : fix to use size_t on compile_data_alloc(),
+	fix illegal cast, fix to set arg_simple at compiling block,
+
+	* compile.c, vm.c : fix NODE_NEXT, NODE_BREAK logic
+
+	* yarvtest/test_flow.rb : add a test for above
+
+	* yarvcore.c, yarvcore.h, compile.c, eval.c : remove
+	yarv_iseq_t#root_iseq and add yarv_iseq_t#local_iseq and fix
+	to use this member field
+
+	* eval_method.h : fix indent
+
+	* gc.c : fix indent
+
+	* insns.def, compile.c : remove "zsuper" instruction (use "super"
+	instead).  This is because NODE_ZSUPER represent with only "super"
+	instruction
+
+	* yarvcore.c : add proc_arity
+
+
+2005-12-05(Mon) 03:58:30 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c, blockinlining.c : support block inlining for Array#each
+
+	* disasm.c : fix catch table format
+
+	* insns.def : fix stack consistency error message
+
+	* vm.c : fix to skip pushing value at "next"
+
+	* yarvcore.h : move definision of 
+	"struct iseq_compile_data_ensure_node_stack" to compile.c
+
+	* compile.c : fix ensure catch table creation
+
+	* yarvtest/test_flow.rb : add tests for above
+
+
+2005-12-03(Sat) 22:27:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c, compile.c, yarvcore.c, yarvcore.h,
+	numeric.c, range.c : collect block inlining logic to blockinlining.c
+
+
+2005-12-03(Sat) 20:24:07 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* blockinlining.c, common.mk : add blockinlining.c
+
+	* yarvcore.c, yarvcore.h, blockinlining.c, compile.c, compile.h,
+	gc.c, node.h, numeric.c, range.c :
+	support block inlining for Integer#times, Range#each
+
+	* compile.c : fix to set block redo/next point at last,
+	and fix NODE_OP_ASGN1
+
+	* compile.c, vm.c : add specialized instruction "opt_le"
+
+	* disasm.c : fix to show block, and to show catch type as string
+	and change node_name logic
+
+	* eval_thread.c : fix function type declaration
+
+	* insns.def : add instruction "putundef", "opt_checkenv"
+	to support block inlining and add stack check routine
+
+	* lib/cgi.rb : add global variable $CGI_DONTINPUT
+
+	* opt_operand.def : add some operand unification rules
+
+	* rb/insns2vm.rb : fix operand unification logic for BLOCKISEQ
+
+	* vm.c : fix exception handling routine (collect stack operations)
+
+	* vm_macro.def : fix macro_eval_invoke_bmethod
+
+	* yarvsubst.c : removed
+
+	* yarvtest/test_syn.rb : rename to yarvtest/test_syntax.rb
+
+	* yarvtest/yarvtest.rb : remove tempfile explicitly
+
+
+2005-11-30(Wed) 01:13:57 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add vm_opts.h rule
+
+	* vm.c, insns.def : fix proc creation under class and block
+	environment
+
+
+2005-11-29(Tue) 16:39:07 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, eval_proc.c, vm.c, vm_macro.def : 
+	support define_method and invoke NODE_BMETHOD method
+
+
+2005-11-29(Tue) 13:18:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : add iseq_add_mark_object, iseq_add_mark_object_compile_time
+	and use it to mark objects on iseq
+
+	* compile.h, compile.c : remove cast on NEW_CHILD_ISEQVAL, NEW_ISEQVAL
+	and interface
+
+	* compile.c, disasm.c, insns.def, vm_macro.def, rb/insns2vm.rb :
+	add BLOCKISEQ parameter type
+
+	* gc.c : fix garbage_collect to return true if only allocate memory
+
+	* vm.c : fix insertion order of proc/env
+
+	* vm_evalbody.h : add typedef yarv_iseq_t *BLOCKISEQ
+
+	* yarvcore.c, yarvcore.c : add idTimes
+
+	* yarvcore.c : fix proc_mark, env_mark around iseq mark
+
+
+2005-11-28(Mon) 09:02:57 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def, vm_evalbody.h : support super
+	with splat argument and block (and zsuper with block)
+
+	* yarvtest/test_class.rb : add tests for above
+
+	* compile.c, yarvcore.h, yarvcore.c, insns.def, time.c, string.c :
+	add opt_succ insn
+
+	* eval_method.h : fix indent
+
+	* eval_thread.c : apply cast to vanish a warning
+
+	* lib/tempfile.rb, lib/tmpdir.rb : added
+
+	* vm.c : eval_method_missing added
+
+	* vm_macro.def : refactoring
+
+
+2005-11-21(Mon) 21:21:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, compile.h, yarvcore.c : remove "iseqobj"
+	variables and rename to "iseq"
+
+
+2005-11-21(Mon) 07:31:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix block parameter error
+
+	* ext/* : added
+
+	* lib/optparse* : added
+
+	* benchmark/bm_so_sieve.rb : fix parameter
+
+
+
+2005-11-21(Mon) 03:47:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : optimize condition in literal
+
+	* thread_win32.h : fix win32 thread function prototype
+
+
+2005-11-20(Sun) 17:58:24 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix NODE_AND/OR bug
+
+	* eval.c : support rb_frame_this_func()
+
+
+2005-11-20(Sun) 12:32:31 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, yarvcore.c, yarvcore.h : support NODE_OPT_N
+
+	* compile.h : add macro ADD_CALL
+
+	* debug.c : add debug_v() and change to use only printf
+	on debug_id()
+
+	* sample/test.rb : 
+
+	* vm.c : fix make_proc_from_block
+
+
+2005-11-19(Sat) 14:55:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* import ruby 1.9.0 (2005-11-18)
+
+
+2005-11-19(Sat) 06:08:37 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/test : added
+
+
+2005-11-19(Sat) 05:48:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : useless jump elimination (if/unless destination)
+
+	* eval.c : rb_iter_break support,
+	 fix rb_iterate (clear errinfo if break)
+
+	* eval_proc.c : support rb_node_arity (YARV_METHOD_NODE)
+
+	* insns.def : change variable name
+
+	* vm.c : fix th_invoke_yield and add th_iter_break()
+
+	* vm_dump.c : fix yarv_bug()
+
+	* yarvcore.c : fix proc_mark to check IFUNC node and add
+	global ruby method SDR() for debug
+
+	* yarvtest/test_syn.rb : add a test for all condition combination
+
+
+2005-11-15(Tue) 05:52:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/forwardable.rb : added
+
+	* common.mk : remove "vm.o : CFLAGS += -fno-crossjumping" rule
+
+	* compile.c, yarvcore.h, insns.def : add FCALL/VCALL flag
+
+	* compile.c, insns.def : add onceinlinecache instruction
+
+	* eval.c : support $!, $@, raise (== raise $!)
+
+	* opt_operand.def : add some unification rule (send flags)
+
+	* vm.c : fix return process
+
+	* vm_macro.def : fix option prameters
+
+	* yarvtest/test_method.rb : add tests for above
+
+
+2005-11-15(Tue) 00:42:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : support rb_frame_pop() and rb_frame_callee(),
+	add rb_sourcefile(), rb_souceline(),
+	
+
+	* compile.c : support postposition while/until,
+	fix block parameter index
+
+	* yarvtest/test_syn.rb : add tests for above
+
+	* yarvcore.c : fix env_mark
+
+	* vm.h, yarvcore.h : move vm.h#cmethod_info to
+	 yarvcore.h#yarv_cmethod_info
+
+	* vm.c : add th_get_sourceline()
+
+	* eval_intern.h : fix PASS_PASSED_BLOCK()
+
+	* eval_load.c : fix re-enter require (temporalily)
+
+	* insns.def : permit re-open class when superclass is same
+
+
+2005-11-11(Fri) 01:20:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : add "allload" rule
+
+	* compile.c, yarvcore.h, insns.def, vm_macro.def, disasm.c :
+	change arg_rest, arg_block offset (1)
+
+	* insns.def : add postexe instruction
+
+	* insns.def, vm.c : support rest block parameter
+
+	* yarvtest/test_block.rb : add tests for above
+
+	* rb/allload.rb : get path from ARGV
+
+	* vm_opts.h.base : set default off
+
+
+2005-11-01(Tue) 08:28:19 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/other-lang/eval.rb : fix path
+
+	* lib/English.rb, lib/cgi.rb, lib/complex.rb, lib/delegate.rb : 
+	added
+
+
+2005-11-01(Tue) 08:18:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : push and pop values after checkincludearray for
+	stack caching
+
+
+2005-10-31(Mon) 15:37:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_mandelbrot.rb : added
+
+	* benchmark/bm_app_factorial.rb : fixed parameter
+
+	* benchmark/bm_so_count_words.rb, benchmark/run_rite.rb : use
+	real file
+
+	* common.mk : add "ext" rule, add some dependencies and add option
+	to bench-each rule (renamed from bench-item)
+
+	* compile.c : fix get_root_iseq_object (check iseq type),
+	support splat case/when. support //o (regexp)
+
+	* eval.c : support *_eval, fix rb_obj_call_init to pass block
+
+	* eval_jump.h : support throw/catch
+
+	* eval_load.c : save klass_nest_stack when require
+
+	* eval_method.h : fix ruby_cbase()
+
+	* insnhelper.h : GET_EV_KLASS checks toplevel or not
+
+	* insns.def, yarvcore.c : fix singleton method definition and fix
+	super class's method
+
+	* lib/shellwords.rb : use String() instead of String.new()
+
+	* vm.c : check class iseq or not when making Proc and
+	add eval_search_super_klass function
+
+	* vm.h : CMETHOD_INFO_P to yarvcore.h
+
+	* vm_macro.def : splat if object type is T_ARRAY
+
+	* vm_opts.h, vm_opts.h.base : rename to vm_opts.h.base
+	insns2vm.rb will copy it to build directory
+
+	* yarvcore.c : add Proc#[]
+
+	* yarvcore.h : change INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE
+	to 512
+
+	* yarvtest/test_* : invalidate splat non array code (like: "*1")
+
+	* yarvtest/yarvtest.rb : use tempfile instead of popen
+
+
+2005-10-28(Fri) 09:11:53 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvtest/test_method.rb : fix test
+
+
+2005-10-28(Fri) 08:43:29 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run_rite.rb : add -I options to run benchmark
+
+	* common.mk : pass options to some rules with RUNOPT
+	and add -I options
+
+	* compile.c : fix massign with constant
+
+	* yarvtest/test_massign.rb : add tests for above
+
+	* eval_load.c : fix load_wait()
+
+	* eval_method.h : support ruby_cbase()
+
+	* lib/*.rb : add or modify libraries to run on yarv
+	* parse.y : change to ANSI C style
+
+	* vm.c : fix making proc process under cfunc/ifunc environment
+
+	* vm_macro.def : fix block pass
+
+	* yarvtest/test_method.rb : add tests for above
+
+	* yarvcore.c : add yarv_obj_is_proc()
+
+	* eval.c : fix rb_obj_is_proc to use yarv_obj_is_proc()
+
+
+2005-10-27(Thu) 11:50:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* some files : import from ruby 1.9.0 (2005-10-12)
+
+
+2005-10-16(Sun) 14:50:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c, yarvcore.h, yarvcore.c : add insns "bitblt" and "answer"
+
+
+2005-10-11(Tue) 17:01:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarv_version.h, Changes : 0.3.2
+
+
+2005-10-11(Tue) 13:35:25 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : add YARV_CHECK_INTS()
+
+	* thread.c, thread_pthread.h, thread_win32.h : kick timer thread
+	when another thread kicked
+
+	* vm.c : remove debug print
+
+	* vm_opts.h : add OPT_CALL_THREADED_CODE
+
+	* yarvtest/yarvtest.rb : remove "\r" from answer
+
+
+2005-10-07(Fri) 09:36:36 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : add member variable "interrupt_flag" to yarv_thread_t
+
+
+2005-10-05(Wed) 21:20:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eva.c, eval_thread.c, ruby.h, eval_error.h, eval_jump.h, 
+	eval_load.c, thread.c, error.c, compile.h : remove ruby_errinfo
+
+	* thread_win32.h, thread_pthread.h : set stack size to 4KB
+
+	* vm.c : fix making env routine
+
+	* vm_dump.c, vm.h : support frame type "EVAL" and fix magic number
+
+	* yarvcore.c : fix some mark/free routine
+
+
+2005-10-05(Wed) 09:08:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, eval_intern.h, vm.c, eval_jump.h, yarvcore.h :
+	re-define PUSH/POP/EXEC/JUMP_TAG to use thread local tag
+
+	* inits.c, yarvcore.c : fix boostrap
+
+
+2005-10-03(Mon) 22:28:24 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix NODE_COLON2 bugs
+
+	* compile.h : fix debug routine
+
+	* disasm.c : add space between insn and operand
+
+	* insns.def : add comment of classdef, singletonclassdef
+
+	* vm.c, yarv.h : fix invoke_light routine
+
+	* yarvcore.c : fix to mark each threads
+
+
+2005-10-02(Sun) 05:55:34 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.h : add "system_working" global variable
+
+
+2005-10-02(Sun) 01:23:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c : add raw gets (for test), and fix indent
+
+
+2005-10-01(Sat) 23:06:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_win32.h, common.mk : add thread_win32.h
+
+	* thread.c : support _WIN32 thread
+
+	* thread.c, thread_pthread.h : fix some interface
+
+	* eval_thread.c : remove debug print
+
+	* gc.c : fix stack region
+
+	* win32/Makefile.sub : add -MD flag to LDFLAGS
+
+	* yarvcore.c : fix mark and sweep debug print
+
+	* yarvcore.h : fix VM#living_threads data type to st_table
+
+
+2005-10-01(Sat) 00:25:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, yarvcore.h : rename GIL (Global Interpreter Lock) to
+	GVL (Global VM Lock)
+
+	* thread_pthread.h : fix pthread mutex initialize
+
+
+2005-09-30(Fri) 20:11:19 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c : support join with timeout
+
+	* yarvcore.h : use GET_VM()
+
+
+2005-09-30(Fri) 14:59:29 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, common.mk : add thread.c
+
+	* thread.c, gc.c, eval_thread.c, yarvcore.c, yarvcore.h : 
+	support native thread (on pthread)
+
+	* insns.def : add YARV_CHECK_INTS() check
+
+	* yarv.h : add GET_VM() macro
+
+
+2005-09-29(Thu) 22:43:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_intern.h, eval_thread.c : move thread_status to eval_intern.h
+
+	* yarvcore.c : fix thread/vm value
+
+	* yarvcore.h : add some parameter to yarv_thread_t
+
+
+2005-09-29(Thu) 01:52:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, yarvcore.h : add line number on last end instruction
+
+	* vm.c : fix line no detection
+
+
+2005-09-28(Wed) 00:02:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk, eval_load.c, eval.c, eval_intern.h : add eval_load.c
+
+	* disasm.c : fix around block local variables
+
+	* eval_proc.c : fix typo
+
+
+2005-09-27(Tue) 16:45:20 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : remove debug print
+
+
+2005-09-27(Tue) 16:41:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : support Kernel.local_variables
+
+	* parse.y, yarvcore.c : move some functions
+	(rb_(backref|lastline)_(get|set)) from parse.y to yarvcore.c
+
+	* yarvcore.h : fix typo of YARV_PREVIOUS_CONTROL_FRAME
+
+
+2005-09-26(Mon) 18:51:29 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, compile.c, parse.y, vm.c, yarvcore.h :
+	 eval() works with binding (Env)
+
+	* vm.c : add th_set_eval_stack
+
+	* yarvtest/test_syn.rb : remove an assert "defined?(local_var)"
+
+
+2005-09-25(Sun) 19:30:59 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm2_send.rb : added
+
+	* common.mk : add rule "bench-item"
+
+	* eval_intern.h : add PASS_PASSED_BLOCK()
+
+	* eval_proc.c : support some functions
+
+	* rb/mklog.rb : added
+
+	* vm.c : fix prototype style and coding style
+
+	* yarv.h : add some prototypes of functions
+
+	* yarvcore.c, yarvcore.h, eval.c : yarv_thread_t#ifuncnode -> passed_block,
+	and add yarv_proc_t#safe_level
+
+
+2005-09-25(Sun) 11:01:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* some files : import from ruby 1.9.0 (2005-09-25)
+
+	* eval*, vm.c, vm_macro.def : remove frame, scope, ...
+
+	* yarvcore.c : remove yarv_block_given_p()
+
+	* yarvcore.h, insnhelper.h : move some macro from insnhelper.h to yarvcore.h
+	to use these in eval.c
+
+
+2005-09-24(Sat) 15:51:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval* : remove dependency to ruby_dyna_vars and ruby_class
+
+
+2005-09-23(Fri) 20:39:14 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_*.[ch] : split eval.c to some files
+
+	* *.[ch] : import ruby 1.9.0 (2004-09-23)
+
+	* parse.y : remove dependency to ruby_dyna_vars and ruby_scope
+
+
+2005-09-15(Thu) 16:51:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, yarvcore.h : fix "for" scope
+
+	* yarvtest/test_block.rb : add tests for above
+
+
+2005-09-14(Wed) 06:11:43 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, vm_evalbody.h, vm.h, vm_dump.c,
+	compile.c, yarvcore.c : use #ifdef insted of #if for recognize
+	vm options
+
+	* vm_opts.h : fix default options
+
+
+2005-09-10(Sat) 14:10:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_opts.h : added
+
+	* yarvcore.h, rb/insns2vm.h : use vm_opts.h
+
+
+2005-09-10(Sat) 04:53:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, insns.def, compile.c : add DEFINED_YIELD
+
+	* yarvtest/test_yield.rb : add test_1_ary_and_1_params
+
+	* insns.def : fix splat and svalue
+
+	* vm.c : fix to perform with proc with ifunc (incomplete)
+
+	* sample/test.rb : added (comment out unsupported features)
+
+	* common.mk : add rule "runtest"
+
+
+2005-09-09(Fri) 19:32:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c : add splatarray
+
+	* yarvtest/test_massign.rb : add tests for above
+
+
+2005-08-31(Wed) 22:55:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c (yarvcore_eval_parsed): fix to return value
+
+	* yarv_version.h, Changes : 0.3.1
+
+
+2005-08-20(Sat) 10:19:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/ir.rb : add some check
+
+	* import today's ruby HEAD
+
+
+2005-08-18(Thu) 23:29:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : fix object file extension
+
+	* rb/ir.rb : added (import ruby script)
+
+	* rb/diff.rb : removed
+
+	* import today's ruby HEAD
+
+
+2005-08-18(Thu) 12:59:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk : rule test -> test2, test1 -> test
+
+	* compile.c : fix when clause bug and splat arugment
+
+
+2005-08-17(Wed) 05:22:31 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix block local parameter setting routine and support
+	massign in block parameter initialze
+
+	* yarvtest/test_yield.rb : add tests for above
+
+	* insns.def, compile.c : support array concat (ex: "[x, *y]")
+
+	* yarvtest/test_bin.rb : add tests for above
+
+
+2005-08-16(Tue) 19:51:19 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support nested massign
+
+	* yarvtest/test_massign.rb : add tests for above
+
+
+2005-08-16(Tue) 10:25:29 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : support rb_yield_0 with 0 args
+
+
+2005-08-16(Tue) 09:09:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/fileutils.rb : imported
+
+	* insns.def : fix yield argument (same as last commit)
+
+	* yarvtest/test_yield.rb : add tests for above
+
+
+2005-08-16(Tue) 08:29:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : fix to support rb_yield_0 with multiple values
+
+	* common.mk : add parse, run1p ruelse
+
+	* compile.c : support yield with ARGSCAT/SPLAT
+
+	* vm.c, insns.def : fix yield arguments to do compatible behaviour
+
+	* yarvtest/test_yield.rb : added for above
+
+
+2005-08-16(Tue) 06:00:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix to set klass_nest_stack on singleton
+	method definition
+
+	* yarvtest/test_method.rb : add a test for above
+
+
+2005-08-16(Tue) 05:34:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test1.rb : added.  gdb and run1 rule run this script
+
+	* compile.c : fix error handled variable access
+
+	* yarvtest/test_exception.rb : add tests for above
+
+
+2005-08-16(Tue) 04:26:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* base ruby : ruby 1.9.0 (2005-08-15)
+
+
+2005-08-16(Tue) 03:54:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk, Makefile.in : move some rules to common.mk
+
+	* rb/diff.rb : added
+
+	* yarvtest/yarvtest.rb : fix to compare output last value
+
+
+2005-08-15(Mon) 18:27:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* Changes : 0.3.0
+
+
+2005-08-15(Mon) 17:56:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : fix to add prototype
+
+	* all files : propset svn:eol-style native
+
+
+2005-08-15(Mon) 10:48:53 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c : support rb_load
+
+
+2005-08-15(Mon) 09:42:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : define SDR()
+
+	* vm_dump.c : stack_dump_raw() -> vm_stack_dump_raw()
+
+	* yarvtest/yarvtest.rb : add rite test scheme
+
+	* benchmark/run_rite.rb : added
+
+	* yarvcore.c, inits.c : add Init_vm()
+
+	* yarv.h : add some prototype declarations, GET_THREAD()
+
+	* eval.c : remove unused functions
+
+	* eval.c : support Kernel.eval, some schemes (same as evalc.patch)
+
+
+2005-08-15(Mon) 00:53:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarv_version.h : move configurations to yarvcore.h
+
+	* yarvcore.c : remove VALUE yarv_get_current_running_thread() and
+	add yarv_thread_t *yarv_get_current_running_thread(), ...
+
+	* yarvcore.h : yarv_thread_t#vm -> vm_value
+
+	* compile.c : fix "break from nested classes"
+
+	* yarvext/extconf.rb : use have_func instead of defined?(YARV_PACHED)
+
+	* depend : fix pass
+
+	* eval.c : change to kick VM
+
+	* version.c : fix to show yarv version
+
+	* common.mk : fix dependent
+
+	* inits.c : fix to kick Init_yarvcore
+
+
+2005-08-14(Sun) 02:05:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* README : add description
+
+	* yarvext/depend : move to topdir/depend
+
+2005-08-14(Sun) 01:50:43 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* merge yarv to ruby (prepare)
+
+	* make yarvext/ to build as extension
+
+
+2005-08-13(Sat) 09:36:26 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* evalc.patch, insns.def, compile.c : fix to support current
+	ruby HEAD.
+
+	* 0.2.3
+
+
+2005-08-08(Mon) 19:13:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h, Changes : 0.2.2
+
+
+2005-08-08(Mon) 17:17:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.h, vm.c, insns.def, yarvcore.h, yarvcore.c :
+	remove yarv_iseq_t#iseq_dt and add yarv_iseq_t#encoded.
+	use yarv_iseq_t#encoded anytime
+
+	* vm_evalbody.h, vm.h, extconf.rb, version.h :
+	support call threaded code (incomplete)
+
+
+2005-08-01(Mon) 05:26:12 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : support yield with multiple values
+
+	* compile.c : fix dynavars
+
+	* yarvcore.h : fix to mark defined method
+
+
+2005-07-31(Sun) 23:27:24 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, vm.c, insns.def : fix search object path
+
+	* compile.c : fix "for" statement
+
+	* vm_macro.def : fix rest, opt arguments
+
+
+2005-07-31(Sun) 14:52:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_macro.def : fix block parameter
+
+	* compile.c : fix to unuse compile_data->in_ensure
+
+	* insns.def : add orphan check when return
+
+
+2005-07-31(Sun) 03:25:05 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, compile.c, yarvcore.h, insns.def :
+	support jump from rescue/ensure/class/module
+
+	* test/test_flow.rb : add tests for above fix
+
+
+2005-07-30(Sat) 04:44:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : struct iseq_compile_data_ensure_node_stack is added
+
+	* compile.c : insert ensure clause before break/next/redo
+
+	* vm.c : fix return/break handling
+
+	* yarv.h, vm.c : fix lightweight yield
+
+	* vm.c, insns.def, vm_macro.def : change arguments of th_set_env (add sp)
+
+	* test/test_flow.rb : added
+
+	* test/yarvtest.rb : add ae_flow
+
+	* compile.c, vm_macro.def : add tail-call/tail-recursion optimization
+	(experimental)
+
+
+2005-07-29(Fri) 20:14:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : make_name_for_block and make_name_with_str
+	are added
+
+	* insns.def : fix if unmatched size arg size to yield
+
+	* test/test_block.rb : add test for above fix
+
+	* vm.c : add th_backtrace_each and fix backtrace notation
+
+	* yarvcore.c : set top level iseq name to "<main>"
+
+
+2005-07-29(Fri) 13:20:19 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : fix yarv_iseq_t to pass VC (cl)
+
+	* vm_dump.c : ditto
+
+	* compile.h : ditto
+
+	* insnhelper.h : ditto
+
+	* vm_evalbody.h : include 'math.h'
+
+	* insns.def, vm.c : raise error when yield without block
+
+	* vm.c : implement thread_backtrace
+
+	* vm.c, yarvsubst.c, yarv.h : implement thread_yield_light_prepare and
+	thread_yield_light_invoke
+
+	* yarvcore.c : Integer#times uses yarv specific version
+
+
+2005-07-28(Thu) 21:35:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : add another mark function for thread/stack
+
+	* vm_evalbody.h : fix register allocation for x86_64
+
+	* vm.h : use asm for tc on x86_64
+
+
+2005-07-28(Thu) 20:17:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : add mark/free message to debug gc
+
+	* insnhelper.h, insns.def, vm_macro.def : remove and
+	add new RESTORE_REGS
+
+	* vm_evalbody.h : fix register allocation
+
+
+2005-07-28(Thu) 02:00:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, etc : change VM stack structure. re-write all
+	vm functions to do it
+
+	* vm_macro.def : added
+
+
+2005-07-08(Fri) 01:36:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : don't use fmod on AMD64
+
+
+2005-07-08(Fri) 00:14:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* Changes : added
+
+
+2005-07-07(Thu) 23:54:37 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h : 0.3.0
+
+
+2005-07-07(Thu) 23:52:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* 0.2.1 : released
+
+
+2005-07-07(Thu) 23:50:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h : 0.2.1
+
+
+2005-07-07(Thu) 23:47:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb, extconf.rb : add --[enable|disable]-opt-unify-all-combination
+	and --disable-opts
+
+	* vm.h : DISPATCH_ARCH_DEPEND_WAY is only enabled on GCC 3.x
+
+
+2005-07-06(Wed) 13:20:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* depend, rb/eval.rb : add ITEMS option to benchmark rule
+
+	* benchmark/* : changed
+
+	* benchmark/other-lang/* : added
+
+
+2005-07-04(Mon) 04:02:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h. yarvcore.c : add idDIV, idMOD, idEq, idLength
+
+	* compile.c, insns.def : add specialized insn for above method id
+
+	* test/test_bin.rb : add tests for above
+
+
+2005-07-03(Sun) 20:31:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, yarvcore.h : remove cYarvThrowObject (unused)
+
+	* yarvcore.c, yarvcore.h, insns.def : 
+	thread_object#stack_mark_poinetr
+
+	* depend, rb/eval.rb : BOPT, TOPT -> OPT
+
+
+2005-07-03(Sun) 13:53:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, compile.h : INSN_OBJECT, LABEL_OBJECT -> INSN, LABEL,
+	ISEQ_LINK_ELEMENT, ISEQ_LINK_ANCHOR -> LINK_ELEMENT, LINK_ANCHOR,
+	and some fixes
+
+	* tmpl/optinsn.inc.tmpl : ditto
+
+	* yarvcore.c, yarvcore.h : remove label_object, insn_object
+	prepare_iseq_build, cleanup_iseq_build are added
+
+	* insns.def : remove unused variable from send
+
+
+2005-07-02(Sat) 04:19:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : add GC protect for opt_aset
+
+
+2005-07-02(Sat) 03:49:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb : add option -fno-reorder-blocks to vm.asm rule
+
+	* insns.def : fix opt_aset bugs
+
+	* test/test_bin.rb : add tests for aset, aref
+
+
+2005-07-02(Sat) 03:05:12 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb : fix output
+
+	* vm_evalbody.h : add register for x86_64
+
+	* rb/asm_parse.rb : fix to shor size and length
+
+
+2005-07-02(Sat) 02:56:31 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : move specialized instruction point (new_insn_send)
+
+	* insns.def : add opt_aref, opt_aset
+
+
+2005-07-01(Fri) 11:04:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.h : fix to pass VALUE type to new_insn_body
+
+	* insnhelper.h : add cast
+
+	* compile.c : fix getdynamic argument (0 == Qfalse -> I2F(0))
+
+
+2005-06-30(Thu) 23:34:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/eval.rb : add and fix some rules
+
+	* rb/insns2vm.rb : generate all
+
+	* benchmark/run.rb : add -r (ruby only) option
+
+
+2005-06-30(Thu) 23:25:23 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* tmpl/vmtc.inc.tmpl : add const prefix
+
+	* /rb/asm_parse.rb, extconf.rb : added and make assembler analised output 
+
+	* opt_operand.def : add send operands unification
+
+	* insnhelper.h : add HEAP_CLASS_OF(obj)
+
+	* insns.def : fix opt_plus, opt_ltlt
+
+	* vm_evalbody.h : move _tag
+
+	* benchmark/run.rb : fix file select
+
+
+2005-06-30(Thu) 06:07:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb : add collect-usage-analysis option
+
+	* opt_operand.def, opt_insn_unif.def : add some rules
+
+
+2005-06-29(Wed) 23:28:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, extconf.rb, vm.h, compile.c :
+	DISPATCH_DIRECT_THREADED_CODE, DISPATCH_THREADED_CODE
+	 -> OPT_DIRECT_THREADED_CODE,  OPT_INDIRECT_THREADED_CODE.
+	if at least one of then is defined, OPT_THREADED_CODE is defined
+
+	* benchmark/* : fix name and parameters
+
+	* rb/eval.rb : added for YARV evaluation
+
+
+2005-06-29(Wed) 16:16:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb : fix output format
+
+	* call_cfunc.inc -> call_cfunc.h
+
+	* vm.h : add sign by asm statement
+
+
+2005-06-28(Tue) 22:28:40 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : fix method search
+
+
+2005-06-28(Tue) 22:26:34 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb : fix options
+
+
+2005-06-28(Tue) 21:50:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb : fix output format
+
+
+2005-06-28(Tue) 21:34:54 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* depend : add option TOPT to test rules
+
+	* benchmark/run.rb : fix output format
+
+
+2005-06-28(Tue) 21:15:54 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix opt_case_dispatch instruction
+
+	* benchmark/run.rb : output all usertimes when exit benchmark
+
+
+2005-06-28(Tue) 20:35:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb, compile.c, tmpl/optinsn.inc.tmpl, vm.c :
+	change extconf options
+
+2005-06-28(Tue) 13:20:59 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb : add -y, --yarv-only option
+
+	* depend : add BOPT to tbench rule
+
+
+2005-06-27(Mon) 23:31:12 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* depend : add gdb rule
+
+	* vm.h : use inline assembler for x86 (to support gcc 3.4.x)
+
+
+2005-06-27(Mon) 20:04:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, compile.c, disasm.c : remove unused variables
+
+	* vm.h, insnhelper.h, debug.h : fix to reduce warning
+
+	* vm.c, vm_dump.c : move VM state dump (debug) functions to vm_dump.c
+
+	* depend : adde reconf rule
+
+	* insnhelper.h : 
+
+	* vm_evalbody.inc : rename to vm_evalbody.h
+
+
+2005-06-27(Mon) 16:50:31 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns2vm.rb : fix generating unif insn
+
+	* compile.c : add useless pop/swap insn elimination with stack caching
+
+	* depend : remove compiled.o dependency
+
+
+2005-06-26(Sun) 14:06:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb : use tmpfile instead of popen
+
+	* rb/insns2vm.rb : fix generating insn unification logic
+
+	* opt_insn_unif.def : add some unification rules
+
+	* compile.c : add verify_list function and fix unification logic
+
+
+2005-06-22(Wed) 12:58:26 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, yarvcore.c, insns.def,  compile.c : add mult optimization
+
+	* test/test_bin.rb : add test_fact
+
+
+2005-06-21(Tue) 22:34:07 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, compile.[ch], tmpl/optinsn.inc.tmpl, rb/insns2vm.rb :
+	change data structure (don't use Ruby's array to represent a
+	instruction sequence)
+
+	* disasm.c : add separator
+
+
+2005-06-14(Tue) 07:48:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support "for" statement
+
+	* test/test_block.rb : add test for above
+
+	* yarvcore.[ch] : add global id idEach
+
+
+2005-06-08(Wed) 22:30:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : add if/unless(L1) jump (L2) :L1 => unless/if(L2)
+	optimize (condition reversal) and fix typo
+
+
+2005-06-07(Tue) 08:29:41 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : fix to remove compiler warning
+
+	* version.h : 0.2.1
+
+
+2005-06-07(Tue) 08:16:22 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : iseq_link_element changed to double linked list
+
+	* disasm.c : support dump struct iseq_link_element
+
+	* compile.c : use double linked list instead of array
+	for intermediate representation
+
+
+2005-06-06(Mon) 15:38:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, yarvcore.c : add link structure to insn and label object
+
+	* compile.h, compile.c : remove some variables in function top scope
+	of iseq_compile_each and some optimization (now working)
+
+
+2005-06-04(Sat) 16:12:59 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix previous commit
+
+
+2005-06-04(Sat) 15:56:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix stack caching (after jump state)
+
+
+2005-06-04(Sat) 09:12:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix some point for previous commit
+
+
+2005-06-04(Sat) 07:31:21 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : optimize case/when statement
+	(dispatch on constant time)
+
+	* yarvcore.h, disasm.c, rb/insns2vm.rb : fixed for above
+	(CDHASH)
+
+	* test/test_syn.rb : add test for above
+
+
+2005-06-04(Sat) 03:41:29 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, yarvcore.c : add some temporary variable test
+	(it'll be vanished)
+
+	* compile.c : NODE_CASE optimize (use topn instead of dup/swap)
+
+
+2005-06-03(Fri) 00:54:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : apply flow optimization for while/until statement
+
+
+2005-03-04(Fri) 19:34:32 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb : fix category (comment)
+
+	* depend : remove space betweeen target name and colon
+
+
+2005-03-04(Fri) 15:55:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* tmpl/yarvarch.ja : fix typo
+
+
+2005-03-04(Fri) 13:30:19 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* depend : add a rule for jitcompile.o
+
+	* vm.h : fix a macro argument
+
+	* version.h : 0.2.0
+
+
+2005-03-03(Thu) 08:35:14 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb : remove vm_evalbody.inc call_cfunc.inc from clean target
+
+
+2005-03-03(Thu) 00:54:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* tmpl/insns.inc.tmpl : fixed typo
+
+	* insns.def : store th->pc to current pc
+
+
+2005-03-03(Thu) 00:31:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* tmpl/yarvarch.ja, doc/yarv.rb : write current architecture of yarv
+
+
+2005-03-01(Tue) 13:50:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c (yarvcore_eval_parsed) : added
+	(separeted from yarvcore_eval)
+
+	* yarvcore.c, compile.c : iseq_translate_direct_threaded_code
+	is moved to compile.c
+
+	* depend : add rule for yasmdata.rb
+
+	* rb/yasm.rb : support top-level and method-level assemble
+
+
+2005-02-26(Sat) 08:09:57 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb, compile.c, vm.h : change type long to OFFSET
+
+	* tmpl/yasmdata.rb.tmpl : added
+
+	* rb/insns2vm.rb : add yasmdata_rb method
+
+	* rb/yasm.rb : fix some interface (incomplete)
+
+	* compile.c : iseq_setup added
+
+	* yarvcore.c : YARVCore::InstructionSequence::Instruction#make added
+
+
+2005-02-24(Thu) 07:45:37 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/yasm.rb : added
+
+
+2005-02-24(Thu) 01:13:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : remove useless statements
+
+
+2005-02-24(Thu) 00:46:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb (InsnInfo) : add @is_sc attr and remove
+	is_sc method
+
+	* compile.c : fix NODE_CASE/NODE_WHEN bug (cond at 'when'
+	must not be popped)
+
+	* compile.c : support NODE_OP_ASGN1 to &&= and ||=
+
+	* test/test_bin.rb : add tests for above
+
+
+2005-02-23(Wed) 09:17:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, yarvcore.c : thread_svar added and fix svar location
+
+
+2005-02-21(Mon) 08:38:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h : make type "struct iseq_compile_data"
+
+	* yarvcore.h : iseq_object#insn_info_ary to iseq_object#insn_info_tbl 
+
+
+2005-02-21(Mon) 05:24:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c (compile_string) : remove null check of node
+
+
+2005-02-19(Sat) 03:52:45 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h : 0.1.1
+
+
+2005-02-18(Fri) 20:57:18 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, yarvcore.c : add idLTLT, idMethodMissing
+
+	* compile.c : suopport lval (or others) block parameter
+
+	* test/test_block.rb : add tests for above
+
+	* insns.def (send) : support method_missing
+
+	* test/test_method.rb : add tests for above
+
+	* insns.def : opt_ltlt and 
+
+
+2005-02-18(Fri) 08:54:40 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/runc.rb : added
+
+	* benchmark/contrib/pentomino.rb : added opt_ltlt
+	and Float, String plus specialization
+
+
+2005-02-18(Fri) 07:49:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : remove debug print
+
+	* rb/aotcompile.rb : skip if yarvcore.so is not created
+
+
+2005-02-18(Fri) 06:46:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix block passing
+	and block argument
+
+
+2005-02-18(Fri) 05:52:41 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : thread_get_ev_const, thread_get_ev_defined is added
+	(separated from insns.def)
+
+	* insnhelper.h : GET_EV_KLASS(klass) is added
+	(separated from insns.def)
+
+	* yarvcore.h, insns.def, compile.c : support defined? expression (limited)
+
+	* test/test_syn.rb : tests for above is added 
+
+	* compile.c, insns.def : support block passed method dispatch
+
+	* test/test_method.rb : tests for above is added
+
+	* compile.h : CALL_ARGS_SPLAT is removed
+
+
+2005-02-16(Wed) 13:32:37 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* disasm.c : fix ID to String method
+
+	* compile.c : NODE_SUPER, NODE_ZSUPER check 'poped'
+	and NODE_RETURN check outer type
+	and NODE_DREGX_ONCE supported (temporarily)
+
+	* test/test_syn.rb : add a test
+
+	* test/test_jump.rb : add a test
+
+
+2005-02-16(Wed) 06:07:41 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.[hc] : use Symbol instead of Fixnum to represent ID
+
+	* rb/insns2vm.rb : add attr_reader :insns, :insn_map
+
+	* vm.h, rb/insns2vm.rb : END_INSN have one arg
+
+	* jitcompile.c : jit compiler framework (experimental)
+
+	* rb/aotcompile.rb : refactoring
+
+	* compiled.c : add constant pool
+
+	* vm_evalbody.inc, call_cfunc.inc, vm.c : separeted from vm.c
+
+	* insns.def : fix return val
+
+	* depend : add rules for compiled.o
+
+
+2005-02-14(Mon) 13:09:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.h, yarvcore.h: move YARV_METHOD_NODE to yarvcore.h
+
+	* yarvcore.h : add 2 members jit_compiled and iseq_orig
+	to struct iseq_object
+
+	* yarvcore.c : add yarv_jitcompile and global function jitcompile
+
+	* insns.def : insn opt_call_native_compiled added
+
+	* jitcompile.c : added
+
+
+2005-02-12(Sat) 05:38:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (putstring) : fixed to duplicate string object
+
+	* rb/insns2vm.rb, tmpl/optunifs.inc.tmpl, compile.c : support
+	instructions unification (aka super instruction)
+
+	* opt_insn_unif.def : added for above
+
+	* benchmark/bm_unif1.rb : added to measure efficiency of unification
+
+	* depend : fixed for above
+
+	* extconf.rb : add option --(enable|disalbe)-opt-insns-unification
+
+
+2005-02-11(Fri) 12:14:39 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, vm.c, insns.def : permit to access svar from
+	cfunc environment
+
+	* test/test_method.rb : add tests for above
+
+
+2005-02-09(Wed) 19:31:06 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* ite.rb : added (ruby -rite [script file])
+
+
+2005-02-09(Wed) 02:25:43 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.[hc] : add member compile_data (hash) to iseq_object
+
+	* compile.c, yarvcore.h : check label is already set
+
+	* compile.c, extconf.rb : support __goto__ and __label__ statement
+
+
+2005-01-25(Tue) 12:49:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_block.rb : add break test to test_times
+
+
+2005-01-25(Tue) 03:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb : check ruby version if yarv patch is applied or not
+
+	* evalc.patch : fixed for rb_call_super and above check
+
+
+2005-01-25(Tue) 03:21:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb : refactoring (mainly, make InsnsDef::InsnInfo
+	to represent each instruction information)
+
+	* depend, rb/makedocs.rb : fixed for above
+
+	* yarvcore.c (thread_call_super) : added
+
+	* vm.c (thread_call_super) : added
+
+	* vm.h : add struct cmethod_info
+
+	* insns.def, vm.c : use cmethod_info to represent C method info
+
+	* insns.def : use iseq_object#klass_nest_stack
+	to search super/zsuper's class
+
+	* prosym.rb : removed
+
+	* ToDo : write todo things on wiki
+
+
+
+2005-01-18(Tue) 23:44:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb : check ENV['RUBY'] to use ruby binary
+
+
+2005-01-10(Mon) 08:44:40 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h : 0.1.0
+
+
+2005-01-09(Sun) 22:01:29 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* repository : svn propset svn:eol-style native *.c *.h tmpl/*.tmpl
+
+
+2005-01-09(Sun) 21:48:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : FREE_UNLESS_NULL, MARK_UNLESS_NULL macros are added
+
+	* yarvcore.c : some insn/label methods are added
+
+	* yarvcore.h : add structure menber "insns_ary" to iseq_object
+
+	* vm.c, insns.def (thread_eval_body) : return values with throw
+
+	* prosym.rb : added
+
+	* insns.def : add YARV_AOT_COMPILED and some procedure
+
+	* depend : add compiled.c
+
+	* compiled.c : added to build compiled Ruby program (C source)
+	by AOT compiler
+
+	* rb/aotcompile.rb : AOT compiler
+
+	* aotct.rb, rb/aotctest.rb : test and benchmark AOT compiler
+
+	* rb/allload.rb : added
+
+
+2005-01-09(Sun) 08:30:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c (yarv_yield_values) : added
+
+	* vm.c (thread_call0) : change interface. substitute rb_call0 in
+	yarv environment
+
+	* yarvcore.c (yarv_call0) : fix for above
+
+	* yarvcore.c (yarv_call0_cfunc) : removed
+
+	* yarvcore.c : change passing items for yarv_setup
+
+	* evalc.patch : fix for above
+
+	* benchmark/bm_lists.rb : fix (unsupport block passing)
+
+	* benchmark/run.rb : use full path to ruby
+
+	* insns.def (yield): raise error if argc > expected argc
+
+
+2005-01-08(Sat) 16:07:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb : add descrioptions
+
+	* compile.c : fix bugs (getinlinecache operands)
+
+	* yarvcore.c : initial value of yarvGlobalStateVersion
+	to 1
+
+
+2005-01-08(Sat) 14:39:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, vm.c, evalc.patch : support making backtrace
+	(incompatible with current ruby interpreter)
+
+
+2005-01-08(Sat) 11:25:46 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* evalc.patch : commit for previous commit change
+
+	* yarvcore.h, compile.c, insns.def : MC to IC (inline cache),
+	and changed to using IC by set/getinlinecache
+
+
+2005-01-08(Sat) 10:04:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : add global variable sym[IC]FUNC
+
+	* yarvcore.c (yarv_iterate, yarv_call0_cfunc) : added
+	(each called from rb_iterate, rb_call0 with NODE_CFUNC)
+
+	* vm.c (stack_dump_raw) : fixed to prints more detail
+
+	* vm.c (stack_dump_th, stack_dump_thobj) : added to
+	dumps thread_object states (for VALUE, struct pointer)
+
+	* vm.c (thread_dump_regs) : added
+
+	* vm.c (thread_call0, thread_call0_cfunc, thread_invoke_yield, 
+	thread_invoke_yield_cfunc), insns.def (yield, send) :
+	fixed, added to support IFUNC
+
+	* vm.c, yarvcore.c, insns.def : change type purpose
+	thread_object#block_ptr (it holds IFUNC block information,
+	so this type was changed to 'NODE *')
+
+	* vm.c (stack_dump_each) : fixed for above
+
+	* test/test_block.rb (test_ifunc) : test for above
+
+	* vm.c (get_block_objec, thread_make_env_object) : fixed bugs
+
+	* test/test_bin.rb (test_xstr) : remove `ls` test
+
+
+2005-01-06(Thu) 21:35:18 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarv : trying to support NODE_IFUNC (rb_iterate)
+
+
+2005-01-05(Wed) 06:50:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, insns.def, disasm.c, rb/insns2vm.rb, compile.[ch] :
+	support inline method cache
+
+	* extconf.rb : add -*-inline-method-cache (default: enable)
+
+	* test/test_method.rb : add a test for above
+
+	* benchmark/bm_poly_method.rb : added
+
+	* yarvcore.c : add option string
+
+
+2005-01-04(Tue) 17:15:41 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c : add compile_array and duparray insn
+	to optimize only literal array creation
+
+	* benchmark/bm_array.rb : added
+
+
+2005-01-04(Tue) 10:02:40 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* README : fix version
+
+
+2005-01-04(Tue) 09:57:25 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* ToDo : reflect current status
+
+
+2005-01-04(Tue) 09:43:54 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_VALUES, NODE_ARGSCAT, NODE_SPLAT
+
+	* test/test_massign.rb : add tests for above
+
+	* benchmark/bm_swap.rb : added
+
+
+2005-01-04(Tue) 06:25:45 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.h : COMPILE_ERROR break contol (instead of return)
+
+	* compile.c : support NODE_MASGN
+
+	* insns.def : change expandarray for massign and add topn insn
+
+	* test/test_massign.rb : added
+
+
+2005-01-03(Mon) 21:20:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : store block when create proc
+
+	* test/test_proc.rb : add a test for above change
+
+	* yarvcore.c : add global function "once"
+
+
+2005-01-02(Sun) 00:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_super.rb : fix bug (remove infinite loop)
+
+
+2005-01-01(Sat) 23:45:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_z?super.rb : added
+
+
+2005-01-01(Sat) 23:37:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bmx_so_object.rb : rename to benchmark/bm_so_object.rb
+
+
+2005-01-01(Sat) 23:19:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_OP_ASGN2, NODE_OP_ASGN_AND, NODE_OP_ASGN_OR,
+	NODE_SUPER, NODE_ZSUPER, NODE_MATCH
+
+	* insns.def : support super, zsuper (currently, super can't
+	handle with block)
+
+	* test/test_bin.rb : add test for op_asgin2, op_assgin_and/or
+
+	* test/test_class.rb : add test for super, zsuper
+
+
+2005-01-01(Sat) 20:39:29 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_MATCH
+
+	* yarvcore.c : fix yarv_svar bug (fix condition boundary)
+
+	* insnhelper.h : save cfp/lfp/dfp vars to thread_object (th)
+
+
+2005-01-01(Sat) 20:03:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h : 0.0.1
+
+	* yarvcore.h : add idIntern declaration
+
+	* insns.def : add getspecial, setspecial.
+	implement getclassvariable, setclassvariable.
+	store lfp before reg match (opt_regexpmatch1)
+
+	* compile.c : support ditto, flipflop
+
+	* yarvcore.c : support svar
+
+	* test/test_syn.rb : add test for flipflop
+
+	* test/test_bin.rb : add test for dsym, cvar, backref
+
+
+2005-01-01(Sat) 09:09:32 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : add getspecial insn
+
+	* compile.c : support NODE_NTH_REF, NODE_BACK_REF
+
+
+2005-01-01(Sat) 06:53:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c : support alias, undef
+
+	* test/test_method.rb : test for above
+
+	* rb/insns2vm.rb : fix enbug
+
+
+2005-01-01(Sat) 06:00:32 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_jump.rb : add test (next with value)
+
+	* yarvcore.h, yarvcore.c, compile.c, compile.h :
+	raise compile error exception instead of rb_bug
+
+	* yarvcore.c, evalc.patch : support "require"
+
+	* test.rb : restore $" after evaluation with ruby
+
+	* rb/insns2vm.rb : remove unnecesary each
+
+
+2004-12-17(Fri) 18:56:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix newhash
+
+
+2004-12-15(Wed) 13:29:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : add version string
+
+	* compile.c : fix rescure clause bug
+
+
+2004-12-14(Tue) 22:46:30 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : add reput insn
+
+	* vm.h : show stack cache registers when stack dump
+
+	* rb/insns2vm.rb, compile.c : fix stack caching bugs
+
+
+2004-12-14(Tue) 00:51:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns2vm.rb, compile.c, tmpl/opt_sc.inc.tmpl : fix bugs
+
+	* rb/mixc-asm.rb : added
+
+
+2004-12-14(Tue) 00:17:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, yarvcore.c, compile.c : fix SC bugs
+	(SC state management)
+
+	* extconf.rb : add option -[enable|disable]-opt-stack-caching
+
+	* insns2vm.rb : accept CPPFLAGS options
+
+	* vm.c : support restrore register for pc
+
+
+2004-12-13(Mon) 16:53:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb : add macro INSN_IS_SC()
+
+
+2004-12-11(Sat) 10:51:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, compile.c : support singleton method definition
+
+	* test/test_method.rb : add test for above
+
+
+2004-12-11(Sat) 03:17:54 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/*.rb : modify
+
+	* extconf.rb : add $cleanfiles
+
+
+2004-12-08(Wed) 13:01:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : change to disable stack caching
+
+
+2004-12-07(Tue) 19:37:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.rb : add default after
+
+	* insns.def : fix to work on stack caching
+
+
+2004-12-07(Tue) 15:07:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* depend : add some dependency to *.inc files
+
+	* vm.c : add "register" and asm("regname") descriptor
+
+	* rb/insns2vm.rb, compile.c : add stack caching support
+
+	* tmpl/opt_sc.inc.tmpl : added to above change
+
+	* rb/makedocs.rb : fix file path
+
+	* extconf.rb : fix option selection
+
+
+2004-12-06(Mon) 11:20:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* extconf.rb : add vm.asm target if compiler is gcc
+
+
+2004-12-06(Mon) 09:56:24 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.h : rename method_frame's member block to block_ptr
+
+	* extconf.rb : add "-fno-crossjumping" option when compiler
+	is gcc
+
+	* opt_operand.def : add unification insn send
+
+	* rb/insns2vm.rb : define symbol instead of declare const
+	variable (for more optmize on VC)
+
+	* insns.def : move enter point in send
+
+
+2004-12-06(Mon) 04:53:51 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, opt_operand.def, rb/insns2vm.rb, depend :
+	support operand unification
+
+
+2004-12-05(Sun) 03:16:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, insns.def : speed up throw/catch scheme
+
+
+2004-12-05(Sun) 01:47:05 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : fix catch handler bugs
+
+	* test/test_jump.rb : test_complex_jump added
+
+
+2004-12-03(Fri) 20:39:05 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/contrib/mcq.rb : added
+	(from URABE Syouhei)
+
+
+2004-12-03(Fri) 20:35:28 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : support break in rb_yield block
+
+
+2004-12-03(Fri) 14:26:35 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support block local variable in current
+	ruby specification (patche from Kent Sibilev)
+
+	* insns.def : support attr_* (patch from Kent Sibilev)
+
+
+2004-12-02(Thu) 21:04:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* opt_operand.def : added
+
+
+2004-12-02(Thu) 13:20:41 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c, vm.h, vm.c, insns.def, insnhelper.h, yarvutil.rb :
+	add usage analisys framework 
+
+	* disasm.c : insn_operand_intern to separate function
+
+	* benchmark/run.rb : run each benchmark on another process
+
+
+2004-12-01(Wed) 10:26:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : yield check block is given
+
+	* benchmark/bm_lists.rb : rename to bmx_lists.rb
+	(because it's not work ... bug?)
+
+	* insns.def : opt_* support other type calc
+
+
+2004-11-30(Tue) 16:14:54 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_so_array.rb : added
+
+	* benchmark/bm_so_matrix.rb : added
+
+
+2004-11-30(Tue) 14:11:30 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/getrev.rb : added
+
+	* yarvcore.c : add YARVCore::REV, YARVCore::DATE constant
+
+
+2004-11-30(Tue) 13:05:42 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_OP_ASGN1 (incomplete)
+
+	* insns.def : add dupn
+
+
+2004-11-30(Tue) 08:52:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h : 0.0.0.f
+
+
+2004-11-30(Tue) 08:43:59 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_class.rb : add test_initialize and test_to_s
+
+	* yarvsubst.c : use rb_funcall instead of yarv_funcall
+
+	* evalc.patch : fix ruby's patch
+
+	* benchmark/bm_so_*.rb : change naming rule. "bm_so_*" from
+	language shootout
+
+	* depend : tbench target item is ITEM env val (default: bmx_temp)
+
+	* vm.c : show raw address if environment is in heap at dumping stack trace
+
+	* vm.c : thread_call0 added
+
+	* vm.c : fix thread_yield_light_invoke
+
+	* yarv.h, yarvcore.c : remove yarv_funcall
+
+
+2004-11-29(Mon) 11:37:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test/test_proc.rb : add test test_nestproc
+
+	* yarvsubst.c : comment out yarv_Array_each
+
+	* insns.def : restore lfp/dfp after call_cfunc
+
+	* vm.c : fix stack dump routine
+
+	* vm.c : impliment thread_funcall (temporarily)
+
+	* yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP()
+
+	* yarvcore.c : remove check with yarv_in_work
+
+	* evalc.patch : added
+
+
+2004-11-27(Sat) 00:19:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.c : free -> ruby_xfree
+
+
+2004-11-26(Fri) 02:11:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm,c : fix bug
+
+
+2004-11-22(Mon) 11:19:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_ackermann.rb, bm_proc.rb, bm_simpleiter.rb,
+	bm_so_exception.rb, bm_wc.rb, wc.input added
+
+
+2004-11-22(Mon) 02:31:56 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_proc.rb : add some test
+
+	* yarvcore.c, vm.c : support yield in C method (as rb_yield)
+
+	* vm.c (thread_yield_light_(prepare|invoke)) : support lightweight
+	yield
+
+	* yarv.h : added
+
+	* yarvcore.c, yarv.h : support yarv_is_working, yarv_block_given_p, 
+	yarv_yield, yarv_funcall (only dummy function)
+
+	* vm.c : thread_eval_body changed return value
+
+	* yarvsubst.c : added and add yarv_Integer_times, yarv_Array_each
+
+	* yarvcore.h : block_ptr is added to struct thread_object
+
+	* insns.def : pass block when C method call
+
+	* insnhelper.h : add GET_ISEQOBJ(cfp) macro
+
+
+2004-11-21(Sun) 07:25:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c : support Proc#call
+
+	* test/test_proc.rb : added
+
+
+2004-11-19(Fri) 18:04:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, vm.c : support creating Proc object
+
+
+2004-11-15(Mon) 14:19:27 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (send) : use clear_local_size to specify
+	clear local table vars.
+
+	* insns.def : block represent data shares lfp, dfp with frame data
+
+
+2004-11-13(Sat) 18:19:41 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, insns.def : add VM_CALL_ARGS_SPLAT_BIT and
+	VM_CALL_ARGS_BLOCKARG_BIT
+
+	* compile.c, compile.h : add ADD_SEND, ADD_SEND_R
+
+
+2004-11-10(Wed) 08:26:25 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* add "vm_" prefix to (block_object, proc_object, env_object)
+
+
+2004-11-03(Wed) 15:52:14 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, yarvcore.c, disasm.c, compile.c, insns.def, vm.c :
+	fix to move x86_64 (illegal cast, etc)
+
+
+2004-11-01(Mon) 04:45:54 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, compile.c, debug.c, version.h : 
+	redesgin gc debug scheme (GC_CHECK())
+
+	* yarvcore.c : mark iseqobj->current_block on GC
+
+	* insns.def, compile.c : last "throw" in ensure/rescue block
+	use operand throwobj and before this insn, use "getdynamic 0, 1"
+
+	* benchmark/bm_temp.rb : move to benchmark bmx_temp.rb
+
+	* depend : change some targets
+
+
+2004-10-25(Mon) 19:57:58 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : push exception iseq to iseqobj->iseq_mark_ary
+	to mark for GC
+
+
+2004-10-10(Sun) 16:25:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : remove $_, $' area from method local frame
+	and provide that's special method local variables pointer(LFP[-1])
+
+	* disasm.c : change environment showing format
+
+	* yarvcore.(h|c) : add YarvProc, YarvEnv
+
+	* yarvcore.h : add arg_block field to iseq_object
+	and init -1 as default value
+
+
+2004-09-30(Thu) 19:50:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : support passing splat argument
+
+	* compile.c, insns.def : support rest argument
+
+	* compile.c, insns.def : support optional argument initializer
+
+	* test/test_method.rb : add tests for above
+
+
+2004-09-29(Wed) 10:50:03 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix rescue clause popped
+
+	* benchmark/bm_random.rb : move to benchmark/bmx_random.rb
+
+
+2004-09-29(Wed) 01:25:35 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* many many files: change stack frame design
+
+
+2004-09-16(Thu) 08:51:37 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, yarvcore.h : support 'return' from method
+	in ensure clause
+
+
+2004-09-13(Mon) 21:56:40 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support inline cache constant access
+	on NODE_COLON2, NODE_COLON3
+
+	* depend : add 'vtest' rule(verbose test)
+
+
+2004-09-13(Mon) 10:58:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, yarvcore.h : support redo/next/break in
+	while/until
+
+
+2004-09-13(Mon) 08:50:19 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_jump.rb : added(correctly)
+
+	* benchamark/bm_(ensure|rescue|simplereturn).rb added
+
+
+2004-09-12(Sun) 23:30:20 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_jump.rb : added
+
+	* insns.def, compile.c : add 'putnil' insn
+
+	* compile.c : use '===' when rescue check
+
+	* insns.def : remove 'rescuecheck' insn
+
+	* compile.c : support retry in begin/rescue clause
+
+	* ToDo : added
+
+
+2004-09-08(Wed) 12:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvcore.h, yarvcore.c : add idThrow*
+
+	* insns.def, compile.c, vm.c : support retry, break,
+	next, redo, return(imcomplete)
+
+
+2004-09-03(Fri) 13:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : add nop after rescue body
+
+	* insns.def, vm.c : support stack rewind when thrown
+
+
+2004-09-01(Wed) 17:31:01 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_exception.rb : added
+
+
+2004-09-01(Wed) 13:15:14 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, insns.def : implementing exception handling
+
+
+2004-09-01(Wed) 00:18:54 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : add 'throw' insn
+
+	* compile.c : support 'rescue' and 'ensure' clause
+
+	* yarvcore.c, yarvcore.h : add 'catch_table' to iseq_struct
+
+
+2004-08-30(Mon) 19:06:12 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.h : NEW_ISEQOBJ don't pass self as parent
+
+	* compile.c : use NEW_CHILD_ISEQOBJ explicitly
+
+
+2004-08-29(Sun) 21:09:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : trying to implement rescue/ensure
+
+	* insns.def : fix yield bug(lfp, dfp link)
+
+
+2004-08-28(Sat) 13:52:15 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix dvar bug
+
+	* test/test_block.rb : add test
+
+	* insns.def, insnhelper.h : remove unused source code
+
+
+2004-08-28(Sat) 08:51:26 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_DASGN
+
+	* test/test_block.rb : add test
+
+
+2004-08-28(Sat) 08:13:04 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : support access to instance variable
+
+	* test/test_class.rb : add test of instance variable
+
+	* benchmark/bm_block.rb : added
+
+
+2004-08-28(Sat) 07:48:43 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_block.rb : fix block parameter name
+
+
+2004-08-28(Sat) 07:27:52 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def : support method call with block
+	and yield and add some functions
+
+	* compile.c, insns.def : support dynavars accessor
+
+	* test/test_block.rb : added
+
+	* vm.c : fix block parameter stack dump
+
+
+2004-08-27(Fri) 23:56:47 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c(iseq_compile) : remove parameter iseqtype
+	(this information can access via self)
+
+2004-08-27(Fri) 17:13:35 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_bin.rb : add test(absolute path constant)
+
+	* yarvcore.h, compile.c(iseq_compile) : change parameter
+
+	* insns.def(classdef) : fix bug
+
+
+2004-08-27(Fri) 04:53:13 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : support setconstant, getconstant, classdef,
+	moduledef
+
+	* vm.h : fix debug levels and so on
+
+	* vm.h : foo_WORD -> foo_WC
+
+	* test/test_class.rb : added
+
+
+2004-08-25(Wed) 17:51:50 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix getconstant/setconstant/classdef
+
+
+2004-08-25(Wed) 14:27:10 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* debug.[ch] : added
+
+	* compile.c, disasm.c : use debug interface
+
+	* compile.c : support some nodes
+
+	* compile.c, rb/insns2vm.rb : remove TS_CPATH
+
+	* insns.def : modify classdef/moduledef/singletonclassdef
+	and add popcref
+
+	* and others...
+
+
+2004-08-18(Wed) 20:16:45 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix case/when statement with empty else clause
+
+	* insns.def : enable compile
+
+	* yarvcore.h : add class search path scheme
+
+	* test/test_syn.rb : add switch/case test case
+
+	* tmpl/yarvarch.ja : update documents
+
+
+2004-05-22(Sat) 01:30:44 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvutil.rb : add eval_in_wrap
+
+	* test/test_*.rb : change to use eval_in_wrap
+
+
+2004-05-20(Thu) 02:50:32 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* support global variables
+
+	* benchmark/bm_*.rb : add some benchmarks
+
+	* compile.c : support NODE_ATTRASGN
+
+	* compile.c : add debugi(...)
+
+
+2004-05-19(Wed) 23:19:38 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_method.rb : added
+
+
+2004-05-19(Wed) 22:56:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : fix typo
+
+	* benchmark/run.rb : sort benchmark order by filename
+
+	* extconf.rb : use --enable/disable-xxx
+
+	* version.h : ditto(don't touch to change yarv options)
+
+
+2004-05-19(Wed) 21:18:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* yarvutil.rb : added
+
+	* test.rb, test/*, benchmark/run.rb : use yarvutil.rb
+
+	* version.h : USE_OPTIMIZED_REGEXP_MATCH added
+
+	* yarvcore.h : add idEqTilde
+
+	* yarvcore.c(yarvcore_parse, yarvcore_eval) : require file and line
+	parameter
+
+	* test/test_bin.rb : add regexp test
+
+	* benchmark/bm_regexp.rb : added
+
+
+2004-05-19(Wed) 13:57:31 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : add compile_dstr(self, node)
+
+	* compile.c : support NODE_MATCH2, NODE_MATCH3, NODE_DXSTR
+
+	* insns.def : add toregexp
+
+
+2004-05-18(Tue) 10:12:20 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_XDSTR
+
+	* test/test_bin.rb : add test for above change
+
+
+2004-05-18(Tue) 09:46:33 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def(send) : store regs before call_cfunc
+
+
+2004-05-18(Tue) 08:55:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : support NODE_DSTR, NODE_EVSTR
+
+	* compile.c : support NODE_XSTR
+
+	* insns.def : add tostring operation
+
+	* rb/makedocs.rb : fix directory path
+
+	* depend : add tbench rule
+
+	* yarvcore.h : add 'exten ID idBackquote'
+
+
+2004-05-18(Tue) 00:09:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h : add USE_OPTIMIZED_BASIC_OPERATION
+
+	* yarvcore.h(struct thread_object) : add 'VALUE stat_insn_usage'
+
+
+2004-05-17(Mon) 11:28:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* version.h, insns.def, yarvcore.c : add FAKE_INLINE_METHOD_CACHE
+
+
+2004-05-17(Mon) 09:05:53 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c : fix generating opt_* insn process
+
+
+2004-05-17(Mon) 08:58:49 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/(bm_tarai.rb, bm_fib.rb) : added
+
+
+2004-05-17(Mon) 08:20:12 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/(bm_tak.rb, bm_reccount.rb) : added
+
+	* insns.def : test method cache(incomplete)
+
+	* insns.def : add expandarray insn
+
+	* yarvcore.c(iseq_init) : add parameter 'parent'
+
+
+2004-05-17(Mon) 01:49:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/run.rb, bm_factorial.rb, bm_whileloop.rb : added
+
+	* insns.def(send) : set id to ruby_frame->orig_func
+
+	* check behavior on mswin32 and cygwin
+
+	* insns.def(send) : check stack overflow
+
+
+2004-05-16(Sun) 08:00:55 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* change frame structure(debugging)
+
+
+2004-05-14(Fri) 15:06:02 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns2vm.rb : support file name arguments
+
+
+2004-05-14(Fri) 04:33:09 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def : support (easy) constant
+
+
+2004-05-12(Wed) 01:51:48 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* rb/insns2vm.b : set directory prefix
+
+	* disasm.c : fix bug
+
+
+2004-05-12(Wed) 00:00:17 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.h, compiler.h, version.h : move *DEBUG defs to version.h
+
+
+2004-05-11(Tue) 23:00:11 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.h, version.h, yarvcore.h : move gcc ver check to version.h
+	and include version.h from yarvcore.h
+
+
+2004-05-11(Tue) 19:16:26 +0900  Koichi Sasada  <ko1@atdot.net>
+
+	* 0.0.0.d : imported
+
+
+Local variables:
+add-log-time-format: (lambda ()
+  (let* ((time (current-time))
+	 (diff (+ (cadr time) 32400))
+	 (lo (% diff 65536))
+	 (hi  (+ (car time) (/ diff 65536))))
+  (format-time-string "%Y-%m-%d(%a) %H:%M:%S +900"  (list hi lo) t)))
+indent-tabs-mode: t
+tab-width: 8
+end:
diff --git a/doc/NEWS-1.8.0 b/doc/NEWS-1.8.0
deleted file mode 100644
index b4445fa59f..0000000000
--- a/doc/NEWS-1.8.0
+++ /dev/null
@@ -1,837 +0,0 @@
-= command line options
-
-: -W option
-
-  new option to specify warning level. -W0 to shut up warnings, -W1 for normal level,
-  -W2 for verbose level.  -w equals to -W2.
-
-= language syntax
-
-: arbitrary delimited string array
-
-  %W(...) notation, word list literal like %w(...) with the
-  exception that #{} interpolation is allowed.
-
-: arbitrary delimited symbol literl
-
-  :"foo", :"foo#{bar}", etc.
-
-: expression interpolation in strings
-
-  Now arbitrary statements are allowed inside #{} interpolation
-  without escapes.  In other hand, they can no longer access to
-  variables defined in eval.
-
-: negative number literals
-
-  Digits preceded minus sign is a literal integer.
-
-: array expansion
-
-  Fixed with the following behavior:
-
-    a = *[1]
-    p a #=> [1]
-
-  Now 1-element array in rhs is expanded properly.
-
-    a = *[1]
-    p a #=> 1
-
-: break and next
-
-  Extended to take an optional expression, which is used as a value
-  for termination.
-
-: direct assignment to Foo::Bar is allowed
-
-  also, you can define "class Foo::Bar; end".
-
-= language core
-
-: $stdin, $stdout, $stderr
-
-  can be assignable again.  the original stdio are preserved as STDIN,
-  STDOUT, STDERR.
-
-: $VERBOSE now has 3 levels
-
-  nil - silence, false - medium (default), true - verbose
-
-: allocation framework
-
-  any instance of class can be allocated by class.allocate,
-  (except for a few classes).
-
-: comparison of exception classes in a rescue clause
-
-  changed to use Module#=== for comparing $! with the exception
-  class specified in each rescue clause.
-
-  as the previous behavior was to use kind_of?, the effect is limited
-  to the SystemCallError case.  SystemCallError.=== has been newly
-  defined to return true when the two have the same errno.  With this
-  change, SystemCallError's with the same errno, such as Errno::EAGAIN
-  and Errno::EWOULDBLOCK, can both be rescued by listing just one of
-  them.
-
-: constants lookup
-
-  improved at the performance of searching by using an internal hash
-  table.
-
-  calls const_missing method of the class/module, if constant is not
-  found in the look up path.
-
-: expression parenthesis in the first argument
-
-  altered to get the following code (note the space after p):
-
-    p ("xx"*2).to_i
-
-  Interpreted as:
-
-    p (("xx"*2).to_i)
-
-  Instead of:
-
-    (p("xx"*2)).to_i
-
-: implicit comparison in conditional expressions
-
-  Obsoleted except when it is used in -e.
-
-  : between Range and $.
-      Use explicit comparison instead.
-
-  : between Regexp and $_
-      Use the unary method ~/re/ instead.
-
-: to_str
-
-  added to get objects which define to_str() treated as String's.
-
-  now almost all the built-in methods try each argument with to_str()
-  when they expect it to be a String.
-
-    foo = Object.new
-    class <<foo
-      def to_str
-        "foo"
-      end
-    end
-    p File.open(foo)
-    => -:7:in `open': wrong argument type Object (expected String) (TypeError)
-       ruby 1.6.4 (2001-04-19) [i586-linux]
-    => -:7:in `open': No such file or directory - "foo" (Errno::ENOENT)
-       ruby 1.7.0 (2001-05-02) [i586-linux]
-
-: multiple assignment behavior
-
-  Fixed so that "*a = nil" results in "a == []".
-
-= changes in core class library
-
-: open
-
-  Extended so that when the third argument is permission flags it
-  calls open(2) instead of fopen(3).
-
-: sprintf
-
-  new format specifier "%p" is available.
-
-: lambda and proc
-
-  Proc object returns from these methods has the following attributes:
-
-  * strict argument number check
-  * break and return terminates the proc execution.
-
-: warn(message)
-
-  a method to give warnings.
-
-: abort()
-
-  takes optional terminate message argument.
-
-: Object#initialize_copy
-
-  copy constructor for clone and dup.
-
-: Object#instance_variable_set, Object#instance_variable_get
-
-  added.
-
-: Object#singleton_method_removed
-: Object#singleton_method_undefined
-
-  Added.
-
-: Array#transpose
-
-  added.
-
-: Array#fetch(index [, default])
-
-  Added.  If a default value isn't given, raises index error if index
-  is out of range.
-
-: Array#insert(n, other, ...)
-
-  Added. [ruby-talk:14289]
-
-  This is much the same as (({ary[n,0] = [other,...]})) except
-  returing self.
-
-    ary = [0,1,2,3]
-    ary[2, 0] = [4, 5, 6]
-    p ary
-
-    ary = [0,1,2,3]
-    ary.insert(2, 4, 5, 6)
-    p ary
-
-: Array#sort!
-
-  Changed to always return self without checking whether the sequence
-  of the elements was modified or not.
-
-  Beware that this behavior is not guaranteed to continue in the
-  future.  Do not rely on its return value. [ruby-dev:12506]
-
-: Array#filter
-
-  Previously deprecated, now removed.  Use Array#collect!.
-
-: Array#pack, String#unpack
-
-  Allows comment in template strings.
-
-: Array#pack, String#unpack
-
-  New templates 'q' and 'Q' for 64bit integer (signed and unsigned respectively).
-
-: Array#new
-
-  Now takes block to fill initial values.  E.g.
-
-	Array.new(10) { |i| i + 1 }
-	=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-
-: Array#fill
-
-  Takes block to get the values to fill.
-
-: Array#fetch
-
-  Takes block to get the default value.
-
-: Array#zip
-
-  added.
-
-: Hash#update
-
-  Takes block to resolve key conflict.
-
-: Hash#merge and Hash#merge!
-
-  update hash.  Hash#merge! is a synonym of Hash#update.
-
-: String#split
-
-  if "sep" argument is a string, regular expression meta characters
-  are escaped internally.
-
-: String#rstrip
-
-  chop off NULs at the end of strings.
-
-: String#to_i
-
-  Now accepts optional base argument.
-
-	"101".to_i(10) => 101
-	"101".to_i(2)  => 5
-	"101".to_i(8)  => 65
-	"101".to_i(16) => 257
-
-  A base argument of 0 guesses at the base.
-
-	"101".to_i(0)   => 101
-	"0b101".to_i(0) => 5
-	"0101".to_i(0)  => 65
-	"0x101".to_i(0) => 257
-
-: String#[regexp, nth]
-
-  Extended to accepts optional second argument.
-
-  It tries match between self and REGEXP, then returns the
-  content of the NTH regexp register.
-
-: String#casecmp
-
-  Added.  This is a case insensitive version of String#<=>.
-
-: String#chomp
-
-  If $/ == "\n", chops off last newlines (any of \n, \r, \r\n).
-
-: String#eql?
-
-  Changed to be always case sensitive.
-
-: String#insert(n, other)
-
-  Added.
-
-  This is much the same as (({str[n, 0] = other})) except returing
-  self.
-
-: String#lstrip, rstrip, lstrip!, rstrip!
-
-  Added.  These strip only left or right part of a string.
-
-: String#match
-
-  Added.
-
-: String/Array methods
-
-  Returns an instance of receivers class.
-
-: String.new
-
-  The first argument becomes optional.
-
-: Symbol#intern
-
-  Added.
-
-: Symbol.all_symbols
-
-  Added. [ruby-dev:12921]
-
-: IO
-
-  64bit off_t support by Janathan Baker.
-
-: IO#read
-: IO#sysread
-
-  takes optinal second argument for read buffer.
-
-: IO::sysopen
-
-  New method to get a raw file descriptor.
-
-: IO#sysseek
-
-  Added.
-
-: IO#fsync
-
-  new method that copies all in-memory parts of a file to disk and
-  waits until the device reports that all parts are on stable storage.
-  Implemented with fsync(2) or equivalent.
-
-: IO.open
-
-  Made public.  Can only associate an IO object with a file number
-  like IO.new and IO.for_fd, but can take a block.
-
-: IO.for_fd
-
-  Added as a synonym for IO.new.
-
-: IO.read
-
-  Added.  Like IO.readlines, except it returns the entire file as a
-  string.  [ruby-talk:9460]
-
-: File#fnmatch, File::Constants::FNM_*
-
-  Added.  Refer to the fnmatch(3) manpage for details.
-
-  Localism is FNM_DOTMATCH which has the opposite meaning of the
-  commonly known FNM_PERIOD, which does not exist in Ruby.
-
-  e.g.
-
-    # exclude files matching "*.bak" case-insensitively.
-    files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
-
-: File.lchmod
-: File.lchown
-
-  Added.
-
-: File.open, IO.open
-
-  File mode can be specified by flags like open(2),
-  e.g. File::open(path, File::CREAT|File::WRONLY).
-
-: Regexp#options
-
-  Added.
-
-: Regexp.last_match(n)
-
-  Extended to take an optional argument.
-
-: MatchData#captures
-
-  added.
-
-: Dir#path
-
-  Added.
-
-: Dir.chdir
-
-  Extended to take a block.
-
-: Dir.glob
-
-  Made to support meta-character escaping by a backslash.  Wildcards
-  and spaces may now be escaped using a backslash.
-
-: Dir.open
-
-  Changed to return what the block returns when a block is given, just
-  as File.open does. (It always returned (({nil})) in 1.6 and
-  prior)
-
-: Dir.chdir
-
-  Changed to warn only when invoked from multiple threads or no block
-  is given. [ruby-dev:13823]
-
-    Dir.chdir('foo') {
-      Dir.chdir('bar') {   # previously warned
-        puts Dir.pwd
-      }
-    }
-
-: Dir#pos=
-
-  Returns the new position instead of self.
-
-: Dir::glob
-
-  Now accepts optional FNM_* flags via the second argument, whereas
-  Dir::[] doesn't.
-
-    Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
-
-: Class#inherited
-
-  Method is called when Class is inherited by another class.
-
-	class A; end
-	def A.inherited(by)
-          puts "A inherited by #{by.inspect}"
-        end
-        class B < A; end
-
-        Prints out "A inherited by B"
-
-: Module#include?
-
-  Added. [ruby-dev:13941] 
-
-: Module#included
-
-  Added.  This is a hook called after Module#append_feature.
-
-: Module#method_removed
-: Module#method_undefined
-
-  Added.
-
-: Module.new, Class.new
-
-  Extended to take block.
-
-: Time
-
-  Extended to accept a negative time_t. (Only when the platform
-  supports it)
-
-    p Time.at(-1)
-    => Thu Jan 01 08:59:59 JST 1970
-
-: Time#to_a
-: Time#zone
-
-  Made to return "UTC" under gmtime.  It used to return a platform
-  dependent value, typically "GMT", in 1.6 and prior.
-
-: Marshal to use marshal_dump and marshal_load
-
-  if a dumping object responds to 'marshal_dump', Marshal.dump calls
-  it, and dumps object returned.  Marshal.load allocates a new instance
-  using "allocate", then calls its "marshal_load" with dumped data.
-  Marshal format version is now 4.8 (was 4.6 in 1.6.8).
-
-: Marshal
-
-  Fixed not to dump anonymous classes/modules.
-
-  Fixed with loading modules.
-
-: Thread#group
-
-  new method to get belonging  ThreadGroup.
-
-: Thread#terminate
-
-  synonym of Thread#exit
-
-: Thread#join
-
-  Optional argument limits maximum time to wait the thread in second.
-  And returns nil if timed out.
-
-: ThreagGroup#enclose
-
-  prohibits thread movement from/to enclosed groups.
-
-: Range#step([step=1])
-
-  Added.
-
-: SystemCallError
-
-  SystemCallError's "===" match (used in rescue also) is now based on its errno.
-
-: Interrupt
-
-  Made a subclass of SignalException. (It was a subclass of
-  Exception in 1.6 and prior)
-
-: NameError and NoMethodError
-
-  Moved and now NoMethodError < NameError < StandardError.
-
-: NoMethodError
-
-  Added. [ruby-dev:12763]
-
-: NotImplementError
-
-  Finally obsoleted.  Use NotImplementedError.
-
-: SystemCallError.===
-
-  Added. (See the "Comparison of exception classes in a rescue clause"
-  paragraph above) [ruby-dev:12670]
-
-: SystemExit#status
-
-  Added.
-
-: Proc#==
-
-  Added.
-
-: Method#==
-
-  Added.
-
-: UnboundMethod is no longer subclass of Method
-
-  class hierarchy changed. 
-
-: Enumerable#all?
-: Enumerable#any?
-: Enumerable#inject
-: Enumerable#sort_by
-
-  Added.
-
-: Math.acos(x)
-: Math.asin(x)
-: Math.atan(x)
-: Math.cosh(x)
-: Math.hypot(x,y)
-: Math.sinh(x)
-: Math.tanh(x)
-
-  Added.
-
-: Process.abort
-: Process.exit
-
-  synonym of Kernel#abort, and Kernel#exit respectively.
-
-: Process::detach(pid)
-
-  new method to detach child process.  child process will be "wait"ed
-  automagically.
-
-: Process.times
-
-  Moved from Time.times. (Time.times still remains but emits a
-  warning)
-
-: Process.waitall
-
-  Added.
-
-: Process::Status
-
-  Added.  (({$?})) is now an instance of this class.
-
-: Process::UID, Process::GID, Process::Sys,
-
-  Added.
-
-: Signal
-
-  Added. This module has module functions Signal.trap and Signal.list.
-
-= changes in bundled libraries
-
-: lib/cgi.rb
-
-  cgi[name] returns CGI::QueryExtension::Value that wraps string
-  value, no longer array.
-
-: lib/timeout
-
-  timeout "function" wrapped in Timeout module.
-
-: TCPServer#accept, UNIXServer#accept, Socket#accept
-
-  New methods to return an accepted socket fd.
-
-: Date and DateTime
-
-  lib/date.rb now provides both Date and DateTime.
-
-  Some methods have been renamed.  But the old names are still alive.
-
-  Some new methods have been added (Date::parse, Date#strftime, etc.).
-
-  Date#mjd now returns the chronological modified Julian day number.
-
-  All facilities about tjd have been removed.
-
-: Curses
-
-  Updated.  New methods and constants for using the mouse, character
-  attributes, colors and key codes have been added.
-
-: Net::HTTP
-
-  New version of Net::HTTP has introduced seriously incompatible
-  changes. For details, see document embedded in net/http.rb itself.
-
-: Socket.pack_sockaddr_in, Socket.unpack_sockaddr_in
-
-  Added.  Utility for direct Socket access.
-
-: Socket.pack_sockaddr_un, Socket.unpack_sockaddr_un
-
-  Added.  Utility for direct Socket access.
-
-: TCPServer#listen, UNIXServer#listen
-
-  Added.
-
-: TCPSocket.new
-: TCPSocket.open
-
-  Extended to take an address and a port number for the local side in
-  optional 3rd and 4th arguments.
-
-= newly bundled library
-
-: ext/bigdecimal
-
-  variable precision decimal number 
-
-: ext/dl
-
-  an interface to the dynamic linker.
-
-: ext/enumerator
-
-  a helper module for the Enumerable interface.
-
-: ext/io/wait
-
-  IO wait methods.
-
-: ext/iconv
-
-  wrapper library of (({iconv})).
-
-: ext/openssl
-
-  OpenSSL for Ruby
-
-: ext/racc/cparse
-
-  Racc runtime library in C. (Racc is a parser generator for ruby)
-
-: ext/stringio
-
-  Pseudo (({IO})) class from/to (({String})).
-
-: ext/strscan
-
-  Fast string scanner library.
-
-: ext/syck
-
-  fast YAML parser.
-
-: lib/abbrev
-
-  creates an abbreviation table from a list
-
-: lib/benchmark
-
-  Ruby scripts benchmarker
-
-: lib/cgi/session/pstore
-
-  cgi/session back-end using pstore 
-
-: lib/csv
-
-  reads/writes CSV files.
-
-: lib/date/format
-
-  strftime for Date class
-
-: lib/drb
-
-  dRuby or distributed Ruby
-
-: lib/fileutils
-
-  file utility library.
-
-: lib/generator
-
-  converts an internal iterator to an external iterator
-
-: lib/gserver
-
-  generic server used by xmlrpc
-
-: lib/ipaddr
-
-  manipulates IP address.
-
-: lib/multi-tk
-
-  to allow safe Tk, etc.
-
-: lib/open-uri
-
-  easy-to-use wrapper for net/http and net/ftp
-
-: lib/optparse
-
-  command line options utility library
-
-: lib/pathname
-
-  handles pathname in OO manner.
-
-: lib/pp
-
-  prettyprinter for Ruby objects
-
-: lib/prettyprint
-
-  implements prettyprint algorithm.
-
-: lib/profiler
-
-  library to implement -r "profile"
-
-: lib/racc/parser
-
-  RACC parser generator runtime in Ruby.
-
-: lib/scanf
-
-  scan string and retrieve object with format
-
-: lib/set
-
-  Set class
-
-: lib/runit
-
-  RubyUnit compatible layer for test/unit
-
-: lib/test/unit
-
-  unit testing framework for Ruby
-
-: lib/tmpdir
-
-  get temporary directory path.
-
-: lib/tsort
-
-  topological sorting library.
-
-: lib/rexml
-
-  REXML XML library
-
-: lib/webrick
-
-  generic internet server kit
-
-: lib/xmlrpc
-
-  simple RPC via XML
-
-: lib/un
-
-  used like 'ruby -run -e cp -- -p foo bar'.  neat, isn't it?
-
-: lib/win32/registry
-
-  win32/registry is registry accessor
-
-: lib/yaml
-
-  YAML Ain't Mark-up Language
-
-= removed libraries
-
-: lib/ftplib
-
-  use net/ftp instead.
-
-: lib/telnet
-
-  use net/telnet instead.
-
-= new port
-
-: WindowsCE port
-: Win32 BCC
-
-= interpreter implementation
-
-: garbage collector
-
-  faster, but uses more memory for the worst case.
-
-: string concatenation
-
-  faster by avoiding too frequent realloc(3).
diff --git a/doc/NEWS-1.8.7 b/doc/NEWS-1.8.7
new file mode 100644
index 0000000000..460a7c9328
--- /dev/null
+++ b/doc/NEWS-1.8.7
@@ -0,0 +1,648 @@
+= NEWS
+
+This document is a list of user visible feature changes made between
+releases except for bug fixes.
+
+Note that each entry is kept so brief that no reason behind or
+reference information is supplied with.  For a full list of changes
+with all sufficient information, see the ChangeLog file.
+
+== Changes since the 1.8.6 release
+
+=== Configuration changes
+
+* default C flags
+
+  Some C compiler flags may be added by default depending on your
+  environment.  Specify optflags=.. and warnflags=.. as necessary to
+  override them.
+
+* vendor_ruby directory
+
+  A new library directory named `vendor_ruby' is introduced in
+  addition to `site_ruby'.  The idea is to separate libraries
+  installed by the package system (`vendor') from manually (`site')
+  installed libraries preventing the former from getting overwritten
+  by the latter, while preserving the user option to override vendor
+  libraries with site libraries. (`site_ruby' takes precedence over
+  `vendor_ruby')
+
+  If you are a package maintainer, make each library package configure
+  the library passing the `--vendor' option to `extconf.rb' so that
+  the library files will get installed under `vendor_ruby'.
+
+  You can change the directory locations using configure options such
+  as `--with-sitedir=DIR' and `--with-vendordir=DIR'.
+
+=== Global constants
+
+* new constants
+
+  * RUBY_COPYRIGHT
+  * RUBY_DESCRIPTION
+
+=== Library updates (outstanding ones only)
+
+* new library
+
+  * securerandom
+
+* builtin classes
+
+  * Array#flatten
+  * Array#flatten!
+
+    Take an optional argument that determines the level of recursion
+    to flatten.
+
+  * Array#eql?
+  * Array#hash
+  * Array#==
+  * Array#<=>
+
+    Handle recursive data properly.
+
+  * Array#index
+  * Array#rindex
+
+    Use a given block if no argument is given.
+
+  * Array#collect!
+  * Array#map!
+  * Array#each
+  * Array#each_index
+  * Array#reverse_each
+  * Array#reject
+  * Array#reject!
+  * Array#delete_if
+
+    Return an enumerator if no block is given.
+
+    Note that #map and #collect still return an array unlike Ruby 1.9
+    to keep compatibility.
+
+  * Array#pop
+  * Array#shift
+
+    Take an optional argument specifying the number of elements to
+    remove.
+
+  * Array#choice
+  * Array#combination
+  * Array#cycle
+  * Array#drop
+  * Array#drop_while
+  * Array#permutation
+  * Array#product
+  * Array#shuffle
+  * Array#shuffle!
+  * Array#take,
+  * Array#take_while
+
+    New methods.
+
+  * Binding#eval
+
+    New method.
+
+  * Dir#each
+  * Dir#foreach
+
+    Return an enumerator if no block is given.
+
+  * Enumerable::Enumerator
+
+    New class for various enumeration defined by the enumerator library.
+
+  * Enumerable#each_slice
+  * Enumerable#each_cons
+  * Object#to_enum
+  * Object#enum_for
+
+    New methods for various enumeration defined by the enumerator library.
+
+  * Enumerable#count
+  * Enumerable#cycle
+  * Enumerable#drop
+  * Enumerable#drop_while
+  * Enumerable#find_index
+  * Enumerable#first
+  * Enumerable#group_by
+  * Enumerable#max_by
+  * Enumerable#min_by
+  * Enumerable#minmax
+  * Enumerable#minmax_by
+  * Enumerable#none?
+  * Enumerable#one?
+  * Enumerable#take
+  * Enumerable#take_while
+
+    New methods.
+
+  * Enumerable#find
+  * Enumerable#find_all
+  * Enumerable#partition
+  * Enumerable#reject
+  * Enumerable#select
+  * Enumerable#sort_by
+
+    Return an enumerator if no block is given.
+
+    Note that #map and #collect still return an array unlike Ruby 1.9
+    to keep compatibility.
+
+  * Enumerable#inject
+
+    Accepts a binary operator instead of a block.
+
+  * Enumerable#reduce
+
+    New alias to #inject.
+
+  * Hash#eql?
+  * Hash#hash
+  * Hash#==
+
+    Handle recursive data properly.
+
+  * Hash#delete_if
+  * Hash#each
+  * Hash#each_key
+  * Hash#each_pair
+  * Hash#each_value
+  * Hash#reject!
+  * Hash#select
+  * ENV.delete_if
+  * ENV.each
+  * ENV.each_key
+  * ENV.each_pair
+  * ENV.each_value
+  * ENV.reject!
+  * ENV.select
+
+    Return an enumerator if no block is given.
+
+  * GC.stress
+  * GC.stress=
+
+    New methods.
+
+  * Integer#ord
+  * Integer#odd?
+  * Integer#even?
+  * Integer#pred
+
+    New methods.
+
+  * Integer#downto
+  * Integer#times
+  * Integer#upto
+
+    Return an enumerator if no block is given.
+
+  * IO#each
+  * IO#each_line
+  * IO#each_byte
+  * IO.foreach
+  * ARGF.each
+  * ARGF.each_line
+  * ARGF.each_byte
+
+    Return an enumerator if no block is given.
+
+  * IO#bytes
+  * IO#chars
+  * IO#each_char
+  * IO#getbyte
+  * IO#lines
+  * IO#readbyte
+  * ARGF.bytes
+  * ARGF.chars
+  * ARGF.each_char
+  * ARGF.getbyte
+  * ARGF.lines
+  * ARGF.readbyte
+
+    New methods. 
+
+  * Method#name
+  * Method#owner
+  * Method#receiver
+  * UnboundMethod#name
+  * UnboundMethod#owner
+
+    New methods.
+
+  * Module#class_exec
+  * Module#module_exec
+
+    New methods.
+
+  * Numeric#step
+
+    Return an enumerator if no block is given.
+
+  * Object#instance_exec
+  * Object#tap
+
+    New methods.
+
+  * ObjectSpace.each_object
+
+    Return an enumerator if no block is given.
+
+  * Process.exec implemented.
+
+  * Range#each
+  * Range#step
+
+    Return an enumerator if no block is given.
+
+  * Regexp.union accepts an array of patterns.
+
+  * String#bytesize
+
+    New method, returning the size in bytes. (alias length and size)
+
+  * String#chars
+  * String#each_char
+  * String#partition
+  * String#rpartition
+  * String#start_with?
+  * String#end_with?
+
+    New methods.  These are $KCODE aware unlike #index, #rindex and
+    #include?.
+
+  * String#each_byte
+  * String#each
+  * String#each_line
+  * String#gsub(pattern)
+
+    Return an enumerator if no block is given.
+
+  * String#upto
+
+    An optional second argument is added to specify if the last value
+    should be included.
+
+  * StopIteration
+
+    New exception class that causes Kernel#loop to stop iteration when
+    raised.
+
+  * Struct#each
+  * Struct#each_pair
+
+    Return an enumerator if no block is given.
+
+  * Symbol#to_proc
+
+    New method.
+
+  * __method__
+
+    New global function that returns the name of the current method as
+    a Symbol.
+
+* enumerator
+
+  * Enumerator is now a built-in module.  The #next and #rewind
+    methods are implemented using the "generator" library.  Use with
+    care and be aware of the performance loss.
+
+* ipaddr
+
+  * New methods
+    * IPAddr#<=>
+    * IPAddr#succ
+
+      IPAddr objects are now comparable and enumerable having these
+      methods.  This also means that it is possible to have a Range
+      object between two IPAddr objects.
+
+    * IPAddr#to_range
+
+      A new method to create a Range object for the (network) address.
+
+  * Type coercion support
+    * IPAddr#&
+    * IPAddr#|
+    * IPAddr#==
+    * IPAddr#include?
+
+      These methods now accept a string or an integer instead of an
+      IPAddr object as the argument.
+
+* net/smtp
+
+  * Support SSL/TLS.
+
+* openssl
+
+  * New classes
+    * OpenSSL::PKey::EC
+    * OpenSSL::PKey::EC::Group
+    * OpenSSL::PKey::EC::Point
+    * OpenSSL::PKey::PKCS5
+    * OpenSSL::SSL::Session
+
+  * Documentation!
+
+  * Various new methods (see documentation).
+
+  * Remove redundant module namespace in Cipher, Digest, PKCS7, PKCS12.
+    Compatibility classes are provided which will be removed in Ruby 1.9.
+
+* shellwords
+
+  * Add methods for escaping shell-unsafe characters:
+    * Shellwords.join
+    * Shellwords.escape
+    * Array#shelljoin
+    * String#shellescape
+
+  * Add shorthand methods:
+    * Shellwords.split (alias shellwords)
+    * String#shellsplit
+
+* stringio
+
+  * StringIO#getbyte
+  * StringIO#readbyte
+
+    New methods. (aliases for compatibility with 1.9)
+
+  * StringIO#each_char
+  * StringIO#chars
+
+    New methods.
+
+  * StringIO#each
+  * StringIO#each_line
+  * StringIO#each_byte
+
+    Return an enumerator if no block is given.
+
+* tempfile
+
+  * Tempfile.open and Tempfile.new now accept a suffix for the
+    temporary file to be created.  To specify a suffix, pass an array
+    of [basename, suffix] as the first argument.
+
+      Tempfile.open(['image', 'jpg']) { |tempfile| ... }
+
+* tmpdir
+
+  * New method:
+
+    * Dir.mktmpdir
+
+* uri
+
+  * added LDAPS scheme.
+  * Change for RFC3986:
+    * FTP
+      * URI('ftp://example.com/foo').path #=> 'foo'
+      * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
+      * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
+    * URI merge
+      * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
+      * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('/../g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('../../../g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('../../../../g') == URI('http://a/g')
+
+* rss
+
+  * 0.1.6 -> 0.2.4
+
+  * Fix image module URI
+
+  * Atom support
+
+  * ITunes module support
+
+  * Slash module support
+
+  * content:encoded with RSS 2.0 support
+
+=== Interpreter Implementation
+
+* passing a block to a Proc [experimental]
+
+  This implementation in current shape is known to be buggy/broken,
+  especially with nested block invocation.  Take this as an
+  experimental feature.
+
+* stack trace
+
+  On non-SystemStackError exception, full stack trace is shown.
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* String#slice! had some unintentional bugs and they have been fixed
+  because either they disagreed with documentation or their respective
+  behavior of #slice.  Unfortunately, this causes some
+  incompatibilities in the following (somewhat rare) cases.
+
+  * #slice! no longer expands the array when an out-of-boundary value
+    is given.
+
+      # Ruby 1.8.6
+      a = [1,2]
+      a.slice!(4,0)   #=> nil
+      a               #=> [1,2,nil,nil]
+
+      # Ruby 1.8.7
+      a = [1,2]
+      a.slice!(4,0)   #=> nil
+      a               #=> [1,2]
+
+  * #slice! no longer raises an exception but returns nil when a
+    negative length or out-of-boundary negative position is given.
+
+      # Ruby 1.8.6
+      a = [1,2]
+      a.slice!(1,-1)  #=> (raises IndexError)
+      a.slice!(-5,1)  #=> (raises IndexError)
+
+      # Ruby 1.8.7
+      a = [1,2]
+      a.slice!(1,-1)  #=> nil
+      a.slice!(-5,1)  #=> nil
+
+* String#to_i, String#hex and String#oct no longer accept a sequence
+  of underscores (`__') as part of a number.
+
+    # Ruby 1.8.6
+    '1__0'.to_i     #=> 10
+    '1__0'.to_i(2)  #=> 2  # 0b10
+    '1__0'.oct      #=> 8  # 010
+    '1__0'.hex      #=> 16 # 0x10
+
+    # Ruby 1.8.7
+    '1__0'.to_i     #=> 1
+    '1__0'.to_i(2)  #=> 1
+    '1__0'.oct      #=> 1
+    '1__0'.hex      #=> 1
+
+  The old behavior was inconsistent with Ruby syntax and considered as
+  a bug.
+
+* date
+
+  * Date.parse
+
+    '##.##.##' (where each '#' is a digit) is now taken as 'YY.MM.DD'
+    instead of 'MM.DD.YY'.  While the change may confuse you, you can
+    always use Date.strptime() when you know what you are dealing
+    with.
+
+* stringio
+
+  * StringIO#each_byte
+
+    The return value changed from nil to self.  This is what the
+    document says and the same as each_line() does.
+
+* tempfile
+
+  * The file name format has changed.  No dots are included by default
+    in temporary file names any more.  See above for how to specify a
+    suffix.
+
+* uri
+
+  * See above for details.
+
+== Changes since the 1.8.5 release
+
+=== New platforms/build tools support
+
+* IA64 HP-UX
+
+* Visual C++ 8 SP1
+
+* autoconf 2.6x
+
+=== Global constants
+
+* RUBY_PATCHLEVEL
+
+  New constant since 1.8.5-p1.
+
+=== Library updates (outstanding ones only)
+
+* builtin classes
+
+  * New method: Kernel#instance_variable_defined?
+
+  * New method: Module#class_variable_defined?
+
+  * New feature: Dir::glob() can now take an array of glob patterns.
+
+* date
+
+  * Updated based on date2 4.0.3.
+
+* digest
+
+  * New internal APIs for C and Ruby.
+
+  * Support for autoloading.
+
+      require 'digest'
+
+      # autoloads digest/md5
+      md = Digest::MD5.digest("string")
+
+  * New digest class methods: file
+
+  * New digest instance methods: clone, reset, new, inspect,
+    digest_length (alias size or length), block_length()
+
+  * New library: digest/bubblebabble
+
+  * New function: Digest(name)
+
+* fileutils
+
+  * New option for FileUtils.cp_r(): :remove_destination
+
+* nkf
+
+  * Updated based on nkf as of 2007-01-28.
+
+* thread
+
+  * Replaced with much faster mutex implementation in C.  The former
+    implementation, which is slow but considered to be stable, is
+    available with a configure option `--disable-fastthread'.
+
+* tk
+
+  * Updated Tile extension support based on Tile 0.7.8.
+
+  * Support --without-X11 configure option for non-X11 versions of
+    Tcl/Tk (e.g. Tcl/Tk Aqua).
+
+  * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
+    about STDIN blocking on Windows.
+
+* webrick
+
+  * New method: WEBrick::Cookie.parse_set_cookies()
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* builtin classes
+
+  * String#intern now raises SecurityError when $SAFE level is greater
+    than zero.
+
+* date
+
+  * Time#to_date and Time#to_datetime are added as private methods.
+    They cause name conflict error in ActiveSupport 1.4.1 and prior,
+    which comes with Rails 1.2.2 and prior.  Updating ActiveSupport
+    and/or Rails to the latest versions fixes the problem.
+
+* digest
+
+  * The constructor does no longer take an initial string to feed.
+    The following examples show how to migrate:
+
+      # Before
+      md = Digest::MD5.new("string")
+      # After (works with any version)
+      md = Digest::MD5.new.update("string")
+        
+      # Before
+      hd = Digest::MD5.new("string").hexdigest
+      # After (works with any version)
+      hd = Digest::MD5.hexdigest("string")
+
+  * Digest::Base#==
+
+    * self == string
+
+      Automatic detection between binary digest values and hexadecimal
+      digest values has been dropped.  It is always assumed that a
+      hexadecimal digest value is given for comparison.
+
+    * self == md
+
+      Digest objects are compared by the resulting digest values, not
+      by the exact vector states.
+
+* fileutils
+
+  * A minor implementation change breaks Rake <=0.7.1.
+    Updating Rake to 0.7.2 or higher fixes the problem.
+
+* tk
+
+  * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+    (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
+    but it is an alias name.
diff --git a/doc/NEWS-1.9.1 b/doc/NEWS-1.9.1
new file mode 100644
index 0000000000..f2afa00bdc
--- /dev/null
+++ b/doc/NEWS-1.9.1
@@ -0,0 +1,422 @@
+= NEWS
+
+This document is a list of user visible feature changes made between
+releases except for bug fixes.
+
+Note that each entry is kept so brief that no reason behind or
+reference information is supplied with.  For a full list of changes
+with all sufficient information, see the ChangeLog file.
+
+== Changes since the 1.8.7 release
+See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
+
+=== Compatibility issues
+
+* language core
+
+    * New syntax and semantics
+          o Block arguments are always local
+          o New semantics for block arguments
+          o defined? and local variables
+          o Parser expects that your source code has only valid byte
+            sequence in some character encoding.  Use magic comments
+            to tell the parser which encoding you use.
+          o New semantics for constant definition in instance_eval
+            or in module_eval.
+
+    * Deprecated syntax
+          o colon (:) instead of "then" in if/unless or case expression.
+          o retry in a loop or an iterator.
+
+* builtin classes and objects
+
+    * Kernel and Object
+          o Kernel#methods and #singleton_methods used to return an 
+            array of strings but now they return an array of symbols.
+    * Class and Module
+          o Module#attr works as Module#attr_reader by default.
+	    Optional boolean argument is obsolete.
+          o Module#instance_methods, #private_instance_methods and
+            #public_instance_methods used to return an array of 
+            strings but now they return an array of symbols.
+          o Extra subclassing check when binding UnboundMethods
+            
+    * Exceptions
+          o Exceptions are equal to each other if they belong to 
+            the same class and have the same message and backtrace.
+          o SystemStackError used to be a subclass of StandardError
+            but not it is a direct subclass of Exception.
+          o SecurityError: ditto
+          o Removed Exception#to_str [Ruby2]
+
+    * Enumerable and Enumerator
+          o Enumerable::Enumerator, compatibility alias of Enumerator,
+            is removed.
+          o Enumerable#{map,collect} called without a block returns
+            an enumerator.
+          o Even more builtin and bundled libraries have been made to
+            return an enumerator when called without a block.
+    * Array
+          o Array#nitems was removed (use count {|i| !i.nil?})
+          o Array#choice was removed (use sample)
+          o Array#[m,n] = nil places nil in the array.
+    * Hash
+          o Hash#to_s is equivalent to Hash#inspect
+          o Semantics for Hash#each and Hash#each_pair
+          o Hash#select returns a hash
+          o Hash#key is the new name for #index which has been
+            deprecated.
+          o Hash preserves order.  It enumerates its elements in the
+            order in which the keys are inserted.
+          o Most of the changes in Hash apply to hash like interfaces
+            such as ENV and *DBM.
+    * IO operations
+          o Many methods used to act byte-wise but now some of those act 
+            character-wise. You can use alternate byte-wise methods.
+          o IO#getc
+          o Non-blocking IO
+          o Kernel#open takes "t" for newline conversion
+          o Kernel#open takes encoding specified
+          o IO automatically converts byte sequence from a character
+            encodings into another if specified.
+          o StringIO#readpartial
+          o IO.try_convert
+          o IO.binread
+          o IO.copy_stream
+          o IO#binmode?
+          o IO#close_on_exec= and IO#close_on_exec?
+          o Limit input in IO#gets, IO#readline, IO#readlines,
+            IO#each_line, IO#lines, IO.foreach, IO.readlines,
+            StringIO#gets, StringIO#readline, StringIO#each,
+            StringIO#readlines
+          o IO#ungetc, StringIO#ungetc
+          o IO#ungetbyte, StringIO#ungetbyte
+          o IO#internal_encoding, IO#external_encoding,
+            IO#set_encoding
+          o IO.pipe takes encoding option
+          o Directive %u behaves like %d for negative values in 
+            printf-style formatting.
+    * File and Dir operations
+          o #to_path is called as necessary in File.path, File.chmod,
+            File.lchmod, File.chown, File.lchown, File.utime,
+            File.unlink, etc..
+          o File.world_readable?
+          o File.world_writable?
+          o Dir.[], Dir.glob
+          o Dir.exist?
+          o Dir.exists?
+    * File::Stat
+          o File::Stat#world_readable?
+          o File::Stat#world_writable?
+    * String
+          o No longer an Enumerable: use each_line/lines for line
+            oriented operation
+          o Encoding-awareness
+              o Character-wise semantics in many methods instead of
+                byte-wise.
+                  o String#[]: Indexing a String with an integer returns a
+                    single character String instead of an integer.
+                  o String#[]=: No longer takes an integer as right
+                    side value.  Note that "str[i] = ?c" because of
+                    the following change.
+                  o ?c is evaluated to a single character string
+                    instead of an integer.
+    * Regexp
+          o Encoding-awareness
+          o Regexp matches only with strings which is encoded in a
+            compatible character encoding to the regexp's.
+          o Regexp#kcode is removed. use Regexp#encoding.
+    * Symbols: restriction on literal symbols
+    * Numeric
+          o Numeric#div always rounds as Integer#div has done.
+          o Numeric#fdiv: ditto.
+    * Integer
+          o Integer(nil) raises TypeError
+    * Fixnum
+          o Fixnum#id2name removed
+          o Fixnum#to_sym removed
+    * Struct
+          o Struct#inspect
+    * Time
+          o New format in Time#to_s
+          o Timezone information preserved on Marshal.dump/load
+    * $SAFE and bound methods
+          o New trusted/untrusted model in addition to
+            tainted/untainted model.
+
+    * Deprecation
+          o $= (global flag for case-sensitiveness on string matching)
+          o Kernel#to_a
+          o Kernel#getc, #gsub, #sub
+          o Kernel#callcc and Continuation now become 'continuation'
+            bundled library.
+          o Object#type
+          o Removed Array and Hash #indices, #indexes
+          o Hash#index
+          o ENV.index
+          o Process::Status#to_int
+          o Numeric#rdiv
+          o Precision is removed.  Don't cry, it will be redesigned
+            and come back in future version.
+          o Symbol#to_int and Symbol#to_i
+          o $KCODE is no longer effective.  Use Encoding related
+            features of each class.
+          o VERSION and friends
+
+* bundled libraries
+
+    * Pathname
+          o No longer has #to_str nor #=~.
+    * time and date
+          o Time.parse and Date.parse interprets slashed numerical dates 
+	    as "dd/mm/yyyy".
+    * Readline
+          o If Readline uses libedit, Readline::HISTORY[0] returns the
+            first of the history.
+    * Continuation
+          o as above
+
+    * Deprecation
+          o Complex#image: use Complex#imag
+          o All SSL-related class methods in Net::SMTP
+          o Prime#cache, Prime#primes, Prime#primes_so_far
+          o mailread library: use tmail gem.
+          o cgi-lib library: use cgi.
+          o date2 library: use date.
+          o eregex library
+          o finalize library: use ObjectSpace.define_finalizer if you
+            really need a finalizer. really?
+          o ftools library: use fileutils.
+          o generator library: use Enumerator.
+          o importenv library and Env library
+          o jcode library: use multilingualization support of String
+          o parsedate library
+          o ping library
+          o readbytes library
+          o getopts library and parsearg library: use optparse or
+            getoptlong.
+          o soap, wsdl and xsd libraries: use soap4r gem.
+          o Win32API library: use dl.
+          o dl library: Reimplemented and API changed. use the new
+	    version of dl or ffi gem.
+          o rubyunit library and runit library: use minitest or
+            test/unit. Or use anything you love through RubyGems.
+          o test/unit is reimplemented on top of minitest.  This is
+            not fully compatible with the original.
+
+=== Language core changes
+
+    * New syntax and semantics
+          o Magic comments to declare in which encoding your source
+            code is written
+          o New literal hash syntax and new syntax for hash style 
+	    arguments 
+          o New syntax for lambdas
+          o .() and calling Procs without #call/#[]
+          o Block in block arguments
+          o Block local variables
+          o Mandatory arguments after optional arguments allowed
+          o Multiple splats allowed
+          o #[] can take splatted arguments, hash style arguments 
+            and a block.
+          o New directives in printf-style formatted strings (%).
+          o Newlines allowed before ternary colon operator (:) and
+            method call dot operator (.)
+          o Negative operators such as !, != and !~ are now
+            overloadable
+          o Encoding.default_external and default_internal
+          o __ENCODING__: New pseudo variable to hold the current
+            script's encoding
+
+=== Library updates
+
+* builtin classes and objects
+    * Kernel and Object
+          o BasicObject
+          o Object#=~ returns nil instead of false by default.
+          o Kernel#define_singleton_method
+	  o Kernel#load can load a library from the highest versions
+	    of gems by default.
+    * Class and Module
+          o Module#const_defined?, #const_get and #method_defined?
+            take an optional parameter.
+          o #class_variable_{set,get} are public.
+          o Class of singleton classes
+
+    * Errno::EXXX
+          o All of those are always defined.  Errno::EXXX will be
+            defined as an alias to Errno::NOERROR if your platform
+            does not have one.
+
+    * Binding#eval
+    * Blocks and Procs
+          o Arity of blocks without arguments
+          o proc is now a synonym of Proc.new
+          o Proc#yield
+          o Passing blocks to #[]
+          o Proc#lambda?
+          o Proc#curry
+    * Fiber: coroutines/micro-threads
+    * Thread
+          o Thread.critical and Thread.critical= removed
+          o Thread#exit!, Thread#kill! and Thread#terminate! removed.
+
+    * Enumerable and Enumerator
+          o Enumerator#enum_cons and Enumerator#enum_slice are
+            removed.  Use #each_cons and #each_slice without a block.            
+          o Enumerable#each_with_index can take optional arguments
+            and passes them to #each.
+          o Enumerable#each_with_object
+          o Enumerator#with_object
+          o Enumerator.new { ... }
+    * Array
+          o Array#delete returns a deleted element rather than a given
+            object
+          o Array#to_s is equivalent to Array#inspect
+          o Array.try_convert
+          o Array#pack('m0') complies with RFC 4648.
+    * Hash
+          o preserving item insertion order
+          o Hash#default_proc=
+          o Hash#_compare_by_identity and Hash#compare_by_identity?
+          o Hash.try_convert
+          o Hash#assoc
+          o Hash#rassoc
+          o Hash#flatten
+    * Range
+          o Range#cover?
+          o Range#include? iterates over elements and compares the
+            given value with each element unless the range is numeric.
+            Use Range#cover? for the old behavior, i.e. comparison
+            with boundary values.
+          o Range#min, Range#max
+
+    * File and Dir operations
+          o New methods
+    * Process
+          o Process.spawn
+          o Process.daemon
+    * String
+          o String#clear
+          o String#ord
+          o String#getbyte, String#setbyte
+          o String#chars and String#each_char act as character-wise.
+          o String#codepoints, String#each_codepoint
+          o String#unpack with a block
+          o String#hash
+          o String.try_convert
+          o String#encoding
+	  o String#force_encoding, String#encode and String#encode!
+          o String#ascii_only?
+          o String#valid_encoding?
+	  o String#match
+    * Symbol
+          o Zero-length symbols allowed
+          o Symbol#intern
+          o Symbol#encoding
+          o Symbol methods similar to those in String
+    * Regexp
+          o Regexp#=== matches symbols
+          o Regexp.try_convert
+          o Regexp#match
+          o Regexp#fixed_encoding?
+          o Regexp#encoding
+          o Regexp#named_captures
+          o Regexp#names
+    * MatchData
+          o MatchData#names
+          o MatchData#regexp
+    * Encoding
+    * Encoding::Converter
+          o supports conversion between many encodings
+    * Numeric
+          o Numeric#upto, #downto, #times, #step
+          o Numeric#real?, Complex#real?
+          o Numeric#magnitude
+    * Rational / Complex
+          o They are in the core library now
+    * Math
+          o Math#log takes an optional argument.
+          o Math#log2
+          o Math#cbrt, Math#lgamma, Math#gamma
+    * Time
+          o Time.times removed.  Use Process.times.
+          o Time#sunday?
+          o Time#monday?
+          o Time#tuesday?
+          o Time#wednesday?
+          o Time#thursday?
+          o Time#friday?
+          o Time#saturday?
+          o Time#tv_nsec and Time#nsec
+    * Misc. new methods
+          o RUBY_ENGINE to distinguish between Ruby processor implementation
+          o public_method
+          o public_send
+          o GC.count
+          o ObjectSpace.count_objects
+          o Method#hash, Proc#hash
+          o Method#source_location, UnboundMethod#source_location and
+	    Proc#source_location
+          o __callee__
+          o Elements in $LOAD_PATH and $LOADED_FEATURES are expanded
+
+* bundled libraries
+    * RubyGems
+          o Package management system for Ruby.
+          o Integrated with Ruby's library loader.
+    * Rake
+          o Ruby make. A simple ruby build program with capabilities
+            similar to make.
+    * minitest
+          o Our new testing library which is faster, cleaner and easier
+	    to read than the old test/unit.
+          o You can introduce the old test/unit as testunit gem through
+            RubyGems if you want.
+    * CMath
+          o Complex number version of Math
+    * Prime
+          o Extracted from Mathn and improved. You can easily enumerate
+            prime numbers.
+          o Prime.new is obsolete. Use its class methods.
+    * ripper
+          o Ruby script parser
+    * Readline
+          o Readline.vi_editing_mode?
+          o Readline.emacs_editing_mode?
+          o Readline::HISTORY.clear
+    * Tk
+          o TkXXX widget classes are removed and redefined as aliases of 
+            Tk::XXX classes.
+    * RDoc
+          o Updated to version 2.2.2.  See:
+            http://rubyforge.org/frs/shownotes.php?group_id=627&release_id=26434
+    * json
+          o JSON (JavaScript Object Notation) encoder/decoder
+
+* commandline options
+    * -E, --encoding
+    * -U
+    * --enable-gems, --disable-gems
+    * --enable-rubyopt, --disable-rubyopt
+    * long options are allowed in RUBYOPT environment variable.
+
+=== Implementation changes
+
+* Memory Diet
+    * Object Compaction - Object, Array, String, Hash, Struct, Class,
+      Module
+    * st_table compaction (inlining small tables)
+* YARV
+    * Ruby codes are compiled into opcodes before executed.
+    * Native thread
+
+* Platform supports
+    * Support levels
+          (0) Supported
+          (1) Best effort
+          (2) Perhaps
+          (3) Not supported
+    * Dropped
+          o No longer supports djgpp, bcc32, human68k, MacOS 9 or earlier,
+            VMS nor Windows CE.
diff --git a/doc/etc.rd b/doc/etc.rd
new file mode 100644
index 0000000000..b69f9884ad
--- /dev/null
+++ b/doc/etc.rd
@@ -0,0 +1,75 @@
+# etc.rd -  -*- mode: rd; coding: us-ascii -*- created at: Fri Jul 14 00:47:15 JST 1995
+=begin
+
+= Etc(Module)
+
+The module to retrieve information from running OS.  All operations
+defined in this module are module functions, so that you can include
+Etc module into your class.
+
+== Module Function
+
+--- getlogin
+
+	returns login name of the user.  It this fails, try getpwuid().
+
+--- getpwnam(name)
+
+	searches in /etc/passwd file (or equivalent database), and
+	returns password entry for the user.  The return value is an
+	passwd structure, which has members described below.
+
+	  struct passwd
+	    name 	# user name(string)
+	    passwd	# encrypted password(string)
+	    uid		# user ID(integer)
+	    gid		# group ID(integer)
+	    gecos	# gecos field(string)
+	    dir		# home directory(string)
+	    shell	# login shell(string)
+	    # members below are optional
+	    change	# password change time(integer)
+	    quota	# quota value(integer)
+	    age		# password age(integer)
+	    class	# user access class(string)
+	    comment	# comment(string)
+	    expire	# account expiration time(integer)	    
+	  end
+
+	See getpwnam(3) for detail.
+
+--- getpwuid([uid])
+
+	returns passwd entry for the specified user id.  If uid is
+	ommitted, use the value from getuid().  See getpwuid(3) for
+	detail.
+
+--- getgrgid(gid)
+
+	searches in /etc/group file (or equivalent database), and
+	returns group entry for the group id.  The return value is an
+	group structure, which has members described below.
+
+	  struct group
+	    name 	# group name(string)
+	    passwd	# group password(string)
+	    gid		# group ID(integer)
+	    mem		# array of the group member names
+	  end
+
+	See getgrgid(3) for detail.
+
+--- getgrnam(name)
+
+	returns the group entry for the specified name.  The return
+	value is the group structure.  See getgrnam(3) for detail.
+
+--- group
+
+	iterates over all group entries.
+
+--- passwd
+
+	iterates over all passwd entries.
+
+=end
diff --git a/doc/etc.rd.ja b/doc/etc.rd.ja
new file mode 100644
index 0000000000..39a1efbff1
--- /dev/null
+++ b/doc/etc.rd.ja
@@ -0,0 +1,75 @@
+# etc.rd.ja -  -*- mode: rd; coding: euc-jp; -*- created at: Fri Jul 14 00:47:15 JST 1995
+=begin
+
+= Etc(�⥸�塼��)
+
+�¹Ԥ��Ƥ���OS����ξ�������뤿��Υ⥸�塼�롥���饹�˥��󥯥롼��
+���ƻȤ����Ȥ�Ǥ��롥
+
+== Module Function
+
+--- getlogin
+
+	��ʬ��login̾���֤������줬���Ԥ�������getpwuid()���Ѥ����
+	�ɤ���
+
+--- getpwnam(name)
+
+	/etc/passwd�ե�����(���뤤��DBM�ե������NIS�ǡ����١���)��
+	������name��̾�������passwd����ȥ���֤�������ͤ�passwd��¤
+	�Τǰʲ��Υ��Ф���ġ�
+
+	  struct passwd
+	    name 	# �桼��̾(ʸ����)
+	    passwd	# �ѥ����(ʸ����)
+	    uid		# �桼��ID(����)
+	    gid		# ���롼��ID(����)
+	    gecos	# gecos�ե������(ʸ����)
+	    dir		# �ۡ���ǥ��쥯�ȥ�(ʸ����)
+	    shell	# �������󥷥���(ʸ����)
+	    # �ʹߤΥ��Фϥ����ƥ�ˤ�äƤ��󶡤���ʤ���
+	    change	# �ѥ�����ѹ�����(����)
+	    quota	# ��������(����)
+	    age		# ������(����)
+	    class	# �桼�������������饹(ʸ����)
+	    comment	# ������(ʸ����)
+	    expire	# ���������ͭ������(����)	    
+	  end
+
+	�ܺ٤�getpwnam(3)�򻲾ȤΤ��ȡ�
+
+--- getpwuid([uid])
+
+	uid��桼��ID�Ȥ���passwd����ȥ���֤�������ͤ�getpwnam()��
+	Ʊ�ͤǤ��롥�������ά�������ˤ�getuid()���ͤ��Ѥ��롥�ܺ٤�
+	getpwuid(3)�򻲾ȤΤ��ȡ�
+
+--- getgrgid(gid)
+
+	/etc/group�ե�����(���뤤�ϡ�getpwnam����)�򸡺�����gid�򥰥롼
+	��ID�Ȥ��륰�롼�ץ���ȥ���֤�������ͤ�group��¤�Τǰʲ���
+	���Ф���ġ�
+
+	  struct group
+	    name 	# ���롼��̾(ʸ����)
+	    passwd	# ���롼�פΥѥ����(ʸ����)
+	    gid		# ���롼��ID(����)
+	    mem		# ���롼�ץ���̾������
+	  end
+
+	�ܺ٤�getgrgid(3)�򻲾ȤΤ��ȡ�
+
+--- getgrnam(name)
+
+	name�Ȥ���̾���Υ��롼�ץ���ȥ���֤�������ͤ�getgrgid()��Ʊ
+	�ͤǤ��롥�ܺ٤�getgrnam(3)�򻲾ȡ�
+
+--- group
+
+	���ƤΥ��롼�ץ���ȥ���˥����������뤿��Υ��ƥ졼����
+
+--- passwd
+
+	���Ƥ�passwd����ȥ���˥����������뤿��Υ��ƥ졼����
+
+=end
diff --git a/doc/forwardable.rd b/doc/forwardable.rd
index 7272c374b6..0eca25b90a 100644
--- a/doc/forwardable.rd
+++ b/doc/forwardable.rd
@@ -2,7 +2,6 @@
 						
                                                 $Release Version: 1.1 $
                                                 $Revision$
-                                                $Date$
 						Original version by Tosh
 
 =begin
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index d928fddc5e..48186b111f 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -1,7 +1,6 @@
   -- forwatable.rb
                                                 $Release Version: 1.1 $
                                                 $Revision$
-                                                $Date$
 
 =begin
 = Forwardable
diff --git a/doc/images/boottime-classes.png b/doc/images/boottime-classes.png
new file mode 100644
index 0000000000..b5fab75c41
--- /dev/null
+++ b/doc/images/boottime-classes.png
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 64d9ab29c8..7711f96e08 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -1,7 +1,6 @@
 irb��Ϣ���ޤ����ޥ�ɤȥ饤�֥��
 				$Release Version: 0.7.1 $
 			   	$Revision$
-			   	$Date$
 			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
 
 =begin
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
index a42cd46680..8468809d2b 100644
--- a/doc/irb/irb.rd
+++ b/doc/irb/irb.rd
@@ -1,7 +1,6 @@
 irb -- interactive ruby
 		$Release Version: 0.9 $
 		$Revision$
-		$Date$
 		by Keiju ISHITSUKA(keiju@ishitsuka.com)
 		by gotoken-san who is original translater from japanese version
 
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 338dcc644e..53f76180ec 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -1,7 +1,6 @@
 irb -- interactive ruby
 				$Release Version: 0.9.5 $
 			   	$Revision$
-			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 =begin
 = irb�Ȥ�?
diff --git a/doc/pty/README b/doc/pty/README
new file mode 100644
index 0000000000..d6368f3758
--- /dev/null
+++ b/doc/pty/README
@@ -0,0 +1,84 @@
+pty extension version 0.3 by A.ito
+
+1. Introduction
+
+This extension module adds ruby a functionality to execute an 
+arbitrary command through pseudo tty (pty).
+
+2. Install
+
+Follow the instruction below.
+
+(1) Execute
+
+      ruby extconf.rb
+
+    then Makefile is generated.
+
+(3) Do make; make install.
+
+3. What you can do
+
+This extension module defines a module named PTY, which contains
+following module fungtions:
+
+   getpty(command)
+   spawn(command)
+
+      This function reserves a pty, executes command over the pty 
+      and returns an array. The return value is an array with three
+      elements. The first element in the array is for reading and the 
+      second for writing. The third element is the process ID of the
+      child process. If this function is called with an iterator block,
+      the array is passed to the block as block parameters, and the
+      function itself returns nil.
+
+      When the child process is suspended or finished, an exception is
+      raised.  If this function is called with an iterator block,
+      exception is raised only within the block.  Child process
+      monitor is terminated on block exit.
+
+   protect_signal
+   reset_signal
+
+      These functions are obsolete in this version of pty.
+
+   PTY.open
+
+      Allocates a pty (pseudo-terminal).
+
+      It returns an array which contains an IO object and a File object.
+      The former is the master of the pty.
+      The latter is the slave of the pty.
+
+      If a block is given, it yields the array instead of return.
+      The value of the block is returned.
+      master_io and slave_file is closed when return if they are not closed.
+
+   PTY.check(pid[, raise=false])
+
+      checks the status of the child process specified by pid, and
+      returns nil if the process is still alive and active.
+      Otherwise, returns Process::Status about the process if raise is
+      false, or PTY::ChildExited exception is raised.
+
+4. License
+
+(C) Copyright 1998 by Akinori Ito.
+
+This software may be redistributed freely for this purpose, in full 
+or in part, provided that this entire copyright notice is included 
+on any copies of this software and applications and derivations thereof.
+
+This software is provided on an "as is" basis, without warranty of any
+kind, either expressed or implied, as to any matter including, but not
+limited to warranty of fitness of purpose, or merchantability, or
+results obtained from use of this software.
+
+5. Bug report
+
+Please feel free to send E-mail to
+
+   aito@ei5sun.yz.yamagata-u.ac.jp
+
+for any bug report, opinion, contribution, etc.
diff --git a/ext/pty/README.expect b/doc/pty/README.expect
index fddbb6fdad..fddbb6fdad 100644
--- a/ext/pty/README.expect
+++ b/doc/pty/README.expect
diff --git a/ext/pty/README.expect.ja b/doc/pty/README.expect.ja
index db84695ee5..db84695ee5 100644
--- a/ext/pty/README.expect.ja
+++ b/doc/pty/README.expect.ja
diff --git a/doc/pty/README.ja b/doc/pty/README.ja
new file mode 100644
index 0000000000..ca2a01442a
--- /dev/null
+++ b/doc/pty/README.ja
@@ -0,0 +1,76 @@
+pty ��ĥ�⥸�塼�� version 0.3 by A.ito
+
+1. �Ϥ����
+
+���γ�ĥ�⥸�塼��ϡ�����tty (pty) ���̤���Ŭ���ʥ��ޥ�ɤ�
+�¹Ԥ��뵡ǽ�� ruby ���󶡤��ޤ���
+
+2. ���󥹥ȡ���
+
+���Τ褦�ˤ��ƥ��󥹥ȡ��뤷�Ƥ���������
+
+(1)  ruby extconf.rb
+
+    ��¹Ԥ���� Makefile ����������ޤ���
+
+(2) make; make install ��¹Ԥ��Ƥ���������
+
+3. �����Ǥ��뤫
+
+���γ�ĥ�⥸�塼��ϡ�PTY �Ȥ����⥸�塼���������ޤ���������
+�ˤϡ����Τ褦�ʥ⥸�塼��ؿ����ޤޤ�Ƥ��ޤ���
+
+   getpty(command)
+   spawn(command)
+
+      ���δؿ��ϡ�����tty����ݤ������ꤵ�줿���ޥ�ɤ򤽤β���tty
+      �θ������Ǽ¹Ԥ���������֤��ޤ�������ͤ�3�Ĥ����Ǥ���ʤ�
+      ����Ǥ����ǽ�����Ǥϲ���tty�����ɤ߽Ф������IO���֥������ȡ�
+      2���ܤϽ񤭤��ि���IO���֥������ȡ�3���ܤϻҥץ������Υץ�
+      ����ID�Ǥ������δؿ������ƥ졼���Ȥ��ƸƤФ줿��硤������
+      ���Ǥϥ֥��å��ѥ�᡼���Ȥ����Ϥ��졤�ؿ����Τ�nil���֤��ޤ���
+
+      �ҥץ���������λ��������ߤ������ˤϡ��㳰��ȯ�����ޤ������δ�
+      �����֥��å��ѥ�᡼���դ��ǸƤФ줿���ˤϡ����Υ֥��å������
+      �Τ��㳰��ȯ�����ޤ����ҥץ��������˥������Ƥ��륹��åɤϥ֥���
+      ����ȴ����Ȥ��˽�λ���ޤ���
+      
+   protect_signal
+   reset_signal
+
+      �ѻ�ͽ��Ǥ���
+
+   PTY.open
+
+      ����tty����ݤ����ޥ�����¦���б�����IO���֥������Ȥȥ��졼��¦��
+      �б�����File���֥������Ȥ�������֤��ޤ����֥��å��դ��ǸƤӽФ�
+      �줿���ϡ����������Ǥϥ֥��å��ѥ�᡼���Ȥ����Ϥ��졤�֥���
+      �������֤��줿��̤��֤��ޤ����ޤ������Υޥ�����IO�ȥ��졼��File
+      �ϡ��֥��å���ȴ����Ȥ��˥��������ѤߤǤʤ���Х�����������ޤ���
+
+   PTY.check(pid[, raise=false])
+
+      pid�ǻ��ꤵ�줿�ҥץ������ξ��֤�����å������¹���Ǥ����nil��
+      �֤��ޤ�����λ���Ƥ��뤫��ߤ��Ƥ����硢������������Ǥ���С�
+      �б�����Process::Status���֥������Ȥ��֤��ޤ������Ǥ����
+      PTY::ChildExited�㳰��ȯ�����ޤ���
+
+4. ���ѤˤĤ���
+
+��ƣ��§���������ͭ���ޤ���
+
+�������ץ������ޤ��ϥɥ�����Ȥ˸������ɽ�������Ѥ��줺��
+ɽ������Ƥ�����˸¤ꡤï�Ǥ⡤���Υ��եȥ�������̵����������
+���Ԥ�̵�Ǥ����ѡ����ۡ����ѤǤ��ޤ���������Ū�ϸ��ꤵ��Ƥ��ޤ�
+��
+
+���Υץ����������ѡ����ۤ���¾���Υץ������˴ط�����԰٤ˤ�
+�ä������������ʤ�»�����Ф��Ƥ⡤��Ԥϰ�����Ǥ���餤�ޤ���
+
+5. �Х������
+
+�Х���ݡ��Ȥϴ��ޤ��ޤ���
+
+	aito@ei5sun.yz.yamagata-u.ac.jp
+
+�ޤ��Żҥ᡼��ǥХ���ݡ��Ȥ����꤯��������
diff --git a/doc/rake/CHANGES b/doc/rake/CHANGES
new file mode 100644
index 0000000000..3b1a02b812
--- /dev/null
+++ b/doc/rake/CHANGES
@@ -0,0 +1,440 @@
+
+= Rake Changelog
+
+== Version 0.8.7
+
+* Fixed EXEEXT for JRuby on windows.
+
+== Version 0.8.6
+
+* Minor fixes to the RDoc generation (removed dependency on darkfish
+  and removed inline source option).
+
+== Version 0.8.5
+
+* Better support for the system command on Windows.
+
+== Version 0.8.4
+
+* Preserve case when locating rakefiles (patch from James
+  M. Lawrence/quix)
+
+* Better support for windows paths in the test task (patch from Simon
+  Chiang/bahuvrihi)
+
+* Windows system dir search order is now: HOME, HOMEDRIVE + HOMEPATH,
+  APPDATA, USERPROFILE (patch from Luis Lavena)
+
+* MingGW is now recognized as a windows platform.  (patch from Luis
+  Lavena)
+
+* Numerous fixes to the windows test suite (patch from Luis Lavena).
+
+* Improved Rakefile case insensitivity testing (patch from Luis
+  Lavena).
+
+* Fixed stray ARGV option problem that was interfering with
+  Test::Unit::Runner.
+
+* Fixed default verbose mode (was accidently changed to false).  
+
+* Removed reference to manage_gem to fix the warning produced by the
+  gem package task.
+
+== Version 0.8.3
+
+* Enhanced the system directory detection in windows. We now check
+  HOMEDRIVE/HOMEPATH and USERPROFILE if APPDATA isn't found. (Patch
+  supplied by James Tucker). Rake no long aborts if it can't find the
+  directory.
+
+* Added fix to handle ruby installations in directories with spaces in
+  their name.  
+
+== Version 0.8.2
+
+* Fixed bug in package task so that it will include the subdir
+  directory in the package for testing. (Bug found by Adam Majer)
+
+* Added ENV var to rakefile to prevent OS X from including extended
+  attribute junk in a tar file. (Bug found by Adam Majer)
+
+* Fixed filename dependency order bug in test_inspect_pending and
+  test_to_s_pending. (Bug found by Adam Majer)
+
+* Fixed check for file utils options to make them immune to the
+  symbol/string differences. (Patch supplied by Edwin Pratomo)
+
+* Fixed bug with rules involving multiple source (Patch supplied by
+  Emanuel Inderm�hle)
+
+* Switched from getoptlong to optparse (patches supplied by Edwin
+  Pratomo)
+
+* The -T option will now attempt to dynamically sense the size of the
+  terminal.  RAKE_COLUMNS will override any dynamic sensing.
+
+* FileList#clone and FileList#dup have better sematics w.r.t. taint
+  and freeze.
+
+* Added ability clear prerequisites, and/or actions from an existing
+  task.
+
+* Added the ability to reenable a task to be invoked a second time.
+
+* Changed RDoc test task to have no default template. This makes it
+  easier for the tempate to pick up the template from the environment.
+
+* Changed from using Mutex to Monitor. Evidently Mutex causes thread
+  join errors when Ruby is compiled with -disable-pthreads. (Patch
+  supplied by Ittay Dror) 
+
+* Fixed bug in makefile parser that had problems with extra spaces in
+  file task names. (Patch supplied by Ittay Dror)
+
+* Added a performance patch for reading large makefile dependency
+  files. (Patch supplied by Ittay Dror)
+
+* Default values for task arguments can easily be specified with the
+  :with_defaults method. (Idea for default argument merging supplied
+  by (Adam Q. Salter)
+
+* The -T output will only self-truncate if the output is a tty.
+  However, if RAKE_COLUMNS is explicitly set, it will be honored in
+  any case. (Patch provided by Gavin Stark).
+
+* Numerous fixes for running under windows. A big thanks to Bheeshmar
+  Redheendran for spending a good part of the afternoon at the
+  Lonestar Ruby Conference to help me work out these issues.
+
+== Version 0.8.1
+
+* Removed requires on parsedate.rb (in Ftptools)
+* Removed ftools from rake.rb.  Made it options in sys.rb
+
+== Version 0.8.0
+
+* Added task parameters (e.g. "rake build[version7]")
+* Made task parameters passable to prerequisites.
+* Comments are limited to 80 columns or so (suggested by Jamis Buck).
+* Added -D to display full comments (suggested by Jamis Buck).
+* The rake program will set the status value used in any explicit
+  exit(n) calls. (patch provided by Stephen Touset)
+* Fixed error in functional tests that were not including session (and
+  silently skipping the functionl tests.
+* Removed --usage and make -h the same as -H.
+* Make a prettier inspect for tasks.
+
+== Version 0.7.3
+
+* Added existing and existing! methods to FileList
+* FileLists now claim to be Arrays (via is_a?) to get better support
+  from the FileUtil module.
+* Added init and top_level for custom rake applications.
+
+== Version 0.7.2
+
+* Error messages are now send to stderr rather than stdout (from
+  Payton Quackenbush).
+* Better error handling on invalid command line arguments (from Payton
+  Quackenbush).
+* Added rcov task and updated unit testing for better code coverage.
+* Fixed some bugs where the application object was going to the global
+  appliation instead of using its own data.
+* Added square and curly bracket patterns to FileList#include (Tilman
+  Sauerbeck). 
+* Added plain filename support to rule dependents (suggested by Nobu
+  Nakada). 
+* Added pathmap support to rule dependents.
+* Added a 'tasks' method to a namespace to get a list of tasks
+  associated with the namespace.
+* Fixed the method name leak from FileUtils (bug found by Glenn
+  Vanderburg). 
+* Added rake_extension to handle detection of extension collisions.
+* Added test for noop, bad_option and verbose flags to sh command.
+* Removed dependency on internal fu_xxx functions from FileUtils.
+* Added a 'shame' task to the Rakefile.
+* Added tar_command and zip_command options to the Package task.
+* Added a description to the gem task in GemPackageTask.
+* Fixed a bug when rules have multiple prerequisites (patch by Joel
+  VanderWerf)
+* Added a protected 'require "rubygems"' to test/test_application to
+  unbreak cruisecontrol.rb.
+* Added the handful of RakeFileUtils to the private method as well.
+* Added block based exclusion.
+* The clean task will no longer delete 'core' if it is a directory.
+* Removed rake_dup.  Now we just simply rescue a bad dup.
+* Refactored the FileList reject logic to remove duplication.
+* Removed if __FILE__ at the end of the rake.rb file.
+
+== Version 0.7.1
+
+* Added optional filter parameter to the --tasks command line option.
+* Added flatten to allow rule transform procs to return lists of
+  prereqs (Joel VanderWerf provided patch).
+* Added pathmap to String and FileList.
+* The -r option will now load .rake files (but a straight require
+  doesn't yet).  NOTE: This is experimental ... it may be
+  discontinued.
+* The -f option without a value will disable the search for a
+  Rakefile.  The assumption is that the -r files are adequate.
+* Fixed the safe_ln function to fall back to cp in more error
+  scenarios.
+
+== Version 0.7.0
+
+* Added Rake.original_dir to return the original starting directory of
+  the rake application.
+* Added safe_ln support for openAFS (from Ludvig Omholt).
+* Added --trace reminder on short exception messages (David Heinemeier
+  Hansson suggestion).
+* Added multitask declaration that executes prerequisites in
+  parallel. (Doug Young providied an initial implementation).
+* Fixed missing_const hack to be compatible with Rails. (Jamis Buck
+  supplied test case).
+* Made the RDoc task default to internal (in-process) RDoc formatting.
+  The old behavior is still available by setting the +external+ flag
+  to true.
+* Rakefiles are now loaded with the expanded path to prevent
+  accidental polution from the Ruby load path.
+* The +namespace+ command now returns a NameSpace object that can be
+  used to lookup tasks defined in that namespace.  This allows for
+  better anonymous namespace behavior.
+* Task objects my now be used in prerequisite lists directly.
+
+== Version 0.6.1
+
+* Rebuilt 0.6.0 gem without signing.
+
+== Version 0.6.0
+
+* Fixed file creation bug in the unit tests (caused infinite loop on
+  windows).
+* Fixed bug where session based functional tests were run under
+  windows.
+* Fixed bug in directory tasks so that updating a directory will not
+  retrigger file tasks depending on the directory (see
+  FileCreationTask and EarlyTime).
+* Added egrep to FileList
+* ruby command now runs same ruby version as rake.
+* Added investigation to task object. (suggested by Martin Fowler)
+* Added ruby_opts to the test task to allow arbitrary ruby options to
+  be passed to the test script. (Greg Fast)
+* Fixed the test loader to ignore options. (Greg Fast)
+* Moved Task, FileTask, FileCreationTask and RakeApp into the Rake
+  module namespace.  Old style namespace behavior can be invoked via
+  the --classic-namespace option. (requested by Kelly Felkins).
+* GemTask is now sensitive to the gem platform (Masao Mutoh).
+* A non-existing file prerequisite will no longer cause an exception
+  (Philipp Neubeck).
+* Multiple prerequisites on Rake rules now allowed (initial patch
+  supplied by Stuart Jansen).
+
+== Version 0.5.4
+
+* Added double quotes to the test runner.
+* Added .svn to default ignore list.
+* Updated FileList#include to support nested arrays and filelists.
+
+== Version 0.5.3
+
+* Added support for importing Rakefile and other dependencies.
+* Fixed bug so that now rules can chain off of existing tasks as well
+  as existing files.
+* Fixed verbose flag bug in the testing task.  Shortened some failure
+  messages.
+* Make FileUtils methods private at the top level module to avoid
+  accidental method leaking into other objects.
+* Added test loader option to test task.  "testrb" is no longer the
+  default test loader.  It is now eating syntax errors that should
+  halt the unit tests.
+* Revamped FileList so that it works more like and array (addressed
+  flatten bug).  Added many tests around file list.
+* Added +ext+ method to both String and FileList.
+
+== Version 0.5.0
+
+* Fixed documentation that was lacking the Rake module name (Tilman
+  Sauerbeck).
+* Added tar.gz and tar.bz2 support to package task (Tilman Sauerbeck).
+* Recursive rules are now supported (Tilman Sauerbeck).
+* Added warning option for the Test Task (requested by Eric Hodel).
+* The jamis rdoc template is only used if it exists.
+* Added fix for Ruby 1.8.2 test/unit and rails problem.
+* Added contributed rake man file (Jani Monoses).
+* Added Brian Candler's fix for problems in --trace and --dry-run
+  mode.
+
+== Version 0.4.15
+
+* Fixed a bug that prevented the TESTOPTS flag from working with the
+  revised for 1.8.2 test task.
+* Updated the docs on --trace to indicate that it also enables a full
+  backtrace on errors. 
+
+== Version 0.4.14
+
+* Modified the TestTask to workaround the Ruby 1.8.2 change in
+  autoexecuting unit tests.
+
+== Version 0.4.13
+
+* Fixed the dry-run flag so it is operating again.
+* Multiple arguments to sh and ruby commands will not be interpreted
+  by the shell (patch provided by Jonathan Paisley).
+
+== Version 0.4.12
+
+* Added --silent (-s) to suppress the (in directory) rake message.
+
+== Version 0.4.11
+
+* Changed the "don't know how to rake" message (finally)
+* Changes references to a literal "Rakefile" to reference the global
+  variable $rakefile (which contains the actual name of the rakefile).
+
+== Version 0.4.10
+
+* Added block support to the "sh" command, allowing users to take
+  special actions on the result of the system call.  E.g.
+
+    sh "shell_command" do |ok, res|
+      puts "Program returned #{res.exitstatus}" if ! ok
+    end
+
+== Version 0.4.9
+
+* Switched to Jamis Buck's RDoc template.
+* Removed autorequire from Rake's gem spec.  This prevents the Rake
+  libraries from loading while using rails.
+
+== Version 0.4.8
+
+* Added support for .rb versions of Rakefile.
+* Removed \\\n's from test task.
+* Fixed Ruby 1.9 compatibility issue with FileList.
+
+== Version 0.4.7
+
+* Fixed problem in FileList that caused Ruby 1.9 to go into infinite
+  recursion.  Since to_a was removed from Object, it does not need to
+  added back into the list of methods to rewrite in FileList.  (Thanks
+  to Kent Sibilev for pointing this out).
+
+== Version 0.4.6
+* Removed test version of ln in FileUtils that prevented safe_ln from
+  using ln.
+
+== Version 0.4.5
+* Upgraded comments in TestTask.
+* FileList to_s and inspect now automatically resolve pending changes.
+* FileList#exclude properly returns the FileList.
+
+== Version 0.4.4
+* Fixed initialization problem with @comment.
+* Now using multi -r technique in TestTask.  Switch Rakefile back to
+  using the built-in test task macros because the rake runtime is no
+  longer needed.
+* Added 'TEST=filename' and 'TESTOPTS=options' to the Test Task
+  macros.
+* Allow a +test_files+ attribute in test tasks.  This allows more
+  flexibility in specifying test files.
+
+== Version 0.4.3
+* Fixed Comment leakage.
+
+== Version 0.4.2
+* Added safe_ln that falls back to a copy if a file link is not supported.
+* Package builder now uses safe_ln.
+
+== Version 0.4.1
+* Task comments are now additive, combined with "/".
+* Works with (soon to be released) rubygems 0.6.2 (or 0.7.0)
+
+== Version 0.4.0
+* FileList now uses deferred loading.  The file system is not searched
+  until the first call that needs the file names.
+* VAR=VALUE options are now accepted on the command line and are
+  treated like environment variables.  The values may be tested in a
+  Rakefile by referencing ENV['VAR'].
+* File.mtime is now used (instead of File.new().mtime).
+
+== Version 0.3.2.x
+
+* Removed some hidden dependencies on rubygems.  Tests now will test
+  gems only if they are installed.
+* Removed Sys from some example files.  I believe that is that last
+  reference to Sys outside of the contrib area.
+* Updated all copyright notices to include 2004.
+
+== Version 0.3.2
+
+* GEM Installation now works with the application stub.
+
+== Version 0.3.1
+
+* FileLists now automatically ignore CVS, .bak, !
+* GEM Installation now works.
+
+== Version 0.3.0
+
+Promoted 0.2.10.
+
+== Version 0.2.10
+General
+
+* Added title to Rake's rdocs
+* Contrib packages are no longer included in the documentation.
+
+RDoc Issues
+
+* Removed default for the '--main' option
+* Fixed rendering of the rdoc options
+* Fixed clean/clobber confusion with rerdoc
+* 'title' attribute added
+
+Package Task Library Issues
+
+* Version (or explicit :noversion) is required.
+* +package_file+ attribute is now writable
+
+FileList Issues
+
+* Dropped bang version of exclude.  Now using ant-like include/exclude semantics.
+* Enabled the "yield self" idiom in FileList#initialize.
+
+== Version 0.2.9
+
+This version contains numerous changes as the RubyConf.new(2003)
+presentation was being prepared.  The changes include:
+
+* The monolithic rubyapp task library is in the process of being
+  dropped in favor of lighter weight task libraries.
+
+== Version 0.2.7
+
+* Added "desc" for task descriptions.
+* -T will now display tasks with descriptions.
+* -P will display tasks and prerequisites.
+* Dropped the Sys module in favor of the 1.8.x FileUtils module.  Sys
+  is still supported in the contrib area.
+
+== Version 0.2.6
+
+* Moved to RubyForge
+
+== Version 0.2.5
+
+* Switched to standard ruby app builder.
+* Added no_match option to file matcher.
+
+== Version 0.2.4
+
+* Fixed indir, which neglected to actually change directories.
+
+== Version 0.2.3
+
+* Added rake module for a help target
+* Added 'for_files' to Sys
+* Added a $rakefile constant
+* Added test for selecting proper rule with multiple targets.
diff --git a/doc/rake/README b/doc/rake/README
new file mode 100644
index 0000000000..41668dd727
--- /dev/null
+++ b/doc/rake/README
@@ -0,0 +1,196 @@
+= RAKE -- Ruby Make 
+
+Supporting Rake version: 0.8.6
+
+This package contains Rake, a simple ruby build program with
+capabilities similar to make.
+
+Rake has the following features:
+
+* Rakefiles (rake's version of Makefiles) are completely defined in
+  standard Ruby syntax.  No XML files to edit.  No quirky Makefile
+  syntax to worry about (is that a tab or a space?)
+
+* Users can specify tasks with prerequisites.
+
+* Rake supports rule patterns to synthesize implicit tasks.
+
+* Flexible FileLists that act like arrays but know about manipulating
+  file names and paths.
+
+* A library of prepackaged tasks to make building rakefiles easier. For example,
+  tasks for building tarballs, gems and RDoc output are provided.
+
+* Supports parallel execution of tasks.
+
+
+== Installation
+
+=== Gem Installation
+
+Download and install  rake with the following.
+
+   gem install rake
+
+=== Normal Installation
+
+You can download the source tarball of the latest version of Rake from
+
+* http://rubyforge.org/project/showfiles.php?group_id=50
+
+Extract the tarball and run
+
+  % ruby install.rb
+
+from its distribution directory.
+
+== Usage
+
+=== Simple Example
+
+First, you must write a "Rakefile" file which contains the build rules. Here's
+a simple example:
+
+  task :default => [:test]
+  
+  task :test do
+    ruby "test/unittest.rb"
+  end
+
+This Rakefile has two tasks:
+
+* A task named "test", which - upon invocation - will run a unit test file in
+  Ruby.
+* A task named "default". This task does nothing by itself, but it has exactly
+  one dependency, namely the "test" task. Invoking the "default" task will
+  cause Rake to invoke the "test" task as well.
+
+Running the "rake" command without any options will cause it to run the
+"default" task in the Rakefile:
+
+  % ls
+  Rakefile     test/
+  % rake
+  (in /home/some_user/Projects/rake)
+  ruby test/unittest.rb
+  ....unit test output here...
+
+Type "rake --help" for all available options.
+
+
+=== More Information
+
+* For details on Rake's command-line invocation, read
+  doc/command_line_usage.rdoc[http://rake.rubyforge.org/files/doc/command_line_usage_rdoc.html]
+* For details on writing Rakefiles, see
+  doc/rakefile.rdoc[http://rake.rubyforge.org/files/doc/rakefile_rdoc.html].
+* For the original announcement of Rake, see
+  doc/rational.rdoc[http://rake.rubyforge.org/files/doc/rational_rdoc.html].
+* For a glossary of terms, see
+  doc/glossary.rdoc[http://rake.rubyforge.org/files/doc/glossary_rdoc.html].
+
+
+== Development
+
+=== Source Repository
+
+Rake is currently hosted at github. The github web page is
+http://github.com/jimweirich/rake. The public git clone URL is
+
+* git://github.com/jimweirich/rake.git
+
+=== Running the Rake Test Suite
+
+If you wish to run the unit and functional tests that come with Rake:
+
+* Install the 'session' gem in order to run the functional tests.
+* CD into the top project directory of rake.
+* Type one of the following:
+
+     rake                  # If you have a version of rake installed
+     ruby -Ilib bin/rake   # If you do not have a version of rake installed.
+
+=== Issues and Bug Reports
+
+Bugs, features requests and other issues can be logged at
+
+* http://onestepback.org/redmine/projects/show/rake
+
+You will need an account to before you can post issues.  Register at
+http://onestepback.org/redmine/account/register.  Or you can send me
+an email (at jim dot weirich at gmail dot com)
+
+
+== Online Resources
+
+=== Rake References
+
+* Rake Documentation Home: http://docs.rubyrake.org
+* Rake Project Page: http://rubyforge.org/projects/rake
+* Rake API Documents: http://rake.rubyforge.org
+* Rake Source Code Repo:  http://github.com/jimweirich/rake
+* Rake Git Repo Clone URL: git://github.com/jimweirich/rake.git
+
+=== Presentations and Articles about Rake
+
+* Jim Weirich's 2003 RubyConf presentation: http://onestepback.org/articles/buildingwithrake/
+* Martin Fowler's article on Rake: http://martinfowler.com/articles/rake.html
+
+== Other Make Reinvisionings ...
+
+Rake is a late entry in the make replacement field.  Here are links to
+other projects with similar (and not so similar) goals.
+
+* http://directory.fsf.org/bras.html -- Bras, one of earliest
+  implementations of "make in a scripting language".
+* http://www.a-a-p.org -- Make in Python
+* http://www.aromatic.com/tools/jam.txt -- JAM, Java Automated Make
+* http://ant.apache.org -- The Ant project
+* http://ppt.perl.org/commands/make/index.html -- Make from the Perl
+  Power Tools implementation.
+* http://search.cpan.org/search?query=PerlBuildSystem -- The Perl Build System
+* http://make.rubyforge.org -- Rant, another Ruby make tool.
+
+== Credits
+
+[<b>Ryan Dlugosz</b>] For the initial conversation that sparked Rake.
+
+[<b>nobu.nokada@softhome.net</b>] For the initial patch for rule support.
+
+[<b>Tilman Sauerbeck <tilman@code-monkey.de></b>] For the recursive rule patch.
+
+== License
+
+Rake is available under an MIT-style license.
+
+:include: MIT-LICENSE
+
+== Support
+
+The Rake homepage is http://rake.rubyforge.org.  You can find the Rake
+RubyForge page at http://rubyforge.org/projects/rake.
+
+Feel free to submit commits or feature requests.  If you send a patch,
+remember to update the corresponding unit tests.  If fact, I prefer
+new feature to be submitted in the form of new unit tests.
+
+For other information, feel free to ask on the ruby-talk mailing list
+(which is mirrored to comp.lang.ruby) or contact
+jim dot weirich at gmail.com.
+
+---
+
+= Other stuff
+
+Author::   Jim Weirich <jim.weirich@gmail.com>
+Requires:: Ruby 1.8.0 or later
+License::  Copyright 2003-2008 by Jim Weirich.
+           Released under an MIT-style license.  See the LICENSE file
+           included in the distribution.
+
+== Warranty
+
+This software is provided "as is" and without any express or
+implied warranties, including, without limitation, the implied
+warranties of merchantibility and fitness for a particular
+purpose.
diff --git a/doc/rake/command_line_usage.rdoc b/doc/rake/command_line_usage.rdoc
new file mode 100644
index 0000000000..c60e53f51a
--- /dev/null
+++ b/doc/rake/command_line_usage.rdoc
@@ -0,0 +1,102 @@
+= Rake Command Line Usage
+
+Rake is invoked from the command line using:
+
+   % rake [<em>options</em> ...]  [<em>VAR</em>=<em>VALUE</em>]  [<em>targets</em> ...]
+
+Options are:
+
+[<tt><em>name</em>=<em>value</em></tt>]
+    Set the environment variable <em>name</em> to <em>value</em>
+    during the execution of the <b>rake</b> command.  You can access
+    the value by using ENV['<em>name</em>'].  
+
+[<tt>--classic-namespace</tt> (-n)]
+    Import the Task, FileTask, and FileCreateTask into the top-level
+    scope to be compatible with older versions of Rake.  Alternatively
+    you can include the line <code>require
+    'rake/classic_namespace'</code> in your Rakefile to get the
+    classic behavior.
+
+[<tt>--describe</tt> _pattern_ (-D)]
+    Describe the tasks (matching optional PATTERN), then exit.
+
+[<tt>--dry-run</tt> (-n)]
+    Do a dry run.  Print the tasks invoked and executed, but do not
+    actually execute any of the actions.
+
+[<tt>--execute</tt> _code_ (-e)]
+    Execute some Ruby code and exit.
+
+[<tt>--execute-print</tt> _code_ (-p)]
+    Execute some Ruby code, print the result, and exit.
+
+[<tt>--execute-continue</tt> _code_ (-p)]
+    Execute some Ruby code, then continue with normal task processing.
+
+[<tt>--help</tt>  (-H)]
+    Display some help text and exit.
+
+[<tt>--libdir</tt> _directory_  (-I)]
+    Add _directory_ to the list of directories searched for require.
+
+[<tt>--nosearch</tt>  (-N)]
+    Do not search for a Rakefile in parent directories.
+
+[<tt>--prereqs</tt>  (-P)]
+    Display a list of all tasks and their immediate prerequisites.
+
+[<tt>--quiet</tt> (-q)]
+    Do not echo commands from FileUtils.
+
+[<tt>--rakefile</tt> _filename_ (-f)]
+    Use _filename_ as the name of the rakefile. The default rakefile
+    names are +rakefile+ and +Rakefile+ (with +rakefile+ taking
+    precedence). If the rakefile is not found in the current
+    directory, +rake+ will search parent directories for a match. The
+    directory where the Rakefile is found will become the current
+    directory for the actions executed in the Rakefile.
+
+[<tt>--rakelibdir</tt> _rakelibdir_ (-R)]
+    Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')
+
+[<tt>--require</tt> _name_ (-r)]
+    Require _name_ before executing the Rakefile.
+
+[<tt>--rules</tt>]
+    Trace the rules resolution.
+
+[<tt>--silent (-s)</tt>]
+    Like --quiet, but also suppresses the 'in directory' announcement.
+
+[<tt>--system</tt> (-g)]
+    Use the system wide (global) rakefiles. The project Rakefile is
+    ignored. By default, the system wide rakefiles are used only if no
+    project Rakefile is found. On Unix-like system, the system wide
+    rake files are located in $HOME/.rake. On a windows system they
+    are stored in $APPDATA/Rake.
+
+[<tt>--no-system</tt> (-G)]
+    Use the project level Rakefile, ignoring the system-wide (global)
+    rakefiles.
+
+[<tt>--tasks</tt> (-T)]
+    Display a list of the major tasks and their comments.  Comments
+    are defined using the "desc" command.
+
+[<tt>--trace</tt> (-t)]
+    Turn on invoke/execute tracing. Also enable full backtrace on
+    errors.
+
+[<tt>--usage</tt> (-h)]
+    Display a usage message and exit.
+
+[<tt>--verbose</tt> (-v)]
+    Echo the Sys commands to standard output.
+
+[<tt>--version</tt> (-V)]
+    Display the program version and exit.
+
+In addition, any command line option of the form
+<em>VAR</em>=<em>VALUE</em> will be added to the environment hash
+<tt>ENV</tt> and may be tested in the Rakefile.
diff --git a/doc/rake/example/Rakefile1 b/doc/rake/example/Rakefile1
new file mode 100644
index 0000000000..39f8bcceb0
--- /dev/null
+++ b/doc/rake/example/Rakefile1
@@ -0,0 +1,38 @@
+# Example Rakefile -*- ruby -*-
+
+task :default => [:main]
+
+file "a.o" => ["a.c"] do |t|
+  src = t.name.sub(/\.o$/, '.c')
+  sh "gcc #{src} -c -o #{t.name}"
+end
+
+file "b.o" => ["b.c"] do |t|
+  src = t.name.sub(/\.o$/, '.c')
+  sh "gcc #{src} -c -o #{t.name}"
+end
+
+file "main.o" => ["main.c"] do |t|
+  src = t.name.sub(/\.o$/, '.c')
+  sh "gcc #{src} -c -o #{t.name}"
+end
+
+OBJFILES = ["a.o", "b.o", "main.o"]
+task :obj => OBJFILES
+
+file "main" => OBJFILES do |t|
+  sh "gcc -o #{t.name} main.o a.o b.o"
+end
+
+task :clean do
+  rm_f FileList['*.o']
+  Dir['*~'].each { |fn| rm_f fn }
+end
+
+task :clobber => [:clean] do
+  rm_f "main"
+end
+
+task :run => ["main"] do
+  sh "./main"
+end
diff --git a/doc/rake/example/Rakefile2 b/doc/rake/example/Rakefile2
new file mode 100644
index 0000000000..35310eceb5
--- /dev/null
+++ b/doc/rake/example/Rakefile2
@@ -0,0 +1,35 @@
+# Example Rakefile -*- ruby -*-
+# Using the power of Ruby
+
+task :default => [:main]
+
+def ext(fn, newext)
+  fn.sub(/\.[^.]+$/, newext)
+end
+
+SRCFILES = Dir['*.c']
+OBJFILES = SRCFILES.collect { |fn| ext(fn,".o") }
+
+OBJFILES.each do |objfile|
+  srcfile = ext(objfile, ".c")
+  file objfile => [srcfile] do |t|
+    sh "gcc #{srcfile} -c -o #{t.name}"
+  end
+end
+
+file "main" => OBJFILES do |t|
+  sh "gcc -o #{t.name} main.o a.o b.o"
+end
+
+task :clean do
+  rm_f FileList['*.o']
+  Dir['*~'].each { |fn| rm_f fn }
+end
+
+task :clobber => [:clean] do
+  rm_f "main"
+end
+
+task :run => ["main"] do
+  sh "./main"
+end
diff --git a/doc/rake/example/a.c b/doc/rake/example/a.c
new file mode 100644
index 0000000000..620e6f8007
--- /dev/null
+++ b/doc/rake/example/a.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+void a()
+{
+    printf ("In function a\n");
+}
diff --git a/doc/rake/example/b.c b/doc/rake/example/b.c
new file mode 100644
index 0000000000..9b24aa1273
--- /dev/null
+++ b/doc/rake/example/b.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+void b()
+{
+    printf ("In function b\n");
+}
diff --git a/doc/rake/example/main.c b/doc/rake/example/main.c
new file mode 100644
index 0000000000..a04558a251
--- /dev/null
+++ b/doc/rake/example/main.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+extern void a();
+extern void b();
+
+int main ()
+{
+    a();
+    b();
+    return 0;
+}
diff --git a/doc/rake/glossary.rdoc b/doc/rake/glossary.rdoc
new file mode 100644
index 0000000000..0ca1869306
--- /dev/null
+++ b/doc/rake/glossary.rdoc
@@ -0,0 +1,51 @@
+= Glossary
+
+[<b>action</b>]
+	Code to be executed in order to perform a task.  Actions in a
+	rakefile are specified in a code block (usually delimited by
+	+do+/+end+ pairs.
+
+[<b>execute</b>]
+	When a task is executed, all of its actions are performed, in
+	the order they were defined.  Note that unlike
+	<tt>invoke</tt>, <tt>execute</tt> always executes the actions
+	(without invoking or executing the prerequisites).
+
+[<b>file task</b> (FileTask)]
+	 A file task is a task whose purpose is to create a file
+	 (which has the same name as the task).  When invoked, a file
+	 task will only execute if one or more of the following
+	 conditions are true.
+
+         1. The associated file does not exist.
+	 2. A prerequisite has a later time stamp than the existing file.
+
+	 Because normal Tasks always have the current time as
+	 timestamp, a FileTask that has a normal Task prerequisite
+	 will always execute.
+
+[<b>invoke</b>]
+	When a task is invoked, first we check to see if it has been
+	invoked before.  if it has been, then nothing else is done.
+	If this is the first time its been invoked, then we invoke
+	each of its prerequisites.  Finally, we check to see if we
+	need to execute the actions of this task by calling
+	<tt>needed?</tt>.  Finally, if the task is needed, we execute
+	its actions.
+
+	NOTE: Currently prerequisites are invoked even if the task is
+	not needed.  This may change in the future.
+
+[<b>prerequisites</b>]
+	Every task has a set (possiblity empty) of prerequisites.  A
+	prerequisite P to Task T is itself a task that must be invoked
+	before Task T.  
+
+[<b>rule</b>]
+	A rule is a recipe for synthesizing a task when no task is
+	explicitly defined.  Rules generally synthesize file tasks.
+
+[<b>task</b> (Task)]
+	Basic unit of work in a rakefile.  A task has a name, a set of
+	prerequisites and a list of actions to be performed.
+
diff --git a/doc/rake/jamis.rb b/doc/rake/jamis.rb
new file mode 100644
index 0000000000..c7439d88ea
--- /dev/null
+++ b/doc/rake/jamis.rb
@@ -0,0 +1,591 @@
+module RDoc
+module Page
+
+FONTS = "\"Bitstream Vera Sans\", Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = <<CSS
+a {
+  color: #00F;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #77F;
+  text-decoration: underline;
+}
+
+body, td, p {
+  font-family: %fonts%;
+  background: #FFF;
+  color: #000;
+  margin: 0px;
+  font-size: small;
+}
+
+#content {
+  margin: 2em;
+}
+
+#description p {
+  margin-bottom: 0.5em;
+}
+
+.sectiontitle {
+  margin-top: 1em;
+  margin-bottom: 1em;
+  padding: 0.5em;
+  padding-left: 2em;
+  background: #005;
+  color: #FFF;
+  font-weight: bold;
+  border: 1px dotted black;
+}
+
+.attr-rw {
+  padding-left: 1em;
+  padding-right: 1em;
+  text-align: center;
+  color: #055;
+}
+
+.attr-name {
+  font-weight: bold;
+}
+
+.attr-desc {
+}
+
+.attr-value {
+  font-family: monospace;
+}
+
+.file-title-prefix {
+  font-size: large;
+}
+
+.file-title {
+  font-size: large;
+  font-weight: bold;
+  background: #005;
+  color: #FFF;
+}
+
+.banner {
+  background: #005;
+  color: #FFF;
+  border: 1px solid black;
+  padding: 1em;
+}
+
+.banner td {
+  background: transparent;
+  color: #FFF;
+}
+
+h1 a, h2 a, .sectiontitle a, .banner a {
+  color: #FF0;
+}
+
+h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
+  color: #FF7;
+}
+
+.dyn-source {
+  display: none;
+  background: #FFE;
+  color: #000;
+  border: 1px dotted black;
+  margin: 0.5em 2em 0.5em 2em;
+  padding: 0.5em;
+}
+
+.dyn-source .cmt {
+  color: #00F;
+  font-style: italic;
+}
+
+.dyn-source .kw {
+  color: #070;
+  font-weight: bold;
+}
+
+.method {
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-bottom: 1em;
+}
+
+.description pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+
+.method .title {
+  font-family: monospace;
+  font-size: large;
+  border-bottom: 1px dashed black;
+  margin-bottom: 0.3em;
+  padding-bottom: 0.1em;
+}
+
+.method .description, .method .sourcecode {
+  margin-left: 1em;
+}
+
+.description p, .sourcecode p {
+  margin-bottom: 0.5em;
+}
+
+.method .sourcecode p.source-link {
+  text-indent: 0em;
+  margin-top: 0.5em;
+}
+
+.method .aka {
+  margin-top: 0.3em;
+  margin-left: 1em;
+  font-style: italic;
+  text-indent: 2em;
+}
+
+h1 {
+  padding: 1em;
+  border: 1px solid black;
+  font-size: x-large;
+  font-weight: bold;
+  color: #FFF;
+  background: #007;
+}
+
+h2 {
+  padding: 0.5em 1em 0.5em 1em;
+  border: 1px solid black;
+  font-size: large;
+  font-weight: bold;
+  color: #FFF;
+  background: #009;
+}
+
+h3, h4, h5, h6 {
+  padding: 0.2em 1em 0.2em 1em;
+  border: 1px dashed black;
+  color: #000;
+  background: #AAF;
+}
+
+.sourcecode > pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+
+CSS
+
+XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+}
+
+HEADER = XHTML_PREAMBLE + <<ENDHEADER
+<html>
+  <head>
+    <title>%title%</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+    <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+
+    <script language="JavaScript" type="text/javascript">
+    // <![CDATA[
+
+        function toggleSource( id )
+        {
+          var elem
+          var link
+
+          if( document.getElementById )
+          {
+            elem = document.getElementById( id )
+            link = document.getElementById( "l_" + id )
+          }
+          else if ( document.all )
+          {
+            elem = eval( "document.all." + id )
+            link = eval( "document.all.l_" + id )
+          }
+          else
+            return false;
+
+          if( elem.style.display == "block" )
+          {
+            elem.style.display = "none"
+            link.innerHTML = "show source"
+          }
+          else
+          {
+            elem.style.display = "block"
+            link.innerHTML = "hide source"
+          }
+        }
+
+        function openCode( url )
+        {
+          window.open( url, "SOURCE_CODE", "width=400,height=400,scrollbars=yes" )
+        }
+      // ]]>
+    </script>
+  </head>
+
+  <body>
+ENDHEADER
+
+FILE_PAGE = <<HTML
+<table border='0' cellpadding='0' cellspacing='0' width="100%" class='banner'>
+  <tr><td>
+    <table width="100%" border='0' cellpadding='0' cellspacing='0'><tr>
+      <td class="file-title" colspan="2"><span class="file-title-prefix">File</span><br />%short_name%</td>
+      <td align="right">
+        <table border='0' cellspacing="0" cellpadding="2">
+          <tr>
+            <td>Path:</td>
+            <td>%full_path%
+IF:cvsurl
+              &nbsp;(<a href="%cvsurl%">CVS</a>)
+ENDIF:cvsurl
+            </td>
+          </tr>
+          <tr>
+            <td>Modified:</td>
+            <td>%dtm_modified%</td>
+          </tr>
+        </table>
+      </td></tr>
+    </table>
+  </td></tr>
+</table><br>
+HTML
+
+###################################################################
+
+CLASS_PAGE = <<HTML
+<table width="100%" border='0' cellpadding='0' cellspacing='0' class='banner'><tr>
+  <td class="file-title"><span class="file-title-prefix">%classmod%</span><br />%full_name%</td>
+  <td align="right">
+    <table cellspacing=0 cellpadding=2>
+      <tr valign="top">
+        <td>In:</td>
+        <td>
+START:infiles
+HREF:full_path_url:full_path:
+IF:cvsurl
+&nbsp;(<a href="%cvsurl%">CVS</a>)
+ENDIF:cvsurl
+END:infiles
+        </td>
+      </tr>
+IF:parent
+    <tr>
+      <td>Parent:</td>
+      <td>
+IF:par_url
+        <a href="%par_url%">
+ENDIF:par_url
+%parent%
+IF:par_url
+         </a>
+ENDIF:par_url
+     </td>
+   </tr>
+ENDIF:parent
+         </table>
+        </td>
+        </tr>
+      </table>
+HTML
+
+###################################################################
+
+METHOD_LIST = <<HTML
+  <div id="content">
+IF:diagram
+  <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center">
+    %diagram%
+  </td></tr></table>
+ENDIF:diagram
+
+IF:description
+  <div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+  <div class="sectiontitle">Required Files</div>
+  <ul>
+START:requires
+  <li>HREF:aref:name:</li>
+END:requires
+  </ul>
+ENDIF:requires
+
+IF:toc
+  <div class="sectiontitle">Contents</div>
+  <ul>
+START:toc
+  <li><a href="#%href%">%secname%</a></li>
+END:toc
+  </ul>
+ENDIF:toc
+
+IF:methods
+  <div class="sectiontitle">Methods</div>
+  <ul>
+START:methods
+  <li>HREF:aref:name:</li>
+END:methods
+  </ul>
+ENDIF:methods
+
+IF:includes
+<div class="sectiontitle">Included Modules</div>
+<ul>
+START:includes
+  <li>HREF:aref:name:</li>
+END:includes
+</ul>
+ENDIF:includes
+
+START:sections
+IF:sectitle
+<div class="sectiontitle"><a nem="%secsequence%">%sectitle%</a></div>
+IF:seccomment
+<div class="description">
+%seccomment%
+</div>
+ENDIF:seccomment
+ENDIF:sectitle
+
+IF:classlist
+  <div class="sectiontitle">Classes and Modules</div>
+  %classlist%
+ENDIF:classlist
+
+IF:constants
+  <div class="sectiontitle">Constants</div>
+  <table border='0' cellpadding='5'>
+START:constants
+  <tr valign='top'>
+    <td class="attr-name">%name%</td>
+    <td>=</td>
+    <td class="attr-value">%value%</td>
+  </tr>
+IF:desc
+  <tr valign='top'>
+    <td>&nbsp;</td>
+    <td colspan="2" class="attr-desc">%desc%</td>
+  </tr>
+ENDIF:desc
+END:constants
+  </table>
+ENDIF:constants
+
+IF:attributes
+  <div class="sectiontitle">Attributes</div>
+  <table border='0' cellpadding='5'>
+START:attributes
+  <tr valign='top'>
+    <td class='attr-rw'>
+IF:rw
+[%rw%]
+ENDIF:rw
+    </td>
+    <td class='attr-name'>%name%</td>
+    <td class='attr-desc'>%a_desc%</td>
+  </tr>
+END:attributes
+  </table>
+ENDIF:attributes
+
+IF:method_list
+START:method_list
+IF:methods
+<div class="sectiontitle">%type% %category% methods</div>
+START:methods
+<div class="method">
+  <div class="title">
+IF:callseq
+    <a name="%aref%"></a><b>%callseq%</b>
+ENDIF:callseq
+IFNOT:callseq
+    <a name="%aref%"></a><b>%name%</b>%params%
+ENDIF:callseq
+IF:codeurl
+[ <a href="javascript:openCode('%codeurl%')">source</a> ]
+ENDIF:codeurl
+  </div>
+IF:m_desc
+  <div class="description">
+  %m_desc%
+  </div>
+ENDIF:m_desc
+IF:aka
+<div class="aka">
+  This method is also aliased as
+START:aka
+  <a href="%aref%">%name%</a>
+END:aka
+</div>
+ENDIF:aka
+IF:sourcecode
+<div class="sourcecode">
+  <p class="source-link">[ <a href="javascript:toggleSource('%aref%_source')" id="l_%aref%_source">show source</a> ]</p>
+  <div id="%aref%_source" class="dyn-source">
+<pre>
+%sourcecode%
+</pre>
+  </div>
+</div>
+ENDIF:sourcecode
+</div>
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+END:sections
+</div>
+HTML
+
+FOOTER = <<ENDFOOTER
+  </body>
+</html>
+ENDFOOTER
+
+BODY = HEADER + <<ENDBODY
+  !INCLUDE! <!-- banner header -->
+
+  <div id="bodyContent">
+    #{METHOD_LIST}
+  </div>
+
+  #{FOOTER}
+ENDBODY
+
+########################## Source code ##########################
+
+SRC_PAGE = XHTML_PREAMBLE + <<HTML
+<html>
+<head><title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style>
+.ruby-comment    { color: green; font-style: italic }
+.ruby-constant   { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222;  }
+.ruby-ivar       { color: #2233dd; }
+.ruby-keyword    { color: #3333FF; font-weight: bold }
+.ruby-node       { color: #777777; }
+.ruby-operator   { color: #111111;  }
+.ruby-regexp     { color: #662222; }
+.ruby-value      { color: #662222; font-style: italic }
+  .kw { color: #3333FF; font-weight: bold }
+  .cmt { color: green; font-style: italic }
+  .str { color: #662222; font-style: italic }
+  .re  { color: #662222; }
+</style>
+</head>
+<body bgcolor="white">
+<pre>%code%</pre>
+</body>
+</html>
+HTML
+
+########################## Index ################################
+
+FR_INDEX_BODY = <<HTML
+!INCLUDE!
+HTML
+
+FILE_INDEX = XHTML_PREAMBLE + <<HTML
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style>
+<!--
+  body {
+    background-color: #EEE;
+    font-family: #{FONTS}; 
+    color: #000;
+    margin: 0px;
+  }
+  .banner {
+    background: #005;
+    color: #FFF;
+    padding: 0.2em;
+    font-size: small;
+    font-weight: bold;
+    text-align: center;
+  }
+  .entries {
+    margin: 0.25em 1em 0 1em;
+    font-size: x-small;
+  }
+  a {
+    color: #00F;
+    text-decoration: none;
+    white-space: nowrap;
+  }
+  a:hover {
+    color: #77F;
+    text-decoration: underline;
+  }
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner">%list_title%</div>
+<div class="entries">
+START:entries
+<a href="%href%">%name%</a><br>
+END:entries
+</div>
+</body></html>
+HTML
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = XHTML_PREAMBLE + <<HTML
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+</head>
+
+<frameset cols="20%,*">
+    <frameset rows="15%,35%,50%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+IF:inline_source
+      <frame  src="%initial_page%" name="docwin">
+ENDIF:inline_source
+IFNOT:inline_source
+    <frameset rows="80%,20%">
+      <frame  src="%initial_page%" name="docwin">
+      <frame  src="blank.html" name="source">
+    </frameset>
+ENDIF:inline_source
+    <noframes>
+          <body bgcolor="white">
+            Click <a href="html/index.html">here</a> for a non-frames
+            version of this page.
+          </body>
+    </noframes>
+</frameset>
+
+</html>
+HTML
+
+end
+end
+
+
diff --git a/doc/rake/proto_rake.rdoc b/doc/rake/proto_rake.rdoc
new file mode 100644
index 0000000000..39b9b88c1f
--- /dev/null
+++ b/doc/rake/proto_rake.rdoc
@@ -0,0 +1,127 @@
+= Original Prototype Rake
+
+This is the original 100 line prototype rake program.
+
+---
+ #!/usr/bin/env ruby
+ 
+ require 'ftools'
+ 
+ class Task
+   TASKS = Hash.new
+ 
+   attr_reader :prerequisites
+ 
+   def initialize(task_name)
+     @name = task_name
+     @prerequisites = []
+     @actions = []
+   end
+ 
+   def enhance(deps=nil, &block)
+     @prerequisites |= deps if deps
+     @actions << block if block_given?
+     self
+   end
+ 
+   def name
+     @name.to_s
+   end
+ 
+   def invoke
+     @prerequisites.each { |n| Task[n].invoke }
+     execute if needed?
+   end
+ 
+   def execute
+     return if @triggered
+     @triggered = true
+     @actions.collect { |act| result = act.call(self) }.last
+   end
+ 
+   def needed?
+     true
+   end
+ 
+   def timestamp
+     Time.now
+   end
+ 
+   class << self
+     def [](task_name)
+       TASKS[intern(task_name)] or fail "Don't know how to rake #{task_name}"
+     end
+     
+     def define_task(args, &block)
+       case args
+       when Hash
+ 	fail "Too Many Target Names: #{args.keys.join(' ')}" if args.size > 1
+ 	fail "No Task Name Given" if args.size < 1
+ 	task_name = args.keys[0]
+ 	deps = args[task_name]
+       else
+ 	task_name = args
+ 	deps = []
+       end
+       deps = deps.collect {|d| intern(d) }
+       get(task_name).enhance(deps, &block)
+     end
+ 
+     def get(task_name)
+       name = intern(task_name)
+       TASKS[name] ||= self.new(name)
+     end
+ 
+     def intern(task_name)
+       (Symbol === task_name) ? task_name : task_name.intern
+     end
+   end
+ end
+ 
+ class FileTask < Task
+   def needed?
+     return true unless File.exist?(name)
+     latest_prereq = @prerequisites.collect{|n| Task[n].timestamp}.max
+     return false if latest_prereq.nil?
+     timestamp < latest_prereq
+   end
+ 
+   def timestamp
+     File.new(name.to_s).mtime
+   end
+ end
+ 
+ def task(args, &block)
+   Task.define_task(args, &block)
+ end
+ 
+ def file(args, &block)
+   FileTask.define_task(args, &block)
+ end
+ 
+ def sys(cmd)
+   puts cmd
+   system(cmd) or fail "Command Failed: [#{cmd}]"
+ end
+   
+ def rake
+   begin
+     here = Dir.pwd
+     while ! File.exist?("Rakefile")
+       Dir.chdir("..")
+       fail "No Rakefile found" if Dir.pwd == here
+       here = Dir.pwd
+     end
+     puts "(in #{Dir.pwd})"
+     load "./Rakefile"
+     ARGV.push("default") if ARGV.size == 0
+     ARGV.each { |task_name| Task[task_name].invoke }
+   rescue Exception => ex
+     puts "rake aborted ... #{ex.message}"
+     puts ex.backtrace.find {|str| str =~ /Rakefile/ } || ""
+   end    
+ end
+ 
+ if __FILE__ == $0 then
+   rake
+ end
diff --git a/doc/rake/rakefile.rdoc b/doc/rake/rakefile.rdoc
new file mode 100644
index 0000000000..f8ae72c32a
--- /dev/null
+++ b/doc/rake/rakefile.rdoc
@@ -0,0 +1,534 @@
+= Rakefile Format (as of version 0.8.3)
+
+First of all, there is no special format for a Rakefile.  A Rakefile
+contains executable Ruby code.  Anything legal in a ruby script is
+allowed in a Rakefile.
+
+Now that we understand there is no special syntax in a Rakefile, there
+are some conventions that are used in a Rakefile that are a little
+unusual in a typical Ruby program.  Since a Rakefile is tailored to
+specifying tasks and actions, the idioms used in a Rakefile are
+designed to support that.
+
+So, what goes into a Rakefile?
+
+== Tasks
+
+Tasks are the main unit of work in a Rakefile.  Tasks have a name
+(usually given as a symbol or a string), a list of prerequisites (more
+symbols or strings) and a list of actions (given as a block).
+
+=== Simple Tasks
+
+A task is declared by using the +task+ method.  +task+ takes a single
+parameter that is the name of the task.
+
+  task :name
+
+=== Tasks with Prerequisites
+
+Any prerequisites are given as a list (inclosed in square brackets)
+following the name and an arrow (=>).
+
+  task :name => [:prereq1, :prereq2]
+
+<b>NOTE:</b> Although this syntax looks a little funky, it is legal
+Ruby.  We are constructing a hash where the key is :name and the value
+for that key is the list of prerequisites.  It is equivalent to the
+following ...
+
+  hash = Hash.new
+  hash[:name] = [:prereq1, :prereq2]
+  task(hash)
+
+=== Tasks with Actions
+
+Actions are defined by passing a block to the +task+ method.  Any Ruby
+code can be placed in the block.  The block may reference the task
+object via the block paramter..
+
+  task :name => [:prereq1, :prereq2] do |t|
+    # actions (may reference t)
+  end
+
+=== Multiple Definitions
+
+A task may be specified more than once.  Each specification adds its
+prerequisites and actions to the existing definition.  This allows one
+part of a rakefile to specify the actions and a different rakefile
+(perhaps separately generated) to specify the dependencies.
+
+For example, the following is equivalent to the single task
+specification given above.
+
+  task :name
+  task :name => [:prereq1]
+  task :name => [:prereq2]
+  task :name do |t|
+    # actions
+  end
+
+== File Tasks
+
+Some tasks are designed to create a file from one or more other files.
+Tasks that generate these files may be skipped if the file already
+exists.  File tasks are used to specify file creation tasks.
+
+File tasks are declared using the +file+ method (instead of the +task+
+method).  In addition, file tasks are usually named with a string
+rather than a symbol.
+
+The following file task creates a executable program (named +prog+)
+given two object files name <tt>a.o</tt> and <tt>b.o</tt>.  The tasks
+for creating <tt>a.o</tt> and <tt>b.o</tt> are not shown.
+
+  file "prog" => ["a.o", "b.o"] do |t|
+    sh "cc -o #{t.name} #{t.prerequisites.join(' ')}"
+  end
+
+== Directory Tasks
+
+It is common to need to create directories upon demand.  The
++directory+ convenience method is a short-hand for creating a FileTask
+that creates the directory.  For example, the following declaration
+...
+
+  directory "testdata/examples/doc"
+
+is equivalent to ...
+
+  file "testdata"              do |t| mkdir t.name end
+  file "testdata/examples"     do |t| mkdir t.name end
+  file "testdata/examples/doc" do |t| mkdir t.name end
+
+The +directory+ method does not accept prerequisites or actions, but
+both prerequisites and actions can be added later.  For example ...
+
+  directory "testdata"
+  file "testdata" => ["otherdata"]
+  file "testdata" do
+    cp Dir["standard_data/*.data"], "testdata"
+  end
+
+== Tasks with Parallel Prerequisites
+
+Rake allows parallel execution of prerequisites using the following syntax:
+
+  multitask :copy_files => [:copy_src, :copy_doc, :copy_bin] do
+    puts "All Copies Complete"
+  end
+
+In this example, +copy_files+ is a normal rake task.  Its actions are
+executed whereever all of its prerequisites are done.  The big
+difference is that the prerequisites (+copy_src+, +copy_bin+ and
++copy_doc+) are executed in parallel.  Each of the prerequisites are
+run in their own Ruby thread, possibly allowing faster overall runtime.
+
+=== Secondary Prerequisites
+
+If any of the primary prerequites of a multitask have common secondary
+prerequisites, all of the primary/parallel prerequisites will wait
+until the common prerequisites have been run.
+
+For example, if the <tt>copy_<em>xxx</em></tt> tasks have the
+following prerequisites:
+
+  task :copy_src => [:prep_for_copy]
+  task :copy_bin => [:prep_for_copy]
+  task :copy_doc => [:prep_for_copy]
+
+Then the +prep_for_copy+ task is run before starting all the copies in
+parallel.  Once +prep_for_copy+ is complete, +copy_src+, +copy_bin+,
+and +copy_doc+ are all run in parallel.  Note that +prep_for_copy+ is
+run only once, even though it is referenced in multiple threads.
+
+=== Thread Safety
+
+The Rake internal data structures are thread-safe with respect
+to the multitask parallel execution, so there is no need for the user
+to do extra synchronization for Rake's benefit.  However, if there are
+user data structures shared between the parallel prerequisites, the
+user must do whatever is necessary to prevent race conditions.
+
+== Tasks with Arguments
+
+Prior to version 0.8.0, rake was only able to handle command line
+arguments of the form NAME=VALUE that were passed into Rake via the
+ENV hash.  Many folks had asked for some kind of simple command line
+arguments, perhaps using "--" to separate regular task names from
+argument values on the command line.  The problem is that there was no
+easy way to associate positional arguments on the command line with
+different tasks.  Suppose both tasks :a and :b expect a command line
+argument: does the first value go with :a?  What if :b is run first?
+Should it then get the first command line argument.
+
+Rake 0.8.0 solves this problem by explicitly passing values directly
+to the tasks that need them.  For example, if I had a release task
+that required a version number, I could say:
+
+   rake release[0.8.2]
+
+And the string "0.8.2" will be passed to the :release task.  Multiple
+arguments can be passed by separating them with a comma, for example:
+
+   rake name[john,doe]
+
+Just a few words of caution.  The rake task name and its arguments
+need to be a single command line argument to rake.  This generally
+means no spaces.  If spaces are needed, then the entire rake +
+argument string should be quoted.  Something like this:
+
+   rake "name[billy bob, smith]"
+
+(Quoting rules vary between operating systems and shells, so make sure
+you consult the proper docs for your OS/shell).
+
+=== Tasks that Expect Parameters
+
+Parameters are only given to tasks that are setup to expect them.  In
+order to handle named parameters, the task declaration syntax for
+tasks has been extended slightly.
+
+For example, a task that needs a first name and last name might be
+declared as:
+
+   task :name, [:first_name, :last_name]
+
+The first argument is still the name of the task (:name in this case).
+The next to argumements are the names of the parameters expected by
+:name in an array (:first_name and :last_name in the example).
+
+To access the values of the paramters, the block defining the task
+behaviour can now accept a second parameter:
+
+   task :name, [:first_name, :last_name] do |t, args|
+     puts "First name is #{args.first_name}"
+     puts "Last  name is #{args.last_name}"
+   end
+
+The first argument of the block "t" is always bound to the current
+task object.  The second argument "args" is an open-struct like object
+that allows access to the task arguments.  Extra command line
+arguments to a task are ignored.  Missing command line arguments are
+given the nil value.
+
+If you wish to specify default values for the arguments, you can use
+the with_defaults method in the task body.  Here is the above example
+where we specify default values for the first and last names:
+
+   task :name, [:first_name, :last_name] do |t, args|
+     args.with_defaults(:first_name => "John", :last_name => "Dough")
+     puts "First name is #{args.first_name}"
+     puts "Last  name is #{args.last_name}"
+   end
+
+=== Tasks that Expect Parameters and Have Prerequisites
+
+Tasks that use parameters have a slightly different format for
+prerequisites.  Use the arrow notation to indicate the prerequisites
+for tasks with arguments.  For example:
+
+   task :name, [:first_name, :last_name] => [:pre_name] do |t, args|
+     args.with_defaults(:first_name => "John", :last_name => "Dough")
+     puts "First name is #{args.first_name}"
+     puts "Last  name is #{args.last_name}"
+   end
+
+=== Deprecated Task Parameters Format
+
+There is an older format for declaring task parameters that omitted
+the task argument array and used the :needs keyword to introduce the
+dependencies.  That format is still supported for compatibility, but
+is not recommended for use.
+
+== Accessing Task Programatically
+
+Sometimes it is useful to manipulate tasks programatically in a
+Rakefile. To find a task object, use the <tt>:[]</tt> operator on the
+<tt>Rake::Task</tt>.
+
+=== Programmatic Task Example
+
+For example, the following Rakefile defines two tasks.  The :doit task
+simply prints a simple "DONE" message.  The :dont class will lookup
+the doit class and remove (clear) all of its prerequisites and
+actions.
+
+   task :doit do
+     puts "DONE"
+   end
+
+   task :dont do
+     Rake::Task[:doit].clear
+   end        
+
+Running this example:
+
+  $ rake doit
+  (in /Users/jim/working/git/rake/x)
+  DONE
+  $ rake dont doit
+  (in /Users/jim/working/git/rake/x)
+  $ 
+
+The ability to programmatically manipulate tasks gives rake very
+powerful meta-programming capabilities w.r.t. task execution, but
+should be used with cation.
+
+== Rules
+
+When a file is named as a prerequisite, but does not have a file task
+defined for it, Rake will attempt to synthesize a task by looking at a
+list of rules supplied in the Rakefile.
+
+Suppose we were trying to invoke task "mycode.o", but no task is
+defined for it.  But the rakefile has a rule that look like this ...
+
+  rule '.o' => ['.c'] do |t|
+    sh "cc #{t.source} -c -o #{t.name}"
+  end
+
+This rule will synthesize any task that ends in ".o".  It has a
+prerequisite a source file with an extension of ".c" must exist.  If
+Rake is able to find a file named "mycode.c", it will automatically
+create a task that builds "mycode.o" from "mycode.c".
+
+If the file "mycode.c" does not exist, rake will attempt
+to recursively synthesize a rule for it. 
+
+When a task is synthesized from a rule, the +source+ attribute of the
+task is set to the matching source file.  This allows us to write
+rules with actions that reference the source file.
+
+=== Advanced Rules
+
+Any regular expression may be used as the rule pattern.  Additionally,
+a proc may be used to calculate the name of the source file.  This
+allows for complex patterns and sources.
+
+The following rule is equivalent to the example above.
+
+  rule( /\.o$/ => [
+    proc {|task_name| task_name.sub(/\.[^.]+$/, '.c') }
+  ]) do |t|
+    sh "cc #{t.source} -c -o #{t.name}"
+  end    
+
+<b>NOTE:</b> Because of a _quirk_ in Ruby syntax, parenthesis are
+required on *rule* when the first argument is a regular expression.
+
+The following rule might be used for Java files ...
+
+  rule '.java' => [
+    proc { |tn| tn.sub(/\.class$/, '.java').sub(/^classes\//, 'src/') }
+  ] do |t|
+    java_compile(t.source, t.name)  
+  end
+
+<b>NOTE:</b> +java_compile+ is a hypothetical method that invokes the
+java compiler.
+
+== Importing Dependencies
+
+Any ruby file (including other rakefiles) can be included with a
+standard Ruby +require+ command.  The rules and declarations in the
+required file are just added to the definitions already accumulated.
+
+Because the files are loaded _before_ the rake targets are evaluated,
+the loaded files must be "ready to go" when the rake command is
+invoked.  This make generated dependency files difficult to use.  By
+the time rake gets around to updating the dependencies file, it is too
+late to load it.
+
+The +import+ command addresses this by specifying a file to be loaded
+_after_ the main rakefile is loaded, but _before_ any targets on the
+command line are specified.  In addition, if the file name matches an
+explicit task, that task is invoked before loading the file.  This
+allows dependency files to be generated and used in a single rake
+command invocation.
+
+=== Example:
+
+  require 'rake/loaders/makefile'
+
+  file ".depends.mf" => [SRC_LIST] do |t|
+    sh "makedepend -f- -- #{CFLAGS} -- #{t.prerequisites} > #{t.name}"
+  end
+
+  import ".depends.mf"
+
+If ".depends" does not exist, or is out of date w.r.t. the source
+files, a new ".depends" file is generated using +makedepend+ before
+loading.
+
+== Comments
+
+Standard Ruby comments (beginning with "#") can be used anywhere it is
+legal in Ruby source code, including comments for tasks and rules.
+However, if you wish a task to be described using the "-T" switch,
+then you need to use the +desc+ command to describe the task.
+
+=== Example:
+
+  desc "Create a distribution package"
+  task :package => [ ... ] do ... end
+
+The "-T" switch (or "--tasks" if you like to spell things out) will
+display a list of tasks that have a defined comment.  If you use
++desc+ to describe your major tasks, you have a semi-automatic way of
+generating a summary of your Rake file.
+
+  traken$ rake -T
+  (in /home/.../rake)
+  rake clean            # Remove any temporary products.
+  rake clobber          # Remove any generated file.
+  rake clobber_rdoc     # Remove rdoc products
+  rake contrib_test     # Run tests for contrib_test
+  rake default          # Default Task
+  rake install          # Install the application
+  rake lines            # Count lines in the main rake file
+  rake rdoc             # Build the rdoc HTML Files
+  rake rerdoc           # Force a rebuild of the RDOC files
+  rake test             # Run tests
+  rake testall          # Run all test targets
+
+Only tasks with descriptions will be displayed with the "-T" switch.
+Use "-P" (or "--prereqs") to get a list of all tasks and their
+prerequisites.
+
+== Namespaces
+
+As projects grow (and along with it, the number of tasks), it is
+common for task names to begin to clash.  For example, if you might
+have a main program and a set of sample programs built by a single
+Rakefile.  By placing the tasks related to the main program in one
+namespace, and the tasks for building the sample programs in a
+different namespace, the task names will not will not interfer with
+each other.
+
+For example:
+
+  namespace "main"
+    task :build do
+      # Build the main program
+    end
+  end
+
+  namespace "samples" do
+    task :build do
+      # Build the sample programs
+    end
+  end
+
+  task :build => ["main:build", "samples:build"]
+
+Referencing a task in a separate namespace can be achieved by
+prefixing the task name with the namespace and a colon
+(e.g. "main:build" refers to the :build task in the +main+ namespace).
+Nested namespaces are supported, so
+
+Note that the name given in the +task+ command is always the unadorned
+task name without any namespace prefixes.  The +task+ command always
+defines a task in the current namespace.  
+
+=== FileTasks
+
+File task names are not scoped by the namespace command.  Since the
+name of a file task is the name of an actual file in the file system,
+it makes little sense to include file task names in name space.
+Directory tasks (created by the +directory+ command) are a type of
+file task and are also not affected by namespaces.
+
+=== Name Resolution
+
+When looking up a task name, rake will start with the current
+namespace and attempt to find the name there.  If it fails to find a
+name in the current namespace, it will search the parent namespaces
+until a match is found (or an error occurs if there is no match).
+
+The "rake" namespace is a special implicit namespace that refers to
+the toplevel names.
+
+If a task name begins with a "^" character, the name resolution will
+start in the parent namespace.  Multiple "^" characters are allowed.
+
+Here is an example file with multiple :run tasks and how various names
+resolve in different locations.
+
+  task :run
+
+  namespace "one" do
+    task :run
+
+    namespace "two" do
+      task :run
+
+      # :run            => "one:two:run"
+      # "two:run"       => "one:two:run"
+      # "one:two:run"   => "one:two:run"
+      # "one:run"       => "one:run"
+      # "^run"          => "one:run"
+      # "^^run"         => "rake:run" (the top level task)
+      # "rake:run"      => "rake:run" (the top level task)
+    end
+
+    # :run       => "one:run"
+    # "two:run"  => "one:two:run"
+    # "^run"     => "rake:run"
+  end
+
+  # :run           => "rake:run"
+  # "one:run"      => "one:run"
+  # "one:two:run"  => "one:two:run"
+
+== FileLists
+
+FileLists are the way Rake manages lists of files.  You can treat a
+FileList as an array of strings for the most part, but FileLists
+support some additional operations.
+
+=== Creating a FileList
+
+Creating a file list is easy.  Just give it the list of file names:
+
+   fl = FileList['file1.rb', file2.rb']
+
+Or give it a glob pattern:
+
+   fl = FileList['*.rb']
+
+== Odds and Ends
+
+=== do/end verses { }
+
+Blocks may be specified with either a +do+/+end+ pair, or with curly
+braces in Ruby.  We _strongly_ recommend using +do+/+end+ to specify the
+actions for tasks and rules.  Because the rakefile idiom tends to
+leave off parenthesis on the task/file/rule methods, unusual
+ambiguities can arise when using curly braces.
+
+For example, suppose that the method +object_files+ returns a list of
+object files in a project.  Now we use +object_files+ as the
+prerequistes in a rule specified with actions in curly braces.
+
+  # DON'T DO THIS!
+  file "prog" => object_files {
+    # Actions are expected here (but it doesn't work)!
+  }
+
+Because curly braces have a higher precedence than +do+/+end+, the
+block is associated with the +object_files+ method rather than the
++file+ method.
+
+This is the proper way to specify the task ...
+
+  # THIS IS FINE
+  file "prog" => object_files do
+    # Actions go here
+  end
+
+----
+
+== See
+
+* README -- Main documentation for Rake.
diff --git a/doc/rake/rational.rdoc b/doc/rake/rational.rdoc
new file mode 100644
index 0000000000..f741e65bf8
--- /dev/null
+++ b/doc/rake/rational.rdoc
@@ -0,0 +1,151 @@
+= Why rake?
+
+Ok, let me state from the beginning that I never intended to write this
+code.  I'm not convinced it is useful, and I'm not convinced anyone
+would even be interested in it.  All I can say is that Why's onion truck
+must by been passing through the Ohio valley.
+
+What am I talking about? ... A Ruby version of Make.
+
+See, I can sense you cringing already, and I agree.  The world certainly
+doesn't need yet another reworking of the "make" program.  I mean, we
+already have "ant".  Isn't that enough?
+
+It started yesterday.  I was helping a coworker fix a problem in one of
+the Makefiles we use in our project.  Not a particularly tough problem,
+but during the course of the conversation I began lamenting some of the
+shortcomings of make.  In particular, in one of my makefiles I wanted to
+determine the name of a file dynamically and had to resort to some
+simple scripting (in Ruby) to make it work.  "Wouldn't it be nice if you
+could just use Ruby inside a Makefile" I said.
+
+My coworker (a recent convert to Ruby) agreed, but wondered what it
+would look like.  So I sketched the following on the whiteboard...
+
+    "What if you could specify the make tasks in Ruby, like this ..."
+
+      task "build" do
+        java_compile(...args, etc ...)
+      end
+
+    "The task function would register "build" as a target to be made,
+    and the block would be the action executed whenever the build
+    system determined that it was time to do the build target."
+
+We agreed that would be cool, but writing make from scratch would be WAY
+too much work.  And that was the end of that!
+
+... Except I couldn't get the thought out of my head.  What exactly
+would be needed to make the about syntax work as a make file?  Hmmm, you
+would need to register the tasks, you need some way of specifying
+dependencies between tasks, and some way of kicking off the process. 
+Hey!  What if we did ... and fifteen minutes later I had a working
+prototype of Ruby make, complete with dependencies and actions.
+
+I showed the code to my coworker and we had a good laugh.  It was just
+about a page worth of code that reproduced an amazing amount of the
+functionality of make.  We were both truely stunned with the power of
+Ruby.
+
+But it didn't do everything make did.  In particular, it didn't have
+timestamp based file dependencies (where a file is rebuilt if any of its
+prerequisite files have a later timestamp).  Obviously THAT would be a
+pain to add and so Ruby Make would remain an interesting experiment.
+
+... Except as I walked back to my desk, I started thinking about what
+file based dependecies would really need.  Rats!  I was hooked again,
+and by adding a new class and two new methods, file/timestamp
+dependencies were implemented.
+
+Ok, now I was really hooked.  Last night (during CSI!) I massaged the
+code and cleaned it up a bit.  The result is a bare-bones replacement
+for make in exactly 100 lines of code.
+
+For the curious, you can see it at ...
+* doc/proto_rake.rdoc
+
+Oh, about the name.  When I wrote the example Ruby Make task on my
+whiteboard, my coworker exclaimed "Oh! I have the perfect name: Rake ...
+Get it?  Ruby-Make. Rake!"  He said he envisioned the tasks as leaves
+and Rake would clean them up  ... or something like that.  Anyways, the
+name stuck.
+
+Some quick examples ...
+
+A simple task to delete backup files ...
+
+   task :clean do
+     Dir['*~'].each {|fn| rm fn rescue nil}
+   end
+
+Note that task names are symbols (they are slightly easier to type
+than quoted strings ... but you may use quoted string if you would
+rather). Rake makes the methods of the FileUtils module directly
+available, so we take advantage of the <tt>rm</tt> command.  Also note
+the use of "rescue nil" to trap and ignore errors in the <tt>rm</tt>
+command.
+
+To run it, just type "rake clean".  Rake will automatically find a
+Rakefile in the current directory (or above!) and will invoke the
+targets named on the command line.  If there are no targets explicitly
+named, rake will invoke the task "default".
+
+Here's another task with dependencies ...
+
+   task :clobber => [:clean] do
+     rm_r "tempdir"
+   end
+
+Task :clobber depends upon task :clean, so :clean will be run before
+:clobber is executed. 
+
+Files are specified by using the "file" command.  It is similar to the
+task command, except that the task name represents a file, and the task
+will be run only if the file doesn't exist, or if its modification time
+is earlier than any of its prerequisites.
+
+Here is a file based dependency that will compile "hello.cc" to
+"hello.o".
+
+   file "hello.cc"
+   file "hello.o" => ["hello.cc"] do |t|
+     srcfile = t.name.sub(/\.o$/, ".cc")
+     sh %{g++ #{srcfile} -c -o #{t.name}}
+   end
+
+I normally specify file tasks with string (rather than symbols).  Some
+file names can't be represented by symbols.  Plus it makes the
+distinction between them more clear to the casual reader.  
+
+Currently writing a task for each and every file in the project would be
+tedious at best.  I envision a set of libraries to make this job
+easier.  For instance, perhaps something like this ...
+
+   require 'rake/ctools'
+   Dir['*.c'].each do |fn|
+     c_source_file(fn)
+   end
+
+where "c_source_file" will create all the tasks need to compile all the
+C source files in a directory.  Any number of useful libraries could be
+created for rake.
+
+That's it.  There's no documentation (other than whats in this
+message).  Does this sound interesting to anyone?  If so, I'll continue
+to clean it up and write it up and publish it on RAA.  Otherwise, I'll
+leave it as an interesting excerise and a tribute to the power of Ruby.
+
+Why /might/ rake be interesting to Ruby programmers.  I don't know,
+perhaps ...
+
+* No weird make syntax (only weird Ruby syntax :-)
+* No need to edit or read XML (a la ant)
+* Platform independent build scripts.
+* Will run anywhere Ruby exists, so no need to have "make" installed.
+  If you stay away from the "sys" command and use things like
+  'ftools', you can have a perfectly platform independent
+  build script.  Also rake is only 100 lines of code, so it can
+  easily be packaged along with the rest of your code.
+
+So ... Sorry for the long rambling message.  Like I said, I never
+intended to write this code at all.
diff --git a/doc/rake/release_notes/rake-0.8.7.rdoc b/doc/rake/release_notes/rake-0.8.7.rdoc
new file mode 100644
index 0000000000..fb0c5d4e36
--- /dev/null
+++ b/doc/rake/release_notes/rake-0.8.7.rdoc
@@ -0,0 +1,55 @@
+= Rake 0.8.7 Released
+
+Rake version 0.8.5 introduced greatly improved support for executing
+commands on Windows.  The "sh" command now has the same semantics on
+Windows that it has on Unix based platforms.
+
+Rake version 0.8.6 includes minor fixes the the RDoc generation.
+Rake version 0.8.7 includes a minor fix for JRuby running on windows.
+
+== Changes
+
+=== New Features / Enhancements in Version 0.8.5
+
+* Improved implementation of the Rake system command for Windows.
+  (patch from James M. Lawrence/quix)
+
+* Support for Ruby 1.9's improved system command.  (patch from James
+  M. Lawrence/quix)
+
+* Rake now includes the configured extension when invoking an
+  executable (Config::CONFIG['EXEEXT])
+
+=== Bug Fixes in Version 0.8.5
+
+* Environment variable keys are now correctly cased (it matters in
+  some implementations).
+
+== What is Rake
+
+Rake is a build tool similar to the make program in many ways. But
+instead of cryptic make recipes, Rake uses standard Ruby code to
+declare tasks and dependencies. You have the full power of a modern
+scripting language built right into your build tool.
+
+== Availability
+
+The easiest way to get and install rake is via RubyGems ...
+
+  gem install rake    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Home Page:: http://rake.rubyforge.org/
+Download::  http://rubyforge.org/project/showfiles.php?group_id=50
+GitHub::    git://github.com/jimweirich/rake.git 
+
+== Thanks
+
+As usual, it was input from users that drove a alot of these changes. The
+following people either contributed patches, made suggestions or made
+otherwise helpful comments.  Thanks to ...
+
+* Charles Nutter
+
+-- Jim Weirich
diff --git a/doc/re.rdoc b/doc/re.rdoc
new file mode 100644
index 0000000000..04481268c3
--- /dev/null
+++ b/doc/re.rdoc
@@ -0,0 +1,582 @@
+# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
+
+Regular expressions (<i>regexp</i>s) are patterns which describe the
+contents of a string. They're used for testing whether a string contains a
+given pattern, or extracting the portions that match. They are created
+with the <tt>/</tt><i>pat</i><tt>/</tt> and
+<tt>%r{</tt><i>pat</i><tt>}</tt> literals or the <tt>Regexp.new</tt>
+constructor.
+
+A regexp is usually delimited with forward slashes (<tt>/</tt>). For
+example:
+
+    /hay/ =~ 'haystack'   #=> 0
+    /y/.match('haystack') #=> #<MatchData "y">
+
+If a string contains the pattern it is said to <i>match</i>. A literal
+string matches itself.
+
+    # 'haystack' does not contain the pattern 'needle', so doesn't match.
+    /needle/.match('haystack') #=> nil
+    # 'haystack' does contain the pattern 'hay', so it matches
+    /hay/.match('haystack')    #=> #<MatchData "hay">
+
+Specifically, <tt>/st/</tt> requires that the string contains the letter
+_s_ followed by the letter _t_, so it matches _haystack_, also.
+
+== Metacharacters and Escapes
+
+The following are <i>metacharacters</i> <tt>(</tt>, <tt>)</tt>,
+<tt>[</tt>, <tt>]</tt>, <tt>{</tt>, <tt>}</tt>, <tt>.</tt>, <tt>?</tt>,
+<tt>+</tt>, <tt>*</tt>. They have a specific meaning when appearing in a
+pattern. To match them literally they must be backslash-escaped. To match
+a backslash literally backslash-escape that: <tt>\\\\\\</tt>.
+
+    /1 \+ 2 = 3\?/.match('Does 1 + 2 = 3?') #=> #<MatchData "1 + 2 = 3?">
+
+Patterns behave like double-quoted strings so can contain the same
+backslash escapes.
+
+    /\s\u{6771 4eac 90fd}/.match("Go to 東京都")
+        #=> #<MatchData " 東京都">
+
+Arbitrary Ruby expressions can be embedded into patterns with the
+<tt>#{...}</tt> construct.
+
+    place = "東京都"
+    /#{place}/.match("Go to 東京都")
+        #=> #<MatchData "東京都">
+
+== Character Classes
+
+A <i>character class</i> is delimited with square brackets (<tt>[</tt>,
+<tt>]</tt>) and lists characters that may appear at that point in the
+match. <tt>/[ab]/</tt> means _a_ or _b_, as opposed to <tt>/ab/</tt> which
+means _a_ followed by _b_.
+
+    /W[aeiou]rd/.match("Word") #=> #<MatchData "Word">
+
+Within a character class the hyphen (<tt>-</tt>) is a metacharacter
+denoting an inclusive range of characters. <tt>[abcd]</tt> is equivalent
+to <tt>[a-d]</tt>. A range can be followed by another range, so
+<tt>[abcdwxyz]</tt> is equivalent to <tt>[a-dw-z]</tt>. The order in which
+ranges or individual characters appear inside a character class is
+irrelevant.
+
+    /[0-9a-f]/.match('9f') #=> #<MatchData "9">
+    /[9f]/.match('9f')     #=> #<MatchData "9">
+
+If the first character of a character class is a caret (<tt>^</tt>) the
+class is inverted: it matches any character _except_ those named.
+
+    /[^a-eg-z]/.match('f') #=> #<MatchData "f">
+
+A character class may contain another character class. By itself this
+isn't useful because <tt>[a-z[0-9]]</tt> describes the same set as
+<tt>[a-z0-9]</tt>. However, character classes also support the <tt>&&</tt>
+operator which performs set intersection on its arguments. The two can be
+combined as follows:
+
+    /[a-w&&[^c-g]z]/ # ([a-w] AND ([^c-g] OR z))
+    # This is equivalent to:
+    /[abh-w]/
+
+The following metacharacters also behave like character classes:
+
+* <tt>/./</tt> - Any character except a newline.
+* <tt>/./m</tt> - Any character (the +m+ modifier enables multiline mode)
+* <tt>/\w/</tt> - A word character (<tt>[a-zA-Z0-9_]</tt>)
+* <tt>/\W/</tt> - A non-word character (<tt>[^a-zA-Z0-9_]</tt>)
+* <tt>/\d/</tt> - A digit character (<tt>[0-9]</tt>)
+* <tt>/\D/</tt> - A non-digit character (<tt>[^0-9]</tt>)
+* <tt>/\h/</tt> - A hexdigit character (<tt>[0-9a-fA-F]</tt>)
+* <tt>/\H/</tt> - A non-hexdigit character (<tt>[^0-9a-fA-F]</tt>)
+* <tt>/\s/</tt> - A whitespace character: <tt>/[ \t\r\n\f]/</tt>
+* <tt>/\S/</tt> - A non-whitespace character: <tt>/[^ \t\r\n\f]/</tt>
+
+POSIX <i>bracket expressions</i> are also similar to character classes.
+They provide a portable alternative to the above, with the added benefit
+that they encompass non-ASCII characters. For instance, <tt>/\d/</tt>
+matches only the ASCII decimal digits (0-9); whereas <tt>/[[:digit:]]/</tt>
+matches any character in the Unicode _Nd_ category.
+
+* <tt>/[[:alnum:]]/</tt> - Alphabetic and numeric character
+* <tt>/[[:alpha:]]/</tt> - Alphabetic character
+* <tt>/[[:blank:]]/</tt> - Space or tab
+* <tt>/[[:cntrl:]]/</tt> - Control character
+* <tt>/[[:digit:]]/</tt> - Digit
+* <tt>/[[:graph:]]/</tt> - Non-blank character (excludes spaces, control
+  characters, and similar)
+* <tt>/[[:lower:]]/</tt> - Lowercase alphabetical character
+* <tt>/[[:print:]]/</tt> - Like [:graph:], but includes the space character
+* <tt>/[[:punct:]]/</tt> - Punctuation character
+* <tt>/[[:space:]]/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline,
+   carriage return, etc.)
+* <tt>/[[:upper:]]/</tt> - Uppercase alphabetical
+* <tt>/[[:xdigit:]]/</tt> - Digit allowed in a hexadecimal number (i.e.,
+  0-9a-fA-F)
+
+Ruby also supports the following non-POSIX character classes:
+
+* <tt>/[[:word:]]/</tt> - A character in one of the following Unicode
+  general categories _Letter_, _Mark_, _Number_,
+  <i>Connector_Punctuation<i/i>
+* <tt>/[[:ascii:]]/</tt> - A character in the ASCII character set
+
+    # U+06F2 is "EXTENDED ARABIC-INDIC DIGIT TWO"
+    /[[:digit:]]/.match("\u06F2")    #=> #<MatchData "\u{06F2}">
+    /[[:upper:]][[:lower:]]/.match("Hello") #=> #<MatchData "He">
+    /[[:xdigit:]][[:xdigit:]]/.match("A6")  #=> #<MatchData "A6">
+
+== Repetition
+
+The constructs described so far match a single character. They can be
+followed by a repetition metacharacter to specify how many times they need
+to occur. Such metacharacters are called <i>quantifiers</i>.
+
+* <tt>*</tt> - Zero or more times
+* <tt>+</tt> - One or more times
+* <tt>?</tt> - Zero or one times (optional)
+* <tt>{</tt><i>n</i><tt>}</tt> - Exactly <i>n</i> times
+* <tt>{</tt><i>n</i><tt>,}</tt> - <i>n</i> or more times
+* <tt>{,</tt><i>m</i><tt>}</tt> - <i>m</i> or less times
+* <tt>{</tt><i>n</i><tt>,</tt><i>m</i><tt>}</tt> - At least <i>n</i> and
+  at most <i>m</i> times
+
+    # At least one uppercase character ('H'), at least one lowercase
+    # character ('e'), two 'l' characters, then one 'o'
+    "Hello".match(/[[:upper:]]+[[:lower:]]+l{2}o/) #=> #<MatchData "Hello">
+
+Repetition is <i>greedy</i> by default: as many occurrences as possible
+are matched while still allowing the overall match to succeed. By
+contrast, <i>lazy</i> matching makes the minimal amount of matches
+necessary for overall success. A greedy metacharacter can be made lazy by
+following it with <tt>?</tt>.
+
+    # Both patterns below match the string. The first uses a greedy
+    # quantifier so '.+' matches '<a><b>'; the second uses a lazy
+    # quantifier so '.+?' matches '<a>'.
+    /<.+>/.match("<a><b>")  #=> #<MatchData "<a><b>">
+    /<.+?>/.match("<a><b>") #=> #<MatchData "<a>">
+
+A quantifier followed by <tt>+</tt> matches <i>possessively</i>: once it
+has matched it does not backtrack. They behave like greedy quantifiers,
+but having matched they refuse to "give up" their match even if this
+jeopardises the overall match.
+
+== Capturing
+
+Parentheses can be used for <i>capturing</i>. The text enclosed by the
+<i>n</i><sup>th</sup> group of parentheses can be subsequently referred to
+with <i>n</i>. Within a pattern use the <i>backreference</i>
+<tt>\</tt><i>n</i>; outside of the pattern use
+<tt>MatchData[</tt><i>n</i><tt>]</tt>.
+
+    # 'at' is captured by the first group of parentheses, then referred to
+    # later with \1
+    /[csh](..) [csh]\1 in/.match("The cat sat in the hat")
+        #=> #<MatchData "cat sat in" 1:"at">
+    # Regexp#match returns a MatchData object which makes the captured
+    # text available with its #[] method.
+    /[csh](..) [csh]\1 in/.match("The cat sat in the hat")[1] #=> 'at'
+
+Capture groups can be referred to by name when defined with the
+<tt>(?<</tt><i>name</i><tt>>)</tt> or <tt>(?'</tt><i>name</i><tt>')</tt>
+constructs.
+
+    /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")
+        => #<MatchData "$3.67" dollars:"3" cents:"67">
+    /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")[:dollars] #=> "3"
+
+Named groups can be backreferenced with <tt>\k<</tt><i>name</i><tt>></tt>,
+where _name_ is the group name.
+
+    /(?<vowel>[aeiou]).\k<vowel>.\k<vowel>/.match('ototomy')
+        #=> #<MatchData "ototo" vowel:"o">
+
+*Note*: A regexp can't use named backreferences and numbered
+backreferences simultaneously.
+
+When named capture groups are used with a literal regexp on the left-hand
+side of an expression and the <tt>=~</tt> operator, the captured text is
+also assigned to local variables with corresponding names.
+
+    /\$(?<dollars>\d+)\.(?<cents>\d+)/ =~ "$3.67" #=> 0
+    dollars #=> "3"
+
+== Grouping
+
+Parentheses also <i>group</i> the terms they enclose, allowing them to be
+quantified as one <i>atomic</i> whole.
+
+    # The pattern below matches a vowel followed by 2 word characters:
+    # 'aen'
+    /[aeiou]\w{2}/.match("Caenorhabditis elegans") #=> #<MatchData "aen">
+    # Whereas the following pattern matches a vowel followed by a word
+    # character, twice, i.e. <tt>[aeiou]\w[aeiou]\w</tt>: 'enor'.
+    /([aeiou]\w){2}/.match("Caenorhabditis elegans")
+        #=> #<MatchData "enor" 1:"or">
+
+The <tt>(?:</tt>...<tt>)</tt> construct provides grouping without
+capturing. That is, it combines the terms it contains into an atomic whole
+without creating a backreference. This benefits performance at the slight
+expense of readabilty.
+
+    # The group of parentheses captures 'n' and the second 'ti'. The
+    # second group is referred to later with the backreference \2
+    /I(n)ves(ti)ga\2ons/.match("Investigations")
+        #=> #<MatchData "Investigations" 1:"n" 2:"ti">
+    # The first group of parentheses is now made non-capturing with '?:',
+    # so it still matches 'n', but doesn't create the backreference. Thus,
+    # the backreference \1 now refers to 'ti'.
+    /I(?:n)ves(ti)ga\1ons/.match("Investigations")
+        #=> #<MatchData "Investigations" 1:"ti">
+
+=== Atomic Grouping
+
+Grouping can be made <i>atomic</i> with
+<tt>(?></tt><i>pat</i><tt>)</tt>. This causes the subexpression <i>pat</i>
+to be matched independently of the rest of the expression such that what
+it matches becomes fixed for the remainder of the match, unless the entire
+subexpression must be abandoned and subsequently revisited. In this
+way <i>pat</i> is treated as a non-divisible whole. Atomic grouping is
+typically used to optimise patterns so as to prevent the regular
+expression engine from backtracking needlesly.
+
+    # The <tt>"</tt> in the pattern below matches the first character of
+    # the string, then <tt>.*</tt> matches <i>Quote"</i>. This causes the
+    # overall match to fail, so the text matched by <tt>.*</tt> is
+    # backtracked by one position, which leaves the final character of the
+    # string available to match <tt>"</tt>
+          /".*"/.match('"Quote"')     #=> #<MatchData "\"Quote\"">
+    # If <tt>.*</tt> is grouped atomically, it refuses to backtrack
+    # <i>Quote"</i>, even though this means that the overall match fails
+    /"(?>.*)"/.match('"Quote"') #=> nil
+
+== Subexpression Calls
+
+The <tt>\g<</tt><i>name</i><tt>></tt> syntax matches the previous
+subexpression named _name_, which can be a group name or number, again.
+This differs from backreferences in that it re-executes the group rather
+than simply trying to re-match the same text.
+
+    # Matches a <i>(</i> character and assigns it to the <tt>paren</tt>
+    # group, tries to call that the <tt>paren</tt> sub-expression again
+    # but fails, then matches a literal <i>)</i>.
+    /\A(?<paren>\(\g<paren>*\))*\z/ =~ '()'
+
+
+    /\A(?<paren>\(\g<paren>*\))*\z/ =~ '(())' #=> 0
+    # ^1
+    #      ^2
+    #           ^3
+    #                 ^4
+    #      ^5
+    #           ^6
+    #                      ^7
+    #                       ^8
+    #                       ^9
+    #                           ^10
+
+1.  Matches at the beginning of the string, i.e. before the first
+    character.
+2.  Enters a named capture group called <tt>paren</tt>
+3.  Matches a literal <i>(</i>, the first character in the string
+4.  Calls the <tt>paren</tt> group again, i.e. recurses back to the
+    second step
+5.  Re-enters the <tt>paren</tt> group
+6.  Matches a literal <i>(</i>, the second character in the
+    string
+7.  Try to call <tt>paren</tt> a third time, but fail because
+    doing so would prevent an overall successful match
+8.  Match a literal <i>)</i>, the third character in the string.
+    Marks the end of the second recursive call
+9.  Match a literal <i>)</i>, the fourth character in the string
+10. Match the end of the string
+
+== Alternation
+
+The vertical bar metacharacter (<tt>|</tt>) combines two expressions into
+a single one that matches either of the expressions. Each expression is an
+<i>alternative</i>.
+
+    /\w(and|or)\w/.match("Feliformia") #=> #<MatchData "form" 1:"or">
+    /\w(and|or)\w/.match("furandi")    #=> #<MatchData "randi" 1:"and">
+    /\w(and|or)\w/.match("dissemblance") #=> nil
+
+== Character Properties
+
+The <tt>\p{}</tt> construct matches characters with the named property,
+much like POSIX bracket classes.
+
+* <tt>/\p{Alnum}/</tt> - Alphabetic and numeric character
+* <tt>/\p{Alpha}/</tt> - Alphabetic character
+* <tt>/\p{Blank}/</tt> - Space or tab
+* <tt>/\p{Cntrl}/</tt> - Control character
+* <tt>/\p{Digit}/</tt> - Digit
+* <tt>/\p{Graph}/</tt> - Non-blank character (excludes spaces, control
+  characters, and similar)
+* <tt>/\p{Lower}/</tt> - Lowercase alphabetical character
+* <tt>/\p{Print}/</tt> - Like <tt>\p{Graph}</tt>, but includes the space character
+* <tt>/\p{Punct}/</tt> - Punctuation character
+* <tt>/\p{Space}/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline,
+  carriage return, etc.)
+* <tt>/\p{Upper}/</tt> - Uppercase alphabetical
+* <tt>/\p{XDigit}/</tt> - Digit allowed in a hexadecimal number (i.e., 0-9a-fA-F)
+* <tt>/\p{Word}/</tt> - A member of one of the following Unicode general
+  category <i>Letter</i>, <i>Mark</i>, <i>Number</i>,
+  <i>Connector\_Punctuation</i>
+* <tt>/\p{ASCII}/</tt> - A character in the ASCII character set
+* <tt>/\p{Any}/</tt> - Any Unicode character (including unassigned
+  characters)
+* <tt>/\p{Assigned}/</tt> - An assigned character
+
+A Unicode character's <i>General Category</i> value can also be matched
+with <tt>\p{</tt><i>Ab</i><tt>}</tt> where <i>Ab</i> is the category's
+abbreviation as described below:
+
+* <tt>/\p{L}/</tt> - 'Letter'
+* <tt>/\p{Ll}/</tt> - 'Letter: Lowercase'
+* <tt>/\p{Lm}/</tt> - 'Letter: Mark'
+* <tt>/\p{Lo}/</tt> - 'Letter: Other'
+* <tt>/\p{Lt}/</tt> - 'Letter: Titlecase'
+* <tt>/\p{Lu}/</tt> - 'Letter: Uppercase
+* <tt>/\p{Lo}/</tt> - 'Letter: Other'
+* <tt>/\p{M}/</tt> - 'Mark'
+* <tt>/\p{Mn}/</tt> - 'Mark: Nonspacing'
+* <tt>/\p{Mc}/</tt> - 'Mark: Spacing Combining'
+* <tt>/\p{Me}/</tt> - 'Mark: Enclosing'
+* <tt>/\p{N}/</tt> - 'Number'
+* <tt>/\p{Nd}/</tt> - 'Number: Decimal Digit'
+* <tt>/\p{Nl}/</tt> - 'Number: Letter'
+* <tt>/\p{No}/</tt> - 'Number: Other'
+* <tt>/\p{P}/</tt> - 'Punctuation'
+* <tt>/\p{Pc}/</tt> - 'Punctuation: Connector'
+* <tt>/\p{Pd}/</tt> - 'Punctuation: Dash'
+* <tt>/\p{Ps}/</tt> - 'Punctuation: Open'
+* <tt>/\p{Pe}/</tt> - 'Punctuation: Close'
+* <tt>/\p{Pi}/</tt> - 'Punctuation: Initial Quote'
+* <tt>/\p{Pf}/</tt> - 'Punctuation: Final Quote'
+* <tt>/\p{Po}/</tt> - 'Punctuation: Other'
+* <tt>/\p{S}/</tt> - 'Symbol'
+* <tt>/\p{Sm}/</tt> - 'Symbol: Math'
+* <tt>/\p{Sc}/</tt> - 'Symbol: Currency'
+* <tt>/\p{Sc}/</tt> - 'Symbol: Currency'
+* <tt>/\p{Sk}/</tt> - 'Symbol: Modifier'
+* <tt>/\p{So}/</tt> - 'Symbol: Other'
+* <tt>/\p{Z}/</tt> - 'Separator'
+* <tt>/\p{Zs}/</tt> - 'Separator: Space'
+* <tt>/\p{Zl}/</tt> - 'Separator: Line'
+* <tt>/\p{Zp}/</tt> - 'Separator: Paragraph'
+* <tt>/\p{C}/</tt> - 'Other'
+* <tt>/\p{Cc}/</tt> - 'Other: Control'
+* <tt>/\p{Cf}/</tt> - 'Other: Format'
+* <tt>/\p{Cn}/</tt> - 'Other: Not Assigned'
+* <tt>/\p{Co}/</tt> - 'Other: Private Use'
+* <tt>/\p{Cs}/</tt> - 'Other: Surrogate'
+
+Lastly, <tt>\p{}</tt> matches a character's Unicode <i>script</i>. The
+following scripts are supported: <i>Arabic</i>, <i>Armenian</i>,
+<i>Balinese</i>, <i>Bengali</i>, <i>Bopomofo</i>, <i>Braille</i>,
+<i>Buginese</i>, <i>Buhid</i>, <i>Canadian_Aboriginal</i>, <i>Carian</i>,
+<i>Cham</i>, <i>Cherokee</i>, <i>Common</i>, <i>Coptic</i>,
+<i>Cuneiform</i>, <i>Cypriot</i>, <i>Cyrillic</i>, <i>Deseret</i>,
+<i>Devanagari</i>, <i>Ethiopic</i>, <i>Georgian</i>, <i>Glagolitic</i>,
+<i>Gothic</i>, <i>Greek</i>, <i>Gujarati</i>, <i>Gurmukhi</i>, <i>Han</i>,
+<i>Hangul</i>, <i>Hanunoo</i>, <i>Hebrew</i>, <i>Hiragana</i>,
+<i>Inherited</i>, <i>Kannada</i>, <i>Katakana</i>, <i>Kayah_Li</i>,
+<i>Kharoshthi</i>, <i>Khmer</i>, <i>Lao</i>, <i>Latin</i>, <i>Lepcha</i>,
+<i>Limbu</i>, <i>Linear_B</i>, <i>Lycian</i>, <i>Lydian</i>,
+<i>Malayalam</i>, <i>Mongolian</i>, <i>Myanmar</i>, <i>New_Tai_Lue</i>,
+<i>Nko</i>, <i>Ogham</i>, <i>Ol_Chiki</i>, <i>Old_Italic</i>,
+<i>Old_Persian</i>, <i>Oriya</i>, <i>Osmanya</i>, <i>Phags_Pa</i>,
+<i>Phoenician</i>, <i>Rejang</i>, <i>Runic</i>, <i>Saurashtra</i>,
+<i>Shavian</i>, <i>Sinhala</i>, <i>Sundanese</i>, <i>Syloti_Nagri</i>,
+<i>Syriac</i>, <i>Tagalog</i>, <i>Tagbanwa</i>, <i>Tai_Le</i>,
+<i>Tamil</i>, <i>Telugu</i>, <i>Thaana</i>, <i>Thai</i>, <i>Tibetan</i>,
+<i>Tifinagh</i>, <i>Ugaritic</i>, <i>Vai</i>, and <i>Yi</i>.
+
+    # Unicode codepoint U+06E9 is named "ARABIC PLACE OF SAJDAH" and
+    # belongs to the Arabic script.
+    /\p{Arabic}/.match("\u06E9") #=> #<MatchData "\u06E9">
+
+All character properties can be inverted by prefixing their name with a
+caret (<tt>^</tt>).
+
+    # Letter 'A' is not in the Unicode Ll (Letter; Lowercase) category, so
+    # this match succeeds
+    /\p{^Ll}/.match("A") #=> #<MatchData "A">
+
+== Anchors
+
+Anchors are metacharacter that match the zero-width positions between
+characters, <i>anchoring</i> the match to a specific position.
+
+* <tt>^</tt> - Matches beginning of line
+* <tt>$</tt> - Matches end of line
+* <tt>\A</tt> - Matches beginning of string.
+* <tt>\Z</tt> - Matches end of string. If string ends with a newline,
+  it matches just before newline
+* <tt>\z</tt> - Matches end of string
+* <tt>\G</tt> - Matches point where last match finished
+* <tt>\b</tt> - Matches word boundaries when outside brackets; backspace
+   (0x08) inside brackets
+* <tt>\B</tt> - Matches non-word boundaries
+* <tt>(?=</tt><i>pat</i><tt>)</tt> - <i>Positive lookahead</i> assertion:
+  ensures that the following characters match <i>pat</i>, but doesn't
+  include those characters in the matched text
+* <tt>(?!</tt><i>pat</i><tt>)</tt> - <i>Negative lookahead</i> assertion:
+  ensures that the following characters do not match <i>pat</i>, but
+  doesn't include those characters in the matched text
+* <tt>(?<=</tt><i>pat</i><tt>)</tt> - <i>Positive lookbehind</i>
+  assertion: ensures that the preceding characters match <i>pat</i>, but
+  doesn't include those characters in the matched text
+* <tt>(?<!</tt><i>pat</i><tt>)</tt> - <i>Negative lookbehind</i>
+  assertion: ensures that the preceding characters do not match
+  <i>pat</i>, but doesn't include those characters in the matched text
+
+    # If a pattern isn't anchored it can begin at any point in the string
+    /real/.match("surrealist") #=> #<MatchData "real">
+    # Anchoring the pattern to the beginning of the string forces the
+    # match to start there. 'real' doesn't occur at the beginning of the
+    # string, so now the match fails
+    /\Areal/.match("surrealist") #=> nil
+    # The match below fails because although 'Demand' contains 'and', the
+    pattern does not occur at a word boundary.
+    /\band/.match("Demand")
+    # Whereas in the following example 'and' has been anchored to a
+    # non-word boundary so instead of matching the first 'and' it matches
+    # from the fourth letter of 'demand' instead
+    /\Band.+/.match("Supply and demand curve") #=> #<MatchData "and curve">
+    # The pattern below uses positive lookahead and positive lookbehind to
+    # match text appearing in <b></b> tags without including the tags in the
+    # match
+    /(?<=<b>)\w+(?=<\/b>)/.match("Fortune favours the <b>bold</b>")
+        #=> #<MatchData "bold">
+
+== Options
+
+The end delimiter for a regexp can be followed by one or more single-letter
+options which control how the pattern can match.
+
+* <tt>/pat/i</tt> - Ignore case
+* <tt>/pat/m</tt> - Treat a newline as a character matched by <tt>.</tt>
+* <tt>/pat/x</tt> - Ignore whitespace and comments in the pattern
+* <tt>/pat/o</tt> - Perform <tt>#{}</tt> interpolation only once
+
+<tt>i</tt>, <tt>m</tt>, and <tt>x</tt> can also be applied on the
+subexpression level with the
+<tt>(?</tt><i>on</i><tt>-</tt><i>off</i><tt>)</tt> construct, which
+enables options <i>on</i>, and disables options <i>off</i> for the
+expression enclosed by the parentheses.
+
+    /a(?i:b)c/.match('aBc') #=> #<MatchData "aBc">
+    /a(?i:b)c/.match('abc') #=> #<MatchData "abc">
+
+== Free-Spacing Mode and Comments
+
+As mentioned above, the <tt>x</tt> option enables <i>free-spacing</i>
+mode. Literal white space inside the pattern is ignored, and the
+octothorpe (<tt>#</tt>) character introduces a comment until the end of
+the line. This allows the components of the pattern to be organised in a
+potentially more readable fashion.
+
+    # A contrived pattern to match a number with optional decimal places
+    float_pat = /\A
+        [[:digit:]]+ # 1 or more digits before the decimal point
+        (\.          # Decimal point
+            [[:digit:]]+ # 1 or more digits after the decimal point
+        )? # The decimal point and following digits are optional
+    \Z/x
+    float_pat.match('3.14') #=> #<MatchData "3.14" 1:".14">
+
+*Note*: To match whitespace in an <tt>x</tt> pattern use an escape such as
+<tt>\s</tt> or <tt>\p{Space}</tt>.
+
+Comments can be included in a non-<tt>x</tt> pattern with the
+<tt>(?#</tt><i>comment</i><tt>)</tt> construct, where <i>comment</i> is
+arbitrary text ignored by the regexp engine.
+
+== Encoding
+
+Regular expressions are assumed to use the source encoding. This can be
+overridden with one of the following modifiers.
+
+* <tt>/</tt><i>pat</i><tt>/u</tt> - UTF-8
+* <tt>/</tt><i>pat</i><tt>/e</tt> - EUC-JP
+* <tt>/</tt><i>pat</i><tt>/s</tt> - Windows-31J
+* <tt>/</tt><i>pat</i><tt>/n</tt> - ASCII-8BIT
+
+A regexp can be matched against a string when they either share an
+encoding, or the regexp's encoding is _US-ASCII_ and the string's encoding
+is ASCII-compatible.
+
+If a match between incompatible encodings is attempted an
+<tt>Encoding::CompatibilityError</tt> exception is raised.
+
+The <tt>Regexp#fixed_encoding?</tt> predicate indicates whether the regexp
+has a <i>fixed</i> encoding, that is one incompatible with ASCII. A
+regexp's encoding can be explicitly fixed by supplying
+<tt>Regexp::FIXEDENCODING</tt> as the second argument of
+<tt>Regexp.new</tt>:
+
+    r = Regexp.new("a".force_encoding("iso-8859-1"),Regexp::FIXEDENCODING)
+    r =~"a\u3042"
+       #=> Encoding::CompatibilityError: incompatible encoding regexp match
+            (ISO-8859-1 regexp with UTF-8 string)
+
+== Performance
+
+Certain pathological combinations of constructs can lead to abysmally bad
+performance.
+
+Consider a string of 25 <i>a</i>s, a <i>d</i>, 4 <i>a</i>s, and a
+<i>c</i>.
+
+    s = 'a' * 25 + 'd' 'a' * 4 + 'c'
+        #=> "aaaaaaaaaaaaaaaaaaaaaaaaadadadadac"
+
+The following patterns match instantly as you would expect:
+
+    /(b|a)/ =~ s #=> 0
+    /(b|a+)/ =~ s #=> 0
+    /(b|a+)*\/ =~ s #=> 0
+
+However, the following pattern takes appreciably longer:
+
+    /(b|a+)*c/ =~ s #=> 32
+
+This happens because an atom in the regexp is quantified by both an
+immediate <tt>+</tt> and an enclosing <tt>*</tt> with nothing to
+differentiate which is in control of any particular character. The
+nondeterminism that results produces super-linear performance. (Consult
+<i>Mastering Regular Expressions</i> (3rd ed.), pp 222, by
+<i>Jeffery Friedl</i>, for an in-depth analysis). This particular case
+can be fixed by use of atomic grouping, which prevents the unnecessary
+backtracking:
+
+    (start = Time.now) && /(b|a+)*c/ =~ s && (Time.now - start)
+       #=> 24.702736882
+    (start = Time.now) && /(?>b|a+)*c/ =~ s && (Time.now - start)
+       #=> 0.000166571
+
+A similar case is typified by the following example, which takes
+approximately 60 seconds to execute for me:
+
+    # Match a string of 29 <i>a</i>s against a pattern of 29 optional
+    # <i>a</i>s followed by 29 mandatory <i>a</i>s.
+    Regexp.new('a?' * 29 + 'a' * 29) =~ 'a' * 29
+
+The 29 optional <i>a</i>s match the string, but this prevents the 29
+mandatory <i>a</i>s that follow from matching. Ruby must then backtrack
+repeatedly so as to satisfy as many of the optional matches as it can
+while still matching the mandatory 29. It is plain to us that none of the
+optional matches can succeed, but this fact unfortunately eludes Ruby.
+
+One approach for improving performance is to anchor the match to the
+beginning of the string, thus significantly reducing the amount of
+backtracking needed.
+
+    Regexp.new('\A' 'a?' * 29 + 'a' * 29).match('a' * 29)
+        #=> #<MatchData "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa">
+
diff --git a/doc/rubygems/ChangeLog b/doc/rubygems/ChangeLog
new file mode 100644
index 0000000000..2e67a4c2c5
--- /dev/null
+++ b/doc/rubygems/ChangeLog
@@ -0,0 +1,5689 @@
+# -*- coding: utf-8 -*-
+
+2010-02-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  1.3.6.
+	* test/*:  Windows test fixes
+	* lib/rubygems/remote_fetcher.rb:  Fix same file detection on windows.
+
+2010-02-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/config_file.rb:  Fix use of ConfigFile#api_key= vs
+	  #rubygems_api_key=.  Patch by Nick Quaranto.
+
+2010-02-12  Eric Hodel  <drbrain@segment7.net>
+
+	* Rakefile:  RubyGems doesn't depend on previous RubyGems.
+
+2010-02-11  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  http://rubygems.org is now the default source.
+	* lib/rubygems/dependency.rb:  Only warn once about
+	  #version_requirement
+
+2010-02-09  Eric Hodel  <drbrain@segment7.net>
+
+	* bin/update_rubygems:  Use system, exec more correctly, remove
+	  useless puts.
+	* lib/rubygems/commands/query_command.rb:  List every version when
+	  --prerelease --all is given.
+
+2010-02-08  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/dependency_command.rb:  Support --prerelease.
+	* lib/rubygems/commands/fetch_command.rb:  Support --prerelease.
+	* lib/rubygems/format.rb:  Don't crash on empty files.  Bug #27292 by
+	  Ian Ragsdale.
+	* lib/rubygems/server.rb:  Fix markup.  Bug #27045 by Eric Young.
+	* History.txt:  RubyGems 1.3.6 release notes.
+
+2010-02-07  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb:  Allow prerelease gems to
+	  depend on non-prerelease gems.
+
+2010-02-06  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_gem_commands_specification_command.rb:  Don't enforce YAML
+	  format.  Patch #27791 by Aaron Patterson.
+	* lib/rubygems/version.rb:  Allow captial letters in prerelease
+	  versions.
+	* lib/rubygems/config_file.rb:  Explain format of ~/.gemrc.  Bug
+	  #27698 by J Smith.
+	* lib/rubygems/gem_path_searcher.rb:  Handle nil require_paths.
+	  Patch #27334 by Roger Pack.
+	* lib/rubygems/server.rb:  Handle --bind option.  Patch #27357 by
+	  Bruno Michel.
+	* lib/rubygems/doc_manager:  gem rdoc --overwrite to preserve built
+	  rdoc.  Patch #25982 by Akinori MUSHA.
+	* lib/rubygems/commands/which_command.rb:  Fail if no paths were
+	  found.  Adapted patch #27681 by Caio Chassot.
+	* lib/rubygems/remote_fetcher.rb:  Don't copy if the file is where we
+	  want it.  Patch #27409 by Jakub Šťastný.
+
+2010-02-01  John Barnette  <jbarnette@rubygems.org>
+
+	* lib/rubygems/command*: Add 'gem push' and 'gem owner' for
+	  interacting with modern/Gemcutter sources [Nick Quaranto]
+
+2010-01-18  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_list.rb:  Ignore development dependencies
+	  unless explicitly needed.  Bug #27608 by Roger Pack.
+
+2010-01-12  John Barnette <jbarnette@rubygems.org>
+
+	* Rakefile: Don't add development deps when building the
+	  rubygems-update gem, it borks older versions when they're updating
+	  from a stub index.
+
+2009-12-22  Evan Phoenix  <evan@fallingsnow.net>
+
+	* lib/rubygems/spec_fetcher.rb: Don't bother re-Marshaling the spec
+	  YAML list.
+
+2009-11-04  John Barnette  <jbarnette@rubygems.org>
+
+	* lib/rubygems/timer.rb: Removed. The deprecation sun set in July.
+
+2009-10-14  John Barnette  <jbarnette@rubygems.org>
+
+	* lib/rubygems/dependency.rb: Burndown/cleanup. Refactored code
+	  and tests. Gem::Dependency.version_requirement(s) is deprecated in
+	  favor of Gem::Dependency.requirement.
+
+	* lib/rubygems/requirement.rb: Burndown/cleanup. Refactored code
+	  and tests. See test/support/shortcuts.rb for some new test helpers.
+
+2009-10-13  John Barnette  <jbarnette@rubygems.org>
+
+	* lib/rubygems/local_remote_options.rb: Make --source additive,
+	  not exclusive. If exclusive sources are desired, use
+	  --clear-sources first.
+
+2009-09-29  John Barnette  <jbarnette@rubyforge.org>
+
+	* lib/rubygems/spec_fetcher.rb: Be slightly more robust when faced
+	  with corrupted indexes.
+
+2009-09-03  John Barnette  <jbarnette@rubyforge.org>
+
+	* LOTS: Use "raise" consistently, not "fail".
+
+2009-09-01  John Barnette  <jbarnette@rubyforge.org>
+
+	* lib/rubygems/version.rb: Gem::Version immutability
+	  burndown. Changed canonical internal representation to an
+	  Array. Refactored significant amounts of the internals for
+	  clarity. Breaking change: Gem::Version::Requirement is no longer
+	  available, use Gem::Requirement instead. Breaking change: custom
+	  YAML marshaling is gone. Credit to Yehuda Katz for certain bits of
+	  a related patch.
+	* test/test_gem_dependency.rb: Moved a bunch of tests over from
+	  test_gem_version.rb. Work in progress.
+	* test/test_gem_specification.rb: Removed a failing YAML
+	  test. Many more will be going away shortly.
+	* test/test_gem_version.rb: Significant refactoring for
+	  maintainability and clarity. Moved a ton of poorly-placed tests to
+	  test_gem_dependency.rb for future refactoring.
+
+2009-08-19  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/rubygems.rb: Cleanup of rdoc and file layout.
+	* lib/rubygems/versions.rb: Added Version#spermy_recommendation
+	  and fixed bug in Version::Part#inspect. General cleanup.
+
+2009-07-29  John Barnette <jbarnette@rubyforge.org>
+
+	* lib/rubygems/package/tar_input.rb:  Add Maglev to the list of
+	  implementations with working Zlib. Bug #26790 by Peter McLain.
+
+2009-07-21  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  1.3.5.
+	* lib/rubygems/package.rb:  Remove dangling digest require.  Reported
+	  by Jeremy Kemper.
+
+2009-06-25  Eric Hodel  <drbrain@segment7.net>
+
+	* release_notes/:  Merged into History.txt for Hoe.
+	* lib/rubygems/commands/setup_command.rb:  Streamlined install text.
+
+2009-06-23  Eric Hodel  <drbrain@segment7.net>
+
+	* release_notes/rel_1_3_5.rdoc:  RubyGems 1.3.5 release notes.
+	* lib/rubygems/builder.rb:  Only print out with verbose.
+	* lib/rubygems/package_task.rb:  Only print out with -t.
+
+2009-06-12  Ryan Davis  <ryand@zenspider.com>
+
+	* Rakefile:  Switched to Hoe.
+
+2009-06-10  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems/installer.rb:  --user-install is no longer enabled by
+	  default.
+	* lib/rubygems/source_index.rb:  Fix use of prerelease gems.
+
+2009-06-04  Eric Hodel  <drbrain@segment7.net>
+
+	* util/gem_prelude.rb.template:  Backports from 1.9.
+
+2009-06-03  Eric Hodel  <drbrain@segment7.net>
+
+	* bin/gem:  Support 1.8.6+
+	* lib/rubygems/digest*:  Removed, support dropped for Ruby < 1.8.6
+	* lib/rubygems/installer.rb:  Support env(1) in wrong path, use
+	  /bin/sh if shebang has options.  By Nobu, ruby trunk r22853.
+	* lib/rubygems/config_file.rb:  Switch to stdcall for appdata folder.
+	  [ruby-core:22601].
+	* lib/rubygems.rb:  Use only File::expand_path on 1.9 for home dir.
+	  Don't recklessly create directories.  Simplify RbConfig::datadir
+	  definition.
+
+2009-05-30  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/which_command.rb:  Only print out directory
+	  information to a TTY.
+	* lib/rubygems/rubygems_version.rb:  1.3.4.
+	* doc/release_notes/rel_1_3_4.rdoc:  RubyGems 1.3.4 release notes.
+
+2009-05-28  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/setup_command.rb:  Fix --format-executable
+	  option name.
+	* lib/rubygems/requirement.rb:  Fix typo in #parse.  Bug #26000 by
+	  Mike Gunderloy.
+
+2009-05-21  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Add 'dev' and svn revision for -1 RUBY_PATCHLEVEL
+	  and RUBY_REVISION.
+
+2009-05-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/defaults.rb:  Restore 1.9.1 path behavior.
+	* lib/rubygems/specification.rb:  Fix undefined ivar warning.
+	* lib/rubygems/indexer.rb:  Force loading of builder gem.
+	* test/gemutilities.rb:  Remove gem_prelude code by hand to avoid 1.9
+	  warnings.
+
+2009-05-19  Luis Lavena  <luislavena@gmail.com>
+
+	* test/test_gem_specification.rb: skip symlinks tests on Windows.
+	* test/test_gem_commands_install_command.rb: skip chmod test on
+	  Windows.
+
+2009-05-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*:  Fix 1.9 warnings about circular require.
+
+2009-05-12  Daniel Berger  <djberg96@gmail.com>
+
+	* lib/rubygems/remote_fetcher.rb:  Fixed the download method in the
+	  remote_fetcher.rb file so that it handles local installs on MS
+	  Windows when using explicit paths that aren't on the 'C:' drive.
+	  Bug #25882 by Lars Christensen.
+	* lib/rubygems/commands/update_command.rb:  Replaced deprecated
+	  Gem::SourceIndex method 'search' with 'find_name' in the 'execute'
+	  method.
+
+2009-05-07  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/query_command.rb:  Support prerelease version
+	  listing (--prerelease), list locally installed prereleases.
+	* lib/rubygems/source_info_cache.rb:  Gem::SourceInfoCache is
+	  officially unsupported, maintaining its tests is hard.
+	* lib/rubygems/source_index.rb:  Add #all_gems, fix #remove_spec,
+	  #search to work with it.  Prerelease gems can now be used.
+
+2009-05-04  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 1.3.3.
+	* doc/release_notes/rel_1_3_3.rdoc:  RubyGems 1.3.3 release notes.
+	* lib/rubygems/specification.rb:  Default has_rdoc to true, ignore
+	  its value.
+	* lib/rubygems/doc_manager.rb:  Always generate RDoc regardless of
+	  #has_rdoc?
+	* lib/rubygems.rb:  Raise Gem::LoadError if Kernel#gem fails due to
+	  previously-loaded gem.  Bug reported by Alf Mikula.
+
+2009-05-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/server_command.rb:  Allow port names with
+	  --port.
+	* lib/rubygems/requirement.rb:  Match prerelease versions and ~>
+	  correctly.  Patch #25759 by Yossef Mendelssohn.
+
+2009-05-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Check bindir for executables, not
+	  root.  Bug reported by David Chelimsky.  Remove Time.today, no way
+	  to override it before RubyGems loads.  Bug #25564 by Emanuele
+	  Vicentini.  Raise Gem::Exception for #installation_path when not
+	  installed.  Bug #25741 by Daniel Berger.  Don't error in #validate
+	  when homepage is nil.  Bug #25677 by Mike Burrows.
+	* lib/rubygems/commands/cleanup_command.rb:  Clean up --user-install
+	  gems.  Bug #25516 by Brett Eisenberg.
+	* lib/rubygems/uninstaller.rb:  Uninstall executables from the correct
+	  directory.  Bug #25555 by Brett Eisenberg.
+	* lib/rubygems/server.rb:  Add search that jumps to RDoc.  Patch
+	  #22959 by Vladimir Dobriakov.
+
+2009-05-01  James Tucker  <jftucker@gmail.com>
+
+	* lib/rubygems.rb: Gem.bin_path now escapes paths with spaces.
+
+2009-04-30  Daniel Berger  <djberg96@gmail.com>
+
+	* lib/rubygems/commands/install_command.rb:  Replaced deprecated
+	  Gem::SourceIndex method 'search' with 'find_name' when using
+	  the -t option. Fixes bug # 25632 by Daniel Berger.
+
+2009-04-30  James Tucker  <jftucker@gmail.com>
+
+	* lib/rubygems/ext/rake_builder.rb: Use explicit ruby command loading
+	  rubygems to invoke rake.
+
+2009-04-24  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/specification_command.rb:  Added requesting
+	  single fields from a spec.
+
+2009-04-23  James Tucker  <jftucker@gmail.com>
+
+	* lib/rubygems/ext/configure_builder.rb: Support Gem::Command.build_args.
+
+2009-04-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 1.3.2.
+
+2009-04-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Complain when summary and
+	  description are identical.
+
+2009-04-08  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Strip directories, complain for
+	  non-files in #validate.
+
+2009-04-07  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Implement #initialize_copy.
+	* lib/rubygems/commands/contents_command.rb:  Add --no-prefix and
+	  --all.
+
+2009-04-06  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/defaults.rb:  Don't allow gem to overwrite ruby on
+	  install.  Fixes bug #24958 by Michael Soulier.
+	* doc/release_notes/rel_1_3_2.rdoc:  Preliminary 1.3.2 release notes.
+	* Rakefile:  Trim off some stale code, switch to Manifest.txt, one
+	  step closer to Hoe!
+
+2009-04-06  Daniel Berger  <djberg96@gmail.com>
+
+	* test/test_gem_ext_configure_builder.rb: Better handling for MS
+	  Windows.
+	* test/gemutilities.rb: Added the make_command and vc_windows? helper
+	  methods.
+
+2009-04-03  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/: RDoc improvements.
+
+2009-04-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/setup_command.rb:  Fix --destdir.  Patch
+	  #24970 by Richard Brown.
+
+2009-04-02  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems/version.rb: Documentation of prerelease
+	versions. See http://technomancy.us/123 for details.
+
+2009-03-31  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/spec_fetcher.rb:  If the cached specs file won't load,
+	  refetch.  Bug #24961 by Dylan Stamat.
+	* lib/rubygems/defaults.rb:  Add a sanity check to
+	  Gem.default_exec_format.  Workaround for bug #24958 by Michael
+	  Soulier.
+	* lib/rubygems/commands/setup_command.rb:  Fix confusion with option
+	  names.  Patch #24971 by Richard Brown.
+	* lib/rubygems/specification.rb:  Make #validate complain about
+	  not-files.
+	* lib/gauntlet_rubygems.rb:  For verification of the validator.
+
+2009-03-27  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  RubyGems now loads plugins from rubygems_plugin.rb
+	  in installed gems.  This can be used to add commands (See
+	  Gem::CommandManager) or add install/uninstall hooks (See
+	  Gem::Installer and Gem::Uninstaller).
+	* setup.rb:  Ensure we're in a RubyGems dir when installing.
+
+2009-03-26  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package_task.rb:  Import from Rake's
+	  rake/gempackagetask.rb
+	* Rakefile:  Switched to RDoc::Task from RDoc 2.4.2.
+	* lib/rubygems.rb:  Gem.find_files now returns paths in $LOAD_PATH.
+	* lib/rubygems/commands/sources_command.rb:  Allow sources to be added
+	  behind proxies.  Bug #24785 by Elia Schito.
+
+2009-03-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/install_command.rb:  Fix typo.  Patch #24446
+	  by Luis Parravicini.
+	* lib/rubygems/version.rb:  Handle non-String versions by calling
+	  #to_s.  Patch #24392 by Stephen Bannasch.
+
+2009-03-22  Daniel Berger <djberg96@gmail.com>
+
+	* lib/rubygems/remote_fetcher.rb: Always escape URI's to deal with spaces
+	  and such, regardless of platform.
+	* lib/rubygesm/validator.rb: Use the test-unit gem if installed.
+	  Part of the fix for RF #24261 by Daniel Berger
+	* lib/rubygems/commands/install_command.rb: Explictly require
+	  rubygems/uninstaller.rb if the user wants to bail because of failed
+	  tests.
+	  Part of the fix for RF #24261 by Daniel Berger
+
+2009-03-17  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/query_command.rb:  Make `gem unpack` work with
+	  more than one gem name, fix warning about installation location.
+
+2009-03-16  James Tucker <jftucker@gmail.com>
+
+	* lib/rubygems.rb: Deprecate ConfigMap[:RUBY_INSTALL_NAME]
+	* lib/rubygems/defaults.rb: Gem.default_exec_format to use 
+		ConfigMap[:ruby_install_name].
+		Fixes Bug #24457
+	* util/gem_prelude.rb.template: Fix potential bug in
+	  Gem.default_exec_format when ConfigMap[:BASERUBY] is not 'ruby'.
+
+2009-03-14  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/installer.rb: Cleanup quotes on Windows stub scripts.
+	  Fixes Bug #24039.
+	* lib/rubygems/commands/setup_command.rb: ditto.
+
+2008-03-13  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/uninstall_command.rb:  Add --user-install to
+	  allow uninstallation from ~/.gem.  Bug #23760 by Roger Pack.
+	* lib/rubygems/uninstaller.rb:  Automatically uninstall from
+	  Gem.user_dir.
+	* lib/rubygems/commands/update_command.rb:  Rescue InstallError
+	  and continue.  Bug #19268 by Gabriel Wilkins.
+	* lib/rubygems/doc_manager.rb:  Remove some options from the args list
+	  that RDoc no longer supports.
+
+2008-03-12  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  #description no longer removes
+	  newlines.
+	* lib/rubygems/indexer.rb:  Wrap description in a pre and force-wrap
+	  lines to 78 characters for prettier display.
+	* lib/rubygems/commands/setup_command.rb:  Clarify RubyGems RDoc
+	  installation location.  Bug #22656 by Gian Marco Gherardi.
+
+2008-03-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/query_command.rb:  Add platforms to gem list
+	  -d.
+	* lib/rubygems/commands/setup_command.rb:  Allow setup to run from
+	  read-only location.  Patch #21862 by Luis Herrera.
+	* lib/rubygems/package/tar_input.rb:  Use real File methods.  Bug
+	  #23966 by Mike Furr.
+	* lib/rubygems.rb:  Don't add PATCHLEVEL if it's -1.  Patch #24048 by
+	  Jeremy Kemper.
+	* lib/rubygems/package/tar_input.rb:  Choose security policy
+	  correctly.  Bug #24001 by Mike Furr.
+	* lib/rubygems/remote_fetcher.rb:  Handle local paths with spaces.
+	  Bug #24169 by Ryan Davis.
+	* lib/rubygems/specification.rb:  Removed Gem::Specification::list,
+	  causes leaks.  Bug #23668 by Steve Purcell.
+
+2008-03-07  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Use Gem::bin_path in executable stubs to
+	  work around Kernel#load bug.
+	* lib/rubygems/commands/install_command.rb:  Copy user_install down to
+	  Gem::DependencyInstaller.  Patch #23573 by Alf Mikula.
+	* lib/rubygems/command.rb:  Add info on gem server directly to `gem
+	  help`.  Patch #22271 by Hugh Sasse.
+
+2008-03-06  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Don't allow FIXME in specs.
+	* lib/rubygems/commands/spec_command.rb:  Add --ruby and --marshal
+	  formats.
+	* lib/rubygems.rb:  Add Gem::bin_path.  Patch #24114 by James Tucker.
+
+2008-03-04  Eric Hodel  <drbrain@segment7.net>
+
+	* setup.rb:  Moved guts to lib/rubygems/commands/setup_command.rb.
+	* lib/rubygems/indexer.rb:  Added RSS feed generation on full index
+	  update.
+
+2008-03-04  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/*: Prerelease gems go into their own index now and are excluded
+	from other indices. InstallCommand only gets prereleases if explicitly
+	requested. Thanks to Alex Vollmer.
+
+2008-03-04  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/*: Add lots of pretty pretty_print stuff!
+
+2008-02-25  Ryan Davis  <ryand@zenspider.com>
+
+	* lib/rubygems/commands/check_command.rb:  Fix various usability
+	  issues.
+
+2009-02-10  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/specification: Refactored and fixed the installation_path
+	method. It was overwrought and it now no longer uses File::SEPARATOR
+	explicitly.
+	[RubyForge: bug #23879 by Daniel Berger]
+
+2009-02-10  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/validator.rb: The Gem::Validator#verify_gem_file method
+	now explicitly rescues Errno::EINVAL as well as Errno::ENOENT because
+	MS Windows raises a different SystemCallError for empty paths.
+	
+2009-01-21  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/remote_fetcher.rb: Split out nil and file handling in
+	the download method. Modified file URI handling to work properly.
+	[RubyForge: bug #16495 by Paul Sadauskas]
+	
+2009-01-19  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/remote_fetcher.rb: Added uri scheme validation back
+	into the open_uri_or_path method, though it now accepts 'https' and
+	'file' as well.
+	* test/test_gem_remote_fetcher.rb: Updated the test_fetch_size_bad_uri
+	to reflect the updated error message.
+
+2009-01-15  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/remote_fetcher.rb: Removed the open_file_uri_path method
+	since the URI#path method already does the same thing, and changed
+	the file_uri? method so that it explicitly calls .to_s.
+	* lib/rubygems/local_remote_options.rb: Allow file urls.
+
+2009-01-15  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/commands/generate_index_command.rb: Fixed a typo in
+	the description.
+	* test/test_gem_doc_manager.rb: The test_uninstall_doc_unwritable
+	test is now skipped on Windows.
+	* test/test_gem_install_update_options.rb: The
+	test_user_install_disabled_read_only test is now skipped on Windows.
+	* test/test_gem_installer.rb: The test_generate_bin_symlink_no_perms
+	and test_generate_bin_script_no_perms tests are now skipped on Windows.
+
+2009-01-14  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/specification.rb: Added support for a license attribute.
+	[RubyForge: feature #11041 (partial) by Kevin Williams]
+	* lib/rubygems/commands/query_command.rb: Gem detail information now
+	includes license information.
+	* test/test_gem_specification.rb: Added tests for the license attribute.
+
+2009-01-05  Chad Woolley <thewoolleyman@gmail.com>
+
+	* move processing of build args out of gem binary so they are handled correctly via API usage.
+	* lib/rubygems/command.rb: Add class accessor for build_args.
+	* lib/rubygems/ext/rake_builder.rb: Use Gem::Command.build_args instead of ARGV.
+	* lib/rubygems/ext/ext_conf_builder.rb: Use Gem::Command.build_args instead of ARGV.
+	* lib/rubygems/gem_runner.rb: Move build arg processing from gem binary.
+	* lib/rubygems/commands/contents_command.rb: Use nonzero return code (required to make tests pass).
+	* bin/gem: Move build arg processing to gem_runner.rb.
+	[RubyForge: bug #23210]
+
+	* lib/rubygems/config_file.rb:  Fix --config-file option with no
+	equals and subsequent options to properly assign config file.
+	Previously config file was overwritten by subsequent option.
+	Fixes bug #16688.
+
+2009-1-4  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/installer.rb: Remove existing path if it already
+	exists before installing.
+	[RubyForge: patch #22837 by Eric Wong]
+	* lib/rubygems.rb: Minor modification to the location_of_caller
+	method - deal with possible characters after line number
+
+2009-1-3  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems.rb: Better activation error message.
+	[RubyForge: patch #23082 by Tim Carey-Smith]
+
+2009-1-2  Daniel Berger <djberg96@gmail.com>
+	* lib/rubygems/ext/rake_builder.rb: Quote path if it contains spaces
+	[RubyForge: patch #23003 by Charlie Savage]
+	* lib/rubygems/local_remote_options.rb: Ignore duplicate sources
+	[RubyForge: bug #22277 by Elliot Temple]
+	* lib/rubygems/remote_fetcher.rb: Automatically normalize the URI
+	[RubyForge: bug #22151 by Alex Legler]
+	* lib/rubygems/specification.rb: Ensure that specification_version is
+	a Fixnum [RubyForge: bug #22598 by Tsutomu Kuroda]
+	* lib/rubygems/specification.rb: Bumped the CURRENT_SPECIFICATION_VERSION
+	and added an entry to the SPECIFICATION_VERSION_HISTORY
+
+2009-1-1  Daniel Berger <djberg96@gmail.com>
+
+	* test/test_gem_dependency.rb: Removed a duplicate "def dep" that
+	was causing a warning.
+	* lib/rubygems/platform.rb: Added an empty? method in order to
+	better handle gem indexing when dealing with gems created
+	prior to 0.9.5. [Rubyforge: bug #22603 by Johnathan Conley]
+	* lib/rubygems.rb: Added an explicit 'require "etc"'.
+	[RubyForge: bug #22313 by Matthew Boedicker]
+
+2008-12-31  Daniel Berger <djberg96@gmail.com>
+
+	* lib/rubygems/local_remote_options: Allow 'https' as a valid scheme
+	in addition to 'http' [RubyForge: patch #22485 by Duarte Henriques] 
+	* setup.rb: Deal with extraneous quotation mark when autogenerating
+	.bat file on MS Windows [RubyForge: bug #22712 Takayuki Ishikawa]
+	* lib/rubygems/commands/unpack_command.rb: Fixed the --target option
+	[RubyForge: patch #22532 by Bryan Ash]
+
+2008-12-30  Daniel Berger <djberg96@gmail.com>
+
+	* lib/rubygems/builder.rb: Don't allow .gem file to be added back
+	onto itself [RubyForge: bug #19136, patch #23346 by Daniel Berger]
+	* lib/rubygems/defaults.rb: The default_path now only returns the
+	default_dir if the Gem.user_home doesn't exist
+	[RubyForge: bug #23037 by Pierre PLR]
+	* lib/rubygems.rb: Handle the possibility that Etc.getpwuid might
+	return nil on platforms other than Windows
+	[RubyForge: bug #22764 by Dudley Flanders]
+
+2008-12-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/doc_manager.rb:  Set title for generated documentation.
+	* lib/rubygems/dependency.rb:  Make #=~ work with Gem::Specification.
+
+2008-12-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Fix documentation for
+	Gem::Installer#write_spec.  Issue by okkez.
+
+2008-12-12  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/local_remote_options.rb:  Merge documentation fix by
+	okkez [ruby-dev:37271].
+	* lib/rubygems/source_info_cache_entry.rb:  Merge documentation fix
+	from [ruby-dev:37255].
+
+2008-12-08  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Add Gem::promote_load_path
+
+2008-12-01  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/rubygems/remote_fetcher.rb: made threadsafe.
+
+2008-11-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/install_command.rb:  Don't do any post-install
+	stuff if no gems were installed.  Issue by Daniel Berger.
+
+2008-11-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb:  Read the file outside the exception
+	block so we raise a sane error.
+	* lib/rubygems/indexer.rb:  Allow the modern index to be updated
+	incrementally.  Allow the legacy and modern indicies to be updated
+	separately.
+
+2008-11-17  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer.rb:  Added ability to only generate modern or
+	legacy indicies.
+
+2008-11-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/timer.rb:  Deprecate and move methods to Gem and
+	Gem::StreamUI.
+
+2008-11-11  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems/, test/: Make Version understand prerelease
+	versions using letters. (eg. '1.2.1.b') Thanks to Josh Susser and
+	Alex Vollmer.
+
+2008-11-03  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Gem name must be a String.
+
+2008-10-31  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/defaults.rb:  Update to support 1.9 libdir.
+	* util/gem_prelude.rb:  Move to .template, automatically fold in
+	defaults.
+
+2008-10-29  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Handle nonexistent home directory.  Bug #22229 by
+	Alexey Verkhovsky.
+
+2008-10-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb, lib/rubygems/custom_require.rb:  Make kernel
+	methods private.  Patch #20801 by James M. Lawrence.  Expose
+	our kernel extensions to RDoc.  Make Gem::location_of_caller behave on
+	Windows.  Patch by Daniel Berger.
+	* doc/release_notes/rel_1_3_1.rdoc:  Final release notes for 1.3.1.
+	* lib/rubygems/rubygems_version.rb:  1.3.1.
+
+2008-10-10  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/unpack_command.rb:  Silence PATH warning.
+
+2008-10-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Fix requires for inflate, deflate, etc.
+	* test/*:  Convert to minitest/unit.
+	* lib/rubygems/validator.rb:  Fix for MiniTest instead of test/unit
+	classic in 1.9.
+
+2008-10-03  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems.rb: Make Gem.dir respect :gemhome value from config.
+	* lib/rubygems/config_file.rb: Expose :gemhome value.
+
+2008-09-26  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems.rb:  Disregard ownership of ~ under Windows while
+	creating ~/.gem.  Fixes issues related to no uid support under
+	Windows.
+
+2008-09-24  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/release_notes/rel_1_3_0.rdoc:  Final release notes for 1.3.0.
+	* lib/rubygems/rubygems_version.rb:  1.3.0.
+	* lib/rubygems/builder.rb:  Examine process status correctly.  Patch
+	  by Nobu.
+	* test/test_gem_ext_rake_builder.rb:  Override Gem.ruby and
+	  ENV['rake'] for 1.9 integration.  Patch by Nobu.
+
+2008-09-16  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems.rb: Use the path set in the config file if
+	applicable.
+	* lib/rubygems/config_file.rb: Expose the path.
+
+2008-09-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Only create ~/.gem by user owning ~.  Bug #21561
+	by Neil Wilson.
+
+2008-09-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb:  Autoload SpecFetcher to improve load
+	time.  Patch #21577 by Simon Chiang.
+	* lib/rubygems/commands/lock_command.rb:  Modernize.  Fix --strict.
+	Patch #21814 by Sven Engelhardt.
+	* lib/rubygems/platform.rb:  Fix for solaris platform.  Patch #21911
+	by Bob Remeika.
+
+2008-09-10  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/install_command.rb:  Describe _version_ in `gem
+	help install`.
+	* lib/rubygems/commands/environment_command.rb:  Describe environment
+	variables and gemrc in `gem help env`.
+	* lib/rubygems.rb:  Warn when executing Gem::manage_gems.
+	* lib/rubygems/doc_manager.rb:  Have RubyGems update the ri cache.
+	* lib/rubygems/source_index.rb:  Ensure specs are read as UTF-8.
+	* lib/rubygems/specification.rb:  Add magic comment to .gemspec files
+	so they are read in as UTF-8.
+
+2008-08-22  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems.rb: Corrected usage of HOMEDRIVE and HOMEPATH on Windows.
+	Escape Gem.ruby if spaces in the path are present. Solves bug related to
+	extensions compile process.
+	* test/test_gem.rb: Added test to verify both conditions.
+
+2008-08-17  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/release_notes/rel_1_3_0.rdoc:  Initial release notes for 1.3.0.
+	* util/CL2notes:  Release note creation helper script.
+
+2008-08-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/local_remote_options.rb:  Added #both? to complement
+	  #local? and #remote?.
+	* lib/rubygems/commands/query_command.rb:  Print out LOCAL/REMOTE with
+	--both, even without a TTY.
+	* lib/rubygems.rb:  Add Gem.find_files, allows a gem to discover
+	features provided by other gems.
+
+2008-08-14  Wilson Bilkovich  <wilson@supremetyrant.com>
+
+	* lib/rubygems/source_index.rb: Deprecate options to 'search' other than
+	Gem::Dependency instances and issue warning until November 2008.
+	* lib/rubygems/platform.rb:	Remove deprecated constant warnings
+	and really deprecate them.
+	* Rakefile: If the SETUP_OPTIONS environment variable is set, pass its
+	contents as arguments to setup.rb
+	* test/test_gem_commands_uninstall_command.rb: Added
+
+2008-08-13  Wilson Bilkovich  <wilson@supremetyrant.com>
+
+	* lib/rubygems/uninstaller.rb:	Fix binary script uninstallation.
+	Bug #21234 by Neil Wilson.
+	* test/test_gem_commands_uninstall_command.rb: Added
+
+2008-08-12  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Try to create directory before diverting
+	to ~/.gems.
+	* lib/rubygems/uninstaller.rb:  Fix uninstallation with -i.  Bug
+	#20812 by John Clayton.  Have #remove_all call #uninstall_gem so hooks
+	get called.  Bug #21242 by Neil Wilson.
+	* lib/rubygems/commands/update_command.rb:  Fix updating RubyGems when
+	no previous rubygems-update is installed.  Bug #20775 by Hemant Kumar.
+
+2008-08-11  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb:  Fix HTTPS support.  Patch #21072 by
+	Alex Arnell.  Fix Not Modified handling.  Bug #21310 by Gordon
+	Thiesfeld.
+
+2008-07-11  Luis Lavena  <luislavena@gmail.com>
+
+	* setup.rb: Properly build --destdir folder structure using Pathname.
+	* test/mockgemui.rb: Fix warnings about instance variables in a module.
+
+2008-07-02  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems/defaults.rb: Add Gem.user_dir to use paths like
+	~/.gem/ruby/1.8/gems and the like instead of just ~/.gem. Update
+	remote fetcher and installer to use it.
+
+2008-07-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Add #gem_home, #bin_dir for hooks.  Use
+	DependencyInstaller's source_index so reinstallation via -i does not
+	fail.
+	* lib/rubygems/uninstaller.rb:  Add #gem_home, #bin_dir for hooks.
+	* lib/rubygems/commands/query_command.rb:  Don't print LOCAL/REMOTE
+	gems if stdout is not a TTY.
+	* lib/rubygems/commands/query_command.rb:  Use the regexp we already
+	have for `gem list --installed`.  Bug #20876 by Nick Hoffman.
+	* lib/rubygems/commands/which_command.rb:  Clarify what `gem which` is
+	for.
+
+2008-06-30  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_ext_configure_builder.rb:  Locale-free patch by Yusuke
+	Endoh [ruby-core:17444].
+	* lib/rubygems.rb:  Add pre/post (un)install hooks.
+	* lib/rubygems/installer.rb:  Call pre/post install hooks as
+	appropriate.
+	* lib/rubygems/uninstaller.rb:  Call pre/post uninstall hooks as
+	appropriate.  Minor refactoring of #uninstall.
+	* lib/rubygems/package/tar_reader.rb:  Some OSs raise EINVAL on seek.
+	Based on patch in bug #20791 by Neil Wilson.
+	* lib/rubygems/specification.rb:  Correctly check for support of
+	development dependencies for #to_ruby.  Bug #20778 by Evan Weaver.
+	* lib/rubygems/spec_fetcher.rb:  Correctly load all cache file even if
+	latest has been loaded.  Bug #20776 by Uwe Kubosch.
+
+2008-06-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/config_file.rb:  Add Gem::ConfigFile constants for
+	packagers and implementors to override defaults.
+	* test/*:  Fixes to run tests when under test/rubygems/.  Patch by
+	Yusuke ENDOH [ruby-core:17353].
+
+2008-06-24  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb:  Cleanup to support
+	if-modified-since requests.  pair: Ryan Davis
+	* lib/rubygems/indexer:  Force platform to Gem::Platform::RUBY when
+	nil or blank.  Fixes various uninstallable gems.
+
+2008-06-24  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems/installer.rb: Fall back on ~/.gem if GEM_HOME is
+	not writable.
+	* lib/rubygems/install_update_options.rb: Allow --user-install or
+	--no-user-install command-line switch to explicitly force whether
+	or not ~/.gem should be used.
+	* lib/rubygems/remote_fetcher.rb: Use ~/.gem/cache if cache dir is
+	not writable.
+	* test/gemutilities.rb: Use MockGemUi for all tests.
+
+2008-06-21  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Load specifications from the future.
+	Roll back specification version change.
+	* lib/rubygems/remote_fetcher.rb:  Reset connection when an HTTP
+	server misbehaves.
+	* setup.rb:  Fix --destdir for windows.
+	* doc/release_notes/rel_1_2_0.rdoc:  Bugs in RubyGems were
+	unintentionally added, order bug fixes by importance.
+	* lib/rubygems/rubygems_version.rb:  1.2.0.
+
+2008-06-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/uninstaller.rb:  Improve output when a gem to uninstall
+	isn't found.  Bug #20746 reported by Chad Wooley.
+	* setup.rb:  Fix rdoc installation with --destdir.  Patch #20739 by
+	Matthew Kent.
+	* lib/rubygems/commands/install_command.rb:  Don't reset GEM_PATH when
+	installing.  Fixes Bug #20746 by Chad Wooley.
+
+2008-06-20  Luis Lavena  <luislavena@gmail.com>
+
+	* setup.rb: Only prepend install_destdir when especified. Fixes
+	installation issues related to Windows paths (/C:/...)
+
+2008-06-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb:  Ensure that the entire
+	dependency chain is installed.  Fixes bug reported by Chad Woolley.
+
+2008-06-18  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/dependency_command.rb:  Restore matching
+	everything when no name is specified, regexp matching.  Fixes bug
+	#20716, bug #20717 by Chad Woolley.
+
+2008-06-18  Chad Woolley  <thewoolleyman@gmail.com>
+
+	* lib/rubygems/config_file.rb:  Fix --config-file option with no
+	equals and subsequent options to properly assign config file.
+	Previously config file was overwritten by subsequent option.
+	Fixes bug #16688.
+
+2008-06-17  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/version.rb:  Gem::Version #hash and #eql? now operate
+	on the version string, terms of the version string, so "1" and "1.0"
+	no longer correspond to the same slot.  Fixes indexer bug reported by
+	Chad Woolley.
+	* setup.rb:  Fix --format-executable.  Patch #20698 by Richard Brown.
+	* util/gem_prelude.rb:  Prevent infinite recursion, check for Gem now.
+	Patch from ruby trunk by nobu.
+	* lib/*:  Spelling cleanup.  Patch from trunk by Evan Farrar.
+	* test/*:  Fixes for win32 test failures reported by Luis Lavena.
+	* util/gem_prelude.rb:  Only remove methods added by gem_prelude.rb.
+
+2008-06-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer.rb:  Fix quick_index generation.
+	* lib/rubygems/specification.rb:  Correctly guard new spec features
+	for older RubyGems.
+	* lib/rubygems/config_file.rb:  Add system-wide config file
+	(/etc/gemrc).  Patch #14723 by Phil Hagelberg.  Add windows code to
+	use appropriate directory.  Code by Daniel Berger.
+	* doc/release_notes/rel_1_2_0.rdoc:  Draft of 1.2.0 release notes.
+
+2008-06-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/server.rb:  Store off if we are returning Marshal
+	format before running =~ again.  Fixes bug reported by Chad Woolley.
+	* lib/rubygems/commands/stale_command.rb:  `gem stale` lists gems by
+	last access time.  Patch #20593 by Aaron Patterson.
+	* lib/rubygems/setup.rb:  Add --vendor and --destdir to setup.rb for
+	packagers.  Patch #20610 by Richard Brown.  Don't look for stub
+	files to remove any more.
+	* lib/rubygems/specification.rb:  Bump specification version and be
+	backwards compatible with type 2 specs.
+	* lib/rubygems/commands/query_command.rb:  Add installed location to
+	details for installed gems.
+
+2008-06-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb:  Only install all dependencies
+	when install_dir option is set.  Don't include satisfied dependencies
+	when gathering dependencies.
+	* lib/rubygems/commands/query_command.rb:  Display authors, rubyforge
+	and homepage urls with details.
+	* lib/rubygems/commands/environment_command.rb:  Add executable
+	directory (from Rubinius).
+	* lib/rubygems/commands/install_command.rb:  Don't set install_dir by
+	default.
+	* lib/rubygems/commands/update_command.rb:  Don't set install_dir by
+	default.  Use #find_missing for efficiency.
+
+2008-06-07  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/server.rb:  Fully mirror Gem::Indexer indexes, set
+	correct content-type headers, always refresh the source index.
+	* lib/rubygems/source_index.rb:  Add spec_dirs so that #refresh! will
+	always reload from the same locations.  #refresh! on manually-built
+	SourceIndex now raises.  Fixes #20509 by Chad Woolley.
+
+2008-06-06  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Remove previous bin_script_path in case
+	it is a symlink.
+	* lib/rubygems/commands/pristine_command.rb:  Force reinstallation of
+	the gem using the installer.  Fixes bug #20387 by Erik Persson.
+	* lib/rubygems/doc_manager.rb:  Ensure args to RDoc are all strings.
+	* lib/rubygems/source_index.rb:  Use find_matching to discover updated
+	specs instead of fetch.
+	* lib/rubygems/commands/query_command.rb:  Platform, not name in spec
+	tuples.
+
+2008-06-05  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/local_remote_options.rb:  Ensure remote repository URLs
+	reference directories.  Fixes bug #20134 by Neil Wilson.
+	* lib/rubygems/source_index.rb:  Gracefully handle ^C or explicit exit
+	while loading .gemspec files from disk.  Fixes bug #20523 by Joel
+	VanderWerf.
+	* lib/rubygems/specification.rb:  Use File#expand_path in
+	installation_path.  Fixes bug #19317 by Hemant Kumar.
+	* lib/rubygems/spec_fetcher.rb:  Fix legacy test against URI.
+	* lib/rubygems/remote_fetcher.rb:  Always raise FetchError from
+	RemoteFetcher.  Fix FetchErrors without URIs.  Refactor Net::HTTP
+	request code to use persistent connections for HEAD requests.  Feature
+	Request #7973 by Christian Schachtzabel.
+	* lib/rubygems.rb:  Don't load custom_require until after the OS and
+	implementation have had a chance to set paths.
+
+2008-06-04  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/source_index.rb:  Only fetch specs we need in
+	#outdated.
+	* lib/rubygems.rb:  Fix typo in ::activate exception.
+	* lib/rubygems/dependency.rb:  For #to_s, display dependency type when
+	nil.
+	* lib/rubygems/dependency_installer.rb:  Reset #installed_gems for
+	every #install.  Fixes bug #19444 by Glenn Rempe.
+	* lib/rubygems/installer.rb:  Don't re-read the disk to check for new
+	gems, add them by hand on install.
+
+2008-06-03  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Add ::gzip, ::gunzip, ::deflate and ::inflate.
+	* lib/rubygems/server.rb:  Add specs and latest_specs indicies.
+	* setup.rb:  Don't require rdoc until needed.  Patch #20414 by Brian
+	Candler.
+	* lib/uninstaller.rb:  Correctly uninstall gems installed with a
+	legacy platform.  Patch #19877 by Luis Lavena.
+	* lib/rubygems/commands/update_command.rb:  Only fetch remote specs
+	when we know what we're looking for.
+
+2008-06-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Remove double slash in
+	#installation_path.  Fixes bug #19896 by Heiko Seebach.
+	* lib/rubygems/remote_fetcher.rb:  Require StringIO.  Fixes bug #19866
+	by Caleb Land.
+	* lib/rubygems.rb:  Require rubygems/defaults/#{RBX_ENGINE}.rb and
+	rubygem/defaults/operating_system.rb if they exist.  (OS require comes
+	first and may be overridden by operating system.)
+
+2008-06-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer.rb:  Ensure identical names, versions and
+	platforms are identical for a smaller index.
+	* lib/rubygems/spec_fetcher.rb:  Only write to cache when we own it.
+	* lib/rubygems.rb:  Honor default_path if GEM_PATH environment
+	variable is not set.  Patch #19502 by Donavan Pantke.
+	* lib/rubygems/installer.rb:  Set file mode indicated by tar file.
+	Patch #19737 by Jason Roelofs.
+
+2008-06-01  John Barnette <jbarnette@rubyforge.org>
+
+	* lib/rubygems.rb: Add Gem.available?(gem, *specs) for easy availability
+	checks at runtime.
+
+2008-05-31  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/dependency_command.rb:  Delay fetching specs
+	until needed.  Reverse dependencies can no longer be calculated for
+	remote sources.  Add backwards compatibility.
+	* lib/rubygems/commands/fetch_command.rb:  Add backwards
+	compatibility.
+
+2008-05-30  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/local_remote_options.rb:  --sources option should not
+	add URIs to Gem.sources.
+	* lib/rubygems/spec_fetcher.rb:  Add #warn_legacy to help handling
+	legacy sources.
+	* luby/rubygems/commands/query_command.rb:  Add backwards
+	compatibility with legacy sources.
+
+2008-05-28  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb:  Add #uri to
+	Gem::RemoteFetcher::FetchError.
+	* lib/rubygems/user_interaction.rb:  Improve RDoc slightly.
+	* lib/rubygems/spec_fetcher.rb:  Introduce backwards compatibility for
+	legacy (pre 1.2) repositories
+	* lib/rubygems/commands/sources_command.rb:  Backwards compatibility
+	and restoration of --update.
+	* lib/rubygems/specification.rb:  Ensure nil-typed dependencies become
+	runtime dependencies.
+
+2008-05-27  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/spec_fetcher.rb:  Switch #fetch, #find_matching to be
+	compatible with Gem::SourceInfoCache#search_with_source.  Add caching
+	for .gemspec files.
+	* lib/rubygems/dependency_installer.rb:  Switch to SpecFetcher.
+	* lib/rubygems/source_index.rb:  Switch #outdated to use SpecFetcher.
+	* lib/rubygems/commands/dependency_command.rb:  Switch to SpecFetcher.
+	* lib/rubygems/commands/outdated_command.rb:  Switch to SpecFetcher.
+	* lib/rubygems/commands/query_command.rb:  Switch to SpecFetcher.
+	* lib/rubygems/commands/sources_command.rb:  Switch to SpecFetcher.
+	* lib/rubygems/commands/update_command.rb:  Switch to SpecFetcher.
+	* lib/rubygems/version.rb:  Handle comparisons with non-Gem::Version
+	objects.
+
+2008-05-13  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/spec_fetcher.rb:  Add caching of specs, latest_specs
+	files.
+	* test/gemutilities.rb:  Ensure Gem.user_home doesn't point to ~.
+
+2008-05-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer.rb:  Add Marshal format index of spec names,
+	versions and platforms.  WIP.
+	* lib/rubygems/spec_fetcher.rb:  WIP for replacement of
+	Gem::SourceInfoCache and SourceInfoCacheEntry.
+	* lib/rubygems/dependency.rb:  Add #=~.
+
+2008-05-07 John Barnette <jbarnette@gmail.com>
+
+	* lib/rubygems/specification.rb, et. al: Let gems have development
+	dependencies, which aren't installed (except when --development is
+	supplied) or activated.
+
+2008-05-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer.rb:  Refactored into simpler more imperative
+	code.
+	* lib/rubygems.rb:  Leave rbconfig/datadir.rb for non-RubyGems use.
+
+2008-04-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/server.rb:  Refresh the source index per request so new
+	gems will be found after server startup.
+
+2008-04-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb:  Only print out "Bulk updating" when
+	verbose, fix #latest_specs documentation.
+	* lib/rubygems/dependency_installer.rb:  Add :cache_dir option for
+	Tinderbox.
+
+2008-04-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/test_utilities.rb:  Expose some internal testing
+	utilities that are of general use.
+
+2008-04-10  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Fix Gem.prefix so it reports nil when rubygems.rb
+	is in sitelibdir, libdir, or doesn't have 'lib' as a parent directory.
+	* doc/release_notes/rel_1_1_1.rdoc:  RubyGems 1.1.1 release notes.
+	* lib/rubygems/rubygems_version.rb:  1.1.1.
+
+2008-04-07  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/server.rb:  Fix fragment URIs.  Patch by James Tucker.
+	* lib/rubygems/commands/update_command.rb:  Pass
+	--no-format-executable to setup.rb.  Patch by Stephen Bannasch.
+
+2008-04-06  Chad Woolley  <thewoolleyman@gmail.com>
+
+	* lib/rubygems.rb:  Add setter Gems.platforms=, to allow platforms
+	to be set/reset when invoking or testing RubyGems programatically.
+	Also force Gems.platforms to automatically reset to default of
+	[Gem::Platform::RUBY, Gem::Platform.local] if cleared.
+	* lib/rubygems/version_option.rb:  Change add_platform_option
+	to initialize Gem.platforms to contain only Gem::Platform::RUBY
+
+2008-04-04  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb:  Make Gem::SourceIndex#refresh!
+	more-correct.  Reported by Paul Haddad.
+	* lib/rubygems.rb:  Add Gem::refresh.  Bug #19176 by Hongli Lai.
+	* lib/rubygems/dependency_installer.rb:  Put downloaded gems into
+	install_dir's cache.  Patch #19182 by Richard Brown.
+
+2008-04-03  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache.rb:  Merge full cache file into
+	latest data.  Don't write cache files when checking for them.  Only
+	update full cache file when we've read it.  Refresh all data when
+	loading all data.
+	* lib/rubygems/dependency_installer.rb:  Fix --force to work without
+	network for dependent gems.  Fix all-fetching test.
+	* lib/rubygems/commands/query_command.rb:  Obey --all flag for gem
+	query.
+	* lib/rubygems/commands/environment_command.rb:  Don't display
+	RubyGemsPackageVersion.
+	* lib/rubygems/indexer.rb:  Fix typo.  Patch by Tom Copeland.
+	* lib/rubygems/command_manager.rb:  Display RubyGemsVersion with
+	--version.
+	* lib/rubygems/commands/pristine_command.rb:  Rebuild extensions along
+	with everything else.  Patch #19281 by Dr. Nic Williams.
+
+2008-04-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Fix prefix to point to directory above RubyGems,
+	so RubyGems will be installed into lib/.
+	* setup.rb:  Work around apple's libdir-installed RubyGems, by
+	installing into sitelibdir.
+	* Rakefile:  Add svnversion to RubyGems version number for `rake
+	install`.
+
+2008-03-31  Luis Lavena  <luislavena@gmail.com>
+
+	* test/: Allow tests to use a random (but controlled) port number
+	instead of a hardcoded one. This helps CI tools when running
+	parallels builds.
+
+2008-03-30  Luis Lavena  <luislavena@gmail.com>
+
+	* test/test_gem.rb: Leave APPLE_GEM_HOME tests only to *nixes.
+	* lib/rubygems/remote_fetcher.rb: Errno::ECONNABORTED raised on Windows
+	on closed Keep-Alive connections.
+
+2008-03-29  Eric Hodel  <drbrain@segment7.net>
+
+	* gemspecs/:  Removed.
+	* examples/:  Removed.
+	* doc/design/:  Removed.
+	* doc/rdoc_templates/:  Removed.
+	* Rakefile:  Package doc/release_notes/.
+	* setup.rb:  Use full path to release_notes, ensure RDoc can be
+	both removed and installed.
+
+2008-03-28  Eric Hodel  <drbrain@segment7.net>
+
+	* bin/gem, Rakefile:  RubyGems now requires Ruby > 1.8.3.
+	* lib/rubygems.rb:  Added Gem.ruby_version, Gem.read_binary,
+	Gem.binary_mode.
+	* lib/, test/:  Read files in binary mode for windows and ruby 1.9.
+	* lib/rubygems/commands/update_command.rb:  Only update once.
+	* lib/rubygems/commands/sources_command.rb:  Ditto.
+	* lib/rubygems/source_index.rb:  Fix #remove_extra, #find_missing so
+	legacy platform gems don't get updated repeatedly.
+	* doc/release_notes/rel_1_1_0.rdoc:  RubyGems 1.1.0 release notes.
+	* lib/rubygems/rubygems_version.rb:  1.1.0.
+
+2008-03-28  Ryan Woodrum  <rwoodrum@avvo.com>
+
+	* lib/rubygems/commands/query_command.rb: Add --installed
+	subcommand to check if a gem and/or version is installed.
+	* test/test_gem_commands_query_command.rb: Add relevant tests.
+	* test/gemutilities.rb: Override exit() for query tests.
+	* test/mockgemui.rb: Add =() to manipulate output values (clear).
+
+2008-03-28  Chad Woolley  <thewoolleyman@gmail.com>
+
+	* lib/rubygems/source_info_cache.rb: Add reset_cache_file.
+
+2008-03-27  Chad Woolley  <thewoolleyman@gmail.com>
+
+	* lib/rubygems/user_interaction.rb: Raise Gem::SystemExitException
+	instead of exiting, kill unused terminate_interaction!.
+	* lib/rubygems/exceptions.rb: Add Gem::SystemExitException.
+	* lib/rubygems/commands/install_command.rb: Raise
+	Gem::SystemExitException instead of exiting.
+	* bin/gem: Rescue Gem::SystemExitException and exit with
+	specified exit_code.
+	* test/test_gem_commands_install_command.rb: Assert on
+	Gem::SystemExitException and exit_code in tests.
+
+2008-03-27  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/sources_command.rb:  Allow sources to be
+	removed without network.  Fixes bug #18644 by Mikel Lindsaar.
+
+2008-03-27  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/commands/environment_command.rb: Use platform specific
+	PATH_SEPARATOR instead of hardcoded ':'
+	* test/test_gem_commands_unpack_command.rb: Ditto.
+	* test/test_gem_commands_environment_command.rb: Ditto.
+	* test/gemutilities.rb: Fix binary file reads being truncated on
+	Windows.
+	* test/test_gem_commands_install_command.rb: Switch to read_binary.
+	* test/test_gem_commands_update_command.rb: Ditto.
+	* test/test_gem_commands_server_command.rb: Consider full path when
+	evaluating location (instead of hardcoded or missing drive leter).
+	* test/test_gem_installer.rb: Ditto.
+	* test/test_gem_dependency_installer.rb: exclude no-wrapper tests for
+	Windows.
+
+2008-03-26  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems.rb: Handle backslashes that came from GEM_HOME and
+	GEM_PATH on Windows.
+
+2008-03-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb:  Add updating from latest index,
+	default to updating from latest index.  Reduces common-case update
+	to under 3,000 gems at present.
+	* lib/rubygems/remote_fetcher:  Fix error reporting from net/http.
+	* lib/rubygems.rb:  Sort methods, remove last vestiges of autorequire,
+	RDoc cleanup.
+
+2008-03-23  Luis Lavena  <luislavena@gmail.com>
+
+	* setup.rb: generated Windows stubs will honors prefix using Gem.ruby
+	instead of hardcoded 'ruby.exe'
+	* lib/rubygems/installer.rb: generated Windows stubs scripts will now
+	work from differnt directories than Gem::bindir. Fixes bug #16259 by
+	Claus Folke Brobak
+
+2008-03-20  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_gem_source_info_cache.rb:  Test with real objects now.
+	* lib/rubygems/source_index.rb:  #latest_specs now has latest specs
+	for all platforms.
+	* lib/rubygems/source_info_cache.rb:  Add latest cache data, only load
+	full cache data when needed.
+
+2008-03-20  Luis Lavena  <luislavena@gmail.com>
+
+	* test/gemutilities.rb:  Change all the file processing mechanism to
+	enable binary mode by default (required for Windows file operations
+	dealing with non-printable characters).
+
+2008-03-19  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/package/tar_output.rb: Adapted code to use #wrap instead
+	of #new when dealing with Zlib::GzipWriter (fixes SEGV and warnings due
+	GzipWriter object not being closed explicitly).
+
+2008-03-12  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer.rb:  Add latest_index.
+
+2008-03-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/defaults.rb:  Add special case for RUBY_ENGINE constant
+	when setting default gem dir.
+	* Rakefile:  Add update_rubinius and diff_rubinius.
+
+2008-03-08  Lincoln Stoll  <lstoll@lstoll.net>
+
+	* lib/rubygems/server.rb:  Drop use of RDoc's TemplatePage in favor of
+	ERB.
+
+2008-03-04  Ryan Davis  <ryan@wrath.local>
+
+	* lib/rubygems/remote_fetcher.rb: Moved #download from
+	DependencyInstaller.
+	* lib/rubygems/commands/fetch_command.rb: Updated to use #download.
+	* lib/rubygems/dependency_installer.rb: install now takes name or dep.
+	Renamed gather_specs_to_download to find_spec_by_name_and_version.
+	Modifed #initialize to not take gem name or version.
+
+2008-03-04  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package*:  Removed #open_from_io and friends, switched
+	to #open, no special handling for file names.
+	* lib/rubygems/package/tar_output.rb:  Refactored ::open to use
+	instance methods.
+	* lib/rubygems/remote_fetcher.rb:  Print out number of requests made
+	before connection reset.
+
+2008-02-29  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package/tar_reader/entry.rb:  Removed is_directory and
+	is_file? in favor of file? and directory?.
+
+2008-02-28  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package.rb:  Broke up Tar bits into separate files.
+	* lib/rubygems/package/tar_reader/entry.rb:  Don't copy TarHeader data
+	into Entry, go through #header instead.  Better tests for
+	TarReader::Entry.
+
+2008-02-27  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb:  Automatically fall back to
+	local-only install on network error.  Fixes bug #15759 by Chauk-Mean P.
+	* lib/rubygems/source_index.rb:  Process spec dirs so that earlier
+	dirs override later dirs.  Fixes bug #14816 by Kurt Stephens.
+
+2008-02-26  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/update_command.rb:  Only update gems that need
+	updates.  Fixes bug #14780 by Mathieu Lajugie.  Don't force
+	remote-only updates.  Properly handle dependencies when updating.
+	Fixes bug #17488 by Hongli Lai.
+	* lib/rubygems/commands/environment_command.rb:  Display path as a
+	usable path.
+	* lib/rubygems.rb:  Don't add APPLE_GEM_HOME with ENV['GEM_HOME'].
+
+2008-02-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Expand sitelibdir when checking prefix.  Fixes bug
+	#17983 by Hemant Kumar.
+	* setup.rb:  Print release notes on installation.  Tell people where
+	`gem` was installed.
+	* bin/update_rubygems:  Added --help output to explain how to install
+	earlier versions of RubyGems.  Added --version option workaround.
+	Fixes bug #16842 by Chad Woolley.
+	* lib/rubygems/install_command.rb:  Give proper exit code on failure.
+	Fixes bug #17438 by Josh Nichols.
+
+2008-02-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb:  Change hosts correctly when
+	redirecting.  Handle EOFError from Net::HTTP.
+	* lib/rubygems/commands/specification_command.rb:  Pull specifications
+	from gem files.
+	* lib/rubygems/uninstaller.rb:  When :executable is set, don't ask the
+	user.  Fixes bug #16812 by Matt Mower.  Raise exception instead of
+	printing message when gem is not in GEM_HOME.
+	* lib/rubygems/uninstall_command.rb:  Print message when gem is not in
+	GEM_HOME.
+	* lib/rubygems/commands/cleanup_command.rb:  Clean up all old gems.
+	* lib/rubygems/commands/unpack_command.rb:  Scan every gem path when
+	unpacking.  Fixes bug #17602 by Ryan Davis.
+
+2008-02-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/install_update_options.rb: Add --bindir option to
+	specify destination to install executables into.  Patch #17937 by
+	Donavan Pantke.
+	* lib/rubygems/specification.rb: Fix Time.today == Time.today.  Bug
+	#17413 by Andrei Bocan.
+	* setup.rb: Properly check for deletablitily of user and system
+	caches.  Bug #17869 by Alexey Verkhovsky.  Fix --no-format-executable.
+	Fixes bug #16879 by Charles Nutter.
+
+2008-02-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb: Add persistent connection support.
+	Patch #18180 by Aaron Patterson.
+	* lib/rubygems/installer.rb: Fix #shebang to use the ruby install
+	name.  Patch #16878 by Donavan Pantke.
+	* lib/rubygems/defaults.rb, lib/rubygems.rb: Enable defaults for
+	Gem.path and Gem.bindir.  Patch #17886 by Donavan Pantke.
+	* test/test_gem_ext_configure_builder.rb: Make test_self_build_fail
+	more platform independent.  Patch #17599 by Martin Krauskopf.
+
+2008-02-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/fetch_command.rb: Fix a bug when fetching
+	from non-default sources.  Report non-existent gems instead of
+	crashing.
+
+2008-01-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/update_command.rb: Use portable and safe ENV
+	operation.  Patch by usa in ruby SVN revision 14739.
+	* lib/rubygems/open-uri.rb: Fix tests.  Patch by NARUSE Yui.
+	[ruby-dev:33336]
+
+2007-12-23  Eric Hodel  <drbrain@segment7.net>
+
+	* util/gem_prelude.rb:  Remove methods from Gem, not QuickLoader, to
+	fix warnings.
+
+2007-12-22  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/environment_command.rb:  Put GEM PATHS in the
+	correct order.
+	* lib/rubygems/commands/uninstall_command.rb:  Add --install-dir to
+	specify which local repository to uninstall from.  Patch #15151 by
+	Donavan Pantke.
+	* lib/rubygems/uninstaller.rb:  Only allow uninstallation of gems from
+	specified directory.  Properly clean up executables on uninstall.
+	Patch #15151 by Donavan Pantke.
+	* lib/rubygems/install_update_options.rb:  Add --no-env-shebang
+	option.  Patch #16508 by Donavan Pantke.
+	* util/gem_prelude.rb:  Use require to load rubygems.rb to make
+	$LOADED_FEATURES correct on RubyGems update.
+
+2007-12-21  Eric Hodel  <drbrain@segment7.net>
+
+	* util/gem_prelude.rb:  Place bin before lib so bin stubs work.
+
+2007-12-20  Eric Hodel  <drbrain@segment7.net>
+
+	* Rakefile:  Require Ruby > 1.8.2.  Enable CERT_DIR.
+	* lib/rubygems.rb:  Work with RbConfig and Config.  Bug #16457 by
+	Christian Ramilo, John Barnette.
+	* lib/rubygems/commands/build_command.rb:  Relax yaml? test to work
+	with Ruby 1.8.3.
+	* lib/rubygems/rubygems_version.rb:  1.0.1.
+	* doc/release_notes/rel_1_0_1.rdoc:  RubyGems 1.0.1 release notes.
+
+2007-12-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Revert change that only wrapped
+	executables with #!.
+	* lib/rubygems/specification.rb:  Warn about a lot of things that
+	could be wrong with gemspecs on build, including missing #!.  Use
+	'x86-mswin32' for legacy 'mswin32' platform, fix CURRENT platform.
+	Paired with Luis Lavena.
+	* lib/rubygems/remote_installer.rb:  Deleted.
+	* lib/rubygems.rb:  Removed Kernel#require_gem.
+	* doc/release_notes/rel_1_0_0.rdoc:  RubyGems 1.0 release notes.
+	* lib/rubygems/rubygems_version.rb:  1.0.0.
+
+2007-12-18  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/commands/mirror_command.rb: Work around URI::parse
+	processing file:// scheme and drive paths on Windows.
+	* test/test_gem_commands_mirror_command.rb: ditto.
+
+2007-12-17  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Copy files into bindir if they don't
+	have a shebang.  Bug reported by Luis Lavena.
+	* lib/rubygems/server.rb:  Handle platforms in Gem::Server#quick.
+	Exactly match gem names.  Bugs reported by Chad Woolley.
+	* lib/rubygems/platform.rb:  Remove platform constants in favor of
+	Gem::Platform::CURRENT.  Bug reported by Luis Lavena.
+	* lib/rubygems/dependency_installer.rb:  Work around Dir::glob not
+	understanding File::ALT_SEPARATOR.  Bug submitted by Luis Lavena.
+
+2007-12-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb:  Be more verbose in error messages
+	from OpenURI.
+	* lib/rubygems/server.rb:  Be more verbose in error/missing responses.
+
+2007-12-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Output extension build results when
+	really verbose.  From bug #15853 John Croisant.
+	* lib/rubygems/specification.rb:  Fix backwards compatibility with
+	0.9.4, don't allow the platform to be nil or an empty string.  Bug
+	#16177 by Dan Manges.
+	* setup.rb:  Re-exec setup.rb if rubygems is loaded and RUBYOPT is
+	set.  Fixes bug #15974 by Joshua Sierles.
+	* lib/rubygems/update_command.rb:  Tweak formatting of updated
+	message.  Bug #15625 by Bil Kleb.
+	* lib/rubygems/remote_fetcher.rb:  Add URI to exception message for
+	Gem::RemoteFetcher#fetch_size.  Bug #14801 by Bil Kleb.
+
+2007-12-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/query_command.rb:  Don't display duplicate
+	version numbers.  Bug #15828 by Tim Fletcher.
+	* setup.rb:  Fix my stupidity with --help.  Patch #16308 by Stephen
+	Bannasch.  Fix --prefix= argument.  Bug #16002 by Piglop.
+
+2007-12-13  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/server_command.rb:  Fix --no-daemon.  Bug by
+	Chad Woolley.
+	* lib/rubygems/server.rb:  Fix Marshal quick index.  Bug by Chad
+	Woolley.
+	* lib/rubygems/installer.rb: Respect Gem::Specification#bindir.  Bug
+	#16202 by Suraj Kurapati.
+	* lib/rubygems/commands/update_command.rb: Fix `gem update mysql`.
+	Bug #16244 by Stephen Bannasch.
+
+2007-12-12  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Add --format-executable option to
+	install executables with ruby's program-suffix and prefix.  Patch
+	#14688 by Jeremy Kemper.  Also, installing in really-verbose mode
+	prints out written files.
+	* setup.rb:  Add --format-executable option to install gem with ruby's
+	program-suffix and prefix.  Add --help.  Fixes bug #16056 by Chad
+	Woolley.
+	* lib/rubygems/uninstaller.rb:  Fallback to original_platform_name
+	correctly.  Patch #15960 by Nicola Piccinini's friend.
+
+2007-12-11  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/validator.rb:  Correct test run failures when no tests
+	are provided.  Patch #15701 by Jérémy Zurcher.
+	* lib/rubygems/commands/mirror_command.rb:  Don't File.join a
+	URI::HTTP.  Patch #16116 by Morgan Nelson.
+	* lib/rubygems/commands/unpack_command.rb:  Add --target option to
+	`gem unpack`.  Patch #16154 by Kevin Barnes.
+
+2007-12-10  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb:  Revert to nil for the default
+	security policy to avoid requiring OpenSSL.
+	* lib/rubygems/defaults.rb: Consolidate defaults for easier editing.
+	Patch #15150 by Donavan Pantke.
+
+2007-11-27  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb: Remove dependency on forwadable.
+	Patch by Koichi Sasada.
+	* lib/rubygems/specification.rb: Reduce dependency on time.rb.  Patch
+	by Koichi Sasada.
+
+2007-11-26  Rich Kilmer <rich@infoether.com>
+
+	* lib/rubygems/version.rb: Fix bug 15948 with version bump
+	* test/test_gem_version.rb: Test for bug 15948 with version bump
+	* util/gem_prelude.rb: wrap init code with exception handler
+	and skip badly formed directory names
+
+2007-11-23  Rich Kilmer <rich@infoether.com>
+
+	* lib/rubygems.rb: Centralize all CONFIG options into Hash
+	Gem::ConfigMap with keys as symbols, change all references
+	to CONFIG to ConfigMap
+	* lib/rubygems/require_paths_builder.rb: Added to support 
+	building .require_paths file
+	* lib/rubygems/installer.rb: Add building of .require_paths if
+	needed
+	* lib/rubygems/platform.rb: Use new ConfigMap hash for arch
+	* lib/rubygems
+	* util/gem_prelude.rb: new gem prelude for Ruby 1.9
+	* test/test_gem_installer.rb: change to use ConfigMap hash
+	* test/gemutilities.rb: change to use ConfigMap hash
+
+2007-11-21  Daniel Berger <djberg96@gmail.com>
+
+	* lib/rubygems/platform.rb: Gem::Platform.new now returns
+	Gem::Platform.local if the arch matches Gem::Platform::CURRENT.
+	Bugs #15815 and #15782 submitted by Daniel Berger.
+
+2007-11-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/platform.rb: Handle bare 'mswin32' platform's CPU.
+
+2007-11-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 0.9.5.
+
+2007-11-16  Eric Hodel  <drbrain@segment7.net>
+
+	* test/gemutilities: Add a legacy platform gem to the default test
+	gems list.
+	* lib/rubygems/specification.rb: Add Gem::Specification#original_name
+	for legacy purposes
+	* lib/rubygems/indexer.rb: Use #original_name to make the indexer
+	backwards compatible.
+	* lib/rubygems/master_index_builder.rb: Reduce memory consumption.
+
+2007-11-13  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 0.9.4.7 beta.
+	* lib/rubygems.rb: Patch for RUBY_FRAMEWORK for OS X 10.5.  Patch
+	submitted by Laurent Sansonetti.
+	* lib/rubygems.rb: cygwin, djgpp, mingw are Windows platforms.  Fixes
+	bug #15537 by Roger Pack.
+
+2007-11-11  Eric Hodel  <drbrain@segment7.net>
+
+	* Rakefile: Tasks for maintaining ruby trunk export of RubyGems.
+	* lib/rubygems/specification.rb: Preserve original platform across
+	serialization.
+	* lib/rubygems/dependency_installer.rb: Retry with original platform
+	name on fetch error.
+
+2007-11-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb: Set #original_platform only once.
+	* lib/rubygems/indexer.rb: Handle legacy platforms.
+	* lib/rubygems/platform.rb: Gem::Platform is a valid argument.  Bug
+	#15511 submitted by Daniel Berger.
+	* lib/rubygems/custom_require.rb: Fix compatibility with 1.8.2.  Bug
+	#14933 submitted by Aaron Patterson.
+	* lib/rubygems/command.rb: Now '-V' enables verbose.  Bug #14951
+	submitted by Sasa Ebach.
+	* lib/rubygems/commands/check_command.rb: Change use of '-v', '-V' to
+	match above.
+	* lib/rubygems/package.rb: #send! is gone again.
+	* lib/rubygems.rb: Don't add custom_require for 1.9.
+	* test/*: Make compatible with 1.9 import.
+
+2007-10-30  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb: Don't re-use @platform to maintain
+	backwards compatibility.
+	* lib/rubygems/platform.rb: Handle nil and 'ruby' platforms in ::new.
+
+2007-10-20	Daniel Berger	<djberg96@gmail.com>
+
+	* lib/rubygems/uninstaller.rb: Changed '.cmd' to '.bat' in the
+	remove_executables method for MS Windows. Patch from Luis Lavena.
+
+2007-10-18  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 0.9.4.6 beta.
+
+2007-10-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/update_command.rb: Don't install with
+	dependencies when updating.  This is a hack.
+
+2007-10-19  Daniel Berger  <djberg96@gmail.com>
+
+	* setup.rb: gem.cmd stub is now gem.cmd, and the stub generation was
+	changed - now better for NT. Patch #14725 (Luis Lavena).
+	* lib/rubygems/installer.rb: Same as for setup.rb.
+
+2007-10-18  Daniel Berger  <djberg96@gmail.com>
+
+	* lib/rubygems/platform.rb: Modified the Platform.local method for MS
+	Windows for versions built with VC++ 6. Patch #14727 (Luis Lavena).
+	* test/test_gem_specification.rb: Added version independent tests for
+	MS Windows. Patch #14727 (Luis Lavena).
+
+2007-10-18  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb: Add platform to User-Agent.
+	* lib/rubygems/commands/install_command.rb: Fix typo.  Debian bug
+	#443135 submitted by Reuben Thomas.
+	* lib/rubygems/dependency_installer.rb: Don't install dropped
+	dependencies.  Fixes bug #14724 submitted by Luis Lavena.
+
+2007-10-17  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/update_command.rb: Unset RUBYOPT when running
+	setup.rb
+	* setup.rb: Re-exec without RUBYOPT if it is set.  Fixes bug #14683
+	submitted by Lyle Johnson.
+
+2007-10-16  Daniel Berger  <djberg96@gmail.com>
+
+	* lib/rubygems/indexer/abstract_index_builder.rb: The compress method
+	now does a binary read to make MS Windows happy.
+
+2007-10-16  Eric Hodel  <drbrain@segment7.net>
+
+	* setup.rb: Installs bin stubs that warn when you try to use the old
+	commands.  Simple mswin deprecation stubs by Luis Lavena.
+
+2007-10-12  Eric Hodel  <drbrain@segment7.net>
+
+	* setup.rb: Remove source caches on install.
+	* doc/release_notes/rel_0_9_5.rdoc: Draft added.
+	* lib/rubygems/rubygems_version.rb: 0.9.4.5 beta.
+
+2007-10-10  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb: Fix small bug found by Alan C.
+	Francis.
+
+2007-10-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb: Use install_dir so custom gem
+	repos can be used.
+	* lib/rubygems/specification.rb: Always set required attributes, even
+	if they match the default.
+
+2007-10-08  Ryan Davis  <ryan@wrath.local>
+
+	* lib/rubygems.rb: Fixed require order so custom_require is
+	last. Added HACK tag to remind Jim to release rake.
+	* test/test_gem_source_index.rb: Fixed latest_specs' tests so
+	failures were much more readable.
+	* lib/rubygems/source_index.rb: Fixed latest_specs to deal with
+	platforms appropriately. Returns array again.
+
+2007-10-08  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/config_file.rb: Boost bulk_threshold to 1000, Marshal
+	format is smaller than yaml format quick index.
+	* lib/rubygems/installer.rb: Make #shebang correctly rewrite env
+	shebangs.
+	* lib/rubygems/specification.rb: Mark Time.today for removal, too much
+	depends upon it now.
+
+2007-10-07  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb: Sped up ::_load.
+	* lib/rubygems/source_index.rb: Sped up #search.
+	* lib/rubygems/version.rb: Replace #to_ints with #ints, and cache
+	result.
+	* lib/rubygems/source_info_cache.rb: Only flush cache when it changes.
+
+2007-10-05  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/user_interaction.rb: Allow customization of completion
+	message for progress reporters.
+	* lib/rubygems/command.rb: Add --quiet option.
+	* lib/rubygems/commands/generate_index_command.rb: Add description.
+
+2007-10-04  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/uninstaller.rb: Also check and uninstall old platform
+	name to ensure legacy platform gems are uninstalled.
+	* lib/rubygems/doc_manager.rb: Remove existing rdoc and ri directory
+	so regenerating docs succeeds even if previously interrupted.
+
+2007-10-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb: Make #outdated search only for gems
+	matching the current platform.
+	* lib/rubygems/commands/dependency_command.rb: Add --platform.
+	* lib/rubygems/commands/outdated_command.rb: Ditto.
+	* lib/rubygems/commands/specification_command.rb: Ditto.
+	* lib/rubygems/commands/update_command.rb: Ditto.
+
+2007-10-02  Wilson Bilkovich  <wilson@supremetyrant.com>
+
+	* lib/rubygems/specification.rb: Custom Marshal format to reduce index
+	size.
+	* lib/rubygems/requirement.rb: Ditto
+	* lib/rubygems/version.rb: Ditto
+
+2007-10-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/platform.rb: Handle mswin32 on VC6.  Partial patch and
+	assistance by Luis Lavena.  Handle cpu-os-version style platforms for
+	command-line arguments.
+
+2007-09-30  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb: Gem::Specification is now
+	forward-compatible while loading.
+
+2007-09-29  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache_entry.rb: Correctly handle URIs.
+	* lib/rubygems/remote_fetcher.rb: ditto.
+	* lib/rubygems/remote_options.rb: Add --update-sources option.  Patch
+	#14246 submitted by Alan Francis.
+	* lib/rubygems/config_file.rb: Add update_sources setting to control
+	automatic refreshing of sources (patch #14246).  Fix bug where things
+	would be overwritten in ~/.gemrc when they shouldn't.
+
+2007-09-28  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems.rb: Gem.ruby now returns the full path.  Added
+	Gem.prefix to make self updating work right.
+	* setup.rb, pre-install.rb, post-install.rb: Replace with a small,
+	simple setup script that works.
+	* lib/rubygems/commands/update_command.rb: Pass rdoc, ri and prefix
+	flags down to setup.rb when self updating.
+
+2007-09-26  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/version_option.rb: Always include RUBY platform,
+	allow RUBY platform as an option.
+	* lib/rubygems/specification.rb: Gems with non-ruby platform sort
+	last (first in preference for installation).
+	* lib/rubygems/platform.rb: Allow matching of legacy platforms.
+	* lib/rubygems/source_index.rb: Add only_platform option to #search.
+
+2007-09-24  Wilson Bilkovich  <wilson@supremetyrant.com>
+	* lib/rubygems/indexer.rb: Generate a Marshal index in parallel to YAML
+	* lib/rubygems/source_index.rb: Fetch a Marshal index if it exists, to
+	avoid the memory cost of parsing a huge YAML file
+	* lib/rubygems/commands/mirror_command.rb: Check for Marshal first
+	* lib/rubygems/indexer/abstract_index_builder.rb: Index refactoring
+	* lib/rubygems/indexer/marshal_index_builder.rb: Build Marshal index
+	* lib/rubygems/indexer/master_index_builder.rb: Simplify YAML generation
+	* lib/rubygems/indexer/quick_index_builder.rb: Build Marshal quickindex
+	* lib/rubygems/server.rb: Serve up Marshal index as well as YAML
+	* lib/rubygems/source_info_cache_entry.rb: Expect a Marshal index
+
+2007-09-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/fetch_command.rb: `gem fetch` downloads a gem
+	to the current directory.  Feature request #10752 by Bret Pettichord.
+	* lib/rubygems/commands/local_remote_options.rb, etc.: Fix spelling of
+	'threshold'.
+	* lib/rubygems/installer.rb: Revert feature request #8818, it
+	interferes with `ruby -S` and multiple versions of ruby (1.8 and 1.9).
+	* lib/rubygems/dependency_installer.rb: Fix a bug where the wrong
+	platform gem would be installed.
+	* lib/rubygems/version_option.rb: Add --platform.
+	* lib/rubygems/install_update_options.rb: Verify --security-policy.
+	* lib/rubygems/local_remote_options.rb: Verify --source, --http-proxy.
+
+2007-09-22  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/open-uri.rb: Don't document our OpenURI.
+	* lib/rubygems/commands/generate_index_command.rb: Fix Indexer class
+	change.
+	* lib/rubygems/commands/mirror_command.rb: Fix for 1.9.
+	* lib/rubygems/commands/pristine_command.rb: Have `gem pristine`
+	give a better report of what it accomplished.
+	* lib/rubygems/command.rb: Add optional description field.
+	* lib/rubygems/installer.rb: Hack around broken Pathname#absolute? on
+	windows.  Patch #14139 by Jim Hughes.
+
+2007-09-20  Eric Hodel  <drbrain@segment7.net>
+
+	* misc files: Tests pass on 1.9.
+	* test/gemutilities.rb: Added Object#send! stub for 1.8.
+	* test/test_open_uri.rb: Require gem_open_uri.rb to avoid warnings.
+	* lib/rubygems/commands/sources_command.rb: Clarify `gem sources -c`
+	and what `gem sources` does.  Patch by Hugh Sasse.
+
+2007-09-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/platform.rb: Make Gem::Platform a class.
+	* lib/rubygems/specification.rb: Gem::Specification#validate returns
+	true, non-Gem::Platform platforms are no longer allowed.
+	* test/gemutilities.rb: 1.9 compatiblity fixes.
+	* lib/rubygems/dependency_installer.rb: Work around a bug in URI.parse
+	which misinterprets "C:/".  Patch #13537 submitted by Daniel Berger.
+	* lib/rubygems/format.rb: Ensure file handles are closed.  Patch
+	#13533 submitted by Daniel Berger.
+	* test/test_gem_installer.rb: Win32 path fix.  Patch #13528 submitted
+	by Daniel Berger.
+	* test/gemutilities.rb: Make the platform be a win32 platform on
+	win32.  Fixes confusion in generate_bin_symlink tests.  Patch #13529
+	submitted by Daniel Berger.
+	* test/test_gem_specification.rb: Sequel to above.  Patch
+	#13535 submitted by Daniel Berger.
+	* lib/rubygems/source_index.rb: Make the updating cache message more
+	clear.  Patch #12778 submitted by Bil Kleb.
+	* lib/rubygems/server.rb: Allow gem's rdoc-style.css to be used.
+	Patch #13589 by Stephen Bannasch.
+	* lib/rubygems/indexer.rb: Fail on missing builder gem only when
+	trying to use the indexer.  Fixes bug #13939 by Bryan Stearns.
+	* lib/rubygems/indexer/indexer.rb: Move Indexer up one level in
+	nesting.
+	* lib/rubygems/indexer/compressor.rb: Only used in
+	Gem::Indexer::AbstractIndexBuilder subclasses, merged there.
+	* lib/rubygems/command_aids.rb: Merged Gem::CommandAids into
+	Gem::Command since that's the only place it gets used.
+	* misc other files: mswin fixes.  Paired with Daniel Berger.
+
+2007-08-24  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb: Fix #full_name for versionless
+	platforms.
+	* lib/rubygems/command_manager.rb: We're only looking for NameError.
+	* lib/rubygems/command.rb: 1.9 fix.
+	* lib/rubygems/format.rb: ditto.
+	* lib/rubygems/installer.rb: ditto.
+
+2007-08-24  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 0.9.4.4
+
+2007-08-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/platform.rb: Add HPUX, AIX and NetBSD.  Thanks to
+	Daniel Berger, Yutaka KANEMOTO and Andre Nathan respectively.
+	* lib/rubygems/installer.rb: Move all option setting to #initialize to
+	make `gem pristine` work again.
+	* lib/rubygems/commands/environment_command.rb: Include platforms.
+	* lib/rubygems/dependency_installer.rb: Support local non-root
+	installation.
+
+2007-08-22  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb: Don't reinstall dependencies
+	existing in the install dir.  Don't install dependencies for older
+	versions of the gem we're installing.  #installed_gems now contains
+	loaded gemspecs.  Always prefer local gems.  Handle globs correctly.
+	All deps are now installed into the install_dir.
+	* lib/rubygems/commands/install_command.rb: Switch to
+	Gem::DependencyInstaller.  Warn when -y is given, it will be removed.
+	Try our best to install everything the user asked.
+	* lib/rubygems.rb: Gem.bindir now handles Pathname correctly.
+	* lib/rubygems/remote_fetcher.rb: Don't downcase anymore.
+
+2007-08-21  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb: Add installation from local
+	gems.  Install gems in the correct order.  Handle -E, -f,
+	--ignore-dependencies, -i, -r, -l, -b, -P, -w, -v options for `gem
+	install`
+	* test/gemutilities.rb: Work around OS X /private/tmp.
+	* lib/rubygems/platform.rb: Switch to using arch instead of target_*
+	for JRuby compatibility.  Thanks to Nick Sieger.
+
+2007-08-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb: Add working but unfinished
+	Gem::DependencyInstaller.
+	* lib/rubygems/source_info_cache.rb: Add #search_with_source.
+	* lib/rubygems/dependency_list.rb: Move #fill_dependencies to
+	Gem::DependencyInstaller
+	* lib/rubygems/platform.rb: Split from specification.rb.  Add methods
+	to recognize platforms from Config::CONFIG.
+	* lib/rubygems.rb: Add Gem::platforms.
+	* lib/rubygems/specification.rb: Disallow String platforms.
+
+2007-08-18  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache.rb: Search by Gem::Dependenency.
+	* lib/rubygems/source_index: Search by Gem::Dependenency.
+	* lib/rubygems/version.rb: Version can be String or Integer.
+	Gem::Requirement::default is now >= 0.  Gem::Requirement can be built
+	from a Gem::Dependency.
+	* lib/rubygems/dependency_list.rb: Uses TSort now.  Add
+	Gem::DependencyList#fill_dependencies.
+	* lib/rubygems/server.rb: Support quick index.
+
+2007-08-17  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_list.rb: For diamond dependencies with
+	different versions on the bottom of the diamond, trim all but the
+	latest dependency.  This will prevent gems like hoe from being
+	installed multiple times.
+
+2007-08-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb: Support building mkrf extensions.  Fixes
+	bug #11313.  Patch by Jeremy Hinegardner.
+	* lib/rubygems/installer.rb: Ensure bin files are executable.  Fixes
+	bug #8985 submitted by Ara Howard.
+	* lib/rubygems/installer.rb: Insert installing gem home dir into bin
+	wrapper.  Patch #8818 by Ara Howard.
+
+2007-08-13  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/uninstall_command.rb: Gems with version of 0
+	can now be uninstalled.
+
+2007-08-11  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/config_file.rb: Command-line args override ~/.gemrc
+	now.  Gem.sources is pulled from ~/.gemrc now.  Gem::ConfigFile can
+	write itself out now.
+	* lib/rubygems/commands/sources_command.rb: Now writes out
+	Gem.configuration on changes.  No longer checks source cache on
+	--list.
+
+2007-08-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache.rb: Make Gem::SourceInfoCache#search
+	only search gems in Gem.sources.
+	* lib/rubygems.rb: Make Gem::configuration a real Gem::ConfigFile
+	object.
+	* lib/rubygems/commands/query_command.rb: Fix `gem query --details`.
+	Add `gem query --no-versions`.
+	* lib/rubygems/local_remote_options.rb: Make `gem mumble --source URL`
+	only use that source.
+	* lib/rubygems/config_file.rb: Fix Gem::ConfigFile#[]= to match
+	Gem::ConfigFile#[].
+
+2007-08-08  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/specification_command.rb: Match only exact gem
+	names.  Fixes bug #9681.  Patch by Michael DeCandia.
+	* lib/rubygems/commands/unpack_command.rb: Match only exact gem names.
+	Fixes bug #9681.  Patch by Michael DeCandia.
+	* lib/rubygems/commands/contents_command.rb: Match only exact gem
+	names.  Fixes bug #9681.  Patch by Michael DeCandia
+	* lib/rubygems/remote_fetcher.rb: Perform a GET request if the HEAD
+	request doesn't have Content-Length.  Fixes bug #9771.  Patch by Ben
+	Bleything.
+	* lib/rubygems.rb: Clear Gem::searcher when we Gem::clear_paths.
+	Fixes bug #12886.  Submitted by Peter Williams.
+	* lib/rubygems.rb: Add #default_sources and rework #sources to use it.
+	* post-install.rb: No longer runs install_sources.
+	* pkgs/sources: Updated to something what a 0.0.2 would look like, if
+	we ever make one.
+
+2007-08-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/gem_commands.rb: Removed and broken up into individual
+	files.
+	* lib/rubygems/command_manager.rb: Lazily loads gem commands.  Now to
+	use CommandManager just "require 'rubygems/command_manager'" and
+	everything will be there.
+
+2007-08-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/*, test/*: Pushed down dependencies as far as reasonable.
+	Removed Gem::manage_gems.  Now only 14 files are loaded with "require
+	'rubygems'".  Added tests for `gem build` and `gem cert`.
+	* lib/rubygems/extensions.rb: Added common place for all extensions.
+
+2007-07-26  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_gem_ext_configure_builder.rb: Linux has different behavior
+	for `sh ./configure` when configure is missing.  Fix adapted from
+	Patch #10019 by Donavan Pantke.
+	* lib/rubygems/commands/pristine_command.rb: Compare fully-qualified
+	paths.  Fixes bug #7976 by Lyle Johnson.
+	* lib/rubygems/config_file.rb: Add ConfigFile#[]=, so --proxy
+	command-line option works.  Fixes #8152 by Justin Sabelkko.
+	* lib/rubygems/post-install.rb: Make sure we use the
+	latest-and-greatest RubyGems when running post-install.rb.  Fixes Bug
+	#8411 by Duy Nguyen.
+	* lib/rubygems/remote_fetcher.rb: An empty HTTP_PROXY means no proxy.
+	Fixes Bug #9042 by Michael Brodhead.
+	* lib/rubygems/version.rb: Disallow newlines in version string.  Strip
+	spaces from version string.  Fixes Bug #9499 by Bryce Kerley.
+	* lib/rubygems/commands/sources_command.rb: Fix spelling error.  Fixes
+	Bug #11064 by Chris Eskow.
+
+2007-07-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/indexer.rb: Create the index in /tmp, then move it into
+	place when we're done.  This will prevent spurious bulk index updates
+	from occurring while the quick index is missing.  Remove the option to
+	not build the quick index.
+	* lib/rubygems/commands/generate_index_command.rb: --no-quick is gone.
+	* lib/rubygems/user_interaction.rb: If stdin is not a tty, it is
+	unlikely that gem is going to get a response when asking a question.
+	Patch #10660 by Paul Brannan.
+	* lib/rubygems/validator.rb: Output test failures when using install
+	-t.  Patch #10659 by Paul Brannan.
+	* lib/rubygems/custom_require.rb (Kernel#require): Only rescue a
+	LoadError that matches the file we are requiring.  Patch #10723 by
+	Tyler Rick.
+	* lib/rubygems/remote_fetcher.rb: Support HTTP basic authentication.
+	Patch #8121 by Max Dunn.
+	* lib/rubygems/commands/install_command.rb: Don't raise an error when
+	a gem has no tests.  Patch #11824 by Katsuyuki MIYAMUKO.
+
+2007-07-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/commands/contents_command.rb: Add --lib-only option, remove
+	useless --list option.  Feature request #9498 by Martin DeMello.
+	* lib/rubygems/specification.rb: Restrict to only files in
+	#require_paths.  Add #required_rubygems_version.  Feature request
+	#7780 by Eric Hodel.
+	* lib/rubygems/commands/dependency_command.rb: Display dependencies for
+	remote gems.  Feature request #12133 by Eric Hodel.  -r for reverse
+	dependencies is now -R.
+	* lib/rubygems/commands/specification_command.rb: Display
+	specifications for remote gems.  Feature request #12133 by Eric Hodel.
+	* lib/rubygems/installer.rb (Gem::Installer#install): Check
+	required_rubygems_version.
+	* lib/rubygems/user_interaction.rb
+	(Gem::UserInteraction#choose_from_list): Check result for EOF.  Fixes
+	bug #8018.  Patch by Jos Backus.
+	* post-install.rb: Install using absolute path.  Fixes bug #10675.
+	Patch by Jeremy Burks.
+	* lib/rubygems/commands/environment_command.rb: Add RUBY VERSION to
+	environment output.
+	* lib/rubygems/command.rb: Don't worry about duplicated command-line
+	options, OptionParser takes care of them for us.
+
+2007-07-22  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb (Gem::Specification#files): Make it
+	faster
+	* lib/rubygems/command.rb: Better documentation.  -v flag now lets you
+	get to "really verbose" mode which makes the verbose progress meter
+	work.  Add command groups to separate types of commands easily.
+	* lib/rubygems/commands/which_command.rb, bin/gemwhich: Move `gemwhich`
+	under `gem`.
+	* lib/rubygems/commands/mirror_command.rb, bin/gem_mirror: Move
+	`gem_mirror` under `gem`.
+	* lib/rubygems/commands/lock_command.rb, bin/gemlock: Move `gemlock`
+	under `gem`.
+	* lib/rubygems/commands/server_command.rb, bin/gem_server: Move
+	`gem_server` under `gem`.
+	* lib/rubygems/doc_manager.rb (Gem::DocManager#initialize): Only raise
+	when operating on the filesystem.
+	* lib/rubygems/server.rb: Remove option processing, now in
+	Gem::Commands::ServerCommand.
+	* lib/rubygems/commands/generate_index.rb, bin/index_gem_repository.rb:
+	Move `index_gem_repository.rb` to `gem generate_index`.
+	* lib/rubygems/indexer (Gem::Indexer): Extract from
+	index_gem_repository.rb and merge RubyForge changes.
+	* lib/rubygems/command_manager.rb (Gem::CommandManager#run): Print
+	backtrace when --debug is set too.
+	* lib/rubygems/command_manager.rb (Gem::CommandManager#load_and_instantiate):
+	Don't infinitely loop in retry.
+	* bin/gemri: Removed.  Everybody should have ri integration now.
+	* lib/rubygems/config_file.rb: Allow settings to be examined.  Pull
+	settings from .gemrc.
+	* lib/rubygems/commands/environment_command.rb: Add ruby executable
+	and configuration settings to `gem env`.
+	* lib/rubygems/indexer/indexer.rb (Gem::Indexer::Indexer#build_index):
+	Now uses UserInteraction.
+	* various: Use UserInteraction for output.
+	* lib/gemconfigure.rb: Removed. Same as multiple gem commands.
+	* lib/rubygems/commands/contents_command.rb: Removed extra --verbose
+	option.
+	* lib/rubygems/gem_commands.rb (Gem::LocalRemoteOptions): Moved -B,
+	--source, -p from Gem::Commands::common_options.
+
+2007-07-22  Chad Fowler  <chad@chadfowler.com>
+
+	* lib/rubygems/gem_commands.rb: Added another example to the gem
+	example output (Gile Bowkett)
+	* test/test_documentation_generation.rb, lib/rubygems/doc_manager.rb:
+	Added a test for documentation generation and fixed a bug when doc
+	location is not writable.
+
+2007-06-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/gem_path_searcher.rb (Gem::GemPathSearcher): Moved out
+	of lib/rubygems/custom_require.rb and added tests.
+
+2007-06-02  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/source_info_cache.rb (Gem::try_file): Fix for issue
+	where a non-existing source cache file causes the gem command to
+	not find a gem.  This fixes it by marshalling out an empty
+	hash.  (Thanks to Nick Sieger for this fix).
+
+2007-06-01  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems.rb
+	(Gem::OperationNotSupportedError::latest_partials): Changed from
+	match data style to $1 style regexp (on the recommendation of
+	better performance).
+
+2007-05-30  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex::update):
+	Modified to get the bulk_threshhold from the configuration.
+	(Gem::SourceIndex::convert_specs): Ryan removed the "reduce_specs"
+	method because it is not needed any more and is creating memory
+	overhead.
+
+	* lib/rubygems/config_file.rb (Gem::ConfigFile): Added
+	bulk_threshhold field to ConfigFile.
+	(Gem::ConfigFile::initialize): Initialize bulk threshhold to 500.
+
+	* lib/rubygems/command.rb
+	(Gem::Command::specific_extra_args_hash): Added
+	-B (--bulk-threshhold) option to allow user specified bulk
+	download threshhold.
+
+2007-05-23  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/commands/sources_command.rb
+	(Gem::Commands::SourcesCommand::initialize): Added a --clear-all
+	option to the sources subcommand.  Clear-all will remove the cache
+	files.
+
+	* lib/rubygems/source_info_cache.rb (Gem): Moved system_cache_file
+	and user_cache_file to class methods so that we can get the file
+	names without creating a SourceInfoCache instance.
+
+2007-05-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache.rb: Teach SIC to repair itself
+	when it encounters a bad cache file.
+
+2007-05-14  Chad Fowler  <chad@chadfowler.com>
+		* lib/rubygems/command_manager.rb: Re-added registration for
+	gem cleanup command which I accidentally removed during refactoring.
+
+2007-05-10  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb: Uncommented the require
+	'sources' line.
+
+	* lib/rubygems/source_info_cache.rb: Uncommented the require
+	'sources' line.
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.3
+	in preparation for release.
+
+	* lib/rubygems/package.rb (Gem::TarInput::zipped_stream):
+	Zipped_stream now always uses the in memory string IO buffer.
+	There were just too many problems with ZLib (on windows)
+	otherwise.
+
+2007-03-26  Jim Weirich  <jim@weirichhouse.org>
+
+	*  (Index): new digest technique.
+
+	* lib/rubygems/validator.rb (Gem::Validator::verify_gem): Removed
+	really old MD5 and replaced with gem based digests.  
+	
+	* experimental/deployment.rb (Gem::Deployment::Manager::initialize):
+	New digest technique.
+
+	* experimental/test_deployment.rb (TestDeployment::test_deployed_file):
+	New digest technique.
+
+2007-03-26  Chad Fowler <chad@chadfowler.com>
+
+	* Extracted the big ball of mud that was gem_commands.rb into    
+	separate files.
+
+2007-03-17  Chad Fowler <chad@chadfowler.com>
+
+	* Various ruby 1.8.6 fixes for failing tests.
+	
+	* Updated setup.rb to 3.4.1
+	
+	* Renamed cmd_manager to command_manager to keep names consistent
+	
+	* lib/installer.rb: Rework path checking to use Pathname (ara howard bug #8811)
+	
+2007-03-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb: Add bin directory before library directory,
+	otherwise gems like rake don't work.
+
+2007-03-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/open-uri.rb: Fix all the infinite loop errors.
+
+	* lib/rubygems.rb: Add dirs from activate after -I and ENV['RUBYLIB']
+	dirs.  Otherwise gems won't allow -I to work when #gem is called.
+
+2007-02-11  Chad Fowler <chad@chadfowler.com>
+
+	* test/gemutilities.rb: Fix to make Windows tests pass. (Anatol Pomozov)
+
+2007-02-05  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.2
+	and made a release.
+
+2007-02-04  Chad Fowler <chad@chadfowler.com>
+
+	* Fixed failing tests (changed from assert_equal to assert_match to 
+	  deal with ARGV inconsistencies in test vs. production).
+
+2007-02-03  Jim Weirich  <jim@weirichhouse.org>
+
+	* Bumped version to 0.9.1.1.
+
+	* lib/rubygems/gem_open_uri.rb: Added the patched open-uri back
+	into the gems software.  Evidently, the 1.8 version of open-uri
+	does not handle authenticating proxies with username and password.
+
+	* lib/rubygems/source_info_cache.rb (Gem::cache_data): Added
+	rescue block to capture bad file loads.  The original rescue was
+	only around the marshal load (bug was probably introduced when the
+	file data was preloaded into a string).
+	(Gem::set_cache_data): Added set_cache_data to be used during
+	testing to avoid reload the cache file over and over.
+
+	* lib/rubygems/gem_commands.rb: Added require for command class so
+	that this file can be loaded independently.
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex::outdated): Minor
+	cleanup.
+
+	* test/gemutilities.rb
+	(RubyGemTestCase::util_setup_source_info_cache): Minor cleanup
+
+	* test/test_gem_source_info_cache.rb
+	(TestGemSourceInfoCache::test_write_cache_user): Switched to using
+	set_cache_data here and several other places to avoid rereading
+	the cache data over and over again.
+
+2007-02-02  Chad Fowler  <chad@chadfowler.com>
+
+	* lib/rubygems/gem_commands.rb:
+	Fixed gem unpack (broken since 0.9.1)
+
+2007-01-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache.rb (Gem::SourceInfoCache#cache_data):
+	Read the source_cache in binary mode for mswin.
+
+2007-01-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Released 0.9.1.
+
+2007-01-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb (Gem::Installer#extract_files): Only allow
+	installation to absolute directories.  (Call File::expand_path first).
+	More informative message for attempting to install with bad path.
+	* post-install.rb: Install sources first, since its rather important.
+
+2007-01-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache.rb: require 'fileutils', as its
+	needed.
+
+2007-01-12  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb (Gem::Installer#extract_files): Don't
+	allow gems to place files outside the installation directory.  Fixes
+	bug 7751 by Gavin Sinclair.
+
+2007-01-08  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/specification.rb
+	(Gem::Specification::test_suite_file): Added rescue clause for
+	default_executable.
+	(Gem::Specification::add_bindir): Added rescue clause for
+	add_bindir.
+
+	* test/test_specification.rb
+	(TestSpecification::test_pathologically_bad_non_array_stuff_doesnt_goof_up_files):
+	Added a sanity check on hash for some pathologically bad case.
+	(TestSpecification::test_pathologically_bad_exectuables_doesnt_goof_up_hash):
+	Added sanity check for pathologically bad executables field.
+
+2007-01-08  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/gem_commands.rb (Gem::PristineCommand#execute): Better
+	messaging.
+	* lib/rubygems.rb, lib/rubygems/custom_require.rb: Correctly include
+	documentation for methods added to Kernel.
+
+2007-01-07  Eric Hodel  <drbrain@segment7.net>
+
+	* Rakefile: Include GPL.txt.  Fixes bug #7572 by David Lee.
+
+2007-01-06  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+	0.9.0.9.
+
+	* lib/rubygems/specification.rb
+	(Gem::Specification::test_suite_file): Rewrote default_executable
+	to be a bit more explicit.
+	(Gem::Specification::add_bindir): Rewrote the 'files' accessor to
+	handle pathologically bad input.
+	(Gem::Specification::copy_of): Added as_array private method.
+
+	* Rakefile (package_version): Added '*.out' to clobber list.
+	Removed the broken-1.0.0.gem file from the clobber list.
+
+	* test/test_specification.rb
+	(TestSpecification::test_default_executable):
+	Seriously beefed up tests for certain specification issues.
+
+	* test/gemenvironment.rb (TestEnvironment::create): Added the 'f'
+	flag to deleting 'gemhome'.
+
+2006-12-30  Eric Hodel  <drbrain@segment7.net>
+
+	* post-install.rb, lib/rubygems/server.rb: RubyGems now installs RDoc
+	and ri for itself.
+
+2006-12-28  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb (Gem::Installer#build_extensions):
+	Extension build failures now raise Gem::Installer::ExtensionBuildErrors.
+
+2006-12-26  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package.rb (Gem::Package::TarInput#initialize): Bad
+	packages now raise FormatError instead of a generic RuntimeError.
+	* lib/rubygems/installer.rb (Gem::Installer#install): Raise an
+	InstallError when we have a bad gem file.
+
+2006-12-25  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/custom_require.rb (Gem::GemPathSearcher::find):
+	Removed SUFFIX_PATTERN.  Evidently this was miss during an earlier
+	attempt to remove it.
+	(Gem::GemPathSearcher::matching_file): Changed reference to
+	SUFFIX_PATTERN into a call to Gem.suffix_pattern.
+
+	* Removed tab characters from numerous source files.
+	
+	* lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): Removed
+	stray tab characters.
+
+	* lib/rubygems.rb (Kernel::require_gem): Added file and line
+	number information to require_gem worning (makes it easier to
+	track down those offending lines of code).
+	(Kernel::location_of_caller): Added helper function to determine
+	file and line number of caller.
+
+2006-12-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb (Gem::Installer#app_script_text):
+	Simpler, more readable bin script.
+	* lib/rubygems/gem_commands.rb (Gem::PristineCommand#execute):
+	Regenerate bin scripts.  This will clean up require_gem in scripts.
+
+2006-12-24  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#fetch_path):
+	Rescue various errors and return a more-friendly error.
+
+2006-12-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/command.rb lib/rubygems/gem_commands.rb: Make help
+	output fit in 80 columns.
+	* lib/rubygems/rubygems_version.rb: Bump version to 0.9.0.8, beta
+	time!  (Oops, didn't go into beta.)
+
+2006-12-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#fetch_size): Give
+	a sensible error on bad URIs.
+	* lib/rubygems/gem_commands.rb (Gem::SourceCommand): Allow management
+	of sources in source_cache.  Fixes bug #1128.
+	* lib/rubygems.rb (Kernel#require_gem): Add deprecation warning in
+	favor of gem.
+
+2006-12-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb (Gem::ExtBuilder): Refactored for
+	uniformity.
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller#specs_n_sources_matching): Don't display gems
+	that can't be installed.
+	* lib/rubygems.rb, pre-install.rb: Fix installation errors on 1.9.
+	Fixes bug #4536 by Ryan Davis.
+	* lib/rubygems/source_index.rb, lib/rubygems/gem_commands.rb,
+	lib/rubygems-custom_require.rb: Use File.join with glob strings.
+	Fixes bug #1096 submitted by Chad Fowler.
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller#install_dependencies): Make --force actually
+	force.  Fixes bug #7365 by Robert James.
+
+2006-12-18  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/gem_commands (Gem::OutdatedCommand): Add a way to see
+	which gems are out-of-date.
+
+	* setup.rb: Ignore errors for .config and InstalledFiles when
+	the source path is read-only/NFS.  Fixes bugs #1395 and #1374.  Patch
+	by Ryan Davis.
+
+	* bin/gem_server: Pull code out into lib/rubygems/server.rb for
+	reusability.  Closes Feature Request #2220 by Chris Morris.
+
+2006-12-16  Chad Fowler <chad@chadfowler.com>
+
+	* test/: Added functional test for extension gems proving that
+	non-compiling extensions don't result in success message.
+
+	* lib/rubygems/specification.rb: Raise exception if loaded spec is
+	nil.  Closes bug #7299.
+
+	* test/gemenvironment.rb: Clean out gemhome every time to avoid dirty
+	directory failing tests.
+
+	* lib/rubygems/installer.rb: Change uninstall to require a full gem
+	name (not a partial match).  Fixes bug #6007 and related unreported
+	issues.
+
+2006-12-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller): Correctly uninstall
+	executables if GEM_HOME is set.  Patch #2264 by Sylvain Joyeux.
+
+	* lib/rubygems.rb (Gem::loaded_specs): Expose list of currently loaded
+	gems.
+
+	* lib/rubygems/gem_commands (Gem::UninstallCommand): Allow multiple
+	gems to be uninstalled at once.
+
+2006-12-14  Eric Hodel  <drbrain@segment7.net>
+
+	* post-install.rb: Don't attempt to read unreadable files.  Fixes
+	bug #2851.
+
+2006-12-13  Eric Hodel  <drbrain@segment7.net>
+
+	* pre-install.rb.rb, post-install.rb: Don't call manage_gems because
+	we don't have sources installed yet.  Bump version requirement to
+	1.8.2 since rubygems/open-uri.rb was removed.  Should fix bug #6206.
+
+	* lib/rubygems/installer.rb (Gem::Installer#build_extensions): Capture
+	stderr into results when building extensions.
+
+	* lib/rubygems/gem_commands.rb (Gem::ContentsCommand): Allow version
+	to be passed to gem contents.  Not backwards compatible, -v now -V and
+	vice versa.  Select newest gem for contents.  Fixes bugs #2723, #7225.
+	Patches by Sava Chankov, Tom Pollard.
+
+	* lib/rubygems/gem_commands.rb (Gem::InstallCommand#execute): Allow
+	install errors to result in non-zero exit code.  Fixes bug #2773.
+
+2006-12-03  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#install):
+	Add :cache_dir option to override the default.
+
+	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#download_gem): 
+	Check cache to see if the gem has been cached before downloading.
+
+2006-12-02  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems.rb (Gem::OperationNotSupportedError::suffixes,
+	Gem::OperationNotSupportedError::suffix_pattern): Removed
+	duplicate copies of the SUFFIX_PATTERN by providing a global
+	method Gem.suffixes and Gem.suffix_pattern.
+
+	* lib/rubygems/remote_fetcher.rb (Gem::open_uri_or_path): Reworked
+	the connection options for the open-uri call.  Since we are not
+	using the rubygems supplied open_uri, we can use some new options
+	available that make proxy handling much easier.
+	(Gem::file_uri): Renamed is_file_uri to file_uri?.
+
+	* lib/rubygems/loadpath_manager.rb (Gem::LoadPathManager::self):
+	Added .jar to list of suffixes.
+
+	* test/functional.rb (FunctionalTest::test_env_remotesources):
+	Changed test to uses Gem.sources (the sources method on
+	remote_fetcher was removed).
+
+	* test/test_remote_fetcher.rb (TestRemoteFetcher): Renamed some of
+	the test constants and instance variables so that they were more
+	consistent and explained the tests a wee bit better.
+	(TestRemoteFetcher::test_no_proxy): Added assert_data_from_server
+	and assert_data_from_proxy to make it clear what the test was
+	doing and give better error messages on errors.
+	(TestRemoteFetcher::assert_data_from_server): Added
+	assert_data_from_server.
+	(TestRemoteFetcher::assert_data_from_proxy): Added
+	assert_data_from_proxy.
+
+2006-11-30  Chad Fowler <chad@chadfowler.com>
+
+	* lib/rubygems/open-uri.rb: Removed the duplicated library.
+
+2006-11-30  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification (Gem::Specification#eql?): Allow gemspecs
+	to be used intelligently with Array#- and Array#uniq.
+
+	* lib/rubygems/installer.rb: Return extension-building results in
+	Exception on build failure.
+
+	* lib/rubygems/remote_installer.rb: Ensure gems with similar names
+	cannot be matched for install.  (Broken when searching was removed
+	from RemoteInstaller.)
+
+2006-11-29  Eric Hodel  <drbrain@segment7.net>
+
+	* post-install.rb: Now requires rbconfig.
+
+	* lib/rubygems/specification.rb, lib/rubygems/version.rb: Fixed many
+	ivar warnings due to YAML specs.
+
+	* lib/rubygems/validator.rb, lib/rubygems/validator.rb
+	(Gem::Validator#unit_test Gem::RemoteInstaller::): Ensure the
+	current directory is restored.
+
+	* lib/rubygems/remote_fetcher.rb, lib/rubygems/remote_installer.rb,
+	lib/rubygems/installer.rb: Raise more-friendly and less-deadly errors.
+
+	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#install):
+	Create version requirement correctly.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller#find_gem_to_install): Allow RemoteInstaller to
+	work with SilentUI.
+
+	* lib/rubygems/remote_fetcher.rb (RemoteFetcher#open_uri_or_path):
+	Don't double-require open-uri.
+
+2006-11-27  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb
+	(Gem::Specification#default_executable):  Fixed bug where @executables
+	could be nil when loaded from index.
+
+2006-11-21  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex#latest_specs):  Grab
+	the latest versions of everything in the index.  Written by Ryan
+	Davis.
+
+2006-11-20  Rich Kilmer  <rich@infoether.com>
+
+	* lib/rubygems/cmd_manager.rb: Added PristineCommand
+
+	* lib/rubygems/gem_commands.rb: Added PristineCommand to restore
+	gems to pristine condition in the event of files begin deleted
+	based on the cached .gem file
+
+2006-11-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/*_fetcher.rb: Removed code specific to remote source
+	index updating.
+
+	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#search):
+	Moved to Gem::SourceInfoCache#search
+
+	* lib/rubygems/source_info_cache.rb: Taught to update itself
+
+	* lib/rubygems/source_info_cache_entry.rb: Taught to update itself
+
+	* lib/rubygems/source_index.rb: Taught to update itself from a uri.
+
+2006-11-18  Chad Fowler  <chad@chadfowler.com>
+
+	* lib/rubygems/installer.rb: Applied Kevin Clark's patch to make
+	RubyGems recognize mkrf files.
+
+2006-11-17  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_remote_fetcher.rb:  Don't allow files in Dir.pwd to make
+	tests fail.  Spotted by Chad Fowler.
+
+	* lib/rubygems/remote_installer.rb (Gem::RemoteFetcher,
+	Gem::CacheFetcher):  Break out of remote_installer.rb into separate
+	files.
+
+	* lib/rubygems/remote_installer.rb (Gem::SourceInfoCache,
+	Gem::SourceInfoCacheEntry):  Allow requiring just the source cache
+	without the remote fetcher.
+
+2006-11-16  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_local_cache.rb: Moved to better name
+
+	* test/test_gem_source_info_cache.rb: Renamed test methods to match
+	implementations.  Sorted test names.
+
+	* lib/rubygems/remote_installer (Gem::SourceInfoCache): cache_data no
+	longer resets dirty flag.  Sped up source cache loading.  Exposed
+	cache file name in use.
+	
+2006-11-15  Eric Hodel  <drbrain@segment7.net>
+
+	* test/, lib/: Made files -w clean.
+
+	* test/: Made tests run independently.
+
+	* Rakefile: Tests now run with warnings on.
+
+2006-11-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/user_interaction.rb (Gem::StreamUI#progress_reporter):
+	Fix for Gem.configuration.verbose = nil, false
+
+	* lib/rubygems.rb (Gem::configuration): Fix RakeFileUtils pollution.
+
+2006-10-05  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb (Gem::Installer::shebang): Updated to
+	optionally call env_shebang if the command line option is set.
+	(Gem::Installer::shebang_env): Added this method.
+
+2006-09-25  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+	0.9.0.6.
+
+	* lib/rubygems/security.rb (Gem::Security::Exception): Added
+	permissions for cert files and directories.
+	(Gem::Security::Policy::verify_gem): File.exists? => File.exist?
+	(Gem::Security::self.verify_trust_dir): Beefed up code to create
+	trust directory structure.
+	(Gem::Security::self): Apply permissions when creating trust
+	files.
+
+	* lib/rubygems/package.rb (TarInput::initialize): File.exists? =>
+	File.exist?
+
+2006-09-24  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems.rb
+	(Gem::OperationNotSupportedError::configuration): Added
+	method_missing to configuration hash to allow nicer reference
+	syntax.
+
+2006-09-22  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::initialize): Proxy patch fixup to
+	escape user/password from Anatol Pomozov.
+	(Gem::RemoteSourceFetcher::connect_to): Proxy patch fixup to
+	escape user/password from Anatol Pomozov.
+
+	* test/test_remote_fetcher.rb (TestRemoteFetcher::setup): Proxy
+	patch fixup to escape user/password from Anatol Pomozov.
+	(TestRemoteFetcher::test_no_proxy): Proxy patch fixup to escape
+	user/password from Anatol Pomozov.
+
+	* test/io_capture.rb (Gem::IoCapture): Created new IoCapture
+	module to handle capturing output of code under test.
+
+	* test/test_installer.rb
+	(TestInstaller::test_generate_bin_symlinks_win32): Removed ugly
+	$TESTING hack and substituted new io capture module.
+	(TestInstaller::test_install_with_message): Removed one-off stdout
+	capture and replaced with new IO Capture module.
+
+2006-09-19  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+	0.9.0.3.
+
+	* test/test_version_comparison.rb (TestRequirementEquality): Added
+	more tests for Dependency equality testing and one additions check
+	for requirement vs non-requirement equality.
+
+	* lib/rubygems/version.rb (Gem::Dependency::==) Fixed '=' bug in
+	'==' code.
+
+2006-09-18 Chad Fowler <chad@chadfowler.com>
+
+	* lib/rubygems/remote_installer.rb
+	Only show the last 3 gem versions on a multiplatform remote
+	install list.
+
+2006-09-18  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::install): Added Hugh Sasse's patch for
+	skipping gems on install.
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to 0.9.0.2.
+
+	* lib/rubygems/version.rb (Gem::Dependency::hash): Added hash code
+	--http-proxy, the ENV var http_proxy and with no proxy.
+
+2006-08-26  Jim Weirich  <jim@weirichhouse.org>
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::download_gem): Fixed download_gems so that
+	it properly passes the proxy option to the fetcher class. (based
+	on patch by Andy Shen).
+
+2006-08-12  Jim Weirich  <jim@weirichhouse.org>
+
+	* bin/index_gem_repository.rb (Indexer::sanitize): Added a
+	sanitize step to the gem index generation in the hope of avoiding
+	problems with non-ASCII names in the yaml data.
+
+2006-06-14  Jim Weirich  <jim@weirichhouse.org>
+
+	* Rakefile (announce): Added 1.9 hack for ENV['CERT_DIR'].  Remove
+	this in the future if 1.9 behavior changes.
+
+2006-06-13  Jim Weirich  <jim@weirichhouse.org>
+
+	* Rakefile: ENV['CERT_DIR'] is now '' rather than nil.
+
+	* lib/rubygems/specification.rb (Gem::Specification::initialize):
+	Eric added some 1.9 compatibility code (funcall vs send).
+
+	* lib/rubygems/package.rb (TarOutput::self): Eric added some 1.9
+	compatibility code (funcall vs send).
+
+	* experimental/deployment.rb (Gem::Deployment): Moved the
+	deployment code out of the live code base into the experimental
+	directory.  The code wasn't used and the tests were not all
+	passing.
+
+2006-06-11  Jim Weirich  <jim@weirichhouse.org>
+
+	* bin/gemri: Added gemri to bin directory.
+
+	* lib/rubygems/custom_require.rb (Gem::GemPathSearcher::find):
+	Added .rbw to suffix pattern in custom_require.
+
+2006-06-07  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems.rb: Added copyright notices to all Ruby files.
+
+2006-04-07  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::RDocCommand::execute): Added
+	RI option to the rdoc subcommand.
+
+2006-04-05  Jim Weirich  <jim@weirichhouse.org>
+
+	* test/test_parse_commands.rb
+	(TestParseCommands::test_parsing_update_options): Fixed unit tests
+	to assert that the install dir is expanded.
+
+	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_ri):
+	Break out from generate_rdoc to support installing all RI docs
+	first.
+
+	* lib/rubygems/gem_commands.rb
+	(Gem::InstallUpdateOptions::add_install_update_options): Expanded
+	repository directory to absolute path.
+	(Gem::InstallCommand::execute): Make sure that *all* of the RI
+	documents are generated before generating any RDocs (due to a bug
+	in the RDoc library).
+
+	* lib/rubygems/installer.rb (Gem::ExtExtConfBuilder::self): Fixed
+	typo in ExtExtConfBuilder that prevented C based gems to install.
+	(Gem::ExtExtConfBuilder::self): Installed patch to prevent the
+	overriding of target_prefix in native extensions (thanks to Aaron
+	Patterson for the patch).
+
+2006-04-04  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+	0.8.11.10.
+
+	* lib/rubygems/incremental_fetcher.rb
+	(Gem::IncrementalFetcher::update_cache): Now falls back to bulk
+	updates if the number of gems if over 50.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::source_index): Added "bulk" to the
+	update message to differentiate it from the incremental message.
+
+	* lib/rubygems/specification.rb
+	(Gem::Specification::Specification): Modified to add dashes to
+	gemspecs generated under Ruby 1.8.3.  This makes it easier to run
+	RubyGems on a 1.8.2 system.
+
+2006-04-01  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/doc_manager.rb (Gem::DocManager::run_rdoc): Changed
+	exception handler to print error message if document generation
+	fails, but then to continue with the rest of the installation.
+	Permission errors still terminate the install because if one
+	install fails because of permission problems, chances are that all
+	will fail.
+	(Gem::DocManager::install_ri): Removed wrapping of exceptions with
+	DocumentError.  Most exceptions now don't propagate out of
+	run_rdoc.
+	(Gem::DocManager::install_rdoc): Removed wrapping of exceptions
+	with DocumentError.  Most exceptions now don't propagate out of
+	run_rdoc.
+
+2006-02-23  Jim Weirich  <jim@weirichhouse.org>
+
+	* bin/index_gem_repository.rb (MasterIndexBuilder::cleanup): Fixed
+	bug where we were trying to read the index file (to compress it)
+	before it was closed, often leading to a truncated index file.
+
+Tue Jan 24 16:26:13 2006  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/config_file.rb
+	Luca Pireddu reported a fatal error when permissions on
+	.gemrc were too restrictive.  Fixed.
+
+Tue Dec  6 14:51:13 2005  Jim Weirich  <jim@tardis>
+
+	* lib/rubygems/source_index.rb
+		(Gem::SourceIndex::load_specification): Added an untaint call to
+		make the code run in SAFE=1 mode under 1.8.3.
+	(Gem::SourceIndex::load_gems_in): Untaint here too.
+
+	* lib/rubygems/installer.rb (Gem::Installer::install): Untaint
+		here too.
+	(Gem::Installer::extract_files): Untaint here too.
+
+	* lib/rubygems/custom_require.rb
+		(Gem::GemPathSearcher::matching_file): Untaint here too.
+
+	* test/gemenvironment.rb: Added $SAFE=1 to the test environment to
+		make sure we can run in $SAFE mode.
+
+2005-12-03  Jim Weirich  <jim@tardis>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped version to
+	0.8.11.6'
+
+	* lib/rubygems/user_interaction.rb
+	(Gem::StreamUI::SimpleProgressReporter::done): Added several new
+	progress reporters.
+
+	* lib/rubygems/command.rb
+	(Gem::Command::specific_extra_args_hash): Added --verbose
+	processing.
+	
+	* lib/rubygems/config_file.rb (Gem::ConfigFile::handle_arguments):
+	Added --traceback as alias for --backtrace (I always get them
+	confused).
+	(Gem::ConfigFile::initialize): Added a verbose option.
+
+2005-11-28  Jim Weirich  <jim@tardis>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::SourceInfoCacheEntry::replace_source_index): Fixed the
+	SourceIndexCacheEntry so that it will manufacture an empty source
+	index if given a nil value for the +si+ value.
+
+2005-11-08  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems.rb: Ara Howard's fix to allow 0.0.0 to be a valid gem
+	version.
+
+2005-11-08  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: Fixed bug in gem unpack.  It was
+	sorting incorrectly, resulting in the wrong version being unpacked in
+	some edge cases. Thanks to Jakob Skjerning for the detailed bug report.
+
+2005-11-03  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/installer.rb: Fixed bug that would cause the executables
+	from the wrong gem to be uninstalled if the names matched the same
+	regex.  Thanks Eric Hodel.
+
+2005-11-01  Jim Weirich  <jim@tardis>
+	* lib/rubygems/gem_commands.rb (Gem::UpdateCommand::initialize):
+	Upgrade => Update change.
+	(Gem::UpdateCommand::execute): Upgrade => Update change.
+	(Gem::UpdateCommand::execute): Upgrade => Update change.
+
+2005-11-01  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: Allow gem unpack to accept a gem file
+	path instead of gem name: gem unpack mygem-1.0.0.gem.
+
+2005-10-31  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/installer.rb: Tilman Sauerbeck's patch to support
+	extensions built with Rake!
+
+2005-09-13  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/package.rb (TarInput::initialize): Removed
+	requirement for SSL when signatures are found in a gem.  Only
+	require SSL if the security policy requires checking the
+	signatures.
+
+	* lib/rubygems/custom_require.rb (Kernel::require): Disabled
+	autorequire during custom require.
+
+2005-09-07  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_openssl.rb (Gem::ensure_ssl_available): Added a
+	test in gem_openssl to make sure the ruby portion of ssl is also
+	loaded.
+
+2005-08-31  Jim Weirich  <jim@weirichhouse.org>
+
+	* Rakefile (install): Changed the rake install task to use setup.rb.
+
+2005-07-08  Chad Fowler  <chad@chadfowler.com>
+
+	* lib/rubygems/remote_installer.rb: Applied Daniel Roux's patch
+	to make RubyGems work with authenticating proxies.
+
+2005-07-08  Jim Weirich  <jim@weirichhouse.org>
+
+	* Preparing for release 0.8.11.
+
+2005-06-12  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb
+	(Gem::Installer::installation_satisfies_dependency): Refactored
+	dependency check into ensure_dependency! and
+	installation_satisfies_dependency?.
+
+2005-06-12  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems.rb,lib/rubygems/installer.rb: Applied Mark Hubbart's
+	* lib/rubygems/remote_installer.rb: Applied David Glasser's install-
+	* Applied Paul Duncan's incredibly complete gem signing patch.
+	Thanks, Paul!
+	* lib/rubygems/installer.rb: Fixed bug in installer that caused
+	dependency installation not to work.
+
+2005-06-06  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/specification.rb: Fixed Erik hatcher's reported bug
+	of gem directories having "-" at the end of their names (e.g.
+	"BlueCloth-1.0.0-".
+
+2005-06-01  Jim Weirich  <jim@weirichhouse.org>
+
+	* scripts/specdoc.rb (_resolve_links): Updated to generate hieraki
+	format so it can be included in the docs.rubygems.org site.
+
+	* test/test_specification.rb (TestSpecification::test_to_ruby):
+	Fixed test on date that hard-coded a specific date.
+
+2005-05-29  Jim Weirich  <jim@weirichhouse.org>
+
+	* Changes from the Seattle Code fest: (1) Package list command
+	(e.g. gem inspect GEM).  (2) .gemrc settings now allow cvsrc like
+	options to set defaults per subcommand.  (3) The autorequire spec
+	attribute will now accept a list.  (4) Binwrappers vs symlinks
+	(more info to follow).  (5) Substituted Time for Date in specs,
+	increasing performance dramatically in an important area.
+
+2005-05-04  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems.rb (Gem::Exception::find_home): Changed rescue
+	clause from Exception to StandardError.  Exception doesn't seem to
+	catch everything ... I'm not sure I understand why.
+
+2005-04-29  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/specifiation.rb: Marcel Molina's patch to discover
+	which attributes in the spec are Array attributes.
+
+2005-04-27  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: -y is now a synonym for 
+	--include-dependencies
+
+2005-04-21  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/installer.rb: Added non-require_gem dependency check
+	for installation.
+
+2005-04-03  Chad Fowler <chad@chadfowler.com>
+
+	* pre-install.rb: Added version check to RubyGems installation.
+
+2005-03-25  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/rubygems_version.rb (Gem): Created release for
+	0.8.10.
+
+	* lib/rubygems/gem_commands.rb
+	(Gem::UpdateCommand::do_rubygems_update): Update --system now runs
+	the ruby command directly rather than trying to load the
+	update-rubygems command.  There were too many things to go wrong
+	with the old way.
+
+2005-03-24  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::find_dependencies_not_installed): Fixed to
+	reload source index before attempting to detect dependencies.
+
+2005-03-23  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::find_dependencies_not_installed): Switched
+	to using SourceIndex#find_name to detect missing dependencies,
+	avoiding a gem activation during an install.
+
+	* lib/rubygems/installer.rb (Gem::Installer::install): Removed
+	activate call from install step.  If we need to do something about
+	dependencies at this time, then we need a better way to do them.
+
+	* lib/rubygems.rb: Removed the require for rubygems/timer.
+
+2005-03-16  Jim Weirich  <jim@weirichhouse.org>
+
+	* test/gemenvironment.rb (TestEnvironment::create): Added require
+	on gem/builder.
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex::initialize):
+	Allowing default argument to new to be an empty hash.
+	(Gem::SourceIndex::from_installed_gems): Refactored into a class
+	method that invokes a instance method.
+	(Gem::SourceIndex::refresh): Refresh now does a complete reload
+	from disk.  This should be more accurate that the earlier version.
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): removed
+	unneeded refresh!.
+
+	* lib/rubygems.rb (Gem::Exception::source_index): Removed
+	automatic refresh from Gem.source_index ... it wasn't reliable
+	when removing installed gems.
+	(Gem::Exception::activate): Added detection of previously loaded
+	gems.
+
+2005-03-15  Chad Fowler  <chad@chadfowler.com>
+
+	* bin/gem_server: (htonl) rdoc opens in existing browser window.
+
+2005-03-14  Jim Weirich  <jim@weirichhouse.org>
+
+	* Released 0.8.8
+	
+2005-03-14  Jim Weirich  <jim@weirichhouse.org>
+
+	* Released 0.8.7
+	
+2005-03-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/installer.rb (Gem::Installer#shebang): Refactored and
+	stripped result to avoid ^M issues.
+
+2005-03-11  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::DependencyCommand): Added a
+	new command "gem dependency" to show the dependencies of an
+	installed gem.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
+	Added DependencyCommand to the command manager registrar.
+
+	* lib/rubygems/version.rb (Gem::Requirement): Unnested Requirement
+	from the Version class.  There was no benefit to having it nested.
+	Gem::Version::Requirement is set to point to the new class so to
+	be compatible with old gems.
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::ask_if_ok): Changed
+	uninstaller confirm message to read 'Continue with uninstall'.
+	Its clearer that way.
+
+	* lib/rubygems.rb (Gem::Exception::required_location): Switch to
+	use SourceIndex#find_name rather than search.  Made sure a nil
+	value is returned with a path is not found.
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex::search): Changed
+	parameter name to gem_pattern to emphasize using Regex in search.
+	(Gem::SourceIndex::find_name): Added find_name to handle the
+	common case of searching for an exact match on the short name.
+
+	* lib/rubygems.rb (Gem::Exception::activate): Make sure that
+	activate more closely adheres to honoring the auto_require=>false
+	request.
+	(Gem::Exception::report_activate_error): Out of line error
+	reporting for activate.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::find_dependencies_not_installed): Found
+	another location that was using require_gem with auto_require.
+	Fixed to use :auto_require=>false.
+
+	* lib/rubygems/gem_commands.rb
+	(Gem::InstallUpdateOptions::add_install_update_options): Added
+	--ignore-dependencies option.  Still needs to be wired to logic.
+
+	* lib/rubygems/installer.rb (Gem::Installer::install): Added call
+	to require_gem_with_options.
+
+	* lib/rubygems.rb (Kernel::require_gem_with_options): Added to
+	allow easier specification of the autorequire flag for
+	Gem.activate.
+
+2005-03-10  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::normalize_uri): Normialize a URI to
+	start with http:// if it does not already.
+
+	* test/test_deployment.rb (TestDeployment::xtest_deploy_sources):
+	Disabled this test.  It is part of the new deployment software and
+	is not working yet.
+
+2005-03-09  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/gemconfigure.rb (Gem::self): Added to aid dynamic
+	versioning.
+
+	* lib/rubygems/command.rb (Gem::Command::command_manager): Moved
+	command_manager to base class.
+
+	* lib/rubygems/gem_commands.rb (Gem::CleanupCommand::execute):
+	Both implicit and explicit gems now work with cleanup.  
+
+2005-03-08  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
+	Fixed source index to be loaded from the installed gems when doing
+	an "OK TO REMOVE" dependency check.
+
+2005-03-06  Rich Kilmer <rich@infoether.com>
+	* lib/rubygems/deployment.rb: beginning of a deployment capability
+
+	* test/test_deployment.rb: first tests of new deployment system
+
+2005-03-04  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: Small bugfix for the case when you
+	pass in a gem name (or more) to cleanup for the cleanup command.
+
+2005-03-04  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
+	Reworked logic in uninstall to be intelligent about dependencies.
+	We only complain about dependencies if removing a gem will cause a
+	dependency error.  The uninstaller now checks for :ignore, :all
+	and :executables options.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
+	Registered Cleanup command.
+
+	* lib/rubygems/gem_commands.rb (Gem::CleanupCommand): Added
+	Cleanup command to gem.
+	(Gem::UninstallCommand::initialize): Added --all, --ignore and
+	--executables options to uninstall.  This helps to avoid excessive
+	YESes all the time.
+
+2005-02-28  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::LocalSourceInfoCache::write_cache): Open cache file in
+	binary mode.
+
+2005-02-28  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/config_file.rb: don't warn about not being able to
+	find config file.
+	* lib/rubygems/doc_manager.rb: (for DHH) don't install rdoc docs for
+	* lib/rubygems/gem_commands.rb: Print which gems are updated on 'gem
+	update'.  If --system is used, report that the rubygems system
+	software has been updated.
+	* lib/rubygems/installer.rb: Cleaned up the uninstall has_dependents
+	logic and output.  It was misleading and buggy before.
+
+2005-02-27  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/config_file.rb
+	(Gem::ConfigFile::default_config_file_name): Fixed bug in finding
+	home directory for the .gemrc file.
+
+2005-02-27  Chad Fowler  <chad@chadfowler.com>
+
+	* Released 0.8.6
+
+	* Fixed a small bug with shebang construction
+
+2005-02-26  Jim Weirich  <jim@weirichhouse.org>
+
+	* Released 0.8.5
+
+	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+	Removed warning about generating rdocs on gems w/o an rdoc flag.
+
+	* lib/rubygems/gem_commands.rb
+	(Gem::UpdateCommand::do_rubygems_update): Added --system option to
+	update to specifically update the version of rubygems.
+	(Gem::UpdateCommand::which_to_update): Fixed some refactoring bugs
+	in the which_to_update method.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::LocalSourceInfoCache::read_cache): switched to Marshal
+	rather than Yaml for local cache.
+
+	* bin/gem: Added requirement for Ruby >= 1.8.0.
+
+2005-02-10  Chad Fowler  <chad@chadfowler.com>
+	* bin/gem_server: Added Martin Ankerl's wonderful new gem_server
+	template
+
+2005-01-27  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: Fixed
+	`gem update` so it accepts a list of gems to update and _only_
+	updates those.
+	* lib/rubygems/installer.rb: Fixed a bug in the new shebang code.
+	* lib/rubygems/remote_installer.rb: Attempt to fix Curt Hibbs'  
+	reported Proxy bug without actually having a proxy to test with.
+
+2005-01-22  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/custom_require.rb: Lyle Johnson's fix for Bug #1379
+
+2005-01-20  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/validator.rb: Applied Austin Ziegler/Kasper Schiess's
+	patch to fix unit test running bug.
+
+2005-01-14  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/installer.rb: attempt at fixing Ryan Davis's
+	reported Shebang bug.  STILL NOT WORKING, because it doesn't work
+	with ^M characters.
+	* lib/rubygems/config_file.rb: small but ugly error fixed if no
+	config file exists.
+	* lib/rubygems/remote_installer.rb: Fixed bug http://rubyforge.org/tracker/index.php?func=detail&aid=1331&group_id=126&atid=575.
+
+2005-01-01  Chad Fowler  <chad@chadfowler.com>
+	* Released 0.8.4
+
+2004-12-31  Jim Weirich  <jim@weirichhouse.org>
+
+	* Rakefile: Switch to standard Rake test tasks.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::read_data): Added a retry to try a
+	lower case gem name if the open failed.  This fixes a problem
+	where case differences are preventing some gems from installing.
+
+2004-12-29  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::execute):
+	Changed the RemoteInstaller to take an options hash rather than
+	individual options.  This will leave the interface more resilient
+	to changes as more options are added
+	(e.g. --install_dependencies).
+
+	* lib/rubygems/specification.rb (Gem::Specification): Marked array
+	attributes explicitly.  This allows for explicit conversion to
+	arrays when assigned.
+
+	* test/test_specification.rb
+	(TestSimpleSpecification::test_array_attributes): Added test for
+	array_attributes forcing values to arrays.
+
+2004-12-28  Jim Weirich  <jim@tardis>
+
+	* lib/rubygems.rb (Gem::Exception::ensure_gem_subdirectories):
+	Fixed the Ryan Davis patch to work correctly when directories are
+	not writable.
+	
+2004-12-18  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/version.rb: Erik Veenstra's sort patch.
+	* lib/rubygems.rb: Ryan Davis's installation bug fix.
+
+2004-12-14  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* test/test_loadmanager.rb: invalidated it as a unit test; it's
+	incompatible with custom_require.rb.
+
+2004-12-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/custom_require.rb: simple bug fix.
+
+2004-12-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/custom_require.rb: new file to replace
+	loadpath_manager.rb and speed up the custom require functionality.
+
+	* lib/rubygems/timer.rb: new file; simple benchmarking tool that's
+	useful at the moment but needn't stay in RubyGems permanently.
+
+	* lib/rubygems/source_index.rb: include Enumerable and implement #size
+	and #length.
+
+	* lib/rubygems/specification.rb: removed lazy initialisation of
+	attributes to reduce #copy_of invocations; folded
+	Specification.copy_of into Specification#copy_of.
+
+	* lib/rubygems.rb: require 'rubygems/custom_require' instead of
+	'rubygems/loadpath_manager'; removed out of date documentation; added
+	"require 'rubygems/timer'" to temporarily assist with benchmarks.
+
+2004-12-07  Jim Weirich  <jim@weirichhouse.org>
+
+	* Released 0.8.3
+
+2004-12-06  Jim Weirich  <jim@weirichhouse.org>
+
+	* test/test_specification.rb
+	(TestLegacyYamlSpecification::test_load): Fixed test to avoid the
+	__FILE__ stuff.  Running tests from rakefile guarantees that the
+	file paths start from the right location.
+
+	* pkgs/sources/sources.gemspec: Made Gem.sources_spec idempotent.
+
+	* lib/rubygems/specification.rb (Gem::Specification::initialize):
+	Added @@gather to Gem::Specification to facilitate proper loads.
+	(Gem::Specification::Specification): Added Specification.load.
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex): Fixed comments
+	'long name' => 'full name'.
+
+	* lib/rubygems/gem_commands.rb (Gem::BuildCommand::load_gemspecs):
+	Changed to use Gem.Specification.load.
+
+	* Rakefile: Added sources-*.gem to clobber list.
+	(egrep): Upgraded the DBG finder to include breakpoint.
+
+	* post-install.rb (install_sources): Using block version of chdir.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::LocalSourceInfoCache::read_cache): Fixed initialization of
+	cache.
+
+	* lib/rubygems.rb: Updated version to 0.8.2.
+
+2004-12-04  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::LocalSourceInfoCache::writable_file): Now just returns the
+	selected cache file (which was selected based on writability).
+	(Gem::LocalSourceInfoCache::try_file): Added try_file to determine
+	if a file is a candidate for a cache file.
+	(Gem::LocalSourceInfoCache::select_cache_file): Added failure if
+	there are not valid cache file candidates.
+
+	* lib/rubygems.rb (Gem::Exception): Renamed @@cache to
+	@@source_index.
+	(Gem::Exception::source_index): Renamed Gem.cache to
+	Gem.source_index (but left cache as an alias).
+
+2004-12-03  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb (Gem::LocalSourceInfoCache):
+	Added a local cache manager object to implement the read/write
+	policies on the system and user cache files.
+	(Gem::LocalSourceInfoCache::update): Added update and flush to the
+	caching fetcher so that it knows when it needs to update the local
+	cache files.
+	(Gem::RemoteInstaller::initialize): Switched to using a cached
+	fetcher in the remote installer.  All the caching logic was
+	removed from the installer.  User writable cache files are now
+	supported.
+	(Gem::RemoteInstaller::write_gem_to_file): write_gem_to_file now
+	will create the path if needed.
+
+2004-12-02  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/package.rb (TarInput::zipped_stream): To workaround
+	a problem with earlier than 1.2.1, we read the zipped data into a
+	string, and then return an IO object on that string.
+	(TarInput::each): Refactored getting a stream to the zipped data
+	into <tt>zipped_stream</tt>.
+
+2004-12-01  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::convert_spec): We now proprocess the
+	yaml string data to reduce it in size.  This was done to
+	workaround a problem with large YAML files (although it is just a
+	temporary fix because our yaml data keeps growing and growing).
+
+	* Rakefile: Added more targets to the clobber target.
+
+	* test/test_remote_fetcher.rb
+	(TestRemoteFetcher::test_explicit_proxy): Added tests for proxy
+	support.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::connect_to): Refactored to add proxy
+	support.
+
+2004-11-28  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/loadpath_manager.rb: Added Mauricio's patch to work
+	around string contains null byte issue.
+
+2004-11-27  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::get_size): Switched from open-uri with
+	early abort to an HTTP.head call to get the size of the yaml file
+	on the server.
+
+2004-11-26  Jim Weirich  <jim@weirichhouse.org>
+
+	* test/test_specification.rb
+	(TestDefaultSpecification::test_defaults): Added test for some
+	basic defaults in a gem spec.
+
+	* test/test_remote_installer.rb (MockFetcher::source_info): Made
+	the fake test data more realistic.
+	(TestRemoteInstaller::test_source_info): Improved tests.
+
+2004-11-26  Jim Weirich  <jim@tardis>
+
+	* test/test_remote_installer.rb (MockFetcher): Added MockFetcher
+	to make testing the remote installer easier. Currently there are
+	two remote installer test classes.  Eventually TestRemoteInstaller
+	will succeed RemoteInstallerTest, which is very incomplete.
+
+	* test/test_package.rb (TC_TarReader::TC_TarInput): Made the unit
+	test ignore the setgid bit.  The setgid bit doesn't work on my
+	laptop for some reason.  This may be a problem with my laptop
+	rather than with this code.  Should investigate further.
+
+	* lib/rubygems/remote_installer.rb (Gem::RemoteSourceFetcher):
+	Added a Fetcher object to the remote installer to handle all the
+	details of getting the remote information.  This allows testing
+	the logic of the remote installer without actually doing remote
+	calls.
+	(Gem::RemoteInstaller::sources): Renamed get_caches to
+	source_info.  The problem is that cache is too generic and there
+	are actually several things that we will cache in the system.
+
+	* lib/rubygems/cache.rb (Gem::Cache::self): Changed interface to
+	from_installed_gems slightly.
+	(Gem::Cache::self): Reordered rescue clauses so that the syntax
+	exception might actually be handled.
+
+	* lib/rubygems.rb (Gem::Exception::ensure_gem_subdirectories):
+	Dumped the check_gem_subdirectories method to use the almost
+	identical ensure_gem_subdirectories method.
+	(Gem::Exception::ensure_gem_subdirectories): Only attempt to
+	create the gem subdirectories if we can actually write them.
+
+	* bin/gem_server: Added date of last file modification to header
+	of /yaml.  This is in preparation for using a head command with
+	date/time stamping in fetching the source cache.
+
+2004-11-25  Ryan Davis <ryand@zenspider.com>
+	* lib/rubygems.rb: Added GEM_SKIP functionality, which will tell
+	loadpath_manager not to load specific libs from gems.  For
+	testing/ development purposes.  Created by Ryan Davis.
+
+2004-11-24  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/specification.rb: Allow multiple authors per gem.
+	* lib/rubygems/gem_commands.rb: command line error message if you
+	run 'gem install' with no args.
+	* lib/rubygems/loadpath_manager.rb: Fixed @specs bug as reported by
+	Lothar Schulz on ruby-talk.
+
+2004-11-07  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems.rb,lib/rubygems/installer.rb,lib/rubygems/cache.rb
+	lib/rubygems/remote_installer.rb,lib/rubygems/gem_commands.rb: 
+	Fixes to make non-root installation work properly.  Still need to
+	fix uninstallation.
+	* lib/rubygems/gem_commands.rb: Allow multiple gems/gem names on the
+	command line for install.
+
+2004-10-31  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/version.rb,test/test_version_comparison.rb: Patrick May's
+	* post-install.rb: Patrick May's fix for rubygems lib not being found
+	during install.
+
+2004-10-29  Chad Fowler <chad@chadfowler.com>
+	* packages/,pkgs,install.rb: renamed "packages" to "pkgs" to avoid
+	* remote_installer.rb: Added user-agent reporting for remote
+	operations
+	* setup.rb,install.rb,bin/update_rubygems: removed install.rb and 
+	added setup.rb and post-install.rb.  Changed update_rubygems so that
+	params passed to it can be passed on to setup.rb
+		
+2004-10-25  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb
+	(Gem::Uninstaller::remove_executables): Corrected spelling of
+	"addtion".
+
+2004-10-24  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/version.rb (Gem::Version::Requirement::self): Now
+	properly handles arrays of version constraints.
+
+	* lib/rubygems/loadpath_manager.rb
+	(Gem::LoadPathManager::Gem::Specification): Added comments
+	describing the fast Spec class purpose. Added to_s to
+	Gem::Specification (both fast and slow versions).
+	(Gem::LoadPathManager.paths): Returns (cached) list of gem paths.
+	(Gem::LoadPathManager::self): Refactored to use glob_over in
+	search_loadpaths and search_gempaths.
+
+	* lib/rubygems/installer.rb: Added some requires.
+
+	* lib/rubygems/cache.rb (Gem::Cache::refresh): Fixed refresh! to
+	call load_specification on the Cache class, not on itself.
+
+	* lib/rubygems.rb (Gem::Exception::activate): added comments to
+	activate.  Also made sure that partial name matches in the gem
+	cache search were avoided.
+	(Gem::Exception::clear_paths): Added code to clear the gem cache
+	when reseting the gem paths.
+	(Gem::Exception::require): Added a function to take a gem name and
+	a library file name (in that gem) and return a path to the library
+	in the gem.  David HH was interested in this in order to speed up
+	some require statements under ModRuby.  Eventually I hope we won't
+	need these special tricks.
+	(Gem::Exception::latest_partials): Fixed bug that assumed exactly
+	three digits in a version number.
+
+	* Rakefile (egrep): Added two tasks to find all the FIXME/TODO
+	markers in the source code comments and to find the DBG print
+	lines.
+
+2004-10-23  Jim Weirich  <jim@weirichhouse.org>
+
+	* test/test_specification.rb
+	(TestSimpleSpecification::test_add_bindir_to_list_of_files):
+	Verify that an executable doesn't need the bindir if bindir is
+	set.
+	(TestSimpleSpecification::test_no_bindir_in_list_of_files): Added
+	test the verify that exectuable can be written without a default
+	binder.
+
+	* lib/rubygems/installer.rb
+	(Gem::Installer::generate_bin_scripts): Added check so that the
+	bindir is access only when there are actually executables to
+	install.  Checking for an installable bindir was giving permission
+	errors when installing test gems.
+
+2004-10-21  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/installer.rb: Show extension build errors during install
+	in addition to logging them to gem_make.out
+
+2004-10-02  Chad Fowler <chad@chadfowler.com>
+
+	* lib/rubygems/validator.rb,lib/rubygems/gem_commands.rb: Added
+	--test option for "gem check" that runs unit tests on already-
+	installed gems.
+
+2004-09-30  Rich Kilmer  <rich@infoether.com>
+
+	* lib/rubygems/specification.rb -  externalized the loaded_from runtime 
+	var on specification
+	* lib/rubygems/cache.rb - optimized cache refresh! method and refactored 
+	processing of files when building cache.
+	* lib/rubygems/loadpath_manager.rb - fixed bug in loadpath manager in 
+	finding native extensions that have ext on os x, win32 and solaris
+
+2004-09-20  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb:  If file match during local install is
+	a directory, don't try to treat it erroneously as a gem (bug reported
+	by Rich).
+	* lib/rubygems.rb:  Fixed small bug in #latest_load_paths
+
+	(NOTE: It looks like 0.8.0/0.8.1 was released in this timeframe)
+	
+2004-09-14  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems.rb: Fixed bug in require_gem (thanks Jamis Buck!)
+	that would require a gem based on an inexact search of its name
+	in the local cache.  This caused copland-webrick to be loaded
+	when a request was made for "copland".
+
+2004-09-12  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/specification.rb, test/test_specification.rb: Removed
+	library_stubs attribute.
+
+2004-09-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* scripts/specdoc.rb: Check that all attributes are documented; and
+	  improved formatting.
+	* scripts/specdoc.yaml: test_suite_file -> test_files; finished
+	  documentation.
+	* scripts/specdoc.data: misc changes.
+
+2004-09-11  Chad Fowler <chad@chadfowler.com>
+
+	* test/test_parse_commands.rb: Fix failing unit tests due to Rich's fix from
+
+	* lib/rubygems/specification.rb: Add bindir to executable path on file list
+
+2004-09-11  Rich Kilmer <rich@infoether.com>
+
+	* lib/rubygems/gem_commands.rb - got rid of stub options
+
+	* lib/rubygems/install.rb - changed output of messages so the UI would format
+	better 
+
+	* bin/gem_server - exit! from ^c
+
+2004-09-09  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/loadpath_manager.rb: Small bug when gem specs have ruby 
+	version requirements.
+	* lib/rubygems/specification.rb, lib/rubygems/gem_commands.rb: Fixed failing
+	functional test.
+
+2004-09-08  Chad Fowler <chad@chadfowler.com>
+	* install.rb: added stub removal to the install process
+
+2004-09-06  Chad Fowler <chad@chadfowler.com>
+	* test/test_package.rb: Fixed failing unit test as per Mauricio's email to 
+	the rubygems list.
+	* Fixed minor issues with Windows cmd file generation.
+
+2004-09-06  Rich Kilmer <rich@infoether.com>
+	* lib/rubygems/remote_installer.rb - enabled caching of source caches
+	based on the size of the yaml.Z/yaml file.
+	
+2004-08-29  Chad Fowler <chad@chadfowler.com>
+	* /lib/rubygems/gem_command.rb: small big fix for local gem installs
+	on Windows.
+
+2004-08-28  Rich Kilmer <rich@infoether.com>
+
+	* /lib/rubygems/installer.rb, /lib/rubygems/doc_manager.rb, 
+	/lib/rubygems/cmd_manager.rb - Added an exception: FilePermissionError
+	which checks to ensure write access to the install/uninstall/rdoc 
+	destination directories and raises a nice error instead of the standard
+	one. 
+
+2004-08-28  Rich Kilmer <rich@infoether.com>
+
+	* /lib/rubygems/installer.rb - commented out stub addition and removal
+
+2004-08-28  Rich Kilmer <rich@infoether.com>
+
+	* /lib/rubygems.rb, /lib/rubygems/loadpath_manager.rb -
+	this adds all the loadpath_manager stuff with the 'ultimate require hack' to
+	rubygems.rb.  Also, require_gem methods body has been extracted into a method
+	Gem.activate that differs in the calling signature in that the second param is
+	a boolean that determines whether to autorequire or not.
+
+2004-08-27  Rich Kilmer <rich@infoether.com>
+
+	* lib/rubygems/user_interaction - added ask_yes_no as a method
+	which returns true/false and formats/processes the [yn] stuff.
+	it also has an optional second parameter of true/false for the
+	default value.
+
+	* lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb, 
+	lib/rubygems/command_manager.rb - changed all places where ask 
+	was used with [Yn] to ask_yes_no
+
+2004-08-24  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/installer.rb: Library stubs are now installed as per
+	  'library_stubs' gemspec attribute.  A stub is (still) also installed
+	  for the 'autorequire' attribute.  All library stub handling
+	  refactored into two new classes: LibraryStubs and LibraryStub.
+
+	* test/test_parse_commands.rb: as per 2004-08-17 below, the 'update'
+	  command takes --rdoc as its default now.
+
+2004-08-22  Rich Kilmer <rich@infoether.com>
+	* lib/rubygems/installer.rb: fixed stub generation...i added the version 
+	stuff that only app stubs should have...sorry!
+
+2004-08-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/gem_commands.rb: --rdoc is default on 'update' command,
+	  consistent with 'install'.  'default_str' methods changed to reflect
+	  --rdoc being default now.
+
+2004-08-21  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: Proper checking for gems in local 
+	directory on local install.  rescue Gem::LoadError to avoid ugly
+	backtrace.
+	* lib/rubygems/installer.rb: created Gem::LoadError to hold extra
+	metadata.  Setting up for proper dependency installation on local
+	installs.
+	
+2004-08-20  Chad Fowler  <chad@chadfowler.com>
+	
+	* lib/rubygems/specification.rb: Fixed small bug in the previous spec
+	change commit.
+
+	* lib/rubygems/cache.rb: Prevent catastrophic failure if a gemspec is 
+	corrupted.
+
+	* lib/rubygems/installer.rb: Fixed (in not a great way) a bug that would
+	cause a zero-length spec file to be written to the gem specifications
+	directory.
+
+2004-08-19  Chad Fowler  <chad@chadfowler.com>
+
+	* lib/rubygems/specification.rb: #files auto-includes any #extensions,
+	#extra_rdoc_files, #test_files, etc. that weren't explicitly added
+	to the file list.
+
+2004-08-18  Chad Fowler  <chad@chadfowler.com>
+
+	* lib/rubygems/specification.rb: One more bug with #test_files.
+	Default value of [] wasn't set, resulting in an attempt to call
+	#empty? on nil.
+
+	* lib/rubygems/gem_commands.rb: Unit tests appear to be working now.
+	Still more testing to do.
+
+	* lib/rubygems/remote_installer.rb, lib/rubygems/installer.rb: Fixed
+	minor bugs in default selections for questions asked during 
+	installation and uninstallation
+	
+2004-08-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/specification.rb:
+	  - #test_suite_file and #test_files now work on older gems.
+	  - Added Specification.from_yaml for loading YAML gemspecs
+	  - #to_ruby doesn't emit 'specification_version'
+
+	* lib/rubygems/gem_commands.rb: Updated test-on-install code to use
+	  Specification#test_files instead of #unit_test_suite.
+
+	* lib/rubygems/old_format.rb: Use Specification.from_yaml
+	* lib/rubygems/package.rb:    Ditto
+
+2004-08-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/command.rb: --debug option to turn on $DEBUG
+	* lib/rubygems/config_file.rb: ditto
+
+2004-08-11  Rich Kilmer <rich@infoether.com>
+	* lib/rubygems/installer.rb: The application stub now defaults to 
+	the latest version of the library, and optionally allows an initial 
+	parameter conforming to _VERSION_ to be passed to select a prior 
+	version of the library (this initial parameter, if present, is shifted 
+	off of ARGV). This change was re-added...I erased it somehow :(
+
+2004-08-11  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/gem_commands.rb:
+	  - 'gem spec X' displays spec for _latest_ version of X.  Added
+	    '--all' option if you want to see all versions.
+	  - RDocCommand code cleanup and slight change: document _all_
+	    versions of the gem by default, not just the first.
+
+	* lib/rubygems/doc_manager.rb: removed 'kilmer' default template
+	  option and obsolete error message.
+
+2004-08-12  Chad Fowler <chad@chadfowler.com>
+	* Added "gem rdoc" command for generating docs for already-installed
+	gems
+
+2004-08-11  Rich Kilmer <rich@infoether.com>
+	* bin/generate_yaml_index: updated to work with new gem format (and use the Gem::Format
+	 class to read).  Will deploy after testing on RubyForge.
+	* lib/rubygems/gem_commands.rb: generate rdoc by default on installs (I think this is
+	 just good practice.
+	* lib/rubygems/remote_install.rb: raise an exception if dependent gems cannot be found 
+	 on remote_install
+
+2004-08-11  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: query is now case insensitive (as it used to be)
+	* lib/rubygems/installer.rb: gem_make.out wasn't being written when an extension failed to compile.
+
+2004-08-11  Rich Kilmer <rich@infoether.com>
+
+	* removed String.to_requirement...we should not modify 
+	  base classes in Ruby! modified to get rid of said to_requirement 
+	  with Gem::Version::Requirement.create(obj)
+
+	* specification.rb - fixed constructor bug of version requirement...
+	  it now defaults to Requirement.default
+
+2004-08-11  Chad Fowler <chad@chadfowler.com>
+
+	* One more specification.rb bug fixed.
+
+2004-08-11  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/specification.rb:
+	  - Added convenience class methods: attribute_names,
+	    attribute_defaults, default_value, required_attributes, and
+	    required_attribute?.
+
+	  - IMPORTANT: attribute readers now use lazy initialization, just
+	    like some of them did before the 2004-08-01 change.  This was done
+	    to fix the breakage when loading older gemspecs.
+
+	  - IMPORTANT: replaced instance variable access with attribute reader
+	    method calls in many cases.  This is in line with the above change.
+
+	  - Good documentation for the "attribute" method.
+
+	  - Renamed _copy -> _copy_of.
+
+	* lib/rubygems/cache.rb:
+	  - Some fairly shallow changes. Exception handling needs improvement.
+
+	* lib/rubygems/version.rb:
+	  - (Version.create) new method (for convenience)
+	  - (Version::Requirement.create) new method (for convenience)
+	  - (Version::Requirement.default) new method (for consistency)
+
+	* test/test_specification.rb: test attribute_names instead of
+	  attributes.  Other "class convenience" methods remain to be tested
+	  at this stage.  Also added test classes for legacy gemspecs.
+
+	* test/data/legacy/keyedlist-0.4.0.ruby: added.
+	* test/data/legacy/keyedlist-0.4.0.yaml: added.
+
+2004-08-06  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/specification.rb:
+	  - Added convenience class methods: attribute_names,
+	    attribute_defaults, default_value, required_attributes, and
+	    required_attribute?.
+
+	  - IMPORTANT: attribute readers now use lazy initialization, just
+	    like some of them did before the 2004-08-01 change.  This was done
+	    to fix the breakage when loading older gemspecs.
+
+	  - Good documentation for the "attribute" method.
+
+	  - Renamed _copy -> _copy_of.
+
+	* test/test_specification.rb: test attribute_names instead of
+	  attributes.  Other "class convenience" methods remain to be tested
+	  at this stage.
+
+2004-08-01  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/specification.rb:
+	  - (Re)defined class methods: attribute, attributes,
+	    required_attribute, read_only, overwrite_accessor.	@@attributes
+	    contains a list of attribute names and default values.  This
+	    allows higher-level specification of gemspec attributes, and the
+	    handling of them in a DRY fashion.
+
+	  - to_yaml_properties now includes all properties, to ensure
+	    correct deserialization of a Gem::Specification object.
+
+	  - #to_ruby and #to_yaml_properties rewritten to use @@attributes
+
+	  - Introduced 'specification_version' attribute and three constants:
+	    NONEXISTENT_SPECIFICATION_VERSION, CURRENT_SPECIFICATION_VERSION, and
+	    SPECIFICATION_VERSION_HISTORY.  This allows us to track changes to
+	    the spec format.
+
+	  - Refactored several "helper" methods, using the new class method
+	    'attribute_alias_singular', which provides a "singular" alias for
+	    a "plural" attribute (e.g. require_path and require_paths).
+
+	  - All gemspec attributes now defined in a uniform fashion, which
+	    implies that they all have valid instance variables on
+	    initialization.  Previously, some attributes were lazily
+	    initialized.
+
+	  - Introduced attribute 'library_stubs', to allow the specification
+	    of several stub files.  (That feature not implemented, though.)
+
+	  - Introduced attribute 'test_files' and deprecated 'test_suite_file'.
+
+	  - Provided #warn_deprecated stub of a method, but don't know what to
+	    do with it.
+
+	  - Deprecated #has_test_suite? in favour of (new) #has_unit_tests?
+
+	  - Used overwrite_accessor to provide special behaviour for the
+	    setting of some attributes.
+
+	  - The 'date' attribute is now a Date object.	We don't need high
+	    resolution, and Time objects, being system-dependent, are not nice
+	    to deal with.
+
+	  - Various code style changes.
+
+	  - Summary: uniform treatment of gemspec attributes; reduced code by
+	    refactoring; 'test_suite_file' deprecated for 'test_files';
+	    'library_stubs' introduced; spec versioning introduced.
+
+	* lib/rubygems/version.rb: (Dependency) added #to_s, #==, and an
+	  alias (requirements_list -> requirement_list).
+
+	* test/test_specification.rb: several new tests: _singular_attributes,
+	  _deprecated_attributes, _defaults, _to_{yaml,ruby}_and_back,
+	  _directly_setting_dependencies_doesnt_work, and more.  Plus a new
+	  class to give Specification a more thorough workout (TestSpecificationComplex).
+
+	* scripts/runtest.rb: require 'pp' so it's always available in unit
+	  tests.
+
+2004-07-30  Rich Kilmer  <rich@infoether.com>
+
+	* lib/rubygems/installer.rb The application stub now defaults 
+	  to the latest version of the library, and optionally allows 
+	  an initial parameter conforming to _VERSION_ to be passed
+	  to select a prior version of the library (this initial 
+	  parameter, if present, is shifted off of ARGV).
+
+	* lib/rubygems/version.rb correct? is now a class method on
+	  Version enabling Gem::Version.correct?(...)
+
+	* lib/rubygems/install.rb make it so uninstalling a gem will
+	  not remove executables if another version of that gem is 
+	  installed and needs those executables
+
+2004-07-26  Jim Weirich  <jim@tardis>
+
+	* lib/rubygems.rb (Gem::Exception::latest_load_paths): Added
+	latest_load_paths and refactored all_load_paths to use common
+	code.
+
+2004-07-25  Rich Kilmer  <rich@infoether.com>
+	* fixed bug in using --source in command.rb (removed short -s version)
+
+	* changed spec to use the RUBY_PLATFORM for Platform::CURRENT
+
+	* added ability to choose from list of available gems on remote install
+	  if (1) some of the gems are binary and (2) there are move than one.
+	  If the gems are all source gems, the latest is selected.
+
+2004-07-25  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems.rb (Gem::Exception::all_load_paths): Added
+	all_load_paths utility function.
+
+	* bin/update_rubygems: Added a command to update the gem
+	installation based on a update gem.
+
+	* Rakefile: Pulled package file list out into a constant so it can
+	be reused between the package command and the gem package command.
+	Added a gem package target to support rubygems updates.
+
+2004-07-22  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/version.rb:
+	  * (Requirement#initialize) initialize @version to avoid warning
+	  * (Dependency#initialize) initialize @version_requirement to avoid
+	    warning
+
+2004-07-19  Chad Fowler     <chad@chadfowler.com>
+	* install.rb: Shebang line should point to the ruby version used during
+	installation.
+
+2004-07-19  Assaph Mehr     <assaph@avaya.com>
+	* lib/rubygems/command.rb, packages/sources/lib/sources.rb: Added
+	command-line-configurable sources.
+
+2004-07-18  Chad Fowler	    <chad@chadfowler.com>
+	* lib/rubygems/validator.rb: Fixed a bug that would cause "managed"
+	files to appear to be unmanaged due to differences in how the paths
+	were formatted.
+
+2004-07-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/gem_commands.rb (InstallCommand#execute): removed clear
+	  bug (name -> gem.name).
+
+2004-07-14  Rich Kilmer     <rich@infoether.com>
+	* added old_format.rb which is used in the (hack) in format.rb 
+	  to detect the older version of a gem, and if present, switches 
+	  to that class instead.
+	* fixed the ARGV passing in bin/gem to ingore args past -- which
+	  are used for passing params to source gems (extconf.rb)
+
+2004-07-13  Chad Fowler	    <chad@chadfowler.com>
+	* lib/rubygems/installer.rb, lib/rubygems/package.rb, 
+	lib/rubygems/format.rb, test/test_package.rb: Added Mauricio 
+	Fernandez's patch to replace old gem format with tar.gz format.
+	Fixed some failing unit tests that resulted.  Still a couple left.
+	* lib/rubygems.rb: Fixed a bug introduced by the previous patch.
+
+2004-07-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems.rb: (#require_gem) added the ability to do
+	  "require_gem 'rake/packagetask'", for instance, which is a
+	  shortcut for "require_gem 'rake'; require 'rake/packagetask'".
+
+2004-07-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/gem_commands.rb: refactored --version option
+	  in all cases to the new VersionOption module.
+
+2004-07-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/cmd_manager.rb: added 'unpack' command.
+
+	* lib/rubygems/gem_commands.rb (UnpackCommand): added.
+
+	* lib/rubygems/installer.rb (Installer#unpack): added.
+
+2004-07-09  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/user_interaction.rb (Gem::StreamUI::ask and
+	Gem::StreamUI::choose_from_list): Added flush before each gets.
+
+2004-07-05  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/command.rb (Gem::Command#defaults_str): added.
+
+	* lib/rubygems/command.rb (Gem::Command#create_option_parser):
+	  Defaults for the options are included in the parser output.
+
+	* lib/rubygems/gem_commands.rb: all commands which have options
+	  and defaults now have #defaults_str implemented.
+
+2004-07-05  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/command.rb (Gem::Command#create_option_parser):
+	Make the argument and option sections optional.  They are only
+	printed if there are options or arguments defined.
+
+2004-07-05  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/gem_commands.rb:
+	  - scrubbed up the 'help' command a bit, removing its options
+	  - added information to 'help commands'
+
+2004-07-04  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/gem_commands.rb:
+	  - modified generic help and examples
+	  - improved 'list' and 'search' help, and fixed bug in 'search'
+
+	* lib/rubygems/cmd_manager.rb: 
+	  - explicit support for top-level commands --help and --version
+	  - no more support for --examples and --commands
+
+2004-07-04  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/gem_commands.rb:
+	  - added 'list' and 'search' commands ('list' is no longer an alias
+	    for 'query')
+	  - modified return value from all 'arguments' methods (see command.rb)
+
+	* lib/rubygems/cmd_manager.rb: added 'search' command.
+
+	* lib/rubygems/command.rb:
+	    (Command#create_option_parser): enhanced the option parser for 'help'
+					    display
+	    (Command#remove_option): added (to support 'list' and 'search')
+
+	* Rakefile: added 'gem' target.  Runs "local" (not installed) command
+	  and libraries.
+
+2004-07-04  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* Rakefile: added 'install' target.
+
+	* lib/rubygems/cmd_manager.rb: code formatting.
+
+	* lib/rubygems/gem_commands.rb:
+	  - refactored common install and update options into new module
+	    InstallUpdateOptions
+	      . consolidated option pairs (e.g. --test & --no-test ==> --[no-]test)
+	      . --gen-rdoc is now --rdoc
+	  - (UninstallCommand) corrected typo
+	  - (InstallCommand) corrected output with local install
+
+	* test/test_parse_commands.rb: :%s/--gen-rdoc/--rdoc/g
+
+2004-07-03  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::initialize):
+	Added --no-gen-rdoc and --no-test to allow the user to override
+	.gemrc default options.
+
+	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+	Concatenate the local rdoc options to the end of the spec's rdoc
+	options.
+	(Gem::DocManager::configured_args): Added configured_args as a
+	place to store local rdoc options.
+
+	* lib/rubygems/gem_runner.rb (Gem::GemRunner::do_configuration):
+	Configuration handled in do_configuration now.
+	(Gem::GemRunner::do_configuration): Set the local rdoc
+	configuration from the config file.
+
+	* lib/rubygems/command.rb (Gem::Command::handles): Added a
+	handles? method to Command so that we can detect which extra
+	arguments can be used with a command.
+	(Gem::Command::add_extra_args): New method to add the config
+	file's extra arguments to the front of the argument list.
+	(Gem::Command::extra_args): Added extra_args to Command class to
+	hold the extra args discovered in the config file.
+
+	* Rakefile: Added TEST=filename option to all the test targets.
+
+	* test/functional.rb (FunctionalTest::test_gemrc): Added
+	functional test for gemrc.
+
+	* scripts/gemdoc.data: Added an example to the specification command.
+
+	* lib/rubygems.rb (Gem::Exception::manage_gems): Added gem_runner
+	and config_file to manage_gems.
+	(Gem::Exception::use_paths): use_paths now accepts (and ignores)
+	nil parameters.
+
+	* bin/gem: Make Gem::GemRunner the top level object.  It now
+	creates and calls the CommandManager /after/ the arguments are
+	processed.
+
+	* Rakefile: Added test/data/gemhome to clobber list.
+
+2004-07-01  Jim Weirich  <jim@weirichhouse.org>
+
+	* test/test_specification.rb
+	(TestSpecification::test_rdoc_files_included): Test for rdoc files
+	included in file list.	Test for redundent file removal.
+
+	* lib/rubygems/specification.rb (Gem::Specification::validate):
+	Added gem version to validation requirement.  Added normalize to
+	remove redundent files in lists.
+
+	* lib/rubygems/gem_commands.rb (Gem::InfoCommand::usage): Added
+	usage and arguments methods for InfoCommand.
+	(Gem::SpecificationCommand::usage): Fixed several usage comments.
+
+2004-06-30  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::usage):
+	Upcased the comment on the usage statement (and corresponding
+	option).  This makes the variable part of the command
+	(e.g. GEMNAME) stand out from the static parts.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::process_args):
+	Downcased commands before searching (allows upper case or mixed
+	case for commands on command line).
+
+	* install.rb (install_rb): Fixed bug where the installer falsely
+	triggered the old repository upgrade when the directory part of
+	the file contained the matching "-digits." pattern.  Now the
+	pattern must be in the file's base name.
+
+2004-06-26  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* scripts/specdoc.rb: added (to generate gem specificiation document)
+	* scripts/specdoc.data: added (supports specdoc.rb)
+	* scripts/specdoc.yaml: added (supports specdoc.rb)
+
+2004-06-27  Jim Weirich  <jim@weirichhouse.org>
+
+	* scripts/gemdoc.data Removed extraneous <em> marker. 
+
+	* lib/rubygems/specification.rb
+	(Gem::Specification::satisfies_requirement): HA!  Caught another
+	version_requirement vs version_requirements error.  (I really
+	regret the decision to change that name.)
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::has_dependents):
+	Changed call to alert to alert_warning.
+
+	* lib/rubygems/gem_commands.rb (Gem::UninstallCommand::execute):
+	Again, remove local error handling to allow the error to perculate
+	up the chain to the top level.
+
+	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+	Removed one level of exception handling.  Only catching RDocErrors
+	at the outermost level.  And instead of reporting the error and
+	swallowing it, I convert it to a Gem::DocumentError (with the same
+	error message).  This is for better error handling.
+
+	* lib/rubygems/command.rb (Gem::Command::handle_options): Removed
+	exception handling from handle_options.  This allows errors to be
+	handled at the top level.  Makes for a more consistent error
+	interface.
+
+	* lib/rubygems/doc_manager.rb (Gem::DocumentError): Added
+	DocumentError to wrap RDocErrors (which derive from Exception
+	... yuck).
+
+	* lib/rubygems/cmd_manager.rb (Gem::RemoteError): RemoteError and
+	LocalInstallationError are now Gem::Exceptions (rather than
+	StandardErrors).  
+
+	* lib/rubygems.rb (Gem::Exception): Changed base of Gem::Exception
+	to RuntimeError (was ::Exception).  Apps using gem as a library
+	would have to catch Gem::Exceptions explicitly (yuck), or catch
+	Exceptions generically.  Catching Exceptions will catch
+	EVERYTHING, including things like SystemExit.  By makeing
+	Gem::Exception a RuntimeError, apps can catch RuntimeError or even
+	StandardError.
+
+2004-06-26  Jim Weirich  <jim@weirichhouse.org>
+
+	* test/functional.rb (FunctionalTest::test_all_command_helps):
+	Added functional test to show all commands have usage messaegs.
+
+	* lib/rubygems/gem_commands.rb (Gem::HelpCommand::execute): Added
+	version option to help (gem help version).
+	(Gem): Cleaned up the help text.  Dropped unneeded verbage.
+
+	* lib/rubygems/cmd_manager.rb
+	(Gem::CommandManager::find_command_possibilities): Added
+	find_command_possibilities to help the Help command look for
+	commands.
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): Fixed
+	null pointer bug where a list was destroyed in a method.
+
+	* lib/rubygems/gem_commands.rb (Gem::BuildCommand::load_gemspecs):
+	yaml gemspec files are now accepted by the build command.
+
+	* lib/rubygems/command.rb (Gem::Command::parser): Created an
+	on-demand option parser for all commands.
+	(Gem::Command::handle_options): Command line option hash is now
+	and instance variable with a reader.
+
+	* Rakefile: Linked package version to the value in the rubygems.rb
+	file.  The gem env command now shows both gem version (e.g. 0.6)
+	and the package version (e.g. 0.6.1).
+
+2004-06-25  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::InfoCommand): Dropped the
+	version command (its available via gem env).  Added a gem info
+	command to extract the yaml from a gemfile.
+	(Gem::LocalRemoteOptions): Refactored the local/remote options
+	(adding and testing) into a mixin module.
+
+	* test/test_version_comparison.rb
+	(TestDependencies::test_normalization): Added some tests for the
+	normalization issues mentions below.
+
+	* lib/rubygems/version.rb (Gem::Dependency::normalize): Old gems
+	have requirements and dependencies incoded in the Yaml spec in an
+	out of date format.  When loaded, they have incorrect instance
+	variables for modern objects.  I added a normalize call to handle
+	transforming out dated objects in to modern objects. (Remember
+	this next time we change the data structure of something in the
+	spec file.)
+	(Gem::Version::Requirement::parse): Requirements are comparable
+	now, just so that we can test them with asserts.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::find_dependencies_not_installed): Fixed
+	recursive call to require_gem to properly pass dependency
+	information.
+	
+	* lib/rubygems/installer.rb (Gem::Uninstaller::has_dependents):
+	Fixed reference to version_requirement (needs to be plural).
+
+	* lib/rubygems/command.rb (Gem::Command::invoke): Command now
+	handles it own help messages.  Commands no longer have to return
+	true/false to trigger help messages.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::process_args):
+	Moved help handling into the help command.
+
+	* lib/rubygems/gem_commands.rb (Gem::HelpCommand): Renamed the
+	base command to HelpCommand and made it handle a lot of the help
+	options.  Still need work on individual command helps.
+
+	* test/functional.rb (FunctionalTest::test_env_version): Added a
+	bunch of new functional tests for the environment command.
+
+	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::execute):
+	Made multiple gem names an error for now.  Should look at later.
+
+	* lib/rubygems/cmd_manager.rb (Gem::ListCommand): Added list as an
+	alias to query.
+	(Gem::UpdateCommand::initialize): Corrected spelling of install
+	(intall) in several places.
+
+	* bin/gem_server: Added Gem.manage_gems to the gem_server to fix
+	missing requirements.
+
+	* lib/rubygems/cmd_manager.rb (Gem::InstallCommand::initialize):
+	Added missing --both option to install.
+
+	* test/test_command.rb
+	(TestCommand::test_invode_with_bad_options): Catch the termination
+	request.
+
+	* test/mockgemui.rb (MockGemUi::terminate_interaction): Make the
+	mock UI throw an exception when a termination is requested.  This
+	makes sure that we don't miss accidental terminations.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::find_command):
+	Added find_command to handle best matching command names.
+
+	* test/functional.rb (FunctionalTest::test_build): Updated
+	functional tests to use the new command structure.
+
+	* lib/rubygems/version.rb (Gem::Version::Requirement): Changed the
+	pessimistic version comparison operator to "~>".  I like to think
+	of it as "approximately greater than".	(It was ">*").
+
+	* bin/gem: Moved gem2 into the standard gem script location.  It
+	is now stable enough to use as the standard command.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::run): Added
+	run method to trap errors while running commands.  Makes for
+	prettier output.
+	(Gem::CommandManager): Move *all* commands to their own classes.
+	Simplified CommandManager.  Lowered the coupling between
+	CommandManager and the Commands (the commands don't even need to
+	know about the manager anymore).  CommandManager maybe created
+	with "new" for testing (the script will continue to use
+	"instance").
+	(Gem::RubyGemsInfoCommand): New command.
+	(Gem::VersionCommand): New command.
+
+2004-06-24  Jim Weirich  <jim@weirichhouse.org>
+	
+	* lib/rubygems/user_interaction.rb (Gem::UserInteraction):
+	Significantly rewrote the whole user interaction scheme.  We are
+	now using an UI object that responds to the standard list of UI
+	commands (e.g. say, alert, ask).  The UserInteraction module
+	defines all the interaction methods to be forwarded to the default
+	UI objects.  The "ui" method returns that default object (and you
+	can use self.ui=(new_ui) to change it).  Also the use_ui(new_ui) {
+	} command is convienent for switching the UI object for a short
+	period of time.
+
+2004-06-18  Rich Kilmer <rich@infoether.com>
+	* broke test_cmd_manager.rb into test_parse_commands and 
+	test_process_commands to test the parsing of command line options
+	and the funtionality, respectively. 
+
+2004-06-18  Rich Kilmer <rich@infoether.com>
+	* added new unit test file: test/test_cmd_manager.rb to test the 
+	command manager classes.  this is just the first few tests which
+	will be expanded to a full test suite.
+
+2004-06-17  Chad FOwler <chad@chadfowler.com>
+
+	* lib/rubygems/installer.rb: Fixed bug in windows batch file generation
+	which was causing file not found errors.
+	* lib/rubygems/installer.rb: Uninstall now removes scripts and batch 
+	* lib/rubygems/specification.rb: Fixed install bug.  Thanks to Mark 
+	Sparshatt for the fix (via the rubyforge bug tracker). 
+
+2004-06-17  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+	Changed rdoc generation to do a chdir into the base source
+	directory and then to use a relative path for all the source
+	files.	This makes the generated RDOC html look better and may fix
+	the windows drive/rdoc bug as a side effect.
+
+2004-06-17  Rich Kilmer <rich@infoether.com>
+	* Added ability to capture the UserInteraction with:
+	c = Gem::UserInteraction.capture
+	and then you can override specific methods like 'say':
+	c.on_say {|statement| puts "you said: #{statement}"}
+
+2004-06-15  Rich Kilmer <rich@infoether.com>
+	* Added refactored command handling in rubygems/cmd_manager.rb and a 
+	(temporary) bin/gem2 command file to test things out.  Once we feel
+	comfortable, we can replace gem with gem2.
+
+2004-06-10  Rich Kilmer <rich@infoether.com>
+	* Isolated all user interaction to pass through module methods on a new
+	Gem::UserInteraction module.  Those methods will be the method of abstracting
+	the interaction of RubyGems for use in a GUI-based solution.
+
+2004-06-10  Rich Kilmer <rich@infoether.com>
+	* require 'rubygems' now minimally requires only the files needed
+	for runtime access to gems...not management of gems.  To manage
+	gems you now additionally need to execute Gem::manage_gems prior
+	to using the builder/installer/etc.  This makes gemspecs not 
+	backward compatible unless they add that line to the gemspec 
+	after the require 'rubygems' line.
+
+2004-06-10  Gavin Sinclair <gsinclair@soyabean.com.au>
+	* bin/gem: --upgrade-all was broken, probably as a result of the
+	  search changes listed below.
+
+2004-06-09  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/remote_install.rb: delegate search functionality to
+	  Cache class, bringing remote and local search and list together into
+	  one piece of code.
+	* bin/gem, lib/rubygems/validator.rb: move all STDIO work to bin/gem.
+	  Validator.alien now returns a hash of ErrorData objects.
+	* bin/gem, lib/rubygems/installer.rb: move most of the STDIO stuff to
+	  bin/gem, communicating via exceptions in this case.
+
+2004-06-08  Rich Kilmer  <rich@infoether.com>
+	* Fixed the drive problem on win32 (hopefully) so multiple drives
+	  should now work.  Its still a hack until rdoc is fixed.
+
+2004-06-08  Chad Fowler  <chad@chadfowler.com>
+	* Fixed bug caused by method change on Version::Requirement
+
+2004-06-08  Rich Kilmer <rich@infoether.com>
+	* fixed bug in doc_manager.rb whereby the extra_rdoc_files should
+	  be appended to the list of directories prior to prepending the
+	  full path.
+
+2004-06-08  Gavin Sinclair <gsinclair@soyabean.com.au>
+	* bin/gem_server: List installed gems in [name,version] order.
+
+2004-06-08  Gavin Sinclair <gsinclair@soyabean.com.au>
+	* lib/rubygems/installer.rb: don't warn about not being able to
+	  install a library stub if a library stub is already installed.
+	  Still warn if it's not a library stub that's there already.
+
+2004-06-08  Gavin Sinclair <gsinclair@soyabean.com.au>
+	* bin/gem: renamed --upgrade-dist to --upgrade--all and fixed bug.
+	* lib/rubygems/installer.rb: fixed bug with Ruby version assertion.
+
+2004-06-07  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/remote_installer.rb, lib/rubygems/version.rb: Fixed old
+	  dependency on #version method for Gem::Version::Requirement
+	* bin/gem: new --upgrade-dist option allows one to upgrade every
+	  installed gem
+	* lib/rubygems/specification.rb,lib/rubygems/installer.rb: new
+	  #required_ruby_version attribute added to gem specification for specifying a
+	  dependency on which version of ruby the gem needs.	Format it accepts is
+	  the same as the Gem::Version::Requirement format.
+
+2004-06-06  Chad Fowler  <chad@chadfowler.com>
+	* bin/gem: install_stub is once again the default due to requests.
+
+2004-06-04  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/specification.rb, lib/rubygems/doc_manager.rb:  
+	Allow arbitrary files to be added for rdoc to run over them (as per
+	Jim's request).
+
+2004-06-04  Chad Fowler  <chad@chadfowler.com>
+	* bin/gem:  Reformatted --search and --list output such that
+	multiple versions of a gem are compressed into a single entry
+	(with version numbers in parentheses)
+
+2004-05-31  Jim Weirich  <jweirich@one.net>
+
+	* lib/rubygems/version.rb (Gem::Dependency): Dependency attribute
+	renamed to version_requirements (made plural).
+	(Gem::Version::bump): Added bump to implement pessimistic
+	operator.
+	(Gem::Version::Requirement): Added pessimistic operator to list of
+	operators. Operators now implemented using lambda.
+
+	* lib/rubygems.rb (Kernel::require_gem): require_gem now takes an
+	array of requirement strings.
+
+	* lib/rubygems/version.rb (Gem::Version::Requirement::initialize):
+	Simplified initialization by making parse a bit smarter.
+	(Gem::Version::Requirement::satisfied_by): Simplified by using
+	all?
+	(Gem::Version::Requirement::satisfy): Added explicit one
+	requirement satisfy test.
+	(Gem::Version::Requirement::parse): parse now returns a two
+	element string array (operator and version string).  We don't
+	bother converting to an integer array during parsing.
+
+2004-05-31 18:38 chadfowler
+
+	* gemspec now supports #rdoc_options, to which you can append
+	strings that will be passed to rdoc as additional options.
+
+2004-05-08 21:57  chadfowler
+
+	* Using Gem::RubyGemsVersion to match the release number.  If we
+	need to use this as an internal version format specifier in the
+	future, we can use the Gem::Version semantics.
+
+2004-05-30 14:33 gsinclair
+
+	* bin/gem: Split --help into --help (basic), --help-options (what
+	  --help used to be), and --help-examples.
+
+2004-04-30 15:57  chadfowler
+
+	* bin/gem: --install-stub is no longer the default ;)
+
+2004-04-30 15:51  chadfowler
+
+	* lib/rubygems/installer.rb: Rich Kilmer (who kicks butt) figured
+	  out how to fix the library stub stuff.
+
+2004-04-29 19:12  chadfowler
+
+	* lib/rubygems/doc_manager.rb: Dick Davies fixed a bug in the doc
+	  generator.
+
+2004-04-29 13:41  gsinclair
+
+	* lib/rubygems/installer.rb: Added skeleton code and comments to
+	  uninstall stub apps and libs
+
+2004-04-29 12:20  gsinclair
+
+	* install.rb: Don't install library stub for 'sources'
+
+2004-04-29 12:20  gsinclair
+
+	* lib/rubygems/installer.rb: Improvements to library stub
+	  installation: * don't overwrite existing file (emit warning) *
+	  nice warning if there's a permission problem * observe
+	  --[no-]install-stub flag (rather, observe the argument to
+	  #install)
+
+2004-04-29 12:16  gsinclair
+
+	* bin/gem: --install-stub is now the default
+
+2004-04-26 20:20  chadfowler
+
+	* test/test_remote_installer.rb: Cleaning up after Gavin and his
+	  test-breaking self. ;)
+
+2004-04-26 12:06  gsinclair
+
+	* bin/gem, lib/rubygems/installer.rb,
+	  lib/rubygems/remote_installer.rb: Installing a gem now causes a
+	  library stub to be installed as well, allowing you to require
+	  'package' without knowing it's a gem.
+
+2004-04-25 23:18  chadfowler
+
+	* lib/rubygems/: installer.rb, specification.rb: Prompt user if
+	  trying to uninstall a gem that other gems *may* depend on.
+
+2004-04-25 09:27  chadfowler
+
+	* test/test_remote_installer.rb: Changed expected test results to
+	  match new (old) gem naming scheme--"ruby" doesn't appear as a
+	  platform in the gem name.
+
+2004-04-25 05:50  gsinclair
+
+	* bin/gem: Changed @directory -> @install_dir for clarity
+
+2004-04-25 05:47  gsinclair
+
+	* bin/gem: Improved display of gems, platform-wise
+
+2004-04-25 05:46  gsinclair
+
+	* lib/rubygems/specification.rb: Added documentation
+
+2004-04-25 04:17  jimweirich
+
+	* test/functional.rb: Fixed functional test to properly name a Ruby
+	  platform gem.
+
+2004-04-25 04:17  jimweirich
+
+	* packages/sources/.cvsignore, test/data/one/.cvsignore: Ignore the
+	  proper gem name.
+
+2004-04-25 04:17  jimweirich
+
+	* lib/rubygems/specification.rb: Undefined several attributes that
+	  were redefined to avoid warnings.
+
+2004-04-25 04:17  jimweirich
+
+	* lib/rubygems.rb: Need to initialize @gem_home and @gem_path with
+	  ||= to avoid warning.
+
+2004-04-25 03:40  gsinclair
+
+	* lib/rubygems.rb, test/test_gempaths.rb: RUBY_GEMS -> GEM_PATH
+	  (environment variable)
+
+2004-04-25 03:33  gsinclair
+
+	* lib/rubygems/specification.rb: Pretty-print the specification
+
+2004-04-25 03:18  gsinclair
+
+	* lib/rubygems/specification.rb: Handle platform in a (hopefully)
+	  consistent manner
+
+2004-04-25 03:16  gsinclair
+
+	* install.rb: Use return value from Builder#build to locate gem
+	  file
+
+2004-04-25 03:09  gsinclair
+
+	* lib/rubygems/builder.rb: Return file name from #build
+
+2004-04-25 02:32  gsinclair
+
+	* lib/rubygems/specification.rb: Platform goes at the *end* of the
+	  full name now.
+
+2004-04-22 06:19  chadfowler
+
+	* test/test_remote_installer.rb: Fixed test to reflect fewer cache
+	  sources :(
+
+2004-04-21 17:19  rich
+
+	* lib/rubygems/remote_installer.rb: added support to download the
+	  yaml index as a .Z (zlib compressed) file if it exists, then move
+	  on to the plain yaml file if it does not
+
+2004-04-20 20:23  chadfowler
+
+	* examples/application/an-app.gemspec, lib/rubygems/format.rb,
+	  packages/sources/lib/sources.rb: Committed Dick Davies' patch to
+	  fix broken tests.
+
+2004-04-18 01:51  gsinclair
+
+	* bin/gem, lib/rubygems/doc_manager.rb: RDoc generation observes
+	  'rdoc' config file value
+
+2004-04-17 12:15  gsinclair
+
+	* bin/gem: Improved 'build' error output
+
+2004-04-17 12:12  gsinclair
+
+	* lib/: rubygems.rb, rubygems/remote_installer.rb,
+	  rubygems/specification.rb, rubygems/validator.rb: All
+	  gems-related exceptions now extend Gem::Exception
+
+2004-04-17 12:11  gsinclair
+
+	* lib/rubygems/specification.rb: Improved handling of summary and
+	  decription strings - convert to single line
+
+2004-04-17 01:09  gsinclair
+
+	* bin/gem: Prevent remote install attempt if local install was
+	  successful
+
+2004-04-17 00:49  gsinclair
+
+	* lib/rubygems/builder.rb: Better formatted the output code
+
+2004-04-16 21:31  gsinclair
+
+	* lib/rubygems/remote_installer.rb: Stoopid coding error (thanks
+	  Kent Sibilev)
+
+2004-04-16 00:00  rich
+
+	* lib/rubygems/installer.rb: added code to optionally use nmake
+	  instead of make on win32 systems
+
+2004-04-15 20:12  gsinclair
+
+	* bin/gem, lib/rubygems/remote_installer.rb: Clarified proxy
+	  handling and interface: --[no-]http-proxy [URL]
+
+2004-04-13 00:16  jimweirich
+
+	* bin/gem, test/bogussources.rb, test/functional.rb: Oops, missed
+	  an instance of GEM_PATH in the gem binary.
+
+2004-04-12 21:28  jimweirich
+
+	* lib/rubygems/cache.rb: Oops.	Missed a GEM_PATH.
+
+2004-04-12 21:11  jimweirich
+
+	* test/test_remote_installer.rb: removed setting of environment
+	  variable for now.
+
+2004-04-12 21:09  jimweirich
+
+	* Rakefile, lib/rubygems.rb, lib/rubygems/cache.rb,
+	  lib/rubygems/installer.rb, packages/sources/.cvsignore,
+	  scripts/runtest.rb, test/.cvsignore, test/bogussources.rb,
+	  test/test_format.rb, test/test_gempaths.rb,
+	  test/test_remote_installer.rb, test/test_validator.rb: Added
+	  test/temp to the clobber list.  Broke out tests into inline to
+	  avoid test dependencies on rubygem.
+
+2004-04-12 07:52  chadfowler
+
+	* lib/: rubygems.rb, rubygems/installer.rb,
+	  rubygems/remote_installer.rb: Cleaning up output strings wrt
+	  formating of "gem (version)".
+
+2004-04-12 07:41  chadfowler
+
+	* lib/rubygems/installer.rb: Gavin Sinclair's uninstall bug.
+
+2004-04-11 15:26  jimweirich
+
+	* test/data/one/: .cvsignore, one-ruby-0.0.1.gem:  removed
+	  one-ruby*.gem from source control.  This gem is automatically
+	  generated in testing.
+
+2004-04-11 10:50  chadfowler
+
+	* bin/gem: Gavin Sinclair's test code enhancements
+
+2004-04-11 07:50  chadfowler
+
+	* bin/gem, lib/rubygems/installer.rb,
+	  lib/rubygems/remote_installer.rb, lib/rubygems/specification.rb,
+	  test/insure_session.rb, test/test_remote_installer.rb,
+	  test/data/one/one-ruby-0.0.1.gem: Gavin Sinclair patches to make
+	  installer return types less ambiguous.
+
+2004-04-09 10:29  chadfowler
+
+	* lib/rubygems/installer.rb, test/data/one/one-ruby-0.0.1.gem: gem
+	  -u input validation patch by Ville Aine
+
+2004-04-07 07:49  chadfowler
+
+	* bin/gem, lib/rubygems/cache.rb, test/data/one/one-ruby-0.0.1.gem:
+	  Finally have passing tests.
+
+2004-04-07 07:24  chadfowler
+
+	* lib/rubygems/remote_installer.rb,
+	  test/data/one/one-ruby-0.0.1.gem: Allow default option to work on
+	  remote dependency prompt.
+
+2004-04-07 07:05  chadfowler
+
+	* lib/rubygems/remote_installer.rb, test/test_remote_installer.rb,
+	  test/data/one/one-ruby-0.0.1.gem: Applied George Marrows' patch
+	  to remote_install
+
+2004-04-07 06:23  chadfowler
+
+	* bin/gem, test/data/one/one-ruby-0.0.1.gem: No longer "seeing"
+	  double on remote searches
+
+2004-04-05 07:39  chadfowler
+
+	* Rakefile, test/test_remote_installer.rb,
+	  test/data/one/one-ruby-0.0.1.gem: remote_installer tests aren't
+	  completely hosed anymore.
+
+2004-04-05 06:16  chadfowler
+
+	* Rakefile, test/data/one/one-ruby-0.0.1.gem: Rake target for
+	  running all tests (unit + functional) "alltests"
+
+2004-04-05 00:48  jimweirich
+
+	* test/: insure_session.rb, data/one/README.one,
+	  data/one/one-ruby-0.0.1.gem, data/one/one.gemspec,
+	  data/one/lib/one.rb: added for functional tests
+
+2004-04-05 00:48  jimweirich
+
+	* test/functional.rb: Moved session gem detection to insure_session
+	  file.  Modified functional tests to use gem command.	Removed
+	  some directory stuff because rake guarantees the starting
+	  directory.  Added test_info functional test.	Added test_build
+	  functional test.  Added assert status.
+
+2004-04-05 00:48  jimweirich
+
+	* lib/rubygems/remote_installer.rb: Changed exceptions to inherit
+	  from RunTimeError
+
+2004-04-05 00:48  jimweirich
+
+	* bin/gem: Changed Installer to RemoteInstaller in rubygems-info.
+
+2004-04-05 00:48  jimweirich
+
+	* Rakefile: Added generated test gem to clobber list.  Added
+	  functional test target to rakefile.
+
+2004-04-04 21:17  chadfowler
+
+	* packages/sources/lib/sources.rb: Added gems mirror at
+	  http://gems.chadfowler.com
+
+2004-04-04 20:51  chadfowler
+
+	* bin/gem, lib/rubygems/remote_installer.rb, test/functional.rb:
+	  More improved error messages (don't show stack trace when using
+	  bin/gem)
+
+2004-04-04 20:43  chadfowler
+
+	* lib/rubygems/cache.rb: Only read specs that end in "gemspec".
+	  The code doesn't handle non-gemspecs very well at all.
+
+2004-04-04 20:15  chadfowler
+
+	* test/mock/gems/specifications/sources-0.0.1.gemspec: [no log
+	  message]
+
+2004-04-04 20:09  chadfowler
+
+	* test/mock/gems/gems/sources-0.0.1/lib/sources.rb: Rearranging
+	  things a bit
+
+2004-04-04 20:02  chadfowler
+
+	* bin/gem, lib/rubygems/remote_installer.rb, test/bogussources.rb,
+	  test/functional.rb: Better error messages on unresolvable host.
+
+2004-04-04 12:50  chadfowler
+
+	* redist/session.gem, test/bogussources.rb, test/functional.rb:
+	  Added the beginnings of a functional test suite.
+
+2004-04-03 22:02  chadfowler
+
+	* lib/rubygems/validator.rb: Just had to explicitly rescue
+	  VerificationError.  All is well.
+
+2004-04-03 22:01  chadfowler
+
+	* lib/rubygems/validator.rb: Mauricio fixed a problem with alien
+	  (just failed to update it when we changed the gem directory), but
+	  now there's another issue I can't find.  Anyway, this fix is
+	  obviously needed.  But alien is broken anyway.
+
+2004-04-03 21:57  chadfowler
+
+	* install.rb, lib/rubygems/builder.rb: Batsman's bug report and
+	  code for the bugs I introduced today. :)
+
+2004-04-03 09:50  chadfowler
+
+	* lib/rubygems/specification.rb: Defaulting a spec's require_path
+	  to [] to avoid downstream errors.
+
+2004-04-03 09:06  chadfowler
+
+	* lib/rubygems/builder.rb, test/test_builder.rb: builder now
+	  validates the gemspec.
+
+2004-04-03 08:48  chadfowler
+
+	* lib/rubygems/specification.rb, test/test_specification.rb: Added
+	  checking for gem specs to make sure they have all required
+	  attributes.
+
+2004-04-03 08:06  chadfowler
+
+	* gemspecs/rublog.gemspec: My original rublog gem was broken, in
+	  that it didn't have a require_path.
+
+2004-04-02 07:48  chadfowler
+
+	* lib/rubygems/remote_installer.rb: Prompt for installation of
+	  dependencies.
+
+	  For now, there is a puts/gets in the middle of
+	  remote_installer.rb  This should probably be cleaned up later
+	  (return control flow to the gem program to install the
+	  dependencies, for example.
+
+2004-04-02 07:37  chadfowler
+
+	* TODO: [no log message]
+
+2004-04-02 07:34  chadfowler
+
+	* test/: simple_gem.rb, test_format.rb: Some things I forgot to cvs
+	  add earlier.
+
+2004-04-02 07:29  chadfowler
+
+	* example/: test.gemspec, lib/test.rb, lib/test/wow.rb: Removing
+	  example directory in favor of "examples" directory (just better
+	  organized).
+
+2004-04-02 07:26  chadfowler
+
+	* test/test_all.rb: Removed test_all.rb.  Rake is obviously a
+	  better way to do it.
+
+2004-03-31 19:13  chadfowler
+
+	* lib/rubygems/format.rb, lib/rubygems/installer.rb,
+	  lib/rubygems/validator.rb, test/test_all.rb,
+	  test/test_validator.rb: More tests and refactoring to support
+	  them.
+
+2004-03-30 02:41  rich
+
+	* lib/rubygems/installer.rb: allow passing parameters to extconf.rb
+	  with:
+
+	  ruby -i blah.gem --local -- --with-option
+
+	  everything past the -- will go to the extconf.rb...just like
+	  setup.rb
+
+2004-03-30 02:34  rich
+
+	* lib/rubygems/: installer.rb, specification.rb: very initial
+	  capability to build source gems.  this only lets you build native
+	  extensions so long as you do not have to specify --with-
+	  directories
+
+2004-03-29 08:31  rich
+
+	* install.rb: switched migration of old gems to new ./gems subdir
+	  to use FileUtils rather than ftools...hope to fix reported win32
+	  error.
+
+2004-03-29 01:04  rich
+
+	* lib/rubygems/doc_manager.rb: fixed bug in pathing based on new
+	  directory structure
+
+2004-03-29 01:03  rich
+
+	* lib/rubygems/remote_installer.rb: fixed bug in default for proxy
+	  (should default to nil not true)
+
+2004-03-29 01:03  rich
+
+	* bin/gem: updated with patch to allow for config file with minor
+	  difference from gavin's patch which passes a nil to the
+	  RemoteInstaller if the proxy does not exist
+
+2004-03-28 23:22  rich
+
+	* install.rb: added code to migrate gems if they are in the old
+	  directory structure
+
+2004-03-28 21:30  rich
+
+	* install.rb, lib/rubygems.rb, lib/rubygems/installer.rb,
+	  lib/rubygems/specification.rb: changed path of installed gems to
+	  be:
+
+	  ruby/gems/1.8/gems
+
+	  which cleans up the root.
+
+2004-03-28 18:53  chadfowler
+
+	* test/test_all.rb: This is the file to run for all of the tests.
+
+	  test_remote_installer is commented out for now.  The open URI
+	  patch that George gave us makes the code a lot nicer to look at,
+	  but a little harder to test.
+
+2004-03-28 18:50  chadfowler
+
+	* lib/rubygems/remote_installer.rb, test/test_cache.rb,
+	  test/test_remote_installer.rb: Added some tests for cache search
+
+2004-03-28 12:19  chadfowler
+
+	* bin/gem, lib/rubygems/validator.rb, test/test_validator.rb: Some
+	  tests for the validator.
+
+	  Made the validator more testable.
+
+2004-03-28 09:30  chadfowler
+
+	* bin/gem, lib/rubygems/validator.rb: Fixed a problem with false
+	  alarms in the validator.
+
+2004-03-27 08:23  chadfowler
+
+	* bin/gem: No longer have an option to pass http proxy host into
+	  the gem program.  Only reads it from the environment.  This is
+	  because George's patch (and open-uri) work this way, and I'm lazy
+	  right now.
+
+2004-03-27 08:17  chadfowler
+
+	* lib/rubygems/remote_installer.rb: George Marrows' nice patch to
+	  remove a bunch of code from remote_installer.
+
+	  Our remote_installer tests are failing.  We really need to start
+	  paying attention to the test directory. :(`
+
+2004-03-24 23:26  jimweirich
+
+	* install.rb: Do not install commands ending in ~.
+
+2004-03-24 23:25  jimweirich
+
+	* lib/rubygems/specification.rb: Changed executables from accessor
+	  to writer to avoid redefinition.
+
+2004-03-21 21:10  jimweirich
+
+	* bin/gem: fixed uninitialized directory option
+
+2004-03-21 15:34  jimweirich
+
+	* bin/gem: removed carriage returns that screwed up the #! line
+
+2004-03-21 09:02  chadfowler
+
+	* bin/gem: Gavin's bin/gem refactoring.
+
+2004-03-20 17:03  jimweirich
+
+	* bin/gem: added wrapping to gem listing
+
+2004-03-20 12:22  chadfowler
+
+	* install.rb: More cleaning by Gavin Sinclair
+
+2004-03-20 12:08  chadfowler
+
+	* examples/application/an-app.gemspec,
+	  examples/application/bin/myapp,
+	  examples/application/lib/somefunctionality.rb, lib/rubygems.rb,
+	  lib/rubygems/installer.rb, lib/rubygems/specification.rb: Added
+	  functionality for installing applications into the system bindir.
+	  Needs cleaning and refactoring.
+
+2004-03-20 07:53  chadfowler
+
+	* bin/gem: [no log message]
+
+2004-03-19 23:03  chadfowler
+
+	* bin/gem: More intuitive default.
+
+2004-03-19 10:45  chadfowler
+
+	* bin/gem: * Some minor rearranging of the test stuff so that
+	  installation errors will also abort the test run * Don't try to
+	  run tests if none are included with the gem
+
+2004-03-18 22:27  chadfowler
+
+	* bin/gem, example/lib/test.rb, lib/rubygems/cache.rb,
+	  lib/rubygems/specification.rb: * Preliminary support for: gem -i
+	  blah-0.0.1.gem --run-tests Needs to be cleaned up considerably.
+	  * Introduction of new gemspec metadata "unit_test_suite", which
+	  will be require'd in order to load all unit tests
+
+2004-03-17 09:33  chadfowler
+
+	* bin/gem: Applied Gavin Sinclair's patch to make help output
+	  better.
+
+2004-03-16 21:55  chadfowler
+
+	* bin/gem: Added --remote-list option for gem command to display
+	  all gems on server.
+
+2004-03-16 21:50  chadfowler
+
+	* bin/gem, doc/UserDoc.html: Fixed --help case inconsistencies and
+	  documentation typos as per Scott Harper's email.
+
+2004-03-16 21:41  chadfowler
+
+	* bin/gem: --list and --search display are the same.
+
+2004-03-16 21:33  chadfowler
+
+	* bin/gem: Implemented some of Scott Harper's search suggestions:
+	  case insensitive sort of returned gems and display description
+	  with gem name in search results.
+
+2004-03-16 21:20  chadfowler
+
+	* bin/gem, lib/rubygems/remote_installer.rb: http_proxy  option
+	  implemented
+
+2004-03-15 07:19  chadfowler
+
+	* lib/rubygems/remote_installer.rb: Installation is now case
+	  insensitive (like search)
+
+2004-03-15 07:07  chadfowler
+
+	* TODO, bin/gem, lib/rubygems/remote_installer.rb: Better error
+	  messages.  updated TODO list.
+
+2004-03-14 21:02  chadfowler
+
+	* bin/gem, lib/rubygems/remote_installer.rb: --dir didn't work with
+	  remote-install.  Now it does.
+
+2004-03-14 17:48  rich
+
+	* bin/gem: fixed uninstall bug
+
+2004-03-14 17:18  rich
+
+	* lib/rubygems/doc_manager.rb: changed to remove <drive>: on
+	  win32...ug
+
+2004-03-14 16:15  rich
+
+	* install.rb: fixed typo
+
+2004-03-14 16:13  rich
+
+	* install.rb: generate cmd files
+
+2004-03-14 16:13  rich
+
+	* bin/: gem.cmd, gem_server.cmd: now generate cmd files
+
+2004-03-14 15:52  chadfowler
+
+	* bin/gem: Fixed a small bug with --gen-rdoc and the remote
+	  installer.
+
+2004-03-14 15:38  chadfowler
+
+	* lib/rubygems.rb: Back to version 1.0 ;)
+
+2004-03-14 15:36  chadfowler
+
+	* lib/rubygems.rb: Updated rubygemsversion
+
+2004-03-14 15:31  chadfowler
+
+	* README: credits
+
+2004-03-14 15:24  rich
+
+	* README: initial readme
+
+2004-03-14 15:12  rich
+
+	* doc/UserDoc.html: updated w/doc on documentation ;-)
+
+2004-03-14 15:01  rich
+
+	* gemspecs/jabber4r.gemspec: added jabber4r gemspec
+
+2004-03-14 14:58  rich
+
+	* bin/gem_server: change the documentation path to /
+
+2004-03-14 14:57  rich
+
+	* install.rb: remove installing .rb files from ./bin
+
+2004-03-14 14:32  rich
+
+	* doc/: DevDoc.txt, GemSpecification.txt, UserDoc.html,
+	  UserDoc.txt: updated with latest docs
+
+2004-03-14 12:05  chadfowler
+
+	* test/test_remote_installer.rb: Fixed tests.
+
+2004-03-14 11:31  chadfowler
+
+	* lib/rubygems/specification.rb: Fixed bug that would manifest
+	  itself if a gem creator put apostrophes/single-quotes in the gem
+	  spec.
+
+2004-03-14 00:04  rich
+
+	* doc/: UserDoc.html, UserDoc.txt: finished user's guide
+
+2004-03-13 21:48  rich
+
+	* doc/: DevDoc.html, UserDoc.html, UserDoc.txt: updated user's
+	  guide...will finish section on ruby's library mgt soon ;-)
+
+2004-03-13 20:48  chadfowler
+
+	* doc/DevDoc.txt: Added documentation on making and distributing
+	  gems
+
+2004-03-13 20:20  chadfowler
+
+	* TODO: [no log message]
+
+2004-03-13 19:51  rich
+
+	* doc/: DevDoc.html, DevDoc.txt, GemSpecification.html,
+	  GemSpecification.txt, UserDoc.html, UserDoc.txt, doc.css,
+	  makedoc.rb: added these doc (wiki) files from
+	  http://rubygems.rubyforge.org/
+
+2004-03-13 17:56  chadfowler
+
+	* TODO, gemspecs/README, gemspecs/cgikit-1.1.0.gemspec,
+	  gemspecs/linguistics.gemspec, gemspecs/ook.gemspec,
+	  gemspecs/progressbar.gemspec, gemspecs/redcloth.gemspec,
+	  gemspecs/rublog.gemspec, gemspecs/ruby-doom.gemspec,
+	  gemspecs/rubyjdwp.gemspec, gemspecs/statistics.gemspec: Added
+	  some gemspecs for actual RAA packages.
+
+2004-03-13 14:35  chadfowler
+
+	* TODO, lib/rubygems/remote_installer.rb: Preliminary HTTP Proxy
+	  support.  Untested.
+
+2004-03-13 09:11  chadfowler
+
+	* packages/sources/lib/sources.rb: Changed to point to rubyforge
+
+2004-03-12 22:40  rich
+
+	* bin/generate_yaml_index.rb: generates a yaml index for a gems
+	  repository
+
+2004-03-12 22:02  chadfowler
+
+	* bin/gem_server: No longer serving gem specs.
+
+2004-03-12 21:42  chadfowler
+
+	* TODO, bin/gem_server.cgi: We decided to trash gem_server.cgi in
+	  favor of the static content generator Rich is working on.
+
+2004-03-12 21:15  chadfowler
+
+	* TODO: [no log message]
+
+2004-03-12 20:11  chadfowler
+
+	* bin/gem, lib/rubygems/installer.rb,
+	  lib/rubygems/remote_installer.rb: Basic search funtionality in.
+
+	  Slight refactoring of Installer and RemoteInstaller
+
+2004-03-12 18:28  chadfowler
+
+	* TODO: [no log message]
+
+2004-03-12 16:37  chadfowler
+
+	* TODO: [no log message]
+
+2004-03-12 16:14  chadfowler
+
+	* TODO: More TODO items
+
+2004-03-08 13:50  chadfowler
+
+	* TODO, bin/gem_server, example/test.gemspec: Use rdoc templates
+	  for HTML.  Nearly XHTML compliant.
+
+2004-03-08 08:21  chadfowler
+
+	* TODO: Added TODO list
+
+2004-03-08 08:12  chadfowler
+
+	* lib/rubygems/validator.rb: Fixed a small (but crippling) bug in
+	  the validator.
+
+2004-01-24 13:49  chadfowler
+
+	* bin/gem, lib/rubygems.rb, lib/rubygems/cache.rb,
+	  lib/rubygems/validator.rb, lib/rubygems/version.rb: More cleanup.
+
+2004-01-24 13:29  chadfowler
+
+	* bin/gem, lib/rubygems/remote_installer.rb: A little cleaning of
+	  (Remote)Installer inconsistencies
+
+2004-01-24 13:23  chadfowler
+
+	* bin/gem: Removed the weird instance variable thing we had going
+	  on. :)
+
+2004-01-07 17:34  chadfowler
+
+	* bin/gem: removed old cruft
+
+2003-12-24 11:32  chadfowler
+
+	* lib/rubygems/validator.rb: Gem validation was returning false
+	  negatives (corrupted gems were not reporting their corruption).
+
+2003-12-18 14:18  chadfowler
+
+	* lib/rubygems/cache.rb: Lyle noticed some out of date rdoc
+	  documentation.  Thanks Lyle!
+
+2003-12-03 08:05  chadfowler
+
+	* install.rb: Gavin's patch for installing the files in bin/ on
+	  rubygems installation.
+
+2003-11-30 00:36  chadfowler
+
+	* lib/rubygems/specification.rb: Little warnings adjustment
+
+2003-11-29 17:27  jimweirich
+
+	* Rakefile: added Rakefile to package
+
+2003-11-29 16:23  jimweirich
+
+	* lib/rubygems/specification.rb: Removed defined? and initialized
+	  @platform
+
+2003-11-29 16:08  jimweirich
+
+	* lib/rubygems/specification.rb: Initialized @loaded and check
+	  defined?(@platform) to silence some -w warnings.
+
+2003-11-29 09:26  rich
+
+	* bin/gem_server, lib/rubygems/doc_manager.rb: updated to support
+	  /doc URL to generate list of installed gems w/doc link for rdoc
+	  generated links.
+
+2003-11-29 08:30  rich
+
+	* lib/rubygems/doc_manager.rb: minor format change of error message
+
+2003-11-29 08:29  rich
+
+	* bin/gem, lib/rubygems/builder.rb, lib/rubygems/doc_manager.rb,
+	  lib/rubygems/installer.rb: instantiates DocManager now.  errors
+	  out on no install of RDoc.  warns if .gemspec does not specify
+	  having rdoc, but rdoc is generated
+
+2003-11-29 02:13  rich
+
+	* bin/gem, lib/rubygems.rb, lib/rubygems/doc_manager.rb,
+	  lib/rubygems/format.rb, lib/rubygems/installer.rb,
+	  lib/rubygems/specification.rb: added capability to generate rdoc
+	  on install of gem (--gen-rdoc).  this doc is placed in
+	  Gem.dir+doc+gem.full_name fixed but in installer when moving to
+	  format (not calling each) added doc manager to add/remove
+	  documenatation (right now only rdoc)
+
+2003-11-29 01:28  rich
+
+	* lib/rubygems/specification.rb: should not define the attr_readers
+	  for requirements/dependencies so undef is unnecessary
+
+2003-11-29 00:12  jimweirich
+
+	* lib/rubygems/specification.rb: Undefing dependencies and
+	  requirements removes warning when used with -w.
+
+2003-11-29 00:12  jimweirich
+
+	* lib/rubygems.rb: Using defined?($GEM_PATH) avoids warning when
+	  used with -w switch.
+
+2003-11-28 15:58  chadfowler
+
+	* bin/gem, example/test.gemspec, lib/rubygems.rb,
+	  lib/rubygems/installer.rb, lib/rubygems/validator.rb,
+	  lib/rubygems/format.rb: Separated gem file reading into a
+	  separate class/file.
+
+2003-11-28 15:20  rich
+
+	* lib/rubygems/specification.rb: added has_rdoc?/has_rdoc methods
+	  ... will be used to autogenerate rdoc
+
+2003-11-28 12:30  chadfowler
+
+	* lib/rubygems/validator.rb: Rdoc added
+
+2003-11-28 11:51  chadfowler
+
+	* bin/gem, lib/rubygems.rb, lib/rubygems/validator.rb: A little
+	  rearranging of the validation/alien code.  It's still ugly, but
+	  at least it's in its own file now. :)
+
+2003-11-28 11:40  chadfowler
+
+	* bin/gem: Removed a little cruft.
+
+2003-11-27 11:04  chadfowler
+
+	* bin/gem: Print success message for each gem *not* containing
+	  errors.
+
+2003-11-27 11:00  chadfowler
+
+	* bin/gem, lib/rubygems/installer.rb: Preliminary support for gem
+	  directory validation (--alien).  Looks for bad or missing gem
+	  files, missing spec files, files installed that aren't part of
+	  the gem, checksum mismatches, etc.
+
+	  Very ugly code.  Very ugly output.  Work in progress.
+
+2003-11-24 11:58  rich
+
+	* lib/rubygems/specification.rb: change full_name to include
+	  platform
+
+2003-11-24 09:15  chadfowler
+
+	* bin/gem: Option for HTTP Proxy server for remote-install.  Not
+	  yet implemented.
+
+2003-11-23 20:22  chadfowler
+
+	* lib/rubygems/builder.rb: Removed a stray \" in builder's success
+	  message
+
+2003-11-23 20:16  chadfowler
+
+	* lib/rubygems/specification.rb: Leaving escape in but commenting
+	  out its functionality because it hosed some other things up.
+	  Need to revisit this for the case where:
+
+	   s.summary = "Chad's Thing" # It's the apostrophe
+
+2003-11-23 20:08  chadfowler
+
+	* lib/rubygems/specification.rb: Escape quotes to avoid invalid
+	  gemspecs in the #{Gem.dir}/specifications directory
+
+2003-11-23 19:21  chadfowler
+
+	* bin/gem: Less ugly error message on file IO problems.
+
+2003-11-22 22:34  chadfowler
+
+	* bin/gem: Very simple support for validating a gem.  Will probably
+	  move this into the libs eventually.
+
+2003-11-22 20:53  chadfowler
+
+	* example/test.gemspec, lib/rubygems/builder.rb: Generate MD5
+	  checksum for gem and store it in the file.  Will be used to
+	  validate gem file before installation.
+
+2003-11-22 13:58  chadfowler
+
+	* install.rb, lib/rubygems/remote_installer.rb,
+	  packages/sources/sources.gemspec,
+	  packages/sources/lib/sources.rb: remote-install sources are now
+	  installed as a ruby gem at the time of rubygems installation.
+	  sources gemspec included in the rubygems distribution.
+
+2003-11-22 12:52  chadfowler
+
+	* bin/gem: Allow gem info by --version
+
+2003-11-22 11:50  chadfowler
+
+	* lib/: rubygems.rb, rubygems/cache.rb: Fixed the bug I introduced
+	  by fixing Rich's bug with gem cache caching. ;)
+
+	  Gem::Cache now has a #refresh! method.
+
+2003-11-22 10:16  chadfowler
+
+	* bin/gem, lib/rubygems.rb, lib/rubygems/installer.rb,
+	  lib/rubygems/remote_installer.rb: - Fixed bug in Gem.cache
+	  (though we may want to revisit it for in-memory caching - Command
+	  line configurable version for uninstall
+
+2003-11-22 00:28  rich
+
+	* lib/rubygems/cache.rb: rdoc'd search method
+
+2003-11-22 00:24  rich
+
+	* bin/gem, lib/rubygems/cache.rb, lib/rubygems/version.rb,
+	  test/test_version_comparison.rb: removed search_by_name because
+	  search does the same thing.  version::requirement was updated to
+	  that if you did not specific a version operation, it assumes an =
+	  sign.  updated tests accordingly
+
+2003-11-21 23:58  rich
+
+	* lib/rubygems/: cache.rb, installer.rb: allow version to be
+	  specified in uninstall (if called programatically)
+
+2003-11-21 23:52  rich
+
+	* lib/: rubygems.rb, rubygems/cache.rb, rubygems/installer.rb,
+	  rubygems/specification.rb: > moved all searching into cache..and
+	  now search by name/version and return an
+	  ordered list (.last == highest version).
+	  > modified uninstaller to allow selecting a specific version to
+	  uninstall if
+	  multiple versions are installed.
+	  > implemented comparison function on specification.
+	  > changed require_gem to use new search of cache function
+
+2003-11-21 21:06  chadfowler
+
+	* bin/gem, lib/rubygems/remote_installer.rb: Added ability to
+	  specify optional version requirement for remote installations
+
+2003-11-21 20:25  chadfowler
+
+	* test/test_remote_installer.rb: Removed carriage returns
+
+2003-11-21 19:04  chadfowler
+
+	* bin/gem_server: Converted from getopts to optparse.
+
+2003-11-21 18:31  rich
+
+	* lib/rubygems.rb: changed the order in which operations are
+	  performed in require_gem.  it now requires dependent gems prior
+	  to adding the require_paths to a gem.  otherwise we could have
+	  had a LoadError on a dependent gem but the paths were already
+	  added...potential problem
+
+2003-11-21 18:21  rich
+
+	* lib/rubygems/installer.rb: updated to ensure
+	  (specifications/cache) directories exist for a provided path
+
+2003-11-21 18:01  rich
+
+	* lib/rubygems/specification.rb: updated rdoc
+
+2003-11-21 17:59  rich
+
+	* bin/gem, lib/rubygems/builder.rb, lib/rubygems/installer.rb,
+	  lib/rubygems/specification.rb: fixed various bugs with the
+	  $GEM_PATH stuff, specifically on uninstall.  Also, changed to
+	  allow specifying a directory on install (--dir) and force install
+	  (--force).  Changed the builder generated ruby header to use
+	  optparse.
+
+2003-11-21 07:03  chadfowler
+
+	* lib/: rubygems.rb, rubygems/cache.rb,
+	  rubygems/remote_installer.rb: Remote installation of dependencies
+	  now works.  It downloads all dependent gems or errors out.
+
+	  Fixed bug in require_gem.  Wrong call to cache.
+
+2003-11-21 00:59  rich
+
+	* bin/gem, example/test.gemspec, lib/rubygems.rb,
+	  lib/rubygems/cache.rb, lib/rubygems/installer.rb,
+	  lib/rubygems/specification.rb: added capability to support
+	  multiple paths $GEM_PATH in Ruby and RUBY_GEMS in the ARGV.  Lots
+	  of changes were needed to support this.  also added the --force
+	  and --dir options to gem installtion
+
+2003-11-20 22:50  chadfowler
+
+	* bin/gem: Switched to optparse.  Not a whole lot gained, but it
+	  seems to be the way Ruby is going.  It's nice not to have to do
+	  the "when" stuff, I guess.
+
+2003-11-19 23:41  chadfowler
+
+	* lib/rubygems/: installer.rb, remote_installer.rb: Added
+	  chadfowler.com to the hardcoded remote install list.
+
+	  Fixed a dangling YAML.load that broke uninstall.
+
+2003-11-19 22:56  rich
+
+	* lib/rubygems.rb: fixed bug in loading rubygems
+
+2003-11-19 22:51  chadfowler
+
+	* bin/: gem_server, gem_server.cgi: require 'yaml' :)
+
+2003-11-19 22:44  rich
+
+	* lib/: rubygems.rb, rubygems/cache.rb, rubygems/specification.rb:
+	  changed the format of stuff stored in the spec directory to ruby
+	  instead of YAML.  This allows us to not have to load yaml in
+	  'require_gem'.  switched the specification list to a Cache
+	  object.
+
+2003-11-19 21:56  rich
+
+	* lib/rubygems/installer.rb: write the spec file in ruby and not in
+	  yaml format (in the spec dir)
+
+2003-11-19 20:32  rich
+
+	* lib/rubygems/specification.rb: added to_ruby method to generate a
+	  ruby string that can be eval'ed in to build a Gem Specification
+
+2003-11-17 21:37  jimweirich
+
+	* bin/: gem_server, gem_server.cgi: removed carriage returns
+
+2003-11-17 21:19  chadfowler
+
+	* install.rb: Accidentally left some junk in the file.
+
+2003-11-17 19:50  dblack
+
+	* test/test_version_comparison.rb: * Test cases for Version.rb
+
+2003-11-17 19:50  dblack
+
+	* lib/rubygems/version.rb: * Split off tests into
+	  rubygems/tests/test_version_comparison.rb
+
+2003-11-17 12:37  chadfowler
+
+	* install.rb: Create File.join(Config::CONFIG['libdir'], "ruby",
+	  "gems") + "specifications" and + "cache" during installation.
+
+	  Need to remove this from rubygems.rb and replace with
+	  ensure_directory call.
+
+2003-11-17 12:29  rich
+
+	* lib/rubygems/version.rb: rdoc added
+
+2003-11-17 11:31  rich
+
+	* lib/rubygems/specification.rb: rdoc added
+
+2003-11-17 10:38  rich
+
+	* lib/rubygems/: cache.rb, installer.rb: made rdoc comments and
+	  renamed some variables
+
+2003-11-17 08:48  dblack
+
+	* lib/rubygems/version.rb: * Added stricter checking of incoming
+	  Requirement string
+
+	  * Added unit tests at end of file
+
+2003-11-17 07:32  chadfowler
+
+	* bin/: gem_server, gem_server.cgi: Refactored gem_server program
+	  and added an equivalent CGI version.
+
+2003-11-17 00:14  rich
+
+	* lib/: rubygems.rb, rubygems/builder.rb, rubygems/cache.rb: added
+	  rdoc documentation
+
+2003-11-16 17:15  chadfowler
+
+	* bin/: gem.cmd, gem_server.cmd: Added some batch files for Windows
+
+2003-11-16 17:08  rich
+
+	* install.rb, bin/gem, bin/gem_server, example/test.gemspec,
+	  example/lib/test.rb, example/lib/test/wow.rb, lib/rubygems.rb,
+	  lib/rubygems/builder.rb, lib/rubygems/cache.rb,
+	  lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb,
+	  lib/rubygems/specification.rb, lib/rubygems/version.rb,
+	  test/test_remote_installer.rb: Initial import developed at
+	  RubyConf 2003 by:
+
+	  Rich Kilmer Chad Fowler David Black Paul Brannon Jim Weirich
+
+2003-11-16 17:08  rich
+
+	* install.rb, bin/gem, bin/gem_server, example/test.gemspec,
+	  example/lib/test.rb, example/lib/test/wow.rb, lib/rubygems.rb,
+	  lib/rubygems/builder.rb, lib/rubygems/cache.rb,
+	  lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb,
+	  lib/rubygems/specification.rb, lib/rubygems/version.rb,
+	  test/test_remote_installer.rb: Initial revision
+
+Local variables:
+indent-tabs-mode: t
+tab-width: 8
+end:
diff --git a/doc/rubygems/History.txt b/doc/rubygems/History.txt
new file mode 100644
index 0000000000..4a80b1bfb4
--- /dev/null
+++ b/doc/rubygems/History.txt
@@ -0,0 +1,852 @@
+# -*- coding: utf-8 -*-
+
+=== 1.3.6 / 2010-02-17
+
+NOTE:
+
+http://rubygems.org is now the default source for downloading gems.
+
+You may have sources set via ~/.gemrc, so you should replace
+http://gems.rubyforge.org with http://rubygems.org
+
+http://gems.rubyforge.org will continue to work for the forseeable future.
+
+New features:
+
+* `gem` commands
+  * Added `gem push` and `gem owner` for interacting with modern/Gemcutter
+    sources
+  * `gem dep` now supports --prerelease.
+  * `gem fetch` now supports --prerelease.
+  * `gem server` now supports --bind.  Patch #27357 by Bruno Michel.
+  * `gem rdoc` no longer overwrites built documentation.  Use --overwrite
+    force rebuilding.  Patch #25982 by Akinori MUSHA.
+* Captial letters are now allowed in prerelease versions.
+
+Bug fixes:
+
+* Development deps are no longer added to rubygems-update gem so older
+  versions can update sucessfully.
+* Installer bugs:
+  * Prerelease gems can now depend on non-prerelease gems.
+  * Development dependencies are ignored unless explicitly needed.  Bug #27608
+    by Roger Pack.
+* `gem` commands
+  * `gem which` now fails if no paths were found.  Adapted patch #27681 by
+    Caio Chassot.
+  * `gem server` no longer has invalid markup.  Bug #27045 by Eric Young.
+  * `gem list` and friends show both prerelease and regular gems when
+    --prerelease --all is given
+* Gem::Format no longer crashes on empty files.  Bug #27292 by Ian Ragsdale.
+* Gem::GemPathSearcher handles nil require_paths. Patch #27334 by Roger Pack.
+* Gem::RemoteFetcher no longer copies the file if it is where we want it.
+  Patch #27409 by Jakub Šťastný.
+
+Deprecation Notices:
+
+* lib/rubygems/timer.rb has been removed.
+* Gem::Dependency#version_requirements is deprecated and will be removed on or
+  after August 2010.
+* Bulk index update is no longer supported.
+* Gem::manage_gems was removed in 1.3.3.
+* Time::today was removed in 1.3.3.
+
+=== 1.3.5 / 2009-07-21
+
+Bug fixes:
+
+* Fix use of prerelease gems.
+* Gem.bin_path no longer escapes path with spaces. Bug #25935 and #26458.
+
+Deprecation Notices:
+
+* Bulk index update is no longer supported (the code currently remains, but not
+  the tests)
+* Gem::manage_gems was removed in 1.3.3.
+* Time::today was removed in 1.3.3.
+
+=== 1.3.4 / 2009-05-03
+
+Bug Fixes:
+
+* Fixed various warnings
+* Gem::ruby_version works correctly for 1.8 branch and trunk
+* Prerelease gems now show up in `gem list` and can be used
+* Fixed option name for `gem setup --format-executable`
+* RubyGems now matches Ruby > 1.9.1 gem paths
+* Gem::RemoteFetcher#download now works for explicit Windows paths across
+  drives.  Bug #25882 by Lars Christensen
+* Fix typo in Gem::Requirement#parse.  Bug #26000 by Mike Gunderloy.
+
+Deprecation Notices:
+
+* Bulk index update is no longer supported (the code currently remains, but not
+  the tests)
+* Gem::manage_gems was removed in 1.3.3.
+* Time::today was removed in 1.3.3.
+
+=== 1.3.3 / 2009-05-04
+
+New Features:
+
+* `gem server` allows port names (from /etc/services) with --port.
+* `gem server` now has search that jumps to RDoc.  Patch #22959 by Vladimir
+  Dobriakov.
+* `gem spec` can retrieve single fields from a spec (like `gem spec rake
+  authors`).
+* Gem::Specification#has_rdoc= is deprecated and ignored (defaults to true)
+* RDoc is now generated regardless of Gem::Specification#has_rdoc?
+
+Bug Fixes:
+
+* `gem clean` now cleans up --user-install gems.  Bug #25516 by Brett
+  Eisenberg.
+* Gem.bin_path now escapes paths with spaces.
+* Rake extension builder uses explicit correctly loads rubygems when invoking
+  rake.
+* Prerelease versions now match "~>" correctly.  Patch #25759 by Yossef
+  Mendelssohn.
+* Check bindir for executables, not root when validating.  Bug reported by
+  David Chelimsky.
+* Remove Time.today, no way to override it before RubyGems loads.  Bug #25564
+  by Emanuele Vicentini
+* Raise Gem::Exception for #installation_path when not installed.  Bug #25741
+  by Daniel Berger.
+* Don't raise in Gem::Specification#validate when homepage is nil.  Bug #25677
+  by Mike Burrows.
+* Uninstall executables from the correct directory.  Bug #25555 by Brett
+  Eisenberg.
+* Raise Gem::LoadError if Kernel#gem fails due to previously-loaded gem.  Bug
+  reported by Alf Mikula.
+
+Deprecation Notices:
+
+* Gem::manage_gems has been removed.
+* Time::today has been removed early.  There was no way to make it warn and be
+  easy to override with user code.
+
+=== 1.3.2 / 2009-04-15
+
+Select New Features:
+
+* RubyGems now loads plugins from rubygems_plugin.rb in installed gems.
+  This can be used to add commands (See Gem::CommandManager) or add
+  install/uninstall hooks (See Gem::Installer and Gem::Uninstaller).
+* Gem::Version now understands prerelease versions using letters. (eg.
+  '1.2.1.b')  Thanks to Josh Susser, Alex Vollmer and Phil Hagelberg.
+* RubyGems now includes a Rake task for creating gems which replaces rake's
+  Rake::GemPackageTask.  See Gem::PackageTask.
+* Gem::find_files now returns paths in $LOAD_PATH.
+* Added Gem::promote_load_path for use with Gem::find_files
+* Added Gem::bin_path to make finding executables easier.  Patch #24114 by
+  James Tucker.
+* Various improvements to build arguments for installing gems.
+* `gem contents` added --all and --no-prefix.
+* Gem::Specification
+  * #validate strips directories and errors on not-files.
+  * #description no longer removes newlines.
+  * #name must be a String.
+  * FIXME and TODO are no longer allowed in various fields.
+  * Added support for a license attribute.  Feature #11041 (partial).
+  * Removed Gem::Specification::list, too much process growth.  Bug #23668 by
+    Steve Purcell.
+* `gem generate_index`
+  * Can now generate an RSS feed.
+  * Modern indicies can now be updated incrementally.
+  * Legacy indicies can be updated separately from modern.
+
+Select Bugs Fixed:
+
+* Better gem activation error message. Patch #23082.
+* Kernel methods are now private.  Patch #20801 by James M. Lawrence.
+* Fixed various usability issues with `gem check`.
+* `gem update` now rescues InstallError and continues.  Bug #19268 by Gabriel
+  Wilkins.
+* Allow 'https', 'file' as a valid schemes for --source.  Patch #22485.
+* `gem install`
+  * Now removes existing path before installing.  Bug #22837.
+  * Uses Gem::bin_path in executable stubs to work around Kernel#load bug in
+    1.9.
+  * Correctly handle build args (after --) via the API.  Bug #23210.
+* --user-install
+  * `gem install --no-user-install` now works.  Patch #23573 by Alf Mikula.
+  * `gem uninstall` can now uninstall from ~/.gem.  Bug #23760 by Roger Pack.
+* setup.rb
+  * Clarify RubyGems RDoc installation location.  Bug #22656 by Gian Marco
+    Gherardi.
+  * Allow setup to run from read-only location.  Patch #21862 by Luis Herrera.
+  * Fixed overwriting ruby executable when BASERUBY was not set.  Bug #24958
+    by Michael Soulier.
+  * Ensure we're in a RubyGems dir when installing.
+  * Deal with extraneous quotation mark when autogenerating .bat file on MS
+    Windows.  Bug #22712.
+
+Deprecation Notices:
+
+* Gem::manage_gems has been removed.
+* Time::today will be removed in RubyGems 1.4.
+
+Special thanks to Chad Wooley for backwards compatibility testing and Luis
+Lavena and Daniel Berger for continuing windows support.
+
+=== 1.3.1 / 2008-10-28
+
+Bugs fixed:
+
+* Disregard ownership of ~ under Windows while creating ~/.gem.  Fixes
+  issues related to no uid support under Windows.
+* Fix requires for Gem::inflate, Gem::deflate, etc.
+* Make Gem.dir respect :gemhome value from config.  (Note: this feature may be
+  removed since it is hard to implement on 1.9.)
+* Kernel methods are now private.  Patch #20801 by James M. Lawrence.
+* Gem::location_of_caller now behaves on Windows.  Patch by Daniel Berger.
+* Silence PATH warning.
+
+Deprecation Notices:
+
+* Gem::manage_gems will be removed on or after March 2009.
+
+=== 1.3.0 / 2008-09-25
+
+New features:
+
+* RubyGems doesn't print LOCAL/REMOTE titles for `gem query` and friends if
+  stdout is not a TTY, except with --both.
+* Added Gem.find_files, allows a gem to discover features provided by other
+  gems.
+* Added pre/post (un)install hooks for packagers of RubyGems.  (Not for gems
+  themselves).
+* RubyGems now installs gems into ~/.gem if GEM_HOME is not writable.  Use
+  --no-user-install command-line switch to disable this behavior.
+* Fetching specs for update now uses If-Modified-Since requests.
+* RubyGems now updates the ri cache when the rdoc gem is installed and
+  documentation is generated.
+
+Deprecation Notices:
+
+* Gem::manage_gems now warns when called.  It will be removed on or after March
+  2009.
+
+Bugs Fixed:
+
+* RubyGems 1.3.0+ now updates when no previous rubygems-update is installed.
+  Bug #20775 by Hemant Kumar.
+* RubyGems now uses the regexp we already have for `gem list --installed`.  Bug
+  #20876 by Nick Hoffman.
+* Platform is now forced to Gem::Platform::RUBY when nil or blank in the
+  indexer.  Fixes various uninstallable gems.
+* Handle EINVAL on seek.  Based on patch in bug #20791 by Neil Wilson.
+* Fix HTTPS support.  Patch #21072 by Alex Arnell.
+* RubyGems now loads all cache files even if latest has been loaded.  Bug
+  #20776 by Uwe Kubosch.
+* RubyGems checks for support of development dependencies for #to_ruby.  Bug
+  #20778 by Evan Weaver.
+* Now specifications from the future can be loaded.
+* Binary script uninstallation fixed.  Bug #21234 by Neil Wilson.
+* Uninstallation with -i fixed.  Bug #20812 by John Clayton.
+* Gem::Uninstaller#remove_all now calls Gem::Uninstaller#uninstall_gem so hooks
+  get called.  Bug #21242 by Neil Wilson.
+* Gem.ruby now properly escaped on windows.  Fixes problem with extension
+  compilation.
+* `gem lock --strict` works again.  Patch #21814 by Sven Engelhardt.
+* Platform detection for Solaris was improved.  Patch #21911 by Bob Remeika.
+
+Other Changes Include:
+
+* `gem help install` now describes _version_ argument to executable stubs
+* `gem help environment` describes environment variables and ~/.gemrc and
+  /etc/gemrc
+* On-disk gemspecs are now read in UTF-8 and written with a UTF-8 magic comment
+* Rakefile
+  * If the SETUP_OPTIONS environment variable is set, pass its contents as
+    arguments to setup.rb
+* lib/rubygems/platform.rb
+  * Remove deprecated constant warnings and really deprecate them.  (WIN32,
+    etc).
+* lib/rubygems/remote_fetcher.rb
+  * Now uses ~/.gem/cache if the cache dir in GEM_HOME is not writable.
+* lib/rubygems/source_index.rb
+  * Deprecate options to 'search' other than Gem::Dependency instances and
+    issue warning until November 2008.
+* setup.rb
+  * --destdir folder structure now built using Pathname, so it works for
+    Windows platforms.
+* test/*
+  * Fixes to run tests when under test/rubygems/.  Patch by Yusuke ENDOH
+    [ruby-core:17353].
+* test/test_ext_configure_builder.rb
+  * Locale-free patch by Yusuke Endoh [ruby-core:17444].
+
+=== 1.2.0 / 2008-06-21
+
+New features:
+
+* RubyGems no longer performs bulk updates and instead only fetches the gemspec
+  files it needs.  Alternate sources will need to upgrade to RubyGems 1.2 to
+  allow RubyGems to take advantage of the new metadata updater.  If a pre 1.2
+  remote source is in the sources list, RubyGems will revert to the bulk update
+  code for compatibility.
+* RubyGems now has runtime and development dependency types.  Use
+  #add_development_dependency and #add_runtime_dependency.  All typeless
+  dependencies are considered to be runtime dependencies.
+* RubyGems will now require rubygems/defaults/operating_system.rb and
+  rubygems/defaults/#{RBX_ENGINE}.rb if they exist.  This allows packagers and
+  ruby implementers to add custom behavior to RubyGems via these files.  (If
+  the RubyGems API is insufficient, please suggest improvements via the
+  RubyGems list.)
+* /etc/gemrc (and windows equivalent) for global settings
+* setup.rb now handles --vendor and --destdir for packagers
+* `gem stale` command that lists gems by last access time
+
+Bugs Fixed:
+
+* File modes from gems are now honored, patch #19737
+* Marshal Gem::Specification objects from the future can now be loaded.
+* A trailing / is now added to remote sources when missing, bug #20134
+* Gems with legacy platforms will now be correctly uninstalled, patch #19877
+* `gem install --no-wrappers` followed by `gem install --wrappers` no longer
+  overwrites executables
+* `gem pristine` now forces reinstallation of gems, bug #20387
+* RubyGems gracefully handles ^C while loading .gemspec files from disk, bug
+  #20523
+* Paths are expanded in more places, bug #19317, bug #19896
+* Gem::DependencyInstaller resets installed gems every install, bug #19444
+* Gem.default_path is now honored if GEM_PATH is not set, patch #19502
+
+Other Changes Include:
+
+* setup.rb
+  * stub files created by RubyGems 0.7.x and older are no longer removed.  When
+    upgrading from these ancient versions, upgrade to 1.1.x first to clean up
+    stubs.
+  * RDoc is no longer required until necessary, patch #20414
+* `gem server`
+  * Now completely matches the output of `gem generate_index` and
+    has correct content types
+  * Refreshes from source directories for every hit.  The server will no longer
+    need to be restarted after installing gems.
+* `gem query --details` and friends now display author, homepage, rubyforge url
+  and installed location
+* `gem install` without -i no longer reinstalls dependencies if they are in
+  GEM_PATH but not in GEM_HOME
+* Gem::RemoteFetcher now performs persistent connections for HEAD requests,
+  bug #7973
+
+=== 1.1.1 / 2008-04-11
+
+Bugs Fixed:
+
+* Gem.prefix now returns non-nil only when RubyGems was installed outside
+  sitelibdir or libdir.
+* The `gem server` gem list now correctly links to gem details.
+* `gem update --system` now passes --no-format-executable to setup.rb.
+* Gem::SourceIndex#refresh! now works with multiple gem repositories.
+* Downloaded gems now go into --install-dir's cache directory.
+* Various fixes to downloading gem metadata.
+* `gem install --force` now ignores network errors too.
+* `gem pristine` now rebuilds extensions.
+* `gem update --system` now works on virgin Apple ruby.
+* Gem::RemoteFetcher handles Errno::ECONNABORTED.
+* Printing of release notes fixed.
+
+=== 1.1.0 / 2008-03-29
+
+New features:
+
+* RubyGems now uses persistent connections on index updates.  Index updates are
+  much faster now.
+* RubyGems only updates from a latest index by default, cutting candidate gems
+  for updates to roughly 1/4 (at present).  Index updates are even faster
+  still.
+  * `gem list -r` may only show the latest version of a gem, add --all to see
+    all gems.
+* `gem spec` now extracts specifications from .gem files.
+* `gem query --installed` to aid automation of checking for gems.
+
+Bugs Fixed:
+
+* RubyGems works with both Config and RbConfig now.
+* Executables are now cleaned upon uninstall.
+* You can now uninstall from a particular directory.
+* Updating from non-default sources fixed.
+* Executable stubs now use ruby install name in shebang.
+* `gem unpack` checks every directory in Gem.path now.
+* `gem install` now exits with non-zero exit code when appropriate.
+* `gem update` only updates gems that need updates.
+* `gem update` doesn't force remote-only updates.
+* `gem update` handles dependencies properly when updating.
+* Gems are now loaded in Gem.path order.
+* Gem stub scripts on windows now work outside Gem.bindir.
+* `gem sources -r` now works without network access.
+
+Other Changes Include:
+
+* RubyGems now requires Ruby > 1.8.3.
+* Release notes are now printed upon installation.
+* `gem env path` now prints a usable path.
+* `gem install` reverts to local-only installation upon network error.
+* Tar handling code refactoring and cleanup.
+* Gem::DependencyInstaller's API has changed.
+
+For a full list of changes to RubyGems, see the ChangeLog file.
+
+=== 1.0.1 / 2007-12-20
+
+Bugs Fixed:
+
+* Installation on Ruby 1.8.3 through 1.8.5 fixed
+* `gem build` on 1.8.3 fixed
+
+Other Changes Include:
+
+* Since RubyGems 0.9.5, RubyGems is no longer supported on Ruby 1.8.2 or older,
+  this is official in RubyGems 1.0.1.
+
+=== 1.0.0 / 2007-12-20
+
+Major New Features Include:
+
+* RubyGems warns about various problems with gemspecs during gem building
+* More-consistent versioning for the RubyGems software
+
+Other Changes Include:
+
+* Fixed various bugs and problems with installing gems on Windows
+* Fixed using `gem server` for installing gems
+* Various operations are even more verbose with --verbose
+* Built gems are now backwards compatible with 0.9.4
+* Improved detection of RUBYOPT loading rubygems
+* `ruby setup.rb` now has a --help option
+* Gem::Specification#bindir is now respected on installation
+* Executable stubs can now be installed to match ruby's name, so if ruby is
+  installed as 'ruby18', foo_exec will be installed as 'foo_exec18'
+* `gem unpack` can now unpack into a specific directory with --target
+* OpenSSL is no longer required by default
+
+Deprecations and Deletions:
+
+* Kernel#require_gem has been removed
+* Executables without a shebang will not be wrapped in a future version, this
+  may cause such executables to fail to operate on installation
+* Gem::Platform constants other than RUBY and CURRENT have been removed
+* Gem::RemoteInstaller was removed
+* Gem::Specification#test_suite_file and #test_suite_file= are deprecated in
+  favor of #test_file and #test_file=
+* Gem::Specification#autorequire= has been deprecated
+* Time::today will be removed in a future version
+
+=== 0.9.5 / 2007-11-19
+
+Major New Features Include:
+
+* Platform support
+* Automatic installation of platform gems
+* New bandwidth and memory friendlier index file format
+* "Offline" mode (--no-update-sources)
+* Bulk update threshold can be specified (-B, --bulk-threshold)
+* New `gem fetch` command
+* `gem` now has "really verbose" output when you specify -v
+* Improved stubs and `gem.bat` on mswin, including better compatiblity
+  with the One-Click Installer.
+
+Other Changes Include:
+
+* Time::today is deprecated and will be removed at a future date
+* Gem::manage_gems is deprecated and will be removed at a future date
+* `gem install --include-dependencies` (-y) is now deprecated since it is the
+  default, use --ignore-dependencies to turn off automatic dependency
+  installation
+* Multi-version diamond dependencies only are installed once
+* Processing a YAML bulk index update takes less memory
+* `gem install -i` makes sure all depenencies are installed
+* `gem update --system` reinstalls into the prefix it was originally installed
+  in
+* `gem update --system` respects --no-rdoc and --no-ri flags
+* HTTP basic authentication support for proxies
+* Gem::Specification#platforms should no longer be a String, use
+  Gem::Platform::CURRENT when building binary gems instead
+* `gem env` has more diagnostic information
+* require 'rubygems' loads less code
+* sources.gem is gone, RubyGems now uses built-in defaults
+* `gem install --source` will no longer add --source by default, use `gem
+  sources --add` to make it a permanent extra source
+* `gem query` (list) no longer prints details by default
+* Exact gem names are matched in various places
+* mkrf extensions are now supported
+* A gem can depend on a specific RubyGems version
+* `gem_server` is now `gem server`
+* `gemlock` is now `gem lock`
+* `gem_mirror` is now `gem mirror`
+* `gemwhich` is now `gem which`
+* `gemri` is no longer included with RubyGems
+* `index_gem_repository.rb` is now `gem generate_index`
+* `gem` performs more validation of parameters
+* Custom rdoc styles are now supported
+* Gem indexer no longer removes quick index during index creation
+* Kernel#require only rescues a LoadError for the file being required now
+* `gem dependencies` can now display some information for remote gems
+* Updating RubyGems now works with RUBYOPT=-rubygems
+
+Special thanks to:
+
+* Daniel Berger
+* Luis Lavena
+* Tom Copeland
+* Wilson Bilkovich
+
+=== 0.9.4 / 2007-05-23
+
+If you are experiencing problems with the source index (e.g. strange
+"No Method" errors), or problems with zlib (e.g. "Buffer Error"
+messsage), we recommend upgrading to RubyGems 0.9.4.
+
+Bug Fixes Include:
+
+* Several people have been experiencing problems with no method errors
+  on the source index cache.  The source index cache is now a bit more
+  self healing.  Furthermore, if the source index cache is
+  irreparable, then it is automatically dropped and reloaded.
+* The source cache files may now be dropped with the "gem sources
+  --clear-all" command.  (This command may require root is the system
+  source cache is in a root protected area).
+* Several sub-commands were accidently dropped from the "gem" command.
+  These commands have been restored.
+
+=== 0.9.3 / 2007-05-10
+
+Bug Fixes Include:
+
+The ZLib library on Windows will occasionally complains about a buffer error
+when unpacking gems.  The Gems software has a workaround for that problem, but
+the workaround was only enabled for versions of ZLib 1.2.1 or earlier.  We
+have received several reports of the error occuring with ZLib 1.2.3, so we
+have permanently enabled the work around on all versions.
+
+=== 0.9.2 / 2007-02-05
+
+Bug Fixes Include:
+
+* The "unpack" command now works properly.
+* User name and password are now passed properly to the authenticating
+  proxy when downloading gems.
+
+=== 0.9.1 / 2007-01-16
+
+See ChangeLog
+
+=== 0.9.0 / 2006-06-28
+
+Finally, the much anticipated RubyGems version 0.9.0 is now available.
+This release includes a number of new features and bug fixes.  The
+number one change is that we can now download the gem index
+incrementally.  This will greatly speed up the gem command when only a
+few gems are out of date.
+
+Major Enhancments include:
+
+* The gem index is now downloaded incrementally, only updating entries
+  that are out of date.  If more than 50 entries are out of date, we
+  revert back to a bulk download.
+* Several patches related to allowing RubyGems to work with
+  authenticating proxies (from Danie Roux and Anatol Pomozov).  Just
+  put the user and password in the proxy URL (e.g. -p
+  http://user:password@proxy.address.com:8080) or use the
+  HTTP_PROXY_USER and HTTP_PROXY_PASS environment variables.
+* The gem unpack command can now accept a file path rather than just a
+  install gem name.
+* Both RI and RDOC documents are now generated by default.
+* A gemri command is included to read gem RI docs (only needed for
+  Ruby 1.8.4 or earlier).
+
+Minor enhancements include:
+
+* Verison 0.0.0 is now a valid gem version.
+* Better detection of missing SSL functionality.
+* SSL is not required if the security policy does not require
+  signature checking.
+* Rake built extensions are now supported (Tilman Sauerbeck).
+* Several autorequire bug fixes.
+* --traceback is now an alias for --backtrace (I can never remember
+  which one it is).
+* SAFE=1 compatibility fixes.
+* .rbw is now a supported suffix for RubyGem's custom require.
+* Several Ruby 1.9 compatibility fixes (Eric Hodel).
+
+Bug Fixes:
+
+* Added dashes to gemspecs generated in Ruby 1.8.3.  This solves some
+  cross-Ruby version compatibility issues.
+* Fixed bug where the wrong executables could be uninstalled (Eric
+  Hodel).
+* Fixed bug where gem unpack occasionally unpacked the wrong gem.
+* Fixed bug where a fatal error occured when permissions on .gemrc
+  were too restrictive (reported by Luca Pireddu).
+* Fixed prefix handling for native expressions (patch by Aaron Patterson).
+* Fixed several Upgrade => Update typos.
+
+=== 0.8.11 / 2005-07-13
+
+* -y is a synonym for --include-dependencies.
+* Better handling of errors in the top level rescue clause.
+* Package list command (e.g. gem inspect GEM).
+* .gemrc now allows cvsrc-like options to set defaults per subcommand.
+* The autorequire gem spec field will now accept a list.
+* Substituted Time for Date in specs, increasing performance
+  dramatically.
+* Fixed reported bug of gem directories ending in "-" (reported by
+  Erik Hatcher).
+* Fixed but in installer that caused dependency installation to not
+  work.
+* Added Paul Duncan's gem signing patch.
+* Added Mark Hubbart's Framework patch (for better integration with OS
+  X).
+* Added David Glasser's install-from-mirror patch.
+* Additional internal structural cleanup and test reorganization.
+
+=== 0.8.10 / 2005-03-27
+
+* In multi-user environments, it is common to supply mulitple versions of gems
+  (for example Rails), allowing individual users to select the version of the
+  gem they desire.  This allows a user to be insulated from updates to that
+  gem.  RubyGems 0.8.10 fixes a problem where gems could occasionally become
+  confused about the current versions of libraries selected by the user.
+* The other annoying bug is that if there are any existing rubygems-update gems
+  installed, then the "gem update --system" command will download a new
+  update, but install the latest update prior to the download.
+
+=== 0.8.9
+
+Never released
+
+=== 0.8.8 / 2005-03-14
+
+* Moved the master definition of class Requirement back under version.
+  Kept the body of Requirement under Gem.
+
+=== 0.8.7 / 2005-03-14
+
+Even though it has only been a few weeks since that last release,
+there are quite a number of new features in 0.8.7.  A complete list of
+new features will be given below, but here is a summary of the hot
+items.
+
+* The bug that prevented some users from installing rails has been
+  squashed.  A big thanks to Bill Guindon (aGorilla) for helping track
+  that one down.
+
+There are several new commands available on the gem command:
+
+* gem cleanup GEMNAME -- Cleanup (uninstall) all the old versions of
+  gem.  If the gem name is omitted, the entire repository is cleaned.
+* gem dependency GEMNAME -- Show the dependencies for the named gems.
+  This is really helpful when trying to figure out what gem needs what
+  other gem.
+
+There changes to the existing commands as well.
+
+* gem uninstall is much smarter about removing gems from the
+  repository.  Lists of gems are now uninstalled in proper dependency
+  order (ie. if A depends on B, A is uninstalled first).  Also,
+  warnings about broken dependencies occur only when removing the
+  *last* gem that supports a dependency is removed.
+
+Both gem install and gem uninstall support some new command line
+options that can reduce the amount of yes/no queries given the user.
+For install we have:
+
+* --ignore-dependencies -- Only install requests gems, no
+  dependendecies are automatically installed.
+* --include-dependencies -- Automatically install dependencies,
+  without confirmation.
+
+For gem uninstall, the new options are:
+
+* --all -- Uninstall all matching gems without confirmation.
+* --ignore-dependencies -- Uninstall, even if dependencies are broken.
+* --executables -- Remove executables without confirmation
+
+Under general cleanup, gems will not, by default, run RDoc on packages
+that do not have the RDoc flag set.
+
+And finally there is a new library file 'gemconfigure' to aid in
+writing version sensitive applications (without undue dependencies on
+RubyGems); and 'gemwhich', a short script to locate libraries in the
+file system.  You can read more about them here:
+
+* gemconfigure: http://docs.rubygems.org/read/chapter/4#page73
+* gemwhich: http://docs.rubygems.org/read/chapter/17
+
+=== 0.8.6 / 2005-02-27
+
+* Fixed a small bug with shebang construction
+
+=== 0.8.5 / 2005-02-26
+
+Do you know how you used to dread getting the following message while
+installing gems?
+
+  Updating Gem source index for: http://gems.rubyforge.org
+
+It could take up to 30 seconds (on my machine, even worse on others) for
+that crazy source index to update.
+
+This latest release of RubyGems speeds that wait time up considerably.
+The following table gives the following times for installing RedCloth
+with a required source index update on three system we had available to
+us.  No RDoc generation was included in the following times.
+
+  RubyGems    Linux         Mac OSX      Windows
+  0.8.4       33 secs       73 secs      58 secs
+  0.8.5        8 secs       14 secs      21 secs
+
+The new caching code is at least 3x faster than previous versions.  Woo
+Hoo!
+
+=== 0.8.4 / 2005-01-01
+
+* Rubygems 0.8.3's installer was broken unless you already had an older
+  version of RubyGems installed.  That's fixed.
+* Change in the way Gem::Specification internally deals with lazy attributes
+  and defaults, bringing (with some loadpath_manager changes) a fairly
+  significant increase in speed.
+* Support for lower-cased Gem file names (for you, Paul Duncan :)
+* Erik Veenstra's patch for making Gem versions sortable.
+
+=== 0.8.3 / 2004-12-07
+
+No real earth shattering news here, but there were a number of really
+annoying issues involving other libraries that RubyGems depends upon.
+0.8.3 contains some workarounds for these issues.  In particular:
+
+* Added workaround for the null byte in Dir string issue. (see
+  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121702).
+  (Thanks to Mauricio Fernández for the quick response on this one).
+* Added workaround for old version of Zlib on windows that caused
+  Ruwiki to fail to install. (see
+  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121770)
+* Added workaround for large YAML file issues.  (We dynamically cut
+  down the size of the source index YAML file and seem to have worked
+  around immediate issues.
+
+There has been some minor usability enhancements and changes ...
+
+* A user specific source index cache can be used when the site-wide
+  cache is unwritable (i.e. because you are running as a non-admin).
+  This *greatly* speeds up gem commands run in non-admin mode when the
+  site-wide cache is out of date.
+* The gem command now used an HTTP HEAD command to detect if the
+  server's source index needs to be downloaed.
+* gem check gemname --test will run unit tests on installed gems that
+  have unit tests.
+* Multiple gem names are allowed on the gem install command line.
+  This means you can do:
+  
+    gem install rake rails needle postgres-pr pimki
+  
+  (Ok, you get the idea)
+* Multiple authors my be specified in a Gem spec.
+* Switched to using setup.rb (rather than a custom install script) for
+  the installation of RubyGems itself.  If you have installed RubyGems
+  before, double check the installation instructions and make sure you
+  use setup.rb instead of install.rb.
+* Ryan Davis has provided a patch so you can use an env variable
+  (GEM_SKIP), to tell loadpath_manager not to load gems of those
+  names.  This was useful for him while testing libs that he had in
+  development.
+
+=== 0.8.1 / 2009-09-14
+
+* Quick release to capture some bug fixes.
+
+=== 0.8.0 / 2009-09-12
+
+* Remove need for library stubs.  Set the RUBYOPT environment variable to
+  include "rrubygems", and a normal require will find gem files.  Continue to
+  use 'require_gem gem_name, version' to specify gem versions.
+* Deprecated "test_suite_file" gemspec attribute in favor of "test_files" array.
+* Generates rdoc by default on installs.
+* Adopted tar/gzip file format, thanks to Mauricio Fernandez.
+* "gem rdoc" allows generation of rdoc after gem installation (will add a "gem
+  test"
+* Application stubs can now accept an optional parameter of _VERSION_ that will
+  run an arbitrary version of the application requested.
+* Various bug fixes
+* Various platform-independency improvements
+* "gem spec --all" displays spec info for all installed version of a given gem.
+* Dynamic caching of sources
+* Support for user-definable sources on the command line (thanks Assaph Mehr)
+* More intelligent support for platform-dependent gems.  Use Platform::CURRENT
+  when building a gem to set its platform to the one you're building on.
+  Installation displays a choice of platform-dependent gems, allowing the user
+  to pick.
+* Added "gem unpack" for "unpacking" a gem to the current directory
+
+=== 0.7.0 / 2004-07-09
+
+See ChangeLog
+
+=== 0.6.0 / 2004-06-08
+
+* Collapse output of --search and --list (and gem_server) operations so that
+  each gem is listed only once, with each of its versions listed on the same
+  line.
+* bin/gem: new --upgrade-all option allows one to upgrade every installed gem
+* new #required_ruby_version attribute added to gem specification for
+  specifying a dependency on which version of ruby the gem needs.  Format it
+  accepts is the same as the Gem::Version::Requirement format:
+  
+    spec.required_ruby_version = "> 1.8.0"
+* --install-stub defaults to true, so library stubs are created
+
+=== 0.5.0 / 2004-06-06
+
+* Jim added the ability to specify version constraints to avoid API
+  incompatibilities.  This has been the subject of much debate for the past
+  couple of months, with many ideas and code contributed by Eivind Eklund and
+  Mauricio Fernandez.  The following set of assertions shows how it works:
+  
+    assert_inadequate("1.3", "~> 1.4")
+    assert_adequate(  "1.4", "~> 1.4")
+    assert_adequate(  "1.5", "~> 1.4")
+    assert_inadequate("2.0", "~> 1.4") # This one is key--the new operator
+				       # disallows major version number
+				       # differences.
+* Group gem search output when multiple versions exist for a given gem:
+  
+    activerecord (0.7.8, 0.7.7, 0.7.6, 0.7.5)
+      Implements the ActiveRecord pattern for ORM.
+* Add arbitrary RDoc-able files via gemspec (not just Ruby source files) for
+  people who have, for example, README.rdoc in their distributions.  Add to
+  gemspec via: spec.extra_rdoc_files = ["list", "of", "files"].  Ruby files are
+  automatically included.
+* Some small bug fixes
+
+=== 0.4.0 / 2004-05-31
+
+* Minor bug fixes including Windows compatability issues
+
+=== 0.3.0 / 2004-04-30
+
+* Cleanup of command-line arguments and handling.  Most commands accept a
+  --local or --remote modifier.
+* Creation of Application Gems (packages that include executable programs).
+  See http://rubygems.rubyforge.org/wiki/wiki.pl?DeveloperGuide for information
+  on how to use it.
+* Basic functionality for installing binary gems from source (:extensions
+  property of gem specification holds an array of paths to extconf.rb files to
+  be used for compilation)
+* Install library "stub" allowing a normal 'require' to work (which then does
+  the rubygems require and 'require_gem'
+* --run-tests runs the test suite specified by the "test_suite_file" property
+  of a gem specification
+* HTTP Proxy support works.  Rewrite of HTTP code.
+* Unit and functional tests added (see Rakefile).
+* Prompt before remote-installing dependencies during gem installation.
+* Config file for storing preferences for 'gem' command usage.
+* Generally improved error messages (still more work to do)
+* Rearranged gem directory structure for cleanliness.
+
+=== 0.2.0 / 2004-03-14
+
+* Initial public release
+
diff --git a/doc/rubygems/LICENSE.txt b/doc/rubygems/LICENSE.txt
new file mode 100644
index 0000000000..db88c5e118
--- /dev/null
+++ b/doc/rubygems/LICENSE.txt
@@ -0,0 +1,53 @@
+RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
+Weirich and others.  You can redistribute it and/or modify it under
+either the terms of the GPL (see the GPL.txt file), or the conditions
+below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
diff --git a/doc/rubygems/README b/doc/rubygems/README
new file mode 100644
index 0000000000..68a52593d4
--- /dev/null
+++ b/doc/rubygems/README
@@ -0,0 +1,41 @@
+= RubyGems
+
+* http://rubygems.org/
+* http://docs.rubygems.org/
+* http://rubygems.rubyforge.org/
+* http://rubyforge.org/projects/rubygems
+
+== DESCRIPTION
+
+RubyGems is a package management framework for Ruby.
+
+This gem is an update for the RubyGems software. You must have an
+installation of RubyGems before this update can be applied.
+
+See Gem for information on RubyGems (or `ri Gem`)
+
+To upgrade to the latest RubyGems, run:
+
+  $ gem update --system  # you might need to be an administrator or root
+
+NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed.  You will need to use the following instructions
+if you see "Nothing to update".
+
+If you have an older version of RubyGems installed, then you can still
+do it in two steps:
+
+  $ gem install rubygems-update  # again, might need to be admin/root
+  $ update_rubygems              # ... here too
+
+If you don't have any RubyGems install, there is still the pre-gem approach to
+getting software, doing it manually:
+
+1. Download from: http://rubyforge.org/frs/?group_id=126
+2. Unpack into a directory and cd there
+3. Install with: ruby setup.rb  # you may need admin/root privilege
+
+For more details and other options, see:
+
+  ruby setup.rb --help
+
diff --git a/doc/shell.rd b/doc/shell.rd
index 02ee1b020a..8a1f7c5a80 100644
--- a/doc/shell.rd
+++ b/doc/shell.rd
@@ -1,7 +1,6 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
 			   	$Revision$
-			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index 073e71ea42..33e5a9ed9b 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -1,7 +1,6 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
 			   	$Revision$
-			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/enc/Makefile.in b/enc/Makefile.in
new file mode 100644
index 0000000000..2a7807d9b7
--- /dev/null
+++ b/enc/Makefile.in
@@ -0,0 +1,64 @@
+encsrcdir = @srcdir@
+topdir = .
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+top_srcdir = $(encsrcdir:/enc=)
+srcdir = $(top_srcdir)
+arch = @arch@
+EXTOUT = @EXTOUT@
+hdrdir = $(srcdir)/include
+arch_hdrdir = $(EXTOUT)/include/$(arch)
+ENCSODIR = $(EXTOUT)/$(arch)/enc
+TRANSSODIR = $(ENCSODIR)/trans
+DLEXT = @DLEXT@
+OBJEXT = @OBJEXT@
+
+BUILTIN_ENCS	= ascii.c us_ascii.c\
+		  unicode.c utf_8.c
+
+BUILTIN_TRANSES	= newline.trans
+
+RUBY_SO_NAME = @RUBY_SO_NAME@
+LIBRUBY = @LIBRUBY@
+LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
+LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
+
+empty =
+CC = @CC@
+OUTFLAG = @OUTFLAG@$(empty)
+COUTFLAG = @COUTFLAG@$(empty)
+CFLAGS = $(CCDLFLAGS) @CFLAGS@ @ARCH_FLAG@
+cflags = @cflags@
+optflags = @optflags@
+debugflags = @debugflags@
+warnflags = @warnflags@
+CCDLFLAGS = @CCDLFLAGS@
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
+DEFS = @DEFS@
+CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
+LDFLAGS = @LDFLAGS@
+LDSHARED = @LDSHARED@
+ldflags  = $(LDFLAGS)
+dldflags = @DLDFLAGS@
+archflag = @ARCH_FLAG@
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+RUBY     = $(MINIRUBY)
+
+WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans
+
+RM = @RM@
+MAKEDIRS = @MAKEDIRS@
+
+.SUFFIXES: .trans
+
+all: make-workdir
+
+make-workdir:
+	$(MAKEDIRS) $(WORKDIRS)
+
+clean:
+
+distclean: clean clean-srcs
+	@$(RM) enc.mk
+realclean: distclean
diff --git a/enc/ascii.c b/enc/ascii.c
new file mode 100644
index 0000000000..3d62ec9bf7
--- /dev/null
+++ b/enc/ascii.c
@@ -0,0 +1,93 @@
+/**********************************************************************
+  ascii.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2006  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+OnigEncodingDefine(ascii, ASCII) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ASCII-8BIT",/* name */
+  1,           /* max byte length */
+  1,           /* min byte length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  onigenc_ascii_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  onigenc_ascii_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("BINARY", "ASCII-8BIT")
+ENC_REPLICATE("IBM437", "ASCII-8BIT")
+ENC_ALIAS("CP437", "IBM437")
+ENC_REPLICATE("IBM737", "ASCII-8BIT")
+ENC_ALIAS("CP737", "IBM737")
+ENC_REPLICATE("IBM775", "ASCII-8BIT")
+ENC_ALIAS("CP775", "IBM775")
+ENC_REPLICATE("CP850", "ASCII-8BIT")
+ENC_ALIAS("IBM850", "CP850")
+ENC_REPLICATE("IBM852", "ASCII-8BIT")
+ENC_REPLICATE("CP852", "IBM852")
+ENC_REPLICATE("IBM855", "ASCII-8BIT")
+ENC_REPLICATE("CP855", "IBM855")
+ENC_REPLICATE("IBM857", "ASCII-8BIT")
+ENC_ALIAS("CP857", "IBM857")
+ENC_REPLICATE("IBM860", "ASCII-8BIT")
+ENC_ALIAS("CP860", "IBM860")
+ENC_REPLICATE("IBM861", "ASCII-8BIT")
+ENC_ALIAS("CP861", "IBM861")
+ENC_REPLICATE("IBM862", "ASCII-8BIT")
+ENC_ALIAS("CP862", "IBM862")
+ENC_REPLICATE("IBM863", "ASCII-8BIT")
+ENC_ALIAS("CP863", "IBM863")
+ENC_REPLICATE("IBM864", "ASCII-8BIT")
+ENC_ALIAS("CP864", "IBM864")
+ENC_REPLICATE("IBM865", "ASCII-8BIT")
+ENC_ALIAS("CP865", "IBM865")
+ENC_REPLICATE("IBM866", "ASCII-8BIT")
+ENC_ALIAS("CP866", "IBM866")
+ENC_REPLICATE("IBM869", "ASCII-8BIT")
+ENC_ALIAS("CP869", "IBM869")
+ENC_REPLICATE("Windows-1258", "ASCII-8BIT")
+ENC_ALIAS("CP1258", "Windows-1258")
+ENC_REPLICATE("GB1988", "ASCII-8BIT")
+ENC_REPLICATE("macCentEuro", "ASCII-8BIT")
+ENC_REPLICATE("macCroatian", "ASCII-8BIT")
+ENC_REPLICATE("macCyrillic", "ASCII-8BIT")
+ENC_REPLICATE("macGreek", "ASCII-8BIT")
+ENC_REPLICATE("macIceland", "ASCII-8BIT")
+ENC_REPLICATE("macRoman", "ASCII-8BIT")
+ENC_REPLICATE("macRomania", "ASCII-8BIT")
+ENC_REPLICATE("macThai", "ASCII-8BIT")
+ENC_REPLICATE("macTurkish", "ASCII-8BIT")
+ENC_REPLICATE("macUkraine", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
new file mode 100644
index 0000000000..c4a088d531
--- /dev/null
+++ b/enc/big5.c
@@ -0,0 +1,353 @@
+/**********************************************************************
+  big5.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static const int EncLen_BIG5[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
+};
+static const int EncLen_BIG5_HKSCS[] = {
+ /* LEN  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F */
+ /* 0 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 1 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 2 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 3 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 4 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 5 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 6 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 7 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 8 */ 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* 9 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* A */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* B */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* C */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* D */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* E */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* F */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+};
+
+static const int EncLen_BIG5_UAO[] = {
+ /* LEN  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F */
+ /* 0 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 1 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 2 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 3 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 4 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 5 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 6 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 7 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ /* 8 */ 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* 9 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* A */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* B */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* C */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* D */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* E */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ /* F */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+};
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
+  },
+  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, F, F, F, F, F, F, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
+  }
+};
+#undef A
+#undef F
+
+static int
+big5_mbc_enc_len0(const UChar* p, const UChar* e, int tridx, const int tbl[])
+{
+  int firstbyte = *p++;
+  state_t s = trans[tridx][firstbyte];
+#define RETURN(n) \
+    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
+                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
+  if (s < 0) RETURN(1);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(tbl[firstbyte]-1);
+  s = trans[s][*p++];
+  RETURN(2);
+#undef RETURN
+}
+
+static int
+big5_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+    return big5_mbc_enc_len0(p, e, 0, EncLen_BIG5);
+}
+
+static int
+big5_hkscs_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+    return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_HKSCS);
+}
+
+static int
+big5_uao_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+    return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_UAO);
+}
+
+static OnigCodePoint
+big5_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_to_code(enc, p, end);
+}
+
+static int
+big5_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  return onigenc_mb2_code_to_mbc(enc, code, buf);
+}
+
+static int
+big5_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
+                   UChar* lower, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_case_fold(enc, flag,
+                                   pp, end, lower);
+}
+
+#if 0
+static int
+big5_is_mbc_ambiguous(OnigCaseFoldType flag,
+		      const UChar** pp, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
+}
+#endif
+
+static int
+big5_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  return onigenc_mb2_is_code_ctype(enc, code, ctype);
+}
+
+static const char BIG5_CAN_BE_TRAIL_TABLE[256] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
+};
+
+#define BIG5_HKSCS_P(enc) ((enc)->precise_mbc_enc_len == big5_hkscs_mbc_enc_len)
+#define BIG5_UAO_P(enc) ((enc)->precise_mbc_enc_len == big5_uao_mbc_enc_len)
+
+#define BIG5_ISMB_FIRST(byte)  ( \
+	BIG5_HKSCS_P(enc) ? EncLen_BIG5_HKSCS[byte] > 1 : \
+	EncLen_BIG5[byte] > 1 \
+	)
+#define BIG5_ISMB_TRAIL(byte)  BIG5_CAN_BE_TRAIL_TABLE[(byte)]
+
+static UChar*
+big5_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  if (BIG5_ISMB_TRAIL(*p)) {
+    while (p > start) {
+      if (! BIG5_ISMB_FIRST(*--p)) {
+	p++;
+	break;
+      }
+    } 
+  }
+  len = enclen(enc, p, end);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+big5_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+
+  return (BIG5_ISMB_TRAIL(c) ? FALSE : TRUE);
+}
+
+/*
+ * Name: Big5  (preferred MIME name)
+ * MIBenum: 2026
+ * Source: Chinese for Taiwan Multi-byte set.
+ *         PCL Symbol Set Id: 18T
+ * Alias: csBig5
+ */
+OnigEncodingDefine(big5, BIG5) = {
+  big5_mbc_enc_len,
+  "Big5",     /* name */
+  2,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  big5_mbc_to_code,
+  onigenc_mb2_code_to_mbclen,
+  big5_code_to_mbc,
+  big5_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  big5_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  big5_left_adjust_char_head,
+  big5_is_allowed_reverse_match
+};
+ENC_ALIAS("CP950", "Big5")
+
+/*
+ * Name: Big5-HKSCS
+ * MIBenum: 2101
+ * Source:   See (http://www.iana.org/assignments/charset-reg/Big5-HKSCS)
+ * Alias: None
+ */
+OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
+  big5_hkscs_mbc_enc_len,
+  "Big5-HKSCS",     /* name */
+  2,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  big5_mbc_to_code,
+  onigenc_mb2_code_to_mbclen,
+  big5_code_to_mbc,
+  big5_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  big5_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  big5_left_adjust_char_head,
+  big5_is_allowed_reverse_match
+};
+ENC_ALIAS("CP951", "Big5-HKSCS")
+
+/*
+ * Name: Big5-UAO [NOT registered by IANA!]
+ * Source: http://moztw.org/docs/big5/table/big5_2003-b2u.txt
+ */
+OnigEncodingDefine(big5_uao, BIG5_UAO) = {
+  big5_uao_mbc_enc_len,
+  "Big5-UAO",     /* name */
+  2,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  big5_mbc_to_code,
+  onigenc_mb2_code_to_mbclen,
+  big5_code_to_mbc,
+  big5_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  big5_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  big5_left_adjust_char_head,
+  big5_is_allowed_reverse_match
+};
diff --git a/enc/cp949.c b/enc/cp949.c
new file mode 100644
index 0000000000..009443aed4
--- /dev/null
+++ b/enc/cp949.c
@@ -0,0 +1,219 @@
+/**********************************************************************
+  cp949.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static const int EncLen_CP949[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
+};
+
+static const char CP949_CAN_BE_TRAIL_TABLE[256] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
+};
+
+#define CP949_ISMB_FIRST(byte)  (EncLen_CP949[byte] > 1)
+#define CP949_ISMB_TRAIL(byte)  CP949_CAN_BE_TRAIL_TABLE[(byte)]
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ A, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, F, F, F, F, F,
+    /* 6 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, F, F, F, F, F,
+    /* 8 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
+  }
+};
+#undef A
+#undef F
+
+static int
+cp949_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s = trans[0][firstbyte];
+#define RETURN(n) \
+    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
+                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
+  if (s < 0) RETURN(1);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_CP949[firstbyte]-1);
+  s = trans[s][*p++];
+  RETURN(2);
+#undef RETURN
+}
+
+static OnigCodePoint
+cp949_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_to_code(enc, p, end);
+}
+
+static int
+cp949_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  return onigenc_mb2_code_to_mbc(enc, code, buf);
+}
+
+static int
+cp949_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
+                    UChar* lower, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_case_fold(enc, flag,
+                                   pp, end, lower);
+}
+
+#if 0
+static int
+cp949_is_mbc_ambiguous(OnigCaseFoldType flag,
+		       const UChar** pp, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
+}
+#endif
+
+static int
+cp949_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  return onigenc_mb2_is_code_ctype(enc, code, ctype);
+}
+
+static UChar*
+cp949_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  if (CP949_ISMB_TRAIL(*p)) {
+    while (p > start) {
+      if (! CP949_ISMB_FIRST(*--p)) {
+	p++;
+	break;
+      }
+    } 
+  }
+  len = enclen(enc, p, end);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+cp949_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+  return (CP949_ISMB_TRAIL(c) ? FALSE : TRUE);
+}
+
+OnigEncodingDefine(cp949, CP949) = {
+  cp949_mbc_enc_len,
+  "CP949",      /* name */
+  2,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  cp949_mbc_to_code,
+  onigenc_mb2_code_to_mbclen,
+  cp949_code_to_mbc,
+  cp949_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  cp949_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  cp949_left_adjust_char_head,
+  cp949_is_allowed_reverse_match
+};
+/*
+ * Name: CP949
+ * Link: http://www.microsoft.com/globaldev/reference/dbcs/949.mspx
+ * Link: http://en.wikipedia.org/wiki/EUC-KR#EUC-KR
+ */
diff --git a/enc/depend b/enc/depend
new file mode 100644
index 0000000000..7186179ef0
--- /dev/null
+++ b/enc/depend
@@ -0,0 +1,143 @@
+% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
+% dldflags = $2
+% enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
+% deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
+% encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS
+% encs.each {|e| e.chomp!(".c")}
+% encs.reject! {|e| !ENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}} if !ENC_PATTERNS.empty?
+% encs.reject! {|e| NOENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}}
+% alphanumeric_order = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
+% encs = encs.sort_by(&alphanumeric_order)
+% encs.unshift(encs.delete("encdb"))
+% atrans = []
+% trans = Dir.open($srcdir+"/trans") {|d|
+%   d.select {|e|
+%     if e.chomp!('.trans')
+%       atrans << e
+%       true
+%     elsif e.chomp!('.c')
+%       true
+%     end
+%   }
+% }
+% trans -= BUILTIN_TRANSES
+% atrans -= BUILTIN_TRANSES
+% trans.uniq!
+% atrans = atrans.sort_by(&alphanumeric_order)
+% trans = trans.sort_by(&alphanumeric_order)
+% trans.unshift(trans.delete("transdb"))
+% trans.compact!
+% trans |= atrans
+% trans.map! {|e| "trans/#{e}"}
+% dependencies = encs + trans
+% cleanlibs = Shellwords.shellwords(CONFIG["cleanlibs"] || "")
+% cleanobjs = Shellwords.shellwords(CONFIG["cleanobjs"] || "")
+% cleanobjs << "$*.def" if deffile
+% rule_subst = CONFIG["RULE_SUBST"] || "%s"
+% transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
+% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "") % ""
+% if File::ALT_SEPARATOR
+%   pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
+% else
+%   pathrep = proc {|path| path}
+% end
+
+VPATH = <%=%w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(srcdir) $(encsrcdir)].join(CONFIG["PATH_SEPARATOR"])%>
+LIBPATH = <%=libpathflag($DEFLIBPATH)%>
+LIBS = <%=
+if enable_shared or RbConfig.expand(CONFIG["LIBRUBY"].dup) != RbConfig.expand(CONFIG["LIBRUBY_A"].dup)
+  CONFIG['LIBRUBYARG']
+else
+  ''
+end %> <%=CONFIG['LIBS']%> $(EXTLIBS)
+
+ENCOBJS = <%=encs.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t  ")%><%="\n" if encs.size>1%>
+ENCSOS = <%=encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%><%="\n" if encs.size>1%>
+ENCCLEANLIBS = <%=cleanlibs.map {|clean|
+  clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+}.join(" ")%>
+ENCCLEANOBJS = <%=cleanobjs.map {|clean|
+  clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+}.join(" ")%>
+
+TRANSVPATH = $(srcdir)/enc/trans
+
+TRANSCSRCS = <%=atrans.map {|e| transvpath % "#{e}.c"}.join(" \\\n\t     ")%><%="\n" if trans.size>1%>
+TRANSOBJS = <%=trans.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t    ")%><%="\n" if trans.size>1%>
+TRANSSOS = <%=trans.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t   ")%><%="\n" if trans.size>1%>
+TRANSCLEANLIBS = <%=cleanlibs.map {|clean|
+  clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+}.join(" ")%>
+TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
+  clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+}.join(" ")%>
+
+encs: all
+all: enc trans
+enc: $(ENCSOS)
+trans: $(TRANSSOS)
+
+srcs: $(TRANSCSRCS)
+
+<%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
+	$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
+
+% unless encs.empty? or trans.empty?
+
+%   unless encs.empty?
+$(ENCOBJS): regenc.h oniguruma.h config.h defines.h
+%   end
+%   unless trans.empty?
+$(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h
+%   end
+%   atrans.each do |e|
+%     src = "#{e}.trans"
+
+<%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
+%     src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
+<%=transvpath % "#{e}.c"%>: <%= src.map {|e| transvpath % "#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
+%   end
+
+% end
+% link_so = LINK_SO.gsub(/\n/, "\n\t")
+% link_so.gsub!(/(-(?:implib|pdb):\S+)-\$\(arch\)\./, '\1.')
+% dependencies.each do |e|
+%   obj = "enc/#{e}.$(OBJEXT)"
+%   df = ("enc/#{e}.def" if deffile)
+$(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
+%   cmd = link_so.sub(/\$\(OBJS\)/) {obj}
+%   base = File.basename(e)
+%   cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
+%   if df
+	echo> <%=df%> EXPORTS
+	echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
+%     cmd.sub!(/\$\(DEFFILE\)/) {df}
+%     cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
+%   end
+	@$(MAKEDIRS) "$(@D)"
+	<%=cmd%>
+
+% end
+% dependencies.each do |e|
+<%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
+	-@$(MAKEDIRS) "$(@D)"
+	<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
+
+% end
+
+enc/encdb.$(OBJEXT): encdb.h
+enc/trans/transdb.$(OBJEXT): transdb.h
+
+clean:
+% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
+	@$(RM) <%=pathrep[clean]%>
+% end
+% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir|
+	@-rmdir <%=pathrep[dir]%>
+% end
+
+clean-srcs:
+	@$(RM) <%=pathrep['$(TRANSCSRCS)']%>
+% %w[enc/trans enc].each do|dir|
+	@-rmdir <%=pathrep[dir]%>
+% end
diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c
new file mode 100644
index 0000000000..63087541c5
--- /dev/null
+++ b/enc/emacs_mule.c
@@ -0,0 +1,340 @@
+/**********************************************************************
+  emacs_mule.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regint.h"
+
+
+#define emacsmule_islead(c)    ((UChar )(c) < 0x9e)
+
+/*
+    CHARACTER := ASCII_CHAR | MULTIBYTE_CHAR
+    MULTIBYTE_CHAR := PRIMARY_CHAR_1 | PRIMARY_CHAR_2
+                      | SECONDARY_CHAR_1 | SECONDARY_CHAR_2
+    PRIMARY_CHAR_1   := LEADING_CODE_PRI C1
+    PRIMARY_CHAR_2   := LEADING_CODE_PRI C1 C2
+    SECONDARY_CHAR_1 := LEADING_CODE_SEC LEADING_CODE_EXT C1
+    SECONDARY_CHAR_2 := LEADING_CODE_SEC LEADING_CODE_EXT C1 C2
+    ASCII_CHAR := 0 | 1 | ... | 127
+    LEADING_CODE_PRI := 129 | 130 | ... | 153
+    LEADING_CODE_SEC := 154 | 155 | 156 | 157
+    C1, C2, LEADING_CODE_EXT := 160 | 161 | ... | 255
+ */
+
+static const int EncLen_EmacsMule[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+};
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3, S4, S5, S6 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 5, 6, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A 
+  },
+  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 
+  },
+  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S4   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S5   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ 2, 2, 2, 2, 2, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S6   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, F
+  },
+
+};
+#undef A
+#undef F
+
+static int
+mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s;
+  s = trans[0][firstbyte];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EmacsMule[firstbyte]-1);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EmacsMule[firstbyte]-2);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EmacsMule[firstbyte]-3);
+  s = trans[s][*p++];
+  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4) :
+                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static OnigCodePoint
+mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int c, i, len;
+  OnigCodePoint n;
+
+  len = enclen(enc, p, end);
+  n = (OnigCodePoint )*p++;
+  if (len == 1) return n;
+
+  for (i = 1; i < len; i++) {
+    if (p >= end) break;
+    c = *p++;
+    n <<= 8;  n += c;
+  }
+  return n;
+}
+
+static int
+code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
+{
+  if (ONIGENC_IS_CODE_ASCII(code)) return 1;
+  else if (code > 0xffffffff) return 0;
+  else if ((code & 0xff000000) >= 0x80000000) return 4;
+  else if ((code &   0xff0000) >= 0x800000) return 3;
+  else if ((code &     0xff00) >= 0x8000) return 2;
+  else
+    return ONIGERR_INVALID_CODE_POINT_VALUE;
+}
+
+static int
+code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  UChar *p = buf;
+
+  if ((code & 0xff000000) != 0) *p++ = (UChar )(((code >> 24) & 0xff));
+  if ((code &   0xff0000) != 0) *p++ = (UChar )(((code >> 16) & 0xff));
+  if ((code &     0xff00) != 0) *p++ = (UChar )(((code >>  8) & 0xff));
+  *p++ = (UChar )(code & 0xff);
+
+  if (enclen(enc, buf, p) != (p - buf))
+    return ONIGERR_INVALID_CODE_POINT_VALUE;
+  return p - buf;
+}
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end, UChar* lower,
+	      OnigEncoding enc)
+{
+  int len;
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_MBC_ASCII(p)) {
+    *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    (*pp)++;
+    return 1;
+  }
+  else {
+    int i;
+
+    len = mbc_enc_len(p, end, enc);
+    for (i = 0; i < len; i++) {
+      *lower++ = *p++;
+    }
+    (*pp) += len;
+    return len; /* return byte length of converted char to lower */
+  }
+}
+
+static UChar*
+left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  const UChar *p;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  while (!emacsmule_islead(*p) && p > start) p--;
+  return (UChar* )p;
+}
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 128)
+    return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
+  else
+    return (code_to_mbclen(code, enc) > 1 ? TRUE : FALSE);
+}
+
+/*
+ * Name: Emacs-Mule
+ * Link: http://www.m17n.org/mule/pricai96/mule.en.html
+ */
+OnigEncodingDefine(emacs_mule, Emacs_Mule) = {
+  mbc_enc_len,
+  "Emacs-Mule",   /* name */
+  4,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  mbc_to_code,
+  code_to_mbclen,
+  code_to_mbc,
+  mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match,
+  0
+};
+
+ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule")
diff --git a/enc/encdb.c b/enc/encdb.c
new file mode 100644
index 0000000000..11f80e8640
--- /dev/null
+++ b/enc/encdb.c
@@ -0,0 +1,27 @@
+/**********************************************************************
+
+  enc/encdb.c -
+
+  $Author$
+  created at: Mon Apr  7 15:51:31 2008
+
+  Copyright (C) 2008 Yukihiro Matsumoto
+
+**********************************************************************/
+
+int rb_encdb_replicate(const char *alias, const char *orig);
+int rb_encdb_alias(const char *alias, const char *orig);
+int rb_encdb_dummy(const char *name);
+void rb_encdb_declare(const char *name);
+void rb_enc_set_base(const char *name, const char *orig);
+#define ENC_REPLICATE(name, orig) rb_encdb_replicate(name, orig)
+#define ENC_ALIAS(name, orig) rb_encdb_alias(name, orig)
+#define ENC_DUMMY(name) rb_encdb_dummy(name)
+#define ENC_DEFINE(name) rb_encdb_declare(name)
+#define ENC_SET_BASE(name, orig) rb_enc_set_base(name, orig)
+
+void
+Init_encdb(void)
+{
+#include "encdb.h"
+}
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
new file mode 100644
index 0000000000..21f30ad2f3
--- /dev/null
+++ b/enc/euc_jp.c
@@ -0,0 +1,388 @@
+/**********************************************************************
+  euc_jp.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regint.h"
+
+
+#define eucjp_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
+
+static const int EncLen_EUCJP[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
+};
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, 1, 2,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
+  },
+  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+
+};
+#undef A
+#undef F
+
+static int
+mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s;
+  s = trans[0][firstbyte];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCJP[firstbyte]-1);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCJP[firstbyte]-2);
+  s = trans[s][*p++];
+  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
+                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static OnigCodePoint
+mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int c, i, len;
+  OnigCodePoint n;
+
+  len = enclen(enc, p, end);
+  n = (OnigCodePoint )*p++;
+  if (len == 1) return n;
+
+  for (i = 1; i < len; i++) {
+    if (p >= end) break;
+    c = *p++;
+    n <<= 8;  n += c;
+  }
+  return n;
+}
+
+static int
+code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
+{
+  if (ONIGENC_IS_CODE_ASCII(code)) return 1;
+  else if (code > 0xffffff) return 0;
+  else if ((code & 0xff0000) >= 0x800000) return 3;
+  else if ((code &   0xff00) >= 0x8000) return 2;
+  else
+    return ONIGERR_INVALID_CODE_POINT_VALUE;
+}
+
+#if 0
+static int
+code_to_mbc_first(OnigCodePoint code)
+{
+  int first;
+
+  if ((code & 0xff0000) != 0) {
+    first = (code >> 16) & 0xff;
+  }
+  else if ((code & 0xff00) != 0) {
+    first = (code >> 8) & 0xff;
+  }
+  else {
+    return (int )code;
+  }
+  return first;
+}
+#endif
+
+static int
+code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  UChar *p = buf;
+
+  if ((code & 0xff0000) != 0) *p++ = (UChar )(((code >> 16) & 0xff));
+  if ((code &   0xff00) != 0) *p++ = (UChar )(((code >>  8) & 0xff));
+  *p++ = (UChar )(code & 0xff);
+
+#if 1
+  if (enclen(enc, buf, p) != (p - buf))
+    return ONIGERR_INVALID_CODE_POINT_VALUE;
+#endif  
+  return p - buf;
+}
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end, UChar* lower,
+	      OnigEncoding enc)
+{
+  int len;
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_MBC_ASCII(p)) {
+    *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    (*pp)++;
+    return 1;
+  }
+  else {
+    int i;
+
+    len = enclen(enc, p, end);
+    for (i = 0; i < len; i++) {
+      *lower++ = *p++;
+    }
+    (*pp) += len;
+    return len; /* return byte length of converted char to lower */
+  }
+}
+
+static UChar*
+left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  /* In this encoding
+     mb-trail bytes doesn't mix with single bytes.
+  */
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  while (!eucjp_islead(*p) && p > start) p--;
+  len = enclen(enc, p, end);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+  if (c <= 0x7e || c == 0x8e || c == 0x8f)
+    return TRUE;
+  else
+    return FALSE;
+}
+
+
+static int PropertyInited = 0;
+static const OnigCodePoint** PropertyList;
+static int PropertyListNum;
+static int PropertyListSize;
+static hash_table_type* PropertyNameTable;
+
+static const OnigCodePoint CR_Hiragana[] = {
+  1,
+  0xa4a1, 0xa4f3
+}; /* CR_Hiragana */
+
+static const OnigCodePoint CR_Katakana[] = {
+  3,
+  0xa5a1, 0xa5f6,
+  0xaaa6, 0xaaaf,
+  0xaab1, 0xaadd
+}; /* CR_Katakana */
+
+static int
+init_property_list(void)
+{
+  int r;
+
+  PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
+  PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
+  PropertyInited = 1;
+
+ end:
+  return r;
+}
+
+static int
+property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
+{
+  st_data_t ctype;
+
+  PROPERTY_LIST_INIT_CHECK;
+
+  if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
+    return onigenc_minimum_property_name_to_ctype(enc, p, end);
+  }
+
+  return ctype;
+}
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
+    if (code < 128)
+      return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
+    else {
+      if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
+	return (code_to_mbclen(code, enc) > 1 ? TRUE : FALSE);
+      }
+    }
+  }
+  else {
+    PROPERTY_LIST_INIT_CHECK;
+
+    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
+    if (ctype >= (unsigned int )PropertyListNum)
+      return ONIGERR_TYPE_BUG;
+
+    return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
+  }
+
+  return FALSE;
+}
+
+static int
+get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
+		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
+{
+  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
+    return ONIG_NO_SUPPORT_CONFIG;
+  }
+  else {
+    *sb_out = 0x80;
+
+    PROPERTY_LIST_INIT_CHECK;
+
+    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
+    if (ctype >= (OnigCtype )PropertyListNum)
+      return ONIGERR_TYPE_BUG;
+
+    *ranges = PropertyList[ctype];
+    return 0;
+  }
+}
+
+
+OnigEncodingDefine(euc_jp, EUC_JP) = {
+  mbc_enc_len,
+  "EUC-JP",   /* name */
+  3,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  mbc_to_code,
+  code_to_mbclen,
+  code_to_mbc,
+  mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  property_name_to_ctype,
+  is_code_ctype,
+  get_ctype_code_range,
+  left_adjust_char_head,
+  is_allowed_reverse_match,
+  0
+};
+/*
+ * Name: EUC-JP
+ * MIBenum: 18
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://home.m05.itscom.net/numa/cde/sjis-euc/sjis-euc.html
+ */
+ENC_ALIAS("eucJP", "EUC-JP") /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */
+
+/*
+ * Name: eucJP-ms
+ * Link: http://home.m05.itscom.net/numa/cde/ucs-conv/ucs-conv.html
+ * Link: http://www2d.biglobe.ne.jp/~msyk/charcode/cp932/eucJP-ms.html
+ * Link: http://ja.wikipedia.org/wiki/EUC-JP
+ */
+ENC_REPLICATE("eucJP-ms", "EUC-JP") /* TOG/JVC CDE/Motif Technical WG */
+ENC_ALIAS("euc-jp-ms", "eucJP-ms")
+
+/*
+ * Name: CP51932
+ * Link: http://search.cpan.org/src/NARUSE/Encode-EUCJPMS-0.07/ucm/cp51932.ucm
+ * Link: http://legacy-encoding.sourceforge.jp/wiki/index.php?cp51932
+ * Link: http://msyk.at.webry.info/200511/article_2.html
+ */
+ENC_REPLICATE("CP51932", "EUC-JP")
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
new file mode 100644
index 0000000000..f20a57e69a
--- /dev/null
+++ b/enc/euc_kr.c
@@ -0,0 +1,192 @@
+/**********************************************************************
+  euc_kr.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static const int EncLen_EUCKR[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
+};
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
+  }
+};
+#undef A
+#undef F
+
+static int
+euckr_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s = trans[0][firstbyte];
+#define RETURN(n) \
+    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
+                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
+  if (s < 0) RETURN(1);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCKR[firstbyte]-1);
+  s = trans[s][*p++];
+  RETURN(2);
+#undef RETURN
+}
+
+static OnigCodePoint
+euckr_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_to_code(enc, p, end);
+}
+
+static int
+euckr_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  return onigenc_mb2_code_to_mbc(enc, code, buf);
+}
+
+static int
+euckr_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
+                    UChar* lower, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_case_fold(enc, flag,
+                                   pp, end, lower);
+}
+
+#if 0
+static int
+euckr_is_mbc_ambiguous(OnigCaseFoldType flag,
+		       const UChar** pp, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
+}
+#endif
+
+static int
+euckr_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  return onigenc_mb2_is_code_ctype(enc, code, ctype);
+}
+
+#define euckr_islead(c)    ((c) < 0xa1 || (c) == 0xff)
+
+static UChar*
+euckr_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  /* Assumed in this encoding,
+     mb-trail bytes don't mix with single bytes.
+  */
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  while (!euckr_islead(*p) && p > start) p--;
+  len = enclen(enc, p, end);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+euckr_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+  if (c <= 0x7e) return TRUE;
+  else           return FALSE;
+}
+
+OnigEncodingDefine(euc_kr, EUC_KR) = {
+  euckr_mbc_enc_len,
+  "EUC-KR",   /* name */
+  2,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  euckr_mbc_to_code,
+  onigenc_mb2_code_to_mbclen,
+  euckr_code_to_mbc,
+  euckr_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  euckr_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  euckr_left_adjust_char_head,
+  euckr_is_allowed_reverse_match
+};
+ENC_ALIAS("eucKR", "EUC-KR")
diff --git a/enc/euc_tw.c b/enc/euc_tw.c
new file mode 100644
index 0000000000..cf95954bc5
--- /dev/null
+++ b/enc/euc_tw.c
@@ -0,0 +1,225 @@
+/**********************************************************************
+  euc_tw.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static const int EncLen_EUCTW[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
+};
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, 2, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
+  },
+  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* b */ 3, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  }
+};
+#undef A
+#undef F
+
+static int
+euctw_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s = trans[0][firstbyte];
+#define RETURN(n) \
+    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
+                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
+  if (s < 0) RETURN(1);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCTW[firstbyte]-1);
+  s = trans[s][*p++];
+  if (s < 0) RETURN(2);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-2);
+  s = trans[s][*p++];
+  if (s < 0) RETURN(3);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-3);
+  s = trans[s][*p++];
+  RETURN(4);
+#undef RETURN
+}
+
+static OnigCodePoint
+euctw_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_mbn_mbc_to_code(enc, p, end);
+}
+
+static int
+euctw_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  return onigenc_mb4_code_to_mbc(enc, code, buf);
+}
+
+static int
+euctw_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
+                    UChar* lower, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_case_fold(enc, flag,
+                                   pp, end, lower);
+}
+
+static int
+euctw_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  return onigenc_mb4_is_code_ctype(enc, code, ctype);
+}
+
+#define euctw_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
+
+static UChar*
+euctw_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  /* Assumed in this encoding,
+     mb-trail bytes don't mix with single bytes.
+  */
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  while (!euctw_islead(*p) && p > start) p--;
+  len = enclen(enc, p, end);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+euctw_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+  if (c <= 0x7e) return TRUE;
+  else           return FALSE;
+}
+
+OnigEncodingDefine(euc_tw, EUC_TW) = {
+  euctw_mbc_enc_len,
+  "EUC-TW",   /* name */
+  4,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  euctw_mbc_to_code,
+  onigenc_mb4_code_to_mbclen,
+  euctw_code_to_mbc,
+  euctw_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  euctw_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  euctw_left_adjust_char_head,
+  euctw_is_allowed_reverse_match
+};
+ENC_ALIAS("eucTW", "EUC-TW")
diff --git a/enc/gb18030.c b/enc/gb18030.c
new file mode 100644
index 0000000000..16c8c1c17f
--- /dev/null
+++ b/enc/gb18030.c
@@ -0,0 +1,596 @@
+/**********************************************************************
+  gb18030.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2005-2007  KUBO Takehiro <kubo AT jiubao DOT org>
+ *                          K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#if 1
+#define DEBUG_GB18030(arg)
+#else
+#define DEBUG_GB18030(arg) printf arg
+#endif
+
+enum {
+  C1, /* one-byte char */
+  C2, /* one-byte or second of two-byte char */
+  C4, /* one-byte or second or fourth of four-byte char */
+  CM  /* first of two- or four-byte char or second of two-byte char */
+};
+
+static const char GB18030_MAP[] = {
+  C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
+  C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
+  C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
+  C4, C4, C4, C4, C4, C4, C4, C4, C4, C4, C1, C1, C1, C1, C1, C1,
+  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
+  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
+  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
+  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C1,
+  C2, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
+  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
+  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
+  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
+  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
+  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
+  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
+  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, C1
+};
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, F, F, F, F, F, F,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
+    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
+  },
+  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* c */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* d */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* e */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* f */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, F 
+  },
+  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  }
+};
+#undef A
+#undef F
+
+static int
+gb18030_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s = trans[0][firstbyte];
+#define RETURN(n) \
+    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
+                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
+  if (s < 0) RETURN(1);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2-1);
+  s = trans[s][*p++];
+  if (s < 0) RETURN(2);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-2);
+  s = trans[s][*p++];
+  if (s < 0) RETURN(3);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-3);
+  s = trans[s][*p++];
+  RETURN(4);
+#undef RETURN
+}
+
+static OnigCodePoint
+gb18030_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int c, i, len;
+  OnigCodePoint n;
+
+  len = enclen(enc, p, end);
+  n = (OnigCodePoint )(*p++);
+  if (len == 1) return n;
+
+  for (i = 1; i < len; i++) {
+    if (p >= end) break;
+    c = *p++;
+    n <<= 8;  n += c;
+  }
+  return n;
+}
+
+static int
+gb18030_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  return onigenc_mb4_code_to_mbc(enc, code, buf);
+}
+
+static int
+gb18030_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
+                      UChar* lower, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_case_fold(enc, flag,
+                                   pp, end, lower);
+}
+
+#if 0
+static int
+gb18030_is_mbc_ambiguous(OnigCaseFoldType flag,
+			 const UChar** pp, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
+}
+#endif
+
+static int
+gb18030_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  return onigenc_mb4_is_code_ctype(enc, code, ctype);
+}
+
+enum state {
+  S_START,
+  S_one_C2,
+  S_one_C4,
+  S_one_CM,
+
+  S_odd_CM_one_CX,
+  S_even_CM_one_CX,
+
+  /* CMC4 : pair of "CM C4" */
+  S_one_CMC4,
+  S_odd_CMC4,
+  S_one_C4_odd_CMC4,
+  S_even_CMC4,
+  S_one_C4_even_CMC4,
+
+  S_odd_CM_odd_CMC4,
+  S_even_CM_odd_CMC4,
+
+  S_odd_CM_even_CMC4,
+  S_even_CM_even_CMC4,
+
+  /* C4CM : pair of "C4 CM" */
+  S_odd_C4CM,
+  S_one_CM_odd_C4CM,
+  S_even_C4CM,
+  S_one_CM_even_C4CM,
+
+  S_even_CM_odd_C4CM,
+  S_odd_CM_odd_C4CM,
+  S_even_CM_even_C4CM,
+  S_odd_CM_even_C4CM
+};
+
+static UChar*
+gb18030_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  const UChar *p;
+  enum state state = S_START;
+
+  DEBUG_GB18030(("----------------\n"));
+  for (p = s; p >= start; p--) {
+    DEBUG_GB18030(("state %d --(%02x)-->\n", state, *p));
+    switch (state) {
+    case S_START:
+      switch (GB18030_MAP[*p]) {
+      case C1:
+	return (UChar *)s;
+      case C2:
+	state = S_one_C2; /* C2 */
+	break;
+      case C4:
+	state = S_one_C4; /* C4 */
+	break;
+      case CM:
+	state = S_one_CM; /* CM */
+	break;
+      }
+      break;
+    case S_one_C2: /* C2 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)s;
+      case CM:
+	state = S_odd_CM_one_CX; /* CM C2 */
+	break;
+      }
+      break;
+    case S_one_C4: /* C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)s;
+      case CM:
+	state = S_one_CMC4;
+	break;
+      }
+      break;
+    case S_one_CM: /* CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+	return (UChar *)s;
+      case C4:
+	state = S_odd_C4CM;
+	break;
+      case CM:
+	state = S_odd_CM_one_CX; /* CM CM */
+	break;
+      }
+      break;
+
+    case S_odd_CM_one_CX: /* CM C2 */ /* CM CM */ /* CM CM CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 1);
+      case CM:
+	state = S_even_CM_one_CX;
+	break;
+      }
+      break;
+    case S_even_CM_one_CX: /* CM CM C2 */ /* CM CM CM */ /* CM CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)s;
+      case CM:
+	state = S_odd_CM_one_CX;
+	break;
+      }
+      break;
+
+    case S_one_CMC4: /* CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+	return (UChar *)(s - 1);
+      case C4:
+	state = S_one_C4_odd_CMC4; /* C4 CM C4 */
+	break;
+      case CM:
+	state = S_even_CM_one_CX; /* CM CM C4 */
+	break;
+      }
+      break;
+    case S_odd_CMC4: /* CM C4 CM C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+	return (UChar *)(s - 1);
+      case C4:
+	state = S_one_C4_odd_CMC4;
+	break;
+      case CM:
+	state = S_odd_CM_odd_CMC4;
+	break;
+      }
+      break;
+    case S_one_C4_odd_CMC4: /* C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 1);
+      case CM:
+	state = S_even_CMC4; /* CM C4 CM C4 */
+	break;
+      }
+      break;
+    case S_even_CMC4: /* CM C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+	return (UChar *)(s - 3);
+      case C4:
+	state = S_one_C4_even_CMC4;
+	break;
+      case CM:
+	state = S_odd_CM_even_CMC4;
+	break;
+      }
+      break;
+    case S_one_C4_even_CMC4: /* C4 CM C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 3);
+      case CM:
+	state = S_odd_CMC4;
+	break;
+      }
+      break;
+
+    case S_odd_CM_odd_CMC4: /* CM CM C4 CM C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 3);
+      case CM:
+	state = S_even_CM_odd_CMC4;
+	break;
+      }
+      break;
+    case S_even_CM_odd_CMC4: /* CM CM CM C4 CM C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 1);
+      case CM:
+	state = S_odd_CM_odd_CMC4;
+	break;
+      }
+      break;
+
+    case S_odd_CM_even_CMC4: /* CM CM C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 1);
+      case CM:
+	state = S_even_CM_even_CMC4;
+	break;
+      }
+      break;
+    case S_even_CM_even_CMC4: /* CM CM CM C4 CM C4 */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 3);
+      case CM:
+	state = S_odd_CM_even_CMC4;
+	break;
+      }
+      break;
+
+    case S_odd_C4CM: /* C4 CM */  /* C4 CM C4 CM C4 CM*/
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)s;
+      case CM:
+	state = S_one_CM_odd_C4CM; /* CM C4 CM */
+	break;
+      }
+      break;
+    case S_one_CM_odd_C4CM: /* CM C4 CM */ /* CM C4 CM C4 CM C4 CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+	return (UChar *)(s - 2); /* |CM C4 CM */
+      case C4:
+	state = S_even_C4CM;
+	break;
+      case CM:
+	state = S_even_CM_odd_C4CM;
+	break;
+      }
+      break;
+    case S_even_C4CM: /* C4 CM C4 CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 2);  /* C4|CM C4 CM */
+      case CM:
+	state = S_one_CM_even_C4CM;
+	break;
+      }
+      break;
+    case S_one_CM_even_C4CM: /* CM C4 CM C4 CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+	return (UChar *)(s - 0);  /*|CM C4 CM C4|CM */
+      case C4:
+	state = S_odd_C4CM;
+	break;
+      case CM:
+	state = S_even_CM_even_C4CM;
+	break;
+      }
+      break;
+
+    case S_even_CM_odd_C4CM: /* CM CM C4 CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 0); /* |CM CM|C4|CM */
+      case CM:
+	state = S_odd_CM_odd_C4CM;
+	break;
+      }
+      break;
+    case S_odd_CM_odd_C4CM: /* CM CM CM C4 CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 2); /* |CM CM|CM C4 CM */
+      case CM:
+	state = S_even_CM_odd_C4CM;
+	break;
+      }
+      break;
+
+    case S_even_CM_even_C4CM: /* CM CM C4 CM C4 CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 2); /* |CM CM|C4|CM C4 CM */
+      case CM:
+	state = S_odd_CM_even_C4CM;
+	break;
+      }
+      break;
+    case S_odd_CM_even_C4CM: /* CM CM CM C4 CM C4 CM */
+      switch (GB18030_MAP[*p]) {
+      case C1:
+      case C2:
+      case C4:
+	return (UChar *)(s - 0);  /* |CM CM|CM C4 CM C4|CM */
+      case CM:
+	state = S_even_CM_even_C4CM;
+	break;
+      }
+      break;
+    }
+  }
+
+  DEBUG_GB18030(("state %d\n", state));
+  switch (state) {
+  case S_START:             return (UChar *)(s - 0);
+  case S_one_C2:            return (UChar *)(s - 0);
+  case S_one_C4:            return (UChar *)(s - 0);
+  case S_one_CM:            return (UChar *)(s - 0);
+
+  case S_odd_CM_one_CX:     return (UChar *)(s - 1);
+  case S_even_CM_one_CX:    return (UChar *)(s - 0);
+
+  case S_one_CMC4:          return (UChar *)(s - 1);
+  case S_odd_CMC4:          return (UChar *)(s - 1);
+  case S_one_C4_odd_CMC4:   return (UChar *)(s - 1);
+  case S_even_CMC4:         return (UChar *)(s - 3);
+  case S_one_C4_even_CMC4:  return (UChar *)(s - 3);
+
+  case S_odd_CM_odd_CMC4:   return (UChar *)(s - 3);
+  case S_even_CM_odd_CMC4:  return (UChar *)(s - 1);
+
+  case S_odd_CM_even_CMC4:  return (UChar *)(s - 1);
+  case S_even_CM_even_CMC4: return (UChar *)(s - 3);
+
+  case S_odd_C4CM:          return (UChar *)(s - 0);
+  case S_one_CM_odd_C4CM:   return (UChar *)(s - 2);
+  case S_even_C4CM:         return (UChar *)(s - 2);
+  case S_one_CM_even_C4CM:  return (UChar *)(s - 0);
+
+  case S_even_CM_odd_C4CM:  return (UChar *)(s - 0);
+  case S_odd_CM_odd_C4CM:   return (UChar *)(s - 2);
+  case S_even_CM_even_C4CM: return (UChar *)(s - 2);
+  case S_odd_CM_even_C4CM:  return (UChar *)(s - 0);
+  }
+
+  return (UChar* )s;  /* never come here. (escape warning) */
+}
+
+static int
+gb18030_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
+{
+  return GB18030_MAP[*s] == C1 ? TRUE : FALSE;
+}
+
+OnigEncodingDefine(gb18030, GB18030) = {
+  gb18030_mbc_enc_len,
+  "GB18030",   /* name */
+  4,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  gb18030_mbc_to_code,
+  onigenc_mb4_code_to_mbclen,
+  gb18030_code_to_mbc,
+  gb18030_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  gb18030_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  gb18030_left_adjust_char_head,
+  gb18030_is_allowed_reverse_match
+};
+
diff --git a/enc/gb2312.c b/enc/gb2312.c
new file mode 100644
index 0000000000..6fc15735fc
--- /dev/null
+++ b/enc/gb2312.c
@@ -0,0 +1,13 @@
+#include <ruby/ruby.h>
+#include <ruby/encoding.h>
+#include "regenc.h"
+
+void
+Init_gb2312(void)
+{
+    rb_enc_register("GB2312", rb_enc_find("EUC-KR"));
+}
+
+ENC_ALIAS("EUC-CN", "GB2312")
+ENC_ALIAS("eucCN", "GB2312")
+ENC_REPLICATE("GB12345", "GB2312")
diff --git a/enc/gbk.c b/enc/gbk.c
new file mode 100644
index 0000000000..3efb1bf636
--- /dev/null
+++ b/enc/gbk.c
@@ -0,0 +1,222 @@
+/**********************************************************************
+  gbk.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static const int EncLen_GBK[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
+};
+
+static const char GBK_CAN_BE_TRAIL_TABLE[256] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
+};
+
+#define GBK_ISMB_FIRST(byte)  (EncLen_GBK[byte] > 1)
+#define GBK_ISMB_TRAIL(byte)  GBK_CAN_BE_TRAIL_TABLE[(byte)]
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ A, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
+    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
+  }
+};
+#undef A
+#undef F
+
+static int
+gbk_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s = trans[0][firstbyte];
+#define RETURN(n) \
+    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
+                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
+  if (s < 0) RETURN(1);
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_GBK[firstbyte]-1);
+  s = trans[s][*p++];
+  RETURN(2);
+#undef RETURN
+}
+
+static OnigCodePoint
+gbk_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_to_code(enc, p, end);
+}
+
+static int
+gbk_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  return onigenc_mb2_code_to_mbc(enc, code, buf);
+}
+
+static int
+gbk_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
+                    UChar* lower, OnigEncoding enc)
+{
+  return onigenc_mbn_mbc_case_fold(enc, flag,
+                                   pp, end, lower);
+}
+
+#if 0
+static int
+gbk_is_mbc_ambiguous(OnigCaseFoldType flag,
+		       const UChar** pp, const UChar* end, OnigEncoding enc)
+{
+  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
+}
+#endif
+
+static int
+gbk_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  return onigenc_mb2_is_code_ctype(enc, code, ctype);
+}
+
+static UChar*
+gbk_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  if (GBK_ISMB_TRAIL(*p)) {
+    while (p > start) {
+      if (! GBK_ISMB_FIRST(*--p)) {
+	p++;
+	break;
+      }
+    } 
+  }
+  len = enclen(enc, p, end);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+gbk_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+  return (GBK_ISMB_TRAIL(c) ? FALSE : TRUE);
+}
+
+OnigEncodingDefine(gbk, GBK) = {
+  gbk_mbc_enc_len,
+  "GBK",      /* name */
+  2,          /* max enc length */
+  1,          /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  gbk_mbc_to_code,
+  onigenc_mb2_code_to_mbclen,
+  gbk_code_to_mbc,
+  gbk_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  gbk_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  gbk_left_adjust_char_head,
+  gbk_is_allowed_reverse_match
+};
+/*
+ * Name: GBK
+ * MIBenum: 113
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.iana.org/assignments/charset-reg/GBK
+ * Link: http://www.microsoft.com/globaldev/reference/dbcs/936.mspx
+ */
+ENC_ALIAS("CP936", "GBK")
diff --git a/enc/iso_2022_jp.h b/enc/iso_2022_jp.h
new file mode 100644
index 0000000000..8cfad0be06
--- /dev/null
+++ b/enc/iso_2022_jp.h
@@ -0,0 +1,42 @@
+#include "regenc.h"
+/* dummy for unsupported, statefull encoding */
+ENC_DUMMY("ISO-2022-JP");
+ENC_ALIAS("ISO2022-JP", "ISO-2022-JP");
+ENC_REPLICATE("ISO-2022-JP-2", "ISO-2022-JP");
+ENC_ALIAS("ISO2022-JP2", "ISO-2022-JP-2");
+
+/* Windows Codepage 50220
+ * a ISO-2022-JP variant.
+ * This includes
+ * * US-ASCII
+ * * JIS X 0201 Latin
+ * * JIS X 0201 Katakana
+ * * JIS X 0208
+ * * NEC special characters
+ * * NEC selected IBM extended characters
+ * and this implementation doesn't include
+ * * User Defined Characters
+ *
+ * So this CP50220 has the same characters of CP51932.
+ *
+ * See http://legacy-encoding.sourceforge.jp/wiki/index.php?cp50220
+ */
+ENC_REPLICATE("CP50220", "ISO-2022-JP");
+
+/* Windows Codepage 50221
+ * a ISO-2022-JP variant.
+ * This includes
+ * * US-ASCII
+ * * JIS X 0201 Latin
+ * * JIS X 0201 Katakana
+ * * JIS X 0208
+ * * NEC special characters
+ * * NEC selected IBM extended characters
+ * and this implementation doesn't include
+ * * User Defined Characters
+ *
+ * So this CP50221 has the same characters of CP51932.
+ *
+ * See http://legacy-encoding.sourceforge.jp/wiki/index.php?cp50221
+ */
+ENC_REPLICATE("CP50221", "ISO-2022-JP");
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
new file mode 100644
index 0000000000..b73f8ca379
--- /dev/null
+++ b/enc/iso_8859_1.c
@@ -0,0 +1,285 @@
+/**********************************************************************
+  iso8859_1.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_IS_ISO_8859_1_CTYPE(code,ctype) \
+  ((EncISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const unsigned short EncISO_8859_1_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
+  0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  { 0xc0, 0xe0 },
+  { 0xc1, 0xe1 },
+  { 0xc2, 0xe2 },
+  { 0xc3, 0xe3 },
+  { 0xc4, 0xe4 },
+  { 0xc5, 0xe5 },
+  { 0xc6, 0xe6 },
+  { 0xc7, 0xe7 },
+  { 0xc8, 0xe8 },
+  { 0xc9, 0xe9 },
+  { 0xca, 0xea },
+  { 0xcb, 0xeb },
+  { 0xcc, 0xec },
+  { 0xcd, 0xed },
+  { 0xce, 0xee },
+  { 0xcf, 0xef },
+
+  { 0xd0, 0xf0 },
+  { 0xd1, 0xf1 },
+  { 0xd2, 0xf2 },
+  { 0xd3, 0xf3 },
+  { 0xd4, 0xf4 },
+  { 0xd5, 0xf5 },
+  { 0xd6, 0xf6 },
+  { 0xd8, 0xf8 },
+  { 0xd9, 0xf9 },
+  { 0xda, 0xfa },
+  { 0xdb, 0xfb },
+  { 0xdc, 0xfc },
+  { 0xdd, 0xfd },
+  { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+            sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+            flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
+{
+  if (0x41 <= *p && *p <= 0x5a) {
+    items[0].byte_len = 1;
+    items[0].code_len = 1;
+    items[0].code[0] = (OnigCodePoint )(*p + 0x20);
+    if (*p == 0x53 && end > p + 1
+	&& (*(p+1) == 0x53 || *(p+1) == 0x73)) { /* SS */
+      items[1].byte_len = 2;
+      items[1].code_len = 1;
+      items[1].code[0] = (OnigCodePoint )0xdf;
+      return 2;
+    }
+    else
+      return 1;
+  }
+  else if (0x61 <= *p && *p <= 0x7a) {
+    items[0].byte_len = 1;
+    items[0].code_len = 1;
+    items[0].code[0] = (OnigCodePoint )(*p - 0x20);
+    if (*p == 0x73 && end > p + 1
+	&& (*(p+1) == 0x73 || *(p+1) == 0x53)) { /* ss */
+      items[1].byte_len = 2;
+      items[1].code_len = 1;
+      items[1].code[0] = (OnigCodePoint )0xdf;
+      return 2;
+    }
+    else
+      return 1;
+  }
+  else if (0xc0 <= *p && *p <= 0xcf) {
+    items[0].byte_len = 1;
+    items[0].code_len = 1;
+    items[0].code[0] = (OnigCodePoint )(*p + 0x20);
+    return 1;
+  }
+  else if (0xd0 <= *p && *p <= 0xdf) {
+    if (*p == 0xdf) {
+      items[0].byte_len = 1;
+      items[0].code_len = 2;
+      items[0].code[0] = (OnigCodePoint )'s';
+      items[0].code[1] = (OnigCodePoint )'s';
+
+      items[1].byte_len = 1;
+      items[1].code_len = 2;
+      items[1].code[0] = (OnigCodePoint )'S';
+      items[1].code[1] = (OnigCodePoint )'S';
+
+      items[2].byte_len = 1;
+      items[2].code_len = 2;
+      items[2].code[0] = (OnigCodePoint )'s';
+      items[2].code[1] = (OnigCodePoint )'S';
+
+      items[3].byte_len = 1;
+      items[3].code_len = 2;
+      items[3].code[0] = (OnigCodePoint )'S';
+      items[3].code[1] = (OnigCodePoint )'s';
+
+      return 4;
+    }
+    else if (*p != 0xd7) {
+      items[0].byte_len = 1;
+      items[0].code_len = 1;
+      items[0].code[0] = (OnigCodePoint )(*p + 0x20);
+      return 1;
+    }
+  }
+  else if (0xe0 <= *p && *p <= 0xef) {
+    items[0].byte_len = 1;
+    items[0].code_len = 1;
+    items[0].code[0] = (OnigCodePoint )(*p - 0x20);
+    return 1;
+  }
+  else if (0xf0 <= *p && *p <= 0xfe) {
+    if (*p != 0xf7) {
+      items[0].byte_len = 1;
+      items[0].code_len = 1;
+      items[0].code[0] = (OnigCodePoint )(*p - 0x20);
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+static int
+mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end ARG_UNUSED,
+	      UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ONIGENC_ISO_8859_1_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag,
+		 const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_1_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    /* 0xdf, 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
+    if (*p >= 0xaa && *p <= 0xba)
+      return FALSE;
+    else
+      return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_1_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-1",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-1", "ISO-8859-1")
+
+/*
+ * Name: windows-1252
+ * MIBenum: 2252
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1252.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1252
+ */
+ENC_REPLICATE("Windows-1252", "ISO-8859-1")
+ENC_ALIAS("CP1252", "Windows-1252")
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
new file mode 100644
index 0000000000..1643278dfd
--- /dev/null
+++ b/enc/iso_8859_10.c
@@ -0,0 +1,244 @@
+/**********************************************************************
+  iso8859_10.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_10_TO_LOWER_CASE(c) EncISO_8859_10_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_10_CTYPE(code,ctype) \
+  ((EncISO_8859_10_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_10_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\261', '\262', '\263', '\264', '\265', '\266', '\247',
+  '\270', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
+  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_10_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
+  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0, 0x30e2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+			  const UChar** pp, const UChar* end ARG_UNUSED,
+			  UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_10_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_10_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_10_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa1, 0xb1 },
+ { 0xa2, 0xb2 },
+ { 0xa3, 0xb3 },
+ { 0xa4, 0xb4 },
+ { 0xa5, 0xb5 },
+ { 0xa6, 0xb6 },
+ { 0xa8, 0xb8 },
+ { 0xa9, 0xb9 },
+ { 0xaa, 0xba },
+ { 0xab, 0xbb },
+ { 0xac, 0xbc },
+ { 0xae, 0xbe },
+ { 0xaf, 0xbf },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd7, 0xf7 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+			       OnigApplyAllCaseFoldFunc f, void* arg,
+			       OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-10", /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-10", "ISO-8859-10")
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
new file mode 100644
index 0000000000..257d9d8919
--- /dev/null
+++ b/enc/iso_8859_11.c
@@ -0,0 +1,111 @@
+/**********************************************************************
+  iso8859_11.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_IS_ISO_8859_11_CTYPE(code,ctype) \
+  ((EncISO_8859_11_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const unsigned short EncISO_8859_11_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000
+};
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_11_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-11",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  onigenc_ascii_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-11", "ISO-8859-11")
+
+/*
+ * Name: TIS-620
+ * MIBenum: 2259
+ * Link: http://en.wikipedia.org/wiki/Thai_Industrial_Standard_620-2533
+ */
+ENC_REPLICATE("TIS-620", "ISO-8859-11")
+
+/*
+ * Name: Windows-874
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/874.mspx
+ */
+ENC_REPLICATE("Windows-874", "ISO-8859-11")
+ENC_ALIAS("CP874", "Windows-874")
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
new file mode 100644
index 0000000000..f29cb2e281
--- /dev/null
+++ b/enc/iso_8859_13.c
@@ -0,0 +1,243 @@
+/**********************************************************************
+  iso8859_13.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_13_TO_LOWER_CASE(c) EncISO_8859_13_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_13_CTYPE(code,ctype) \
+  ((EncISO_8859_13_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_13_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+  '\270', '\251', '\272', '\253', '\254', '\255', '\256', '\277',
+  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_13_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
+  0x34a2, 0x00a0, 0x34a2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x34a2,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x01a0, 0x30e2, 0x00a0, 0x01a0,
+  0x30e2, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+			  const UChar** pp, const UChar* end ARG_UNUSED,
+			  UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_13_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_13_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    /* 0xdf, 0xb5 are lower case letter, but can't convert. */
+    if (*p == 0xb5)
+      return FALSE;
+    else
+      return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_13_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+				OnigApplyAllCaseFoldFunc f, void* arg,
+				OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-13",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-13", "ISO-8859-13")
+
+/*
+ * Name: windows-1257
+ * MIBenum: 2257
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1257.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1257
+ */
+ENC_REPLICATE("Windows-1257", "ISO-8859-13")
+ENC_ALIAS("CP1257", "Windows-1257")
diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c
new file mode 100644
index 0000000000..be83f93f80
--- /dev/null
+++ b/enc/iso_8859_14.c
@@ -0,0 +1,246 @@
+/**********************************************************************
+  iso8859_14.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_14_TO_LOWER_CASE(c) EncISO_8859_14_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_14_CTYPE(code,ctype) \
+  ((EncISO_8859_14_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_14_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\242', '\242', '\243', '\245', '\245', '\253', '\247',
+  '\270', '\251', '\272', '\253', '\274', '\255', '\256', '\377',
+  '\261', '\261', '\263', '\263', '\265', '\265', '\266', '\271',
+  '\270', '\271', '\272', '\277', '\274', '\276', '\276', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_14_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x34a2, 0x30e2, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x00a0,
+  0x34a2, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x00a0, 0x34a2,
+  0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x00a0, 0x34a2,
+  0x30e2, 0x30e2, 0x30e2, 0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+			  const UChar** pp, const UChar* end ARG_UNUSED,
+			  UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_14_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1; /* return byte length of converted char to lower */
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag,
+		 const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_14_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_14_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa1, 0xa2 },
+ { 0xa4, 0xa5 },
+ { 0xa6, 0xab },
+ { 0xa8, 0xb8 },
+ { 0xaa, 0xba },
+ { 0xac, 0xbc },
+ { 0xaf, 0xff },
+
+ { 0xb0, 0xb1 },
+ { 0xb2, 0xb3 },
+ { 0xb4, 0xb5 },
+ { 0xb7, 0xb9 },
+ { 0xbb, 0xbf },
+ { 0xbd, 0xbe },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd7, 0xf7 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+				OnigApplyAllCaseFoldFunc f, void* arg,
+				OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-14",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-14", "ISO-8859-14")
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
new file mode 100644
index 0000000000..2ec41b66c0
--- /dev/null
+++ b/enc/iso_8859_15.c
@@ -0,0 +1,240 @@
+/**********************************************************************
+  iso8859_15.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_15_TO_LOWER_CASE(c) EncISO_8859_15_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_15_CTYPE(code,ctype) \
+  ((EncISO_8859_15_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_15_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\241', '\242', '\243', '\244', '\245', '\250', '\247',
+  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+  '\260', '\261', '\262', '\263', '\270', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\275', '\275', '\377', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_15_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0,
+  0x30e2, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x34a2, 0x30e2, 0x00a0, 0x01a0,
+  0x30e2, 0x10a0, 0x30e2, 0x01a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+			  const UChar** pp, const UChar* end ARG_UNUSED,
+			  UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_15_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1; /* return byte length of converted char to lower */
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag,
+		 const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_15_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    /* 0xdf etc.. are lower case letter, but can't convert. */
+    if (*p == 0xaa || *p == 0xb5 || *p == 0xba)
+      return FALSE;
+    else
+      return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_15_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa6, 0xa8 },
+
+ { 0xb4, 0xb8 },
+ { 0xbc, 0xbd },
+ { 0xbe, 0xff },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+				OnigApplyAllCaseFoldFunc f, void* arg,
+				OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-15",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-15", "ISO-8859-15")
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
new file mode 100644
index 0000000000..3ddc1d91c6
--- /dev/null
+++ b/enc/iso_8859_16.c
@@ -0,0 +1,242 @@
+/**********************************************************************
+  iso8859_16.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_16_TO_LOWER_CASE(c) EncISO_8859_16_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_16_CTYPE(code,ctype) \
+  ((EncISO_8859_16_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_16_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\242', '\242', '\263', '\245', '\245', '\250', '\247',
+  '\250', '\251', '\272', '\253', '\256', '\255', '\256', '\277',
+  '\260', '\261', '\271', '\263', '\270', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\275', '\275', '\377', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_16_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x34a2, 0x30e2, 0x34a2, 0x00a0, 0x01a0, 0x34a2, 0x00a0,
+  0x30e2, 0x00a0, 0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x30e2, 0x34a2,
+  0x00a0, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x00a0, 0x01a0,
+  0x30e2, 0x30e2, 0x30e2, 0x01a0, 0x34a2, 0x30e2, 0x34a2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+			  const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
+			  OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_16_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1; /* return byte length of converted char to lower */
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_16_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_16_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa1, 0xa2 },
+ { 0xa3, 0xb3 },
+ { 0xa6, 0xa8 },
+ { 0xaa, 0xba },
+ { 0xac, 0xae },
+ { 0xaf, 0xbf },
+
+ { 0xb2, 0xb9 },
+ { 0xb4, 0xb8 },
+ { 0xbc, 0xbd },
+ { 0xbe, 0xff },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd7, 0xf7 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+				OnigApplyAllCaseFoldFunc f, void* arg,
+				OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-16",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-16", "ISO-8859-16")
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
new file mode 100644
index 0000000000..9783f1cd02
--- /dev/null
+++ b/enc/iso_8859_2.c
@@ -0,0 +1,250 @@
+/**********************************************************************
+  iso8859_2.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_2_TO_LOWER_CASE(c) EncISO_8859_2_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_2_CTYPE(code,ctype) \
+  ((EncISO_8859_2_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_2_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\261', '\242', '\263', '\244', '\265', '\266', '\247',
+  '\250', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
+  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_2_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x34a2, 0x00a0, 0x34a2, 0x00a0, 0x34a2, 0x34a2, 0x00a0,
+  0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
+  0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x30e2, 0x00a0,
+  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
+	      OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_2_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1; /* return byte length of converted char to lower */
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_2_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa1, 0xb1 },
+ { 0xa3, 0xb3 },
+ { 0xa5, 0xb5 },
+ { 0xa6, 0xb6 },
+ { 0xa9, 0xb9 },
+ { 0xaa, 0xba },
+ { 0xab, 0xbb },
+ { 0xac, 0xbc },
+ { 0xae, 0xbe },
+ { 0xaf, 0xbf },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+            sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+            flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_2_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-2",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-2", "ISO-8859-2")
+
+/*
+ * Name: windows-1250
+ * MIBenum: 2250
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1250.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1250
+ */
+ENC_REPLICATE("Windows-1250", "ISO-8859-2")
+ENC_ALIAS("CP1250", "Windows-1250")
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
new file mode 100644
index 0000000000..81c0c742b6
--- /dev/null
+++ b/enc/iso_8859_3.c
@@ -0,0 +1,240 @@
+/**********************************************************************
+  iso8859_3.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_3_TO_LOWER_CASE(c) EncISO_8859_3_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_3_CTYPE(code,ctype) \
+  ((EncISO_8859_3_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_3_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\261', '\242', '\243', '\244', '\245', '\266', '\247',
+  '\250', '\271', '\272', '\273', '\274', '\255', '\256', '\277',
+  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+  '\340', '\341', '\342', '\303', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\320', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_3_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x34a2, 0x00a0, 0x00a0, 0x00a0, 0x0000, 0x34a2, 0x00a0,
+  0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x0000, 0x34a2,
+  0x00a0, 0x30e2, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x30e2, 0x01a0,
+  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x11a0, 0x0000, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x0000, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x0000, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
+	      OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_3_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_3_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
+    if (*p == 0xb5)
+      return FALSE;
+    else
+      return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_3_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa1, 0xb1 },
+ { 0xa6, 0xb6 },
+ { 0xa9, 0xb9 },
+ { 0xaa, 0xba },
+ { 0xab, 0xbb },
+ { 0xac, 0xbc },
+ { 0xaf, 0xbf },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-3",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-3", "ISO-8859-3")
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
new file mode 100644
index 0000000000..ec71c4bcbf
--- /dev/null
+++ b/enc/iso_8859_4.c
@@ -0,0 +1,242 @@
+/**********************************************************************
+  iso8859_4.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_4_TO_LOWER_CASE(c) EncISO_8859_4_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_4_CTYPE(code,ctype) \
+  ((EncISO_8859_4_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_4_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\261', '\242', '\263', '\244', '\265', '\266', '\247',
+  '\250', '\271', '\272', '\273', '\274', '\255', '\276', '\257',
+  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\277', '\276', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_4_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x34a2, 0x30e2, 0x34a2, 0x00a0, 0x34a2, 0x34a2, 0x00a0,
+  0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x00a0,
+  0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x30e2, 0x00a0,
+  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
+	      OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_4_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1; /* return byte length of converted char to lower */
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_4_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    if (*p == 0xa2)
+      return FALSE;
+    else
+      return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_4_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa1, 0xb1 },
+ { 0xa3, 0xb3 },
+ { 0xa5, 0xb5 },
+ { 0xa6, 0xb6 },
+ { 0xa9, 0xb9 },
+ { 0xaa, 0xba },
+ { 0xab, 0xbb },
+ { 0xac, 0xbc },
+ { 0xae, 0xbe },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb },
+ { 0xdc, 0xfc },
+ { 0xdd, 0xfd },
+ { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-4",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-4", "ISO-8859-4")
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
new file mode 100644
index 0000000000..81cc8e5b32
--- /dev/null
+++ b/enc/iso_8859_5.c
@@ -0,0 +1,230 @@
+/**********************************************************************
+  iso8859_5.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_5_TO_LOWER_CASE(c) EncISO_8859_5_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_5_CTYPE(code,ctype) \
+  ((EncISO_8859_5_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_5_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\255', '\376', '\377',
+  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_5_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
+	      OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  *lower = ENC_ISO_8859_5_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  (*pp)++;
+  v = (EncISO_8859_5_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_5_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa1, 0xf1 },
+ { 0xa2, 0xf2 },
+ { 0xa3, 0xf3 },
+ { 0xa4, 0xf4 },
+ { 0xa5, 0xf5 },
+ { 0xa6, 0xf6 },
+ { 0xa7, 0xf7 },
+ { 0xa8, 0xf8 },
+ { 0xa9, 0xf9 },
+ { 0xaa, 0xfa },
+ { 0xab, 0xfb },
+ { 0xac, 0xfc },
+ { 0xae, 0xfe },
+ { 0xaf, 0xff },
+
+ { 0xb0, 0xd0 },
+ { 0xb1, 0xd1 },
+ { 0xb2, 0xd2 },
+ { 0xb3, 0xd3 },
+ { 0xb4, 0xd4 },
+ { 0xb5, 0xd5 },
+ { 0xb6, 0xd6 },
+ { 0xb7, 0xd7 },
+ { 0xb8, 0xd8 },
+ { 0xb9, 0xd9 },
+ { 0xba, 0xda },
+ { 0xbb, 0xdb },
+ { 0xbc, 0xdc },
+ { 0xbd, 0xdd },
+ { 0xbe, 0xde },
+ { 0xbf, 0xdf },
+
+ { 0xc0, 0xe0 },
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-5",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-5", "ISO-8859-5")
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
new file mode 100644
index 0000000000..7384061a1f
--- /dev/null
+++ b/enc/iso_8859_6.c
@@ -0,0 +1,107 @@
+/**********************************************************************
+  iso8859_6.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_IS_ISO_8859_6_CTYPE(code,ctype) \
+  ((EncISO_8859_6_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const unsigned short EncISO_8859_6_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x0000, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0000, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x0000, 0x01a0, 0x01a0, 0x0000, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x01a0, 0x0000, 0x0000, 0x0000, 0x01a0,
+  0x0000, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+};
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_6_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-6",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  onigenc_ascii_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-6", "ISO-8859-6")
+
+/*
+ * Name: windows-1256
+ * MIBenum: 2256
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1256.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1256
+ */
+ENC_REPLICATE("Windows-1256", "ISO-8859-6")
+ENC_ALIAS("CP1256", "Windows-1256")
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
new file mode 100644
index 0000000000..2f916171db
--- /dev/null
+++ b/enc/iso_8859_7.c
@@ -0,0 +1,237 @@
+/**********************************************************************
+  iso8859_7.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_7_TO_LOWER_CASE(c) EncISO_8859_7_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_7_CTYPE(code,ctype) \
+  ((EncISO_8859_7_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_7_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+  '\260', '\261', '\262', '\263', '\264', '\265', '\334', '\267',
+  '\335', '\336', '\337', '\273', '\374', '\275', '\375', '\376',
+  '\300', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\322', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\334', '\335', '\336', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_7_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x01a0, 0x01a0, 0x00a0, 0x0000, 0x0000, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x0000, 0x01a0, 0x00a0, 0x01a0, 0x0000, 0x01a0,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x00a0, 0x34a2, 0x01a0,
+  0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x10a0, 0x34a2, 0x34a2,
+  0x30e2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x0000
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
+	      OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  *lower = ENC_ISO_8859_7_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag,
+		 const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  (*pp)++;
+  v = (EncISO_8859_7_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    if (*p == 0xc0 || *p == 0xe0)
+      return FALSE;
+    else
+      return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_7_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xb6, 0xdc },
+ { 0xb8, 0xdd },
+ { 0xb9, 0xde },
+ { 0xba, 0xdf },
+ { 0xbc, 0xfc },
+ { 0xbe, 0xfd },
+ { 0xbf, 0xfe },
+
+ { 0xc1, 0xe1 },
+ { 0xc2, 0xe2 },
+ { 0xc3, 0xe3 },
+ { 0xc4, 0xe4 },
+ { 0xc5, 0xe5 },
+ { 0xc6, 0xe6 },
+ { 0xc7, 0xe7 },
+ { 0xc8, 0xe8 },
+ { 0xc9, 0xe9 },
+ { 0xca, 0xea },
+ { 0xcb, 0xeb },
+ { 0xcc, 0xec },
+ { 0xcd, 0xed },
+ { 0xce, 0xee },
+ { 0xcf, 0xef },
+
+ { 0xd0, 0xf0 },
+ { 0xd1, 0xf1 },
+ { 0xd2, 0xf2 },
+ { 0xd3, 0xf3 },
+ { 0xd4, 0xf4 },
+ { 0xd5, 0xf5 },
+ { 0xd6, 0xf6 },
+ { 0xd7, 0xf7 },
+ { 0xd8, 0xf8 },
+ { 0xd9, 0xf9 },
+ { 0xda, 0xfa },
+ { 0xdb, 0xfb }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     flag, p, end, items);
+}
+
+
+OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-7",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-7", "ISO-8859-7")
+
+/*
+ * Name: windows-1253
+ * MIBenum: 2253
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1253.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1253
+ */
+ENC_REPLICATE("Windows-1253", "ISO-8859-7")
+ENC_ALIAS("CP1253", "Windows-1253")
diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c
new file mode 100644
index 0000000000..bd0754c2b1
--- /dev/null
+++ b/enc/iso_8859_8.c
@@ -0,0 +1,107 @@
+/**********************************************************************
+  iso8859_8.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_IS_ISO_8859_8_CTYPE(code,ctype) \
+  ((EncISO_8859_8_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const unsigned short EncISO_8859_8_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x0000, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
+  0x00a0, 0x10a0, 0x00a0, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01a0,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
+  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+};
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_8_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-8",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  onigenc_ascii_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-8", "ISO-8859-8")
+
+/*
+ * Name: windows-1255
+ * MIBenum: 2255
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1255.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1255
+ */
+ENC_REPLICATE("Windows-1255", "ISO-8859-8")
+ENC_ALIAS("CP1255", "Windows-1255")
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
new file mode 100644
index 0000000000..4d46e742e2
--- /dev/null
+++ b/enc/iso_8859_9.c
@@ -0,0 +1,243 @@
+/**********************************************************************
+  iso8859_9.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_ISO_8859_9_TO_LOWER_CASE(c) EncISO_8859_9_ToLowerCaseTable[c]
+#define ENC_IS_ISO_8859_9_CTYPE(code,ctype) \
+  ((EncISO_8859_9_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncISO_8859_9_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
+  '\370', '\371', '\372', '\373', '\374', '\335', '\376', '\337',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncISO_8859_9_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
+  0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
+	      OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_ISO_8859_9_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  int v;
+  const UChar* p = *pp;
+
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncISO_8859_9_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  if ((v | BIT_CTYPE_LOWER) != 0) {
+    /* 0xdf etc..  are lower case letter, but can't convert. */
+    if (*p >= 0xaa && *p <= 0xba)
+      return FALSE;
+    else
+      return TRUE;
+  }
+
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_ISO_8859_9_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  { 0xc0, 0xe0 },
+  { 0xc1, 0xe1 },
+  { 0xc2, 0xe2 },
+  { 0xc3, 0xe3 },
+  { 0xc4, 0xe4 },
+  { 0xc5, 0xe5 },
+  { 0xc6, 0xe6 },
+  { 0xc7, 0xe7 },
+  { 0xc8, 0xe8 },
+  { 0xc9, 0xe9 },
+  { 0xca, 0xea },
+  { 0xcb, 0xeb },
+  { 0xcc, 0xec },
+  { 0xcd, 0xed },
+  { 0xce, 0xee },
+  { 0xcf, 0xef },
+
+  { 0xd0, 0xf0 },
+  { 0xd1, 0xf1 },
+  { 0xd2, 0xf2 },
+  { 0xd3, 0xf3 },
+  { 0xd4, 0xf4 },
+  { 0xd5, 0xf5 },
+  { 0xd6, 0xf6 },
+  { 0xd8, 0xf8 },
+  { 0xd9, 0xf9 },
+  { 0xda, 0xfa },
+  { 0xdb, 0xfb },
+  { 0xdc, 0xfc },
+  { 0xdd, 0xfd },
+  { 0xde, 0xfe }
+};
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+			       OnigApplyAllCaseFoldFunc f, void* arg,
+			       OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             flag, f, arg);
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				      const OnigUChar* p, const OnigUChar* end,
+				      OnigCaseFoldCodeItem items[],
+				      OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
+  onigenc_single_byte_mbc_enc_len,
+  "ISO-8859-9",  /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ISO8859-9", "ISO-8859-9")
+
+/*
+ * Name: windows-1254
+ * MIBenum: 2254
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1254.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1254
+ */
+ENC_REPLICATE("Windows-1254", "ISO-8859-9")
+ENC_ALIAS("CP1254", "Windows-1254")
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
new file mode 100644
index 0000000000..f5b7d22349
--- /dev/null
+++ b/enc/koi8_r.c
@@ -0,0 +1,219 @@
+/**********************************************************************
+  koi8_r.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_KOI8_R_TO_LOWER_CASE(c) EncKOI8_R_ToLowerCaseTable[c]
+#define ENC_IS_KOI8_R_CTYPE(code,ctype) \
+  ((EncKOI8_R_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncKOI8_R_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+  '\260', '\261', '\262', '\243', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337'
+};
+
+static const unsigned short EncKOI8_R_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x0284, 0x00a0, 0x00a0, 0x10a0, 0x01a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2
+};
+
+static int
+koi8_r_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
+		     const UChar** pp, const UChar* end ARG_UNUSED,
+		     UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  *lower = ENC_KOI8_R_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+koi8_r_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
+			const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  int v;
+  const UChar* p = *pp;
+
+  (*pp)++;
+  v = (EncKOI8_R_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+koi8_r_is_code_ctype(OnigCodePoint code, unsigned int ctype,
+		     OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_KOI8_R_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  { 0xa3, 0xb3 },
+
+  { 0xc0, 0xe0 },
+  { 0xc1, 0xe1 },
+  { 0xc2, 0xe2 },
+  { 0xc3, 0xe3 },
+  { 0xc4, 0xe4 },
+  { 0xc5, 0xe5 },
+  { 0xc6, 0xe6 },
+  { 0xc7, 0xe7 },
+  { 0xc8, 0xe8 },
+  { 0xc9, 0xe9 },
+  { 0xca, 0xea },
+  { 0xcb, 0xeb },
+  { 0xcc, 0xec },
+  { 0xcd, 0xed },
+  { 0xce, 0xee },
+  { 0xcf, 0xef },
+
+  { 0xd0, 0xf0 },
+  { 0xd1, 0xf1 },
+  { 0xd2, 0xf2 },
+  { 0xd3, 0xf3 },
+  { 0xd4, 0xf4 },
+  { 0xd5, 0xf5 },
+  { 0xd6, 0xf6 },
+  { 0xd7, 0xf7 },
+  { 0xd8, 0xf8 },
+  { 0xd9, 0xf9 },
+  { 0xda, 0xfa },
+  { 0xdb, 0xfb },
+  { 0xdc, 0xfc },
+  { 0xdd, 0xfd },
+  { 0xde, 0xfe },
+  { 0xdf, 0xff }
+};
+
+static int
+koi8_r_apply_all_case_fold(OnigCaseFoldType flag,
+			   OnigApplyAllCaseFoldFunc f,
+			   void* arg, OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             flag, f, arg);
+}
+
+static int
+koi8_r_get_case_fold_codes_by_str(OnigCaseFoldType flag,
+		  const OnigUChar* p, const OnigUChar* end,
+		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(koi8_r, KOI8_R) = {
+  onigenc_single_byte_mbc_enc_len,
+  "KOI8-R",       /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  koi8_r_mbc_case_fold,
+  koi8_r_apply_all_case_fold,
+  koi8_r_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  koi8_r_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("CP878", "KOI8-R")
+
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
new file mode 100644
index 0000000000..dfbaa9ac36
--- /dev/null
+++ b/enc/koi8_u.c
@@ -0,0 +1,221 @@
+/**********************************************************************
+  koi8_u.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_KOI8_U_TO_LOWER_CASE(c) EncKOI8_U_ToLowerCaseTable[c]
+#define ENC_IS_KOI8_U_CTYPE(code,ctype) \
+  ((EncKOI8_U_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncKOI8_U_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+  '\260', '\261', '\262', '\243', '\244', '\265', '\246', '\247',
+  '\270', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
+  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337'
+};
+
+static const unsigned short EncKOI8_U_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x0284, 0x00a0, 0x00a0, 0x10a0, 0x01a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x34a2, 0x00a0, 0x34a2, 0x34a2,
+  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2
+};
+
+static int
+koi8_u_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
+		     const UChar** pp, const UChar* end ARG_UNUSED,
+		     UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  *lower = ENC_KOI8_U_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+#if 0
+static int
+koi8_u_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
+			const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  int v;
+  const UChar* p = *pp;
+
+  (*pp)++;
+  v = (EncKOI8_U_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+  return (v != 0 ? TRUE : FALSE);
+}
+#endif
+
+static int
+koi8_u_is_code_ctype(OnigCodePoint code, unsigned int ctype,
+		     OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_KOI8_U_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  { 0xa3, 0xb3 },
+  { 0xa4, 0xb4 },
+  { 0xa6, 0xb6 },
+  { 0xa7, 0xb7 },
+  { 0xad, 0xbd },
+
+  { 0xc0, 0xe0 },
+  { 0xc1, 0xe1 },
+  { 0xc2, 0xe2 },
+  { 0xc3, 0xe3 },
+  { 0xc4, 0xe4 },
+  { 0xc5, 0xe5 },
+  { 0xc6, 0xe6 },
+  { 0xc7, 0xe7 },
+  { 0xc8, 0xe8 },
+  { 0xc9, 0xe9 },
+  { 0xca, 0xea },
+  { 0xcb, 0xeb },
+  { 0xcc, 0xec },
+  { 0xcd, 0xed },
+  { 0xce, 0xee },
+  { 0xcf, 0xef },
+
+  { 0xd0, 0xf0 },
+  { 0xd1, 0xf1 },
+  { 0xd2, 0xf2 },
+  { 0xd3, 0xf3 },
+  { 0xd4, 0xf4 },
+  { 0xd5, 0xf5 },
+  { 0xd6, 0xf6 },
+  { 0xd7, 0xf7 },
+  { 0xd8, 0xf8 },
+  { 0xd9, 0xf9 },
+  { 0xda, 0xfa },
+  { 0xdb, 0xfb },
+  { 0xdc, 0xfc },
+  { 0xdd, 0xfd },
+  { 0xde, 0xfe },
+  { 0xdf, 0xff }
+};
+
+static int
+koi8_u_apply_all_case_fold(OnigCaseFoldType flag,
+			   OnigApplyAllCaseFoldFunc f,
+			   void* arg, OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             flag, f, arg);
+}
+
+static int
+koi8_u_get_case_fold_codes_by_str(OnigCaseFoldType flag,
+		  const OnigUChar* p, const OnigUChar* end,
+		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(koi8_u, KOI8_U) = {
+  onigenc_single_byte_mbc_enc_len,
+  "KOI8-U",       /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  koi8_u_mbc_case_fold,
+  koi8_u_apply_all_case_fold,
+  koi8_u_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  koi8_u_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
new file mode 100755
index 0000000000..107a387571
--- /dev/null
+++ b/enc/make_encmake.rb
@@ -0,0 +1,50 @@
+#! ./miniruby
+
+dir = File.expand_path("../..", __FILE__)
+$:.unshift(dir)
+$:.unshift(".")
+if $".grep(/mkmf/).empty?
+  $" << "mkmf.rb"
+  load File.expand_path("lib/mkmf.rb", dir)
+end
+require 'erb'
+
+CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p'
+
+BUILTIN_ENCS = []
+BUILTIN_TRANSES = []
+ENC_PATTERNS = []
+NOENC_PATTERNS = []
+
+until ARGV.empty?
+  case ARGV[0]
+  when /\A--builtin-encs=/
+    BUILTIN_ENCS.concat $'.split.map {|e| File.basename(e, '.*') << '.c'}
+    ARGV.shift
+  when /\A--builtin-transes=/
+    BUILTIN_TRANSES.concat $'.split.map {|e| File.basename(e, '.*') }
+    ARGV.shift
+  when /\A--encs=/
+    ENC_PATTERNS.concat $'.split
+    ARGV.shift
+  when /\A--no-encs=/
+    NOENC_PATTERNS.concat $'.split
+    ARGV.shift
+  else
+    break
+  end
+end
+
+if File.exist?(depend = File.join($srcdir, "depend"))
+  erb = ERB.new(File.read(depend), nil, '%')
+  erb.filename = depend
+  tmp = erb.result(binding)
+  dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
+else
+  dep = ""
+end
+mkin = File.read(File.join($srcdir, "Makefile.in"))
+mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
+open(ARGV[0], 'wb') {|f|
+  f.puts mkin, dep
+}
diff --git a/enc/prelude.rb b/enc/prelude.rb
new file mode 100644
index 0000000000..8ce59f957a
--- /dev/null
+++ b/enc/prelude.rb
@@ -0,0 +1,6 @@
+%w'enc/encdb.so enc/trans/transdb.so'.each do |init|
+  begin
+    require(init)
+  rescue LoadError
+  end
+end
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
new file mode 100644
index 0000000000..f7614205af
--- /dev/null
+++ b/enc/shift_jis.c
@@ -0,0 +1,399 @@
+/**********************************************************************
+  sjis.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regint.h"
+
+static const int EncLen_SJIS[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1
+};
+
+static const char SJIS_CAN_BE_TRAIL_TABLE[256] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
+};
+
+#define SJIS_ISMB_FIRST(byte)  (EncLen_SJIS[byte] > 1)
+#define SJIS_ISMB_TRAIL(byte)  SJIS_CAN_BE_TRAIL_TABLE[(byte)]
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F, F, F
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
+    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, F, F, F
+  }
+};
+#undef A
+#undef F
+
+static int
+mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s;
+  s = trans[0][firstbyte];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_SJIS[firstbyte]-1);
+  s = trans[s][*p++];
+  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
+                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static int
+code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256) {
+    if (EncLen_SJIS[(int )code] == 1)
+      return 1;
+    else
+      return 0;
+  }
+  else if (code <= 0xffff) {
+    return 2;
+  }
+  else
+    return ONIGERR_INVALID_CODE_POINT_VALUE;
+}
+
+static OnigCodePoint
+mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int c, i, len;
+  OnigCodePoint n;
+
+  len = enclen(enc, p, end);
+  c = *p++;
+  n = c;
+  if (len == 1) return n;
+
+  for (i = 1; i < len; i++) {
+    if (p >= end) break;
+    c = *p++;
+    n <<= 8;  n += c;
+  }
+  return n;
+}
+
+static int
+code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  UChar *p = buf;
+
+  if ((code & 0xff00) != 0) *p++ = (UChar )(((code >>  8) & 0xff));
+  *p++ = (UChar )(code & 0xff);
+
+#if 0
+  if (enclen(enc, buf) != (p - buf))
+    return REGERR_INVALID_CODE_POINT_VALUE;
+#endif
+  return p - buf;
+}
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end, UChar* lower,
+	      OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_MBC_ASCII(p)) {
+    *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    (*pp)++;
+    return 1;
+  }
+  else {
+    int i;
+    int len = enclen(enc, p, end);
+
+    for (i = 0; i < len; i++) {
+      *lower++ = *p++;
+    }
+    (*pp) += len;
+    return len; /* return byte length of converted char to lower */
+  }
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag,
+		 const UChar** pp, const UChar* end)
+{
+  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
+                                      
+}
+#endif
+
+#if 0
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype)
+{
+  if (code < 128)
+    return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
+  else {
+    if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
+      return (code_to_mbclen(code) > 1 ? TRUE : FALSE);
+    }
+  }
+
+  return FALSE;
+}
+#endif
+
+static UChar*
+left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  if (SJIS_ISMB_TRAIL(*p)) {
+    while (p > start) {
+      if (! SJIS_ISMB_FIRST(*--p)) {
+	p++;
+	break;
+      }
+    } 
+  }
+  len = enclen(enc, p, end);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+  return (SJIS_ISMB_TRAIL(c) ? FALSE : TRUE);
+}
+
+
+static int PropertyInited = 0;
+static const OnigCodePoint** PropertyList;
+static int PropertyListNum;
+static int PropertyListSize;
+static hash_table_type* PropertyNameTable;
+
+static const OnigCodePoint CR_Hiragana[] = {
+  1,
+  0x829f, 0x82f1
+}; /* CR_Hiragana */
+
+static const OnigCodePoint CR_Katakana[] = {
+  4,
+  0x00a6, 0x00af,
+  0x00b1, 0x00dd,
+  0x8340, 0x837e,
+  0x8380, 0x8396,
+}; /* CR_Katakana */
+
+static int
+init_property_list(void)
+{
+  int r;
+
+  PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
+  PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
+  PropertyInited = 1;
+
+ end:
+  return r;
+}
+
+static int
+property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
+{
+  hash_data_type ctype;
+
+  PROPERTY_LIST_INIT_CHECK;
+
+  if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
+    return onigenc_minimum_property_name_to_ctype(enc, p, end);
+  }
+
+  return (int)ctype;
+}
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
+    if (code < 128)
+      return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
+    else {
+      if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
+	return TRUE;
+      }
+    }
+  }
+  else {
+    PROPERTY_LIST_INIT_CHECK;
+
+    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
+    if (ctype >= (unsigned int )PropertyListNum)
+      return ONIGERR_TYPE_BUG;
+
+    return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
+  }
+
+  return FALSE;
+}
+
+static int
+get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
+		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
+{
+  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
+    return ONIG_NO_SUPPORT_CONFIG;
+  }
+  else {
+    *sb_out = 0x80;
+
+    PROPERTY_LIST_INIT_CHECK;
+
+    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
+    if (ctype >= (OnigCtype )PropertyListNum)
+      return ONIGERR_TYPE_BUG;
+
+    *ranges = PropertyList[ctype];
+    return 0;
+  }
+}
+
+OnigEncodingDefine(shift_jis, Shift_JIS) = {
+  mbc_enc_len,
+  "Shift_JIS",   /* name */
+  2,             /* max byte length */
+  1,             /* min byte length */
+  onigenc_is_mbc_newline_0x0a,
+  mbc_to_code,
+  code_to_mbclen,
+  code_to_mbc,
+  mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  property_name_to_ctype,
+  is_code_ctype,
+  get_ctype_code_range,
+  left_adjust_char_head,
+  is_allowed_reverse_match,
+  0
+};
+/*
+ * Name: Shift_JIS
+ * MIBenum: 17
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://ja.wikipedia.org/wiki/Shift_JIS
+ */
+ENC_ALIAS("SJIS", "Shift_JIS")
+
+/*
+ * Name: Windows-31J
+ * MIBenum: 2024
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/dbcs/932.mspx
+ * Link: http://ja.wikipedia.org/wiki/Windows-31J
+ * Link: http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/windows-932-2000.ucm
+ */
+ENC_REPLICATE("Windows-31J", "Shift_JIS")
+ENC_ALIAS("CP932", "Windows-31J")
+ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA.  IE6 don't accept Windows-31J but csWindows31J. */
+
+/*
+ * Name: MacJapanese
+ * Link: http://unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT
+ * Link: http://ja.wikipedia.org/wiki/MacJapanese
+ */
+ENC_REPLICATE("MacJapanese", "Shift_JIS")
+ENC_ALIAS("MacJapan", "MacJapanese")
diff --git a/enc/trans/CP/CP932UDA%UCS.src b/enc/trans/CP/CP932UDA%UCS.src
new file mode 100644
index 0000000000..c49048510e
--- /dev/null
+++ b/enc/trans/CP/CP932UDA%UCS.src
@@ -0,0 +1,1912 @@
+# $NetBSD: CP932UDA%UCS.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"CP932UDA/UCS"
+SRC_ZONE	0x7F-0x92 / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#    Name:     cp932 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       cpxlate@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp932 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp932 order
+#
+0x7F21 = 0xE000
+0x7F22 = 0xE001
+0x7F23 = 0xE002
+0x7F24 = 0xE003
+0x7F25 = 0xE004
+0x7F26 = 0xE005
+0x7F27 = 0xE006
+0x7F28 = 0xE007
+0x7F29 = 0xE008
+0x7F2A = 0xE009
+0x7F2B = 0xE00A
+0x7F2C = 0xE00B
+0x7F2D = 0xE00C
+0x7F2E = 0xE00D
+0x7F2F = 0xE00E
+0x7F30 = 0xE00F
+0x7F31 = 0xE010
+0x7F32 = 0xE011
+0x7F33 = 0xE012
+0x7F34 = 0xE013
+0x7F35 = 0xE014
+0x7F36 = 0xE015
+0x7F37 = 0xE016
+0x7F38 = 0xE017
+0x7F39 = 0xE018
+0x7F3A = 0xE019
+0x7F3B = 0xE01A
+0x7F3C = 0xE01B
+0x7F3D = 0xE01C
+0x7F3E = 0xE01D
+0x7F3F = 0xE01E
+0x7F40 = 0xE01F
+0x7F41 = 0xE020
+0x7F42 = 0xE021
+0x7F43 = 0xE022
+0x7F44 = 0xE023
+0x7F45 = 0xE024
+0x7F46 = 0xE025
+0x7F47 = 0xE026
+0x7F48 = 0xE027
+0x7F49 = 0xE028
+0x7F4A = 0xE029
+0x7F4B = 0xE02A
+0x7F4C = 0xE02B
+0x7F4D = 0xE02C
+0x7F4E = 0xE02D
+0x7F4F = 0xE02E
+0x7F50 = 0xE02F
+0x7F51 = 0xE030
+0x7F52 = 0xE031
+0x7F53 = 0xE032
+0x7F54 = 0xE033
+0x7F55 = 0xE034
+0x7F56 = 0xE035
+0x7F57 = 0xE036
+0x7F58 = 0xE037
+0x7F59 = 0xE038
+0x7F5A = 0xE039
+0x7F5B = 0xE03A
+0x7F5C = 0xE03B
+0x7F5D = 0xE03C
+0x7F5E = 0xE03D
+0x7F5F = 0xE03E
+0x7F60 = 0xE03F
+0x7F61 = 0xE040
+0x7F62 = 0xE041
+0x7F63 = 0xE042
+0x7F64 = 0xE043
+0x7F65 = 0xE044
+0x7F66 = 0xE045
+0x7F67 = 0xE046
+0x7F68 = 0xE047
+0x7F69 = 0xE048
+0x7F6A = 0xE049
+0x7F6B = 0xE04A
+0x7F6C = 0xE04B
+0x7F6D = 0xE04C
+0x7F6E = 0xE04D
+0x7F6F = 0xE04E
+0x7F70 = 0xE04F
+0x7F71 = 0xE050
+0x7F72 = 0xE051
+0x7F73 = 0xE052
+0x7F74 = 0xE053
+0x7F75 = 0xE054
+0x7F76 = 0xE055
+0x7F77 = 0xE056
+0x7F78 = 0xE057
+0x7F79 = 0xE058
+0x7F7A = 0xE059
+0x7F7B = 0xE05A
+0x7F7C = 0xE05B
+0x7F7D = 0xE05C
+0x7F7E = 0xE05D
+0x8021 = 0xE05E
+0x8022 = 0xE05F
+0x8023 = 0xE060
+0x8024 = 0xE061
+0x8025 = 0xE062
+0x8026 = 0xE063
+0x8027 = 0xE064
+0x8028 = 0xE065
+0x8029 = 0xE066
+0x802A = 0xE067
+0x802B = 0xE068
+0x802C = 0xE069
+0x802D = 0xE06A
+0x802E = 0xE06B
+0x802F = 0xE06C
+0x8030 = 0xE06D
+0x8031 = 0xE06E
+0x8032 = 0xE06F
+0x8033 = 0xE070
+0x8034 = 0xE071
+0x8035 = 0xE072
+0x8036 = 0xE073
+0x8037 = 0xE074
+0x8038 = 0xE075
+0x8039 = 0xE076
+0x803A = 0xE077
+0x803B = 0xE078
+0x803C = 0xE079
+0x803D = 0xE07A
+0x803E = 0xE07B
+0x803F = 0xE07C
+0x8040 = 0xE07D
+0x8041 = 0xE07E
+0x8042 = 0xE07F
+0x8043 = 0xE080
+0x8044 = 0xE081
+0x8045 = 0xE082
+0x8046 = 0xE083
+0x8047 = 0xE084
+0x8048 = 0xE085
+0x8049 = 0xE086
+0x804A = 0xE087
+0x804B = 0xE088
+0x804C = 0xE089
+0x804D = 0xE08A
+0x804E = 0xE08B
+0x804F = 0xE08C
+0x8050 = 0xE08D
+0x8051 = 0xE08E
+0x8052 = 0xE08F
+0x8053 = 0xE090
+0x8054 = 0xE091
+0x8055 = 0xE092
+0x8056 = 0xE093
+0x8057 = 0xE094
+0x8058 = 0xE095
+0x8059 = 0xE096
+0x805A = 0xE097
+0x805B = 0xE098
+0x805C = 0xE099
+0x805D = 0xE09A
+0x805E = 0xE09B
+0x805F = 0xE09C
+0x8060 = 0xE09D
+0x8061 = 0xE09E
+0x8062 = 0xE09F
+0x8063 = 0xE0A0
+0x8064 = 0xE0A1
+0x8065 = 0xE0A2
+0x8066 = 0xE0A3
+0x8067 = 0xE0A4
+0x8068 = 0xE0A5
+0x8069 = 0xE0A6
+0x806A = 0xE0A7
+0x806B = 0xE0A8
+0x806C = 0xE0A9
+0x806D = 0xE0AA
+0x806E = 0xE0AB
+0x806F = 0xE0AC
+0x8070 = 0xE0AD
+0x8071 = 0xE0AE
+0x8072 = 0xE0AF
+0x8073 = 0xE0B0
+0x8074 = 0xE0B1
+0x8075 = 0xE0B2
+0x8076 = 0xE0B3
+0x8077 = 0xE0B4
+0x8078 = 0xE0B5
+0x8079 = 0xE0B6
+0x807A = 0xE0B7
+0x807B = 0xE0B8
+0x807C = 0xE0B9
+0x807D = 0xE0BA
+0x807E = 0xE0BB
+0x8121 = 0xE0BC
+0x8122 = 0xE0BD
+0x8123 = 0xE0BE
+0x8124 = 0xE0BF
+0x8125 = 0xE0C0
+0x8126 = 0xE0C1
+0x8127 = 0xE0C2
+0x8128 = 0xE0C3
+0x8129 = 0xE0C4
+0x812A = 0xE0C5
+0x812B = 0xE0C6
+0x812C = 0xE0C7
+0x812D = 0xE0C8
+0x812E = 0xE0C9
+0x812F = 0xE0CA
+0x8130 = 0xE0CB
+0x8131 = 0xE0CC
+0x8132 = 0xE0CD
+0x8133 = 0xE0CE
+0x8134 = 0xE0CF
+0x8135 = 0xE0D0
+0x8136 = 0xE0D1
+0x8137 = 0xE0D2
+0x8138 = 0xE0D3
+0x8139 = 0xE0D4
+0x813A = 0xE0D5
+0x813B = 0xE0D6
+0x813C = 0xE0D7
+0x813D = 0xE0D8
+0x813E = 0xE0D9
+0x813F = 0xE0DA
+0x8140 = 0xE0DB
+0x8141 = 0xE0DC
+0x8142 = 0xE0DD
+0x8143 = 0xE0DE
+0x8144 = 0xE0DF
+0x8145 = 0xE0E0
+0x8146 = 0xE0E1
+0x8147 = 0xE0E2
+0x8148 = 0xE0E3
+0x8149 = 0xE0E4
+0x814A = 0xE0E5
+0x814B = 0xE0E6
+0x814C = 0xE0E7
+0x814D = 0xE0E8
+0x814E = 0xE0E9
+0x814F = 0xE0EA
+0x8150 = 0xE0EB
+0x8151 = 0xE0EC
+0x8152 = 0xE0ED
+0x8153 = 0xE0EE
+0x8154 = 0xE0EF
+0x8155 = 0xE0F0
+0x8156 = 0xE0F1
+0x8157 = 0xE0F2
+0x8158 = 0xE0F3
+0x8159 = 0xE0F4
+0x815A = 0xE0F5
+0x815B = 0xE0F6
+0x815C = 0xE0F7
+0x815D = 0xE0F8
+0x815E = 0xE0F9
+0x815F = 0xE0FA
+0x8160 = 0xE0FB
+0x8161 = 0xE0FC
+0x8162 = 0xE0FD
+0x8163 = 0xE0FE
+0x8164 = 0xE0FF
+0x8165 = 0xE100
+0x8166 = 0xE101
+0x8167 = 0xE102
+0x8168 = 0xE103
+0x8169 = 0xE104
+0x816A = 0xE105
+0x816B = 0xE106
+0x816C = 0xE107
+0x816D = 0xE108
+0x816E = 0xE109
+0x816F = 0xE10A
+0x8170 = 0xE10B
+0x8171 = 0xE10C
+0x8172 = 0xE10D
+0x8173 = 0xE10E
+0x8174 = 0xE10F
+0x8175 = 0xE110
+0x8176 = 0xE111
+0x8177 = 0xE112
+0x8178 = 0xE113
+0x8179 = 0xE114
+0x817A = 0xE115
+0x817B = 0xE116
+0x817C = 0xE117
+0x817D = 0xE118
+0x817E = 0xE119
+0x8221 = 0xE11A
+0x8222 = 0xE11B
+0x8223 = 0xE11C
+0x8224 = 0xE11D
+0x8225 = 0xE11E
+0x8226 = 0xE11F
+0x8227 = 0xE120
+0x8228 = 0xE121
+0x8229 = 0xE122
+0x822A = 0xE123
+0x822B = 0xE124
+0x822C = 0xE125
+0x822D = 0xE126
+0x822E = 0xE127
+0x822F = 0xE128
+0x8230 = 0xE129
+0x8231 = 0xE12A
+0x8232 = 0xE12B
+0x8233 = 0xE12C
+0x8234 = 0xE12D
+0x8235 = 0xE12E
+0x8236 = 0xE12F
+0x8237 = 0xE130
+0x8238 = 0xE131
+0x8239 = 0xE132
+0x823A = 0xE133
+0x823B = 0xE134
+0x823C = 0xE135
+0x823D = 0xE136
+0x823E = 0xE137
+0x823F = 0xE138
+0x8240 = 0xE139
+0x8241 = 0xE13A
+0x8242 = 0xE13B
+0x8243 = 0xE13C
+0x8244 = 0xE13D
+0x8245 = 0xE13E
+0x8246 = 0xE13F
+0x8247 = 0xE140
+0x8248 = 0xE141
+0x8249 = 0xE142
+0x824A = 0xE143
+0x824B = 0xE144
+0x824C = 0xE145
+0x824D = 0xE146
+0x824E = 0xE147
+0x824F = 0xE148
+0x8250 = 0xE149
+0x8251 = 0xE14A
+0x8252 = 0xE14B
+0x8253 = 0xE14C
+0x8254 = 0xE14D
+0x8255 = 0xE14E
+0x8256 = 0xE14F
+0x8257 = 0xE150
+0x8258 = 0xE151
+0x8259 = 0xE152
+0x825A = 0xE153
+0x825B = 0xE154
+0x825C = 0xE155
+0x825D = 0xE156
+0x825E = 0xE157
+0x825F = 0xE158
+0x8260 = 0xE159
+0x8261 = 0xE15A
+0x8262 = 0xE15B
+0x8263 = 0xE15C
+0x8264 = 0xE15D
+0x8265 = 0xE15E
+0x8266 = 0xE15F
+0x8267 = 0xE160
+0x8268 = 0xE161
+0x8269 = 0xE162
+0x826A = 0xE163
+0x826B = 0xE164
+0x826C = 0xE165
+0x826D = 0xE166
+0x826E = 0xE167
+0x826F = 0xE168
+0x8270 = 0xE169
+0x8271 = 0xE16A
+0x8272 = 0xE16B
+0x8273 = 0xE16C
+0x8274 = 0xE16D
+0x8275 = 0xE16E
+0x8276 = 0xE16F
+0x8277 = 0xE170
+0x8278 = 0xE171
+0x8279 = 0xE172
+0x827A = 0xE173
+0x827B = 0xE174
+0x827C = 0xE175
+0x827D = 0xE176
+0x827E = 0xE177
+0x8321 = 0xE178
+0x8322 = 0xE179
+0x8323 = 0xE17A
+0x8324 = 0xE17B
+0x8325 = 0xE17C
+0x8326 = 0xE17D
+0x8327 = 0xE17E
+0x8328 = 0xE17F
+0x8329 = 0xE180
+0x832A = 0xE181
+0x832B = 0xE182
+0x832C = 0xE183
+0x832D = 0xE184
+0x832E = 0xE185
+0x832F = 0xE186
+0x8330 = 0xE187
+0x8331 = 0xE188
+0x8332 = 0xE189
+0x8333 = 0xE18A
+0x8334 = 0xE18B
+0x8335 = 0xE18C
+0x8336 = 0xE18D
+0x8337 = 0xE18E
+0x8338 = 0xE18F
+0x8339 = 0xE190
+0x833A = 0xE191
+0x833B = 0xE192
+0x833C = 0xE193
+0x833D = 0xE194
+0x833E = 0xE195
+0x833F = 0xE196
+0x8340 = 0xE197
+0x8341 = 0xE198
+0x8342 = 0xE199
+0x8343 = 0xE19A
+0x8344 = 0xE19B
+0x8345 = 0xE19C
+0x8346 = 0xE19D
+0x8347 = 0xE19E
+0x8348 = 0xE19F
+0x8349 = 0xE1A0
+0x834A = 0xE1A1
+0x834B = 0xE1A2
+0x834C = 0xE1A3
+0x834D = 0xE1A4
+0x834E = 0xE1A5
+0x834F = 0xE1A6
+0x8350 = 0xE1A7
+0x8351 = 0xE1A8
+0x8352 = 0xE1A9
+0x8353 = 0xE1AA
+0x8354 = 0xE1AB
+0x8355 = 0xE1AC
+0x8356 = 0xE1AD
+0x8357 = 0xE1AE
+0x8358 = 0xE1AF
+0x8359 = 0xE1B0
+0x835A = 0xE1B1
+0x835B = 0xE1B2
+0x835C = 0xE1B3
+0x835D = 0xE1B4
+0x835E = 0xE1B5
+0x835F = 0xE1B6
+0x8360 = 0xE1B7
+0x8361 = 0xE1B8
+0x8362 = 0xE1B9
+0x8363 = 0xE1BA
+0x8364 = 0xE1BB
+0x8365 = 0xE1BC
+0x8366 = 0xE1BD
+0x8367 = 0xE1BE
+0x8368 = 0xE1BF
+0x8369 = 0xE1C0
+0x836A = 0xE1C1
+0x836B = 0xE1C2
+0x836C = 0xE1C3
+0x836D = 0xE1C4
+0x836E = 0xE1C5
+0x836F = 0xE1C6
+0x8370 = 0xE1C7
+0x8371 = 0xE1C8
+0x8372 = 0xE1C9
+0x8373 = 0xE1CA
+0x8374 = 0xE1CB
+0x8375 = 0xE1CC
+0x8376 = 0xE1CD
+0x8377 = 0xE1CE
+0x8378 = 0xE1CF
+0x8379 = 0xE1D0
+0x837A = 0xE1D1
+0x837B = 0xE1D2
+0x837C = 0xE1D3
+0x837D = 0xE1D4
+0x837E = 0xE1D5
+0x8421 = 0xE1D6
+0x8422 = 0xE1D7
+0x8423 = 0xE1D8
+0x8424 = 0xE1D9
+0x8425 = 0xE1DA
+0x8426 = 0xE1DB
+0x8427 = 0xE1DC
+0x8428 = 0xE1DD
+0x8429 = 0xE1DE
+0x842A = 0xE1DF
+0x842B = 0xE1E0
+0x842C = 0xE1E1
+0x842D = 0xE1E2
+0x842E = 0xE1E3
+0x842F = 0xE1E4
+0x8430 = 0xE1E5
+0x8431 = 0xE1E6
+0x8432 = 0xE1E7
+0x8433 = 0xE1E8
+0x8434 = 0xE1E9
+0x8435 = 0xE1EA
+0x8436 = 0xE1EB
+0x8437 = 0xE1EC
+0x8438 = 0xE1ED
+0x8439 = 0xE1EE
+0x843A = 0xE1EF
+0x843B = 0xE1F0
+0x843C = 0xE1F1
+0x843D = 0xE1F2
+0x843E = 0xE1F3
+0x843F = 0xE1F4
+0x8440 = 0xE1F5
+0x8441 = 0xE1F6
+0x8442 = 0xE1F7
+0x8443 = 0xE1F8
+0x8444 = 0xE1F9
+0x8445 = 0xE1FA
+0x8446 = 0xE1FB
+0x8447 = 0xE1FC
+0x8448 = 0xE1FD
+0x8449 = 0xE1FE
+0x844A = 0xE1FF
+0x844B = 0xE200
+0x844C = 0xE201
+0x844D = 0xE202
+0x844E = 0xE203
+0x844F = 0xE204
+0x8450 = 0xE205
+0x8451 = 0xE206
+0x8452 = 0xE207
+0x8453 = 0xE208
+0x8454 = 0xE209
+0x8455 = 0xE20A
+0x8456 = 0xE20B
+0x8457 = 0xE20C
+0x8458 = 0xE20D
+0x8459 = 0xE20E
+0x845A = 0xE20F
+0x845B = 0xE210
+0x845C = 0xE211
+0x845D = 0xE212
+0x845E = 0xE213
+0x845F = 0xE214
+0x8460 = 0xE215
+0x8461 = 0xE216
+0x8462 = 0xE217
+0x8463 = 0xE218
+0x8464 = 0xE219
+0x8465 = 0xE21A
+0x8466 = 0xE21B
+0x8467 = 0xE21C
+0x8468 = 0xE21D
+0x8469 = 0xE21E
+0x846A = 0xE21F
+0x846B = 0xE220
+0x846C = 0xE221
+0x846D = 0xE222
+0x846E = 0xE223
+0x846F = 0xE224
+0x8470 = 0xE225
+0x8471 = 0xE226
+0x8472 = 0xE227
+0x8473 = 0xE228
+0x8474 = 0xE229
+0x8475 = 0xE22A
+0x8476 = 0xE22B
+0x8477 = 0xE22C
+0x8478 = 0xE22D
+0x8479 = 0xE22E
+0x847A = 0xE22F
+0x847B = 0xE230
+0x847C = 0xE231
+0x847D = 0xE232
+0x847E = 0xE233
+0x8521 = 0xE234
+0x8522 = 0xE235
+0x8523 = 0xE236
+0x8524 = 0xE237
+0x8525 = 0xE238
+0x8526 = 0xE239
+0x8527 = 0xE23A
+0x8528 = 0xE23B
+0x8529 = 0xE23C
+0x852A = 0xE23D
+0x852B = 0xE23E
+0x852C = 0xE23F
+0x852D = 0xE240
+0x852E = 0xE241
+0x852F = 0xE242
+0x8530 = 0xE243
+0x8531 = 0xE244
+0x8532 = 0xE245
+0x8533 = 0xE246
+0x8534 = 0xE247
+0x8535 = 0xE248
+0x8536 = 0xE249
+0x8537 = 0xE24A
+0x8538 = 0xE24B
+0x8539 = 0xE24C
+0x853A = 0xE24D
+0x853B = 0xE24E
+0x853C = 0xE24F
+0x853D = 0xE250
+0x853E = 0xE251
+0x853F = 0xE252
+0x8540 = 0xE253
+0x8541 = 0xE254
+0x8542 = 0xE255
+0x8543 = 0xE256
+0x8544 = 0xE257
+0x8545 = 0xE258
+0x8546 = 0xE259
+0x8547 = 0xE25A
+0x8548 = 0xE25B
+0x8549 = 0xE25C
+0x854A = 0xE25D
+0x854B = 0xE25E
+0x854C = 0xE25F
+0x854D = 0xE260
+0x854E = 0xE261
+0x854F = 0xE262
+0x8550 = 0xE263
+0x8551 = 0xE264
+0x8552 = 0xE265
+0x8553 = 0xE266
+0x8554 = 0xE267
+0x8555 = 0xE268
+0x8556 = 0xE269
+0x8557 = 0xE26A
+0x8558 = 0xE26B
+0x8559 = 0xE26C
+0x855A = 0xE26D
+0x855B = 0xE26E
+0x855C = 0xE26F
+0x855D = 0xE270
+0x855E = 0xE271
+0x855F = 0xE272
+0x8560 = 0xE273
+0x8561 = 0xE274
+0x8562 = 0xE275
+0x8563 = 0xE276
+0x8564 = 0xE277
+0x8565 = 0xE278
+0x8566 = 0xE279
+0x8567 = 0xE27A
+0x8568 = 0xE27B
+0x8569 = 0xE27C
+0x856A = 0xE27D
+0x856B = 0xE27E
+0x856C = 0xE27F
+0x856D = 0xE280
+0x856E = 0xE281
+0x856F = 0xE282
+0x8570 = 0xE283
+0x8571 = 0xE284
+0x8572 = 0xE285
+0x8573 = 0xE286
+0x8574 = 0xE287
+0x8575 = 0xE288
+0x8576 = 0xE289
+0x8577 = 0xE28A
+0x8578 = 0xE28B
+0x8579 = 0xE28C
+0x857A = 0xE28D
+0x857B = 0xE28E
+0x857C = 0xE28F
+0x857D = 0xE290
+0x857E = 0xE291
+0x8621 = 0xE292
+0x8622 = 0xE293
+0x8623 = 0xE294
+0x8624 = 0xE295
+0x8625 = 0xE296
+0x8626 = 0xE297
+0x8627 = 0xE298
+0x8628 = 0xE299
+0x8629 = 0xE29A
+0x862A = 0xE29B
+0x862B = 0xE29C
+0x862C = 0xE29D
+0x862D = 0xE29E
+0x862E = 0xE29F
+0x862F = 0xE2A0
+0x8630 = 0xE2A1
+0x8631 = 0xE2A2
+0x8632 = 0xE2A3
+0x8633 = 0xE2A4
+0x8634 = 0xE2A5
+0x8635 = 0xE2A6
+0x8636 = 0xE2A7
+0x8637 = 0xE2A8
+0x8638 = 0xE2A9
+0x8639 = 0xE2AA
+0x863A = 0xE2AB
+0x863B = 0xE2AC
+0x863C = 0xE2AD
+0x863D = 0xE2AE
+0x863E = 0xE2AF
+0x863F = 0xE2B0
+0x8640 = 0xE2B1
+0x8641 = 0xE2B2
+0x8642 = 0xE2B3
+0x8643 = 0xE2B4
+0x8644 = 0xE2B5
+0x8645 = 0xE2B6
+0x8646 = 0xE2B7
+0x8647 = 0xE2B8
+0x8648 = 0xE2B9
+0x8649 = 0xE2BA
+0x864A = 0xE2BB
+0x864B = 0xE2BC
+0x864C = 0xE2BD
+0x864D = 0xE2BE
+0x864E = 0xE2BF
+0x864F = 0xE2C0
+0x8650 = 0xE2C1
+0x8651 = 0xE2C2
+0x8652 = 0xE2C3
+0x8653 = 0xE2C4
+0x8654 = 0xE2C5
+0x8655 = 0xE2C6
+0x8656 = 0xE2C7
+0x8657 = 0xE2C8
+0x8658 = 0xE2C9
+0x8659 = 0xE2CA
+0x865A = 0xE2CB
+0x865B = 0xE2CC
+0x865C = 0xE2CD
+0x865D = 0xE2CE
+0x865E = 0xE2CF
+0x865F = 0xE2D0
+0x8660 = 0xE2D1
+0x8661 = 0xE2D2
+0x8662 = 0xE2D3
+0x8663 = 0xE2D4
+0x8664 = 0xE2D5
+0x8665 = 0xE2D6
+0x8666 = 0xE2D7
+0x8667 = 0xE2D8
+0x8668 = 0xE2D9
+0x8669 = 0xE2DA
+0x866A = 0xE2DB
+0x866B = 0xE2DC
+0x866C = 0xE2DD
+0x866D = 0xE2DE
+0x866E = 0xE2DF
+0x866F = 0xE2E0
+0x8670 = 0xE2E1
+0x8671 = 0xE2E2
+0x8672 = 0xE2E3
+0x8673 = 0xE2E4
+0x8674 = 0xE2E5
+0x8675 = 0xE2E6
+0x8676 = 0xE2E7
+0x8677 = 0xE2E8
+0x8678 = 0xE2E9
+0x8679 = 0xE2EA
+0x867A = 0xE2EB
+0x867B = 0xE2EC
+0x867C = 0xE2ED
+0x867D = 0xE2EE
+0x867E = 0xE2EF
+0x8721 = 0xE2F0
+0x8722 = 0xE2F1
+0x8723 = 0xE2F2
+0x8724 = 0xE2F3
+0x8725 = 0xE2F4
+0x8726 = 0xE2F5
+0x8727 = 0xE2F6
+0x8728 = 0xE2F7
+0x8729 = 0xE2F8
+0x872A = 0xE2F9
+0x872B = 0xE2FA
+0x872C = 0xE2FB
+0x872D = 0xE2FC
+0x872E = 0xE2FD
+0x872F = 0xE2FE
+0x8730 = 0xE2FF
+0x8731 = 0xE300
+0x8732 = 0xE301
+0x8733 = 0xE302
+0x8734 = 0xE303
+0x8735 = 0xE304
+0x8736 = 0xE305
+0x8737 = 0xE306
+0x8738 = 0xE307
+0x8739 = 0xE308
+0x873A = 0xE309
+0x873B = 0xE30A
+0x873C = 0xE30B
+0x873D = 0xE30C
+0x873E = 0xE30D
+0x873F = 0xE30E
+0x8740 = 0xE30F
+0x8741 = 0xE310
+0x8742 = 0xE311
+0x8743 = 0xE312
+0x8744 = 0xE313
+0x8745 = 0xE314
+0x8746 = 0xE315
+0x8747 = 0xE316
+0x8748 = 0xE317
+0x8749 = 0xE318
+0x874A = 0xE319
+0x874B = 0xE31A
+0x874C = 0xE31B
+0x874D = 0xE31C
+0x874E = 0xE31D
+0x874F = 0xE31E
+0x8750 = 0xE31F
+0x8751 = 0xE320
+0x8752 = 0xE321
+0x8753 = 0xE322
+0x8754 = 0xE323
+0x8755 = 0xE324
+0x8756 = 0xE325
+0x8757 = 0xE326
+0x8758 = 0xE327
+0x8759 = 0xE328
+0x875A = 0xE329
+0x875B = 0xE32A
+0x875C = 0xE32B
+0x875D = 0xE32C
+0x875E = 0xE32D
+0x875F = 0xE32E
+0x8760 = 0xE32F
+0x8761 = 0xE330
+0x8762 = 0xE331
+0x8763 = 0xE332
+0x8764 = 0xE333
+0x8765 = 0xE334
+0x8766 = 0xE335
+0x8767 = 0xE336
+0x8768 = 0xE337
+0x8769 = 0xE338
+0x876A = 0xE339
+0x876B = 0xE33A
+0x876C = 0xE33B
+0x876D = 0xE33C
+0x876E = 0xE33D
+0x876F = 0xE33E
+0x8770 = 0xE33F
+0x8771 = 0xE340
+0x8772 = 0xE341
+0x8773 = 0xE342
+0x8774 = 0xE343
+0x8775 = 0xE344
+0x8776 = 0xE345
+0x8777 = 0xE346
+0x8778 = 0xE347
+0x8779 = 0xE348
+0x877A = 0xE349
+0x877B = 0xE34A
+0x877C = 0xE34B
+0x877D = 0xE34C
+0x877E = 0xE34D
+0x8821 = 0xE34E
+0x8822 = 0xE34F
+0x8823 = 0xE350
+0x8824 = 0xE351
+0x8825 = 0xE352
+0x8826 = 0xE353
+0x8827 = 0xE354
+0x8828 = 0xE355
+0x8829 = 0xE356
+0x882A = 0xE357
+0x882B = 0xE358
+0x882C = 0xE359
+0x882D = 0xE35A
+0x882E = 0xE35B
+0x882F = 0xE35C
+0x8830 = 0xE35D
+0x8831 = 0xE35E
+0x8832 = 0xE35F
+0x8833 = 0xE360
+0x8834 = 0xE361
+0x8835 = 0xE362
+0x8836 = 0xE363
+0x8837 = 0xE364
+0x8838 = 0xE365
+0x8839 = 0xE366
+0x883A = 0xE367
+0x883B = 0xE368
+0x883C = 0xE369
+0x883D = 0xE36A
+0x883E = 0xE36B
+0x883F = 0xE36C
+0x8840 = 0xE36D
+0x8841 = 0xE36E
+0x8842 = 0xE36F
+0x8843 = 0xE370
+0x8844 = 0xE371
+0x8845 = 0xE372
+0x8846 = 0xE373
+0x8847 = 0xE374
+0x8848 = 0xE375
+0x8849 = 0xE376
+0x884A = 0xE377
+0x884B = 0xE378
+0x884C = 0xE379
+0x884D = 0xE37A
+0x884E = 0xE37B
+0x884F = 0xE37C
+0x8850 = 0xE37D
+0x8851 = 0xE37E
+0x8852 = 0xE37F
+0x8853 = 0xE380
+0x8854 = 0xE381
+0x8855 = 0xE382
+0x8856 = 0xE383
+0x8857 = 0xE384
+0x8858 = 0xE385
+0x8859 = 0xE386
+0x885A = 0xE387
+0x885B = 0xE388
+0x885C = 0xE389
+0x885D = 0xE38A
+0x885E = 0xE38B
+0x885F = 0xE38C
+0x8860 = 0xE38D
+0x8861 = 0xE38E
+0x8862 = 0xE38F
+0x8863 = 0xE390
+0x8864 = 0xE391
+0x8865 = 0xE392
+0x8866 = 0xE393
+0x8867 = 0xE394
+0x8868 = 0xE395
+0x8869 = 0xE396
+0x886A = 0xE397
+0x886B = 0xE398
+0x886C = 0xE399
+0x886D = 0xE39A
+0x886E = 0xE39B
+0x886F = 0xE39C
+0x8870 = 0xE39D
+0x8871 = 0xE39E
+0x8872 = 0xE39F
+0x8873 = 0xE3A0
+0x8874 = 0xE3A1
+0x8875 = 0xE3A2
+0x8876 = 0xE3A3
+0x8877 = 0xE3A4
+0x8878 = 0xE3A5
+0x8879 = 0xE3A6
+0x887A = 0xE3A7
+0x887B = 0xE3A8
+0x887C = 0xE3A9
+0x887D = 0xE3AA
+0x887E = 0xE3AB
+0x8921 = 0xE3AC
+0x8922 = 0xE3AD
+0x8923 = 0xE3AE
+0x8924 = 0xE3AF
+0x8925 = 0xE3B0
+0x8926 = 0xE3B1
+0x8927 = 0xE3B2
+0x8928 = 0xE3B3
+0x8929 = 0xE3B4
+0x892A = 0xE3B5
+0x892B = 0xE3B6
+0x892C = 0xE3B7
+0x892D = 0xE3B8
+0x892E = 0xE3B9
+0x892F = 0xE3BA
+0x8930 = 0xE3BB
+0x8931 = 0xE3BC
+0x8932 = 0xE3BD
+0x8933 = 0xE3BE
+0x8934 = 0xE3BF
+0x8935 = 0xE3C0
+0x8936 = 0xE3C1
+0x8937 = 0xE3C2
+0x8938 = 0xE3C3
+0x8939 = 0xE3C4
+0x893A = 0xE3C5
+0x893B = 0xE3C6
+0x893C = 0xE3C7
+0x893D = 0xE3C8
+0x893E = 0xE3C9
+0x893F = 0xE3CA
+0x8940 = 0xE3CB
+0x8941 = 0xE3CC
+0x8942 = 0xE3CD
+0x8943 = 0xE3CE
+0x8944 = 0xE3CF
+0x8945 = 0xE3D0
+0x8946 = 0xE3D1
+0x8947 = 0xE3D2
+0x8948 = 0xE3D3
+0x8949 = 0xE3D4
+0x894A = 0xE3D5
+0x894B = 0xE3D6
+0x894C = 0xE3D7
+0x894D = 0xE3D8
+0x894E = 0xE3D9
+0x894F = 0xE3DA
+0x8950 = 0xE3DB
+0x8951 = 0xE3DC
+0x8952 = 0xE3DD
+0x8953 = 0xE3DE
+0x8954 = 0xE3DF
+0x8955 = 0xE3E0
+0x8956 = 0xE3E1
+0x8957 = 0xE3E2
+0x8958 = 0xE3E3
+0x8959 = 0xE3E4
+0x895A = 0xE3E5
+0x895B = 0xE3E6
+0x895C = 0xE3E7
+0x895D = 0xE3E8
+0x895E = 0xE3E9
+0x895F = 0xE3EA
+0x8960 = 0xE3EB
+0x8961 = 0xE3EC
+0x8962 = 0xE3ED
+0x8963 = 0xE3EE
+0x8964 = 0xE3EF
+0x8965 = 0xE3F0
+0x8966 = 0xE3F1
+0x8967 = 0xE3F2
+0x8968 = 0xE3F3
+0x8969 = 0xE3F4
+0x896A = 0xE3F5
+0x896B = 0xE3F6
+0x896C = 0xE3F7
+0x896D = 0xE3F8
+0x896E = 0xE3F9
+0x896F = 0xE3FA
+0x8970 = 0xE3FB
+0x8971 = 0xE3FC
+0x8972 = 0xE3FD
+0x8973 = 0xE3FE
+0x8974 = 0xE3FF
+0x8975 = 0xE400
+0x8976 = 0xE401
+0x8977 = 0xE402
+0x8978 = 0xE403
+0x8979 = 0xE404
+0x897A = 0xE405
+0x897B = 0xE406
+0x897C = 0xE407
+0x897D = 0xE408
+0x897E = 0xE409
+0x8A21 = 0xE40A
+0x8A22 = 0xE40B
+0x8A23 = 0xE40C
+0x8A24 = 0xE40D
+0x8A25 = 0xE40E
+0x8A26 = 0xE40F
+0x8A27 = 0xE410
+0x8A28 = 0xE411
+0x8A29 = 0xE412
+0x8A2A = 0xE413
+0x8A2B = 0xE414
+0x8A2C = 0xE415
+0x8A2D = 0xE416
+0x8A2E = 0xE417
+0x8A2F = 0xE418
+0x8A30 = 0xE419
+0x8A31 = 0xE41A
+0x8A32 = 0xE41B
+0x8A33 = 0xE41C
+0x8A34 = 0xE41D
+0x8A35 = 0xE41E
+0x8A36 = 0xE41F
+0x8A37 = 0xE420
+0x8A38 = 0xE421
+0x8A39 = 0xE422
+0x8A3A = 0xE423
+0x8A3B = 0xE424
+0x8A3C = 0xE425
+0x8A3D = 0xE426
+0x8A3E = 0xE427
+0x8A3F = 0xE428
+0x8A40 = 0xE429
+0x8A41 = 0xE42A
+0x8A42 = 0xE42B
+0x8A43 = 0xE42C
+0x8A44 = 0xE42D
+0x8A45 = 0xE42E
+0x8A46 = 0xE42F
+0x8A47 = 0xE430
+0x8A48 = 0xE431
+0x8A49 = 0xE432
+0x8A4A = 0xE433
+0x8A4B = 0xE434
+0x8A4C = 0xE435
+0x8A4D = 0xE436
+0x8A4E = 0xE437
+0x8A4F = 0xE438
+0x8A50 = 0xE439
+0x8A51 = 0xE43A
+0x8A52 = 0xE43B
+0x8A53 = 0xE43C
+0x8A54 = 0xE43D
+0x8A55 = 0xE43E
+0x8A56 = 0xE43F
+0x8A57 = 0xE440
+0x8A58 = 0xE441
+0x8A59 = 0xE442
+0x8A5A = 0xE443
+0x8A5B = 0xE444
+0x8A5C = 0xE445
+0x8A5D = 0xE446
+0x8A5E = 0xE447
+0x8A5F = 0xE448
+0x8A60 = 0xE449
+0x8A61 = 0xE44A
+0x8A62 = 0xE44B
+0x8A63 = 0xE44C
+0x8A64 = 0xE44D
+0x8A65 = 0xE44E
+0x8A66 = 0xE44F
+0x8A67 = 0xE450
+0x8A68 = 0xE451
+0x8A69 = 0xE452
+0x8A6A = 0xE453
+0x8A6B = 0xE454
+0x8A6C = 0xE455
+0x8A6D = 0xE456
+0x8A6E = 0xE457
+0x8A6F = 0xE458
+0x8A70 = 0xE459
+0x8A71 = 0xE45A
+0x8A72 = 0xE45B
+0x8A73 = 0xE45C
+0x8A74 = 0xE45D
+0x8A75 = 0xE45E
+0x8A76 = 0xE45F
+0x8A77 = 0xE460
+0x8A78 = 0xE461
+0x8A79 = 0xE462
+0x8A7A = 0xE463
+0x8A7B = 0xE464
+0x8A7C = 0xE465
+0x8A7D = 0xE466
+0x8A7E = 0xE467
+0x8B21 = 0xE468
+0x8B22 = 0xE469
+0x8B23 = 0xE46A
+0x8B24 = 0xE46B
+0x8B25 = 0xE46C
+0x8B26 = 0xE46D
+0x8B27 = 0xE46E
+0x8B28 = 0xE46F
+0x8B29 = 0xE470
+0x8B2A = 0xE471
+0x8B2B = 0xE472
+0x8B2C = 0xE473
+0x8B2D = 0xE474
+0x8B2E = 0xE475
+0x8B2F = 0xE476
+0x8B30 = 0xE477
+0x8B31 = 0xE478
+0x8B32 = 0xE479
+0x8B33 = 0xE47A
+0x8B34 = 0xE47B
+0x8B35 = 0xE47C
+0x8B36 = 0xE47D
+0x8B37 = 0xE47E
+0x8B38 = 0xE47F
+0x8B39 = 0xE480
+0x8B3A = 0xE481
+0x8B3B = 0xE482
+0x8B3C = 0xE483
+0x8B3D = 0xE484
+0x8B3E = 0xE485
+0x8B3F = 0xE486
+0x8B40 = 0xE487
+0x8B41 = 0xE488
+0x8B42 = 0xE489
+0x8B43 = 0xE48A
+0x8B44 = 0xE48B
+0x8B45 = 0xE48C
+0x8B46 = 0xE48D
+0x8B47 = 0xE48E
+0x8B48 = 0xE48F
+0x8B49 = 0xE490
+0x8B4A = 0xE491
+0x8B4B = 0xE492
+0x8B4C = 0xE493
+0x8B4D = 0xE494
+0x8B4E = 0xE495
+0x8B4F = 0xE496
+0x8B50 = 0xE497
+0x8B51 = 0xE498
+0x8B52 = 0xE499
+0x8B53 = 0xE49A
+0x8B54 = 0xE49B
+0x8B55 = 0xE49C
+0x8B56 = 0xE49D
+0x8B57 = 0xE49E
+0x8B58 = 0xE49F
+0x8B59 = 0xE4A0
+0x8B5A = 0xE4A1
+0x8B5B = 0xE4A2
+0x8B5C = 0xE4A3
+0x8B5D = 0xE4A4
+0x8B5E = 0xE4A5
+0x8B5F = 0xE4A6
+0x8B60 = 0xE4A7
+0x8B61 = 0xE4A8
+0x8B62 = 0xE4A9
+0x8B63 = 0xE4AA
+0x8B64 = 0xE4AB
+0x8B65 = 0xE4AC
+0x8B66 = 0xE4AD
+0x8B67 = 0xE4AE
+0x8B68 = 0xE4AF
+0x8B69 = 0xE4B0
+0x8B6A = 0xE4B1
+0x8B6B = 0xE4B2
+0x8B6C = 0xE4B3
+0x8B6D = 0xE4B4
+0x8B6E = 0xE4B5
+0x8B6F = 0xE4B6
+0x8B70 = 0xE4B7
+0x8B71 = 0xE4B8
+0x8B72 = 0xE4B9
+0x8B73 = 0xE4BA
+0x8B74 = 0xE4BB
+0x8B75 = 0xE4BC
+0x8B76 = 0xE4BD
+0x8B77 = 0xE4BE
+0x8B78 = 0xE4BF
+0x8B79 = 0xE4C0
+0x8B7A = 0xE4C1
+0x8B7B = 0xE4C2
+0x8B7C = 0xE4C3
+0x8B7D = 0xE4C4
+0x8B7E = 0xE4C5
+0x8C21 = 0xE4C6
+0x8C22 = 0xE4C7
+0x8C23 = 0xE4C8
+0x8C24 = 0xE4C9
+0x8C25 = 0xE4CA
+0x8C26 = 0xE4CB
+0x8C27 = 0xE4CC
+0x8C28 = 0xE4CD
+0x8C29 = 0xE4CE
+0x8C2A = 0xE4CF
+0x8C2B = 0xE4D0
+0x8C2C = 0xE4D1
+0x8C2D = 0xE4D2
+0x8C2E = 0xE4D3
+0x8C2F = 0xE4D4
+0x8C30 = 0xE4D5
+0x8C31 = 0xE4D6
+0x8C32 = 0xE4D7
+0x8C33 = 0xE4D8
+0x8C34 = 0xE4D9
+0x8C35 = 0xE4DA
+0x8C36 = 0xE4DB
+0x8C37 = 0xE4DC
+0x8C38 = 0xE4DD
+0x8C39 = 0xE4DE
+0x8C3A = 0xE4DF
+0x8C3B = 0xE4E0
+0x8C3C = 0xE4E1
+0x8C3D = 0xE4E2
+0x8C3E = 0xE4E3
+0x8C3F = 0xE4E4
+0x8C40 = 0xE4E5
+0x8C41 = 0xE4E6
+0x8C42 = 0xE4E7
+0x8C43 = 0xE4E8
+0x8C44 = 0xE4E9
+0x8C45 = 0xE4EA
+0x8C46 = 0xE4EB
+0x8C47 = 0xE4EC
+0x8C48 = 0xE4ED
+0x8C49 = 0xE4EE
+0x8C4A = 0xE4EF
+0x8C4B = 0xE4F0
+0x8C4C = 0xE4F1
+0x8C4D = 0xE4F2
+0x8C4E = 0xE4F3
+0x8C4F = 0xE4F4
+0x8C50 = 0xE4F5
+0x8C51 = 0xE4F6
+0x8C52 = 0xE4F7
+0x8C53 = 0xE4F8
+0x8C54 = 0xE4F9
+0x8C55 = 0xE4FA
+0x8C56 = 0xE4FB
+0x8C57 = 0xE4FC
+0x8C58 = 0xE4FD
+0x8C59 = 0xE4FE
+0x8C5A = 0xE4FF
+0x8C5B = 0xE500
+0x8C5C = 0xE501
+0x8C5D = 0xE502
+0x8C5E = 0xE503
+0x8C5F = 0xE504
+0x8C60 = 0xE505
+0x8C61 = 0xE506
+0x8C62 = 0xE507
+0x8C63 = 0xE508
+0x8C64 = 0xE509
+0x8C65 = 0xE50A
+0x8C66 = 0xE50B
+0x8C67 = 0xE50C
+0x8C68 = 0xE50D
+0x8C69 = 0xE50E
+0x8C6A = 0xE50F
+0x8C6B = 0xE510
+0x8C6C = 0xE511
+0x8C6D = 0xE512
+0x8C6E = 0xE513
+0x8C6F = 0xE514
+0x8C70 = 0xE515
+0x8C71 = 0xE516
+0x8C72 = 0xE517
+0x8C73 = 0xE518
+0x8C74 = 0xE519
+0x8C75 = 0xE51A
+0x8C76 = 0xE51B
+0x8C77 = 0xE51C
+0x8C78 = 0xE51D
+0x8C79 = 0xE51E
+0x8C7A = 0xE51F
+0x8C7B = 0xE520
+0x8C7C = 0xE521
+0x8C7D = 0xE522
+0x8C7E = 0xE523
+0x8D21 = 0xE524
+0x8D22 = 0xE525
+0x8D23 = 0xE526
+0x8D24 = 0xE527
+0x8D25 = 0xE528
+0x8D26 = 0xE529
+0x8D27 = 0xE52A
+0x8D28 = 0xE52B
+0x8D29 = 0xE52C
+0x8D2A = 0xE52D
+0x8D2B = 0xE52E
+0x8D2C = 0xE52F
+0x8D2D = 0xE530
+0x8D2E = 0xE531
+0x8D2F = 0xE532
+0x8D30 = 0xE533
+0x8D31 = 0xE534
+0x8D32 = 0xE535
+0x8D33 = 0xE536
+0x8D34 = 0xE537
+0x8D35 = 0xE538
+0x8D36 = 0xE539
+0x8D37 = 0xE53A
+0x8D38 = 0xE53B
+0x8D39 = 0xE53C
+0x8D3A = 0xE53D
+0x8D3B = 0xE53E
+0x8D3C = 0xE53F
+0x8D3D = 0xE540
+0x8D3E = 0xE541
+0x8D3F = 0xE542
+0x8D40 = 0xE543
+0x8D41 = 0xE544
+0x8D42 = 0xE545
+0x8D43 = 0xE546
+0x8D44 = 0xE547
+0x8D45 = 0xE548
+0x8D46 = 0xE549
+0x8D47 = 0xE54A
+0x8D48 = 0xE54B
+0x8D49 = 0xE54C
+0x8D4A = 0xE54D
+0x8D4B = 0xE54E
+0x8D4C = 0xE54F
+0x8D4D = 0xE550
+0x8D4E = 0xE551
+0x8D4F = 0xE552
+0x8D50 = 0xE553
+0x8D51 = 0xE554
+0x8D52 = 0xE555
+0x8D53 = 0xE556
+0x8D54 = 0xE557
+0x8D55 = 0xE558
+0x8D56 = 0xE559
+0x8D57 = 0xE55A
+0x8D58 = 0xE55B
+0x8D59 = 0xE55C
+0x8D5A = 0xE55D
+0x8D5B = 0xE55E
+0x8D5C = 0xE55F
+0x8D5D = 0xE560
+0x8D5E = 0xE561
+0x8D5F = 0xE562
+0x8D60 = 0xE563
+0x8D61 = 0xE564
+0x8D62 = 0xE565
+0x8D63 = 0xE566
+0x8D64 = 0xE567
+0x8D65 = 0xE568
+0x8D66 = 0xE569
+0x8D67 = 0xE56A
+0x8D68 = 0xE56B
+0x8D69 = 0xE56C
+0x8D6A = 0xE56D
+0x8D6B = 0xE56E
+0x8D6C = 0xE56F
+0x8D6D = 0xE570
+0x8D6E = 0xE571
+0x8D6F = 0xE572
+0x8D70 = 0xE573
+0x8D71 = 0xE574
+0x8D72 = 0xE575
+0x8D73 = 0xE576
+0x8D74 = 0xE577
+0x8D75 = 0xE578
+0x8D76 = 0xE579
+0x8D77 = 0xE57A
+0x8D78 = 0xE57B
+0x8D79 = 0xE57C
+0x8D7A = 0xE57D
+0x8D7B = 0xE57E
+0x8D7C = 0xE57F
+0x8D7D = 0xE580
+0x8D7E = 0xE581
+0x8E21 = 0xE582
+0x8E22 = 0xE583
+0x8E23 = 0xE584
+0x8E24 = 0xE585
+0x8E25 = 0xE586
+0x8E26 = 0xE587
+0x8E27 = 0xE588
+0x8E28 = 0xE589
+0x8E29 = 0xE58A
+0x8E2A = 0xE58B
+0x8E2B = 0xE58C
+0x8E2C = 0xE58D
+0x8E2D = 0xE58E
+0x8E2E = 0xE58F
+0x8E2F = 0xE590
+0x8E30 = 0xE591
+0x8E31 = 0xE592
+0x8E32 = 0xE593
+0x8E33 = 0xE594
+0x8E34 = 0xE595
+0x8E35 = 0xE596
+0x8E36 = 0xE597
+0x8E37 = 0xE598
+0x8E38 = 0xE599
+0x8E39 = 0xE59A
+0x8E3A = 0xE59B
+0x8E3B = 0xE59C
+0x8E3C = 0xE59D
+0x8E3D = 0xE59E
+0x8E3E = 0xE59F
+0x8E3F = 0xE5A0
+0x8E40 = 0xE5A1
+0x8E41 = 0xE5A2
+0x8E42 = 0xE5A3
+0x8E43 = 0xE5A4
+0x8E44 = 0xE5A5
+0x8E45 = 0xE5A6
+0x8E46 = 0xE5A7
+0x8E47 = 0xE5A8
+0x8E48 = 0xE5A9
+0x8E49 = 0xE5AA
+0x8E4A = 0xE5AB
+0x8E4B = 0xE5AC
+0x8E4C = 0xE5AD
+0x8E4D = 0xE5AE
+0x8E4E = 0xE5AF
+0x8E4F = 0xE5B0
+0x8E50 = 0xE5B1
+0x8E51 = 0xE5B2
+0x8E52 = 0xE5B3
+0x8E53 = 0xE5B4
+0x8E54 = 0xE5B5
+0x8E55 = 0xE5B6
+0x8E56 = 0xE5B7
+0x8E57 = 0xE5B8
+0x8E58 = 0xE5B9
+0x8E59 = 0xE5BA
+0x8E5A = 0xE5BB
+0x8E5B = 0xE5BC
+0x8E5C = 0xE5BD
+0x8E5D = 0xE5BE
+0x8E5E = 0xE5BF
+0x8E5F = 0xE5C0
+0x8E60 = 0xE5C1
+0x8E61 = 0xE5C2
+0x8E62 = 0xE5C3
+0x8E63 = 0xE5C4
+0x8E64 = 0xE5C5
+0x8E65 = 0xE5C6
+0x8E66 = 0xE5C7
+0x8E67 = 0xE5C8
+0x8E68 = 0xE5C9
+0x8E69 = 0xE5CA
+0x8E6A = 0xE5CB
+0x8E6B = 0xE5CC
+0x8E6C = 0xE5CD
+0x8E6D = 0xE5CE
+0x8E6E = 0xE5CF
+0x8E6F = 0xE5D0
+0x8E70 = 0xE5D1
+0x8E71 = 0xE5D2
+0x8E72 = 0xE5D3
+0x8E73 = 0xE5D4
+0x8E74 = 0xE5D5
+0x8E75 = 0xE5D6
+0x8E76 = 0xE5D7
+0x8E77 = 0xE5D8
+0x8E78 = 0xE5D9
+0x8E79 = 0xE5DA
+0x8E7A = 0xE5DB
+0x8E7B = 0xE5DC
+0x8E7C = 0xE5DD
+0x8E7D = 0xE5DE
+0x8E7E = 0xE5DF
+0x8F21 = 0xE5E0
+0x8F22 = 0xE5E1
+0x8F23 = 0xE5E2
+0x8F24 = 0xE5E3
+0x8F25 = 0xE5E4
+0x8F26 = 0xE5E5
+0x8F27 = 0xE5E6
+0x8F28 = 0xE5E7
+0x8F29 = 0xE5E8
+0x8F2A = 0xE5E9
+0x8F2B = 0xE5EA
+0x8F2C = 0xE5EB
+0x8F2D = 0xE5EC
+0x8F2E = 0xE5ED
+0x8F2F = 0xE5EE
+0x8F30 = 0xE5EF
+0x8F31 = 0xE5F0
+0x8F32 = 0xE5F1
+0x8F33 = 0xE5F2
+0x8F34 = 0xE5F3
+0x8F35 = 0xE5F4
+0x8F36 = 0xE5F5
+0x8F37 = 0xE5F6
+0x8F38 = 0xE5F7
+0x8F39 = 0xE5F8
+0x8F3A = 0xE5F9
+0x8F3B = 0xE5FA
+0x8F3C = 0xE5FB
+0x8F3D = 0xE5FC
+0x8F3E = 0xE5FD
+0x8F3F = 0xE5FE
+0x8F40 = 0xE5FF
+0x8F41 = 0xE600
+0x8F42 = 0xE601
+0x8F43 = 0xE602
+0x8F44 = 0xE603
+0x8F45 = 0xE604
+0x8F46 = 0xE605
+0x8F47 = 0xE606
+0x8F48 = 0xE607
+0x8F49 = 0xE608
+0x8F4A = 0xE609
+0x8F4B = 0xE60A
+0x8F4C = 0xE60B
+0x8F4D = 0xE60C
+0x8F4E = 0xE60D
+0x8F4F = 0xE60E
+0x8F50 = 0xE60F
+0x8F51 = 0xE610
+0x8F52 = 0xE611
+0x8F53 = 0xE612
+0x8F54 = 0xE613
+0x8F55 = 0xE614
+0x8F56 = 0xE615
+0x8F57 = 0xE616
+0x8F58 = 0xE617
+0x8F59 = 0xE618
+0x8F5A = 0xE619
+0x8F5B = 0xE61A
+0x8F5C = 0xE61B
+0x8F5D = 0xE61C
+0x8F5E = 0xE61D
+0x8F5F = 0xE61E
+0x8F60 = 0xE61F
+0x8F61 = 0xE620
+0x8F62 = 0xE621
+0x8F63 = 0xE622
+0x8F64 = 0xE623
+0x8F65 = 0xE624
+0x8F66 = 0xE625
+0x8F67 = 0xE626
+0x8F68 = 0xE627
+0x8F69 = 0xE628
+0x8F6A = 0xE629
+0x8F6B = 0xE62A
+0x8F6C = 0xE62B
+0x8F6D = 0xE62C
+0x8F6E = 0xE62D
+0x8F6F = 0xE62E
+0x8F70 = 0xE62F
+0x8F71 = 0xE630
+0x8F72 = 0xE631
+0x8F73 = 0xE632
+0x8F74 = 0xE633
+0x8F75 = 0xE634
+0x8F76 = 0xE635
+0x8F77 = 0xE636
+0x8F78 = 0xE637
+0x8F79 = 0xE638
+0x8F7A = 0xE639
+0x8F7B = 0xE63A
+0x8F7C = 0xE63B
+0x8F7D = 0xE63C
+0x8F7E = 0xE63D
+0x9021 = 0xE63E
+0x9022 = 0xE63F
+0x9023 = 0xE640
+0x9024 = 0xE641
+0x9025 = 0xE642
+0x9026 = 0xE643
+0x9027 = 0xE644
+0x9028 = 0xE645
+0x9029 = 0xE646
+0x902A = 0xE647
+0x902B = 0xE648
+0x902C = 0xE649
+0x902D = 0xE64A
+0x902E = 0xE64B
+0x902F = 0xE64C
+0x9030 = 0xE64D
+0x9031 = 0xE64E
+0x9032 = 0xE64F
+0x9033 = 0xE650
+0x9034 = 0xE651
+0x9035 = 0xE652
+0x9036 = 0xE653
+0x9037 = 0xE654
+0x9038 = 0xE655
+0x9039 = 0xE656
+0x903A = 0xE657
+0x903B = 0xE658
+0x903C = 0xE659
+0x903D = 0xE65A
+0x903E = 0xE65B
+0x903F = 0xE65C
+0x9040 = 0xE65D
+0x9041 = 0xE65E
+0x9042 = 0xE65F
+0x9043 = 0xE660
+0x9044 = 0xE661
+0x9045 = 0xE662
+0x9046 = 0xE663
+0x9047 = 0xE664
+0x9048 = 0xE665
+0x9049 = 0xE666
+0x904A = 0xE667
+0x904B = 0xE668
+0x904C = 0xE669
+0x904D = 0xE66A
+0x904E = 0xE66B
+0x904F = 0xE66C
+0x9050 = 0xE66D
+0x9051 = 0xE66E
+0x9052 = 0xE66F
+0x9053 = 0xE670
+0x9054 = 0xE671
+0x9055 = 0xE672
+0x9056 = 0xE673
+0x9057 = 0xE674
+0x9058 = 0xE675
+0x9059 = 0xE676
+0x905A = 0xE677
+0x905B = 0xE678
+0x905C = 0xE679
+0x905D = 0xE67A
+0x905E = 0xE67B
+0x905F = 0xE67C
+0x9060 = 0xE67D
+0x9061 = 0xE67E
+0x9062 = 0xE67F
+0x9063 = 0xE680
+0x9064 = 0xE681
+0x9065 = 0xE682
+0x9066 = 0xE683
+0x9067 = 0xE684
+0x9068 = 0xE685
+0x9069 = 0xE686
+0x906A = 0xE687
+0x906B = 0xE688
+0x906C = 0xE689
+0x906D = 0xE68A
+0x906E = 0xE68B
+0x906F = 0xE68C
+0x9070 = 0xE68D
+0x9071 = 0xE68E
+0x9072 = 0xE68F
+0x9073 = 0xE690
+0x9074 = 0xE691
+0x9075 = 0xE692
+0x9076 = 0xE693
+0x9077 = 0xE694
+0x9078 = 0xE695
+0x9079 = 0xE696
+0x907A = 0xE697
+0x907B = 0xE698
+0x907C = 0xE699
+0x907D = 0xE69A
+0x907E = 0xE69B
+0x9121 = 0xE69C
+0x9122 = 0xE69D
+0x9123 = 0xE69E
+0x9124 = 0xE69F
+0x9125 = 0xE6A0
+0x9126 = 0xE6A1
+0x9127 = 0xE6A2
+0x9128 = 0xE6A3
+0x9129 = 0xE6A4
+0x912A = 0xE6A5
+0x912B = 0xE6A6
+0x912C = 0xE6A7
+0x912D = 0xE6A8
+0x912E = 0xE6A9
+0x912F = 0xE6AA
+0x9130 = 0xE6AB
+0x9131 = 0xE6AC
+0x9132 = 0xE6AD
+0x9133 = 0xE6AE
+0x9134 = 0xE6AF
+0x9135 = 0xE6B0
+0x9136 = 0xE6B1
+0x9137 = 0xE6B2
+0x9138 = 0xE6B3
+0x9139 = 0xE6B4
+0x913A = 0xE6B5
+0x913B = 0xE6B6
+0x913C = 0xE6B7
+0x913D = 0xE6B8
+0x913E = 0xE6B9
+0x913F = 0xE6BA
+0x9140 = 0xE6BB
+0x9141 = 0xE6BC
+0x9142 = 0xE6BD
+0x9143 = 0xE6BE
+0x9144 = 0xE6BF
+0x9145 = 0xE6C0
+0x9146 = 0xE6C1
+0x9147 = 0xE6C2
+0x9148 = 0xE6C3
+0x9149 = 0xE6C4
+0x914A = 0xE6C5
+0x914B = 0xE6C6
+0x914C = 0xE6C7
+0x914D = 0xE6C8
+0x914E = 0xE6C9
+0x914F = 0xE6CA
+0x9150 = 0xE6CB
+0x9151 = 0xE6CC
+0x9152 = 0xE6CD
+0x9153 = 0xE6CE
+0x9154 = 0xE6CF
+0x9155 = 0xE6D0
+0x9156 = 0xE6D1
+0x9157 = 0xE6D2
+0x9158 = 0xE6D3
+0x9159 = 0xE6D4
+0x915A = 0xE6D5
+0x915B = 0xE6D6
+0x915C = 0xE6D7
+0x915D = 0xE6D8
+0x915E = 0xE6D9
+0x915F = 0xE6DA
+0x9160 = 0xE6DB
+0x9161 = 0xE6DC
+0x9162 = 0xE6DD
+0x9163 = 0xE6DE
+0x9164 = 0xE6DF
+0x9165 = 0xE6E0
+0x9166 = 0xE6E1
+0x9167 = 0xE6E2
+0x9168 = 0xE6E3
+0x9169 = 0xE6E4
+0x916A = 0xE6E5
+0x916B = 0xE6E6
+0x916C = 0xE6E7
+0x916D = 0xE6E8
+0x916E = 0xE6E9
+0x916F = 0xE6EA
+0x9170 = 0xE6EB
+0x9171 = 0xE6EC
+0x9172 = 0xE6ED
+0x9173 = 0xE6EE
+0x9174 = 0xE6EF
+0x9175 = 0xE6F0
+0x9176 = 0xE6F1
+0x9177 = 0xE6F2
+0x9178 = 0xE6F3
+0x9179 = 0xE6F4
+0x917A = 0xE6F5
+0x917B = 0xE6F6
+0x917C = 0xE6F7
+0x917D = 0xE6F8
+0x917E = 0xE6F9
+0x9221 = 0xE6FA
+0x9222 = 0xE6FB
+0x9223 = 0xE6FC
+0x9224 = 0xE6FD
+0x9225 = 0xE6FE
+0x9226 = 0xE6FF
+0x9227 = 0xE700
+0x9228 = 0xE701
+0x9229 = 0xE702
+0x922A = 0xE703
+0x922B = 0xE704
+0x922C = 0xE705
+0x922D = 0xE706
+0x922E = 0xE707
+0x922F = 0xE708
+0x9230 = 0xE709
+0x9231 = 0xE70A
+0x9232 = 0xE70B
+0x9233 = 0xE70C
+0x9234 = 0xE70D
+0x9235 = 0xE70E
+0x9236 = 0xE70F
+0x9237 = 0xE710
+0x9238 = 0xE711
+0x9239 = 0xE712
+0x923A = 0xE713
+0x923B = 0xE714
+0x923C = 0xE715
+0x923D = 0xE716
+0x923E = 0xE717
+0x923F = 0xE718
+0x9240 = 0xE719
+0x9241 = 0xE71A
+0x9242 = 0xE71B
+0x9243 = 0xE71C
+0x9244 = 0xE71D
+0x9245 = 0xE71E
+0x9246 = 0xE71F
+0x9247 = 0xE720
+0x9248 = 0xE721
+0x9249 = 0xE722
+0x924A = 0xE723
+0x924B = 0xE724
+0x924C = 0xE725
+0x924D = 0xE726
+0x924E = 0xE727
+0x924F = 0xE728
+0x9250 = 0xE729
+0x9251 = 0xE72A
+0x9252 = 0xE72B
+0x9253 = 0xE72C
+0x9254 = 0xE72D
+0x9255 = 0xE72E
+0x9256 = 0xE72F
+0x9257 = 0xE730
+0x9258 = 0xE731
+0x9259 = 0xE732
+0x925A = 0xE733
+0x925B = 0xE734
+0x925C = 0xE735
+0x925D = 0xE736
+0x925E = 0xE737
+0x925F = 0xE738
+0x9260 = 0xE739
+0x9261 = 0xE73A
+0x9262 = 0xE73B
+0x9263 = 0xE73C
+0x9264 = 0xE73D
+0x9265 = 0xE73E
+0x9266 = 0xE73F
+0x9267 = 0xE740
+0x9268 = 0xE741
+0x9269 = 0xE742
+0x926A = 0xE743
+0x926B = 0xE744
+0x926C = 0xE745
+0x926D = 0xE746
+0x926E = 0xE747
+0x926F = 0xE748
+0x9270 = 0xE749
+0x9271 = 0xE74A
+0x9272 = 0xE74B
+0x9273 = 0xE74C
+0x9274 = 0xE74D
+0x9275 = 0xE74E
+0x9276 = 0xE74F
+0x9277 = 0xE750
+0x9278 = 0xE751
+0x9279 = 0xE752
+0x927A = 0xE753
+0x927B = 0xE754
+0x927C = 0xE755
+0x927D = 0xE756
+0x927E = 0xE757
+END_MAP
diff --git a/enc/trans/CP/CP932VDC@IBM%UCS.src b/enc/trans/CP/CP932VDC@IBM%UCS.src
new file mode 100644
index 0000000000..3b9b360dd4
--- /dev/null
+++ b/enc/trans/CP/CP932VDC@IBM%UCS.src
@@ -0,0 +1,420 @@
+# $NetBSD: CP932VDC@IBM%UCS.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"CP932VDC:IBM/UCS"
+SRC_ZONE	0x93-0x97 / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#    Name:     cp932 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       cpxlate@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp932 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp932 order
+#
+0x9321 = 0x2170
+0x9322 = 0x2171
+0x9323 = 0x2172
+0x9324 = 0x2173
+0x9325 = 0x2174
+0x9326 = 0x2175
+0x9327 = 0x2176
+0x9328 = 0x2177
+0x9329 = 0x2178
+0x932A = 0x2179
+0x932B = 0x2160
+0x932C = 0x2161
+0x932D = 0x2162
+0x932E = 0x2163
+0x932F = 0x2164
+0x9330 = 0x2165
+0x9331 = 0x2166
+0x9332 = 0x2167
+0x9333 = 0x2168
+0x9334 = 0x2169
+0x9335 = 0xFFE2
+0x9336 = 0xFFE4
+0x9337 = 0xFF07
+0x9338 = 0xFF02
+0x9339 = 0x3231
+0x933A = 0x2116
+0x933B = 0x2121
+0x933C = 0x2235
+0x933D = 0x7E8A
+0x933E = 0x891C
+0x933F = 0x9348
+0x9340 = 0x9288
+0x9341 = 0x84DC
+0x9342 = 0x4FC9
+0x9343 = 0x70BB
+0x9344 = 0x6631
+0x9345 = 0x68C8
+0x9346 = 0x92F9
+0x9347 = 0x66FB
+0x9348 = 0x5F45
+0x9349 = 0x4E28
+0x934A = 0x4EE1
+0x934B = 0x4EFC
+0x934C = 0x4F00
+0x934D = 0x4F03
+0x934E = 0x4F39
+0x934F = 0x4F56
+0x9350 = 0x4F92
+0x9351 = 0x4F8A
+0x9352 = 0x4F9A
+0x9353 = 0x4F94
+0x9354 = 0x4FCD
+0x9355 = 0x5040
+0x9356 = 0x5022
+0x9357 = 0x4FFF
+0x9358 = 0x501E
+0x9359 = 0x5046
+0x935A = 0x5070
+0x935B = 0x5042
+0x935C = 0x5094
+0x935D = 0x50F4
+0x935E = 0x50D8
+0x935F = 0x514A
+0x9360 = 0x5164
+0x9361 = 0x519D
+0x9362 = 0x51BE
+0x9363 = 0x51EC
+0x9364 = 0x5215
+0x9365 = 0x529C
+0x9366 = 0x52A6
+0x9367 = 0x52C0
+0x9368 = 0x52DB
+0x9369 = 0x5300
+0x936A = 0x5307
+0x936B = 0x5324
+0x936C = 0x5372
+0x936D = 0x5393
+0x936E = 0x53B2
+0x936F = 0x53DD
+0x9370 = 0xFA0E
+0x9371 = 0x549C
+0x9372 = 0x548A
+0x9373 = 0x54A9
+0x9374 = 0x54FF
+0x9375 = 0x5586
+0x9376 = 0x5759
+0x9377 = 0x5765
+0x9378 = 0x57AC
+0x9379 = 0x57C8
+0x937A = 0x57C7
+0x937B = 0xFA0F
+0x937C = 0xFA10
+0x937D = 0x589E
+0x937E = 0x58B2
+0x9421 = 0x590B
+0x9422 = 0x5953
+0x9423 = 0x595B
+0x9424 = 0x595D
+0x9425 = 0x5963
+0x9426 = 0x59A4
+0x9427 = 0x59BA
+0x9428 = 0x5B56
+0x9429 = 0x5BC0
+0x942A = 0x752F
+0x942B = 0x5BD8
+0x942C = 0x5BEC
+0x942D = 0x5C1E
+0x942E = 0x5CA6
+0x942F = 0x5CBA
+0x9430 = 0x5CF5
+0x9431 = 0x5D27
+0x9432 = 0x5D53
+0x9433 = 0xFA11
+0x9434 = 0x5D42
+0x9435 = 0x5D6D
+0x9436 = 0x5DB8
+0x9437 = 0x5DB9
+0x9438 = 0x5DD0
+0x9439 = 0x5F21
+0x943A = 0x5F34
+0x943B = 0x5F67
+0x943C = 0x5FB7
+0x943D = 0x5FDE
+0x943E = 0x605D
+0x943F = 0x6085
+0x9440 = 0x608A
+0x9441 = 0x60DE
+0x9442 = 0x60D5
+0x9443 = 0x6120
+0x9444 = 0x60F2
+0x9445 = 0x6111
+0x9446 = 0x6137
+0x9447 = 0x6130
+0x9448 = 0x6198
+0x9449 = 0x6213
+0x944A = 0x62A6
+0x944B = 0x63F5
+0x944C = 0x6460
+0x944D = 0x649D
+0x944E = 0x64CE
+0x944F = 0x654E
+0x9450 = 0x6600
+0x9451 = 0x6615
+0x9452 = 0x663B
+0x9453 = 0x6609
+0x9454 = 0x662E
+0x9455 = 0x661E
+0x9456 = 0x6624
+0x9457 = 0x6665
+0x9458 = 0x6657
+0x9459 = 0x6659
+0x945A = 0xFA12
+0x945B = 0x6673
+0x945C = 0x6699
+0x945D = 0x66A0
+0x945E = 0x66B2
+0x945F = 0x66BF
+0x9460 = 0x66FA
+0x9461 = 0x670E
+0x9462 = 0xF929
+0x9463 = 0x6766
+0x9464 = 0x67BB
+0x9465 = 0x6852
+0x9466 = 0x67C0
+0x9467 = 0x6801
+0x9468 = 0x6844
+0x9469 = 0x68CF
+0x946A = 0xFA13
+0x946B = 0x6968
+0x946C = 0xFA14
+0x946D = 0x6998
+0x946E = 0x69E2
+0x946F = 0x6A30
+0x9470 = 0x6A6B
+0x9471 = 0x6A46
+0x9472 = 0x6A73
+0x9473 = 0x6A7E
+0x9474 = 0x6AE2
+0x9475 = 0x6AE4
+0x9476 = 0x6BD6
+0x9477 = 0x6C3F
+0x9478 = 0x6C5C
+0x9479 = 0x6C86
+0x947A = 0x6C6F
+0x947B = 0x6CDA
+0x947C = 0x6D04
+0x947D = 0x6D87
+0x947E = 0x6D6F
+0x9521 = 0x6D96
+0x9522 = 0x6DAC
+0x9523 = 0x6DCF
+0x9524 = 0x6DF8
+0x9525 = 0x6DF2
+0x9526 = 0x6DFC
+0x9527 = 0x6E39
+0x9528 = 0x6E5C
+0x9529 = 0x6E27
+0x952A = 0x6E3C
+0x952B = 0x6EBF
+0x952C = 0x6F88
+0x952D = 0x6FB5
+0x952E = 0x6FF5
+0x952F = 0x7005
+0x9530 = 0x7007
+0x9531 = 0x7028
+0x9532 = 0x7085
+0x9533 = 0x70AB
+0x9534 = 0x710F
+0x9535 = 0x7104
+0x9536 = 0x715C
+0x9537 = 0x7146
+0x9538 = 0x7147
+0x9539 = 0xFA15
+0x953A = 0x71C1
+0x953B = 0x71FE
+0x953C = 0x72B1
+0x953D = 0x72BE
+0x953E = 0x7324
+0x953F = 0xFA16
+0x9540 = 0x7377
+0x9541 = 0x73BD
+0x9542 = 0x73C9
+0x9543 = 0x73D6
+0x9544 = 0x73E3
+0x9545 = 0x73D2
+0x9546 = 0x7407
+0x9547 = 0x73F5
+0x9548 = 0x7426
+0x9549 = 0x742A
+0x954A = 0x7429
+0x954B = 0x742E
+0x954C = 0x7462
+0x954D = 0x7489
+0x954E = 0x749F
+0x954F = 0x7501
+0x9550 = 0x756F
+0x9551 = 0x7682
+0x9552 = 0x769C
+0x9553 = 0x769E
+0x9554 = 0x769B
+0x9555 = 0x76A6
+0x9556 = 0xFA17
+0x9557 = 0x7746
+0x9558 = 0x52AF
+0x9559 = 0x7821
+0x955A = 0x784E
+0x955B = 0x7864
+0x955C = 0x787A
+0x955D = 0x7930
+0x955E = 0xFA18
+0x955F = 0xFA19
+0x9560 = 0xFA1A
+0x9561 = 0x7994
+0x9562 = 0xFA1B
+0x9563 = 0x799B
+0x9564 = 0x7AD1
+0x9565 = 0x7AE7
+0x9566 = 0xFA1C
+0x9567 = 0x7AEB
+0x9568 = 0x7B9E
+0x9569 = 0xFA1D
+0x956A = 0x7D48
+0x956B = 0x7D5C
+0x956C = 0x7DB7
+0x956D = 0x7DA0
+0x956E = 0x7DD6
+0x956F = 0x7E52
+0x9570 = 0x7F47
+0x9571 = 0x7FA1
+0x9572 = 0xFA1E
+0x9573 = 0x8301
+0x9574 = 0x8362
+0x9575 = 0x837F
+0x9576 = 0x83C7
+0x9577 = 0x83F6
+0x9578 = 0x8448
+0x9579 = 0x84B4
+0x957A = 0x8553
+0x957B = 0x8559
+0x957C = 0x856B
+0x957D = 0xFA1F
+0x957E = 0x85B0
+0x9621 = 0xFA20
+0x9622 = 0xFA21
+0x9623 = 0x8807
+0x9624 = 0x88F5
+0x9625 = 0x8A12
+0x9626 = 0x8A37
+0x9627 = 0x8A79
+0x9628 = 0x8AA7
+0x9629 = 0x8ABE
+0x962A = 0x8ADF
+0x962B = 0xFA22
+0x962C = 0x8AF6
+0x962D = 0x8B53
+0x962E = 0x8B7F
+0x962F = 0x8CF0
+0x9630 = 0x8CF4
+0x9631 = 0x8D12
+0x9632 = 0x8D76
+0x9633 = 0xFA23
+0x9634 = 0x8ECF
+0x9635 = 0xFA24
+0x9636 = 0xFA25
+0x9637 = 0x9067
+0x9638 = 0x90DE
+0x9639 = 0xFA26
+0x963A = 0x9115
+0x963B = 0x9127
+0x963C = 0x91DA
+0x963D = 0x91D7
+0x963E = 0x91DE
+0x963F = 0x91ED
+0x9640 = 0x91EE
+0x9641 = 0x91E4
+0x9642 = 0x91E5
+0x9643 = 0x9206
+0x9644 = 0x9210
+0x9645 = 0x920A
+0x9646 = 0x923A
+0x9647 = 0x9240
+0x9648 = 0x923C
+0x9649 = 0x924E
+0x964A = 0x9259
+0x964B = 0x9251
+0x964C = 0x9239
+0x964D = 0x9267
+0x964E = 0x92A7
+0x964F = 0x9277
+0x9650 = 0x9278
+0x9651 = 0x92E7
+0x9652 = 0x92D7
+0x9653 = 0x92D9
+0x9654 = 0x92D0
+0x9655 = 0xFA27
+0x9656 = 0x92D5
+0x9657 = 0x92E0
+0x9658 = 0x92D3
+0x9659 = 0x9325
+0x965A = 0x9321
+0x965B = 0x92FB
+0x965C = 0xFA28
+0x965D = 0x931E
+0x965E = 0x92FF
+0x965F = 0x931D
+0x9660 = 0x9302
+0x9661 = 0x9370
+0x9662 = 0x9357
+0x9663 = 0x93A4
+0x9664 = 0x93C6
+0x9665 = 0x93DE
+0x9666 = 0x93F8
+0x9667 = 0x9431
+0x9668 = 0x9445
+0x9669 = 0x9448
+0x966A = 0x9592
+0x966B = 0xF9DC
+0x966C = 0xFA29
+0x966D = 0x969D
+0x966E = 0x96AF
+0x966F = 0x9733
+0x9670 = 0x973B
+0x9671 = 0x9743
+0x9672 = 0x974D
+0x9673 = 0x974F
+0x9674 = 0x9751
+0x9675 = 0x9755
+0x9676 = 0x9857
+0x9677 = 0x9865
+0x9678 = 0xFA2A
+0x9679 = 0xFA2B
+0x967A = 0x9927
+0x967B = 0xFA2C
+0x967C = 0x999E
+0x967D = 0x9A4E
+0x967E = 0x9AD9
+0x9721 = 0x9ADC
+0x9722 = 0x9B75
+0x9723 = 0x9B72
+0x9724 = 0x9B8F
+0x9725 = 0x9BB1
+0x9726 = 0x9BBB
+0x9727 = 0x9C00
+0x9728 = 0x9D70
+0x9729 = 0x9D6B
+0x972A = 0xFA2D
+0x972B = 0x9E19
+0x972C = 0x9ED1
+END_MAP
diff --git a/enc/trans/CP/CP932VDC@NEC_IBM%UCS.src b/enc/trans/CP/CP932VDC@NEC_IBM%UCS.src
new file mode 100644
index 0000000000..7696d909e0
--- /dev/null
+++ b/enc/trans/CP/CP932VDC@NEC_IBM%UCS.src
@@ -0,0 +1,406 @@
+# $NetBSD: CP932VDC@NEC_IBM%UCS.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"CP932VDC:NEC_IBM/UCS"
+SRC_ZONE	0x79-0x7C / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#    Name:     cp932 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       cpxlate@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp932 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp932 order
+#
+0x7921 = 0x7E8A
+0x7922 = 0x891C
+0x7923 = 0x9348
+0x7924 = 0x9288
+0x7925 = 0x84DC
+0x7926 = 0x4FC9
+0x7927 = 0x70BB
+0x7928 = 0x6631
+0x7929 = 0x68C8
+0x792A = 0x92F9
+0x792B = 0x66FB
+0x792C = 0x5F45
+0x792D = 0x4E28
+0x792E = 0x4EE1
+0x792F = 0x4EFC
+0x7930 = 0x4F00
+0x7931 = 0x4F03
+0x7932 = 0x4F39
+0x7933 = 0x4F56
+0x7934 = 0x4F92
+0x7935 = 0x4F8A
+0x7936 = 0x4F9A
+0x7937 = 0x4F94
+0x7938 = 0x4FCD
+0x7939 = 0x5040
+0x793A = 0x5022
+0x793B = 0x4FFF
+0x793C = 0x501E
+0x793D = 0x5046
+0x793E = 0x5070
+0x793F = 0x5042
+0x7940 = 0x5094
+0x7941 = 0x50F4
+0x7942 = 0x50D8
+0x7943 = 0x514A
+0x7944 = 0x5164
+0x7945 = 0x519D
+0x7946 = 0x51BE
+0x7947 = 0x51EC
+0x7948 = 0x5215
+0x7949 = 0x529C
+0x794A = 0x52A6
+0x794B = 0x52C0
+0x794C = 0x52DB
+0x794D = 0x5300
+0x794E = 0x5307
+0x794F = 0x5324
+0x7950 = 0x5372
+0x7951 = 0x5393
+0x7952 = 0x53B2
+0x7953 = 0x53DD
+0x7954 = 0xFA0E
+0x7955 = 0x549C
+0x7956 = 0x548A
+0x7957 = 0x54A9
+0x7958 = 0x54FF
+0x7959 = 0x5586
+0x795A = 0x5759
+0x795B = 0x5765
+0x795C = 0x57AC
+0x795D = 0x57C8
+0x795E = 0x57C7
+0x795F = 0xFA0F
+0x7960 = 0xFA10
+0x7961 = 0x589E
+0x7962 = 0x58B2
+0x7963 = 0x590B
+0x7964 = 0x5953
+0x7965 = 0x595B
+0x7966 = 0x595D
+0x7967 = 0x5963
+0x7968 = 0x59A4
+0x7969 = 0x59BA
+0x796A = 0x5B56
+0x796B = 0x5BC0
+0x796C = 0x752F
+0x796D = 0x5BD8
+0x796E = 0x5BEC
+0x796F = 0x5C1E
+0x7970 = 0x5CA6
+0x7971 = 0x5CBA
+0x7972 = 0x5CF5
+0x7973 = 0x5D27
+0x7974 = 0x5D53
+0x7975 = 0xFA11
+0x7976 = 0x5D42
+0x7977 = 0x5D6D
+0x7978 = 0x5DB8
+0x7979 = 0x5DB9
+0x797A = 0x5DD0
+0x797B = 0x5F21
+0x797C = 0x5F34
+0x797D = 0x5F67
+0x797E = 0x5FB7
+0x7A21 = 0x5FDE
+0x7A22 = 0x605D
+0x7A23 = 0x6085
+0x7A24 = 0x608A
+0x7A25 = 0x60DE
+0x7A26 = 0x60D5
+0x7A27 = 0x6120
+0x7A28 = 0x60F2
+0x7A29 = 0x6111
+0x7A2A = 0x6137
+0x7A2B = 0x6130
+0x7A2C = 0x6198
+0x7A2D = 0x6213
+0x7A2E = 0x62A6
+0x7A2F = 0x63F5
+0x7A30 = 0x6460
+0x7A31 = 0x649D
+0x7A32 = 0x64CE
+0x7A33 = 0x654E
+0x7A34 = 0x6600
+0x7A35 = 0x6615
+0x7A36 = 0x663B
+0x7A37 = 0x6609
+0x7A38 = 0x662E
+0x7A39 = 0x661E
+0x7A3A = 0x6624
+0x7A3B = 0x6665
+0x7A3C = 0x6657
+0x7A3D = 0x6659
+0x7A3E = 0xFA12
+0x7A3F = 0x6673
+0x7A40 = 0x6699
+0x7A41 = 0x66A0
+0x7A42 = 0x66B2
+0x7A43 = 0x66BF
+0x7A44 = 0x66FA
+0x7A45 = 0x670E
+0x7A46 = 0xF929
+0x7A47 = 0x6766
+0x7A48 = 0x67BB
+0x7A49 = 0x6852
+0x7A4A = 0x67C0
+0x7A4B = 0x6801
+0x7A4C = 0x6844
+0x7A4D = 0x68CF
+0x7A4E = 0xFA13
+0x7A4F = 0x6968
+0x7A50 = 0xFA14
+0x7A51 = 0x6998
+0x7A52 = 0x69E2
+0x7A53 = 0x6A30
+0x7A54 = 0x6A6B
+0x7A55 = 0x6A46
+0x7A56 = 0x6A73
+0x7A57 = 0x6A7E
+0x7A58 = 0x6AE2
+0x7A59 = 0x6AE4
+0x7A5A = 0x6BD6
+0x7A5B = 0x6C3F
+0x7A5C = 0x6C5C
+0x7A5D = 0x6C86
+0x7A5E = 0x6C6F
+0x7A5F = 0x6CDA
+0x7A60 = 0x6D04
+0x7A61 = 0x6D87
+0x7A62 = 0x6D6F
+0x7A63 = 0x6D96
+0x7A64 = 0x6DAC
+0x7A65 = 0x6DCF
+0x7A66 = 0x6DF8
+0x7A67 = 0x6DF2
+0x7A68 = 0x6DFC
+0x7A69 = 0x6E39
+0x7A6A = 0x6E5C
+0x7A6B = 0x6E27
+0x7A6C = 0x6E3C
+0x7A6D = 0x6EBF
+0x7A6E = 0x6F88
+0x7A6F = 0x6FB5
+0x7A70 = 0x6FF5
+0x7A71 = 0x7005
+0x7A72 = 0x7007
+0x7A73 = 0x7028
+0x7A74 = 0x7085
+0x7A75 = 0x70AB
+0x7A76 = 0x710F
+0x7A77 = 0x7104
+0x7A78 = 0x715C
+0x7A79 = 0x7146
+0x7A7A = 0x7147
+0x7A7B = 0xFA15
+0x7A7C = 0x71C1
+0x7A7D = 0x71FE
+0x7A7E = 0x72B1
+0x7B21 = 0x72BE
+0x7B22 = 0x7324
+0x7B23 = 0xFA16
+0x7B24 = 0x7377
+0x7B25 = 0x73BD
+0x7B26 = 0x73C9
+0x7B27 = 0x73D6
+0x7B28 = 0x73E3
+0x7B29 = 0x73D2
+0x7B2A = 0x7407
+0x7B2B = 0x73F5
+0x7B2C = 0x7426
+0x7B2D = 0x742A
+0x7B2E = 0x7429
+0x7B2F = 0x742E
+0x7B30 = 0x7462
+0x7B31 = 0x7489
+0x7B32 = 0x749F
+0x7B33 = 0x7501
+0x7B34 = 0x756F
+0x7B35 = 0x7682
+0x7B36 = 0x769C
+0x7B37 = 0x769E
+0x7B38 = 0x769B
+0x7B39 = 0x76A6
+0x7B3A = 0xFA17
+0x7B3B = 0x7746
+0x7B3C = 0x52AF
+0x7B3D = 0x7821
+0x7B3E = 0x784E
+0x7B3F = 0x7864
+0x7B40 = 0x787A
+0x7B41 = 0x7930
+0x7B42 = 0xFA18
+0x7B43 = 0xFA19
+0x7B44 = 0xFA1A
+0x7B45 = 0x7994
+0x7B46 = 0xFA1B
+0x7B47 = 0x799B
+0x7B48 = 0x7AD1
+0x7B49 = 0x7AE7
+0x7B4A = 0xFA1C
+0x7B4B = 0x7AEB
+0x7B4C = 0x7B9E
+0x7B4D = 0xFA1D
+0x7B4E = 0x7D48
+0x7B4F = 0x7D5C
+0x7B50 = 0x7DB7
+0x7B51 = 0x7DA0
+0x7B52 = 0x7DD6
+0x7B53 = 0x7E52
+0x7B54 = 0x7F47
+0x7B55 = 0x7FA1
+0x7B56 = 0xFA1E
+0x7B57 = 0x8301
+0x7B58 = 0x8362
+0x7B59 = 0x837F
+0x7B5A = 0x83C7
+0x7B5B = 0x83F6
+0x7B5C = 0x8448
+0x7B5D = 0x84B4
+0x7B5E = 0x8553
+0x7B5F = 0x8559
+0x7B60 = 0x856B
+0x7B61 = 0xFA1F
+0x7B62 = 0x85B0
+0x7B63 = 0xFA20
+0x7B64 = 0xFA21
+0x7B65 = 0x8807
+0x7B66 = 0x88F5
+0x7B67 = 0x8A12
+0x7B68 = 0x8A37
+0x7B69 = 0x8A79
+0x7B6A = 0x8AA7
+0x7B6B = 0x8ABE
+0x7B6C = 0x8ADF
+0x7B6D = 0xFA22
+0x7B6E = 0x8AF6
+0x7B6F = 0x8B53
+0x7B70 = 0x8B7F
+0x7B71 = 0x8CF0
+0x7B72 = 0x8CF4
+0x7B73 = 0x8D12
+0x7B74 = 0x8D76
+0x7B75 = 0xFA23
+0x7B76 = 0x8ECF
+0x7B77 = 0xFA24
+0x7B78 = 0xFA25
+0x7B79 = 0x9067
+0x7B7A = 0x90DE
+0x7B7B = 0xFA26
+0x7B7C = 0x9115
+0x7B7D = 0x9127
+0x7B7E = 0x91DA
+0x7C21 = 0x91D7
+0x7C22 = 0x91DE
+0x7C23 = 0x91ED
+0x7C24 = 0x91EE
+0x7C25 = 0x91E4
+0x7C26 = 0x91E5
+0x7C27 = 0x9206
+0x7C28 = 0x9210
+0x7C29 = 0x920A
+0x7C2A = 0x923A
+0x7C2B = 0x9240
+0x7C2C = 0x923C
+0x7C2D = 0x924E
+0x7C2E = 0x9259
+0x7C2F = 0x9251
+0x7C30 = 0x9239
+0x7C31 = 0x9267
+0x7C32 = 0x92A7
+0x7C33 = 0x9277
+0x7C34 = 0x9278
+0x7C35 = 0x92E7
+0x7C36 = 0x92D7
+0x7C37 = 0x92D9
+0x7C38 = 0x92D0
+0x7C39 = 0xFA27
+0x7C3A = 0x92D5
+0x7C3B = 0x92E0
+0x7C3C = 0x92D3
+0x7C3D = 0x9325
+0x7C3E = 0x9321
+0x7C3F = 0x92FB
+0x7C40 = 0xFA28
+0x7C41 = 0x931E
+0x7C42 = 0x92FF
+0x7C43 = 0x931D
+0x7C44 = 0x9302
+0x7C45 = 0x9370
+0x7C46 = 0x9357
+0x7C47 = 0x93A4
+0x7C48 = 0x93C6
+0x7C49 = 0x93DE
+0x7C4A = 0x93F8
+0x7C4B = 0x9431
+0x7C4C = 0x9445
+0x7C4D = 0x9448
+0x7C4E = 0x9592
+0x7C4F = 0xF9DC
+0x7C50 = 0xFA29
+0x7C51 = 0x969D
+0x7C52 = 0x96AF
+0x7C53 = 0x9733
+0x7C54 = 0x973B
+0x7C55 = 0x9743
+0x7C56 = 0x974D
+0x7C57 = 0x974F
+0x7C58 = 0x9751
+0x7C59 = 0x9755
+0x7C5A = 0x9857
+0x7C5B = 0x9865
+0x7C5C = 0xFA2A
+0x7C5D = 0xFA2B
+0x7C5E = 0x9927
+0x7C5F = 0xFA2C
+0x7C60 = 0x999E
+0x7C61 = 0x9A4E
+0x7C62 = 0x9AD9
+0x7C63 = 0x9ADC
+0x7C64 = 0x9B75
+0x7C65 = 0x9B72
+0x7C66 = 0x9B8F
+0x7C67 = 0x9BB1
+0x7C68 = 0x9BBB
+0x7C69 = 0x9C00
+0x7C6A = 0x9D70
+0x7C6B = 0x9D6B
+0x7C6C = 0xFA2D
+0x7C6D = 0x9E19
+0x7C6E = 0x9ED1
+0x7C71 = 0x2170
+0x7C72 = 0x2171
+0x7C73 = 0x2172
+0x7C74 = 0x2173
+0x7C75 = 0x2174
+0x7C76 = 0x2175
+0x7C77 = 0x2176
+0x7C78 = 0x2177
+0x7C79 = 0x2178
+0x7C7A = 0x2179
+0x7C7B = 0xFFE2
+0x7C7C = 0xFFE4
+0x7C7D = 0xFF07
+0x7C7E = 0xFF02
+END_MAP
diff --git a/enc/trans/CP/UCS%CP932UDA.src b/enc/trans/CP/UCS%CP932UDA.src
new file mode 100644
index 0000000000..f34e9ed829
--- /dev/null
+++ b/enc/trans/CP/UCS%CP932UDA.src
@@ -0,0 +1,1912 @@
+# $NetBSD: UCS%CP932UDA.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/CP932UDA"
+SRC_ZONE	0xE000-0xE757
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#    Name:     cp932 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       cpxlate@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp932 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp932 order
+#
+0xE000 = 0x7F21
+0xE001 = 0x7F22
+0xE002 = 0x7F23
+0xE003 = 0x7F24
+0xE004 = 0x7F25
+0xE005 = 0x7F26
+0xE006 = 0x7F27
+0xE007 = 0x7F28
+0xE008 = 0x7F29
+0xE009 = 0x7F2A
+0xE00A = 0x7F2B
+0xE00B = 0x7F2C
+0xE00C = 0x7F2D
+0xE00D = 0x7F2E
+0xE00E = 0x7F2F
+0xE00F = 0x7F30
+0xE010 = 0x7F31
+0xE011 = 0x7F32
+0xE012 = 0x7F33
+0xE013 = 0x7F34
+0xE014 = 0x7F35
+0xE015 = 0x7F36
+0xE016 = 0x7F37
+0xE017 = 0x7F38
+0xE018 = 0x7F39
+0xE019 = 0x7F3A
+0xE01A = 0x7F3B
+0xE01B = 0x7F3C
+0xE01C = 0x7F3D
+0xE01D = 0x7F3E
+0xE01E = 0x7F3F
+0xE01F = 0x7F40
+0xE020 = 0x7F41
+0xE021 = 0x7F42
+0xE022 = 0x7F43
+0xE023 = 0x7F44
+0xE024 = 0x7F45
+0xE025 = 0x7F46
+0xE026 = 0x7F47
+0xE027 = 0x7F48
+0xE028 = 0x7F49
+0xE029 = 0x7F4A
+0xE02A = 0x7F4B
+0xE02B = 0x7F4C
+0xE02C = 0x7F4D
+0xE02D = 0x7F4E
+0xE02E = 0x7F4F
+0xE02F = 0x7F50
+0xE030 = 0x7F51
+0xE031 = 0x7F52
+0xE032 = 0x7F53
+0xE033 = 0x7F54
+0xE034 = 0x7F55
+0xE035 = 0x7F56
+0xE036 = 0x7F57
+0xE037 = 0x7F58
+0xE038 = 0x7F59
+0xE039 = 0x7F5A
+0xE03A = 0x7F5B
+0xE03B = 0x7F5C
+0xE03C = 0x7F5D
+0xE03D = 0x7F5E
+0xE03E = 0x7F5F
+0xE03F = 0x7F60
+0xE040 = 0x7F61
+0xE041 = 0x7F62
+0xE042 = 0x7F63
+0xE043 = 0x7F64
+0xE044 = 0x7F65
+0xE045 = 0x7F66
+0xE046 = 0x7F67
+0xE047 = 0x7F68
+0xE048 = 0x7F69
+0xE049 = 0x7F6A
+0xE04A = 0x7F6B
+0xE04B = 0x7F6C
+0xE04C = 0x7F6D
+0xE04D = 0x7F6E
+0xE04E = 0x7F6F
+0xE04F = 0x7F70
+0xE050 = 0x7F71
+0xE051 = 0x7F72
+0xE052 = 0x7F73
+0xE053 = 0x7F74
+0xE054 = 0x7F75
+0xE055 = 0x7F76
+0xE056 = 0x7F77
+0xE057 = 0x7F78
+0xE058 = 0x7F79
+0xE059 = 0x7F7A
+0xE05A = 0x7F7B
+0xE05B = 0x7F7C
+0xE05C = 0x7F7D
+0xE05D = 0x7F7E
+0xE05E = 0x8021
+0xE05F = 0x8022
+0xE060 = 0x8023
+0xE061 = 0x8024
+0xE062 = 0x8025
+0xE063 = 0x8026
+0xE064 = 0x8027
+0xE065 = 0x8028
+0xE066 = 0x8029
+0xE067 = 0x802A
+0xE068 = 0x802B
+0xE069 = 0x802C
+0xE06A = 0x802D
+0xE06B = 0x802E
+0xE06C = 0x802F
+0xE06D = 0x8030
+0xE06E = 0x8031
+0xE06F = 0x8032
+0xE070 = 0x8033
+0xE071 = 0x8034
+0xE072 = 0x8035
+0xE073 = 0x8036
+0xE074 = 0x8037
+0xE075 = 0x8038
+0xE076 = 0x8039
+0xE077 = 0x803A
+0xE078 = 0x803B
+0xE079 = 0x803C
+0xE07A = 0x803D
+0xE07B = 0x803E
+0xE07C = 0x803F
+0xE07D = 0x8040
+0xE07E = 0x8041
+0xE07F = 0x8042
+0xE080 = 0x8043
+0xE081 = 0x8044
+0xE082 = 0x8045
+0xE083 = 0x8046
+0xE084 = 0x8047
+0xE085 = 0x8048
+0xE086 = 0x8049
+0xE087 = 0x804A
+0xE088 = 0x804B
+0xE089 = 0x804C
+0xE08A = 0x804D
+0xE08B = 0x804E
+0xE08C = 0x804F
+0xE08D = 0x8050
+0xE08E = 0x8051
+0xE08F = 0x8052
+0xE090 = 0x8053
+0xE091 = 0x8054
+0xE092 = 0x8055
+0xE093 = 0x8056
+0xE094 = 0x8057
+0xE095 = 0x8058
+0xE096 = 0x8059
+0xE097 = 0x805A
+0xE098 = 0x805B
+0xE099 = 0x805C
+0xE09A = 0x805D
+0xE09B = 0x805E
+0xE09C = 0x805F
+0xE09D = 0x8060
+0xE09E = 0x8061
+0xE09F = 0x8062
+0xE0A0 = 0x8063
+0xE0A1 = 0x8064
+0xE0A2 = 0x8065
+0xE0A3 = 0x8066
+0xE0A4 = 0x8067
+0xE0A5 = 0x8068
+0xE0A6 = 0x8069
+0xE0A7 = 0x806A
+0xE0A8 = 0x806B
+0xE0A9 = 0x806C
+0xE0AA = 0x806D
+0xE0AB = 0x806E
+0xE0AC = 0x806F
+0xE0AD = 0x8070
+0xE0AE = 0x8071
+0xE0AF = 0x8072
+0xE0B0 = 0x8073
+0xE0B1 = 0x8074
+0xE0B2 = 0x8075
+0xE0B3 = 0x8076
+0xE0B4 = 0x8077
+0xE0B5 = 0x8078
+0xE0B6 = 0x8079
+0xE0B7 = 0x807A
+0xE0B8 = 0x807B
+0xE0B9 = 0x807C
+0xE0BA = 0x807D
+0xE0BB = 0x807E
+0xE0BC = 0x8121
+0xE0BD = 0x8122
+0xE0BE = 0x8123
+0xE0BF = 0x8124
+0xE0C0 = 0x8125
+0xE0C1 = 0x8126
+0xE0C2 = 0x8127
+0xE0C3 = 0x8128
+0xE0C4 = 0x8129
+0xE0C5 = 0x812A
+0xE0C6 = 0x812B
+0xE0C7 = 0x812C
+0xE0C8 = 0x812D
+0xE0C9 = 0x812E
+0xE0CA = 0x812F
+0xE0CB = 0x8130
+0xE0CC = 0x8131
+0xE0CD = 0x8132
+0xE0CE = 0x8133
+0xE0CF = 0x8134
+0xE0D0 = 0x8135
+0xE0D1 = 0x8136
+0xE0D2 = 0x8137
+0xE0D3 = 0x8138
+0xE0D4 = 0x8139
+0xE0D5 = 0x813A
+0xE0D6 = 0x813B
+0xE0D7 = 0x813C
+0xE0D8 = 0x813D
+0xE0D9 = 0x813E
+0xE0DA = 0x813F
+0xE0DB = 0x8140
+0xE0DC = 0x8141
+0xE0DD = 0x8142
+0xE0DE = 0x8143
+0xE0DF = 0x8144
+0xE0E0 = 0x8145
+0xE0E1 = 0x8146
+0xE0E2 = 0x8147
+0xE0E3 = 0x8148
+0xE0E4 = 0x8149
+0xE0E5 = 0x814A
+0xE0E6 = 0x814B
+0xE0E7 = 0x814C
+0xE0E8 = 0x814D
+0xE0E9 = 0x814E
+0xE0EA = 0x814F
+0xE0EB = 0x8150
+0xE0EC = 0x8151
+0xE0ED = 0x8152
+0xE0EE = 0x8153
+0xE0EF = 0x8154
+0xE0F0 = 0x8155
+0xE0F1 = 0x8156
+0xE0F2 = 0x8157
+0xE0F3 = 0x8158
+0xE0F4 = 0x8159
+0xE0F5 = 0x815A
+0xE0F6 = 0x815B
+0xE0F7 = 0x815C
+0xE0F8 = 0x815D
+0xE0F9 = 0x815E
+0xE0FA = 0x815F
+0xE0FB = 0x8160
+0xE0FC = 0x8161
+0xE0FD = 0x8162
+0xE0FE = 0x8163
+0xE0FF = 0x8164
+0xE100 = 0x8165
+0xE101 = 0x8166
+0xE102 = 0x8167
+0xE103 = 0x8168
+0xE104 = 0x8169
+0xE105 = 0x816A
+0xE106 = 0x816B
+0xE107 = 0x816C
+0xE108 = 0x816D
+0xE109 = 0x816E
+0xE10A = 0x816F
+0xE10B = 0x8170
+0xE10C = 0x8171
+0xE10D = 0x8172
+0xE10E = 0x8173
+0xE10F = 0x8174
+0xE110 = 0x8175
+0xE111 = 0x8176
+0xE112 = 0x8177
+0xE113 = 0x8178
+0xE114 = 0x8179
+0xE115 = 0x817A
+0xE116 = 0x817B
+0xE117 = 0x817C
+0xE118 = 0x817D
+0xE119 = 0x817E
+0xE11A = 0x8221
+0xE11B = 0x8222
+0xE11C = 0x8223
+0xE11D = 0x8224
+0xE11E = 0x8225
+0xE11F = 0x8226
+0xE120 = 0x8227
+0xE121 = 0x8228
+0xE122 = 0x8229
+0xE123 = 0x822A
+0xE124 = 0x822B
+0xE125 = 0x822C
+0xE126 = 0x822D
+0xE127 = 0x822E
+0xE128 = 0x822F
+0xE129 = 0x8230
+0xE12A = 0x8231
+0xE12B = 0x8232
+0xE12C = 0x8233
+0xE12D = 0x8234
+0xE12E = 0x8235
+0xE12F = 0x8236
+0xE130 = 0x8237
+0xE131 = 0x8238
+0xE132 = 0x8239
+0xE133 = 0x823A
+0xE134 = 0x823B
+0xE135 = 0x823C
+0xE136 = 0x823D
+0xE137 = 0x823E
+0xE138 = 0x823F
+0xE139 = 0x8240
+0xE13A = 0x8241
+0xE13B = 0x8242
+0xE13C = 0x8243
+0xE13D = 0x8244
+0xE13E = 0x8245
+0xE13F = 0x8246
+0xE140 = 0x8247
+0xE141 = 0x8248
+0xE142 = 0x8249
+0xE143 = 0x824A
+0xE144 = 0x824B
+0xE145 = 0x824C
+0xE146 = 0x824D
+0xE147 = 0x824E
+0xE148 = 0x824F
+0xE149 = 0x8250
+0xE14A = 0x8251
+0xE14B = 0x8252
+0xE14C = 0x8253
+0xE14D = 0x8254
+0xE14E = 0x8255
+0xE14F = 0x8256
+0xE150 = 0x8257
+0xE151 = 0x8258
+0xE152 = 0x8259
+0xE153 = 0x825A
+0xE154 = 0x825B
+0xE155 = 0x825C
+0xE156 = 0x825D
+0xE157 = 0x825E
+0xE158 = 0x825F
+0xE159 = 0x8260
+0xE15A = 0x8261
+0xE15B = 0x8262
+0xE15C = 0x8263
+0xE15D = 0x8264
+0xE15E = 0x8265
+0xE15F = 0x8266
+0xE160 = 0x8267
+0xE161 = 0x8268
+0xE162 = 0x8269
+0xE163 = 0x826A
+0xE164 = 0x826B
+0xE165 = 0x826C
+0xE166 = 0x826D
+0xE167 = 0x826E
+0xE168 = 0x826F
+0xE169 = 0x8270
+0xE16A = 0x8271
+0xE16B = 0x8272
+0xE16C = 0x8273
+0xE16D = 0x8274
+0xE16E = 0x8275
+0xE16F = 0x8276
+0xE170 = 0x8277
+0xE171 = 0x8278
+0xE172 = 0x8279
+0xE173 = 0x827A
+0xE174 = 0x827B
+0xE175 = 0x827C
+0xE176 = 0x827D
+0xE177 = 0x827E
+0xE178 = 0x8321
+0xE179 = 0x8322
+0xE17A = 0x8323
+0xE17B = 0x8324
+0xE17C = 0x8325
+0xE17D = 0x8326
+0xE17E = 0x8327
+0xE17F = 0x8328
+0xE180 = 0x8329
+0xE181 = 0x832A
+0xE182 = 0x832B
+0xE183 = 0x832C
+0xE184 = 0x832D
+0xE185 = 0x832E
+0xE186 = 0x832F
+0xE187 = 0x8330
+0xE188 = 0x8331
+0xE189 = 0x8332
+0xE18A = 0x8333
+0xE18B = 0x8334
+0xE18C = 0x8335
+0xE18D = 0x8336
+0xE18E = 0x8337
+0xE18F = 0x8338
+0xE190 = 0x8339
+0xE191 = 0x833A
+0xE192 = 0x833B
+0xE193 = 0x833C
+0xE194 = 0x833D
+0xE195 = 0x833E
+0xE196 = 0x833F
+0xE197 = 0x8340
+0xE198 = 0x8341
+0xE199 = 0x8342
+0xE19A = 0x8343
+0xE19B = 0x8344
+0xE19C = 0x8345
+0xE19D = 0x8346
+0xE19E = 0x8347
+0xE19F = 0x8348
+0xE1A0 = 0x8349
+0xE1A1 = 0x834A
+0xE1A2 = 0x834B
+0xE1A3 = 0x834C
+0xE1A4 = 0x834D
+0xE1A5 = 0x834E
+0xE1A6 = 0x834F
+0xE1A7 = 0x8350
+0xE1A8 = 0x8351
+0xE1A9 = 0x8352
+0xE1AA = 0x8353
+0xE1AB = 0x8354
+0xE1AC = 0x8355
+0xE1AD = 0x8356
+0xE1AE = 0x8357
+0xE1AF = 0x8358
+0xE1B0 = 0x8359
+0xE1B1 = 0x835A
+0xE1B2 = 0x835B
+0xE1B3 = 0x835C
+0xE1B4 = 0x835D
+0xE1B5 = 0x835E
+0xE1B6 = 0x835F
+0xE1B7 = 0x8360
+0xE1B8 = 0x8361
+0xE1B9 = 0x8362
+0xE1BA = 0x8363
+0xE1BB = 0x8364
+0xE1BC = 0x8365
+0xE1BD = 0x8366
+0xE1BE = 0x8367
+0xE1BF = 0x8368
+0xE1C0 = 0x8369
+0xE1C1 = 0x836A
+0xE1C2 = 0x836B
+0xE1C3 = 0x836C
+0xE1C4 = 0x836D
+0xE1C5 = 0x836E
+0xE1C6 = 0x836F
+0xE1C7 = 0x8370
+0xE1C8 = 0x8371
+0xE1C9 = 0x8372
+0xE1CA = 0x8373
+0xE1CB = 0x8374
+0xE1CC = 0x8375
+0xE1CD = 0x8376
+0xE1CE = 0x8377
+0xE1CF = 0x8378
+0xE1D0 = 0x8379
+0xE1D1 = 0x837A
+0xE1D2 = 0x837B
+0xE1D3 = 0x837C
+0xE1D4 = 0x837D
+0xE1D5 = 0x837E
+0xE1D6 = 0x8421
+0xE1D7 = 0x8422
+0xE1D8 = 0x8423
+0xE1D9 = 0x8424
+0xE1DA = 0x8425
+0xE1DB = 0x8426
+0xE1DC = 0x8427
+0xE1DD = 0x8428
+0xE1DE = 0x8429
+0xE1DF = 0x842A
+0xE1E0 = 0x842B
+0xE1E1 = 0x842C
+0xE1E2 = 0x842D
+0xE1E3 = 0x842E
+0xE1E4 = 0x842F
+0xE1E5 = 0x8430
+0xE1E6 = 0x8431
+0xE1E7 = 0x8432
+0xE1E8 = 0x8433
+0xE1E9 = 0x8434
+0xE1EA = 0x8435
+0xE1EB = 0x8436
+0xE1EC = 0x8437
+0xE1ED = 0x8438
+0xE1EE = 0x8439
+0xE1EF = 0x843A
+0xE1F0 = 0x843B
+0xE1F1 = 0x843C
+0xE1F2 = 0x843D
+0xE1F3 = 0x843E
+0xE1F4 = 0x843F
+0xE1F5 = 0x8440
+0xE1F6 = 0x8441
+0xE1F7 = 0x8442
+0xE1F8 = 0x8443
+0xE1F9 = 0x8444
+0xE1FA = 0x8445
+0xE1FB = 0x8446
+0xE1FC = 0x8447
+0xE1FD = 0x8448
+0xE1FE = 0x8449
+0xE1FF = 0x844A
+0xE200 = 0x844B
+0xE201 = 0x844C
+0xE202 = 0x844D
+0xE203 = 0x844E
+0xE204 = 0x844F
+0xE205 = 0x8450
+0xE206 = 0x8451
+0xE207 = 0x8452
+0xE208 = 0x8453
+0xE209 = 0x8454
+0xE20A = 0x8455
+0xE20B = 0x8456
+0xE20C = 0x8457
+0xE20D = 0x8458
+0xE20E = 0x8459
+0xE20F = 0x845A
+0xE210 = 0x845B
+0xE211 = 0x845C
+0xE212 = 0x845D
+0xE213 = 0x845E
+0xE214 = 0x845F
+0xE215 = 0x8460
+0xE216 = 0x8461
+0xE217 = 0x8462
+0xE218 = 0x8463
+0xE219 = 0x8464
+0xE21A = 0x8465
+0xE21B = 0x8466
+0xE21C = 0x8467
+0xE21D = 0x8468
+0xE21E = 0x8469
+0xE21F = 0x846A
+0xE220 = 0x846B
+0xE221 = 0x846C
+0xE222 = 0x846D
+0xE223 = 0x846E
+0xE224 = 0x846F
+0xE225 = 0x8470
+0xE226 = 0x8471
+0xE227 = 0x8472
+0xE228 = 0x8473
+0xE229 = 0x8474
+0xE22A = 0x8475
+0xE22B = 0x8476
+0xE22C = 0x8477
+0xE22D = 0x8478
+0xE22E = 0x8479
+0xE22F = 0x847A
+0xE230 = 0x847B
+0xE231 = 0x847C
+0xE232 = 0x847D
+0xE233 = 0x847E
+0xE234 = 0x8521
+0xE235 = 0x8522
+0xE236 = 0x8523
+0xE237 = 0x8524
+0xE238 = 0x8525
+0xE239 = 0x8526
+0xE23A = 0x8527
+0xE23B = 0x8528
+0xE23C = 0x8529
+0xE23D = 0x852A
+0xE23E = 0x852B
+0xE23F = 0x852C
+0xE240 = 0x852D
+0xE241 = 0x852E
+0xE242 = 0x852F
+0xE243 = 0x8530
+0xE244 = 0x8531
+0xE245 = 0x8532
+0xE246 = 0x8533
+0xE247 = 0x8534
+0xE248 = 0x8535
+0xE249 = 0x8536
+0xE24A = 0x8537
+0xE24B = 0x8538
+0xE24C = 0x8539
+0xE24D = 0x853A
+0xE24E = 0x853B
+0xE24F = 0x853C
+0xE250 = 0x853D
+0xE251 = 0x853E
+0xE252 = 0x853F
+0xE253 = 0x8540
+0xE254 = 0x8541
+0xE255 = 0x8542
+0xE256 = 0x8543
+0xE257 = 0x8544
+0xE258 = 0x8545
+0xE259 = 0x8546
+0xE25A = 0x8547
+0xE25B = 0x8548
+0xE25C = 0x8549
+0xE25D = 0x854A
+0xE25E = 0x854B
+0xE25F = 0x854C
+0xE260 = 0x854D
+0xE261 = 0x854E
+0xE262 = 0x854F
+0xE263 = 0x8550
+0xE264 = 0x8551
+0xE265 = 0x8552
+0xE266 = 0x8553
+0xE267 = 0x8554
+0xE268 = 0x8555
+0xE269 = 0x8556
+0xE26A = 0x8557
+0xE26B = 0x8558
+0xE26C = 0x8559
+0xE26D = 0x855A
+0xE26E = 0x855B
+0xE26F = 0x855C
+0xE270 = 0x855D
+0xE271 = 0x855E
+0xE272 = 0x855F
+0xE273 = 0x8560
+0xE274 = 0x8561
+0xE275 = 0x8562
+0xE276 = 0x8563
+0xE277 = 0x8564
+0xE278 = 0x8565
+0xE279 = 0x8566
+0xE27A = 0x8567
+0xE27B = 0x8568
+0xE27C = 0x8569
+0xE27D = 0x856A
+0xE27E = 0x856B
+0xE27F = 0x856C
+0xE280 = 0x856D
+0xE281 = 0x856E
+0xE282 = 0x856F
+0xE283 = 0x8570
+0xE284 = 0x8571
+0xE285 = 0x8572
+0xE286 = 0x8573
+0xE287 = 0x8574
+0xE288 = 0x8575
+0xE289 = 0x8576
+0xE28A = 0x8577
+0xE28B = 0x8578
+0xE28C = 0x8579
+0xE28D = 0x857A
+0xE28E = 0x857B
+0xE28F = 0x857C
+0xE290 = 0x857D
+0xE291 = 0x857E
+0xE292 = 0x8621
+0xE293 = 0x8622
+0xE294 = 0x8623
+0xE295 = 0x8624
+0xE296 = 0x8625
+0xE297 = 0x8626
+0xE298 = 0x8627
+0xE299 = 0x8628
+0xE29A = 0x8629
+0xE29B = 0x862A
+0xE29C = 0x862B
+0xE29D = 0x862C
+0xE29E = 0x862D
+0xE29F = 0x862E
+0xE2A0 = 0x862F
+0xE2A1 = 0x8630
+0xE2A2 = 0x8631
+0xE2A3 = 0x8632
+0xE2A4 = 0x8633
+0xE2A5 = 0x8634
+0xE2A6 = 0x8635
+0xE2A7 = 0x8636
+0xE2A8 = 0x8637
+0xE2A9 = 0x8638
+0xE2AA = 0x8639
+0xE2AB = 0x863A
+0xE2AC = 0x863B
+0xE2AD = 0x863C
+0xE2AE = 0x863D
+0xE2AF = 0x863E
+0xE2B0 = 0x863F
+0xE2B1 = 0x8640
+0xE2B2 = 0x8641
+0xE2B3 = 0x8642
+0xE2B4 = 0x8643
+0xE2B5 = 0x8644
+0xE2B6 = 0x8645
+0xE2B7 = 0x8646
+0xE2B8 = 0x8647
+0xE2B9 = 0x8648
+0xE2BA = 0x8649
+0xE2BB = 0x864A
+0xE2BC = 0x864B
+0xE2BD = 0x864C
+0xE2BE = 0x864D
+0xE2BF = 0x864E
+0xE2C0 = 0x864F
+0xE2C1 = 0x8650
+0xE2C2 = 0x8651
+0xE2C3 = 0x8652
+0xE2C4 = 0x8653
+0xE2C5 = 0x8654
+0xE2C6 = 0x8655
+0xE2C7 = 0x8656
+0xE2C8 = 0x8657
+0xE2C9 = 0x8658
+0xE2CA = 0x8659
+0xE2CB = 0x865A
+0xE2CC = 0x865B
+0xE2CD = 0x865C
+0xE2CE = 0x865D
+0xE2CF = 0x865E
+0xE2D0 = 0x865F
+0xE2D1 = 0x8660
+0xE2D2 = 0x8661
+0xE2D3 = 0x8662
+0xE2D4 = 0x8663
+0xE2D5 = 0x8664
+0xE2D6 = 0x8665
+0xE2D7 = 0x8666
+0xE2D8 = 0x8667
+0xE2D9 = 0x8668
+0xE2DA = 0x8669
+0xE2DB = 0x866A
+0xE2DC = 0x866B
+0xE2DD = 0x866C
+0xE2DE = 0x866D
+0xE2DF = 0x866E
+0xE2E0 = 0x866F
+0xE2E1 = 0x8670
+0xE2E2 = 0x8671
+0xE2E3 = 0x8672
+0xE2E4 = 0x8673
+0xE2E5 = 0x8674
+0xE2E6 = 0x8675
+0xE2E7 = 0x8676
+0xE2E8 = 0x8677
+0xE2E9 = 0x8678
+0xE2EA = 0x8679
+0xE2EB = 0x867A
+0xE2EC = 0x867B
+0xE2ED = 0x867C
+0xE2EE = 0x867D
+0xE2EF = 0x867E
+0xE2F0 = 0x8721
+0xE2F1 = 0x8722
+0xE2F2 = 0x8723
+0xE2F3 = 0x8724
+0xE2F4 = 0x8725
+0xE2F5 = 0x8726
+0xE2F6 = 0x8727
+0xE2F7 = 0x8728
+0xE2F8 = 0x8729
+0xE2F9 = 0x872A
+0xE2FA = 0x872B
+0xE2FB = 0x872C
+0xE2FC = 0x872D
+0xE2FD = 0x872E
+0xE2FE = 0x872F
+0xE2FF = 0x8730
+0xE300 = 0x8731
+0xE301 = 0x8732
+0xE302 = 0x8733
+0xE303 = 0x8734
+0xE304 = 0x8735
+0xE305 = 0x8736
+0xE306 = 0x8737
+0xE307 = 0x8738
+0xE308 = 0x8739
+0xE309 = 0x873A
+0xE30A = 0x873B
+0xE30B = 0x873C
+0xE30C = 0x873D
+0xE30D = 0x873E
+0xE30E = 0x873F
+0xE30F = 0x8740
+0xE310 = 0x8741
+0xE311 = 0x8742
+0xE312 = 0x8743
+0xE313 = 0x8744
+0xE314 = 0x8745
+0xE315 = 0x8746
+0xE316 = 0x8747
+0xE317 = 0x8748
+0xE318 = 0x8749
+0xE319 = 0x874A
+0xE31A = 0x874B
+0xE31B = 0x874C
+0xE31C = 0x874D
+0xE31D = 0x874E
+0xE31E = 0x874F
+0xE31F = 0x8750
+0xE320 = 0x8751
+0xE321 = 0x8752
+0xE322 = 0x8753
+0xE323 = 0x8754
+0xE324 = 0x8755
+0xE325 = 0x8756
+0xE326 = 0x8757
+0xE327 = 0x8758
+0xE328 = 0x8759
+0xE329 = 0x875A
+0xE32A = 0x875B
+0xE32B = 0x875C
+0xE32C = 0x875D
+0xE32D = 0x875E
+0xE32E = 0x875F
+0xE32F = 0x8760
+0xE330 = 0x8761
+0xE331 = 0x8762
+0xE332 = 0x8763
+0xE333 = 0x8764
+0xE334 = 0x8765
+0xE335 = 0x8766
+0xE336 = 0x8767
+0xE337 = 0x8768
+0xE338 = 0x8769
+0xE339 = 0x876A
+0xE33A = 0x876B
+0xE33B = 0x876C
+0xE33C = 0x876D
+0xE33D = 0x876E
+0xE33E = 0x876F
+0xE33F = 0x8770
+0xE340 = 0x8771
+0xE341 = 0x8772
+0xE342 = 0x8773
+0xE343 = 0x8774
+0xE344 = 0x8775
+0xE345 = 0x8776
+0xE346 = 0x8777
+0xE347 = 0x8778
+0xE348 = 0x8779
+0xE349 = 0x877A
+0xE34A = 0x877B
+0xE34B = 0x877C
+0xE34C = 0x877D
+0xE34D = 0x877E
+0xE34E = 0x8821
+0xE34F = 0x8822
+0xE350 = 0x8823
+0xE351 = 0x8824
+0xE352 = 0x8825
+0xE353 = 0x8826
+0xE354 = 0x8827
+0xE355 = 0x8828
+0xE356 = 0x8829
+0xE357 = 0x882A
+0xE358 = 0x882B
+0xE359 = 0x882C
+0xE35A = 0x882D
+0xE35B = 0x882E
+0xE35C = 0x882F
+0xE35D = 0x8830
+0xE35E = 0x8831
+0xE35F = 0x8832
+0xE360 = 0x8833
+0xE361 = 0x8834
+0xE362 = 0x8835
+0xE363 = 0x8836
+0xE364 = 0x8837
+0xE365 = 0x8838
+0xE366 = 0x8839
+0xE367 = 0x883A
+0xE368 = 0x883B
+0xE369 = 0x883C
+0xE36A = 0x883D
+0xE36B = 0x883E
+0xE36C = 0x883F
+0xE36D = 0x8840
+0xE36E = 0x8841
+0xE36F = 0x8842
+0xE370 = 0x8843
+0xE371 = 0x8844
+0xE372 = 0x8845
+0xE373 = 0x8846
+0xE374 = 0x8847
+0xE375 = 0x8848
+0xE376 = 0x8849
+0xE377 = 0x884A
+0xE378 = 0x884B
+0xE379 = 0x884C
+0xE37A = 0x884D
+0xE37B = 0x884E
+0xE37C = 0x884F
+0xE37D = 0x8850
+0xE37E = 0x8851
+0xE37F = 0x8852
+0xE380 = 0x8853
+0xE381 = 0x8854
+0xE382 = 0x8855
+0xE383 = 0x8856
+0xE384 = 0x8857
+0xE385 = 0x8858
+0xE386 = 0x8859
+0xE387 = 0x885A
+0xE388 = 0x885B
+0xE389 = 0x885C
+0xE38A = 0x885D
+0xE38B = 0x885E
+0xE38C = 0x885F
+0xE38D = 0x8860
+0xE38E = 0x8861
+0xE38F = 0x8862
+0xE390 = 0x8863
+0xE391 = 0x8864
+0xE392 = 0x8865
+0xE393 = 0x8866
+0xE394 = 0x8867
+0xE395 = 0x8868
+0xE396 = 0x8869
+0xE397 = 0x886A
+0xE398 = 0x886B
+0xE399 = 0x886C
+0xE39A = 0x886D
+0xE39B = 0x886E
+0xE39C = 0x886F
+0xE39D = 0x8870
+0xE39E = 0x8871
+0xE39F = 0x8872
+0xE3A0 = 0x8873
+0xE3A1 = 0x8874
+0xE3A2 = 0x8875
+0xE3A3 = 0x8876
+0xE3A4 = 0x8877
+0xE3A5 = 0x8878
+0xE3A6 = 0x8879
+0xE3A7 = 0x887A
+0xE3A8 = 0x887B
+0xE3A9 = 0x887C
+0xE3AA = 0x887D
+0xE3AB = 0x887E
+0xE3AC = 0x8921
+0xE3AD = 0x8922
+0xE3AE = 0x8923
+0xE3AF = 0x8924
+0xE3B0 = 0x8925
+0xE3B1 = 0x8926
+0xE3B2 = 0x8927
+0xE3B3 = 0x8928
+0xE3B4 = 0x8929
+0xE3B5 = 0x892A
+0xE3B6 = 0x892B
+0xE3B7 = 0x892C
+0xE3B8 = 0x892D
+0xE3B9 = 0x892E
+0xE3BA = 0x892F
+0xE3BB = 0x8930
+0xE3BC = 0x8931
+0xE3BD = 0x8932
+0xE3BE = 0x8933
+0xE3BF = 0x8934
+0xE3C0 = 0x8935
+0xE3C1 = 0x8936
+0xE3C2 = 0x8937
+0xE3C3 = 0x8938
+0xE3C4 = 0x8939
+0xE3C5 = 0x893A
+0xE3C6 = 0x893B
+0xE3C7 = 0x893C
+0xE3C8 = 0x893D
+0xE3C9 = 0x893E
+0xE3CA = 0x893F
+0xE3CB = 0x8940
+0xE3CC = 0x8941
+0xE3CD = 0x8942
+0xE3CE = 0x8943
+0xE3CF = 0x8944
+0xE3D0 = 0x8945
+0xE3D1 = 0x8946
+0xE3D2 = 0x8947
+0xE3D3 = 0x8948
+0xE3D4 = 0x8949
+0xE3D5 = 0x894A
+0xE3D6 = 0x894B
+0xE3D7 = 0x894C
+0xE3D8 = 0x894D
+0xE3D9 = 0x894E
+0xE3DA = 0x894F
+0xE3DB = 0x8950
+0xE3DC = 0x8951
+0xE3DD = 0x8952
+0xE3DE = 0x8953
+0xE3DF = 0x8954
+0xE3E0 = 0x8955
+0xE3E1 = 0x8956
+0xE3E2 = 0x8957
+0xE3E3 = 0x8958
+0xE3E4 = 0x8959
+0xE3E5 = 0x895A
+0xE3E6 = 0x895B
+0xE3E7 = 0x895C
+0xE3E8 = 0x895D
+0xE3E9 = 0x895E
+0xE3EA = 0x895F
+0xE3EB = 0x8960
+0xE3EC = 0x8961
+0xE3ED = 0x8962
+0xE3EE = 0x8963
+0xE3EF = 0x8964
+0xE3F0 = 0x8965
+0xE3F1 = 0x8966
+0xE3F2 = 0x8967
+0xE3F3 = 0x8968
+0xE3F4 = 0x8969
+0xE3F5 = 0x896A
+0xE3F6 = 0x896B
+0xE3F7 = 0x896C
+0xE3F8 = 0x896D
+0xE3F9 = 0x896E
+0xE3FA = 0x896F
+0xE3FB = 0x8970
+0xE3FC = 0x8971
+0xE3FD = 0x8972
+0xE3FE = 0x8973
+0xE3FF = 0x8974
+0xE400 = 0x8975
+0xE401 = 0x8976
+0xE402 = 0x8977
+0xE403 = 0x8978
+0xE404 = 0x8979
+0xE405 = 0x897A
+0xE406 = 0x897B
+0xE407 = 0x897C
+0xE408 = 0x897D
+0xE409 = 0x897E
+0xE40A = 0x8A21
+0xE40B = 0x8A22
+0xE40C = 0x8A23
+0xE40D = 0x8A24
+0xE40E = 0x8A25
+0xE40F = 0x8A26
+0xE410 = 0x8A27
+0xE411 = 0x8A28
+0xE412 = 0x8A29
+0xE413 = 0x8A2A
+0xE414 = 0x8A2B
+0xE415 = 0x8A2C
+0xE416 = 0x8A2D
+0xE417 = 0x8A2E
+0xE418 = 0x8A2F
+0xE419 = 0x8A30
+0xE41A = 0x8A31
+0xE41B = 0x8A32
+0xE41C = 0x8A33
+0xE41D = 0x8A34
+0xE41E = 0x8A35
+0xE41F = 0x8A36
+0xE420 = 0x8A37
+0xE421 = 0x8A38
+0xE422 = 0x8A39
+0xE423 = 0x8A3A
+0xE424 = 0x8A3B
+0xE425 = 0x8A3C
+0xE426 = 0x8A3D
+0xE427 = 0x8A3E
+0xE428 = 0x8A3F
+0xE429 = 0x8A40
+0xE42A = 0x8A41
+0xE42B = 0x8A42
+0xE42C = 0x8A43
+0xE42D = 0x8A44
+0xE42E = 0x8A45
+0xE42F = 0x8A46
+0xE430 = 0x8A47
+0xE431 = 0x8A48
+0xE432 = 0x8A49
+0xE433 = 0x8A4A
+0xE434 = 0x8A4B
+0xE435 = 0x8A4C
+0xE436 = 0x8A4D
+0xE437 = 0x8A4E
+0xE438 = 0x8A4F
+0xE439 = 0x8A50
+0xE43A = 0x8A51
+0xE43B = 0x8A52
+0xE43C = 0x8A53
+0xE43D = 0x8A54
+0xE43E = 0x8A55
+0xE43F = 0x8A56
+0xE440 = 0x8A57
+0xE441 = 0x8A58
+0xE442 = 0x8A59
+0xE443 = 0x8A5A
+0xE444 = 0x8A5B
+0xE445 = 0x8A5C
+0xE446 = 0x8A5D
+0xE447 = 0x8A5E
+0xE448 = 0x8A5F
+0xE449 = 0x8A60
+0xE44A = 0x8A61
+0xE44B = 0x8A62
+0xE44C = 0x8A63
+0xE44D = 0x8A64
+0xE44E = 0x8A65
+0xE44F = 0x8A66
+0xE450 = 0x8A67
+0xE451 = 0x8A68
+0xE452 = 0x8A69
+0xE453 = 0x8A6A
+0xE454 = 0x8A6B
+0xE455 = 0x8A6C
+0xE456 = 0x8A6D
+0xE457 = 0x8A6E
+0xE458 = 0x8A6F
+0xE459 = 0x8A70
+0xE45A = 0x8A71
+0xE45B = 0x8A72
+0xE45C = 0x8A73
+0xE45D = 0x8A74
+0xE45E = 0x8A75
+0xE45F = 0x8A76
+0xE460 = 0x8A77
+0xE461 = 0x8A78
+0xE462 = 0x8A79
+0xE463 = 0x8A7A
+0xE464 = 0x8A7B
+0xE465 = 0x8A7C
+0xE466 = 0x8A7D
+0xE467 = 0x8A7E
+0xE468 = 0x8B21
+0xE469 = 0x8B22
+0xE46A = 0x8B23
+0xE46B = 0x8B24
+0xE46C = 0x8B25
+0xE46D = 0x8B26
+0xE46E = 0x8B27
+0xE46F = 0x8B28
+0xE470 = 0x8B29
+0xE471 = 0x8B2A
+0xE472 = 0x8B2B
+0xE473 = 0x8B2C
+0xE474 = 0x8B2D
+0xE475 = 0x8B2E
+0xE476 = 0x8B2F
+0xE477 = 0x8B30
+0xE478 = 0x8B31
+0xE479 = 0x8B32
+0xE47A = 0x8B33
+0xE47B = 0x8B34
+0xE47C = 0x8B35
+0xE47D = 0x8B36
+0xE47E = 0x8B37
+0xE47F = 0x8B38
+0xE480 = 0x8B39
+0xE481 = 0x8B3A
+0xE482 = 0x8B3B
+0xE483 = 0x8B3C
+0xE484 = 0x8B3D
+0xE485 = 0x8B3E
+0xE486 = 0x8B3F
+0xE487 = 0x8B40
+0xE488 = 0x8B41
+0xE489 = 0x8B42
+0xE48A = 0x8B43
+0xE48B = 0x8B44
+0xE48C = 0x8B45
+0xE48D = 0x8B46
+0xE48E = 0x8B47
+0xE48F = 0x8B48
+0xE490 = 0x8B49
+0xE491 = 0x8B4A
+0xE492 = 0x8B4B
+0xE493 = 0x8B4C
+0xE494 = 0x8B4D
+0xE495 = 0x8B4E
+0xE496 = 0x8B4F
+0xE497 = 0x8B50
+0xE498 = 0x8B51
+0xE499 = 0x8B52
+0xE49A = 0x8B53
+0xE49B = 0x8B54
+0xE49C = 0x8B55
+0xE49D = 0x8B56
+0xE49E = 0x8B57
+0xE49F = 0x8B58
+0xE4A0 = 0x8B59
+0xE4A1 = 0x8B5A
+0xE4A2 = 0x8B5B
+0xE4A3 = 0x8B5C
+0xE4A4 = 0x8B5D
+0xE4A5 = 0x8B5E
+0xE4A6 = 0x8B5F
+0xE4A7 = 0x8B60
+0xE4A8 = 0x8B61
+0xE4A9 = 0x8B62
+0xE4AA = 0x8B63
+0xE4AB = 0x8B64
+0xE4AC = 0x8B65
+0xE4AD = 0x8B66
+0xE4AE = 0x8B67
+0xE4AF = 0x8B68
+0xE4B0 = 0x8B69
+0xE4B1 = 0x8B6A
+0xE4B2 = 0x8B6B
+0xE4B3 = 0x8B6C
+0xE4B4 = 0x8B6D
+0xE4B5 = 0x8B6E
+0xE4B6 = 0x8B6F
+0xE4B7 = 0x8B70
+0xE4B8 = 0x8B71
+0xE4B9 = 0x8B72
+0xE4BA = 0x8B73
+0xE4BB = 0x8B74
+0xE4BC = 0x8B75
+0xE4BD = 0x8B76
+0xE4BE = 0x8B77
+0xE4BF = 0x8B78
+0xE4C0 = 0x8B79
+0xE4C1 = 0x8B7A
+0xE4C2 = 0x8B7B
+0xE4C3 = 0x8B7C
+0xE4C4 = 0x8B7D
+0xE4C5 = 0x8B7E
+0xE4C6 = 0x8C21
+0xE4C7 = 0x8C22
+0xE4C8 = 0x8C23
+0xE4C9 = 0x8C24
+0xE4CA = 0x8C25
+0xE4CB = 0x8C26
+0xE4CC = 0x8C27
+0xE4CD = 0x8C28
+0xE4CE = 0x8C29
+0xE4CF = 0x8C2A
+0xE4D0 = 0x8C2B
+0xE4D1 = 0x8C2C
+0xE4D2 = 0x8C2D
+0xE4D3 = 0x8C2E
+0xE4D4 = 0x8C2F
+0xE4D5 = 0x8C30
+0xE4D6 = 0x8C31
+0xE4D7 = 0x8C32
+0xE4D8 = 0x8C33
+0xE4D9 = 0x8C34
+0xE4DA = 0x8C35
+0xE4DB = 0x8C36
+0xE4DC = 0x8C37
+0xE4DD = 0x8C38
+0xE4DE = 0x8C39
+0xE4DF = 0x8C3A
+0xE4E0 = 0x8C3B
+0xE4E1 = 0x8C3C
+0xE4E2 = 0x8C3D
+0xE4E3 = 0x8C3E
+0xE4E4 = 0x8C3F
+0xE4E5 = 0x8C40
+0xE4E6 = 0x8C41
+0xE4E7 = 0x8C42
+0xE4E8 = 0x8C43
+0xE4E9 = 0x8C44
+0xE4EA = 0x8C45
+0xE4EB = 0x8C46
+0xE4EC = 0x8C47
+0xE4ED = 0x8C48
+0xE4EE = 0x8C49
+0xE4EF = 0x8C4A
+0xE4F0 = 0x8C4B
+0xE4F1 = 0x8C4C
+0xE4F2 = 0x8C4D
+0xE4F3 = 0x8C4E
+0xE4F4 = 0x8C4F
+0xE4F5 = 0x8C50
+0xE4F6 = 0x8C51
+0xE4F7 = 0x8C52
+0xE4F8 = 0x8C53
+0xE4F9 = 0x8C54
+0xE4FA = 0x8C55
+0xE4FB = 0x8C56
+0xE4FC = 0x8C57
+0xE4FD = 0x8C58
+0xE4FE = 0x8C59
+0xE4FF = 0x8C5A
+0xE500 = 0x8C5B
+0xE501 = 0x8C5C
+0xE502 = 0x8C5D
+0xE503 = 0x8C5E
+0xE504 = 0x8C5F
+0xE505 = 0x8C60
+0xE506 = 0x8C61
+0xE507 = 0x8C62
+0xE508 = 0x8C63
+0xE509 = 0x8C64
+0xE50A = 0x8C65
+0xE50B = 0x8C66
+0xE50C = 0x8C67
+0xE50D = 0x8C68
+0xE50E = 0x8C69
+0xE50F = 0x8C6A
+0xE510 = 0x8C6B
+0xE511 = 0x8C6C
+0xE512 = 0x8C6D
+0xE513 = 0x8C6E
+0xE514 = 0x8C6F
+0xE515 = 0x8C70
+0xE516 = 0x8C71
+0xE517 = 0x8C72
+0xE518 = 0x8C73
+0xE519 = 0x8C74
+0xE51A = 0x8C75
+0xE51B = 0x8C76
+0xE51C = 0x8C77
+0xE51D = 0x8C78
+0xE51E = 0x8C79
+0xE51F = 0x8C7A
+0xE520 = 0x8C7B
+0xE521 = 0x8C7C
+0xE522 = 0x8C7D
+0xE523 = 0x8C7E
+0xE524 = 0x8D21
+0xE525 = 0x8D22
+0xE526 = 0x8D23
+0xE527 = 0x8D24
+0xE528 = 0x8D25
+0xE529 = 0x8D26
+0xE52A = 0x8D27
+0xE52B = 0x8D28
+0xE52C = 0x8D29
+0xE52D = 0x8D2A
+0xE52E = 0x8D2B
+0xE52F = 0x8D2C
+0xE530 = 0x8D2D
+0xE531 = 0x8D2E
+0xE532 = 0x8D2F
+0xE533 = 0x8D30
+0xE534 = 0x8D31
+0xE535 = 0x8D32
+0xE536 = 0x8D33
+0xE537 = 0x8D34
+0xE538 = 0x8D35
+0xE539 = 0x8D36
+0xE53A = 0x8D37
+0xE53B = 0x8D38
+0xE53C = 0x8D39
+0xE53D = 0x8D3A
+0xE53E = 0x8D3B
+0xE53F = 0x8D3C
+0xE540 = 0x8D3D
+0xE541 = 0x8D3E
+0xE542 = 0x8D3F
+0xE543 = 0x8D40
+0xE544 = 0x8D41
+0xE545 = 0x8D42
+0xE546 = 0x8D43
+0xE547 = 0x8D44
+0xE548 = 0x8D45
+0xE549 = 0x8D46
+0xE54A = 0x8D47
+0xE54B = 0x8D48
+0xE54C = 0x8D49
+0xE54D = 0x8D4A
+0xE54E = 0x8D4B
+0xE54F = 0x8D4C
+0xE550 = 0x8D4D
+0xE551 = 0x8D4E
+0xE552 = 0x8D4F
+0xE553 = 0x8D50
+0xE554 = 0x8D51
+0xE555 = 0x8D52
+0xE556 = 0x8D53
+0xE557 = 0x8D54
+0xE558 = 0x8D55
+0xE559 = 0x8D56
+0xE55A = 0x8D57
+0xE55B = 0x8D58
+0xE55C = 0x8D59
+0xE55D = 0x8D5A
+0xE55E = 0x8D5B
+0xE55F = 0x8D5C
+0xE560 = 0x8D5D
+0xE561 = 0x8D5E
+0xE562 = 0x8D5F
+0xE563 = 0x8D60
+0xE564 = 0x8D61
+0xE565 = 0x8D62
+0xE566 = 0x8D63
+0xE567 = 0x8D64
+0xE568 = 0x8D65
+0xE569 = 0x8D66
+0xE56A = 0x8D67
+0xE56B = 0x8D68
+0xE56C = 0x8D69
+0xE56D = 0x8D6A
+0xE56E = 0x8D6B
+0xE56F = 0x8D6C
+0xE570 = 0x8D6D
+0xE571 = 0x8D6E
+0xE572 = 0x8D6F
+0xE573 = 0x8D70
+0xE574 = 0x8D71
+0xE575 = 0x8D72
+0xE576 = 0x8D73
+0xE577 = 0x8D74
+0xE578 = 0x8D75
+0xE579 = 0x8D76
+0xE57A = 0x8D77
+0xE57B = 0x8D78
+0xE57C = 0x8D79
+0xE57D = 0x8D7A
+0xE57E = 0x8D7B
+0xE57F = 0x8D7C
+0xE580 = 0x8D7D
+0xE581 = 0x8D7E
+0xE582 = 0x8E21
+0xE583 = 0x8E22
+0xE584 = 0x8E23
+0xE585 = 0x8E24
+0xE586 = 0x8E25
+0xE587 = 0x8E26
+0xE588 = 0x8E27
+0xE589 = 0x8E28
+0xE58A = 0x8E29
+0xE58B = 0x8E2A
+0xE58C = 0x8E2B
+0xE58D = 0x8E2C
+0xE58E = 0x8E2D
+0xE58F = 0x8E2E
+0xE590 = 0x8E2F
+0xE591 = 0x8E30
+0xE592 = 0x8E31
+0xE593 = 0x8E32
+0xE594 = 0x8E33
+0xE595 = 0x8E34
+0xE596 = 0x8E35
+0xE597 = 0x8E36
+0xE598 = 0x8E37
+0xE599 = 0x8E38
+0xE59A = 0x8E39
+0xE59B = 0x8E3A
+0xE59C = 0x8E3B
+0xE59D = 0x8E3C
+0xE59E = 0x8E3D
+0xE59F = 0x8E3E
+0xE5A0 = 0x8E3F
+0xE5A1 = 0x8E40
+0xE5A2 = 0x8E41
+0xE5A3 = 0x8E42
+0xE5A4 = 0x8E43
+0xE5A5 = 0x8E44
+0xE5A6 = 0x8E45
+0xE5A7 = 0x8E46
+0xE5A8 = 0x8E47
+0xE5A9 = 0x8E48
+0xE5AA = 0x8E49
+0xE5AB = 0x8E4A
+0xE5AC = 0x8E4B
+0xE5AD = 0x8E4C
+0xE5AE = 0x8E4D
+0xE5AF = 0x8E4E
+0xE5B0 = 0x8E4F
+0xE5B1 = 0x8E50
+0xE5B2 = 0x8E51
+0xE5B3 = 0x8E52
+0xE5B4 = 0x8E53
+0xE5B5 = 0x8E54
+0xE5B6 = 0x8E55
+0xE5B7 = 0x8E56
+0xE5B8 = 0x8E57
+0xE5B9 = 0x8E58
+0xE5BA = 0x8E59
+0xE5BB = 0x8E5A
+0xE5BC = 0x8E5B
+0xE5BD = 0x8E5C
+0xE5BE = 0x8E5D
+0xE5BF = 0x8E5E
+0xE5C0 = 0x8E5F
+0xE5C1 = 0x8E60
+0xE5C2 = 0x8E61
+0xE5C3 = 0x8E62
+0xE5C4 = 0x8E63
+0xE5C5 = 0x8E64
+0xE5C6 = 0x8E65
+0xE5C7 = 0x8E66
+0xE5C8 = 0x8E67
+0xE5C9 = 0x8E68
+0xE5CA = 0x8E69
+0xE5CB = 0x8E6A
+0xE5CC = 0x8E6B
+0xE5CD = 0x8E6C
+0xE5CE = 0x8E6D
+0xE5CF = 0x8E6E
+0xE5D0 = 0x8E6F
+0xE5D1 = 0x8E70
+0xE5D2 = 0x8E71
+0xE5D3 = 0x8E72
+0xE5D4 = 0x8E73
+0xE5D5 = 0x8E74
+0xE5D6 = 0x8E75
+0xE5D7 = 0x8E76
+0xE5D8 = 0x8E77
+0xE5D9 = 0x8E78
+0xE5DA = 0x8E79
+0xE5DB = 0x8E7A
+0xE5DC = 0x8E7B
+0xE5DD = 0x8E7C
+0xE5DE = 0x8E7D
+0xE5DF = 0x8E7E
+0xE5E0 = 0x8F21
+0xE5E1 = 0x8F22
+0xE5E2 = 0x8F23
+0xE5E3 = 0x8F24
+0xE5E4 = 0x8F25
+0xE5E5 = 0x8F26
+0xE5E6 = 0x8F27
+0xE5E7 = 0x8F28
+0xE5E8 = 0x8F29
+0xE5E9 = 0x8F2A
+0xE5EA = 0x8F2B
+0xE5EB = 0x8F2C
+0xE5EC = 0x8F2D
+0xE5ED = 0x8F2E
+0xE5EE = 0x8F2F
+0xE5EF = 0x8F30
+0xE5F0 = 0x8F31
+0xE5F1 = 0x8F32
+0xE5F2 = 0x8F33
+0xE5F3 = 0x8F34
+0xE5F4 = 0x8F35
+0xE5F5 = 0x8F36
+0xE5F6 = 0x8F37
+0xE5F7 = 0x8F38
+0xE5F8 = 0x8F39
+0xE5F9 = 0x8F3A
+0xE5FA = 0x8F3B
+0xE5FB = 0x8F3C
+0xE5FC = 0x8F3D
+0xE5FD = 0x8F3E
+0xE5FE = 0x8F3F
+0xE5FF = 0x8F40
+0xE600 = 0x8F41
+0xE601 = 0x8F42
+0xE602 = 0x8F43
+0xE603 = 0x8F44
+0xE604 = 0x8F45
+0xE605 = 0x8F46
+0xE606 = 0x8F47
+0xE607 = 0x8F48
+0xE608 = 0x8F49
+0xE609 = 0x8F4A
+0xE60A = 0x8F4B
+0xE60B = 0x8F4C
+0xE60C = 0x8F4D
+0xE60D = 0x8F4E
+0xE60E = 0x8F4F
+0xE60F = 0x8F50
+0xE610 = 0x8F51
+0xE611 = 0x8F52
+0xE612 = 0x8F53
+0xE613 = 0x8F54
+0xE614 = 0x8F55
+0xE615 = 0x8F56
+0xE616 = 0x8F57
+0xE617 = 0x8F58
+0xE618 = 0x8F59
+0xE619 = 0x8F5A
+0xE61A = 0x8F5B
+0xE61B = 0x8F5C
+0xE61C = 0x8F5D
+0xE61D = 0x8F5E
+0xE61E = 0x8F5F
+0xE61F = 0x8F60
+0xE620 = 0x8F61
+0xE621 = 0x8F62
+0xE622 = 0x8F63
+0xE623 = 0x8F64
+0xE624 = 0x8F65
+0xE625 = 0x8F66
+0xE626 = 0x8F67
+0xE627 = 0x8F68
+0xE628 = 0x8F69
+0xE629 = 0x8F6A
+0xE62A = 0x8F6B
+0xE62B = 0x8F6C
+0xE62C = 0x8F6D
+0xE62D = 0x8F6E
+0xE62E = 0x8F6F
+0xE62F = 0x8F70
+0xE630 = 0x8F71
+0xE631 = 0x8F72
+0xE632 = 0x8F73
+0xE633 = 0x8F74
+0xE634 = 0x8F75
+0xE635 = 0x8F76
+0xE636 = 0x8F77
+0xE637 = 0x8F78
+0xE638 = 0x8F79
+0xE639 = 0x8F7A
+0xE63A = 0x8F7B
+0xE63B = 0x8F7C
+0xE63C = 0x8F7D
+0xE63D = 0x8F7E
+0xE63E = 0x9021
+0xE63F = 0x9022
+0xE640 = 0x9023
+0xE641 = 0x9024
+0xE642 = 0x9025
+0xE643 = 0x9026
+0xE644 = 0x9027
+0xE645 = 0x9028
+0xE646 = 0x9029
+0xE647 = 0x902A
+0xE648 = 0x902B
+0xE649 = 0x902C
+0xE64A = 0x902D
+0xE64B = 0x902E
+0xE64C = 0x902F
+0xE64D = 0x9030
+0xE64E = 0x9031
+0xE64F = 0x9032
+0xE650 = 0x9033
+0xE651 = 0x9034
+0xE652 = 0x9035
+0xE653 = 0x9036
+0xE654 = 0x9037
+0xE655 = 0x9038
+0xE656 = 0x9039
+0xE657 = 0x903A
+0xE658 = 0x903B
+0xE659 = 0x903C
+0xE65A = 0x903D
+0xE65B = 0x903E
+0xE65C = 0x903F
+0xE65D = 0x9040
+0xE65E = 0x9041
+0xE65F = 0x9042
+0xE660 = 0x9043
+0xE661 = 0x9044
+0xE662 = 0x9045
+0xE663 = 0x9046
+0xE664 = 0x9047
+0xE665 = 0x9048
+0xE666 = 0x9049
+0xE667 = 0x904A
+0xE668 = 0x904B
+0xE669 = 0x904C
+0xE66A = 0x904D
+0xE66B = 0x904E
+0xE66C = 0x904F
+0xE66D = 0x9050
+0xE66E = 0x9051
+0xE66F = 0x9052
+0xE670 = 0x9053
+0xE671 = 0x9054
+0xE672 = 0x9055
+0xE673 = 0x9056
+0xE674 = 0x9057
+0xE675 = 0x9058
+0xE676 = 0x9059
+0xE677 = 0x905A
+0xE678 = 0x905B
+0xE679 = 0x905C
+0xE67A = 0x905D
+0xE67B = 0x905E
+0xE67C = 0x905F
+0xE67D = 0x9060
+0xE67E = 0x9061
+0xE67F = 0x9062
+0xE680 = 0x9063
+0xE681 = 0x9064
+0xE682 = 0x9065
+0xE683 = 0x9066
+0xE684 = 0x9067
+0xE685 = 0x9068
+0xE686 = 0x9069
+0xE687 = 0x906A
+0xE688 = 0x906B
+0xE689 = 0x906C
+0xE68A = 0x906D
+0xE68B = 0x906E
+0xE68C = 0x906F
+0xE68D = 0x9070
+0xE68E = 0x9071
+0xE68F = 0x9072
+0xE690 = 0x9073
+0xE691 = 0x9074
+0xE692 = 0x9075
+0xE693 = 0x9076
+0xE694 = 0x9077
+0xE695 = 0x9078
+0xE696 = 0x9079
+0xE697 = 0x907A
+0xE698 = 0x907B
+0xE699 = 0x907C
+0xE69A = 0x907D
+0xE69B = 0x907E
+0xE69C = 0x9121
+0xE69D = 0x9122
+0xE69E = 0x9123
+0xE69F = 0x9124
+0xE6A0 = 0x9125
+0xE6A1 = 0x9126
+0xE6A2 = 0x9127
+0xE6A3 = 0x9128
+0xE6A4 = 0x9129
+0xE6A5 = 0x912A
+0xE6A6 = 0x912B
+0xE6A7 = 0x912C
+0xE6A8 = 0x912D
+0xE6A9 = 0x912E
+0xE6AA = 0x912F
+0xE6AB = 0x9130
+0xE6AC = 0x9131
+0xE6AD = 0x9132
+0xE6AE = 0x9133
+0xE6AF = 0x9134
+0xE6B0 = 0x9135
+0xE6B1 = 0x9136
+0xE6B2 = 0x9137
+0xE6B3 = 0x9138
+0xE6B4 = 0x9139
+0xE6B5 = 0x913A
+0xE6B6 = 0x913B
+0xE6B7 = 0x913C
+0xE6B8 = 0x913D
+0xE6B9 = 0x913E
+0xE6BA = 0x913F
+0xE6BB = 0x9140
+0xE6BC = 0x9141
+0xE6BD = 0x9142
+0xE6BE = 0x9143
+0xE6BF = 0x9144
+0xE6C0 = 0x9145
+0xE6C1 = 0x9146
+0xE6C2 = 0x9147
+0xE6C3 = 0x9148
+0xE6C4 = 0x9149
+0xE6C5 = 0x914A
+0xE6C6 = 0x914B
+0xE6C7 = 0x914C
+0xE6C8 = 0x914D
+0xE6C9 = 0x914E
+0xE6CA = 0x914F
+0xE6CB = 0x9150
+0xE6CC = 0x9151
+0xE6CD = 0x9152
+0xE6CE = 0x9153
+0xE6CF = 0x9154
+0xE6D0 = 0x9155
+0xE6D1 = 0x9156
+0xE6D2 = 0x9157
+0xE6D3 = 0x9158
+0xE6D4 = 0x9159
+0xE6D5 = 0x915A
+0xE6D6 = 0x915B
+0xE6D7 = 0x915C
+0xE6D8 = 0x915D
+0xE6D9 = 0x915E
+0xE6DA = 0x915F
+0xE6DB = 0x9160
+0xE6DC = 0x9161
+0xE6DD = 0x9162
+0xE6DE = 0x9163
+0xE6DF = 0x9164
+0xE6E0 = 0x9165
+0xE6E1 = 0x9166
+0xE6E2 = 0x9167
+0xE6E3 = 0x9168
+0xE6E4 = 0x9169
+0xE6E5 = 0x916A
+0xE6E6 = 0x916B
+0xE6E7 = 0x916C
+0xE6E8 = 0x916D
+0xE6E9 = 0x916E
+0xE6EA = 0x916F
+0xE6EB = 0x9170
+0xE6EC = 0x9171
+0xE6ED = 0x9172
+0xE6EE = 0x9173
+0xE6EF = 0x9174
+0xE6F0 = 0x9175
+0xE6F1 = 0x9176
+0xE6F2 = 0x9177
+0xE6F3 = 0x9178
+0xE6F4 = 0x9179
+0xE6F5 = 0x917A
+0xE6F6 = 0x917B
+0xE6F7 = 0x917C
+0xE6F8 = 0x917D
+0xE6F9 = 0x917E
+0xE6FA = 0x9221
+0xE6FB = 0x9222
+0xE6FC = 0x9223
+0xE6FD = 0x9224
+0xE6FE = 0x9225
+0xE6FF = 0x9226
+0xE700 = 0x9227
+0xE701 = 0x9228
+0xE702 = 0x9229
+0xE703 = 0x922A
+0xE704 = 0x922B
+0xE705 = 0x922C
+0xE706 = 0x922D
+0xE707 = 0x922E
+0xE708 = 0x922F
+0xE709 = 0x9230
+0xE70A = 0x9231
+0xE70B = 0x9232
+0xE70C = 0x9233
+0xE70D = 0x9234
+0xE70E = 0x9235
+0xE70F = 0x9236
+0xE710 = 0x9237
+0xE711 = 0x9238
+0xE712 = 0x9239
+0xE713 = 0x923A
+0xE714 = 0x923B
+0xE715 = 0x923C
+0xE716 = 0x923D
+0xE717 = 0x923E
+0xE718 = 0x923F
+0xE719 = 0x9240
+0xE71A = 0x9241
+0xE71B = 0x9242
+0xE71C = 0x9243
+0xE71D = 0x9244
+0xE71E = 0x9245
+0xE71F = 0x9246
+0xE720 = 0x9247
+0xE721 = 0x9248
+0xE722 = 0x9249
+0xE723 = 0x924A
+0xE724 = 0x924B
+0xE725 = 0x924C
+0xE726 = 0x924D
+0xE727 = 0x924E
+0xE728 = 0x924F
+0xE729 = 0x9250
+0xE72A = 0x9251
+0xE72B = 0x9252
+0xE72C = 0x9253
+0xE72D = 0x9254
+0xE72E = 0x9255
+0xE72F = 0x9256
+0xE730 = 0x9257
+0xE731 = 0x9258
+0xE732 = 0x9259
+0xE733 = 0x925A
+0xE734 = 0x925B
+0xE735 = 0x925C
+0xE736 = 0x925D
+0xE737 = 0x925E
+0xE738 = 0x925F
+0xE739 = 0x9260
+0xE73A = 0x9261
+0xE73B = 0x9262
+0xE73C = 0x9263
+0xE73D = 0x9264
+0xE73E = 0x9265
+0xE73F = 0x9266
+0xE740 = 0x9267
+0xE741 = 0x9268
+0xE742 = 0x9269
+0xE743 = 0x926A
+0xE744 = 0x926B
+0xE745 = 0x926C
+0xE746 = 0x926D
+0xE747 = 0x926E
+0xE748 = 0x926F
+0xE749 = 0x9270
+0xE74A = 0x9271
+0xE74B = 0x9272
+0xE74C = 0x9273
+0xE74D = 0x9274
+0xE74E = 0x9275
+0xE74F = 0x9276
+0xE750 = 0x9277
+0xE751 = 0x9278
+0xE752 = 0x9279
+0xE753 = 0x927A
+0xE754 = 0x927B
+0xE755 = 0x927C
+0xE756 = 0x927D
+0xE757 = 0x927E
+END_MAP
diff --git a/enc/trans/CP/UCS%CP932VDC@IBM.src b/enc/trans/CP/UCS%CP932VDC@IBM.src
new file mode 100644
index 0000000000..78e9b316b4
--- /dev/null
+++ b/enc/trans/CP/UCS%CP932VDC@IBM.src
@@ -0,0 +1,420 @@
+# $NetBSD: UCS%CP932VDC@IBM.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/CP932VDC:IBM"
+SRC_ZONE	0x2116-0xFFE4
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#    Name:     cp932 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       cpxlate@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp932 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp932 order
+#
+0x2116 = 0x933A
+0x2121 = 0x933B
+0x2160 = 0x932B
+0x2161 = 0x932C
+0x2162 = 0x932D
+0x2163 = 0x932E
+0x2164 = 0x932F
+0x2165 = 0x9330
+0x2166 = 0x9331
+0x2167 = 0x9332
+0x2168 = 0x9333
+0x2169 = 0x9334
+0x2170 = 0x9321
+0x2171 = 0x9322
+0x2172 = 0x9323
+0x2173 = 0x9324
+0x2174 = 0x9325
+0x2175 = 0x9326
+0x2176 = 0x9327
+0x2177 = 0x9328
+0x2178 = 0x9329
+0x2179 = 0x932A
+0x2235 = 0x933C
+0x3231 = 0x9339
+0x4E28 = 0x9349
+0x4EE1 = 0x934A
+0x4EFC = 0x934B
+0x4F00 = 0x934C
+0x4F03 = 0x934D
+0x4F39 = 0x934E
+0x4F56 = 0x934F
+0x4F8A = 0x9351
+0x4F92 = 0x9350
+0x4F94 = 0x9353
+0x4F9A = 0x9352
+0x4FC9 = 0x9342
+0x4FCD = 0x9354
+0x4FFF = 0x9357
+0x501E = 0x9358
+0x5022 = 0x9356
+0x5040 = 0x9355
+0x5042 = 0x935B
+0x5046 = 0x9359
+0x5070 = 0x935A
+0x5094 = 0x935C
+0x50D8 = 0x935E
+0x50F4 = 0x935D
+0x514A = 0x935F
+0x5164 = 0x9360
+0x519D = 0x9361
+0x51BE = 0x9362
+0x51EC = 0x9363
+0x5215 = 0x9364
+0x529C = 0x9365
+0x52A6 = 0x9366
+0x52AF = 0x9558
+0x52C0 = 0x9367
+0x52DB = 0x9368
+0x5300 = 0x9369
+0x5307 = 0x936A
+0x5324 = 0x936B
+0x5372 = 0x936C
+0x5393 = 0x936D
+0x53B2 = 0x936E
+0x53DD = 0x936F
+0x548A = 0x9372
+0x549C = 0x9371
+0x54A9 = 0x9373
+0x54FF = 0x9374
+0x5586 = 0x9375
+0x5759 = 0x9376
+0x5765 = 0x9377
+0x57AC = 0x9378
+0x57C7 = 0x937A
+0x57C8 = 0x9379
+0x589E = 0x937D
+0x58B2 = 0x937E
+0x590B = 0x9421
+0x5953 = 0x9422
+0x595B = 0x9423
+0x595D = 0x9424
+0x5963 = 0x9425
+0x59A4 = 0x9426
+0x59BA = 0x9427
+0x5B56 = 0x9428
+0x5BC0 = 0x9429
+0x5BD8 = 0x942B
+0x5BEC = 0x942C
+0x5C1E = 0x942D
+0x5CA6 = 0x942E
+0x5CBA = 0x942F
+0x5CF5 = 0x9430
+0x5D27 = 0x9431
+0x5D42 = 0x9434
+0x5D53 = 0x9432
+0x5D6D = 0x9435
+0x5DB8 = 0x9436
+0x5DB9 = 0x9437
+0x5DD0 = 0x9438
+0x5F21 = 0x9439
+0x5F34 = 0x943A
+0x5F45 = 0x9348
+0x5F67 = 0x943B
+0x5FB7 = 0x943C
+0x5FDE = 0x943D
+0x605D = 0x943E
+0x6085 = 0x943F
+0x608A = 0x9440
+0x60D5 = 0x9442
+0x60DE = 0x9441
+0x60F2 = 0x9444
+0x6111 = 0x9445
+0x6120 = 0x9443
+0x6130 = 0x9447
+0x6137 = 0x9446
+0x6198 = 0x9448
+0x6213 = 0x9449
+0x62A6 = 0x944A
+0x63F5 = 0x944B
+0x6460 = 0x944C
+0x649D = 0x944D
+0x64CE = 0x944E
+0x654E = 0x944F
+0x6600 = 0x9450
+0x6609 = 0x9453
+0x6615 = 0x9451
+0x661E = 0x9455
+0x6624 = 0x9456
+0x662E = 0x9454
+0x6631 = 0x9344
+0x663B = 0x9452
+0x6657 = 0x9458
+0x6659 = 0x9459
+0x6665 = 0x9457
+0x6673 = 0x945B
+0x6699 = 0x945C
+0x66A0 = 0x945D
+0x66B2 = 0x945E
+0x66BF = 0x945F
+0x66FA = 0x9460
+0x66FB = 0x9347
+0x670E = 0x9461
+0x6766 = 0x9463
+0x67BB = 0x9464
+0x67C0 = 0x9466
+0x6801 = 0x9467
+0x6844 = 0x9468
+0x6852 = 0x9465
+0x68C8 = 0x9345
+0x68CF = 0x9469
+0x6968 = 0x946B
+0x6998 = 0x946D
+0x69E2 = 0x946E
+0x6A30 = 0x946F
+0x6A46 = 0x9471
+0x6A6B = 0x9470
+0x6A73 = 0x9472
+0x6A7E = 0x9473
+0x6AE2 = 0x9474
+0x6AE4 = 0x9475
+0x6BD6 = 0x9476
+0x6C3F = 0x9477
+0x6C5C = 0x9478
+0x6C6F = 0x947A
+0x6C86 = 0x9479
+0x6CDA = 0x947B
+0x6D04 = 0x947C
+0x6D6F = 0x947E
+0x6D87 = 0x947D
+0x6D96 = 0x9521
+0x6DAC = 0x9522
+0x6DCF = 0x9523
+0x6DF2 = 0x9525
+0x6DF8 = 0x9524
+0x6DFC = 0x9526
+0x6E27 = 0x9529
+0x6E39 = 0x9527
+0x6E3C = 0x952A
+0x6E5C = 0x9528
+0x6EBF = 0x952B
+0x6F88 = 0x952C
+0x6FB5 = 0x952D
+0x6FF5 = 0x952E
+0x7005 = 0x952F
+0x7007 = 0x9530
+0x7028 = 0x9531
+0x7085 = 0x9532
+0x70AB = 0x9533
+0x70BB = 0x9343
+0x7104 = 0x9535
+0x710F = 0x9534
+0x7146 = 0x9537
+0x7147 = 0x9538
+0x715C = 0x9536
+0x71C1 = 0x953A
+0x71FE = 0x953B
+0x72B1 = 0x953C
+0x72BE = 0x953D
+0x7324 = 0x953E
+0x7377 = 0x9540
+0x73BD = 0x9541
+0x73C9 = 0x9542
+0x73D2 = 0x9545
+0x73D6 = 0x9543
+0x73E3 = 0x9544
+0x73F5 = 0x9547
+0x7407 = 0x9546
+0x7426 = 0x9548
+0x7429 = 0x954A
+0x742A = 0x9549
+0x742E = 0x954B
+0x7462 = 0x954C
+0x7489 = 0x954D
+0x749F = 0x954E
+0x7501 = 0x954F
+0x752F = 0x942A
+0x756F = 0x9550
+0x7682 = 0x9551
+0x769B = 0x9554
+0x769C = 0x9552
+0x769E = 0x9553
+0x76A6 = 0x9555
+0x7746 = 0x9557
+0x7821 = 0x9559
+0x784E = 0x955A
+0x7864 = 0x955B
+0x787A = 0x955C
+0x7930 = 0x955D
+0x7994 = 0x9561
+0x799B = 0x9563
+0x7AD1 = 0x9564
+0x7AE7 = 0x9565
+0x7AEB = 0x9567
+0x7B9E = 0x9568
+0x7D48 = 0x956A
+0x7D5C = 0x956B
+0x7DA0 = 0x956D
+0x7DB7 = 0x956C
+0x7DD6 = 0x956E
+0x7E52 = 0x956F
+0x7E8A = 0x933D
+0x7F47 = 0x9570
+0x7FA1 = 0x9571
+0x8301 = 0x9573
+0x8362 = 0x9574
+0x837F = 0x9575
+0x83C7 = 0x9576
+0x83F6 = 0x9577
+0x8448 = 0x9578
+0x84B4 = 0x9579
+0x84DC = 0x9341
+0x8553 = 0x957A
+0x8559 = 0x957B
+0x856B = 0x957C
+0x85B0 = 0x957E
+0x8807 = 0x9623
+0x88F5 = 0x9624
+0x891C = 0x933E
+0x8A12 = 0x9625
+0x8A37 = 0x9626
+0x8A79 = 0x9627
+0x8AA7 = 0x9628
+0x8ABE = 0x9629
+0x8ADF = 0x962A
+0x8AF6 = 0x962C
+0x8B53 = 0x962D
+0x8B7F = 0x962E
+0x8CF0 = 0x962F
+0x8CF4 = 0x9630
+0x8D12 = 0x9631
+0x8D76 = 0x9632
+0x8ECF = 0x9634
+0x9067 = 0x9637
+0x90DE = 0x9638
+0x9115 = 0x963A
+0x9127 = 0x963B
+0x91D7 = 0x963D
+0x91DA = 0x963C
+0x91DE = 0x963E
+0x91E4 = 0x9641
+0x91E5 = 0x9642
+0x91ED = 0x963F
+0x91EE = 0x9640
+0x9206 = 0x9643
+0x920A = 0x9645
+0x9210 = 0x9644
+0x9239 = 0x964C
+0x923A = 0x9646
+0x923C = 0x9648
+0x9240 = 0x9647
+0x924E = 0x9649
+0x9251 = 0x964B
+0x9259 = 0x964A
+0x9267 = 0x964D
+0x9277 = 0x964F
+0x9278 = 0x9650
+0x9288 = 0x9340
+0x92A7 = 0x964E
+0x92D0 = 0x9654
+0x92D3 = 0x9658
+0x92D5 = 0x9656
+0x92D7 = 0x9652
+0x92D9 = 0x9653
+0x92E0 = 0x9657
+0x92E7 = 0x9651
+0x92F9 = 0x9346
+0x92FB = 0x965B
+0x92FF = 0x965E
+0x9302 = 0x9660
+0x931D = 0x965F
+0x931E = 0x965D
+0x9321 = 0x965A
+0x9325 = 0x9659
+0x9348 = 0x933F
+0x9357 = 0x9662
+0x9370 = 0x9661
+0x93A4 = 0x9663
+0x93C6 = 0x9664
+0x93DE = 0x9665
+0x93F8 = 0x9666
+0x9431 = 0x9667
+0x9445 = 0x9668
+0x9448 = 0x9669
+0x9592 = 0x966A
+0x969D = 0x966D
+0x96AF = 0x966E
+0x9733 = 0x966F
+0x973B = 0x9670
+0x9743 = 0x9671
+0x974D = 0x9672
+0x974F = 0x9673
+0x9751 = 0x9674
+0x9755 = 0x9675
+0x9857 = 0x9676
+0x9865 = 0x9677
+0x9927 = 0x967A
+0x999E = 0x967C
+0x9A4E = 0x967D
+0x9AD9 = 0x967E
+0x9ADC = 0x9721
+0x9B72 = 0x9723
+0x9B75 = 0x9722
+0x9B8F = 0x9724
+0x9BB1 = 0x9725
+0x9BBB = 0x9726
+0x9C00 = 0x9727
+0x9D6B = 0x9729
+0x9D70 = 0x9728
+0x9E19 = 0x972B
+0x9ED1 = 0x972C
+0xF929 = 0x9462
+0xF9DC = 0x966B
+0xFA0E = 0x9370
+0xFA0F = 0x937B
+0xFA10 = 0x937C
+0xFA11 = 0x9433
+0xFA12 = 0x945A
+0xFA13 = 0x946A
+0xFA14 = 0x946C
+0xFA15 = 0x9539
+0xFA16 = 0x953F
+0xFA17 = 0x9556
+0xFA18 = 0x955E
+0xFA19 = 0x955F
+0xFA1A = 0x9560
+0xFA1B = 0x9562
+0xFA1C = 0x9566
+0xFA1D = 0x9569
+0xFA1E = 0x9572
+0xFA1F = 0x957D
+0xFA20 = 0x9621
+0xFA21 = 0x9622
+0xFA22 = 0x962B
+0xFA23 = 0x9633
+0xFA24 = 0x9635
+0xFA25 = 0x9636
+0xFA26 = 0x9639
+0xFA27 = 0x9655
+0xFA28 = 0x965C
+0xFA29 = 0x966C
+0xFA2A = 0x9678
+0xFA2B = 0x9679
+0xFA2C = 0x967B
+0xFA2D = 0x972A
+0xFF02 = 0x9338
+0xFF07 = 0x9337
+0xFFE2 = 0x9335
+0xFFE4 = 0x9336
+END_MAP
diff --git a/enc/trans/CP/UCS%CP932VDC@NEC_IBM.src b/enc/trans/CP/UCS%CP932VDC@NEC_IBM.src
new file mode 100644
index 0000000000..f94167aaa4
--- /dev/null
+++ b/enc/trans/CP/UCS%CP932VDC@NEC_IBM.src
@@ -0,0 +1,406 @@
+# $NetBSD: UCS%CP932VDC@NEC_IBM.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/CP932VDC:NEC_IBM"
+SRC_ZONE	0x2170-0xFFE4
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#    Name:     cp932 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       cpxlate@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp932 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp932 order
+#
+0x2170 = 0x7C71
+0x2171 = 0x7C72
+0x2172 = 0x7C73
+0x2173 = 0x7C74
+0x2174 = 0x7C75
+0x2175 = 0x7C76
+0x2176 = 0x7C77
+0x2177 = 0x7C78
+0x2178 = 0x7C79
+0x2179 = 0x7C7A
+0x4E28 = 0x792D
+0x4EE1 = 0x792E
+0x4EFC = 0x792F
+0x4F00 = 0x7930
+0x4F03 = 0x7931
+0x4F39 = 0x7932
+0x4F56 = 0x7933
+0x4F8A = 0x7935
+0x4F92 = 0x7934
+0x4F94 = 0x7937
+0x4F9A = 0x7936
+0x4FC9 = 0x7926
+0x4FCD = 0x7938
+0x4FFF = 0x793B
+0x501E = 0x793C
+0x5022 = 0x793A
+0x5040 = 0x7939
+0x5042 = 0x793F
+0x5046 = 0x793D
+0x5070 = 0x793E
+0x5094 = 0x7940
+0x50D8 = 0x7942
+0x50F4 = 0x7941
+0x514A = 0x7943
+0x5164 = 0x7944
+0x519D = 0x7945
+0x51BE = 0x7946
+0x51EC = 0x7947
+0x5215 = 0x7948
+0x529C = 0x7949
+0x52A6 = 0x794A
+0x52AF = 0x7B3C
+0x52C0 = 0x794B
+0x52DB = 0x794C
+0x5300 = 0x794D
+0x5307 = 0x794E
+0x5324 = 0x794F
+0x5372 = 0x7950
+0x5393 = 0x7951
+0x53B2 = 0x7952
+0x53DD = 0x7953
+0x548A = 0x7956
+0x549C = 0x7955
+0x54A9 = 0x7957
+0x54FF = 0x7958
+0x5586 = 0x7959
+0x5759 = 0x795A
+0x5765 = 0x795B
+0x57AC = 0x795C
+0x57C7 = 0x795E
+0x57C8 = 0x795D
+0x589E = 0x7961
+0x58B2 = 0x7962
+0x590B = 0x7963
+0x5953 = 0x7964
+0x595B = 0x7965
+0x595D = 0x7966
+0x5963 = 0x7967
+0x59A4 = 0x7968
+0x59BA = 0x7969
+0x5B56 = 0x796A
+0x5BC0 = 0x796B
+0x5BD8 = 0x796D
+0x5BEC = 0x796E
+0x5C1E = 0x796F
+0x5CA6 = 0x7970
+0x5CBA = 0x7971
+0x5CF5 = 0x7972
+0x5D27 = 0x7973
+0x5D42 = 0x7976
+0x5D53 = 0x7974
+0x5D6D = 0x7977
+0x5DB8 = 0x7978
+0x5DB9 = 0x7979
+0x5DD0 = 0x797A
+0x5F21 = 0x797B
+0x5F34 = 0x797C
+0x5F45 = 0x792C
+0x5F67 = 0x797D
+0x5FB7 = 0x797E
+0x5FDE = 0x7A21
+0x605D = 0x7A22
+0x6085 = 0x7A23
+0x608A = 0x7A24
+0x60D5 = 0x7A26
+0x60DE = 0x7A25
+0x60F2 = 0x7A28
+0x6111 = 0x7A29
+0x6120 = 0x7A27
+0x6130 = 0x7A2B
+0x6137 = 0x7A2A
+0x6198 = 0x7A2C
+0x6213 = 0x7A2D
+0x62A6 = 0x7A2E
+0x63F5 = 0x7A2F
+0x6460 = 0x7A30
+0x649D = 0x7A31
+0x64CE = 0x7A32
+0x654E = 0x7A33
+0x6600 = 0x7A34
+0x6609 = 0x7A37
+0x6615 = 0x7A35
+0x661E = 0x7A39
+0x6624 = 0x7A3A
+0x662E = 0x7A38
+0x6631 = 0x7928
+0x663B = 0x7A36
+0x6657 = 0x7A3C
+0x6659 = 0x7A3D
+0x6665 = 0x7A3B
+0x6673 = 0x7A3F
+0x6699 = 0x7A40
+0x66A0 = 0x7A41
+0x66B2 = 0x7A42
+0x66BF = 0x7A43
+0x66FA = 0x7A44
+0x66FB = 0x792B
+0x670E = 0x7A45
+0x6766 = 0x7A47
+0x67BB = 0x7A48
+0x67C0 = 0x7A4A
+0x6801 = 0x7A4B
+0x6844 = 0x7A4C
+0x6852 = 0x7A49
+0x68C8 = 0x7929
+0x68CF = 0x7A4D
+0x6968 = 0x7A4F
+0x6998 = 0x7A51
+0x69E2 = 0x7A52
+0x6A30 = 0x7A53
+0x6A46 = 0x7A55
+0x6A6B = 0x7A54
+0x6A73 = 0x7A56
+0x6A7E = 0x7A57
+0x6AE2 = 0x7A58
+0x6AE4 = 0x7A59
+0x6BD6 = 0x7A5A
+0x6C3F = 0x7A5B
+0x6C5C = 0x7A5C
+0x6C6F = 0x7A5E
+0x6C86 = 0x7A5D
+0x6CDA = 0x7A5F
+0x6D04 = 0x7A60
+0x6D6F = 0x7A62
+0x6D87 = 0x7A61
+0x6D96 = 0x7A63
+0x6DAC = 0x7A64
+0x6DCF = 0x7A65
+0x6DF2 = 0x7A67
+0x6DF8 = 0x7A66
+0x6DFC = 0x7A68
+0x6E27 = 0x7A6B
+0x6E39 = 0x7A69
+0x6E3C = 0x7A6C
+0x6E5C = 0x7A6A
+0x6EBF = 0x7A6D
+0x6F88 = 0x7A6E
+0x6FB5 = 0x7A6F
+0x6FF5 = 0x7A70
+0x7005 = 0x7A71
+0x7007 = 0x7A72
+0x7028 = 0x7A73
+0x7085 = 0x7A74
+0x70AB = 0x7A75
+0x70BB = 0x7927
+0x7104 = 0x7A77
+0x710F = 0x7A76
+0x7146 = 0x7A79
+0x7147 = 0x7A7A
+0x715C = 0x7A78
+0x71C1 = 0x7A7C
+0x71FE = 0x7A7D
+0x72B1 = 0x7A7E
+0x72BE = 0x7B21
+0x7324 = 0x7B22
+0x7377 = 0x7B24
+0x73BD = 0x7B25
+0x73C9 = 0x7B26
+0x73D2 = 0x7B29
+0x73D6 = 0x7B27
+0x73E3 = 0x7B28
+0x73F5 = 0x7B2B
+0x7407 = 0x7B2A
+0x7426 = 0x7B2C
+0x7429 = 0x7B2E
+0x742A = 0x7B2D
+0x742E = 0x7B2F
+0x7462 = 0x7B30
+0x7489 = 0x7B31
+0x749F = 0x7B32
+0x7501 = 0x7B33
+0x752F = 0x796C
+0x756F = 0x7B34
+0x7682 = 0x7B35
+0x769B = 0x7B38
+0x769C = 0x7B36
+0x769E = 0x7B37
+0x76A6 = 0x7B39
+0x7746 = 0x7B3B
+0x7821 = 0x7B3D
+0x784E = 0x7B3E
+0x7864 = 0x7B3F
+0x787A = 0x7B40
+0x7930 = 0x7B41
+0x7994 = 0x7B45
+0x799B = 0x7B47
+0x7AD1 = 0x7B48
+0x7AE7 = 0x7B49
+0x7AEB = 0x7B4B
+0x7B9E = 0x7B4C
+0x7D48 = 0x7B4E
+0x7D5C = 0x7B4F
+0x7DA0 = 0x7B51
+0x7DB7 = 0x7B50
+0x7DD6 = 0x7B52
+0x7E52 = 0x7B53
+0x7E8A = 0x7921
+0x7F47 = 0x7B54
+0x7FA1 = 0x7B55
+0x8301 = 0x7B57
+0x8362 = 0x7B58
+0x837F = 0x7B59
+0x83C7 = 0x7B5A
+0x83F6 = 0x7B5B
+0x8448 = 0x7B5C
+0x84B4 = 0x7B5D
+0x84DC = 0x7925
+0x8553 = 0x7B5E
+0x8559 = 0x7B5F
+0x856B = 0x7B60
+0x85B0 = 0x7B62
+0x8807 = 0x7B65
+0x88F5 = 0x7B66
+0x891C = 0x7922
+0x8A12 = 0x7B67
+0x8A37 = 0x7B68
+0x8A79 = 0x7B69
+0x8AA7 = 0x7B6A
+0x8ABE = 0x7B6B
+0x8ADF = 0x7B6C
+0x8AF6 = 0x7B6E
+0x8B53 = 0x7B6F
+0x8B7F = 0x7B70
+0x8CF0 = 0x7B71
+0x8CF4 = 0x7B72
+0x8D12 = 0x7B73
+0x8D76 = 0x7B74
+0x8ECF = 0x7B76
+0x9067 = 0x7B79
+0x90DE = 0x7B7A
+0x9115 = 0x7B7C
+0x9127 = 0x7B7D
+0x91D7 = 0x7C21
+0x91DA = 0x7B7E
+0x91DE = 0x7C22
+0x91E4 = 0x7C25
+0x91E5 = 0x7C26
+0x91ED = 0x7C23
+0x91EE = 0x7C24
+0x9206 = 0x7C27
+0x920A = 0x7C29
+0x9210 = 0x7C28
+0x9239 = 0x7C30
+0x923A = 0x7C2A
+0x923C = 0x7C2C
+0x9240 = 0x7C2B
+0x924E = 0x7C2D
+0x9251 = 0x7C2F
+0x9259 = 0x7C2E
+0x9267 = 0x7C31
+0x9277 = 0x7C33
+0x9278 = 0x7C34
+0x9288 = 0x7924
+0x92A7 = 0x7C32
+0x92D0 = 0x7C38
+0x92D3 = 0x7C3C
+0x92D5 = 0x7C3A
+0x92D7 = 0x7C36
+0x92D9 = 0x7C37
+0x92E0 = 0x7C3B
+0x92E7 = 0x7C35
+0x92F9 = 0x792A
+0x92FB = 0x7C3F
+0x92FF = 0x7C42
+0x9302 = 0x7C44
+0x931D = 0x7C43
+0x931E = 0x7C41
+0x9321 = 0x7C3E
+0x9325 = 0x7C3D
+0x9348 = 0x7923
+0x9357 = 0x7C46
+0x9370 = 0x7C45
+0x93A4 = 0x7C47
+0x93C6 = 0x7C48
+0x93DE = 0x7C49
+0x93F8 = 0x7C4A
+0x9431 = 0x7C4B
+0x9445 = 0x7C4C
+0x9448 = 0x7C4D
+0x9592 = 0x7C4E
+0x969D = 0x7C51
+0x96AF = 0x7C52
+0x9733 = 0x7C53
+0x973B = 0x7C54
+0x9743 = 0x7C55
+0x974D = 0x7C56
+0x974F = 0x7C57
+0x9751 = 0x7C58
+0x9755 = 0x7C59
+0x9857 = 0x7C5A
+0x9865 = 0x7C5B
+0x9927 = 0x7C5E
+0x999E = 0x7C60
+0x9A4E = 0x7C61
+0x9AD9 = 0x7C62
+0x9ADC = 0x7C63
+0x9B72 = 0x7C65
+0x9B75 = 0x7C64
+0x9B8F = 0x7C66
+0x9BB1 = 0x7C67
+0x9BBB = 0x7C68
+0x9C00 = 0x7C69
+0x9D6B = 0x7C6B
+0x9D70 = 0x7C6A
+0x9E19 = 0x7C6D
+0x9ED1 = 0x7C6E
+0xF929 = 0x7A46
+0xF9DC = 0x7C4F
+0xFA0E = 0x7954
+0xFA0F = 0x795F
+0xFA10 = 0x7960
+0xFA11 = 0x7975
+0xFA12 = 0x7A3E
+0xFA13 = 0x7A4E
+0xFA14 = 0x7A50
+0xFA15 = 0x7A7B
+0xFA16 = 0x7B23
+0xFA17 = 0x7B3A
+0xFA18 = 0x7B42
+0xFA19 = 0x7B43
+0xFA1A = 0x7B44
+0xFA1B = 0x7B46
+0xFA1C = 0x7B4A
+0xFA1D = 0x7B4D
+0xFA1E = 0x7B56
+0xFA1F = 0x7B61
+0xFA20 = 0x7B63
+0xFA21 = 0x7B64
+0xFA22 = 0x7B6D
+0xFA23 = 0x7B75
+0xFA24 = 0x7B77
+0xFA25 = 0x7B78
+0xFA26 = 0x7B7B
+0xFA27 = 0x7C39
+0xFA28 = 0x7C40
+0xFA29 = 0x7C50
+0xFA2A = 0x7C5C
+0xFA2B = 0x7C5D
+0xFA2C = 0x7C5F
+0xFA2D = 0x7C6C
+0xFF02 = 0x7C7E
+0xFF07 = 0x7C7D
+0xFFE2 = 0x7C7B
+0xFFE4 = 0x7C7C
+END_MAP
diff --git a/enc/trans/EMOJI/EMOJI_ISO-2022-JP-KDDI%UCS.src b/enc/trans/EMOJI/EMOJI_ISO-2022-JP-KDDI%UCS.src
new file mode 100644
index 0000000000..69520f75de
--- /dev/null
+++ b/enc/trans/EMOJI/EMOJI_ISO-2022-JP-KDDI%UCS.src
@@ -0,0 +1,658 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		EMOJI_ISO-2022-JP-KDDI/UCS
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x7521 = 0xE468
+0x7522 = 0xE469
+0x7523 = 0xE46A
+0x7524 = 0xE46B
+0x7525 = 0xE46C
+0x7526 = 0xE46D
+0x7527 = 0xE46E
+0x7528 = 0xE46F
+0x7529 = 0xE470
+0x752A = 0xE471
+0x752B = 0xE472
+0x752C = 0xE473
+0x752D = 0xE474
+0x752E = 0xE475
+0x752F = 0xE476
+0x7530 = 0xE477
+0x7531 = 0xE478
+0x7532 = 0xE479
+0x7533 = 0xE47A
+0x7534 = 0xE47B
+0x7535 = 0xE47C
+0x7536 = 0xE47D
+0x7537 = 0xE47E
+0x7538 = 0xE47F
+0x7539 = 0xE480
+0x753A = 0xE481
+0x753B = 0xE482
+0x753C = 0xE483
+0x753D = 0xE484
+0x753E = 0xE485
+0x753F = 0xE486
+0x7540 = 0xE487
+0x7541 = 0xE488
+0x7542 = 0xE489
+0x7543 = 0xE48A
+0x7544 = 0xE48B
+0x7545 = 0xE48C
+0x7546 = 0xE48D
+0x7547 = 0xE48E
+0x7548 = 0xE48F
+0x7549 = 0xE490
+0x754A = 0xE491
+0x754B = 0xE492
+0x754C = 0xE493
+0x754D = 0xE494
+0x754E = 0xE495
+0x754F = 0xE496
+0x7550 = 0xE497
+0x7551 = 0xE498
+0x7552 = 0xE499
+0x7553 = 0xE49A
+0x7554 = 0xE49B
+0x7555 = 0xE49C
+0x7556 = 0xE49D
+0x7557 = 0xE49E
+0x7558 = 0xE49F
+0x7559 = 0xE4A0
+0x755A = 0xE4A1
+0x755B = 0xE4A2
+0x755C = 0xE4A3
+0x755D = 0xE4A4
+0x755E = 0xE4A5
+0x755F = 0xE4A6
+0x7560 = 0xE4A7
+0x7561 = 0xE4A8
+0x7562 = 0xE4A9
+0x7563 = 0xE4AA
+0x7564 = 0xE4AB
+0x7565 = 0xE4AC
+0x7566 = 0xE4AD
+0x7567 = 0xE4AE
+0x7568 = 0xE4AF
+0x7569 = 0xE4B0
+0x756A = 0xE4B1
+0x756B = 0xE4B2
+0x756C = 0xE4B3
+0x756D = 0xE4B4
+0x756E = 0xE4B5
+0x756F = 0xE4B6
+0x7570 = 0xE4B7
+0x7571 = 0xE4B8
+0x7572 = 0xE4B9
+0x7573 = 0xE4BA
+0x7574 = 0xE4BB
+0x7575 = 0xE4BC
+0x7576 = 0xE4BD
+0x7577 = 0xE4BE
+0x7578 = 0xE4BF
+0x7579 = 0xE4C0
+0x757A = 0xE4C1
+0x757B = 0xE4C2
+0x757C = 0xE4C3
+0x757D = 0xE4C4
+0x757E = 0xE4C5
+0x7621 = 0xE4C6
+0x7622 = 0xE4C7
+0x7623 = 0xE4C8
+0x7624 = 0xE4C9
+0x7625 = 0xE4CA
+0x7626 = 0xE4CB
+0x7627 = 0xE4CC
+0x7628 = 0xE4CD
+0x7629 = 0xE4CE
+0x762A = 0xE4CF
+0x762B = 0xE4D0
+0x762C = 0xE4D1
+0x762D = 0xE4D2
+0x762E = 0xE4D3
+0x762F = 0xE4D4
+0x7630 = 0xE4D5
+0x7631 = 0xE4D6
+0x7632 = 0xE4D7
+0x7633 = 0xE4D8
+0x7634 = 0xE4D9
+0x7635 = 0xE4DA
+0x7636 = 0xE4DB
+0x7637 = 0xE4DC
+0x7638 = 0xE4DD
+0x7639 = 0xE4DE
+0x763A = 0xE4DF
+0x763B = 0xE4E0
+0x763C = 0xE4E1
+0x763D = 0xE4E2
+0x763E = 0xE4E3
+0x763F = 0xE4E4
+0x7640 = 0xE4E5
+0x7641 = 0xE4E6
+0x7642 = 0xE4E7
+0x7643 = 0xE4E8
+0x7644 = 0xE4E9
+0x7645 = 0xE4EA
+0x7646 = 0xE4EB
+0x7647 = 0xE4EC
+0x7648 = 0xE4ED
+0x7649 = 0xE4EE
+0x764A = 0xE4EF
+0x764B = 0xE4F0
+0x764C = 0xE4F1
+0x764D = 0xE4F2
+0x764E = 0xE4F3
+0x764F = 0xE4F4
+0x7650 = 0xE4F5
+0x7651 = 0xE4F6
+0x7652 = 0xE4F7
+0x7653 = 0xE4F8
+0x7654 = 0xE4F9
+0x7655 = 0xE4FA
+0x7656 = 0xE4FB
+0x7657 = 0xE4FC
+0x7658 = 0xE4FD
+0x7659 = 0xE4FE
+0x765A = 0xE4FF
+0x765B = 0xE500
+0x765C = 0xE501
+0x765D = 0xE502
+0x765E = 0xE503
+0x765F = 0xE504
+0x7660 = 0xE505
+0x7661 = 0xE506
+0x7662 = 0xE507
+0x7663 = 0xE508
+0x7664 = 0xE509
+0x7665 = 0xE50A
+0x7666 = 0xE50B
+0x7667 = 0xE50C
+0x7668 = 0xE50D
+0x7669 = 0xE50E
+0x766A = 0xE50F
+0x766B = 0xE510
+0x766C = 0xE511
+0x766D = 0xE512
+0x766E = 0xE513
+0x766F = 0xE514
+0x7670 = 0xE515
+0x7671 = 0xE516
+0x7672 = 0xE517
+0x7673 = 0xE518
+0x7674 = 0xE519
+0x7675 = 0xE51A
+0x7676 = 0xE51B
+0x7677 = 0xE51C
+0x7678 = 0xE51D
+0x7679 = 0xE51E
+0x767A = 0xE51F
+0x767B = 0xE520
+0x767C = 0xE521
+0x767D = 0xE522
+0x767E = 0xE523
+0x7721 = 0xE524
+0x7722 = 0xE525
+0x7723 = 0xE526
+0x7724 = 0xE527
+0x7725 = 0xE528
+0x7726 = 0xE529
+0x7727 = 0xE52A
+0x7728 = 0xE52B
+0x7729 = 0xE52C
+0x772A = 0xE52D
+0x772B = 0xE52E
+0x772C = 0xE52F
+0x772D = 0xE530
+0x772E = 0xE531
+0x772F = 0xE532
+0x7730 = 0xE533
+0x7731 = 0xE534
+0x7732 = 0xE535
+0x7733 = 0xE536
+0x7734 = 0xE537
+0x7735 = 0xE538
+0x7736 = 0xE539
+0x7737 = 0xE53A
+0x7738 = 0xE53B
+0x7739 = 0xE53C
+0x773A = 0xE53D
+0x773B = 0xE53E
+0x773C = 0xE53F
+0x773D = 0xE540
+0x773E = 0xE541
+0x773F = 0xE542
+0x7740 = 0xE543
+0x7741 = 0xE544
+0x7742 = 0xE545
+0x7743 = 0xE546
+0x7744 = 0xE547
+0x7745 = 0xE548
+0x7746 = 0xE549
+0x7747 = 0xE54A
+0x7748 = 0xE54B
+0x7749 = 0xE54C
+0x774A = 0xE54D
+0x774B = 0xE54E
+0x774C = 0xE54F
+0x774D = 0xE550
+0x774E = 0xE551
+0x774F = 0xE552
+0x7750 = 0xE553
+0x7751 = 0xE554
+0x7752 = 0xE555
+0x7753 = 0xE556
+0x7754 = 0xE557
+0x7755 = 0xE558
+0x7756 = 0xE559
+0x7757 = 0xE55A
+0x7758 = 0xE55B
+0x7759 = 0xE55C
+0x775A = 0xE55D
+0x775B = 0xE55E
+0x775C = 0xE55F
+0x775D = 0xE560
+0x775E = 0xE561
+0x775F = 0xE562
+0x7760 = 0xE563
+0x7761 = 0xE564
+0x7762 = 0xE565
+0x7763 = 0xE566
+0x7764 = 0xE567
+0x7765 = 0xE568
+0x7766 = 0xE569
+0x7767 = 0xE56A
+0x7768 = 0xE56B
+0x7769 = 0xE56C
+0x776A = 0xE56D
+0x776B = 0xE56E
+0x776C = 0xE56F
+0x776D = 0xE570
+0x776E = 0xE571
+0x776F = 0xE572
+0x7770 = 0xE573
+0x7771 = 0xE574
+0x7772 = 0xE575
+0x7773 = 0xE576
+0x7774 = 0xE577
+0x7775 = 0xE578
+0x7776 = 0xE579
+0x7777 = 0xE57A
+0x7778 = 0xE57B
+0x7779 = 0xE57C
+0x777A = 0xE57D
+0x777B = 0xE57E
+0x777C = 0xE57F
+0x777D = 0xE580
+0x777E = 0xE581
+0x7821 = 0xE582
+0x7822 = 0xE583
+0x7823 = 0xE584
+0x7824 = 0xE585
+0x7825 = 0xE586
+0x7826 = 0xE587
+0x7827 = 0xE588
+0x7828 = 0xE589
+0x7829 = 0xE58A
+0x782A = 0xE58B
+0x782B = 0xE58C
+0x782C = 0xE58D
+0x782D = 0xE58E
+0x782E = 0xE58F
+0x782F = 0xE590
+0x7830 = 0xE591
+0x7831 = 0xE592
+0x7832 = 0xE593
+0x7833 = 0xE594
+0x7834 = 0xE595
+0x7835 = 0xE596
+0x7836 = 0xE597
+0x7837 = 0xE598
+0x7838 = 0xE599
+0x7839 = 0xE59A
+0x783A = 0xE59B
+0x783B = 0xE59C
+0x783C = 0xE59D
+0x783D = 0xE59E
+0x783E = 0xE59F
+0x783F = 0xE5A0
+0x7840 = 0xE5A1
+0x7841 = 0xE5A2
+0x7842 = 0xE5A3
+0x7843 = 0xE5A4
+0x7844 = 0xE5A5
+0x7845 = 0xE5A6
+0x7846 = 0xE5A7
+0x7847 = 0xE5A8
+0x7848 = 0xE5A9
+0x7849 = 0xE5AA
+0x784A = 0xE5AB
+0x784B = 0xE5AC
+0x784C = 0xE5AD
+0x784D = 0xE5AE
+0x784E = 0xE5AF
+0x784F = 0xE5B0
+0x7850 = 0xE5B1
+0x7851 = 0xE5B2
+0x7852 = 0xE5B3
+0x7853 = 0xE5B4
+0x7854 = 0xEAFB
+0x7855 = 0xEAFC
+0x7856 = 0xEAFD
+0x7857 = 0xEAFE
+0x7858 = 0xEAFF
+0x7859 = 0xEB00
+0x785A = 0xEB01
+0x785B = 0xEB02
+0x785C = 0xEB03
+0x785D = 0xEB04
+0x785E = 0xEB05
+0x785F = 0xEB06
+0x7860 = 0xEB07
+0x7861 = 0xEB08
+0x7862 = 0xEB09
+0x7863 = 0xEB0A
+0x7864 = 0xEB0B
+0x7865 = 0xEB0C
+0x7866 = 0xEB0D
+0x7867 = 0xE5B5
+0x7868 = 0xE5B6
+0x7869 = 0xE5B7
+0x786A = 0xE5B8
+0x786B = 0xE5B9
+0x786C = 0xE5BA
+0x786D = 0xE5BB
+0x786E = 0xE5BC
+0x786F = 0xE5BD
+0x7870 = 0xE5BE
+0x7871 = 0xE5BF
+0x7872 = 0xE5C0
+0x7873 = 0xE5C1
+0x7874 = 0xE5C2
+0x7875 = 0xE5C3
+0x7876 = 0xE5C4
+0x7877 = 0xE5C5
+0x7878 = 0xE5C6
+0x7879 = 0xE5C7
+0x787A = 0xE5C8
+0x787B = 0xE5C9
+0x787C = 0xE5CA
+0x787D = 0xE5CB
+0x787E = 0xE5CC
+0x7921 = 0xE5CD
+0x7922 = 0xE5CE
+0x7923 = 0xE5CF
+0x7924 = 0xE5D0
+0x7925 = 0xE5D1
+0x7926 = 0xE5D2
+0x7927 = 0xE5D3
+0x7928 = 0xE5D4
+0x7929 = 0xE5D5
+0x792A = 0xE5D6
+0x792B = 0xE5D7
+0x792C = 0xE5D8
+0x792D = 0xE5D9
+0x792E = 0xE5DA
+0x792F = 0xE5DB
+0x7930 = 0xE5DC
+0x7931 = 0xE5DD
+0x7932 = 0xE5DE
+0x7933 = 0xE5DF
+0x7934 = 0xEA80
+0x7935 = 0xEA81
+0x7936 = 0xEA82
+0x7937 = 0xEA83
+0x7938 = 0xEA84
+0x7939 = 0xEA85
+0x793A = 0xEA86
+0x793B = 0xEA87
+0x793C = 0xEA88
+0x793D = 0xEA89
+0x793E = 0xEA8A
+0x793F = 0xEA8B
+0x7940 = 0xEA8C
+0x7941 = 0xEA8D
+0x7942 = 0xEA8E
+0x7943 = 0xEA8F
+0x7944 = 0xEA90
+0x7945 = 0xEA91
+0x7946 = 0xEA92
+0x7947 = 0xEA93
+0x7948 = 0xEA94
+0x7949 = 0xEA95
+0x794A = 0xEA96
+0x794B = 0xEA97
+0x794C = 0xEA98
+0x794D = 0xEA99
+0x794E = 0xEA9A
+0x794F = 0xEA9B
+0x7950 = 0xEA9C
+0x7951 = 0xEA9D
+0x7952 = 0xEA9E
+0x7953 = 0xEA9F
+0x7954 = 0xEAA0
+0x7955 = 0xEAA1
+0x7956 = 0xEAA2
+0x7957 = 0xEAA3
+0x7958 = 0xEAA4
+0x7959 = 0xEAA5
+0x795A = 0xEAA6
+0x795B = 0xEAA7
+0x795C = 0xEAA8
+0x795D = 0xEAA9
+0x795E = 0xEAAA
+0x795F = 0xEAAB
+0x7960 = 0xEAAC
+0x7961 = 0xEAAD
+0x7962 = 0xEAAE
+0x7963 = 0xEAAF
+0x7964 = 0xEAB0
+0x7965 = 0xEAB1
+0x7966 = 0xEAB2
+0x7967 = 0xEAB3
+0x7968 = 0xEAB4
+0x7969 = 0xEAB5
+0x796A = 0xEAB6
+0x796B = 0xEAB7
+0x796C = 0xEAB8
+0x796D = 0xEAB9
+0x796E = 0xEABA
+0x796F = 0xEABB
+0x7970 = 0xEABC
+0x7971 = 0xEABD
+0x7972 = 0xEABE
+0x7973 = 0xEABF
+0x7974 = 0xEAC0
+0x7975 = 0xEAC1
+0x7976 = 0xEAC2
+0x7977 = 0xEAC3
+0x7978 = 0xEAC4
+0x7979 = 0xEAC5
+0x797A = 0xEAC6
+0x797B = 0xEAC7
+0x797C = 0xEAC8
+0x797D = 0xEAC9
+0x797E = 0xEACA
+0x7A21 = 0xEACB
+0x7A22 = 0xEACC
+0x7A23 = 0xEACD
+0x7A24 = 0xEACE
+0x7A25 = 0xEACF
+0x7A26 = 0xEAD0
+0x7A27 = 0xEAD1
+0x7A28 = 0xEAD2
+0x7A29 = 0xEAD3
+0x7A2A = 0xEAD4
+0x7A2B = 0xEAD5
+0x7A2C = 0xEAD6
+0x7A2D = 0xEAD7
+0x7A2E = 0xEAD8
+0x7A2F = 0xEAD9
+0x7A30 = 0xEADA
+0x7A31 = 0xEADB
+0x7A32 = 0xEADC
+0x7A33 = 0xEADD
+0x7A34 = 0xEADE
+0x7A35 = 0xEADF
+0x7A36 = 0xEAE0
+0x7A37 = 0xEAE1
+0x7A38 = 0xEAE2
+0x7A39 = 0xEAE3
+0x7A3A = 0xEAE4
+0x7A3B = 0xEAE5
+0x7A3C = 0xEAE6
+0x7A3D = 0xEAE7
+0x7A3E = 0xEAE8
+0x7A3F = 0xEAE9
+0x7A40 = 0xEAEA
+0x7A41 = 0xEAEB
+0x7A42 = 0xEAEC
+0x7A43 = 0xEAED
+0x7A44 = 0xEAEE
+0x7A45 = 0xEAEF
+0x7A46 = 0xEAF0
+0x7A47 = 0xEAF1
+0x7A48 = 0xEAF2
+0x7A49 = 0xEAF3
+0x7A4A = 0xEAF4
+0x7A4B = 0xEAF5
+0x7A4C = 0xEAF6
+0x7A4D = 0xEAF7
+0x7A4E = 0xEAF8
+0x7A4F = 0xEAF9
+0x7A50 = 0xEAFA
+0x7A51 = 0xEB0E
+0x7A52 = 0xEB0F
+0x7A53 = 0xEB10
+0x7A54 = 0xEB11
+0x7A55 = 0xEB12
+0x7A56 = 0xEB13
+0x7A57 = 0xEB14
+0x7A58 = 0xEB15
+0x7A59 = 0xEB16
+0x7A5A = 0xEB17
+0x7A5B = 0xEB18
+0x7A5C = 0xEB19
+0x7A5D = 0xEB1A
+0x7A5E = 0xEB1B
+0x7A5F = 0xEB1C
+0x7A60 = 0xEB1D
+0x7A61 = 0xEB1E
+0x7A62 = 0xEB1F
+0x7A63 = 0xEB20
+0x7A64 = 0xEB21
+0x7A65 = 0xEB22
+0x7A66 = 0xEB23
+0x7A67 = 0xEB24
+0x7A68 = 0xEB25
+0x7A69 = 0xEB26
+0x7A6A = 0xEB27
+0x7A6B = 0xEB28
+0x7A6C = 0xEB29
+0x7A6D = 0xEB2A
+0x7A6E = 0xEB2B
+0x7A6F = 0xEB2C
+0x7A70 = 0xEB2D
+0x7A71 = 0xEB2E
+0x7A72 = 0xEB2F
+0x7A73 = 0xEB30
+0x7A74 = 0xEB31
+0x7A75 = 0xEB32
+0x7A76 = 0xEB33
+0x7A77 = 0xEB34
+0x7A78 = 0xEB35
+0x7A79 = 0xEB36
+0x7A7A = 0xEB37
+0x7A7B = 0xEB38
+0x7A7C = 0xEB39
+0x7A7D = 0xEB3A
+0x7A7E = 0xEB3B
+0x7B21 = 0xEB3C
+0x7B22 = 0xEB3D
+0x7B23 = 0xEB3E
+0x7B24 = 0xEB3F
+0x7B25 = 0xEB40
+0x7B26 = 0xEB41
+0x7B27 = 0xEB42
+0x7B28 = 0xEB43
+0x7B29 = 0xEB44
+0x7B2A = 0xEB45
+0x7B2B = 0xEB46
+0x7B2C = 0xEB47
+0x7B2D = 0xEB48
+0x7B2E = 0xEB49
+0x7B2F = 0xEB4A
+0x7B30 = 0xEB4B
+0x7B31 = 0xEB4C
+0x7B32 = 0xEB4D
+0x7B33 = 0xEB4E
+0x7B34 = 0xEB4F
+0x7B35 = 0xEB50
+0x7B36 = 0xEB51
+0x7B37 = 0xEB52
+0x7B38 = 0xEB53
+0x7B39 = 0xEB54
+0x7B3A = 0xEB55
+0x7B3B = 0xEB56
+0x7B3C = 0xEB57
+0x7B3D = 0xEB58
+0x7B3E = 0xEB59
+0x7B3F = 0xEB5A
+0x7B40 = 0xEB5B
+0x7B41 = 0xEB5C
+0x7B42 = 0xEB5D
+0x7B43 = 0xEB5E
+0x7B44 = 0xEB5F
+0x7B45 = 0xEB60
+0x7B46 = 0xEB61
+0x7B47 = 0xEB62
+0x7B48 = 0xEB63
+0x7B49 = 0xEB64
+0x7B4A = 0xEB65
+0x7B4B = 0xEB66
+0x7B4C = 0xEB67
+0x7B4D = 0xEB68
+0x7B4E = 0xEB69
+0x7B4F = 0xEB6A
+0x7B50 = 0xEB6B
+0x7B51 = 0xEB6C
+0x7B52 = 0xEB6D
+0x7B53 = 0xEB6E
+0x7B54 = 0xEB6F
+0x7B55 = 0xEB70
+0x7B56 = 0xEB71
+0x7B57 = 0xEB72
+0x7B58 = 0xEB73
+0x7B59 = 0xEB74
+0x7B5A = 0xEB75
+0x7B5B = 0xEB76
+0x7B5C = 0xEB77
+0x7B5D = 0xEB78
+0x7B5E = 0xEB79
+0x7B5F = 0xEB7A
+0x7B60 = 0xEB7B
+0x7B61 = 0xEB7C
+0x7B62 = 0xEB7D
+0x7B63 = 0xEB7E
+0x7B64 = 0xEB7F
+0x7B65 = 0xEB80
+0x7B66 = 0xEB81
+0x7B67 = 0xEB82
+0x7B68 = 0xEB83
+0x7B69 = 0xEB84
+0x7B6A = 0xEB85
+0x7B6B = 0xEB86
+0x7B6C = 0xEB87
+0x7B6D = 0xEB88
+0x7B6E = 0xEB89
+0x7B6F = 0xEB8A
+0x7B70 = 0xEB8B
+0x7B71 = 0xEB8C
+0x7B72 = 0xEB8D
+0x7B73 = 0xEB8E
+END_MAP
diff --git a/enc/trans/EMOJI/EMOJI_SHIFT_JIS-DOCOMO%UCS.src b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-DOCOMO%UCS.src
new file mode 100644
index 0000000000..942624a3fa
--- /dev/null
+++ b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-DOCOMO%UCS.src
@@ -0,0 +1,293 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		EMOJI_SHIFT_JIS-DOCOMO/UCS
+SRC_ZONE	0xF8-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x9021 = 0xE63E
+0x9022 = 0xE63F
+0x9023 = 0xE640
+0x9024 = 0xE641
+0x9025 = 0xE642
+0x9026 = 0xE643
+0x9027 = 0xE644
+0x9028 = 0xE645
+0x9029 = 0xE646
+0x902A = 0xE647
+0x902B = 0xE648
+0x902C = 0xE649
+0x902D = 0xE64A
+0x902E = 0xE64B
+0x902F = 0xE64C
+0x9030 = 0xE64D
+0x9031 = 0xE64E
+0x9032 = 0xE64F
+0x9033 = 0xE650
+0x9034 = 0xE651
+0x9035 = 0xE652
+0x9036 = 0xE653
+0x9037 = 0xE654
+0x9038 = 0xE655
+0x9039 = 0xE656
+0x903A = 0xE657
+0x903B = 0xE658
+0x903C = 0xE659
+0x903D = 0xE65A
+0x903E = 0xE65B
+0x903F = 0xE65C
+0x9040 = 0xE65D
+0x9041 = 0xE65E
+0x9042 = 0xE65F
+0x9043 = 0xE660
+0x9044 = 0xE661
+0x9045 = 0xE662
+0x9046 = 0xE663
+0x9047 = 0xE664
+0x9048 = 0xE665
+0x9049 = 0xE666
+0x904A = 0xE667
+0x904B = 0xE668
+0x904C = 0xE669
+0x904D = 0xE66A
+0x904E = 0xE66B
+0x904F = 0xE66C
+0x9050 = 0xE66D
+0x9051 = 0xE66E
+0x9052 = 0xE66F
+0x9053 = 0xE670
+0x9054 = 0xE671
+0x9055 = 0xE672
+0x9056 = 0xE673
+0x9057 = 0xE674
+0x9058 = 0xE675
+0x9059 = 0xE676
+0x905A = 0xE677
+0x905B = 0xE678
+0x905C = 0xE679
+0x905D = 0xE67A
+0x905E = 0xE67B
+0x905F = 0xE67C
+0x9060 = 0xE67D
+0x9061 = 0xE67E
+0x9062 = 0xE67F
+0x9063 = 0xE680
+0x9064 = 0xE681
+0x9065 = 0xE682
+0x9066 = 0xE683
+0x9067 = 0xE684
+0x9068 = 0xE685
+0x9069 = 0xE686
+0x906A = 0xE687
+0x906B = 0xE688
+0x906C = 0xE689
+0x906D = 0xE68A
+0x906E = 0xE68B
+0x906F = 0xE68C
+0x9070 = 0xE68D
+0x9071 = 0xE68E
+0x9072 = 0xE68F
+0x9073 = 0xE690
+0x9074 = 0xE691
+0x9075 = 0xE692
+0x9076 = 0xE693
+0x9077 = 0xE694
+0x9078 = 0xE695
+0x9079 = 0xE696
+0x907A = 0xE697
+0x907B = 0xE698
+0x907C = 0xE699
+0x907D = 0xE69A
+0x907E = 0xE69B
+0x9121 = 0xE69C
+0x9122 = 0xE69D
+0x9123 = 0xE69E
+0x9124 = 0xE69F
+0x9125 = 0xE6A0
+0x9126 = 0xE6A1
+0x9127 = 0xE6A2
+0x9128 = 0xE6A3
+0x9129 = 0xE6A4
+0x912A = 0xE6A5
+0x912B = 0xE6A6
+0x912C = 0xE6A7
+0x912D = 0xE6A8
+0x912E = 0xE6A9
+0x912F = 0xE6AA
+0x9130 = 0xE6AB
+0x9131 = 0xE6AC
+0x9132 = 0xE6AD
+0x9133 = 0xE6AE
+0x9134 = 0xE6AF
+0x9135 = 0xE6B0
+0x9136 = 0xE6B1
+0x9137 = 0xE6B2
+0x9138 = 0xE6B3
+0x9139 = 0xE6B4
+0x913A = 0xE6B5
+0x913B = 0xE6B6
+0x913C = 0xE6B7
+0x913D = 0xE6B8
+0x913E = 0xE6B9
+0x913F = 0xE6BA
+0x9140 = 0xE6BB
+0x9141 = 0xE6BC
+0x9142 = 0xE6BD
+0x9143 = 0xE6BE
+0x9144 = 0xE6BF
+0x9145 = 0xE6C0
+0x9146 = 0xE6C1
+0x9147 = 0xE6C2
+0x9148 = 0xE6C3
+0x9149 = 0xE6C4
+0x914A = 0xE6C5
+0x914B = 0xE6C6
+0x914C = 0xE6C7
+0x914D = 0xE6C8
+0x914E = 0xE6C9
+0x914F = 0xE6CA
+0x9150 = 0xE6CB
+0x9151 = 0xE6CC
+0x9152 = 0xE6CD
+0x9153 = 0xE6CE
+0x9154 = 0xE6CF
+0x9155 = 0xE6D0
+0x9156 = 0xE6D1
+0x9157 = 0xE6D2
+0x9158 = 0xE6D3
+0x9159 = 0xE6D4
+0x915A = 0xE6D5
+0x915B = 0xE6D6
+0x915C = 0xE6D7
+0x915D = 0xE6D8
+0x915E = 0xE6D9
+0x915F = 0xE6DA
+0x9160 = 0xE6DB
+0x9161 = 0xE6DC
+0x9162 = 0xE6DD
+0x9163 = 0xE6DE
+0x9164 = 0xE6DF
+0x9165 = 0xE6E0
+0x9166 = 0xE6E1
+0x9167 = 0xE6E2
+0x9168 = 0xE6E3
+0x9169 = 0xE6E4
+0x916A = 0xE6E5
+0x916B = 0xE6E6
+0x916C = 0xE6E7
+0x916D = 0xE6E8
+0x916E = 0xE6E9
+0x916F = 0xE6EA
+0x9170 = 0xE6EB
+0x9171 = 0xE6EC
+0x9172 = 0xE6ED
+0x9173 = 0xE6EE
+0x9174 = 0xE6EF
+0x9175 = 0xE6F0
+0x9176 = 0xE6F1
+0x9177 = 0xE6F2
+0x9178 = 0xE6F3
+0x9179 = 0xE6F4
+0x917A = 0xE6F5
+0x917B = 0xE6F6
+0x917C = 0xE6F7
+0x917D = 0xE6F8
+0x917E = 0xE6F9
+0x9221 = 0xE6FA
+0x9222 = 0xE6FB
+0x9223 = 0xE6FC
+0x9224 = 0xE6FD
+0x9225 = 0xE6FE
+0x9226 = 0xE6FF
+0x9227 = 0xE700
+0x9228 = 0xE701
+0x9229 = 0xE702
+0x922A = 0xE703
+0x922B = 0xE704
+0x922C = 0xE705
+0x922D = 0xE706
+0x922E = 0xE707
+0x922F = 0xE708
+0x9230 = 0xE709
+0x9231 = 0xE70A
+0x9232 = 0xE70B
+0x9233 = 0xE70C
+0x9234 = 0xE70D
+0x9235 = 0xE70E
+0x9236 = 0xE70F
+0x9237 = 0xE710
+0x9238 = 0xE711
+0x9239 = 0xE712
+0x923A = 0xE713
+0x923B = 0xE714
+0x923C = 0xE715
+0x923D = 0xE716
+0x923E = 0xE717
+0x923F = 0xE718
+0x9240 = 0xE719
+0x9241 = 0xE71A
+0x9242 = 0xE71B
+0x9243 = 0xE71C
+0x9244 = 0xE71D
+0x9245 = 0xE71E
+0x9246 = 0xE71F
+0x9247 = 0xE720
+0x9248 = 0xE721
+0x9249 = 0xE722
+0x924A = 0xE723
+0x924B = 0xE724
+0x924C = 0xE725
+0x924D = 0xE726
+0x924E = 0xE727
+0x924F = 0xE728
+0x9250 = 0xE729
+0x9251 = 0xE72A
+0x9252 = 0xE72B
+0x9253 = 0xE72C
+0x9254 = 0xE72D
+0x9255 = 0xE72E
+0x9256 = 0xE72F
+0x9257 = 0xE730
+0x9258 = 0xE731
+0x9259 = 0xE732
+0x925A = 0xE733
+0x925B = 0xE734
+0x925C = 0xE735
+0x925D = 0xE736
+0x925E = 0xE737
+0x925F = 0xE738
+0x9260 = 0xE739
+0x9261 = 0xE73A
+0x9262 = 0xE73B
+0x9263 = 0xE73C
+0x9264 = 0xE73D
+0x9265 = 0xE73E
+0x9266 = 0xE73F
+0x9267 = 0xE740
+0x9268 = 0xE741
+0x9269 = 0xE742
+0x926A = 0xE743
+0x926B = 0xE744
+0x926C = 0xE745
+0x926D = 0xE746
+0x926E = 0xE747
+0x926F = 0xE748
+0x9270 = 0xE749
+0x9271 = 0xE74A
+0x9272 = 0xE74B
+0x9273 = 0xE74C
+0x9274 = 0xE74D
+0x9275 = 0xE74E
+0x9276 = 0xE74F
+0x9277 = 0xE750
+0x9278 = 0xE751
+0x9279 = 0xE752
+0x927A = 0xE753
+0x927B = 0xE754
+0x927C = 0xE755
+0x927D = 0xE756
+0x927E = 0xE757
+END_MAP
diff --git a/enc/trans/EMOJI/EMOJI_SHIFT_JIS-KDDI%UCS.src b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-KDDI%UCS.src
new file mode 100644
index 0000000000..b975ddb894
--- /dev/null
+++ b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-KDDI%UCS.src
@@ -0,0 +1,658 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		EMOJI_SHIFT_JIS-KDDI/UCS
+SRC_ZONE	0xF3-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x8521 = 0xE5CD
+0x8522 = 0xE5CE
+0x8523 = 0xE5CF
+0x8524 = 0xE5D0
+0x8525 = 0xE5D1
+0x8526 = 0xE5D2
+0x8527 = 0xE5D3
+0x8528 = 0xE5D4
+0x8529 = 0xE5D5
+0x852A = 0xE5D6
+0x852B = 0xE5D7
+0x852C = 0xE5D8
+0x852D = 0xE5D9
+0x852E = 0xE5DA
+0x852F = 0xE5DB
+0x8530 = 0xE5DC
+0x8531 = 0xE5DD
+0x8532 = 0xE5DE
+0x8533 = 0xE5DF
+0x8534 = 0xEA80
+0x8535 = 0xEA81
+0x8536 = 0xEA82
+0x8537 = 0xEA83
+0x8538 = 0xEA84
+0x8539 = 0xEA85
+0x853A = 0xEA86
+0x853B = 0xEA87
+0x853C = 0xEA88
+0x853D = 0xEA89
+0x853E = 0xEA8A
+0x853F = 0xEA8B
+0x8540 = 0xEA8C
+0x8541 = 0xEA8D
+0x8542 = 0xEA8E
+0x8543 = 0xEA8F
+0x8544 = 0xEA90
+0x8545 = 0xEA91
+0x8546 = 0xEA92
+0x8547 = 0xEA93
+0x8548 = 0xEA94
+0x8549 = 0xEA95
+0x854A = 0xEA96
+0x854B = 0xEA97
+0x854C = 0xEA98
+0x854D = 0xEA99
+0x854E = 0xEA9A
+0x854F = 0xEA9B
+0x8550 = 0xEA9C
+0x8551 = 0xEA9D
+0x8552 = 0xEA9E
+0x8553 = 0xEA9F
+0x8554 = 0xEAA0
+0x8555 = 0xEAA1
+0x8556 = 0xEAA2
+0x8557 = 0xEAA3
+0x8558 = 0xEAA4
+0x8559 = 0xEAA5
+0x855A = 0xEAA6
+0x855B = 0xEAA7
+0x855C = 0xEAA8
+0x855D = 0xEAA9
+0x855E = 0xEAAA
+0x855F = 0xEAAB
+0x8560 = 0xEAAC
+0x8561 = 0xEAAD
+0x8562 = 0xEAAE
+0x8563 = 0xEAAF
+0x8564 = 0xEAB0
+0x8565 = 0xEAB1
+0x8566 = 0xEAB2
+0x8567 = 0xEAB3
+0x8568 = 0xEAB4
+0x8569 = 0xEAB5
+0x856A = 0xEAB6
+0x856B = 0xEAB7
+0x856C = 0xEAB8
+0x856D = 0xEAB9
+0x856E = 0xEABA
+0x856F = 0xEABB
+0x8570 = 0xEABC
+0x8571 = 0xEABD
+0x8572 = 0xEABE
+0x8573 = 0xEABF
+0x8574 = 0xEAC0
+0x8575 = 0xEAC1
+0x8576 = 0xEAC2
+0x8577 = 0xEAC3
+0x8578 = 0xEAC4
+0x8579 = 0xEAC5
+0x857A = 0xEAC6
+0x857B = 0xEAC7
+0x857C = 0xEAC8
+0x857D = 0xEAC9
+0x857E = 0xEACA
+0x8621 = 0xEACB
+0x8622 = 0xEACC
+0x8623 = 0xEACD
+0x8624 = 0xEACE
+0x8625 = 0xEACF
+0x8626 = 0xEAD0
+0x8627 = 0xEAD1
+0x8628 = 0xEAD2
+0x8629 = 0xEAD3
+0x862A = 0xEAD4
+0x862B = 0xEAD5
+0x862C = 0xEAD6
+0x862D = 0xEAD7
+0x862E = 0xEAD8
+0x862F = 0xEAD9
+0x8630 = 0xEADA
+0x8631 = 0xEADB
+0x8632 = 0xEADC
+0x8633 = 0xEADD
+0x8634 = 0xEADE
+0x8635 = 0xEADF
+0x8636 = 0xEAE0
+0x8637 = 0xEAE1
+0x8638 = 0xEAE2
+0x8639 = 0xEAE3
+0x863A = 0xEAE4
+0x863B = 0xEAE5
+0x863C = 0xEAE6
+0x863D = 0xEAE7
+0x863E = 0xEAE8
+0x863F = 0xEAE9
+0x8640 = 0xEAEA
+0x8641 = 0xEAEB
+0x8642 = 0xEAEC
+0x8643 = 0xEAED
+0x8644 = 0xEAEE
+0x8645 = 0xEAEF
+0x8646 = 0xEAF0
+0x8647 = 0xEAF1
+0x8648 = 0xEAF2
+0x8649 = 0xEAF3
+0x864A = 0xEAF4
+0x864B = 0xEAF5
+0x864C = 0xEAF6
+0x864D = 0xEAF7
+0x864E = 0xEAF8
+0x864F = 0xEAF9
+0x8650 = 0xEAFA
+0x8651 = 0xEB0E
+0x8652 = 0xEB0F
+0x8653 = 0xEB10
+0x8654 = 0xEB11
+0x8655 = 0xEB12
+0x8656 = 0xEB13
+0x8657 = 0xEB14
+0x8658 = 0xEB15
+0x8659 = 0xEB16
+0x865A = 0xEB17
+0x865B = 0xEB18
+0x865C = 0xEB19
+0x865D = 0xEB1A
+0x865E = 0xEB1B
+0x865F = 0xEB1C
+0x8660 = 0xEB1D
+0x8661 = 0xEB1E
+0x8662 = 0xEB1F
+0x8663 = 0xEB20
+0x8664 = 0xEB21
+0x8665 = 0xEB22
+0x8666 = 0xEB23
+0x8667 = 0xEB24
+0x8668 = 0xEB25
+0x8669 = 0xEB26
+0x866A = 0xEB27
+0x866B = 0xEB28
+0x866C = 0xEB29
+0x866D = 0xEB2A
+0x866E = 0xEB2B
+0x866F = 0xEB2C
+0x8670 = 0xEB2D
+0x8671 = 0xEB2E
+0x8672 = 0xEB2F
+0x8673 = 0xEB30
+0x8674 = 0xEB31
+0x8675 = 0xEB32
+0x8676 = 0xEB33
+0x8677 = 0xEB34
+0x8678 = 0xEB35
+0x8679 = 0xEB36
+0x867A = 0xEB37
+0x867B = 0xEB38
+0x867C = 0xEB39
+0x867D = 0xEB3A
+0x867E = 0xEB3B
+0x8721 = 0xEB3C
+0x8722 = 0xEB3D
+0x8723 = 0xEB3E
+0x8724 = 0xEB3F
+0x8725 = 0xEB40
+0x8726 = 0xEB41
+0x8727 = 0xEB42
+0x8728 = 0xEB43
+0x8729 = 0xEB44
+0x872A = 0xEB45
+0x872B = 0xEB46
+0x872C = 0xEB47
+0x872D = 0xEB48
+0x872E = 0xEB49
+0x872F = 0xEB4A
+0x8730 = 0xEB4B
+0x8731 = 0xEB4C
+0x8732 = 0xEB4D
+0x8733 = 0xEB4E
+0x8734 = 0xEB4F
+0x8735 = 0xEB50
+0x8736 = 0xEB51
+0x8737 = 0xEB52
+0x8738 = 0xEB53
+0x8739 = 0xEB54
+0x873A = 0xEB55
+0x873B = 0xEB56
+0x873C = 0xEB57
+0x873D = 0xEB58
+0x873E = 0xEB59
+0x873F = 0xEB5A
+0x8740 = 0xEB5B
+0x8741 = 0xEB5C
+0x8742 = 0xEB5D
+0x8743 = 0xEB5E
+0x8744 = 0xEB5F
+0x8745 = 0xEB60
+0x8746 = 0xEB61
+0x8747 = 0xEB62
+0x8748 = 0xEB63
+0x8749 = 0xEB64
+0x874A = 0xEB65
+0x874B = 0xEB66
+0x874C = 0xEB67
+0x874D = 0xEB68
+0x874E = 0xEB69
+0x874F = 0xEB6A
+0x8750 = 0xEB6B
+0x8751 = 0xEB6C
+0x8752 = 0xEB6D
+0x8753 = 0xEB6E
+0x8754 = 0xEB6F
+0x8755 = 0xEB70
+0x8756 = 0xEB71
+0x8757 = 0xEB72
+0x8758 = 0xEB73
+0x8759 = 0xEB74
+0x875A = 0xEB75
+0x875B = 0xEB76
+0x875C = 0xEB77
+0x875D = 0xEB78
+0x875E = 0xEB79
+0x875F = 0xEB7A
+0x8760 = 0xEB7B
+0x8761 = 0xEB7C
+0x8762 = 0xEB7D
+0x8763 = 0xEB7E
+0x8764 = 0xEB7F
+0x8765 = 0xEB80
+0x8766 = 0xEB81
+0x8767 = 0xEB82
+0x8768 = 0xEB83
+0x8769 = 0xEB84
+0x876A = 0xEB85
+0x876B = 0xEB86
+0x876C = 0xEB87
+0x876D = 0xEB88
+0x876E = 0xEB89
+0x876F = 0xEB8A
+0x8770 = 0xEB8B
+0x8771 = 0xEB8C
+0x8772 = 0xEB8D
+0x8773 = 0xEB8E
+0x8B21 = 0xE468
+0x8B22 = 0xE469
+0x8B23 = 0xE46A
+0x8B24 = 0xE46B
+0x8B25 = 0xE46C
+0x8B26 = 0xE46D
+0x8B27 = 0xE46E
+0x8B28 = 0xE46F
+0x8B29 = 0xE470
+0x8B2A = 0xE471
+0x8B2B = 0xE472
+0x8B2C = 0xE473
+0x8B2D = 0xE474
+0x8B2E = 0xE475
+0x8B2F = 0xE476
+0x8B30 = 0xE477
+0x8B31 = 0xE478
+0x8B32 = 0xE479
+0x8B33 = 0xE47A
+0x8B34 = 0xE47B
+0x8B35 = 0xE47C
+0x8B36 = 0xE47D
+0x8B37 = 0xE47E
+0x8B38 = 0xE47F
+0x8B39 = 0xE480
+0x8B3A = 0xE481
+0x8B3B = 0xE482
+0x8B3C = 0xE483
+0x8B3D = 0xE484
+0x8B3E = 0xE485
+0x8B3F = 0xE486
+0x8B40 = 0xE487
+0x8B41 = 0xE488
+0x8B42 = 0xE489
+0x8B43 = 0xE48A
+0x8B44 = 0xE48B
+0x8B45 = 0xE48C
+0x8B46 = 0xE48D
+0x8B47 = 0xE48E
+0x8B48 = 0xE48F
+0x8B49 = 0xE490
+0x8B4A = 0xE491
+0x8B4B = 0xE492
+0x8B4C = 0xE493
+0x8B4D = 0xE494
+0x8B4E = 0xE495
+0x8B4F = 0xE496
+0x8B50 = 0xE497
+0x8B51 = 0xE498
+0x8B52 = 0xE499
+0x8B53 = 0xE49A
+0x8B54 = 0xE49B
+0x8B55 = 0xE49C
+0x8B56 = 0xE49D
+0x8B57 = 0xE49E
+0x8B58 = 0xE49F
+0x8B59 = 0xE4A0
+0x8B5A = 0xE4A1
+0x8B5B = 0xE4A2
+0x8B5C = 0xE4A3
+0x8B5D = 0xE4A4
+0x8B5E = 0xE4A5
+0x8B5F = 0xE4A6
+0x8B60 = 0xE4A7
+0x8B61 = 0xE4A8
+0x8B62 = 0xE4A9
+0x8B63 = 0xE4AA
+0x8B64 = 0xE4AB
+0x8B65 = 0xE4AC
+0x8B66 = 0xE4AD
+0x8B67 = 0xE4AE
+0x8B68 = 0xE4AF
+0x8B69 = 0xE4B0
+0x8B6A = 0xE4B1
+0x8B6B = 0xE4B2
+0x8B6C = 0xE4B3
+0x8B6D = 0xE4B4
+0x8B6E = 0xE4B5
+0x8B6F = 0xE4B6
+0x8B70 = 0xE4B7
+0x8B71 = 0xE4B8
+0x8B72 = 0xE4B9
+0x8B73 = 0xE4BA
+0x8B74 = 0xE4BB
+0x8B75 = 0xE4BC
+0x8B76 = 0xE4BD
+0x8B77 = 0xE4BE
+0x8B78 = 0xE4BF
+0x8B79 = 0xE4C0
+0x8B7A = 0xE4C1
+0x8B7B = 0xE4C2
+0x8B7C = 0xE4C3
+0x8B7D = 0xE4C4
+0x8B7E = 0xE4C5
+0x8C21 = 0xE4C6
+0x8C22 = 0xE4C7
+0x8C23 = 0xE4C8
+0x8C24 = 0xE4C9
+0x8C25 = 0xE4CA
+0x8C26 = 0xE4CB
+0x8C27 = 0xE4CC
+0x8C28 = 0xE4CD
+0x8C29 = 0xE4CE
+0x8C2A = 0xE4CF
+0x8C2B = 0xE4D0
+0x8C2C = 0xE4D1
+0x8C2D = 0xE4D2
+0x8C2E = 0xE4D3
+0x8C2F = 0xE4D4
+0x8C30 = 0xE4D5
+0x8C31 = 0xE4D6
+0x8C32 = 0xE4D7
+0x8C33 = 0xE4D8
+0x8C34 = 0xE4D9
+0x8C35 = 0xE4DA
+0x8C36 = 0xE4DB
+0x8C37 = 0xE4DC
+0x8C38 = 0xE4DD
+0x8C39 = 0xE4DE
+0x8C3A = 0xE4DF
+0x8C3B = 0xE4E0
+0x8C3C = 0xE4E1
+0x8C3D = 0xE4E2
+0x8C3E = 0xE4E3
+0x8C3F = 0xE4E4
+0x8C40 = 0xE4E5
+0x8C41 = 0xE4E6
+0x8C42 = 0xE4E7
+0x8C43 = 0xE4E8
+0x8C44 = 0xE4E9
+0x8C45 = 0xE4EA
+0x8C46 = 0xE4EB
+0x8C47 = 0xE4EC
+0x8C48 = 0xE4ED
+0x8C49 = 0xE4EE
+0x8C4A = 0xE4EF
+0x8C4B = 0xE4F0
+0x8C4C = 0xE4F1
+0x8C4D = 0xE4F2
+0x8C4E = 0xE4F3
+0x8C4F = 0xE4F4
+0x8C50 = 0xE4F5
+0x8C51 = 0xE4F6
+0x8C52 = 0xE4F7
+0x8C53 = 0xE4F8
+0x8C54 = 0xE4F9
+0x8C55 = 0xE4FA
+0x8C56 = 0xE4FB
+0x8C57 = 0xE4FC
+0x8C58 = 0xE4FD
+0x8C59 = 0xE4FE
+0x8C5A = 0xE4FF
+0x8C5B = 0xE500
+0x8C5C = 0xE501
+0x8C5D = 0xE502
+0x8C5E = 0xE503
+0x8C5F = 0xE504
+0x8C60 = 0xE505
+0x8C61 = 0xE506
+0x8C62 = 0xE507
+0x8C63 = 0xE508
+0x8C64 = 0xE509
+0x8C65 = 0xE50A
+0x8C66 = 0xE50B
+0x8C67 = 0xE50C
+0x8C68 = 0xE50D
+0x8C69 = 0xE50E
+0x8C6A = 0xE50F
+0x8C6B = 0xE510
+0x8C6C = 0xE511
+0x8C6D = 0xE512
+0x8C6E = 0xE513
+0x8C6F = 0xE514
+0x8C70 = 0xE515
+0x8C71 = 0xE516
+0x8C72 = 0xE517
+0x8C73 = 0xE518
+0x8C74 = 0xE519
+0x8C75 = 0xE51A
+0x8C76 = 0xE51B
+0x8C77 = 0xE51C
+0x8C78 = 0xE51D
+0x8C79 = 0xE51E
+0x8C7A = 0xE51F
+0x8C7B = 0xE520
+0x8C7C = 0xE521
+0x8C7D = 0xE522
+0x8C7E = 0xE523
+0x8D21 = 0xE524
+0x8D22 = 0xE525
+0x8D23 = 0xE526
+0x8D24 = 0xE527
+0x8D25 = 0xE528
+0x8D26 = 0xE529
+0x8D27 = 0xE52A
+0x8D28 = 0xE52B
+0x8D29 = 0xE52C
+0x8D2A = 0xE52D
+0x8D2B = 0xE52E
+0x8D2C = 0xE52F
+0x8D2D = 0xE530
+0x8D2E = 0xE531
+0x8D2F = 0xE532
+0x8D30 = 0xE533
+0x8D31 = 0xE534
+0x8D32 = 0xE535
+0x8D33 = 0xE536
+0x8D34 = 0xE537
+0x8D35 = 0xE538
+0x8D36 = 0xE539
+0x8D37 = 0xE53A
+0x8D38 = 0xE53B
+0x8D39 = 0xE53C
+0x8D3A = 0xE53D
+0x8D3B = 0xE53E
+0x8D3C = 0xE53F
+0x8D3D = 0xE540
+0x8D3E = 0xE541
+0x8D3F = 0xE542
+0x8D40 = 0xE543
+0x8D41 = 0xE544
+0x8D42 = 0xE545
+0x8D43 = 0xE546
+0x8D44 = 0xE547
+0x8D45 = 0xE548
+0x8D46 = 0xE549
+0x8D47 = 0xE54A
+0x8D48 = 0xE54B
+0x8D49 = 0xE54C
+0x8D4A = 0xE54D
+0x8D4B = 0xE54E
+0x8D4C = 0xE54F
+0x8D4D = 0xE550
+0x8D4E = 0xE551
+0x8D4F = 0xE552
+0x8D50 = 0xE553
+0x8D51 = 0xE554
+0x8D52 = 0xE555
+0x8D53 = 0xE556
+0x8D54 = 0xE557
+0x8D55 = 0xE558
+0x8D56 = 0xE559
+0x8D57 = 0xE55A
+0x8D58 = 0xE55B
+0x8D59 = 0xE55C
+0x8D5A = 0xE55D
+0x8D5B = 0xE55E
+0x8D5C = 0xE55F
+0x8D5D = 0xE560
+0x8D5E = 0xE561
+0x8D5F = 0xE562
+0x8D60 = 0xE563
+0x8D61 = 0xE564
+0x8D62 = 0xE565
+0x8D63 = 0xE566
+0x8D64 = 0xE567
+0x8D65 = 0xE568
+0x8D66 = 0xE569
+0x8D67 = 0xE56A
+0x8D68 = 0xE56B
+0x8D69 = 0xE56C
+0x8D6A = 0xE56D
+0x8D6B = 0xE56E
+0x8D6C = 0xE56F
+0x8D6D = 0xE570
+0x8D6E = 0xE571
+0x8D6F = 0xE572
+0x8D70 = 0xE573
+0x8D71 = 0xE574
+0x8D72 = 0xE575
+0x8D73 = 0xE576
+0x8D74 = 0xE577
+0x8D75 = 0xE578
+0x8D76 = 0xE579
+0x8D77 = 0xE57A
+0x8D78 = 0xE57B
+0x8D79 = 0xE57C
+0x8D7A = 0xE57D
+0x8D7B = 0xE57E
+0x8D7C = 0xE57F
+0x8D7D = 0xE580
+0x8D7E = 0xE581
+0x8E21 = 0xE582
+0x8E22 = 0xE583
+0x8E23 = 0xE584
+0x8E24 = 0xE585
+0x8E25 = 0xE586
+0x8E26 = 0xE587
+0x8E27 = 0xE588
+0x8E28 = 0xE589
+0x8E29 = 0xE58A
+0x8E2A = 0xE58B
+0x8E2B = 0xE58C
+0x8E2C = 0xE58D
+0x8E2D = 0xE58E
+0x8E2E = 0xE58F
+0x8E2F = 0xE590
+0x8E30 = 0xE591
+0x8E31 = 0xE592
+0x8E32 = 0xE593
+0x8E33 = 0xE594
+0x8E34 = 0xE595
+0x8E35 = 0xE596
+0x8E36 = 0xE597
+0x8E37 = 0xE598
+0x8E38 = 0xE599
+0x8E39 = 0xE59A
+0x8E3A = 0xE59B
+0x8E3B = 0xE59C
+0x8E3C = 0xE59D
+0x8E3D = 0xE59E
+0x8E3E = 0xE59F
+0x8E3F = 0xE5A0
+0x8E40 = 0xE5A1
+0x8E41 = 0xE5A2
+0x8E42 = 0xE5A3
+0x8E43 = 0xE5A4
+0x8E44 = 0xE5A5
+0x8E45 = 0xE5A6
+0x8E46 = 0xE5A7
+0x8E47 = 0xE5A8
+0x8E48 = 0xE5A9
+0x8E49 = 0xE5AA
+0x8E4A = 0xE5AB
+0x8E4B = 0xE5AC
+0x8E4C = 0xE5AD
+0x8E4D = 0xE5AE
+0x8E4E = 0xE5AF
+0x8E4F = 0xE5B0
+0x8E50 = 0xE5B1
+0x8E51 = 0xE5B2
+0x8E52 = 0xE5B3
+0x8E53 = 0xE5B4
+0x8E54 = 0xEAFB
+0x8E55 = 0xEAFC
+0x8E56 = 0xEAFD
+0x8E57 = 0xEAFE
+0x8E58 = 0xEAFF
+0x8E59 = 0xEB00
+0x8E5A = 0xEB01
+0x8E5B = 0xEB02
+0x8E5C = 0xEB03
+0x8E5D = 0xEB04
+0x8E5E = 0xEB05
+0x8E5F = 0xEB06
+0x8E60 = 0xEB07
+0x8E61 = 0xEB08
+0x8E62 = 0xEB09
+0x8E63 = 0xEB0A
+0x8E64 = 0xEB0B
+0x8E65 = 0xEB0C
+0x8E66 = 0xEB0D
+0x8E67 = 0xE5B5
+0x8E68 = 0xE5B6
+0x8E69 = 0xE5B7
+0x8E6A = 0xE5B8
+0x8E6B = 0xE5B9
+0x8E6C = 0xE5BA
+0x8E6D = 0xE5BB
+0x8E6E = 0xE5BC
+0x8E6F = 0xE5BD
+0x8E70 = 0xE5BE
+0x8E71 = 0xE5BF
+0x8E72 = 0xE5C0
+0x8E73 = 0xE5C1
+0x8E74 = 0xE5C2
+0x8E75 = 0xE5C3
+0x8E76 = 0xE5C4
+0x8E77 = 0xE5C5
+0x8E78 = 0xE5C6
+0x8E79 = 0xE5C7
+0x8E7A = 0xE5C8
+0x8E7B = 0xE5C9
+0x8E7C = 0xE5CA
+0x8E7D = 0xE5CB
+0x8E7E = 0xE5CC
+END_MAP
diff --git a/enc/trans/EMOJI/EMOJI_SHIFT_JIS-KDDI-UNDOC%UCS.src b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-KDDI-UNDOC%UCS.src
new file mode 100644
index 0000000000..85e5650b58
--- /dev/null
+++ b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-KDDI-UNDOC%UCS.src
@@ -0,0 +1,658 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		EMOJI_SHIFT_JIS-KDDI-UNDOC/UCS
+SRC_ZONE	0xF3-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x8521 = 0xEC40
+0x8522 = 0xEC41
+0x8523 = 0xEC42
+0x8524 = 0xEC43
+0x8525 = 0xEC44
+0x8526 = 0xEC45
+0x8527 = 0xEC46
+0x8528 = 0xEC47
+0x8529 = 0xEC48
+0x852A = 0xEC49
+0x852B = 0xEC4A
+0x852C = 0xEC4B
+0x852D = 0xEC4C
+0x852E = 0xEC4D
+0x852F = 0xEC4E
+0x8530 = 0xEC4F
+0x8531 = 0xEC50
+0x8532 = 0xEC51
+0x8533 = 0xEC52
+0x8534 = 0xEC53
+0x8535 = 0xEC54
+0x8536 = 0xEC55
+0x8537 = 0xEC56
+0x8538 = 0xEC57
+0x8539 = 0xEC58
+0x853A = 0xEC59
+0x853B = 0xEC5A
+0x853C = 0xEC5B
+0x853D = 0xEC5C
+0x853E = 0xEC5D
+0x853F = 0xEC5E
+0x8540 = 0xEC5F
+0x8541 = 0xEC60
+0x8542 = 0xEC61
+0x8543 = 0xEC62
+0x8544 = 0xEC63
+0x8545 = 0xEC64
+0x8546 = 0xEC65
+0x8547 = 0xEC66
+0x8548 = 0xEC67
+0x8549 = 0xEC68
+0x854A = 0xEC69
+0x854B = 0xEC6A
+0x854C = 0xEC6B
+0x854D = 0xEC6C
+0x854E = 0xEC6D
+0x854F = 0xEC6E
+0x8550 = 0xEC6F
+0x8551 = 0xEC70
+0x8552 = 0xEC71
+0x8553 = 0xEC72
+0x8554 = 0xEC73
+0x8555 = 0xEC74
+0x8556 = 0xEC75
+0x8557 = 0xEC76
+0x8558 = 0xEC77
+0x8559 = 0xEC78
+0x855A = 0xEC79
+0x855B = 0xEC7A
+0x855C = 0xEC7B
+0x855D = 0xEC7C
+0x855E = 0xEC7D
+0x855F = 0xEC7E
+0x8560 = 0xEC80
+0x8561 = 0xEC81
+0x8562 = 0xEC82
+0x8563 = 0xEC83
+0x8564 = 0xEC84
+0x8565 = 0xEC85
+0x8566 = 0xEC86
+0x8567 = 0xEC87
+0x8568 = 0xEC88
+0x8569 = 0xEC89
+0x856A = 0xEC8A
+0x856B = 0xEC8B
+0x856C = 0xEC8C
+0x856D = 0xEC8D
+0x856E = 0xEC8E
+0x856F = 0xEC8F
+0x8570 = 0xEC90
+0x8571 = 0xEC91
+0x8572 = 0xEC92
+0x8573 = 0xEC93
+0x8574 = 0xEC94
+0x8575 = 0xEC95
+0x8576 = 0xEC96
+0x8577 = 0xEC97
+0x8578 = 0xEC98
+0x8579 = 0xEC99
+0x857A = 0xEC9A
+0x857B = 0xEC9B
+0x857C = 0xEC9C
+0x857D = 0xEC9D
+0x857E = 0xEC9E
+0x8621 = 0xEC9F
+0x8622 = 0xECA0
+0x8623 = 0xECA1
+0x8624 = 0xECA2
+0x8625 = 0xECA3
+0x8626 = 0xECA4
+0x8627 = 0xECA5
+0x8628 = 0xECA6
+0x8629 = 0xECA7
+0x862A = 0xECA8
+0x862B = 0xECA9
+0x862C = 0xECAA
+0x862D = 0xECAB
+0x862E = 0xECAC
+0x862F = 0xECAD
+0x8630 = 0xECAE
+0x8631 = 0xECAF
+0x8632 = 0xECB0
+0x8633 = 0xECB1
+0x8634 = 0xECB2
+0x8635 = 0xECB3
+0x8636 = 0xECB4
+0x8637 = 0xECB5
+0x8638 = 0xECB6
+0x8639 = 0xECB7
+0x863A = 0xECB8
+0x863B = 0xECB9
+0x863C = 0xECBA
+0x863D = 0xECBB
+0x863E = 0xECBC
+0x863F = 0xECBD
+0x8640 = 0xECBE
+0x8641 = 0xECBF
+0x8642 = 0xECC0
+0x8643 = 0xECC1
+0x8644 = 0xECC2
+0x8645 = 0xECC3
+0x8646 = 0xECC4
+0x8647 = 0xECC5
+0x8648 = 0xECC6
+0x8649 = 0xECC7
+0x864A = 0xECC8
+0x864B = 0xECC9
+0x864C = 0xECCA
+0x864D = 0xECCB
+0x864E = 0xECCC
+0x864F = 0xECCD
+0x8650 = 0xECCE
+0x8651 = 0xECCF
+0x8652 = 0xECD0
+0x8653 = 0xECD1
+0x8654 = 0xECD2
+0x8655 = 0xECD3
+0x8656 = 0xECD4
+0x8657 = 0xECD5
+0x8658 = 0xECD6
+0x8659 = 0xECD7
+0x865A = 0xECD8
+0x865B = 0xECD9
+0x865C = 0xECDA
+0x865D = 0xECDB
+0x865E = 0xECDC
+0x865F = 0xECDD
+0x8660 = 0xECDE
+0x8661 = 0xECDF
+0x8662 = 0xECE0
+0x8663 = 0xECE1
+0x8664 = 0xECE2
+0x8665 = 0xECE3
+0x8666 = 0xECE4
+0x8667 = 0xECE5
+0x8668 = 0xECE6
+0x8669 = 0xECE7
+0x866A = 0xECE8
+0x866B = 0xECE9
+0x866C = 0xECEA
+0x866D = 0xECEB
+0x866E = 0xECEC
+0x866F = 0xECED
+0x8670 = 0xECEE
+0x8671 = 0xECEF
+0x8672 = 0xECF0
+0x8673 = 0xECF1
+0x8674 = 0xECF2
+0x8675 = 0xECF3
+0x8676 = 0xECF4
+0x8677 = 0xECF5
+0x8678 = 0xECF6
+0x8679 = 0xECF7
+0x867A = 0xECF8
+0x867B = 0xECF9
+0x867C = 0xECFA
+0x867D = 0xECFB
+0x867E = 0xECFC
+0x8721 = 0xED40
+0x8722 = 0xED41
+0x8723 = 0xED42
+0x8724 = 0xED43
+0x8725 = 0xED44
+0x8726 = 0xED45
+0x8727 = 0xED46
+0x8728 = 0xED47
+0x8729 = 0xED48
+0x872A = 0xED49
+0x872B = 0xED4A
+0x872C = 0xED4B
+0x872D = 0xED4C
+0x872E = 0xED4D
+0x872F = 0xED4E
+0x8730 = 0xED4F
+0x8731 = 0xED50
+0x8732 = 0xED51
+0x8733 = 0xED52
+0x8734 = 0xED53
+0x8735 = 0xED54
+0x8736 = 0xED55
+0x8737 = 0xED56
+0x8738 = 0xED57
+0x8739 = 0xED58
+0x873A = 0xED59
+0x873B = 0xED5A
+0x873C = 0xED5B
+0x873D = 0xED5C
+0x873E = 0xED5D
+0x873F = 0xED5E
+0x8740 = 0xED5F
+0x8741 = 0xED60
+0x8742 = 0xED61
+0x8743 = 0xED62
+0x8744 = 0xED63
+0x8745 = 0xED64
+0x8746 = 0xED65
+0x8747 = 0xED66
+0x8748 = 0xED67
+0x8749 = 0xED68
+0x874A = 0xED69
+0x874B = 0xED6A
+0x874C = 0xED6B
+0x874D = 0xED6C
+0x874E = 0xED6D
+0x874F = 0xED6E
+0x8750 = 0xED6F
+0x8751 = 0xED70
+0x8752 = 0xED71
+0x8753 = 0xED72
+0x8754 = 0xED73
+0x8755 = 0xED74
+0x8756 = 0xED75
+0x8757 = 0xED76
+0x8758 = 0xED77
+0x8759 = 0xED78
+0x875A = 0xED79
+0x875B = 0xED7A
+0x875C = 0xED7B
+0x875D = 0xED7C
+0x875E = 0xED7D
+0x875F = 0xED7E
+0x8760 = 0xED80
+0x8761 = 0xED81
+0x8762 = 0xED82
+0x8763 = 0xED83
+0x8764 = 0xED84
+0x8765 = 0xED85
+0x8766 = 0xED86
+0x8767 = 0xED87
+0x8768 = 0xED88
+0x8769 = 0xED89
+0x876A = 0xED8A
+0x876B = 0xED8B
+0x876C = 0xED8C
+0x876D = 0xED8D
+0x876E = 0xED8E
+0x876F = 0xED8F
+0x8770 = 0xED90
+0x8771 = 0xED91
+0x8772 = 0xED92
+0x8773 = 0xED93
+0x8B21 = 0xEF40
+0x8B22 = 0xEF41
+0x8B23 = 0xEF42
+0x8B24 = 0xEF43
+0x8B25 = 0xEF44
+0x8B26 = 0xEF45
+0x8B27 = 0xEF46
+0x8B28 = 0xEF47
+0x8B29 = 0xEF48
+0x8B2A = 0xEF49
+0x8B2B = 0xEF4A
+0x8B2C = 0xEF4B
+0x8B2D = 0xEF4C
+0x8B2E = 0xEF4D
+0x8B2F = 0xEF4E
+0x8B30 = 0xEF4F
+0x8B31 = 0xEF50
+0x8B32 = 0xEF51
+0x8B33 = 0xEF52
+0x8B34 = 0xEF53
+0x8B35 = 0xEF54
+0x8B36 = 0xEF55
+0x8B37 = 0xEF56
+0x8B38 = 0xEF57
+0x8B39 = 0xEF58
+0x8B3A = 0xEF59
+0x8B3B = 0xEF5A
+0x8B3C = 0xEF5B
+0x8B3D = 0xEF5C
+0x8B3E = 0xEF5D
+0x8B3F = 0xEF5E
+0x8B40 = 0xEF5F
+0x8B41 = 0xEF60
+0x8B42 = 0xEF61
+0x8B43 = 0xEF62
+0x8B44 = 0xEF63
+0x8B45 = 0xEF64
+0x8B46 = 0xEF65
+0x8B47 = 0xEF66
+0x8B48 = 0xEF67
+0x8B49 = 0xEF68
+0x8B4A = 0xEF69
+0x8B4B = 0xEF6A
+0x8B4C = 0xEF6B
+0x8B4D = 0xEF6C
+0x8B4E = 0xEF6D
+0x8B4F = 0xEF6E
+0x8B50 = 0xEF6F
+0x8B51 = 0xEF70
+0x8B52 = 0xEF71
+0x8B53 = 0xEF72
+0x8B54 = 0xEF73
+0x8B55 = 0xEF74
+0x8B56 = 0xEF75
+0x8B57 = 0xEF76
+0x8B58 = 0xEF77
+0x8B59 = 0xEF78
+0x8B5A = 0xEF79
+0x8B5B = 0xEF7A
+0x8B5C = 0xEF7B
+0x8B5D = 0xEF7C
+0x8B5E = 0xEF7D
+0x8B5F = 0xEF7E
+0x8B60 = 0xEF80
+0x8B61 = 0xEF81
+0x8B62 = 0xEF82
+0x8B63 = 0xEF83
+0x8B64 = 0xEF84
+0x8B65 = 0xEF85
+0x8B66 = 0xEF86
+0x8B67 = 0xEF87
+0x8B68 = 0xEF88
+0x8B69 = 0xEF89
+0x8B6A = 0xEF8A
+0x8B6B = 0xEF8B
+0x8B6C = 0xEF8C
+0x8B6D = 0xEF8D
+0x8B6E = 0xEF8E
+0x8B6F = 0xEF8F
+0x8B70 = 0xEF90
+0x8B71 = 0xEF91
+0x8B72 = 0xEF92
+0x8B73 = 0xEF93
+0x8B74 = 0xEF94
+0x8B75 = 0xEF95
+0x8B76 = 0xEF96
+0x8B77 = 0xEF97
+0x8B78 = 0xEF98
+0x8B79 = 0xEF99
+0x8B7A = 0xEF9A
+0x8B7B = 0xEF9B
+0x8B7C = 0xEF9C
+0x8B7D = 0xEF9D
+0x8B7E = 0xEF9E
+0x8C21 = 0xEF9F
+0x8C22 = 0xEFA0
+0x8C23 = 0xEFA1
+0x8C24 = 0xEFA2
+0x8C25 = 0xEFA3
+0x8C26 = 0xEFA4
+0x8C27 = 0xEFA5
+0x8C28 = 0xEFA6
+0x8C29 = 0xEFA7
+0x8C2A = 0xEFA8
+0x8C2B = 0xEFA9
+0x8C2C = 0xEFAA
+0x8C2D = 0xEFAB
+0x8C2E = 0xEFAC
+0x8C2F = 0xEFAD
+0x8C30 = 0xEFAE
+0x8C31 = 0xEFAF
+0x8C32 = 0xEFB0
+0x8C33 = 0xEFB1
+0x8C34 = 0xEFB2
+0x8C35 = 0xEFB3
+0x8C36 = 0xEFB4
+0x8C37 = 0xEFB5
+0x8C38 = 0xEFB6
+0x8C39 = 0xEFB7
+0x8C3A = 0xEFB8
+0x8C3B = 0xEFB9
+0x8C3C = 0xEFBA
+0x8C3D = 0xEFBB
+0x8C3E = 0xEFBC
+0x8C3F = 0xEFBD
+0x8C40 = 0xEFBE
+0x8C41 = 0xEFBF
+0x8C42 = 0xEFC0
+0x8C43 = 0xEFC1
+0x8C44 = 0xEFC2
+0x8C45 = 0xEFC3
+0x8C46 = 0xEFC4
+0x8C47 = 0xEFC5
+0x8C48 = 0xEFC6
+0x8C49 = 0xEFC7
+0x8C4A = 0xEFC8
+0x8C4B = 0xEFC9
+0x8C4C = 0xEFCA
+0x8C4D = 0xEFCB
+0x8C4E = 0xEFCC
+0x8C4F = 0xEFCD
+0x8C50 = 0xEFCE
+0x8C51 = 0xEFCF
+0x8C52 = 0xEFD0
+0x8C53 = 0xEFD1
+0x8C54 = 0xEFD2
+0x8C55 = 0xEFD3
+0x8C56 = 0xEFD4
+0x8C57 = 0xEFD5
+0x8C58 = 0xEFD6
+0x8C59 = 0xEFD7
+0x8C5A = 0xEFD8
+0x8C5B = 0xEFD9
+0x8C5C = 0xEFDA
+0x8C5D = 0xEFDB
+0x8C5E = 0xEFDC
+0x8C5F = 0xEFDD
+0x8C60 = 0xEFDE
+0x8C61 = 0xEFDF
+0x8C62 = 0xEFE0
+0x8C63 = 0xEFE1
+0x8C64 = 0xEFE2
+0x8C65 = 0xEFE3
+0x8C66 = 0xEFE4
+0x8C67 = 0xEFE5
+0x8C68 = 0xEFE6
+0x8C69 = 0xEFE7
+0x8C6A = 0xEFE8
+0x8C6B = 0xEFE9
+0x8C6C = 0xEFEA
+0x8C6D = 0xEFEB
+0x8C6E = 0xEFEC
+0x8C6F = 0xEFED
+0x8C70 = 0xEFEE
+0x8C71 = 0xEFEF
+0x8C72 = 0xEFF0
+0x8C73 = 0xEFF1
+0x8C74 = 0xEFF2
+0x8C75 = 0xEFF3
+0x8C76 = 0xEFF4
+0x8C77 = 0xEFF5
+0x8C78 = 0xEFF6
+0x8C79 = 0xEFF7
+0x8C7A = 0xEFF8
+0x8C7B = 0xEFF9
+0x8C7C = 0xEFFA
+0x8C7D = 0xEFFB
+0x8C7E = 0xEFFC
+0x8D21 = 0xF040
+0x8D22 = 0xF041
+0x8D23 = 0xF042
+0x8D24 = 0xF043
+0x8D25 = 0xF044
+0x8D26 = 0xF045
+0x8D27 = 0xF046
+0x8D28 = 0xF047
+0x8D29 = 0xF048
+0x8D2A = 0xF049
+0x8D2B = 0xF04A
+0x8D2C = 0xF04B
+0x8D2D = 0xF04C
+0x8D2E = 0xF04D
+0x8D2F = 0xF04E
+0x8D30 = 0xF04F
+0x8D31 = 0xF050
+0x8D32 = 0xF051
+0x8D33 = 0xF052
+0x8D34 = 0xF053
+0x8D35 = 0xF054
+0x8D36 = 0xF055
+0x8D37 = 0xF056
+0x8D38 = 0xF057
+0x8D39 = 0xF058
+0x8D3A = 0xF059
+0x8D3B = 0xF05A
+0x8D3C = 0xF05B
+0x8D3D = 0xF05C
+0x8D3E = 0xF05D
+0x8D3F = 0xF05E
+0x8D40 = 0xF05F
+0x8D41 = 0xF060
+0x8D42 = 0xF061
+0x8D43 = 0xF062
+0x8D44 = 0xF063
+0x8D45 = 0xF064
+0x8D46 = 0xF065
+0x8D47 = 0xF066
+0x8D48 = 0xF067
+0x8D49 = 0xF068
+0x8D4A = 0xF069
+0x8D4B = 0xF06A
+0x8D4C = 0xF06B
+0x8D4D = 0xF06C
+0x8D4E = 0xF06D
+0x8D4F = 0xF06E
+0x8D50 = 0xF06F
+0x8D51 = 0xF070
+0x8D52 = 0xF071
+0x8D53 = 0xF072
+0x8D54 = 0xF073
+0x8D55 = 0xF074
+0x8D56 = 0xF075
+0x8D57 = 0xF076
+0x8D58 = 0xF077
+0x8D59 = 0xF078
+0x8D5A = 0xF079
+0x8D5B = 0xF07A
+0x8D5C = 0xF07B
+0x8D5D = 0xF07C
+0x8D5E = 0xF07D
+0x8D5F = 0xF07E
+0x8D60 = 0xF080
+0x8D61 = 0xF081
+0x8D62 = 0xF082
+0x8D63 = 0xF083
+0x8D64 = 0xF084
+0x8D65 = 0xF085
+0x8D66 = 0xF086
+0x8D67 = 0xF087
+0x8D68 = 0xF088
+0x8D69 = 0xF089
+0x8D6A = 0xF08A
+0x8D6B = 0xF08B
+0x8D6C = 0xF08C
+0x8D6D = 0xF08D
+0x8D6E = 0xF08E
+0x8D6F = 0xF08F
+0x8D70 = 0xF090
+0x8D71 = 0xF091
+0x8D72 = 0xF092
+0x8D73 = 0xF093
+0x8D74 = 0xF094
+0x8D75 = 0xF095
+0x8D76 = 0xF096
+0x8D77 = 0xF097
+0x8D78 = 0xF098
+0x8D79 = 0xF099
+0x8D7A = 0xF09A
+0x8D7B = 0xF09B
+0x8D7C = 0xF09C
+0x8D7D = 0xF09D
+0x8D7E = 0xF09E
+0x8E21 = 0xF09F
+0x8E22 = 0xF0A0
+0x8E23 = 0xF0A1
+0x8E24 = 0xF0A2
+0x8E25 = 0xF0A3
+0x8E26 = 0xF0A4
+0x8E27 = 0xF0A5
+0x8E28 = 0xF0A6
+0x8E29 = 0xF0A7
+0x8E2A = 0xF0A8
+0x8E2B = 0xF0A9
+0x8E2C = 0xF0AA
+0x8E2D = 0xF0AB
+0x8E2E = 0xF0AC
+0x8E2F = 0xF0AD
+0x8E30 = 0xF0AE
+0x8E31 = 0xF0AF
+0x8E32 = 0xF0B0
+0x8E33 = 0xF0B1
+0x8E34 = 0xF0B2
+0x8E35 = 0xF0B3
+0x8E36 = 0xF0B4
+0x8E37 = 0xF0B5
+0x8E38 = 0xF0B6
+0x8E39 = 0xF0B7
+0x8E3A = 0xF0B8
+0x8E3B = 0xF0B9
+0x8E3C = 0xF0BA
+0x8E3D = 0xF0BB
+0x8E3E = 0xF0BC
+0x8E3F = 0xF0BD
+0x8E40 = 0xF0BE
+0x8E41 = 0xF0BF
+0x8E42 = 0xF0C0
+0x8E43 = 0xF0C1
+0x8E44 = 0xF0C2
+0x8E45 = 0xF0C3
+0x8E46 = 0xF0C4
+0x8E47 = 0xF0C5
+0x8E48 = 0xF0C6
+0x8E49 = 0xF0C7
+0x8E4A = 0xF0C8
+0x8E4B = 0xF0C9
+0x8E4C = 0xF0CA
+0x8E4D = 0xF0CB
+0x8E4E = 0xF0CC
+0x8E4F = 0xF0CD
+0x8E50 = 0xF0CE
+0x8E51 = 0xF0CF
+0x8E52 = 0xF0D0
+0x8E53 = 0xF0D1
+0x8E54 = 0xF0D2
+0x8E55 = 0xF0D3
+0x8E56 = 0xF0D4
+0x8E57 = 0xF0D5
+0x8E58 = 0xF0D6
+0x8E59 = 0xF0D7
+0x8E5A = 0xF0D8
+0x8E5B = 0xF0D9
+0x8E5C = 0xF0DA
+0x8E5D = 0xF0DB
+0x8E5E = 0xF0DC
+0x8E5F = 0xF0DD
+0x8E60 = 0xF0DE
+0x8E61 = 0xF0DF
+0x8E62 = 0xF0E0
+0x8E63 = 0xF0E1
+0x8E64 = 0xF0E2
+0x8E65 = 0xF0E3
+0x8E66 = 0xF0E4
+0x8E67 = 0xF0E5
+0x8E68 = 0xF0E6
+0x8E69 = 0xF0E7
+0x8E6A = 0xF0E8
+0x8E6B = 0xF0E9
+0x8E6C = 0xF0EA
+0x8E6D = 0xF0EB
+0x8E6E = 0xF0EC
+0x8E6F = 0xF0ED
+0x8E70 = 0xF0EE
+0x8E71 = 0xF0EF
+0x8E72 = 0xF0F0
+0x8E73 = 0xF0F1
+0x8E74 = 0xF0F2
+0x8E75 = 0xF0F3
+0x8E76 = 0xF0F4
+0x8E77 = 0xF0F5
+0x8E78 = 0xF0F6
+0x8E79 = 0xF0F7
+0x8E7A = 0xF0F8
+0x8E7B = 0xF0F9
+0x8E7C = 0xF0FA
+0x8E7D = 0xF0FB
+0x8E7E = 0xF0FC
+END_MAP
diff --git a/enc/trans/EMOJI/EMOJI_SHIFT_JIS-SOFTBANK%UCS.src b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-SOFTBANK%UCS.src
new file mode 100644
index 0000000000..015107413f
--- /dev/null
+++ b/enc/trans/EMOJI/EMOJI_SHIFT_JIS-SOFTBANK%UCS.src
@@ -0,0 +1,496 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		EMOJI_SHIFT_JIS-SOFTBANK/UCS
+SRC_ZONE	0xF3-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x8D22 = 0xE101
+0x8D23 = 0xE102
+0x8D24 = 0xE103
+0x8D25 = 0xE104
+0x8D26 = 0xE105
+0x8D27 = 0xE106
+0x8D28 = 0xE107
+0x8D29 = 0xE108
+0x8D2A = 0xE109
+0x8D2B = 0xE10A
+0x8D2C = 0xE10B
+0x8D2D = 0xE10C
+0x8D2E = 0xE10D
+0x8D2F = 0xE10E
+0x8D30 = 0xE10F
+0x8D31 = 0xE110
+0x8D32 = 0xE111
+0x8D33 = 0xE112
+0x8D34 = 0xE113
+0x8D35 = 0xE114
+0x8D36 = 0xE115
+0x8D37 = 0xE116
+0x8D38 = 0xE117
+0x8D39 = 0xE118
+0x8D3A = 0xE119
+0x8D3B = 0xE11A
+0x8D3C = 0xE11B
+0x8D3D = 0xE11C
+0x8D3E = 0xE11D
+0x8D3F = 0xE11E
+0x8D40 = 0xE11F
+0x8D41 = 0xE120
+0x8D42 = 0xE121
+0x8D43 = 0xE122
+0x8D44 = 0xE123
+0x8D45 = 0xE124
+0x8D46 = 0xE125
+0x8D47 = 0xE126
+0x8D48 = 0xE127
+0x8D49 = 0xE128
+0x8D4A = 0xE129
+0x8D4B = 0xE12A
+0x8D4C = 0xE12B
+0x8D4D = 0xE12C
+0x8D4E = 0xE12D
+0x8D4F = 0xE12E
+0x8D50 = 0xE12F
+0x8D51 = 0xE130
+0x8D52 = 0xE131
+0x8D53 = 0xE132
+0x8D54 = 0xE133
+0x8D55 = 0xE134
+0x8D56 = 0xE135
+0x8D57 = 0xE136
+0x8D58 = 0xE137
+0x8D59 = 0xE138
+0x8D5A = 0xE139
+0x8D5B = 0xE13A
+0x8D5C = 0xE13B
+0x8D5D = 0xE13C
+0x8D5E = 0xE13D
+0x8D5F = 0xE13E
+0x8D60 = 0xE13F
+0x8D61 = 0xE140
+0x8D62 = 0xE141
+0x8D63 = 0xE142
+0x8D64 = 0xE143
+0x8D65 = 0xE144
+0x8D66 = 0xE145
+0x8D67 = 0xE146
+0x8D68 = 0xE147
+0x8D69 = 0xE148
+0x8D6A = 0xE149
+0x8D6B = 0xE14A
+0x8D6C = 0xE14B
+0x8D6D = 0xE14C
+0x8D6E = 0xE14D
+0x8D6F = 0xE14E
+0x8D70 = 0xE14F
+0x8D71 = 0xE150
+0x8D72 = 0xE151
+0x8D73 = 0xE152
+0x8D74 = 0xE153
+0x8D75 = 0xE154
+0x8D76 = 0xE155
+0x8D77 = 0xE156
+0x8D78 = 0xE157
+0x8D79 = 0xE158
+0x8D7A = 0xE159
+0x8D7B = 0xE15A
+0x8E23 = 0xE201
+0x8E24 = 0xE202
+0x8E25 = 0xE203
+0x8E26 = 0xE204
+0x8E27 = 0xE205
+0x8E28 = 0xE206
+0x8E29 = 0xE207
+0x8E2A = 0xE208
+0x8E2B = 0xE209
+0x8E2C = 0xE20A
+0x8E2D = 0xE20B
+0x8E2E = 0xE20C
+0x8E2F = 0xE20D
+0x8E30 = 0xE20E
+0x8E31 = 0xE20F
+0x8E32 = 0xE210
+0x8E33 = 0xE211
+0x8E34 = 0xE212
+0x8E35 = 0xE213
+0x8E36 = 0xE214
+0x8E37 = 0xE215
+0x8E38 = 0xE216
+0x8E39 = 0xE217
+0x8E3A = 0xE218
+0x8E3B = 0xE219
+0x8E3C = 0xE21A
+0x8E3D = 0xE21B
+0x8E3E = 0xE21C
+0x8E3F = 0xE21D
+0x8E40 = 0xE21E
+0x8E41 = 0xE21F
+0x8E42 = 0xE220
+0x8E43 = 0xE221
+0x8E44 = 0xE222
+0x8E45 = 0xE223
+0x8E46 = 0xE224
+0x8E47 = 0xE225
+0x8E48 = 0xE226
+0x8E49 = 0xE227
+0x8E4A = 0xE228
+0x8E4B = 0xE229
+0x8E4C = 0xE22A
+0x8E4D = 0xE22B
+0x8E4E = 0xE22C
+0x8E4F = 0xE22D
+0x8E50 = 0xE22E
+0x8E51 = 0xE22F
+0x8E52 = 0xE230
+0x8E53 = 0xE231
+0x8E54 = 0xE232
+0x8E55 = 0xE233
+0x8E56 = 0xE234
+0x8E57 = 0xE235
+0x8E58 = 0xE236
+0x8E59 = 0xE237
+0x8E5A = 0xE238
+0x8E5B = 0xE239
+0x8E5C = 0xE23A
+0x8E5D = 0xE23B
+0x8E5E = 0xE23C
+0x8E5F = 0xE23D
+0x8E60 = 0xE23E
+0x8E61 = 0xE23F
+0x8E62 = 0xE240
+0x8E63 = 0xE241
+0x8E64 = 0xE242
+0x8E65 = 0xE243
+0x8E66 = 0xE244
+0x8E67 = 0xE245
+0x8E68 = 0xE246
+0x8E69 = 0xE247
+0x8E6A = 0xE248
+0x8E6B = 0xE249
+0x8E6C = 0xE24A
+0x8E6D = 0xE24B
+0x8E6E = 0xE24C
+0x8E6F = 0xE24D
+0x8E70 = 0xE24E
+0x8E71 = 0xE24F
+0x8E72 = 0xE250
+0x8E73 = 0xE251
+0x8E74 = 0xE252
+0x8E75 = 0xE253
+0x8E76 = 0xE254
+0x8E77 = 0xE255
+0x8E78 = 0xE256
+0x8E79 = 0xE257
+0x8E7A = 0xE258
+0x8E7B = 0xE259
+0x8E7C = 0xE25A
+0x9122 = 0xE001
+0x9123 = 0xE002
+0x9124 = 0xE003
+0x9125 = 0xE004
+0x9126 = 0xE005
+0x9127 = 0xE006
+0x9128 = 0xE007
+0x9129 = 0xE008
+0x912A = 0xE009
+0x912B = 0xE00A
+0x912C = 0xE00B
+0x912D = 0xE00C
+0x912E = 0xE00D
+0x912F = 0xE00E
+0x9130 = 0xE00F
+0x9131 = 0xE010
+0x9132 = 0xE011
+0x9133 = 0xE012
+0x9134 = 0xE013
+0x9135 = 0xE014
+0x9136 = 0xE015
+0x9137 = 0xE016
+0x9138 = 0xE017
+0x9139 = 0xE018
+0x913A = 0xE019
+0x913B = 0xE01A
+0x913C = 0xE01B
+0x913D = 0xE01C
+0x913E = 0xE01D
+0x913F = 0xE01E
+0x9140 = 0xE01F
+0x9141 = 0xE020
+0x9142 = 0xE021
+0x9143 = 0xE022
+0x9144 = 0xE023
+0x9145 = 0xE024
+0x9146 = 0xE025
+0x9147 = 0xE026
+0x9148 = 0xE027
+0x9149 = 0xE028
+0x914A = 0xE029
+0x914B = 0xE02A
+0x914C = 0xE02B
+0x914D = 0xE02C
+0x914E = 0xE02D
+0x914F = 0xE02E
+0x9150 = 0xE02F
+0x9151 = 0xE030
+0x9152 = 0xE031
+0x9153 = 0xE032
+0x9154 = 0xE033
+0x9155 = 0xE034
+0x9156 = 0xE035
+0x9157 = 0xE036
+0x9158 = 0xE037
+0x9159 = 0xE038
+0x915A = 0xE039
+0x915B = 0xE03A
+0x915C = 0xE03B
+0x915D = 0xE03C
+0x915E = 0xE03D
+0x915F = 0xE03E
+0x9160 = 0xE03F
+0x9161 = 0xE040
+0x9162 = 0xE041
+0x9163 = 0xE042
+0x9164 = 0xE043
+0x9165 = 0xE044
+0x9166 = 0xE045
+0x9167 = 0xE046
+0x9168 = 0xE047
+0x9169 = 0xE048
+0x916A = 0xE049
+0x916B = 0xE04A
+0x916C = 0xE04B
+0x916D = 0xE04C
+0x916E = 0xE04D
+0x916F = 0xE04E
+0x9170 = 0xE04F
+0x9171 = 0xE050
+0x9172 = 0xE051
+0x9173 = 0xE052
+0x9174 = 0xE053
+0x9175 = 0xE054
+0x9176 = 0xE055
+0x9177 = 0xE056
+0x9178 = 0xE057
+0x9179 = 0xE058
+0x917A = 0xE059
+0x917B = 0xE05A
+0x9223 = 0xE301
+0x9224 = 0xE302
+0x9225 = 0xE303
+0x9226 = 0xE304
+0x9227 = 0xE305
+0x9228 = 0xE306
+0x9229 = 0xE307
+0x922A = 0xE308
+0x922B = 0xE309
+0x922C = 0xE30A
+0x922D = 0xE30B
+0x922E = 0xE30C
+0x922F = 0xE30D
+0x9230 = 0xE30E
+0x9231 = 0xE30F
+0x9232 = 0xE310
+0x9233 = 0xE311
+0x9234 = 0xE312
+0x9235 = 0xE313
+0x9236 = 0xE314
+0x9237 = 0xE315
+0x9238 = 0xE316
+0x9239 = 0xE317
+0x923A = 0xE318
+0x923B = 0xE319
+0x923C = 0xE31A
+0x923D = 0xE31B
+0x923E = 0xE31C
+0x923F = 0xE31D
+0x9240 = 0xE31E
+0x9241 = 0xE31F
+0x9242 = 0xE320
+0x9243 = 0xE321
+0x9244 = 0xE322
+0x9245 = 0xE323
+0x9246 = 0xE324
+0x9247 = 0xE325
+0x9248 = 0xE326
+0x9249 = 0xE327
+0x924A = 0xE328
+0x924B = 0xE329
+0x924C = 0xE32A
+0x924D = 0xE32B
+0x924E = 0xE32C
+0x924F = 0xE32D
+0x9250 = 0xE32E
+0x9251 = 0xE32F
+0x9252 = 0xE330
+0x9253 = 0xE331
+0x9254 = 0xE332
+0x9255 = 0xE333
+0x9256 = 0xE334
+0x9257 = 0xE335
+0x9258 = 0xE336
+0x9259 = 0xE337
+0x925A = 0xE338
+0x925B = 0xE339
+0x925C = 0xE33A
+0x925D = 0xE33B
+0x925E = 0xE33C
+0x925F = 0xE33D
+0x9260 = 0xE33E
+0x9261 = 0xE33F
+0x9262 = 0xE340
+0x9263 = 0xE341
+0x9264 = 0xE342
+0x9265 = 0xE343
+0x9266 = 0xE344
+0x9267 = 0xE345
+0x9268 = 0xE346
+0x9269 = 0xE347
+0x926A = 0xE348
+0x926B = 0xE349
+0x926C = 0xE34A
+0x926D = 0xE34B
+0x926E = 0xE34C
+0x926F = 0xE34D
+0x9522 = 0xE401
+0x9523 = 0xE402
+0x9524 = 0xE403
+0x9525 = 0xE404
+0x9526 = 0xE405
+0x9527 = 0xE406
+0x9528 = 0xE407
+0x9529 = 0xE408
+0x952A = 0xE409
+0x952B = 0xE40A
+0x952C = 0xE40B
+0x952D = 0xE40C
+0x952E = 0xE40D
+0x952F = 0xE40E
+0x9530 = 0xE40F
+0x9531 = 0xE410
+0x9532 = 0xE411
+0x9533 = 0xE412
+0x9534 = 0xE413
+0x9535 = 0xE414
+0x9536 = 0xE415
+0x9537 = 0xE416
+0x9538 = 0xE417
+0x9539 = 0xE418
+0x953A = 0xE419
+0x953B = 0xE41A
+0x953C = 0xE41B
+0x953D = 0xE41C
+0x953E = 0xE41D
+0x953F = 0xE41E
+0x9540 = 0xE41F
+0x9541 = 0xE420
+0x9542 = 0xE421
+0x9543 = 0xE422
+0x9544 = 0xE423
+0x9545 = 0xE424
+0x9546 = 0xE425
+0x9547 = 0xE426
+0x9548 = 0xE427
+0x9549 = 0xE428
+0x954A = 0xE429
+0x954B = 0xE42A
+0x954C = 0xE42B
+0x954D = 0xE42C
+0x954E = 0xE42D
+0x954F = 0xE42E
+0x9550 = 0xE42F
+0x9551 = 0xE430
+0x9552 = 0xE431
+0x9553 = 0xE432
+0x9554 = 0xE433
+0x9555 = 0xE434
+0x9556 = 0xE435
+0x9557 = 0xE436
+0x9558 = 0xE437
+0x9559 = 0xE438
+0x955A = 0xE439
+0x955B = 0xE43A
+0x955C = 0xE43B
+0x955D = 0xE43C
+0x955E = 0xE43D
+0x955F = 0xE43E
+0x9560 = 0xE43F
+0x9561 = 0xE440
+0x9562 = 0xE441
+0x9563 = 0xE442
+0x9564 = 0xE443
+0x9565 = 0xE444
+0x9566 = 0xE445
+0x9567 = 0xE446
+0x9568 = 0xE447
+0x9569 = 0xE448
+0x956A = 0xE449
+0x956B = 0xE44A
+0x956C = 0xE44B
+0x956D = 0xE44C
+0x9623 = 0xE501
+0x9624 = 0xE502
+0x9625 = 0xE503
+0x9626 = 0xE504
+0x9627 = 0xE505
+0x9628 = 0xE506
+0x9629 = 0xE507
+0x962A = 0xE508
+0x962B = 0xE509
+0x962C = 0xE50A
+0x962D = 0xE50B
+0x962E = 0xE50C
+0x962F = 0xE50D
+0x9630 = 0xE50E
+0x9631 = 0xE50F
+0x9632 = 0xE510
+0x9633 = 0xE511
+0x9634 = 0xE512
+0x9635 = 0xE513
+0x9636 = 0xE514
+0x9637 = 0xE515
+0x9638 = 0xE516
+0x9639 = 0xE517
+0x963A = 0xE518
+0x963B = 0xE519
+0x963C = 0xE51A
+0x963D = 0xE51B
+0x963E = 0xE51C
+0x963F = 0xE51D
+0x9640 = 0xE51E
+0x9641 = 0xE51F
+0x9642 = 0xE520
+0x9643 = 0xE521
+0x9644 = 0xE522
+0x9645 = 0xE523
+0x9646 = 0xE524
+0x9647 = 0xE525
+0x9648 = 0xE526
+0x9649 = 0xE527
+0x964A = 0xE528
+0x964B = 0xE529
+0x964C = 0xE52A
+0x964D = 0xE52B
+0x964E = 0xE52C
+0x964F = 0xE52D
+0x9650 = 0xE52E
+0x9651 = 0xE52F
+0x9652 = 0xE530
+0x9653 = 0xE531
+0x9654 = 0xE532
+0x9655 = 0xE533
+0x9656 = 0xE534
+0x9657 = 0xE535
+0x9658 = 0xE536
+0x9659 = 0xE537
+0x965A = 0xE538
+0x965B = 0xE539
+0x965C = 0xE53A
+0x965D = 0xE53B
+0x965E = 0xE53C
+0x965F = 0xE53D
+0x9660 = 0xE53E
+END_MAP
diff --git a/enc/trans/EMOJI/UCS%EMOJI_ISO-2022-JP-KDDI-UNDOC.src b/enc/trans/EMOJI/UCS%EMOJI_ISO-2022-JP-KDDI-UNDOC.src
new file mode 100644
index 0000000000..562583344c
--- /dev/null
+++ b/enc/trans/EMOJI/UCS%EMOJI_ISO-2022-JP-KDDI-UNDOC.src
@@ -0,0 +1,658 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		UCS/EMOJI_ISO-2022-JP-KDDI-UNDOC
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xEC40 = 0x7921
+0xEC41 = 0x7922
+0xEC42 = 0x7923
+0xEC43 = 0x7924
+0xEC44 = 0x7925
+0xEC45 = 0x7926
+0xEC46 = 0x7927
+0xEC47 = 0x7928
+0xEC48 = 0x7929
+0xEC49 = 0x792A
+0xEC4A = 0x792B
+0xEC4B = 0x792C
+0xEC4C = 0x792D
+0xEC4D = 0x792E
+0xEC4E = 0x792F
+0xEC4F = 0x7930
+0xEC50 = 0x7931
+0xEC51 = 0x7932
+0xEC52 = 0x7933
+0xEC53 = 0x7934
+0xEC54 = 0x7935
+0xEC55 = 0x7936
+0xEC56 = 0x7937
+0xEC57 = 0x7938
+0xEC58 = 0x7939
+0xEC59 = 0x793A
+0xEC5A = 0x793B
+0xEC5B = 0x793C
+0xEC5C = 0x793D
+0xEC5D = 0x793E
+0xEC5E = 0x793F
+0xEC5F = 0x7940
+0xEC60 = 0x7941
+0xEC61 = 0x7942
+0xEC62 = 0x7943
+0xEC63 = 0x7944
+0xEC64 = 0x7945
+0xEC65 = 0x7946
+0xEC66 = 0x7947
+0xEC67 = 0x7948
+0xEC68 = 0x7949
+0xEC69 = 0x794A
+0xEC6A = 0x794B
+0xEC6B = 0x794C
+0xEC6C = 0x794D
+0xEC6D = 0x794E
+0xEC6E = 0x794F
+0xEC6F = 0x7950
+0xEC70 = 0x7951
+0xEC71 = 0x7952
+0xEC72 = 0x7953
+0xEC73 = 0x7954
+0xEC74 = 0x7955
+0xEC75 = 0x7956
+0xEC76 = 0x7957
+0xEC77 = 0x7958
+0xEC78 = 0x7959
+0xEC79 = 0x795A
+0xEC7A = 0x795B
+0xEC7B = 0x795C
+0xEC7C = 0x795D
+0xEC7D = 0x795E
+0xEC7E = 0x795F
+0xEC80 = 0x7960
+0xEC81 = 0x7961
+0xEC82 = 0x7962
+0xEC83 = 0x7963
+0xEC84 = 0x7964
+0xEC85 = 0x7965
+0xEC86 = 0x7966
+0xEC87 = 0x7967
+0xEC88 = 0x7968
+0xEC89 = 0x7969
+0xEC8A = 0x796A
+0xEC8B = 0x796B
+0xEC8C = 0x796C
+0xEC8D = 0x796D
+0xEC8E = 0x796E
+0xEC8F = 0x796F
+0xEC90 = 0x7970
+0xEC91 = 0x7971
+0xEC92 = 0x7972
+0xEC93 = 0x7973
+0xEC94 = 0x7974
+0xEC95 = 0x7975
+0xEC96 = 0x7976
+0xEC97 = 0x7977
+0xEC98 = 0x7978
+0xEC99 = 0x7979
+0xEC9A = 0x797A
+0xEC9B = 0x797B
+0xEC9C = 0x797C
+0xEC9D = 0x797D
+0xEC9E = 0x797E
+0xEC9F = 0x7A21
+0xECA0 = 0x7A22
+0xECA1 = 0x7A23
+0xECA2 = 0x7A24
+0xECA3 = 0x7A25
+0xECA4 = 0x7A26
+0xECA5 = 0x7A27
+0xECA6 = 0x7A28
+0xECA7 = 0x7A29
+0xECA8 = 0x7A2A
+0xECA9 = 0x7A2B
+0xECAA = 0x7A2C
+0xECAB = 0x7A2D
+0xECAC = 0x7A2E
+0xECAD = 0x7A2F
+0xECAE = 0x7A30
+0xECAF = 0x7A31
+0xECB0 = 0x7A32
+0xECB1 = 0x7A33
+0xECB2 = 0x7A34
+0xECB3 = 0x7A35
+0xECB4 = 0x7A36
+0xECB5 = 0x7A37
+0xECB6 = 0x7A38
+0xECB7 = 0x7A39
+0xECB8 = 0x7A3A
+0xECB9 = 0x7A3B
+0xECBA = 0x7A3C
+0xECBB = 0x7A3D
+0xECBC = 0x7A3E
+0xECBD = 0x7A3F
+0xECBE = 0x7A40
+0xECBF = 0x7A41
+0xECC0 = 0x7A42
+0xECC1 = 0x7A43
+0xECC2 = 0x7A44
+0xECC3 = 0x7A45
+0xECC4 = 0x7A46
+0xECC5 = 0x7A47
+0xECC6 = 0x7A48
+0xECC7 = 0x7A49
+0xECC8 = 0x7A4A
+0xECC9 = 0x7A4B
+0xECCA = 0x7A4C
+0xECCB = 0x7A4D
+0xECCC = 0x7A4E
+0xECCD = 0x7A4F
+0xECCE = 0x7A50
+0xECCF = 0x7A51
+0xECD0 = 0x7A52
+0xECD1 = 0x7A53
+0xECD2 = 0x7A54
+0xECD3 = 0x7A55
+0xECD4 = 0x7A56
+0xECD5 = 0x7A57
+0xECD6 = 0x7A58
+0xECD7 = 0x7A59
+0xECD8 = 0x7A5A
+0xECD9 = 0x7A5B
+0xECDA = 0x7A5C
+0xECDB = 0x7A5D
+0xECDC = 0x7A5E
+0xECDD = 0x7A5F
+0xECDE = 0x7A60
+0xECDF = 0x7A61
+0xECE0 = 0x7A62
+0xECE1 = 0x7A63
+0xECE2 = 0x7A64
+0xECE3 = 0x7A65
+0xECE4 = 0x7A66
+0xECE5 = 0x7A67
+0xECE6 = 0x7A68
+0xECE7 = 0x7A69
+0xECE8 = 0x7A6A
+0xECE9 = 0x7A6B
+0xECEA = 0x7A6C
+0xECEB = 0x7A6D
+0xECEC = 0x7A6E
+0xECED = 0x7A6F
+0xECEE = 0x7A70
+0xECEF = 0x7A71
+0xECF0 = 0x7A72
+0xECF1 = 0x7A73
+0xECF2 = 0x7A74
+0xECF3 = 0x7A75
+0xECF4 = 0x7A76
+0xECF5 = 0x7A77
+0xECF6 = 0x7A78
+0xECF7 = 0x7A79
+0xECF8 = 0x7A7A
+0xECF9 = 0x7A7B
+0xECFA = 0x7A7C
+0xECFB = 0x7A7D
+0xECFC = 0x7A7E
+0xED40 = 0x7B21
+0xED41 = 0x7B22
+0xED42 = 0x7B23
+0xED43 = 0x7B24
+0xED44 = 0x7B25
+0xED45 = 0x7B26
+0xED46 = 0x7B27
+0xED47 = 0x7B28
+0xED48 = 0x7B29
+0xED49 = 0x7B2A
+0xED4A = 0x7B2B
+0xED4B = 0x7B2C
+0xED4C = 0x7B2D
+0xED4D = 0x7B2E
+0xED4E = 0x7B2F
+0xED4F = 0x7B30
+0xED50 = 0x7B31
+0xED51 = 0x7B32
+0xED52 = 0x7B33
+0xED53 = 0x7B34
+0xED54 = 0x7B35
+0xED55 = 0x7B36
+0xED56 = 0x7B37
+0xED57 = 0x7B38
+0xED58 = 0x7B39
+0xED59 = 0x7B3A
+0xED5A = 0x7B3B
+0xED5B = 0x7B3C
+0xED5C = 0x7B3D
+0xED5D = 0x7B3E
+0xED5E = 0x7B3F
+0xED5F = 0x7B40
+0xED60 = 0x7B41
+0xED61 = 0x7B42
+0xED62 = 0x7B43
+0xED63 = 0x7B44
+0xED64 = 0x7B45
+0xED65 = 0x7B46
+0xED66 = 0x7B47
+0xED67 = 0x7B48
+0xED68 = 0x7B49
+0xED69 = 0x7B4A
+0xED6A = 0x7B4B
+0xED6B = 0x7B4C
+0xED6C = 0x7B4D
+0xED6D = 0x7B4E
+0xED6E = 0x7B4F
+0xED6F = 0x7B50
+0xED70 = 0x7B51
+0xED71 = 0x7B52
+0xED72 = 0x7B53
+0xED73 = 0x7B54
+0xED74 = 0x7B55
+0xED75 = 0x7B56
+0xED76 = 0x7B57
+0xED77 = 0x7B58
+0xED78 = 0x7B59
+0xED79 = 0x7B5A
+0xED7A = 0x7B5B
+0xED7B = 0x7B5C
+0xED7C = 0x7B5D
+0xED7D = 0x7B5E
+0xED7E = 0x7B5F
+0xED80 = 0x7B60
+0xED81 = 0x7B61
+0xED82 = 0x7B62
+0xED83 = 0x7B63
+0xED84 = 0x7B64
+0xED85 = 0x7B65
+0xED86 = 0x7B66
+0xED87 = 0x7B67
+0xED88 = 0x7B68
+0xED89 = 0x7B69
+0xED8A = 0x7B6A
+0xED8B = 0x7B6B
+0xED8C = 0x7B6C
+0xED8D = 0x7B6D
+0xED8E = 0x7B6E
+0xED8F = 0x7B6F
+0xED90 = 0x7B70
+0xED91 = 0x7B71
+0xED92 = 0x7B72
+0xED93 = 0x7B73
+0xEF40 = 0x7521
+0xEF41 = 0x7522
+0xEF42 = 0x7523
+0xEF43 = 0x7524
+0xEF44 = 0x7525
+0xEF45 = 0x7526
+0xEF46 = 0x7527
+0xEF47 = 0x7528
+0xEF48 = 0x7529
+0xEF49 = 0x752A
+0xEF4A = 0x752B
+0xEF4B = 0x752C
+0xEF4C = 0x752D
+0xEF4D = 0x752E
+0xEF4E = 0x752F
+0xEF4F = 0x7530
+0xEF50 = 0x7531
+0xEF51 = 0x7532
+0xEF52 = 0x7533
+0xEF53 = 0x7534
+0xEF54 = 0x7535
+0xEF55 = 0x7536
+0xEF56 = 0x7537
+0xEF57 = 0x7538
+0xEF58 = 0x7539
+0xEF59 = 0x753A
+0xEF5A = 0x753B
+0xEF5B = 0x753C
+0xEF5C = 0x753D
+0xEF5D = 0x753E
+0xEF5E = 0x753F
+0xEF5F = 0x7540
+0xEF60 = 0x7541
+0xEF61 = 0x7542
+0xEF62 = 0x7543
+0xEF63 = 0x7544
+0xEF64 = 0x7545
+0xEF65 = 0x7546
+0xEF66 = 0x7547
+0xEF67 = 0x7548
+0xEF68 = 0x7549
+0xEF69 = 0x754A
+0xEF6A = 0x754B
+0xEF6B = 0x754C
+0xEF6C = 0x754D
+0xEF6D = 0x754E
+0xEF6E = 0x754F
+0xEF6F = 0x7550
+0xEF70 = 0x7551
+0xEF71 = 0x7552
+0xEF72 = 0x7553
+0xEF73 = 0x7554
+0xEF74 = 0x7555
+0xEF75 = 0x7556
+0xEF76 = 0x7557
+0xEF77 = 0x7558
+0xEF78 = 0x7559
+0xEF79 = 0x755A
+0xEF7A = 0x755B
+0xEF7B = 0x755C
+0xEF7C = 0x755D
+0xEF7D = 0x755E
+0xEF7E = 0x755F
+0xEF80 = 0x7560
+0xEF81 = 0x7561
+0xEF82 = 0x7562
+0xEF83 = 0x7563
+0xEF84 = 0x7564
+0xEF85 = 0x7565
+0xEF86 = 0x7566
+0xEF87 = 0x7567
+0xEF88 = 0x7568
+0xEF89 = 0x7569
+0xEF8A = 0x756A
+0xEF8B = 0x756B
+0xEF8C = 0x756C
+0xEF8D = 0x756D
+0xEF8E = 0x756E
+0xEF8F = 0x756F
+0xEF90 = 0x7570
+0xEF91 = 0x7571
+0xEF92 = 0x7572
+0xEF93 = 0x7573
+0xEF94 = 0x7574
+0xEF95 = 0x7575
+0xEF96 = 0x7576
+0xEF97 = 0x7577
+0xEF98 = 0x7578
+0xEF99 = 0x7579
+0xEF9A = 0x757A
+0xEF9B = 0x757B
+0xEF9C = 0x757C
+0xEF9D = 0x757D
+0xEF9E = 0x757E
+0xEF9F = 0x7621
+0xEFA0 = 0x7622
+0xEFA1 = 0x7623
+0xEFA2 = 0x7624
+0xEFA3 = 0x7625
+0xEFA4 = 0x7626
+0xEFA5 = 0x7627
+0xEFA6 = 0x7628
+0xEFA7 = 0x7629
+0xEFA8 = 0x762A
+0xEFA9 = 0x762B
+0xEFAA = 0x762C
+0xEFAB = 0x762D
+0xEFAC = 0x762E
+0xEFAD = 0x762F
+0xEFAE = 0x7630
+0xEFAF = 0x7631
+0xEFB0 = 0x7632
+0xEFB1 = 0x7633
+0xEFB2 = 0x7634
+0xEFB3 = 0x7635
+0xEFB4 = 0x7636
+0xEFB5 = 0x7637
+0xEFB6 = 0x7638
+0xEFB7 = 0x7639
+0xEFB8 = 0x763A
+0xEFB9 = 0x763B
+0xEFBA = 0x763C
+0xEFBB = 0x763D
+0xEFBC = 0x763E
+0xEFBD = 0x763F
+0xEFBE = 0x7640
+0xEFBF = 0x7641
+0xEFC0 = 0x7642
+0xEFC1 = 0x7643
+0xEFC2 = 0x7644
+0xEFC3 = 0x7645
+0xEFC4 = 0x7646
+0xEFC5 = 0x7647
+0xEFC6 = 0x7648
+0xEFC7 = 0x7649
+0xEFC8 = 0x764A
+0xEFC9 = 0x764B
+0xEFCA = 0x764C
+0xEFCB = 0x764D
+0xEFCC = 0x764E
+0xEFCD = 0x764F
+0xEFCE = 0x7650
+0xEFCF = 0x7651
+0xEFD0 = 0x7652
+0xEFD1 = 0x7653
+0xEFD2 = 0x7654
+0xEFD3 = 0x7655
+0xEFD4 = 0x7656
+0xEFD5 = 0x7657
+0xEFD6 = 0x7658
+0xEFD7 = 0x7659
+0xEFD8 = 0x765A
+0xEFD9 = 0x765B
+0xEFDA = 0x765C
+0xEFDB = 0x765D
+0xEFDC = 0x765E
+0xEFDD = 0x765F
+0xEFDE = 0x7660
+0xEFDF = 0x7661
+0xEFE0 = 0x7662
+0xEFE1 = 0x7663
+0xEFE2 = 0x7664
+0xEFE3 = 0x7665
+0xEFE4 = 0x7666
+0xEFE5 = 0x7667
+0xEFE6 = 0x7668
+0xEFE7 = 0x7669
+0xEFE8 = 0x766A
+0xEFE9 = 0x766B
+0xEFEA = 0x766C
+0xEFEB = 0x766D
+0xEFEC = 0x766E
+0xEFED = 0x766F
+0xEFEE = 0x7670
+0xEFEF = 0x7671
+0xEFF0 = 0x7672
+0xEFF1 = 0x7673
+0xEFF2 = 0x7674
+0xEFF3 = 0x7675
+0xEFF4 = 0x7676
+0xEFF5 = 0x7677
+0xEFF6 = 0x7678
+0xEFF7 = 0x7679
+0xEFF8 = 0x767A
+0xEFF9 = 0x767B
+0xEFFA = 0x767C
+0xEFFB = 0x767D
+0xEFFC = 0x767E
+0xF040 = 0x7721
+0xF041 = 0x7722
+0xF042 = 0x7723
+0xF043 = 0x7724
+0xF044 = 0x7725
+0xF045 = 0x7726
+0xF046 = 0x7727
+0xF047 = 0x7728
+0xF048 = 0x7729
+0xF049 = 0x772A
+0xF04A = 0x772B
+0xF04B = 0x772C
+0xF04C = 0x772D
+0xF04D = 0x772E
+0xF04E = 0x772F
+0xF04F = 0x7730
+0xF050 = 0x7731
+0xF051 = 0x7732
+0xF052 = 0x7733
+0xF053 = 0x7734
+0xF054 = 0x7735
+0xF055 = 0x7736
+0xF056 = 0x7737
+0xF057 = 0x7738
+0xF058 = 0x7739
+0xF059 = 0x773A
+0xF05A = 0x773B
+0xF05B = 0x773C
+0xF05C = 0x773D
+0xF05D = 0x773E
+0xF05E = 0x773F
+0xF05F = 0x7740
+0xF060 = 0x7741
+0xF061 = 0x7742
+0xF062 = 0x7743
+0xF063 = 0x7744
+0xF064 = 0x7745
+0xF065 = 0x7746
+0xF066 = 0x7747
+0xF067 = 0x7748
+0xF068 = 0x7749
+0xF069 = 0x774A
+0xF06A = 0x774B
+0xF06B = 0x774C
+0xF06C = 0x774D
+0xF06D = 0x774E
+0xF06E = 0x774F
+0xF06F = 0x7750
+0xF070 = 0x7751
+0xF071 = 0x7752
+0xF072 = 0x7753
+0xF073 = 0x7754
+0xF074 = 0x7755
+0xF075 = 0x7756
+0xF076 = 0x7757
+0xF077 = 0x7758
+0xF078 = 0x7759
+0xF079 = 0x775A
+0xF07A = 0x775B
+0xF07B = 0x775C
+0xF07C = 0x775D
+0xF07D = 0x775E
+0xF07E = 0x775F
+0xF080 = 0x7760
+0xF081 = 0x7761
+0xF082 = 0x7762
+0xF083 = 0x7763
+0xF084 = 0x7764
+0xF085 = 0x7765
+0xF086 = 0x7766
+0xF087 = 0x7767
+0xF088 = 0x7768
+0xF089 = 0x7769
+0xF08A = 0x776A
+0xF08B = 0x776B
+0xF08C = 0x776C
+0xF08D = 0x776D
+0xF08E = 0x776E
+0xF08F = 0x776F
+0xF090 = 0x7770
+0xF091 = 0x7771
+0xF092 = 0x7772
+0xF093 = 0x7773
+0xF094 = 0x7774
+0xF095 = 0x7775
+0xF096 = 0x7776
+0xF097 = 0x7777
+0xF098 = 0x7778
+0xF099 = 0x7779
+0xF09A = 0x777A
+0xF09B = 0x777B
+0xF09C = 0x777C
+0xF09D = 0x777D
+0xF09E = 0x777E
+0xF09F = 0x7821
+0xF0A0 = 0x7822
+0xF0A1 = 0x7823
+0xF0A2 = 0x7824
+0xF0A3 = 0x7825
+0xF0A4 = 0x7826
+0xF0A5 = 0x7827
+0xF0A6 = 0x7828
+0xF0A7 = 0x7829
+0xF0A8 = 0x782A
+0xF0A9 = 0x782B
+0xF0AA = 0x782C
+0xF0AB = 0x782D
+0xF0AC = 0x782E
+0xF0AD = 0x782F
+0xF0AE = 0x7830
+0xF0AF = 0x7831
+0xF0B0 = 0x7832
+0xF0B1 = 0x7833
+0xF0B2 = 0x7834
+0xF0B3 = 0x7835
+0xF0B4 = 0x7836
+0xF0B5 = 0x7837
+0xF0B6 = 0x7838
+0xF0B7 = 0x7839
+0xF0B8 = 0x783A
+0xF0B9 = 0x783B
+0xF0BA = 0x783C
+0xF0BB = 0x783D
+0xF0BC = 0x783E
+0xF0BD = 0x783F
+0xF0BE = 0x7840
+0xF0BF = 0x7841
+0xF0C0 = 0x7842
+0xF0C1 = 0x7843
+0xF0C2 = 0x7844
+0xF0C3 = 0x7845
+0xF0C4 = 0x7846
+0xF0C5 = 0x7847
+0xF0C6 = 0x7848
+0xF0C7 = 0x7849
+0xF0C8 = 0x784A
+0xF0C9 = 0x784B
+0xF0CA = 0x784C
+0xF0CB = 0x784D
+0xF0CC = 0x784E
+0xF0CD = 0x784F
+0xF0CE = 0x7850
+0xF0CF = 0x7851
+0xF0D0 = 0x7852
+0xF0D1 = 0x7853
+0xF0D2 = 0x7854
+0xF0D3 = 0x7855
+0xF0D4 = 0x7856
+0xF0D5 = 0x7857
+0xF0D6 = 0x7858
+0xF0D7 = 0x7859
+0xF0D8 = 0x785A
+0xF0D9 = 0x785B
+0xF0DA = 0x785C
+0xF0DB = 0x785D
+0xF0DC = 0x785E
+0xF0DD = 0x785F
+0xF0DE = 0x7860
+0xF0DF = 0x7861
+0xF0E0 = 0x7862
+0xF0E1 = 0x7863
+0xF0E2 = 0x7864
+0xF0E3 = 0x7865
+0xF0E4 = 0x7866
+0xF0E5 = 0x7867
+0xF0E6 = 0x7868
+0xF0E7 = 0x7869
+0xF0E8 = 0x786A
+0xF0E9 = 0x786B
+0xF0EA = 0x786C
+0xF0EB = 0x786D
+0xF0EC = 0x786E
+0xF0ED = 0x786F
+0xF0EE = 0x7870
+0xF0EF = 0x7871
+0xF0F0 = 0x7872
+0xF0F1 = 0x7873
+0xF0F2 = 0x7874
+0xF0F3 = 0x7875
+0xF0F4 = 0x7876
+0xF0F5 = 0x7877
+0xF0F6 = 0x7878
+0xF0F7 = 0x7879
+0xF0F8 = 0x787A
+0xF0F9 = 0x787B
+0xF0FA = 0x787C
+0xF0FB = 0x787D
+0xF0FC = 0x787E
+END_MAP
diff --git a/enc/trans/EMOJI/UCS%EMOJI_ISO-2022-JP-KDDI.src b/enc/trans/EMOJI/UCS%EMOJI_ISO-2022-JP-KDDI.src
new file mode 100644
index 0000000000..0ee6180a7b
--- /dev/null
+++ b/enc/trans/EMOJI/UCS%EMOJI_ISO-2022-JP-KDDI.src
@@ -0,0 +1,658 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		UCS/EMOJI_ISO-2022-JP-KDDI
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xE468 = 0x7521
+0xE469 = 0x7522
+0xE46A = 0x7523
+0xE46B = 0x7524
+0xE46C = 0x7525
+0xE46D = 0x7526
+0xE46E = 0x7527
+0xE46F = 0x7528
+0xE470 = 0x7529
+0xE471 = 0x752A
+0xE472 = 0x752B
+0xE473 = 0x752C
+0xE474 = 0x752D
+0xE475 = 0x752E
+0xE476 = 0x752F
+0xE477 = 0x7530
+0xE478 = 0x7531
+0xE479 = 0x7532
+0xE47A = 0x7533
+0xE47B = 0x7534
+0xE47C = 0x7535
+0xE47D = 0x7536
+0xE47E = 0x7537
+0xE47F = 0x7538
+0xE480 = 0x7539
+0xE481 = 0x753A
+0xE482 = 0x753B
+0xE483 = 0x753C
+0xE484 = 0x753D
+0xE485 = 0x753E
+0xE486 = 0x753F
+0xE487 = 0x7540
+0xE488 = 0x7541
+0xE489 = 0x7542
+0xE48A = 0x7543
+0xE48B = 0x7544
+0xE48C = 0x7545
+0xE48D = 0x7546
+0xE48E = 0x7547
+0xE48F = 0x7548
+0xE490 = 0x7549
+0xE491 = 0x754A
+0xE492 = 0x754B
+0xE493 = 0x754C
+0xE494 = 0x754D
+0xE495 = 0x754E
+0xE496 = 0x754F
+0xE497 = 0x7550
+0xE498 = 0x7551
+0xE499 = 0x7552
+0xE49A = 0x7553
+0xE49B = 0x7554
+0xE49C = 0x7555
+0xE49D = 0x7556
+0xE49E = 0x7557
+0xE49F = 0x7558
+0xE4A0 = 0x7559
+0xE4A1 = 0x755A
+0xE4A2 = 0x755B
+0xE4A3 = 0x755C
+0xE4A4 = 0x755D
+0xE4A5 = 0x755E
+0xE4A6 = 0x755F
+0xE4A7 = 0x7560
+0xE4A8 = 0x7561
+0xE4A9 = 0x7562
+0xE4AA = 0x7563
+0xE4AB = 0x7564
+0xE4AC = 0x7565
+0xE4AD = 0x7566
+0xE4AE = 0x7567
+0xE4AF = 0x7568
+0xE4B0 = 0x7569
+0xE4B1 = 0x756A
+0xE4B2 = 0x756B
+0xE4B3 = 0x756C
+0xE4B4 = 0x756D
+0xE4B5 = 0x756E
+0xE4B6 = 0x756F
+0xE4B7 = 0x7570
+0xE4B8 = 0x7571
+0xE4B9 = 0x7572
+0xE4BA = 0x7573
+0xE4BB = 0x7574
+0xE4BC = 0x7575
+0xE4BD = 0x7576
+0xE4BE = 0x7577
+0xE4BF = 0x7578
+0xE4C0 = 0x7579
+0xE4C1 = 0x757A
+0xE4C2 = 0x757B
+0xE4C3 = 0x757C
+0xE4C4 = 0x757D
+0xE4C5 = 0x757E
+0xE4C6 = 0x7621
+0xE4C7 = 0x7622
+0xE4C8 = 0x7623
+0xE4C9 = 0x7624
+0xE4CA = 0x7625
+0xE4CB = 0x7626
+0xE4CC = 0x7627
+0xE4CD = 0x7628
+0xE4CE = 0x7629
+0xE4CF = 0x762A
+0xE4D0 = 0x762B
+0xE4D1 = 0x762C
+0xE4D2 = 0x762D
+0xE4D3 = 0x762E
+0xE4D4 = 0x762F
+0xE4D5 = 0x7630
+0xE4D6 = 0x7631
+0xE4D7 = 0x7632
+0xE4D8 = 0x7633
+0xE4D9 = 0x7634
+0xE4DA = 0x7635
+0xE4DB = 0x7636
+0xE4DC = 0x7637
+0xE4DD = 0x7638
+0xE4DE = 0x7639
+0xE4DF = 0x763A
+0xE4E0 = 0x763B
+0xE4E1 = 0x763C
+0xE4E2 = 0x763D
+0xE4E3 = 0x763E
+0xE4E4 = 0x763F
+0xE4E5 = 0x7640
+0xE4E6 = 0x7641
+0xE4E7 = 0x7642
+0xE4E8 = 0x7643
+0xE4E9 = 0x7644
+0xE4EA = 0x7645
+0xE4EB = 0x7646
+0xE4EC = 0x7647
+0xE4ED = 0x7648
+0xE4EE = 0x7649
+0xE4EF = 0x764A
+0xE4F0 = 0x764B
+0xE4F1 = 0x764C
+0xE4F2 = 0x764D
+0xE4F3 = 0x764E
+0xE4F4 = 0x764F
+0xE4F5 = 0x7650
+0xE4F6 = 0x7651
+0xE4F7 = 0x7652
+0xE4F8 = 0x7653
+0xE4F9 = 0x7654
+0xE4FA = 0x7655
+0xE4FB = 0x7656
+0xE4FC = 0x7657
+0xE4FD = 0x7658
+0xE4FE = 0x7659
+0xE4FF = 0x765A
+0xE500 = 0x765B
+0xE501 = 0x765C
+0xE502 = 0x765D
+0xE503 = 0x765E
+0xE504 = 0x765F
+0xE505 = 0x7660
+0xE506 = 0x7661
+0xE507 = 0x7662
+0xE508 = 0x7663
+0xE509 = 0x7664
+0xE50A = 0x7665
+0xE50B = 0x7666
+0xE50C = 0x7667
+0xE50D = 0x7668
+0xE50E = 0x7669
+0xE50F = 0x766A
+0xE510 = 0x766B
+0xE511 = 0x766C
+0xE512 = 0x766D
+0xE513 = 0x766E
+0xE514 = 0x766F
+0xE515 = 0x7670
+0xE516 = 0x7671
+0xE517 = 0x7672
+0xE518 = 0x7673
+0xE519 = 0x7674
+0xE51A = 0x7675
+0xE51B = 0x7676
+0xE51C = 0x7677
+0xE51D = 0x7678
+0xE51E = 0x7679
+0xE51F = 0x767A
+0xE520 = 0x767B
+0xE521 = 0x767C
+0xE522 = 0x767D
+0xE523 = 0x767E
+0xE524 = 0x7721
+0xE525 = 0x7722
+0xE526 = 0x7723
+0xE527 = 0x7724
+0xE528 = 0x7725
+0xE529 = 0x7726
+0xE52A = 0x7727
+0xE52B = 0x7728
+0xE52C = 0x7729
+0xE52D = 0x772A
+0xE52E = 0x772B
+0xE52F = 0x772C
+0xE530 = 0x772D
+0xE531 = 0x772E
+0xE532 = 0x772F
+0xE533 = 0x7730
+0xE534 = 0x7731
+0xE535 = 0x7732
+0xE536 = 0x7733
+0xE537 = 0x7734
+0xE538 = 0x7735
+0xE539 = 0x7736
+0xE53A = 0x7737
+0xE53B = 0x7738
+0xE53C = 0x7739
+0xE53D = 0x773A
+0xE53E = 0x773B
+0xE53F = 0x773C
+0xE540 = 0x773D
+0xE541 = 0x773E
+0xE542 = 0x773F
+0xE543 = 0x7740
+0xE544 = 0x7741
+0xE545 = 0x7742
+0xE546 = 0x7743
+0xE547 = 0x7744
+0xE548 = 0x7745
+0xE549 = 0x7746
+0xE54A = 0x7747
+0xE54B = 0x7748
+0xE54C = 0x7749
+0xE54D = 0x774A
+0xE54E = 0x774B
+0xE54F = 0x774C
+0xE550 = 0x774D
+0xE551 = 0x774E
+0xE552 = 0x774F
+0xE553 = 0x7750
+0xE554 = 0x7751
+0xE555 = 0x7752
+0xE556 = 0x7753
+0xE557 = 0x7754
+0xE558 = 0x7755
+0xE559 = 0x7756
+0xE55A = 0x7757
+0xE55B = 0x7758
+0xE55C = 0x7759
+0xE55D = 0x775A
+0xE55E = 0x775B
+0xE55F = 0x775C
+0xE560 = 0x775D
+0xE561 = 0x775E
+0xE562 = 0x775F
+0xE563 = 0x7760
+0xE564 = 0x7761
+0xE565 = 0x7762
+0xE566 = 0x7763
+0xE567 = 0x7764
+0xE568 = 0x7765
+0xE569 = 0x7766
+0xE56A = 0x7767
+0xE56B = 0x7768
+0xE56C = 0x7769
+0xE56D = 0x776A
+0xE56E = 0x776B
+0xE56F = 0x776C
+0xE570 = 0x776D
+0xE571 = 0x776E
+0xE572 = 0x776F
+0xE573 = 0x7770
+0xE574 = 0x7771
+0xE575 = 0x7772
+0xE576 = 0x7773
+0xE577 = 0x7774
+0xE578 = 0x7775
+0xE579 = 0x7776
+0xE57A = 0x7777
+0xE57B = 0x7778
+0xE57C = 0x7779
+0xE57D = 0x777A
+0xE57E = 0x777B
+0xE57F = 0x777C
+0xE580 = 0x777D
+0xE581 = 0x777E
+0xE582 = 0x7821
+0xE583 = 0x7822
+0xE584 = 0x7823
+0xE585 = 0x7824
+0xE586 = 0x7825
+0xE587 = 0x7826
+0xE588 = 0x7827
+0xE589 = 0x7828
+0xE58A = 0x7829
+0xE58B = 0x782A
+0xE58C = 0x782B
+0xE58D = 0x782C
+0xE58E = 0x782D
+0xE58F = 0x782E
+0xE590 = 0x782F
+0xE591 = 0x7830
+0xE592 = 0x7831
+0xE593 = 0x7832
+0xE594 = 0x7833
+0xE595 = 0x7834
+0xE596 = 0x7835
+0xE597 = 0x7836
+0xE598 = 0x7837
+0xE599 = 0x7838
+0xE59A = 0x7839
+0xE59B = 0x783A
+0xE59C = 0x783B
+0xE59D = 0x783C
+0xE59E = 0x783D
+0xE59F = 0x783E
+0xE5A0 = 0x783F
+0xE5A1 = 0x7840
+0xE5A2 = 0x7841
+0xE5A3 = 0x7842
+0xE5A4 = 0x7843
+0xE5A5 = 0x7844
+0xE5A6 = 0x7845
+0xE5A7 = 0x7846
+0xE5A8 = 0x7847
+0xE5A9 = 0x7848
+0xE5AA = 0x7849
+0xE5AB = 0x784A
+0xE5AC = 0x784B
+0xE5AD = 0x784C
+0xE5AE = 0x784D
+0xE5AF = 0x784E
+0xE5B0 = 0x784F
+0xE5B1 = 0x7850
+0xE5B2 = 0x7851
+0xE5B3 = 0x7852
+0xE5B4 = 0x7853
+0xE5B5 = 0x7867
+0xE5B6 = 0x7868
+0xE5B7 = 0x7869
+0xE5B8 = 0x786A
+0xE5B9 = 0x786B
+0xE5BA = 0x786C
+0xE5BB = 0x786D
+0xE5BC = 0x786E
+0xE5BD = 0x786F
+0xE5BE = 0x7870
+0xE5BF = 0x7871
+0xE5C0 = 0x7872
+0xE5C1 = 0x7873
+0xE5C2 = 0x7874
+0xE5C3 = 0x7875
+0xE5C4 = 0x7876
+0xE5C5 = 0x7877
+0xE5C6 = 0x7878
+0xE5C7 = 0x7879
+0xE5C8 = 0x787A
+0xE5C9 = 0x787B
+0xE5CA = 0x787C
+0xE5CB = 0x787D
+0xE5CC = 0x787E
+0xE5CD = 0x7921
+0xE5CE = 0x7922
+0xE5CF = 0x7923
+0xE5D0 = 0x7924
+0xE5D1 = 0x7925
+0xE5D2 = 0x7926
+0xE5D3 = 0x7927
+0xE5D4 = 0x7928
+0xE5D5 = 0x7929
+0xE5D6 = 0x792A
+0xE5D7 = 0x792B
+0xE5D8 = 0x792C
+0xE5D9 = 0x792D
+0xE5DA = 0x792E
+0xE5DB = 0x792F
+0xE5DC = 0x7930
+0xE5DD = 0x7931
+0xE5DE = 0x7932
+0xE5DF = 0x7933
+0xEA80 = 0x7934
+0xEA81 = 0x7935
+0xEA82 = 0x7936
+0xEA83 = 0x7937
+0xEA84 = 0x7938
+0xEA85 = 0x7939
+0xEA86 = 0x793A
+0xEA87 = 0x793B
+0xEA88 = 0x793C
+0xEA89 = 0x793D
+0xEA8A = 0x793E
+0xEA8B = 0x793F
+0xEA8C = 0x7940
+0xEA8D = 0x7941
+0xEA8E = 0x7942
+0xEA8F = 0x7943
+0xEA90 = 0x7944
+0xEA91 = 0x7945
+0xEA92 = 0x7946
+0xEA93 = 0x7947
+0xEA94 = 0x7948
+0xEA95 = 0x7949
+0xEA96 = 0x794A
+0xEA97 = 0x794B
+0xEA98 = 0x794C
+0xEA99 = 0x794D
+0xEA9A = 0x794E
+0xEA9B = 0x794F
+0xEA9C = 0x7950
+0xEA9D = 0x7951
+0xEA9E = 0x7952
+0xEA9F = 0x7953
+0xEAA0 = 0x7954
+0xEAA1 = 0x7955
+0xEAA2 = 0x7956
+0xEAA3 = 0x7957
+0xEAA4 = 0x7958
+0xEAA5 = 0x7959
+0xEAA6 = 0x795A
+0xEAA7 = 0x795B
+0xEAA8 = 0x795C
+0xEAA9 = 0x795D
+0xEAAA = 0x795E
+0xEAAB = 0x795F
+0xEAAC = 0x7960
+0xEAAD = 0x7961
+0xEAAE = 0x7962
+0xEAAF = 0x7963
+0xEAB0 = 0x7964
+0xEAB1 = 0x7965
+0xEAB2 = 0x7966
+0xEAB3 = 0x7967
+0xEAB4 = 0x7968
+0xEAB5 = 0x7969
+0xEAB6 = 0x796A
+0xEAB7 = 0x796B
+0xEAB8 = 0x796C
+0xEAB9 = 0x796D
+0xEABA = 0x796E
+0xEABB = 0x796F
+0xEABC = 0x7970
+0xEABD = 0x7971
+0xEABE = 0x7972
+0xEABF = 0x7973
+0xEAC0 = 0x7974
+0xEAC1 = 0x7975
+0xEAC2 = 0x7976
+0xEAC3 = 0x7977
+0xEAC4 = 0x7978
+0xEAC5 = 0x7979
+0xEAC6 = 0x797A
+0xEAC7 = 0x797B
+0xEAC8 = 0x797C
+0xEAC9 = 0x797D
+0xEACA = 0x797E
+0xEACB = 0x7A21
+0xEACC = 0x7A22
+0xEACD = 0x7A23
+0xEACE = 0x7A24
+0xEACF = 0x7A25
+0xEAD0 = 0x7A26
+0xEAD1 = 0x7A27
+0xEAD2 = 0x7A28
+0xEAD3 = 0x7A29
+0xEAD4 = 0x7A2A
+0xEAD5 = 0x7A2B
+0xEAD6 = 0x7A2C
+0xEAD7 = 0x7A2D
+0xEAD8 = 0x7A2E
+0xEAD9 = 0x7A2F
+0xEADA = 0x7A30
+0xEADB = 0x7A31
+0xEADC = 0x7A32
+0xEADD = 0x7A33
+0xEADE = 0x7A34
+0xEADF = 0x7A35
+0xEAE0 = 0x7A36
+0xEAE1 = 0x7A37
+0xEAE2 = 0x7A38
+0xEAE3 = 0x7A39
+0xEAE4 = 0x7A3A
+0xEAE5 = 0x7A3B
+0xEAE6 = 0x7A3C
+0xEAE7 = 0x7A3D
+0xEAE8 = 0x7A3E
+0xEAE9 = 0x7A3F
+0xEAEA = 0x7A40
+0xEAEB = 0x7A41
+0xEAEC = 0x7A42
+0xEAED = 0x7A43
+0xEAEE = 0x7A44
+0xEAEF = 0x7A45
+0xEAF0 = 0x7A46
+0xEAF1 = 0x7A47
+0xEAF2 = 0x7A48
+0xEAF3 = 0x7A49
+0xEAF4 = 0x7A4A
+0xEAF5 = 0x7A4B
+0xEAF6 = 0x7A4C
+0xEAF7 = 0x7A4D
+0xEAF8 = 0x7A4E
+0xEAF9 = 0x7A4F
+0xEAFA = 0x7A50
+0xEAFB = 0x7854
+0xEAFC = 0x7855
+0xEAFD = 0x7856
+0xEAFE = 0x7857
+0xEAFF = 0x7858
+0xEB00 = 0x7859
+0xEB01 = 0x785A
+0xEB02 = 0x785B
+0xEB03 = 0x785C
+0xEB04 = 0x785D
+0xEB05 = 0x785E
+0xEB06 = 0x785F
+0xEB07 = 0x7860
+0xEB08 = 0x7861
+0xEB09 = 0x7862
+0xEB0A = 0x7863
+0xEB0B = 0x7864
+0xEB0C = 0x7865
+0xEB0D = 0x7866
+0xEB0E = 0x7A51
+0xEB0F = 0x7A52
+0xEB10 = 0x7A53
+0xEB11 = 0x7A54
+0xEB12 = 0x7A55
+0xEB13 = 0x7A56
+0xEB14 = 0x7A57
+0xEB15 = 0x7A58
+0xEB16 = 0x7A59
+0xEB17 = 0x7A5A
+0xEB18 = 0x7A5B
+0xEB19 = 0x7A5C
+0xEB1A = 0x7A5D
+0xEB1B = 0x7A5E
+0xEB1C = 0x7A5F
+0xEB1D = 0x7A60
+0xEB1E = 0x7A61
+0xEB1F = 0x7A62
+0xEB20 = 0x7A63
+0xEB21 = 0x7A64
+0xEB22 = 0x7A65
+0xEB23 = 0x7A66
+0xEB24 = 0x7A67
+0xEB25 = 0x7A68
+0xEB26 = 0x7A69
+0xEB27 = 0x7A6A
+0xEB28 = 0x7A6B
+0xEB29 = 0x7A6C
+0xEB2A = 0x7A6D
+0xEB2B = 0x7A6E
+0xEB2C = 0x7A6F
+0xEB2D = 0x7A70
+0xEB2E = 0x7A71
+0xEB2F = 0x7A72
+0xEB30 = 0x7A73
+0xEB31 = 0x7A74
+0xEB32 = 0x7A75
+0xEB33 = 0x7A76
+0xEB34 = 0x7A77
+0xEB35 = 0x7A78
+0xEB36 = 0x7A79
+0xEB37 = 0x7A7A
+0xEB38 = 0x7A7B
+0xEB39 = 0x7A7C
+0xEB3A = 0x7A7D
+0xEB3B = 0x7A7E
+0xEB3C = 0x7B21
+0xEB3D = 0x7B22
+0xEB3E = 0x7B23
+0xEB3F = 0x7B24
+0xEB40 = 0x7B25
+0xEB41 = 0x7B26
+0xEB42 = 0x7B27
+0xEB43 = 0x7B28
+0xEB44 = 0x7B29
+0xEB45 = 0x7B2A
+0xEB46 = 0x7B2B
+0xEB47 = 0x7B2C
+0xEB48 = 0x7B2D
+0xEB49 = 0x7B2E
+0xEB4A = 0x7B2F
+0xEB4B = 0x7B30
+0xEB4C = 0x7B31
+0xEB4D = 0x7B32
+0xEB4E = 0x7B33
+0xEB4F = 0x7B34
+0xEB50 = 0x7B35
+0xEB51 = 0x7B36
+0xEB52 = 0x7B37
+0xEB53 = 0x7B38
+0xEB54 = 0x7B39
+0xEB55 = 0x7B3A
+0xEB56 = 0x7B3B
+0xEB57 = 0x7B3C
+0xEB58 = 0x7B3D
+0xEB59 = 0x7B3E
+0xEB5A = 0x7B3F
+0xEB5B = 0x7B40
+0xEB5C = 0x7B41
+0xEB5D = 0x7B42
+0xEB5E = 0x7B43
+0xEB5F = 0x7B44
+0xEB60 = 0x7B45
+0xEB61 = 0x7B46
+0xEB62 = 0x7B47
+0xEB63 = 0x7B48
+0xEB64 = 0x7B49
+0xEB65 = 0x7B4A
+0xEB66 = 0x7B4B
+0xEB67 = 0x7B4C
+0xEB68 = 0x7B4D
+0xEB69 = 0x7B4E
+0xEB6A = 0x7B4F
+0xEB6B = 0x7B50
+0xEB6C = 0x7B51
+0xEB6D = 0x7B52
+0xEB6E = 0x7B53
+0xEB6F = 0x7B54
+0xEB70 = 0x7B55
+0xEB71 = 0x7B56
+0xEB72 = 0x7B57
+0xEB73 = 0x7B58
+0xEB74 = 0x7B59
+0xEB75 = 0x7B5A
+0xEB76 = 0x7B5B
+0xEB77 = 0x7B5C
+0xEB78 = 0x7B5D
+0xEB79 = 0x7B5E
+0xEB7A = 0x7B5F
+0xEB7B = 0x7B60
+0xEB7C = 0x7B61
+0xEB7D = 0x7B62
+0xEB7E = 0x7B63
+0xEB7F = 0x7B64
+0xEB80 = 0x7B65
+0xEB81 = 0x7B66
+0xEB82 = 0x7B67
+0xEB83 = 0x7B68
+0xEB84 = 0x7B69
+0xEB85 = 0x7B6A
+0xEB86 = 0x7B6B
+0xEB87 = 0x7B6C
+0xEB88 = 0x7B6D
+0xEB89 = 0x7B6E
+0xEB8A = 0x7B6F
+0xEB8B = 0x7B70
+0xEB8C = 0x7B71
+0xEB8D = 0x7B72
+0xEB8E = 0x7B73
+END_MAP
diff --git a/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-DOCOMO.src b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-DOCOMO.src
new file mode 100644
index 0000000000..9983962c5f
--- /dev/null
+++ b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-DOCOMO.src
@@ -0,0 +1,293 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		UCS/EMOJI_SHIFT_JIS-DOCOMO
+SRC_ZONE	0xF8-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xE63E = 0x9021
+0xE63F = 0x9022
+0xE640 = 0x9023
+0xE641 = 0x9024
+0xE642 = 0x9025
+0xE643 = 0x9026
+0xE644 = 0x9027
+0xE645 = 0x9028
+0xE646 = 0x9029
+0xE647 = 0x902A
+0xE648 = 0x902B
+0xE649 = 0x902C
+0xE64A = 0x902D
+0xE64B = 0x902E
+0xE64C = 0x902F
+0xE64D = 0x9030
+0xE64E = 0x9031
+0xE64F = 0x9032
+0xE650 = 0x9033
+0xE651 = 0x9034
+0xE652 = 0x9035
+0xE653 = 0x9036
+0xE654 = 0x9037
+0xE655 = 0x9038
+0xE656 = 0x9039
+0xE657 = 0x903A
+0xE658 = 0x903B
+0xE659 = 0x903C
+0xE65A = 0x903D
+0xE65B = 0x903E
+0xE65C = 0x903F
+0xE65D = 0x9040
+0xE65E = 0x9041
+0xE65F = 0x9042
+0xE660 = 0x9043
+0xE661 = 0x9044
+0xE662 = 0x9045
+0xE663 = 0x9046
+0xE664 = 0x9047
+0xE665 = 0x9048
+0xE666 = 0x9049
+0xE667 = 0x904A
+0xE668 = 0x904B
+0xE669 = 0x904C
+0xE66A = 0x904D
+0xE66B = 0x904E
+0xE66C = 0x904F
+0xE66D = 0x9050
+0xE66E = 0x9051
+0xE66F = 0x9052
+0xE670 = 0x9053
+0xE671 = 0x9054
+0xE672 = 0x9055
+0xE673 = 0x9056
+0xE674 = 0x9057
+0xE675 = 0x9058
+0xE676 = 0x9059
+0xE677 = 0x905A
+0xE678 = 0x905B
+0xE679 = 0x905C
+0xE67A = 0x905D
+0xE67B = 0x905E
+0xE67C = 0x905F
+0xE67D = 0x9060
+0xE67E = 0x9061
+0xE67F = 0x9062
+0xE680 = 0x9063
+0xE681 = 0x9064
+0xE682 = 0x9065
+0xE683 = 0x9066
+0xE684 = 0x9067
+0xE685 = 0x9068
+0xE686 = 0x9069
+0xE687 = 0x906A
+0xE688 = 0x906B
+0xE689 = 0x906C
+0xE68A = 0x906D
+0xE68B = 0x906E
+0xE68C = 0x906F
+0xE68D = 0x9070
+0xE68E = 0x9071
+0xE68F = 0x9072
+0xE690 = 0x9073
+0xE691 = 0x9074
+0xE692 = 0x9075
+0xE693 = 0x9076
+0xE694 = 0x9077
+0xE695 = 0x9078
+0xE696 = 0x9079
+0xE697 = 0x907A
+0xE698 = 0x907B
+0xE699 = 0x907C
+0xE69A = 0x907D
+0xE69B = 0x907E
+0xE69C = 0x9121
+0xE69D = 0x9122
+0xE69E = 0x9123
+0xE69F = 0x9124
+0xE6A0 = 0x9125
+0xE6A1 = 0x9126
+0xE6A2 = 0x9127
+0xE6A3 = 0x9128
+0xE6A4 = 0x9129
+0xE6A5 = 0x912A
+0xE6A6 = 0x912B
+0xE6A7 = 0x912C
+0xE6A8 = 0x912D
+0xE6A9 = 0x912E
+0xE6AA = 0x912F
+0xE6AB = 0x9130
+0xE6AC = 0x9131
+0xE6AD = 0x9132
+0xE6AE = 0x9133
+0xE6AF = 0x9134
+0xE6B0 = 0x9135
+0xE6B1 = 0x9136
+0xE6B2 = 0x9137
+0xE6B3 = 0x9138
+0xE6B4 = 0x9139
+0xE6B5 = 0x913A
+0xE6B6 = 0x913B
+0xE6B7 = 0x913C
+0xE6B8 = 0x913D
+0xE6B9 = 0x913E
+0xE6BA = 0x913F
+0xE6BB = 0x9140
+0xE6BC = 0x9141
+0xE6BD = 0x9142
+0xE6BE = 0x9143
+0xE6BF = 0x9144
+0xE6C0 = 0x9145
+0xE6C1 = 0x9146
+0xE6C2 = 0x9147
+0xE6C3 = 0x9148
+0xE6C4 = 0x9149
+0xE6C5 = 0x914A
+0xE6C6 = 0x914B
+0xE6C7 = 0x914C
+0xE6C8 = 0x914D
+0xE6C9 = 0x914E
+0xE6CA = 0x914F
+0xE6CB = 0x9150
+0xE6CC = 0x9151
+0xE6CD = 0x9152
+0xE6CE = 0x9153
+0xE6CF = 0x9154
+0xE6D0 = 0x9155
+0xE6D1 = 0x9156
+0xE6D2 = 0x9157
+0xE6D3 = 0x9158
+0xE6D4 = 0x9159
+0xE6D5 = 0x915A
+0xE6D6 = 0x915B
+0xE6D7 = 0x915C
+0xE6D8 = 0x915D
+0xE6D9 = 0x915E
+0xE6DA = 0x915F
+0xE6DB = 0x9160
+0xE6DC = 0x9161
+0xE6DD = 0x9162
+0xE6DE = 0x9163
+0xE6DF = 0x9164
+0xE6E0 = 0x9165
+0xE6E1 = 0x9166
+0xE6E2 = 0x9167
+0xE6E3 = 0x9168
+0xE6E4 = 0x9169
+0xE6E5 = 0x916A
+0xE6E6 = 0x916B
+0xE6E7 = 0x916C
+0xE6E8 = 0x916D
+0xE6E9 = 0x916E
+0xE6EA = 0x916F
+0xE6EB = 0x9170
+0xE6EC = 0x9171
+0xE6ED = 0x9172
+0xE6EE = 0x9173
+0xE6EF = 0x9174
+0xE6F0 = 0x9175
+0xE6F1 = 0x9176
+0xE6F2 = 0x9177
+0xE6F3 = 0x9178
+0xE6F4 = 0x9179
+0xE6F5 = 0x917A
+0xE6F6 = 0x917B
+0xE6F7 = 0x917C
+0xE6F8 = 0x917D
+0xE6F9 = 0x917E
+0xE6FA = 0x9221
+0xE6FB = 0x9222
+0xE6FC = 0x9223
+0xE6FD = 0x9224
+0xE6FE = 0x9225
+0xE6FF = 0x9226
+0xE700 = 0x9227
+0xE701 = 0x9228
+0xE702 = 0x9229
+0xE703 = 0x922A
+0xE704 = 0x922B
+0xE705 = 0x922C
+0xE706 = 0x922D
+0xE707 = 0x922E
+0xE708 = 0x922F
+0xE709 = 0x9230
+0xE70A = 0x9231
+0xE70B = 0x9232
+0xE70C = 0x9233
+0xE70D = 0x9234
+0xE70E = 0x9235
+0xE70F = 0x9236
+0xE710 = 0x9237
+0xE711 = 0x9238
+0xE712 = 0x9239
+0xE713 = 0x923A
+0xE714 = 0x923B
+0xE715 = 0x923C
+0xE716 = 0x923D
+0xE717 = 0x923E
+0xE718 = 0x923F
+0xE719 = 0x9240
+0xE71A = 0x9241
+0xE71B = 0x9242
+0xE71C = 0x9243
+0xE71D = 0x9244
+0xE71E = 0x9245
+0xE71F = 0x9246
+0xE720 = 0x9247
+0xE721 = 0x9248
+0xE722 = 0x9249
+0xE723 = 0x924A
+0xE724 = 0x924B
+0xE725 = 0x924C
+0xE726 = 0x924D
+0xE727 = 0x924E
+0xE728 = 0x924F
+0xE729 = 0x9250
+0xE72A = 0x9251
+0xE72B = 0x9252
+0xE72C = 0x9253
+0xE72D = 0x9254
+0xE72E = 0x9255
+0xE72F = 0x9256
+0xE730 = 0x9257
+0xE731 = 0x9258
+0xE732 = 0x9259
+0xE733 = 0x925A
+0xE734 = 0x925B
+0xE735 = 0x925C
+0xE736 = 0x925D
+0xE737 = 0x925E
+0xE738 = 0x925F
+0xE739 = 0x9260
+0xE73A = 0x9261
+0xE73B = 0x9262
+0xE73C = 0x9263
+0xE73D = 0x9264
+0xE73E = 0x9265
+0xE73F = 0x9266
+0xE740 = 0x9267
+0xE741 = 0x9268
+0xE742 = 0x9269
+0xE743 = 0x926A
+0xE744 = 0x926B
+0xE745 = 0x926C
+0xE746 = 0x926D
+0xE747 = 0x926E
+0xE748 = 0x926F
+0xE749 = 0x9270
+0xE74A = 0x9271
+0xE74B = 0x9272
+0xE74C = 0x9273
+0xE74D = 0x9274
+0xE74E = 0x9275
+0xE74F = 0x9276
+0xE750 = 0x9277
+0xE751 = 0x9278
+0xE752 = 0x9279
+0xE753 = 0x927A
+0xE754 = 0x927B
+0xE755 = 0x927C
+0xE756 = 0x927D
+0xE757 = 0x927E
+END_MAP
diff --git a/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-KDDI-UNDOC.src b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-KDDI-UNDOC.src
new file mode 100644
index 0000000000..3de41a5912
--- /dev/null
+++ b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-KDDI-UNDOC.src
@@ -0,0 +1,658 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		UCS/EMOJI_SHIFT_JIS-KDDI-UNDOC
+SRC_ZONE	0xF3-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xEC40 = 0x8521
+0xEC41 = 0x8522
+0xEC42 = 0x8523
+0xEC43 = 0x8524
+0xEC44 = 0x8525
+0xEC45 = 0x8526
+0xEC46 = 0x8527
+0xEC47 = 0x8528
+0xEC48 = 0x8529
+0xEC49 = 0x852A
+0xEC4A = 0x852B
+0xEC4B = 0x852C
+0xEC4C = 0x852D
+0xEC4D = 0x852E
+0xEC4E = 0x852F
+0xEC4F = 0x8530
+0xEC50 = 0x8531
+0xEC51 = 0x8532
+0xEC52 = 0x8533
+0xEC53 = 0x8534
+0xEC54 = 0x8535
+0xEC55 = 0x8536
+0xEC56 = 0x8537
+0xEC57 = 0x8538
+0xEC58 = 0x8539
+0xEC59 = 0x853A
+0xEC5A = 0x853B
+0xEC5B = 0x853C
+0xEC5C = 0x853D
+0xEC5D = 0x853E
+0xEC5E = 0x853F
+0xEC5F = 0x8540
+0xEC60 = 0x8541
+0xEC61 = 0x8542
+0xEC62 = 0x8543
+0xEC63 = 0x8544
+0xEC64 = 0x8545
+0xEC65 = 0x8546
+0xEC66 = 0x8547
+0xEC67 = 0x8548
+0xEC68 = 0x8549
+0xEC69 = 0x854A
+0xEC6A = 0x854B
+0xEC6B = 0x854C
+0xEC6C = 0x854D
+0xEC6D = 0x854E
+0xEC6E = 0x854F
+0xEC6F = 0x8550
+0xEC70 = 0x8551
+0xEC71 = 0x8552
+0xEC72 = 0x8553
+0xEC73 = 0x8554
+0xEC74 = 0x8555
+0xEC75 = 0x8556
+0xEC76 = 0x8557
+0xEC77 = 0x8558
+0xEC78 = 0x8559
+0xEC79 = 0x855A
+0xEC7A = 0x855B
+0xEC7B = 0x855C
+0xEC7C = 0x855D
+0xEC7D = 0x855E
+0xEC7E = 0x855F
+0xEC80 = 0x8560
+0xEC81 = 0x8561
+0xEC82 = 0x8562
+0xEC83 = 0x8563
+0xEC84 = 0x8564
+0xEC85 = 0x8565
+0xEC86 = 0x8566
+0xEC87 = 0x8567
+0xEC88 = 0x8568
+0xEC89 = 0x8569
+0xEC8A = 0x856A
+0xEC8B = 0x856B
+0xEC8C = 0x856C
+0xEC8D = 0x856D
+0xEC8E = 0x856E
+0xEC8F = 0x856F
+0xEC90 = 0x8570
+0xEC91 = 0x8571
+0xEC92 = 0x8572
+0xEC93 = 0x8573
+0xEC94 = 0x8574
+0xEC95 = 0x8575
+0xEC96 = 0x8576
+0xEC97 = 0x8577
+0xEC98 = 0x8578
+0xEC99 = 0x8579
+0xEC9A = 0x857A
+0xEC9B = 0x857B
+0xEC9C = 0x857C
+0xEC9D = 0x857D
+0xEC9E = 0x857E
+0xEC9F = 0x8621
+0xECA0 = 0x8622
+0xECA1 = 0x8623
+0xECA2 = 0x8624
+0xECA3 = 0x8625
+0xECA4 = 0x8626
+0xECA5 = 0x8627
+0xECA6 = 0x8628
+0xECA7 = 0x8629
+0xECA8 = 0x862A
+0xECA9 = 0x862B
+0xECAA = 0x862C
+0xECAB = 0x862D
+0xECAC = 0x862E
+0xECAD = 0x862F
+0xECAE = 0x8630
+0xECAF = 0x8631
+0xECB0 = 0x8632
+0xECB1 = 0x8633
+0xECB2 = 0x8634
+0xECB3 = 0x8635
+0xECB4 = 0x8636
+0xECB5 = 0x8637
+0xECB6 = 0x8638
+0xECB7 = 0x8639
+0xECB8 = 0x863A
+0xECB9 = 0x863B
+0xECBA = 0x863C
+0xECBB = 0x863D
+0xECBC = 0x863E
+0xECBD = 0x863F
+0xECBE = 0x8640
+0xECBF = 0x8641
+0xECC0 = 0x8642
+0xECC1 = 0x8643
+0xECC2 = 0x8644
+0xECC3 = 0x8645
+0xECC4 = 0x8646
+0xECC5 = 0x8647
+0xECC6 = 0x8648
+0xECC7 = 0x8649
+0xECC8 = 0x864A
+0xECC9 = 0x864B
+0xECCA = 0x864C
+0xECCB = 0x864D
+0xECCC = 0x864E
+0xECCD = 0x864F
+0xECCE = 0x8650
+0xECCF = 0x8651
+0xECD0 = 0x8652
+0xECD1 = 0x8653
+0xECD2 = 0x8654
+0xECD3 = 0x8655
+0xECD4 = 0x8656
+0xECD5 = 0x8657
+0xECD6 = 0x8658
+0xECD7 = 0x8659
+0xECD8 = 0x865A
+0xECD9 = 0x865B
+0xECDA = 0x865C
+0xECDB = 0x865D
+0xECDC = 0x865E
+0xECDD = 0x865F
+0xECDE = 0x8660
+0xECDF = 0x8661
+0xECE0 = 0x8662
+0xECE1 = 0x8663
+0xECE2 = 0x8664
+0xECE3 = 0x8665
+0xECE4 = 0x8666
+0xECE5 = 0x8667
+0xECE6 = 0x8668
+0xECE7 = 0x8669
+0xECE8 = 0x866A
+0xECE9 = 0x866B
+0xECEA = 0x866C
+0xECEB = 0x866D
+0xECEC = 0x866E
+0xECED = 0x866F
+0xECEE = 0x8670
+0xECEF = 0x8671
+0xECF0 = 0x8672
+0xECF1 = 0x8673
+0xECF2 = 0x8674
+0xECF3 = 0x8675
+0xECF4 = 0x8676
+0xECF5 = 0x8677
+0xECF6 = 0x8678
+0xECF7 = 0x8679
+0xECF8 = 0x867A
+0xECF9 = 0x867B
+0xECFA = 0x867C
+0xECFB = 0x867D
+0xECFC = 0x867E
+0xED40 = 0x8721
+0xED41 = 0x8722
+0xED42 = 0x8723
+0xED43 = 0x8724
+0xED44 = 0x8725
+0xED45 = 0x8726
+0xED46 = 0x8727
+0xED47 = 0x8728
+0xED48 = 0x8729
+0xED49 = 0x872A
+0xED4A = 0x872B
+0xED4B = 0x872C
+0xED4C = 0x872D
+0xED4D = 0x872E
+0xED4E = 0x872F
+0xED4F = 0x8730
+0xED50 = 0x8731
+0xED51 = 0x8732
+0xED52 = 0x8733
+0xED53 = 0x8734
+0xED54 = 0x8735
+0xED55 = 0x8736
+0xED56 = 0x8737
+0xED57 = 0x8738
+0xED58 = 0x8739
+0xED59 = 0x873A
+0xED5A = 0x873B
+0xED5B = 0x873C
+0xED5C = 0x873D
+0xED5D = 0x873E
+0xED5E = 0x873F
+0xED5F = 0x8740
+0xED60 = 0x8741
+0xED61 = 0x8742
+0xED62 = 0x8743
+0xED63 = 0x8744
+0xED64 = 0x8745
+0xED65 = 0x8746
+0xED66 = 0x8747
+0xED67 = 0x8748
+0xED68 = 0x8749
+0xED69 = 0x874A
+0xED6A = 0x874B
+0xED6B = 0x874C
+0xED6C = 0x874D
+0xED6D = 0x874E
+0xED6E = 0x874F
+0xED6F = 0x8750
+0xED70 = 0x8751
+0xED71 = 0x8752
+0xED72 = 0x8753
+0xED73 = 0x8754
+0xED74 = 0x8755
+0xED75 = 0x8756
+0xED76 = 0x8757
+0xED77 = 0x8758
+0xED78 = 0x8759
+0xED79 = 0x875A
+0xED7A = 0x875B
+0xED7B = 0x875C
+0xED7C = 0x875D
+0xED7D = 0x875E
+0xED7E = 0x875F
+0xED80 = 0x8760
+0xED81 = 0x8761
+0xED82 = 0x8762
+0xED83 = 0x8763
+0xED84 = 0x8764
+0xED85 = 0x8765
+0xED86 = 0x8766
+0xED87 = 0x8767
+0xED88 = 0x8768
+0xED89 = 0x8769
+0xED8A = 0x876A
+0xED8B = 0x876B
+0xED8C = 0x876C
+0xED8D = 0x876D
+0xED8E = 0x876E
+0xED8F = 0x876F
+0xED90 = 0x8770
+0xED91 = 0x8771
+0xED92 = 0x8772
+0xED93 = 0x8773
+0xEF40 = 0x8B21
+0xEF41 = 0x8B22
+0xEF42 = 0x8B23
+0xEF43 = 0x8B24
+0xEF44 = 0x8B25
+0xEF45 = 0x8B26
+0xEF46 = 0x8B27
+0xEF47 = 0x8B28
+0xEF48 = 0x8B29
+0xEF49 = 0x8B2A
+0xEF4A = 0x8B2B
+0xEF4B = 0x8B2C
+0xEF4C = 0x8B2D
+0xEF4D = 0x8B2E
+0xEF4E = 0x8B2F
+0xEF4F = 0x8B30
+0xEF50 = 0x8B31
+0xEF51 = 0x8B32
+0xEF52 = 0x8B33
+0xEF53 = 0x8B34
+0xEF54 = 0x8B35
+0xEF55 = 0x8B36
+0xEF56 = 0x8B37
+0xEF57 = 0x8B38
+0xEF58 = 0x8B39
+0xEF59 = 0x8B3A
+0xEF5A = 0x8B3B
+0xEF5B = 0x8B3C
+0xEF5C = 0x8B3D
+0xEF5D = 0x8B3E
+0xEF5E = 0x8B3F
+0xEF5F = 0x8B40
+0xEF60 = 0x8B41
+0xEF61 = 0x8B42
+0xEF62 = 0x8B43
+0xEF63 = 0x8B44
+0xEF64 = 0x8B45
+0xEF65 = 0x8B46
+0xEF66 = 0x8B47
+0xEF67 = 0x8B48
+0xEF68 = 0x8B49
+0xEF69 = 0x8B4A
+0xEF6A = 0x8B4B
+0xEF6B = 0x8B4C
+0xEF6C = 0x8B4D
+0xEF6D = 0x8B4E
+0xEF6E = 0x8B4F
+0xEF6F = 0x8B50
+0xEF70 = 0x8B51
+0xEF71 = 0x8B52
+0xEF72 = 0x8B53
+0xEF73 = 0x8B54
+0xEF74 = 0x8B55
+0xEF75 = 0x8B56
+0xEF76 = 0x8B57
+0xEF77 = 0x8B58
+0xEF78 = 0x8B59
+0xEF79 = 0x8B5A
+0xEF7A = 0x8B5B
+0xEF7B = 0x8B5C
+0xEF7C = 0x8B5D
+0xEF7D = 0x8B5E
+0xEF7E = 0x8B5F
+0xEF80 = 0x8B60
+0xEF81 = 0x8B61
+0xEF82 = 0x8B62
+0xEF83 = 0x8B63
+0xEF84 = 0x8B64
+0xEF85 = 0x8B65
+0xEF86 = 0x8B66
+0xEF87 = 0x8B67
+0xEF88 = 0x8B68
+0xEF89 = 0x8B69
+0xEF8A = 0x8B6A
+0xEF8B = 0x8B6B
+0xEF8C = 0x8B6C
+0xEF8D = 0x8B6D
+0xEF8E = 0x8B6E
+0xEF8F = 0x8B6F
+0xEF90 = 0x8B70
+0xEF91 = 0x8B71
+0xEF92 = 0x8B72
+0xEF93 = 0x8B73
+0xEF94 = 0x8B74
+0xEF95 = 0x8B75
+0xEF96 = 0x8B76
+0xEF97 = 0x8B77
+0xEF98 = 0x8B78
+0xEF99 = 0x8B79
+0xEF9A = 0x8B7A
+0xEF9B = 0x8B7B
+0xEF9C = 0x8B7C
+0xEF9D = 0x8B7D
+0xEF9E = 0x8B7E
+0xEF9F = 0x8C21
+0xEFA0 = 0x8C22
+0xEFA1 = 0x8C23
+0xEFA2 = 0x8C24
+0xEFA3 = 0x8C25
+0xEFA4 = 0x8C26
+0xEFA5 = 0x8C27
+0xEFA6 = 0x8C28
+0xEFA7 = 0x8C29
+0xEFA8 = 0x8C2A
+0xEFA9 = 0x8C2B
+0xEFAA = 0x8C2C
+0xEFAB = 0x8C2D
+0xEFAC = 0x8C2E
+0xEFAD = 0x8C2F
+0xEFAE = 0x8C30
+0xEFAF = 0x8C31
+0xEFB0 = 0x8C32
+0xEFB1 = 0x8C33
+0xEFB2 = 0x8C34
+0xEFB3 = 0x8C35
+0xEFB4 = 0x8C36
+0xEFB5 = 0x8C37
+0xEFB6 = 0x8C38
+0xEFB7 = 0x8C39
+0xEFB8 = 0x8C3A
+0xEFB9 = 0x8C3B
+0xEFBA = 0x8C3C
+0xEFBB = 0x8C3D
+0xEFBC = 0x8C3E
+0xEFBD = 0x8C3F
+0xEFBE = 0x8C40
+0xEFBF = 0x8C41
+0xEFC0 = 0x8C42
+0xEFC1 = 0x8C43
+0xEFC2 = 0x8C44
+0xEFC3 = 0x8C45
+0xEFC4 = 0x8C46
+0xEFC5 = 0x8C47
+0xEFC6 = 0x8C48
+0xEFC7 = 0x8C49
+0xEFC8 = 0x8C4A
+0xEFC9 = 0x8C4B
+0xEFCA = 0x8C4C
+0xEFCB = 0x8C4D
+0xEFCC = 0x8C4E
+0xEFCD = 0x8C4F
+0xEFCE = 0x8C50
+0xEFCF = 0x8C51
+0xEFD0 = 0x8C52
+0xEFD1 = 0x8C53
+0xEFD2 = 0x8C54
+0xEFD3 = 0x8C55
+0xEFD4 = 0x8C56
+0xEFD5 = 0x8C57
+0xEFD6 = 0x8C58
+0xEFD7 = 0x8C59
+0xEFD8 = 0x8C5A
+0xEFD9 = 0x8C5B
+0xEFDA = 0x8C5C
+0xEFDB = 0x8C5D
+0xEFDC = 0x8C5E
+0xEFDD = 0x8C5F
+0xEFDE = 0x8C60
+0xEFDF = 0x8C61
+0xEFE0 = 0x8C62
+0xEFE1 = 0x8C63
+0xEFE2 = 0x8C64
+0xEFE3 = 0x8C65
+0xEFE4 = 0x8C66
+0xEFE5 = 0x8C67
+0xEFE6 = 0x8C68
+0xEFE7 = 0x8C69
+0xEFE8 = 0x8C6A
+0xEFE9 = 0x8C6B
+0xEFEA = 0x8C6C
+0xEFEB = 0x8C6D
+0xEFEC = 0x8C6E
+0xEFED = 0x8C6F
+0xEFEE = 0x8C70
+0xEFEF = 0x8C71
+0xEFF0 = 0x8C72
+0xEFF1 = 0x8C73
+0xEFF2 = 0x8C74
+0xEFF3 = 0x8C75
+0xEFF4 = 0x8C76
+0xEFF5 = 0x8C77
+0xEFF6 = 0x8C78
+0xEFF7 = 0x8C79
+0xEFF8 = 0x8C7A
+0xEFF9 = 0x8C7B
+0xEFFA = 0x8C7C
+0xEFFB = 0x8C7D
+0xEFFC = 0x8C7E
+0xF040 = 0x8D21
+0xF041 = 0x8D22
+0xF042 = 0x8D23
+0xF043 = 0x8D24
+0xF044 = 0x8D25
+0xF045 = 0x8D26
+0xF046 = 0x8D27
+0xF047 = 0x8D28
+0xF048 = 0x8D29
+0xF049 = 0x8D2A
+0xF04A = 0x8D2B
+0xF04B = 0x8D2C
+0xF04C = 0x8D2D
+0xF04D = 0x8D2E
+0xF04E = 0x8D2F
+0xF04F = 0x8D30
+0xF050 = 0x8D31
+0xF051 = 0x8D32
+0xF052 = 0x8D33
+0xF053 = 0x8D34
+0xF054 = 0x8D35
+0xF055 = 0x8D36
+0xF056 = 0x8D37
+0xF057 = 0x8D38
+0xF058 = 0x8D39
+0xF059 = 0x8D3A
+0xF05A = 0x8D3B
+0xF05B = 0x8D3C
+0xF05C = 0x8D3D
+0xF05D = 0x8D3E
+0xF05E = 0x8D3F
+0xF05F = 0x8D40
+0xF060 = 0x8D41
+0xF061 = 0x8D42
+0xF062 = 0x8D43
+0xF063 = 0x8D44
+0xF064 = 0x8D45
+0xF065 = 0x8D46
+0xF066 = 0x8D47
+0xF067 = 0x8D48
+0xF068 = 0x8D49
+0xF069 = 0x8D4A
+0xF06A = 0x8D4B
+0xF06B = 0x8D4C
+0xF06C = 0x8D4D
+0xF06D = 0x8D4E
+0xF06E = 0x8D4F
+0xF06F = 0x8D50
+0xF070 = 0x8D51
+0xF071 = 0x8D52
+0xF072 = 0x8D53
+0xF073 = 0x8D54
+0xF074 = 0x8D55
+0xF075 = 0x8D56
+0xF076 = 0x8D57
+0xF077 = 0x8D58
+0xF078 = 0x8D59
+0xF079 = 0x8D5A
+0xF07A = 0x8D5B
+0xF07B = 0x8D5C
+0xF07C = 0x8D5D
+0xF07D = 0x8D5E
+0xF07E = 0x8D5F
+0xF080 = 0x8D60
+0xF081 = 0x8D61
+0xF082 = 0x8D62
+0xF083 = 0x8D63
+0xF084 = 0x8D64
+0xF085 = 0x8D65
+0xF086 = 0x8D66
+0xF087 = 0x8D67
+0xF088 = 0x8D68
+0xF089 = 0x8D69
+0xF08A = 0x8D6A
+0xF08B = 0x8D6B
+0xF08C = 0x8D6C
+0xF08D = 0x8D6D
+0xF08E = 0x8D6E
+0xF08F = 0x8D6F
+0xF090 = 0x8D70
+0xF091 = 0x8D71
+0xF092 = 0x8D72
+0xF093 = 0x8D73
+0xF094 = 0x8D74
+0xF095 = 0x8D75
+0xF096 = 0x8D76
+0xF097 = 0x8D77
+0xF098 = 0x8D78
+0xF099 = 0x8D79
+0xF09A = 0x8D7A
+0xF09B = 0x8D7B
+0xF09C = 0x8D7C
+0xF09D = 0x8D7D
+0xF09E = 0x8D7E
+0xF09F = 0x8E21
+0xF0A0 = 0x8E22
+0xF0A1 = 0x8E23
+0xF0A2 = 0x8E24
+0xF0A3 = 0x8E25
+0xF0A4 = 0x8E26
+0xF0A5 = 0x8E27
+0xF0A6 = 0x8E28
+0xF0A7 = 0x8E29
+0xF0A8 = 0x8E2A
+0xF0A9 = 0x8E2B
+0xF0AA = 0x8E2C
+0xF0AB = 0x8E2D
+0xF0AC = 0x8E2E
+0xF0AD = 0x8E2F
+0xF0AE = 0x8E30
+0xF0AF = 0x8E31
+0xF0B0 = 0x8E32
+0xF0B1 = 0x8E33
+0xF0B2 = 0x8E34
+0xF0B3 = 0x8E35
+0xF0B4 = 0x8E36
+0xF0B5 = 0x8E37
+0xF0B6 = 0x8E38
+0xF0B7 = 0x8E39
+0xF0B8 = 0x8E3A
+0xF0B9 = 0x8E3B
+0xF0BA = 0x8E3C
+0xF0BB = 0x8E3D
+0xF0BC = 0x8E3E
+0xF0BD = 0x8E3F
+0xF0BE = 0x8E40
+0xF0BF = 0x8E41
+0xF0C0 = 0x8E42
+0xF0C1 = 0x8E43
+0xF0C2 = 0x8E44
+0xF0C3 = 0x8E45
+0xF0C4 = 0x8E46
+0xF0C5 = 0x8E47
+0xF0C6 = 0x8E48
+0xF0C7 = 0x8E49
+0xF0C8 = 0x8E4A
+0xF0C9 = 0x8E4B
+0xF0CA = 0x8E4C
+0xF0CB = 0x8E4D
+0xF0CC = 0x8E4E
+0xF0CD = 0x8E4F
+0xF0CE = 0x8E50
+0xF0CF = 0x8E51
+0xF0D0 = 0x8E52
+0xF0D1 = 0x8E53
+0xF0D2 = 0x8E54
+0xF0D3 = 0x8E55
+0xF0D4 = 0x8E56
+0xF0D5 = 0x8E57
+0xF0D6 = 0x8E58
+0xF0D7 = 0x8E59
+0xF0D8 = 0x8E5A
+0xF0D9 = 0x8E5B
+0xF0DA = 0x8E5C
+0xF0DB = 0x8E5D
+0xF0DC = 0x8E5E
+0xF0DD = 0x8E5F
+0xF0DE = 0x8E60
+0xF0DF = 0x8E61
+0xF0E0 = 0x8E62
+0xF0E1 = 0x8E63
+0xF0E2 = 0x8E64
+0xF0E3 = 0x8E65
+0xF0E4 = 0x8E66
+0xF0E5 = 0x8E67
+0xF0E6 = 0x8E68
+0xF0E7 = 0x8E69
+0xF0E8 = 0x8E6A
+0xF0E9 = 0x8E6B
+0xF0EA = 0x8E6C
+0xF0EB = 0x8E6D
+0xF0EC = 0x8E6E
+0xF0ED = 0x8E6F
+0xF0EE = 0x8E70
+0xF0EF = 0x8E71
+0xF0F0 = 0x8E72
+0xF0F1 = 0x8E73
+0xF0F2 = 0x8E74
+0xF0F3 = 0x8E75
+0xF0F4 = 0x8E76
+0xF0F5 = 0x8E77
+0xF0F6 = 0x8E78
+0xF0F7 = 0x8E79
+0xF0F8 = 0x8E7A
+0xF0F9 = 0x8E7B
+0xF0FA = 0x8E7C
+0xF0FB = 0x8E7D
+0xF0FC = 0x8E7E
+END_MAP
diff --git a/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-KDDI.src b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-KDDI.src
new file mode 100644
index 0000000000..5dd1e0f17e
--- /dev/null
+++ b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-KDDI.src
@@ -0,0 +1,658 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		UCS/EMOJI_SHIFT_JIS-KDDI
+SRC_ZONE	0xF3-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xE468 = 0x8B21
+0xE469 = 0x8B22
+0xE46A = 0x8B23
+0xE46B = 0x8B24
+0xE46C = 0x8B25
+0xE46D = 0x8B26
+0xE46E = 0x8B27
+0xE46F = 0x8B28
+0xE470 = 0x8B29
+0xE471 = 0x8B2A
+0xE472 = 0x8B2B
+0xE473 = 0x8B2C
+0xE474 = 0x8B2D
+0xE475 = 0x8B2E
+0xE476 = 0x8B2F
+0xE477 = 0x8B30
+0xE478 = 0x8B31
+0xE479 = 0x8B32
+0xE47A = 0x8B33
+0xE47B = 0x8B34
+0xE47C = 0x8B35
+0xE47D = 0x8B36
+0xE47E = 0x8B37
+0xE47F = 0x8B38
+0xE480 = 0x8B39
+0xE481 = 0x8B3A
+0xE482 = 0x8B3B
+0xE483 = 0x8B3C
+0xE484 = 0x8B3D
+0xE485 = 0x8B3E
+0xE486 = 0x8B3F
+0xE487 = 0x8B40
+0xE488 = 0x8B41
+0xE489 = 0x8B42
+0xE48A = 0x8B43
+0xE48B = 0x8B44
+0xE48C = 0x8B45
+0xE48D = 0x8B46
+0xE48E = 0x8B47
+0xE48F = 0x8B48
+0xE490 = 0x8B49
+0xE491 = 0x8B4A
+0xE492 = 0x8B4B
+0xE493 = 0x8B4C
+0xE494 = 0x8B4D
+0xE495 = 0x8B4E
+0xE496 = 0x8B4F
+0xE497 = 0x8B50
+0xE498 = 0x8B51
+0xE499 = 0x8B52
+0xE49A = 0x8B53
+0xE49B = 0x8B54
+0xE49C = 0x8B55
+0xE49D = 0x8B56
+0xE49E = 0x8B57
+0xE49F = 0x8B58
+0xE4A0 = 0x8B59
+0xE4A1 = 0x8B5A
+0xE4A2 = 0x8B5B
+0xE4A3 = 0x8B5C
+0xE4A4 = 0x8B5D
+0xE4A5 = 0x8B5E
+0xE4A6 = 0x8B5F
+0xE4A7 = 0x8B60
+0xE4A8 = 0x8B61
+0xE4A9 = 0x8B62
+0xE4AA = 0x8B63
+0xE4AB = 0x8B64
+0xE4AC = 0x8B65
+0xE4AD = 0x8B66
+0xE4AE = 0x8B67
+0xE4AF = 0x8B68
+0xE4B0 = 0x8B69
+0xE4B1 = 0x8B6A
+0xE4B2 = 0x8B6B
+0xE4B3 = 0x8B6C
+0xE4B4 = 0x8B6D
+0xE4B5 = 0x8B6E
+0xE4B6 = 0x8B6F
+0xE4B7 = 0x8B70
+0xE4B8 = 0x8B71
+0xE4B9 = 0x8B72
+0xE4BA = 0x8B73
+0xE4BB = 0x8B74
+0xE4BC = 0x8B75
+0xE4BD = 0x8B76
+0xE4BE = 0x8B77
+0xE4BF = 0x8B78
+0xE4C0 = 0x8B79
+0xE4C1 = 0x8B7A
+0xE4C2 = 0x8B7B
+0xE4C3 = 0x8B7C
+0xE4C4 = 0x8B7D
+0xE4C5 = 0x8B7E
+0xE4C6 = 0x8C21
+0xE4C7 = 0x8C22
+0xE4C8 = 0x8C23
+0xE4C9 = 0x8C24
+0xE4CA = 0x8C25
+0xE4CB = 0x8C26
+0xE4CC = 0x8C27
+0xE4CD = 0x8C28
+0xE4CE = 0x8C29
+0xE4CF = 0x8C2A
+0xE4D0 = 0x8C2B
+0xE4D1 = 0x8C2C
+0xE4D2 = 0x8C2D
+0xE4D3 = 0x8C2E
+0xE4D4 = 0x8C2F
+0xE4D5 = 0x8C30
+0xE4D6 = 0x8C31
+0xE4D7 = 0x8C32
+0xE4D8 = 0x8C33
+0xE4D9 = 0x8C34
+0xE4DA = 0x8C35
+0xE4DB = 0x8C36
+0xE4DC = 0x8C37
+0xE4DD = 0x8C38
+0xE4DE = 0x8C39
+0xE4DF = 0x8C3A
+0xE4E0 = 0x8C3B
+0xE4E1 = 0x8C3C
+0xE4E2 = 0x8C3D
+0xE4E3 = 0x8C3E
+0xE4E4 = 0x8C3F
+0xE4E5 = 0x8C40
+0xE4E6 = 0x8C41
+0xE4E7 = 0x8C42
+0xE4E8 = 0x8C43
+0xE4E9 = 0x8C44
+0xE4EA = 0x8C45
+0xE4EB = 0x8C46
+0xE4EC = 0x8C47
+0xE4ED = 0x8C48
+0xE4EE = 0x8C49
+0xE4EF = 0x8C4A
+0xE4F0 = 0x8C4B
+0xE4F1 = 0x8C4C
+0xE4F2 = 0x8C4D
+0xE4F3 = 0x8C4E
+0xE4F4 = 0x8C4F
+0xE4F5 = 0x8C50
+0xE4F6 = 0x8C51
+0xE4F7 = 0x8C52
+0xE4F8 = 0x8C53
+0xE4F9 = 0x8C54
+0xE4FA = 0x8C55
+0xE4FB = 0x8C56
+0xE4FC = 0x8C57
+0xE4FD = 0x8C58
+0xE4FE = 0x8C59
+0xE4FF = 0x8C5A
+0xE500 = 0x8C5B
+0xE501 = 0x8C5C
+0xE502 = 0x8C5D
+0xE503 = 0x8C5E
+0xE504 = 0x8C5F
+0xE505 = 0x8C60
+0xE506 = 0x8C61
+0xE507 = 0x8C62
+0xE508 = 0x8C63
+0xE509 = 0x8C64
+0xE50A = 0x8C65
+0xE50B = 0x8C66
+0xE50C = 0x8C67
+0xE50D = 0x8C68
+0xE50E = 0x8C69
+0xE50F = 0x8C6A
+0xE510 = 0x8C6B
+0xE511 = 0x8C6C
+0xE512 = 0x8C6D
+0xE513 = 0x8C6E
+0xE514 = 0x8C6F
+0xE515 = 0x8C70
+0xE516 = 0x8C71
+0xE517 = 0x8C72
+0xE518 = 0x8C73
+0xE519 = 0x8C74
+0xE51A = 0x8C75
+0xE51B = 0x8C76
+0xE51C = 0x8C77
+0xE51D = 0x8C78
+0xE51E = 0x8C79
+0xE51F = 0x8C7A
+0xE520 = 0x8C7B
+0xE521 = 0x8C7C
+0xE522 = 0x8C7D
+0xE523 = 0x8C7E
+0xE524 = 0x8D21
+0xE525 = 0x8D22
+0xE526 = 0x8D23
+0xE527 = 0x8D24
+0xE528 = 0x8D25
+0xE529 = 0x8D26
+0xE52A = 0x8D27
+0xE52B = 0x8D28
+0xE52C = 0x8D29
+0xE52D = 0x8D2A
+0xE52E = 0x8D2B
+0xE52F = 0x8D2C
+0xE530 = 0x8D2D
+0xE531 = 0x8D2E
+0xE532 = 0x8D2F
+0xE533 = 0x8D30
+0xE534 = 0x8D31
+0xE535 = 0x8D32
+0xE536 = 0x8D33
+0xE537 = 0x8D34
+0xE538 = 0x8D35
+0xE539 = 0x8D36
+0xE53A = 0x8D37
+0xE53B = 0x8D38
+0xE53C = 0x8D39
+0xE53D = 0x8D3A
+0xE53E = 0x8D3B
+0xE53F = 0x8D3C
+0xE540 = 0x8D3D
+0xE541 = 0x8D3E
+0xE542 = 0x8D3F
+0xE543 = 0x8D40
+0xE544 = 0x8D41
+0xE545 = 0x8D42
+0xE546 = 0x8D43
+0xE547 = 0x8D44
+0xE548 = 0x8D45
+0xE549 = 0x8D46
+0xE54A = 0x8D47
+0xE54B = 0x8D48
+0xE54C = 0x8D49
+0xE54D = 0x8D4A
+0xE54E = 0x8D4B
+0xE54F = 0x8D4C
+0xE550 = 0x8D4D
+0xE551 = 0x8D4E
+0xE552 = 0x8D4F
+0xE553 = 0x8D50
+0xE554 = 0x8D51
+0xE555 = 0x8D52
+0xE556 = 0x8D53
+0xE557 = 0x8D54
+0xE558 = 0x8D55
+0xE559 = 0x8D56
+0xE55A = 0x8D57
+0xE55B = 0x8D58
+0xE55C = 0x8D59
+0xE55D = 0x8D5A
+0xE55E = 0x8D5B
+0xE55F = 0x8D5C
+0xE560 = 0x8D5D
+0xE561 = 0x8D5E
+0xE562 = 0x8D5F
+0xE563 = 0x8D60
+0xE564 = 0x8D61
+0xE565 = 0x8D62
+0xE566 = 0x8D63
+0xE567 = 0x8D64
+0xE568 = 0x8D65
+0xE569 = 0x8D66
+0xE56A = 0x8D67
+0xE56B = 0x8D68
+0xE56C = 0x8D69
+0xE56D = 0x8D6A
+0xE56E = 0x8D6B
+0xE56F = 0x8D6C
+0xE570 = 0x8D6D
+0xE571 = 0x8D6E
+0xE572 = 0x8D6F
+0xE573 = 0x8D70
+0xE574 = 0x8D71
+0xE575 = 0x8D72
+0xE576 = 0x8D73
+0xE577 = 0x8D74
+0xE578 = 0x8D75
+0xE579 = 0x8D76
+0xE57A = 0x8D77
+0xE57B = 0x8D78
+0xE57C = 0x8D79
+0xE57D = 0x8D7A
+0xE57E = 0x8D7B
+0xE57F = 0x8D7C
+0xE580 = 0x8D7D
+0xE581 = 0x8D7E
+0xE582 = 0x8E21
+0xE583 = 0x8E22
+0xE584 = 0x8E23
+0xE585 = 0x8E24
+0xE586 = 0x8E25
+0xE587 = 0x8E26
+0xE588 = 0x8E27
+0xE589 = 0x8E28
+0xE58A = 0x8E29
+0xE58B = 0x8E2A
+0xE58C = 0x8E2B
+0xE58D = 0x8E2C
+0xE58E = 0x8E2D
+0xE58F = 0x8E2E
+0xE590 = 0x8E2F
+0xE591 = 0x8E30
+0xE592 = 0x8E31
+0xE593 = 0x8E32
+0xE594 = 0x8E33
+0xE595 = 0x8E34
+0xE596 = 0x8E35
+0xE597 = 0x8E36
+0xE598 = 0x8E37
+0xE599 = 0x8E38
+0xE59A = 0x8E39
+0xE59B = 0x8E3A
+0xE59C = 0x8E3B
+0xE59D = 0x8E3C
+0xE59E = 0x8E3D
+0xE59F = 0x8E3E
+0xE5A0 = 0x8E3F
+0xE5A1 = 0x8E40
+0xE5A2 = 0x8E41
+0xE5A3 = 0x8E42
+0xE5A4 = 0x8E43
+0xE5A5 = 0x8E44
+0xE5A6 = 0x8E45
+0xE5A7 = 0x8E46
+0xE5A8 = 0x8E47
+0xE5A9 = 0x8E48
+0xE5AA = 0x8E49
+0xE5AB = 0x8E4A
+0xE5AC = 0x8E4B
+0xE5AD = 0x8E4C
+0xE5AE = 0x8E4D
+0xE5AF = 0x8E4E
+0xE5B0 = 0x8E4F
+0xE5B1 = 0x8E50
+0xE5B2 = 0x8E51
+0xE5B3 = 0x8E52
+0xE5B4 = 0x8E53
+0xE5B5 = 0x8E67
+0xE5B6 = 0x8E68
+0xE5B7 = 0x8E69
+0xE5B8 = 0x8E6A
+0xE5B9 = 0x8E6B
+0xE5BA = 0x8E6C
+0xE5BB = 0x8E6D
+0xE5BC = 0x8E6E
+0xE5BD = 0x8E6F
+0xE5BE = 0x8E70
+0xE5BF = 0x8E71
+0xE5C0 = 0x8E72
+0xE5C1 = 0x8E73
+0xE5C2 = 0x8E74
+0xE5C3 = 0x8E75
+0xE5C4 = 0x8E76
+0xE5C5 = 0x8E77
+0xE5C6 = 0x8E78
+0xE5C7 = 0x8E79
+0xE5C8 = 0x8E7A
+0xE5C9 = 0x8E7B
+0xE5CA = 0x8E7C
+0xE5CB = 0x8E7D
+0xE5CC = 0x8E7E
+0xE5CD = 0x8521
+0xE5CE = 0x8522
+0xE5CF = 0x8523
+0xE5D0 = 0x8524
+0xE5D1 = 0x8525
+0xE5D2 = 0x8526
+0xE5D3 = 0x8527
+0xE5D4 = 0x8528
+0xE5D5 = 0x8529
+0xE5D6 = 0x852A
+0xE5D7 = 0x852B
+0xE5D8 = 0x852C
+0xE5D9 = 0x852D
+0xE5DA = 0x852E
+0xE5DB = 0x852F
+0xE5DC = 0x8530
+0xE5DD = 0x8531
+0xE5DE = 0x8532
+0xE5DF = 0x8533
+0xEA80 = 0x8534
+0xEA81 = 0x8535
+0xEA82 = 0x8536
+0xEA83 = 0x8537
+0xEA84 = 0x8538
+0xEA85 = 0x8539
+0xEA86 = 0x853A
+0xEA87 = 0x853B
+0xEA88 = 0x853C
+0xEA89 = 0x853D
+0xEA8A = 0x853E
+0xEA8B = 0x853F
+0xEA8C = 0x8540
+0xEA8D = 0x8541
+0xEA8E = 0x8542
+0xEA8F = 0x8543
+0xEA90 = 0x8544
+0xEA91 = 0x8545
+0xEA92 = 0x8546
+0xEA93 = 0x8547
+0xEA94 = 0x8548
+0xEA95 = 0x8549
+0xEA96 = 0x854A
+0xEA97 = 0x854B
+0xEA98 = 0x854C
+0xEA99 = 0x854D
+0xEA9A = 0x854E
+0xEA9B = 0x854F
+0xEA9C = 0x8550
+0xEA9D = 0x8551
+0xEA9E = 0x8552
+0xEA9F = 0x8553
+0xEAA0 = 0x8554
+0xEAA1 = 0x8555
+0xEAA2 = 0x8556
+0xEAA3 = 0x8557
+0xEAA4 = 0x8558
+0xEAA5 = 0x8559
+0xEAA6 = 0x855A
+0xEAA7 = 0x855B
+0xEAA8 = 0x855C
+0xEAA9 = 0x855D
+0xEAAA = 0x855E
+0xEAAB = 0x855F
+0xEAAC = 0x8560
+0xEAAD = 0x8561
+0xEAAE = 0x8562
+0xEAAF = 0x8563
+0xEAB0 = 0x8564
+0xEAB1 = 0x8565
+0xEAB2 = 0x8566
+0xEAB3 = 0x8567
+0xEAB4 = 0x8568
+0xEAB5 = 0x8569
+0xEAB6 = 0x856A
+0xEAB7 = 0x856B
+0xEAB8 = 0x856C
+0xEAB9 = 0x856D
+0xEABA = 0x856E
+0xEABB = 0x856F
+0xEABC = 0x8570
+0xEABD = 0x8571
+0xEABE = 0x8572
+0xEABF = 0x8573
+0xEAC0 = 0x8574
+0xEAC1 = 0x8575
+0xEAC2 = 0x8576
+0xEAC3 = 0x8577
+0xEAC4 = 0x8578
+0xEAC5 = 0x8579
+0xEAC6 = 0x857A
+0xEAC7 = 0x857B
+0xEAC8 = 0x857C
+0xEAC9 = 0x857D
+0xEACA = 0x857E
+0xEACB = 0x8621
+0xEACC = 0x8622
+0xEACD = 0x8623
+0xEACE = 0x8624
+0xEACF = 0x8625
+0xEAD0 = 0x8626
+0xEAD1 = 0x8627
+0xEAD2 = 0x8628
+0xEAD3 = 0x8629
+0xEAD4 = 0x862A
+0xEAD5 = 0x862B
+0xEAD6 = 0x862C
+0xEAD7 = 0x862D
+0xEAD8 = 0x862E
+0xEAD9 = 0x862F
+0xEADA = 0x8630
+0xEADB = 0x8631
+0xEADC = 0x8632
+0xEADD = 0x8633
+0xEADE = 0x8634
+0xEADF = 0x8635
+0xEAE0 = 0x8636
+0xEAE1 = 0x8637
+0xEAE2 = 0x8638
+0xEAE3 = 0x8639
+0xEAE4 = 0x863A
+0xEAE5 = 0x863B
+0xEAE6 = 0x863C
+0xEAE7 = 0x863D
+0xEAE8 = 0x863E
+0xEAE9 = 0x863F
+0xEAEA = 0x8640
+0xEAEB = 0x8641
+0xEAEC = 0x8642
+0xEAED = 0x8643
+0xEAEE = 0x8644
+0xEAEF = 0x8645
+0xEAF0 = 0x8646
+0xEAF1 = 0x8647
+0xEAF2 = 0x8648
+0xEAF3 = 0x8649
+0xEAF4 = 0x864A
+0xEAF5 = 0x864B
+0xEAF6 = 0x864C
+0xEAF7 = 0x864D
+0xEAF8 = 0x864E
+0xEAF9 = 0x864F
+0xEAFA = 0x8650
+0xEAFB = 0x8E54
+0xEAFC = 0x8E55
+0xEAFD = 0x8E56
+0xEAFE = 0x8E57
+0xEAFF = 0x8E58
+0xEB00 = 0x8E59
+0xEB01 = 0x8E5A
+0xEB02 = 0x8E5B
+0xEB03 = 0x8E5C
+0xEB04 = 0x8E5D
+0xEB05 = 0x8E5E
+0xEB06 = 0x8E5F
+0xEB07 = 0x8E60
+0xEB08 = 0x8E61
+0xEB09 = 0x8E62
+0xEB0A = 0x8E63
+0xEB0B = 0x8E64
+0xEB0C = 0x8E65
+0xEB0D = 0x8E66
+0xEB0E = 0x8651
+0xEB0F = 0x8652
+0xEB10 = 0x8653
+0xEB11 = 0x8654
+0xEB12 = 0x8655
+0xEB13 = 0x8656
+0xEB14 = 0x8657
+0xEB15 = 0x8658
+0xEB16 = 0x8659
+0xEB17 = 0x865A
+0xEB18 = 0x865B
+0xEB19 = 0x865C
+0xEB1A = 0x865D
+0xEB1B = 0x865E
+0xEB1C = 0x865F
+0xEB1D = 0x8660
+0xEB1E = 0x8661
+0xEB1F = 0x8662
+0xEB20 = 0x8663
+0xEB21 = 0x8664
+0xEB22 = 0x8665
+0xEB23 = 0x8666
+0xEB24 = 0x8667
+0xEB25 = 0x8668
+0xEB26 = 0x8669
+0xEB27 = 0x866A
+0xEB28 = 0x866B
+0xEB29 = 0x866C
+0xEB2A = 0x866D
+0xEB2B = 0x866E
+0xEB2C = 0x866F
+0xEB2D = 0x8670
+0xEB2E = 0x8671
+0xEB2F = 0x8672
+0xEB30 = 0x8673
+0xEB31 = 0x8674
+0xEB32 = 0x8675
+0xEB33 = 0x8676
+0xEB34 = 0x8677
+0xEB35 = 0x8678
+0xEB36 = 0x8679
+0xEB37 = 0x867A
+0xEB38 = 0x867B
+0xEB39 = 0x867C
+0xEB3A = 0x867D
+0xEB3B = 0x867E
+0xEB3C = 0x8721
+0xEB3D = 0x8722
+0xEB3E = 0x8723
+0xEB3F = 0x8724
+0xEB40 = 0x8725
+0xEB41 = 0x8726
+0xEB42 = 0x8727
+0xEB43 = 0x8728
+0xEB44 = 0x8729
+0xEB45 = 0x872A
+0xEB46 = 0x872B
+0xEB47 = 0x872C
+0xEB48 = 0x872D
+0xEB49 = 0x872E
+0xEB4A = 0x872F
+0xEB4B = 0x8730
+0xEB4C = 0x8731
+0xEB4D = 0x8732
+0xEB4E = 0x8733
+0xEB4F = 0x8734
+0xEB50 = 0x8735
+0xEB51 = 0x8736
+0xEB52 = 0x8737
+0xEB53 = 0x8738
+0xEB54 = 0x8739
+0xEB55 = 0x873A
+0xEB56 = 0x873B
+0xEB57 = 0x873C
+0xEB58 = 0x873D
+0xEB59 = 0x873E
+0xEB5A = 0x873F
+0xEB5B = 0x8740
+0xEB5C = 0x8741
+0xEB5D = 0x8742
+0xEB5E = 0x8743
+0xEB5F = 0x8744
+0xEB60 = 0x8745
+0xEB61 = 0x8746
+0xEB62 = 0x8747
+0xEB63 = 0x8748
+0xEB64 = 0x8749
+0xEB65 = 0x874A
+0xEB66 = 0x874B
+0xEB67 = 0x874C
+0xEB68 = 0x874D
+0xEB69 = 0x874E
+0xEB6A = 0x874F
+0xEB6B = 0x8750
+0xEB6C = 0x8751
+0xEB6D = 0x8752
+0xEB6E = 0x8753
+0xEB6F = 0x8754
+0xEB70 = 0x8755
+0xEB71 = 0x8756
+0xEB72 = 0x8757
+0xEB73 = 0x8758
+0xEB74 = 0x8759
+0xEB75 = 0x875A
+0xEB76 = 0x875B
+0xEB77 = 0x875C
+0xEB78 = 0x875D
+0xEB79 = 0x875E
+0xEB7A = 0x875F
+0xEB7B = 0x8760
+0xEB7C = 0x8761
+0xEB7D = 0x8762
+0xEB7E = 0x8763
+0xEB7F = 0x8764
+0xEB80 = 0x8765
+0xEB81 = 0x8766
+0xEB82 = 0x8767
+0xEB83 = 0x8768
+0xEB84 = 0x8769
+0xEB85 = 0x876A
+0xEB86 = 0x876B
+0xEB87 = 0x876C
+0xEB88 = 0x876D
+0xEB89 = 0x876E
+0xEB8A = 0x876F
+0xEB8B = 0x8770
+0xEB8C = 0x8771
+0xEB8D = 0x8772
+0xEB8E = 0x8773
+END_MAP
diff --git a/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-SOFTBANK.src b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-SOFTBANK.src
new file mode 100644
index 0000000000..b00620294a
--- /dev/null
+++ b/enc/trans/EMOJI/UCS%EMOJI_SHIFT_JIS-SOFTBANK.src
@@ -0,0 +1,496 @@
+# DO NOT EDIT THIS FILE DIRECTLY
+
+TYPE		ROWCOL
+NAME		UCS/EMOJI_SHIFT_JIS-SOFTBANK
+SRC_ZONE	0xF3-0xFC / 0x40-0xFC / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xE001 = 0x9122
+0xE002 = 0x9123
+0xE003 = 0x9124
+0xE004 = 0x9125
+0xE005 = 0x9126
+0xE006 = 0x9127
+0xE007 = 0x9128
+0xE008 = 0x9129
+0xE009 = 0x912A
+0xE00A = 0x912B
+0xE00B = 0x912C
+0xE00C = 0x912D
+0xE00D = 0x912E
+0xE00E = 0x912F
+0xE00F = 0x9130
+0xE010 = 0x9131
+0xE011 = 0x9132
+0xE012 = 0x9133
+0xE013 = 0x9134
+0xE014 = 0x9135
+0xE015 = 0x9136
+0xE016 = 0x9137
+0xE017 = 0x9138
+0xE018 = 0x9139
+0xE019 = 0x913A
+0xE01A = 0x913B
+0xE01B = 0x913C
+0xE01C = 0x913D
+0xE01D = 0x913E
+0xE01E = 0x913F
+0xE01F = 0x9140
+0xE020 = 0x9141
+0xE021 = 0x9142
+0xE022 = 0x9143
+0xE023 = 0x9144
+0xE024 = 0x9145
+0xE025 = 0x9146
+0xE026 = 0x9147
+0xE027 = 0x9148
+0xE028 = 0x9149
+0xE029 = 0x914A
+0xE02A = 0x914B
+0xE02B = 0x914C
+0xE02C = 0x914D
+0xE02D = 0x914E
+0xE02E = 0x914F
+0xE02F = 0x9150
+0xE030 = 0x9151
+0xE031 = 0x9152
+0xE032 = 0x9153
+0xE033 = 0x9154
+0xE034 = 0x9155
+0xE035 = 0x9156
+0xE036 = 0x9157
+0xE037 = 0x9158
+0xE038 = 0x9159
+0xE039 = 0x915A
+0xE03A = 0x915B
+0xE03B = 0x915C
+0xE03C = 0x915D
+0xE03D = 0x915E
+0xE03E = 0x915F
+0xE03F = 0x9160
+0xE040 = 0x9161
+0xE041 = 0x9162
+0xE042 = 0x9163
+0xE043 = 0x9164
+0xE044 = 0x9165
+0xE045 = 0x9166
+0xE046 = 0x9167
+0xE047 = 0x9168
+0xE048 = 0x9169
+0xE049 = 0x916A
+0xE04A = 0x916B
+0xE04B = 0x916C
+0xE04C = 0x916D
+0xE04D = 0x916E
+0xE04E = 0x916F
+0xE04F = 0x9170
+0xE050 = 0x9171
+0xE051 = 0x9172
+0xE052 = 0x9173
+0xE053 = 0x9174
+0xE054 = 0x9175
+0xE055 = 0x9176
+0xE056 = 0x9177
+0xE057 = 0x9178
+0xE058 = 0x9179
+0xE059 = 0x917A
+0xE05A = 0x917B
+0xE101 = 0x8D22
+0xE102 = 0x8D23
+0xE103 = 0x8D24
+0xE104 = 0x8D25
+0xE105 = 0x8D26
+0xE106 = 0x8D27
+0xE107 = 0x8D28
+0xE108 = 0x8D29
+0xE109 = 0x8D2A
+0xE10A = 0x8D2B
+0xE10B = 0x8D2C
+0xE10C = 0x8D2D
+0xE10D = 0x8D2E
+0xE10E = 0x8D2F
+0xE10F = 0x8D30
+0xE110 = 0x8D31
+0xE111 = 0x8D32
+0xE112 = 0x8D33
+0xE113 = 0x8D34
+0xE114 = 0x8D35
+0xE115 = 0x8D36
+0xE116 = 0x8D37
+0xE117 = 0x8D38
+0xE118 = 0x8D39
+0xE119 = 0x8D3A
+0xE11A = 0x8D3B
+0xE11B = 0x8D3C
+0xE11C = 0x8D3D
+0xE11D = 0x8D3E
+0xE11E = 0x8D3F
+0xE11F = 0x8D40
+0xE120 = 0x8D41
+0xE121 = 0x8D42
+0xE122 = 0x8D43
+0xE123 = 0x8D44
+0xE124 = 0x8D45
+0xE125 = 0x8D46
+0xE126 = 0x8D47
+0xE127 = 0x8D48
+0xE128 = 0x8D49
+0xE129 = 0x8D4A
+0xE12A = 0x8D4B
+0xE12B = 0x8D4C
+0xE12C = 0x8D4D
+0xE12D = 0x8D4E
+0xE12E = 0x8D4F
+0xE12F = 0x8D50
+0xE130 = 0x8D51
+0xE131 = 0x8D52
+0xE132 = 0x8D53
+0xE133 = 0x8D54
+0xE134 = 0x8D55
+0xE135 = 0x8D56
+0xE136 = 0x8D57
+0xE137 = 0x8D58
+0xE138 = 0x8D59
+0xE139 = 0x8D5A
+0xE13A = 0x8D5B
+0xE13B = 0x8D5C
+0xE13C = 0x8D5D
+0xE13D = 0x8D5E
+0xE13E = 0x8D5F
+0xE13F = 0x8D60
+0xE140 = 0x8D61
+0xE141 = 0x8D62
+0xE142 = 0x8D63
+0xE143 = 0x8D64
+0xE144 = 0x8D65
+0xE145 = 0x8D66
+0xE146 = 0x8D67
+0xE147 = 0x8D68
+0xE148 = 0x8D69
+0xE149 = 0x8D6A
+0xE14A = 0x8D6B
+0xE14B = 0x8D6C
+0xE14C = 0x8D6D
+0xE14D = 0x8D6E
+0xE14E = 0x8D6F
+0xE14F = 0x8D70
+0xE150 = 0x8D71
+0xE151 = 0x8D72
+0xE152 = 0x8D73
+0xE153 = 0x8D74
+0xE154 = 0x8D75
+0xE155 = 0x8D76
+0xE156 = 0x8D77
+0xE157 = 0x8D78
+0xE158 = 0x8D79
+0xE159 = 0x8D7A
+0xE15A = 0x8D7B
+0xE201 = 0x8E23
+0xE202 = 0x8E24
+0xE203 = 0x8E25
+0xE204 = 0x8E26
+0xE205 = 0x8E27
+0xE206 = 0x8E28
+0xE207 = 0x8E29
+0xE208 = 0x8E2A
+0xE209 = 0x8E2B
+0xE20A = 0x8E2C
+0xE20B = 0x8E2D
+0xE20C = 0x8E2E
+0xE20D = 0x8E2F
+0xE20E = 0x8E30
+0xE20F = 0x8E31
+0xE210 = 0x8E32
+0xE211 = 0x8E33
+0xE212 = 0x8E34
+0xE213 = 0x8E35
+0xE214 = 0x8E36
+0xE215 = 0x8E37
+0xE216 = 0x8E38
+0xE217 = 0x8E39
+0xE218 = 0x8E3A
+0xE219 = 0x8E3B
+0xE21A = 0x8E3C
+0xE21B = 0x8E3D
+0xE21C = 0x8E3E
+0xE21D = 0x8E3F
+0xE21E = 0x8E40
+0xE21F = 0x8E41
+0xE220 = 0x8E42
+0xE221 = 0x8E43
+0xE222 = 0x8E44
+0xE223 = 0x8E45
+0xE224 = 0x8E46
+0xE225 = 0x8E47
+0xE226 = 0x8E48
+0xE227 = 0x8E49
+0xE228 = 0x8E4A
+0xE229 = 0x8E4B
+0xE22A = 0x8E4C
+0xE22B = 0x8E4D
+0xE22C = 0x8E4E
+0xE22D = 0x8E4F
+0xE22E = 0x8E50
+0xE22F = 0x8E51
+0xE230 = 0x8E52
+0xE231 = 0x8E53
+0xE232 = 0x8E54
+0xE233 = 0x8E55
+0xE234 = 0x8E56
+0xE235 = 0x8E57
+0xE236 = 0x8E58
+0xE237 = 0x8E59
+0xE238 = 0x8E5A
+0xE239 = 0x8E5B
+0xE23A = 0x8E5C
+0xE23B = 0x8E5D
+0xE23C = 0x8E5E
+0xE23D = 0x8E5F
+0xE23E = 0x8E60
+0xE23F = 0x8E61
+0xE240 = 0x8E62
+0xE241 = 0x8E63
+0xE242 = 0x8E64
+0xE243 = 0x8E65
+0xE244 = 0x8E66
+0xE245 = 0x8E67
+0xE246 = 0x8E68
+0xE247 = 0x8E69
+0xE248 = 0x8E6A
+0xE249 = 0x8E6B
+0xE24A = 0x8E6C
+0xE24B = 0x8E6D
+0xE24C = 0x8E6E
+0xE24D = 0x8E6F
+0xE24E = 0x8E70
+0xE24F = 0x8E71
+0xE250 = 0x8E72
+0xE251 = 0x8E73
+0xE252 = 0x8E74
+0xE253 = 0x8E75
+0xE254 = 0x8E76
+0xE255 = 0x8E77
+0xE256 = 0x8E78
+0xE257 = 0x8E79
+0xE258 = 0x8E7A
+0xE259 = 0x8E7B
+0xE25A = 0x8E7C
+0xE301 = 0x9223
+0xE302 = 0x9224
+0xE303 = 0x9225
+0xE304 = 0x9226
+0xE305 = 0x9227
+0xE306 = 0x9228
+0xE307 = 0x9229
+0xE308 = 0x922A
+0xE309 = 0x922B
+0xE30A = 0x922C
+0xE30B = 0x922D
+0xE30C = 0x922E
+0xE30D = 0x922F
+0xE30E = 0x9230
+0xE30F = 0x9231
+0xE310 = 0x9232
+0xE311 = 0x9233
+0xE312 = 0x9234
+0xE313 = 0x9235
+0xE314 = 0x9236
+0xE315 = 0x9237
+0xE316 = 0x9238
+0xE317 = 0x9239
+0xE318 = 0x923A
+0xE319 = 0x923B
+0xE31A = 0x923C
+0xE31B = 0x923D
+0xE31C = 0x923E
+0xE31D = 0x923F
+0xE31E = 0x9240
+0xE31F = 0x9241
+0xE320 = 0x9242
+0xE321 = 0x9243
+0xE322 = 0x9244
+0xE323 = 0x9245
+0xE324 = 0x9246
+0xE325 = 0x9247
+0xE326 = 0x9248
+0xE327 = 0x9249
+0xE328 = 0x924A
+0xE329 = 0x924B
+0xE32A = 0x924C
+0xE32B = 0x924D
+0xE32C = 0x924E
+0xE32D = 0x924F
+0xE32E = 0x9250
+0xE32F = 0x9251
+0xE330 = 0x9252
+0xE331 = 0x9253
+0xE332 = 0x9254
+0xE333 = 0x9255
+0xE334 = 0x9256
+0xE335 = 0x9257
+0xE336 = 0x9258
+0xE337 = 0x9259
+0xE338 = 0x925A
+0xE339 = 0x925B
+0xE33A = 0x925C
+0xE33B = 0x925D
+0xE33C = 0x925E
+0xE33D = 0x925F
+0xE33E = 0x9260
+0xE33F = 0x9261
+0xE340 = 0x9262
+0xE341 = 0x9263
+0xE342 = 0x9264
+0xE343 = 0x9265
+0xE344 = 0x9266
+0xE345 = 0x9267
+0xE346 = 0x9268
+0xE347 = 0x9269
+0xE348 = 0x926A
+0xE349 = 0x926B
+0xE34A = 0x926C
+0xE34B = 0x926D
+0xE34C = 0x926E
+0xE34D = 0x926F
+0xE401 = 0x9522
+0xE402 = 0x9523
+0xE403 = 0x9524
+0xE404 = 0x9525
+0xE405 = 0x9526
+0xE406 = 0x9527
+0xE407 = 0x9528
+0xE408 = 0x9529
+0xE409 = 0x952A
+0xE40A = 0x952B
+0xE40B = 0x952C
+0xE40C = 0x952D
+0xE40D = 0x952E
+0xE40E = 0x952F
+0xE40F = 0x9530
+0xE410 = 0x9531
+0xE411 = 0x9532
+0xE412 = 0x9533
+0xE413 = 0x9534
+0xE414 = 0x9535
+0xE415 = 0x9536
+0xE416 = 0x9537
+0xE417 = 0x9538
+0xE418 = 0x9539
+0xE419 = 0x953A
+0xE41A = 0x953B
+0xE41B = 0x953C
+0xE41C = 0x953D
+0xE41D = 0x953E
+0xE41E = 0x953F
+0xE41F = 0x9540
+0xE420 = 0x9541
+0xE421 = 0x9542
+0xE422 = 0x9543
+0xE423 = 0x9544
+0xE424 = 0x9545
+0xE425 = 0x9546
+0xE426 = 0x9547
+0xE427 = 0x9548
+0xE428 = 0x9549
+0xE429 = 0x954A
+0xE42A = 0x954B
+0xE42B = 0x954C
+0xE42C = 0x954D
+0xE42D = 0x954E
+0xE42E = 0x954F
+0xE42F = 0x9550
+0xE430 = 0x9551
+0xE431 = 0x9552
+0xE432 = 0x9553
+0xE433 = 0x9554
+0xE434 = 0x9555
+0xE435 = 0x9556
+0xE436 = 0x9557
+0xE437 = 0x9558
+0xE438 = 0x9559
+0xE439 = 0x955A
+0xE43A = 0x955B
+0xE43B = 0x955C
+0xE43C = 0x955D
+0xE43D = 0x955E
+0xE43E = 0x955F
+0xE43F = 0x9560
+0xE440 = 0x9561
+0xE441 = 0x9562
+0xE442 = 0x9563
+0xE443 = 0x9564
+0xE444 = 0x9565
+0xE445 = 0x9566
+0xE446 = 0x9567
+0xE447 = 0x9568
+0xE448 = 0x9569
+0xE449 = 0x956A
+0xE44A = 0x956B
+0xE44B = 0x956C
+0xE44C = 0x956D
+0xE501 = 0x9623
+0xE502 = 0x9624
+0xE503 = 0x9625
+0xE504 = 0x9626
+0xE505 = 0x9627
+0xE506 = 0x9628
+0xE507 = 0x9629
+0xE508 = 0x962A
+0xE509 = 0x962B
+0xE50A = 0x962C
+0xE50B = 0x962D
+0xE50C = 0x962E
+0xE50D = 0x962F
+0xE50E = 0x9630
+0xE50F = 0x9631
+0xE510 = 0x9632
+0xE511 = 0x9633
+0xE512 = 0x9634
+0xE513 = 0x9635
+0xE514 = 0x9636
+0xE515 = 0x9637
+0xE516 = 0x9638
+0xE517 = 0x9639
+0xE518 = 0x963A
+0xE519 = 0x963B
+0xE51A = 0x963C
+0xE51B = 0x963D
+0xE51C = 0x963E
+0xE51D = 0x963F
+0xE51E = 0x9640
+0xE51F = 0x9641
+0xE520 = 0x9642
+0xE521 = 0x9643
+0xE522 = 0x9644
+0xE523 = 0x9645
+0xE524 = 0x9646
+0xE525 = 0x9647
+0xE526 = 0x9648
+0xE527 = 0x9649
+0xE528 = 0x964A
+0xE529 = 0x964B
+0xE52A = 0x964C
+0xE52B = 0x964D
+0xE52C = 0x964E
+0xE52D = 0x964F
+0xE52E = 0x9650
+0xE52F = 0x9651
+0xE530 = 0x9652
+0xE531 = 0x9653
+0xE532 = 0x9654
+0xE533 = 0x9655
+0xE534 = 0x9656
+0xE535 = 0x9657
+0xE536 = 0x9658
+0xE537 = 0x9659
+0xE538 = 0x965A
+0xE539 = 0x965B
+0xE53A = 0x965C
+0xE53B = 0x965D
+0xE53C = 0x965E
+0xE53D = 0x965F
+0xE53E = 0x9660
+END_MAP
diff --git a/enc/trans/GB/GB12345%UCS.src b/enc/trans/GB/GB12345%UCS.src
new file mode 100644
index 0000000000..0b4115bed9
--- /dev/null
+++ b/enc/trans/GB/GB12345%UCS.src
@@ -0,0 +1,7618 @@
+# $NetBSD: GB12345%UCS.src,v 1.1 2006/11/23 03:25:24 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"GB12345/UCS"
+SRC_ZONE	0x21-0x79 / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             GB12345-80 to Unicode table (complete, hex format)
+#	Unicode version:  1.1
+#	Table version:    0.0d1
+#	Table format:     Format A
+#	Date:             6 December 1993
+#	Author:           Glenn Adams <glenn@metis.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data Metis and Taligent currently have on how
+#       GB12345-90 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the GB12345 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#					The official names for Unicode characters U+4E00
+#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#					where XXXX is the code point.  Including all these
+#					names in this file increases its size substantially
+#					and needlessly.  The token "<CJK>" is used for the
+#					name of these characters.  If necessary, it can be
+#					expanded algorithmically by a parser or editor.
+#
+#	The entries are in GB12345 order
+#
+#	The following algorithms can be used to change the hex form
+#		of GB12345 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x777E -> 0x575E -> 8794
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+#
+0x2121 = 0x3000
+0x2122 = 0x3001
+0x2123 = 0x3002
+0x2124 = 0x00B7
+0x2125 = 0x02C9
+0x2126 = 0x02C7
+0x2127 = 0x00A8
+0x2128 = 0x3003
+0x2129 = 0x3005
+0x212A = 0x2014
+0x212B = 0xFF5E
+0x212C = 0x2016
+0x212D = 0x2026
+0x212E = 0x2018
+0x212F = 0x2019
+0x2130 = 0x201C
+0x2131 = 0x201D
+0x2132 = 0x3014
+0x2133 = 0x3015
+0x2134 = 0x3008
+0x2135 = 0x3009
+0x2136 = 0x300A
+0x2137 = 0x300B
+0x2138 = 0x300C
+0x2139 = 0x300D
+0x213A = 0x300E
+0x213B = 0x300F
+0x213C = 0x3016
+0x213D = 0x3017
+0x213E = 0x3010
+0x213F = 0x3011
+0x2140 = 0x00B1
+0x2141 = 0x00D7
+0x2142 = 0x00F7
+0x2143 = 0x2236
+0x2144 = 0x2227
+0x2145 = 0x2228
+0x2146 = 0x2211
+0x2147 = 0x220F
+0x2148 = 0x222A
+0x2149 = 0x2229
+0x214A = 0x2208
+0x214B = 0x2237
+0x214C = 0x221A
+0x214D = 0x22A5
+0x214E = 0x2225
+0x214F = 0x2220
+0x2150 = 0x2312
+0x2151 = 0x2299
+0x2152 = 0x222B
+0x2153 = 0x222E
+0x2154 = 0x2261
+0x2155 = 0x224C
+0x2156 = 0x2248
+0x2157 = 0x223D
+0x2158 = 0x221D
+0x2159 = 0x2260
+0x215A = 0x226E
+0x215B = 0x226F
+0x215C = 0x2264
+0x215D = 0x2265
+0x215E = 0x221E
+0x215F = 0x2235
+0x2160 = 0x2234
+0x2161 = 0x2642
+0x2162 = 0x2640
+0x2163 = 0x00B0
+0x2164 = 0x2032
+0x2165 = 0x2033
+0x2166 = 0x2103
+0x2167 = 0xFF04
+0x2168 = 0x00A4
+0x2169 = 0xFFE0
+0x216A = 0xFFE1
+0x216B = 0x2030
+0x216C = 0x00A7
+0x216D = 0x2116
+0x216E = 0x2606
+0x216F = 0x2605
+0x2170 = 0x25CB
+0x2171 = 0x25CF
+0x2172 = 0x25CE
+0x2173 = 0x25C7
+0x2174 = 0x25C6
+0x2175 = 0x25A1
+0x2176 = 0x25A0
+0x2177 = 0x25B3
+0x2178 = 0x25B2
+0x2179 = 0x203B
+0x217A = 0x2192
+0x217B = 0x2190
+0x217C = 0x2191
+0x217D = 0x2193
+0x217E = 0x3013
+0x2231 = 0x2488
+0x2232 = 0x2489
+0x2233 = 0x248A
+0x2234 = 0x248B
+0x2235 = 0x248C
+0x2236 = 0x248D
+0x2237 = 0x248E
+0x2238 = 0x248F
+0x2239 = 0x2490
+0x223A = 0x2491
+0x223B = 0x2492
+0x223C = 0x2493
+0x223D = 0x2494
+0x223E = 0x2495
+0x223F = 0x2496
+0x2240 = 0x2497
+0x2241 = 0x2498
+0x2242 = 0x2499
+0x2243 = 0x249A
+0x2244 = 0x249B
+0x2245 = 0x2474
+0x2246 = 0x2475
+0x2247 = 0x2476
+0x2248 = 0x2477
+0x2249 = 0x2478
+0x224A = 0x2479
+0x224B = 0x247A
+0x224C = 0x247B
+0x224D = 0x247C
+0x224E = 0x247D
+0x224F = 0x247E
+0x2250 = 0x247F
+0x2251 = 0x2480
+0x2252 = 0x2481
+0x2253 = 0x2482
+0x2254 = 0x2483
+0x2255 = 0x2484
+0x2256 = 0x2485
+0x2257 = 0x2486
+0x2258 = 0x2487
+0x2259 = 0x2460
+0x225A = 0x2461
+0x225B = 0x2462
+0x225C = 0x2463
+0x225D = 0x2464
+0x225E = 0x2465
+0x225F = 0x2466
+0x2260 = 0x2467
+0x2261 = 0x2468
+0x2262 = 0x2469
+0x2265 = 0x3220
+0x2266 = 0x3221
+0x2267 = 0x3222
+0x2268 = 0x3223
+0x2269 = 0x3224
+0x226A = 0x3225
+0x226B = 0x3226
+0x226C = 0x3227
+0x226D = 0x3228
+0x226E = 0x3229
+0x2271 = 0x2160
+0x2272 = 0x2161
+0x2273 = 0x2162
+0x2274 = 0x2163
+0x2275 = 0x2164
+0x2276 = 0x2165
+0x2277 = 0x2166
+0x2278 = 0x2167
+0x2279 = 0x2168
+0x227A = 0x2169
+0x227B = 0x216A
+0x227C = 0x216B
+0x2321 = 0xFF01
+0x2322 = 0xFF02
+0x2323 = 0xFF03
+0x2324 = 0xFFE5
+0x2325 = 0xFF05
+0x2326 = 0xFF06
+0x2327 = 0xFF07
+0x2328 = 0xFF08
+0x2329 = 0xFF09
+0x232A = 0xFF0A
+0x232B = 0xFF0B
+0x232C = 0xFF0C
+0x232D = 0xFF0D
+0x232E = 0xFF0E
+0x232F = 0xFF0F
+0x2330 = 0xFF10
+0x2331 = 0xFF11
+0x2332 = 0xFF12
+0x2333 = 0xFF13
+0x2334 = 0xFF14
+0x2335 = 0xFF15
+0x2336 = 0xFF16
+0x2337 = 0xFF17
+0x2338 = 0xFF18
+0x2339 = 0xFF19
+0x233A = 0xFF1A
+0x233B = 0xFF1B
+0x233C = 0xFF1C
+0x233D = 0xFF1D
+0x233E = 0xFF1E
+0x233F = 0xFF1F
+0x2340 = 0xFF20
+0x2341 = 0xFF21
+0x2342 = 0xFF22
+0x2343 = 0xFF23
+0x2344 = 0xFF24
+0x2345 = 0xFF25
+0x2346 = 0xFF26
+0x2347 = 0xFF27
+0x2348 = 0xFF28
+0x2349 = 0xFF29
+0x234A = 0xFF2A
+0x234B = 0xFF2B
+0x234C = 0xFF2C
+0x234D = 0xFF2D
+0x234E = 0xFF2E
+0x234F = 0xFF2F
+0x2350 = 0xFF30
+0x2351 = 0xFF31
+0x2352 = 0xFF32
+0x2353 = 0xFF33
+0x2354 = 0xFF34
+0x2355 = 0xFF35
+0x2356 = 0xFF36
+0x2357 = 0xFF37
+0x2358 = 0xFF38
+0x2359 = 0xFF39
+0x235A = 0xFF3A
+0x235B = 0xFF3B
+0x235C = 0xFF3C
+0x235D = 0xFF3D
+0x235E = 0xFF3E
+0x235F = 0xFF3F
+0x2360 = 0xFF40
+0x2361 = 0xFF41
+0x2362 = 0xFF42
+0x2363 = 0xFF43
+0x2364 = 0xFF44
+0x2365 = 0xFF45
+0x2366 = 0xFF46
+0x2367 = 0xFF47
+0x2368 = 0xFF48
+0x2369 = 0xFF49
+0x236A = 0xFF4A
+0x236B = 0xFF4B
+0x236C = 0xFF4C
+0x236D = 0xFF4D
+0x236E = 0xFF4E
+0x236F = 0xFF4F
+0x2370 = 0xFF50
+0x2371 = 0xFF51
+0x2372 = 0xFF52
+0x2373 = 0xFF53
+0x2374 = 0xFF54
+0x2375 = 0xFF55
+0x2376 = 0xFF56
+0x2377 = 0xFF57
+0x2378 = 0xFF58
+0x2379 = 0xFF59
+0x237A = 0xFF5A
+0x237B = 0xFF5B
+0x237C = 0xFF5C
+0x237D = 0xFF5D
+0x237E = 0xFFE3
+0x2421 = 0x3041
+0x2422 = 0x3042
+0x2423 = 0x3043
+0x2424 = 0x3044
+0x2425 = 0x3045
+0x2426 = 0x3046
+0x2427 = 0x3047
+0x2428 = 0x3048
+0x2429 = 0x3049
+0x242A = 0x304A
+0x242B = 0x304B
+0x242C = 0x304C
+0x242D = 0x304D
+0x242E = 0x304E
+0x242F = 0x304F
+0x2430 = 0x3050
+0x2431 = 0x3051
+0x2432 = 0x3052
+0x2433 = 0x3053
+0x2434 = 0x3054
+0x2435 = 0x3055
+0x2436 = 0x3056
+0x2437 = 0x3057
+0x2438 = 0x3058
+0x2439 = 0x3059
+0x243A = 0x305A
+0x243B = 0x305B
+0x243C = 0x305C
+0x243D = 0x305D
+0x243E = 0x305E
+0x243F = 0x305F
+0x2440 = 0x3060
+0x2441 = 0x3061
+0x2442 = 0x3062
+0x2443 = 0x3063
+0x2444 = 0x3064
+0x2445 = 0x3065
+0x2446 = 0x3066
+0x2447 = 0x3067
+0x2448 = 0x3068
+0x2449 = 0x3069
+0x244A = 0x306A
+0x244B = 0x306B
+0x244C = 0x306C
+0x244D = 0x306D
+0x244E = 0x306E
+0x244F = 0x306F
+0x2450 = 0x3070
+0x2451 = 0x3071
+0x2452 = 0x3072
+0x2453 = 0x3073
+0x2454 = 0x3074
+0x2455 = 0x3075
+0x2456 = 0x3076
+0x2457 = 0x3077
+0x2458 = 0x3078
+0x2459 = 0x3079
+0x245A = 0x307A
+0x245B = 0x307B
+0x245C = 0x307C
+0x245D = 0x307D
+0x245E = 0x307E
+0x245F = 0x307F
+0x2460 = 0x3080
+0x2461 = 0x3081
+0x2462 = 0x3082
+0x2463 = 0x3083
+0x2464 = 0x3084
+0x2465 = 0x3085
+0x2466 = 0x3086
+0x2467 = 0x3087
+0x2468 = 0x3088
+0x2469 = 0x3089
+0x246A = 0x308A
+0x246B = 0x308B
+0x246C = 0x308C
+0x246D = 0x308D
+0x246E = 0x308E
+0x246F = 0x308F
+0x2470 = 0x3090
+0x2471 = 0x3091
+0x2472 = 0x3092
+0x2473 = 0x3093
+0x2521 = 0x30A1
+0x2522 = 0x30A2
+0x2523 = 0x30A3
+0x2524 = 0x30A4
+0x2525 = 0x30A5
+0x2526 = 0x30A6
+0x2527 = 0x30A7
+0x2528 = 0x30A8
+0x2529 = 0x30A9
+0x252A = 0x30AA
+0x252B = 0x30AB
+0x252C = 0x30AC
+0x252D = 0x30AD
+0x252E = 0x30AE
+0x252F = 0x30AF
+0x2530 = 0x30B0
+0x2531 = 0x30B1
+0x2532 = 0x30B2
+0x2533 = 0x30B3
+0x2534 = 0x30B4
+0x2535 = 0x30B5
+0x2536 = 0x30B6
+0x2537 = 0x30B7
+0x2538 = 0x30B8
+0x2539 = 0x30B9
+0x253A = 0x30BA
+0x253B = 0x30BB
+0x253C = 0x30BC
+0x253D = 0x30BD
+0x253E = 0x30BE
+0x253F = 0x30BF
+0x2540 = 0x30C0
+0x2541 = 0x30C1
+0x2542 = 0x30C2
+0x2543 = 0x30C3
+0x2544 = 0x30C4
+0x2545 = 0x30C5
+0x2546 = 0x30C6
+0x2547 = 0x30C7
+0x2548 = 0x30C8
+0x2549 = 0x30C9
+0x254A = 0x30CA
+0x254B = 0x30CB
+0x254C = 0x30CC
+0x254D = 0x30CD
+0x254E = 0x30CE
+0x254F = 0x30CF
+0x2550 = 0x30D0
+0x2551 = 0x30D1
+0x2552 = 0x30D2
+0x2553 = 0x30D3
+0x2554 = 0x30D4
+0x2555 = 0x30D5
+0x2556 = 0x30D6
+0x2557 = 0x30D7
+0x2558 = 0x30D8
+0x2559 = 0x30D9
+0x255A = 0x30DA
+0x255B = 0x30DB
+0x255C = 0x30DC
+0x255D = 0x30DD
+0x255E = 0x30DE
+0x255F = 0x30DF
+0x2560 = 0x30E0
+0x2561 = 0x30E1
+0x2562 = 0x30E2
+0x2563 = 0x30E3
+0x2564 = 0x30E4
+0x2565 = 0x30E5
+0x2566 = 0x30E6
+0x2567 = 0x30E7
+0x2568 = 0x30E8
+0x2569 = 0x30E9
+0x256A = 0x30EA
+0x256B = 0x30EB
+0x256C = 0x30EC
+0x256D = 0x30ED
+0x256E = 0x30EE
+0x256F = 0x30EF
+0x2570 = 0x30F0
+0x2571 = 0x30F1
+0x2572 = 0x30F2
+0x2573 = 0x30F3
+0x2574 = 0x30F4
+0x2575 = 0x30F5
+0x2576 = 0x30F6
+0x2621 = 0x0391
+0x2622 = 0x0392
+0x2623 = 0x0393
+0x2624 = 0x0394
+0x2625 = 0x0395
+0x2626 = 0x0396
+0x2627 = 0x0397
+0x2628 = 0x0398
+0x2629 = 0x0399
+0x262A = 0x039A
+0x262B = 0x039B
+0x262C = 0x039C
+0x262D = 0x039D
+0x262E = 0x039E
+0x262F = 0x039F
+0x2630 = 0x03A0
+0x2631 = 0x03A1
+0x2632 = 0x03A3
+0x2633 = 0x03A4
+0x2634 = 0x03A5
+0x2635 = 0x03A6
+0x2636 = 0x03A7
+0x2637 = 0x03A8
+0x2638 = 0x03A9
+0x2641 = 0x03B1
+0x2642 = 0x03B2
+0x2643 = 0x03B3
+0x2644 = 0x03B4
+0x2645 = 0x03B5
+0x2646 = 0x03B6
+0x2647 = 0x03B7
+0x2648 = 0x03B8
+0x2649 = 0x03B9
+0x264A = 0x03BA
+0x264B = 0x03BB
+0x264C = 0x03BC
+0x264D = 0x03BD
+0x264E = 0x03BE
+0x264F = 0x03BF
+0x2650 = 0x03C0
+0x2651 = 0x03C1
+0x2652 = 0x03C3
+0x2653 = 0x03C4
+0x2654 = 0x03C5
+0x2655 = 0x03C6
+0x2656 = 0x03C7
+0x2657 = 0x03C8
+0x2658 = 0x03C9
+0x2721 = 0x0410
+0x2722 = 0x0411
+0x2723 = 0x0412
+0x2724 = 0x0413
+0x2725 = 0x0414
+0x2726 = 0x0415
+0x2727 = 0x0401
+0x2728 = 0x0416
+0x2729 = 0x0417
+0x272A = 0x0418
+0x272B = 0x0419
+0x272C = 0x041A
+0x272D = 0x041B
+0x272E = 0x041C
+0x272F = 0x041D
+0x2730 = 0x041E
+0x2731 = 0x041F
+0x2732 = 0x0420
+0x2733 = 0x0421
+0x2734 = 0x0422
+0x2735 = 0x0423
+0x2736 = 0x0424
+0x2737 = 0x0425
+0x2738 = 0x0426
+0x2739 = 0x0427
+0x273A = 0x0428
+0x273B = 0x0429
+0x273C = 0x042A
+0x273D = 0x042B
+0x273E = 0x042C
+0x273F = 0x042D
+0x2740 = 0x042E
+0x2741 = 0x042F
+0x2751 = 0x0430
+0x2752 = 0x0431
+0x2753 = 0x0432
+0x2754 = 0x0433
+0x2755 = 0x0434
+0x2756 = 0x0435
+0x2757 = 0x0451
+0x2758 = 0x0436
+0x2759 = 0x0437
+0x275A = 0x0438
+0x275B = 0x0439
+0x275C = 0x043A
+0x275D = 0x043B
+0x275E = 0x043C
+0x275F = 0x043D
+0x2760 = 0x043E
+0x2761 = 0x043F
+0x2762 = 0x0440
+0x2763 = 0x0441
+0x2764 = 0x0442
+0x2765 = 0x0443
+0x2766 = 0x0444
+0x2767 = 0x0445
+0x2768 = 0x0446
+0x2769 = 0x0447
+0x276A = 0x0448
+0x276B = 0x0449
+0x276C = 0x044A
+0x276D = 0x044B
+0x276E = 0x044C
+0x276F = 0x044D
+0x2770 = 0x044E
+0x2771 = 0x044F
+0x2821 = 0x0101
+0x2822 = 0x00E1
+0x2823 = 0x01CE
+0x2824 = 0x00E0
+0x2825 = 0x0113
+0x2826 = 0x00E9
+0x2827 = 0x011B
+0x2828 = 0x00E8
+0x2829 = 0x012B
+0x282A = 0x00ED
+0x282B = 0x01D0
+0x282C = 0x00EC
+0x282D = 0x014D
+0x282E = 0x00F3
+0x282F = 0x01D2
+0x2830 = 0x00F2
+0x2831 = 0x016B
+0x2832 = 0x00FA
+0x2833 = 0x01D4
+0x2834 = 0x00F9
+0x2835 = 0x01D6
+0x2836 = 0x01D8
+0x2837 = 0x01DA
+0x2838 = 0x01DC
+0x2839 = 0x00FC
+0x283A = 0x00EA
+0x2845 = 0x3105
+0x2846 = 0x3106
+0x2847 = 0x3107
+0x2848 = 0x3108
+0x2849 = 0x3109
+0x284A = 0x310A
+0x284B = 0x310B
+0x284C = 0x310C
+0x284D = 0x310D
+0x284E = 0x310E
+0x284F = 0x310F
+0x2850 = 0x3110
+0x2851 = 0x3111
+0x2852 = 0x3112
+0x2853 = 0x3113
+0x2854 = 0x3114
+0x2855 = 0x3115
+0x2856 = 0x3116
+0x2857 = 0x3117
+0x2858 = 0x3118
+0x2859 = 0x3119
+0x285A = 0x311A
+0x285B = 0x311B
+0x285C = 0x311C
+0x285D = 0x311D
+0x285E = 0x311E
+0x285F = 0x311F
+0x2860 = 0x3120
+0x2861 = 0x3121
+0x2862 = 0x3122
+0x2863 = 0x3123
+0x2864 = 0x3124
+0x2865 = 0x3125
+0x2866 = 0x3126
+0x2867 = 0x3127
+0x2868 = 0x3128
+0x2869 = 0x3129
+0x2924 = 0x2500
+0x2925 = 0x2501
+0x2926 = 0x2502
+0x2927 = 0x2503
+0x2928 = 0x2504
+0x2929 = 0x2505
+0x292A = 0x2506
+0x292B = 0x2507
+0x292C = 0x2508
+0x292D = 0x2509
+0x292E = 0x250A
+0x292F = 0x250B
+0x2930 = 0x250C
+0x2931 = 0x250D
+0x2932 = 0x250E
+0x2933 = 0x250F
+0x2934 = 0x2510
+0x2935 = 0x2511
+0x2936 = 0x2512
+0x2937 = 0x2513
+0x2938 = 0x2514
+0x2939 = 0x2515
+0x293A = 0x2516
+0x293B = 0x2517
+0x293C = 0x2518
+0x293D = 0x2519
+0x293E = 0x251A
+0x293F = 0x251B
+0x2940 = 0x251C
+0x2941 = 0x251D
+0x2942 = 0x251E
+0x2943 = 0x251F
+0x2944 = 0x2520
+0x2945 = 0x2521
+0x2946 = 0x2522
+0x2947 = 0x2523
+0x2948 = 0x2524
+0x2949 = 0x2525
+0x294A = 0x2526
+0x294B = 0x2527
+0x294C = 0x2528
+0x294D = 0x2529
+0x294E = 0x252A
+0x294F = 0x252B
+0x2950 = 0x252C
+0x2951 = 0x252D
+0x2952 = 0x252E
+0x2953 = 0x252F
+0x2954 = 0x2530
+0x2955 = 0x2531
+0x2956 = 0x2532
+0x2957 = 0x2533
+0x2958 = 0x2534
+0x2959 = 0x2535
+0x295A = 0x2536
+0x295B = 0x2537
+0x295C = 0x2538
+0x295D = 0x2539
+0x295E = 0x253A
+0x295F = 0x253B
+0x2960 = 0x253C
+0x2961 = 0x253D
+0x2962 = 0x253E
+0x2963 = 0x253F
+0x2964 = 0x2540
+0x2965 = 0x2541
+0x2966 = 0x2542
+0x2967 = 0x2543
+0x2968 = 0x2544
+0x2969 = 0x2545
+0x296A = 0x2546
+0x296B = 0x2547
+0x296C = 0x2548
+0x296D = 0x2549
+0x296E = 0x254A
+0x296F = 0x254B
+0x3021 = 0x554A
+0x3022 = 0x963F
+0x3023 = 0x57C3
+0x3024 = 0x6328
+0x3025 = 0x54CE
+0x3026 = 0x5509
+0x3027 = 0x54C0
+0x3028 = 0x769A
+0x3029 = 0x764C
+0x302A = 0x85F9
+0x302B = 0x77EE
+0x302C = 0x827E
+0x302D = 0x7919
+0x302E = 0x611B
+0x302F = 0x9698
+0x3030 = 0x978D
+0x3031 = 0x6C28
+0x3032 = 0x5B89
+0x3033 = 0x4FFA
+0x3034 = 0x6309
+0x3035 = 0x6697
+0x3036 = 0x5CB8
+0x3037 = 0x80FA
+0x3038 = 0x6848
+0x3039 = 0x9AAF
+0x303A = 0x6602
+0x303B = 0x76CE
+0x303C = 0x51F9
+0x303D = 0x6556
+0x303E = 0x71AC
+0x303F = 0x7FF1
+0x3040 = 0x8956
+0x3041 = 0x50B2
+0x3042 = 0x5965
+0x3043 = 0x61CA
+0x3044 = 0x6FB3
+0x3045 = 0x82AD
+0x3046 = 0x634C
+0x3047 = 0x6252
+0x3048 = 0x53ED
+0x3049 = 0x5427
+0x304A = 0x7B06
+0x304B = 0x516B
+0x304C = 0x75A4
+0x304D = 0x5DF4
+0x304E = 0x62D4
+0x304F = 0x8DCB
+0x3050 = 0x9776
+0x3051 = 0x628A
+0x3052 = 0x8019
+0x3053 = 0x58E9
+0x3054 = 0x9738
+0x3055 = 0x7F77
+0x3056 = 0x7238
+0x3057 = 0x767D
+0x3058 = 0x67CF
+0x3059 = 0x767E
+0x305A = 0x64FA
+0x305B = 0x4F70
+0x305C = 0x6557
+0x305D = 0x62DC
+0x305E = 0x7A17
+0x305F = 0x6591
+0x3060 = 0x73ED
+0x3061 = 0x642C
+0x3062 = 0x6273
+0x3063 = 0x822C
+0x3064 = 0x9812
+0x3065 = 0x677F
+0x3066 = 0x7248
+0x3067 = 0x626E
+0x3068 = 0x62CC
+0x3069 = 0x4F34
+0x306A = 0x74E3
+0x306B = 0x534A
+0x306C = 0x8FA6
+0x306D = 0x7D46
+0x306E = 0x90A6
+0x306F = 0x5E6B
+0x3070 = 0x6886
+0x3071 = 0x699C
+0x3072 = 0x8180
+0x3073 = 0x7D81
+0x3074 = 0x68D2
+0x3075 = 0x78C5
+0x3076 = 0x868C
+0x3077 = 0x938A
+0x3078 = 0x508D
+0x3079 = 0x8B17
+0x307A = 0x82DE
+0x307B = 0x80DE
+0x307C = 0x5305
+0x307D = 0x8912
+0x307E = 0x5265
+0x3121 = 0x8584
+0x3122 = 0x96F9
+0x3123 = 0x4FDD
+0x3124 = 0x5821
+0x3125 = 0x98FD
+0x3126 = 0x5BF6
+0x3127 = 0x62B1
+0x3128 = 0x5831
+0x3129 = 0x66B4
+0x312A = 0x8C79
+0x312B = 0x9B91
+0x312C = 0x7206
+0x312D = 0x676F
+0x312E = 0x7891
+0x312F = 0x60B2
+0x3130 = 0x5351
+0x3131 = 0x5317
+0x3132 = 0x8F29
+0x3133 = 0x80CC
+0x3134 = 0x8C9D
+0x3135 = 0x92C7
+0x3136 = 0x500D
+0x3137 = 0x72FD
+0x3138 = 0x5099
+0x3139 = 0x618A
+0x313A = 0x7119
+0x313B = 0x88AB
+0x313C = 0x5954
+0x313D = 0x82EF
+0x313E = 0x672C
+0x313F = 0x7B28
+0x3140 = 0x5D29
+0x3141 = 0x7DB3
+0x3142 = 0x752D
+0x3143 = 0x6CF5
+0x3144 = 0x8E66
+0x3145 = 0x8FF8
+0x3146 = 0x903C
+0x3147 = 0x9F3B
+0x3148 = 0x6BD4
+0x3149 = 0x9119
+0x314A = 0x7B46
+0x314B = 0x5F7C
+0x314C = 0x78A7
+0x314D = 0x84D6
+0x314E = 0x853D
+0x314F = 0x7562
+0x3150 = 0x6583
+0x3151 = 0x6BD6
+0x3152 = 0x5E63
+0x3153 = 0x5E87
+0x3154 = 0x75F9
+0x3155 = 0x9589
+0x3156 = 0x655D
+0x3157 = 0x5F0A
+0x3158 = 0x5FC5
+0x3159 = 0x8F9F
+0x315A = 0x58C1
+0x315B = 0x81C2
+0x315C = 0x907F
+0x315D = 0x965B
+0x315E = 0x97AD
+0x315F = 0x908A
+0x3160 = 0x7DE8
+0x3161 = 0x8CB6
+0x3162 = 0x6241
+0x3163 = 0x4FBF
+0x3164 = 0x8B8A
+0x3165 = 0x535E
+0x3166 = 0x8FA8
+0x3167 = 0x8FAF
+0x3168 = 0x8FAE
+0x3169 = 0x904D
+0x316A = 0x6A19
+0x316B = 0x5F6A
+0x316C = 0x8198
+0x316D = 0x8868
+0x316E = 0x9C49
+0x316F = 0x618B
+0x3170 = 0x522B
+0x3171 = 0x765F
+0x3172 = 0x5F6C
+0x3173 = 0x658C
+0x3174 = 0x7015
+0x3175 = 0x6FF1
+0x3176 = 0x8CD3
+0x3177 = 0x64EF
+0x3178 = 0x5175
+0x3179 = 0x51B0
+0x317A = 0x67C4
+0x317B = 0x4E19
+0x317C = 0x79C9
+0x317D = 0x9905
+0x317E = 0x70B3
+0x3221 = 0x75C5
+0x3222 = 0x5E76
+0x3223 = 0x73BB
+0x3224 = 0x83E0
+0x3225 = 0x64AD
+0x3226 = 0x64A5
+0x3227 = 0x9262
+0x3228 = 0x6CE2
+0x3229 = 0x535A
+0x322A = 0x52C3
+0x322B = 0x640F
+0x322C = 0x9251
+0x322D = 0x7B94
+0x322E = 0x4F2F
+0x322F = 0x5E1B
+0x3230 = 0x8236
+0x3231 = 0x8116
+0x3232 = 0x818A
+0x3233 = 0x6E24
+0x3234 = 0x6CCA
+0x3235 = 0x99C1
+0x3236 = 0x6355
+0x3237 = 0x535C
+0x3238 = 0x54FA
+0x3239 = 0x88DC
+0x323A = 0x57E0
+0x323B = 0x4E0D
+0x323C = 0x5E03
+0x323D = 0x6B65
+0x323E = 0x7C3F
+0x323F = 0x90E8
+0x3240 = 0x6016
+0x3241 = 0x64E6
+0x3242 = 0x731C
+0x3243 = 0x88C1
+0x3244 = 0x6750
+0x3245 = 0x624D
+0x3246 = 0x8CA1
+0x3247 = 0x776C
+0x3248 = 0x8E29
+0x3249 = 0x91C7
+0x324A = 0x5F69
+0x324B = 0x83DC
+0x324C = 0x8521
+0x324D = 0x9910
+0x324E = 0x53C3
+0x324F = 0x8836
+0x3250 = 0x6B98
+0x3251 = 0x615A
+0x3252 = 0x6158
+0x3253 = 0x71E6
+0x3254 = 0x84BC
+0x3255 = 0x8259
+0x3256 = 0x5009
+0x3257 = 0x6EC4
+0x3258 = 0x85CF
+0x3259 = 0x64CD
+0x325A = 0x7CD9
+0x325B = 0x69FD
+0x325C = 0x66F9
+0x325D = 0x8349
+0x325E = 0x53A0
+0x325F = 0x7B56
+0x3260 = 0x5074
+0x3261 = 0x518C
+0x3262 = 0x6E2C
+0x3263 = 0x5C64
+0x3264 = 0x8E6D
+0x3265 = 0x63D2
+0x3266 = 0x53C9
+0x3267 = 0x832C
+0x3268 = 0x8336
+0x3269 = 0x67E5
+0x326A = 0x78B4
+0x326B = 0x643D
+0x326C = 0x5BDF
+0x326D = 0x5C94
+0x326E = 0x5DEE
+0x326F = 0x8A6B
+0x3270 = 0x62C6
+0x3271 = 0x67F4
+0x3272 = 0x8C7A
+0x3273 = 0x6519
+0x3274 = 0x647B
+0x3275 = 0x87EC
+0x3276 = 0x995E
+0x3277 = 0x8B92
+0x3278 = 0x7E8F
+0x3279 = 0x93DF
+0x327A = 0x7523
+0x327B = 0x95E1
+0x327C = 0x986B
+0x327D = 0x660C
+0x327E = 0x7316
+0x3321 = 0x5834
+0x3322 = 0x5617
+0x3323 = 0x5E38
+0x3324 = 0x9577
+0x3325 = 0x511F
+0x3326 = 0x8178
+0x3327 = 0x5EE0
+0x3328 = 0x655E
+0x3329 = 0x66A2
+0x332A = 0x5531
+0x332B = 0x5021
+0x332C = 0x8D85
+0x332D = 0x6284
+0x332E = 0x9214
+0x332F = 0x671D
+0x3330 = 0x5632
+0x3331 = 0x6F6E
+0x3332 = 0x5DE2
+0x3333 = 0x5435
+0x3334 = 0x7092
+0x3335 = 0x8ECA
+0x3336 = 0x626F
+0x3337 = 0x64A4
+0x3338 = 0x63A3
+0x3339 = 0x5FB9
+0x333A = 0x6F88
+0x333B = 0x90F4
+0x333C = 0x81E3
+0x333D = 0x8FB0
+0x333E = 0x5875
+0x333F = 0x6668
+0x3340 = 0x5FF1
+0x3341 = 0x6C89
+0x3342 = 0x9673
+0x3343 = 0x8D81
+0x3344 = 0x896F
+0x3345 = 0x6491
+0x3346 = 0x7A31
+0x3347 = 0x57CE
+0x3348 = 0x6A59
+0x3349 = 0x6210
+0x334A = 0x5448
+0x334B = 0x4E58
+0x334C = 0x7A0B
+0x334D = 0x61F2
+0x334E = 0x6F84
+0x334F = 0x8AA0
+0x3350 = 0x627F
+0x3351 = 0x901E
+0x3352 = 0x9A01
+0x3353 = 0x79E4
+0x3354 = 0x5403
+0x3355 = 0x75F4
+0x3356 = 0x6301
+0x3357 = 0x5319
+0x3358 = 0x6C60
+0x3359 = 0x9072
+0x335A = 0x5F1B
+0x335B = 0x99B3
+0x335C = 0x803B
+0x335D = 0x9F52
+0x335E = 0x4F88
+0x335F = 0x5C3A
+0x3360 = 0x8D64
+0x3361 = 0x7FC5
+0x3362 = 0x65A5
+0x3363 = 0x71BE
+0x3364 = 0x5145
+0x3365 = 0x885D
+0x3366 = 0x87F2
+0x3367 = 0x5D07
+0x3368 = 0x5BF5
+0x3369 = 0x62BD
+0x336A = 0x916C
+0x336B = 0x7587
+0x336C = 0x8E8A
+0x336D = 0x7A20
+0x336E = 0x6101
+0x336F = 0x7C4C
+0x3370 = 0x4EC7
+0x3371 = 0x7DA2
+0x3372 = 0x7785
+0x3373 = 0x919C
+0x3374 = 0x81ED
+0x3375 = 0x521D
+0x3376 = 0x51FA
+0x3377 = 0x6A71
+0x3378 = 0x53A8
+0x3379 = 0x8E87
+0x337A = 0x92E4
+0x337B = 0x96DB
+0x337C = 0x6EC1
+0x337D = 0x9664
+0x337E = 0x695A
+0x3421 = 0x790E
+0x3422 = 0x5132
+0x3423 = 0x77D7
+0x3424 = 0x6410
+0x3425 = 0x89F8
+0x3426 = 0x8655
+0x3427 = 0x63E3
+0x3428 = 0x5DDD
+0x3429 = 0x7A7F
+0x342A = 0x693D
+0x342B = 0x50B3
+0x342C = 0x8239
+0x342D = 0x5598
+0x342E = 0x4E32
+0x342F = 0x7621
+0x3430 = 0x7A97
+0x3431 = 0x5E62
+0x3432 = 0x5E8A
+0x3433 = 0x95D6
+0x3434 = 0x5275
+0x3435 = 0x5439
+0x3436 = 0x708A
+0x3437 = 0x6376
+0x3438 = 0x9318
+0x3439 = 0x5782
+0x343A = 0x6625
+0x343B = 0x693F
+0x343C = 0x9187
+0x343D = 0x5507
+0x343E = 0x6DF3
+0x343F = 0x7D14
+0x3440 = 0x8822
+0x3441 = 0x6233
+0x3442 = 0x7DBD
+0x3443 = 0x75B5
+0x3444 = 0x8328
+0x3445 = 0x78C1
+0x3446 = 0x96CC
+0x3447 = 0x8FAD
+0x3448 = 0x6148
+0x3449 = 0x74F7
+0x344A = 0x8A5E
+0x344B = 0x6B64
+0x344C = 0x523A
+0x344D = 0x8CDC
+0x344E = 0x6B21
+0x344F = 0x8070
+0x3450 = 0x8471
+0x3451 = 0x56F1
+0x3452 = 0x5306
+0x3453 = 0x5F9E
+0x3454 = 0x53E2
+0x3455 = 0x51D1
+0x3456 = 0x7C97
+0x3457 = 0x918B
+0x3458 = 0x7C07
+0x3459 = 0x4FC3
+0x345A = 0x8EA5
+0x345B = 0x7BE1
+0x345C = 0x7AC4
+0x345D = 0x6467
+0x345E = 0x5D14
+0x345F = 0x50AC
+0x3460 = 0x8106
+0x3461 = 0x7601
+0x3462 = 0x7CB9
+0x3463 = 0x6DEC
+0x3464 = 0x7FE0
+0x3465 = 0x6751
+0x3466 = 0x5B58
+0x3467 = 0x5BF8
+0x3468 = 0x78CB
+0x3469 = 0x64AE
+0x346A = 0x6413
+0x346B = 0x63AA
+0x346C = 0x632B
+0x346D = 0x932F
+0x346E = 0x642D
+0x346F = 0x9054
+0x3470 = 0x7B54
+0x3471 = 0x7629
+0x3472 = 0x6253
+0x3473 = 0x5927
+0x3474 = 0x5446
+0x3475 = 0x6B79
+0x3476 = 0x50A3
+0x3477 = 0x6234
+0x3478 = 0x5E36
+0x3479 = 0x6B86
+0x347A = 0x4EE3
+0x347B = 0x8CB8
+0x347C = 0x888B
+0x347D = 0x5F85
+0x347E = 0x902E
+0x3521 = 0x6020
+0x3522 = 0x803D
+0x3523 = 0x64D4
+0x3524 = 0x4E39
+0x3525 = 0x55AE
+0x3526 = 0x9132
+0x3527 = 0x64A3
+0x3528 = 0x81BD
+0x3529 = 0x65E6
+0x352A = 0x6C2E
+0x352B = 0x4F46
+0x352C = 0x619A
+0x352D = 0x6DE1
+0x352E = 0x8A95
+0x352F = 0x5F48
+0x3530 = 0x86CB
+0x3531 = 0x7576
+0x3532 = 0x64CB
+0x3533 = 0x9EE8
+0x3534 = 0x8569
+0x3535 = 0x6A94
+0x3536 = 0x5200
+0x3537 = 0x6417
+0x3538 = 0x8E48
+0x3539 = 0x5012
+0x353A = 0x5CF6
+0x353B = 0x79B1
+0x353C = 0x5C0E
+0x353D = 0x5230
+0x353E = 0x7A3B
+0x353F = 0x60BC
+0x3540 = 0x9053
+0x3541 = 0x76D7
+0x3542 = 0x5FB7
+0x3543 = 0x5F97
+0x3544 = 0x7684
+0x3545 = 0x8E6C
+0x3546 = 0x71C8
+0x3547 = 0x767B
+0x3548 = 0x7B49
+0x3549 = 0x77AA
+0x354A = 0x51F3
+0x354B = 0x9127
+0x354C = 0x5824
+0x354D = 0x4F4E
+0x354E = 0x6EF4
+0x354F = 0x8FEA
+0x3550 = 0x6575
+0x3551 = 0x7B1B
+0x3552 = 0x72C4
+0x3553 = 0x6ECC
+0x3554 = 0x7FDF
+0x3555 = 0x5AE1
+0x3556 = 0x62B5
+0x3557 = 0x5E95
+0x3558 = 0x5730
+0x3559 = 0x8482
+0x355A = 0x7B2C
+0x355B = 0x5E1D
+0x355C = 0x5F1F
+0x355D = 0x905E
+0x355E = 0x7DE0
+0x355F = 0x985B
+0x3560 = 0x6382
+0x3561 = 0x6EC7
+0x3562 = 0x7898
+0x3563 = 0x9EDE
+0x3564 = 0x5178
+0x3565 = 0x975B
+0x3566 = 0x588A
+0x3567 = 0x96FB
+0x3568 = 0x4F43
+0x3569 = 0x7538
+0x356A = 0x5E97
+0x356B = 0x60E6
+0x356C = 0x5960
+0x356D = 0x6FB1
+0x356E = 0x6BBF
+0x356F = 0x7889
+0x3570 = 0x53FC
+0x3571 = 0x96D5
+0x3572 = 0x51CB
+0x3573 = 0x5201
+0x3574 = 0x6389
+0x3575 = 0x540A
+0x3576 = 0x91E3
+0x3577 = 0x8ABF
+0x3578 = 0x8DCC
+0x3579 = 0x7239
+0x357A = 0x789F
+0x357B = 0x8776
+0x357C = 0x8FED
+0x357D = 0x8ADC
+0x357E = 0x758A
+0x3621 = 0x4E01
+0x3622 = 0x76EF
+0x3623 = 0x53EE
+0x3624 = 0x91D8
+0x3625 = 0x9802
+0x3626 = 0x9F0E
+0x3627 = 0x9320
+0x3628 = 0x5B9A
+0x3629 = 0x8A02
+0x362A = 0x4E22
+0x362B = 0x6771
+0x362C = 0x51AC
+0x362D = 0x8463
+0x362E = 0x61C2
+0x362F = 0x52D5
+0x3630 = 0x68DF
+0x3631 = 0x4F97
+0x3632 = 0x606B
+0x3633 = 0x51CD
+0x3634 = 0x6D1E
+0x3635 = 0x515C
+0x3636 = 0x6296
+0x3637 = 0x9B25
+0x3638 = 0x9661
+0x3639 = 0x8C46
+0x363A = 0x9017
+0x363B = 0x75D8
+0x363C = 0x90FD
+0x363D = 0x7763
+0x363E = 0x6BD2
+0x363F = 0x72A2
+0x3640 = 0x7368
+0x3641 = 0x8B80
+0x3642 = 0x5835
+0x3643 = 0x7779
+0x3644 = 0x8CED
+0x3645 = 0x675C
+0x3646 = 0x934D
+0x3647 = 0x809A
+0x3648 = 0x5EA6
+0x3649 = 0x6E21
+0x364A = 0x5992
+0x364B = 0x7AEF
+0x364C = 0x77ED
+0x364D = 0x935B
+0x364E = 0x6BB5
+0x364F = 0x65B7
+0x3650 = 0x7DDE
+0x3651 = 0x5806
+0x3652 = 0x5151
+0x3653 = 0x968A
+0x3654 = 0x5C0D
+0x3655 = 0x58A9
+0x3656 = 0x5678
+0x3657 = 0x8E72
+0x3658 = 0x6566
+0x3659 = 0x9813
+0x365A = 0x56E4
+0x365B = 0x920D
+0x365C = 0x76FE
+0x365D = 0x9041
+0x365E = 0x6387
+0x365F = 0x54C6
+0x3660 = 0x591A
+0x3661 = 0x596A
+0x3662 = 0x579B
+0x3663 = 0x8EB2
+0x3664 = 0x6735
+0x3665 = 0x8DFA
+0x3666 = 0x8235
+0x3667 = 0x5241
+0x3668 = 0x60F0
+0x3669 = 0x58AE
+0x366A = 0x86FE
+0x366B = 0x5CE8
+0x366C = 0x9D5D
+0x366D = 0x4FC4
+0x366E = 0x984D
+0x366F = 0x8A1B
+0x3670 = 0x5A25
+0x3671 = 0x60E1
+0x3672 = 0x5384
+0x3673 = 0x627C
+0x3674 = 0x904F
+0x3675 = 0x9102
+0x3676 = 0x9913
+0x3677 = 0x6069
+0x3678 = 0x800C
+0x3679 = 0x5152
+0x367A = 0x8033
+0x367B = 0x723E
+0x367C = 0x990C
+0x367D = 0x6D31
+0x367E = 0x4E8C
+0x3721 = 0x8CB3
+0x3722 = 0x767C
+0x3723 = 0x7F70
+0x3724 = 0x7B4F
+0x3725 = 0x4F10
+0x3726 = 0x4E4F
+0x3727 = 0x95A5
+0x3728 = 0x6CD5
+0x3729 = 0x73D0
+0x372A = 0x85E9
+0x372B = 0x5E06
+0x372C = 0x756A
+0x372D = 0x7FFB
+0x372E = 0x6A0A
+0x372F = 0x792C
+0x3730 = 0x91E9
+0x3731 = 0x7E41
+0x3732 = 0x51E1
+0x3733 = 0x7169
+0x3734 = 0x53CD
+0x3735 = 0x8FD4
+0x3736 = 0x7BC4
+0x3737 = 0x8CA9
+0x3738 = 0x72AF
+0x3739 = 0x98EF
+0x373A = 0x6CDB
+0x373B = 0x574A
+0x373C = 0x82B3
+0x373D = 0x65B9
+0x373E = 0x80AA
+0x373F = 0x623F
+0x3740 = 0x9632
+0x3741 = 0x59A8
+0x3742 = 0x4EFF
+0x3743 = 0x8A2A
+0x3744 = 0x7D21
+0x3745 = 0x653E
+0x3746 = 0x83F2
+0x3747 = 0x975E
+0x3748 = 0x5561
+0x3749 = 0x98DB
+0x374A = 0x80A5
+0x374B = 0x532A
+0x374C = 0x8AB9
+0x374D = 0x5420
+0x374E = 0x80BA
+0x374F = 0x5EE2
+0x3750 = 0x6CB8
+0x3751 = 0x8CBB
+0x3752 = 0x82AC
+0x3753 = 0x915A
+0x3754 = 0x5429
+0x3755 = 0x6C1B
+0x3756 = 0x5206
+0x3757 = 0x7D1B
+0x3758 = 0x58B3
+0x3759 = 0x711A
+0x375A = 0x6C7E
+0x375B = 0x7C89
+0x375C = 0x596E
+0x375D = 0x4EFD
+0x375E = 0x5FFF
+0x375F = 0x61A4
+0x3760 = 0x7CDE
+0x3761 = 0x8C50
+0x3762 = 0x5C01
+0x3763 = 0x6953
+0x3764 = 0x8702
+0x3765 = 0x5CF0
+0x3766 = 0x92D2
+0x3767 = 0x98A8
+0x3768 = 0x760B
+0x3769 = 0x70FD
+0x376A = 0x9022
+0x376B = 0x99AE
+0x376C = 0x7E2B
+0x376D = 0x8AF7
+0x376E = 0x5949
+0x376F = 0x9CF3
+0x3770 = 0x4F5B
+0x3771 = 0x5426
+0x3772 = 0x592B
+0x3773 = 0x6577
+0x3774 = 0x819A
+0x3775 = 0x5B75
+0x3776 = 0x6276
+0x3777 = 0x62C2
+0x3778 = 0x8F3B
+0x3779 = 0x5E45
+0x377A = 0x6C1F
+0x377B = 0x7B26
+0x377C = 0x4F0F
+0x377D = 0x4FD8
+0x377E = 0x670D
+0x3821 = 0x6D6E
+0x3822 = 0x6DAA
+0x3823 = 0x798F
+0x3824 = 0x88B1
+0x3825 = 0x5F17
+0x3826 = 0x752B
+0x3827 = 0x64AB
+0x3828 = 0x8F14
+0x3829 = 0x4FEF
+0x382A = 0x91DC
+0x382B = 0x65A7
+0x382C = 0x812F
+0x382D = 0x8151
+0x382E = 0x5E9C
+0x382F = 0x8150
+0x3830 = 0x8D74
+0x3831 = 0x526F
+0x3832 = 0x8986
+0x3833 = 0x8CE6
+0x3834 = 0x5FA9
+0x3835 = 0x5085
+0x3836 = 0x4ED8
+0x3837 = 0x961C
+0x3838 = 0x7236
+0x3839 = 0x8179
+0x383A = 0x8CA0
+0x383B = 0x5BCC
+0x383C = 0x8A03
+0x383D = 0x9644
+0x383E = 0x5A66
+0x383F = 0x7E1B
+0x3840 = 0x5490
+0x3841 = 0x5676
+0x3842 = 0x560E
+0x3843 = 0x8A72
+0x3844 = 0x6539
+0x3845 = 0x6982
+0x3846 = 0x9223
+0x3847 = 0x84CB
+0x3848 = 0x6E89
+0x3849 = 0x5E79
+0x384A = 0x7518
+0x384B = 0x6746
+0x384C = 0x67D1
+0x384D = 0x7AFF
+0x384E = 0x809D
+0x384F = 0x8D95
+0x3850 = 0x611F
+0x3851 = 0x79C6
+0x3852 = 0x6562
+0x3853 = 0x8D1B
+0x3854 = 0x5CA1
+0x3855 = 0x525B
+0x3856 = 0x92FC
+0x3857 = 0x7F38
+0x3858 = 0x809B
+0x3859 = 0x7DB1
+0x385A = 0x5D17
+0x385B = 0x6E2F
+0x385C = 0x6760
+0x385D = 0x7BD9
+0x385E = 0x768B
+0x385F = 0x9AD8
+0x3860 = 0x818F
+0x3861 = 0x7F94
+0x3862 = 0x7CD5
+0x3863 = 0x641E
+0x3864 = 0x93AC
+0x3865 = 0x7A3F
+0x3866 = 0x544A
+0x3867 = 0x54E5
+0x3868 = 0x6B4C
+0x3869 = 0x64F1
+0x386A = 0x6208
+0x386B = 0x9D3F
+0x386C = 0x80F3
+0x386D = 0x7599
+0x386E = 0x5272
+0x386F = 0x9769
+0x3870 = 0x845B
+0x3871 = 0x683C
+0x3872 = 0x86E4
+0x3873 = 0x95A3
+0x3874 = 0x9694
+0x3875 = 0x927B
+0x3876 = 0x500B
+0x3877 = 0x5404
+0x3878 = 0x7D66
+0x3879 = 0x6839
+0x387A = 0x8DDF
+0x387B = 0x8015
+0x387C = 0x66F4
+0x387D = 0x5E9A
+0x387E = 0x7FB9
+0x3921 = 0x57C2
+0x3922 = 0x803F
+0x3923 = 0x6897
+0x3924 = 0x5DE5
+0x3925 = 0x653B
+0x3926 = 0x529F
+0x3927 = 0x606D
+0x3928 = 0x9F94
+0x3929 = 0x4F9B
+0x392A = 0x8EAC
+0x392B = 0x516C
+0x392C = 0x5BAB
+0x392D = 0x5F13
+0x392E = 0x978F
+0x392F = 0x6C5E
+0x3930 = 0x62F1
+0x3931 = 0x8CA2
+0x3932 = 0x5171
+0x3933 = 0x920E
+0x3934 = 0x52FE
+0x3935 = 0x6E9D
+0x3936 = 0x82DF
+0x3937 = 0x72D7
+0x3938 = 0x57A2
+0x3939 = 0x69CB
+0x393A = 0x8CFC
+0x393B = 0x591F
+0x393C = 0x8F9C
+0x393D = 0x83C7
+0x393E = 0x5495
+0x393F = 0x7B8D
+0x3940 = 0x4F30
+0x3941 = 0x6CBD
+0x3942 = 0x5B64
+0x3943 = 0x59D1
+0x3944 = 0x9F13
+0x3945 = 0x53E4
+0x3946 = 0x8831
+0x3947 = 0x9AA8
+0x3948 = 0x8C37
+0x3949 = 0x80A1
+0x394A = 0x6545
+0x394B = 0x9867
+0x394C = 0x56FA
+0x394D = 0x96C7
+0x394E = 0x522E
+0x394F = 0x74DC
+0x3950 = 0x526E
+0x3951 = 0x5BE1
+0x3952 = 0x6302
+0x3953 = 0x8902
+0x3954 = 0x4E56
+0x3955 = 0x62D0
+0x3956 = 0x602A
+0x3957 = 0x68FA
+0x3958 = 0x95DC
+0x3959 = 0x5B98
+0x395A = 0x51A0
+0x395B = 0x89C0
+0x395C = 0x7BA1
+0x395D = 0x9928
+0x395E = 0x7F50
+0x395F = 0x6163
+0x3960 = 0x704C
+0x3961 = 0x8CAB
+0x3962 = 0x5149
+0x3963 = 0x5EE3
+0x3964 = 0x901B
+0x3965 = 0x7470
+0x3966 = 0x898F
+0x3967 = 0x572D
+0x3968 = 0x7845
+0x3969 = 0x6B78
+0x396A = 0x9F9C
+0x396B = 0x95A8
+0x396C = 0x8ECC
+0x396D = 0x9B3C
+0x396E = 0x8A6D
+0x396F = 0x7678
+0x3970 = 0x6842
+0x3971 = 0x6AC3
+0x3972 = 0x8DEA
+0x3973 = 0x8CB4
+0x3974 = 0x528A
+0x3975 = 0x8F25
+0x3976 = 0x6EDA
+0x3977 = 0x68CD
+0x3978 = 0x934B
+0x3979 = 0x90ED
+0x397A = 0x570B
+0x397B = 0x679C
+0x397C = 0x88F9
+0x397D = 0x904E
+0x397E = 0x54C8
+0x3A21 = 0x9AB8
+0x3A22 = 0x5B69
+0x3A23 = 0x6D77
+0x3A24 = 0x6C26
+0x3A25 = 0x4EA5
+0x3A26 = 0x5BB3
+0x3A27 = 0x99ED
+0x3A28 = 0x9163
+0x3A29 = 0x61A8
+0x3A2A = 0x90AF
+0x3A2B = 0x97D3
+0x3A2C = 0x542B
+0x3A2D = 0x6DB5
+0x3A2E = 0x5BD2
+0x3A2F = 0x51FD
+0x3A30 = 0x558A
+0x3A31 = 0x7F55
+0x3A32 = 0x7FF0
+0x3A33 = 0x64BC
+0x3A34 = 0x634D
+0x3A35 = 0x65F1
+0x3A36 = 0x61BE
+0x3A37 = 0x608D
+0x3A38 = 0x710A
+0x3A39 = 0x6C57
+0x3A3A = 0x6F22
+0x3A3B = 0x592F
+0x3A3C = 0x676D
+0x3A3D = 0x822A
+0x3A3E = 0x58D5
+0x3A3F = 0x568E
+0x3A40 = 0x8C6A
+0x3A41 = 0x6BEB
+0x3A42 = 0x90DD
+0x3A43 = 0x597D
+0x3A44 = 0x8017
+0x3A45 = 0x865F
+0x3A46 = 0x6D69
+0x3A47 = 0x5475
+0x3A48 = 0x559D
+0x3A49 = 0x8377
+0x3A4A = 0x83CF
+0x3A4B = 0x6838
+0x3A4C = 0x79BE
+0x3A4D = 0x548C
+0x3A4E = 0x4F55
+0x3A4F = 0x5408
+0x3A50 = 0x76D2
+0x3A51 = 0x8C89
+0x3A52 = 0x95A1
+0x3A53 = 0x6CB3
+0x3A54 = 0x6DB8
+0x3A55 = 0x8D6B
+0x3A56 = 0x8910
+0x3A57 = 0x9DB4
+0x3A58 = 0x8CC0
+0x3A59 = 0x563F
+0x3A5A = 0x9ED1
+0x3A5B = 0x75D5
+0x3A5C = 0x5F88
+0x3A5D = 0x72E0
+0x3A5E = 0x6068
+0x3A5F = 0x54FC
+0x3A60 = 0x4EA8
+0x3A61 = 0x6A2A
+0x3A62 = 0x8861
+0x3A63 = 0x6052
+0x3A64 = 0x8F5F
+0x3A65 = 0x54C4
+0x3A66 = 0x70D8
+0x3A67 = 0x8679
+0x3A68 = 0x9D3B
+0x3A69 = 0x6D2A
+0x3A6A = 0x5B8F
+0x3A6B = 0x5F18
+0x3A6C = 0x7D05
+0x3A6D = 0x5589
+0x3A6E = 0x4FAF
+0x3A6F = 0x7334
+0x3A70 = 0x543C
+0x3A71 = 0x539A
+0x3A72 = 0x5019
+0x3A73 = 0x5F8C
+0x3A74 = 0x547C
+0x3A75 = 0x4E4E
+0x3A76 = 0x5FFD
+0x3A77 = 0x745A
+0x3A78 = 0x58FA
+0x3A79 = 0x846B
+0x3A7A = 0x80E1
+0x3A7B = 0x8774
+0x3A7C = 0x72D0
+0x3A7D = 0x7CCA
+0x3A7E = 0x6E56
+0x3B21 = 0x5F27
+0x3B22 = 0x864E
+0x3B23 = 0x552C
+0x3B24 = 0x8B77
+0x3B25 = 0x4E92
+0x3B26 = 0x6EEC
+0x3B27 = 0x6237
+0x3B28 = 0x82B1
+0x3B29 = 0x5629
+0x3B2A = 0x83EF
+0x3B2B = 0x733E
+0x3B2C = 0x6ED1
+0x3B2D = 0x756B
+0x3B2E = 0x5283
+0x3B2F = 0x5316
+0x3B30 = 0x8A71
+0x3B31 = 0x69D0
+0x3B32 = 0x5F8A
+0x3B33 = 0x61F7
+0x3B34 = 0x6DEE
+0x3B35 = 0x58DE
+0x3B36 = 0x6B61
+0x3B37 = 0x74B0
+0x3B38 = 0x6853
+0x3B39 = 0x9084
+0x3B3A = 0x7DE9
+0x3B3B = 0x63DB
+0x3B3C = 0x60A3
+0x3B3D = 0x559A
+0x3B3E = 0x7613
+0x3B3F = 0x8C62
+0x3B40 = 0x7165
+0x3B41 = 0x6E19
+0x3B42 = 0x5BA6
+0x3B43 = 0x5E7B
+0x3B44 = 0x8352
+0x3B45 = 0x614C
+0x3B46 = 0x9EC4
+0x3B47 = 0x78FA
+0x3B48 = 0x8757
+0x3B49 = 0x7C27
+0x3B4A = 0x7687
+0x3B4B = 0x51F0
+0x3B4C = 0x60F6
+0x3B4D = 0x714C
+0x3B4E = 0x6643
+0x3B4F = 0x5E4C
+0x3B50 = 0x604D
+0x3B51 = 0x8B0A
+0x3B52 = 0x7070
+0x3B53 = 0x63EE
+0x3B54 = 0x8F1D
+0x3B55 = 0x5FBD
+0x3B56 = 0x6062
+0x3B57 = 0x86D4
+0x3B58 = 0x56DE
+0x3B59 = 0x6BC1
+0x3B5A = 0x6094
+0x3B5B = 0x6167
+0x3B5C = 0x5349
+0x3B5D = 0x60E0
+0x3B5E = 0x6666
+0x3B5F = 0x8CC4
+0x3B60 = 0x7A62
+0x3B61 = 0x6703
+0x3B62 = 0x71F4
+0x3B63 = 0x532F
+0x3B64 = 0x8AF1
+0x3B65 = 0x8AA8
+0x3B66 = 0x7E6A
+0x3B67 = 0x8477
+0x3B68 = 0x660F
+0x3B69 = 0x5A5A
+0x3B6A = 0x9B42
+0x3B6B = 0x6E3E
+0x3B6C = 0x6DF7
+0x3B6D = 0x8C41
+0x3B6E = 0x6D3B
+0x3B6F = 0x4F19
+0x3B70 = 0x706B
+0x3B71 = 0x7372
+0x3B72 = 0x6216
+0x3B73 = 0x60D1
+0x3B74 = 0x970D
+0x3B75 = 0x8CA8
+0x3B76 = 0x798D
+0x3B77 = 0x64CA
+0x3B78 = 0x573E
+0x3B79 = 0x57FA
+0x3B7A = 0x6A5F
+0x3B7B = 0x7578
+0x3B7C = 0x7A3D
+0x3B7D = 0x7A4D
+0x3B7E = 0x7B95
+0x3C21 = 0x808C
+0x3C22 = 0x9951
+0x3C23 = 0x8FF9
+0x3C24 = 0x6FC0
+0x3C25 = 0x8B4F
+0x3C26 = 0x9DC4
+0x3C27 = 0x59EC
+0x3C28 = 0x7E3E
+0x3C29 = 0x7DDD
+0x3C2A = 0x5409
+0x3C2B = 0x6975
+0x3C2C = 0x68D8
+0x3C2D = 0x8F2F
+0x3C2E = 0x7C4D
+0x3C2F = 0x96C6
+0x3C30 = 0x53CA
+0x3C31 = 0x6025
+0x3C32 = 0x75BE
+0x3C33 = 0x6C72
+0x3C34 = 0x5373
+0x3C35 = 0x5AC9
+0x3C36 = 0x7D1A
+0x3C37 = 0x64E0
+0x3C38 = 0x5E7E
+0x3C39 = 0x810A
+0x3C3A = 0x5DF1
+0x3C3B = 0x858A
+0x3C3C = 0x6280
+0x3C3D = 0x5180
+0x3C3E = 0x5B63
+0x3C3F = 0x4F0E
+0x3C40 = 0x796D
+0x3C41 = 0x5291
+0x3C42 = 0x60B8
+0x3C43 = 0x6FDF
+0x3C44 = 0x5BC4
+0x3C45 = 0x5BC2
+0x3C46 = 0x8A08
+0x3C47 = 0x8A18
+0x3C48 = 0x65E2
+0x3C49 = 0x5FCC
+0x3C4A = 0x969B
+0x3C4B = 0x5993
+0x3C4C = 0x7E7C
+0x3C4D = 0x7D00
+0x3C4E = 0x5609
+0x3C4F = 0x67B7
+0x3C50 = 0x593E
+0x3C51 = 0x4F73
+0x3C52 = 0x5BB6
+0x3C53 = 0x52A0
+0x3C54 = 0x83A2
+0x3C55 = 0x9830
+0x3C56 = 0x8CC8
+0x3C57 = 0x7532
+0x3C58 = 0x9240
+0x3C59 = 0x5047
+0x3C5A = 0x7A3C
+0x3C5B = 0x50F9
+0x3C5C = 0x67B6
+0x3C5D = 0x99D5
+0x3C5E = 0x5AC1
+0x3C5F = 0x6BB2
+0x3C60 = 0x76E3
+0x3C61 = 0x5805
+0x3C62 = 0x5C16
+0x3C63 = 0x7B8B
+0x3C64 = 0x9593
+0x3C65 = 0x714E
+0x3C66 = 0x517C
+0x3C67 = 0x80A9
+0x3C68 = 0x8271
+0x3C69 = 0x5978
+0x3C6A = 0x7DD8
+0x3C6B = 0x7E6D
+0x3C6C = 0x6AA2
+0x3C6D = 0x67EC
+0x3C6E = 0x78B1
+0x3C6F = 0x9E7C
+0x3C70 = 0x63C0
+0x3C71 = 0x64BF
+0x3C72 = 0x7C21
+0x3C73 = 0x5109
+0x3C74 = 0x526A
+0x3C75 = 0x51CF
+0x3C76 = 0x85A6
+0x3C77 = 0x6ABB
+0x3C78 = 0x9452
+0x3C79 = 0x8E10
+0x3C7A = 0x8CE4
+0x3C7B = 0x898B
+0x3C7C = 0x9375
+0x3C7D = 0x7BAD
+0x3C7E = 0x4EF6
+0x3D21 = 0x5065
+0x3D22 = 0x8266
+0x3D23 = 0x528D
+0x3D24 = 0x991E
+0x3D25 = 0x6F38
+0x3D26 = 0x6FFA
+0x3D27 = 0x6F97
+0x3D28 = 0x5EFA
+0x3D29 = 0x50F5
+0x3D2A = 0x59DC
+0x3D2B = 0x5C07
+0x3D2C = 0x6F3F
+0x3D2D = 0x6C5F
+0x3D2E = 0x7586
+0x3D2F = 0x8523
+0x3D30 = 0x69F3
+0x3D31 = 0x596C
+0x3D32 = 0x8B1B
+0x3D33 = 0x5320
+0x3D34 = 0x91AC
+0x3D35 = 0x964D
+0x3D36 = 0x8549
+0x3D37 = 0x6912
+0x3D38 = 0x7901
+0x3D39 = 0x7126
+0x3D3A = 0x81A0
+0x3D3B = 0x4EA4
+0x3D3C = 0x90CA
+0x3D3D = 0x6F86
+0x3D3E = 0x9A55
+0x3D3F = 0x5B0C
+0x3D40 = 0x56BC
+0x3D41 = 0x652A
+0x3D42 = 0x9278
+0x3D43 = 0x77EF
+0x3D44 = 0x50E5
+0x3D45 = 0x811A
+0x3D46 = 0x72E1
+0x3D47 = 0x89D2
+0x3D48 = 0x9903
+0x3D49 = 0x7E73
+0x3D4A = 0x7D5E
+0x3D4B = 0x527F
+0x3D4C = 0x6559
+0x3D4D = 0x9175
+0x3D4E = 0x8F4E
+0x3D4F = 0x8F03
+0x3D50 = 0x53EB
+0x3D51 = 0x7A96
+0x3D52 = 0x63ED
+0x3D53 = 0x63A5
+0x3D54 = 0x7686
+0x3D55 = 0x79F8
+0x3D56 = 0x8857
+0x3D57 = 0x968E
+0x3D58 = 0x622A
+0x3D59 = 0x52AB
+0x3D5A = 0x7BC0
+0x3D5B = 0x6854
+0x3D5C = 0x6770
+0x3D5D = 0x6377
+0x3D5E = 0x776B
+0x3D5F = 0x7AED
+0x3D60 = 0x6F54
+0x3D61 = 0x7D50
+0x3D62 = 0x89E3
+0x3D63 = 0x59D0
+0x3D64 = 0x6212
+0x3D65 = 0x85C9
+0x3D66 = 0x82A5
+0x3D67 = 0x754C
+0x3D68 = 0x501F
+0x3D69 = 0x4ECB
+0x3D6A = 0x75A5
+0x3D6B = 0x8AA1
+0x3D6C = 0x5C4A
+0x3D6D = 0x5DFE
+0x3D6E = 0x7B4B
+0x3D6F = 0x65A4
+0x3D70 = 0x91D1
+0x3D71 = 0x4ECA
+0x3D72 = 0x6D25
+0x3D73 = 0x895F
+0x3D74 = 0x7DCA
+0x3D75 = 0x9326
+0x3D76 = 0x50C5
+0x3D77 = 0x8B39
+0x3D78 = 0x9032
+0x3D79 = 0x9773
+0x3D7A = 0x6649
+0x3D7B = 0x7981
+0x3D7C = 0x8FD1
+0x3D7D = 0x71FC
+0x3D7E = 0x6D78
+0x3E21 = 0x76E1
+0x3E22 = 0x52C1
+0x3E23 = 0x8346
+0x3E24 = 0x5162
+0x3E25 = 0x8396
+0x3E26 = 0x775B
+0x3E27 = 0x6676
+0x3E28 = 0x9BE8
+0x3E29 = 0x4EAC
+0x3E2A = 0x9A5A
+0x3E2B = 0x7CBE
+0x3E2C = 0x7CB3
+0x3E2D = 0x7D93
+0x3E2E = 0x4E95
+0x3E2F = 0x8B66
+0x3E30 = 0x666F
+0x3E31 = 0x9838
+0x3E32 = 0x975C
+0x3E33 = 0x5883
+0x3E34 = 0x656C
+0x3E35 = 0x93E1
+0x3E36 = 0x5F91
+0x3E37 = 0x75D9
+0x3E38 = 0x9756
+0x3E39 = 0x7ADF
+0x3E3A = 0x7AF6
+0x3E3B = 0x51C8
+0x3E3C = 0x70AF
+0x3E3D = 0x7A98
+0x3E3E = 0x63EA
+0x3E3F = 0x7A76
+0x3E40 = 0x7CFE
+0x3E41 = 0x7396
+0x3E42 = 0x97ED
+0x3E43 = 0x4E45
+0x3E44 = 0x7078
+0x3E45 = 0x4E5D
+0x3E46 = 0x9152
+0x3E47 = 0x53A9
+0x3E48 = 0x6551
+0x3E49 = 0x820A
+0x3E4A = 0x81FC
+0x3E4B = 0x8205
+0x3E4C = 0x548E
+0x3E4D = 0x5C31
+0x3E4E = 0x759A
+0x3E4F = 0x97A0
+0x3E50 = 0x62D8
+0x3E51 = 0x72D9
+0x3E52 = 0x75BD
+0x3E53 = 0x5C45
+0x3E54 = 0x99D2
+0x3E55 = 0x83CA
+0x3E56 = 0x5C40
+0x3E57 = 0x5480
+0x3E58 = 0x77E9
+0x3E59 = 0x8209
+0x3E5A = 0x6CAE
+0x3E5B = 0x805A
+0x3E5C = 0x62D2
+0x3E5D = 0x64DA
+0x3E5E = 0x5DE8
+0x3E5F = 0x5177
+0x3E60 = 0x8DDD
+0x3E61 = 0x8E1E
+0x3E62 = 0x92F8
+0x3E63 = 0x4FF1
+0x3E64 = 0x53E5
+0x3E65 = 0x61FC
+0x3E66 = 0x70AC
+0x3E67 = 0x5287
+0x3E68 = 0x6350
+0x3E69 = 0x9D51
+0x3E6A = 0x5A1F
+0x3E6B = 0x5026
+0x3E6C = 0x7737
+0x3E6D = 0x5377
+0x3E6E = 0x7D79
+0x3E6F = 0x6485
+0x3E70 = 0x652B
+0x3E71 = 0x6289
+0x3E72 = 0x6398
+0x3E73 = 0x5014
+0x3E74 = 0x7235
+0x3E75 = 0x89BA
+0x3E76 = 0x51B3
+0x3E77 = 0x8A23
+0x3E78 = 0x7D76
+0x3E79 = 0x5747
+0x3E7A = 0x83CC
+0x3E7B = 0x921E
+0x3E7C = 0x8ECD
+0x3E7D = 0x541B
+0x3E7E = 0x5CFB
+0x3F21 = 0x4FCA
+0x3F22 = 0x7AE3
+0x3F23 = 0x6D5A
+0x3F24 = 0x90E1
+0x3F25 = 0x99FF
+0x3F26 = 0x5580
+0x3F27 = 0x5496
+0x3F28 = 0x5361
+0x3F29 = 0x54AF
+0x3F2A = 0x958B
+0x3F2B = 0x63E9
+0x3F2C = 0x6977
+0x3F2D = 0x51F1
+0x3F2E = 0x6168
+0x3F2F = 0x520A
+0x3F30 = 0x582A
+0x3F31 = 0x52D8
+0x3F32 = 0x574E
+0x3F33 = 0x780D
+0x3F34 = 0x770B
+0x3F35 = 0x5EB7
+0x3F36 = 0x6177
+0x3F37 = 0x7CE0
+0x3F38 = 0x625B
+0x3F39 = 0x6297
+0x3F3A = 0x4EA2
+0x3F3B = 0x7095
+0x3F3C = 0x8003
+0x3F3D = 0x62F7
+0x3F3E = 0x70E4
+0x3F3F = 0x9760
+0x3F40 = 0x5777
+0x3F41 = 0x82DB
+0x3F42 = 0x67EF
+0x3F43 = 0x68F5
+0x3F44 = 0x78D5
+0x3F45 = 0x9846
+0x3F46 = 0x79D1
+0x3F47 = 0x6BBB
+0x3F48 = 0x54B3
+0x3F49 = 0x53EF
+0x3F4A = 0x6E34
+0x3F4B = 0x514B
+0x3F4C = 0x523B
+0x3F4D = 0x5BA2
+0x3F4E = 0x8AB2
+0x3F4F = 0x80AF
+0x3F50 = 0x5543
+0x3F51 = 0x58BE
+0x3F52 = 0x61C7
+0x3F53 = 0x5751
+0x3F54 = 0x542D
+0x3F55 = 0x7A7A
+0x3F56 = 0x6050
+0x3F57 = 0x5B54
+0x3F58 = 0x63A7
+0x3F59 = 0x6473
+0x3F5A = 0x53E3
+0x3F5B = 0x6263
+0x3F5C = 0x5BC7
+0x3F5D = 0x67AF
+0x3F5E = 0x54ED
+0x3F5F = 0x7A9F
+0x3F60 = 0x82E6
+0x3F61 = 0x9177
+0x3F62 = 0x5EAB
+0x3F63 = 0x8932
+0x3F64 = 0x8A87
+0x3F65 = 0x57AE
+0x3F66 = 0x630E
+0x3F67 = 0x8DE8
+0x3F68 = 0x80EF
+0x3F69 = 0x584A
+0x3F6A = 0x7B77
+0x3F6B = 0x5108
+0x3F6C = 0x5FEB
+0x3F6D = 0x5BEC
+0x3F6E = 0x6B3E
+0x3F6F = 0x5321
+0x3F70 = 0x7B50
+0x3F71 = 0x72C2
+0x3F72 = 0x6846
+0x3F73 = 0x7926
+0x3F74 = 0x7736
+0x3F75 = 0x66E0
+0x3F76 = 0x51B5
+0x3F77 = 0x8667
+0x3F78 = 0x76D4
+0x3F79 = 0x5DCB
+0x3F7A = 0x7ABA
+0x3F7B = 0x8475
+0x3F7C = 0x594E
+0x3F7D = 0x9B41
+0x3F7E = 0x5080
+0x4021 = 0x994B
+0x4022 = 0x6127
+0x4023 = 0x6F70
+0x4024 = 0x5764
+0x4025 = 0x6606
+0x4026 = 0x6346
+0x4027 = 0x56F0
+0x4028 = 0x62EC
+0x4029 = 0x64F4
+0x402A = 0x5ED3
+0x402B = 0x95CA
+0x402C = 0x5783
+0x402D = 0x62C9
+0x402E = 0x5587
+0x402F = 0x881F
+0x4030 = 0x81D8
+0x4031 = 0x8FA3
+0x4032 = 0x5566
+0x4033 = 0x840A
+0x4034 = 0x4F86
+0x4035 = 0x8CF4
+0x4036 = 0x85CD
+0x4037 = 0x5A6A
+0x4038 = 0x6B04
+0x4039 = 0x6514
+0x403A = 0x7C43
+0x403B = 0x95CC
+0x403C = 0x862D
+0x403D = 0x703E
+0x403E = 0x8B95
+0x403F = 0x652C
+0x4040 = 0x89BD
+0x4041 = 0x61F6
+0x4042 = 0x7E9C
+0x4043 = 0x721B
+0x4044 = 0x6FEB
+0x4045 = 0x7405
+0x4046 = 0x6994
+0x4047 = 0x72FC
+0x4048 = 0x5ECA
+0x4049 = 0x90CE
+0x404A = 0x6717
+0x404B = 0x6D6A
+0x404C = 0x6488
+0x404D = 0x52DE
+0x404E = 0x7262
+0x404F = 0x8001
+0x4050 = 0x4F6C
+0x4051 = 0x59E5
+0x4052 = 0x916A
+0x4053 = 0x70D9
+0x4054 = 0x6F87
+0x4055 = 0x52D2
+0x4056 = 0x6A02
+0x4057 = 0x96F7
+0x4058 = 0x9433
+0x4059 = 0x857E
+0x405A = 0x78CA
+0x405B = 0x7D2F
+0x405C = 0x5121
+0x405D = 0x58D8
+0x405E = 0x64C2
+0x405F = 0x808B
+0x4060 = 0x985E
+0x4061 = 0x6CEA
+0x4062 = 0x68F1
+0x4063 = 0x695E
+0x4064 = 0x51B7
+0x4065 = 0x5398
+0x4066 = 0x68A8
+0x4067 = 0x7281
+0x4068 = 0x9ECE
+0x4069 = 0x7C6C
+0x406A = 0x72F8
+0x406B = 0x96E2
+0x406C = 0x7055
+0x406D = 0x7406
+0x406E = 0x674E
+0x406F = 0x88CF
+0x4070 = 0x9BC9
+0x4071 = 0x79AE
+0x4072 = 0x8389
+0x4073 = 0x8354
+0x4074 = 0x540F
+0x4075 = 0x6817
+0x4076 = 0x9E97
+0x4077 = 0x53B2
+0x4078 = 0x52F5
+0x4079 = 0x792B
+0x407A = 0x6B77
+0x407B = 0x5229
+0x407C = 0x5088
+0x407D = 0x4F8B
+0x407E = 0x4FD0
+0x4121 = 0x75E2
+0x4122 = 0x7ACB
+0x4123 = 0x7C92
+0x4124 = 0x701D
+0x4125 = 0x96B8
+0x4126 = 0x529B
+0x4127 = 0x7483
+0x4128 = 0x54E9
+0x4129 = 0x5006
+0x412A = 0x806F
+0x412B = 0x84EE
+0x412C = 0x9023
+0x412D = 0x942E
+0x412E = 0x5EC9
+0x412F = 0x6190
+0x4130 = 0x6F23
+0x4131 = 0x7C3E
+0x4132 = 0x6582
+0x4133 = 0x81C9
+0x4134 = 0x93C8
+0x4135 = 0x6200
+0x4136 = 0x7149
+0x4137 = 0x7DF4
+0x4138 = 0x7CE7
+0x4139 = 0x51C9
+0x413A = 0x6881
+0x413B = 0x7CB1
+0x413C = 0x826F
+0x413D = 0x5169
+0x413E = 0x8F1B
+0x413F = 0x91CF
+0x4140 = 0x667E
+0x4141 = 0x4EAE
+0x4142 = 0x8AD2
+0x4143 = 0x64A9
+0x4144 = 0x804A
+0x4145 = 0x50DA
+0x4146 = 0x7642
+0x4147 = 0x71CE
+0x4148 = 0x5BE5
+0x4149 = 0x907C
+0x414A = 0x6F66
+0x414B = 0x4E86
+0x414C = 0x6482
+0x414D = 0x9410
+0x414E = 0x5ED6
+0x414F = 0x6599
+0x4150 = 0x5217
+0x4151 = 0x88C2
+0x4152 = 0x70C8
+0x4153 = 0x52A3
+0x4154 = 0x7375
+0x4155 = 0x7433
+0x4156 = 0x6797
+0x4157 = 0x78F7
+0x4158 = 0x9716
+0x4159 = 0x81E8
+0x415A = 0x9130
+0x415B = 0x9C57
+0x415C = 0x6DCB
+0x415D = 0x51DB
+0x415E = 0x8CC3
+0x415F = 0x541D
+0x4160 = 0x62CE
+0x4161 = 0x73B2
+0x4162 = 0x83F1
+0x4163 = 0x96F6
+0x4164 = 0x9F61
+0x4165 = 0x9234
+0x4166 = 0x4F36
+0x4167 = 0x7F9A
+0x4168 = 0x51CC
+0x4169 = 0x9748
+0x416A = 0x9675
+0x416B = 0x5DBA
+0x416C = 0x9818
+0x416D = 0x53E6
+0x416E = 0x4EE4
+0x416F = 0x6E9C
+0x4170 = 0x7409
+0x4171 = 0x69B4
+0x4172 = 0x786B
+0x4173 = 0x993E
+0x4174 = 0x7559
+0x4175 = 0x5289
+0x4176 = 0x7624
+0x4177 = 0x6D41
+0x4178 = 0x67F3
+0x4179 = 0x516D
+0x417A = 0x9F8D
+0x417B = 0x807E
+0x417C = 0x56A8
+0x417D = 0x7C60
+0x417E = 0x7ABF
+0x4221 = 0x9686
+0x4222 = 0x58DF
+0x4223 = 0x650F
+0x4224 = 0x96B4
+0x4225 = 0x6A13
+0x4226 = 0x5A41
+0x4227 = 0x645F
+0x4228 = 0x7C0D
+0x4229 = 0x6F0F
+0x422A = 0x964B
+0x422B = 0x8606
+0x422C = 0x76E7
+0x422D = 0x9871
+0x422E = 0x5EEC
+0x422F = 0x7210
+0x4230 = 0x64C4
+0x4231 = 0x6EF7
+0x4232 = 0x865C
+0x4233 = 0x9B6F
+0x4234 = 0x9E93
+0x4235 = 0x788C
+0x4236 = 0x9732
+0x4237 = 0x8DEF
+0x4238 = 0x8CC2
+0x4239 = 0x9E7F
+0x423A = 0x6F5E
+0x423B = 0x7984
+0x423C = 0x9332
+0x423D = 0x9678
+0x423E = 0x622E
+0x423F = 0x9A62
+0x4240 = 0x5415
+0x4241 = 0x92C1
+0x4242 = 0x4FA3
+0x4243 = 0x65C5
+0x4244 = 0x5C65
+0x4245 = 0x5C62
+0x4246 = 0x7E37
+0x4247 = 0x616E
+0x4248 = 0x6C2F
+0x4249 = 0x5F8B
+0x424A = 0x7387
+0x424B = 0x6FFE
+0x424C = 0x7DD1
+0x424D = 0x5DD2
+0x424E = 0x6523
+0x424F = 0x5B7F
+0x4250 = 0x7064
+0x4251 = 0x5375
+0x4252 = 0x4E82
+0x4253 = 0x63A0
+0x4254 = 0x7565
+0x4255 = 0x6384
+0x4256 = 0x8F2A
+0x4257 = 0x502B
+0x4258 = 0x4F96
+0x4259 = 0x6DEA
+0x425A = 0x7DB8
+0x425B = 0x8AD6
+0x425C = 0x863F
+0x425D = 0x87BA
+0x425E = 0x7F85
+0x425F = 0x908F
+0x4260 = 0x947C
+0x4261 = 0x7C6E
+0x4262 = 0x9A3E
+0x4263 = 0x88F8
+0x4264 = 0x843D
+0x4265 = 0x6D1B
+0x4266 = 0x99F1
+0x4267 = 0x7D61
+0x4268 = 0x5ABD
+0x4269 = 0x9EBB
+0x426A = 0x746A
+0x426B = 0x78BC
+0x426C = 0x879E
+0x426D = 0x99AC
+0x426E = 0x99E1
+0x426F = 0x561B
+0x4270 = 0x55CE
+0x4271 = 0x57CB
+0x4272 = 0x8CB7
+0x4273 = 0x9EA5
+0x4274 = 0x8CE3
+0x4275 = 0x9081
+0x4276 = 0x8109
+0x4277 = 0x779E
+0x4278 = 0x9945
+0x4279 = 0x883B
+0x427A = 0x6EFF
+0x427B = 0x8513
+0x427C = 0x66FC
+0x427D = 0x6162
+0x427E = 0x6F2B
+0x4321 = 0x8B3E
+0x4322 = 0x8292
+0x4323 = 0x832B
+0x4324 = 0x76F2
+0x4325 = 0x6C13
+0x4326 = 0x5FD9
+0x4327 = 0x83BD
+0x4328 = 0x732B
+0x4329 = 0x8305
+0x432A = 0x9328
+0x432B = 0x6BDB
+0x432C = 0x77DB
+0x432D = 0x925A
+0x432E = 0x536F
+0x432F = 0x8302
+0x4330 = 0x5192
+0x4331 = 0x5E3D
+0x4332 = 0x8C8C
+0x4333 = 0x8CBF
+0x4334 = 0x9EBD
+0x4335 = 0x73AB
+0x4336 = 0x679A
+0x4337 = 0x6885
+0x4338 = 0x9176
+0x4339 = 0x9709
+0x433A = 0x7164
+0x433B = 0x6CA1
+0x433C = 0x7709
+0x433D = 0x5A92
+0x433E = 0x9382
+0x433F = 0x6BCF
+0x4340 = 0x7F8E
+0x4341 = 0x6627
+0x4342 = 0x5BD0
+0x4343 = 0x59B9
+0x4344 = 0x5A9A
+0x4345 = 0x9580
+0x4346 = 0x60B6
+0x4347 = 0x5011
+0x4348 = 0x840C
+0x4349 = 0x8499
+0x434A = 0x6AAC
+0x434B = 0x76DF
+0x434C = 0x9333
+0x434D = 0x731B
+0x434E = 0x5922
+0x434F = 0x5B5F
+0x4350 = 0x772F
+0x4351 = 0x919A
+0x4352 = 0x9761
+0x4353 = 0x7CDC
+0x4354 = 0x8FF7
+0x4355 = 0x8B0E
+0x4356 = 0x5F4C
+0x4357 = 0x7C73
+0x4358 = 0x79D8
+0x4359 = 0x8993
+0x435A = 0x6CCC
+0x435B = 0x871C
+0x435C = 0x5BC6
+0x435D = 0x5E42
+0x435E = 0x68C9
+0x435F = 0x7720
+0x4360 = 0x7DBF
+0x4361 = 0x5195
+0x4362 = 0x514D
+0x4363 = 0x52C9
+0x4364 = 0x5A29
+0x4365 = 0x7DEC
+0x4366 = 0x9762
+0x4367 = 0x82D7
+0x4368 = 0x63CF
+0x4369 = 0x7784
+0x436A = 0x85D0
+0x436B = 0x79D2
+0x436C = 0x6E3A
+0x436D = 0x5EDF
+0x436E = 0x5999
+0x436F = 0x8511
+0x4370 = 0x6EC5
+0x4371 = 0x6C11
+0x4372 = 0x62BF
+0x4373 = 0x76BF
+0x4374 = 0x654F
+0x4375 = 0x61AB
+0x4376 = 0x95A9
+0x4377 = 0x660E
+0x4378 = 0x879F
+0x4379 = 0x9CF4
+0x437A = 0x9298
+0x437B = 0x540D
+0x437C = 0x547D
+0x437D = 0x8B2C
+0x437E = 0x6478
+0x4421 = 0x6479
+0x4422 = 0x8611
+0x4423 = 0x6A21
+0x4424 = 0x819C
+0x4425 = 0x78E8
+0x4426 = 0x6469
+0x4427 = 0x9B54
+0x4428 = 0x62B9
+0x4429 = 0x672B
+0x442A = 0x83AB
+0x442B = 0x58A8
+0x442C = 0x9ED8
+0x442D = 0x6CAB
+0x442E = 0x6F20
+0x442F = 0x5BDE
+0x4430 = 0x964C
+0x4431 = 0x8B00
+0x4432 = 0x725F
+0x4433 = 0x67D0
+0x4434 = 0x62C7
+0x4435 = 0x7261
+0x4436 = 0x755D
+0x4437 = 0x59C6
+0x4438 = 0x6BCD
+0x4439 = 0x5893
+0x443A = 0x66AE
+0x443B = 0x5E55
+0x443C = 0x52DF
+0x443D = 0x6155
+0x443E = 0x6728
+0x443F = 0x76EE
+0x4440 = 0x7766
+0x4441 = 0x7267
+0x4442 = 0x7A46
+0x4443 = 0x62FF
+0x4444 = 0x54EA
+0x4445 = 0x5450
+0x4446 = 0x9209
+0x4447 = 0x90A3
+0x4448 = 0x5A1C
+0x4449 = 0x7D0D
+0x444A = 0x6C16
+0x444B = 0x4E43
+0x444C = 0x5976
+0x444D = 0x8010
+0x444E = 0x5948
+0x444F = 0x5357
+0x4450 = 0x7537
+0x4451 = 0x96E3
+0x4452 = 0x56CA
+0x4453 = 0x6493
+0x4454 = 0x8166
+0x4455 = 0x60F1
+0x4456 = 0x9B27
+0x4457 = 0x6DD6
+0x4458 = 0x5462
+0x4459 = 0x9912
+0x445A = 0x5185
+0x445B = 0x5AE9
+0x445C = 0x80FD
+0x445D = 0x59AE
+0x445E = 0x9713
+0x445F = 0x502A
+0x4460 = 0x6CE5
+0x4461 = 0x5C3C
+0x4462 = 0x64EC
+0x4463 = 0x4F60
+0x4464 = 0x533F
+0x4465 = 0x81A9
+0x4466 = 0x9006
+0x4467 = 0x6EBA
+0x4468 = 0x852B
+0x4469 = 0x62C8
+0x446A = 0x5E74
+0x446B = 0x78BE
+0x446C = 0x6506
+0x446D = 0x637B
+0x446E = 0x5FF5
+0x446F = 0x5A18
+0x4470 = 0x91C0
+0x4471 = 0x9CE5
+0x4472 = 0x5C3F
+0x4473 = 0x634F
+0x4474 = 0x8076
+0x4475 = 0x5B7D
+0x4476 = 0x5699
+0x4477 = 0x9477
+0x4478 = 0x93B3
+0x4479 = 0x6D85
+0x447A = 0x60A8
+0x447B = 0x6AB8
+0x447C = 0x7370
+0x447D = 0x51DD
+0x447E = 0x5BE7
+0x4521 = 0x64F0
+0x4522 = 0x6FD8
+0x4523 = 0x725B
+0x4524 = 0x626D
+0x4525 = 0x9215
+0x4526 = 0x7D10
+0x4527 = 0x81BF
+0x4528 = 0x6FC3
+0x4529 = 0x8FB2
+0x452A = 0x5F04
+0x452B = 0x5974
+0x452C = 0x52AA
+0x452D = 0x6012
+0x452E = 0x5973
+0x452F = 0x6696
+0x4530 = 0x8650
+0x4531 = 0x7627
+0x4532 = 0x632A
+0x4533 = 0x61E6
+0x4534 = 0x7CEF
+0x4535 = 0x8AFE
+0x4536 = 0x54E6
+0x4537 = 0x6B50
+0x4538 = 0x9DD7
+0x4539 = 0x6BC6
+0x453A = 0x85D5
+0x453B = 0x5614
+0x453C = 0x5076
+0x453D = 0x6F1A
+0x453E = 0x556A
+0x453F = 0x8DB4
+0x4540 = 0x722C
+0x4541 = 0x5E15
+0x4542 = 0x6015
+0x4543 = 0x7436
+0x4544 = 0x62CD
+0x4545 = 0x6392
+0x4546 = 0x724C
+0x4547 = 0x5F98
+0x4548 = 0x6E43
+0x4549 = 0x6D3E
+0x454A = 0x6500
+0x454B = 0x6F58
+0x454C = 0x76E4
+0x454D = 0x78D0
+0x454E = 0x76FC
+0x454F = 0x7554
+0x4550 = 0x5224
+0x4551 = 0x53DB
+0x4552 = 0x4E53
+0x4553 = 0x9F90
+0x4554 = 0x65C1
+0x4555 = 0x802A
+0x4556 = 0x80D6
+0x4557 = 0x629B
+0x4558 = 0x5486
+0x4559 = 0x5228
+0x455A = 0x70AE
+0x455B = 0x888D
+0x455C = 0x8DD1
+0x455D = 0x6CE1
+0x455E = 0x5478
+0x455F = 0x80DA
+0x4560 = 0x57F9
+0x4561 = 0x88F4
+0x4562 = 0x8CE0
+0x4563 = 0x966A
+0x4564 = 0x914D
+0x4565 = 0x4F69
+0x4566 = 0x6C9B
+0x4567 = 0x5674
+0x4568 = 0x76C6
+0x4569 = 0x7830
+0x456A = 0x62A8
+0x456B = 0x70F9
+0x456C = 0x6F8E
+0x456D = 0x5F6D
+0x456E = 0x84EC
+0x456F = 0x68DA
+0x4570 = 0x787C
+0x4571 = 0x7BF7
+0x4572 = 0x81A8
+0x4573 = 0x670B
+0x4574 = 0x9D6C
+0x4575 = 0x6367
+0x4576 = 0x78B0
+0x4577 = 0x576F
+0x4578 = 0x7812
+0x4579 = 0x9739
+0x457A = 0x6279
+0x457B = 0x62AB
+0x457C = 0x5288
+0x457D = 0x7435
+0x457E = 0x6BD7
+0x4621 = 0x5564
+0x4622 = 0x813E
+0x4623 = 0x75B2
+0x4624 = 0x76AE
+0x4625 = 0x5339
+0x4626 = 0x75DE
+0x4627 = 0x50FB
+0x4628 = 0x5C41
+0x4629 = 0x8B6C
+0x462A = 0x7BC7
+0x462B = 0x504F
+0x462C = 0x7247
+0x462D = 0x9A19
+0x462E = 0x98C4
+0x462F = 0x6F02
+0x4630 = 0x74E2
+0x4631 = 0x7968
+0x4632 = 0x6487
+0x4633 = 0x77A5
+0x4634 = 0x62FC
+0x4635 = 0x983B
+0x4636 = 0x8CA7
+0x4637 = 0x54C1
+0x4638 = 0x8058
+0x4639 = 0x4E52
+0x463A = 0x576A
+0x463B = 0x860B
+0x463C = 0x840D
+0x463D = 0x5E73
+0x463E = 0x6191
+0x463F = 0x74F6
+0x4640 = 0x8A55
+0x4641 = 0x5C4F
+0x4642 = 0x5761
+0x4643 = 0x6F51
+0x4644 = 0x9817
+0x4645 = 0x5A46
+0x4646 = 0x7834
+0x4647 = 0x9B44
+0x4648 = 0x8FEB
+0x4649 = 0x7C95
+0x464A = 0x5256
+0x464B = 0x64B2
+0x464C = 0x92EA
+0x464D = 0x50D5
+0x464E = 0x8386
+0x464F = 0x8461
+0x4650 = 0x83E9
+0x4651 = 0x84B2
+0x4652 = 0x57D4
+0x4653 = 0x6A38
+0x4654 = 0x5703
+0x4655 = 0x666E
+0x4656 = 0x6D66
+0x4657 = 0x8B5C
+0x4658 = 0x66DD
+0x4659 = 0x7011
+0x465A = 0x671F
+0x465B = 0x6B3A
+0x465C = 0x68F2
+0x465D = 0x621A
+0x465E = 0x59BB
+0x465F = 0x4E03
+0x4660 = 0x51C4
+0x4661 = 0x6F06
+0x4662 = 0x67D2
+0x4663 = 0x6C8F
+0x4664 = 0x5176
+0x4665 = 0x68CB
+0x4666 = 0x5947
+0x4667 = 0x6B67
+0x4668 = 0x7566
+0x4669 = 0x5D0E
+0x466A = 0x81CD
+0x466B = 0x9F4A
+0x466C = 0x65D7
+0x466D = 0x7948
+0x466E = 0x7941
+0x466F = 0x9A0E
+0x4670 = 0x8D77
+0x4671 = 0x8C48
+0x4672 = 0x4E5E
+0x4673 = 0x4F01
+0x4674 = 0x5553
+0x4675 = 0x5951
+0x4676 = 0x780C
+0x4677 = 0x5668
+0x4678 = 0x6C23
+0x4679 = 0x8FC4
+0x467A = 0x68C4
+0x467B = 0x6C7D
+0x467C = 0x6CE3
+0x467D = 0x8A16
+0x467E = 0x6390
+0x4721 = 0x6070
+0x4722 = 0x6D3D
+0x4723 = 0x727D
+0x4724 = 0x6266
+0x4725 = 0x91FA
+0x4726 = 0x925B
+0x4727 = 0x5343
+0x4728 = 0x9077
+0x4729 = 0x7C3D
+0x472A = 0x4EDF
+0x472B = 0x8B19
+0x472C = 0x4E7E
+0x472D = 0x9ED4
+0x472E = 0x9322
+0x472F = 0x9257
+0x4730 = 0x524D
+0x4731 = 0x6F5B
+0x4732 = 0x9063
+0x4733 = 0x6DFA
+0x4734 = 0x8B74
+0x4735 = 0x5879
+0x4736 = 0x5D4C
+0x4737 = 0x6B20
+0x4738 = 0x6B49
+0x4739 = 0x69CD
+0x473A = 0x55C6
+0x473B = 0x8154
+0x473C = 0x7F8C
+0x473D = 0x58BB
+0x473E = 0x8594
+0x473F = 0x5F3A
+0x4740 = 0x6436
+0x4741 = 0x6A47
+0x4742 = 0x936C
+0x4743 = 0x6572
+0x4744 = 0x6084
+0x4745 = 0x6A4B
+0x4746 = 0x77A7
+0x4747 = 0x55AC
+0x4748 = 0x50D1
+0x4749 = 0x5DE7
+0x474A = 0x9798
+0x474B = 0x64AC
+0x474C = 0x7FF9
+0x474D = 0x5CED
+0x474E = 0x4FCF
+0x474F = 0x7AC5
+0x4750 = 0x5207
+0x4751 = 0x8304
+0x4752 = 0x4E14
+0x4753 = 0x602F
+0x4754 = 0x7ACA
+0x4755 = 0x6B3D
+0x4756 = 0x4FB5
+0x4757 = 0x89AA
+0x4758 = 0x79E6
+0x4759 = 0x7434
+0x475A = 0x52E4
+0x475B = 0x82B9
+0x475C = 0x64D2
+0x475D = 0x79BD
+0x475E = 0x5BE2
+0x475F = 0x6C81
+0x4760 = 0x9752
+0x4761 = 0x8F15
+0x4762 = 0x6C2B
+0x4763 = 0x50BE
+0x4764 = 0x537F
+0x4765 = 0x6E05
+0x4766 = 0x64CE
+0x4767 = 0x6674
+0x4768 = 0x6C30
+0x4769 = 0x60C5
+0x476A = 0x9803
+0x476B = 0x8ACB
+0x476C = 0x6176
+0x476D = 0x74CA
+0x476E = 0x7AAE
+0x476F = 0x79CB
+0x4770 = 0x4E18
+0x4771 = 0x90B1
+0x4772 = 0x7403
+0x4773 = 0x6C42
+0x4774 = 0x56DA
+0x4775 = 0x914B
+0x4776 = 0x6CC5
+0x4777 = 0x8DA8
+0x4778 = 0x5340
+0x4779 = 0x86C6
+0x477A = 0x66F2
+0x477B = 0x8EC0
+0x477C = 0x5C48
+0x477D = 0x9A45
+0x477E = 0x6E20
+0x4821 = 0x53D6
+0x4822 = 0x5A36
+0x4823 = 0x9F72
+0x4824 = 0x8DA3
+0x4825 = 0x53BB
+0x4826 = 0x5708
+0x4827 = 0x9874
+0x4828 = 0x6B0A
+0x4829 = 0x919B
+0x482A = 0x6CC9
+0x482B = 0x5168
+0x482C = 0x75CA
+0x482D = 0x62F3
+0x482E = 0x72AC
+0x482F = 0x5238
+0x4830 = 0x52F8
+0x4831 = 0x7F3A
+0x4832 = 0x7094
+0x4833 = 0x7638
+0x4834 = 0x5374
+0x4835 = 0x9D72
+0x4836 = 0x69B7
+0x4837 = 0x78BA
+0x4838 = 0x96C0
+0x4839 = 0x88D9
+0x483A = 0x7FA4
+0x483B = 0x7136
+0x483C = 0x71C3
+0x483D = 0x5189
+0x483E = 0x67D3
+0x483F = 0x74E4
+0x4840 = 0x58E4
+0x4841 = 0x6518
+0x4842 = 0x56B7
+0x4843 = 0x8B93
+0x4844 = 0x9952
+0x4845 = 0x64FE
+0x4846 = 0x7E5E
+0x4847 = 0x60F9
+0x4848 = 0x71B1
+0x4849 = 0x58EC
+0x484A = 0x4EC1
+0x484B = 0x4EBA
+0x484C = 0x5FCD
+0x484D = 0x97CC
+0x484E = 0x4EFB
+0x484F = 0x8A8D
+0x4850 = 0x5203
+0x4851 = 0x598A
+0x4852 = 0x7D09
+0x4853 = 0x6254
+0x4854 = 0x4ECD
+0x4855 = 0x65E5
+0x4856 = 0x620E
+0x4857 = 0x8338
+0x4858 = 0x84C9
+0x4859 = 0x69AE
+0x485A = 0x878D
+0x485B = 0x7194
+0x485C = 0x6EB6
+0x485D = 0x5BB9
+0x485E = 0x7D68
+0x485F = 0x5197
+0x4860 = 0x63C9
+0x4861 = 0x67D4
+0x4862 = 0x8089
+0x4863 = 0x8339
+0x4864 = 0x8815
+0x4865 = 0x5112
+0x4866 = 0x5B7A
+0x4867 = 0x5982
+0x4868 = 0x8FB1
+0x4869 = 0x4E73
+0x486A = 0x6C5D
+0x486B = 0x5165
+0x486C = 0x8925
+0x486D = 0x8EDF
+0x486E = 0x962E
+0x486F = 0x854A
+0x4870 = 0x745E
+0x4871 = 0x92ED
+0x4872 = 0x958F
+0x4873 = 0x6F64
+0x4874 = 0x82E5
+0x4875 = 0x5F31
+0x4876 = 0x6492
+0x4877 = 0x7051
+0x4878 = 0x85A9
+0x4879 = 0x816E
+0x487A = 0x9C13
+0x487B = 0x585E
+0x487C = 0x8CFD
+0x487D = 0x4E09
+0x487E = 0x53C1
+0x4921 = 0x5098
+0x4922 = 0x6563
+0x4923 = 0x6851
+0x4924 = 0x55D3
+0x4925 = 0x55AA
+0x4926 = 0x6414
+0x4927 = 0x9A37
+0x4928 = 0x6383
+0x4929 = 0x5AC2
+0x492A = 0x745F
+0x492B = 0x8272
+0x492C = 0x6F80
+0x492D = 0x68EE
+0x492E = 0x50E7
+0x492F = 0x838E
+0x4930 = 0x7802
+0x4931 = 0x6BBA
+0x4932 = 0x5239
+0x4933 = 0x6C99
+0x4934 = 0x7D17
+0x4935 = 0x50BB
+0x4936 = 0x5565
+0x4937 = 0x715E
+0x4938 = 0x7BE9
+0x4939 = 0x66EC
+0x493A = 0x73CA
+0x493B = 0x82EB
+0x493C = 0x6749
+0x493D = 0x5C71
+0x493E = 0x5220
+0x493F = 0x717D
+0x4940 = 0x886B
+0x4941 = 0x9583
+0x4942 = 0x965D
+0x4943 = 0x64C5
+0x4944 = 0x8D0D
+0x4945 = 0x81B3
+0x4946 = 0x5584
+0x4947 = 0x6C55
+0x4948 = 0x6247
+0x4949 = 0x7E55
+0x494A = 0x5892
+0x494B = 0x50B7
+0x494C = 0x5546
+0x494D = 0x8CDE
+0x494E = 0x664C
+0x494F = 0x4E0A
+0x4950 = 0x5C1A
+0x4951 = 0x88F3
+0x4952 = 0x68A2
+0x4953 = 0x634E
+0x4954 = 0x7A0D
+0x4955 = 0x71D2
+0x4956 = 0x828D
+0x4957 = 0x52FA
+0x4958 = 0x97F6
+0x4959 = 0x5C11
+0x495A = 0x54E8
+0x495B = 0x90B5
+0x495C = 0x7D39
+0x495D = 0x5962
+0x495E = 0x8CD2
+0x495F = 0x86C7
+0x4960 = 0x820C
+0x4961 = 0x6368
+0x4962 = 0x8D66
+0x4963 = 0x651D
+0x4964 = 0x5C04
+0x4965 = 0x61FE
+0x4966 = 0x6D89
+0x4967 = 0x793E
+0x4968 = 0x8A2D
+0x4969 = 0x7837
+0x496A = 0x7533
+0x496B = 0x547B
+0x496C = 0x4F38
+0x496D = 0x8EAB
+0x496E = 0x6DF1
+0x496F = 0x5A20
+0x4970 = 0x7D33
+0x4971 = 0x795E
+0x4972 = 0x6C88
+0x4973 = 0x5BE9
+0x4974 = 0x5B38
+0x4975 = 0x751A
+0x4976 = 0x814E
+0x4977 = 0x614E
+0x4978 = 0x6EF2
+0x4979 = 0x8072
+0x497A = 0x751F
+0x497B = 0x7525
+0x497C = 0x7272
+0x497D = 0x5347
+0x497E = 0x7E69
+0x4A21 = 0x7701
+0x4A22 = 0x76DB
+0x4A23 = 0x5269
+0x4A24 = 0x52DD
+0x4A25 = 0x8056
+0x4A26 = 0x5E2B
+0x4A27 = 0x5931
+0x4A28 = 0x7345
+0x4A29 = 0x65BD
+0x4A2A = 0x6FD5
+0x4A2B = 0x8A69
+0x4A2C = 0x5C38
+0x4A2D = 0x8671
+0x4A2E = 0x5341
+0x4A2F = 0x77F3
+0x4A30 = 0x62FE
+0x4A31 = 0x6642
+0x4A32 = 0x4EC0
+0x4A33 = 0x98DF
+0x4A34 = 0x8755
+0x4A35 = 0x5BE6
+0x4A36 = 0x8B58
+0x4A37 = 0x53F2
+0x4A38 = 0x77E2
+0x4A39 = 0x4F7F
+0x4A3A = 0x5C4E
+0x4A3B = 0x99DB
+0x4A3C = 0x59CB
+0x4A3D = 0x5F0F
+0x4A3E = 0x793A
+0x4A3F = 0x58EB
+0x4A40 = 0x4E16
+0x4A41 = 0x67FF
+0x4A42 = 0x4E8B
+0x4A43 = 0x62ED
+0x4A44 = 0x8A93
+0x4A45 = 0x901D
+0x4A46 = 0x52E2
+0x4A47 = 0x662F
+0x4A48 = 0x55DC
+0x4A49 = 0x566C
+0x4A4A = 0x9069
+0x4A4B = 0x4ED5
+0x4A4C = 0x4F8D
+0x4A4D = 0x91CB
+0x4A4E = 0x98FE
+0x4A4F = 0x6C0F
+0x4A50 = 0x5E02
+0x4A51 = 0x6043
+0x4A52 = 0x5BA4
+0x4A53 = 0x8996
+0x4A54 = 0x8A66
+0x4A55 = 0x6536
+0x4A56 = 0x624B
+0x4A57 = 0x9996
+0x4A58 = 0x5B88
+0x4A59 = 0x58FD
+0x4A5A = 0x6388
+0x4A5B = 0x552E
+0x4A5C = 0x53D7
+0x4A5D = 0x7626
+0x4A5E = 0x7378
+0x4A5F = 0x852C
+0x4A60 = 0x6A1E
+0x4A61 = 0x68B3
+0x4A62 = 0x6B8A
+0x4A63 = 0x6292
+0x4A64 = 0x8F38
+0x4A65 = 0x53D4
+0x4A66 = 0x8212
+0x4A67 = 0x6DD1
+0x4A68 = 0x758F
+0x4A69 = 0x66F8
+0x4A6A = 0x8D16
+0x4A6B = 0x5B70
+0x4A6C = 0x719F
+0x4A6D = 0x85AF
+0x4A6E = 0x6691
+0x4A6F = 0x66D9
+0x4A70 = 0x7F72
+0x4A71 = 0x8700
+0x4A72 = 0x9ECD
+0x4A73 = 0x9F20
+0x4A74 = 0x5C6C
+0x4A75 = 0x8853
+0x4A76 = 0x8FF0
+0x4A77 = 0x6A39
+0x4A78 = 0x675F
+0x4A79 = 0x620D
+0x4A7A = 0x7AEA
+0x4A7B = 0x5885
+0x4A7C = 0x5EB6
+0x4A7D = 0x6578
+0x4A7E = 0x6F31
+0x4B21 = 0x6055
+0x4B22 = 0x5237
+0x4B23 = 0x800D
+0x4B24 = 0x6454
+0x4B25 = 0x8870
+0x4B26 = 0x7529
+0x4B27 = 0x5E25
+0x4B28 = 0x6813
+0x4B29 = 0x62F4
+0x4B2A = 0x971C
+0x4B2B = 0x96D9
+0x4B2C = 0x723D
+0x4B2D = 0x8AB0
+0x4B2E = 0x6C34
+0x4B2F = 0x7761
+0x4B30 = 0x7A0E
+0x4B31 = 0x542E
+0x4B32 = 0x77AC
+0x4B33 = 0x9806
+0x4B34 = 0x821C
+0x4B35 = 0x8AAC
+0x4B36 = 0x78A9
+0x4B37 = 0x6714
+0x4B38 = 0x720D
+0x4B39 = 0x65AF
+0x4B3A = 0x6495
+0x4B3B = 0x5636
+0x4B3C = 0x601D
+0x4B3D = 0x79C1
+0x4B3E = 0x53F8
+0x4B3F = 0x7D72
+0x4B40 = 0x6B7B
+0x4B41 = 0x8086
+0x4B42 = 0x5BFA
+0x4B43 = 0x55E3
+0x4B44 = 0x56DB
+0x4B45 = 0x4F3A
+0x4B46 = 0x4F3C
+0x4B47 = 0x98FC
+0x4B48 = 0x5DF3
+0x4B49 = 0x9B06
+0x4B4A = 0x8073
+0x4B4B = 0x616B
+0x4B4C = 0x980C
+0x4B4D = 0x9001
+0x4B4E = 0x5B8B
+0x4B4F = 0x8A1F
+0x4B50 = 0x8AA6
+0x4B51 = 0x641C
+0x4B52 = 0x8258
+0x4B53 = 0x64FB
+0x4B54 = 0x55FD
+0x4B55 = 0x8607
+0x4B56 = 0x9165
+0x4B57 = 0x4FD7
+0x4B58 = 0x7D20
+0x4B59 = 0x901F
+0x4B5A = 0x7C9F
+0x4B5B = 0x50F3
+0x4B5C = 0x5851
+0x4B5D = 0x6EAF
+0x4B5E = 0x5BBF
+0x4B5F = 0x8A34
+0x4B60 = 0x8085
+0x4B61 = 0x9178
+0x4B62 = 0x849C
+0x4B63 = 0x7B97
+0x4B64 = 0x96D6
+0x4B65 = 0x968B
+0x4B66 = 0x96A8
+0x4B67 = 0x7D8F
+0x4B68 = 0x9AD3
+0x4B69 = 0x788E
+0x4B6A = 0x6B72
+0x4B6B = 0x7A57
+0x4B6C = 0x9042
+0x4B6D = 0x96A7
+0x4B6E = 0x795F
+0x4B6F = 0x5B6B
+0x4B70 = 0x640D
+0x4B71 = 0x7B0B
+0x4B72 = 0x84D1
+0x4B73 = 0x68AD
+0x4B74 = 0x5506
+0x4B75 = 0x7E2E
+0x4B76 = 0x7463
+0x4B77 = 0x7D22
+0x4B78 = 0x9396
+0x4B79 = 0x6240
+0x4B7A = 0x584C
+0x4B7B = 0x4ED6
+0x4B7C = 0x5B83
+0x4B7D = 0x5979
+0x4B7E = 0x5854
+0x4C21 = 0x737A
+0x4C22 = 0x64BB
+0x4C23 = 0x8E4B
+0x4C24 = 0x8E0F
+0x4C25 = 0x80CE
+0x4C26 = 0x82D4
+0x4C27 = 0x62AC
+0x4C28 = 0x81FA
+0x4C29 = 0x6CF0
+0x4C2A = 0x915E
+0x4C2B = 0x592A
+0x4C2C = 0x614B
+0x4C2D = 0x6C70
+0x4C2E = 0x574D
+0x4C2F = 0x6524
+0x4C30 = 0x8CAA
+0x4C31 = 0x7671
+0x4C32 = 0x7058
+0x4C33 = 0x58C7
+0x4C34 = 0x6A80
+0x4C35 = 0x75F0
+0x4C36 = 0x6F6D
+0x4C37 = 0x8B5A
+0x4C38 = 0x8AC7
+0x4C39 = 0x5766
+0x4C3A = 0x6BEF
+0x4C3B = 0x8892
+0x4C3C = 0x78B3
+0x4C3D = 0x63A2
+0x4C3E = 0x5606
+0x4C3F = 0x70AD
+0x4C40 = 0x6E6F
+0x4C41 = 0x5858
+0x4C42 = 0x642A
+0x4C43 = 0x5802
+0x4C44 = 0x68E0
+0x4C45 = 0x819B
+0x4C46 = 0x5510
+0x4C47 = 0x7CD6
+0x4C48 = 0x5018
+0x4C49 = 0x8EBA
+0x4C4A = 0x6DCC
+0x4C4B = 0x8D9F
+0x4C4C = 0x71D9
+0x4C4D = 0x638F
+0x4C4E = 0x6FE4
+0x4C4F = 0x6ED4
+0x4C50 = 0x7E27
+0x4C51 = 0x8404
+0x4C52 = 0x6843
+0x4C53 = 0x9003
+0x4C54 = 0x6DD8
+0x4C55 = 0x9676
+0x4C56 = 0x8A0E
+0x4C57 = 0x5957
+0x4C58 = 0x7279
+0x4C59 = 0x85E4
+0x4C5A = 0x9A30
+0x4C5B = 0x75BC
+0x4C5C = 0x8B04
+0x4C5D = 0x68AF
+0x4C5E = 0x5254
+0x4C5F = 0x8E22
+0x4C60 = 0x92BB
+0x4C61 = 0x63D0
+0x4C62 = 0x984C
+0x4C63 = 0x8E44
+0x4C64 = 0x557C
+0x4C65 = 0x9AD4
+0x4C66 = 0x66FF
+0x4C67 = 0x568F
+0x4C68 = 0x60D5
+0x4C69 = 0x6D95
+0x4C6A = 0x5243
+0x4C6B = 0x5C49
+0x4C6C = 0x5929
+0x4C6D = 0x6DFB
+0x4C6E = 0x586B
+0x4C6F = 0x7530
+0x4C70 = 0x751C
+0x4C71 = 0x606C
+0x4C72 = 0x8214
+0x4C73 = 0x8146
+0x4C74 = 0x6311
+0x4C75 = 0x689D
+0x4C76 = 0x8FE2
+0x4C77 = 0x773A
+0x4C78 = 0x8DF3
+0x4C79 = 0x8CBC
+0x4C7A = 0x9435
+0x4C7B = 0x5E16
+0x4C7C = 0x5EF3
+0x4C7D = 0x807D
+0x4C7E = 0x70F4
+0x4D21 = 0x6C40
+0x4D22 = 0x5EF7
+0x4D23 = 0x505C
+0x4D24 = 0x4EAD
+0x4D25 = 0x5EAD
+0x4D26 = 0x633A
+0x4D27 = 0x8247
+0x4D28 = 0x901A
+0x4D29 = 0x6850
+0x4D2A = 0x916E
+0x4D2B = 0x77B3
+0x4D2C = 0x540C
+0x4D2D = 0x9285
+0x4D2E = 0x5F64
+0x4D2F = 0x7AE5
+0x4D30 = 0x6876
+0x4D31 = 0x6345
+0x4D32 = 0x7B52
+0x4D33 = 0x7D71
+0x4D34 = 0x75DB
+0x4D35 = 0x5077
+0x4D36 = 0x6295
+0x4D37 = 0x982D
+0x4D38 = 0x900F
+0x4D39 = 0x51F8
+0x4D3A = 0x79C3
+0x4D3B = 0x7A81
+0x4D3C = 0x5716
+0x4D3D = 0x5F92
+0x4D3E = 0x9014
+0x4D3F = 0x5857
+0x4D40 = 0x5C60
+0x4D41 = 0x571F
+0x4D42 = 0x5410
+0x4D43 = 0x5154
+0x4D44 = 0x6E4D
+0x4D45 = 0x5718
+0x4D46 = 0x63A8
+0x4D47 = 0x983D
+0x4D48 = 0x817F
+0x4D49 = 0x8715
+0x4D4A = 0x892A
+0x4D4B = 0x9000
+0x4D4C = 0x541E
+0x4D4D = 0x5C6F
+0x4D4E = 0x81C0
+0x4D4F = 0x62D6
+0x4D50 = 0x6258
+0x4D51 = 0x8131
+0x4D52 = 0x9D15
+0x4D53 = 0x9640
+0x4D54 = 0x99B1
+0x4D55 = 0x99DD
+0x4D56 = 0x6A62
+0x4D57 = 0x59A5
+0x4D58 = 0x62D3
+0x4D59 = 0x553E
+0x4D5A = 0x6316
+0x4D5B = 0x54C7
+0x4D5C = 0x86D9
+0x4D5D = 0x7AAA
+0x4D5E = 0x5A03
+0x4D5F = 0x74E6
+0x4D60 = 0x896A
+0x4D61 = 0x6B6A
+0x4D62 = 0x5916
+0x4D63 = 0x8C4C
+0x4D64 = 0x5F4E
+0x4D65 = 0x7063
+0x4D66 = 0x73A9
+0x4D67 = 0x9811
+0x4D68 = 0x4E38
+0x4D69 = 0x70F7
+0x4D6A = 0x5B8C
+0x4D6B = 0x7897
+0x4D6C = 0x633D
+0x4D6D = 0x665A
+0x4D6E = 0x7696
+0x4D6F = 0x60CB
+0x4D70 = 0x5B9B
+0x4D71 = 0x5A49
+0x4D72 = 0x842C
+0x4D73 = 0x8155
+0x4D74 = 0x6C6A
+0x4D75 = 0x738B
+0x4D76 = 0x4EA1
+0x4D77 = 0x6789
+0x4D78 = 0x7DB2
+0x4D79 = 0x5F80
+0x4D7A = 0x65FA
+0x4D7B = 0x671B
+0x4D7C = 0x5FD8
+0x4D7D = 0x5984
+0x4D7E = 0x5A01
+0x4E21 = 0x5DCD
+0x4E22 = 0x5FAE
+0x4E23 = 0x5371
+0x4E24 = 0x97CB
+0x4E25 = 0x9055
+0x4E26 = 0x6845
+0x4E27 = 0x570D
+0x4E28 = 0x552F
+0x4E29 = 0x60DF
+0x4E2A = 0x7232
+0x4E2B = 0x6FF0
+0x4E2C = 0x7DAD
+0x4E2D = 0x8466
+0x4E2E = 0x840E
+0x4E2F = 0x59D4
+0x4E30 = 0x5049
+0x4E31 = 0x50DE
+0x4E32 = 0x5C3E
+0x4E33 = 0x7DEF
+0x4E34 = 0x672A
+0x4E35 = 0x851A
+0x4E36 = 0x5473
+0x4E37 = 0x754F
+0x4E38 = 0x80C3
+0x4E39 = 0x5582
+0x4E3A = 0x9B4F
+0x4E3B = 0x4F4D
+0x4E3C = 0x6E2D
+0x4E3D = 0x8B02
+0x4E3E = 0x5C09
+0x4E3F = 0x6170
+0x4E40 = 0x885B
+0x4E41 = 0x761F
+0x4E42 = 0x6E29
+0x4E43 = 0x868A
+0x4E44 = 0x6587
+0x4E45 = 0x805E
+0x4E46 = 0x7D0B
+0x4E47 = 0x543B
+0x4E48 = 0x7A69
+0x4E49 = 0x7D0A
+0x4E4A = 0x554F
+0x4E4B = 0x55E1
+0x4E4C = 0x7FC1
+0x4E4D = 0x74EE
+0x4E4E = 0x64BE
+0x4E4F = 0x8778
+0x4E50 = 0x6E26
+0x4E51 = 0x7AA9
+0x4E52 = 0x6211
+0x4E53 = 0x65A1
+0x4E54 = 0x5367
+0x4E55 = 0x63E1
+0x4E56 = 0x6C83
+0x4E57 = 0x5DEB
+0x4E58 = 0x55DA
+0x4E59 = 0x93A2
+0x4E5A = 0x70CF
+0x4E5B = 0x6C61
+0x4E5C = 0x8AA3
+0x4E5D = 0x5C4B
+0x4E5E = 0x7121
+0x4E5F = 0x856A
+0x4E60 = 0x68A7
+0x4E61 = 0x543E
+0x4E62 = 0x5434
+0x4E63 = 0x6BCB
+0x4E64 = 0x6B66
+0x4E65 = 0x4E94
+0x4E66 = 0x6342
+0x4E67 = 0x5348
+0x4E68 = 0x821E
+0x4E69 = 0x4F0D
+0x4E6A = 0x4FAE
+0x4E6B = 0x5862
+0x4E6C = 0x620A
+0x4E6D = 0x9727
+0x4E6E = 0x6664
+0x4E6F = 0x7269
+0x4E70 = 0x52FF
+0x4E71 = 0x52D9
+0x4E72 = 0x609F
+0x4E73 = 0x8AA4
+0x4E74 = 0x6614
+0x4E75 = 0x7199
+0x4E76 = 0x6790
+0x4E77 = 0x897F
+0x4E78 = 0x7852
+0x4E79 = 0x77FD
+0x4E7A = 0x6670
+0x4E7B = 0x563B
+0x4E7C = 0x5438
+0x4E7D = 0x932B
+0x4E7E = 0x72A7
+0x4F21 = 0x7A00
+0x4F22 = 0x606F
+0x4F23 = 0x5E0C
+0x4F24 = 0x6089
+0x4F25 = 0x819D
+0x4F26 = 0x5915
+0x4F27 = 0x60DC
+0x4F28 = 0x7184
+0x4F29 = 0x70EF
+0x4F2A = 0x6EAA
+0x4F2B = 0x6C50
+0x4F2C = 0x7280
+0x4F2D = 0x6A84
+0x4F2E = 0x8972
+0x4F2F = 0x5E2D
+0x4F30 = 0x7FD2
+0x4F31 = 0x5AB3
+0x4F32 = 0x559C
+0x4F33 = 0x9291
+0x4F34 = 0x6D17
+0x4F35 = 0x7CFB
+0x4F36 = 0x9699
+0x4F37 = 0x6232
+0x4F38 = 0x7D30
+0x4F39 = 0x778E
+0x4F3A = 0x8766
+0x4F3B = 0x5323
+0x4F3C = 0x971E
+0x4F3D = 0x8F44
+0x4F3E = 0x6687
+0x4F3F = 0x5CFD
+0x4F40 = 0x4FE0
+0x4F41 = 0x72F9
+0x4F42 = 0x4E0B
+0x4F43 = 0x53A6
+0x4F44 = 0x590F
+0x4F45 = 0x5687
+0x4F46 = 0x6380
+0x4F47 = 0x9341
+0x4F48 = 0x5148
+0x4F49 = 0x4ED9
+0x4F4A = 0x9BAE
+0x4F4B = 0x7E96
+0x4F4C = 0x54B8
+0x4F4D = 0x8CE2
+0x4F4E = 0x929C
+0x4F4F = 0x8237
+0x4F50 = 0x9591
+0x4F51 = 0x6D8E
+0x4F52 = 0x5F26
+0x4F53 = 0x5ACC
+0x4F54 = 0x986F
+0x4F55 = 0x96AA
+0x4F56 = 0x73FE
+0x4F57 = 0x737B
+0x4F58 = 0x7E23
+0x4F59 = 0x817A
+0x4F5A = 0x9921
+0x4F5B = 0x7FA1
+0x4F5C = 0x61B2
+0x4F5D = 0x9677
+0x4F5E = 0x9650
+0x4F5F = 0x7DAB
+0x4F60 = 0x76F8
+0x4F61 = 0x53A2
+0x4F62 = 0x9472
+0x4F63 = 0x9999
+0x4F64 = 0x7BB1
+0x4F65 = 0x8944
+0x4F66 = 0x6E58
+0x4F67 = 0x9109
+0x4F68 = 0x7FD4
+0x4F69 = 0x7965
+0x4F6A = 0x8A73
+0x4F6B = 0x60F3
+0x4F6C = 0x97FF
+0x4F6D = 0x4EAB
+0x4F6E = 0x9805
+0x4F6F = 0x5DF7
+0x4F70 = 0x6A61
+0x4F71 = 0x50CF
+0x4F72 = 0x5411
+0x4F73 = 0x8C61
+0x4F74 = 0x856D
+0x4F75 = 0x785D
+0x4F76 = 0x9704
+0x4F77 = 0x524A
+0x4F78 = 0x54EE
+0x4F79 = 0x56C2
+0x4F7A = 0x92B7
+0x4F7B = 0x6D88
+0x4F7C = 0x5BB5
+0x4F7D = 0x6DC6
+0x4F7E = 0x66C9
+0x5021 = 0x5C0F
+0x5022 = 0x5B5D
+0x5023 = 0x6821
+0x5024 = 0x8096
+0x5025 = 0x562F
+0x5026 = 0x7B11
+0x5027 = 0x6548
+0x5028 = 0x6954
+0x5029 = 0x4E9B
+0x502A = 0x6B47
+0x502B = 0x874E
+0x502C = 0x978B
+0x502D = 0x5354
+0x502E = 0x633E
+0x502F = 0x643A
+0x5030 = 0x90AA
+0x5031 = 0x659C
+0x5032 = 0x8105
+0x5033 = 0x8AE7
+0x5034 = 0x5BEB
+0x5035 = 0x68B0
+0x5036 = 0x5378
+0x5037 = 0x87F9
+0x5038 = 0x61C8
+0x5039 = 0x6CC4
+0x503A = 0x7009
+0x503B = 0x8B1D
+0x503C = 0x5C51
+0x503D = 0x85AA
+0x503E = 0x82AF
+0x503F = 0x92C5
+0x5040 = 0x6B23
+0x5041 = 0x8F9B
+0x5042 = 0x65B0
+0x5043 = 0x5FFB
+0x5044 = 0x5FC3
+0x5045 = 0x4FE1
+0x5046 = 0x91C1
+0x5047 = 0x661F
+0x5048 = 0x8165
+0x5049 = 0x7329
+0x504A = 0x60FA
+0x504B = 0x8208
+0x504C = 0x5211
+0x504D = 0x578B
+0x504E = 0x5F62
+0x504F = 0x90A2
+0x5050 = 0x884C
+0x5051 = 0x9192
+0x5052 = 0x5E78
+0x5053 = 0x674F
+0x5054 = 0x6027
+0x5055 = 0x59D3
+0x5056 = 0x5144
+0x5057 = 0x51F6
+0x5058 = 0x80F8
+0x5059 = 0x5308
+0x505A = 0x6C79
+0x505B = 0x96C4
+0x505C = 0x718A
+0x505D = 0x4F11
+0x505E = 0x4FEE
+0x505F = 0x7F9E
+0x5060 = 0x673D
+0x5061 = 0x55C5
+0x5062 = 0x92B9
+0x5063 = 0x79C0
+0x5064 = 0x8896
+0x5065 = 0x7D89
+0x5066 = 0x589F
+0x5067 = 0x620C
+0x5068 = 0x9700
+0x5069 = 0x865A
+0x506A = 0x5618
+0x506B = 0x9808
+0x506C = 0x5F90
+0x506D = 0x8A31
+0x506E = 0x84C4
+0x506F = 0x9157
+0x5070 = 0x53D9
+0x5071 = 0x65ED
+0x5072 = 0x5E8F
+0x5073 = 0x755C
+0x5074 = 0x6064
+0x5075 = 0x7D6E
+0x5076 = 0x5A7F
+0x5077 = 0x7DD2
+0x5078 = 0x7E8C
+0x5079 = 0x8ED2
+0x507A = 0x55A7
+0x507B = 0x5BA3
+0x507C = 0x61F8
+0x507D = 0x65CB
+0x507E = 0x7384
+0x5121 = 0x9078
+0x5122 = 0x766C
+0x5123 = 0x7729
+0x5124 = 0x7D62
+0x5125 = 0x9774
+0x5126 = 0x859B
+0x5127 = 0x5B78
+0x5128 = 0x7A74
+0x5129 = 0x96EA
+0x512A = 0x8840
+0x512B = 0x52DB
+0x512C = 0x718F
+0x512D = 0x5FAA
+0x512E = 0x65EC
+0x512F = 0x8A62
+0x5130 = 0x5C0B
+0x5131 = 0x99B4
+0x5132 = 0x5DE1
+0x5133 = 0x6B89
+0x5134 = 0x6C5B
+0x5135 = 0x8A13
+0x5136 = 0x8A0A
+0x5137 = 0x905C
+0x5138 = 0x8FC5
+0x5139 = 0x58D3
+0x513A = 0x62BC
+0x513B = 0x9D09
+0x513C = 0x9D28
+0x513D = 0x5440
+0x513E = 0x4E2B
+0x513F = 0x82BD
+0x5140 = 0x7259
+0x5141 = 0x869C
+0x5142 = 0x5D16
+0x5143 = 0x8859
+0x5144 = 0x6DAF
+0x5145 = 0x96C5
+0x5146 = 0x555E
+0x5147 = 0x4E9E
+0x5148 = 0x8A1D
+0x5149 = 0x7109
+0x514A = 0x54BD
+0x514B = 0x95B9
+0x514C = 0x70DF
+0x514D = 0x6DF9
+0x514E = 0x9E7D
+0x514F = 0x56B4
+0x5150 = 0x7814
+0x5151 = 0x8712
+0x5152 = 0x5CA9
+0x5153 = 0x5EF6
+0x5154 = 0x8A00
+0x5155 = 0x9854
+0x5156 = 0x95BB
+0x5157 = 0x708E
+0x5158 = 0x6CBF
+0x5159 = 0x5944
+0x515A = 0x63A9
+0x515B = 0x773C
+0x515C = 0x884D
+0x515D = 0x6F14
+0x515E = 0x8277
+0x515F = 0x5830
+0x5160 = 0x71D5
+0x5161 = 0x53AD
+0x5162 = 0x786F
+0x5163 = 0x96C1
+0x5164 = 0x5501
+0x5165 = 0x5F66
+0x5166 = 0x7130
+0x5167 = 0x5BB4
+0x5168 = 0x8AFA
+0x5169 = 0x9A57
+0x516A = 0x6B83
+0x516B = 0x592E
+0x516C = 0x9D26
+0x516D = 0x79E7
+0x516E = 0x694A
+0x516F = 0x63DA
+0x5170 = 0x4F6F
+0x5171 = 0x760D
+0x5172 = 0x7F8A
+0x5173 = 0x6D0B
+0x5174 = 0x967D
+0x5175 = 0x6C27
+0x5176 = 0x4EF0
+0x5177 = 0x7662
+0x5178 = 0x990A
+0x5179 = 0x6A23
+0x517A = 0x6F3E
+0x517B = 0x9080
+0x517C = 0x8170
+0x517D = 0x5996
+0x517E = 0x7476
+0x5221 = 0x6447
+0x5222 = 0x582F
+0x5223 = 0x9065
+0x5224 = 0x7A91
+0x5225 = 0x8B21
+0x5226 = 0x59DA
+0x5227 = 0x54AC
+0x5228 = 0x8200
+0x5229 = 0x85E5
+0x522A = 0x8981
+0x522B = 0x8000
+0x522C = 0x6930
+0x522D = 0x564E
+0x522E = 0x8036
+0x522F = 0x723A
+0x5230 = 0x91CE
+0x5231 = 0x51B6
+0x5232 = 0x4E5F
+0x5233 = 0x9801
+0x5234 = 0x6396
+0x5235 = 0x696D
+0x5236 = 0x8449
+0x5237 = 0x66F3
+0x5238 = 0x814B
+0x5239 = 0x591C
+0x523A = 0x6DB2
+0x523B = 0x4E00
+0x523C = 0x58F9
+0x523D = 0x91AB
+0x523E = 0x63D6
+0x523F = 0x92A5
+0x5240 = 0x4F9D
+0x5241 = 0x4F0A
+0x5242 = 0x8863
+0x5243 = 0x9824
+0x5244 = 0x5937
+0x5245 = 0x907A
+0x5246 = 0x79FB
+0x5247 = 0x5100
+0x5248 = 0x80F0
+0x5249 = 0x7591
+0x524A = 0x6C82
+0x524B = 0x5B9C
+0x524C = 0x59E8
+0x524D = 0x5F5D
+0x524E = 0x6905
+0x524F = 0x87FB
+0x5250 = 0x501A
+0x5251 = 0x5DF2
+0x5252 = 0x4E59
+0x5253 = 0x77E3
+0x5254 = 0x4EE5
+0x5255 = 0x85DD
+0x5256 = 0x6291
+0x5257 = 0x6613
+0x5258 = 0x9091
+0x5259 = 0x5C79
+0x525A = 0x5104
+0x525B = 0x5F79
+0x525C = 0x81C6
+0x525D = 0x9038
+0x525E = 0x8084
+0x525F = 0x75AB
+0x5260 = 0x4EA6
+0x5261 = 0x88D4
+0x5262 = 0x610F
+0x5263 = 0x6BC5
+0x5264 = 0x61B6
+0x5265 = 0x7FA9
+0x5266 = 0x76CA
+0x5267 = 0x6EA2
+0x5268 = 0x8A63
+0x5269 = 0x8B70
+0x526A = 0x8ABC
+0x526B = 0x8B6F
+0x526C = 0x5F02
+0x526D = 0x7FFC
+0x526E = 0x7FCC
+0x526F = 0x7E79
+0x5270 = 0x8335
+0x5271 = 0x852D
+0x5272 = 0x56E0
+0x5273 = 0x6BB7
+0x5274 = 0x97F3
+0x5275 = 0x9670
+0x5276 = 0x59FB
+0x5277 = 0x541F
+0x5278 = 0x9280
+0x5279 = 0x6DEB
+0x527A = 0x5BC5
+0x527B = 0x98F2
+0x527C = 0x5C39
+0x527D = 0x5F15
+0x527E = 0x96B1
+0x5321 = 0x5370
+0x5322 = 0x82F1
+0x5323 = 0x6AFB
+0x5324 = 0x5B30
+0x5325 = 0x9DF9
+0x5326 = 0x61C9
+0x5327 = 0x7E93
+0x5328 = 0x7469
+0x5329 = 0x87A2
+0x532A = 0x71DF
+0x532B = 0x7192
+0x532C = 0x8805
+0x532D = 0x8FCE
+0x532E = 0x8D0F
+0x532F = 0x76C8
+0x5330 = 0x5F71
+0x5331 = 0x7A4E
+0x5332 = 0x786C
+0x5333 = 0x6620
+0x5334 = 0x55B2
+0x5335 = 0x64C1
+0x5336 = 0x50AD
+0x5337 = 0x81C3
+0x5338 = 0x7670
+0x5339 = 0x5EB8
+0x533A = 0x96CD
+0x533B = 0x8E34
+0x533C = 0x86F9
+0x533D = 0x548F
+0x533E = 0x6CF3
+0x533F = 0x6D8C
+0x5340 = 0x6C38
+0x5341 = 0x607F
+0x5342 = 0x52C7
+0x5343 = 0x7528
+0x5344 = 0x5E7D
+0x5345 = 0x512A
+0x5346 = 0x60A0
+0x5347 = 0x6182
+0x5348 = 0x5C24
+0x5349 = 0x7531
+0x534A = 0x90F5
+0x534B = 0x923E
+0x534C = 0x7336
+0x534D = 0x6CB9
+0x534E = 0x6E38
+0x534F = 0x9149
+0x5350 = 0x6709
+0x5351 = 0x53CB
+0x5352 = 0x53F3
+0x5353 = 0x4F51
+0x5354 = 0x91C9
+0x5355 = 0x8A98
+0x5356 = 0x53C8
+0x5357 = 0x5E7C
+0x5358 = 0x8FC2
+0x5359 = 0x6DE4
+0x535A = 0x4E8E
+0x535B = 0x76C2
+0x535C = 0x6986
+0x535D = 0x865E
+0x535E = 0x611A
+0x535F = 0x8F3F
+0x5360 = 0x9918
+0x5361 = 0x4FDE
+0x5362 = 0x903E
+0x5363 = 0x9B5A
+0x5364 = 0x6109
+0x5365 = 0x6E1D
+0x5366 = 0x6F01
+0x5367 = 0x9685
+0x5368 = 0x4E88
+0x5369 = 0x5A31
+0x536A = 0x96E8
+0x536B = 0x8207
+0x536C = 0x5DBC
+0x536D = 0x79B9
+0x536E = 0x5B87
+0x536F = 0x8A9E
+0x5370 = 0x7FBD
+0x5371 = 0x7389
+0x5372 = 0x57DF
+0x5373 = 0x828B
+0x5374 = 0x9B31
+0x5375 = 0x5401
+0x5376 = 0x9047
+0x5377 = 0x55BB
+0x5378 = 0x5CEA
+0x5379 = 0x5FA1
+0x537A = 0x6108
+0x537B = 0x6B32
+0x537C = 0x7344
+0x537D = 0x80B2
+0x537E = 0x8B7D
+0x5421 = 0x6D74
+0x5422 = 0x5BD3
+0x5423 = 0x88D5
+0x5424 = 0x9810
+0x5425 = 0x8C6B
+0x5426 = 0x99AD
+0x5427 = 0x9D1B
+0x5428 = 0x6DF5
+0x5429 = 0x51A4
+0x542A = 0x5143
+0x542B = 0x57A3
+0x542C = 0x8881
+0x542D = 0x539F
+0x542E = 0x63F4
+0x542F = 0x8F45
+0x5430 = 0x5712
+0x5431 = 0x54E1
+0x5432 = 0x5713
+0x5433 = 0x733F
+0x5434 = 0x6E90
+0x5435 = 0x7DE3
+0x5436 = 0x9060
+0x5437 = 0x82D1
+0x5438 = 0x9858
+0x5439 = 0x6028
+0x543A = 0x9662
+0x543B = 0x66F0
+0x543C = 0x7D04
+0x543D = 0x8D8A
+0x543E = 0x8E8D
+0x543F = 0x9470
+0x5440 = 0x5CB3
+0x5441 = 0x7CA4
+0x5442 = 0x6708
+0x5443 = 0x60A6
+0x5444 = 0x95B2
+0x5445 = 0x8018
+0x5446 = 0x96F2
+0x5447 = 0x9116
+0x5448 = 0x5300
+0x5449 = 0x9695
+0x544A = 0x5141
+0x544B = 0x904B
+0x544C = 0x85F4
+0x544D = 0x9196
+0x544E = 0x6688
+0x544F = 0x97F5
+0x5450 = 0x5B55
+0x5451 = 0x531D
+0x5452 = 0x7838
+0x5453 = 0x96DC
+0x5454 = 0x683D
+0x5455 = 0x54C9
+0x5456 = 0x707E
+0x5457 = 0x5BB0
+0x5458 = 0x8F09
+0x5459 = 0x518D
+0x545A = 0x5728
+0x545B = 0x54B1
+0x545C = 0x6522
+0x545D = 0x66AB
+0x545E = 0x8D0A
+0x545F = 0x8D1C
+0x5460 = 0x81DF
+0x5461 = 0x846C
+0x5462 = 0x906D
+0x5463 = 0x7CDF
+0x5464 = 0x947F
+0x5465 = 0x85FB
+0x5466 = 0x68D7
+0x5467 = 0x65E9
+0x5468 = 0x6FA1
+0x5469 = 0x86A4
+0x546A = 0x8E81
+0x546B = 0x566A
+0x546C = 0x9020
+0x546D = 0x7682
+0x546E = 0x7AC8
+0x546F = 0x71E5
+0x5470 = 0x8CAC
+0x5471 = 0x64C7
+0x5472 = 0x5247
+0x5473 = 0x6FA4
+0x5474 = 0x8CCA
+0x5475 = 0x600E
+0x5476 = 0x589E
+0x5477 = 0x618E
+0x5478 = 0x66FE
+0x5479 = 0x8D08
+0x547A = 0x624E
+0x547B = 0x55B3
+0x547C = 0x6E23
+0x547D = 0x672D
+0x547E = 0x8ECB
+0x5521 = 0x9358
+0x5522 = 0x9598
+0x5523 = 0x7728
+0x5524 = 0x6805
+0x5525 = 0x69A8
+0x5526 = 0x548B
+0x5527 = 0x4E4D
+0x5528 = 0x70B8
+0x5529 = 0x8A50
+0x552A = 0x6458
+0x552B = 0x9F4B
+0x552C = 0x5B85
+0x552D = 0x7A84
+0x552E = 0x50B5
+0x552F = 0x5BE8
+0x5530 = 0x77BB
+0x5531 = 0x6C08
+0x5532 = 0x8A79
+0x5533 = 0x7C98
+0x5534 = 0x6CBE
+0x5535 = 0x76DE
+0x5536 = 0x65AC
+0x5537 = 0x8F3E
+0x5538 = 0x5D84
+0x5539 = 0x5C55
+0x553A = 0x8638
+0x553B = 0x68E7
+0x553C = 0x5360
+0x553D = 0x6230
+0x553E = 0x7AD9
+0x553F = 0x6E5B
+0x5540 = 0x7DBB
+0x5541 = 0x6A1F
+0x5542 = 0x7AE0
+0x5543 = 0x5F70
+0x5544 = 0x6F33
+0x5545 = 0x5F35
+0x5546 = 0x638C
+0x5547 = 0x6F32
+0x5548 = 0x6756
+0x5549 = 0x4E08
+0x554A = 0x5E33
+0x554B = 0x8CEC
+0x554C = 0x4ED7
+0x554D = 0x8139
+0x554E = 0x7634
+0x554F = 0x969C
+0x5550 = 0x62DB
+0x5551 = 0x662D
+0x5552 = 0x627E
+0x5553 = 0x6CBC
+0x5554 = 0x8D99
+0x5555 = 0x7167
+0x5556 = 0x7F69
+0x5557 = 0x5146
+0x5558 = 0x8087
+0x5559 = 0x53EC
+0x555A = 0x906E
+0x555B = 0x6298
+0x555C = 0x54F2
+0x555D = 0x87C4
+0x555E = 0x8F4D
+0x555F = 0x8005
+0x5560 = 0x937A
+0x5561 = 0x8517
+0x5562 = 0x9019
+0x5563 = 0x6D59
+0x5564 = 0x73CD
+0x5565 = 0x659F
+0x5566 = 0x771F
+0x5567 = 0x7504
+0x5568 = 0x7827
+0x5569 = 0x81FB
+0x556A = 0x8C9E
+0x556B = 0x91DD
+0x556C = 0x5075
+0x556D = 0x6795
+0x556E = 0x75B9
+0x556F = 0x8A3A
+0x5570 = 0x9707
+0x5571 = 0x632F
+0x5572 = 0x93AE
+0x5573 = 0x9663
+0x5574 = 0x84B8
+0x5575 = 0x6399
+0x5576 = 0x775C
+0x5577 = 0x5F81
+0x5578 = 0x7319
+0x5579 = 0x722D
+0x557A = 0x6014
+0x557B = 0x6574
+0x557C = 0x62EF
+0x557D = 0x6B63
+0x557E = 0x653F
+0x5621 = 0x5E40
+0x5622 = 0x7665
+0x5623 = 0x912D
+0x5624 = 0x8B49
+0x5625 = 0x829D
+0x5626 = 0x679D
+0x5627 = 0x652F
+0x5628 = 0x5431
+0x5629 = 0x8718
+0x562A = 0x77E5
+0x562B = 0x80A2
+0x562C = 0x8102
+0x562D = 0x6C41
+0x562E = 0x4E4B
+0x562F = 0x7E54
+0x5630 = 0x8077
+0x5631 = 0x76F4
+0x5632 = 0x690D
+0x5633 = 0x6B96
+0x5634 = 0x57F7
+0x5635 = 0x503C
+0x5636 = 0x4F84
+0x5637 = 0x5740
+0x5638 = 0x6307
+0x5639 = 0x6B62
+0x563A = 0x8DBE
+0x563B = 0x8879
+0x563C = 0x65E8
+0x563D = 0x7D19
+0x563E = 0x5FD7
+0x563F = 0x646F
+0x5640 = 0x64F2
+0x5641 = 0x81F3
+0x5642 = 0x81F4
+0x5643 = 0x7F6E
+0x5644 = 0x5E5F
+0x5645 = 0x5CD9
+0x5646 = 0x5236
+0x5647 = 0x667A
+0x5648 = 0x79E9
+0x5649 = 0x7A1A
+0x564A = 0x8CEA
+0x564B = 0x7099
+0x564C = 0x75D4
+0x564D = 0x6EEF
+0x564E = 0x6CBB
+0x564F = 0x7A92
+0x5650 = 0x4E2D
+0x5651 = 0x76C5
+0x5652 = 0x5FE0
+0x5653 = 0x9418
+0x5654 = 0x8877
+0x5655 = 0x7D42
+0x5656 = 0x7A2E
+0x5657 = 0x816B
+0x5658 = 0x91CD
+0x5659 = 0x4EF2
+0x565A = 0x8846
+0x565B = 0x821F
+0x565C = 0x5468
+0x565D = 0x5DDE
+0x565E = 0x6D32
+0x565F = 0x8B05
+0x5660 = 0x7CA5
+0x5661 = 0x8EF8
+0x5662 = 0x8098
+0x5663 = 0x5E1A
+0x5664 = 0x5492
+0x5665 = 0x76BA
+0x5666 = 0x5B99
+0x5667 = 0x665D
+0x5668 = 0x9A5F
+0x5669 = 0x73E0
+0x566A = 0x682A
+0x566B = 0x86DB
+0x566C = 0x6731
+0x566D = 0x732A
+0x566E = 0x8AF8
+0x566F = 0x8A85
+0x5670 = 0x9010
+0x5671 = 0x7AF9
+0x5672 = 0x71ED
+0x5673 = 0x716E
+0x5674 = 0x62C4
+0x5675 = 0x77DA
+0x5676 = 0x56D1
+0x5677 = 0x4E3B
+0x5678 = 0x8457
+0x5679 = 0x67F1
+0x567A = 0x52A9
+0x567B = 0x86C0
+0x567C = 0x8CAF
+0x567D = 0x9444
+0x567E = 0x7BC9
+0x5721 = 0x4F4F
+0x5722 = 0x6CE8
+0x5723 = 0x795D
+0x5724 = 0x99D0
+0x5725 = 0x6293
+0x5726 = 0x722A
+0x5727 = 0x62FD
+0x5728 = 0x5C08
+0x5729 = 0x78DA
+0x572A = 0x8F49
+0x572B = 0x64B0
+0x572C = 0x8CFA
+0x572D = 0x7BC6
+0x572E = 0x6A01
+0x572F = 0x838A
+0x5730 = 0x88DD
+0x5731 = 0x599D
+0x5732 = 0x649E
+0x5733 = 0x58EF
+0x5734 = 0x72C0
+0x5735 = 0x690E
+0x5736 = 0x9310
+0x5737 = 0x8FFD
+0x5738 = 0x8D05
+0x5739 = 0x589C
+0x573A = 0x7DB4
+0x573B = 0x8AC4
+0x573C = 0x6E96
+0x573D = 0x6349
+0x573E = 0x62D9
+0x573F = 0x5353
+0x5740 = 0x684C
+0x5741 = 0x7422
+0x5742 = 0x8301
+0x5743 = 0x914C
+0x5744 = 0x5544
+0x5745 = 0x7740
+0x5746 = 0x707C
+0x5747 = 0x6FC1
+0x5748 = 0x5179
+0x5749 = 0x54A8
+0x574A = 0x8CC7
+0x574B = 0x59FF
+0x574C = 0x6ECB
+0x574D = 0x6DC4
+0x574E = 0x5B5C
+0x574F = 0x7D2B
+0x5750 = 0x4ED4
+0x5751 = 0x7C7D
+0x5752 = 0x6ED3
+0x5753 = 0x5B50
+0x5754 = 0x81EA
+0x5755 = 0x6F2C
+0x5756 = 0x5B57
+0x5757 = 0x9B03
+0x5758 = 0x68D5
+0x5759 = 0x8E2A
+0x575A = 0x5B97
+0x575B = 0x7D9C
+0x575C = 0x7E3D
+0x575D = 0x7E31
+0x575E = 0x9112
+0x575F = 0x8D70
+0x5760 = 0x594F
+0x5761 = 0x63CD
+0x5762 = 0x79DF
+0x5763 = 0x8DB3
+0x5764 = 0x5352
+0x5765 = 0x65CF
+0x5766 = 0x7956
+0x5767 = 0x8A5B
+0x5768 = 0x963B
+0x5769 = 0x7D44
+0x576A = 0x947D
+0x576B = 0x7E82
+0x576C = 0x5634
+0x576D = 0x9189
+0x576E = 0x6700
+0x576F = 0x7F6A
+0x5770 = 0x5C0A
+0x5771 = 0x9075
+0x5772 = 0x6628
+0x5773 = 0x5DE6
+0x5774 = 0x4F50
+0x5775 = 0x67DE
+0x5776 = 0x505A
+0x5777 = 0x4F5C
+0x5778 = 0x5750
+0x5779 = 0x5EA7
+0x5821 = 0x4E8D
+0x5822 = 0x4E0C
+0x5823 = 0x5140
+0x5824 = 0x4E10
+0x5825 = 0x5EFF
+0x5826 = 0x5345
+0x5827 = 0x4E15
+0x5828 = 0x4E98
+0x5829 = 0x4E1E
+0x582A = 0x9B32
+0x582B = 0x5B6C
+0x582C = 0x5669
+0x582D = 0x4E28
+0x582E = 0x79BA
+0x582F = 0x4E3F
+0x5830 = 0x5315
+0x5831 = 0x4E47
+0x5832 = 0x592D
+0x5833 = 0x723B
+0x5834 = 0x536E
+0x5835 = 0x6C10
+0x5836 = 0x56DF
+0x5837 = 0x80E4
+0x5838 = 0x9997
+0x5839 = 0x6BD3
+0x583A = 0x777E
+0x583B = 0x9F17
+0x583C = 0x4E36
+0x583D = 0x4E9F
+0x583E = 0x9F10
+0x583F = 0x4E5C
+0x5840 = 0x4E69
+0x5841 = 0x4E93
+0x5842 = 0x8288
+0x5843 = 0x5B5B
+0x5844 = 0x55C7
+0x5845 = 0x560F
+0x5846 = 0x4EC4
+0x5847 = 0x5399
+0x5848 = 0x539D
+0x5849 = 0x53B4
+0x584A = 0x53A5
+0x584B = 0x53AE
+0x584C = 0x9768
+0x584D = 0x8D0B
+0x584E = 0x531A
+0x584F = 0x53F5
+0x5850 = 0x532D
+0x5851 = 0x5331
+0x5852 = 0x533E
+0x5853 = 0x8CFE
+0x5854 = 0x5366
+0x5855 = 0x5363
+0x5856 = 0x5202
+0x5857 = 0x5208
+0x5858 = 0x520E
+0x5859 = 0x5244
+0x585A = 0x5233
+0x585B = 0x528C
+0x585C = 0x5274
+0x585D = 0x524C
+0x585E = 0x525E
+0x585F = 0x5261
+0x5860 = 0x525C
+0x5861 = 0x84AF
+0x5862 = 0x527D
+0x5863 = 0x5282
+0x5864 = 0x5281
+0x5865 = 0x5290
+0x5866 = 0x5293
+0x5867 = 0x5182
+0x5868 = 0x7F54
+0x5869 = 0x4EBB
+0x586A = 0x4EC3
+0x586B = 0x4EC9
+0x586C = 0x4EC2
+0x586D = 0x4EE8
+0x586E = 0x4EE1
+0x586F = 0x4EEB
+0x5870 = 0x4EDE
+0x5871 = 0x50B4
+0x5872 = 0x4EF3
+0x5873 = 0x4F22
+0x5874 = 0x4F64
+0x5875 = 0x4EF5
+0x5876 = 0x5000
+0x5877 = 0x5096
+0x5878 = 0x4F09
+0x5879 = 0x4F47
+0x587A = 0x4F5E
+0x587B = 0x4F67
+0x587C = 0x6538
+0x587D = 0x4F5A
+0x587E = 0x4F5D
+0x5921 = 0x4F5F
+0x5922 = 0x4F57
+0x5923 = 0x4F32
+0x5924 = 0x4F3D
+0x5925 = 0x4F76
+0x5926 = 0x4F74
+0x5927 = 0x4F91
+0x5928 = 0x4F89
+0x5929 = 0x4F83
+0x592A = 0x4F8F
+0x592B = 0x4F7E
+0x592C = 0x4F7B
+0x592D = 0x5115
+0x592E = 0x4F7C
+0x592F = 0x5102
+0x5930 = 0x4F94
+0x5931 = 0x5114
+0x5932 = 0x513C
+0x5933 = 0x5137
+0x5934 = 0x4FC5
+0x5935 = 0x4FDA
+0x5936 = 0x4FE3
+0x5937 = 0x4FDC
+0x5938 = 0x4FD1
+0x5939 = 0x4FDF
+0x593A = 0x4FF8
+0x593B = 0x5029
+0x593C = 0x504C
+0x593D = 0x4FF3
+0x593E = 0x502C
+0x593F = 0x500F
+0x5940 = 0x502E
+0x5941 = 0x502D
+0x5942 = 0x4FFE
+0x5943 = 0x501C
+0x5944 = 0x500C
+0x5945 = 0x5025
+0x5946 = 0x5028
+0x5947 = 0x50E8
+0x5948 = 0x5043
+0x5949 = 0x5055
+0x594A = 0x5048
+0x594B = 0x504E
+0x594C = 0x506C
+0x594D = 0x50C2
+0x594E = 0x513B
+0x594F = 0x5110
+0x5950 = 0x513A
+0x5951 = 0x50BA
+0x5952 = 0x50D6
+0x5953 = 0x5106
+0x5954 = 0x50ED
+0x5955 = 0x50EC
+0x5956 = 0x50E6
+0x5957 = 0x50EE
+0x5958 = 0x5107
+0x5959 = 0x510B
+0x595A = 0x4EDD
+0x595B = 0x6C3D
+0x595C = 0x4F58
+0x595D = 0x50C9
+0x595E = 0x4FCE
+0x595F = 0x9FA0
+0x5960 = 0x6C46
+0x5961 = 0x7CF4
+0x5962 = 0x516E
+0x5963 = 0x5DFD
+0x5964 = 0x9ECC
+0x5965 = 0x9998
+0x5966 = 0x56C5
+0x5967 = 0x5914
+0x5968 = 0x52F9
+0x5969 = 0x530D
+0x596A = 0x8A07
+0x596B = 0x5310
+0x596C = 0x9CEC
+0x596D = 0x5919
+0x596E = 0x5155
+0x596F = 0x4EA0
+0x5970 = 0x5156
+0x5971 = 0x4EB3
+0x5972 = 0x886E
+0x5973 = 0x88A4
+0x5974 = 0x893B
+0x5975 = 0x81E0
+0x5976 = 0x88D2
+0x5977 = 0x7980
+0x5978 = 0x5B34
+0x5979 = 0x8803
+0x597A = 0x7FB8
+0x597B = 0x51AB
+0x597C = 0x51B1
+0x597D = 0x51BD
+0x597E = 0x51BC
+0x5A21 = 0x51C7
+0x5A22 = 0x5196
+0x5A23 = 0x51A2
+0x5A24 = 0x51A5
+0x5A25 = 0x8A01
+0x5A26 = 0x8A10
+0x5A27 = 0x8A0C
+0x5A28 = 0x8A15
+0x5A29 = 0x8B33
+0x5A2A = 0x8A4E
+0x5A2B = 0x8A25
+0x5A2C = 0x8A41
+0x5A2D = 0x8A36
+0x5A2E = 0x8A46
+0x5A2F = 0x8A54
+0x5A30 = 0x8A58
+0x5A31 = 0x8A52
+0x5A32 = 0x8A86
+0x5A33 = 0x8A84
+0x5A34 = 0x8A7F
+0x5A35 = 0x8A70
+0x5A36 = 0x8A7C
+0x5A37 = 0x8A75
+0x5A38 = 0x8A6C
+0x5A39 = 0x8A6E
+0x5A3A = 0x8ACD
+0x5A3B = 0x8AE2
+0x5A3C = 0x8A61
+0x5A3D = 0x8A9A
+0x5A3E = 0x8AA5
+0x5A3F = 0x8A91
+0x5A40 = 0x8A92
+0x5A41 = 0x8ACF
+0x5A42 = 0x8AD1
+0x5A43 = 0x8AC9
+0x5A44 = 0x8ADB
+0x5A45 = 0x8AD7
+0x5A46 = 0x8AC2
+0x5A47 = 0x8AB6
+0x5A48 = 0x8AF6
+0x5A49 = 0x8AEB
+0x5A4A = 0x8B14
+0x5A4B = 0x8B01
+0x5A4C = 0x8AE4
+0x5A4D = 0x8AED
+0x5A4E = 0x8AFC
+0x5A4F = 0x8AF3
+0x5A50 = 0x8AE6
+0x5A51 = 0x8AEE
+0x5A52 = 0x8ADE
+0x5A53 = 0x8B28
+0x5A54 = 0x8B9C
+0x5A55 = 0x8B16
+0x5A56 = 0x8B1A
+0x5A57 = 0x8B10
+0x5A58 = 0x8B2B
+0x5A59 = 0x8B2D
+0x5A5A = 0x8B56
+0x5A5B = 0x8B59
+0x5A5C = 0x8B4E
+0x5A5D = 0x8B9E
+0x5A5E = 0x8B6B
+0x5A5F = 0x8B96
+0x5A60 = 0x5369
+0x5A61 = 0x537A
+0x5A62 = 0x961D
+0x5A63 = 0x9622
+0x5A64 = 0x9621
+0x5A65 = 0x9631
+0x5A66 = 0x962A
+0x5A67 = 0x963D
+0x5A68 = 0x963C
+0x5A69 = 0x9642
+0x5A6A = 0x9658
+0x5A6B = 0x9654
+0x5A6C = 0x965F
+0x5A6D = 0x9689
+0x5A6E = 0x966C
+0x5A6F = 0x9672
+0x5A70 = 0x9674
+0x5A71 = 0x9688
+0x5A72 = 0x968D
+0x5A73 = 0x9697
+0x5A74 = 0x96B0
+0x5A75 = 0x9097
+0x5A76 = 0x909B
+0x5A77 = 0x913A
+0x5A78 = 0x9099
+0x5A79 = 0x9114
+0x5A7A = 0x90A1
+0x5A7B = 0x90B4
+0x5A7C = 0x90B3
+0x5A7D = 0x90B6
+0x5A7E = 0x9134
+0x5B21 = 0x90B8
+0x5B22 = 0x90B0
+0x5B23 = 0x90DF
+0x5B24 = 0x90C5
+0x5B25 = 0x90BE
+0x5B26 = 0x9136
+0x5B27 = 0x90C4
+0x5B28 = 0x90C7
+0x5B29 = 0x9106
+0x5B2A = 0x9148
+0x5B2B = 0x90E2
+0x5B2C = 0x90DC
+0x5B2D = 0x90D7
+0x5B2E = 0x90DB
+0x5B2F = 0x90EB
+0x5B30 = 0x90EF
+0x5B31 = 0x90FE
+0x5B32 = 0x9104
+0x5B33 = 0x9122
+0x5B34 = 0x911E
+0x5B35 = 0x9123
+0x5B36 = 0x9131
+0x5B37 = 0x912F
+0x5B38 = 0x9139
+0x5B39 = 0x9143
+0x5B3A = 0x9146
+0x5B3B = 0x82BB
+0x5B3C = 0x5950
+0x5B3D = 0x52F1
+0x5B3E = 0x52AC
+0x5B3F = 0x52AD
+0x5B40 = 0x52BE
+0x5B41 = 0x54FF
+0x5B42 = 0x52D0
+0x5B43 = 0x52D6
+0x5B44 = 0x52F0
+0x5B45 = 0x53DF
+0x5B46 = 0x71EE
+0x5B47 = 0x77CD
+0x5B48 = 0x5EF4
+0x5B49 = 0x51F5
+0x5B4A = 0x51FC
+0x5B4B = 0x9B2F
+0x5B4C = 0x53B6
+0x5B4D = 0x5F01
+0x5B4E = 0x755A
+0x5B4F = 0x5DF0
+0x5B50 = 0x574C
+0x5B51 = 0x580A
+0x5B52 = 0x57A1
+0x5B53 = 0x587E
+0x5B54 = 0x58BC
+0x5B55 = 0x58C5
+0x5B56 = 0x58D1
+0x5B57 = 0x5729
+0x5B58 = 0x572C
+0x5B59 = 0x572A
+0x5B5A = 0x5733
+0x5B5B = 0x58D9
+0x5B5C = 0x572E
+0x5B5D = 0x572F
+0x5B5E = 0x58E2
+0x5B5F = 0x573B
+0x5B60 = 0x5742
+0x5B61 = 0x5769
+0x5B62 = 0x58E0
+0x5B63 = 0x576B
+0x5B64 = 0x58DA
+0x5B65 = 0x577C
+0x5B66 = 0x577B
+0x5B67 = 0x5768
+0x5B68 = 0x576D
+0x5B69 = 0x5776
+0x5B6A = 0x5773
+0x5B6B = 0x57E1
+0x5B6C = 0x57A4
+0x5B6D = 0x578C
+0x5B6E = 0x584F
+0x5B6F = 0x57CF
+0x5B70 = 0x57A7
+0x5B71 = 0x5816
+0x5B72 = 0x5793
+0x5B73 = 0x57A0
+0x5B74 = 0x57D5
+0x5B75 = 0x5852
+0x5B76 = 0x581D
+0x5B77 = 0x5864
+0x5B78 = 0x57D2
+0x5B79 = 0x57B8
+0x5B7A = 0x57F4
+0x5B7B = 0x57EF
+0x5B7C = 0x57F8
+0x5B7D = 0x57E4
+0x5B7E = 0x57DD
+0x5C21 = 0x580B
+0x5C22 = 0x580D
+0x5C23 = 0x57FD
+0x5C24 = 0x57ED
+0x5C25 = 0x5800
+0x5C26 = 0x581E
+0x5C27 = 0x5819
+0x5C28 = 0x5844
+0x5C29 = 0x5820
+0x5C2A = 0x5865
+0x5C2B = 0x586C
+0x5C2C = 0x5881
+0x5C2D = 0x5889
+0x5C2E = 0x589A
+0x5C2F = 0x5880
+0x5C30 = 0x99A8
+0x5C31 = 0x9F19
+0x5C32 = 0x61FF
+0x5C33 = 0x8279
+0x5C34 = 0x827D
+0x5C35 = 0x827F
+0x5C36 = 0x828F
+0x5C37 = 0x828A
+0x5C38 = 0x82A8
+0x5C39 = 0x8284
+0x5C3A = 0x828E
+0x5C3B = 0x8291
+0x5C3C = 0x858C
+0x5C3D = 0x8299
+0x5C3E = 0x82AB
+0x5C3F = 0x8553
+0x5C40 = 0x82BE
+0x5C41 = 0x82B0
+0x5C42 = 0x85F6
+0x5C43 = 0x82CA
+0x5C44 = 0x82E3
+0x5C45 = 0x8298
+0x5C46 = 0x82B7
+0x5C47 = 0x82AE
+0x5C48 = 0x83A7
+0x5C49 = 0x8407
+0x5C4A = 0x84EF
+0x5C4B = 0x82A9
+0x5C4C = 0x82B4
+0x5C4D = 0x82A1
+0x5C4E = 0x82AA
+0x5C4F = 0x829F
+0x5C50 = 0x82C4
+0x5C51 = 0x82E7
+0x5C52 = 0x82A4
+0x5C53 = 0x82E1
+0x5C54 = 0x8309
+0x5C55 = 0x82F7
+0x5C56 = 0x82E4
+0x5C57 = 0x8622
+0x5C58 = 0x8307
+0x5C59 = 0x82DC
+0x5C5A = 0x82F4
+0x5C5B = 0x82D2
+0x5C5C = 0x82D8
+0x5C5D = 0x830C
+0x5C5E = 0x82FB
+0x5C5F = 0x82D3
+0x5C60 = 0x8526
+0x5C61 = 0x831A
+0x5C62 = 0x8306
+0x5C63 = 0x584B
+0x5C64 = 0x7162
+0x5C65 = 0x82E0
+0x5C66 = 0x82D5
+0x5C67 = 0x831C
+0x5C68 = 0x8351
+0x5C69 = 0x8558
+0x5C6A = 0x84FD
+0x5C6B = 0x8308
+0x5C6C = 0x8392
+0x5C6D = 0x833C
+0x5C6E = 0x8334
+0x5C6F = 0x8331
+0x5C70 = 0x839B
+0x5C71 = 0x854E
+0x5C72 = 0x832F
+0x5C73 = 0x834F
+0x5C74 = 0x8347
+0x5C75 = 0x8343
+0x5C76 = 0x8588
+0x5C77 = 0x8340
+0x5C78 = 0x8317
+0x5C79 = 0x85BA
+0x5C7A = 0x832D
+0x5C7B = 0x833A
+0x5C7C = 0x8333
+0x5C7D = 0x7296
+0x5C7E = 0x6ECE
+0x5D21 = 0x8541
+0x5D22 = 0x831B
+0x5D23 = 0x85CE
+0x5D24 = 0x8552
+0x5D25 = 0x84C0
+0x5D26 = 0x8452
+0x5D27 = 0x8464
+0x5D28 = 0x83B0
+0x5D29 = 0x8378
+0x5D2A = 0x8494
+0x5D2B = 0x8435
+0x5D2C = 0x83A0
+0x5D2D = 0x83AA
+0x5D2E = 0x8393
+0x5D2F = 0x839C
+0x5D30 = 0x8385
+0x5D31 = 0x837C
+0x5D32 = 0x859F
+0x5D33 = 0x83A9
+0x5D34 = 0x837D
+0x5D35 = 0x8555
+0x5D36 = 0x837B
+0x5D37 = 0x8398
+0x5D38 = 0x839E
+0x5D39 = 0x83A8
+0x5D3A = 0x9DAF
+0x5D3B = 0x8493
+0x5D3C = 0x83C1
+0x5D3D = 0x8401
+0x5D3E = 0x83E5
+0x5D3F = 0x83D8
+0x5D40 = 0x5807
+0x5D41 = 0x8418
+0x5D42 = 0x840B
+0x5D43 = 0x83DD
+0x5D44 = 0x83FD
+0x5D45 = 0x83D6
+0x5D46 = 0x841C
+0x5D47 = 0x8438
+0x5D48 = 0x8411
+0x5D49 = 0x8406
+0x5D4A = 0x83D4
+0x5D4B = 0x83DF
+0x5D4C = 0x840F
+0x5D4D = 0x8403
+0x5D4E = 0x83F8
+0x5D4F = 0x83F9
+0x5D50 = 0x83EA
+0x5D51 = 0x83C5
+0x5D52 = 0x83C0
+0x5D53 = 0x7E08
+0x5D54 = 0x83F0
+0x5D55 = 0x83E1
+0x5D56 = 0x845C
+0x5D57 = 0x8451
+0x5D58 = 0x845A
+0x5D59 = 0x8459
+0x5D5A = 0x8473
+0x5D5B = 0x8546
+0x5D5C = 0x8488
+0x5D5D = 0x847A
+0x5D5E = 0x8562
+0x5D5F = 0x8478
+0x5D60 = 0x843C
+0x5D61 = 0x8446
+0x5D62 = 0x8469
+0x5D63 = 0x8476
+0x5D64 = 0x851E
+0x5D65 = 0x848E
+0x5D66 = 0x8431
+0x5D67 = 0x846D
+0x5D68 = 0x84C1
+0x5D69 = 0x84CD
+0x5D6A = 0x84D0
+0x5D6B = 0x9A40
+0x5D6C = 0x84BD
+0x5D6D = 0x84D3
+0x5D6E = 0x84CA
+0x5D6F = 0x84BF
+0x5D70 = 0x84BA
+0x5D71 = 0x863A
+0x5D72 = 0x84A1
+0x5D73 = 0x84B9
+0x5D74 = 0x84B4
+0x5D75 = 0x8497
+0x5D76 = 0x93A3
+0x5D77 = 0x8577
+0x5D78 = 0x850C
+0x5D79 = 0x750D
+0x5D7A = 0x8538
+0x5D7B = 0x84F0
+0x5D7C = 0x861E
+0x5D7D = 0x851F
+0x5D7E = 0x85FA
+0x5E21 = 0x8556
+0x5E22 = 0x853B
+0x5E23 = 0x84FF
+0x5E24 = 0x84FC
+0x5E25 = 0x8559
+0x5E26 = 0x8548
+0x5E27 = 0x8568
+0x5E28 = 0x8564
+0x5E29 = 0x855E
+0x5E2A = 0x857A
+0x5E2B = 0x77A2
+0x5E2C = 0x8543
+0x5E2D = 0x8604
+0x5E2E = 0x857B
+0x5E2F = 0x85A4
+0x5E30 = 0x85A8
+0x5E31 = 0x8587
+0x5E32 = 0x858F
+0x5E33 = 0x8579
+0x5E34 = 0x85EA
+0x5E35 = 0x859C
+0x5E36 = 0x8585
+0x5E37 = 0x85B9
+0x5E38 = 0x85B7
+0x5E39 = 0x85B0
+0x5E3A = 0x861A
+0x5E3B = 0x85C1
+0x5E3C = 0x85DC
+0x5E3D = 0x85FF
+0x5E3E = 0x8627
+0x5E3F = 0x8605
+0x5E40 = 0x8629
+0x5E41 = 0x8616
+0x5E42 = 0x863C
+0x5E43 = 0x5EFE
+0x5E44 = 0x5F08
+0x5E45 = 0x593C
+0x5E46 = 0x5969
+0x5E47 = 0x8037
+0x5E48 = 0x5955
+0x5E49 = 0x595A
+0x5E4A = 0x5958
+0x5E4B = 0x530F
+0x5E4C = 0x5C22
+0x5E4D = 0x5C25
+0x5E4E = 0x5C2C
+0x5E4F = 0x5C37
+0x5E50 = 0x624C
+0x5E51 = 0x636B
+0x5E52 = 0x6476
+0x5E53 = 0x62BB
+0x5E54 = 0x62CA
+0x5E55 = 0x62DA
+0x5E56 = 0x62D7
+0x5E57 = 0x62EE
+0x5E58 = 0x649F
+0x5E59 = 0x62F6
+0x5E5A = 0x6339
+0x5E5B = 0x634B
+0x5E5C = 0x6343
+0x5E5D = 0x63AD
+0x5E5E = 0x63F6
+0x5E5F = 0x6371
+0x5E60 = 0x637A
+0x5E61 = 0x638E
+0x5E62 = 0x6451
+0x5E63 = 0x636D
+0x5E64 = 0x63AC
+0x5E65 = 0x638A
+0x5E66 = 0x6369
+0x5E67 = 0x63AE
+0x5E68 = 0x645C
+0x5E69 = 0x63F2
+0x5E6A = 0x63F8
+0x5E6B = 0x63E0
+0x5E6C = 0x64B3
+0x5E6D = 0x63C4
+0x5E6E = 0x63DE
+0x5E6F = 0x63CE
+0x5E70 = 0x6452
+0x5E71 = 0x63C6
+0x5E72 = 0x63BE
+0x5E73 = 0x6504
+0x5E74 = 0x6441
+0x5E75 = 0x640B
+0x5E76 = 0x641B
+0x5E77 = 0x6420
+0x5E78 = 0x640C
+0x5E79 = 0x6426
+0x5E7A = 0x6421
+0x5E7B = 0x645E
+0x5E7C = 0x6516
+0x5E7D = 0x646D
+0x5E7E = 0x6496
+0x5F21 = 0x647A
+0x5F22 = 0x64F7
+0x5F23 = 0x64FC
+0x5F24 = 0x6499
+0x5F25 = 0x651B
+0x5F26 = 0x64C0
+0x5F27 = 0x64D0
+0x5F28 = 0x64D7
+0x5F29 = 0x64E4
+0x5F2A = 0x64E2
+0x5F2B = 0x6509
+0x5F2C = 0x6525
+0x5F2D = 0x652E
+0x5F2E = 0x5F0B
+0x5F2F = 0x5FD2
+0x5F30 = 0x7519
+0x5F31 = 0x5F11
+0x5F32 = 0x535F
+0x5F33 = 0x53F1
+0x5F34 = 0x5630
+0x5F35 = 0x53E9
+0x5F36 = 0x53E8
+0x5F37 = 0x53FB
+0x5F38 = 0x5412
+0x5F39 = 0x5416
+0x5F3A = 0x5406
+0x5F3B = 0x544B
+0x5F3C = 0x5638
+0x5F3D = 0x56C8
+0x5F3E = 0x5454
+0x5F3F = 0x56A6
+0x5F40 = 0x5443
+0x5F41 = 0x5421
+0x5F42 = 0x5504
+0x5F43 = 0x54BC
+0x5F44 = 0x5423
+0x5F45 = 0x5432
+0x5F46 = 0x5482
+0x5F47 = 0x5494
+0x5F48 = 0x5477
+0x5F49 = 0x5471
+0x5F4A = 0x5464
+0x5F4B = 0x549A
+0x5F4C = 0x5680
+0x5F4D = 0x5484
+0x5F4E = 0x5476
+0x5F4F = 0x5466
+0x5F50 = 0x565D
+0x5F51 = 0x54D0
+0x5F52 = 0x54AD
+0x5F53 = 0x54C2
+0x5F54 = 0x54B4
+0x5F55 = 0x5660
+0x5F56 = 0x54A7
+0x5F57 = 0x54A6
+0x5F58 = 0x5635
+0x5F59 = 0x55F6
+0x5F5A = 0x5472
+0x5F5B = 0x54A3
+0x5F5C = 0x5666
+0x5F5D = 0x54BB
+0x5F5E = 0x54BF
+0x5F5F = 0x54CC
+0x5F60 = 0x5672
+0x5F61 = 0x54DA
+0x5F62 = 0x568C
+0x5F63 = 0x54A9
+0x5F64 = 0x54AA
+0x5F65 = 0x54A4
+0x5F66 = 0x5665
+0x5F67 = 0x54CF
+0x5F68 = 0x54DE
+0x5F69 = 0x561C
+0x5F6A = 0x54E7
+0x5F6B = 0x562E
+0x5F6C = 0x54FD
+0x5F6D = 0x5514
+0x5F6E = 0x54F3
+0x5F6F = 0x55E9
+0x5F70 = 0x5523
+0x5F71 = 0x550F
+0x5F72 = 0x5511
+0x5F73 = 0x5527
+0x5F74 = 0x552A
+0x5F75 = 0x5616
+0x5F76 = 0x558F
+0x5F77 = 0x55B5
+0x5F78 = 0x5549
+0x5F79 = 0x56C0
+0x5F7A = 0x5541
+0x5F7B = 0x5555
+0x5F7C = 0x553F
+0x5F7D = 0x5550
+0x5F7E = 0x553C
+0x6021 = 0x5537
+0x6022 = 0x5556
+0x6023 = 0x5575
+0x6024 = 0x5576
+0x6025 = 0x5577
+0x6026 = 0x5533
+0x6027 = 0x5530
+0x6028 = 0x555C
+0x6029 = 0x558B
+0x602A = 0x55D2
+0x602B = 0x5583
+0x602C = 0x55B1
+0x602D = 0x55B9
+0x602E = 0x5588
+0x602F = 0x5581
+0x6030 = 0x559F
+0x6031 = 0x557E
+0x6032 = 0x55D6
+0x6033 = 0x5591
+0x6034 = 0x557B
+0x6035 = 0x55DF
+0x6036 = 0x560D
+0x6037 = 0x56B3
+0x6038 = 0x5594
+0x6039 = 0x5599
+0x603A = 0x55EA
+0x603B = 0x55F7
+0x603C = 0x55C9
+0x603D = 0x561F
+0x603E = 0x55D1
+0x603F = 0x56C1
+0x6040 = 0x55EC
+0x6041 = 0x55D4
+0x6042 = 0x55E6
+0x6043 = 0x55DD
+0x6044 = 0x55C4
+0x6045 = 0x55EF
+0x6046 = 0x55E5
+0x6047 = 0x55F2
+0x6048 = 0x566F
+0x6049 = 0x55CC
+0x604A = 0x55CD
+0x604B = 0x55E8
+0x604C = 0x55F5
+0x604D = 0x55E4
+0x604E = 0x8F61
+0x604F = 0x561E
+0x6050 = 0x5608
+0x6051 = 0x560C
+0x6052 = 0x5601
+0x6053 = 0x56B6
+0x6054 = 0x5623
+0x6055 = 0x55FE
+0x6056 = 0x5600
+0x6057 = 0x5627
+0x6058 = 0x562D
+0x6059 = 0x5658
+0x605A = 0x5639
+0x605B = 0x5657
+0x605C = 0x562C
+0x605D = 0x564D
+0x605E = 0x5662
+0x605F = 0x5659
+0x6060 = 0x5695
+0x6061 = 0x564C
+0x6062 = 0x5654
+0x6063 = 0x5686
+0x6064 = 0x5664
+0x6065 = 0x5671
+0x6066 = 0x566B
+0x6067 = 0x567B
+0x6068 = 0x567C
+0x6069 = 0x5685
+0x606A = 0x5693
+0x606B = 0x56AF
+0x606C = 0x56D4
+0x606D = 0x56D7
+0x606E = 0x56DD
+0x606F = 0x56E1
+0x6070 = 0x5707
+0x6071 = 0x56EB
+0x6072 = 0x56F9
+0x6073 = 0x56FF
+0x6074 = 0x5704
+0x6075 = 0x570A
+0x6076 = 0x5709
+0x6077 = 0x571C
+0x6078 = 0x5E43
+0x6079 = 0x5E19
+0x607A = 0x5E14
+0x607B = 0x5E11
+0x607C = 0x5E6C
+0x607D = 0x5E58
+0x607E = 0x5E57
+0x6121 = 0x5E37
+0x6122 = 0x5E44
+0x6123 = 0x5E54
+0x6124 = 0x5E5B
+0x6125 = 0x5E5E
+0x6126 = 0x5E61
+0x6127 = 0x5C8C
+0x6128 = 0x5C7A
+0x6129 = 0x5C8D
+0x612A = 0x5C90
+0x612B = 0x5D87
+0x612C = 0x5C88
+0x612D = 0x5CF4
+0x612E = 0x5C99
+0x612F = 0x5C91
+0x6130 = 0x5D50
+0x6131 = 0x5C9C
+0x6132 = 0x5CB5
+0x6133 = 0x5CA2
+0x6134 = 0x5D2C
+0x6135 = 0x5CAC
+0x6136 = 0x5CAB
+0x6137 = 0x5CB1
+0x6138 = 0x5CA3
+0x6139 = 0x5CC1
+0x613A = 0x5CB7
+0x613B = 0x5DA7
+0x613C = 0x5CD2
+0x613D = 0x5DA0
+0x613E = 0x5CCB
+0x613F = 0x5D22
+0x6140 = 0x5D97
+0x6141 = 0x5D0D
+0x6142 = 0x5D27
+0x6143 = 0x5D26
+0x6144 = 0x5D2E
+0x6145 = 0x5D24
+0x6146 = 0x5D1E
+0x6147 = 0x5D06
+0x6148 = 0x5D1B
+0x6149 = 0x5DB8
+0x614A = 0x5D3E
+0x614B = 0x5D34
+0x614C = 0x5D3D
+0x614D = 0x5D6C
+0x614E = 0x5D5B
+0x614F = 0x5D6F
+0x6150 = 0x5D81
+0x6151 = 0x5D6B
+0x6152 = 0x5D4B
+0x6153 = 0x5D4A
+0x6154 = 0x5D69
+0x6155 = 0x5D74
+0x6156 = 0x5D82
+0x6157 = 0x5D99
+0x6158 = 0x5D9D
+0x6159 = 0x8C73
+0x615A = 0x5DB7
+0x615B = 0x5DD4
+0x615C = 0x5F73
+0x615D = 0x5F77
+0x615E = 0x5F82
+0x615F = 0x5F87
+0x6160 = 0x5F89
+0x6161 = 0x540E
+0x6162 = 0x5FA0
+0x6163 = 0x5F99
+0x6164 = 0x5F9C
+0x6165 = 0x5FA8
+0x6166 = 0x5FAD
+0x6167 = 0x5FB5
+0x6168 = 0x5FBC
+0x6169 = 0x8862
+0x616A = 0x5F61
+0x616B = 0x72AD
+0x616C = 0x72B0
+0x616D = 0x72B4
+0x616E = 0x7377
+0x616F = 0x7341
+0x6170 = 0x72C3
+0x6171 = 0x72C1
+0x6172 = 0x72CE
+0x6173 = 0x72CD
+0x6174 = 0x72D2
+0x6175 = 0x72E8
+0x6176 = 0x736A
+0x6177 = 0x72E9
+0x6178 = 0x733B
+0x6179 = 0x72F4
+0x617A = 0x72F7
+0x617B = 0x7301
+0x617C = 0x72F3
+0x617D = 0x736B
+0x617E = 0x72FA
+0x6221 = 0x72FB
+0x6222 = 0x7317
+0x6223 = 0x7313
+0x6224 = 0x7380
+0x6225 = 0x730A
+0x6226 = 0x731E
+0x6227 = 0x731D
+0x6228 = 0x737C
+0x6229 = 0x7322
+0x622A = 0x7339
+0x622B = 0x7325
+0x622C = 0x732C
+0x622D = 0x7338
+0x622E = 0x7331
+0x622F = 0x7350
+0x6230 = 0x734D
+0x6231 = 0x7357
+0x6232 = 0x7360
+0x6233 = 0x736C
+0x6234 = 0x736F
+0x6235 = 0x737E
+0x6236 = 0x821B
+0x6237 = 0x5925
+0x6238 = 0x98E7
+0x6239 = 0x5924
+0x623A = 0x5902
+0x623B = 0x98E0
+0x623C = 0x9933
+0x623D = 0x98E9
+0x623E = 0x993C
+0x623F = 0x98EA
+0x6240 = 0x98EB
+0x6241 = 0x98ED
+0x6242 = 0x98F4
+0x6243 = 0x9909
+0x6244 = 0x9911
+0x6245 = 0x4F59
+0x6246 = 0x991B
+0x6247 = 0x9937
+0x6248 = 0x993F
+0x6249 = 0x9943
+0x624A = 0x9948
+0x624B = 0x9949
+0x624C = 0x994A
+0x624D = 0x994C
+0x624E = 0x9962
+0x624F = 0x5E80
+0x6250 = 0x5EE1
+0x6251 = 0x5E8B
+0x6252 = 0x5E96
+0x6253 = 0x5EA5
+0x6254 = 0x5EA0
+0x6255 = 0x5EB9
+0x6256 = 0x5EB5
+0x6257 = 0x5EBE
+0x6258 = 0x5EB3
+0x6259 = 0x8CE1
+0x625A = 0x5ED2
+0x625B = 0x5ED1
+0x625C = 0x5EDB
+0x625D = 0x5EE8
+0x625E = 0x5EEA
+0x625F = 0x81BA
+0x6260 = 0x5FC4
+0x6261 = 0x5FC9
+0x6262 = 0x5FD6
+0x6263 = 0x61FA
+0x6264 = 0x61AE
+0x6265 = 0x5FEE
+0x6266 = 0x616A
+0x6267 = 0x5FE1
+0x6268 = 0x5FE4
+0x6269 = 0x613E
+0x626A = 0x60B5
+0x626B = 0x6134
+0x626C = 0x5FEA
+0x626D = 0x5FED
+0x626E = 0x5FF8
+0x626F = 0x6019
+0x6270 = 0x6035
+0x6271 = 0x6026
+0x6272 = 0x601B
+0x6273 = 0x600F
+0x6274 = 0x600D
+0x6275 = 0x6029
+0x6276 = 0x602B
+0x6277 = 0x600A
+0x6278 = 0x61CC
+0x6279 = 0x6021
+0x627A = 0x615F
+0x627B = 0x61E8
+0x627C = 0x60FB
+0x627D = 0x6137
+0x627E = 0x6042
+0x6321 = 0x606A
+0x6322 = 0x60F2
+0x6323 = 0x6096
+0x6324 = 0x609A
+0x6325 = 0x6173
+0x6326 = 0x609D
+0x6327 = 0x6083
+0x6328 = 0x6092
+0x6329 = 0x608C
+0x632A = 0x609B
+0x632B = 0x611C
+0x632C = 0x60BB
+0x632D = 0x60B1
+0x632E = 0x60DD
+0x632F = 0x60D8
+0x6330 = 0x60C6
+0x6331 = 0x60DA
+0x6332 = 0x60B4
+0x6333 = 0x6120
+0x6334 = 0x6192
+0x6335 = 0x6115
+0x6336 = 0x6123
+0x6337 = 0x60F4
+0x6338 = 0x6100
+0x6339 = 0x610E
+0x633A = 0x612B
+0x633B = 0x614A
+0x633C = 0x6175
+0x633D = 0x61AC
+0x633E = 0x6194
+0x633F = 0x61A7
+0x6340 = 0x61B7
+0x6341 = 0x61D4
+0x6342 = 0x61F5
+0x6343 = 0x5FDD
+0x6344 = 0x96B3
+0x6345 = 0x9582
+0x6346 = 0x9586
+0x6347 = 0x95C8
+0x6348 = 0x958E
+0x6349 = 0x9594
+0x634A = 0x958C
+0x634B = 0x95E5
+0x634C = 0x95AD
+0x634D = 0x95AB
+0x634E = 0x9B2E
+0x634F = 0x95AC
+0x6350 = 0x95BE
+0x6351 = 0x95B6
+0x6352 = 0x9B29
+0x6353 = 0x95BF
+0x6354 = 0x95BD
+0x6355 = 0x95BC
+0x6356 = 0x95C3
+0x6357 = 0x95CB
+0x6358 = 0x95D4
+0x6359 = 0x95D0
+0x635A = 0x95D5
+0x635B = 0x95DE
+0x635C = 0x4E2C
+0x635D = 0x723F
+0x635E = 0x6215
+0x635F = 0x6C35
+0x6360 = 0x6C54
+0x6361 = 0x6C5C
+0x6362 = 0x6C4A
+0x6363 = 0x7043
+0x6364 = 0x6C85
+0x6365 = 0x6C90
+0x6366 = 0x6C94
+0x6367 = 0x6C8C
+0x6368 = 0x6C68
+0x6369 = 0x6C69
+0x636A = 0x6C74
+0x636B = 0x6C76
+0x636C = 0x6C86
+0x636D = 0x6F59
+0x636E = 0x6CD0
+0x636F = 0x6CD4
+0x6370 = 0x6CAD
+0x6371 = 0x7027
+0x6372 = 0x7018
+0x6373 = 0x6CF1
+0x6374 = 0x6CD7
+0x6375 = 0x6CB2
+0x6376 = 0x6CE0
+0x6377 = 0x6CD6
+0x6378 = 0x6FFC
+0x6379 = 0x6CEB
+0x637A = 0x6CEE
+0x637B = 0x6CB1
+0x637C = 0x6CD3
+0x637D = 0x6CEF
+0x637E = 0x6D87
+0x6421 = 0x6D39
+0x6422 = 0x6D27
+0x6423 = 0x6D0C
+0x6424 = 0x6D79
+0x6425 = 0x6E5E
+0x6426 = 0x6D07
+0x6427 = 0x6D04
+0x6428 = 0x6D19
+0x6429 = 0x6D0E
+0x642A = 0x6D2B
+0x642B = 0x6FAE
+0x642C = 0x6D2E
+0x642D = 0x6D35
+0x642E = 0x6D1A
+0x642F = 0x700F
+0x6430 = 0x6EF8
+0x6431 = 0x6F6F
+0x6432 = 0x6D33
+0x6433 = 0x6D91
+0x6434 = 0x6D6F
+0x6435 = 0x6DF6
+0x6436 = 0x6F7F
+0x6437 = 0x6D5E
+0x6438 = 0x6D93
+0x6439 = 0x6D94
+0x643A = 0x6D5C
+0x643B = 0x6D60
+0x643C = 0x6D7C
+0x643D = 0x6D63
+0x643E = 0x6E1A
+0x643F = 0x6DC7
+0x6440 = 0x6DC5
+0x6441 = 0x6DDE
+0x6442 = 0x7006
+0x6443 = 0x6DBF
+0x6444 = 0x6DE0
+0x6445 = 0x6FA0
+0x6446 = 0x6DE6
+0x6447 = 0x6DDD
+0x6448 = 0x6DD9
+0x6449 = 0x700B
+0x644A = 0x6DAB
+0x644B = 0x6E0C
+0x644C = 0x6DAE
+0x644D = 0x6E2B
+0x644E = 0x6E6E
+0x644F = 0x6E4E
+0x6450 = 0x6E6B
+0x6451 = 0x6EB2
+0x6452 = 0x6E5F
+0x6453 = 0x6E86
+0x6454 = 0x6E53
+0x6455 = 0x6E54
+0x6456 = 0x6E32
+0x6457 = 0x6E25
+0x6458 = 0x6E44
+0x6459 = 0x7067
+0x645A = 0x6EB1
+0x645B = 0x6E98
+0x645C = 0x7044
+0x645D = 0x6F2D
+0x645E = 0x7005
+0x645F = 0x6EA5
+0x6460 = 0x6EA7
+0x6461 = 0x6EBD
+0x6462 = 0x6EBB
+0x6463 = 0x6EB7
+0x6464 = 0x6F77
+0x6465 = 0x6EB4
+0x6466 = 0x6ECF
+0x6467 = 0x6E8F
+0x6468 = 0x6EC2
+0x6469 = 0x6E9F
+0x646A = 0x6F62
+0x646B = 0x7020
+0x646C = 0x701F
+0x646D = 0x6F24
+0x646E = 0x6F15
+0x646F = 0x6EF9
+0x6470 = 0x6F2F
+0x6471 = 0x6F36
+0x6472 = 0x7032
+0x6473 = 0x6F74
+0x6474 = 0x6F2A
+0x6475 = 0x6F09
+0x6476 = 0x6F29
+0x6477 = 0x6F89
+0x6478 = 0x6F8D
+0x6479 = 0x6F8C
+0x647A = 0x6F78
+0x647B = 0x6F72
+0x647C = 0x6F7C
+0x647D = 0x6F7A
+0x647E = 0x7028
+0x6521 = 0x6FC9
+0x6522 = 0x6FA7
+0x6523 = 0x6FB9
+0x6524 = 0x6FB6
+0x6525 = 0x6FC2
+0x6526 = 0x6FE1
+0x6527 = 0x6FEE
+0x6528 = 0x6FDE
+0x6529 = 0x6FE0
+0x652A = 0x6FEF
+0x652B = 0x701A
+0x652C = 0x7023
+0x652D = 0x701B
+0x652E = 0x7039
+0x652F = 0x7035
+0x6530 = 0x705D
+0x6531 = 0x705E
+0x6532 = 0x5B80
+0x6533 = 0x5B84
+0x6534 = 0x5B95
+0x6535 = 0x5B93
+0x6536 = 0x5BA5
+0x6537 = 0x5BB8
+0x6538 = 0x752F
+0x6539 = 0x9A2B
+0x653A = 0x6434
+0x653B = 0x5BE4
+0x653C = 0x5BEE
+0x653D = 0x8930
+0x653E = 0x5BF0
+0x653F = 0x8E47
+0x6540 = 0x8B07
+0x6541 = 0x8FB6
+0x6542 = 0x8FD3
+0x6543 = 0x8FD5
+0x6544 = 0x8FE5
+0x6545 = 0x8FEE
+0x6546 = 0x8FE4
+0x6547 = 0x9087
+0x6548 = 0x8FE6
+0x6549 = 0x9015
+0x654A = 0x8FE8
+0x654B = 0x9005
+0x654C = 0x9004
+0x654D = 0x900B
+0x654E = 0x9090
+0x654F = 0x9011
+0x6550 = 0x900D
+0x6551 = 0x9016
+0x6552 = 0x9021
+0x6553 = 0x9035
+0x6554 = 0x9036
+0x6555 = 0x902D
+0x6556 = 0x902F
+0x6557 = 0x9044
+0x6558 = 0x9051
+0x6559 = 0x9052
+0x655A = 0x9050
+0x655B = 0x9068
+0x655C = 0x9058
+0x655D = 0x9062
+0x655E = 0x905B
+0x655F = 0x66B9
+0x6560 = 0x9074
+0x6561 = 0x907D
+0x6562 = 0x9082
+0x6563 = 0x9088
+0x6564 = 0x9083
+0x6565 = 0x908B
+0x6566 = 0x5F50
+0x6567 = 0x5F57
+0x6568 = 0x5F56
+0x6569 = 0x5F58
+0x656A = 0x5C3B
+0x656B = 0x54AB
+0x656C = 0x5C50
+0x656D = 0x5C59
+0x656E = 0x5B71
+0x656F = 0x5C63
+0x6570 = 0x5C68
+0x6571 = 0x7FBC
+0x6572 = 0x5F33
+0x6573 = 0x5F29
+0x6574 = 0x5F2D
+0x6575 = 0x8274
+0x6576 = 0x5F3C
+0x6577 = 0x9B3B
+0x6578 = 0x5C6E
+0x6579 = 0x5981
+0x657A = 0x5983
+0x657B = 0x598D
+0x657C = 0x5AF5
+0x657D = 0x5AD7
+0x657E = 0x59A3
+0x6621 = 0x5997
+0x6622 = 0x59CA
+0x6623 = 0x5B00
+0x6624 = 0x599E
+0x6625 = 0x59A4
+0x6626 = 0x59D2
+0x6627 = 0x59B2
+0x6628 = 0x59AF
+0x6629 = 0x59D7
+0x662A = 0x59BE
+0x662B = 0x5A6D
+0x662C = 0x5B08
+0x662D = 0x59DD
+0x662E = 0x5B4C
+0x662F = 0x59E3
+0x6630 = 0x59D8
+0x6631 = 0x59F9
+0x6632 = 0x5A0C
+0x6633 = 0x5A09
+0x6634 = 0x5AA7
+0x6635 = 0x5AFB
+0x6636 = 0x5A11
+0x6637 = 0x5A23
+0x6638 = 0x5A13
+0x6639 = 0x5A40
+0x663A = 0x5A67
+0x663B = 0x5A4A
+0x663C = 0x5A55
+0x663D = 0x5A3C
+0x663E = 0x5A62
+0x663F = 0x5B0B
+0x6640 = 0x80EC
+0x6641 = 0x5AAA
+0x6642 = 0x5A9B
+0x6643 = 0x5A77
+0x6644 = 0x5A7A
+0x6645 = 0x5ABE
+0x6646 = 0x5AEB
+0x6647 = 0x5AB2
+0x6648 = 0x5B21
+0x6649 = 0x5B2A
+0x664A = 0x5AB8
+0x664B = 0x5AE0
+0x664C = 0x5AE3
+0x664D = 0x5B19
+0x664E = 0x5AD6
+0x664F = 0x5AE6
+0x6650 = 0x5AD8
+0x6651 = 0x5ADC
+0x6652 = 0x5B09
+0x6653 = 0x5B17
+0x6654 = 0x5B16
+0x6655 = 0x5B32
+0x6656 = 0x5B37
+0x6657 = 0x5B40
+0x6658 = 0x5C15
+0x6659 = 0x5C1C
+0x665A = 0x5B5A
+0x665B = 0x5B65
+0x665C = 0x5B73
+0x665D = 0x5B51
+0x665E = 0x5B53
+0x665F = 0x5B62
+0x6660 = 0x99D4
+0x6661 = 0x99DF
+0x6662 = 0x99D9
+0x6663 = 0x9A36
+0x6664 = 0x9A5B
+0x6665 = 0x99D1
+0x6666 = 0x99D8
+0x6667 = 0x9A4D
+0x6668 = 0x9A4A
+0x6669 = 0x99E2
+0x666A = 0x9A6A
+0x666B = 0x9A0F
+0x666C = 0x9A0D
+0x666D = 0x9A05
+0x666E = 0x9A42
+0x666F = 0x9A2D
+0x6670 = 0x9A16
+0x6671 = 0x9A41
+0x6672 = 0x9A2E
+0x6673 = 0x9A38
+0x6674 = 0x9A43
+0x6675 = 0x9A44
+0x6676 = 0x9A4F
+0x6677 = 0x9A65
+0x6678 = 0x9A64
+0x6679 = 0x7CF9
+0x667A = 0x7D06
+0x667B = 0x7D02
+0x667C = 0x7D07
+0x667D = 0x7D08
+0x667E = 0x7E8A
+0x6721 = 0x7D1C
+0x6722 = 0x7D15
+0x6723 = 0x7D13
+0x6724 = 0x7D3A
+0x6725 = 0x7D32
+0x6726 = 0x7D31
+0x6727 = 0x7E10
+0x6728 = 0x7D3C
+0x6729 = 0x7D40
+0x672A = 0x7D3F
+0x672B = 0x7D5D
+0x672C = 0x7D4E
+0x672D = 0x7D73
+0x672E = 0x7D86
+0x672F = 0x7D83
+0x6730 = 0x7D88
+0x6731 = 0x7DBE
+0x6732 = 0x7DBA
+0x6733 = 0x7DCB
+0x6734 = 0x7DD4
+0x6735 = 0x7DC4
+0x6736 = 0x7D9E
+0x6737 = 0x7DAC
+0x6738 = 0x7DB9
+0x6739 = 0x7DA3
+0x673A = 0x7DB0
+0x673B = 0x7DC7
+0x673C = 0x7DD9
+0x673D = 0x7DD7
+0x673E = 0x7DF9
+0x673F = 0x7DF2
+0x6740 = 0x7E62
+0x6741 = 0x7DE6
+0x6742 = 0x7DF6
+0x6743 = 0x7DF1
+0x6744 = 0x7E0B
+0x6745 = 0x7DE1
+0x6746 = 0x7E09
+0x6747 = 0x7E1D
+0x6748 = 0x7E1F
+0x6749 = 0x7E1E
+0x674A = 0x7E2D
+0x674B = 0x7E0A
+0x674C = 0x7E11
+0x674D = 0x7E7D
+0x674E = 0x7E39
+0x674F = 0x7E35
+0x6750 = 0x7E32
+0x6751 = 0x7E46
+0x6752 = 0x7E45
+0x6753 = 0x7E88
+0x6754 = 0x7E5A
+0x6755 = 0x7E52
+0x6756 = 0x7E6E
+0x6757 = 0x7E7E
+0x6758 = 0x7E70
+0x6759 = 0x7E6F
+0x675A = 0x7E98
+0x675B = 0x5E7A
+0x675C = 0x757F
+0x675D = 0x5DDB
+0x675E = 0x753E
+0x675F = 0x9095
+0x6760 = 0x738E
+0x6761 = 0x74A3
+0x6762 = 0x744B
+0x6763 = 0x73A2
+0x6764 = 0x739F
+0x6765 = 0x73CF
+0x6766 = 0x73C2
+0x6767 = 0x74CF
+0x6768 = 0x73B7
+0x6769 = 0x73B3
+0x676A = 0x73C0
+0x676B = 0x73C9
+0x676C = 0x73C8
+0x676D = 0x73E5
+0x676E = 0x73D9
+0x676F = 0x980A
+0x6770 = 0x740A
+0x6771 = 0x73E9
+0x6772 = 0x73E7
+0x6773 = 0x73DE
+0x6774 = 0x74BD
+0x6775 = 0x743F
+0x6776 = 0x7489
+0x6777 = 0x742A
+0x6778 = 0x745B
+0x6779 = 0x7426
+0x677A = 0x7425
+0x677B = 0x7428
+0x677C = 0x7430
+0x677D = 0x742E
+0x677E = 0x742C
+0x6821 = 0x741B
+0x6822 = 0x741A
+0x6823 = 0x7441
+0x6824 = 0x745C
+0x6825 = 0x7457
+0x6826 = 0x7455
+0x6827 = 0x7459
+0x6828 = 0x74A6
+0x6829 = 0x746D
+0x682A = 0x747E
+0x682B = 0x749C
+0x682C = 0x74D4
+0x682D = 0x7480
+0x682E = 0x7481
+0x682F = 0x7487
+0x6830 = 0x748B
+0x6831 = 0x749E
+0x6832 = 0x74A8
+0x6833 = 0x74A9
+0x6834 = 0x7490
+0x6835 = 0x74A7
+0x6836 = 0x74DA
+0x6837 = 0x74BA
+0x6838 = 0x97D9
+0x6839 = 0x97DE
+0x683A = 0x97DC
+0x683B = 0x674C
+0x683C = 0x6753
+0x683D = 0x675E
+0x683E = 0x6748
+0x683F = 0x69AA
+0x6840 = 0x6AEA
+0x6841 = 0x6787
+0x6842 = 0x676A
+0x6843 = 0x6773
+0x6844 = 0x6798
+0x6845 = 0x6898
+0x6846 = 0x6775
+0x6847 = 0x68D6
+0x6848 = 0x6A05
+0x6849 = 0x689F
+0x684A = 0x678B
+0x684B = 0x6777
+0x684C = 0x677C
+0x684D = 0x67F0
+0x684E = 0x6ADB
+0x684F = 0x67D8
+0x6850 = 0x6AF3
+0x6851 = 0x67E9
+0x6852 = 0x67B0
+0x6853 = 0x6AE8
+0x6854 = 0x67D9
+0x6855 = 0x67B5
+0x6856 = 0x67DA
+0x6857 = 0x67B3
+0x6858 = 0x67DD
+0x6859 = 0x6800
+0x685A = 0x67C3
+0x685B = 0x67B8
+0x685C = 0x67E2
+0x685D = 0x6ADF
+0x685E = 0x67C1
+0x685F = 0x6A89
+0x6860 = 0x6832
+0x6861 = 0x6833
+0x6862 = 0x690F
+0x6863 = 0x6A48
+0x6864 = 0x684E
+0x6865 = 0x6968
+0x6866 = 0x6844
+0x6867 = 0x69BF
+0x6868 = 0x6883
+0x6869 = 0x681D
+0x686A = 0x6855
+0x686B = 0x6A3A
+0x686C = 0x6841
+0x686D = 0x6A9C
+0x686E = 0x6840
+0x686F = 0x6B12
+0x6870 = 0x684A
+0x6871 = 0x6849
+0x6872 = 0x6829
+0x6873 = 0x68B5
+0x6874 = 0x688F
+0x6875 = 0x6874
+0x6876 = 0x6877
+0x6877 = 0x6893
+0x6878 = 0x686B
+0x6879 = 0x6B1E
+0x687A = 0x696E
+0x687B = 0x68FC
+0x687C = 0x6ADD
+0x687D = 0x69E7
+0x687E = 0x68F9
+0x6921 = 0x6B0F
+0x6922 = 0x68F0
+0x6923 = 0x690B
+0x6924 = 0x6901
+0x6925 = 0x6957
+0x6926 = 0x68E3
+0x6927 = 0x6910
+0x6928 = 0x6971
+0x6929 = 0x6939
+0x692A = 0x6960
+0x692B = 0x6942
+0x692C = 0x695D
+0x692D = 0x6B16
+0x692E = 0x696B
+0x692F = 0x6980
+0x6930 = 0x6998
+0x6931 = 0x6978
+0x6932 = 0x6934
+0x6933 = 0x69CC
+0x6934 = 0x6AEC
+0x6935 = 0x6ADA
+0x6936 = 0x69CE
+0x6937 = 0x6AF8
+0x6938 = 0x6966
+0x6939 = 0x6963
+0x693A = 0x6979
+0x693B = 0x699B
+0x693C = 0x69A7
+0x693D = 0x69BB
+0x693E = 0x69AB
+0x693F = 0x69AD
+0x6940 = 0x69D4
+0x6941 = 0x69B1
+0x6942 = 0x69C1
+0x6943 = 0x69CA
+0x6944 = 0x6AB3
+0x6945 = 0x6995
+0x6946 = 0x6AE7
+0x6947 = 0x698D
+0x6948 = 0x69FF
+0x6949 = 0x6AA3
+0x694A = 0x69ED
+0x694B = 0x6A17
+0x694C = 0x6A18
+0x694D = 0x6A65
+0x694E = 0x69F2
+0x694F = 0x6A44
+0x6950 = 0x6A3E
+0x6951 = 0x6AA0
+0x6952 = 0x6A50
+0x6953 = 0x6A5B
+0x6954 = 0x6A35
+0x6955 = 0x6A8E
+0x6956 = 0x6AD3
+0x6957 = 0x6A3D
+0x6958 = 0x6A28
+0x6959 = 0x6A58
+0x695A = 0x6ADE
+0x695B = 0x6A91
+0x695C = 0x6A90
+0x695D = 0x6AA9
+0x695E = 0x6A97
+0x695F = 0x6AAB
+0x6960 = 0x7337
+0x6961 = 0x7352
+0x6962 = 0x6B81
+0x6963 = 0x6B82
+0x6964 = 0x6BA4
+0x6965 = 0x6B84
+0x6966 = 0x6B9E
+0x6967 = 0x6BAE
+0x6968 = 0x6B8D
+0x6969 = 0x6BAB
+0x696A = 0x6B9B
+0x696B = 0x6BAF
+0x696C = 0x6BAA
+0x696D = 0x8ED4
+0x696E = 0x8EDB
+0x696F = 0x8EF2
+0x6970 = 0x8EFB
+0x6971 = 0x8F64
+0x6972 = 0x8EF9
+0x6973 = 0x8EFC
+0x6974 = 0x8EEB
+0x6975 = 0x8EE4
+0x6976 = 0x8F62
+0x6977 = 0x8EFA
+0x6978 = 0x8EFE
+0x6979 = 0x8F0A
+0x697A = 0x8F07
+0x697B = 0x8F05
+0x697C = 0x8F12
+0x697D = 0x8F26
+0x697E = 0x8F1E
+0x6A21 = 0x8F1F
+0x6A22 = 0x8F1C
+0x6A23 = 0x8F33
+0x6A24 = 0x8F46
+0x6A25 = 0x8F54
+0x6A26 = 0x8ECE
+0x6A27 = 0x6214
+0x6A28 = 0x6227
+0x6A29 = 0x621B
+0x6A2A = 0x621F
+0x6A2B = 0x6222
+0x6A2C = 0x6221
+0x6A2D = 0x6225
+0x6A2E = 0x6224
+0x6A2F = 0x6229
+0x6A30 = 0x81E7
+0x6A31 = 0x750C
+0x6A32 = 0x74F4
+0x6A33 = 0x74FF
+0x6A34 = 0x750F
+0x6A35 = 0x7511
+0x6A36 = 0x7513
+0x6A37 = 0x6534
+0x6A38 = 0x65EE
+0x6A39 = 0x65EF
+0x6A3A = 0x65F0
+0x6A3B = 0x660A
+0x6A3C = 0x66C7
+0x6A3D = 0x6772
+0x6A3E = 0x6603
+0x6A3F = 0x6615
+0x6A40 = 0x6600
+0x6A41 = 0x7085
+0x6A42 = 0x66F7
+0x6A43 = 0x661D
+0x6A44 = 0x6634
+0x6A45 = 0x6631
+0x6A46 = 0x6636
+0x6A47 = 0x6635
+0x6A48 = 0x8006
+0x6A49 = 0x665F
+0x6A4A = 0x66C4
+0x6A4B = 0x6641
+0x6A4C = 0x664F
+0x6A4D = 0x6689
+0x6A4E = 0x6661
+0x6A4F = 0x6657
+0x6A50 = 0x6677
+0x6A51 = 0x6684
+0x6A52 = 0x668C
+0x6A53 = 0x66D6
+0x6A54 = 0x669D
+0x6A55 = 0x66BE
+0x6A56 = 0x66DB
+0x6A57 = 0x66DC
+0x6A58 = 0x66E6
+0x6A59 = 0x66E9
+0x6A5A = 0x8CC1
+0x6A5B = 0x8CB0
+0x6A5C = 0x8CBA
+0x6A5D = 0x8CBD
+0x6A5E = 0x8D04
+0x6A5F = 0x8CB2
+0x6A60 = 0x8CC5
+0x6A61 = 0x8D10
+0x6A62 = 0x8CD1
+0x6A63 = 0x8CDA
+0x6A64 = 0x8CD5
+0x6A65 = 0x8CEB
+0x6A66 = 0x8CE7
+0x6A67 = 0x8CFB
+0x6A68 = 0x8998
+0x6A69 = 0x89AC
+0x6A6A = 0x89A1
+0x6A6B = 0x89BF
+0x6A6C = 0x89A6
+0x6A6D = 0x89AF
+0x6A6E = 0x89B2
+0x6A6F = 0x89B7
+0x6A70 = 0x726E
+0x6A71 = 0x729F
+0x6A72 = 0x725D
+0x6A73 = 0x7266
+0x6A74 = 0x726F
+0x6A75 = 0x727E
+0x6A76 = 0x727F
+0x6A77 = 0x7284
+0x6A78 = 0x728B
+0x6A79 = 0x728D
+0x6A7A = 0x728F
+0x6A7B = 0x7292
+0x6A7C = 0x6308
+0x6A7D = 0x6332
+0x6A7E = 0x63B0
+0x6B21 = 0x643F
+0x6B22 = 0x64D8
+0x6B23 = 0x8004
+0x6B24 = 0x6BEA
+0x6B25 = 0x6BF3
+0x6B26 = 0x6BFD
+0x6B27 = 0x6BFF
+0x6B28 = 0x6BF9
+0x6B29 = 0x6C05
+0x6B2A = 0x6C0C
+0x6B2B = 0x6C06
+0x6B2C = 0x6C0D
+0x6B2D = 0x6C15
+0x6B2E = 0x6C18
+0x6B2F = 0x6C19
+0x6B30 = 0x6C1A
+0x6B31 = 0x6C21
+0x6B32 = 0x6C2C
+0x6B33 = 0x6C24
+0x6B34 = 0x6C2A
+0x6B35 = 0x6C32
+0x6B36 = 0x6535
+0x6B37 = 0x6555
+0x6B38 = 0x656B
+0x6B39 = 0x7258
+0x6B3A = 0x7252
+0x6B3B = 0x7256
+0x6B3C = 0x7230
+0x6B3D = 0x8662
+0x6B3E = 0x5216
+0x6B3F = 0x809F
+0x6B40 = 0x809C
+0x6B41 = 0x8093
+0x6B42 = 0x80BC
+0x6B43 = 0x670A
+0x6B44 = 0x80BD
+0x6B45 = 0x80B1
+0x6B46 = 0x80AB
+0x6B47 = 0x80AD
+0x6B48 = 0x80B4
+0x6B49 = 0x80B7
+0x6B4A = 0x6727
+0x6B4B = 0x8156
+0x6B4C = 0x80E9
+0x6B4D = 0x81DA
+0x6B4E = 0x80DB
+0x6B4F = 0x80C2
+0x6B50 = 0x80C4
+0x6B51 = 0x80D9
+0x6B52 = 0x80CD
+0x6B53 = 0x80D7
+0x6B54 = 0x6710
+0x6B55 = 0x80DD
+0x6B56 = 0x811B
+0x6B57 = 0x80F1
+0x6B58 = 0x80F4
+0x6B59 = 0x80ED
+0x6B5A = 0x81BE
+0x6B5B = 0x810E
+0x6B5C = 0x80F2
+0x6B5D = 0x80FC
+0x6B5E = 0x6715
+0x6B5F = 0x8112
+0x6B60 = 0x8C5A
+0x6B61 = 0x8161
+0x6B62 = 0x811E
+0x6B63 = 0x812C
+0x6B64 = 0x8118
+0x6B65 = 0x8132
+0x6B66 = 0x8148
+0x6B67 = 0x814C
+0x6B68 = 0x8153
+0x6B69 = 0x8174
+0x6B6A = 0x8159
+0x6B6B = 0x815A
+0x6B6C = 0x8171
+0x6B6D = 0x8160
+0x6B6E = 0x8169
+0x6B6F = 0x817C
+0x6B70 = 0x817D
+0x6B71 = 0x816D
+0x6B72 = 0x8167
+0x6B73 = 0x584D
+0x6B74 = 0x5AB5
+0x6B75 = 0x8188
+0x6B76 = 0x8182
+0x6B77 = 0x81CF
+0x6B78 = 0x6ED5
+0x6B79 = 0x81A3
+0x6B7A = 0x81AA
+0x6B7B = 0x81CC
+0x6B7C = 0x6726
+0x6B7D = 0x81CA
+0x6B7E = 0x81BB
+0x6C21 = 0x81C1
+0x6C22 = 0x81A6
+0x6C23 = 0x6B5F
+0x6C24 = 0x6B37
+0x6C25 = 0x6B39
+0x6C26 = 0x6B43
+0x6C27 = 0x6B46
+0x6C28 = 0x6B59
+0x6C29 = 0x98AE
+0x6C2A = 0x98AF
+0x6C2B = 0x98B6
+0x6C2C = 0x98BC
+0x6C2D = 0x98C6
+0x6C2E = 0x98C8
+0x6C2F = 0x6BB3
+0x6C30 = 0x5F40
+0x6C31 = 0x8F42
+0x6C32 = 0x89F3
+0x6C33 = 0x6590
+0x6C34 = 0x9F4F
+0x6C35 = 0x6595
+0x6C36 = 0x65BC
+0x6C37 = 0x65C6
+0x6C38 = 0x65C4
+0x6C39 = 0x65C3
+0x6C3A = 0x65CC
+0x6C3B = 0x65CE
+0x6C3C = 0x65D2
+0x6C3D = 0x65D6
+0x6C3E = 0x716C
+0x6C3F = 0x7152
+0x6C40 = 0x7096
+0x6C41 = 0x7197
+0x6C42 = 0x70BB
+0x6C43 = 0x70C0
+0x6C44 = 0x70B7
+0x6C45 = 0x70AB
+0x6C46 = 0x70B1
+0x6C47 = 0x71C1
+0x6C48 = 0x70CA
+0x6C49 = 0x7110
+0x6C4A = 0x7113
+0x6C4B = 0x71DC
+0x6C4C = 0x712F
+0x6C4D = 0x7131
+0x6C4E = 0x7173
+0x6C4F = 0x715C
+0x6C50 = 0x7168
+0x6C51 = 0x7145
+0x6C52 = 0x7172
+0x6C53 = 0x714A
+0x6C54 = 0x7178
+0x6C55 = 0x717A
+0x6C56 = 0x7198
+0x6C57 = 0x71B3
+0x6C58 = 0x71B5
+0x6C59 = 0x71A8
+0x6C5A = 0x71A0
+0x6C5B = 0x71E0
+0x6C5C = 0x71D4
+0x6C5D = 0x71E7
+0x6C5E = 0x71F9
+0x6C5F = 0x721D
+0x6C60 = 0x7228
+0x6C61 = 0x706C
+0x6C62 = 0x71FE
+0x6C63 = 0x7166
+0x6C64 = 0x71B9
+0x6C65 = 0x623E
+0x6C66 = 0x623D
+0x6C67 = 0x6243
+0x6C68 = 0x6248
+0x6C69 = 0x6249
+0x6C6A = 0x793B
+0x6C6B = 0x7940
+0x6C6C = 0x7946
+0x6C6D = 0x7949
+0x6C6E = 0x795B
+0x6C6F = 0x795C
+0x6C70 = 0x7953
+0x6C71 = 0x795A
+0x6C72 = 0x79B0
+0x6C73 = 0x7957
+0x6C74 = 0x7960
+0x6C75 = 0x798E
+0x6C76 = 0x7967
+0x6C77 = 0x797A
+0x6C78 = 0x79AA
+0x6C79 = 0x798A
+0x6C7A = 0x799A
+0x6C7B = 0x79A7
+0x6C7C = 0x79B3
+0x6C7D = 0x5FD1
+0x6C7E = 0x5FD0
+0x6D21 = 0x61DF
+0x6D22 = 0x605D
+0x6D23 = 0x605A
+0x6D24 = 0x6067
+0x6D25 = 0x6041
+0x6D26 = 0x6059
+0x6D27 = 0x6063
+0x6D28 = 0x6164
+0x6D29 = 0x6106
+0x6D2A = 0x610D
+0x6D2B = 0x615D
+0x6D2C = 0x61A9
+0x6D2D = 0x619D
+0x6D2E = 0x61CB
+0x6D2F = 0x61E3
+0x6D30 = 0x6207
+0x6D31 = 0x8080
+0x6D32 = 0x807F
+0x6D33 = 0x6C93
+0x6D34 = 0x6FA9
+0x6D35 = 0x6DFC
+0x6D36 = 0x78EF
+0x6D37 = 0x77F8
+0x6D38 = 0x78AD
+0x6D39 = 0x7809
+0x6D3A = 0x7868
+0x6D3B = 0x7818
+0x6D3C = 0x7811
+0x6D3D = 0x65AB
+0x6D3E = 0x782D
+0x6D3F = 0x78B8
+0x6D40 = 0x781D
+0x6D41 = 0x7839
+0x6D42 = 0x792A
+0x6D43 = 0x7931
+0x6D44 = 0x781F
+0x6D45 = 0x783C
+0x6D46 = 0x7825
+0x6D47 = 0x782C
+0x6D48 = 0x7823
+0x6D49 = 0x7829
+0x6D4A = 0x784E
+0x6D4B = 0x786D
+0x6D4C = 0x7864
+0x6D4D = 0x78FD
+0x6D4E = 0x7826
+0x6D4F = 0x7850
+0x6D50 = 0x7847
+0x6D51 = 0x784C
+0x6D52 = 0x786A
+0x6D53 = 0x78E7
+0x6D54 = 0x7893
+0x6D55 = 0x789A
+0x6D56 = 0x7887
+0x6D57 = 0x78E3
+0x6D58 = 0x78A1
+0x6D59 = 0x78A3
+0x6D5A = 0x78B2
+0x6D5B = 0x78B9
+0x6D5C = 0x78A5
+0x6D5D = 0x78D4
+0x6D5E = 0x78D9
+0x6D5F = 0x78C9
+0x6D60 = 0x78EC
+0x6D61 = 0x78F2
+0x6D62 = 0x7905
+0x6D63 = 0x78F4
+0x6D64 = 0x7913
+0x6D65 = 0x7924
+0x6D66 = 0x791E
+0x6D67 = 0x7934
+0x6D68 = 0x9F95
+0x6D69 = 0x9EF9
+0x6D6A = 0x9EFB
+0x6D6B = 0x9EFC
+0x6D6C = 0x76F1
+0x6D6D = 0x7704
+0x6D6E = 0x7798
+0x6D6F = 0x76F9
+0x6D70 = 0x7707
+0x6D71 = 0x7708
+0x6D72 = 0x771A
+0x6D73 = 0x7722
+0x6D74 = 0x7719
+0x6D75 = 0x772D
+0x6D76 = 0x7726
+0x6D77 = 0x7735
+0x6D78 = 0x7738
+0x6D79 = 0x775E
+0x6D7A = 0x77BC
+0x6D7B = 0x7747
+0x6D7C = 0x7743
+0x6D7D = 0x775A
+0x6D7E = 0x7768
+0x6E21 = 0x7762
+0x6E22 = 0x7765
+0x6E23 = 0x777F
+0x6E24 = 0x778D
+0x6E25 = 0x777D
+0x6E26 = 0x7780
+0x6E27 = 0x778C
+0x6E28 = 0x7791
+0x6E29 = 0x779F
+0x6E2A = 0x77A0
+0x6E2B = 0x77B0
+0x6E2C = 0x77B5
+0x6E2D = 0x77BD
+0x6E2E = 0x753A
+0x6E2F = 0x7540
+0x6E30 = 0x754E
+0x6E31 = 0x754B
+0x6E32 = 0x7548
+0x6E33 = 0x755B
+0x6E34 = 0x7572
+0x6E35 = 0x7579
+0x6E36 = 0x7583
+0x6E37 = 0x7F58
+0x6E38 = 0x7F61
+0x6E39 = 0x7F5F
+0x6E3A = 0x8A48
+0x6E3B = 0x7F68
+0x6E3C = 0x7F86
+0x6E3D = 0x7F71
+0x6E3E = 0x7F79
+0x6E3F = 0x7F88
+0x6E40 = 0x7F7E
+0x6E41 = 0x76CD
+0x6E42 = 0x76E5
+0x6E43 = 0x8832
+0x6E44 = 0x91D2
+0x6E45 = 0x91D3
+0x6E46 = 0x91D4
+0x6E47 = 0x91D9
+0x6E48 = 0x91D7
+0x6E49 = 0x91D5
+0x6E4A = 0x91F7
+0x6E4B = 0x91E7
+0x6E4C = 0x91E4
+0x6E4D = 0x9346
+0x6E4E = 0x91F5
+0x6E4F = 0x91F9
+0x6E50 = 0x9208
+0x6E51 = 0x9226
+0x6E52 = 0x9245
+0x6E53 = 0x9211
+0x6E54 = 0x9210
+0x6E55 = 0x9201
+0x6E56 = 0x9227
+0x6E57 = 0x9204
+0x6E58 = 0x9225
+0x6E59 = 0x9200
+0x6E5A = 0x923A
+0x6E5B = 0x9266
+0x6E5C = 0x9237
+0x6E5D = 0x9233
+0x6E5E = 0x9255
+0x6E5F = 0x923D
+0x6E60 = 0x9238
+0x6E61 = 0x925E
+0x6E62 = 0x926C
+0x6E63 = 0x926D
+0x6E64 = 0x923F
+0x6E65 = 0x9460
+0x6E66 = 0x9230
+0x6E67 = 0x9249
+0x6E68 = 0x9248
+0x6E69 = 0x924D
+0x6E6A = 0x922E
+0x6E6B = 0x9239
+0x6E6C = 0x9438
+0x6E6D = 0x92AC
+0x6E6E = 0x92A0
+0x6E6F = 0x927A
+0x6E70 = 0x92AA
+0x6E71 = 0x92EE
+0x6E72 = 0x92CF
+0x6E73 = 0x9403
+0x6E74 = 0x92E3
+0x6E75 = 0x943A
+0x6E76 = 0x92B1
+0x6E77 = 0x92A6
+0x6E78 = 0x93A7
+0x6E79 = 0x9296
+0x6E7A = 0x92CC
+0x6E7B = 0x92A9
+0x6E7C = 0x93F5
+0x6E7D = 0x9293
+0x6E7E = 0x927F
+0x6F21 = 0x93A9
+0x6F22 = 0x929A
+0x6F23 = 0x931A
+0x6F24 = 0x92AB
+0x6F25 = 0x9283
+0x6F26 = 0x940B
+0x6F27 = 0x92A8
+0x6F28 = 0x92A3
+0x6F29 = 0x9412
+0x6F2A = 0x9338
+0x6F2B = 0x92F1
+0x6F2C = 0x93D7
+0x6F2D = 0x92E5
+0x6F2E = 0x92F0
+0x6F2F = 0x92EF
+0x6F30 = 0x92E8
+0x6F31 = 0x92BC
+0x6F32 = 0x92DD
+0x6F33 = 0x92F6
+0x6F34 = 0x9426
+0x6F35 = 0x9427
+0x6F36 = 0x92C3
+0x6F37 = 0x92DF
+0x6F38 = 0x92E6
+0x6F39 = 0x9312
+0x6F3A = 0x9306
+0x6F3B = 0x9369
+0x6F3C = 0x931B
+0x6F3D = 0x9340
+0x6F3E = 0x9301
+0x6F3F = 0x9315
+0x6F40 = 0x932E
+0x6F41 = 0x9343
+0x6F42 = 0x9307
+0x6F43 = 0x9308
+0x6F44 = 0x931F
+0x6F45 = 0x9319
+0x6F46 = 0x9365
+0x6F47 = 0x9347
+0x6F48 = 0x9376
+0x6F49 = 0x9354
+0x6F4A = 0x9364
+0x6F4B = 0x93AA
+0x6F4C = 0x9370
+0x6F4D = 0x9384
+0x6F4E = 0x93E4
+0x6F4F = 0x93D8
+0x6F50 = 0x9428
+0x6F51 = 0x9387
+0x6F52 = 0x93CC
+0x6F53 = 0x9398
+0x6F54 = 0x93B8
+0x6F55 = 0x93BF
+0x6F56 = 0x93A6
+0x6F57 = 0x93B0
+0x6F58 = 0x93B5
+0x6F59 = 0x944C
+0x6F5A = 0x93E2
+0x6F5B = 0x93DC
+0x6F5C = 0x93DD
+0x6F5D = 0x93CD
+0x6F5E = 0x93DE
+0x6F5F = 0x93C3
+0x6F60 = 0x93C7
+0x6F61 = 0x93D1
+0x6F62 = 0x9414
+0x6F63 = 0x941D
+0x6F64 = 0x93F7
+0x6F65 = 0x9465
+0x6F66 = 0x9413
+0x6F67 = 0x946D
+0x6F68 = 0x9420
+0x6F69 = 0x9479
+0x6F6A = 0x93F9
+0x6F6B = 0x9419
+0x6F6C = 0x944A
+0x6F6D = 0x9432
+0x6F6E = 0x943F
+0x6F6F = 0x9454
+0x6F70 = 0x9463
+0x6F71 = 0x937E
+0x6F72 = 0x77E7
+0x6F73 = 0x77EC
+0x6F74 = 0x96C9
+0x6F75 = 0x79D5
+0x6F76 = 0x79ED
+0x6F77 = 0x79E3
+0x6F78 = 0x79EB
+0x6F79 = 0x7A06
+0x6F7A = 0x5D47
+0x6F7B = 0x7A03
+0x6F7C = 0x7A02
+0x6F7D = 0x7A1E
+0x6F7E = 0x7A14
+0x7021 = 0x7A39
+0x7022 = 0x7A37
+0x7023 = 0x7A61
+0x7024 = 0x9ECF
+0x7025 = 0x99A5
+0x7026 = 0x7A70
+0x7027 = 0x7688
+0x7028 = 0x768E
+0x7029 = 0x7693
+0x702A = 0x7699
+0x702B = 0x76A4
+0x702C = 0x74DE
+0x702D = 0x74E0
+0x702E = 0x752C
+0x702F = 0x9CE9
+0x7030 = 0x9CF6
+0x7031 = 0x9D07
+0x7032 = 0x9D06
+0x7033 = 0x9D23
+0x7034 = 0x9D87
+0x7035 = 0x9E15
+0x7036 = 0x9D1D
+0x7037 = 0x9D1F
+0x7038 = 0x9DE5
+0x7039 = 0x9D2F
+0x703A = 0x9DD9
+0x703B = 0x9D30
+0x703C = 0x9D42
+0x703D = 0x9E1E
+0x703E = 0x9D53
+0x703F = 0x9E1D
+0x7040 = 0x9D60
+0x7041 = 0x9D52
+0x7042 = 0x9DF3
+0x7043 = 0x9D5C
+0x7044 = 0x9D61
+0x7045 = 0x9D93
+0x7046 = 0x9D6A
+0x7047 = 0x9D6F
+0x7048 = 0x9D89
+0x7049 = 0x9D98
+0x704A = 0x9D9A
+0x704B = 0x9DC0
+0x704C = 0x9DA5
+0x704D = 0x9DA9
+0x704E = 0x9DC2
+0x704F = 0x9DBC
+0x7050 = 0x9E1A
+0x7051 = 0x9DD3
+0x7052 = 0x9DDA
+0x7053 = 0x9DEF
+0x7054 = 0x9DE6
+0x7055 = 0x9DF2
+0x7056 = 0x9DF8
+0x7057 = 0x9E0C
+0x7058 = 0x9DFA
+0x7059 = 0x9E1B
+0x705A = 0x7592
+0x705B = 0x7594
+0x705C = 0x7664
+0x705D = 0x7658
+0x705E = 0x759D
+0x705F = 0x7667
+0x7060 = 0x75A3
+0x7061 = 0x75B3
+0x7062 = 0x75B4
+0x7063 = 0x75B8
+0x7064 = 0x75C4
+0x7065 = 0x75B1
+0x7066 = 0x75B0
+0x7067 = 0x75C3
+0x7068 = 0x75C2
+0x7069 = 0x7602
+0x706A = 0x75CD
+0x706B = 0x75E3
+0x706C = 0x7646
+0x706D = 0x75E6
+0x706E = 0x75E4
+0x706F = 0x7647
+0x7070 = 0x75E7
+0x7071 = 0x7603
+0x7072 = 0x75F1
+0x7073 = 0x75FC
+0x7074 = 0x75FF
+0x7075 = 0x7610
+0x7076 = 0x7600
+0x7077 = 0x7649
+0x7078 = 0x760C
+0x7079 = 0x761E
+0x707A = 0x760A
+0x707B = 0x7625
+0x707C = 0x763B
+0x707D = 0x7615
+0x707E = 0x7619
+0x7121 = 0x761B
+0x7122 = 0x763C
+0x7123 = 0x7622
+0x7124 = 0x7620
+0x7125 = 0x7640
+0x7126 = 0x762D
+0x7127 = 0x7630
+0x7128 = 0x766D
+0x7129 = 0x7635
+0x712A = 0x7643
+0x712B = 0x766E
+0x712C = 0x7633
+0x712D = 0x764D
+0x712E = 0x7669
+0x712F = 0x7654
+0x7130 = 0x765C
+0x7131 = 0x7656
+0x7132 = 0x7672
+0x7133 = 0x766F
+0x7134 = 0x7FCA
+0x7135 = 0x7AE6
+0x7136 = 0x7A78
+0x7137 = 0x7A79
+0x7138 = 0x7A80
+0x7139 = 0x7A86
+0x713A = 0x7A88
+0x713B = 0x7A95
+0x713C = 0x7AC7
+0x713D = 0x7AA0
+0x713E = 0x7AAC
+0x713F = 0x7AA8
+0x7140 = 0x7AB6
+0x7141 = 0x7AB3
+0x7142 = 0x8864
+0x7143 = 0x8869
+0x7144 = 0x8872
+0x7145 = 0x887D
+0x7146 = 0x887F
+0x7147 = 0x8882
+0x7148 = 0x88A2
+0x7149 = 0x8960
+0x714A = 0x88B7
+0x714B = 0x88BC
+0x714C = 0x88C9
+0x714D = 0x8933
+0x714E = 0x88CE
+0x714F = 0x895D
+0x7150 = 0x8947
+0x7151 = 0x88F1
+0x7152 = 0x891A
+0x7153 = 0x88FC
+0x7154 = 0x88E8
+0x7155 = 0x88FE
+0x7156 = 0x88F0
+0x7157 = 0x8921
+0x7158 = 0x8919
+0x7159 = 0x8913
+0x715A = 0x8938
+0x715B = 0x890A
+0x715C = 0x8964
+0x715D = 0x892B
+0x715E = 0x8936
+0x715F = 0x8941
+0x7160 = 0x8966
+0x7161 = 0x897B
+0x7162 = 0x758B
+0x7163 = 0x80E5
+0x7164 = 0x76B8
+0x7165 = 0x76B4
+0x7166 = 0x77DC
+0x7167 = 0x8012
+0x7168 = 0x8014
+0x7169 = 0x8016
+0x716A = 0x801C
+0x716B = 0x8020
+0x716C = 0x802E
+0x716D = 0x8025
+0x716E = 0x8026
+0x716F = 0x802C
+0x7170 = 0x8029
+0x7171 = 0x8028
+0x7172 = 0x8031
+0x7173 = 0x800B
+0x7174 = 0x8035
+0x7175 = 0x8043
+0x7176 = 0x8046
+0x7177 = 0x8079
+0x7178 = 0x8052
+0x7179 = 0x8075
+0x717A = 0x8071
+0x717B = 0x8983
+0x717C = 0x9807
+0x717D = 0x980E
+0x717E = 0x980F
+0x7221 = 0x9821
+0x7222 = 0x981C
+0x7223 = 0x6F41
+0x7224 = 0x9826
+0x7225 = 0x9837
+0x7226 = 0x984E
+0x7227 = 0x9853
+0x7228 = 0x9873
+0x7229 = 0x9862
+0x722A = 0x9859
+0x722B = 0x9865
+0x722C = 0x986C
+0x722D = 0x9870
+0x722E = 0x864D
+0x722F = 0x8654
+0x7230 = 0x866C
+0x7231 = 0x87E3
+0x7232 = 0x8806
+0x7233 = 0x867A
+0x7234 = 0x867C
+0x7235 = 0x867B
+0x7236 = 0x86A8
+0x7237 = 0x868D
+0x7238 = 0x868B
+0x7239 = 0x8706
+0x723A = 0x869D
+0x723B = 0x86A7
+0x723C = 0x86A3
+0x723D = 0x86AA
+0x723E = 0x8693
+0x723F = 0x86A9
+0x7240 = 0x86B6
+0x7241 = 0x86C4
+0x7242 = 0x86B5
+0x7243 = 0x8823
+0x7244 = 0x86B0
+0x7245 = 0x86BA
+0x7246 = 0x86B1
+0x7247 = 0x86AF
+0x7248 = 0x86C9
+0x7249 = 0x87F6
+0x724A = 0x86B4
+0x724B = 0x86E9
+0x724C = 0x86FA
+0x724D = 0x87EF
+0x724E = 0x86ED
+0x724F = 0x8784
+0x7250 = 0x86D0
+0x7251 = 0x8713
+0x7252 = 0x86DE
+0x7253 = 0x8810
+0x7254 = 0x86DF
+0x7255 = 0x86D8
+0x7256 = 0x86D1
+0x7257 = 0x8703
+0x7258 = 0x8707
+0x7259 = 0x86F8
+0x725A = 0x8708
+0x725B = 0x870A
+0x725C = 0x870D
+0x725D = 0x8709
+0x725E = 0x8723
+0x725F = 0x873B
+0x7260 = 0x871E
+0x7261 = 0x8725
+0x7262 = 0x872E
+0x7263 = 0x871A
+0x7264 = 0x873E
+0x7265 = 0x87C8
+0x7266 = 0x8734
+0x7267 = 0x8731
+0x7268 = 0x8729
+0x7269 = 0x8737
+0x726A = 0x873F
+0x726B = 0x8782
+0x726C = 0x8722
+0x726D = 0x877D
+0x726E = 0x8811
+0x726F = 0x877B
+0x7270 = 0x8760
+0x7271 = 0x8770
+0x7272 = 0x874C
+0x7273 = 0x876E
+0x7274 = 0x878B
+0x7275 = 0x8753
+0x7276 = 0x8763
+0x7277 = 0x87BB
+0x7278 = 0x8764
+0x7279 = 0x8759
+0x727A = 0x8765
+0x727B = 0x8793
+0x727C = 0x87AF
+0x727D = 0x87CE
+0x727E = 0x87D2
+0x7321 = 0x87C6
+0x7322 = 0x8788
+0x7323 = 0x8785
+0x7324 = 0x87AD
+0x7325 = 0x8797
+0x7326 = 0x8783
+0x7327 = 0x87AB
+0x7328 = 0x87E5
+0x7329 = 0x87AC
+0x732A = 0x87B5
+0x732B = 0x87B3
+0x732C = 0x87CB
+0x732D = 0x87D3
+0x732E = 0x87BD
+0x732F = 0x87D1
+0x7330 = 0x87C0
+0x7331 = 0x87CA
+0x7332 = 0x87DB
+0x7333 = 0x87EA
+0x7334 = 0x87E0
+0x7335 = 0x87EE
+0x7336 = 0x8816
+0x7337 = 0x8813
+0x7338 = 0x87FE
+0x7339 = 0x880A
+0x733A = 0x881B
+0x733B = 0x8821
+0x733C = 0x8839
+0x733D = 0x883C
+0x733E = 0x7F36
+0x733F = 0x7F4C
+0x7340 = 0x7F44
+0x7341 = 0x7F45
+0x7342 = 0x8210
+0x7343 = 0x7AFA
+0x7344 = 0x7AFD
+0x7345 = 0x7B08
+0x7346 = 0x7BE4
+0x7347 = 0x7B04
+0x7348 = 0x7B67
+0x7349 = 0x7B0A
+0x734A = 0x7B2B
+0x734B = 0x7B0F
+0x734C = 0x7B47
+0x734D = 0x7B38
+0x734E = 0x7B2A
+0x734F = 0x7B19
+0x7350 = 0x7B2E
+0x7351 = 0x7B31
+0x7352 = 0x7B20
+0x7353 = 0x7B25
+0x7354 = 0x7B24
+0x7355 = 0x7B33
+0x7356 = 0x7C69
+0x7357 = 0x7B1E
+0x7358 = 0x7B58
+0x7359 = 0x7BF3
+0x735A = 0x7B45
+0x735B = 0x7B75
+0x735C = 0x7B4C
+0x735D = 0x7B8F
+0x735E = 0x7B60
+0x735F = 0x7B6E
+0x7360 = 0x7B7B
+0x7361 = 0x7B62
+0x7362 = 0x7B72
+0x7363 = 0x7B71
+0x7364 = 0x7B90
+0x7365 = 0x7C00
+0x7366 = 0x7BCB
+0x7367 = 0x7BB8
+0x7368 = 0x7BAC
+0x7369 = 0x7B9D
+0x736A = 0x7C5C
+0x736B = 0x7B85
+0x736C = 0x7C1E
+0x736D = 0x7B9C
+0x736E = 0x7BA2
+0x736F = 0x7C2B
+0x7370 = 0x7BB4
+0x7371 = 0x7C23
+0x7372 = 0x7BC1
+0x7373 = 0x7BCC
+0x7374 = 0x7BDD
+0x7375 = 0x7BDA
+0x7376 = 0x7BE5
+0x7377 = 0x7BE6
+0x7378 = 0x7BEA
+0x7379 = 0x7C0C
+0x737A = 0x7BFE
+0x737B = 0x7BFC
+0x737C = 0x7C0F
+0x737D = 0x7C6A
+0x737E = 0x7C0B
+0x7421 = 0x7C1F
+0x7422 = 0x7C2A
+0x7423 = 0x7C26
+0x7424 = 0x7C38
+0x7425 = 0x7C5F
+0x7426 = 0x7C40
+0x7427 = 0x81FE
+0x7428 = 0x8201
+0x7429 = 0x8202
+0x742A = 0x8204
+0x742B = 0x81EC
+0x742C = 0x8844
+0x742D = 0x8221
+0x742E = 0x8222
+0x742F = 0x8264
+0x7430 = 0x822D
+0x7431 = 0x822F
+0x7432 = 0x8228
+0x7433 = 0x822B
+0x7434 = 0x8238
+0x7435 = 0x826B
+0x7436 = 0x8233
+0x7437 = 0x8234
+0x7438 = 0x823E
+0x7439 = 0x8244
+0x743A = 0x8249
+0x743B = 0x824B
+0x743C = 0x824F
+0x743D = 0x825A
+0x743E = 0x825F
+0x743F = 0x8268
+0x7440 = 0x887E
+0x7441 = 0x88CA
+0x7442 = 0x8888
+0x7443 = 0x88D8
+0x7444 = 0x88DF
+0x7445 = 0x895E
+0x7446 = 0x7F9D
+0x7447 = 0x7FA5
+0x7448 = 0x7FA7
+0x7449 = 0x7FAF
+0x744A = 0x7FB0
+0x744B = 0x7FB2
+0x744C = 0x7C7C
+0x744D = 0x6549
+0x744E = 0x7C91
+0x744F = 0x7CF2
+0x7450 = 0x7CF6
+0x7451 = 0x7C9E
+0x7452 = 0x7CA2
+0x7453 = 0x7CB2
+0x7454 = 0x7CBC
+0x7455 = 0x7CBD
+0x7456 = 0x7CDD
+0x7457 = 0x7CC7
+0x7458 = 0x7CCC
+0x7459 = 0x7CCD
+0x745A = 0x7CC8
+0x745B = 0x7CC5
+0x745C = 0x7CD7
+0x745D = 0x7CE8
+0x745E = 0x826E
+0x745F = 0x66A8
+0x7460 = 0x7FBF
+0x7461 = 0x7FCE
+0x7462 = 0x7FD5
+0x7463 = 0x7FE5
+0x7464 = 0x7FE1
+0x7465 = 0x7FE6
+0x7466 = 0x7FE9
+0x7467 = 0x7FEE
+0x7468 = 0x7FF3
+0x7469 = 0x7CF8
+0x746A = 0x7E36
+0x746B = 0x7DA6
+0x746C = 0x7DAE
+0x746D = 0x7E47
+0x746E = 0x7E9B
+0x746F = 0x9EA9
+0x7470 = 0x9EB4
+0x7471 = 0x8D73
+0x7472 = 0x8D84
+0x7473 = 0x8D94
+0x7474 = 0x8D91
+0x7475 = 0x8DB2
+0x7476 = 0x8D67
+0x7477 = 0x8D6D
+0x7478 = 0x8C47
+0x7479 = 0x8C49
+0x747A = 0x914A
+0x747B = 0x9150
+0x747C = 0x914E
+0x747D = 0x914F
+0x747E = 0x9164
+0x7521 = 0x9162
+0x7522 = 0x9161
+0x7523 = 0x9170
+0x7524 = 0x9169
+0x7525 = 0x916F
+0x7526 = 0x91C5
+0x7527 = 0x91C3
+0x7528 = 0x9172
+0x7529 = 0x9174
+0x752A = 0x9179
+0x752B = 0x918C
+0x752C = 0x9185
+0x752D = 0x9190
+0x752E = 0x918D
+0x752F = 0x9191
+0x7530 = 0x91A2
+0x7531 = 0x91A3
+0x7532 = 0x91AA
+0x7533 = 0x91AD
+0x7534 = 0x91AE
+0x7535 = 0x91AF
+0x7536 = 0x91B5
+0x7537 = 0x91B4
+0x7538 = 0x91BA
+0x7539 = 0x8C55
+0x753A = 0x9E7A
+0x753B = 0x8E89
+0x753C = 0x8DEB
+0x753D = 0x8E05
+0x753E = 0x8E59
+0x753F = 0x8E69
+0x7540 = 0x8DB5
+0x7541 = 0x8DBF
+0x7542 = 0x8DBC
+0x7543 = 0x8DBA
+0x7544 = 0x8E4C
+0x7545 = 0x8DD6
+0x7546 = 0x8DD7
+0x7547 = 0x8DDA
+0x7548 = 0x8E92
+0x7549 = 0x8DCE
+0x754A = 0x8DCF
+0x754B = 0x8DDB
+0x754C = 0x8DC6
+0x754D = 0x8DEC
+0x754E = 0x8E7A
+0x754F = 0x8E55
+0x7550 = 0x8DE3
+0x7551 = 0x8E9A
+0x7552 = 0x8E8B
+0x7553 = 0x8DE4
+0x7554 = 0x8E09
+0x7555 = 0x8DFD
+0x7556 = 0x8E14
+0x7557 = 0x8E1D
+0x7558 = 0x8E1F
+0x7559 = 0x8E93
+0x755A = 0x8E2E
+0x755B = 0x8E23
+0x755C = 0x8E91
+0x755D = 0x8E3A
+0x755E = 0x8E40
+0x755F = 0x8E39
+0x7560 = 0x8E35
+0x7561 = 0x8E3D
+0x7562 = 0x8E31
+0x7563 = 0x8E49
+0x7564 = 0x8E41
+0x7565 = 0x8E42
+0x7566 = 0x8EA1
+0x7567 = 0x8E63
+0x7568 = 0x8E4A
+0x7569 = 0x8E70
+0x756A = 0x8E76
+0x756B = 0x8E7C
+0x756C = 0x8E6F
+0x756D = 0x8E74
+0x756E = 0x8E85
+0x756F = 0x8EAA
+0x7570 = 0x8E94
+0x7571 = 0x8E90
+0x7572 = 0x8EA6
+0x7573 = 0x8E9E
+0x7574 = 0x8C78
+0x7575 = 0x8C82
+0x7576 = 0x8C8A
+0x7577 = 0x8C85
+0x7578 = 0x8C98
+0x7579 = 0x8C94
+0x757A = 0x659B
+0x757B = 0x89D6
+0x757C = 0x89F4
+0x757D = 0x89DA
+0x757E = 0x89DC
+0x7621 = 0x89E5
+0x7622 = 0x89EB
+0x7623 = 0x89F6
+0x7624 = 0x8A3E
+0x7625 = 0x8B26
+0x7626 = 0x975A
+0x7627 = 0x96E9
+0x7628 = 0x9742
+0x7629 = 0x96EF
+0x762A = 0x9706
+0x762B = 0x973D
+0x762C = 0x9708
+0x762D = 0x970F
+0x762E = 0x970E
+0x762F = 0x972A
+0x7630 = 0x9744
+0x7631 = 0x9730
+0x7632 = 0x973E
+0x7633 = 0x9F54
+0x7634 = 0x9F5F
+0x7635 = 0x9F59
+0x7636 = 0x9F60
+0x7637 = 0x9F5C
+0x7638 = 0x9F66
+0x7639 = 0x9F6C
+0x763A = 0x9F6A
+0x763B = 0x9F77
+0x763C = 0x9EFD
+0x763D = 0x9EFF
+0x763E = 0x9F09
+0x763F = 0x96B9
+0x7640 = 0x96BC
+0x7641 = 0x96BD
+0x7642 = 0x96CE
+0x7643 = 0x96D2
+0x7644 = 0x77BF
+0x7645 = 0x8B8E
+0x7646 = 0x928E
+0x7647 = 0x947E
+0x7648 = 0x92C8
+0x7649 = 0x93E8
+0x764A = 0x936A
+0x764B = 0x93CA
+0x764C = 0x938F
+0x764D = 0x943E
+0x764E = 0x946B
+0x764F = 0x9B77
+0x7650 = 0x9B74
+0x7651 = 0x9B81
+0x7652 = 0x9B83
+0x7653 = 0x9B8E
+0x7654 = 0x9C78
+0x7655 = 0x7A4C
+0x7656 = 0x9B92
+0x7657 = 0x9C5F
+0x7658 = 0x9B90
+0x7659 = 0x9BAD
+0x765A = 0x9B9A
+0x765B = 0x9BAA
+0x765C = 0x9B9E
+0x765D = 0x9C6D
+0x765E = 0x9BAB
+0x765F = 0x9B9D
+0x7660 = 0x9C58
+0x7661 = 0x9BC1
+0x7662 = 0x9C7A
+0x7663 = 0x9C31
+0x7664 = 0x9C39
+0x7665 = 0x9C23
+0x7666 = 0x9C37
+0x7667 = 0x9BC0
+0x7668 = 0x9BCA
+0x7669 = 0x9BC7
+0x766A = 0x9BFD
+0x766B = 0x9BD6
+0x766C = 0x9BEA
+0x766D = 0x9BEB
+0x766E = 0x9BE1
+0x766F = 0x9BE4
+0x7670 = 0x9BE7
+0x7671 = 0x9BDD
+0x7672 = 0x9BE2
+0x7673 = 0x9BF0
+0x7674 = 0x9BDB
+0x7675 = 0x9BF4
+0x7676 = 0x9BD4
+0x7677 = 0x9C5D
+0x7678 = 0x9C08
+0x7679 = 0x9C10
+0x767A = 0x9C0D
+0x767B = 0x9C12
+0x767C = 0x9C09
+0x767D = 0x9BFF
+0x767E = 0x9C20
+0x7721 = 0x9C32
+0x7722 = 0x9C2D
+0x7723 = 0x9C28
+0x7724 = 0x9C25
+0x7725 = 0x9C29
+0x7726 = 0x9C33
+0x7727 = 0x9C3E
+0x7728 = 0x9C48
+0x7729 = 0x9C3B
+0x772A = 0x9C35
+0x772B = 0x9C45
+0x772C = 0x9C56
+0x772D = 0x9C54
+0x772E = 0x9C52
+0x772F = 0x9C67
+0x7730 = 0x977C
+0x7731 = 0x9785
+0x7732 = 0x97C3
+0x7733 = 0x97BD
+0x7734 = 0x9794
+0x7735 = 0x97C9
+0x7736 = 0x97AB
+0x7737 = 0x97A3
+0x7738 = 0x97B2
+0x7739 = 0x97B4
+0x773A = 0x9AB1
+0x773B = 0x9AB0
+0x773C = 0x9AB7
+0x773D = 0x9DBB
+0x773E = 0x9AB6
+0x773F = 0x9ABA
+0x7740 = 0x9ABC
+0x7741 = 0x9AC1
+0x7742 = 0x9AC0
+0x7743 = 0x9ACF
+0x7744 = 0x9AC2
+0x7745 = 0x9AD6
+0x7746 = 0x9AD5
+0x7747 = 0x9AD1
+0x7748 = 0x9B45
+0x7749 = 0x9B43
+0x774A = 0x9B58
+0x774B = 0x9B4E
+0x774C = 0x9B48
+0x774D = 0x9B4D
+0x774E = 0x9B51
+0x774F = 0x9957
+0x7750 = 0x995C
+0x7751 = 0x992E
+0x7752 = 0x9955
+0x7753 = 0x9954
+0x7754 = 0x9ADF
+0x7755 = 0x9AE1
+0x7756 = 0x9AE6
+0x7757 = 0x9AEF
+0x7758 = 0x9AEB
+0x7759 = 0x9AFB
+0x775A = 0x9AED
+0x775B = 0x9AF9
+0x775C = 0x9B08
+0x775D = 0x9B0F
+0x775E = 0x9B22
+0x775F = 0x9B1F
+0x7760 = 0x9B23
+0x7761 = 0x4E48
+0x7762 = 0x9EBE
+0x7763 = 0x7E3B
+0x7764 = 0x9E82
+0x7765 = 0x9E87
+0x7766 = 0x9E88
+0x7767 = 0x9E8B
+0x7768 = 0x9E92
+0x7769 = 0x93D6
+0x776A = 0x9E9D
+0x776B = 0x9E9F
+0x776C = 0x9EDB
+0x776D = 0x9EDC
+0x776E = 0x9EDD
+0x776F = 0x9EE0
+0x7770 = 0x9EDF
+0x7771 = 0x9EE2
+0x7772 = 0x9EF7
+0x7773 = 0x9EE7
+0x7774 = 0x9EE5
+0x7775 = 0x9EF2
+0x7776 = 0x9EEF
+0x7777 = 0x9F22
+0x7778 = 0x9F2C
+0x7779 = 0x9F2F
+0x777A = 0x9F39
+0x777B = 0x9F37
+0x777C = 0x9F3D
+0x777D = 0x9F3E
+0x777E = 0x9F44
+0x7821 = 0x896C
+0x7822 = 0x95C6
+0x7823 = 0x9336
+0x7824 = 0x5F46
+0x7825 = 0x8514
+0x7826 = 0x7E94
+0x7827 = 0x5382
+0x7828 = 0x51B2
+0x7829 = 0x4E11
+0x782A = 0x9F63
+0x782B = 0x5679
+0x782C = 0x515A
+0x782D = 0x6DC0
+0x782E = 0x9F15
+0x782F = 0x6597
+0x7830 = 0x5641
+0x7831 = 0x9AEE
+0x7832 = 0x8303
+0x7833 = 0x4E30
+0x7834 = 0x8907
+0x7835 = 0x5E72
+0x7836 = 0x7A40
+0x7837 = 0x98B3
+0x7838 = 0x5E7F
+0x7839 = 0x95A4
+0x783A = 0x9B0D
+0x783B = 0x5212
+0x783C = 0x8FF4
+0x783D = 0x5F59
+0x783E = 0x7A6B
+0x783F = 0x98E2
+0x7840 = 0x51E0
+0x7841 = 0x50A2
+0x7842 = 0x4EF7
+0x7843 = 0x8350
+0x7844 = 0x8591
+0x7845 = 0x5118
+0x7846 = 0x636E
+0x7847 = 0x6372
+0x7848 = 0x524B
+0x7849 = 0x5938
+0x784A = 0x774F
+0x784B = 0x8721
+0x784C = 0x814A
+0x784D = 0x7E8D
+0x784E = 0x91CC
+0x784F = 0x66C6
+0x7850 = 0x5E18
+0x7851 = 0x77AD
+0x7852 = 0x9E75
+0x7853 = 0x56C9
+0x7854 = 0x9EF4
+0x7855 = 0x6FDB
+0x7856 = 0x61DE
+0x7857 = 0x77C7
+0x7858 = 0x7030
+0x7859 = 0x9EB5
+0x785A = 0x884A
+0x785B = 0x95E2
+0x785C = 0x82F9
+0x785D = 0x51ED
+0x785E = 0x6251
+0x785F = 0x4EC6
+0x7860 = 0x6734
+0x7861 = 0x97C6
+0x7862 = 0x7C64
+0x7863 = 0x7E34
+0x7864 = 0x97A6
+0x7865 = 0x9EAF
+0x7866 = 0x786E
+0x7867 = 0x820D
+0x7868 = 0x672F
+0x7869 = 0x677E
+0x786A = 0x56CC
+0x786B = 0x53F0
+0x786C = 0x98B1
+0x786D = 0x6AAF
+0x786E = 0x7F4E
+0x786F = 0x6D82
+0x7870 = 0x7CF0
+0x7871 = 0x4E07
+0x7872 = 0x4FC2
+0x7873 = 0x7E6B
+0x7874 = 0x9E79
+0x7875 = 0x56AE
+0x7876 = 0x9B1A
+0x7877 = 0x846F
+0x7878 = 0x53F6
+0x7879 = 0x90C1
+0x787A = 0x79A6
+0x787B = 0x7C72
+0x787C = 0x613F
+0x787D = 0x4E91
+0x787E = 0x9AD2
+0x7921 = 0x75C7
+0x7922 = 0x96BB
+0x7923 = 0x53EA
+0x7924 = 0x7DFB
+0x7925 = 0x88FD
+0x7926 = 0x79CD
+0x7927 = 0x7843
+0x7928 = 0x7B51
+0x7929 = 0x51C6
+END_MAP
diff --git a/enc/trans/GB/GB2312%UCS.src b/enc/trans/GB/GB2312%UCS.src
new file mode 100644
index 0000000000..d196bab535
--- /dev/null
+++ b/enc/trans/GB/GB2312%UCS.src
@@ -0,0 +1,7535 @@
+# $NetBSD: GB2312%UCS.src,v 1.4 2006/08/19 10:58:41 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"GB2312/UCS"
+SRC_ZONE	0x21-0x77 / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             GB2312-80 to Unicode table (complete, hex format)
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 October 8
+#
+#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from GB2312-80 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# GB2312-80 and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between GB2312-80 and
+# Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point.  Including all these
+#			names in this file increases its size substantially
+#			and needlessly.  The token "<CJK>" is used for the
+#			name of these characters.  If necessary, it can be
+#			expanded algorithmically by a parser or editor.
+#
+#	The entries are in GB2312 order
+#
+#	The following algorithms can be used to change the hex form
+#		of GB2312 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x777E -> 0x575E -> 8794
+#
+#	Version history
+#	1.0 version updates 0.0d2 version by correcting mapping for 0x212C
+#             from U+2225 to U+2016.
+#
+#
+
+# GBK1
+0x2121 = 0x3000
+0x2122 = 0x3001
+0x2123 = 0x3002
+0x2124 = 0x00B7
+0x2125 = 0x02C9
+0x2126 = 0x02C7
+0x2127 = 0x00A8
+0x2128 = 0x3003
+0x2129 = 0x3005
+0x212A = 0x2014
+0x212B = 0xFF5E
+0x212C = 0x2016
+0x212D = 0x2026
+0x212E = 0x2018
+0x212F = 0x2019
+0x2130 = 0x201C
+0x2131 = 0x201D
+0x2132 = 0x3014
+0x2133 = 0x3015
+0x2134 = 0x3008
+0x2135 = 0x3009
+0x2136 = 0x300A
+0x2137 = 0x300B
+0x2138 = 0x300C
+0x2139 = 0x300D
+0x213A = 0x300E
+0x213B = 0x300F
+0x213C = 0x3016
+0x213D = 0x3017
+0x213E = 0x3010
+0x213F = 0x3011
+0x2140 = 0x00B1
+0x2141 = 0x00D7
+0x2142 = 0x00F7
+0x2143 = 0x2236
+0x2144 = 0x2227
+0x2145 = 0x2228
+0x2146 = 0x2211
+0x2147 = 0x220F
+0x2148 = 0x222A
+0x2149 = 0x2229
+0x214A = 0x2208
+0x214B = 0x2237
+0x214C = 0x221A
+0x214D = 0x22A5
+0x214E = 0x2225
+0x214F = 0x2220
+0x2150 = 0x2312
+0x2151 = 0x2299
+0x2152 = 0x222B
+0x2153 = 0x222E
+0x2154 = 0x2261
+0x2155 = 0x224C
+0x2156 = 0x2248
+0x2157 = 0x223D
+0x2158 = 0x221D
+0x2159 = 0x2260
+0x215A = 0x226E
+0x215B = 0x226F
+0x215C = 0x2264
+0x215D = 0x2265
+0x215E = 0x221E
+0x215F = 0x2235
+0x2160 = 0x2234
+0x2161 = 0x2642
+0x2162 = 0x2640
+0x2163 = 0x00B0
+0x2164 = 0x2032
+0x2165 = 0x2033
+0x2166 = 0x2103
+0x2167 = 0xFF04
+0x2168 = 0x00A4
+0x2169 = 0xFFE0
+0x216A = 0xFFE1
+0x216B = 0x2030
+0x216C = 0x00A7
+0x216D = 0x2116
+0x216E = 0x2606
+0x216F = 0x2605
+0x2170 = 0x25CB
+0x2171 = 0x25CF
+0x2172 = 0x25CE
+0x2173 = 0x25C7
+0x2174 = 0x25C6
+0x2175 = 0x25A1
+0x2176 = 0x25A0
+0x2177 = 0x25B3
+0x2178 = 0x25B2
+0x2179 = 0x203B
+0x217A = 0x2192
+0x217B = 0x2190
+0x217C = 0x2191
+0x217D = 0x2193
+0x217E = 0x3013
+0x2231 = 0x2488
+0x2232 = 0x2489
+0x2233 = 0x248A
+0x2234 = 0x248B
+0x2235 = 0x248C
+0x2236 = 0x248D
+0x2237 = 0x248E
+0x2238 = 0x248F
+0x2239 = 0x2490
+0x223A = 0x2491
+0x223B = 0x2492
+0x223C = 0x2493
+0x223D = 0x2494
+0x223E = 0x2495
+0x223F = 0x2496
+0x2240 = 0x2497
+0x2241 = 0x2498
+0x2242 = 0x2499
+0x2243 = 0x249A
+0x2244 = 0x249B
+0x2245 = 0x2474
+0x2246 = 0x2475
+0x2247 = 0x2476
+0x2248 = 0x2477
+0x2249 = 0x2478
+0x224A = 0x2479
+0x224B = 0x247A
+0x224C = 0x247B
+0x224D = 0x247C
+0x224E = 0x247D
+0x224F = 0x247E
+0x2250 = 0x247F
+0x2251 = 0x2480
+0x2252 = 0x2481
+0x2253 = 0x2482
+0x2254 = 0x2483
+0x2255 = 0x2484
+0x2256 = 0x2485
+0x2257 = 0x2486
+0x2258 = 0x2487
+0x2259 = 0x2460
+0x225A = 0x2461
+0x225B = 0x2462
+0x225C = 0x2463
+0x225D = 0x2464
+0x225E = 0x2465
+0x225F = 0x2466
+0x2260 = 0x2467
+0x2261 = 0x2468
+0x2262 = 0x2469
+0x2265 = 0x3220
+0x2266 = 0x3221
+0x2267 = 0x3222
+0x2268 = 0x3223
+0x2269 = 0x3224
+0x226A = 0x3225
+0x226B = 0x3226
+0x226C = 0x3227
+0x226D = 0x3228
+0x226E = 0x3229
+0x2271 = 0x2160
+0x2272 = 0x2161
+0x2273 = 0x2162
+0x2274 = 0x2163
+0x2275 = 0x2164
+0x2276 = 0x2165
+0x2277 = 0x2166
+0x2278 = 0x2167
+0x2279 = 0x2168
+0x227A = 0x2169
+0x227B = 0x216A
+0x227C = 0x216B
+0x2321 = 0xFF01
+0x2322 = 0xFF02
+0x2323 = 0xFF03
+0x2324 = 0xFFE5
+0x2325 = 0xFF05
+0x2326 = 0xFF06
+0x2327 = 0xFF07
+0x2328 = 0xFF08
+0x2329 = 0xFF09
+0x232A = 0xFF0A
+0x232B = 0xFF0B
+0x232C = 0xFF0C
+0x232D = 0xFF0D
+0x232E = 0xFF0E
+0x232F = 0xFF0F
+0x2330 = 0xFF10
+0x2331 = 0xFF11
+0x2332 = 0xFF12
+0x2333 = 0xFF13
+0x2334 = 0xFF14
+0x2335 = 0xFF15
+0x2336 = 0xFF16
+0x2337 = 0xFF17
+0x2338 = 0xFF18
+0x2339 = 0xFF19
+0x233A = 0xFF1A
+0x233B = 0xFF1B
+0x233C = 0xFF1C
+0x233D = 0xFF1D
+0x233E = 0xFF1E
+0x233F = 0xFF1F
+0x2340 = 0xFF20
+0x2341 = 0xFF21
+0x2342 = 0xFF22
+0x2343 = 0xFF23
+0x2344 = 0xFF24
+0x2345 = 0xFF25
+0x2346 = 0xFF26
+0x2347 = 0xFF27
+0x2348 = 0xFF28
+0x2349 = 0xFF29
+0x234A = 0xFF2A
+0x234B = 0xFF2B
+0x234C = 0xFF2C
+0x234D = 0xFF2D
+0x234E = 0xFF2E
+0x234F = 0xFF2F
+0x2350 = 0xFF30
+0x2351 = 0xFF31
+0x2352 = 0xFF32
+0x2353 = 0xFF33
+0x2354 = 0xFF34
+0x2355 = 0xFF35
+0x2356 = 0xFF36
+0x2357 = 0xFF37
+0x2358 = 0xFF38
+0x2359 = 0xFF39
+0x235A = 0xFF3A
+0x235B = 0xFF3B
+0x235C = 0xFF3C
+0x235D = 0xFF3D
+0x235E = 0xFF3E
+0x235F = 0xFF3F
+0x2360 = 0xFF40
+0x2361 = 0xFF41
+0x2362 = 0xFF42
+0x2363 = 0xFF43
+0x2364 = 0xFF44
+0x2365 = 0xFF45
+0x2366 = 0xFF46
+0x2367 = 0xFF47
+0x2368 = 0xFF48
+0x2369 = 0xFF49
+0x236A = 0xFF4A
+0x236B = 0xFF4B
+0x236C = 0xFF4C
+0x236D = 0xFF4D
+0x236E = 0xFF4E
+0x236F = 0xFF4F
+0x2370 = 0xFF50
+0x2371 = 0xFF51
+0x2372 = 0xFF52
+0x2373 = 0xFF53
+0x2374 = 0xFF54
+0x2375 = 0xFF55
+0x2376 = 0xFF56
+0x2377 = 0xFF57
+0x2378 = 0xFF58
+0x2379 = 0xFF59
+0x237A = 0xFF5A
+0x237B = 0xFF5B
+0x237C = 0xFF5C
+0x237D = 0xFF5D
+0x237E = 0xFFE3
+0x2421 = 0x3041
+0x2422 = 0x3042
+0x2423 = 0x3043
+0x2424 = 0x3044
+0x2425 = 0x3045
+0x2426 = 0x3046
+0x2427 = 0x3047
+0x2428 = 0x3048
+0x2429 = 0x3049
+0x242A = 0x304A
+0x242B = 0x304B
+0x242C = 0x304C
+0x242D = 0x304D
+0x242E = 0x304E
+0x242F = 0x304F
+0x2430 = 0x3050
+0x2431 = 0x3051
+0x2432 = 0x3052
+0x2433 = 0x3053
+0x2434 = 0x3054
+0x2435 = 0x3055
+0x2436 = 0x3056
+0x2437 = 0x3057
+0x2438 = 0x3058
+0x2439 = 0x3059
+0x243A = 0x305A
+0x243B = 0x305B
+0x243C = 0x305C
+0x243D = 0x305D
+0x243E = 0x305E
+0x243F = 0x305F
+0x2440 = 0x3060
+0x2441 = 0x3061
+0x2442 = 0x3062
+0x2443 = 0x3063
+0x2444 = 0x3064
+0x2445 = 0x3065
+0x2446 = 0x3066
+0x2447 = 0x3067
+0x2448 = 0x3068
+0x2449 = 0x3069
+0x244A = 0x306A
+0x244B = 0x306B
+0x244C = 0x306C
+0x244D = 0x306D
+0x244E = 0x306E
+0x244F = 0x306F
+0x2450 = 0x3070
+0x2451 = 0x3071
+0x2452 = 0x3072
+0x2453 = 0x3073
+0x2454 = 0x3074
+0x2455 = 0x3075
+0x2456 = 0x3076
+0x2457 = 0x3077
+0x2458 = 0x3078
+0x2459 = 0x3079
+0x245A = 0x307A
+0x245B = 0x307B
+0x245C = 0x307C
+0x245D = 0x307D
+0x245E = 0x307E
+0x245F = 0x307F
+0x2460 = 0x3080
+0x2461 = 0x3081
+0x2462 = 0x3082
+0x2463 = 0x3083
+0x2464 = 0x3084
+0x2465 = 0x3085
+0x2466 = 0x3086
+0x2467 = 0x3087
+0x2468 = 0x3088
+0x2469 = 0x3089
+0x246A = 0x308A
+0x246B = 0x308B
+0x246C = 0x308C
+0x246D = 0x308D
+0x246E = 0x308E
+0x246F = 0x308F
+0x2470 = 0x3090
+0x2471 = 0x3091
+0x2472 = 0x3092
+0x2473 = 0x3093
+0x2521 = 0x30A1
+0x2522 = 0x30A2
+0x2523 = 0x30A3
+0x2524 = 0x30A4
+0x2525 = 0x30A5
+0x2526 = 0x30A6
+0x2527 = 0x30A7
+0x2528 = 0x30A8
+0x2529 = 0x30A9
+0x252A = 0x30AA
+0x252B = 0x30AB
+0x252C = 0x30AC
+0x252D = 0x30AD
+0x252E = 0x30AE
+0x252F = 0x30AF
+0x2530 = 0x30B0
+0x2531 = 0x30B1
+0x2532 = 0x30B2
+0x2533 = 0x30B3
+0x2534 = 0x30B4
+0x2535 = 0x30B5
+0x2536 = 0x30B6
+0x2537 = 0x30B7
+0x2538 = 0x30B8
+0x2539 = 0x30B9
+0x253A = 0x30BA
+0x253B = 0x30BB
+0x253C = 0x30BC
+0x253D = 0x30BD
+0x253E = 0x30BE
+0x253F = 0x30BF
+0x2540 = 0x30C0
+0x2541 = 0x30C1
+0x2542 = 0x30C2
+0x2543 = 0x30C3
+0x2544 = 0x30C4
+0x2545 = 0x30C5
+0x2546 = 0x30C6
+0x2547 = 0x30C7
+0x2548 = 0x30C8
+0x2549 = 0x30C9
+0x254A = 0x30CA
+0x254B = 0x30CB
+0x254C = 0x30CC
+0x254D = 0x30CD
+0x254E = 0x30CE
+0x254F = 0x30CF
+0x2550 = 0x30D0
+0x2551 = 0x30D1
+0x2552 = 0x30D2
+0x2553 = 0x30D3
+0x2554 = 0x30D4
+0x2555 = 0x30D5
+0x2556 = 0x30D6
+0x2557 = 0x30D7
+0x2558 = 0x30D8
+0x2559 = 0x30D9
+0x255A = 0x30DA
+0x255B = 0x30DB
+0x255C = 0x30DC
+0x255D = 0x30DD
+0x255E = 0x30DE
+0x255F = 0x30DF
+0x2560 = 0x30E0
+0x2561 = 0x30E1
+0x2562 = 0x30E2
+0x2563 = 0x30E3
+0x2564 = 0x30E4
+0x2565 = 0x30E5
+0x2566 = 0x30E6
+0x2567 = 0x30E7
+0x2568 = 0x30E8
+0x2569 = 0x30E9
+0x256A = 0x30EA
+0x256B = 0x30EB
+0x256C = 0x30EC
+0x256D = 0x30ED
+0x256E = 0x30EE
+0x256F = 0x30EF
+0x2570 = 0x30F0
+0x2571 = 0x30F1
+0x2572 = 0x30F2
+0x2573 = 0x30F3
+0x2574 = 0x30F4
+0x2575 = 0x30F5
+0x2576 = 0x30F6
+0x2621 = 0x0391
+0x2622 = 0x0392
+0x2623 = 0x0393
+0x2624 = 0x0394
+0x2625 = 0x0395
+0x2626 = 0x0396
+0x2627 = 0x0397
+0x2628 = 0x0398
+0x2629 = 0x0399
+0x262A = 0x039A
+0x262B = 0x039B
+0x262C = 0x039C
+0x262D = 0x039D
+0x262E = 0x039E
+0x262F = 0x039F
+0x2630 = 0x03A0
+0x2631 = 0x03A1
+0x2632 = 0x03A3
+0x2633 = 0x03A4
+0x2634 = 0x03A5
+0x2635 = 0x03A6
+0x2636 = 0x03A7
+0x2637 = 0x03A8
+0x2638 = 0x03A9
+0x2641 = 0x03B1
+0x2642 = 0x03B2
+0x2643 = 0x03B3
+0x2644 = 0x03B4
+0x2645 = 0x03B5
+0x2646 = 0x03B6
+0x2647 = 0x03B7
+0x2648 = 0x03B8
+0x2649 = 0x03B9
+0x264A = 0x03BA
+0x264B = 0x03BB
+0x264C = 0x03BC
+0x264D = 0x03BD
+0x264E = 0x03BE
+0x264F = 0x03BF
+0x2650 = 0x03C0
+0x2651 = 0x03C1
+0x2652 = 0x03C3
+0x2653 = 0x03C4
+0x2654 = 0x03C5
+0x2655 = 0x03C6
+0x2656 = 0x03C7
+0x2657 = 0x03C8
+0x2658 = 0x03C9
+0x2721 = 0x0410
+0x2722 = 0x0411
+0x2723 = 0x0412
+0x2724 = 0x0413
+0x2725 = 0x0414
+0x2726 = 0x0415
+0x2727 = 0x0401
+0x2728 = 0x0416
+0x2729 = 0x0417
+0x272A = 0x0418
+0x272B = 0x0419
+0x272C = 0x041A
+0x272D = 0x041B
+0x272E = 0x041C
+0x272F = 0x041D
+0x2730 = 0x041E
+0x2731 = 0x041F
+0x2732 = 0x0420
+0x2733 = 0x0421
+0x2734 = 0x0422
+0x2735 = 0x0423
+0x2736 = 0x0424
+0x2737 = 0x0425
+0x2738 = 0x0426
+0x2739 = 0x0427
+0x273A = 0x0428
+0x273B = 0x0429
+0x273C = 0x042A
+0x273D = 0x042B
+0x273E = 0x042C
+0x273F = 0x042D
+0x2740 = 0x042E
+0x2741 = 0x042F
+0x2751 = 0x0430
+0x2752 = 0x0431
+0x2753 = 0x0432
+0x2754 = 0x0433
+0x2755 = 0x0434
+0x2756 = 0x0435
+0x2757 = 0x0451
+0x2758 = 0x0436
+0x2759 = 0x0437
+0x275A = 0x0438
+0x275B = 0x0439
+0x275C = 0x043A
+0x275D = 0x043B
+0x275E = 0x043C
+0x275F = 0x043D
+0x2760 = 0x043E
+0x2761 = 0x043F
+0x2762 = 0x0440
+0x2763 = 0x0441
+0x2764 = 0x0442
+0x2765 = 0x0443
+0x2766 = 0x0444
+0x2767 = 0x0445
+0x2768 = 0x0446
+0x2769 = 0x0447
+0x276A = 0x0448
+0x276B = 0x0449
+0x276C = 0x044A
+0x276D = 0x044B
+0x276E = 0x044C
+0x276F = 0x044D
+0x2770 = 0x044E
+0x2771 = 0x044F
+0x2821 = 0x0101
+0x2822 = 0x00E1
+0x2823 = 0x01CE
+0x2824 = 0x00E0
+0x2825 = 0x0113
+0x2826 = 0x00E9
+0x2827 = 0x011B
+0x2828 = 0x00E8
+0x2829 = 0x012B
+0x282A = 0x00ED
+0x282B = 0x01D0
+0x282C = 0x00EC
+0x282D = 0x014D
+0x282E = 0x00F3
+0x282F = 0x01D2
+0x2830 = 0x00F2
+0x2831 = 0x016B
+0x2832 = 0x00FA
+0x2833 = 0x01D4
+0x2834 = 0x00F9
+0x2835 = 0x01D6
+0x2836 = 0x01D8
+0x2837 = 0x01DA
+0x2838 = 0x01DC
+0x2839 = 0x00FC
+0x283A = 0x00EA
+0x2845 = 0x3105
+0x2846 = 0x3106
+0x2847 = 0x3107
+0x2848 = 0x3108
+0x2849 = 0x3109
+0x284A = 0x310A
+0x284B = 0x310B
+0x284C = 0x310C
+0x284D = 0x310D
+0x284E = 0x310E
+0x284F = 0x310F
+0x2850 = 0x3110
+0x2851 = 0x3111
+0x2852 = 0x3112
+0x2853 = 0x3113
+0x2854 = 0x3114
+0x2855 = 0x3115
+0x2856 = 0x3116
+0x2857 = 0x3117
+0x2858 = 0x3118
+0x2859 = 0x3119
+0x285A = 0x311A
+0x285B = 0x311B
+0x285C = 0x311C
+0x285D = 0x311D
+0x285E = 0x311E
+0x285F = 0x311F
+0x2860 = 0x3120
+0x2861 = 0x3121
+0x2862 = 0x3122
+0x2863 = 0x3123
+0x2864 = 0x3124
+0x2865 = 0x3125
+0x2866 = 0x3126
+0x2867 = 0x3127
+0x2868 = 0x3128
+0x2869 = 0x3129
+0x2924 = 0x2500
+0x2925 = 0x2501
+0x2926 = 0x2502
+0x2927 = 0x2503
+0x2928 = 0x2504
+0x2929 = 0x2505
+0x292A = 0x2506
+0x292B = 0x2507
+0x292C = 0x2508
+0x292D = 0x2509
+0x292E = 0x250A
+0x292F = 0x250B
+0x2930 = 0x250C
+0x2931 = 0x250D
+0x2932 = 0x250E
+0x2933 = 0x250F
+0x2934 = 0x2510
+0x2935 = 0x2511
+0x2936 = 0x2512
+0x2937 = 0x2513
+0x2938 = 0x2514
+0x2939 = 0x2515
+0x293A = 0x2516
+0x293B = 0x2517
+0x293C = 0x2518
+0x293D = 0x2519
+0x293E = 0x251A
+0x293F = 0x251B
+0x2940 = 0x251C
+0x2941 = 0x251D
+0x2942 = 0x251E
+0x2943 = 0x251F
+0x2944 = 0x2520
+0x2945 = 0x2521
+0x2946 = 0x2522
+0x2947 = 0x2523
+0x2948 = 0x2524
+0x2949 = 0x2525
+0x294A = 0x2526
+0x294B = 0x2527
+0x294C = 0x2528
+0x294D = 0x2529
+0x294E = 0x252A
+0x294F = 0x252B
+0x2950 = 0x252C
+0x2951 = 0x252D
+0x2952 = 0x252E
+0x2953 = 0x252F
+0x2954 = 0x2530
+0x2955 = 0x2531
+0x2956 = 0x2532
+0x2957 = 0x2533
+0x2958 = 0x2534
+0x2959 = 0x2535
+0x295A = 0x2536
+0x295B = 0x2537
+0x295C = 0x2538
+0x295D = 0x2539
+0x295E = 0x253A
+0x295F = 0x253B
+0x2960 = 0x253C
+0x2961 = 0x253D
+0x2962 = 0x253E
+0x2963 = 0x253F
+0x2964 = 0x2540
+0x2965 = 0x2541
+0x2966 = 0x2542
+0x2967 = 0x2543
+0x2968 = 0x2544
+0x2969 = 0x2545
+0x296A = 0x2546
+0x296B = 0x2547
+0x296C = 0x2548
+0x296D = 0x2549
+0x296E = 0x254A
+0x296F = 0x254B
+
+# GBK2 / GB2312 plane1
+0x3021 = 0x554A
+0x3022 = 0x963F
+0x3023 = 0x57C3
+0x3024 = 0x6328
+0x3025 = 0x54CE
+0x3026 = 0x5509
+0x3027 = 0x54C0
+0x3028 = 0x7691
+0x3029 = 0x764C
+0x302A = 0x853C
+0x302B = 0x77EE
+0x302C = 0x827E
+0x302D = 0x788D
+0x302E = 0x7231
+0x302F = 0x9698
+0x3030 = 0x978D
+0x3031 = 0x6C28
+0x3032 = 0x5B89
+0x3033 = 0x4FFA
+0x3034 = 0x6309
+0x3035 = 0x6697
+0x3036 = 0x5CB8
+0x3037 = 0x80FA
+0x3038 = 0x6848
+0x3039 = 0x80AE
+0x303A = 0x6602
+0x303B = 0x76CE
+0x303C = 0x51F9
+0x303D = 0x6556
+0x303E = 0x71AC
+0x303F = 0x7FF1
+0x3040 = 0x8884
+0x3041 = 0x50B2
+0x3042 = 0x5965
+0x3043 = 0x61CA
+0x3044 = 0x6FB3
+0x3045 = 0x82AD
+0x3046 = 0x634C
+0x3047 = 0x6252
+0x3048 = 0x53ED
+0x3049 = 0x5427
+0x304A = 0x7B06
+0x304B = 0x516B
+0x304C = 0x75A4
+0x304D = 0x5DF4
+0x304E = 0x62D4
+0x304F = 0x8DCB
+0x3050 = 0x9776
+0x3051 = 0x628A
+0x3052 = 0x8019
+0x3053 = 0x575D
+0x3054 = 0x9738
+0x3055 = 0x7F62
+0x3056 = 0x7238
+0x3057 = 0x767D
+0x3058 = 0x67CF
+0x3059 = 0x767E
+0x305A = 0x6446
+0x305B = 0x4F70
+0x305C = 0x8D25
+0x305D = 0x62DC
+0x305E = 0x7A17
+0x305F = 0x6591
+0x3060 = 0x73ED
+0x3061 = 0x642C
+0x3062 = 0x6273
+0x3063 = 0x822C
+0x3064 = 0x9881
+0x3065 = 0x677F
+0x3066 = 0x7248
+0x3067 = 0x626E
+0x3068 = 0x62CC
+0x3069 = 0x4F34
+0x306A = 0x74E3
+0x306B = 0x534A
+0x306C = 0x529E
+0x306D = 0x7ECA
+0x306E = 0x90A6
+0x306F = 0x5E2E
+0x3070 = 0x6886
+0x3071 = 0x699C
+0x3072 = 0x8180
+0x3073 = 0x7ED1
+0x3074 = 0x68D2
+0x3075 = 0x78C5
+0x3076 = 0x868C
+0x3077 = 0x9551
+0x3078 = 0x508D
+0x3079 = 0x8C24
+0x307A = 0x82DE
+0x307B = 0x80DE
+0x307C = 0x5305
+0x307D = 0x8912
+0x307E = 0x5265
+0x3121 = 0x8584
+0x3122 = 0x96F9
+0x3123 = 0x4FDD
+0x3124 = 0x5821
+0x3125 = 0x9971
+0x3126 = 0x5B9D
+0x3127 = 0x62B1
+0x3128 = 0x62A5
+0x3129 = 0x66B4
+0x312A = 0x8C79
+0x312B = 0x9C8D
+0x312C = 0x7206
+0x312D = 0x676F
+0x312E = 0x7891
+0x312F = 0x60B2
+0x3130 = 0x5351
+0x3131 = 0x5317
+0x3132 = 0x8F88
+0x3133 = 0x80CC
+0x3134 = 0x8D1D
+0x3135 = 0x94A1
+0x3136 = 0x500D
+0x3137 = 0x72C8
+0x3138 = 0x5907
+0x3139 = 0x60EB
+0x313A = 0x7119
+0x313B = 0x88AB
+0x313C = 0x5954
+0x313D = 0x82EF
+0x313E = 0x672C
+0x313F = 0x7B28
+0x3140 = 0x5D29
+0x3141 = 0x7EF7
+0x3142 = 0x752D
+0x3143 = 0x6CF5
+0x3144 = 0x8E66
+0x3145 = 0x8FF8
+0x3146 = 0x903C
+0x3147 = 0x9F3B
+0x3148 = 0x6BD4
+0x3149 = 0x9119
+0x314A = 0x7B14
+0x314B = 0x5F7C
+0x314C = 0x78A7
+0x314D = 0x84D6
+0x314E = 0x853D
+0x314F = 0x6BD5
+0x3150 = 0x6BD9
+0x3151 = 0x6BD6
+0x3152 = 0x5E01
+0x3153 = 0x5E87
+0x3154 = 0x75F9
+0x3155 = 0x95ED
+0x3156 = 0x655D
+0x3157 = 0x5F0A
+0x3158 = 0x5FC5
+0x3159 = 0x8F9F
+0x315A = 0x58C1
+0x315B = 0x81C2
+0x315C = 0x907F
+0x315D = 0x965B
+0x315E = 0x97AD
+0x315F = 0x8FB9
+0x3160 = 0x7F16
+0x3161 = 0x8D2C
+0x3162 = 0x6241
+0x3163 = 0x4FBF
+0x3164 = 0x53D8
+0x3165 = 0x535E
+0x3166 = 0x8FA8
+0x3167 = 0x8FA9
+0x3168 = 0x8FAB
+0x3169 = 0x904D
+0x316A = 0x6807
+0x316B = 0x5F6A
+0x316C = 0x8198
+0x316D = 0x8868
+0x316E = 0x9CD6
+0x316F = 0x618B
+0x3170 = 0x522B
+0x3171 = 0x762A
+0x3172 = 0x5F6C
+0x3173 = 0x658C
+0x3174 = 0x6FD2
+0x3175 = 0x6EE8
+0x3176 = 0x5BBE
+0x3177 = 0x6448
+0x3178 = 0x5175
+0x3179 = 0x51B0
+0x317A = 0x67C4
+0x317B = 0x4E19
+0x317C = 0x79C9
+0x317D = 0x997C
+0x317E = 0x70B3
+0x3221 = 0x75C5
+0x3222 = 0x5E76
+0x3223 = 0x73BB
+0x3224 = 0x83E0
+0x3225 = 0x64AD
+0x3226 = 0x62E8
+0x3227 = 0x94B5
+0x3228 = 0x6CE2
+0x3229 = 0x535A
+0x322A = 0x52C3
+0x322B = 0x640F
+0x322C = 0x94C2
+0x322D = 0x7B94
+0x322E = 0x4F2F
+0x322F = 0x5E1B
+0x3230 = 0x8236
+0x3231 = 0x8116
+0x3232 = 0x818A
+0x3233 = 0x6E24
+0x3234 = 0x6CCA
+0x3235 = 0x9A73
+0x3236 = 0x6355
+0x3237 = 0x535C
+0x3238 = 0x54FA
+0x3239 = 0x8865
+0x323A = 0x57E0
+0x323B = 0x4E0D
+0x323C = 0x5E03
+0x323D = 0x6B65
+0x323E = 0x7C3F
+0x323F = 0x90E8
+0x3240 = 0x6016
+0x3241 = 0x64E6
+0x3242 = 0x731C
+0x3243 = 0x88C1
+0x3244 = 0x6750
+0x3245 = 0x624D
+0x3246 = 0x8D22
+0x3247 = 0x776C
+0x3248 = 0x8E29
+0x3249 = 0x91C7
+0x324A = 0x5F69
+0x324B = 0x83DC
+0x324C = 0x8521
+0x324D = 0x9910
+0x324E = 0x53C2
+0x324F = 0x8695
+0x3250 = 0x6B8B
+0x3251 = 0x60ED
+0x3252 = 0x60E8
+0x3253 = 0x707F
+0x3254 = 0x82CD
+0x3255 = 0x8231
+0x3256 = 0x4ED3
+0x3257 = 0x6CA7
+0x3258 = 0x85CF
+0x3259 = 0x64CD
+0x325A = 0x7CD9
+0x325B = 0x69FD
+0x325C = 0x66F9
+0x325D = 0x8349
+0x325E = 0x5395
+0x325F = 0x7B56
+0x3260 = 0x4FA7
+0x3261 = 0x518C
+0x3262 = 0x6D4B
+0x3263 = 0x5C42
+0x3264 = 0x8E6D
+0x3265 = 0x63D2
+0x3266 = 0x53C9
+0x3267 = 0x832C
+0x3268 = 0x8336
+0x3269 = 0x67E5
+0x326A = 0x78B4
+0x326B = 0x643D
+0x326C = 0x5BDF
+0x326D = 0x5C94
+0x326E = 0x5DEE
+0x326F = 0x8BE7
+0x3270 = 0x62C6
+0x3271 = 0x67F4
+0x3272 = 0x8C7A
+0x3273 = 0x6400
+0x3274 = 0x63BA
+0x3275 = 0x8749
+0x3276 = 0x998B
+0x3277 = 0x8C17
+0x3278 = 0x7F20
+0x3279 = 0x94F2
+0x327A = 0x4EA7
+0x327B = 0x9610
+0x327C = 0x98A4
+0x327D = 0x660C
+0x327E = 0x7316
+0x3321 = 0x573A
+0x3322 = 0x5C1D
+0x3323 = 0x5E38
+0x3324 = 0x957F
+0x3325 = 0x507F
+0x3326 = 0x80A0
+0x3327 = 0x5382
+0x3328 = 0x655E
+0x3329 = 0x7545
+0x332A = 0x5531
+0x332B = 0x5021
+0x332C = 0x8D85
+0x332D = 0x6284
+0x332E = 0x949E
+0x332F = 0x671D
+0x3330 = 0x5632
+0x3331 = 0x6F6E
+0x3332 = 0x5DE2
+0x3333 = 0x5435
+0x3334 = 0x7092
+0x3335 = 0x8F66
+0x3336 = 0x626F
+0x3337 = 0x64A4
+0x3338 = 0x63A3
+0x3339 = 0x5F7B
+0x333A = 0x6F88
+0x333B = 0x90F4
+0x333C = 0x81E3
+0x333D = 0x8FB0
+0x333E = 0x5C18
+0x333F = 0x6668
+0x3340 = 0x5FF1
+0x3341 = 0x6C89
+0x3342 = 0x9648
+0x3343 = 0x8D81
+0x3344 = 0x886C
+0x3345 = 0x6491
+0x3346 = 0x79F0
+0x3347 = 0x57CE
+0x3348 = 0x6A59
+0x3349 = 0x6210
+0x334A = 0x5448
+0x334B = 0x4E58
+0x334C = 0x7A0B
+0x334D = 0x60E9
+0x334E = 0x6F84
+0x334F = 0x8BDA
+0x3350 = 0x627F
+0x3351 = 0x901E
+0x3352 = 0x9A8B
+0x3353 = 0x79E4
+0x3354 = 0x5403
+0x3355 = 0x75F4
+0x3356 = 0x6301
+0x3357 = 0x5319
+0x3358 = 0x6C60
+0x3359 = 0x8FDF
+0x335A = 0x5F1B
+0x335B = 0x9A70
+0x335C = 0x803B
+0x335D = 0x9F7F
+0x335E = 0x4F88
+0x335F = 0x5C3A
+0x3360 = 0x8D64
+0x3361 = 0x7FC5
+0x3362 = 0x65A5
+0x3363 = 0x70BD
+0x3364 = 0x5145
+0x3365 = 0x51B2
+0x3366 = 0x866B
+0x3367 = 0x5D07
+0x3368 = 0x5BA0
+0x3369 = 0x62BD
+0x336A = 0x916C
+0x336B = 0x7574
+0x336C = 0x8E0C
+0x336D = 0x7A20
+0x336E = 0x6101
+0x336F = 0x7B79
+0x3370 = 0x4EC7
+0x3371 = 0x7EF8
+0x3372 = 0x7785
+0x3373 = 0x4E11
+0x3374 = 0x81ED
+0x3375 = 0x521D
+0x3376 = 0x51FA
+0x3377 = 0x6A71
+0x3378 = 0x53A8
+0x3379 = 0x8E87
+0x337A = 0x9504
+0x337B = 0x96CF
+0x337C = 0x6EC1
+0x337D = 0x9664
+0x337E = 0x695A
+0x3421 = 0x7840
+0x3422 = 0x50A8
+0x3423 = 0x77D7
+0x3424 = 0x6410
+0x3425 = 0x89E6
+0x3426 = 0x5904
+0x3427 = 0x63E3
+0x3428 = 0x5DDD
+0x3429 = 0x7A7F
+0x342A = 0x693D
+0x342B = 0x4F20
+0x342C = 0x8239
+0x342D = 0x5598
+0x342E = 0x4E32
+0x342F = 0x75AE
+0x3430 = 0x7A97
+0x3431 = 0x5E62
+0x3432 = 0x5E8A
+0x3433 = 0x95EF
+0x3434 = 0x521B
+0x3435 = 0x5439
+0x3436 = 0x708A
+0x3437 = 0x6376
+0x3438 = 0x9524
+0x3439 = 0x5782
+0x343A = 0x6625
+0x343B = 0x693F
+0x343C = 0x9187
+0x343D = 0x5507
+0x343E = 0x6DF3
+0x343F = 0x7EAF
+0x3440 = 0x8822
+0x3441 = 0x6233
+0x3442 = 0x7EF0
+0x3443 = 0x75B5
+0x3444 = 0x8328
+0x3445 = 0x78C1
+0x3446 = 0x96CC
+0x3447 = 0x8F9E
+0x3448 = 0x6148
+0x3449 = 0x74F7
+0x344A = 0x8BCD
+0x344B = 0x6B64
+0x344C = 0x523A
+0x344D = 0x8D50
+0x344E = 0x6B21
+0x344F = 0x806A
+0x3450 = 0x8471
+0x3451 = 0x56F1
+0x3452 = 0x5306
+0x3453 = 0x4ECE
+0x3454 = 0x4E1B
+0x3455 = 0x51D1
+0x3456 = 0x7C97
+0x3457 = 0x918B
+0x3458 = 0x7C07
+0x3459 = 0x4FC3
+0x345A = 0x8E7F
+0x345B = 0x7BE1
+0x345C = 0x7A9C
+0x345D = 0x6467
+0x345E = 0x5D14
+0x345F = 0x50AC
+0x3460 = 0x8106
+0x3461 = 0x7601
+0x3462 = 0x7CB9
+0x3463 = 0x6DEC
+0x3464 = 0x7FE0
+0x3465 = 0x6751
+0x3466 = 0x5B58
+0x3467 = 0x5BF8
+0x3468 = 0x78CB
+0x3469 = 0x64AE
+0x346A = 0x6413
+0x346B = 0x63AA
+0x346C = 0x632B
+0x346D = 0x9519
+0x346E = 0x642D
+0x346F = 0x8FBE
+0x3470 = 0x7B54
+0x3471 = 0x7629
+0x3472 = 0x6253
+0x3473 = 0x5927
+0x3474 = 0x5446
+0x3475 = 0x6B79
+0x3476 = 0x50A3
+0x3477 = 0x6234
+0x3478 = 0x5E26
+0x3479 = 0x6B86
+0x347A = 0x4EE3
+0x347B = 0x8D37
+0x347C = 0x888B
+0x347D = 0x5F85
+0x347E = 0x902E
+0x3521 = 0x6020
+0x3522 = 0x803D
+0x3523 = 0x62C5
+0x3524 = 0x4E39
+0x3525 = 0x5355
+0x3526 = 0x90F8
+0x3527 = 0x63B8
+0x3528 = 0x80C6
+0x3529 = 0x65E6
+0x352A = 0x6C2E
+0x352B = 0x4F46
+0x352C = 0x60EE
+0x352D = 0x6DE1
+0x352E = 0x8BDE
+0x352F = 0x5F39
+0x3530 = 0x86CB
+0x3531 = 0x5F53
+0x3532 = 0x6321
+0x3533 = 0x515A
+0x3534 = 0x8361
+0x3535 = 0x6863
+0x3536 = 0x5200
+0x3537 = 0x6363
+0x3538 = 0x8E48
+0x3539 = 0x5012
+0x353A = 0x5C9B
+0x353B = 0x7977
+0x353C = 0x5BFC
+0x353D = 0x5230
+0x353E = 0x7A3B
+0x353F = 0x60BC
+0x3540 = 0x9053
+0x3541 = 0x76D7
+0x3542 = 0x5FB7
+0x3543 = 0x5F97
+0x3544 = 0x7684
+0x3545 = 0x8E6C
+0x3546 = 0x706F
+0x3547 = 0x767B
+0x3548 = 0x7B49
+0x3549 = 0x77AA
+0x354A = 0x51F3
+0x354B = 0x9093
+0x354C = 0x5824
+0x354D = 0x4F4E
+0x354E = 0x6EF4
+0x354F = 0x8FEA
+0x3550 = 0x654C
+0x3551 = 0x7B1B
+0x3552 = 0x72C4
+0x3553 = 0x6DA4
+0x3554 = 0x7FDF
+0x3555 = 0x5AE1
+0x3556 = 0x62B5
+0x3557 = 0x5E95
+0x3558 = 0x5730
+0x3559 = 0x8482
+0x355A = 0x7B2C
+0x355B = 0x5E1D
+0x355C = 0x5F1F
+0x355D = 0x9012
+0x355E = 0x7F14
+0x355F = 0x98A0
+0x3560 = 0x6382
+0x3561 = 0x6EC7
+0x3562 = 0x7898
+0x3563 = 0x70B9
+0x3564 = 0x5178
+0x3565 = 0x975B
+0x3566 = 0x57AB
+0x3567 = 0x7535
+0x3568 = 0x4F43
+0x3569 = 0x7538
+0x356A = 0x5E97
+0x356B = 0x60E6
+0x356C = 0x5960
+0x356D = 0x6DC0
+0x356E = 0x6BBF
+0x356F = 0x7889
+0x3570 = 0x53FC
+0x3571 = 0x96D5
+0x3572 = 0x51CB
+0x3573 = 0x5201
+0x3574 = 0x6389
+0x3575 = 0x540A
+0x3576 = 0x9493
+0x3577 = 0x8C03
+0x3578 = 0x8DCC
+0x3579 = 0x7239
+0x357A = 0x789F
+0x357B = 0x8776
+0x357C = 0x8FED
+0x357D = 0x8C0D
+0x357E = 0x53E0
+0x3621 = 0x4E01
+0x3622 = 0x76EF
+0x3623 = 0x53EE
+0x3624 = 0x9489
+0x3625 = 0x9876
+0x3626 = 0x9F0E
+0x3627 = 0x952D
+0x3628 = 0x5B9A
+0x3629 = 0x8BA2
+0x362A = 0x4E22
+0x362B = 0x4E1C
+0x362C = 0x51AC
+0x362D = 0x8463
+0x362E = 0x61C2
+0x362F = 0x52A8
+0x3630 = 0x680B
+0x3631 = 0x4F97
+0x3632 = 0x606B
+0x3633 = 0x51BB
+0x3634 = 0x6D1E
+0x3635 = 0x515C
+0x3636 = 0x6296
+0x3637 = 0x6597
+0x3638 = 0x9661
+0x3639 = 0x8C46
+0x363A = 0x9017
+0x363B = 0x75D8
+0x363C = 0x90FD
+0x363D = 0x7763
+0x363E = 0x6BD2
+0x363F = 0x728A
+0x3640 = 0x72EC
+0x3641 = 0x8BFB
+0x3642 = 0x5835
+0x3643 = 0x7779
+0x3644 = 0x8D4C
+0x3645 = 0x675C
+0x3646 = 0x9540
+0x3647 = 0x809A
+0x3648 = 0x5EA6
+0x3649 = 0x6E21
+0x364A = 0x5992
+0x364B = 0x7AEF
+0x364C = 0x77ED
+0x364D = 0x953B
+0x364E = 0x6BB5
+0x364F = 0x65AD
+0x3650 = 0x7F0E
+0x3651 = 0x5806
+0x3652 = 0x5151
+0x3653 = 0x961F
+0x3654 = 0x5BF9
+0x3655 = 0x58A9
+0x3656 = 0x5428
+0x3657 = 0x8E72
+0x3658 = 0x6566
+0x3659 = 0x987F
+0x365A = 0x56E4
+0x365B = 0x949D
+0x365C = 0x76FE
+0x365D = 0x9041
+0x365E = 0x6387
+0x365F = 0x54C6
+0x3660 = 0x591A
+0x3661 = 0x593A
+0x3662 = 0x579B
+0x3663 = 0x8EB2
+0x3664 = 0x6735
+0x3665 = 0x8DFA
+0x3666 = 0x8235
+0x3667 = 0x5241
+0x3668 = 0x60F0
+0x3669 = 0x5815
+0x366A = 0x86FE
+0x366B = 0x5CE8
+0x366C = 0x9E45
+0x366D = 0x4FC4
+0x366E = 0x989D
+0x366F = 0x8BB9
+0x3670 = 0x5A25
+0x3671 = 0x6076
+0x3672 = 0x5384
+0x3673 = 0x627C
+0x3674 = 0x904F
+0x3675 = 0x9102
+0x3676 = 0x997F
+0x3677 = 0x6069
+0x3678 = 0x800C
+0x3679 = 0x513F
+0x367A = 0x8033
+0x367B = 0x5C14
+0x367C = 0x9975
+0x367D = 0x6D31
+0x367E = 0x4E8C
+0x3721 = 0x8D30
+0x3722 = 0x53D1
+0x3723 = 0x7F5A
+0x3724 = 0x7B4F
+0x3725 = 0x4F10
+0x3726 = 0x4E4F
+0x3727 = 0x9600
+0x3728 = 0x6CD5
+0x3729 = 0x73D0
+0x372A = 0x85E9
+0x372B = 0x5E06
+0x372C = 0x756A
+0x372D = 0x7FFB
+0x372E = 0x6A0A
+0x372F = 0x77FE
+0x3730 = 0x9492
+0x3731 = 0x7E41
+0x3732 = 0x51E1
+0x3733 = 0x70E6
+0x3734 = 0x53CD
+0x3735 = 0x8FD4
+0x3736 = 0x8303
+0x3737 = 0x8D29
+0x3738 = 0x72AF
+0x3739 = 0x996D
+0x373A = 0x6CDB
+0x373B = 0x574A
+0x373C = 0x82B3
+0x373D = 0x65B9
+0x373E = 0x80AA
+0x373F = 0x623F
+0x3740 = 0x9632
+0x3741 = 0x59A8
+0x3742 = 0x4EFF
+0x3743 = 0x8BBF
+0x3744 = 0x7EBA
+0x3745 = 0x653E
+0x3746 = 0x83F2
+0x3747 = 0x975E
+0x3748 = 0x5561
+0x3749 = 0x98DE
+0x374A = 0x80A5
+0x374B = 0x532A
+0x374C = 0x8BFD
+0x374D = 0x5420
+0x374E = 0x80BA
+0x374F = 0x5E9F
+0x3750 = 0x6CB8
+0x3751 = 0x8D39
+0x3752 = 0x82AC
+0x3753 = 0x915A
+0x3754 = 0x5429
+0x3755 = 0x6C1B
+0x3756 = 0x5206
+0x3757 = 0x7EB7
+0x3758 = 0x575F
+0x3759 = 0x711A
+0x375A = 0x6C7E
+0x375B = 0x7C89
+0x375C = 0x594B
+0x375D = 0x4EFD
+0x375E = 0x5FFF
+0x375F = 0x6124
+0x3760 = 0x7CAA
+0x3761 = 0x4E30
+0x3762 = 0x5C01
+0x3763 = 0x67AB
+0x3764 = 0x8702
+0x3765 = 0x5CF0
+0x3766 = 0x950B
+0x3767 = 0x98CE
+0x3768 = 0x75AF
+0x3769 = 0x70FD
+0x376A = 0x9022
+0x376B = 0x51AF
+0x376C = 0x7F1D
+0x376D = 0x8BBD
+0x376E = 0x5949
+0x376F = 0x51E4
+0x3770 = 0x4F5B
+0x3771 = 0x5426
+0x3772 = 0x592B
+0x3773 = 0x6577
+0x3774 = 0x80A4
+0x3775 = 0x5B75
+0x3776 = 0x6276
+0x3777 = 0x62C2
+0x3778 = 0x8F90
+0x3779 = 0x5E45
+0x377A = 0x6C1F
+0x377B = 0x7B26
+0x377C = 0x4F0F
+0x377D = 0x4FD8
+0x377E = 0x670D
+0x3821 = 0x6D6E
+0x3822 = 0x6DAA
+0x3823 = 0x798F
+0x3824 = 0x88B1
+0x3825 = 0x5F17
+0x3826 = 0x752B
+0x3827 = 0x629A
+0x3828 = 0x8F85
+0x3829 = 0x4FEF
+0x382A = 0x91DC
+0x382B = 0x65A7
+0x382C = 0x812F
+0x382D = 0x8151
+0x382E = 0x5E9C
+0x382F = 0x8150
+0x3830 = 0x8D74
+0x3831 = 0x526F
+0x3832 = 0x8986
+0x3833 = 0x8D4B
+0x3834 = 0x590D
+0x3835 = 0x5085
+0x3836 = 0x4ED8
+0x3837 = 0x961C
+0x3838 = 0x7236
+0x3839 = 0x8179
+0x383A = 0x8D1F
+0x383B = 0x5BCC
+0x383C = 0x8BA3
+0x383D = 0x9644
+0x383E = 0x5987
+0x383F = 0x7F1A
+0x3840 = 0x5490
+0x3841 = 0x5676
+0x3842 = 0x560E
+0x3843 = 0x8BE5
+0x3844 = 0x6539
+0x3845 = 0x6982
+0x3846 = 0x9499
+0x3847 = 0x76D6
+0x3848 = 0x6E89
+0x3849 = 0x5E72
+0x384A = 0x7518
+0x384B = 0x6746
+0x384C = 0x67D1
+0x384D = 0x7AFF
+0x384E = 0x809D
+0x384F = 0x8D76
+0x3850 = 0x611F
+0x3851 = 0x79C6
+0x3852 = 0x6562
+0x3853 = 0x8D63
+0x3854 = 0x5188
+0x3855 = 0x521A
+0x3856 = 0x94A2
+0x3857 = 0x7F38
+0x3858 = 0x809B
+0x3859 = 0x7EB2
+0x385A = 0x5C97
+0x385B = 0x6E2F
+0x385C = 0x6760
+0x385D = 0x7BD9
+0x385E = 0x768B
+0x385F = 0x9AD8
+0x3860 = 0x818F
+0x3861 = 0x7F94
+0x3862 = 0x7CD5
+0x3863 = 0x641E
+0x3864 = 0x9550
+0x3865 = 0x7A3F
+0x3866 = 0x544A
+0x3867 = 0x54E5
+0x3868 = 0x6B4C
+0x3869 = 0x6401
+0x386A = 0x6208
+0x386B = 0x9E3D
+0x386C = 0x80F3
+0x386D = 0x7599
+0x386E = 0x5272
+0x386F = 0x9769
+0x3870 = 0x845B
+0x3871 = 0x683C
+0x3872 = 0x86E4
+0x3873 = 0x9601
+0x3874 = 0x9694
+0x3875 = 0x94EC
+0x3876 = 0x4E2A
+0x3877 = 0x5404
+0x3878 = 0x7ED9
+0x3879 = 0x6839
+0x387A = 0x8DDF
+0x387B = 0x8015
+0x387C = 0x66F4
+0x387D = 0x5E9A
+0x387E = 0x7FB9
+0x3921 = 0x57C2
+0x3922 = 0x803F
+0x3923 = 0x6897
+0x3924 = 0x5DE5
+0x3925 = 0x653B
+0x3926 = 0x529F
+0x3927 = 0x606D
+0x3928 = 0x9F9A
+0x3929 = 0x4F9B
+0x392A = 0x8EAC
+0x392B = 0x516C
+0x392C = 0x5BAB
+0x392D = 0x5F13
+0x392E = 0x5DE9
+0x392F = 0x6C5E
+0x3930 = 0x62F1
+0x3931 = 0x8D21
+0x3932 = 0x5171
+0x3933 = 0x94A9
+0x3934 = 0x52FE
+0x3935 = 0x6C9F
+0x3936 = 0x82DF
+0x3937 = 0x72D7
+0x3938 = 0x57A2
+0x3939 = 0x6784
+0x393A = 0x8D2D
+0x393B = 0x591F
+0x393C = 0x8F9C
+0x393D = 0x83C7
+0x393E = 0x5495
+0x393F = 0x7B8D
+0x3940 = 0x4F30
+0x3941 = 0x6CBD
+0x3942 = 0x5B64
+0x3943 = 0x59D1
+0x3944 = 0x9F13
+0x3945 = 0x53E4
+0x3946 = 0x86CA
+0x3947 = 0x9AA8
+0x3948 = 0x8C37
+0x3949 = 0x80A1
+0x394A = 0x6545
+0x394B = 0x987E
+0x394C = 0x56FA
+0x394D = 0x96C7
+0x394E = 0x522E
+0x394F = 0x74DC
+0x3950 = 0x5250
+0x3951 = 0x5BE1
+0x3952 = 0x6302
+0x3953 = 0x8902
+0x3954 = 0x4E56
+0x3955 = 0x62D0
+0x3956 = 0x602A
+0x3957 = 0x68FA
+0x3958 = 0x5173
+0x3959 = 0x5B98
+0x395A = 0x51A0
+0x395B = 0x89C2
+0x395C = 0x7BA1
+0x395D = 0x9986
+0x395E = 0x7F50
+0x395F = 0x60EF
+0x3960 = 0x704C
+0x3961 = 0x8D2F
+0x3962 = 0x5149
+0x3963 = 0x5E7F
+0x3964 = 0x901B
+0x3965 = 0x7470
+0x3966 = 0x89C4
+0x3967 = 0x572D
+0x3968 = 0x7845
+0x3969 = 0x5F52
+0x396A = 0x9F9F
+0x396B = 0x95FA
+0x396C = 0x8F68
+0x396D = 0x9B3C
+0x396E = 0x8BE1
+0x396F = 0x7678
+0x3970 = 0x6842
+0x3971 = 0x67DC
+0x3972 = 0x8DEA
+0x3973 = 0x8D35
+0x3974 = 0x523D
+0x3975 = 0x8F8A
+0x3976 = 0x6EDA
+0x3977 = 0x68CD
+0x3978 = 0x9505
+0x3979 = 0x90ED
+0x397A = 0x56FD
+0x397B = 0x679C
+0x397C = 0x88F9
+0x397D = 0x8FC7
+0x397E = 0x54C8
+0x3A21 = 0x9AB8
+0x3A22 = 0x5B69
+0x3A23 = 0x6D77
+0x3A24 = 0x6C26
+0x3A25 = 0x4EA5
+0x3A26 = 0x5BB3
+0x3A27 = 0x9A87
+0x3A28 = 0x9163
+0x3A29 = 0x61A8
+0x3A2A = 0x90AF
+0x3A2B = 0x97E9
+0x3A2C = 0x542B
+0x3A2D = 0x6DB5
+0x3A2E = 0x5BD2
+0x3A2F = 0x51FD
+0x3A30 = 0x558A
+0x3A31 = 0x7F55
+0x3A32 = 0x7FF0
+0x3A33 = 0x64BC
+0x3A34 = 0x634D
+0x3A35 = 0x65F1
+0x3A36 = 0x61BE
+0x3A37 = 0x608D
+0x3A38 = 0x710A
+0x3A39 = 0x6C57
+0x3A3A = 0x6C49
+0x3A3B = 0x592F
+0x3A3C = 0x676D
+0x3A3D = 0x822A
+0x3A3E = 0x58D5
+0x3A3F = 0x568E
+0x3A40 = 0x8C6A
+0x3A41 = 0x6BEB
+0x3A42 = 0x90DD
+0x3A43 = 0x597D
+0x3A44 = 0x8017
+0x3A45 = 0x53F7
+0x3A46 = 0x6D69
+0x3A47 = 0x5475
+0x3A48 = 0x559D
+0x3A49 = 0x8377
+0x3A4A = 0x83CF
+0x3A4B = 0x6838
+0x3A4C = 0x79BE
+0x3A4D = 0x548C
+0x3A4E = 0x4F55
+0x3A4F = 0x5408
+0x3A50 = 0x76D2
+0x3A51 = 0x8C89
+0x3A52 = 0x9602
+0x3A53 = 0x6CB3
+0x3A54 = 0x6DB8
+0x3A55 = 0x8D6B
+0x3A56 = 0x8910
+0x3A57 = 0x9E64
+0x3A58 = 0x8D3A
+0x3A59 = 0x563F
+0x3A5A = 0x9ED1
+0x3A5B = 0x75D5
+0x3A5C = 0x5F88
+0x3A5D = 0x72E0
+0x3A5E = 0x6068
+0x3A5F = 0x54FC
+0x3A60 = 0x4EA8
+0x3A61 = 0x6A2A
+0x3A62 = 0x8861
+0x3A63 = 0x6052
+0x3A64 = 0x8F70
+0x3A65 = 0x54C4
+0x3A66 = 0x70D8
+0x3A67 = 0x8679
+0x3A68 = 0x9E3F
+0x3A69 = 0x6D2A
+0x3A6A = 0x5B8F
+0x3A6B = 0x5F18
+0x3A6C = 0x7EA2
+0x3A6D = 0x5589
+0x3A6E = 0x4FAF
+0x3A6F = 0x7334
+0x3A70 = 0x543C
+0x3A71 = 0x539A
+0x3A72 = 0x5019
+0x3A73 = 0x540E
+0x3A74 = 0x547C
+0x3A75 = 0x4E4E
+0x3A76 = 0x5FFD
+0x3A77 = 0x745A
+0x3A78 = 0x58F6
+0x3A79 = 0x846B
+0x3A7A = 0x80E1
+0x3A7B = 0x8774
+0x3A7C = 0x72D0
+0x3A7D = 0x7CCA
+0x3A7E = 0x6E56
+0x3B21 = 0x5F27
+0x3B22 = 0x864E
+0x3B23 = 0x552C
+0x3B24 = 0x62A4
+0x3B25 = 0x4E92
+0x3B26 = 0x6CAA
+0x3B27 = 0x6237
+0x3B28 = 0x82B1
+0x3B29 = 0x54D7
+0x3B2A = 0x534E
+0x3B2B = 0x733E
+0x3B2C = 0x6ED1
+0x3B2D = 0x753B
+0x3B2E = 0x5212
+0x3B2F = 0x5316
+0x3B30 = 0x8BDD
+0x3B31 = 0x69D0
+0x3B32 = 0x5F8A
+0x3B33 = 0x6000
+0x3B34 = 0x6DEE
+0x3B35 = 0x574F
+0x3B36 = 0x6B22
+0x3B37 = 0x73AF
+0x3B38 = 0x6853
+0x3B39 = 0x8FD8
+0x3B3A = 0x7F13
+0x3B3B = 0x6362
+0x3B3C = 0x60A3
+0x3B3D = 0x5524
+0x3B3E = 0x75EA
+0x3B3F = 0x8C62
+0x3B40 = 0x7115
+0x3B41 = 0x6DA3
+0x3B42 = 0x5BA6
+0x3B43 = 0x5E7B
+0x3B44 = 0x8352
+0x3B45 = 0x614C
+0x3B46 = 0x9EC4
+0x3B47 = 0x78FA
+0x3B48 = 0x8757
+0x3B49 = 0x7C27
+0x3B4A = 0x7687
+0x3B4B = 0x51F0
+0x3B4C = 0x60F6
+0x3B4D = 0x714C
+0x3B4E = 0x6643
+0x3B4F = 0x5E4C
+0x3B50 = 0x604D
+0x3B51 = 0x8C0E
+0x3B52 = 0x7070
+0x3B53 = 0x6325
+0x3B54 = 0x8F89
+0x3B55 = 0x5FBD
+0x3B56 = 0x6062
+0x3B57 = 0x86D4
+0x3B58 = 0x56DE
+0x3B59 = 0x6BC1
+0x3B5A = 0x6094
+0x3B5B = 0x6167
+0x3B5C = 0x5349
+0x3B5D = 0x60E0
+0x3B5E = 0x6666
+0x3B5F = 0x8D3F
+0x3B60 = 0x79FD
+0x3B61 = 0x4F1A
+0x3B62 = 0x70E9
+0x3B63 = 0x6C47
+0x3B64 = 0x8BB3
+0x3B65 = 0x8BF2
+0x3B66 = 0x7ED8
+0x3B67 = 0x8364
+0x3B68 = 0x660F
+0x3B69 = 0x5A5A
+0x3B6A = 0x9B42
+0x3B6B = 0x6D51
+0x3B6C = 0x6DF7
+0x3B6D = 0x8C41
+0x3B6E = 0x6D3B
+0x3B6F = 0x4F19
+0x3B70 = 0x706B
+0x3B71 = 0x83B7
+0x3B72 = 0x6216
+0x3B73 = 0x60D1
+0x3B74 = 0x970D
+0x3B75 = 0x8D27
+0x3B76 = 0x7978
+0x3B77 = 0x51FB
+0x3B78 = 0x573E
+0x3B79 = 0x57FA
+0x3B7A = 0x673A
+0x3B7B = 0x7578
+0x3B7C = 0x7A3D
+0x3B7D = 0x79EF
+0x3B7E = 0x7B95
+0x3C21 = 0x808C
+0x3C22 = 0x9965
+0x3C23 = 0x8FF9
+0x3C24 = 0x6FC0
+0x3C25 = 0x8BA5
+0x3C26 = 0x9E21
+0x3C27 = 0x59EC
+0x3C28 = 0x7EE9
+0x3C29 = 0x7F09
+0x3C2A = 0x5409
+0x3C2B = 0x6781
+0x3C2C = 0x68D8
+0x3C2D = 0x8F91
+0x3C2E = 0x7C4D
+0x3C2F = 0x96C6
+0x3C30 = 0x53CA
+0x3C31 = 0x6025
+0x3C32 = 0x75BE
+0x3C33 = 0x6C72
+0x3C34 = 0x5373
+0x3C35 = 0x5AC9
+0x3C36 = 0x7EA7
+0x3C37 = 0x6324
+0x3C38 = 0x51E0
+0x3C39 = 0x810A
+0x3C3A = 0x5DF1
+0x3C3B = 0x84DF
+0x3C3C = 0x6280
+0x3C3D = 0x5180
+0x3C3E = 0x5B63
+0x3C3F = 0x4F0E
+0x3C40 = 0x796D
+0x3C41 = 0x5242
+0x3C42 = 0x60B8
+0x3C43 = 0x6D4E
+0x3C44 = 0x5BC4
+0x3C45 = 0x5BC2
+0x3C46 = 0x8BA1
+0x3C47 = 0x8BB0
+0x3C48 = 0x65E2
+0x3C49 = 0x5FCC
+0x3C4A = 0x9645
+0x3C4B = 0x5993
+0x3C4C = 0x7EE7
+0x3C4D = 0x7EAA
+0x3C4E = 0x5609
+0x3C4F = 0x67B7
+0x3C50 = 0x5939
+0x3C51 = 0x4F73
+0x3C52 = 0x5BB6
+0x3C53 = 0x52A0
+0x3C54 = 0x835A
+0x3C55 = 0x988A
+0x3C56 = 0x8D3E
+0x3C57 = 0x7532
+0x3C58 = 0x94BE
+0x3C59 = 0x5047
+0x3C5A = 0x7A3C
+0x3C5B = 0x4EF7
+0x3C5C = 0x67B6
+0x3C5D = 0x9A7E
+0x3C5E = 0x5AC1
+0x3C5F = 0x6B7C
+0x3C60 = 0x76D1
+0x3C61 = 0x575A
+0x3C62 = 0x5C16
+0x3C63 = 0x7B3A
+0x3C64 = 0x95F4
+0x3C65 = 0x714E
+0x3C66 = 0x517C
+0x3C67 = 0x80A9
+0x3C68 = 0x8270
+0x3C69 = 0x5978
+0x3C6A = 0x7F04
+0x3C6B = 0x8327
+0x3C6C = 0x68C0
+0x3C6D = 0x67EC
+0x3C6E = 0x78B1
+0x3C6F = 0x7877
+0x3C70 = 0x62E3
+0x3C71 = 0x6361
+0x3C72 = 0x7B80
+0x3C73 = 0x4FED
+0x3C74 = 0x526A
+0x3C75 = 0x51CF
+0x3C76 = 0x8350
+0x3C77 = 0x69DB
+0x3C78 = 0x9274
+0x3C79 = 0x8DF5
+0x3C7A = 0x8D31
+0x3C7B = 0x89C1
+0x3C7C = 0x952E
+0x3C7D = 0x7BAD
+0x3C7E = 0x4EF6
+0x3D21 = 0x5065
+0x3D22 = 0x8230
+0x3D23 = 0x5251
+0x3D24 = 0x996F
+0x3D25 = 0x6E10
+0x3D26 = 0x6E85
+0x3D27 = 0x6DA7
+0x3D28 = 0x5EFA
+0x3D29 = 0x50F5
+0x3D2A = 0x59DC
+0x3D2B = 0x5C06
+0x3D2C = 0x6D46
+0x3D2D = 0x6C5F
+0x3D2E = 0x7586
+0x3D2F = 0x848B
+0x3D30 = 0x6868
+0x3D31 = 0x5956
+0x3D32 = 0x8BB2
+0x3D33 = 0x5320
+0x3D34 = 0x9171
+0x3D35 = 0x964D
+0x3D36 = 0x8549
+0x3D37 = 0x6912
+0x3D38 = 0x7901
+0x3D39 = 0x7126
+0x3D3A = 0x80F6
+0x3D3B = 0x4EA4
+0x3D3C = 0x90CA
+0x3D3D = 0x6D47
+0x3D3E = 0x9A84
+0x3D3F = 0x5A07
+0x3D40 = 0x56BC
+0x3D41 = 0x6405
+0x3D42 = 0x94F0
+0x3D43 = 0x77EB
+0x3D44 = 0x4FA5
+0x3D45 = 0x811A
+0x3D46 = 0x72E1
+0x3D47 = 0x89D2
+0x3D48 = 0x997A
+0x3D49 = 0x7F34
+0x3D4A = 0x7EDE
+0x3D4B = 0x527F
+0x3D4C = 0x6559
+0x3D4D = 0x9175
+0x3D4E = 0x8F7F
+0x3D4F = 0x8F83
+0x3D50 = 0x53EB
+0x3D51 = 0x7A96
+0x3D52 = 0x63ED
+0x3D53 = 0x63A5
+0x3D54 = 0x7686
+0x3D55 = 0x79F8
+0x3D56 = 0x8857
+0x3D57 = 0x9636
+0x3D58 = 0x622A
+0x3D59 = 0x52AB
+0x3D5A = 0x8282
+0x3D5B = 0x6854
+0x3D5C = 0x6770
+0x3D5D = 0x6377
+0x3D5E = 0x776B
+0x3D5F = 0x7AED
+0x3D60 = 0x6D01
+0x3D61 = 0x7ED3
+0x3D62 = 0x89E3
+0x3D63 = 0x59D0
+0x3D64 = 0x6212
+0x3D65 = 0x85C9
+0x3D66 = 0x82A5
+0x3D67 = 0x754C
+0x3D68 = 0x501F
+0x3D69 = 0x4ECB
+0x3D6A = 0x75A5
+0x3D6B = 0x8BEB
+0x3D6C = 0x5C4A
+0x3D6D = 0x5DFE
+0x3D6E = 0x7B4B
+0x3D6F = 0x65A4
+0x3D70 = 0x91D1
+0x3D71 = 0x4ECA
+0x3D72 = 0x6D25
+0x3D73 = 0x895F
+0x3D74 = 0x7D27
+0x3D75 = 0x9526
+0x3D76 = 0x4EC5
+0x3D77 = 0x8C28
+0x3D78 = 0x8FDB
+0x3D79 = 0x9773
+0x3D7A = 0x664B
+0x3D7B = 0x7981
+0x3D7C = 0x8FD1
+0x3D7D = 0x70EC
+0x3D7E = 0x6D78
+0x3E21 = 0x5C3D
+0x3E22 = 0x52B2
+0x3E23 = 0x8346
+0x3E24 = 0x5162
+0x3E25 = 0x830E
+0x3E26 = 0x775B
+0x3E27 = 0x6676
+0x3E28 = 0x9CB8
+0x3E29 = 0x4EAC
+0x3E2A = 0x60CA
+0x3E2B = 0x7CBE
+0x3E2C = 0x7CB3
+0x3E2D = 0x7ECF
+0x3E2E = 0x4E95
+0x3E2F = 0x8B66
+0x3E30 = 0x666F
+0x3E31 = 0x9888
+0x3E32 = 0x9759
+0x3E33 = 0x5883
+0x3E34 = 0x656C
+0x3E35 = 0x955C
+0x3E36 = 0x5F84
+0x3E37 = 0x75C9
+0x3E38 = 0x9756
+0x3E39 = 0x7ADF
+0x3E3A = 0x7ADE
+0x3E3B = 0x51C0
+0x3E3C = 0x70AF
+0x3E3D = 0x7A98
+0x3E3E = 0x63EA
+0x3E3F = 0x7A76
+0x3E40 = 0x7EA0
+0x3E41 = 0x7396
+0x3E42 = 0x97ED
+0x3E43 = 0x4E45
+0x3E44 = 0x7078
+0x3E45 = 0x4E5D
+0x3E46 = 0x9152
+0x3E47 = 0x53A9
+0x3E48 = 0x6551
+0x3E49 = 0x65E7
+0x3E4A = 0x81FC
+0x3E4B = 0x8205
+0x3E4C = 0x548E
+0x3E4D = 0x5C31
+0x3E4E = 0x759A
+0x3E4F = 0x97A0
+0x3E50 = 0x62D8
+0x3E51 = 0x72D9
+0x3E52 = 0x75BD
+0x3E53 = 0x5C45
+0x3E54 = 0x9A79
+0x3E55 = 0x83CA
+0x3E56 = 0x5C40
+0x3E57 = 0x5480
+0x3E58 = 0x77E9
+0x3E59 = 0x4E3E
+0x3E5A = 0x6CAE
+0x3E5B = 0x805A
+0x3E5C = 0x62D2
+0x3E5D = 0x636E
+0x3E5E = 0x5DE8
+0x3E5F = 0x5177
+0x3E60 = 0x8DDD
+0x3E61 = 0x8E1E
+0x3E62 = 0x952F
+0x3E63 = 0x4FF1
+0x3E64 = 0x53E5
+0x3E65 = 0x60E7
+0x3E66 = 0x70AC
+0x3E67 = 0x5267
+0x3E68 = 0x6350
+0x3E69 = 0x9E43
+0x3E6A = 0x5A1F
+0x3E6B = 0x5026
+0x3E6C = 0x7737
+0x3E6D = 0x5377
+0x3E6E = 0x7EE2
+0x3E6F = 0x6485
+0x3E70 = 0x652B
+0x3E71 = 0x6289
+0x3E72 = 0x6398
+0x3E73 = 0x5014
+0x3E74 = 0x7235
+0x3E75 = 0x89C9
+0x3E76 = 0x51B3
+0x3E77 = 0x8BC0
+0x3E78 = 0x7EDD
+0x3E79 = 0x5747
+0x3E7A = 0x83CC
+0x3E7B = 0x94A7
+0x3E7C = 0x519B
+0x3E7D = 0x541B
+0x3E7E = 0x5CFB
+0x3F21 = 0x4FCA
+0x3F22 = 0x7AE3
+0x3F23 = 0x6D5A
+0x3F24 = 0x90E1
+0x3F25 = 0x9A8F
+0x3F26 = 0x5580
+0x3F27 = 0x5496
+0x3F28 = 0x5361
+0x3F29 = 0x54AF
+0x3F2A = 0x5F00
+0x3F2B = 0x63E9
+0x3F2C = 0x6977
+0x3F2D = 0x51EF
+0x3F2E = 0x6168
+0x3F2F = 0x520A
+0x3F30 = 0x582A
+0x3F31 = 0x52D8
+0x3F32 = 0x574E
+0x3F33 = 0x780D
+0x3F34 = 0x770B
+0x3F35 = 0x5EB7
+0x3F36 = 0x6177
+0x3F37 = 0x7CE0
+0x3F38 = 0x625B
+0x3F39 = 0x6297
+0x3F3A = 0x4EA2
+0x3F3B = 0x7095
+0x3F3C = 0x8003
+0x3F3D = 0x62F7
+0x3F3E = 0x70E4
+0x3F3F = 0x9760
+0x3F40 = 0x5777
+0x3F41 = 0x82DB
+0x3F42 = 0x67EF
+0x3F43 = 0x68F5
+0x3F44 = 0x78D5
+0x3F45 = 0x9897
+0x3F46 = 0x79D1
+0x3F47 = 0x58F3
+0x3F48 = 0x54B3
+0x3F49 = 0x53EF
+0x3F4A = 0x6E34
+0x3F4B = 0x514B
+0x3F4C = 0x523B
+0x3F4D = 0x5BA2
+0x3F4E = 0x8BFE
+0x3F4F = 0x80AF
+0x3F50 = 0x5543
+0x3F51 = 0x57A6
+0x3F52 = 0x6073
+0x3F53 = 0x5751
+0x3F54 = 0x542D
+0x3F55 = 0x7A7A
+0x3F56 = 0x6050
+0x3F57 = 0x5B54
+0x3F58 = 0x63A7
+0x3F59 = 0x62A0
+0x3F5A = 0x53E3
+0x3F5B = 0x6263
+0x3F5C = 0x5BC7
+0x3F5D = 0x67AF
+0x3F5E = 0x54ED
+0x3F5F = 0x7A9F
+0x3F60 = 0x82E6
+0x3F61 = 0x9177
+0x3F62 = 0x5E93
+0x3F63 = 0x88E4
+0x3F64 = 0x5938
+0x3F65 = 0x57AE
+0x3F66 = 0x630E
+0x3F67 = 0x8DE8
+0x3F68 = 0x80EF
+0x3F69 = 0x5757
+0x3F6A = 0x7B77
+0x3F6B = 0x4FA9
+0x3F6C = 0x5FEB
+0x3F6D = 0x5BBD
+0x3F6E = 0x6B3E
+0x3F6F = 0x5321
+0x3F70 = 0x7B50
+0x3F71 = 0x72C2
+0x3F72 = 0x6846
+0x3F73 = 0x77FF
+0x3F74 = 0x7736
+0x3F75 = 0x65F7
+0x3F76 = 0x51B5
+0x3F77 = 0x4E8F
+0x3F78 = 0x76D4
+0x3F79 = 0x5CBF
+0x3F7A = 0x7AA5
+0x3F7B = 0x8475
+0x3F7C = 0x594E
+0x3F7D = 0x9B41
+0x3F7E = 0x5080
+0x4021 = 0x9988
+0x4022 = 0x6127
+0x4023 = 0x6E83
+0x4024 = 0x5764
+0x4025 = 0x6606
+0x4026 = 0x6346
+0x4027 = 0x56F0
+0x4028 = 0x62EC
+0x4029 = 0x6269
+0x402A = 0x5ED3
+0x402B = 0x9614
+0x402C = 0x5783
+0x402D = 0x62C9
+0x402E = 0x5587
+0x402F = 0x8721
+0x4030 = 0x814A
+0x4031 = 0x8FA3
+0x4032 = 0x5566
+0x4033 = 0x83B1
+0x4034 = 0x6765
+0x4035 = 0x8D56
+0x4036 = 0x84DD
+0x4037 = 0x5A6A
+0x4038 = 0x680F
+0x4039 = 0x62E6
+0x403A = 0x7BEE
+0x403B = 0x9611
+0x403C = 0x5170
+0x403D = 0x6F9C
+0x403E = 0x8C30
+0x403F = 0x63FD
+0x4040 = 0x89C8
+0x4041 = 0x61D2
+0x4042 = 0x7F06
+0x4043 = 0x70C2
+0x4044 = 0x6EE5
+0x4045 = 0x7405
+0x4046 = 0x6994
+0x4047 = 0x72FC
+0x4048 = 0x5ECA
+0x4049 = 0x90CE
+0x404A = 0x6717
+0x404B = 0x6D6A
+0x404C = 0x635E
+0x404D = 0x52B3
+0x404E = 0x7262
+0x404F = 0x8001
+0x4050 = 0x4F6C
+0x4051 = 0x59E5
+0x4052 = 0x916A
+0x4053 = 0x70D9
+0x4054 = 0x6D9D
+0x4055 = 0x52D2
+0x4056 = 0x4E50
+0x4057 = 0x96F7
+0x4058 = 0x956D
+0x4059 = 0x857E
+0x405A = 0x78CA
+0x405B = 0x7D2F
+0x405C = 0x5121
+0x405D = 0x5792
+0x405E = 0x64C2
+0x405F = 0x808B
+0x4060 = 0x7C7B
+0x4061 = 0x6CEA
+0x4062 = 0x68F1
+0x4063 = 0x695E
+0x4064 = 0x51B7
+0x4065 = 0x5398
+0x4066 = 0x68A8
+0x4067 = 0x7281
+0x4068 = 0x9ECE
+0x4069 = 0x7BF1
+0x406A = 0x72F8
+0x406B = 0x79BB
+0x406C = 0x6F13
+0x406D = 0x7406
+0x406E = 0x674E
+0x406F = 0x91CC
+0x4070 = 0x9CA4
+0x4071 = 0x793C
+0x4072 = 0x8389
+0x4073 = 0x8354
+0x4074 = 0x540F
+0x4075 = 0x6817
+0x4076 = 0x4E3D
+0x4077 = 0x5389
+0x4078 = 0x52B1
+0x4079 = 0x783E
+0x407A = 0x5386
+0x407B = 0x5229
+0x407C = 0x5088
+0x407D = 0x4F8B
+0x407E = 0x4FD0
+0x4121 = 0x75E2
+0x4122 = 0x7ACB
+0x4123 = 0x7C92
+0x4124 = 0x6CA5
+0x4125 = 0x96B6
+0x4126 = 0x529B
+0x4127 = 0x7483
+0x4128 = 0x54E9
+0x4129 = 0x4FE9
+0x412A = 0x8054
+0x412B = 0x83B2
+0x412C = 0x8FDE
+0x412D = 0x9570
+0x412E = 0x5EC9
+0x412F = 0x601C
+0x4130 = 0x6D9F
+0x4131 = 0x5E18
+0x4132 = 0x655B
+0x4133 = 0x8138
+0x4134 = 0x94FE
+0x4135 = 0x604B
+0x4136 = 0x70BC
+0x4137 = 0x7EC3
+0x4138 = 0x7CAE
+0x4139 = 0x51C9
+0x413A = 0x6881
+0x413B = 0x7CB1
+0x413C = 0x826F
+0x413D = 0x4E24
+0x413E = 0x8F86
+0x413F = 0x91CF
+0x4140 = 0x667E
+0x4141 = 0x4EAE
+0x4142 = 0x8C05
+0x4143 = 0x64A9
+0x4144 = 0x804A
+0x4145 = 0x50DA
+0x4146 = 0x7597
+0x4147 = 0x71CE
+0x4148 = 0x5BE5
+0x4149 = 0x8FBD
+0x414A = 0x6F66
+0x414B = 0x4E86
+0x414C = 0x6482
+0x414D = 0x9563
+0x414E = 0x5ED6
+0x414F = 0x6599
+0x4150 = 0x5217
+0x4151 = 0x88C2
+0x4152 = 0x70C8
+0x4153 = 0x52A3
+0x4154 = 0x730E
+0x4155 = 0x7433
+0x4156 = 0x6797
+0x4157 = 0x78F7
+0x4158 = 0x9716
+0x4159 = 0x4E34
+0x415A = 0x90BB
+0x415B = 0x9CDE
+0x415C = 0x6DCB
+0x415D = 0x51DB
+0x415E = 0x8D41
+0x415F = 0x541D
+0x4160 = 0x62CE
+0x4161 = 0x73B2
+0x4162 = 0x83F1
+0x4163 = 0x96F6
+0x4164 = 0x9F84
+0x4165 = 0x94C3
+0x4166 = 0x4F36
+0x4167 = 0x7F9A
+0x4168 = 0x51CC
+0x4169 = 0x7075
+0x416A = 0x9675
+0x416B = 0x5CAD
+0x416C = 0x9886
+0x416D = 0x53E6
+0x416E = 0x4EE4
+0x416F = 0x6E9C
+0x4170 = 0x7409
+0x4171 = 0x69B4
+0x4172 = 0x786B
+0x4173 = 0x998F
+0x4174 = 0x7559
+0x4175 = 0x5218
+0x4176 = 0x7624
+0x4177 = 0x6D41
+0x4178 = 0x67F3
+0x4179 = 0x516D
+0x417A = 0x9F99
+0x417B = 0x804B
+0x417C = 0x5499
+0x417D = 0x7B3C
+0x417E = 0x7ABF
+0x4221 = 0x9686
+0x4222 = 0x5784
+0x4223 = 0x62E2
+0x4224 = 0x9647
+0x4225 = 0x697C
+0x4226 = 0x5A04
+0x4227 = 0x6402
+0x4228 = 0x7BD3
+0x4229 = 0x6F0F
+0x422A = 0x964B
+0x422B = 0x82A6
+0x422C = 0x5362
+0x422D = 0x9885
+0x422E = 0x5E90
+0x422F = 0x7089
+0x4230 = 0x63B3
+0x4231 = 0x5364
+0x4232 = 0x864F
+0x4233 = 0x9C81
+0x4234 = 0x9E93
+0x4235 = 0x788C
+0x4236 = 0x9732
+0x4237 = 0x8DEF
+0x4238 = 0x8D42
+0x4239 = 0x9E7F
+0x423A = 0x6F5E
+0x423B = 0x7984
+0x423C = 0x5F55
+0x423D = 0x9646
+0x423E = 0x622E
+0x423F = 0x9A74
+0x4240 = 0x5415
+0x4241 = 0x94DD
+0x4242 = 0x4FA3
+0x4243 = 0x65C5
+0x4244 = 0x5C65
+0x4245 = 0x5C61
+0x4246 = 0x7F15
+0x4247 = 0x8651
+0x4248 = 0x6C2F
+0x4249 = 0x5F8B
+0x424A = 0x7387
+0x424B = 0x6EE4
+0x424C = 0x7EFF
+0x424D = 0x5CE6
+0x424E = 0x631B
+0x424F = 0x5B6A
+0x4250 = 0x6EE6
+0x4251 = 0x5375
+0x4252 = 0x4E71
+0x4253 = 0x63A0
+0x4254 = 0x7565
+0x4255 = 0x62A1
+0x4256 = 0x8F6E
+0x4257 = 0x4F26
+0x4258 = 0x4ED1
+0x4259 = 0x6CA6
+0x425A = 0x7EB6
+0x425B = 0x8BBA
+0x425C = 0x841D
+0x425D = 0x87BA
+0x425E = 0x7F57
+0x425F = 0x903B
+0x4260 = 0x9523
+0x4261 = 0x7BA9
+0x4262 = 0x9AA1
+0x4263 = 0x88F8
+0x4264 = 0x843D
+0x4265 = 0x6D1B
+0x4266 = 0x9A86
+0x4267 = 0x7EDC
+0x4268 = 0x5988
+0x4269 = 0x9EBB
+0x426A = 0x739B
+0x426B = 0x7801
+0x426C = 0x8682
+0x426D = 0x9A6C
+0x426E = 0x9A82
+0x426F = 0x561B
+0x4270 = 0x5417
+0x4271 = 0x57CB
+0x4272 = 0x4E70
+0x4273 = 0x9EA6
+0x4274 = 0x5356
+0x4275 = 0x8FC8
+0x4276 = 0x8109
+0x4277 = 0x7792
+0x4278 = 0x9992
+0x4279 = 0x86EE
+0x427A = 0x6EE1
+0x427B = 0x8513
+0x427C = 0x66FC
+0x427D = 0x6162
+0x427E = 0x6F2B
+0x4321 = 0x8C29
+0x4322 = 0x8292
+0x4323 = 0x832B
+0x4324 = 0x76F2
+0x4325 = 0x6C13
+0x4326 = 0x5FD9
+0x4327 = 0x83BD
+0x4328 = 0x732B
+0x4329 = 0x8305
+0x432A = 0x951A
+0x432B = 0x6BDB
+0x432C = 0x77DB
+0x432D = 0x94C6
+0x432E = 0x536F
+0x432F = 0x8302
+0x4330 = 0x5192
+0x4331 = 0x5E3D
+0x4332 = 0x8C8C
+0x4333 = 0x8D38
+0x4334 = 0x4E48
+0x4335 = 0x73AB
+0x4336 = 0x679A
+0x4337 = 0x6885
+0x4338 = 0x9176
+0x4339 = 0x9709
+0x433A = 0x7164
+0x433B = 0x6CA1
+0x433C = 0x7709
+0x433D = 0x5A92
+0x433E = 0x9541
+0x433F = 0x6BCF
+0x4340 = 0x7F8E
+0x4341 = 0x6627
+0x4342 = 0x5BD0
+0x4343 = 0x59B9
+0x4344 = 0x5A9A
+0x4345 = 0x95E8
+0x4346 = 0x95F7
+0x4347 = 0x4EEC
+0x4348 = 0x840C
+0x4349 = 0x8499
+0x434A = 0x6AAC
+0x434B = 0x76DF
+0x434C = 0x9530
+0x434D = 0x731B
+0x434E = 0x68A6
+0x434F = 0x5B5F
+0x4350 = 0x772F
+0x4351 = 0x919A
+0x4352 = 0x9761
+0x4353 = 0x7CDC
+0x4354 = 0x8FF7
+0x4355 = 0x8C1C
+0x4356 = 0x5F25
+0x4357 = 0x7C73
+0x4358 = 0x79D8
+0x4359 = 0x89C5
+0x435A = 0x6CCC
+0x435B = 0x871C
+0x435C = 0x5BC6
+0x435D = 0x5E42
+0x435E = 0x68C9
+0x435F = 0x7720
+0x4360 = 0x7EF5
+0x4361 = 0x5195
+0x4362 = 0x514D
+0x4363 = 0x52C9
+0x4364 = 0x5A29
+0x4365 = 0x7F05
+0x4366 = 0x9762
+0x4367 = 0x82D7
+0x4368 = 0x63CF
+0x4369 = 0x7784
+0x436A = 0x85D0
+0x436B = 0x79D2
+0x436C = 0x6E3A
+0x436D = 0x5E99
+0x436E = 0x5999
+0x436F = 0x8511
+0x4370 = 0x706D
+0x4371 = 0x6C11
+0x4372 = 0x62BF
+0x4373 = 0x76BF
+0x4374 = 0x654F
+0x4375 = 0x60AF
+0x4376 = 0x95FD
+0x4377 = 0x660E
+0x4378 = 0x879F
+0x4379 = 0x9E23
+0x437A = 0x94ED
+0x437B = 0x540D
+0x437C = 0x547D
+0x437D = 0x8C2C
+0x437E = 0x6478
+0x4421 = 0x6479
+0x4422 = 0x8611
+0x4423 = 0x6A21
+0x4424 = 0x819C
+0x4425 = 0x78E8
+0x4426 = 0x6469
+0x4427 = 0x9B54
+0x4428 = 0x62B9
+0x4429 = 0x672B
+0x442A = 0x83AB
+0x442B = 0x58A8
+0x442C = 0x9ED8
+0x442D = 0x6CAB
+0x442E = 0x6F20
+0x442F = 0x5BDE
+0x4430 = 0x964C
+0x4431 = 0x8C0B
+0x4432 = 0x725F
+0x4433 = 0x67D0
+0x4434 = 0x62C7
+0x4435 = 0x7261
+0x4436 = 0x4EA9
+0x4437 = 0x59C6
+0x4438 = 0x6BCD
+0x4439 = 0x5893
+0x443A = 0x66AE
+0x443B = 0x5E55
+0x443C = 0x52DF
+0x443D = 0x6155
+0x443E = 0x6728
+0x443F = 0x76EE
+0x4440 = 0x7766
+0x4441 = 0x7267
+0x4442 = 0x7A46
+0x4443 = 0x62FF
+0x4444 = 0x54EA
+0x4445 = 0x5450
+0x4446 = 0x94A0
+0x4447 = 0x90A3
+0x4448 = 0x5A1C
+0x4449 = 0x7EB3
+0x444A = 0x6C16
+0x444B = 0x4E43
+0x444C = 0x5976
+0x444D = 0x8010
+0x444E = 0x5948
+0x444F = 0x5357
+0x4450 = 0x7537
+0x4451 = 0x96BE
+0x4452 = 0x56CA
+0x4453 = 0x6320
+0x4454 = 0x8111
+0x4455 = 0x607C
+0x4456 = 0x95F9
+0x4457 = 0x6DD6
+0x4458 = 0x5462
+0x4459 = 0x9981
+0x445A = 0x5185
+0x445B = 0x5AE9
+0x445C = 0x80FD
+0x445D = 0x59AE
+0x445E = 0x9713
+0x445F = 0x502A
+0x4460 = 0x6CE5
+0x4461 = 0x5C3C
+0x4462 = 0x62DF
+0x4463 = 0x4F60
+0x4464 = 0x533F
+0x4465 = 0x817B
+0x4466 = 0x9006
+0x4467 = 0x6EBA
+0x4468 = 0x852B
+0x4469 = 0x62C8
+0x446A = 0x5E74
+0x446B = 0x78BE
+0x446C = 0x64B5
+0x446D = 0x637B
+0x446E = 0x5FF5
+0x446F = 0x5A18
+0x4470 = 0x917F
+0x4471 = 0x9E1F
+0x4472 = 0x5C3F
+0x4473 = 0x634F
+0x4474 = 0x8042
+0x4475 = 0x5B7D
+0x4476 = 0x556E
+0x4477 = 0x954A
+0x4478 = 0x954D
+0x4479 = 0x6D85
+0x447A = 0x60A8
+0x447B = 0x67E0
+0x447C = 0x72DE
+0x447D = 0x51DD
+0x447E = 0x5B81
+0x4521 = 0x62E7
+0x4522 = 0x6CDE
+0x4523 = 0x725B
+0x4524 = 0x626D
+0x4525 = 0x94AE
+0x4526 = 0x7EBD
+0x4527 = 0x8113
+0x4528 = 0x6D53
+0x4529 = 0x519C
+0x452A = 0x5F04
+0x452B = 0x5974
+0x452C = 0x52AA
+0x452D = 0x6012
+0x452E = 0x5973
+0x452F = 0x6696
+0x4530 = 0x8650
+0x4531 = 0x759F
+0x4532 = 0x632A
+0x4533 = 0x61E6
+0x4534 = 0x7CEF
+0x4535 = 0x8BFA
+0x4536 = 0x54E6
+0x4537 = 0x6B27
+0x4538 = 0x9E25
+0x4539 = 0x6BB4
+0x453A = 0x85D5
+0x453B = 0x5455
+0x453C = 0x5076
+0x453D = 0x6CA4
+0x453E = 0x556A
+0x453F = 0x8DB4
+0x4540 = 0x722C
+0x4541 = 0x5E15
+0x4542 = 0x6015
+0x4543 = 0x7436
+0x4544 = 0x62CD
+0x4545 = 0x6392
+0x4546 = 0x724C
+0x4547 = 0x5F98
+0x4548 = 0x6E43
+0x4549 = 0x6D3E
+0x454A = 0x6500
+0x454B = 0x6F58
+0x454C = 0x76D8
+0x454D = 0x78D0
+0x454E = 0x76FC
+0x454F = 0x7554
+0x4550 = 0x5224
+0x4551 = 0x53DB
+0x4552 = 0x4E53
+0x4553 = 0x5E9E
+0x4554 = 0x65C1
+0x4555 = 0x802A
+0x4556 = 0x80D6
+0x4557 = 0x629B
+0x4558 = 0x5486
+0x4559 = 0x5228
+0x455A = 0x70AE
+0x455B = 0x888D
+0x455C = 0x8DD1
+0x455D = 0x6CE1
+0x455E = 0x5478
+0x455F = 0x80DA
+0x4560 = 0x57F9
+0x4561 = 0x88F4
+0x4562 = 0x8D54
+0x4563 = 0x966A
+0x4564 = 0x914D
+0x4565 = 0x4F69
+0x4566 = 0x6C9B
+0x4567 = 0x55B7
+0x4568 = 0x76C6
+0x4569 = 0x7830
+0x456A = 0x62A8
+0x456B = 0x70F9
+0x456C = 0x6F8E
+0x456D = 0x5F6D
+0x456E = 0x84EC
+0x456F = 0x68DA
+0x4570 = 0x787C
+0x4571 = 0x7BF7
+0x4572 = 0x81A8
+0x4573 = 0x670B
+0x4574 = 0x9E4F
+0x4575 = 0x6367
+0x4576 = 0x78B0
+0x4577 = 0x576F
+0x4578 = 0x7812
+0x4579 = 0x9739
+0x457A = 0x6279
+0x457B = 0x62AB
+0x457C = 0x5288
+0x457D = 0x7435
+0x457E = 0x6BD7
+0x4621 = 0x5564
+0x4622 = 0x813E
+0x4623 = 0x75B2
+0x4624 = 0x76AE
+0x4625 = 0x5339
+0x4626 = 0x75DE
+0x4627 = 0x50FB
+0x4628 = 0x5C41
+0x4629 = 0x8B6C
+0x462A = 0x7BC7
+0x462B = 0x504F
+0x462C = 0x7247
+0x462D = 0x9A97
+0x462E = 0x98D8
+0x462F = 0x6F02
+0x4630 = 0x74E2
+0x4631 = 0x7968
+0x4632 = 0x6487
+0x4633 = 0x77A5
+0x4634 = 0x62FC
+0x4635 = 0x9891
+0x4636 = 0x8D2B
+0x4637 = 0x54C1
+0x4638 = 0x8058
+0x4639 = 0x4E52
+0x463A = 0x576A
+0x463B = 0x82F9
+0x463C = 0x840D
+0x463D = 0x5E73
+0x463E = 0x51ED
+0x463F = 0x74F6
+0x4640 = 0x8BC4
+0x4641 = 0x5C4F
+0x4642 = 0x5761
+0x4643 = 0x6CFC
+0x4644 = 0x9887
+0x4645 = 0x5A46
+0x4646 = 0x7834
+0x4647 = 0x9B44
+0x4648 = 0x8FEB
+0x4649 = 0x7C95
+0x464A = 0x5256
+0x464B = 0x6251
+0x464C = 0x94FA
+0x464D = 0x4EC6
+0x464E = 0x8386
+0x464F = 0x8461
+0x4650 = 0x83E9
+0x4651 = 0x84B2
+0x4652 = 0x57D4
+0x4653 = 0x6734
+0x4654 = 0x5703
+0x4655 = 0x666E
+0x4656 = 0x6D66
+0x4657 = 0x8C31
+0x4658 = 0x66DD
+0x4659 = 0x7011
+0x465A = 0x671F
+0x465B = 0x6B3A
+0x465C = 0x6816
+0x465D = 0x621A
+0x465E = 0x59BB
+0x465F = 0x4E03
+0x4660 = 0x51C4
+0x4661 = 0x6F06
+0x4662 = 0x67D2
+0x4663 = 0x6C8F
+0x4664 = 0x5176
+0x4665 = 0x68CB
+0x4666 = 0x5947
+0x4667 = 0x6B67
+0x4668 = 0x7566
+0x4669 = 0x5D0E
+0x466A = 0x8110
+0x466B = 0x9F50
+0x466C = 0x65D7
+0x466D = 0x7948
+0x466E = 0x7941
+0x466F = 0x9A91
+0x4670 = 0x8D77
+0x4671 = 0x5C82
+0x4672 = 0x4E5E
+0x4673 = 0x4F01
+0x4674 = 0x542F
+0x4675 = 0x5951
+0x4676 = 0x780C
+0x4677 = 0x5668
+0x4678 = 0x6C14
+0x4679 = 0x8FC4
+0x467A = 0x5F03
+0x467B = 0x6C7D
+0x467C = 0x6CE3
+0x467D = 0x8BAB
+0x467E = 0x6390
+0x4721 = 0x6070
+0x4722 = 0x6D3D
+0x4723 = 0x7275
+0x4724 = 0x6266
+0x4725 = 0x948E
+0x4726 = 0x94C5
+0x4727 = 0x5343
+0x4728 = 0x8FC1
+0x4729 = 0x7B7E
+0x472A = 0x4EDF
+0x472B = 0x8C26
+0x472C = 0x4E7E
+0x472D = 0x9ED4
+0x472E = 0x94B1
+0x472F = 0x94B3
+0x4730 = 0x524D
+0x4731 = 0x6F5C
+0x4732 = 0x9063
+0x4733 = 0x6D45
+0x4734 = 0x8C34
+0x4735 = 0x5811
+0x4736 = 0x5D4C
+0x4737 = 0x6B20
+0x4738 = 0x6B49
+0x4739 = 0x67AA
+0x473A = 0x545B
+0x473B = 0x8154
+0x473C = 0x7F8C
+0x473D = 0x5899
+0x473E = 0x8537
+0x473F = 0x5F3A
+0x4740 = 0x62A2
+0x4741 = 0x6A47
+0x4742 = 0x9539
+0x4743 = 0x6572
+0x4744 = 0x6084
+0x4745 = 0x6865
+0x4746 = 0x77A7
+0x4747 = 0x4E54
+0x4748 = 0x4FA8
+0x4749 = 0x5DE7
+0x474A = 0x9798
+0x474B = 0x64AC
+0x474C = 0x7FD8
+0x474D = 0x5CED
+0x474E = 0x4FCF
+0x474F = 0x7A8D
+0x4750 = 0x5207
+0x4751 = 0x8304
+0x4752 = 0x4E14
+0x4753 = 0x602F
+0x4754 = 0x7A83
+0x4755 = 0x94A6
+0x4756 = 0x4FB5
+0x4757 = 0x4EB2
+0x4758 = 0x79E6
+0x4759 = 0x7434
+0x475A = 0x52E4
+0x475B = 0x82B9
+0x475C = 0x64D2
+0x475D = 0x79BD
+0x475E = 0x5BDD
+0x475F = 0x6C81
+0x4760 = 0x9752
+0x4761 = 0x8F7B
+0x4762 = 0x6C22
+0x4763 = 0x503E
+0x4764 = 0x537F
+0x4765 = 0x6E05
+0x4766 = 0x64CE
+0x4767 = 0x6674
+0x4768 = 0x6C30
+0x4769 = 0x60C5
+0x476A = 0x9877
+0x476B = 0x8BF7
+0x476C = 0x5E86
+0x476D = 0x743C
+0x476E = 0x7A77
+0x476F = 0x79CB
+0x4770 = 0x4E18
+0x4771 = 0x90B1
+0x4772 = 0x7403
+0x4773 = 0x6C42
+0x4774 = 0x56DA
+0x4775 = 0x914B
+0x4776 = 0x6CC5
+0x4777 = 0x8D8B
+0x4778 = 0x533A
+0x4779 = 0x86C6
+0x477A = 0x66F2
+0x477B = 0x8EAF
+0x477C = 0x5C48
+0x477D = 0x9A71
+0x477E = 0x6E20
+0x4821 = 0x53D6
+0x4822 = 0x5A36
+0x4823 = 0x9F8B
+0x4824 = 0x8DA3
+0x4825 = 0x53BB
+0x4826 = 0x5708
+0x4827 = 0x98A7
+0x4828 = 0x6743
+0x4829 = 0x919B
+0x482A = 0x6CC9
+0x482B = 0x5168
+0x482C = 0x75CA
+0x482D = 0x62F3
+0x482E = 0x72AC
+0x482F = 0x5238
+0x4830 = 0x529D
+0x4831 = 0x7F3A
+0x4832 = 0x7094
+0x4833 = 0x7638
+0x4834 = 0x5374
+0x4835 = 0x9E4A
+0x4836 = 0x69B7
+0x4837 = 0x786E
+0x4838 = 0x96C0
+0x4839 = 0x88D9
+0x483A = 0x7FA4
+0x483B = 0x7136
+0x483C = 0x71C3
+0x483D = 0x5189
+0x483E = 0x67D3
+0x483F = 0x74E4
+0x4840 = 0x58E4
+0x4841 = 0x6518
+0x4842 = 0x56B7
+0x4843 = 0x8BA9
+0x4844 = 0x9976
+0x4845 = 0x6270
+0x4846 = 0x7ED5
+0x4847 = 0x60F9
+0x4848 = 0x70ED
+0x4849 = 0x58EC
+0x484A = 0x4EC1
+0x484B = 0x4EBA
+0x484C = 0x5FCD
+0x484D = 0x97E7
+0x484E = 0x4EFB
+0x484F = 0x8BA4
+0x4850 = 0x5203
+0x4851 = 0x598A
+0x4852 = 0x7EAB
+0x4853 = 0x6254
+0x4854 = 0x4ECD
+0x4855 = 0x65E5
+0x4856 = 0x620E
+0x4857 = 0x8338
+0x4858 = 0x84C9
+0x4859 = 0x8363
+0x485A = 0x878D
+0x485B = 0x7194
+0x485C = 0x6EB6
+0x485D = 0x5BB9
+0x485E = 0x7ED2
+0x485F = 0x5197
+0x4860 = 0x63C9
+0x4861 = 0x67D4
+0x4862 = 0x8089
+0x4863 = 0x8339
+0x4864 = 0x8815
+0x4865 = 0x5112
+0x4866 = 0x5B7A
+0x4867 = 0x5982
+0x4868 = 0x8FB1
+0x4869 = 0x4E73
+0x486A = 0x6C5D
+0x486B = 0x5165
+0x486C = 0x8925
+0x486D = 0x8F6F
+0x486E = 0x962E
+0x486F = 0x854A
+0x4870 = 0x745E
+0x4871 = 0x9510
+0x4872 = 0x95F0
+0x4873 = 0x6DA6
+0x4874 = 0x82E5
+0x4875 = 0x5F31
+0x4876 = 0x6492
+0x4877 = 0x6D12
+0x4878 = 0x8428
+0x4879 = 0x816E
+0x487A = 0x9CC3
+0x487B = 0x585E
+0x487C = 0x8D5B
+0x487D = 0x4E09
+0x487E = 0x53C1
+0x4921 = 0x4F1E
+0x4922 = 0x6563
+0x4923 = 0x6851
+0x4924 = 0x55D3
+0x4925 = 0x4E27
+0x4926 = 0x6414
+0x4927 = 0x9A9A
+0x4928 = 0x626B
+0x4929 = 0x5AC2
+0x492A = 0x745F
+0x492B = 0x8272
+0x492C = 0x6DA9
+0x492D = 0x68EE
+0x492E = 0x50E7
+0x492F = 0x838E
+0x4930 = 0x7802
+0x4931 = 0x6740
+0x4932 = 0x5239
+0x4933 = 0x6C99
+0x4934 = 0x7EB1
+0x4935 = 0x50BB
+0x4936 = 0x5565
+0x4937 = 0x715E
+0x4938 = 0x7B5B
+0x4939 = 0x6652
+0x493A = 0x73CA
+0x493B = 0x82EB
+0x493C = 0x6749
+0x493D = 0x5C71
+0x493E = 0x5220
+0x493F = 0x717D
+0x4940 = 0x886B
+0x4941 = 0x95EA
+0x4942 = 0x9655
+0x4943 = 0x64C5
+0x4944 = 0x8D61
+0x4945 = 0x81B3
+0x4946 = 0x5584
+0x4947 = 0x6C55
+0x4948 = 0x6247
+0x4949 = 0x7F2E
+0x494A = 0x5892
+0x494B = 0x4F24
+0x494C = 0x5546
+0x494D = 0x8D4F
+0x494E = 0x664C
+0x494F = 0x4E0A
+0x4950 = 0x5C1A
+0x4951 = 0x88F3
+0x4952 = 0x68A2
+0x4953 = 0x634E
+0x4954 = 0x7A0D
+0x4955 = 0x70E7
+0x4956 = 0x828D
+0x4957 = 0x52FA
+0x4958 = 0x97F6
+0x4959 = 0x5C11
+0x495A = 0x54E8
+0x495B = 0x90B5
+0x495C = 0x7ECD
+0x495D = 0x5962
+0x495E = 0x8D4A
+0x495F = 0x86C7
+0x4960 = 0x820C
+0x4961 = 0x820D
+0x4962 = 0x8D66
+0x4963 = 0x6444
+0x4964 = 0x5C04
+0x4965 = 0x6151
+0x4966 = 0x6D89
+0x4967 = 0x793E
+0x4968 = 0x8BBE
+0x4969 = 0x7837
+0x496A = 0x7533
+0x496B = 0x547B
+0x496C = 0x4F38
+0x496D = 0x8EAB
+0x496E = 0x6DF1
+0x496F = 0x5A20
+0x4970 = 0x7EC5
+0x4971 = 0x795E
+0x4972 = 0x6C88
+0x4973 = 0x5BA1
+0x4974 = 0x5A76
+0x4975 = 0x751A
+0x4976 = 0x80BE
+0x4977 = 0x614E
+0x4978 = 0x6E17
+0x4979 = 0x58F0
+0x497A = 0x751F
+0x497B = 0x7525
+0x497C = 0x7272
+0x497D = 0x5347
+0x497E = 0x7EF3
+0x4A21 = 0x7701
+0x4A22 = 0x76DB
+0x4A23 = 0x5269
+0x4A24 = 0x80DC
+0x4A25 = 0x5723
+0x4A26 = 0x5E08
+0x4A27 = 0x5931
+0x4A28 = 0x72EE
+0x4A29 = 0x65BD
+0x4A2A = 0x6E7F
+0x4A2B = 0x8BD7
+0x4A2C = 0x5C38
+0x4A2D = 0x8671
+0x4A2E = 0x5341
+0x4A2F = 0x77F3
+0x4A30 = 0x62FE
+0x4A31 = 0x65F6
+0x4A32 = 0x4EC0
+0x4A33 = 0x98DF
+0x4A34 = 0x8680
+0x4A35 = 0x5B9E
+0x4A36 = 0x8BC6
+0x4A37 = 0x53F2
+0x4A38 = 0x77E2
+0x4A39 = 0x4F7F
+0x4A3A = 0x5C4E
+0x4A3B = 0x9A76
+0x4A3C = 0x59CB
+0x4A3D = 0x5F0F
+0x4A3E = 0x793A
+0x4A3F = 0x58EB
+0x4A40 = 0x4E16
+0x4A41 = 0x67FF
+0x4A42 = 0x4E8B
+0x4A43 = 0x62ED
+0x4A44 = 0x8A93
+0x4A45 = 0x901D
+0x4A46 = 0x52BF
+0x4A47 = 0x662F
+0x4A48 = 0x55DC
+0x4A49 = 0x566C
+0x4A4A = 0x9002
+0x4A4B = 0x4ED5
+0x4A4C = 0x4F8D
+0x4A4D = 0x91CA
+0x4A4E = 0x9970
+0x4A4F = 0x6C0F
+0x4A50 = 0x5E02
+0x4A51 = 0x6043
+0x4A52 = 0x5BA4
+0x4A53 = 0x89C6
+0x4A54 = 0x8BD5
+0x4A55 = 0x6536
+0x4A56 = 0x624B
+0x4A57 = 0x9996
+0x4A58 = 0x5B88
+0x4A59 = 0x5BFF
+0x4A5A = 0x6388
+0x4A5B = 0x552E
+0x4A5C = 0x53D7
+0x4A5D = 0x7626
+0x4A5E = 0x517D
+0x4A5F = 0x852C
+0x4A60 = 0x67A2
+0x4A61 = 0x68B3
+0x4A62 = 0x6B8A
+0x4A63 = 0x6292
+0x4A64 = 0x8F93
+0x4A65 = 0x53D4
+0x4A66 = 0x8212
+0x4A67 = 0x6DD1
+0x4A68 = 0x758F
+0x4A69 = 0x4E66
+0x4A6A = 0x8D4E
+0x4A6B = 0x5B70
+0x4A6C = 0x719F
+0x4A6D = 0x85AF
+0x4A6E = 0x6691
+0x4A6F = 0x66D9
+0x4A70 = 0x7F72
+0x4A71 = 0x8700
+0x4A72 = 0x9ECD
+0x4A73 = 0x9F20
+0x4A74 = 0x5C5E
+0x4A75 = 0x672F
+0x4A76 = 0x8FF0
+0x4A77 = 0x6811
+0x4A78 = 0x675F
+0x4A79 = 0x620D
+0x4A7A = 0x7AD6
+0x4A7B = 0x5885
+0x4A7C = 0x5EB6
+0x4A7D = 0x6570
+0x4A7E = 0x6F31
+0x4B21 = 0x6055
+0x4B22 = 0x5237
+0x4B23 = 0x800D
+0x4B24 = 0x6454
+0x4B25 = 0x8870
+0x4B26 = 0x7529
+0x4B27 = 0x5E05
+0x4B28 = 0x6813
+0x4B29 = 0x62F4
+0x4B2A = 0x971C
+0x4B2B = 0x53CC
+0x4B2C = 0x723D
+0x4B2D = 0x8C01
+0x4B2E = 0x6C34
+0x4B2F = 0x7761
+0x4B30 = 0x7A0E
+0x4B31 = 0x542E
+0x4B32 = 0x77AC
+0x4B33 = 0x987A
+0x4B34 = 0x821C
+0x4B35 = 0x8BF4
+0x4B36 = 0x7855
+0x4B37 = 0x6714
+0x4B38 = 0x70C1
+0x4B39 = 0x65AF
+0x4B3A = 0x6495
+0x4B3B = 0x5636
+0x4B3C = 0x601D
+0x4B3D = 0x79C1
+0x4B3E = 0x53F8
+0x4B3F = 0x4E1D
+0x4B40 = 0x6B7B
+0x4B41 = 0x8086
+0x4B42 = 0x5BFA
+0x4B43 = 0x55E3
+0x4B44 = 0x56DB
+0x4B45 = 0x4F3A
+0x4B46 = 0x4F3C
+0x4B47 = 0x9972
+0x4B48 = 0x5DF3
+0x4B49 = 0x677E
+0x4B4A = 0x8038
+0x4B4B = 0x6002
+0x4B4C = 0x9882
+0x4B4D = 0x9001
+0x4B4E = 0x5B8B
+0x4B4F = 0x8BBC
+0x4B50 = 0x8BF5
+0x4B51 = 0x641C
+0x4B52 = 0x8258
+0x4B53 = 0x64DE
+0x4B54 = 0x55FD
+0x4B55 = 0x82CF
+0x4B56 = 0x9165
+0x4B57 = 0x4FD7
+0x4B58 = 0x7D20
+0x4B59 = 0x901F
+0x4B5A = 0x7C9F
+0x4B5B = 0x50F3
+0x4B5C = 0x5851
+0x4B5D = 0x6EAF
+0x4B5E = 0x5BBF
+0x4B5F = 0x8BC9
+0x4B60 = 0x8083
+0x4B61 = 0x9178
+0x4B62 = 0x849C
+0x4B63 = 0x7B97
+0x4B64 = 0x867D
+0x4B65 = 0x968B
+0x4B66 = 0x968F
+0x4B67 = 0x7EE5
+0x4B68 = 0x9AD3
+0x4B69 = 0x788E
+0x4B6A = 0x5C81
+0x4B6B = 0x7A57
+0x4B6C = 0x9042
+0x4B6D = 0x96A7
+0x4B6E = 0x795F
+0x4B6F = 0x5B59
+0x4B70 = 0x635F
+0x4B71 = 0x7B0B
+0x4B72 = 0x84D1
+0x4B73 = 0x68AD
+0x4B74 = 0x5506
+0x4B75 = 0x7F29
+0x4B76 = 0x7410
+0x4B77 = 0x7D22
+0x4B78 = 0x9501
+0x4B79 = 0x6240
+0x4B7A = 0x584C
+0x4B7B = 0x4ED6
+0x4B7C = 0x5B83
+0x4B7D = 0x5979
+0x4B7E = 0x5854
+0x4C21 = 0x736D
+0x4C22 = 0x631E
+0x4C23 = 0x8E4B
+0x4C24 = 0x8E0F
+0x4C25 = 0x80CE
+0x4C26 = 0x82D4
+0x4C27 = 0x62AC
+0x4C28 = 0x53F0
+0x4C29 = 0x6CF0
+0x4C2A = 0x915E
+0x4C2B = 0x592A
+0x4C2C = 0x6001
+0x4C2D = 0x6C70
+0x4C2E = 0x574D
+0x4C2F = 0x644A
+0x4C30 = 0x8D2A
+0x4C31 = 0x762B
+0x4C32 = 0x6EE9
+0x4C33 = 0x575B
+0x4C34 = 0x6A80
+0x4C35 = 0x75F0
+0x4C36 = 0x6F6D
+0x4C37 = 0x8C2D
+0x4C38 = 0x8C08
+0x4C39 = 0x5766
+0x4C3A = 0x6BEF
+0x4C3B = 0x8892
+0x4C3C = 0x78B3
+0x4C3D = 0x63A2
+0x4C3E = 0x53F9
+0x4C3F = 0x70AD
+0x4C40 = 0x6C64
+0x4C41 = 0x5858
+0x4C42 = 0x642A
+0x4C43 = 0x5802
+0x4C44 = 0x68E0
+0x4C45 = 0x819B
+0x4C46 = 0x5510
+0x4C47 = 0x7CD6
+0x4C48 = 0x5018
+0x4C49 = 0x8EBA
+0x4C4A = 0x6DCC
+0x4C4B = 0x8D9F
+0x4C4C = 0x70EB
+0x4C4D = 0x638F
+0x4C4E = 0x6D9B
+0x4C4F = 0x6ED4
+0x4C50 = 0x7EE6
+0x4C51 = 0x8404
+0x4C52 = 0x6843
+0x4C53 = 0x9003
+0x4C54 = 0x6DD8
+0x4C55 = 0x9676
+0x4C56 = 0x8BA8
+0x4C57 = 0x5957
+0x4C58 = 0x7279
+0x4C59 = 0x85E4
+0x4C5A = 0x817E
+0x4C5B = 0x75BC
+0x4C5C = 0x8A8A
+0x4C5D = 0x68AF
+0x4C5E = 0x5254
+0x4C5F = 0x8E22
+0x4C60 = 0x9511
+0x4C61 = 0x63D0
+0x4C62 = 0x9898
+0x4C63 = 0x8E44
+0x4C64 = 0x557C
+0x4C65 = 0x4F53
+0x4C66 = 0x66FF
+0x4C67 = 0x568F
+0x4C68 = 0x60D5
+0x4C69 = 0x6D95
+0x4C6A = 0x5243
+0x4C6B = 0x5C49
+0x4C6C = 0x5929
+0x4C6D = 0x6DFB
+0x4C6E = 0x586B
+0x4C6F = 0x7530
+0x4C70 = 0x751C
+0x4C71 = 0x606C
+0x4C72 = 0x8214
+0x4C73 = 0x8146
+0x4C74 = 0x6311
+0x4C75 = 0x6761
+0x4C76 = 0x8FE2
+0x4C77 = 0x773A
+0x4C78 = 0x8DF3
+0x4C79 = 0x8D34
+0x4C7A = 0x94C1
+0x4C7B = 0x5E16
+0x4C7C = 0x5385
+0x4C7D = 0x542C
+0x4C7E = 0x70C3
+0x4D21 = 0x6C40
+0x4D22 = 0x5EF7
+0x4D23 = 0x505C
+0x4D24 = 0x4EAD
+0x4D25 = 0x5EAD
+0x4D26 = 0x633A
+0x4D27 = 0x8247
+0x4D28 = 0x901A
+0x4D29 = 0x6850
+0x4D2A = 0x916E
+0x4D2B = 0x77B3
+0x4D2C = 0x540C
+0x4D2D = 0x94DC
+0x4D2E = 0x5F64
+0x4D2F = 0x7AE5
+0x4D30 = 0x6876
+0x4D31 = 0x6345
+0x4D32 = 0x7B52
+0x4D33 = 0x7EDF
+0x4D34 = 0x75DB
+0x4D35 = 0x5077
+0x4D36 = 0x6295
+0x4D37 = 0x5934
+0x4D38 = 0x900F
+0x4D39 = 0x51F8
+0x4D3A = 0x79C3
+0x4D3B = 0x7A81
+0x4D3C = 0x56FE
+0x4D3D = 0x5F92
+0x4D3E = 0x9014
+0x4D3F = 0x6D82
+0x4D40 = 0x5C60
+0x4D41 = 0x571F
+0x4D42 = 0x5410
+0x4D43 = 0x5154
+0x4D44 = 0x6E4D
+0x4D45 = 0x56E2
+0x4D46 = 0x63A8
+0x4D47 = 0x9893
+0x4D48 = 0x817F
+0x4D49 = 0x8715
+0x4D4A = 0x892A
+0x4D4B = 0x9000
+0x4D4C = 0x541E
+0x4D4D = 0x5C6F
+0x4D4E = 0x81C0
+0x4D4F = 0x62D6
+0x4D50 = 0x6258
+0x4D51 = 0x8131
+0x4D52 = 0x9E35
+0x4D53 = 0x9640
+0x4D54 = 0x9A6E
+0x4D55 = 0x9A7C
+0x4D56 = 0x692D
+0x4D57 = 0x59A5
+0x4D58 = 0x62D3
+0x4D59 = 0x553E
+0x4D5A = 0x6316
+0x4D5B = 0x54C7
+0x4D5C = 0x86D9
+0x4D5D = 0x6D3C
+0x4D5E = 0x5A03
+0x4D5F = 0x74E6
+0x4D60 = 0x889C
+0x4D61 = 0x6B6A
+0x4D62 = 0x5916
+0x4D63 = 0x8C4C
+0x4D64 = 0x5F2F
+0x4D65 = 0x6E7E
+0x4D66 = 0x73A9
+0x4D67 = 0x987D
+0x4D68 = 0x4E38
+0x4D69 = 0x70F7
+0x4D6A = 0x5B8C
+0x4D6B = 0x7897
+0x4D6C = 0x633D
+0x4D6D = 0x665A
+0x4D6E = 0x7696
+0x4D6F = 0x60CB
+0x4D70 = 0x5B9B
+0x4D71 = 0x5A49
+0x4D72 = 0x4E07
+0x4D73 = 0x8155
+0x4D74 = 0x6C6A
+0x4D75 = 0x738B
+0x4D76 = 0x4EA1
+0x4D77 = 0x6789
+0x4D78 = 0x7F51
+0x4D79 = 0x5F80
+0x4D7A = 0x65FA
+0x4D7B = 0x671B
+0x4D7C = 0x5FD8
+0x4D7D = 0x5984
+0x4D7E = 0x5A01
+0x4E21 = 0x5DCD
+0x4E22 = 0x5FAE
+0x4E23 = 0x5371
+0x4E24 = 0x97E6
+0x4E25 = 0x8FDD
+0x4E26 = 0x6845
+0x4E27 = 0x56F4
+0x4E28 = 0x552F
+0x4E29 = 0x60DF
+0x4E2A = 0x4E3A
+0x4E2B = 0x6F4D
+0x4E2C = 0x7EF4
+0x4E2D = 0x82C7
+0x4E2E = 0x840E
+0x4E2F = 0x59D4
+0x4E30 = 0x4F1F
+0x4E31 = 0x4F2A
+0x4E32 = 0x5C3E
+0x4E33 = 0x7EAC
+0x4E34 = 0x672A
+0x4E35 = 0x851A
+0x4E36 = 0x5473
+0x4E37 = 0x754F
+0x4E38 = 0x80C3
+0x4E39 = 0x5582
+0x4E3A = 0x9B4F
+0x4E3B = 0x4F4D
+0x4E3C = 0x6E2D
+0x4E3D = 0x8C13
+0x4E3E = 0x5C09
+0x4E3F = 0x6170
+0x4E40 = 0x536B
+0x4E41 = 0x761F
+0x4E42 = 0x6E29
+0x4E43 = 0x868A
+0x4E44 = 0x6587
+0x4E45 = 0x95FB
+0x4E46 = 0x7EB9
+0x4E47 = 0x543B
+0x4E48 = 0x7A33
+0x4E49 = 0x7D0A
+0x4E4A = 0x95EE
+0x4E4B = 0x55E1
+0x4E4C = 0x7FC1
+0x4E4D = 0x74EE
+0x4E4E = 0x631D
+0x4E4F = 0x8717
+0x4E50 = 0x6DA1
+0x4E51 = 0x7A9D
+0x4E52 = 0x6211
+0x4E53 = 0x65A1
+0x4E54 = 0x5367
+0x4E55 = 0x63E1
+0x4E56 = 0x6C83
+0x4E57 = 0x5DEB
+0x4E58 = 0x545C
+0x4E59 = 0x94A8
+0x4E5A = 0x4E4C
+0x4E5B = 0x6C61
+0x4E5C = 0x8BEC
+0x4E5D = 0x5C4B
+0x4E5E = 0x65E0
+0x4E5F = 0x829C
+0x4E60 = 0x68A7
+0x4E61 = 0x543E
+0x4E62 = 0x5434
+0x4E63 = 0x6BCB
+0x4E64 = 0x6B66
+0x4E65 = 0x4E94
+0x4E66 = 0x6342
+0x4E67 = 0x5348
+0x4E68 = 0x821E
+0x4E69 = 0x4F0D
+0x4E6A = 0x4FAE
+0x4E6B = 0x575E
+0x4E6C = 0x620A
+0x4E6D = 0x96FE
+0x4E6E = 0x6664
+0x4E6F = 0x7269
+0x4E70 = 0x52FF
+0x4E71 = 0x52A1
+0x4E72 = 0x609F
+0x4E73 = 0x8BEF
+0x4E74 = 0x6614
+0x4E75 = 0x7199
+0x4E76 = 0x6790
+0x4E77 = 0x897F
+0x4E78 = 0x7852
+0x4E79 = 0x77FD
+0x4E7A = 0x6670
+0x4E7B = 0x563B
+0x4E7C = 0x5438
+0x4E7D = 0x9521
+0x4E7E = 0x727A
+0x4F21 = 0x7A00
+0x4F22 = 0x606F
+0x4F23 = 0x5E0C
+0x4F24 = 0x6089
+0x4F25 = 0x819D
+0x4F26 = 0x5915
+0x4F27 = 0x60DC
+0x4F28 = 0x7184
+0x4F29 = 0x70EF
+0x4F2A = 0x6EAA
+0x4F2B = 0x6C50
+0x4F2C = 0x7280
+0x4F2D = 0x6A84
+0x4F2E = 0x88AD
+0x4F2F = 0x5E2D
+0x4F30 = 0x4E60
+0x4F31 = 0x5AB3
+0x4F32 = 0x559C
+0x4F33 = 0x94E3
+0x4F34 = 0x6D17
+0x4F35 = 0x7CFB
+0x4F36 = 0x9699
+0x4F37 = 0x620F
+0x4F38 = 0x7EC6
+0x4F39 = 0x778E
+0x4F3A = 0x867E
+0x4F3B = 0x5323
+0x4F3C = 0x971E
+0x4F3D = 0x8F96
+0x4F3E = 0x6687
+0x4F3F = 0x5CE1
+0x4F40 = 0x4FA0
+0x4F41 = 0x72ED
+0x4F42 = 0x4E0B
+0x4F43 = 0x53A6
+0x4F44 = 0x590F
+0x4F45 = 0x5413
+0x4F46 = 0x6380
+0x4F47 = 0x9528
+0x4F48 = 0x5148
+0x4F49 = 0x4ED9
+0x4F4A = 0x9C9C
+0x4F4B = 0x7EA4
+0x4F4C = 0x54B8
+0x4F4D = 0x8D24
+0x4F4E = 0x8854
+0x4F4F = 0x8237
+0x4F50 = 0x95F2
+0x4F51 = 0x6D8E
+0x4F52 = 0x5F26
+0x4F53 = 0x5ACC
+0x4F54 = 0x663E
+0x4F55 = 0x9669
+0x4F56 = 0x73B0
+0x4F57 = 0x732E
+0x4F58 = 0x53BF
+0x4F59 = 0x817A
+0x4F5A = 0x9985
+0x4F5B = 0x7FA1
+0x4F5C = 0x5BAA
+0x4F5D = 0x9677
+0x4F5E = 0x9650
+0x4F5F = 0x7EBF
+0x4F60 = 0x76F8
+0x4F61 = 0x53A2
+0x4F62 = 0x9576
+0x4F63 = 0x9999
+0x4F64 = 0x7BB1
+0x4F65 = 0x8944
+0x4F66 = 0x6E58
+0x4F67 = 0x4E61
+0x4F68 = 0x7FD4
+0x4F69 = 0x7965
+0x4F6A = 0x8BE6
+0x4F6B = 0x60F3
+0x4F6C = 0x54CD
+0x4F6D = 0x4EAB
+0x4F6E = 0x9879
+0x4F6F = 0x5DF7
+0x4F70 = 0x6A61
+0x4F71 = 0x50CF
+0x4F72 = 0x5411
+0x4F73 = 0x8C61
+0x4F74 = 0x8427
+0x4F75 = 0x785D
+0x4F76 = 0x9704
+0x4F77 = 0x524A
+0x4F78 = 0x54EE
+0x4F79 = 0x56A3
+0x4F7A = 0x9500
+0x4F7B = 0x6D88
+0x4F7C = 0x5BB5
+0x4F7D = 0x6DC6
+0x4F7E = 0x6653
+0x5021 = 0x5C0F
+0x5022 = 0x5B5D
+0x5023 = 0x6821
+0x5024 = 0x8096
+0x5025 = 0x5578
+0x5026 = 0x7B11
+0x5027 = 0x6548
+0x5028 = 0x6954
+0x5029 = 0x4E9B
+0x502A = 0x6B47
+0x502B = 0x874E
+0x502C = 0x978B
+0x502D = 0x534F
+0x502E = 0x631F
+0x502F = 0x643A
+0x5030 = 0x90AA
+0x5031 = 0x659C
+0x5032 = 0x80C1
+0x5033 = 0x8C10
+0x5034 = 0x5199
+0x5035 = 0x68B0
+0x5036 = 0x5378
+0x5037 = 0x87F9
+0x5038 = 0x61C8
+0x5039 = 0x6CC4
+0x503A = 0x6CFB
+0x503B = 0x8C22
+0x503C = 0x5C51
+0x503D = 0x85AA
+0x503E = 0x82AF
+0x503F = 0x950C
+0x5040 = 0x6B23
+0x5041 = 0x8F9B
+0x5042 = 0x65B0
+0x5043 = 0x5FFB
+0x5044 = 0x5FC3
+0x5045 = 0x4FE1
+0x5046 = 0x8845
+0x5047 = 0x661F
+0x5048 = 0x8165
+0x5049 = 0x7329
+0x504A = 0x60FA
+0x504B = 0x5174
+0x504C = 0x5211
+0x504D = 0x578B
+0x504E = 0x5F62
+0x504F = 0x90A2
+0x5050 = 0x884C
+0x5051 = 0x9192
+0x5052 = 0x5E78
+0x5053 = 0x674F
+0x5054 = 0x6027
+0x5055 = 0x59D3
+0x5056 = 0x5144
+0x5057 = 0x51F6
+0x5058 = 0x80F8
+0x5059 = 0x5308
+0x505A = 0x6C79
+0x505B = 0x96C4
+0x505C = 0x718A
+0x505D = 0x4F11
+0x505E = 0x4FEE
+0x505F = 0x7F9E
+0x5060 = 0x673D
+0x5061 = 0x55C5
+0x5062 = 0x9508
+0x5063 = 0x79C0
+0x5064 = 0x8896
+0x5065 = 0x7EE3
+0x5066 = 0x589F
+0x5067 = 0x620C
+0x5068 = 0x9700
+0x5069 = 0x865A
+0x506A = 0x5618
+0x506B = 0x987B
+0x506C = 0x5F90
+0x506D = 0x8BB8
+0x506E = 0x84C4
+0x506F = 0x9157
+0x5070 = 0x53D9
+0x5071 = 0x65ED
+0x5072 = 0x5E8F
+0x5073 = 0x755C
+0x5074 = 0x6064
+0x5075 = 0x7D6E
+0x5076 = 0x5A7F
+0x5077 = 0x7EEA
+0x5078 = 0x7EED
+0x5079 = 0x8F69
+0x507A = 0x55A7
+0x507B = 0x5BA3
+0x507C = 0x60AC
+0x507D = 0x65CB
+0x507E = 0x7384
+0x5121 = 0x9009
+0x5122 = 0x7663
+0x5123 = 0x7729
+0x5124 = 0x7EDA
+0x5125 = 0x9774
+0x5126 = 0x859B
+0x5127 = 0x5B66
+0x5128 = 0x7A74
+0x5129 = 0x96EA
+0x512A = 0x8840
+0x512B = 0x52CB
+0x512C = 0x718F
+0x512D = 0x5FAA
+0x512E = 0x65EC
+0x512F = 0x8BE2
+0x5130 = 0x5BFB
+0x5131 = 0x9A6F
+0x5132 = 0x5DE1
+0x5133 = 0x6B89
+0x5134 = 0x6C5B
+0x5135 = 0x8BAD
+0x5136 = 0x8BAF
+0x5137 = 0x900A
+0x5138 = 0x8FC5
+0x5139 = 0x538B
+0x513A = 0x62BC
+0x513B = 0x9E26
+0x513C = 0x9E2D
+0x513D = 0x5440
+0x513E = 0x4E2B
+0x513F = 0x82BD
+0x5140 = 0x7259
+0x5141 = 0x869C
+0x5142 = 0x5D16
+0x5143 = 0x8859
+0x5144 = 0x6DAF
+0x5145 = 0x96C5
+0x5146 = 0x54D1
+0x5147 = 0x4E9A
+0x5148 = 0x8BB6
+0x5149 = 0x7109
+0x514A = 0x54BD
+0x514B = 0x9609
+0x514C = 0x70DF
+0x514D = 0x6DF9
+0x514E = 0x76D0
+0x514F = 0x4E25
+0x5150 = 0x7814
+0x5151 = 0x8712
+0x5152 = 0x5CA9
+0x5153 = 0x5EF6
+0x5154 = 0x8A00
+0x5155 = 0x989C
+0x5156 = 0x960E
+0x5157 = 0x708E
+0x5158 = 0x6CBF
+0x5159 = 0x5944
+0x515A = 0x63A9
+0x515B = 0x773C
+0x515C = 0x884D
+0x515D = 0x6F14
+0x515E = 0x8273
+0x515F = 0x5830
+0x5160 = 0x71D5
+0x5161 = 0x538C
+0x5162 = 0x781A
+0x5163 = 0x96C1
+0x5164 = 0x5501
+0x5165 = 0x5F66
+0x5166 = 0x7130
+0x5167 = 0x5BB4
+0x5168 = 0x8C1A
+0x5169 = 0x9A8C
+0x516A = 0x6B83
+0x516B = 0x592E
+0x516C = 0x9E2F
+0x516D = 0x79E7
+0x516E = 0x6768
+0x516F = 0x626C
+0x5170 = 0x4F6F
+0x5171 = 0x75A1
+0x5172 = 0x7F8A
+0x5173 = 0x6D0B
+0x5174 = 0x9633
+0x5175 = 0x6C27
+0x5176 = 0x4EF0
+0x5177 = 0x75D2
+0x5178 = 0x517B
+0x5179 = 0x6837
+0x517A = 0x6F3E
+0x517B = 0x9080
+0x517C = 0x8170
+0x517D = 0x5996
+0x517E = 0x7476
+0x5221 = 0x6447
+0x5222 = 0x5C27
+0x5223 = 0x9065
+0x5224 = 0x7A91
+0x5225 = 0x8C23
+0x5226 = 0x59DA
+0x5227 = 0x54AC
+0x5228 = 0x8200
+0x5229 = 0x836F
+0x522A = 0x8981
+0x522B = 0x8000
+0x522C = 0x6930
+0x522D = 0x564E
+0x522E = 0x8036
+0x522F = 0x7237
+0x5230 = 0x91CE
+0x5231 = 0x51B6
+0x5232 = 0x4E5F
+0x5233 = 0x9875
+0x5234 = 0x6396
+0x5235 = 0x4E1A
+0x5236 = 0x53F6
+0x5237 = 0x66F3
+0x5238 = 0x814B
+0x5239 = 0x591C
+0x523A = 0x6DB2
+0x523B = 0x4E00
+0x523C = 0x58F9
+0x523D = 0x533B
+0x523E = 0x63D6
+0x523F = 0x94F1
+0x5240 = 0x4F9D
+0x5241 = 0x4F0A
+0x5242 = 0x8863
+0x5243 = 0x9890
+0x5244 = 0x5937
+0x5245 = 0x9057
+0x5246 = 0x79FB
+0x5247 = 0x4EEA
+0x5248 = 0x80F0
+0x5249 = 0x7591
+0x524A = 0x6C82
+0x524B = 0x5B9C
+0x524C = 0x59E8
+0x524D = 0x5F5D
+0x524E = 0x6905
+0x524F = 0x8681
+0x5250 = 0x501A
+0x5251 = 0x5DF2
+0x5252 = 0x4E59
+0x5253 = 0x77E3
+0x5254 = 0x4EE5
+0x5255 = 0x827A
+0x5256 = 0x6291
+0x5257 = 0x6613
+0x5258 = 0x9091
+0x5259 = 0x5C79
+0x525A = 0x4EBF
+0x525B = 0x5F79
+0x525C = 0x81C6
+0x525D = 0x9038
+0x525E = 0x8084
+0x525F = 0x75AB
+0x5260 = 0x4EA6
+0x5261 = 0x88D4
+0x5262 = 0x610F
+0x5263 = 0x6BC5
+0x5264 = 0x5FC6
+0x5265 = 0x4E49
+0x5266 = 0x76CA
+0x5267 = 0x6EA2
+0x5268 = 0x8BE3
+0x5269 = 0x8BAE
+0x526A = 0x8C0A
+0x526B = 0x8BD1
+0x526C = 0x5F02
+0x526D = 0x7FFC
+0x526E = 0x7FCC
+0x526F = 0x7ECE
+0x5270 = 0x8335
+0x5271 = 0x836B
+0x5272 = 0x56E0
+0x5273 = 0x6BB7
+0x5274 = 0x97F3
+0x5275 = 0x9634
+0x5276 = 0x59FB
+0x5277 = 0x541F
+0x5278 = 0x94F6
+0x5279 = 0x6DEB
+0x527A = 0x5BC5
+0x527B = 0x996E
+0x527C = 0x5C39
+0x527D = 0x5F15
+0x527E = 0x9690
+0x5321 = 0x5370
+0x5322 = 0x82F1
+0x5323 = 0x6A31
+0x5324 = 0x5A74
+0x5325 = 0x9E70
+0x5326 = 0x5E94
+0x5327 = 0x7F28
+0x5328 = 0x83B9
+0x5329 = 0x8424
+0x532A = 0x8425
+0x532B = 0x8367
+0x532C = 0x8747
+0x532D = 0x8FCE
+0x532E = 0x8D62
+0x532F = 0x76C8
+0x5330 = 0x5F71
+0x5331 = 0x9896
+0x5332 = 0x786C
+0x5333 = 0x6620
+0x5334 = 0x54DF
+0x5335 = 0x62E5
+0x5336 = 0x4F63
+0x5337 = 0x81C3
+0x5338 = 0x75C8
+0x5339 = 0x5EB8
+0x533A = 0x96CD
+0x533B = 0x8E0A
+0x533C = 0x86F9
+0x533D = 0x548F
+0x533E = 0x6CF3
+0x533F = 0x6D8C
+0x5340 = 0x6C38
+0x5341 = 0x607F
+0x5342 = 0x52C7
+0x5343 = 0x7528
+0x5344 = 0x5E7D
+0x5345 = 0x4F18
+0x5346 = 0x60A0
+0x5347 = 0x5FE7
+0x5348 = 0x5C24
+0x5349 = 0x7531
+0x534A = 0x90AE
+0x534B = 0x94C0
+0x534C = 0x72B9
+0x534D = 0x6CB9
+0x534E = 0x6E38
+0x534F = 0x9149
+0x5350 = 0x6709
+0x5351 = 0x53CB
+0x5352 = 0x53F3
+0x5353 = 0x4F51
+0x5354 = 0x91C9
+0x5355 = 0x8BF1
+0x5356 = 0x53C8
+0x5357 = 0x5E7C
+0x5358 = 0x8FC2
+0x5359 = 0x6DE4
+0x535A = 0x4E8E
+0x535B = 0x76C2
+0x535C = 0x6986
+0x535D = 0x865E
+0x535E = 0x611A
+0x535F = 0x8206
+0x5360 = 0x4F59
+0x5361 = 0x4FDE
+0x5362 = 0x903E
+0x5363 = 0x9C7C
+0x5364 = 0x6109
+0x5365 = 0x6E1D
+0x5366 = 0x6E14
+0x5367 = 0x9685
+0x5368 = 0x4E88
+0x5369 = 0x5A31
+0x536A = 0x96E8
+0x536B = 0x4E0E
+0x536C = 0x5C7F
+0x536D = 0x79B9
+0x536E = 0x5B87
+0x536F = 0x8BED
+0x5370 = 0x7FBD
+0x5371 = 0x7389
+0x5372 = 0x57DF
+0x5373 = 0x828B
+0x5374 = 0x90C1
+0x5375 = 0x5401
+0x5376 = 0x9047
+0x5377 = 0x55BB
+0x5378 = 0x5CEA
+0x5379 = 0x5FA1
+0x537A = 0x6108
+0x537B = 0x6B32
+0x537C = 0x72F1
+0x537D = 0x80B2
+0x537E = 0x8A89
+0x5421 = 0x6D74
+0x5422 = 0x5BD3
+0x5423 = 0x88D5
+0x5424 = 0x9884
+0x5425 = 0x8C6B
+0x5426 = 0x9A6D
+0x5427 = 0x9E33
+0x5428 = 0x6E0A
+0x5429 = 0x51A4
+0x542A = 0x5143
+0x542B = 0x57A3
+0x542C = 0x8881
+0x542D = 0x539F
+0x542E = 0x63F4
+0x542F = 0x8F95
+0x5430 = 0x56ED
+0x5431 = 0x5458
+0x5432 = 0x5706
+0x5433 = 0x733F
+0x5434 = 0x6E90
+0x5435 = 0x7F18
+0x5436 = 0x8FDC
+0x5437 = 0x82D1
+0x5438 = 0x613F
+0x5439 = 0x6028
+0x543A = 0x9662
+0x543B = 0x66F0
+0x543C = 0x7EA6
+0x543D = 0x8D8A
+0x543E = 0x8DC3
+0x543F = 0x94A5
+0x5440 = 0x5CB3
+0x5441 = 0x7CA4
+0x5442 = 0x6708
+0x5443 = 0x60A6
+0x5444 = 0x9605
+0x5445 = 0x8018
+0x5446 = 0x4E91
+0x5447 = 0x90E7
+0x5448 = 0x5300
+0x5449 = 0x9668
+0x544A = 0x5141
+0x544B = 0x8FD0
+0x544C = 0x8574
+0x544D = 0x915D
+0x544E = 0x6655
+0x544F = 0x97F5
+0x5450 = 0x5B55
+0x5451 = 0x531D
+0x5452 = 0x7838
+0x5453 = 0x6742
+0x5454 = 0x683D
+0x5455 = 0x54C9
+0x5456 = 0x707E
+0x5457 = 0x5BB0
+0x5458 = 0x8F7D
+0x5459 = 0x518D
+0x545A = 0x5728
+0x545B = 0x54B1
+0x545C = 0x6512
+0x545D = 0x6682
+0x545E = 0x8D5E
+0x545F = 0x8D43
+0x5460 = 0x810F
+0x5461 = 0x846C
+0x5462 = 0x906D
+0x5463 = 0x7CDF
+0x5464 = 0x51FF
+0x5465 = 0x85FB
+0x5466 = 0x67A3
+0x5467 = 0x65E9
+0x5468 = 0x6FA1
+0x5469 = 0x86A4
+0x546A = 0x8E81
+0x546B = 0x566A
+0x546C = 0x9020
+0x546D = 0x7682
+0x546E = 0x7076
+0x546F = 0x71E5
+0x5470 = 0x8D23
+0x5471 = 0x62E9
+0x5472 = 0x5219
+0x5473 = 0x6CFD
+0x5474 = 0x8D3C
+0x5475 = 0x600E
+0x5476 = 0x589E
+0x5477 = 0x618E
+0x5478 = 0x66FE
+0x5479 = 0x8D60
+0x547A = 0x624E
+0x547B = 0x55B3
+0x547C = 0x6E23
+0x547D = 0x672D
+0x547E = 0x8F67
+0x5521 = 0x94E1
+0x5522 = 0x95F8
+0x5523 = 0x7728
+0x5524 = 0x6805
+0x5525 = 0x69A8
+0x5526 = 0x548B
+0x5527 = 0x4E4D
+0x5528 = 0x70B8
+0x5529 = 0x8BC8
+0x552A = 0x6458
+0x552B = 0x658B
+0x552C = 0x5B85
+0x552D = 0x7A84
+0x552E = 0x503A
+0x552F = 0x5BE8
+0x5530 = 0x77BB
+0x5531 = 0x6BE1
+0x5532 = 0x8A79
+0x5533 = 0x7C98
+0x5534 = 0x6CBE
+0x5535 = 0x76CF
+0x5536 = 0x65A9
+0x5537 = 0x8F97
+0x5538 = 0x5D2D
+0x5539 = 0x5C55
+0x553A = 0x8638
+0x553B = 0x6808
+0x553C = 0x5360
+0x553D = 0x6218
+0x553E = 0x7AD9
+0x553F = 0x6E5B
+0x5540 = 0x7EFD
+0x5541 = 0x6A1F
+0x5542 = 0x7AE0
+0x5543 = 0x5F70
+0x5544 = 0x6F33
+0x5545 = 0x5F20
+0x5546 = 0x638C
+0x5547 = 0x6DA8
+0x5548 = 0x6756
+0x5549 = 0x4E08
+0x554A = 0x5E10
+0x554B = 0x8D26
+0x554C = 0x4ED7
+0x554D = 0x80C0
+0x554E = 0x7634
+0x554F = 0x969C
+0x5550 = 0x62DB
+0x5551 = 0x662D
+0x5552 = 0x627E
+0x5553 = 0x6CBC
+0x5554 = 0x8D75
+0x5555 = 0x7167
+0x5556 = 0x7F69
+0x5557 = 0x5146
+0x5558 = 0x8087
+0x5559 = 0x53EC
+0x555A = 0x906E
+0x555B = 0x6298
+0x555C = 0x54F2
+0x555D = 0x86F0
+0x555E = 0x8F99
+0x555F = 0x8005
+0x5560 = 0x9517
+0x5561 = 0x8517
+0x5562 = 0x8FD9
+0x5563 = 0x6D59
+0x5564 = 0x73CD
+0x5565 = 0x659F
+0x5566 = 0x771F
+0x5567 = 0x7504
+0x5568 = 0x7827
+0x5569 = 0x81FB
+0x556A = 0x8D1E
+0x556B = 0x9488
+0x556C = 0x4FA6
+0x556D = 0x6795
+0x556E = 0x75B9
+0x556F = 0x8BCA
+0x5570 = 0x9707
+0x5571 = 0x632F
+0x5572 = 0x9547
+0x5573 = 0x9635
+0x5574 = 0x84B8
+0x5575 = 0x6323
+0x5576 = 0x7741
+0x5577 = 0x5F81
+0x5578 = 0x72F0
+0x5579 = 0x4E89
+0x557A = 0x6014
+0x557B = 0x6574
+0x557C = 0x62EF
+0x557D = 0x6B63
+0x557E = 0x653F
+0x5621 = 0x5E27
+0x5622 = 0x75C7
+0x5623 = 0x90D1
+0x5624 = 0x8BC1
+0x5625 = 0x829D
+0x5626 = 0x679D
+0x5627 = 0x652F
+0x5628 = 0x5431
+0x5629 = 0x8718
+0x562A = 0x77E5
+0x562B = 0x80A2
+0x562C = 0x8102
+0x562D = 0x6C41
+0x562E = 0x4E4B
+0x562F = 0x7EC7
+0x5630 = 0x804C
+0x5631 = 0x76F4
+0x5632 = 0x690D
+0x5633 = 0x6B96
+0x5634 = 0x6267
+0x5635 = 0x503C
+0x5636 = 0x4F84
+0x5637 = 0x5740
+0x5638 = 0x6307
+0x5639 = 0x6B62
+0x563A = 0x8DBE
+0x563B = 0x53EA
+0x563C = 0x65E8
+0x563D = 0x7EB8
+0x563E = 0x5FD7
+0x563F = 0x631A
+0x5640 = 0x63B7
+0x5641 = 0x81F3
+0x5642 = 0x81F4
+0x5643 = 0x7F6E
+0x5644 = 0x5E1C
+0x5645 = 0x5CD9
+0x5646 = 0x5236
+0x5647 = 0x667A
+0x5648 = 0x79E9
+0x5649 = 0x7A1A
+0x564A = 0x8D28
+0x564B = 0x7099
+0x564C = 0x75D4
+0x564D = 0x6EDE
+0x564E = 0x6CBB
+0x564F = 0x7A92
+0x5650 = 0x4E2D
+0x5651 = 0x76C5
+0x5652 = 0x5FE0
+0x5653 = 0x949F
+0x5654 = 0x8877
+0x5655 = 0x7EC8
+0x5656 = 0x79CD
+0x5657 = 0x80BF
+0x5658 = 0x91CD
+0x5659 = 0x4EF2
+0x565A = 0x4F17
+0x565B = 0x821F
+0x565C = 0x5468
+0x565D = 0x5DDE
+0x565E = 0x6D32
+0x565F = 0x8BCC
+0x5660 = 0x7CA5
+0x5661 = 0x8F74
+0x5662 = 0x8098
+0x5663 = 0x5E1A
+0x5664 = 0x5492
+0x5665 = 0x76B1
+0x5666 = 0x5B99
+0x5667 = 0x663C
+0x5668 = 0x9AA4
+0x5669 = 0x73E0
+0x566A = 0x682A
+0x566B = 0x86DB
+0x566C = 0x6731
+0x566D = 0x732A
+0x566E = 0x8BF8
+0x566F = 0x8BDB
+0x5670 = 0x9010
+0x5671 = 0x7AF9
+0x5672 = 0x70DB
+0x5673 = 0x716E
+0x5674 = 0x62C4
+0x5675 = 0x77A9
+0x5676 = 0x5631
+0x5677 = 0x4E3B
+0x5678 = 0x8457
+0x5679 = 0x67F1
+0x567A = 0x52A9
+0x567B = 0x86C0
+0x567C = 0x8D2E
+0x567D = 0x94F8
+0x567E = 0x7B51
+0x5721 = 0x4F4F
+0x5722 = 0x6CE8
+0x5723 = 0x795D
+0x5724 = 0x9A7B
+0x5725 = 0x6293
+0x5726 = 0x722A
+0x5727 = 0x62FD
+0x5728 = 0x4E13
+0x5729 = 0x7816
+0x572A = 0x8F6C
+0x572B = 0x64B0
+0x572C = 0x8D5A
+0x572D = 0x7BC6
+0x572E = 0x6869
+0x572F = 0x5E84
+0x5730 = 0x88C5
+0x5731 = 0x5986
+0x5732 = 0x649E
+0x5733 = 0x58EE
+0x5734 = 0x72B6
+0x5735 = 0x690E
+0x5736 = 0x9525
+0x5737 = 0x8FFD
+0x5738 = 0x8D58
+0x5739 = 0x5760
+0x573A = 0x7F00
+0x573B = 0x8C06
+0x573C = 0x51C6
+0x573D = 0x6349
+0x573E = 0x62D9
+0x573F = 0x5353
+0x5740 = 0x684C
+0x5741 = 0x7422
+0x5742 = 0x8301
+0x5743 = 0x914C
+0x5744 = 0x5544
+0x5745 = 0x7740
+0x5746 = 0x707C
+0x5747 = 0x6D4A
+0x5748 = 0x5179
+0x5749 = 0x54A8
+0x574A = 0x8D44
+0x574B = 0x59FF
+0x574C = 0x6ECB
+0x574D = 0x6DC4
+0x574E = 0x5B5C
+0x574F = 0x7D2B
+0x5750 = 0x4ED4
+0x5751 = 0x7C7D
+0x5752 = 0x6ED3
+0x5753 = 0x5B50
+0x5754 = 0x81EA
+0x5755 = 0x6E0D
+0x5756 = 0x5B57
+0x5757 = 0x9B03
+0x5758 = 0x68D5
+0x5759 = 0x8E2A
+0x575A = 0x5B97
+0x575B = 0x7EFC
+0x575C = 0x603B
+0x575D = 0x7EB5
+0x575E = 0x90B9
+0x575F = 0x8D70
+0x5760 = 0x594F
+0x5761 = 0x63CD
+0x5762 = 0x79DF
+0x5763 = 0x8DB3
+0x5764 = 0x5352
+0x5765 = 0x65CF
+0x5766 = 0x7956
+0x5767 = 0x8BC5
+0x5768 = 0x963B
+0x5769 = 0x7EC4
+0x576A = 0x94BB
+0x576B = 0x7E82
+0x576C = 0x5634
+0x576D = 0x9189
+0x576E = 0x6700
+0x576F = 0x7F6A
+0x5770 = 0x5C0A
+0x5771 = 0x9075
+0x5772 = 0x6628
+0x5773 = 0x5DE6
+0x5774 = 0x4F50
+0x5775 = 0x67DE
+0x5776 = 0x505A
+0x5777 = 0x4F5C
+0x5778 = 0x5750
+0x5779 = 0x5EA7
+
+# GBK2 / GB2312 plane2
+0x5821 = 0x4E8D
+0x5822 = 0x4E0C
+0x5823 = 0x5140
+0x5824 = 0x4E10
+0x5825 = 0x5EFF
+0x5826 = 0x5345
+0x5827 = 0x4E15
+0x5828 = 0x4E98
+0x5829 = 0x4E1E
+0x582A = 0x9B32
+0x582B = 0x5B6C
+0x582C = 0x5669
+0x582D = 0x4E28
+0x582E = 0x79BA
+0x582F = 0x4E3F
+0x5830 = 0x5315
+0x5831 = 0x4E47
+0x5832 = 0x592D
+0x5833 = 0x723B
+0x5834 = 0x536E
+0x5835 = 0x6C10
+0x5836 = 0x56DF
+0x5837 = 0x80E4
+0x5838 = 0x9997
+0x5839 = 0x6BD3
+0x583A = 0x777E
+0x583B = 0x9F17
+0x583C = 0x4E36
+0x583D = 0x4E9F
+0x583E = 0x9F10
+0x583F = 0x4E5C
+0x5840 = 0x4E69
+0x5841 = 0x4E93
+0x5842 = 0x8288
+0x5843 = 0x5B5B
+0x5844 = 0x556C
+0x5845 = 0x560F
+0x5846 = 0x4EC4
+0x5847 = 0x538D
+0x5848 = 0x539D
+0x5849 = 0x53A3
+0x584A = 0x53A5
+0x584B = 0x53AE
+0x584C = 0x9765
+0x584D = 0x8D5D
+0x584E = 0x531A
+0x584F = 0x53F5
+0x5850 = 0x5326
+0x5851 = 0x532E
+0x5852 = 0x533E
+0x5853 = 0x8D5C
+0x5854 = 0x5366
+0x5855 = 0x5363
+0x5856 = 0x5202
+0x5857 = 0x5208
+0x5858 = 0x520E
+0x5859 = 0x522D
+0x585A = 0x5233
+0x585B = 0x523F
+0x585C = 0x5240
+0x585D = 0x524C
+0x585E = 0x525E
+0x585F = 0x5261
+0x5860 = 0x525C
+0x5861 = 0x84AF
+0x5862 = 0x527D
+0x5863 = 0x5282
+0x5864 = 0x5281
+0x5865 = 0x5290
+0x5866 = 0x5293
+0x5867 = 0x5182
+0x5868 = 0x7F54
+0x5869 = 0x4EBB
+0x586A = 0x4EC3
+0x586B = 0x4EC9
+0x586C = 0x4EC2
+0x586D = 0x4EE8
+0x586E = 0x4EE1
+0x586F = 0x4EEB
+0x5870 = 0x4EDE
+0x5871 = 0x4F1B
+0x5872 = 0x4EF3
+0x5873 = 0x4F22
+0x5874 = 0x4F64
+0x5875 = 0x4EF5
+0x5876 = 0x4F25
+0x5877 = 0x4F27
+0x5878 = 0x4F09
+0x5879 = 0x4F2B
+0x587A = 0x4F5E
+0x587B = 0x4F67
+0x587C = 0x6538
+0x587D = 0x4F5A
+0x587E = 0x4F5D
+0x5921 = 0x4F5F
+0x5922 = 0x4F57
+0x5923 = 0x4F32
+0x5924 = 0x4F3D
+0x5925 = 0x4F76
+0x5926 = 0x4F74
+0x5927 = 0x4F91
+0x5928 = 0x4F89
+0x5929 = 0x4F83
+0x592A = 0x4F8F
+0x592B = 0x4F7E
+0x592C = 0x4F7B
+0x592D = 0x4FAA
+0x592E = 0x4F7C
+0x592F = 0x4FAC
+0x5930 = 0x4F94
+0x5931 = 0x4FE6
+0x5932 = 0x4FE8
+0x5933 = 0x4FEA
+0x5934 = 0x4FC5
+0x5935 = 0x4FDA
+0x5936 = 0x4FE3
+0x5937 = 0x4FDC
+0x5938 = 0x4FD1
+0x5939 = 0x4FDF
+0x593A = 0x4FF8
+0x593B = 0x5029
+0x593C = 0x504C
+0x593D = 0x4FF3
+0x593E = 0x502C
+0x593F = 0x500F
+0x5940 = 0x502E
+0x5941 = 0x502D
+0x5942 = 0x4FFE
+0x5943 = 0x501C
+0x5944 = 0x500C
+0x5945 = 0x5025
+0x5946 = 0x5028
+0x5947 = 0x507E
+0x5948 = 0x5043
+0x5949 = 0x5055
+0x594A = 0x5048
+0x594B = 0x504E
+0x594C = 0x506C
+0x594D = 0x507B
+0x594E = 0x50A5
+0x594F = 0x50A7
+0x5950 = 0x50A9
+0x5951 = 0x50BA
+0x5952 = 0x50D6
+0x5953 = 0x5106
+0x5954 = 0x50ED
+0x5955 = 0x50EC
+0x5956 = 0x50E6
+0x5957 = 0x50EE
+0x5958 = 0x5107
+0x5959 = 0x510B
+0x595A = 0x4EDD
+0x595B = 0x6C3D
+0x595C = 0x4F58
+0x595D = 0x4F65
+0x595E = 0x4FCE
+0x595F = 0x9FA0
+0x5960 = 0x6C46
+0x5961 = 0x7C74
+0x5962 = 0x516E
+0x5963 = 0x5DFD
+0x5964 = 0x9EC9
+0x5965 = 0x9998
+0x5966 = 0x5181
+0x5967 = 0x5914
+0x5968 = 0x52F9
+0x5969 = 0x530D
+0x596A = 0x8A07
+0x596B = 0x5310
+0x596C = 0x51EB
+0x596D = 0x5919
+0x596E = 0x5155
+0x596F = 0x4EA0
+0x5970 = 0x5156
+0x5971 = 0x4EB3
+0x5972 = 0x886E
+0x5973 = 0x88A4
+0x5974 = 0x4EB5
+0x5975 = 0x8114
+0x5976 = 0x88D2
+0x5977 = 0x7980
+0x5978 = 0x5B34
+0x5979 = 0x8803
+0x597A = 0x7FB8
+0x597B = 0x51AB
+0x597C = 0x51B1
+0x597D = 0x51BD
+0x597E = 0x51BC
+0x5A21 = 0x51C7
+0x5A22 = 0x5196
+0x5A23 = 0x51A2
+0x5A24 = 0x51A5
+0x5A25 = 0x8BA0
+0x5A26 = 0x8BA6
+0x5A27 = 0x8BA7
+0x5A28 = 0x8BAA
+0x5A29 = 0x8BB4
+0x5A2A = 0x8BB5
+0x5A2B = 0x8BB7
+0x5A2C = 0x8BC2
+0x5A2D = 0x8BC3
+0x5A2E = 0x8BCB
+0x5A2F = 0x8BCF
+0x5A30 = 0x8BCE
+0x5A31 = 0x8BD2
+0x5A32 = 0x8BD3
+0x5A33 = 0x8BD4
+0x5A34 = 0x8BD6
+0x5A35 = 0x8BD8
+0x5A36 = 0x8BD9
+0x5A37 = 0x8BDC
+0x5A38 = 0x8BDF
+0x5A39 = 0x8BE0
+0x5A3A = 0x8BE4
+0x5A3B = 0x8BE8
+0x5A3C = 0x8BE9
+0x5A3D = 0x8BEE
+0x5A3E = 0x8BF0
+0x5A3F = 0x8BF3
+0x5A40 = 0x8BF6
+0x5A41 = 0x8BF9
+0x5A42 = 0x8BFC
+0x5A43 = 0x8BFF
+0x5A44 = 0x8C00
+0x5A45 = 0x8C02
+0x5A46 = 0x8C04
+0x5A47 = 0x8C07
+0x5A48 = 0x8C0C
+0x5A49 = 0x8C0F
+0x5A4A = 0x8C11
+0x5A4B = 0x8C12
+0x5A4C = 0x8C14
+0x5A4D = 0x8C15
+0x5A4E = 0x8C16
+0x5A4F = 0x8C19
+0x5A50 = 0x8C1B
+0x5A51 = 0x8C18
+0x5A52 = 0x8C1D
+0x5A53 = 0x8C1F
+0x5A54 = 0x8C20
+0x5A55 = 0x8C21
+0x5A56 = 0x8C25
+0x5A57 = 0x8C27
+0x5A58 = 0x8C2A
+0x5A59 = 0x8C2B
+0x5A5A = 0x8C2E
+0x5A5B = 0x8C2F
+0x5A5C = 0x8C32
+0x5A5D = 0x8C33
+0x5A5E = 0x8C35
+0x5A5F = 0x8C36
+0x5A60 = 0x5369
+0x5A61 = 0x537A
+0x5A62 = 0x961D
+0x5A63 = 0x9622
+0x5A64 = 0x9621
+0x5A65 = 0x9631
+0x5A66 = 0x962A
+0x5A67 = 0x963D
+0x5A68 = 0x963C
+0x5A69 = 0x9642
+0x5A6A = 0x9649
+0x5A6B = 0x9654
+0x5A6C = 0x965F
+0x5A6D = 0x9667
+0x5A6E = 0x966C
+0x5A6F = 0x9672
+0x5A70 = 0x9674
+0x5A71 = 0x9688
+0x5A72 = 0x968D
+0x5A73 = 0x9697
+0x5A74 = 0x96B0
+0x5A75 = 0x9097
+0x5A76 = 0x909B
+0x5A77 = 0x909D
+0x5A78 = 0x9099
+0x5A79 = 0x90AC
+0x5A7A = 0x90A1
+0x5A7B = 0x90B4
+0x5A7C = 0x90B3
+0x5A7D = 0x90B6
+0x5A7E = 0x90BA
+0x5B21 = 0x90B8
+0x5B22 = 0x90B0
+0x5B23 = 0x90CF
+0x5B24 = 0x90C5
+0x5B25 = 0x90BE
+0x5B26 = 0x90D0
+0x5B27 = 0x90C4
+0x5B28 = 0x90C7
+0x5B29 = 0x90D3
+0x5B2A = 0x90E6
+0x5B2B = 0x90E2
+0x5B2C = 0x90DC
+0x5B2D = 0x90D7
+0x5B2E = 0x90DB
+0x5B2F = 0x90EB
+0x5B30 = 0x90EF
+0x5B31 = 0x90FE
+0x5B32 = 0x9104
+0x5B33 = 0x9122
+0x5B34 = 0x911E
+0x5B35 = 0x9123
+0x5B36 = 0x9131
+0x5B37 = 0x912F
+0x5B38 = 0x9139
+0x5B39 = 0x9143
+0x5B3A = 0x9146
+0x5B3B = 0x520D
+0x5B3C = 0x5942
+0x5B3D = 0x52A2
+0x5B3E = 0x52AC
+0x5B3F = 0x52AD
+0x5B40 = 0x52BE
+0x5B41 = 0x54FF
+0x5B42 = 0x52D0
+0x5B43 = 0x52D6
+0x5B44 = 0x52F0
+0x5B45 = 0x53DF
+0x5B46 = 0x71EE
+0x5B47 = 0x77CD
+0x5B48 = 0x5EF4
+0x5B49 = 0x51F5
+0x5B4A = 0x51FC
+0x5B4B = 0x9B2F
+0x5B4C = 0x53B6
+0x5B4D = 0x5F01
+0x5B4E = 0x755A
+0x5B4F = 0x5DEF
+0x5B50 = 0x574C
+0x5B51 = 0x57A9
+0x5B52 = 0x57A1
+0x5B53 = 0x587E
+0x5B54 = 0x58BC
+0x5B55 = 0x58C5
+0x5B56 = 0x58D1
+0x5B57 = 0x5729
+0x5B58 = 0x572C
+0x5B59 = 0x572A
+0x5B5A = 0x5733
+0x5B5B = 0x5739
+0x5B5C = 0x572E
+0x5B5D = 0x572F
+0x5B5E = 0x575C
+0x5B5F = 0x573B
+0x5B60 = 0x5742
+0x5B61 = 0x5769
+0x5B62 = 0x5785
+0x5B63 = 0x576B
+0x5B64 = 0x5786
+0x5B65 = 0x577C
+0x5B66 = 0x577B
+0x5B67 = 0x5768
+0x5B68 = 0x576D
+0x5B69 = 0x5776
+0x5B6A = 0x5773
+0x5B6B = 0x57AD
+0x5B6C = 0x57A4
+0x5B6D = 0x578C
+0x5B6E = 0x57B2
+0x5B6F = 0x57CF
+0x5B70 = 0x57A7
+0x5B71 = 0x57B4
+0x5B72 = 0x5793
+0x5B73 = 0x57A0
+0x5B74 = 0x57D5
+0x5B75 = 0x57D8
+0x5B76 = 0x57DA
+0x5B77 = 0x57D9
+0x5B78 = 0x57D2
+0x5B79 = 0x57B8
+0x5B7A = 0x57F4
+0x5B7B = 0x57EF
+0x5B7C = 0x57F8
+0x5B7D = 0x57E4
+0x5B7E = 0x57DD
+0x5C21 = 0x580B
+0x5C22 = 0x580D
+0x5C23 = 0x57FD
+0x5C24 = 0x57ED
+0x5C25 = 0x5800
+0x5C26 = 0x581E
+0x5C27 = 0x5819
+0x5C28 = 0x5844
+0x5C29 = 0x5820
+0x5C2A = 0x5865
+0x5C2B = 0x586C
+0x5C2C = 0x5881
+0x5C2D = 0x5889
+0x5C2E = 0x589A
+0x5C2F = 0x5880
+0x5C30 = 0x99A8
+0x5C31 = 0x9F19
+0x5C32 = 0x61FF
+0x5C33 = 0x8279
+0x5C34 = 0x827D
+0x5C35 = 0x827F
+0x5C36 = 0x828F
+0x5C37 = 0x828A
+0x5C38 = 0x82A8
+0x5C39 = 0x8284
+0x5C3A = 0x828E
+0x5C3B = 0x8291
+0x5C3C = 0x8297
+0x5C3D = 0x8299
+0x5C3E = 0x82AB
+0x5C3F = 0x82B8
+0x5C40 = 0x82BE
+0x5C41 = 0x82B0
+0x5C42 = 0x82C8
+0x5C43 = 0x82CA
+0x5C44 = 0x82E3
+0x5C45 = 0x8298
+0x5C46 = 0x82B7
+0x5C47 = 0x82AE
+0x5C48 = 0x82CB
+0x5C49 = 0x82CC
+0x5C4A = 0x82C1
+0x5C4B = 0x82A9
+0x5C4C = 0x82B4
+0x5C4D = 0x82A1
+0x5C4E = 0x82AA
+0x5C4F = 0x829F
+0x5C50 = 0x82C4
+0x5C51 = 0x82CE
+0x5C52 = 0x82A4
+0x5C53 = 0x82E1
+0x5C54 = 0x8309
+0x5C55 = 0x82F7
+0x5C56 = 0x82E4
+0x5C57 = 0x830F
+0x5C58 = 0x8307
+0x5C59 = 0x82DC
+0x5C5A = 0x82F4
+0x5C5B = 0x82D2
+0x5C5C = 0x82D8
+0x5C5D = 0x830C
+0x5C5E = 0x82FB
+0x5C5F = 0x82D3
+0x5C60 = 0x8311
+0x5C61 = 0x831A
+0x5C62 = 0x8306
+0x5C63 = 0x8314
+0x5C64 = 0x8315
+0x5C65 = 0x82E0
+0x5C66 = 0x82D5
+0x5C67 = 0x831C
+0x5C68 = 0x8351
+0x5C69 = 0x835B
+0x5C6A = 0x835C
+0x5C6B = 0x8308
+0x5C6C = 0x8392
+0x5C6D = 0x833C
+0x5C6E = 0x8334
+0x5C6F = 0x8331
+0x5C70 = 0x839B
+0x5C71 = 0x835E
+0x5C72 = 0x832F
+0x5C73 = 0x834F
+0x5C74 = 0x8347
+0x5C75 = 0x8343
+0x5C76 = 0x835F
+0x5C77 = 0x8340
+0x5C78 = 0x8317
+0x5C79 = 0x8360
+0x5C7A = 0x832D
+0x5C7B = 0x833A
+0x5C7C = 0x8333
+0x5C7D = 0x8366
+0x5C7E = 0x8365
+0x5D21 = 0x8368
+0x5D22 = 0x831B
+0x5D23 = 0x8369
+0x5D24 = 0x836C
+0x5D25 = 0x836A
+0x5D26 = 0x836D
+0x5D27 = 0x836E
+0x5D28 = 0x83B0
+0x5D29 = 0x8378
+0x5D2A = 0x83B3
+0x5D2B = 0x83B4
+0x5D2C = 0x83A0
+0x5D2D = 0x83AA
+0x5D2E = 0x8393
+0x5D2F = 0x839C
+0x5D30 = 0x8385
+0x5D31 = 0x837C
+0x5D32 = 0x83B6
+0x5D33 = 0x83A9
+0x5D34 = 0x837D
+0x5D35 = 0x83B8
+0x5D36 = 0x837B
+0x5D37 = 0x8398
+0x5D38 = 0x839E
+0x5D39 = 0x83A8
+0x5D3A = 0x83BA
+0x5D3B = 0x83BC
+0x5D3C = 0x83C1
+0x5D3D = 0x8401
+0x5D3E = 0x83E5
+0x5D3F = 0x83D8
+0x5D40 = 0x5807
+0x5D41 = 0x8418
+0x5D42 = 0x840B
+0x5D43 = 0x83DD
+0x5D44 = 0x83FD
+0x5D45 = 0x83D6
+0x5D46 = 0x841C
+0x5D47 = 0x8438
+0x5D48 = 0x8411
+0x5D49 = 0x8406
+0x5D4A = 0x83D4
+0x5D4B = 0x83DF
+0x5D4C = 0x840F
+0x5D4D = 0x8403
+0x5D4E = 0x83F8
+0x5D4F = 0x83F9
+0x5D50 = 0x83EA
+0x5D51 = 0x83C5
+0x5D52 = 0x83C0
+0x5D53 = 0x8426
+0x5D54 = 0x83F0
+0x5D55 = 0x83E1
+0x5D56 = 0x845C
+0x5D57 = 0x8451
+0x5D58 = 0x845A
+0x5D59 = 0x8459
+0x5D5A = 0x8473
+0x5D5B = 0x8487
+0x5D5C = 0x8488
+0x5D5D = 0x847A
+0x5D5E = 0x8489
+0x5D5F = 0x8478
+0x5D60 = 0x843C
+0x5D61 = 0x8446
+0x5D62 = 0x8469
+0x5D63 = 0x8476
+0x5D64 = 0x848C
+0x5D65 = 0x848E
+0x5D66 = 0x8431
+0x5D67 = 0x846D
+0x5D68 = 0x84C1
+0x5D69 = 0x84CD
+0x5D6A = 0x84D0
+0x5D6B = 0x84E6
+0x5D6C = 0x84BD
+0x5D6D = 0x84D3
+0x5D6E = 0x84CA
+0x5D6F = 0x84BF
+0x5D70 = 0x84BA
+0x5D71 = 0x84E0
+0x5D72 = 0x84A1
+0x5D73 = 0x84B9
+0x5D74 = 0x84B4
+0x5D75 = 0x8497
+0x5D76 = 0x84E5
+0x5D77 = 0x84E3
+0x5D78 = 0x850C
+0x5D79 = 0x750D
+0x5D7A = 0x8538
+0x5D7B = 0x84F0
+0x5D7C = 0x8539
+0x5D7D = 0x851F
+0x5D7E = 0x853A
+0x5E21 = 0x8556
+0x5E22 = 0x853B
+0x5E23 = 0x84FF
+0x5E24 = 0x84FC
+0x5E25 = 0x8559
+0x5E26 = 0x8548
+0x5E27 = 0x8568
+0x5E28 = 0x8564
+0x5E29 = 0x855E
+0x5E2A = 0x857A
+0x5E2B = 0x77A2
+0x5E2C = 0x8543
+0x5E2D = 0x8572
+0x5E2E = 0x857B
+0x5E2F = 0x85A4
+0x5E30 = 0x85A8
+0x5E31 = 0x8587
+0x5E32 = 0x858F
+0x5E33 = 0x8579
+0x5E34 = 0x85AE
+0x5E35 = 0x859C
+0x5E36 = 0x8585
+0x5E37 = 0x85B9
+0x5E38 = 0x85B7
+0x5E39 = 0x85B0
+0x5E3A = 0x85D3
+0x5E3B = 0x85C1
+0x5E3C = 0x85DC
+0x5E3D = 0x85FF
+0x5E3E = 0x8627
+0x5E3F = 0x8605
+0x5E40 = 0x8629
+0x5E41 = 0x8616
+0x5E42 = 0x863C
+0x5E43 = 0x5EFE
+0x5E44 = 0x5F08
+0x5E45 = 0x593C
+0x5E46 = 0x5941
+0x5E47 = 0x8037
+0x5E48 = 0x5955
+0x5E49 = 0x595A
+0x5E4A = 0x5958
+0x5E4B = 0x530F
+0x5E4C = 0x5C22
+0x5E4D = 0x5C25
+0x5E4E = 0x5C2C
+0x5E4F = 0x5C34
+0x5E50 = 0x624C
+0x5E51 = 0x626A
+0x5E52 = 0x629F
+0x5E53 = 0x62BB
+0x5E54 = 0x62CA
+0x5E55 = 0x62DA
+0x5E56 = 0x62D7
+0x5E57 = 0x62EE
+0x5E58 = 0x6322
+0x5E59 = 0x62F6
+0x5E5A = 0x6339
+0x5E5B = 0x634B
+0x5E5C = 0x6343
+0x5E5D = 0x63AD
+0x5E5E = 0x63F6
+0x5E5F = 0x6371
+0x5E60 = 0x637A
+0x5E61 = 0x638E
+0x5E62 = 0x63B4
+0x5E63 = 0x636D
+0x5E64 = 0x63AC
+0x5E65 = 0x638A
+0x5E66 = 0x6369
+0x5E67 = 0x63AE
+0x5E68 = 0x63BC
+0x5E69 = 0x63F2
+0x5E6A = 0x63F8
+0x5E6B = 0x63E0
+0x5E6C = 0x63FF
+0x5E6D = 0x63C4
+0x5E6E = 0x63DE
+0x5E6F = 0x63CE
+0x5E70 = 0x6452
+0x5E71 = 0x63C6
+0x5E72 = 0x63BE
+0x5E73 = 0x6445
+0x5E74 = 0x6441
+0x5E75 = 0x640B
+0x5E76 = 0x641B
+0x5E77 = 0x6420
+0x5E78 = 0x640C
+0x5E79 = 0x6426
+0x5E7A = 0x6421
+0x5E7B = 0x645E
+0x5E7C = 0x6484
+0x5E7D = 0x646D
+0x5E7E = 0x6496
+0x5F21 = 0x647A
+0x5F22 = 0x64B7
+0x5F23 = 0x64B8
+0x5F24 = 0x6499
+0x5F25 = 0x64BA
+0x5F26 = 0x64C0
+0x5F27 = 0x64D0
+0x5F28 = 0x64D7
+0x5F29 = 0x64E4
+0x5F2A = 0x64E2
+0x5F2B = 0x6509
+0x5F2C = 0x6525
+0x5F2D = 0x652E
+0x5F2E = 0x5F0B
+0x5F2F = 0x5FD2
+0x5F30 = 0x7519
+0x5F31 = 0x5F11
+0x5F32 = 0x535F
+0x5F33 = 0x53F1
+0x5F34 = 0x53FD
+0x5F35 = 0x53E9
+0x5F36 = 0x53E8
+0x5F37 = 0x53FB
+0x5F38 = 0x5412
+0x5F39 = 0x5416
+0x5F3A = 0x5406
+0x5F3B = 0x544B
+0x5F3C = 0x5452
+0x5F3D = 0x5453
+0x5F3E = 0x5454
+0x5F3F = 0x5456
+0x5F40 = 0x5443
+0x5F41 = 0x5421
+0x5F42 = 0x5457
+0x5F43 = 0x5459
+0x5F44 = 0x5423
+0x5F45 = 0x5432
+0x5F46 = 0x5482
+0x5F47 = 0x5494
+0x5F48 = 0x5477
+0x5F49 = 0x5471
+0x5F4A = 0x5464
+0x5F4B = 0x549A
+0x5F4C = 0x549B
+0x5F4D = 0x5484
+0x5F4E = 0x5476
+0x5F4F = 0x5466
+0x5F50 = 0x549D
+0x5F51 = 0x54D0
+0x5F52 = 0x54AD
+0x5F53 = 0x54C2
+0x5F54 = 0x54B4
+0x5F55 = 0x54D2
+0x5F56 = 0x54A7
+0x5F57 = 0x54A6
+0x5F58 = 0x54D3
+0x5F59 = 0x54D4
+0x5F5A = 0x5472
+0x5F5B = 0x54A3
+0x5F5C = 0x54D5
+0x5F5D = 0x54BB
+0x5F5E = 0x54BF
+0x5F5F = 0x54CC
+0x5F60 = 0x54D9
+0x5F61 = 0x54DA
+0x5F62 = 0x54DC
+0x5F63 = 0x54A9
+0x5F64 = 0x54AA
+0x5F65 = 0x54A4
+0x5F66 = 0x54DD
+0x5F67 = 0x54CF
+0x5F68 = 0x54DE
+0x5F69 = 0x551B
+0x5F6A = 0x54E7
+0x5F6B = 0x5520
+0x5F6C = 0x54FD
+0x5F6D = 0x5514
+0x5F6E = 0x54F3
+0x5F6F = 0x5522
+0x5F70 = 0x5523
+0x5F71 = 0x550F
+0x5F72 = 0x5511
+0x5F73 = 0x5527
+0x5F74 = 0x552A
+0x5F75 = 0x5567
+0x5F76 = 0x558F
+0x5F77 = 0x55B5
+0x5F78 = 0x5549
+0x5F79 = 0x556D
+0x5F7A = 0x5541
+0x5F7B = 0x5555
+0x5F7C = 0x553F
+0x5F7D = 0x5550
+0x5F7E = 0x553C
+0x6021 = 0x5537
+0x6022 = 0x5556
+0x6023 = 0x5575
+0x6024 = 0x5576
+0x6025 = 0x5577
+0x6026 = 0x5533
+0x6027 = 0x5530
+0x6028 = 0x555C
+0x6029 = 0x558B
+0x602A = 0x55D2
+0x602B = 0x5583
+0x602C = 0x55B1
+0x602D = 0x55B9
+0x602E = 0x5588
+0x602F = 0x5581
+0x6030 = 0x559F
+0x6031 = 0x557E
+0x6032 = 0x55D6
+0x6033 = 0x5591
+0x6034 = 0x557B
+0x6035 = 0x55DF
+0x6036 = 0x55BD
+0x6037 = 0x55BE
+0x6038 = 0x5594
+0x6039 = 0x5599
+0x603A = 0x55EA
+0x603B = 0x55F7
+0x603C = 0x55C9
+0x603D = 0x561F
+0x603E = 0x55D1
+0x603F = 0x55EB
+0x6040 = 0x55EC
+0x6041 = 0x55D4
+0x6042 = 0x55E6
+0x6043 = 0x55DD
+0x6044 = 0x55C4
+0x6045 = 0x55EF
+0x6046 = 0x55E5
+0x6047 = 0x55F2
+0x6048 = 0x55F3
+0x6049 = 0x55CC
+0x604A = 0x55CD
+0x604B = 0x55E8
+0x604C = 0x55F5
+0x604D = 0x55E4
+0x604E = 0x8F94
+0x604F = 0x561E
+0x6050 = 0x5608
+0x6051 = 0x560C
+0x6052 = 0x5601
+0x6053 = 0x5624
+0x6054 = 0x5623
+0x6055 = 0x55FE
+0x6056 = 0x5600
+0x6057 = 0x5627
+0x6058 = 0x562D
+0x6059 = 0x5658
+0x605A = 0x5639
+0x605B = 0x5657
+0x605C = 0x562C
+0x605D = 0x564D
+0x605E = 0x5662
+0x605F = 0x5659
+0x6060 = 0x565C
+0x6061 = 0x564C
+0x6062 = 0x5654
+0x6063 = 0x5686
+0x6064 = 0x5664
+0x6065 = 0x5671
+0x6066 = 0x566B
+0x6067 = 0x567B
+0x6068 = 0x567C
+0x6069 = 0x5685
+0x606A = 0x5693
+0x606B = 0x56AF
+0x606C = 0x56D4
+0x606D = 0x56D7
+0x606E = 0x56DD
+0x606F = 0x56E1
+0x6070 = 0x56F5
+0x6071 = 0x56EB
+0x6072 = 0x56F9
+0x6073 = 0x56FF
+0x6074 = 0x5704
+0x6075 = 0x570A
+0x6076 = 0x5709
+0x6077 = 0x571C
+0x6078 = 0x5E0F
+0x6079 = 0x5E19
+0x607A = 0x5E14
+0x607B = 0x5E11
+0x607C = 0x5E31
+0x607D = 0x5E3B
+0x607E = 0x5E3C
+0x6121 = 0x5E37
+0x6122 = 0x5E44
+0x6123 = 0x5E54
+0x6124 = 0x5E5B
+0x6125 = 0x5E5E
+0x6126 = 0x5E61
+0x6127 = 0x5C8C
+0x6128 = 0x5C7A
+0x6129 = 0x5C8D
+0x612A = 0x5C90
+0x612B = 0x5C96
+0x612C = 0x5C88
+0x612D = 0x5C98
+0x612E = 0x5C99
+0x612F = 0x5C91
+0x6130 = 0x5C9A
+0x6131 = 0x5C9C
+0x6132 = 0x5CB5
+0x6133 = 0x5CA2
+0x6134 = 0x5CBD
+0x6135 = 0x5CAC
+0x6136 = 0x5CAB
+0x6137 = 0x5CB1
+0x6138 = 0x5CA3
+0x6139 = 0x5CC1
+0x613A = 0x5CB7
+0x613B = 0x5CC4
+0x613C = 0x5CD2
+0x613D = 0x5CE4
+0x613E = 0x5CCB
+0x613F = 0x5CE5
+0x6140 = 0x5D02
+0x6141 = 0x5D03
+0x6142 = 0x5D27
+0x6143 = 0x5D26
+0x6144 = 0x5D2E
+0x6145 = 0x5D24
+0x6146 = 0x5D1E
+0x6147 = 0x5D06
+0x6148 = 0x5D1B
+0x6149 = 0x5D58
+0x614A = 0x5D3E
+0x614B = 0x5D34
+0x614C = 0x5D3D
+0x614D = 0x5D6C
+0x614E = 0x5D5B
+0x614F = 0x5D6F
+0x6150 = 0x5D5D
+0x6151 = 0x5D6B
+0x6152 = 0x5D4B
+0x6153 = 0x5D4A
+0x6154 = 0x5D69
+0x6155 = 0x5D74
+0x6156 = 0x5D82
+0x6157 = 0x5D99
+0x6158 = 0x5D9D
+0x6159 = 0x8C73
+0x615A = 0x5DB7
+0x615B = 0x5DC5
+0x615C = 0x5F73
+0x615D = 0x5F77
+0x615E = 0x5F82
+0x615F = 0x5F87
+0x6160 = 0x5F89
+0x6161 = 0x5F8C
+0x6162 = 0x5F95
+0x6163 = 0x5F99
+0x6164 = 0x5F9C
+0x6165 = 0x5FA8
+0x6166 = 0x5FAD
+0x6167 = 0x5FB5
+0x6168 = 0x5FBC
+0x6169 = 0x8862
+0x616A = 0x5F61
+0x616B = 0x72AD
+0x616C = 0x72B0
+0x616D = 0x72B4
+0x616E = 0x72B7
+0x616F = 0x72B8
+0x6170 = 0x72C3
+0x6171 = 0x72C1
+0x6172 = 0x72CE
+0x6173 = 0x72CD
+0x6174 = 0x72D2
+0x6175 = 0x72E8
+0x6176 = 0x72EF
+0x6177 = 0x72E9
+0x6178 = 0x72F2
+0x6179 = 0x72F4
+0x617A = 0x72F7
+0x617B = 0x7301
+0x617C = 0x72F3
+0x617D = 0x7303
+0x617E = 0x72FA
+0x6221 = 0x72FB
+0x6222 = 0x7317
+0x6223 = 0x7313
+0x6224 = 0x7321
+0x6225 = 0x730A
+0x6226 = 0x731E
+0x6227 = 0x731D
+0x6228 = 0x7315
+0x6229 = 0x7322
+0x622A = 0x7339
+0x622B = 0x7325
+0x622C = 0x732C
+0x622D = 0x7338
+0x622E = 0x7331
+0x622F = 0x7350
+0x6230 = 0x734D
+0x6231 = 0x7357
+0x6232 = 0x7360
+0x6233 = 0x736C
+0x6234 = 0x736F
+0x6235 = 0x737E
+0x6236 = 0x821B
+0x6237 = 0x5925
+0x6238 = 0x98E7
+0x6239 = 0x5924
+0x623A = 0x5902
+0x623B = 0x9963
+0x623C = 0x9967
+0x623D = 0x9968
+0x623E = 0x9969
+0x623F = 0x996A
+0x6240 = 0x996B
+0x6241 = 0x996C
+0x6242 = 0x9974
+0x6243 = 0x9977
+0x6244 = 0x997D
+0x6245 = 0x9980
+0x6246 = 0x9984
+0x6247 = 0x9987
+0x6248 = 0x998A
+0x6249 = 0x998D
+0x624A = 0x9990
+0x624B = 0x9991
+0x624C = 0x9993
+0x624D = 0x9994
+0x624E = 0x9995
+0x624F = 0x5E80
+0x6250 = 0x5E91
+0x6251 = 0x5E8B
+0x6252 = 0x5E96
+0x6253 = 0x5EA5
+0x6254 = 0x5EA0
+0x6255 = 0x5EB9
+0x6256 = 0x5EB5
+0x6257 = 0x5EBE
+0x6258 = 0x5EB3
+0x6259 = 0x8D53
+0x625A = 0x5ED2
+0x625B = 0x5ED1
+0x625C = 0x5EDB
+0x625D = 0x5EE8
+0x625E = 0x5EEA
+0x625F = 0x81BA
+0x6260 = 0x5FC4
+0x6261 = 0x5FC9
+0x6262 = 0x5FD6
+0x6263 = 0x5FCF
+0x6264 = 0x6003
+0x6265 = 0x5FEE
+0x6266 = 0x6004
+0x6267 = 0x5FE1
+0x6268 = 0x5FE4
+0x6269 = 0x5FFE
+0x626A = 0x6005
+0x626B = 0x6006
+0x626C = 0x5FEA
+0x626D = 0x5FED
+0x626E = 0x5FF8
+0x626F = 0x6019
+0x6270 = 0x6035
+0x6271 = 0x6026
+0x6272 = 0x601B
+0x6273 = 0x600F
+0x6274 = 0x600D
+0x6275 = 0x6029
+0x6276 = 0x602B
+0x6277 = 0x600A
+0x6278 = 0x603F
+0x6279 = 0x6021
+0x627A = 0x6078
+0x627B = 0x6079
+0x627C = 0x607B
+0x627D = 0x607A
+0x627E = 0x6042
+0x6321 = 0x606A
+0x6322 = 0x607D
+0x6323 = 0x6096
+0x6324 = 0x609A
+0x6325 = 0x60AD
+0x6326 = 0x609D
+0x6327 = 0x6083
+0x6328 = 0x6092
+0x6329 = 0x608C
+0x632A = 0x609B
+0x632B = 0x60EC
+0x632C = 0x60BB
+0x632D = 0x60B1
+0x632E = 0x60DD
+0x632F = 0x60D8
+0x6330 = 0x60C6
+0x6331 = 0x60DA
+0x6332 = 0x60B4
+0x6333 = 0x6120
+0x6334 = 0x6126
+0x6335 = 0x6115
+0x6336 = 0x6123
+0x6337 = 0x60F4
+0x6338 = 0x6100
+0x6339 = 0x610E
+0x633A = 0x612B
+0x633B = 0x614A
+0x633C = 0x6175
+0x633D = 0x61AC
+0x633E = 0x6194
+0x633F = 0x61A7
+0x6340 = 0x61B7
+0x6341 = 0x61D4
+0x6342 = 0x61F5
+0x6343 = 0x5FDD
+0x6344 = 0x96B3
+0x6345 = 0x95E9
+0x6346 = 0x95EB
+0x6347 = 0x95F1
+0x6348 = 0x95F3
+0x6349 = 0x95F5
+0x634A = 0x95F6
+0x634B = 0x95FC
+0x634C = 0x95FE
+0x634D = 0x9603
+0x634E = 0x9604
+0x634F = 0x9606
+0x6350 = 0x9608
+0x6351 = 0x960A
+0x6352 = 0x960B
+0x6353 = 0x960C
+0x6354 = 0x960D
+0x6355 = 0x960F
+0x6356 = 0x9612
+0x6357 = 0x9615
+0x6358 = 0x9616
+0x6359 = 0x9617
+0x635A = 0x9619
+0x635B = 0x961A
+0x635C = 0x4E2C
+0x635D = 0x723F
+0x635E = 0x6215
+0x635F = 0x6C35
+0x6360 = 0x6C54
+0x6361 = 0x6C5C
+0x6362 = 0x6C4A
+0x6363 = 0x6CA3
+0x6364 = 0x6C85
+0x6365 = 0x6C90
+0x6366 = 0x6C94
+0x6367 = 0x6C8C
+0x6368 = 0x6C68
+0x6369 = 0x6C69
+0x636A = 0x6C74
+0x636B = 0x6C76
+0x636C = 0x6C86
+0x636D = 0x6CA9
+0x636E = 0x6CD0
+0x636F = 0x6CD4
+0x6370 = 0x6CAD
+0x6371 = 0x6CF7
+0x6372 = 0x6CF8
+0x6373 = 0x6CF1
+0x6374 = 0x6CD7
+0x6375 = 0x6CB2
+0x6376 = 0x6CE0
+0x6377 = 0x6CD6
+0x6378 = 0x6CFA
+0x6379 = 0x6CEB
+0x637A = 0x6CEE
+0x637B = 0x6CB1
+0x637C = 0x6CD3
+0x637D = 0x6CEF
+0x637E = 0x6CFE
+0x6421 = 0x6D39
+0x6422 = 0x6D27
+0x6423 = 0x6D0C
+0x6424 = 0x6D43
+0x6425 = 0x6D48
+0x6426 = 0x6D07
+0x6427 = 0x6D04
+0x6428 = 0x6D19
+0x6429 = 0x6D0E
+0x642A = 0x6D2B
+0x642B = 0x6D4D
+0x642C = 0x6D2E
+0x642D = 0x6D35
+0x642E = 0x6D1A
+0x642F = 0x6D4F
+0x6430 = 0x6D52
+0x6431 = 0x6D54
+0x6432 = 0x6D33
+0x6433 = 0x6D91
+0x6434 = 0x6D6F
+0x6435 = 0x6D9E
+0x6436 = 0x6DA0
+0x6437 = 0x6D5E
+0x6438 = 0x6D93
+0x6439 = 0x6D94
+0x643A = 0x6D5C
+0x643B = 0x6D60
+0x643C = 0x6D7C
+0x643D = 0x6D63
+0x643E = 0x6E1A
+0x643F = 0x6DC7
+0x6440 = 0x6DC5
+0x6441 = 0x6DDE
+0x6442 = 0x6E0E
+0x6443 = 0x6DBF
+0x6444 = 0x6DE0
+0x6445 = 0x6E11
+0x6446 = 0x6DE6
+0x6447 = 0x6DDD
+0x6448 = 0x6DD9
+0x6449 = 0x6E16
+0x644A = 0x6DAB
+0x644B = 0x6E0C
+0x644C = 0x6DAE
+0x644D = 0x6E2B
+0x644E = 0x6E6E
+0x644F = 0x6E4E
+0x6450 = 0x6E6B
+0x6451 = 0x6EB2
+0x6452 = 0x6E5F
+0x6453 = 0x6E86
+0x6454 = 0x6E53
+0x6455 = 0x6E54
+0x6456 = 0x6E32
+0x6457 = 0x6E25
+0x6458 = 0x6E44
+0x6459 = 0x6EDF
+0x645A = 0x6EB1
+0x645B = 0x6E98
+0x645C = 0x6EE0
+0x645D = 0x6F2D
+0x645E = 0x6EE2
+0x645F = 0x6EA5
+0x6460 = 0x6EA7
+0x6461 = 0x6EBD
+0x6462 = 0x6EBB
+0x6463 = 0x6EB7
+0x6464 = 0x6ED7
+0x6465 = 0x6EB4
+0x6466 = 0x6ECF
+0x6467 = 0x6E8F
+0x6468 = 0x6EC2
+0x6469 = 0x6E9F
+0x646A = 0x6F62
+0x646B = 0x6F46
+0x646C = 0x6F47
+0x646D = 0x6F24
+0x646E = 0x6F15
+0x646F = 0x6EF9
+0x6470 = 0x6F2F
+0x6471 = 0x6F36
+0x6472 = 0x6F4B
+0x6473 = 0x6F74
+0x6474 = 0x6F2A
+0x6475 = 0x6F09
+0x6476 = 0x6F29
+0x6477 = 0x6F89
+0x6478 = 0x6F8D
+0x6479 = 0x6F8C
+0x647A = 0x6F78
+0x647B = 0x6F72
+0x647C = 0x6F7C
+0x647D = 0x6F7A
+0x647E = 0x6FD1
+0x6521 = 0x6FC9
+0x6522 = 0x6FA7
+0x6523 = 0x6FB9
+0x6524 = 0x6FB6
+0x6525 = 0x6FC2
+0x6526 = 0x6FE1
+0x6527 = 0x6FEE
+0x6528 = 0x6FDE
+0x6529 = 0x6FE0
+0x652A = 0x6FEF
+0x652B = 0x701A
+0x652C = 0x7023
+0x652D = 0x701B
+0x652E = 0x7039
+0x652F = 0x7035
+0x6530 = 0x704F
+0x6531 = 0x705E
+0x6532 = 0x5B80
+0x6533 = 0x5B84
+0x6534 = 0x5B95
+0x6535 = 0x5B93
+0x6536 = 0x5BA5
+0x6537 = 0x5BB8
+0x6538 = 0x752F
+0x6539 = 0x9A9E
+0x653A = 0x6434
+0x653B = 0x5BE4
+0x653C = 0x5BEE
+0x653D = 0x8930
+0x653E = 0x5BF0
+0x653F = 0x8E47
+0x6540 = 0x8B07
+0x6541 = 0x8FB6
+0x6542 = 0x8FD3
+0x6543 = 0x8FD5
+0x6544 = 0x8FE5
+0x6545 = 0x8FEE
+0x6546 = 0x8FE4
+0x6547 = 0x8FE9
+0x6548 = 0x8FE6
+0x6549 = 0x8FF3
+0x654A = 0x8FE8
+0x654B = 0x9005
+0x654C = 0x9004
+0x654D = 0x900B
+0x654E = 0x9026
+0x654F = 0x9011
+0x6550 = 0x900D
+0x6551 = 0x9016
+0x6552 = 0x9021
+0x6553 = 0x9035
+0x6554 = 0x9036
+0x6555 = 0x902D
+0x6556 = 0x902F
+0x6557 = 0x9044
+0x6558 = 0x9051
+0x6559 = 0x9052
+0x655A = 0x9050
+0x655B = 0x9068
+0x655C = 0x9058
+0x655D = 0x9062
+0x655E = 0x905B
+0x655F = 0x66B9
+0x6560 = 0x9074
+0x6561 = 0x907D
+0x6562 = 0x9082
+0x6563 = 0x9088
+0x6564 = 0x9083
+0x6565 = 0x908B
+0x6566 = 0x5F50
+0x6567 = 0x5F57
+0x6568 = 0x5F56
+0x6569 = 0x5F58
+0x656A = 0x5C3B
+0x656B = 0x54AB
+0x656C = 0x5C50
+0x656D = 0x5C59
+0x656E = 0x5B71
+0x656F = 0x5C63
+0x6570 = 0x5C66
+0x6571 = 0x7FBC
+0x6572 = 0x5F2A
+0x6573 = 0x5F29
+0x6574 = 0x5F2D
+0x6575 = 0x8274
+0x6576 = 0x5F3C
+0x6577 = 0x9B3B
+0x6578 = 0x5C6E
+0x6579 = 0x5981
+0x657A = 0x5983
+0x657B = 0x598D
+0x657C = 0x59A9
+0x657D = 0x59AA
+0x657E = 0x59A3
+0x6621 = 0x5997
+0x6622 = 0x59CA
+0x6623 = 0x59AB
+0x6624 = 0x599E
+0x6625 = 0x59A4
+0x6626 = 0x59D2
+0x6627 = 0x59B2
+0x6628 = 0x59AF
+0x6629 = 0x59D7
+0x662A = 0x59BE
+0x662B = 0x5A05
+0x662C = 0x5A06
+0x662D = 0x59DD
+0x662E = 0x5A08
+0x662F = 0x59E3
+0x6630 = 0x59D8
+0x6631 = 0x59F9
+0x6632 = 0x5A0C
+0x6633 = 0x5A09
+0x6634 = 0x5A32
+0x6635 = 0x5A34
+0x6636 = 0x5A11
+0x6637 = 0x5A23
+0x6638 = 0x5A13
+0x6639 = 0x5A40
+0x663A = 0x5A67
+0x663B = 0x5A4A
+0x663C = 0x5A55
+0x663D = 0x5A3C
+0x663E = 0x5A62
+0x663F = 0x5A75
+0x6640 = 0x80EC
+0x6641 = 0x5AAA
+0x6642 = 0x5A9B
+0x6643 = 0x5A77
+0x6644 = 0x5A7A
+0x6645 = 0x5ABE
+0x6646 = 0x5AEB
+0x6647 = 0x5AB2
+0x6648 = 0x5AD2
+0x6649 = 0x5AD4
+0x664A = 0x5AB8
+0x664B = 0x5AE0
+0x664C = 0x5AE3
+0x664D = 0x5AF1
+0x664E = 0x5AD6
+0x664F = 0x5AE6
+0x6650 = 0x5AD8
+0x6651 = 0x5ADC
+0x6652 = 0x5B09
+0x6653 = 0x5B17
+0x6654 = 0x5B16
+0x6655 = 0x5B32
+0x6656 = 0x5B37
+0x6657 = 0x5B40
+0x6658 = 0x5C15
+0x6659 = 0x5C1C
+0x665A = 0x5B5A
+0x665B = 0x5B65
+0x665C = 0x5B73
+0x665D = 0x5B51
+0x665E = 0x5B53
+0x665F = 0x5B62
+0x6660 = 0x9A75
+0x6661 = 0x9A77
+0x6662 = 0x9A78
+0x6663 = 0x9A7A
+0x6664 = 0x9A7F
+0x6665 = 0x9A7D
+0x6666 = 0x9A80
+0x6667 = 0x9A81
+0x6668 = 0x9A85
+0x6669 = 0x9A88
+0x666A = 0x9A8A
+0x666B = 0x9A90
+0x666C = 0x9A92
+0x666D = 0x9A93
+0x666E = 0x9A96
+0x666F = 0x9A98
+0x6670 = 0x9A9B
+0x6671 = 0x9A9C
+0x6672 = 0x9A9D
+0x6673 = 0x9A9F
+0x6674 = 0x9AA0
+0x6675 = 0x9AA2
+0x6676 = 0x9AA3
+0x6677 = 0x9AA5
+0x6678 = 0x9AA7
+0x6679 = 0x7E9F
+0x667A = 0x7EA1
+0x667B = 0x7EA3
+0x667C = 0x7EA5
+0x667D = 0x7EA8
+0x667E = 0x7EA9
+0x6721 = 0x7EAD
+0x6722 = 0x7EB0
+0x6723 = 0x7EBE
+0x6724 = 0x7EC0
+0x6725 = 0x7EC1
+0x6726 = 0x7EC2
+0x6727 = 0x7EC9
+0x6728 = 0x7ECB
+0x6729 = 0x7ECC
+0x672A = 0x7ED0
+0x672B = 0x7ED4
+0x672C = 0x7ED7
+0x672D = 0x7EDB
+0x672E = 0x7EE0
+0x672F = 0x7EE1
+0x6730 = 0x7EE8
+0x6731 = 0x7EEB
+0x6732 = 0x7EEE
+0x6733 = 0x7EEF
+0x6734 = 0x7EF1
+0x6735 = 0x7EF2
+0x6736 = 0x7F0D
+0x6737 = 0x7EF6
+0x6738 = 0x7EFA
+0x6739 = 0x7EFB
+0x673A = 0x7EFE
+0x673B = 0x7F01
+0x673C = 0x7F02
+0x673D = 0x7F03
+0x673E = 0x7F07
+0x673F = 0x7F08
+0x6740 = 0x7F0B
+0x6741 = 0x7F0C
+0x6742 = 0x7F0F
+0x6743 = 0x7F11
+0x6744 = 0x7F12
+0x6745 = 0x7F17
+0x6746 = 0x7F19
+0x6747 = 0x7F1C
+0x6748 = 0x7F1B
+0x6749 = 0x7F1F
+0x674A = 0x7F21
+0x674B = 0x7F22
+0x674C = 0x7F23
+0x674D = 0x7F24
+0x674E = 0x7F25
+0x674F = 0x7F26
+0x6750 = 0x7F27
+0x6751 = 0x7F2A
+0x6752 = 0x7F2B
+0x6753 = 0x7F2C
+0x6754 = 0x7F2D
+0x6755 = 0x7F2F
+0x6756 = 0x7F30
+0x6757 = 0x7F31
+0x6758 = 0x7F32
+0x6759 = 0x7F33
+0x675A = 0x7F35
+0x675B = 0x5E7A
+0x675C = 0x757F
+0x675D = 0x5DDB
+0x675E = 0x753E
+0x675F = 0x9095
+0x6760 = 0x738E
+0x6761 = 0x7391
+0x6762 = 0x73AE
+0x6763 = 0x73A2
+0x6764 = 0x739F
+0x6765 = 0x73CF
+0x6766 = 0x73C2
+0x6767 = 0x73D1
+0x6768 = 0x73B7
+0x6769 = 0x73B3
+0x676A = 0x73C0
+0x676B = 0x73C9
+0x676C = 0x73C8
+0x676D = 0x73E5
+0x676E = 0x73D9
+0x676F = 0x987C
+0x6770 = 0x740A
+0x6771 = 0x73E9
+0x6772 = 0x73E7
+0x6773 = 0x73DE
+0x6774 = 0x73BA
+0x6775 = 0x73F2
+0x6776 = 0x740F
+0x6777 = 0x742A
+0x6778 = 0x745B
+0x6779 = 0x7426
+0x677A = 0x7425
+0x677B = 0x7428
+0x677C = 0x7430
+0x677D = 0x742E
+0x677E = 0x742C
+0x6821 = 0x741B
+0x6822 = 0x741A
+0x6823 = 0x7441
+0x6824 = 0x745C
+0x6825 = 0x7457
+0x6826 = 0x7455
+0x6827 = 0x7459
+0x6828 = 0x7477
+0x6829 = 0x746D
+0x682A = 0x747E
+0x682B = 0x749C
+0x682C = 0x748E
+0x682D = 0x7480
+0x682E = 0x7481
+0x682F = 0x7487
+0x6830 = 0x748B
+0x6831 = 0x749E
+0x6832 = 0x74A8
+0x6833 = 0x74A9
+0x6834 = 0x7490
+0x6835 = 0x74A7
+0x6836 = 0x74D2
+0x6837 = 0x74BA
+0x6838 = 0x97EA
+0x6839 = 0x97EB
+0x683A = 0x97EC
+0x683B = 0x674C
+0x683C = 0x6753
+0x683D = 0x675E
+0x683E = 0x6748
+0x683F = 0x6769
+0x6840 = 0x67A5
+0x6841 = 0x6787
+0x6842 = 0x676A
+0x6843 = 0x6773
+0x6844 = 0x6798
+0x6845 = 0x67A7
+0x6846 = 0x6775
+0x6847 = 0x67A8
+0x6848 = 0x679E
+0x6849 = 0x67AD
+0x684A = 0x678B
+0x684B = 0x6777
+0x684C = 0x677C
+0x684D = 0x67F0
+0x684E = 0x6809
+0x684F = 0x67D8
+0x6850 = 0x680A
+0x6851 = 0x67E9
+0x6852 = 0x67B0
+0x6853 = 0x680C
+0x6854 = 0x67D9
+0x6855 = 0x67B5
+0x6856 = 0x67DA
+0x6857 = 0x67B3
+0x6858 = 0x67DD
+0x6859 = 0x6800
+0x685A = 0x67C3
+0x685B = 0x67B8
+0x685C = 0x67E2
+0x685D = 0x680E
+0x685E = 0x67C1
+0x685F = 0x67FD
+0x6860 = 0x6832
+0x6861 = 0x6833
+0x6862 = 0x6860
+0x6863 = 0x6861
+0x6864 = 0x684E
+0x6865 = 0x6862
+0x6866 = 0x6844
+0x6867 = 0x6864
+0x6868 = 0x6883
+0x6869 = 0x681D
+0x686A = 0x6855
+0x686B = 0x6866
+0x686C = 0x6841
+0x686D = 0x6867
+0x686E = 0x6840
+0x686F = 0x683E
+0x6870 = 0x684A
+0x6871 = 0x6849
+0x6872 = 0x6829
+0x6873 = 0x68B5
+0x6874 = 0x688F
+0x6875 = 0x6874
+0x6876 = 0x6877
+0x6877 = 0x6893
+0x6878 = 0x686B
+0x6879 = 0x68C2
+0x687A = 0x696E
+0x687B = 0x68FC
+0x687C = 0x691F
+0x687D = 0x6920
+0x687E = 0x68F9
+0x6921 = 0x6924
+0x6922 = 0x68F0
+0x6923 = 0x690B
+0x6924 = 0x6901
+0x6925 = 0x6957
+0x6926 = 0x68E3
+0x6927 = 0x6910
+0x6928 = 0x6971
+0x6929 = 0x6939
+0x692A = 0x6960
+0x692B = 0x6942
+0x692C = 0x695D
+0x692D = 0x6984
+0x692E = 0x696B
+0x692F = 0x6980
+0x6930 = 0x6998
+0x6931 = 0x6978
+0x6932 = 0x6934
+0x6933 = 0x69CC
+0x6934 = 0x6987
+0x6935 = 0x6988
+0x6936 = 0x69CE
+0x6937 = 0x6989
+0x6938 = 0x6966
+0x6939 = 0x6963
+0x693A = 0x6979
+0x693B = 0x699B
+0x693C = 0x69A7
+0x693D = 0x69BB
+0x693E = 0x69AB
+0x693F = 0x69AD
+0x6940 = 0x69D4
+0x6941 = 0x69B1
+0x6942 = 0x69C1
+0x6943 = 0x69CA
+0x6944 = 0x69DF
+0x6945 = 0x6995
+0x6946 = 0x69E0
+0x6947 = 0x698D
+0x6948 = 0x69FF
+0x6949 = 0x6A2F
+0x694A = 0x69ED
+0x694B = 0x6A17
+0x694C = 0x6A18
+0x694D = 0x6A65
+0x694E = 0x69F2
+0x694F = 0x6A44
+0x6950 = 0x6A3E
+0x6951 = 0x6AA0
+0x6952 = 0x6A50
+0x6953 = 0x6A5B
+0x6954 = 0x6A35
+0x6955 = 0x6A8E
+0x6956 = 0x6A79
+0x6957 = 0x6A3D
+0x6958 = 0x6A28
+0x6959 = 0x6A58
+0x695A = 0x6A7C
+0x695B = 0x6A91
+0x695C = 0x6A90
+0x695D = 0x6AA9
+0x695E = 0x6A97
+0x695F = 0x6AAB
+0x6960 = 0x7337
+0x6961 = 0x7352
+0x6962 = 0x6B81
+0x6963 = 0x6B82
+0x6964 = 0x6B87
+0x6965 = 0x6B84
+0x6966 = 0x6B92
+0x6967 = 0x6B93
+0x6968 = 0x6B8D
+0x6969 = 0x6B9A
+0x696A = 0x6B9B
+0x696B = 0x6BA1
+0x696C = 0x6BAA
+0x696D = 0x8F6B
+0x696E = 0x8F6D
+0x696F = 0x8F71
+0x6970 = 0x8F72
+0x6971 = 0x8F73
+0x6972 = 0x8F75
+0x6973 = 0x8F76
+0x6974 = 0x8F78
+0x6975 = 0x8F77
+0x6976 = 0x8F79
+0x6977 = 0x8F7A
+0x6978 = 0x8F7C
+0x6979 = 0x8F7E
+0x697A = 0x8F81
+0x697B = 0x8F82
+0x697C = 0x8F84
+0x697D = 0x8F87
+0x697E = 0x8F8B
+0x6A21 = 0x8F8D
+0x6A22 = 0x8F8E
+0x6A23 = 0x8F8F
+0x6A24 = 0x8F98
+0x6A25 = 0x8F9A
+0x6A26 = 0x8ECE
+0x6A27 = 0x620B
+0x6A28 = 0x6217
+0x6A29 = 0x621B
+0x6A2A = 0x621F
+0x6A2B = 0x6222
+0x6A2C = 0x6221
+0x6A2D = 0x6225
+0x6A2E = 0x6224
+0x6A2F = 0x622C
+0x6A30 = 0x81E7
+0x6A31 = 0x74EF
+0x6A32 = 0x74F4
+0x6A33 = 0x74FF
+0x6A34 = 0x750F
+0x6A35 = 0x7511
+0x6A36 = 0x7513
+0x6A37 = 0x6534
+0x6A38 = 0x65EE
+0x6A39 = 0x65EF
+0x6A3A = 0x65F0
+0x6A3B = 0x660A
+0x6A3C = 0x6619
+0x6A3D = 0x6772
+0x6A3E = 0x6603
+0x6A3F = 0x6615
+0x6A40 = 0x6600
+0x6A41 = 0x7085
+0x6A42 = 0x66F7
+0x6A43 = 0x661D
+0x6A44 = 0x6634
+0x6A45 = 0x6631
+0x6A46 = 0x6636
+0x6A47 = 0x6635
+0x6A48 = 0x8006
+0x6A49 = 0x665F
+0x6A4A = 0x6654
+0x6A4B = 0x6641
+0x6A4C = 0x664F
+0x6A4D = 0x6656
+0x6A4E = 0x6661
+0x6A4F = 0x6657
+0x6A50 = 0x6677
+0x6A51 = 0x6684
+0x6A52 = 0x668C
+0x6A53 = 0x66A7
+0x6A54 = 0x669D
+0x6A55 = 0x66BE
+0x6A56 = 0x66DB
+0x6A57 = 0x66DC
+0x6A58 = 0x66E6
+0x6A59 = 0x66E9
+0x6A5A = 0x8D32
+0x6A5B = 0x8D33
+0x6A5C = 0x8D36
+0x6A5D = 0x8D3B
+0x6A5E = 0x8D3D
+0x6A5F = 0x8D40
+0x6A60 = 0x8D45
+0x6A61 = 0x8D46
+0x6A62 = 0x8D48
+0x6A63 = 0x8D49
+0x6A64 = 0x8D47
+0x6A65 = 0x8D4D
+0x6A66 = 0x8D55
+0x6A67 = 0x8D59
+0x6A68 = 0x89C7
+0x6A69 = 0x89CA
+0x6A6A = 0x89CB
+0x6A6B = 0x89CC
+0x6A6C = 0x89CE
+0x6A6D = 0x89CF
+0x6A6E = 0x89D0
+0x6A6F = 0x89D1
+0x6A70 = 0x726E
+0x6A71 = 0x729F
+0x6A72 = 0x725D
+0x6A73 = 0x7266
+0x6A74 = 0x726F
+0x6A75 = 0x727E
+0x6A76 = 0x727F
+0x6A77 = 0x7284
+0x6A78 = 0x728B
+0x6A79 = 0x728D
+0x6A7A = 0x728F
+0x6A7B = 0x7292
+0x6A7C = 0x6308
+0x6A7D = 0x6332
+0x6A7E = 0x63B0
+0x6B21 = 0x643F
+0x6B22 = 0x64D8
+0x6B23 = 0x8004
+0x6B24 = 0x6BEA
+0x6B25 = 0x6BF3
+0x6B26 = 0x6BFD
+0x6B27 = 0x6BF5
+0x6B28 = 0x6BF9
+0x6B29 = 0x6C05
+0x6B2A = 0x6C07
+0x6B2B = 0x6C06
+0x6B2C = 0x6C0D
+0x6B2D = 0x6C15
+0x6B2E = 0x6C18
+0x6B2F = 0x6C19
+0x6B30 = 0x6C1A
+0x6B31 = 0x6C21
+0x6B32 = 0x6C29
+0x6B33 = 0x6C24
+0x6B34 = 0x6C2A
+0x6B35 = 0x6C32
+0x6B36 = 0x6535
+0x6B37 = 0x6555
+0x6B38 = 0x656B
+0x6B39 = 0x724D
+0x6B3A = 0x7252
+0x6B3B = 0x7256
+0x6B3C = 0x7230
+0x6B3D = 0x8662
+0x6B3E = 0x5216
+0x6B3F = 0x809F
+0x6B40 = 0x809C
+0x6B41 = 0x8093
+0x6B42 = 0x80BC
+0x6B43 = 0x670A
+0x6B44 = 0x80BD
+0x6B45 = 0x80B1
+0x6B46 = 0x80AB
+0x6B47 = 0x80AD
+0x6B48 = 0x80B4
+0x6B49 = 0x80B7
+0x6B4A = 0x80E7
+0x6B4B = 0x80E8
+0x6B4C = 0x80E9
+0x6B4D = 0x80EA
+0x6B4E = 0x80DB
+0x6B4F = 0x80C2
+0x6B50 = 0x80C4
+0x6B51 = 0x80D9
+0x6B52 = 0x80CD
+0x6B53 = 0x80D7
+0x6B54 = 0x6710
+0x6B55 = 0x80DD
+0x6B56 = 0x80EB
+0x6B57 = 0x80F1
+0x6B58 = 0x80F4
+0x6B59 = 0x80ED
+0x6B5A = 0x810D
+0x6B5B = 0x810E
+0x6B5C = 0x80F2
+0x6B5D = 0x80FC
+0x6B5E = 0x6715
+0x6B5F = 0x8112
+0x6B60 = 0x8C5A
+0x6B61 = 0x8136
+0x6B62 = 0x811E
+0x6B63 = 0x812C
+0x6B64 = 0x8118
+0x6B65 = 0x8132
+0x6B66 = 0x8148
+0x6B67 = 0x814C
+0x6B68 = 0x8153
+0x6B69 = 0x8174
+0x6B6A = 0x8159
+0x6B6B = 0x815A
+0x6B6C = 0x8171
+0x6B6D = 0x8160
+0x6B6E = 0x8169
+0x6B6F = 0x817C
+0x6B70 = 0x817D
+0x6B71 = 0x816D
+0x6B72 = 0x8167
+0x6B73 = 0x584D
+0x6B74 = 0x5AB5
+0x6B75 = 0x8188
+0x6B76 = 0x8182
+0x6B77 = 0x8191
+0x6B78 = 0x6ED5
+0x6B79 = 0x81A3
+0x6B7A = 0x81AA
+0x6B7B = 0x81CC
+0x6B7C = 0x6726
+0x6B7D = 0x81CA
+0x6B7E = 0x81BB
+0x6C21 = 0x81C1
+0x6C22 = 0x81A6
+0x6C23 = 0x6B24
+0x6C24 = 0x6B37
+0x6C25 = 0x6B39
+0x6C26 = 0x6B43
+0x6C27 = 0x6B46
+0x6C28 = 0x6B59
+0x6C29 = 0x98D1
+0x6C2A = 0x98D2
+0x6C2B = 0x98D3
+0x6C2C = 0x98D5
+0x6C2D = 0x98D9
+0x6C2E = 0x98DA
+0x6C2F = 0x6BB3
+0x6C30 = 0x5F40
+0x6C31 = 0x6BC2
+0x6C32 = 0x89F3
+0x6C33 = 0x6590
+0x6C34 = 0x9F51
+0x6C35 = 0x6593
+0x6C36 = 0x65BC
+0x6C37 = 0x65C6
+0x6C38 = 0x65C4
+0x6C39 = 0x65C3
+0x6C3A = 0x65CC
+0x6C3B = 0x65CE
+0x6C3C = 0x65D2
+0x6C3D = 0x65D6
+0x6C3E = 0x7080
+0x6C3F = 0x709C
+0x6C40 = 0x7096
+0x6C41 = 0x709D
+0x6C42 = 0x70BB
+0x6C43 = 0x70C0
+0x6C44 = 0x70B7
+0x6C45 = 0x70AB
+0x6C46 = 0x70B1
+0x6C47 = 0x70E8
+0x6C48 = 0x70CA
+0x6C49 = 0x7110
+0x6C4A = 0x7113
+0x6C4B = 0x7116
+0x6C4C = 0x712F
+0x6C4D = 0x7131
+0x6C4E = 0x7173
+0x6C4F = 0x715C
+0x6C50 = 0x7168
+0x6C51 = 0x7145
+0x6C52 = 0x7172
+0x6C53 = 0x714A
+0x6C54 = 0x7178
+0x6C55 = 0x717A
+0x6C56 = 0x7198
+0x6C57 = 0x71B3
+0x6C58 = 0x71B5
+0x6C59 = 0x71A8
+0x6C5A = 0x71A0
+0x6C5B = 0x71E0
+0x6C5C = 0x71D4
+0x6C5D = 0x71E7
+0x6C5E = 0x71F9
+0x6C5F = 0x721D
+0x6C60 = 0x7228
+0x6C61 = 0x706C
+0x6C62 = 0x7118
+0x6C63 = 0x7166
+0x6C64 = 0x71B9
+0x6C65 = 0x623E
+0x6C66 = 0x623D
+0x6C67 = 0x6243
+0x6C68 = 0x6248
+0x6C69 = 0x6249
+0x6C6A = 0x793B
+0x6C6B = 0x7940
+0x6C6C = 0x7946
+0x6C6D = 0x7949
+0x6C6E = 0x795B
+0x6C6F = 0x795C
+0x6C70 = 0x7953
+0x6C71 = 0x795A
+0x6C72 = 0x7962
+0x6C73 = 0x7957
+0x6C74 = 0x7960
+0x6C75 = 0x796F
+0x6C76 = 0x7967
+0x6C77 = 0x797A
+0x6C78 = 0x7985
+0x6C79 = 0x798A
+0x6C7A = 0x799A
+0x6C7B = 0x79A7
+0x6C7C = 0x79B3
+0x6C7D = 0x5FD1
+0x6C7E = 0x5FD0
+0x6D21 = 0x603C
+0x6D22 = 0x605D
+0x6D23 = 0x605A
+0x6D24 = 0x6067
+0x6D25 = 0x6041
+0x6D26 = 0x6059
+0x6D27 = 0x6063
+0x6D28 = 0x60AB
+0x6D29 = 0x6106
+0x6D2A = 0x610D
+0x6D2B = 0x615D
+0x6D2C = 0x61A9
+0x6D2D = 0x619D
+0x6D2E = 0x61CB
+0x6D2F = 0x61D1
+0x6D30 = 0x6206
+0x6D31 = 0x8080
+0x6D32 = 0x807F
+0x6D33 = 0x6C93
+0x6D34 = 0x6CF6
+0x6D35 = 0x6DFC
+0x6D36 = 0x77F6
+0x6D37 = 0x77F8
+0x6D38 = 0x7800
+0x6D39 = 0x7809
+0x6D3A = 0x7817
+0x6D3B = 0x7818
+0x6D3C = 0x7811
+0x6D3D = 0x65AB
+0x6D3E = 0x782D
+0x6D3F = 0x781C
+0x6D40 = 0x781D
+0x6D41 = 0x7839
+0x6D42 = 0x783A
+0x6D43 = 0x783B
+0x6D44 = 0x781F
+0x6D45 = 0x783C
+0x6D46 = 0x7825
+0x6D47 = 0x782C
+0x6D48 = 0x7823
+0x6D49 = 0x7829
+0x6D4A = 0x784E
+0x6D4B = 0x786D
+0x6D4C = 0x7856
+0x6D4D = 0x7857
+0x6D4E = 0x7826
+0x6D4F = 0x7850
+0x6D50 = 0x7847
+0x6D51 = 0x784C
+0x6D52 = 0x786A
+0x6D53 = 0x789B
+0x6D54 = 0x7893
+0x6D55 = 0x789A
+0x6D56 = 0x7887
+0x6D57 = 0x789C
+0x6D58 = 0x78A1
+0x6D59 = 0x78A3
+0x6D5A = 0x78B2
+0x6D5B = 0x78B9
+0x6D5C = 0x78A5
+0x6D5D = 0x78D4
+0x6D5E = 0x78D9
+0x6D5F = 0x78C9
+0x6D60 = 0x78EC
+0x6D61 = 0x78F2
+0x6D62 = 0x7905
+0x6D63 = 0x78F4
+0x6D64 = 0x7913
+0x6D65 = 0x7924
+0x6D66 = 0x791E
+0x6D67 = 0x7934
+0x6D68 = 0x9F9B
+0x6D69 = 0x9EF9
+0x6D6A = 0x9EFB
+0x6D6B = 0x9EFC
+0x6D6C = 0x76F1
+0x6D6D = 0x7704
+0x6D6E = 0x770D
+0x6D6F = 0x76F9
+0x6D70 = 0x7707
+0x6D71 = 0x7708
+0x6D72 = 0x771A
+0x6D73 = 0x7722
+0x6D74 = 0x7719
+0x6D75 = 0x772D
+0x6D76 = 0x7726
+0x6D77 = 0x7735
+0x6D78 = 0x7738
+0x6D79 = 0x7750
+0x6D7A = 0x7751
+0x6D7B = 0x7747
+0x6D7C = 0x7743
+0x6D7D = 0x775A
+0x6D7E = 0x7768
+0x6E21 = 0x7762
+0x6E22 = 0x7765
+0x6E23 = 0x777F
+0x6E24 = 0x778D
+0x6E25 = 0x777D
+0x6E26 = 0x7780
+0x6E27 = 0x778C
+0x6E28 = 0x7791
+0x6E29 = 0x779F
+0x6E2A = 0x77A0
+0x6E2B = 0x77B0
+0x6E2C = 0x77B5
+0x6E2D = 0x77BD
+0x6E2E = 0x753A
+0x6E2F = 0x7540
+0x6E30 = 0x754E
+0x6E31 = 0x754B
+0x6E32 = 0x7548
+0x6E33 = 0x755B
+0x6E34 = 0x7572
+0x6E35 = 0x7579
+0x6E36 = 0x7583
+0x6E37 = 0x7F58
+0x6E38 = 0x7F61
+0x6E39 = 0x7F5F
+0x6E3A = 0x8A48
+0x6E3B = 0x7F68
+0x6E3C = 0x7F74
+0x6E3D = 0x7F71
+0x6E3E = 0x7F79
+0x6E3F = 0x7F81
+0x6E40 = 0x7F7E
+0x6E41 = 0x76CD
+0x6E42 = 0x76E5
+0x6E43 = 0x8832
+0x6E44 = 0x9485
+0x6E45 = 0x9486
+0x6E46 = 0x9487
+0x6E47 = 0x948B
+0x6E48 = 0x948A
+0x6E49 = 0x948C
+0x6E4A = 0x948D
+0x6E4B = 0x948F
+0x6E4C = 0x9490
+0x6E4D = 0x9494
+0x6E4E = 0x9497
+0x6E4F = 0x9495
+0x6E50 = 0x949A
+0x6E51 = 0x949B
+0x6E52 = 0x949C
+0x6E53 = 0x94A3
+0x6E54 = 0x94A4
+0x6E55 = 0x94AB
+0x6E56 = 0x94AA
+0x6E57 = 0x94AD
+0x6E58 = 0x94AC
+0x6E59 = 0x94AF
+0x6E5A = 0x94B0
+0x6E5B = 0x94B2
+0x6E5C = 0x94B4
+0x6E5D = 0x94B6
+0x6E5E = 0x94B7
+0x6E5F = 0x94B8
+0x6E60 = 0x94B9
+0x6E61 = 0x94BA
+0x6E62 = 0x94BC
+0x6E63 = 0x94BD
+0x6E64 = 0x94BF
+0x6E65 = 0x94C4
+0x6E66 = 0x94C8
+0x6E67 = 0x94C9
+0x6E68 = 0x94CA
+0x6E69 = 0x94CB
+0x6E6A = 0x94CC
+0x6E6B = 0x94CD
+0x6E6C = 0x94CE
+0x6E6D = 0x94D0
+0x6E6E = 0x94D1
+0x6E6F = 0x94D2
+0x6E70 = 0x94D5
+0x6E71 = 0x94D6
+0x6E72 = 0x94D7
+0x6E73 = 0x94D9
+0x6E74 = 0x94D8
+0x6E75 = 0x94DB
+0x6E76 = 0x94DE
+0x6E77 = 0x94DF
+0x6E78 = 0x94E0
+0x6E79 = 0x94E2
+0x6E7A = 0x94E4
+0x6E7B = 0x94E5
+0x6E7C = 0x94E7
+0x6E7D = 0x94E8
+0x6E7E = 0x94EA
+0x6F21 = 0x94E9
+0x6F22 = 0x94EB
+0x6F23 = 0x94EE
+0x6F24 = 0x94EF
+0x6F25 = 0x94F3
+0x6F26 = 0x94F4
+0x6F27 = 0x94F5
+0x6F28 = 0x94F7
+0x6F29 = 0x94F9
+0x6F2A = 0x94FC
+0x6F2B = 0x94FD
+0x6F2C = 0x94FF
+0x6F2D = 0x9503
+0x6F2E = 0x9502
+0x6F2F = 0x9506
+0x6F30 = 0x9507
+0x6F31 = 0x9509
+0x6F32 = 0x950A
+0x6F33 = 0x950D
+0x6F34 = 0x950E
+0x6F35 = 0x950F
+0x6F36 = 0x9512
+0x6F37 = 0x9513
+0x6F38 = 0x9514
+0x6F39 = 0x9515
+0x6F3A = 0x9516
+0x6F3B = 0x9518
+0x6F3C = 0x951B
+0x6F3D = 0x951D
+0x6F3E = 0x951E
+0x6F3F = 0x951F
+0x6F40 = 0x9522
+0x6F41 = 0x952A
+0x6F42 = 0x952B
+0x6F43 = 0x9529
+0x6F44 = 0x952C
+0x6F45 = 0x9531
+0x6F46 = 0x9532
+0x6F47 = 0x9534
+0x6F48 = 0x9536
+0x6F49 = 0x9537
+0x6F4A = 0x9538
+0x6F4B = 0x953C
+0x6F4C = 0x953E
+0x6F4D = 0x953F
+0x6F4E = 0x9542
+0x6F4F = 0x9535
+0x6F50 = 0x9544
+0x6F51 = 0x9545
+0x6F52 = 0x9546
+0x6F53 = 0x9549
+0x6F54 = 0x954C
+0x6F55 = 0x954E
+0x6F56 = 0x954F
+0x6F57 = 0x9552
+0x6F58 = 0x9553
+0x6F59 = 0x9554
+0x6F5A = 0x9556
+0x6F5B = 0x9557
+0x6F5C = 0x9558
+0x6F5D = 0x9559
+0x6F5E = 0x955B
+0x6F5F = 0x955E
+0x6F60 = 0x955F
+0x6F61 = 0x955D
+0x6F62 = 0x9561
+0x6F63 = 0x9562
+0x6F64 = 0x9564
+0x6F65 = 0x9565
+0x6F66 = 0x9566
+0x6F67 = 0x9567
+0x6F68 = 0x9568
+0x6F69 = 0x9569
+0x6F6A = 0x956A
+0x6F6B = 0x956B
+0x6F6C = 0x956C
+0x6F6D = 0x956F
+0x6F6E = 0x9571
+0x6F6F = 0x9572
+0x6F70 = 0x9573
+0x6F71 = 0x953A
+0x6F72 = 0x77E7
+0x6F73 = 0x77EC
+0x6F74 = 0x96C9
+0x6F75 = 0x79D5
+0x6F76 = 0x79ED
+0x6F77 = 0x79E3
+0x6F78 = 0x79EB
+0x6F79 = 0x7A06
+0x6F7A = 0x5D47
+0x6F7B = 0x7A03
+0x6F7C = 0x7A02
+0x6F7D = 0x7A1E
+0x6F7E = 0x7A14
+0x7021 = 0x7A39
+0x7022 = 0x7A37
+0x7023 = 0x7A51
+0x7024 = 0x9ECF
+0x7025 = 0x99A5
+0x7026 = 0x7A70
+0x7027 = 0x7688
+0x7028 = 0x768E
+0x7029 = 0x7693
+0x702A = 0x7699
+0x702B = 0x76A4
+0x702C = 0x74DE
+0x702D = 0x74E0
+0x702E = 0x752C
+0x702F = 0x9E20
+0x7030 = 0x9E22
+0x7031 = 0x9E28
+0x7032 = 0x9E29
+0x7033 = 0x9E2A
+0x7034 = 0x9E2B
+0x7035 = 0x9E2C
+0x7036 = 0x9E32
+0x7037 = 0x9E31
+0x7038 = 0x9E36
+0x7039 = 0x9E38
+0x703A = 0x9E37
+0x703B = 0x9E39
+0x703C = 0x9E3A
+0x703D = 0x9E3E
+0x703E = 0x9E41
+0x703F = 0x9E42
+0x7040 = 0x9E44
+0x7041 = 0x9E46
+0x7042 = 0x9E47
+0x7043 = 0x9E48
+0x7044 = 0x9E49
+0x7045 = 0x9E4B
+0x7046 = 0x9E4C
+0x7047 = 0x9E4E
+0x7048 = 0x9E51
+0x7049 = 0x9E55
+0x704A = 0x9E57
+0x704B = 0x9E5A
+0x704C = 0x9E5B
+0x704D = 0x9E5C
+0x704E = 0x9E5E
+0x704F = 0x9E63
+0x7050 = 0x9E66
+0x7051 = 0x9E67
+0x7052 = 0x9E68
+0x7053 = 0x9E69
+0x7054 = 0x9E6A
+0x7055 = 0x9E6B
+0x7056 = 0x9E6C
+0x7057 = 0x9E71
+0x7058 = 0x9E6D
+0x7059 = 0x9E73
+0x705A = 0x7592
+0x705B = 0x7594
+0x705C = 0x7596
+0x705D = 0x75A0
+0x705E = 0x759D
+0x705F = 0x75AC
+0x7060 = 0x75A3
+0x7061 = 0x75B3
+0x7062 = 0x75B4
+0x7063 = 0x75B8
+0x7064 = 0x75C4
+0x7065 = 0x75B1
+0x7066 = 0x75B0
+0x7067 = 0x75C3
+0x7068 = 0x75C2
+0x7069 = 0x75D6
+0x706A = 0x75CD
+0x706B = 0x75E3
+0x706C = 0x75E8
+0x706D = 0x75E6
+0x706E = 0x75E4
+0x706F = 0x75EB
+0x7070 = 0x75E7
+0x7071 = 0x7603
+0x7072 = 0x75F1
+0x7073 = 0x75FC
+0x7074 = 0x75FF
+0x7075 = 0x7610
+0x7076 = 0x7600
+0x7077 = 0x7605
+0x7078 = 0x760C
+0x7079 = 0x7617
+0x707A = 0x760A
+0x707B = 0x7625
+0x707C = 0x7618
+0x707D = 0x7615
+0x707E = 0x7619
+0x7121 = 0x761B
+0x7122 = 0x763C
+0x7123 = 0x7622
+0x7124 = 0x7620
+0x7125 = 0x7640
+0x7126 = 0x762D
+0x7127 = 0x7630
+0x7128 = 0x763F
+0x7129 = 0x7635
+0x712A = 0x7643
+0x712B = 0x763E
+0x712C = 0x7633
+0x712D = 0x764D
+0x712E = 0x765E
+0x712F = 0x7654
+0x7130 = 0x765C
+0x7131 = 0x7656
+0x7132 = 0x766B
+0x7133 = 0x766F
+0x7134 = 0x7FCA
+0x7135 = 0x7AE6
+0x7136 = 0x7A78
+0x7137 = 0x7A79
+0x7138 = 0x7A80
+0x7139 = 0x7A86
+0x713A = 0x7A88
+0x713B = 0x7A95
+0x713C = 0x7AA6
+0x713D = 0x7AA0
+0x713E = 0x7AAC
+0x713F = 0x7AA8
+0x7140 = 0x7AAD
+0x7141 = 0x7AB3
+0x7142 = 0x8864
+0x7143 = 0x8869
+0x7144 = 0x8872
+0x7145 = 0x887D
+0x7146 = 0x887F
+0x7147 = 0x8882
+0x7148 = 0x88A2
+0x7149 = 0x88C6
+0x714A = 0x88B7
+0x714B = 0x88BC
+0x714C = 0x88C9
+0x714D = 0x88E2
+0x714E = 0x88CE
+0x714F = 0x88E3
+0x7150 = 0x88E5
+0x7151 = 0x88F1
+0x7152 = 0x891A
+0x7153 = 0x88FC
+0x7154 = 0x88E8
+0x7155 = 0x88FE
+0x7156 = 0x88F0
+0x7157 = 0x8921
+0x7158 = 0x8919
+0x7159 = 0x8913
+0x715A = 0x891B
+0x715B = 0x890A
+0x715C = 0x8934
+0x715D = 0x892B
+0x715E = 0x8936
+0x715F = 0x8941
+0x7160 = 0x8966
+0x7161 = 0x897B
+0x7162 = 0x758B
+0x7163 = 0x80E5
+0x7164 = 0x76B2
+0x7165 = 0x76B4
+0x7166 = 0x77DC
+0x7167 = 0x8012
+0x7168 = 0x8014
+0x7169 = 0x8016
+0x716A = 0x801C
+0x716B = 0x8020
+0x716C = 0x8022
+0x716D = 0x8025
+0x716E = 0x8026
+0x716F = 0x8027
+0x7170 = 0x8029
+0x7171 = 0x8028
+0x7172 = 0x8031
+0x7173 = 0x800B
+0x7174 = 0x8035
+0x7175 = 0x8043
+0x7176 = 0x8046
+0x7177 = 0x804D
+0x7178 = 0x8052
+0x7179 = 0x8069
+0x717A = 0x8071
+0x717B = 0x8983
+0x717C = 0x9878
+0x717D = 0x9880
+0x717E = 0x9883
+0x7221 = 0x9889
+0x7222 = 0x988C
+0x7223 = 0x988D
+0x7224 = 0x988F
+0x7225 = 0x9894
+0x7226 = 0x989A
+0x7227 = 0x989B
+0x7228 = 0x989E
+0x7229 = 0x989F
+0x722A = 0x98A1
+0x722B = 0x98A2
+0x722C = 0x98A5
+0x722D = 0x98A6
+0x722E = 0x864D
+0x722F = 0x8654
+0x7230 = 0x866C
+0x7231 = 0x866E
+0x7232 = 0x867F
+0x7233 = 0x867A
+0x7234 = 0x867C
+0x7235 = 0x867B
+0x7236 = 0x86A8
+0x7237 = 0x868D
+0x7238 = 0x868B
+0x7239 = 0x86AC
+0x723A = 0x869D
+0x723B = 0x86A7
+0x723C = 0x86A3
+0x723D = 0x86AA
+0x723E = 0x8693
+0x723F = 0x86A9
+0x7240 = 0x86B6
+0x7241 = 0x86C4
+0x7242 = 0x86B5
+0x7243 = 0x86CE
+0x7244 = 0x86B0
+0x7245 = 0x86BA
+0x7246 = 0x86B1
+0x7247 = 0x86AF
+0x7248 = 0x86C9
+0x7249 = 0x86CF
+0x724A = 0x86B4
+0x724B = 0x86E9
+0x724C = 0x86F1
+0x724D = 0x86F2
+0x724E = 0x86ED
+0x724F = 0x86F3
+0x7250 = 0x86D0
+0x7251 = 0x8713
+0x7252 = 0x86DE
+0x7253 = 0x86F4
+0x7254 = 0x86DF
+0x7255 = 0x86D8
+0x7256 = 0x86D1
+0x7257 = 0x8703
+0x7258 = 0x8707
+0x7259 = 0x86F8
+0x725A = 0x8708
+0x725B = 0x870A
+0x725C = 0x870D
+0x725D = 0x8709
+0x725E = 0x8723
+0x725F = 0x873B
+0x7260 = 0x871E
+0x7261 = 0x8725
+0x7262 = 0x872E
+0x7263 = 0x871A
+0x7264 = 0x873E
+0x7265 = 0x8748
+0x7266 = 0x8734
+0x7267 = 0x8731
+0x7268 = 0x8729
+0x7269 = 0x8737
+0x726A = 0x873F
+0x726B = 0x8782
+0x726C = 0x8722
+0x726D = 0x877D
+0x726E = 0x877E
+0x726F = 0x877B
+0x7270 = 0x8760
+0x7271 = 0x8770
+0x7272 = 0x874C
+0x7273 = 0x876E
+0x7274 = 0x878B
+0x7275 = 0x8753
+0x7276 = 0x8763
+0x7277 = 0x877C
+0x7278 = 0x8764
+0x7279 = 0x8759
+0x727A = 0x8765
+0x727B = 0x8793
+0x727C = 0x87AF
+0x727D = 0x87A8
+0x727E = 0x87D2
+0x7321 = 0x87C6
+0x7322 = 0x8788
+0x7323 = 0x8785
+0x7324 = 0x87AD
+0x7325 = 0x8797
+0x7326 = 0x8783
+0x7327 = 0x87AB
+0x7328 = 0x87E5
+0x7329 = 0x87AC
+0x732A = 0x87B5
+0x732B = 0x87B3
+0x732C = 0x87CB
+0x732D = 0x87D3
+0x732E = 0x87BD
+0x732F = 0x87D1
+0x7330 = 0x87C0
+0x7331 = 0x87CA
+0x7332 = 0x87DB
+0x7333 = 0x87EA
+0x7334 = 0x87E0
+0x7335 = 0x87EE
+0x7336 = 0x8816
+0x7337 = 0x8813
+0x7338 = 0x87FE
+0x7339 = 0x880A
+0x733A = 0x881B
+0x733B = 0x8821
+0x733C = 0x8839
+0x733D = 0x883C
+0x733E = 0x7F36
+0x733F = 0x7F42
+0x7340 = 0x7F44
+0x7341 = 0x7F45
+0x7342 = 0x8210
+0x7343 = 0x7AFA
+0x7344 = 0x7AFD
+0x7345 = 0x7B08
+0x7346 = 0x7B03
+0x7347 = 0x7B04
+0x7348 = 0x7B15
+0x7349 = 0x7B0A
+0x734A = 0x7B2B
+0x734B = 0x7B0F
+0x734C = 0x7B47
+0x734D = 0x7B38
+0x734E = 0x7B2A
+0x734F = 0x7B19
+0x7350 = 0x7B2E
+0x7351 = 0x7B31
+0x7352 = 0x7B20
+0x7353 = 0x7B25
+0x7354 = 0x7B24
+0x7355 = 0x7B33
+0x7356 = 0x7B3E
+0x7357 = 0x7B1E
+0x7358 = 0x7B58
+0x7359 = 0x7B5A
+0x735A = 0x7B45
+0x735B = 0x7B75
+0x735C = 0x7B4C
+0x735D = 0x7B5D
+0x735E = 0x7B60
+0x735F = 0x7B6E
+0x7360 = 0x7B7B
+0x7361 = 0x7B62
+0x7362 = 0x7B72
+0x7363 = 0x7B71
+0x7364 = 0x7B90
+0x7365 = 0x7BA6
+0x7366 = 0x7BA7
+0x7367 = 0x7BB8
+0x7368 = 0x7BAC
+0x7369 = 0x7B9D
+0x736A = 0x7BA8
+0x736B = 0x7B85
+0x736C = 0x7BAA
+0x736D = 0x7B9C
+0x736E = 0x7BA2
+0x736F = 0x7BAB
+0x7370 = 0x7BB4
+0x7371 = 0x7BD1
+0x7372 = 0x7BC1
+0x7373 = 0x7BCC
+0x7374 = 0x7BDD
+0x7375 = 0x7BDA
+0x7376 = 0x7BE5
+0x7377 = 0x7BE6
+0x7378 = 0x7BEA
+0x7379 = 0x7C0C
+0x737A = 0x7BFE
+0x737B = 0x7BFC
+0x737C = 0x7C0F
+0x737D = 0x7C16
+0x737E = 0x7C0B
+0x7421 = 0x7C1F
+0x7422 = 0x7C2A
+0x7423 = 0x7C26
+0x7424 = 0x7C38
+0x7425 = 0x7C41
+0x7426 = 0x7C40
+0x7427 = 0x81FE
+0x7428 = 0x8201
+0x7429 = 0x8202
+0x742A = 0x8204
+0x742B = 0x81EC
+0x742C = 0x8844
+0x742D = 0x8221
+0x742E = 0x8222
+0x742F = 0x8223
+0x7430 = 0x822D
+0x7431 = 0x822F
+0x7432 = 0x8228
+0x7433 = 0x822B
+0x7434 = 0x8238
+0x7435 = 0x823B
+0x7436 = 0x8233
+0x7437 = 0x8234
+0x7438 = 0x823E
+0x7439 = 0x8244
+0x743A = 0x8249
+0x743B = 0x824B
+0x743C = 0x824F
+0x743D = 0x825A
+0x743E = 0x825F
+0x743F = 0x8268
+0x7440 = 0x887E
+0x7441 = 0x8885
+0x7442 = 0x8888
+0x7443 = 0x88D8
+0x7444 = 0x88DF
+0x7445 = 0x895E
+0x7446 = 0x7F9D
+0x7447 = 0x7F9F
+0x7448 = 0x7FA7
+0x7449 = 0x7FAF
+0x744A = 0x7FB0
+0x744B = 0x7FB2
+0x744C = 0x7C7C
+0x744D = 0x6549
+0x744E = 0x7C91
+0x744F = 0x7C9D
+0x7450 = 0x7C9C
+0x7451 = 0x7C9E
+0x7452 = 0x7CA2
+0x7453 = 0x7CB2
+0x7454 = 0x7CBC
+0x7455 = 0x7CBD
+0x7456 = 0x7CC1
+0x7457 = 0x7CC7
+0x7458 = 0x7CCC
+0x7459 = 0x7CCD
+0x745A = 0x7CC8
+0x745B = 0x7CC5
+0x745C = 0x7CD7
+0x745D = 0x7CE8
+0x745E = 0x826E
+0x745F = 0x66A8
+0x7460 = 0x7FBF
+0x7461 = 0x7FCE
+0x7462 = 0x7FD5
+0x7463 = 0x7FE5
+0x7464 = 0x7FE1
+0x7465 = 0x7FE6
+0x7466 = 0x7FE9
+0x7467 = 0x7FEE
+0x7468 = 0x7FF3
+0x7469 = 0x7CF8
+0x746A = 0x7D77
+0x746B = 0x7DA6
+0x746C = 0x7DAE
+0x746D = 0x7E47
+0x746E = 0x7E9B
+0x746F = 0x9EB8
+0x7470 = 0x9EB4
+0x7471 = 0x8D73
+0x7472 = 0x8D84
+0x7473 = 0x8D94
+0x7474 = 0x8D91
+0x7475 = 0x8DB1
+0x7476 = 0x8D67
+0x7477 = 0x8D6D
+0x7478 = 0x8C47
+0x7479 = 0x8C49
+0x747A = 0x914A
+0x747B = 0x9150
+0x747C = 0x914E
+0x747D = 0x914F
+0x747E = 0x9164
+0x7521 = 0x9162
+0x7522 = 0x9161
+0x7523 = 0x9170
+0x7524 = 0x9169
+0x7525 = 0x916F
+0x7526 = 0x917D
+0x7527 = 0x917E
+0x7528 = 0x9172
+0x7529 = 0x9174
+0x752A = 0x9179
+0x752B = 0x918C
+0x752C = 0x9185
+0x752D = 0x9190
+0x752E = 0x918D
+0x752F = 0x9191
+0x7530 = 0x91A2
+0x7531 = 0x91A3
+0x7532 = 0x91AA
+0x7533 = 0x91AD
+0x7534 = 0x91AE
+0x7535 = 0x91AF
+0x7536 = 0x91B5
+0x7537 = 0x91B4
+0x7538 = 0x91BA
+0x7539 = 0x8C55
+0x753A = 0x9E7E
+0x753B = 0x8DB8
+0x753C = 0x8DEB
+0x753D = 0x8E05
+0x753E = 0x8E59
+0x753F = 0x8E69
+0x7540 = 0x8DB5
+0x7541 = 0x8DBF
+0x7542 = 0x8DBC
+0x7543 = 0x8DBA
+0x7544 = 0x8DC4
+0x7545 = 0x8DD6
+0x7546 = 0x8DD7
+0x7547 = 0x8DDA
+0x7548 = 0x8DDE
+0x7549 = 0x8DCE
+0x754A = 0x8DCF
+0x754B = 0x8DDB
+0x754C = 0x8DC6
+0x754D = 0x8DEC
+0x754E = 0x8DF7
+0x754F = 0x8DF8
+0x7550 = 0x8DE3
+0x7551 = 0x8DF9
+0x7552 = 0x8DFB
+0x7553 = 0x8DE4
+0x7554 = 0x8E09
+0x7555 = 0x8DFD
+0x7556 = 0x8E14
+0x7557 = 0x8E1D
+0x7558 = 0x8E1F
+0x7559 = 0x8E2C
+0x755A = 0x8E2E
+0x755B = 0x8E23
+0x755C = 0x8E2F
+0x755D = 0x8E3A
+0x755E = 0x8E40
+0x755F = 0x8E39
+0x7560 = 0x8E35
+0x7561 = 0x8E3D
+0x7562 = 0x8E31
+0x7563 = 0x8E49
+0x7564 = 0x8E41
+0x7565 = 0x8E42
+0x7566 = 0x8E51
+0x7567 = 0x8E52
+0x7568 = 0x8E4A
+0x7569 = 0x8E70
+0x756A = 0x8E76
+0x756B = 0x8E7C
+0x756C = 0x8E6F
+0x756D = 0x8E74
+0x756E = 0x8E85
+0x756F = 0x8E8F
+0x7570 = 0x8E94
+0x7571 = 0x8E90
+0x7572 = 0x8E9C
+0x7573 = 0x8E9E
+0x7574 = 0x8C78
+0x7575 = 0x8C82
+0x7576 = 0x8C8A
+0x7577 = 0x8C85
+0x7578 = 0x8C98
+0x7579 = 0x8C94
+0x757A = 0x659B
+0x757B = 0x89D6
+0x757C = 0x89DE
+0x757D = 0x89DA
+0x757E = 0x89DC
+0x7621 = 0x89E5
+0x7622 = 0x89EB
+0x7623 = 0x89EF
+0x7624 = 0x8A3E
+0x7625 = 0x8B26
+0x7626 = 0x9753
+0x7627 = 0x96E9
+0x7628 = 0x96F3
+0x7629 = 0x96EF
+0x762A = 0x9706
+0x762B = 0x9701
+0x762C = 0x9708
+0x762D = 0x970F
+0x762E = 0x970E
+0x762F = 0x972A
+0x7630 = 0x972D
+0x7631 = 0x9730
+0x7632 = 0x973E
+0x7633 = 0x9F80
+0x7634 = 0x9F83
+0x7635 = 0x9F85
+0x7636 = 0x9F86
+0x7637 = 0x9F87
+0x7638 = 0x9F88
+0x7639 = 0x9F89
+0x763A = 0x9F8A
+0x763B = 0x9F8C
+0x763C = 0x9EFE
+0x763D = 0x9F0B
+0x763E = 0x9F0D
+0x763F = 0x96B9
+0x7640 = 0x96BC
+0x7641 = 0x96BD
+0x7642 = 0x96CE
+0x7643 = 0x96D2
+0x7644 = 0x77BF
+0x7645 = 0x96E0
+0x7646 = 0x928E
+0x7647 = 0x92AE
+0x7648 = 0x92C8
+0x7649 = 0x933E
+0x764A = 0x936A
+0x764B = 0x93CA
+0x764C = 0x938F
+0x764D = 0x943E
+0x764E = 0x946B
+0x764F = 0x9C7F
+0x7650 = 0x9C82
+0x7651 = 0x9C85
+0x7652 = 0x9C86
+0x7653 = 0x9C87
+0x7654 = 0x9C88
+0x7655 = 0x7A23
+0x7656 = 0x9C8B
+0x7657 = 0x9C8E
+0x7658 = 0x9C90
+0x7659 = 0x9C91
+0x765A = 0x9C92
+0x765B = 0x9C94
+0x765C = 0x9C95
+0x765D = 0x9C9A
+0x765E = 0x9C9B
+0x765F = 0x9C9E
+0x7660 = 0x9C9F
+0x7661 = 0x9CA0
+0x7662 = 0x9CA1
+0x7663 = 0x9CA2
+0x7664 = 0x9CA3
+0x7665 = 0x9CA5
+0x7666 = 0x9CA6
+0x7667 = 0x9CA7
+0x7668 = 0x9CA8
+0x7669 = 0x9CA9
+0x766A = 0x9CAB
+0x766B = 0x9CAD
+0x766C = 0x9CAE
+0x766D = 0x9CB0
+0x766E = 0x9CB1
+0x766F = 0x9CB2
+0x7670 = 0x9CB3
+0x7671 = 0x9CB4
+0x7672 = 0x9CB5
+0x7673 = 0x9CB6
+0x7674 = 0x9CB7
+0x7675 = 0x9CBA
+0x7676 = 0x9CBB
+0x7677 = 0x9CBC
+0x7678 = 0x9CBD
+0x7679 = 0x9CC4
+0x767A = 0x9CC5
+0x767B = 0x9CC6
+0x767C = 0x9CC7
+0x767D = 0x9CCA
+0x767E = 0x9CCB
+0x7721 = 0x9CCC
+0x7722 = 0x9CCD
+0x7723 = 0x9CCE
+0x7724 = 0x9CCF
+0x7725 = 0x9CD0
+0x7726 = 0x9CD3
+0x7727 = 0x9CD4
+0x7728 = 0x9CD5
+0x7729 = 0x9CD7
+0x772A = 0x9CD8
+0x772B = 0x9CD9
+0x772C = 0x9CDC
+0x772D = 0x9CDD
+0x772E = 0x9CDF
+0x772F = 0x9CE2
+0x7730 = 0x977C
+0x7731 = 0x9785
+0x7732 = 0x9791
+0x7733 = 0x9792
+0x7734 = 0x9794
+0x7735 = 0x97AF
+0x7736 = 0x97AB
+0x7737 = 0x97A3
+0x7738 = 0x97B2
+0x7739 = 0x97B4
+0x773A = 0x9AB1
+0x773B = 0x9AB0
+0x773C = 0x9AB7
+0x773D = 0x9E58
+0x773E = 0x9AB6
+0x773F = 0x9ABA
+0x7740 = 0x9ABC
+0x7741 = 0x9AC1
+0x7742 = 0x9AC0
+0x7743 = 0x9AC5
+0x7744 = 0x9AC2
+0x7745 = 0x9ACB
+0x7746 = 0x9ACC
+0x7747 = 0x9AD1
+0x7748 = 0x9B45
+0x7749 = 0x9B43
+0x774A = 0x9B47
+0x774B = 0x9B49
+0x774C = 0x9B48
+0x774D = 0x9B4D
+0x774E = 0x9B51
+0x774F = 0x98E8
+0x7750 = 0x990D
+0x7751 = 0x992E
+0x7752 = 0x9955
+0x7753 = 0x9954
+0x7754 = 0x9ADF
+0x7755 = 0x9AE1
+0x7756 = 0x9AE6
+0x7757 = 0x9AEF
+0x7758 = 0x9AEB
+0x7759 = 0x9AFB
+0x775A = 0x9AED
+0x775B = 0x9AF9
+0x775C = 0x9B08
+0x775D = 0x9B0F
+0x775E = 0x9B13
+0x775F = 0x9B1F
+0x7760 = 0x9B23
+0x7761 = 0x9EBD
+0x7762 = 0x9EBE
+0x7763 = 0x7E3B
+0x7764 = 0x9E82
+0x7765 = 0x9E87
+0x7766 = 0x9E88
+0x7767 = 0x9E8B
+0x7768 = 0x9E92
+0x7769 = 0x93D6
+0x776A = 0x9E9D
+0x776B = 0x9E9F
+0x776C = 0x9EDB
+0x776D = 0x9EDC
+0x776E = 0x9EDD
+0x776F = 0x9EE0
+0x7770 = 0x9EDF
+0x7771 = 0x9EE2
+0x7772 = 0x9EE9
+0x7773 = 0x9EE7
+0x7774 = 0x9EE5
+0x7775 = 0x9EEA
+0x7776 = 0x9EEF
+0x7777 = 0x9F22
+0x7778 = 0x9F2C
+0x7779 = 0x9F2F
+0x777A = 0x9F39
+0x777B = 0x9F37
+0x777C = 0x9F3D
+0x777D = 0x9F3E
+0x777E = 0x9F44
+END_MAP
diff --git a/enc/trans/GB/UCS%GB12345.src b/enc/trans/GB/UCS%GB12345.src
new file mode 100644
index 0000000000..8ec8318438
--- /dev/null
+++ b/enc/trans/GB/UCS%GB12345.src
@@ -0,0 +1,7620 @@
+# $NetBSD: UCS%GB12345.src,v 1.1 2006/11/23 03:25:24 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/GB12345"
+SRC_ZONE	0x00A4 - 0xFFE5
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             GB12345-80 to Unicode table (complete, hex format)
+#	Unicode version:  1.1
+#	Table version:    0.0d1
+#	Table format:     Format A
+#	Date:             6 December 1993
+#	Author:           Glenn Adams <glenn@metis.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data Metis and Taligent currently have on how
+#       GB12345-90 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the GB12345 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#					The official names for Unicode characters U+4E00
+#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#					where XXXX is the code point.  Including all these
+#					names in this file increases its size substantially
+#					and needlessly.  The token "<CJK>" is used for the
+#					name of these characters.  If necessary, it can be
+#					expanded algorithmically by a parser or editor.
+#
+#	The entries are in GB12345 order
+#
+#	The following algorithms can be used to change the hex form
+#		of GB12345 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x777E -> 0x575E -> 8794
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+#
+0x00A4 = 0x2168
+0x00A7 = 0x216C
+0x00A8 = 0x2127
+0x00B0 = 0x2163
+0x00B1 = 0x2140
+0x00B7 = 0x2124
+0x00D7 = 0x2141
+0x00E0 = 0x2824
+0x00E1 = 0x2822
+0x00E8 = 0x2828
+0x00E9 = 0x2826
+0x00EA = 0x283A
+0x00EC = 0x282C
+0x00ED = 0x282A
+0x00F2 = 0x2830
+0x00F3 = 0x282E
+0x00F7 = 0x2142
+0x00F9 = 0x2834
+0x00FA = 0x2832
+0x00FC = 0x2839
+0x0101 = 0x2821
+0x0113 = 0x2825
+0x011B = 0x2827
+0x012B = 0x2829
+0x014D = 0x282D
+0x016B = 0x2831
+0x01CE = 0x2823
+0x01D0 = 0x282B
+0x01D2 = 0x282F
+0x01D4 = 0x2833
+0x01D6 = 0x2835
+0x01D8 = 0x2836
+0x01DA = 0x2837
+0x01DC = 0x2838
+0x02C7 = 0x2126
+0x02C9 = 0x2125
+0x0391 = 0x2621
+0x0392 = 0x2622
+0x0393 = 0x2623
+0x0394 = 0x2624
+0x0395 = 0x2625
+0x0396 = 0x2626
+0x0397 = 0x2627
+0x0398 = 0x2628
+0x0399 = 0x2629
+0x039A = 0x262A
+0x039B = 0x262B
+0x039C = 0x262C
+0x039D = 0x262D
+0x039E = 0x262E
+0x039F = 0x262F
+0x03A0 = 0x2630
+0x03A1 = 0x2631
+0x03A3 = 0x2632
+0x03A4 = 0x2633
+0x03A5 = 0x2634
+0x03A6 = 0x2635
+0x03A7 = 0x2636
+0x03A8 = 0x2637
+0x03A9 = 0x2638
+0x03B1 = 0x2641
+0x03B2 = 0x2642
+0x03B3 = 0x2643
+0x03B4 = 0x2644
+0x03B5 = 0x2645
+0x03B6 = 0x2646
+0x03B7 = 0x2647
+0x03B8 = 0x2648
+0x03B9 = 0x2649
+0x03BA = 0x264A
+0x03BB = 0x264B
+0x03BC = 0x264C
+0x03BD = 0x264D
+0x03BE = 0x264E
+0x03BF = 0x264F
+0x03C0 = 0x2650
+0x03C1 = 0x2651
+0x03C3 = 0x2652
+0x03C4 = 0x2653
+0x03C5 = 0x2654
+0x03C6 = 0x2655
+0x03C7 = 0x2656
+0x03C8 = 0x2657
+0x03C9 = 0x2658
+0x0401 = 0x2727
+0x0410 = 0x2721
+0x0411 = 0x2722
+0x0412 = 0x2723
+0x0413 = 0x2724
+0x0414 = 0x2725
+0x0415 = 0x2726
+0x0416 = 0x2728
+0x0417 = 0x2729
+0x0418 = 0x272A
+0x0419 = 0x272B
+0x041A = 0x272C
+0x041B = 0x272D
+0x041C = 0x272E
+0x041D = 0x272F
+0x041E = 0x2730
+0x041F = 0x2731
+0x0420 = 0x2732
+0x0421 = 0x2733
+0x0422 = 0x2734
+0x0423 = 0x2735
+0x0424 = 0x2736
+0x0425 = 0x2737
+0x0426 = 0x2738
+0x0427 = 0x2739
+0x0428 = 0x273A
+0x0429 = 0x273B
+0x042A = 0x273C
+0x042B = 0x273D
+0x042C = 0x273E
+0x042D = 0x273F
+0x042E = 0x2740
+0x042F = 0x2741
+0x0430 = 0x2751
+0x0431 = 0x2752
+0x0432 = 0x2753
+0x0433 = 0x2754
+0x0434 = 0x2755
+0x0435 = 0x2756
+0x0436 = 0x2758
+0x0437 = 0x2759
+0x0438 = 0x275A
+0x0439 = 0x275B
+0x043A = 0x275C
+0x043B = 0x275D
+0x043C = 0x275E
+0x043D = 0x275F
+0x043E = 0x2760
+0x043F = 0x2761
+0x0440 = 0x2762
+0x0441 = 0x2763
+0x0442 = 0x2764
+0x0443 = 0x2765
+0x0444 = 0x2766
+0x0445 = 0x2767
+0x0446 = 0x2768
+0x0447 = 0x2769
+0x0448 = 0x276A
+0x0449 = 0x276B
+0x044A = 0x276C
+0x044B = 0x276D
+0x044C = 0x276E
+0x044D = 0x276F
+0x044E = 0x2770
+0x044F = 0x2771
+0x0451 = 0x2757
+0x2014 = 0x212A
+0x2015 = 0x212A # fallback -> 0x2014
+0x2016 = 0x212C
+0x2018 = 0x212E
+0x2019 = 0x212F
+0x201C = 0x2130
+0x201D = 0x2131
+0x2026 = 0x212D
+0x2030 = 0x216B
+0x2032 = 0x2164
+0x2033 = 0x2165
+0x203B = 0x2179
+0x2103 = 0x2166
+0x2116 = 0x216D
+0x2160 = 0x2271
+0x2161 = 0x2272
+0x2162 = 0x2273
+0x2163 = 0x2274
+0x2164 = 0x2275
+0x2165 = 0x2276
+0x2166 = 0x2277
+0x2167 = 0x2278
+0x2168 = 0x2279
+0x2169 = 0x227A
+0x216A = 0x227B
+0x216B = 0x227C
+0x2190 = 0x217B
+0x2191 = 0x217C
+0x2192 = 0x217A
+0x2193 = 0x217D
+0x2208 = 0x214A
+0x220F = 0x2147
+0x2211 = 0x2146
+0x221A = 0x214C
+0x221D = 0x2158
+0x221E = 0x215E
+0x2220 = 0x214F
+0x2225 = 0x214E
+0x2227 = 0x2144
+0x2228 = 0x2145
+0x2229 = 0x2149
+0x222A = 0x2148
+0x222B = 0x2152
+0x222E = 0x2153
+0x2234 = 0x2160
+0x2235 = 0x215F
+0x2236 = 0x2143
+0x2237 = 0x214B
+0x223D = 0x2157
+0x2248 = 0x2156
+0x224C = 0x2155
+0x2260 = 0x2159
+0x2261 = 0x2154
+0x2264 = 0x215C
+0x2265 = 0x215D
+0x226E = 0x215A
+0x226F = 0x215B
+0x2299 = 0x2151
+0x22A5 = 0x214D
+0x2312 = 0x2150
+0x2460 = 0x2259
+0x2461 = 0x225A
+0x2462 = 0x225B
+0x2463 = 0x225C
+0x2464 = 0x225D
+0x2465 = 0x225E
+0x2466 = 0x225F
+0x2467 = 0x2260
+0x2468 = 0x2261
+0x2469 = 0x2262
+0x2474 = 0x2245
+0x2475 = 0x2246
+0x2476 = 0x2247
+0x2477 = 0x2248
+0x2478 = 0x2249
+0x2479 = 0x224A
+0x247A = 0x224B
+0x247B = 0x224C
+0x247C = 0x224D
+0x247D = 0x224E
+0x247E = 0x224F
+0x247F = 0x2250
+0x2480 = 0x2251
+0x2481 = 0x2252
+0x2482 = 0x2253
+0x2483 = 0x2254
+0x2484 = 0x2255
+0x2485 = 0x2256
+0x2486 = 0x2257
+0x2487 = 0x2258
+0x2488 = 0x2231
+0x2489 = 0x2232
+0x248A = 0x2233
+0x248B = 0x2234
+0x248C = 0x2235
+0x248D = 0x2236
+0x248E = 0x2237
+0x248F = 0x2238
+0x2490 = 0x2239
+0x2491 = 0x223A
+0x2492 = 0x223B
+0x2493 = 0x223C
+0x2494 = 0x223D
+0x2495 = 0x223E
+0x2496 = 0x223F
+0x2497 = 0x2240
+0x2498 = 0x2241
+0x2499 = 0x2242
+0x249A = 0x2243
+0x249B = 0x2244
+0x2500 = 0x2924
+0x2501 = 0x2925
+0x2502 = 0x2926
+0x2503 = 0x2927
+0x2504 = 0x2928
+0x2505 = 0x2929
+0x2506 = 0x292A
+0x2507 = 0x292B
+0x2508 = 0x292C
+0x2509 = 0x292D
+0x250A = 0x292E
+0x250B = 0x292F
+0x250C = 0x2930
+0x250D = 0x2931
+0x250E = 0x2932
+0x250F = 0x2933
+0x2510 = 0x2934
+0x2511 = 0x2935
+0x2512 = 0x2936
+0x2513 = 0x2937
+0x2514 = 0x2938
+0x2515 = 0x2939
+0x2516 = 0x293A
+0x2517 = 0x293B
+0x2518 = 0x293C
+0x2519 = 0x293D
+0x251A = 0x293E
+0x251B = 0x293F
+0x251C = 0x2940
+0x251D = 0x2941
+0x251E = 0x2942
+0x251F = 0x2943
+0x2520 = 0x2944
+0x2521 = 0x2945
+0x2522 = 0x2946
+0x2523 = 0x2947
+0x2524 = 0x2948
+0x2525 = 0x2949
+0x2526 = 0x294A
+0x2527 = 0x294B
+0x2528 = 0x294C
+0x2529 = 0x294D
+0x252A = 0x294E
+0x252B = 0x294F
+0x252C = 0x2950
+0x252D = 0x2951
+0x252E = 0x2952
+0x252F = 0x2953
+0x2530 = 0x2954
+0x2531 = 0x2955
+0x2532 = 0x2956
+0x2533 = 0x2957
+0x2534 = 0x2958
+0x2535 = 0x2959
+0x2536 = 0x295A
+0x2537 = 0x295B
+0x2538 = 0x295C
+0x2539 = 0x295D
+0x253A = 0x295E
+0x253B = 0x295F
+0x253C = 0x2960
+0x253D = 0x2961
+0x253E = 0x2962
+0x253F = 0x2963
+0x2540 = 0x2964
+0x2541 = 0x2965
+0x2542 = 0x2966
+0x2543 = 0x2967
+0x2544 = 0x2968
+0x2545 = 0x2969
+0x2546 = 0x296A
+0x2547 = 0x296B
+0x2548 = 0x296C
+0x2549 = 0x296D
+0x254A = 0x296E
+0x254B = 0x296F
+0x25A0 = 0x2176
+0x25A1 = 0x2175
+0x25B2 = 0x2178
+0x25B3 = 0x2177
+0x25C6 = 0x2174
+0x25C7 = 0x2173
+0x25CB = 0x2170
+0x25CE = 0x2172
+0x25CF = 0x2171
+0x2605 = 0x216F
+0x2606 = 0x216E
+0x2640 = 0x2162
+0x2642 = 0x2161
+0x3000 = 0x2121
+0x3001 = 0x2122
+0x3002 = 0x2123
+0x3003 = 0x2128
+0x3005 = 0x2129
+0x3008 = 0x2134
+0x3009 = 0x2135
+0x300A = 0x2136
+0x300B = 0x2137
+0x300C = 0x2138
+0x300D = 0x2139
+0x300E = 0x213A
+0x300F = 0x213B
+0x3010 = 0x213E
+0x3011 = 0x213F
+0x3013 = 0x217E
+0x3014 = 0x2132
+0x3015 = 0x2133
+0x3016 = 0x213C
+0x3017 = 0x213D
+0x3041 = 0x2421
+0x3042 = 0x2422
+0x3043 = 0x2423
+0x3044 = 0x2424
+0x3045 = 0x2425
+0x3046 = 0x2426
+0x3047 = 0x2427
+0x3048 = 0x2428
+0x3049 = 0x2429
+0x304A = 0x242A
+0x304B = 0x242B
+0x304C = 0x242C
+0x304D = 0x242D
+0x304E = 0x242E
+0x304F = 0x242F
+0x3050 = 0x2430
+0x3051 = 0x2431
+0x3052 = 0x2432
+0x3053 = 0x2433
+0x3054 = 0x2434
+0x3055 = 0x2435
+0x3056 = 0x2436
+0x3057 = 0x2437
+0x3058 = 0x2438
+0x3059 = 0x2439
+0x305A = 0x243A
+0x305B = 0x243B
+0x305C = 0x243C
+0x305D = 0x243D
+0x305E = 0x243E
+0x305F = 0x243F
+0x3060 = 0x2440
+0x3061 = 0x2441
+0x3062 = 0x2442
+0x3063 = 0x2443
+0x3064 = 0x2444
+0x3065 = 0x2445
+0x3066 = 0x2446
+0x3067 = 0x2447
+0x3068 = 0x2448
+0x3069 = 0x2449
+0x306A = 0x244A
+0x306B = 0x244B
+0x306C = 0x244C
+0x306D = 0x244D
+0x306E = 0x244E
+0x306F = 0x244F
+0x3070 = 0x2450
+0x3071 = 0x2451
+0x3072 = 0x2452
+0x3073 = 0x2453
+0x3074 = 0x2454
+0x3075 = 0x2455
+0x3076 = 0x2456
+0x3077 = 0x2457
+0x3078 = 0x2458
+0x3079 = 0x2459
+0x307A = 0x245A
+0x307B = 0x245B
+0x307C = 0x245C
+0x307D = 0x245D
+0x307E = 0x245E
+0x307F = 0x245F
+0x3080 = 0x2460
+0x3081 = 0x2461
+0x3082 = 0x2462
+0x3083 = 0x2463
+0x3084 = 0x2464
+0x3085 = 0x2465
+0x3086 = 0x2466
+0x3087 = 0x2467
+0x3088 = 0x2468
+0x3089 = 0x2469
+0x308A = 0x246A
+0x308B = 0x246B
+0x308C = 0x246C
+0x308D = 0x246D
+0x308E = 0x246E
+0x308F = 0x246F
+0x3090 = 0x2470
+0x3091 = 0x2471
+0x3092 = 0x2472
+0x3093 = 0x2473
+0x30A1 = 0x2521
+0x30A2 = 0x2522
+0x30A3 = 0x2523
+0x30A4 = 0x2524
+0x30A5 = 0x2525
+0x30A6 = 0x2526
+0x30A7 = 0x2527
+0x30A8 = 0x2528
+0x30A9 = 0x2529
+0x30AA = 0x252A
+0x30AB = 0x252B
+0x30AC = 0x252C
+0x30AD = 0x252D
+0x30AE = 0x252E
+0x30AF = 0x252F
+0x30B0 = 0x2530
+0x30B1 = 0x2531
+0x30B2 = 0x2532
+0x30B3 = 0x2533
+0x30B4 = 0x2534
+0x30B5 = 0x2535
+0x30B6 = 0x2536
+0x30B7 = 0x2537
+0x30B8 = 0x2538
+0x30B9 = 0x2539
+0x30BA = 0x253A
+0x30BB = 0x253B
+0x30BC = 0x253C
+0x30BD = 0x253D
+0x30BE = 0x253E
+0x30BF = 0x253F
+0x30C0 = 0x2540
+0x30C1 = 0x2541
+0x30C2 = 0x2542
+0x30C3 = 0x2543
+0x30C4 = 0x2544
+0x30C5 = 0x2545
+0x30C6 = 0x2546
+0x30C7 = 0x2547
+0x30C8 = 0x2548
+0x30C9 = 0x2549
+0x30CA = 0x254A
+0x30CB = 0x254B
+0x30CC = 0x254C
+0x30CD = 0x254D
+0x30CE = 0x254E
+0x30CF = 0x254F
+0x30D0 = 0x2550
+0x30D1 = 0x2551
+0x30D2 = 0x2552
+0x30D3 = 0x2553
+0x30D4 = 0x2554
+0x30D5 = 0x2555
+0x30D6 = 0x2556
+0x30D7 = 0x2557
+0x30D8 = 0x2558
+0x30D9 = 0x2559
+0x30DA = 0x255A
+0x30DB = 0x255B
+0x30DC = 0x255C
+0x30DD = 0x255D
+0x30DE = 0x255E
+0x30DF = 0x255F
+0x30E0 = 0x2560
+0x30E1 = 0x2561
+0x30E2 = 0x2562
+0x30E3 = 0x2563
+0x30E4 = 0x2564
+0x30E5 = 0x2565
+0x30E6 = 0x2566
+0x30E7 = 0x2567
+0x30E8 = 0x2568
+0x30E9 = 0x2569
+0x30EA = 0x256A
+0x30EB = 0x256B
+0x30EC = 0x256C
+0x30ED = 0x256D
+0x30EE = 0x256E
+0x30EF = 0x256F
+0x30F0 = 0x2570
+0x30F1 = 0x2571
+0x30F2 = 0x2572
+0x30F3 = 0x2573
+0x30F4 = 0x2574
+0x30F5 = 0x2575
+0x30F6 = 0x2576
+0x30FB = 0x2124 # fallback -> 0x00B7
+0x3105 = 0x2845
+0x3106 = 0x2846
+0x3107 = 0x2847
+0x3108 = 0x2848
+0x3109 = 0x2849
+0x310A = 0x284A
+0x310B = 0x284B
+0x310C = 0x284C
+0x310D = 0x284D
+0x310E = 0x284E
+0x310F = 0x284F
+0x3110 = 0x2850
+0x3111 = 0x2851
+0x3112 = 0x2852
+0x3113 = 0x2853
+0x3114 = 0x2854
+0x3115 = 0x2855
+0x3116 = 0x2856
+0x3117 = 0x2857
+0x3118 = 0x2858
+0x3119 = 0x2859
+0x311A = 0x285A
+0x311B = 0x285B
+0x311C = 0x285C
+0x311D = 0x285D
+0x311E = 0x285E
+0x311F = 0x285F
+0x3120 = 0x2860
+0x3121 = 0x2861
+0x3122 = 0x2862
+0x3123 = 0x2863
+0x3124 = 0x2864
+0x3125 = 0x2865
+0x3126 = 0x2866
+0x3127 = 0x2867
+0x3128 = 0x2868
+0x3129 = 0x2869
+0x3220 = 0x2265
+0x3221 = 0x2266
+0x3222 = 0x2267
+0x3223 = 0x2268
+0x3224 = 0x2269
+0x3225 = 0x226A
+0x3226 = 0x226B
+0x3227 = 0x226C
+0x3228 = 0x226D
+0x3229 = 0x226E
+0x4E00 = 0x523B
+0x4E01 = 0x3621
+0x4E03 = 0x465F
+0x4E07 = 0x7871
+0x4E08 = 0x5549
+0x4E09 = 0x487D
+0x4E0A = 0x494F
+0x4E0B = 0x4F42
+0x4E0C = 0x5822
+0x4E0D = 0x323B
+0x4E10 = 0x5824
+0x4E11 = 0x7829
+0x4E14 = 0x4752
+0x4E15 = 0x5827
+0x4E16 = 0x4A40
+0x4E18 = 0x4770
+0x4E19 = 0x317B
+0x4E1E = 0x5829
+0x4E22 = 0x362A
+0x4E28 = 0x582D
+0x4E2B = 0x513E
+0x4E2C = 0x635C
+0x4E2D = 0x5650
+0x4E30 = 0x7833
+0x4E32 = 0x342E
+0x4E36 = 0x583C
+0x4E38 = 0x4D68
+0x4E39 = 0x3524
+0x4E3B = 0x5677
+0x4E3F = 0x582F
+0x4E43 = 0x444B
+0x4E45 = 0x3E43
+0x4E47 = 0x5831
+0x4E48 = 0x7761
+0x4E4B = 0x562E
+0x4E4D = 0x5527
+0x4E4E = 0x3A75
+0x4E4F = 0x3726
+0x4E52 = 0x4639
+0x4E53 = 0x4552
+0x4E56 = 0x3954
+0x4E58 = 0x334B
+0x4E59 = 0x5252
+0x4E5C = 0x583F
+0x4E5D = 0x3E45
+0x4E5E = 0x4672
+0x4E5F = 0x5232
+0x4E69 = 0x5840
+0x4E73 = 0x4869
+0x4E7E = 0x472C
+0x4E82 = 0x4252
+0x4E86 = 0x414B
+0x4E88 = 0x5368
+0x4E8B = 0x4A42
+0x4E8C = 0x367E
+0x4E8D = 0x5821
+0x4E8E = 0x535A
+0x4E91 = 0x787D
+0x4E92 = 0x3B25
+0x4E93 = 0x5841
+0x4E94 = 0x4E65
+0x4E95 = 0x3E2E
+0x4E98 = 0x5828
+0x4E9B = 0x5029
+0x4E9E = 0x5147
+0x4E9F = 0x583D
+0x4EA0 = 0x596F
+0x4EA1 = 0x4D76
+0x4EA2 = 0x3F3A
+0x4EA4 = 0x3D3B
+0x4EA5 = 0x3A25
+0x4EA6 = 0x5260
+0x4EA8 = 0x3A60
+0x4EAB = 0x4F6D
+0x4EAC = 0x3E29
+0x4EAD = 0x4D24
+0x4EAE = 0x4141
+0x4EB3 = 0x5971
+0x4EBA = 0x484B
+0x4EBB = 0x5869
+0x4EC0 = 0x4A32
+0x4EC1 = 0x484A
+0x4EC2 = 0x586C
+0x4EC3 = 0x586A
+0x4EC4 = 0x5846
+0x4EC6 = 0x785F
+0x4EC7 = 0x3370
+0x4EC9 = 0x586B
+0x4ECA = 0x3D71
+0x4ECB = 0x3D69
+0x4ECD = 0x4854
+0x4ED4 = 0x5750
+0x4ED5 = 0x4A4B
+0x4ED6 = 0x4B7B
+0x4ED7 = 0x554C
+0x4ED8 = 0x3836
+0x4ED9 = 0x4F49
+0x4EDD = 0x595A
+0x4EDE = 0x5870
+0x4EDF = 0x472A
+0x4EE1 = 0x586E
+0x4EE3 = 0x347A
+0x4EE4 = 0x416E
+0x4EE5 = 0x5254
+0x4EE8 = 0x586D
+0x4EEB = 0x586F
+0x4EF0 = 0x5176
+0x4EF2 = 0x5659
+0x4EF3 = 0x5872
+0x4EF5 = 0x5875
+0x4EF6 = 0x3C7E
+0x4EF7 = 0x7842
+0x4EFB = 0x484E
+0x4EFD = 0x375D
+0x4EFF = 0x3742
+0x4F01 = 0x4673
+0x4F09 = 0x5878
+0x4F0A = 0x5241
+0x4F0D = 0x4E69
+0x4F0E = 0x3C3F
+0x4F0F = 0x377C
+0x4F10 = 0x3725
+0x4F11 = 0x505D
+0x4F19 = 0x3B6F
+0x4F22 = 0x5873
+0x4F2F = 0x322E
+0x4F30 = 0x3940
+0x4F32 = 0x5923
+0x4F34 = 0x3069
+0x4F36 = 0x4166
+0x4F38 = 0x496C
+0x4F3A = 0x4B45
+0x4F3C = 0x4B46
+0x4F3D = 0x5924
+0x4F43 = 0x3568
+0x4F46 = 0x352B
+0x4F47 = 0x5879
+0x4F4D = 0x4E3B
+0x4F4E = 0x354D
+0x4F4F = 0x5721
+0x4F50 = 0x5774
+0x4F51 = 0x5353
+0x4F55 = 0x3A4E
+0x4F57 = 0x5922
+0x4F58 = 0x595C
+0x4F59 = 0x6245
+0x4F5A = 0x587D
+0x4F5B = 0x3770
+0x4F5C = 0x5777
+0x4F5D = 0x587E
+0x4F5E = 0x587A
+0x4F5F = 0x5921
+0x4F60 = 0x4463
+0x4F64 = 0x5874
+0x4F67 = 0x587B
+0x4F69 = 0x4565
+0x4F6C = 0x4050
+0x4F6F = 0x5170
+0x4F70 = 0x305B
+0x4F73 = 0x3C51
+0x4F74 = 0x5926
+0x4F76 = 0x5925
+0x4F7B = 0x592C
+0x4F7C = 0x592E
+0x4F7E = 0x592B
+0x4F7F = 0x4A39
+0x4F83 = 0x5929
+0x4F84 = 0x5636
+0x4F86 = 0x4034
+0x4F88 = 0x335E
+0x4F89 = 0x5928
+0x4F8B = 0x407D
+0x4F8D = 0x4A4C
+0x4F8F = 0x592A
+0x4F91 = 0x5927
+0x4F94 = 0x5930
+0x4F96 = 0x4258
+0x4F97 = 0x3631
+0x4F9B = 0x3929
+0x4F9D = 0x5240
+0x4FA3 = 0x4242
+0x4FAE = 0x4E6A
+0x4FAF = 0x3A6E
+0x4FB5 = 0x4756
+0x4FBF = 0x3163
+0x4FC2 = 0x7872
+0x4FC3 = 0x3459
+0x4FC4 = 0x366D
+0x4FC5 = 0x5934
+0x4FCA = 0x3F21
+0x4FCE = 0x595E
+0x4FCF = 0x474E
+0x4FD0 = 0x407E
+0x4FD1 = 0x5938
+0x4FD7 = 0x4B57
+0x4FD8 = 0x377D
+0x4FDA = 0x5935
+0x4FDC = 0x5937
+0x4FDD = 0x3123
+0x4FDE = 0x5361
+0x4FDF = 0x5939
+0x4FE0 = 0x4F40
+0x4FE1 = 0x5045
+0x4FE3 = 0x5936
+0x4FEE = 0x505E
+0x4FEF = 0x3829
+0x4FF1 = 0x3E63
+0x4FF3 = 0x593D
+0x4FF8 = 0x593A
+0x4FFA = 0x3033
+0x4FFE = 0x5942
+0x5000 = 0x5876
+0x5006 = 0x4129
+0x5009 = 0x3256
+0x500B = 0x3876
+0x500C = 0x5944
+0x500D = 0x3136
+0x500F = 0x593F
+0x5011 = 0x4347
+0x5012 = 0x3539
+0x5014 = 0x3E73
+0x5018 = 0x4C48
+0x5019 = 0x3A72
+0x501A = 0x5250
+0x501C = 0x5943
+0x501F = 0x3D68
+0x5021 = 0x332B
+0x5025 = 0x5945
+0x5026 = 0x3E6B
+0x5028 = 0x5946
+0x5029 = 0x593B
+0x502A = 0x445F
+0x502B = 0x4257
+0x502C = 0x593E
+0x502D = 0x5941
+0x502E = 0x5940
+0x503C = 0x5635
+0x5043 = 0x5948
+0x5047 = 0x3C59
+0x5048 = 0x594A
+0x5049 = 0x4E30
+0x504C = 0x593C
+0x504E = 0x594B
+0x504F = 0x462B
+0x5055 = 0x5949
+0x505A = 0x5776
+0x505C = 0x4D23
+0x5065 = 0x3D21
+0x506C = 0x594C
+0x5074 = 0x3260
+0x5075 = 0x556C
+0x5076 = 0x453C
+0x5077 = 0x4D35
+0x5080 = 0x3F7E
+0x5085 = 0x3835
+0x5088 = 0x407C
+0x508D = 0x3078
+0x5096 = 0x5877
+0x5098 = 0x4921
+0x5099 = 0x3138
+0x50A2 = 0x7841
+0x50A3 = 0x3476
+0x50AC = 0x345F
+0x50AD = 0x5336
+0x50B2 = 0x3041
+0x50B3 = 0x342B
+0x50B4 = 0x5871
+0x50B5 = 0x552E
+0x50B7 = 0x494B
+0x50BA = 0x5951
+0x50BB = 0x4935
+0x50BE = 0x4763
+0x50C2 = 0x594D
+0x50C5 = 0x3D76
+0x50C9 = 0x595D
+0x50CF = 0x4F71
+0x50D1 = 0x4748
+0x50D5 = 0x464D
+0x50D6 = 0x5952
+0x50DA = 0x4145
+0x50DE = 0x4E31
+0x50E5 = 0x3D44
+0x50E6 = 0x5956
+0x50E7 = 0x492E
+0x50E8 = 0x5947
+0x50EC = 0x5955
+0x50ED = 0x5954
+0x50EE = 0x5957
+0x50F3 = 0x4B5B
+0x50F5 = 0x3D29
+0x50F9 = 0x3C5B
+0x50FB = 0x4627
+0x5100 = 0x5247
+0x5102 = 0x592F
+0x5104 = 0x525A
+0x5106 = 0x5953
+0x5107 = 0x5958
+0x5108 = 0x3F6B
+0x5109 = 0x3C73
+0x510B = 0x5959
+0x5110 = 0x594F
+0x5112 = 0x4865
+0x5114 = 0x5931
+0x5115 = 0x592D
+0x5118 = 0x7845
+0x511F = 0x3325
+0x5121 = 0x405C
+0x512A = 0x5345
+0x5132 = 0x3422
+0x5137 = 0x5933
+0x513A = 0x5950
+0x513B = 0x594E
+0x513C = 0x5932
+0x5140 = 0x5823
+0x5141 = 0x544A
+0x5143 = 0x542A
+0x5144 = 0x5056
+0x5145 = 0x3364
+0x5146 = 0x5557
+0x5148 = 0x4F48
+0x5149 = 0x3962
+0x514B = 0x3F4B
+0x514D = 0x4362
+0x5151 = 0x3652
+0x5152 = 0x3679
+0x5154 = 0x4D43
+0x5155 = 0x596E
+0x5156 = 0x5970
+0x515A = 0x782C
+0x515C = 0x3635
+0x5162 = 0x3E24
+0x5165 = 0x486B
+0x5168 = 0x482B
+0x5169 = 0x413D
+0x516B = 0x304B
+0x516C = 0x392B
+0x516D = 0x4179
+0x516E = 0x5962
+0x5171 = 0x3932
+0x5175 = 0x3178
+0x5176 = 0x4664
+0x5177 = 0x3E5F
+0x5178 = 0x3564
+0x5179 = 0x5748
+0x517C = 0x3C66
+0x5180 = 0x3C3D
+0x5182 = 0x5867
+0x5185 = 0x445A
+0x5189 = 0x483D
+0x518C = 0x3261
+0x518D = 0x5459
+0x5192 = 0x4330
+0x5195 = 0x4361
+0x5196 = 0x5A22
+0x5197 = 0x485F
+0x51A0 = 0x395A
+0x51A2 = 0x5A23
+0x51A4 = 0x5429
+0x51A5 = 0x5A24
+0x51AB = 0x597B
+0x51AC = 0x362C
+0x51B0 = 0x3179
+0x51B1 = 0x597C
+0x51B2 = 0x7828
+0x51B3 = 0x3E76
+0x51B5 = 0x3F76
+0x51B6 = 0x5231
+0x51B7 = 0x4064
+0x51BC = 0x597E
+0x51BD = 0x597D
+0x51C4 = 0x4660
+0x51C6 = 0x7929
+0x51C7 = 0x5A21
+0x51C8 = 0x3E3B
+0x51C9 = 0x4139
+0x51CB = 0x3572
+0x51CC = 0x4168
+0x51CD = 0x3633
+0x51CF = 0x3C75
+0x51D1 = 0x3455
+0x51DB = 0x415D
+0x51DD = 0x447D
+0x51E0 = 0x7840
+0x51E1 = 0x3732
+0x51ED = 0x785D
+0x51F0 = 0x3B4B
+0x51F1 = 0x3F2D
+0x51F3 = 0x354A
+0x51F5 = 0x5B49
+0x51F6 = 0x5057
+0x51F8 = 0x4D39
+0x51F9 = 0x303C
+0x51FA = 0x3376
+0x51FC = 0x5B4A
+0x51FD = 0x3A2F
+0x5200 = 0x3536
+0x5201 = 0x3573
+0x5202 = 0x5856
+0x5203 = 0x4850
+0x5206 = 0x3756
+0x5207 = 0x4750
+0x5208 = 0x5857
+0x520A = 0x3F2F
+0x520E = 0x5858
+0x5211 = 0x504C
+0x5212 = 0x783B
+0x5216 = 0x6B3E
+0x5217 = 0x4150
+0x521D = 0x3375
+0x5220 = 0x493E
+0x5224 = 0x4550
+0x5228 = 0x4559
+0x5229 = 0x407B
+0x522B = 0x3170
+0x522E = 0x394E
+0x5230 = 0x353D
+0x5233 = 0x585A
+0x5236 = 0x5646
+0x5237 = 0x4B22
+0x5238 = 0x482F
+0x5239 = 0x4932
+0x523A = 0x344C
+0x523B = 0x3F4C
+0x5241 = 0x3667
+0x5243 = 0x4C6A
+0x5244 = 0x5859
+0x5247 = 0x5472
+0x524A = 0x4F77
+0x524B = 0x7848
+0x524C = 0x585D
+0x524D = 0x4730
+0x5254 = 0x4C5E
+0x5256 = 0x464A
+0x525B = 0x3855
+0x525C = 0x5860
+0x525E = 0x585E
+0x5261 = 0x585F
+0x5265 = 0x307E
+0x5269 = 0x4A23
+0x526A = 0x3C74
+0x526E = 0x3950
+0x526F = 0x3831
+0x5272 = 0x386E
+0x5274 = 0x585C
+0x5275 = 0x3434
+0x527D = 0x5862
+0x527F = 0x3D4B
+0x5281 = 0x5864
+0x5282 = 0x5863
+0x5283 = 0x3B2E
+0x5287 = 0x3E67
+0x5288 = 0x457C
+0x5289 = 0x4175
+0x528A = 0x3974
+0x528C = 0x585B
+0x528D = 0x3D23
+0x5290 = 0x5865
+0x5291 = 0x3C41
+0x5293 = 0x5866
+0x529B = 0x4126
+0x529F = 0x3926
+0x52A0 = 0x3C53
+0x52A3 = 0x4153
+0x52A9 = 0x567A
+0x52AA = 0x452C
+0x52AB = 0x3D59
+0x52AC = 0x5B3E
+0x52AD = 0x5B3F
+0x52BE = 0x5B40
+0x52C1 = 0x3E22
+0x52C3 = 0x322A
+0x52C7 = 0x5342
+0x52C9 = 0x4363
+0x52D0 = 0x5B42
+0x52D2 = 0x4055
+0x52D5 = 0x362F
+0x52D6 = 0x5B43
+0x52D8 = 0x3F31
+0x52D9 = 0x4E71
+0x52DB = 0x512B
+0x52DD = 0x4A24
+0x52DE = 0x404D
+0x52DF = 0x443C
+0x52E2 = 0x4A46
+0x52E4 = 0x475A
+0x52F0 = 0x5B44
+0x52F1 = 0x5B3D
+0x52F5 = 0x4078
+0x52F8 = 0x4830
+0x52F9 = 0x5968
+0x52FA = 0x4957
+0x52FE = 0x3934
+0x52FF = 0x4E70
+0x5300 = 0x5448
+0x5305 = 0x307C
+0x5306 = 0x3452
+0x5308 = 0x5059
+0x530D = 0x5969
+0x530F = 0x5E4B
+0x5310 = 0x596B
+0x5315 = 0x5830
+0x5316 = 0x3B2F
+0x5317 = 0x3131
+0x5319 = 0x3357
+0x531A = 0x584E
+0x531D = 0x5451
+0x5320 = 0x3D33
+0x5321 = 0x3F6F
+0x5323 = 0x4F3B
+0x532A = 0x374B
+0x532D = 0x5850
+0x532F = 0x3B63
+0x5331 = 0x5851
+0x5339 = 0x4625
+0x533E = 0x5852
+0x533F = 0x4464
+0x5340 = 0x4778
+0x5341 = 0x4A2E
+0x5343 = 0x4727
+0x5345 = 0x5826
+0x5347 = 0x497D
+0x5348 = 0x4E67
+0x5349 = 0x3B5C
+0x534A = 0x306B
+0x5351 = 0x3130
+0x5352 = 0x5764
+0x5353 = 0x573F
+0x5354 = 0x502D
+0x5357 = 0x444F
+0x535A = 0x3229
+0x535C = 0x3237
+0x535E = 0x3165
+0x535F = 0x5F32
+0x5360 = 0x553C
+0x5361 = 0x3F28
+0x5363 = 0x5855
+0x5366 = 0x5854
+0x5367 = 0x4E54
+0x5369 = 0x5A60
+0x536E = 0x5834
+0x536F = 0x432E
+0x5370 = 0x5321
+0x5371 = 0x4E23
+0x5373 = 0x3C34
+0x5374 = 0x4834
+0x5375 = 0x4251
+0x5377 = 0x3E6D
+0x5378 = 0x5036
+0x537A = 0x5A61
+0x537F = 0x4764
+0x5382 = 0x7827
+0x5384 = 0x3672
+0x5398 = 0x4065
+0x5399 = 0x5847
+0x539A = 0x3A71
+0x539D = 0x5848
+0x539F = 0x542D
+0x53A0 = 0x325E
+0x53A2 = 0x4F61
+0x53A5 = 0x584A
+0x53A6 = 0x4F43
+0x53A8 = 0x3378
+0x53A9 = 0x3E47
+0x53AD = 0x5161
+0x53AE = 0x584B
+0x53B2 = 0x4077
+0x53B4 = 0x5849
+0x53B6 = 0x5B4C
+0x53BB = 0x4825
+0x53C1 = 0x487E
+0x53C3 = 0x324E
+0x53C8 = 0x5356
+0x53C9 = 0x3266
+0x53CA = 0x3C30
+0x53CB = 0x5351
+0x53CD = 0x3734
+0x53D4 = 0x4A65
+0x53D6 = 0x4821
+0x53D7 = 0x4A5C
+0x53D9 = 0x5070
+0x53DB = 0x4551
+0x53DF = 0x5B45
+0x53E2 = 0x3454
+0x53E3 = 0x3F5A
+0x53E4 = 0x3945
+0x53E5 = 0x3E64
+0x53E6 = 0x416D
+0x53E8 = 0x5F36
+0x53E9 = 0x5F35
+0x53EA = 0x7923
+0x53EB = 0x3D50
+0x53EC = 0x5559
+0x53ED = 0x3048
+0x53EE = 0x3623
+0x53EF = 0x3F49
+0x53F0 = 0x786B
+0x53F1 = 0x5F33
+0x53F2 = 0x4A37
+0x53F3 = 0x5352
+0x53F5 = 0x584F
+0x53F6 = 0x7878
+0x53F8 = 0x4B3E
+0x53FB = 0x5F37
+0x53FC = 0x3570
+0x5401 = 0x5375
+0x5403 = 0x3354
+0x5404 = 0x3877
+0x5406 = 0x5F3A
+0x5408 = 0x3A4F
+0x5409 = 0x3C2A
+0x540A = 0x3575
+0x540C = 0x4D2C
+0x540D = 0x437B
+0x540E = 0x6161
+0x540F = 0x4074
+0x5410 = 0x4D42
+0x5411 = 0x4F72
+0x5412 = 0x5F38
+0x5415 = 0x4240
+0x5416 = 0x5F39
+0x541B = 0x3E7D
+0x541D = 0x415F
+0x541E = 0x4D4C
+0x541F = 0x5277
+0x5420 = 0x374D
+0x5421 = 0x5F41
+0x5423 = 0x5F44
+0x5426 = 0x3771
+0x5427 = 0x3049
+0x5429 = 0x3754
+0x542B = 0x3A2C
+0x542D = 0x3F54
+0x542E = 0x4B31
+0x5431 = 0x5628
+0x5432 = 0x5F45
+0x5434 = 0x4E62
+0x5435 = 0x3333
+0x5438 = 0x4E7C
+0x5439 = 0x3435
+0x543B = 0x4E47
+0x543C = 0x3A70
+0x543E = 0x4E61
+0x5440 = 0x513D
+0x5443 = 0x5F40
+0x5446 = 0x3474
+0x5448 = 0x334A
+0x544A = 0x3866
+0x544B = 0x5F3B
+0x5450 = 0x4445
+0x5454 = 0x5F3E
+0x5462 = 0x4458
+0x5464 = 0x5F4A
+0x5466 = 0x5F4F
+0x5468 = 0x565C
+0x5471 = 0x5F49
+0x5472 = 0x5F5A
+0x5473 = 0x4E36
+0x5475 = 0x3A47
+0x5476 = 0x5F4E
+0x5477 = 0x5F48
+0x5478 = 0x455E
+0x547B = 0x496B
+0x547C = 0x3A74
+0x547D = 0x437C
+0x5480 = 0x3E57
+0x5482 = 0x5F46
+0x5484 = 0x5F4D
+0x5486 = 0x4558
+0x548B = 0x5526
+0x548C = 0x3A4D
+0x548E = 0x3E4C
+0x548F = 0x533D
+0x5490 = 0x3840
+0x5492 = 0x5664
+0x5494 = 0x5F47
+0x5495 = 0x393E
+0x5496 = 0x3F27
+0x549A = 0x5F4B
+0x54A3 = 0x5F5B
+0x54A4 = 0x5F65
+0x54A6 = 0x5F57
+0x54A7 = 0x5F56
+0x54A8 = 0x5749
+0x54A9 = 0x5F63
+0x54AA = 0x5F64
+0x54AB = 0x656B
+0x54AC = 0x5227
+0x54AD = 0x5F52
+0x54AF = 0x3F29
+0x54B1 = 0x545B
+0x54B3 = 0x3F48
+0x54B4 = 0x5F54
+0x54B8 = 0x4F4C
+0x54BB = 0x5F5D
+0x54BC = 0x5F43
+0x54BD = 0x514A
+0x54BF = 0x5F5E
+0x54C0 = 0x3027
+0x54C1 = 0x4637
+0x54C2 = 0x5F53
+0x54C4 = 0x3A65
+0x54C6 = 0x365F
+0x54C7 = 0x4D5B
+0x54C8 = 0x397E
+0x54C9 = 0x5455
+0x54CC = 0x5F5F
+0x54CE = 0x3025
+0x54CF = 0x5F67
+0x54D0 = 0x5F51
+0x54DA = 0x5F61
+0x54DE = 0x5F68
+0x54E1 = 0x5431
+0x54E5 = 0x3867
+0x54E6 = 0x4536
+0x54E7 = 0x5F6A
+0x54E8 = 0x495A
+0x54E9 = 0x4128
+0x54EA = 0x4444
+0x54ED = 0x3F5E
+0x54EE = 0x4F78
+0x54F2 = 0x555C
+0x54F3 = 0x5F6E
+0x54FA = 0x3238
+0x54FC = 0x3A5F
+0x54FD = 0x5F6C
+0x54FF = 0x5B41
+0x5501 = 0x5164
+0x5504 = 0x5F42
+0x5506 = 0x4B74
+0x5507 = 0x343D
+0x5509 = 0x3026
+0x550F = 0x5F71
+0x5510 = 0x4C46
+0x5511 = 0x5F72
+0x5514 = 0x5F6D
+0x5523 = 0x5F70
+0x5527 = 0x5F73
+0x552A = 0x5F74
+0x552C = 0x3B23
+0x552E = 0x4A5B
+0x552F = 0x4E28
+0x5530 = 0x6027
+0x5531 = 0x332A
+0x5533 = 0x6026
+0x5537 = 0x6021
+0x553C = 0x5F7E
+0x553E = 0x4D59
+0x553F = 0x5F7C
+0x5541 = 0x5F7A
+0x5543 = 0x3F50
+0x5544 = 0x5744
+0x5546 = 0x494C
+0x5549 = 0x5F78
+0x554A = 0x3021
+0x554F = 0x4E4A
+0x5550 = 0x5F7D
+0x5553 = 0x4674
+0x5555 = 0x5F7B
+0x5556 = 0x6022
+0x555C = 0x6028
+0x555E = 0x5146
+0x5561 = 0x3748
+0x5564 = 0x4621
+0x5565 = 0x4936
+0x5566 = 0x4032
+0x556A = 0x453E
+0x5575 = 0x6023
+0x5576 = 0x6024
+0x5577 = 0x6025
+0x557B = 0x6034
+0x557C = 0x4C64
+0x557E = 0x6031
+0x5580 = 0x3F26
+0x5581 = 0x602F
+0x5582 = 0x4E39
+0x5583 = 0x602B
+0x5584 = 0x4946
+0x5587 = 0x402E
+0x5588 = 0x602E
+0x5589 = 0x3A6D
+0x558A = 0x3A30
+0x558B = 0x6029
+0x558F = 0x5F76
+0x5591 = 0x6033
+0x5594 = 0x6038
+0x5598 = 0x342D
+0x5599 = 0x6039
+0x559A = 0x3B3D
+0x559C = 0x4F32
+0x559D = 0x3A48
+0x559F = 0x6030
+0x55A7 = 0x507A
+0x55AA = 0x4925
+0x55AC = 0x4747
+0x55AE = 0x3525
+0x55B1 = 0x602C
+0x55B2 = 0x5334
+0x55B3 = 0x547B
+0x55B5 = 0x5F77
+0x55B9 = 0x602D
+0x55BB = 0x5377
+0x55C4 = 0x6044
+0x55C5 = 0x5061
+0x55C6 = 0x473A
+0x55C7 = 0x5844
+0x55C9 = 0x603C
+0x55CC = 0x6049
+0x55CD = 0x604A
+0x55CE = 0x4270
+0x55D1 = 0x603E
+0x55D2 = 0x602A
+0x55D3 = 0x4924
+0x55D4 = 0x6041
+0x55D6 = 0x6032
+0x55DA = 0x4E58
+0x55DC = 0x4A48
+0x55DD = 0x6043
+0x55DF = 0x6035
+0x55E1 = 0x4E4B
+0x55E3 = 0x4B43
+0x55E4 = 0x604D
+0x55E5 = 0x6046
+0x55E6 = 0x6042
+0x55E8 = 0x604B
+0x55E9 = 0x5F6F
+0x55EA = 0x603A
+0x55EC = 0x6040
+0x55EF = 0x6045
+0x55F2 = 0x6047
+0x55F5 = 0x604C
+0x55F6 = 0x5F59
+0x55F7 = 0x603B
+0x55FD = 0x4B54
+0x55FE = 0x6055
+0x5600 = 0x6056
+0x5601 = 0x6052
+0x5606 = 0x4C3E
+0x5608 = 0x6050
+0x5609 = 0x3C4E
+0x560C = 0x6051
+0x560D = 0x6036
+0x560E = 0x3842
+0x560F = 0x5845
+0x5614 = 0x453B
+0x5616 = 0x5F75
+0x5617 = 0x3322
+0x5618 = 0x506A
+0x561B = 0x426F
+0x561C = 0x5F69
+0x561E = 0x604F
+0x561F = 0x603D
+0x5623 = 0x6054
+0x5627 = 0x6057
+0x5629 = 0x3B29
+0x562C = 0x605C
+0x562D = 0x6058
+0x562E = 0x5F6B
+0x562F = 0x5025
+0x5630 = 0x5F34
+0x5632 = 0x3330
+0x5634 = 0x576C
+0x5635 = 0x5F58
+0x5636 = 0x4B3B
+0x5638 = 0x5F3C
+0x5639 = 0x605A
+0x563B = 0x4E7B
+0x563F = 0x3A59
+0x5641 = 0x7830
+0x564C = 0x6061
+0x564D = 0x605D
+0x564E = 0x522D
+0x5654 = 0x6062
+0x5657 = 0x605B
+0x5658 = 0x6059
+0x5659 = 0x605F
+0x565D = 0x5F50
+0x5660 = 0x5F55
+0x5662 = 0x605E
+0x5664 = 0x6064
+0x5665 = 0x5F66
+0x5666 = 0x5F5C
+0x5668 = 0x4677
+0x5669 = 0x582C
+0x566A = 0x546B
+0x566B = 0x6066
+0x566C = 0x4A49
+0x566F = 0x6048
+0x5671 = 0x6065
+0x5672 = 0x5F60
+0x5674 = 0x4567
+0x5676 = 0x3841
+0x5678 = 0x3656
+0x5679 = 0x782B
+0x567B = 0x6067
+0x567C = 0x6068
+0x5680 = 0x5F4C
+0x5685 = 0x6069
+0x5686 = 0x6063
+0x5687 = 0x4F45
+0x568C = 0x5F62
+0x568E = 0x3A3F
+0x568F = 0x4C67
+0x5693 = 0x606A
+0x5695 = 0x6060
+0x5699 = 0x4476
+0x56A6 = 0x5F3F
+0x56A8 = 0x417C
+0x56AE = 0x7875
+0x56AF = 0x606B
+0x56B3 = 0x6037
+0x56B4 = 0x514F
+0x56B6 = 0x6053
+0x56B7 = 0x4842
+0x56BC = 0x3D40
+0x56C0 = 0x5F79
+0x56C1 = 0x603F
+0x56C2 = 0x4F79
+0x56C5 = 0x5966
+0x56C8 = 0x5F3D
+0x56C9 = 0x7853
+0x56CA = 0x4452
+0x56CC = 0x786A
+0x56D1 = 0x5676
+0x56D4 = 0x606C
+0x56D7 = 0x606D
+0x56DA = 0x4774
+0x56DB = 0x4B44
+0x56DD = 0x606E
+0x56DE = 0x3B58
+0x56DF = 0x5836
+0x56E0 = 0x5272
+0x56E1 = 0x606F
+0x56E4 = 0x365A
+0x56EB = 0x6071
+0x56F0 = 0x4027
+0x56F1 = 0x3451
+0x56F9 = 0x6072
+0x56FA = 0x394C
+0x56FF = 0x6073
+0x5703 = 0x4654
+0x5704 = 0x6074
+0x5707 = 0x6070
+0x5708 = 0x4826
+0x5709 = 0x6076
+0x570A = 0x6075
+0x570B = 0x397A
+0x570D = 0x4E27
+0x5712 = 0x5430
+0x5713 = 0x5432
+0x5716 = 0x4D3C
+0x5718 = 0x4D45
+0x571C = 0x6077
+0x571F = 0x4D41
+0x5728 = 0x545A
+0x5729 = 0x5B57
+0x572A = 0x5B59
+0x572C = 0x5B58
+0x572D = 0x3967
+0x572E = 0x5B5C
+0x572F = 0x5B5D
+0x5730 = 0x3558
+0x5733 = 0x5B5A
+0x573B = 0x5B5F
+0x573E = 0x3B78
+0x5740 = 0x5637
+0x5742 = 0x5B60
+0x5747 = 0x3E79
+0x574A = 0x373B
+0x574C = 0x5B50
+0x574D = 0x4C2E
+0x574E = 0x3F32
+0x5750 = 0x5778
+0x5751 = 0x3F53
+0x5761 = 0x4642
+0x5764 = 0x4024
+0x5766 = 0x4C39
+0x5768 = 0x5B67
+0x5769 = 0x5B61
+0x576A = 0x463A
+0x576B = 0x5B63
+0x576D = 0x5B68
+0x576F = 0x4577
+0x5773 = 0x5B6A
+0x5776 = 0x5B69
+0x5777 = 0x3F40
+0x577B = 0x5B66
+0x577C = 0x5B65
+0x5782 = 0x3439
+0x5783 = 0x402C
+0x578B = 0x504D
+0x578C = 0x5B6D
+0x5793 = 0x5B72
+0x579B = 0x3662
+0x57A0 = 0x5B73
+0x57A1 = 0x5B52
+0x57A2 = 0x3938
+0x57A3 = 0x542B
+0x57A4 = 0x5B6C
+0x57A7 = 0x5B70
+0x57AE = 0x3F65
+0x57B8 = 0x5B79
+0x57C2 = 0x3921
+0x57C3 = 0x3023
+0x57CB = 0x4271
+0x57CE = 0x3347
+0x57CF = 0x5B6F
+0x57D2 = 0x5B78
+0x57D4 = 0x4652
+0x57D5 = 0x5B74
+0x57DD = 0x5B7E
+0x57DF = 0x5372
+0x57E0 = 0x323A
+0x57E1 = 0x5B6B
+0x57E4 = 0x5B7D
+0x57ED = 0x5C24
+0x57EF = 0x5B7B
+0x57F4 = 0x5B7A
+0x57F7 = 0x5634
+0x57F8 = 0x5B7C
+0x57F9 = 0x4560
+0x57FA = 0x3B79
+0x57FD = 0x5C23
+0x5800 = 0x5C25
+0x5802 = 0x4C43
+0x5805 = 0x3C61
+0x5806 = 0x3651
+0x5807 = 0x5D40
+0x580A = 0x5B51
+0x580B = 0x5C21
+0x580D = 0x5C22
+0x5816 = 0x5B71
+0x5819 = 0x5C27
+0x581D = 0x5B76
+0x581E = 0x5C26
+0x5820 = 0x5C29
+0x5821 = 0x3124
+0x5824 = 0x354C
+0x582A = 0x3F30
+0x582F = 0x5222
+0x5830 = 0x515F
+0x5831 = 0x3128
+0x5834 = 0x3321
+0x5835 = 0x3642
+0x5844 = 0x5C28
+0x584A = 0x3F69
+0x584B = 0x5C63
+0x584C = 0x4B7A
+0x584D = 0x6B73
+0x584F = 0x5B6E
+0x5851 = 0x4B5C
+0x5852 = 0x5B75
+0x5854 = 0x4B7E
+0x5857 = 0x4D3F
+0x5858 = 0x4C41
+0x585E = 0x487B
+0x5862 = 0x4E6B
+0x5864 = 0x5B77
+0x5865 = 0x5C2A
+0x586B = 0x4C6E
+0x586C = 0x5C2B
+0x5875 = 0x333E
+0x5879 = 0x4735
+0x587E = 0x5B53
+0x5880 = 0x5C2F
+0x5881 = 0x5C2C
+0x5883 = 0x3E33
+0x5885 = 0x4A7B
+0x5889 = 0x5C2D
+0x588A = 0x3566
+0x5892 = 0x494A
+0x5893 = 0x4439
+0x589A = 0x5C2E
+0x589C = 0x5739
+0x589E = 0x5476
+0x589F = 0x5066
+0x58A8 = 0x442B
+0x58A9 = 0x3655
+0x58AE = 0x3669
+0x58B3 = 0x3758
+0x58BB = 0x473D
+0x58BC = 0x5B54
+0x58BE = 0x3F51
+0x58C1 = 0x315A
+0x58C5 = 0x5B55
+0x58C7 = 0x4C33
+0x58D1 = 0x5B56
+0x58D3 = 0x5139
+0x58D5 = 0x3A3E
+0x58D8 = 0x405D
+0x58D9 = 0x5B5B
+0x58DA = 0x5B64
+0x58DE = 0x3B35
+0x58DF = 0x4222
+0x58E0 = 0x5B62
+0x58E2 = 0x5B5E
+0x58E4 = 0x4840
+0x58E9 = 0x3053
+0x58EB = 0x4A3F
+0x58EC = 0x4849
+0x58EF = 0x5733
+0x58F9 = 0x523C
+0x58FA = 0x3A78
+0x58FD = 0x4A59
+0x5902 = 0x623A
+0x590F = 0x4F44
+0x5914 = 0x5967
+0x5915 = 0x4F26
+0x5916 = 0x4D62
+0x5919 = 0x596D
+0x591A = 0x3660
+0x591C = 0x5239
+0x591F = 0x393B
+0x5922 = 0x434E
+0x5924 = 0x6239
+0x5925 = 0x6237
+0x5927 = 0x3473
+0x5929 = 0x4C6C
+0x592A = 0x4C2B
+0x592B = 0x3772
+0x592D = 0x5832
+0x592E = 0x516B
+0x592F = 0x3A3B
+0x5931 = 0x4A27
+0x5937 = 0x5244
+0x5938 = 0x7849
+0x593C = 0x5E45
+0x593E = 0x3C50
+0x5944 = 0x5159
+0x5947 = 0x4666
+0x5948 = 0x444E
+0x5949 = 0x376E
+0x594E = 0x3F7C
+0x594F = 0x5760
+0x5950 = 0x5B3C
+0x5951 = 0x4675
+0x5954 = 0x313C
+0x5955 = 0x5E48
+0x5957 = 0x4C57
+0x5958 = 0x5E4A
+0x595A = 0x5E49
+0x5960 = 0x356C
+0x5962 = 0x495D
+0x5965 = 0x3042
+0x5969 = 0x5E46
+0x596A = 0x3661
+0x596C = 0x3D31
+0x596E = 0x375C
+0x5973 = 0x452E
+0x5974 = 0x452B
+0x5976 = 0x444C
+0x5978 = 0x3C69
+0x5979 = 0x4B7D
+0x597D = 0x3A43
+0x5981 = 0x6579
+0x5982 = 0x4867
+0x5983 = 0x657A
+0x5984 = 0x4D7D
+0x598A = 0x4851
+0x598D = 0x657B
+0x5992 = 0x364A
+0x5993 = 0x3C4B
+0x5996 = 0x517D
+0x5997 = 0x6621
+0x5999 = 0x436E
+0x599D = 0x5731
+0x599E = 0x6624
+0x59A3 = 0x657E
+0x59A4 = 0x6625
+0x59A5 = 0x4D57
+0x59A8 = 0x3741
+0x59AE = 0x445D
+0x59AF = 0x6628
+0x59B2 = 0x6627
+0x59B9 = 0x4343
+0x59BB = 0x465E
+0x59BE = 0x662A
+0x59C6 = 0x4437
+0x59CA = 0x6622
+0x59CB = 0x4A3C
+0x59D0 = 0x3D63
+0x59D1 = 0x3943
+0x59D2 = 0x6626
+0x59D3 = 0x5055
+0x59D4 = 0x4E2F
+0x59D7 = 0x6629
+0x59D8 = 0x6630
+0x59DA = 0x5226
+0x59DC = 0x3D2A
+0x59DD = 0x662D
+0x59E3 = 0x662F
+0x59E5 = 0x4051
+0x59E8 = 0x524C
+0x59EC = 0x3C27
+0x59F9 = 0x6631
+0x59FB = 0x5276
+0x59FF = 0x574B
+0x5A01 = 0x4D7E
+0x5A03 = 0x4D5E
+0x5A09 = 0x6633
+0x5A0C = 0x6632
+0x5A11 = 0x6636
+0x5A13 = 0x6638
+0x5A18 = 0x446F
+0x5A1C = 0x4448
+0x5A1F = 0x3E6A
+0x5A20 = 0x496F
+0x5A23 = 0x6637
+0x5A25 = 0x3670
+0x5A29 = 0x4364
+0x5A31 = 0x5369
+0x5A36 = 0x4822
+0x5A3C = 0x663D
+0x5A40 = 0x6639
+0x5A41 = 0x4226
+0x5A46 = 0x4645
+0x5A49 = 0x4D71
+0x5A4A = 0x663B
+0x5A55 = 0x663C
+0x5A5A = 0x3B69
+0x5A62 = 0x663E
+0x5A66 = 0x383E
+0x5A67 = 0x663A
+0x5A6A = 0x4037
+0x5A6D = 0x662B
+0x5A77 = 0x6643
+0x5A7A = 0x6644
+0x5A7F = 0x5076
+0x5A92 = 0x433D
+0x5A9A = 0x4344
+0x5A9B = 0x6642
+0x5AA7 = 0x6634
+0x5AAA = 0x6641
+0x5AB2 = 0x6647
+0x5AB3 = 0x4F31
+0x5AB5 = 0x6B74
+0x5AB8 = 0x664A
+0x5ABD = 0x4268
+0x5ABE = 0x6645
+0x5AC1 = 0x3C5E
+0x5AC2 = 0x4929
+0x5AC9 = 0x3C35
+0x5ACC = 0x4F53
+0x5AD6 = 0x664E
+0x5AD7 = 0x657D
+0x5AD8 = 0x6650
+0x5ADC = 0x6651
+0x5AE0 = 0x664B
+0x5AE1 = 0x3555
+0x5AE3 = 0x664C
+0x5AE6 = 0x664F
+0x5AE9 = 0x445B
+0x5AEB = 0x6646
+0x5AF5 = 0x657C
+0x5AFB = 0x6635
+0x5B00 = 0x6623
+0x5B08 = 0x662C
+0x5B09 = 0x6652
+0x5B0B = 0x663F
+0x5B0C = 0x3D3F
+0x5B16 = 0x6654
+0x5B17 = 0x6653
+0x5B19 = 0x664D
+0x5B21 = 0x6648
+0x5B2A = 0x6649
+0x5B30 = 0x5324
+0x5B32 = 0x6655
+0x5B34 = 0x5978
+0x5B37 = 0x6656
+0x5B38 = 0x4974
+0x5B40 = 0x6657
+0x5B4C = 0x662E
+0x5B50 = 0x5753
+0x5B51 = 0x665D
+0x5B53 = 0x665E
+0x5B54 = 0x3F57
+0x5B55 = 0x5450
+0x5B57 = 0x5756
+0x5B58 = 0x3466
+0x5B5A = 0x665A
+0x5B5B = 0x5843
+0x5B5C = 0x574E
+0x5B5D = 0x5022
+0x5B5F = 0x434F
+0x5B62 = 0x665F
+0x5B63 = 0x3C3E
+0x5B64 = 0x3942
+0x5B65 = 0x665B
+0x5B69 = 0x3A22
+0x5B6B = 0x4B6F
+0x5B6C = 0x582B
+0x5B70 = 0x4A6B
+0x5B71 = 0x656E
+0x5B73 = 0x665C
+0x5B75 = 0x3775
+0x5B78 = 0x5127
+0x5B7A = 0x4866
+0x5B7D = 0x4475
+0x5B7F = 0x424F
+0x5B80 = 0x6532
+0x5B83 = 0x4B7C
+0x5B84 = 0x6533
+0x5B85 = 0x552C
+0x5B87 = 0x536E
+0x5B88 = 0x4A58
+0x5B89 = 0x3032
+0x5B8B = 0x4B4E
+0x5B8C = 0x4D6A
+0x5B8F = 0x3A6A
+0x5B93 = 0x6535
+0x5B95 = 0x6534
+0x5B97 = 0x575A
+0x5B98 = 0x3959
+0x5B99 = 0x5666
+0x5B9A = 0x3628
+0x5B9B = 0x4D70
+0x5B9C = 0x524B
+0x5BA2 = 0x3F4D
+0x5BA3 = 0x507B
+0x5BA4 = 0x4A52
+0x5BA5 = 0x6536
+0x5BA6 = 0x3B42
+0x5BAB = 0x392C
+0x5BB0 = 0x5457
+0x5BB3 = 0x3A26
+0x5BB4 = 0x5167
+0x5BB5 = 0x4F7C
+0x5BB6 = 0x3C52
+0x5BB8 = 0x6537
+0x5BB9 = 0x485D
+0x5BBF = 0x4B5E
+0x5BC2 = 0x3C45
+0x5BC4 = 0x3C44
+0x5BC5 = 0x527A
+0x5BC6 = 0x435C
+0x5BC7 = 0x3F5C
+0x5BCC = 0x383B
+0x5BD0 = 0x4342
+0x5BD2 = 0x3A2E
+0x5BD3 = 0x5422
+0x5BDE = 0x442F
+0x5BDF = 0x326C
+0x5BE1 = 0x3951
+0x5BE2 = 0x475E
+0x5BE4 = 0x653B
+0x5BE5 = 0x4148
+0x5BE6 = 0x4A35
+0x5BE7 = 0x447E
+0x5BE8 = 0x552F
+0x5BE9 = 0x4973
+0x5BEB = 0x5034
+0x5BEC = 0x3F6D
+0x5BEE = 0x653C
+0x5BF0 = 0x653E
+0x5BF5 = 0x3368
+0x5BF6 = 0x3126
+0x5BF8 = 0x3467
+0x5BFA = 0x4B42
+0x5C01 = 0x3762
+0x5C04 = 0x4964
+0x5C07 = 0x3D2B
+0x5C08 = 0x5728
+0x5C09 = 0x4E3E
+0x5C0A = 0x5770
+0x5C0B = 0x5130
+0x5C0D = 0x3654
+0x5C0E = 0x353C
+0x5C0F = 0x5021
+0x5C11 = 0x4959
+0x5C15 = 0x6658
+0x5C16 = 0x3C62
+0x5C1A = 0x4950
+0x5C1C = 0x6659
+0x5C22 = 0x5E4C
+0x5C24 = 0x5348
+0x5C25 = 0x5E4D
+0x5C2C = 0x5E4E
+0x5C31 = 0x3E4D
+0x5C37 = 0x5E4F
+0x5C38 = 0x4A2C
+0x5C39 = 0x527C
+0x5C3A = 0x335F
+0x5C3B = 0x656A
+0x5C3C = 0x4461
+0x5C3E = 0x4E32
+0x5C3F = 0x4472
+0x5C40 = 0x3E56
+0x5C41 = 0x4628
+0x5C45 = 0x3E53
+0x5C48 = 0x477C
+0x5C49 = 0x4C6B
+0x5C4A = 0x3D6C
+0x5C4B = 0x4E5D
+0x5C4E = 0x4A3A
+0x5C4F = 0x4641
+0x5C50 = 0x656C
+0x5C51 = 0x503C
+0x5C55 = 0x5539
+0x5C59 = 0x656D
+0x5C60 = 0x4D40
+0x5C62 = 0x4245
+0x5C63 = 0x656F
+0x5C64 = 0x3263
+0x5C65 = 0x4244
+0x5C68 = 0x6570
+0x5C6C = 0x4A74
+0x5C6E = 0x6578
+0x5C6F = 0x4D4D
+0x5C71 = 0x493D
+0x5C79 = 0x5259
+0x5C7A = 0x6128
+0x5C88 = 0x612C
+0x5C8C = 0x6127
+0x5C8D = 0x6129
+0x5C90 = 0x612A
+0x5C91 = 0x612F
+0x5C94 = 0x326D
+0x5C99 = 0x612E
+0x5C9C = 0x6131
+0x5CA1 = 0x3854
+0x5CA2 = 0x6133
+0x5CA3 = 0x6138
+0x5CA9 = 0x5152
+0x5CAB = 0x6136
+0x5CAC = 0x6135
+0x5CB1 = 0x6137
+0x5CB3 = 0x5440
+0x5CB5 = 0x6132
+0x5CB7 = 0x613A
+0x5CB8 = 0x3036
+0x5CC1 = 0x6139
+0x5CCB = 0x613E
+0x5CD2 = 0x613C
+0x5CD9 = 0x5645
+0x5CE8 = 0x366B
+0x5CEA = 0x5378
+0x5CED = 0x474D
+0x5CF0 = 0x3765
+0x5CF4 = 0x612D
+0x5CF6 = 0x353A
+0x5CFB = 0x3E7E
+0x5CFD = 0x4F3F
+0x5D06 = 0x6147
+0x5D07 = 0x3367
+0x5D0D = 0x6141
+0x5D0E = 0x4669
+0x5D14 = 0x345E
+0x5D16 = 0x5142
+0x5D17 = 0x385A
+0x5D1B = 0x6148
+0x5D1E = 0x6146
+0x5D22 = 0x613F
+0x5D24 = 0x6145
+0x5D26 = 0x6143
+0x5D27 = 0x6142
+0x5D29 = 0x3140
+0x5D2C = 0x6134
+0x5D2E = 0x6144
+0x5D34 = 0x614B
+0x5D3D = 0x614C
+0x5D3E = 0x614A
+0x5D47 = 0x6F7A
+0x5D4A = 0x6153
+0x5D4B = 0x6152
+0x5D4C = 0x4736
+0x5D50 = 0x6130
+0x5D5B = 0x614E
+0x5D69 = 0x6154
+0x5D6B = 0x6151
+0x5D6C = 0x614D
+0x5D6F = 0x614F
+0x5D74 = 0x6155
+0x5D81 = 0x6150
+0x5D82 = 0x6156
+0x5D84 = 0x5538
+0x5D87 = 0x612B
+0x5D97 = 0x6140
+0x5D99 = 0x6157
+0x5D9D = 0x6158
+0x5DA0 = 0x613D
+0x5DA7 = 0x613B
+0x5DB7 = 0x615A
+0x5DB8 = 0x6149
+0x5DBA = 0x416B
+0x5DBC = 0x536C
+0x5DCB = 0x3F79
+0x5DCD = 0x4E21
+0x5DD2 = 0x424D
+0x5DD4 = 0x615B
+0x5DDB = 0x675D
+0x5DDD = 0x3428
+0x5DDE = 0x565D
+0x5DE1 = 0x5132
+0x5DE2 = 0x3332
+0x5DE5 = 0x3924
+0x5DE6 = 0x5773
+0x5DE7 = 0x4749
+0x5DE8 = 0x3E5E
+0x5DEB = 0x4E57
+0x5DEE = 0x326E
+0x5DF0 = 0x5B4F
+0x5DF1 = 0x3C3A
+0x5DF2 = 0x5251
+0x5DF3 = 0x4B48
+0x5DF4 = 0x304D
+0x5DF7 = 0x4F6F
+0x5DFD = 0x5963
+0x5DFE = 0x3D6D
+0x5E02 = 0x4A50
+0x5E03 = 0x323C
+0x5E06 = 0x372B
+0x5E0C = 0x4F23
+0x5E11 = 0x607B
+0x5E14 = 0x607A
+0x5E15 = 0x4541
+0x5E16 = 0x4C7B
+0x5E18 = 0x7850
+0x5E19 = 0x6079
+0x5E1A = 0x5663
+0x5E1B = 0x322F
+0x5E1D = 0x355B
+0x5E25 = 0x4B27
+0x5E2B = 0x4A26
+0x5E2D = 0x4F2F
+0x5E33 = 0x554A
+0x5E36 = 0x3478
+0x5E37 = 0x6121
+0x5E38 = 0x3323
+0x5E3D = 0x4331
+0x5E40 = 0x5621
+0x5E42 = 0x435D
+0x5E43 = 0x6078
+0x5E44 = 0x6122
+0x5E45 = 0x3779
+0x5E4C = 0x3B4F
+0x5E54 = 0x6123
+0x5E55 = 0x443B
+0x5E57 = 0x607E
+0x5E58 = 0x607D
+0x5E5B = 0x6124
+0x5E5E = 0x6125
+0x5E5F = 0x5644
+0x5E61 = 0x6126
+0x5E62 = 0x3431
+0x5E63 = 0x3152
+0x5E6B = 0x306F
+0x5E6C = 0x607C
+0x5E72 = 0x7835
+0x5E73 = 0x463D
+0x5E74 = 0x446A
+0x5E76 = 0x3222
+0x5E78 = 0x5052
+0x5E79 = 0x3849
+0x5E7A = 0x675B
+0x5E7B = 0x3B43
+0x5E7C = 0x5357
+0x5E7D = 0x5344
+0x5E7E = 0x3C38
+0x5E7F = 0x7838
+0x5E80 = 0x624F
+0x5E87 = 0x3153
+0x5E8A = 0x3432
+0x5E8B = 0x6251
+0x5E8F = 0x5072
+0x5E95 = 0x3557
+0x5E96 = 0x6252
+0x5E97 = 0x356A
+0x5E9A = 0x387D
+0x5E9C = 0x382E
+0x5EA0 = 0x6254
+0x5EA5 = 0x6253
+0x5EA6 = 0x3648
+0x5EA7 = 0x5779
+0x5EAB = 0x3F62
+0x5EAD = 0x4D25
+0x5EB3 = 0x6258
+0x5EB5 = 0x6256
+0x5EB6 = 0x4A7C
+0x5EB7 = 0x3F35
+0x5EB8 = 0x5339
+0x5EB9 = 0x6255
+0x5EBE = 0x6257
+0x5EC9 = 0x412E
+0x5ECA = 0x4048
+0x5ED1 = 0x625B
+0x5ED2 = 0x625A
+0x5ED3 = 0x402A
+0x5ED6 = 0x414E
+0x5EDB = 0x625C
+0x5EDF = 0x436D
+0x5EE0 = 0x3327
+0x5EE1 = 0x6250
+0x5EE2 = 0x374F
+0x5EE3 = 0x3963
+0x5EE8 = 0x625D
+0x5EEA = 0x625E
+0x5EEC = 0x422E
+0x5EF3 = 0x4C7C
+0x5EF4 = 0x5B48
+0x5EF6 = 0x5153
+0x5EF7 = 0x4D22
+0x5EFA = 0x3D28
+0x5EFE = 0x5E43
+0x5EFF = 0x5825
+0x5F01 = 0x5B4D
+0x5F02 = 0x526C
+0x5F04 = 0x452A
+0x5F08 = 0x5E44
+0x5F0A = 0x3157
+0x5F0B = 0x5F2E
+0x5F0F = 0x4A3D
+0x5F11 = 0x5F31
+0x5F13 = 0x392D
+0x5F15 = 0x527D
+0x5F17 = 0x3825
+0x5F18 = 0x3A6B
+0x5F1B = 0x335A
+0x5F1F = 0x355C
+0x5F26 = 0x4F52
+0x5F27 = 0x3B21
+0x5F29 = 0x6573
+0x5F2D = 0x6574
+0x5F31 = 0x4875
+0x5F33 = 0x6572
+0x5F35 = 0x5545
+0x5F3A = 0x473F
+0x5F3C = 0x6576
+0x5F40 = 0x6C30
+0x5F46 = 0x7824
+0x5F48 = 0x352F
+0x5F4C = 0x4356
+0x5F4E = 0x4D64
+0x5F50 = 0x6566
+0x5F56 = 0x6568
+0x5F57 = 0x6567
+0x5F58 = 0x6569
+0x5F59 = 0x783D
+0x5F5D = 0x524D
+0x5F61 = 0x616A
+0x5F62 = 0x504E
+0x5F64 = 0x4D2E
+0x5F66 = 0x5165
+0x5F69 = 0x324A
+0x5F6A = 0x316B
+0x5F6C = 0x3172
+0x5F6D = 0x456D
+0x5F70 = 0x5543
+0x5F71 = 0x5330
+0x5F73 = 0x615C
+0x5F77 = 0x615D
+0x5F79 = 0x525B
+0x5F7C = 0x314B
+0x5F80 = 0x4D79
+0x5F81 = 0x5577
+0x5F82 = 0x615E
+0x5F85 = 0x347D
+0x5F87 = 0x615F
+0x5F88 = 0x3A5C
+0x5F89 = 0x6160
+0x5F8A = 0x3B32
+0x5F8B = 0x4249
+0x5F8C = 0x3A73
+0x5F90 = 0x506C
+0x5F91 = 0x3E36
+0x5F92 = 0x4D3D
+0x5F97 = 0x3543
+0x5F98 = 0x4547
+0x5F99 = 0x6163
+0x5F9C = 0x6164
+0x5F9E = 0x3453
+0x5FA0 = 0x6162
+0x5FA1 = 0x5379
+0x5FA8 = 0x6165
+0x5FA9 = 0x3834
+0x5FAA = 0x512D
+0x5FAD = 0x6166
+0x5FAE = 0x4E22
+0x5FB5 = 0x6167
+0x5FB7 = 0x3542
+0x5FB9 = 0x3339
+0x5FBC = 0x6168
+0x5FBD = 0x3B55
+0x5FC3 = 0x5044
+0x5FC4 = 0x6260
+0x5FC5 = 0x3158
+0x5FC9 = 0x6261
+0x5FCC = 0x3C49
+0x5FCD = 0x484C
+0x5FD0 = 0x6C7E
+0x5FD1 = 0x6C7D
+0x5FD2 = 0x5F2F
+0x5FD6 = 0x6262
+0x5FD7 = 0x563E
+0x5FD8 = 0x4D7C
+0x5FD9 = 0x4326
+0x5FDD = 0x6343
+0x5FE0 = 0x5652
+0x5FE1 = 0x6267
+0x5FE4 = 0x6268
+0x5FEA = 0x626C
+0x5FEB = 0x3F6C
+0x5FED = 0x626D
+0x5FEE = 0x6265
+0x5FF1 = 0x3340
+0x5FF5 = 0x446E
+0x5FF8 = 0x626E
+0x5FFB = 0x5043
+0x5FFD = 0x3A76
+0x5FFF = 0x375E
+0x600A = 0x6277
+0x600D = 0x6274
+0x600E = 0x5475
+0x600F = 0x6273
+0x6012 = 0x452D
+0x6014 = 0x557A
+0x6015 = 0x4542
+0x6016 = 0x3240
+0x6019 = 0x626F
+0x601B = 0x6272
+0x601D = 0x4B3C
+0x6020 = 0x3521
+0x6021 = 0x6279
+0x6025 = 0x3C31
+0x6026 = 0x6271
+0x6027 = 0x5054
+0x6028 = 0x5439
+0x6029 = 0x6275
+0x602A = 0x3956
+0x602B = 0x6276
+0x602F = 0x4753
+0x6035 = 0x6270
+0x6041 = 0x6D25
+0x6042 = 0x627E
+0x6043 = 0x4A51
+0x604D = 0x3B50
+0x6050 = 0x3F56
+0x6052 = 0x3A63
+0x6055 = 0x4B21
+0x6059 = 0x6D26
+0x605A = 0x6D23
+0x605D = 0x6D22
+0x6062 = 0x3B56
+0x6063 = 0x6D27
+0x6064 = 0x5074
+0x6067 = 0x6D24
+0x6068 = 0x3A5E
+0x6069 = 0x3677
+0x606A = 0x6321
+0x606B = 0x3632
+0x606C = 0x4C71
+0x606D = 0x3927
+0x606F = 0x4F22
+0x6070 = 0x4721
+0x607F = 0x5341
+0x6083 = 0x6327
+0x6084 = 0x4744
+0x6089 = 0x4F24
+0x608C = 0x6329
+0x608D = 0x3A37
+0x6092 = 0x6328
+0x6094 = 0x3B5A
+0x6096 = 0x6323
+0x609A = 0x6324
+0x609B = 0x632A
+0x609D = 0x6326
+0x609F = 0x4E72
+0x60A0 = 0x5346
+0x60A3 = 0x3B3C
+0x60A6 = 0x5443
+0x60A8 = 0x447A
+0x60B1 = 0x632D
+0x60B2 = 0x312F
+0x60B4 = 0x6332
+0x60B5 = 0x626A
+0x60B6 = 0x4346
+0x60B8 = 0x3C42
+0x60BB = 0x632C
+0x60BC = 0x353F
+0x60C5 = 0x4769
+0x60C6 = 0x6330
+0x60CB = 0x4D6F
+0x60D1 = 0x3B73
+0x60D5 = 0x4C68
+0x60D8 = 0x632F
+0x60DA = 0x6331
+0x60DC = 0x4F27
+0x60DD = 0x632E
+0x60DF = 0x4E29
+0x60E0 = 0x3B5D
+0x60E1 = 0x3671
+0x60E6 = 0x356B
+0x60F0 = 0x3668
+0x60F1 = 0x4455
+0x60F2 = 0x6322
+0x60F3 = 0x4F6B
+0x60F4 = 0x6337
+0x60F6 = 0x3B4C
+0x60F9 = 0x4847
+0x60FA = 0x504A
+0x60FB = 0x627C
+0x6100 = 0x6338
+0x6101 = 0x336E
+0x6106 = 0x6D29
+0x6108 = 0x537A
+0x6109 = 0x5364
+0x610D = 0x6D2A
+0x610E = 0x6339
+0x610F = 0x5262
+0x6115 = 0x6335
+0x611A = 0x535E
+0x611B = 0x302E
+0x611C = 0x632B
+0x611F = 0x3850
+0x6120 = 0x6333
+0x6123 = 0x6336
+0x6127 = 0x4022
+0x612B = 0x633A
+0x6134 = 0x626B
+0x6137 = 0x627D
+0x613E = 0x6269
+0x613F = 0x787C
+0x6148 = 0x3448
+0x614A = 0x633B
+0x614B = 0x4C2C
+0x614C = 0x3B45
+0x614E = 0x4977
+0x6155 = 0x443D
+0x6158 = 0x3252
+0x615A = 0x3251
+0x615D = 0x6D2B
+0x615F = 0x627A
+0x6162 = 0x427D
+0x6163 = 0x395F
+0x6164 = 0x6D28
+0x6167 = 0x3B5B
+0x6168 = 0x3F2E
+0x616A = 0x6266
+0x616B = 0x4B4B
+0x616E = 0x4247
+0x6170 = 0x4E3F
+0x6173 = 0x6325
+0x6175 = 0x633C
+0x6176 = 0x476C
+0x6177 = 0x3F36
+0x6182 = 0x5347
+0x618A = 0x3139
+0x618B = 0x316F
+0x618E = 0x5477
+0x6190 = 0x412F
+0x6191 = 0x463E
+0x6192 = 0x6334
+0x6194 = 0x633E
+0x619A = 0x352C
+0x619D = 0x6D2D
+0x61A4 = 0x375F
+0x61A7 = 0x633F
+0x61A8 = 0x3A29
+0x61A9 = 0x6D2C
+0x61AB = 0x4375
+0x61AC = 0x633D
+0x61AE = 0x6264
+0x61B2 = 0x4F5C
+0x61B6 = 0x5264
+0x61B7 = 0x6340
+0x61BE = 0x3A36
+0x61C2 = 0x362E
+0x61C7 = 0x3F52
+0x61C8 = 0x5038
+0x61C9 = 0x5326
+0x61CA = 0x3043
+0x61CB = 0x6D2E
+0x61CC = 0x6278
+0x61D4 = 0x6341
+0x61DE = 0x7856
+0x61DF = 0x6D21
+0x61E3 = 0x6D2F
+0x61E6 = 0x4533
+0x61E8 = 0x627B
+0x61F2 = 0x334D
+0x61F5 = 0x6342
+0x61F6 = 0x4041
+0x61F7 = 0x3B33
+0x61F8 = 0x507C
+0x61FA = 0x6263
+0x61FC = 0x3E65
+0x61FE = 0x4965
+0x61FF = 0x5C32
+0x6200 = 0x4135
+0x6207 = 0x6D30
+0x6208 = 0x386A
+0x620A = 0x4E6C
+0x620C = 0x5067
+0x620D = 0x4A79
+0x620E = 0x4856
+0x6210 = 0x3349
+0x6211 = 0x4E52
+0x6212 = 0x3D64
+0x6214 = 0x6A27
+0x6215 = 0x635E
+0x6216 = 0x3B72
+0x621A = 0x465D
+0x621B = 0x6A29
+0x621F = 0x6A2A
+0x6221 = 0x6A2C
+0x6222 = 0x6A2B
+0x6224 = 0x6A2E
+0x6225 = 0x6A2D
+0x6227 = 0x6A28
+0x6229 = 0x6A2F
+0x622A = 0x3D58
+0x622E = 0x423E
+0x6230 = 0x553D
+0x6232 = 0x4F37
+0x6233 = 0x3441
+0x6234 = 0x3477
+0x6237 = 0x3B27
+0x623D = 0x6C66
+0x623E = 0x6C65
+0x623F = 0x373F
+0x6240 = 0x4B79
+0x6241 = 0x3162
+0x6243 = 0x6C67
+0x6247 = 0x4948
+0x6248 = 0x6C68
+0x6249 = 0x6C69
+0x624B = 0x4A56
+0x624C = 0x5E50
+0x624D = 0x3245
+0x624E = 0x547A
+0x6251 = 0x785E
+0x6252 = 0x3047
+0x6253 = 0x3472
+0x6254 = 0x4853
+0x6258 = 0x4D50
+0x625B = 0x3F38
+0x6263 = 0x3F5B
+0x6266 = 0x4724
+0x626D = 0x4524
+0x626E = 0x3067
+0x626F = 0x3336
+0x6273 = 0x3062
+0x6276 = 0x3776
+0x6279 = 0x457A
+0x627C = 0x3673
+0x627E = 0x5552
+0x627F = 0x3350
+0x6280 = 0x3C3C
+0x6284 = 0x332D
+0x6289 = 0x3E71
+0x628A = 0x3051
+0x6291 = 0x5256
+0x6292 = 0x4A63
+0x6293 = 0x5725
+0x6295 = 0x4D36
+0x6296 = 0x3636
+0x6297 = 0x3F39
+0x6298 = 0x555B
+0x629B = 0x4557
+0x62A8 = 0x456A
+0x62AB = 0x457B
+0x62AC = 0x4C27
+0x62B1 = 0x3127
+0x62B5 = 0x3556
+0x62B9 = 0x4428
+0x62BB = 0x5E53
+0x62BC = 0x513A
+0x62BD = 0x3369
+0x62BF = 0x4372
+0x62C2 = 0x3777
+0x62C4 = 0x5674
+0x62C6 = 0x3270
+0x62C7 = 0x4434
+0x62C8 = 0x4469
+0x62C9 = 0x402D
+0x62CA = 0x5E54
+0x62CC = 0x3068
+0x62CD = 0x4544
+0x62CE = 0x4160
+0x62D0 = 0x3955
+0x62D2 = 0x3E5C
+0x62D3 = 0x4D58
+0x62D4 = 0x304E
+0x62D6 = 0x4D4F
+0x62D7 = 0x5E56
+0x62D8 = 0x3E50
+0x62D9 = 0x573E
+0x62DA = 0x5E55
+0x62DB = 0x5550
+0x62DC = 0x305D
+0x62EC = 0x4028
+0x62ED = 0x4A43
+0x62EE = 0x5E57
+0x62EF = 0x557C
+0x62F1 = 0x3930
+0x62F3 = 0x482D
+0x62F4 = 0x4B29
+0x62F6 = 0x5E59
+0x62F7 = 0x3F3D
+0x62FC = 0x4634
+0x62FD = 0x5727
+0x62FE = 0x4A30
+0x62FF = 0x4443
+0x6301 = 0x3356
+0x6302 = 0x3952
+0x6307 = 0x5638
+0x6308 = 0x6A7C
+0x6309 = 0x3034
+0x630E = 0x3F66
+0x6311 = 0x4C74
+0x6316 = 0x4D5A
+0x6328 = 0x3024
+0x632A = 0x4532
+0x632B = 0x346C
+0x632F = 0x5571
+0x6332 = 0x6A7D
+0x6339 = 0x5E5A
+0x633A = 0x4D26
+0x633D = 0x4D6C
+0x633E = 0x502E
+0x6342 = 0x4E66
+0x6343 = 0x5E5C
+0x6345 = 0x4D31
+0x6346 = 0x4026
+0x6349 = 0x573D
+0x634B = 0x5E5B
+0x634C = 0x3046
+0x634D = 0x3A34
+0x634E = 0x4953
+0x634F = 0x4473
+0x6350 = 0x3E68
+0x6355 = 0x3236
+0x6367 = 0x4575
+0x6368 = 0x4961
+0x6369 = 0x5E66
+0x636B = 0x5E51
+0x636D = 0x5E63
+0x636E = 0x7846
+0x6371 = 0x5E5F
+0x6372 = 0x7847
+0x6376 = 0x3437
+0x6377 = 0x3D5D
+0x637A = 0x5E60
+0x637B = 0x446D
+0x6380 = 0x4F46
+0x6382 = 0x3560
+0x6383 = 0x4928
+0x6384 = 0x4255
+0x6387 = 0x365E
+0x6388 = 0x4A5A
+0x6389 = 0x3574
+0x638A = 0x5E65
+0x638C = 0x5546
+0x638E = 0x5E61
+0x638F = 0x4C4D
+0x6390 = 0x467E
+0x6392 = 0x4545
+0x6396 = 0x5234
+0x6398 = 0x3E72
+0x6399 = 0x5575
+0x63A0 = 0x4253
+0x63A2 = 0x4C3D
+0x63A3 = 0x3338
+0x63A5 = 0x3D53
+0x63A7 = 0x3F58
+0x63A8 = 0x4D46
+0x63A9 = 0x515A
+0x63AA = 0x346B
+0x63AC = 0x5E64
+0x63AD = 0x5E5D
+0x63AE = 0x5E67
+0x63B0 = 0x6A7E
+0x63BE = 0x5E72
+0x63C0 = 0x3C70
+0x63C4 = 0x5E6D
+0x63C6 = 0x5E71
+0x63C9 = 0x4860
+0x63CD = 0x5761
+0x63CE = 0x5E6F
+0x63CF = 0x4368
+0x63D0 = 0x4C61
+0x63D2 = 0x3265
+0x63D6 = 0x523E
+0x63DA = 0x516F
+0x63DB = 0x3B3B
+0x63DE = 0x5E6E
+0x63E0 = 0x5E6B
+0x63E1 = 0x4E55
+0x63E3 = 0x3427
+0x63E9 = 0x3F2B
+0x63EA = 0x3E3E
+0x63ED = 0x3D52
+0x63EE = 0x3B53
+0x63F2 = 0x5E69
+0x63F4 = 0x542E
+0x63F6 = 0x5E5E
+0x63F8 = 0x5E6A
+0x640B = 0x5E75
+0x640C = 0x5E78
+0x640D = 0x4B70
+0x640F = 0x322B
+0x6410 = 0x3424
+0x6413 = 0x346A
+0x6414 = 0x4926
+0x6417 = 0x3537
+0x641B = 0x5E76
+0x641C = 0x4B51
+0x641E = 0x3863
+0x6420 = 0x5E77
+0x6421 = 0x5E7A
+0x6426 = 0x5E79
+0x642A = 0x4C42
+0x642C = 0x3061
+0x642D = 0x346E
+0x6434 = 0x653A
+0x6436 = 0x4740
+0x643A = 0x502F
+0x643D = 0x326B
+0x643F = 0x6B21
+0x6441 = 0x5E74
+0x6447 = 0x5221
+0x6451 = 0x5E62
+0x6452 = 0x5E70
+0x6454 = 0x4B24
+0x6458 = 0x552A
+0x645C = 0x5E68
+0x645E = 0x5E7B
+0x645F = 0x4227
+0x6467 = 0x345D
+0x6469 = 0x4426
+0x646D = 0x5E7D
+0x646F = 0x563F
+0x6473 = 0x3F59
+0x6476 = 0x5E52
+0x6478 = 0x437E
+0x6479 = 0x4421
+0x647A = 0x5F21
+0x647B = 0x3274
+0x6482 = 0x414C
+0x6485 = 0x3E6F
+0x6487 = 0x4632
+0x6488 = 0x404C
+0x6491 = 0x3345
+0x6492 = 0x4876
+0x6493 = 0x4453
+0x6495 = 0x4B3A
+0x6496 = 0x5E7E
+0x6499 = 0x5F24
+0x649E = 0x5732
+0x649F = 0x5E58
+0x64A3 = 0x3527
+0x64A4 = 0x3337
+0x64A5 = 0x3226
+0x64A9 = 0x4143
+0x64AB = 0x3827
+0x64AC = 0x474B
+0x64AD = 0x3225
+0x64AE = 0x3469
+0x64B0 = 0x572B
+0x64B2 = 0x464B
+0x64B3 = 0x5E6C
+0x64BB = 0x4C22
+0x64BC = 0x3A33
+0x64BE = 0x4E4E
+0x64BF = 0x3C71
+0x64C0 = 0x5F26
+0x64C1 = 0x5335
+0x64C2 = 0x405E
+0x64C4 = 0x4230
+0x64C5 = 0x4943
+0x64C7 = 0x5471
+0x64CA = 0x3B77
+0x64CB = 0x3532
+0x64CD = 0x3259
+0x64CE = 0x4766
+0x64D0 = 0x5F27
+0x64D2 = 0x475C
+0x64D4 = 0x3523
+0x64D7 = 0x5F28
+0x64D8 = 0x6B22
+0x64DA = 0x3E5D
+0x64E0 = 0x3C37
+0x64E2 = 0x5F2A
+0x64E4 = 0x5F29
+0x64E6 = 0x3241
+0x64EC = 0x4462
+0x64EF = 0x3177
+0x64F0 = 0x4521
+0x64F1 = 0x3869
+0x64F2 = 0x5640
+0x64F4 = 0x4029
+0x64F7 = 0x5F22
+0x64FA = 0x305A
+0x64FB = 0x4B53
+0x64FC = 0x5F23
+0x64FE = 0x4845
+0x6500 = 0x454A
+0x6504 = 0x5E73
+0x6506 = 0x446C
+0x6509 = 0x5F2B
+0x650F = 0x4223
+0x6514 = 0x4039
+0x6516 = 0x5E7C
+0x6518 = 0x4841
+0x6519 = 0x3273
+0x651B = 0x5F25
+0x651D = 0x4963
+0x6522 = 0x545C
+0x6523 = 0x424E
+0x6524 = 0x4C2F
+0x6525 = 0x5F2C
+0x652A = 0x3D41
+0x652B = 0x3E70
+0x652C = 0x403F
+0x652E = 0x5F2D
+0x652F = 0x5627
+0x6534 = 0x6A37
+0x6535 = 0x6B36
+0x6536 = 0x4A55
+0x6538 = 0x587C
+0x6539 = 0x3844
+0x653B = 0x3925
+0x653E = 0x3745
+0x653F = 0x557E
+0x6545 = 0x394A
+0x6548 = 0x5027
+0x6549 = 0x744D
+0x654F = 0x4374
+0x6551 = 0x3E48
+0x6555 = 0x6B37
+0x6556 = 0x303D
+0x6557 = 0x305C
+0x6559 = 0x3D4C
+0x655D = 0x3156
+0x655E = 0x3328
+0x6562 = 0x3852
+0x6563 = 0x4922
+0x6566 = 0x3658
+0x656B = 0x6B38
+0x656C = 0x3E34
+0x6572 = 0x4743
+0x6574 = 0x557B
+0x6575 = 0x3550
+0x6577 = 0x3773
+0x6578 = 0x4A7D
+0x6582 = 0x4132
+0x6583 = 0x3150
+0x6587 = 0x4E44
+0x658C = 0x3173
+0x6590 = 0x6C33
+0x6591 = 0x305F
+0x6595 = 0x6C35
+0x6597 = 0x782F
+0x6599 = 0x414F
+0x659B = 0x757A
+0x659C = 0x5031
+0x659F = 0x5565
+0x65A1 = 0x4E53
+0x65A4 = 0x3D6F
+0x65A5 = 0x3362
+0x65A7 = 0x382B
+0x65AB = 0x6D3D
+0x65AC = 0x5536
+0x65AF = 0x4B39
+0x65B0 = 0x5042
+0x65B7 = 0x364F
+0x65B9 = 0x373D
+0x65BC = 0x6C36
+0x65BD = 0x4A29
+0x65C1 = 0x4554
+0x65C3 = 0x6C39
+0x65C4 = 0x6C38
+0x65C5 = 0x4243
+0x65C6 = 0x6C37
+0x65CB = 0x507D
+0x65CC = 0x6C3A
+0x65CE = 0x6C3B
+0x65CF = 0x5765
+0x65D2 = 0x6C3C
+0x65D6 = 0x6C3D
+0x65D7 = 0x466C
+0x65E2 = 0x3C48
+0x65E5 = 0x4855
+0x65E6 = 0x3529
+0x65E8 = 0x563C
+0x65E9 = 0x5467
+0x65EC = 0x512E
+0x65ED = 0x5071
+0x65EE = 0x6A38
+0x65EF = 0x6A39
+0x65F0 = 0x6A3A
+0x65F1 = 0x3A35
+0x65FA = 0x4D7A
+0x6600 = 0x6A40
+0x6602 = 0x303A
+0x6603 = 0x6A3E
+0x6606 = 0x4025
+0x660A = 0x6A3B
+0x660C = 0x327D
+0x660E = 0x4377
+0x660F = 0x3B68
+0x6613 = 0x5257
+0x6614 = 0x4E74
+0x6615 = 0x6A3F
+0x661D = 0x6A43
+0x661F = 0x5047
+0x6620 = 0x5333
+0x6625 = 0x343A
+0x6627 = 0x4341
+0x6628 = 0x5772
+0x662D = 0x5551
+0x662F = 0x4A47
+0x6631 = 0x6A45
+0x6634 = 0x6A44
+0x6635 = 0x6A47
+0x6636 = 0x6A46
+0x6641 = 0x6A4B
+0x6642 = 0x4A31
+0x6643 = 0x3B4E
+0x6649 = 0x3D7A
+0x664C = 0x494E
+0x664F = 0x6A4C
+0x6657 = 0x6A4F
+0x665A = 0x4D6D
+0x665D = 0x5667
+0x665F = 0x6A49
+0x6661 = 0x6A4E
+0x6664 = 0x4E6E
+0x6666 = 0x3B5E
+0x6668 = 0x333F
+0x666E = 0x4655
+0x666F = 0x3E30
+0x6670 = 0x4E7A
+0x6674 = 0x4767
+0x6676 = 0x3E27
+0x6677 = 0x6A50
+0x667A = 0x5647
+0x667E = 0x4140
+0x6684 = 0x6A51
+0x6687 = 0x4F3E
+0x6688 = 0x544E
+0x6689 = 0x6A4D
+0x668C = 0x6A52
+0x6691 = 0x4A6E
+0x6696 = 0x452F
+0x6697 = 0x3035
+0x669D = 0x6A54
+0x66A2 = 0x3329
+0x66A8 = 0x745F
+0x66AB = 0x545D
+0x66AE = 0x443A
+0x66B4 = 0x3129
+0x66B9 = 0x655F
+0x66BE = 0x6A55
+0x66C4 = 0x6A4A
+0x66C6 = 0x784F
+0x66C7 = 0x6A3C
+0x66C9 = 0x4F7E
+0x66D6 = 0x6A53
+0x66D9 = 0x4A6F
+0x66DB = 0x6A56
+0x66DC = 0x6A57
+0x66DD = 0x4658
+0x66E0 = 0x3F75
+0x66E6 = 0x6A58
+0x66E9 = 0x6A59
+0x66EC = 0x4939
+0x66F0 = 0x543B
+0x66F2 = 0x477A
+0x66F3 = 0x5237
+0x66F4 = 0x387C
+0x66F7 = 0x6A42
+0x66F8 = 0x4A69
+0x66F9 = 0x325C
+0x66FC = 0x427C
+0x66FE = 0x5478
+0x66FF = 0x4C66
+0x6700 = 0x576E
+0x6703 = 0x3B61
+0x6708 = 0x5442
+0x6709 = 0x5350
+0x670A = 0x6B43
+0x670B = 0x4573
+0x670D = 0x377E
+0x6710 = 0x6B54
+0x6714 = 0x4B37
+0x6715 = 0x6B5E
+0x6717 = 0x404A
+0x671B = 0x4D7B
+0x671D = 0x332F
+0x671F = 0x465A
+0x6726 = 0x6B7C
+0x6727 = 0x6B4A
+0x6728 = 0x443E
+0x672A = 0x4E34
+0x672B = 0x4429
+0x672C = 0x313E
+0x672D = 0x547D
+0x672F = 0x7868
+0x6731 = 0x566C
+0x6734 = 0x7860
+0x6735 = 0x3664
+0x673D = 0x5060
+0x6746 = 0x384B
+0x6748 = 0x683E
+0x6749 = 0x493C
+0x674C = 0x683B
+0x674E = 0x406E
+0x674F = 0x5053
+0x6750 = 0x3244
+0x6751 = 0x3465
+0x6753 = 0x683C
+0x6756 = 0x5548
+0x675C = 0x3645
+0x675E = 0x683D
+0x675F = 0x4A78
+0x6760 = 0x385C
+0x676A = 0x6842
+0x676D = 0x3A3C
+0x676F = 0x312D
+0x6770 = 0x3D5C
+0x6771 = 0x362B
+0x6772 = 0x6A3D
+0x6773 = 0x6843
+0x6775 = 0x6846
+0x6777 = 0x684B
+0x677C = 0x684C
+0x677E = 0x7869
+0x677F = 0x3065
+0x6787 = 0x6841
+0x6789 = 0x4D77
+0x678B = 0x684A
+0x6790 = 0x4E76
+0x6795 = 0x556D
+0x6797 = 0x4156
+0x6798 = 0x6844
+0x679A = 0x4336
+0x679C = 0x397B
+0x679D = 0x5626
+0x67AF = 0x3F5D
+0x67B0 = 0x6852
+0x67B3 = 0x6857
+0x67B5 = 0x6855
+0x67B6 = 0x3C5C
+0x67B7 = 0x3C4F
+0x67B8 = 0x685B
+0x67C1 = 0x685E
+0x67C3 = 0x685A
+0x67C4 = 0x317A
+0x67CF = 0x3058
+0x67D0 = 0x4433
+0x67D1 = 0x384C
+0x67D2 = 0x4662
+0x67D3 = 0x483E
+0x67D4 = 0x4861
+0x67D8 = 0x684F
+0x67D9 = 0x6854
+0x67DA = 0x6856
+0x67DD = 0x6858
+0x67DE = 0x5775
+0x67E2 = 0x685C
+0x67E5 = 0x3269
+0x67E9 = 0x6851
+0x67EC = 0x3C6D
+0x67EF = 0x3F42
+0x67F0 = 0x684D
+0x67F1 = 0x5679
+0x67F3 = 0x4178
+0x67F4 = 0x3271
+0x67FF = 0x4A41
+0x6800 = 0x6859
+0x6805 = 0x5524
+0x6813 = 0x4B28
+0x6817 = 0x4075
+0x681D = 0x6869
+0x6821 = 0x5023
+0x6829 = 0x6872
+0x682A = 0x566A
+0x6832 = 0x6860
+0x6833 = 0x6861
+0x6838 = 0x3A4B
+0x6839 = 0x3879
+0x683C = 0x3871
+0x683D = 0x5454
+0x6840 = 0x686E
+0x6841 = 0x686C
+0x6842 = 0x3970
+0x6843 = 0x4C52
+0x6844 = 0x6866
+0x6845 = 0x4E26
+0x6846 = 0x3F72
+0x6848 = 0x3038
+0x6849 = 0x6871
+0x684A = 0x6870
+0x684C = 0x5740
+0x684E = 0x6864
+0x6850 = 0x4D29
+0x6851 = 0x4923
+0x6853 = 0x3B38
+0x6854 = 0x3D5B
+0x6855 = 0x686A
+0x686B = 0x6878
+0x6874 = 0x6875
+0x6876 = 0x4D30
+0x6877 = 0x6876
+0x6881 = 0x413A
+0x6883 = 0x6868
+0x6885 = 0x4337
+0x6886 = 0x3070
+0x688F = 0x6874
+0x6893 = 0x6877
+0x6897 = 0x3923
+0x6898 = 0x6845
+0x689D = 0x4C75
+0x689F = 0x6849
+0x68A2 = 0x4952
+0x68A7 = 0x4E60
+0x68A8 = 0x4066
+0x68AD = 0x4B73
+0x68AF = 0x4C5D
+0x68B0 = 0x5035
+0x68B3 = 0x4A61
+0x68B5 = 0x6873
+0x68C4 = 0x467A
+0x68C9 = 0x435E
+0x68CB = 0x4665
+0x68CD = 0x3977
+0x68D2 = 0x3074
+0x68D5 = 0x5758
+0x68D6 = 0x6847
+0x68D7 = 0x5466
+0x68D8 = 0x3C2C
+0x68DA = 0x456F
+0x68DF = 0x3630
+0x68E0 = 0x4C44
+0x68E3 = 0x6926
+0x68E7 = 0x553B
+0x68EE = 0x492D
+0x68F0 = 0x6922
+0x68F1 = 0x4062
+0x68F2 = 0x465C
+0x68F5 = 0x3F43
+0x68F9 = 0x687E
+0x68FA = 0x3957
+0x68FC = 0x687B
+0x6901 = 0x6924
+0x6905 = 0x524E
+0x690B = 0x6923
+0x690D = 0x5632
+0x690E = 0x5735
+0x690F = 0x6862
+0x6910 = 0x6927
+0x6912 = 0x3D37
+0x6930 = 0x522C
+0x6934 = 0x6932
+0x6939 = 0x6929
+0x693D = 0x342A
+0x693F = 0x343B
+0x6942 = 0x692B
+0x694A = 0x516E
+0x6953 = 0x3763
+0x6954 = 0x5028
+0x6957 = 0x6925
+0x695A = 0x337E
+0x695D = 0x692C
+0x695E = 0x4063
+0x6960 = 0x692A
+0x6963 = 0x6939
+0x6966 = 0x6938
+0x6968 = 0x6865
+0x696B = 0x692E
+0x696D = 0x5235
+0x696E = 0x687A
+0x6971 = 0x6928
+0x6975 = 0x3C2B
+0x6977 = 0x3F2C
+0x6978 = 0x6931
+0x6979 = 0x693A
+0x6980 = 0x692F
+0x6982 = 0x3845
+0x6986 = 0x535C
+0x698D = 0x6947
+0x6994 = 0x4046
+0x6995 = 0x6945
+0x6998 = 0x6930
+0x699B = 0x693B
+0x699C = 0x3071
+0x69A7 = 0x693C
+0x69A8 = 0x5525
+0x69AA = 0x683F
+0x69AB = 0x693E
+0x69AD = 0x693F
+0x69AE = 0x4859
+0x69B1 = 0x6941
+0x69B4 = 0x4171
+0x69B7 = 0x4836
+0x69BB = 0x693D
+0x69BF = 0x6867
+0x69C1 = 0x6942
+0x69CA = 0x6943
+0x69CB = 0x3939
+0x69CC = 0x6933
+0x69CD = 0x4739
+0x69CE = 0x6936
+0x69D0 = 0x3B31
+0x69D4 = 0x6940
+0x69E7 = 0x687D
+0x69ED = 0x694A
+0x69F2 = 0x694E
+0x69F3 = 0x3D30
+0x69FD = 0x325B
+0x69FF = 0x6948
+0x6A01 = 0x572E
+0x6A02 = 0x4056
+0x6A05 = 0x6848
+0x6A0A = 0x372E
+0x6A13 = 0x4225
+0x6A17 = 0x694B
+0x6A18 = 0x694C
+0x6A19 = 0x316A
+0x6A1E = 0x4A60
+0x6A1F = 0x5541
+0x6A21 = 0x4423
+0x6A23 = 0x5179
+0x6A28 = 0x6958
+0x6A2A = 0x3A61
+0x6A35 = 0x6954
+0x6A38 = 0x4653
+0x6A39 = 0x4A77
+0x6A3A = 0x686B
+0x6A3D = 0x6957
+0x6A3E = 0x6950
+0x6A44 = 0x694F
+0x6A47 = 0x4741
+0x6A48 = 0x6863
+0x6A4B = 0x4745
+0x6A50 = 0x6952
+0x6A58 = 0x6959
+0x6A59 = 0x3348
+0x6A5B = 0x6953
+0x6A5F = 0x3B7A
+0x6A61 = 0x4F70
+0x6A62 = 0x4D56
+0x6A65 = 0x694D
+0x6A71 = 0x3377
+0x6A80 = 0x4C34
+0x6A84 = 0x4F2D
+0x6A89 = 0x685F
+0x6A8E = 0x6955
+0x6A90 = 0x695C
+0x6A91 = 0x695B
+0x6A94 = 0x3535
+0x6A97 = 0x695E
+0x6A9C = 0x686D
+0x6AA0 = 0x6951
+0x6AA2 = 0x3C6C
+0x6AA3 = 0x6949
+0x6AA9 = 0x695D
+0x6AAB = 0x695F
+0x6AAC = 0x434A
+0x6AAF = 0x786D
+0x6AB3 = 0x6944
+0x6AB8 = 0x447B
+0x6ABB = 0x3C77
+0x6AC3 = 0x3971
+0x6AD3 = 0x6956
+0x6ADA = 0x6935
+0x6ADB = 0x684E
+0x6ADD = 0x687C
+0x6ADE = 0x695A
+0x6ADF = 0x685D
+0x6AE7 = 0x6946
+0x6AE8 = 0x6853
+0x6AEA = 0x6840
+0x6AEC = 0x6934
+0x6AF3 = 0x6850
+0x6AF8 = 0x6937
+0x6AFB = 0x5323
+0x6B04 = 0x4038
+0x6B0A = 0x4828
+0x6B0F = 0x6921
+0x6B12 = 0x686F
+0x6B16 = 0x692D
+0x6B1E = 0x6879
+0x6B20 = 0x4737
+0x6B21 = 0x344E
+0x6B23 = 0x5040
+0x6B32 = 0x537B
+0x6B37 = 0x6C24
+0x6B39 = 0x6C25
+0x6B3A = 0x465B
+0x6B3D = 0x4755
+0x6B3E = 0x3F6E
+0x6B43 = 0x6C26
+0x6B46 = 0x6C27
+0x6B47 = 0x502A
+0x6B49 = 0x4738
+0x6B4C = 0x3868
+0x6B50 = 0x4537
+0x6B59 = 0x6C28
+0x6B5F = 0x6C23
+0x6B61 = 0x3B36
+0x6B62 = 0x5639
+0x6B63 = 0x557D
+0x6B64 = 0x344B
+0x6B65 = 0x323D
+0x6B66 = 0x4E64
+0x6B67 = 0x4667
+0x6B6A = 0x4D61
+0x6B72 = 0x4B6A
+0x6B77 = 0x407A
+0x6B78 = 0x3969
+0x6B79 = 0x3475
+0x6B7B = 0x4B40
+0x6B81 = 0x6962
+0x6B82 = 0x6963
+0x6B83 = 0x516A
+0x6B84 = 0x6965
+0x6B86 = 0x3479
+0x6B89 = 0x5133
+0x6B8A = 0x4A62
+0x6B8D = 0x6968
+0x6B96 = 0x5633
+0x6B98 = 0x3250
+0x6B9B = 0x696A
+0x6B9E = 0x6966
+0x6BA4 = 0x6964
+0x6BAA = 0x696C
+0x6BAB = 0x6969
+0x6BAE = 0x6967
+0x6BAF = 0x696B
+0x6BB2 = 0x3C5F
+0x6BB3 = 0x6C2F
+0x6BB5 = 0x364E
+0x6BB7 = 0x5273
+0x6BBA = 0x4931
+0x6BBB = 0x3F47
+0x6BBF = 0x356E
+0x6BC1 = 0x3B59
+0x6BC5 = 0x5263
+0x6BC6 = 0x4539
+0x6BCB = 0x4E63
+0x6BCD = 0x4438
+0x6BCF = 0x433F
+0x6BD2 = 0x363E
+0x6BD3 = 0x5839
+0x6BD4 = 0x3148
+0x6BD6 = 0x3151
+0x6BD7 = 0x457E
+0x6BDB = 0x432B
+0x6BEA = 0x6B24
+0x6BEB = 0x3A41
+0x6BEF = 0x4C3A
+0x6BF3 = 0x6B25
+0x6BF9 = 0x6B28
+0x6BFD = 0x6B26
+0x6BFF = 0x6B27
+0x6C05 = 0x6B29
+0x6C06 = 0x6B2B
+0x6C08 = 0x5531
+0x6C0C = 0x6B2A
+0x6C0D = 0x6B2C
+0x6C0F = 0x4A4F
+0x6C10 = 0x5835
+0x6C11 = 0x4371
+0x6C13 = 0x4325
+0x6C15 = 0x6B2D
+0x6C16 = 0x444A
+0x6C18 = 0x6B2E
+0x6C19 = 0x6B2F
+0x6C1A = 0x6B30
+0x6C1B = 0x3755
+0x6C1F = 0x377A
+0x6C21 = 0x6B31
+0x6C23 = 0x4678
+0x6C24 = 0x6B33
+0x6C26 = 0x3A24
+0x6C27 = 0x5175
+0x6C28 = 0x3031
+0x6C2A = 0x6B34
+0x6C2B = 0x4762
+0x6C2C = 0x6B32
+0x6C2E = 0x352A
+0x6C2F = 0x4248
+0x6C30 = 0x4768
+0x6C32 = 0x6B35
+0x6C34 = 0x4B2E
+0x6C35 = 0x635F
+0x6C38 = 0x5340
+0x6C3D = 0x595B
+0x6C40 = 0x4D21
+0x6C41 = 0x562D
+0x6C42 = 0x4773
+0x6C46 = 0x5960
+0x6C4A = 0x6362
+0x6C50 = 0x4F2B
+0x6C54 = 0x6360
+0x6C55 = 0x4947
+0x6C57 = 0x3A39
+0x6C5B = 0x5134
+0x6C5C = 0x6361
+0x6C5D = 0x486A
+0x6C5E = 0x392F
+0x6C5F = 0x3D2D
+0x6C60 = 0x3358
+0x6C61 = 0x4E5B
+0x6C68 = 0x6368
+0x6C69 = 0x6369
+0x6C6A = 0x4D74
+0x6C70 = 0x4C2D
+0x6C72 = 0x3C33
+0x6C74 = 0x636A
+0x6C76 = 0x636B
+0x6C79 = 0x505A
+0x6C7D = 0x467B
+0x6C7E = 0x375A
+0x6C81 = 0x475F
+0x6C82 = 0x524A
+0x6C83 = 0x4E56
+0x6C85 = 0x6364
+0x6C86 = 0x636C
+0x6C88 = 0x4972
+0x6C89 = 0x3341
+0x6C8C = 0x6367
+0x6C8F = 0x4663
+0x6C90 = 0x6365
+0x6C93 = 0x6D33
+0x6C94 = 0x6366
+0x6C99 = 0x4933
+0x6C9B = 0x4566
+0x6CA1 = 0x433B
+0x6CAB = 0x442D
+0x6CAD = 0x6370
+0x6CAE = 0x3E5A
+0x6CB1 = 0x637B
+0x6CB2 = 0x6375
+0x6CB3 = 0x3A53
+0x6CB8 = 0x3750
+0x6CB9 = 0x534D
+0x6CBB = 0x564E
+0x6CBC = 0x5553
+0x6CBD = 0x3941
+0x6CBE = 0x5534
+0x6CBF = 0x5158
+0x6CC4 = 0x5039
+0x6CC5 = 0x4776
+0x6CC9 = 0x482A
+0x6CCA = 0x3234
+0x6CCC = 0x435A
+0x6CD0 = 0x636E
+0x6CD3 = 0x637C
+0x6CD4 = 0x636F
+0x6CD5 = 0x3728
+0x6CD6 = 0x6377
+0x6CD7 = 0x6374
+0x6CDB = 0x373A
+0x6CE0 = 0x6376
+0x6CE1 = 0x455D
+0x6CE2 = 0x3228
+0x6CE3 = 0x467C
+0x6CE5 = 0x4460
+0x6CE8 = 0x5722
+0x6CEA = 0x4061
+0x6CEB = 0x6379
+0x6CEE = 0x637A
+0x6CEF = 0x637D
+0x6CF0 = 0x4C29
+0x6CF1 = 0x6373
+0x6CF3 = 0x533E
+0x6CF5 = 0x3143
+0x6D04 = 0x6427
+0x6D07 = 0x6426
+0x6D0B = 0x5173
+0x6D0C = 0x6423
+0x6D0E = 0x6429
+0x6D17 = 0x4F34
+0x6D19 = 0x6428
+0x6D1A = 0x642E
+0x6D1B = 0x4265
+0x6D1E = 0x3634
+0x6D25 = 0x3D72
+0x6D27 = 0x6422
+0x6D2A = 0x3A69
+0x6D2B = 0x642A
+0x6D2E = 0x642C
+0x6D31 = 0x367D
+0x6D32 = 0x565E
+0x6D33 = 0x6432
+0x6D35 = 0x642D
+0x6D39 = 0x6421
+0x6D3B = 0x3B6E
+0x6D3D = 0x4722
+0x6D3E = 0x4549
+0x6D41 = 0x4177
+0x6D59 = 0x5563
+0x6D5A = 0x3F23
+0x6D5C = 0x643A
+0x6D5E = 0x6437
+0x6D60 = 0x643B
+0x6D63 = 0x643D
+0x6D66 = 0x4656
+0x6D69 = 0x3A46
+0x6D6A = 0x404B
+0x6D6E = 0x3821
+0x6D6F = 0x6434
+0x6D74 = 0x5421
+0x6D77 = 0x3A23
+0x6D78 = 0x3D7E
+0x6D79 = 0x6424
+0x6D7C = 0x643C
+0x6D82 = 0x786F
+0x6D85 = 0x4479
+0x6D87 = 0x637E
+0x6D88 = 0x4F7B
+0x6D89 = 0x4966
+0x6D8C = 0x533F
+0x6D8E = 0x4F51
+0x6D91 = 0x6433
+0x6D93 = 0x6438
+0x6D94 = 0x6439
+0x6D95 = 0x4C69
+0x6DAA = 0x3822
+0x6DAB = 0x644A
+0x6DAE = 0x644C
+0x6DAF = 0x5144
+0x6DB2 = 0x523A
+0x6DB5 = 0x3A2D
+0x6DB8 = 0x3A54
+0x6DBF = 0x6443
+0x6DC0 = 0x782D
+0x6DC4 = 0x574D
+0x6DC5 = 0x6440
+0x6DC6 = 0x4F7D
+0x6DC7 = 0x643F
+0x6DCB = 0x415C
+0x6DCC = 0x4C4A
+0x6DD1 = 0x4A67
+0x6DD6 = 0x4457
+0x6DD8 = 0x4C54
+0x6DD9 = 0x6448
+0x6DDD = 0x6447
+0x6DDE = 0x6441
+0x6DE0 = 0x6444
+0x6DE1 = 0x352D
+0x6DE4 = 0x5359
+0x6DE6 = 0x6446
+0x6DEA = 0x4259
+0x6DEB = 0x5279
+0x6DEC = 0x3463
+0x6DEE = 0x3B34
+0x6DF1 = 0x496E
+0x6DF3 = 0x343E
+0x6DF5 = 0x5428
+0x6DF6 = 0x6435
+0x6DF7 = 0x3B6C
+0x6DF9 = 0x514D
+0x6DFA = 0x4733
+0x6DFB = 0x4C6D
+0x6DFC = 0x6D35
+0x6E05 = 0x4765
+0x6E0C = 0x644B
+0x6E19 = 0x3B41
+0x6E1A = 0x643E
+0x6E1D = 0x5365
+0x6E20 = 0x477E
+0x6E21 = 0x3649
+0x6E23 = 0x547C
+0x6E24 = 0x3233
+0x6E25 = 0x6457
+0x6E26 = 0x4E50
+0x6E29 = 0x4E42
+0x6E2B = 0x644D
+0x6E2C = 0x3262
+0x6E2D = 0x4E3C
+0x6E2F = 0x385B
+0x6E32 = 0x6456
+0x6E34 = 0x3F4A
+0x6E38 = 0x534E
+0x6E3A = 0x436C
+0x6E3E = 0x3B6B
+0x6E43 = 0x4548
+0x6E44 = 0x6458
+0x6E4D = 0x4D44
+0x6E4E = 0x644F
+0x6E53 = 0x6454
+0x6E54 = 0x6455
+0x6E56 = 0x3A7E
+0x6E58 = 0x4F66
+0x6E5B = 0x553F
+0x6E5E = 0x6425
+0x6E5F = 0x6452
+0x6E6B = 0x6450
+0x6E6E = 0x644E
+0x6E6F = 0x4C40
+0x6E86 = 0x6453
+0x6E89 = 0x3848
+0x6E8F = 0x6467
+0x6E90 = 0x5434
+0x6E96 = 0x573C
+0x6E98 = 0x645B
+0x6E9C = 0x416F
+0x6E9D = 0x3935
+0x6E9F = 0x6469
+0x6EA2 = 0x5267
+0x6EA5 = 0x645F
+0x6EA7 = 0x6460
+0x6EAA = 0x4F2A
+0x6EAF = 0x4B5D
+0x6EB1 = 0x645A
+0x6EB2 = 0x6451
+0x6EB4 = 0x6465
+0x6EB6 = 0x485C
+0x6EB7 = 0x6463
+0x6EBA = 0x4467
+0x6EBB = 0x6462
+0x6EBD = 0x6461
+0x6EC1 = 0x337C
+0x6EC2 = 0x6468
+0x6EC4 = 0x3257
+0x6EC5 = 0x4370
+0x6EC7 = 0x3561
+0x6ECB = 0x574C
+0x6ECC = 0x3553
+0x6ECE = 0x5C7E
+0x6ECF = 0x6466
+0x6ED1 = 0x3B2C
+0x6ED3 = 0x5752
+0x6ED4 = 0x4C4F
+0x6ED5 = 0x6B78
+0x6EDA = 0x3976
+0x6EEC = 0x3B26
+0x6EEF = 0x564D
+0x6EF2 = 0x4978
+0x6EF4 = 0x354E
+0x6EF7 = 0x4231
+0x6EF8 = 0x6430
+0x6EF9 = 0x646F
+0x6EFF = 0x427A
+0x6F01 = 0x5366
+0x6F02 = 0x462F
+0x6F06 = 0x4661
+0x6F09 = 0x6475
+0x6F0F = 0x4229
+0x6F14 = 0x515D
+0x6F15 = 0x646E
+0x6F1A = 0x453D
+0x6F20 = 0x442E
+0x6F22 = 0x3A3A
+0x6F23 = 0x4130
+0x6F24 = 0x646D
+0x6F29 = 0x6476
+0x6F2A = 0x6474
+0x6F2B = 0x427E
+0x6F2C = 0x5755
+0x6F2D = 0x645D
+0x6F2F = 0x6470
+0x6F31 = 0x4A7E
+0x6F32 = 0x5547
+0x6F33 = 0x5544
+0x6F36 = 0x6471
+0x6F38 = 0x3D25
+0x6F3E = 0x517A
+0x6F3F = 0x3D2C
+0x6F41 = 0x7223
+0x6F51 = 0x4643
+0x6F54 = 0x3D60
+0x6F58 = 0x454B
+0x6F59 = 0x636D
+0x6F5B = 0x4731
+0x6F5E = 0x423A
+0x6F62 = 0x646A
+0x6F64 = 0x4873
+0x6F66 = 0x414A
+0x6F6D = 0x4C36
+0x6F6E = 0x3331
+0x6F6F = 0x6431
+0x6F70 = 0x4023
+0x6F72 = 0x647B
+0x6F74 = 0x6473
+0x6F77 = 0x6464
+0x6F78 = 0x647A
+0x6F7A = 0x647D
+0x6F7C = 0x647C
+0x6F7F = 0x6436
+0x6F80 = 0x492C
+0x6F84 = 0x334E
+0x6F86 = 0x3D3D
+0x6F87 = 0x4054
+0x6F88 = 0x333A
+0x6F89 = 0x6477
+0x6F8C = 0x6479
+0x6F8D = 0x6478
+0x6F8E = 0x456C
+0x6F97 = 0x3D27
+0x6FA0 = 0x6445
+0x6FA1 = 0x5468
+0x6FA4 = 0x5473
+0x6FA7 = 0x6522
+0x6FA9 = 0x6D34
+0x6FAE = 0x642B
+0x6FB1 = 0x356D
+0x6FB3 = 0x3044
+0x6FB6 = 0x6524
+0x6FB9 = 0x6523
+0x6FC0 = 0x3C24
+0x6FC1 = 0x5747
+0x6FC2 = 0x6525
+0x6FC3 = 0x4528
+0x6FC9 = 0x6521
+0x6FD5 = 0x4A2A
+0x6FD8 = 0x4522
+0x6FDB = 0x7855
+0x6FDE = 0x6528
+0x6FDF = 0x3C43
+0x6FE0 = 0x6529
+0x6FE1 = 0x6526
+0x6FE4 = 0x4C4E
+0x6FEB = 0x4044
+0x6FEE = 0x6527
+0x6FEF = 0x652A
+0x6FF0 = 0x4E2B
+0x6FF1 = 0x3175
+0x6FFA = 0x3D26
+0x6FFC = 0x6378
+0x6FFE = 0x424B
+0x7005 = 0x645E
+0x7006 = 0x6442
+0x7009 = 0x503A
+0x700B = 0x6449
+0x700F = 0x642F
+0x7011 = 0x4659
+0x7015 = 0x3174
+0x7018 = 0x6372
+0x701A = 0x652B
+0x701B = 0x652D
+0x701D = 0x4124
+0x701F = 0x646C
+0x7020 = 0x646B
+0x7023 = 0x652C
+0x7027 = 0x6371
+0x7028 = 0x647E
+0x7030 = 0x7858
+0x7032 = 0x6472
+0x7035 = 0x652F
+0x7039 = 0x652E
+0x703E = 0x403D
+0x7043 = 0x6363
+0x7044 = 0x645C
+0x704C = 0x3960
+0x7051 = 0x4877
+0x7055 = 0x406C
+0x7058 = 0x4C32
+0x705D = 0x6530
+0x705E = 0x6531
+0x7063 = 0x4D65
+0x7064 = 0x4250
+0x7067 = 0x6459
+0x706B = 0x3B70
+0x706C = 0x6C61
+0x7070 = 0x3B52
+0x7078 = 0x3E44
+0x707C = 0x5746
+0x707E = 0x5456
+0x7085 = 0x6A41
+0x708A = 0x3436
+0x708E = 0x5157
+0x7092 = 0x3334
+0x7094 = 0x4832
+0x7095 = 0x3F3B
+0x7096 = 0x6C40
+0x7099 = 0x564B
+0x70AB = 0x6C45
+0x70AC = 0x3E66
+0x70AD = 0x4C3F
+0x70AE = 0x455A
+0x70AF = 0x3E3C
+0x70B1 = 0x6C46
+0x70B3 = 0x317E
+0x70B7 = 0x6C44
+0x70B8 = 0x5528
+0x70BB = 0x6C42
+0x70C0 = 0x6C43
+0x70C8 = 0x4152
+0x70CA = 0x6C48
+0x70CF = 0x4E5A
+0x70D8 = 0x3A66
+0x70D9 = 0x4053
+0x70DF = 0x514C
+0x70E4 = 0x3F3E
+0x70EF = 0x4F29
+0x70F4 = 0x4C7E
+0x70F7 = 0x4D69
+0x70F9 = 0x456B
+0x70FD = 0x3769
+0x7109 = 0x5149
+0x710A = 0x3A38
+0x7110 = 0x6C49
+0x7113 = 0x6C4A
+0x7119 = 0x313A
+0x711A = 0x3759
+0x7121 = 0x4E5E
+0x7126 = 0x3D39
+0x712F = 0x6C4C
+0x7130 = 0x5166
+0x7131 = 0x6C4D
+0x7136 = 0x483B
+0x7145 = 0x6C51
+0x7149 = 0x4136
+0x714A = 0x6C53
+0x714C = 0x3B4D
+0x714E = 0x3C65
+0x7152 = 0x6C3F
+0x715C = 0x6C4F
+0x715E = 0x4937
+0x7162 = 0x5C64
+0x7164 = 0x433A
+0x7165 = 0x3B40
+0x7166 = 0x6C63
+0x7167 = 0x5555
+0x7168 = 0x6C50
+0x7169 = 0x3733
+0x716C = 0x6C3E
+0x716E = 0x5673
+0x7172 = 0x6C52
+0x7173 = 0x6C4E
+0x7178 = 0x6C54
+0x717A = 0x6C55
+0x717D = 0x493F
+0x7184 = 0x4F28
+0x718A = 0x505C
+0x718F = 0x512C
+0x7192 = 0x532B
+0x7194 = 0x485B
+0x7197 = 0x6C41
+0x7198 = 0x6C56
+0x7199 = 0x4E75
+0x719F = 0x4A6C
+0x71A0 = 0x6C5A
+0x71A8 = 0x6C59
+0x71AC = 0x303E
+0x71B1 = 0x4848
+0x71B3 = 0x6C57
+0x71B5 = 0x6C58
+0x71B9 = 0x6C64
+0x71BE = 0x3363
+0x71C1 = 0x6C47
+0x71C3 = 0x483C
+0x71C8 = 0x3546
+0x71CE = 0x4147
+0x71D2 = 0x4955
+0x71D4 = 0x6C5C
+0x71D5 = 0x5160
+0x71D9 = 0x4C4C
+0x71DC = 0x6C4B
+0x71DF = 0x532A
+0x71E0 = 0x6C5B
+0x71E5 = 0x546F
+0x71E6 = 0x3253
+0x71E7 = 0x6C5D
+0x71ED = 0x5672
+0x71EE = 0x5B46
+0x71F4 = 0x3B62
+0x71F9 = 0x6C5E
+0x71FC = 0x3D7D
+0x71FE = 0x6C62
+0x7206 = 0x312C
+0x720D = 0x4B38
+0x7210 = 0x422F
+0x721B = 0x4043
+0x721D = 0x6C5F
+0x7228 = 0x6C60
+0x722A = 0x5726
+0x722C = 0x4540
+0x722D = 0x5579
+0x7230 = 0x6B3C
+0x7232 = 0x4E2A
+0x7235 = 0x3E74
+0x7236 = 0x3838
+0x7238 = 0x3056
+0x7239 = 0x3579
+0x723A = 0x522F
+0x723B = 0x5833
+0x723D = 0x4B2C
+0x723E = 0x367B
+0x723F = 0x635D
+0x7247 = 0x462C
+0x7248 = 0x3066
+0x724C = 0x4546
+0x7252 = 0x6B3A
+0x7256 = 0x6B3B
+0x7258 = 0x6B39
+0x7259 = 0x5140
+0x725B = 0x4523
+0x725D = 0x6A72
+0x725F = 0x4432
+0x7261 = 0x4435
+0x7262 = 0x404E
+0x7266 = 0x6A73
+0x7267 = 0x4441
+0x7269 = 0x4E6F
+0x726E = 0x6A70
+0x726F = 0x6A74
+0x7272 = 0x497C
+0x7279 = 0x4C58
+0x727D = 0x4723
+0x727E = 0x6A75
+0x727F = 0x6A76
+0x7280 = 0x4F2C
+0x7281 = 0x4067
+0x7284 = 0x6A77
+0x728B = 0x6A78
+0x728D = 0x6A79
+0x728F = 0x6A7A
+0x7292 = 0x6A7B
+0x7296 = 0x5C7D
+0x729F = 0x6A71
+0x72A2 = 0x363F
+0x72A7 = 0x4E7E
+0x72AC = 0x482E
+0x72AD = 0x616B
+0x72AF = 0x3738
+0x72B0 = 0x616C
+0x72B4 = 0x616D
+0x72C0 = 0x5734
+0x72C1 = 0x6171
+0x72C2 = 0x3F71
+0x72C3 = 0x6170
+0x72C4 = 0x3552
+0x72CD = 0x6173
+0x72CE = 0x6172
+0x72D0 = 0x3A7C
+0x72D2 = 0x6174
+0x72D7 = 0x3937
+0x72D9 = 0x3E51
+0x72E0 = 0x3A5D
+0x72E1 = 0x3D46
+0x72E8 = 0x6175
+0x72E9 = 0x6177
+0x72F3 = 0x617C
+0x72F4 = 0x6179
+0x72F7 = 0x617A
+0x72F8 = 0x406A
+0x72F9 = 0x4F41
+0x72FA = 0x617E
+0x72FB = 0x6221
+0x72FC = 0x4047
+0x72FD = 0x3137
+0x7301 = 0x617B
+0x730A = 0x6225
+0x7313 = 0x6223
+0x7316 = 0x327E
+0x7317 = 0x6222
+0x7319 = 0x5578
+0x731B = 0x434D
+0x731C = 0x3242
+0x731D = 0x6227
+0x731E = 0x6226
+0x7322 = 0x6229
+0x7325 = 0x622B
+0x7329 = 0x5049
+0x732A = 0x566D
+0x732B = 0x4328
+0x732C = 0x622C
+0x7331 = 0x622E
+0x7334 = 0x3A6F
+0x7336 = 0x534C
+0x7337 = 0x6960
+0x7338 = 0x622D
+0x7339 = 0x622A
+0x733B = 0x6178
+0x733E = 0x3B2B
+0x733F = 0x5433
+0x7341 = 0x616F
+0x7344 = 0x537C
+0x7345 = 0x4A28
+0x734D = 0x6230
+0x7350 = 0x622F
+0x7352 = 0x6961
+0x7357 = 0x6231
+0x7360 = 0x6232
+0x7368 = 0x3640
+0x736A = 0x6176
+0x736B = 0x617D
+0x736C = 0x6233
+0x736F = 0x6234
+0x7370 = 0x447C
+0x7372 = 0x3B71
+0x7375 = 0x4154
+0x7377 = 0x616E
+0x7378 = 0x4A5E
+0x737A = 0x4C21
+0x737B = 0x4F57
+0x737C = 0x6228
+0x737E = 0x6235
+0x7380 = 0x6224
+0x7384 = 0x507E
+0x7387 = 0x424A
+0x7389 = 0x5371
+0x738B = 0x4D75
+0x738E = 0x6760
+0x7396 = 0x3E41
+0x739F = 0x6764
+0x73A2 = 0x6763
+0x73A9 = 0x4D66
+0x73AB = 0x4335
+0x73B2 = 0x4161
+0x73B3 = 0x6769
+0x73B7 = 0x6768
+0x73BB = 0x3223
+0x73C0 = 0x676A
+0x73C2 = 0x6766
+0x73C8 = 0x676C
+0x73C9 = 0x676B
+0x73CA = 0x493A
+0x73CD = 0x5564
+0x73CF = 0x6765
+0x73D0 = 0x3729
+0x73D9 = 0x676E
+0x73DE = 0x6773
+0x73E0 = 0x5669
+0x73E5 = 0x676D
+0x73E7 = 0x6772
+0x73E9 = 0x6771
+0x73ED = 0x3060
+0x73FE = 0x4F56
+0x7403 = 0x4772
+0x7405 = 0x4045
+0x7406 = 0x406D
+0x7409 = 0x4170
+0x740A = 0x6770
+0x741A = 0x6822
+0x741B = 0x6821
+0x7422 = 0x5741
+0x7425 = 0x677A
+0x7426 = 0x6779
+0x7428 = 0x677B
+0x742A = 0x6777
+0x742C = 0x677E
+0x742E = 0x677D
+0x7430 = 0x677C
+0x7433 = 0x4155
+0x7434 = 0x4759
+0x7435 = 0x457D
+0x7436 = 0x4543
+0x743F = 0x6775
+0x7441 = 0x6823
+0x744B = 0x6762
+0x7455 = 0x6826
+0x7457 = 0x6825
+0x7459 = 0x6827
+0x745A = 0x3A77
+0x745B = 0x6778
+0x745C = 0x6824
+0x745E = 0x4870
+0x745F = 0x492A
+0x7463 = 0x4B76
+0x7469 = 0x5328
+0x746A = 0x426A
+0x746D = 0x6829
+0x7470 = 0x3965
+0x7476 = 0x517E
+0x747E = 0x682A
+0x7480 = 0x682D
+0x7481 = 0x682E
+0x7483 = 0x4127
+0x7487 = 0x682F
+0x7489 = 0x6776
+0x748B = 0x6830
+0x7490 = 0x6834
+0x749C = 0x682B
+0x749E = 0x6831
+0x74A3 = 0x6761
+0x74A6 = 0x6828
+0x74A7 = 0x6835
+0x74A8 = 0x6832
+0x74A9 = 0x6833
+0x74B0 = 0x3B37
+0x74BA = 0x6837
+0x74BD = 0x6774
+0x74CA = 0x476D
+0x74CF = 0x6767
+0x74D4 = 0x682C
+0x74DA = 0x6836
+0x74DC = 0x394F
+0x74DE = 0x702C
+0x74E0 = 0x702D
+0x74E2 = 0x4630
+0x74E3 = 0x306A
+0x74E4 = 0x483F
+0x74E6 = 0x4D5F
+0x74EE = 0x4E4D
+0x74F4 = 0x6A32
+0x74F6 = 0x463F
+0x74F7 = 0x3449
+0x74FF = 0x6A33
+0x7504 = 0x5567
+0x750C = 0x6A31
+0x750D = 0x5D79
+0x750F = 0x6A34
+0x7511 = 0x6A35
+0x7513 = 0x6A36
+0x7518 = 0x384A
+0x7519 = 0x5F30
+0x751A = 0x4975
+0x751C = 0x4C70
+0x751F = 0x497A
+0x7523 = 0x327A
+0x7525 = 0x497B
+0x7528 = 0x5343
+0x7529 = 0x4B26
+0x752B = 0x3826
+0x752C = 0x702E
+0x752D = 0x3142
+0x752F = 0x6538
+0x7530 = 0x4C6F
+0x7531 = 0x5349
+0x7532 = 0x3C57
+0x7533 = 0x496A
+0x7537 = 0x4450
+0x7538 = 0x3569
+0x753A = 0x6E2E
+0x753E = 0x675E
+0x7540 = 0x6E2F
+0x7548 = 0x6E32
+0x754B = 0x6E31
+0x754C = 0x3D67
+0x754E = 0x6E30
+0x754F = 0x4E37
+0x7554 = 0x454F
+0x7559 = 0x4174
+0x755A = 0x5B4E
+0x755B = 0x6E33
+0x755C = 0x5073
+0x755D = 0x4436
+0x7562 = 0x314F
+0x7565 = 0x4254
+0x7566 = 0x4668
+0x756A = 0x372C
+0x756B = 0x3B2D
+0x7572 = 0x6E34
+0x7576 = 0x3531
+0x7578 = 0x3B7B
+0x7579 = 0x6E35
+0x757F = 0x675C
+0x7583 = 0x6E36
+0x7586 = 0x3D2E
+0x7587 = 0x336B
+0x758A = 0x357E
+0x758B = 0x7162
+0x758F = 0x4A68
+0x7591 = 0x5249
+0x7592 = 0x705A
+0x7594 = 0x705B
+0x7599 = 0x386D
+0x759A = 0x3E4E
+0x759D = 0x705E
+0x75A3 = 0x7060
+0x75A4 = 0x304C
+0x75A5 = 0x3D6A
+0x75AB = 0x525F
+0x75B0 = 0x7066
+0x75B1 = 0x7065
+0x75B2 = 0x4623
+0x75B3 = 0x7061
+0x75B4 = 0x7062
+0x75B5 = 0x3443
+0x75B8 = 0x7063
+0x75B9 = 0x556E
+0x75BC = 0x4C5B
+0x75BD = 0x3E52
+0x75BE = 0x3C32
+0x75C2 = 0x7068
+0x75C3 = 0x7067
+0x75C4 = 0x7064
+0x75C5 = 0x3221
+0x75C7 = 0x7921
+0x75CA = 0x482C
+0x75CD = 0x706A
+0x75D4 = 0x564C
+0x75D5 = 0x3A5B
+0x75D8 = 0x363B
+0x75D9 = 0x3E37
+0x75DB = 0x4D34
+0x75DE = 0x4626
+0x75E2 = 0x4121
+0x75E3 = 0x706B
+0x75E4 = 0x706E
+0x75E6 = 0x706D
+0x75E7 = 0x7070
+0x75F0 = 0x4C35
+0x75F1 = 0x7072
+0x75F4 = 0x3355
+0x75F9 = 0x3154
+0x75FC = 0x7073
+0x75FF = 0x7074
+0x7600 = 0x7076
+0x7601 = 0x3461
+0x7602 = 0x7069
+0x7603 = 0x7071
+0x760A = 0x707A
+0x760B = 0x3768
+0x760C = 0x7078
+0x760D = 0x5171
+0x7610 = 0x7075
+0x7613 = 0x3B3E
+0x7615 = 0x707D
+0x7619 = 0x707E
+0x761B = 0x7121
+0x761E = 0x7079
+0x761F = 0x4E41
+0x7620 = 0x7124
+0x7621 = 0x342F
+0x7622 = 0x7123
+0x7624 = 0x4176
+0x7625 = 0x707B
+0x7626 = 0x4A5D
+0x7627 = 0x4531
+0x7629 = 0x3471
+0x762D = 0x7126
+0x7630 = 0x7127
+0x7633 = 0x712C
+0x7634 = 0x554E
+0x7635 = 0x7129
+0x7638 = 0x4833
+0x763B = 0x707C
+0x763C = 0x7122
+0x7640 = 0x7125
+0x7642 = 0x4146
+0x7643 = 0x712A
+0x7646 = 0x706C
+0x7647 = 0x706F
+0x7649 = 0x7077
+0x764C = 0x3029
+0x764D = 0x712D
+0x7654 = 0x712F
+0x7656 = 0x7131
+0x7658 = 0x705D
+0x765C = 0x7130
+0x765F = 0x3171
+0x7662 = 0x5177
+0x7664 = 0x705C
+0x7665 = 0x5622
+0x7667 = 0x705F
+0x7669 = 0x712E
+0x766C = 0x5122
+0x766D = 0x7128
+0x766E = 0x712B
+0x766F = 0x7133
+0x7670 = 0x5338
+0x7671 = 0x4C31
+0x7672 = 0x7132
+0x7678 = 0x396F
+0x767B = 0x3547
+0x767C = 0x3722
+0x767D = 0x3057
+0x767E = 0x3059
+0x7682 = 0x546D
+0x7684 = 0x3544
+0x7686 = 0x3D54
+0x7687 = 0x3B4A
+0x7688 = 0x7027
+0x768B = 0x385E
+0x768E = 0x7028
+0x7693 = 0x7029
+0x7696 = 0x4D6E
+0x7699 = 0x702A
+0x769A = 0x3028
+0x76A4 = 0x702B
+0x76AE = 0x4624
+0x76B4 = 0x7165
+0x76B8 = 0x7164
+0x76BA = 0x5665
+0x76BF = 0x4373
+0x76C2 = 0x535B
+0x76C5 = 0x5651
+0x76C6 = 0x4568
+0x76C8 = 0x532F
+0x76CA = 0x5266
+0x76CD = 0x6E41
+0x76CE = 0x303B
+0x76D2 = 0x3A50
+0x76D4 = 0x3F78
+0x76D7 = 0x3541
+0x76DB = 0x4A22
+0x76DE = 0x5535
+0x76DF = 0x434B
+0x76E1 = 0x3E21
+0x76E3 = 0x3C60
+0x76E4 = 0x454C
+0x76E5 = 0x6E42
+0x76E7 = 0x422C
+0x76EE = 0x443F
+0x76EF = 0x3622
+0x76F1 = 0x6D6C
+0x76F2 = 0x4324
+0x76F4 = 0x5631
+0x76F8 = 0x4F60
+0x76F9 = 0x6D6F
+0x76FC = 0x454E
+0x76FE = 0x365C
+0x7701 = 0x4A21
+0x7704 = 0x6D6D
+0x7707 = 0x6D70
+0x7708 = 0x6D71
+0x7709 = 0x433C
+0x770B = 0x3F34
+0x7719 = 0x6D74
+0x771A = 0x6D72
+0x771F = 0x5566
+0x7720 = 0x435F
+0x7722 = 0x6D73
+0x7726 = 0x6D76
+0x7728 = 0x5523
+0x7729 = 0x5123
+0x772D = 0x6D75
+0x772F = 0x4350
+0x7735 = 0x6D77
+0x7736 = 0x3F74
+0x7737 = 0x3E6C
+0x7738 = 0x6D78
+0x773A = 0x4C77
+0x773C = 0x515B
+0x7740 = 0x5745
+0x7743 = 0x6D7C
+0x7747 = 0x6D7B
+0x774F = 0x784A
+0x775A = 0x6D7D
+0x775B = 0x3E26
+0x775C = 0x5576
+0x775E = 0x6D79
+0x7761 = 0x4B2F
+0x7762 = 0x6E21
+0x7763 = 0x363D
+0x7765 = 0x6E22
+0x7766 = 0x4440
+0x7768 = 0x6D7E
+0x776B = 0x3D5E
+0x776C = 0x3247
+0x7779 = 0x3643
+0x777D = 0x6E25
+0x777E = 0x583A
+0x777F = 0x6E23
+0x7780 = 0x6E26
+0x7784 = 0x4369
+0x7785 = 0x3372
+0x778C = 0x6E27
+0x778D = 0x6E24
+0x778E = 0x4F39
+0x7791 = 0x6E28
+0x7798 = 0x6D6E
+0x779E = 0x4277
+0x779F = 0x6E29
+0x77A0 = 0x6E2A
+0x77A2 = 0x5E2B
+0x77A5 = 0x4633
+0x77A7 = 0x4746
+0x77AA = 0x3549
+0x77AC = 0x4B32
+0x77AD = 0x7851
+0x77B0 = 0x6E2B
+0x77B3 = 0x4D2B
+0x77B5 = 0x6E2C
+0x77BB = 0x5530
+0x77BC = 0x6D7A
+0x77BD = 0x6E2D
+0x77BF = 0x7644
+0x77C7 = 0x7857
+0x77CD = 0x5B47
+0x77D7 = 0x3423
+0x77DA = 0x5675
+0x77DB = 0x432C
+0x77DC = 0x7166
+0x77E2 = 0x4A38
+0x77E3 = 0x5253
+0x77E5 = 0x562A
+0x77E7 = 0x6F72
+0x77E9 = 0x3E58
+0x77EC = 0x6F73
+0x77ED = 0x364C
+0x77EE = 0x302B
+0x77EF = 0x3D43
+0x77F3 = 0x4A2F
+0x77F8 = 0x6D37
+0x77FD = 0x4E79
+0x7802 = 0x4930
+0x7809 = 0x6D39
+0x780C = 0x4676
+0x780D = 0x3F33
+0x7811 = 0x6D3C
+0x7812 = 0x4578
+0x7814 = 0x5150
+0x7818 = 0x6D3B
+0x781D = 0x6D40
+0x781F = 0x6D44
+0x7823 = 0x6D48
+0x7825 = 0x6D46
+0x7826 = 0x6D4E
+0x7827 = 0x5568
+0x7829 = 0x6D49
+0x782C = 0x6D47
+0x782D = 0x6D3E
+0x7830 = 0x4569
+0x7834 = 0x4646
+0x7837 = 0x4969
+0x7838 = 0x5452
+0x7839 = 0x6D41
+0x783C = 0x6D45
+0x7843 = 0x7927
+0x7845 = 0x3968
+0x7847 = 0x6D50
+0x784C = 0x6D51
+0x784E = 0x6D4A
+0x7850 = 0x6D4F
+0x7852 = 0x4E78
+0x785D = 0x4F75
+0x7864 = 0x6D4C
+0x7868 = 0x6D3A
+0x786A = 0x6D52
+0x786B = 0x4172
+0x786C = 0x5332
+0x786D = 0x6D4B
+0x786E = 0x7866
+0x786F = 0x5162
+0x787C = 0x4570
+0x7887 = 0x6D56
+0x7889 = 0x356F
+0x788C = 0x4235
+0x788E = 0x4B69
+0x7891 = 0x312E
+0x7893 = 0x6D54
+0x7897 = 0x4D6B
+0x7898 = 0x3562
+0x789A = 0x6D55
+0x789F = 0x357A
+0x78A1 = 0x6D58
+0x78A3 = 0x6D59
+0x78A5 = 0x6D5C
+0x78A7 = 0x314C
+0x78A9 = 0x4B36
+0x78AD = 0x6D38
+0x78B0 = 0x4576
+0x78B1 = 0x3C6E
+0x78B2 = 0x6D5A
+0x78B3 = 0x4C3C
+0x78B4 = 0x326A
+0x78B8 = 0x6D3F
+0x78B9 = 0x6D5B
+0x78BA = 0x4837
+0x78BC = 0x426B
+0x78BE = 0x446B
+0x78C1 = 0x3445
+0x78C5 = 0x3075
+0x78C9 = 0x6D5F
+0x78CA = 0x405A
+0x78CB = 0x3468
+0x78D0 = 0x454D
+0x78D4 = 0x6D5D
+0x78D5 = 0x3F44
+0x78D9 = 0x6D5E
+0x78DA = 0x5729
+0x78E3 = 0x6D57
+0x78E7 = 0x6D53
+0x78E8 = 0x4425
+0x78EC = 0x6D60
+0x78EF = 0x6D36
+0x78F2 = 0x6D61
+0x78F4 = 0x6D63
+0x78F7 = 0x4157
+0x78FA = 0x3B47
+0x78FD = 0x6D4D
+0x7901 = 0x3D38
+0x7905 = 0x6D62
+0x790E = 0x3421
+0x7913 = 0x6D64
+0x7919 = 0x302D
+0x791E = 0x6D66
+0x7924 = 0x6D65
+0x7926 = 0x3F73
+0x792A = 0x6D42
+0x792B = 0x4079
+0x792C = 0x372F
+0x7931 = 0x6D43
+0x7934 = 0x6D67
+0x793A = 0x4A3E
+0x793B = 0x6C6A
+0x793E = 0x4967
+0x7940 = 0x6C6B
+0x7941 = 0x466E
+0x7946 = 0x6C6C
+0x7948 = 0x466D
+0x7949 = 0x6C6D
+0x7953 = 0x6C70
+0x7956 = 0x5766
+0x7957 = 0x6C73
+0x795A = 0x6C71
+0x795B = 0x6C6E
+0x795C = 0x6C6F
+0x795D = 0x5723
+0x795E = 0x4971
+0x795F = 0x4B6E
+0x7960 = 0x6C74
+0x7965 = 0x4F69
+0x7967 = 0x6C76
+0x7968 = 0x4631
+0x796D = 0x3C40
+0x797A = 0x6C77
+0x7980 = 0x5977
+0x7981 = 0x3D7B
+0x7984 = 0x423B
+0x798A = 0x6C79
+0x798D = 0x3B76
+0x798E = 0x6C75
+0x798F = 0x3823
+0x799A = 0x6C7A
+0x79A6 = 0x787A
+0x79A7 = 0x6C7B
+0x79AA = 0x6C78
+0x79AE = 0x4071
+0x79B0 = 0x6C72
+0x79B1 = 0x353B
+0x79B3 = 0x6C7C
+0x79B9 = 0x536D
+0x79BA = 0x582E
+0x79BD = 0x475D
+0x79BE = 0x3A4C
+0x79C0 = 0x5063
+0x79C1 = 0x4B3D
+0x79C3 = 0x4D3A
+0x79C6 = 0x3851
+0x79C9 = 0x317C
+0x79CB = 0x476F
+0x79CD = 0x7926
+0x79D1 = 0x3F46
+0x79D2 = 0x436B
+0x79D5 = 0x6F75
+0x79D8 = 0x4358
+0x79DF = 0x5762
+0x79E3 = 0x6F77
+0x79E4 = 0x3353
+0x79E6 = 0x4758
+0x79E7 = 0x516D
+0x79E9 = 0x5648
+0x79EB = 0x6F78
+0x79ED = 0x6F76
+0x79F8 = 0x3D55
+0x79FB = 0x5246
+0x7A00 = 0x4F21
+0x7A02 = 0x6F7C
+0x7A03 = 0x6F7B
+0x7A06 = 0x6F79
+0x7A0B = 0x334C
+0x7A0D = 0x4954
+0x7A0E = 0x4B30
+0x7A14 = 0x6F7E
+0x7A17 = 0x305E
+0x7A1A = 0x5649
+0x7A1E = 0x6F7D
+0x7A20 = 0x336D
+0x7A2E = 0x5656
+0x7A31 = 0x3346
+0x7A37 = 0x7022
+0x7A39 = 0x7021
+0x7A3B = 0x353E
+0x7A3C = 0x3C5A
+0x7A3D = 0x3B7C
+0x7A3F = 0x3865
+0x7A40 = 0x7836
+0x7A46 = 0x4442
+0x7A4C = 0x7655
+0x7A4D = 0x3B7D
+0x7A4E = 0x5331
+0x7A57 = 0x4B6B
+0x7A61 = 0x7023
+0x7A62 = 0x3B60
+0x7A69 = 0x4E48
+0x7A6B = 0x783E
+0x7A70 = 0x7026
+0x7A74 = 0x5128
+0x7A76 = 0x3E3F
+0x7A78 = 0x7136
+0x7A79 = 0x7137
+0x7A7A = 0x3F55
+0x7A7F = 0x3429
+0x7A80 = 0x7138
+0x7A81 = 0x4D3B
+0x7A84 = 0x552D
+0x7A86 = 0x7139
+0x7A88 = 0x713A
+0x7A91 = 0x5224
+0x7A92 = 0x564F
+0x7A95 = 0x713B
+0x7A96 = 0x3D51
+0x7A97 = 0x3430
+0x7A98 = 0x3E3D
+0x7A9F = 0x3F5F
+0x7AA0 = 0x713D
+0x7AA8 = 0x713F
+0x7AA9 = 0x4E51
+0x7AAA = 0x4D5D
+0x7AAC = 0x713E
+0x7AAE = 0x476E
+0x7AB3 = 0x7141
+0x7AB6 = 0x7140
+0x7ABA = 0x3F7A
+0x7ABF = 0x417E
+0x7AC4 = 0x345C
+0x7AC5 = 0x474F
+0x7AC7 = 0x713C
+0x7AC8 = 0x546E
+0x7ACA = 0x4754
+0x7ACB = 0x4122
+0x7AD9 = 0x553E
+0x7ADF = 0x3E39
+0x7AE0 = 0x5542
+0x7AE3 = 0x3F22
+0x7AE5 = 0x4D2F
+0x7AE6 = 0x7135
+0x7AEA = 0x4A7A
+0x7AED = 0x3D5F
+0x7AEF = 0x364B
+0x7AF6 = 0x3E3A
+0x7AF9 = 0x5671
+0x7AFA = 0x7343
+0x7AFD = 0x7344
+0x7AFF = 0x384D
+0x7B04 = 0x7347
+0x7B06 = 0x304A
+0x7B08 = 0x7345
+0x7B0A = 0x7349
+0x7B0B = 0x4B71
+0x7B0F = 0x734B
+0x7B11 = 0x5026
+0x7B19 = 0x734F
+0x7B1B = 0x3551
+0x7B1E = 0x7357
+0x7B20 = 0x7352
+0x7B24 = 0x7354
+0x7B25 = 0x7353
+0x7B26 = 0x377B
+0x7B28 = 0x313F
+0x7B2A = 0x734E
+0x7B2B = 0x734A
+0x7B2C = 0x355A
+0x7B2E = 0x7350
+0x7B31 = 0x7351
+0x7B33 = 0x7355
+0x7B38 = 0x734D
+0x7B45 = 0x735A
+0x7B46 = 0x314A
+0x7B47 = 0x734C
+0x7B49 = 0x3548
+0x7B4B = 0x3D6E
+0x7B4C = 0x735C
+0x7B4F = 0x3724
+0x7B50 = 0x3F70
+0x7B51 = 0x7928
+0x7B52 = 0x4D32
+0x7B54 = 0x3470
+0x7B56 = 0x325F
+0x7B58 = 0x7358
+0x7B60 = 0x735E
+0x7B62 = 0x7361
+0x7B67 = 0x7348
+0x7B6E = 0x735F
+0x7B71 = 0x7363
+0x7B72 = 0x7362
+0x7B75 = 0x735B
+0x7B77 = 0x3F6A
+0x7B7B = 0x7360
+0x7B85 = 0x736B
+0x7B8B = 0x3C63
+0x7B8D = 0x393F
+0x7B8F = 0x735D
+0x7B90 = 0x7364
+0x7B94 = 0x322D
+0x7B95 = 0x3B7E
+0x7B97 = 0x4B63
+0x7B9C = 0x736D
+0x7B9D = 0x7369
+0x7BA1 = 0x395C
+0x7BA2 = 0x736E
+0x7BAC = 0x7368
+0x7BAD = 0x3C7D
+0x7BB1 = 0x4F64
+0x7BB4 = 0x7370
+0x7BB8 = 0x7367
+0x7BC0 = 0x3D5A
+0x7BC1 = 0x7372
+0x7BC4 = 0x3736
+0x7BC6 = 0x572D
+0x7BC7 = 0x462A
+0x7BC9 = 0x567E
+0x7BCB = 0x7366
+0x7BCC = 0x7373
+0x7BD9 = 0x385D
+0x7BDA = 0x7375
+0x7BDD = 0x7374
+0x7BE1 = 0x345B
+0x7BE4 = 0x7346
+0x7BE5 = 0x7376
+0x7BE6 = 0x7377
+0x7BE9 = 0x4938
+0x7BEA = 0x7378
+0x7BF3 = 0x7359
+0x7BF7 = 0x4571
+0x7BFC = 0x737B
+0x7BFE = 0x737A
+0x7C00 = 0x7365
+0x7C07 = 0x3458
+0x7C0B = 0x737E
+0x7C0C = 0x7379
+0x7C0D = 0x4228
+0x7C0F = 0x737C
+0x7C1E = 0x736C
+0x7C1F = 0x7421
+0x7C21 = 0x3C72
+0x7C23 = 0x7371
+0x7C26 = 0x7423
+0x7C27 = 0x3B49
+0x7C2A = 0x7422
+0x7C2B = 0x736F
+0x7C38 = 0x7424
+0x7C3D = 0x4729
+0x7C3E = 0x4131
+0x7C3F = 0x323E
+0x7C40 = 0x7426
+0x7C43 = 0x403A
+0x7C4C = 0x336F
+0x7C4D = 0x3C2E
+0x7C5C = 0x736A
+0x7C5F = 0x7425
+0x7C60 = 0x417D
+0x7C64 = 0x7862
+0x7C69 = 0x7356
+0x7C6A = 0x737D
+0x7C6C = 0x4069
+0x7C6E = 0x4261
+0x7C72 = 0x787B
+0x7C73 = 0x4357
+0x7C7C = 0x744C
+0x7C7D = 0x5751
+0x7C89 = 0x375B
+0x7C91 = 0x744E
+0x7C92 = 0x4123
+0x7C95 = 0x4649
+0x7C97 = 0x3456
+0x7C98 = 0x5533
+0x7C9E = 0x7451
+0x7C9F = 0x4B5A
+0x7CA2 = 0x7452
+0x7CA4 = 0x5441
+0x7CA5 = 0x5660
+0x7CB1 = 0x413B
+0x7CB2 = 0x7453
+0x7CB3 = 0x3E2C
+0x7CB9 = 0x3462
+0x7CBC = 0x7454
+0x7CBD = 0x7455
+0x7CBE = 0x3E2B
+0x7CC5 = 0x745B
+0x7CC7 = 0x7457
+0x7CC8 = 0x745A
+0x7CCA = 0x3A7D
+0x7CCC = 0x7458
+0x7CCD = 0x7459
+0x7CD5 = 0x3862
+0x7CD6 = 0x4C47
+0x7CD7 = 0x745C
+0x7CD9 = 0x325A
+0x7CDC = 0x4353
+0x7CDD = 0x7456
+0x7CDE = 0x3760
+0x7CDF = 0x5463
+0x7CE0 = 0x3F37
+0x7CE7 = 0x4138
+0x7CE8 = 0x745D
+0x7CEF = 0x4534
+0x7CF0 = 0x7870
+0x7CF2 = 0x744F
+0x7CF4 = 0x5961
+0x7CF6 = 0x7450
+0x7CF8 = 0x7469
+0x7CF9 = 0x6679
+0x7CFB = 0x4F35
+0x7CFE = 0x3E40
+0x7D00 = 0x3C4D
+0x7D02 = 0x667B
+0x7D04 = 0x543C
+0x7D05 = 0x3A6C
+0x7D06 = 0x667A
+0x7D07 = 0x667C
+0x7D08 = 0x667D
+0x7D09 = 0x4852
+0x7D0A = 0x4E49
+0x7D0B = 0x4E46
+0x7D0D = 0x4449
+0x7D10 = 0x4526
+0x7D13 = 0x6723
+0x7D14 = 0x343F
+0x7D15 = 0x6722
+0x7D17 = 0x4934
+0x7D19 = 0x563D
+0x7D1A = 0x3C36
+0x7D1B = 0x3757
+0x7D1C = 0x6721
+0x7D20 = 0x4B58
+0x7D21 = 0x3744
+0x7D22 = 0x4B77
+0x7D2B = 0x574F
+0x7D2F = 0x405B
+0x7D30 = 0x4F38
+0x7D31 = 0x6726
+0x7D32 = 0x6725
+0x7D33 = 0x4970
+0x7D39 = 0x495C
+0x7D3A = 0x6724
+0x7D3C = 0x6728
+0x7D3F = 0x672A
+0x7D40 = 0x6729
+0x7D42 = 0x5655
+0x7D44 = 0x5769
+0x7D46 = 0x306D
+0x7D4E = 0x672C
+0x7D50 = 0x3D61
+0x7D5D = 0x672B
+0x7D5E = 0x3D4A
+0x7D61 = 0x4267
+0x7D62 = 0x5124
+0x7D66 = 0x3878
+0x7D68 = 0x485E
+0x7D6E = 0x5075
+0x7D71 = 0x4D33
+0x7D72 = 0x4B3F
+0x7D73 = 0x672D
+0x7D76 = 0x3E78
+0x7D79 = 0x3E6E
+0x7D81 = 0x3073
+0x7D83 = 0x672F
+0x7D86 = 0x672E
+0x7D88 = 0x6730
+0x7D89 = 0x5065
+0x7D8F = 0x4B67
+0x7D93 = 0x3E2D
+0x7D9C = 0x575B
+0x7D9E = 0x6736
+0x7DA2 = 0x3371
+0x7DA3 = 0x6739
+0x7DA6 = 0x746B
+0x7DAB = 0x4F5F
+0x7DAC = 0x6737
+0x7DAD = 0x4E2C
+0x7DAE = 0x746C
+0x7DB0 = 0x673A
+0x7DB1 = 0x3859
+0x7DB2 = 0x4D78
+0x7DB3 = 0x3141
+0x7DB4 = 0x573A
+0x7DB8 = 0x425A
+0x7DB9 = 0x6738
+0x7DBA = 0x6732
+0x7DBB = 0x5540
+0x7DBD = 0x3442
+0x7DBE = 0x6731
+0x7DBF = 0x4360
+0x7DC4 = 0x6735
+0x7DC7 = 0x673B
+0x7DCA = 0x3D74
+0x7DCB = 0x6733
+0x7DD1 = 0x424C
+0x7DD2 = 0x5077
+0x7DD4 = 0x6734
+0x7DD7 = 0x673D
+0x7DD8 = 0x3C6A
+0x7DD9 = 0x673C
+0x7DDD = 0x3C29
+0x7DDE = 0x3650
+0x7DE0 = 0x355E
+0x7DE1 = 0x6745
+0x7DE3 = 0x5435
+0x7DE6 = 0x6741
+0x7DE8 = 0x3160
+0x7DE9 = 0x3B3A
+0x7DEC = 0x4365
+0x7DEF = 0x4E33
+0x7DF1 = 0x6743
+0x7DF2 = 0x673F
+0x7DF4 = 0x4137
+0x7DF6 = 0x6742
+0x7DF9 = 0x673E
+0x7DFB = 0x7924
+0x7E08 = 0x5D53
+0x7E09 = 0x6746
+0x7E0A = 0x674B
+0x7E0B = 0x6744
+0x7E10 = 0x6727
+0x7E11 = 0x674C
+0x7E1B = 0x383F
+0x7E1D = 0x6747
+0x7E1E = 0x6749
+0x7E1F = 0x6748
+0x7E23 = 0x4F58
+0x7E27 = 0x4C50
+0x7E2B = 0x376C
+0x7E2D = 0x674A
+0x7E2E = 0x4B75
+0x7E31 = 0x575D
+0x7E32 = 0x6750
+0x7E34 = 0x7863
+0x7E35 = 0x674F
+0x7E36 = 0x746A
+0x7E37 = 0x4246
+0x7E39 = 0x674E
+0x7E3B = 0x7763
+0x7E3D = 0x575C
+0x7E3E = 0x3C28
+0x7E41 = 0x3731
+0x7E45 = 0x6752
+0x7E46 = 0x6751
+0x7E47 = 0x746D
+0x7E52 = 0x6755
+0x7E54 = 0x562F
+0x7E55 = 0x4949
+0x7E5A = 0x6754
+0x7E5E = 0x4846
+0x7E62 = 0x6740
+0x7E69 = 0x497E
+0x7E6A = 0x3B66
+0x7E6B = 0x7873
+0x7E6D = 0x3C6B
+0x7E6E = 0x6756
+0x7E6F = 0x6759
+0x7E70 = 0x6758
+0x7E73 = 0x3D49
+0x7E79 = 0x526F
+0x7E7C = 0x3C4C
+0x7E7D = 0x674D
+0x7E7E = 0x6757
+0x7E82 = 0x576B
+0x7E88 = 0x6753
+0x7E8A = 0x667E
+0x7E8C = 0x5078
+0x7E8D = 0x784D
+0x7E8F = 0x3278
+0x7E93 = 0x5327
+0x7E94 = 0x7826
+0x7E96 = 0x4F4B
+0x7E98 = 0x675A
+0x7E9B = 0x746E
+0x7E9C = 0x4042
+0x7F36 = 0x733E
+0x7F38 = 0x3857
+0x7F3A = 0x4831
+0x7F44 = 0x7340
+0x7F45 = 0x7341
+0x7F4C = 0x733F
+0x7F4E = 0x786E
+0x7F50 = 0x395E
+0x7F54 = 0x5868
+0x7F55 = 0x3A31
+0x7F58 = 0x6E37
+0x7F5F = 0x6E39
+0x7F61 = 0x6E38
+0x7F68 = 0x6E3B
+0x7F69 = 0x5556
+0x7F6A = 0x576F
+0x7F6E = 0x5643
+0x7F70 = 0x3723
+0x7F71 = 0x6E3D
+0x7F72 = 0x4A70
+0x7F77 = 0x3055
+0x7F79 = 0x6E3E
+0x7F7E = 0x6E40
+0x7F85 = 0x425E
+0x7F86 = 0x6E3C
+0x7F88 = 0x6E3F
+0x7F8A = 0x5172
+0x7F8C = 0x473C
+0x7F8E = 0x4340
+0x7F94 = 0x3861
+0x7F9A = 0x4167
+0x7F9D = 0x7446
+0x7F9E = 0x505F
+0x7FA1 = 0x4F5B
+0x7FA4 = 0x483A
+0x7FA5 = 0x7447
+0x7FA7 = 0x7448
+0x7FA9 = 0x5265
+0x7FAF = 0x7449
+0x7FB0 = 0x744A
+0x7FB2 = 0x744B
+0x7FB8 = 0x597A
+0x7FB9 = 0x387E
+0x7FBC = 0x6571
+0x7FBD = 0x5370
+0x7FBF = 0x7460
+0x7FC1 = 0x4E4C
+0x7FC5 = 0x3361
+0x7FCA = 0x7134
+0x7FCC = 0x526E
+0x7FCE = 0x7461
+0x7FD2 = 0x4F30
+0x7FD4 = 0x4F68
+0x7FD5 = 0x7462
+0x7FDF = 0x3554
+0x7FE0 = 0x3464
+0x7FE1 = 0x7464
+0x7FE5 = 0x7463
+0x7FE6 = 0x7465
+0x7FE9 = 0x7466
+0x7FEE = 0x7467
+0x7FF0 = 0x3A32
+0x7FF1 = 0x303F
+0x7FF3 = 0x7468
+0x7FF9 = 0x474C
+0x7FFB = 0x372D
+0x7FFC = 0x526D
+0x8000 = 0x522B
+0x8001 = 0x404F
+0x8003 = 0x3F3C
+0x8004 = 0x6B23
+0x8005 = 0x555F
+0x8006 = 0x6A48
+0x800B = 0x7173
+0x800C = 0x3678
+0x800D = 0x4B23
+0x8010 = 0x444D
+0x8012 = 0x7167
+0x8014 = 0x7168
+0x8015 = 0x387B
+0x8016 = 0x7169
+0x8017 = 0x3A44
+0x8018 = 0x5445
+0x8019 = 0x3052
+0x801C = 0x716A
+0x8020 = 0x716B
+0x8025 = 0x716D
+0x8026 = 0x716E
+0x8028 = 0x7171
+0x8029 = 0x7170
+0x802A = 0x4555
+0x802C = 0x716F
+0x802E = 0x716C
+0x8031 = 0x7172
+0x8033 = 0x367A
+0x8035 = 0x7174
+0x8036 = 0x522E
+0x8037 = 0x5E47
+0x803B = 0x335C
+0x803D = 0x3522
+0x803F = 0x3922
+0x8043 = 0x7175
+0x8046 = 0x7176
+0x804A = 0x4144
+0x8052 = 0x7178
+0x8056 = 0x4A25
+0x8058 = 0x4638
+0x805A = 0x3E5B
+0x805E = 0x4E45
+0x806F = 0x412A
+0x8070 = 0x344F
+0x8071 = 0x717A
+0x8072 = 0x4979
+0x8073 = 0x4B4A
+0x8075 = 0x7179
+0x8076 = 0x4474
+0x8077 = 0x5630
+0x8079 = 0x7177
+0x807D = 0x4C7D
+0x807E = 0x417B
+0x807F = 0x6D32
+0x8080 = 0x6D31
+0x8084 = 0x525E
+0x8085 = 0x4B60
+0x8086 = 0x4B41
+0x8087 = 0x5558
+0x8089 = 0x4862
+0x808B = 0x405F
+0x808C = 0x3C21
+0x8093 = 0x6B41
+0x8096 = 0x5024
+0x8098 = 0x5662
+0x809A = 0x3647
+0x809B = 0x3858
+0x809C = 0x6B40
+0x809D = 0x384E
+0x809F = 0x6B3F
+0x80A1 = 0x3949
+0x80A2 = 0x562B
+0x80A5 = 0x374A
+0x80A9 = 0x3C67
+0x80AA = 0x373E
+0x80AB = 0x6B46
+0x80AD = 0x6B47
+0x80AF = 0x3F4F
+0x80B1 = 0x6B45
+0x80B2 = 0x537D
+0x80B4 = 0x6B48
+0x80B7 = 0x6B49
+0x80BA = 0x374E
+0x80BC = 0x6B42
+0x80BD = 0x6B44
+0x80C2 = 0x6B4F
+0x80C3 = 0x4E38
+0x80C4 = 0x6B50
+0x80CC = 0x3133
+0x80CD = 0x6B52
+0x80CE = 0x4C25
+0x80D6 = 0x4556
+0x80D7 = 0x6B53
+0x80D9 = 0x6B51
+0x80DA = 0x455F
+0x80DB = 0x6B4E
+0x80DD = 0x6B55
+0x80DE = 0x307B
+0x80E1 = 0x3A7A
+0x80E4 = 0x5837
+0x80E5 = 0x7163
+0x80E9 = 0x6B4C
+0x80EC = 0x6640
+0x80ED = 0x6B59
+0x80EF = 0x3F68
+0x80F0 = 0x5248
+0x80F1 = 0x6B57
+0x80F2 = 0x6B5C
+0x80F3 = 0x386C
+0x80F4 = 0x6B58
+0x80F8 = 0x5058
+0x80FA = 0x3037
+0x80FC = 0x6B5D
+0x80FD = 0x445C
+0x8102 = 0x562C
+0x8105 = 0x5032
+0x8106 = 0x3460
+0x8109 = 0x4276
+0x810A = 0x3C39
+0x810E = 0x6B5B
+0x8112 = 0x6B5F
+0x8116 = 0x3231
+0x8118 = 0x6B64
+0x811A = 0x3D45
+0x811B = 0x6B56
+0x811E = 0x6B62
+0x812C = 0x6B63
+0x812F = 0x382C
+0x8131 = 0x4D51
+0x8132 = 0x6B65
+0x8139 = 0x554D
+0x813E = 0x4622
+0x8146 = 0x4C73
+0x8148 = 0x6B66
+0x814A = 0x784C
+0x814B = 0x5238
+0x814C = 0x6B67
+0x814E = 0x4976
+0x8150 = 0x382F
+0x8151 = 0x382D
+0x8153 = 0x6B68
+0x8154 = 0x473B
+0x8155 = 0x4D73
+0x8156 = 0x6B4B
+0x8159 = 0x6B6A
+0x815A = 0x6B6B
+0x8160 = 0x6B6D
+0x8161 = 0x6B61
+0x8165 = 0x5048
+0x8166 = 0x4454
+0x8167 = 0x6B72
+0x8169 = 0x6B6E
+0x816B = 0x5657
+0x816D = 0x6B71
+0x816E = 0x4879
+0x8170 = 0x517C
+0x8171 = 0x6B6C
+0x8174 = 0x6B69
+0x8178 = 0x3326
+0x8179 = 0x3839
+0x817A = 0x4F59
+0x817C = 0x6B6F
+0x817D = 0x6B70
+0x817F = 0x4D48
+0x8180 = 0x3072
+0x8182 = 0x6B76
+0x8188 = 0x6B75
+0x818A = 0x3232
+0x818F = 0x3860
+0x8198 = 0x316C
+0x819A = 0x3774
+0x819B = 0x4C45
+0x819C = 0x4424
+0x819D = 0x4F25
+0x81A0 = 0x3D3A
+0x81A3 = 0x6B79
+0x81A6 = 0x6C22
+0x81A8 = 0x4572
+0x81A9 = 0x4465
+0x81AA = 0x6B7A
+0x81B3 = 0x4945
+0x81BA = 0x625F
+0x81BB = 0x6B7E
+0x81BD = 0x3528
+0x81BE = 0x6B5A
+0x81BF = 0x4527
+0x81C0 = 0x4D4E
+0x81C1 = 0x6C21
+0x81C2 = 0x315B
+0x81C3 = 0x5337
+0x81C6 = 0x525C
+0x81C9 = 0x4133
+0x81CA = 0x6B7D
+0x81CC = 0x6B7B
+0x81CD = 0x466A
+0x81CF = 0x6B77
+0x81D8 = 0x4030
+0x81DA = 0x6B4D
+0x81DF = 0x5460
+0x81E0 = 0x5975
+0x81E3 = 0x333C
+0x81E7 = 0x6A30
+0x81E8 = 0x4159
+0x81EA = 0x5754
+0x81EC = 0x742B
+0x81ED = 0x3374
+0x81F3 = 0x5641
+0x81F4 = 0x5642
+0x81FA = 0x4C28
+0x81FB = 0x5569
+0x81FC = 0x3E4A
+0x81FE = 0x7427
+0x8200 = 0x5228
+0x8201 = 0x7428
+0x8202 = 0x7429
+0x8204 = 0x742A
+0x8205 = 0x3E4B
+0x8207 = 0x536B
+0x8208 = 0x504B
+0x8209 = 0x3E59
+0x820A = 0x3E49
+0x820C = 0x4960
+0x820D = 0x7867
+0x8210 = 0x7342
+0x8212 = 0x4A66
+0x8214 = 0x4C72
+0x821B = 0x6236
+0x821C = 0x4B34
+0x821E = 0x4E68
+0x821F = 0x565B
+0x8221 = 0x742D
+0x8222 = 0x742E
+0x8228 = 0x7432
+0x822A = 0x3A3D
+0x822B = 0x7433
+0x822C = 0x3063
+0x822D = 0x7430
+0x822F = 0x7431
+0x8233 = 0x7436
+0x8234 = 0x7437
+0x8235 = 0x3666
+0x8236 = 0x3230
+0x8237 = 0x4F4F
+0x8238 = 0x7434
+0x8239 = 0x342C
+0x823E = 0x7438
+0x8244 = 0x7439
+0x8247 = 0x4D27
+0x8249 = 0x743A
+0x824B = 0x743B
+0x824F = 0x743C
+0x8258 = 0x4B52
+0x8259 = 0x3255
+0x825A = 0x743D
+0x825F = 0x743E
+0x8264 = 0x742F
+0x8266 = 0x3D22
+0x8268 = 0x743F
+0x826B = 0x7435
+0x826E = 0x745E
+0x826F = 0x413C
+0x8271 = 0x3C68
+0x8272 = 0x492B
+0x8274 = 0x6575
+0x8277 = 0x515E
+0x8279 = 0x5C33
+0x827D = 0x5C34
+0x827E = 0x302C
+0x827F = 0x5C35
+0x8284 = 0x5C39
+0x8288 = 0x5842
+0x828A = 0x5C37
+0x828B = 0x5373
+0x828D = 0x4956
+0x828E = 0x5C3A
+0x828F = 0x5C36
+0x8291 = 0x5C3B
+0x8292 = 0x4322
+0x8298 = 0x5C45
+0x8299 = 0x5C3D
+0x829D = 0x5625
+0x829F = 0x5C4F
+0x82A1 = 0x5C4D
+0x82A4 = 0x5C52
+0x82A5 = 0x3D66
+0x82A8 = 0x5C38
+0x82A9 = 0x5C4B
+0x82AA = 0x5C4E
+0x82AB = 0x5C3E
+0x82AC = 0x3752
+0x82AD = 0x3045
+0x82AE = 0x5C47
+0x82AF = 0x503E
+0x82B0 = 0x5C41
+0x82B1 = 0x3B28
+0x82B3 = 0x373C
+0x82B4 = 0x5C4C
+0x82B7 = 0x5C46
+0x82B9 = 0x475B
+0x82BB = 0x5B3B
+0x82BD = 0x513F
+0x82BE = 0x5C40
+0x82C4 = 0x5C50
+0x82CA = 0x5C43
+0x82D1 = 0x5437
+0x82D2 = 0x5C5B
+0x82D3 = 0x5C5F
+0x82D4 = 0x4C26
+0x82D5 = 0x5C66
+0x82D7 = 0x4367
+0x82D8 = 0x5C5C
+0x82DB = 0x3F41
+0x82DC = 0x5C59
+0x82DE = 0x307A
+0x82DF = 0x3936
+0x82E0 = 0x5C65
+0x82E1 = 0x5C53
+0x82E3 = 0x5C44
+0x82E4 = 0x5C56
+0x82E5 = 0x4874
+0x82E6 = 0x3F60
+0x82E7 = 0x5C51
+0x82EB = 0x493B
+0x82EF = 0x313D
+0x82F1 = 0x5322
+0x82F4 = 0x5C5A
+0x82F7 = 0x5C55
+0x82F9 = 0x785C
+0x82FB = 0x5C5E
+0x8301 = 0x5742
+0x8302 = 0x432F
+0x8303 = 0x7832
+0x8304 = 0x4751
+0x8305 = 0x4329
+0x8306 = 0x5C62
+0x8307 = 0x5C58
+0x8308 = 0x5C6B
+0x8309 = 0x5C54
+0x830C = 0x5C5D
+0x8317 = 0x5C78
+0x831A = 0x5C61
+0x831B = 0x5D22
+0x831C = 0x5C67
+0x8328 = 0x3444
+0x832B = 0x4323
+0x832C = 0x3267
+0x832D = 0x5C7A
+0x832F = 0x5C72
+0x8331 = 0x5C6F
+0x8333 = 0x5C7C
+0x8334 = 0x5C6E
+0x8335 = 0x5270
+0x8336 = 0x3268
+0x8338 = 0x4857
+0x8339 = 0x4863
+0x833A = 0x5C7B
+0x833C = 0x5C6D
+0x8340 = 0x5C77
+0x8343 = 0x5C75
+0x8346 = 0x3E23
+0x8347 = 0x5C74
+0x8349 = 0x325D
+0x834F = 0x5C73
+0x8350 = 0x7843
+0x8351 = 0x5C68
+0x8352 = 0x3B44
+0x8354 = 0x4073
+0x8377 = 0x3A49
+0x8378 = 0x5D29
+0x837B = 0x5D36
+0x837C = 0x5D31
+0x837D = 0x5D34
+0x8385 = 0x5D30
+0x8386 = 0x464E
+0x8389 = 0x4072
+0x838A = 0x572F
+0x838E = 0x492F
+0x8392 = 0x5C6C
+0x8393 = 0x5D2E
+0x8396 = 0x3E25
+0x8398 = 0x5D37
+0x839B = 0x5C70
+0x839C = 0x5D2F
+0x839E = 0x5D38
+0x83A0 = 0x5D2C
+0x83A2 = 0x3C54
+0x83A7 = 0x5C48
+0x83A8 = 0x5D39
+0x83A9 = 0x5D33
+0x83AA = 0x5D2D
+0x83AB = 0x442A
+0x83B0 = 0x5D28
+0x83BD = 0x4327
+0x83C0 = 0x5D52
+0x83C1 = 0x5D3C
+0x83C5 = 0x5D51
+0x83C7 = 0x393D
+0x83CA = 0x3E55
+0x83CC = 0x3E7A
+0x83CF = 0x3A4A
+0x83D4 = 0x5D4A
+0x83D6 = 0x5D45
+0x83D8 = 0x5D3F
+0x83DC = 0x324B
+0x83DD = 0x5D43
+0x83DF = 0x5D4B
+0x83E0 = 0x3224
+0x83E1 = 0x5D55
+0x83E5 = 0x5D3E
+0x83E9 = 0x4650
+0x83EA = 0x5D50
+0x83EF = 0x3B2A
+0x83F0 = 0x5D54
+0x83F1 = 0x4162
+0x83F2 = 0x3746
+0x83F8 = 0x5D4E
+0x83F9 = 0x5D4F
+0x83FD = 0x5D44
+0x8401 = 0x5D3D
+0x8403 = 0x5D4D
+0x8404 = 0x4C51
+0x8406 = 0x5D49
+0x8407 = 0x5C49
+0x840A = 0x4033
+0x840B = 0x5D42
+0x840C = 0x4348
+0x840D = 0x463C
+0x840E = 0x4E2E
+0x840F = 0x5D4C
+0x8411 = 0x5D48
+0x8418 = 0x5D41
+0x841C = 0x5D46
+0x842C = 0x4D72
+0x8431 = 0x5D66
+0x8435 = 0x5D2B
+0x8438 = 0x5D47
+0x843C = 0x5D60
+0x843D = 0x4264
+0x8446 = 0x5D61
+0x8449 = 0x5236
+0x8451 = 0x5D57
+0x8452 = 0x5D26
+0x8457 = 0x5678
+0x8459 = 0x5D59
+0x845A = 0x5D58
+0x845B = 0x3870
+0x845C = 0x5D56
+0x8461 = 0x464F
+0x8463 = 0x362D
+0x8464 = 0x5D27
+0x8466 = 0x4E2D
+0x8469 = 0x5D62
+0x846B = 0x3A79
+0x846C = 0x5461
+0x846D = 0x5D67
+0x846F = 0x7877
+0x8471 = 0x3450
+0x8473 = 0x5D5A
+0x8475 = 0x3F7B
+0x8476 = 0x5D63
+0x8477 = 0x3B67
+0x8478 = 0x5D5F
+0x847A = 0x5D5D
+0x8482 = 0x3559
+0x8488 = 0x5D5C
+0x848E = 0x5D65
+0x8493 = 0x5D3B
+0x8494 = 0x5D2A
+0x8497 = 0x5D75
+0x8499 = 0x4349
+0x849C = 0x4B62
+0x84A1 = 0x5D72
+0x84AF = 0x5861
+0x84B2 = 0x4651
+0x84B4 = 0x5D74
+0x84B8 = 0x5574
+0x84B9 = 0x5D73
+0x84BA = 0x5D70
+0x84BC = 0x3254
+0x84BD = 0x5D6C
+0x84BF = 0x5D6F
+0x84C0 = 0x5D25
+0x84C1 = 0x5D68
+0x84C4 = 0x506E
+0x84C9 = 0x4858
+0x84CA = 0x5D6E
+0x84CB = 0x3847
+0x84CD = 0x5D69
+0x84D0 = 0x5D6A
+0x84D1 = 0x4B72
+0x84D3 = 0x5D6D
+0x84D6 = 0x314D
+0x84EC = 0x456E
+0x84EE = 0x412B
+0x84EF = 0x5C4A
+0x84F0 = 0x5D7B
+0x84FC = 0x5E24
+0x84FD = 0x5C6A
+0x84FF = 0x5E23
+0x850C = 0x5D78
+0x8511 = 0x436F
+0x8513 = 0x427B
+0x8514 = 0x7825
+0x8517 = 0x5561
+0x851A = 0x4E35
+0x851E = 0x5D64
+0x851F = 0x5D7D
+0x8521 = 0x324C
+0x8523 = 0x3D2F
+0x8526 = 0x5C60
+0x852B = 0x4468
+0x852C = 0x4A5F
+0x852D = 0x5271
+0x8538 = 0x5D7A
+0x853B = 0x5E22
+0x853D = 0x314E
+0x8541 = 0x5D21
+0x8543 = 0x5E2C
+0x8546 = 0x5D5B
+0x8548 = 0x5E26
+0x8549 = 0x3D36
+0x854A = 0x486F
+0x854E = 0x5C71
+0x8552 = 0x5D24
+0x8553 = 0x5C3F
+0x8555 = 0x5D35
+0x8556 = 0x5E21
+0x8558 = 0x5C69
+0x8559 = 0x5E25
+0x855E = 0x5E29
+0x8562 = 0x5D5E
+0x8564 = 0x5E28
+0x8568 = 0x5E27
+0x8569 = 0x3534
+0x856A = 0x4E5F
+0x856D = 0x4F74
+0x8577 = 0x5D77
+0x8579 = 0x5E33
+0x857A = 0x5E2A
+0x857B = 0x5E2E
+0x857E = 0x4059
+0x8584 = 0x3121
+0x8585 = 0x5E36
+0x8587 = 0x5E31
+0x8588 = 0x5C76
+0x858A = 0x3C3B
+0x858C = 0x5C3C
+0x858F = 0x5E32
+0x8591 = 0x7844
+0x8594 = 0x473E
+0x859B = 0x5126
+0x859C = 0x5E35
+0x859F = 0x5D32
+0x85A4 = 0x5E2F
+0x85A6 = 0x3C76
+0x85A8 = 0x5E30
+0x85A9 = 0x4878
+0x85AA = 0x503D
+0x85AF = 0x4A6D
+0x85B0 = 0x5E39
+0x85B7 = 0x5E38
+0x85B9 = 0x5E37
+0x85BA = 0x5C79
+0x85C1 = 0x5E3B
+0x85C9 = 0x3D65
+0x85CD = 0x4036
+0x85CE = 0x5D23
+0x85CF = 0x3258
+0x85D0 = 0x436A
+0x85D5 = 0x453A
+0x85DC = 0x5E3C
+0x85DD = 0x5255
+0x85E4 = 0x4C59
+0x85E5 = 0x5229
+0x85E9 = 0x372A
+0x85EA = 0x5E34
+0x85F4 = 0x544C
+0x85F6 = 0x5C42
+0x85F9 = 0x302A
+0x85FA = 0x5D7E
+0x85FB = 0x5465
+0x85FF = 0x5E3D
+0x8604 = 0x5E2D
+0x8605 = 0x5E3F
+0x8606 = 0x422B
+0x8607 = 0x4B55
+0x860B = 0x463B
+0x8611 = 0x4422
+0x8616 = 0x5E41
+0x861A = 0x5E3A
+0x861E = 0x5D7C
+0x8622 = 0x5C57
+0x8627 = 0x5E3E
+0x8629 = 0x5E40
+0x862D = 0x403C
+0x8638 = 0x553A
+0x863A = 0x5D71
+0x863C = 0x5E42
+0x863F = 0x425C
+0x864D = 0x722E
+0x864E = 0x3B22
+0x8650 = 0x4530
+0x8654 = 0x722F
+0x8655 = 0x3426
+0x865A = 0x5069
+0x865C = 0x4232
+0x865E = 0x535D
+0x865F = 0x3A45
+0x8662 = 0x6B3D
+0x8667 = 0x3F77
+0x866C = 0x7230
+0x8671 = 0x4A2D
+0x8679 = 0x3A67
+0x867A = 0x7233
+0x867B = 0x7235
+0x867C = 0x7234
+0x868A = 0x4E43
+0x868B = 0x7238
+0x868C = 0x3076
+0x868D = 0x7237
+0x8693 = 0x723E
+0x869C = 0x5141
+0x869D = 0x723A
+0x86A3 = 0x723C
+0x86A4 = 0x5469
+0x86A7 = 0x723B
+0x86A8 = 0x7236
+0x86A9 = 0x723F
+0x86AA = 0x723D
+0x86AF = 0x7247
+0x86B0 = 0x7244
+0x86B1 = 0x7246
+0x86B4 = 0x724A
+0x86B5 = 0x7242
+0x86B6 = 0x7240
+0x86BA = 0x7245
+0x86C0 = 0x567B
+0x86C4 = 0x7241
+0x86C6 = 0x4779
+0x86C7 = 0x495F
+0x86C9 = 0x7248
+0x86CB = 0x3530
+0x86D0 = 0x7250
+0x86D1 = 0x7256
+0x86D4 = 0x3B57
+0x86D8 = 0x7255
+0x86D9 = 0x4D5C
+0x86DB = 0x566B
+0x86DE = 0x7252
+0x86DF = 0x7254
+0x86E4 = 0x3872
+0x86E9 = 0x724B
+0x86ED = 0x724E
+0x86F8 = 0x7259
+0x86F9 = 0x533C
+0x86FA = 0x724C
+0x86FE = 0x366A
+0x8700 = 0x4A71
+0x8702 = 0x3764
+0x8703 = 0x7257
+0x8706 = 0x7239
+0x8707 = 0x7258
+0x8708 = 0x725A
+0x8709 = 0x725D
+0x870A = 0x725B
+0x870D = 0x725C
+0x8712 = 0x5151
+0x8713 = 0x7251
+0x8715 = 0x4D49
+0x8718 = 0x5629
+0x871A = 0x7263
+0x871C = 0x435B
+0x871E = 0x7260
+0x8721 = 0x784B
+0x8722 = 0x726C
+0x8723 = 0x725E
+0x8725 = 0x7261
+0x8729 = 0x7268
+0x872E = 0x7262
+0x8731 = 0x7267
+0x8734 = 0x7266
+0x8737 = 0x7269
+0x873B = 0x725F
+0x873E = 0x7264
+0x873F = 0x726A
+0x874C = 0x7272
+0x874E = 0x502B
+0x8753 = 0x7275
+0x8755 = 0x4A34
+0x8757 = 0x3B48
+0x8759 = 0x7279
+0x8760 = 0x7270
+0x8763 = 0x7276
+0x8764 = 0x7278
+0x8765 = 0x727A
+0x8766 = 0x4F3A
+0x876E = 0x7273
+0x8770 = 0x7271
+0x8774 = 0x3A7B
+0x8776 = 0x357B
+0x8778 = 0x4E4F
+0x877B = 0x726F
+0x877D = 0x726D
+0x8782 = 0x726B
+0x8783 = 0x7326
+0x8784 = 0x724F
+0x8785 = 0x7323
+0x8788 = 0x7322
+0x878B = 0x7274
+0x878D = 0x485A
+0x8793 = 0x727B
+0x8797 = 0x7325
+0x879E = 0x426C
+0x879F = 0x4378
+0x87A2 = 0x5329
+0x87AB = 0x7327
+0x87AC = 0x7329
+0x87AD = 0x7324
+0x87AF = 0x727C
+0x87B3 = 0x732B
+0x87B5 = 0x732A
+0x87BA = 0x425D
+0x87BB = 0x7277
+0x87BD = 0x732E
+0x87C0 = 0x7330
+0x87C4 = 0x555D
+0x87C6 = 0x7321
+0x87C8 = 0x7265
+0x87CA = 0x7331
+0x87CB = 0x732C
+0x87CE = 0x727D
+0x87D1 = 0x732F
+0x87D2 = 0x727E
+0x87D3 = 0x732D
+0x87DB = 0x7332
+0x87E0 = 0x7334
+0x87E3 = 0x7231
+0x87E5 = 0x7328
+0x87EA = 0x7333
+0x87EC = 0x3275
+0x87EE = 0x7335
+0x87EF = 0x724D
+0x87F2 = 0x3366
+0x87F6 = 0x7249
+0x87F9 = 0x5037
+0x87FB = 0x524F
+0x87FE = 0x7338
+0x8803 = 0x5979
+0x8805 = 0x532C
+0x8806 = 0x7232
+0x880A = 0x7339
+0x8810 = 0x7253
+0x8811 = 0x726E
+0x8813 = 0x7337
+0x8815 = 0x4864
+0x8816 = 0x7336
+0x881B = 0x733A
+0x881F = 0x402F
+0x8821 = 0x733B
+0x8822 = 0x3440
+0x8823 = 0x7243
+0x8831 = 0x3946
+0x8832 = 0x6E43
+0x8836 = 0x324F
+0x8839 = 0x733C
+0x883B = 0x4279
+0x883C = 0x733D
+0x8840 = 0x512A
+0x8844 = 0x742C
+0x8846 = 0x565A
+0x884A = 0x785A
+0x884C = 0x5050
+0x884D = 0x515C
+0x8853 = 0x4A75
+0x8857 = 0x3D56
+0x8859 = 0x5143
+0x885B = 0x4E40
+0x885D = 0x3365
+0x8861 = 0x3A62
+0x8862 = 0x6169
+0x8863 = 0x5242
+0x8864 = 0x7142
+0x8868 = 0x316D
+0x8869 = 0x7143
+0x886B = 0x4940
+0x886E = 0x5972
+0x8870 = 0x4B25
+0x8872 = 0x7144
+0x8877 = 0x5654
+0x8879 = 0x563B
+0x887D = 0x7145
+0x887E = 0x7440
+0x887F = 0x7146
+0x8881 = 0x542C
+0x8882 = 0x7147
+0x8888 = 0x7442
+0x888B = 0x347C
+0x888D = 0x455B
+0x8892 = 0x4C3B
+0x8896 = 0x5064
+0x88A2 = 0x7148
+0x88A4 = 0x5973
+0x88AB = 0x313B
+0x88B1 = 0x3824
+0x88B7 = 0x714A
+0x88BC = 0x714B
+0x88C1 = 0x3243
+0x88C2 = 0x4151
+0x88C9 = 0x714C
+0x88CA = 0x7441
+0x88CE = 0x714E
+0x88CF = 0x406F
+0x88D2 = 0x5976
+0x88D4 = 0x5261
+0x88D5 = 0x5423
+0x88D8 = 0x7443
+0x88D9 = 0x4839
+0x88DC = 0x3239
+0x88DD = 0x5730
+0x88DF = 0x7444
+0x88E8 = 0x7154
+0x88F0 = 0x7156
+0x88F1 = 0x7151
+0x88F3 = 0x4951
+0x88F4 = 0x4561
+0x88F8 = 0x4263
+0x88F9 = 0x397C
+0x88FC = 0x7153
+0x88FD = 0x7925
+0x88FE = 0x7155
+0x8902 = 0x3953
+0x8907 = 0x7834
+0x890A = 0x715B
+0x8910 = 0x3A56
+0x8912 = 0x307D
+0x8913 = 0x7159
+0x8919 = 0x7158
+0x891A = 0x7152
+0x8921 = 0x7157
+0x8925 = 0x486C
+0x892A = 0x4D4A
+0x892B = 0x715D
+0x8930 = 0x653D
+0x8932 = 0x3F63
+0x8933 = 0x714D
+0x8936 = 0x715E
+0x8938 = 0x715A
+0x893B = 0x5974
+0x8941 = 0x715F
+0x8944 = 0x4F65
+0x8947 = 0x7150
+0x8956 = 0x3040
+0x895D = 0x714F
+0x895E = 0x7445
+0x895F = 0x3D73
+0x8960 = 0x7149
+0x8964 = 0x715C
+0x8966 = 0x7160
+0x896A = 0x4D60
+0x896C = 0x7821
+0x896F = 0x3344
+0x8972 = 0x4F2E
+0x897B = 0x7161
+0x897F = 0x4E77
+0x8981 = 0x522A
+0x8983 = 0x717B
+0x8986 = 0x3832
+0x898B = 0x3C7B
+0x898F = 0x3966
+0x8993 = 0x4359
+0x8996 = 0x4A53
+0x8998 = 0x6A68
+0x89A1 = 0x6A6A
+0x89A6 = 0x6A6C
+0x89AA = 0x4757
+0x89AC = 0x6A69
+0x89AF = 0x6A6D
+0x89B2 = 0x6A6E
+0x89B7 = 0x6A6F
+0x89BA = 0x3E75
+0x89BD = 0x4040
+0x89BF = 0x6A6B
+0x89C0 = 0x395B
+0x89D2 = 0x3D47
+0x89D6 = 0x757B
+0x89DA = 0x757D
+0x89DC = 0x757E
+0x89E3 = 0x3D62
+0x89E5 = 0x7621
+0x89EB = 0x7622
+0x89F3 = 0x6C32
+0x89F4 = 0x757C
+0x89F6 = 0x7623
+0x89F8 = 0x3425
+0x8A00 = 0x5154
+0x8A01 = 0x5A25
+0x8A02 = 0x3629
+0x8A03 = 0x383C
+0x8A07 = 0x596A
+0x8A08 = 0x3C46
+0x8A0A = 0x5136
+0x8A0C = 0x5A27
+0x8A0E = 0x4C56
+0x8A10 = 0x5A26
+0x8A13 = 0x5135
+0x8A15 = 0x5A28
+0x8A16 = 0x467D
+0x8A18 = 0x3C47
+0x8A1B = 0x366F
+0x8A1D = 0x5148
+0x8A1F = 0x4B4F
+0x8A23 = 0x3E77
+0x8A25 = 0x5A2B
+0x8A2A = 0x3743
+0x8A2D = 0x4968
+0x8A31 = 0x506D
+0x8A34 = 0x4B5F
+0x8A36 = 0x5A2D
+0x8A3A = 0x556F
+0x8A3E = 0x7624
+0x8A41 = 0x5A2C
+0x8A46 = 0x5A2E
+0x8A48 = 0x6E3A
+0x8A4E = 0x5A2A
+0x8A50 = 0x5529
+0x8A52 = 0x5A31
+0x8A54 = 0x5A2F
+0x8A55 = 0x4640
+0x8A58 = 0x5A30
+0x8A5B = 0x5767
+0x8A5E = 0x344A
+0x8A61 = 0x5A3C
+0x8A62 = 0x512F
+0x8A63 = 0x5268
+0x8A66 = 0x4A54
+0x8A69 = 0x4A2B
+0x8A6B = 0x326F
+0x8A6C = 0x5A38
+0x8A6D = 0x396E
+0x8A6E = 0x5A39
+0x8A70 = 0x5A35
+0x8A71 = 0x3B30
+0x8A72 = 0x3843
+0x8A73 = 0x4F6A
+0x8A75 = 0x5A37
+0x8A79 = 0x5532
+0x8A7C = 0x5A36
+0x8A7F = 0x5A34
+0x8A84 = 0x5A33
+0x8A85 = 0x566F
+0x8A86 = 0x5A32
+0x8A87 = 0x3F64
+0x8A8D = 0x484F
+0x8A91 = 0x5A3F
+0x8A92 = 0x5A40
+0x8A93 = 0x4A44
+0x8A95 = 0x352E
+0x8A98 = 0x5355
+0x8A9A = 0x5A3D
+0x8A9E = 0x536F
+0x8AA0 = 0x334F
+0x8AA1 = 0x3D6B
+0x8AA3 = 0x4E5C
+0x8AA4 = 0x4E73
+0x8AA5 = 0x5A3E
+0x8AA6 = 0x4B50
+0x8AA8 = 0x3B65
+0x8AAC = 0x4B35
+0x8AB0 = 0x4B2D
+0x8AB2 = 0x3F4E
+0x8AB6 = 0x5A47
+0x8AB9 = 0x374C
+0x8ABC = 0x526A
+0x8ABF = 0x3577
+0x8AC2 = 0x5A46
+0x8AC4 = 0x573B
+0x8AC7 = 0x4C38
+0x8AC9 = 0x5A43
+0x8ACB = 0x476B
+0x8ACD = 0x5A3A
+0x8ACF = 0x5A41
+0x8AD1 = 0x5A42
+0x8AD2 = 0x4142
+0x8AD6 = 0x425B
+0x8AD7 = 0x5A45
+0x8ADB = 0x5A44
+0x8ADC = 0x357D
+0x8ADE = 0x5A52
+0x8AE2 = 0x5A3B
+0x8AE4 = 0x5A4C
+0x8AE6 = 0x5A50
+0x8AE7 = 0x5033
+0x8AEB = 0x5A49
+0x8AED = 0x5A4D
+0x8AEE = 0x5A51
+0x8AF1 = 0x3B64
+0x8AF3 = 0x5A4F
+0x8AF6 = 0x5A48
+0x8AF7 = 0x376D
+0x8AF8 = 0x566E
+0x8AFA = 0x5168
+0x8AFC = 0x5A4E
+0x8AFE = 0x4535
+0x8B00 = 0x4431
+0x8B01 = 0x5A4B
+0x8B02 = 0x4E3D
+0x8B04 = 0x4C5C
+0x8B05 = 0x565F
+0x8B07 = 0x6540
+0x8B0A = 0x3B51
+0x8B0E = 0x4355
+0x8B10 = 0x5A57
+0x8B14 = 0x5A4A
+0x8B16 = 0x5A55
+0x8B17 = 0x3079
+0x8B19 = 0x472B
+0x8B1A = 0x5A56
+0x8B1B = 0x3D32
+0x8B1D = 0x503B
+0x8B21 = 0x5225
+0x8B26 = 0x7625
+0x8B28 = 0x5A53
+0x8B2B = 0x5A58
+0x8B2C = 0x437D
+0x8B2D = 0x5A59
+0x8B33 = 0x5A29
+0x8B39 = 0x3D77
+0x8B3E = 0x4321
+0x8B49 = 0x5624
+0x8B4E = 0x5A5C
+0x8B4F = 0x3C25
+0x8B56 = 0x5A5A
+0x8B58 = 0x4A36
+0x8B59 = 0x5A5B
+0x8B5A = 0x4C37
+0x8B5C = 0x4657
+0x8B66 = 0x3E2F
+0x8B6B = 0x5A5E
+0x8B6C = 0x4629
+0x8B6F = 0x526B
+0x8B70 = 0x5269
+0x8B74 = 0x4734
+0x8B77 = 0x3B24
+0x8B7D = 0x537E
+0x8B80 = 0x3641
+0x8B8A = 0x3164
+0x8B8E = 0x7645
+0x8B92 = 0x3277
+0x8B93 = 0x4843
+0x8B95 = 0x403E
+0x8B96 = 0x5A5F
+0x8B9C = 0x5A54
+0x8B9E = 0x5A5D
+0x8C37 = 0x3948
+0x8C41 = 0x3B6D
+0x8C46 = 0x3639
+0x8C47 = 0x7478
+0x8C48 = 0x4671
+0x8C49 = 0x7479
+0x8C4C = 0x4D63
+0x8C50 = 0x3761
+0x8C55 = 0x7539
+0x8C5A = 0x6B60
+0x8C61 = 0x4F73
+0x8C62 = 0x3B3F
+0x8C6A = 0x3A40
+0x8C6B = 0x5425
+0x8C73 = 0x6159
+0x8C78 = 0x7574
+0x8C79 = 0x312A
+0x8C7A = 0x3272
+0x8C82 = 0x7575
+0x8C85 = 0x7577
+0x8C89 = 0x3A51
+0x8C8A = 0x7576
+0x8C8C = 0x4332
+0x8C94 = 0x7579
+0x8C98 = 0x7578
+0x8C9D = 0x3134
+0x8C9E = 0x556A
+0x8CA0 = 0x383A
+0x8CA1 = 0x3246
+0x8CA2 = 0x3931
+0x8CA7 = 0x4636
+0x8CA8 = 0x3B75
+0x8CA9 = 0x3737
+0x8CAA = 0x4C30
+0x8CAB = 0x3961
+0x8CAC = 0x5470
+0x8CAF = 0x567C
+0x8CB0 = 0x6A5B
+0x8CB2 = 0x6A5F
+0x8CB3 = 0x3721
+0x8CB4 = 0x3973
+0x8CB6 = 0x3161
+0x8CB7 = 0x4272
+0x8CB8 = 0x347B
+0x8CBA = 0x6A5C
+0x8CBB = 0x3751
+0x8CBC = 0x4C79
+0x8CBD = 0x6A5D
+0x8CBF = 0x4333
+0x8CC0 = 0x3A58
+0x8CC1 = 0x6A5A
+0x8CC2 = 0x4238
+0x8CC3 = 0x415E
+0x8CC4 = 0x3B5F
+0x8CC5 = 0x6A60
+0x8CC7 = 0x574A
+0x8CC8 = 0x3C56
+0x8CCA = 0x5474
+0x8CD1 = 0x6A62
+0x8CD2 = 0x495E
+0x8CD3 = 0x3176
+0x8CD5 = 0x6A64
+0x8CDA = 0x6A63
+0x8CDC = 0x344D
+0x8CDE = 0x494D
+0x8CE0 = 0x4562
+0x8CE1 = 0x6259
+0x8CE2 = 0x4F4D
+0x8CE3 = 0x4274
+0x8CE4 = 0x3C7A
+0x8CE6 = 0x3833
+0x8CE7 = 0x6A66
+0x8CEA = 0x564A
+0x8CEB = 0x6A65
+0x8CEC = 0x554B
+0x8CED = 0x3644
+0x8CF4 = 0x4035
+0x8CFA = 0x572C
+0x8CFB = 0x6A67
+0x8CFC = 0x393A
+0x8CFD = 0x487C
+0x8CFE = 0x5853
+0x8D04 = 0x6A5E
+0x8D05 = 0x5738
+0x8D08 = 0x5479
+0x8D0A = 0x545E
+0x8D0B = 0x584D
+0x8D0D = 0x4944
+0x8D0F = 0x532E
+0x8D10 = 0x6A61
+0x8D16 = 0x4A6A
+0x8D1B = 0x3853
+0x8D1C = 0x545F
+0x8D64 = 0x3360
+0x8D66 = 0x4962
+0x8D67 = 0x7476
+0x8D6B = 0x3A55
+0x8D6D = 0x7477
+0x8D70 = 0x575F
+0x8D73 = 0x7471
+0x8D74 = 0x3830
+0x8D77 = 0x4670
+0x8D81 = 0x3343
+0x8D84 = 0x7472
+0x8D85 = 0x332C
+0x8D8A = 0x543D
+0x8D91 = 0x7474
+0x8D94 = 0x7473
+0x8D95 = 0x384F
+0x8D99 = 0x5554
+0x8D9F = 0x4C4B
+0x8DA3 = 0x4824
+0x8DA8 = 0x4777
+0x8DB2 = 0x7475
+0x8DB3 = 0x5763
+0x8DB4 = 0x453F
+0x8DB5 = 0x7540
+0x8DBA = 0x7543
+0x8DBC = 0x7542
+0x8DBE = 0x563A
+0x8DBF = 0x7541
+0x8DC6 = 0x754C
+0x8DCB = 0x304F
+0x8DCC = 0x3578
+0x8DCE = 0x7549
+0x8DCF = 0x754A
+0x8DD1 = 0x455C
+0x8DD6 = 0x7545
+0x8DD7 = 0x7546
+0x8DDA = 0x7547
+0x8DDB = 0x754B
+0x8DDD = 0x3E60
+0x8DDF = 0x387A
+0x8DE3 = 0x7550
+0x8DE4 = 0x7553
+0x8DE8 = 0x3F67
+0x8DEA = 0x3972
+0x8DEB = 0x753C
+0x8DEC = 0x754D
+0x8DEF = 0x4237
+0x8DF3 = 0x4C78
+0x8DFA = 0x3665
+0x8DFD = 0x7555
+0x8E05 = 0x753D
+0x8E09 = 0x7554
+0x8E0F = 0x4C24
+0x8E10 = 0x3C79
+0x8E14 = 0x7556
+0x8E1D = 0x7557
+0x8E1E = 0x3E61
+0x8E1F = 0x7558
+0x8E22 = 0x4C5F
+0x8E23 = 0x755B
+0x8E29 = 0x3248
+0x8E2A = 0x5759
+0x8E2E = 0x755A
+0x8E31 = 0x7562
+0x8E34 = 0x533B
+0x8E35 = 0x7560
+0x8E39 = 0x755F
+0x8E3A = 0x755D
+0x8E3D = 0x7561
+0x8E40 = 0x755E
+0x8E41 = 0x7564
+0x8E42 = 0x7565
+0x8E44 = 0x4C63
+0x8E47 = 0x653F
+0x8E48 = 0x3538
+0x8E49 = 0x7563
+0x8E4A = 0x7568
+0x8E4B = 0x4C23
+0x8E4C = 0x7544
+0x8E55 = 0x754F
+0x8E59 = 0x753E
+0x8E63 = 0x7567
+0x8E66 = 0x3144
+0x8E69 = 0x753F
+0x8E6C = 0x3545
+0x8E6D = 0x3264
+0x8E6F = 0x756C
+0x8E70 = 0x7569
+0x8E72 = 0x3657
+0x8E74 = 0x756D
+0x8E76 = 0x756A
+0x8E7A = 0x754E
+0x8E7C = 0x756B
+0x8E81 = 0x546A
+0x8E85 = 0x756E
+0x8E87 = 0x3379
+0x8E89 = 0x753B
+0x8E8A = 0x336C
+0x8E8B = 0x7552
+0x8E8D = 0x543E
+0x8E90 = 0x7571
+0x8E91 = 0x755C
+0x8E92 = 0x7548
+0x8E93 = 0x7559
+0x8E94 = 0x7570
+0x8E9A = 0x7551
+0x8E9E = 0x7573
+0x8EA1 = 0x7566
+0x8EA5 = 0x345A
+0x8EA6 = 0x7572
+0x8EAA = 0x756F
+0x8EAB = 0x496D
+0x8EAC = 0x392A
+0x8EB2 = 0x3663
+0x8EBA = 0x4C49
+0x8EC0 = 0x477B
+0x8ECA = 0x3335
+0x8ECB = 0x547E
+0x8ECC = 0x396C
+0x8ECD = 0x3E7C
+0x8ECE = 0x6A26
+0x8ED2 = 0x5079
+0x8ED4 = 0x696D
+0x8EDB = 0x696E
+0x8EDF = 0x486D
+0x8EE4 = 0x6975
+0x8EEB = 0x6974
+0x8EF2 = 0x696F
+0x8EF8 = 0x5661
+0x8EF9 = 0x6972
+0x8EFA = 0x6977
+0x8EFB = 0x6970
+0x8EFC = 0x6973
+0x8EFE = 0x6978
+0x8F03 = 0x3D4F
+0x8F05 = 0x697B
+0x8F07 = 0x697A
+0x8F09 = 0x5458
+0x8F0A = 0x6979
+0x8F12 = 0x697C
+0x8F14 = 0x3828
+0x8F15 = 0x4761
+0x8F1B = 0x413E
+0x8F1C = 0x6A22
+0x8F1D = 0x3B54
+0x8F1E = 0x697E
+0x8F1F = 0x6A21
+0x8F25 = 0x3975
+0x8F26 = 0x697D
+0x8F29 = 0x3132
+0x8F2A = 0x4256
+0x8F2F = 0x3C2D
+0x8F33 = 0x6A23
+0x8F38 = 0x4A64
+0x8F3B = 0x3778
+0x8F3E = 0x5537
+0x8F3F = 0x535F
+0x8F42 = 0x6C31
+0x8F44 = 0x4F3D
+0x8F45 = 0x542F
+0x8F46 = 0x6A24
+0x8F49 = 0x572A
+0x8F4D = 0x555E
+0x8F4E = 0x3D4E
+0x8F54 = 0x6A25
+0x8F5F = 0x3A64
+0x8F61 = 0x604E
+0x8F62 = 0x6976
+0x8F64 = 0x6971
+0x8F9B = 0x5041
+0x8F9C = 0x393C
+0x8F9F = 0x3159
+0x8FA3 = 0x4031
+0x8FA6 = 0x306C
+0x8FA8 = 0x3166
+0x8FAD = 0x3447
+0x8FAE = 0x3168
+0x8FAF = 0x3167
+0x8FB0 = 0x333D
+0x8FB1 = 0x4868
+0x8FB2 = 0x4529
+0x8FB6 = 0x6541
+0x8FC2 = 0x5358
+0x8FC4 = 0x4679
+0x8FC5 = 0x5138
+0x8FCE = 0x532D
+0x8FD1 = 0x3D7C
+0x8FD3 = 0x6542
+0x8FD4 = 0x3735
+0x8FD5 = 0x6543
+0x8FE2 = 0x4C76
+0x8FE4 = 0x6546
+0x8FE5 = 0x6544
+0x8FE6 = 0x6548
+0x8FE8 = 0x654A
+0x8FEA = 0x354F
+0x8FEB = 0x4648
+0x8FED = 0x357C
+0x8FEE = 0x6545
+0x8FF0 = 0x4A76
+0x8FF4 = 0x783C
+0x8FF7 = 0x4354
+0x8FF8 = 0x3145
+0x8FF9 = 0x3C23
+0x8FFD = 0x5737
+0x9000 = 0x4D4B
+0x9001 = 0x4B4D
+0x9003 = 0x4C53
+0x9004 = 0x654C
+0x9005 = 0x654B
+0x9006 = 0x4466
+0x900B = 0x654D
+0x900D = 0x6550
+0x900F = 0x4D38
+0x9010 = 0x5670
+0x9011 = 0x654F
+0x9014 = 0x4D3E
+0x9015 = 0x6549
+0x9016 = 0x6551
+0x9017 = 0x363A
+0x9019 = 0x5562
+0x901A = 0x4D28
+0x901B = 0x3964
+0x901D = 0x4A45
+0x901E = 0x3351
+0x901F = 0x4B59
+0x9020 = 0x546C
+0x9021 = 0x6552
+0x9022 = 0x376A
+0x9023 = 0x412C
+0x902D = 0x6555
+0x902E = 0x347E
+0x902F = 0x6556
+0x9032 = 0x3D78
+0x9035 = 0x6553
+0x9036 = 0x6554
+0x9038 = 0x525D
+0x903C = 0x3146
+0x903E = 0x5362
+0x9041 = 0x365D
+0x9042 = 0x4B6C
+0x9044 = 0x6557
+0x9047 = 0x5376
+0x904B = 0x544B
+0x904D = 0x3169
+0x904E = 0x397D
+0x904F = 0x3674
+0x9050 = 0x655A
+0x9051 = 0x6558
+0x9052 = 0x6559
+0x9053 = 0x3540
+0x9054 = 0x346F
+0x9055 = 0x4E25
+0x9058 = 0x655C
+0x905B = 0x655E
+0x905C = 0x5137
+0x905E = 0x355D
+0x9060 = 0x5436
+0x9062 = 0x655D
+0x9063 = 0x4732
+0x9065 = 0x5223
+0x9068 = 0x655B
+0x9069 = 0x4A4A
+0x906D = 0x5462
+0x906E = 0x555A
+0x9072 = 0x3359
+0x9074 = 0x6560
+0x9075 = 0x5771
+0x9077 = 0x4728
+0x9078 = 0x5121
+0x907A = 0x5245
+0x907C = 0x4149
+0x907D = 0x6561
+0x907F = 0x315C
+0x9080 = 0x517B
+0x9081 = 0x4275
+0x9082 = 0x6562
+0x9083 = 0x6564
+0x9084 = 0x3B39
+0x9087 = 0x6547
+0x9088 = 0x6563
+0x908A = 0x315F
+0x908B = 0x6565
+0x908F = 0x425F
+0x9090 = 0x654E
+0x9091 = 0x5258
+0x9095 = 0x675F
+0x9097 = 0x5A75
+0x9099 = 0x5A78
+0x909B = 0x5A76
+0x90A1 = 0x5A7A
+0x90A2 = 0x504F
+0x90A3 = 0x4447
+0x90A6 = 0x306E
+0x90AA = 0x5030
+0x90AF = 0x3A2A
+0x90B0 = 0x5B22
+0x90B1 = 0x4771
+0x90B3 = 0x5A7C
+0x90B4 = 0x5A7B
+0x90B5 = 0x495B
+0x90B6 = 0x5A7D
+0x90B8 = 0x5B21
+0x90BE = 0x5B25
+0x90C1 = 0x7879
+0x90C4 = 0x5B27
+0x90C5 = 0x5B24
+0x90C7 = 0x5B28
+0x90CA = 0x3D3C
+0x90CE = 0x4049
+0x90D7 = 0x5B2D
+0x90DB = 0x5B2E
+0x90DC = 0x5B2C
+0x90DD = 0x3A42
+0x90DF = 0x5B23
+0x90E1 = 0x3F24
+0x90E2 = 0x5B2B
+0x90E8 = 0x323F
+0x90EB = 0x5B2F
+0x90ED = 0x3979
+0x90EF = 0x5B30
+0x90F4 = 0x333B
+0x90F5 = 0x534A
+0x90FD = 0x363C
+0x90FE = 0x5B31
+0x9102 = 0x3675
+0x9104 = 0x5B32
+0x9106 = 0x5B29
+0x9109 = 0x4F67
+0x9112 = 0x575E
+0x9114 = 0x5A79
+0x9116 = 0x5447
+0x9119 = 0x3149
+0x911E = 0x5B34
+0x9122 = 0x5B33
+0x9123 = 0x5B35
+0x9127 = 0x354B
+0x912D = 0x5623
+0x912F = 0x5B37
+0x9130 = 0x415A
+0x9131 = 0x5B36
+0x9132 = 0x3526
+0x9134 = 0x5A7E
+0x9136 = 0x5B26
+0x9139 = 0x5B38
+0x913A = 0x5A77
+0x9143 = 0x5B39
+0x9146 = 0x5B3A
+0x9148 = 0x5B2A
+0x9149 = 0x534F
+0x914A = 0x747A
+0x914B = 0x4775
+0x914C = 0x5743
+0x914D = 0x4564
+0x914E = 0x747C
+0x914F = 0x747D
+0x9150 = 0x747B
+0x9152 = 0x3E46
+0x9157 = 0x506F
+0x915A = 0x3753
+0x915E = 0x4C2A
+0x9161 = 0x7522
+0x9162 = 0x7521
+0x9163 = 0x3A28
+0x9164 = 0x747E
+0x9165 = 0x4B56
+0x9169 = 0x7524
+0x916A = 0x4052
+0x916C = 0x336A
+0x916E = 0x4D2A
+0x916F = 0x7525
+0x9170 = 0x7523
+0x9172 = 0x7528
+0x9174 = 0x7529
+0x9175 = 0x3D4D
+0x9176 = 0x4338
+0x9177 = 0x3F61
+0x9178 = 0x4B61
+0x9179 = 0x752A
+0x9185 = 0x752C
+0x9187 = 0x343C
+0x9189 = 0x576D
+0x918B = 0x3457
+0x918C = 0x752B
+0x918D = 0x752E
+0x9190 = 0x752D
+0x9191 = 0x752F
+0x9192 = 0x5051
+0x9196 = 0x544D
+0x919A = 0x4351
+0x919B = 0x4829
+0x919C = 0x3373
+0x91A2 = 0x7530
+0x91A3 = 0x7531
+0x91AA = 0x7532
+0x91AB = 0x523D
+0x91AC = 0x3D34
+0x91AD = 0x7533
+0x91AE = 0x7534
+0x91AF = 0x7535
+0x91B4 = 0x7537
+0x91B5 = 0x7536
+0x91BA = 0x7538
+0x91C0 = 0x4470
+0x91C1 = 0x5046
+0x91C3 = 0x7527
+0x91C5 = 0x7526
+0x91C7 = 0x3249
+0x91C9 = 0x5354
+0x91CB = 0x4A4D
+0x91CC = 0x784E
+0x91CD = 0x5658
+0x91CE = 0x5230
+0x91CF = 0x413F
+0x91D1 = 0x3D70
+0x91D2 = 0x6E44
+0x91D3 = 0x6E45
+0x91D4 = 0x6E46
+0x91D5 = 0x6E49
+0x91D7 = 0x6E48
+0x91D8 = 0x3624
+0x91D9 = 0x6E47
+0x91DC = 0x382A
+0x91DD = 0x556B
+0x91E3 = 0x3576
+0x91E4 = 0x6E4C
+0x91E7 = 0x6E4B
+0x91E9 = 0x3730
+0x91F5 = 0x6E4E
+0x91F7 = 0x6E4A
+0x91F9 = 0x6E4F
+0x91FA = 0x4725
+0x9200 = 0x6E59
+0x9201 = 0x6E55
+0x9204 = 0x6E57
+0x9208 = 0x6E50
+0x9209 = 0x4446
+0x920D = 0x365B
+0x920E = 0x3933
+0x9210 = 0x6E54
+0x9211 = 0x6E53
+0x9214 = 0x332E
+0x9215 = 0x4525
+0x921E = 0x3E7B
+0x9223 = 0x3846
+0x9225 = 0x6E58
+0x9226 = 0x6E51
+0x9227 = 0x6E56
+0x922E = 0x6E6A
+0x9230 = 0x6E66
+0x9233 = 0x6E5D
+0x9234 = 0x4165
+0x9237 = 0x6E5C
+0x9238 = 0x6E60
+0x9239 = 0x6E6B
+0x923A = 0x6E5A
+0x923D = 0x6E5F
+0x923E = 0x534B
+0x923F = 0x6E64
+0x9240 = 0x3C58
+0x9245 = 0x6E52
+0x9248 = 0x6E68
+0x9249 = 0x6E67
+0x924D = 0x6E69
+0x9251 = 0x322C
+0x9255 = 0x6E5E
+0x9257 = 0x472F
+0x925A = 0x432D
+0x925B = 0x4726
+0x925E = 0x6E61
+0x9262 = 0x3227
+0x9266 = 0x6E5B
+0x926C = 0x6E62
+0x926D = 0x6E63
+0x9278 = 0x3D42
+0x927A = 0x6E6F
+0x927B = 0x3875
+0x927F = 0x6E7E
+0x9280 = 0x5278
+0x9283 = 0x6F25
+0x9285 = 0x4D2D
+0x928E = 0x7646
+0x9291 = 0x4F33
+0x9293 = 0x6E7D
+0x9296 = 0x6E79
+0x9298 = 0x437A
+0x929A = 0x6F22
+0x929C = 0x4F4E
+0x92A0 = 0x6E6E
+0x92A3 = 0x6F28
+0x92A5 = 0x523F
+0x92A6 = 0x6E77
+0x92A8 = 0x6F27
+0x92A9 = 0x6E7B
+0x92AA = 0x6E70
+0x92AB = 0x6F24
+0x92AC = 0x6E6D
+0x92B1 = 0x6E76
+0x92B7 = 0x4F7A
+0x92B9 = 0x5062
+0x92BB = 0x4C60
+0x92BC = 0x6F31
+0x92C1 = 0x4241
+0x92C3 = 0x6F36
+0x92C5 = 0x503F
+0x92C7 = 0x3135
+0x92C8 = 0x7648
+0x92CC = 0x6E7A
+0x92CF = 0x6E72
+0x92D2 = 0x3766
+0x92DD = 0x6F32
+0x92DF = 0x6F37
+0x92E3 = 0x6E74
+0x92E4 = 0x337A
+0x92E5 = 0x6F2D
+0x92E6 = 0x6F38
+0x92E8 = 0x6F30
+0x92EA = 0x464C
+0x92ED = 0x4871
+0x92EE = 0x6E71
+0x92EF = 0x6F2F
+0x92F0 = 0x6F2E
+0x92F1 = 0x6F2B
+0x92F6 = 0x6F33
+0x92F8 = 0x3E62
+0x92FC = 0x3856
+0x9301 = 0x6F3E
+0x9306 = 0x6F3A
+0x9307 = 0x6F42
+0x9308 = 0x6F43
+0x9310 = 0x5736
+0x9312 = 0x6F39
+0x9315 = 0x6F3F
+0x9318 = 0x3438
+0x9319 = 0x6F45
+0x931A = 0x6F23
+0x931B = 0x6F3C
+0x931F = 0x6F44
+0x9320 = 0x3627
+0x9322 = 0x472E
+0x9326 = 0x3D75
+0x9328 = 0x432A
+0x932B = 0x4E7D
+0x932E = 0x6F40
+0x932F = 0x346D
+0x9332 = 0x423C
+0x9333 = 0x434C
+0x9336 = 0x7823
+0x9338 = 0x6F2A
+0x9340 = 0x6F3D
+0x9341 = 0x4F47
+0x9343 = 0x6F41
+0x9346 = 0x6E4D
+0x9347 = 0x6F47
+0x934B = 0x3978
+0x934D = 0x3646
+0x9354 = 0x6F49
+0x9358 = 0x5521
+0x935B = 0x364D
+0x9364 = 0x6F4A
+0x9365 = 0x6F46
+0x9369 = 0x6F3B
+0x936A = 0x764A
+0x936C = 0x4742
+0x9370 = 0x6F4C
+0x9375 = 0x3C7C
+0x9376 = 0x6F48
+0x937A = 0x5560
+0x937E = 0x6F71
+0x9382 = 0x433E
+0x9384 = 0x6F4D
+0x9387 = 0x6F51
+0x938A = 0x3077
+0x938F = 0x764C
+0x9396 = 0x4B78
+0x9398 = 0x6F53
+0x93A2 = 0x4E59
+0x93A3 = 0x5D76
+0x93A6 = 0x6F56
+0x93A7 = 0x6E78
+0x93A9 = 0x6F21
+0x93AA = 0x6F4B
+0x93AC = 0x3864
+0x93AE = 0x5572
+0x93B0 = 0x6F57
+0x93B3 = 0x4478
+0x93B5 = 0x6F58
+0x93B8 = 0x6F54
+0x93BF = 0x6F55
+0x93C3 = 0x6F5F
+0x93C7 = 0x6F60
+0x93C8 = 0x4134
+0x93CA = 0x764B
+0x93CC = 0x6F52
+0x93CD = 0x6F5D
+0x93D1 = 0x6F61
+0x93D6 = 0x7769
+0x93D7 = 0x6F2C
+0x93D8 = 0x6F4F
+0x93DC = 0x6F5B
+0x93DD = 0x6F5C
+0x93DE = 0x6F5E
+0x93DF = 0x3279
+0x93E1 = 0x3E35
+0x93E2 = 0x6F5A
+0x93E4 = 0x6F4E
+0x93E8 = 0x7649
+0x93F5 = 0x6E7C
+0x93F7 = 0x6F64
+0x93F9 = 0x6F6A
+0x9403 = 0x6E73
+0x940B = 0x6F26
+0x9410 = 0x414D
+0x9412 = 0x6F29
+0x9413 = 0x6F66
+0x9414 = 0x6F62
+0x9418 = 0x5653
+0x9419 = 0x6F6B
+0x941D = 0x6F63
+0x9420 = 0x6F68
+0x9426 = 0x6F34
+0x9427 = 0x6F35
+0x9428 = 0x6F50
+0x942E = 0x412D
+0x9432 = 0x6F6D
+0x9433 = 0x4058
+0x9435 = 0x4C7A
+0x9438 = 0x6E6C
+0x943A = 0x6E75
+0x943E = 0x764D
+0x943F = 0x6F6E
+0x9444 = 0x567D
+0x944A = 0x6F6C
+0x944C = 0x6F59
+0x9452 = 0x3C78
+0x9454 = 0x6F6F
+0x9460 = 0x6E65
+0x9463 = 0x6F70
+0x9465 = 0x6F65
+0x946B = 0x764E
+0x946D = 0x6F67
+0x9470 = 0x543F
+0x9472 = 0x4F62
+0x9477 = 0x4477
+0x9479 = 0x6F69
+0x947C = 0x4260
+0x947D = 0x576A
+0x947E = 0x7647
+0x947F = 0x5464
+0x9577 = 0x3324
+0x9580 = 0x4345
+0x9582 = 0x6345
+0x9583 = 0x4941
+0x9586 = 0x6346
+0x9589 = 0x3155
+0x958B = 0x3F2A
+0x958C = 0x634A
+0x958E = 0x6348
+0x958F = 0x4872
+0x9591 = 0x4F50
+0x9593 = 0x3C64
+0x9594 = 0x6349
+0x9598 = 0x5522
+0x95A1 = 0x3A52
+0x95A3 = 0x3873
+0x95A4 = 0x7839
+0x95A5 = 0x3727
+0x95A8 = 0x396B
+0x95A9 = 0x4376
+0x95AB = 0x634D
+0x95AC = 0x634F
+0x95AD = 0x634C
+0x95B2 = 0x5444
+0x95B6 = 0x6351
+0x95B9 = 0x514B
+0x95BB = 0x5156
+0x95BC = 0x6355
+0x95BD = 0x6354
+0x95BE = 0x6350
+0x95BF = 0x6353
+0x95C3 = 0x6356
+0x95C6 = 0x7822
+0x95C8 = 0x6347
+0x95CA = 0x402B
+0x95CB = 0x6357
+0x95CC = 0x403B
+0x95D0 = 0x6359
+0x95D4 = 0x6358
+0x95D5 = 0x635A
+0x95D6 = 0x3433
+0x95DC = 0x3958
+0x95DE = 0x635B
+0x95E1 = 0x327B
+0x95E2 = 0x785B
+0x95E5 = 0x634B
+0x961C = 0x3837
+0x961D = 0x5A62
+0x9621 = 0x5A64
+0x9622 = 0x5A63
+0x962A = 0x5A66
+0x962E = 0x486E
+0x9631 = 0x5A65
+0x9632 = 0x3740
+0x963B = 0x5768
+0x963C = 0x5A68
+0x963D = 0x5A67
+0x963F = 0x3022
+0x9640 = 0x4D53
+0x9642 = 0x5A69
+0x9644 = 0x383D
+0x964B = 0x422A
+0x964C = 0x4430
+0x964D = 0x3D35
+0x9650 = 0x4F5E
+0x9654 = 0x5A6B
+0x9658 = 0x5A6A
+0x965B = 0x315D
+0x965D = 0x4942
+0x965F = 0x5A6C
+0x9661 = 0x3638
+0x9662 = 0x543A
+0x9663 = 0x5573
+0x9664 = 0x337D
+0x966A = 0x4563
+0x966C = 0x5A6E
+0x9670 = 0x5275
+0x9672 = 0x5A6F
+0x9673 = 0x3342
+0x9674 = 0x5A70
+0x9675 = 0x416A
+0x9676 = 0x4C55
+0x9677 = 0x4F5D
+0x9678 = 0x423D
+0x967D = 0x5174
+0x9685 = 0x5367
+0x9686 = 0x4221
+0x9688 = 0x5A71
+0x9689 = 0x5A6D
+0x968A = 0x3653
+0x968B = 0x4B65
+0x968D = 0x5A72
+0x968E = 0x3D57
+0x9694 = 0x3874
+0x9695 = 0x5449
+0x9697 = 0x5A73
+0x9698 = 0x302F
+0x9699 = 0x4F36
+0x969B = 0x3C4A
+0x969C = 0x554F
+0x96A7 = 0x4B6D
+0x96A8 = 0x4B66
+0x96AA = 0x4F55
+0x96B0 = 0x5A74
+0x96B1 = 0x527E
+0x96B3 = 0x6344
+0x96B4 = 0x4224
+0x96B8 = 0x4125
+0x96B9 = 0x763F
+0x96BB = 0x7922
+0x96BC = 0x7640
+0x96BD = 0x7641
+0x96C0 = 0x4838
+0x96C1 = 0x5163
+0x96C4 = 0x505B
+0x96C5 = 0x5145
+0x96C6 = 0x3C2F
+0x96C7 = 0x394D
+0x96C9 = 0x6F74
+0x96CC = 0x3446
+0x96CD = 0x533A
+0x96CE = 0x7642
+0x96D2 = 0x7643
+0x96D5 = 0x3571
+0x96D6 = 0x4B64
+0x96D9 = 0x4B2B
+0x96DB = 0x337B
+0x96DC = 0x5453
+0x96E2 = 0x406B
+0x96E3 = 0x4451
+0x96E8 = 0x536A
+0x96E9 = 0x7627
+0x96EA = 0x5129
+0x96EF = 0x7629
+0x96F2 = 0x5446
+0x96F6 = 0x4163
+0x96F7 = 0x4057
+0x96F9 = 0x3122
+0x96FB = 0x3567
+0x9700 = 0x5068
+0x9704 = 0x4F76
+0x9706 = 0x762A
+0x9707 = 0x5570
+0x9708 = 0x762C
+0x9709 = 0x4339
+0x970D = 0x3B74
+0x970E = 0x762E
+0x970F = 0x762D
+0x9713 = 0x445E
+0x9716 = 0x4158
+0x971C = 0x4B2A
+0x971E = 0x4F3C
+0x9727 = 0x4E6D
+0x972A = 0x762F
+0x9730 = 0x7631
+0x9732 = 0x4236
+0x9738 = 0x3054
+0x9739 = 0x4579
+0x973D = 0x762B
+0x973E = 0x7632
+0x9742 = 0x7628
+0x9744 = 0x7630
+0x9748 = 0x4169
+0x9752 = 0x4760
+0x9756 = 0x3E38
+0x975A = 0x7626
+0x975B = 0x3565
+0x975C = 0x3E32
+0x975E = 0x3747
+0x9760 = 0x3F3F
+0x9761 = 0x4352
+0x9762 = 0x4366
+0x9768 = 0x584C
+0x9769 = 0x386F
+0x9773 = 0x3D79
+0x9774 = 0x5125
+0x9776 = 0x3050
+0x977C = 0x7730
+0x9785 = 0x7731
+0x978B = 0x502C
+0x978D = 0x3030
+0x978F = 0x392E
+0x9794 = 0x7734
+0x9798 = 0x474A
+0x97A0 = 0x3E4F
+0x97A3 = 0x7737
+0x97A6 = 0x7864
+0x97AB = 0x7736
+0x97AD = 0x315E
+0x97B2 = 0x7738
+0x97B4 = 0x7739
+0x97BD = 0x7733
+0x97C3 = 0x7732
+0x97C6 = 0x7861
+0x97C9 = 0x7735
+0x97CB = 0x4E24
+0x97CC = 0x484D
+0x97D3 = 0x3A2B
+0x97D9 = 0x6838
+0x97DC = 0x683A
+0x97DE = 0x6839
+0x97ED = 0x3E42
+0x97F3 = 0x5274
+0x97F5 = 0x544F
+0x97F6 = 0x4958
+0x97FF = 0x4F6C
+0x9801 = 0x5233
+0x9802 = 0x3625
+0x9803 = 0x476A
+0x9805 = 0x4F6E
+0x9806 = 0x4B33
+0x9807 = 0x717C
+0x9808 = 0x506B
+0x980A = 0x676F
+0x980C = 0x4B4C
+0x980E = 0x717D
+0x980F = 0x717E
+0x9810 = 0x5424
+0x9811 = 0x4D67
+0x9812 = 0x3064
+0x9813 = 0x3659
+0x9817 = 0x4644
+0x9818 = 0x416C
+0x981C = 0x7222
+0x9821 = 0x7221
+0x9824 = 0x5243
+0x9826 = 0x7224
+0x982D = 0x4D37
+0x9830 = 0x3C55
+0x9837 = 0x7225
+0x9838 = 0x3E31
+0x983B = 0x4635
+0x983D = 0x4D47
+0x9846 = 0x3F45
+0x984C = 0x4C62
+0x984D = 0x366E
+0x984E = 0x7226
+0x9853 = 0x7227
+0x9854 = 0x5155
+0x9858 = 0x5438
+0x9859 = 0x722A
+0x985B = 0x355F
+0x985E = 0x4060
+0x9862 = 0x7229
+0x9865 = 0x722B
+0x9867 = 0x394B
+0x986B = 0x327C
+0x986C = 0x722C
+0x986F = 0x4F54
+0x9870 = 0x722D
+0x9871 = 0x422D
+0x9873 = 0x7228
+0x9874 = 0x4827
+0x98A8 = 0x3767
+0x98AE = 0x6C29
+0x98AF = 0x6C2A
+0x98B1 = 0x786C
+0x98B3 = 0x7837
+0x98B6 = 0x6C2B
+0x98BC = 0x6C2C
+0x98C4 = 0x462E
+0x98C6 = 0x6C2D
+0x98C8 = 0x6C2E
+0x98DB = 0x3749
+0x98DF = 0x4A33
+0x98E0 = 0x623B
+0x98E2 = 0x783F
+0x98E7 = 0x6238
+0x98E9 = 0x623D
+0x98EA = 0x623F
+0x98EB = 0x6240
+0x98ED = 0x6241
+0x98EF = 0x3739
+0x98F2 = 0x527B
+0x98F4 = 0x6242
+0x98FC = 0x4B47
+0x98FD = 0x3125
+0x98FE = 0x4A4E
+0x9903 = 0x3D48
+0x9905 = 0x317D
+0x9909 = 0x6243
+0x990A = 0x5178
+0x990C = 0x367C
+0x9910 = 0x324D
+0x9911 = 0x6244
+0x9912 = 0x4459
+0x9913 = 0x3676
+0x9918 = 0x5360
+0x991B = 0x6246
+0x991E = 0x3D24
+0x9921 = 0x4F5A
+0x9928 = 0x395D
+0x992E = 0x7751
+0x9933 = 0x623C
+0x9937 = 0x6247
+0x993C = 0x623E
+0x993E = 0x4173
+0x993F = 0x6248
+0x9943 = 0x6249
+0x9945 = 0x4278
+0x9948 = 0x624A
+0x9949 = 0x624B
+0x994A = 0x624C
+0x994B = 0x4021
+0x994C = 0x624D
+0x9951 = 0x3C22
+0x9952 = 0x4844
+0x9954 = 0x7753
+0x9955 = 0x7752
+0x9957 = 0x774F
+0x995C = 0x7750
+0x995E = 0x3276
+0x9962 = 0x624E
+0x9996 = 0x4A57
+0x9997 = 0x5838
+0x9998 = 0x5965
+0x9999 = 0x4F63
+0x99A5 = 0x7025
+0x99A8 = 0x5C30
+0x99AC = 0x426D
+0x99AD = 0x5426
+0x99AE = 0x376B
+0x99B1 = 0x4D54
+0x99B3 = 0x335B
+0x99B4 = 0x5131
+0x99C1 = 0x3235
+0x99D0 = 0x5724
+0x99D1 = 0x6665
+0x99D2 = 0x3E54
+0x99D4 = 0x6660
+0x99D5 = 0x3C5D
+0x99D8 = 0x6666
+0x99D9 = 0x6662
+0x99DB = 0x4A3B
+0x99DD = 0x4D55
+0x99DF = 0x6661
+0x99E1 = 0x426E
+0x99E2 = 0x6669
+0x99ED = 0x3A27
+0x99F1 = 0x4266
+0x99FF = 0x3F25
+0x9A01 = 0x3352
+0x9A05 = 0x666D
+0x9A0D = 0x666C
+0x9A0E = 0x466F
+0x9A0F = 0x666B
+0x9A16 = 0x6670
+0x9A19 = 0x462D
+0x9A2B = 0x6539
+0x9A2D = 0x666F
+0x9A2E = 0x6672
+0x9A30 = 0x4C5A
+0x9A36 = 0x6663
+0x9A37 = 0x4927
+0x9A38 = 0x6673
+0x9A3E = 0x4262
+0x9A40 = 0x5D6B
+0x9A41 = 0x6671
+0x9A42 = 0x666E
+0x9A43 = 0x6674
+0x9A44 = 0x6675
+0x9A45 = 0x477D
+0x9A4A = 0x6668
+0x9A4D = 0x6667
+0x9A4F = 0x6676
+0x9A55 = 0x3D3E
+0x9A57 = 0x5169
+0x9A5A = 0x3E2A
+0x9A5B = 0x6664
+0x9A5F = 0x5668
+0x9A62 = 0x423F
+0x9A64 = 0x6678
+0x9A65 = 0x6677
+0x9A6A = 0x666A
+0x9AA8 = 0x3947
+0x9AAF = 0x3039
+0x9AB0 = 0x773B
+0x9AB1 = 0x773A
+0x9AB6 = 0x773E
+0x9AB7 = 0x773C
+0x9AB8 = 0x3A21
+0x9ABA = 0x773F
+0x9ABC = 0x7740
+0x9AC0 = 0x7742
+0x9AC1 = 0x7741
+0x9AC2 = 0x7744
+0x9ACF = 0x7743
+0x9AD1 = 0x7747
+0x9AD2 = 0x787E
+0x9AD3 = 0x4B68
+0x9AD4 = 0x4C65
+0x9AD5 = 0x7746
+0x9AD6 = 0x7745
+0x9AD8 = 0x385F
+0x9ADF = 0x7754
+0x9AE1 = 0x7755
+0x9AE6 = 0x7756
+0x9AEB = 0x7758
+0x9AED = 0x775A
+0x9AEE = 0x7831
+0x9AEF = 0x7757
+0x9AF9 = 0x775B
+0x9AFB = 0x7759
+0x9B03 = 0x5757
+0x9B06 = 0x4B49
+0x9B08 = 0x775C
+0x9B0D = 0x783A
+0x9B0F = 0x775D
+0x9B1A = 0x7876
+0x9B1F = 0x775F
+0x9B22 = 0x775E
+0x9B23 = 0x7760
+0x9B25 = 0x3637
+0x9B27 = 0x4456
+0x9B29 = 0x6352
+0x9B2E = 0x634E
+0x9B2F = 0x5B4B
+0x9B31 = 0x5374
+0x9B32 = 0x582A
+0x9B3B = 0x6577
+0x9B3C = 0x396D
+0x9B41 = 0x3F7D
+0x9B42 = 0x3B6A
+0x9B43 = 0x7749
+0x9B44 = 0x4647
+0x9B45 = 0x7748
+0x9B48 = 0x774C
+0x9B4D = 0x774D
+0x9B4E = 0x774B
+0x9B4F = 0x4E3A
+0x9B51 = 0x774E
+0x9B54 = 0x4427
+0x9B58 = 0x774A
+0x9B5A = 0x5363
+0x9B6F = 0x4233
+0x9B74 = 0x7650
+0x9B77 = 0x764F
+0x9B81 = 0x7651
+0x9B83 = 0x7652
+0x9B8E = 0x7653
+0x9B90 = 0x7658
+0x9B91 = 0x312B
+0x9B92 = 0x7656
+0x9B9A = 0x765A
+0x9B9D = 0x765F
+0x9B9E = 0x765C
+0x9BAA = 0x765B
+0x9BAB = 0x765E
+0x9BAD = 0x7659
+0x9BAE = 0x4F4A
+0x9BC0 = 0x7667
+0x9BC1 = 0x7661
+0x9BC7 = 0x7669
+0x9BC9 = 0x4070
+0x9BCA = 0x7668
+0x9BD4 = 0x7676
+0x9BD6 = 0x766B
+0x9BDB = 0x7674
+0x9BDD = 0x7671
+0x9BE1 = 0x766E
+0x9BE2 = 0x7672
+0x9BE4 = 0x766F
+0x9BE7 = 0x7670
+0x9BE8 = 0x3E28
+0x9BEA = 0x766C
+0x9BEB = 0x766D
+0x9BF0 = 0x7673
+0x9BF4 = 0x7675
+0x9BFD = 0x766A
+0x9BFF = 0x767D
+0x9C08 = 0x7678
+0x9C09 = 0x767C
+0x9C0D = 0x767A
+0x9C10 = 0x7679
+0x9C12 = 0x767B
+0x9C13 = 0x487A
+0x9C20 = 0x767E
+0x9C23 = 0x7665
+0x9C25 = 0x7724
+0x9C28 = 0x7723
+0x9C29 = 0x7725
+0x9C2D = 0x7722
+0x9C31 = 0x7663
+0x9C32 = 0x7721
+0x9C33 = 0x7726
+0x9C35 = 0x772A
+0x9C37 = 0x7666
+0x9C39 = 0x7664
+0x9C3B = 0x7729
+0x9C3E = 0x7727
+0x9C45 = 0x772B
+0x9C48 = 0x7728
+0x9C49 = 0x316E
+0x9C52 = 0x772E
+0x9C54 = 0x772D
+0x9C56 = 0x772C
+0x9C57 = 0x415B
+0x9C58 = 0x7660
+0x9C5D = 0x7677
+0x9C5F = 0x7657
+0x9C67 = 0x772F
+0x9C6D = 0x765D
+0x9C78 = 0x7654
+0x9C7A = 0x7662
+0x9CE5 = 0x4471
+0x9CE9 = 0x702F
+0x9CEC = 0x596C
+0x9CF3 = 0x376F
+0x9CF4 = 0x4379
+0x9CF6 = 0x7030
+0x9D06 = 0x7032
+0x9D07 = 0x7031
+0x9D09 = 0x513B
+0x9D15 = 0x4D52
+0x9D1B = 0x5427
+0x9D1D = 0x7036
+0x9D1F = 0x7037
+0x9D23 = 0x7033
+0x9D26 = 0x516C
+0x9D28 = 0x513C
+0x9D2F = 0x7039
+0x9D30 = 0x703B
+0x9D3B = 0x3A68
+0x9D3F = 0x386B
+0x9D42 = 0x703C
+0x9D51 = 0x3E69
+0x9D52 = 0x7041
+0x9D53 = 0x703E
+0x9D5C = 0x7043
+0x9D5D = 0x366C
+0x9D60 = 0x7040
+0x9D61 = 0x7044
+0x9D6A = 0x7046
+0x9D6C = 0x4574
+0x9D6F = 0x7047
+0x9D72 = 0x4835
+0x9D87 = 0x7034
+0x9D89 = 0x7048
+0x9D93 = 0x7045
+0x9D98 = 0x7049
+0x9D9A = 0x704A
+0x9DA5 = 0x704C
+0x9DA9 = 0x704D
+0x9DAF = 0x5D3A
+0x9DB4 = 0x3A57
+0x9DBB = 0x773D
+0x9DBC = 0x704F
+0x9DC0 = 0x704B
+0x9DC2 = 0x704E
+0x9DC4 = 0x3C26
+0x9DD3 = 0x7051
+0x9DD7 = 0x4538
+0x9DD9 = 0x703A
+0x9DDA = 0x7052
+0x9DE5 = 0x7038
+0x9DE6 = 0x7054
+0x9DEF = 0x7053
+0x9DF2 = 0x7055
+0x9DF3 = 0x7042
+0x9DF8 = 0x7056
+0x9DF9 = 0x5325
+0x9DFA = 0x7058
+0x9E0C = 0x7057
+0x9E15 = 0x7035
+0x9E1A = 0x7050
+0x9E1B = 0x7059
+0x9E1D = 0x703F
+0x9E1E = 0x703D
+0x9E75 = 0x7852
+0x9E79 = 0x7874
+0x9E7A = 0x753A
+0x9E7C = 0x3C6F
+0x9E7D = 0x514E
+0x9E7F = 0x4239
+0x9E82 = 0x7764
+0x9E87 = 0x7765
+0x9E88 = 0x7766
+0x9E8B = 0x7767
+0x9E92 = 0x7768
+0x9E93 = 0x4234
+0x9E97 = 0x4076
+0x9E9D = 0x776A
+0x9E9F = 0x776B
+0x9EA5 = 0x4273
+0x9EA9 = 0x746F
+0x9EAF = 0x7865
+0x9EB4 = 0x7470
+0x9EB5 = 0x7859
+0x9EBB = 0x4269
+0x9EBD = 0x4334
+0x9EBE = 0x7762
+0x9EC4 = 0x3B46
+0x9ECC = 0x5964
+0x9ECD = 0x4A72
+0x9ECE = 0x4068
+0x9ECF = 0x7024
+0x9ED1 = 0x3A5A
+0x9ED4 = 0x472D
+0x9ED8 = 0x442C
+0x9EDB = 0x776C
+0x9EDC = 0x776D
+0x9EDD = 0x776E
+0x9EDE = 0x3563
+0x9EDF = 0x7770
+0x9EE0 = 0x776F
+0x9EE2 = 0x7771
+0x9EE5 = 0x7774
+0x9EE7 = 0x7773
+0x9EE8 = 0x3533
+0x9EEF = 0x7776
+0x9EF2 = 0x7775
+0x9EF4 = 0x7854
+0x9EF7 = 0x7772
+0x9EF9 = 0x6D69
+0x9EFB = 0x6D6A
+0x9EFC = 0x6D6B
+0x9EFD = 0x763C
+0x9EFF = 0x763D
+0x9F09 = 0x763E
+0x9F0E = 0x3626
+0x9F10 = 0x583E
+0x9F13 = 0x3944
+0x9F15 = 0x782E
+0x9F17 = 0x583B
+0x9F19 = 0x5C31
+0x9F20 = 0x4A73
+0x9F22 = 0x7777
+0x9F2C = 0x7778
+0x9F2F = 0x7779
+0x9F37 = 0x777B
+0x9F39 = 0x777A
+0x9F3B = 0x3147
+0x9F3D = 0x777C
+0x9F3E = 0x777D
+0x9F44 = 0x777E
+0x9F4A = 0x466B
+0x9F4B = 0x552B
+0x9F4F = 0x6C34
+0x9F52 = 0x335D
+0x9F54 = 0x7633
+0x9F59 = 0x7635
+0x9F5C = 0x7637
+0x9F5F = 0x7634
+0x9F60 = 0x7636
+0x9F61 = 0x4164
+0x9F63 = 0x782A
+0x9F66 = 0x7638
+0x9F6A = 0x763A
+0x9F6C = 0x7639
+0x9F72 = 0x4823
+0x9F77 = 0x763B
+0x9F8D = 0x417A
+0x9F90 = 0x4553
+0x9F94 = 0x3928
+0x9F95 = 0x6D68
+0x9F9C = 0x396A
+0x9FA0 = 0x595F
+0xFF01 = 0x2321
+0xFF02 = 0x2322
+0xFF03 = 0x2323
+0xFF04 = 0x2167
+0xFF05 = 0x2325
+0xFF06 = 0x2326
+0xFF07 = 0x2327
+0xFF08 = 0x2328
+0xFF09 = 0x2329
+0xFF0A = 0x232A
+0xFF0B = 0x232B
+0xFF0C = 0x232C
+0xFF0D = 0x232D
+0xFF0E = 0x232E
+0xFF0F = 0x232F
+0xFF10 = 0x2330
+0xFF11 = 0x2331
+0xFF12 = 0x2332
+0xFF13 = 0x2333
+0xFF14 = 0x2334
+0xFF15 = 0x2335
+0xFF16 = 0x2336
+0xFF17 = 0x2337
+0xFF18 = 0x2338
+0xFF19 = 0x2339
+0xFF1A = 0x233A
+0xFF1B = 0x233B
+0xFF1C = 0x233C
+0xFF1D = 0x233D
+0xFF1E = 0x233E
+0xFF1F = 0x233F
+0xFF20 = 0x2340
+0xFF21 = 0x2341
+0xFF22 = 0x2342
+0xFF23 = 0x2343
+0xFF24 = 0x2344
+0xFF25 = 0x2345
+0xFF26 = 0x2346
+0xFF27 = 0x2347
+0xFF28 = 0x2348
+0xFF29 = 0x2349
+0xFF2A = 0x234A
+0xFF2B = 0x234B
+0xFF2C = 0x234C
+0xFF2D = 0x234D
+0xFF2E = 0x234E
+0xFF2F = 0x234F
+0xFF30 = 0x2350
+0xFF31 = 0x2351
+0xFF32 = 0x2352
+0xFF33 = 0x2353
+0xFF34 = 0x2354
+0xFF35 = 0x2355
+0xFF36 = 0x2356
+0xFF37 = 0x2357
+0xFF38 = 0x2358
+0xFF39 = 0x2359
+0xFF3A = 0x235A
+0xFF3B = 0x235B
+0xFF3C = 0x235C
+0xFF3D = 0x235D
+0xFF3E = 0x235E
+0xFF3F = 0x235F
+0xFF40 = 0x2360
+0xFF41 = 0x2361
+0xFF42 = 0x2362
+0xFF43 = 0x2363
+0xFF44 = 0x2364
+0xFF45 = 0x2365
+0xFF46 = 0x2366
+0xFF47 = 0x2367
+0xFF48 = 0x2368
+0xFF49 = 0x2369
+0xFF4A = 0x236A
+0xFF4B = 0x236B
+0xFF4C = 0x236C
+0xFF4D = 0x236D
+0xFF4E = 0x236E
+0xFF4F = 0x236F
+0xFF50 = 0x2370
+0xFF51 = 0x2371
+0xFF52 = 0x2372
+0xFF53 = 0x2373
+0xFF54 = 0x2374
+0xFF55 = 0x2375
+0xFF56 = 0x2376
+0xFF57 = 0x2377
+0xFF58 = 0x2378
+0xFF59 = 0x2379
+0xFF5A = 0x237A
+0xFF5B = 0x237B
+0xFF5C = 0x237C
+0xFF5D = 0x237D
+0xFF5E = 0x212B
+0xFFE0 = 0x2169
+0xFFE1 = 0x216A
+0xFFE3 = 0x237E
+0xFFE5 = 0x2324
+END_MAP
diff --git a/enc/trans/GB/UCS%GB2312.src b/enc/trans/GB/UCS%GB2312.src
new file mode 100644
index 0000000000..3293fea604
--- /dev/null
+++ b/enc/trans/GB/UCS%GB2312.src
@@ -0,0 +1,7531 @@
+# $NetBSD: UCS%GB2312.src,v 1.6 2006/11/22 20:22:30 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/GB2312"
+SRC_ZONE	0x00A4 - 0xFFE5
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             GB2312-80 to Unicode table (complete, hex format)
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 October 8
+#
+#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from GB2312-80 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# GB2312-80 and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between GB2312-80 and
+# Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point.  Including all these
+#			names in this file increases its size substantially
+#			and needlessly.  The token "<CJK>" is used for the
+#			name of these characters.  If necessary, it can be
+#			expanded algorithmically by a parser or editor.
+#
+#	The entries are in GB2312 order
+#
+#	The following algorithms can be used to change the hex form
+#		of GB2312 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x777E -> 0x575E -> 8794
+#
+#	Version history
+#	1.0 version updates 0.0d2 version by correcting mapping for 0x212C
+#             from U+2225 to U+2016.
+#
+#
+0x00A4 = 0x2168
+0x00A7 = 0x216C
+0x00A8 = 0x2127
+0x00B0 = 0x2163
+0x00B1 = 0x2140
+0x00B7 = 0x2124
+0x00D7 = 0x2141
+0x00E0 = 0x2824
+0x00E1 = 0x2822
+0x00E8 = 0x2828
+0x00E9 = 0x2826
+0x00EA = 0x283A
+0x00EC = 0x282C
+0x00ED = 0x282A
+0x00F2 = 0x2830
+0x00F3 = 0x282E
+0x00F7 = 0x2142
+0x00F9 = 0x2834
+0x00FA = 0x2832
+0x00FC = 0x2839
+0x0101 = 0x2821
+0x0113 = 0x2825
+0x011B = 0x2827
+0x012B = 0x2829
+0x014D = 0x282D
+0x016B = 0x2831
+0x01CE = 0x2823
+0x01D0 = 0x282B
+0x01D2 = 0x282F
+0x01D4 = 0x2833
+0x01D6 = 0x2835
+0x01D8 = 0x2836
+0x01DA = 0x2837
+0x01DC = 0x2838
+0x02C7 = 0x2126
+0x02C9 = 0x2125
+0x0391 = 0x2621
+0x0392 = 0x2622
+0x0393 = 0x2623
+0x0394 = 0x2624
+0x0395 = 0x2625
+0x0396 = 0x2626
+0x0397 = 0x2627
+0x0398 = 0x2628
+0x0399 = 0x2629
+0x039A = 0x262A
+0x039B = 0x262B
+0x039C = 0x262C
+0x039D = 0x262D
+0x039E = 0x262E
+0x039F = 0x262F
+0x03A0 = 0x2630
+0x03A1 = 0x2631
+0x03A3 = 0x2632
+0x03A4 = 0x2633
+0x03A5 = 0x2634
+0x03A6 = 0x2635
+0x03A7 = 0x2636
+0x03A8 = 0x2637
+0x03A9 = 0x2638
+0x03B1 = 0x2641
+0x03B2 = 0x2642
+0x03B3 = 0x2643
+0x03B4 = 0x2644
+0x03B5 = 0x2645
+0x03B6 = 0x2646
+0x03B7 = 0x2647
+0x03B8 = 0x2648
+0x03B9 = 0x2649
+0x03BA = 0x264A
+0x03BB = 0x264B
+0x03BC = 0x264C
+0x03BD = 0x264D
+0x03BE = 0x264E
+0x03BF = 0x264F
+0x03C0 = 0x2650
+0x03C1 = 0x2651
+0x03C3 = 0x2652
+0x03C4 = 0x2653
+0x03C5 = 0x2654
+0x03C6 = 0x2655
+0x03C7 = 0x2656
+0x03C8 = 0x2657
+0x03C9 = 0x2658
+0x0401 = 0x2727
+0x0410 = 0x2721
+0x0411 = 0x2722
+0x0412 = 0x2723
+0x0413 = 0x2724
+0x0414 = 0x2725
+0x0415 = 0x2726
+0x0416 = 0x2728
+0x0417 = 0x2729
+0x0418 = 0x272A
+0x0419 = 0x272B
+0x041A = 0x272C
+0x041B = 0x272D
+0x041C = 0x272E
+0x041D = 0x272F
+0x041E = 0x2730
+0x041F = 0x2731
+0x0420 = 0x2732
+0x0421 = 0x2733
+0x0422 = 0x2734
+0x0423 = 0x2735
+0x0424 = 0x2736
+0x0425 = 0x2737
+0x0426 = 0x2738
+0x0427 = 0x2739
+0x0428 = 0x273A
+0x0429 = 0x273B
+0x042A = 0x273C
+0x042B = 0x273D
+0x042C = 0x273E
+0x042D = 0x273F
+0x042E = 0x2740
+0x042F = 0x2741
+0x0430 = 0x2751
+0x0431 = 0x2752
+0x0432 = 0x2753
+0x0433 = 0x2754
+0x0434 = 0x2755
+0x0435 = 0x2756
+0x0436 = 0x2758
+0x0437 = 0x2759
+0x0438 = 0x275A
+0x0439 = 0x275B
+0x043A = 0x275C
+0x043B = 0x275D
+0x043C = 0x275E
+0x043D = 0x275F
+0x043E = 0x2760
+0x043F = 0x2761
+0x0440 = 0x2762
+0x0441 = 0x2763
+0x0442 = 0x2764
+0x0443 = 0x2765
+0x0444 = 0x2766
+0x0445 = 0x2767
+0x0446 = 0x2768
+0x0447 = 0x2769
+0x0448 = 0x276A
+0x0449 = 0x276B
+0x044A = 0x276C
+0x044B = 0x276D
+0x044C = 0x276E
+0x044D = 0x276F
+0x044E = 0x2770
+0x044F = 0x2771
+0x0451 = 0x2757
+0x2014 = 0x212A
+0x2015 = 0x212A # fallback -> 0x2014
+0x2016 = 0x212C
+0x2018 = 0x212E
+0x2019 = 0x212F
+0x201C = 0x2130
+0x201D = 0x2131
+0x2026 = 0x212D
+0x2030 = 0x216B
+0x2032 = 0x2164
+0x2033 = 0x2165
+0x203B = 0x2179
+0x2103 = 0x2166
+0x2116 = 0x216D
+0x2160 = 0x2271
+0x2161 = 0x2272
+0x2162 = 0x2273
+0x2163 = 0x2274
+0x2164 = 0x2275
+0x2165 = 0x2276
+0x2166 = 0x2277
+0x2167 = 0x2278
+0x2168 = 0x2279
+0x2169 = 0x227A
+0x216A = 0x227B
+0x216B = 0x227C
+0x2190 = 0x217B
+0x2191 = 0x217C
+0x2192 = 0x217A
+0x2193 = 0x217D
+0x2208 = 0x214A
+0x220F = 0x2147
+0x2211 = 0x2146
+0x221A = 0x214C
+0x221D = 0x2158
+0x221E = 0x215E
+0x2220 = 0x214F
+0x2225 = 0x214E
+0x2227 = 0x2144
+0x2228 = 0x2145
+0x2229 = 0x2149
+0x222A = 0x2148
+0x222B = 0x2152
+0x222E = 0x2153
+0x2234 = 0x2160
+0x2235 = 0x215F
+0x2236 = 0x2143
+0x2237 = 0x214B
+0x223D = 0x2157
+0x2248 = 0x2156
+0x224C = 0x2155
+0x2260 = 0x2159
+0x2261 = 0x2154
+0x2264 = 0x215C
+0x2265 = 0x215D
+0x226E = 0x215A
+0x226F = 0x215B
+0x2299 = 0x2151
+0x22A5 = 0x214D
+0x2312 = 0x2150
+0x2460 = 0x2259
+0x2461 = 0x225A
+0x2462 = 0x225B
+0x2463 = 0x225C
+0x2464 = 0x225D
+0x2465 = 0x225E
+0x2466 = 0x225F
+0x2467 = 0x2260
+0x2468 = 0x2261
+0x2469 = 0x2262
+0x2474 = 0x2245
+0x2475 = 0x2246
+0x2476 = 0x2247
+0x2477 = 0x2248
+0x2478 = 0x2249
+0x2479 = 0x224A
+0x247A = 0x224B
+0x247B = 0x224C
+0x247C = 0x224D
+0x247D = 0x224E
+0x247E = 0x224F
+0x247F = 0x2250
+0x2480 = 0x2251
+0x2481 = 0x2252
+0x2482 = 0x2253
+0x2483 = 0x2254
+0x2484 = 0x2255
+0x2485 = 0x2256
+0x2486 = 0x2257
+0x2487 = 0x2258
+0x2488 = 0x2231
+0x2489 = 0x2232
+0x248A = 0x2233
+0x248B = 0x2234
+0x248C = 0x2235
+0x248D = 0x2236
+0x248E = 0x2237
+0x248F = 0x2238
+0x2490 = 0x2239
+0x2491 = 0x223A
+0x2492 = 0x223B
+0x2493 = 0x223C
+0x2494 = 0x223D
+0x2495 = 0x223E
+0x2496 = 0x223F
+0x2497 = 0x2240
+0x2498 = 0x2241
+0x2499 = 0x2242
+0x249A = 0x2243
+0x249B = 0x2244
+0x2500 = 0x2924
+0x2501 = 0x2925
+0x2502 = 0x2926
+0x2503 = 0x2927
+0x2504 = 0x2928
+0x2505 = 0x2929
+0x2506 = 0x292A
+0x2507 = 0x292B
+0x2508 = 0x292C
+0x2509 = 0x292D
+0x250A = 0x292E
+0x250B = 0x292F
+0x250C = 0x2930
+0x250D = 0x2931
+0x250E = 0x2932
+0x250F = 0x2933
+0x2510 = 0x2934
+0x2511 = 0x2935
+0x2512 = 0x2936
+0x2513 = 0x2937
+0x2514 = 0x2938
+0x2515 = 0x2939
+0x2516 = 0x293A
+0x2517 = 0x293B
+0x2518 = 0x293C
+0x2519 = 0x293D
+0x251A = 0x293E
+0x251B = 0x293F
+0x251C = 0x2940
+0x251D = 0x2941
+0x251E = 0x2942
+0x251F = 0x2943
+0x2520 = 0x2944
+0x2521 = 0x2945
+0x2522 = 0x2946
+0x2523 = 0x2947
+0x2524 = 0x2948
+0x2525 = 0x2949
+0x2526 = 0x294A
+0x2527 = 0x294B
+0x2528 = 0x294C
+0x2529 = 0x294D
+0x252A = 0x294E
+0x252B = 0x294F
+0x252C = 0x2950
+0x252D = 0x2951
+0x252E = 0x2952
+0x252F = 0x2953
+0x2530 = 0x2954
+0x2531 = 0x2955
+0x2532 = 0x2956
+0x2533 = 0x2957
+0x2534 = 0x2958
+0x2535 = 0x2959
+0x2536 = 0x295A
+0x2537 = 0x295B
+0x2538 = 0x295C
+0x2539 = 0x295D
+0x253A = 0x295E
+0x253B = 0x295F
+0x253C = 0x2960
+0x253D = 0x2961
+0x253E = 0x2962
+0x253F = 0x2963
+0x2540 = 0x2964
+0x2541 = 0x2965
+0x2542 = 0x2966
+0x2543 = 0x2967
+0x2544 = 0x2968
+0x2545 = 0x2969
+0x2546 = 0x296A
+0x2547 = 0x296B
+0x2548 = 0x296C
+0x2549 = 0x296D
+0x254A = 0x296E
+0x254B = 0x296F
+0x25A0 = 0x2176
+0x25A1 = 0x2175
+0x25B2 = 0x2178
+0x25B3 = 0x2177
+0x25C6 = 0x2174
+0x25C7 = 0x2173
+0x25CB = 0x2170
+0x25CE = 0x2172
+0x25CF = 0x2171
+0x2605 = 0x216F
+0x2606 = 0x216E
+0x2640 = 0x2162
+0x2642 = 0x2161
+0x3000 = 0x2121
+0x3001 = 0x2122
+0x3002 = 0x2123
+0x3003 = 0x2128
+0x3005 = 0x2129
+0x3008 = 0x2134
+0x3009 = 0x2135
+0x300A = 0x2136
+0x300B = 0x2137
+0x300C = 0x2138
+0x300D = 0x2139
+0x300E = 0x213A
+0x300F = 0x213B
+0x3010 = 0x213E
+0x3011 = 0x213F
+0x3013 = 0x217E
+0x3014 = 0x2132
+0x3015 = 0x2133
+0x3016 = 0x213C
+0x3017 = 0x213D
+0x3041 = 0x2421
+0x3042 = 0x2422
+0x3043 = 0x2423
+0x3044 = 0x2424
+0x3045 = 0x2425
+0x3046 = 0x2426
+0x3047 = 0x2427
+0x3048 = 0x2428
+0x3049 = 0x2429
+0x304A = 0x242A
+0x304B = 0x242B
+0x304C = 0x242C
+0x304D = 0x242D
+0x304E = 0x242E
+0x304F = 0x242F
+0x3050 = 0x2430
+0x3051 = 0x2431
+0x3052 = 0x2432
+0x3053 = 0x2433
+0x3054 = 0x2434
+0x3055 = 0x2435
+0x3056 = 0x2436
+0x3057 = 0x2437
+0x3058 = 0x2438
+0x3059 = 0x2439
+0x305A = 0x243A
+0x305B = 0x243B
+0x305C = 0x243C
+0x305D = 0x243D
+0x305E = 0x243E
+0x305F = 0x243F
+0x3060 = 0x2440
+0x3061 = 0x2441
+0x3062 = 0x2442
+0x3063 = 0x2443
+0x3064 = 0x2444
+0x3065 = 0x2445
+0x3066 = 0x2446
+0x3067 = 0x2447
+0x3068 = 0x2448
+0x3069 = 0x2449
+0x306A = 0x244A
+0x306B = 0x244B
+0x306C = 0x244C
+0x306D = 0x244D
+0x306E = 0x244E
+0x306F = 0x244F
+0x3070 = 0x2450
+0x3071 = 0x2451
+0x3072 = 0x2452
+0x3073 = 0x2453
+0x3074 = 0x2454
+0x3075 = 0x2455
+0x3076 = 0x2456
+0x3077 = 0x2457
+0x3078 = 0x2458
+0x3079 = 0x2459
+0x307A = 0x245A
+0x307B = 0x245B
+0x307C = 0x245C
+0x307D = 0x245D
+0x307E = 0x245E
+0x307F = 0x245F
+0x3080 = 0x2460
+0x3081 = 0x2461
+0x3082 = 0x2462
+0x3083 = 0x2463
+0x3084 = 0x2464
+0x3085 = 0x2465
+0x3086 = 0x2466
+0x3087 = 0x2467
+0x3088 = 0x2468
+0x3089 = 0x2469
+0x308A = 0x246A
+0x308B = 0x246B
+0x308C = 0x246C
+0x308D = 0x246D
+0x308E = 0x246E
+0x308F = 0x246F
+0x3090 = 0x2470
+0x3091 = 0x2471
+0x3092 = 0x2472
+0x3093 = 0x2473
+0x30A1 = 0x2521
+0x30A2 = 0x2522
+0x30A3 = 0x2523
+0x30A4 = 0x2524
+0x30A5 = 0x2525
+0x30A6 = 0x2526
+0x30A7 = 0x2527
+0x30A8 = 0x2528
+0x30A9 = 0x2529
+0x30AA = 0x252A
+0x30AB = 0x252B
+0x30AC = 0x252C
+0x30AD = 0x252D
+0x30AE = 0x252E
+0x30AF = 0x252F
+0x30B0 = 0x2530
+0x30B1 = 0x2531
+0x30B2 = 0x2532
+0x30B3 = 0x2533
+0x30B4 = 0x2534
+0x30B5 = 0x2535
+0x30B6 = 0x2536
+0x30B7 = 0x2537
+0x30B8 = 0x2538
+0x30B9 = 0x2539
+0x30BA = 0x253A
+0x30BB = 0x253B
+0x30BC = 0x253C
+0x30BD = 0x253D
+0x30BE = 0x253E
+0x30BF = 0x253F
+0x30C0 = 0x2540
+0x30C1 = 0x2541
+0x30C2 = 0x2542
+0x30C3 = 0x2543
+0x30C4 = 0x2544
+0x30C5 = 0x2545
+0x30C6 = 0x2546
+0x30C7 = 0x2547
+0x30C8 = 0x2548
+0x30C9 = 0x2549
+0x30CA = 0x254A
+0x30CB = 0x254B
+0x30CC = 0x254C
+0x30CD = 0x254D
+0x30CE = 0x254E
+0x30CF = 0x254F
+0x30D0 = 0x2550
+0x30D1 = 0x2551
+0x30D2 = 0x2552
+0x30D3 = 0x2553
+0x30D4 = 0x2554
+0x30D5 = 0x2555
+0x30D6 = 0x2556
+0x30D7 = 0x2557
+0x30D8 = 0x2558
+0x30D9 = 0x2559
+0x30DA = 0x255A
+0x30DB = 0x255B
+0x30DC = 0x255C
+0x30DD = 0x255D
+0x30DE = 0x255E
+0x30DF = 0x255F
+0x30E0 = 0x2560
+0x30E1 = 0x2561
+0x30E2 = 0x2562
+0x30E3 = 0x2563
+0x30E4 = 0x2564
+0x30E5 = 0x2565
+0x30E6 = 0x2566
+0x30E7 = 0x2567
+0x30E8 = 0x2568
+0x30E9 = 0x2569
+0x30EA = 0x256A
+0x30EB = 0x256B
+0x30EC = 0x256C
+0x30ED = 0x256D
+0x30EE = 0x256E
+0x30EF = 0x256F
+0x30F0 = 0x2570
+0x30F1 = 0x2571
+0x30F2 = 0x2572
+0x30F3 = 0x2573
+0x30F4 = 0x2574
+0x30F5 = 0x2575
+0x30F6 = 0x2576
+0x30FB = 0x2124 # fallback -> 0x00B7
+0x3105 = 0x2845
+0x3106 = 0x2846
+0x3107 = 0x2847
+0x3108 = 0x2848
+0x3109 = 0x2849
+0x310A = 0x284A
+0x310B = 0x284B
+0x310C = 0x284C
+0x310D = 0x284D
+0x310E = 0x284E
+0x310F = 0x284F
+0x3110 = 0x2850
+0x3111 = 0x2851
+0x3112 = 0x2852
+0x3113 = 0x2853
+0x3114 = 0x2854
+0x3115 = 0x2855
+0x3116 = 0x2856
+0x3117 = 0x2857
+0x3118 = 0x2858
+0x3119 = 0x2859
+0x311A = 0x285A
+0x311B = 0x285B
+0x311C = 0x285C
+0x311D = 0x285D
+0x311E = 0x285E
+0x311F = 0x285F
+0x3120 = 0x2860
+0x3121 = 0x2861
+0x3122 = 0x2862
+0x3123 = 0x2863
+0x3124 = 0x2864
+0x3125 = 0x2865
+0x3126 = 0x2866
+0x3127 = 0x2867
+0x3128 = 0x2868
+0x3129 = 0x2869
+0x3220 = 0x2265
+0x3221 = 0x2266
+0x3222 = 0x2267
+0x3223 = 0x2268
+0x3224 = 0x2269
+0x3225 = 0x226A
+0x3226 = 0x226B
+0x3227 = 0x226C
+0x3228 = 0x226D
+0x3229 = 0x226E
+0x4E00 = 0x523B
+0x4E01 = 0x3621
+0x4E03 = 0x465F
+0x4E07 = 0x4D72
+0x4E08 = 0x5549
+0x4E09 = 0x487D
+0x4E0A = 0x494F
+0x4E0B = 0x4F42
+0x4E0C = 0x5822
+0x4E0D = 0x323B
+0x4E0E = 0x536B
+0x4E10 = 0x5824
+0x4E11 = 0x3373
+0x4E13 = 0x5728
+0x4E14 = 0x4752
+0x4E15 = 0x5827
+0x4E16 = 0x4A40
+0x4E18 = 0x4770
+0x4E19 = 0x317B
+0x4E1A = 0x5235
+0x4E1B = 0x3454
+0x4E1C = 0x362B
+0x4E1D = 0x4B3F
+0x4E1E = 0x5829
+0x4E22 = 0x362A
+0x4E24 = 0x413D
+0x4E25 = 0x514F
+0x4E27 = 0x4925
+0x4E28 = 0x582D
+0x4E2A = 0x3876
+0x4E2B = 0x513E
+0x4E2C = 0x635C
+0x4E2D = 0x5650
+0x4E30 = 0x3761
+0x4E32 = 0x342E
+0x4E34 = 0x4159
+0x4E36 = 0x583C
+0x4E38 = 0x4D68
+0x4E39 = 0x3524
+0x4E3A = 0x4E2A
+0x4E3B = 0x5677
+0x4E3D = 0x4076
+0x4E3E = 0x3E59
+0x4E3F = 0x582F
+0x4E43 = 0x444B
+0x4E45 = 0x3E43
+0x4E47 = 0x5831
+0x4E48 = 0x4334
+0x4E49 = 0x5265
+0x4E4B = 0x562E
+0x4E4C = 0x4E5A
+0x4E4D = 0x5527
+0x4E4E = 0x3A75
+0x4E4F = 0x3726
+0x4E50 = 0x4056
+0x4E52 = 0x4639
+0x4E53 = 0x4552
+0x4E54 = 0x4747
+0x4E56 = 0x3954
+0x4E58 = 0x334B
+0x4E59 = 0x5252
+0x4E5C = 0x583F
+0x4E5D = 0x3E45
+0x4E5E = 0x4672
+0x4E5F = 0x5232
+0x4E60 = 0x4F30
+0x4E61 = 0x4F67
+0x4E66 = 0x4A69
+0x4E69 = 0x5840
+0x4E70 = 0x4272
+0x4E71 = 0x4252
+0x4E73 = 0x4869
+0x4E7E = 0x472C
+0x4E86 = 0x414B
+0x4E88 = 0x5368
+0x4E89 = 0x5579
+0x4E8B = 0x4A42
+0x4E8C = 0x367E
+0x4E8D = 0x5821
+0x4E8E = 0x535A
+0x4E8F = 0x3F77
+0x4E91 = 0x5446
+0x4E92 = 0x3B25
+0x4E93 = 0x5841
+0x4E94 = 0x4E65
+0x4E95 = 0x3E2E
+0x4E98 = 0x5828
+0x4E9A = 0x5147
+0x4E9B = 0x5029
+0x4E9F = 0x583D
+0x4EA0 = 0x596F
+0x4EA1 = 0x4D76
+0x4EA2 = 0x3F3A
+0x4EA4 = 0x3D3B
+0x4EA5 = 0x3A25
+0x4EA6 = 0x5260
+0x4EA7 = 0x327A
+0x4EA8 = 0x3A60
+0x4EA9 = 0x4436
+0x4EAB = 0x4F6D
+0x4EAC = 0x3E29
+0x4EAD = 0x4D24
+0x4EAE = 0x4141
+0x4EB2 = 0x4757
+0x4EB3 = 0x5971
+0x4EB5 = 0x5974
+0x4EBA = 0x484B
+0x4EBB = 0x5869
+0x4EBF = 0x525A
+0x4EC0 = 0x4A32
+0x4EC1 = 0x484A
+0x4EC2 = 0x586C
+0x4EC3 = 0x586A
+0x4EC4 = 0x5846
+0x4EC5 = 0x3D76
+0x4EC6 = 0x464D
+0x4EC7 = 0x3370
+0x4EC9 = 0x586B
+0x4ECA = 0x3D71
+0x4ECB = 0x3D69
+0x4ECD = 0x4854
+0x4ECE = 0x3453
+0x4ED1 = 0x4258
+0x4ED3 = 0x3256
+0x4ED4 = 0x5750
+0x4ED5 = 0x4A4B
+0x4ED6 = 0x4B7B
+0x4ED7 = 0x554C
+0x4ED8 = 0x3836
+0x4ED9 = 0x4F49
+0x4EDD = 0x595A
+0x4EDE = 0x5870
+0x4EDF = 0x472A
+0x4EE1 = 0x586E
+0x4EE3 = 0x347A
+0x4EE4 = 0x416E
+0x4EE5 = 0x5254
+0x4EE8 = 0x586D
+0x4EEA = 0x5247
+0x4EEB = 0x586F
+0x4EEC = 0x4347
+0x4EF0 = 0x5176
+0x4EF2 = 0x5659
+0x4EF3 = 0x5872
+0x4EF5 = 0x5875
+0x4EF6 = 0x3C7E
+0x4EF7 = 0x3C5B
+0x4EFB = 0x484E
+0x4EFD = 0x375D
+0x4EFF = 0x3742
+0x4F01 = 0x4673
+0x4F09 = 0x5878
+0x4F0A = 0x5241
+0x4F0D = 0x4E69
+0x4F0E = 0x3C3F
+0x4F0F = 0x377C
+0x4F10 = 0x3725
+0x4F11 = 0x505D
+0x4F17 = 0x565A
+0x4F18 = 0x5345
+0x4F19 = 0x3B6F
+0x4F1A = 0x3B61
+0x4F1B = 0x5871
+0x4F1E = 0x4921
+0x4F1F = 0x4E30
+0x4F20 = 0x342B
+0x4F22 = 0x5873
+0x4F24 = 0x494B
+0x4F25 = 0x5876
+0x4F26 = 0x4257
+0x4F27 = 0x5877
+0x4F2A = 0x4E31
+0x4F2B = 0x5879
+0x4F2F = 0x322E
+0x4F30 = 0x3940
+0x4F32 = 0x5923
+0x4F34 = 0x3069
+0x4F36 = 0x4166
+0x4F38 = 0x496C
+0x4F3A = 0x4B45
+0x4F3C = 0x4B46
+0x4F3D = 0x5924
+0x4F43 = 0x3568
+0x4F46 = 0x352B
+0x4F4D = 0x4E3B
+0x4F4E = 0x354D
+0x4F4F = 0x5721
+0x4F50 = 0x5774
+0x4F51 = 0x5353
+0x4F53 = 0x4C65
+0x4F55 = 0x3A4E
+0x4F57 = 0x5922
+0x4F58 = 0x595C
+0x4F59 = 0x5360
+0x4F5A = 0x587D
+0x4F5B = 0x3770
+0x4F5C = 0x5777
+0x4F5D = 0x587E
+0x4F5E = 0x587A
+0x4F5F = 0x5921
+0x4F60 = 0x4463
+0x4F63 = 0x5336
+0x4F64 = 0x5874
+0x4F65 = 0x595D
+0x4F67 = 0x587B
+0x4F69 = 0x4565
+0x4F6C = 0x4050
+0x4F6F = 0x5170
+0x4F70 = 0x305B
+0x4F73 = 0x3C51
+0x4F74 = 0x5926
+0x4F76 = 0x5925
+0x4F7B = 0x592C
+0x4F7C = 0x592E
+0x4F7E = 0x592B
+0x4F7F = 0x4A39
+0x4F83 = 0x5929
+0x4F84 = 0x5636
+0x4F88 = 0x335E
+0x4F89 = 0x5928
+0x4F8B = 0x407D
+0x4F8D = 0x4A4C
+0x4F8F = 0x592A
+0x4F91 = 0x5927
+0x4F94 = 0x5930
+0x4F97 = 0x3631
+0x4F9B = 0x3929
+0x4F9D = 0x5240
+0x4FA0 = 0x4F40
+0x4FA3 = 0x4242
+0x4FA5 = 0x3D44
+0x4FA6 = 0x556C
+0x4FA7 = 0x3260
+0x4FA8 = 0x4748
+0x4FA9 = 0x3F6B
+0x4FAA = 0x592D
+0x4FAC = 0x592F
+0x4FAE = 0x4E6A
+0x4FAF = 0x3A6E
+0x4FB5 = 0x4756
+0x4FBF = 0x3163
+0x4FC3 = 0x3459
+0x4FC4 = 0x366D
+0x4FC5 = 0x5934
+0x4FCA = 0x3F21
+0x4FCE = 0x595E
+0x4FCF = 0x474E
+0x4FD0 = 0x407E
+0x4FD1 = 0x5938
+0x4FD7 = 0x4B57
+0x4FD8 = 0x377D
+0x4FDA = 0x5935
+0x4FDC = 0x5937
+0x4FDD = 0x3123
+0x4FDE = 0x5361
+0x4FDF = 0x5939
+0x4FE1 = 0x5045
+0x4FE3 = 0x5936
+0x4FE6 = 0x5931
+0x4FE8 = 0x5932
+0x4FE9 = 0x4129
+0x4FEA = 0x5933
+0x4FED = 0x3C73
+0x4FEE = 0x505E
+0x4FEF = 0x3829
+0x4FF1 = 0x3E63
+0x4FF3 = 0x593D
+0x4FF8 = 0x593A
+0x4FFA = 0x3033
+0x4FFE = 0x5942
+0x500C = 0x5944
+0x500D = 0x3136
+0x500F = 0x593F
+0x5012 = 0x3539
+0x5014 = 0x3E73
+0x5018 = 0x4C48
+0x5019 = 0x3A72
+0x501A = 0x5250
+0x501C = 0x5943
+0x501F = 0x3D68
+0x5021 = 0x332B
+0x5025 = 0x5945
+0x5026 = 0x3E6B
+0x5028 = 0x5946
+0x5029 = 0x593B
+0x502A = 0x445F
+0x502C = 0x593E
+0x502D = 0x5941
+0x502E = 0x5940
+0x503A = 0x552E
+0x503C = 0x5635
+0x503E = 0x4763
+0x5043 = 0x5948
+0x5047 = 0x3C59
+0x5048 = 0x594A
+0x504C = 0x593C
+0x504E = 0x594B
+0x504F = 0x462B
+0x5055 = 0x5949
+0x505A = 0x5776
+0x505C = 0x4D23
+0x5065 = 0x3D21
+0x506C = 0x594C
+0x5076 = 0x453C
+0x5077 = 0x4D35
+0x507B = 0x594D
+0x507E = 0x5947
+0x507F = 0x3325
+0x5080 = 0x3F7E
+0x5085 = 0x3835
+0x5088 = 0x407C
+0x508D = 0x3078
+0x50A3 = 0x3476
+0x50A5 = 0x594E
+0x50A7 = 0x594F
+0x50A8 = 0x3422
+0x50A9 = 0x5950
+0x50AC = 0x345F
+0x50B2 = 0x3041
+0x50BA = 0x5951
+0x50BB = 0x4935
+0x50CF = 0x4F71
+0x50D6 = 0x5952
+0x50DA = 0x4145
+0x50E6 = 0x5956
+0x50E7 = 0x492E
+0x50EC = 0x5955
+0x50ED = 0x5954
+0x50EE = 0x5957
+0x50F3 = 0x4B5B
+0x50F5 = 0x3D29
+0x50FB = 0x4627
+0x5106 = 0x5953
+0x5107 = 0x5958
+0x510B = 0x5959
+0x5112 = 0x4865
+0x5121 = 0x405C
+0x513F = 0x3679
+0x5140 = 0x5823
+0x5141 = 0x544A
+0x5143 = 0x542A
+0x5144 = 0x5056
+0x5145 = 0x3364
+0x5146 = 0x5557
+0x5148 = 0x4F48
+0x5149 = 0x3962
+0x514B = 0x3F4B
+0x514D = 0x4362
+0x5151 = 0x3652
+0x5154 = 0x4D43
+0x5155 = 0x596E
+0x5156 = 0x5970
+0x515A = 0x3533
+0x515C = 0x3635
+0x5162 = 0x3E24
+0x5165 = 0x486B
+0x5168 = 0x482B
+0x516B = 0x304B
+0x516C = 0x392B
+0x516D = 0x4179
+0x516E = 0x5962
+0x5170 = 0x403C
+0x5171 = 0x3932
+0x5173 = 0x3958
+0x5174 = 0x504B
+0x5175 = 0x3178
+0x5176 = 0x4664
+0x5177 = 0x3E5F
+0x5178 = 0x3564
+0x5179 = 0x5748
+0x517B = 0x5178
+0x517C = 0x3C66
+0x517D = 0x4A5E
+0x5180 = 0x3C3D
+0x5181 = 0x5966
+0x5182 = 0x5867
+0x5185 = 0x445A
+0x5188 = 0x3854
+0x5189 = 0x483D
+0x518C = 0x3261
+0x518D = 0x5459
+0x5192 = 0x4330
+0x5195 = 0x4361
+0x5196 = 0x5A22
+0x5197 = 0x485F
+0x5199 = 0x5034
+0x519B = 0x3E7C
+0x519C = 0x4529
+0x51A0 = 0x395A
+0x51A2 = 0x5A23
+0x51A4 = 0x5429
+0x51A5 = 0x5A24
+0x51AB = 0x597B
+0x51AC = 0x362C
+0x51AF = 0x376B
+0x51B0 = 0x3179
+0x51B1 = 0x597C
+0x51B2 = 0x3365
+0x51B3 = 0x3E76
+0x51B5 = 0x3F76
+0x51B6 = 0x5231
+0x51B7 = 0x4064
+0x51BB = 0x3633
+0x51BC = 0x597E
+0x51BD = 0x597D
+0x51C0 = 0x3E3B
+0x51C4 = 0x4660
+0x51C6 = 0x573C
+0x51C7 = 0x5A21
+0x51C9 = 0x4139
+0x51CB = 0x3572
+0x51CC = 0x4168
+0x51CF = 0x3C75
+0x51D1 = 0x3455
+0x51DB = 0x415D
+0x51DD = 0x447D
+0x51E0 = 0x3C38
+0x51E1 = 0x3732
+0x51E4 = 0x376F
+0x51EB = 0x596C
+0x51ED = 0x463E
+0x51EF = 0x3F2D
+0x51F0 = 0x3B4B
+0x51F3 = 0x354A
+0x51F5 = 0x5B49
+0x51F6 = 0x5057
+0x51F8 = 0x4D39
+0x51F9 = 0x303C
+0x51FA = 0x3376
+0x51FB = 0x3B77
+0x51FC = 0x5B4A
+0x51FD = 0x3A2F
+0x51FF = 0x5464
+0x5200 = 0x3536
+0x5201 = 0x3573
+0x5202 = 0x5856
+0x5203 = 0x4850
+0x5206 = 0x3756
+0x5207 = 0x4750
+0x5208 = 0x5857
+0x520A = 0x3F2F
+0x520D = 0x5B3B
+0x520E = 0x5858
+0x5211 = 0x504C
+0x5212 = 0x3B2E
+0x5216 = 0x6B3E
+0x5217 = 0x4150
+0x5218 = 0x4175
+0x5219 = 0x5472
+0x521A = 0x3855
+0x521B = 0x3434
+0x521D = 0x3375
+0x5220 = 0x493E
+0x5224 = 0x4550
+0x5228 = 0x4559
+0x5229 = 0x407B
+0x522B = 0x3170
+0x522D = 0x5859
+0x522E = 0x394E
+0x5230 = 0x353D
+0x5233 = 0x585A
+0x5236 = 0x5646
+0x5237 = 0x4B22
+0x5238 = 0x482F
+0x5239 = 0x4932
+0x523A = 0x344C
+0x523B = 0x3F4C
+0x523D = 0x3974
+0x523F = 0x585B
+0x5240 = 0x585C
+0x5241 = 0x3667
+0x5242 = 0x3C41
+0x5243 = 0x4C6A
+0x524A = 0x4F77
+0x524C = 0x585D
+0x524D = 0x4730
+0x5250 = 0x3950
+0x5251 = 0x3D23
+0x5254 = 0x4C5E
+0x5256 = 0x464A
+0x525C = 0x5860
+0x525E = 0x585E
+0x5261 = 0x585F
+0x5265 = 0x307E
+0x5267 = 0x3E67
+0x5269 = 0x4A23
+0x526A = 0x3C74
+0x526F = 0x3831
+0x5272 = 0x386E
+0x527D = 0x5862
+0x527F = 0x3D4B
+0x5281 = 0x5864
+0x5282 = 0x5863
+0x5288 = 0x457C
+0x5290 = 0x5865
+0x5293 = 0x5866
+0x529B = 0x4126
+0x529D = 0x4830
+0x529E = 0x306C
+0x529F = 0x3926
+0x52A0 = 0x3C53
+0x52A1 = 0x4E71
+0x52A2 = 0x5B3D
+0x52A3 = 0x4153
+0x52A8 = 0x362F
+0x52A9 = 0x567A
+0x52AA = 0x452C
+0x52AB = 0x3D59
+0x52AC = 0x5B3E
+0x52AD = 0x5B3F
+0x52B1 = 0x4078
+0x52B2 = 0x3E22
+0x52B3 = 0x404D
+0x52BE = 0x5B40
+0x52BF = 0x4A46
+0x52C3 = 0x322A
+0x52C7 = 0x5342
+0x52C9 = 0x4363
+0x52CB = 0x512B
+0x52D0 = 0x5B42
+0x52D2 = 0x4055
+0x52D6 = 0x5B43
+0x52D8 = 0x3F31
+0x52DF = 0x443C
+0x52E4 = 0x475A
+0x52F0 = 0x5B44
+0x52F9 = 0x5968
+0x52FA = 0x4957
+0x52FE = 0x3934
+0x52FF = 0x4E70
+0x5300 = 0x5448
+0x5305 = 0x307C
+0x5306 = 0x3452
+0x5308 = 0x5059
+0x530D = 0x5969
+0x530F = 0x5E4B
+0x5310 = 0x596B
+0x5315 = 0x5830
+0x5316 = 0x3B2F
+0x5317 = 0x3131
+0x5319 = 0x3357
+0x531A = 0x584E
+0x531D = 0x5451
+0x5320 = 0x3D33
+0x5321 = 0x3F6F
+0x5323 = 0x4F3B
+0x5326 = 0x5850
+0x532A = 0x374B
+0x532E = 0x5851
+0x5339 = 0x4625
+0x533A = 0x4778
+0x533B = 0x523D
+0x533E = 0x5852
+0x533F = 0x4464
+0x5341 = 0x4A2E
+0x5343 = 0x4727
+0x5345 = 0x5826
+0x5347 = 0x497D
+0x5348 = 0x4E67
+0x5349 = 0x3B5C
+0x534A = 0x306B
+0x534E = 0x3B2A
+0x534F = 0x502D
+0x5351 = 0x3130
+0x5352 = 0x5764
+0x5353 = 0x573F
+0x5355 = 0x3525
+0x5356 = 0x4274
+0x5357 = 0x444F
+0x535A = 0x3229
+0x535C = 0x3237
+0x535E = 0x3165
+0x535F = 0x5F32
+0x5360 = 0x553C
+0x5361 = 0x3F28
+0x5362 = 0x422C
+0x5363 = 0x5855
+0x5364 = 0x4231
+0x5366 = 0x5854
+0x5367 = 0x4E54
+0x5369 = 0x5A60
+0x536B = 0x4E40
+0x536E = 0x5834
+0x536F = 0x432E
+0x5370 = 0x5321
+0x5371 = 0x4E23
+0x5373 = 0x3C34
+0x5374 = 0x4834
+0x5375 = 0x4251
+0x5377 = 0x3E6D
+0x5378 = 0x5036
+0x537A = 0x5A61
+0x537F = 0x4764
+0x5382 = 0x3327
+0x5384 = 0x3672
+0x5385 = 0x4C7C
+0x5386 = 0x407A
+0x5389 = 0x4077
+0x538B = 0x5139
+0x538C = 0x5161
+0x538D = 0x5847
+0x5395 = 0x325E
+0x5398 = 0x4065
+0x539A = 0x3A71
+0x539D = 0x5848
+0x539F = 0x542D
+0x53A2 = 0x4F61
+0x53A3 = 0x5849
+0x53A5 = 0x584A
+0x53A6 = 0x4F43
+0x53A8 = 0x3378
+0x53A9 = 0x3E47
+0x53AE = 0x584B
+0x53B6 = 0x5B4C
+0x53BB = 0x4825
+0x53BF = 0x4F58
+0x53C1 = 0x487E
+0x53C2 = 0x324E
+0x53C8 = 0x5356
+0x53C9 = 0x3266
+0x53CA = 0x3C30
+0x53CB = 0x5351
+0x53CC = 0x4B2B
+0x53CD = 0x3734
+0x53D1 = 0x3722
+0x53D4 = 0x4A65
+0x53D6 = 0x4821
+0x53D7 = 0x4A5C
+0x53D8 = 0x3164
+0x53D9 = 0x5070
+0x53DB = 0x4551
+0x53DF = 0x5B45
+0x53E0 = 0x357E
+0x53E3 = 0x3F5A
+0x53E4 = 0x3945
+0x53E5 = 0x3E64
+0x53E6 = 0x416D
+0x53E8 = 0x5F36
+0x53E9 = 0x5F35
+0x53EA = 0x563B
+0x53EB = 0x3D50
+0x53EC = 0x5559
+0x53ED = 0x3048
+0x53EE = 0x3623
+0x53EF = 0x3F49
+0x53F0 = 0x4C28
+0x53F1 = 0x5F33
+0x53F2 = 0x4A37
+0x53F3 = 0x5352
+0x53F5 = 0x584F
+0x53F6 = 0x5236
+0x53F7 = 0x3A45
+0x53F8 = 0x4B3E
+0x53F9 = 0x4C3E
+0x53FB = 0x5F37
+0x53FC = 0x3570
+0x53FD = 0x5F34
+0x5401 = 0x5375
+0x5403 = 0x3354
+0x5404 = 0x3877
+0x5406 = 0x5F3A
+0x5408 = 0x3A4F
+0x5409 = 0x3C2A
+0x540A = 0x3575
+0x540C = 0x4D2C
+0x540D = 0x437B
+0x540E = 0x3A73
+0x540F = 0x4074
+0x5410 = 0x4D42
+0x5411 = 0x4F72
+0x5412 = 0x5F38
+0x5413 = 0x4F45
+0x5415 = 0x4240
+0x5416 = 0x5F39
+0x5417 = 0x4270
+0x541B = 0x3E7D
+0x541D = 0x415F
+0x541E = 0x4D4C
+0x541F = 0x5277
+0x5420 = 0x374D
+0x5421 = 0x5F41
+0x5423 = 0x5F44
+0x5426 = 0x3771
+0x5427 = 0x3049
+0x5428 = 0x3656
+0x5429 = 0x3754
+0x542B = 0x3A2C
+0x542C = 0x4C7D
+0x542D = 0x3F54
+0x542E = 0x4B31
+0x542F = 0x4674
+0x5431 = 0x5628
+0x5432 = 0x5F45
+0x5434 = 0x4E62
+0x5435 = 0x3333
+0x5438 = 0x4E7C
+0x5439 = 0x3435
+0x543B = 0x4E47
+0x543C = 0x3A70
+0x543E = 0x4E61
+0x5440 = 0x513D
+0x5443 = 0x5F40
+0x5446 = 0x3474
+0x5448 = 0x334A
+0x544A = 0x3866
+0x544B = 0x5F3B
+0x5450 = 0x4445
+0x5452 = 0x5F3C
+0x5453 = 0x5F3D
+0x5454 = 0x5F3E
+0x5455 = 0x453B
+0x5456 = 0x5F3F
+0x5457 = 0x5F42
+0x5458 = 0x5431
+0x5459 = 0x5F43
+0x545B = 0x473A
+0x545C = 0x4E58
+0x5462 = 0x4458
+0x5464 = 0x5F4A
+0x5466 = 0x5F4F
+0x5468 = 0x565C
+0x5471 = 0x5F49
+0x5472 = 0x5F5A
+0x5473 = 0x4E36
+0x5475 = 0x3A47
+0x5476 = 0x5F4E
+0x5477 = 0x5F48
+0x5478 = 0x455E
+0x547B = 0x496B
+0x547C = 0x3A74
+0x547D = 0x437C
+0x5480 = 0x3E57
+0x5482 = 0x5F46
+0x5484 = 0x5F4D
+0x5486 = 0x4558
+0x548B = 0x5526
+0x548C = 0x3A4D
+0x548E = 0x3E4C
+0x548F = 0x533D
+0x5490 = 0x3840
+0x5492 = 0x5664
+0x5494 = 0x5F47
+0x5495 = 0x393E
+0x5496 = 0x3F27
+0x5499 = 0x417C
+0x549A = 0x5F4B
+0x549B = 0x5F4C
+0x549D = 0x5F50
+0x54A3 = 0x5F5B
+0x54A4 = 0x5F65
+0x54A6 = 0x5F57
+0x54A7 = 0x5F56
+0x54A8 = 0x5749
+0x54A9 = 0x5F63
+0x54AA = 0x5F64
+0x54AB = 0x656B
+0x54AC = 0x5227
+0x54AD = 0x5F52
+0x54AF = 0x3F29
+0x54B1 = 0x545B
+0x54B3 = 0x3F48
+0x54B4 = 0x5F54
+0x54B8 = 0x4F4C
+0x54BB = 0x5F5D
+0x54BD = 0x514A
+0x54BF = 0x5F5E
+0x54C0 = 0x3027
+0x54C1 = 0x4637
+0x54C2 = 0x5F53
+0x54C4 = 0x3A65
+0x54C6 = 0x365F
+0x54C7 = 0x4D5B
+0x54C8 = 0x397E
+0x54C9 = 0x5455
+0x54CC = 0x5F5F
+0x54CD = 0x4F6C
+0x54CE = 0x3025
+0x54CF = 0x5F67
+0x54D0 = 0x5F51
+0x54D1 = 0x5146
+0x54D2 = 0x5F55
+0x54D3 = 0x5F58
+0x54D4 = 0x5F59
+0x54D5 = 0x5F5C
+0x54D7 = 0x3B29
+0x54D9 = 0x5F60
+0x54DA = 0x5F61
+0x54DC = 0x5F62
+0x54DD = 0x5F66
+0x54DE = 0x5F68
+0x54DF = 0x5334
+0x54E5 = 0x3867
+0x54E6 = 0x4536
+0x54E7 = 0x5F6A
+0x54E8 = 0x495A
+0x54E9 = 0x4128
+0x54EA = 0x4444
+0x54ED = 0x3F5E
+0x54EE = 0x4F78
+0x54F2 = 0x555C
+0x54F3 = 0x5F6E
+0x54FA = 0x3238
+0x54FC = 0x3A5F
+0x54FD = 0x5F6C
+0x54FF = 0x5B41
+0x5501 = 0x5164
+0x5506 = 0x4B74
+0x5507 = 0x343D
+0x5509 = 0x3026
+0x550F = 0x5F71
+0x5510 = 0x4C46
+0x5511 = 0x5F72
+0x5514 = 0x5F6D
+0x551B = 0x5F69
+0x5520 = 0x5F6B
+0x5522 = 0x5F6F
+0x5523 = 0x5F70
+0x5524 = 0x3B3D
+0x5527 = 0x5F73
+0x552A = 0x5F74
+0x552C = 0x3B23
+0x552E = 0x4A5B
+0x552F = 0x4E28
+0x5530 = 0x6027
+0x5531 = 0x332A
+0x5533 = 0x6026
+0x5537 = 0x6021
+0x553C = 0x5F7E
+0x553E = 0x4D59
+0x553F = 0x5F7C
+0x5541 = 0x5F7A
+0x5543 = 0x3F50
+0x5544 = 0x5744
+0x5546 = 0x494C
+0x5549 = 0x5F78
+0x554A = 0x3021
+0x5550 = 0x5F7D
+0x5555 = 0x5F7B
+0x5556 = 0x6022
+0x555C = 0x6028
+0x5561 = 0x3748
+0x5564 = 0x4621
+0x5565 = 0x4936
+0x5566 = 0x4032
+0x5567 = 0x5F75
+0x556A = 0x453E
+0x556C = 0x5844
+0x556D = 0x5F79
+0x556E = 0x4476
+0x5575 = 0x6023
+0x5576 = 0x6024
+0x5577 = 0x6025
+0x5578 = 0x5025
+0x557B = 0x6034
+0x557C = 0x4C64
+0x557E = 0x6031
+0x5580 = 0x3F26
+0x5581 = 0x602F
+0x5582 = 0x4E39
+0x5583 = 0x602B
+0x5584 = 0x4946
+0x5587 = 0x402E
+0x5588 = 0x602E
+0x5589 = 0x3A6D
+0x558A = 0x3A30
+0x558B = 0x6029
+0x558F = 0x5F76
+0x5591 = 0x6033
+0x5594 = 0x6038
+0x5598 = 0x342D
+0x5599 = 0x6039
+0x559C = 0x4F32
+0x559D = 0x3A48
+0x559F = 0x6030
+0x55A7 = 0x507A
+0x55B1 = 0x602C
+0x55B3 = 0x547B
+0x55B5 = 0x5F77
+0x55B7 = 0x4567
+0x55B9 = 0x602D
+0x55BB = 0x5377
+0x55BD = 0x6036
+0x55BE = 0x6037
+0x55C4 = 0x6044
+0x55C5 = 0x5061
+0x55C9 = 0x603C
+0x55CC = 0x6049
+0x55CD = 0x604A
+0x55D1 = 0x603E
+0x55D2 = 0x602A
+0x55D3 = 0x4924
+0x55D4 = 0x6041
+0x55D6 = 0x6032
+0x55DC = 0x4A48
+0x55DD = 0x6043
+0x55DF = 0x6035
+0x55E1 = 0x4E4B
+0x55E3 = 0x4B43
+0x55E4 = 0x604D
+0x55E5 = 0x6046
+0x55E6 = 0x6042
+0x55E8 = 0x604B
+0x55EA = 0x603A
+0x55EB = 0x603F
+0x55EC = 0x6040
+0x55EF = 0x6045
+0x55F2 = 0x6047
+0x55F3 = 0x6048
+0x55F5 = 0x604C
+0x55F7 = 0x603B
+0x55FD = 0x4B54
+0x55FE = 0x6055
+0x5600 = 0x6056
+0x5601 = 0x6052
+0x5608 = 0x6050
+0x5609 = 0x3C4E
+0x560C = 0x6051
+0x560E = 0x3842
+0x560F = 0x5845
+0x5618 = 0x506A
+0x561B = 0x426F
+0x561E = 0x604F
+0x561F = 0x603D
+0x5623 = 0x6054
+0x5624 = 0x6053
+0x5627 = 0x6057
+0x562C = 0x605C
+0x562D = 0x6058
+0x5631 = 0x5676
+0x5632 = 0x3330
+0x5634 = 0x576C
+0x5636 = 0x4B3B
+0x5639 = 0x605A
+0x563B = 0x4E7B
+0x563F = 0x3A59
+0x564C = 0x6061
+0x564D = 0x605D
+0x564E = 0x522D
+0x5654 = 0x6062
+0x5657 = 0x605B
+0x5658 = 0x6059
+0x5659 = 0x605F
+0x565C = 0x6060
+0x5662 = 0x605E
+0x5664 = 0x6064
+0x5668 = 0x4677
+0x5669 = 0x582C
+0x566A = 0x546B
+0x566B = 0x6066
+0x566C = 0x4A49
+0x5671 = 0x6065
+0x5676 = 0x3841
+0x567B = 0x6067
+0x567C = 0x6068
+0x5685 = 0x6069
+0x5686 = 0x6063
+0x568E = 0x3A3F
+0x568F = 0x4C67
+0x5693 = 0x606A
+0x56A3 = 0x4F79
+0x56AF = 0x606B
+0x56B7 = 0x4842
+0x56BC = 0x3D40
+0x56CA = 0x4452
+0x56D4 = 0x606C
+0x56D7 = 0x606D
+0x56DA = 0x4774
+0x56DB = 0x4B44
+0x56DD = 0x606E
+0x56DE = 0x3B58
+0x56DF = 0x5836
+0x56E0 = 0x5272
+0x56E1 = 0x606F
+0x56E2 = 0x4D45
+0x56E4 = 0x365A
+0x56EB = 0x6071
+0x56ED = 0x5430
+0x56F0 = 0x4027
+0x56F1 = 0x3451
+0x56F4 = 0x4E27
+0x56F5 = 0x6070
+0x56F9 = 0x6072
+0x56FA = 0x394C
+0x56FD = 0x397A
+0x56FE = 0x4D3C
+0x56FF = 0x6073
+0x5703 = 0x4654
+0x5704 = 0x6074
+0x5706 = 0x5432
+0x5708 = 0x4826
+0x5709 = 0x6076
+0x570A = 0x6075
+0x571C = 0x6077
+0x571F = 0x4D41
+0x5723 = 0x4A25
+0x5728 = 0x545A
+0x5729 = 0x5B57
+0x572A = 0x5B59
+0x572C = 0x5B58
+0x572D = 0x3967
+0x572E = 0x5B5C
+0x572F = 0x5B5D
+0x5730 = 0x3558
+0x5733 = 0x5B5A
+0x5739 = 0x5B5B
+0x573A = 0x3321
+0x573B = 0x5B5F
+0x573E = 0x3B78
+0x5740 = 0x5637
+0x5742 = 0x5B60
+0x5747 = 0x3E79
+0x574A = 0x373B
+0x574C = 0x5B50
+0x574D = 0x4C2E
+0x574E = 0x3F32
+0x574F = 0x3B35
+0x5750 = 0x5778
+0x5751 = 0x3F53
+0x5757 = 0x3F69
+0x575A = 0x3C61
+0x575B = 0x4C33
+0x575C = 0x5B5E
+0x575D = 0x3053
+0x575E = 0x4E6B
+0x575F = 0x3758
+0x5760 = 0x5739
+0x5761 = 0x4642
+0x5764 = 0x4024
+0x5766 = 0x4C39
+0x5768 = 0x5B67
+0x5769 = 0x5B61
+0x576A = 0x463A
+0x576B = 0x5B63
+0x576D = 0x5B68
+0x576F = 0x4577
+0x5773 = 0x5B6A
+0x5776 = 0x5B69
+0x5777 = 0x3F40
+0x577B = 0x5B66
+0x577C = 0x5B65
+0x5782 = 0x3439
+0x5783 = 0x402C
+0x5784 = 0x4222
+0x5785 = 0x5B62
+0x5786 = 0x5B64
+0x578B = 0x504D
+0x578C = 0x5B6D
+0x5792 = 0x405D
+0x5793 = 0x5B72
+0x579B = 0x3662
+0x57A0 = 0x5B73
+0x57A1 = 0x5B52
+0x57A2 = 0x3938
+0x57A3 = 0x542B
+0x57A4 = 0x5B6C
+0x57A6 = 0x3F51
+0x57A7 = 0x5B70
+0x57A9 = 0x5B51
+0x57AB = 0x3566
+0x57AD = 0x5B6B
+0x57AE = 0x3F65
+0x57B2 = 0x5B6E
+0x57B4 = 0x5B71
+0x57B8 = 0x5B79
+0x57C2 = 0x3921
+0x57C3 = 0x3023
+0x57CB = 0x4271
+0x57CE = 0x3347
+0x57CF = 0x5B6F
+0x57D2 = 0x5B78
+0x57D4 = 0x4652
+0x57D5 = 0x5B74
+0x57D8 = 0x5B75
+0x57D9 = 0x5B77
+0x57DA = 0x5B76
+0x57DD = 0x5B7E
+0x57DF = 0x5372
+0x57E0 = 0x323A
+0x57E4 = 0x5B7D
+0x57ED = 0x5C24
+0x57EF = 0x5B7B
+0x57F4 = 0x5B7A
+0x57F8 = 0x5B7C
+0x57F9 = 0x4560
+0x57FA = 0x3B79
+0x57FD = 0x5C23
+0x5800 = 0x5C25
+0x5802 = 0x4C43
+0x5806 = 0x3651
+0x5807 = 0x5D40
+0x580B = 0x5C21
+0x580D = 0x5C22
+0x5811 = 0x4735
+0x5815 = 0x3669
+0x5819 = 0x5C27
+0x581E = 0x5C26
+0x5820 = 0x5C29
+0x5821 = 0x3124
+0x5824 = 0x354C
+0x582A = 0x3F30
+0x5830 = 0x515F
+0x5835 = 0x3642
+0x5844 = 0x5C28
+0x584C = 0x4B7A
+0x584D = 0x6B73
+0x5851 = 0x4B5C
+0x5854 = 0x4B7E
+0x5858 = 0x4C41
+0x585E = 0x487B
+0x5865 = 0x5C2A
+0x586B = 0x4C6E
+0x586C = 0x5C2B
+0x587E = 0x5B53
+0x5880 = 0x5C2F
+0x5881 = 0x5C2C
+0x5883 = 0x3E33
+0x5885 = 0x4A7B
+0x5889 = 0x5C2D
+0x5892 = 0x494A
+0x5893 = 0x4439
+0x5899 = 0x473D
+0x589A = 0x5C2E
+0x589E = 0x5476
+0x589F = 0x5066
+0x58A8 = 0x442B
+0x58A9 = 0x3655
+0x58BC = 0x5B54
+0x58C1 = 0x315A
+0x58C5 = 0x5B55
+0x58D1 = 0x5B56
+0x58D5 = 0x3A3E
+0x58E4 = 0x4840
+0x58EB = 0x4A3F
+0x58EC = 0x4849
+0x58EE = 0x5733
+0x58F0 = 0x4979
+0x58F3 = 0x3F47
+0x58F6 = 0x3A78
+0x58F9 = 0x523C
+0x5902 = 0x623A
+0x5904 = 0x3426
+0x5907 = 0x3138
+0x590D = 0x3834
+0x590F = 0x4F44
+0x5914 = 0x5967
+0x5915 = 0x4F26
+0x5916 = 0x4D62
+0x5919 = 0x596D
+0x591A = 0x3660
+0x591C = 0x5239
+0x591F = 0x393B
+0x5924 = 0x6239
+0x5925 = 0x6237
+0x5927 = 0x3473
+0x5929 = 0x4C6C
+0x592A = 0x4C2B
+0x592B = 0x3772
+0x592D = 0x5832
+0x592E = 0x516B
+0x592F = 0x3A3B
+0x5931 = 0x4A27
+0x5934 = 0x4D37
+0x5937 = 0x5244
+0x5938 = 0x3F64
+0x5939 = 0x3C50
+0x593A = 0x3661
+0x593C = 0x5E45
+0x5941 = 0x5E46
+0x5942 = 0x5B3C
+0x5944 = 0x5159
+0x5947 = 0x4666
+0x5948 = 0x444E
+0x5949 = 0x376E
+0x594B = 0x375C
+0x594E = 0x3F7C
+0x594F = 0x5760
+0x5951 = 0x4675
+0x5954 = 0x313C
+0x5955 = 0x5E48
+0x5956 = 0x3D31
+0x5957 = 0x4C57
+0x5958 = 0x5E4A
+0x595A = 0x5E49
+0x5960 = 0x356C
+0x5962 = 0x495D
+0x5965 = 0x3042
+0x5973 = 0x452E
+0x5974 = 0x452B
+0x5976 = 0x444C
+0x5978 = 0x3C69
+0x5979 = 0x4B7D
+0x597D = 0x3A43
+0x5981 = 0x6579
+0x5982 = 0x4867
+0x5983 = 0x657A
+0x5984 = 0x4D7D
+0x5986 = 0x5731
+0x5987 = 0x383E
+0x5988 = 0x4268
+0x598A = 0x4851
+0x598D = 0x657B
+0x5992 = 0x364A
+0x5993 = 0x3C4B
+0x5996 = 0x517D
+0x5997 = 0x6621
+0x5999 = 0x436E
+0x599E = 0x6624
+0x59A3 = 0x657E
+0x59A4 = 0x6625
+0x59A5 = 0x4D57
+0x59A8 = 0x3741
+0x59A9 = 0x657C
+0x59AA = 0x657D
+0x59AB = 0x6623
+0x59AE = 0x445D
+0x59AF = 0x6628
+0x59B2 = 0x6627
+0x59B9 = 0x4343
+0x59BB = 0x465E
+0x59BE = 0x662A
+0x59C6 = 0x4437
+0x59CA = 0x6622
+0x59CB = 0x4A3C
+0x59D0 = 0x3D63
+0x59D1 = 0x3943
+0x59D2 = 0x6626
+0x59D3 = 0x5055
+0x59D4 = 0x4E2F
+0x59D7 = 0x6629
+0x59D8 = 0x6630
+0x59DA = 0x5226
+0x59DC = 0x3D2A
+0x59DD = 0x662D
+0x59E3 = 0x662F
+0x59E5 = 0x4051
+0x59E8 = 0x524C
+0x59EC = 0x3C27
+0x59F9 = 0x6631
+0x59FB = 0x5276
+0x59FF = 0x574B
+0x5A01 = 0x4D7E
+0x5A03 = 0x4D5E
+0x5A04 = 0x4226
+0x5A05 = 0x662B
+0x5A06 = 0x662C
+0x5A07 = 0x3D3F
+0x5A08 = 0x662E
+0x5A09 = 0x6633
+0x5A0C = 0x6632
+0x5A11 = 0x6636
+0x5A13 = 0x6638
+0x5A18 = 0x446F
+0x5A1C = 0x4448
+0x5A1F = 0x3E6A
+0x5A20 = 0x496F
+0x5A23 = 0x6637
+0x5A25 = 0x3670
+0x5A29 = 0x4364
+0x5A31 = 0x5369
+0x5A32 = 0x6634
+0x5A34 = 0x6635
+0x5A36 = 0x4822
+0x5A3C = 0x663D
+0x5A40 = 0x6639
+0x5A46 = 0x4645
+0x5A49 = 0x4D71
+0x5A4A = 0x663B
+0x5A55 = 0x663C
+0x5A5A = 0x3B69
+0x5A62 = 0x663E
+0x5A67 = 0x663A
+0x5A6A = 0x4037
+0x5A74 = 0x5324
+0x5A75 = 0x663F
+0x5A76 = 0x4974
+0x5A77 = 0x6643
+0x5A7A = 0x6644
+0x5A7F = 0x5076
+0x5A92 = 0x433D
+0x5A9A = 0x4344
+0x5A9B = 0x6642
+0x5AAA = 0x6641
+0x5AB2 = 0x6647
+0x5AB3 = 0x4F31
+0x5AB5 = 0x6B74
+0x5AB8 = 0x664A
+0x5ABE = 0x6645
+0x5AC1 = 0x3C5E
+0x5AC2 = 0x4929
+0x5AC9 = 0x3C35
+0x5ACC = 0x4F53
+0x5AD2 = 0x6648
+0x5AD4 = 0x6649
+0x5AD6 = 0x664E
+0x5AD8 = 0x6650
+0x5ADC = 0x6651
+0x5AE0 = 0x664B
+0x5AE1 = 0x3555
+0x5AE3 = 0x664C
+0x5AE6 = 0x664F
+0x5AE9 = 0x445B
+0x5AEB = 0x6646
+0x5AF1 = 0x664D
+0x5B09 = 0x6652
+0x5B16 = 0x6654
+0x5B17 = 0x6653
+0x5B32 = 0x6655
+0x5B34 = 0x5978
+0x5B37 = 0x6656
+0x5B40 = 0x6657
+0x5B50 = 0x5753
+0x5B51 = 0x665D
+0x5B53 = 0x665E
+0x5B54 = 0x3F57
+0x5B55 = 0x5450
+0x5B57 = 0x5756
+0x5B58 = 0x3466
+0x5B59 = 0x4B6F
+0x5B5A = 0x665A
+0x5B5B = 0x5843
+0x5B5C = 0x574E
+0x5B5D = 0x5022
+0x5B5F = 0x434F
+0x5B62 = 0x665F
+0x5B63 = 0x3C3E
+0x5B64 = 0x3942
+0x5B65 = 0x665B
+0x5B66 = 0x5127
+0x5B69 = 0x3A22
+0x5B6A = 0x424F
+0x5B6C = 0x582B
+0x5B70 = 0x4A6B
+0x5B71 = 0x656E
+0x5B73 = 0x665C
+0x5B75 = 0x3775
+0x5B7A = 0x4866
+0x5B7D = 0x4475
+0x5B80 = 0x6532
+0x5B81 = 0x447E
+0x5B83 = 0x4B7C
+0x5B84 = 0x6533
+0x5B85 = 0x552C
+0x5B87 = 0x536E
+0x5B88 = 0x4A58
+0x5B89 = 0x3032
+0x5B8B = 0x4B4E
+0x5B8C = 0x4D6A
+0x5B8F = 0x3A6A
+0x5B93 = 0x6535
+0x5B95 = 0x6534
+0x5B97 = 0x575A
+0x5B98 = 0x3959
+0x5B99 = 0x5666
+0x5B9A = 0x3628
+0x5B9B = 0x4D70
+0x5B9C = 0x524B
+0x5B9D = 0x3126
+0x5B9E = 0x4A35
+0x5BA0 = 0x3368
+0x5BA1 = 0x4973
+0x5BA2 = 0x3F4D
+0x5BA3 = 0x507B
+0x5BA4 = 0x4A52
+0x5BA5 = 0x6536
+0x5BA6 = 0x3B42
+0x5BAA = 0x4F5C
+0x5BAB = 0x392C
+0x5BB0 = 0x5457
+0x5BB3 = 0x3A26
+0x5BB4 = 0x5167
+0x5BB5 = 0x4F7C
+0x5BB6 = 0x3C52
+0x5BB8 = 0x6537
+0x5BB9 = 0x485D
+0x5BBD = 0x3F6D
+0x5BBE = 0x3176
+0x5BBF = 0x4B5E
+0x5BC2 = 0x3C45
+0x5BC4 = 0x3C44
+0x5BC5 = 0x527A
+0x5BC6 = 0x435C
+0x5BC7 = 0x3F5C
+0x5BCC = 0x383B
+0x5BD0 = 0x4342
+0x5BD2 = 0x3A2E
+0x5BD3 = 0x5422
+0x5BDD = 0x475E
+0x5BDE = 0x442F
+0x5BDF = 0x326C
+0x5BE1 = 0x3951
+0x5BE4 = 0x653B
+0x5BE5 = 0x4148
+0x5BE8 = 0x552F
+0x5BEE = 0x653C
+0x5BF0 = 0x653E
+0x5BF8 = 0x3467
+0x5BF9 = 0x3654
+0x5BFA = 0x4B42
+0x5BFB = 0x5130
+0x5BFC = 0x353C
+0x5BFF = 0x4A59
+0x5C01 = 0x3762
+0x5C04 = 0x4964
+0x5C06 = 0x3D2B
+0x5C09 = 0x4E3E
+0x5C0A = 0x5770
+0x5C0F = 0x5021
+0x5C11 = 0x4959
+0x5C14 = 0x367B
+0x5C15 = 0x6658
+0x5C16 = 0x3C62
+0x5C18 = 0x333E
+0x5C1A = 0x4950
+0x5C1C = 0x6659
+0x5C1D = 0x3322
+0x5C22 = 0x5E4C
+0x5C24 = 0x5348
+0x5C25 = 0x5E4D
+0x5C27 = 0x5222
+0x5C2C = 0x5E4E
+0x5C31 = 0x3E4D
+0x5C34 = 0x5E4F
+0x5C38 = 0x4A2C
+0x5C39 = 0x527C
+0x5C3A = 0x335F
+0x5C3B = 0x656A
+0x5C3C = 0x4461
+0x5C3D = 0x3E21
+0x5C3E = 0x4E32
+0x5C3F = 0x4472
+0x5C40 = 0x3E56
+0x5C41 = 0x4628
+0x5C42 = 0x3263
+0x5C45 = 0x3E53
+0x5C48 = 0x477C
+0x5C49 = 0x4C6B
+0x5C4A = 0x3D6C
+0x5C4B = 0x4E5D
+0x5C4E = 0x4A3A
+0x5C4F = 0x4641
+0x5C50 = 0x656C
+0x5C51 = 0x503C
+0x5C55 = 0x5539
+0x5C59 = 0x656D
+0x5C5E = 0x4A74
+0x5C60 = 0x4D40
+0x5C61 = 0x4245
+0x5C63 = 0x656F
+0x5C65 = 0x4244
+0x5C66 = 0x6570
+0x5C6E = 0x6578
+0x5C6F = 0x4D4D
+0x5C71 = 0x493D
+0x5C79 = 0x5259
+0x5C7A = 0x6128
+0x5C7F = 0x536C
+0x5C81 = 0x4B6A
+0x5C82 = 0x4671
+0x5C88 = 0x612C
+0x5C8C = 0x6127
+0x5C8D = 0x6129
+0x5C90 = 0x612A
+0x5C91 = 0x612F
+0x5C94 = 0x326D
+0x5C96 = 0x612B
+0x5C97 = 0x385A
+0x5C98 = 0x612D
+0x5C99 = 0x612E
+0x5C9A = 0x6130
+0x5C9B = 0x353A
+0x5C9C = 0x6131
+0x5CA2 = 0x6133
+0x5CA3 = 0x6138
+0x5CA9 = 0x5152
+0x5CAB = 0x6136
+0x5CAC = 0x6135
+0x5CAD = 0x416B
+0x5CB1 = 0x6137
+0x5CB3 = 0x5440
+0x5CB5 = 0x6132
+0x5CB7 = 0x613A
+0x5CB8 = 0x3036
+0x5CBD = 0x6134
+0x5CBF = 0x3F79
+0x5CC1 = 0x6139
+0x5CC4 = 0x613B
+0x5CCB = 0x613E
+0x5CD2 = 0x613C
+0x5CD9 = 0x5645
+0x5CE1 = 0x4F3F
+0x5CE4 = 0x613D
+0x5CE5 = 0x613F
+0x5CE6 = 0x424D
+0x5CE8 = 0x366B
+0x5CEA = 0x5378
+0x5CED = 0x474D
+0x5CF0 = 0x3765
+0x5CFB = 0x3E7E
+0x5D02 = 0x6140
+0x5D03 = 0x6141
+0x5D06 = 0x6147
+0x5D07 = 0x3367
+0x5D0E = 0x4669
+0x5D14 = 0x345E
+0x5D16 = 0x5142
+0x5D1B = 0x6148
+0x5D1E = 0x6146
+0x5D24 = 0x6145
+0x5D26 = 0x6143
+0x5D27 = 0x6142
+0x5D29 = 0x3140
+0x5D2D = 0x5538
+0x5D2E = 0x6144
+0x5D34 = 0x614B
+0x5D3D = 0x614C
+0x5D3E = 0x614A
+0x5D47 = 0x6F7A
+0x5D4A = 0x6153
+0x5D4B = 0x6152
+0x5D4C = 0x4736
+0x5D58 = 0x6149
+0x5D5B = 0x614E
+0x5D5D = 0x6150
+0x5D69 = 0x6154
+0x5D6B = 0x6151
+0x5D6C = 0x614D
+0x5D6F = 0x614F
+0x5D74 = 0x6155
+0x5D82 = 0x6156
+0x5D99 = 0x6157
+0x5D9D = 0x6158
+0x5DB7 = 0x615A
+0x5DC5 = 0x615B
+0x5DCD = 0x4E21
+0x5DDB = 0x675D
+0x5DDD = 0x3428
+0x5DDE = 0x565D
+0x5DE1 = 0x5132
+0x5DE2 = 0x3332
+0x5DE5 = 0x3924
+0x5DE6 = 0x5773
+0x5DE7 = 0x4749
+0x5DE8 = 0x3E5E
+0x5DE9 = 0x392E
+0x5DEB = 0x4E57
+0x5DEE = 0x326E
+0x5DEF = 0x5B4F
+0x5DF1 = 0x3C3A
+0x5DF2 = 0x5251
+0x5DF3 = 0x4B48
+0x5DF4 = 0x304D
+0x5DF7 = 0x4F6F
+0x5DFD = 0x5963
+0x5DFE = 0x3D6D
+0x5E01 = 0x3152
+0x5E02 = 0x4A50
+0x5E03 = 0x323C
+0x5E05 = 0x4B27
+0x5E06 = 0x372B
+0x5E08 = 0x4A26
+0x5E0C = 0x4F23
+0x5E0F = 0x6078
+0x5E10 = 0x554A
+0x5E11 = 0x607B
+0x5E14 = 0x607A
+0x5E15 = 0x4541
+0x5E16 = 0x4C7B
+0x5E18 = 0x4131
+0x5E19 = 0x6079
+0x5E1A = 0x5663
+0x5E1B = 0x322F
+0x5E1C = 0x5644
+0x5E1D = 0x355B
+0x5E26 = 0x3478
+0x5E27 = 0x5621
+0x5E2D = 0x4F2F
+0x5E2E = 0x306F
+0x5E31 = 0x607C
+0x5E37 = 0x6121
+0x5E38 = 0x3323
+0x5E3B = 0x607D
+0x5E3C = 0x607E
+0x5E3D = 0x4331
+0x5E42 = 0x435D
+0x5E44 = 0x6122
+0x5E45 = 0x3779
+0x5E4C = 0x3B4F
+0x5E54 = 0x6123
+0x5E55 = 0x443B
+0x5E5B = 0x6124
+0x5E5E = 0x6125
+0x5E61 = 0x6126
+0x5E62 = 0x3431
+0x5E72 = 0x3849
+0x5E73 = 0x463D
+0x5E74 = 0x446A
+0x5E76 = 0x3222
+0x5E78 = 0x5052
+0x5E7A = 0x675B
+0x5E7B = 0x3B43
+0x5E7C = 0x5357
+0x5E7D = 0x5344
+0x5E7F = 0x3963
+0x5E80 = 0x624F
+0x5E84 = 0x572F
+0x5E86 = 0x476C
+0x5E87 = 0x3153
+0x5E8A = 0x3432
+0x5E8B = 0x6251
+0x5E8F = 0x5072
+0x5E90 = 0x422E
+0x5E91 = 0x6250
+0x5E93 = 0x3F62
+0x5E94 = 0x5326
+0x5E95 = 0x3557
+0x5E96 = 0x6252
+0x5E97 = 0x356A
+0x5E99 = 0x436D
+0x5E9A = 0x387D
+0x5E9C = 0x382E
+0x5E9E = 0x4553
+0x5E9F = 0x374F
+0x5EA0 = 0x6254
+0x5EA5 = 0x6253
+0x5EA6 = 0x3648
+0x5EA7 = 0x5779
+0x5EAD = 0x4D25
+0x5EB3 = 0x6258
+0x5EB5 = 0x6256
+0x5EB6 = 0x4A7C
+0x5EB7 = 0x3F35
+0x5EB8 = 0x5339
+0x5EB9 = 0x6255
+0x5EBE = 0x6257
+0x5EC9 = 0x412E
+0x5ECA = 0x4048
+0x5ED1 = 0x625B
+0x5ED2 = 0x625A
+0x5ED3 = 0x402A
+0x5ED6 = 0x414E
+0x5EDB = 0x625C
+0x5EE8 = 0x625D
+0x5EEA = 0x625E
+0x5EF4 = 0x5B48
+0x5EF6 = 0x5153
+0x5EF7 = 0x4D22
+0x5EFA = 0x3D28
+0x5EFE = 0x5E43
+0x5EFF = 0x5825
+0x5F00 = 0x3F2A
+0x5F01 = 0x5B4D
+0x5F02 = 0x526C
+0x5F03 = 0x467A
+0x5F04 = 0x452A
+0x5F08 = 0x5E44
+0x5F0A = 0x3157
+0x5F0B = 0x5F2E
+0x5F0F = 0x4A3D
+0x5F11 = 0x5F31
+0x5F13 = 0x392D
+0x5F15 = 0x527D
+0x5F17 = 0x3825
+0x5F18 = 0x3A6B
+0x5F1B = 0x335A
+0x5F1F = 0x355C
+0x5F20 = 0x5545
+0x5F25 = 0x4356
+0x5F26 = 0x4F52
+0x5F27 = 0x3B21
+0x5F29 = 0x6573
+0x5F2A = 0x6572
+0x5F2D = 0x6574
+0x5F2F = 0x4D64
+0x5F31 = 0x4875
+0x5F39 = 0x352F
+0x5F3A = 0x473F
+0x5F3C = 0x6576
+0x5F40 = 0x6C30
+0x5F50 = 0x6566
+0x5F52 = 0x3969
+0x5F53 = 0x3531
+0x5F55 = 0x423C
+0x5F56 = 0x6568
+0x5F57 = 0x6567
+0x5F58 = 0x6569
+0x5F5D = 0x524D
+0x5F61 = 0x616A
+0x5F62 = 0x504E
+0x5F64 = 0x4D2E
+0x5F66 = 0x5165
+0x5F69 = 0x324A
+0x5F6A = 0x316B
+0x5F6C = 0x3172
+0x5F6D = 0x456D
+0x5F70 = 0x5543
+0x5F71 = 0x5330
+0x5F73 = 0x615C
+0x5F77 = 0x615D
+0x5F79 = 0x525B
+0x5F7B = 0x3339
+0x5F7C = 0x314B
+0x5F80 = 0x4D79
+0x5F81 = 0x5577
+0x5F82 = 0x615E
+0x5F84 = 0x3E36
+0x5F85 = 0x347D
+0x5F87 = 0x615F
+0x5F88 = 0x3A5C
+0x5F89 = 0x6160
+0x5F8A = 0x3B32
+0x5F8B = 0x4249
+0x5F8C = 0x6161
+0x5F90 = 0x506C
+0x5F92 = 0x4D3D
+0x5F95 = 0x6162
+0x5F97 = 0x3543
+0x5F98 = 0x4547
+0x5F99 = 0x6163
+0x5F9C = 0x6164
+0x5FA1 = 0x5379
+0x5FA8 = 0x6165
+0x5FAA = 0x512D
+0x5FAD = 0x6166
+0x5FAE = 0x4E22
+0x5FB5 = 0x6167
+0x5FB7 = 0x3542
+0x5FBC = 0x6168
+0x5FBD = 0x3B55
+0x5FC3 = 0x5044
+0x5FC4 = 0x6260
+0x5FC5 = 0x3158
+0x5FC6 = 0x5264
+0x5FC9 = 0x6261
+0x5FCC = 0x3C49
+0x5FCD = 0x484C
+0x5FCF = 0x6263
+0x5FD0 = 0x6C7E
+0x5FD1 = 0x6C7D
+0x5FD2 = 0x5F2F
+0x5FD6 = 0x6262
+0x5FD7 = 0x563E
+0x5FD8 = 0x4D7C
+0x5FD9 = 0x4326
+0x5FDD = 0x6343
+0x5FE0 = 0x5652
+0x5FE1 = 0x6267
+0x5FE4 = 0x6268
+0x5FE7 = 0x5347
+0x5FEA = 0x626C
+0x5FEB = 0x3F6C
+0x5FED = 0x626D
+0x5FEE = 0x6265
+0x5FF1 = 0x3340
+0x5FF5 = 0x446E
+0x5FF8 = 0x626E
+0x5FFB = 0x5043
+0x5FFD = 0x3A76
+0x5FFE = 0x6269
+0x5FFF = 0x375E
+0x6000 = 0x3B33
+0x6001 = 0x4C2C
+0x6002 = 0x4B4B
+0x6003 = 0x6264
+0x6004 = 0x6266
+0x6005 = 0x626A
+0x6006 = 0x626B
+0x600A = 0x6277
+0x600D = 0x6274
+0x600E = 0x5475
+0x600F = 0x6273
+0x6012 = 0x452D
+0x6014 = 0x557A
+0x6015 = 0x4542
+0x6016 = 0x3240
+0x6019 = 0x626F
+0x601B = 0x6272
+0x601C = 0x412F
+0x601D = 0x4B3C
+0x6020 = 0x3521
+0x6021 = 0x6279
+0x6025 = 0x3C31
+0x6026 = 0x6271
+0x6027 = 0x5054
+0x6028 = 0x5439
+0x6029 = 0x6275
+0x602A = 0x3956
+0x602B = 0x6276
+0x602F = 0x4753
+0x6035 = 0x6270
+0x603B = 0x575C
+0x603C = 0x6D21
+0x603F = 0x6278
+0x6041 = 0x6D25
+0x6042 = 0x627E
+0x6043 = 0x4A51
+0x604B = 0x4135
+0x604D = 0x3B50
+0x6050 = 0x3F56
+0x6052 = 0x3A63
+0x6055 = 0x4B21
+0x6059 = 0x6D26
+0x605A = 0x6D23
+0x605D = 0x6D22
+0x6062 = 0x3B56
+0x6063 = 0x6D27
+0x6064 = 0x5074
+0x6067 = 0x6D24
+0x6068 = 0x3A5E
+0x6069 = 0x3677
+0x606A = 0x6321
+0x606B = 0x3632
+0x606C = 0x4C71
+0x606D = 0x3927
+0x606F = 0x4F22
+0x6070 = 0x4721
+0x6073 = 0x3F52
+0x6076 = 0x3671
+0x6078 = 0x627A
+0x6079 = 0x627B
+0x607A = 0x627D
+0x607B = 0x627C
+0x607C = 0x4455
+0x607D = 0x6322
+0x607F = 0x5341
+0x6083 = 0x6327
+0x6084 = 0x4744
+0x6089 = 0x4F24
+0x608C = 0x6329
+0x608D = 0x3A37
+0x6092 = 0x6328
+0x6094 = 0x3B5A
+0x6096 = 0x6323
+0x609A = 0x6324
+0x609B = 0x632A
+0x609D = 0x6326
+0x609F = 0x4E72
+0x60A0 = 0x5346
+0x60A3 = 0x3B3C
+0x60A6 = 0x5443
+0x60A8 = 0x447A
+0x60AB = 0x6D28
+0x60AC = 0x507C
+0x60AD = 0x6325
+0x60AF = 0x4375
+0x60B1 = 0x632D
+0x60B2 = 0x312F
+0x60B4 = 0x6332
+0x60B8 = 0x3C42
+0x60BB = 0x632C
+0x60BC = 0x353F
+0x60C5 = 0x4769
+0x60C6 = 0x6330
+0x60CA = 0x3E2A
+0x60CB = 0x4D6F
+0x60D1 = 0x3B73
+0x60D5 = 0x4C68
+0x60D8 = 0x632F
+0x60DA = 0x6331
+0x60DC = 0x4F27
+0x60DD = 0x632E
+0x60DF = 0x4E29
+0x60E0 = 0x3B5D
+0x60E6 = 0x356B
+0x60E7 = 0x3E65
+0x60E8 = 0x3252
+0x60E9 = 0x334D
+0x60EB = 0x3139
+0x60EC = 0x632B
+0x60ED = 0x3251
+0x60EE = 0x352C
+0x60EF = 0x395F
+0x60F0 = 0x3668
+0x60F3 = 0x4F6B
+0x60F4 = 0x6337
+0x60F6 = 0x3B4C
+0x60F9 = 0x4847
+0x60FA = 0x504A
+0x6100 = 0x6338
+0x6101 = 0x336E
+0x6106 = 0x6D29
+0x6108 = 0x537A
+0x6109 = 0x5364
+0x610D = 0x6D2A
+0x610E = 0x6339
+0x610F = 0x5262
+0x6115 = 0x6335
+0x611A = 0x535E
+0x611F = 0x3850
+0x6120 = 0x6333
+0x6123 = 0x6336
+0x6124 = 0x375F
+0x6126 = 0x6334
+0x6127 = 0x4022
+0x612B = 0x633A
+0x613F = 0x5438
+0x6148 = 0x3448
+0x614A = 0x633B
+0x614C = 0x3B45
+0x614E = 0x4977
+0x6151 = 0x4965
+0x6155 = 0x443D
+0x615D = 0x6D2B
+0x6162 = 0x427D
+0x6167 = 0x3B5B
+0x6168 = 0x3F2E
+0x6170 = 0x4E3F
+0x6175 = 0x633C
+0x6177 = 0x3F36
+0x618B = 0x316F
+0x618E = 0x5477
+0x6194 = 0x633E
+0x619D = 0x6D2D
+0x61A7 = 0x633F
+0x61A8 = 0x3A29
+0x61A9 = 0x6D2C
+0x61AC = 0x633D
+0x61B7 = 0x6340
+0x61BE = 0x3A36
+0x61C2 = 0x362E
+0x61C8 = 0x5038
+0x61CA = 0x3043
+0x61CB = 0x6D2E
+0x61D1 = 0x6D2F
+0x61D2 = 0x4041
+0x61D4 = 0x6341
+0x61E6 = 0x4533
+0x61F5 = 0x6342
+0x61FF = 0x5C32
+0x6206 = 0x6D30
+0x6208 = 0x386A
+0x620A = 0x4E6C
+0x620B = 0x6A27
+0x620C = 0x5067
+0x620D = 0x4A79
+0x620E = 0x4856
+0x620F = 0x4F37
+0x6210 = 0x3349
+0x6211 = 0x4E52
+0x6212 = 0x3D64
+0x6215 = 0x635E
+0x6216 = 0x3B72
+0x6217 = 0x6A28
+0x6218 = 0x553D
+0x621A = 0x465D
+0x621B = 0x6A29
+0x621F = 0x6A2A
+0x6221 = 0x6A2C
+0x6222 = 0x6A2B
+0x6224 = 0x6A2E
+0x6225 = 0x6A2D
+0x622A = 0x3D58
+0x622C = 0x6A2F
+0x622E = 0x423E
+0x6233 = 0x3441
+0x6234 = 0x3477
+0x6237 = 0x3B27
+0x623D = 0x6C66
+0x623E = 0x6C65
+0x623F = 0x373F
+0x6240 = 0x4B79
+0x6241 = 0x3162
+0x6243 = 0x6C67
+0x6247 = 0x4948
+0x6248 = 0x6C68
+0x6249 = 0x6C69
+0x624B = 0x4A56
+0x624C = 0x5E50
+0x624D = 0x3245
+0x624E = 0x547A
+0x6251 = 0x464B
+0x6252 = 0x3047
+0x6253 = 0x3472
+0x6254 = 0x4853
+0x6258 = 0x4D50
+0x625B = 0x3F38
+0x6263 = 0x3F5B
+0x6266 = 0x4724
+0x6267 = 0x5634
+0x6269 = 0x4029
+0x626A = 0x5E51
+0x626B = 0x4928
+0x626C = 0x516F
+0x626D = 0x4524
+0x626E = 0x3067
+0x626F = 0x3336
+0x6270 = 0x4845
+0x6273 = 0x3062
+0x6276 = 0x3776
+0x6279 = 0x457A
+0x627C = 0x3673
+0x627E = 0x5552
+0x627F = 0x3350
+0x6280 = 0x3C3C
+0x6284 = 0x332D
+0x6289 = 0x3E71
+0x628A = 0x3051
+0x6291 = 0x5256
+0x6292 = 0x4A63
+0x6293 = 0x5725
+0x6295 = 0x4D36
+0x6296 = 0x3636
+0x6297 = 0x3F39
+0x6298 = 0x555B
+0x629A = 0x3827
+0x629B = 0x4557
+0x629F = 0x5E52
+0x62A0 = 0x3F59
+0x62A1 = 0x4255
+0x62A2 = 0x4740
+0x62A4 = 0x3B24
+0x62A5 = 0x3128
+0x62A8 = 0x456A
+0x62AB = 0x457B
+0x62AC = 0x4C27
+0x62B1 = 0x3127
+0x62B5 = 0x3556
+0x62B9 = 0x4428
+0x62BB = 0x5E53
+0x62BC = 0x513A
+0x62BD = 0x3369
+0x62BF = 0x4372
+0x62C2 = 0x3777
+0x62C4 = 0x5674
+0x62C5 = 0x3523
+0x62C6 = 0x3270
+0x62C7 = 0x4434
+0x62C8 = 0x4469
+0x62C9 = 0x402D
+0x62CA = 0x5E54
+0x62CC = 0x3068
+0x62CD = 0x4544
+0x62CE = 0x4160
+0x62D0 = 0x3955
+0x62D2 = 0x3E5C
+0x62D3 = 0x4D58
+0x62D4 = 0x304E
+0x62D6 = 0x4D4F
+0x62D7 = 0x5E56
+0x62D8 = 0x3E50
+0x62D9 = 0x573E
+0x62DA = 0x5E55
+0x62DB = 0x5550
+0x62DC = 0x305D
+0x62DF = 0x4462
+0x62E2 = 0x4223
+0x62E3 = 0x3C70
+0x62E5 = 0x5335
+0x62E6 = 0x4039
+0x62E7 = 0x4521
+0x62E8 = 0x3226
+0x62E9 = 0x5471
+0x62EC = 0x4028
+0x62ED = 0x4A43
+0x62EE = 0x5E57
+0x62EF = 0x557C
+0x62F1 = 0x3930
+0x62F3 = 0x482D
+0x62F4 = 0x4B29
+0x62F6 = 0x5E59
+0x62F7 = 0x3F3D
+0x62FC = 0x4634
+0x62FD = 0x5727
+0x62FE = 0x4A30
+0x62FF = 0x4443
+0x6301 = 0x3356
+0x6302 = 0x3952
+0x6307 = 0x5638
+0x6308 = 0x6A7C
+0x6309 = 0x3034
+0x630E = 0x3F66
+0x6311 = 0x4C74
+0x6316 = 0x4D5A
+0x631A = 0x563F
+0x631B = 0x424E
+0x631D = 0x4E4E
+0x631E = 0x4C22
+0x631F = 0x502E
+0x6320 = 0x4453
+0x6321 = 0x3532
+0x6322 = 0x5E58
+0x6323 = 0x5575
+0x6324 = 0x3C37
+0x6325 = 0x3B53
+0x6328 = 0x3024
+0x632A = 0x4532
+0x632B = 0x346C
+0x632F = 0x5571
+0x6332 = 0x6A7D
+0x6339 = 0x5E5A
+0x633A = 0x4D26
+0x633D = 0x4D6C
+0x6342 = 0x4E66
+0x6343 = 0x5E5C
+0x6345 = 0x4D31
+0x6346 = 0x4026
+0x6349 = 0x573D
+0x634B = 0x5E5B
+0x634C = 0x3046
+0x634D = 0x3A34
+0x634E = 0x4953
+0x634F = 0x4473
+0x6350 = 0x3E68
+0x6355 = 0x3236
+0x635E = 0x404C
+0x635F = 0x4B70
+0x6361 = 0x3C71
+0x6362 = 0x3B3B
+0x6363 = 0x3537
+0x6367 = 0x4575
+0x6369 = 0x5E66
+0x636D = 0x5E63
+0x636E = 0x3E5D
+0x6371 = 0x5E5F
+0x6376 = 0x3437
+0x6377 = 0x3D5D
+0x637A = 0x5E60
+0x637B = 0x446D
+0x6380 = 0x4F46
+0x6382 = 0x3560
+0x6387 = 0x365E
+0x6388 = 0x4A5A
+0x6389 = 0x3574
+0x638A = 0x5E65
+0x638C = 0x5546
+0x638E = 0x5E61
+0x638F = 0x4C4D
+0x6390 = 0x467E
+0x6392 = 0x4545
+0x6396 = 0x5234
+0x6398 = 0x3E72
+0x63A0 = 0x4253
+0x63A2 = 0x4C3D
+0x63A3 = 0x3338
+0x63A5 = 0x3D53
+0x63A7 = 0x3F58
+0x63A8 = 0x4D46
+0x63A9 = 0x515A
+0x63AA = 0x346B
+0x63AC = 0x5E64
+0x63AD = 0x5E5D
+0x63AE = 0x5E67
+0x63B0 = 0x6A7E
+0x63B3 = 0x4230
+0x63B4 = 0x5E62
+0x63B7 = 0x5640
+0x63B8 = 0x3527
+0x63BA = 0x3274
+0x63BC = 0x5E68
+0x63BE = 0x5E72
+0x63C4 = 0x5E6D
+0x63C6 = 0x5E71
+0x63C9 = 0x4860
+0x63CD = 0x5761
+0x63CE = 0x5E6F
+0x63CF = 0x4368
+0x63D0 = 0x4C61
+0x63D2 = 0x3265
+0x63D6 = 0x523E
+0x63DE = 0x5E6E
+0x63E0 = 0x5E6B
+0x63E1 = 0x4E55
+0x63E3 = 0x3427
+0x63E9 = 0x3F2B
+0x63EA = 0x3E3E
+0x63ED = 0x3D52
+0x63F2 = 0x5E69
+0x63F4 = 0x542E
+0x63F6 = 0x5E5E
+0x63F8 = 0x5E6A
+0x63FD = 0x403F
+0x63FF = 0x5E6C
+0x6400 = 0x3273
+0x6401 = 0x3869
+0x6402 = 0x4227
+0x6405 = 0x3D41
+0x640B = 0x5E75
+0x640C = 0x5E78
+0x640F = 0x322B
+0x6410 = 0x3424
+0x6413 = 0x346A
+0x6414 = 0x4926
+0x641B = 0x5E76
+0x641C = 0x4B51
+0x641E = 0x3863
+0x6420 = 0x5E77
+0x6421 = 0x5E7A
+0x6426 = 0x5E79
+0x642A = 0x4C42
+0x642C = 0x3061
+0x642D = 0x346E
+0x6434 = 0x653A
+0x643A = 0x502F
+0x643D = 0x326B
+0x643F = 0x6B21
+0x6441 = 0x5E74
+0x6444 = 0x4963
+0x6445 = 0x5E73
+0x6446 = 0x305A
+0x6447 = 0x5221
+0x6448 = 0x3177
+0x644A = 0x4C2F
+0x6452 = 0x5E70
+0x6454 = 0x4B24
+0x6458 = 0x552A
+0x645E = 0x5E7B
+0x6467 = 0x345D
+0x6469 = 0x4426
+0x646D = 0x5E7D
+0x6478 = 0x437E
+0x6479 = 0x4421
+0x647A = 0x5F21
+0x6482 = 0x414C
+0x6484 = 0x5E7C
+0x6485 = 0x3E6F
+0x6487 = 0x4632
+0x6491 = 0x3345
+0x6492 = 0x4876
+0x6495 = 0x4B3A
+0x6496 = 0x5E7E
+0x6499 = 0x5F24
+0x649E = 0x5732
+0x64A4 = 0x3337
+0x64A9 = 0x4143
+0x64AC = 0x474B
+0x64AD = 0x3225
+0x64AE = 0x3469
+0x64B0 = 0x572B
+0x64B5 = 0x446C
+0x64B7 = 0x5F22
+0x64B8 = 0x5F23
+0x64BA = 0x5F25
+0x64BC = 0x3A33
+0x64C0 = 0x5F26
+0x64C2 = 0x405E
+0x64C5 = 0x4943
+0x64CD = 0x3259
+0x64CE = 0x4766
+0x64D0 = 0x5F27
+0x64D2 = 0x475C
+0x64D7 = 0x5F28
+0x64D8 = 0x6B22
+0x64DE = 0x4B53
+0x64E2 = 0x5F2A
+0x64E4 = 0x5F29
+0x64E6 = 0x3241
+0x6500 = 0x454A
+0x6509 = 0x5F2B
+0x6512 = 0x545C
+0x6518 = 0x4841
+0x6525 = 0x5F2C
+0x652B = 0x3E70
+0x652E = 0x5F2D
+0x652F = 0x5627
+0x6534 = 0x6A37
+0x6535 = 0x6B36
+0x6536 = 0x4A55
+0x6538 = 0x587C
+0x6539 = 0x3844
+0x653B = 0x3925
+0x653E = 0x3745
+0x653F = 0x557E
+0x6545 = 0x394A
+0x6548 = 0x5027
+0x6549 = 0x744D
+0x654C = 0x3550
+0x654F = 0x4374
+0x6551 = 0x3E48
+0x6555 = 0x6B37
+0x6556 = 0x303D
+0x6559 = 0x3D4C
+0x655B = 0x4132
+0x655D = 0x3156
+0x655E = 0x3328
+0x6562 = 0x3852
+0x6563 = 0x4922
+0x6566 = 0x3658
+0x656B = 0x6B38
+0x656C = 0x3E34
+0x6570 = 0x4A7D
+0x6572 = 0x4743
+0x6574 = 0x557B
+0x6577 = 0x3773
+0x6587 = 0x4E44
+0x658B = 0x552B
+0x658C = 0x3173
+0x6590 = 0x6C33
+0x6591 = 0x305F
+0x6593 = 0x6C35
+0x6597 = 0x3637
+0x6599 = 0x414F
+0x659B = 0x757A
+0x659C = 0x5031
+0x659F = 0x5565
+0x65A1 = 0x4E53
+0x65A4 = 0x3D6F
+0x65A5 = 0x3362
+0x65A7 = 0x382B
+0x65A9 = 0x5536
+0x65AB = 0x6D3D
+0x65AD = 0x364F
+0x65AF = 0x4B39
+0x65B0 = 0x5042
+0x65B9 = 0x373D
+0x65BC = 0x6C36
+0x65BD = 0x4A29
+0x65C1 = 0x4554
+0x65C3 = 0x6C39
+0x65C4 = 0x6C38
+0x65C5 = 0x4243
+0x65C6 = 0x6C37
+0x65CB = 0x507D
+0x65CC = 0x6C3A
+0x65CE = 0x6C3B
+0x65CF = 0x5765
+0x65D2 = 0x6C3C
+0x65D6 = 0x6C3D
+0x65D7 = 0x466C
+0x65E0 = 0x4E5E
+0x65E2 = 0x3C48
+0x65E5 = 0x4855
+0x65E6 = 0x3529
+0x65E7 = 0x3E49
+0x65E8 = 0x563C
+0x65E9 = 0x5467
+0x65EC = 0x512E
+0x65ED = 0x5071
+0x65EE = 0x6A38
+0x65EF = 0x6A39
+0x65F0 = 0x6A3A
+0x65F1 = 0x3A35
+0x65F6 = 0x4A31
+0x65F7 = 0x3F75
+0x65FA = 0x4D7A
+0x6600 = 0x6A40
+0x6602 = 0x303A
+0x6603 = 0x6A3E
+0x6606 = 0x4025
+0x660A = 0x6A3B
+0x660C = 0x327D
+0x660E = 0x4377
+0x660F = 0x3B68
+0x6613 = 0x5257
+0x6614 = 0x4E74
+0x6615 = 0x6A3F
+0x6619 = 0x6A3C
+0x661D = 0x6A43
+0x661F = 0x5047
+0x6620 = 0x5333
+0x6625 = 0x343A
+0x6627 = 0x4341
+0x6628 = 0x5772
+0x662D = 0x5551
+0x662F = 0x4A47
+0x6631 = 0x6A45
+0x6634 = 0x6A44
+0x6635 = 0x6A47
+0x6636 = 0x6A46
+0x663C = 0x5667
+0x663E = 0x4F54
+0x6641 = 0x6A4B
+0x6643 = 0x3B4E
+0x664B = 0x3D7A
+0x664C = 0x494E
+0x664F = 0x6A4C
+0x6652 = 0x4939
+0x6653 = 0x4F7E
+0x6654 = 0x6A4A
+0x6655 = 0x544E
+0x6656 = 0x6A4D
+0x6657 = 0x6A4F
+0x665A = 0x4D6D
+0x665F = 0x6A49
+0x6661 = 0x6A4E
+0x6664 = 0x4E6E
+0x6666 = 0x3B5E
+0x6668 = 0x333F
+0x666E = 0x4655
+0x666F = 0x3E30
+0x6670 = 0x4E7A
+0x6674 = 0x4767
+0x6676 = 0x3E27
+0x6677 = 0x6A50
+0x667A = 0x5647
+0x667E = 0x4140
+0x6682 = 0x545D
+0x6684 = 0x6A51
+0x6687 = 0x4F3E
+0x668C = 0x6A52
+0x6691 = 0x4A6E
+0x6696 = 0x452F
+0x6697 = 0x3035
+0x669D = 0x6A54
+0x66A7 = 0x6A53
+0x66A8 = 0x745F
+0x66AE = 0x443A
+0x66B4 = 0x3129
+0x66B9 = 0x655F
+0x66BE = 0x6A55
+0x66D9 = 0x4A6F
+0x66DB = 0x6A56
+0x66DC = 0x6A57
+0x66DD = 0x4658
+0x66E6 = 0x6A58
+0x66E9 = 0x6A59
+0x66F0 = 0x543B
+0x66F2 = 0x477A
+0x66F3 = 0x5237
+0x66F4 = 0x387C
+0x66F7 = 0x6A42
+0x66F9 = 0x325C
+0x66FC = 0x427C
+0x66FE = 0x5478
+0x66FF = 0x4C66
+0x6700 = 0x576E
+0x6708 = 0x5442
+0x6709 = 0x5350
+0x670A = 0x6B43
+0x670B = 0x4573
+0x670D = 0x377E
+0x6710 = 0x6B54
+0x6714 = 0x4B37
+0x6715 = 0x6B5E
+0x6717 = 0x404A
+0x671B = 0x4D7B
+0x671D = 0x332F
+0x671F = 0x465A
+0x6726 = 0x6B7C
+0x6728 = 0x443E
+0x672A = 0x4E34
+0x672B = 0x4429
+0x672C = 0x313E
+0x672D = 0x547D
+0x672F = 0x4A75
+0x6731 = 0x566C
+0x6734 = 0x4653
+0x6735 = 0x3664
+0x673A = 0x3B7A
+0x673D = 0x5060
+0x6740 = 0x4931
+0x6742 = 0x5453
+0x6743 = 0x4828
+0x6746 = 0x384B
+0x6748 = 0x683E
+0x6749 = 0x493C
+0x674C = 0x683B
+0x674E = 0x406E
+0x674F = 0x5053
+0x6750 = 0x3244
+0x6751 = 0x3465
+0x6753 = 0x683C
+0x6756 = 0x5548
+0x675C = 0x3645
+0x675E = 0x683D
+0x675F = 0x4A78
+0x6760 = 0x385C
+0x6761 = 0x4C75
+0x6765 = 0x4034
+0x6768 = 0x516E
+0x6769 = 0x683F
+0x676A = 0x6842
+0x676D = 0x3A3C
+0x676F = 0x312D
+0x6770 = 0x3D5C
+0x6772 = 0x6A3D
+0x6773 = 0x6843
+0x6775 = 0x6846
+0x6777 = 0x684B
+0x677C = 0x684C
+0x677E = 0x4B49
+0x677F = 0x3065
+0x6781 = 0x3C2B
+0x6784 = 0x3939
+0x6787 = 0x6841
+0x6789 = 0x4D77
+0x678B = 0x684A
+0x6790 = 0x4E76
+0x6795 = 0x556D
+0x6797 = 0x4156
+0x6798 = 0x6844
+0x679A = 0x4336
+0x679C = 0x397B
+0x679D = 0x5626
+0x679E = 0x6848
+0x67A2 = 0x4A60
+0x67A3 = 0x5466
+0x67A5 = 0x6840
+0x67A7 = 0x6845
+0x67A8 = 0x6847
+0x67AA = 0x4739
+0x67AB = 0x3763
+0x67AD = 0x6849
+0x67AF = 0x3F5D
+0x67B0 = 0x6852
+0x67B3 = 0x6857
+0x67B5 = 0x6855
+0x67B6 = 0x3C5C
+0x67B7 = 0x3C4F
+0x67B8 = 0x685B
+0x67C1 = 0x685E
+0x67C3 = 0x685A
+0x67C4 = 0x317A
+0x67CF = 0x3058
+0x67D0 = 0x4433
+0x67D1 = 0x384C
+0x67D2 = 0x4662
+0x67D3 = 0x483E
+0x67D4 = 0x4861
+0x67D8 = 0x684F
+0x67D9 = 0x6854
+0x67DA = 0x6856
+0x67DC = 0x3971
+0x67DD = 0x6858
+0x67DE = 0x5775
+0x67E0 = 0x447B
+0x67E2 = 0x685C
+0x67E5 = 0x3269
+0x67E9 = 0x6851
+0x67EC = 0x3C6D
+0x67EF = 0x3F42
+0x67F0 = 0x684D
+0x67F1 = 0x5679
+0x67F3 = 0x4178
+0x67F4 = 0x3271
+0x67FD = 0x685F
+0x67FF = 0x4A41
+0x6800 = 0x6859
+0x6805 = 0x5524
+0x6807 = 0x316A
+0x6808 = 0x553B
+0x6809 = 0x684E
+0x680A = 0x6850
+0x680B = 0x3630
+0x680C = 0x6853
+0x680E = 0x685D
+0x680F = 0x4038
+0x6811 = 0x4A77
+0x6813 = 0x4B28
+0x6816 = 0x465C
+0x6817 = 0x4075
+0x681D = 0x6869
+0x6821 = 0x5023
+0x6829 = 0x6872
+0x682A = 0x566A
+0x6832 = 0x6860
+0x6833 = 0x6861
+0x6837 = 0x5179
+0x6838 = 0x3A4B
+0x6839 = 0x3879
+0x683C = 0x3871
+0x683D = 0x5454
+0x683E = 0x686F
+0x6840 = 0x686E
+0x6841 = 0x686C
+0x6842 = 0x3970
+0x6843 = 0x4C52
+0x6844 = 0x6866
+0x6845 = 0x4E26
+0x6846 = 0x3F72
+0x6848 = 0x3038
+0x6849 = 0x6871
+0x684A = 0x6870
+0x684C = 0x5740
+0x684E = 0x6864
+0x6850 = 0x4D29
+0x6851 = 0x4923
+0x6853 = 0x3B38
+0x6854 = 0x3D5B
+0x6855 = 0x686A
+0x6860 = 0x6862
+0x6861 = 0x6863
+0x6862 = 0x6865
+0x6863 = 0x3535
+0x6864 = 0x6867
+0x6865 = 0x4745
+0x6866 = 0x686B
+0x6867 = 0x686D
+0x6868 = 0x3D30
+0x6869 = 0x572E
+0x686B = 0x6878
+0x6874 = 0x6875
+0x6876 = 0x4D30
+0x6877 = 0x6876
+0x6881 = 0x413A
+0x6883 = 0x6868
+0x6885 = 0x4337
+0x6886 = 0x3070
+0x688F = 0x6874
+0x6893 = 0x6877
+0x6897 = 0x3923
+0x68A2 = 0x4952
+0x68A6 = 0x434E
+0x68A7 = 0x4E60
+0x68A8 = 0x4066
+0x68AD = 0x4B73
+0x68AF = 0x4C5D
+0x68B0 = 0x5035
+0x68B3 = 0x4A61
+0x68B5 = 0x6873
+0x68C0 = 0x3C6C
+0x68C2 = 0x6879
+0x68C9 = 0x435E
+0x68CB = 0x4665
+0x68CD = 0x3977
+0x68D2 = 0x3074
+0x68D5 = 0x5758
+0x68D8 = 0x3C2C
+0x68DA = 0x456F
+0x68E0 = 0x4C44
+0x68E3 = 0x6926
+0x68EE = 0x492D
+0x68F0 = 0x6922
+0x68F1 = 0x4062
+0x68F5 = 0x3F43
+0x68F9 = 0x687E
+0x68FA = 0x3957
+0x68FC = 0x687B
+0x6901 = 0x6924
+0x6905 = 0x524E
+0x690B = 0x6923
+0x690D = 0x5632
+0x690E = 0x5735
+0x6910 = 0x6927
+0x6912 = 0x3D37
+0x691F = 0x687C
+0x6920 = 0x687D
+0x6924 = 0x6921
+0x692D = 0x4D56
+0x6930 = 0x522C
+0x6934 = 0x6932
+0x6939 = 0x6929
+0x693D = 0x342A
+0x693F = 0x343B
+0x6942 = 0x692B
+0x6954 = 0x5028
+0x6957 = 0x6925
+0x695A = 0x337E
+0x695D = 0x692C
+0x695E = 0x4063
+0x6960 = 0x692A
+0x6963 = 0x6939
+0x6966 = 0x6938
+0x696B = 0x692E
+0x696E = 0x687A
+0x6971 = 0x6928
+0x6977 = 0x3F2C
+0x6978 = 0x6931
+0x6979 = 0x693A
+0x697C = 0x4225
+0x6980 = 0x692F
+0x6982 = 0x3845
+0x6984 = 0x692D
+0x6986 = 0x535C
+0x6987 = 0x6934
+0x6988 = 0x6935
+0x6989 = 0x6937
+0x698D = 0x6947
+0x6994 = 0x4046
+0x6995 = 0x6945
+0x6998 = 0x6930
+0x699B = 0x693B
+0x699C = 0x3071
+0x69A7 = 0x693C
+0x69A8 = 0x5525
+0x69AB = 0x693E
+0x69AD = 0x693F
+0x69B1 = 0x6941
+0x69B4 = 0x4171
+0x69B7 = 0x4836
+0x69BB = 0x693D
+0x69C1 = 0x6942
+0x69CA = 0x6943
+0x69CC = 0x6933
+0x69CE = 0x6936
+0x69D0 = 0x3B31
+0x69D4 = 0x6940
+0x69DB = 0x3C77
+0x69DF = 0x6944
+0x69E0 = 0x6946
+0x69ED = 0x694A
+0x69F2 = 0x694E
+0x69FD = 0x325B
+0x69FF = 0x6948
+0x6A0A = 0x372E
+0x6A17 = 0x694B
+0x6A18 = 0x694C
+0x6A1F = 0x5541
+0x6A21 = 0x4423
+0x6A28 = 0x6958
+0x6A2A = 0x3A61
+0x6A2F = 0x6949
+0x6A31 = 0x5323
+0x6A35 = 0x6954
+0x6A3D = 0x6957
+0x6A3E = 0x6950
+0x6A44 = 0x694F
+0x6A47 = 0x4741
+0x6A50 = 0x6952
+0x6A58 = 0x6959
+0x6A59 = 0x3348
+0x6A5B = 0x6953
+0x6A61 = 0x4F70
+0x6A65 = 0x694D
+0x6A71 = 0x3377
+0x6A79 = 0x6956
+0x6A7C = 0x695A
+0x6A80 = 0x4C34
+0x6A84 = 0x4F2D
+0x6A8E = 0x6955
+0x6A90 = 0x695C
+0x6A91 = 0x695B
+0x6A97 = 0x695E
+0x6AA0 = 0x6951
+0x6AA9 = 0x695D
+0x6AAB = 0x695F
+0x6AAC = 0x434A
+0x6B20 = 0x4737
+0x6B21 = 0x344E
+0x6B22 = 0x3B36
+0x6B23 = 0x5040
+0x6B24 = 0x6C23
+0x6B27 = 0x4537
+0x6B32 = 0x537B
+0x6B37 = 0x6C24
+0x6B39 = 0x6C25
+0x6B3A = 0x465B
+0x6B3E = 0x3F6E
+0x6B43 = 0x6C26
+0x6B46 = 0x6C27
+0x6B47 = 0x502A
+0x6B49 = 0x4738
+0x6B4C = 0x3868
+0x6B59 = 0x6C28
+0x6B62 = 0x5639
+0x6B63 = 0x557D
+0x6B64 = 0x344B
+0x6B65 = 0x323D
+0x6B66 = 0x4E64
+0x6B67 = 0x4667
+0x6B6A = 0x4D61
+0x6B79 = 0x3475
+0x6B7B = 0x4B40
+0x6B7C = 0x3C5F
+0x6B81 = 0x6962
+0x6B82 = 0x6963
+0x6B83 = 0x516A
+0x6B84 = 0x6965
+0x6B86 = 0x3479
+0x6B87 = 0x6964
+0x6B89 = 0x5133
+0x6B8A = 0x4A62
+0x6B8B = 0x3250
+0x6B8D = 0x6968
+0x6B92 = 0x6966
+0x6B93 = 0x6967
+0x6B96 = 0x5633
+0x6B9A = 0x6969
+0x6B9B = 0x696A
+0x6BA1 = 0x696B
+0x6BAA = 0x696C
+0x6BB3 = 0x6C2F
+0x6BB4 = 0x4539
+0x6BB5 = 0x364E
+0x6BB7 = 0x5273
+0x6BBF = 0x356E
+0x6BC1 = 0x3B59
+0x6BC2 = 0x6C31
+0x6BC5 = 0x5263
+0x6BCB = 0x4E63
+0x6BCD = 0x4438
+0x6BCF = 0x433F
+0x6BD2 = 0x363E
+0x6BD3 = 0x5839
+0x6BD4 = 0x3148
+0x6BD5 = 0x314F
+0x6BD6 = 0x3151
+0x6BD7 = 0x457E
+0x6BD9 = 0x3150
+0x6BDB = 0x432B
+0x6BE1 = 0x5531
+0x6BEA = 0x6B24
+0x6BEB = 0x3A41
+0x6BEF = 0x4C3A
+0x6BF3 = 0x6B25
+0x6BF5 = 0x6B27
+0x6BF9 = 0x6B28
+0x6BFD = 0x6B26
+0x6C05 = 0x6B29
+0x6C06 = 0x6B2B
+0x6C07 = 0x6B2A
+0x6C0D = 0x6B2C
+0x6C0F = 0x4A4F
+0x6C10 = 0x5835
+0x6C11 = 0x4371
+0x6C13 = 0x4325
+0x6C14 = 0x4678
+0x6C15 = 0x6B2D
+0x6C16 = 0x444A
+0x6C18 = 0x6B2E
+0x6C19 = 0x6B2F
+0x6C1A = 0x6B30
+0x6C1B = 0x3755
+0x6C1F = 0x377A
+0x6C21 = 0x6B31
+0x6C22 = 0x4762
+0x6C24 = 0x6B33
+0x6C26 = 0x3A24
+0x6C27 = 0x5175
+0x6C28 = 0x3031
+0x6C29 = 0x6B32
+0x6C2A = 0x6B34
+0x6C2E = 0x352A
+0x6C2F = 0x4248
+0x6C30 = 0x4768
+0x6C32 = 0x6B35
+0x6C34 = 0x4B2E
+0x6C35 = 0x635F
+0x6C38 = 0x5340
+0x6C3D = 0x595B
+0x6C40 = 0x4D21
+0x6C41 = 0x562D
+0x6C42 = 0x4773
+0x6C46 = 0x5960
+0x6C47 = 0x3B63
+0x6C49 = 0x3A3A
+0x6C4A = 0x6362
+0x6C50 = 0x4F2B
+0x6C54 = 0x6360
+0x6C55 = 0x4947
+0x6C57 = 0x3A39
+0x6C5B = 0x5134
+0x6C5C = 0x6361
+0x6C5D = 0x486A
+0x6C5E = 0x392F
+0x6C5F = 0x3D2D
+0x6C60 = 0x3358
+0x6C61 = 0x4E5B
+0x6C64 = 0x4C40
+0x6C68 = 0x6368
+0x6C69 = 0x6369
+0x6C6A = 0x4D74
+0x6C70 = 0x4C2D
+0x6C72 = 0x3C33
+0x6C74 = 0x636A
+0x6C76 = 0x636B
+0x6C79 = 0x505A
+0x6C7D = 0x467B
+0x6C7E = 0x375A
+0x6C81 = 0x475F
+0x6C82 = 0x524A
+0x6C83 = 0x4E56
+0x6C85 = 0x6364
+0x6C86 = 0x636C
+0x6C88 = 0x4972
+0x6C89 = 0x3341
+0x6C8C = 0x6367
+0x6C8F = 0x4663
+0x6C90 = 0x6365
+0x6C93 = 0x6D33
+0x6C94 = 0x6366
+0x6C99 = 0x4933
+0x6C9B = 0x4566
+0x6C9F = 0x3935
+0x6CA1 = 0x433B
+0x6CA3 = 0x6363
+0x6CA4 = 0x453D
+0x6CA5 = 0x4124
+0x6CA6 = 0x4259
+0x6CA7 = 0x3257
+0x6CA9 = 0x636D
+0x6CAA = 0x3B26
+0x6CAB = 0x442D
+0x6CAD = 0x6370
+0x6CAE = 0x3E5A
+0x6CB1 = 0x637B
+0x6CB2 = 0x6375
+0x6CB3 = 0x3A53
+0x6CB8 = 0x3750
+0x6CB9 = 0x534D
+0x6CBB = 0x564E
+0x6CBC = 0x5553
+0x6CBD = 0x3941
+0x6CBE = 0x5534
+0x6CBF = 0x5158
+0x6CC4 = 0x5039
+0x6CC5 = 0x4776
+0x6CC9 = 0x482A
+0x6CCA = 0x3234
+0x6CCC = 0x435A
+0x6CD0 = 0x636E
+0x6CD3 = 0x637C
+0x6CD4 = 0x636F
+0x6CD5 = 0x3728
+0x6CD6 = 0x6377
+0x6CD7 = 0x6374
+0x6CDB = 0x373A
+0x6CDE = 0x4522
+0x6CE0 = 0x6376
+0x6CE1 = 0x455D
+0x6CE2 = 0x3228
+0x6CE3 = 0x467C
+0x6CE5 = 0x4460
+0x6CE8 = 0x5722
+0x6CEA = 0x4061
+0x6CEB = 0x6379
+0x6CEE = 0x637A
+0x6CEF = 0x637D
+0x6CF0 = 0x4C29
+0x6CF1 = 0x6373
+0x6CF3 = 0x533E
+0x6CF5 = 0x3143
+0x6CF6 = 0x6D34
+0x6CF7 = 0x6371
+0x6CF8 = 0x6372
+0x6CFA = 0x6378
+0x6CFB = 0x503A
+0x6CFC = 0x4643
+0x6CFD = 0x5473
+0x6CFE = 0x637E
+0x6D01 = 0x3D60
+0x6D04 = 0x6427
+0x6D07 = 0x6426
+0x6D0B = 0x5173
+0x6D0C = 0x6423
+0x6D0E = 0x6429
+0x6D12 = 0x4877
+0x6D17 = 0x4F34
+0x6D19 = 0x6428
+0x6D1A = 0x642E
+0x6D1B = 0x4265
+0x6D1E = 0x3634
+0x6D25 = 0x3D72
+0x6D27 = 0x6422
+0x6D2A = 0x3A69
+0x6D2B = 0x642A
+0x6D2E = 0x642C
+0x6D31 = 0x367D
+0x6D32 = 0x565E
+0x6D33 = 0x6432
+0x6D35 = 0x642D
+0x6D39 = 0x6421
+0x6D3B = 0x3B6E
+0x6D3C = 0x4D5D
+0x6D3D = 0x4722
+0x6D3E = 0x4549
+0x6D41 = 0x4177
+0x6D43 = 0x6424
+0x6D45 = 0x4733
+0x6D46 = 0x3D2C
+0x6D47 = 0x3D3D
+0x6D48 = 0x6425
+0x6D4A = 0x5747
+0x6D4B = 0x3262
+0x6D4D = 0x642B
+0x6D4E = 0x3C43
+0x6D4F = 0x642F
+0x6D51 = 0x3B6B
+0x6D52 = 0x6430
+0x6D53 = 0x4528
+0x6D54 = 0x6431
+0x6D59 = 0x5563
+0x6D5A = 0x3F23
+0x6D5C = 0x643A
+0x6D5E = 0x6437
+0x6D60 = 0x643B
+0x6D63 = 0x643D
+0x6D66 = 0x4656
+0x6D69 = 0x3A46
+0x6D6A = 0x404B
+0x6D6E = 0x3821
+0x6D6F = 0x6434
+0x6D74 = 0x5421
+0x6D77 = 0x3A23
+0x6D78 = 0x3D7E
+0x6D7C = 0x643C
+0x6D82 = 0x4D3F
+0x6D85 = 0x4479
+0x6D88 = 0x4F7B
+0x6D89 = 0x4966
+0x6D8C = 0x533F
+0x6D8E = 0x4F51
+0x6D91 = 0x6433
+0x6D93 = 0x6438
+0x6D94 = 0x6439
+0x6D95 = 0x4C69
+0x6D9B = 0x4C4E
+0x6D9D = 0x4054
+0x6D9E = 0x6435
+0x6D9F = 0x4130
+0x6DA0 = 0x6436
+0x6DA1 = 0x4E50
+0x6DA3 = 0x3B41
+0x6DA4 = 0x3553
+0x6DA6 = 0x4873
+0x6DA7 = 0x3D27
+0x6DA8 = 0x5547
+0x6DA9 = 0x492C
+0x6DAA = 0x3822
+0x6DAB = 0x644A
+0x6DAE = 0x644C
+0x6DAF = 0x5144
+0x6DB2 = 0x523A
+0x6DB5 = 0x3A2D
+0x6DB8 = 0x3A54
+0x6DBF = 0x6443
+0x6DC0 = 0x356D
+0x6DC4 = 0x574D
+0x6DC5 = 0x6440
+0x6DC6 = 0x4F7D
+0x6DC7 = 0x643F
+0x6DCB = 0x415C
+0x6DCC = 0x4C4A
+0x6DD1 = 0x4A67
+0x6DD6 = 0x4457
+0x6DD8 = 0x4C54
+0x6DD9 = 0x6448
+0x6DDD = 0x6447
+0x6DDE = 0x6441
+0x6DE0 = 0x6444
+0x6DE1 = 0x352D
+0x6DE4 = 0x5359
+0x6DE6 = 0x6446
+0x6DEB = 0x5279
+0x6DEC = 0x3463
+0x6DEE = 0x3B34
+0x6DF1 = 0x496E
+0x6DF3 = 0x343E
+0x6DF7 = 0x3B6C
+0x6DF9 = 0x514D
+0x6DFB = 0x4C6D
+0x6DFC = 0x6D35
+0x6E05 = 0x4765
+0x6E0A = 0x5428
+0x6E0C = 0x644B
+0x6E0D = 0x5755
+0x6E0E = 0x6442
+0x6E10 = 0x3D25
+0x6E11 = 0x6445
+0x6E14 = 0x5366
+0x6E16 = 0x6449
+0x6E17 = 0x4978
+0x6E1A = 0x643E
+0x6E1D = 0x5365
+0x6E20 = 0x477E
+0x6E21 = 0x3649
+0x6E23 = 0x547C
+0x6E24 = 0x3233
+0x6E25 = 0x6457
+0x6E29 = 0x4E42
+0x6E2B = 0x644D
+0x6E2D = 0x4E3C
+0x6E2F = 0x385B
+0x6E32 = 0x6456
+0x6E34 = 0x3F4A
+0x6E38 = 0x534E
+0x6E3A = 0x436C
+0x6E43 = 0x4548
+0x6E44 = 0x6458
+0x6E4D = 0x4D44
+0x6E4E = 0x644F
+0x6E53 = 0x6454
+0x6E54 = 0x6455
+0x6E56 = 0x3A7E
+0x6E58 = 0x4F66
+0x6E5B = 0x553F
+0x6E5F = 0x6452
+0x6E6B = 0x6450
+0x6E6E = 0x644E
+0x6E7E = 0x4D65
+0x6E7F = 0x4A2A
+0x6E83 = 0x4023
+0x6E85 = 0x3D26
+0x6E86 = 0x6453
+0x6E89 = 0x3848
+0x6E8F = 0x6467
+0x6E90 = 0x5434
+0x6E98 = 0x645B
+0x6E9C = 0x416F
+0x6E9F = 0x6469
+0x6EA2 = 0x5267
+0x6EA5 = 0x645F
+0x6EA7 = 0x6460
+0x6EAA = 0x4F2A
+0x6EAF = 0x4B5D
+0x6EB1 = 0x645A
+0x6EB2 = 0x6451
+0x6EB4 = 0x6465
+0x6EB6 = 0x485C
+0x6EB7 = 0x6463
+0x6EBA = 0x4467
+0x6EBB = 0x6462
+0x6EBD = 0x6461
+0x6EC1 = 0x337C
+0x6EC2 = 0x6468
+0x6EC7 = 0x3561
+0x6ECB = 0x574C
+0x6ECF = 0x6466
+0x6ED1 = 0x3B2C
+0x6ED3 = 0x5752
+0x6ED4 = 0x4C4F
+0x6ED5 = 0x6B78
+0x6ED7 = 0x6464
+0x6EDA = 0x3976
+0x6EDE = 0x564D
+0x6EDF = 0x6459
+0x6EE0 = 0x645C
+0x6EE1 = 0x427A
+0x6EE2 = 0x645E
+0x6EE4 = 0x424B
+0x6EE5 = 0x4044
+0x6EE6 = 0x4250
+0x6EE8 = 0x3175
+0x6EE9 = 0x4C32
+0x6EF4 = 0x354E
+0x6EF9 = 0x646F
+0x6F02 = 0x462F
+0x6F06 = 0x4661
+0x6F09 = 0x6475
+0x6F0F = 0x4229
+0x6F13 = 0x406C
+0x6F14 = 0x515D
+0x6F15 = 0x646E
+0x6F20 = 0x442E
+0x6F24 = 0x646D
+0x6F29 = 0x6476
+0x6F2A = 0x6474
+0x6F2B = 0x427E
+0x6F2D = 0x645D
+0x6F2F = 0x6470
+0x6F31 = 0x4A7E
+0x6F33 = 0x5544
+0x6F36 = 0x6471
+0x6F3E = 0x517A
+0x6F46 = 0x646B
+0x6F47 = 0x646C
+0x6F4B = 0x6472
+0x6F4D = 0x4E2B
+0x6F58 = 0x454B
+0x6F5C = 0x4731
+0x6F5E = 0x423A
+0x6F62 = 0x646A
+0x6F66 = 0x414A
+0x6F6D = 0x4C36
+0x6F6E = 0x3331
+0x6F72 = 0x647B
+0x6F74 = 0x6473
+0x6F78 = 0x647A
+0x6F7A = 0x647D
+0x6F7C = 0x647C
+0x6F84 = 0x334E
+0x6F88 = 0x333A
+0x6F89 = 0x6477
+0x6F8C = 0x6479
+0x6F8D = 0x6478
+0x6F8E = 0x456C
+0x6F9C = 0x403D
+0x6FA1 = 0x5468
+0x6FA7 = 0x6522
+0x6FB3 = 0x3044
+0x6FB6 = 0x6524
+0x6FB9 = 0x6523
+0x6FC0 = 0x3C24
+0x6FC2 = 0x6525
+0x6FC9 = 0x6521
+0x6FD1 = 0x647E
+0x6FD2 = 0x3174
+0x6FDE = 0x6528
+0x6FE0 = 0x6529
+0x6FE1 = 0x6526
+0x6FEE = 0x6527
+0x6FEF = 0x652A
+0x7011 = 0x4659
+0x701A = 0x652B
+0x701B = 0x652D
+0x7023 = 0x652C
+0x7035 = 0x652F
+0x7039 = 0x652E
+0x704C = 0x3960
+0x704F = 0x6530
+0x705E = 0x6531
+0x706B = 0x3B70
+0x706C = 0x6C61
+0x706D = 0x4370
+0x706F = 0x3546
+0x7070 = 0x3B52
+0x7075 = 0x4169
+0x7076 = 0x546E
+0x7078 = 0x3E44
+0x707C = 0x5746
+0x707E = 0x5456
+0x707F = 0x3253
+0x7080 = 0x6C3E
+0x7085 = 0x6A41
+0x7089 = 0x422F
+0x708A = 0x3436
+0x708E = 0x5157
+0x7092 = 0x3334
+0x7094 = 0x4832
+0x7095 = 0x3F3B
+0x7096 = 0x6C40
+0x7099 = 0x564B
+0x709C = 0x6C3F
+0x709D = 0x6C41
+0x70AB = 0x6C45
+0x70AC = 0x3E66
+0x70AD = 0x4C3F
+0x70AE = 0x455A
+0x70AF = 0x3E3C
+0x70B1 = 0x6C46
+0x70B3 = 0x317E
+0x70B7 = 0x6C44
+0x70B8 = 0x5528
+0x70B9 = 0x3563
+0x70BB = 0x6C42
+0x70BC = 0x4136
+0x70BD = 0x3363
+0x70C0 = 0x6C43
+0x70C1 = 0x4B38
+0x70C2 = 0x4043
+0x70C3 = 0x4C7E
+0x70C8 = 0x4152
+0x70CA = 0x6C48
+0x70D8 = 0x3A66
+0x70D9 = 0x4053
+0x70DB = 0x5672
+0x70DF = 0x514C
+0x70E4 = 0x3F3E
+0x70E6 = 0x3733
+0x70E7 = 0x4955
+0x70E8 = 0x6C47
+0x70E9 = 0x3B62
+0x70EB = 0x4C4C
+0x70EC = 0x3D7D
+0x70ED = 0x4848
+0x70EF = 0x4F29
+0x70F7 = 0x4D69
+0x70F9 = 0x456B
+0x70FD = 0x3769
+0x7109 = 0x5149
+0x710A = 0x3A38
+0x7110 = 0x6C49
+0x7113 = 0x6C4A
+0x7115 = 0x3B40
+0x7116 = 0x6C4B
+0x7118 = 0x6C62
+0x7119 = 0x313A
+0x711A = 0x3759
+0x7126 = 0x3D39
+0x712F = 0x6C4C
+0x7130 = 0x5166
+0x7131 = 0x6C4D
+0x7136 = 0x483B
+0x7145 = 0x6C51
+0x714A = 0x6C53
+0x714C = 0x3B4D
+0x714E = 0x3C65
+0x715C = 0x6C4F
+0x715E = 0x4937
+0x7164 = 0x433A
+0x7166 = 0x6C63
+0x7167 = 0x5555
+0x7168 = 0x6C50
+0x716E = 0x5673
+0x7172 = 0x6C52
+0x7173 = 0x6C4E
+0x7178 = 0x6C54
+0x717A = 0x6C55
+0x717D = 0x493F
+0x7184 = 0x4F28
+0x718A = 0x505C
+0x718F = 0x512C
+0x7194 = 0x485B
+0x7198 = 0x6C56
+0x7199 = 0x4E75
+0x719F = 0x4A6C
+0x71A0 = 0x6C5A
+0x71A8 = 0x6C59
+0x71AC = 0x303E
+0x71B3 = 0x6C57
+0x71B5 = 0x6C58
+0x71B9 = 0x6C64
+0x71C3 = 0x483C
+0x71CE = 0x4147
+0x71D4 = 0x6C5C
+0x71D5 = 0x5160
+0x71E0 = 0x6C5B
+0x71E5 = 0x546F
+0x71E7 = 0x6C5D
+0x71EE = 0x5B46
+0x71F9 = 0x6C5E
+0x7206 = 0x312C
+0x721D = 0x6C5F
+0x7228 = 0x6C60
+0x722A = 0x5726
+0x722C = 0x4540
+0x7230 = 0x6B3C
+0x7231 = 0x302E
+0x7235 = 0x3E74
+0x7236 = 0x3838
+0x7237 = 0x522F
+0x7238 = 0x3056
+0x7239 = 0x3579
+0x723B = 0x5833
+0x723D = 0x4B2C
+0x723F = 0x635D
+0x7247 = 0x462C
+0x7248 = 0x3066
+0x724C = 0x4546
+0x724D = 0x6B39
+0x7252 = 0x6B3A
+0x7256 = 0x6B3B
+0x7259 = 0x5140
+0x725B = 0x4523
+0x725D = 0x6A72
+0x725F = 0x4432
+0x7261 = 0x4435
+0x7262 = 0x404E
+0x7266 = 0x6A73
+0x7267 = 0x4441
+0x7269 = 0x4E6F
+0x726E = 0x6A70
+0x726F = 0x6A74
+0x7272 = 0x497C
+0x7275 = 0x4723
+0x7279 = 0x4C58
+0x727A = 0x4E7E
+0x727E = 0x6A75
+0x727F = 0x6A76
+0x7280 = 0x4F2C
+0x7281 = 0x4067
+0x7284 = 0x6A77
+0x728A = 0x363F
+0x728B = 0x6A78
+0x728D = 0x6A79
+0x728F = 0x6A7A
+0x7292 = 0x6A7B
+0x729F = 0x6A71
+0x72AC = 0x482E
+0x72AD = 0x616B
+0x72AF = 0x3738
+0x72B0 = 0x616C
+0x72B4 = 0x616D
+0x72B6 = 0x5734
+0x72B7 = 0x616E
+0x72B8 = 0x616F
+0x72B9 = 0x534C
+0x72C1 = 0x6171
+0x72C2 = 0x3F71
+0x72C3 = 0x6170
+0x72C4 = 0x3552
+0x72C8 = 0x3137
+0x72CD = 0x6173
+0x72CE = 0x6172
+0x72D0 = 0x3A7C
+0x72D2 = 0x6174
+0x72D7 = 0x3937
+0x72D9 = 0x3E51
+0x72DE = 0x447C
+0x72E0 = 0x3A5D
+0x72E1 = 0x3D46
+0x72E8 = 0x6175
+0x72E9 = 0x6177
+0x72EC = 0x3640
+0x72ED = 0x4F41
+0x72EE = 0x4A28
+0x72EF = 0x6176
+0x72F0 = 0x5578
+0x72F1 = 0x537C
+0x72F2 = 0x6178
+0x72F3 = 0x617C
+0x72F4 = 0x6179
+0x72F7 = 0x617A
+0x72F8 = 0x406A
+0x72FA = 0x617E
+0x72FB = 0x6221
+0x72FC = 0x4047
+0x7301 = 0x617B
+0x7303 = 0x617D
+0x730A = 0x6225
+0x730E = 0x4154
+0x7313 = 0x6223
+0x7315 = 0x6228
+0x7316 = 0x327E
+0x7317 = 0x6222
+0x731B = 0x434D
+0x731C = 0x3242
+0x731D = 0x6227
+0x731E = 0x6226
+0x7321 = 0x6224
+0x7322 = 0x6229
+0x7325 = 0x622B
+0x7329 = 0x5049
+0x732A = 0x566D
+0x732B = 0x4328
+0x732C = 0x622C
+0x732E = 0x4F57
+0x7331 = 0x622E
+0x7334 = 0x3A6F
+0x7337 = 0x6960
+0x7338 = 0x622D
+0x7339 = 0x622A
+0x733E = 0x3B2B
+0x733F = 0x5433
+0x734D = 0x6230
+0x7350 = 0x622F
+0x7352 = 0x6961
+0x7357 = 0x6231
+0x7360 = 0x6232
+0x736C = 0x6233
+0x736D = 0x4C21
+0x736F = 0x6234
+0x737E = 0x6235
+0x7384 = 0x507E
+0x7387 = 0x424A
+0x7389 = 0x5371
+0x738B = 0x4D75
+0x738E = 0x6760
+0x7391 = 0x6761
+0x7396 = 0x3E41
+0x739B = 0x426A
+0x739F = 0x6764
+0x73A2 = 0x6763
+0x73A9 = 0x4D66
+0x73AB = 0x4335
+0x73AE = 0x6762
+0x73AF = 0x3B37
+0x73B0 = 0x4F56
+0x73B2 = 0x4161
+0x73B3 = 0x6769
+0x73B7 = 0x6768
+0x73BA = 0x6774
+0x73BB = 0x3223
+0x73C0 = 0x676A
+0x73C2 = 0x6766
+0x73C8 = 0x676C
+0x73C9 = 0x676B
+0x73CA = 0x493A
+0x73CD = 0x5564
+0x73CF = 0x6765
+0x73D0 = 0x3729
+0x73D1 = 0x6767
+0x73D9 = 0x676E
+0x73DE = 0x6773
+0x73E0 = 0x5669
+0x73E5 = 0x676D
+0x73E7 = 0x6772
+0x73E9 = 0x6771
+0x73ED = 0x3060
+0x73F2 = 0x6775
+0x7403 = 0x4772
+0x7405 = 0x4045
+0x7406 = 0x406D
+0x7409 = 0x4170
+0x740A = 0x6770
+0x740F = 0x6776
+0x7410 = 0x4B76
+0x741A = 0x6822
+0x741B = 0x6821
+0x7422 = 0x5741
+0x7425 = 0x677A
+0x7426 = 0x6779
+0x7428 = 0x677B
+0x742A = 0x6777
+0x742C = 0x677E
+0x742E = 0x677D
+0x7430 = 0x677C
+0x7433 = 0x4155
+0x7434 = 0x4759
+0x7435 = 0x457D
+0x7436 = 0x4543
+0x743C = 0x476D
+0x7441 = 0x6823
+0x7455 = 0x6826
+0x7457 = 0x6825
+0x7459 = 0x6827
+0x745A = 0x3A77
+0x745B = 0x6778
+0x745C = 0x6824
+0x745E = 0x4870
+0x745F = 0x492A
+0x746D = 0x6829
+0x7470 = 0x3965
+0x7476 = 0x517E
+0x7477 = 0x6828
+0x747E = 0x682A
+0x7480 = 0x682D
+0x7481 = 0x682E
+0x7483 = 0x4127
+0x7487 = 0x682F
+0x748B = 0x6830
+0x748E = 0x682C
+0x7490 = 0x6834
+0x749C = 0x682B
+0x749E = 0x6831
+0x74A7 = 0x6835
+0x74A8 = 0x6832
+0x74A9 = 0x6833
+0x74BA = 0x6837
+0x74D2 = 0x6836
+0x74DC = 0x394F
+0x74DE = 0x702C
+0x74E0 = 0x702D
+0x74E2 = 0x4630
+0x74E3 = 0x306A
+0x74E4 = 0x483F
+0x74E6 = 0x4D5F
+0x74EE = 0x4E4D
+0x74EF = 0x6A31
+0x74F4 = 0x6A32
+0x74F6 = 0x463F
+0x74F7 = 0x3449
+0x74FF = 0x6A33
+0x7504 = 0x5567
+0x750D = 0x5D79
+0x750F = 0x6A34
+0x7511 = 0x6A35
+0x7513 = 0x6A36
+0x7518 = 0x384A
+0x7519 = 0x5F30
+0x751A = 0x4975
+0x751C = 0x4C70
+0x751F = 0x497A
+0x7525 = 0x497B
+0x7528 = 0x5343
+0x7529 = 0x4B26
+0x752B = 0x3826
+0x752C = 0x702E
+0x752D = 0x3142
+0x752F = 0x6538
+0x7530 = 0x4C6F
+0x7531 = 0x5349
+0x7532 = 0x3C57
+0x7533 = 0x496A
+0x7535 = 0x3567
+0x7537 = 0x4450
+0x7538 = 0x3569
+0x753A = 0x6E2E
+0x753B = 0x3B2D
+0x753E = 0x675E
+0x7540 = 0x6E2F
+0x7545 = 0x3329
+0x7548 = 0x6E32
+0x754B = 0x6E31
+0x754C = 0x3D67
+0x754E = 0x6E30
+0x754F = 0x4E37
+0x7554 = 0x454F
+0x7559 = 0x4174
+0x755A = 0x5B4E
+0x755B = 0x6E33
+0x755C = 0x5073
+0x7565 = 0x4254
+0x7566 = 0x4668
+0x756A = 0x372C
+0x7572 = 0x6E34
+0x7574 = 0x336B
+0x7578 = 0x3B7B
+0x7579 = 0x6E35
+0x757F = 0x675C
+0x7583 = 0x6E36
+0x7586 = 0x3D2E
+0x758B = 0x7162
+0x758F = 0x4A68
+0x7591 = 0x5249
+0x7592 = 0x705A
+0x7594 = 0x705B
+0x7596 = 0x705C
+0x7597 = 0x4146
+0x7599 = 0x386D
+0x759A = 0x3E4E
+0x759D = 0x705E
+0x759F = 0x4531
+0x75A0 = 0x705D
+0x75A1 = 0x5171
+0x75A3 = 0x7060
+0x75A4 = 0x304C
+0x75A5 = 0x3D6A
+0x75AB = 0x525F
+0x75AC = 0x705F
+0x75AE = 0x342F
+0x75AF = 0x3768
+0x75B0 = 0x7066
+0x75B1 = 0x7065
+0x75B2 = 0x4623
+0x75B3 = 0x7061
+0x75B4 = 0x7062
+0x75B5 = 0x3443
+0x75B8 = 0x7063
+0x75B9 = 0x556E
+0x75BC = 0x4C5B
+0x75BD = 0x3E52
+0x75BE = 0x3C32
+0x75C2 = 0x7068
+0x75C3 = 0x7067
+0x75C4 = 0x7064
+0x75C5 = 0x3221
+0x75C7 = 0x5622
+0x75C8 = 0x5338
+0x75C9 = 0x3E37
+0x75CA = 0x482C
+0x75CD = 0x706A
+0x75D2 = 0x5177
+0x75D4 = 0x564C
+0x75D5 = 0x3A5B
+0x75D6 = 0x7069
+0x75D8 = 0x363B
+0x75DB = 0x4D34
+0x75DE = 0x4626
+0x75E2 = 0x4121
+0x75E3 = 0x706B
+0x75E4 = 0x706E
+0x75E6 = 0x706D
+0x75E7 = 0x7070
+0x75E8 = 0x706C
+0x75EA = 0x3B3E
+0x75EB = 0x706F
+0x75F0 = 0x4C35
+0x75F1 = 0x7072
+0x75F4 = 0x3355
+0x75F9 = 0x3154
+0x75FC = 0x7073
+0x75FF = 0x7074
+0x7600 = 0x7076
+0x7601 = 0x3461
+0x7603 = 0x7071
+0x7605 = 0x7077
+0x760A = 0x707A
+0x760C = 0x7078
+0x7610 = 0x7075
+0x7615 = 0x707D
+0x7617 = 0x7079
+0x7618 = 0x707C
+0x7619 = 0x707E
+0x761B = 0x7121
+0x761F = 0x4E41
+0x7620 = 0x7124
+0x7622 = 0x7123
+0x7624 = 0x4176
+0x7625 = 0x707B
+0x7626 = 0x4A5D
+0x7629 = 0x3471
+0x762A = 0x3171
+0x762B = 0x4C31
+0x762D = 0x7126
+0x7630 = 0x7127
+0x7633 = 0x712C
+0x7634 = 0x554E
+0x7635 = 0x7129
+0x7638 = 0x4833
+0x763C = 0x7122
+0x763E = 0x712B
+0x763F = 0x7128
+0x7640 = 0x7125
+0x7643 = 0x712A
+0x764C = 0x3029
+0x764D = 0x712D
+0x7654 = 0x712F
+0x7656 = 0x7131
+0x765C = 0x7130
+0x765E = 0x712E
+0x7663 = 0x5122
+0x766B = 0x7132
+0x766F = 0x7133
+0x7678 = 0x396F
+0x767B = 0x3547
+0x767D = 0x3057
+0x767E = 0x3059
+0x7682 = 0x546D
+0x7684 = 0x3544
+0x7686 = 0x3D54
+0x7687 = 0x3B4A
+0x7688 = 0x7027
+0x768B = 0x385E
+0x768E = 0x7028
+0x7691 = 0x3028
+0x7693 = 0x7029
+0x7696 = 0x4D6E
+0x7699 = 0x702A
+0x76A4 = 0x702B
+0x76AE = 0x4624
+0x76B1 = 0x5665
+0x76B2 = 0x7164
+0x76B4 = 0x7165
+0x76BF = 0x4373
+0x76C2 = 0x535B
+0x76C5 = 0x5651
+0x76C6 = 0x4568
+0x76C8 = 0x532F
+0x76CA = 0x5266
+0x76CD = 0x6E41
+0x76CE = 0x303B
+0x76CF = 0x5535
+0x76D0 = 0x514E
+0x76D1 = 0x3C60
+0x76D2 = 0x3A50
+0x76D4 = 0x3F78
+0x76D6 = 0x3847
+0x76D7 = 0x3541
+0x76D8 = 0x454C
+0x76DB = 0x4A22
+0x76DF = 0x434B
+0x76E5 = 0x6E42
+0x76EE = 0x443F
+0x76EF = 0x3622
+0x76F1 = 0x6D6C
+0x76F2 = 0x4324
+0x76F4 = 0x5631
+0x76F8 = 0x4F60
+0x76F9 = 0x6D6F
+0x76FC = 0x454E
+0x76FE = 0x365C
+0x7701 = 0x4A21
+0x7704 = 0x6D6D
+0x7707 = 0x6D70
+0x7708 = 0x6D71
+0x7709 = 0x433C
+0x770B = 0x3F34
+0x770D = 0x6D6E
+0x7719 = 0x6D74
+0x771A = 0x6D72
+0x771F = 0x5566
+0x7720 = 0x435F
+0x7722 = 0x6D73
+0x7726 = 0x6D76
+0x7728 = 0x5523
+0x7729 = 0x5123
+0x772D = 0x6D75
+0x772F = 0x4350
+0x7735 = 0x6D77
+0x7736 = 0x3F74
+0x7737 = 0x3E6C
+0x7738 = 0x6D78
+0x773A = 0x4C77
+0x773C = 0x515B
+0x7740 = 0x5745
+0x7741 = 0x5576
+0x7743 = 0x6D7C
+0x7747 = 0x6D7B
+0x7750 = 0x6D79
+0x7751 = 0x6D7A
+0x775A = 0x6D7D
+0x775B = 0x3E26
+0x7761 = 0x4B2F
+0x7762 = 0x6E21
+0x7763 = 0x363D
+0x7765 = 0x6E22
+0x7766 = 0x4440
+0x7768 = 0x6D7E
+0x776B = 0x3D5E
+0x776C = 0x3247
+0x7779 = 0x3643
+0x777D = 0x6E25
+0x777E = 0x583A
+0x777F = 0x6E23
+0x7780 = 0x6E26
+0x7784 = 0x4369
+0x7785 = 0x3372
+0x778C = 0x6E27
+0x778D = 0x6E24
+0x778E = 0x4F39
+0x7791 = 0x6E28
+0x7792 = 0x4277
+0x779F = 0x6E29
+0x77A0 = 0x6E2A
+0x77A2 = 0x5E2B
+0x77A5 = 0x4633
+0x77A7 = 0x4746
+0x77A9 = 0x5675
+0x77AA = 0x3549
+0x77AC = 0x4B32
+0x77B0 = 0x6E2B
+0x77B3 = 0x4D2B
+0x77B5 = 0x6E2C
+0x77BB = 0x5530
+0x77BD = 0x6E2D
+0x77BF = 0x7644
+0x77CD = 0x5B47
+0x77D7 = 0x3423
+0x77DB = 0x432C
+0x77DC = 0x7166
+0x77E2 = 0x4A38
+0x77E3 = 0x5253
+0x77E5 = 0x562A
+0x77E7 = 0x6F72
+0x77E9 = 0x3E58
+0x77EB = 0x3D43
+0x77EC = 0x6F73
+0x77ED = 0x364C
+0x77EE = 0x302B
+0x77F3 = 0x4A2F
+0x77F6 = 0x6D36
+0x77F8 = 0x6D37
+0x77FD = 0x4E79
+0x77FE = 0x372F
+0x77FF = 0x3F73
+0x7800 = 0x6D38
+0x7801 = 0x426B
+0x7802 = 0x4930
+0x7809 = 0x6D39
+0x780C = 0x4676
+0x780D = 0x3F33
+0x7811 = 0x6D3C
+0x7812 = 0x4578
+0x7814 = 0x5150
+0x7816 = 0x5729
+0x7817 = 0x6D3A
+0x7818 = 0x6D3B
+0x781A = 0x5162
+0x781C = 0x6D3F
+0x781D = 0x6D40
+0x781F = 0x6D44
+0x7823 = 0x6D48
+0x7825 = 0x6D46
+0x7826 = 0x6D4E
+0x7827 = 0x5568
+0x7829 = 0x6D49
+0x782C = 0x6D47
+0x782D = 0x6D3E
+0x7830 = 0x4569
+0x7834 = 0x4646
+0x7837 = 0x4969
+0x7838 = 0x5452
+0x7839 = 0x6D41
+0x783A = 0x6D42
+0x783B = 0x6D43
+0x783C = 0x6D45
+0x783E = 0x4079
+0x7840 = 0x3421
+0x7845 = 0x3968
+0x7847 = 0x6D50
+0x784C = 0x6D51
+0x784E = 0x6D4A
+0x7850 = 0x6D4F
+0x7852 = 0x4E78
+0x7855 = 0x4B36
+0x7856 = 0x6D4C
+0x7857 = 0x6D4D
+0x785D = 0x4F75
+0x786A = 0x6D52
+0x786B = 0x4172
+0x786C = 0x5332
+0x786D = 0x6D4B
+0x786E = 0x4837
+0x7877 = 0x3C6F
+0x787C = 0x4570
+0x7887 = 0x6D56
+0x7889 = 0x356F
+0x788C = 0x4235
+0x788D = 0x302D
+0x788E = 0x4B69
+0x7891 = 0x312E
+0x7893 = 0x6D54
+0x7897 = 0x4D6B
+0x7898 = 0x3562
+0x789A = 0x6D55
+0x789B = 0x6D53
+0x789C = 0x6D57
+0x789F = 0x357A
+0x78A1 = 0x6D58
+0x78A3 = 0x6D59
+0x78A5 = 0x6D5C
+0x78A7 = 0x314C
+0x78B0 = 0x4576
+0x78B1 = 0x3C6E
+0x78B2 = 0x6D5A
+0x78B3 = 0x4C3C
+0x78B4 = 0x326A
+0x78B9 = 0x6D5B
+0x78BE = 0x446B
+0x78C1 = 0x3445
+0x78C5 = 0x3075
+0x78C9 = 0x6D5F
+0x78CA = 0x405A
+0x78CB = 0x3468
+0x78D0 = 0x454D
+0x78D4 = 0x6D5D
+0x78D5 = 0x3F44
+0x78D9 = 0x6D5E
+0x78E8 = 0x4425
+0x78EC = 0x6D60
+0x78F2 = 0x6D61
+0x78F4 = 0x6D63
+0x78F7 = 0x4157
+0x78FA = 0x3B47
+0x7901 = 0x3D38
+0x7905 = 0x6D62
+0x7913 = 0x6D64
+0x791E = 0x6D66
+0x7924 = 0x6D65
+0x7934 = 0x6D67
+0x793A = 0x4A3E
+0x793B = 0x6C6A
+0x793C = 0x4071
+0x793E = 0x4967
+0x7940 = 0x6C6B
+0x7941 = 0x466E
+0x7946 = 0x6C6C
+0x7948 = 0x466D
+0x7949 = 0x6C6D
+0x7953 = 0x6C70
+0x7956 = 0x5766
+0x7957 = 0x6C73
+0x795A = 0x6C71
+0x795B = 0x6C6E
+0x795C = 0x6C6F
+0x795D = 0x5723
+0x795E = 0x4971
+0x795F = 0x4B6E
+0x7960 = 0x6C74
+0x7962 = 0x6C72
+0x7965 = 0x4F69
+0x7967 = 0x6C76
+0x7968 = 0x4631
+0x796D = 0x3C40
+0x796F = 0x6C75
+0x7977 = 0x353B
+0x7978 = 0x3B76
+0x797A = 0x6C77
+0x7980 = 0x5977
+0x7981 = 0x3D7B
+0x7984 = 0x423B
+0x7985 = 0x6C78
+0x798A = 0x6C79
+0x798F = 0x3823
+0x799A = 0x6C7A
+0x79A7 = 0x6C7B
+0x79B3 = 0x6C7C
+0x79B9 = 0x536D
+0x79BA = 0x582E
+0x79BB = 0x406B
+0x79BD = 0x475D
+0x79BE = 0x3A4C
+0x79C0 = 0x5063
+0x79C1 = 0x4B3D
+0x79C3 = 0x4D3A
+0x79C6 = 0x3851
+0x79C9 = 0x317C
+0x79CB = 0x476F
+0x79CD = 0x5656
+0x79D1 = 0x3F46
+0x79D2 = 0x436B
+0x79D5 = 0x6F75
+0x79D8 = 0x4358
+0x79DF = 0x5762
+0x79E3 = 0x6F77
+0x79E4 = 0x3353
+0x79E6 = 0x4758
+0x79E7 = 0x516D
+0x79E9 = 0x5648
+0x79EB = 0x6F78
+0x79ED = 0x6F76
+0x79EF = 0x3B7D
+0x79F0 = 0x3346
+0x79F8 = 0x3D55
+0x79FB = 0x5246
+0x79FD = 0x3B60
+0x7A00 = 0x4F21
+0x7A02 = 0x6F7C
+0x7A03 = 0x6F7B
+0x7A06 = 0x6F79
+0x7A0B = 0x334C
+0x7A0D = 0x4954
+0x7A0E = 0x4B30
+0x7A14 = 0x6F7E
+0x7A17 = 0x305E
+0x7A1A = 0x5649
+0x7A1E = 0x6F7D
+0x7A20 = 0x336D
+0x7A23 = 0x7655
+0x7A33 = 0x4E48
+0x7A37 = 0x7022
+0x7A39 = 0x7021
+0x7A3B = 0x353E
+0x7A3C = 0x3C5A
+0x7A3D = 0x3B7C
+0x7A3F = 0x3865
+0x7A46 = 0x4442
+0x7A51 = 0x7023
+0x7A57 = 0x4B6B
+0x7A70 = 0x7026
+0x7A74 = 0x5128
+0x7A76 = 0x3E3F
+0x7A77 = 0x476E
+0x7A78 = 0x7136
+0x7A79 = 0x7137
+0x7A7A = 0x3F55
+0x7A7F = 0x3429
+0x7A80 = 0x7138
+0x7A81 = 0x4D3B
+0x7A83 = 0x4754
+0x7A84 = 0x552D
+0x7A86 = 0x7139
+0x7A88 = 0x713A
+0x7A8D = 0x474F
+0x7A91 = 0x5224
+0x7A92 = 0x564F
+0x7A95 = 0x713B
+0x7A96 = 0x3D51
+0x7A97 = 0x3430
+0x7A98 = 0x3E3D
+0x7A9C = 0x345C
+0x7A9D = 0x4E51
+0x7A9F = 0x3F5F
+0x7AA0 = 0x713D
+0x7AA5 = 0x3F7A
+0x7AA6 = 0x713C
+0x7AA8 = 0x713F
+0x7AAC = 0x713E
+0x7AAD = 0x7140
+0x7AB3 = 0x7141
+0x7ABF = 0x417E
+0x7ACB = 0x4122
+0x7AD6 = 0x4A7A
+0x7AD9 = 0x553E
+0x7ADE = 0x3E3A
+0x7ADF = 0x3E39
+0x7AE0 = 0x5542
+0x7AE3 = 0x3F22
+0x7AE5 = 0x4D2F
+0x7AE6 = 0x7135
+0x7AED = 0x3D5F
+0x7AEF = 0x364B
+0x7AF9 = 0x5671
+0x7AFA = 0x7343
+0x7AFD = 0x7344
+0x7AFF = 0x384D
+0x7B03 = 0x7346
+0x7B04 = 0x7347
+0x7B06 = 0x304A
+0x7B08 = 0x7345
+0x7B0A = 0x7349
+0x7B0B = 0x4B71
+0x7B0F = 0x734B
+0x7B11 = 0x5026
+0x7B14 = 0x314A
+0x7B15 = 0x7348
+0x7B19 = 0x734F
+0x7B1B = 0x3551
+0x7B1E = 0x7357
+0x7B20 = 0x7352
+0x7B24 = 0x7354
+0x7B25 = 0x7353
+0x7B26 = 0x377B
+0x7B28 = 0x313F
+0x7B2A = 0x734E
+0x7B2B = 0x734A
+0x7B2C = 0x355A
+0x7B2E = 0x7350
+0x7B31 = 0x7351
+0x7B33 = 0x7355
+0x7B38 = 0x734D
+0x7B3A = 0x3C63
+0x7B3C = 0x417D
+0x7B3E = 0x7356
+0x7B45 = 0x735A
+0x7B47 = 0x734C
+0x7B49 = 0x3548
+0x7B4B = 0x3D6E
+0x7B4C = 0x735C
+0x7B4F = 0x3724
+0x7B50 = 0x3F70
+0x7B51 = 0x567E
+0x7B52 = 0x4D32
+0x7B54 = 0x3470
+0x7B56 = 0x325F
+0x7B58 = 0x7358
+0x7B5A = 0x7359
+0x7B5B = 0x4938
+0x7B5D = 0x735D
+0x7B60 = 0x735E
+0x7B62 = 0x7361
+0x7B6E = 0x735F
+0x7B71 = 0x7363
+0x7B72 = 0x7362
+0x7B75 = 0x735B
+0x7B77 = 0x3F6A
+0x7B79 = 0x336F
+0x7B7B = 0x7360
+0x7B7E = 0x4729
+0x7B80 = 0x3C72
+0x7B85 = 0x736B
+0x7B8D = 0x393F
+0x7B90 = 0x7364
+0x7B94 = 0x322D
+0x7B95 = 0x3B7E
+0x7B97 = 0x4B63
+0x7B9C = 0x736D
+0x7B9D = 0x7369
+0x7BA1 = 0x395C
+0x7BA2 = 0x736E
+0x7BA6 = 0x7365
+0x7BA7 = 0x7366
+0x7BA8 = 0x736A
+0x7BA9 = 0x4261
+0x7BAA = 0x736C
+0x7BAB = 0x736F
+0x7BAC = 0x7368
+0x7BAD = 0x3C7D
+0x7BB1 = 0x4F64
+0x7BB4 = 0x7370
+0x7BB8 = 0x7367
+0x7BC1 = 0x7372
+0x7BC6 = 0x572D
+0x7BC7 = 0x462A
+0x7BCC = 0x7373
+0x7BD1 = 0x7371
+0x7BD3 = 0x4228
+0x7BD9 = 0x385D
+0x7BDA = 0x7375
+0x7BDD = 0x7374
+0x7BE1 = 0x345B
+0x7BE5 = 0x7376
+0x7BE6 = 0x7377
+0x7BEA = 0x7378
+0x7BEE = 0x403A
+0x7BF1 = 0x4069
+0x7BF7 = 0x4571
+0x7BFC = 0x737B
+0x7BFE = 0x737A
+0x7C07 = 0x3458
+0x7C0B = 0x737E
+0x7C0C = 0x7379
+0x7C0F = 0x737C
+0x7C16 = 0x737D
+0x7C1F = 0x7421
+0x7C26 = 0x7423
+0x7C27 = 0x3B49
+0x7C2A = 0x7422
+0x7C38 = 0x7424
+0x7C3F = 0x323E
+0x7C40 = 0x7426
+0x7C41 = 0x7425
+0x7C4D = 0x3C2E
+0x7C73 = 0x4357
+0x7C74 = 0x5961
+0x7C7B = 0x4060
+0x7C7C = 0x744C
+0x7C7D = 0x5751
+0x7C89 = 0x375B
+0x7C91 = 0x744E
+0x7C92 = 0x4123
+0x7C95 = 0x4649
+0x7C97 = 0x3456
+0x7C98 = 0x5533
+0x7C9C = 0x7450
+0x7C9D = 0x744F
+0x7C9E = 0x7451
+0x7C9F = 0x4B5A
+0x7CA2 = 0x7452
+0x7CA4 = 0x5441
+0x7CA5 = 0x5660
+0x7CAA = 0x3760
+0x7CAE = 0x4138
+0x7CB1 = 0x413B
+0x7CB2 = 0x7453
+0x7CB3 = 0x3E2C
+0x7CB9 = 0x3462
+0x7CBC = 0x7454
+0x7CBD = 0x7455
+0x7CBE = 0x3E2B
+0x7CC1 = 0x7456
+0x7CC5 = 0x745B
+0x7CC7 = 0x7457
+0x7CC8 = 0x745A
+0x7CCA = 0x3A7D
+0x7CCC = 0x7458
+0x7CCD = 0x7459
+0x7CD5 = 0x3862
+0x7CD6 = 0x4C47
+0x7CD7 = 0x745C
+0x7CD9 = 0x325A
+0x7CDC = 0x4353
+0x7CDF = 0x5463
+0x7CE0 = 0x3F37
+0x7CE8 = 0x745D
+0x7CEF = 0x4534
+0x7CF8 = 0x7469
+0x7CFB = 0x4F35
+0x7D0A = 0x4E49
+0x7D20 = 0x4B58
+0x7D22 = 0x4B77
+0x7D27 = 0x3D74
+0x7D2B = 0x574F
+0x7D2F = 0x405B
+0x7D6E = 0x5075
+0x7D77 = 0x746A
+0x7DA6 = 0x746B
+0x7DAE = 0x746C
+0x7E3B = 0x7763
+0x7E41 = 0x3731
+0x7E47 = 0x746D
+0x7E82 = 0x576B
+0x7E9B = 0x746E
+0x7E9F = 0x6679
+0x7EA0 = 0x3E40
+0x7EA1 = 0x667A
+0x7EA2 = 0x3A6C
+0x7EA3 = 0x667B
+0x7EA4 = 0x4F4B
+0x7EA5 = 0x667C
+0x7EA6 = 0x543C
+0x7EA7 = 0x3C36
+0x7EA8 = 0x667D
+0x7EA9 = 0x667E
+0x7EAA = 0x3C4D
+0x7EAB = 0x4852
+0x7EAC = 0x4E33
+0x7EAD = 0x6721
+0x7EAF = 0x343F
+0x7EB0 = 0x6722
+0x7EB1 = 0x4934
+0x7EB2 = 0x3859
+0x7EB3 = 0x4449
+0x7EB5 = 0x575D
+0x7EB6 = 0x425A
+0x7EB7 = 0x3757
+0x7EB8 = 0x563D
+0x7EB9 = 0x4E46
+0x7EBA = 0x3744
+0x7EBD = 0x4526
+0x7EBE = 0x6723
+0x7EBF = 0x4F5F
+0x7EC0 = 0x6724
+0x7EC1 = 0x6725
+0x7EC2 = 0x6726
+0x7EC3 = 0x4137
+0x7EC4 = 0x5769
+0x7EC5 = 0x4970
+0x7EC6 = 0x4F38
+0x7EC7 = 0x562F
+0x7EC8 = 0x5655
+0x7EC9 = 0x6727
+0x7ECA = 0x306D
+0x7ECB = 0x6728
+0x7ECC = 0x6729
+0x7ECD = 0x495C
+0x7ECE = 0x526F
+0x7ECF = 0x3E2D
+0x7ED0 = 0x672A
+0x7ED1 = 0x3073
+0x7ED2 = 0x485E
+0x7ED3 = 0x3D61
+0x7ED4 = 0x672B
+0x7ED5 = 0x4846
+0x7ED7 = 0x672C
+0x7ED8 = 0x3B66
+0x7ED9 = 0x3878
+0x7EDA = 0x5124
+0x7EDB = 0x672D
+0x7EDC = 0x4267
+0x7EDD = 0x3E78
+0x7EDE = 0x3D4A
+0x7EDF = 0x4D33
+0x7EE0 = 0x672E
+0x7EE1 = 0x672F
+0x7EE2 = 0x3E6E
+0x7EE3 = 0x5065
+0x7EE5 = 0x4B67
+0x7EE6 = 0x4C50
+0x7EE7 = 0x3C4C
+0x7EE8 = 0x6730
+0x7EE9 = 0x3C28
+0x7EEA = 0x5077
+0x7EEB = 0x6731
+0x7EED = 0x5078
+0x7EEE = 0x6732
+0x7EEF = 0x6733
+0x7EF0 = 0x3442
+0x7EF1 = 0x6734
+0x7EF2 = 0x6735
+0x7EF3 = 0x497E
+0x7EF4 = 0x4E2C
+0x7EF5 = 0x4360
+0x7EF6 = 0x6737
+0x7EF7 = 0x3141
+0x7EF8 = 0x3371
+0x7EFA = 0x6738
+0x7EFB = 0x6739
+0x7EFC = 0x575B
+0x7EFD = 0x5540
+0x7EFE = 0x673A
+0x7EFF = 0x424C
+0x7F00 = 0x573A
+0x7F01 = 0x673B
+0x7F02 = 0x673C
+0x7F03 = 0x673D
+0x7F04 = 0x3C6A
+0x7F05 = 0x4365
+0x7F06 = 0x4042
+0x7F07 = 0x673E
+0x7F08 = 0x673F
+0x7F09 = 0x3C29
+0x7F0B = 0x6740
+0x7F0C = 0x6741
+0x7F0D = 0x6736
+0x7F0E = 0x3650
+0x7F0F = 0x6742
+0x7F11 = 0x6743
+0x7F12 = 0x6744
+0x7F13 = 0x3B3A
+0x7F14 = 0x355E
+0x7F15 = 0x4246
+0x7F16 = 0x3160
+0x7F17 = 0x6745
+0x7F18 = 0x5435
+0x7F19 = 0x6746
+0x7F1A = 0x383F
+0x7F1B = 0x6748
+0x7F1C = 0x6747
+0x7F1D = 0x376C
+0x7F1F = 0x6749
+0x7F20 = 0x3278
+0x7F21 = 0x674A
+0x7F22 = 0x674B
+0x7F23 = 0x674C
+0x7F24 = 0x674D
+0x7F25 = 0x674E
+0x7F26 = 0x674F
+0x7F27 = 0x6750
+0x7F28 = 0x5327
+0x7F29 = 0x4B75
+0x7F2A = 0x6751
+0x7F2B = 0x6752
+0x7F2C = 0x6753
+0x7F2D = 0x6754
+0x7F2E = 0x4949
+0x7F2F = 0x6755
+0x7F30 = 0x6756
+0x7F31 = 0x6757
+0x7F32 = 0x6758
+0x7F33 = 0x6759
+0x7F34 = 0x3D49
+0x7F35 = 0x675A
+0x7F36 = 0x733E
+0x7F38 = 0x3857
+0x7F3A = 0x4831
+0x7F42 = 0x733F
+0x7F44 = 0x7340
+0x7F45 = 0x7341
+0x7F50 = 0x395E
+0x7F51 = 0x4D78
+0x7F54 = 0x5868
+0x7F55 = 0x3A31
+0x7F57 = 0x425E
+0x7F58 = 0x6E37
+0x7F5A = 0x3723
+0x7F5F = 0x6E39
+0x7F61 = 0x6E38
+0x7F62 = 0x3055
+0x7F68 = 0x6E3B
+0x7F69 = 0x5556
+0x7F6A = 0x576F
+0x7F6E = 0x5643
+0x7F71 = 0x6E3D
+0x7F72 = 0x4A70
+0x7F74 = 0x6E3C
+0x7F79 = 0x6E3E
+0x7F7E = 0x6E40
+0x7F81 = 0x6E3F
+0x7F8A = 0x5172
+0x7F8C = 0x473C
+0x7F8E = 0x4340
+0x7F94 = 0x3861
+0x7F9A = 0x4167
+0x7F9D = 0x7446
+0x7F9E = 0x505F
+0x7F9F = 0x7447
+0x7FA1 = 0x4F5B
+0x7FA4 = 0x483A
+0x7FA7 = 0x7448
+0x7FAF = 0x7449
+0x7FB0 = 0x744A
+0x7FB2 = 0x744B
+0x7FB8 = 0x597A
+0x7FB9 = 0x387E
+0x7FBC = 0x6571
+0x7FBD = 0x5370
+0x7FBF = 0x7460
+0x7FC1 = 0x4E4C
+0x7FC5 = 0x3361
+0x7FCA = 0x7134
+0x7FCC = 0x526E
+0x7FCE = 0x7461
+0x7FD4 = 0x4F68
+0x7FD5 = 0x7462
+0x7FD8 = 0x474C
+0x7FDF = 0x3554
+0x7FE0 = 0x3464
+0x7FE1 = 0x7464
+0x7FE5 = 0x7463
+0x7FE6 = 0x7465
+0x7FE9 = 0x7466
+0x7FEE = 0x7467
+0x7FF0 = 0x3A32
+0x7FF1 = 0x303F
+0x7FF3 = 0x7468
+0x7FFB = 0x372D
+0x7FFC = 0x526D
+0x8000 = 0x522B
+0x8001 = 0x404F
+0x8003 = 0x3F3C
+0x8004 = 0x6B23
+0x8005 = 0x555F
+0x8006 = 0x6A48
+0x800B = 0x7173
+0x800C = 0x3678
+0x800D = 0x4B23
+0x8010 = 0x444D
+0x8012 = 0x7167
+0x8014 = 0x7168
+0x8015 = 0x387B
+0x8016 = 0x7169
+0x8017 = 0x3A44
+0x8018 = 0x5445
+0x8019 = 0x3052
+0x801C = 0x716A
+0x8020 = 0x716B
+0x8022 = 0x716C
+0x8025 = 0x716D
+0x8026 = 0x716E
+0x8027 = 0x716F
+0x8028 = 0x7171
+0x8029 = 0x7170
+0x802A = 0x4555
+0x8031 = 0x7172
+0x8033 = 0x367A
+0x8035 = 0x7174
+0x8036 = 0x522E
+0x8037 = 0x5E47
+0x8038 = 0x4B4A
+0x803B = 0x335C
+0x803D = 0x3522
+0x803F = 0x3922
+0x8042 = 0x4474
+0x8043 = 0x7175
+0x8046 = 0x7176
+0x804A = 0x4144
+0x804B = 0x417B
+0x804C = 0x5630
+0x804D = 0x7177
+0x8052 = 0x7178
+0x8054 = 0x412A
+0x8058 = 0x4638
+0x805A = 0x3E5B
+0x8069 = 0x7179
+0x806A = 0x344F
+0x8071 = 0x717A
+0x807F = 0x6D32
+0x8080 = 0x6D31
+0x8083 = 0x4B60
+0x8084 = 0x525E
+0x8086 = 0x4B41
+0x8087 = 0x5558
+0x8089 = 0x4862
+0x808B = 0x405F
+0x808C = 0x3C21
+0x8093 = 0x6B41
+0x8096 = 0x5024
+0x8098 = 0x5662
+0x809A = 0x3647
+0x809B = 0x3858
+0x809C = 0x6B40
+0x809D = 0x384E
+0x809F = 0x6B3F
+0x80A0 = 0x3326
+0x80A1 = 0x3949
+0x80A2 = 0x562B
+0x80A4 = 0x3774
+0x80A5 = 0x374A
+0x80A9 = 0x3C67
+0x80AA = 0x373E
+0x80AB = 0x6B46
+0x80AD = 0x6B47
+0x80AE = 0x3039
+0x80AF = 0x3F4F
+0x80B1 = 0x6B45
+0x80B2 = 0x537D
+0x80B4 = 0x6B48
+0x80B7 = 0x6B49
+0x80BA = 0x374E
+0x80BC = 0x6B42
+0x80BD = 0x6B44
+0x80BE = 0x4976
+0x80BF = 0x5657
+0x80C0 = 0x554D
+0x80C1 = 0x5032
+0x80C2 = 0x6B4F
+0x80C3 = 0x4E38
+0x80C4 = 0x6B50
+0x80C6 = 0x3528
+0x80CC = 0x3133
+0x80CD = 0x6B52
+0x80CE = 0x4C25
+0x80D6 = 0x4556
+0x80D7 = 0x6B53
+0x80D9 = 0x6B51
+0x80DA = 0x455F
+0x80DB = 0x6B4E
+0x80DC = 0x4A24
+0x80DD = 0x6B55
+0x80DE = 0x307B
+0x80E1 = 0x3A7A
+0x80E4 = 0x5837
+0x80E5 = 0x7163
+0x80E7 = 0x6B4A
+0x80E8 = 0x6B4B
+0x80E9 = 0x6B4C
+0x80EA = 0x6B4D
+0x80EB = 0x6B56
+0x80EC = 0x6640
+0x80ED = 0x6B59
+0x80EF = 0x3F68
+0x80F0 = 0x5248
+0x80F1 = 0x6B57
+0x80F2 = 0x6B5C
+0x80F3 = 0x386C
+0x80F4 = 0x6B58
+0x80F6 = 0x3D3A
+0x80F8 = 0x5058
+0x80FA = 0x3037
+0x80FC = 0x6B5D
+0x80FD = 0x445C
+0x8102 = 0x562C
+0x8106 = 0x3460
+0x8109 = 0x4276
+0x810A = 0x3C39
+0x810D = 0x6B5A
+0x810E = 0x6B5B
+0x810F = 0x5460
+0x8110 = 0x466A
+0x8111 = 0x4454
+0x8112 = 0x6B5F
+0x8113 = 0x4527
+0x8114 = 0x5975
+0x8116 = 0x3231
+0x8118 = 0x6B64
+0x811A = 0x3D45
+0x811E = 0x6B62
+0x812C = 0x6B63
+0x812F = 0x382C
+0x8131 = 0x4D51
+0x8132 = 0x6B65
+0x8136 = 0x6B61
+0x8138 = 0x4133
+0x813E = 0x4622
+0x8146 = 0x4C73
+0x8148 = 0x6B66
+0x814A = 0x4030
+0x814B = 0x5238
+0x814C = 0x6B67
+0x8150 = 0x382F
+0x8151 = 0x382D
+0x8153 = 0x6B68
+0x8154 = 0x473B
+0x8155 = 0x4D73
+0x8159 = 0x6B6A
+0x815A = 0x6B6B
+0x8160 = 0x6B6D
+0x8165 = 0x5048
+0x8167 = 0x6B72
+0x8169 = 0x6B6E
+0x816D = 0x6B71
+0x816E = 0x4879
+0x8170 = 0x517C
+0x8171 = 0x6B6C
+0x8174 = 0x6B69
+0x8179 = 0x3839
+0x817A = 0x4F59
+0x817B = 0x4465
+0x817C = 0x6B6F
+0x817D = 0x6B70
+0x817E = 0x4C5A
+0x817F = 0x4D48
+0x8180 = 0x3072
+0x8182 = 0x6B76
+0x8188 = 0x6B75
+0x818A = 0x3232
+0x818F = 0x3860
+0x8191 = 0x6B77
+0x8198 = 0x316C
+0x819B = 0x4C45
+0x819C = 0x4424
+0x819D = 0x4F25
+0x81A3 = 0x6B79
+0x81A6 = 0x6C22
+0x81A8 = 0x4572
+0x81AA = 0x6B7A
+0x81B3 = 0x4945
+0x81BA = 0x625F
+0x81BB = 0x6B7E
+0x81C0 = 0x4D4E
+0x81C1 = 0x6C21
+0x81C2 = 0x315B
+0x81C3 = 0x5337
+0x81C6 = 0x525C
+0x81CA = 0x6B7D
+0x81CC = 0x6B7B
+0x81E3 = 0x333C
+0x81E7 = 0x6A30
+0x81EA = 0x5754
+0x81EC = 0x742B
+0x81ED = 0x3374
+0x81F3 = 0x5641
+0x81F4 = 0x5642
+0x81FB = 0x5569
+0x81FC = 0x3E4A
+0x81FE = 0x7427
+0x8200 = 0x5228
+0x8201 = 0x7428
+0x8202 = 0x7429
+0x8204 = 0x742A
+0x8205 = 0x3E4B
+0x8206 = 0x535F
+0x820C = 0x4960
+0x820D = 0x4961
+0x8210 = 0x7342
+0x8212 = 0x4A66
+0x8214 = 0x4C72
+0x821B = 0x6236
+0x821C = 0x4B34
+0x821E = 0x4E68
+0x821F = 0x565B
+0x8221 = 0x742D
+0x8222 = 0x742E
+0x8223 = 0x742F
+0x8228 = 0x7432
+0x822A = 0x3A3D
+0x822B = 0x7433
+0x822C = 0x3063
+0x822D = 0x7430
+0x822F = 0x7431
+0x8230 = 0x3D22
+0x8231 = 0x3255
+0x8233 = 0x7436
+0x8234 = 0x7437
+0x8235 = 0x3666
+0x8236 = 0x3230
+0x8237 = 0x4F4F
+0x8238 = 0x7434
+0x8239 = 0x342C
+0x823B = 0x7435
+0x823E = 0x7438
+0x8244 = 0x7439
+0x8247 = 0x4D27
+0x8249 = 0x743A
+0x824B = 0x743B
+0x824F = 0x743C
+0x8258 = 0x4B52
+0x825A = 0x743D
+0x825F = 0x743E
+0x8268 = 0x743F
+0x826E = 0x745E
+0x826F = 0x413C
+0x8270 = 0x3C68
+0x8272 = 0x492B
+0x8273 = 0x515E
+0x8274 = 0x6575
+0x8279 = 0x5C33
+0x827A = 0x5255
+0x827D = 0x5C34
+0x827E = 0x302C
+0x827F = 0x5C35
+0x8282 = 0x3D5A
+0x8284 = 0x5C39
+0x8288 = 0x5842
+0x828A = 0x5C37
+0x828B = 0x5373
+0x828D = 0x4956
+0x828E = 0x5C3A
+0x828F = 0x5C36
+0x8291 = 0x5C3B
+0x8292 = 0x4322
+0x8297 = 0x5C3C
+0x8298 = 0x5C45
+0x8299 = 0x5C3D
+0x829C = 0x4E5F
+0x829D = 0x5625
+0x829F = 0x5C4F
+0x82A1 = 0x5C4D
+0x82A4 = 0x5C52
+0x82A5 = 0x3D66
+0x82A6 = 0x422B
+0x82A8 = 0x5C38
+0x82A9 = 0x5C4B
+0x82AA = 0x5C4E
+0x82AB = 0x5C3E
+0x82AC = 0x3752
+0x82AD = 0x3045
+0x82AE = 0x5C47
+0x82AF = 0x503E
+0x82B0 = 0x5C41
+0x82B1 = 0x3B28
+0x82B3 = 0x373C
+0x82B4 = 0x5C4C
+0x82B7 = 0x5C46
+0x82B8 = 0x5C3F
+0x82B9 = 0x475B
+0x82BD = 0x513F
+0x82BE = 0x5C40
+0x82C1 = 0x5C4A
+0x82C4 = 0x5C50
+0x82C7 = 0x4E2D
+0x82C8 = 0x5C42
+0x82CA = 0x5C43
+0x82CB = 0x5C48
+0x82CC = 0x5C49
+0x82CD = 0x3254
+0x82CE = 0x5C51
+0x82CF = 0x4B55
+0x82D1 = 0x5437
+0x82D2 = 0x5C5B
+0x82D3 = 0x5C5F
+0x82D4 = 0x4C26
+0x82D5 = 0x5C66
+0x82D7 = 0x4367
+0x82D8 = 0x5C5C
+0x82DB = 0x3F41
+0x82DC = 0x5C59
+0x82DE = 0x307A
+0x82DF = 0x3936
+0x82E0 = 0x5C65
+0x82E1 = 0x5C53
+0x82E3 = 0x5C44
+0x82E4 = 0x5C56
+0x82E5 = 0x4874
+0x82E6 = 0x3F60
+0x82EB = 0x493B
+0x82EF = 0x313D
+0x82F1 = 0x5322
+0x82F4 = 0x5C5A
+0x82F7 = 0x5C55
+0x82F9 = 0x463B
+0x82FB = 0x5C5E
+0x8301 = 0x5742
+0x8302 = 0x432F
+0x8303 = 0x3736
+0x8304 = 0x4751
+0x8305 = 0x4329
+0x8306 = 0x5C62
+0x8307 = 0x5C58
+0x8308 = 0x5C6B
+0x8309 = 0x5C54
+0x830C = 0x5C5D
+0x830E = 0x3E25
+0x830F = 0x5C57
+0x8311 = 0x5C60
+0x8314 = 0x5C63
+0x8315 = 0x5C64
+0x8317 = 0x5C78
+0x831A = 0x5C61
+0x831B = 0x5D22
+0x831C = 0x5C67
+0x8327 = 0x3C6B
+0x8328 = 0x3444
+0x832B = 0x4323
+0x832C = 0x3267
+0x832D = 0x5C7A
+0x832F = 0x5C72
+0x8331 = 0x5C6F
+0x8333 = 0x5C7C
+0x8334 = 0x5C6E
+0x8335 = 0x5270
+0x8336 = 0x3268
+0x8338 = 0x4857
+0x8339 = 0x4863
+0x833A = 0x5C7B
+0x833C = 0x5C6D
+0x8340 = 0x5C77
+0x8343 = 0x5C75
+0x8346 = 0x3E23
+0x8347 = 0x5C74
+0x8349 = 0x325D
+0x834F = 0x5C73
+0x8350 = 0x3C76
+0x8351 = 0x5C68
+0x8352 = 0x3B44
+0x8354 = 0x4073
+0x835A = 0x3C54
+0x835B = 0x5C69
+0x835C = 0x5C6A
+0x835E = 0x5C71
+0x835F = 0x5C76
+0x8360 = 0x5C79
+0x8361 = 0x3534
+0x8363 = 0x4859
+0x8364 = 0x3B67
+0x8365 = 0x5C7E
+0x8366 = 0x5C7D
+0x8367 = 0x532B
+0x8368 = 0x5D21
+0x8369 = 0x5D23
+0x836A = 0x5D25
+0x836B = 0x5271
+0x836C = 0x5D24
+0x836D = 0x5D26
+0x836E = 0x5D27
+0x836F = 0x5229
+0x8377 = 0x3A49
+0x8378 = 0x5D29
+0x837B = 0x5D36
+0x837C = 0x5D31
+0x837D = 0x5D34
+0x8385 = 0x5D30
+0x8386 = 0x464E
+0x8389 = 0x4072
+0x838E = 0x492F
+0x8392 = 0x5C6C
+0x8393 = 0x5D2E
+0x8398 = 0x5D37
+0x839B = 0x5C70
+0x839C = 0x5D2F
+0x839E = 0x5D38
+0x83A0 = 0x5D2C
+0x83A8 = 0x5D39
+0x83A9 = 0x5D33
+0x83AA = 0x5D2D
+0x83AB = 0x442A
+0x83B0 = 0x5D28
+0x83B1 = 0x4033
+0x83B2 = 0x412B
+0x83B3 = 0x5D2A
+0x83B4 = 0x5D2B
+0x83B6 = 0x5D32
+0x83B7 = 0x3B71
+0x83B8 = 0x5D35
+0x83B9 = 0x5328
+0x83BA = 0x5D3A
+0x83BC = 0x5D3B
+0x83BD = 0x4327
+0x83C0 = 0x5D52
+0x83C1 = 0x5D3C
+0x83C5 = 0x5D51
+0x83C7 = 0x393D
+0x83CA = 0x3E55
+0x83CC = 0x3E7A
+0x83CF = 0x3A4A
+0x83D4 = 0x5D4A
+0x83D6 = 0x5D45
+0x83D8 = 0x5D3F
+0x83DC = 0x324B
+0x83DD = 0x5D43
+0x83DF = 0x5D4B
+0x83E0 = 0x3224
+0x83E1 = 0x5D55
+0x83E5 = 0x5D3E
+0x83E9 = 0x4650
+0x83EA = 0x5D50
+0x83F0 = 0x5D54
+0x83F1 = 0x4162
+0x83F2 = 0x3746
+0x83F8 = 0x5D4E
+0x83F9 = 0x5D4F
+0x83FD = 0x5D44
+0x8401 = 0x5D3D
+0x8403 = 0x5D4D
+0x8404 = 0x4C51
+0x8406 = 0x5D49
+0x840B = 0x5D42
+0x840C = 0x4348
+0x840D = 0x463C
+0x840E = 0x4E2E
+0x840F = 0x5D4C
+0x8411 = 0x5D48
+0x8418 = 0x5D41
+0x841C = 0x5D46
+0x841D = 0x425C
+0x8424 = 0x5329
+0x8425 = 0x532A
+0x8426 = 0x5D53
+0x8427 = 0x4F74
+0x8428 = 0x4878
+0x8431 = 0x5D66
+0x8438 = 0x5D47
+0x843C = 0x5D60
+0x843D = 0x4264
+0x8446 = 0x5D61
+0x8451 = 0x5D57
+0x8457 = 0x5678
+0x8459 = 0x5D59
+0x845A = 0x5D58
+0x845B = 0x3870
+0x845C = 0x5D56
+0x8461 = 0x464F
+0x8463 = 0x362D
+0x8469 = 0x5D62
+0x846B = 0x3A79
+0x846C = 0x5461
+0x846D = 0x5D67
+0x8471 = 0x3450
+0x8473 = 0x5D5A
+0x8475 = 0x3F7B
+0x8476 = 0x5D63
+0x8478 = 0x5D5F
+0x847A = 0x5D5D
+0x8482 = 0x3559
+0x8487 = 0x5D5B
+0x8488 = 0x5D5C
+0x8489 = 0x5D5E
+0x848B = 0x3D2F
+0x848C = 0x5D64
+0x848E = 0x5D65
+0x8497 = 0x5D75
+0x8499 = 0x4349
+0x849C = 0x4B62
+0x84A1 = 0x5D72
+0x84AF = 0x5861
+0x84B2 = 0x4651
+0x84B4 = 0x5D74
+0x84B8 = 0x5574
+0x84B9 = 0x5D73
+0x84BA = 0x5D70
+0x84BD = 0x5D6C
+0x84BF = 0x5D6F
+0x84C1 = 0x5D68
+0x84C4 = 0x506E
+0x84C9 = 0x4858
+0x84CA = 0x5D6E
+0x84CD = 0x5D69
+0x84D0 = 0x5D6A
+0x84D1 = 0x4B72
+0x84D3 = 0x5D6D
+0x84D6 = 0x314D
+0x84DD = 0x4036
+0x84DF = 0x3C3B
+0x84E0 = 0x5D71
+0x84E3 = 0x5D77
+0x84E5 = 0x5D76
+0x84E6 = 0x5D6B
+0x84EC = 0x456E
+0x84F0 = 0x5D7B
+0x84FC = 0x5E24
+0x84FF = 0x5E23
+0x850C = 0x5D78
+0x8511 = 0x436F
+0x8513 = 0x427B
+0x8517 = 0x5561
+0x851A = 0x4E35
+0x851F = 0x5D7D
+0x8521 = 0x324C
+0x852B = 0x4468
+0x852C = 0x4A5F
+0x8537 = 0x473E
+0x8538 = 0x5D7A
+0x8539 = 0x5D7C
+0x853A = 0x5D7E
+0x853B = 0x5E22
+0x853C = 0x302A
+0x853D = 0x314E
+0x8543 = 0x5E2C
+0x8548 = 0x5E26
+0x8549 = 0x3D36
+0x854A = 0x486F
+0x8556 = 0x5E21
+0x8559 = 0x5E25
+0x855E = 0x5E29
+0x8564 = 0x5E28
+0x8568 = 0x5E27
+0x8572 = 0x5E2D
+0x8574 = 0x544C
+0x8579 = 0x5E33
+0x857A = 0x5E2A
+0x857B = 0x5E2E
+0x857E = 0x4059
+0x8584 = 0x3121
+0x8585 = 0x5E36
+0x8587 = 0x5E31
+0x858F = 0x5E32
+0x859B = 0x5126
+0x859C = 0x5E35
+0x85A4 = 0x5E2F
+0x85A8 = 0x5E30
+0x85AA = 0x503D
+0x85AE = 0x5E34
+0x85AF = 0x4A6D
+0x85B0 = 0x5E39
+0x85B7 = 0x5E38
+0x85B9 = 0x5E37
+0x85C1 = 0x5E3B
+0x85C9 = 0x3D65
+0x85CF = 0x3258
+0x85D0 = 0x436A
+0x85D3 = 0x5E3A
+0x85D5 = 0x453A
+0x85DC = 0x5E3C
+0x85E4 = 0x4C59
+0x85E9 = 0x372A
+0x85FB = 0x5465
+0x85FF = 0x5E3D
+0x8605 = 0x5E3F
+0x8611 = 0x4422
+0x8616 = 0x5E41
+0x8627 = 0x5E3E
+0x8629 = 0x5E40
+0x8638 = 0x553A
+0x863C = 0x5E42
+0x864D = 0x722E
+0x864E = 0x3B22
+0x864F = 0x4232
+0x8650 = 0x4530
+0x8651 = 0x4247
+0x8654 = 0x722F
+0x865A = 0x5069
+0x865E = 0x535D
+0x8662 = 0x6B3D
+0x866B = 0x3366
+0x866C = 0x7230
+0x866E = 0x7231
+0x8671 = 0x4A2D
+0x8679 = 0x3A67
+0x867A = 0x7233
+0x867B = 0x7235
+0x867C = 0x7234
+0x867D = 0x4B64
+0x867E = 0x4F3A
+0x867F = 0x7232
+0x8680 = 0x4A34
+0x8681 = 0x524F
+0x8682 = 0x426C
+0x868A = 0x4E43
+0x868B = 0x7238
+0x868C = 0x3076
+0x868D = 0x7237
+0x8693 = 0x723E
+0x8695 = 0x324F
+0x869C = 0x5141
+0x869D = 0x723A
+0x86A3 = 0x723C
+0x86A4 = 0x5469
+0x86A7 = 0x723B
+0x86A8 = 0x7236
+0x86A9 = 0x723F
+0x86AA = 0x723D
+0x86AC = 0x7239
+0x86AF = 0x7247
+0x86B0 = 0x7244
+0x86B1 = 0x7246
+0x86B4 = 0x724A
+0x86B5 = 0x7242
+0x86B6 = 0x7240
+0x86BA = 0x7245
+0x86C0 = 0x567B
+0x86C4 = 0x7241
+0x86C6 = 0x4779
+0x86C7 = 0x495F
+0x86C9 = 0x7248
+0x86CA = 0x3946
+0x86CB = 0x3530
+0x86CE = 0x7243
+0x86CF = 0x7249
+0x86D0 = 0x7250
+0x86D1 = 0x7256
+0x86D4 = 0x3B57
+0x86D8 = 0x7255
+0x86D9 = 0x4D5C
+0x86DB = 0x566B
+0x86DE = 0x7252
+0x86DF = 0x7254
+0x86E4 = 0x3872
+0x86E9 = 0x724B
+0x86ED = 0x724E
+0x86EE = 0x4279
+0x86F0 = 0x555D
+0x86F1 = 0x724C
+0x86F2 = 0x724D
+0x86F3 = 0x724F
+0x86F4 = 0x7253
+0x86F8 = 0x7259
+0x86F9 = 0x533C
+0x86FE = 0x366A
+0x8700 = 0x4A71
+0x8702 = 0x3764
+0x8703 = 0x7257
+0x8707 = 0x7258
+0x8708 = 0x725A
+0x8709 = 0x725D
+0x870A = 0x725B
+0x870D = 0x725C
+0x8712 = 0x5151
+0x8713 = 0x7251
+0x8715 = 0x4D49
+0x8717 = 0x4E4F
+0x8718 = 0x5629
+0x871A = 0x7263
+0x871C = 0x435B
+0x871E = 0x7260
+0x8721 = 0x402F
+0x8722 = 0x726C
+0x8723 = 0x725E
+0x8725 = 0x7261
+0x8729 = 0x7268
+0x872E = 0x7262
+0x8731 = 0x7267
+0x8734 = 0x7266
+0x8737 = 0x7269
+0x873B = 0x725F
+0x873E = 0x7264
+0x873F = 0x726A
+0x8747 = 0x532C
+0x8748 = 0x7265
+0x8749 = 0x3275
+0x874C = 0x7272
+0x874E = 0x502B
+0x8753 = 0x7275
+0x8757 = 0x3B48
+0x8759 = 0x7279
+0x8760 = 0x7270
+0x8763 = 0x7276
+0x8764 = 0x7278
+0x8765 = 0x727A
+0x876E = 0x7273
+0x8770 = 0x7271
+0x8774 = 0x3A7B
+0x8776 = 0x357B
+0x877B = 0x726F
+0x877C = 0x7277
+0x877D = 0x726D
+0x877E = 0x726E
+0x8782 = 0x726B
+0x8783 = 0x7326
+0x8785 = 0x7323
+0x8788 = 0x7322
+0x878B = 0x7274
+0x878D = 0x485A
+0x8793 = 0x727B
+0x8797 = 0x7325
+0x879F = 0x4378
+0x87A8 = 0x727D
+0x87AB = 0x7327
+0x87AC = 0x7329
+0x87AD = 0x7324
+0x87AF = 0x727C
+0x87B3 = 0x732B
+0x87B5 = 0x732A
+0x87BA = 0x425D
+0x87BD = 0x732E
+0x87C0 = 0x7330
+0x87C6 = 0x7321
+0x87CA = 0x7331
+0x87CB = 0x732C
+0x87D1 = 0x732F
+0x87D2 = 0x727E
+0x87D3 = 0x732D
+0x87DB = 0x7332
+0x87E0 = 0x7334
+0x87E5 = 0x7328
+0x87EA = 0x7333
+0x87EE = 0x7335
+0x87F9 = 0x5037
+0x87FE = 0x7338
+0x8803 = 0x5979
+0x880A = 0x7339
+0x8813 = 0x7337
+0x8815 = 0x4864
+0x8816 = 0x7336
+0x881B = 0x733A
+0x8821 = 0x733B
+0x8822 = 0x3440
+0x8832 = 0x6E43
+0x8839 = 0x733C
+0x883C = 0x733D
+0x8840 = 0x512A
+0x8844 = 0x742C
+0x8845 = 0x5046
+0x884C = 0x5050
+0x884D = 0x515C
+0x8854 = 0x4F4E
+0x8857 = 0x3D56
+0x8859 = 0x5143
+0x8861 = 0x3A62
+0x8862 = 0x6169
+0x8863 = 0x5242
+0x8864 = 0x7142
+0x8865 = 0x3239
+0x8868 = 0x316D
+0x8869 = 0x7143
+0x886B = 0x4940
+0x886C = 0x3344
+0x886E = 0x5972
+0x8870 = 0x4B25
+0x8872 = 0x7144
+0x8877 = 0x5654
+0x887D = 0x7145
+0x887E = 0x7440
+0x887F = 0x7146
+0x8881 = 0x542C
+0x8882 = 0x7147
+0x8884 = 0x3040
+0x8885 = 0x7441
+0x8888 = 0x7442
+0x888B = 0x347C
+0x888D = 0x455B
+0x8892 = 0x4C3B
+0x8896 = 0x5064
+0x889C = 0x4D60
+0x88A2 = 0x7148
+0x88A4 = 0x5973
+0x88AB = 0x313B
+0x88AD = 0x4F2E
+0x88B1 = 0x3824
+0x88B7 = 0x714A
+0x88BC = 0x714B
+0x88C1 = 0x3243
+0x88C2 = 0x4151
+0x88C5 = 0x5730
+0x88C6 = 0x7149
+0x88C9 = 0x714C
+0x88CE = 0x714E
+0x88D2 = 0x5976
+0x88D4 = 0x5261
+0x88D5 = 0x5423
+0x88D8 = 0x7443
+0x88D9 = 0x4839
+0x88DF = 0x7444
+0x88E2 = 0x714D
+0x88E3 = 0x714F
+0x88E4 = 0x3F63
+0x88E5 = 0x7150
+0x88E8 = 0x7154
+0x88F0 = 0x7156
+0x88F1 = 0x7151
+0x88F3 = 0x4951
+0x88F4 = 0x4561
+0x88F8 = 0x4263
+0x88F9 = 0x397C
+0x88FC = 0x7153
+0x88FE = 0x7155
+0x8902 = 0x3953
+0x890A = 0x715B
+0x8910 = 0x3A56
+0x8912 = 0x307D
+0x8913 = 0x7159
+0x8919 = 0x7158
+0x891A = 0x7152
+0x891B = 0x715A
+0x8921 = 0x7157
+0x8925 = 0x486C
+0x892A = 0x4D4A
+0x892B = 0x715D
+0x8930 = 0x653D
+0x8934 = 0x715C
+0x8936 = 0x715E
+0x8941 = 0x715F
+0x8944 = 0x4F65
+0x895E = 0x7445
+0x895F = 0x3D73
+0x8966 = 0x7160
+0x897B = 0x7161
+0x897F = 0x4E77
+0x8981 = 0x522A
+0x8983 = 0x717B
+0x8986 = 0x3832
+0x89C1 = 0x3C7B
+0x89C2 = 0x395B
+0x89C4 = 0x3966
+0x89C5 = 0x4359
+0x89C6 = 0x4A53
+0x89C7 = 0x6A68
+0x89C8 = 0x4040
+0x89C9 = 0x3E75
+0x89CA = 0x6A69
+0x89CB = 0x6A6A
+0x89CC = 0x6A6B
+0x89CE = 0x6A6C
+0x89CF = 0x6A6D
+0x89D0 = 0x6A6E
+0x89D1 = 0x6A6F
+0x89D2 = 0x3D47
+0x89D6 = 0x757B
+0x89DA = 0x757D
+0x89DC = 0x757E
+0x89DE = 0x757C
+0x89E3 = 0x3D62
+0x89E5 = 0x7621
+0x89E6 = 0x3425
+0x89EB = 0x7622
+0x89EF = 0x7623
+0x89F3 = 0x6C32
+0x8A00 = 0x5154
+0x8A07 = 0x596A
+0x8A3E = 0x7624
+0x8A48 = 0x6E3A
+0x8A79 = 0x5532
+0x8A89 = 0x537E
+0x8A8A = 0x4C5C
+0x8A93 = 0x4A44
+0x8B07 = 0x6540
+0x8B26 = 0x7625
+0x8B66 = 0x3E2F
+0x8B6C = 0x4629
+0x8BA0 = 0x5A25
+0x8BA1 = 0x3C46
+0x8BA2 = 0x3629
+0x8BA3 = 0x383C
+0x8BA4 = 0x484F
+0x8BA5 = 0x3C25
+0x8BA6 = 0x5A26
+0x8BA7 = 0x5A27
+0x8BA8 = 0x4C56
+0x8BA9 = 0x4843
+0x8BAA = 0x5A28
+0x8BAB = 0x467D
+0x8BAD = 0x5135
+0x8BAE = 0x5269
+0x8BAF = 0x5136
+0x8BB0 = 0x3C47
+0x8BB2 = 0x3D32
+0x8BB3 = 0x3B64
+0x8BB4 = 0x5A29
+0x8BB5 = 0x5A2A
+0x8BB6 = 0x5148
+0x8BB7 = 0x5A2B
+0x8BB8 = 0x506D
+0x8BB9 = 0x366F
+0x8BBA = 0x425B
+0x8BBC = 0x4B4F
+0x8BBD = 0x376D
+0x8BBE = 0x4968
+0x8BBF = 0x3743
+0x8BC0 = 0x3E77
+0x8BC1 = 0x5624
+0x8BC2 = 0x5A2C
+0x8BC3 = 0x5A2D
+0x8BC4 = 0x4640
+0x8BC5 = 0x5767
+0x8BC6 = 0x4A36
+0x8BC8 = 0x5529
+0x8BC9 = 0x4B5F
+0x8BCA = 0x556F
+0x8BCB = 0x5A2E
+0x8BCC = 0x565F
+0x8BCD = 0x344A
+0x8BCE = 0x5A30
+0x8BCF = 0x5A2F
+0x8BD1 = 0x526B
+0x8BD2 = 0x5A31
+0x8BD3 = 0x5A32
+0x8BD4 = 0x5A33
+0x8BD5 = 0x4A54
+0x8BD6 = 0x5A34
+0x8BD7 = 0x4A2B
+0x8BD8 = 0x5A35
+0x8BD9 = 0x5A36
+0x8BDA = 0x334F
+0x8BDB = 0x566F
+0x8BDC = 0x5A37
+0x8BDD = 0x3B30
+0x8BDE = 0x352E
+0x8BDF = 0x5A38
+0x8BE0 = 0x5A39
+0x8BE1 = 0x396E
+0x8BE2 = 0x512F
+0x8BE3 = 0x5268
+0x8BE4 = 0x5A3A
+0x8BE5 = 0x3843
+0x8BE6 = 0x4F6A
+0x8BE7 = 0x326F
+0x8BE8 = 0x5A3B
+0x8BE9 = 0x5A3C
+0x8BEB = 0x3D6B
+0x8BEC = 0x4E5C
+0x8BED = 0x536F
+0x8BEE = 0x5A3D
+0x8BEF = 0x4E73
+0x8BF0 = 0x5A3E
+0x8BF1 = 0x5355
+0x8BF2 = 0x3B65
+0x8BF3 = 0x5A3F
+0x8BF4 = 0x4B35
+0x8BF5 = 0x4B50
+0x8BF6 = 0x5A40
+0x8BF7 = 0x476B
+0x8BF8 = 0x566E
+0x8BF9 = 0x5A41
+0x8BFA = 0x4535
+0x8BFB = 0x3641
+0x8BFC = 0x5A42
+0x8BFD = 0x374C
+0x8BFE = 0x3F4E
+0x8BFF = 0x5A43
+0x8C00 = 0x5A44
+0x8C01 = 0x4B2D
+0x8C02 = 0x5A45
+0x8C03 = 0x3577
+0x8C04 = 0x5A46
+0x8C05 = 0x4142
+0x8C06 = 0x573B
+0x8C07 = 0x5A47
+0x8C08 = 0x4C38
+0x8C0A = 0x526A
+0x8C0B = 0x4431
+0x8C0C = 0x5A48
+0x8C0D = 0x357D
+0x8C0E = 0x3B51
+0x8C0F = 0x5A49
+0x8C10 = 0x5033
+0x8C11 = 0x5A4A
+0x8C12 = 0x5A4B
+0x8C13 = 0x4E3D
+0x8C14 = 0x5A4C
+0x8C15 = 0x5A4D
+0x8C16 = 0x5A4E
+0x8C17 = 0x3277
+0x8C18 = 0x5A51
+0x8C19 = 0x5A4F
+0x8C1A = 0x5168
+0x8C1B = 0x5A50
+0x8C1C = 0x4355
+0x8C1D = 0x5A52
+0x8C1F = 0x5A53
+0x8C20 = 0x5A54
+0x8C21 = 0x5A55
+0x8C22 = 0x503B
+0x8C23 = 0x5225
+0x8C24 = 0x3079
+0x8C25 = 0x5A56
+0x8C26 = 0x472B
+0x8C27 = 0x5A57
+0x8C28 = 0x3D77
+0x8C29 = 0x4321
+0x8C2A = 0x5A58
+0x8C2B = 0x5A59
+0x8C2C = 0x437D
+0x8C2D = 0x4C37
+0x8C2E = 0x5A5A
+0x8C2F = 0x5A5B
+0x8C30 = 0x403E
+0x8C31 = 0x4657
+0x8C32 = 0x5A5C
+0x8C33 = 0x5A5D
+0x8C34 = 0x4734
+0x8C35 = 0x5A5E
+0x8C36 = 0x5A5F
+0x8C37 = 0x3948
+0x8C41 = 0x3B6D
+0x8C46 = 0x3639
+0x8C47 = 0x7478
+0x8C49 = 0x7479
+0x8C4C = 0x4D63
+0x8C55 = 0x7539
+0x8C5A = 0x6B60
+0x8C61 = 0x4F73
+0x8C62 = 0x3B3F
+0x8C6A = 0x3A40
+0x8C6B = 0x5425
+0x8C73 = 0x6159
+0x8C78 = 0x7574
+0x8C79 = 0x312A
+0x8C7A = 0x3272
+0x8C82 = 0x7575
+0x8C85 = 0x7577
+0x8C89 = 0x3A51
+0x8C8A = 0x7576
+0x8C8C = 0x4332
+0x8C94 = 0x7579
+0x8C98 = 0x7578
+0x8D1D = 0x3134
+0x8D1E = 0x556A
+0x8D1F = 0x383A
+0x8D21 = 0x3931
+0x8D22 = 0x3246
+0x8D23 = 0x5470
+0x8D24 = 0x4F4D
+0x8D25 = 0x305C
+0x8D26 = 0x554B
+0x8D27 = 0x3B75
+0x8D28 = 0x564A
+0x8D29 = 0x3737
+0x8D2A = 0x4C30
+0x8D2B = 0x4636
+0x8D2C = 0x3161
+0x8D2D = 0x393A
+0x8D2E = 0x567C
+0x8D2F = 0x3961
+0x8D30 = 0x3721
+0x8D31 = 0x3C7A
+0x8D32 = 0x6A5A
+0x8D33 = 0x6A5B
+0x8D34 = 0x4C79
+0x8D35 = 0x3973
+0x8D36 = 0x6A5C
+0x8D37 = 0x347B
+0x8D38 = 0x4333
+0x8D39 = 0x3751
+0x8D3A = 0x3A58
+0x8D3B = 0x6A5D
+0x8D3C = 0x5474
+0x8D3D = 0x6A5E
+0x8D3E = 0x3C56
+0x8D3F = 0x3B5F
+0x8D40 = 0x6A5F
+0x8D41 = 0x415E
+0x8D42 = 0x4238
+0x8D43 = 0x545F
+0x8D44 = 0x574A
+0x8D45 = 0x6A60
+0x8D46 = 0x6A61
+0x8D47 = 0x6A64
+0x8D48 = 0x6A62
+0x8D49 = 0x6A63
+0x8D4A = 0x495E
+0x8D4B = 0x3833
+0x8D4C = 0x3644
+0x8D4D = 0x6A65
+0x8D4E = 0x4A6A
+0x8D4F = 0x494D
+0x8D50 = 0x344D
+0x8D53 = 0x6259
+0x8D54 = 0x4562
+0x8D55 = 0x6A66
+0x8D56 = 0x4035
+0x8D58 = 0x5738
+0x8D59 = 0x6A67
+0x8D5A = 0x572C
+0x8D5B = 0x487C
+0x8D5C = 0x5853
+0x8D5D = 0x584D
+0x8D5E = 0x545E
+0x8D60 = 0x5479
+0x8D61 = 0x4944
+0x8D62 = 0x532E
+0x8D63 = 0x3853
+0x8D64 = 0x3360
+0x8D66 = 0x4962
+0x8D67 = 0x7476
+0x8D6B = 0x3A55
+0x8D6D = 0x7477
+0x8D70 = 0x575F
+0x8D73 = 0x7471
+0x8D74 = 0x3830
+0x8D75 = 0x5554
+0x8D76 = 0x384F
+0x8D77 = 0x4670
+0x8D81 = 0x3343
+0x8D84 = 0x7472
+0x8D85 = 0x332C
+0x8D8A = 0x543D
+0x8D8B = 0x4777
+0x8D91 = 0x7474
+0x8D94 = 0x7473
+0x8D9F = 0x4C4B
+0x8DA3 = 0x4824
+0x8DB1 = 0x7475
+0x8DB3 = 0x5763
+0x8DB4 = 0x453F
+0x8DB5 = 0x7540
+0x8DB8 = 0x753B
+0x8DBA = 0x7543
+0x8DBC = 0x7542
+0x8DBE = 0x563A
+0x8DBF = 0x7541
+0x8DC3 = 0x543E
+0x8DC4 = 0x7544
+0x8DC6 = 0x754C
+0x8DCB = 0x304F
+0x8DCC = 0x3578
+0x8DCE = 0x7549
+0x8DCF = 0x754A
+0x8DD1 = 0x455C
+0x8DD6 = 0x7545
+0x8DD7 = 0x7546
+0x8DDA = 0x7547
+0x8DDB = 0x754B
+0x8DDD = 0x3E60
+0x8DDE = 0x7548
+0x8DDF = 0x387A
+0x8DE3 = 0x7550
+0x8DE4 = 0x7553
+0x8DE8 = 0x3F67
+0x8DEA = 0x3972
+0x8DEB = 0x753C
+0x8DEC = 0x754D
+0x8DEF = 0x4237
+0x8DF3 = 0x4C78
+0x8DF5 = 0x3C79
+0x8DF7 = 0x754E
+0x8DF8 = 0x754F
+0x8DF9 = 0x7551
+0x8DFA = 0x3665
+0x8DFB = 0x7552
+0x8DFD = 0x7555
+0x8E05 = 0x753D
+0x8E09 = 0x7554
+0x8E0A = 0x533B
+0x8E0C = 0x336C
+0x8E0F = 0x4C24
+0x8E14 = 0x7556
+0x8E1D = 0x7557
+0x8E1E = 0x3E61
+0x8E1F = 0x7558
+0x8E22 = 0x4C5F
+0x8E23 = 0x755B
+0x8E29 = 0x3248
+0x8E2A = 0x5759
+0x8E2C = 0x7559
+0x8E2E = 0x755A
+0x8E2F = 0x755C
+0x8E31 = 0x7562
+0x8E35 = 0x7560
+0x8E39 = 0x755F
+0x8E3A = 0x755D
+0x8E3D = 0x7561
+0x8E40 = 0x755E
+0x8E41 = 0x7564
+0x8E42 = 0x7565
+0x8E44 = 0x4C63
+0x8E47 = 0x653F
+0x8E48 = 0x3538
+0x8E49 = 0x7563
+0x8E4A = 0x7568
+0x8E4B = 0x4C23
+0x8E51 = 0x7566
+0x8E52 = 0x7567
+0x8E59 = 0x753E
+0x8E66 = 0x3144
+0x8E69 = 0x753F
+0x8E6C = 0x3545
+0x8E6D = 0x3264
+0x8E6F = 0x756C
+0x8E70 = 0x7569
+0x8E72 = 0x3657
+0x8E74 = 0x756D
+0x8E76 = 0x756A
+0x8E7C = 0x756B
+0x8E7F = 0x345A
+0x8E81 = 0x546A
+0x8E85 = 0x756E
+0x8E87 = 0x3379
+0x8E8F = 0x756F
+0x8E90 = 0x7571
+0x8E94 = 0x7570
+0x8E9C = 0x7572
+0x8E9E = 0x7573
+0x8EAB = 0x496D
+0x8EAC = 0x392A
+0x8EAF = 0x477B
+0x8EB2 = 0x3663
+0x8EBA = 0x4C49
+0x8ECE = 0x6A26
+0x8F66 = 0x3335
+0x8F67 = 0x547E
+0x8F68 = 0x396C
+0x8F69 = 0x5079
+0x8F6B = 0x696D
+0x8F6C = 0x572A
+0x8F6D = 0x696E
+0x8F6E = 0x4256
+0x8F6F = 0x486D
+0x8F70 = 0x3A64
+0x8F71 = 0x696F
+0x8F72 = 0x6970
+0x8F73 = 0x6971
+0x8F74 = 0x5661
+0x8F75 = 0x6972
+0x8F76 = 0x6973
+0x8F77 = 0x6975
+0x8F78 = 0x6974
+0x8F79 = 0x6976
+0x8F7A = 0x6977
+0x8F7B = 0x4761
+0x8F7C = 0x6978
+0x8F7D = 0x5458
+0x8F7E = 0x6979
+0x8F7F = 0x3D4E
+0x8F81 = 0x697A
+0x8F82 = 0x697B
+0x8F83 = 0x3D4F
+0x8F84 = 0x697C
+0x8F85 = 0x3828
+0x8F86 = 0x413E
+0x8F87 = 0x697D
+0x8F88 = 0x3132
+0x8F89 = 0x3B54
+0x8F8A = 0x3975
+0x8F8B = 0x697E
+0x8F8D = 0x6A21
+0x8F8E = 0x6A22
+0x8F8F = 0x6A23
+0x8F90 = 0x3778
+0x8F91 = 0x3C2D
+0x8F93 = 0x4A64
+0x8F94 = 0x604E
+0x8F95 = 0x542F
+0x8F96 = 0x4F3D
+0x8F97 = 0x5537
+0x8F98 = 0x6A24
+0x8F99 = 0x555E
+0x8F9A = 0x6A25
+0x8F9B = 0x5041
+0x8F9C = 0x393C
+0x8F9E = 0x3447
+0x8F9F = 0x3159
+0x8FA3 = 0x4031
+0x8FA8 = 0x3166
+0x8FA9 = 0x3167
+0x8FAB = 0x3168
+0x8FB0 = 0x333D
+0x8FB1 = 0x4868
+0x8FB6 = 0x6541
+0x8FB9 = 0x315F
+0x8FBD = 0x4149
+0x8FBE = 0x346F
+0x8FC1 = 0x4728
+0x8FC2 = 0x5358
+0x8FC4 = 0x4679
+0x8FC5 = 0x5138
+0x8FC7 = 0x397D
+0x8FC8 = 0x4275
+0x8FCE = 0x532D
+0x8FD0 = 0x544B
+0x8FD1 = 0x3D7C
+0x8FD3 = 0x6542
+0x8FD4 = 0x3735
+0x8FD5 = 0x6543
+0x8FD8 = 0x3B39
+0x8FD9 = 0x5562
+0x8FDB = 0x3D78
+0x8FDC = 0x5436
+0x8FDD = 0x4E25
+0x8FDE = 0x412C
+0x8FDF = 0x3359
+0x8FE2 = 0x4C76
+0x8FE4 = 0x6546
+0x8FE5 = 0x6544
+0x8FE6 = 0x6548
+0x8FE8 = 0x654A
+0x8FE9 = 0x6547
+0x8FEA = 0x354F
+0x8FEB = 0x4648
+0x8FED = 0x357C
+0x8FEE = 0x6545
+0x8FF0 = 0x4A76
+0x8FF3 = 0x6549
+0x8FF7 = 0x4354
+0x8FF8 = 0x3145
+0x8FF9 = 0x3C23
+0x8FFD = 0x5737
+0x9000 = 0x4D4B
+0x9001 = 0x4B4D
+0x9002 = 0x4A4A
+0x9003 = 0x4C53
+0x9004 = 0x654C
+0x9005 = 0x654B
+0x9006 = 0x4466
+0x9009 = 0x5121
+0x900A = 0x5137
+0x900B = 0x654D
+0x900D = 0x6550
+0x900F = 0x4D38
+0x9010 = 0x5670
+0x9011 = 0x654F
+0x9012 = 0x355D
+0x9014 = 0x4D3E
+0x9016 = 0x6551
+0x9017 = 0x363A
+0x901A = 0x4D28
+0x901B = 0x3964
+0x901D = 0x4A45
+0x901E = 0x3351
+0x901F = 0x4B59
+0x9020 = 0x546C
+0x9021 = 0x6552
+0x9022 = 0x376A
+0x9026 = 0x654E
+0x902D = 0x6555
+0x902E = 0x347E
+0x902F = 0x6556
+0x9035 = 0x6553
+0x9036 = 0x6554
+0x9038 = 0x525D
+0x903B = 0x425F
+0x903C = 0x3146
+0x903E = 0x5362
+0x9041 = 0x365D
+0x9042 = 0x4B6C
+0x9044 = 0x6557
+0x9047 = 0x5376
+0x904D = 0x3169
+0x904F = 0x3674
+0x9050 = 0x655A
+0x9051 = 0x6558
+0x9052 = 0x6559
+0x9053 = 0x3540
+0x9057 = 0x5245
+0x9058 = 0x655C
+0x905B = 0x655E
+0x9062 = 0x655D
+0x9063 = 0x4732
+0x9065 = 0x5223
+0x9068 = 0x655B
+0x906D = 0x5462
+0x906E = 0x555A
+0x9074 = 0x6560
+0x9075 = 0x5771
+0x907D = 0x6561
+0x907F = 0x315C
+0x9080 = 0x517B
+0x9082 = 0x6562
+0x9083 = 0x6564
+0x9088 = 0x6563
+0x908B = 0x6565
+0x9091 = 0x5258
+0x9093 = 0x354B
+0x9095 = 0x675F
+0x9097 = 0x5A75
+0x9099 = 0x5A78
+0x909B = 0x5A76
+0x909D = 0x5A77
+0x90A1 = 0x5A7A
+0x90A2 = 0x504F
+0x90A3 = 0x4447
+0x90A6 = 0x306E
+0x90AA = 0x5030
+0x90AC = 0x5A79
+0x90AE = 0x534A
+0x90AF = 0x3A2A
+0x90B0 = 0x5B22
+0x90B1 = 0x4771
+0x90B3 = 0x5A7C
+0x90B4 = 0x5A7B
+0x90B5 = 0x495B
+0x90B6 = 0x5A7D
+0x90B8 = 0x5B21
+0x90B9 = 0x575E
+0x90BA = 0x5A7E
+0x90BB = 0x415A
+0x90BE = 0x5B25
+0x90C1 = 0x5374
+0x90C4 = 0x5B27
+0x90C5 = 0x5B24
+0x90C7 = 0x5B28
+0x90CA = 0x3D3C
+0x90CE = 0x4049
+0x90CF = 0x5B23
+0x90D0 = 0x5B26
+0x90D1 = 0x5623
+0x90D3 = 0x5B29
+0x90D7 = 0x5B2D
+0x90DB = 0x5B2E
+0x90DC = 0x5B2C
+0x90DD = 0x3A42
+0x90E1 = 0x3F24
+0x90E2 = 0x5B2B
+0x90E6 = 0x5B2A
+0x90E7 = 0x5447
+0x90E8 = 0x323F
+0x90EB = 0x5B2F
+0x90ED = 0x3979
+0x90EF = 0x5B30
+0x90F4 = 0x333B
+0x90F8 = 0x3526
+0x90FD = 0x363C
+0x90FE = 0x5B31
+0x9102 = 0x3675
+0x9104 = 0x5B32
+0x9119 = 0x3149
+0x911E = 0x5B34
+0x9122 = 0x5B33
+0x9123 = 0x5B35
+0x912F = 0x5B37
+0x9131 = 0x5B36
+0x9139 = 0x5B38
+0x9143 = 0x5B39
+0x9146 = 0x5B3A
+0x9149 = 0x534F
+0x914A = 0x747A
+0x914B = 0x4775
+0x914C = 0x5743
+0x914D = 0x4564
+0x914E = 0x747C
+0x914F = 0x747D
+0x9150 = 0x747B
+0x9152 = 0x3E46
+0x9157 = 0x506F
+0x915A = 0x3753
+0x915D = 0x544D
+0x915E = 0x4C2A
+0x9161 = 0x7522
+0x9162 = 0x7521
+0x9163 = 0x3A28
+0x9164 = 0x747E
+0x9165 = 0x4B56
+0x9169 = 0x7524
+0x916A = 0x4052
+0x916C = 0x336A
+0x916E = 0x4D2A
+0x916F = 0x7525
+0x9170 = 0x7523
+0x9171 = 0x3D34
+0x9172 = 0x7528
+0x9174 = 0x7529
+0x9175 = 0x3D4D
+0x9176 = 0x4338
+0x9177 = 0x3F61
+0x9178 = 0x4B61
+0x9179 = 0x752A
+0x917D = 0x7526
+0x917E = 0x7527
+0x917F = 0x4470
+0x9185 = 0x752C
+0x9187 = 0x343C
+0x9189 = 0x576D
+0x918B = 0x3457
+0x918C = 0x752B
+0x918D = 0x752E
+0x9190 = 0x752D
+0x9191 = 0x752F
+0x9192 = 0x5051
+0x919A = 0x4351
+0x919B = 0x4829
+0x91A2 = 0x7530
+0x91A3 = 0x7531
+0x91AA = 0x7532
+0x91AD = 0x7533
+0x91AE = 0x7534
+0x91AF = 0x7535
+0x91B4 = 0x7537
+0x91B5 = 0x7536
+0x91BA = 0x7538
+0x91C7 = 0x3249
+0x91C9 = 0x5354
+0x91CA = 0x4A4D
+0x91CC = 0x406F
+0x91CD = 0x5658
+0x91CE = 0x5230
+0x91CF = 0x413F
+0x91D1 = 0x3D70
+0x91DC = 0x382A
+0x9274 = 0x3C78
+0x928E = 0x7646
+0x92AE = 0x7647
+0x92C8 = 0x7648
+0x933E = 0x7649
+0x936A = 0x764A
+0x938F = 0x764C
+0x93CA = 0x764B
+0x93D6 = 0x7769
+0x943E = 0x764D
+0x946B = 0x764E
+0x9485 = 0x6E44
+0x9486 = 0x6E45
+0x9487 = 0x6E46
+0x9488 = 0x556B
+0x9489 = 0x3624
+0x948A = 0x6E48
+0x948B = 0x6E47
+0x948C = 0x6E49
+0x948D = 0x6E4A
+0x948E = 0x4725
+0x948F = 0x6E4B
+0x9490 = 0x6E4C
+0x9492 = 0x3730
+0x9493 = 0x3576
+0x9494 = 0x6E4D
+0x9495 = 0x6E4F
+0x9497 = 0x6E4E
+0x9499 = 0x3846
+0x949A = 0x6E50
+0x949B = 0x6E51
+0x949C = 0x6E52
+0x949D = 0x365B
+0x949E = 0x332E
+0x949F = 0x5653
+0x94A0 = 0x4446
+0x94A1 = 0x3135
+0x94A2 = 0x3856
+0x94A3 = 0x6E53
+0x94A4 = 0x6E54
+0x94A5 = 0x543F
+0x94A6 = 0x4755
+0x94A7 = 0x3E7B
+0x94A8 = 0x4E59
+0x94A9 = 0x3933
+0x94AA = 0x6E56
+0x94AB = 0x6E55
+0x94AC = 0x6E58
+0x94AD = 0x6E57
+0x94AE = 0x4525
+0x94AF = 0x6E59
+0x94B0 = 0x6E5A
+0x94B1 = 0x472E
+0x94B2 = 0x6E5B
+0x94B3 = 0x472F
+0x94B4 = 0x6E5C
+0x94B5 = 0x3227
+0x94B6 = 0x6E5D
+0x94B7 = 0x6E5E
+0x94B8 = 0x6E5F
+0x94B9 = 0x6E60
+0x94BA = 0x6E61
+0x94BB = 0x576A
+0x94BC = 0x6E62
+0x94BD = 0x6E63
+0x94BE = 0x3C58
+0x94BF = 0x6E64
+0x94C0 = 0x534B
+0x94C1 = 0x4C7A
+0x94C2 = 0x322C
+0x94C3 = 0x4165
+0x94C4 = 0x6E65
+0x94C5 = 0x4726
+0x94C6 = 0x432D
+0x94C8 = 0x6E66
+0x94C9 = 0x6E67
+0x94CA = 0x6E68
+0x94CB = 0x6E69
+0x94CC = 0x6E6A
+0x94CD = 0x6E6B
+0x94CE = 0x6E6C
+0x94D0 = 0x6E6D
+0x94D1 = 0x6E6E
+0x94D2 = 0x6E6F
+0x94D5 = 0x6E70
+0x94D6 = 0x6E71
+0x94D7 = 0x6E72
+0x94D8 = 0x6E74
+0x94D9 = 0x6E73
+0x94DB = 0x6E75
+0x94DC = 0x4D2D
+0x94DD = 0x4241
+0x94DE = 0x6E76
+0x94DF = 0x6E77
+0x94E0 = 0x6E78
+0x94E1 = 0x5521
+0x94E2 = 0x6E79
+0x94E3 = 0x4F33
+0x94E4 = 0x6E7A
+0x94E5 = 0x6E7B
+0x94E7 = 0x6E7C
+0x94E8 = 0x6E7D
+0x94E9 = 0x6F21
+0x94EA = 0x6E7E
+0x94EB = 0x6F22
+0x94EC = 0x3875
+0x94ED = 0x437A
+0x94EE = 0x6F23
+0x94EF = 0x6F24
+0x94F0 = 0x3D42
+0x94F1 = 0x523F
+0x94F2 = 0x3279
+0x94F3 = 0x6F25
+0x94F4 = 0x6F26
+0x94F5 = 0x6F27
+0x94F6 = 0x5278
+0x94F7 = 0x6F28
+0x94F8 = 0x567D
+0x94F9 = 0x6F29
+0x94FA = 0x464C
+0x94FC = 0x6F2A
+0x94FD = 0x6F2B
+0x94FE = 0x4134
+0x94FF = 0x6F2C
+0x9500 = 0x4F7A
+0x9501 = 0x4B78
+0x9502 = 0x6F2E
+0x9503 = 0x6F2D
+0x9504 = 0x337A
+0x9505 = 0x3978
+0x9506 = 0x6F2F
+0x9507 = 0x6F30
+0x9508 = 0x5062
+0x9509 = 0x6F31
+0x950A = 0x6F32
+0x950B = 0x3766
+0x950C = 0x503F
+0x950D = 0x6F33
+0x950E = 0x6F34
+0x950F = 0x6F35
+0x9510 = 0x4871
+0x9511 = 0x4C60
+0x9512 = 0x6F36
+0x9513 = 0x6F37
+0x9514 = 0x6F38
+0x9515 = 0x6F39
+0x9516 = 0x6F3A
+0x9517 = 0x5560
+0x9518 = 0x6F3B
+0x9519 = 0x346D
+0x951A = 0x432A
+0x951B = 0x6F3C
+0x951D = 0x6F3D
+0x951E = 0x6F3E
+0x951F = 0x6F3F
+0x9521 = 0x4E7D
+0x9522 = 0x6F40
+0x9523 = 0x4260
+0x9524 = 0x3438
+0x9525 = 0x5736
+0x9526 = 0x3D75
+0x9528 = 0x4F47
+0x9529 = 0x6F43
+0x952A = 0x6F41
+0x952B = 0x6F42
+0x952C = 0x6F44
+0x952D = 0x3627
+0x952E = 0x3C7C
+0x952F = 0x3E62
+0x9530 = 0x434C
+0x9531 = 0x6F45
+0x9532 = 0x6F46
+0x9534 = 0x6F47
+0x9535 = 0x6F4F
+0x9536 = 0x6F48
+0x9537 = 0x6F49
+0x9538 = 0x6F4A
+0x9539 = 0x4742
+0x953A = 0x6F71
+0x953B = 0x364D
+0x953C = 0x6F4B
+0x953E = 0x6F4C
+0x953F = 0x6F4D
+0x9540 = 0x3646
+0x9541 = 0x433E
+0x9542 = 0x6F4E
+0x9544 = 0x6F50
+0x9545 = 0x6F51
+0x9546 = 0x6F52
+0x9547 = 0x5572
+0x9549 = 0x6F53
+0x954A = 0x4477
+0x954C = 0x6F54
+0x954D = 0x4478
+0x954E = 0x6F55
+0x954F = 0x6F56
+0x9550 = 0x3864
+0x9551 = 0x3077
+0x9552 = 0x6F57
+0x9553 = 0x6F58
+0x9554 = 0x6F59
+0x9556 = 0x6F5A
+0x9557 = 0x6F5B
+0x9558 = 0x6F5C
+0x9559 = 0x6F5D
+0x955B = 0x6F5E
+0x955C = 0x3E35
+0x955D = 0x6F61
+0x955E = 0x6F5F
+0x955F = 0x6F60
+0x9561 = 0x6F62
+0x9562 = 0x6F63
+0x9563 = 0x414D
+0x9564 = 0x6F64
+0x9565 = 0x6F65
+0x9566 = 0x6F66
+0x9567 = 0x6F67
+0x9568 = 0x6F68
+0x9569 = 0x6F69
+0x956A = 0x6F6A
+0x956B = 0x6F6B
+0x956C = 0x6F6C
+0x956D = 0x4058
+0x956F = 0x6F6D
+0x9570 = 0x412D
+0x9571 = 0x6F6E
+0x9572 = 0x6F6F
+0x9573 = 0x6F70
+0x9576 = 0x4F62
+0x957F = 0x3324
+0x95E8 = 0x4345
+0x95E9 = 0x6345
+0x95EA = 0x4941
+0x95EB = 0x6346
+0x95ED = 0x3155
+0x95EE = 0x4E4A
+0x95EF = 0x3433
+0x95F0 = 0x4872
+0x95F1 = 0x6347
+0x95F2 = 0x4F50
+0x95F3 = 0x6348
+0x95F4 = 0x3C64
+0x95F5 = 0x6349
+0x95F6 = 0x634A
+0x95F7 = 0x4346
+0x95F8 = 0x5522
+0x95F9 = 0x4456
+0x95FA = 0x396B
+0x95FB = 0x4E45
+0x95FC = 0x634B
+0x95FD = 0x4376
+0x95FE = 0x634C
+0x9600 = 0x3727
+0x9601 = 0x3873
+0x9602 = 0x3A52
+0x9603 = 0x634D
+0x9604 = 0x634E
+0x9605 = 0x5444
+0x9606 = 0x634F
+0x9608 = 0x6350
+0x9609 = 0x514B
+0x960A = 0x6351
+0x960B = 0x6352
+0x960C = 0x6353
+0x960D = 0x6354
+0x960E = 0x5156
+0x960F = 0x6355
+0x9610 = 0x327B
+0x9611 = 0x403B
+0x9612 = 0x6356
+0x9614 = 0x402B
+0x9615 = 0x6357
+0x9616 = 0x6358
+0x9617 = 0x6359
+0x9619 = 0x635A
+0x961A = 0x635B
+0x961C = 0x3837
+0x961D = 0x5A62
+0x961F = 0x3653
+0x9621 = 0x5A64
+0x9622 = 0x5A63
+0x962A = 0x5A66
+0x962E = 0x486E
+0x9631 = 0x5A65
+0x9632 = 0x3740
+0x9633 = 0x5174
+0x9634 = 0x5275
+0x9635 = 0x5573
+0x9636 = 0x3D57
+0x963B = 0x5768
+0x963C = 0x5A68
+0x963D = 0x5A67
+0x963F = 0x3022
+0x9640 = 0x4D53
+0x9642 = 0x5A69
+0x9644 = 0x383D
+0x9645 = 0x3C4A
+0x9646 = 0x423D
+0x9647 = 0x4224
+0x9648 = 0x3342
+0x9649 = 0x5A6A
+0x964B = 0x422A
+0x964C = 0x4430
+0x964D = 0x3D35
+0x9650 = 0x4F5E
+0x9654 = 0x5A6B
+0x9655 = 0x4942
+0x965B = 0x315D
+0x965F = 0x5A6C
+0x9661 = 0x3638
+0x9662 = 0x543A
+0x9664 = 0x337D
+0x9667 = 0x5A6D
+0x9668 = 0x5449
+0x9669 = 0x4F55
+0x966A = 0x4563
+0x966C = 0x5A6E
+0x9672 = 0x5A6F
+0x9674 = 0x5A70
+0x9675 = 0x416A
+0x9676 = 0x4C55
+0x9677 = 0x4F5D
+0x9685 = 0x5367
+0x9686 = 0x4221
+0x9688 = 0x5A71
+0x968B = 0x4B65
+0x968D = 0x5A72
+0x968F = 0x4B66
+0x9690 = 0x527E
+0x9694 = 0x3874
+0x9697 = 0x5A73
+0x9698 = 0x302F
+0x9699 = 0x4F36
+0x969C = 0x554F
+0x96A7 = 0x4B6D
+0x96B0 = 0x5A74
+0x96B3 = 0x6344
+0x96B6 = 0x4125
+0x96B9 = 0x763F
+0x96BC = 0x7640
+0x96BD = 0x7641
+0x96BE = 0x4451
+0x96C0 = 0x4838
+0x96C1 = 0x5163
+0x96C4 = 0x505B
+0x96C5 = 0x5145
+0x96C6 = 0x3C2F
+0x96C7 = 0x394D
+0x96C9 = 0x6F74
+0x96CC = 0x3446
+0x96CD = 0x533A
+0x96CE = 0x7642
+0x96CF = 0x337B
+0x96D2 = 0x7643
+0x96D5 = 0x3571
+0x96E0 = 0x7645
+0x96E8 = 0x536A
+0x96E9 = 0x7627
+0x96EA = 0x5129
+0x96EF = 0x7629
+0x96F3 = 0x7628
+0x96F6 = 0x4163
+0x96F7 = 0x4057
+0x96F9 = 0x3122
+0x96FE = 0x4E6D
+0x9700 = 0x5068
+0x9701 = 0x762B
+0x9704 = 0x4F76
+0x9706 = 0x762A
+0x9707 = 0x5570
+0x9708 = 0x762C
+0x9709 = 0x4339
+0x970D = 0x3B74
+0x970E = 0x762E
+0x970F = 0x762D
+0x9713 = 0x445E
+0x9716 = 0x4158
+0x971C = 0x4B2A
+0x971E = 0x4F3C
+0x972A = 0x762F
+0x972D = 0x7630
+0x9730 = 0x7631
+0x9732 = 0x4236
+0x9738 = 0x3054
+0x9739 = 0x4579
+0x973E = 0x7632
+0x9752 = 0x4760
+0x9753 = 0x7626
+0x9756 = 0x3E38
+0x9759 = 0x3E32
+0x975B = 0x3565
+0x975E = 0x3747
+0x9760 = 0x3F3F
+0x9761 = 0x4352
+0x9762 = 0x4366
+0x9765 = 0x584C
+0x9769 = 0x386F
+0x9773 = 0x3D79
+0x9774 = 0x5125
+0x9776 = 0x3050
+0x977C = 0x7730
+0x9785 = 0x7731
+0x978B = 0x502C
+0x978D = 0x3030
+0x9791 = 0x7732
+0x9792 = 0x7733
+0x9794 = 0x7734
+0x9798 = 0x474A
+0x97A0 = 0x3E4F
+0x97A3 = 0x7737
+0x97AB = 0x7736
+0x97AD = 0x315E
+0x97AF = 0x7735
+0x97B2 = 0x7738
+0x97B4 = 0x7739
+0x97E6 = 0x4E24
+0x97E7 = 0x484D
+0x97E9 = 0x3A2B
+0x97EA = 0x6838
+0x97EB = 0x6839
+0x97EC = 0x683A
+0x97ED = 0x3E42
+0x97F3 = 0x5274
+0x97F5 = 0x544F
+0x97F6 = 0x4958
+0x9875 = 0x5233
+0x9876 = 0x3625
+0x9877 = 0x476A
+0x9878 = 0x717C
+0x9879 = 0x4F6E
+0x987A = 0x4B33
+0x987B = 0x506B
+0x987C = 0x676F
+0x987D = 0x4D67
+0x987E = 0x394B
+0x987F = 0x3659
+0x9880 = 0x717D
+0x9881 = 0x3064
+0x9882 = 0x4B4C
+0x9883 = 0x717E
+0x9884 = 0x5424
+0x9885 = 0x422D
+0x9886 = 0x416C
+0x9887 = 0x4644
+0x9888 = 0x3E31
+0x9889 = 0x7221
+0x988A = 0x3C55
+0x988C = 0x7222
+0x988D = 0x7223
+0x988F = 0x7224
+0x9890 = 0x5243
+0x9891 = 0x4635
+0x9893 = 0x4D47
+0x9894 = 0x7225
+0x9896 = 0x5331
+0x9897 = 0x3F45
+0x9898 = 0x4C62
+0x989A = 0x7226
+0x989B = 0x7227
+0x989C = 0x5155
+0x989D = 0x366E
+0x989E = 0x7228
+0x989F = 0x7229
+0x98A0 = 0x355F
+0x98A1 = 0x722A
+0x98A2 = 0x722B
+0x98A4 = 0x327C
+0x98A5 = 0x722C
+0x98A6 = 0x722D
+0x98A7 = 0x4827
+0x98CE = 0x3767
+0x98D1 = 0x6C29
+0x98D2 = 0x6C2A
+0x98D3 = 0x6C2B
+0x98D5 = 0x6C2C
+0x98D8 = 0x462E
+0x98D9 = 0x6C2D
+0x98DA = 0x6C2E
+0x98DE = 0x3749
+0x98DF = 0x4A33
+0x98E7 = 0x6238
+0x98E8 = 0x774F
+0x990D = 0x7750
+0x9910 = 0x324D
+0x992E = 0x7751
+0x9954 = 0x7753
+0x9955 = 0x7752
+0x9963 = 0x623B
+0x9965 = 0x3C22
+0x9967 = 0x623C
+0x9968 = 0x623D
+0x9969 = 0x623E
+0x996A = 0x623F
+0x996B = 0x6240
+0x996C = 0x6241
+0x996D = 0x3739
+0x996E = 0x527B
+0x996F = 0x3D24
+0x9970 = 0x4A4E
+0x9971 = 0x3125
+0x9972 = 0x4B47
+0x9974 = 0x6242
+0x9975 = 0x367C
+0x9976 = 0x4844
+0x9977 = 0x6243
+0x997A = 0x3D48
+0x997C = 0x317D
+0x997D = 0x6244
+0x997F = 0x3676
+0x9980 = 0x6245
+0x9981 = 0x4459
+0x9984 = 0x6246
+0x9985 = 0x4F5A
+0x9986 = 0x395D
+0x9987 = 0x6247
+0x9988 = 0x4021
+0x998A = 0x6248
+0x998B = 0x3276
+0x998D = 0x6249
+0x998F = 0x4173
+0x9990 = 0x624A
+0x9991 = 0x624B
+0x9992 = 0x4278
+0x9993 = 0x624C
+0x9994 = 0x624D
+0x9995 = 0x624E
+0x9996 = 0x4A57
+0x9997 = 0x5838
+0x9998 = 0x5965
+0x9999 = 0x4F63
+0x99A5 = 0x7025
+0x99A8 = 0x5C30
+0x9A6C = 0x426D
+0x9A6D = 0x5426
+0x9A6E = 0x4D54
+0x9A6F = 0x5131
+0x9A70 = 0x335B
+0x9A71 = 0x477D
+0x9A73 = 0x3235
+0x9A74 = 0x423F
+0x9A75 = 0x6660
+0x9A76 = 0x4A3B
+0x9A77 = 0x6661
+0x9A78 = 0x6662
+0x9A79 = 0x3E54
+0x9A7A = 0x6663
+0x9A7B = 0x5724
+0x9A7C = 0x4D55
+0x9A7D = 0x6665
+0x9A7E = 0x3C5D
+0x9A7F = 0x6664
+0x9A80 = 0x6666
+0x9A81 = 0x6667
+0x9A82 = 0x426E
+0x9A84 = 0x3D3E
+0x9A85 = 0x6668
+0x9A86 = 0x4266
+0x9A87 = 0x3A27
+0x9A88 = 0x6669
+0x9A8A = 0x666A
+0x9A8B = 0x3352
+0x9A8C = 0x5169
+0x9A8F = 0x3F25
+0x9A90 = 0x666B
+0x9A91 = 0x466F
+0x9A92 = 0x666C
+0x9A93 = 0x666D
+0x9A96 = 0x666E
+0x9A97 = 0x462D
+0x9A98 = 0x666F
+0x9A9A = 0x4927
+0x9A9B = 0x6670
+0x9A9C = 0x6671
+0x9A9D = 0x6672
+0x9A9E = 0x6539
+0x9A9F = 0x6673
+0x9AA0 = 0x6674
+0x9AA1 = 0x4262
+0x9AA2 = 0x6675
+0x9AA3 = 0x6676
+0x9AA4 = 0x5668
+0x9AA5 = 0x6677
+0x9AA7 = 0x6678
+0x9AA8 = 0x3947
+0x9AB0 = 0x773B
+0x9AB1 = 0x773A
+0x9AB6 = 0x773E
+0x9AB7 = 0x773C
+0x9AB8 = 0x3A21
+0x9ABA = 0x773F
+0x9ABC = 0x7740
+0x9AC0 = 0x7742
+0x9AC1 = 0x7741
+0x9AC2 = 0x7744
+0x9AC5 = 0x7743
+0x9ACB = 0x7745
+0x9ACC = 0x7746
+0x9AD1 = 0x7747
+0x9AD3 = 0x4B68
+0x9AD8 = 0x385F
+0x9ADF = 0x7754
+0x9AE1 = 0x7755
+0x9AE6 = 0x7756
+0x9AEB = 0x7758
+0x9AED = 0x775A
+0x9AEF = 0x7757
+0x9AF9 = 0x775B
+0x9AFB = 0x7759
+0x9B03 = 0x5757
+0x9B08 = 0x775C
+0x9B0F = 0x775D
+0x9B13 = 0x775E
+0x9B1F = 0x775F
+0x9B23 = 0x7760
+0x9B2F = 0x5B4B
+0x9B32 = 0x582A
+0x9B3B = 0x6577
+0x9B3C = 0x396D
+0x9B41 = 0x3F7D
+0x9B42 = 0x3B6A
+0x9B43 = 0x7749
+0x9B44 = 0x4647
+0x9B45 = 0x7748
+0x9B47 = 0x774A
+0x9B48 = 0x774C
+0x9B49 = 0x774B
+0x9B4D = 0x774D
+0x9B4F = 0x4E3A
+0x9B51 = 0x774E
+0x9B54 = 0x4427
+0x9C7C = 0x5363
+0x9C7F = 0x764F
+0x9C81 = 0x4233
+0x9C82 = 0x7650
+0x9C85 = 0x7651
+0x9C86 = 0x7652
+0x9C87 = 0x7653
+0x9C88 = 0x7654
+0x9C8B = 0x7656
+0x9C8D = 0x312B
+0x9C8E = 0x7657
+0x9C90 = 0x7658
+0x9C91 = 0x7659
+0x9C92 = 0x765A
+0x9C94 = 0x765B
+0x9C95 = 0x765C
+0x9C9A = 0x765D
+0x9C9B = 0x765E
+0x9C9C = 0x4F4A
+0x9C9E = 0x765F
+0x9C9F = 0x7660
+0x9CA0 = 0x7661
+0x9CA1 = 0x7662
+0x9CA2 = 0x7663
+0x9CA3 = 0x7664
+0x9CA4 = 0x4070
+0x9CA5 = 0x7665
+0x9CA6 = 0x7666
+0x9CA7 = 0x7667
+0x9CA8 = 0x7668
+0x9CA9 = 0x7669
+0x9CAB = 0x766A
+0x9CAD = 0x766B
+0x9CAE = 0x766C
+0x9CB0 = 0x766D
+0x9CB1 = 0x766E
+0x9CB2 = 0x766F
+0x9CB3 = 0x7670
+0x9CB4 = 0x7671
+0x9CB5 = 0x7672
+0x9CB6 = 0x7673
+0x9CB7 = 0x7674
+0x9CB8 = 0x3E28
+0x9CBA = 0x7675
+0x9CBB = 0x7676
+0x9CBC = 0x7677
+0x9CBD = 0x7678
+0x9CC3 = 0x487A
+0x9CC4 = 0x7679
+0x9CC5 = 0x767A
+0x9CC6 = 0x767B
+0x9CC7 = 0x767C
+0x9CCA = 0x767D
+0x9CCB = 0x767E
+0x9CCC = 0x7721
+0x9CCD = 0x7722
+0x9CCE = 0x7723
+0x9CCF = 0x7724
+0x9CD0 = 0x7725
+0x9CD3 = 0x7726
+0x9CD4 = 0x7727
+0x9CD5 = 0x7728
+0x9CD6 = 0x316E
+0x9CD7 = 0x7729
+0x9CD8 = 0x772A
+0x9CD9 = 0x772B
+0x9CDC = 0x772C
+0x9CDD = 0x772D
+0x9CDE = 0x415B
+0x9CDF = 0x772E
+0x9CE2 = 0x772F
+0x9E1F = 0x4471
+0x9E20 = 0x702F
+0x9E21 = 0x3C26
+0x9E22 = 0x7030
+0x9E23 = 0x4379
+0x9E25 = 0x4538
+0x9E26 = 0x513B
+0x9E28 = 0x7031
+0x9E29 = 0x7032
+0x9E2A = 0x7033
+0x9E2B = 0x7034
+0x9E2C = 0x7035
+0x9E2D = 0x513C
+0x9E2F = 0x516C
+0x9E31 = 0x7037
+0x9E32 = 0x7036
+0x9E33 = 0x5427
+0x9E35 = 0x4D52
+0x9E36 = 0x7038
+0x9E37 = 0x703A
+0x9E38 = 0x7039
+0x9E39 = 0x703B
+0x9E3A = 0x703C
+0x9E3D = 0x386B
+0x9E3E = 0x703D
+0x9E3F = 0x3A68
+0x9E41 = 0x703E
+0x9E42 = 0x703F
+0x9E43 = 0x3E69
+0x9E44 = 0x7040
+0x9E45 = 0x366C
+0x9E46 = 0x7041
+0x9E47 = 0x7042
+0x9E48 = 0x7043
+0x9E49 = 0x7044
+0x9E4A = 0x4835
+0x9E4B = 0x7045
+0x9E4C = 0x7046
+0x9E4E = 0x7047
+0x9E4F = 0x4574
+0x9E51 = 0x7048
+0x9E55 = 0x7049
+0x9E57 = 0x704A
+0x9E58 = 0x773D
+0x9E5A = 0x704B
+0x9E5B = 0x704C
+0x9E5C = 0x704D
+0x9E5E = 0x704E
+0x9E63 = 0x704F
+0x9E64 = 0x3A57
+0x9E66 = 0x7050
+0x9E67 = 0x7051
+0x9E68 = 0x7052
+0x9E69 = 0x7053
+0x9E6A = 0x7054
+0x9E6B = 0x7055
+0x9E6C = 0x7056
+0x9E6D = 0x7058
+0x9E70 = 0x5325
+0x9E71 = 0x7057
+0x9E73 = 0x7059
+0x9E7E = 0x753A
+0x9E7F = 0x4239
+0x9E82 = 0x7764
+0x9E87 = 0x7765
+0x9E88 = 0x7766
+0x9E8B = 0x7767
+0x9E92 = 0x7768
+0x9E93 = 0x4234
+0x9E9D = 0x776A
+0x9E9F = 0x776B
+0x9EA6 = 0x4273
+0x9EB4 = 0x7470
+0x9EB8 = 0x746F
+0x9EBB = 0x4269
+0x9EBD = 0x7761
+0x9EBE = 0x7762
+0x9EC4 = 0x3B46
+0x9EC9 = 0x5964
+0x9ECD = 0x4A72
+0x9ECE = 0x4068
+0x9ECF = 0x7024
+0x9ED1 = 0x3A5A
+0x9ED4 = 0x472D
+0x9ED8 = 0x442C
+0x9EDB = 0x776C
+0x9EDC = 0x776D
+0x9EDD = 0x776E
+0x9EDF = 0x7770
+0x9EE0 = 0x776F
+0x9EE2 = 0x7771
+0x9EE5 = 0x7774
+0x9EE7 = 0x7773
+0x9EE9 = 0x7772
+0x9EEA = 0x7775
+0x9EEF = 0x7776
+0x9EF9 = 0x6D69
+0x9EFB = 0x6D6A
+0x9EFC = 0x6D6B
+0x9EFE = 0x763C
+0x9F0B = 0x763D
+0x9F0D = 0x763E
+0x9F0E = 0x3626
+0x9F10 = 0x583E
+0x9F13 = 0x3944
+0x9F17 = 0x583B
+0x9F19 = 0x5C31
+0x9F20 = 0x4A73
+0x9F22 = 0x7777
+0x9F2C = 0x7778
+0x9F2F = 0x7779
+0x9F37 = 0x777B
+0x9F39 = 0x777A
+0x9F3B = 0x3147
+0x9F3D = 0x777C
+0x9F3E = 0x777D
+0x9F44 = 0x777E
+0x9F50 = 0x466B
+0x9F51 = 0x6C34
+0x9F7F = 0x335D
+0x9F80 = 0x7633
+0x9F83 = 0x7634
+0x9F84 = 0x4164
+0x9F85 = 0x7635
+0x9F86 = 0x7636
+0x9F87 = 0x7637
+0x9F88 = 0x7638
+0x9F89 = 0x7639
+0x9F8A = 0x763A
+0x9F8B = 0x4823
+0x9F8C = 0x763B
+0x9F99 = 0x417A
+0x9F9A = 0x3928
+0x9F9B = 0x6D68
+0x9F9F = 0x396A
+0x9FA0 = 0x595F
+0xFF01 = 0x2321
+0xFF02 = 0x2322
+0xFF03 = 0x2323
+0xFF04 = 0x2167
+0xFF05 = 0x2325
+0xFF06 = 0x2326
+0xFF07 = 0x2327
+0xFF08 = 0x2328
+0xFF09 = 0x2329
+0xFF0A = 0x232A
+0xFF0B = 0x232B
+0xFF0C = 0x232C
+0xFF0D = 0x232D
+0xFF0E = 0x232E
+0xFF0F = 0x232F
+0xFF10 = 0x2330
+0xFF11 = 0x2331
+0xFF12 = 0x2332
+0xFF13 = 0x2333
+0xFF14 = 0x2334
+0xFF15 = 0x2335
+0xFF16 = 0x2336
+0xFF17 = 0x2337
+0xFF18 = 0x2338
+0xFF19 = 0x2339
+0xFF1A = 0x233A
+0xFF1B = 0x233B
+0xFF1C = 0x233C
+0xFF1D = 0x233D
+0xFF1E = 0x233E
+0xFF1F = 0x233F
+0xFF20 = 0x2340
+0xFF21 = 0x2341
+0xFF22 = 0x2342
+0xFF23 = 0x2343
+0xFF24 = 0x2344
+0xFF25 = 0x2345
+0xFF26 = 0x2346
+0xFF27 = 0x2347
+0xFF28 = 0x2348
+0xFF29 = 0x2349
+0xFF2A = 0x234A
+0xFF2B = 0x234B
+0xFF2C = 0x234C
+0xFF2D = 0x234D
+0xFF2E = 0x234E
+0xFF2F = 0x234F
+0xFF30 = 0x2350
+0xFF31 = 0x2351
+0xFF32 = 0x2352
+0xFF33 = 0x2353
+0xFF34 = 0x2354
+0xFF35 = 0x2355
+0xFF36 = 0x2356
+0xFF37 = 0x2357
+0xFF38 = 0x2358
+0xFF39 = 0x2359
+0xFF3A = 0x235A
+0xFF3B = 0x235B
+0xFF3C = 0x235C
+0xFF3D = 0x235D
+0xFF3E = 0x235E
+0xFF3F = 0x235F
+0xFF40 = 0x2360
+0xFF41 = 0x2361
+0xFF42 = 0x2362
+0xFF43 = 0x2363
+0xFF44 = 0x2364
+0xFF45 = 0x2365
+0xFF46 = 0x2366
+0xFF47 = 0x2367
+0xFF48 = 0x2368
+0xFF49 = 0x2369
+0xFF4A = 0x236A
+0xFF4B = 0x236B
+0xFF4C = 0x236C
+0xFF4D = 0x236D
+0xFF4E = 0x236E
+0xFF4F = 0x236F
+0xFF50 = 0x2370
+0xFF51 = 0x2371
+0xFF52 = 0x2372
+0xFF53 = 0x2373
+0xFF54 = 0x2374
+0xFF55 = 0x2375
+0xFF56 = 0x2376
+0xFF57 = 0x2377
+0xFF58 = 0x2378
+0xFF59 = 0x2379
+0xFF5A = 0x237A
+0xFF5B = 0x237B
+0xFF5C = 0x237C
+0xFF5D = 0x237D
+0xFF5E = 0x212B
+0xFFE0 = 0x2169
+0xFFE1 = 0x216A
+0xFFE3 = 0x237E
+0xFFE5 = 0x2324
+END_MAP
diff --git a/enc/trans/JIS/JISX0201-KANA%UCS.src b/enc/trans/JIS/JISX0201-KANA%UCS.src
new file mode 100644
index 0000000000..d25b580fed
--- /dev/null
+++ b/enc/trans/JIS/JISX0201-KANA%UCS.src
@@ -0,0 +1,127 @@
+# $NetBSD: JISX0201-KANA%UCS.src,v 1.3 2006/10/26 16:19:02 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		JISX0201-KANA/UCS
+SRC_ZONE	0x21-0x5F
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             JIS X 0201 (1976) to Unicode 1.1 Table
+#	Unicode version:  1.1
+#	Table version:    0.9
+#	Table format:     Format A
+#	Date:             8 March 1994
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from JIS X 0201 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between JIS X 0201 and
+# Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Three tab-separated columns
+#		Column #1 is the shift JIS code (in hex as 0xXX)
+#		Column #2 is the Unicode (in hex as 0xXXXX)
+#		Column #3 the Unicode (ISO 10646) name (follows a comment sign)
+#
+#	The entries are in JIS order
+#
+#
+0x21 = 0xFF61
+0x22 = 0xFF62
+0x23 = 0xFF63
+0x24 = 0xFF64
+0x25 = 0xFF65
+0x26 = 0xFF66
+0x27 = 0xFF67
+0x28 = 0xFF68
+0x29 = 0xFF69
+0x2A = 0xFF6A
+0x2B = 0xFF6B
+0x2C = 0xFF6C
+0x2D = 0xFF6D
+0x2E = 0xFF6E
+0x2F = 0xFF6F
+0x30 = 0xFF70
+0x31 = 0xFF71
+0x32 = 0xFF72
+0x33 = 0xFF73
+0x34 = 0xFF74
+0x35 = 0xFF75
+0x36 = 0xFF76
+0x37 = 0xFF77
+0x38 = 0xFF78
+0x39 = 0xFF79
+0x3A = 0xFF7A
+0x3B = 0xFF7B
+0x3C = 0xFF7C
+0x3D = 0xFF7D
+0x3E = 0xFF7E
+0x3F = 0xFF7F
+0x40 = 0xFF80
+0x41 = 0xFF81
+0x42 = 0xFF82
+0x43 = 0xFF83
+0x44 = 0xFF84
+0x45 = 0xFF85
+0x46 = 0xFF86
+0x47 = 0xFF87
+0x48 = 0xFF88
+0x49 = 0xFF89
+0x4A = 0xFF8A
+0x4B = 0xFF8B
+0x4C = 0xFF8C
+0x4D = 0xFF8D
+0x4E = 0xFF8E
+0x4F = 0xFF8F
+0x50 = 0xFF90
+0x51 = 0xFF91
+0x52 = 0xFF92
+0x53 = 0xFF93
+0x54 = 0xFF94
+0x55 = 0xFF95
+0x56 = 0xFF96
+0x57 = 0xFF97
+0x58 = 0xFF98
+0x59 = 0xFF99
+0x5A = 0xFF9A
+0x5B = 0xFF9B
+0x5C = 0xFF9C
+0x5D = 0xFF9D
+0x5E = 0xFF9E
+0x5F = 0xFF9F
+END_MAP
diff --git a/enc/trans/JIS/JISX0208@1990%UCS.src b/enc/trans/JIS/JISX0208@1990%UCS.src
new file mode 100644
index 0000000000..c2cacd422e
--- /dev/null
+++ b/enc/trans/JIS/JISX0208@1990%UCS.src
@@ -0,0 +1,6972 @@
+# $NetBSD: JISX0208@1990%UCS.src,v 1.5 2006/12/02 14:36:13 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		JISX0208:1990/UCS
+SRC_ZONE	0x21-0x74 / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             JIS X 0208 (1990) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.9
+#	Table format:     Format A
+#	Date:             8 March 1994
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from JIS X 0208 (1990) into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between JIS X 0208 (1990)
+# and Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Four tab-separated columns
+#		 Column #1 is the shift-JIS code (in hex)
+#		 Column #2 is the JIS X 0208 code (in hex as 0xXXXX)
+#		 Column #3 is the Unicode (in hex as 0xXXXX)
+#		 Column #4 the Unicode name (follows a comment sign, '#')
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point.  Including all these
+#			names in this file increases its size substantially
+#			and needlessly.  The token "<CJK>" is used for the
+#			name of these characters.  If necessary, it can be
+#			expanded algorithmically by a parser or editor.
+#
+#	The entries are in JIS X 0208 order
+#
+#	The following algorithms can be used to change the hex form
+#		of JIS 0208 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x7426 -> 0x5406 -> 8406
+#
+#   The kanji mappings are a normative part of ISO/IEC 10646.  The
+#       non-kanji mappings are provisional, pending definition of
+#       official mappings by Japanese standards bodies
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+#
+# NetBSD specific modification:
+#	2003-08-18 : change the conversion for reverse solidus (0x2140).
+#			Unicode Inc.'s table converts it to U+005C,
+#			but this may conflict in the case of compound encoding,
+#			e.g. EUC-JP.  Instead, we use U+FF3C.
+#
+0x2121 = 0x3000
+0x2122 = 0x3001
+0x2123 = 0x3002
+0x2124 = 0xFF0C
+0x2125 = 0xFF0E
+0x2126 = 0x30FB
+0x2127 = 0xFF1A
+0x2128 = 0xFF1B
+0x2129 = 0xFF1F
+0x212A = 0xFF01
+0x212B = 0x309B
+0x212C = 0x309C
+0x212D = 0x00B4
+0x212E = 0xFF40
+0x212F = 0x00A8
+0x2130 = 0xFF3E
+0x2131 = 0xFFE3
+0x2132 = 0xFF3F
+0x2133 = 0x30FD
+0x2134 = 0x30FE
+0x2135 = 0x309D
+0x2136 = 0x309E
+0x2137 = 0x3003
+0x2138 = 0x4EDD
+0x2139 = 0x3005
+0x213A = 0x3006
+0x213B = 0x3007
+0x213C = 0x30FC
+0x213D = 0x2014
+0x213E = 0x2010
+0x213F = 0xFF0F
+0x2140 = 0xFF3C
+0x2141 = 0x301C
+0x2142 = 0x2016
+0x2143 = 0xFF5C
+0x2144 = 0x2026
+0x2145 = 0x2025
+0x2146 = 0x2018
+0x2147 = 0x2019
+0x2148 = 0x201C
+0x2149 = 0x201D
+0x214A = 0xFF08
+0x214B = 0xFF09
+0x214C = 0x3014
+0x214D = 0x3015
+0x214E = 0xFF3B
+0x214F = 0xFF3D
+0x2150 = 0xFF5B
+0x2151 = 0xFF5D
+0x2152 = 0x3008
+0x2153 = 0x3009
+0x2154 = 0x300A
+0x2155 = 0x300B
+0x2156 = 0x300C
+0x2157 = 0x300D
+0x2158 = 0x300E
+0x2159 = 0x300F
+0x215A = 0x3010
+0x215B = 0x3011
+0x215C = 0xFF0B
+0x215D = 0x2212
+0x215E = 0x00B1
+0x215F = 0x00D7
+0x2160 = 0x00F7
+0x2161 = 0xFF1D
+0x2162 = 0x2260
+0x2163 = 0xFF1C
+0x2164 = 0xFF1E
+0x2165 = 0x2266
+0x2166 = 0x2267
+0x2167 = 0x221E
+0x2168 = 0x2234
+0x2169 = 0x2642
+0x216A = 0x2640
+0x216B = 0x00B0
+0x216C = 0x2032
+0x216D = 0x2033
+0x216E = 0x2103
+0x216F = 0xFFE5
+0x2170 = 0xFF04
+0x2171 = 0x00A2
+0x2172 = 0x00A3
+0x2173 = 0xFF05
+0x2174 = 0xFF03
+0x2175 = 0xFF06
+0x2176 = 0xFF0A
+0x2177 = 0xFF20
+0x2178 = 0x00A7
+0x2179 = 0x2606
+0x217A = 0x2605
+0x217B = 0x25CB
+0x217C = 0x25CF
+0x217D = 0x25CE
+0x217E = 0x25C7
+0x2221 = 0x25C6
+0x2222 = 0x25A1
+0x2223 = 0x25A0
+0x2224 = 0x25B3
+0x2225 = 0x25B2
+0x2226 = 0x25BD
+0x2227 = 0x25BC
+0x2228 = 0x203B
+0x2229 = 0x3012
+0x222A = 0x2192
+0x222B = 0x2190
+0x222C = 0x2191
+0x222D = 0x2193
+0x222E = 0x3013
+0x223A = 0x2208
+0x223B = 0x220B
+0x223C = 0x2286
+0x223D = 0x2287
+0x223E = 0x2282
+0x223F = 0x2283
+0x2240 = 0x222A
+0x2241 = 0x2229
+0x224A = 0x2227
+0x224B = 0x2228
+0x224C = 0x00AC
+0x224D = 0x21D2
+0x224E = 0x21D4
+0x224F = 0x2200
+0x2250 = 0x2203
+0x225C = 0x2220
+0x225D = 0x22A5
+0x225E = 0x2312
+0x225F = 0x2202
+0x2260 = 0x2207
+0x2261 = 0x2261
+0x2262 = 0x2252
+0x2263 = 0x226A
+0x2264 = 0x226B
+0x2265 = 0x221A
+0x2266 = 0x223D
+0x2267 = 0x221D
+0x2268 = 0x2235
+0x2269 = 0x222B
+0x226A = 0x222C
+0x2272 = 0x212B
+0x2273 = 0x2030
+0x2274 = 0x266F
+0x2275 = 0x266D
+0x2276 = 0x266A
+0x2277 = 0x2020
+0x2278 = 0x2021
+0x2279 = 0x00B6
+0x227E = 0x25EF
+0x2330 = 0xFF10
+0x2331 = 0xFF11
+0x2332 = 0xFF12
+0x2333 = 0xFF13
+0x2334 = 0xFF14
+0x2335 = 0xFF15
+0x2336 = 0xFF16
+0x2337 = 0xFF17
+0x2338 = 0xFF18
+0x2339 = 0xFF19
+0x2341 = 0xFF21
+0x2342 = 0xFF22
+0x2343 = 0xFF23
+0x2344 = 0xFF24
+0x2345 = 0xFF25
+0x2346 = 0xFF26
+0x2347 = 0xFF27
+0x2348 = 0xFF28
+0x2349 = 0xFF29
+0x234A = 0xFF2A
+0x234B = 0xFF2B
+0x234C = 0xFF2C
+0x234D = 0xFF2D
+0x234E = 0xFF2E
+0x234F = 0xFF2F
+0x2350 = 0xFF30
+0x2351 = 0xFF31
+0x2352 = 0xFF32
+0x2353 = 0xFF33
+0x2354 = 0xFF34
+0x2355 = 0xFF35
+0x2356 = 0xFF36
+0x2357 = 0xFF37
+0x2358 = 0xFF38
+0x2359 = 0xFF39
+0x235A = 0xFF3A
+0x2361 = 0xFF41
+0x2362 = 0xFF42
+0x2363 = 0xFF43
+0x2364 = 0xFF44
+0x2365 = 0xFF45
+0x2366 = 0xFF46
+0x2367 = 0xFF47
+0x2368 = 0xFF48
+0x2369 = 0xFF49
+0x236A = 0xFF4A
+0x236B = 0xFF4B
+0x236C = 0xFF4C
+0x236D = 0xFF4D
+0x236E = 0xFF4E
+0x236F = 0xFF4F
+0x2370 = 0xFF50
+0x2371 = 0xFF51
+0x2372 = 0xFF52
+0x2373 = 0xFF53
+0x2374 = 0xFF54
+0x2375 = 0xFF55
+0x2376 = 0xFF56
+0x2377 = 0xFF57
+0x2378 = 0xFF58
+0x2379 = 0xFF59
+0x237A = 0xFF5A
+0x2421 = 0x3041
+0x2422 = 0x3042
+0x2423 = 0x3043
+0x2424 = 0x3044
+0x2425 = 0x3045
+0x2426 = 0x3046
+0x2427 = 0x3047
+0x2428 = 0x3048
+0x2429 = 0x3049
+0x242A = 0x304A
+0x242B = 0x304B
+0x242C = 0x304C
+0x242D = 0x304D
+0x242E = 0x304E
+0x242F = 0x304F
+0x2430 = 0x3050
+0x2431 = 0x3051
+0x2432 = 0x3052
+0x2433 = 0x3053
+0x2434 = 0x3054
+0x2435 = 0x3055
+0x2436 = 0x3056
+0x2437 = 0x3057
+0x2438 = 0x3058
+0x2439 = 0x3059
+0x243A = 0x305A
+0x243B = 0x305B
+0x243C = 0x305C
+0x243D = 0x305D
+0x243E = 0x305E
+0x243F = 0x305F
+0x2440 = 0x3060
+0x2441 = 0x3061
+0x2442 = 0x3062
+0x2443 = 0x3063
+0x2444 = 0x3064
+0x2445 = 0x3065
+0x2446 = 0x3066
+0x2447 = 0x3067
+0x2448 = 0x3068
+0x2449 = 0x3069
+0x244A = 0x306A
+0x244B = 0x306B
+0x244C = 0x306C
+0x244D = 0x306D
+0x244E = 0x306E
+0x244F = 0x306F
+0x2450 = 0x3070
+0x2451 = 0x3071
+0x2452 = 0x3072
+0x2453 = 0x3073
+0x2454 = 0x3074
+0x2455 = 0x3075
+0x2456 = 0x3076
+0x2457 = 0x3077
+0x2458 = 0x3078
+0x2459 = 0x3079
+0x245A = 0x307A
+0x245B = 0x307B
+0x245C = 0x307C
+0x245D = 0x307D
+0x245E = 0x307E
+0x245F = 0x307F
+0x2460 = 0x3080
+0x2461 = 0x3081
+0x2462 = 0x3082
+0x2463 = 0x3083
+0x2464 = 0x3084
+0x2465 = 0x3085
+0x2466 = 0x3086
+0x2467 = 0x3087
+0x2468 = 0x3088
+0x2469 = 0x3089
+0x246A = 0x308A
+0x246B = 0x308B
+0x246C = 0x308C
+0x246D = 0x308D
+0x246E = 0x308E
+0x246F = 0x308F
+0x2470 = 0x3090
+0x2471 = 0x3091
+0x2472 = 0x3092
+0x2473 = 0x3093
+0x2521 = 0x30A1
+0x2522 = 0x30A2
+0x2523 = 0x30A3
+0x2524 = 0x30A4
+0x2525 = 0x30A5
+0x2526 = 0x30A6
+0x2527 = 0x30A7
+0x2528 = 0x30A8
+0x2529 = 0x30A9
+0x252A = 0x30AA
+0x252B = 0x30AB
+0x252C = 0x30AC
+0x252D = 0x30AD
+0x252E = 0x30AE
+0x252F = 0x30AF
+0x2530 = 0x30B0
+0x2531 = 0x30B1
+0x2532 = 0x30B2
+0x2533 = 0x30B3
+0x2534 = 0x30B4
+0x2535 = 0x30B5
+0x2536 = 0x30B6
+0x2537 = 0x30B7
+0x2538 = 0x30B8
+0x2539 = 0x30B9
+0x253A = 0x30BA
+0x253B = 0x30BB
+0x253C = 0x30BC
+0x253D = 0x30BD
+0x253E = 0x30BE
+0x253F = 0x30BF
+0x2540 = 0x30C0
+0x2541 = 0x30C1
+0x2542 = 0x30C2
+0x2543 = 0x30C3
+0x2544 = 0x30C4
+0x2545 = 0x30C5
+0x2546 = 0x30C6
+0x2547 = 0x30C7
+0x2548 = 0x30C8
+0x2549 = 0x30C9
+0x254A = 0x30CA
+0x254B = 0x30CB
+0x254C = 0x30CC
+0x254D = 0x30CD
+0x254E = 0x30CE
+0x254F = 0x30CF
+0x2550 = 0x30D0
+0x2551 = 0x30D1
+0x2552 = 0x30D2
+0x2553 = 0x30D3
+0x2554 = 0x30D4
+0x2555 = 0x30D5
+0x2556 = 0x30D6
+0x2557 = 0x30D7
+0x2558 = 0x30D8
+0x2559 = 0x30D9
+0x255A = 0x30DA
+0x255B = 0x30DB
+0x255C = 0x30DC
+0x255D = 0x30DD
+0x255E = 0x30DE
+0x255F = 0x30DF
+0x2560 = 0x30E0
+0x2561 = 0x30E1
+0x2562 = 0x30E2
+0x2563 = 0x30E3
+0x2564 = 0x30E4
+0x2565 = 0x30E5
+0x2566 = 0x30E6
+0x2567 = 0x30E7
+0x2568 = 0x30E8
+0x2569 = 0x30E9
+0x256A = 0x30EA
+0x256B = 0x30EB
+0x256C = 0x30EC
+0x256D = 0x30ED
+0x256E = 0x30EE
+0x256F = 0x30EF
+0x2570 = 0x30F0
+0x2571 = 0x30F1
+0x2572 = 0x30F2
+0x2573 = 0x30F3
+0x2574 = 0x30F4
+0x2575 = 0x30F5
+0x2576 = 0x30F6
+0x2621 = 0x0391
+0x2622 = 0x0392
+0x2623 = 0x0393
+0x2624 = 0x0394
+0x2625 = 0x0395
+0x2626 = 0x0396
+0x2627 = 0x0397
+0x2628 = 0x0398
+0x2629 = 0x0399
+0x262A = 0x039A
+0x262B = 0x039B
+0x262C = 0x039C
+0x262D = 0x039D
+0x262E = 0x039E
+0x262F = 0x039F
+0x2630 = 0x03A0
+0x2631 = 0x03A1
+0x2632 = 0x03A3
+0x2633 = 0x03A4
+0x2634 = 0x03A5
+0x2635 = 0x03A6
+0x2636 = 0x03A7
+0x2637 = 0x03A8
+0x2638 = 0x03A9
+0x2641 = 0x03B1
+0x2642 = 0x03B2
+0x2643 = 0x03B3
+0x2644 = 0x03B4
+0x2645 = 0x03B5
+0x2646 = 0x03B6
+0x2647 = 0x03B7
+0x2648 = 0x03B8
+0x2649 = 0x03B9
+0x264A = 0x03BA
+0x264B = 0x03BB
+0x264C = 0x03BC
+0x264D = 0x03BD
+0x264E = 0x03BE
+0x264F = 0x03BF
+0x2650 = 0x03C0
+0x2651 = 0x03C1
+0x2652 = 0x03C3
+0x2653 = 0x03C4
+0x2654 = 0x03C5
+0x2655 = 0x03C6
+0x2656 = 0x03C7
+0x2657 = 0x03C8
+0x2658 = 0x03C9
+0x2721 = 0x0410
+0x2722 = 0x0411
+0x2723 = 0x0412
+0x2724 = 0x0413
+0x2725 = 0x0414
+0x2726 = 0x0415
+0x2727 = 0x0401
+0x2728 = 0x0416
+0x2729 = 0x0417
+0x272A = 0x0418
+0x272B = 0x0419
+0x272C = 0x041A
+0x272D = 0x041B
+0x272E = 0x041C
+0x272F = 0x041D
+0x2730 = 0x041E
+0x2731 = 0x041F
+0x2732 = 0x0420
+0x2733 = 0x0421
+0x2734 = 0x0422
+0x2735 = 0x0423
+0x2736 = 0x0424
+0x2737 = 0x0425
+0x2738 = 0x0426
+0x2739 = 0x0427
+0x273A = 0x0428
+0x273B = 0x0429
+0x273C = 0x042A
+0x273D = 0x042B
+0x273E = 0x042C
+0x273F = 0x042D
+0x2740 = 0x042E
+0x2741 = 0x042F
+0x2751 = 0x0430
+0x2752 = 0x0431
+0x2753 = 0x0432
+0x2754 = 0x0433
+0x2755 = 0x0434
+0x2756 = 0x0435
+0x2757 = 0x0451
+0x2758 = 0x0436
+0x2759 = 0x0437
+0x275A = 0x0438
+0x275B = 0x0439
+0x275C = 0x043A
+0x275D = 0x043B
+0x275E = 0x043C
+0x275F = 0x043D
+0x2760 = 0x043E
+0x2761 = 0x043F
+0x2762 = 0x0440
+0x2763 = 0x0441
+0x2764 = 0x0442
+0x2765 = 0x0443
+0x2766 = 0x0444
+0x2767 = 0x0445
+0x2768 = 0x0446
+0x2769 = 0x0447
+0x276A = 0x0448
+0x276B = 0x0449
+0x276C = 0x044A
+0x276D = 0x044B
+0x276E = 0x044C
+0x276F = 0x044D
+0x2770 = 0x044E
+0x2771 = 0x044F
+0x2821 = 0x2500
+0x2822 = 0x2502
+0x2823 = 0x250C
+0x2824 = 0x2510
+0x2825 = 0x2518
+0x2826 = 0x2514
+0x2827 = 0x251C
+0x2828 = 0x252C
+0x2829 = 0x2524
+0x282A = 0x2534
+0x282B = 0x253C
+0x282C = 0x2501
+0x282D = 0x2503
+0x282E = 0x250F
+0x282F = 0x2513
+0x2830 = 0x251B
+0x2831 = 0x2517
+0x2832 = 0x2523
+0x2833 = 0x2533
+0x2834 = 0x252B
+0x2835 = 0x253B
+0x2836 = 0x254B
+0x2837 = 0x2520
+0x2838 = 0x252F
+0x2839 = 0x2528
+0x283A = 0x2537
+0x283B = 0x253F
+0x283C = 0x251D
+0x283D = 0x2530
+0x283E = 0x2525
+0x283F = 0x2538
+0x2840 = 0x2542
+0x3021 = 0x4E9C
+0x3022 = 0x5516
+0x3023 = 0x5A03
+0x3024 = 0x963F
+0x3025 = 0x54C0
+0x3026 = 0x611B
+0x3027 = 0x6328
+0x3028 = 0x59F6
+0x3029 = 0x9022
+0x302A = 0x8475
+0x302B = 0x831C
+0x302C = 0x7A50
+0x302D = 0x60AA
+0x302E = 0x63E1
+0x302F = 0x6E25
+0x3030 = 0x65ED
+0x3031 = 0x8466
+0x3032 = 0x82A6
+0x3033 = 0x9BF5
+0x3034 = 0x6893
+0x3035 = 0x5727
+0x3036 = 0x65A1
+0x3037 = 0x6271
+0x3038 = 0x5B9B
+0x3039 = 0x59D0
+0x303A = 0x867B
+0x303B = 0x98F4
+0x303C = 0x7D62
+0x303D = 0x7DBE
+0x303E = 0x9B8E
+0x303F = 0x6216
+0x3040 = 0x7C9F
+0x3041 = 0x88B7
+0x3042 = 0x5B89
+0x3043 = 0x5EB5
+0x3044 = 0x6309
+0x3045 = 0x6697
+0x3046 = 0x6848
+0x3047 = 0x95C7
+0x3048 = 0x978D
+0x3049 = 0x674F
+0x304A = 0x4EE5
+0x304B = 0x4F0A
+0x304C = 0x4F4D
+0x304D = 0x4F9D
+0x304E = 0x5049
+0x304F = 0x56F2
+0x3050 = 0x5937
+0x3051 = 0x59D4
+0x3052 = 0x5A01
+0x3053 = 0x5C09
+0x3054 = 0x60DF
+0x3055 = 0x610F
+0x3056 = 0x6170
+0x3057 = 0x6613
+0x3058 = 0x6905
+0x3059 = 0x70BA
+0x305A = 0x754F
+0x305B = 0x7570
+0x305C = 0x79FB
+0x305D = 0x7DAD
+0x305E = 0x7DEF
+0x305F = 0x80C3
+0x3060 = 0x840E
+0x3061 = 0x8863
+0x3062 = 0x8B02
+0x3063 = 0x9055
+0x3064 = 0x907A
+0x3065 = 0x533B
+0x3066 = 0x4E95
+0x3067 = 0x4EA5
+0x3068 = 0x57DF
+0x3069 = 0x80B2
+0x306A = 0x90C1
+0x306B = 0x78EF
+0x306C = 0x4E00
+0x306D = 0x58F1
+0x306E = 0x6EA2
+0x306F = 0x9038
+0x3070 = 0x7A32
+0x3071 = 0x8328
+0x3072 = 0x828B
+0x3073 = 0x9C2F
+0x3074 = 0x5141
+0x3075 = 0x5370
+0x3076 = 0x54BD
+0x3077 = 0x54E1
+0x3078 = 0x56E0
+0x3079 = 0x59FB
+0x307A = 0x5F15
+0x307B = 0x98F2
+0x307C = 0x6DEB
+0x307D = 0x80E4
+0x307E = 0x852D
+0x3121 = 0x9662
+0x3122 = 0x9670
+0x3123 = 0x96A0
+0x3124 = 0x97FB
+0x3125 = 0x540B
+0x3126 = 0x53F3
+0x3127 = 0x5B87
+0x3128 = 0x70CF
+0x3129 = 0x7FBD
+0x312A = 0x8FC2
+0x312B = 0x96E8
+0x312C = 0x536F
+0x312D = 0x9D5C
+0x312E = 0x7ABA
+0x312F = 0x4E11
+0x3130 = 0x7893
+0x3131 = 0x81FC
+0x3132 = 0x6E26
+0x3133 = 0x5618
+0x3134 = 0x5504
+0x3135 = 0x6B1D
+0x3136 = 0x851A
+0x3137 = 0x9C3B
+0x3138 = 0x59E5
+0x3139 = 0x53A9
+0x313A = 0x6D66
+0x313B = 0x74DC
+0x313C = 0x958F
+0x313D = 0x5642
+0x313E = 0x4E91
+0x313F = 0x904B
+0x3140 = 0x96F2
+0x3141 = 0x834F
+0x3142 = 0x990C
+0x3143 = 0x53E1
+0x3144 = 0x55B6
+0x3145 = 0x5B30
+0x3146 = 0x5F71
+0x3147 = 0x6620
+0x3148 = 0x66F3
+0x3149 = 0x6804
+0x314A = 0x6C38
+0x314B = 0x6CF3
+0x314C = 0x6D29
+0x314D = 0x745B
+0x314E = 0x76C8
+0x314F = 0x7A4E
+0x3150 = 0x9834
+0x3151 = 0x82F1
+0x3152 = 0x885B
+0x3153 = 0x8A60
+0x3154 = 0x92ED
+0x3155 = 0x6DB2
+0x3156 = 0x75AB
+0x3157 = 0x76CA
+0x3158 = 0x99C5
+0x3159 = 0x60A6
+0x315A = 0x8B01
+0x315B = 0x8D8A
+0x315C = 0x95B2
+0x315D = 0x698E
+0x315E = 0x53AD
+0x315F = 0x5186
+0x3160 = 0x5712
+0x3161 = 0x5830
+0x3162 = 0x5944
+0x3163 = 0x5BB4
+0x3164 = 0x5EF6
+0x3165 = 0x6028
+0x3166 = 0x63A9
+0x3167 = 0x63F4
+0x3168 = 0x6CBF
+0x3169 = 0x6F14
+0x316A = 0x708E
+0x316B = 0x7114
+0x316C = 0x7159
+0x316D = 0x71D5
+0x316E = 0x733F
+0x316F = 0x7E01
+0x3170 = 0x8276
+0x3171 = 0x82D1
+0x3172 = 0x8597
+0x3173 = 0x9060
+0x3174 = 0x925B
+0x3175 = 0x9D1B
+0x3176 = 0x5869
+0x3177 = 0x65BC
+0x3178 = 0x6C5A
+0x3179 = 0x7525
+0x317A = 0x51F9
+0x317B = 0x592E
+0x317C = 0x5965
+0x317D = 0x5F80
+0x317E = 0x5FDC
+0x3221 = 0x62BC
+0x3222 = 0x65FA
+0x3223 = 0x6A2A
+0x3224 = 0x6B27
+0x3225 = 0x6BB4
+0x3226 = 0x738B
+0x3227 = 0x7FC1
+0x3228 = 0x8956
+0x3229 = 0x9D2C
+0x322A = 0x9D0E
+0x322B = 0x9EC4
+0x322C = 0x5CA1
+0x322D = 0x6C96
+0x322E = 0x837B
+0x322F = 0x5104
+0x3230 = 0x5C4B
+0x3231 = 0x61B6
+0x3232 = 0x81C6
+0x3233 = 0x6876
+0x3234 = 0x7261
+0x3235 = 0x4E59
+0x3236 = 0x4FFA
+0x3237 = 0x5378
+0x3238 = 0x6069
+0x3239 = 0x6E29
+0x323A = 0x7A4F
+0x323B = 0x97F3
+0x323C = 0x4E0B
+0x323D = 0x5316
+0x323E = 0x4EEE
+0x323F = 0x4F55
+0x3240 = 0x4F3D
+0x3241 = 0x4FA1
+0x3242 = 0x4F73
+0x3243 = 0x52A0
+0x3244 = 0x53EF
+0x3245 = 0x5609
+0x3246 = 0x590F
+0x3247 = 0x5AC1
+0x3248 = 0x5BB6
+0x3249 = 0x5BE1
+0x324A = 0x79D1
+0x324B = 0x6687
+0x324C = 0x679C
+0x324D = 0x67B6
+0x324E = 0x6B4C
+0x324F = 0x6CB3
+0x3250 = 0x706B
+0x3251 = 0x73C2
+0x3252 = 0x798D
+0x3253 = 0x79BE
+0x3254 = 0x7A3C
+0x3255 = 0x7B87
+0x3256 = 0x82B1
+0x3257 = 0x82DB
+0x3258 = 0x8304
+0x3259 = 0x8377
+0x325A = 0x83EF
+0x325B = 0x83D3
+0x325C = 0x8766
+0x325D = 0x8AB2
+0x325E = 0x5629
+0x325F = 0x8CA8
+0x3260 = 0x8FE6
+0x3261 = 0x904E
+0x3262 = 0x971E
+0x3263 = 0x868A
+0x3264 = 0x4FC4
+0x3265 = 0x5CE8
+0x3266 = 0x6211
+0x3267 = 0x7259
+0x3268 = 0x753B
+0x3269 = 0x81E5
+0x326A = 0x82BD
+0x326B = 0x86FE
+0x326C = 0x8CC0
+0x326D = 0x96C5
+0x326E = 0x9913
+0x326F = 0x99D5
+0x3270 = 0x4ECB
+0x3271 = 0x4F1A
+0x3272 = 0x89E3
+0x3273 = 0x56DE
+0x3274 = 0x584A
+0x3275 = 0x58CA
+0x3276 = 0x5EFB
+0x3277 = 0x5FEB
+0x3278 = 0x602A
+0x3279 = 0x6094
+0x327A = 0x6062
+0x327B = 0x61D0
+0x327C = 0x6212
+0x327D = 0x62D0
+0x327E = 0x6539
+0x3321 = 0x9B41
+0x3322 = 0x6666
+0x3323 = 0x68B0
+0x3324 = 0x6D77
+0x3325 = 0x7070
+0x3326 = 0x754C
+0x3327 = 0x7686
+0x3328 = 0x7D75
+0x3329 = 0x82A5
+0x332A = 0x87F9
+0x332B = 0x958B
+0x332C = 0x968E
+0x332D = 0x8C9D
+0x332E = 0x51F1
+0x332F = 0x52BE
+0x3330 = 0x5916
+0x3331 = 0x54B3
+0x3332 = 0x5BB3
+0x3333 = 0x5D16
+0x3334 = 0x6168
+0x3335 = 0x6982
+0x3336 = 0x6DAF
+0x3337 = 0x788D
+0x3338 = 0x84CB
+0x3339 = 0x8857
+0x333A = 0x8A72
+0x333B = 0x93A7
+0x333C = 0x9AB8
+0x333D = 0x6D6C
+0x333E = 0x99A8
+0x333F = 0x86D9
+0x3340 = 0x57A3
+0x3341 = 0x67FF
+0x3342 = 0x86CE
+0x3343 = 0x920E
+0x3344 = 0x5283
+0x3345 = 0x5687
+0x3346 = 0x5404
+0x3347 = 0x5ED3
+0x3348 = 0x62E1
+0x3349 = 0x64B9
+0x334A = 0x683C
+0x334B = 0x6838
+0x334C = 0x6BBB
+0x334D = 0x7372
+0x334E = 0x78BA
+0x334F = 0x7A6B
+0x3350 = 0x899A
+0x3351 = 0x89D2
+0x3352 = 0x8D6B
+0x3353 = 0x8F03
+0x3354 = 0x90ED
+0x3355 = 0x95A3
+0x3356 = 0x9694
+0x3357 = 0x9769
+0x3358 = 0x5B66
+0x3359 = 0x5CB3
+0x335A = 0x697D
+0x335B = 0x984D
+0x335C = 0x984E
+0x335D = 0x639B
+0x335E = 0x7B20
+0x335F = 0x6A2B
+0x3360 = 0x6A7F
+0x3361 = 0x68B6
+0x3362 = 0x9C0D
+0x3363 = 0x6F5F
+0x3364 = 0x5272
+0x3365 = 0x559D
+0x3366 = 0x6070
+0x3367 = 0x62EC
+0x3368 = 0x6D3B
+0x3369 = 0x6E07
+0x336A = 0x6ED1
+0x336B = 0x845B
+0x336C = 0x8910
+0x336D = 0x8F44
+0x336E = 0x4E14
+0x336F = 0x9C39
+0x3370 = 0x53F6
+0x3371 = 0x691B
+0x3372 = 0x6A3A
+0x3373 = 0x9784
+0x3374 = 0x682A
+0x3375 = 0x515C
+0x3376 = 0x7AC3
+0x3377 = 0x84B2
+0x3378 = 0x91DC
+0x3379 = 0x938C
+0x337A = 0x565B
+0x337B = 0x9D28
+0x337C = 0x6822
+0x337D = 0x8305
+0x337E = 0x8431
+0x3421 = 0x7CA5
+0x3422 = 0x5208
+0x3423 = 0x82C5
+0x3424 = 0x74E6
+0x3425 = 0x4E7E
+0x3426 = 0x4F83
+0x3427 = 0x51A0
+0x3428 = 0x5BD2
+0x3429 = 0x520A
+0x342A = 0x52D8
+0x342B = 0x52E7
+0x342C = 0x5DFB
+0x342D = 0x559A
+0x342E = 0x582A
+0x342F = 0x59E6
+0x3430 = 0x5B8C
+0x3431 = 0x5B98
+0x3432 = 0x5BDB
+0x3433 = 0x5E72
+0x3434 = 0x5E79
+0x3435 = 0x60A3
+0x3436 = 0x611F
+0x3437 = 0x6163
+0x3438 = 0x61BE
+0x3439 = 0x63DB
+0x343A = 0x6562
+0x343B = 0x67D1
+0x343C = 0x6853
+0x343D = 0x68FA
+0x343E = 0x6B3E
+0x343F = 0x6B53
+0x3440 = 0x6C57
+0x3441 = 0x6F22
+0x3442 = 0x6F97
+0x3443 = 0x6F45
+0x3444 = 0x74B0
+0x3445 = 0x7518
+0x3446 = 0x76E3
+0x3447 = 0x770B
+0x3448 = 0x7AFF
+0x3449 = 0x7BA1
+0x344A = 0x7C21
+0x344B = 0x7DE9
+0x344C = 0x7F36
+0x344D = 0x7FF0
+0x344E = 0x809D
+0x344F = 0x8266
+0x3450 = 0x839E
+0x3451 = 0x89B3
+0x3452 = 0x8ACC
+0x3453 = 0x8CAB
+0x3454 = 0x9084
+0x3455 = 0x9451
+0x3456 = 0x9593
+0x3457 = 0x9591
+0x3458 = 0x95A2
+0x3459 = 0x9665
+0x345A = 0x97D3
+0x345B = 0x9928
+0x345C = 0x8218
+0x345D = 0x4E38
+0x345E = 0x542B
+0x345F = 0x5CB8
+0x3460 = 0x5DCC
+0x3461 = 0x73A9
+0x3462 = 0x764C
+0x3463 = 0x773C
+0x3464 = 0x5CA9
+0x3465 = 0x7FEB
+0x3466 = 0x8D0B
+0x3467 = 0x96C1
+0x3468 = 0x9811
+0x3469 = 0x9854
+0x346A = 0x9858
+0x346B = 0x4F01
+0x346C = 0x4F0E
+0x346D = 0x5371
+0x346E = 0x559C
+0x346F = 0x5668
+0x3470 = 0x57FA
+0x3471 = 0x5947
+0x3472 = 0x5B09
+0x3473 = 0x5BC4
+0x3474 = 0x5C90
+0x3475 = 0x5E0C
+0x3476 = 0x5E7E
+0x3477 = 0x5FCC
+0x3478 = 0x63EE
+0x3479 = 0x673A
+0x347A = 0x65D7
+0x347B = 0x65E2
+0x347C = 0x671F
+0x347D = 0x68CB
+0x347E = 0x68C4
+0x3521 = 0x6A5F
+0x3522 = 0x5E30
+0x3523 = 0x6BC5
+0x3524 = 0x6C17
+0x3525 = 0x6C7D
+0x3526 = 0x757F
+0x3527 = 0x7948
+0x3528 = 0x5B63
+0x3529 = 0x7A00
+0x352A = 0x7D00
+0x352B = 0x5FBD
+0x352C = 0x898F
+0x352D = 0x8A18
+0x352E = 0x8CB4
+0x352F = 0x8D77
+0x3530 = 0x8ECC
+0x3531 = 0x8F1D
+0x3532 = 0x98E2
+0x3533 = 0x9A0E
+0x3534 = 0x9B3C
+0x3535 = 0x4E80
+0x3536 = 0x507D
+0x3537 = 0x5100
+0x3538 = 0x5993
+0x3539 = 0x5B9C
+0x353A = 0x622F
+0x353B = 0x6280
+0x353C = 0x64EC
+0x353D = 0x6B3A
+0x353E = 0x72A0
+0x353F = 0x7591
+0x3540 = 0x7947
+0x3541 = 0x7FA9
+0x3542 = 0x87FB
+0x3543 = 0x8ABC
+0x3544 = 0x8B70
+0x3545 = 0x63AC
+0x3546 = 0x83CA
+0x3547 = 0x97A0
+0x3548 = 0x5409
+0x3549 = 0x5403
+0x354A = 0x55AB
+0x354B = 0x6854
+0x354C = 0x6A58
+0x354D = 0x8A70
+0x354E = 0x7827
+0x354F = 0x6775
+0x3550 = 0x9ECD
+0x3551 = 0x5374
+0x3552 = 0x5BA2
+0x3553 = 0x811A
+0x3554 = 0x8650
+0x3555 = 0x9006
+0x3556 = 0x4E18
+0x3557 = 0x4E45
+0x3558 = 0x4EC7
+0x3559 = 0x4F11
+0x355A = 0x53CA
+0x355B = 0x5438
+0x355C = 0x5BAE
+0x355D = 0x5F13
+0x355E = 0x6025
+0x355F = 0x6551
+0x3560 = 0x673D
+0x3561 = 0x6C42
+0x3562 = 0x6C72
+0x3563 = 0x6CE3
+0x3564 = 0x7078
+0x3565 = 0x7403
+0x3566 = 0x7A76
+0x3567 = 0x7AAE
+0x3568 = 0x7B08
+0x3569 = 0x7D1A
+0x356A = 0x7CFE
+0x356B = 0x7D66
+0x356C = 0x65E7
+0x356D = 0x725B
+0x356E = 0x53BB
+0x356F = 0x5C45
+0x3570 = 0x5DE8
+0x3571 = 0x62D2
+0x3572 = 0x62E0
+0x3573 = 0x6319
+0x3574 = 0x6E20
+0x3575 = 0x865A
+0x3576 = 0x8A31
+0x3577 = 0x8DDD
+0x3578 = 0x92F8
+0x3579 = 0x6F01
+0x357A = 0x79A6
+0x357B = 0x9B5A
+0x357C = 0x4EA8
+0x357D = 0x4EAB
+0x357E = 0x4EAC
+0x3621 = 0x4F9B
+0x3622 = 0x4FA0
+0x3623 = 0x50D1
+0x3624 = 0x5147
+0x3625 = 0x7AF6
+0x3626 = 0x5171
+0x3627 = 0x51F6
+0x3628 = 0x5354
+0x3629 = 0x5321
+0x362A = 0x537F
+0x362B = 0x53EB
+0x362C = 0x55AC
+0x362D = 0x5883
+0x362E = 0x5CE1
+0x362F = 0x5F37
+0x3630 = 0x5F4A
+0x3631 = 0x602F
+0x3632 = 0x6050
+0x3633 = 0x606D
+0x3634 = 0x631F
+0x3635 = 0x6559
+0x3636 = 0x6A4B
+0x3637 = 0x6CC1
+0x3638 = 0x72C2
+0x3639 = 0x72ED
+0x363A = 0x77EF
+0x363B = 0x80F8
+0x363C = 0x8105
+0x363D = 0x8208
+0x363E = 0x854E
+0x363F = 0x90F7
+0x3640 = 0x93E1
+0x3641 = 0x97FF
+0x3642 = 0x9957
+0x3643 = 0x9A5A
+0x3644 = 0x4EF0
+0x3645 = 0x51DD
+0x3646 = 0x5C2D
+0x3647 = 0x6681
+0x3648 = 0x696D
+0x3649 = 0x5C40
+0x364A = 0x66F2
+0x364B = 0x6975
+0x364C = 0x7389
+0x364D = 0x6850
+0x364E = 0x7C81
+0x364F = 0x50C5
+0x3650 = 0x52E4
+0x3651 = 0x5747
+0x3652 = 0x5DFE
+0x3653 = 0x9326
+0x3654 = 0x65A4
+0x3655 = 0x6B23
+0x3656 = 0x6B3D
+0x3657 = 0x7434
+0x3658 = 0x7981
+0x3659 = 0x79BD
+0x365A = 0x7B4B
+0x365B = 0x7DCA
+0x365C = 0x82B9
+0x365D = 0x83CC
+0x365E = 0x887F
+0x365F = 0x895F
+0x3660 = 0x8B39
+0x3661 = 0x8FD1
+0x3662 = 0x91D1
+0x3663 = 0x541F
+0x3664 = 0x9280
+0x3665 = 0x4E5D
+0x3666 = 0x5036
+0x3667 = 0x53E5
+0x3668 = 0x533A
+0x3669 = 0x72D7
+0x366A = 0x7396
+0x366B = 0x77E9
+0x366C = 0x82E6
+0x366D = 0x8EAF
+0x366E = 0x99C6
+0x366F = 0x99C8
+0x3670 = 0x99D2
+0x3671 = 0x5177
+0x3672 = 0x611A
+0x3673 = 0x865E
+0x3674 = 0x55B0
+0x3675 = 0x7A7A
+0x3676 = 0x5076
+0x3677 = 0x5BD3
+0x3678 = 0x9047
+0x3679 = 0x9685
+0x367A = 0x4E32
+0x367B = 0x6ADB
+0x367C = 0x91E7
+0x367D = 0x5C51
+0x367E = 0x5C48
+0x3721 = 0x6398
+0x3722 = 0x7A9F
+0x3723 = 0x6C93
+0x3724 = 0x9774
+0x3725 = 0x8F61
+0x3726 = 0x7AAA
+0x3727 = 0x718A
+0x3728 = 0x9688
+0x3729 = 0x7C82
+0x372A = 0x6817
+0x372B = 0x7E70
+0x372C = 0x6851
+0x372D = 0x936C
+0x372E = 0x52F2
+0x372F = 0x541B
+0x3730 = 0x85AB
+0x3731 = 0x8A13
+0x3732 = 0x7FA4
+0x3733 = 0x8ECD
+0x3734 = 0x90E1
+0x3735 = 0x5366
+0x3736 = 0x8888
+0x3737 = 0x7941
+0x3738 = 0x4FC2
+0x3739 = 0x50BE
+0x373A = 0x5211
+0x373B = 0x5144
+0x373C = 0x5553
+0x373D = 0x572D
+0x373E = 0x73EA
+0x373F = 0x578B
+0x3740 = 0x5951
+0x3741 = 0x5F62
+0x3742 = 0x5F84
+0x3743 = 0x6075
+0x3744 = 0x6176
+0x3745 = 0x6167
+0x3746 = 0x61A9
+0x3747 = 0x63B2
+0x3748 = 0x643A
+0x3749 = 0x656C
+0x374A = 0x666F
+0x374B = 0x6842
+0x374C = 0x6E13
+0x374D = 0x7566
+0x374E = 0x7A3D
+0x374F = 0x7CFB
+0x3750 = 0x7D4C
+0x3751 = 0x7D99
+0x3752 = 0x7E4B
+0x3753 = 0x7F6B
+0x3754 = 0x830E
+0x3755 = 0x834A
+0x3756 = 0x86CD
+0x3757 = 0x8A08
+0x3758 = 0x8A63
+0x3759 = 0x8B66
+0x375A = 0x8EFD
+0x375B = 0x981A
+0x375C = 0x9D8F
+0x375D = 0x82B8
+0x375E = 0x8FCE
+0x375F = 0x9BE8
+0x3760 = 0x5287
+0x3761 = 0x621F
+0x3762 = 0x6483
+0x3763 = 0x6FC0
+0x3764 = 0x9699
+0x3765 = 0x6841
+0x3766 = 0x5091
+0x3767 = 0x6B20
+0x3768 = 0x6C7A
+0x3769 = 0x6F54
+0x376A = 0x7A74
+0x376B = 0x7D50
+0x376C = 0x8840
+0x376D = 0x8A23
+0x376E = 0x6708
+0x376F = 0x4EF6
+0x3770 = 0x5039
+0x3771 = 0x5026
+0x3772 = 0x5065
+0x3773 = 0x517C
+0x3774 = 0x5238
+0x3775 = 0x5263
+0x3776 = 0x55A7
+0x3777 = 0x570F
+0x3778 = 0x5805
+0x3779 = 0x5ACC
+0x377A = 0x5EFA
+0x377B = 0x61B2
+0x377C = 0x61F8
+0x377D = 0x62F3
+0x377E = 0x6372
+0x3821 = 0x691C
+0x3822 = 0x6A29
+0x3823 = 0x727D
+0x3824 = 0x72AC
+0x3825 = 0x732E
+0x3826 = 0x7814
+0x3827 = 0x786F
+0x3828 = 0x7D79
+0x3829 = 0x770C
+0x382A = 0x80A9
+0x382B = 0x898B
+0x382C = 0x8B19
+0x382D = 0x8CE2
+0x382E = 0x8ED2
+0x382F = 0x9063
+0x3830 = 0x9375
+0x3831 = 0x967A
+0x3832 = 0x9855
+0x3833 = 0x9A13
+0x3834 = 0x9E78
+0x3835 = 0x5143
+0x3836 = 0x539F
+0x3837 = 0x53B3
+0x3838 = 0x5E7B
+0x3839 = 0x5F26
+0x383A = 0x6E1B
+0x383B = 0x6E90
+0x383C = 0x7384
+0x383D = 0x73FE
+0x383E = 0x7D43
+0x383F = 0x8237
+0x3840 = 0x8A00
+0x3841 = 0x8AFA
+0x3842 = 0x9650
+0x3843 = 0x4E4E
+0x3844 = 0x500B
+0x3845 = 0x53E4
+0x3846 = 0x547C
+0x3847 = 0x56FA
+0x3848 = 0x59D1
+0x3849 = 0x5B64
+0x384A = 0x5DF1
+0x384B = 0x5EAB
+0x384C = 0x5F27
+0x384D = 0x6238
+0x384E = 0x6545
+0x384F = 0x67AF
+0x3850 = 0x6E56
+0x3851 = 0x72D0
+0x3852 = 0x7CCA
+0x3853 = 0x88B4
+0x3854 = 0x80A1
+0x3855 = 0x80E1
+0x3856 = 0x83F0
+0x3857 = 0x864E
+0x3858 = 0x8A87
+0x3859 = 0x8DE8
+0x385A = 0x9237
+0x385B = 0x96C7
+0x385C = 0x9867
+0x385D = 0x9F13
+0x385E = 0x4E94
+0x385F = 0x4E92
+0x3860 = 0x4F0D
+0x3861 = 0x5348
+0x3862 = 0x5449
+0x3863 = 0x543E
+0x3864 = 0x5A2F
+0x3865 = 0x5F8C
+0x3866 = 0x5FA1
+0x3867 = 0x609F
+0x3868 = 0x68A7
+0x3869 = 0x6A8E
+0x386A = 0x745A
+0x386B = 0x7881
+0x386C = 0x8A9E
+0x386D = 0x8AA4
+0x386E = 0x8B77
+0x386F = 0x9190
+0x3870 = 0x4E5E
+0x3871 = 0x9BC9
+0x3872 = 0x4EA4
+0x3873 = 0x4F7C
+0x3874 = 0x4FAF
+0x3875 = 0x5019
+0x3876 = 0x5016
+0x3877 = 0x5149
+0x3878 = 0x516C
+0x3879 = 0x529F
+0x387A = 0x52B9
+0x387B = 0x52FE
+0x387C = 0x539A
+0x387D = 0x53E3
+0x387E = 0x5411
+0x3921 = 0x540E
+0x3922 = 0x5589
+0x3923 = 0x5751
+0x3924 = 0x57A2
+0x3925 = 0x597D
+0x3926 = 0x5B54
+0x3927 = 0x5B5D
+0x3928 = 0x5B8F
+0x3929 = 0x5DE5
+0x392A = 0x5DE7
+0x392B = 0x5DF7
+0x392C = 0x5E78
+0x392D = 0x5E83
+0x392E = 0x5E9A
+0x392F = 0x5EB7
+0x3930 = 0x5F18
+0x3931 = 0x6052
+0x3932 = 0x614C
+0x3933 = 0x6297
+0x3934 = 0x62D8
+0x3935 = 0x63A7
+0x3936 = 0x653B
+0x3937 = 0x6602
+0x3938 = 0x6643
+0x3939 = 0x66F4
+0x393A = 0x676D
+0x393B = 0x6821
+0x393C = 0x6897
+0x393D = 0x69CB
+0x393E = 0x6C5F
+0x393F = 0x6D2A
+0x3940 = 0x6D69
+0x3941 = 0x6E2F
+0x3942 = 0x6E9D
+0x3943 = 0x7532
+0x3944 = 0x7687
+0x3945 = 0x786C
+0x3946 = 0x7A3F
+0x3947 = 0x7CE0
+0x3948 = 0x7D05
+0x3949 = 0x7D18
+0x394A = 0x7D5E
+0x394B = 0x7DB1
+0x394C = 0x8015
+0x394D = 0x8003
+0x394E = 0x80AF
+0x394F = 0x80B1
+0x3950 = 0x8154
+0x3951 = 0x818F
+0x3952 = 0x822A
+0x3953 = 0x8352
+0x3954 = 0x884C
+0x3955 = 0x8861
+0x3956 = 0x8B1B
+0x3957 = 0x8CA2
+0x3958 = 0x8CFC
+0x3959 = 0x90CA
+0x395A = 0x9175
+0x395B = 0x9271
+0x395C = 0x783F
+0x395D = 0x92FC
+0x395E = 0x95A4
+0x395F = 0x964D
+0x3960 = 0x9805
+0x3961 = 0x9999
+0x3962 = 0x9AD8
+0x3963 = 0x9D3B
+0x3964 = 0x525B
+0x3965 = 0x52AB
+0x3966 = 0x53F7
+0x3967 = 0x5408
+0x3968 = 0x58D5
+0x3969 = 0x62F7
+0x396A = 0x6FE0
+0x396B = 0x8C6A
+0x396C = 0x8F5F
+0x396D = 0x9EB9
+0x396E = 0x514B
+0x396F = 0x523B
+0x3970 = 0x544A
+0x3971 = 0x56FD
+0x3972 = 0x7A40
+0x3973 = 0x9177
+0x3974 = 0x9D60
+0x3975 = 0x9ED2
+0x3976 = 0x7344
+0x3977 = 0x6F09
+0x3978 = 0x8170
+0x3979 = 0x7511
+0x397A = 0x5FFD
+0x397B = 0x60DA
+0x397C = 0x9AA8
+0x397D = 0x72DB
+0x397E = 0x8FBC
+0x3A21 = 0x6B64
+0x3A22 = 0x9803
+0x3A23 = 0x4ECA
+0x3A24 = 0x56F0
+0x3A25 = 0x5764
+0x3A26 = 0x58BE
+0x3A27 = 0x5A5A
+0x3A28 = 0x6068
+0x3A29 = 0x61C7
+0x3A2A = 0x660F
+0x3A2B = 0x6606
+0x3A2C = 0x6839
+0x3A2D = 0x68B1
+0x3A2E = 0x6DF7
+0x3A2F = 0x75D5
+0x3A30 = 0x7D3A
+0x3A31 = 0x826E
+0x3A32 = 0x9B42
+0x3A33 = 0x4E9B
+0x3A34 = 0x4F50
+0x3A35 = 0x53C9
+0x3A36 = 0x5506
+0x3A37 = 0x5D6F
+0x3A38 = 0x5DE6
+0x3A39 = 0x5DEE
+0x3A3A = 0x67FB
+0x3A3B = 0x6C99
+0x3A3C = 0x7473
+0x3A3D = 0x7802
+0x3A3E = 0x8A50
+0x3A3F = 0x9396
+0x3A40 = 0x88DF
+0x3A41 = 0x5750
+0x3A42 = 0x5EA7
+0x3A43 = 0x632B
+0x3A44 = 0x50B5
+0x3A45 = 0x50AC
+0x3A46 = 0x518D
+0x3A47 = 0x6700
+0x3A48 = 0x54C9
+0x3A49 = 0x585E
+0x3A4A = 0x59BB
+0x3A4B = 0x5BB0
+0x3A4C = 0x5F69
+0x3A4D = 0x624D
+0x3A4E = 0x63A1
+0x3A4F = 0x683D
+0x3A50 = 0x6B73
+0x3A51 = 0x6E08
+0x3A52 = 0x707D
+0x3A53 = 0x91C7
+0x3A54 = 0x7280
+0x3A55 = 0x7815
+0x3A56 = 0x7826
+0x3A57 = 0x796D
+0x3A58 = 0x658E
+0x3A59 = 0x7D30
+0x3A5A = 0x83DC
+0x3A5B = 0x88C1
+0x3A5C = 0x8F09
+0x3A5D = 0x969B
+0x3A5E = 0x5264
+0x3A5F = 0x5728
+0x3A60 = 0x6750
+0x3A61 = 0x7F6A
+0x3A62 = 0x8CA1
+0x3A63 = 0x51B4
+0x3A64 = 0x5742
+0x3A65 = 0x962A
+0x3A66 = 0x583A
+0x3A67 = 0x698A
+0x3A68 = 0x80B4
+0x3A69 = 0x54B2
+0x3A6A = 0x5D0E
+0x3A6B = 0x57FC
+0x3A6C = 0x7895
+0x3A6D = 0x9DFA
+0x3A6E = 0x4F5C
+0x3A6F = 0x524A
+0x3A70 = 0x548B
+0x3A71 = 0x643E
+0x3A72 = 0x6628
+0x3A73 = 0x6714
+0x3A74 = 0x67F5
+0x3A75 = 0x7A84
+0x3A76 = 0x7B56
+0x3A77 = 0x7D22
+0x3A78 = 0x932F
+0x3A79 = 0x685C
+0x3A7A = 0x9BAD
+0x3A7B = 0x7B39
+0x3A7C = 0x5319
+0x3A7D = 0x518A
+0x3A7E = 0x5237
+0x3B21 = 0x5BDF
+0x3B22 = 0x62F6
+0x3B23 = 0x64AE
+0x3B24 = 0x64E6
+0x3B25 = 0x672D
+0x3B26 = 0x6BBA
+0x3B27 = 0x85A9
+0x3B28 = 0x96D1
+0x3B29 = 0x7690
+0x3B2A = 0x9BD6
+0x3B2B = 0x634C
+0x3B2C = 0x9306
+0x3B2D = 0x9BAB
+0x3B2E = 0x76BF
+0x3B2F = 0x6652
+0x3B30 = 0x4E09
+0x3B31 = 0x5098
+0x3B32 = 0x53C2
+0x3B33 = 0x5C71
+0x3B34 = 0x60E8
+0x3B35 = 0x6492
+0x3B36 = 0x6563
+0x3B37 = 0x685F
+0x3B38 = 0x71E6
+0x3B39 = 0x73CA
+0x3B3A = 0x7523
+0x3B3B = 0x7B97
+0x3B3C = 0x7E82
+0x3B3D = 0x8695
+0x3B3E = 0x8B83
+0x3B3F = 0x8CDB
+0x3B40 = 0x9178
+0x3B41 = 0x9910
+0x3B42 = 0x65AC
+0x3B43 = 0x66AB
+0x3B44 = 0x6B8B
+0x3B45 = 0x4ED5
+0x3B46 = 0x4ED4
+0x3B47 = 0x4F3A
+0x3B48 = 0x4F7F
+0x3B49 = 0x523A
+0x3B4A = 0x53F8
+0x3B4B = 0x53F2
+0x3B4C = 0x55E3
+0x3B4D = 0x56DB
+0x3B4E = 0x58EB
+0x3B4F = 0x59CB
+0x3B50 = 0x59C9
+0x3B51 = 0x59FF
+0x3B52 = 0x5B50
+0x3B53 = 0x5C4D
+0x3B54 = 0x5E02
+0x3B55 = 0x5E2B
+0x3B56 = 0x5FD7
+0x3B57 = 0x601D
+0x3B58 = 0x6307
+0x3B59 = 0x652F
+0x3B5A = 0x5B5C
+0x3B5B = 0x65AF
+0x3B5C = 0x65BD
+0x3B5D = 0x65E8
+0x3B5E = 0x679D
+0x3B5F = 0x6B62
+0x3B60 = 0x6B7B
+0x3B61 = 0x6C0F
+0x3B62 = 0x7345
+0x3B63 = 0x7949
+0x3B64 = 0x79C1
+0x3B65 = 0x7CF8
+0x3B66 = 0x7D19
+0x3B67 = 0x7D2B
+0x3B68 = 0x80A2
+0x3B69 = 0x8102
+0x3B6A = 0x81F3
+0x3B6B = 0x8996
+0x3B6C = 0x8A5E
+0x3B6D = 0x8A69
+0x3B6E = 0x8A66
+0x3B6F = 0x8A8C
+0x3B70 = 0x8AEE
+0x3B71 = 0x8CC7
+0x3B72 = 0x8CDC
+0x3B73 = 0x96CC
+0x3B74 = 0x98FC
+0x3B75 = 0x6B6F
+0x3B76 = 0x4E8B
+0x3B77 = 0x4F3C
+0x3B78 = 0x4F8D
+0x3B79 = 0x5150
+0x3B7A = 0x5B57
+0x3B7B = 0x5BFA
+0x3B7C = 0x6148
+0x3B7D = 0x6301
+0x3B7E = 0x6642
+0x3C21 = 0x6B21
+0x3C22 = 0x6ECB
+0x3C23 = 0x6CBB
+0x3C24 = 0x723E
+0x3C25 = 0x74BD
+0x3C26 = 0x75D4
+0x3C27 = 0x78C1
+0x3C28 = 0x793A
+0x3C29 = 0x800C
+0x3C2A = 0x8033
+0x3C2B = 0x81EA
+0x3C2C = 0x8494
+0x3C2D = 0x8F9E
+0x3C2E = 0x6C50
+0x3C2F = 0x9E7F
+0x3C30 = 0x5F0F
+0x3C31 = 0x8B58
+0x3C32 = 0x9D2B
+0x3C33 = 0x7AFA
+0x3C34 = 0x8EF8
+0x3C35 = 0x5B8D
+0x3C36 = 0x96EB
+0x3C37 = 0x4E03
+0x3C38 = 0x53F1
+0x3C39 = 0x57F7
+0x3C3A = 0x5931
+0x3C3B = 0x5AC9
+0x3C3C = 0x5BA4
+0x3C3D = 0x6089
+0x3C3E = 0x6E7F
+0x3C3F = 0x6F06
+0x3C40 = 0x75BE
+0x3C41 = 0x8CEA
+0x3C42 = 0x5B9F
+0x3C43 = 0x8500
+0x3C44 = 0x7BE0
+0x3C45 = 0x5072
+0x3C46 = 0x67F4
+0x3C47 = 0x829D
+0x3C48 = 0x5C61
+0x3C49 = 0x854A
+0x3C4A = 0x7E1E
+0x3C4B = 0x820E
+0x3C4C = 0x5199
+0x3C4D = 0x5C04
+0x3C4E = 0x6368
+0x3C4F = 0x8D66
+0x3C50 = 0x659C
+0x3C51 = 0x716E
+0x3C52 = 0x793E
+0x3C53 = 0x7D17
+0x3C54 = 0x8005
+0x3C55 = 0x8B1D
+0x3C56 = 0x8ECA
+0x3C57 = 0x906E
+0x3C58 = 0x86C7
+0x3C59 = 0x90AA
+0x3C5A = 0x501F
+0x3C5B = 0x52FA
+0x3C5C = 0x5C3A
+0x3C5D = 0x6753
+0x3C5E = 0x707C
+0x3C5F = 0x7235
+0x3C60 = 0x914C
+0x3C61 = 0x91C8
+0x3C62 = 0x932B
+0x3C63 = 0x82E5
+0x3C64 = 0x5BC2
+0x3C65 = 0x5F31
+0x3C66 = 0x60F9
+0x3C67 = 0x4E3B
+0x3C68 = 0x53D6
+0x3C69 = 0x5B88
+0x3C6A = 0x624B
+0x3C6B = 0x6731
+0x3C6C = 0x6B8A
+0x3C6D = 0x72E9
+0x3C6E = 0x73E0
+0x3C6F = 0x7A2E
+0x3C70 = 0x816B
+0x3C71 = 0x8DA3
+0x3C72 = 0x9152
+0x3C73 = 0x9996
+0x3C74 = 0x5112
+0x3C75 = 0x53D7
+0x3C76 = 0x546A
+0x3C77 = 0x5BFF
+0x3C78 = 0x6388
+0x3C79 = 0x6A39
+0x3C7A = 0x7DAC
+0x3C7B = 0x9700
+0x3C7C = 0x56DA
+0x3C7D = 0x53CE
+0x3C7E = 0x5468
+0x3D21 = 0x5B97
+0x3D22 = 0x5C31
+0x3D23 = 0x5DDE
+0x3D24 = 0x4FEE
+0x3D25 = 0x6101
+0x3D26 = 0x62FE
+0x3D27 = 0x6D32
+0x3D28 = 0x79C0
+0x3D29 = 0x79CB
+0x3D2A = 0x7D42
+0x3D2B = 0x7E4D
+0x3D2C = 0x7FD2
+0x3D2D = 0x81ED
+0x3D2E = 0x821F
+0x3D2F = 0x8490
+0x3D30 = 0x8846
+0x3D31 = 0x8972
+0x3D32 = 0x8B90
+0x3D33 = 0x8E74
+0x3D34 = 0x8F2F
+0x3D35 = 0x9031
+0x3D36 = 0x914B
+0x3D37 = 0x916C
+0x3D38 = 0x96C6
+0x3D39 = 0x919C
+0x3D3A = 0x4EC0
+0x3D3B = 0x4F4F
+0x3D3C = 0x5145
+0x3D3D = 0x5341
+0x3D3E = 0x5F93
+0x3D3F = 0x620E
+0x3D40 = 0x67D4
+0x3D41 = 0x6C41
+0x3D42 = 0x6E0B
+0x3D43 = 0x7363
+0x3D44 = 0x7E26
+0x3D45 = 0x91CD
+0x3D46 = 0x9283
+0x3D47 = 0x53D4
+0x3D48 = 0x5919
+0x3D49 = 0x5BBF
+0x3D4A = 0x6DD1
+0x3D4B = 0x795D
+0x3D4C = 0x7E2E
+0x3D4D = 0x7C9B
+0x3D4E = 0x587E
+0x3D4F = 0x719F
+0x3D50 = 0x51FA
+0x3D51 = 0x8853
+0x3D52 = 0x8FF0
+0x3D53 = 0x4FCA
+0x3D54 = 0x5CFB
+0x3D55 = 0x6625
+0x3D56 = 0x77AC
+0x3D57 = 0x7AE3
+0x3D58 = 0x821C
+0x3D59 = 0x99FF
+0x3D5A = 0x51C6
+0x3D5B = 0x5FAA
+0x3D5C = 0x65EC
+0x3D5D = 0x696F
+0x3D5E = 0x6B89
+0x3D5F = 0x6DF3
+0x3D60 = 0x6E96
+0x3D61 = 0x6F64
+0x3D62 = 0x76FE
+0x3D63 = 0x7D14
+0x3D64 = 0x5DE1
+0x3D65 = 0x9075
+0x3D66 = 0x9187
+0x3D67 = 0x9806
+0x3D68 = 0x51E6
+0x3D69 = 0x521D
+0x3D6A = 0x6240
+0x3D6B = 0x6691
+0x3D6C = 0x66D9
+0x3D6D = 0x6E1A
+0x3D6E = 0x5EB6
+0x3D6F = 0x7DD2
+0x3D70 = 0x7F72
+0x3D71 = 0x66F8
+0x3D72 = 0x85AF
+0x3D73 = 0x85F7
+0x3D74 = 0x8AF8
+0x3D75 = 0x52A9
+0x3D76 = 0x53D9
+0x3D77 = 0x5973
+0x3D78 = 0x5E8F
+0x3D79 = 0x5F90
+0x3D7A = 0x6055
+0x3D7B = 0x92E4
+0x3D7C = 0x9664
+0x3D7D = 0x50B7
+0x3D7E = 0x511F
+0x3E21 = 0x52DD
+0x3E22 = 0x5320
+0x3E23 = 0x5347
+0x3E24 = 0x53EC
+0x3E25 = 0x54E8
+0x3E26 = 0x5546
+0x3E27 = 0x5531
+0x3E28 = 0x5617
+0x3E29 = 0x5968
+0x3E2A = 0x59BE
+0x3E2B = 0x5A3C
+0x3E2C = 0x5BB5
+0x3E2D = 0x5C06
+0x3E2E = 0x5C0F
+0x3E2F = 0x5C11
+0x3E30 = 0x5C1A
+0x3E31 = 0x5E84
+0x3E32 = 0x5E8A
+0x3E33 = 0x5EE0
+0x3E34 = 0x5F70
+0x3E35 = 0x627F
+0x3E36 = 0x6284
+0x3E37 = 0x62DB
+0x3E38 = 0x638C
+0x3E39 = 0x6377
+0x3E3A = 0x6607
+0x3E3B = 0x660C
+0x3E3C = 0x662D
+0x3E3D = 0x6676
+0x3E3E = 0x677E
+0x3E3F = 0x68A2
+0x3E40 = 0x6A1F
+0x3E41 = 0x6A35
+0x3E42 = 0x6CBC
+0x3E43 = 0x6D88
+0x3E44 = 0x6E09
+0x3E45 = 0x6E58
+0x3E46 = 0x713C
+0x3E47 = 0x7126
+0x3E48 = 0x7167
+0x3E49 = 0x75C7
+0x3E4A = 0x7701
+0x3E4B = 0x785D
+0x3E4C = 0x7901
+0x3E4D = 0x7965
+0x3E4E = 0x79F0
+0x3E4F = 0x7AE0
+0x3E50 = 0x7B11
+0x3E51 = 0x7CA7
+0x3E52 = 0x7D39
+0x3E53 = 0x8096
+0x3E54 = 0x83D6
+0x3E55 = 0x848B
+0x3E56 = 0x8549
+0x3E57 = 0x885D
+0x3E58 = 0x88F3
+0x3E59 = 0x8A1F
+0x3E5A = 0x8A3C
+0x3E5B = 0x8A54
+0x3E5C = 0x8A73
+0x3E5D = 0x8C61
+0x3E5E = 0x8CDE
+0x3E5F = 0x91A4
+0x3E60 = 0x9266
+0x3E61 = 0x937E
+0x3E62 = 0x9418
+0x3E63 = 0x969C
+0x3E64 = 0x9798
+0x3E65 = 0x4E0A
+0x3E66 = 0x4E08
+0x3E67 = 0x4E1E
+0x3E68 = 0x4E57
+0x3E69 = 0x5197
+0x3E6A = 0x5270
+0x3E6B = 0x57CE
+0x3E6C = 0x5834
+0x3E6D = 0x58CC
+0x3E6E = 0x5B22
+0x3E6F = 0x5E38
+0x3E70 = 0x60C5
+0x3E71 = 0x64FE
+0x3E72 = 0x6761
+0x3E73 = 0x6756
+0x3E74 = 0x6D44
+0x3E75 = 0x72B6
+0x3E76 = 0x7573
+0x3E77 = 0x7A63
+0x3E78 = 0x84B8
+0x3E79 = 0x8B72
+0x3E7A = 0x91B8
+0x3E7B = 0x9320
+0x3E7C = 0x5631
+0x3E7D = 0x57F4
+0x3E7E = 0x98FE
+0x3F21 = 0x62ED
+0x3F22 = 0x690D
+0x3F23 = 0x6B96
+0x3F24 = 0x71ED
+0x3F25 = 0x7E54
+0x3F26 = 0x8077
+0x3F27 = 0x8272
+0x3F28 = 0x89E6
+0x3F29 = 0x98DF
+0x3F2A = 0x8755
+0x3F2B = 0x8FB1
+0x3F2C = 0x5C3B
+0x3F2D = 0x4F38
+0x3F2E = 0x4FE1
+0x3F2F = 0x4FB5
+0x3F30 = 0x5507
+0x3F31 = 0x5A20
+0x3F32 = 0x5BDD
+0x3F33 = 0x5BE9
+0x3F34 = 0x5FC3
+0x3F35 = 0x614E
+0x3F36 = 0x632F
+0x3F37 = 0x65B0
+0x3F38 = 0x664B
+0x3F39 = 0x68EE
+0x3F3A = 0x699B
+0x3F3B = 0x6D78
+0x3F3C = 0x6DF1
+0x3F3D = 0x7533
+0x3F3E = 0x75B9
+0x3F3F = 0x771F
+0x3F40 = 0x795E
+0x3F41 = 0x79E6
+0x3F42 = 0x7D33
+0x3F43 = 0x81E3
+0x3F44 = 0x82AF
+0x3F45 = 0x85AA
+0x3F46 = 0x89AA
+0x3F47 = 0x8A3A
+0x3F48 = 0x8EAB
+0x3F49 = 0x8F9B
+0x3F4A = 0x9032
+0x3F4B = 0x91DD
+0x3F4C = 0x9707
+0x3F4D = 0x4EBA
+0x3F4E = 0x4EC1
+0x3F4F = 0x5203
+0x3F50 = 0x5875
+0x3F51 = 0x58EC
+0x3F52 = 0x5C0B
+0x3F53 = 0x751A
+0x3F54 = 0x5C3D
+0x3F55 = 0x814E
+0x3F56 = 0x8A0A
+0x3F57 = 0x8FC5
+0x3F58 = 0x9663
+0x3F59 = 0x976D
+0x3F5A = 0x7B25
+0x3F5B = 0x8ACF
+0x3F5C = 0x9808
+0x3F5D = 0x9162
+0x3F5E = 0x56F3
+0x3F5F = 0x53A8
+0x3F60 = 0x9017
+0x3F61 = 0x5439
+0x3F62 = 0x5782
+0x3F63 = 0x5E25
+0x3F64 = 0x63A8
+0x3F65 = 0x6C34
+0x3F66 = 0x708A
+0x3F67 = 0x7761
+0x3F68 = 0x7C8B
+0x3F69 = 0x7FE0
+0x3F6A = 0x8870
+0x3F6B = 0x9042
+0x3F6C = 0x9154
+0x3F6D = 0x9310
+0x3F6E = 0x9318
+0x3F6F = 0x968F
+0x3F70 = 0x745E
+0x3F71 = 0x9AC4
+0x3F72 = 0x5D07
+0x3F73 = 0x5D69
+0x3F74 = 0x6570
+0x3F75 = 0x67A2
+0x3F76 = 0x8DA8
+0x3F77 = 0x96DB
+0x3F78 = 0x636E
+0x3F79 = 0x6749
+0x3F7A = 0x6919
+0x3F7B = 0x83C5
+0x3F7C = 0x9817
+0x3F7D = 0x96C0
+0x3F7E = 0x88FE
+0x4021 = 0x6F84
+0x4022 = 0x647A
+0x4023 = 0x5BF8
+0x4024 = 0x4E16
+0x4025 = 0x702C
+0x4026 = 0x755D
+0x4027 = 0x662F
+0x4028 = 0x51C4
+0x4029 = 0x5236
+0x402A = 0x52E2
+0x402B = 0x59D3
+0x402C = 0x5F81
+0x402D = 0x6027
+0x402E = 0x6210
+0x402F = 0x653F
+0x4030 = 0x6574
+0x4031 = 0x661F
+0x4032 = 0x6674
+0x4033 = 0x68F2
+0x4034 = 0x6816
+0x4035 = 0x6B63
+0x4036 = 0x6E05
+0x4037 = 0x7272
+0x4038 = 0x751F
+0x4039 = 0x76DB
+0x403A = 0x7CBE
+0x403B = 0x8056
+0x403C = 0x58F0
+0x403D = 0x88FD
+0x403E = 0x897F
+0x403F = 0x8AA0
+0x4040 = 0x8A93
+0x4041 = 0x8ACB
+0x4042 = 0x901D
+0x4043 = 0x9192
+0x4044 = 0x9752
+0x4045 = 0x9759
+0x4046 = 0x6589
+0x4047 = 0x7A0E
+0x4048 = 0x8106
+0x4049 = 0x96BB
+0x404A = 0x5E2D
+0x404B = 0x60DC
+0x404C = 0x621A
+0x404D = 0x65A5
+0x404E = 0x6614
+0x404F = 0x6790
+0x4050 = 0x77F3
+0x4051 = 0x7A4D
+0x4052 = 0x7C4D
+0x4053 = 0x7E3E
+0x4054 = 0x810A
+0x4055 = 0x8CAC
+0x4056 = 0x8D64
+0x4057 = 0x8DE1
+0x4058 = 0x8E5F
+0x4059 = 0x78A9
+0x405A = 0x5207
+0x405B = 0x62D9
+0x405C = 0x63A5
+0x405D = 0x6442
+0x405E = 0x6298
+0x405F = 0x8A2D
+0x4060 = 0x7A83
+0x4061 = 0x7BC0
+0x4062 = 0x8AAC
+0x4063 = 0x96EA
+0x4064 = 0x7D76
+0x4065 = 0x820C
+0x4066 = 0x8749
+0x4067 = 0x4ED9
+0x4068 = 0x5148
+0x4069 = 0x5343
+0x406A = 0x5360
+0x406B = 0x5BA3
+0x406C = 0x5C02
+0x406D = 0x5C16
+0x406E = 0x5DDD
+0x406F = 0x6226
+0x4070 = 0x6247
+0x4071 = 0x64B0
+0x4072 = 0x6813
+0x4073 = 0x6834
+0x4074 = 0x6CC9
+0x4075 = 0x6D45
+0x4076 = 0x6D17
+0x4077 = 0x67D3
+0x4078 = 0x6F5C
+0x4079 = 0x714E
+0x407A = 0x717D
+0x407B = 0x65CB
+0x407C = 0x7A7F
+0x407D = 0x7BAD
+0x407E = 0x7DDA
+0x4121 = 0x7E4A
+0x4122 = 0x7FA8
+0x4123 = 0x817A
+0x4124 = 0x821B
+0x4125 = 0x8239
+0x4126 = 0x85A6
+0x4127 = 0x8A6E
+0x4128 = 0x8CCE
+0x4129 = 0x8DF5
+0x412A = 0x9078
+0x412B = 0x9077
+0x412C = 0x92AD
+0x412D = 0x9291
+0x412E = 0x9583
+0x412F = 0x9BAE
+0x4130 = 0x524D
+0x4131 = 0x5584
+0x4132 = 0x6F38
+0x4133 = 0x7136
+0x4134 = 0x5168
+0x4135 = 0x7985
+0x4136 = 0x7E55
+0x4137 = 0x81B3
+0x4138 = 0x7CCE
+0x4139 = 0x564C
+0x413A = 0x5851
+0x413B = 0x5CA8
+0x413C = 0x63AA
+0x413D = 0x66FE
+0x413E = 0x66FD
+0x413F = 0x695A
+0x4140 = 0x72D9
+0x4141 = 0x758F
+0x4142 = 0x758E
+0x4143 = 0x790E
+0x4144 = 0x7956
+0x4145 = 0x79DF
+0x4146 = 0x7C97
+0x4147 = 0x7D20
+0x4148 = 0x7D44
+0x4149 = 0x8607
+0x414A = 0x8A34
+0x414B = 0x963B
+0x414C = 0x9061
+0x414D = 0x9F20
+0x414E = 0x50E7
+0x414F = 0x5275
+0x4150 = 0x53CC
+0x4151 = 0x53E2
+0x4152 = 0x5009
+0x4153 = 0x55AA
+0x4154 = 0x58EE
+0x4155 = 0x594F
+0x4156 = 0x723D
+0x4157 = 0x5B8B
+0x4158 = 0x5C64
+0x4159 = 0x531D
+0x415A = 0x60E3
+0x415B = 0x60F3
+0x415C = 0x635C
+0x415D = 0x6383
+0x415E = 0x633F
+0x415F = 0x63BB
+0x4160 = 0x64CD
+0x4161 = 0x65E9
+0x4162 = 0x66F9
+0x4163 = 0x5DE3
+0x4164 = 0x69CD
+0x4165 = 0x69FD
+0x4166 = 0x6F15
+0x4167 = 0x71E5
+0x4168 = 0x4E89
+0x4169 = 0x75E9
+0x416A = 0x76F8
+0x416B = 0x7A93
+0x416C = 0x7CDF
+0x416D = 0x7DCF
+0x416E = 0x7D9C
+0x416F = 0x8061
+0x4170 = 0x8349
+0x4171 = 0x8358
+0x4172 = 0x846C
+0x4173 = 0x84BC
+0x4174 = 0x85FB
+0x4175 = 0x88C5
+0x4176 = 0x8D70
+0x4177 = 0x9001
+0x4178 = 0x906D
+0x4179 = 0x9397
+0x417A = 0x971C
+0x417B = 0x9A12
+0x417C = 0x50CF
+0x417D = 0x5897
+0x417E = 0x618E
+0x4221 = 0x81D3
+0x4222 = 0x8535
+0x4223 = 0x8D08
+0x4224 = 0x9020
+0x4225 = 0x4FC3
+0x4226 = 0x5074
+0x4227 = 0x5247
+0x4228 = 0x5373
+0x4229 = 0x606F
+0x422A = 0x6349
+0x422B = 0x675F
+0x422C = 0x6E2C
+0x422D = 0x8DB3
+0x422E = 0x901F
+0x422F = 0x4FD7
+0x4230 = 0x5C5E
+0x4231 = 0x8CCA
+0x4232 = 0x65CF
+0x4233 = 0x7D9A
+0x4234 = 0x5352
+0x4235 = 0x8896
+0x4236 = 0x5176
+0x4237 = 0x63C3
+0x4238 = 0x5B58
+0x4239 = 0x5B6B
+0x423A = 0x5C0A
+0x423B = 0x640D
+0x423C = 0x6751
+0x423D = 0x905C
+0x423E = 0x4ED6
+0x423F = 0x591A
+0x4240 = 0x592A
+0x4241 = 0x6C70
+0x4242 = 0x8A51
+0x4243 = 0x553E
+0x4244 = 0x5815
+0x4245 = 0x59A5
+0x4246 = 0x60F0
+0x4247 = 0x6253
+0x4248 = 0x67C1
+0x4249 = 0x8235
+0x424A = 0x6955
+0x424B = 0x9640
+0x424C = 0x99C4
+0x424D = 0x9A28
+0x424E = 0x4F53
+0x424F = 0x5806
+0x4250 = 0x5BFE
+0x4251 = 0x8010
+0x4252 = 0x5CB1
+0x4253 = 0x5E2F
+0x4254 = 0x5F85
+0x4255 = 0x6020
+0x4256 = 0x614B
+0x4257 = 0x6234
+0x4258 = 0x66FF
+0x4259 = 0x6CF0
+0x425A = 0x6EDE
+0x425B = 0x80CE
+0x425C = 0x817F
+0x425D = 0x82D4
+0x425E = 0x888B
+0x425F = 0x8CB8
+0x4260 = 0x9000
+0x4261 = 0x902E
+0x4262 = 0x968A
+0x4263 = 0x9EDB
+0x4264 = 0x9BDB
+0x4265 = 0x4EE3
+0x4266 = 0x53F0
+0x4267 = 0x5927
+0x4268 = 0x7B2C
+0x4269 = 0x918D
+0x426A = 0x984C
+0x426B = 0x9DF9
+0x426C = 0x6EDD
+0x426D = 0x7027
+0x426E = 0x5353
+0x426F = 0x5544
+0x4270 = 0x5B85
+0x4271 = 0x6258
+0x4272 = 0x629E
+0x4273 = 0x62D3
+0x4274 = 0x6CA2
+0x4275 = 0x6FEF
+0x4276 = 0x7422
+0x4277 = 0x8A17
+0x4278 = 0x9438
+0x4279 = 0x6FC1
+0x427A = 0x8AFE
+0x427B = 0x8338
+0x427C = 0x51E7
+0x427D = 0x86F8
+0x427E = 0x53EA
+0x4321 = 0x53E9
+0x4322 = 0x4F46
+0x4323 = 0x9054
+0x4324 = 0x8FB0
+0x4325 = 0x596A
+0x4326 = 0x8131
+0x4327 = 0x5DFD
+0x4328 = 0x7AEA
+0x4329 = 0x8FBF
+0x432A = 0x68DA
+0x432B = 0x8C37
+0x432C = 0x72F8
+0x432D = 0x9C48
+0x432E = 0x6A3D
+0x432F = 0x8AB0
+0x4330 = 0x4E39
+0x4331 = 0x5358
+0x4332 = 0x5606
+0x4333 = 0x5766
+0x4334 = 0x62C5
+0x4335 = 0x63A2
+0x4336 = 0x65E6
+0x4337 = 0x6B4E
+0x4338 = 0x6DE1
+0x4339 = 0x6E5B
+0x433A = 0x70AD
+0x433B = 0x77ED
+0x433C = 0x7AEF
+0x433D = 0x7BAA
+0x433E = 0x7DBB
+0x433F = 0x803D
+0x4340 = 0x80C6
+0x4341 = 0x86CB
+0x4342 = 0x8A95
+0x4343 = 0x935B
+0x4344 = 0x56E3
+0x4345 = 0x58C7
+0x4346 = 0x5F3E
+0x4347 = 0x65AD
+0x4348 = 0x6696
+0x4349 = 0x6A80
+0x434A = 0x6BB5
+0x434B = 0x7537
+0x434C = 0x8AC7
+0x434D = 0x5024
+0x434E = 0x77E5
+0x434F = 0x5730
+0x4350 = 0x5F1B
+0x4351 = 0x6065
+0x4352 = 0x667A
+0x4353 = 0x6C60
+0x4354 = 0x75F4
+0x4355 = 0x7A1A
+0x4356 = 0x7F6E
+0x4357 = 0x81F4
+0x4358 = 0x8718
+0x4359 = 0x9045
+0x435A = 0x99B3
+0x435B = 0x7BC9
+0x435C = 0x755C
+0x435D = 0x7AF9
+0x435E = 0x7B51
+0x435F = 0x84C4
+0x4360 = 0x9010
+0x4361 = 0x79E9
+0x4362 = 0x7A92
+0x4363 = 0x8336
+0x4364 = 0x5AE1
+0x4365 = 0x7740
+0x4366 = 0x4E2D
+0x4367 = 0x4EF2
+0x4368 = 0x5B99
+0x4369 = 0x5FE0
+0x436A = 0x62BD
+0x436B = 0x663C
+0x436C = 0x67F1
+0x436D = 0x6CE8
+0x436E = 0x866B
+0x436F = 0x8877
+0x4370 = 0x8A3B
+0x4371 = 0x914E
+0x4372 = 0x92F3
+0x4373 = 0x99D0
+0x4374 = 0x6A17
+0x4375 = 0x7026
+0x4376 = 0x732A
+0x4377 = 0x82E7
+0x4378 = 0x8457
+0x4379 = 0x8CAF
+0x437A = 0x4E01
+0x437B = 0x5146
+0x437C = 0x51CB
+0x437D = 0x558B
+0x437E = 0x5BF5
+0x4421 = 0x5E16
+0x4422 = 0x5E33
+0x4423 = 0x5E81
+0x4424 = 0x5F14
+0x4425 = 0x5F35
+0x4426 = 0x5F6B
+0x4427 = 0x5FB4
+0x4428 = 0x61F2
+0x4429 = 0x6311
+0x442A = 0x66A2
+0x442B = 0x671D
+0x442C = 0x6F6E
+0x442D = 0x7252
+0x442E = 0x753A
+0x442F = 0x773A
+0x4430 = 0x8074
+0x4431 = 0x8139
+0x4432 = 0x8178
+0x4433 = 0x8776
+0x4434 = 0x8ABF
+0x4435 = 0x8ADC
+0x4436 = 0x8D85
+0x4437 = 0x8DF3
+0x4438 = 0x929A
+0x4439 = 0x9577
+0x443A = 0x9802
+0x443B = 0x9CE5
+0x443C = 0x52C5
+0x443D = 0x6357
+0x443E = 0x76F4
+0x443F = 0x6715
+0x4440 = 0x6C88
+0x4441 = 0x73CD
+0x4442 = 0x8CC3
+0x4443 = 0x93AE
+0x4444 = 0x9673
+0x4445 = 0x6D25
+0x4446 = 0x589C
+0x4447 = 0x690E
+0x4448 = 0x69CC
+0x4449 = 0x8FFD
+0x444A = 0x939A
+0x444B = 0x75DB
+0x444C = 0x901A
+0x444D = 0x585A
+0x444E = 0x6802
+0x444F = 0x63B4
+0x4450 = 0x69FB
+0x4451 = 0x4F43
+0x4452 = 0x6F2C
+0x4453 = 0x67D8
+0x4454 = 0x8FBB
+0x4455 = 0x8526
+0x4456 = 0x7DB4
+0x4457 = 0x9354
+0x4458 = 0x693F
+0x4459 = 0x6F70
+0x445A = 0x576A
+0x445B = 0x58F7
+0x445C = 0x5B2C
+0x445D = 0x7D2C
+0x445E = 0x722A
+0x445F = 0x540A
+0x4460 = 0x91E3
+0x4461 = 0x9DB4
+0x4462 = 0x4EAD
+0x4463 = 0x4F4E
+0x4464 = 0x505C
+0x4465 = 0x5075
+0x4466 = 0x5243
+0x4467 = 0x8C9E
+0x4468 = 0x5448
+0x4469 = 0x5824
+0x446A = 0x5B9A
+0x446B = 0x5E1D
+0x446C = 0x5E95
+0x446D = 0x5EAD
+0x446E = 0x5EF7
+0x446F = 0x5F1F
+0x4470 = 0x608C
+0x4471 = 0x62B5
+0x4472 = 0x633A
+0x4473 = 0x63D0
+0x4474 = 0x68AF
+0x4475 = 0x6C40
+0x4476 = 0x7887
+0x4477 = 0x798E
+0x4478 = 0x7A0B
+0x4479 = 0x7DE0
+0x447A = 0x8247
+0x447B = 0x8A02
+0x447C = 0x8AE6
+0x447D = 0x8E44
+0x447E = 0x9013
+0x4521 = 0x90B8
+0x4522 = 0x912D
+0x4523 = 0x91D8
+0x4524 = 0x9F0E
+0x4525 = 0x6CE5
+0x4526 = 0x6458
+0x4527 = 0x64E2
+0x4528 = 0x6575
+0x4529 = 0x6EF4
+0x452A = 0x7684
+0x452B = 0x7B1B
+0x452C = 0x9069
+0x452D = 0x93D1
+0x452E = 0x6EBA
+0x452F = 0x54F2
+0x4530 = 0x5FB9
+0x4531 = 0x64A4
+0x4532 = 0x8F4D
+0x4533 = 0x8FED
+0x4534 = 0x9244
+0x4535 = 0x5178
+0x4536 = 0x586B
+0x4537 = 0x5929
+0x4538 = 0x5C55
+0x4539 = 0x5E97
+0x453A = 0x6DFB
+0x453B = 0x7E8F
+0x453C = 0x751C
+0x453D = 0x8CBC
+0x453E = 0x8EE2
+0x453F = 0x985B
+0x4540 = 0x70B9
+0x4541 = 0x4F1D
+0x4542 = 0x6BBF
+0x4543 = 0x6FB1
+0x4544 = 0x7530
+0x4545 = 0x96FB
+0x4546 = 0x514E
+0x4547 = 0x5410
+0x4548 = 0x5835
+0x4549 = 0x5857
+0x454A = 0x59AC
+0x454B = 0x5C60
+0x454C = 0x5F92
+0x454D = 0x6597
+0x454E = 0x675C
+0x454F = 0x6E21
+0x4550 = 0x767B
+0x4551 = 0x83DF
+0x4552 = 0x8CED
+0x4553 = 0x9014
+0x4554 = 0x90FD
+0x4555 = 0x934D
+0x4556 = 0x7825
+0x4557 = 0x783A
+0x4558 = 0x52AA
+0x4559 = 0x5EA6
+0x455A = 0x571F
+0x455B = 0x5974
+0x455C = 0x6012
+0x455D = 0x5012
+0x455E = 0x515A
+0x455F = 0x51AC
+0x4560 = 0x51CD
+0x4561 = 0x5200
+0x4562 = 0x5510
+0x4563 = 0x5854
+0x4564 = 0x5858
+0x4565 = 0x5957
+0x4566 = 0x5B95
+0x4567 = 0x5CF6
+0x4568 = 0x5D8B
+0x4569 = 0x60BC
+0x456A = 0x6295
+0x456B = 0x642D
+0x456C = 0x6771
+0x456D = 0x6843
+0x456E = 0x68BC
+0x456F = 0x68DF
+0x4570 = 0x76D7
+0x4571 = 0x6DD8
+0x4572 = 0x6E6F
+0x4573 = 0x6D9B
+0x4574 = 0x706F
+0x4575 = 0x71C8
+0x4576 = 0x5F53
+0x4577 = 0x75D8
+0x4578 = 0x7977
+0x4579 = 0x7B49
+0x457A = 0x7B54
+0x457B = 0x7B52
+0x457C = 0x7CD6
+0x457D = 0x7D71
+0x457E = 0x5230
+0x4621 = 0x8463
+0x4622 = 0x8569
+0x4623 = 0x85E4
+0x4624 = 0x8A0E
+0x4625 = 0x8B04
+0x4626 = 0x8C46
+0x4627 = 0x8E0F
+0x4628 = 0x9003
+0x4629 = 0x900F
+0x462A = 0x9419
+0x462B = 0x9676
+0x462C = 0x982D
+0x462D = 0x9A30
+0x462E = 0x95D8
+0x462F = 0x50CD
+0x4630 = 0x52D5
+0x4631 = 0x540C
+0x4632 = 0x5802
+0x4633 = 0x5C0E
+0x4634 = 0x61A7
+0x4635 = 0x649E
+0x4636 = 0x6D1E
+0x4637 = 0x77B3
+0x4638 = 0x7AE5
+0x4639 = 0x80F4
+0x463A = 0x8404
+0x463B = 0x9053
+0x463C = 0x9285
+0x463D = 0x5CE0
+0x463E = 0x9D07
+0x463F = 0x533F
+0x4640 = 0x5F97
+0x4641 = 0x5FB3
+0x4642 = 0x6D9C
+0x4643 = 0x7279
+0x4644 = 0x7763
+0x4645 = 0x79BF
+0x4646 = 0x7BE4
+0x4647 = 0x6BD2
+0x4648 = 0x72EC
+0x4649 = 0x8AAD
+0x464A = 0x6803
+0x464B = 0x6A61
+0x464C = 0x51F8
+0x464D = 0x7A81
+0x464E = 0x6934
+0x464F = 0x5C4A
+0x4650 = 0x9CF6
+0x4651 = 0x82EB
+0x4652 = 0x5BC5
+0x4653 = 0x9149
+0x4654 = 0x701E
+0x4655 = 0x5678
+0x4656 = 0x5C6F
+0x4657 = 0x60C7
+0x4658 = 0x6566
+0x4659 = 0x6C8C
+0x465A = 0x8C5A
+0x465B = 0x9041
+0x465C = 0x9813
+0x465D = 0x5451
+0x465E = 0x66C7
+0x465F = 0x920D
+0x4660 = 0x5948
+0x4661 = 0x90A3
+0x4662 = 0x5185
+0x4663 = 0x4E4D
+0x4664 = 0x51EA
+0x4665 = 0x8599
+0x4666 = 0x8B0E
+0x4667 = 0x7058
+0x4668 = 0x637A
+0x4669 = 0x934B
+0x466A = 0x6962
+0x466B = 0x99B4
+0x466C = 0x7E04
+0x466D = 0x7577
+0x466E = 0x5357
+0x466F = 0x6960
+0x4670 = 0x8EDF
+0x4671 = 0x96E3
+0x4672 = 0x6C5D
+0x4673 = 0x4E8C
+0x4674 = 0x5C3C
+0x4675 = 0x5F10
+0x4676 = 0x8FE9
+0x4677 = 0x5302
+0x4678 = 0x8CD1
+0x4679 = 0x8089
+0x467A = 0x8679
+0x467B = 0x5EFF
+0x467C = 0x65E5
+0x467D = 0x4E73
+0x467E = 0x5165
+0x4721 = 0x5982
+0x4722 = 0x5C3F
+0x4723 = 0x97EE
+0x4724 = 0x4EFB
+0x4725 = 0x598A
+0x4726 = 0x5FCD
+0x4727 = 0x8A8D
+0x4728 = 0x6FE1
+0x4729 = 0x79B0
+0x472A = 0x7962
+0x472B = 0x5BE7
+0x472C = 0x8471
+0x472D = 0x732B
+0x472E = 0x71B1
+0x472F = 0x5E74
+0x4730 = 0x5FF5
+0x4731 = 0x637B
+0x4732 = 0x649A
+0x4733 = 0x71C3
+0x4734 = 0x7C98
+0x4735 = 0x4E43
+0x4736 = 0x5EFC
+0x4737 = 0x4E4B
+0x4738 = 0x57DC
+0x4739 = 0x56A2
+0x473A = 0x60A9
+0x473B = 0x6FC3
+0x473C = 0x7D0D
+0x473D = 0x80FD
+0x473E = 0x8133
+0x473F = 0x81BF
+0x4740 = 0x8FB2
+0x4741 = 0x8997
+0x4742 = 0x86A4
+0x4743 = 0x5DF4
+0x4744 = 0x628A
+0x4745 = 0x64AD
+0x4746 = 0x8987
+0x4747 = 0x6777
+0x4748 = 0x6CE2
+0x4749 = 0x6D3E
+0x474A = 0x7436
+0x474B = 0x7834
+0x474C = 0x5A46
+0x474D = 0x7F75
+0x474E = 0x82AD
+0x474F = 0x99AC
+0x4750 = 0x4FF3
+0x4751 = 0x5EC3
+0x4752 = 0x62DD
+0x4753 = 0x6392
+0x4754 = 0x6557
+0x4755 = 0x676F
+0x4756 = 0x76C3
+0x4757 = 0x724C
+0x4758 = 0x80CC
+0x4759 = 0x80BA
+0x475A = 0x8F29
+0x475B = 0x914D
+0x475C = 0x500D
+0x475D = 0x57F9
+0x475E = 0x5A92
+0x475F = 0x6885
+0x4760 = 0x6973
+0x4761 = 0x7164
+0x4762 = 0x72FD
+0x4763 = 0x8CB7
+0x4764 = 0x58F2
+0x4765 = 0x8CE0
+0x4766 = 0x966A
+0x4767 = 0x9019
+0x4768 = 0x877F
+0x4769 = 0x79E4
+0x476A = 0x77E7
+0x476B = 0x8429
+0x476C = 0x4F2F
+0x476D = 0x5265
+0x476E = 0x535A
+0x476F = 0x62CD
+0x4770 = 0x67CF
+0x4771 = 0x6CCA
+0x4772 = 0x767D
+0x4773 = 0x7B94
+0x4774 = 0x7C95
+0x4775 = 0x8236
+0x4776 = 0x8584
+0x4777 = 0x8FEB
+0x4778 = 0x66DD
+0x4779 = 0x6F20
+0x477A = 0x7206
+0x477B = 0x7E1B
+0x477C = 0x83AB
+0x477D = 0x99C1
+0x477E = 0x9EA6
+0x4821 = 0x51FD
+0x4822 = 0x7BB1
+0x4823 = 0x7872
+0x4824 = 0x7BB8
+0x4825 = 0x8087
+0x4826 = 0x7B48
+0x4827 = 0x6AE8
+0x4828 = 0x5E61
+0x4829 = 0x808C
+0x482A = 0x7551
+0x482B = 0x7560
+0x482C = 0x516B
+0x482D = 0x9262
+0x482E = 0x6E8C
+0x482F = 0x767A
+0x4830 = 0x9197
+0x4831 = 0x9AEA
+0x4832 = 0x4F10
+0x4833 = 0x7F70
+0x4834 = 0x629C
+0x4835 = 0x7B4F
+0x4836 = 0x95A5
+0x4837 = 0x9CE9
+0x4838 = 0x567A
+0x4839 = 0x5859
+0x483A = 0x86E4
+0x483B = 0x96BC
+0x483C = 0x4F34
+0x483D = 0x5224
+0x483E = 0x534A
+0x483F = 0x53CD
+0x4840 = 0x53DB
+0x4841 = 0x5E06
+0x4842 = 0x642C
+0x4843 = 0x6591
+0x4844 = 0x677F
+0x4845 = 0x6C3E
+0x4846 = 0x6C4E
+0x4847 = 0x7248
+0x4848 = 0x72AF
+0x4849 = 0x73ED
+0x484A = 0x7554
+0x484B = 0x7E41
+0x484C = 0x822C
+0x484D = 0x85E9
+0x484E = 0x8CA9
+0x484F = 0x7BC4
+0x4850 = 0x91C6
+0x4851 = 0x7169
+0x4852 = 0x9812
+0x4853 = 0x98EF
+0x4854 = 0x633D
+0x4855 = 0x6669
+0x4856 = 0x756A
+0x4857 = 0x76E4
+0x4858 = 0x78D0
+0x4859 = 0x8543
+0x485A = 0x86EE
+0x485B = 0x532A
+0x485C = 0x5351
+0x485D = 0x5426
+0x485E = 0x5983
+0x485F = 0x5E87
+0x4860 = 0x5F7C
+0x4861 = 0x60B2
+0x4862 = 0x6249
+0x4863 = 0x6279
+0x4864 = 0x62AB
+0x4865 = 0x6590
+0x4866 = 0x6BD4
+0x4867 = 0x6CCC
+0x4868 = 0x75B2
+0x4869 = 0x76AE
+0x486A = 0x7891
+0x486B = 0x79D8
+0x486C = 0x7DCB
+0x486D = 0x7F77
+0x486E = 0x80A5
+0x486F = 0x88AB
+0x4870 = 0x8AB9
+0x4871 = 0x8CBB
+0x4872 = 0x907F
+0x4873 = 0x975E
+0x4874 = 0x98DB
+0x4875 = 0x6A0B
+0x4876 = 0x7C38
+0x4877 = 0x5099
+0x4878 = 0x5C3E
+0x4879 = 0x5FAE
+0x487A = 0x6787
+0x487B = 0x6BD8
+0x487C = 0x7435
+0x487D = 0x7709
+0x487E = 0x7F8E
+0x4921 = 0x9F3B
+0x4922 = 0x67CA
+0x4923 = 0x7A17
+0x4924 = 0x5339
+0x4925 = 0x758B
+0x4926 = 0x9AED
+0x4927 = 0x5F66
+0x4928 = 0x819D
+0x4929 = 0x83F1
+0x492A = 0x8098
+0x492B = 0x5F3C
+0x492C = 0x5FC5
+0x492D = 0x7562
+0x492E = 0x7B46
+0x492F = 0x903C
+0x4930 = 0x6867
+0x4931 = 0x59EB
+0x4932 = 0x5A9B
+0x4933 = 0x7D10
+0x4934 = 0x767E
+0x4935 = 0x8B2C
+0x4936 = 0x4FF5
+0x4937 = 0x5F6A
+0x4938 = 0x6A19
+0x4939 = 0x6C37
+0x493A = 0x6F02
+0x493B = 0x74E2
+0x493C = 0x7968
+0x493D = 0x8868
+0x493E = 0x8A55
+0x493F = 0x8C79
+0x4940 = 0x5EDF
+0x4941 = 0x63CF
+0x4942 = 0x75C5
+0x4943 = 0x79D2
+0x4944 = 0x82D7
+0x4945 = 0x9328
+0x4946 = 0x92F2
+0x4947 = 0x849C
+0x4948 = 0x86ED
+0x4949 = 0x9C2D
+0x494A = 0x54C1
+0x494B = 0x5F6C
+0x494C = 0x658C
+0x494D = 0x6D5C
+0x494E = 0x7015
+0x494F = 0x8CA7
+0x4950 = 0x8CD3
+0x4951 = 0x983B
+0x4952 = 0x654F
+0x4953 = 0x74F6
+0x4954 = 0x4E0D
+0x4955 = 0x4ED8
+0x4956 = 0x57E0
+0x4957 = 0x592B
+0x4958 = 0x5A66
+0x4959 = 0x5BCC
+0x495A = 0x51A8
+0x495B = 0x5E03
+0x495C = 0x5E9C
+0x495D = 0x6016
+0x495E = 0x6276
+0x495F = 0x6577
+0x4960 = 0x65A7
+0x4961 = 0x666E
+0x4962 = 0x6D6E
+0x4963 = 0x7236
+0x4964 = 0x7B26
+0x4965 = 0x8150
+0x4966 = 0x819A
+0x4967 = 0x8299
+0x4968 = 0x8B5C
+0x4969 = 0x8CA0
+0x496A = 0x8CE6
+0x496B = 0x8D74
+0x496C = 0x961C
+0x496D = 0x9644
+0x496E = 0x4FAE
+0x496F = 0x64AB
+0x4970 = 0x6B66
+0x4971 = 0x821E
+0x4972 = 0x8461
+0x4973 = 0x856A
+0x4974 = 0x90E8
+0x4975 = 0x5C01
+0x4976 = 0x6953
+0x4977 = 0x98A8
+0x4978 = 0x847A
+0x4979 = 0x8557
+0x497A = 0x4F0F
+0x497B = 0x526F
+0x497C = 0x5FA9
+0x497D = 0x5E45
+0x497E = 0x670D
+0x4A21 = 0x798F
+0x4A22 = 0x8179
+0x4A23 = 0x8907
+0x4A24 = 0x8986
+0x4A25 = 0x6DF5
+0x4A26 = 0x5F17
+0x4A27 = 0x6255
+0x4A28 = 0x6CB8
+0x4A29 = 0x4ECF
+0x4A2A = 0x7269
+0x4A2B = 0x9B92
+0x4A2C = 0x5206
+0x4A2D = 0x543B
+0x4A2E = 0x5674
+0x4A2F = 0x58B3
+0x4A30 = 0x61A4
+0x4A31 = 0x626E
+0x4A32 = 0x711A
+0x4A33 = 0x596E
+0x4A34 = 0x7C89
+0x4A35 = 0x7CDE
+0x4A36 = 0x7D1B
+0x4A37 = 0x96F0
+0x4A38 = 0x6587
+0x4A39 = 0x805E
+0x4A3A = 0x4E19
+0x4A3B = 0x4F75
+0x4A3C = 0x5175
+0x4A3D = 0x5840
+0x4A3E = 0x5E63
+0x4A3F = 0x5E73
+0x4A40 = 0x5F0A
+0x4A41 = 0x67C4
+0x4A42 = 0x4E26
+0x4A43 = 0x853D
+0x4A44 = 0x9589
+0x4A45 = 0x965B
+0x4A46 = 0x7C73
+0x4A47 = 0x9801
+0x4A48 = 0x50FB
+0x4A49 = 0x58C1
+0x4A4A = 0x7656
+0x4A4B = 0x78A7
+0x4A4C = 0x5225
+0x4A4D = 0x77A5
+0x4A4E = 0x8511
+0x4A4F = 0x7B86
+0x4A50 = 0x504F
+0x4A51 = 0x5909
+0x4A52 = 0x7247
+0x4A53 = 0x7BC7
+0x4A54 = 0x7DE8
+0x4A55 = 0x8FBA
+0x4A56 = 0x8FD4
+0x4A57 = 0x904D
+0x4A58 = 0x4FBF
+0x4A59 = 0x52C9
+0x4A5A = 0x5A29
+0x4A5B = 0x5F01
+0x4A5C = 0x97AD
+0x4A5D = 0x4FDD
+0x4A5E = 0x8217
+0x4A5F = 0x92EA
+0x4A60 = 0x5703
+0x4A61 = 0x6355
+0x4A62 = 0x6B69
+0x4A63 = 0x752B
+0x4A64 = 0x88DC
+0x4A65 = 0x8F14
+0x4A66 = 0x7A42
+0x4A67 = 0x52DF
+0x4A68 = 0x5893
+0x4A69 = 0x6155
+0x4A6A = 0x620A
+0x4A6B = 0x66AE
+0x4A6C = 0x6BCD
+0x4A6D = 0x7C3F
+0x4A6E = 0x83E9
+0x4A6F = 0x5023
+0x4A70 = 0x4FF8
+0x4A71 = 0x5305
+0x4A72 = 0x5446
+0x4A73 = 0x5831
+0x4A74 = 0x5949
+0x4A75 = 0x5B9D
+0x4A76 = 0x5CF0
+0x4A77 = 0x5CEF
+0x4A78 = 0x5D29
+0x4A79 = 0x5E96
+0x4A7A = 0x62B1
+0x4A7B = 0x6367
+0x4A7C = 0x653E
+0x4A7D = 0x65B9
+0x4A7E = 0x670B
+0x4B21 = 0x6CD5
+0x4B22 = 0x6CE1
+0x4B23 = 0x70F9
+0x4B24 = 0x7832
+0x4B25 = 0x7E2B
+0x4B26 = 0x80DE
+0x4B27 = 0x82B3
+0x4B28 = 0x840C
+0x4B29 = 0x84EC
+0x4B2A = 0x8702
+0x4B2B = 0x8912
+0x4B2C = 0x8A2A
+0x4B2D = 0x8C4A
+0x4B2E = 0x90A6
+0x4B2F = 0x92D2
+0x4B30 = 0x98FD
+0x4B31 = 0x9CF3
+0x4B32 = 0x9D6C
+0x4B33 = 0x4E4F
+0x4B34 = 0x4EA1
+0x4B35 = 0x508D
+0x4B36 = 0x5256
+0x4B37 = 0x574A
+0x4B38 = 0x59A8
+0x4B39 = 0x5E3D
+0x4B3A = 0x5FD8
+0x4B3B = 0x5FD9
+0x4B3C = 0x623F
+0x4B3D = 0x66B4
+0x4B3E = 0x671B
+0x4B3F = 0x67D0
+0x4B40 = 0x68D2
+0x4B41 = 0x5192
+0x4B42 = 0x7D21
+0x4B43 = 0x80AA
+0x4B44 = 0x81A8
+0x4B45 = 0x8B00
+0x4B46 = 0x8C8C
+0x4B47 = 0x8CBF
+0x4B48 = 0x927E
+0x4B49 = 0x9632
+0x4B4A = 0x5420
+0x4B4B = 0x982C
+0x4B4C = 0x5317
+0x4B4D = 0x50D5
+0x4B4E = 0x535C
+0x4B4F = 0x58A8
+0x4B50 = 0x64B2
+0x4B51 = 0x6734
+0x4B52 = 0x7267
+0x4B53 = 0x7766
+0x4B54 = 0x7A46
+0x4B55 = 0x91E6
+0x4B56 = 0x52C3
+0x4B57 = 0x6CA1
+0x4B58 = 0x6B86
+0x4B59 = 0x5800
+0x4B5A = 0x5E4C
+0x4B5B = 0x5954
+0x4B5C = 0x672C
+0x4B5D = 0x7FFB
+0x4B5E = 0x51E1
+0x4B5F = 0x76C6
+0x4B60 = 0x6469
+0x4B61 = 0x78E8
+0x4B62 = 0x9B54
+0x4B63 = 0x9EBB
+0x4B64 = 0x57CB
+0x4B65 = 0x59B9
+0x4B66 = 0x6627
+0x4B67 = 0x679A
+0x4B68 = 0x6BCE
+0x4B69 = 0x54E9
+0x4B6A = 0x69D9
+0x4B6B = 0x5E55
+0x4B6C = 0x819C
+0x4B6D = 0x6795
+0x4B6E = 0x9BAA
+0x4B6F = 0x67FE
+0x4B70 = 0x9C52
+0x4B71 = 0x685D
+0x4B72 = 0x4EA6
+0x4B73 = 0x4FE3
+0x4B74 = 0x53C8
+0x4B75 = 0x62B9
+0x4B76 = 0x672B
+0x4B77 = 0x6CAB
+0x4B78 = 0x8FC4
+0x4B79 = 0x4FAD
+0x4B7A = 0x7E6D
+0x4B7B = 0x9EBF
+0x4B7C = 0x4E07
+0x4B7D = 0x6162
+0x4B7E = 0x6E80
+0x4C21 = 0x6F2B
+0x4C22 = 0x8513
+0x4C23 = 0x5473
+0x4C24 = 0x672A
+0x4C25 = 0x9B45
+0x4C26 = 0x5DF3
+0x4C27 = 0x7B95
+0x4C28 = 0x5CAC
+0x4C29 = 0x5BC6
+0x4C2A = 0x871C
+0x4C2B = 0x6E4A
+0x4C2C = 0x84D1
+0x4C2D = 0x7A14
+0x4C2E = 0x8108
+0x4C2F = 0x5999
+0x4C30 = 0x7C8D
+0x4C31 = 0x6C11
+0x4C32 = 0x7720
+0x4C33 = 0x52D9
+0x4C34 = 0x5922
+0x4C35 = 0x7121
+0x4C36 = 0x725F
+0x4C37 = 0x77DB
+0x4C38 = 0x9727
+0x4C39 = 0x9D61
+0x4C3A = 0x690B
+0x4C3B = 0x5A7F
+0x4C3C = 0x5A18
+0x4C3D = 0x51A5
+0x4C3E = 0x540D
+0x4C3F = 0x547D
+0x4C40 = 0x660E
+0x4C41 = 0x76DF
+0x4C42 = 0x8FF7
+0x4C43 = 0x9298
+0x4C44 = 0x9CF4
+0x4C45 = 0x59EA
+0x4C46 = 0x725D
+0x4C47 = 0x6EC5
+0x4C48 = 0x514D
+0x4C49 = 0x68C9
+0x4C4A = 0x7DBF
+0x4C4B = 0x7DEC
+0x4C4C = 0x9762
+0x4C4D = 0x9EBA
+0x4C4E = 0x6478
+0x4C4F = 0x6A21
+0x4C50 = 0x8302
+0x4C51 = 0x5984
+0x4C52 = 0x5B5F
+0x4C53 = 0x6BDB
+0x4C54 = 0x731B
+0x4C55 = 0x76F2
+0x4C56 = 0x7DB2
+0x4C57 = 0x8017
+0x4C58 = 0x8499
+0x4C59 = 0x5132
+0x4C5A = 0x6728
+0x4C5B = 0x9ED9
+0x4C5C = 0x76EE
+0x4C5D = 0x6762
+0x4C5E = 0x52FF
+0x4C5F = 0x9905
+0x4C60 = 0x5C24
+0x4C61 = 0x623B
+0x4C62 = 0x7C7E
+0x4C63 = 0x8CB0
+0x4C64 = 0x554F
+0x4C65 = 0x60B6
+0x4C66 = 0x7D0B
+0x4C67 = 0x9580
+0x4C68 = 0x5301
+0x4C69 = 0x4E5F
+0x4C6A = 0x51B6
+0x4C6B = 0x591C
+0x4C6C = 0x723A
+0x4C6D = 0x8036
+0x4C6E = 0x91CE
+0x4C6F = 0x5F25
+0x4C70 = 0x77E2
+0x4C71 = 0x5384
+0x4C72 = 0x5F79
+0x4C73 = 0x7D04
+0x4C74 = 0x85AC
+0x4C75 = 0x8A33
+0x4C76 = 0x8E8D
+0x4C77 = 0x9756
+0x4C78 = 0x67F3
+0x4C79 = 0x85AE
+0x4C7A = 0x9453
+0x4C7B = 0x6109
+0x4C7C = 0x6108
+0x4C7D = 0x6CB9
+0x4C7E = 0x7652
+0x4D21 = 0x8AED
+0x4D22 = 0x8F38
+0x4D23 = 0x552F
+0x4D24 = 0x4F51
+0x4D25 = 0x512A
+0x4D26 = 0x52C7
+0x4D27 = 0x53CB
+0x4D28 = 0x5BA5
+0x4D29 = 0x5E7D
+0x4D2A = 0x60A0
+0x4D2B = 0x6182
+0x4D2C = 0x63D6
+0x4D2D = 0x6709
+0x4D2E = 0x67DA
+0x4D2F = 0x6E67
+0x4D30 = 0x6D8C
+0x4D31 = 0x7336
+0x4D32 = 0x7337
+0x4D33 = 0x7531
+0x4D34 = 0x7950
+0x4D35 = 0x88D5
+0x4D36 = 0x8A98
+0x4D37 = 0x904A
+0x4D38 = 0x9091
+0x4D39 = 0x90F5
+0x4D3A = 0x96C4
+0x4D3B = 0x878D
+0x4D3C = 0x5915
+0x4D3D = 0x4E88
+0x4D3E = 0x4F59
+0x4D3F = 0x4E0E
+0x4D40 = 0x8A89
+0x4D41 = 0x8F3F
+0x4D42 = 0x9810
+0x4D43 = 0x50AD
+0x4D44 = 0x5E7C
+0x4D45 = 0x5996
+0x4D46 = 0x5BB9
+0x4D47 = 0x5EB8
+0x4D48 = 0x63DA
+0x4D49 = 0x63FA
+0x4D4A = 0x64C1
+0x4D4B = 0x66DC
+0x4D4C = 0x694A
+0x4D4D = 0x69D8
+0x4D4E = 0x6D0B
+0x4D4F = 0x6EB6
+0x4D50 = 0x7194
+0x4D51 = 0x7528
+0x4D52 = 0x7AAF
+0x4D53 = 0x7F8A
+0x4D54 = 0x8000
+0x4D55 = 0x8449
+0x4D56 = 0x84C9
+0x4D57 = 0x8981
+0x4D58 = 0x8B21
+0x4D59 = 0x8E0A
+0x4D5A = 0x9065
+0x4D5B = 0x967D
+0x4D5C = 0x990A
+0x4D5D = 0x617E
+0x4D5E = 0x6291
+0x4D5F = 0x6B32
+0x4D60 = 0x6C83
+0x4D61 = 0x6D74
+0x4D62 = 0x7FCC
+0x4D63 = 0x7FFC
+0x4D64 = 0x6DC0
+0x4D65 = 0x7F85
+0x4D66 = 0x87BA
+0x4D67 = 0x88F8
+0x4D68 = 0x6765
+0x4D69 = 0x83B1
+0x4D6A = 0x983C
+0x4D6B = 0x96F7
+0x4D6C = 0x6D1B
+0x4D6D = 0x7D61
+0x4D6E = 0x843D
+0x4D6F = 0x916A
+0x4D70 = 0x4E71
+0x4D71 = 0x5375
+0x4D72 = 0x5D50
+0x4D73 = 0x6B04
+0x4D74 = 0x6FEB
+0x4D75 = 0x85CD
+0x4D76 = 0x862D
+0x4D77 = 0x89A7
+0x4D78 = 0x5229
+0x4D79 = 0x540F
+0x4D7A = 0x5C65
+0x4D7B = 0x674E
+0x4D7C = 0x68A8
+0x4D7D = 0x7406
+0x4D7E = 0x7483
+0x4E21 = 0x75E2
+0x4E22 = 0x88CF
+0x4E23 = 0x88E1
+0x4E24 = 0x91CC
+0x4E25 = 0x96E2
+0x4E26 = 0x9678
+0x4E27 = 0x5F8B
+0x4E28 = 0x7387
+0x4E29 = 0x7ACB
+0x4E2A = 0x844E
+0x4E2B = 0x63A0
+0x4E2C = 0x7565
+0x4E2D = 0x5289
+0x4E2E = 0x6D41
+0x4E2F = 0x6E9C
+0x4E30 = 0x7409
+0x4E31 = 0x7559
+0x4E32 = 0x786B
+0x4E33 = 0x7C92
+0x4E34 = 0x9686
+0x4E35 = 0x7ADC
+0x4E36 = 0x9F8D
+0x4E37 = 0x4FB6
+0x4E38 = 0x616E
+0x4E39 = 0x65C5
+0x4E3A = 0x865C
+0x4E3B = 0x4E86
+0x4E3C = 0x4EAE
+0x4E3D = 0x50DA
+0x4E3E = 0x4E21
+0x4E3F = 0x51CC
+0x4E40 = 0x5BEE
+0x4E41 = 0x6599
+0x4E42 = 0x6881
+0x4E43 = 0x6DBC
+0x4E44 = 0x731F
+0x4E45 = 0x7642
+0x4E46 = 0x77AD
+0x4E47 = 0x7A1C
+0x4E48 = 0x7CE7
+0x4E49 = 0x826F
+0x4E4A = 0x8AD2
+0x4E4B = 0x907C
+0x4E4C = 0x91CF
+0x4E4D = 0x9675
+0x4E4E = 0x9818
+0x4E4F = 0x529B
+0x4E50 = 0x7DD1
+0x4E51 = 0x502B
+0x4E52 = 0x5398
+0x4E53 = 0x6797
+0x4E54 = 0x6DCB
+0x4E55 = 0x71D0
+0x4E56 = 0x7433
+0x4E57 = 0x81E8
+0x4E58 = 0x8F2A
+0x4E59 = 0x96A3
+0x4E5A = 0x9C57
+0x4E5B = 0x9E9F
+0x4E5C = 0x7460
+0x4E5D = 0x5841
+0x4E5E = 0x6D99
+0x4E5F = 0x7D2F
+0x4E60 = 0x985E
+0x4E61 = 0x4EE4
+0x4E62 = 0x4F36
+0x4E63 = 0x4F8B
+0x4E64 = 0x51B7
+0x4E65 = 0x52B1
+0x4E66 = 0x5DBA
+0x4E67 = 0x601C
+0x4E68 = 0x73B2
+0x4E69 = 0x793C
+0x4E6A = 0x82D3
+0x4E6B = 0x9234
+0x4E6C = 0x96B7
+0x4E6D = 0x96F6
+0x4E6E = 0x970A
+0x4E6F = 0x9E97
+0x4E70 = 0x9F62
+0x4E71 = 0x66A6
+0x4E72 = 0x6B74
+0x4E73 = 0x5217
+0x4E74 = 0x52A3
+0x4E75 = 0x70C8
+0x4E76 = 0x88C2
+0x4E77 = 0x5EC9
+0x4E78 = 0x604B
+0x4E79 = 0x6190
+0x4E7A = 0x6F23
+0x4E7B = 0x7149
+0x4E7C = 0x7C3E
+0x4E7D = 0x7DF4
+0x4E7E = 0x806F
+0x4F21 = 0x84EE
+0x4F22 = 0x9023
+0x4F23 = 0x932C
+0x4F24 = 0x5442
+0x4F25 = 0x9B6F
+0x4F26 = 0x6AD3
+0x4F27 = 0x7089
+0x4F28 = 0x8CC2
+0x4F29 = 0x8DEF
+0x4F2A = 0x9732
+0x4F2B = 0x52B4
+0x4F2C = 0x5A41
+0x4F2D = 0x5ECA
+0x4F2E = 0x5F04
+0x4F2F = 0x6717
+0x4F30 = 0x697C
+0x4F31 = 0x6994
+0x4F32 = 0x6D6A
+0x4F33 = 0x6F0F
+0x4F34 = 0x7262
+0x4F35 = 0x72FC
+0x4F36 = 0x7BED
+0x4F37 = 0x8001
+0x4F38 = 0x807E
+0x4F39 = 0x874B
+0x4F3A = 0x90CE
+0x4F3B = 0x516D
+0x4F3C = 0x9E93
+0x4F3D = 0x7984
+0x4F3E = 0x808B
+0x4F3F = 0x9332
+0x4F40 = 0x8AD6
+0x4F41 = 0x502D
+0x4F42 = 0x548C
+0x4F43 = 0x8A71
+0x4F44 = 0x6B6A
+0x4F45 = 0x8CC4
+0x4F46 = 0x8107
+0x4F47 = 0x60D1
+0x4F48 = 0x67A0
+0x4F49 = 0x9DF2
+0x4F4A = 0x4E99
+0x4F4B = 0x4E98
+0x4F4C = 0x9C10
+0x4F4D = 0x8A6B
+0x4F4E = 0x85C1
+0x4F4F = 0x8568
+0x4F50 = 0x6900
+0x4F51 = 0x6E7E
+0x4F52 = 0x7897
+0x4F53 = 0x8155
+0x5021 = 0x5F0C
+0x5022 = 0x4E10
+0x5023 = 0x4E15
+0x5024 = 0x4E2A
+0x5025 = 0x4E31
+0x5026 = 0x4E36
+0x5027 = 0x4E3C
+0x5028 = 0x4E3F
+0x5029 = 0x4E42
+0x502A = 0x4E56
+0x502B = 0x4E58
+0x502C = 0x4E82
+0x502D = 0x4E85
+0x502E = 0x8C6B
+0x502F = 0x4E8A
+0x5030 = 0x8212
+0x5031 = 0x5F0D
+0x5032 = 0x4E8E
+0x5033 = 0x4E9E
+0x5034 = 0x4E9F
+0x5035 = 0x4EA0
+0x5036 = 0x4EA2
+0x5037 = 0x4EB0
+0x5038 = 0x4EB3
+0x5039 = 0x4EB6
+0x503A = 0x4ECE
+0x503B = 0x4ECD
+0x503C = 0x4EC4
+0x503D = 0x4EC6
+0x503E = 0x4EC2
+0x503F = 0x4ED7
+0x5040 = 0x4EDE
+0x5041 = 0x4EED
+0x5042 = 0x4EDF
+0x5043 = 0x4EF7
+0x5044 = 0x4F09
+0x5045 = 0x4F5A
+0x5046 = 0x4F30
+0x5047 = 0x4F5B
+0x5048 = 0x4F5D
+0x5049 = 0x4F57
+0x504A = 0x4F47
+0x504B = 0x4F76
+0x504C = 0x4F88
+0x504D = 0x4F8F
+0x504E = 0x4F98
+0x504F = 0x4F7B
+0x5050 = 0x4F69
+0x5051 = 0x4F70
+0x5052 = 0x4F91
+0x5053 = 0x4F6F
+0x5054 = 0x4F86
+0x5055 = 0x4F96
+0x5056 = 0x5118
+0x5057 = 0x4FD4
+0x5058 = 0x4FDF
+0x5059 = 0x4FCE
+0x505A = 0x4FD8
+0x505B = 0x4FDB
+0x505C = 0x4FD1
+0x505D = 0x4FDA
+0x505E = 0x4FD0
+0x505F = 0x4FE4
+0x5060 = 0x4FE5
+0x5061 = 0x501A
+0x5062 = 0x5028
+0x5063 = 0x5014
+0x5064 = 0x502A
+0x5065 = 0x5025
+0x5066 = 0x5005
+0x5067 = 0x4F1C
+0x5068 = 0x4FF6
+0x5069 = 0x5021
+0x506A = 0x5029
+0x506B = 0x502C
+0x506C = 0x4FFE
+0x506D = 0x4FEF
+0x506E = 0x5011
+0x506F = 0x5006
+0x5070 = 0x5043
+0x5071 = 0x5047
+0x5072 = 0x6703
+0x5073 = 0x5055
+0x5074 = 0x5050
+0x5075 = 0x5048
+0x5076 = 0x505A
+0x5077 = 0x5056
+0x5078 = 0x506C
+0x5079 = 0x5078
+0x507A = 0x5080
+0x507B = 0x509A
+0x507C = 0x5085
+0x507D = 0x50B4
+0x507E = 0x50B2
+0x5121 = 0x50C9
+0x5122 = 0x50CA
+0x5123 = 0x50B3
+0x5124 = 0x50C2
+0x5125 = 0x50D6
+0x5126 = 0x50DE
+0x5127 = 0x50E5
+0x5128 = 0x50ED
+0x5129 = 0x50E3
+0x512A = 0x50EE
+0x512B = 0x50F9
+0x512C = 0x50F5
+0x512D = 0x5109
+0x512E = 0x5101
+0x512F = 0x5102
+0x5130 = 0x5116
+0x5131 = 0x5115
+0x5132 = 0x5114
+0x5133 = 0x511A
+0x5134 = 0x5121
+0x5135 = 0x513A
+0x5136 = 0x5137
+0x5137 = 0x513C
+0x5138 = 0x513B
+0x5139 = 0x513F
+0x513A = 0x5140
+0x513B = 0x5152
+0x513C = 0x514C
+0x513D = 0x5154
+0x513E = 0x5162
+0x513F = 0x7AF8
+0x5140 = 0x5169
+0x5141 = 0x516A
+0x5142 = 0x516E
+0x5143 = 0x5180
+0x5144 = 0x5182
+0x5145 = 0x56D8
+0x5146 = 0x518C
+0x5147 = 0x5189
+0x5148 = 0x518F
+0x5149 = 0x5191
+0x514A = 0x5193
+0x514B = 0x5195
+0x514C = 0x5196
+0x514D = 0x51A4
+0x514E = 0x51A6
+0x514F = 0x51A2
+0x5150 = 0x51A9
+0x5151 = 0x51AA
+0x5152 = 0x51AB
+0x5153 = 0x51B3
+0x5154 = 0x51B1
+0x5155 = 0x51B2
+0x5156 = 0x51B0
+0x5157 = 0x51B5
+0x5158 = 0x51BD
+0x5159 = 0x51C5
+0x515A = 0x51C9
+0x515B = 0x51DB
+0x515C = 0x51E0
+0x515D = 0x8655
+0x515E = 0x51E9
+0x515F = 0x51ED
+0x5160 = 0x51F0
+0x5161 = 0x51F5
+0x5162 = 0x51FE
+0x5163 = 0x5204
+0x5164 = 0x520B
+0x5165 = 0x5214
+0x5166 = 0x520E
+0x5167 = 0x5227
+0x5168 = 0x522A
+0x5169 = 0x522E
+0x516A = 0x5233
+0x516B = 0x5239
+0x516C = 0x524F
+0x516D = 0x5244
+0x516E = 0x524B
+0x516F = 0x524C
+0x5170 = 0x525E
+0x5171 = 0x5254
+0x5172 = 0x526A
+0x5173 = 0x5274
+0x5174 = 0x5269
+0x5175 = 0x5273
+0x5176 = 0x527F
+0x5177 = 0x527D
+0x5178 = 0x528D
+0x5179 = 0x5294
+0x517A = 0x5292
+0x517B = 0x5271
+0x517C = 0x5288
+0x517D = 0x5291
+0x517E = 0x8FA8
+0x5221 = 0x8FA7
+0x5222 = 0x52AC
+0x5223 = 0x52AD
+0x5224 = 0x52BC
+0x5225 = 0x52B5
+0x5226 = 0x52C1
+0x5227 = 0x52CD
+0x5228 = 0x52D7
+0x5229 = 0x52DE
+0x522A = 0x52E3
+0x522B = 0x52E6
+0x522C = 0x98ED
+0x522D = 0x52E0
+0x522E = 0x52F3
+0x522F = 0x52F5
+0x5230 = 0x52F8
+0x5231 = 0x52F9
+0x5232 = 0x5306
+0x5233 = 0x5308
+0x5234 = 0x7538
+0x5235 = 0x530D
+0x5236 = 0x5310
+0x5237 = 0x530F
+0x5238 = 0x5315
+0x5239 = 0x531A
+0x523A = 0x5323
+0x523B = 0x532F
+0x523C = 0x5331
+0x523D = 0x5333
+0x523E = 0x5338
+0x523F = 0x5340
+0x5240 = 0x5346
+0x5241 = 0x5345
+0x5242 = 0x4E17
+0x5243 = 0x5349
+0x5244 = 0x534D
+0x5245 = 0x51D6
+0x5246 = 0x535E
+0x5247 = 0x5369
+0x5248 = 0x536E
+0x5249 = 0x5918
+0x524A = 0x537B
+0x524B = 0x5377
+0x524C = 0x5382
+0x524D = 0x5396
+0x524E = 0x53A0
+0x524F = 0x53A6
+0x5250 = 0x53A5
+0x5251 = 0x53AE
+0x5252 = 0x53B0
+0x5253 = 0x53B6
+0x5254 = 0x53C3
+0x5255 = 0x7C12
+0x5256 = 0x96D9
+0x5257 = 0x53DF
+0x5258 = 0x66FC
+0x5259 = 0x71EE
+0x525A = 0x53EE
+0x525B = 0x53E8
+0x525C = 0x53ED
+0x525D = 0x53FA
+0x525E = 0x5401
+0x525F = 0x543D
+0x5260 = 0x5440
+0x5261 = 0x542C
+0x5262 = 0x542D
+0x5263 = 0x543C
+0x5264 = 0x542E
+0x5265 = 0x5436
+0x5266 = 0x5429
+0x5267 = 0x541D
+0x5268 = 0x544E
+0x5269 = 0x548F
+0x526A = 0x5475
+0x526B = 0x548E
+0x526C = 0x545F
+0x526D = 0x5471
+0x526E = 0x5477
+0x526F = 0x5470
+0x5270 = 0x5492
+0x5271 = 0x547B
+0x5272 = 0x5480
+0x5273 = 0x5476
+0x5274 = 0x5484
+0x5275 = 0x5490
+0x5276 = 0x5486
+0x5277 = 0x54C7
+0x5278 = 0x54A2
+0x5279 = 0x54B8
+0x527A = 0x54A5
+0x527B = 0x54AC
+0x527C = 0x54C4
+0x527D = 0x54C8
+0x527E = 0x54A8
+0x5321 = 0x54AB
+0x5322 = 0x54C2
+0x5323 = 0x54A4
+0x5324 = 0x54BE
+0x5325 = 0x54BC
+0x5326 = 0x54D8
+0x5327 = 0x54E5
+0x5328 = 0x54E6
+0x5329 = 0x550F
+0x532A = 0x5514
+0x532B = 0x54FD
+0x532C = 0x54EE
+0x532D = 0x54ED
+0x532E = 0x54FA
+0x532F = 0x54E2
+0x5330 = 0x5539
+0x5331 = 0x5540
+0x5332 = 0x5563
+0x5333 = 0x554C
+0x5334 = 0x552E
+0x5335 = 0x555C
+0x5336 = 0x5545
+0x5337 = 0x5556
+0x5338 = 0x5557
+0x5339 = 0x5538
+0x533A = 0x5533
+0x533B = 0x555D
+0x533C = 0x5599
+0x533D = 0x5580
+0x533E = 0x54AF
+0x533F = 0x558A
+0x5340 = 0x559F
+0x5341 = 0x557B
+0x5342 = 0x557E
+0x5343 = 0x5598
+0x5344 = 0x559E
+0x5345 = 0x55AE
+0x5346 = 0x557C
+0x5347 = 0x5583
+0x5348 = 0x55A9
+0x5349 = 0x5587
+0x534A = 0x55A8
+0x534B = 0x55DA
+0x534C = 0x55C5
+0x534D = 0x55DF
+0x534E = 0x55C4
+0x534F = 0x55DC
+0x5350 = 0x55E4
+0x5351 = 0x55D4
+0x5352 = 0x5614
+0x5353 = 0x55F7
+0x5354 = 0x5616
+0x5355 = 0x55FE
+0x5356 = 0x55FD
+0x5357 = 0x561B
+0x5358 = 0x55F9
+0x5359 = 0x564E
+0x535A = 0x5650
+0x535B = 0x71DF
+0x535C = 0x5634
+0x535D = 0x5636
+0x535E = 0x5632
+0x535F = 0x5638
+0x5360 = 0x566B
+0x5361 = 0x5664
+0x5362 = 0x562F
+0x5363 = 0x566C
+0x5364 = 0x566A
+0x5365 = 0x5686
+0x5366 = 0x5680
+0x5367 = 0x568A
+0x5368 = 0x56A0
+0x5369 = 0x5694
+0x536A = 0x568F
+0x536B = 0x56A5
+0x536C = 0x56AE
+0x536D = 0x56B6
+0x536E = 0x56B4
+0x536F = 0x56C2
+0x5370 = 0x56BC
+0x5371 = 0x56C1
+0x5372 = 0x56C3
+0x5373 = 0x56C0
+0x5374 = 0x56C8
+0x5375 = 0x56CE
+0x5376 = 0x56D1
+0x5377 = 0x56D3
+0x5378 = 0x56D7
+0x5379 = 0x56EE
+0x537A = 0x56F9
+0x537B = 0x5700
+0x537C = 0x56FF
+0x537D = 0x5704
+0x537E = 0x5709
+0x5421 = 0x5708
+0x5422 = 0x570B
+0x5423 = 0x570D
+0x5424 = 0x5713
+0x5425 = 0x5718
+0x5426 = 0x5716
+0x5427 = 0x55C7
+0x5428 = 0x571C
+0x5429 = 0x5726
+0x542A = 0x5737
+0x542B = 0x5738
+0x542C = 0x574E
+0x542D = 0x573B
+0x542E = 0x5740
+0x542F = 0x574F
+0x5430 = 0x5769
+0x5431 = 0x57C0
+0x5432 = 0x5788
+0x5433 = 0x5761
+0x5434 = 0x577F
+0x5435 = 0x5789
+0x5436 = 0x5793
+0x5437 = 0x57A0
+0x5438 = 0x57B3
+0x5439 = 0x57A4
+0x543A = 0x57AA
+0x543B = 0x57B0
+0x543C = 0x57C3
+0x543D = 0x57C6
+0x543E = 0x57D4
+0x543F = 0x57D2
+0x5440 = 0x57D3
+0x5441 = 0x580A
+0x5442 = 0x57D6
+0x5443 = 0x57E3
+0x5444 = 0x580B
+0x5445 = 0x5819
+0x5446 = 0x581D
+0x5447 = 0x5872
+0x5448 = 0x5821
+0x5449 = 0x5862
+0x544A = 0x584B
+0x544B = 0x5870
+0x544C = 0x6BC0
+0x544D = 0x5852
+0x544E = 0x583D
+0x544F = 0x5879
+0x5450 = 0x5885
+0x5451 = 0x58B9
+0x5452 = 0x589F
+0x5453 = 0x58AB
+0x5454 = 0x58BA
+0x5455 = 0x58DE
+0x5456 = 0x58BB
+0x5457 = 0x58B8
+0x5458 = 0x58AE
+0x5459 = 0x58C5
+0x545A = 0x58D3
+0x545B = 0x58D1
+0x545C = 0x58D7
+0x545D = 0x58D9
+0x545E = 0x58D8
+0x545F = 0x58E5
+0x5460 = 0x58DC
+0x5461 = 0x58E4
+0x5462 = 0x58DF
+0x5463 = 0x58EF
+0x5464 = 0x58FA
+0x5465 = 0x58F9
+0x5466 = 0x58FB
+0x5467 = 0x58FC
+0x5468 = 0x58FD
+0x5469 = 0x5902
+0x546A = 0x590A
+0x546B = 0x5910
+0x546C = 0x591B
+0x546D = 0x68A6
+0x546E = 0x5925
+0x546F = 0x592C
+0x5470 = 0x592D
+0x5471 = 0x5932
+0x5472 = 0x5938
+0x5473 = 0x593E
+0x5474 = 0x7AD2
+0x5475 = 0x5955
+0x5476 = 0x5950
+0x5477 = 0x594E
+0x5478 = 0x595A
+0x5479 = 0x5958
+0x547A = 0x5962
+0x547B = 0x5960
+0x547C = 0x5967
+0x547D = 0x596C
+0x547E = 0x5969
+0x5521 = 0x5978
+0x5522 = 0x5981
+0x5523 = 0x599D
+0x5524 = 0x4F5E
+0x5525 = 0x4FAB
+0x5526 = 0x59A3
+0x5527 = 0x59B2
+0x5528 = 0x59C6
+0x5529 = 0x59E8
+0x552A = 0x59DC
+0x552B = 0x598D
+0x552C = 0x59D9
+0x552D = 0x59DA
+0x552E = 0x5A25
+0x552F = 0x5A1F
+0x5530 = 0x5A11
+0x5531 = 0x5A1C
+0x5532 = 0x5A09
+0x5533 = 0x5A1A
+0x5534 = 0x5A40
+0x5535 = 0x5A6C
+0x5536 = 0x5A49
+0x5537 = 0x5A35
+0x5538 = 0x5A36
+0x5539 = 0x5A62
+0x553A = 0x5A6A
+0x553B = 0x5A9A
+0x553C = 0x5ABC
+0x553D = 0x5ABE
+0x553E = 0x5ACB
+0x553F = 0x5AC2
+0x5540 = 0x5ABD
+0x5541 = 0x5AE3
+0x5542 = 0x5AD7
+0x5543 = 0x5AE6
+0x5544 = 0x5AE9
+0x5545 = 0x5AD6
+0x5546 = 0x5AFA
+0x5547 = 0x5AFB
+0x5548 = 0x5B0C
+0x5549 = 0x5B0B
+0x554A = 0x5B16
+0x554B = 0x5B32
+0x554C = 0x5AD0
+0x554D = 0x5B2A
+0x554E = 0x5B36
+0x554F = 0x5B3E
+0x5550 = 0x5B43
+0x5551 = 0x5B45
+0x5552 = 0x5B40
+0x5553 = 0x5B51
+0x5554 = 0x5B55
+0x5555 = 0x5B5A
+0x5556 = 0x5B5B
+0x5557 = 0x5B65
+0x5558 = 0x5B69
+0x5559 = 0x5B70
+0x555A = 0x5B73
+0x555B = 0x5B75
+0x555C = 0x5B78
+0x555D = 0x6588
+0x555E = 0x5B7A
+0x555F = 0x5B80
+0x5560 = 0x5B83
+0x5561 = 0x5BA6
+0x5562 = 0x5BB8
+0x5563 = 0x5BC3
+0x5564 = 0x5BC7
+0x5565 = 0x5BC9
+0x5566 = 0x5BD4
+0x5567 = 0x5BD0
+0x5568 = 0x5BE4
+0x5569 = 0x5BE6
+0x556A = 0x5BE2
+0x556B = 0x5BDE
+0x556C = 0x5BE5
+0x556D = 0x5BEB
+0x556E = 0x5BF0
+0x556F = 0x5BF6
+0x5570 = 0x5BF3
+0x5571 = 0x5C05
+0x5572 = 0x5C07
+0x5573 = 0x5C08
+0x5574 = 0x5C0D
+0x5575 = 0x5C13
+0x5576 = 0x5C20
+0x5577 = 0x5C22
+0x5578 = 0x5C28
+0x5579 = 0x5C38
+0x557A = 0x5C39
+0x557B = 0x5C41
+0x557C = 0x5C46
+0x557D = 0x5C4E
+0x557E = 0x5C53
+0x5621 = 0x5C50
+0x5622 = 0x5C4F
+0x5623 = 0x5B71
+0x5624 = 0x5C6C
+0x5625 = 0x5C6E
+0x5626 = 0x4E62
+0x5627 = 0x5C76
+0x5628 = 0x5C79
+0x5629 = 0x5C8C
+0x562A = 0x5C91
+0x562B = 0x5C94
+0x562C = 0x599B
+0x562D = 0x5CAB
+0x562E = 0x5CBB
+0x562F = 0x5CB6
+0x5630 = 0x5CBC
+0x5631 = 0x5CB7
+0x5632 = 0x5CC5
+0x5633 = 0x5CBE
+0x5634 = 0x5CC7
+0x5635 = 0x5CD9
+0x5636 = 0x5CE9
+0x5637 = 0x5CFD
+0x5638 = 0x5CFA
+0x5639 = 0x5CED
+0x563A = 0x5D8C
+0x563B = 0x5CEA
+0x563C = 0x5D0B
+0x563D = 0x5D15
+0x563E = 0x5D17
+0x563F = 0x5D5C
+0x5640 = 0x5D1F
+0x5641 = 0x5D1B
+0x5642 = 0x5D11
+0x5643 = 0x5D14
+0x5644 = 0x5D22
+0x5645 = 0x5D1A
+0x5646 = 0x5D19
+0x5647 = 0x5D18
+0x5648 = 0x5D4C
+0x5649 = 0x5D52
+0x564A = 0x5D4E
+0x564B = 0x5D4B
+0x564C = 0x5D6C
+0x564D = 0x5D73
+0x564E = 0x5D76
+0x564F = 0x5D87
+0x5650 = 0x5D84
+0x5651 = 0x5D82
+0x5652 = 0x5DA2
+0x5653 = 0x5D9D
+0x5654 = 0x5DAC
+0x5655 = 0x5DAE
+0x5656 = 0x5DBD
+0x5657 = 0x5D90
+0x5658 = 0x5DB7
+0x5659 = 0x5DBC
+0x565A = 0x5DC9
+0x565B = 0x5DCD
+0x565C = 0x5DD3
+0x565D = 0x5DD2
+0x565E = 0x5DD6
+0x565F = 0x5DDB
+0x5660 = 0x5DEB
+0x5661 = 0x5DF2
+0x5662 = 0x5DF5
+0x5663 = 0x5E0B
+0x5664 = 0x5E1A
+0x5665 = 0x5E19
+0x5666 = 0x5E11
+0x5667 = 0x5E1B
+0x5668 = 0x5E36
+0x5669 = 0x5E37
+0x566A = 0x5E44
+0x566B = 0x5E43
+0x566C = 0x5E40
+0x566D = 0x5E4E
+0x566E = 0x5E57
+0x566F = 0x5E54
+0x5670 = 0x5E5F
+0x5671 = 0x5E62
+0x5672 = 0x5E64
+0x5673 = 0x5E47
+0x5674 = 0x5E75
+0x5675 = 0x5E76
+0x5676 = 0x5E7A
+0x5677 = 0x9EBC
+0x5678 = 0x5E7F
+0x5679 = 0x5EA0
+0x567A = 0x5EC1
+0x567B = 0x5EC2
+0x567C = 0x5EC8
+0x567D = 0x5ED0
+0x567E = 0x5ECF
+0x5721 = 0x5ED6
+0x5722 = 0x5EE3
+0x5723 = 0x5EDD
+0x5724 = 0x5EDA
+0x5725 = 0x5EDB
+0x5726 = 0x5EE2
+0x5727 = 0x5EE1
+0x5728 = 0x5EE8
+0x5729 = 0x5EE9
+0x572A = 0x5EEC
+0x572B = 0x5EF1
+0x572C = 0x5EF3
+0x572D = 0x5EF0
+0x572E = 0x5EF4
+0x572F = 0x5EF8
+0x5730 = 0x5EFE
+0x5731 = 0x5F03
+0x5732 = 0x5F09
+0x5733 = 0x5F5D
+0x5734 = 0x5F5C
+0x5735 = 0x5F0B
+0x5736 = 0x5F11
+0x5737 = 0x5F16
+0x5738 = 0x5F29
+0x5739 = 0x5F2D
+0x573A = 0x5F38
+0x573B = 0x5F41
+0x573C = 0x5F48
+0x573D = 0x5F4C
+0x573E = 0x5F4E
+0x573F = 0x5F2F
+0x5740 = 0x5F51
+0x5741 = 0x5F56
+0x5742 = 0x5F57
+0x5743 = 0x5F59
+0x5744 = 0x5F61
+0x5745 = 0x5F6D
+0x5746 = 0x5F73
+0x5747 = 0x5F77
+0x5748 = 0x5F83
+0x5749 = 0x5F82
+0x574A = 0x5F7F
+0x574B = 0x5F8A
+0x574C = 0x5F88
+0x574D = 0x5F91
+0x574E = 0x5F87
+0x574F = 0x5F9E
+0x5750 = 0x5F99
+0x5751 = 0x5F98
+0x5752 = 0x5FA0
+0x5753 = 0x5FA8
+0x5754 = 0x5FAD
+0x5755 = 0x5FBC
+0x5756 = 0x5FD6
+0x5757 = 0x5FFB
+0x5758 = 0x5FE4
+0x5759 = 0x5FF8
+0x575A = 0x5FF1
+0x575B = 0x5FDD
+0x575C = 0x60B3
+0x575D = 0x5FFF
+0x575E = 0x6021
+0x575F = 0x6060
+0x5760 = 0x6019
+0x5761 = 0x6010
+0x5762 = 0x6029
+0x5763 = 0x600E
+0x5764 = 0x6031
+0x5765 = 0x601B
+0x5766 = 0x6015
+0x5767 = 0x602B
+0x5768 = 0x6026
+0x5769 = 0x600F
+0x576A = 0x603A
+0x576B = 0x605A
+0x576C = 0x6041
+0x576D = 0x606A
+0x576E = 0x6077
+0x576F = 0x605F
+0x5770 = 0x604A
+0x5771 = 0x6046
+0x5772 = 0x604D
+0x5773 = 0x6063
+0x5774 = 0x6043
+0x5775 = 0x6064
+0x5776 = 0x6042
+0x5777 = 0x606C
+0x5778 = 0x606B
+0x5779 = 0x6059
+0x577A = 0x6081
+0x577B = 0x608D
+0x577C = 0x60E7
+0x577D = 0x6083
+0x577E = 0x609A
+0x5821 = 0x6084
+0x5822 = 0x609B
+0x5823 = 0x6096
+0x5824 = 0x6097
+0x5825 = 0x6092
+0x5826 = 0x60A7
+0x5827 = 0x608B
+0x5828 = 0x60E1
+0x5829 = 0x60B8
+0x582A = 0x60E0
+0x582B = 0x60D3
+0x582C = 0x60B4
+0x582D = 0x5FF0
+0x582E = 0x60BD
+0x582F = 0x60C6
+0x5830 = 0x60B5
+0x5831 = 0x60D8
+0x5832 = 0x614D
+0x5833 = 0x6115
+0x5834 = 0x6106
+0x5835 = 0x60F6
+0x5836 = 0x60F7
+0x5837 = 0x6100
+0x5838 = 0x60F4
+0x5839 = 0x60FA
+0x583A = 0x6103
+0x583B = 0x6121
+0x583C = 0x60FB
+0x583D = 0x60F1
+0x583E = 0x610D
+0x583F = 0x610E
+0x5840 = 0x6147
+0x5841 = 0x613E
+0x5842 = 0x6128
+0x5843 = 0x6127
+0x5844 = 0x614A
+0x5845 = 0x613F
+0x5846 = 0x613C
+0x5847 = 0x612C
+0x5848 = 0x6134
+0x5849 = 0x613D
+0x584A = 0x6142
+0x584B = 0x6144
+0x584C = 0x6173
+0x584D = 0x6177
+0x584E = 0x6158
+0x584F = 0x6159
+0x5850 = 0x615A
+0x5851 = 0x616B
+0x5852 = 0x6174
+0x5853 = 0x616F
+0x5854 = 0x6165
+0x5855 = 0x6171
+0x5856 = 0x615F
+0x5857 = 0x615D
+0x5858 = 0x6153
+0x5859 = 0x6175
+0x585A = 0x6199
+0x585B = 0x6196
+0x585C = 0x6187
+0x585D = 0x61AC
+0x585E = 0x6194
+0x585F = 0x619A
+0x5860 = 0x618A
+0x5861 = 0x6191
+0x5862 = 0x61AB
+0x5863 = 0x61AE
+0x5864 = 0x61CC
+0x5865 = 0x61CA
+0x5866 = 0x61C9
+0x5867 = 0x61F7
+0x5868 = 0x61C8
+0x5869 = 0x61C3
+0x586A = 0x61C6
+0x586B = 0x61BA
+0x586C = 0x61CB
+0x586D = 0x7F79
+0x586E = 0x61CD
+0x586F = 0x61E6
+0x5870 = 0x61E3
+0x5871 = 0x61F6
+0x5872 = 0x61FA
+0x5873 = 0x61F4
+0x5874 = 0x61FF
+0x5875 = 0x61FD
+0x5876 = 0x61FC
+0x5877 = 0x61FE
+0x5878 = 0x6200
+0x5879 = 0x6208
+0x587A = 0x6209
+0x587B = 0x620D
+0x587C = 0x620C
+0x587D = 0x6214
+0x587E = 0x621B
+0x5921 = 0x621E
+0x5922 = 0x6221
+0x5923 = 0x622A
+0x5924 = 0x622E
+0x5925 = 0x6230
+0x5926 = 0x6232
+0x5927 = 0x6233
+0x5928 = 0x6241
+0x5929 = 0x624E
+0x592A = 0x625E
+0x592B = 0x6263
+0x592C = 0x625B
+0x592D = 0x6260
+0x592E = 0x6268
+0x592F = 0x627C
+0x5930 = 0x6282
+0x5931 = 0x6289
+0x5932 = 0x627E
+0x5933 = 0x6292
+0x5934 = 0x6293
+0x5935 = 0x6296
+0x5936 = 0x62D4
+0x5937 = 0x6283
+0x5938 = 0x6294
+0x5939 = 0x62D7
+0x593A = 0x62D1
+0x593B = 0x62BB
+0x593C = 0x62CF
+0x593D = 0x62FF
+0x593E = 0x62C6
+0x593F = 0x64D4
+0x5940 = 0x62C8
+0x5941 = 0x62DC
+0x5942 = 0x62CC
+0x5943 = 0x62CA
+0x5944 = 0x62C2
+0x5945 = 0x62C7
+0x5946 = 0x629B
+0x5947 = 0x62C9
+0x5948 = 0x630C
+0x5949 = 0x62EE
+0x594A = 0x62F1
+0x594B = 0x6327
+0x594C = 0x6302
+0x594D = 0x6308
+0x594E = 0x62EF
+0x594F = 0x62F5
+0x5950 = 0x6350
+0x5951 = 0x633E
+0x5952 = 0x634D
+0x5953 = 0x641C
+0x5954 = 0x634F
+0x5955 = 0x6396
+0x5956 = 0x638E
+0x5957 = 0x6380
+0x5958 = 0x63AB
+0x5959 = 0x6376
+0x595A = 0x63A3
+0x595B = 0x638F
+0x595C = 0x6389
+0x595D = 0x639F
+0x595E = 0x63B5
+0x595F = 0x636B
+0x5960 = 0x6369
+0x5961 = 0x63BE
+0x5962 = 0x63E9
+0x5963 = 0x63C0
+0x5964 = 0x63C6
+0x5965 = 0x63E3
+0x5966 = 0x63C9
+0x5967 = 0x63D2
+0x5968 = 0x63F6
+0x5969 = 0x63C4
+0x596A = 0x6416
+0x596B = 0x6434
+0x596C = 0x6406
+0x596D = 0x6413
+0x596E = 0x6426
+0x596F = 0x6436
+0x5970 = 0x651D
+0x5971 = 0x6417
+0x5972 = 0x6428
+0x5973 = 0x640F
+0x5974 = 0x6467
+0x5975 = 0x646F
+0x5976 = 0x6476
+0x5977 = 0x644E
+0x5978 = 0x652A
+0x5979 = 0x6495
+0x597A = 0x6493
+0x597B = 0x64A5
+0x597C = 0x64A9
+0x597D = 0x6488
+0x597E = 0x64BC
+0x5A21 = 0x64DA
+0x5A22 = 0x64D2
+0x5A23 = 0x64C5
+0x5A24 = 0x64C7
+0x5A25 = 0x64BB
+0x5A26 = 0x64D8
+0x5A27 = 0x64C2
+0x5A28 = 0x64F1
+0x5A29 = 0x64E7
+0x5A2A = 0x8209
+0x5A2B = 0x64E0
+0x5A2C = 0x64E1
+0x5A2D = 0x62AC
+0x5A2E = 0x64E3
+0x5A2F = 0x64EF
+0x5A30 = 0x652C
+0x5A31 = 0x64F6
+0x5A32 = 0x64F4
+0x5A33 = 0x64F2
+0x5A34 = 0x64FA
+0x5A35 = 0x6500
+0x5A36 = 0x64FD
+0x5A37 = 0x6518
+0x5A38 = 0x651C
+0x5A39 = 0x6505
+0x5A3A = 0x6524
+0x5A3B = 0x6523
+0x5A3C = 0x652B
+0x5A3D = 0x6534
+0x5A3E = 0x6535
+0x5A3F = 0x6537
+0x5A40 = 0x6536
+0x5A41 = 0x6538
+0x5A42 = 0x754B
+0x5A43 = 0x6548
+0x5A44 = 0x6556
+0x5A45 = 0x6555
+0x5A46 = 0x654D
+0x5A47 = 0x6558
+0x5A48 = 0x655E
+0x5A49 = 0x655D
+0x5A4A = 0x6572
+0x5A4B = 0x6578
+0x5A4C = 0x6582
+0x5A4D = 0x6583
+0x5A4E = 0x8B8A
+0x5A4F = 0x659B
+0x5A50 = 0x659F
+0x5A51 = 0x65AB
+0x5A52 = 0x65B7
+0x5A53 = 0x65C3
+0x5A54 = 0x65C6
+0x5A55 = 0x65C1
+0x5A56 = 0x65C4
+0x5A57 = 0x65CC
+0x5A58 = 0x65D2
+0x5A59 = 0x65DB
+0x5A5A = 0x65D9
+0x5A5B = 0x65E0
+0x5A5C = 0x65E1
+0x5A5D = 0x65F1
+0x5A5E = 0x6772
+0x5A5F = 0x660A
+0x5A60 = 0x6603
+0x5A61 = 0x65FB
+0x5A62 = 0x6773
+0x5A63 = 0x6635
+0x5A64 = 0x6636
+0x5A65 = 0x6634
+0x5A66 = 0x661C
+0x5A67 = 0x664F
+0x5A68 = 0x6644
+0x5A69 = 0x6649
+0x5A6A = 0x6641
+0x5A6B = 0x665E
+0x5A6C = 0x665D
+0x5A6D = 0x6664
+0x5A6E = 0x6667
+0x5A6F = 0x6668
+0x5A70 = 0x665F
+0x5A71 = 0x6662
+0x5A72 = 0x6670
+0x5A73 = 0x6683
+0x5A74 = 0x6688
+0x5A75 = 0x668E
+0x5A76 = 0x6689
+0x5A77 = 0x6684
+0x5A78 = 0x6698
+0x5A79 = 0x669D
+0x5A7A = 0x66C1
+0x5A7B = 0x66B9
+0x5A7C = 0x66C9
+0x5A7D = 0x66BE
+0x5A7E = 0x66BC
+0x5B21 = 0x66C4
+0x5B22 = 0x66B8
+0x5B23 = 0x66D6
+0x5B24 = 0x66DA
+0x5B25 = 0x66E0
+0x5B26 = 0x663F
+0x5B27 = 0x66E6
+0x5B28 = 0x66E9
+0x5B29 = 0x66F0
+0x5B2A = 0x66F5
+0x5B2B = 0x66F7
+0x5B2C = 0x670F
+0x5B2D = 0x6716
+0x5B2E = 0x671E
+0x5B2F = 0x6726
+0x5B30 = 0x6727
+0x5B31 = 0x9738
+0x5B32 = 0x672E
+0x5B33 = 0x673F
+0x5B34 = 0x6736
+0x5B35 = 0x6741
+0x5B36 = 0x6738
+0x5B37 = 0x6737
+0x5B38 = 0x6746
+0x5B39 = 0x675E
+0x5B3A = 0x6760
+0x5B3B = 0x6759
+0x5B3C = 0x6763
+0x5B3D = 0x6764
+0x5B3E = 0x6789
+0x5B3F = 0x6770
+0x5B40 = 0x67A9
+0x5B41 = 0x677C
+0x5B42 = 0x676A
+0x5B43 = 0x678C
+0x5B44 = 0x678B
+0x5B45 = 0x67A6
+0x5B46 = 0x67A1
+0x5B47 = 0x6785
+0x5B48 = 0x67B7
+0x5B49 = 0x67EF
+0x5B4A = 0x67B4
+0x5B4B = 0x67EC
+0x5B4C = 0x67B3
+0x5B4D = 0x67E9
+0x5B4E = 0x67B8
+0x5B4F = 0x67E4
+0x5B50 = 0x67DE
+0x5B51 = 0x67DD
+0x5B52 = 0x67E2
+0x5B53 = 0x67EE
+0x5B54 = 0x67B9
+0x5B55 = 0x67CE
+0x5B56 = 0x67C6
+0x5B57 = 0x67E7
+0x5B58 = 0x6A9C
+0x5B59 = 0x681E
+0x5B5A = 0x6846
+0x5B5B = 0x6829
+0x5B5C = 0x6840
+0x5B5D = 0x684D
+0x5B5E = 0x6832
+0x5B5F = 0x684E
+0x5B60 = 0x68B3
+0x5B61 = 0x682B
+0x5B62 = 0x6859
+0x5B63 = 0x6863
+0x5B64 = 0x6877
+0x5B65 = 0x687F
+0x5B66 = 0x689F
+0x5B67 = 0x688F
+0x5B68 = 0x68AD
+0x5B69 = 0x6894
+0x5B6A = 0x689D
+0x5B6B = 0x689B
+0x5B6C = 0x6883
+0x5B6D = 0x6AAE
+0x5B6E = 0x68B9
+0x5B6F = 0x6874
+0x5B70 = 0x68B5
+0x5B71 = 0x68A0
+0x5B72 = 0x68BA
+0x5B73 = 0x690F
+0x5B74 = 0x688D
+0x5B75 = 0x687E
+0x5B76 = 0x6901
+0x5B77 = 0x68CA
+0x5B78 = 0x6908
+0x5B79 = 0x68D8
+0x5B7A = 0x6922
+0x5B7B = 0x6926
+0x5B7C = 0x68E1
+0x5B7D = 0x690C
+0x5B7E = 0x68CD
+0x5C21 = 0x68D4
+0x5C22 = 0x68E7
+0x5C23 = 0x68D5
+0x5C24 = 0x6936
+0x5C25 = 0x6912
+0x5C26 = 0x6904
+0x5C27 = 0x68D7
+0x5C28 = 0x68E3
+0x5C29 = 0x6925
+0x5C2A = 0x68F9
+0x5C2B = 0x68E0
+0x5C2C = 0x68EF
+0x5C2D = 0x6928
+0x5C2E = 0x692A
+0x5C2F = 0x691A
+0x5C30 = 0x6923
+0x5C31 = 0x6921
+0x5C32 = 0x68C6
+0x5C33 = 0x6979
+0x5C34 = 0x6977
+0x5C35 = 0x695C
+0x5C36 = 0x6978
+0x5C37 = 0x696B
+0x5C38 = 0x6954
+0x5C39 = 0x697E
+0x5C3A = 0x696E
+0x5C3B = 0x6939
+0x5C3C = 0x6974
+0x5C3D = 0x693D
+0x5C3E = 0x6959
+0x5C3F = 0x6930
+0x5C40 = 0x6961
+0x5C41 = 0x695E
+0x5C42 = 0x695D
+0x5C43 = 0x6981
+0x5C44 = 0x696A
+0x5C45 = 0x69B2
+0x5C46 = 0x69AE
+0x5C47 = 0x69D0
+0x5C48 = 0x69BF
+0x5C49 = 0x69C1
+0x5C4A = 0x69D3
+0x5C4B = 0x69BE
+0x5C4C = 0x69CE
+0x5C4D = 0x5BE8
+0x5C4E = 0x69CA
+0x5C4F = 0x69DD
+0x5C50 = 0x69BB
+0x5C51 = 0x69C3
+0x5C52 = 0x69A7
+0x5C53 = 0x6A2E
+0x5C54 = 0x6991
+0x5C55 = 0x69A0
+0x5C56 = 0x699C
+0x5C57 = 0x6995
+0x5C58 = 0x69B4
+0x5C59 = 0x69DE
+0x5C5A = 0x69E8
+0x5C5B = 0x6A02
+0x5C5C = 0x6A1B
+0x5C5D = 0x69FF
+0x5C5E = 0x6B0A
+0x5C5F = 0x69F9
+0x5C60 = 0x69F2
+0x5C61 = 0x69E7
+0x5C62 = 0x6A05
+0x5C63 = 0x69B1
+0x5C64 = 0x6A1E
+0x5C65 = 0x69ED
+0x5C66 = 0x6A14
+0x5C67 = 0x69EB
+0x5C68 = 0x6A0A
+0x5C69 = 0x6A12
+0x5C6A = 0x6AC1
+0x5C6B = 0x6A23
+0x5C6C = 0x6A13
+0x5C6D = 0x6A44
+0x5C6E = 0x6A0C
+0x5C6F = 0x6A72
+0x5C70 = 0x6A36
+0x5C71 = 0x6A78
+0x5C72 = 0x6A47
+0x5C73 = 0x6A62
+0x5C74 = 0x6A59
+0x5C75 = 0x6A66
+0x5C76 = 0x6A48
+0x5C77 = 0x6A38
+0x5C78 = 0x6A22
+0x5C79 = 0x6A90
+0x5C7A = 0x6A8D
+0x5C7B = 0x6AA0
+0x5C7C = 0x6A84
+0x5C7D = 0x6AA2
+0x5C7E = 0x6AA3
+0x5D21 = 0x6A97
+0x5D22 = 0x8617
+0x5D23 = 0x6ABB
+0x5D24 = 0x6AC3
+0x5D25 = 0x6AC2
+0x5D26 = 0x6AB8
+0x5D27 = 0x6AB3
+0x5D28 = 0x6AAC
+0x5D29 = 0x6ADE
+0x5D2A = 0x6AD1
+0x5D2B = 0x6ADF
+0x5D2C = 0x6AAA
+0x5D2D = 0x6ADA
+0x5D2E = 0x6AEA
+0x5D2F = 0x6AFB
+0x5D30 = 0x6B05
+0x5D31 = 0x8616
+0x5D32 = 0x6AFA
+0x5D33 = 0x6B12
+0x5D34 = 0x6B16
+0x5D35 = 0x9B31
+0x5D36 = 0x6B1F
+0x5D37 = 0x6B38
+0x5D38 = 0x6B37
+0x5D39 = 0x76DC
+0x5D3A = 0x6B39
+0x5D3B = 0x98EE
+0x5D3C = 0x6B47
+0x5D3D = 0x6B43
+0x5D3E = 0x6B49
+0x5D3F = 0x6B50
+0x5D40 = 0x6B59
+0x5D41 = 0x6B54
+0x5D42 = 0x6B5B
+0x5D43 = 0x6B5F
+0x5D44 = 0x6B61
+0x5D45 = 0x6B78
+0x5D46 = 0x6B79
+0x5D47 = 0x6B7F
+0x5D48 = 0x6B80
+0x5D49 = 0x6B84
+0x5D4A = 0x6B83
+0x5D4B = 0x6B8D
+0x5D4C = 0x6B98
+0x5D4D = 0x6B95
+0x5D4E = 0x6B9E
+0x5D4F = 0x6BA4
+0x5D50 = 0x6BAA
+0x5D51 = 0x6BAB
+0x5D52 = 0x6BAF
+0x5D53 = 0x6BB2
+0x5D54 = 0x6BB1
+0x5D55 = 0x6BB3
+0x5D56 = 0x6BB7
+0x5D57 = 0x6BBC
+0x5D58 = 0x6BC6
+0x5D59 = 0x6BCB
+0x5D5A = 0x6BD3
+0x5D5B = 0x6BDF
+0x5D5C = 0x6BEC
+0x5D5D = 0x6BEB
+0x5D5E = 0x6BF3
+0x5D5F = 0x6BEF
+0x5D60 = 0x9EBE
+0x5D61 = 0x6C08
+0x5D62 = 0x6C13
+0x5D63 = 0x6C14
+0x5D64 = 0x6C1B
+0x5D65 = 0x6C24
+0x5D66 = 0x6C23
+0x5D67 = 0x6C5E
+0x5D68 = 0x6C55
+0x5D69 = 0x6C62
+0x5D6A = 0x6C6A
+0x5D6B = 0x6C82
+0x5D6C = 0x6C8D
+0x5D6D = 0x6C9A
+0x5D6E = 0x6C81
+0x5D6F = 0x6C9B
+0x5D70 = 0x6C7E
+0x5D71 = 0x6C68
+0x5D72 = 0x6C73
+0x5D73 = 0x6C92
+0x5D74 = 0x6C90
+0x5D75 = 0x6CC4
+0x5D76 = 0x6CF1
+0x5D77 = 0x6CD3
+0x5D78 = 0x6CBD
+0x5D79 = 0x6CD7
+0x5D7A = 0x6CC5
+0x5D7B = 0x6CDD
+0x5D7C = 0x6CAE
+0x5D7D = 0x6CB1
+0x5D7E = 0x6CBE
+0x5E21 = 0x6CBA
+0x5E22 = 0x6CDB
+0x5E23 = 0x6CEF
+0x5E24 = 0x6CD9
+0x5E25 = 0x6CEA
+0x5E26 = 0x6D1F
+0x5E27 = 0x884D
+0x5E28 = 0x6D36
+0x5E29 = 0x6D2B
+0x5E2A = 0x6D3D
+0x5E2B = 0x6D38
+0x5E2C = 0x6D19
+0x5E2D = 0x6D35
+0x5E2E = 0x6D33
+0x5E2F = 0x6D12
+0x5E30 = 0x6D0C
+0x5E31 = 0x6D63
+0x5E32 = 0x6D93
+0x5E33 = 0x6D64
+0x5E34 = 0x6D5A
+0x5E35 = 0x6D79
+0x5E36 = 0x6D59
+0x5E37 = 0x6D8E
+0x5E38 = 0x6D95
+0x5E39 = 0x6FE4
+0x5E3A = 0x6D85
+0x5E3B = 0x6DF9
+0x5E3C = 0x6E15
+0x5E3D = 0x6E0A
+0x5E3E = 0x6DB5
+0x5E3F = 0x6DC7
+0x5E40 = 0x6DE6
+0x5E41 = 0x6DB8
+0x5E42 = 0x6DC6
+0x5E43 = 0x6DEC
+0x5E44 = 0x6DDE
+0x5E45 = 0x6DCC
+0x5E46 = 0x6DE8
+0x5E47 = 0x6DD2
+0x5E48 = 0x6DC5
+0x5E49 = 0x6DFA
+0x5E4A = 0x6DD9
+0x5E4B = 0x6DE4
+0x5E4C = 0x6DD5
+0x5E4D = 0x6DEA
+0x5E4E = 0x6DEE
+0x5E4F = 0x6E2D
+0x5E50 = 0x6E6E
+0x5E51 = 0x6E2E
+0x5E52 = 0x6E19
+0x5E53 = 0x6E72
+0x5E54 = 0x6E5F
+0x5E55 = 0x6E3E
+0x5E56 = 0x6E23
+0x5E57 = 0x6E6B
+0x5E58 = 0x6E2B
+0x5E59 = 0x6E76
+0x5E5A = 0x6E4D
+0x5E5B = 0x6E1F
+0x5E5C = 0x6E43
+0x5E5D = 0x6E3A
+0x5E5E = 0x6E4E
+0x5E5F = 0x6E24
+0x5E60 = 0x6EFF
+0x5E61 = 0x6E1D
+0x5E62 = 0x6E38
+0x5E63 = 0x6E82
+0x5E64 = 0x6EAA
+0x5E65 = 0x6E98
+0x5E66 = 0x6EC9
+0x5E67 = 0x6EB7
+0x5E68 = 0x6ED3
+0x5E69 = 0x6EBD
+0x5E6A = 0x6EAF
+0x5E6B = 0x6EC4
+0x5E6C = 0x6EB2
+0x5E6D = 0x6ED4
+0x5E6E = 0x6ED5
+0x5E6F = 0x6E8F
+0x5E70 = 0x6EA5
+0x5E71 = 0x6EC2
+0x5E72 = 0x6E9F
+0x5E73 = 0x6F41
+0x5E74 = 0x6F11
+0x5E75 = 0x704C
+0x5E76 = 0x6EEC
+0x5E77 = 0x6EF8
+0x5E78 = 0x6EFE
+0x5E79 = 0x6F3F
+0x5E7A = 0x6EF2
+0x5E7B = 0x6F31
+0x5E7C = 0x6EEF
+0x5E7D = 0x6F32
+0x5E7E = 0x6ECC
+0x5F21 = 0x6F3E
+0x5F22 = 0x6F13
+0x5F23 = 0x6EF7
+0x5F24 = 0x6F86
+0x5F25 = 0x6F7A
+0x5F26 = 0x6F78
+0x5F27 = 0x6F81
+0x5F28 = 0x6F80
+0x5F29 = 0x6F6F
+0x5F2A = 0x6F5B
+0x5F2B = 0x6FF3
+0x5F2C = 0x6F6D
+0x5F2D = 0x6F82
+0x5F2E = 0x6F7C
+0x5F2F = 0x6F58
+0x5F30 = 0x6F8E
+0x5F31 = 0x6F91
+0x5F32 = 0x6FC2
+0x5F33 = 0x6F66
+0x5F34 = 0x6FB3
+0x5F35 = 0x6FA3
+0x5F36 = 0x6FA1
+0x5F37 = 0x6FA4
+0x5F38 = 0x6FB9
+0x5F39 = 0x6FC6
+0x5F3A = 0x6FAA
+0x5F3B = 0x6FDF
+0x5F3C = 0x6FD5
+0x5F3D = 0x6FEC
+0x5F3E = 0x6FD4
+0x5F3F = 0x6FD8
+0x5F40 = 0x6FF1
+0x5F41 = 0x6FEE
+0x5F42 = 0x6FDB
+0x5F43 = 0x7009
+0x5F44 = 0x700B
+0x5F45 = 0x6FFA
+0x5F46 = 0x7011
+0x5F47 = 0x7001
+0x5F48 = 0x700F
+0x5F49 = 0x6FFE
+0x5F4A = 0x701B
+0x5F4B = 0x701A
+0x5F4C = 0x6F74
+0x5F4D = 0x701D
+0x5F4E = 0x7018
+0x5F4F = 0x701F
+0x5F50 = 0x7030
+0x5F51 = 0x703E
+0x5F52 = 0x7032
+0x5F53 = 0x7051
+0x5F54 = 0x7063
+0x5F55 = 0x7099
+0x5F56 = 0x7092
+0x5F57 = 0x70AF
+0x5F58 = 0x70F1
+0x5F59 = 0x70AC
+0x5F5A = 0x70B8
+0x5F5B = 0x70B3
+0x5F5C = 0x70AE
+0x5F5D = 0x70DF
+0x5F5E = 0x70CB
+0x5F5F = 0x70DD
+0x5F60 = 0x70D9
+0x5F61 = 0x7109
+0x5F62 = 0x70FD
+0x5F63 = 0x711C
+0x5F64 = 0x7119
+0x5F65 = 0x7165
+0x5F66 = 0x7155
+0x5F67 = 0x7188
+0x5F68 = 0x7166
+0x5F69 = 0x7162
+0x5F6A = 0x714C
+0x5F6B = 0x7156
+0x5F6C = 0x716C
+0x5F6D = 0x718F
+0x5F6E = 0x71FB
+0x5F6F = 0x7184
+0x5F70 = 0x7195
+0x5F71 = 0x71A8
+0x5F72 = 0x71AC
+0x5F73 = 0x71D7
+0x5F74 = 0x71B9
+0x5F75 = 0x71BE
+0x5F76 = 0x71D2
+0x5F77 = 0x71C9
+0x5F78 = 0x71D4
+0x5F79 = 0x71CE
+0x5F7A = 0x71E0
+0x5F7B = 0x71EC
+0x5F7C = 0x71E7
+0x5F7D = 0x71F5
+0x5F7E = 0x71FC
+0x6021 = 0x71F9
+0x6022 = 0x71FF
+0x6023 = 0x720D
+0x6024 = 0x7210
+0x6025 = 0x721B
+0x6026 = 0x7228
+0x6027 = 0x722D
+0x6028 = 0x722C
+0x6029 = 0x7230
+0x602A = 0x7232
+0x602B = 0x723B
+0x602C = 0x723C
+0x602D = 0x723F
+0x602E = 0x7240
+0x602F = 0x7246
+0x6030 = 0x724B
+0x6031 = 0x7258
+0x6032 = 0x7274
+0x6033 = 0x727E
+0x6034 = 0x7282
+0x6035 = 0x7281
+0x6036 = 0x7287
+0x6037 = 0x7292
+0x6038 = 0x7296
+0x6039 = 0x72A2
+0x603A = 0x72A7
+0x603B = 0x72B9
+0x603C = 0x72B2
+0x603D = 0x72C3
+0x603E = 0x72C6
+0x603F = 0x72C4
+0x6040 = 0x72CE
+0x6041 = 0x72D2
+0x6042 = 0x72E2
+0x6043 = 0x72E0
+0x6044 = 0x72E1
+0x6045 = 0x72F9
+0x6046 = 0x72F7
+0x6047 = 0x500F
+0x6048 = 0x7317
+0x6049 = 0x730A
+0x604A = 0x731C
+0x604B = 0x7316
+0x604C = 0x731D
+0x604D = 0x7334
+0x604E = 0x732F
+0x604F = 0x7329
+0x6050 = 0x7325
+0x6051 = 0x733E
+0x6052 = 0x734E
+0x6053 = 0x734F
+0x6054 = 0x9ED8
+0x6055 = 0x7357
+0x6056 = 0x736A
+0x6057 = 0x7368
+0x6058 = 0x7370
+0x6059 = 0x7378
+0x605A = 0x7375
+0x605B = 0x737B
+0x605C = 0x737A
+0x605D = 0x73C8
+0x605E = 0x73B3
+0x605F = 0x73CE
+0x6060 = 0x73BB
+0x6061 = 0x73C0
+0x6062 = 0x73E5
+0x6063 = 0x73EE
+0x6064 = 0x73DE
+0x6065 = 0x74A2
+0x6066 = 0x7405
+0x6067 = 0x746F
+0x6068 = 0x7425
+0x6069 = 0x73F8
+0x606A = 0x7432
+0x606B = 0x743A
+0x606C = 0x7455
+0x606D = 0x743F
+0x606E = 0x745F
+0x606F = 0x7459
+0x6070 = 0x7441
+0x6071 = 0x745C
+0x6072 = 0x7469
+0x6073 = 0x7470
+0x6074 = 0x7463
+0x6075 = 0x746A
+0x6076 = 0x7476
+0x6077 = 0x747E
+0x6078 = 0x748B
+0x6079 = 0x749E
+0x607A = 0x74A7
+0x607B = 0x74CA
+0x607C = 0x74CF
+0x607D = 0x74D4
+0x607E = 0x73F1
+0x6121 = 0x74E0
+0x6122 = 0x74E3
+0x6123 = 0x74E7
+0x6124 = 0x74E9
+0x6125 = 0x74EE
+0x6126 = 0x74F2
+0x6127 = 0x74F0
+0x6128 = 0x74F1
+0x6129 = 0x74F8
+0x612A = 0x74F7
+0x612B = 0x7504
+0x612C = 0x7503
+0x612D = 0x7505
+0x612E = 0x750C
+0x612F = 0x750E
+0x6130 = 0x750D
+0x6131 = 0x7515
+0x6132 = 0x7513
+0x6133 = 0x751E
+0x6134 = 0x7526
+0x6135 = 0x752C
+0x6136 = 0x753C
+0x6137 = 0x7544
+0x6138 = 0x754D
+0x6139 = 0x754A
+0x613A = 0x7549
+0x613B = 0x755B
+0x613C = 0x7546
+0x613D = 0x755A
+0x613E = 0x7569
+0x613F = 0x7564
+0x6140 = 0x7567
+0x6141 = 0x756B
+0x6142 = 0x756D
+0x6143 = 0x7578
+0x6144 = 0x7576
+0x6145 = 0x7586
+0x6146 = 0x7587
+0x6147 = 0x7574
+0x6148 = 0x758A
+0x6149 = 0x7589
+0x614A = 0x7582
+0x614B = 0x7594
+0x614C = 0x759A
+0x614D = 0x759D
+0x614E = 0x75A5
+0x614F = 0x75A3
+0x6150 = 0x75C2
+0x6151 = 0x75B3
+0x6152 = 0x75C3
+0x6153 = 0x75B5
+0x6154 = 0x75BD
+0x6155 = 0x75B8
+0x6156 = 0x75BC
+0x6157 = 0x75B1
+0x6158 = 0x75CD
+0x6159 = 0x75CA
+0x615A = 0x75D2
+0x615B = 0x75D9
+0x615C = 0x75E3
+0x615D = 0x75DE
+0x615E = 0x75FE
+0x615F = 0x75FF
+0x6160 = 0x75FC
+0x6161 = 0x7601
+0x6162 = 0x75F0
+0x6163 = 0x75FA
+0x6164 = 0x75F2
+0x6165 = 0x75F3
+0x6166 = 0x760B
+0x6167 = 0x760D
+0x6168 = 0x7609
+0x6169 = 0x761F
+0x616A = 0x7627
+0x616B = 0x7620
+0x616C = 0x7621
+0x616D = 0x7622
+0x616E = 0x7624
+0x616F = 0x7634
+0x6170 = 0x7630
+0x6171 = 0x763B
+0x6172 = 0x7647
+0x6173 = 0x7648
+0x6174 = 0x7646
+0x6175 = 0x765C
+0x6176 = 0x7658
+0x6177 = 0x7661
+0x6178 = 0x7662
+0x6179 = 0x7668
+0x617A = 0x7669
+0x617B = 0x766A
+0x617C = 0x7667
+0x617D = 0x766C
+0x617E = 0x7670
+0x6221 = 0x7672
+0x6222 = 0x7676
+0x6223 = 0x7678
+0x6224 = 0x767C
+0x6225 = 0x7680
+0x6226 = 0x7683
+0x6227 = 0x7688
+0x6228 = 0x768B
+0x6229 = 0x768E
+0x622A = 0x7696
+0x622B = 0x7693
+0x622C = 0x7699
+0x622D = 0x769A
+0x622E = 0x76B0
+0x622F = 0x76B4
+0x6230 = 0x76B8
+0x6231 = 0x76B9
+0x6232 = 0x76BA
+0x6233 = 0x76C2
+0x6234 = 0x76CD
+0x6235 = 0x76D6
+0x6236 = 0x76D2
+0x6237 = 0x76DE
+0x6238 = 0x76E1
+0x6239 = 0x76E5
+0x623A = 0x76E7
+0x623B = 0x76EA
+0x623C = 0x862F
+0x623D = 0x76FB
+0x623E = 0x7708
+0x623F = 0x7707
+0x6240 = 0x7704
+0x6241 = 0x7729
+0x6242 = 0x7724
+0x6243 = 0x771E
+0x6244 = 0x7725
+0x6245 = 0x7726
+0x6246 = 0x771B
+0x6247 = 0x7737
+0x6248 = 0x7738
+0x6249 = 0x7747
+0x624A = 0x775A
+0x624B = 0x7768
+0x624C = 0x776B
+0x624D = 0x775B
+0x624E = 0x7765
+0x624F = 0x777F
+0x6250 = 0x777E
+0x6251 = 0x7779
+0x6252 = 0x778E
+0x6253 = 0x778B
+0x6254 = 0x7791
+0x6255 = 0x77A0
+0x6256 = 0x779E
+0x6257 = 0x77B0
+0x6258 = 0x77B6
+0x6259 = 0x77B9
+0x625A = 0x77BF
+0x625B = 0x77BC
+0x625C = 0x77BD
+0x625D = 0x77BB
+0x625E = 0x77C7
+0x625F = 0x77CD
+0x6260 = 0x77D7
+0x6261 = 0x77DA
+0x6262 = 0x77DC
+0x6263 = 0x77E3
+0x6264 = 0x77EE
+0x6265 = 0x77FC
+0x6266 = 0x780C
+0x6267 = 0x7812
+0x6268 = 0x7926
+0x6269 = 0x7820
+0x626A = 0x792A
+0x626B = 0x7845
+0x626C = 0x788E
+0x626D = 0x7874
+0x626E = 0x7886
+0x626F = 0x787C
+0x6270 = 0x789A
+0x6271 = 0x788C
+0x6272 = 0x78A3
+0x6273 = 0x78B5
+0x6274 = 0x78AA
+0x6275 = 0x78AF
+0x6276 = 0x78D1
+0x6277 = 0x78C6
+0x6278 = 0x78CB
+0x6279 = 0x78D4
+0x627A = 0x78BE
+0x627B = 0x78BC
+0x627C = 0x78C5
+0x627D = 0x78CA
+0x627E = 0x78EC
+0x6321 = 0x78E7
+0x6322 = 0x78DA
+0x6323 = 0x78FD
+0x6324 = 0x78F4
+0x6325 = 0x7907
+0x6326 = 0x7912
+0x6327 = 0x7911
+0x6328 = 0x7919
+0x6329 = 0x792C
+0x632A = 0x792B
+0x632B = 0x7940
+0x632C = 0x7960
+0x632D = 0x7957
+0x632E = 0x795F
+0x632F = 0x795A
+0x6330 = 0x7955
+0x6331 = 0x7953
+0x6332 = 0x797A
+0x6333 = 0x797F
+0x6334 = 0x798A
+0x6335 = 0x799D
+0x6336 = 0x79A7
+0x6337 = 0x9F4B
+0x6338 = 0x79AA
+0x6339 = 0x79AE
+0x633A = 0x79B3
+0x633B = 0x79B9
+0x633C = 0x79BA
+0x633D = 0x79C9
+0x633E = 0x79D5
+0x633F = 0x79E7
+0x6340 = 0x79EC
+0x6341 = 0x79E1
+0x6342 = 0x79E3
+0x6343 = 0x7A08
+0x6344 = 0x7A0D
+0x6345 = 0x7A18
+0x6346 = 0x7A19
+0x6347 = 0x7A20
+0x6348 = 0x7A1F
+0x6349 = 0x7980
+0x634A = 0x7A31
+0x634B = 0x7A3B
+0x634C = 0x7A3E
+0x634D = 0x7A37
+0x634E = 0x7A43
+0x634F = 0x7A57
+0x6350 = 0x7A49
+0x6351 = 0x7A61
+0x6352 = 0x7A62
+0x6353 = 0x7A69
+0x6354 = 0x9F9D
+0x6355 = 0x7A70
+0x6356 = 0x7A79
+0x6357 = 0x7A7D
+0x6358 = 0x7A88
+0x6359 = 0x7A97
+0x635A = 0x7A95
+0x635B = 0x7A98
+0x635C = 0x7A96
+0x635D = 0x7AA9
+0x635E = 0x7AC8
+0x635F = 0x7AB0
+0x6360 = 0x7AB6
+0x6361 = 0x7AC5
+0x6362 = 0x7AC4
+0x6363 = 0x7ABF
+0x6364 = 0x9083
+0x6365 = 0x7AC7
+0x6366 = 0x7ACA
+0x6367 = 0x7ACD
+0x6368 = 0x7ACF
+0x6369 = 0x7AD5
+0x636A = 0x7AD3
+0x636B = 0x7AD9
+0x636C = 0x7ADA
+0x636D = 0x7ADD
+0x636E = 0x7AE1
+0x636F = 0x7AE2
+0x6370 = 0x7AE6
+0x6371 = 0x7AED
+0x6372 = 0x7AF0
+0x6373 = 0x7B02
+0x6374 = 0x7B0F
+0x6375 = 0x7B0A
+0x6376 = 0x7B06
+0x6377 = 0x7B33
+0x6378 = 0x7B18
+0x6379 = 0x7B19
+0x637A = 0x7B1E
+0x637B = 0x7B35
+0x637C = 0x7B28
+0x637D = 0x7B36
+0x637E = 0x7B50
+0x6421 = 0x7B7A
+0x6422 = 0x7B04
+0x6423 = 0x7B4D
+0x6424 = 0x7B0B
+0x6425 = 0x7B4C
+0x6426 = 0x7B45
+0x6427 = 0x7B75
+0x6428 = 0x7B65
+0x6429 = 0x7B74
+0x642A = 0x7B67
+0x642B = 0x7B70
+0x642C = 0x7B71
+0x642D = 0x7B6C
+0x642E = 0x7B6E
+0x642F = 0x7B9D
+0x6430 = 0x7B98
+0x6431 = 0x7B9F
+0x6432 = 0x7B8D
+0x6433 = 0x7B9C
+0x6434 = 0x7B9A
+0x6435 = 0x7B8B
+0x6436 = 0x7B92
+0x6437 = 0x7B8F
+0x6438 = 0x7B5D
+0x6439 = 0x7B99
+0x643A = 0x7BCB
+0x643B = 0x7BC1
+0x643C = 0x7BCC
+0x643D = 0x7BCF
+0x643E = 0x7BB4
+0x643F = 0x7BC6
+0x6440 = 0x7BDD
+0x6441 = 0x7BE9
+0x6442 = 0x7C11
+0x6443 = 0x7C14
+0x6444 = 0x7BE6
+0x6445 = 0x7BE5
+0x6446 = 0x7C60
+0x6447 = 0x7C00
+0x6448 = 0x7C07
+0x6449 = 0x7C13
+0x644A = 0x7BF3
+0x644B = 0x7BF7
+0x644C = 0x7C17
+0x644D = 0x7C0D
+0x644E = 0x7BF6
+0x644F = 0x7C23
+0x6450 = 0x7C27
+0x6451 = 0x7C2A
+0x6452 = 0x7C1F
+0x6453 = 0x7C37
+0x6454 = 0x7C2B
+0x6455 = 0x7C3D
+0x6456 = 0x7C4C
+0x6457 = 0x7C43
+0x6458 = 0x7C54
+0x6459 = 0x7C4F
+0x645A = 0x7C40
+0x645B = 0x7C50
+0x645C = 0x7C58
+0x645D = 0x7C5F
+0x645E = 0x7C64
+0x645F = 0x7C56
+0x6460 = 0x7C65
+0x6461 = 0x7C6C
+0x6462 = 0x7C75
+0x6463 = 0x7C83
+0x6464 = 0x7C90
+0x6465 = 0x7CA4
+0x6466 = 0x7CAD
+0x6467 = 0x7CA2
+0x6468 = 0x7CAB
+0x6469 = 0x7CA1
+0x646A = 0x7CA8
+0x646B = 0x7CB3
+0x646C = 0x7CB2
+0x646D = 0x7CB1
+0x646E = 0x7CAE
+0x646F = 0x7CB9
+0x6470 = 0x7CBD
+0x6471 = 0x7CC0
+0x6472 = 0x7CC5
+0x6473 = 0x7CC2
+0x6474 = 0x7CD8
+0x6475 = 0x7CD2
+0x6476 = 0x7CDC
+0x6477 = 0x7CE2
+0x6478 = 0x9B3B
+0x6479 = 0x7CEF
+0x647A = 0x7CF2
+0x647B = 0x7CF4
+0x647C = 0x7CF6
+0x647D = 0x7CFA
+0x647E = 0x7D06
+0x6521 = 0x7D02
+0x6522 = 0x7D1C
+0x6523 = 0x7D15
+0x6524 = 0x7D0A
+0x6525 = 0x7D45
+0x6526 = 0x7D4B
+0x6527 = 0x7D2E
+0x6528 = 0x7D32
+0x6529 = 0x7D3F
+0x652A = 0x7D35
+0x652B = 0x7D46
+0x652C = 0x7D73
+0x652D = 0x7D56
+0x652E = 0x7D4E
+0x652F = 0x7D72
+0x6530 = 0x7D68
+0x6531 = 0x7D6E
+0x6532 = 0x7D4F
+0x6533 = 0x7D63
+0x6534 = 0x7D93
+0x6535 = 0x7D89
+0x6536 = 0x7D5B
+0x6537 = 0x7D8F
+0x6538 = 0x7D7D
+0x6539 = 0x7D9B
+0x653A = 0x7DBA
+0x653B = 0x7DAE
+0x653C = 0x7DA3
+0x653D = 0x7DB5
+0x653E = 0x7DC7
+0x653F = 0x7DBD
+0x6540 = 0x7DAB
+0x6541 = 0x7E3D
+0x6542 = 0x7DA2
+0x6543 = 0x7DAF
+0x6544 = 0x7DDC
+0x6545 = 0x7DB8
+0x6546 = 0x7D9F
+0x6547 = 0x7DB0
+0x6548 = 0x7DD8
+0x6549 = 0x7DDD
+0x654A = 0x7DE4
+0x654B = 0x7DDE
+0x654C = 0x7DFB
+0x654D = 0x7DF2
+0x654E = 0x7DE1
+0x654F = 0x7E05
+0x6550 = 0x7E0A
+0x6551 = 0x7E23
+0x6552 = 0x7E21
+0x6553 = 0x7E12
+0x6554 = 0x7E31
+0x6555 = 0x7E1F
+0x6556 = 0x7E09
+0x6557 = 0x7E0B
+0x6558 = 0x7E22
+0x6559 = 0x7E46
+0x655A = 0x7E66
+0x655B = 0x7E3B
+0x655C = 0x7E35
+0x655D = 0x7E39
+0x655E = 0x7E43
+0x655F = 0x7E37
+0x6560 = 0x7E32
+0x6561 = 0x7E3A
+0x6562 = 0x7E67
+0x6563 = 0x7E5D
+0x6564 = 0x7E56
+0x6565 = 0x7E5E
+0x6566 = 0x7E59
+0x6567 = 0x7E5A
+0x6568 = 0x7E79
+0x6569 = 0x7E6A
+0x656A = 0x7E69
+0x656B = 0x7E7C
+0x656C = 0x7E7B
+0x656D = 0x7E83
+0x656E = 0x7DD5
+0x656F = 0x7E7D
+0x6570 = 0x8FAE
+0x6571 = 0x7E7F
+0x6572 = 0x7E88
+0x6573 = 0x7E89
+0x6574 = 0x7E8C
+0x6575 = 0x7E92
+0x6576 = 0x7E90
+0x6577 = 0x7E93
+0x6578 = 0x7E94
+0x6579 = 0x7E96
+0x657A = 0x7E8E
+0x657B = 0x7E9B
+0x657C = 0x7E9C
+0x657D = 0x7F38
+0x657E = 0x7F3A
+0x6621 = 0x7F45
+0x6622 = 0x7F4C
+0x6623 = 0x7F4D
+0x6624 = 0x7F4E
+0x6625 = 0x7F50
+0x6626 = 0x7F51
+0x6627 = 0x7F55
+0x6628 = 0x7F54
+0x6629 = 0x7F58
+0x662A = 0x7F5F
+0x662B = 0x7F60
+0x662C = 0x7F68
+0x662D = 0x7F69
+0x662E = 0x7F67
+0x662F = 0x7F78
+0x6630 = 0x7F82
+0x6631 = 0x7F86
+0x6632 = 0x7F83
+0x6633 = 0x7F88
+0x6634 = 0x7F87
+0x6635 = 0x7F8C
+0x6636 = 0x7F94
+0x6637 = 0x7F9E
+0x6638 = 0x7F9D
+0x6639 = 0x7F9A
+0x663A = 0x7FA3
+0x663B = 0x7FAF
+0x663C = 0x7FB2
+0x663D = 0x7FB9
+0x663E = 0x7FAE
+0x663F = 0x7FB6
+0x6640 = 0x7FB8
+0x6641 = 0x8B71
+0x6642 = 0x7FC5
+0x6643 = 0x7FC6
+0x6644 = 0x7FCA
+0x6645 = 0x7FD5
+0x6646 = 0x7FD4
+0x6647 = 0x7FE1
+0x6648 = 0x7FE6
+0x6649 = 0x7FE9
+0x664A = 0x7FF3
+0x664B = 0x7FF9
+0x664C = 0x98DC
+0x664D = 0x8006
+0x664E = 0x8004
+0x664F = 0x800B
+0x6650 = 0x8012
+0x6651 = 0x8018
+0x6652 = 0x8019
+0x6653 = 0x801C
+0x6654 = 0x8021
+0x6655 = 0x8028
+0x6656 = 0x803F
+0x6657 = 0x803B
+0x6658 = 0x804A
+0x6659 = 0x8046
+0x665A = 0x8052
+0x665B = 0x8058
+0x665C = 0x805A
+0x665D = 0x805F
+0x665E = 0x8062
+0x665F = 0x8068
+0x6660 = 0x8073
+0x6661 = 0x8072
+0x6662 = 0x8070
+0x6663 = 0x8076
+0x6664 = 0x8079
+0x6665 = 0x807D
+0x6666 = 0x807F
+0x6667 = 0x8084
+0x6668 = 0x8086
+0x6669 = 0x8085
+0x666A = 0x809B
+0x666B = 0x8093
+0x666C = 0x809A
+0x666D = 0x80AD
+0x666E = 0x5190
+0x666F = 0x80AC
+0x6670 = 0x80DB
+0x6671 = 0x80E5
+0x6672 = 0x80D9
+0x6673 = 0x80DD
+0x6674 = 0x80C4
+0x6675 = 0x80DA
+0x6676 = 0x80D6
+0x6677 = 0x8109
+0x6678 = 0x80EF
+0x6679 = 0x80F1
+0x667A = 0x811B
+0x667B = 0x8129
+0x667C = 0x8123
+0x667D = 0x812F
+0x667E = 0x814B
+0x6721 = 0x968B
+0x6722 = 0x8146
+0x6723 = 0x813E
+0x6724 = 0x8153
+0x6725 = 0x8151
+0x6726 = 0x80FC
+0x6727 = 0x8171
+0x6728 = 0x816E
+0x6729 = 0x8165
+0x672A = 0x8166
+0x672B = 0x8174
+0x672C = 0x8183
+0x672D = 0x8188
+0x672E = 0x818A
+0x672F = 0x8180
+0x6730 = 0x8182
+0x6731 = 0x81A0
+0x6732 = 0x8195
+0x6733 = 0x81A4
+0x6734 = 0x81A3
+0x6735 = 0x815F
+0x6736 = 0x8193
+0x6737 = 0x81A9
+0x6738 = 0x81B0
+0x6739 = 0x81B5
+0x673A = 0x81BE
+0x673B = 0x81B8
+0x673C = 0x81BD
+0x673D = 0x81C0
+0x673E = 0x81C2
+0x673F = 0x81BA
+0x6740 = 0x81C9
+0x6741 = 0x81CD
+0x6742 = 0x81D1
+0x6743 = 0x81D9
+0x6744 = 0x81D8
+0x6745 = 0x81C8
+0x6746 = 0x81DA
+0x6747 = 0x81DF
+0x6748 = 0x81E0
+0x6749 = 0x81E7
+0x674A = 0x81FA
+0x674B = 0x81FB
+0x674C = 0x81FE
+0x674D = 0x8201
+0x674E = 0x8202
+0x674F = 0x8205
+0x6750 = 0x8207
+0x6751 = 0x820A
+0x6752 = 0x820D
+0x6753 = 0x8210
+0x6754 = 0x8216
+0x6755 = 0x8229
+0x6756 = 0x822B
+0x6757 = 0x8238
+0x6758 = 0x8233
+0x6759 = 0x8240
+0x675A = 0x8259
+0x675B = 0x8258
+0x675C = 0x825D
+0x675D = 0x825A
+0x675E = 0x825F
+0x675F = 0x8264
+0x6760 = 0x8262
+0x6761 = 0x8268
+0x6762 = 0x826A
+0x6763 = 0x826B
+0x6764 = 0x822E
+0x6765 = 0x8271
+0x6766 = 0x8277
+0x6767 = 0x8278
+0x6768 = 0x827E
+0x6769 = 0x828D
+0x676A = 0x8292
+0x676B = 0x82AB
+0x676C = 0x829F
+0x676D = 0x82BB
+0x676E = 0x82AC
+0x676F = 0x82E1
+0x6770 = 0x82E3
+0x6771 = 0x82DF
+0x6772 = 0x82D2
+0x6773 = 0x82F4
+0x6774 = 0x82F3
+0x6775 = 0x82FA
+0x6776 = 0x8393
+0x6777 = 0x8303
+0x6778 = 0x82FB
+0x6779 = 0x82F9
+0x677A = 0x82DE
+0x677B = 0x8306
+0x677C = 0x82DC
+0x677D = 0x8309
+0x677E = 0x82D9
+0x6821 = 0x8335
+0x6822 = 0x8334
+0x6823 = 0x8316
+0x6824 = 0x8332
+0x6825 = 0x8331
+0x6826 = 0x8340
+0x6827 = 0x8339
+0x6828 = 0x8350
+0x6829 = 0x8345
+0x682A = 0x832F
+0x682B = 0x832B
+0x682C = 0x8317
+0x682D = 0x8318
+0x682E = 0x8385
+0x682F = 0x839A
+0x6830 = 0x83AA
+0x6831 = 0x839F
+0x6832 = 0x83A2
+0x6833 = 0x8396
+0x6834 = 0x8323
+0x6835 = 0x838E
+0x6836 = 0x8387
+0x6837 = 0x838A
+0x6838 = 0x837C
+0x6839 = 0x83B5
+0x683A = 0x8373
+0x683B = 0x8375
+0x683C = 0x83A0
+0x683D = 0x8389
+0x683E = 0x83A8
+0x683F = 0x83F4
+0x6840 = 0x8413
+0x6841 = 0x83EB
+0x6842 = 0x83CE
+0x6843 = 0x83FD
+0x6844 = 0x8403
+0x6845 = 0x83D8
+0x6846 = 0x840B
+0x6847 = 0x83C1
+0x6848 = 0x83F7
+0x6849 = 0x8407
+0x684A = 0x83E0
+0x684B = 0x83F2
+0x684C = 0x840D
+0x684D = 0x8422
+0x684E = 0x8420
+0x684F = 0x83BD
+0x6850 = 0x8438
+0x6851 = 0x8506
+0x6852 = 0x83FB
+0x6853 = 0x846D
+0x6854 = 0x842A
+0x6855 = 0x843C
+0x6856 = 0x855A
+0x6857 = 0x8484
+0x6858 = 0x8477
+0x6859 = 0x846B
+0x685A = 0x84AD
+0x685B = 0x846E
+0x685C = 0x8482
+0x685D = 0x8469
+0x685E = 0x8446
+0x685F = 0x842C
+0x6860 = 0x846F
+0x6861 = 0x8479
+0x6862 = 0x8435
+0x6863 = 0x84CA
+0x6864 = 0x8462
+0x6865 = 0x84B9
+0x6866 = 0x84BF
+0x6867 = 0x849F
+0x6868 = 0x84D9
+0x6869 = 0x84CD
+0x686A = 0x84BB
+0x686B = 0x84DA
+0x686C = 0x84D0
+0x686D = 0x84C1
+0x686E = 0x84C6
+0x686F = 0x84D6
+0x6870 = 0x84A1
+0x6871 = 0x8521
+0x6872 = 0x84FF
+0x6873 = 0x84F4
+0x6874 = 0x8517
+0x6875 = 0x8518
+0x6876 = 0x852C
+0x6877 = 0x851F
+0x6878 = 0x8515
+0x6879 = 0x8514
+0x687A = 0x84FC
+0x687B = 0x8540
+0x687C = 0x8563
+0x687D = 0x8558
+0x687E = 0x8548
+0x6921 = 0x8541
+0x6922 = 0x8602
+0x6923 = 0x854B
+0x6924 = 0x8555
+0x6925 = 0x8580
+0x6926 = 0x85A4
+0x6927 = 0x8588
+0x6928 = 0x8591
+0x6929 = 0x858A
+0x692A = 0x85A8
+0x692B = 0x856D
+0x692C = 0x8594
+0x692D = 0x859B
+0x692E = 0x85EA
+0x692F = 0x8587
+0x6930 = 0x859C
+0x6931 = 0x8577
+0x6932 = 0x857E
+0x6933 = 0x8590
+0x6934 = 0x85C9
+0x6935 = 0x85BA
+0x6936 = 0x85CF
+0x6937 = 0x85B9
+0x6938 = 0x85D0
+0x6939 = 0x85D5
+0x693A = 0x85DD
+0x693B = 0x85E5
+0x693C = 0x85DC
+0x693D = 0x85F9
+0x693E = 0x860A
+0x693F = 0x8613
+0x6940 = 0x860B
+0x6941 = 0x85FE
+0x6942 = 0x85FA
+0x6943 = 0x8606
+0x6944 = 0x8622
+0x6945 = 0x861A
+0x6946 = 0x8630
+0x6947 = 0x863F
+0x6948 = 0x864D
+0x6949 = 0x4E55
+0x694A = 0x8654
+0x694B = 0x865F
+0x694C = 0x8667
+0x694D = 0x8671
+0x694E = 0x8693
+0x694F = 0x86A3
+0x6950 = 0x86A9
+0x6951 = 0x86AA
+0x6952 = 0x868B
+0x6953 = 0x868C
+0x6954 = 0x86B6
+0x6955 = 0x86AF
+0x6956 = 0x86C4
+0x6957 = 0x86C6
+0x6958 = 0x86B0
+0x6959 = 0x86C9
+0x695A = 0x8823
+0x695B = 0x86AB
+0x695C = 0x86D4
+0x695D = 0x86DE
+0x695E = 0x86E9
+0x695F = 0x86EC
+0x6960 = 0x86DF
+0x6961 = 0x86DB
+0x6962 = 0x86EF
+0x6963 = 0x8712
+0x6964 = 0x8706
+0x6965 = 0x8708
+0x6966 = 0x8700
+0x6967 = 0x8703
+0x6968 = 0x86FB
+0x6969 = 0x8711
+0x696A = 0x8709
+0x696B = 0x870D
+0x696C = 0x86F9
+0x696D = 0x870A
+0x696E = 0x8734
+0x696F = 0x873F
+0x6970 = 0x8737
+0x6971 = 0x873B
+0x6972 = 0x8725
+0x6973 = 0x8729
+0x6974 = 0x871A
+0x6975 = 0x8760
+0x6976 = 0x875F
+0x6977 = 0x8778
+0x6978 = 0x874C
+0x6979 = 0x874E
+0x697A = 0x8774
+0x697B = 0x8757
+0x697C = 0x8768
+0x697D = 0x876E
+0x697E = 0x8759
+0x6A21 = 0x8753
+0x6A22 = 0x8763
+0x6A23 = 0x876A
+0x6A24 = 0x8805
+0x6A25 = 0x87A2
+0x6A26 = 0x879F
+0x6A27 = 0x8782
+0x6A28 = 0x87AF
+0x6A29 = 0x87CB
+0x6A2A = 0x87BD
+0x6A2B = 0x87C0
+0x6A2C = 0x87D0
+0x6A2D = 0x96D6
+0x6A2E = 0x87AB
+0x6A2F = 0x87C4
+0x6A30 = 0x87B3
+0x6A31 = 0x87C7
+0x6A32 = 0x87C6
+0x6A33 = 0x87BB
+0x6A34 = 0x87EF
+0x6A35 = 0x87F2
+0x6A36 = 0x87E0
+0x6A37 = 0x880F
+0x6A38 = 0x880D
+0x6A39 = 0x87FE
+0x6A3A = 0x87F6
+0x6A3B = 0x87F7
+0x6A3C = 0x880E
+0x6A3D = 0x87D2
+0x6A3E = 0x8811
+0x6A3F = 0x8816
+0x6A40 = 0x8815
+0x6A41 = 0x8822
+0x6A42 = 0x8821
+0x6A43 = 0x8831
+0x6A44 = 0x8836
+0x6A45 = 0x8839
+0x6A46 = 0x8827
+0x6A47 = 0x883B
+0x6A48 = 0x8844
+0x6A49 = 0x8842
+0x6A4A = 0x8852
+0x6A4B = 0x8859
+0x6A4C = 0x885E
+0x6A4D = 0x8862
+0x6A4E = 0x886B
+0x6A4F = 0x8881
+0x6A50 = 0x887E
+0x6A51 = 0x889E
+0x6A52 = 0x8875
+0x6A53 = 0x887D
+0x6A54 = 0x88B5
+0x6A55 = 0x8872
+0x6A56 = 0x8882
+0x6A57 = 0x8897
+0x6A58 = 0x8892
+0x6A59 = 0x88AE
+0x6A5A = 0x8899
+0x6A5B = 0x88A2
+0x6A5C = 0x888D
+0x6A5D = 0x88A4
+0x6A5E = 0x88B0
+0x6A5F = 0x88BF
+0x6A60 = 0x88B1
+0x6A61 = 0x88C3
+0x6A62 = 0x88C4
+0x6A63 = 0x88D4
+0x6A64 = 0x88D8
+0x6A65 = 0x88D9
+0x6A66 = 0x88DD
+0x6A67 = 0x88F9
+0x6A68 = 0x8902
+0x6A69 = 0x88FC
+0x6A6A = 0x88F4
+0x6A6B = 0x88E8
+0x6A6C = 0x88F2
+0x6A6D = 0x8904
+0x6A6E = 0x890C
+0x6A6F = 0x890A
+0x6A70 = 0x8913
+0x6A71 = 0x8943
+0x6A72 = 0x891E
+0x6A73 = 0x8925
+0x6A74 = 0x892A
+0x6A75 = 0x892B
+0x6A76 = 0x8941
+0x6A77 = 0x8944
+0x6A78 = 0x893B
+0x6A79 = 0x8936
+0x6A7A = 0x8938
+0x6A7B = 0x894C
+0x6A7C = 0x891D
+0x6A7D = 0x8960
+0x6A7E = 0x895E
+0x6B21 = 0x8966
+0x6B22 = 0x8964
+0x6B23 = 0x896D
+0x6B24 = 0x896A
+0x6B25 = 0x896F
+0x6B26 = 0x8974
+0x6B27 = 0x8977
+0x6B28 = 0x897E
+0x6B29 = 0x8983
+0x6B2A = 0x8988
+0x6B2B = 0x898A
+0x6B2C = 0x8993
+0x6B2D = 0x8998
+0x6B2E = 0x89A1
+0x6B2F = 0x89A9
+0x6B30 = 0x89A6
+0x6B31 = 0x89AC
+0x6B32 = 0x89AF
+0x6B33 = 0x89B2
+0x6B34 = 0x89BA
+0x6B35 = 0x89BD
+0x6B36 = 0x89BF
+0x6B37 = 0x89C0
+0x6B38 = 0x89DA
+0x6B39 = 0x89DC
+0x6B3A = 0x89DD
+0x6B3B = 0x89E7
+0x6B3C = 0x89F4
+0x6B3D = 0x89F8
+0x6B3E = 0x8A03
+0x6B3F = 0x8A16
+0x6B40 = 0x8A10
+0x6B41 = 0x8A0C
+0x6B42 = 0x8A1B
+0x6B43 = 0x8A1D
+0x6B44 = 0x8A25
+0x6B45 = 0x8A36
+0x6B46 = 0x8A41
+0x6B47 = 0x8A5B
+0x6B48 = 0x8A52
+0x6B49 = 0x8A46
+0x6B4A = 0x8A48
+0x6B4B = 0x8A7C
+0x6B4C = 0x8A6D
+0x6B4D = 0x8A6C
+0x6B4E = 0x8A62
+0x6B4F = 0x8A85
+0x6B50 = 0x8A82
+0x6B51 = 0x8A84
+0x6B52 = 0x8AA8
+0x6B53 = 0x8AA1
+0x6B54 = 0x8A91
+0x6B55 = 0x8AA5
+0x6B56 = 0x8AA6
+0x6B57 = 0x8A9A
+0x6B58 = 0x8AA3
+0x6B59 = 0x8AC4
+0x6B5A = 0x8ACD
+0x6B5B = 0x8AC2
+0x6B5C = 0x8ADA
+0x6B5D = 0x8AEB
+0x6B5E = 0x8AF3
+0x6B5F = 0x8AE7
+0x6B60 = 0x8AE4
+0x6B61 = 0x8AF1
+0x6B62 = 0x8B14
+0x6B63 = 0x8AE0
+0x6B64 = 0x8AE2
+0x6B65 = 0x8AF7
+0x6B66 = 0x8ADE
+0x6B67 = 0x8ADB
+0x6B68 = 0x8B0C
+0x6B69 = 0x8B07
+0x6B6A = 0x8B1A
+0x6B6B = 0x8AE1
+0x6B6C = 0x8B16
+0x6B6D = 0x8B10
+0x6B6E = 0x8B17
+0x6B6F = 0x8B20
+0x6B70 = 0x8B33
+0x6B71 = 0x97AB
+0x6B72 = 0x8B26
+0x6B73 = 0x8B2B
+0x6B74 = 0x8B3E
+0x6B75 = 0x8B28
+0x6B76 = 0x8B41
+0x6B77 = 0x8B4C
+0x6B78 = 0x8B4F
+0x6B79 = 0x8B4E
+0x6B7A = 0x8B49
+0x6B7B = 0x8B56
+0x6B7C = 0x8B5B
+0x6B7D = 0x8B5A
+0x6B7E = 0x8B6B
+0x6C21 = 0x8B5F
+0x6C22 = 0x8B6C
+0x6C23 = 0x8B6F
+0x6C24 = 0x8B74
+0x6C25 = 0x8B7D
+0x6C26 = 0x8B80
+0x6C27 = 0x8B8C
+0x6C28 = 0x8B8E
+0x6C29 = 0x8B92
+0x6C2A = 0x8B93
+0x6C2B = 0x8B96
+0x6C2C = 0x8B99
+0x6C2D = 0x8B9A
+0x6C2E = 0x8C3A
+0x6C2F = 0x8C41
+0x6C30 = 0x8C3F
+0x6C31 = 0x8C48
+0x6C32 = 0x8C4C
+0x6C33 = 0x8C4E
+0x6C34 = 0x8C50
+0x6C35 = 0x8C55
+0x6C36 = 0x8C62
+0x6C37 = 0x8C6C
+0x6C38 = 0x8C78
+0x6C39 = 0x8C7A
+0x6C3A = 0x8C82
+0x6C3B = 0x8C89
+0x6C3C = 0x8C85
+0x6C3D = 0x8C8A
+0x6C3E = 0x8C8D
+0x6C3F = 0x8C8E
+0x6C40 = 0x8C94
+0x6C41 = 0x8C7C
+0x6C42 = 0x8C98
+0x6C43 = 0x621D
+0x6C44 = 0x8CAD
+0x6C45 = 0x8CAA
+0x6C46 = 0x8CBD
+0x6C47 = 0x8CB2
+0x6C48 = 0x8CB3
+0x6C49 = 0x8CAE
+0x6C4A = 0x8CB6
+0x6C4B = 0x8CC8
+0x6C4C = 0x8CC1
+0x6C4D = 0x8CE4
+0x6C4E = 0x8CE3
+0x6C4F = 0x8CDA
+0x6C50 = 0x8CFD
+0x6C51 = 0x8CFA
+0x6C52 = 0x8CFB
+0x6C53 = 0x8D04
+0x6C54 = 0x8D05
+0x6C55 = 0x8D0A
+0x6C56 = 0x8D07
+0x6C57 = 0x8D0F
+0x6C58 = 0x8D0D
+0x6C59 = 0x8D10
+0x6C5A = 0x9F4E
+0x6C5B = 0x8D13
+0x6C5C = 0x8CCD
+0x6C5D = 0x8D14
+0x6C5E = 0x8D16
+0x6C5F = 0x8D67
+0x6C60 = 0x8D6D
+0x6C61 = 0x8D71
+0x6C62 = 0x8D73
+0x6C63 = 0x8D81
+0x6C64 = 0x8D99
+0x6C65 = 0x8DC2
+0x6C66 = 0x8DBE
+0x6C67 = 0x8DBA
+0x6C68 = 0x8DCF
+0x6C69 = 0x8DDA
+0x6C6A = 0x8DD6
+0x6C6B = 0x8DCC
+0x6C6C = 0x8DDB
+0x6C6D = 0x8DCB
+0x6C6E = 0x8DEA
+0x6C6F = 0x8DEB
+0x6C70 = 0x8DDF
+0x6C71 = 0x8DE3
+0x6C72 = 0x8DFC
+0x6C73 = 0x8E08
+0x6C74 = 0x8E09
+0x6C75 = 0x8DFF
+0x6C76 = 0x8E1D
+0x6C77 = 0x8E1E
+0x6C78 = 0x8E10
+0x6C79 = 0x8E1F
+0x6C7A = 0x8E42
+0x6C7B = 0x8E35
+0x6C7C = 0x8E30
+0x6C7D = 0x8E34
+0x6C7E = 0x8E4A
+0x6D21 = 0x8E47
+0x6D22 = 0x8E49
+0x6D23 = 0x8E4C
+0x6D24 = 0x8E50
+0x6D25 = 0x8E48
+0x6D26 = 0x8E59
+0x6D27 = 0x8E64
+0x6D28 = 0x8E60
+0x6D29 = 0x8E2A
+0x6D2A = 0x8E63
+0x6D2B = 0x8E55
+0x6D2C = 0x8E76
+0x6D2D = 0x8E72
+0x6D2E = 0x8E7C
+0x6D2F = 0x8E81
+0x6D30 = 0x8E87
+0x6D31 = 0x8E85
+0x6D32 = 0x8E84
+0x6D33 = 0x8E8B
+0x6D34 = 0x8E8A
+0x6D35 = 0x8E93
+0x6D36 = 0x8E91
+0x6D37 = 0x8E94
+0x6D38 = 0x8E99
+0x6D39 = 0x8EAA
+0x6D3A = 0x8EA1
+0x6D3B = 0x8EAC
+0x6D3C = 0x8EB0
+0x6D3D = 0x8EC6
+0x6D3E = 0x8EB1
+0x6D3F = 0x8EBE
+0x6D40 = 0x8EC5
+0x6D41 = 0x8EC8
+0x6D42 = 0x8ECB
+0x6D43 = 0x8EDB
+0x6D44 = 0x8EE3
+0x6D45 = 0x8EFC
+0x6D46 = 0x8EFB
+0x6D47 = 0x8EEB
+0x6D48 = 0x8EFE
+0x6D49 = 0x8F0A
+0x6D4A = 0x8F05
+0x6D4B = 0x8F15
+0x6D4C = 0x8F12
+0x6D4D = 0x8F19
+0x6D4E = 0x8F13
+0x6D4F = 0x8F1C
+0x6D50 = 0x8F1F
+0x6D51 = 0x8F1B
+0x6D52 = 0x8F0C
+0x6D53 = 0x8F26
+0x6D54 = 0x8F33
+0x6D55 = 0x8F3B
+0x6D56 = 0x8F39
+0x6D57 = 0x8F45
+0x6D58 = 0x8F42
+0x6D59 = 0x8F3E
+0x6D5A = 0x8F4C
+0x6D5B = 0x8F49
+0x6D5C = 0x8F46
+0x6D5D = 0x8F4E
+0x6D5E = 0x8F57
+0x6D5F = 0x8F5C
+0x6D60 = 0x8F62
+0x6D61 = 0x8F63
+0x6D62 = 0x8F64
+0x6D63 = 0x8F9C
+0x6D64 = 0x8F9F
+0x6D65 = 0x8FA3
+0x6D66 = 0x8FAD
+0x6D67 = 0x8FAF
+0x6D68 = 0x8FB7
+0x6D69 = 0x8FDA
+0x6D6A = 0x8FE5
+0x6D6B = 0x8FE2
+0x6D6C = 0x8FEA
+0x6D6D = 0x8FEF
+0x6D6E = 0x9087
+0x6D6F = 0x8FF4
+0x6D70 = 0x9005
+0x6D71 = 0x8FF9
+0x6D72 = 0x8FFA
+0x6D73 = 0x9011
+0x6D74 = 0x9015
+0x6D75 = 0x9021
+0x6D76 = 0x900D
+0x6D77 = 0x901E
+0x6D78 = 0x9016
+0x6D79 = 0x900B
+0x6D7A = 0x9027
+0x6D7B = 0x9036
+0x6D7C = 0x9035
+0x6D7D = 0x9039
+0x6D7E = 0x8FF8
+0x6E21 = 0x904F
+0x6E22 = 0x9050
+0x6E23 = 0x9051
+0x6E24 = 0x9052
+0x6E25 = 0x900E
+0x6E26 = 0x9049
+0x6E27 = 0x903E
+0x6E28 = 0x9056
+0x6E29 = 0x9058
+0x6E2A = 0x905E
+0x6E2B = 0x9068
+0x6E2C = 0x906F
+0x6E2D = 0x9076
+0x6E2E = 0x96A8
+0x6E2F = 0x9072
+0x6E30 = 0x9082
+0x6E31 = 0x907D
+0x6E32 = 0x9081
+0x6E33 = 0x9080
+0x6E34 = 0x908A
+0x6E35 = 0x9089
+0x6E36 = 0x908F
+0x6E37 = 0x90A8
+0x6E38 = 0x90AF
+0x6E39 = 0x90B1
+0x6E3A = 0x90B5
+0x6E3B = 0x90E2
+0x6E3C = 0x90E4
+0x6E3D = 0x6248
+0x6E3E = 0x90DB
+0x6E3F = 0x9102
+0x6E40 = 0x9112
+0x6E41 = 0x9119
+0x6E42 = 0x9132
+0x6E43 = 0x9130
+0x6E44 = 0x914A
+0x6E45 = 0x9156
+0x6E46 = 0x9158
+0x6E47 = 0x9163
+0x6E48 = 0x9165
+0x6E49 = 0x9169
+0x6E4A = 0x9173
+0x6E4B = 0x9172
+0x6E4C = 0x918B
+0x6E4D = 0x9189
+0x6E4E = 0x9182
+0x6E4F = 0x91A2
+0x6E50 = 0x91AB
+0x6E51 = 0x91AF
+0x6E52 = 0x91AA
+0x6E53 = 0x91B5
+0x6E54 = 0x91B4
+0x6E55 = 0x91BA
+0x6E56 = 0x91C0
+0x6E57 = 0x91C1
+0x6E58 = 0x91C9
+0x6E59 = 0x91CB
+0x6E5A = 0x91D0
+0x6E5B = 0x91D6
+0x6E5C = 0x91DF
+0x6E5D = 0x91E1
+0x6E5E = 0x91DB
+0x6E5F = 0x91FC
+0x6E60 = 0x91F5
+0x6E61 = 0x91F6
+0x6E62 = 0x921E
+0x6E63 = 0x91FF
+0x6E64 = 0x9214
+0x6E65 = 0x922C
+0x6E66 = 0x9215
+0x6E67 = 0x9211
+0x6E68 = 0x925E
+0x6E69 = 0x9257
+0x6E6A = 0x9245
+0x6E6B = 0x9249
+0x6E6C = 0x9264
+0x6E6D = 0x9248
+0x6E6E = 0x9295
+0x6E6F = 0x923F
+0x6E70 = 0x924B
+0x6E71 = 0x9250
+0x6E72 = 0x929C
+0x6E73 = 0x9296
+0x6E74 = 0x9293
+0x6E75 = 0x929B
+0x6E76 = 0x925A
+0x6E77 = 0x92CF
+0x6E78 = 0x92B9
+0x6E79 = 0x92B7
+0x6E7A = 0x92E9
+0x6E7B = 0x930F
+0x6E7C = 0x92FA
+0x6E7D = 0x9344
+0x6E7E = 0x932E
+0x6F21 = 0x9319
+0x6F22 = 0x9322
+0x6F23 = 0x931A
+0x6F24 = 0x9323
+0x6F25 = 0x933A
+0x6F26 = 0x9335
+0x6F27 = 0x933B
+0x6F28 = 0x935C
+0x6F29 = 0x9360
+0x6F2A = 0x937C
+0x6F2B = 0x936E
+0x6F2C = 0x9356
+0x6F2D = 0x93B0
+0x6F2E = 0x93AC
+0x6F2F = 0x93AD
+0x6F30 = 0x9394
+0x6F31 = 0x93B9
+0x6F32 = 0x93D6
+0x6F33 = 0x93D7
+0x6F34 = 0x93E8
+0x6F35 = 0x93E5
+0x6F36 = 0x93D8
+0x6F37 = 0x93C3
+0x6F38 = 0x93DD
+0x6F39 = 0x93D0
+0x6F3A = 0x93C8
+0x6F3B = 0x93E4
+0x6F3C = 0x941A
+0x6F3D = 0x9414
+0x6F3E = 0x9413
+0x6F3F = 0x9403
+0x6F40 = 0x9407
+0x6F41 = 0x9410
+0x6F42 = 0x9436
+0x6F43 = 0x942B
+0x6F44 = 0x9435
+0x6F45 = 0x9421
+0x6F46 = 0x943A
+0x6F47 = 0x9441
+0x6F48 = 0x9452
+0x6F49 = 0x9444
+0x6F4A = 0x945B
+0x6F4B = 0x9460
+0x6F4C = 0x9462
+0x6F4D = 0x945E
+0x6F4E = 0x946A
+0x6F4F = 0x9229
+0x6F50 = 0x9470
+0x6F51 = 0x9475
+0x6F52 = 0x9477
+0x6F53 = 0x947D
+0x6F54 = 0x945A
+0x6F55 = 0x947C
+0x6F56 = 0x947E
+0x6F57 = 0x9481
+0x6F58 = 0x947F
+0x6F59 = 0x9582
+0x6F5A = 0x9587
+0x6F5B = 0x958A
+0x6F5C = 0x9594
+0x6F5D = 0x9596
+0x6F5E = 0x9598
+0x6F5F = 0x9599
+0x6F60 = 0x95A0
+0x6F61 = 0x95A8
+0x6F62 = 0x95A7
+0x6F63 = 0x95AD
+0x6F64 = 0x95BC
+0x6F65 = 0x95BB
+0x6F66 = 0x95B9
+0x6F67 = 0x95BE
+0x6F68 = 0x95CA
+0x6F69 = 0x6FF6
+0x6F6A = 0x95C3
+0x6F6B = 0x95CD
+0x6F6C = 0x95CC
+0x6F6D = 0x95D5
+0x6F6E = 0x95D4
+0x6F6F = 0x95D6
+0x6F70 = 0x95DC
+0x6F71 = 0x95E1
+0x6F72 = 0x95E5
+0x6F73 = 0x95E2
+0x6F74 = 0x9621
+0x6F75 = 0x9628
+0x6F76 = 0x962E
+0x6F77 = 0x962F
+0x6F78 = 0x9642
+0x6F79 = 0x964C
+0x6F7A = 0x964F
+0x6F7B = 0x964B
+0x6F7C = 0x9677
+0x6F7D = 0x965C
+0x6F7E = 0x965E
+0x7021 = 0x965D
+0x7022 = 0x965F
+0x7023 = 0x9666
+0x7024 = 0x9672
+0x7025 = 0x966C
+0x7026 = 0x968D
+0x7027 = 0x9698
+0x7028 = 0x9695
+0x7029 = 0x9697
+0x702A = 0x96AA
+0x702B = 0x96A7
+0x702C = 0x96B1
+0x702D = 0x96B2
+0x702E = 0x96B0
+0x702F = 0x96B4
+0x7030 = 0x96B6
+0x7031 = 0x96B8
+0x7032 = 0x96B9
+0x7033 = 0x96CE
+0x7034 = 0x96CB
+0x7035 = 0x96C9
+0x7036 = 0x96CD
+0x7037 = 0x894D
+0x7038 = 0x96DC
+0x7039 = 0x970D
+0x703A = 0x96D5
+0x703B = 0x96F9
+0x703C = 0x9704
+0x703D = 0x9706
+0x703E = 0x9708
+0x703F = 0x9713
+0x7040 = 0x970E
+0x7041 = 0x9711
+0x7042 = 0x970F
+0x7043 = 0x9716
+0x7044 = 0x9719
+0x7045 = 0x9724
+0x7046 = 0x972A
+0x7047 = 0x9730
+0x7048 = 0x9739
+0x7049 = 0x973D
+0x704A = 0x973E
+0x704B = 0x9744
+0x704C = 0x9746
+0x704D = 0x9748
+0x704E = 0x9742
+0x704F = 0x9749
+0x7050 = 0x975C
+0x7051 = 0x9760
+0x7052 = 0x9764
+0x7053 = 0x9766
+0x7054 = 0x9768
+0x7055 = 0x52D2
+0x7056 = 0x976B
+0x7057 = 0x9771
+0x7058 = 0x9779
+0x7059 = 0x9785
+0x705A = 0x977C
+0x705B = 0x9781
+0x705C = 0x977A
+0x705D = 0x9786
+0x705E = 0x978B
+0x705F = 0x978F
+0x7060 = 0x9790
+0x7061 = 0x979C
+0x7062 = 0x97A8
+0x7063 = 0x97A6
+0x7064 = 0x97A3
+0x7065 = 0x97B3
+0x7066 = 0x97B4
+0x7067 = 0x97C3
+0x7068 = 0x97C6
+0x7069 = 0x97C8
+0x706A = 0x97CB
+0x706B = 0x97DC
+0x706C = 0x97ED
+0x706D = 0x9F4F
+0x706E = 0x97F2
+0x706F = 0x7ADF
+0x7070 = 0x97F6
+0x7071 = 0x97F5
+0x7072 = 0x980F
+0x7073 = 0x980C
+0x7074 = 0x9838
+0x7075 = 0x9824
+0x7076 = 0x9821
+0x7077 = 0x9837
+0x7078 = 0x983D
+0x7079 = 0x9846
+0x707A = 0x984F
+0x707B = 0x984B
+0x707C = 0x986B
+0x707D = 0x986F
+0x707E = 0x9870
+0x7121 = 0x9871
+0x7122 = 0x9874
+0x7123 = 0x9873
+0x7124 = 0x98AA
+0x7125 = 0x98AF
+0x7126 = 0x98B1
+0x7127 = 0x98B6
+0x7128 = 0x98C4
+0x7129 = 0x98C3
+0x712A = 0x98C6
+0x712B = 0x98E9
+0x712C = 0x98EB
+0x712D = 0x9903
+0x712E = 0x9909
+0x712F = 0x9912
+0x7130 = 0x9914
+0x7131 = 0x9918
+0x7132 = 0x9921
+0x7133 = 0x991D
+0x7134 = 0x991E
+0x7135 = 0x9924
+0x7136 = 0x9920
+0x7137 = 0x992C
+0x7138 = 0x992E
+0x7139 = 0x993D
+0x713A = 0x993E
+0x713B = 0x9942
+0x713C = 0x9949
+0x713D = 0x9945
+0x713E = 0x9950
+0x713F = 0x994B
+0x7140 = 0x9951
+0x7141 = 0x9952
+0x7142 = 0x994C
+0x7143 = 0x9955
+0x7144 = 0x9997
+0x7145 = 0x9998
+0x7146 = 0x99A5
+0x7147 = 0x99AD
+0x7148 = 0x99AE
+0x7149 = 0x99BC
+0x714A = 0x99DF
+0x714B = 0x99DB
+0x714C = 0x99DD
+0x714D = 0x99D8
+0x714E = 0x99D1
+0x714F = 0x99ED
+0x7150 = 0x99EE
+0x7151 = 0x99F1
+0x7152 = 0x99F2
+0x7153 = 0x99FB
+0x7154 = 0x99F8
+0x7155 = 0x9A01
+0x7156 = 0x9A0F
+0x7157 = 0x9A05
+0x7158 = 0x99E2
+0x7159 = 0x9A19
+0x715A = 0x9A2B
+0x715B = 0x9A37
+0x715C = 0x9A45
+0x715D = 0x9A42
+0x715E = 0x9A40
+0x715F = 0x9A43
+0x7160 = 0x9A3E
+0x7161 = 0x9A55
+0x7162 = 0x9A4D
+0x7163 = 0x9A5B
+0x7164 = 0x9A57
+0x7165 = 0x9A5F
+0x7166 = 0x9A62
+0x7167 = 0x9A65
+0x7168 = 0x9A64
+0x7169 = 0x9A69
+0x716A = 0x9A6B
+0x716B = 0x9A6A
+0x716C = 0x9AAD
+0x716D = 0x9AB0
+0x716E = 0x9ABC
+0x716F = 0x9AC0
+0x7170 = 0x9ACF
+0x7171 = 0x9AD1
+0x7172 = 0x9AD3
+0x7173 = 0x9AD4
+0x7174 = 0x9ADE
+0x7175 = 0x9ADF
+0x7176 = 0x9AE2
+0x7177 = 0x9AE3
+0x7178 = 0x9AE6
+0x7179 = 0x9AEF
+0x717A = 0x9AEB
+0x717B = 0x9AEE
+0x717C = 0x9AF4
+0x717D = 0x9AF1
+0x717E = 0x9AF7
+0x7221 = 0x9AFB
+0x7222 = 0x9B06
+0x7223 = 0x9B18
+0x7224 = 0x9B1A
+0x7225 = 0x9B1F
+0x7226 = 0x9B22
+0x7227 = 0x9B23
+0x7228 = 0x9B25
+0x7229 = 0x9B27
+0x722A = 0x9B28
+0x722B = 0x9B29
+0x722C = 0x9B2A
+0x722D = 0x9B2E
+0x722E = 0x9B2F
+0x722F = 0x9B32
+0x7230 = 0x9B44
+0x7231 = 0x9B43
+0x7232 = 0x9B4F
+0x7233 = 0x9B4D
+0x7234 = 0x9B4E
+0x7235 = 0x9B51
+0x7236 = 0x9B58
+0x7237 = 0x9B74
+0x7238 = 0x9B93
+0x7239 = 0x9B83
+0x723A = 0x9B91
+0x723B = 0x9B96
+0x723C = 0x9B97
+0x723D = 0x9B9F
+0x723E = 0x9BA0
+0x723F = 0x9BA8
+0x7240 = 0x9BB4
+0x7241 = 0x9BC0
+0x7242 = 0x9BCA
+0x7243 = 0x9BB9
+0x7244 = 0x9BC6
+0x7245 = 0x9BCF
+0x7246 = 0x9BD1
+0x7247 = 0x9BD2
+0x7248 = 0x9BE3
+0x7249 = 0x9BE2
+0x724A = 0x9BE4
+0x724B = 0x9BD4
+0x724C = 0x9BE1
+0x724D = 0x9C3A
+0x724E = 0x9BF2
+0x724F = 0x9BF1
+0x7250 = 0x9BF0
+0x7251 = 0x9C15
+0x7252 = 0x9C14
+0x7253 = 0x9C09
+0x7254 = 0x9C13
+0x7255 = 0x9C0C
+0x7256 = 0x9C06
+0x7257 = 0x9C08
+0x7258 = 0x9C12
+0x7259 = 0x9C0A
+0x725A = 0x9C04
+0x725B = 0x9C2E
+0x725C = 0x9C1B
+0x725D = 0x9C25
+0x725E = 0x9C24
+0x725F = 0x9C21
+0x7260 = 0x9C30
+0x7261 = 0x9C47
+0x7262 = 0x9C32
+0x7263 = 0x9C46
+0x7264 = 0x9C3E
+0x7265 = 0x9C5A
+0x7266 = 0x9C60
+0x7267 = 0x9C67
+0x7268 = 0x9C76
+0x7269 = 0x9C78
+0x726A = 0x9CE7
+0x726B = 0x9CEC
+0x726C = 0x9CF0
+0x726D = 0x9D09
+0x726E = 0x9D08
+0x726F = 0x9CEB
+0x7270 = 0x9D03
+0x7271 = 0x9D06
+0x7272 = 0x9D2A
+0x7273 = 0x9D26
+0x7274 = 0x9DAF
+0x7275 = 0x9D23
+0x7276 = 0x9D1F
+0x7277 = 0x9D44
+0x7278 = 0x9D15
+0x7279 = 0x9D12
+0x727A = 0x9D41
+0x727B = 0x9D3F
+0x727C = 0x9D3E
+0x727D = 0x9D46
+0x727E = 0x9D48
+0x7321 = 0x9D5D
+0x7322 = 0x9D5E
+0x7323 = 0x9D64
+0x7324 = 0x9D51
+0x7325 = 0x9D50
+0x7326 = 0x9D59
+0x7327 = 0x9D72
+0x7328 = 0x9D89
+0x7329 = 0x9D87
+0x732A = 0x9DAB
+0x732B = 0x9D6F
+0x732C = 0x9D7A
+0x732D = 0x9D9A
+0x732E = 0x9DA4
+0x732F = 0x9DA9
+0x7330 = 0x9DB2
+0x7331 = 0x9DC4
+0x7332 = 0x9DC1
+0x7333 = 0x9DBB
+0x7334 = 0x9DB8
+0x7335 = 0x9DBA
+0x7336 = 0x9DC6
+0x7337 = 0x9DCF
+0x7338 = 0x9DC2
+0x7339 = 0x9DD9
+0x733A = 0x9DD3
+0x733B = 0x9DF8
+0x733C = 0x9DE6
+0x733D = 0x9DED
+0x733E = 0x9DEF
+0x733F = 0x9DFD
+0x7340 = 0x9E1A
+0x7341 = 0x9E1B
+0x7342 = 0x9E1E
+0x7343 = 0x9E75
+0x7344 = 0x9E79
+0x7345 = 0x9E7D
+0x7346 = 0x9E81
+0x7347 = 0x9E88
+0x7348 = 0x9E8B
+0x7349 = 0x9E8C
+0x734A = 0x9E92
+0x734B = 0x9E95
+0x734C = 0x9E91
+0x734D = 0x9E9D
+0x734E = 0x9EA5
+0x734F = 0x9EA9
+0x7350 = 0x9EB8
+0x7351 = 0x9EAA
+0x7352 = 0x9EAD
+0x7353 = 0x9761
+0x7354 = 0x9ECC
+0x7355 = 0x9ECE
+0x7356 = 0x9ECF
+0x7357 = 0x9ED0
+0x7358 = 0x9ED4
+0x7359 = 0x9EDC
+0x735A = 0x9EDE
+0x735B = 0x9EDD
+0x735C = 0x9EE0
+0x735D = 0x9EE5
+0x735E = 0x9EE8
+0x735F = 0x9EEF
+0x7360 = 0x9EF4
+0x7361 = 0x9EF6
+0x7362 = 0x9EF7
+0x7363 = 0x9EF9
+0x7364 = 0x9EFB
+0x7365 = 0x9EFC
+0x7366 = 0x9EFD
+0x7367 = 0x9F07
+0x7368 = 0x9F08
+0x7369 = 0x76B7
+0x736A = 0x9F15
+0x736B = 0x9F21
+0x736C = 0x9F2C
+0x736D = 0x9F3E
+0x736E = 0x9F4A
+0x736F = 0x9F52
+0x7370 = 0x9F54
+0x7371 = 0x9F63
+0x7372 = 0x9F5F
+0x7373 = 0x9F60
+0x7374 = 0x9F61
+0x7375 = 0x9F66
+0x7376 = 0x9F67
+0x7377 = 0x9F6C
+0x7378 = 0x9F6A
+0x7379 = 0x9F77
+0x737A = 0x9F72
+0x737B = 0x9F76
+0x737C = 0x9F95
+0x737D = 0x9F9C
+0x737E = 0x9FA0
+0x7421 = 0x582F
+0x7422 = 0x69C7
+0x7423 = 0x9059
+0x7424 = 0x7464
+0x7425 = 0x51DC
+0x7426 = 0x7199
+END_MAP
diff --git a/enc/trans/JIS/JISX0208@MS%UCS.src b/enc/trans/JIS/JISX0208@MS%UCS.src
new file mode 100644
index 0000000000..768e037f5d
--- /dev/null
+++ b/enc/trans/JIS/JISX0208@MS%UCS.src
@@ -0,0 +1,6893 @@
+# $NetBSD: JISX0208@MS%UCS.src,v 1.1 2003/07/19 20:20:40 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0208:MS/UCS"
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x2121 = 0x3000
+0x2122 = 0x3001
+0x2123 = 0x3002
+0x2124 = 0xFF0C
+0x2125 = 0xFF0E
+0x2126 = 0x30FB
+0x2127 = 0xFF1A
+0x2128 = 0xFF1B
+0x2129 = 0xFF1F
+0x212A = 0xFF01
+0x212B = 0x309B
+0x212C = 0x309C
+0x212D = 0x00B4
+0x212E = 0xFF40
+0x212F = 0x00A8
+0x2130 = 0xFF3E
+0x2131 = 0xFFE3
+0x2132 = 0xFF3F
+0x2133 = 0x30FD
+0x2134 = 0x30FE
+0x2135 = 0x309D
+0x2136 = 0x309E
+0x2137 = 0x3003
+0x2138 = 0x4EDD
+0x2139 = 0x3005
+0x213A = 0x3006
+0x213B = 0x3007
+0x213C = 0x30FC
+0x213D = 0x2015
+0x213E = 0x2010
+0x213F = 0xFF0F
+0x2140 = 0xFF3C
+0x2141 = 0xFF5E
+0x2142 = 0x2225
+0x2143 = 0xFF5C
+0x2144 = 0x2026
+0x2145 = 0x2025
+0x2146 = 0x2018
+0x2147 = 0x2019
+0x2148 = 0x201C
+0x2149 = 0x201D
+0x214A = 0xFF08
+0x214B = 0xFF09
+0x214C = 0x3014
+0x214D = 0x3015
+0x214E = 0xFF3B
+0x214F = 0xFF3D
+0x2150 = 0xFF5B
+0x2151 = 0xFF5D
+0x2152 = 0x3008
+0x2153 = 0x3009
+0x2154 = 0x300A
+0x2155 = 0x300B
+0x2156 = 0x300C
+0x2157 = 0x300D
+0x2158 = 0x300E
+0x2159 = 0x300F
+0x215A = 0x3010
+0x215B = 0x3011
+0x215C = 0xFF0B
+0x215D = 0xFF0D
+0x215E = 0x00B1
+0x215F = 0x00D7
+0x2160 = 0x00F7
+0x2161 = 0xFF1D
+0x2162 = 0x2260
+0x2163 = 0xFF1C
+0x2164 = 0xFF1E
+0x2165 = 0x2266
+0x2166 = 0x2267
+0x2167 = 0x221E
+0x2168 = 0x2234
+0x2169 = 0x2642
+0x216A = 0x2640
+0x216B = 0x00B0
+0x216C = 0x2032
+0x216D = 0x2033
+0x216E = 0x2103
+0x216F = 0xFFE5
+0x2170 = 0xFF04
+0x2171 = 0xFFE0
+0x2172 = 0xFFE1
+0x2173 = 0xFF05
+0x2174 = 0xFF03
+0x2175 = 0xFF06
+0x2176 = 0xFF0A
+0x2177 = 0xFF20
+0x2178 = 0x00A7
+0x2179 = 0x2606
+0x217A = 0x2605
+0x217B = 0x25CB
+0x217C = 0x25CF
+0x217D = 0x25CE
+0x217E = 0x25C7
+0x2221 = 0x25C6
+0x2222 = 0x25A1
+0x2223 = 0x25A0
+0x2224 = 0x25B3
+0x2225 = 0x25B2
+0x2226 = 0x25BD
+0x2227 = 0x25BC
+0x2228 = 0x203B
+0x2229 = 0x3012
+0x222A = 0x2192
+0x222B = 0x2190
+0x222C = 0x2191
+0x222D = 0x2193
+0x222E = 0x3013
+0x223A = 0x2208
+0x223B = 0x220B
+0x223C = 0x2286
+0x223D = 0x2287
+0x223E = 0x2282
+0x223F = 0x2283
+0x2240 = 0x222A
+0x2241 = 0x2229
+0x224A = 0x2227
+0x224B = 0x2228
+0x224C = 0xFFE2
+0x224D = 0x21D2
+0x224E = 0x21D4
+0x224F = 0x2200
+0x2250 = 0x2203
+0x225C = 0x2220
+0x225D = 0x22A5
+0x225E = 0x2312
+0x225F = 0x2202
+0x2260 = 0x2207
+0x2261 = 0x2261
+0x2262 = 0x2252
+0x2263 = 0x226A
+0x2264 = 0x226B
+0x2265 = 0x221A
+0x2266 = 0x223D
+0x2267 = 0x221D
+0x2268 = 0x2235
+0x2269 = 0x222B
+0x226A = 0x222C
+0x2272 = 0x212B
+0x2273 = 0x2030
+0x2274 = 0x266F
+0x2275 = 0x266D
+0x2276 = 0x266A
+0x2277 = 0x2020
+0x2278 = 0x2021
+0x2279 = 0x00B6
+0x227E = 0x25EF
+0x2330 = 0xFF10
+0x2331 = 0xFF11
+0x2332 = 0xFF12
+0x2333 = 0xFF13
+0x2334 = 0xFF14
+0x2335 = 0xFF15
+0x2336 = 0xFF16
+0x2337 = 0xFF17
+0x2338 = 0xFF18
+0x2339 = 0xFF19
+0x2341 = 0xFF21
+0x2342 = 0xFF22
+0x2343 = 0xFF23
+0x2344 = 0xFF24
+0x2345 = 0xFF25
+0x2346 = 0xFF26
+0x2347 = 0xFF27
+0x2348 = 0xFF28
+0x2349 = 0xFF29
+0x234A = 0xFF2A
+0x234B = 0xFF2B
+0x234C = 0xFF2C
+0x234D = 0xFF2D
+0x234E = 0xFF2E
+0x234F = 0xFF2F
+0x2350 = 0xFF30
+0x2351 = 0xFF31
+0x2352 = 0xFF32
+0x2353 = 0xFF33
+0x2354 = 0xFF34
+0x2355 = 0xFF35
+0x2356 = 0xFF36
+0x2357 = 0xFF37
+0x2358 = 0xFF38
+0x2359 = 0xFF39
+0x235A = 0xFF3A
+0x2361 = 0xFF41
+0x2362 = 0xFF42
+0x2363 = 0xFF43
+0x2364 = 0xFF44
+0x2365 = 0xFF45
+0x2366 = 0xFF46
+0x2367 = 0xFF47
+0x2368 = 0xFF48
+0x2369 = 0xFF49
+0x236A = 0xFF4A
+0x236B = 0xFF4B
+0x236C = 0xFF4C
+0x236D = 0xFF4D
+0x236E = 0xFF4E
+0x236F = 0xFF4F
+0x2370 = 0xFF50
+0x2371 = 0xFF51
+0x2372 = 0xFF52
+0x2373 = 0xFF53
+0x2374 = 0xFF54
+0x2375 = 0xFF55
+0x2376 = 0xFF56
+0x2377 = 0xFF57
+0x2378 = 0xFF58
+0x2379 = 0xFF59
+0x237A = 0xFF5A
+0x2421 = 0x3041
+0x2422 = 0x3042
+0x2423 = 0x3043
+0x2424 = 0x3044
+0x2425 = 0x3045
+0x2426 = 0x3046
+0x2427 = 0x3047
+0x2428 = 0x3048
+0x2429 = 0x3049
+0x242A = 0x304A
+0x242B = 0x304B
+0x242C = 0x304C
+0x242D = 0x304D
+0x242E = 0x304E
+0x242F = 0x304F
+0x2430 = 0x3050
+0x2431 = 0x3051
+0x2432 = 0x3052
+0x2433 = 0x3053
+0x2434 = 0x3054
+0x2435 = 0x3055
+0x2436 = 0x3056
+0x2437 = 0x3057
+0x2438 = 0x3058
+0x2439 = 0x3059
+0x243A = 0x305A
+0x243B = 0x305B
+0x243C = 0x305C
+0x243D = 0x305D
+0x243E = 0x305E
+0x243F = 0x305F
+0x2440 = 0x3060
+0x2441 = 0x3061
+0x2442 = 0x3062
+0x2443 = 0x3063
+0x2444 = 0x3064
+0x2445 = 0x3065
+0x2446 = 0x3066
+0x2447 = 0x3067
+0x2448 = 0x3068
+0x2449 = 0x3069
+0x244A = 0x306A
+0x244B = 0x306B
+0x244C = 0x306C
+0x244D = 0x306D
+0x244E = 0x306E
+0x244F = 0x306F
+0x2450 = 0x3070
+0x2451 = 0x3071
+0x2452 = 0x3072
+0x2453 = 0x3073
+0x2454 = 0x3074
+0x2455 = 0x3075
+0x2456 = 0x3076
+0x2457 = 0x3077
+0x2458 = 0x3078
+0x2459 = 0x3079
+0x245A = 0x307A
+0x245B = 0x307B
+0x245C = 0x307C
+0x245D = 0x307D
+0x245E = 0x307E
+0x245F = 0x307F
+0x2460 = 0x3080
+0x2461 = 0x3081
+0x2462 = 0x3082
+0x2463 = 0x3083
+0x2464 = 0x3084
+0x2465 = 0x3085
+0x2466 = 0x3086
+0x2467 = 0x3087
+0x2468 = 0x3088
+0x2469 = 0x3089
+0x246A = 0x308A
+0x246B = 0x308B
+0x246C = 0x308C
+0x246D = 0x308D
+0x246E = 0x308E
+0x246F = 0x308F
+0x2470 = 0x3090
+0x2471 = 0x3091
+0x2472 = 0x3092
+0x2473 = 0x3093
+0x2521 = 0x30A1
+0x2522 = 0x30A2
+0x2523 = 0x30A3
+0x2524 = 0x30A4
+0x2525 = 0x30A5
+0x2526 = 0x30A6
+0x2527 = 0x30A7
+0x2528 = 0x30A8
+0x2529 = 0x30A9
+0x252A = 0x30AA
+0x252B = 0x30AB
+0x252C = 0x30AC
+0x252D = 0x30AD
+0x252E = 0x30AE
+0x252F = 0x30AF
+0x2530 = 0x30B0
+0x2531 = 0x30B1
+0x2532 = 0x30B2
+0x2533 = 0x30B3
+0x2534 = 0x30B4
+0x2535 = 0x30B5
+0x2536 = 0x30B6
+0x2537 = 0x30B7
+0x2538 = 0x30B8
+0x2539 = 0x30B9
+0x253A = 0x30BA
+0x253B = 0x30BB
+0x253C = 0x30BC
+0x253D = 0x30BD
+0x253E = 0x30BE
+0x253F = 0x30BF
+0x2540 = 0x30C0
+0x2541 = 0x30C1
+0x2542 = 0x30C2
+0x2543 = 0x30C3
+0x2544 = 0x30C4
+0x2545 = 0x30C5
+0x2546 = 0x30C6
+0x2547 = 0x30C7
+0x2548 = 0x30C8
+0x2549 = 0x30C9
+0x254A = 0x30CA
+0x254B = 0x30CB
+0x254C = 0x30CC
+0x254D = 0x30CD
+0x254E = 0x30CE
+0x254F = 0x30CF
+0x2550 = 0x30D0
+0x2551 = 0x30D1
+0x2552 = 0x30D2
+0x2553 = 0x30D3
+0x2554 = 0x30D4
+0x2555 = 0x30D5
+0x2556 = 0x30D6
+0x2557 = 0x30D7
+0x2558 = 0x30D8
+0x2559 = 0x30D9
+0x255A = 0x30DA
+0x255B = 0x30DB
+0x255C = 0x30DC
+0x255D = 0x30DD
+0x255E = 0x30DE
+0x255F = 0x30DF
+0x2560 = 0x30E0
+0x2561 = 0x30E1
+0x2562 = 0x30E2
+0x2563 = 0x30E3
+0x2564 = 0x30E4
+0x2565 = 0x30E5
+0x2566 = 0x30E6
+0x2567 = 0x30E7
+0x2568 = 0x30E8
+0x2569 = 0x30E9
+0x256A = 0x30EA
+0x256B = 0x30EB
+0x256C = 0x30EC
+0x256D = 0x30ED
+0x256E = 0x30EE
+0x256F = 0x30EF
+0x2570 = 0x30F0
+0x2571 = 0x30F1
+0x2572 = 0x30F2
+0x2573 = 0x30F3
+0x2574 = 0x30F4
+0x2575 = 0x30F5
+0x2576 = 0x30F6
+0x2621 = 0x0391
+0x2622 = 0x0392
+0x2623 = 0x0393
+0x2624 = 0x0394
+0x2625 = 0x0395
+0x2626 = 0x0396
+0x2627 = 0x0397
+0x2628 = 0x0398
+0x2629 = 0x0399
+0x262A = 0x039A
+0x262B = 0x039B
+0x262C = 0x039C
+0x262D = 0x039D
+0x262E = 0x039E
+0x262F = 0x039F
+0x2630 = 0x03A0
+0x2631 = 0x03A1
+0x2632 = 0x03A3
+0x2633 = 0x03A4
+0x2634 = 0x03A5
+0x2635 = 0x03A6
+0x2636 = 0x03A7
+0x2637 = 0x03A8
+0x2638 = 0x03A9
+0x2641 = 0x03B1
+0x2642 = 0x03B2
+0x2643 = 0x03B3
+0x2644 = 0x03B4
+0x2645 = 0x03B5
+0x2646 = 0x03B6
+0x2647 = 0x03B7
+0x2648 = 0x03B8
+0x2649 = 0x03B9
+0x264A = 0x03BA
+0x264B = 0x03BB
+0x264C = 0x03BC
+0x264D = 0x03BD
+0x264E = 0x03BE
+0x264F = 0x03BF
+0x2650 = 0x03C0
+0x2651 = 0x03C1
+0x2652 = 0x03C3
+0x2653 = 0x03C4
+0x2654 = 0x03C5
+0x2655 = 0x03C6
+0x2656 = 0x03C7
+0x2657 = 0x03C8
+0x2658 = 0x03C9
+0x2721 = 0x0410
+0x2722 = 0x0411
+0x2723 = 0x0412
+0x2724 = 0x0413
+0x2725 = 0x0414
+0x2726 = 0x0415
+0x2727 = 0x0401
+0x2728 = 0x0416
+0x2729 = 0x0417
+0x272A = 0x0418
+0x272B = 0x0419
+0x272C = 0x041A
+0x272D = 0x041B
+0x272E = 0x041C
+0x272F = 0x041D
+0x2730 = 0x041E
+0x2731 = 0x041F
+0x2732 = 0x0420
+0x2733 = 0x0421
+0x2734 = 0x0422
+0x2735 = 0x0423
+0x2736 = 0x0424
+0x2737 = 0x0425
+0x2738 = 0x0426
+0x2739 = 0x0427
+0x273A = 0x0428
+0x273B = 0x0429
+0x273C = 0x042A
+0x273D = 0x042B
+0x273E = 0x042C
+0x273F = 0x042D
+0x2740 = 0x042E
+0x2741 = 0x042F
+0x2751 = 0x0430
+0x2752 = 0x0431
+0x2753 = 0x0432
+0x2754 = 0x0433
+0x2755 = 0x0434
+0x2756 = 0x0435
+0x2757 = 0x0451
+0x2758 = 0x0436
+0x2759 = 0x0437
+0x275A = 0x0438
+0x275B = 0x0439
+0x275C = 0x043A
+0x275D = 0x043B
+0x275E = 0x043C
+0x275F = 0x043D
+0x2760 = 0x043E
+0x2761 = 0x043F
+0x2762 = 0x0440
+0x2763 = 0x0441
+0x2764 = 0x0442
+0x2765 = 0x0443
+0x2766 = 0x0444
+0x2767 = 0x0445
+0x2768 = 0x0446
+0x2769 = 0x0447
+0x276A = 0x0448
+0x276B = 0x0449
+0x276C = 0x044A
+0x276D = 0x044B
+0x276E = 0x044C
+0x276F = 0x044D
+0x2770 = 0x044E
+0x2771 = 0x044F
+0x2821 = 0x2500
+0x2822 = 0x2502
+0x2823 = 0x250C
+0x2824 = 0x2510
+0x2825 = 0x2518
+0x2826 = 0x2514
+0x2827 = 0x251C
+0x2828 = 0x252C
+0x2829 = 0x2524
+0x282A = 0x2534
+0x282B = 0x253C
+0x282C = 0x2501
+0x282D = 0x2503
+0x282E = 0x250F
+0x282F = 0x2513
+0x2830 = 0x251B
+0x2831 = 0x2517
+0x2832 = 0x2523
+0x2833 = 0x2533
+0x2834 = 0x252B
+0x2835 = 0x253B
+0x2836 = 0x254B
+0x2837 = 0x2520
+0x2838 = 0x252F
+0x2839 = 0x2528
+0x283A = 0x2537
+0x283B = 0x253F
+0x283C = 0x251D
+0x283D = 0x2530
+0x283E = 0x2525
+0x283F = 0x2538
+0x2840 = 0x2542
+0x3021 = 0x4E9C
+0x3022 = 0x5516
+0x3023 = 0x5A03
+0x3024 = 0x963F
+0x3025 = 0x54C0
+0x3026 = 0x611B
+0x3027 = 0x6328
+0x3028 = 0x59F6
+0x3029 = 0x9022
+0x302A = 0x8475
+0x302B = 0x831C
+0x302C = 0x7A50
+0x302D = 0x60AA
+0x302E = 0x63E1
+0x302F = 0x6E25
+0x3030 = 0x65ED
+0x3031 = 0x8466
+0x3032 = 0x82A6
+0x3033 = 0x9BF5
+0x3034 = 0x6893
+0x3035 = 0x5727
+0x3036 = 0x65A1
+0x3037 = 0x6271
+0x3038 = 0x5B9B
+0x3039 = 0x59D0
+0x303A = 0x867B
+0x303B = 0x98F4
+0x303C = 0x7D62
+0x303D = 0x7DBE
+0x303E = 0x9B8E
+0x303F = 0x6216
+0x3040 = 0x7C9F
+0x3041 = 0x88B7
+0x3042 = 0x5B89
+0x3043 = 0x5EB5
+0x3044 = 0x6309
+0x3045 = 0x6697
+0x3046 = 0x6848
+0x3047 = 0x95C7
+0x3048 = 0x978D
+0x3049 = 0x674F
+0x304A = 0x4EE5
+0x304B = 0x4F0A
+0x304C = 0x4F4D
+0x304D = 0x4F9D
+0x304E = 0x5049
+0x304F = 0x56F2
+0x3050 = 0x5937
+0x3051 = 0x59D4
+0x3052 = 0x5A01
+0x3053 = 0x5C09
+0x3054 = 0x60DF
+0x3055 = 0x610F
+0x3056 = 0x6170
+0x3057 = 0x6613
+0x3058 = 0x6905
+0x3059 = 0x70BA
+0x305A = 0x754F
+0x305B = 0x7570
+0x305C = 0x79FB
+0x305D = 0x7DAD
+0x305E = 0x7DEF
+0x305F = 0x80C3
+0x3060 = 0x840E
+0x3061 = 0x8863
+0x3062 = 0x8B02
+0x3063 = 0x9055
+0x3064 = 0x907A
+0x3065 = 0x533B
+0x3066 = 0x4E95
+0x3067 = 0x4EA5
+0x3068 = 0x57DF
+0x3069 = 0x80B2
+0x306A = 0x90C1
+0x306B = 0x78EF
+0x306C = 0x4E00
+0x306D = 0x58F1
+0x306E = 0x6EA2
+0x306F = 0x9038
+0x3070 = 0x7A32
+0x3071 = 0x8328
+0x3072 = 0x828B
+0x3073 = 0x9C2F
+0x3074 = 0x5141
+0x3075 = 0x5370
+0x3076 = 0x54BD
+0x3077 = 0x54E1
+0x3078 = 0x56E0
+0x3079 = 0x59FB
+0x307A = 0x5F15
+0x307B = 0x98F2
+0x307C = 0x6DEB
+0x307D = 0x80E4
+0x307E = 0x852D
+0x3121 = 0x9662
+0x3122 = 0x9670
+0x3123 = 0x96A0
+0x3124 = 0x97FB
+0x3125 = 0x540B
+0x3126 = 0x53F3
+0x3127 = 0x5B87
+0x3128 = 0x70CF
+0x3129 = 0x7FBD
+0x312A = 0x8FC2
+0x312B = 0x96E8
+0x312C = 0x536F
+0x312D = 0x9D5C
+0x312E = 0x7ABA
+0x312F = 0x4E11
+0x3130 = 0x7893
+0x3131 = 0x81FC
+0x3132 = 0x6E26
+0x3133 = 0x5618
+0x3134 = 0x5504
+0x3135 = 0x6B1D
+0x3136 = 0x851A
+0x3137 = 0x9C3B
+0x3138 = 0x59E5
+0x3139 = 0x53A9
+0x313A = 0x6D66
+0x313B = 0x74DC
+0x313C = 0x958F
+0x313D = 0x5642
+0x313E = 0x4E91
+0x313F = 0x904B
+0x3140 = 0x96F2
+0x3141 = 0x834F
+0x3142 = 0x990C
+0x3143 = 0x53E1
+0x3144 = 0x55B6
+0x3145 = 0x5B30
+0x3146 = 0x5F71
+0x3147 = 0x6620
+0x3148 = 0x66F3
+0x3149 = 0x6804
+0x314A = 0x6C38
+0x314B = 0x6CF3
+0x314C = 0x6D29
+0x314D = 0x745B
+0x314E = 0x76C8
+0x314F = 0x7A4E
+0x3150 = 0x9834
+0x3151 = 0x82F1
+0x3152 = 0x885B
+0x3153 = 0x8A60
+0x3154 = 0x92ED
+0x3155 = 0x6DB2
+0x3156 = 0x75AB
+0x3157 = 0x76CA
+0x3158 = 0x99C5
+0x3159 = 0x60A6
+0x315A = 0x8B01
+0x315B = 0x8D8A
+0x315C = 0x95B2
+0x315D = 0x698E
+0x315E = 0x53AD
+0x315F = 0x5186
+0x3160 = 0x5712
+0x3161 = 0x5830
+0x3162 = 0x5944
+0x3163 = 0x5BB4
+0x3164 = 0x5EF6
+0x3165 = 0x6028
+0x3166 = 0x63A9
+0x3167 = 0x63F4
+0x3168 = 0x6CBF
+0x3169 = 0x6F14
+0x316A = 0x708E
+0x316B = 0x7114
+0x316C = 0x7159
+0x316D = 0x71D5
+0x316E = 0x733F
+0x316F = 0x7E01
+0x3170 = 0x8276
+0x3171 = 0x82D1
+0x3172 = 0x8597
+0x3173 = 0x9060
+0x3174 = 0x925B
+0x3175 = 0x9D1B
+0x3176 = 0x5869
+0x3177 = 0x65BC
+0x3178 = 0x6C5A
+0x3179 = 0x7525
+0x317A = 0x51F9
+0x317B = 0x592E
+0x317C = 0x5965
+0x317D = 0x5F80
+0x317E = 0x5FDC
+0x3221 = 0x62BC
+0x3222 = 0x65FA
+0x3223 = 0x6A2A
+0x3224 = 0x6B27
+0x3225 = 0x6BB4
+0x3226 = 0x738B
+0x3227 = 0x7FC1
+0x3228 = 0x8956
+0x3229 = 0x9D2C
+0x322A = 0x9D0E
+0x322B = 0x9EC4
+0x322C = 0x5CA1
+0x322D = 0x6C96
+0x322E = 0x837B
+0x322F = 0x5104
+0x3230 = 0x5C4B
+0x3231 = 0x61B6
+0x3232 = 0x81C6
+0x3233 = 0x6876
+0x3234 = 0x7261
+0x3235 = 0x4E59
+0x3236 = 0x4FFA
+0x3237 = 0x5378
+0x3238 = 0x6069
+0x3239 = 0x6E29
+0x323A = 0x7A4F
+0x323B = 0x97F3
+0x323C = 0x4E0B
+0x323D = 0x5316
+0x323E = 0x4EEE
+0x323F = 0x4F55
+0x3240 = 0x4F3D
+0x3241 = 0x4FA1
+0x3242 = 0x4F73
+0x3243 = 0x52A0
+0x3244 = 0x53EF
+0x3245 = 0x5609
+0x3246 = 0x590F
+0x3247 = 0x5AC1
+0x3248 = 0x5BB6
+0x3249 = 0x5BE1
+0x324A = 0x79D1
+0x324B = 0x6687
+0x324C = 0x679C
+0x324D = 0x67B6
+0x324E = 0x6B4C
+0x324F = 0x6CB3
+0x3250 = 0x706B
+0x3251 = 0x73C2
+0x3252 = 0x798D
+0x3253 = 0x79BE
+0x3254 = 0x7A3C
+0x3255 = 0x7B87
+0x3256 = 0x82B1
+0x3257 = 0x82DB
+0x3258 = 0x8304
+0x3259 = 0x8377
+0x325A = 0x83EF
+0x325B = 0x83D3
+0x325C = 0x8766
+0x325D = 0x8AB2
+0x325E = 0x5629
+0x325F = 0x8CA8
+0x3260 = 0x8FE6
+0x3261 = 0x904E
+0x3262 = 0x971E
+0x3263 = 0x868A
+0x3264 = 0x4FC4
+0x3265 = 0x5CE8
+0x3266 = 0x6211
+0x3267 = 0x7259
+0x3268 = 0x753B
+0x3269 = 0x81E5
+0x326A = 0x82BD
+0x326B = 0x86FE
+0x326C = 0x8CC0
+0x326D = 0x96C5
+0x326E = 0x9913
+0x326F = 0x99D5
+0x3270 = 0x4ECB
+0x3271 = 0x4F1A
+0x3272 = 0x89E3
+0x3273 = 0x56DE
+0x3274 = 0x584A
+0x3275 = 0x58CA
+0x3276 = 0x5EFB
+0x3277 = 0x5FEB
+0x3278 = 0x602A
+0x3279 = 0x6094
+0x327A = 0x6062
+0x327B = 0x61D0
+0x327C = 0x6212
+0x327D = 0x62D0
+0x327E = 0x6539
+0x3321 = 0x9B41
+0x3322 = 0x6666
+0x3323 = 0x68B0
+0x3324 = 0x6D77
+0x3325 = 0x7070
+0x3326 = 0x754C
+0x3327 = 0x7686
+0x3328 = 0x7D75
+0x3329 = 0x82A5
+0x332A = 0x87F9
+0x332B = 0x958B
+0x332C = 0x968E
+0x332D = 0x8C9D
+0x332E = 0x51F1
+0x332F = 0x52BE
+0x3330 = 0x5916
+0x3331 = 0x54B3
+0x3332 = 0x5BB3
+0x3333 = 0x5D16
+0x3334 = 0x6168
+0x3335 = 0x6982
+0x3336 = 0x6DAF
+0x3337 = 0x788D
+0x3338 = 0x84CB
+0x3339 = 0x8857
+0x333A = 0x8A72
+0x333B = 0x93A7
+0x333C = 0x9AB8
+0x333D = 0x6D6C
+0x333E = 0x99A8
+0x333F = 0x86D9
+0x3340 = 0x57A3
+0x3341 = 0x67FF
+0x3342 = 0x86CE
+0x3343 = 0x920E
+0x3344 = 0x5283
+0x3345 = 0x5687
+0x3346 = 0x5404
+0x3347 = 0x5ED3
+0x3348 = 0x62E1
+0x3349 = 0x64B9
+0x334A = 0x683C
+0x334B = 0x6838
+0x334C = 0x6BBB
+0x334D = 0x7372
+0x334E = 0x78BA
+0x334F = 0x7A6B
+0x3350 = 0x899A
+0x3351 = 0x89D2
+0x3352 = 0x8D6B
+0x3353 = 0x8F03
+0x3354 = 0x90ED
+0x3355 = 0x95A3
+0x3356 = 0x9694
+0x3357 = 0x9769
+0x3358 = 0x5B66
+0x3359 = 0x5CB3
+0x335A = 0x697D
+0x335B = 0x984D
+0x335C = 0x984E
+0x335D = 0x639B
+0x335E = 0x7B20
+0x335F = 0x6A2B
+0x3360 = 0x6A7F
+0x3361 = 0x68B6
+0x3362 = 0x9C0D
+0x3363 = 0x6F5F
+0x3364 = 0x5272
+0x3365 = 0x559D
+0x3366 = 0x6070
+0x3367 = 0x62EC
+0x3368 = 0x6D3B
+0x3369 = 0x6E07
+0x336A = 0x6ED1
+0x336B = 0x845B
+0x336C = 0x8910
+0x336D = 0x8F44
+0x336E = 0x4E14
+0x336F = 0x9C39
+0x3370 = 0x53F6
+0x3371 = 0x691B
+0x3372 = 0x6A3A
+0x3373 = 0x9784
+0x3374 = 0x682A
+0x3375 = 0x515C
+0x3376 = 0x7AC3
+0x3377 = 0x84B2
+0x3378 = 0x91DC
+0x3379 = 0x938C
+0x337A = 0x565B
+0x337B = 0x9D28
+0x337C = 0x6822
+0x337D = 0x8305
+0x337E = 0x8431
+0x3421 = 0x7CA5
+0x3422 = 0x5208
+0x3423 = 0x82C5
+0x3424 = 0x74E6
+0x3425 = 0x4E7E
+0x3426 = 0x4F83
+0x3427 = 0x51A0
+0x3428 = 0x5BD2
+0x3429 = 0x520A
+0x342A = 0x52D8
+0x342B = 0x52E7
+0x342C = 0x5DFB
+0x342D = 0x559A
+0x342E = 0x582A
+0x342F = 0x59E6
+0x3430 = 0x5B8C
+0x3431 = 0x5B98
+0x3432 = 0x5BDB
+0x3433 = 0x5E72
+0x3434 = 0x5E79
+0x3435 = 0x60A3
+0x3436 = 0x611F
+0x3437 = 0x6163
+0x3438 = 0x61BE
+0x3439 = 0x63DB
+0x343A = 0x6562
+0x343B = 0x67D1
+0x343C = 0x6853
+0x343D = 0x68FA
+0x343E = 0x6B3E
+0x343F = 0x6B53
+0x3440 = 0x6C57
+0x3441 = 0x6F22
+0x3442 = 0x6F97
+0x3443 = 0x6F45
+0x3444 = 0x74B0
+0x3445 = 0x7518
+0x3446 = 0x76E3
+0x3447 = 0x770B
+0x3448 = 0x7AFF
+0x3449 = 0x7BA1
+0x344A = 0x7C21
+0x344B = 0x7DE9
+0x344C = 0x7F36
+0x344D = 0x7FF0
+0x344E = 0x809D
+0x344F = 0x8266
+0x3450 = 0x839E
+0x3451 = 0x89B3
+0x3452 = 0x8ACC
+0x3453 = 0x8CAB
+0x3454 = 0x9084
+0x3455 = 0x9451
+0x3456 = 0x9593
+0x3457 = 0x9591
+0x3458 = 0x95A2
+0x3459 = 0x9665
+0x345A = 0x97D3
+0x345B = 0x9928
+0x345C = 0x8218
+0x345D = 0x4E38
+0x345E = 0x542B
+0x345F = 0x5CB8
+0x3460 = 0x5DCC
+0x3461 = 0x73A9
+0x3462 = 0x764C
+0x3463 = 0x773C
+0x3464 = 0x5CA9
+0x3465 = 0x7FEB
+0x3466 = 0x8D0B
+0x3467 = 0x96C1
+0x3468 = 0x9811
+0x3469 = 0x9854
+0x346A = 0x9858
+0x346B = 0x4F01
+0x346C = 0x4F0E
+0x346D = 0x5371
+0x346E = 0x559C
+0x346F = 0x5668
+0x3470 = 0x57FA
+0x3471 = 0x5947
+0x3472 = 0x5B09
+0x3473 = 0x5BC4
+0x3474 = 0x5C90
+0x3475 = 0x5E0C
+0x3476 = 0x5E7E
+0x3477 = 0x5FCC
+0x3478 = 0x63EE
+0x3479 = 0x673A
+0x347A = 0x65D7
+0x347B = 0x65E2
+0x347C = 0x671F
+0x347D = 0x68CB
+0x347E = 0x68C4
+0x3521 = 0x6A5F
+0x3522 = 0x5E30
+0x3523 = 0x6BC5
+0x3524 = 0x6C17
+0x3525 = 0x6C7D
+0x3526 = 0x757F
+0x3527 = 0x7948
+0x3528 = 0x5B63
+0x3529 = 0x7A00
+0x352A = 0x7D00
+0x352B = 0x5FBD
+0x352C = 0x898F
+0x352D = 0x8A18
+0x352E = 0x8CB4
+0x352F = 0x8D77
+0x3530 = 0x8ECC
+0x3531 = 0x8F1D
+0x3532 = 0x98E2
+0x3533 = 0x9A0E
+0x3534 = 0x9B3C
+0x3535 = 0x4E80
+0x3536 = 0x507D
+0x3537 = 0x5100
+0x3538 = 0x5993
+0x3539 = 0x5B9C
+0x353A = 0x622F
+0x353B = 0x6280
+0x353C = 0x64EC
+0x353D = 0x6B3A
+0x353E = 0x72A0
+0x353F = 0x7591
+0x3540 = 0x7947
+0x3541 = 0x7FA9
+0x3542 = 0x87FB
+0x3543 = 0x8ABC
+0x3544 = 0x8B70
+0x3545 = 0x63AC
+0x3546 = 0x83CA
+0x3547 = 0x97A0
+0x3548 = 0x5409
+0x3549 = 0x5403
+0x354A = 0x55AB
+0x354B = 0x6854
+0x354C = 0x6A58
+0x354D = 0x8A70
+0x354E = 0x7827
+0x354F = 0x6775
+0x3550 = 0x9ECD
+0x3551 = 0x5374
+0x3552 = 0x5BA2
+0x3553 = 0x811A
+0x3554 = 0x8650
+0x3555 = 0x9006
+0x3556 = 0x4E18
+0x3557 = 0x4E45
+0x3558 = 0x4EC7
+0x3559 = 0x4F11
+0x355A = 0x53CA
+0x355B = 0x5438
+0x355C = 0x5BAE
+0x355D = 0x5F13
+0x355E = 0x6025
+0x355F = 0x6551
+0x3560 = 0x673D
+0x3561 = 0x6C42
+0x3562 = 0x6C72
+0x3563 = 0x6CE3
+0x3564 = 0x7078
+0x3565 = 0x7403
+0x3566 = 0x7A76
+0x3567 = 0x7AAE
+0x3568 = 0x7B08
+0x3569 = 0x7D1A
+0x356A = 0x7CFE
+0x356B = 0x7D66
+0x356C = 0x65E7
+0x356D = 0x725B
+0x356E = 0x53BB
+0x356F = 0x5C45
+0x3570 = 0x5DE8
+0x3571 = 0x62D2
+0x3572 = 0x62E0
+0x3573 = 0x6319
+0x3574 = 0x6E20
+0x3575 = 0x865A
+0x3576 = 0x8A31
+0x3577 = 0x8DDD
+0x3578 = 0x92F8
+0x3579 = 0x6F01
+0x357A = 0x79A6
+0x357B = 0x9B5A
+0x357C = 0x4EA8
+0x357D = 0x4EAB
+0x357E = 0x4EAC
+0x3621 = 0x4F9B
+0x3622 = 0x4FA0
+0x3623 = 0x50D1
+0x3624 = 0x5147
+0x3625 = 0x7AF6
+0x3626 = 0x5171
+0x3627 = 0x51F6
+0x3628 = 0x5354
+0x3629 = 0x5321
+0x362A = 0x537F
+0x362B = 0x53EB
+0x362C = 0x55AC
+0x362D = 0x5883
+0x362E = 0x5CE1
+0x362F = 0x5F37
+0x3630 = 0x5F4A
+0x3631 = 0x602F
+0x3632 = 0x6050
+0x3633 = 0x606D
+0x3634 = 0x631F
+0x3635 = 0x6559
+0x3636 = 0x6A4B
+0x3637 = 0x6CC1
+0x3638 = 0x72C2
+0x3639 = 0x72ED
+0x363A = 0x77EF
+0x363B = 0x80F8
+0x363C = 0x8105
+0x363D = 0x8208
+0x363E = 0x854E
+0x363F = 0x90F7
+0x3640 = 0x93E1
+0x3641 = 0x97FF
+0x3642 = 0x9957
+0x3643 = 0x9A5A
+0x3644 = 0x4EF0
+0x3645 = 0x51DD
+0x3646 = 0x5C2D
+0x3647 = 0x6681
+0x3648 = 0x696D
+0x3649 = 0x5C40
+0x364A = 0x66F2
+0x364B = 0x6975
+0x364C = 0x7389
+0x364D = 0x6850
+0x364E = 0x7C81
+0x364F = 0x50C5
+0x3650 = 0x52E4
+0x3651 = 0x5747
+0x3652 = 0x5DFE
+0x3653 = 0x9326
+0x3654 = 0x65A4
+0x3655 = 0x6B23
+0x3656 = 0x6B3D
+0x3657 = 0x7434
+0x3658 = 0x7981
+0x3659 = 0x79BD
+0x365A = 0x7B4B
+0x365B = 0x7DCA
+0x365C = 0x82B9
+0x365D = 0x83CC
+0x365E = 0x887F
+0x365F = 0x895F
+0x3660 = 0x8B39
+0x3661 = 0x8FD1
+0x3662 = 0x91D1
+0x3663 = 0x541F
+0x3664 = 0x9280
+0x3665 = 0x4E5D
+0x3666 = 0x5036
+0x3667 = 0x53E5
+0x3668 = 0x533A
+0x3669 = 0x72D7
+0x366A = 0x7396
+0x366B = 0x77E9
+0x366C = 0x82E6
+0x366D = 0x8EAF
+0x366E = 0x99C6
+0x366F = 0x99C8
+0x3670 = 0x99D2
+0x3671 = 0x5177
+0x3672 = 0x611A
+0x3673 = 0x865E
+0x3674 = 0x55B0
+0x3675 = 0x7A7A
+0x3676 = 0x5076
+0x3677 = 0x5BD3
+0x3678 = 0x9047
+0x3679 = 0x9685
+0x367A = 0x4E32
+0x367B = 0x6ADB
+0x367C = 0x91E7
+0x367D = 0x5C51
+0x367E = 0x5C48
+0x3721 = 0x6398
+0x3722 = 0x7A9F
+0x3723 = 0x6C93
+0x3724 = 0x9774
+0x3725 = 0x8F61
+0x3726 = 0x7AAA
+0x3727 = 0x718A
+0x3728 = 0x9688
+0x3729 = 0x7C82
+0x372A = 0x6817
+0x372B = 0x7E70
+0x372C = 0x6851
+0x372D = 0x936C
+0x372E = 0x52F2
+0x372F = 0x541B
+0x3730 = 0x85AB
+0x3731 = 0x8A13
+0x3732 = 0x7FA4
+0x3733 = 0x8ECD
+0x3734 = 0x90E1
+0x3735 = 0x5366
+0x3736 = 0x8888
+0x3737 = 0x7941
+0x3738 = 0x4FC2
+0x3739 = 0x50BE
+0x373A = 0x5211
+0x373B = 0x5144
+0x373C = 0x5553
+0x373D = 0x572D
+0x373E = 0x73EA
+0x373F = 0x578B
+0x3740 = 0x5951
+0x3741 = 0x5F62
+0x3742 = 0x5F84
+0x3743 = 0x6075
+0x3744 = 0x6176
+0x3745 = 0x6167
+0x3746 = 0x61A9
+0x3747 = 0x63B2
+0x3748 = 0x643A
+0x3749 = 0x656C
+0x374A = 0x666F
+0x374B = 0x6842
+0x374C = 0x6E13
+0x374D = 0x7566
+0x374E = 0x7A3D
+0x374F = 0x7CFB
+0x3750 = 0x7D4C
+0x3751 = 0x7D99
+0x3752 = 0x7E4B
+0x3753 = 0x7F6B
+0x3754 = 0x830E
+0x3755 = 0x834A
+0x3756 = 0x86CD
+0x3757 = 0x8A08
+0x3758 = 0x8A63
+0x3759 = 0x8B66
+0x375A = 0x8EFD
+0x375B = 0x981A
+0x375C = 0x9D8F
+0x375D = 0x82B8
+0x375E = 0x8FCE
+0x375F = 0x9BE8
+0x3760 = 0x5287
+0x3761 = 0x621F
+0x3762 = 0x6483
+0x3763 = 0x6FC0
+0x3764 = 0x9699
+0x3765 = 0x6841
+0x3766 = 0x5091
+0x3767 = 0x6B20
+0x3768 = 0x6C7A
+0x3769 = 0x6F54
+0x376A = 0x7A74
+0x376B = 0x7D50
+0x376C = 0x8840
+0x376D = 0x8A23
+0x376E = 0x6708
+0x376F = 0x4EF6
+0x3770 = 0x5039
+0x3771 = 0x5026
+0x3772 = 0x5065
+0x3773 = 0x517C
+0x3774 = 0x5238
+0x3775 = 0x5263
+0x3776 = 0x55A7
+0x3777 = 0x570F
+0x3778 = 0x5805
+0x3779 = 0x5ACC
+0x377A = 0x5EFA
+0x377B = 0x61B2
+0x377C = 0x61F8
+0x377D = 0x62F3
+0x377E = 0x6372
+0x3821 = 0x691C
+0x3822 = 0x6A29
+0x3823 = 0x727D
+0x3824 = 0x72AC
+0x3825 = 0x732E
+0x3826 = 0x7814
+0x3827 = 0x786F
+0x3828 = 0x7D79
+0x3829 = 0x770C
+0x382A = 0x80A9
+0x382B = 0x898B
+0x382C = 0x8B19
+0x382D = 0x8CE2
+0x382E = 0x8ED2
+0x382F = 0x9063
+0x3830 = 0x9375
+0x3831 = 0x967A
+0x3832 = 0x9855
+0x3833 = 0x9A13
+0x3834 = 0x9E78
+0x3835 = 0x5143
+0x3836 = 0x539F
+0x3837 = 0x53B3
+0x3838 = 0x5E7B
+0x3839 = 0x5F26
+0x383A = 0x6E1B
+0x383B = 0x6E90
+0x383C = 0x7384
+0x383D = 0x73FE
+0x383E = 0x7D43
+0x383F = 0x8237
+0x3840 = 0x8A00
+0x3841 = 0x8AFA
+0x3842 = 0x9650
+0x3843 = 0x4E4E
+0x3844 = 0x500B
+0x3845 = 0x53E4
+0x3846 = 0x547C
+0x3847 = 0x56FA
+0x3848 = 0x59D1
+0x3849 = 0x5B64
+0x384A = 0x5DF1
+0x384B = 0x5EAB
+0x384C = 0x5F27
+0x384D = 0x6238
+0x384E = 0x6545
+0x384F = 0x67AF
+0x3850 = 0x6E56
+0x3851 = 0x72D0
+0x3852 = 0x7CCA
+0x3853 = 0x88B4
+0x3854 = 0x80A1
+0x3855 = 0x80E1
+0x3856 = 0x83F0
+0x3857 = 0x864E
+0x3858 = 0x8A87
+0x3859 = 0x8DE8
+0x385A = 0x9237
+0x385B = 0x96C7
+0x385C = 0x9867
+0x385D = 0x9F13
+0x385E = 0x4E94
+0x385F = 0x4E92
+0x3860 = 0x4F0D
+0x3861 = 0x5348
+0x3862 = 0x5449
+0x3863 = 0x543E
+0x3864 = 0x5A2F
+0x3865 = 0x5F8C
+0x3866 = 0x5FA1
+0x3867 = 0x609F
+0x3868 = 0x68A7
+0x3869 = 0x6A8E
+0x386A = 0x745A
+0x386B = 0x7881
+0x386C = 0x8A9E
+0x386D = 0x8AA4
+0x386E = 0x8B77
+0x386F = 0x9190
+0x3870 = 0x4E5E
+0x3871 = 0x9BC9
+0x3872 = 0x4EA4
+0x3873 = 0x4F7C
+0x3874 = 0x4FAF
+0x3875 = 0x5019
+0x3876 = 0x5016
+0x3877 = 0x5149
+0x3878 = 0x516C
+0x3879 = 0x529F
+0x387A = 0x52B9
+0x387B = 0x52FE
+0x387C = 0x539A
+0x387D = 0x53E3
+0x387E = 0x5411
+0x3921 = 0x540E
+0x3922 = 0x5589
+0x3923 = 0x5751
+0x3924 = 0x57A2
+0x3925 = 0x597D
+0x3926 = 0x5B54
+0x3927 = 0x5B5D
+0x3928 = 0x5B8F
+0x3929 = 0x5DE5
+0x392A = 0x5DE7
+0x392B = 0x5DF7
+0x392C = 0x5E78
+0x392D = 0x5E83
+0x392E = 0x5E9A
+0x392F = 0x5EB7
+0x3930 = 0x5F18
+0x3931 = 0x6052
+0x3932 = 0x614C
+0x3933 = 0x6297
+0x3934 = 0x62D8
+0x3935 = 0x63A7
+0x3936 = 0x653B
+0x3937 = 0x6602
+0x3938 = 0x6643
+0x3939 = 0x66F4
+0x393A = 0x676D
+0x393B = 0x6821
+0x393C = 0x6897
+0x393D = 0x69CB
+0x393E = 0x6C5F
+0x393F = 0x6D2A
+0x3940 = 0x6D69
+0x3941 = 0x6E2F
+0x3942 = 0x6E9D
+0x3943 = 0x7532
+0x3944 = 0x7687
+0x3945 = 0x786C
+0x3946 = 0x7A3F
+0x3947 = 0x7CE0
+0x3948 = 0x7D05
+0x3949 = 0x7D18
+0x394A = 0x7D5E
+0x394B = 0x7DB1
+0x394C = 0x8015
+0x394D = 0x8003
+0x394E = 0x80AF
+0x394F = 0x80B1
+0x3950 = 0x8154
+0x3951 = 0x818F
+0x3952 = 0x822A
+0x3953 = 0x8352
+0x3954 = 0x884C
+0x3955 = 0x8861
+0x3956 = 0x8B1B
+0x3957 = 0x8CA2
+0x3958 = 0x8CFC
+0x3959 = 0x90CA
+0x395A = 0x9175
+0x395B = 0x9271
+0x395C = 0x783F
+0x395D = 0x92FC
+0x395E = 0x95A4
+0x395F = 0x964D
+0x3960 = 0x9805
+0x3961 = 0x9999
+0x3962 = 0x9AD8
+0x3963 = 0x9D3B
+0x3964 = 0x525B
+0x3965 = 0x52AB
+0x3966 = 0x53F7
+0x3967 = 0x5408
+0x3968 = 0x58D5
+0x3969 = 0x62F7
+0x396A = 0x6FE0
+0x396B = 0x8C6A
+0x396C = 0x8F5F
+0x396D = 0x9EB9
+0x396E = 0x514B
+0x396F = 0x523B
+0x3970 = 0x544A
+0x3971 = 0x56FD
+0x3972 = 0x7A40
+0x3973 = 0x9177
+0x3974 = 0x9D60
+0x3975 = 0x9ED2
+0x3976 = 0x7344
+0x3977 = 0x6F09
+0x3978 = 0x8170
+0x3979 = 0x7511
+0x397A = 0x5FFD
+0x397B = 0x60DA
+0x397C = 0x9AA8
+0x397D = 0x72DB
+0x397E = 0x8FBC
+0x3A21 = 0x6B64
+0x3A22 = 0x9803
+0x3A23 = 0x4ECA
+0x3A24 = 0x56F0
+0x3A25 = 0x5764
+0x3A26 = 0x58BE
+0x3A27 = 0x5A5A
+0x3A28 = 0x6068
+0x3A29 = 0x61C7
+0x3A2A = 0x660F
+0x3A2B = 0x6606
+0x3A2C = 0x6839
+0x3A2D = 0x68B1
+0x3A2E = 0x6DF7
+0x3A2F = 0x75D5
+0x3A30 = 0x7D3A
+0x3A31 = 0x826E
+0x3A32 = 0x9B42
+0x3A33 = 0x4E9B
+0x3A34 = 0x4F50
+0x3A35 = 0x53C9
+0x3A36 = 0x5506
+0x3A37 = 0x5D6F
+0x3A38 = 0x5DE6
+0x3A39 = 0x5DEE
+0x3A3A = 0x67FB
+0x3A3B = 0x6C99
+0x3A3C = 0x7473
+0x3A3D = 0x7802
+0x3A3E = 0x8A50
+0x3A3F = 0x9396
+0x3A40 = 0x88DF
+0x3A41 = 0x5750
+0x3A42 = 0x5EA7
+0x3A43 = 0x632B
+0x3A44 = 0x50B5
+0x3A45 = 0x50AC
+0x3A46 = 0x518D
+0x3A47 = 0x6700
+0x3A48 = 0x54C9
+0x3A49 = 0x585E
+0x3A4A = 0x59BB
+0x3A4B = 0x5BB0
+0x3A4C = 0x5F69
+0x3A4D = 0x624D
+0x3A4E = 0x63A1
+0x3A4F = 0x683D
+0x3A50 = 0x6B73
+0x3A51 = 0x6E08
+0x3A52 = 0x707D
+0x3A53 = 0x91C7
+0x3A54 = 0x7280
+0x3A55 = 0x7815
+0x3A56 = 0x7826
+0x3A57 = 0x796D
+0x3A58 = 0x658E
+0x3A59 = 0x7D30
+0x3A5A = 0x83DC
+0x3A5B = 0x88C1
+0x3A5C = 0x8F09
+0x3A5D = 0x969B
+0x3A5E = 0x5264
+0x3A5F = 0x5728
+0x3A60 = 0x6750
+0x3A61 = 0x7F6A
+0x3A62 = 0x8CA1
+0x3A63 = 0x51B4
+0x3A64 = 0x5742
+0x3A65 = 0x962A
+0x3A66 = 0x583A
+0x3A67 = 0x698A
+0x3A68 = 0x80B4
+0x3A69 = 0x54B2
+0x3A6A = 0x5D0E
+0x3A6B = 0x57FC
+0x3A6C = 0x7895
+0x3A6D = 0x9DFA
+0x3A6E = 0x4F5C
+0x3A6F = 0x524A
+0x3A70 = 0x548B
+0x3A71 = 0x643E
+0x3A72 = 0x6628
+0x3A73 = 0x6714
+0x3A74 = 0x67F5
+0x3A75 = 0x7A84
+0x3A76 = 0x7B56
+0x3A77 = 0x7D22
+0x3A78 = 0x932F
+0x3A79 = 0x685C
+0x3A7A = 0x9BAD
+0x3A7B = 0x7B39
+0x3A7C = 0x5319
+0x3A7D = 0x518A
+0x3A7E = 0x5237
+0x3B21 = 0x5BDF
+0x3B22 = 0x62F6
+0x3B23 = 0x64AE
+0x3B24 = 0x64E6
+0x3B25 = 0x672D
+0x3B26 = 0x6BBA
+0x3B27 = 0x85A9
+0x3B28 = 0x96D1
+0x3B29 = 0x7690
+0x3B2A = 0x9BD6
+0x3B2B = 0x634C
+0x3B2C = 0x9306
+0x3B2D = 0x9BAB
+0x3B2E = 0x76BF
+0x3B2F = 0x6652
+0x3B30 = 0x4E09
+0x3B31 = 0x5098
+0x3B32 = 0x53C2
+0x3B33 = 0x5C71
+0x3B34 = 0x60E8
+0x3B35 = 0x6492
+0x3B36 = 0x6563
+0x3B37 = 0x685F
+0x3B38 = 0x71E6
+0x3B39 = 0x73CA
+0x3B3A = 0x7523
+0x3B3B = 0x7B97
+0x3B3C = 0x7E82
+0x3B3D = 0x8695
+0x3B3E = 0x8B83
+0x3B3F = 0x8CDB
+0x3B40 = 0x9178
+0x3B41 = 0x9910
+0x3B42 = 0x65AC
+0x3B43 = 0x66AB
+0x3B44 = 0x6B8B
+0x3B45 = 0x4ED5
+0x3B46 = 0x4ED4
+0x3B47 = 0x4F3A
+0x3B48 = 0x4F7F
+0x3B49 = 0x523A
+0x3B4A = 0x53F8
+0x3B4B = 0x53F2
+0x3B4C = 0x55E3
+0x3B4D = 0x56DB
+0x3B4E = 0x58EB
+0x3B4F = 0x59CB
+0x3B50 = 0x59C9
+0x3B51 = 0x59FF
+0x3B52 = 0x5B50
+0x3B53 = 0x5C4D
+0x3B54 = 0x5E02
+0x3B55 = 0x5E2B
+0x3B56 = 0x5FD7
+0x3B57 = 0x601D
+0x3B58 = 0x6307
+0x3B59 = 0x652F
+0x3B5A = 0x5B5C
+0x3B5B = 0x65AF
+0x3B5C = 0x65BD
+0x3B5D = 0x65E8
+0x3B5E = 0x679D
+0x3B5F = 0x6B62
+0x3B60 = 0x6B7B
+0x3B61 = 0x6C0F
+0x3B62 = 0x7345
+0x3B63 = 0x7949
+0x3B64 = 0x79C1
+0x3B65 = 0x7CF8
+0x3B66 = 0x7D19
+0x3B67 = 0x7D2B
+0x3B68 = 0x80A2
+0x3B69 = 0x8102
+0x3B6A = 0x81F3
+0x3B6B = 0x8996
+0x3B6C = 0x8A5E
+0x3B6D = 0x8A69
+0x3B6E = 0x8A66
+0x3B6F = 0x8A8C
+0x3B70 = 0x8AEE
+0x3B71 = 0x8CC7
+0x3B72 = 0x8CDC
+0x3B73 = 0x96CC
+0x3B74 = 0x98FC
+0x3B75 = 0x6B6F
+0x3B76 = 0x4E8B
+0x3B77 = 0x4F3C
+0x3B78 = 0x4F8D
+0x3B79 = 0x5150
+0x3B7A = 0x5B57
+0x3B7B = 0x5BFA
+0x3B7C = 0x6148
+0x3B7D = 0x6301
+0x3B7E = 0x6642
+0x3C21 = 0x6B21
+0x3C22 = 0x6ECB
+0x3C23 = 0x6CBB
+0x3C24 = 0x723E
+0x3C25 = 0x74BD
+0x3C26 = 0x75D4
+0x3C27 = 0x78C1
+0x3C28 = 0x793A
+0x3C29 = 0x800C
+0x3C2A = 0x8033
+0x3C2B = 0x81EA
+0x3C2C = 0x8494
+0x3C2D = 0x8F9E
+0x3C2E = 0x6C50
+0x3C2F = 0x9E7F
+0x3C30 = 0x5F0F
+0x3C31 = 0x8B58
+0x3C32 = 0x9D2B
+0x3C33 = 0x7AFA
+0x3C34 = 0x8EF8
+0x3C35 = 0x5B8D
+0x3C36 = 0x96EB
+0x3C37 = 0x4E03
+0x3C38 = 0x53F1
+0x3C39 = 0x57F7
+0x3C3A = 0x5931
+0x3C3B = 0x5AC9
+0x3C3C = 0x5BA4
+0x3C3D = 0x6089
+0x3C3E = 0x6E7F
+0x3C3F = 0x6F06
+0x3C40 = 0x75BE
+0x3C41 = 0x8CEA
+0x3C42 = 0x5B9F
+0x3C43 = 0x8500
+0x3C44 = 0x7BE0
+0x3C45 = 0x5072
+0x3C46 = 0x67F4
+0x3C47 = 0x829D
+0x3C48 = 0x5C61
+0x3C49 = 0x854A
+0x3C4A = 0x7E1E
+0x3C4B = 0x820E
+0x3C4C = 0x5199
+0x3C4D = 0x5C04
+0x3C4E = 0x6368
+0x3C4F = 0x8D66
+0x3C50 = 0x659C
+0x3C51 = 0x716E
+0x3C52 = 0x793E
+0x3C53 = 0x7D17
+0x3C54 = 0x8005
+0x3C55 = 0x8B1D
+0x3C56 = 0x8ECA
+0x3C57 = 0x906E
+0x3C58 = 0x86C7
+0x3C59 = 0x90AA
+0x3C5A = 0x501F
+0x3C5B = 0x52FA
+0x3C5C = 0x5C3A
+0x3C5D = 0x6753
+0x3C5E = 0x707C
+0x3C5F = 0x7235
+0x3C60 = 0x914C
+0x3C61 = 0x91C8
+0x3C62 = 0x932B
+0x3C63 = 0x82E5
+0x3C64 = 0x5BC2
+0x3C65 = 0x5F31
+0x3C66 = 0x60F9
+0x3C67 = 0x4E3B
+0x3C68 = 0x53D6
+0x3C69 = 0x5B88
+0x3C6A = 0x624B
+0x3C6B = 0x6731
+0x3C6C = 0x6B8A
+0x3C6D = 0x72E9
+0x3C6E = 0x73E0
+0x3C6F = 0x7A2E
+0x3C70 = 0x816B
+0x3C71 = 0x8DA3
+0x3C72 = 0x9152
+0x3C73 = 0x9996
+0x3C74 = 0x5112
+0x3C75 = 0x53D7
+0x3C76 = 0x546A
+0x3C77 = 0x5BFF
+0x3C78 = 0x6388
+0x3C79 = 0x6A39
+0x3C7A = 0x7DAC
+0x3C7B = 0x9700
+0x3C7C = 0x56DA
+0x3C7D = 0x53CE
+0x3C7E = 0x5468
+0x3D21 = 0x5B97
+0x3D22 = 0x5C31
+0x3D23 = 0x5DDE
+0x3D24 = 0x4FEE
+0x3D25 = 0x6101
+0x3D26 = 0x62FE
+0x3D27 = 0x6D32
+0x3D28 = 0x79C0
+0x3D29 = 0x79CB
+0x3D2A = 0x7D42
+0x3D2B = 0x7E4D
+0x3D2C = 0x7FD2
+0x3D2D = 0x81ED
+0x3D2E = 0x821F
+0x3D2F = 0x8490
+0x3D30 = 0x8846
+0x3D31 = 0x8972
+0x3D32 = 0x8B90
+0x3D33 = 0x8E74
+0x3D34 = 0x8F2F
+0x3D35 = 0x9031
+0x3D36 = 0x914B
+0x3D37 = 0x916C
+0x3D38 = 0x96C6
+0x3D39 = 0x919C
+0x3D3A = 0x4EC0
+0x3D3B = 0x4F4F
+0x3D3C = 0x5145
+0x3D3D = 0x5341
+0x3D3E = 0x5F93
+0x3D3F = 0x620E
+0x3D40 = 0x67D4
+0x3D41 = 0x6C41
+0x3D42 = 0x6E0B
+0x3D43 = 0x7363
+0x3D44 = 0x7E26
+0x3D45 = 0x91CD
+0x3D46 = 0x9283
+0x3D47 = 0x53D4
+0x3D48 = 0x5919
+0x3D49 = 0x5BBF
+0x3D4A = 0x6DD1
+0x3D4B = 0x795D
+0x3D4C = 0x7E2E
+0x3D4D = 0x7C9B
+0x3D4E = 0x587E
+0x3D4F = 0x719F
+0x3D50 = 0x51FA
+0x3D51 = 0x8853
+0x3D52 = 0x8FF0
+0x3D53 = 0x4FCA
+0x3D54 = 0x5CFB
+0x3D55 = 0x6625
+0x3D56 = 0x77AC
+0x3D57 = 0x7AE3
+0x3D58 = 0x821C
+0x3D59 = 0x99FF
+0x3D5A = 0x51C6
+0x3D5B = 0x5FAA
+0x3D5C = 0x65EC
+0x3D5D = 0x696F
+0x3D5E = 0x6B89
+0x3D5F = 0x6DF3
+0x3D60 = 0x6E96
+0x3D61 = 0x6F64
+0x3D62 = 0x76FE
+0x3D63 = 0x7D14
+0x3D64 = 0x5DE1
+0x3D65 = 0x9075
+0x3D66 = 0x9187
+0x3D67 = 0x9806
+0x3D68 = 0x51E6
+0x3D69 = 0x521D
+0x3D6A = 0x6240
+0x3D6B = 0x6691
+0x3D6C = 0x66D9
+0x3D6D = 0x6E1A
+0x3D6E = 0x5EB6
+0x3D6F = 0x7DD2
+0x3D70 = 0x7F72
+0x3D71 = 0x66F8
+0x3D72 = 0x85AF
+0x3D73 = 0x85F7
+0x3D74 = 0x8AF8
+0x3D75 = 0x52A9
+0x3D76 = 0x53D9
+0x3D77 = 0x5973
+0x3D78 = 0x5E8F
+0x3D79 = 0x5F90
+0x3D7A = 0x6055
+0x3D7B = 0x92E4
+0x3D7C = 0x9664
+0x3D7D = 0x50B7
+0x3D7E = 0x511F
+0x3E21 = 0x52DD
+0x3E22 = 0x5320
+0x3E23 = 0x5347
+0x3E24 = 0x53EC
+0x3E25 = 0x54E8
+0x3E26 = 0x5546
+0x3E27 = 0x5531
+0x3E28 = 0x5617
+0x3E29 = 0x5968
+0x3E2A = 0x59BE
+0x3E2B = 0x5A3C
+0x3E2C = 0x5BB5
+0x3E2D = 0x5C06
+0x3E2E = 0x5C0F
+0x3E2F = 0x5C11
+0x3E30 = 0x5C1A
+0x3E31 = 0x5E84
+0x3E32 = 0x5E8A
+0x3E33 = 0x5EE0
+0x3E34 = 0x5F70
+0x3E35 = 0x627F
+0x3E36 = 0x6284
+0x3E37 = 0x62DB
+0x3E38 = 0x638C
+0x3E39 = 0x6377
+0x3E3A = 0x6607
+0x3E3B = 0x660C
+0x3E3C = 0x662D
+0x3E3D = 0x6676
+0x3E3E = 0x677E
+0x3E3F = 0x68A2
+0x3E40 = 0x6A1F
+0x3E41 = 0x6A35
+0x3E42 = 0x6CBC
+0x3E43 = 0x6D88
+0x3E44 = 0x6E09
+0x3E45 = 0x6E58
+0x3E46 = 0x713C
+0x3E47 = 0x7126
+0x3E48 = 0x7167
+0x3E49 = 0x75C7
+0x3E4A = 0x7701
+0x3E4B = 0x785D
+0x3E4C = 0x7901
+0x3E4D = 0x7965
+0x3E4E = 0x79F0
+0x3E4F = 0x7AE0
+0x3E50 = 0x7B11
+0x3E51 = 0x7CA7
+0x3E52 = 0x7D39
+0x3E53 = 0x8096
+0x3E54 = 0x83D6
+0x3E55 = 0x848B
+0x3E56 = 0x8549
+0x3E57 = 0x885D
+0x3E58 = 0x88F3
+0x3E59 = 0x8A1F
+0x3E5A = 0x8A3C
+0x3E5B = 0x8A54
+0x3E5C = 0x8A73
+0x3E5D = 0x8C61
+0x3E5E = 0x8CDE
+0x3E5F = 0x91A4
+0x3E60 = 0x9266
+0x3E61 = 0x937E
+0x3E62 = 0x9418
+0x3E63 = 0x969C
+0x3E64 = 0x9798
+0x3E65 = 0x4E0A
+0x3E66 = 0x4E08
+0x3E67 = 0x4E1E
+0x3E68 = 0x4E57
+0x3E69 = 0x5197
+0x3E6A = 0x5270
+0x3E6B = 0x57CE
+0x3E6C = 0x5834
+0x3E6D = 0x58CC
+0x3E6E = 0x5B22
+0x3E6F = 0x5E38
+0x3E70 = 0x60C5
+0x3E71 = 0x64FE
+0x3E72 = 0x6761
+0x3E73 = 0x6756
+0x3E74 = 0x6D44
+0x3E75 = 0x72B6
+0x3E76 = 0x7573
+0x3E77 = 0x7A63
+0x3E78 = 0x84B8
+0x3E79 = 0x8B72
+0x3E7A = 0x91B8
+0x3E7B = 0x9320
+0x3E7C = 0x5631
+0x3E7D = 0x57F4
+0x3E7E = 0x98FE
+0x3F21 = 0x62ED
+0x3F22 = 0x690D
+0x3F23 = 0x6B96
+0x3F24 = 0x71ED
+0x3F25 = 0x7E54
+0x3F26 = 0x8077
+0x3F27 = 0x8272
+0x3F28 = 0x89E6
+0x3F29 = 0x98DF
+0x3F2A = 0x8755
+0x3F2B = 0x8FB1
+0x3F2C = 0x5C3B
+0x3F2D = 0x4F38
+0x3F2E = 0x4FE1
+0x3F2F = 0x4FB5
+0x3F30 = 0x5507
+0x3F31 = 0x5A20
+0x3F32 = 0x5BDD
+0x3F33 = 0x5BE9
+0x3F34 = 0x5FC3
+0x3F35 = 0x614E
+0x3F36 = 0x632F
+0x3F37 = 0x65B0
+0x3F38 = 0x664B
+0x3F39 = 0x68EE
+0x3F3A = 0x699B
+0x3F3B = 0x6D78
+0x3F3C = 0x6DF1
+0x3F3D = 0x7533
+0x3F3E = 0x75B9
+0x3F3F = 0x771F
+0x3F40 = 0x795E
+0x3F41 = 0x79E6
+0x3F42 = 0x7D33
+0x3F43 = 0x81E3
+0x3F44 = 0x82AF
+0x3F45 = 0x85AA
+0x3F46 = 0x89AA
+0x3F47 = 0x8A3A
+0x3F48 = 0x8EAB
+0x3F49 = 0x8F9B
+0x3F4A = 0x9032
+0x3F4B = 0x91DD
+0x3F4C = 0x9707
+0x3F4D = 0x4EBA
+0x3F4E = 0x4EC1
+0x3F4F = 0x5203
+0x3F50 = 0x5875
+0x3F51 = 0x58EC
+0x3F52 = 0x5C0B
+0x3F53 = 0x751A
+0x3F54 = 0x5C3D
+0x3F55 = 0x814E
+0x3F56 = 0x8A0A
+0x3F57 = 0x8FC5
+0x3F58 = 0x9663
+0x3F59 = 0x976D
+0x3F5A = 0x7B25
+0x3F5B = 0x8ACF
+0x3F5C = 0x9808
+0x3F5D = 0x9162
+0x3F5E = 0x56F3
+0x3F5F = 0x53A8
+0x3F60 = 0x9017
+0x3F61 = 0x5439
+0x3F62 = 0x5782
+0x3F63 = 0x5E25
+0x3F64 = 0x63A8
+0x3F65 = 0x6C34
+0x3F66 = 0x708A
+0x3F67 = 0x7761
+0x3F68 = 0x7C8B
+0x3F69 = 0x7FE0
+0x3F6A = 0x8870
+0x3F6B = 0x9042
+0x3F6C = 0x9154
+0x3F6D = 0x9310
+0x3F6E = 0x9318
+0x3F6F = 0x968F
+0x3F70 = 0x745E
+0x3F71 = 0x9AC4
+0x3F72 = 0x5D07
+0x3F73 = 0x5D69
+0x3F74 = 0x6570
+0x3F75 = 0x67A2
+0x3F76 = 0x8DA8
+0x3F77 = 0x96DB
+0x3F78 = 0x636E
+0x3F79 = 0x6749
+0x3F7A = 0x6919
+0x3F7B = 0x83C5
+0x3F7C = 0x9817
+0x3F7D = 0x96C0
+0x3F7E = 0x88FE
+0x4021 = 0x6F84
+0x4022 = 0x647A
+0x4023 = 0x5BF8
+0x4024 = 0x4E16
+0x4025 = 0x702C
+0x4026 = 0x755D
+0x4027 = 0x662F
+0x4028 = 0x51C4
+0x4029 = 0x5236
+0x402A = 0x52E2
+0x402B = 0x59D3
+0x402C = 0x5F81
+0x402D = 0x6027
+0x402E = 0x6210
+0x402F = 0x653F
+0x4030 = 0x6574
+0x4031 = 0x661F
+0x4032 = 0x6674
+0x4033 = 0x68F2
+0x4034 = 0x6816
+0x4035 = 0x6B63
+0x4036 = 0x6E05
+0x4037 = 0x7272
+0x4038 = 0x751F
+0x4039 = 0x76DB
+0x403A = 0x7CBE
+0x403B = 0x8056
+0x403C = 0x58F0
+0x403D = 0x88FD
+0x403E = 0x897F
+0x403F = 0x8AA0
+0x4040 = 0x8A93
+0x4041 = 0x8ACB
+0x4042 = 0x901D
+0x4043 = 0x9192
+0x4044 = 0x9752
+0x4045 = 0x9759
+0x4046 = 0x6589
+0x4047 = 0x7A0E
+0x4048 = 0x8106
+0x4049 = 0x96BB
+0x404A = 0x5E2D
+0x404B = 0x60DC
+0x404C = 0x621A
+0x404D = 0x65A5
+0x404E = 0x6614
+0x404F = 0x6790
+0x4050 = 0x77F3
+0x4051 = 0x7A4D
+0x4052 = 0x7C4D
+0x4053 = 0x7E3E
+0x4054 = 0x810A
+0x4055 = 0x8CAC
+0x4056 = 0x8D64
+0x4057 = 0x8DE1
+0x4058 = 0x8E5F
+0x4059 = 0x78A9
+0x405A = 0x5207
+0x405B = 0x62D9
+0x405C = 0x63A5
+0x405D = 0x6442
+0x405E = 0x6298
+0x405F = 0x8A2D
+0x4060 = 0x7A83
+0x4061 = 0x7BC0
+0x4062 = 0x8AAC
+0x4063 = 0x96EA
+0x4064 = 0x7D76
+0x4065 = 0x820C
+0x4066 = 0x8749
+0x4067 = 0x4ED9
+0x4068 = 0x5148
+0x4069 = 0x5343
+0x406A = 0x5360
+0x406B = 0x5BA3
+0x406C = 0x5C02
+0x406D = 0x5C16
+0x406E = 0x5DDD
+0x406F = 0x6226
+0x4070 = 0x6247
+0x4071 = 0x64B0
+0x4072 = 0x6813
+0x4073 = 0x6834
+0x4074 = 0x6CC9
+0x4075 = 0x6D45
+0x4076 = 0x6D17
+0x4077 = 0x67D3
+0x4078 = 0x6F5C
+0x4079 = 0x714E
+0x407A = 0x717D
+0x407B = 0x65CB
+0x407C = 0x7A7F
+0x407D = 0x7BAD
+0x407E = 0x7DDA
+0x4121 = 0x7E4A
+0x4122 = 0x7FA8
+0x4123 = 0x817A
+0x4124 = 0x821B
+0x4125 = 0x8239
+0x4126 = 0x85A6
+0x4127 = 0x8A6E
+0x4128 = 0x8CCE
+0x4129 = 0x8DF5
+0x412A = 0x9078
+0x412B = 0x9077
+0x412C = 0x92AD
+0x412D = 0x9291
+0x412E = 0x9583
+0x412F = 0x9BAE
+0x4130 = 0x524D
+0x4131 = 0x5584
+0x4132 = 0x6F38
+0x4133 = 0x7136
+0x4134 = 0x5168
+0x4135 = 0x7985
+0x4136 = 0x7E55
+0x4137 = 0x81B3
+0x4138 = 0x7CCE
+0x4139 = 0x564C
+0x413A = 0x5851
+0x413B = 0x5CA8
+0x413C = 0x63AA
+0x413D = 0x66FE
+0x413E = 0x66FD
+0x413F = 0x695A
+0x4140 = 0x72D9
+0x4141 = 0x758F
+0x4142 = 0x758E
+0x4143 = 0x790E
+0x4144 = 0x7956
+0x4145 = 0x79DF
+0x4146 = 0x7C97
+0x4147 = 0x7D20
+0x4148 = 0x7D44
+0x4149 = 0x8607
+0x414A = 0x8A34
+0x414B = 0x963B
+0x414C = 0x9061
+0x414D = 0x9F20
+0x414E = 0x50E7
+0x414F = 0x5275
+0x4150 = 0x53CC
+0x4151 = 0x53E2
+0x4152 = 0x5009
+0x4153 = 0x55AA
+0x4154 = 0x58EE
+0x4155 = 0x594F
+0x4156 = 0x723D
+0x4157 = 0x5B8B
+0x4158 = 0x5C64
+0x4159 = 0x531D
+0x415A = 0x60E3
+0x415B = 0x60F3
+0x415C = 0x635C
+0x415D = 0x6383
+0x415E = 0x633F
+0x415F = 0x63BB
+0x4160 = 0x64CD
+0x4161 = 0x65E9
+0x4162 = 0x66F9
+0x4163 = 0x5DE3
+0x4164 = 0x69CD
+0x4165 = 0x69FD
+0x4166 = 0x6F15
+0x4167 = 0x71E5
+0x4168 = 0x4E89
+0x4169 = 0x75E9
+0x416A = 0x76F8
+0x416B = 0x7A93
+0x416C = 0x7CDF
+0x416D = 0x7DCF
+0x416E = 0x7D9C
+0x416F = 0x8061
+0x4170 = 0x8349
+0x4171 = 0x8358
+0x4172 = 0x846C
+0x4173 = 0x84BC
+0x4174 = 0x85FB
+0x4175 = 0x88C5
+0x4176 = 0x8D70
+0x4177 = 0x9001
+0x4178 = 0x906D
+0x4179 = 0x9397
+0x417A = 0x971C
+0x417B = 0x9A12
+0x417C = 0x50CF
+0x417D = 0x5897
+0x417E = 0x618E
+0x4221 = 0x81D3
+0x4222 = 0x8535
+0x4223 = 0x8D08
+0x4224 = 0x9020
+0x4225 = 0x4FC3
+0x4226 = 0x5074
+0x4227 = 0x5247
+0x4228 = 0x5373
+0x4229 = 0x606F
+0x422A = 0x6349
+0x422B = 0x675F
+0x422C = 0x6E2C
+0x422D = 0x8DB3
+0x422E = 0x901F
+0x422F = 0x4FD7
+0x4230 = 0x5C5E
+0x4231 = 0x8CCA
+0x4232 = 0x65CF
+0x4233 = 0x7D9A
+0x4234 = 0x5352
+0x4235 = 0x8896
+0x4236 = 0x5176
+0x4237 = 0x63C3
+0x4238 = 0x5B58
+0x4239 = 0x5B6B
+0x423A = 0x5C0A
+0x423B = 0x640D
+0x423C = 0x6751
+0x423D = 0x905C
+0x423E = 0x4ED6
+0x423F = 0x591A
+0x4240 = 0x592A
+0x4241 = 0x6C70
+0x4242 = 0x8A51
+0x4243 = 0x553E
+0x4244 = 0x5815
+0x4245 = 0x59A5
+0x4246 = 0x60F0
+0x4247 = 0x6253
+0x4248 = 0x67C1
+0x4249 = 0x8235
+0x424A = 0x6955
+0x424B = 0x9640
+0x424C = 0x99C4
+0x424D = 0x9A28
+0x424E = 0x4F53
+0x424F = 0x5806
+0x4250 = 0x5BFE
+0x4251 = 0x8010
+0x4252 = 0x5CB1
+0x4253 = 0x5E2F
+0x4254 = 0x5F85
+0x4255 = 0x6020
+0x4256 = 0x614B
+0x4257 = 0x6234
+0x4258 = 0x66FF
+0x4259 = 0x6CF0
+0x425A = 0x6EDE
+0x425B = 0x80CE
+0x425C = 0x817F
+0x425D = 0x82D4
+0x425E = 0x888B
+0x425F = 0x8CB8
+0x4260 = 0x9000
+0x4261 = 0x902E
+0x4262 = 0x968A
+0x4263 = 0x9EDB
+0x4264 = 0x9BDB
+0x4265 = 0x4EE3
+0x4266 = 0x53F0
+0x4267 = 0x5927
+0x4268 = 0x7B2C
+0x4269 = 0x918D
+0x426A = 0x984C
+0x426B = 0x9DF9
+0x426C = 0x6EDD
+0x426D = 0x7027
+0x426E = 0x5353
+0x426F = 0x5544
+0x4270 = 0x5B85
+0x4271 = 0x6258
+0x4272 = 0x629E
+0x4273 = 0x62D3
+0x4274 = 0x6CA2
+0x4275 = 0x6FEF
+0x4276 = 0x7422
+0x4277 = 0x8A17
+0x4278 = 0x9438
+0x4279 = 0x6FC1
+0x427A = 0x8AFE
+0x427B = 0x8338
+0x427C = 0x51E7
+0x427D = 0x86F8
+0x427E = 0x53EA
+0x4321 = 0x53E9
+0x4322 = 0x4F46
+0x4323 = 0x9054
+0x4324 = 0x8FB0
+0x4325 = 0x596A
+0x4326 = 0x8131
+0x4327 = 0x5DFD
+0x4328 = 0x7AEA
+0x4329 = 0x8FBF
+0x432A = 0x68DA
+0x432B = 0x8C37
+0x432C = 0x72F8
+0x432D = 0x9C48
+0x432E = 0x6A3D
+0x432F = 0x8AB0
+0x4330 = 0x4E39
+0x4331 = 0x5358
+0x4332 = 0x5606
+0x4333 = 0x5766
+0x4334 = 0x62C5
+0x4335 = 0x63A2
+0x4336 = 0x65E6
+0x4337 = 0x6B4E
+0x4338 = 0x6DE1
+0x4339 = 0x6E5B
+0x433A = 0x70AD
+0x433B = 0x77ED
+0x433C = 0x7AEF
+0x433D = 0x7BAA
+0x433E = 0x7DBB
+0x433F = 0x803D
+0x4340 = 0x80C6
+0x4341 = 0x86CB
+0x4342 = 0x8A95
+0x4343 = 0x935B
+0x4344 = 0x56E3
+0x4345 = 0x58C7
+0x4346 = 0x5F3E
+0x4347 = 0x65AD
+0x4348 = 0x6696
+0x4349 = 0x6A80
+0x434A = 0x6BB5
+0x434B = 0x7537
+0x434C = 0x8AC7
+0x434D = 0x5024
+0x434E = 0x77E5
+0x434F = 0x5730
+0x4350 = 0x5F1B
+0x4351 = 0x6065
+0x4352 = 0x667A
+0x4353 = 0x6C60
+0x4354 = 0x75F4
+0x4355 = 0x7A1A
+0x4356 = 0x7F6E
+0x4357 = 0x81F4
+0x4358 = 0x8718
+0x4359 = 0x9045
+0x435A = 0x99B3
+0x435B = 0x7BC9
+0x435C = 0x755C
+0x435D = 0x7AF9
+0x435E = 0x7B51
+0x435F = 0x84C4
+0x4360 = 0x9010
+0x4361 = 0x79E9
+0x4362 = 0x7A92
+0x4363 = 0x8336
+0x4364 = 0x5AE1
+0x4365 = 0x7740
+0x4366 = 0x4E2D
+0x4367 = 0x4EF2
+0x4368 = 0x5B99
+0x4369 = 0x5FE0
+0x436A = 0x62BD
+0x436B = 0x663C
+0x436C = 0x67F1
+0x436D = 0x6CE8
+0x436E = 0x866B
+0x436F = 0x8877
+0x4370 = 0x8A3B
+0x4371 = 0x914E
+0x4372 = 0x92F3
+0x4373 = 0x99D0
+0x4374 = 0x6A17
+0x4375 = 0x7026
+0x4376 = 0x732A
+0x4377 = 0x82E7
+0x4378 = 0x8457
+0x4379 = 0x8CAF
+0x437A = 0x4E01
+0x437B = 0x5146
+0x437C = 0x51CB
+0x437D = 0x558B
+0x437E = 0x5BF5
+0x4421 = 0x5E16
+0x4422 = 0x5E33
+0x4423 = 0x5E81
+0x4424 = 0x5F14
+0x4425 = 0x5F35
+0x4426 = 0x5F6B
+0x4427 = 0x5FB4
+0x4428 = 0x61F2
+0x4429 = 0x6311
+0x442A = 0x66A2
+0x442B = 0x671D
+0x442C = 0x6F6E
+0x442D = 0x7252
+0x442E = 0x753A
+0x442F = 0x773A
+0x4430 = 0x8074
+0x4431 = 0x8139
+0x4432 = 0x8178
+0x4433 = 0x8776
+0x4434 = 0x8ABF
+0x4435 = 0x8ADC
+0x4436 = 0x8D85
+0x4437 = 0x8DF3
+0x4438 = 0x929A
+0x4439 = 0x9577
+0x443A = 0x9802
+0x443B = 0x9CE5
+0x443C = 0x52C5
+0x443D = 0x6357
+0x443E = 0x76F4
+0x443F = 0x6715
+0x4440 = 0x6C88
+0x4441 = 0x73CD
+0x4442 = 0x8CC3
+0x4443 = 0x93AE
+0x4444 = 0x9673
+0x4445 = 0x6D25
+0x4446 = 0x589C
+0x4447 = 0x690E
+0x4448 = 0x69CC
+0x4449 = 0x8FFD
+0x444A = 0x939A
+0x444B = 0x75DB
+0x444C = 0x901A
+0x444D = 0x585A
+0x444E = 0x6802
+0x444F = 0x63B4
+0x4450 = 0x69FB
+0x4451 = 0x4F43
+0x4452 = 0x6F2C
+0x4453 = 0x67D8
+0x4454 = 0x8FBB
+0x4455 = 0x8526
+0x4456 = 0x7DB4
+0x4457 = 0x9354
+0x4458 = 0x693F
+0x4459 = 0x6F70
+0x445A = 0x576A
+0x445B = 0x58F7
+0x445C = 0x5B2C
+0x445D = 0x7D2C
+0x445E = 0x722A
+0x445F = 0x540A
+0x4460 = 0x91E3
+0x4461 = 0x9DB4
+0x4462 = 0x4EAD
+0x4463 = 0x4F4E
+0x4464 = 0x505C
+0x4465 = 0x5075
+0x4466 = 0x5243
+0x4467 = 0x8C9E
+0x4468 = 0x5448
+0x4469 = 0x5824
+0x446A = 0x5B9A
+0x446B = 0x5E1D
+0x446C = 0x5E95
+0x446D = 0x5EAD
+0x446E = 0x5EF7
+0x446F = 0x5F1F
+0x4470 = 0x608C
+0x4471 = 0x62B5
+0x4472 = 0x633A
+0x4473 = 0x63D0
+0x4474 = 0x68AF
+0x4475 = 0x6C40
+0x4476 = 0x7887
+0x4477 = 0x798E
+0x4478 = 0x7A0B
+0x4479 = 0x7DE0
+0x447A = 0x8247
+0x447B = 0x8A02
+0x447C = 0x8AE6
+0x447D = 0x8E44
+0x447E = 0x9013
+0x4521 = 0x90B8
+0x4522 = 0x912D
+0x4523 = 0x91D8
+0x4524 = 0x9F0E
+0x4525 = 0x6CE5
+0x4526 = 0x6458
+0x4527 = 0x64E2
+0x4528 = 0x6575
+0x4529 = 0x6EF4
+0x452A = 0x7684
+0x452B = 0x7B1B
+0x452C = 0x9069
+0x452D = 0x93D1
+0x452E = 0x6EBA
+0x452F = 0x54F2
+0x4530 = 0x5FB9
+0x4531 = 0x64A4
+0x4532 = 0x8F4D
+0x4533 = 0x8FED
+0x4534 = 0x9244
+0x4535 = 0x5178
+0x4536 = 0x586B
+0x4537 = 0x5929
+0x4538 = 0x5C55
+0x4539 = 0x5E97
+0x453A = 0x6DFB
+0x453B = 0x7E8F
+0x453C = 0x751C
+0x453D = 0x8CBC
+0x453E = 0x8EE2
+0x453F = 0x985B
+0x4540 = 0x70B9
+0x4541 = 0x4F1D
+0x4542 = 0x6BBF
+0x4543 = 0x6FB1
+0x4544 = 0x7530
+0x4545 = 0x96FB
+0x4546 = 0x514E
+0x4547 = 0x5410
+0x4548 = 0x5835
+0x4549 = 0x5857
+0x454A = 0x59AC
+0x454B = 0x5C60
+0x454C = 0x5F92
+0x454D = 0x6597
+0x454E = 0x675C
+0x454F = 0x6E21
+0x4550 = 0x767B
+0x4551 = 0x83DF
+0x4552 = 0x8CED
+0x4553 = 0x9014
+0x4554 = 0x90FD
+0x4555 = 0x934D
+0x4556 = 0x7825
+0x4557 = 0x783A
+0x4558 = 0x52AA
+0x4559 = 0x5EA6
+0x455A = 0x571F
+0x455B = 0x5974
+0x455C = 0x6012
+0x455D = 0x5012
+0x455E = 0x515A
+0x455F = 0x51AC
+0x4560 = 0x51CD
+0x4561 = 0x5200
+0x4562 = 0x5510
+0x4563 = 0x5854
+0x4564 = 0x5858
+0x4565 = 0x5957
+0x4566 = 0x5B95
+0x4567 = 0x5CF6
+0x4568 = 0x5D8B
+0x4569 = 0x60BC
+0x456A = 0x6295
+0x456B = 0x642D
+0x456C = 0x6771
+0x456D = 0x6843
+0x456E = 0x68BC
+0x456F = 0x68DF
+0x4570 = 0x76D7
+0x4571 = 0x6DD8
+0x4572 = 0x6E6F
+0x4573 = 0x6D9B
+0x4574 = 0x706F
+0x4575 = 0x71C8
+0x4576 = 0x5F53
+0x4577 = 0x75D8
+0x4578 = 0x7977
+0x4579 = 0x7B49
+0x457A = 0x7B54
+0x457B = 0x7B52
+0x457C = 0x7CD6
+0x457D = 0x7D71
+0x457E = 0x5230
+0x4621 = 0x8463
+0x4622 = 0x8569
+0x4623 = 0x85E4
+0x4624 = 0x8A0E
+0x4625 = 0x8B04
+0x4626 = 0x8C46
+0x4627 = 0x8E0F
+0x4628 = 0x9003
+0x4629 = 0x900F
+0x462A = 0x9419
+0x462B = 0x9676
+0x462C = 0x982D
+0x462D = 0x9A30
+0x462E = 0x95D8
+0x462F = 0x50CD
+0x4630 = 0x52D5
+0x4631 = 0x540C
+0x4632 = 0x5802
+0x4633 = 0x5C0E
+0x4634 = 0x61A7
+0x4635 = 0x649E
+0x4636 = 0x6D1E
+0x4637 = 0x77B3
+0x4638 = 0x7AE5
+0x4639 = 0x80F4
+0x463A = 0x8404
+0x463B = 0x9053
+0x463C = 0x9285
+0x463D = 0x5CE0
+0x463E = 0x9D07
+0x463F = 0x533F
+0x4640 = 0x5F97
+0x4641 = 0x5FB3
+0x4642 = 0x6D9C
+0x4643 = 0x7279
+0x4644 = 0x7763
+0x4645 = 0x79BF
+0x4646 = 0x7BE4
+0x4647 = 0x6BD2
+0x4648 = 0x72EC
+0x4649 = 0x8AAD
+0x464A = 0x6803
+0x464B = 0x6A61
+0x464C = 0x51F8
+0x464D = 0x7A81
+0x464E = 0x6934
+0x464F = 0x5C4A
+0x4650 = 0x9CF6
+0x4651 = 0x82EB
+0x4652 = 0x5BC5
+0x4653 = 0x9149
+0x4654 = 0x701E
+0x4655 = 0x5678
+0x4656 = 0x5C6F
+0x4657 = 0x60C7
+0x4658 = 0x6566
+0x4659 = 0x6C8C
+0x465A = 0x8C5A
+0x465B = 0x9041
+0x465C = 0x9813
+0x465D = 0x5451
+0x465E = 0x66C7
+0x465F = 0x920D
+0x4660 = 0x5948
+0x4661 = 0x90A3
+0x4662 = 0x5185
+0x4663 = 0x4E4D
+0x4664 = 0x51EA
+0x4665 = 0x8599
+0x4666 = 0x8B0E
+0x4667 = 0x7058
+0x4668 = 0x637A
+0x4669 = 0x934B
+0x466A = 0x6962
+0x466B = 0x99B4
+0x466C = 0x7E04
+0x466D = 0x7577
+0x466E = 0x5357
+0x466F = 0x6960
+0x4670 = 0x8EDF
+0x4671 = 0x96E3
+0x4672 = 0x6C5D
+0x4673 = 0x4E8C
+0x4674 = 0x5C3C
+0x4675 = 0x5F10
+0x4676 = 0x8FE9
+0x4677 = 0x5302
+0x4678 = 0x8CD1
+0x4679 = 0x8089
+0x467A = 0x8679
+0x467B = 0x5EFF
+0x467C = 0x65E5
+0x467D = 0x4E73
+0x467E = 0x5165
+0x4721 = 0x5982
+0x4722 = 0x5C3F
+0x4723 = 0x97EE
+0x4724 = 0x4EFB
+0x4725 = 0x598A
+0x4726 = 0x5FCD
+0x4727 = 0x8A8D
+0x4728 = 0x6FE1
+0x4729 = 0x79B0
+0x472A = 0x7962
+0x472B = 0x5BE7
+0x472C = 0x8471
+0x472D = 0x732B
+0x472E = 0x71B1
+0x472F = 0x5E74
+0x4730 = 0x5FF5
+0x4731 = 0x637B
+0x4732 = 0x649A
+0x4733 = 0x71C3
+0x4734 = 0x7C98
+0x4735 = 0x4E43
+0x4736 = 0x5EFC
+0x4737 = 0x4E4B
+0x4738 = 0x57DC
+0x4739 = 0x56A2
+0x473A = 0x60A9
+0x473B = 0x6FC3
+0x473C = 0x7D0D
+0x473D = 0x80FD
+0x473E = 0x8133
+0x473F = 0x81BF
+0x4740 = 0x8FB2
+0x4741 = 0x8997
+0x4742 = 0x86A4
+0x4743 = 0x5DF4
+0x4744 = 0x628A
+0x4745 = 0x64AD
+0x4746 = 0x8987
+0x4747 = 0x6777
+0x4748 = 0x6CE2
+0x4749 = 0x6D3E
+0x474A = 0x7436
+0x474B = 0x7834
+0x474C = 0x5A46
+0x474D = 0x7F75
+0x474E = 0x82AD
+0x474F = 0x99AC
+0x4750 = 0x4FF3
+0x4751 = 0x5EC3
+0x4752 = 0x62DD
+0x4753 = 0x6392
+0x4754 = 0x6557
+0x4755 = 0x676F
+0x4756 = 0x76C3
+0x4757 = 0x724C
+0x4758 = 0x80CC
+0x4759 = 0x80BA
+0x475A = 0x8F29
+0x475B = 0x914D
+0x475C = 0x500D
+0x475D = 0x57F9
+0x475E = 0x5A92
+0x475F = 0x6885
+0x4760 = 0x6973
+0x4761 = 0x7164
+0x4762 = 0x72FD
+0x4763 = 0x8CB7
+0x4764 = 0x58F2
+0x4765 = 0x8CE0
+0x4766 = 0x966A
+0x4767 = 0x9019
+0x4768 = 0x877F
+0x4769 = 0x79E4
+0x476A = 0x77E7
+0x476B = 0x8429
+0x476C = 0x4F2F
+0x476D = 0x5265
+0x476E = 0x535A
+0x476F = 0x62CD
+0x4770 = 0x67CF
+0x4771 = 0x6CCA
+0x4772 = 0x767D
+0x4773 = 0x7B94
+0x4774 = 0x7C95
+0x4775 = 0x8236
+0x4776 = 0x8584
+0x4777 = 0x8FEB
+0x4778 = 0x66DD
+0x4779 = 0x6F20
+0x477A = 0x7206
+0x477B = 0x7E1B
+0x477C = 0x83AB
+0x477D = 0x99C1
+0x477E = 0x9EA6
+0x4821 = 0x51FD
+0x4822 = 0x7BB1
+0x4823 = 0x7872
+0x4824 = 0x7BB8
+0x4825 = 0x8087
+0x4826 = 0x7B48
+0x4827 = 0x6AE8
+0x4828 = 0x5E61
+0x4829 = 0x808C
+0x482A = 0x7551
+0x482B = 0x7560
+0x482C = 0x516B
+0x482D = 0x9262
+0x482E = 0x6E8C
+0x482F = 0x767A
+0x4830 = 0x9197
+0x4831 = 0x9AEA
+0x4832 = 0x4F10
+0x4833 = 0x7F70
+0x4834 = 0x629C
+0x4835 = 0x7B4F
+0x4836 = 0x95A5
+0x4837 = 0x9CE9
+0x4838 = 0x567A
+0x4839 = 0x5859
+0x483A = 0x86E4
+0x483B = 0x96BC
+0x483C = 0x4F34
+0x483D = 0x5224
+0x483E = 0x534A
+0x483F = 0x53CD
+0x4840 = 0x53DB
+0x4841 = 0x5E06
+0x4842 = 0x642C
+0x4843 = 0x6591
+0x4844 = 0x677F
+0x4845 = 0x6C3E
+0x4846 = 0x6C4E
+0x4847 = 0x7248
+0x4848 = 0x72AF
+0x4849 = 0x73ED
+0x484A = 0x7554
+0x484B = 0x7E41
+0x484C = 0x822C
+0x484D = 0x85E9
+0x484E = 0x8CA9
+0x484F = 0x7BC4
+0x4850 = 0x91C6
+0x4851 = 0x7169
+0x4852 = 0x9812
+0x4853 = 0x98EF
+0x4854 = 0x633D
+0x4855 = 0x6669
+0x4856 = 0x756A
+0x4857 = 0x76E4
+0x4858 = 0x78D0
+0x4859 = 0x8543
+0x485A = 0x86EE
+0x485B = 0x532A
+0x485C = 0x5351
+0x485D = 0x5426
+0x485E = 0x5983
+0x485F = 0x5E87
+0x4860 = 0x5F7C
+0x4861 = 0x60B2
+0x4862 = 0x6249
+0x4863 = 0x6279
+0x4864 = 0x62AB
+0x4865 = 0x6590
+0x4866 = 0x6BD4
+0x4867 = 0x6CCC
+0x4868 = 0x75B2
+0x4869 = 0x76AE
+0x486A = 0x7891
+0x486B = 0x79D8
+0x486C = 0x7DCB
+0x486D = 0x7F77
+0x486E = 0x80A5
+0x486F = 0x88AB
+0x4870 = 0x8AB9
+0x4871 = 0x8CBB
+0x4872 = 0x907F
+0x4873 = 0x975E
+0x4874 = 0x98DB
+0x4875 = 0x6A0B
+0x4876 = 0x7C38
+0x4877 = 0x5099
+0x4878 = 0x5C3E
+0x4879 = 0x5FAE
+0x487A = 0x6787
+0x487B = 0x6BD8
+0x487C = 0x7435
+0x487D = 0x7709
+0x487E = 0x7F8E
+0x4921 = 0x9F3B
+0x4922 = 0x67CA
+0x4923 = 0x7A17
+0x4924 = 0x5339
+0x4925 = 0x758B
+0x4926 = 0x9AED
+0x4927 = 0x5F66
+0x4928 = 0x819D
+0x4929 = 0x83F1
+0x492A = 0x8098
+0x492B = 0x5F3C
+0x492C = 0x5FC5
+0x492D = 0x7562
+0x492E = 0x7B46
+0x492F = 0x903C
+0x4930 = 0x6867
+0x4931 = 0x59EB
+0x4932 = 0x5A9B
+0x4933 = 0x7D10
+0x4934 = 0x767E
+0x4935 = 0x8B2C
+0x4936 = 0x4FF5
+0x4937 = 0x5F6A
+0x4938 = 0x6A19
+0x4939 = 0x6C37
+0x493A = 0x6F02
+0x493B = 0x74E2
+0x493C = 0x7968
+0x493D = 0x8868
+0x493E = 0x8A55
+0x493F = 0x8C79
+0x4940 = 0x5EDF
+0x4941 = 0x63CF
+0x4942 = 0x75C5
+0x4943 = 0x79D2
+0x4944 = 0x82D7
+0x4945 = 0x9328
+0x4946 = 0x92F2
+0x4947 = 0x849C
+0x4948 = 0x86ED
+0x4949 = 0x9C2D
+0x494A = 0x54C1
+0x494B = 0x5F6C
+0x494C = 0x658C
+0x494D = 0x6D5C
+0x494E = 0x7015
+0x494F = 0x8CA7
+0x4950 = 0x8CD3
+0x4951 = 0x983B
+0x4952 = 0x654F
+0x4953 = 0x74F6
+0x4954 = 0x4E0D
+0x4955 = 0x4ED8
+0x4956 = 0x57E0
+0x4957 = 0x592B
+0x4958 = 0x5A66
+0x4959 = 0x5BCC
+0x495A = 0x51A8
+0x495B = 0x5E03
+0x495C = 0x5E9C
+0x495D = 0x6016
+0x495E = 0x6276
+0x495F = 0x6577
+0x4960 = 0x65A7
+0x4961 = 0x666E
+0x4962 = 0x6D6E
+0x4963 = 0x7236
+0x4964 = 0x7B26
+0x4965 = 0x8150
+0x4966 = 0x819A
+0x4967 = 0x8299
+0x4968 = 0x8B5C
+0x4969 = 0x8CA0
+0x496A = 0x8CE6
+0x496B = 0x8D74
+0x496C = 0x961C
+0x496D = 0x9644
+0x496E = 0x4FAE
+0x496F = 0x64AB
+0x4970 = 0x6B66
+0x4971 = 0x821E
+0x4972 = 0x8461
+0x4973 = 0x856A
+0x4974 = 0x90E8
+0x4975 = 0x5C01
+0x4976 = 0x6953
+0x4977 = 0x98A8
+0x4978 = 0x847A
+0x4979 = 0x8557
+0x497A = 0x4F0F
+0x497B = 0x526F
+0x497C = 0x5FA9
+0x497D = 0x5E45
+0x497E = 0x670D
+0x4A21 = 0x798F
+0x4A22 = 0x8179
+0x4A23 = 0x8907
+0x4A24 = 0x8986
+0x4A25 = 0x6DF5
+0x4A26 = 0x5F17
+0x4A27 = 0x6255
+0x4A28 = 0x6CB8
+0x4A29 = 0x4ECF
+0x4A2A = 0x7269
+0x4A2B = 0x9B92
+0x4A2C = 0x5206
+0x4A2D = 0x543B
+0x4A2E = 0x5674
+0x4A2F = 0x58B3
+0x4A30 = 0x61A4
+0x4A31 = 0x626E
+0x4A32 = 0x711A
+0x4A33 = 0x596E
+0x4A34 = 0x7C89
+0x4A35 = 0x7CDE
+0x4A36 = 0x7D1B
+0x4A37 = 0x96F0
+0x4A38 = 0x6587
+0x4A39 = 0x805E
+0x4A3A = 0x4E19
+0x4A3B = 0x4F75
+0x4A3C = 0x5175
+0x4A3D = 0x5840
+0x4A3E = 0x5E63
+0x4A3F = 0x5E73
+0x4A40 = 0x5F0A
+0x4A41 = 0x67C4
+0x4A42 = 0x4E26
+0x4A43 = 0x853D
+0x4A44 = 0x9589
+0x4A45 = 0x965B
+0x4A46 = 0x7C73
+0x4A47 = 0x9801
+0x4A48 = 0x50FB
+0x4A49 = 0x58C1
+0x4A4A = 0x7656
+0x4A4B = 0x78A7
+0x4A4C = 0x5225
+0x4A4D = 0x77A5
+0x4A4E = 0x8511
+0x4A4F = 0x7B86
+0x4A50 = 0x504F
+0x4A51 = 0x5909
+0x4A52 = 0x7247
+0x4A53 = 0x7BC7
+0x4A54 = 0x7DE8
+0x4A55 = 0x8FBA
+0x4A56 = 0x8FD4
+0x4A57 = 0x904D
+0x4A58 = 0x4FBF
+0x4A59 = 0x52C9
+0x4A5A = 0x5A29
+0x4A5B = 0x5F01
+0x4A5C = 0x97AD
+0x4A5D = 0x4FDD
+0x4A5E = 0x8217
+0x4A5F = 0x92EA
+0x4A60 = 0x5703
+0x4A61 = 0x6355
+0x4A62 = 0x6B69
+0x4A63 = 0x752B
+0x4A64 = 0x88DC
+0x4A65 = 0x8F14
+0x4A66 = 0x7A42
+0x4A67 = 0x52DF
+0x4A68 = 0x5893
+0x4A69 = 0x6155
+0x4A6A = 0x620A
+0x4A6B = 0x66AE
+0x4A6C = 0x6BCD
+0x4A6D = 0x7C3F
+0x4A6E = 0x83E9
+0x4A6F = 0x5023
+0x4A70 = 0x4FF8
+0x4A71 = 0x5305
+0x4A72 = 0x5446
+0x4A73 = 0x5831
+0x4A74 = 0x5949
+0x4A75 = 0x5B9D
+0x4A76 = 0x5CF0
+0x4A77 = 0x5CEF
+0x4A78 = 0x5D29
+0x4A79 = 0x5E96
+0x4A7A = 0x62B1
+0x4A7B = 0x6367
+0x4A7C = 0x653E
+0x4A7D = 0x65B9
+0x4A7E = 0x670B
+0x4B21 = 0x6CD5
+0x4B22 = 0x6CE1
+0x4B23 = 0x70F9
+0x4B24 = 0x7832
+0x4B25 = 0x7E2B
+0x4B26 = 0x80DE
+0x4B27 = 0x82B3
+0x4B28 = 0x840C
+0x4B29 = 0x84EC
+0x4B2A = 0x8702
+0x4B2B = 0x8912
+0x4B2C = 0x8A2A
+0x4B2D = 0x8C4A
+0x4B2E = 0x90A6
+0x4B2F = 0x92D2
+0x4B30 = 0x98FD
+0x4B31 = 0x9CF3
+0x4B32 = 0x9D6C
+0x4B33 = 0x4E4F
+0x4B34 = 0x4EA1
+0x4B35 = 0x508D
+0x4B36 = 0x5256
+0x4B37 = 0x574A
+0x4B38 = 0x59A8
+0x4B39 = 0x5E3D
+0x4B3A = 0x5FD8
+0x4B3B = 0x5FD9
+0x4B3C = 0x623F
+0x4B3D = 0x66B4
+0x4B3E = 0x671B
+0x4B3F = 0x67D0
+0x4B40 = 0x68D2
+0x4B41 = 0x5192
+0x4B42 = 0x7D21
+0x4B43 = 0x80AA
+0x4B44 = 0x81A8
+0x4B45 = 0x8B00
+0x4B46 = 0x8C8C
+0x4B47 = 0x8CBF
+0x4B48 = 0x927E
+0x4B49 = 0x9632
+0x4B4A = 0x5420
+0x4B4B = 0x982C
+0x4B4C = 0x5317
+0x4B4D = 0x50D5
+0x4B4E = 0x535C
+0x4B4F = 0x58A8
+0x4B50 = 0x64B2
+0x4B51 = 0x6734
+0x4B52 = 0x7267
+0x4B53 = 0x7766
+0x4B54 = 0x7A46
+0x4B55 = 0x91E6
+0x4B56 = 0x52C3
+0x4B57 = 0x6CA1
+0x4B58 = 0x6B86
+0x4B59 = 0x5800
+0x4B5A = 0x5E4C
+0x4B5B = 0x5954
+0x4B5C = 0x672C
+0x4B5D = 0x7FFB
+0x4B5E = 0x51E1
+0x4B5F = 0x76C6
+0x4B60 = 0x6469
+0x4B61 = 0x78E8
+0x4B62 = 0x9B54
+0x4B63 = 0x9EBB
+0x4B64 = 0x57CB
+0x4B65 = 0x59B9
+0x4B66 = 0x6627
+0x4B67 = 0x679A
+0x4B68 = 0x6BCE
+0x4B69 = 0x54E9
+0x4B6A = 0x69D9
+0x4B6B = 0x5E55
+0x4B6C = 0x819C
+0x4B6D = 0x6795
+0x4B6E = 0x9BAA
+0x4B6F = 0x67FE
+0x4B70 = 0x9C52
+0x4B71 = 0x685D
+0x4B72 = 0x4EA6
+0x4B73 = 0x4FE3
+0x4B74 = 0x53C8
+0x4B75 = 0x62B9
+0x4B76 = 0x672B
+0x4B77 = 0x6CAB
+0x4B78 = 0x8FC4
+0x4B79 = 0x4FAD
+0x4B7A = 0x7E6D
+0x4B7B = 0x9EBF
+0x4B7C = 0x4E07
+0x4B7D = 0x6162
+0x4B7E = 0x6E80
+0x4C21 = 0x6F2B
+0x4C22 = 0x8513
+0x4C23 = 0x5473
+0x4C24 = 0x672A
+0x4C25 = 0x9B45
+0x4C26 = 0x5DF3
+0x4C27 = 0x7B95
+0x4C28 = 0x5CAC
+0x4C29 = 0x5BC6
+0x4C2A = 0x871C
+0x4C2B = 0x6E4A
+0x4C2C = 0x84D1
+0x4C2D = 0x7A14
+0x4C2E = 0x8108
+0x4C2F = 0x5999
+0x4C30 = 0x7C8D
+0x4C31 = 0x6C11
+0x4C32 = 0x7720
+0x4C33 = 0x52D9
+0x4C34 = 0x5922
+0x4C35 = 0x7121
+0x4C36 = 0x725F
+0x4C37 = 0x77DB
+0x4C38 = 0x9727
+0x4C39 = 0x9D61
+0x4C3A = 0x690B
+0x4C3B = 0x5A7F
+0x4C3C = 0x5A18
+0x4C3D = 0x51A5
+0x4C3E = 0x540D
+0x4C3F = 0x547D
+0x4C40 = 0x660E
+0x4C41 = 0x76DF
+0x4C42 = 0x8FF7
+0x4C43 = 0x9298
+0x4C44 = 0x9CF4
+0x4C45 = 0x59EA
+0x4C46 = 0x725D
+0x4C47 = 0x6EC5
+0x4C48 = 0x514D
+0x4C49 = 0x68C9
+0x4C4A = 0x7DBF
+0x4C4B = 0x7DEC
+0x4C4C = 0x9762
+0x4C4D = 0x9EBA
+0x4C4E = 0x6478
+0x4C4F = 0x6A21
+0x4C50 = 0x8302
+0x4C51 = 0x5984
+0x4C52 = 0x5B5F
+0x4C53 = 0x6BDB
+0x4C54 = 0x731B
+0x4C55 = 0x76F2
+0x4C56 = 0x7DB2
+0x4C57 = 0x8017
+0x4C58 = 0x8499
+0x4C59 = 0x5132
+0x4C5A = 0x6728
+0x4C5B = 0x9ED9
+0x4C5C = 0x76EE
+0x4C5D = 0x6762
+0x4C5E = 0x52FF
+0x4C5F = 0x9905
+0x4C60 = 0x5C24
+0x4C61 = 0x623B
+0x4C62 = 0x7C7E
+0x4C63 = 0x8CB0
+0x4C64 = 0x554F
+0x4C65 = 0x60B6
+0x4C66 = 0x7D0B
+0x4C67 = 0x9580
+0x4C68 = 0x5301
+0x4C69 = 0x4E5F
+0x4C6A = 0x51B6
+0x4C6B = 0x591C
+0x4C6C = 0x723A
+0x4C6D = 0x8036
+0x4C6E = 0x91CE
+0x4C6F = 0x5F25
+0x4C70 = 0x77E2
+0x4C71 = 0x5384
+0x4C72 = 0x5F79
+0x4C73 = 0x7D04
+0x4C74 = 0x85AC
+0x4C75 = 0x8A33
+0x4C76 = 0x8E8D
+0x4C77 = 0x9756
+0x4C78 = 0x67F3
+0x4C79 = 0x85AE
+0x4C7A = 0x9453
+0x4C7B = 0x6109
+0x4C7C = 0x6108
+0x4C7D = 0x6CB9
+0x4C7E = 0x7652
+0x4D21 = 0x8AED
+0x4D22 = 0x8F38
+0x4D23 = 0x552F
+0x4D24 = 0x4F51
+0x4D25 = 0x512A
+0x4D26 = 0x52C7
+0x4D27 = 0x53CB
+0x4D28 = 0x5BA5
+0x4D29 = 0x5E7D
+0x4D2A = 0x60A0
+0x4D2B = 0x6182
+0x4D2C = 0x63D6
+0x4D2D = 0x6709
+0x4D2E = 0x67DA
+0x4D2F = 0x6E67
+0x4D30 = 0x6D8C
+0x4D31 = 0x7336
+0x4D32 = 0x7337
+0x4D33 = 0x7531
+0x4D34 = 0x7950
+0x4D35 = 0x88D5
+0x4D36 = 0x8A98
+0x4D37 = 0x904A
+0x4D38 = 0x9091
+0x4D39 = 0x90F5
+0x4D3A = 0x96C4
+0x4D3B = 0x878D
+0x4D3C = 0x5915
+0x4D3D = 0x4E88
+0x4D3E = 0x4F59
+0x4D3F = 0x4E0E
+0x4D40 = 0x8A89
+0x4D41 = 0x8F3F
+0x4D42 = 0x9810
+0x4D43 = 0x50AD
+0x4D44 = 0x5E7C
+0x4D45 = 0x5996
+0x4D46 = 0x5BB9
+0x4D47 = 0x5EB8
+0x4D48 = 0x63DA
+0x4D49 = 0x63FA
+0x4D4A = 0x64C1
+0x4D4B = 0x66DC
+0x4D4C = 0x694A
+0x4D4D = 0x69D8
+0x4D4E = 0x6D0B
+0x4D4F = 0x6EB6
+0x4D50 = 0x7194
+0x4D51 = 0x7528
+0x4D52 = 0x7AAF
+0x4D53 = 0x7F8A
+0x4D54 = 0x8000
+0x4D55 = 0x8449
+0x4D56 = 0x84C9
+0x4D57 = 0x8981
+0x4D58 = 0x8B21
+0x4D59 = 0x8E0A
+0x4D5A = 0x9065
+0x4D5B = 0x967D
+0x4D5C = 0x990A
+0x4D5D = 0x617E
+0x4D5E = 0x6291
+0x4D5F = 0x6B32
+0x4D60 = 0x6C83
+0x4D61 = 0x6D74
+0x4D62 = 0x7FCC
+0x4D63 = 0x7FFC
+0x4D64 = 0x6DC0
+0x4D65 = 0x7F85
+0x4D66 = 0x87BA
+0x4D67 = 0x88F8
+0x4D68 = 0x6765
+0x4D69 = 0x83B1
+0x4D6A = 0x983C
+0x4D6B = 0x96F7
+0x4D6C = 0x6D1B
+0x4D6D = 0x7D61
+0x4D6E = 0x843D
+0x4D6F = 0x916A
+0x4D70 = 0x4E71
+0x4D71 = 0x5375
+0x4D72 = 0x5D50
+0x4D73 = 0x6B04
+0x4D74 = 0x6FEB
+0x4D75 = 0x85CD
+0x4D76 = 0x862D
+0x4D77 = 0x89A7
+0x4D78 = 0x5229
+0x4D79 = 0x540F
+0x4D7A = 0x5C65
+0x4D7B = 0x674E
+0x4D7C = 0x68A8
+0x4D7D = 0x7406
+0x4D7E = 0x7483
+0x4E21 = 0x75E2
+0x4E22 = 0x88CF
+0x4E23 = 0x88E1
+0x4E24 = 0x91CC
+0x4E25 = 0x96E2
+0x4E26 = 0x9678
+0x4E27 = 0x5F8B
+0x4E28 = 0x7387
+0x4E29 = 0x7ACB
+0x4E2A = 0x844E
+0x4E2B = 0x63A0
+0x4E2C = 0x7565
+0x4E2D = 0x5289
+0x4E2E = 0x6D41
+0x4E2F = 0x6E9C
+0x4E30 = 0x7409
+0x4E31 = 0x7559
+0x4E32 = 0x786B
+0x4E33 = 0x7C92
+0x4E34 = 0x9686
+0x4E35 = 0x7ADC
+0x4E36 = 0x9F8D
+0x4E37 = 0x4FB6
+0x4E38 = 0x616E
+0x4E39 = 0x65C5
+0x4E3A = 0x865C
+0x4E3B = 0x4E86
+0x4E3C = 0x4EAE
+0x4E3D = 0x50DA
+0x4E3E = 0x4E21
+0x4E3F = 0x51CC
+0x4E40 = 0x5BEE
+0x4E41 = 0x6599
+0x4E42 = 0x6881
+0x4E43 = 0x6DBC
+0x4E44 = 0x731F
+0x4E45 = 0x7642
+0x4E46 = 0x77AD
+0x4E47 = 0x7A1C
+0x4E48 = 0x7CE7
+0x4E49 = 0x826F
+0x4E4A = 0x8AD2
+0x4E4B = 0x907C
+0x4E4C = 0x91CF
+0x4E4D = 0x9675
+0x4E4E = 0x9818
+0x4E4F = 0x529B
+0x4E50 = 0x7DD1
+0x4E51 = 0x502B
+0x4E52 = 0x5398
+0x4E53 = 0x6797
+0x4E54 = 0x6DCB
+0x4E55 = 0x71D0
+0x4E56 = 0x7433
+0x4E57 = 0x81E8
+0x4E58 = 0x8F2A
+0x4E59 = 0x96A3
+0x4E5A = 0x9C57
+0x4E5B = 0x9E9F
+0x4E5C = 0x7460
+0x4E5D = 0x5841
+0x4E5E = 0x6D99
+0x4E5F = 0x7D2F
+0x4E60 = 0x985E
+0x4E61 = 0x4EE4
+0x4E62 = 0x4F36
+0x4E63 = 0x4F8B
+0x4E64 = 0x51B7
+0x4E65 = 0x52B1
+0x4E66 = 0x5DBA
+0x4E67 = 0x601C
+0x4E68 = 0x73B2
+0x4E69 = 0x793C
+0x4E6A = 0x82D3
+0x4E6B = 0x9234
+0x4E6C = 0x96B7
+0x4E6D = 0x96F6
+0x4E6E = 0x970A
+0x4E6F = 0x9E97
+0x4E70 = 0x9F62
+0x4E71 = 0x66A6
+0x4E72 = 0x6B74
+0x4E73 = 0x5217
+0x4E74 = 0x52A3
+0x4E75 = 0x70C8
+0x4E76 = 0x88C2
+0x4E77 = 0x5EC9
+0x4E78 = 0x604B
+0x4E79 = 0x6190
+0x4E7A = 0x6F23
+0x4E7B = 0x7149
+0x4E7C = 0x7C3E
+0x4E7D = 0x7DF4
+0x4E7E = 0x806F
+0x4F21 = 0x84EE
+0x4F22 = 0x9023
+0x4F23 = 0x932C
+0x4F24 = 0x5442
+0x4F25 = 0x9B6F
+0x4F26 = 0x6AD3
+0x4F27 = 0x7089
+0x4F28 = 0x8CC2
+0x4F29 = 0x8DEF
+0x4F2A = 0x9732
+0x4F2B = 0x52B4
+0x4F2C = 0x5A41
+0x4F2D = 0x5ECA
+0x4F2E = 0x5F04
+0x4F2F = 0x6717
+0x4F30 = 0x697C
+0x4F31 = 0x6994
+0x4F32 = 0x6D6A
+0x4F33 = 0x6F0F
+0x4F34 = 0x7262
+0x4F35 = 0x72FC
+0x4F36 = 0x7BED
+0x4F37 = 0x8001
+0x4F38 = 0x807E
+0x4F39 = 0x874B
+0x4F3A = 0x90CE
+0x4F3B = 0x516D
+0x4F3C = 0x9E93
+0x4F3D = 0x7984
+0x4F3E = 0x808B
+0x4F3F = 0x9332
+0x4F40 = 0x8AD6
+0x4F41 = 0x502D
+0x4F42 = 0x548C
+0x4F43 = 0x8A71
+0x4F44 = 0x6B6A
+0x4F45 = 0x8CC4
+0x4F46 = 0x8107
+0x4F47 = 0x60D1
+0x4F48 = 0x67A0
+0x4F49 = 0x9DF2
+0x4F4A = 0x4E99
+0x4F4B = 0x4E98
+0x4F4C = 0x9C10
+0x4F4D = 0x8A6B
+0x4F4E = 0x85C1
+0x4F4F = 0x8568
+0x4F50 = 0x6900
+0x4F51 = 0x6E7E
+0x4F52 = 0x7897
+0x4F53 = 0x8155
+0x5021 = 0x5F0C
+0x5022 = 0x4E10
+0x5023 = 0x4E15
+0x5024 = 0x4E2A
+0x5025 = 0x4E31
+0x5026 = 0x4E36
+0x5027 = 0x4E3C
+0x5028 = 0x4E3F
+0x5029 = 0x4E42
+0x502A = 0x4E56
+0x502B = 0x4E58
+0x502C = 0x4E82
+0x502D = 0x4E85
+0x502E = 0x8C6B
+0x502F = 0x4E8A
+0x5030 = 0x8212
+0x5031 = 0x5F0D
+0x5032 = 0x4E8E
+0x5033 = 0x4E9E
+0x5034 = 0x4E9F
+0x5035 = 0x4EA0
+0x5036 = 0x4EA2
+0x5037 = 0x4EB0
+0x5038 = 0x4EB3
+0x5039 = 0x4EB6
+0x503A = 0x4ECE
+0x503B = 0x4ECD
+0x503C = 0x4EC4
+0x503D = 0x4EC6
+0x503E = 0x4EC2
+0x503F = 0x4ED7
+0x5040 = 0x4EDE
+0x5041 = 0x4EED
+0x5042 = 0x4EDF
+0x5043 = 0x4EF7
+0x5044 = 0x4F09
+0x5045 = 0x4F5A
+0x5046 = 0x4F30
+0x5047 = 0x4F5B
+0x5048 = 0x4F5D
+0x5049 = 0x4F57
+0x504A = 0x4F47
+0x504B = 0x4F76
+0x504C = 0x4F88
+0x504D = 0x4F8F
+0x504E = 0x4F98
+0x504F = 0x4F7B
+0x5050 = 0x4F69
+0x5051 = 0x4F70
+0x5052 = 0x4F91
+0x5053 = 0x4F6F
+0x5054 = 0x4F86
+0x5055 = 0x4F96
+0x5056 = 0x5118
+0x5057 = 0x4FD4
+0x5058 = 0x4FDF
+0x5059 = 0x4FCE
+0x505A = 0x4FD8
+0x505B = 0x4FDB
+0x505C = 0x4FD1
+0x505D = 0x4FDA
+0x505E = 0x4FD0
+0x505F = 0x4FE4
+0x5060 = 0x4FE5
+0x5061 = 0x501A
+0x5062 = 0x5028
+0x5063 = 0x5014
+0x5064 = 0x502A
+0x5065 = 0x5025
+0x5066 = 0x5005
+0x5067 = 0x4F1C
+0x5068 = 0x4FF6
+0x5069 = 0x5021
+0x506A = 0x5029
+0x506B = 0x502C
+0x506C = 0x4FFE
+0x506D = 0x4FEF
+0x506E = 0x5011
+0x506F = 0x5006
+0x5070 = 0x5043
+0x5071 = 0x5047
+0x5072 = 0x6703
+0x5073 = 0x5055
+0x5074 = 0x5050
+0x5075 = 0x5048
+0x5076 = 0x505A
+0x5077 = 0x5056
+0x5078 = 0x506C
+0x5079 = 0x5078
+0x507A = 0x5080
+0x507B = 0x509A
+0x507C = 0x5085
+0x507D = 0x50B4
+0x507E = 0x50B2
+0x5121 = 0x50C9
+0x5122 = 0x50CA
+0x5123 = 0x50B3
+0x5124 = 0x50C2
+0x5125 = 0x50D6
+0x5126 = 0x50DE
+0x5127 = 0x50E5
+0x5128 = 0x50ED
+0x5129 = 0x50E3
+0x512A = 0x50EE
+0x512B = 0x50F9
+0x512C = 0x50F5
+0x512D = 0x5109
+0x512E = 0x5101
+0x512F = 0x5102
+0x5130 = 0x5116
+0x5131 = 0x5115
+0x5132 = 0x5114
+0x5133 = 0x511A
+0x5134 = 0x5121
+0x5135 = 0x513A
+0x5136 = 0x5137
+0x5137 = 0x513C
+0x5138 = 0x513B
+0x5139 = 0x513F
+0x513A = 0x5140
+0x513B = 0x5152
+0x513C = 0x514C
+0x513D = 0x5154
+0x513E = 0x5162
+0x513F = 0x7AF8
+0x5140 = 0x5169
+0x5141 = 0x516A
+0x5142 = 0x516E
+0x5143 = 0x5180
+0x5144 = 0x5182
+0x5145 = 0x56D8
+0x5146 = 0x518C
+0x5147 = 0x5189
+0x5148 = 0x518F
+0x5149 = 0x5191
+0x514A = 0x5193
+0x514B = 0x5195
+0x514C = 0x5196
+0x514D = 0x51A4
+0x514E = 0x51A6
+0x514F = 0x51A2
+0x5150 = 0x51A9
+0x5151 = 0x51AA
+0x5152 = 0x51AB
+0x5153 = 0x51B3
+0x5154 = 0x51B1
+0x5155 = 0x51B2
+0x5156 = 0x51B0
+0x5157 = 0x51B5
+0x5158 = 0x51BD
+0x5159 = 0x51C5
+0x515A = 0x51C9
+0x515B = 0x51DB
+0x515C = 0x51E0
+0x515D = 0x8655
+0x515E = 0x51E9
+0x515F = 0x51ED
+0x5160 = 0x51F0
+0x5161 = 0x51F5
+0x5162 = 0x51FE
+0x5163 = 0x5204
+0x5164 = 0x520B
+0x5165 = 0x5214
+0x5166 = 0x520E
+0x5167 = 0x5227
+0x5168 = 0x522A
+0x5169 = 0x522E
+0x516A = 0x5233
+0x516B = 0x5239
+0x516C = 0x524F
+0x516D = 0x5244
+0x516E = 0x524B
+0x516F = 0x524C
+0x5170 = 0x525E
+0x5171 = 0x5254
+0x5172 = 0x526A
+0x5173 = 0x5274
+0x5174 = 0x5269
+0x5175 = 0x5273
+0x5176 = 0x527F
+0x5177 = 0x527D
+0x5178 = 0x528D
+0x5179 = 0x5294
+0x517A = 0x5292
+0x517B = 0x5271
+0x517C = 0x5288
+0x517D = 0x5291
+0x517E = 0x8FA8
+0x5221 = 0x8FA7
+0x5222 = 0x52AC
+0x5223 = 0x52AD
+0x5224 = 0x52BC
+0x5225 = 0x52B5
+0x5226 = 0x52C1
+0x5227 = 0x52CD
+0x5228 = 0x52D7
+0x5229 = 0x52DE
+0x522A = 0x52E3
+0x522B = 0x52E6
+0x522C = 0x98ED
+0x522D = 0x52E0
+0x522E = 0x52F3
+0x522F = 0x52F5
+0x5230 = 0x52F8
+0x5231 = 0x52F9
+0x5232 = 0x5306
+0x5233 = 0x5308
+0x5234 = 0x7538
+0x5235 = 0x530D
+0x5236 = 0x5310
+0x5237 = 0x530F
+0x5238 = 0x5315
+0x5239 = 0x531A
+0x523A = 0x5323
+0x523B = 0x532F
+0x523C = 0x5331
+0x523D = 0x5333
+0x523E = 0x5338
+0x523F = 0x5340
+0x5240 = 0x5346
+0x5241 = 0x5345
+0x5242 = 0x4E17
+0x5243 = 0x5349
+0x5244 = 0x534D
+0x5245 = 0x51D6
+0x5246 = 0x535E
+0x5247 = 0x5369
+0x5248 = 0x536E
+0x5249 = 0x5918
+0x524A = 0x537B
+0x524B = 0x5377
+0x524C = 0x5382
+0x524D = 0x5396
+0x524E = 0x53A0
+0x524F = 0x53A6
+0x5250 = 0x53A5
+0x5251 = 0x53AE
+0x5252 = 0x53B0
+0x5253 = 0x53B6
+0x5254 = 0x53C3
+0x5255 = 0x7C12
+0x5256 = 0x96D9
+0x5257 = 0x53DF
+0x5258 = 0x66FC
+0x5259 = 0x71EE
+0x525A = 0x53EE
+0x525B = 0x53E8
+0x525C = 0x53ED
+0x525D = 0x53FA
+0x525E = 0x5401
+0x525F = 0x543D
+0x5260 = 0x5440
+0x5261 = 0x542C
+0x5262 = 0x542D
+0x5263 = 0x543C
+0x5264 = 0x542E
+0x5265 = 0x5436
+0x5266 = 0x5429
+0x5267 = 0x541D
+0x5268 = 0x544E
+0x5269 = 0x548F
+0x526A = 0x5475
+0x526B = 0x548E
+0x526C = 0x545F
+0x526D = 0x5471
+0x526E = 0x5477
+0x526F = 0x5470
+0x5270 = 0x5492
+0x5271 = 0x547B
+0x5272 = 0x5480
+0x5273 = 0x5476
+0x5274 = 0x5484
+0x5275 = 0x5490
+0x5276 = 0x5486
+0x5277 = 0x54C7
+0x5278 = 0x54A2
+0x5279 = 0x54B8
+0x527A = 0x54A5
+0x527B = 0x54AC
+0x527C = 0x54C4
+0x527D = 0x54C8
+0x527E = 0x54A8
+0x5321 = 0x54AB
+0x5322 = 0x54C2
+0x5323 = 0x54A4
+0x5324 = 0x54BE
+0x5325 = 0x54BC
+0x5326 = 0x54D8
+0x5327 = 0x54E5
+0x5328 = 0x54E6
+0x5329 = 0x550F
+0x532A = 0x5514
+0x532B = 0x54FD
+0x532C = 0x54EE
+0x532D = 0x54ED
+0x532E = 0x54FA
+0x532F = 0x54E2
+0x5330 = 0x5539
+0x5331 = 0x5540
+0x5332 = 0x5563
+0x5333 = 0x554C
+0x5334 = 0x552E
+0x5335 = 0x555C
+0x5336 = 0x5545
+0x5337 = 0x5556
+0x5338 = 0x5557
+0x5339 = 0x5538
+0x533A = 0x5533
+0x533B = 0x555D
+0x533C = 0x5599
+0x533D = 0x5580
+0x533E = 0x54AF
+0x533F = 0x558A
+0x5340 = 0x559F
+0x5341 = 0x557B
+0x5342 = 0x557E
+0x5343 = 0x5598
+0x5344 = 0x559E
+0x5345 = 0x55AE
+0x5346 = 0x557C
+0x5347 = 0x5583
+0x5348 = 0x55A9
+0x5349 = 0x5587
+0x534A = 0x55A8
+0x534B = 0x55DA
+0x534C = 0x55C5
+0x534D = 0x55DF
+0x534E = 0x55C4
+0x534F = 0x55DC
+0x5350 = 0x55E4
+0x5351 = 0x55D4
+0x5352 = 0x5614
+0x5353 = 0x55F7
+0x5354 = 0x5616
+0x5355 = 0x55FE
+0x5356 = 0x55FD
+0x5357 = 0x561B
+0x5358 = 0x55F9
+0x5359 = 0x564E
+0x535A = 0x5650
+0x535B = 0x71DF
+0x535C = 0x5634
+0x535D = 0x5636
+0x535E = 0x5632
+0x535F = 0x5638
+0x5360 = 0x566B
+0x5361 = 0x5664
+0x5362 = 0x562F
+0x5363 = 0x566C
+0x5364 = 0x566A
+0x5365 = 0x5686
+0x5366 = 0x5680
+0x5367 = 0x568A
+0x5368 = 0x56A0
+0x5369 = 0x5694
+0x536A = 0x568F
+0x536B = 0x56A5
+0x536C = 0x56AE
+0x536D = 0x56B6
+0x536E = 0x56B4
+0x536F = 0x56C2
+0x5370 = 0x56BC
+0x5371 = 0x56C1
+0x5372 = 0x56C3
+0x5373 = 0x56C0
+0x5374 = 0x56C8
+0x5375 = 0x56CE
+0x5376 = 0x56D1
+0x5377 = 0x56D3
+0x5378 = 0x56D7
+0x5379 = 0x56EE
+0x537A = 0x56F9
+0x537B = 0x5700
+0x537C = 0x56FF
+0x537D = 0x5704
+0x537E = 0x5709
+0x5421 = 0x5708
+0x5422 = 0x570B
+0x5423 = 0x570D
+0x5424 = 0x5713
+0x5425 = 0x5718
+0x5426 = 0x5716
+0x5427 = 0x55C7
+0x5428 = 0x571C
+0x5429 = 0x5726
+0x542A = 0x5737
+0x542B = 0x5738
+0x542C = 0x574E
+0x542D = 0x573B
+0x542E = 0x5740
+0x542F = 0x574F
+0x5430 = 0x5769
+0x5431 = 0x57C0
+0x5432 = 0x5788
+0x5433 = 0x5761
+0x5434 = 0x577F
+0x5435 = 0x5789
+0x5436 = 0x5793
+0x5437 = 0x57A0
+0x5438 = 0x57B3
+0x5439 = 0x57A4
+0x543A = 0x57AA
+0x543B = 0x57B0
+0x543C = 0x57C3
+0x543D = 0x57C6
+0x543E = 0x57D4
+0x543F = 0x57D2
+0x5440 = 0x57D3
+0x5441 = 0x580A
+0x5442 = 0x57D6
+0x5443 = 0x57E3
+0x5444 = 0x580B
+0x5445 = 0x5819
+0x5446 = 0x581D
+0x5447 = 0x5872
+0x5448 = 0x5821
+0x5449 = 0x5862
+0x544A = 0x584B
+0x544B = 0x5870
+0x544C = 0x6BC0
+0x544D = 0x5852
+0x544E = 0x583D
+0x544F = 0x5879
+0x5450 = 0x5885
+0x5451 = 0x58B9
+0x5452 = 0x589F
+0x5453 = 0x58AB
+0x5454 = 0x58BA
+0x5455 = 0x58DE
+0x5456 = 0x58BB
+0x5457 = 0x58B8
+0x5458 = 0x58AE
+0x5459 = 0x58C5
+0x545A = 0x58D3
+0x545B = 0x58D1
+0x545C = 0x58D7
+0x545D = 0x58D9
+0x545E = 0x58D8
+0x545F = 0x58E5
+0x5460 = 0x58DC
+0x5461 = 0x58E4
+0x5462 = 0x58DF
+0x5463 = 0x58EF
+0x5464 = 0x58FA
+0x5465 = 0x58F9
+0x5466 = 0x58FB
+0x5467 = 0x58FC
+0x5468 = 0x58FD
+0x5469 = 0x5902
+0x546A = 0x590A
+0x546B = 0x5910
+0x546C = 0x591B
+0x546D = 0x68A6
+0x546E = 0x5925
+0x546F = 0x592C
+0x5470 = 0x592D
+0x5471 = 0x5932
+0x5472 = 0x5938
+0x5473 = 0x593E
+0x5474 = 0x7AD2
+0x5475 = 0x5955
+0x5476 = 0x5950
+0x5477 = 0x594E
+0x5478 = 0x595A
+0x5479 = 0x5958
+0x547A = 0x5962
+0x547B = 0x5960
+0x547C = 0x5967
+0x547D = 0x596C
+0x547E = 0x5969
+0x5521 = 0x5978
+0x5522 = 0x5981
+0x5523 = 0x599D
+0x5524 = 0x4F5E
+0x5525 = 0x4FAB
+0x5526 = 0x59A3
+0x5527 = 0x59B2
+0x5528 = 0x59C6
+0x5529 = 0x59E8
+0x552A = 0x59DC
+0x552B = 0x598D
+0x552C = 0x59D9
+0x552D = 0x59DA
+0x552E = 0x5A25
+0x552F = 0x5A1F
+0x5530 = 0x5A11
+0x5531 = 0x5A1C
+0x5532 = 0x5A09
+0x5533 = 0x5A1A
+0x5534 = 0x5A40
+0x5535 = 0x5A6C
+0x5536 = 0x5A49
+0x5537 = 0x5A35
+0x5538 = 0x5A36
+0x5539 = 0x5A62
+0x553A = 0x5A6A
+0x553B = 0x5A9A
+0x553C = 0x5ABC
+0x553D = 0x5ABE
+0x553E = 0x5ACB
+0x553F = 0x5AC2
+0x5540 = 0x5ABD
+0x5541 = 0x5AE3
+0x5542 = 0x5AD7
+0x5543 = 0x5AE6
+0x5544 = 0x5AE9
+0x5545 = 0x5AD6
+0x5546 = 0x5AFA
+0x5547 = 0x5AFB
+0x5548 = 0x5B0C
+0x5549 = 0x5B0B
+0x554A = 0x5B16
+0x554B = 0x5B32
+0x554C = 0x5AD0
+0x554D = 0x5B2A
+0x554E = 0x5B36
+0x554F = 0x5B3E
+0x5550 = 0x5B43
+0x5551 = 0x5B45
+0x5552 = 0x5B40
+0x5553 = 0x5B51
+0x5554 = 0x5B55
+0x5555 = 0x5B5A
+0x5556 = 0x5B5B
+0x5557 = 0x5B65
+0x5558 = 0x5B69
+0x5559 = 0x5B70
+0x555A = 0x5B73
+0x555B = 0x5B75
+0x555C = 0x5B78
+0x555D = 0x6588
+0x555E = 0x5B7A
+0x555F = 0x5B80
+0x5560 = 0x5B83
+0x5561 = 0x5BA6
+0x5562 = 0x5BB8
+0x5563 = 0x5BC3
+0x5564 = 0x5BC7
+0x5565 = 0x5BC9
+0x5566 = 0x5BD4
+0x5567 = 0x5BD0
+0x5568 = 0x5BE4
+0x5569 = 0x5BE6
+0x556A = 0x5BE2
+0x556B = 0x5BDE
+0x556C = 0x5BE5
+0x556D = 0x5BEB
+0x556E = 0x5BF0
+0x556F = 0x5BF6
+0x5570 = 0x5BF3
+0x5571 = 0x5C05
+0x5572 = 0x5C07
+0x5573 = 0x5C08
+0x5574 = 0x5C0D
+0x5575 = 0x5C13
+0x5576 = 0x5C20
+0x5577 = 0x5C22
+0x5578 = 0x5C28
+0x5579 = 0x5C38
+0x557A = 0x5C39
+0x557B = 0x5C41
+0x557C = 0x5C46
+0x557D = 0x5C4E
+0x557E = 0x5C53
+0x5621 = 0x5C50
+0x5622 = 0x5C4F
+0x5623 = 0x5B71
+0x5624 = 0x5C6C
+0x5625 = 0x5C6E
+0x5626 = 0x4E62
+0x5627 = 0x5C76
+0x5628 = 0x5C79
+0x5629 = 0x5C8C
+0x562A = 0x5C91
+0x562B = 0x5C94
+0x562C = 0x599B
+0x562D = 0x5CAB
+0x562E = 0x5CBB
+0x562F = 0x5CB6
+0x5630 = 0x5CBC
+0x5631 = 0x5CB7
+0x5632 = 0x5CC5
+0x5633 = 0x5CBE
+0x5634 = 0x5CC7
+0x5635 = 0x5CD9
+0x5636 = 0x5CE9
+0x5637 = 0x5CFD
+0x5638 = 0x5CFA
+0x5639 = 0x5CED
+0x563A = 0x5D8C
+0x563B = 0x5CEA
+0x563C = 0x5D0B
+0x563D = 0x5D15
+0x563E = 0x5D17
+0x563F = 0x5D5C
+0x5640 = 0x5D1F
+0x5641 = 0x5D1B
+0x5642 = 0x5D11
+0x5643 = 0x5D14
+0x5644 = 0x5D22
+0x5645 = 0x5D1A
+0x5646 = 0x5D19
+0x5647 = 0x5D18
+0x5648 = 0x5D4C
+0x5649 = 0x5D52
+0x564A = 0x5D4E
+0x564B = 0x5D4B
+0x564C = 0x5D6C
+0x564D = 0x5D73
+0x564E = 0x5D76
+0x564F = 0x5D87
+0x5650 = 0x5D84
+0x5651 = 0x5D82
+0x5652 = 0x5DA2
+0x5653 = 0x5D9D
+0x5654 = 0x5DAC
+0x5655 = 0x5DAE
+0x5656 = 0x5DBD
+0x5657 = 0x5D90
+0x5658 = 0x5DB7
+0x5659 = 0x5DBC
+0x565A = 0x5DC9
+0x565B = 0x5DCD
+0x565C = 0x5DD3
+0x565D = 0x5DD2
+0x565E = 0x5DD6
+0x565F = 0x5DDB
+0x5660 = 0x5DEB
+0x5661 = 0x5DF2
+0x5662 = 0x5DF5
+0x5663 = 0x5E0B
+0x5664 = 0x5E1A
+0x5665 = 0x5E19
+0x5666 = 0x5E11
+0x5667 = 0x5E1B
+0x5668 = 0x5E36
+0x5669 = 0x5E37
+0x566A = 0x5E44
+0x566B = 0x5E43
+0x566C = 0x5E40
+0x566D = 0x5E4E
+0x566E = 0x5E57
+0x566F = 0x5E54
+0x5670 = 0x5E5F
+0x5671 = 0x5E62
+0x5672 = 0x5E64
+0x5673 = 0x5E47
+0x5674 = 0x5E75
+0x5675 = 0x5E76
+0x5676 = 0x5E7A
+0x5677 = 0x9EBC
+0x5678 = 0x5E7F
+0x5679 = 0x5EA0
+0x567A = 0x5EC1
+0x567B = 0x5EC2
+0x567C = 0x5EC8
+0x567D = 0x5ED0
+0x567E = 0x5ECF
+0x5721 = 0x5ED6
+0x5722 = 0x5EE3
+0x5723 = 0x5EDD
+0x5724 = 0x5EDA
+0x5725 = 0x5EDB
+0x5726 = 0x5EE2
+0x5727 = 0x5EE1
+0x5728 = 0x5EE8
+0x5729 = 0x5EE9
+0x572A = 0x5EEC
+0x572B = 0x5EF1
+0x572C = 0x5EF3
+0x572D = 0x5EF0
+0x572E = 0x5EF4
+0x572F = 0x5EF8
+0x5730 = 0x5EFE
+0x5731 = 0x5F03
+0x5732 = 0x5F09
+0x5733 = 0x5F5D
+0x5734 = 0x5F5C
+0x5735 = 0x5F0B
+0x5736 = 0x5F11
+0x5737 = 0x5F16
+0x5738 = 0x5F29
+0x5739 = 0x5F2D
+0x573A = 0x5F38
+0x573B = 0x5F41
+0x573C = 0x5F48
+0x573D = 0x5F4C
+0x573E = 0x5F4E
+0x573F = 0x5F2F
+0x5740 = 0x5F51
+0x5741 = 0x5F56
+0x5742 = 0x5F57
+0x5743 = 0x5F59
+0x5744 = 0x5F61
+0x5745 = 0x5F6D
+0x5746 = 0x5F73
+0x5747 = 0x5F77
+0x5748 = 0x5F83
+0x5749 = 0x5F82
+0x574A = 0x5F7F
+0x574B = 0x5F8A
+0x574C = 0x5F88
+0x574D = 0x5F91
+0x574E = 0x5F87
+0x574F = 0x5F9E
+0x5750 = 0x5F99
+0x5751 = 0x5F98
+0x5752 = 0x5FA0
+0x5753 = 0x5FA8
+0x5754 = 0x5FAD
+0x5755 = 0x5FBC
+0x5756 = 0x5FD6
+0x5757 = 0x5FFB
+0x5758 = 0x5FE4
+0x5759 = 0x5FF8
+0x575A = 0x5FF1
+0x575B = 0x5FDD
+0x575C = 0x60B3
+0x575D = 0x5FFF
+0x575E = 0x6021
+0x575F = 0x6060
+0x5760 = 0x6019
+0x5761 = 0x6010
+0x5762 = 0x6029
+0x5763 = 0x600E
+0x5764 = 0x6031
+0x5765 = 0x601B
+0x5766 = 0x6015
+0x5767 = 0x602B
+0x5768 = 0x6026
+0x5769 = 0x600F
+0x576A = 0x603A
+0x576B = 0x605A
+0x576C = 0x6041
+0x576D = 0x606A
+0x576E = 0x6077
+0x576F = 0x605F
+0x5770 = 0x604A
+0x5771 = 0x6046
+0x5772 = 0x604D
+0x5773 = 0x6063
+0x5774 = 0x6043
+0x5775 = 0x6064
+0x5776 = 0x6042
+0x5777 = 0x606C
+0x5778 = 0x606B
+0x5779 = 0x6059
+0x577A = 0x6081
+0x577B = 0x608D
+0x577C = 0x60E7
+0x577D = 0x6083
+0x577E = 0x609A
+0x5821 = 0x6084
+0x5822 = 0x609B
+0x5823 = 0x6096
+0x5824 = 0x6097
+0x5825 = 0x6092
+0x5826 = 0x60A7
+0x5827 = 0x608B
+0x5828 = 0x60E1
+0x5829 = 0x60B8
+0x582A = 0x60E0
+0x582B = 0x60D3
+0x582C = 0x60B4
+0x582D = 0x5FF0
+0x582E = 0x60BD
+0x582F = 0x60C6
+0x5830 = 0x60B5
+0x5831 = 0x60D8
+0x5832 = 0x614D
+0x5833 = 0x6115
+0x5834 = 0x6106
+0x5835 = 0x60F6
+0x5836 = 0x60F7
+0x5837 = 0x6100
+0x5838 = 0x60F4
+0x5839 = 0x60FA
+0x583A = 0x6103
+0x583B = 0x6121
+0x583C = 0x60FB
+0x583D = 0x60F1
+0x583E = 0x610D
+0x583F = 0x610E
+0x5840 = 0x6147
+0x5841 = 0x613E
+0x5842 = 0x6128
+0x5843 = 0x6127
+0x5844 = 0x614A
+0x5845 = 0x613F
+0x5846 = 0x613C
+0x5847 = 0x612C
+0x5848 = 0x6134
+0x5849 = 0x613D
+0x584A = 0x6142
+0x584B = 0x6144
+0x584C = 0x6173
+0x584D = 0x6177
+0x584E = 0x6158
+0x584F = 0x6159
+0x5850 = 0x615A
+0x5851 = 0x616B
+0x5852 = 0x6174
+0x5853 = 0x616F
+0x5854 = 0x6165
+0x5855 = 0x6171
+0x5856 = 0x615F
+0x5857 = 0x615D
+0x5858 = 0x6153
+0x5859 = 0x6175
+0x585A = 0x6199
+0x585B = 0x6196
+0x585C = 0x6187
+0x585D = 0x61AC
+0x585E = 0x6194
+0x585F = 0x619A
+0x5860 = 0x618A
+0x5861 = 0x6191
+0x5862 = 0x61AB
+0x5863 = 0x61AE
+0x5864 = 0x61CC
+0x5865 = 0x61CA
+0x5866 = 0x61C9
+0x5867 = 0x61F7
+0x5868 = 0x61C8
+0x5869 = 0x61C3
+0x586A = 0x61C6
+0x586B = 0x61BA
+0x586C = 0x61CB
+0x586D = 0x7F79
+0x586E = 0x61CD
+0x586F = 0x61E6
+0x5870 = 0x61E3
+0x5871 = 0x61F6
+0x5872 = 0x61FA
+0x5873 = 0x61F4
+0x5874 = 0x61FF
+0x5875 = 0x61FD
+0x5876 = 0x61FC
+0x5877 = 0x61FE
+0x5878 = 0x6200
+0x5879 = 0x6208
+0x587A = 0x6209
+0x587B = 0x620D
+0x587C = 0x620C
+0x587D = 0x6214
+0x587E = 0x621B
+0x5921 = 0x621E
+0x5922 = 0x6221
+0x5923 = 0x622A
+0x5924 = 0x622E
+0x5925 = 0x6230
+0x5926 = 0x6232
+0x5927 = 0x6233
+0x5928 = 0x6241
+0x5929 = 0x624E
+0x592A = 0x625E
+0x592B = 0x6263
+0x592C = 0x625B
+0x592D = 0x6260
+0x592E = 0x6268
+0x592F = 0x627C
+0x5930 = 0x6282
+0x5931 = 0x6289
+0x5932 = 0x627E
+0x5933 = 0x6292
+0x5934 = 0x6293
+0x5935 = 0x6296
+0x5936 = 0x62D4
+0x5937 = 0x6283
+0x5938 = 0x6294
+0x5939 = 0x62D7
+0x593A = 0x62D1
+0x593B = 0x62BB
+0x593C = 0x62CF
+0x593D = 0x62FF
+0x593E = 0x62C6
+0x593F = 0x64D4
+0x5940 = 0x62C8
+0x5941 = 0x62DC
+0x5942 = 0x62CC
+0x5943 = 0x62CA
+0x5944 = 0x62C2
+0x5945 = 0x62C7
+0x5946 = 0x629B
+0x5947 = 0x62C9
+0x5948 = 0x630C
+0x5949 = 0x62EE
+0x594A = 0x62F1
+0x594B = 0x6327
+0x594C = 0x6302
+0x594D = 0x6308
+0x594E = 0x62EF
+0x594F = 0x62F5
+0x5950 = 0x6350
+0x5951 = 0x633E
+0x5952 = 0x634D
+0x5953 = 0x641C
+0x5954 = 0x634F
+0x5955 = 0x6396
+0x5956 = 0x638E
+0x5957 = 0x6380
+0x5958 = 0x63AB
+0x5959 = 0x6376
+0x595A = 0x63A3
+0x595B = 0x638F
+0x595C = 0x6389
+0x595D = 0x639F
+0x595E = 0x63B5
+0x595F = 0x636B
+0x5960 = 0x6369
+0x5961 = 0x63BE
+0x5962 = 0x63E9
+0x5963 = 0x63C0
+0x5964 = 0x63C6
+0x5965 = 0x63E3
+0x5966 = 0x63C9
+0x5967 = 0x63D2
+0x5968 = 0x63F6
+0x5969 = 0x63C4
+0x596A = 0x6416
+0x596B = 0x6434
+0x596C = 0x6406
+0x596D = 0x6413
+0x596E = 0x6426
+0x596F = 0x6436
+0x5970 = 0x651D
+0x5971 = 0x6417
+0x5972 = 0x6428
+0x5973 = 0x640F
+0x5974 = 0x6467
+0x5975 = 0x646F
+0x5976 = 0x6476
+0x5977 = 0x644E
+0x5978 = 0x652A
+0x5979 = 0x6495
+0x597A = 0x6493
+0x597B = 0x64A5
+0x597C = 0x64A9
+0x597D = 0x6488
+0x597E = 0x64BC
+0x5A21 = 0x64DA
+0x5A22 = 0x64D2
+0x5A23 = 0x64C5
+0x5A24 = 0x64C7
+0x5A25 = 0x64BB
+0x5A26 = 0x64D8
+0x5A27 = 0x64C2
+0x5A28 = 0x64F1
+0x5A29 = 0x64E7
+0x5A2A = 0x8209
+0x5A2B = 0x64E0
+0x5A2C = 0x64E1
+0x5A2D = 0x62AC
+0x5A2E = 0x64E3
+0x5A2F = 0x64EF
+0x5A30 = 0x652C
+0x5A31 = 0x64F6
+0x5A32 = 0x64F4
+0x5A33 = 0x64F2
+0x5A34 = 0x64FA
+0x5A35 = 0x6500
+0x5A36 = 0x64FD
+0x5A37 = 0x6518
+0x5A38 = 0x651C
+0x5A39 = 0x6505
+0x5A3A = 0x6524
+0x5A3B = 0x6523
+0x5A3C = 0x652B
+0x5A3D = 0x6534
+0x5A3E = 0x6535
+0x5A3F = 0x6537
+0x5A40 = 0x6536
+0x5A41 = 0x6538
+0x5A42 = 0x754B
+0x5A43 = 0x6548
+0x5A44 = 0x6556
+0x5A45 = 0x6555
+0x5A46 = 0x654D
+0x5A47 = 0x6558
+0x5A48 = 0x655E
+0x5A49 = 0x655D
+0x5A4A = 0x6572
+0x5A4B = 0x6578
+0x5A4C = 0x6582
+0x5A4D = 0x6583
+0x5A4E = 0x8B8A
+0x5A4F = 0x659B
+0x5A50 = 0x659F
+0x5A51 = 0x65AB
+0x5A52 = 0x65B7
+0x5A53 = 0x65C3
+0x5A54 = 0x65C6
+0x5A55 = 0x65C1
+0x5A56 = 0x65C4
+0x5A57 = 0x65CC
+0x5A58 = 0x65D2
+0x5A59 = 0x65DB
+0x5A5A = 0x65D9
+0x5A5B = 0x65E0
+0x5A5C = 0x65E1
+0x5A5D = 0x65F1
+0x5A5E = 0x6772
+0x5A5F = 0x660A
+0x5A60 = 0x6603
+0x5A61 = 0x65FB
+0x5A62 = 0x6773
+0x5A63 = 0x6635
+0x5A64 = 0x6636
+0x5A65 = 0x6634
+0x5A66 = 0x661C
+0x5A67 = 0x664F
+0x5A68 = 0x6644
+0x5A69 = 0x6649
+0x5A6A = 0x6641
+0x5A6B = 0x665E
+0x5A6C = 0x665D
+0x5A6D = 0x6664
+0x5A6E = 0x6667
+0x5A6F = 0x6668
+0x5A70 = 0x665F
+0x5A71 = 0x6662
+0x5A72 = 0x6670
+0x5A73 = 0x6683
+0x5A74 = 0x6688
+0x5A75 = 0x668E
+0x5A76 = 0x6689
+0x5A77 = 0x6684
+0x5A78 = 0x6698
+0x5A79 = 0x669D
+0x5A7A = 0x66C1
+0x5A7B = 0x66B9
+0x5A7C = 0x66C9
+0x5A7D = 0x66BE
+0x5A7E = 0x66BC
+0x5B21 = 0x66C4
+0x5B22 = 0x66B8
+0x5B23 = 0x66D6
+0x5B24 = 0x66DA
+0x5B25 = 0x66E0
+0x5B26 = 0x663F
+0x5B27 = 0x66E6
+0x5B28 = 0x66E9
+0x5B29 = 0x66F0
+0x5B2A = 0x66F5
+0x5B2B = 0x66F7
+0x5B2C = 0x670F
+0x5B2D = 0x6716
+0x5B2E = 0x671E
+0x5B2F = 0x6726
+0x5B30 = 0x6727
+0x5B31 = 0x9738
+0x5B32 = 0x672E
+0x5B33 = 0x673F
+0x5B34 = 0x6736
+0x5B35 = 0x6741
+0x5B36 = 0x6738
+0x5B37 = 0x6737
+0x5B38 = 0x6746
+0x5B39 = 0x675E
+0x5B3A = 0x6760
+0x5B3B = 0x6759
+0x5B3C = 0x6763
+0x5B3D = 0x6764
+0x5B3E = 0x6789
+0x5B3F = 0x6770
+0x5B40 = 0x67A9
+0x5B41 = 0x677C
+0x5B42 = 0x676A
+0x5B43 = 0x678C
+0x5B44 = 0x678B
+0x5B45 = 0x67A6
+0x5B46 = 0x67A1
+0x5B47 = 0x6785
+0x5B48 = 0x67B7
+0x5B49 = 0x67EF
+0x5B4A = 0x67B4
+0x5B4B = 0x67EC
+0x5B4C = 0x67B3
+0x5B4D = 0x67E9
+0x5B4E = 0x67B8
+0x5B4F = 0x67E4
+0x5B50 = 0x67DE
+0x5B51 = 0x67DD
+0x5B52 = 0x67E2
+0x5B53 = 0x67EE
+0x5B54 = 0x67B9
+0x5B55 = 0x67CE
+0x5B56 = 0x67C6
+0x5B57 = 0x67E7
+0x5B58 = 0x6A9C
+0x5B59 = 0x681E
+0x5B5A = 0x6846
+0x5B5B = 0x6829
+0x5B5C = 0x6840
+0x5B5D = 0x684D
+0x5B5E = 0x6832
+0x5B5F = 0x684E
+0x5B60 = 0x68B3
+0x5B61 = 0x682B
+0x5B62 = 0x6859
+0x5B63 = 0x6863
+0x5B64 = 0x6877
+0x5B65 = 0x687F
+0x5B66 = 0x689F
+0x5B67 = 0x688F
+0x5B68 = 0x68AD
+0x5B69 = 0x6894
+0x5B6A = 0x689D
+0x5B6B = 0x689B
+0x5B6C = 0x6883
+0x5B6D = 0x6AAE
+0x5B6E = 0x68B9
+0x5B6F = 0x6874
+0x5B70 = 0x68B5
+0x5B71 = 0x68A0
+0x5B72 = 0x68BA
+0x5B73 = 0x690F
+0x5B74 = 0x688D
+0x5B75 = 0x687E
+0x5B76 = 0x6901
+0x5B77 = 0x68CA
+0x5B78 = 0x6908
+0x5B79 = 0x68D8
+0x5B7A = 0x6922
+0x5B7B = 0x6926
+0x5B7C = 0x68E1
+0x5B7D = 0x690C
+0x5B7E = 0x68CD
+0x5C21 = 0x68D4
+0x5C22 = 0x68E7
+0x5C23 = 0x68D5
+0x5C24 = 0x6936
+0x5C25 = 0x6912
+0x5C26 = 0x6904
+0x5C27 = 0x68D7
+0x5C28 = 0x68E3
+0x5C29 = 0x6925
+0x5C2A = 0x68F9
+0x5C2B = 0x68E0
+0x5C2C = 0x68EF
+0x5C2D = 0x6928
+0x5C2E = 0x692A
+0x5C2F = 0x691A
+0x5C30 = 0x6923
+0x5C31 = 0x6921
+0x5C32 = 0x68C6
+0x5C33 = 0x6979
+0x5C34 = 0x6977
+0x5C35 = 0x695C
+0x5C36 = 0x6978
+0x5C37 = 0x696B
+0x5C38 = 0x6954
+0x5C39 = 0x697E
+0x5C3A = 0x696E
+0x5C3B = 0x6939
+0x5C3C = 0x6974
+0x5C3D = 0x693D
+0x5C3E = 0x6959
+0x5C3F = 0x6930
+0x5C40 = 0x6961
+0x5C41 = 0x695E
+0x5C42 = 0x695D
+0x5C43 = 0x6981
+0x5C44 = 0x696A
+0x5C45 = 0x69B2
+0x5C46 = 0x69AE
+0x5C47 = 0x69D0
+0x5C48 = 0x69BF
+0x5C49 = 0x69C1
+0x5C4A = 0x69D3
+0x5C4B = 0x69BE
+0x5C4C = 0x69CE
+0x5C4D = 0x5BE8
+0x5C4E = 0x69CA
+0x5C4F = 0x69DD
+0x5C50 = 0x69BB
+0x5C51 = 0x69C3
+0x5C52 = 0x69A7
+0x5C53 = 0x6A2E
+0x5C54 = 0x6991
+0x5C55 = 0x69A0
+0x5C56 = 0x699C
+0x5C57 = 0x6995
+0x5C58 = 0x69B4
+0x5C59 = 0x69DE
+0x5C5A = 0x69E8
+0x5C5B = 0x6A02
+0x5C5C = 0x6A1B
+0x5C5D = 0x69FF
+0x5C5E = 0x6B0A
+0x5C5F = 0x69F9
+0x5C60 = 0x69F2
+0x5C61 = 0x69E7
+0x5C62 = 0x6A05
+0x5C63 = 0x69B1
+0x5C64 = 0x6A1E
+0x5C65 = 0x69ED
+0x5C66 = 0x6A14
+0x5C67 = 0x69EB
+0x5C68 = 0x6A0A
+0x5C69 = 0x6A12
+0x5C6A = 0x6AC1
+0x5C6B = 0x6A23
+0x5C6C = 0x6A13
+0x5C6D = 0x6A44
+0x5C6E = 0x6A0C
+0x5C6F = 0x6A72
+0x5C70 = 0x6A36
+0x5C71 = 0x6A78
+0x5C72 = 0x6A47
+0x5C73 = 0x6A62
+0x5C74 = 0x6A59
+0x5C75 = 0x6A66
+0x5C76 = 0x6A48
+0x5C77 = 0x6A38
+0x5C78 = 0x6A22
+0x5C79 = 0x6A90
+0x5C7A = 0x6A8D
+0x5C7B = 0x6AA0
+0x5C7C = 0x6A84
+0x5C7D = 0x6AA2
+0x5C7E = 0x6AA3
+0x5D21 = 0x6A97
+0x5D22 = 0x8617
+0x5D23 = 0x6ABB
+0x5D24 = 0x6AC3
+0x5D25 = 0x6AC2
+0x5D26 = 0x6AB8
+0x5D27 = 0x6AB3
+0x5D28 = 0x6AAC
+0x5D29 = 0x6ADE
+0x5D2A = 0x6AD1
+0x5D2B = 0x6ADF
+0x5D2C = 0x6AAA
+0x5D2D = 0x6ADA
+0x5D2E = 0x6AEA
+0x5D2F = 0x6AFB
+0x5D30 = 0x6B05
+0x5D31 = 0x8616
+0x5D32 = 0x6AFA
+0x5D33 = 0x6B12
+0x5D34 = 0x6B16
+0x5D35 = 0x9B31
+0x5D36 = 0x6B1F
+0x5D37 = 0x6B38
+0x5D38 = 0x6B37
+0x5D39 = 0x76DC
+0x5D3A = 0x6B39
+0x5D3B = 0x98EE
+0x5D3C = 0x6B47
+0x5D3D = 0x6B43
+0x5D3E = 0x6B49
+0x5D3F = 0x6B50
+0x5D40 = 0x6B59
+0x5D41 = 0x6B54
+0x5D42 = 0x6B5B
+0x5D43 = 0x6B5F
+0x5D44 = 0x6B61
+0x5D45 = 0x6B78
+0x5D46 = 0x6B79
+0x5D47 = 0x6B7F
+0x5D48 = 0x6B80
+0x5D49 = 0x6B84
+0x5D4A = 0x6B83
+0x5D4B = 0x6B8D
+0x5D4C = 0x6B98
+0x5D4D = 0x6B95
+0x5D4E = 0x6B9E
+0x5D4F = 0x6BA4
+0x5D50 = 0x6BAA
+0x5D51 = 0x6BAB
+0x5D52 = 0x6BAF
+0x5D53 = 0x6BB2
+0x5D54 = 0x6BB1
+0x5D55 = 0x6BB3
+0x5D56 = 0x6BB7
+0x5D57 = 0x6BBC
+0x5D58 = 0x6BC6
+0x5D59 = 0x6BCB
+0x5D5A = 0x6BD3
+0x5D5B = 0x6BDF
+0x5D5C = 0x6BEC
+0x5D5D = 0x6BEB
+0x5D5E = 0x6BF3
+0x5D5F = 0x6BEF
+0x5D60 = 0x9EBE
+0x5D61 = 0x6C08
+0x5D62 = 0x6C13
+0x5D63 = 0x6C14
+0x5D64 = 0x6C1B
+0x5D65 = 0x6C24
+0x5D66 = 0x6C23
+0x5D67 = 0x6C5E
+0x5D68 = 0x6C55
+0x5D69 = 0x6C62
+0x5D6A = 0x6C6A
+0x5D6B = 0x6C82
+0x5D6C = 0x6C8D
+0x5D6D = 0x6C9A
+0x5D6E = 0x6C81
+0x5D6F = 0x6C9B
+0x5D70 = 0x6C7E
+0x5D71 = 0x6C68
+0x5D72 = 0x6C73
+0x5D73 = 0x6C92
+0x5D74 = 0x6C90
+0x5D75 = 0x6CC4
+0x5D76 = 0x6CF1
+0x5D77 = 0x6CD3
+0x5D78 = 0x6CBD
+0x5D79 = 0x6CD7
+0x5D7A = 0x6CC5
+0x5D7B = 0x6CDD
+0x5D7C = 0x6CAE
+0x5D7D = 0x6CB1
+0x5D7E = 0x6CBE
+0x5E21 = 0x6CBA
+0x5E22 = 0x6CDB
+0x5E23 = 0x6CEF
+0x5E24 = 0x6CD9
+0x5E25 = 0x6CEA
+0x5E26 = 0x6D1F
+0x5E27 = 0x884D
+0x5E28 = 0x6D36
+0x5E29 = 0x6D2B
+0x5E2A = 0x6D3D
+0x5E2B = 0x6D38
+0x5E2C = 0x6D19
+0x5E2D = 0x6D35
+0x5E2E = 0x6D33
+0x5E2F = 0x6D12
+0x5E30 = 0x6D0C
+0x5E31 = 0x6D63
+0x5E32 = 0x6D93
+0x5E33 = 0x6D64
+0x5E34 = 0x6D5A
+0x5E35 = 0x6D79
+0x5E36 = 0x6D59
+0x5E37 = 0x6D8E
+0x5E38 = 0x6D95
+0x5E39 = 0x6FE4
+0x5E3A = 0x6D85
+0x5E3B = 0x6DF9
+0x5E3C = 0x6E15
+0x5E3D = 0x6E0A
+0x5E3E = 0x6DB5
+0x5E3F = 0x6DC7
+0x5E40 = 0x6DE6
+0x5E41 = 0x6DB8
+0x5E42 = 0x6DC6
+0x5E43 = 0x6DEC
+0x5E44 = 0x6DDE
+0x5E45 = 0x6DCC
+0x5E46 = 0x6DE8
+0x5E47 = 0x6DD2
+0x5E48 = 0x6DC5
+0x5E49 = 0x6DFA
+0x5E4A = 0x6DD9
+0x5E4B = 0x6DE4
+0x5E4C = 0x6DD5
+0x5E4D = 0x6DEA
+0x5E4E = 0x6DEE
+0x5E4F = 0x6E2D
+0x5E50 = 0x6E6E
+0x5E51 = 0x6E2E
+0x5E52 = 0x6E19
+0x5E53 = 0x6E72
+0x5E54 = 0x6E5F
+0x5E55 = 0x6E3E
+0x5E56 = 0x6E23
+0x5E57 = 0x6E6B
+0x5E58 = 0x6E2B
+0x5E59 = 0x6E76
+0x5E5A = 0x6E4D
+0x5E5B = 0x6E1F
+0x5E5C = 0x6E43
+0x5E5D = 0x6E3A
+0x5E5E = 0x6E4E
+0x5E5F = 0x6E24
+0x5E60 = 0x6EFF
+0x5E61 = 0x6E1D
+0x5E62 = 0x6E38
+0x5E63 = 0x6E82
+0x5E64 = 0x6EAA
+0x5E65 = 0x6E98
+0x5E66 = 0x6EC9
+0x5E67 = 0x6EB7
+0x5E68 = 0x6ED3
+0x5E69 = 0x6EBD
+0x5E6A = 0x6EAF
+0x5E6B = 0x6EC4
+0x5E6C = 0x6EB2
+0x5E6D = 0x6ED4
+0x5E6E = 0x6ED5
+0x5E6F = 0x6E8F
+0x5E70 = 0x6EA5
+0x5E71 = 0x6EC2
+0x5E72 = 0x6E9F
+0x5E73 = 0x6F41
+0x5E74 = 0x6F11
+0x5E75 = 0x704C
+0x5E76 = 0x6EEC
+0x5E77 = 0x6EF8
+0x5E78 = 0x6EFE
+0x5E79 = 0x6F3F
+0x5E7A = 0x6EF2
+0x5E7B = 0x6F31
+0x5E7C = 0x6EEF
+0x5E7D = 0x6F32
+0x5E7E = 0x6ECC
+0x5F21 = 0x6F3E
+0x5F22 = 0x6F13
+0x5F23 = 0x6EF7
+0x5F24 = 0x6F86
+0x5F25 = 0x6F7A
+0x5F26 = 0x6F78
+0x5F27 = 0x6F81
+0x5F28 = 0x6F80
+0x5F29 = 0x6F6F
+0x5F2A = 0x6F5B
+0x5F2B = 0x6FF3
+0x5F2C = 0x6F6D
+0x5F2D = 0x6F82
+0x5F2E = 0x6F7C
+0x5F2F = 0x6F58
+0x5F30 = 0x6F8E
+0x5F31 = 0x6F91
+0x5F32 = 0x6FC2
+0x5F33 = 0x6F66
+0x5F34 = 0x6FB3
+0x5F35 = 0x6FA3
+0x5F36 = 0x6FA1
+0x5F37 = 0x6FA4
+0x5F38 = 0x6FB9
+0x5F39 = 0x6FC6
+0x5F3A = 0x6FAA
+0x5F3B = 0x6FDF
+0x5F3C = 0x6FD5
+0x5F3D = 0x6FEC
+0x5F3E = 0x6FD4
+0x5F3F = 0x6FD8
+0x5F40 = 0x6FF1
+0x5F41 = 0x6FEE
+0x5F42 = 0x6FDB
+0x5F43 = 0x7009
+0x5F44 = 0x700B
+0x5F45 = 0x6FFA
+0x5F46 = 0x7011
+0x5F47 = 0x7001
+0x5F48 = 0x700F
+0x5F49 = 0x6FFE
+0x5F4A = 0x701B
+0x5F4B = 0x701A
+0x5F4C = 0x6F74
+0x5F4D = 0x701D
+0x5F4E = 0x7018
+0x5F4F = 0x701F
+0x5F50 = 0x7030
+0x5F51 = 0x703E
+0x5F52 = 0x7032
+0x5F53 = 0x7051
+0x5F54 = 0x7063
+0x5F55 = 0x7099
+0x5F56 = 0x7092
+0x5F57 = 0x70AF
+0x5F58 = 0x70F1
+0x5F59 = 0x70AC
+0x5F5A = 0x70B8
+0x5F5B = 0x70B3
+0x5F5C = 0x70AE
+0x5F5D = 0x70DF
+0x5F5E = 0x70CB
+0x5F5F = 0x70DD
+0x5F60 = 0x70D9
+0x5F61 = 0x7109
+0x5F62 = 0x70FD
+0x5F63 = 0x711C
+0x5F64 = 0x7119
+0x5F65 = 0x7165
+0x5F66 = 0x7155
+0x5F67 = 0x7188
+0x5F68 = 0x7166
+0x5F69 = 0x7162
+0x5F6A = 0x714C
+0x5F6B = 0x7156
+0x5F6C = 0x716C
+0x5F6D = 0x718F
+0x5F6E = 0x71FB
+0x5F6F = 0x7184
+0x5F70 = 0x7195
+0x5F71 = 0x71A8
+0x5F72 = 0x71AC
+0x5F73 = 0x71D7
+0x5F74 = 0x71B9
+0x5F75 = 0x71BE
+0x5F76 = 0x71D2
+0x5F77 = 0x71C9
+0x5F78 = 0x71D4
+0x5F79 = 0x71CE
+0x5F7A = 0x71E0
+0x5F7B = 0x71EC
+0x5F7C = 0x71E7
+0x5F7D = 0x71F5
+0x5F7E = 0x71FC
+0x6021 = 0x71F9
+0x6022 = 0x71FF
+0x6023 = 0x720D
+0x6024 = 0x7210
+0x6025 = 0x721B
+0x6026 = 0x7228
+0x6027 = 0x722D
+0x6028 = 0x722C
+0x6029 = 0x7230
+0x602A = 0x7232
+0x602B = 0x723B
+0x602C = 0x723C
+0x602D = 0x723F
+0x602E = 0x7240
+0x602F = 0x7246
+0x6030 = 0x724B
+0x6031 = 0x7258
+0x6032 = 0x7274
+0x6033 = 0x727E
+0x6034 = 0x7282
+0x6035 = 0x7281
+0x6036 = 0x7287
+0x6037 = 0x7292
+0x6038 = 0x7296
+0x6039 = 0x72A2
+0x603A = 0x72A7
+0x603B = 0x72B9
+0x603C = 0x72B2
+0x603D = 0x72C3
+0x603E = 0x72C6
+0x603F = 0x72C4
+0x6040 = 0x72CE
+0x6041 = 0x72D2
+0x6042 = 0x72E2
+0x6043 = 0x72E0
+0x6044 = 0x72E1
+0x6045 = 0x72F9
+0x6046 = 0x72F7
+0x6047 = 0x500F
+0x6048 = 0x7317
+0x6049 = 0x730A
+0x604A = 0x731C
+0x604B = 0x7316
+0x604C = 0x731D
+0x604D = 0x7334
+0x604E = 0x732F
+0x604F = 0x7329
+0x6050 = 0x7325
+0x6051 = 0x733E
+0x6052 = 0x734E
+0x6053 = 0x734F
+0x6054 = 0x9ED8
+0x6055 = 0x7357
+0x6056 = 0x736A
+0x6057 = 0x7368
+0x6058 = 0x7370
+0x6059 = 0x7378
+0x605A = 0x7375
+0x605B = 0x737B
+0x605C = 0x737A
+0x605D = 0x73C8
+0x605E = 0x73B3
+0x605F = 0x73CE
+0x6060 = 0x73BB
+0x6061 = 0x73C0
+0x6062 = 0x73E5
+0x6063 = 0x73EE
+0x6064 = 0x73DE
+0x6065 = 0x74A2
+0x6066 = 0x7405
+0x6067 = 0x746F
+0x6068 = 0x7425
+0x6069 = 0x73F8
+0x606A = 0x7432
+0x606B = 0x743A
+0x606C = 0x7455
+0x606D = 0x743F
+0x606E = 0x745F
+0x606F = 0x7459
+0x6070 = 0x7441
+0x6071 = 0x745C
+0x6072 = 0x7469
+0x6073 = 0x7470
+0x6074 = 0x7463
+0x6075 = 0x746A
+0x6076 = 0x7476
+0x6077 = 0x747E
+0x6078 = 0x748B
+0x6079 = 0x749E
+0x607A = 0x74A7
+0x607B = 0x74CA
+0x607C = 0x74CF
+0x607D = 0x74D4
+0x607E = 0x73F1
+0x6121 = 0x74E0
+0x6122 = 0x74E3
+0x6123 = 0x74E7
+0x6124 = 0x74E9
+0x6125 = 0x74EE
+0x6126 = 0x74F2
+0x6127 = 0x74F0
+0x6128 = 0x74F1
+0x6129 = 0x74F8
+0x612A = 0x74F7
+0x612B = 0x7504
+0x612C = 0x7503
+0x612D = 0x7505
+0x612E = 0x750C
+0x612F = 0x750E
+0x6130 = 0x750D
+0x6131 = 0x7515
+0x6132 = 0x7513
+0x6133 = 0x751E
+0x6134 = 0x7526
+0x6135 = 0x752C
+0x6136 = 0x753C
+0x6137 = 0x7544
+0x6138 = 0x754D
+0x6139 = 0x754A
+0x613A = 0x7549
+0x613B = 0x755B
+0x613C = 0x7546
+0x613D = 0x755A
+0x613E = 0x7569
+0x613F = 0x7564
+0x6140 = 0x7567
+0x6141 = 0x756B
+0x6142 = 0x756D
+0x6143 = 0x7578
+0x6144 = 0x7576
+0x6145 = 0x7586
+0x6146 = 0x7587
+0x6147 = 0x7574
+0x6148 = 0x758A
+0x6149 = 0x7589
+0x614A = 0x7582
+0x614B = 0x7594
+0x614C = 0x759A
+0x614D = 0x759D
+0x614E = 0x75A5
+0x614F = 0x75A3
+0x6150 = 0x75C2
+0x6151 = 0x75B3
+0x6152 = 0x75C3
+0x6153 = 0x75B5
+0x6154 = 0x75BD
+0x6155 = 0x75B8
+0x6156 = 0x75BC
+0x6157 = 0x75B1
+0x6158 = 0x75CD
+0x6159 = 0x75CA
+0x615A = 0x75D2
+0x615B = 0x75D9
+0x615C = 0x75E3
+0x615D = 0x75DE
+0x615E = 0x75FE
+0x615F = 0x75FF
+0x6160 = 0x75FC
+0x6161 = 0x7601
+0x6162 = 0x75F0
+0x6163 = 0x75FA
+0x6164 = 0x75F2
+0x6165 = 0x75F3
+0x6166 = 0x760B
+0x6167 = 0x760D
+0x6168 = 0x7609
+0x6169 = 0x761F
+0x616A = 0x7627
+0x616B = 0x7620
+0x616C = 0x7621
+0x616D = 0x7622
+0x616E = 0x7624
+0x616F = 0x7634
+0x6170 = 0x7630
+0x6171 = 0x763B
+0x6172 = 0x7647
+0x6173 = 0x7648
+0x6174 = 0x7646
+0x6175 = 0x765C
+0x6176 = 0x7658
+0x6177 = 0x7661
+0x6178 = 0x7662
+0x6179 = 0x7668
+0x617A = 0x7669
+0x617B = 0x766A
+0x617C = 0x7667
+0x617D = 0x766C
+0x617E = 0x7670
+0x6221 = 0x7672
+0x6222 = 0x7676
+0x6223 = 0x7678
+0x6224 = 0x767C
+0x6225 = 0x7680
+0x6226 = 0x7683
+0x6227 = 0x7688
+0x6228 = 0x768B
+0x6229 = 0x768E
+0x622A = 0x7696
+0x622B = 0x7693
+0x622C = 0x7699
+0x622D = 0x769A
+0x622E = 0x76B0
+0x622F = 0x76B4
+0x6230 = 0x76B8
+0x6231 = 0x76B9
+0x6232 = 0x76BA
+0x6233 = 0x76C2
+0x6234 = 0x76CD
+0x6235 = 0x76D6
+0x6236 = 0x76D2
+0x6237 = 0x76DE
+0x6238 = 0x76E1
+0x6239 = 0x76E5
+0x623A = 0x76E7
+0x623B = 0x76EA
+0x623C = 0x862F
+0x623D = 0x76FB
+0x623E = 0x7708
+0x623F = 0x7707
+0x6240 = 0x7704
+0x6241 = 0x7729
+0x6242 = 0x7724
+0x6243 = 0x771E
+0x6244 = 0x7725
+0x6245 = 0x7726
+0x6246 = 0x771B
+0x6247 = 0x7737
+0x6248 = 0x7738
+0x6249 = 0x7747
+0x624A = 0x775A
+0x624B = 0x7768
+0x624C = 0x776B
+0x624D = 0x775B
+0x624E = 0x7765
+0x624F = 0x777F
+0x6250 = 0x777E
+0x6251 = 0x7779
+0x6252 = 0x778E
+0x6253 = 0x778B
+0x6254 = 0x7791
+0x6255 = 0x77A0
+0x6256 = 0x779E
+0x6257 = 0x77B0
+0x6258 = 0x77B6
+0x6259 = 0x77B9
+0x625A = 0x77BF
+0x625B = 0x77BC
+0x625C = 0x77BD
+0x625D = 0x77BB
+0x625E = 0x77C7
+0x625F = 0x77CD
+0x6260 = 0x77D7
+0x6261 = 0x77DA
+0x6262 = 0x77DC
+0x6263 = 0x77E3
+0x6264 = 0x77EE
+0x6265 = 0x77FC
+0x6266 = 0x780C
+0x6267 = 0x7812
+0x6268 = 0x7926
+0x6269 = 0x7820
+0x626A = 0x792A
+0x626B = 0x7845
+0x626C = 0x788E
+0x626D = 0x7874
+0x626E = 0x7886
+0x626F = 0x787C
+0x6270 = 0x789A
+0x6271 = 0x788C
+0x6272 = 0x78A3
+0x6273 = 0x78B5
+0x6274 = 0x78AA
+0x6275 = 0x78AF
+0x6276 = 0x78D1
+0x6277 = 0x78C6
+0x6278 = 0x78CB
+0x6279 = 0x78D4
+0x627A = 0x78BE
+0x627B = 0x78BC
+0x627C = 0x78C5
+0x627D = 0x78CA
+0x627E = 0x78EC
+0x6321 = 0x78E7
+0x6322 = 0x78DA
+0x6323 = 0x78FD
+0x6324 = 0x78F4
+0x6325 = 0x7907
+0x6326 = 0x7912
+0x6327 = 0x7911
+0x6328 = 0x7919
+0x6329 = 0x792C
+0x632A = 0x792B
+0x632B = 0x7940
+0x632C = 0x7960
+0x632D = 0x7957
+0x632E = 0x795F
+0x632F = 0x795A
+0x6330 = 0x7955
+0x6331 = 0x7953
+0x6332 = 0x797A
+0x6333 = 0x797F
+0x6334 = 0x798A
+0x6335 = 0x799D
+0x6336 = 0x79A7
+0x6337 = 0x9F4B
+0x6338 = 0x79AA
+0x6339 = 0x79AE
+0x633A = 0x79B3
+0x633B = 0x79B9
+0x633C = 0x79BA
+0x633D = 0x79C9
+0x633E = 0x79D5
+0x633F = 0x79E7
+0x6340 = 0x79EC
+0x6341 = 0x79E1
+0x6342 = 0x79E3
+0x6343 = 0x7A08
+0x6344 = 0x7A0D
+0x6345 = 0x7A18
+0x6346 = 0x7A19
+0x6347 = 0x7A20
+0x6348 = 0x7A1F
+0x6349 = 0x7980
+0x634A = 0x7A31
+0x634B = 0x7A3B
+0x634C = 0x7A3E
+0x634D = 0x7A37
+0x634E = 0x7A43
+0x634F = 0x7A57
+0x6350 = 0x7A49
+0x6351 = 0x7A61
+0x6352 = 0x7A62
+0x6353 = 0x7A69
+0x6354 = 0x9F9D
+0x6355 = 0x7A70
+0x6356 = 0x7A79
+0x6357 = 0x7A7D
+0x6358 = 0x7A88
+0x6359 = 0x7A97
+0x635A = 0x7A95
+0x635B = 0x7A98
+0x635C = 0x7A96
+0x635D = 0x7AA9
+0x635E = 0x7AC8
+0x635F = 0x7AB0
+0x6360 = 0x7AB6
+0x6361 = 0x7AC5
+0x6362 = 0x7AC4
+0x6363 = 0x7ABF
+0x6364 = 0x9083
+0x6365 = 0x7AC7
+0x6366 = 0x7ACA
+0x6367 = 0x7ACD
+0x6368 = 0x7ACF
+0x6369 = 0x7AD5
+0x636A = 0x7AD3
+0x636B = 0x7AD9
+0x636C = 0x7ADA
+0x636D = 0x7ADD
+0x636E = 0x7AE1
+0x636F = 0x7AE2
+0x6370 = 0x7AE6
+0x6371 = 0x7AED
+0x6372 = 0x7AF0
+0x6373 = 0x7B02
+0x6374 = 0x7B0F
+0x6375 = 0x7B0A
+0x6376 = 0x7B06
+0x6377 = 0x7B33
+0x6378 = 0x7B18
+0x6379 = 0x7B19
+0x637A = 0x7B1E
+0x637B = 0x7B35
+0x637C = 0x7B28
+0x637D = 0x7B36
+0x637E = 0x7B50
+0x6421 = 0x7B7A
+0x6422 = 0x7B04
+0x6423 = 0x7B4D
+0x6424 = 0x7B0B
+0x6425 = 0x7B4C
+0x6426 = 0x7B45
+0x6427 = 0x7B75
+0x6428 = 0x7B65
+0x6429 = 0x7B74
+0x642A = 0x7B67
+0x642B = 0x7B70
+0x642C = 0x7B71
+0x642D = 0x7B6C
+0x642E = 0x7B6E
+0x642F = 0x7B9D
+0x6430 = 0x7B98
+0x6431 = 0x7B9F
+0x6432 = 0x7B8D
+0x6433 = 0x7B9C
+0x6434 = 0x7B9A
+0x6435 = 0x7B8B
+0x6436 = 0x7B92
+0x6437 = 0x7B8F
+0x6438 = 0x7B5D
+0x6439 = 0x7B99
+0x643A = 0x7BCB
+0x643B = 0x7BC1
+0x643C = 0x7BCC
+0x643D = 0x7BCF
+0x643E = 0x7BB4
+0x643F = 0x7BC6
+0x6440 = 0x7BDD
+0x6441 = 0x7BE9
+0x6442 = 0x7C11
+0x6443 = 0x7C14
+0x6444 = 0x7BE6
+0x6445 = 0x7BE5
+0x6446 = 0x7C60
+0x6447 = 0x7C00
+0x6448 = 0x7C07
+0x6449 = 0x7C13
+0x644A = 0x7BF3
+0x644B = 0x7BF7
+0x644C = 0x7C17
+0x644D = 0x7C0D
+0x644E = 0x7BF6
+0x644F = 0x7C23
+0x6450 = 0x7C27
+0x6451 = 0x7C2A
+0x6452 = 0x7C1F
+0x6453 = 0x7C37
+0x6454 = 0x7C2B
+0x6455 = 0x7C3D
+0x6456 = 0x7C4C
+0x6457 = 0x7C43
+0x6458 = 0x7C54
+0x6459 = 0x7C4F
+0x645A = 0x7C40
+0x645B = 0x7C50
+0x645C = 0x7C58
+0x645D = 0x7C5F
+0x645E = 0x7C64
+0x645F = 0x7C56
+0x6460 = 0x7C65
+0x6461 = 0x7C6C
+0x6462 = 0x7C75
+0x6463 = 0x7C83
+0x6464 = 0x7C90
+0x6465 = 0x7CA4
+0x6466 = 0x7CAD
+0x6467 = 0x7CA2
+0x6468 = 0x7CAB
+0x6469 = 0x7CA1
+0x646A = 0x7CA8
+0x646B = 0x7CB3
+0x646C = 0x7CB2
+0x646D = 0x7CB1
+0x646E = 0x7CAE
+0x646F = 0x7CB9
+0x6470 = 0x7CBD
+0x6471 = 0x7CC0
+0x6472 = 0x7CC5
+0x6473 = 0x7CC2
+0x6474 = 0x7CD8
+0x6475 = 0x7CD2
+0x6476 = 0x7CDC
+0x6477 = 0x7CE2
+0x6478 = 0x9B3B
+0x6479 = 0x7CEF
+0x647A = 0x7CF2
+0x647B = 0x7CF4
+0x647C = 0x7CF6
+0x647D = 0x7CFA
+0x647E = 0x7D06
+0x6521 = 0x7D02
+0x6522 = 0x7D1C
+0x6523 = 0x7D15
+0x6524 = 0x7D0A
+0x6525 = 0x7D45
+0x6526 = 0x7D4B
+0x6527 = 0x7D2E
+0x6528 = 0x7D32
+0x6529 = 0x7D3F
+0x652A = 0x7D35
+0x652B = 0x7D46
+0x652C = 0x7D73
+0x652D = 0x7D56
+0x652E = 0x7D4E
+0x652F = 0x7D72
+0x6530 = 0x7D68
+0x6531 = 0x7D6E
+0x6532 = 0x7D4F
+0x6533 = 0x7D63
+0x6534 = 0x7D93
+0x6535 = 0x7D89
+0x6536 = 0x7D5B
+0x6537 = 0x7D8F
+0x6538 = 0x7D7D
+0x6539 = 0x7D9B
+0x653A = 0x7DBA
+0x653B = 0x7DAE
+0x653C = 0x7DA3
+0x653D = 0x7DB5
+0x653E = 0x7DC7
+0x653F = 0x7DBD
+0x6540 = 0x7DAB
+0x6541 = 0x7E3D
+0x6542 = 0x7DA2
+0x6543 = 0x7DAF
+0x6544 = 0x7DDC
+0x6545 = 0x7DB8
+0x6546 = 0x7D9F
+0x6547 = 0x7DB0
+0x6548 = 0x7DD8
+0x6549 = 0x7DDD
+0x654A = 0x7DE4
+0x654B = 0x7DDE
+0x654C = 0x7DFB
+0x654D = 0x7DF2
+0x654E = 0x7DE1
+0x654F = 0x7E05
+0x6550 = 0x7E0A
+0x6551 = 0x7E23
+0x6552 = 0x7E21
+0x6553 = 0x7E12
+0x6554 = 0x7E31
+0x6555 = 0x7E1F
+0x6556 = 0x7E09
+0x6557 = 0x7E0B
+0x6558 = 0x7E22
+0x6559 = 0x7E46
+0x655A = 0x7E66
+0x655B = 0x7E3B
+0x655C = 0x7E35
+0x655D = 0x7E39
+0x655E = 0x7E43
+0x655F = 0x7E37
+0x6560 = 0x7E32
+0x6561 = 0x7E3A
+0x6562 = 0x7E67
+0x6563 = 0x7E5D
+0x6564 = 0x7E56
+0x6565 = 0x7E5E
+0x6566 = 0x7E59
+0x6567 = 0x7E5A
+0x6568 = 0x7E79
+0x6569 = 0x7E6A
+0x656A = 0x7E69
+0x656B = 0x7E7C
+0x656C = 0x7E7B
+0x656D = 0x7E83
+0x656E = 0x7DD5
+0x656F = 0x7E7D
+0x6570 = 0x8FAE
+0x6571 = 0x7E7F
+0x6572 = 0x7E88
+0x6573 = 0x7E89
+0x6574 = 0x7E8C
+0x6575 = 0x7E92
+0x6576 = 0x7E90
+0x6577 = 0x7E93
+0x6578 = 0x7E94
+0x6579 = 0x7E96
+0x657A = 0x7E8E
+0x657B = 0x7E9B
+0x657C = 0x7E9C
+0x657D = 0x7F38
+0x657E = 0x7F3A
+0x6621 = 0x7F45
+0x6622 = 0x7F4C
+0x6623 = 0x7F4D
+0x6624 = 0x7F4E
+0x6625 = 0x7F50
+0x6626 = 0x7F51
+0x6627 = 0x7F55
+0x6628 = 0x7F54
+0x6629 = 0x7F58
+0x662A = 0x7F5F
+0x662B = 0x7F60
+0x662C = 0x7F68
+0x662D = 0x7F69
+0x662E = 0x7F67
+0x662F = 0x7F78
+0x6630 = 0x7F82
+0x6631 = 0x7F86
+0x6632 = 0x7F83
+0x6633 = 0x7F88
+0x6634 = 0x7F87
+0x6635 = 0x7F8C
+0x6636 = 0x7F94
+0x6637 = 0x7F9E
+0x6638 = 0x7F9D
+0x6639 = 0x7F9A
+0x663A = 0x7FA3
+0x663B = 0x7FAF
+0x663C = 0x7FB2
+0x663D = 0x7FB9
+0x663E = 0x7FAE
+0x663F = 0x7FB6
+0x6640 = 0x7FB8
+0x6641 = 0x8B71
+0x6642 = 0x7FC5
+0x6643 = 0x7FC6
+0x6644 = 0x7FCA
+0x6645 = 0x7FD5
+0x6646 = 0x7FD4
+0x6647 = 0x7FE1
+0x6648 = 0x7FE6
+0x6649 = 0x7FE9
+0x664A = 0x7FF3
+0x664B = 0x7FF9
+0x664C = 0x98DC
+0x664D = 0x8006
+0x664E = 0x8004
+0x664F = 0x800B
+0x6650 = 0x8012
+0x6651 = 0x8018
+0x6652 = 0x8019
+0x6653 = 0x801C
+0x6654 = 0x8021
+0x6655 = 0x8028
+0x6656 = 0x803F
+0x6657 = 0x803B
+0x6658 = 0x804A
+0x6659 = 0x8046
+0x665A = 0x8052
+0x665B = 0x8058
+0x665C = 0x805A
+0x665D = 0x805F
+0x665E = 0x8062
+0x665F = 0x8068
+0x6660 = 0x8073
+0x6661 = 0x8072
+0x6662 = 0x8070
+0x6663 = 0x8076
+0x6664 = 0x8079
+0x6665 = 0x807D
+0x6666 = 0x807F
+0x6667 = 0x8084
+0x6668 = 0x8086
+0x6669 = 0x8085
+0x666A = 0x809B
+0x666B = 0x8093
+0x666C = 0x809A
+0x666D = 0x80AD
+0x666E = 0x5190
+0x666F = 0x80AC
+0x6670 = 0x80DB
+0x6671 = 0x80E5
+0x6672 = 0x80D9
+0x6673 = 0x80DD
+0x6674 = 0x80C4
+0x6675 = 0x80DA
+0x6676 = 0x80D6
+0x6677 = 0x8109
+0x6678 = 0x80EF
+0x6679 = 0x80F1
+0x667A = 0x811B
+0x667B = 0x8129
+0x667C = 0x8123
+0x667D = 0x812F
+0x667E = 0x814B
+0x6721 = 0x968B
+0x6722 = 0x8146
+0x6723 = 0x813E
+0x6724 = 0x8153
+0x6725 = 0x8151
+0x6726 = 0x80FC
+0x6727 = 0x8171
+0x6728 = 0x816E
+0x6729 = 0x8165
+0x672A = 0x8166
+0x672B = 0x8174
+0x672C = 0x8183
+0x672D = 0x8188
+0x672E = 0x818A
+0x672F = 0x8180
+0x6730 = 0x8182
+0x6731 = 0x81A0
+0x6732 = 0x8195
+0x6733 = 0x81A4
+0x6734 = 0x81A3
+0x6735 = 0x815F
+0x6736 = 0x8193
+0x6737 = 0x81A9
+0x6738 = 0x81B0
+0x6739 = 0x81B5
+0x673A = 0x81BE
+0x673B = 0x81B8
+0x673C = 0x81BD
+0x673D = 0x81C0
+0x673E = 0x81C2
+0x673F = 0x81BA
+0x6740 = 0x81C9
+0x6741 = 0x81CD
+0x6742 = 0x81D1
+0x6743 = 0x81D9
+0x6744 = 0x81D8
+0x6745 = 0x81C8
+0x6746 = 0x81DA
+0x6747 = 0x81DF
+0x6748 = 0x81E0
+0x6749 = 0x81E7
+0x674A = 0x81FA
+0x674B = 0x81FB
+0x674C = 0x81FE
+0x674D = 0x8201
+0x674E = 0x8202
+0x674F = 0x8205
+0x6750 = 0x8207
+0x6751 = 0x820A
+0x6752 = 0x820D
+0x6753 = 0x8210
+0x6754 = 0x8216
+0x6755 = 0x8229
+0x6756 = 0x822B
+0x6757 = 0x8238
+0x6758 = 0x8233
+0x6759 = 0x8240
+0x675A = 0x8259
+0x675B = 0x8258
+0x675C = 0x825D
+0x675D = 0x825A
+0x675E = 0x825F
+0x675F = 0x8264
+0x6760 = 0x8262
+0x6761 = 0x8268
+0x6762 = 0x826A
+0x6763 = 0x826B
+0x6764 = 0x822E
+0x6765 = 0x8271
+0x6766 = 0x8277
+0x6767 = 0x8278
+0x6768 = 0x827E
+0x6769 = 0x828D
+0x676A = 0x8292
+0x676B = 0x82AB
+0x676C = 0x829F
+0x676D = 0x82BB
+0x676E = 0x82AC
+0x676F = 0x82E1
+0x6770 = 0x82E3
+0x6771 = 0x82DF
+0x6772 = 0x82D2
+0x6773 = 0x82F4
+0x6774 = 0x82F3
+0x6775 = 0x82FA
+0x6776 = 0x8393
+0x6777 = 0x8303
+0x6778 = 0x82FB
+0x6779 = 0x82F9
+0x677A = 0x82DE
+0x677B = 0x8306
+0x677C = 0x82DC
+0x677D = 0x8309
+0x677E = 0x82D9
+0x6821 = 0x8335
+0x6822 = 0x8334
+0x6823 = 0x8316
+0x6824 = 0x8332
+0x6825 = 0x8331
+0x6826 = 0x8340
+0x6827 = 0x8339
+0x6828 = 0x8350
+0x6829 = 0x8345
+0x682A = 0x832F
+0x682B = 0x832B
+0x682C = 0x8317
+0x682D = 0x8318
+0x682E = 0x8385
+0x682F = 0x839A
+0x6830 = 0x83AA
+0x6831 = 0x839F
+0x6832 = 0x83A2
+0x6833 = 0x8396
+0x6834 = 0x8323
+0x6835 = 0x838E
+0x6836 = 0x8387
+0x6837 = 0x838A
+0x6838 = 0x837C
+0x6839 = 0x83B5
+0x683A = 0x8373
+0x683B = 0x8375
+0x683C = 0x83A0
+0x683D = 0x8389
+0x683E = 0x83A8
+0x683F = 0x83F4
+0x6840 = 0x8413
+0x6841 = 0x83EB
+0x6842 = 0x83CE
+0x6843 = 0x83FD
+0x6844 = 0x8403
+0x6845 = 0x83D8
+0x6846 = 0x840B
+0x6847 = 0x83C1
+0x6848 = 0x83F7
+0x6849 = 0x8407
+0x684A = 0x83E0
+0x684B = 0x83F2
+0x684C = 0x840D
+0x684D = 0x8422
+0x684E = 0x8420
+0x684F = 0x83BD
+0x6850 = 0x8438
+0x6851 = 0x8506
+0x6852 = 0x83FB
+0x6853 = 0x846D
+0x6854 = 0x842A
+0x6855 = 0x843C
+0x6856 = 0x855A
+0x6857 = 0x8484
+0x6858 = 0x8477
+0x6859 = 0x846B
+0x685A = 0x84AD
+0x685B = 0x846E
+0x685C = 0x8482
+0x685D = 0x8469
+0x685E = 0x8446
+0x685F = 0x842C
+0x6860 = 0x846F
+0x6861 = 0x8479
+0x6862 = 0x8435
+0x6863 = 0x84CA
+0x6864 = 0x8462
+0x6865 = 0x84B9
+0x6866 = 0x84BF
+0x6867 = 0x849F
+0x6868 = 0x84D9
+0x6869 = 0x84CD
+0x686A = 0x84BB
+0x686B = 0x84DA
+0x686C = 0x84D0
+0x686D = 0x84C1
+0x686E = 0x84C6
+0x686F = 0x84D6
+0x6870 = 0x84A1
+0x6871 = 0x8521
+0x6872 = 0x84FF
+0x6873 = 0x84F4
+0x6874 = 0x8517
+0x6875 = 0x8518
+0x6876 = 0x852C
+0x6877 = 0x851F
+0x6878 = 0x8515
+0x6879 = 0x8514
+0x687A = 0x84FC
+0x687B = 0x8540
+0x687C = 0x8563
+0x687D = 0x8558
+0x687E = 0x8548
+0x6921 = 0x8541
+0x6922 = 0x8602
+0x6923 = 0x854B
+0x6924 = 0x8555
+0x6925 = 0x8580
+0x6926 = 0x85A4
+0x6927 = 0x8588
+0x6928 = 0x8591
+0x6929 = 0x858A
+0x692A = 0x85A8
+0x692B = 0x856D
+0x692C = 0x8594
+0x692D = 0x859B
+0x692E = 0x85EA
+0x692F = 0x8587
+0x6930 = 0x859C
+0x6931 = 0x8577
+0x6932 = 0x857E
+0x6933 = 0x8590
+0x6934 = 0x85C9
+0x6935 = 0x85BA
+0x6936 = 0x85CF
+0x6937 = 0x85B9
+0x6938 = 0x85D0
+0x6939 = 0x85D5
+0x693A = 0x85DD
+0x693B = 0x85E5
+0x693C = 0x85DC
+0x693D = 0x85F9
+0x693E = 0x860A
+0x693F = 0x8613
+0x6940 = 0x860B
+0x6941 = 0x85FE
+0x6942 = 0x85FA
+0x6943 = 0x8606
+0x6944 = 0x8622
+0x6945 = 0x861A
+0x6946 = 0x8630
+0x6947 = 0x863F
+0x6948 = 0x864D
+0x6949 = 0x4E55
+0x694A = 0x8654
+0x694B = 0x865F
+0x694C = 0x8667
+0x694D = 0x8671
+0x694E = 0x8693
+0x694F = 0x86A3
+0x6950 = 0x86A9
+0x6951 = 0x86AA
+0x6952 = 0x868B
+0x6953 = 0x868C
+0x6954 = 0x86B6
+0x6955 = 0x86AF
+0x6956 = 0x86C4
+0x6957 = 0x86C6
+0x6958 = 0x86B0
+0x6959 = 0x86C9
+0x695A = 0x8823
+0x695B = 0x86AB
+0x695C = 0x86D4
+0x695D = 0x86DE
+0x695E = 0x86E9
+0x695F = 0x86EC
+0x6960 = 0x86DF
+0x6961 = 0x86DB
+0x6962 = 0x86EF
+0x6963 = 0x8712
+0x6964 = 0x8706
+0x6965 = 0x8708
+0x6966 = 0x8700
+0x6967 = 0x8703
+0x6968 = 0x86FB
+0x6969 = 0x8711
+0x696A = 0x8709
+0x696B = 0x870D
+0x696C = 0x86F9
+0x696D = 0x870A
+0x696E = 0x8734
+0x696F = 0x873F
+0x6970 = 0x8737
+0x6971 = 0x873B
+0x6972 = 0x8725
+0x6973 = 0x8729
+0x6974 = 0x871A
+0x6975 = 0x8760
+0x6976 = 0x875F
+0x6977 = 0x8778
+0x6978 = 0x874C
+0x6979 = 0x874E
+0x697A = 0x8774
+0x697B = 0x8757
+0x697C = 0x8768
+0x697D = 0x876E
+0x697E = 0x8759
+0x6A21 = 0x8753
+0x6A22 = 0x8763
+0x6A23 = 0x876A
+0x6A24 = 0x8805
+0x6A25 = 0x87A2
+0x6A26 = 0x879F
+0x6A27 = 0x8782
+0x6A28 = 0x87AF
+0x6A29 = 0x87CB
+0x6A2A = 0x87BD
+0x6A2B = 0x87C0
+0x6A2C = 0x87D0
+0x6A2D = 0x96D6
+0x6A2E = 0x87AB
+0x6A2F = 0x87C4
+0x6A30 = 0x87B3
+0x6A31 = 0x87C7
+0x6A32 = 0x87C6
+0x6A33 = 0x87BB
+0x6A34 = 0x87EF
+0x6A35 = 0x87F2
+0x6A36 = 0x87E0
+0x6A37 = 0x880F
+0x6A38 = 0x880D
+0x6A39 = 0x87FE
+0x6A3A = 0x87F6
+0x6A3B = 0x87F7
+0x6A3C = 0x880E
+0x6A3D = 0x87D2
+0x6A3E = 0x8811
+0x6A3F = 0x8816
+0x6A40 = 0x8815
+0x6A41 = 0x8822
+0x6A42 = 0x8821
+0x6A43 = 0x8831
+0x6A44 = 0x8836
+0x6A45 = 0x8839
+0x6A46 = 0x8827
+0x6A47 = 0x883B
+0x6A48 = 0x8844
+0x6A49 = 0x8842
+0x6A4A = 0x8852
+0x6A4B = 0x8859
+0x6A4C = 0x885E
+0x6A4D = 0x8862
+0x6A4E = 0x886B
+0x6A4F = 0x8881
+0x6A50 = 0x887E
+0x6A51 = 0x889E
+0x6A52 = 0x8875
+0x6A53 = 0x887D
+0x6A54 = 0x88B5
+0x6A55 = 0x8872
+0x6A56 = 0x8882
+0x6A57 = 0x8897
+0x6A58 = 0x8892
+0x6A59 = 0x88AE
+0x6A5A = 0x8899
+0x6A5B = 0x88A2
+0x6A5C = 0x888D
+0x6A5D = 0x88A4
+0x6A5E = 0x88B0
+0x6A5F = 0x88BF
+0x6A60 = 0x88B1
+0x6A61 = 0x88C3
+0x6A62 = 0x88C4
+0x6A63 = 0x88D4
+0x6A64 = 0x88D8
+0x6A65 = 0x88D9
+0x6A66 = 0x88DD
+0x6A67 = 0x88F9
+0x6A68 = 0x8902
+0x6A69 = 0x88FC
+0x6A6A = 0x88F4
+0x6A6B = 0x88E8
+0x6A6C = 0x88F2
+0x6A6D = 0x8904
+0x6A6E = 0x890C
+0x6A6F = 0x890A
+0x6A70 = 0x8913
+0x6A71 = 0x8943
+0x6A72 = 0x891E
+0x6A73 = 0x8925
+0x6A74 = 0x892A
+0x6A75 = 0x892B
+0x6A76 = 0x8941
+0x6A77 = 0x8944
+0x6A78 = 0x893B
+0x6A79 = 0x8936
+0x6A7A = 0x8938
+0x6A7B = 0x894C
+0x6A7C = 0x891D
+0x6A7D = 0x8960
+0x6A7E = 0x895E
+0x6B21 = 0x8966
+0x6B22 = 0x8964
+0x6B23 = 0x896D
+0x6B24 = 0x896A
+0x6B25 = 0x896F
+0x6B26 = 0x8974
+0x6B27 = 0x8977
+0x6B28 = 0x897E
+0x6B29 = 0x8983
+0x6B2A = 0x8988
+0x6B2B = 0x898A
+0x6B2C = 0x8993
+0x6B2D = 0x8998
+0x6B2E = 0x89A1
+0x6B2F = 0x89A9
+0x6B30 = 0x89A6
+0x6B31 = 0x89AC
+0x6B32 = 0x89AF
+0x6B33 = 0x89B2
+0x6B34 = 0x89BA
+0x6B35 = 0x89BD
+0x6B36 = 0x89BF
+0x6B37 = 0x89C0
+0x6B38 = 0x89DA
+0x6B39 = 0x89DC
+0x6B3A = 0x89DD
+0x6B3B = 0x89E7
+0x6B3C = 0x89F4
+0x6B3D = 0x89F8
+0x6B3E = 0x8A03
+0x6B3F = 0x8A16
+0x6B40 = 0x8A10
+0x6B41 = 0x8A0C
+0x6B42 = 0x8A1B
+0x6B43 = 0x8A1D
+0x6B44 = 0x8A25
+0x6B45 = 0x8A36
+0x6B46 = 0x8A41
+0x6B47 = 0x8A5B
+0x6B48 = 0x8A52
+0x6B49 = 0x8A46
+0x6B4A = 0x8A48
+0x6B4B = 0x8A7C
+0x6B4C = 0x8A6D
+0x6B4D = 0x8A6C
+0x6B4E = 0x8A62
+0x6B4F = 0x8A85
+0x6B50 = 0x8A82
+0x6B51 = 0x8A84
+0x6B52 = 0x8AA8
+0x6B53 = 0x8AA1
+0x6B54 = 0x8A91
+0x6B55 = 0x8AA5
+0x6B56 = 0x8AA6
+0x6B57 = 0x8A9A
+0x6B58 = 0x8AA3
+0x6B59 = 0x8AC4
+0x6B5A = 0x8ACD
+0x6B5B = 0x8AC2
+0x6B5C = 0x8ADA
+0x6B5D = 0x8AEB
+0x6B5E = 0x8AF3
+0x6B5F = 0x8AE7
+0x6B60 = 0x8AE4
+0x6B61 = 0x8AF1
+0x6B62 = 0x8B14
+0x6B63 = 0x8AE0
+0x6B64 = 0x8AE2
+0x6B65 = 0x8AF7
+0x6B66 = 0x8ADE
+0x6B67 = 0x8ADB
+0x6B68 = 0x8B0C
+0x6B69 = 0x8B07
+0x6B6A = 0x8B1A
+0x6B6B = 0x8AE1
+0x6B6C = 0x8B16
+0x6B6D = 0x8B10
+0x6B6E = 0x8B17
+0x6B6F = 0x8B20
+0x6B70 = 0x8B33
+0x6B71 = 0x97AB
+0x6B72 = 0x8B26
+0x6B73 = 0x8B2B
+0x6B74 = 0x8B3E
+0x6B75 = 0x8B28
+0x6B76 = 0x8B41
+0x6B77 = 0x8B4C
+0x6B78 = 0x8B4F
+0x6B79 = 0x8B4E
+0x6B7A = 0x8B49
+0x6B7B = 0x8B56
+0x6B7C = 0x8B5B
+0x6B7D = 0x8B5A
+0x6B7E = 0x8B6B
+0x6C21 = 0x8B5F
+0x6C22 = 0x8B6C
+0x6C23 = 0x8B6F
+0x6C24 = 0x8B74
+0x6C25 = 0x8B7D
+0x6C26 = 0x8B80
+0x6C27 = 0x8B8C
+0x6C28 = 0x8B8E
+0x6C29 = 0x8B92
+0x6C2A = 0x8B93
+0x6C2B = 0x8B96
+0x6C2C = 0x8B99
+0x6C2D = 0x8B9A
+0x6C2E = 0x8C3A
+0x6C2F = 0x8C41
+0x6C30 = 0x8C3F
+0x6C31 = 0x8C48
+0x6C32 = 0x8C4C
+0x6C33 = 0x8C4E
+0x6C34 = 0x8C50
+0x6C35 = 0x8C55
+0x6C36 = 0x8C62
+0x6C37 = 0x8C6C
+0x6C38 = 0x8C78
+0x6C39 = 0x8C7A
+0x6C3A = 0x8C82
+0x6C3B = 0x8C89
+0x6C3C = 0x8C85
+0x6C3D = 0x8C8A
+0x6C3E = 0x8C8D
+0x6C3F = 0x8C8E
+0x6C40 = 0x8C94
+0x6C41 = 0x8C7C
+0x6C42 = 0x8C98
+0x6C43 = 0x621D
+0x6C44 = 0x8CAD
+0x6C45 = 0x8CAA
+0x6C46 = 0x8CBD
+0x6C47 = 0x8CB2
+0x6C48 = 0x8CB3
+0x6C49 = 0x8CAE
+0x6C4A = 0x8CB6
+0x6C4B = 0x8CC8
+0x6C4C = 0x8CC1
+0x6C4D = 0x8CE4
+0x6C4E = 0x8CE3
+0x6C4F = 0x8CDA
+0x6C50 = 0x8CFD
+0x6C51 = 0x8CFA
+0x6C52 = 0x8CFB
+0x6C53 = 0x8D04
+0x6C54 = 0x8D05
+0x6C55 = 0x8D0A
+0x6C56 = 0x8D07
+0x6C57 = 0x8D0F
+0x6C58 = 0x8D0D
+0x6C59 = 0x8D10
+0x6C5A = 0x9F4E
+0x6C5B = 0x8D13
+0x6C5C = 0x8CCD
+0x6C5D = 0x8D14
+0x6C5E = 0x8D16
+0x6C5F = 0x8D67
+0x6C60 = 0x8D6D
+0x6C61 = 0x8D71
+0x6C62 = 0x8D73
+0x6C63 = 0x8D81
+0x6C64 = 0x8D99
+0x6C65 = 0x8DC2
+0x6C66 = 0x8DBE
+0x6C67 = 0x8DBA
+0x6C68 = 0x8DCF
+0x6C69 = 0x8DDA
+0x6C6A = 0x8DD6
+0x6C6B = 0x8DCC
+0x6C6C = 0x8DDB
+0x6C6D = 0x8DCB
+0x6C6E = 0x8DEA
+0x6C6F = 0x8DEB
+0x6C70 = 0x8DDF
+0x6C71 = 0x8DE3
+0x6C72 = 0x8DFC
+0x6C73 = 0x8E08
+0x6C74 = 0x8E09
+0x6C75 = 0x8DFF
+0x6C76 = 0x8E1D
+0x6C77 = 0x8E1E
+0x6C78 = 0x8E10
+0x6C79 = 0x8E1F
+0x6C7A = 0x8E42
+0x6C7B = 0x8E35
+0x6C7C = 0x8E30
+0x6C7D = 0x8E34
+0x6C7E = 0x8E4A
+0x6D21 = 0x8E47
+0x6D22 = 0x8E49
+0x6D23 = 0x8E4C
+0x6D24 = 0x8E50
+0x6D25 = 0x8E48
+0x6D26 = 0x8E59
+0x6D27 = 0x8E64
+0x6D28 = 0x8E60
+0x6D29 = 0x8E2A
+0x6D2A = 0x8E63
+0x6D2B = 0x8E55
+0x6D2C = 0x8E76
+0x6D2D = 0x8E72
+0x6D2E = 0x8E7C
+0x6D2F = 0x8E81
+0x6D30 = 0x8E87
+0x6D31 = 0x8E85
+0x6D32 = 0x8E84
+0x6D33 = 0x8E8B
+0x6D34 = 0x8E8A
+0x6D35 = 0x8E93
+0x6D36 = 0x8E91
+0x6D37 = 0x8E94
+0x6D38 = 0x8E99
+0x6D39 = 0x8EAA
+0x6D3A = 0x8EA1
+0x6D3B = 0x8EAC
+0x6D3C = 0x8EB0
+0x6D3D = 0x8EC6
+0x6D3E = 0x8EB1
+0x6D3F = 0x8EBE
+0x6D40 = 0x8EC5
+0x6D41 = 0x8EC8
+0x6D42 = 0x8ECB
+0x6D43 = 0x8EDB
+0x6D44 = 0x8EE3
+0x6D45 = 0x8EFC
+0x6D46 = 0x8EFB
+0x6D47 = 0x8EEB
+0x6D48 = 0x8EFE
+0x6D49 = 0x8F0A
+0x6D4A = 0x8F05
+0x6D4B = 0x8F15
+0x6D4C = 0x8F12
+0x6D4D = 0x8F19
+0x6D4E = 0x8F13
+0x6D4F = 0x8F1C
+0x6D50 = 0x8F1F
+0x6D51 = 0x8F1B
+0x6D52 = 0x8F0C
+0x6D53 = 0x8F26
+0x6D54 = 0x8F33
+0x6D55 = 0x8F3B
+0x6D56 = 0x8F39
+0x6D57 = 0x8F45
+0x6D58 = 0x8F42
+0x6D59 = 0x8F3E
+0x6D5A = 0x8F4C
+0x6D5B = 0x8F49
+0x6D5C = 0x8F46
+0x6D5D = 0x8F4E
+0x6D5E = 0x8F57
+0x6D5F = 0x8F5C
+0x6D60 = 0x8F62
+0x6D61 = 0x8F63
+0x6D62 = 0x8F64
+0x6D63 = 0x8F9C
+0x6D64 = 0x8F9F
+0x6D65 = 0x8FA3
+0x6D66 = 0x8FAD
+0x6D67 = 0x8FAF
+0x6D68 = 0x8FB7
+0x6D69 = 0x8FDA
+0x6D6A = 0x8FE5
+0x6D6B = 0x8FE2
+0x6D6C = 0x8FEA
+0x6D6D = 0x8FEF
+0x6D6E = 0x9087
+0x6D6F = 0x8FF4
+0x6D70 = 0x9005
+0x6D71 = 0x8FF9
+0x6D72 = 0x8FFA
+0x6D73 = 0x9011
+0x6D74 = 0x9015
+0x6D75 = 0x9021
+0x6D76 = 0x900D
+0x6D77 = 0x901E
+0x6D78 = 0x9016
+0x6D79 = 0x900B
+0x6D7A = 0x9027
+0x6D7B = 0x9036
+0x6D7C = 0x9035
+0x6D7D = 0x9039
+0x6D7E = 0x8FF8
+0x6E21 = 0x904F
+0x6E22 = 0x9050
+0x6E23 = 0x9051
+0x6E24 = 0x9052
+0x6E25 = 0x900E
+0x6E26 = 0x9049
+0x6E27 = 0x903E
+0x6E28 = 0x9056
+0x6E29 = 0x9058
+0x6E2A = 0x905E
+0x6E2B = 0x9068
+0x6E2C = 0x906F
+0x6E2D = 0x9076
+0x6E2E = 0x96A8
+0x6E2F = 0x9072
+0x6E30 = 0x9082
+0x6E31 = 0x907D
+0x6E32 = 0x9081
+0x6E33 = 0x9080
+0x6E34 = 0x908A
+0x6E35 = 0x9089
+0x6E36 = 0x908F
+0x6E37 = 0x90A8
+0x6E38 = 0x90AF
+0x6E39 = 0x90B1
+0x6E3A = 0x90B5
+0x6E3B = 0x90E2
+0x6E3C = 0x90E4
+0x6E3D = 0x6248
+0x6E3E = 0x90DB
+0x6E3F = 0x9102
+0x6E40 = 0x9112
+0x6E41 = 0x9119
+0x6E42 = 0x9132
+0x6E43 = 0x9130
+0x6E44 = 0x914A
+0x6E45 = 0x9156
+0x6E46 = 0x9158
+0x6E47 = 0x9163
+0x6E48 = 0x9165
+0x6E49 = 0x9169
+0x6E4A = 0x9173
+0x6E4B = 0x9172
+0x6E4C = 0x918B
+0x6E4D = 0x9189
+0x6E4E = 0x9182
+0x6E4F = 0x91A2
+0x6E50 = 0x91AB
+0x6E51 = 0x91AF
+0x6E52 = 0x91AA
+0x6E53 = 0x91B5
+0x6E54 = 0x91B4
+0x6E55 = 0x91BA
+0x6E56 = 0x91C0
+0x6E57 = 0x91C1
+0x6E58 = 0x91C9
+0x6E59 = 0x91CB
+0x6E5A = 0x91D0
+0x6E5B = 0x91D6
+0x6E5C = 0x91DF
+0x6E5D = 0x91E1
+0x6E5E = 0x91DB
+0x6E5F = 0x91FC
+0x6E60 = 0x91F5
+0x6E61 = 0x91F6
+0x6E62 = 0x921E
+0x6E63 = 0x91FF
+0x6E64 = 0x9214
+0x6E65 = 0x922C
+0x6E66 = 0x9215
+0x6E67 = 0x9211
+0x6E68 = 0x925E
+0x6E69 = 0x9257
+0x6E6A = 0x9245
+0x6E6B = 0x9249
+0x6E6C = 0x9264
+0x6E6D = 0x9248
+0x6E6E = 0x9295
+0x6E6F = 0x923F
+0x6E70 = 0x924B
+0x6E71 = 0x9250
+0x6E72 = 0x929C
+0x6E73 = 0x9296
+0x6E74 = 0x9293
+0x6E75 = 0x929B
+0x6E76 = 0x925A
+0x6E77 = 0x92CF
+0x6E78 = 0x92B9
+0x6E79 = 0x92B7
+0x6E7A = 0x92E9
+0x6E7B = 0x930F
+0x6E7C = 0x92FA
+0x6E7D = 0x9344
+0x6E7E = 0x932E
+0x6F21 = 0x9319
+0x6F22 = 0x9322
+0x6F23 = 0x931A
+0x6F24 = 0x9323
+0x6F25 = 0x933A
+0x6F26 = 0x9335
+0x6F27 = 0x933B
+0x6F28 = 0x935C
+0x6F29 = 0x9360
+0x6F2A = 0x937C
+0x6F2B = 0x936E
+0x6F2C = 0x9356
+0x6F2D = 0x93B0
+0x6F2E = 0x93AC
+0x6F2F = 0x93AD
+0x6F30 = 0x9394
+0x6F31 = 0x93B9
+0x6F32 = 0x93D6
+0x6F33 = 0x93D7
+0x6F34 = 0x93E8
+0x6F35 = 0x93E5
+0x6F36 = 0x93D8
+0x6F37 = 0x93C3
+0x6F38 = 0x93DD
+0x6F39 = 0x93D0
+0x6F3A = 0x93C8
+0x6F3B = 0x93E4
+0x6F3C = 0x941A
+0x6F3D = 0x9414
+0x6F3E = 0x9413
+0x6F3F = 0x9403
+0x6F40 = 0x9407
+0x6F41 = 0x9410
+0x6F42 = 0x9436
+0x6F43 = 0x942B
+0x6F44 = 0x9435
+0x6F45 = 0x9421
+0x6F46 = 0x943A
+0x6F47 = 0x9441
+0x6F48 = 0x9452
+0x6F49 = 0x9444
+0x6F4A = 0x945B
+0x6F4B = 0x9460
+0x6F4C = 0x9462
+0x6F4D = 0x945E
+0x6F4E = 0x946A
+0x6F4F = 0x9229
+0x6F50 = 0x9470
+0x6F51 = 0x9475
+0x6F52 = 0x9477
+0x6F53 = 0x947D
+0x6F54 = 0x945A
+0x6F55 = 0x947C
+0x6F56 = 0x947E
+0x6F57 = 0x9481
+0x6F58 = 0x947F
+0x6F59 = 0x9582
+0x6F5A = 0x9587
+0x6F5B = 0x958A
+0x6F5C = 0x9594
+0x6F5D = 0x9596
+0x6F5E = 0x9598
+0x6F5F = 0x9599
+0x6F60 = 0x95A0
+0x6F61 = 0x95A8
+0x6F62 = 0x95A7
+0x6F63 = 0x95AD
+0x6F64 = 0x95BC
+0x6F65 = 0x95BB
+0x6F66 = 0x95B9
+0x6F67 = 0x95BE
+0x6F68 = 0x95CA
+0x6F69 = 0x6FF6
+0x6F6A = 0x95C3
+0x6F6B = 0x95CD
+0x6F6C = 0x95CC
+0x6F6D = 0x95D5
+0x6F6E = 0x95D4
+0x6F6F = 0x95D6
+0x6F70 = 0x95DC
+0x6F71 = 0x95E1
+0x6F72 = 0x95E5
+0x6F73 = 0x95E2
+0x6F74 = 0x9621
+0x6F75 = 0x9628
+0x6F76 = 0x962E
+0x6F77 = 0x962F
+0x6F78 = 0x9642
+0x6F79 = 0x964C
+0x6F7A = 0x964F
+0x6F7B = 0x964B
+0x6F7C = 0x9677
+0x6F7D = 0x965C
+0x6F7E = 0x965E
+0x7021 = 0x965D
+0x7022 = 0x965F
+0x7023 = 0x9666
+0x7024 = 0x9672
+0x7025 = 0x966C
+0x7026 = 0x968D
+0x7027 = 0x9698
+0x7028 = 0x9695
+0x7029 = 0x9697
+0x702A = 0x96AA
+0x702B = 0x96A7
+0x702C = 0x96B1
+0x702D = 0x96B2
+0x702E = 0x96B0
+0x702F = 0x96B4
+0x7030 = 0x96B6
+0x7031 = 0x96B8
+0x7032 = 0x96B9
+0x7033 = 0x96CE
+0x7034 = 0x96CB
+0x7035 = 0x96C9
+0x7036 = 0x96CD
+0x7037 = 0x894D
+0x7038 = 0x96DC
+0x7039 = 0x970D
+0x703A = 0x96D5
+0x703B = 0x96F9
+0x703C = 0x9704
+0x703D = 0x9706
+0x703E = 0x9708
+0x703F = 0x9713
+0x7040 = 0x970E
+0x7041 = 0x9711
+0x7042 = 0x970F
+0x7043 = 0x9716
+0x7044 = 0x9719
+0x7045 = 0x9724
+0x7046 = 0x972A
+0x7047 = 0x9730
+0x7048 = 0x9739
+0x7049 = 0x973D
+0x704A = 0x973E
+0x704B = 0x9744
+0x704C = 0x9746
+0x704D = 0x9748
+0x704E = 0x9742
+0x704F = 0x9749
+0x7050 = 0x975C
+0x7051 = 0x9760
+0x7052 = 0x9764
+0x7053 = 0x9766
+0x7054 = 0x9768
+0x7055 = 0x52D2
+0x7056 = 0x976B
+0x7057 = 0x9771
+0x7058 = 0x9779
+0x7059 = 0x9785
+0x705A = 0x977C
+0x705B = 0x9781
+0x705C = 0x977A
+0x705D = 0x9786
+0x705E = 0x978B
+0x705F = 0x978F
+0x7060 = 0x9790
+0x7061 = 0x979C
+0x7062 = 0x97A8
+0x7063 = 0x97A6
+0x7064 = 0x97A3
+0x7065 = 0x97B3
+0x7066 = 0x97B4
+0x7067 = 0x97C3
+0x7068 = 0x97C6
+0x7069 = 0x97C8
+0x706A = 0x97CB
+0x706B = 0x97DC
+0x706C = 0x97ED
+0x706D = 0x9F4F
+0x706E = 0x97F2
+0x706F = 0x7ADF
+0x7070 = 0x97F6
+0x7071 = 0x97F5
+0x7072 = 0x980F
+0x7073 = 0x980C
+0x7074 = 0x9838
+0x7075 = 0x9824
+0x7076 = 0x9821
+0x7077 = 0x9837
+0x7078 = 0x983D
+0x7079 = 0x9846
+0x707A = 0x984F
+0x707B = 0x984B
+0x707C = 0x986B
+0x707D = 0x986F
+0x707E = 0x9870
+0x7121 = 0x9871
+0x7122 = 0x9874
+0x7123 = 0x9873
+0x7124 = 0x98AA
+0x7125 = 0x98AF
+0x7126 = 0x98B1
+0x7127 = 0x98B6
+0x7128 = 0x98C4
+0x7129 = 0x98C3
+0x712A = 0x98C6
+0x712B = 0x98E9
+0x712C = 0x98EB
+0x712D = 0x9903
+0x712E = 0x9909
+0x712F = 0x9912
+0x7130 = 0x9914
+0x7131 = 0x9918
+0x7132 = 0x9921
+0x7133 = 0x991D
+0x7134 = 0x991E
+0x7135 = 0x9924
+0x7136 = 0x9920
+0x7137 = 0x992C
+0x7138 = 0x992E
+0x7139 = 0x993D
+0x713A = 0x993E
+0x713B = 0x9942
+0x713C = 0x9949
+0x713D = 0x9945
+0x713E = 0x9950
+0x713F = 0x994B
+0x7140 = 0x9951
+0x7141 = 0x9952
+0x7142 = 0x994C
+0x7143 = 0x9955
+0x7144 = 0x9997
+0x7145 = 0x9998
+0x7146 = 0x99A5
+0x7147 = 0x99AD
+0x7148 = 0x99AE
+0x7149 = 0x99BC
+0x714A = 0x99DF
+0x714B = 0x99DB
+0x714C = 0x99DD
+0x714D = 0x99D8
+0x714E = 0x99D1
+0x714F = 0x99ED
+0x7150 = 0x99EE
+0x7151 = 0x99F1
+0x7152 = 0x99F2
+0x7153 = 0x99FB
+0x7154 = 0x99F8
+0x7155 = 0x9A01
+0x7156 = 0x9A0F
+0x7157 = 0x9A05
+0x7158 = 0x99E2
+0x7159 = 0x9A19
+0x715A = 0x9A2B
+0x715B = 0x9A37
+0x715C = 0x9A45
+0x715D = 0x9A42
+0x715E = 0x9A40
+0x715F = 0x9A43
+0x7160 = 0x9A3E
+0x7161 = 0x9A55
+0x7162 = 0x9A4D
+0x7163 = 0x9A5B
+0x7164 = 0x9A57
+0x7165 = 0x9A5F
+0x7166 = 0x9A62
+0x7167 = 0x9A65
+0x7168 = 0x9A64
+0x7169 = 0x9A69
+0x716A = 0x9A6B
+0x716B = 0x9A6A
+0x716C = 0x9AAD
+0x716D = 0x9AB0
+0x716E = 0x9ABC
+0x716F = 0x9AC0
+0x7170 = 0x9ACF
+0x7171 = 0x9AD1
+0x7172 = 0x9AD3
+0x7173 = 0x9AD4
+0x7174 = 0x9ADE
+0x7175 = 0x9ADF
+0x7176 = 0x9AE2
+0x7177 = 0x9AE3
+0x7178 = 0x9AE6
+0x7179 = 0x9AEF
+0x717A = 0x9AEB
+0x717B = 0x9AEE
+0x717C = 0x9AF4
+0x717D = 0x9AF1
+0x717E = 0x9AF7
+0x7221 = 0x9AFB
+0x7222 = 0x9B06
+0x7223 = 0x9B18
+0x7224 = 0x9B1A
+0x7225 = 0x9B1F
+0x7226 = 0x9B22
+0x7227 = 0x9B23
+0x7228 = 0x9B25
+0x7229 = 0x9B27
+0x722A = 0x9B28
+0x722B = 0x9B29
+0x722C = 0x9B2A
+0x722D = 0x9B2E
+0x722E = 0x9B2F
+0x722F = 0x9B32
+0x7230 = 0x9B44
+0x7231 = 0x9B43
+0x7232 = 0x9B4F
+0x7233 = 0x9B4D
+0x7234 = 0x9B4E
+0x7235 = 0x9B51
+0x7236 = 0x9B58
+0x7237 = 0x9B74
+0x7238 = 0x9B93
+0x7239 = 0x9B83
+0x723A = 0x9B91
+0x723B = 0x9B96
+0x723C = 0x9B97
+0x723D = 0x9B9F
+0x723E = 0x9BA0
+0x723F = 0x9BA8
+0x7240 = 0x9BB4
+0x7241 = 0x9BC0
+0x7242 = 0x9BCA
+0x7243 = 0x9BB9
+0x7244 = 0x9BC6
+0x7245 = 0x9BCF
+0x7246 = 0x9BD1
+0x7247 = 0x9BD2
+0x7248 = 0x9BE3
+0x7249 = 0x9BE2
+0x724A = 0x9BE4
+0x724B = 0x9BD4
+0x724C = 0x9BE1
+0x724D = 0x9C3A
+0x724E = 0x9BF2
+0x724F = 0x9BF1
+0x7250 = 0x9BF0
+0x7251 = 0x9C15
+0x7252 = 0x9C14
+0x7253 = 0x9C09
+0x7254 = 0x9C13
+0x7255 = 0x9C0C
+0x7256 = 0x9C06
+0x7257 = 0x9C08
+0x7258 = 0x9C12
+0x7259 = 0x9C0A
+0x725A = 0x9C04
+0x725B = 0x9C2E
+0x725C = 0x9C1B
+0x725D = 0x9C25
+0x725E = 0x9C24
+0x725F = 0x9C21
+0x7260 = 0x9C30
+0x7261 = 0x9C47
+0x7262 = 0x9C32
+0x7263 = 0x9C46
+0x7264 = 0x9C3E
+0x7265 = 0x9C5A
+0x7266 = 0x9C60
+0x7267 = 0x9C67
+0x7268 = 0x9C76
+0x7269 = 0x9C78
+0x726A = 0x9CE7
+0x726B = 0x9CEC
+0x726C = 0x9CF0
+0x726D = 0x9D09
+0x726E = 0x9D08
+0x726F = 0x9CEB
+0x7270 = 0x9D03
+0x7271 = 0x9D06
+0x7272 = 0x9D2A
+0x7273 = 0x9D26
+0x7274 = 0x9DAF
+0x7275 = 0x9D23
+0x7276 = 0x9D1F
+0x7277 = 0x9D44
+0x7278 = 0x9D15
+0x7279 = 0x9D12
+0x727A = 0x9D41
+0x727B = 0x9D3F
+0x727C = 0x9D3E
+0x727D = 0x9D46
+0x727E = 0x9D48
+0x7321 = 0x9D5D
+0x7322 = 0x9D5E
+0x7323 = 0x9D64
+0x7324 = 0x9D51
+0x7325 = 0x9D50
+0x7326 = 0x9D59
+0x7327 = 0x9D72
+0x7328 = 0x9D89
+0x7329 = 0x9D87
+0x732A = 0x9DAB
+0x732B = 0x9D6F
+0x732C = 0x9D7A
+0x732D = 0x9D9A
+0x732E = 0x9DA4
+0x732F = 0x9DA9
+0x7330 = 0x9DB2
+0x7331 = 0x9DC4
+0x7332 = 0x9DC1
+0x7333 = 0x9DBB
+0x7334 = 0x9DB8
+0x7335 = 0x9DBA
+0x7336 = 0x9DC6
+0x7337 = 0x9DCF
+0x7338 = 0x9DC2
+0x7339 = 0x9DD9
+0x733A = 0x9DD3
+0x733B = 0x9DF8
+0x733C = 0x9DE6
+0x733D = 0x9DED
+0x733E = 0x9DEF
+0x733F = 0x9DFD
+0x7340 = 0x9E1A
+0x7341 = 0x9E1B
+0x7342 = 0x9E1E
+0x7343 = 0x9E75
+0x7344 = 0x9E79
+0x7345 = 0x9E7D
+0x7346 = 0x9E81
+0x7347 = 0x9E88
+0x7348 = 0x9E8B
+0x7349 = 0x9E8C
+0x734A = 0x9E92
+0x734B = 0x9E95
+0x734C = 0x9E91
+0x734D = 0x9E9D
+0x734E = 0x9EA5
+0x734F = 0x9EA9
+0x7350 = 0x9EB8
+0x7351 = 0x9EAA
+0x7352 = 0x9EAD
+0x7353 = 0x9761
+0x7354 = 0x9ECC
+0x7355 = 0x9ECE
+0x7356 = 0x9ECF
+0x7357 = 0x9ED0
+0x7358 = 0x9ED4
+0x7359 = 0x9EDC
+0x735A = 0x9EDE
+0x735B = 0x9EDD
+0x735C = 0x9EE0
+0x735D = 0x9EE5
+0x735E = 0x9EE8
+0x735F = 0x9EEF
+0x7360 = 0x9EF4
+0x7361 = 0x9EF6
+0x7362 = 0x9EF7
+0x7363 = 0x9EF9
+0x7364 = 0x9EFB
+0x7365 = 0x9EFC
+0x7366 = 0x9EFD
+0x7367 = 0x9F07
+0x7368 = 0x9F08
+0x7369 = 0x76B7
+0x736A = 0x9F15
+0x736B = 0x9F21
+0x736C = 0x9F2C
+0x736D = 0x9F3E
+0x736E = 0x9F4A
+0x736F = 0x9F52
+0x7370 = 0x9F54
+0x7371 = 0x9F63
+0x7372 = 0x9F5F
+0x7373 = 0x9F60
+0x7374 = 0x9F61
+0x7375 = 0x9F66
+0x7376 = 0x9F67
+0x7377 = 0x9F6C
+0x7378 = 0x9F6A
+0x7379 = 0x9F77
+0x737A = 0x9F72
+0x737B = 0x9F76
+0x737C = 0x9F95
+0x737D = 0x9F9C
+0x737E = 0x9FA0
+0x7421 = 0x582F
+0x7422 = 0x69C7
+0x7423 = 0x9059
+0x7424 = 0x7464
+0x7425 = 0x51DC
+0x7426 = 0x7199
+END_MAP
diff --git a/enc/trans/JIS/JISX0208UDC%UCS.src b/enc/trans/JIS/JISX0208UDC%UCS.src
new file mode 100644
index 0000000000..9f5dd94090
--- /dev/null
+++ b/enc/trans/JIS/JISX0208UDC%UCS.src
@@ -0,0 +1,954 @@
+# $NetBSD: JISX0208UDC%UCS.src,v 1.1 2003/07/19 20:20:40 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0208UDC/UCS"
+SRC_ZONE	0x75-0x7E / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x7521 = 0xE000
+0x7522 = 0xE001
+0x7523 = 0xE002
+0x7524 = 0xE003
+0x7525 = 0xE004
+0x7526 = 0xE005
+0x7527 = 0xE006
+0x7528 = 0xE007
+0x7529 = 0xE008
+0x752A = 0xE009
+0x752B = 0xE00A
+0x752C = 0xE00B
+0x752D = 0xE00C
+0x752E = 0xE00D
+0x752F = 0xE00E
+0x7530 = 0xE00F
+0x7531 = 0xE010
+0x7532 = 0xE011
+0x7533 = 0xE012
+0x7534 = 0xE013
+0x7535 = 0xE014
+0x7536 = 0xE015
+0x7537 = 0xE016
+0x7538 = 0xE017
+0x7539 = 0xE018
+0x753A = 0xE019
+0x753B = 0xE01A
+0x753C = 0xE01B
+0x753D = 0xE01C
+0x753E = 0xE01D
+0x753F = 0xE01E
+0x7540 = 0xE01F
+0x7541 = 0xE020
+0x7542 = 0xE021
+0x7543 = 0xE022
+0x7544 = 0xE023
+0x7545 = 0xE024
+0x7546 = 0xE025
+0x7547 = 0xE026
+0x7548 = 0xE027
+0x7549 = 0xE028
+0x754A = 0xE029
+0x754B = 0xE02A
+0x754C = 0xE02B
+0x754D = 0xE02C
+0x754E = 0xE02D
+0x754F = 0xE02E
+0x7550 = 0xE02F
+0x7551 = 0xE030
+0x7552 = 0xE031
+0x7553 = 0xE032
+0x7554 = 0xE033
+0x7555 = 0xE034
+0x7556 = 0xE035
+0x7557 = 0xE036
+0x7558 = 0xE037
+0x7559 = 0xE038
+0x755A = 0xE039
+0x755B = 0xE03A
+0x755C = 0xE03B
+0x755D = 0xE03C
+0x755E = 0xE03D
+0x755F = 0xE03E
+0x7560 = 0xE03F
+0x7561 = 0xE040
+0x7562 = 0xE041
+0x7563 = 0xE042
+0x7564 = 0xE043
+0x7565 = 0xE044
+0x7566 = 0xE045
+0x7567 = 0xE046
+0x7568 = 0xE047
+0x7569 = 0xE048
+0x756A = 0xE049
+0x756B = 0xE04A
+0x756C = 0xE04B
+0x756D = 0xE04C
+0x756E = 0xE04D
+0x756F = 0xE04E
+0x7570 = 0xE04F
+0x7571 = 0xE050
+0x7572 = 0xE051
+0x7573 = 0xE052
+0x7574 = 0xE053
+0x7575 = 0xE054
+0x7576 = 0xE055
+0x7577 = 0xE056
+0x7578 = 0xE057
+0x7579 = 0xE058
+0x757A = 0xE059
+0x757B = 0xE05A
+0x757C = 0xE05B
+0x757D = 0xE05C
+0x757E = 0xE05D
+0x7621 = 0xE05E
+0x7622 = 0xE05F
+0x7623 = 0xE060
+0x7624 = 0xE061
+0x7625 = 0xE062
+0x7626 = 0xE063
+0x7627 = 0xE064
+0x7628 = 0xE065
+0x7629 = 0xE066
+0x762A = 0xE067
+0x762B = 0xE068
+0x762C = 0xE069
+0x762D = 0xE06A
+0x762E = 0xE06B
+0x762F = 0xE06C
+0x7630 = 0xE06D
+0x7631 = 0xE06E
+0x7632 = 0xE06F
+0x7633 = 0xE070
+0x7634 = 0xE071
+0x7635 = 0xE072
+0x7636 = 0xE073
+0x7637 = 0xE074
+0x7638 = 0xE075
+0x7639 = 0xE076
+0x763A = 0xE077
+0x763B = 0xE078
+0x763C = 0xE079
+0x763D = 0xE07A
+0x763E = 0xE07B
+0x763F = 0xE07C
+0x7640 = 0xE07D
+0x7641 = 0xE07E
+0x7642 = 0xE07F
+0x7643 = 0xE080
+0x7644 = 0xE081
+0x7645 = 0xE082
+0x7646 = 0xE083
+0x7647 = 0xE084
+0x7648 = 0xE085
+0x7649 = 0xE086
+0x764A = 0xE087
+0x764B = 0xE088
+0x764C = 0xE089
+0x764D = 0xE08A
+0x764E = 0xE08B
+0x764F = 0xE08C
+0x7650 = 0xE08D
+0x7651 = 0xE08E
+0x7652 = 0xE08F
+0x7653 = 0xE090
+0x7654 = 0xE091
+0x7655 = 0xE092
+0x7656 = 0xE093
+0x7657 = 0xE094
+0x7658 = 0xE095
+0x7659 = 0xE096
+0x765A = 0xE097
+0x765B = 0xE098
+0x765C = 0xE099
+0x765D = 0xE09A
+0x765E = 0xE09B
+0x765F = 0xE09C
+0x7660 = 0xE09D
+0x7661 = 0xE09E
+0x7662 = 0xE09F
+0x7663 = 0xE0A0
+0x7664 = 0xE0A1
+0x7665 = 0xE0A2
+0x7666 = 0xE0A3
+0x7667 = 0xE0A4
+0x7668 = 0xE0A5
+0x7669 = 0xE0A6
+0x766A = 0xE0A7
+0x766B = 0xE0A8
+0x766C = 0xE0A9
+0x766D = 0xE0AA
+0x766E = 0xE0AB
+0x766F = 0xE0AC
+0x7670 = 0xE0AD
+0x7671 = 0xE0AE
+0x7672 = 0xE0AF
+0x7673 = 0xE0B0
+0x7674 = 0xE0B1
+0x7675 = 0xE0B2
+0x7676 = 0xE0B3
+0x7677 = 0xE0B4
+0x7678 = 0xE0B5
+0x7679 = 0xE0B6
+0x767A = 0xE0B7
+0x767B = 0xE0B8
+0x767C = 0xE0B9
+0x767D = 0xE0BA
+0x767E = 0xE0BB
+0x7721 = 0xE0BC
+0x7722 = 0xE0BD
+0x7723 = 0xE0BE
+0x7724 = 0xE0BF
+0x7725 = 0xE0C0
+0x7726 = 0xE0C1
+0x7727 = 0xE0C2
+0x7728 = 0xE0C3
+0x7729 = 0xE0C4
+0x772A = 0xE0C5
+0x772B = 0xE0C6
+0x772C = 0xE0C7
+0x772D = 0xE0C8
+0x772E = 0xE0C9
+0x772F = 0xE0CA
+0x7730 = 0xE0CB
+0x7731 = 0xE0CC
+0x7732 = 0xE0CD
+0x7733 = 0xE0CE
+0x7734 = 0xE0CF
+0x7735 = 0xE0D0
+0x7736 = 0xE0D1
+0x7737 = 0xE0D2
+0x7738 = 0xE0D3
+0x7739 = 0xE0D4
+0x773A = 0xE0D5
+0x773B = 0xE0D6
+0x773C = 0xE0D7
+0x773D = 0xE0D8
+0x773E = 0xE0D9
+0x773F = 0xE0DA
+0x7740 = 0xE0DB
+0x7741 = 0xE0DC
+0x7742 = 0xE0DD
+0x7743 = 0xE0DE
+0x7744 = 0xE0DF
+0x7745 = 0xE0E0
+0x7746 = 0xE0E1
+0x7747 = 0xE0E2
+0x7748 = 0xE0E3
+0x7749 = 0xE0E4
+0x774A = 0xE0E5
+0x774B = 0xE0E6
+0x774C = 0xE0E7
+0x774D = 0xE0E8
+0x774E = 0xE0E9
+0x774F = 0xE0EA
+0x7750 = 0xE0EB
+0x7751 = 0xE0EC
+0x7752 = 0xE0ED
+0x7753 = 0xE0EE
+0x7754 = 0xE0EF
+0x7755 = 0xE0F0
+0x7756 = 0xE0F1
+0x7757 = 0xE0F2
+0x7758 = 0xE0F3
+0x7759 = 0xE0F4
+0x775A = 0xE0F5
+0x775B = 0xE0F6
+0x775C = 0xE0F7
+0x775D = 0xE0F8
+0x775E = 0xE0F9
+0x775F = 0xE0FA
+0x7760 = 0xE0FB
+0x7761 = 0xE0FC
+0x7762 = 0xE0FD
+0x7763 = 0xE0FE
+0x7764 = 0xE0FF
+0x7765 = 0xE100
+0x7766 = 0xE101
+0x7767 = 0xE102
+0x7768 = 0xE103
+0x7769 = 0xE104
+0x776A = 0xE105
+0x776B = 0xE106
+0x776C = 0xE107
+0x776D = 0xE108
+0x776E = 0xE109
+0x776F = 0xE10A
+0x7770 = 0xE10B
+0x7771 = 0xE10C
+0x7772 = 0xE10D
+0x7773 = 0xE10E
+0x7774 = 0xE10F
+0x7775 = 0xE110
+0x7776 = 0xE111
+0x7777 = 0xE112
+0x7778 = 0xE113
+0x7779 = 0xE114
+0x777A = 0xE115
+0x777B = 0xE116
+0x777C = 0xE117
+0x777D = 0xE118
+0x777E = 0xE119
+0x7821 = 0xE11A
+0x7822 = 0xE11B
+0x7823 = 0xE11C
+0x7824 = 0xE11D
+0x7825 = 0xE11E
+0x7826 = 0xE11F
+0x7827 = 0xE120
+0x7828 = 0xE121
+0x7829 = 0xE122
+0x782A = 0xE123
+0x782B = 0xE124
+0x782C = 0xE125
+0x782D = 0xE126
+0x782E = 0xE127
+0x782F = 0xE128
+0x7830 = 0xE129
+0x7831 = 0xE12A
+0x7832 = 0xE12B
+0x7833 = 0xE12C
+0x7834 = 0xE12D
+0x7835 = 0xE12E
+0x7836 = 0xE12F
+0x7837 = 0xE130
+0x7838 = 0xE131
+0x7839 = 0xE132
+0x783A = 0xE133
+0x783B = 0xE134
+0x783C = 0xE135
+0x783D = 0xE136
+0x783E = 0xE137
+0x783F = 0xE138
+0x7840 = 0xE139
+0x7841 = 0xE13A
+0x7842 = 0xE13B
+0x7843 = 0xE13C
+0x7844 = 0xE13D
+0x7845 = 0xE13E
+0x7846 = 0xE13F
+0x7847 = 0xE140
+0x7848 = 0xE141
+0x7849 = 0xE142
+0x784A = 0xE143
+0x784B = 0xE144
+0x784C = 0xE145
+0x784D = 0xE146
+0x784E = 0xE147
+0x784F = 0xE148
+0x7850 = 0xE149
+0x7851 = 0xE14A
+0x7852 = 0xE14B
+0x7853 = 0xE14C
+0x7854 = 0xE14D
+0x7855 = 0xE14E
+0x7856 = 0xE14F
+0x7857 = 0xE150
+0x7858 = 0xE151
+0x7859 = 0xE152
+0x785A = 0xE153
+0x785B = 0xE154
+0x785C = 0xE155
+0x785D = 0xE156
+0x785E = 0xE157
+0x785F = 0xE158
+0x7860 = 0xE159
+0x7861 = 0xE15A
+0x7862 = 0xE15B
+0x7863 = 0xE15C
+0x7864 = 0xE15D
+0x7865 = 0xE15E
+0x7866 = 0xE15F
+0x7867 = 0xE160
+0x7868 = 0xE161
+0x7869 = 0xE162
+0x786A = 0xE163
+0x786B = 0xE164
+0x786C = 0xE165
+0x786D = 0xE166
+0x786E = 0xE167
+0x786F = 0xE168
+0x7870 = 0xE169
+0x7871 = 0xE16A
+0x7872 = 0xE16B
+0x7873 = 0xE16C
+0x7874 = 0xE16D
+0x7875 = 0xE16E
+0x7876 = 0xE16F
+0x7877 = 0xE170
+0x7878 = 0xE171
+0x7879 = 0xE172
+0x787A = 0xE173
+0x787B = 0xE174
+0x787C = 0xE175
+0x787D = 0xE176
+0x787E = 0xE177
+0x7921 = 0xE178
+0x7922 = 0xE179
+0x7923 = 0xE17A
+0x7924 = 0xE17B
+0x7925 = 0xE17C
+0x7926 = 0xE17D
+0x7927 = 0xE17E
+0x7928 = 0xE17F
+0x7929 = 0xE180
+0x792A = 0xE181
+0x792B = 0xE182
+0x792C = 0xE183
+0x792D = 0xE184
+0x792E = 0xE185
+0x792F = 0xE186
+0x7930 = 0xE187
+0x7931 = 0xE188
+0x7932 = 0xE189
+0x7933 = 0xE18A
+0x7934 = 0xE18B
+0x7935 = 0xE18C
+0x7936 = 0xE18D
+0x7937 = 0xE18E
+0x7938 = 0xE18F
+0x7939 = 0xE190
+0x793A = 0xE191
+0x793B = 0xE192
+0x793C = 0xE193
+0x793D = 0xE194
+0x793E = 0xE195
+0x793F = 0xE196
+0x7940 = 0xE197
+0x7941 = 0xE198
+0x7942 = 0xE199
+0x7943 = 0xE19A
+0x7944 = 0xE19B
+0x7945 = 0xE19C
+0x7946 = 0xE19D
+0x7947 = 0xE19E
+0x7948 = 0xE19F
+0x7949 = 0xE1A0
+0x794A = 0xE1A1
+0x794B = 0xE1A2
+0x794C = 0xE1A3
+0x794D = 0xE1A4
+0x794E = 0xE1A5
+0x794F = 0xE1A6
+0x7950 = 0xE1A7
+0x7951 = 0xE1A8
+0x7952 = 0xE1A9
+0x7953 = 0xE1AA
+0x7954 = 0xE1AB
+0x7955 = 0xE1AC
+0x7956 = 0xE1AD
+0x7957 = 0xE1AE
+0x7958 = 0xE1AF
+0x7959 = 0xE1B0
+0x795A = 0xE1B1
+0x795B = 0xE1B2
+0x795C = 0xE1B3
+0x795D = 0xE1B4
+0x795E = 0xE1B5
+0x795F = 0xE1B6
+0x7960 = 0xE1B7
+0x7961 = 0xE1B8
+0x7962 = 0xE1B9
+0x7963 = 0xE1BA
+0x7964 = 0xE1BB
+0x7965 = 0xE1BC
+0x7966 = 0xE1BD
+0x7967 = 0xE1BE
+0x7968 = 0xE1BF
+0x7969 = 0xE1C0
+0x796A = 0xE1C1
+0x796B = 0xE1C2
+0x796C = 0xE1C3
+0x796D = 0xE1C4
+0x796E = 0xE1C5
+0x796F = 0xE1C6
+0x7970 = 0xE1C7
+0x7971 = 0xE1C8
+0x7972 = 0xE1C9
+0x7973 = 0xE1CA
+0x7974 = 0xE1CB
+0x7975 = 0xE1CC
+0x7976 = 0xE1CD
+0x7977 = 0xE1CE
+0x7978 = 0xE1CF
+0x7979 = 0xE1D0
+0x797A = 0xE1D1
+0x797B = 0xE1D2
+0x797C = 0xE1D3
+0x797D = 0xE1D4
+0x797E = 0xE1D5
+0x7A21 = 0xE1D6
+0x7A22 = 0xE1D7
+0x7A23 = 0xE1D8
+0x7A24 = 0xE1D9
+0x7A25 = 0xE1DA
+0x7A26 = 0xE1DB
+0x7A27 = 0xE1DC
+0x7A28 = 0xE1DD
+0x7A29 = 0xE1DE
+0x7A2A = 0xE1DF
+0x7A2B = 0xE1E0
+0x7A2C = 0xE1E1
+0x7A2D = 0xE1E2
+0x7A2E = 0xE1E3
+0x7A2F = 0xE1E4
+0x7A30 = 0xE1E5
+0x7A31 = 0xE1E6
+0x7A32 = 0xE1E7
+0x7A33 = 0xE1E8
+0x7A34 = 0xE1E9
+0x7A35 = 0xE1EA
+0x7A36 = 0xE1EB
+0x7A37 = 0xE1EC
+0x7A38 = 0xE1ED
+0x7A39 = 0xE1EE
+0x7A3A = 0xE1EF
+0x7A3B = 0xE1F0
+0x7A3C = 0xE1F1
+0x7A3D = 0xE1F2
+0x7A3E = 0xE1F3
+0x7A3F = 0xE1F4
+0x7A40 = 0xE1F5
+0x7A41 = 0xE1F6
+0x7A42 = 0xE1F7
+0x7A43 = 0xE1F8
+0x7A44 = 0xE1F9
+0x7A45 = 0xE1FA
+0x7A46 = 0xE1FB
+0x7A47 = 0xE1FC
+0x7A48 = 0xE1FD
+0x7A49 = 0xE1FE
+0x7A4A = 0xE1FF
+0x7A4B = 0xE200
+0x7A4C = 0xE201
+0x7A4D = 0xE202
+0x7A4E = 0xE203
+0x7A4F = 0xE204
+0x7A50 = 0xE205
+0x7A51 = 0xE206
+0x7A52 = 0xE207
+0x7A53 = 0xE208
+0x7A54 = 0xE209
+0x7A55 = 0xE20A
+0x7A56 = 0xE20B
+0x7A57 = 0xE20C
+0x7A58 = 0xE20D
+0x7A59 = 0xE20E
+0x7A5A = 0xE20F
+0x7A5B = 0xE210
+0x7A5C = 0xE211
+0x7A5D = 0xE212
+0x7A5E = 0xE213
+0x7A5F = 0xE214
+0x7A60 = 0xE215
+0x7A61 = 0xE216
+0x7A62 = 0xE217
+0x7A63 = 0xE218
+0x7A64 = 0xE219
+0x7A65 = 0xE21A
+0x7A66 = 0xE21B
+0x7A67 = 0xE21C
+0x7A68 = 0xE21D
+0x7A69 = 0xE21E
+0x7A6A = 0xE21F
+0x7A6B = 0xE220
+0x7A6C = 0xE221
+0x7A6D = 0xE222
+0x7A6E = 0xE223
+0x7A6F = 0xE224
+0x7A70 = 0xE225
+0x7A71 = 0xE226
+0x7A72 = 0xE227
+0x7A73 = 0xE228
+0x7A74 = 0xE229
+0x7A75 = 0xE22A
+0x7A76 = 0xE22B
+0x7A77 = 0xE22C
+0x7A78 = 0xE22D
+0x7A79 = 0xE22E
+0x7A7A = 0xE22F
+0x7A7B = 0xE230
+0x7A7C = 0xE231
+0x7A7D = 0xE232
+0x7A7E = 0xE233
+0x7B21 = 0xE234
+0x7B22 = 0xE235
+0x7B23 = 0xE236
+0x7B24 = 0xE237
+0x7B25 = 0xE238
+0x7B26 = 0xE239
+0x7B27 = 0xE23A
+0x7B28 = 0xE23B
+0x7B29 = 0xE23C
+0x7B2A = 0xE23D
+0x7B2B = 0xE23E
+0x7B2C = 0xE23F
+0x7B2D = 0xE240
+0x7B2E = 0xE241
+0x7B2F = 0xE242
+0x7B30 = 0xE243
+0x7B31 = 0xE244
+0x7B32 = 0xE245
+0x7B33 = 0xE246
+0x7B34 = 0xE247
+0x7B35 = 0xE248
+0x7B36 = 0xE249
+0x7B37 = 0xE24A
+0x7B38 = 0xE24B
+0x7B39 = 0xE24C
+0x7B3A = 0xE24D
+0x7B3B = 0xE24E
+0x7B3C = 0xE24F
+0x7B3D = 0xE250
+0x7B3E = 0xE251
+0x7B3F = 0xE252
+0x7B40 = 0xE253
+0x7B41 = 0xE254
+0x7B42 = 0xE255
+0x7B43 = 0xE256
+0x7B44 = 0xE257
+0x7B45 = 0xE258
+0x7B46 = 0xE259
+0x7B47 = 0xE25A
+0x7B48 = 0xE25B
+0x7B49 = 0xE25C
+0x7B4A = 0xE25D
+0x7B4B = 0xE25E
+0x7B4C = 0xE25F
+0x7B4D = 0xE260
+0x7B4E = 0xE261
+0x7B4F = 0xE262
+0x7B50 = 0xE263
+0x7B51 = 0xE264
+0x7B52 = 0xE265
+0x7B53 = 0xE266
+0x7B54 = 0xE267
+0x7B55 = 0xE268
+0x7B56 = 0xE269
+0x7B57 = 0xE26A
+0x7B58 = 0xE26B
+0x7B59 = 0xE26C
+0x7B5A = 0xE26D
+0x7B5B = 0xE26E
+0x7B5C = 0xE26F
+0x7B5D = 0xE270
+0x7B5E = 0xE271
+0x7B5F = 0xE272
+0x7B60 = 0xE273
+0x7B61 = 0xE274
+0x7B62 = 0xE275
+0x7B63 = 0xE276
+0x7B64 = 0xE277
+0x7B65 = 0xE278
+0x7B66 = 0xE279
+0x7B67 = 0xE27A
+0x7B68 = 0xE27B
+0x7B69 = 0xE27C
+0x7B6A = 0xE27D
+0x7B6B = 0xE27E
+0x7B6C = 0xE27F
+0x7B6D = 0xE280
+0x7B6E = 0xE281
+0x7B6F = 0xE282
+0x7B70 = 0xE283
+0x7B71 = 0xE284
+0x7B72 = 0xE285
+0x7B73 = 0xE286
+0x7B74 = 0xE287
+0x7B75 = 0xE288
+0x7B76 = 0xE289
+0x7B77 = 0xE28A
+0x7B78 = 0xE28B
+0x7B79 = 0xE28C
+0x7B7A = 0xE28D
+0x7B7B = 0xE28E
+0x7B7C = 0xE28F
+0x7B7D = 0xE290
+0x7B7E = 0xE291
+0x7C21 = 0xE292
+0x7C22 = 0xE293
+0x7C23 = 0xE294
+0x7C24 = 0xE295
+0x7C25 = 0xE296
+0x7C26 = 0xE297
+0x7C27 = 0xE298
+0x7C28 = 0xE299
+0x7C29 = 0xE29A
+0x7C2A = 0xE29B
+0x7C2B = 0xE29C
+0x7C2C = 0xE29D
+0x7C2D = 0xE29E
+0x7C2E = 0xE29F
+0x7C2F = 0xE2A0
+0x7C30 = 0xE2A1
+0x7C31 = 0xE2A2
+0x7C32 = 0xE2A3
+0x7C33 = 0xE2A4
+0x7C34 = 0xE2A5
+0x7C35 = 0xE2A6
+0x7C36 = 0xE2A7
+0x7C37 = 0xE2A8
+0x7C38 = 0xE2A9
+0x7C39 = 0xE2AA
+0x7C3A = 0xE2AB
+0x7C3B = 0xE2AC
+0x7C3C = 0xE2AD
+0x7C3D = 0xE2AE
+0x7C3E = 0xE2AF
+0x7C3F = 0xE2B0
+0x7C40 = 0xE2B1
+0x7C41 = 0xE2B2
+0x7C42 = 0xE2B3
+0x7C43 = 0xE2B4
+0x7C44 = 0xE2B5
+0x7C45 = 0xE2B6
+0x7C46 = 0xE2B7
+0x7C47 = 0xE2B8
+0x7C48 = 0xE2B9
+0x7C49 = 0xE2BA
+0x7C4A = 0xE2BB
+0x7C4B = 0xE2BC
+0x7C4C = 0xE2BD
+0x7C4D = 0xE2BE
+0x7C4E = 0xE2BF
+0x7C4F = 0xE2C0
+0x7C50 = 0xE2C1
+0x7C51 = 0xE2C2
+0x7C52 = 0xE2C3
+0x7C53 = 0xE2C4
+0x7C54 = 0xE2C5
+0x7C55 = 0xE2C6
+0x7C56 = 0xE2C7
+0x7C57 = 0xE2C8
+0x7C58 = 0xE2C9
+0x7C59 = 0xE2CA
+0x7C5A = 0xE2CB
+0x7C5B = 0xE2CC
+0x7C5C = 0xE2CD
+0x7C5D = 0xE2CE
+0x7C5E = 0xE2CF
+0x7C5F = 0xE2D0
+0x7C60 = 0xE2D1
+0x7C61 = 0xE2D2
+0x7C62 = 0xE2D3
+0x7C63 = 0xE2D4
+0x7C64 = 0xE2D5
+0x7C65 = 0xE2D6
+0x7C66 = 0xE2D7
+0x7C67 = 0xE2D8
+0x7C68 = 0xE2D9
+0x7C69 = 0xE2DA
+0x7C6A = 0xE2DB
+0x7C6B = 0xE2DC
+0x7C6C = 0xE2DD
+0x7C6D = 0xE2DE
+0x7C6E = 0xE2DF
+0x7C6F = 0xE2E0
+0x7C70 = 0xE2E1
+0x7C71 = 0xE2E2
+0x7C72 = 0xE2E3
+0x7C73 = 0xE2E4
+0x7C74 = 0xE2E5
+0x7C75 = 0xE2E6
+0x7C76 = 0xE2E7
+0x7C77 = 0xE2E8
+0x7C78 = 0xE2E9
+0x7C79 = 0xE2EA
+0x7C7A = 0xE2EB
+0x7C7B = 0xE2EC
+0x7C7C = 0xE2ED
+0x7C7D = 0xE2EE
+0x7C7E = 0xE2EF
+0x7D21 = 0xE2F0
+0x7D22 = 0xE2F1
+0x7D23 = 0xE2F2
+0x7D24 = 0xE2F3
+0x7D25 = 0xE2F4
+0x7D26 = 0xE2F5
+0x7D27 = 0xE2F6
+0x7D28 = 0xE2F7
+0x7D29 = 0xE2F8
+0x7D2A = 0xE2F9
+0x7D2B = 0xE2FA
+0x7D2C = 0xE2FB
+0x7D2D = 0xE2FC
+0x7D2E = 0xE2FD
+0x7D2F = 0xE2FE
+0x7D30 = 0xE2FF
+0x7D31 = 0xE300
+0x7D32 = 0xE301
+0x7D33 = 0xE302
+0x7D34 = 0xE303
+0x7D35 = 0xE304
+0x7D36 = 0xE305
+0x7D37 = 0xE306
+0x7D38 = 0xE307
+0x7D39 = 0xE308
+0x7D3A = 0xE309
+0x7D3B = 0xE30A
+0x7D3C = 0xE30B
+0x7D3D = 0xE30C
+0x7D3E = 0xE30D
+0x7D3F = 0xE30E
+0x7D40 = 0xE30F
+0x7D41 = 0xE310
+0x7D42 = 0xE311
+0x7D43 = 0xE312
+0x7D44 = 0xE313
+0x7D45 = 0xE314
+0x7D46 = 0xE315
+0x7D47 = 0xE316
+0x7D48 = 0xE317
+0x7D49 = 0xE318
+0x7D4A = 0xE319
+0x7D4B = 0xE31A
+0x7D4C = 0xE31B
+0x7D4D = 0xE31C
+0x7D4E = 0xE31D
+0x7D4F = 0xE31E
+0x7D50 = 0xE31F
+0x7D51 = 0xE320
+0x7D52 = 0xE321
+0x7D53 = 0xE322
+0x7D54 = 0xE323
+0x7D55 = 0xE324
+0x7D56 = 0xE325
+0x7D57 = 0xE326
+0x7D58 = 0xE327
+0x7D59 = 0xE328
+0x7D5A = 0xE329
+0x7D5B = 0xE32A
+0x7D5C = 0xE32B
+0x7D5D = 0xE32C
+0x7D5E = 0xE32D
+0x7D5F = 0xE32E
+0x7D60 = 0xE32F
+0x7D61 = 0xE330
+0x7D62 = 0xE331
+0x7D63 = 0xE332
+0x7D64 = 0xE333
+0x7D65 = 0xE334
+0x7D66 = 0xE335
+0x7D67 = 0xE336
+0x7D68 = 0xE337
+0x7D69 = 0xE338
+0x7D6A = 0xE339
+0x7D6B = 0xE33A
+0x7D6C = 0xE33B
+0x7D6D = 0xE33C
+0x7D6E = 0xE33D
+0x7D6F = 0xE33E
+0x7D70 = 0xE33F
+0x7D71 = 0xE340
+0x7D72 = 0xE341
+0x7D73 = 0xE342
+0x7D74 = 0xE343
+0x7D75 = 0xE344
+0x7D76 = 0xE345
+0x7D77 = 0xE346
+0x7D78 = 0xE347
+0x7D79 = 0xE348
+0x7D7A = 0xE349
+0x7D7B = 0xE34A
+0x7D7C = 0xE34B
+0x7D7D = 0xE34C
+0x7D7E = 0xE34D
+0x7E21 = 0xE34E
+0x7E22 = 0xE34F
+0x7E23 = 0xE350
+0x7E24 = 0xE351
+0x7E25 = 0xE352
+0x7E26 = 0xE353
+0x7E27 = 0xE354
+0x7E28 = 0xE355
+0x7E29 = 0xE356
+0x7E2A = 0xE357
+0x7E2B = 0xE358
+0x7E2C = 0xE359
+0x7E2D = 0xE35A
+0x7E2E = 0xE35B
+0x7E2F = 0xE35C
+0x7E30 = 0xE35D
+0x7E31 = 0xE35E
+0x7E32 = 0xE35F
+0x7E33 = 0xE360
+0x7E34 = 0xE361
+0x7E35 = 0xE362
+0x7E36 = 0xE363
+0x7E37 = 0xE364
+0x7E38 = 0xE365
+0x7E39 = 0xE366
+0x7E3A = 0xE367
+0x7E3B = 0xE368
+0x7E3C = 0xE369
+0x7E3D = 0xE36A
+0x7E3E = 0xE36B
+0x7E3F = 0xE36C
+0x7E40 = 0xE36D
+0x7E41 = 0xE36E
+0x7E42 = 0xE36F
+0x7E43 = 0xE370
+0x7E44 = 0xE371
+0x7E45 = 0xE372
+0x7E46 = 0xE373
+0x7E47 = 0xE374
+0x7E48 = 0xE375
+0x7E49 = 0xE376
+0x7E4A = 0xE377
+0x7E4B = 0xE378
+0x7E4C = 0xE379
+0x7E4D = 0xE37A
+0x7E4E = 0xE37B
+0x7E4F = 0xE37C
+0x7E50 = 0xE37D
+0x7E51 = 0xE37E
+0x7E52 = 0xE37F
+0x7E53 = 0xE380
+0x7E54 = 0xE381
+0x7E55 = 0xE382
+0x7E56 = 0xE383
+0x7E57 = 0xE384
+0x7E58 = 0xE385
+0x7E59 = 0xE386
+0x7E5A = 0xE387
+0x7E5B = 0xE388
+0x7E5C = 0xE389
+0x7E5D = 0xE38A
+0x7E5E = 0xE38B
+0x7E5F = 0xE38C
+0x7E60 = 0xE38D
+0x7E61 = 0xE38E
+0x7E62 = 0xE38F
+0x7E63 = 0xE390
+0x7E64 = 0xE391
+0x7E65 = 0xE392
+0x7E66 = 0xE393
+0x7E67 = 0xE394
+0x7E68 = 0xE395
+0x7E69 = 0xE396
+0x7E6A = 0xE397
+0x7E6B = 0xE398
+0x7E6C = 0xE399
+0x7E6D = 0xE39A
+0x7E6E = 0xE39B
+0x7E6F = 0xE39C
+0x7E70 = 0xE39D
+0x7E71 = 0xE39E
+0x7E72 = 0xE39F
+0x7E73 = 0xE3A0
+0x7E74 = 0xE3A1
+0x7E75 = 0xE3A2
+0x7E76 = 0xE3A3
+0x7E77 = 0xE3A4
+0x7E78 = 0xE3A5
+0x7E79 = 0xE3A6
+0x7E7A = 0xE3A7
+0x7E7B = 0xE3A8
+0x7E7C = 0xE3A9
+0x7E7D = 0xE3AA
+0x7E7E = 0xE3AB
+END_MAP
diff --git a/enc/trans/JIS/JISX0208VDC@NEC%UCS.src b/enc/trans/JIS/JISX0208VDC@NEC%UCS.src
new file mode 100644
index 0000000000..bf7ea7b67a
--- /dev/null
+++ b/enc/trans/JIS/JISX0208VDC@NEC%UCS.src
@@ -0,0 +1,97 @@
+# $NetBSD: JISX0208VDC@NEC%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0208VDC:NEC/UCS"
+SRC_ZONE	0x2D21 - 0x2D7C
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x2D21 = 0x2460
+0x2D22 = 0x2461
+0x2D23 = 0x2462
+0x2D24 = 0x2463
+0x2D25 = 0x2464
+0x2D26 = 0x2465
+0x2D27 = 0x2466
+0x2D28 = 0x2467
+0x2D29 = 0x2468
+0x2D2A = 0x2469
+0x2D2B = 0x246A
+0x2D2C = 0x246B
+0x2D2D = 0x246C
+0x2D2E = 0x246D
+0x2D2F = 0x246E
+0x2D30 = 0x246F
+0x2D31 = 0x2470
+0x2D32 = 0x2471
+0x2D33 = 0x2472
+0x2D34 = 0x2473
+0x2D35 = 0x2160
+0x2D36 = 0x2161
+0x2D37 = 0x2162
+0x2D38 = 0x2163
+0x2D39 = 0x2164
+0x2D3A = 0x2165
+0x2D3B = 0x2166
+0x2D3C = 0x2167
+0x2D3D = 0x2168
+0x2D3E = 0x2169
+0x2D40 = 0x3349
+0x2D41 = 0x3314
+0x2D42 = 0x3322
+0x2D43 = 0x334D
+0x2D44 = 0x3318
+0x2D45 = 0x3327
+0x2D46 = 0x3303
+0x2D47 = 0x3336
+0x2D48 = 0x3351
+0x2D49 = 0x3357
+0x2D4A = 0x330D
+0x2D4B = 0x3326
+0x2D4C = 0x3323
+0x2D4D = 0x332B
+0x2D4E = 0x334A
+0x2D4F = 0x333B
+0x2D50 = 0x339C
+0x2D51 = 0x339D
+0x2D52 = 0x339E
+0x2D53 = 0x338E
+0x2D54 = 0x338F
+0x2D55 = 0x33C4
+0x2D56 = 0x33A1
+0x2D5F = 0x337B
+0x2D60 = 0x301D
+0x2D61 = 0x301F
+0x2D62 = 0x2116
+0x2D63 = 0x33CD
+0x2D64 = 0x2121
+0x2D65 = 0x32A4
+0x2D66 = 0x32A5
+0x2D67 = 0x32A6
+0x2D68 = 0x32A7
+0x2D69 = 0x32A8
+0x2D6A = 0x3231
+0x2D6B = 0x3232
+0x2D6C = 0x3239
+0x2D6D = 0x337E
+0x2D6E = 0x337D
+0x2D6F = 0x337C
+0x2D70 = 0x2252
+0x2D71 = 0x2261
+0x2D72 = 0x222B
+0x2D73 = 0x222E
+0x2D74 = 0x2211
+0x2D75 = 0x221A
+0x2D76 = 0x22A5
+0x2D77 = 0x2220
+0x2D78 = 0x221F
+0x2D79 = 0x22BF
+0x2D7A = 0x2235
+0x2D7B = 0x2229
+0x2D7C = 0x222A
+END_MAP
diff --git a/enc/trans/JIS/JISX0212%UCS.src b/enc/trans/JIS/JISX0212%UCS.src
new file mode 100644
index 0000000000..cf4e7ecf62
--- /dev/null
+++ b/enc/trans/JIS/JISX0212%UCS.src
@@ -0,0 +1,6167 @@
+# $NetBSD: JISX0212%UCS.src,v 1.2 2003/07/12 16:11:10 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		JISX0212/UCS
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             JIS X 0212 (1990) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.9
+#	Table format:     Format A
+#	Date:             8 March 1994
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from JIS X 0212 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# JIS X 0212 and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between JIS X 0212 and
+# Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point.  Including all these
+#			names in this file increases its size substantially
+#			and needlessly.  The token "<CJK>" is used for the
+#			name of these characters.  If necessary, it can be
+#			expanded algorithmically by a parser or editor.
+#
+#	The entries are in JIS X 0212 order
+#
+#	The following algorithms can be used to change the hex form
+#		of JIS 0212 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x6D63 -> 0x4D43 -> 7767
+#
+#   The kanji mappings are a normative part of ISO/IEC 10646.  The
+#       non-kanji mappings are provisional, pending definition of
+#       official mappings by Japanese standards bodies
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+#	Notes:
+#
+#	1. JIS X 0212 apparently unified the following two symbols
+#	   into a single character at 0x2922:
+#	
+#	   LATIN CAPITAL LETTER D WITH STROKE
+#	   LATIN CAPITAL LETTER ETH
+#
+#	   However, JIS X 0212 maintains the distinction between
+#	   the lowercase forms of these two elements at 0x2942 and 0x2943.
+#	   Given the structre of these JIS encodings, it is clear that
+#	   0x2922 and 0x2942 are intended to be a capital/small pair.
+#	   Consequently, in the Unicode mapping, 0x2922 is treated as
+#	   LATIN CAPITAL LETTER D WITH STROKE.
+#	  
+0x222F = 0x02D8
+0x2230 = 0x02C7
+0x2231 = 0x00B8
+0x2232 = 0x02D9
+0x2233 = 0x02DD
+0x2234 = 0x00AF
+0x2235 = 0x02DB
+0x2236 = 0x02DA
+0x2237 = 0x007E
+0x2238 = 0x0384
+0x2239 = 0x0385
+0x2242 = 0x00A1
+0x2243 = 0x00A6
+0x2244 = 0x00BF
+0x226B = 0x00BA
+0x226C = 0x00AA
+0x226D = 0x00A9
+0x226E = 0x00AE
+0x226F = 0x2122
+0x2270 = 0x00A4
+0x2271 = 0x2116
+0x2661 = 0x0386
+0x2662 = 0x0388
+0x2663 = 0x0389
+0x2664 = 0x038A
+0x2665 = 0x03AA
+0x2667 = 0x038C
+0x2669 = 0x038E
+0x266A = 0x03AB
+0x266C = 0x038F
+0x2671 = 0x03AC
+0x2672 = 0x03AD
+0x2673 = 0x03AE
+0x2674 = 0x03AF
+0x2675 = 0x03CA
+0x2676 = 0x0390
+0x2677 = 0x03CC
+0x2678 = 0x03C2
+0x2679 = 0x03CD
+0x267A = 0x03CB
+0x267B = 0x03B0
+0x267C = 0x03CE
+0x2742 = 0x0402
+0x2743 = 0x0403
+0x2744 = 0x0404
+0x2745 = 0x0405
+0x2746 = 0x0406
+0x2747 = 0x0407
+0x2748 = 0x0408
+0x2749 = 0x0409
+0x274A = 0x040A
+0x274B = 0x040B
+0x274C = 0x040C
+0x274D = 0x040E
+0x274E = 0x040F
+0x2772 = 0x0452
+0x2773 = 0x0453
+0x2774 = 0x0454
+0x2775 = 0x0455
+0x2776 = 0x0456
+0x2777 = 0x0457
+0x2778 = 0x0458
+0x2779 = 0x0459
+0x277A = 0x045A
+0x277B = 0x045B
+0x277C = 0x045C
+0x277D = 0x045E
+0x277E = 0x045F
+0x2921 = 0x00C6
+0x2922 = 0x0110
+0x2924 = 0x0126
+0x2926 = 0x0132
+0x2928 = 0x0141
+0x2929 = 0x013F
+0x292B = 0x014A
+0x292C = 0x00D8
+0x292D = 0x0152
+0x292F = 0x0166
+0x2930 = 0x00DE
+0x2941 = 0x00E6
+0x2942 = 0x0111
+0x2943 = 0x00F0
+0x2944 = 0x0127
+0x2945 = 0x0131
+0x2946 = 0x0133
+0x2947 = 0x0138
+0x2948 = 0x0142
+0x2949 = 0x0140
+0x294A = 0x0149
+0x294B = 0x014B
+0x294C = 0x00F8
+0x294D = 0x0153
+0x294E = 0x00DF
+0x294F = 0x0167
+0x2950 = 0x00FE
+0x2A21 = 0x00C1
+0x2A22 = 0x00C0
+0x2A23 = 0x00C4
+0x2A24 = 0x00C2
+0x2A25 = 0x0102
+0x2A26 = 0x01CD
+0x2A27 = 0x0100
+0x2A28 = 0x0104
+0x2A29 = 0x00C5
+0x2A2A = 0x00C3
+0x2A2B = 0x0106
+0x2A2C = 0x0108
+0x2A2D = 0x010C
+0x2A2E = 0x00C7
+0x2A2F = 0x010A
+0x2A30 = 0x010E
+0x2A31 = 0x00C9
+0x2A32 = 0x00C8
+0x2A33 = 0x00CB
+0x2A34 = 0x00CA
+0x2A35 = 0x011A
+0x2A36 = 0x0116
+0x2A37 = 0x0112
+0x2A38 = 0x0118
+0x2A3A = 0x011C
+0x2A3B = 0x011E
+0x2A3C = 0x0122
+0x2A3D = 0x0120
+0x2A3E = 0x0124
+0x2A3F = 0x00CD
+0x2A40 = 0x00CC
+0x2A41 = 0x00CF
+0x2A42 = 0x00CE
+0x2A43 = 0x01CF
+0x2A44 = 0x0130
+0x2A45 = 0x012A
+0x2A46 = 0x012E
+0x2A47 = 0x0128
+0x2A48 = 0x0134
+0x2A49 = 0x0136
+0x2A4A = 0x0139
+0x2A4B = 0x013D
+0x2A4C = 0x013B
+0x2A4D = 0x0143
+0x2A4E = 0x0147
+0x2A4F = 0x0145
+0x2A50 = 0x00D1
+0x2A51 = 0x00D3
+0x2A52 = 0x00D2
+0x2A53 = 0x00D6
+0x2A54 = 0x00D4
+0x2A55 = 0x01D1
+0x2A56 = 0x0150
+0x2A57 = 0x014C
+0x2A58 = 0x00D5
+0x2A59 = 0x0154
+0x2A5A = 0x0158
+0x2A5B = 0x0156
+0x2A5C = 0x015A
+0x2A5D = 0x015C
+0x2A5E = 0x0160
+0x2A5F = 0x015E
+0x2A60 = 0x0164
+0x2A61 = 0x0162
+0x2A62 = 0x00DA
+0x2A63 = 0x00D9
+0x2A64 = 0x00DC
+0x2A65 = 0x00DB
+0x2A66 = 0x016C
+0x2A67 = 0x01D3
+0x2A68 = 0x0170
+0x2A69 = 0x016A
+0x2A6A = 0x0172
+0x2A6B = 0x016E
+0x2A6C = 0x0168
+0x2A6D = 0x01D7
+0x2A6E = 0x01DB
+0x2A6F = 0x01D9
+0x2A70 = 0x01D5
+0x2A71 = 0x0174
+0x2A72 = 0x00DD
+0x2A73 = 0x0178
+0x2A74 = 0x0176
+0x2A75 = 0x0179
+0x2A76 = 0x017D
+0x2A77 = 0x017B
+0x2B21 = 0x00E1
+0x2B22 = 0x00E0
+0x2B23 = 0x00E4
+0x2B24 = 0x00E2
+0x2B25 = 0x0103
+0x2B26 = 0x01CE
+0x2B27 = 0x0101
+0x2B28 = 0x0105
+0x2B29 = 0x00E5
+0x2B2A = 0x00E3
+0x2B2B = 0x0107
+0x2B2C = 0x0109
+0x2B2D = 0x010D
+0x2B2E = 0x00E7
+0x2B2F = 0x010B
+0x2B30 = 0x010F
+0x2B31 = 0x00E9
+0x2B32 = 0x00E8
+0x2B33 = 0x00EB
+0x2B34 = 0x00EA
+0x2B35 = 0x011B
+0x2B36 = 0x0117
+0x2B37 = 0x0113
+0x2B38 = 0x0119
+0x2B39 = 0x01F5
+0x2B3A = 0x011D
+0x2B3B = 0x011F
+0x2B3D = 0x0121
+0x2B3E = 0x0125
+0x2B3F = 0x00ED
+0x2B40 = 0x00EC
+0x2B41 = 0x00EF
+0x2B42 = 0x00EE
+0x2B43 = 0x01D0
+0x2B45 = 0x012B
+0x2B46 = 0x012F
+0x2B47 = 0x0129
+0x2B48 = 0x0135
+0x2B49 = 0x0137
+0x2B4A = 0x013A
+0x2B4B = 0x013E
+0x2B4C = 0x013C
+0x2B4D = 0x0144
+0x2B4E = 0x0148
+0x2B4F = 0x0146
+0x2B50 = 0x00F1
+0x2B51 = 0x00F3
+0x2B52 = 0x00F2
+0x2B53 = 0x00F6
+0x2B54 = 0x00F4
+0x2B55 = 0x01D2
+0x2B56 = 0x0151
+0x2B57 = 0x014D
+0x2B58 = 0x00F5
+0x2B59 = 0x0155
+0x2B5A = 0x0159
+0x2B5B = 0x0157
+0x2B5C = 0x015B
+0x2B5D = 0x015D
+0x2B5E = 0x0161
+0x2B5F = 0x015F
+0x2B60 = 0x0165
+0x2B61 = 0x0163
+0x2B62 = 0x00FA
+0x2B63 = 0x00F9
+0x2B64 = 0x00FC
+0x2B65 = 0x00FB
+0x2B66 = 0x016D
+0x2B67 = 0x01D4
+0x2B68 = 0x0171
+0x2B69 = 0x016B
+0x2B6A = 0x0173
+0x2B6B = 0x016F
+0x2B6C = 0x0169
+0x2B6D = 0x01D8
+0x2B6E = 0x01DC
+0x2B6F = 0x01DA
+0x2B70 = 0x01D6
+0x2B71 = 0x0175
+0x2B72 = 0x00FD
+0x2B73 = 0x00FF
+0x2B74 = 0x0177
+0x2B75 = 0x017A
+0x2B76 = 0x017E
+0x2B77 = 0x017C
+0x3021 = 0x4E02
+0x3022 = 0x4E04
+0x3023 = 0x4E05
+0x3024 = 0x4E0C
+0x3025 = 0x4E12
+0x3026 = 0x4E1F
+0x3027 = 0x4E23
+0x3028 = 0x4E24
+0x3029 = 0x4E28
+0x302A = 0x4E2B
+0x302B = 0x4E2E
+0x302C = 0x4E2F
+0x302D = 0x4E30
+0x302E = 0x4E35
+0x302F = 0x4E40
+0x3030 = 0x4E41
+0x3031 = 0x4E44
+0x3032 = 0x4E47
+0x3033 = 0x4E51
+0x3034 = 0x4E5A
+0x3035 = 0x4E5C
+0x3036 = 0x4E63
+0x3037 = 0x4E68
+0x3038 = 0x4E69
+0x3039 = 0x4E74
+0x303A = 0x4E75
+0x303B = 0x4E79
+0x303C = 0x4E7F
+0x303D = 0x4E8D
+0x303E = 0x4E96
+0x303F = 0x4E97
+0x3040 = 0x4E9D
+0x3041 = 0x4EAF
+0x3042 = 0x4EB9
+0x3043 = 0x4EC3
+0x3044 = 0x4ED0
+0x3045 = 0x4EDA
+0x3046 = 0x4EDB
+0x3047 = 0x4EE0
+0x3048 = 0x4EE1
+0x3049 = 0x4EE2
+0x304A = 0x4EE8
+0x304B = 0x4EEF
+0x304C = 0x4EF1
+0x304D = 0x4EF3
+0x304E = 0x4EF5
+0x304F = 0x4EFD
+0x3050 = 0x4EFE
+0x3051 = 0x4EFF
+0x3052 = 0x4F00
+0x3053 = 0x4F02
+0x3054 = 0x4F03
+0x3055 = 0x4F08
+0x3056 = 0x4F0B
+0x3057 = 0x4F0C
+0x3058 = 0x4F12
+0x3059 = 0x4F15
+0x305A = 0x4F16
+0x305B = 0x4F17
+0x305C = 0x4F19
+0x305D = 0x4F2E
+0x305E = 0x4F31
+0x305F = 0x4F60
+0x3060 = 0x4F33
+0x3061 = 0x4F35
+0x3062 = 0x4F37
+0x3063 = 0x4F39
+0x3064 = 0x4F3B
+0x3065 = 0x4F3E
+0x3066 = 0x4F40
+0x3067 = 0x4F42
+0x3068 = 0x4F48
+0x3069 = 0x4F49
+0x306A = 0x4F4B
+0x306B = 0x4F4C
+0x306C = 0x4F52
+0x306D = 0x4F54
+0x306E = 0x4F56
+0x306F = 0x4F58
+0x3070 = 0x4F5F
+0x3071 = 0x4F63
+0x3072 = 0x4F6A
+0x3073 = 0x4F6C
+0x3074 = 0x4F6E
+0x3075 = 0x4F71
+0x3076 = 0x4F77
+0x3077 = 0x4F78
+0x3078 = 0x4F79
+0x3079 = 0x4F7A
+0x307A = 0x4F7D
+0x307B = 0x4F7E
+0x307C = 0x4F81
+0x307D = 0x4F82
+0x307E = 0x4F84
+0x3121 = 0x4F85
+0x3122 = 0x4F89
+0x3123 = 0x4F8A
+0x3124 = 0x4F8C
+0x3125 = 0x4F8E
+0x3126 = 0x4F90
+0x3127 = 0x4F92
+0x3128 = 0x4F93
+0x3129 = 0x4F94
+0x312A = 0x4F97
+0x312B = 0x4F99
+0x312C = 0x4F9A
+0x312D = 0x4F9E
+0x312E = 0x4F9F
+0x312F = 0x4FB2
+0x3130 = 0x4FB7
+0x3131 = 0x4FB9
+0x3132 = 0x4FBB
+0x3133 = 0x4FBC
+0x3134 = 0x4FBD
+0x3135 = 0x4FBE
+0x3136 = 0x4FC0
+0x3137 = 0x4FC1
+0x3138 = 0x4FC5
+0x3139 = 0x4FC6
+0x313A = 0x4FC8
+0x313B = 0x4FC9
+0x313C = 0x4FCB
+0x313D = 0x4FCC
+0x313E = 0x4FCD
+0x313F = 0x4FCF
+0x3140 = 0x4FD2
+0x3141 = 0x4FDC
+0x3142 = 0x4FE0
+0x3143 = 0x4FE2
+0x3144 = 0x4FF0
+0x3145 = 0x4FF2
+0x3146 = 0x4FFC
+0x3147 = 0x4FFD
+0x3148 = 0x4FFF
+0x3149 = 0x5000
+0x314A = 0x5001
+0x314B = 0x5004
+0x314C = 0x5007
+0x314D = 0x500A
+0x314E = 0x500C
+0x314F = 0x500E
+0x3150 = 0x5010
+0x3151 = 0x5013
+0x3152 = 0x5017
+0x3153 = 0x5018
+0x3154 = 0x501B
+0x3155 = 0x501C
+0x3156 = 0x501D
+0x3157 = 0x501E
+0x3158 = 0x5022
+0x3159 = 0x5027
+0x315A = 0x502E
+0x315B = 0x5030
+0x315C = 0x5032
+0x315D = 0x5033
+0x315E = 0x5035
+0x315F = 0x5040
+0x3160 = 0x5041
+0x3161 = 0x5042
+0x3162 = 0x5045
+0x3163 = 0x5046
+0x3164 = 0x504A
+0x3165 = 0x504C
+0x3166 = 0x504E
+0x3167 = 0x5051
+0x3168 = 0x5052
+0x3169 = 0x5053
+0x316A = 0x5057
+0x316B = 0x5059
+0x316C = 0x505F
+0x316D = 0x5060
+0x316E = 0x5062
+0x316F = 0x5063
+0x3170 = 0x5066
+0x3171 = 0x5067
+0x3172 = 0x506A
+0x3173 = 0x506D
+0x3174 = 0x5070
+0x3175 = 0x5071
+0x3176 = 0x503B
+0x3177 = 0x5081
+0x3178 = 0x5083
+0x3179 = 0x5084
+0x317A = 0x5086
+0x317B = 0x508A
+0x317C = 0x508E
+0x317D = 0x508F
+0x317E = 0x5090
+0x3221 = 0x5092
+0x3222 = 0x5093
+0x3223 = 0x5094
+0x3224 = 0x5096
+0x3225 = 0x509B
+0x3226 = 0x509C
+0x3227 = 0x509E
+0x3228 = 0x509F
+0x3229 = 0x50A0
+0x322A = 0x50A1
+0x322B = 0x50A2
+0x322C = 0x50AA
+0x322D = 0x50AF
+0x322E = 0x50B0
+0x322F = 0x50B9
+0x3230 = 0x50BA
+0x3231 = 0x50BD
+0x3232 = 0x50C0
+0x3233 = 0x50C3
+0x3234 = 0x50C4
+0x3235 = 0x50C7
+0x3236 = 0x50CC
+0x3237 = 0x50CE
+0x3238 = 0x50D0
+0x3239 = 0x50D3
+0x323A = 0x50D4
+0x323B = 0x50D8
+0x323C = 0x50DC
+0x323D = 0x50DD
+0x323E = 0x50DF
+0x323F = 0x50E2
+0x3240 = 0x50E4
+0x3241 = 0x50E6
+0x3242 = 0x50E8
+0x3243 = 0x50E9
+0x3244 = 0x50EF
+0x3245 = 0x50F1
+0x3246 = 0x50F6
+0x3247 = 0x50FA
+0x3248 = 0x50FE
+0x3249 = 0x5103
+0x324A = 0x5106
+0x324B = 0x5107
+0x324C = 0x5108
+0x324D = 0x510B
+0x324E = 0x510C
+0x324F = 0x510D
+0x3250 = 0x510E
+0x3251 = 0x50F2
+0x3252 = 0x5110
+0x3253 = 0x5117
+0x3254 = 0x5119
+0x3255 = 0x511B
+0x3256 = 0x511C
+0x3257 = 0x511D
+0x3258 = 0x511E
+0x3259 = 0x5123
+0x325A = 0x5127
+0x325B = 0x5128
+0x325C = 0x512C
+0x325D = 0x512D
+0x325E = 0x512F
+0x325F = 0x5131
+0x3260 = 0x5133
+0x3261 = 0x5134
+0x3262 = 0x5135
+0x3263 = 0x5138
+0x3264 = 0x5139
+0x3265 = 0x5142
+0x3266 = 0x514A
+0x3267 = 0x514F
+0x3268 = 0x5153
+0x3269 = 0x5155
+0x326A = 0x5157
+0x326B = 0x5158
+0x326C = 0x515F
+0x326D = 0x5164
+0x326E = 0x5166
+0x326F = 0x517E
+0x3270 = 0x5183
+0x3271 = 0x5184
+0x3272 = 0x518B
+0x3273 = 0x518E
+0x3274 = 0x5198
+0x3275 = 0x519D
+0x3276 = 0x51A1
+0x3277 = 0x51A3
+0x3278 = 0x51AD
+0x3279 = 0x51B8
+0x327A = 0x51BA
+0x327B = 0x51BC
+0x327C = 0x51BE
+0x327D = 0x51BF
+0x327E = 0x51C2
+0x3321 = 0x51C8
+0x3322 = 0x51CF
+0x3323 = 0x51D1
+0x3324 = 0x51D2
+0x3325 = 0x51D3
+0x3326 = 0x51D5
+0x3327 = 0x51D8
+0x3328 = 0x51DE
+0x3329 = 0x51E2
+0x332A = 0x51E5
+0x332B = 0x51EE
+0x332C = 0x51F2
+0x332D = 0x51F3
+0x332E = 0x51F4
+0x332F = 0x51F7
+0x3330 = 0x5201
+0x3331 = 0x5202
+0x3332 = 0x5205
+0x3333 = 0x5212
+0x3334 = 0x5213
+0x3335 = 0x5215
+0x3336 = 0x5216
+0x3337 = 0x5218
+0x3338 = 0x5222
+0x3339 = 0x5228
+0x333A = 0x5231
+0x333B = 0x5232
+0x333C = 0x5235
+0x333D = 0x523C
+0x333E = 0x5245
+0x333F = 0x5249
+0x3340 = 0x5255
+0x3341 = 0x5257
+0x3342 = 0x5258
+0x3343 = 0x525A
+0x3344 = 0x525C
+0x3345 = 0x525F
+0x3346 = 0x5260
+0x3347 = 0x5261
+0x3348 = 0x5266
+0x3349 = 0x526E
+0x334A = 0x5277
+0x334B = 0x5278
+0x334C = 0x5279
+0x334D = 0x5280
+0x334E = 0x5282
+0x334F = 0x5285
+0x3350 = 0x528A
+0x3351 = 0x528C
+0x3352 = 0x5293
+0x3353 = 0x5295
+0x3354 = 0x5296
+0x3355 = 0x5297
+0x3356 = 0x5298
+0x3357 = 0x529A
+0x3358 = 0x529C
+0x3359 = 0x52A4
+0x335A = 0x52A5
+0x335B = 0x52A6
+0x335C = 0x52A7
+0x335D = 0x52AF
+0x335E = 0x52B0
+0x335F = 0x52B6
+0x3360 = 0x52B7
+0x3361 = 0x52B8
+0x3362 = 0x52BA
+0x3363 = 0x52BB
+0x3364 = 0x52BD
+0x3365 = 0x52C0
+0x3366 = 0x52C4
+0x3367 = 0x52C6
+0x3368 = 0x52C8
+0x3369 = 0x52CC
+0x336A = 0x52CF
+0x336B = 0x52D1
+0x336C = 0x52D4
+0x336D = 0x52D6
+0x336E = 0x52DB
+0x336F = 0x52DC
+0x3370 = 0x52E1
+0x3371 = 0x52E5
+0x3372 = 0x52E8
+0x3373 = 0x52E9
+0x3374 = 0x52EA
+0x3375 = 0x52EC
+0x3376 = 0x52F0
+0x3377 = 0x52F1
+0x3378 = 0x52F4
+0x3379 = 0x52F6
+0x337A = 0x52F7
+0x337B = 0x5300
+0x337C = 0x5303
+0x337D = 0x530A
+0x337E = 0x530B
+0x3421 = 0x530C
+0x3422 = 0x5311
+0x3423 = 0x5313
+0x3424 = 0x5318
+0x3425 = 0x531B
+0x3426 = 0x531C
+0x3427 = 0x531E
+0x3428 = 0x531F
+0x3429 = 0x5325
+0x342A = 0x5327
+0x342B = 0x5328
+0x342C = 0x5329
+0x342D = 0x532B
+0x342E = 0x532C
+0x342F = 0x532D
+0x3430 = 0x5330
+0x3431 = 0x5332
+0x3432 = 0x5335
+0x3433 = 0x533C
+0x3434 = 0x533D
+0x3435 = 0x533E
+0x3436 = 0x5342
+0x3437 = 0x534C
+0x3438 = 0x534B
+0x3439 = 0x5359
+0x343A = 0x535B
+0x343B = 0x5361
+0x343C = 0x5363
+0x343D = 0x5365
+0x343E = 0x536C
+0x343F = 0x536D
+0x3440 = 0x5372
+0x3441 = 0x5379
+0x3442 = 0x537E
+0x3443 = 0x5383
+0x3444 = 0x5387
+0x3445 = 0x5388
+0x3446 = 0x538E
+0x3447 = 0x5393
+0x3448 = 0x5394
+0x3449 = 0x5399
+0x344A = 0x539D
+0x344B = 0x53A1
+0x344C = 0x53A4
+0x344D = 0x53AA
+0x344E = 0x53AB
+0x344F = 0x53AF
+0x3450 = 0x53B2
+0x3451 = 0x53B4
+0x3452 = 0x53B5
+0x3453 = 0x53B7
+0x3454 = 0x53B8
+0x3455 = 0x53BA
+0x3456 = 0x53BD
+0x3457 = 0x53C0
+0x3458 = 0x53C5
+0x3459 = 0x53CF
+0x345A = 0x53D2
+0x345B = 0x53D3
+0x345C = 0x53D5
+0x345D = 0x53DA
+0x345E = 0x53DD
+0x345F = 0x53DE
+0x3460 = 0x53E0
+0x3461 = 0x53E6
+0x3462 = 0x53E7
+0x3463 = 0x53F5
+0x3464 = 0x5402
+0x3465 = 0x5413
+0x3466 = 0x541A
+0x3467 = 0x5421
+0x3468 = 0x5427
+0x3469 = 0x5428
+0x346A = 0x542A
+0x346B = 0x542F
+0x346C = 0x5431
+0x346D = 0x5434
+0x346E = 0x5435
+0x346F = 0x5443
+0x3470 = 0x5444
+0x3471 = 0x5447
+0x3472 = 0x544D
+0x3473 = 0x544F
+0x3474 = 0x545E
+0x3475 = 0x5462
+0x3476 = 0x5464
+0x3477 = 0x5466
+0x3478 = 0x5467
+0x3479 = 0x5469
+0x347A = 0x546B
+0x347B = 0x546D
+0x347C = 0x546E
+0x347D = 0x5474
+0x347E = 0x547F
+0x3521 = 0x5481
+0x3522 = 0x5483
+0x3523 = 0x5485
+0x3524 = 0x5488
+0x3525 = 0x5489
+0x3526 = 0x548D
+0x3527 = 0x5491
+0x3528 = 0x5495
+0x3529 = 0x5496
+0x352A = 0x549C
+0x352B = 0x549F
+0x352C = 0x54A1
+0x352D = 0x54A6
+0x352E = 0x54A7
+0x352F = 0x54A9
+0x3530 = 0x54AA
+0x3531 = 0x54AD
+0x3532 = 0x54AE
+0x3533 = 0x54B1
+0x3534 = 0x54B7
+0x3535 = 0x54B9
+0x3536 = 0x54BA
+0x3537 = 0x54BB
+0x3538 = 0x54BF
+0x3539 = 0x54C6
+0x353A = 0x54CA
+0x353B = 0x54CD
+0x353C = 0x54CE
+0x353D = 0x54E0
+0x353E = 0x54EA
+0x353F = 0x54EC
+0x3540 = 0x54EF
+0x3541 = 0x54F6
+0x3542 = 0x54FC
+0x3543 = 0x54FE
+0x3544 = 0x54FF
+0x3545 = 0x5500
+0x3546 = 0x5501
+0x3547 = 0x5505
+0x3548 = 0x5508
+0x3549 = 0x5509
+0x354A = 0x550C
+0x354B = 0x550D
+0x354C = 0x550E
+0x354D = 0x5515
+0x354E = 0x552A
+0x354F = 0x552B
+0x3550 = 0x5532
+0x3551 = 0x5535
+0x3552 = 0x5536
+0x3553 = 0x553B
+0x3554 = 0x553C
+0x3555 = 0x553D
+0x3556 = 0x5541
+0x3557 = 0x5547
+0x3558 = 0x5549
+0x3559 = 0x554A
+0x355A = 0x554D
+0x355B = 0x5550
+0x355C = 0x5551
+0x355D = 0x5558
+0x355E = 0x555A
+0x355F = 0x555B
+0x3560 = 0x555E
+0x3561 = 0x5560
+0x3562 = 0x5561
+0x3563 = 0x5564
+0x3564 = 0x5566
+0x3565 = 0x557F
+0x3566 = 0x5581
+0x3567 = 0x5582
+0x3568 = 0x5586
+0x3569 = 0x5588
+0x356A = 0x558E
+0x356B = 0x558F
+0x356C = 0x5591
+0x356D = 0x5592
+0x356E = 0x5593
+0x356F = 0x5594
+0x3570 = 0x5597
+0x3571 = 0x55A3
+0x3572 = 0x55A4
+0x3573 = 0x55AD
+0x3574 = 0x55B2
+0x3575 = 0x55BF
+0x3576 = 0x55C1
+0x3577 = 0x55C3
+0x3578 = 0x55C6
+0x3579 = 0x55C9
+0x357A = 0x55CB
+0x357B = 0x55CC
+0x357C = 0x55CE
+0x357D = 0x55D1
+0x357E = 0x55D2
+0x3621 = 0x55D3
+0x3622 = 0x55D7
+0x3623 = 0x55D8
+0x3624 = 0x55DB
+0x3625 = 0x55DE
+0x3626 = 0x55E2
+0x3627 = 0x55E9
+0x3628 = 0x55F6
+0x3629 = 0x55FF
+0x362A = 0x5605
+0x362B = 0x5608
+0x362C = 0x560A
+0x362D = 0x560D
+0x362E = 0x560E
+0x362F = 0x560F
+0x3630 = 0x5610
+0x3631 = 0x5611
+0x3632 = 0x5612
+0x3633 = 0x5619
+0x3634 = 0x562C
+0x3635 = 0x5630
+0x3636 = 0x5633
+0x3637 = 0x5635
+0x3638 = 0x5637
+0x3639 = 0x5639
+0x363A = 0x563B
+0x363B = 0x563C
+0x363C = 0x563D
+0x363D = 0x563F
+0x363E = 0x5640
+0x363F = 0x5641
+0x3640 = 0x5643
+0x3641 = 0x5644
+0x3642 = 0x5646
+0x3643 = 0x5649
+0x3644 = 0x564B
+0x3645 = 0x564D
+0x3646 = 0x564F
+0x3647 = 0x5654
+0x3648 = 0x565E
+0x3649 = 0x5660
+0x364A = 0x5661
+0x364B = 0x5662
+0x364C = 0x5663
+0x364D = 0x5666
+0x364E = 0x5669
+0x364F = 0x566D
+0x3650 = 0x566F
+0x3651 = 0x5671
+0x3652 = 0x5672
+0x3653 = 0x5675
+0x3654 = 0x5684
+0x3655 = 0x5685
+0x3656 = 0x5688
+0x3657 = 0x568B
+0x3658 = 0x568C
+0x3659 = 0x5695
+0x365A = 0x5699
+0x365B = 0x569A
+0x365C = 0x569D
+0x365D = 0x569E
+0x365E = 0x569F
+0x365F = 0x56A6
+0x3660 = 0x56A7
+0x3661 = 0x56A8
+0x3662 = 0x56A9
+0x3663 = 0x56AB
+0x3664 = 0x56AC
+0x3665 = 0x56AD
+0x3666 = 0x56B1
+0x3667 = 0x56B3
+0x3668 = 0x56B7
+0x3669 = 0x56BE
+0x366A = 0x56C5
+0x366B = 0x56C9
+0x366C = 0x56CA
+0x366D = 0x56CB
+0x366E = 0x56CF
+0x366F = 0x56D0
+0x3670 = 0x56CC
+0x3671 = 0x56CD
+0x3672 = 0x56D9
+0x3673 = 0x56DC
+0x3674 = 0x56DD
+0x3675 = 0x56DF
+0x3676 = 0x56E1
+0x3677 = 0x56E4
+0x3678 = 0x56E5
+0x3679 = 0x56E6
+0x367A = 0x56E7
+0x367B = 0x56E8
+0x367C = 0x56F1
+0x367D = 0x56EB
+0x367E = 0x56ED
+0x3721 = 0x56F6
+0x3722 = 0x56F7
+0x3723 = 0x5701
+0x3724 = 0x5702
+0x3725 = 0x5707
+0x3726 = 0x570A
+0x3727 = 0x570C
+0x3728 = 0x5711
+0x3729 = 0x5715
+0x372A = 0x571A
+0x372B = 0x571B
+0x372C = 0x571D
+0x372D = 0x5720
+0x372E = 0x5722
+0x372F = 0x5723
+0x3730 = 0x5724
+0x3731 = 0x5725
+0x3732 = 0x5729
+0x3733 = 0x572A
+0x3734 = 0x572C
+0x3735 = 0x572E
+0x3736 = 0x572F
+0x3737 = 0x5733
+0x3738 = 0x5734
+0x3739 = 0x573D
+0x373A = 0x573E
+0x373B = 0x573F
+0x373C = 0x5745
+0x373D = 0x5746
+0x373E = 0x574C
+0x373F = 0x574D
+0x3740 = 0x5752
+0x3741 = 0x5762
+0x3742 = 0x5765
+0x3743 = 0x5767
+0x3744 = 0x5768
+0x3745 = 0x576B
+0x3746 = 0x576D
+0x3747 = 0x576E
+0x3748 = 0x576F
+0x3749 = 0x5770
+0x374A = 0x5771
+0x374B = 0x5773
+0x374C = 0x5774
+0x374D = 0x5775
+0x374E = 0x5777
+0x374F = 0x5779
+0x3750 = 0x577A
+0x3751 = 0x577B
+0x3752 = 0x577C
+0x3753 = 0x577E
+0x3754 = 0x5781
+0x3755 = 0x5783
+0x3756 = 0x578C
+0x3757 = 0x5794
+0x3758 = 0x5797
+0x3759 = 0x5799
+0x375A = 0x579A
+0x375B = 0x579C
+0x375C = 0x579D
+0x375D = 0x579E
+0x375E = 0x579F
+0x375F = 0x57A1
+0x3760 = 0x5795
+0x3761 = 0x57A7
+0x3762 = 0x57A8
+0x3763 = 0x57A9
+0x3764 = 0x57AC
+0x3765 = 0x57B8
+0x3766 = 0x57BD
+0x3767 = 0x57C7
+0x3768 = 0x57C8
+0x3769 = 0x57CC
+0x376A = 0x57CF
+0x376B = 0x57D5
+0x376C = 0x57DD
+0x376D = 0x57DE
+0x376E = 0x57E4
+0x376F = 0x57E6
+0x3770 = 0x57E7
+0x3771 = 0x57E9
+0x3772 = 0x57ED
+0x3773 = 0x57F0
+0x3774 = 0x57F5
+0x3775 = 0x57F6
+0x3776 = 0x57F8
+0x3777 = 0x57FD
+0x3778 = 0x57FE
+0x3779 = 0x57FF
+0x377A = 0x5803
+0x377B = 0x5804
+0x377C = 0x5808
+0x377D = 0x5809
+0x377E = 0x57E1
+0x3821 = 0x580C
+0x3822 = 0x580D
+0x3823 = 0x581B
+0x3824 = 0x581E
+0x3825 = 0x581F
+0x3826 = 0x5820
+0x3827 = 0x5826
+0x3828 = 0x5827
+0x3829 = 0x582D
+0x382A = 0x5832
+0x382B = 0x5839
+0x382C = 0x583F
+0x382D = 0x5849
+0x382E = 0x584C
+0x382F = 0x584D
+0x3830 = 0x584F
+0x3831 = 0x5850
+0x3832 = 0x5855
+0x3833 = 0x585F
+0x3834 = 0x5861
+0x3835 = 0x5864
+0x3836 = 0x5867
+0x3837 = 0x5868
+0x3838 = 0x5878
+0x3839 = 0x587C
+0x383A = 0x587F
+0x383B = 0x5880
+0x383C = 0x5881
+0x383D = 0x5887
+0x383E = 0x5888
+0x383F = 0x5889
+0x3840 = 0x588A
+0x3841 = 0x588C
+0x3842 = 0x588D
+0x3843 = 0x588F
+0x3844 = 0x5890
+0x3845 = 0x5894
+0x3846 = 0x5896
+0x3847 = 0x589D
+0x3848 = 0x58A0
+0x3849 = 0x58A1
+0x384A = 0x58A2
+0x384B = 0x58A6
+0x384C = 0x58A9
+0x384D = 0x58B1
+0x384E = 0x58B2
+0x384F = 0x58C4
+0x3850 = 0x58BC
+0x3851 = 0x58C2
+0x3852 = 0x58C8
+0x3853 = 0x58CD
+0x3854 = 0x58CE
+0x3855 = 0x58D0
+0x3856 = 0x58D2
+0x3857 = 0x58D4
+0x3858 = 0x58D6
+0x3859 = 0x58DA
+0x385A = 0x58DD
+0x385B = 0x58E1
+0x385C = 0x58E2
+0x385D = 0x58E9
+0x385E = 0x58F3
+0x385F = 0x5905
+0x3860 = 0x5906
+0x3861 = 0x590B
+0x3862 = 0x590C
+0x3863 = 0x5912
+0x3864 = 0x5913
+0x3865 = 0x5914
+0x3866 = 0x8641
+0x3867 = 0x591D
+0x3868 = 0x5921
+0x3869 = 0x5923
+0x386A = 0x5924
+0x386B = 0x5928
+0x386C = 0x592F
+0x386D = 0x5930
+0x386E = 0x5933
+0x386F = 0x5935
+0x3870 = 0x5936
+0x3871 = 0x593F
+0x3872 = 0x5943
+0x3873 = 0x5946
+0x3874 = 0x5952
+0x3875 = 0x5953
+0x3876 = 0x5959
+0x3877 = 0x595B
+0x3878 = 0x595D
+0x3879 = 0x595E
+0x387A = 0x595F
+0x387B = 0x5961
+0x387C = 0x5963
+0x387D = 0x596B
+0x387E = 0x596D
+0x3921 = 0x596F
+0x3922 = 0x5972
+0x3923 = 0x5975
+0x3924 = 0x5976
+0x3925 = 0x5979
+0x3926 = 0x597B
+0x3927 = 0x597C
+0x3928 = 0x598B
+0x3929 = 0x598C
+0x392A = 0x598E
+0x392B = 0x5992
+0x392C = 0x5995
+0x392D = 0x5997
+0x392E = 0x599F
+0x392F = 0x59A4
+0x3930 = 0x59A7
+0x3931 = 0x59AD
+0x3932 = 0x59AE
+0x3933 = 0x59AF
+0x3934 = 0x59B0
+0x3935 = 0x59B3
+0x3936 = 0x59B7
+0x3937 = 0x59BA
+0x3938 = 0x59BC
+0x3939 = 0x59C1
+0x393A = 0x59C3
+0x393B = 0x59C4
+0x393C = 0x59C8
+0x393D = 0x59CA
+0x393E = 0x59CD
+0x393F = 0x59D2
+0x3940 = 0x59DD
+0x3941 = 0x59DE
+0x3942 = 0x59DF
+0x3943 = 0x59E3
+0x3944 = 0x59E4
+0x3945 = 0x59E7
+0x3946 = 0x59EE
+0x3947 = 0x59EF
+0x3948 = 0x59F1
+0x3949 = 0x59F2
+0x394A = 0x59F4
+0x394B = 0x59F7
+0x394C = 0x5A00
+0x394D = 0x5A04
+0x394E = 0x5A0C
+0x394F = 0x5A0D
+0x3950 = 0x5A0E
+0x3951 = 0x5A12
+0x3952 = 0x5A13
+0x3953 = 0x5A1E
+0x3954 = 0x5A23
+0x3955 = 0x5A24
+0x3956 = 0x5A27
+0x3957 = 0x5A28
+0x3958 = 0x5A2A
+0x3959 = 0x5A2D
+0x395A = 0x5A30
+0x395B = 0x5A44
+0x395C = 0x5A45
+0x395D = 0x5A47
+0x395E = 0x5A48
+0x395F = 0x5A4C
+0x3960 = 0x5A50
+0x3961 = 0x5A55
+0x3962 = 0x5A5E
+0x3963 = 0x5A63
+0x3964 = 0x5A65
+0x3965 = 0x5A67
+0x3966 = 0x5A6D
+0x3967 = 0x5A77
+0x3968 = 0x5A7A
+0x3969 = 0x5A7B
+0x396A = 0x5A7E
+0x396B = 0x5A8B
+0x396C = 0x5A90
+0x396D = 0x5A93
+0x396E = 0x5A96
+0x396F = 0x5A99
+0x3970 = 0x5A9C
+0x3971 = 0x5A9E
+0x3972 = 0x5A9F
+0x3973 = 0x5AA0
+0x3974 = 0x5AA2
+0x3975 = 0x5AA7
+0x3976 = 0x5AAC
+0x3977 = 0x5AB1
+0x3978 = 0x5AB2
+0x3979 = 0x5AB3
+0x397A = 0x5AB5
+0x397B = 0x5AB8
+0x397C = 0x5ABA
+0x397D = 0x5ABB
+0x397E = 0x5ABF
+0x3A21 = 0x5AC4
+0x3A22 = 0x5AC6
+0x3A23 = 0x5AC8
+0x3A24 = 0x5ACF
+0x3A25 = 0x5ADA
+0x3A26 = 0x5ADC
+0x3A27 = 0x5AE0
+0x3A28 = 0x5AE5
+0x3A29 = 0x5AEA
+0x3A2A = 0x5AEE
+0x3A2B = 0x5AF5
+0x3A2C = 0x5AF6
+0x3A2D = 0x5AFD
+0x3A2E = 0x5B00
+0x3A2F = 0x5B01
+0x3A30 = 0x5B08
+0x3A31 = 0x5B17
+0x3A32 = 0x5B34
+0x3A33 = 0x5B19
+0x3A34 = 0x5B1B
+0x3A35 = 0x5B1D
+0x3A36 = 0x5B21
+0x3A37 = 0x5B25
+0x3A38 = 0x5B2D
+0x3A39 = 0x5B38
+0x3A3A = 0x5B41
+0x3A3B = 0x5B4B
+0x3A3C = 0x5B4C
+0x3A3D = 0x5B52
+0x3A3E = 0x5B56
+0x3A3F = 0x5B5E
+0x3A40 = 0x5B68
+0x3A41 = 0x5B6E
+0x3A42 = 0x5B6F
+0x3A43 = 0x5B7C
+0x3A44 = 0x5B7D
+0x3A45 = 0x5B7E
+0x3A46 = 0x5B7F
+0x3A47 = 0x5B81
+0x3A48 = 0x5B84
+0x3A49 = 0x5B86
+0x3A4A = 0x5B8A
+0x3A4B = 0x5B8E
+0x3A4C = 0x5B90
+0x3A4D = 0x5B91
+0x3A4E = 0x5B93
+0x3A4F = 0x5B94
+0x3A50 = 0x5B96
+0x3A51 = 0x5BA8
+0x3A52 = 0x5BA9
+0x3A53 = 0x5BAC
+0x3A54 = 0x5BAD
+0x3A55 = 0x5BAF
+0x3A56 = 0x5BB1
+0x3A57 = 0x5BB2
+0x3A58 = 0x5BB7
+0x3A59 = 0x5BBA
+0x3A5A = 0x5BBC
+0x3A5B = 0x5BC0
+0x3A5C = 0x5BC1
+0x3A5D = 0x5BCD
+0x3A5E = 0x5BCF
+0x3A5F = 0x5BD6
+0x3A60 = 0x5BD7
+0x3A61 = 0x5BD8
+0x3A62 = 0x5BD9
+0x3A63 = 0x5BDA
+0x3A64 = 0x5BE0
+0x3A65 = 0x5BEF
+0x3A66 = 0x5BF1
+0x3A67 = 0x5BF4
+0x3A68 = 0x5BFD
+0x3A69 = 0x5C0C
+0x3A6A = 0x5C17
+0x3A6B = 0x5C1E
+0x3A6C = 0x5C1F
+0x3A6D = 0x5C23
+0x3A6E = 0x5C26
+0x3A6F = 0x5C29
+0x3A70 = 0x5C2B
+0x3A71 = 0x5C2C
+0x3A72 = 0x5C2E
+0x3A73 = 0x5C30
+0x3A74 = 0x5C32
+0x3A75 = 0x5C35
+0x3A76 = 0x5C36
+0x3A77 = 0x5C59
+0x3A78 = 0x5C5A
+0x3A79 = 0x5C5C
+0x3A7A = 0x5C62
+0x3A7B = 0x5C63
+0x3A7C = 0x5C67
+0x3A7D = 0x5C68
+0x3A7E = 0x5C69
+0x3B21 = 0x5C6D
+0x3B22 = 0x5C70
+0x3B23 = 0x5C74
+0x3B24 = 0x5C75
+0x3B25 = 0x5C7A
+0x3B26 = 0x5C7B
+0x3B27 = 0x5C7C
+0x3B28 = 0x5C7D
+0x3B29 = 0x5C87
+0x3B2A = 0x5C88
+0x3B2B = 0x5C8A
+0x3B2C = 0x5C8F
+0x3B2D = 0x5C92
+0x3B2E = 0x5C9D
+0x3B2F = 0x5C9F
+0x3B30 = 0x5CA0
+0x3B31 = 0x5CA2
+0x3B32 = 0x5CA3
+0x3B33 = 0x5CA6
+0x3B34 = 0x5CAA
+0x3B35 = 0x5CB2
+0x3B36 = 0x5CB4
+0x3B37 = 0x5CB5
+0x3B38 = 0x5CBA
+0x3B39 = 0x5CC9
+0x3B3A = 0x5CCB
+0x3B3B = 0x5CD2
+0x3B3C = 0x5CDD
+0x3B3D = 0x5CD7
+0x3B3E = 0x5CEE
+0x3B3F = 0x5CF1
+0x3B40 = 0x5CF2
+0x3B41 = 0x5CF4
+0x3B42 = 0x5D01
+0x3B43 = 0x5D06
+0x3B44 = 0x5D0D
+0x3B45 = 0x5D12
+0x3B46 = 0x5D2B
+0x3B47 = 0x5D23
+0x3B48 = 0x5D24
+0x3B49 = 0x5D26
+0x3B4A = 0x5D27
+0x3B4B = 0x5D31
+0x3B4C = 0x5D34
+0x3B4D = 0x5D39
+0x3B4E = 0x5D3D
+0x3B4F = 0x5D3F
+0x3B50 = 0x5D42
+0x3B51 = 0x5D43
+0x3B52 = 0x5D46
+0x3B53 = 0x5D48
+0x3B54 = 0x5D55
+0x3B55 = 0x5D51
+0x3B56 = 0x5D59
+0x3B57 = 0x5D4A
+0x3B58 = 0x5D5F
+0x3B59 = 0x5D60
+0x3B5A = 0x5D61
+0x3B5B = 0x5D62
+0x3B5C = 0x5D64
+0x3B5D = 0x5D6A
+0x3B5E = 0x5D6D
+0x3B5F = 0x5D70
+0x3B60 = 0x5D79
+0x3B61 = 0x5D7A
+0x3B62 = 0x5D7E
+0x3B63 = 0x5D7F
+0x3B64 = 0x5D81
+0x3B65 = 0x5D83
+0x3B66 = 0x5D88
+0x3B67 = 0x5D8A
+0x3B68 = 0x5D92
+0x3B69 = 0x5D93
+0x3B6A = 0x5D94
+0x3B6B = 0x5D95
+0x3B6C = 0x5D99
+0x3B6D = 0x5D9B
+0x3B6E = 0x5D9F
+0x3B6F = 0x5DA0
+0x3B70 = 0x5DA7
+0x3B71 = 0x5DAB
+0x3B72 = 0x5DB0
+0x3B73 = 0x5DB4
+0x3B74 = 0x5DB8
+0x3B75 = 0x5DB9
+0x3B76 = 0x5DC3
+0x3B77 = 0x5DC7
+0x3B78 = 0x5DCB
+0x3B79 = 0x5DD0
+0x3B7A = 0x5DCE
+0x3B7B = 0x5DD8
+0x3B7C = 0x5DD9
+0x3B7D = 0x5DE0
+0x3B7E = 0x5DE4
+0x3C21 = 0x5DE9
+0x3C22 = 0x5DF8
+0x3C23 = 0x5DF9
+0x3C24 = 0x5E00
+0x3C25 = 0x5E07
+0x3C26 = 0x5E0D
+0x3C27 = 0x5E12
+0x3C28 = 0x5E14
+0x3C29 = 0x5E15
+0x3C2A = 0x5E18
+0x3C2B = 0x5E1F
+0x3C2C = 0x5E20
+0x3C2D = 0x5E2E
+0x3C2E = 0x5E28
+0x3C2F = 0x5E32
+0x3C30 = 0x5E35
+0x3C31 = 0x5E3E
+0x3C32 = 0x5E4B
+0x3C33 = 0x5E50
+0x3C34 = 0x5E49
+0x3C35 = 0x5E51
+0x3C36 = 0x5E56
+0x3C37 = 0x5E58
+0x3C38 = 0x5E5B
+0x3C39 = 0x5E5C
+0x3C3A = 0x5E5E
+0x3C3B = 0x5E68
+0x3C3C = 0x5E6A
+0x3C3D = 0x5E6B
+0x3C3E = 0x5E6C
+0x3C3F = 0x5E6D
+0x3C40 = 0x5E6E
+0x3C41 = 0x5E70
+0x3C42 = 0x5E80
+0x3C43 = 0x5E8B
+0x3C44 = 0x5E8E
+0x3C45 = 0x5EA2
+0x3C46 = 0x5EA4
+0x3C47 = 0x5EA5
+0x3C48 = 0x5EA8
+0x3C49 = 0x5EAA
+0x3C4A = 0x5EAC
+0x3C4B = 0x5EB1
+0x3C4C = 0x5EB3
+0x3C4D = 0x5EBD
+0x3C4E = 0x5EBE
+0x3C4F = 0x5EBF
+0x3C50 = 0x5EC6
+0x3C51 = 0x5ECC
+0x3C52 = 0x5ECB
+0x3C53 = 0x5ECE
+0x3C54 = 0x5ED1
+0x3C55 = 0x5ED2
+0x3C56 = 0x5ED4
+0x3C57 = 0x5ED5
+0x3C58 = 0x5EDC
+0x3C59 = 0x5EDE
+0x3C5A = 0x5EE5
+0x3C5B = 0x5EEB
+0x3C5C = 0x5F02
+0x3C5D = 0x5F06
+0x3C5E = 0x5F07
+0x3C5F = 0x5F08
+0x3C60 = 0x5F0E
+0x3C61 = 0x5F19
+0x3C62 = 0x5F1C
+0x3C63 = 0x5F1D
+0x3C64 = 0x5F21
+0x3C65 = 0x5F22
+0x3C66 = 0x5F23
+0x3C67 = 0x5F24
+0x3C68 = 0x5F28
+0x3C69 = 0x5F2B
+0x3C6A = 0x5F2C
+0x3C6B = 0x5F2E
+0x3C6C = 0x5F30
+0x3C6D = 0x5F34
+0x3C6E = 0x5F36
+0x3C6F = 0x5F3B
+0x3C70 = 0x5F3D
+0x3C71 = 0x5F3F
+0x3C72 = 0x5F40
+0x3C73 = 0x5F44
+0x3C74 = 0x5F45
+0x3C75 = 0x5F47
+0x3C76 = 0x5F4D
+0x3C77 = 0x5F50
+0x3C78 = 0x5F54
+0x3C79 = 0x5F58
+0x3C7A = 0x5F5B
+0x3C7B = 0x5F60
+0x3C7C = 0x5F63
+0x3C7D = 0x5F64
+0x3C7E = 0x5F67
+0x3D21 = 0x5F6F
+0x3D22 = 0x5F72
+0x3D23 = 0x5F74
+0x3D24 = 0x5F75
+0x3D25 = 0x5F78
+0x3D26 = 0x5F7A
+0x3D27 = 0x5F7D
+0x3D28 = 0x5F7E
+0x3D29 = 0x5F89
+0x3D2A = 0x5F8D
+0x3D2B = 0x5F8F
+0x3D2C = 0x5F96
+0x3D2D = 0x5F9C
+0x3D2E = 0x5F9D
+0x3D2F = 0x5FA2
+0x3D30 = 0x5FA7
+0x3D31 = 0x5FAB
+0x3D32 = 0x5FA4
+0x3D33 = 0x5FAC
+0x3D34 = 0x5FAF
+0x3D35 = 0x5FB0
+0x3D36 = 0x5FB1
+0x3D37 = 0x5FB8
+0x3D38 = 0x5FC4
+0x3D39 = 0x5FC7
+0x3D3A = 0x5FC8
+0x3D3B = 0x5FC9
+0x3D3C = 0x5FCB
+0x3D3D = 0x5FD0
+0x3D3E = 0x5FD1
+0x3D3F = 0x5FD2
+0x3D40 = 0x5FD3
+0x3D41 = 0x5FD4
+0x3D42 = 0x5FDE
+0x3D43 = 0x5FE1
+0x3D44 = 0x5FE2
+0x3D45 = 0x5FE8
+0x3D46 = 0x5FE9
+0x3D47 = 0x5FEA
+0x3D48 = 0x5FEC
+0x3D49 = 0x5FED
+0x3D4A = 0x5FEE
+0x3D4B = 0x5FEF
+0x3D4C = 0x5FF2
+0x3D4D = 0x5FF3
+0x3D4E = 0x5FF6
+0x3D4F = 0x5FFA
+0x3D50 = 0x5FFC
+0x3D51 = 0x6007
+0x3D52 = 0x600A
+0x3D53 = 0x600D
+0x3D54 = 0x6013
+0x3D55 = 0x6014
+0x3D56 = 0x6017
+0x3D57 = 0x6018
+0x3D58 = 0x601A
+0x3D59 = 0x601F
+0x3D5A = 0x6024
+0x3D5B = 0x602D
+0x3D5C = 0x6033
+0x3D5D = 0x6035
+0x3D5E = 0x6040
+0x3D5F = 0x6047
+0x3D60 = 0x6048
+0x3D61 = 0x6049
+0x3D62 = 0x604C
+0x3D63 = 0x6051
+0x3D64 = 0x6054
+0x3D65 = 0x6056
+0x3D66 = 0x6057
+0x3D67 = 0x605D
+0x3D68 = 0x6061
+0x3D69 = 0x6067
+0x3D6A = 0x6071
+0x3D6B = 0x607E
+0x3D6C = 0x607F
+0x3D6D = 0x6082
+0x3D6E = 0x6086
+0x3D6F = 0x6088
+0x3D70 = 0x608A
+0x3D71 = 0x608E
+0x3D72 = 0x6091
+0x3D73 = 0x6093
+0x3D74 = 0x6095
+0x3D75 = 0x6098
+0x3D76 = 0x609D
+0x3D77 = 0x609E
+0x3D78 = 0x60A2
+0x3D79 = 0x60A4
+0x3D7A = 0x60A5
+0x3D7B = 0x60A8
+0x3D7C = 0x60B0
+0x3D7D = 0x60B1
+0x3D7E = 0x60B7
+0x3E21 = 0x60BB
+0x3E22 = 0x60BE
+0x3E23 = 0x60C2
+0x3E24 = 0x60C4
+0x3E25 = 0x60C8
+0x3E26 = 0x60C9
+0x3E27 = 0x60CA
+0x3E28 = 0x60CB
+0x3E29 = 0x60CE
+0x3E2A = 0x60CF
+0x3E2B = 0x60D4
+0x3E2C = 0x60D5
+0x3E2D = 0x60D9
+0x3E2E = 0x60DB
+0x3E2F = 0x60DD
+0x3E30 = 0x60DE
+0x3E31 = 0x60E2
+0x3E32 = 0x60E5
+0x3E33 = 0x60F2
+0x3E34 = 0x60F5
+0x3E35 = 0x60F8
+0x3E36 = 0x60FC
+0x3E37 = 0x60FD
+0x3E38 = 0x6102
+0x3E39 = 0x6107
+0x3E3A = 0x610A
+0x3E3B = 0x610C
+0x3E3C = 0x6110
+0x3E3D = 0x6111
+0x3E3E = 0x6112
+0x3E3F = 0x6113
+0x3E40 = 0x6114
+0x3E41 = 0x6116
+0x3E42 = 0x6117
+0x3E43 = 0x6119
+0x3E44 = 0x611C
+0x3E45 = 0x611E
+0x3E46 = 0x6122
+0x3E47 = 0x612A
+0x3E48 = 0x612B
+0x3E49 = 0x6130
+0x3E4A = 0x6131
+0x3E4B = 0x6135
+0x3E4C = 0x6136
+0x3E4D = 0x6137
+0x3E4E = 0x6139
+0x3E4F = 0x6141
+0x3E50 = 0x6145
+0x3E51 = 0x6146
+0x3E52 = 0x6149
+0x3E53 = 0x615E
+0x3E54 = 0x6160
+0x3E55 = 0x616C
+0x3E56 = 0x6172
+0x3E57 = 0x6178
+0x3E58 = 0x617B
+0x3E59 = 0x617C
+0x3E5A = 0x617F
+0x3E5B = 0x6180
+0x3E5C = 0x6181
+0x3E5D = 0x6183
+0x3E5E = 0x6184
+0x3E5F = 0x618B
+0x3E60 = 0x618D
+0x3E61 = 0x6192
+0x3E62 = 0x6193
+0x3E63 = 0x6197
+0x3E64 = 0x6198
+0x3E65 = 0x619C
+0x3E66 = 0x619D
+0x3E67 = 0x619F
+0x3E68 = 0x61A0
+0x3E69 = 0x61A5
+0x3E6A = 0x61A8
+0x3E6B = 0x61AA
+0x3E6C = 0x61AD
+0x3E6D = 0x61B8
+0x3E6E = 0x61B9
+0x3E6F = 0x61BC
+0x3E70 = 0x61C0
+0x3E71 = 0x61C1
+0x3E72 = 0x61C2
+0x3E73 = 0x61CE
+0x3E74 = 0x61CF
+0x3E75 = 0x61D5
+0x3E76 = 0x61DC
+0x3E77 = 0x61DD
+0x3E78 = 0x61DE
+0x3E79 = 0x61DF
+0x3E7A = 0x61E1
+0x3E7B = 0x61E2
+0x3E7C = 0x61E7
+0x3E7D = 0x61E9
+0x3E7E = 0x61E5
+0x3F21 = 0x61EC
+0x3F22 = 0x61ED
+0x3F23 = 0x61EF
+0x3F24 = 0x6201
+0x3F25 = 0x6203
+0x3F26 = 0x6204
+0x3F27 = 0x6207
+0x3F28 = 0x6213
+0x3F29 = 0x6215
+0x3F2A = 0x621C
+0x3F2B = 0x6220
+0x3F2C = 0x6222
+0x3F2D = 0x6223
+0x3F2E = 0x6227
+0x3F2F = 0x6229
+0x3F30 = 0x622B
+0x3F31 = 0x6239
+0x3F32 = 0x623D
+0x3F33 = 0x6242
+0x3F34 = 0x6243
+0x3F35 = 0x6244
+0x3F36 = 0x6246
+0x3F37 = 0x624C
+0x3F38 = 0x6250
+0x3F39 = 0x6251
+0x3F3A = 0x6252
+0x3F3B = 0x6254
+0x3F3C = 0x6256
+0x3F3D = 0x625A
+0x3F3E = 0x625C
+0x3F3F = 0x6264
+0x3F40 = 0x626D
+0x3F41 = 0x626F
+0x3F42 = 0x6273
+0x3F43 = 0x627A
+0x3F44 = 0x627D
+0x3F45 = 0x628D
+0x3F46 = 0x628E
+0x3F47 = 0x628F
+0x3F48 = 0x6290
+0x3F49 = 0x62A6
+0x3F4A = 0x62A8
+0x3F4B = 0x62B3
+0x3F4C = 0x62B6
+0x3F4D = 0x62B7
+0x3F4E = 0x62BA
+0x3F4F = 0x62BE
+0x3F50 = 0x62BF
+0x3F51 = 0x62C4
+0x3F52 = 0x62CE
+0x3F53 = 0x62D5
+0x3F54 = 0x62D6
+0x3F55 = 0x62DA
+0x3F56 = 0x62EA
+0x3F57 = 0x62F2
+0x3F58 = 0x62F4
+0x3F59 = 0x62FC
+0x3F5A = 0x62FD
+0x3F5B = 0x6303
+0x3F5C = 0x6304
+0x3F5D = 0x630A
+0x3F5E = 0x630B
+0x3F5F = 0x630D
+0x3F60 = 0x6310
+0x3F61 = 0x6313
+0x3F62 = 0x6316
+0x3F63 = 0x6318
+0x3F64 = 0x6329
+0x3F65 = 0x632A
+0x3F66 = 0x632D
+0x3F67 = 0x6335
+0x3F68 = 0x6336
+0x3F69 = 0x6339
+0x3F6A = 0x633C
+0x3F6B = 0x6341
+0x3F6C = 0x6342
+0x3F6D = 0x6343
+0x3F6E = 0x6344
+0x3F6F = 0x6346
+0x3F70 = 0x634A
+0x3F71 = 0x634B
+0x3F72 = 0x634E
+0x3F73 = 0x6352
+0x3F74 = 0x6353
+0x3F75 = 0x6354
+0x3F76 = 0x6358
+0x3F77 = 0x635B
+0x3F78 = 0x6365
+0x3F79 = 0x6366
+0x3F7A = 0x636C
+0x3F7B = 0x636D
+0x3F7C = 0x6371
+0x3F7D = 0x6374
+0x3F7E = 0x6375
+0x4021 = 0x6378
+0x4022 = 0x637C
+0x4023 = 0x637D
+0x4024 = 0x637F
+0x4025 = 0x6382
+0x4026 = 0x6384
+0x4027 = 0x6387
+0x4028 = 0x638A
+0x4029 = 0x6390
+0x402A = 0x6394
+0x402B = 0x6395
+0x402C = 0x6399
+0x402D = 0x639A
+0x402E = 0x639E
+0x402F = 0x63A4
+0x4030 = 0x63A6
+0x4031 = 0x63AD
+0x4032 = 0x63AE
+0x4033 = 0x63AF
+0x4034 = 0x63BD
+0x4035 = 0x63C1
+0x4036 = 0x63C5
+0x4037 = 0x63C8
+0x4038 = 0x63CE
+0x4039 = 0x63D1
+0x403A = 0x63D3
+0x403B = 0x63D4
+0x403C = 0x63D5
+0x403D = 0x63DC
+0x403E = 0x63E0
+0x403F = 0x63E5
+0x4040 = 0x63EA
+0x4041 = 0x63EC
+0x4042 = 0x63F2
+0x4043 = 0x63F3
+0x4044 = 0x63F5
+0x4045 = 0x63F8
+0x4046 = 0x63F9
+0x4047 = 0x6409
+0x4048 = 0x640A
+0x4049 = 0x6410
+0x404A = 0x6412
+0x404B = 0x6414
+0x404C = 0x6418
+0x404D = 0x641E
+0x404E = 0x6420
+0x404F = 0x6422
+0x4050 = 0x6424
+0x4051 = 0x6425
+0x4052 = 0x6429
+0x4053 = 0x642A
+0x4054 = 0x642F
+0x4055 = 0x6430
+0x4056 = 0x6435
+0x4057 = 0x643D
+0x4058 = 0x643F
+0x4059 = 0x644B
+0x405A = 0x644F
+0x405B = 0x6451
+0x405C = 0x6452
+0x405D = 0x6453
+0x405E = 0x6454
+0x405F = 0x645A
+0x4060 = 0x645B
+0x4061 = 0x645C
+0x4062 = 0x645D
+0x4063 = 0x645F
+0x4064 = 0x6460
+0x4065 = 0x6461
+0x4066 = 0x6463
+0x4067 = 0x646D
+0x4068 = 0x6473
+0x4069 = 0x6474
+0x406A = 0x647B
+0x406B = 0x647D
+0x406C = 0x6485
+0x406D = 0x6487
+0x406E = 0x648F
+0x406F = 0x6490
+0x4070 = 0x6491
+0x4071 = 0x6498
+0x4072 = 0x6499
+0x4073 = 0x649B
+0x4074 = 0x649D
+0x4075 = 0x649F
+0x4076 = 0x64A1
+0x4077 = 0x64A3
+0x4078 = 0x64A6
+0x4079 = 0x64A8
+0x407A = 0x64AC
+0x407B = 0x64B3
+0x407C = 0x64BD
+0x407D = 0x64BE
+0x407E = 0x64BF
+0x4121 = 0x64C4
+0x4122 = 0x64C9
+0x4123 = 0x64CA
+0x4124 = 0x64CB
+0x4125 = 0x64CC
+0x4126 = 0x64CE
+0x4127 = 0x64D0
+0x4128 = 0x64D1
+0x4129 = 0x64D5
+0x412A = 0x64D7
+0x412B = 0x64E4
+0x412C = 0x64E5
+0x412D = 0x64E9
+0x412E = 0x64EA
+0x412F = 0x64ED
+0x4130 = 0x64F0
+0x4131 = 0x64F5
+0x4132 = 0x64F7
+0x4133 = 0x64FB
+0x4134 = 0x64FF
+0x4135 = 0x6501
+0x4136 = 0x6504
+0x4137 = 0x6508
+0x4138 = 0x6509
+0x4139 = 0x650A
+0x413A = 0x650F
+0x413B = 0x6513
+0x413C = 0x6514
+0x413D = 0x6516
+0x413E = 0x6519
+0x413F = 0x651B
+0x4140 = 0x651E
+0x4141 = 0x651F
+0x4142 = 0x6522
+0x4143 = 0x6526
+0x4144 = 0x6529
+0x4145 = 0x652E
+0x4146 = 0x6531
+0x4147 = 0x653A
+0x4148 = 0x653C
+0x4149 = 0x653D
+0x414A = 0x6543
+0x414B = 0x6547
+0x414C = 0x6549
+0x414D = 0x6550
+0x414E = 0x6552
+0x414F = 0x6554
+0x4150 = 0x655F
+0x4151 = 0x6560
+0x4152 = 0x6567
+0x4153 = 0x656B
+0x4154 = 0x657A
+0x4155 = 0x657D
+0x4156 = 0x6581
+0x4157 = 0x6585
+0x4158 = 0x658A
+0x4159 = 0x6592
+0x415A = 0x6595
+0x415B = 0x6598
+0x415C = 0x659D
+0x415D = 0x65A0
+0x415E = 0x65A3
+0x415F = 0x65A6
+0x4160 = 0x65AE
+0x4161 = 0x65B2
+0x4162 = 0x65B3
+0x4163 = 0x65B4
+0x4164 = 0x65BF
+0x4165 = 0x65C2
+0x4166 = 0x65C8
+0x4167 = 0x65C9
+0x4168 = 0x65CE
+0x4169 = 0x65D0
+0x416A = 0x65D4
+0x416B = 0x65D6
+0x416C = 0x65D8
+0x416D = 0x65DF
+0x416E = 0x65F0
+0x416F = 0x65F2
+0x4170 = 0x65F4
+0x4171 = 0x65F5
+0x4172 = 0x65F9
+0x4173 = 0x65FE
+0x4174 = 0x65FF
+0x4175 = 0x6600
+0x4176 = 0x6604
+0x4177 = 0x6608
+0x4178 = 0x6609
+0x4179 = 0x660D
+0x417A = 0x6611
+0x417B = 0x6612
+0x417C = 0x6615
+0x417D = 0x6616
+0x417E = 0x661D
+0x4221 = 0x661E
+0x4222 = 0x6621
+0x4223 = 0x6622
+0x4224 = 0x6623
+0x4225 = 0x6624
+0x4226 = 0x6626
+0x4227 = 0x6629
+0x4228 = 0x662A
+0x4229 = 0x662B
+0x422A = 0x662C
+0x422B = 0x662E
+0x422C = 0x6630
+0x422D = 0x6631
+0x422E = 0x6633
+0x422F = 0x6639
+0x4230 = 0x6637
+0x4231 = 0x6640
+0x4232 = 0x6645
+0x4233 = 0x6646
+0x4234 = 0x664A
+0x4235 = 0x664C
+0x4236 = 0x6651
+0x4237 = 0x664E
+0x4238 = 0x6657
+0x4239 = 0x6658
+0x423A = 0x6659
+0x423B = 0x665B
+0x423C = 0x665C
+0x423D = 0x6660
+0x423E = 0x6661
+0x423F = 0x66FB
+0x4240 = 0x666A
+0x4241 = 0x666B
+0x4242 = 0x666C
+0x4243 = 0x667E
+0x4244 = 0x6673
+0x4245 = 0x6675
+0x4246 = 0x667F
+0x4247 = 0x6677
+0x4248 = 0x6678
+0x4249 = 0x6679
+0x424A = 0x667B
+0x424B = 0x6680
+0x424C = 0x667C
+0x424D = 0x668B
+0x424E = 0x668C
+0x424F = 0x668D
+0x4250 = 0x6690
+0x4251 = 0x6692
+0x4252 = 0x6699
+0x4253 = 0x669A
+0x4254 = 0x669B
+0x4255 = 0x669C
+0x4256 = 0x669F
+0x4257 = 0x66A0
+0x4258 = 0x66A4
+0x4259 = 0x66AD
+0x425A = 0x66B1
+0x425B = 0x66B2
+0x425C = 0x66B5
+0x425D = 0x66BB
+0x425E = 0x66BF
+0x425F = 0x66C0
+0x4260 = 0x66C2
+0x4261 = 0x66C3
+0x4262 = 0x66C8
+0x4263 = 0x66CC
+0x4264 = 0x66CE
+0x4265 = 0x66CF
+0x4266 = 0x66D4
+0x4267 = 0x66DB
+0x4268 = 0x66DF
+0x4269 = 0x66E8
+0x426A = 0x66EB
+0x426B = 0x66EC
+0x426C = 0x66EE
+0x426D = 0x66FA
+0x426E = 0x6705
+0x426F = 0x6707
+0x4270 = 0x670E
+0x4271 = 0x6713
+0x4272 = 0x6719
+0x4273 = 0x671C
+0x4274 = 0x6720
+0x4275 = 0x6722
+0x4276 = 0x6733
+0x4277 = 0x673E
+0x4278 = 0x6745
+0x4279 = 0x6747
+0x427A = 0x6748
+0x427B = 0x674C
+0x427C = 0x6754
+0x427D = 0x6755
+0x427E = 0x675D
+0x4321 = 0x6766
+0x4322 = 0x676C
+0x4323 = 0x676E
+0x4324 = 0x6774
+0x4325 = 0x6776
+0x4326 = 0x677B
+0x4327 = 0x6781
+0x4328 = 0x6784
+0x4329 = 0x678E
+0x432A = 0x678F
+0x432B = 0x6791
+0x432C = 0x6793
+0x432D = 0x6796
+0x432E = 0x6798
+0x432F = 0x6799
+0x4330 = 0x679B
+0x4331 = 0x67B0
+0x4332 = 0x67B1
+0x4333 = 0x67B2
+0x4334 = 0x67B5
+0x4335 = 0x67BB
+0x4336 = 0x67BC
+0x4337 = 0x67BD
+0x4338 = 0x67F9
+0x4339 = 0x67C0
+0x433A = 0x67C2
+0x433B = 0x67C3
+0x433C = 0x67C5
+0x433D = 0x67C8
+0x433E = 0x67C9
+0x433F = 0x67D2
+0x4340 = 0x67D7
+0x4341 = 0x67D9
+0x4342 = 0x67DC
+0x4343 = 0x67E1
+0x4344 = 0x67E6
+0x4345 = 0x67F0
+0x4346 = 0x67F2
+0x4347 = 0x67F6
+0x4348 = 0x67F7
+0x4349 = 0x6852
+0x434A = 0x6814
+0x434B = 0x6819
+0x434C = 0x681D
+0x434D = 0x681F
+0x434E = 0x6828
+0x434F = 0x6827
+0x4350 = 0x682C
+0x4351 = 0x682D
+0x4352 = 0x682F
+0x4353 = 0x6830
+0x4354 = 0x6831
+0x4355 = 0x6833
+0x4356 = 0x683B
+0x4357 = 0x683F
+0x4358 = 0x6844
+0x4359 = 0x6845
+0x435A = 0x684A
+0x435B = 0x684C
+0x435C = 0x6855
+0x435D = 0x6857
+0x435E = 0x6858
+0x435F = 0x685B
+0x4360 = 0x686B
+0x4361 = 0x686E
+0x4362 = 0x686F
+0x4363 = 0x6870
+0x4364 = 0x6871
+0x4365 = 0x6872
+0x4366 = 0x6875
+0x4367 = 0x6879
+0x4368 = 0x687A
+0x4369 = 0x687B
+0x436A = 0x687C
+0x436B = 0x6882
+0x436C = 0x6884
+0x436D = 0x6886
+0x436E = 0x6888
+0x436F = 0x6896
+0x4370 = 0x6898
+0x4371 = 0x689A
+0x4372 = 0x689C
+0x4373 = 0x68A1
+0x4374 = 0x68A3
+0x4375 = 0x68A5
+0x4376 = 0x68A9
+0x4377 = 0x68AA
+0x4378 = 0x68AE
+0x4379 = 0x68B2
+0x437A = 0x68BB
+0x437B = 0x68C5
+0x437C = 0x68C8
+0x437D = 0x68CC
+0x437E = 0x68CF
+0x4421 = 0x68D0
+0x4422 = 0x68D1
+0x4423 = 0x68D3
+0x4424 = 0x68D6
+0x4425 = 0x68D9
+0x4426 = 0x68DC
+0x4427 = 0x68DD
+0x4428 = 0x68E5
+0x4429 = 0x68E8
+0x442A = 0x68EA
+0x442B = 0x68EB
+0x442C = 0x68EC
+0x442D = 0x68ED
+0x442E = 0x68F0
+0x442F = 0x68F1
+0x4430 = 0x68F5
+0x4431 = 0x68F6
+0x4432 = 0x68FB
+0x4433 = 0x68FC
+0x4434 = 0x68FD
+0x4435 = 0x6906
+0x4436 = 0x6909
+0x4437 = 0x690A
+0x4438 = 0x6910
+0x4439 = 0x6911
+0x443A = 0x6913
+0x443B = 0x6916
+0x443C = 0x6917
+0x443D = 0x6931
+0x443E = 0x6933
+0x443F = 0x6935
+0x4440 = 0x6938
+0x4441 = 0x693B
+0x4442 = 0x6942
+0x4443 = 0x6945
+0x4444 = 0x6949
+0x4445 = 0x694E
+0x4446 = 0x6957
+0x4447 = 0x695B
+0x4448 = 0x6963
+0x4449 = 0x6964
+0x444A = 0x6965
+0x444B = 0x6966
+0x444C = 0x6968
+0x444D = 0x6969
+0x444E = 0x696C
+0x444F = 0x6970
+0x4450 = 0x6971
+0x4451 = 0x6972
+0x4452 = 0x697A
+0x4453 = 0x697B
+0x4454 = 0x697F
+0x4455 = 0x6980
+0x4456 = 0x698D
+0x4457 = 0x6992
+0x4458 = 0x6996
+0x4459 = 0x6998
+0x445A = 0x69A1
+0x445B = 0x69A5
+0x445C = 0x69A6
+0x445D = 0x69A8
+0x445E = 0x69AB
+0x445F = 0x69AD
+0x4460 = 0x69AF
+0x4461 = 0x69B7
+0x4462 = 0x69B8
+0x4463 = 0x69BA
+0x4464 = 0x69BC
+0x4465 = 0x69C5
+0x4466 = 0x69C8
+0x4467 = 0x69D1
+0x4468 = 0x69D6
+0x4469 = 0x69D7
+0x446A = 0x69E2
+0x446B = 0x69E5
+0x446C = 0x69EE
+0x446D = 0x69EF
+0x446E = 0x69F1
+0x446F = 0x69F3
+0x4470 = 0x69F5
+0x4471 = 0x69FE
+0x4472 = 0x6A00
+0x4473 = 0x6A01
+0x4474 = 0x6A03
+0x4475 = 0x6A0F
+0x4476 = 0x6A11
+0x4477 = 0x6A15
+0x4478 = 0x6A1A
+0x4479 = 0x6A1D
+0x447A = 0x6A20
+0x447B = 0x6A24
+0x447C = 0x6A28
+0x447D = 0x6A30
+0x447E = 0x6A32
+0x4521 = 0x6A34
+0x4522 = 0x6A37
+0x4523 = 0x6A3B
+0x4524 = 0x6A3E
+0x4525 = 0x6A3F
+0x4526 = 0x6A45
+0x4527 = 0x6A46
+0x4528 = 0x6A49
+0x4529 = 0x6A4A
+0x452A = 0x6A4E
+0x452B = 0x6A50
+0x452C = 0x6A51
+0x452D = 0x6A52
+0x452E = 0x6A55
+0x452F = 0x6A56
+0x4530 = 0x6A5B
+0x4531 = 0x6A64
+0x4532 = 0x6A67
+0x4533 = 0x6A6A
+0x4534 = 0x6A71
+0x4535 = 0x6A73
+0x4536 = 0x6A7E
+0x4537 = 0x6A81
+0x4538 = 0x6A83
+0x4539 = 0x6A86
+0x453A = 0x6A87
+0x453B = 0x6A89
+0x453C = 0x6A8B
+0x453D = 0x6A91
+0x453E = 0x6A9B
+0x453F = 0x6A9D
+0x4540 = 0x6A9E
+0x4541 = 0x6A9F
+0x4542 = 0x6AA5
+0x4543 = 0x6AAB
+0x4544 = 0x6AAF
+0x4545 = 0x6AB0
+0x4546 = 0x6AB1
+0x4547 = 0x6AB4
+0x4548 = 0x6ABD
+0x4549 = 0x6ABE
+0x454A = 0x6ABF
+0x454B = 0x6AC6
+0x454C = 0x6AC9
+0x454D = 0x6AC8
+0x454E = 0x6ACC
+0x454F = 0x6AD0
+0x4550 = 0x6AD4
+0x4551 = 0x6AD5
+0x4552 = 0x6AD6
+0x4553 = 0x6ADC
+0x4554 = 0x6ADD
+0x4555 = 0x6AE4
+0x4556 = 0x6AE7
+0x4557 = 0x6AEC
+0x4558 = 0x6AF0
+0x4559 = 0x6AF1
+0x455A = 0x6AF2
+0x455B = 0x6AFC
+0x455C = 0x6AFD
+0x455D = 0x6B02
+0x455E = 0x6B03
+0x455F = 0x6B06
+0x4560 = 0x6B07
+0x4561 = 0x6B09
+0x4562 = 0x6B0F
+0x4563 = 0x6B10
+0x4564 = 0x6B11
+0x4565 = 0x6B17
+0x4566 = 0x6B1B
+0x4567 = 0x6B1E
+0x4568 = 0x6B24
+0x4569 = 0x6B28
+0x456A = 0x6B2B
+0x456B = 0x6B2C
+0x456C = 0x6B2F
+0x456D = 0x6B35
+0x456E = 0x6B36
+0x456F = 0x6B3B
+0x4570 = 0x6B3F
+0x4571 = 0x6B46
+0x4572 = 0x6B4A
+0x4573 = 0x6B4D
+0x4574 = 0x6B52
+0x4575 = 0x6B56
+0x4576 = 0x6B58
+0x4577 = 0x6B5D
+0x4578 = 0x6B60
+0x4579 = 0x6B67
+0x457A = 0x6B6B
+0x457B = 0x6B6E
+0x457C = 0x6B70
+0x457D = 0x6B75
+0x457E = 0x6B7D
+0x4621 = 0x6B7E
+0x4622 = 0x6B82
+0x4623 = 0x6B85
+0x4624 = 0x6B97
+0x4625 = 0x6B9B
+0x4626 = 0x6B9F
+0x4627 = 0x6BA0
+0x4628 = 0x6BA2
+0x4629 = 0x6BA3
+0x462A = 0x6BA8
+0x462B = 0x6BA9
+0x462C = 0x6BAC
+0x462D = 0x6BAD
+0x462E = 0x6BAE
+0x462F = 0x6BB0
+0x4630 = 0x6BB8
+0x4631 = 0x6BB9
+0x4632 = 0x6BBD
+0x4633 = 0x6BBE
+0x4634 = 0x6BC3
+0x4635 = 0x6BC4
+0x4636 = 0x6BC9
+0x4637 = 0x6BCC
+0x4638 = 0x6BD6
+0x4639 = 0x6BDA
+0x463A = 0x6BE1
+0x463B = 0x6BE3
+0x463C = 0x6BE6
+0x463D = 0x6BE7
+0x463E = 0x6BEE
+0x463F = 0x6BF1
+0x4640 = 0x6BF7
+0x4641 = 0x6BF9
+0x4642 = 0x6BFF
+0x4643 = 0x6C02
+0x4644 = 0x6C04
+0x4645 = 0x6C05
+0x4646 = 0x6C09
+0x4647 = 0x6C0D
+0x4648 = 0x6C0E
+0x4649 = 0x6C10
+0x464A = 0x6C12
+0x464B = 0x6C19
+0x464C = 0x6C1F
+0x464D = 0x6C26
+0x464E = 0x6C27
+0x464F = 0x6C28
+0x4650 = 0x6C2C
+0x4651 = 0x6C2E
+0x4652 = 0x6C33
+0x4653 = 0x6C35
+0x4654 = 0x6C36
+0x4655 = 0x6C3A
+0x4656 = 0x6C3B
+0x4657 = 0x6C3F
+0x4658 = 0x6C4A
+0x4659 = 0x6C4B
+0x465A = 0x6C4D
+0x465B = 0x6C4F
+0x465C = 0x6C52
+0x465D = 0x6C54
+0x465E = 0x6C59
+0x465F = 0x6C5B
+0x4660 = 0x6C5C
+0x4661 = 0x6C6B
+0x4662 = 0x6C6D
+0x4663 = 0x6C6F
+0x4664 = 0x6C74
+0x4665 = 0x6C76
+0x4666 = 0x6C78
+0x4667 = 0x6C79
+0x4668 = 0x6C7B
+0x4669 = 0x6C85
+0x466A = 0x6C86
+0x466B = 0x6C87
+0x466C = 0x6C89
+0x466D = 0x6C94
+0x466E = 0x6C95
+0x466F = 0x6C97
+0x4670 = 0x6C98
+0x4671 = 0x6C9C
+0x4672 = 0x6C9F
+0x4673 = 0x6CB0
+0x4674 = 0x6CB2
+0x4675 = 0x6CB4
+0x4676 = 0x6CC2
+0x4677 = 0x6CC6
+0x4678 = 0x6CCD
+0x4679 = 0x6CCF
+0x467A = 0x6CD0
+0x467B = 0x6CD1
+0x467C = 0x6CD2
+0x467D = 0x6CD4
+0x467E = 0x6CD6
+0x4721 = 0x6CDA
+0x4722 = 0x6CDC
+0x4723 = 0x6CE0
+0x4724 = 0x6CE7
+0x4725 = 0x6CE9
+0x4726 = 0x6CEB
+0x4727 = 0x6CEC
+0x4728 = 0x6CEE
+0x4729 = 0x6CF2
+0x472A = 0x6CF4
+0x472B = 0x6D04
+0x472C = 0x6D07
+0x472D = 0x6D0A
+0x472E = 0x6D0E
+0x472F = 0x6D0F
+0x4730 = 0x6D11
+0x4731 = 0x6D13
+0x4732 = 0x6D1A
+0x4733 = 0x6D26
+0x4734 = 0x6D27
+0x4735 = 0x6D28
+0x4736 = 0x6C67
+0x4737 = 0x6D2E
+0x4738 = 0x6D2F
+0x4739 = 0x6D31
+0x473A = 0x6D39
+0x473B = 0x6D3C
+0x473C = 0x6D3F
+0x473D = 0x6D57
+0x473E = 0x6D5E
+0x473F = 0x6D5F
+0x4740 = 0x6D61
+0x4741 = 0x6D65
+0x4742 = 0x6D67
+0x4743 = 0x6D6F
+0x4744 = 0x6D70
+0x4745 = 0x6D7C
+0x4746 = 0x6D82
+0x4747 = 0x6D87
+0x4748 = 0x6D91
+0x4749 = 0x6D92
+0x474A = 0x6D94
+0x474B = 0x6D96
+0x474C = 0x6D97
+0x474D = 0x6D98
+0x474E = 0x6DAA
+0x474F = 0x6DAC
+0x4750 = 0x6DB4
+0x4751 = 0x6DB7
+0x4752 = 0x6DB9
+0x4753 = 0x6DBD
+0x4754 = 0x6DBF
+0x4755 = 0x6DC4
+0x4756 = 0x6DC8
+0x4757 = 0x6DCA
+0x4758 = 0x6DCE
+0x4759 = 0x6DCF
+0x475A = 0x6DD6
+0x475B = 0x6DDB
+0x475C = 0x6DDD
+0x475D = 0x6DDF
+0x475E = 0x6DE0
+0x475F = 0x6DE2
+0x4760 = 0x6DE5
+0x4761 = 0x6DE9
+0x4762 = 0x6DEF
+0x4763 = 0x6DF0
+0x4764 = 0x6DF4
+0x4765 = 0x6DF6
+0x4766 = 0x6DFC
+0x4767 = 0x6E00
+0x4768 = 0x6E04
+0x4769 = 0x6E1E
+0x476A = 0x6E22
+0x476B = 0x6E27
+0x476C = 0x6E32
+0x476D = 0x6E36
+0x476E = 0x6E39
+0x476F = 0x6E3B
+0x4770 = 0x6E3C
+0x4771 = 0x6E44
+0x4772 = 0x6E45
+0x4773 = 0x6E48
+0x4774 = 0x6E49
+0x4775 = 0x6E4B
+0x4776 = 0x6E4F
+0x4777 = 0x6E51
+0x4778 = 0x6E52
+0x4779 = 0x6E53
+0x477A = 0x6E54
+0x477B = 0x6E57
+0x477C = 0x6E5C
+0x477D = 0x6E5D
+0x477E = 0x6E5E
+0x4821 = 0x6E62
+0x4822 = 0x6E63
+0x4823 = 0x6E68
+0x4824 = 0x6E73
+0x4825 = 0x6E7B
+0x4826 = 0x6E7D
+0x4827 = 0x6E8D
+0x4828 = 0x6E93
+0x4829 = 0x6E99
+0x482A = 0x6EA0
+0x482B = 0x6EA7
+0x482C = 0x6EAD
+0x482D = 0x6EAE
+0x482E = 0x6EB1
+0x482F = 0x6EB3
+0x4830 = 0x6EBB
+0x4831 = 0x6EBF
+0x4832 = 0x6EC0
+0x4833 = 0x6EC1
+0x4834 = 0x6EC3
+0x4835 = 0x6EC7
+0x4836 = 0x6EC8
+0x4837 = 0x6ECA
+0x4838 = 0x6ECD
+0x4839 = 0x6ECE
+0x483A = 0x6ECF
+0x483B = 0x6EEB
+0x483C = 0x6EED
+0x483D = 0x6EEE
+0x483E = 0x6EF9
+0x483F = 0x6EFB
+0x4840 = 0x6EFD
+0x4841 = 0x6F04
+0x4842 = 0x6F08
+0x4843 = 0x6F0A
+0x4844 = 0x6F0C
+0x4845 = 0x6F0D
+0x4846 = 0x6F16
+0x4847 = 0x6F18
+0x4848 = 0x6F1A
+0x4849 = 0x6F1B
+0x484A = 0x6F26
+0x484B = 0x6F29
+0x484C = 0x6F2A
+0x484D = 0x6F2F
+0x484E = 0x6F30
+0x484F = 0x6F33
+0x4850 = 0x6F36
+0x4851 = 0x6F3B
+0x4852 = 0x6F3C
+0x4853 = 0x6F2D
+0x4854 = 0x6F4F
+0x4855 = 0x6F51
+0x4856 = 0x6F52
+0x4857 = 0x6F53
+0x4858 = 0x6F57
+0x4859 = 0x6F59
+0x485A = 0x6F5A
+0x485B = 0x6F5D
+0x485C = 0x6F5E
+0x485D = 0x6F61
+0x485E = 0x6F62
+0x485F = 0x6F68
+0x4860 = 0x6F6C
+0x4861 = 0x6F7D
+0x4862 = 0x6F7E
+0x4863 = 0x6F83
+0x4864 = 0x6F87
+0x4865 = 0x6F88
+0x4866 = 0x6F8B
+0x4867 = 0x6F8C
+0x4868 = 0x6F8D
+0x4869 = 0x6F90
+0x486A = 0x6F92
+0x486B = 0x6F93
+0x486C = 0x6F94
+0x486D = 0x6F96
+0x486E = 0x6F9A
+0x486F = 0x6F9F
+0x4870 = 0x6FA0
+0x4871 = 0x6FA5
+0x4872 = 0x6FA6
+0x4873 = 0x6FA7
+0x4874 = 0x6FA8
+0x4875 = 0x6FAE
+0x4876 = 0x6FAF
+0x4877 = 0x6FB0
+0x4878 = 0x6FB5
+0x4879 = 0x6FB6
+0x487A = 0x6FBC
+0x487B = 0x6FC5
+0x487C = 0x6FC7
+0x487D = 0x6FC8
+0x487E = 0x6FCA
+0x4921 = 0x6FDA
+0x4922 = 0x6FDE
+0x4923 = 0x6FE8
+0x4924 = 0x6FE9
+0x4925 = 0x6FF0
+0x4926 = 0x6FF5
+0x4927 = 0x6FF9
+0x4928 = 0x6FFC
+0x4929 = 0x6FFD
+0x492A = 0x7000
+0x492B = 0x7005
+0x492C = 0x7006
+0x492D = 0x7007
+0x492E = 0x700D
+0x492F = 0x7017
+0x4930 = 0x7020
+0x4931 = 0x7023
+0x4932 = 0x702F
+0x4933 = 0x7034
+0x4934 = 0x7037
+0x4935 = 0x7039
+0x4936 = 0x703C
+0x4937 = 0x7043
+0x4938 = 0x7044
+0x4939 = 0x7048
+0x493A = 0x7049
+0x493B = 0x704A
+0x493C = 0x704B
+0x493D = 0x7054
+0x493E = 0x7055
+0x493F = 0x705D
+0x4940 = 0x705E
+0x4941 = 0x704E
+0x4942 = 0x7064
+0x4943 = 0x7065
+0x4944 = 0x706C
+0x4945 = 0x706E
+0x4946 = 0x7075
+0x4947 = 0x7076
+0x4948 = 0x707E
+0x4949 = 0x7081
+0x494A = 0x7085
+0x494B = 0x7086
+0x494C = 0x7094
+0x494D = 0x7095
+0x494E = 0x7096
+0x494F = 0x7097
+0x4950 = 0x7098
+0x4951 = 0x709B
+0x4952 = 0x70A4
+0x4953 = 0x70AB
+0x4954 = 0x70B0
+0x4955 = 0x70B1
+0x4956 = 0x70B4
+0x4957 = 0x70B7
+0x4958 = 0x70CA
+0x4959 = 0x70D1
+0x495A = 0x70D3
+0x495B = 0x70D4
+0x495C = 0x70D5
+0x495D = 0x70D6
+0x495E = 0x70D8
+0x495F = 0x70DC
+0x4960 = 0x70E4
+0x4961 = 0x70FA
+0x4962 = 0x7103
+0x4963 = 0x7104
+0x4964 = 0x7105
+0x4965 = 0x7106
+0x4966 = 0x7107
+0x4967 = 0x710B
+0x4968 = 0x710C
+0x4969 = 0x710F
+0x496A = 0x711E
+0x496B = 0x7120
+0x496C = 0x712B
+0x496D = 0x712D
+0x496E = 0x712F
+0x496F = 0x7130
+0x4970 = 0x7131
+0x4971 = 0x7138
+0x4972 = 0x7141
+0x4973 = 0x7145
+0x4974 = 0x7146
+0x4975 = 0x7147
+0x4976 = 0x714A
+0x4977 = 0x714B
+0x4978 = 0x7150
+0x4979 = 0x7152
+0x497A = 0x7157
+0x497B = 0x715A
+0x497C = 0x715C
+0x497D = 0x715E
+0x497E = 0x7160
+0x4A21 = 0x7168
+0x4A22 = 0x7179
+0x4A23 = 0x7180
+0x4A24 = 0x7185
+0x4A25 = 0x7187
+0x4A26 = 0x718C
+0x4A27 = 0x7192
+0x4A28 = 0x719A
+0x4A29 = 0x719B
+0x4A2A = 0x71A0
+0x4A2B = 0x71A2
+0x4A2C = 0x71AF
+0x4A2D = 0x71B0
+0x4A2E = 0x71B2
+0x4A2F = 0x71B3
+0x4A30 = 0x71BA
+0x4A31 = 0x71BF
+0x4A32 = 0x71C0
+0x4A33 = 0x71C1
+0x4A34 = 0x71C4
+0x4A35 = 0x71CB
+0x4A36 = 0x71CC
+0x4A37 = 0x71D3
+0x4A38 = 0x71D6
+0x4A39 = 0x71D9
+0x4A3A = 0x71DA
+0x4A3B = 0x71DC
+0x4A3C = 0x71F8
+0x4A3D = 0x71FE
+0x4A3E = 0x7200
+0x4A3F = 0x7207
+0x4A40 = 0x7208
+0x4A41 = 0x7209
+0x4A42 = 0x7213
+0x4A43 = 0x7217
+0x4A44 = 0x721A
+0x4A45 = 0x721D
+0x4A46 = 0x721F
+0x4A47 = 0x7224
+0x4A48 = 0x722B
+0x4A49 = 0x722F
+0x4A4A = 0x7234
+0x4A4B = 0x7238
+0x4A4C = 0x7239
+0x4A4D = 0x7241
+0x4A4E = 0x7242
+0x4A4F = 0x7243
+0x4A50 = 0x7245
+0x4A51 = 0x724E
+0x4A52 = 0x724F
+0x4A53 = 0x7250
+0x4A54 = 0x7253
+0x4A55 = 0x7255
+0x4A56 = 0x7256
+0x4A57 = 0x725A
+0x4A58 = 0x725C
+0x4A59 = 0x725E
+0x4A5A = 0x7260
+0x4A5B = 0x7263
+0x4A5C = 0x7268
+0x4A5D = 0x726B
+0x4A5E = 0x726E
+0x4A5F = 0x726F
+0x4A60 = 0x7271
+0x4A61 = 0x7277
+0x4A62 = 0x7278
+0x4A63 = 0x727B
+0x4A64 = 0x727C
+0x4A65 = 0x727F
+0x4A66 = 0x7284
+0x4A67 = 0x7289
+0x4A68 = 0x728D
+0x4A69 = 0x728E
+0x4A6A = 0x7293
+0x4A6B = 0x729B
+0x4A6C = 0x72A8
+0x4A6D = 0x72AD
+0x4A6E = 0x72AE
+0x4A6F = 0x72B1
+0x4A70 = 0x72B4
+0x4A71 = 0x72BE
+0x4A72 = 0x72C1
+0x4A73 = 0x72C7
+0x4A74 = 0x72C9
+0x4A75 = 0x72CC
+0x4A76 = 0x72D5
+0x4A77 = 0x72D6
+0x4A78 = 0x72D8
+0x4A79 = 0x72DF
+0x4A7A = 0x72E5
+0x4A7B = 0x72F3
+0x4A7C = 0x72F4
+0x4A7D = 0x72FA
+0x4A7E = 0x72FB
+0x4B21 = 0x72FE
+0x4B22 = 0x7302
+0x4B23 = 0x7304
+0x4B24 = 0x7305
+0x4B25 = 0x7307
+0x4B26 = 0x730B
+0x4B27 = 0x730D
+0x4B28 = 0x7312
+0x4B29 = 0x7313
+0x4B2A = 0x7318
+0x4B2B = 0x7319
+0x4B2C = 0x731E
+0x4B2D = 0x7322
+0x4B2E = 0x7324
+0x4B2F = 0x7327
+0x4B30 = 0x7328
+0x4B31 = 0x732C
+0x4B32 = 0x7331
+0x4B33 = 0x7332
+0x4B34 = 0x7335
+0x4B35 = 0x733A
+0x4B36 = 0x733B
+0x4B37 = 0x733D
+0x4B38 = 0x7343
+0x4B39 = 0x734D
+0x4B3A = 0x7350
+0x4B3B = 0x7352
+0x4B3C = 0x7356
+0x4B3D = 0x7358
+0x4B3E = 0x735D
+0x4B3F = 0x735E
+0x4B40 = 0x735F
+0x4B41 = 0x7360
+0x4B42 = 0x7366
+0x4B43 = 0x7367
+0x4B44 = 0x7369
+0x4B45 = 0x736B
+0x4B46 = 0x736C
+0x4B47 = 0x736E
+0x4B48 = 0x736F
+0x4B49 = 0x7371
+0x4B4A = 0x7377
+0x4B4B = 0x7379
+0x4B4C = 0x737C
+0x4B4D = 0x7380
+0x4B4E = 0x7381
+0x4B4F = 0x7383
+0x4B50 = 0x7385
+0x4B51 = 0x7386
+0x4B52 = 0x738E
+0x4B53 = 0x7390
+0x4B54 = 0x7393
+0x4B55 = 0x7395
+0x4B56 = 0x7397
+0x4B57 = 0x7398
+0x4B58 = 0x739C
+0x4B59 = 0x739E
+0x4B5A = 0x739F
+0x4B5B = 0x73A0
+0x4B5C = 0x73A2
+0x4B5D = 0x73A5
+0x4B5E = 0x73A6
+0x4B5F = 0x73AA
+0x4B60 = 0x73AB
+0x4B61 = 0x73AD
+0x4B62 = 0x73B5
+0x4B63 = 0x73B7
+0x4B64 = 0x73B9
+0x4B65 = 0x73BC
+0x4B66 = 0x73BD
+0x4B67 = 0x73BF
+0x4B68 = 0x73C5
+0x4B69 = 0x73C6
+0x4B6A = 0x73C9
+0x4B6B = 0x73CB
+0x4B6C = 0x73CC
+0x4B6D = 0x73CF
+0x4B6E = 0x73D2
+0x4B6F = 0x73D3
+0x4B70 = 0x73D6
+0x4B71 = 0x73D9
+0x4B72 = 0x73DD
+0x4B73 = 0x73E1
+0x4B74 = 0x73E3
+0x4B75 = 0x73E6
+0x4B76 = 0x73E7
+0x4B77 = 0x73E9
+0x4B78 = 0x73F4
+0x4B79 = 0x73F5
+0x4B7A = 0x73F7
+0x4B7B = 0x73F9
+0x4B7C = 0x73FA
+0x4B7D = 0x73FB
+0x4B7E = 0x73FD
+0x4C21 = 0x73FF
+0x4C22 = 0x7400
+0x4C23 = 0x7401
+0x4C24 = 0x7404
+0x4C25 = 0x7407
+0x4C26 = 0x740A
+0x4C27 = 0x7411
+0x4C28 = 0x741A
+0x4C29 = 0x741B
+0x4C2A = 0x7424
+0x4C2B = 0x7426
+0x4C2C = 0x7428
+0x4C2D = 0x7429
+0x4C2E = 0x742A
+0x4C2F = 0x742B
+0x4C30 = 0x742C
+0x4C31 = 0x742D
+0x4C32 = 0x742E
+0x4C33 = 0x742F
+0x4C34 = 0x7430
+0x4C35 = 0x7431
+0x4C36 = 0x7439
+0x4C37 = 0x7440
+0x4C38 = 0x7443
+0x4C39 = 0x7444
+0x4C3A = 0x7446
+0x4C3B = 0x7447
+0x4C3C = 0x744B
+0x4C3D = 0x744D
+0x4C3E = 0x7451
+0x4C3F = 0x7452
+0x4C40 = 0x7457
+0x4C41 = 0x745D
+0x4C42 = 0x7462
+0x4C43 = 0x7466
+0x4C44 = 0x7467
+0x4C45 = 0x7468
+0x4C46 = 0x746B
+0x4C47 = 0x746D
+0x4C48 = 0x746E
+0x4C49 = 0x7471
+0x4C4A = 0x7472
+0x4C4B = 0x7480
+0x4C4C = 0x7481
+0x4C4D = 0x7485
+0x4C4E = 0x7486
+0x4C4F = 0x7487
+0x4C50 = 0x7489
+0x4C51 = 0x748F
+0x4C52 = 0x7490
+0x4C53 = 0x7491
+0x4C54 = 0x7492
+0x4C55 = 0x7498
+0x4C56 = 0x7499
+0x4C57 = 0x749A
+0x4C58 = 0x749C
+0x4C59 = 0x749F
+0x4C5A = 0x74A0
+0x4C5B = 0x74A1
+0x4C5C = 0x74A3
+0x4C5D = 0x74A6
+0x4C5E = 0x74A8
+0x4C5F = 0x74A9
+0x4C60 = 0x74AA
+0x4C61 = 0x74AB
+0x4C62 = 0x74AE
+0x4C63 = 0x74AF
+0x4C64 = 0x74B1
+0x4C65 = 0x74B2
+0x4C66 = 0x74B5
+0x4C67 = 0x74B9
+0x4C68 = 0x74BB
+0x4C69 = 0x74BF
+0x4C6A = 0x74C8
+0x4C6B = 0x74C9
+0x4C6C = 0x74CC
+0x4C6D = 0x74D0
+0x4C6E = 0x74D3
+0x4C6F = 0x74D8
+0x4C70 = 0x74DA
+0x4C71 = 0x74DB
+0x4C72 = 0x74DE
+0x4C73 = 0x74DF
+0x4C74 = 0x74E4
+0x4C75 = 0x74E8
+0x4C76 = 0x74EA
+0x4C77 = 0x74EB
+0x4C78 = 0x74EF
+0x4C79 = 0x74F4
+0x4C7A = 0x74FA
+0x4C7B = 0x74FB
+0x4C7C = 0x74FC
+0x4C7D = 0x74FF
+0x4C7E = 0x7506
+0x4D21 = 0x7512
+0x4D22 = 0x7516
+0x4D23 = 0x7517
+0x4D24 = 0x7520
+0x4D25 = 0x7521
+0x4D26 = 0x7524
+0x4D27 = 0x7527
+0x4D28 = 0x7529
+0x4D29 = 0x752A
+0x4D2A = 0x752F
+0x4D2B = 0x7536
+0x4D2C = 0x7539
+0x4D2D = 0x753D
+0x4D2E = 0x753E
+0x4D2F = 0x753F
+0x4D30 = 0x7540
+0x4D31 = 0x7543
+0x4D32 = 0x7547
+0x4D33 = 0x7548
+0x4D34 = 0x754E
+0x4D35 = 0x7550
+0x4D36 = 0x7552
+0x4D37 = 0x7557
+0x4D38 = 0x755E
+0x4D39 = 0x755F
+0x4D3A = 0x7561
+0x4D3B = 0x756F
+0x4D3C = 0x7571
+0x4D3D = 0x7579
+0x4D3E = 0x757A
+0x4D3F = 0x757B
+0x4D40 = 0x757C
+0x4D41 = 0x757D
+0x4D42 = 0x757E
+0x4D43 = 0x7581
+0x4D44 = 0x7585
+0x4D45 = 0x7590
+0x4D46 = 0x7592
+0x4D47 = 0x7593
+0x4D48 = 0x7595
+0x4D49 = 0x7599
+0x4D4A = 0x759C
+0x4D4B = 0x75A2
+0x4D4C = 0x75A4
+0x4D4D = 0x75B4
+0x4D4E = 0x75BA
+0x4D4F = 0x75BF
+0x4D50 = 0x75C0
+0x4D51 = 0x75C1
+0x4D52 = 0x75C4
+0x4D53 = 0x75C6
+0x4D54 = 0x75CC
+0x4D55 = 0x75CE
+0x4D56 = 0x75CF
+0x4D57 = 0x75D7
+0x4D58 = 0x75DC
+0x4D59 = 0x75DF
+0x4D5A = 0x75E0
+0x4D5B = 0x75E1
+0x4D5C = 0x75E4
+0x4D5D = 0x75E7
+0x4D5E = 0x75EC
+0x4D5F = 0x75EE
+0x4D60 = 0x75EF
+0x4D61 = 0x75F1
+0x4D62 = 0x75F9
+0x4D63 = 0x7600
+0x4D64 = 0x7602
+0x4D65 = 0x7603
+0x4D66 = 0x7604
+0x4D67 = 0x7607
+0x4D68 = 0x7608
+0x4D69 = 0x760A
+0x4D6A = 0x760C
+0x4D6B = 0x760F
+0x4D6C = 0x7612
+0x4D6D = 0x7613
+0x4D6E = 0x7615
+0x4D6F = 0x7616
+0x4D70 = 0x7619
+0x4D71 = 0x761B
+0x4D72 = 0x761C
+0x4D73 = 0x761D
+0x4D74 = 0x761E
+0x4D75 = 0x7623
+0x4D76 = 0x7625
+0x4D77 = 0x7626
+0x4D78 = 0x7629
+0x4D79 = 0x762D
+0x4D7A = 0x7632
+0x4D7B = 0x7633
+0x4D7C = 0x7635
+0x4D7D = 0x7638
+0x4D7E = 0x7639
+0x4E21 = 0x763A
+0x4E22 = 0x763C
+0x4E23 = 0x764A
+0x4E24 = 0x7640
+0x4E25 = 0x7641
+0x4E26 = 0x7643
+0x4E27 = 0x7644
+0x4E28 = 0x7645
+0x4E29 = 0x7649
+0x4E2A = 0x764B
+0x4E2B = 0x7655
+0x4E2C = 0x7659
+0x4E2D = 0x765F
+0x4E2E = 0x7664
+0x4E2F = 0x7665
+0x4E30 = 0x766D
+0x4E31 = 0x766E
+0x4E32 = 0x766F
+0x4E33 = 0x7671
+0x4E34 = 0x7674
+0x4E35 = 0x7681
+0x4E36 = 0x7685
+0x4E37 = 0x768C
+0x4E38 = 0x768D
+0x4E39 = 0x7695
+0x4E3A = 0x769B
+0x4E3B = 0x769C
+0x4E3C = 0x769D
+0x4E3D = 0x769F
+0x4E3E = 0x76A0
+0x4E3F = 0x76A2
+0x4E40 = 0x76A3
+0x4E41 = 0x76A4
+0x4E42 = 0x76A5
+0x4E43 = 0x76A6
+0x4E44 = 0x76A7
+0x4E45 = 0x76A8
+0x4E46 = 0x76AA
+0x4E47 = 0x76AD
+0x4E48 = 0x76BD
+0x4E49 = 0x76C1
+0x4E4A = 0x76C5
+0x4E4B = 0x76C9
+0x4E4C = 0x76CB
+0x4E4D = 0x76CC
+0x4E4E = 0x76CE
+0x4E4F = 0x76D4
+0x4E50 = 0x76D9
+0x4E51 = 0x76E0
+0x4E52 = 0x76E6
+0x4E53 = 0x76E8
+0x4E54 = 0x76EC
+0x4E55 = 0x76F0
+0x4E56 = 0x76F1
+0x4E57 = 0x76F6
+0x4E58 = 0x76F9
+0x4E59 = 0x76FC
+0x4E5A = 0x7700
+0x4E5B = 0x7706
+0x4E5C = 0x770A
+0x4E5D = 0x770E
+0x4E5E = 0x7712
+0x4E5F = 0x7714
+0x4E60 = 0x7715
+0x4E61 = 0x7717
+0x4E62 = 0x7719
+0x4E63 = 0x771A
+0x4E64 = 0x771C
+0x4E65 = 0x7722
+0x4E66 = 0x7728
+0x4E67 = 0x772D
+0x4E68 = 0x772E
+0x4E69 = 0x772F
+0x4E6A = 0x7734
+0x4E6B = 0x7735
+0x4E6C = 0x7736
+0x4E6D = 0x7739
+0x4E6E = 0x773D
+0x4E6F = 0x773E
+0x4E70 = 0x7742
+0x4E71 = 0x7745
+0x4E72 = 0x7746
+0x4E73 = 0x774A
+0x4E74 = 0x774D
+0x4E75 = 0x774E
+0x4E76 = 0x774F
+0x4E77 = 0x7752
+0x4E78 = 0x7756
+0x4E79 = 0x7757
+0x4E7A = 0x775C
+0x4E7B = 0x775E
+0x4E7C = 0x775F
+0x4E7D = 0x7760
+0x4E7E = 0x7762
+0x4F21 = 0x7764
+0x4F22 = 0x7767
+0x4F23 = 0x776A
+0x4F24 = 0x776C
+0x4F25 = 0x7770
+0x4F26 = 0x7772
+0x4F27 = 0x7773
+0x4F28 = 0x7774
+0x4F29 = 0x777A
+0x4F2A = 0x777D
+0x4F2B = 0x7780
+0x4F2C = 0x7784
+0x4F2D = 0x778C
+0x4F2E = 0x778D
+0x4F2F = 0x7794
+0x4F30 = 0x7795
+0x4F31 = 0x7796
+0x4F32 = 0x779A
+0x4F33 = 0x779F
+0x4F34 = 0x77A2
+0x4F35 = 0x77A7
+0x4F36 = 0x77AA
+0x4F37 = 0x77AE
+0x4F38 = 0x77AF
+0x4F39 = 0x77B1
+0x4F3A = 0x77B5
+0x4F3B = 0x77BE
+0x4F3C = 0x77C3
+0x4F3D = 0x77C9
+0x4F3E = 0x77D1
+0x4F3F = 0x77D2
+0x4F40 = 0x77D5
+0x4F41 = 0x77D9
+0x4F42 = 0x77DE
+0x4F43 = 0x77DF
+0x4F44 = 0x77E0
+0x4F45 = 0x77E4
+0x4F46 = 0x77E6
+0x4F47 = 0x77EA
+0x4F48 = 0x77EC
+0x4F49 = 0x77F0
+0x4F4A = 0x77F1
+0x4F4B = 0x77F4
+0x4F4C = 0x77F8
+0x4F4D = 0x77FB
+0x4F4E = 0x7805
+0x4F4F = 0x7806
+0x4F50 = 0x7809
+0x4F51 = 0x780D
+0x4F52 = 0x780E
+0x4F53 = 0x7811
+0x4F54 = 0x781D
+0x4F55 = 0x7821
+0x4F56 = 0x7822
+0x4F57 = 0x7823
+0x4F58 = 0x782D
+0x4F59 = 0x782E
+0x4F5A = 0x7830
+0x4F5B = 0x7835
+0x4F5C = 0x7837
+0x4F5D = 0x7843
+0x4F5E = 0x7844
+0x4F5F = 0x7847
+0x4F60 = 0x7848
+0x4F61 = 0x784C
+0x4F62 = 0x784E
+0x4F63 = 0x7852
+0x4F64 = 0x785C
+0x4F65 = 0x785E
+0x4F66 = 0x7860
+0x4F67 = 0x7861
+0x4F68 = 0x7863
+0x4F69 = 0x7864
+0x4F6A = 0x7868
+0x4F6B = 0x786A
+0x4F6C = 0x786E
+0x4F6D = 0x787A
+0x4F6E = 0x787E
+0x4F6F = 0x788A
+0x4F70 = 0x788F
+0x4F71 = 0x7894
+0x4F72 = 0x7898
+0x4F73 = 0x78A1
+0x4F74 = 0x789D
+0x4F75 = 0x789E
+0x4F76 = 0x789F
+0x4F77 = 0x78A4
+0x4F78 = 0x78A8
+0x4F79 = 0x78AC
+0x4F7A = 0x78AD
+0x4F7B = 0x78B0
+0x4F7C = 0x78B1
+0x4F7D = 0x78B2
+0x4F7E = 0x78B3
+0x5021 = 0x78BB
+0x5022 = 0x78BD
+0x5023 = 0x78BF
+0x5024 = 0x78C7
+0x5025 = 0x78C8
+0x5026 = 0x78C9
+0x5027 = 0x78CC
+0x5028 = 0x78CE
+0x5029 = 0x78D2
+0x502A = 0x78D3
+0x502B = 0x78D5
+0x502C = 0x78D6
+0x502D = 0x78E4
+0x502E = 0x78DB
+0x502F = 0x78DF
+0x5030 = 0x78E0
+0x5031 = 0x78E1
+0x5032 = 0x78E6
+0x5033 = 0x78EA
+0x5034 = 0x78F2
+0x5035 = 0x78F3
+0x5036 = 0x7900
+0x5037 = 0x78F6
+0x5038 = 0x78F7
+0x5039 = 0x78FA
+0x503A = 0x78FB
+0x503B = 0x78FF
+0x503C = 0x7906
+0x503D = 0x790C
+0x503E = 0x7910
+0x503F = 0x791A
+0x5040 = 0x791C
+0x5041 = 0x791E
+0x5042 = 0x791F
+0x5043 = 0x7920
+0x5044 = 0x7925
+0x5045 = 0x7927
+0x5046 = 0x7929
+0x5047 = 0x792D
+0x5048 = 0x7931
+0x5049 = 0x7934
+0x504A = 0x7935
+0x504B = 0x793B
+0x504C = 0x793D
+0x504D = 0x793F
+0x504E = 0x7944
+0x504F = 0x7945
+0x5050 = 0x7946
+0x5051 = 0x794A
+0x5052 = 0x794B
+0x5053 = 0x794F
+0x5054 = 0x7951
+0x5055 = 0x7954
+0x5056 = 0x7958
+0x5057 = 0x795B
+0x5058 = 0x795C
+0x5059 = 0x7967
+0x505A = 0x7969
+0x505B = 0x796B
+0x505C = 0x7972
+0x505D = 0x7979
+0x505E = 0x797B
+0x505F = 0x797C
+0x5060 = 0x797E
+0x5061 = 0x798B
+0x5062 = 0x798C
+0x5063 = 0x7991
+0x5064 = 0x7993
+0x5065 = 0x7994
+0x5066 = 0x7995
+0x5067 = 0x7996
+0x5068 = 0x7998
+0x5069 = 0x799B
+0x506A = 0x799C
+0x506B = 0x79A1
+0x506C = 0x79A8
+0x506D = 0x79A9
+0x506E = 0x79AB
+0x506F = 0x79AF
+0x5070 = 0x79B1
+0x5071 = 0x79B4
+0x5072 = 0x79B8
+0x5073 = 0x79BB
+0x5074 = 0x79C2
+0x5075 = 0x79C4
+0x5076 = 0x79C7
+0x5077 = 0x79C8
+0x5078 = 0x79CA
+0x5079 = 0x79CF
+0x507A = 0x79D4
+0x507B = 0x79D6
+0x507C = 0x79DA
+0x507D = 0x79DD
+0x507E = 0x79DE
+0x5121 = 0x79E0
+0x5122 = 0x79E2
+0x5123 = 0x79E5
+0x5124 = 0x79EA
+0x5125 = 0x79EB
+0x5126 = 0x79ED
+0x5127 = 0x79F1
+0x5128 = 0x79F8
+0x5129 = 0x79FC
+0x512A = 0x7A02
+0x512B = 0x7A03
+0x512C = 0x7A07
+0x512D = 0x7A09
+0x512E = 0x7A0A
+0x512F = 0x7A0C
+0x5130 = 0x7A11
+0x5131 = 0x7A15
+0x5132 = 0x7A1B
+0x5133 = 0x7A1E
+0x5134 = 0x7A21
+0x5135 = 0x7A27
+0x5136 = 0x7A2B
+0x5137 = 0x7A2D
+0x5138 = 0x7A2F
+0x5139 = 0x7A30
+0x513A = 0x7A34
+0x513B = 0x7A35
+0x513C = 0x7A38
+0x513D = 0x7A39
+0x513E = 0x7A3A
+0x513F = 0x7A44
+0x5140 = 0x7A45
+0x5141 = 0x7A47
+0x5142 = 0x7A48
+0x5143 = 0x7A4C
+0x5144 = 0x7A55
+0x5145 = 0x7A56
+0x5146 = 0x7A59
+0x5147 = 0x7A5C
+0x5148 = 0x7A5D
+0x5149 = 0x7A5F
+0x514A = 0x7A60
+0x514B = 0x7A65
+0x514C = 0x7A67
+0x514D = 0x7A6A
+0x514E = 0x7A6D
+0x514F = 0x7A75
+0x5150 = 0x7A78
+0x5151 = 0x7A7E
+0x5152 = 0x7A80
+0x5153 = 0x7A82
+0x5154 = 0x7A85
+0x5155 = 0x7A86
+0x5156 = 0x7A8A
+0x5157 = 0x7A8B
+0x5158 = 0x7A90
+0x5159 = 0x7A91
+0x515A = 0x7A94
+0x515B = 0x7A9E
+0x515C = 0x7AA0
+0x515D = 0x7AA3
+0x515E = 0x7AAC
+0x515F = 0x7AB3
+0x5160 = 0x7AB5
+0x5161 = 0x7AB9
+0x5162 = 0x7ABB
+0x5163 = 0x7ABC
+0x5164 = 0x7AC6
+0x5165 = 0x7AC9
+0x5166 = 0x7ACC
+0x5167 = 0x7ACE
+0x5168 = 0x7AD1
+0x5169 = 0x7ADB
+0x516A = 0x7AE8
+0x516B = 0x7AE9
+0x516C = 0x7AEB
+0x516D = 0x7AEC
+0x516E = 0x7AF1
+0x516F = 0x7AF4
+0x5170 = 0x7AFB
+0x5171 = 0x7AFD
+0x5172 = 0x7AFE
+0x5173 = 0x7B07
+0x5174 = 0x7B14
+0x5175 = 0x7B1F
+0x5176 = 0x7B23
+0x5177 = 0x7B27
+0x5178 = 0x7B29
+0x5179 = 0x7B2A
+0x517A = 0x7B2B
+0x517B = 0x7B2D
+0x517C = 0x7B2E
+0x517D = 0x7B2F
+0x517E = 0x7B30
+0x5221 = 0x7B31
+0x5222 = 0x7B34
+0x5223 = 0x7B3D
+0x5224 = 0x7B3F
+0x5225 = 0x7B40
+0x5226 = 0x7B41
+0x5227 = 0x7B47
+0x5228 = 0x7B4E
+0x5229 = 0x7B55
+0x522A = 0x7B60
+0x522B = 0x7B64
+0x522C = 0x7B66
+0x522D = 0x7B69
+0x522E = 0x7B6A
+0x522F = 0x7B6D
+0x5230 = 0x7B6F
+0x5231 = 0x7B72
+0x5232 = 0x7B73
+0x5233 = 0x7B77
+0x5234 = 0x7B84
+0x5235 = 0x7B89
+0x5236 = 0x7B8E
+0x5237 = 0x7B90
+0x5238 = 0x7B91
+0x5239 = 0x7B96
+0x523A = 0x7B9B
+0x523B = 0x7B9E
+0x523C = 0x7BA0
+0x523D = 0x7BA5
+0x523E = 0x7BAC
+0x523F = 0x7BAF
+0x5240 = 0x7BB0
+0x5241 = 0x7BB2
+0x5242 = 0x7BB5
+0x5243 = 0x7BB6
+0x5244 = 0x7BBA
+0x5245 = 0x7BBB
+0x5246 = 0x7BBC
+0x5247 = 0x7BBD
+0x5248 = 0x7BC2
+0x5249 = 0x7BC5
+0x524A = 0x7BC8
+0x524B = 0x7BCA
+0x524C = 0x7BD4
+0x524D = 0x7BD6
+0x524E = 0x7BD7
+0x524F = 0x7BD9
+0x5250 = 0x7BDA
+0x5251 = 0x7BDB
+0x5252 = 0x7BE8
+0x5253 = 0x7BEA
+0x5254 = 0x7BF2
+0x5255 = 0x7BF4
+0x5256 = 0x7BF5
+0x5257 = 0x7BF8
+0x5258 = 0x7BF9
+0x5259 = 0x7BFA
+0x525A = 0x7BFC
+0x525B = 0x7BFE
+0x525C = 0x7C01
+0x525D = 0x7C02
+0x525E = 0x7C03
+0x525F = 0x7C04
+0x5260 = 0x7C06
+0x5261 = 0x7C09
+0x5262 = 0x7C0B
+0x5263 = 0x7C0C
+0x5264 = 0x7C0E
+0x5265 = 0x7C0F
+0x5266 = 0x7C19
+0x5267 = 0x7C1B
+0x5268 = 0x7C20
+0x5269 = 0x7C25
+0x526A = 0x7C26
+0x526B = 0x7C28
+0x526C = 0x7C2C
+0x526D = 0x7C31
+0x526E = 0x7C33
+0x526F = 0x7C34
+0x5270 = 0x7C36
+0x5271 = 0x7C39
+0x5272 = 0x7C3A
+0x5273 = 0x7C46
+0x5274 = 0x7C4A
+0x5275 = 0x7C55
+0x5276 = 0x7C51
+0x5277 = 0x7C52
+0x5278 = 0x7C53
+0x5279 = 0x7C59
+0x527A = 0x7C5A
+0x527B = 0x7C5B
+0x527C = 0x7C5C
+0x527D = 0x7C5D
+0x527E = 0x7C5E
+0x5321 = 0x7C61
+0x5322 = 0x7C63
+0x5323 = 0x7C67
+0x5324 = 0x7C69
+0x5325 = 0x7C6D
+0x5326 = 0x7C6E
+0x5327 = 0x7C70
+0x5328 = 0x7C72
+0x5329 = 0x7C79
+0x532A = 0x7C7C
+0x532B = 0x7C7D
+0x532C = 0x7C86
+0x532D = 0x7C87
+0x532E = 0x7C8F
+0x532F = 0x7C94
+0x5330 = 0x7C9E
+0x5331 = 0x7CA0
+0x5332 = 0x7CA6
+0x5333 = 0x7CB0
+0x5334 = 0x7CB6
+0x5335 = 0x7CB7
+0x5336 = 0x7CBA
+0x5337 = 0x7CBB
+0x5338 = 0x7CBC
+0x5339 = 0x7CBF
+0x533A = 0x7CC4
+0x533B = 0x7CC7
+0x533C = 0x7CC8
+0x533D = 0x7CC9
+0x533E = 0x7CCD
+0x533F = 0x7CCF
+0x5340 = 0x7CD3
+0x5341 = 0x7CD4
+0x5342 = 0x7CD5
+0x5343 = 0x7CD7
+0x5344 = 0x7CD9
+0x5345 = 0x7CDA
+0x5346 = 0x7CDD
+0x5347 = 0x7CE6
+0x5348 = 0x7CE9
+0x5349 = 0x7CEB
+0x534A = 0x7CF5
+0x534B = 0x7D03
+0x534C = 0x7D07
+0x534D = 0x7D08
+0x534E = 0x7D09
+0x534F = 0x7D0F
+0x5350 = 0x7D11
+0x5351 = 0x7D12
+0x5352 = 0x7D13
+0x5353 = 0x7D16
+0x5354 = 0x7D1D
+0x5355 = 0x7D1E
+0x5356 = 0x7D23
+0x5357 = 0x7D26
+0x5358 = 0x7D2A
+0x5359 = 0x7D2D
+0x535A = 0x7D31
+0x535B = 0x7D3C
+0x535C = 0x7D3D
+0x535D = 0x7D3E
+0x535E = 0x7D40
+0x535F = 0x7D41
+0x5360 = 0x7D47
+0x5361 = 0x7D48
+0x5362 = 0x7D4D
+0x5363 = 0x7D51
+0x5364 = 0x7D53
+0x5365 = 0x7D57
+0x5366 = 0x7D59
+0x5367 = 0x7D5A
+0x5368 = 0x7D5C
+0x5369 = 0x7D5D
+0x536A = 0x7D65
+0x536B = 0x7D67
+0x536C = 0x7D6A
+0x536D = 0x7D70
+0x536E = 0x7D78
+0x536F = 0x7D7A
+0x5370 = 0x7D7B
+0x5371 = 0x7D7F
+0x5372 = 0x7D81
+0x5373 = 0x7D82
+0x5374 = 0x7D83
+0x5375 = 0x7D85
+0x5376 = 0x7D86
+0x5377 = 0x7D88
+0x5378 = 0x7D8B
+0x5379 = 0x7D8C
+0x537A = 0x7D8D
+0x537B = 0x7D91
+0x537C = 0x7D96
+0x537D = 0x7D97
+0x537E = 0x7D9D
+0x5421 = 0x7D9E
+0x5422 = 0x7DA6
+0x5423 = 0x7DA7
+0x5424 = 0x7DAA
+0x5425 = 0x7DB3
+0x5426 = 0x7DB6
+0x5427 = 0x7DB7
+0x5428 = 0x7DB9
+0x5429 = 0x7DC2
+0x542A = 0x7DC3
+0x542B = 0x7DC4
+0x542C = 0x7DC5
+0x542D = 0x7DC6
+0x542E = 0x7DCC
+0x542F = 0x7DCD
+0x5430 = 0x7DCE
+0x5431 = 0x7DD7
+0x5432 = 0x7DD9
+0x5433 = 0x7E00
+0x5434 = 0x7DE2
+0x5435 = 0x7DE5
+0x5436 = 0x7DE6
+0x5437 = 0x7DEA
+0x5438 = 0x7DEB
+0x5439 = 0x7DED
+0x543A = 0x7DF1
+0x543B = 0x7DF5
+0x543C = 0x7DF6
+0x543D = 0x7DF9
+0x543E = 0x7DFA
+0x543F = 0x7E08
+0x5440 = 0x7E10
+0x5441 = 0x7E11
+0x5442 = 0x7E15
+0x5443 = 0x7E17
+0x5444 = 0x7E1C
+0x5445 = 0x7E1D
+0x5446 = 0x7E20
+0x5447 = 0x7E27
+0x5448 = 0x7E28
+0x5449 = 0x7E2C
+0x544A = 0x7E2D
+0x544B = 0x7E2F
+0x544C = 0x7E33
+0x544D = 0x7E36
+0x544E = 0x7E3F
+0x544F = 0x7E44
+0x5450 = 0x7E45
+0x5451 = 0x7E47
+0x5452 = 0x7E4E
+0x5453 = 0x7E50
+0x5454 = 0x7E52
+0x5455 = 0x7E58
+0x5456 = 0x7E5F
+0x5457 = 0x7E61
+0x5458 = 0x7E62
+0x5459 = 0x7E65
+0x545A = 0x7E6B
+0x545B = 0x7E6E
+0x545C = 0x7E6F
+0x545D = 0x7E73
+0x545E = 0x7E78
+0x545F = 0x7E7E
+0x5460 = 0x7E81
+0x5461 = 0x7E86
+0x5462 = 0x7E87
+0x5463 = 0x7E8A
+0x5464 = 0x7E8D
+0x5465 = 0x7E91
+0x5466 = 0x7E95
+0x5467 = 0x7E98
+0x5468 = 0x7E9A
+0x5469 = 0x7E9D
+0x546A = 0x7E9E
+0x546B = 0x7F3C
+0x546C = 0x7F3B
+0x546D = 0x7F3D
+0x546E = 0x7F3E
+0x546F = 0x7F3F
+0x5470 = 0x7F43
+0x5471 = 0x7F44
+0x5472 = 0x7F47
+0x5473 = 0x7F4F
+0x5474 = 0x7F52
+0x5475 = 0x7F53
+0x5476 = 0x7F5B
+0x5477 = 0x7F5C
+0x5478 = 0x7F5D
+0x5479 = 0x7F61
+0x547A = 0x7F63
+0x547B = 0x7F64
+0x547C = 0x7F65
+0x547D = 0x7F66
+0x547E = 0x7F6D
+0x5521 = 0x7F71
+0x5522 = 0x7F7D
+0x5523 = 0x7F7E
+0x5524 = 0x7F7F
+0x5525 = 0x7F80
+0x5526 = 0x7F8B
+0x5527 = 0x7F8D
+0x5528 = 0x7F8F
+0x5529 = 0x7F90
+0x552A = 0x7F91
+0x552B = 0x7F96
+0x552C = 0x7F97
+0x552D = 0x7F9C
+0x552E = 0x7FA1
+0x552F = 0x7FA2
+0x5530 = 0x7FA6
+0x5531 = 0x7FAA
+0x5532 = 0x7FAD
+0x5533 = 0x7FB4
+0x5534 = 0x7FBC
+0x5535 = 0x7FBF
+0x5536 = 0x7FC0
+0x5537 = 0x7FC3
+0x5538 = 0x7FC8
+0x5539 = 0x7FCE
+0x553A = 0x7FCF
+0x553B = 0x7FDB
+0x553C = 0x7FDF
+0x553D = 0x7FE3
+0x553E = 0x7FE5
+0x553F = 0x7FE8
+0x5540 = 0x7FEC
+0x5541 = 0x7FEE
+0x5542 = 0x7FEF
+0x5543 = 0x7FF2
+0x5544 = 0x7FFA
+0x5545 = 0x7FFD
+0x5546 = 0x7FFE
+0x5547 = 0x7FFF
+0x5548 = 0x8007
+0x5549 = 0x8008
+0x554A = 0x800A
+0x554B = 0x800D
+0x554C = 0x800E
+0x554D = 0x800F
+0x554E = 0x8011
+0x554F = 0x8013
+0x5550 = 0x8014
+0x5551 = 0x8016
+0x5552 = 0x801D
+0x5553 = 0x801E
+0x5554 = 0x801F
+0x5555 = 0x8020
+0x5556 = 0x8024
+0x5557 = 0x8026
+0x5558 = 0x802C
+0x5559 = 0x802E
+0x555A = 0x8030
+0x555B = 0x8034
+0x555C = 0x8035
+0x555D = 0x8037
+0x555E = 0x8039
+0x555F = 0x803A
+0x5560 = 0x803C
+0x5561 = 0x803E
+0x5562 = 0x8040
+0x5563 = 0x8044
+0x5564 = 0x8060
+0x5565 = 0x8064
+0x5566 = 0x8066
+0x5567 = 0x806D
+0x5568 = 0x8071
+0x5569 = 0x8075
+0x556A = 0x8081
+0x556B = 0x8088
+0x556C = 0x808E
+0x556D = 0x809C
+0x556E = 0x809E
+0x556F = 0x80A6
+0x5570 = 0x80A7
+0x5571 = 0x80AB
+0x5572 = 0x80B8
+0x5573 = 0x80B9
+0x5574 = 0x80C8
+0x5575 = 0x80CD
+0x5576 = 0x80CF
+0x5577 = 0x80D2
+0x5578 = 0x80D4
+0x5579 = 0x80D5
+0x557A = 0x80D7
+0x557B = 0x80D8
+0x557C = 0x80E0
+0x557D = 0x80ED
+0x557E = 0x80EE
+0x5621 = 0x80F0
+0x5622 = 0x80F2
+0x5623 = 0x80F3
+0x5624 = 0x80F6
+0x5625 = 0x80F9
+0x5626 = 0x80FA
+0x5627 = 0x80FE
+0x5628 = 0x8103
+0x5629 = 0x810B
+0x562A = 0x8116
+0x562B = 0x8117
+0x562C = 0x8118
+0x562D = 0x811C
+0x562E = 0x811E
+0x562F = 0x8120
+0x5630 = 0x8124
+0x5631 = 0x8127
+0x5632 = 0x812C
+0x5633 = 0x8130
+0x5634 = 0x8135
+0x5635 = 0x813A
+0x5636 = 0x813C
+0x5637 = 0x8145
+0x5638 = 0x8147
+0x5639 = 0x814A
+0x563A = 0x814C
+0x563B = 0x8152
+0x563C = 0x8157
+0x563D = 0x8160
+0x563E = 0x8161
+0x563F = 0x8167
+0x5640 = 0x8168
+0x5641 = 0x8169
+0x5642 = 0x816D
+0x5643 = 0x816F
+0x5644 = 0x8177
+0x5645 = 0x8181
+0x5646 = 0x8190
+0x5647 = 0x8184
+0x5648 = 0x8185
+0x5649 = 0x8186
+0x564A = 0x818B
+0x564B = 0x818E
+0x564C = 0x8196
+0x564D = 0x8198
+0x564E = 0x819B
+0x564F = 0x819E
+0x5650 = 0x81A2
+0x5651 = 0x81AE
+0x5652 = 0x81B2
+0x5653 = 0x81B4
+0x5654 = 0x81BB
+0x5655 = 0x81CB
+0x5656 = 0x81C3
+0x5657 = 0x81C5
+0x5658 = 0x81CA
+0x5659 = 0x81CE
+0x565A = 0x81CF
+0x565B = 0x81D5
+0x565C = 0x81D7
+0x565D = 0x81DB
+0x565E = 0x81DD
+0x565F = 0x81DE
+0x5660 = 0x81E1
+0x5661 = 0x81E4
+0x5662 = 0x81EB
+0x5663 = 0x81EC
+0x5664 = 0x81F0
+0x5665 = 0x81F1
+0x5666 = 0x81F2
+0x5667 = 0x81F5
+0x5668 = 0x81F6
+0x5669 = 0x81F8
+0x566A = 0x81F9
+0x566B = 0x81FD
+0x566C = 0x81FF
+0x566D = 0x8200
+0x566E = 0x8203
+0x566F = 0x820F
+0x5670 = 0x8213
+0x5671 = 0x8214
+0x5672 = 0x8219
+0x5673 = 0x821A
+0x5674 = 0x821D
+0x5675 = 0x8221
+0x5676 = 0x8222
+0x5677 = 0x8228
+0x5678 = 0x8232
+0x5679 = 0x8234
+0x567A = 0x823A
+0x567B = 0x8243
+0x567C = 0x8244
+0x567D = 0x8245
+0x567E = 0x8246
+0x5721 = 0x824B
+0x5722 = 0x824E
+0x5723 = 0x824F
+0x5724 = 0x8251
+0x5725 = 0x8256
+0x5726 = 0x825C
+0x5727 = 0x8260
+0x5728 = 0x8263
+0x5729 = 0x8267
+0x572A = 0x826D
+0x572B = 0x8274
+0x572C = 0x827B
+0x572D = 0x827D
+0x572E = 0x827F
+0x572F = 0x8280
+0x5730 = 0x8281
+0x5731 = 0x8283
+0x5732 = 0x8284
+0x5733 = 0x8287
+0x5734 = 0x8289
+0x5735 = 0x828A
+0x5736 = 0x828E
+0x5737 = 0x8291
+0x5738 = 0x8294
+0x5739 = 0x8296
+0x573A = 0x8298
+0x573B = 0x829A
+0x573C = 0x829B
+0x573D = 0x82A0
+0x573E = 0x82A1
+0x573F = 0x82A3
+0x5740 = 0x82A4
+0x5741 = 0x82A7
+0x5742 = 0x82A8
+0x5743 = 0x82A9
+0x5744 = 0x82AA
+0x5745 = 0x82AE
+0x5746 = 0x82B0
+0x5747 = 0x82B2
+0x5748 = 0x82B4
+0x5749 = 0x82B7
+0x574A = 0x82BA
+0x574B = 0x82BC
+0x574C = 0x82BE
+0x574D = 0x82BF
+0x574E = 0x82C6
+0x574F = 0x82D0
+0x5750 = 0x82D5
+0x5751 = 0x82DA
+0x5752 = 0x82E0
+0x5753 = 0x82E2
+0x5754 = 0x82E4
+0x5755 = 0x82E8
+0x5756 = 0x82EA
+0x5757 = 0x82ED
+0x5758 = 0x82EF
+0x5759 = 0x82F6
+0x575A = 0x82F7
+0x575B = 0x82FD
+0x575C = 0x82FE
+0x575D = 0x8300
+0x575E = 0x8301
+0x575F = 0x8307
+0x5760 = 0x8308
+0x5761 = 0x830A
+0x5762 = 0x830B
+0x5763 = 0x8354
+0x5764 = 0x831B
+0x5765 = 0x831D
+0x5766 = 0x831E
+0x5767 = 0x831F
+0x5768 = 0x8321
+0x5769 = 0x8322
+0x576A = 0x832C
+0x576B = 0x832D
+0x576C = 0x832E
+0x576D = 0x8330
+0x576E = 0x8333
+0x576F = 0x8337
+0x5770 = 0x833A
+0x5771 = 0x833C
+0x5772 = 0x833D
+0x5773 = 0x8342
+0x5774 = 0x8343
+0x5775 = 0x8344
+0x5776 = 0x8347
+0x5777 = 0x834D
+0x5778 = 0x834E
+0x5779 = 0x8351
+0x577A = 0x8355
+0x577B = 0x8356
+0x577C = 0x8357
+0x577D = 0x8370
+0x577E = 0x8378
+0x5821 = 0x837D
+0x5822 = 0x837F
+0x5823 = 0x8380
+0x5824 = 0x8382
+0x5825 = 0x8384
+0x5826 = 0x8386
+0x5827 = 0x838D
+0x5828 = 0x8392
+0x5829 = 0x8394
+0x582A = 0x8395
+0x582B = 0x8398
+0x582C = 0x8399
+0x582D = 0x839B
+0x582E = 0x839C
+0x582F = 0x839D
+0x5830 = 0x83A6
+0x5831 = 0x83A7
+0x5832 = 0x83A9
+0x5833 = 0x83AC
+0x5834 = 0x83BE
+0x5835 = 0x83BF
+0x5836 = 0x83C0
+0x5837 = 0x83C7
+0x5838 = 0x83C9
+0x5839 = 0x83CF
+0x583A = 0x83D0
+0x583B = 0x83D1
+0x583C = 0x83D4
+0x583D = 0x83DD
+0x583E = 0x8353
+0x583F = 0x83E8
+0x5840 = 0x83EA
+0x5841 = 0x83F6
+0x5842 = 0x83F8
+0x5843 = 0x83F9
+0x5844 = 0x83FC
+0x5845 = 0x8401
+0x5846 = 0x8406
+0x5847 = 0x840A
+0x5848 = 0x840F
+0x5849 = 0x8411
+0x584A = 0x8415
+0x584B = 0x8419
+0x584C = 0x83AD
+0x584D = 0x842F
+0x584E = 0x8439
+0x584F = 0x8445
+0x5850 = 0x8447
+0x5851 = 0x8448
+0x5852 = 0x844A
+0x5853 = 0x844D
+0x5854 = 0x844F
+0x5855 = 0x8451
+0x5856 = 0x8452
+0x5857 = 0x8456
+0x5858 = 0x8458
+0x5859 = 0x8459
+0x585A = 0x845A
+0x585B = 0x845C
+0x585C = 0x8460
+0x585D = 0x8464
+0x585E = 0x8465
+0x585F = 0x8467
+0x5860 = 0x846A
+0x5861 = 0x8470
+0x5862 = 0x8473
+0x5863 = 0x8474
+0x5864 = 0x8476
+0x5865 = 0x8478
+0x5866 = 0x847C
+0x5867 = 0x847D
+0x5868 = 0x8481
+0x5869 = 0x8485
+0x586A = 0x8492
+0x586B = 0x8493
+0x586C = 0x8495
+0x586D = 0x849E
+0x586E = 0x84A6
+0x586F = 0x84A8
+0x5870 = 0x84A9
+0x5871 = 0x84AA
+0x5872 = 0x84AF
+0x5873 = 0x84B1
+0x5874 = 0x84B4
+0x5875 = 0x84BA
+0x5876 = 0x84BD
+0x5877 = 0x84BE
+0x5878 = 0x84C0
+0x5879 = 0x84C2
+0x587A = 0x84C7
+0x587B = 0x84C8
+0x587C = 0x84CC
+0x587D = 0x84CF
+0x587E = 0x84D3
+0x5921 = 0x84DC
+0x5922 = 0x84E7
+0x5923 = 0x84EA
+0x5924 = 0x84EF
+0x5925 = 0x84F0
+0x5926 = 0x84F1
+0x5927 = 0x84F2
+0x5928 = 0x84F7
+0x5929 = 0x8532
+0x592A = 0x84FA
+0x592B = 0x84FB
+0x592C = 0x84FD
+0x592D = 0x8502
+0x592E = 0x8503
+0x592F = 0x8507
+0x5930 = 0x850C
+0x5931 = 0x850E
+0x5932 = 0x8510
+0x5933 = 0x851C
+0x5934 = 0x851E
+0x5935 = 0x8522
+0x5936 = 0x8523
+0x5937 = 0x8524
+0x5938 = 0x8525
+0x5939 = 0x8527
+0x593A = 0x852A
+0x593B = 0x852B
+0x593C = 0x852F
+0x593D = 0x8533
+0x593E = 0x8534
+0x593F = 0x8536
+0x5940 = 0x853F
+0x5941 = 0x8546
+0x5942 = 0x854F
+0x5943 = 0x8550
+0x5944 = 0x8551
+0x5945 = 0x8552
+0x5946 = 0x8553
+0x5947 = 0x8556
+0x5948 = 0x8559
+0x5949 = 0x855C
+0x594A = 0x855D
+0x594B = 0x855E
+0x594C = 0x855F
+0x594D = 0x8560
+0x594E = 0x8561
+0x594F = 0x8562
+0x5950 = 0x8564
+0x5951 = 0x856B
+0x5952 = 0x856F
+0x5953 = 0x8579
+0x5954 = 0x857A
+0x5955 = 0x857B
+0x5956 = 0x857D
+0x5957 = 0x857F
+0x5958 = 0x8581
+0x5959 = 0x8585
+0x595A = 0x8586
+0x595B = 0x8589
+0x595C = 0x858B
+0x595D = 0x858C
+0x595E = 0x858F
+0x595F = 0x8593
+0x5960 = 0x8598
+0x5961 = 0x859D
+0x5962 = 0x859F
+0x5963 = 0x85A0
+0x5964 = 0x85A2
+0x5965 = 0x85A5
+0x5966 = 0x85A7
+0x5967 = 0x85B4
+0x5968 = 0x85B6
+0x5969 = 0x85B7
+0x596A = 0x85B8
+0x596B = 0x85BC
+0x596C = 0x85BD
+0x596D = 0x85BE
+0x596E = 0x85BF
+0x596F = 0x85C2
+0x5970 = 0x85C7
+0x5971 = 0x85CA
+0x5972 = 0x85CB
+0x5973 = 0x85CE
+0x5974 = 0x85AD
+0x5975 = 0x85D8
+0x5976 = 0x85DA
+0x5977 = 0x85DF
+0x5978 = 0x85E0
+0x5979 = 0x85E6
+0x597A = 0x85E8
+0x597B = 0x85ED
+0x597C = 0x85F3
+0x597D = 0x85F6
+0x597E = 0x85FC
+0x5A21 = 0x85FF
+0x5A22 = 0x8600
+0x5A23 = 0x8604
+0x5A24 = 0x8605
+0x5A25 = 0x860D
+0x5A26 = 0x860E
+0x5A27 = 0x8610
+0x5A28 = 0x8611
+0x5A29 = 0x8612
+0x5A2A = 0x8618
+0x5A2B = 0x8619
+0x5A2C = 0x861B
+0x5A2D = 0x861E
+0x5A2E = 0x8621
+0x5A2F = 0x8627
+0x5A30 = 0x8629
+0x5A31 = 0x8636
+0x5A32 = 0x8638
+0x5A33 = 0x863A
+0x5A34 = 0x863C
+0x5A35 = 0x863D
+0x5A36 = 0x8640
+0x5A37 = 0x8642
+0x5A38 = 0x8646
+0x5A39 = 0x8652
+0x5A3A = 0x8653
+0x5A3B = 0x8656
+0x5A3C = 0x8657
+0x5A3D = 0x8658
+0x5A3E = 0x8659
+0x5A3F = 0x865D
+0x5A40 = 0x8660
+0x5A41 = 0x8661
+0x5A42 = 0x8662
+0x5A43 = 0x8663
+0x5A44 = 0x8664
+0x5A45 = 0x8669
+0x5A46 = 0x866C
+0x5A47 = 0x866F
+0x5A48 = 0x8675
+0x5A49 = 0x8676
+0x5A4A = 0x8677
+0x5A4B = 0x867A
+0x5A4C = 0x868D
+0x5A4D = 0x8691
+0x5A4E = 0x8696
+0x5A4F = 0x8698
+0x5A50 = 0x869A
+0x5A51 = 0x869C
+0x5A52 = 0x86A1
+0x5A53 = 0x86A6
+0x5A54 = 0x86A7
+0x5A55 = 0x86A8
+0x5A56 = 0x86AD
+0x5A57 = 0x86B1
+0x5A58 = 0x86B3
+0x5A59 = 0x86B4
+0x5A5A = 0x86B5
+0x5A5B = 0x86B7
+0x5A5C = 0x86B8
+0x5A5D = 0x86B9
+0x5A5E = 0x86BF
+0x5A5F = 0x86C0
+0x5A60 = 0x86C1
+0x5A61 = 0x86C3
+0x5A62 = 0x86C5
+0x5A63 = 0x86D1
+0x5A64 = 0x86D2
+0x5A65 = 0x86D5
+0x5A66 = 0x86D7
+0x5A67 = 0x86DA
+0x5A68 = 0x86DC
+0x5A69 = 0x86E0
+0x5A6A = 0x86E3
+0x5A6B = 0x86E5
+0x5A6C = 0x86E7
+0x5A6D = 0x8688
+0x5A6E = 0x86FA
+0x5A6F = 0x86FC
+0x5A70 = 0x86FD
+0x5A71 = 0x8704
+0x5A72 = 0x8705
+0x5A73 = 0x8707
+0x5A74 = 0x870B
+0x5A75 = 0x870E
+0x5A76 = 0x870F
+0x5A77 = 0x8710
+0x5A78 = 0x8713
+0x5A79 = 0x8714
+0x5A7A = 0x8719
+0x5A7B = 0x871E
+0x5A7C = 0x871F
+0x5A7D = 0x8721
+0x5A7E = 0x8723
+0x5B21 = 0x8728
+0x5B22 = 0x872E
+0x5B23 = 0x872F
+0x5B24 = 0x8731
+0x5B25 = 0x8732
+0x5B26 = 0x8739
+0x5B27 = 0x873A
+0x5B28 = 0x873C
+0x5B29 = 0x873D
+0x5B2A = 0x873E
+0x5B2B = 0x8740
+0x5B2C = 0x8743
+0x5B2D = 0x8745
+0x5B2E = 0x874D
+0x5B2F = 0x8758
+0x5B30 = 0x875D
+0x5B31 = 0x8761
+0x5B32 = 0x8764
+0x5B33 = 0x8765
+0x5B34 = 0x876F
+0x5B35 = 0x8771
+0x5B36 = 0x8772
+0x5B37 = 0x877B
+0x5B38 = 0x8783
+0x5B39 = 0x8784
+0x5B3A = 0x8785
+0x5B3B = 0x8786
+0x5B3C = 0x8787
+0x5B3D = 0x8788
+0x5B3E = 0x8789
+0x5B3F = 0x878B
+0x5B40 = 0x878C
+0x5B41 = 0x8790
+0x5B42 = 0x8793
+0x5B43 = 0x8795
+0x5B44 = 0x8797
+0x5B45 = 0x8798
+0x5B46 = 0x8799
+0x5B47 = 0x879E
+0x5B48 = 0x87A0
+0x5B49 = 0x87A3
+0x5B4A = 0x87A7
+0x5B4B = 0x87AC
+0x5B4C = 0x87AD
+0x5B4D = 0x87AE
+0x5B4E = 0x87B1
+0x5B4F = 0x87B5
+0x5B50 = 0x87BE
+0x5B51 = 0x87BF
+0x5B52 = 0x87C1
+0x5B53 = 0x87C8
+0x5B54 = 0x87C9
+0x5B55 = 0x87CA
+0x5B56 = 0x87CE
+0x5B57 = 0x87D5
+0x5B58 = 0x87D6
+0x5B59 = 0x87D9
+0x5B5A = 0x87DA
+0x5B5B = 0x87DC
+0x5B5C = 0x87DF
+0x5B5D = 0x87E2
+0x5B5E = 0x87E3
+0x5B5F = 0x87E4
+0x5B60 = 0x87EA
+0x5B61 = 0x87EB
+0x5B62 = 0x87ED
+0x5B63 = 0x87F1
+0x5B64 = 0x87F3
+0x5B65 = 0x87F8
+0x5B66 = 0x87FA
+0x5B67 = 0x87FF
+0x5B68 = 0x8801
+0x5B69 = 0x8803
+0x5B6A = 0x8806
+0x5B6B = 0x8809
+0x5B6C = 0x880A
+0x5B6D = 0x880B
+0x5B6E = 0x8810
+0x5B6F = 0x8819
+0x5B70 = 0x8812
+0x5B71 = 0x8813
+0x5B72 = 0x8814
+0x5B73 = 0x8818
+0x5B74 = 0x881A
+0x5B75 = 0x881B
+0x5B76 = 0x881C
+0x5B77 = 0x881E
+0x5B78 = 0x881F
+0x5B79 = 0x8828
+0x5B7A = 0x882D
+0x5B7B = 0x882E
+0x5B7C = 0x8830
+0x5B7D = 0x8832
+0x5B7E = 0x8835
+0x5C21 = 0x883A
+0x5C22 = 0x883C
+0x5C23 = 0x8841
+0x5C24 = 0x8843
+0x5C25 = 0x8845
+0x5C26 = 0x8848
+0x5C27 = 0x8849
+0x5C28 = 0x884A
+0x5C29 = 0x884B
+0x5C2A = 0x884E
+0x5C2B = 0x8851
+0x5C2C = 0x8855
+0x5C2D = 0x8856
+0x5C2E = 0x8858
+0x5C2F = 0x885A
+0x5C30 = 0x885C
+0x5C31 = 0x885F
+0x5C32 = 0x8860
+0x5C33 = 0x8864
+0x5C34 = 0x8869
+0x5C35 = 0x8871
+0x5C36 = 0x8879
+0x5C37 = 0x887B
+0x5C38 = 0x8880
+0x5C39 = 0x8898
+0x5C3A = 0x889A
+0x5C3B = 0x889B
+0x5C3C = 0x889C
+0x5C3D = 0x889F
+0x5C3E = 0x88A0
+0x5C3F = 0x88A8
+0x5C40 = 0x88AA
+0x5C41 = 0x88BA
+0x5C42 = 0x88BD
+0x5C43 = 0x88BE
+0x5C44 = 0x88C0
+0x5C45 = 0x88CA
+0x5C46 = 0x88CB
+0x5C47 = 0x88CC
+0x5C48 = 0x88CD
+0x5C49 = 0x88CE
+0x5C4A = 0x88D1
+0x5C4B = 0x88D2
+0x5C4C = 0x88D3
+0x5C4D = 0x88DB
+0x5C4E = 0x88DE
+0x5C4F = 0x88E7
+0x5C50 = 0x88EF
+0x5C51 = 0x88F0
+0x5C52 = 0x88F1
+0x5C53 = 0x88F5
+0x5C54 = 0x88F7
+0x5C55 = 0x8901
+0x5C56 = 0x8906
+0x5C57 = 0x890D
+0x5C58 = 0x890E
+0x5C59 = 0x890F
+0x5C5A = 0x8915
+0x5C5B = 0x8916
+0x5C5C = 0x8918
+0x5C5D = 0x8919
+0x5C5E = 0x891A
+0x5C5F = 0x891C
+0x5C60 = 0x8920
+0x5C61 = 0x8926
+0x5C62 = 0x8927
+0x5C63 = 0x8928
+0x5C64 = 0x8930
+0x5C65 = 0x8931
+0x5C66 = 0x8932
+0x5C67 = 0x8935
+0x5C68 = 0x8939
+0x5C69 = 0x893A
+0x5C6A = 0x893E
+0x5C6B = 0x8940
+0x5C6C = 0x8942
+0x5C6D = 0x8945
+0x5C6E = 0x8946
+0x5C6F = 0x8949
+0x5C70 = 0x894F
+0x5C71 = 0x8952
+0x5C72 = 0x8957
+0x5C73 = 0x895A
+0x5C74 = 0x895B
+0x5C75 = 0x895C
+0x5C76 = 0x8961
+0x5C77 = 0x8962
+0x5C78 = 0x8963
+0x5C79 = 0x896B
+0x5C7A = 0x896E
+0x5C7B = 0x8970
+0x5C7C = 0x8973
+0x5C7D = 0x8975
+0x5C7E = 0x897A
+0x5D21 = 0x897B
+0x5D22 = 0x897C
+0x5D23 = 0x897D
+0x5D24 = 0x8989
+0x5D25 = 0x898D
+0x5D26 = 0x8990
+0x5D27 = 0x8994
+0x5D28 = 0x8995
+0x5D29 = 0x899B
+0x5D2A = 0x899C
+0x5D2B = 0x899F
+0x5D2C = 0x89A0
+0x5D2D = 0x89A5
+0x5D2E = 0x89B0
+0x5D2F = 0x89B4
+0x5D30 = 0x89B5
+0x5D31 = 0x89B6
+0x5D32 = 0x89B7
+0x5D33 = 0x89BC
+0x5D34 = 0x89D4
+0x5D35 = 0x89D5
+0x5D36 = 0x89D6
+0x5D37 = 0x89D7
+0x5D38 = 0x89D8
+0x5D39 = 0x89E5
+0x5D3A = 0x89E9
+0x5D3B = 0x89EB
+0x5D3C = 0x89ED
+0x5D3D = 0x89F1
+0x5D3E = 0x89F3
+0x5D3F = 0x89F6
+0x5D40 = 0x89F9
+0x5D41 = 0x89FD
+0x5D42 = 0x89FF
+0x5D43 = 0x8A04
+0x5D44 = 0x8A05
+0x5D45 = 0x8A07
+0x5D46 = 0x8A0F
+0x5D47 = 0x8A11
+0x5D48 = 0x8A12
+0x5D49 = 0x8A14
+0x5D4A = 0x8A15
+0x5D4B = 0x8A1E
+0x5D4C = 0x8A20
+0x5D4D = 0x8A22
+0x5D4E = 0x8A24
+0x5D4F = 0x8A26
+0x5D50 = 0x8A2B
+0x5D51 = 0x8A2C
+0x5D52 = 0x8A2F
+0x5D53 = 0x8A35
+0x5D54 = 0x8A37
+0x5D55 = 0x8A3D
+0x5D56 = 0x8A3E
+0x5D57 = 0x8A40
+0x5D58 = 0x8A43
+0x5D59 = 0x8A45
+0x5D5A = 0x8A47
+0x5D5B = 0x8A49
+0x5D5C = 0x8A4D
+0x5D5D = 0x8A4E
+0x5D5E = 0x8A53
+0x5D5F = 0x8A56
+0x5D60 = 0x8A57
+0x5D61 = 0x8A58
+0x5D62 = 0x8A5C
+0x5D63 = 0x8A5D
+0x5D64 = 0x8A61
+0x5D65 = 0x8A65
+0x5D66 = 0x8A67
+0x5D67 = 0x8A75
+0x5D68 = 0x8A76
+0x5D69 = 0x8A77
+0x5D6A = 0x8A79
+0x5D6B = 0x8A7A
+0x5D6C = 0x8A7B
+0x5D6D = 0x8A7E
+0x5D6E = 0x8A7F
+0x5D6F = 0x8A80
+0x5D70 = 0x8A83
+0x5D71 = 0x8A86
+0x5D72 = 0x8A8B
+0x5D73 = 0x8A8F
+0x5D74 = 0x8A90
+0x5D75 = 0x8A92
+0x5D76 = 0x8A96
+0x5D77 = 0x8A97
+0x5D78 = 0x8A99
+0x5D79 = 0x8A9F
+0x5D7A = 0x8AA7
+0x5D7B = 0x8AA9
+0x5D7C = 0x8AAE
+0x5D7D = 0x8AAF
+0x5D7E = 0x8AB3
+0x5E21 = 0x8AB6
+0x5E22 = 0x8AB7
+0x5E23 = 0x8ABB
+0x5E24 = 0x8ABE
+0x5E25 = 0x8AC3
+0x5E26 = 0x8AC6
+0x5E27 = 0x8AC8
+0x5E28 = 0x8AC9
+0x5E29 = 0x8ACA
+0x5E2A = 0x8AD1
+0x5E2B = 0x8AD3
+0x5E2C = 0x8AD4
+0x5E2D = 0x8AD5
+0x5E2E = 0x8AD7
+0x5E2F = 0x8ADD
+0x5E30 = 0x8ADF
+0x5E31 = 0x8AEC
+0x5E32 = 0x8AF0
+0x5E33 = 0x8AF4
+0x5E34 = 0x8AF5
+0x5E35 = 0x8AF6
+0x5E36 = 0x8AFC
+0x5E37 = 0x8AFF
+0x5E38 = 0x8B05
+0x5E39 = 0x8B06
+0x5E3A = 0x8B0B
+0x5E3B = 0x8B11
+0x5E3C = 0x8B1C
+0x5E3D = 0x8B1E
+0x5E3E = 0x8B1F
+0x5E3F = 0x8B0A
+0x5E40 = 0x8B2D
+0x5E41 = 0x8B30
+0x5E42 = 0x8B37
+0x5E43 = 0x8B3C
+0x5E44 = 0x8B42
+0x5E45 = 0x8B43
+0x5E46 = 0x8B44
+0x5E47 = 0x8B45
+0x5E48 = 0x8B46
+0x5E49 = 0x8B48
+0x5E4A = 0x8B52
+0x5E4B = 0x8B53
+0x5E4C = 0x8B54
+0x5E4D = 0x8B59
+0x5E4E = 0x8B4D
+0x5E4F = 0x8B5E
+0x5E50 = 0x8B63
+0x5E51 = 0x8B6D
+0x5E52 = 0x8B76
+0x5E53 = 0x8B78
+0x5E54 = 0x8B79
+0x5E55 = 0x8B7C
+0x5E56 = 0x8B7E
+0x5E57 = 0x8B81
+0x5E58 = 0x8B84
+0x5E59 = 0x8B85
+0x5E5A = 0x8B8B
+0x5E5B = 0x8B8D
+0x5E5C = 0x8B8F
+0x5E5D = 0x8B94
+0x5E5E = 0x8B95
+0x5E5F = 0x8B9C
+0x5E60 = 0x8B9E
+0x5E61 = 0x8B9F
+0x5E62 = 0x8C38
+0x5E63 = 0x8C39
+0x5E64 = 0x8C3D
+0x5E65 = 0x8C3E
+0x5E66 = 0x8C45
+0x5E67 = 0x8C47
+0x5E68 = 0x8C49
+0x5E69 = 0x8C4B
+0x5E6A = 0x8C4F
+0x5E6B = 0x8C51
+0x5E6C = 0x8C53
+0x5E6D = 0x8C54
+0x5E6E = 0x8C57
+0x5E6F = 0x8C58
+0x5E70 = 0x8C5B
+0x5E71 = 0x8C5D
+0x5E72 = 0x8C59
+0x5E73 = 0x8C63
+0x5E74 = 0x8C64
+0x5E75 = 0x8C66
+0x5E76 = 0x8C68
+0x5E77 = 0x8C69
+0x5E78 = 0x8C6D
+0x5E79 = 0x8C73
+0x5E7A = 0x8C75
+0x5E7B = 0x8C76
+0x5E7C = 0x8C7B
+0x5E7D = 0x8C7E
+0x5E7E = 0x8C86
+0x5F21 = 0x8C87
+0x5F22 = 0x8C8B
+0x5F23 = 0x8C90
+0x5F24 = 0x8C92
+0x5F25 = 0x8C93
+0x5F26 = 0x8C99
+0x5F27 = 0x8C9B
+0x5F28 = 0x8C9C
+0x5F29 = 0x8CA4
+0x5F2A = 0x8CB9
+0x5F2B = 0x8CBA
+0x5F2C = 0x8CC5
+0x5F2D = 0x8CC6
+0x5F2E = 0x8CC9
+0x5F2F = 0x8CCB
+0x5F30 = 0x8CCF
+0x5F31 = 0x8CD6
+0x5F32 = 0x8CD5
+0x5F33 = 0x8CD9
+0x5F34 = 0x8CDD
+0x5F35 = 0x8CE1
+0x5F36 = 0x8CE8
+0x5F37 = 0x8CEC
+0x5F38 = 0x8CEF
+0x5F39 = 0x8CF0
+0x5F3A = 0x8CF2
+0x5F3B = 0x8CF5
+0x5F3C = 0x8CF7
+0x5F3D = 0x8CF8
+0x5F3E = 0x8CFE
+0x5F3F = 0x8CFF
+0x5F40 = 0x8D01
+0x5F41 = 0x8D03
+0x5F42 = 0x8D09
+0x5F43 = 0x8D12
+0x5F44 = 0x8D17
+0x5F45 = 0x8D1B
+0x5F46 = 0x8D65
+0x5F47 = 0x8D69
+0x5F48 = 0x8D6C
+0x5F49 = 0x8D6E
+0x5F4A = 0x8D7F
+0x5F4B = 0x8D82
+0x5F4C = 0x8D84
+0x5F4D = 0x8D88
+0x5F4E = 0x8D8D
+0x5F4F = 0x8D90
+0x5F50 = 0x8D91
+0x5F51 = 0x8D95
+0x5F52 = 0x8D9E
+0x5F53 = 0x8D9F
+0x5F54 = 0x8DA0
+0x5F55 = 0x8DA6
+0x5F56 = 0x8DAB
+0x5F57 = 0x8DAC
+0x5F58 = 0x8DAF
+0x5F59 = 0x8DB2
+0x5F5A = 0x8DB5
+0x5F5B = 0x8DB7
+0x5F5C = 0x8DB9
+0x5F5D = 0x8DBB
+0x5F5E = 0x8DC0
+0x5F5F = 0x8DC5
+0x5F60 = 0x8DC6
+0x5F61 = 0x8DC7
+0x5F62 = 0x8DC8
+0x5F63 = 0x8DCA
+0x5F64 = 0x8DCE
+0x5F65 = 0x8DD1
+0x5F66 = 0x8DD4
+0x5F67 = 0x8DD5
+0x5F68 = 0x8DD7
+0x5F69 = 0x8DD9
+0x5F6A = 0x8DE4
+0x5F6B = 0x8DE5
+0x5F6C = 0x8DE7
+0x5F6D = 0x8DEC
+0x5F6E = 0x8DF0
+0x5F6F = 0x8DBC
+0x5F70 = 0x8DF1
+0x5F71 = 0x8DF2
+0x5F72 = 0x8DF4
+0x5F73 = 0x8DFD
+0x5F74 = 0x8E01
+0x5F75 = 0x8E04
+0x5F76 = 0x8E05
+0x5F77 = 0x8E06
+0x5F78 = 0x8E0B
+0x5F79 = 0x8E11
+0x5F7A = 0x8E14
+0x5F7B = 0x8E16
+0x5F7C = 0x8E20
+0x5F7D = 0x8E21
+0x5F7E = 0x8E22
+0x6021 = 0x8E23
+0x6022 = 0x8E26
+0x6023 = 0x8E27
+0x6024 = 0x8E31
+0x6025 = 0x8E33
+0x6026 = 0x8E36
+0x6027 = 0x8E37
+0x6028 = 0x8E38
+0x6029 = 0x8E39
+0x602A = 0x8E3D
+0x602B = 0x8E40
+0x602C = 0x8E41
+0x602D = 0x8E4B
+0x602E = 0x8E4D
+0x602F = 0x8E4E
+0x6030 = 0x8E4F
+0x6031 = 0x8E54
+0x6032 = 0x8E5B
+0x6033 = 0x8E5C
+0x6034 = 0x8E5D
+0x6035 = 0x8E5E
+0x6036 = 0x8E61
+0x6037 = 0x8E62
+0x6038 = 0x8E69
+0x6039 = 0x8E6C
+0x603A = 0x8E6D
+0x603B = 0x8E6F
+0x603C = 0x8E70
+0x603D = 0x8E71
+0x603E = 0x8E79
+0x603F = 0x8E7A
+0x6040 = 0x8E7B
+0x6041 = 0x8E82
+0x6042 = 0x8E83
+0x6043 = 0x8E89
+0x6044 = 0x8E90
+0x6045 = 0x8E92
+0x6046 = 0x8E95
+0x6047 = 0x8E9A
+0x6048 = 0x8E9B
+0x6049 = 0x8E9D
+0x604A = 0x8E9E
+0x604B = 0x8EA2
+0x604C = 0x8EA7
+0x604D = 0x8EA9
+0x604E = 0x8EAD
+0x604F = 0x8EAE
+0x6050 = 0x8EB3
+0x6051 = 0x8EB5
+0x6052 = 0x8EBA
+0x6053 = 0x8EBB
+0x6054 = 0x8EC0
+0x6055 = 0x8EC1
+0x6056 = 0x8EC3
+0x6057 = 0x8EC4
+0x6058 = 0x8EC7
+0x6059 = 0x8ECF
+0x605A = 0x8ED1
+0x605B = 0x8ED4
+0x605C = 0x8EDC
+0x605D = 0x8EE8
+0x605E = 0x8EEE
+0x605F = 0x8EF0
+0x6060 = 0x8EF1
+0x6061 = 0x8EF7
+0x6062 = 0x8EF9
+0x6063 = 0x8EFA
+0x6064 = 0x8EED
+0x6065 = 0x8F00
+0x6066 = 0x8F02
+0x6067 = 0x8F07
+0x6068 = 0x8F08
+0x6069 = 0x8F0F
+0x606A = 0x8F10
+0x606B = 0x8F16
+0x606C = 0x8F17
+0x606D = 0x8F18
+0x606E = 0x8F1E
+0x606F = 0x8F20
+0x6070 = 0x8F21
+0x6071 = 0x8F23
+0x6072 = 0x8F25
+0x6073 = 0x8F27
+0x6074 = 0x8F28
+0x6075 = 0x8F2C
+0x6076 = 0x8F2D
+0x6077 = 0x8F2E
+0x6078 = 0x8F34
+0x6079 = 0x8F35
+0x607A = 0x8F36
+0x607B = 0x8F37
+0x607C = 0x8F3A
+0x607D = 0x8F40
+0x607E = 0x8F41
+0x6121 = 0x8F43
+0x6122 = 0x8F47
+0x6123 = 0x8F4F
+0x6124 = 0x8F51
+0x6125 = 0x8F52
+0x6126 = 0x8F53
+0x6127 = 0x8F54
+0x6128 = 0x8F55
+0x6129 = 0x8F58
+0x612A = 0x8F5D
+0x612B = 0x8F5E
+0x612C = 0x8F65
+0x612D = 0x8F9D
+0x612E = 0x8FA0
+0x612F = 0x8FA1
+0x6130 = 0x8FA4
+0x6131 = 0x8FA5
+0x6132 = 0x8FA6
+0x6133 = 0x8FB5
+0x6134 = 0x8FB6
+0x6135 = 0x8FB8
+0x6136 = 0x8FBE
+0x6137 = 0x8FC0
+0x6138 = 0x8FC1
+0x6139 = 0x8FC6
+0x613A = 0x8FCA
+0x613B = 0x8FCB
+0x613C = 0x8FCD
+0x613D = 0x8FD0
+0x613E = 0x8FD2
+0x613F = 0x8FD3
+0x6140 = 0x8FD5
+0x6141 = 0x8FE0
+0x6142 = 0x8FE3
+0x6143 = 0x8FE4
+0x6144 = 0x8FE8
+0x6145 = 0x8FEE
+0x6146 = 0x8FF1
+0x6147 = 0x8FF5
+0x6148 = 0x8FF6
+0x6149 = 0x8FFB
+0x614A = 0x8FFE
+0x614B = 0x9002
+0x614C = 0x9004
+0x614D = 0x9008
+0x614E = 0x900C
+0x614F = 0x9018
+0x6150 = 0x901B
+0x6151 = 0x9028
+0x6152 = 0x9029
+0x6153 = 0x902F
+0x6154 = 0x902A
+0x6155 = 0x902C
+0x6156 = 0x902D
+0x6157 = 0x9033
+0x6158 = 0x9034
+0x6159 = 0x9037
+0x615A = 0x903F
+0x615B = 0x9043
+0x615C = 0x9044
+0x615D = 0x904C
+0x615E = 0x905B
+0x615F = 0x905D
+0x6160 = 0x9062
+0x6161 = 0x9066
+0x6162 = 0x9067
+0x6163 = 0x906C
+0x6164 = 0x9070
+0x6165 = 0x9074
+0x6166 = 0x9079
+0x6167 = 0x9085
+0x6168 = 0x9088
+0x6169 = 0x908B
+0x616A = 0x908C
+0x616B = 0x908E
+0x616C = 0x9090
+0x616D = 0x9095
+0x616E = 0x9097
+0x616F = 0x9098
+0x6170 = 0x9099
+0x6171 = 0x909B
+0x6172 = 0x90A0
+0x6173 = 0x90A1
+0x6174 = 0x90A2
+0x6175 = 0x90A5
+0x6176 = 0x90B0
+0x6177 = 0x90B2
+0x6178 = 0x90B3
+0x6179 = 0x90B4
+0x617A = 0x90B6
+0x617B = 0x90BD
+0x617C = 0x90CC
+0x617D = 0x90BE
+0x617E = 0x90C3
+0x6221 = 0x90C4
+0x6222 = 0x90C5
+0x6223 = 0x90C7
+0x6224 = 0x90C8
+0x6225 = 0x90D5
+0x6226 = 0x90D7
+0x6227 = 0x90D8
+0x6228 = 0x90D9
+0x6229 = 0x90DC
+0x622A = 0x90DD
+0x622B = 0x90DF
+0x622C = 0x90E5
+0x622D = 0x90D2
+0x622E = 0x90F6
+0x622F = 0x90EB
+0x6230 = 0x90EF
+0x6231 = 0x90F0
+0x6232 = 0x90F4
+0x6233 = 0x90FE
+0x6234 = 0x90FF
+0x6235 = 0x9100
+0x6236 = 0x9104
+0x6237 = 0x9105
+0x6238 = 0x9106
+0x6239 = 0x9108
+0x623A = 0x910D
+0x623B = 0x9110
+0x623C = 0x9114
+0x623D = 0x9116
+0x623E = 0x9117
+0x623F = 0x9118
+0x6240 = 0x911A
+0x6241 = 0x911C
+0x6242 = 0x911E
+0x6243 = 0x9120
+0x6244 = 0x9125
+0x6245 = 0x9122
+0x6246 = 0x9123
+0x6247 = 0x9127
+0x6248 = 0x9129
+0x6249 = 0x912E
+0x624A = 0x912F
+0x624B = 0x9131
+0x624C = 0x9134
+0x624D = 0x9136
+0x624E = 0x9137
+0x624F = 0x9139
+0x6250 = 0x913A
+0x6251 = 0x913C
+0x6252 = 0x913D
+0x6253 = 0x9143
+0x6254 = 0x9147
+0x6255 = 0x9148
+0x6256 = 0x914F
+0x6257 = 0x9153
+0x6258 = 0x9157
+0x6259 = 0x9159
+0x625A = 0x915A
+0x625B = 0x915B
+0x625C = 0x9161
+0x625D = 0x9164
+0x625E = 0x9167
+0x625F = 0x916D
+0x6260 = 0x9174
+0x6261 = 0x9179
+0x6262 = 0x917A
+0x6263 = 0x917B
+0x6264 = 0x9181
+0x6265 = 0x9183
+0x6266 = 0x9185
+0x6267 = 0x9186
+0x6268 = 0x918A
+0x6269 = 0x918E
+0x626A = 0x9191
+0x626B = 0x9193
+0x626C = 0x9194
+0x626D = 0x9195
+0x626E = 0x9198
+0x626F = 0x919E
+0x6270 = 0x91A1
+0x6271 = 0x91A6
+0x6272 = 0x91A8
+0x6273 = 0x91AC
+0x6274 = 0x91AD
+0x6275 = 0x91AE
+0x6276 = 0x91B0
+0x6277 = 0x91B1
+0x6278 = 0x91B2
+0x6279 = 0x91B3
+0x627A = 0x91B6
+0x627B = 0x91BB
+0x627C = 0x91BC
+0x627D = 0x91BD
+0x627E = 0x91BF
+0x6321 = 0x91C2
+0x6322 = 0x91C3
+0x6323 = 0x91C5
+0x6324 = 0x91D3
+0x6325 = 0x91D4
+0x6326 = 0x91D7
+0x6327 = 0x91D9
+0x6328 = 0x91DA
+0x6329 = 0x91DE
+0x632A = 0x91E4
+0x632B = 0x91E5
+0x632C = 0x91E9
+0x632D = 0x91EA
+0x632E = 0x91EC
+0x632F = 0x91ED
+0x6330 = 0x91EE
+0x6331 = 0x91EF
+0x6332 = 0x91F0
+0x6333 = 0x91F1
+0x6334 = 0x91F7
+0x6335 = 0x91F9
+0x6336 = 0x91FB
+0x6337 = 0x91FD
+0x6338 = 0x9200
+0x6339 = 0x9201
+0x633A = 0x9204
+0x633B = 0x9205
+0x633C = 0x9206
+0x633D = 0x9207
+0x633E = 0x9209
+0x633F = 0x920A
+0x6340 = 0x920C
+0x6341 = 0x9210
+0x6342 = 0x9212
+0x6343 = 0x9213
+0x6344 = 0x9216
+0x6345 = 0x9218
+0x6346 = 0x921C
+0x6347 = 0x921D
+0x6348 = 0x9223
+0x6349 = 0x9224
+0x634A = 0x9225
+0x634B = 0x9226
+0x634C = 0x9228
+0x634D = 0x922E
+0x634E = 0x922F
+0x634F = 0x9230
+0x6350 = 0x9233
+0x6351 = 0x9235
+0x6352 = 0x9236
+0x6353 = 0x9238
+0x6354 = 0x9239
+0x6355 = 0x923A
+0x6356 = 0x923C
+0x6357 = 0x923E
+0x6358 = 0x9240
+0x6359 = 0x9242
+0x635A = 0x9243
+0x635B = 0x9246
+0x635C = 0x9247
+0x635D = 0x924A
+0x635E = 0x924D
+0x635F = 0x924E
+0x6360 = 0x924F
+0x6361 = 0x9251
+0x6362 = 0x9258
+0x6363 = 0x9259
+0x6364 = 0x925C
+0x6365 = 0x925D
+0x6366 = 0x9260
+0x6367 = 0x9261
+0x6368 = 0x9265
+0x6369 = 0x9267
+0x636A = 0x9268
+0x636B = 0x9269
+0x636C = 0x926E
+0x636D = 0x926F
+0x636E = 0x9270
+0x636F = 0x9275
+0x6370 = 0x9276
+0x6371 = 0x9277
+0x6372 = 0x9278
+0x6373 = 0x9279
+0x6374 = 0x927B
+0x6375 = 0x927C
+0x6376 = 0x927D
+0x6377 = 0x927F
+0x6378 = 0x9288
+0x6379 = 0x9289
+0x637A = 0x928A
+0x637B = 0x928D
+0x637C = 0x928E
+0x637D = 0x9292
+0x637E = 0x9297
+0x6421 = 0x9299
+0x6422 = 0x929F
+0x6423 = 0x92A0
+0x6424 = 0x92A4
+0x6425 = 0x92A5
+0x6426 = 0x92A7
+0x6427 = 0x92A8
+0x6428 = 0x92AB
+0x6429 = 0x92AF
+0x642A = 0x92B2
+0x642B = 0x92B6
+0x642C = 0x92B8
+0x642D = 0x92BA
+0x642E = 0x92BB
+0x642F = 0x92BC
+0x6430 = 0x92BD
+0x6431 = 0x92BF
+0x6432 = 0x92C0
+0x6433 = 0x92C1
+0x6434 = 0x92C2
+0x6435 = 0x92C3
+0x6436 = 0x92C5
+0x6437 = 0x92C6
+0x6438 = 0x92C7
+0x6439 = 0x92C8
+0x643A = 0x92CB
+0x643B = 0x92CC
+0x643C = 0x92CD
+0x643D = 0x92CE
+0x643E = 0x92D0
+0x643F = 0x92D3
+0x6440 = 0x92D5
+0x6441 = 0x92D7
+0x6442 = 0x92D8
+0x6443 = 0x92D9
+0x6444 = 0x92DC
+0x6445 = 0x92DD
+0x6446 = 0x92DF
+0x6447 = 0x92E0
+0x6448 = 0x92E1
+0x6449 = 0x92E3
+0x644A = 0x92E5
+0x644B = 0x92E7
+0x644C = 0x92E8
+0x644D = 0x92EC
+0x644E = 0x92EE
+0x644F = 0x92F0
+0x6450 = 0x92F9
+0x6451 = 0x92FB
+0x6452 = 0x92FF
+0x6453 = 0x9300
+0x6454 = 0x9302
+0x6455 = 0x9308
+0x6456 = 0x930D
+0x6457 = 0x9311
+0x6458 = 0x9314
+0x6459 = 0x9315
+0x645A = 0x931C
+0x645B = 0x931D
+0x645C = 0x931E
+0x645D = 0x931F
+0x645E = 0x9321
+0x645F = 0x9324
+0x6460 = 0x9325
+0x6461 = 0x9327
+0x6462 = 0x9329
+0x6463 = 0x932A
+0x6464 = 0x9333
+0x6465 = 0x9334
+0x6466 = 0x9336
+0x6467 = 0x9337
+0x6468 = 0x9347
+0x6469 = 0x9348
+0x646A = 0x9349
+0x646B = 0x9350
+0x646C = 0x9351
+0x646D = 0x9352
+0x646E = 0x9355
+0x646F = 0x9357
+0x6470 = 0x9358
+0x6471 = 0x935A
+0x6472 = 0x935E
+0x6473 = 0x9364
+0x6474 = 0x9365
+0x6475 = 0x9367
+0x6476 = 0x9369
+0x6477 = 0x936A
+0x6478 = 0x936D
+0x6479 = 0x936F
+0x647A = 0x9370
+0x647B = 0x9371
+0x647C = 0x9373
+0x647D = 0x9374
+0x647E = 0x9376
+0x6521 = 0x937A
+0x6522 = 0x937D
+0x6523 = 0x937F
+0x6524 = 0x9380
+0x6525 = 0x9381
+0x6526 = 0x9382
+0x6527 = 0x9388
+0x6528 = 0x938A
+0x6529 = 0x938B
+0x652A = 0x938D
+0x652B = 0x938F
+0x652C = 0x9392
+0x652D = 0x9395
+0x652E = 0x9398
+0x652F = 0x939B
+0x6530 = 0x939E
+0x6531 = 0x93A1
+0x6532 = 0x93A3
+0x6533 = 0x93A4
+0x6534 = 0x93A6
+0x6535 = 0x93A8
+0x6536 = 0x93AB
+0x6537 = 0x93B4
+0x6538 = 0x93B5
+0x6539 = 0x93B6
+0x653A = 0x93BA
+0x653B = 0x93A9
+0x653C = 0x93C1
+0x653D = 0x93C4
+0x653E = 0x93C5
+0x653F = 0x93C6
+0x6540 = 0x93C7
+0x6541 = 0x93C9
+0x6542 = 0x93CA
+0x6543 = 0x93CB
+0x6544 = 0x93CC
+0x6545 = 0x93CD
+0x6546 = 0x93D3
+0x6547 = 0x93D9
+0x6548 = 0x93DC
+0x6549 = 0x93DE
+0x654A = 0x93DF
+0x654B = 0x93E2
+0x654C = 0x93E6
+0x654D = 0x93E7
+0x654E = 0x93F9
+0x654F = 0x93F7
+0x6550 = 0x93F8
+0x6551 = 0x93FA
+0x6552 = 0x93FB
+0x6553 = 0x93FD
+0x6554 = 0x9401
+0x6555 = 0x9402
+0x6556 = 0x9404
+0x6557 = 0x9408
+0x6558 = 0x9409
+0x6559 = 0x940D
+0x655A = 0x940E
+0x655B = 0x940F
+0x655C = 0x9415
+0x655D = 0x9416
+0x655E = 0x9417
+0x655F = 0x941F
+0x6560 = 0x942E
+0x6561 = 0x942F
+0x6562 = 0x9431
+0x6563 = 0x9432
+0x6564 = 0x9433
+0x6565 = 0x9434
+0x6566 = 0x943B
+0x6567 = 0x943F
+0x6568 = 0x943D
+0x6569 = 0x9443
+0x656A = 0x9445
+0x656B = 0x9448
+0x656C = 0x944A
+0x656D = 0x944C
+0x656E = 0x9455
+0x656F = 0x9459
+0x6570 = 0x945C
+0x6571 = 0x945F
+0x6572 = 0x9461
+0x6573 = 0x9463
+0x6574 = 0x9468
+0x6575 = 0x946B
+0x6576 = 0x946D
+0x6577 = 0x946E
+0x6578 = 0x946F
+0x6579 = 0x9471
+0x657A = 0x9472
+0x657B = 0x9484
+0x657C = 0x9483
+0x657D = 0x9578
+0x657E = 0x9579
+0x6621 = 0x957E
+0x6622 = 0x9584
+0x6623 = 0x9588
+0x6624 = 0x958C
+0x6625 = 0x958D
+0x6626 = 0x958E
+0x6627 = 0x959D
+0x6628 = 0x959E
+0x6629 = 0x959F
+0x662A = 0x95A1
+0x662B = 0x95A6
+0x662C = 0x95A9
+0x662D = 0x95AB
+0x662E = 0x95AC
+0x662F = 0x95B4
+0x6630 = 0x95B6
+0x6631 = 0x95BA
+0x6632 = 0x95BD
+0x6633 = 0x95BF
+0x6634 = 0x95C6
+0x6635 = 0x95C8
+0x6636 = 0x95C9
+0x6637 = 0x95CB
+0x6638 = 0x95D0
+0x6639 = 0x95D1
+0x663A = 0x95D2
+0x663B = 0x95D3
+0x663C = 0x95D9
+0x663D = 0x95DA
+0x663E = 0x95DD
+0x663F = 0x95DE
+0x6640 = 0x95DF
+0x6641 = 0x95E0
+0x6642 = 0x95E4
+0x6643 = 0x95E6
+0x6644 = 0x961D
+0x6645 = 0x961E
+0x6646 = 0x9622
+0x6647 = 0x9624
+0x6648 = 0x9625
+0x6649 = 0x9626
+0x664A = 0x962C
+0x664B = 0x9631
+0x664C = 0x9633
+0x664D = 0x9637
+0x664E = 0x9638
+0x664F = 0x9639
+0x6650 = 0x963A
+0x6651 = 0x963C
+0x6652 = 0x963D
+0x6653 = 0x9641
+0x6654 = 0x9652
+0x6655 = 0x9654
+0x6656 = 0x9656
+0x6657 = 0x9657
+0x6658 = 0x9658
+0x6659 = 0x9661
+0x665A = 0x966E
+0x665B = 0x9674
+0x665C = 0x967B
+0x665D = 0x967C
+0x665E = 0x967E
+0x665F = 0x967F
+0x6660 = 0x9681
+0x6661 = 0x9682
+0x6662 = 0x9683
+0x6663 = 0x9684
+0x6664 = 0x9689
+0x6665 = 0x9691
+0x6666 = 0x9696
+0x6667 = 0x969A
+0x6668 = 0x969D
+0x6669 = 0x969F
+0x666A = 0x96A4
+0x666B = 0x96A5
+0x666C = 0x96A6
+0x666D = 0x96A9
+0x666E = 0x96AE
+0x666F = 0x96AF
+0x6670 = 0x96B3
+0x6671 = 0x96BA
+0x6672 = 0x96CA
+0x6673 = 0x96D2
+0x6674 = 0x5DB2
+0x6675 = 0x96D8
+0x6676 = 0x96DA
+0x6677 = 0x96DD
+0x6678 = 0x96DE
+0x6679 = 0x96DF
+0x667A = 0x96E9
+0x667B = 0x96EF
+0x667C = 0x96F1
+0x667D = 0x96FA
+0x667E = 0x9702
+0x6721 = 0x9703
+0x6722 = 0x9705
+0x6723 = 0x9709
+0x6724 = 0x971A
+0x6725 = 0x971B
+0x6726 = 0x971D
+0x6727 = 0x9721
+0x6728 = 0x9722
+0x6729 = 0x9723
+0x672A = 0x9728
+0x672B = 0x9731
+0x672C = 0x9733
+0x672D = 0x9741
+0x672E = 0x9743
+0x672F = 0x974A
+0x6730 = 0x974E
+0x6731 = 0x974F
+0x6732 = 0x9755
+0x6733 = 0x9757
+0x6734 = 0x9758
+0x6735 = 0x975A
+0x6736 = 0x975B
+0x6737 = 0x9763
+0x6738 = 0x9767
+0x6739 = 0x976A
+0x673A = 0x976E
+0x673B = 0x9773
+0x673C = 0x9776
+0x673D = 0x9777
+0x673E = 0x9778
+0x673F = 0x977B
+0x6740 = 0x977D
+0x6741 = 0x977F
+0x6742 = 0x9780
+0x6743 = 0x9789
+0x6744 = 0x9795
+0x6745 = 0x9796
+0x6746 = 0x9797
+0x6747 = 0x9799
+0x6748 = 0x979A
+0x6749 = 0x979E
+0x674A = 0x979F
+0x674B = 0x97A2
+0x674C = 0x97AC
+0x674D = 0x97AE
+0x674E = 0x97B1
+0x674F = 0x97B2
+0x6750 = 0x97B5
+0x6751 = 0x97B6
+0x6752 = 0x97B8
+0x6753 = 0x97B9
+0x6754 = 0x97BA
+0x6755 = 0x97BC
+0x6756 = 0x97BE
+0x6757 = 0x97BF
+0x6758 = 0x97C1
+0x6759 = 0x97C4
+0x675A = 0x97C5
+0x675B = 0x97C7
+0x675C = 0x97C9
+0x675D = 0x97CA
+0x675E = 0x97CC
+0x675F = 0x97CD
+0x6760 = 0x97CE
+0x6761 = 0x97D0
+0x6762 = 0x97D1
+0x6763 = 0x97D4
+0x6764 = 0x97D7
+0x6765 = 0x97D8
+0x6766 = 0x97D9
+0x6767 = 0x97DD
+0x6768 = 0x97DE
+0x6769 = 0x97E0
+0x676A = 0x97DB
+0x676B = 0x97E1
+0x676C = 0x97E4
+0x676D = 0x97EF
+0x676E = 0x97F1
+0x676F = 0x97F4
+0x6770 = 0x97F7
+0x6771 = 0x97F8
+0x6772 = 0x97FA
+0x6773 = 0x9807
+0x6774 = 0x980A
+0x6775 = 0x9819
+0x6776 = 0x980D
+0x6777 = 0x980E
+0x6778 = 0x9814
+0x6779 = 0x9816
+0x677A = 0x981C
+0x677B = 0x981E
+0x677C = 0x9820
+0x677D = 0x9823
+0x677E = 0x9826
+0x6821 = 0x982B
+0x6822 = 0x982E
+0x6823 = 0x982F
+0x6824 = 0x9830
+0x6825 = 0x9832
+0x6826 = 0x9833
+0x6827 = 0x9835
+0x6828 = 0x9825
+0x6829 = 0x983E
+0x682A = 0x9844
+0x682B = 0x9847
+0x682C = 0x984A
+0x682D = 0x9851
+0x682E = 0x9852
+0x682F = 0x9853
+0x6830 = 0x9856
+0x6831 = 0x9857
+0x6832 = 0x9859
+0x6833 = 0x985A
+0x6834 = 0x9862
+0x6835 = 0x9863
+0x6836 = 0x9865
+0x6837 = 0x9866
+0x6838 = 0x986A
+0x6839 = 0x986C
+0x683A = 0x98AB
+0x683B = 0x98AD
+0x683C = 0x98AE
+0x683D = 0x98B0
+0x683E = 0x98B4
+0x683F = 0x98B7
+0x6840 = 0x98B8
+0x6841 = 0x98BA
+0x6842 = 0x98BB
+0x6843 = 0x98BF
+0x6844 = 0x98C2
+0x6845 = 0x98C5
+0x6846 = 0x98C8
+0x6847 = 0x98CC
+0x6848 = 0x98E1
+0x6849 = 0x98E3
+0x684A = 0x98E5
+0x684B = 0x98E6
+0x684C = 0x98E7
+0x684D = 0x98EA
+0x684E = 0x98F3
+0x684F = 0x98F6
+0x6850 = 0x9902
+0x6851 = 0x9907
+0x6852 = 0x9908
+0x6853 = 0x9911
+0x6854 = 0x9915
+0x6855 = 0x9916
+0x6856 = 0x9917
+0x6857 = 0x991A
+0x6858 = 0x991B
+0x6859 = 0x991C
+0x685A = 0x991F
+0x685B = 0x9922
+0x685C = 0x9926
+0x685D = 0x9927
+0x685E = 0x992B
+0x685F = 0x9931
+0x6860 = 0x9932
+0x6861 = 0x9933
+0x6862 = 0x9934
+0x6863 = 0x9935
+0x6864 = 0x9939
+0x6865 = 0x993A
+0x6866 = 0x993B
+0x6867 = 0x993C
+0x6868 = 0x9940
+0x6869 = 0x9941
+0x686A = 0x9946
+0x686B = 0x9947
+0x686C = 0x9948
+0x686D = 0x994D
+0x686E = 0x994E
+0x686F = 0x9954
+0x6870 = 0x9958
+0x6871 = 0x9959
+0x6872 = 0x995B
+0x6873 = 0x995C
+0x6874 = 0x995E
+0x6875 = 0x995F
+0x6876 = 0x9960
+0x6877 = 0x999B
+0x6878 = 0x999D
+0x6879 = 0x999F
+0x687A = 0x99A6
+0x687B = 0x99B0
+0x687C = 0x99B1
+0x687D = 0x99B2
+0x687E = 0x99B5
+0x6921 = 0x99B9
+0x6922 = 0x99BA
+0x6923 = 0x99BD
+0x6924 = 0x99BF
+0x6925 = 0x99C3
+0x6926 = 0x99C9
+0x6927 = 0x99D3
+0x6928 = 0x99D4
+0x6929 = 0x99D9
+0x692A = 0x99DA
+0x692B = 0x99DC
+0x692C = 0x99DE
+0x692D = 0x99E7
+0x692E = 0x99EA
+0x692F = 0x99EB
+0x6930 = 0x99EC
+0x6931 = 0x99F0
+0x6932 = 0x99F4
+0x6933 = 0x99F5
+0x6934 = 0x99F9
+0x6935 = 0x99FD
+0x6936 = 0x99FE
+0x6937 = 0x9A02
+0x6938 = 0x9A03
+0x6939 = 0x9A04
+0x693A = 0x9A0B
+0x693B = 0x9A0C
+0x693C = 0x9A10
+0x693D = 0x9A11
+0x693E = 0x9A16
+0x693F = 0x9A1E
+0x6940 = 0x9A20
+0x6941 = 0x9A22
+0x6942 = 0x9A23
+0x6943 = 0x9A24
+0x6944 = 0x9A27
+0x6945 = 0x9A2D
+0x6946 = 0x9A2E
+0x6947 = 0x9A33
+0x6948 = 0x9A35
+0x6949 = 0x9A36
+0x694A = 0x9A38
+0x694B = 0x9A47
+0x694C = 0x9A41
+0x694D = 0x9A44
+0x694E = 0x9A4A
+0x694F = 0x9A4B
+0x6950 = 0x9A4C
+0x6951 = 0x9A4E
+0x6952 = 0x9A51
+0x6953 = 0x9A54
+0x6954 = 0x9A56
+0x6955 = 0x9A5D
+0x6956 = 0x9AAA
+0x6957 = 0x9AAC
+0x6958 = 0x9AAE
+0x6959 = 0x9AAF
+0x695A = 0x9AB2
+0x695B = 0x9AB4
+0x695C = 0x9AB5
+0x695D = 0x9AB6
+0x695E = 0x9AB9
+0x695F = 0x9ABB
+0x6960 = 0x9ABE
+0x6961 = 0x9ABF
+0x6962 = 0x9AC1
+0x6963 = 0x9AC3
+0x6964 = 0x9AC6
+0x6965 = 0x9AC8
+0x6966 = 0x9ACE
+0x6967 = 0x9AD0
+0x6968 = 0x9AD2
+0x6969 = 0x9AD5
+0x696A = 0x9AD6
+0x696B = 0x9AD7
+0x696C = 0x9ADB
+0x696D = 0x9ADC
+0x696E = 0x9AE0
+0x696F = 0x9AE4
+0x6970 = 0x9AE5
+0x6971 = 0x9AE7
+0x6972 = 0x9AE9
+0x6973 = 0x9AEC
+0x6974 = 0x9AF2
+0x6975 = 0x9AF3
+0x6976 = 0x9AF5
+0x6977 = 0x9AF9
+0x6978 = 0x9AFA
+0x6979 = 0x9AFD
+0x697A = 0x9AFF
+0x697B = 0x9B00
+0x697C = 0x9B01
+0x697D = 0x9B02
+0x697E = 0x9B03
+0x6A21 = 0x9B04
+0x6A22 = 0x9B05
+0x6A23 = 0x9B08
+0x6A24 = 0x9B09
+0x6A25 = 0x9B0B
+0x6A26 = 0x9B0C
+0x6A27 = 0x9B0D
+0x6A28 = 0x9B0E
+0x6A29 = 0x9B10
+0x6A2A = 0x9B12
+0x6A2B = 0x9B16
+0x6A2C = 0x9B19
+0x6A2D = 0x9B1B
+0x6A2E = 0x9B1C
+0x6A2F = 0x9B20
+0x6A30 = 0x9B26
+0x6A31 = 0x9B2B
+0x6A32 = 0x9B2D
+0x6A33 = 0x9B33
+0x6A34 = 0x9B34
+0x6A35 = 0x9B35
+0x6A36 = 0x9B37
+0x6A37 = 0x9B39
+0x6A38 = 0x9B3A
+0x6A39 = 0x9B3D
+0x6A3A = 0x9B48
+0x6A3B = 0x9B4B
+0x6A3C = 0x9B4C
+0x6A3D = 0x9B55
+0x6A3E = 0x9B56
+0x6A3F = 0x9B57
+0x6A40 = 0x9B5B
+0x6A41 = 0x9B5E
+0x6A42 = 0x9B61
+0x6A43 = 0x9B63
+0x6A44 = 0x9B65
+0x6A45 = 0x9B66
+0x6A46 = 0x9B68
+0x6A47 = 0x9B6A
+0x6A48 = 0x9B6B
+0x6A49 = 0x9B6C
+0x6A4A = 0x9B6D
+0x6A4B = 0x9B6E
+0x6A4C = 0x9B73
+0x6A4D = 0x9B75
+0x6A4E = 0x9B77
+0x6A4F = 0x9B78
+0x6A50 = 0x9B79
+0x6A51 = 0x9B7F
+0x6A52 = 0x9B80
+0x6A53 = 0x9B84
+0x6A54 = 0x9B85
+0x6A55 = 0x9B86
+0x6A56 = 0x9B87
+0x6A57 = 0x9B89
+0x6A58 = 0x9B8A
+0x6A59 = 0x9B8B
+0x6A5A = 0x9B8D
+0x6A5B = 0x9B8F
+0x6A5C = 0x9B90
+0x6A5D = 0x9B94
+0x6A5E = 0x9B9A
+0x6A5F = 0x9B9D
+0x6A60 = 0x9B9E
+0x6A61 = 0x9BA6
+0x6A62 = 0x9BA7
+0x6A63 = 0x9BA9
+0x6A64 = 0x9BAC
+0x6A65 = 0x9BB0
+0x6A66 = 0x9BB1
+0x6A67 = 0x9BB2
+0x6A68 = 0x9BB7
+0x6A69 = 0x9BB8
+0x6A6A = 0x9BBB
+0x6A6B = 0x9BBC
+0x6A6C = 0x9BBE
+0x6A6D = 0x9BBF
+0x6A6E = 0x9BC1
+0x6A6F = 0x9BC7
+0x6A70 = 0x9BC8
+0x6A71 = 0x9BCE
+0x6A72 = 0x9BD0
+0x6A73 = 0x9BD7
+0x6A74 = 0x9BD8
+0x6A75 = 0x9BDD
+0x6A76 = 0x9BDF
+0x6A77 = 0x9BE5
+0x6A78 = 0x9BE7
+0x6A79 = 0x9BEA
+0x6A7A = 0x9BEB
+0x6A7B = 0x9BEF
+0x6A7C = 0x9BF3
+0x6A7D = 0x9BF7
+0x6A7E = 0x9BF8
+0x6B21 = 0x9BF9
+0x6B22 = 0x9BFA
+0x6B23 = 0x9BFD
+0x6B24 = 0x9BFF
+0x6B25 = 0x9C00
+0x6B26 = 0x9C02
+0x6B27 = 0x9C0B
+0x6B28 = 0x9C0F
+0x6B29 = 0x9C11
+0x6B2A = 0x9C16
+0x6B2B = 0x9C18
+0x6B2C = 0x9C19
+0x6B2D = 0x9C1A
+0x6B2E = 0x9C1C
+0x6B2F = 0x9C1E
+0x6B30 = 0x9C22
+0x6B31 = 0x9C23
+0x6B32 = 0x9C26
+0x6B33 = 0x9C27
+0x6B34 = 0x9C28
+0x6B35 = 0x9C29
+0x6B36 = 0x9C2A
+0x6B37 = 0x9C31
+0x6B38 = 0x9C35
+0x6B39 = 0x9C36
+0x6B3A = 0x9C37
+0x6B3B = 0x9C3D
+0x6B3C = 0x9C41
+0x6B3D = 0x9C43
+0x6B3E = 0x9C44
+0x6B3F = 0x9C45
+0x6B40 = 0x9C49
+0x6B41 = 0x9C4A
+0x6B42 = 0x9C4E
+0x6B43 = 0x9C4F
+0x6B44 = 0x9C50
+0x6B45 = 0x9C53
+0x6B46 = 0x9C54
+0x6B47 = 0x9C56
+0x6B48 = 0x9C58
+0x6B49 = 0x9C5B
+0x6B4A = 0x9C5D
+0x6B4B = 0x9C5E
+0x6B4C = 0x9C5F
+0x6B4D = 0x9C63
+0x6B4E = 0x9C69
+0x6B4F = 0x9C6A
+0x6B50 = 0x9C5C
+0x6B51 = 0x9C6B
+0x6B52 = 0x9C68
+0x6B53 = 0x9C6E
+0x6B54 = 0x9C70
+0x6B55 = 0x9C72
+0x6B56 = 0x9C75
+0x6B57 = 0x9C77
+0x6B58 = 0x9C7B
+0x6B59 = 0x9CE6
+0x6B5A = 0x9CF2
+0x6B5B = 0x9CF7
+0x6B5C = 0x9CF9
+0x6B5D = 0x9D0B
+0x6B5E = 0x9D02
+0x6B5F = 0x9D11
+0x6B60 = 0x9D17
+0x6B61 = 0x9D18
+0x6B62 = 0x9D1C
+0x6B63 = 0x9D1D
+0x6B64 = 0x9D1E
+0x6B65 = 0x9D2F
+0x6B66 = 0x9D30
+0x6B67 = 0x9D32
+0x6B68 = 0x9D33
+0x6B69 = 0x9D34
+0x6B6A = 0x9D3A
+0x6B6B = 0x9D3C
+0x6B6C = 0x9D45
+0x6B6D = 0x9D3D
+0x6B6E = 0x9D42
+0x6B6F = 0x9D43
+0x6B70 = 0x9D47
+0x6B71 = 0x9D4A
+0x6B72 = 0x9D53
+0x6B73 = 0x9D54
+0x6B74 = 0x9D5F
+0x6B75 = 0x9D63
+0x6B76 = 0x9D62
+0x6B77 = 0x9D65
+0x6B78 = 0x9D69
+0x6B79 = 0x9D6A
+0x6B7A = 0x9D6B
+0x6B7B = 0x9D70
+0x6B7C = 0x9D76
+0x6B7D = 0x9D77
+0x6B7E = 0x9D7B
+0x6C21 = 0x9D7C
+0x6C22 = 0x9D7E
+0x6C23 = 0x9D83
+0x6C24 = 0x9D84
+0x6C25 = 0x9D86
+0x6C26 = 0x9D8A
+0x6C27 = 0x9D8D
+0x6C28 = 0x9D8E
+0x6C29 = 0x9D92
+0x6C2A = 0x9D93
+0x6C2B = 0x9D95
+0x6C2C = 0x9D96
+0x6C2D = 0x9D97
+0x6C2E = 0x9D98
+0x6C2F = 0x9DA1
+0x6C30 = 0x9DAA
+0x6C31 = 0x9DAC
+0x6C32 = 0x9DAE
+0x6C33 = 0x9DB1
+0x6C34 = 0x9DB5
+0x6C35 = 0x9DB9
+0x6C36 = 0x9DBC
+0x6C37 = 0x9DBF
+0x6C38 = 0x9DC3
+0x6C39 = 0x9DC7
+0x6C3A = 0x9DC9
+0x6C3B = 0x9DCA
+0x6C3C = 0x9DD4
+0x6C3D = 0x9DD5
+0x6C3E = 0x9DD6
+0x6C3F = 0x9DD7
+0x6C40 = 0x9DDA
+0x6C41 = 0x9DDE
+0x6C42 = 0x9DDF
+0x6C43 = 0x9DE0
+0x6C44 = 0x9DE5
+0x6C45 = 0x9DE7
+0x6C46 = 0x9DE9
+0x6C47 = 0x9DEB
+0x6C48 = 0x9DEE
+0x6C49 = 0x9DF0
+0x6C4A = 0x9DF3
+0x6C4B = 0x9DF4
+0x6C4C = 0x9DFE
+0x6C4D = 0x9E0A
+0x6C4E = 0x9E02
+0x6C4F = 0x9E07
+0x6C50 = 0x9E0E
+0x6C51 = 0x9E10
+0x6C52 = 0x9E11
+0x6C53 = 0x9E12
+0x6C54 = 0x9E15
+0x6C55 = 0x9E16
+0x6C56 = 0x9E19
+0x6C57 = 0x9E1C
+0x6C58 = 0x9E1D
+0x6C59 = 0x9E7A
+0x6C5A = 0x9E7B
+0x6C5B = 0x9E7C
+0x6C5C = 0x9E80
+0x6C5D = 0x9E82
+0x6C5E = 0x9E83
+0x6C5F = 0x9E84
+0x6C60 = 0x9E85
+0x6C61 = 0x9E87
+0x6C62 = 0x9E8E
+0x6C63 = 0x9E8F
+0x6C64 = 0x9E96
+0x6C65 = 0x9E98
+0x6C66 = 0x9E9B
+0x6C67 = 0x9E9E
+0x6C68 = 0x9EA4
+0x6C69 = 0x9EA8
+0x6C6A = 0x9EAC
+0x6C6B = 0x9EAE
+0x6C6C = 0x9EAF
+0x6C6D = 0x9EB0
+0x6C6E = 0x9EB3
+0x6C6F = 0x9EB4
+0x6C70 = 0x9EB5
+0x6C71 = 0x9EC6
+0x6C72 = 0x9EC8
+0x6C73 = 0x9ECB
+0x6C74 = 0x9ED5
+0x6C75 = 0x9EDF
+0x6C76 = 0x9EE4
+0x6C77 = 0x9EE7
+0x6C78 = 0x9EEC
+0x6C79 = 0x9EED
+0x6C7A = 0x9EEE
+0x6C7B = 0x9EF0
+0x6C7C = 0x9EF1
+0x6C7D = 0x9EF2
+0x6C7E = 0x9EF5
+0x6D21 = 0x9EF8
+0x6D22 = 0x9EFF
+0x6D23 = 0x9F02
+0x6D24 = 0x9F03
+0x6D25 = 0x9F09
+0x6D26 = 0x9F0F
+0x6D27 = 0x9F10
+0x6D28 = 0x9F11
+0x6D29 = 0x9F12
+0x6D2A = 0x9F14
+0x6D2B = 0x9F16
+0x6D2C = 0x9F17
+0x6D2D = 0x9F19
+0x6D2E = 0x9F1A
+0x6D2F = 0x9F1B
+0x6D30 = 0x9F1F
+0x6D31 = 0x9F22
+0x6D32 = 0x9F26
+0x6D33 = 0x9F2A
+0x6D34 = 0x9F2B
+0x6D35 = 0x9F2F
+0x6D36 = 0x9F31
+0x6D37 = 0x9F32
+0x6D38 = 0x9F34
+0x6D39 = 0x9F37
+0x6D3A = 0x9F39
+0x6D3B = 0x9F3A
+0x6D3C = 0x9F3C
+0x6D3D = 0x9F3D
+0x6D3E = 0x9F3F
+0x6D3F = 0x9F41
+0x6D40 = 0x9F43
+0x6D41 = 0x9F44
+0x6D42 = 0x9F45
+0x6D43 = 0x9F46
+0x6D44 = 0x9F47
+0x6D45 = 0x9F53
+0x6D46 = 0x9F55
+0x6D47 = 0x9F56
+0x6D48 = 0x9F57
+0x6D49 = 0x9F58
+0x6D4A = 0x9F5A
+0x6D4B = 0x9F5D
+0x6D4C = 0x9F5E
+0x6D4D = 0x9F68
+0x6D4E = 0x9F69
+0x6D4F = 0x9F6D
+0x6D50 = 0x9F6E
+0x6D51 = 0x9F6F
+0x6D52 = 0x9F70
+0x6D53 = 0x9F71
+0x6D54 = 0x9F73
+0x6D55 = 0x9F75
+0x6D56 = 0x9F7A
+0x6D57 = 0x9F7D
+0x6D58 = 0x9F8F
+0x6D59 = 0x9F90
+0x6D5A = 0x9F91
+0x6D5B = 0x9F92
+0x6D5C = 0x9F94
+0x6D5D = 0x9F96
+0x6D5E = 0x9F97
+0x6D5F = 0x9F9E
+0x6D60 = 0x9FA1
+0x6D61 = 0x9FA2
+0x6D62 = 0x9FA3
+0x6D63 = 0x9FA5
+END_MAP
diff --git a/enc/trans/JIS/JISX0212@MS%UCS.src b/enc/trans/JIS/JISX0212@MS%UCS.src
new file mode 100644
index 0000000000..cd05e26d3a
--- /dev/null
+++ b/enc/trans/JIS/JISX0212@MS%UCS.src
@@ -0,0 +1,6081 @@
+# $NetBSD: JISX0212@MS%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0212:MS/UCS"
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	ILSEQ
+DST_ILSEQ	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x222F = 0x02D8
+0x2230 = 0x02C7
+0x2231 = 0x00B8
+0x2232 = 0x02D9
+0x2233 = 0x02DD
+0x2234 = 0x00AF
+0x2235 = 0x02DB
+0x2236 = 0x02DA
+0x2237 = 0xFF5E
+0x2238 = 0x0384
+0x2239 = 0x0385
+0x2242 = 0x00A1
+0x2243 = 0xFFE4
+0x2244 = 0x00BF
+0x226B = 0x00BA
+0x226C = 0x00AA
+0x226D = 0x00A9
+0x226E = 0x00AE
+0x226F = 0x2122
+0x2270 = 0x00A4
+0x2271 = 0x2116
+0x2661 = 0x0386
+0x2662 = 0x0388
+0x2663 = 0x0389
+0x2664 = 0x038A
+0x2665 = 0x03AA
+0x2667 = 0x038C
+0x2669 = 0x038E
+0x266A = 0x03AB
+0x266C = 0x038F
+0x2671 = 0x03AC
+0x2672 = 0x03AD
+0x2673 = 0x03AE
+0x2674 = 0x03AF
+0x2675 = 0x03CA
+0x2676 = 0x0390
+0x2677 = 0x03CC
+0x2678 = 0x03C2
+0x2679 = 0x03CD
+0x267A = 0x03CB
+0x267B = 0x03B0
+0x267C = 0x03CE
+0x2742 = 0x0402
+0x2743 = 0x0403
+0x2744 = 0x0404
+0x2745 = 0x0405
+0x2746 = 0x0406
+0x2747 = 0x0407
+0x2748 = 0x0408
+0x2749 = 0x0409
+0x274A = 0x040A
+0x274B = 0x040B
+0x274C = 0x040C
+0x274D = 0x040E
+0x274E = 0x040F
+0x2772 = 0x0452
+0x2773 = 0x0453
+0x2774 = 0x0454
+0x2775 = 0x0455
+0x2776 = 0x0456
+0x2777 = 0x0457
+0x2778 = 0x0458
+0x2779 = 0x0459
+0x277A = 0x045A
+0x277B = 0x045B
+0x277C = 0x045C
+0x277D = 0x045E
+0x277E = 0x045F
+0x2921 = 0x00C6
+0x2922 = 0x0110
+0x2924 = 0x0126
+0x2926 = 0x0132
+0x2928 = 0x0141
+0x2929 = 0x013F
+0x292B = 0x014A
+0x292C = 0x00D8
+0x292D = 0x0152
+0x292F = 0x0166
+0x2930 = 0x00DE
+0x2941 = 0x00E6
+0x2942 = 0x0111
+0x2943 = 0x00F0
+0x2944 = 0x0127
+0x2945 = 0x0131
+0x2946 = 0x0133
+0x2947 = 0x0138
+0x2948 = 0x0142
+0x2949 = 0x0140
+0x294A = 0x0149
+0x294B = 0x014B
+0x294C = 0x00F8
+0x294D = 0x0153
+0x294E = 0x00DF
+0x294F = 0x0167
+0x2950 = 0x00FE
+0x2A21 = 0x00C1
+0x2A22 = 0x00C0
+0x2A23 = 0x00C4
+0x2A24 = 0x00C2
+0x2A25 = 0x0102
+0x2A26 = 0x01CD
+0x2A27 = 0x0100
+0x2A28 = 0x0104
+0x2A29 = 0x00C5
+0x2A2A = 0x00C3
+0x2A2B = 0x0106
+0x2A2C = 0x0108
+0x2A2D = 0x010C
+0x2A2E = 0x00C7
+0x2A2F = 0x010A
+0x2A30 = 0x010E
+0x2A31 = 0x00C9
+0x2A32 = 0x00C8
+0x2A33 = 0x00CB
+0x2A34 = 0x00CA
+0x2A35 = 0x011A
+0x2A36 = 0x0116
+0x2A37 = 0x0112
+0x2A38 = 0x0118
+0x2A3A = 0x011C
+0x2A3B = 0x011E
+0x2A3C = 0x0122
+0x2A3D = 0x0120
+0x2A3E = 0x0124
+0x2A3F = 0x00CD
+0x2A40 = 0x00CC
+0x2A41 = 0x00CF
+0x2A42 = 0x00CE
+0x2A43 = 0x01CF
+0x2A44 = 0x0130
+0x2A45 = 0x012A
+0x2A46 = 0x012E
+0x2A47 = 0x0128
+0x2A48 = 0x0134
+0x2A49 = 0x0136
+0x2A4A = 0x0139
+0x2A4B = 0x013D
+0x2A4C = 0x013B
+0x2A4D = 0x0143
+0x2A4E = 0x0147
+0x2A4F = 0x0145
+0x2A50 = 0x00D1
+0x2A51 = 0x00D3
+0x2A52 = 0x00D2
+0x2A53 = 0x00D6
+0x2A54 = 0x00D4
+0x2A55 = 0x01D1
+0x2A56 = 0x0150
+0x2A57 = 0x014C
+0x2A58 = 0x00D5
+0x2A59 = 0x0154
+0x2A5A = 0x0158
+0x2A5B = 0x0156
+0x2A5C = 0x015A
+0x2A5D = 0x015C
+0x2A5E = 0x0160
+0x2A5F = 0x015E
+0x2A60 = 0x0164
+0x2A61 = 0x0162
+0x2A62 = 0x00DA
+0x2A63 = 0x00D9
+0x2A64 = 0x00DC
+0x2A65 = 0x00DB
+0x2A66 = 0x016C
+0x2A67 = 0x01D3
+0x2A68 = 0x0170
+0x2A69 = 0x016A
+0x2A6A = 0x0172
+0x2A6B = 0x016E
+0x2A6C = 0x0168
+0x2A6D = 0x01D7
+0x2A6E = 0x01DB
+0x2A6F = 0x01D9
+0x2A70 = 0x01D5
+0x2A71 = 0x0174
+0x2A72 = 0x00DD
+0x2A73 = 0x0178
+0x2A74 = 0x0176
+0x2A75 = 0x0179
+0x2A76 = 0x017D
+0x2A77 = 0x017B
+0x2B21 = 0x00E1
+0x2B22 = 0x00E0
+0x2B23 = 0x00E4
+0x2B24 = 0x00E2
+0x2B25 = 0x0103
+0x2B26 = 0x01CE
+0x2B27 = 0x0101
+0x2B28 = 0x0105
+0x2B29 = 0x00E5
+0x2B2A = 0x00E3
+0x2B2B = 0x0107
+0x2B2C = 0x0109
+0x2B2D = 0x010D
+0x2B2E = 0x00E7
+0x2B2F = 0x010B
+0x2B30 = 0x010F
+0x2B31 = 0x00E9
+0x2B32 = 0x00E8
+0x2B33 = 0x00EB
+0x2B34 = 0x00EA
+0x2B35 = 0x011B
+0x2B36 = 0x0117
+0x2B37 = 0x0113
+0x2B38 = 0x0119
+0x2B39 = 0x01F5
+0x2B3A = 0x011D
+0x2B3B = 0x011F
+0x2B3D = 0x0121
+0x2B3E = 0x0125
+0x2B3F = 0x00ED
+0x2B40 = 0x00EC
+0x2B41 = 0x00EF
+0x2B42 = 0x00EE
+0x2B43 = 0x01D0
+0x2B45 = 0x012B
+0x2B46 = 0x012F
+0x2B47 = 0x0129
+0x2B48 = 0x0135
+0x2B49 = 0x0137
+0x2B4A = 0x013A
+0x2B4B = 0x013E
+0x2B4C = 0x013C
+0x2B4D = 0x0144
+0x2B4E = 0x0148
+0x2B4F = 0x0146
+0x2B50 = 0x00F1
+0x2B51 = 0x00F3
+0x2B52 = 0x00F2
+0x2B53 = 0x00F6
+0x2B54 = 0x00F4
+0x2B55 = 0x01D2
+0x2B56 = 0x0151
+0x2B57 = 0x014D
+0x2B58 = 0x00F5
+0x2B59 = 0x0155
+0x2B5A = 0x0159
+0x2B5B = 0x0157
+0x2B5C = 0x015B
+0x2B5D = 0x015D
+0x2B5E = 0x0161
+0x2B5F = 0x015F
+0x2B60 = 0x0165
+0x2B61 = 0x0163
+0x2B62 = 0x00FA
+0x2B63 = 0x00F9
+0x2B64 = 0x00FC
+0x2B65 = 0x00FB
+0x2B66 = 0x016D
+0x2B67 = 0x01D4
+0x2B68 = 0x0171
+0x2B69 = 0x016B
+0x2B6A = 0x0173
+0x2B6B = 0x016F
+0x2B6C = 0x0169
+0x2B6D = 0x01D8
+0x2B6E = 0x01DC
+0x2B6F = 0x01DA
+0x2B70 = 0x01D6
+0x2B71 = 0x0175
+0x2B72 = 0x00FD
+0x2B73 = 0x00FF
+0x2B74 = 0x0177
+0x2B75 = 0x017A
+0x2B76 = 0x017E
+0x2B77 = 0x017C
+0x3021 = 0x4E02
+0x3022 = 0x4E04
+0x3023 = 0x4E05
+0x3024 = 0x4E0C
+0x3025 = 0x4E12
+0x3026 = 0x4E1F
+0x3027 = 0x4E23
+0x3028 = 0x4E24
+0x3029 = 0x4E28
+0x302A = 0x4E2B
+0x302B = 0x4E2E
+0x302C = 0x4E2F
+0x302D = 0x4E30
+0x302E = 0x4E35
+0x302F = 0x4E40
+0x3030 = 0x4E41
+0x3031 = 0x4E44
+0x3032 = 0x4E47
+0x3033 = 0x4E51
+0x3034 = 0x4E5A
+0x3035 = 0x4E5C
+0x3036 = 0x4E63
+0x3037 = 0x4E68
+0x3038 = 0x4E69
+0x3039 = 0x4E74
+0x303A = 0x4E75
+0x303B = 0x4E79
+0x303C = 0x4E7F
+0x303D = 0x4E8D
+0x303E = 0x4E96
+0x303F = 0x4E97
+0x3040 = 0x4E9D
+0x3041 = 0x4EAF
+0x3042 = 0x4EB9
+0x3043 = 0x4EC3
+0x3044 = 0x4ED0
+0x3045 = 0x4EDA
+0x3046 = 0x4EDB
+0x3047 = 0x4EE0
+0x3048 = 0x4EE1
+0x3049 = 0x4EE2
+0x304A = 0x4EE8
+0x304B = 0x4EEF
+0x304C = 0x4EF1
+0x304D = 0x4EF3
+0x304E = 0x4EF5
+0x304F = 0x4EFD
+0x3050 = 0x4EFE
+0x3051 = 0x4EFF
+0x3052 = 0x4F00
+0x3053 = 0x4F02
+0x3054 = 0x4F03
+0x3055 = 0x4F08
+0x3056 = 0x4F0B
+0x3057 = 0x4F0C
+0x3058 = 0x4F12
+0x3059 = 0x4F15
+0x305A = 0x4F16
+0x305B = 0x4F17
+0x305C = 0x4F19
+0x305D = 0x4F2E
+0x305E = 0x4F31
+0x305F = 0x4F60
+0x3060 = 0x4F33
+0x3061 = 0x4F35
+0x3062 = 0x4F37
+0x3063 = 0x4F39
+0x3064 = 0x4F3B
+0x3065 = 0x4F3E
+0x3066 = 0x4F40
+0x3067 = 0x4F42
+0x3068 = 0x4F48
+0x3069 = 0x4F49
+0x306A = 0x4F4B
+0x306B = 0x4F4C
+0x306C = 0x4F52
+0x306D = 0x4F54
+0x306E = 0x4F56
+0x306F = 0x4F58
+0x3070 = 0x4F5F
+0x3071 = 0x4F63
+0x3072 = 0x4F6A
+0x3073 = 0x4F6C
+0x3074 = 0x4F6E
+0x3075 = 0x4F71
+0x3076 = 0x4F77
+0x3077 = 0x4F78
+0x3078 = 0x4F79
+0x3079 = 0x4F7A
+0x307A = 0x4F7D
+0x307B = 0x4F7E
+0x307C = 0x4F81
+0x307D = 0x4F82
+0x307E = 0x4F84
+0x3121 = 0x4F85
+0x3122 = 0x4F89
+0x3123 = 0x4F8A
+0x3124 = 0x4F8C
+0x3125 = 0x4F8E
+0x3126 = 0x4F90
+0x3127 = 0x4F92
+0x3128 = 0x4F93
+0x3129 = 0x4F94
+0x312A = 0x4F97
+0x312B = 0x4F99
+0x312C = 0x4F9A
+0x312D = 0x4F9E
+0x312E = 0x4F9F
+0x312F = 0x4FB2
+0x3130 = 0x4FB7
+0x3131 = 0x4FB9
+0x3132 = 0x4FBB
+0x3133 = 0x4FBC
+0x3134 = 0x4FBD
+0x3135 = 0x4FBE
+0x3136 = 0x4FC0
+0x3137 = 0x4FC1
+0x3138 = 0x4FC5
+0x3139 = 0x4FC6
+0x313A = 0x4FC8
+0x313B = 0x4FC9
+0x313C = 0x4FCB
+0x313D = 0x4FCC
+0x313E = 0x4FCD
+0x313F = 0x4FCF
+0x3140 = 0x4FD2
+0x3141 = 0x4FDC
+0x3142 = 0x4FE0
+0x3143 = 0x4FE2
+0x3144 = 0x4FF0
+0x3145 = 0x4FF2
+0x3146 = 0x4FFC
+0x3147 = 0x4FFD
+0x3148 = 0x4FFF
+0x3149 = 0x5000
+0x314A = 0x5001
+0x314B = 0x5004
+0x314C = 0x5007
+0x314D = 0x500A
+0x314E = 0x500C
+0x314F = 0x500E
+0x3150 = 0x5010
+0x3151 = 0x5013
+0x3152 = 0x5017
+0x3153 = 0x5018
+0x3154 = 0x501B
+0x3155 = 0x501C
+0x3156 = 0x501D
+0x3157 = 0x501E
+0x3158 = 0x5022
+0x3159 = 0x5027
+0x315A = 0x502E
+0x315B = 0x5030
+0x315C = 0x5032
+0x315D = 0x5033
+0x315E = 0x5035
+0x315F = 0x5040
+0x3160 = 0x5041
+0x3161 = 0x5042
+0x3162 = 0x5045
+0x3163 = 0x5046
+0x3164 = 0x504A
+0x3165 = 0x504C
+0x3166 = 0x504E
+0x3167 = 0x5051
+0x3168 = 0x5052
+0x3169 = 0x5053
+0x316A = 0x5057
+0x316B = 0x5059
+0x316C = 0x505F
+0x316D = 0x5060
+0x316E = 0x5062
+0x316F = 0x5063
+0x3170 = 0x5066
+0x3171 = 0x5067
+0x3172 = 0x506A
+0x3173 = 0x506D
+0x3174 = 0x5070
+0x3175 = 0x5071
+0x3176 = 0x503B
+0x3177 = 0x5081
+0x3178 = 0x5083
+0x3179 = 0x5084
+0x317A = 0x5086
+0x317B = 0x508A
+0x317C = 0x508E
+0x317D = 0x508F
+0x317E = 0x5090
+0x3221 = 0x5092
+0x3222 = 0x5093
+0x3223 = 0x5094
+0x3224 = 0x5096
+0x3225 = 0x509B
+0x3226 = 0x509C
+0x3227 = 0x509E
+0x3228 = 0x509F
+0x3229 = 0x50A0
+0x322A = 0x50A1
+0x322B = 0x50A2
+0x322C = 0x50AA
+0x322D = 0x50AF
+0x322E = 0x50B0
+0x322F = 0x50B9
+0x3230 = 0x50BA
+0x3231 = 0x50BD
+0x3232 = 0x50C0
+0x3233 = 0x50C3
+0x3234 = 0x50C4
+0x3235 = 0x50C7
+0x3236 = 0x50CC
+0x3237 = 0x50CE
+0x3238 = 0x50D0
+0x3239 = 0x50D3
+0x323A = 0x50D4
+0x323B = 0x50D8
+0x323C = 0x50DC
+0x323D = 0x50DD
+0x323E = 0x50DF
+0x323F = 0x50E2
+0x3240 = 0x50E4
+0x3241 = 0x50E6
+0x3242 = 0x50E8
+0x3243 = 0x50E9
+0x3244 = 0x50EF
+0x3245 = 0x50F1
+0x3246 = 0x50F6
+0x3247 = 0x50FA
+0x3248 = 0x50FE
+0x3249 = 0x5103
+0x324A = 0x5106
+0x324B = 0x5107
+0x324C = 0x5108
+0x324D = 0x510B
+0x324E = 0x510C
+0x324F = 0x510D
+0x3250 = 0x510E
+0x3251 = 0x50F2
+0x3252 = 0x5110
+0x3253 = 0x5117
+0x3254 = 0x5119
+0x3255 = 0x511B
+0x3256 = 0x511C
+0x3257 = 0x511D
+0x3258 = 0x511E
+0x3259 = 0x5123
+0x325A = 0x5127
+0x325B = 0x5128
+0x325C = 0x512C
+0x325D = 0x512D
+0x325E = 0x512F
+0x325F = 0x5131
+0x3260 = 0x5133
+0x3261 = 0x5134
+0x3262 = 0x5135
+0x3263 = 0x5138
+0x3264 = 0x5139
+0x3265 = 0x5142
+0x3266 = 0x514A
+0x3267 = 0x514F
+0x3268 = 0x5153
+0x3269 = 0x5155
+0x326A = 0x5157
+0x326B = 0x5158
+0x326C = 0x515F
+0x326D = 0x5164
+0x326E = 0x5166
+0x326F = 0x517E
+0x3270 = 0x5183
+0x3271 = 0x5184
+0x3272 = 0x518B
+0x3273 = 0x518E
+0x3274 = 0x5198
+0x3275 = 0x519D
+0x3276 = 0x51A1
+0x3277 = 0x51A3
+0x3278 = 0x51AD
+0x3279 = 0x51B8
+0x327A = 0x51BA
+0x327B = 0x51BC
+0x327C = 0x51BE
+0x327D = 0x51BF
+0x327E = 0x51C2
+0x3321 = 0x51C8
+0x3322 = 0x51CF
+0x3323 = 0x51D1
+0x3324 = 0x51D2
+0x3325 = 0x51D3
+0x3326 = 0x51D5
+0x3327 = 0x51D8
+0x3328 = 0x51DE
+0x3329 = 0x51E2
+0x332A = 0x51E5
+0x332B = 0x51EE
+0x332C = 0x51F2
+0x332D = 0x51F3
+0x332E = 0x51F4
+0x332F = 0x51F7
+0x3330 = 0x5201
+0x3331 = 0x5202
+0x3332 = 0x5205
+0x3333 = 0x5212
+0x3334 = 0x5213
+0x3335 = 0x5215
+0x3336 = 0x5216
+0x3337 = 0x5218
+0x3338 = 0x5222
+0x3339 = 0x5228
+0x333A = 0x5231
+0x333B = 0x5232
+0x333C = 0x5235
+0x333D = 0x523C
+0x333E = 0x5245
+0x333F = 0x5249
+0x3340 = 0x5255
+0x3341 = 0x5257
+0x3342 = 0x5258
+0x3343 = 0x525A
+0x3344 = 0x525C
+0x3345 = 0x525F
+0x3346 = 0x5260
+0x3347 = 0x5261
+0x3348 = 0x5266
+0x3349 = 0x526E
+0x334A = 0x5277
+0x334B = 0x5278
+0x334C = 0x5279
+0x334D = 0x5280
+0x334E = 0x5282
+0x334F = 0x5285
+0x3350 = 0x528A
+0x3351 = 0x528C
+0x3352 = 0x5293
+0x3353 = 0x5295
+0x3354 = 0x5296
+0x3355 = 0x5297
+0x3356 = 0x5298
+0x3357 = 0x529A
+0x3358 = 0x529C
+0x3359 = 0x52A4
+0x335A = 0x52A5
+0x335B = 0x52A6
+0x335C = 0x52A7
+0x335D = 0x52AF
+0x335E = 0x52B0
+0x335F = 0x52B6
+0x3360 = 0x52B7
+0x3361 = 0x52B8
+0x3362 = 0x52BA
+0x3363 = 0x52BB
+0x3364 = 0x52BD
+0x3365 = 0x52C0
+0x3366 = 0x52C4
+0x3367 = 0x52C6
+0x3368 = 0x52C8
+0x3369 = 0x52CC
+0x336A = 0x52CF
+0x336B = 0x52D1
+0x336C = 0x52D4
+0x336D = 0x52D6
+0x336E = 0x52DB
+0x336F = 0x52DC
+0x3370 = 0x52E1
+0x3371 = 0x52E5
+0x3372 = 0x52E8
+0x3373 = 0x52E9
+0x3374 = 0x52EA
+0x3375 = 0x52EC
+0x3376 = 0x52F0
+0x3377 = 0x52F1
+0x3378 = 0x52F4
+0x3379 = 0x52F6
+0x337A = 0x52F7
+0x337B = 0x5300
+0x337C = 0x5303
+0x337D = 0x530A
+0x337E = 0x530B
+0x3421 = 0x530C
+0x3422 = 0x5311
+0x3423 = 0x5313
+0x3424 = 0x5318
+0x3425 = 0x531B
+0x3426 = 0x531C
+0x3427 = 0x531E
+0x3428 = 0x531F
+0x3429 = 0x5325
+0x342A = 0x5327
+0x342B = 0x5328
+0x342C = 0x5329
+0x342D = 0x532B
+0x342E = 0x532C
+0x342F = 0x532D
+0x3430 = 0x5330
+0x3431 = 0x5332
+0x3432 = 0x5335
+0x3433 = 0x533C
+0x3434 = 0x533D
+0x3435 = 0x533E
+0x3436 = 0x5342
+0x3437 = 0x534C
+0x3438 = 0x534B
+0x3439 = 0x5359
+0x343A = 0x535B
+0x343B = 0x5361
+0x343C = 0x5363
+0x343D = 0x5365
+0x343E = 0x536C
+0x343F = 0x536D
+0x3440 = 0x5372
+0x3441 = 0x5379
+0x3442 = 0x537E
+0x3443 = 0x5383
+0x3444 = 0x5387
+0x3445 = 0x5388
+0x3446 = 0x538E
+0x3447 = 0x5393
+0x3448 = 0x5394
+0x3449 = 0x5399
+0x344A = 0x539D
+0x344B = 0x53A1
+0x344C = 0x53A4
+0x344D = 0x53AA
+0x344E = 0x53AB
+0x344F = 0x53AF
+0x3450 = 0x53B2
+0x3451 = 0x53B4
+0x3452 = 0x53B5
+0x3453 = 0x53B7
+0x3454 = 0x53B8
+0x3455 = 0x53BA
+0x3456 = 0x53BD
+0x3457 = 0x53C0
+0x3458 = 0x53C5
+0x3459 = 0x53CF
+0x345A = 0x53D2
+0x345B = 0x53D3
+0x345C = 0x53D5
+0x345D = 0x53DA
+0x345E = 0x53DD
+0x345F = 0x53DE
+0x3460 = 0x53E0
+0x3461 = 0x53E6
+0x3462 = 0x53E7
+0x3463 = 0x53F5
+0x3464 = 0x5402
+0x3465 = 0x5413
+0x3466 = 0x541A
+0x3467 = 0x5421
+0x3468 = 0x5427
+0x3469 = 0x5428
+0x346A = 0x542A
+0x346B = 0x542F
+0x346C = 0x5431
+0x346D = 0x5434
+0x346E = 0x5435
+0x346F = 0x5443
+0x3470 = 0x5444
+0x3471 = 0x5447
+0x3472 = 0x544D
+0x3473 = 0x544F
+0x3474 = 0x545E
+0x3475 = 0x5462
+0x3476 = 0x5464
+0x3477 = 0x5466
+0x3478 = 0x5467
+0x3479 = 0x5469
+0x347A = 0x546B
+0x347B = 0x546D
+0x347C = 0x546E
+0x347D = 0x5474
+0x347E = 0x547F
+0x3521 = 0x5481
+0x3522 = 0x5483
+0x3523 = 0x5485
+0x3524 = 0x5488
+0x3525 = 0x5489
+0x3526 = 0x548D
+0x3527 = 0x5491
+0x3528 = 0x5495
+0x3529 = 0x5496
+0x352A = 0x549C
+0x352B = 0x549F
+0x352C = 0x54A1
+0x352D = 0x54A6
+0x352E = 0x54A7
+0x352F = 0x54A9
+0x3530 = 0x54AA
+0x3531 = 0x54AD
+0x3532 = 0x54AE
+0x3533 = 0x54B1
+0x3534 = 0x54B7
+0x3535 = 0x54B9
+0x3536 = 0x54BA
+0x3537 = 0x54BB
+0x3538 = 0x54BF
+0x3539 = 0x54C6
+0x353A = 0x54CA
+0x353B = 0x54CD
+0x353C = 0x54CE
+0x353D = 0x54E0
+0x353E = 0x54EA
+0x353F = 0x54EC
+0x3540 = 0x54EF
+0x3541 = 0x54F6
+0x3542 = 0x54FC
+0x3543 = 0x54FE
+0x3544 = 0x54FF
+0x3545 = 0x5500
+0x3546 = 0x5501
+0x3547 = 0x5505
+0x3548 = 0x5508
+0x3549 = 0x5509
+0x354A = 0x550C
+0x354B = 0x550D
+0x354C = 0x550E
+0x354D = 0x5515
+0x354E = 0x552A
+0x354F = 0x552B
+0x3550 = 0x5532
+0x3551 = 0x5535
+0x3552 = 0x5536
+0x3553 = 0x553B
+0x3554 = 0x553C
+0x3555 = 0x553D
+0x3556 = 0x5541
+0x3557 = 0x5547
+0x3558 = 0x5549
+0x3559 = 0x554A
+0x355A = 0x554D
+0x355B = 0x5550
+0x355C = 0x5551
+0x355D = 0x5558
+0x355E = 0x555A
+0x355F = 0x555B
+0x3560 = 0x555E
+0x3561 = 0x5560
+0x3562 = 0x5561
+0x3563 = 0x5564
+0x3564 = 0x5566
+0x3565 = 0x557F
+0x3566 = 0x5581
+0x3567 = 0x5582
+0x3568 = 0x5586
+0x3569 = 0x5588
+0x356A = 0x558E
+0x356B = 0x558F
+0x356C = 0x5591
+0x356D = 0x5592
+0x356E = 0x5593
+0x356F = 0x5594
+0x3570 = 0x5597
+0x3571 = 0x55A3
+0x3572 = 0x55A4
+0x3573 = 0x55AD
+0x3574 = 0x55B2
+0x3575 = 0x55BF
+0x3576 = 0x55C1
+0x3577 = 0x55C3
+0x3578 = 0x55C6
+0x3579 = 0x55C9
+0x357A = 0x55CB
+0x357B = 0x55CC
+0x357C = 0x55CE
+0x357D = 0x55D1
+0x357E = 0x55D2
+0x3621 = 0x55D3
+0x3622 = 0x55D7
+0x3623 = 0x55D8
+0x3624 = 0x55DB
+0x3625 = 0x55DE
+0x3626 = 0x55E2
+0x3627 = 0x55E9
+0x3628 = 0x55F6
+0x3629 = 0x55FF
+0x362A = 0x5605
+0x362B = 0x5608
+0x362C = 0x560A
+0x362D = 0x560D
+0x362E = 0x560E
+0x362F = 0x560F
+0x3630 = 0x5610
+0x3631 = 0x5611
+0x3632 = 0x5612
+0x3633 = 0x5619
+0x3634 = 0x562C
+0x3635 = 0x5630
+0x3636 = 0x5633
+0x3637 = 0x5635
+0x3638 = 0x5637
+0x3639 = 0x5639
+0x363A = 0x563B
+0x363B = 0x563C
+0x363C = 0x563D
+0x363D = 0x563F
+0x363E = 0x5640
+0x363F = 0x5641
+0x3640 = 0x5643
+0x3641 = 0x5644
+0x3642 = 0x5646
+0x3643 = 0x5649
+0x3644 = 0x564B
+0x3645 = 0x564D
+0x3646 = 0x564F
+0x3647 = 0x5654
+0x3648 = 0x565E
+0x3649 = 0x5660
+0x364A = 0x5661
+0x364B = 0x5662
+0x364C = 0x5663
+0x364D = 0x5666
+0x364E = 0x5669
+0x364F = 0x566D
+0x3650 = 0x566F
+0x3651 = 0x5671
+0x3652 = 0x5672
+0x3653 = 0x5675
+0x3654 = 0x5684
+0x3655 = 0x5685
+0x3656 = 0x5688
+0x3657 = 0x568B
+0x3658 = 0x568C
+0x3659 = 0x5695
+0x365A = 0x5699
+0x365B = 0x569A
+0x365C = 0x569D
+0x365D = 0x569E
+0x365E = 0x569F
+0x365F = 0x56A6
+0x3660 = 0x56A7
+0x3661 = 0x56A8
+0x3662 = 0x56A9
+0x3663 = 0x56AB
+0x3664 = 0x56AC
+0x3665 = 0x56AD
+0x3666 = 0x56B1
+0x3667 = 0x56B3
+0x3668 = 0x56B7
+0x3669 = 0x56BE
+0x366A = 0x56C5
+0x366B = 0x56C9
+0x366C = 0x56CA
+0x366D = 0x56CB
+0x366E = 0x56CF
+0x366F = 0x56D0
+0x3670 = 0x56CC
+0x3671 = 0x56CD
+0x3672 = 0x56D9
+0x3673 = 0x56DC
+0x3674 = 0x56DD
+0x3675 = 0x56DF
+0x3676 = 0x56E1
+0x3677 = 0x56E4
+0x3678 = 0x56E5
+0x3679 = 0x56E6
+0x367A = 0x56E7
+0x367B = 0x56E8
+0x367C = 0x56F1
+0x367D = 0x56EB
+0x367E = 0x56ED
+0x3721 = 0x56F6
+0x3722 = 0x56F7
+0x3723 = 0x5701
+0x3724 = 0x5702
+0x3725 = 0x5707
+0x3726 = 0x570A
+0x3727 = 0x570C
+0x3728 = 0x5711
+0x3729 = 0x5715
+0x372A = 0x571A
+0x372B = 0x571B
+0x372C = 0x571D
+0x372D = 0x5720
+0x372E = 0x5722
+0x372F = 0x5723
+0x3730 = 0x5724
+0x3731 = 0x5725
+0x3732 = 0x5729
+0x3733 = 0x572A
+0x3734 = 0x572C
+0x3735 = 0x572E
+0x3736 = 0x572F
+0x3737 = 0x5733
+0x3738 = 0x5734
+0x3739 = 0x573D
+0x373A = 0x573E
+0x373B = 0x573F
+0x373C = 0x5745
+0x373D = 0x5746
+0x373E = 0x574C
+0x373F = 0x574D
+0x3740 = 0x5752
+0x3741 = 0x5762
+0x3742 = 0x5765
+0x3743 = 0x5767
+0x3744 = 0x5768
+0x3745 = 0x576B
+0x3746 = 0x576D
+0x3747 = 0x576E
+0x3748 = 0x576F
+0x3749 = 0x5770
+0x374A = 0x5771
+0x374B = 0x5773
+0x374C = 0x5774
+0x374D = 0x5775
+0x374E = 0x5777
+0x374F = 0x5779
+0x3750 = 0x577A
+0x3751 = 0x577B
+0x3752 = 0x577C
+0x3753 = 0x577E
+0x3754 = 0x5781
+0x3755 = 0x5783
+0x3756 = 0x578C
+0x3757 = 0x5794
+0x3758 = 0x5797
+0x3759 = 0x5799
+0x375A = 0x579A
+0x375B = 0x579C
+0x375C = 0x579D
+0x375D = 0x579E
+0x375E = 0x579F
+0x375F = 0x57A1
+0x3760 = 0x5795
+0x3761 = 0x57A7
+0x3762 = 0x57A8
+0x3763 = 0x57A9
+0x3764 = 0x57AC
+0x3765 = 0x57B8
+0x3766 = 0x57BD
+0x3767 = 0x57C7
+0x3768 = 0x57C8
+0x3769 = 0x57CC
+0x376A = 0x57CF
+0x376B = 0x57D5
+0x376C = 0x57DD
+0x376D = 0x57DE
+0x376E = 0x57E4
+0x376F = 0x57E6
+0x3770 = 0x57E7
+0x3771 = 0x57E9
+0x3772 = 0x57ED
+0x3773 = 0x57F0
+0x3774 = 0x57F5
+0x3775 = 0x57F6
+0x3776 = 0x57F8
+0x3777 = 0x57FD
+0x3778 = 0x57FE
+0x3779 = 0x57FF
+0x377A = 0x5803
+0x377B = 0x5804
+0x377C = 0x5808
+0x377D = 0x5809
+0x377E = 0x57E1
+0x3821 = 0x580C
+0x3822 = 0x580D
+0x3823 = 0x581B
+0x3824 = 0x581E
+0x3825 = 0x581F
+0x3826 = 0x5820
+0x3827 = 0x5826
+0x3828 = 0x5827
+0x3829 = 0x582D
+0x382A = 0x5832
+0x382B = 0x5839
+0x382C = 0x583F
+0x382D = 0x5849
+0x382E = 0x584C
+0x382F = 0x584D
+0x3830 = 0x584F
+0x3831 = 0x5850
+0x3832 = 0x5855
+0x3833 = 0x585F
+0x3834 = 0x5861
+0x3835 = 0x5864
+0x3836 = 0x5867
+0x3837 = 0x5868
+0x3838 = 0x5878
+0x3839 = 0x587C
+0x383A = 0x587F
+0x383B = 0x5880
+0x383C = 0x5881
+0x383D = 0x5887
+0x383E = 0x5888
+0x383F = 0x5889
+0x3840 = 0x588A
+0x3841 = 0x588C
+0x3842 = 0x588D
+0x3843 = 0x588F
+0x3844 = 0x5890
+0x3845 = 0x5894
+0x3846 = 0x5896
+0x3847 = 0x589D
+0x3848 = 0x58A0
+0x3849 = 0x58A1
+0x384A = 0x58A2
+0x384B = 0x58A6
+0x384C = 0x58A9
+0x384D = 0x58B1
+0x384E = 0x58B2
+0x384F = 0x58C4
+0x3850 = 0x58BC
+0x3851 = 0x58C2
+0x3852 = 0x58C8
+0x3853 = 0x58CD
+0x3854 = 0x58CE
+0x3855 = 0x58D0
+0x3856 = 0x58D2
+0x3857 = 0x58D4
+0x3858 = 0x58D6
+0x3859 = 0x58DA
+0x385A = 0x58DD
+0x385B = 0x58E1
+0x385C = 0x58E2
+0x385D = 0x58E9
+0x385E = 0x58F3
+0x385F = 0x5905
+0x3860 = 0x5906
+0x3861 = 0x590B
+0x3862 = 0x590C
+0x3863 = 0x5912
+0x3864 = 0x5913
+0x3865 = 0x5914
+0x3866 = 0x8641
+0x3867 = 0x591D
+0x3868 = 0x5921
+0x3869 = 0x5923
+0x386A = 0x5924
+0x386B = 0x5928
+0x386C = 0x592F
+0x386D = 0x5930
+0x386E = 0x5933
+0x386F = 0x5935
+0x3870 = 0x5936
+0x3871 = 0x593F
+0x3872 = 0x5943
+0x3873 = 0x5946
+0x3874 = 0x5952
+0x3875 = 0x5953
+0x3876 = 0x5959
+0x3877 = 0x595B
+0x3878 = 0x595D
+0x3879 = 0x595E
+0x387A = 0x595F
+0x387B = 0x5961
+0x387C = 0x5963
+0x387D = 0x596B
+0x387E = 0x596D
+0x3921 = 0x596F
+0x3922 = 0x5972
+0x3923 = 0x5975
+0x3924 = 0x5976
+0x3925 = 0x5979
+0x3926 = 0x597B
+0x3927 = 0x597C
+0x3928 = 0x598B
+0x3929 = 0x598C
+0x392A = 0x598E
+0x392B = 0x5992
+0x392C = 0x5995
+0x392D = 0x5997
+0x392E = 0x599F
+0x392F = 0x59A4
+0x3930 = 0x59A7
+0x3931 = 0x59AD
+0x3932 = 0x59AE
+0x3933 = 0x59AF
+0x3934 = 0x59B0
+0x3935 = 0x59B3
+0x3936 = 0x59B7
+0x3937 = 0x59BA
+0x3938 = 0x59BC
+0x3939 = 0x59C1
+0x393A = 0x59C3
+0x393B = 0x59C4
+0x393C = 0x59C8
+0x393D = 0x59CA
+0x393E = 0x59CD
+0x393F = 0x59D2
+0x3940 = 0x59DD
+0x3941 = 0x59DE
+0x3942 = 0x59DF
+0x3943 = 0x59E3
+0x3944 = 0x59E4
+0x3945 = 0x59E7
+0x3946 = 0x59EE
+0x3947 = 0x59EF
+0x3948 = 0x59F1
+0x3949 = 0x59F2
+0x394A = 0x59F4
+0x394B = 0x59F7
+0x394C = 0x5A00
+0x394D = 0x5A04
+0x394E = 0x5A0C
+0x394F = 0x5A0D
+0x3950 = 0x5A0E
+0x3951 = 0x5A12
+0x3952 = 0x5A13
+0x3953 = 0x5A1E
+0x3954 = 0x5A23
+0x3955 = 0x5A24
+0x3956 = 0x5A27
+0x3957 = 0x5A28
+0x3958 = 0x5A2A
+0x3959 = 0x5A2D
+0x395A = 0x5A30
+0x395B = 0x5A44
+0x395C = 0x5A45
+0x395D = 0x5A47
+0x395E = 0x5A48
+0x395F = 0x5A4C
+0x3960 = 0x5A50
+0x3961 = 0x5A55
+0x3962 = 0x5A5E
+0x3963 = 0x5A63
+0x3964 = 0x5A65
+0x3965 = 0x5A67
+0x3966 = 0x5A6D
+0x3967 = 0x5A77
+0x3968 = 0x5A7A
+0x3969 = 0x5A7B
+0x396A = 0x5A7E
+0x396B = 0x5A8B
+0x396C = 0x5A90
+0x396D = 0x5A93
+0x396E = 0x5A96
+0x396F = 0x5A99
+0x3970 = 0x5A9C
+0x3971 = 0x5A9E
+0x3972 = 0x5A9F
+0x3973 = 0x5AA0
+0x3974 = 0x5AA2
+0x3975 = 0x5AA7
+0x3976 = 0x5AAC
+0x3977 = 0x5AB1
+0x3978 = 0x5AB2
+0x3979 = 0x5AB3
+0x397A = 0x5AB5
+0x397B = 0x5AB8
+0x397C = 0x5ABA
+0x397D = 0x5ABB
+0x397E = 0x5ABF
+0x3A21 = 0x5AC4
+0x3A22 = 0x5AC6
+0x3A23 = 0x5AC8
+0x3A24 = 0x5ACF
+0x3A25 = 0x5ADA
+0x3A26 = 0x5ADC
+0x3A27 = 0x5AE0
+0x3A28 = 0x5AE5
+0x3A29 = 0x5AEA
+0x3A2A = 0x5AEE
+0x3A2B = 0x5AF5
+0x3A2C = 0x5AF6
+0x3A2D = 0x5AFD
+0x3A2E = 0x5B00
+0x3A2F = 0x5B01
+0x3A30 = 0x5B08
+0x3A31 = 0x5B17
+0x3A32 = 0x5B34
+0x3A33 = 0x5B19
+0x3A34 = 0x5B1B
+0x3A35 = 0x5B1D
+0x3A36 = 0x5B21
+0x3A37 = 0x5B25
+0x3A38 = 0x5B2D
+0x3A39 = 0x5B38
+0x3A3A = 0x5B41
+0x3A3B = 0x5B4B
+0x3A3C = 0x5B4C
+0x3A3D = 0x5B52
+0x3A3E = 0x5B56
+0x3A3F = 0x5B5E
+0x3A40 = 0x5B68
+0x3A41 = 0x5B6E
+0x3A42 = 0x5B6F
+0x3A43 = 0x5B7C
+0x3A44 = 0x5B7D
+0x3A45 = 0x5B7E
+0x3A46 = 0x5B7F
+0x3A47 = 0x5B81
+0x3A48 = 0x5B84
+0x3A49 = 0x5B86
+0x3A4A = 0x5B8A
+0x3A4B = 0x5B8E
+0x3A4C = 0x5B90
+0x3A4D = 0x5B91
+0x3A4E = 0x5B93
+0x3A4F = 0x5B94
+0x3A50 = 0x5B96
+0x3A51 = 0x5BA8
+0x3A52 = 0x5BA9
+0x3A53 = 0x5BAC
+0x3A54 = 0x5BAD
+0x3A55 = 0x5BAF
+0x3A56 = 0x5BB1
+0x3A57 = 0x5BB2
+0x3A58 = 0x5BB7
+0x3A59 = 0x5BBA
+0x3A5A = 0x5BBC
+0x3A5B = 0x5BC0
+0x3A5C = 0x5BC1
+0x3A5D = 0x5BCD
+0x3A5E = 0x5BCF
+0x3A5F = 0x5BD6
+0x3A60 = 0x5BD7
+0x3A61 = 0x5BD8
+0x3A62 = 0x5BD9
+0x3A63 = 0x5BDA
+0x3A64 = 0x5BE0
+0x3A65 = 0x5BEF
+0x3A66 = 0x5BF1
+0x3A67 = 0x5BF4
+0x3A68 = 0x5BFD
+0x3A69 = 0x5C0C
+0x3A6A = 0x5C17
+0x3A6B = 0x5C1E
+0x3A6C = 0x5C1F
+0x3A6D = 0x5C23
+0x3A6E = 0x5C26
+0x3A6F = 0x5C29
+0x3A70 = 0x5C2B
+0x3A71 = 0x5C2C
+0x3A72 = 0x5C2E
+0x3A73 = 0x5C30
+0x3A74 = 0x5C32
+0x3A75 = 0x5C35
+0x3A76 = 0x5C36
+0x3A77 = 0x5C59
+0x3A78 = 0x5C5A
+0x3A79 = 0x5C5C
+0x3A7A = 0x5C62
+0x3A7B = 0x5C63
+0x3A7C = 0x5C67
+0x3A7D = 0x5C68
+0x3A7E = 0x5C69
+0x3B21 = 0x5C6D
+0x3B22 = 0x5C70
+0x3B23 = 0x5C74
+0x3B24 = 0x5C75
+0x3B25 = 0x5C7A
+0x3B26 = 0x5C7B
+0x3B27 = 0x5C7C
+0x3B28 = 0x5C7D
+0x3B29 = 0x5C87
+0x3B2A = 0x5C88
+0x3B2B = 0x5C8A
+0x3B2C = 0x5C8F
+0x3B2D = 0x5C92
+0x3B2E = 0x5C9D
+0x3B2F = 0x5C9F
+0x3B30 = 0x5CA0
+0x3B31 = 0x5CA2
+0x3B32 = 0x5CA3
+0x3B33 = 0x5CA6
+0x3B34 = 0x5CAA
+0x3B35 = 0x5CB2
+0x3B36 = 0x5CB4
+0x3B37 = 0x5CB5
+0x3B38 = 0x5CBA
+0x3B39 = 0x5CC9
+0x3B3A = 0x5CCB
+0x3B3B = 0x5CD2
+0x3B3C = 0x5CDD
+0x3B3D = 0x5CD7
+0x3B3E = 0x5CEE
+0x3B3F = 0x5CF1
+0x3B40 = 0x5CF2
+0x3B41 = 0x5CF4
+0x3B42 = 0x5D01
+0x3B43 = 0x5D06
+0x3B44 = 0x5D0D
+0x3B45 = 0x5D12
+0x3B46 = 0x5D2B
+0x3B47 = 0x5D23
+0x3B48 = 0x5D24
+0x3B49 = 0x5D26
+0x3B4A = 0x5D27
+0x3B4B = 0x5D31
+0x3B4C = 0x5D34
+0x3B4D = 0x5D39
+0x3B4E = 0x5D3D
+0x3B4F = 0x5D3F
+0x3B50 = 0x5D42
+0x3B51 = 0x5D43
+0x3B52 = 0x5D46
+0x3B53 = 0x5D48
+0x3B54 = 0x5D55
+0x3B55 = 0x5D51
+0x3B56 = 0x5D59
+0x3B57 = 0x5D4A
+0x3B58 = 0x5D5F
+0x3B59 = 0x5D60
+0x3B5A = 0x5D61
+0x3B5B = 0x5D62
+0x3B5C = 0x5D64
+0x3B5D = 0x5D6A
+0x3B5E = 0x5D6D
+0x3B5F = 0x5D70
+0x3B60 = 0x5D79
+0x3B61 = 0x5D7A
+0x3B62 = 0x5D7E
+0x3B63 = 0x5D7F
+0x3B64 = 0x5D81
+0x3B65 = 0x5D83
+0x3B66 = 0x5D88
+0x3B67 = 0x5D8A
+0x3B68 = 0x5D92
+0x3B69 = 0x5D93
+0x3B6A = 0x5D94
+0x3B6B = 0x5D95
+0x3B6C = 0x5D99
+0x3B6D = 0x5D9B
+0x3B6E = 0x5D9F
+0x3B6F = 0x5DA0
+0x3B70 = 0x5DA7
+0x3B71 = 0x5DAB
+0x3B72 = 0x5DB0
+0x3B73 = 0x5DB4
+0x3B74 = 0x5DB8
+0x3B75 = 0x5DB9
+0x3B76 = 0x5DC3
+0x3B77 = 0x5DC7
+0x3B78 = 0x5DCB
+0x3B79 = 0x5DD0
+0x3B7A = 0x5DCE
+0x3B7B = 0x5DD8
+0x3B7C = 0x5DD9
+0x3B7D = 0x5DE0
+0x3B7E = 0x5DE4
+0x3C21 = 0x5DE9
+0x3C22 = 0x5DF8
+0x3C23 = 0x5DF9
+0x3C24 = 0x5E00
+0x3C25 = 0x5E07
+0x3C26 = 0x5E0D
+0x3C27 = 0x5E12
+0x3C28 = 0x5E14
+0x3C29 = 0x5E15
+0x3C2A = 0x5E18
+0x3C2B = 0x5E1F
+0x3C2C = 0x5E20
+0x3C2D = 0x5E2E
+0x3C2E = 0x5E28
+0x3C2F = 0x5E32
+0x3C30 = 0x5E35
+0x3C31 = 0x5E3E
+0x3C32 = 0x5E4B
+0x3C33 = 0x5E50
+0x3C34 = 0x5E49
+0x3C35 = 0x5E51
+0x3C36 = 0x5E56
+0x3C37 = 0x5E58
+0x3C38 = 0x5E5B
+0x3C39 = 0x5E5C
+0x3C3A = 0x5E5E
+0x3C3B = 0x5E68
+0x3C3C = 0x5E6A
+0x3C3D = 0x5E6B
+0x3C3E = 0x5E6C
+0x3C3F = 0x5E6D
+0x3C40 = 0x5E6E
+0x3C41 = 0x5E70
+0x3C42 = 0x5E80
+0x3C43 = 0x5E8B
+0x3C44 = 0x5E8E
+0x3C45 = 0x5EA2
+0x3C46 = 0x5EA4
+0x3C47 = 0x5EA5
+0x3C48 = 0x5EA8
+0x3C49 = 0x5EAA
+0x3C4A = 0x5EAC
+0x3C4B = 0x5EB1
+0x3C4C = 0x5EB3
+0x3C4D = 0x5EBD
+0x3C4E = 0x5EBE
+0x3C4F = 0x5EBF
+0x3C50 = 0x5EC6
+0x3C51 = 0x5ECC
+0x3C52 = 0x5ECB
+0x3C53 = 0x5ECE
+0x3C54 = 0x5ED1
+0x3C55 = 0x5ED2
+0x3C56 = 0x5ED4
+0x3C57 = 0x5ED5
+0x3C58 = 0x5EDC
+0x3C59 = 0x5EDE
+0x3C5A = 0x5EE5
+0x3C5B = 0x5EEB
+0x3C5C = 0x5F02
+0x3C5D = 0x5F06
+0x3C5E = 0x5F07
+0x3C5F = 0x5F08
+0x3C60 = 0x5F0E
+0x3C61 = 0x5F19
+0x3C62 = 0x5F1C
+0x3C63 = 0x5F1D
+0x3C64 = 0x5F21
+0x3C65 = 0x5F22
+0x3C66 = 0x5F23
+0x3C67 = 0x5F24
+0x3C68 = 0x5F28
+0x3C69 = 0x5F2B
+0x3C6A = 0x5F2C
+0x3C6B = 0x5F2E
+0x3C6C = 0x5F30
+0x3C6D = 0x5F34
+0x3C6E = 0x5F36
+0x3C6F = 0x5F3B
+0x3C70 = 0x5F3D
+0x3C71 = 0x5F3F
+0x3C72 = 0x5F40
+0x3C73 = 0x5F44
+0x3C74 = 0x5F45
+0x3C75 = 0x5F47
+0x3C76 = 0x5F4D
+0x3C77 = 0x5F50
+0x3C78 = 0x5F54
+0x3C79 = 0x5F58
+0x3C7A = 0x5F5B
+0x3C7B = 0x5F60
+0x3C7C = 0x5F63
+0x3C7D = 0x5F64
+0x3C7E = 0x5F67
+0x3D21 = 0x5F6F
+0x3D22 = 0x5F72
+0x3D23 = 0x5F74
+0x3D24 = 0x5F75
+0x3D25 = 0x5F78
+0x3D26 = 0x5F7A
+0x3D27 = 0x5F7D
+0x3D28 = 0x5F7E
+0x3D29 = 0x5F89
+0x3D2A = 0x5F8D
+0x3D2B = 0x5F8F
+0x3D2C = 0x5F96
+0x3D2D = 0x5F9C
+0x3D2E = 0x5F9D
+0x3D2F = 0x5FA2
+0x3D30 = 0x5FA7
+0x3D31 = 0x5FAB
+0x3D32 = 0x5FA4
+0x3D33 = 0x5FAC
+0x3D34 = 0x5FAF
+0x3D35 = 0x5FB0
+0x3D36 = 0x5FB1
+0x3D37 = 0x5FB8
+0x3D38 = 0x5FC4
+0x3D39 = 0x5FC7
+0x3D3A = 0x5FC8
+0x3D3B = 0x5FC9
+0x3D3C = 0x5FCB
+0x3D3D = 0x5FD0
+0x3D3E = 0x5FD1
+0x3D3F = 0x5FD2
+0x3D40 = 0x5FD3
+0x3D41 = 0x5FD4
+0x3D42 = 0x5FDE
+0x3D43 = 0x5FE1
+0x3D44 = 0x5FE2
+0x3D45 = 0x5FE8
+0x3D46 = 0x5FE9
+0x3D47 = 0x5FEA
+0x3D48 = 0x5FEC
+0x3D49 = 0x5FED
+0x3D4A = 0x5FEE
+0x3D4B = 0x5FEF
+0x3D4C = 0x5FF2
+0x3D4D = 0x5FF3
+0x3D4E = 0x5FF6
+0x3D4F = 0x5FFA
+0x3D50 = 0x5FFC
+0x3D51 = 0x6007
+0x3D52 = 0x600A
+0x3D53 = 0x600D
+0x3D54 = 0x6013
+0x3D55 = 0x6014
+0x3D56 = 0x6017
+0x3D57 = 0x6018
+0x3D58 = 0x601A
+0x3D59 = 0x601F
+0x3D5A = 0x6024
+0x3D5B = 0x602D
+0x3D5C = 0x6033
+0x3D5D = 0x6035
+0x3D5E = 0x6040
+0x3D5F = 0x6047
+0x3D60 = 0x6048
+0x3D61 = 0x6049
+0x3D62 = 0x604C
+0x3D63 = 0x6051
+0x3D64 = 0x6054
+0x3D65 = 0x6056
+0x3D66 = 0x6057
+0x3D67 = 0x605D
+0x3D68 = 0x6061
+0x3D69 = 0x6067
+0x3D6A = 0x6071
+0x3D6B = 0x607E
+0x3D6C = 0x607F
+0x3D6D = 0x6082
+0x3D6E = 0x6086
+0x3D6F = 0x6088
+0x3D70 = 0x608A
+0x3D71 = 0x608E
+0x3D72 = 0x6091
+0x3D73 = 0x6093
+0x3D74 = 0x6095
+0x3D75 = 0x6098
+0x3D76 = 0x609D
+0x3D77 = 0x609E
+0x3D78 = 0x60A2
+0x3D79 = 0x60A4
+0x3D7A = 0x60A5
+0x3D7B = 0x60A8
+0x3D7C = 0x60B0
+0x3D7D = 0x60B1
+0x3D7E = 0x60B7
+0x3E21 = 0x60BB
+0x3E22 = 0x60BE
+0x3E23 = 0x60C2
+0x3E24 = 0x60C4
+0x3E25 = 0x60C8
+0x3E26 = 0x60C9
+0x3E27 = 0x60CA
+0x3E28 = 0x60CB
+0x3E29 = 0x60CE
+0x3E2A = 0x60CF
+0x3E2B = 0x60D4
+0x3E2C = 0x60D5
+0x3E2D = 0x60D9
+0x3E2E = 0x60DB
+0x3E2F = 0x60DD
+0x3E30 = 0x60DE
+0x3E31 = 0x60E2
+0x3E32 = 0x60E5
+0x3E33 = 0x60F2
+0x3E34 = 0x60F5
+0x3E35 = 0x60F8
+0x3E36 = 0x60FC
+0x3E37 = 0x60FD
+0x3E38 = 0x6102
+0x3E39 = 0x6107
+0x3E3A = 0x610A
+0x3E3B = 0x610C
+0x3E3C = 0x6110
+0x3E3D = 0x6111
+0x3E3E = 0x6112
+0x3E3F = 0x6113
+0x3E40 = 0x6114
+0x3E41 = 0x6116
+0x3E42 = 0x6117
+0x3E43 = 0x6119
+0x3E44 = 0x611C
+0x3E45 = 0x611E
+0x3E46 = 0x6122
+0x3E47 = 0x612A
+0x3E48 = 0x612B
+0x3E49 = 0x6130
+0x3E4A = 0x6131
+0x3E4B = 0x6135
+0x3E4C = 0x6136
+0x3E4D = 0x6137
+0x3E4E = 0x6139
+0x3E4F = 0x6141
+0x3E50 = 0x6145
+0x3E51 = 0x6146
+0x3E52 = 0x6149
+0x3E53 = 0x615E
+0x3E54 = 0x6160
+0x3E55 = 0x616C
+0x3E56 = 0x6172
+0x3E57 = 0x6178
+0x3E58 = 0x617B
+0x3E59 = 0x617C
+0x3E5A = 0x617F
+0x3E5B = 0x6180
+0x3E5C = 0x6181
+0x3E5D = 0x6183
+0x3E5E = 0x6184
+0x3E5F = 0x618B
+0x3E60 = 0x618D
+0x3E61 = 0x6192
+0x3E62 = 0x6193
+0x3E63 = 0x6197
+0x3E64 = 0x6198
+0x3E65 = 0x619C
+0x3E66 = 0x619D
+0x3E67 = 0x619F
+0x3E68 = 0x61A0
+0x3E69 = 0x61A5
+0x3E6A = 0x61A8
+0x3E6B = 0x61AA
+0x3E6C = 0x61AD
+0x3E6D = 0x61B8
+0x3E6E = 0x61B9
+0x3E6F = 0x61BC
+0x3E70 = 0x61C0
+0x3E71 = 0x61C1
+0x3E72 = 0x61C2
+0x3E73 = 0x61CE
+0x3E74 = 0x61CF
+0x3E75 = 0x61D5
+0x3E76 = 0x61DC
+0x3E77 = 0x61DD
+0x3E78 = 0x61DE
+0x3E79 = 0x61DF
+0x3E7A = 0x61E1
+0x3E7B = 0x61E2
+0x3E7C = 0x61E7
+0x3E7D = 0x61E9
+0x3E7E = 0x61E5
+0x3F21 = 0x61EC
+0x3F22 = 0x61ED
+0x3F23 = 0x61EF
+0x3F24 = 0x6201
+0x3F25 = 0x6203
+0x3F26 = 0x6204
+0x3F27 = 0x6207
+0x3F28 = 0x6213
+0x3F29 = 0x6215
+0x3F2A = 0x621C
+0x3F2B = 0x6220
+0x3F2C = 0x6222
+0x3F2D = 0x6223
+0x3F2E = 0x6227
+0x3F2F = 0x6229
+0x3F30 = 0x622B
+0x3F31 = 0x6239
+0x3F32 = 0x623D
+0x3F33 = 0x6242
+0x3F34 = 0x6243
+0x3F35 = 0x6244
+0x3F36 = 0x6246
+0x3F37 = 0x624C
+0x3F38 = 0x6250
+0x3F39 = 0x6251
+0x3F3A = 0x6252
+0x3F3B = 0x6254
+0x3F3C = 0x6256
+0x3F3D = 0x625A
+0x3F3E = 0x625C
+0x3F3F = 0x6264
+0x3F40 = 0x626D
+0x3F41 = 0x626F
+0x3F42 = 0x6273
+0x3F43 = 0x627A
+0x3F44 = 0x627D
+0x3F45 = 0x628D
+0x3F46 = 0x628E
+0x3F47 = 0x628F
+0x3F48 = 0x6290
+0x3F49 = 0x62A6
+0x3F4A = 0x62A8
+0x3F4B = 0x62B3
+0x3F4C = 0x62B6
+0x3F4D = 0x62B7
+0x3F4E = 0x62BA
+0x3F4F = 0x62BE
+0x3F50 = 0x62BF
+0x3F51 = 0x62C4
+0x3F52 = 0x62CE
+0x3F53 = 0x62D5
+0x3F54 = 0x62D6
+0x3F55 = 0x62DA
+0x3F56 = 0x62EA
+0x3F57 = 0x62F2
+0x3F58 = 0x62F4
+0x3F59 = 0x62FC
+0x3F5A = 0x62FD
+0x3F5B = 0x6303
+0x3F5C = 0x6304
+0x3F5D = 0x630A
+0x3F5E = 0x630B
+0x3F5F = 0x630D
+0x3F60 = 0x6310
+0x3F61 = 0x6313
+0x3F62 = 0x6316
+0x3F63 = 0x6318
+0x3F64 = 0x6329
+0x3F65 = 0x632A
+0x3F66 = 0x632D
+0x3F67 = 0x6335
+0x3F68 = 0x6336
+0x3F69 = 0x6339
+0x3F6A = 0x633C
+0x3F6B = 0x6341
+0x3F6C = 0x6342
+0x3F6D = 0x6343
+0x3F6E = 0x6344
+0x3F6F = 0x6346
+0x3F70 = 0x634A
+0x3F71 = 0x634B
+0x3F72 = 0x634E
+0x3F73 = 0x6352
+0x3F74 = 0x6353
+0x3F75 = 0x6354
+0x3F76 = 0x6358
+0x3F77 = 0x635B
+0x3F78 = 0x6365
+0x3F79 = 0x6366
+0x3F7A = 0x636C
+0x3F7B = 0x636D
+0x3F7C = 0x6371
+0x3F7D = 0x6374
+0x3F7E = 0x6375
+0x4021 = 0x6378
+0x4022 = 0x637C
+0x4023 = 0x637D
+0x4024 = 0x637F
+0x4025 = 0x6382
+0x4026 = 0x6384
+0x4027 = 0x6387
+0x4028 = 0x638A
+0x4029 = 0x6390
+0x402A = 0x6394
+0x402B = 0x6395
+0x402C = 0x6399
+0x402D = 0x639A
+0x402E = 0x639E
+0x402F = 0x63A4
+0x4030 = 0x63A6
+0x4031 = 0x63AD
+0x4032 = 0x63AE
+0x4033 = 0x63AF
+0x4034 = 0x63BD
+0x4035 = 0x63C1
+0x4036 = 0x63C5
+0x4037 = 0x63C8
+0x4038 = 0x63CE
+0x4039 = 0x63D1
+0x403A = 0x63D3
+0x403B = 0x63D4
+0x403C = 0x63D5
+0x403D = 0x63DC
+0x403E = 0x63E0
+0x403F = 0x63E5
+0x4040 = 0x63EA
+0x4041 = 0x63EC
+0x4042 = 0x63F2
+0x4043 = 0x63F3
+0x4044 = 0x63F5
+0x4045 = 0x63F8
+0x4046 = 0x63F9
+0x4047 = 0x6409
+0x4048 = 0x640A
+0x4049 = 0x6410
+0x404A = 0x6412
+0x404B = 0x6414
+0x404C = 0x6418
+0x404D = 0x641E
+0x404E = 0x6420
+0x404F = 0x6422
+0x4050 = 0x6424
+0x4051 = 0x6425
+0x4052 = 0x6429
+0x4053 = 0x642A
+0x4054 = 0x642F
+0x4055 = 0x6430
+0x4056 = 0x6435
+0x4057 = 0x643D
+0x4058 = 0x643F
+0x4059 = 0x644B
+0x405A = 0x644F
+0x405B = 0x6451
+0x405C = 0x6452
+0x405D = 0x6453
+0x405E = 0x6454
+0x405F = 0x645A
+0x4060 = 0x645B
+0x4061 = 0x645C
+0x4062 = 0x645D
+0x4063 = 0x645F
+0x4064 = 0x6460
+0x4065 = 0x6461
+0x4066 = 0x6463
+0x4067 = 0x646D
+0x4068 = 0x6473
+0x4069 = 0x6474
+0x406A = 0x647B
+0x406B = 0x647D
+0x406C = 0x6485
+0x406D = 0x6487
+0x406E = 0x648F
+0x406F = 0x6490
+0x4070 = 0x6491
+0x4071 = 0x6498
+0x4072 = 0x6499
+0x4073 = 0x649B
+0x4074 = 0x649D
+0x4075 = 0x649F
+0x4076 = 0x64A1
+0x4077 = 0x64A3
+0x4078 = 0x64A6
+0x4079 = 0x64A8
+0x407A = 0x64AC
+0x407B = 0x64B3
+0x407C = 0x64BD
+0x407D = 0x64BE
+0x407E = 0x64BF
+0x4121 = 0x64C4
+0x4122 = 0x64C9
+0x4123 = 0x64CA
+0x4124 = 0x64CB
+0x4125 = 0x64CC
+0x4126 = 0x64CE
+0x4127 = 0x64D0
+0x4128 = 0x64D1
+0x4129 = 0x64D5
+0x412A = 0x64D7
+0x412B = 0x64E4
+0x412C = 0x64E5
+0x412D = 0x64E9
+0x412E = 0x64EA
+0x412F = 0x64ED
+0x4130 = 0x64F0
+0x4131 = 0x64F5
+0x4132 = 0x64F7
+0x4133 = 0x64FB
+0x4134 = 0x64FF
+0x4135 = 0x6501
+0x4136 = 0x6504
+0x4137 = 0x6508
+0x4138 = 0x6509
+0x4139 = 0x650A
+0x413A = 0x650F
+0x413B = 0x6513
+0x413C = 0x6514
+0x413D = 0x6516
+0x413E = 0x6519
+0x413F = 0x651B
+0x4140 = 0x651E
+0x4141 = 0x651F
+0x4142 = 0x6522
+0x4143 = 0x6526
+0x4144 = 0x6529
+0x4145 = 0x652E
+0x4146 = 0x6531
+0x4147 = 0x653A
+0x4148 = 0x653C
+0x4149 = 0x653D
+0x414A = 0x6543
+0x414B = 0x6547
+0x414C = 0x6549
+0x414D = 0x6550
+0x414E = 0x6552
+0x414F = 0x6554
+0x4150 = 0x655F
+0x4151 = 0x6560
+0x4152 = 0x6567
+0x4153 = 0x656B
+0x4154 = 0x657A
+0x4155 = 0x657D
+0x4156 = 0x6581
+0x4157 = 0x6585
+0x4158 = 0x658A
+0x4159 = 0x6592
+0x415A = 0x6595
+0x415B = 0x6598
+0x415C = 0x659D
+0x415D = 0x65A0
+0x415E = 0x65A3
+0x415F = 0x65A6
+0x4160 = 0x65AE
+0x4161 = 0x65B2
+0x4162 = 0x65B3
+0x4163 = 0x65B4
+0x4164 = 0x65BF
+0x4165 = 0x65C2
+0x4166 = 0x65C8
+0x4167 = 0x65C9
+0x4168 = 0x65CE
+0x4169 = 0x65D0
+0x416A = 0x65D4
+0x416B = 0x65D6
+0x416C = 0x65D8
+0x416D = 0x65DF
+0x416E = 0x65F0
+0x416F = 0x65F2
+0x4170 = 0x65F4
+0x4171 = 0x65F5
+0x4172 = 0x65F9
+0x4173 = 0x65FE
+0x4174 = 0x65FF
+0x4175 = 0x6600
+0x4176 = 0x6604
+0x4177 = 0x6608
+0x4178 = 0x6609
+0x4179 = 0x660D
+0x417A = 0x6611
+0x417B = 0x6612
+0x417C = 0x6615
+0x417D = 0x6616
+0x417E = 0x661D
+0x4221 = 0x661E
+0x4222 = 0x6621
+0x4223 = 0x6622
+0x4224 = 0x6623
+0x4225 = 0x6624
+0x4226 = 0x6626
+0x4227 = 0x6629
+0x4228 = 0x662A
+0x4229 = 0x662B
+0x422A = 0x662C
+0x422B = 0x662E
+0x422C = 0x6630
+0x422D = 0x6631
+0x422E = 0x6633
+0x422F = 0x6639
+0x4230 = 0x6637
+0x4231 = 0x6640
+0x4232 = 0x6645
+0x4233 = 0x6646
+0x4234 = 0x664A
+0x4235 = 0x664C
+0x4236 = 0x6651
+0x4237 = 0x664E
+0x4238 = 0x6657
+0x4239 = 0x6658
+0x423A = 0x6659
+0x423B = 0x665B
+0x423C = 0x665C
+0x423D = 0x6660
+0x423E = 0x6661
+0x423F = 0x66FB
+0x4240 = 0x666A
+0x4241 = 0x666B
+0x4242 = 0x666C
+0x4243 = 0x667E
+0x4244 = 0x6673
+0x4245 = 0x6675
+0x4246 = 0x667F
+0x4247 = 0x6677
+0x4248 = 0x6678
+0x4249 = 0x6679
+0x424A = 0x667B
+0x424B = 0x6680
+0x424C = 0x667C
+0x424D = 0x668B
+0x424E = 0x668C
+0x424F = 0x668D
+0x4250 = 0x6690
+0x4251 = 0x6692
+0x4252 = 0x6699
+0x4253 = 0x669A
+0x4254 = 0x669B
+0x4255 = 0x669C
+0x4256 = 0x669F
+0x4257 = 0x66A0
+0x4258 = 0x66A4
+0x4259 = 0x66AD
+0x425A = 0x66B1
+0x425B = 0x66B2
+0x425C = 0x66B5
+0x425D = 0x66BB
+0x425E = 0x66BF
+0x425F = 0x66C0
+0x4260 = 0x66C2
+0x4261 = 0x66C3
+0x4262 = 0x66C8
+0x4263 = 0x66CC
+0x4264 = 0x66CE
+0x4265 = 0x66CF
+0x4266 = 0x66D4
+0x4267 = 0x66DB
+0x4268 = 0x66DF
+0x4269 = 0x66E8
+0x426A = 0x66EB
+0x426B = 0x66EC
+0x426C = 0x66EE
+0x426D = 0x66FA
+0x426E = 0x6705
+0x426F = 0x6707
+0x4270 = 0x670E
+0x4271 = 0x6713
+0x4272 = 0x6719
+0x4273 = 0x671C
+0x4274 = 0x6720
+0x4275 = 0x6722
+0x4276 = 0x6733
+0x4277 = 0x673E
+0x4278 = 0x6745
+0x4279 = 0x6747
+0x427A = 0x6748
+0x427B = 0x674C
+0x427C = 0x6754
+0x427D = 0x6755
+0x427E = 0x675D
+0x4321 = 0x6766
+0x4322 = 0x676C
+0x4323 = 0x676E
+0x4324 = 0x6774
+0x4325 = 0x6776
+0x4326 = 0x677B
+0x4327 = 0x6781
+0x4328 = 0x6784
+0x4329 = 0x678E
+0x432A = 0x678F
+0x432B = 0x6791
+0x432C = 0x6793
+0x432D = 0x6796
+0x432E = 0x6798
+0x432F = 0x6799
+0x4330 = 0x679B
+0x4331 = 0x67B0
+0x4332 = 0x67B1
+0x4333 = 0x67B2
+0x4334 = 0x67B5
+0x4335 = 0x67BB
+0x4336 = 0x67BC
+0x4337 = 0x67BD
+0x4338 = 0x67F9
+0x4339 = 0x67C0
+0x433A = 0x67C2
+0x433B = 0x67C3
+0x433C = 0x67C5
+0x433D = 0x67C8
+0x433E = 0x67C9
+0x433F = 0x67D2
+0x4340 = 0x67D7
+0x4341 = 0x67D9
+0x4342 = 0x67DC
+0x4343 = 0x67E1
+0x4344 = 0x67E6
+0x4345 = 0x67F0
+0x4346 = 0x67F2
+0x4347 = 0x67F6
+0x4348 = 0x67F7
+0x4349 = 0x6852
+0x434A = 0x6814
+0x434B = 0x6819
+0x434C = 0x681D
+0x434D = 0x681F
+0x434E = 0x6828
+0x434F = 0x6827
+0x4350 = 0x682C
+0x4351 = 0x682D
+0x4352 = 0x682F
+0x4353 = 0x6830
+0x4354 = 0x6831
+0x4355 = 0x6833
+0x4356 = 0x683B
+0x4357 = 0x683F
+0x4358 = 0x6844
+0x4359 = 0x6845
+0x435A = 0x684A
+0x435B = 0x684C
+0x435C = 0x6855
+0x435D = 0x6857
+0x435E = 0x6858
+0x435F = 0x685B
+0x4360 = 0x686B
+0x4361 = 0x686E
+0x4362 = 0x686F
+0x4363 = 0x6870
+0x4364 = 0x6871
+0x4365 = 0x6872
+0x4366 = 0x6875
+0x4367 = 0x6879
+0x4368 = 0x687A
+0x4369 = 0x687B
+0x436A = 0x687C
+0x436B = 0x6882
+0x436C = 0x6884
+0x436D = 0x6886
+0x436E = 0x6888
+0x436F = 0x6896
+0x4370 = 0x6898
+0x4371 = 0x689A
+0x4372 = 0x689C
+0x4373 = 0x68A1
+0x4374 = 0x68A3
+0x4375 = 0x68A5
+0x4376 = 0x68A9
+0x4377 = 0x68AA
+0x4378 = 0x68AE
+0x4379 = 0x68B2
+0x437A = 0x68BB
+0x437B = 0x68C5
+0x437C = 0x68C8
+0x437D = 0x68CC
+0x437E = 0x68CF
+0x4421 = 0x68D0
+0x4422 = 0x68D1
+0x4423 = 0x68D3
+0x4424 = 0x68D6
+0x4425 = 0x68D9
+0x4426 = 0x68DC
+0x4427 = 0x68DD
+0x4428 = 0x68E5
+0x4429 = 0x68E8
+0x442A = 0x68EA
+0x442B = 0x68EB
+0x442C = 0x68EC
+0x442D = 0x68ED
+0x442E = 0x68F0
+0x442F = 0x68F1
+0x4430 = 0x68F5
+0x4431 = 0x68F6
+0x4432 = 0x68FB
+0x4433 = 0x68FC
+0x4434 = 0x68FD
+0x4435 = 0x6906
+0x4436 = 0x6909
+0x4437 = 0x690A
+0x4438 = 0x6910
+0x4439 = 0x6911
+0x443A = 0x6913
+0x443B = 0x6916
+0x443C = 0x6917
+0x443D = 0x6931
+0x443E = 0x6933
+0x443F = 0x6935
+0x4440 = 0x6938
+0x4441 = 0x693B
+0x4442 = 0x6942
+0x4443 = 0x6945
+0x4444 = 0x6949
+0x4445 = 0x694E
+0x4446 = 0x6957
+0x4447 = 0x695B
+0x4448 = 0x6963
+0x4449 = 0x6964
+0x444A = 0x6965
+0x444B = 0x6966
+0x444C = 0x6968
+0x444D = 0x6969
+0x444E = 0x696C
+0x444F = 0x6970
+0x4450 = 0x6971
+0x4451 = 0x6972
+0x4452 = 0x697A
+0x4453 = 0x697B
+0x4454 = 0x697F
+0x4455 = 0x6980
+0x4456 = 0x698D
+0x4457 = 0x6992
+0x4458 = 0x6996
+0x4459 = 0x6998
+0x445A = 0x69A1
+0x445B = 0x69A5
+0x445C = 0x69A6
+0x445D = 0x69A8
+0x445E = 0x69AB
+0x445F = 0x69AD
+0x4460 = 0x69AF
+0x4461 = 0x69B7
+0x4462 = 0x69B8
+0x4463 = 0x69BA
+0x4464 = 0x69BC
+0x4465 = 0x69C5
+0x4466 = 0x69C8
+0x4467 = 0x69D1
+0x4468 = 0x69D6
+0x4469 = 0x69D7
+0x446A = 0x69E2
+0x446B = 0x69E5
+0x446C = 0x69EE
+0x446D = 0x69EF
+0x446E = 0x69F1
+0x446F = 0x69F3
+0x4470 = 0x69F5
+0x4471 = 0x69FE
+0x4472 = 0x6A00
+0x4473 = 0x6A01
+0x4474 = 0x6A03
+0x4475 = 0x6A0F
+0x4476 = 0x6A11
+0x4477 = 0x6A15
+0x4478 = 0x6A1A
+0x4479 = 0x6A1D
+0x447A = 0x6A20
+0x447B = 0x6A24
+0x447C = 0x6A28
+0x447D = 0x6A30
+0x447E = 0x6A32
+0x4521 = 0x6A34
+0x4522 = 0x6A37
+0x4523 = 0x6A3B
+0x4524 = 0x6A3E
+0x4525 = 0x6A3F
+0x4526 = 0x6A45
+0x4527 = 0x6A46
+0x4528 = 0x6A49
+0x4529 = 0x6A4A
+0x452A = 0x6A4E
+0x452B = 0x6A50
+0x452C = 0x6A51
+0x452D = 0x6A52
+0x452E = 0x6A55
+0x452F = 0x6A56
+0x4530 = 0x6A5B
+0x4531 = 0x6A64
+0x4532 = 0x6A67
+0x4533 = 0x6A6A
+0x4534 = 0x6A71
+0x4535 = 0x6A73
+0x4536 = 0x6A7E
+0x4537 = 0x6A81
+0x4538 = 0x6A83
+0x4539 = 0x6A86
+0x453A = 0x6A87
+0x453B = 0x6A89
+0x453C = 0x6A8B
+0x453D = 0x6A91
+0x453E = 0x6A9B
+0x453F = 0x6A9D
+0x4540 = 0x6A9E
+0x4541 = 0x6A9F
+0x4542 = 0x6AA5
+0x4543 = 0x6AAB
+0x4544 = 0x6AAF
+0x4545 = 0x6AB0
+0x4546 = 0x6AB1
+0x4547 = 0x6AB4
+0x4548 = 0x6ABD
+0x4549 = 0x6ABE
+0x454A = 0x6ABF
+0x454B = 0x6AC6
+0x454C = 0x6AC9
+0x454D = 0x6AC8
+0x454E = 0x6ACC
+0x454F = 0x6AD0
+0x4550 = 0x6AD4
+0x4551 = 0x6AD5
+0x4552 = 0x6AD6
+0x4553 = 0x6ADC
+0x4554 = 0x6ADD
+0x4555 = 0x6AE4
+0x4556 = 0x6AE7
+0x4557 = 0x6AEC
+0x4558 = 0x6AF0
+0x4559 = 0x6AF1
+0x455A = 0x6AF2
+0x455B = 0x6AFC
+0x455C = 0x6AFD
+0x455D = 0x6B02
+0x455E = 0x6B03
+0x455F = 0x6B06
+0x4560 = 0x6B07
+0x4561 = 0x6B09
+0x4562 = 0x6B0F
+0x4563 = 0x6B10
+0x4564 = 0x6B11
+0x4565 = 0x6B17
+0x4566 = 0x6B1B
+0x4567 = 0x6B1E
+0x4568 = 0x6B24
+0x4569 = 0x6B28
+0x456A = 0x6B2B
+0x456B = 0x6B2C
+0x456C = 0x6B2F
+0x456D = 0x6B35
+0x456E = 0x6B36
+0x456F = 0x6B3B
+0x4570 = 0x6B3F
+0x4571 = 0x6B46
+0x4572 = 0x6B4A
+0x4573 = 0x6B4D
+0x4574 = 0x6B52
+0x4575 = 0x6B56
+0x4576 = 0x6B58
+0x4577 = 0x6B5D
+0x4578 = 0x6B60
+0x4579 = 0x6B67
+0x457A = 0x6B6B
+0x457B = 0x6B6E
+0x457C = 0x6B70
+0x457D = 0x6B75
+0x457E = 0x6B7D
+0x4621 = 0x6B7E
+0x4622 = 0x6B82
+0x4623 = 0x6B85
+0x4624 = 0x6B97
+0x4625 = 0x6B9B
+0x4626 = 0x6B9F
+0x4627 = 0x6BA0
+0x4628 = 0x6BA2
+0x4629 = 0x6BA3
+0x462A = 0x6BA8
+0x462B = 0x6BA9
+0x462C = 0x6BAC
+0x462D = 0x6BAD
+0x462E = 0x6BAE
+0x462F = 0x6BB0
+0x4630 = 0x6BB8
+0x4631 = 0x6BB9
+0x4632 = 0x6BBD
+0x4633 = 0x6BBE
+0x4634 = 0x6BC3
+0x4635 = 0x6BC4
+0x4636 = 0x6BC9
+0x4637 = 0x6BCC
+0x4638 = 0x6BD6
+0x4639 = 0x6BDA
+0x463A = 0x6BE1
+0x463B = 0x6BE3
+0x463C = 0x6BE6
+0x463D = 0x6BE7
+0x463E = 0x6BEE
+0x463F = 0x6BF1
+0x4640 = 0x6BF7
+0x4641 = 0x6BF9
+0x4642 = 0x6BFF
+0x4643 = 0x6C02
+0x4644 = 0x6C04
+0x4645 = 0x6C05
+0x4646 = 0x6C09
+0x4647 = 0x6C0D
+0x4648 = 0x6C0E
+0x4649 = 0x6C10
+0x464A = 0x6C12
+0x464B = 0x6C19
+0x464C = 0x6C1F
+0x464D = 0x6C26
+0x464E = 0x6C27
+0x464F = 0x6C28
+0x4650 = 0x6C2C
+0x4651 = 0x6C2E
+0x4652 = 0x6C33
+0x4653 = 0x6C35
+0x4654 = 0x6C36
+0x4655 = 0x6C3A
+0x4656 = 0x6C3B
+0x4657 = 0x6C3F
+0x4658 = 0x6C4A
+0x4659 = 0x6C4B
+0x465A = 0x6C4D
+0x465B = 0x6C4F
+0x465C = 0x6C52
+0x465D = 0x6C54
+0x465E = 0x6C59
+0x465F = 0x6C5B
+0x4660 = 0x6C5C
+0x4661 = 0x6C6B
+0x4662 = 0x6C6D
+0x4663 = 0x6C6F
+0x4664 = 0x6C74
+0x4665 = 0x6C76
+0x4666 = 0x6C78
+0x4667 = 0x6C79
+0x4668 = 0x6C7B
+0x4669 = 0x6C85
+0x466A = 0x6C86
+0x466B = 0x6C87
+0x466C = 0x6C89
+0x466D = 0x6C94
+0x466E = 0x6C95
+0x466F = 0x6C97
+0x4670 = 0x6C98
+0x4671 = 0x6C9C
+0x4672 = 0x6C9F
+0x4673 = 0x6CB0
+0x4674 = 0x6CB2
+0x4675 = 0x6CB4
+0x4676 = 0x6CC2
+0x4677 = 0x6CC6
+0x4678 = 0x6CCD
+0x4679 = 0x6CCF
+0x467A = 0x6CD0
+0x467B = 0x6CD1
+0x467C = 0x6CD2
+0x467D = 0x6CD4
+0x467E = 0x6CD6
+0x4721 = 0x6CDA
+0x4722 = 0x6CDC
+0x4723 = 0x6CE0
+0x4724 = 0x6CE7
+0x4725 = 0x6CE9
+0x4726 = 0x6CEB
+0x4727 = 0x6CEC
+0x4728 = 0x6CEE
+0x4729 = 0x6CF2
+0x472A = 0x6CF4
+0x472B = 0x6D04
+0x472C = 0x6D07
+0x472D = 0x6D0A
+0x472E = 0x6D0E
+0x472F = 0x6D0F
+0x4730 = 0x6D11
+0x4731 = 0x6D13
+0x4732 = 0x6D1A
+0x4733 = 0x6D26
+0x4734 = 0x6D27
+0x4735 = 0x6D28
+0x4736 = 0x6C67
+0x4737 = 0x6D2E
+0x4738 = 0x6D2F
+0x4739 = 0x6D31
+0x473A = 0x6D39
+0x473B = 0x6D3C
+0x473C = 0x6D3F
+0x473D = 0x6D57
+0x473E = 0x6D5E
+0x473F = 0x6D5F
+0x4740 = 0x6D61
+0x4741 = 0x6D65
+0x4742 = 0x6D67
+0x4743 = 0x6D6F
+0x4744 = 0x6D70
+0x4745 = 0x6D7C
+0x4746 = 0x6D82
+0x4747 = 0x6D87
+0x4748 = 0x6D91
+0x4749 = 0x6D92
+0x474A = 0x6D94
+0x474B = 0x6D96
+0x474C = 0x6D97
+0x474D = 0x6D98
+0x474E = 0x6DAA
+0x474F = 0x6DAC
+0x4750 = 0x6DB4
+0x4751 = 0x6DB7
+0x4752 = 0x6DB9
+0x4753 = 0x6DBD
+0x4754 = 0x6DBF
+0x4755 = 0x6DC4
+0x4756 = 0x6DC8
+0x4757 = 0x6DCA
+0x4758 = 0x6DCE
+0x4759 = 0x6DCF
+0x475A = 0x6DD6
+0x475B = 0x6DDB
+0x475C = 0x6DDD
+0x475D = 0x6DDF
+0x475E = 0x6DE0
+0x475F = 0x6DE2
+0x4760 = 0x6DE5
+0x4761 = 0x6DE9
+0x4762 = 0x6DEF
+0x4763 = 0x6DF0
+0x4764 = 0x6DF4
+0x4765 = 0x6DF6
+0x4766 = 0x6DFC
+0x4767 = 0x6E00
+0x4768 = 0x6E04
+0x4769 = 0x6E1E
+0x476A = 0x6E22
+0x476B = 0x6E27
+0x476C = 0x6E32
+0x476D = 0x6E36
+0x476E = 0x6E39
+0x476F = 0x6E3B
+0x4770 = 0x6E3C
+0x4771 = 0x6E44
+0x4772 = 0x6E45
+0x4773 = 0x6E48
+0x4774 = 0x6E49
+0x4775 = 0x6E4B
+0x4776 = 0x6E4F
+0x4777 = 0x6E51
+0x4778 = 0x6E52
+0x4779 = 0x6E53
+0x477A = 0x6E54
+0x477B = 0x6E57
+0x477C = 0x6E5C
+0x477D = 0x6E5D
+0x477E = 0x6E5E
+0x4821 = 0x6E62
+0x4822 = 0x6E63
+0x4823 = 0x6E68
+0x4824 = 0x6E73
+0x4825 = 0x6E7B
+0x4826 = 0x6E7D
+0x4827 = 0x6E8D
+0x4828 = 0x6E93
+0x4829 = 0x6E99
+0x482A = 0x6EA0
+0x482B = 0x6EA7
+0x482C = 0x6EAD
+0x482D = 0x6EAE
+0x482E = 0x6EB1
+0x482F = 0x6EB3
+0x4830 = 0x6EBB
+0x4831 = 0x6EBF
+0x4832 = 0x6EC0
+0x4833 = 0x6EC1
+0x4834 = 0x6EC3
+0x4835 = 0x6EC7
+0x4836 = 0x6EC8
+0x4837 = 0x6ECA
+0x4838 = 0x6ECD
+0x4839 = 0x6ECE
+0x483A = 0x6ECF
+0x483B = 0x6EEB
+0x483C = 0x6EED
+0x483D = 0x6EEE
+0x483E = 0x6EF9
+0x483F = 0x6EFB
+0x4840 = 0x6EFD
+0x4841 = 0x6F04
+0x4842 = 0x6F08
+0x4843 = 0x6F0A
+0x4844 = 0x6F0C
+0x4845 = 0x6F0D
+0x4846 = 0x6F16
+0x4847 = 0x6F18
+0x4848 = 0x6F1A
+0x4849 = 0x6F1B
+0x484A = 0x6F26
+0x484B = 0x6F29
+0x484C = 0x6F2A
+0x484D = 0x6F2F
+0x484E = 0x6F30
+0x484F = 0x6F33
+0x4850 = 0x6F36
+0x4851 = 0x6F3B
+0x4852 = 0x6F3C
+0x4853 = 0x6F2D
+0x4854 = 0x6F4F
+0x4855 = 0x6F51
+0x4856 = 0x6F52
+0x4857 = 0x6F53
+0x4858 = 0x6F57
+0x4859 = 0x6F59
+0x485A = 0x6F5A
+0x485B = 0x6F5D
+0x485C = 0x6F5E
+0x485D = 0x6F61
+0x485E = 0x6F62
+0x485F = 0x6F68
+0x4860 = 0x6F6C
+0x4861 = 0x6F7D
+0x4862 = 0x6F7E
+0x4863 = 0x6F83
+0x4864 = 0x6F87
+0x4865 = 0x6F88
+0x4866 = 0x6F8B
+0x4867 = 0x6F8C
+0x4868 = 0x6F8D
+0x4869 = 0x6F90
+0x486A = 0x6F92
+0x486B = 0x6F93
+0x486C = 0x6F94
+0x486D = 0x6F96
+0x486E = 0x6F9A
+0x486F = 0x6F9F
+0x4870 = 0x6FA0
+0x4871 = 0x6FA5
+0x4872 = 0x6FA6
+0x4873 = 0x6FA7
+0x4874 = 0x6FA8
+0x4875 = 0x6FAE
+0x4876 = 0x6FAF
+0x4877 = 0x6FB0
+0x4878 = 0x6FB5
+0x4879 = 0x6FB6
+0x487A = 0x6FBC
+0x487B = 0x6FC5
+0x487C = 0x6FC7
+0x487D = 0x6FC8
+0x487E = 0x6FCA
+0x4921 = 0x6FDA
+0x4922 = 0x6FDE
+0x4923 = 0x6FE8
+0x4924 = 0x6FE9
+0x4925 = 0x6FF0
+0x4926 = 0x6FF5
+0x4927 = 0x6FF9
+0x4928 = 0x6FFC
+0x4929 = 0x6FFD
+0x492A = 0x7000
+0x492B = 0x7005
+0x492C = 0x7006
+0x492D = 0x7007
+0x492E = 0x700D
+0x492F = 0x7017
+0x4930 = 0x7020
+0x4931 = 0x7023
+0x4932 = 0x702F
+0x4933 = 0x7034
+0x4934 = 0x7037
+0x4935 = 0x7039
+0x4936 = 0x703C
+0x4937 = 0x7043
+0x4938 = 0x7044
+0x4939 = 0x7048
+0x493A = 0x7049
+0x493B = 0x704A
+0x493C = 0x704B
+0x493D = 0x7054
+0x493E = 0x7055
+0x493F = 0x705D
+0x4940 = 0x705E
+0x4941 = 0x704E
+0x4942 = 0x7064
+0x4943 = 0x7065
+0x4944 = 0x706C
+0x4945 = 0x706E
+0x4946 = 0x7075
+0x4947 = 0x7076
+0x4948 = 0x707E
+0x4949 = 0x7081
+0x494A = 0x7085
+0x494B = 0x7086
+0x494C = 0x7094
+0x494D = 0x7095
+0x494E = 0x7096
+0x494F = 0x7097
+0x4950 = 0x7098
+0x4951 = 0x709B
+0x4952 = 0x70A4
+0x4953 = 0x70AB
+0x4954 = 0x70B0
+0x4955 = 0x70B1
+0x4956 = 0x70B4
+0x4957 = 0x70B7
+0x4958 = 0x70CA
+0x4959 = 0x70D1
+0x495A = 0x70D3
+0x495B = 0x70D4
+0x495C = 0x70D5
+0x495D = 0x70D6
+0x495E = 0x70D8
+0x495F = 0x70DC
+0x4960 = 0x70E4
+0x4961 = 0x70FA
+0x4962 = 0x7103
+0x4963 = 0x7104
+0x4964 = 0x7105
+0x4965 = 0x7106
+0x4966 = 0x7107
+0x4967 = 0x710B
+0x4968 = 0x710C
+0x4969 = 0x710F
+0x496A = 0x711E
+0x496B = 0x7120
+0x496C = 0x712B
+0x496D = 0x712D
+0x496E = 0x712F
+0x496F = 0x7130
+0x4970 = 0x7131
+0x4971 = 0x7138
+0x4972 = 0x7141
+0x4973 = 0x7145
+0x4974 = 0x7146
+0x4975 = 0x7147
+0x4976 = 0x714A
+0x4977 = 0x714B
+0x4978 = 0x7150
+0x4979 = 0x7152
+0x497A = 0x7157
+0x497B = 0x715A
+0x497C = 0x715C
+0x497D = 0x715E
+0x497E = 0x7160
+0x4A21 = 0x7168
+0x4A22 = 0x7179
+0x4A23 = 0x7180
+0x4A24 = 0x7185
+0x4A25 = 0x7187
+0x4A26 = 0x718C
+0x4A27 = 0x7192
+0x4A28 = 0x719A
+0x4A29 = 0x719B
+0x4A2A = 0x71A0
+0x4A2B = 0x71A2
+0x4A2C = 0x71AF
+0x4A2D = 0x71B0
+0x4A2E = 0x71B2
+0x4A2F = 0x71B3
+0x4A30 = 0x71BA
+0x4A31 = 0x71BF
+0x4A32 = 0x71C0
+0x4A33 = 0x71C1
+0x4A34 = 0x71C4
+0x4A35 = 0x71CB
+0x4A36 = 0x71CC
+0x4A37 = 0x71D3
+0x4A38 = 0x71D6
+0x4A39 = 0x71D9
+0x4A3A = 0x71DA
+0x4A3B = 0x71DC
+0x4A3C = 0x71F8
+0x4A3D = 0x71FE
+0x4A3E = 0x7200
+0x4A3F = 0x7207
+0x4A40 = 0x7208
+0x4A41 = 0x7209
+0x4A42 = 0x7213
+0x4A43 = 0x7217
+0x4A44 = 0x721A
+0x4A45 = 0x721D
+0x4A46 = 0x721F
+0x4A47 = 0x7224
+0x4A48 = 0x722B
+0x4A49 = 0x722F
+0x4A4A = 0x7234
+0x4A4B = 0x7238
+0x4A4C = 0x7239
+0x4A4D = 0x7241
+0x4A4E = 0x7242
+0x4A4F = 0x7243
+0x4A50 = 0x7245
+0x4A51 = 0x724E
+0x4A52 = 0x724F
+0x4A53 = 0x7250
+0x4A54 = 0x7253
+0x4A55 = 0x7255
+0x4A56 = 0x7256
+0x4A57 = 0x725A
+0x4A58 = 0x725C
+0x4A59 = 0x725E
+0x4A5A = 0x7260
+0x4A5B = 0x7263
+0x4A5C = 0x7268
+0x4A5D = 0x726B
+0x4A5E = 0x726E
+0x4A5F = 0x726F
+0x4A60 = 0x7271
+0x4A61 = 0x7277
+0x4A62 = 0x7278
+0x4A63 = 0x727B
+0x4A64 = 0x727C
+0x4A65 = 0x727F
+0x4A66 = 0x7284
+0x4A67 = 0x7289
+0x4A68 = 0x728D
+0x4A69 = 0x728E
+0x4A6A = 0x7293
+0x4A6B = 0x729B
+0x4A6C = 0x72A8
+0x4A6D = 0x72AD
+0x4A6E = 0x72AE
+0x4A6F = 0x72B1
+0x4A70 = 0x72B4
+0x4A71 = 0x72BE
+0x4A72 = 0x72C1
+0x4A73 = 0x72C7
+0x4A74 = 0x72C9
+0x4A75 = 0x72CC
+0x4A76 = 0x72D5
+0x4A77 = 0x72D6
+0x4A78 = 0x72D8
+0x4A79 = 0x72DF
+0x4A7A = 0x72E5
+0x4A7B = 0x72F3
+0x4A7C = 0x72F4
+0x4A7D = 0x72FA
+0x4A7E = 0x72FB
+0x4B21 = 0x72FE
+0x4B22 = 0x7302
+0x4B23 = 0x7304
+0x4B24 = 0x7305
+0x4B25 = 0x7307
+0x4B26 = 0x730B
+0x4B27 = 0x730D
+0x4B28 = 0x7312
+0x4B29 = 0x7313
+0x4B2A = 0x7318
+0x4B2B = 0x7319
+0x4B2C = 0x731E
+0x4B2D = 0x7322
+0x4B2E = 0x7324
+0x4B2F = 0x7327
+0x4B30 = 0x7328
+0x4B31 = 0x732C
+0x4B32 = 0x7331
+0x4B33 = 0x7332
+0x4B34 = 0x7335
+0x4B35 = 0x733A
+0x4B36 = 0x733B
+0x4B37 = 0x733D
+0x4B38 = 0x7343
+0x4B39 = 0x734D
+0x4B3A = 0x7350
+0x4B3B = 0x7352
+0x4B3C = 0x7356
+0x4B3D = 0x7358
+0x4B3E = 0x735D
+0x4B3F = 0x735E
+0x4B40 = 0x735F
+0x4B41 = 0x7360
+0x4B42 = 0x7366
+0x4B43 = 0x7367
+0x4B44 = 0x7369
+0x4B45 = 0x736B
+0x4B46 = 0x736C
+0x4B47 = 0x736E
+0x4B48 = 0x736F
+0x4B49 = 0x7371
+0x4B4A = 0x7377
+0x4B4B = 0x7379
+0x4B4C = 0x737C
+0x4B4D = 0x7380
+0x4B4E = 0x7381
+0x4B4F = 0x7383
+0x4B50 = 0x7385
+0x4B51 = 0x7386
+0x4B52 = 0x738E
+0x4B53 = 0x7390
+0x4B54 = 0x7393
+0x4B55 = 0x7395
+0x4B56 = 0x7397
+0x4B57 = 0x7398
+0x4B58 = 0x739C
+0x4B59 = 0x739E
+0x4B5A = 0x739F
+0x4B5B = 0x73A0
+0x4B5C = 0x73A2
+0x4B5D = 0x73A5
+0x4B5E = 0x73A6
+0x4B5F = 0x73AA
+0x4B60 = 0x73AB
+0x4B61 = 0x73AD
+0x4B62 = 0x73B5
+0x4B63 = 0x73B7
+0x4B64 = 0x73B9
+0x4B65 = 0x73BC
+0x4B66 = 0x73BD
+0x4B67 = 0x73BF
+0x4B68 = 0x73C5
+0x4B69 = 0x73C6
+0x4B6A = 0x73C9
+0x4B6B = 0x73CB
+0x4B6C = 0x73CC
+0x4B6D = 0x73CF
+0x4B6E = 0x73D2
+0x4B6F = 0x73D3
+0x4B70 = 0x73D6
+0x4B71 = 0x73D9
+0x4B72 = 0x73DD
+0x4B73 = 0x73E1
+0x4B74 = 0x73E3
+0x4B75 = 0x73E6
+0x4B76 = 0x73E7
+0x4B77 = 0x73E9
+0x4B78 = 0x73F4
+0x4B79 = 0x73F5
+0x4B7A = 0x73F7
+0x4B7B = 0x73F9
+0x4B7C = 0x73FA
+0x4B7D = 0x73FB
+0x4B7E = 0x73FD
+0x4C21 = 0x73FF
+0x4C22 = 0x7400
+0x4C23 = 0x7401
+0x4C24 = 0x7404
+0x4C25 = 0x7407
+0x4C26 = 0x740A
+0x4C27 = 0x7411
+0x4C28 = 0x741A
+0x4C29 = 0x741B
+0x4C2A = 0x7424
+0x4C2B = 0x7426
+0x4C2C = 0x7428
+0x4C2D = 0x7429
+0x4C2E = 0x742A
+0x4C2F = 0x742B
+0x4C30 = 0x742C
+0x4C31 = 0x742D
+0x4C32 = 0x742E
+0x4C33 = 0x742F
+0x4C34 = 0x7430
+0x4C35 = 0x7431
+0x4C36 = 0x7439
+0x4C37 = 0x7440
+0x4C38 = 0x7443
+0x4C39 = 0x7444
+0x4C3A = 0x7446
+0x4C3B = 0x7447
+0x4C3C = 0x744B
+0x4C3D = 0x744D
+0x4C3E = 0x7451
+0x4C3F = 0x7452
+0x4C40 = 0x7457
+0x4C41 = 0x745D
+0x4C42 = 0x7462
+0x4C43 = 0x7466
+0x4C44 = 0x7467
+0x4C45 = 0x7468
+0x4C46 = 0x746B
+0x4C47 = 0x746D
+0x4C48 = 0x746E
+0x4C49 = 0x7471
+0x4C4A = 0x7472
+0x4C4B = 0x7480
+0x4C4C = 0x7481
+0x4C4D = 0x7485
+0x4C4E = 0x7486
+0x4C4F = 0x7487
+0x4C50 = 0x7489
+0x4C51 = 0x748F
+0x4C52 = 0x7490
+0x4C53 = 0x7491
+0x4C54 = 0x7492
+0x4C55 = 0x7498
+0x4C56 = 0x7499
+0x4C57 = 0x749A
+0x4C58 = 0x749C
+0x4C59 = 0x749F
+0x4C5A = 0x74A0
+0x4C5B = 0x74A1
+0x4C5C = 0x74A3
+0x4C5D = 0x74A6
+0x4C5E = 0x74A8
+0x4C5F = 0x74A9
+0x4C60 = 0x74AA
+0x4C61 = 0x74AB
+0x4C62 = 0x74AE
+0x4C63 = 0x74AF
+0x4C64 = 0x74B1
+0x4C65 = 0x74B2
+0x4C66 = 0x74B5
+0x4C67 = 0x74B9
+0x4C68 = 0x74BB
+0x4C69 = 0x74BF
+0x4C6A = 0x74C8
+0x4C6B = 0x74C9
+0x4C6C = 0x74CC
+0x4C6D = 0x74D0
+0x4C6E = 0x74D3
+0x4C6F = 0x74D8
+0x4C70 = 0x74DA
+0x4C71 = 0x74DB
+0x4C72 = 0x74DE
+0x4C73 = 0x74DF
+0x4C74 = 0x74E4
+0x4C75 = 0x74E8
+0x4C76 = 0x74EA
+0x4C77 = 0x74EB
+0x4C78 = 0x74EF
+0x4C79 = 0x74F4
+0x4C7A = 0x74FA
+0x4C7B = 0x74FB
+0x4C7C = 0x74FC
+0x4C7D = 0x74FF
+0x4C7E = 0x7506
+0x4D21 = 0x7512
+0x4D22 = 0x7516
+0x4D23 = 0x7517
+0x4D24 = 0x7520
+0x4D25 = 0x7521
+0x4D26 = 0x7524
+0x4D27 = 0x7527
+0x4D28 = 0x7529
+0x4D29 = 0x752A
+0x4D2A = 0x752F
+0x4D2B = 0x7536
+0x4D2C = 0x7539
+0x4D2D = 0x753D
+0x4D2E = 0x753E
+0x4D2F = 0x753F
+0x4D30 = 0x7540
+0x4D31 = 0x7543
+0x4D32 = 0x7547
+0x4D33 = 0x7548
+0x4D34 = 0x754E
+0x4D35 = 0x7550
+0x4D36 = 0x7552
+0x4D37 = 0x7557
+0x4D38 = 0x755E
+0x4D39 = 0x755F
+0x4D3A = 0x7561
+0x4D3B = 0x756F
+0x4D3C = 0x7571
+0x4D3D = 0x7579
+0x4D3E = 0x757A
+0x4D3F = 0x757B
+0x4D40 = 0x757C
+0x4D41 = 0x757D
+0x4D42 = 0x757E
+0x4D43 = 0x7581
+0x4D44 = 0x7585
+0x4D45 = 0x7590
+0x4D46 = 0x7592
+0x4D47 = 0x7593
+0x4D48 = 0x7595
+0x4D49 = 0x7599
+0x4D4A = 0x759C
+0x4D4B = 0x75A2
+0x4D4C = 0x75A4
+0x4D4D = 0x75B4
+0x4D4E = 0x75BA
+0x4D4F = 0x75BF
+0x4D50 = 0x75C0
+0x4D51 = 0x75C1
+0x4D52 = 0x75C4
+0x4D53 = 0x75C6
+0x4D54 = 0x75CC
+0x4D55 = 0x75CE
+0x4D56 = 0x75CF
+0x4D57 = 0x75D7
+0x4D58 = 0x75DC
+0x4D59 = 0x75DF
+0x4D5A = 0x75E0
+0x4D5B = 0x75E1
+0x4D5C = 0x75E4
+0x4D5D = 0x75E7
+0x4D5E = 0x75EC
+0x4D5F = 0x75EE
+0x4D60 = 0x75EF
+0x4D61 = 0x75F1
+0x4D62 = 0x75F9
+0x4D63 = 0x7600
+0x4D64 = 0x7602
+0x4D65 = 0x7603
+0x4D66 = 0x7604
+0x4D67 = 0x7607
+0x4D68 = 0x7608
+0x4D69 = 0x760A
+0x4D6A = 0x760C
+0x4D6B = 0x760F
+0x4D6C = 0x7612
+0x4D6D = 0x7613
+0x4D6E = 0x7615
+0x4D6F = 0x7616
+0x4D70 = 0x7619
+0x4D71 = 0x761B
+0x4D72 = 0x761C
+0x4D73 = 0x761D
+0x4D74 = 0x761E
+0x4D75 = 0x7623
+0x4D76 = 0x7625
+0x4D77 = 0x7626
+0x4D78 = 0x7629
+0x4D79 = 0x762D
+0x4D7A = 0x7632
+0x4D7B = 0x7633
+0x4D7C = 0x7635
+0x4D7D = 0x7638
+0x4D7E = 0x7639
+0x4E21 = 0x763A
+0x4E22 = 0x763C
+0x4E23 = 0x764A
+0x4E24 = 0x7640
+0x4E25 = 0x7641
+0x4E26 = 0x7643
+0x4E27 = 0x7644
+0x4E28 = 0x7645
+0x4E29 = 0x7649
+0x4E2A = 0x764B
+0x4E2B = 0x7655
+0x4E2C = 0x7659
+0x4E2D = 0x765F
+0x4E2E = 0x7664
+0x4E2F = 0x7665
+0x4E30 = 0x766D
+0x4E31 = 0x766E
+0x4E32 = 0x766F
+0x4E33 = 0x7671
+0x4E34 = 0x7674
+0x4E35 = 0x7681
+0x4E36 = 0x7685
+0x4E37 = 0x768C
+0x4E38 = 0x768D
+0x4E39 = 0x7695
+0x4E3A = 0x769B
+0x4E3B = 0x769C
+0x4E3C = 0x769D
+0x4E3D = 0x769F
+0x4E3E = 0x76A0
+0x4E3F = 0x76A2
+0x4E40 = 0x76A3
+0x4E41 = 0x76A4
+0x4E42 = 0x76A5
+0x4E43 = 0x76A6
+0x4E44 = 0x76A7
+0x4E45 = 0x76A8
+0x4E46 = 0x76AA
+0x4E47 = 0x76AD
+0x4E48 = 0x76BD
+0x4E49 = 0x76C1
+0x4E4A = 0x76C5
+0x4E4B = 0x76C9
+0x4E4C = 0x76CB
+0x4E4D = 0x76CC
+0x4E4E = 0x76CE
+0x4E4F = 0x76D4
+0x4E50 = 0x76D9
+0x4E51 = 0x76E0
+0x4E52 = 0x76E6
+0x4E53 = 0x76E8
+0x4E54 = 0x76EC
+0x4E55 = 0x76F0
+0x4E56 = 0x76F1
+0x4E57 = 0x76F6
+0x4E58 = 0x76F9
+0x4E59 = 0x76FC
+0x4E5A = 0x7700
+0x4E5B = 0x7706
+0x4E5C = 0x770A
+0x4E5D = 0x770E
+0x4E5E = 0x7712
+0x4E5F = 0x7714
+0x4E60 = 0x7715
+0x4E61 = 0x7717
+0x4E62 = 0x7719
+0x4E63 = 0x771A
+0x4E64 = 0x771C
+0x4E65 = 0x7722
+0x4E66 = 0x7728
+0x4E67 = 0x772D
+0x4E68 = 0x772E
+0x4E69 = 0x772F
+0x4E6A = 0x7734
+0x4E6B = 0x7735
+0x4E6C = 0x7736
+0x4E6D = 0x7739
+0x4E6E = 0x773D
+0x4E6F = 0x773E
+0x4E70 = 0x7742
+0x4E71 = 0x7745
+0x4E72 = 0x7746
+0x4E73 = 0x774A
+0x4E74 = 0x774D
+0x4E75 = 0x774E
+0x4E76 = 0x774F
+0x4E77 = 0x7752
+0x4E78 = 0x7756
+0x4E79 = 0x7757
+0x4E7A = 0x775C
+0x4E7B = 0x775E
+0x4E7C = 0x775F
+0x4E7D = 0x7760
+0x4E7E = 0x7762
+0x4F21 = 0x7764
+0x4F22 = 0x7767
+0x4F23 = 0x776A
+0x4F24 = 0x776C
+0x4F25 = 0x7770
+0x4F26 = 0x7772
+0x4F27 = 0x7773
+0x4F28 = 0x7774
+0x4F29 = 0x777A
+0x4F2A = 0x777D
+0x4F2B = 0x7780
+0x4F2C = 0x7784
+0x4F2D = 0x778C
+0x4F2E = 0x778D
+0x4F2F = 0x7794
+0x4F30 = 0x7795
+0x4F31 = 0x7796
+0x4F32 = 0x779A
+0x4F33 = 0x779F
+0x4F34 = 0x77A2
+0x4F35 = 0x77A7
+0x4F36 = 0x77AA
+0x4F37 = 0x77AE
+0x4F38 = 0x77AF
+0x4F39 = 0x77B1
+0x4F3A = 0x77B5
+0x4F3B = 0x77BE
+0x4F3C = 0x77C3
+0x4F3D = 0x77C9
+0x4F3E = 0x77D1
+0x4F3F = 0x77D2
+0x4F40 = 0x77D5
+0x4F41 = 0x77D9
+0x4F42 = 0x77DE
+0x4F43 = 0x77DF
+0x4F44 = 0x77E0
+0x4F45 = 0x77E4
+0x4F46 = 0x77E6
+0x4F47 = 0x77EA
+0x4F48 = 0x77EC
+0x4F49 = 0x77F0
+0x4F4A = 0x77F1
+0x4F4B = 0x77F4
+0x4F4C = 0x77F8
+0x4F4D = 0x77FB
+0x4F4E = 0x7805
+0x4F4F = 0x7806
+0x4F50 = 0x7809
+0x4F51 = 0x780D
+0x4F52 = 0x780E
+0x4F53 = 0x7811
+0x4F54 = 0x781D
+0x4F55 = 0x7821
+0x4F56 = 0x7822
+0x4F57 = 0x7823
+0x4F58 = 0x782D
+0x4F59 = 0x782E
+0x4F5A = 0x7830
+0x4F5B = 0x7835
+0x4F5C = 0x7837
+0x4F5D = 0x7843
+0x4F5E = 0x7844
+0x4F5F = 0x7847
+0x4F60 = 0x7848
+0x4F61 = 0x784C
+0x4F62 = 0x784E
+0x4F63 = 0x7852
+0x4F64 = 0x785C
+0x4F65 = 0x785E
+0x4F66 = 0x7860
+0x4F67 = 0x7861
+0x4F68 = 0x7863
+0x4F69 = 0x7864
+0x4F6A = 0x7868
+0x4F6B = 0x786A
+0x4F6C = 0x786E
+0x4F6D = 0x787A
+0x4F6E = 0x787E
+0x4F6F = 0x788A
+0x4F70 = 0x788F
+0x4F71 = 0x7894
+0x4F72 = 0x7898
+0x4F73 = 0x78A1
+0x4F74 = 0x789D
+0x4F75 = 0x789E
+0x4F76 = 0x789F
+0x4F77 = 0x78A4
+0x4F78 = 0x78A8
+0x4F79 = 0x78AC
+0x4F7A = 0x78AD
+0x4F7B = 0x78B0
+0x4F7C = 0x78B1
+0x4F7D = 0x78B2
+0x4F7E = 0x78B3
+0x5021 = 0x78BB
+0x5022 = 0x78BD
+0x5023 = 0x78BF
+0x5024 = 0x78C7
+0x5025 = 0x78C8
+0x5026 = 0x78C9
+0x5027 = 0x78CC
+0x5028 = 0x78CE
+0x5029 = 0x78D2
+0x502A = 0x78D3
+0x502B = 0x78D5
+0x502C = 0x78D6
+0x502D = 0x78E4
+0x502E = 0x78DB
+0x502F = 0x78DF
+0x5030 = 0x78E0
+0x5031 = 0x78E1
+0x5032 = 0x78E6
+0x5033 = 0x78EA
+0x5034 = 0x78F2
+0x5035 = 0x78F3
+0x5036 = 0x7900
+0x5037 = 0x78F6
+0x5038 = 0x78F7
+0x5039 = 0x78FA
+0x503A = 0x78FB
+0x503B = 0x78FF
+0x503C = 0x7906
+0x503D = 0x790C
+0x503E = 0x7910
+0x503F = 0x791A
+0x5040 = 0x791C
+0x5041 = 0x791E
+0x5042 = 0x791F
+0x5043 = 0x7920
+0x5044 = 0x7925
+0x5045 = 0x7927
+0x5046 = 0x7929
+0x5047 = 0x792D
+0x5048 = 0x7931
+0x5049 = 0x7934
+0x504A = 0x7935
+0x504B = 0x793B
+0x504C = 0x793D
+0x504D = 0x793F
+0x504E = 0x7944
+0x504F = 0x7945
+0x5050 = 0x7946
+0x5051 = 0x794A
+0x5052 = 0x794B
+0x5053 = 0x794F
+0x5054 = 0x7951
+0x5055 = 0x7954
+0x5056 = 0x7958
+0x5057 = 0x795B
+0x5058 = 0x795C
+0x5059 = 0x7967
+0x505A = 0x7969
+0x505B = 0x796B
+0x505C = 0x7972
+0x505D = 0x7979
+0x505E = 0x797B
+0x505F = 0x797C
+0x5060 = 0x797E
+0x5061 = 0x798B
+0x5062 = 0x798C
+0x5063 = 0x7991
+0x5064 = 0x7993
+0x5065 = 0x7994
+0x5066 = 0x7995
+0x5067 = 0x7996
+0x5068 = 0x7998
+0x5069 = 0x799B
+0x506A = 0x799C
+0x506B = 0x79A1
+0x506C = 0x79A8
+0x506D = 0x79A9
+0x506E = 0x79AB
+0x506F = 0x79AF
+0x5070 = 0x79B1
+0x5071 = 0x79B4
+0x5072 = 0x79B8
+0x5073 = 0x79BB
+0x5074 = 0x79C2
+0x5075 = 0x79C4
+0x5076 = 0x79C7
+0x5077 = 0x79C8
+0x5078 = 0x79CA
+0x5079 = 0x79CF
+0x507A = 0x79D4
+0x507B = 0x79D6
+0x507C = 0x79DA
+0x507D = 0x79DD
+0x507E = 0x79DE
+0x5121 = 0x79E0
+0x5122 = 0x79E2
+0x5123 = 0x79E5
+0x5124 = 0x79EA
+0x5125 = 0x79EB
+0x5126 = 0x79ED
+0x5127 = 0x79F1
+0x5128 = 0x79F8
+0x5129 = 0x79FC
+0x512A = 0x7A02
+0x512B = 0x7A03
+0x512C = 0x7A07
+0x512D = 0x7A09
+0x512E = 0x7A0A
+0x512F = 0x7A0C
+0x5130 = 0x7A11
+0x5131 = 0x7A15
+0x5132 = 0x7A1B
+0x5133 = 0x7A1E
+0x5134 = 0x7A21
+0x5135 = 0x7A27
+0x5136 = 0x7A2B
+0x5137 = 0x7A2D
+0x5138 = 0x7A2F
+0x5139 = 0x7A30
+0x513A = 0x7A34
+0x513B = 0x7A35
+0x513C = 0x7A38
+0x513D = 0x7A39
+0x513E = 0x7A3A
+0x513F = 0x7A44
+0x5140 = 0x7A45
+0x5141 = 0x7A47
+0x5142 = 0x7A48
+0x5143 = 0x7A4C
+0x5144 = 0x7A55
+0x5145 = 0x7A56
+0x5146 = 0x7A59
+0x5147 = 0x7A5C
+0x5148 = 0x7A5D
+0x5149 = 0x7A5F
+0x514A = 0x7A60
+0x514B = 0x7A65
+0x514C = 0x7A67
+0x514D = 0x7A6A
+0x514E = 0x7A6D
+0x514F = 0x7A75
+0x5150 = 0x7A78
+0x5151 = 0x7A7E
+0x5152 = 0x7A80
+0x5153 = 0x7A82
+0x5154 = 0x7A85
+0x5155 = 0x7A86
+0x5156 = 0x7A8A
+0x5157 = 0x7A8B
+0x5158 = 0x7A90
+0x5159 = 0x7A91
+0x515A = 0x7A94
+0x515B = 0x7A9E
+0x515C = 0x7AA0
+0x515D = 0x7AA3
+0x515E = 0x7AAC
+0x515F = 0x7AB3
+0x5160 = 0x7AB5
+0x5161 = 0x7AB9
+0x5162 = 0x7ABB
+0x5163 = 0x7ABC
+0x5164 = 0x7AC6
+0x5165 = 0x7AC9
+0x5166 = 0x7ACC
+0x5167 = 0x7ACE
+0x5168 = 0x7AD1
+0x5169 = 0x7ADB
+0x516A = 0x7AE8
+0x516B = 0x7AE9
+0x516C = 0x7AEB
+0x516D = 0x7AEC
+0x516E = 0x7AF1
+0x516F = 0x7AF4
+0x5170 = 0x7AFB
+0x5171 = 0x7AFD
+0x5172 = 0x7AFE
+0x5173 = 0x7B07
+0x5174 = 0x7B14
+0x5175 = 0x7B1F
+0x5176 = 0x7B23
+0x5177 = 0x7B27
+0x5178 = 0x7B29
+0x5179 = 0x7B2A
+0x517A = 0x7B2B
+0x517B = 0x7B2D
+0x517C = 0x7B2E
+0x517D = 0x7B2F
+0x517E = 0x7B30
+0x5221 = 0x7B31
+0x5222 = 0x7B34
+0x5223 = 0x7B3D
+0x5224 = 0x7B3F
+0x5225 = 0x7B40
+0x5226 = 0x7B41
+0x5227 = 0x7B47
+0x5228 = 0x7B4E
+0x5229 = 0x7B55
+0x522A = 0x7B60
+0x522B = 0x7B64
+0x522C = 0x7B66
+0x522D = 0x7B69
+0x522E = 0x7B6A
+0x522F = 0x7B6D
+0x5230 = 0x7B6F
+0x5231 = 0x7B72
+0x5232 = 0x7B73
+0x5233 = 0x7B77
+0x5234 = 0x7B84
+0x5235 = 0x7B89
+0x5236 = 0x7B8E
+0x5237 = 0x7B90
+0x5238 = 0x7B91
+0x5239 = 0x7B96
+0x523A = 0x7B9B
+0x523B = 0x7B9E
+0x523C = 0x7BA0
+0x523D = 0x7BA5
+0x523E = 0x7BAC
+0x523F = 0x7BAF
+0x5240 = 0x7BB0
+0x5241 = 0x7BB2
+0x5242 = 0x7BB5
+0x5243 = 0x7BB6
+0x5244 = 0x7BBA
+0x5245 = 0x7BBB
+0x5246 = 0x7BBC
+0x5247 = 0x7BBD
+0x5248 = 0x7BC2
+0x5249 = 0x7BC5
+0x524A = 0x7BC8
+0x524B = 0x7BCA
+0x524C = 0x7BD4
+0x524D = 0x7BD6
+0x524E = 0x7BD7
+0x524F = 0x7BD9
+0x5250 = 0x7BDA
+0x5251 = 0x7BDB
+0x5252 = 0x7BE8
+0x5253 = 0x7BEA
+0x5254 = 0x7BF2
+0x5255 = 0x7BF4
+0x5256 = 0x7BF5
+0x5257 = 0x7BF8
+0x5258 = 0x7BF9
+0x5259 = 0x7BFA
+0x525A = 0x7BFC
+0x525B = 0x7BFE
+0x525C = 0x7C01
+0x525D = 0x7C02
+0x525E = 0x7C03
+0x525F = 0x7C04
+0x5260 = 0x7C06
+0x5261 = 0x7C09
+0x5262 = 0x7C0B
+0x5263 = 0x7C0C
+0x5264 = 0x7C0E
+0x5265 = 0x7C0F
+0x5266 = 0x7C19
+0x5267 = 0x7C1B
+0x5268 = 0x7C20
+0x5269 = 0x7C25
+0x526A = 0x7C26
+0x526B = 0x7C28
+0x526C = 0x7C2C
+0x526D = 0x7C31
+0x526E = 0x7C33
+0x526F = 0x7C34
+0x5270 = 0x7C36
+0x5271 = 0x7C39
+0x5272 = 0x7C3A
+0x5273 = 0x7C46
+0x5274 = 0x7C4A
+0x5275 = 0x7C55
+0x5276 = 0x7C51
+0x5277 = 0x7C52
+0x5278 = 0x7C53
+0x5279 = 0x7C59
+0x527A = 0x7C5A
+0x527B = 0x7C5B
+0x527C = 0x7C5C
+0x527D = 0x7C5D
+0x527E = 0x7C5E
+0x5321 = 0x7C61
+0x5322 = 0x7C63
+0x5323 = 0x7C67
+0x5324 = 0x7C69
+0x5325 = 0x7C6D
+0x5326 = 0x7C6E
+0x5327 = 0x7C70
+0x5328 = 0x7C72
+0x5329 = 0x7C79
+0x532A = 0x7C7C
+0x532B = 0x7C7D
+0x532C = 0x7C86
+0x532D = 0x7C87
+0x532E = 0x7C8F
+0x532F = 0x7C94
+0x5330 = 0x7C9E
+0x5331 = 0x7CA0
+0x5332 = 0x7CA6
+0x5333 = 0x7CB0
+0x5334 = 0x7CB6
+0x5335 = 0x7CB7
+0x5336 = 0x7CBA
+0x5337 = 0x7CBB
+0x5338 = 0x7CBC
+0x5339 = 0x7CBF
+0x533A = 0x7CC4
+0x533B = 0x7CC7
+0x533C = 0x7CC8
+0x533D = 0x7CC9
+0x533E = 0x7CCD
+0x533F = 0x7CCF
+0x5340 = 0x7CD3
+0x5341 = 0x7CD4
+0x5342 = 0x7CD5
+0x5343 = 0x7CD7
+0x5344 = 0x7CD9
+0x5345 = 0x7CDA
+0x5346 = 0x7CDD
+0x5347 = 0x7CE6
+0x5348 = 0x7CE9
+0x5349 = 0x7CEB
+0x534A = 0x7CF5
+0x534B = 0x7D03
+0x534C = 0x7D07
+0x534D = 0x7D08
+0x534E = 0x7D09
+0x534F = 0x7D0F
+0x5350 = 0x7D11
+0x5351 = 0x7D12
+0x5352 = 0x7D13
+0x5353 = 0x7D16
+0x5354 = 0x7D1D
+0x5355 = 0x7D1E
+0x5356 = 0x7D23
+0x5357 = 0x7D26
+0x5358 = 0x7D2A
+0x5359 = 0x7D2D
+0x535A = 0x7D31
+0x535B = 0x7D3C
+0x535C = 0x7D3D
+0x535D = 0x7D3E
+0x535E = 0x7D40
+0x535F = 0x7D41
+0x5360 = 0x7D47
+0x5361 = 0x7D48
+0x5362 = 0x7D4D
+0x5363 = 0x7D51
+0x5364 = 0x7D53
+0x5365 = 0x7D57
+0x5366 = 0x7D59
+0x5367 = 0x7D5A
+0x5368 = 0x7D5C
+0x5369 = 0x7D5D
+0x536A = 0x7D65
+0x536B = 0x7D67
+0x536C = 0x7D6A
+0x536D = 0x7D70
+0x536E = 0x7D78
+0x536F = 0x7D7A
+0x5370 = 0x7D7B
+0x5371 = 0x7D7F
+0x5372 = 0x7D81
+0x5373 = 0x7D82
+0x5374 = 0x7D83
+0x5375 = 0x7D85
+0x5376 = 0x7D86
+0x5377 = 0x7D88
+0x5378 = 0x7D8B
+0x5379 = 0x7D8C
+0x537A = 0x7D8D
+0x537B = 0x7D91
+0x537C = 0x7D96
+0x537D = 0x7D97
+0x537E = 0x7D9D
+0x5421 = 0x7D9E
+0x5422 = 0x7DA6
+0x5423 = 0x7DA7
+0x5424 = 0x7DAA
+0x5425 = 0x7DB3
+0x5426 = 0x7DB6
+0x5427 = 0x7DB7
+0x5428 = 0x7DB9
+0x5429 = 0x7DC2
+0x542A = 0x7DC3
+0x542B = 0x7DC4
+0x542C = 0x7DC5
+0x542D = 0x7DC6
+0x542E = 0x7DCC
+0x542F = 0x7DCD
+0x5430 = 0x7DCE
+0x5431 = 0x7DD7
+0x5432 = 0x7DD9
+0x5433 = 0x7E00
+0x5434 = 0x7DE2
+0x5435 = 0x7DE5
+0x5436 = 0x7DE6
+0x5437 = 0x7DEA
+0x5438 = 0x7DEB
+0x5439 = 0x7DED
+0x543A = 0x7DF1
+0x543B = 0x7DF5
+0x543C = 0x7DF6
+0x543D = 0x7DF9
+0x543E = 0x7DFA
+0x543F = 0x7E08
+0x5440 = 0x7E10
+0x5441 = 0x7E11
+0x5442 = 0x7E15
+0x5443 = 0x7E17
+0x5444 = 0x7E1C
+0x5445 = 0x7E1D
+0x5446 = 0x7E20
+0x5447 = 0x7E27
+0x5448 = 0x7E28
+0x5449 = 0x7E2C
+0x544A = 0x7E2D
+0x544B = 0x7E2F
+0x544C = 0x7E33
+0x544D = 0x7E36
+0x544E = 0x7E3F
+0x544F = 0x7E44
+0x5450 = 0x7E45
+0x5451 = 0x7E47
+0x5452 = 0x7E4E
+0x5453 = 0x7E50
+0x5454 = 0x7E52
+0x5455 = 0x7E58
+0x5456 = 0x7E5F
+0x5457 = 0x7E61
+0x5458 = 0x7E62
+0x5459 = 0x7E65
+0x545A = 0x7E6B
+0x545B = 0x7E6E
+0x545C = 0x7E6F
+0x545D = 0x7E73
+0x545E = 0x7E78
+0x545F = 0x7E7E
+0x5460 = 0x7E81
+0x5461 = 0x7E86
+0x5462 = 0x7E87
+0x5463 = 0x7E8A
+0x5464 = 0x7E8D
+0x5465 = 0x7E91
+0x5466 = 0x7E95
+0x5467 = 0x7E98
+0x5468 = 0x7E9A
+0x5469 = 0x7E9D
+0x546A = 0x7E9E
+0x546B = 0x7F3C
+0x546C = 0x7F3B
+0x546D = 0x7F3D
+0x546E = 0x7F3E
+0x546F = 0x7F3F
+0x5470 = 0x7F43
+0x5471 = 0x7F44
+0x5472 = 0x7F47
+0x5473 = 0x7F4F
+0x5474 = 0x7F52
+0x5475 = 0x7F53
+0x5476 = 0x7F5B
+0x5477 = 0x7F5C
+0x5478 = 0x7F5D
+0x5479 = 0x7F61
+0x547A = 0x7F63
+0x547B = 0x7F64
+0x547C = 0x7F65
+0x547D = 0x7F66
+0x547E = 0x7F6D
+0x5521 = 0x7F71
+0x5522 = 0x7F7D
+0x5523 = 0x7F7E
+0x5524 = 0x7F7F
+0x5525 = 0x7F80
+0x5526 = 0x7F8B
+0x5527 = 0x7F8D
+0x5528 = 0x7F8F
+0x5529 = 0x7F90
+0x552A = 0x7F91
+0x552B = 0x7F96
+0x552C = 0x7F97
+0x552D = 0x7F9C
+0x552E = 0x7FA1
+0x552F = 0x7FA2
+0x5530 = 0x7FA6
+0x5531 = 0x7FAA
+0x5532 = 0x7FAD
+0x5533 = 0x7FB4
+0x5534 = 0x7FBC
+0x5535 = 0x7FBF
+0x5536 = 0x7FC0
+0x5537 = 0x7FC3
+0x5538 = 0x7FC8
+0x5539 = 0x7FCE
+0x553A = 0x7FCF
+0x553B = 0x7FDB
+0x553C = 0x7FDF
+0x553D = 0x7FE3
+0x553E = 0x7FE5
+0x553F = 0x7FE8
+0x5540 = 0x7FEC
+0x5541 = 0x7FEE
+0x5542 = 0x7FEF
+0x5543 = 0x7FF2
+0x5544 = 0x7FFA
+0x5545 = 0x7FFD
+0x5546 = 0x7FFE
+0x5547 = 0x7FFF
+0x5548 = 0x8007
+0x5549 = 0x8008
+0x554A = 0x800A
+0x554B = 0x800D
+0x554C = 0x800E
+0x554D = 0x800F
+0x554E = 0x8011
+0x554F = 0x8013
+0x5550 = 0x8014
+0x5551 = 0x8016
+0x5552 = 0x801D
+0x5553 = 0x801E
+0x5554 = 0x801F
+0x5555 = 0x8020
+0x5556 = 0x8024
+0x5557 = 0x8026
+0x5558 = 0x802C
+0x5559 = 0x802E
+0x555A = 0x8030
+0x555B = 0x8034
+0x555C = 0x8035
+0x555D = 0x8037
+0x555E = 0x8039
+0x555F = 0x803A
+0x5560 = 0x803C
+0x5561 = 0x803E
+0x5562 = 0x8040
+0x5563 = 0x8044
+0x5564 = 0x8060
+0x5565 = 0x8064
+0x5566 = 0x8066
+0x5567 = 0x806D
+0x5568 = 0x8071
+0x5569 = 0x8075
+0x556A = 0x8081
+0x556B = 0x8088
+0x556C = 0x808E
+0x556D = 0x809C
+0x556E = 0x809E
+0x556F = 0x80A6
+0x5570 = 0x80A7
+0x5571 = 0x80AB
+0x5572 = 0x80B8
+0x5573 = 0x80B9
+0x5574 = 0x80C8
+0x5575 = 0x80CD
+0x5576 = 0x80CF
+0x5577 = 0x80D2
+0x5578 = 0x80D4
+0x5579 = 0x80D5
+0x557A = 0x80D7
+0x557B = 0x80D8
+0x557C = 0x80E0
+0x557D = 0x80ED
+0x557E = 0x80EE
+0x5621 = 0x80F0
+0x5622 = 0x80F2
+0x5623 = 0x80F3
+0x5624 = 0x80F6
+0x5625 = 0x80F9
+0x5626 = 0x80FA
+0x5627 = 0x80FE
+0x5628 = 0x8103
+0x5629 = 0x810B
+0x562A = 0x8116
+0x562B = 0x8117
+0x562C = 0x8118
+0x562D = 0x811C
+0x562E = 0x811E
+0x562F = 0x8120
+0x5630 = 0x8124
+0x5631 = 0x8127
+0x5632 = 0x812C
+0x5633 = 0x8130
+0x5634 = 0x8135
+0x5635 = 0x813A
+0x5636 = 0x813C
+0x5637 = 0x8145
+0x5638 = 0x8147
+0x5639 = 0x814A
+0x563A = 0x814C
+0x563B = 0x8152
+0x563C = 0x8157
+0x563D = 0x8160
+0x563E = 0x8161
+0x563F = 0x8167
+0x5640 = 0x8168
+0x5641 = 0x8169
+0x5642 = 0x816D
+0x5643 = 0x816F
+0x5644 = 0x8177
+0x5645 = 0x8181
+0x5646 = 0x8190
+0x5647 = 0x8184
+0x5648 = 0x8185
+0x5649 = 0x8186
+0x564A = 0x818B
+0x564B = 0x818E
+0x564C = 0x8196
+0x564D = 0x8198
+0x564E = 0x819B
+0x564F = 0x819E
+0x5650 = 0x81A2
+0x5651 = 0x81AE
+0x5652 = 0x81B2
+0x5653 = 0x81B4
+0x5654 = 0x81BB
+0x5655 = 0x81CB
+0x5656 = 0x81C3
+0x5657 = 0x81C5
+0x5658 = 0x81CA
+0x5659 = 0x81CE
+0x565A = 0x81CF
+0x565B = 0x81D5
+0x565C = 0x81D7
+0x565D = 0x81DB
+0x565E = 0x81DD
+0x565F = 0x81DE
+0x5660 = 0x81E1
+0x5661 = 0x81E4
+0x5662 = 0x81EB
+0x5663 = 0x81EC
+0x5664 = 0x81F0
+0x5665 = 0x81F1
+0x5666 = 0x81F2
+0x5667 = 0x81F5
+0x5668 = 0x81F6
+0x5669 = 0x81F8
+0x566A = 0x81F9
+0x566B = 0x81FD
+0x566C = 0x81FF
+0x566D = 0x8200
+0x566E = 0x8203
+0x566F = 0x820F
+0x5670 = 0x8213
+0x5671 = 0x8214
+0x5672 = 0x8219
+0x5673 = 0x821A
+0x5674 = 0x821D
+0x5675 = 0x8221
+0x5676 = 0x8222
+0x5677 = 0x8228
+0x5678 = 0x8232
+0x5679 = 0x8234
+0x567A = 0x823A
+0x567B = 0x8243
+0x567C = 0x8244
+0x567D = 0x8245
+0x567E = 0x8246
+0x5721 = 0x824B
+0x5722 = 0x824E
+0x5723 = 0x824F
+0x5724 = 0x8251
+0x5725 = 0x8256
+0x5726 = 0x825C
+0x5727 = 0x8260
+0x5728 = 0x8263
+0x5729 = 0x8267
+0x572A = 0x826D
+0x572B = 0x8274
+0x572C = 0x827B
+0x572D = 0x827D
+0x572E = 0x827F
+0x572F = 0x8280
+0x5730 = 0x8281
+0x5731 = 0x8283
+0x5732 = 0x8284
+0x5733 = 0x8287
+0x5734 = 0x8289
+0x5735 = 0x828A
+0x5736 = 0x828E
+0x5737 = 0x8291
+0x5738 = 0x8294
+0x5739 = 0x8296
+0x573A = 0x8298
+0x573B = 0x829A
+0x573C = 0x829B
+0x573D = 0x82A0
+0x573E = 0x82A1
+0x573F = 0x82A3
+0x5740 = 0x82A4
+0x5741 = 0x82A7
+0x5742 = 0x82A8
+0x5743 = 0x82A9
+0x5744 = 0x82AA
+0x5745 = 0x82AE
+0x5746 = 0x82B0
+0x5747 = 0x82B2
+0x5748 = 0x82B4
+0x5749 = 0x82B7
+0x574A = 0x82BA
+0x574B = 0x82BC
+0x574C = 0x82BE
+0x574D = 0x82BF
+0x574E = 0x82C6
+0x574F = 0x82D0
+0x5750 = 0x82D5
+0x5751 = 0x82DA
+0x5752 = 0x82E0
+0x5753 = 0x82E2
+0x5754 = 0x82E4
+0x5755 = 0x82E8
+0x5756 = 0x82EA
+0x5757 = 0x82ED
+0x5758 = 0x82EF
+0x5759 = 0x82F6
+0x575A = 0x82F7
+0x575B = 0x82FD
+0x575C = 0x82FE
+0x575D = 0x8300
+0x575E = 0x8301
+0x575F = 0x8307
+0x5760 = 0x8308
+0x5761 = 0x830A
+0x5762 = 0x830B
+0x5763 = 0x8354
+0x5764 = 0x831B
+0x5765 = 0x831D
+0x5766 = 0x831E
+0x5767 = 0x831F
+0x5768 = 0x8321
+0x5769 = 0x8322
+0x576A = 0x832C
+0x576B = 0x832D
+0x576C = 0x832E
+0x576D = 0x8330
+0x576E = 0x8333
+0x576F = 0x8337
+0x5770 = 0x833A
+0x5771 = 0x833C
+0x5772 = 0x833D
+0x5773 = 0x8342
+0x5774 = 0x8343
+0x5775 = 0x8344
+0x5776 = 0x8347
+0x5777 = 0x834D
+0x5778 = 0x834E
+0x5779 = 0x8351
+0x577A = 0x8355
+0x577B = 0x8356
+0x577C = 0x8357
+0x577D = 0x8370
+0x577E = 0x8378
+0x5821 = 0x837D
+0x5822 = 0x837F
+0x5823 = 0x8380
+0x5824 = 0x8382
+0x5825 = 0x8384
+0x5826 = 0x8386
+0x5827 = 0x838D
+0x5828 = 0x8392
+0x5829 = 0x8394
+0x582A = 0x8395
+0x582B = 0x8398
+0x582C = 0x8399
+0x582D = 0x839B
+0x582E = 0x839C
+0x582F = 0x839D
+0x5830 = 0x83A6
+0x5831 = 0x83A7
+0x5832 = 0x83A9
+0x5833 = 0x83AC
+0x5834 = 0x83BE
+0x5835 = 0x83BF
+0x5836 = 0x83C0
+0x5837 = 0x83C7
+0x5838 = 0x83C9
+0x5839 = 0x83CF
+0x583A = 0x83D0
+0x583B = 0x83D1
+0x583C = 0x83D4
+0x583D = 0x83DD
+0x583E = 0x8353
+0x583F = 0x83E8
+0x5840 = 0x83EA
+0x5841 = 0x83F6
+0x5842 = 0x83F8
+0x5843 = 0x83F9
+0x5844 = 0x83FC
+0x5845 = 0x8401
+0x5846 = 0x8406
+0x5847 = 0x840A
+0x5848 = 0x840F
+0x5849 = 0x8411
+0x584A = 0x8415
+0x584B = 0x8419
+0x584C = 0x83AD
+0x584D = 0x842F
+0x584E = 0x8439
+0x584F = 0x8445
+0x5850 = 0x8447
+0x5851 = 0x8448
+0x5852 = 0x844A
+0x5853 = 0x844D
+0x5854 = 0x844F
+0x5855 = 0x8451
+0x5856 = 0x8452
+0x5857 = 0x8456
+0x5858 = 0x8458
+0x5859 = 0x8459
+0x585A = 0x845A
+0x585B = 0x845C
+0x585C = 0x8460
+0x585D = 0x8464
+0x585E = 0x8465
+0x585F = 0x8467
+0x5860 = 0x846A
+0x5861 = 0x8470
+0x5862 = 0x8473
+0x5863 = 0x8474
+0x5864 = 0x8476
+0x5865 = 0x8478
+0x5866 = 0x847C
+0x5867 = 0x847D
+0x5868 = 0x8481
+0x5869 = 0x8485
+0x586A = 0x8492
+0x586B = 0x8493
+0x586C = 0x8495
+0x586D = 0x849E
+0x586E = 0x84A6
+0x586F = 0x84A8
+0x5870 = 0x84A9
+0x5871 = 0x84AA
+0x5872 = 0x84AF
+0x5873 = 0x84B1
+0x5874 = 0x84B4
+0x5875 = 0x84BA
+0x5876 = 0x84BD
+0x5877 = 0x84BE
+0x5878 = 0x84C0
+0x5879 = 0x84C2
+0x587A = 0x84C7
+0x587B = 0x84C8
+0x587C = 0x84CC
+0x587D = 0x84CF
+0x587E = 0x84D3
+0x5921 = 0x84DC
+0x5922 = 0x84E7
+0x5923 = 0x84EA
+0x5924 = 0x84EF
+0x5925 = 0x84F0
+0x5926 = 0x84F1
+0x5927 = 0x84F2
+0x5928 = 0x84F7
+0x5929 = 0x8532
+0x592A = 0x84FA
+0x592B = 0x84FB
+0x592C = 0x84FD
+0x592D = 0x8502
+0x592E = 0x8503
+0x592F = 0x8507
+0x5930 = 0x850C
+0x5931 = 0x850E
+0x5932 = 0x8510
+0x5933 = 0x851C
+0x5934 = 0x851E
+0x5935 = 0x8522
+0x5936 = 0x8523
+0x5937 = 0x8524
+0x5938 = 0x8525
+0x5939 = 0x8527
+0x593A = 0x852A
+0x593B = 0x852B
+0x593C = 0x852F
+0x593D = 0x8533
+0x593E = 0x8534
+0x593F = 0x8536
+0x5940 = 0x853F
+0x5941 = 0x8546
+0x5942 = 0x854F
+0x5943 = 0x8550
+0x5944 = 0x8551
+0x5945 = 0x8552
+0x5946 = 0x8553
+0x5947 = 0x8556
+0x5948 = 0x8559
+0x5949 = 0x855C
+0x594A = 0x855D
+0x594B = 0x855E
+0x594C = 0x855F
+0x594D = 0x8560
+0x594E = 0x8561
+0x594F = 0x8562
+0x5950 = 0x8564
+0x5951 = 0x856B
+0x5952 = 0x856F
+0x5953 = 0x8579
+0x5954 = 0x857A
+0x5955 = 0x857B
+0x5956 = 0x857D
+0x5957 = 0x857F
+0x5958 = 0x8581
+0x5959 = 0x8585
+0x595A = 0x8586
+0x595B = 0x8589
+0x595C = 0x858B
+0x595D = 0x858C
+0x595E = 0x858F
+0x595F = 0x8593
+0x5960 = 0x8598
+0x5961 = 0x859D
+0x5962 = 0x859F
+0x5963 = 0x85A0
+0x5964 = 0x85A2
+0x5965 = 0x85A5
+0x5966 = 0x85A7
+0x5967 = 0x85B4
+0x5968 = 0x85B6
+0x5969 = 0x85B7
+0x596A = 0x85B8
+0x596B = 0x85BC
+0x596C = 0x85BD
+0x596D = 0x85BE
+0x596E = 0x85BF
+0x596F = 0x85C2
+0x5970 = 0x85C7
+0x5971 = 0x85CA
+0x5972 = 0x85CB
+0x5973 = 0x85CE
+0x5974 = 0x85AD
+0x5975 = 0x85D8
+0x5976 = 0x85DA
+0x5977 = 0x85DF
+0x5978 = 0x85E0
+0x5979 = 0x85E6
+0x597A = 0x85E8
+0x597B = 0x85ED
+0x597C = 0x85F3
+0x597D = 0x85F6
+0x597E = 0x85FC
+0x5A21 = 0x85FF
+0x5A22 = 0x8600
+0x5A23 = 0x8604
+0x5A24 = 0x8605
+0x5A25 = 0x860D
+0x5A26 = 0x860E
+0x5A27 = 0x8610
+0x5A28 = 0x8611
+0x5A29 = 0x8612
+0x5A2A = 0x8618
+0x5A2B = 0x8619
+0x5A2C = 0x861B
+0x5A2D = 0x861E
+0x5A2E = 0x8621
+0x5A2F = 0x8627
+0x5A30 = 0x8629
+0x5A31 = 0x8636
+0x5A32 = 0x8638
+0x5A33 = 0x863A
+0x5A34 = 0x863C
+0x5A35 = 0x863D
+0x5A36 = 0x8640
+0x5A37 = 0x8642
+0x5A38 = 0x8646
+0x5A39 = 0x8652
+0x5A3A = 0x8653
+0x5A3B = 0x8656
+0x5A3C = 0x8657
+0x5A3D = 0x8658
+0x5A3E = 0x8659
+0x5A3F = 0x865D
+0x5A40 = 0x8660
+0x5A41 = 0x8661
+0x5A42 = 0x8662
+0x5A43 = 0x8663
+0x5A44 = 0x8664
+0x5A45 = 0x8669
+0x5A46 = 0x866C
+0x5A47 = 0x866F
+0x5A48 = 0x8675
+0x5A49 = 0x8676
+0x5A4A = 0x8677
+0x5A4B = 0x867A
+0x5A4C = 0x868D
+0x5A4D = 0x8691
+0x5A4E = 0x8696
+0x5A4F = 0x8698
+0x5A50 = 0x869A
+0x5A51 = 0x869C
+0x5A52 = 0x86A1
+0x5A53 = 0x86A6
+0x5A54 = 0x86A7
+0x5A55 = 0x86A8
+0x5A56 = 0x86AD
+0x5A57 = 0x86B1
+0x5A58 = 0x86B3
+0x5A59 = 0x86B4
+0x5A5A = 0x86B5
+0x5A5B = 0x86B7
+0x5A5C = 0x86B8
+0x5A5D = 0x86B9
+0x5A5E = 0x86BF
+0x5A5F = 0x86C0
+0x5A60 = 0x86C1
+0x5A61 = 0x86C3
+0x5A62 = 0x86C5
+0x5A63 = 0x86D1
+0x5A64 = 0x86D2
+0x5A65 = 0x86D5
+0x5A66 = 0x86D7
+0x5A67 = 0x86DA
+0x5A68 = 0x86DC
+0x5A69 = 0x86E0
+0x5A6A = 0x86E3
+0x5A6B = 0x86E5
+0x5A6C = 0x86E7
+0x5A6D = 0x8688
+0x5A6E = 0x86FA
+0x5A6F = 0x86FC
+0x5A70 = 0x86FD
+0x5A71 = 0x8704
+0x5A72 = 0x8705
+0x5A73 = 0x8707
+0x5A74 = 0x870B
+0x5A75 = 0x870E
+0x5A76 = 0x870F
+0x5A77 = 0x8710
+0x5A78 = 0x8713
+0x5A79 = 0x8714
+0x5A7A = 0x8719
+0x5A7B = 0x871E
+0x5A7C = 0x871F
+0x5A7D = 0x8721
+0x5A7E = 0x8723
+0x5B21 = 0x8728
+0x5B22 = 0x872E
+0x5B23 = 0x872F
+0x5B24 = 0x8731
+0x5B25 = 0x8732
+0x5B26 = 0x8739
+0x5B27 = 0x873A
+0x5B28 = 0x873C
+0x5B29 = 0x873D
+0x5B2A = 0x873E
+0x5B2B = 0x8740
+0x5B2C = 0x8743
+0x5B2D = 0x8745
+0x5B2E = 0x874D
+0x5B2F = 0x8758
+0x5B30 = 0x875D
+0x5B31 = 0x8761
+0x5B32 = 0x8764
+0x5B33 = 0x8765
+0x5B34 = 0x876F
+0x5B35 = 0x8771
+0x5B36 = 0x8772
+0x5B37 = 0x877B
+0x5B38 = 0x8783
+0x5B39 = 0x8784
+0x5B3A = 0x8785
+0x5B3B = 0x8786
+0x5B3C = 0x8787
+0x5B3D = 0x8788
+0x5B3E = 0x8789
+0x5B3F = 0x878B
+0x5B40 = 0x878C
+0x5B41 = 0x8790
+0x5B42 = 0x8793
+0x5B43 = 0x8795
+0x5B44 = 0x8797
+0x5B45 = 0x8798
+0x5B46 = 0x8799
+0x5B47 = 0x879E
+0x5B48 = 0x87A0
+0x5B49 = 0x87A3
+0x5B4A = 0x87A7
+0x5B4B = 0x87AC
+0x5B4C = 0x87AD
+0x5B4D = 0x87AE
+0x5B4E = 0x87B1
+0x5B4F = 0x87B5
+0x5B50 = 0x87BE
+0x5B51 = 0x87BF
+0x5B52 = 0x87C1
+0x5B53 = 0x87C8
+0x5B54 = 0x87C9
+0x5B55 = 0x87CA
+0x5B56 = 0x87CE
+0x5B57 = 0x87D5
+0x5B58 = 0x87D6
+0x5B59 = 0x87D9
+0x5B5A = 0x87DA
+0x5B5B = 0x87DC
+0x5B5C = 0x87DF
+0x5B5D = 0x87E2
+0x5B5E = 0x87E3
+0x5B5F = 0x87E4
+0x5B60 = 0x87EA
+0x5B61 = 0x87EB
+0x5B62 = 0x87ED
+0x5B63 = 0x87F1
+0x5B64 = 0x87F3
+0x5B65 = 0x87F8
+0x5B66 = 0x87FA
+0x5B67 = 0x87FF
+0x5B68 = 0x8801
+0x5B69 = 0x8803
+0x5B6A = 0x8806
+0x5B6B = 0x8809
+0x5B6C = 0x880A
+0x5B6D = 0x880B
+0x5B6E = 0x8810
+0x5B6F = 0x8819
+0x5B70 = 0x8812
+0x5B71 = 0x8813
+0x5B72 = 0x8814
+0x5B73 = 0x8818
+0x5B74 = 0x881A
+0x5B75 = 0x881B
+0x5B76 = 0x881C
+0x5B77 = 0x881E
+0x5B78 = 0x881F
+0x5B79 = 0x8828
+0x5B7A = 0x882D
+0x5B7B = 0x882E
+0x5B7C = 0x8830
+0x5B7D = 0x8832
+0x5B7E = 0x8835
+0x5C21 = 0x883A
+0x5C22 = 0x883C
+0x5C23 = 0x8841
+0x5C24 = 0x8843
+0x5C25 = 0x8845
+0x5C26 = 0x8848
+0x5C27 = 0x8849
+0x5C28 = 0x884A
+0x5C29 = 0x884B
+0x5C2A = 0x884E
+0x5C2B = 0x8851
+0x5C2C = 0x8855
+0x5C2D = 0x8856
+0x5C2E = 0x8858
+0x5C2F = 0x885A
+0x5C30 = 0x885C
+0x5C31 = 0x885F
+0x5C32 = 0x8860
+0x5C33 = 0x8864
+0x5C34 = 0x8869
+0x5C35 = 0x8871
+0x5C36 = 0x8879
+0x5C37 = 0x887B
+0x5C38 = 0x8880
+0x5C39 = 0x8898
+0x5C3A = 0x889A
+0x5C3B = 0x889B
+0x5C3C = 0x889C
+0x5C3D = 0x889F
+0x5C3E = 0x88A0
+0x5C3F = 0x88A8
+0x5C40 = 0x88AA
+0x5C41 = 0x88BA
+0x5C42 = 0x88BD
+0x5C43 = 0x88BE
+0x5C44 = 0x88C0
+0x5C45 = 0x88CA
+0x5C46 = 0x88CB
+0x5C47 = 0x88CC
+0x5C48 = 0x88CD
+0x5C49 = 0x88CE
+0x5C4A = 0x88D1
+0x5C4B = 0x88D2
+0x5C4C = 0x88D3
+0x5C4D = 0x88DB
+0x5C4E = 0x88DE
+0x5C4F = 0x88E7
+0x5C50 = 0x88EF
+0x5C51 = 0x88F0
+0x5C52 = 0x88F1
+0x5C53 = 0x88F5
+0x5C54 = 0x88F7
+0x5C55 = 0x8901
+0x5C56 = 0x8906
+0x5C57 = 0x890D
+0x5C58 = 0x890E
+0x5C59 = 0x890F
+0x5C5A = 0x8915
+0x5C5B = 0x8916
+0x5C5C = 0x8918
+0x5C5D = 0x8919
+0x5C5E = 0x891A
+0x5C5F = 0x891C
+0x5C60 = 0x8920
+0x5C61 = 0x8926
+0x5C62 = 0x8927
+0x5C63 = 0x8928
+0x5C64 = 0x8930
+0x5C65 = 0x8931
+0x5C66 = 0x8932
+0x5C67 = 0x8935
+0x5C68 = 0x8939
+0x5C69 = 0x893A
+0x5C6A = 0x893E
+0x5C6B = 0x8940
+0x5C6C = 0x8942
+0x5C6D = 0x8945
+0x5C6E = 0x8946
+0x5C6F = 0x8949
+0x5C70 = 0x894F
+0x5C71 = 0x8952
+0x5C72 = 0x8957
+0x5C73 = 0x895A
+0x5C74 = 0x895B
+0x5C75 = 0x895C
+0x5C76 = 0x8961
+0x5C77 = 0x8962
+0x5C78 = 0x8963
+0x5C79 = 0x896B
+0x5C7A = 0x896E
+0x5C7B = 0x8970
+0x5C7C = 0x8973
+0x5C7D = 0x8975
+0x5C7E = 0x897A
+0x5D21 = 0x897B
+0x5D22 = 0x897C
+0x5D23 = 0x897D
+0x5D24 = 0x8989
+0x5D25 = 0x898D
+0x5D26 = 0x8990
+0x5D27 = 0x8994
+0x5D28 = 0x8995
+0x5D29 = 0x899B
+0x5D2A = 0x899C
+0x5D2B = 0x899F
+0x5D2C = 0x89A0
+0x5D2D = 0x89A5
+0x5D2E = 0x89B0
+0x5D2F = 0x89B4
+0x5D30 = 0x89B5
+0x5D31 = 0x89B6
+0x5D32 = 0x89B7
+0x5D33 = 0x89BC
+0x5D34 = 0x89D4
+0x5D35 = 0x89D5
+0x5D36 = 0x89D6
+0x5D37 = 0x89D7
+0x5D38 = 0x89D8
+0x5D39 = 0x89E5
+0x5D3A = 0x89E9
+0x5D3B = 0x89EB
+0x5D3C = 0x89ED
+0x5D3D = 0x89F1
+0x5D3E = 0x89F3
+0x5D3F = 0x89F6
+0x5D40 = 0x89F9
+0x5D41 = 0x89FD
+0x5D42 = 0x89FF
+0x5D43 = 0x8A04
+0x5D44 = 0x8A05
+0x5D45 = 0x8A07
+0x5D46 = 0x8A0F
+0x5D47 = 0x8A11
+0x5D48 = 0x8A12
+0x5D49 = 0x8A14
+0x5D4A = 0x8A15
+0x5D4B = 0x8A1E
+0x5D4C = 0x8A20
+0x5D4D = 0x8A22
+0x5D4E = 0x8A24
+0x5D4F = 0x8A26
+0x5D50 = 0x8A2B
+0x5D51 = 0x8A2C
+0x5D52 = 0x8A2F
+0x5D53 = 0x8A35
+0x5D54 = 0x8A37
+0x5D55 = 0x8A3D
+0x5D56 = 0x8A3E
+0x5D57 = 0x8A40
+0x5D58 = 0x8A43
+0x5D59 = 0x8A45
+0x5D5A = 0x8A47
+0x5D5B = 0x8A49
+0x5D5C = 0x8A4D
+0x5D5D = 0x8A4E
+0x5D5E = 0x8A53
+0x5D5F = 0x8A56
+0x5D60 = 0x8A57
+0x5D61 = 0x8A58
+0x5D62 = 0x8A5C
+0x5D63 = 0x8A5D
+0x5D64 = 0x8A61
+0x5D65 = 0x8A65
+0x5D66 = 0x8A67
+0x5D67 = 0x8A75
+0x5D68 = 0x8A76
+0x5D69 = 0x8A77
+0x5D6A = 0x8A79
+0x5D6B = 0x8A7A
+0x5D6C = 0x8A7B
+0x5D6D = 0x8A7E
+0x5D6E = 0x8A7F
+0x5D6F = 0x8A80
+0x5D70 = 0x8A83
+0x5D71 = 0x8A86
+0x5D72 = 0x8A8B
+0x5D73 = 0x8A8F
+0x5D74 = 0x8A90
+0x5D75 = 0x8A92
+0x5D76 = 0x8A96
+0x5D77 = 0x8A97
+0x5D78 = 0x8A99
+0x5D79 = 0x8A9F
+0x5D7A = 0x8AA7
+0x5D7B = 0x8AA9
+0x5D7C = 0x8AAE
+0x5D7D = 0x8AAF
+0x5D7E = 0x8AB3
+0x5E21 = 0x8AB6
+0x5E22 = 0x8AB7
+0x5E23 = 0x8ABB
+0x5E24 = 0x8ABE
+0x5E25 = 0x8AC3
+0x5E26 = 0x8AC6
+0x5E27 = 0x8AC8
+0x5E28 = 0x8AC9
+0x5E29 = 0x8ACA
+0x5E2A = 0x8AD1
+0x5E2B = 0x8AD3
+0x5E2C = 0x8AD4
+0x5E2D = 0x8AD5
+0x5E2E = 0x8AD7
+0x5E2F = 0x8ADD
+0x5E30 = 0x8ADF
+0x5E31 = 0x8AEC
+0x5E32 = 0x8AF0
+0x5E33 = 0x8AF4
+0x5E34 = 0x8AF5
+0x5E35 = 0x8AF6
+0x5E36 = 0x8AFC
+0x5E37 = 0x8AFF
+0x5E38 = 0x8B05
+0x5E39 = 0x8B06
+0x5E3A = 0x8B0B
+0x5E3B = 0x8B11
+0x5E3C = 0x8B1C
+0x5E3D = 0x8B1E
+0x5E3E = 0x8B1F
+0x5E3F = 0x8B0A
+0x5E40 = 0x8B2D
+0x5E41 = 0x8B30
+0x5E42 = 0x8B37
+0x5E43 = 0x8B3C
+0x5E44 = 0x8B42
+0x5E45 = 0x8B43
+0x5E46 = 0x8B44
+0x5E47 = 0x8B45
+0x5E48 = 0x8B46
+0x5E49 = 0x8B48
+0x5E4A = 0x8B52
+0x5E4B = 0x8B53
+0x5E4C = 0x8B54
+0x5E4D = 0x8B59
+0x5E4E = 0x8B4D
+0x5E4F = 0x8B5E
+0x5E50 = 0x8B63
+0x5E51 = 0x8B6D
+0x5E52 = 0x8B76
+0x5E53 = 0x8B78
+0x5E54 = 0x8B79
+0x5E55 = 0x8B7C
+0x5E56 = 0x8B7E
+0x5E57 = 0x8B81
+0x5E58 = 0x8B84
+0x5E59 = 0x8B85
+0x5E5A = 0x8B8B
+0x5E5B = 0x8B8D
+0x5E5C = 0x8B8F
+0x5E5D = 0x8B94
+0x5E5E = 0x8B95
+0x5E5F = 0x8B9C
+0x5E60 = 0x8B9E
+0x5E61 = 0x8B9F
+0x5E62 = 0x8C38
+0x5E63 = 0x8C39
+0x5E64 = 0x8C3D
+0x5E65 = 0x8C3E
+0x5E66 = 0x8C45
+0x5E67 = 0x8C47
+0x5E68 = 0x8C49
+0x5E69 = 0x8C4B
+0x5E6A = 0x8C4F
+0x5E6B = 0x8C51
+0x5E6C = 0x8C53
+0x5E6D = 0x8C54
+0x5E6E = 0x8C57
+0x5E6F = 0x8C58
+0x5E70 = 0x8C5B
+0x5E71 = 0x8C5D
+0x5E72 = 0x8C59
+0x5E73 = 0x8C63
+0x5E74 = 0x8C64
+0x5E75 = 0x8C66
+0x5E76 = 0x8C68
+0x5E77 = 0x8C69
+0x5E78 = 0x8C6D
+0x5E79 = 0x8C73
+0x5E7A = 0x8C75
+0x5E7B = 0x8C76
+0x5E7C = 0x8C7B
+0x5E7D = 0x8C7E
+0x5E7E = 0x8C86
+0x5F21 = 0x8C87
+0x5F22 = 0x8C8B
+0x5F23 = 0x8C90
+0x5F24 = 0x8C92
+0x5F25 = 0x8C93
+0x5F26 = 0x8C99
+0x5F27 = 0x8C9B
+0x5F28 = 0x8C9C
+0x5F29 = 0x8CA4
+0x5F2A = 0x8CB9
+0x5F2B = 0x8CBA
+0x5F2C = 0x8CC5
+0x5F2D = 0x8CC6
+0x5F2E = 0x8CC9
+0x5F2F = 0x8CCB
+0x5F30 = 0x8CCF
+0x5F31 = 0x8CD6
+0x5F32 = 0x8CD5
+0x5F33 = 0x8CD9
+0x5F34 = 0x8CDD
+0x5F35 = 0x8CE1
+0x5F36 = 0x8CE8
+0x5F37 = 0x8CEC
+0x5F38 = 0x8CEF
+0x5F39 = 0x8CF0
+0x5F3A = 0x8CF2
+0x5F3B = 0x8CF5
+0x5F3C = 0x8CF7
+0x5F3D = 0x8CF8
+0x5F3E = 0x8CFE
+0x5F3F = 0x8CFF
+0x5F40 = 0x8D01
+0x5F41 = 0x8D03
+0x5F42 = 0x8D09
+0x5F43 = 0x8D12
+0x5F44 = 0x8D17
+0x5F45 = 0x8D1B
+0x5F46 = 0x8D65
+0x5F47 = 0x8D69
+0x5F48 = 0x8D6C
+0x5F49 = 0x8D6E
+0x5F4A = 0x8D7F
+0x5F4B = 0x8D82
+0x5F4C = 0x8D84
+0x5F4D = 0x8D88
+0x5F4E = 0x8D8D
+0x5F4F = 0x8D90
+0x5F50 = 0x8D91
+0x5F51 = 0x8D95
+0x5F52 = 0x8D9E
+0x5F53 = 0x8D9F
+0x5F54 = 0x8DA0
+0x5F55 = 0x8DA6
+0x5F56 = 0x8DAB
+0x5F57 = 0x8DAC
+0x5F58 = 0x8DAF
+0x5F59 = 0x8DB2
+0x5F5A = 0x8DB5
+0x5F5B = 0x8DB7
+0x5F5C = 0x8DB9
+0x5F5D = 0x8DBB
+0x5F5E = 0x8DC0
+0x5F5F = 0x8DC5
+0x5F60 = 0x8DC6
+0x5F61 = 0x8DC7
+0x5F62 = 0x8DC8
+0x5F63 = 0x8DCA
+0x5F64 = 0x8DCE
+0x5F65 = 0x8DD1
+0x5F66 = 0x8DD4
+0x5F67 = 0x8DD5
+0x5F68 = 0x8DD7
+0x5F69 = 0x8DD9
+0x5F6A = 0x8DE4
+0x5F6B = 0x8DE5
+0x5F6C = 0x8DE7
+0x5F6D = 0x8DEC
+0x5F6E = 0x8DF0
+0x5F6F = 0x8DBC
+0x5F70 = 0x8DF1
+0x5F71 = 0x8DF2
+0x5F72 = 0x8DF4
+0x5F73 = 0x8DFD
+0x5F74 = 0x8E01
+0x5F75 = 0x8E04
+0x5F76 = 0x8E05
+0x5F77 = 0x8E06
+0x5F78 = 0x8E0B
+0x5F79 = 0x8E11
+0x5F7A = 0x8E14
+0x5F7B = 0x8E16
+0x5F7C = 0x8E20
+0x5F7D = 0x8E21
+0x5F7E = 0x8E22
+0x6021 = 0x8E23
+0x6022 = 0x8E26
+0x6023 = 0x8E27
+0x6024 = 0x8E31
+0x6025 = 0x8E33
+0x6026 = 0x8E36
+0x6027 = 0x8E37
+0x6028 = 0x8E38
+0x6029 = 0x8E39
+0x602A = 0x8E3D
+0x602B = 0x8E40
+0x602C = 0x8E41
+0x602D = 0x8E4B
+0x602E = 0x8E4D
+0x602F = 0x8E4E
+0x6030 = 0x8E4F
+0x6031 = 0x8E54
+0x6032 = 0x8E5B
+0x6033 = 0x8E5C
+0x6034 = 0x8E5D
+0x6035 = 0x8E5E
+0x6036 = 0x8E61
+0x6037 = 0x8E62
+0x6038 = 0x8E69
+0x6039 = 0x8E6C
+0x603A = 0x8E6D
+0x603B = 0x8E6F
+0x603C = 0x8E70
+0x603D = 0x8E71
+0x603E = 0x8E79
+0x603F = 0x8E7A
+0x6040 = 0x8E7B
+0x6041 = 0x8E82
+0x6042 = 0x8E83
+0x6043 = 0x8E89
+0x6044 = 0x8E90
+0x6045 = 0x8E92
+0x6046 = 0x8E95
+0x6047 = 0x8E9A
+0x6048 = 0x8E9B
+0x6049 = 0x8E9D
+0x604A = 0x8E9E
+0x604B = 0x8EA2
+0x604C = 0x8EA7
+0x604D = 0x8EA9
+0x604E = 0x8EAD
+0x604F = 0x8EAE
+0x6050 = 0x8EB3
+0x6051 = 0x8EB5
+0x6052 = 0x8EBA
+0x6053 = 0x8EBB
+0x6054 = 0x8EC0
+0x6055 = 0x8EC1
+0x6056 = 0x8EC3
+0x6057 = 0x8EC4
+0x6058 = 0x8EC7
+0x6059 = 0x8ECF
+0x605A = 0x8ED1
+0x605B = 0x8ED4
+0x605C = 0x8EDC
+0x605D = 0x8EE8
+0x605E = 0x8EEE
+0x605F = 0x8EF0
+0x6060 = 0x8EF1
+0x6061 = 0x8EF7
+0x6062 = 0x8EF9
+0x6063 = 0x8EFA
+0x6064 = 0x8EED
+0x6065 = 0x8F00
+0x6066 = 0x8F02
+0x6067 = 0x8F07
+0x6068 = 0x8F08
+0x6069 = 0x8F0F
+0x606A = 0x8F10
+0x606B = 0x8F16
+0x606C = 0x8F17
+0x606D = 0x8F18
+0x606E = 0x8F1E
+0x606F = 0x8F20
+0x6070 = 0x8F21
+0x6071 = 0x8F23
+0x6072 = 0x8F25
+0x6073 = 0x8F27
+0x6074 = 0x8F28
+0x6075 = 0x8F2C
+0x6076 = 0x8F2D
+0x6077 = 0x8F2E
+0x6078 = 0x8F34
+0x6079 = 0x8F35
+0x607A = 0x8F36
+0x607B = 0x8F37
+0x607C = 0x8F3A
+0x607D = 0x8F40
+0x607E = 0x8F41
+0x6121 = 0x8F43
+0x6122 = 0x8F47
+0x6123 = 0x8F4F
+0x6124 = 0x8F51
+0x6125 = 0x8F52
+0x6126 = 0x8F53
+0x6127 = 0x8F54
+0x6128 = 0x8F55
+0x6129 = 0x8F58
+0x612A = 0x8F5D
+0x612B = 0x8F5E
+0x612C = 0x8F65
+0x612D = 0x8F9D
+0x612E = 0x8FA0
+0x612F = 0x8FA1
+0x6130 = 0x8FA4
+0x6131 = 0x8FA5
+0x6132 = 0x8FA6
+0x6133 = 0x8FB5
+0x6134 = 0x8FB6
+0x6135 = 0x8FB8
+0x6136 = 0x8FBE
+0x6137 = 0x8FC0
+0x6138 = 0x8FC1
+0x6139 = 0x8FC6
+0x613A = 0x8FCA
+0x613B = 0x8FCB
+0x613C = 0x8FCD
+0x613D = 0x8FD0
+0x613E = 0x8FD2
+0x613F = 0x8FD3
+0x6140 = 0x8FD5
+0x6141 = 0x8FE0
+0x6142 = 0x8FE3
+0x6143 = 0x8FE4
+0x6144 = 0x8FE8
+0x6145 = 0x8FEE
+0x6146 = 0x8FF1
+0x6147 = 0x8FF5
+0x6148 = 0x8FF6
+0x6149 = 0x8FFB
+0x614A = 0x8FFE
+0x614B = 0x9002
+0x614C = 0x9004
+0x614D = 0x9008
+0x614E = 0x900C
+0x614F = 0x9018
+0x6150 = 0x901B
+0x6151 = 0x9028
+0x6152 = 0x9029
+0x6153 = 0x902F
+0x6154 = 0x902A
+0x6155 = 0x902C
+0x6156 = 0x902D
+0x6157 = 0x9033
+0x6158 = 0x9034
+0x6159 = 0x9037
+0x615A = 0x903F
+0x615B = 0x9043
+0x615C = 0x9044
+0x615D = 0x904C
+0x615E = 0x905B
+0x615F = 0x905D
+0x6160 = 0x9062
+0x6161 = 0x9066
+0x6162 = 0x9067
+0x6163 = 0x906C
+0x6164 = 0x9070
+0x6165 = 0x9074
+0x6166 = 0x9079
+0x6167 = 0x9085
+0x6168 = 0x9088
+0x6169 = 0x908B
+0x616A = 0x908C
+0x616B = 0x908E
+0x616C = 0x9090
+0x616D = 0x9095
+0x616E = 0x9097
+0x616F = 0x9098
+0x6170 = 0x9099
+0x6171 = 0x909B
+0x6172 = 0x90A0
+0x6173 = 0x90A1
+0x6174 = 0x90A2
+0x6175 = 0x90A5
+0x6176 = 0x90B0
+0x6177 = 0x90B2
+0x6178 = 0x90B3
+0x6179 = 0x90B4
+0x617A = 0x90B6
+0x617B = 0x90BD
+0x617C = 0x90CC
+0x617D = 0x90BE
+0x617E = 0x90C3
+0x6221 = 0x90C4
+0x6222 = 0x90C5
+0x6223 = 0x90C7
+0x6224 = 0x90C8
+0x6225 = 0x90D5
+0x6226 = 0x90D7
+0x6227 = 0x90D8
+0x6228 = 0x90D9
+0x6229 = 0x90DC
+0x622A = 0x90DD
+0x622B = 0x90DF
+0x622C = 0x90E5
+0x622D = 0x90D2
+0x622E = 0x90F6
+0x622F = 0x90EB
+0x6230 = 0x90EF
+0x6231 = 0x90F0
+0x6232 = 0x90F4
+0x6233 = 0x90FE
+0x6234 = 0x90FF
+0x6235 = 0x9100
+0x6236 = 0x9104
+0x6237 = 0x9105
+0x6238 = 0x9106
+0x6239 = 0x9108
+0x623A = 0x910D
+0x623B = 0x9110
+0x623C = 0x9114
+0x623D = 0x9116
+0x623E = 0x9117
+0x623F = 0x9118
+0x6240 = 0x911A
+0x6241 = 0x911C
+0x6242 = 0x911E
+0x6243 = 0x9120
+0x6244 = 0x9125
+0x6245 = 0x9122
+0x6246 = 0x9123
+0x6247 = 0x9127
+0x6248 = 0x9129
+0x6249 = 0x912E
+0x624A = 0x912F
+0x624B = 0x9131
+0x624C = 0x9134
+0x624D = 0x9136
+0x624E = 0x9137
+0x624F = 0x9139
+0x6250 = 0x913A
+0x6251 = 0x913C
+0x6252 = 0x913D
+0x6253 = 0x9143
+0x6254 = 0x9147
+0x6255 = 0x9148
+0x6256 = 0x914F
+0x6257 = 0x9153
+0x6258 = 0x9157
+0x6259 = 0x9159
+0x625A = 0x915A
+0x625B = 0x915B
+0x625C = 0x9161
+0x625D = 0x9164
+0x625E = 0x9167
+0x625F = 0x916D
+0x6260 = 0x9174
+0x6261 = 0x9179
+0x6262 = 0x917A
+0x6263 = 0x917B
+0x6264 = 0x9181
+0x6265 = 0x9183
+0x6266 = 0x9185
+0x6267 = 0x9186
+0x6268 = 0x918A
+0x6269 = 0x918E
+0x626A = 0x9191
+0x626B = 0x9193
+0x626C = 0x9194
+0x626D = 0x9195
+0x626E = 0x9198
+0x626F = 0x919E
+0x6270 = 0x91A1
+0x6271 = 0x91A6
+0x6272 = 0x91A8
+0x6273 = 0x91AC
+0x6274 = 0x91AD
+0x6275 = 0x91AE
+0x6276 = 0x91B0
+0x6277 = 0x91B1
+0x6278 = 0x91B2
+0x6279 = 0x91B3
+0x627A = 0x91B6
+0x627B = 0x91BB
+0x627C = 0x91BC
+0x627D = 0x91BD
+0x627E = 0x91BF
+0x6321 = 0x91C2
+0x6322 = 0x91C3
+0x6323 = 0x91C5
+0x6324 = 0x91D3
+0x6325 = 0x91D4
+0x6326 = 0x91D7
+0x6327 = 0x91D9
+0x6328 = 0x91DA
+0x6329 = 0x91DE
+0x632A = 0x91E4
+0x632B = 0x91E5
+0x632C = 0x91E9
+0x632D = 0x91EA
+0x632E = 0x91EC
+0x632F = 0x91ED
+0x6330 = 0x91EE
+0x6331 = 0x91EF
+0x6332 = 0x91F0
+0x6333 = 0x91F1
+0x6334 = 0x91F7
+0x6335 = 0x91F9
+0x6336 = 0x91FB
+0x6337 = 0x91FD
+0x6338 = 0x9200
+0x6339 = 0x9201
+0x633A = 0x9204
+0x633B = 0x9205
+0x633C = 0x9206
+0x633D = 0x9207
+0x633E = 0x9209
+0x633F = 0x920A
+0x6340 = 0x920C
+0x6341 = 0x9210
+0x6342 = 0x9212
+0x6343 = 0x9213
+0x6344 = 0x9216
+0x6345 = 0x9218
+0x6346 = 0x921C
+0x6347 = 0x921D
+0x6348 = 0x9223
+0x6349 = 0x9224
+0x634A = 0x9225
+0x634B = 0x9226
+0x634C = 0x9228
+0x634D = 0x922E
+0x634E = 0x922F
+0x634F = 0x9230
+0x6350 = 0x9233
+0x6351 = 0x9235
+0x6352 = 0x9236
+0x6353 = 0x9238
+0x6354 = 0x9239
+0x6355 = 0x923A
+0x6356 = 0x923C
+0x6357 = 0x923E
+0x6358 = 0x9240
+0x6359 = 0x9242
+0x635A = 0x9243
+0x635B = 0x9246
+0x635C = 0x9247
+0x635D = 0x924A
+0x635E = 0x924D
+0x635F = 0x924E
+0x6360 = 0x924F
+0x6361 = 0x9251
+0x6362 = 0x9258
+0x6363 = 0x9259
+0x6364 = 0x925C
+0x6365 = 0x925D
+0x6366 = 0x9260
+0x6367 = 0x9261
+0x6368 = 0x9265
+0x6369 = 0x9267
+0x636A = 0x9268
+0x636B = 0x9269
+0x636C = 0x926E
+0x636D = 0x926F
+0x636E = 0x9270
+0x636F = 0x9275
+0x6370 = 0x9276
+0x6371 = 0x9277
+0x6372 = 0x9278
+0x6373 = 0x9279
+0x6374 = 0x927B
+0x6375 = 0x927C
+0x6376 = 0x927D
+0x6377 = 0x927F
+0x6378 = 0x9288
+0x6379 = 0x9289
+0x637A = 0x928A
+0x637B = 0x928D
+0x637C = 0x928E
+0x637D = 0x9292
+0x637E = 0x9297
+0x6421 = 0x9299
+0x6422 = 0x929F
+0x6423 = 0x92A0
+0x6424 = 0x92A4
+0x6425 = 0x92A5
+0x6426 = 0x92A7
+0x6427 = 0x92A8
+0x6428 = 0x92AB
+0x6429 = 0x92AF
+0x642A = 0x92B2
+0x642B = 0x92B6
+0x642C = 0x92B8
+0x642D = 0x92BA
+0x642E = 0x92BB
+0x642F = 0x92BC
+0x6430 = 0x92BD
+0x6431 = 0x92BF
+0x6432 = 0x92C0
+0x6433 = 0x92C1
+0x6434 = 0x92C2
+0x6435 = 0x92C3
+0x6436 = 0x92C5
+0x6437 = 0x92C6
+0x6438 = 0x92C7
+0x6439 = 0x92C8
+0x643A = 0x92CB
+0x643B = 0x92CC
+0x643C = 0x92CD
+0x643D = 0x92CE
+0x643E = 0x92D0
+0x643F = 0x92D3
+0x6440 = 0x92D5
+0x6441 = 0x92D7
+0x6442 = 0x92D8
+0x6443 = 0x92D9
+0x6444 = 0x92DC
+0x6445 = 0x92DD
+0x6446 = 0x92DF
+0x6447 = 0x92E0
+0x6448 = 0x92E1
+0x6449 = 0x92E3
+0x644A = 0x92E5
+0x644B = 0x92E7
+0x644C = 0x92E8
+0x644D = 0x92EC
+0x644E = 0x92EE
+0x644F = 0x92F0
+0x6450 = 0x92F9
+0x6451 = 0x92FB
+0x6452 = 0x92FF
+0x6453 = 0x9300
+0x6454 = 0x9302
+0x6455 = 0x9308
+0x6456 = 0x930D
+0x6457 = 0x9311
+0x6458 = 0x9314
+0x6459 = 0x9315
+0x645A = 0x931C
+0x645B = 0x931D
+0x645C = 0x931E
+0x645D = 0x931F
+0x645E = 0x9321
+0x645F = 0x9324
+0x6460 = 0x9325
+0x6461 = 0x9327
+0x6462 = 0x9329
+0x6463 = 0x932A
+0x6464 = 0x9333
+0x6465 = 0x9334
+0x6466 = 0x9336
+0x6467 = 0x9337
+0x6468 = 0x9347
+0x6469 = 0x9348
+0x646A = 0x9349
+0x646B = 0x9350
+0x646C = 0x9351
+0x646D = 0x9352
+0x646E = 0x9355
+0x646F = 0x9357
+0x6470 = 0x9358
+0x6471 = 0x935A
+0x6472 = 0x935E
+0x6473 = 0x9364
+0x6474 = 0x9365
+0x6475 = 0x9367
+0x6476 = 0x9369
+0x6477 = 0x936A
+0x6478 = 0x936D
+0x6479 = 0x936F
+0x647A = 0x9370
+0x647B = 0x9371
+0x647C = 0x9373
+0x647D = 0x9374
+0x647E = 0x9376
+0x6521 = 0x937A
+0x6522 = 0x937D
+0x6523 = 0x937F
+0x6524 = 0x9380
+0x6525 = 0x9381
+0x6526 = 0x9382
+0x6527 = 0x9388
+0x6528 = 0x938A
+0x6529 = 0x938B
+0x652A = 0x938D
+0x652B = 0x938F
+0x652C = 0x9392
+0x652D = 0x9395
+0x652E = 0x9398
+0x652F = 0x939B
+0x6530 = 0x939E
+0x6531 = 0x93A1
+0x6532 = 0x93A3
+0x6533 = 0x93A4
+0x6534 = 0x93A6
+0x6535 = 0x93A8
+0x6536 = 0x93AB
+0x6537 = 0x93B4
+0x6538 = 0x93B5
+0x6539 = 0x93B6
+0x653A = 0x93BA
+0x653B = 0x93A9
+0x653C = 0x93C1
+0x653D = 0x93C4
+0x653E = 0x93C5
+0x653F = 0x93C6
+0x6540 = 0x93C7
+0x6541 = 0x93C9
+0x6542 = 0x93CA
+0x6543 = 0x93CB
+0x6544 = 0x93CC
+0x6545 = 0x93CD
+0x6546 = 0x93D3
+0x6547 = 0x93D9
+0x6548 = 0x93DC
+0x6549 = 0x93DE
+0x654A = 0x93DF
+0x654B = 0x93E2
+0x654C = 0x93E6
+0x654D = 0x93E7
+0x654E = 0x93F9
+0x654F = 0x93F7
+0x6550 = 0x93F8
+0x6551 = 0x93FA
+0x6552 = 0x93FB
+0x6553 = 0x93FD
+0x6554 = 0x9401
+0x6555 = 0x9402
+0x6556 = 0x9404
+0x6557 = 0x9408
+0x6558 = 0x9409
+0x6559 = 0x940D
+0x655A = 0x940E
+0x655B = 0x940F
+0x655C = 0x9415
+0x655D = 0x9416
+0x655E = 0x9417
+0x655F = 0x941F
+0x6560 = 0x942E
+0x6561 = 0x942F
+0x6562 = 0x9431
+0x6563 = 0x9432
+0x6564 = 0x9433
+0x6565 = 0x9434
+0x6566 = 0x943B
+0x6567 = 0x943F
+0x6568 = 0x943D
+0x6569 = 0x9443
+0x656A = 0x9445
+0x656B = 0x9448
+0x656C = 0x944A
+0x656D = 0x944C
+0x656E = 0x9455
+0x656F = 0x9459
+0x6570 = 0x945C
+0x6571 = 0x945F
+0x6572 = 0x9461
+0x6573 = 0x9463
+0x6574 = 0x9468
+0x6575 = 0x946B
+0x6576 = 0x946D
+0x6577 = 0x946E
+0x6578 = 0x946F
+0x6579 = 0x9471
+0x657A = 0x9472
+0x657B = 0x9484
+0x657C = 0x9483
+0x657D = 0x9578
+0x657E = 0x9579
+0x6621 = 0x957E
+0x6622 = 0x9584
+0x6623 = 0x9588
+0x6624 = 0x958C
+0x6625 = 0x958D
+0x6626 = 0x958E
+0x6627 = 0x959D
+0x6628 = 0x959E
+0x6629 = 0x959F
+0x662A = 0x95A1
+0x662B = 0x95A6
+0x662C = 0x95A9
+0x662D = 0x95AB
+0x662E = 0x95AC
+0x662F = 0x95B4
+0x6630 = 0x95B6
+0x6631 = 0x95BA
+0x6632 = 0x95BD
+0x6633 = 0x95BF
+0x6634 = 0x95C6
+0x6635 = 0x95C8
+0x6636 = 0x95C9
+0x6637 = 0x95CB
+0x6638 = 0x95D0
+0x6639 = 0x95D1
+0x663A = 0x95D2
+0x663B = 0x95D3
+0x663C = 0x95D9
+0x663D = 0x95DA
+0x663E = 0x95DD
+0x663F = 0x95DE
+0x6640 = 0x95DF
+0x6641 = 0x95E0
+0x6642 = 0x95E4
+0x6643 = 0x95E6
+0x6644 = 0x961D
+0x6645 = 0x961E
+0x6646 = 0x9622
+0x6647 = 0x9624
+0x6648 = 0x9625
+0x6649 = 0x9626
+0x664A = 0x962C
+0x664B = 0x9631
+0x664C = 0x9633
+0x664D = 0x9637
+0x664E = 0x9638
+0x664F = 0x9639
+0x6650 = 0x963A
+0x6651 = 0x963C
+0x6652 = 0x963D
+0x6653 = 0x9641
+0x6654 = 0x9652
+0x6655 = 0x9654
+0x6656 = 0x9656
+0x6657 = 0x9657
+0x6658 = 0x9658
+0x6659 = 0x9661
+0x665A = 0x966E
+0x665B = 0x9674
+0x665C = 0x967B
+0x665D = 0x967C
+0x665E = 0x967E
+0x665F = 0x967F
+0x6660 = 0x9681
+0x6661 = 0x9682
+0x6662 = 0x9683
+0x6663 = 0x9684
+0x6664 = 0x9689
+0x6665 = 0x9691
+0x6666 = 0x9696
+0x6667 = 0x969A
+0x6668 = 0x969D
+0x6669 = 0x969F
+0x666A = 0x96A4
+0x666B = 0x96A5
+0x666C = 0x96A6
+0x666D = 0x96A9
+0x666E = 0x96AE
+0x666F = 0x96AF
+0x6670 = 0x96B3
+0x6671 = 0x96BA
+0x6672 = 0x96CA
+0x6673 = 0x96D2
+0x6674 = 0x5DB2
+0x6675 = 0x96D8
+0x6676 = 0x96DA
+0x6677 = 0x96DD
+0x6678 = 0x96DE
+0x6679 = 0x96DF
+0x667A = 0x96E9
+0x667B = 0x96EF
+0x667C = 0x96F1
+0x667D = 0x96FA
+0x667E = 0x9702
+0x6721 = 0x9703
+0x6722 = 0x9705
+0x6723 = 0x9709
+0x6724 = 0x971A
+0x6725 = 0x971B
+0x6726 = 0x971D
+0x6727 = 0x9721
+0x6728 = 0x9722
+0x6729 = 0x9723
+0x672A = 0x9728
+0x672B = 0x9731
+0x672C = 0x9733
+0x672D = 0x9741
+0x672E = 0x9743
+0x672F = 0x974A
+0x6730 = 0x974E
+0x6731 = 0x974F
+0x6732 = 0x9755
+0x6733 = 0x9757
+0x6734 = 0x9758
+0x6735 = 0x975A
+0x6736 = 0x975B
+0x6737 = 0x9763
+0x6738 = 0x9767
+0x6739 = 0x976A
+0x673A = 0x976E
+0x673B = 0x9773
+0x673C = 0x9776
+0x673D = 0x9777
+0x673E = 0x9778
+0x673F = 0x977B
+0x6740 = 0x977D
+0x6741 = 0x977F
+0x6742 = 0x9780
+0x6743 = 0x9789
+0x6744 = 0x9795
+0x6745 = 0x9796
+0x6746 = 0x9797
+0x6747 = 0x9799
+0x6748 = 0x979A
+0x6749 = 0x979E
+0x674A = 0x979F
+0x674B = 0x97A2
+0x674C = 0x97AC
+0x674D = 0x97AE
+0x674E = 0x97B1
+0x674F = 0x97B2
+0x6750 = 0x97B5
+0x6751 = 0x97B6
+0x6752 = 0x97B8
+0x6753 = 0x97B9
+0x6754 = 0x97BA
+0x6755 = 0x97BC
+0x6756 = 0x97BE
+0x6757 = 0x97BF
+0x6758 = 0x97C1
+0x6759 = 0x97C4
+0x675A = 0x97C5
+0x675B = 0x97C7
+0x675C = 0x97C9
+0x675D = 0x97CA
+0x675E = 0x97CC
+0x675F = 0x97CD
+0x6760 = 0x97CE
+0x6761 = 0x97D0
+0x6762 = 0x97D1
+0x6763 = 0x97D4
+0x6764 = 0x97D7
+0x6765 = 0x97D8
+0x6766 = 0x97D9
+0x6767 = 0x97DD
+0x6768 = 0x97DE
+0x6769 = 0x97E0
+0x676A = 0x97DB
+0x676B = 0x97E1
+0x676C = 0x97E4
+0x676D = 0x97EF
+0x676E = 0x97F1
+0x676F = 0x97F4
+0x6770 = 0x97F7
+0x6771 = 0x97F8
+0x6772 = 0x97FA
+0x6773 = 0x9807
+0x6774 = 0x980A
+0x6775 = 0x9819
+0x6776 = 0x980D
+0x6777 = 0x980E
+0x6778 = 0x9814
+0x6779 = 0x9816
+0x677A = 0x981C
+0x677B = 0x981E
+0x677C = 0x9820
+0x677D = 0x9823
+0x677E = 0x9826
+0x6821 = 0x982B
+0x6822 = 0x982E
+0x6823 = 0x982F
+0x6824 = 0x9830
+0x6825 = 0x9832
+0x6826 = 0x9833
+0x6827 = 0x9835
+0x6828 = 0x9825
+0x6829 = 0x983E
+0x682A = 0x9844
+0x682B = 0x9847
+0x682C = 0x984A
+0x682D = 0x9851
+0x682E = 0x9852
+0x682F = 0x9853
+0x6830 = 0x9856
+0x6831 = 0x9857
+0x6832 = 0x9859
+0x6833 = 0x985A
+0x6834 = 0x9862
+0x6835 = 0x9863
+0x6836 = 0x9865
+0x6837 = 0x9866
+0x6838 = 0x986A
+0x6839 = 0x986C
+0x683A = 0x98AB
+0x683B = 0x98AD
+0x683C = 0x98AE
+0x683D = 0x98B0
+0x683E = 0x98B4
+0x683F = 0x98B7
+0x6840 = 0x98B8
+0x6841 = 0x98BA
+0x6842 = 0x98BB
+0x6843 = 0x98BF
+0x6844 = 0x98C2
+0x6845 = 0x98C5
+0x6846 = 0x98C8
+0x6847 = 0x98CC
+0x6848 = 0x98E1
+0x6849 = 0x98E3
+0x684A = 0x98E5
+0x684B = 0x98E6
+0x684C = 0x98E7
+0x684D = 0x98EA
+0x684E = 0x98F3
+0x684F = 0x98F6
+0x6850 = 0x9902
+0x6851 = 0x9907
+0x6852 = 0x9908
+0x6853 = 0x9911
+0x6854 = 0x9915
+0x6855 = 0x9916
+0x6856 = 0x9917
+0x6857 = 0x991A
+0x6858 = 0x991B
+0x6859 = 0x991C
+0x685A = 0x991F
+0x685B = 0x9922
+0x685C = 0x9926
+0x685D = 0x9927
+0x685E = 0x992B
+0x685F = 0x9931
+0x6860 = 0x9932
+0x6861 = 0x9933
+0x6862 = 0x9934
+0x6863 = 0x9935
+0x6864 = 0x9939
+0x6865 = 0x993A
+0x6866 = 0x993B
+0x6867 = 0x993C
+0x6868 = 0x9940
+0x6869 = 0x9941
+0x686A = 0x9946
+0x686B = 0x9947
+0x686C = 0x9948
+0x686D = 0x994D
+0x686E = 0x994E
+0x686F = 0x9954
+0x6870 = 0x9958
+0x6871 = 0x9959
+0x6872 = 0x995B
+0x6873 = 0x995C
+0x6874 = 0x995E
+0x6875 = 0x995F
+0x6876 = 0x9960
+0x6877 = 0x999B
+0x6878 = 0x999D
+0x6879 = 0x999F
+0x687A = 0x99A6
+0x687B = 0x99B0
+0x687C = 0x99B1
+0x687D = 0x99B2
+0x687E = 0x99B5
+0x6921 = 0x99B9
+0x6922 = 0x99BA
+0x6923 = 0x99BD
+0x6924 = 0x99BF
+0x6925 = 0x99C3
+0x6926 = 0x99C9
+0x6927 = 0x99D3
+0x6928 = 0x99D4
+0x6929 = 0x99D9
+0x692A = 0x99DA
+0x692B = 0x99DC
+0x692C = 0x99DE
+0x692D = 0x99E7
+0x692E = 0x99EA
+0x692F = 0x99EB
+0x6930 = 0x99EC
+0x6931 = 0x99F0
+0x6932 = 0x99F4
+0x6933 = 0x99F5
+0x6934 = 0x99F9
+0x6935 = 0x99FD
+0x6936 = 0x99FE
+0x6937 = 0x9A02
+0x6938 = 0x9A03
+0x6939 = 0x9A04
+0x693A = 0x9A0B
+0x693B = 0x9A0C
+0x693C = 0x9A10
+0x693D = 0x9A11
+0x693E = 0x9A16
+0x693F = 0x9A1E
+0x6940 = 0x9A20
+0x6941 = 0x9A22
+0x6942 = 0x9A23
+0x6943 = 0x9A24
+0x6944 = 0x9A27
+0x6945 = 0x9A2D
+0x6946 = 0x9A2E
+0x6947 = 0x9A33
+0x6948 = 0x9A35
+0x6949 = 0x9A36
+0x694A = 0x9A38
+0x694B = 0x9A47
+0x694C = 0x9A41
+0x694D = 0x9A44
+0x694E = 0x9A4A
+0x694F = 0x9A4B
+0x6950 = 0x9A4C
+0x6951 = 0x9A4E
+0x6952 = 0x9A51
+0x6953 = 0x9A54
+0x6954 = 0x9A56
+0x6955 = 0x9A5D
+0x6956 = 0x9AAA
+0x6957 = 0x9AAC
+0x6958 = 0x9AAE
+0x6959 = 0x9AAF
+0x695A = 0x9AB2
+0x695B = 0x9AB4
+0x695C = 0x9AB5
+0x695D = 0x9AB6
+0x695E = 0x9AB9
+0x695F = 0x9ABB
+0x6960 = 0x9ABE
+0x6961 = 0x9ABF
+0x6962 = 0x9AC1
+0x6963 = 0x9AC3
+0x6964 = 0x9AC6
+0x6965 = 0x9AC8
+0x6966 = 0x9ACE
+0x6967 = 0x9AD0
+0x6968 = 0x9AD2
+0x6969 = 0x9AD5
+0x696A = 0x9AD6
+0x696B = 0x9AD7
+0x696C = 0x9ADB
+0x696D = 0x9ADC
+0x696E = 0x9AE0
+0x696F = 0x9AE4
+0x6970 = 0x9AE5
+0x6971 = 0x9AE7
+0x6972 = 0x9AE9
+0x6973 = 0x9AEC
+0x6974 = 0x9AF2
+0x6975 = 0x9AF3
+0x6976 = 0x9AF5
+0x6977 = 0x9AF9
+0x6978 = 0x9AFA
+0x6979 = 0x9AFD
+0x697A = 0x9AFF
+0x697B = 0x9B00
+0x697C = 0x9B01
+0x697D = 0x9B02
+0x697E = 0x9B03
+0x6A21 = 0x9B04
+0x6A22 = 0x9B05
+0x6A23 = 0x9B08
+0x6A24 = 0x9B09
+0x6A25 = 0x9B0B
+0x6A26 = 0x9B0C
+0x6A27 = 0x9B0D
+0x6A28 = 0x9B0E
+0x6A29 = 0x9B10
+0x6A2A = 0x9B12
+0x6A2B = 0x9B16
+0x6A2C = 0x9B19
+0x6A2D = 0x9B1B
+0x6A2E = 0x9B1C
+0x6A2F = 0x9B20
+0x6A30 = 0x9B26
+0x6A31 = 0x9B2B
+0x6A32 = 0x9B2D
+0x6A33 = 0x9B33
+0x6A34 = 0x9B34
+0x6A35 = 0x9B35
+0x6A36 = 0x9B37
+0x6A37 = 0x9B39
+0x6A38 = 0x9B3A
+0x6A39 = 0x9B3D
+0x6A3A = 0x9B48
+0x6A3B = 0x9B4B
+0x6A3C = 0x9B4C
+0x6A3D = 0x9B55
+0x6A3E = 0x9B56
+0x6A3F = 0x9B57
+0x6A40 = 0x9B5B
+0x6A41 = 0x9B5E
+0x6A42 = 0x9B61
+0x6A43 = 0x9B63
+0x6A44 = 0x9B65
+0x6A45 = 0x9B66
+0x6A46 = 0x9B68
+0x6A47 = 0x9B6A
+0x6A48 = 0x9B6B
+0x6A49 = 0x9B6C
+0x6A4A = 0x9B6D
+0x6A4B = 0x9B6E
+0x6A4C = 0x9B73
+0x6A4D = 0x9B75
+0x6A4E = 0x9B77
+0x6A4F = 0x9B78
+0x6A50 = 0x9B79
+0x6A51 = 0x9B7F
+0x6A52 = 0x9B80
+0x6A53 = 0x9B84
+0x6A54 = 0x9B85
+0x6A55 = 0x9B86
+0x6A56 = 0x9B87
+0x6A57 = 0x9B89
+0x6A58 = 0x9B8A
+0x6A59 = 0x9B8B
+0x6A5A = 0x9B8D
+0x6A5B = 0x9B8F
+0x6A5C = 0x9B90
+0x6A5D = 0x9B94
+0x6A5E = 0x9B9A
+0x6A5F = 0x9B9D
+0x6A60 = 0x9B9E
+0x6A61 = 0x9BA6
+0x6A62 = 0x9BA7
+0x6A63 = 0x9BA9
+0x6A64 = 0x9BAC
+0x6A65 = 0x9BB0
+0x6A66 = 0x9BB1
+0x6A67 = 0x9BB2
+0x6A68 = 0x9BB7
+0x6A69 = 0x9BB8
+0x6A6A = 0x9BBB
+0x6A6B = 0x9BBC
+0x6A6C = 0x9BBE
+0x6A6D = 0x9BBF
+0x6A6E = 0x9BC1
+0x6A6F = 0x9BC7
+0x6A70 = 0x9BC8
+0x6A71 = 0x9BCE
+0x6A72 = 0x9BD0
+0x6A73 = 0x9BD7
+0x6A74 = 0x9BD8
+0x6A75 = 0x9BDD
+0x6A76 = 0x9BDF
+0x6A77 = 0x9BE5
+0x6A78 = 0x9BE7
+0x6A79 = 0x9BEA
+0x6A7A = 0x9BEB
+0x6A7B = 0x9BEF
+0x6A7C = 0x9BF3
+0x6A7D = 0x9BF7
+0x6A7E = 0x9BF8
+0x6B21 = 0x9BF9
+0x6B22 = 0x9BFA
+0x6B23 = 0x9BFD
+0x6B24 = 0x9BFF
+0x6B25 = 0x9C00
+0x6B26 = 0x9C02
+0x6B27 = 0x9C0B
+0x6B28 = 0x9C0F
+0x6B29 = 0x9C11
+0x6B2A = 0x9C16
+0x6B2B = 0x9C18
+0x6B2C = 0x9C19
+0x6B2D = 0x9C1A
+0x6B2E = 0x9C1C
+0x6B2F = 0x9C1E
+0x6B30 = 0x9C22
+0x6B31 = 0x9C23
+0x6B32 = 0x9C26
+0x6B33 = 0x9C27
+0x6B34 = 0x9C28
+0x6B35 = 0x9C29
+0x6B36 = 0x9C2A
+0x6B37 = 0x9C31
+0x6B38 = 0x9C35
+0x6B39 = 0x9C36
+0x6B3A = 0x9C37
+0x6B3B = 0x9C3D
+0x6B3C = 0x9C41
+0x6B3D = 0x9C43
+0x6B3E = 0x9C44
+0x6B3F = 0x9C45
+0x6B40 = 0x9C49
+0x6B41 = 0x9C4A
+0x6B42 = 0x9C4E
+0x6B43 = 0x9C4F
+0x6B44 = 0x9C50
+0x6B45 = 0x9C53
+0x6B46 = 0x9C54
+0x6B47 = 0x9C56
+0x6B48 = 0x9C58
+0x6B49 = 0x9C5B
+0x6B4A = 0x9C5D
+0x6B4B = 0x9C5E
+0x6B4C = 0x9C5F
+0x6B4D = 0x9C63
+0x6B4E = 0x9C69
+0x6B4F = 0x9C6A
+0x6B50 = 0x9C5C
+0x6B51 = 0x9C6B
+0x6B52 = 0x9C68
+0x6B53 = 0x9C6E
+0x6B54 = 0x9C70
+0x6B55 = 0x9C72
+0x6B56 = 0x9C75
+0x6B57 = 0x9C77
+0x6B58 = 0x9C7B
+0x6B59 = 0x9CE6
+0x6B5A = 0x9CF2
+0x6B5B = 0x9CF7
+0x6B5C = 0x9CF9
+0x6B5D = 0x9D0B
+0x6B5E = 0x9D02
+0x6B5F = 0x9D11
+0x6B60 = 0x9D17
+0x6B61 = 0x9D18
+0x6B62 = 0x9D1C
+0x6B63 = 0x9D1D
+0x6B64 = 0x9D1E
+0x6B65 = 0x9D2F
+0x6B66 = 0x9D30
+0x6B67 = 0x9D32
+0x6B68 = 0x9D33
+0x6B69 = 0x9D34
+0x6B6A = 0x9D3A
+0x6B6B = 0x9D3C
+0x6B6C = 0x9D45
+0x6B6D = 0x9D3D
+0x6B6E = 0x9D42
+0x6B6F = 0x9D43
+0x6B70 = 0x9D47
+0x6B71 = 0x9D4A
+0x6B72 = 0x9D53
+0x6B73 = 0x9D54
+0x6B74 = 0x9D5F
+0x6B75 = 0x9D63
+0x6B76 = 0x9D62
+0x6B77 = 0x9D65
+0x6B78 = 0x9D69
+0x6B79 = 0x9D6A
+0x6B7A = 0x9D6B
+0x6B7B = 0x9D70
+0x6B7C = 0x9D76
+0x6B7D = 0x9D77
+0x6B7E = 0x9D7B
+0x6C21 = 0x9D7C
+0x6C22 = 0x9D7E
+0x6C23 = 0x9D83
+0x6C24 = 0x9D84
+0x6C25 = 0x9D86
+0x6C26 = 0x9D8A
+0x6C27 = 0x9D8D
+0x6C28 = 0x9D8E
+0x6C29 = 0x9D92
+0x6C2A = 0x9D93
+0x6C2B = 0x9D95
+0x6C2C = 0x9D96
+0x6C2D = 0x9D97
+0x6C2E = 0x9D98
+0x6C2F = 0x9DA1
+0x6C30 = 0x9DAA
+0x6C31 = 0x9DAC
+0x6C32 = 0x9DAE
+0x6C33 = 0x9DB1
+0x6C34 = 0x9DB5
+0x6C35 = 0x9DB9
+0x6C36 = 0x9DBC
+0x6C37 = 0x9DBF
+0x6C38 = 0x9DC3
+0x6C39 = 0x9DC7
+0x6C3A = 0x9DC9
+0x6C3B = 0x9DCA
+0x6C3C = 0x9DD4
+0x6C3D = 0x9DD5
+0x6C3E = 0x9DD6
+0x6C3F = 0x9DD7
+0x6C40 = 0x9DDA
+0x6C41 = 0x9DDE
+0x6C42 = 0x9DDF
+0x6C43 = 0x9DE0
+0x6C44 = 0x9DE5
+0x6C45 = 0x9DE7
+0x6C46 = 0x9DE9
+0x6C47 = 0x9DEB
+0x6C48 = 0x9DEE
+0x6C49 = 0x9DF0
+0x6C4A = 0x9DF3
+0x6C4B = 0x9DF4
+0x6C4C = 0x9DFE
+0x6C4D = 0x9E0A
+0x6C4E = 0x9E02
+0x6C4F = 0x9E07
+0x6C50 = 0x9E0E
+0x6C51 = 0x9E10
+0x6C52 = 0x9E11
+0x6C53 = 0x9E12
+0x6C54 = 0x9E15
+0x6C55 = 0x9E16
+0x6C56 = 0x9E19
+0x6C57 = 0x9E1C
+0x6C58 = 0x9E1D
+0x6C59 = 0x9E7A
+0x6C5A = 0x9E7B
+0x6C5B = 0x9E7C
+0x6C5C = 0x9E80
+0x6C5D = 0x9E82
+0x6C5E = 0x9E83
+0x6C5F = 0x9E84
+0x6C60 = 0x9E85
+0x6C61 = 0x9E87
+0x6C62 = 0x9E8E
+0x6C63 = 0x9E8F
+0x6C64 = 0x9E96
+0x6C65 = 0x9E98
+0x6C66 = 0x9E9B
+0x6C67 = 0x9E9E
+0x6C68 = 0x9EA4
+0x6C69 = 0x9EA8
+0x6C6A = 0x9EAC
+0x6C6B = 0x9EAE
+0x6C6C = 0x9EAF
+0x6C6D = 0x9EB0
+0x6C6E = 0x9EB3
+0x6C6F = 0x9EB4
+0x6C70 = 0x9EB5
+0x6C71 = 0x9EC6
+0x6C72 = 0x9EC8
+0x6C73 = 0x9ECB
+0x6C74 = 0x9ED5
+0x6C75 = 0x9EDF
+0x6C76 = 0x9EE4
+0x6C77 = 0x9EE7
+0x6C78 = 0x9EEC
+0x6C79 = 0x9EED
+0x6C7A = 0x9EEE
+0x6C7B = 0x9EF0
+0x6C7C = 0x9EF1
+0x6C7D = 0x9EF2
+0x6C7E = 0x9EF5
+0x6D21 = 0x9EF8
+0x6D22 = 0x9EFF
+0x6D23 = 0x9F02
+0x6D24 = 0x9F03
+0x6D25 = 0x9F09
+0x6D26 = 0x9F0F
+0x6D27 = 0x9F10
+0x6D28 = 0x9F11
+0x6D29 = 0x9F12
+0x6D2A = 0x9F14
+0x6D2B = 0x9F16
+0x6D2C = 0x9F17
+0x6D2D = 0x9F19
+0x6D2E = 0x9F1A
+0x6D2F = 0x9F1B
+0x6D30 = 0x9F1F
+0x6D31 = 0x9F22
+0x6D32 = 0x9F26
+0x6D33 = 0x9F2A
+0x6D34 = 0x9F2B
+0x6D35 = 0x9F2F
+0x6D36 = 0x9F31
+0x6D37 = 0x9F32
+0x6D38 = 0x9F34
+0x6D39 = 0x9F37
+0x6D3A = 0x9F39
+0x6D3B = 0x9F3A
+0x6D3C = 0x9F3C
+0x6D3D = 0x9F3D
+0x6D3E = 0x9F3F
+0x6D3F = 0x9F41
+0x6D40 = 0x9F43
+0x6D41 = 0x9F44
+0x6D42 = 0x9F45
+0x6D43 = 0x9F46
+0x6D44 = 0x9F47
+0x6D45 = 0x9F53
+0x6D46 = 0x9F55
+0x6D47 = 0x9F56
+0x6D48 = 0x9F57
+0x6D49 = 0x9F58
+0x6D4A = 0x9F5A
+0x6D4B = 0x9F5D
+0x6D4C = 0x9F5E
+0x6D4D = 0x9F68
+0x6D4E = 0x9F69
+0x6D4F = 0x9F6D
+0x6D50 = 0x9F6E
+0x6D51 = 0x9F6F
+0x6D52 = 0x9F70
+0x6D53 = 0x9F71
+0x6D54 = 0x9F73
+0x6D55 = 0x9F75
+0x6D56 = 0x9F7A
+0x6D57 = 0x9F7D
+0x6D58 = 0x9F8F
+0x6D59 = 0x9F90
+0x6D5A = 0x9F91
+0x6D5B = 0x9F92
+0x6D5C = 0x9F94
+0x6D5D = 0x9F96
+0x6D5E = 0x9F97
+0x6D5F = 0x9F9E
+0x6D60 = 0x9FA1
+0x6D61 = 0x9FA2
+0x6D62 = 0x9FA3
+0x6D63 = 0x9FA5
+END_MAP
diff --git a/enc/trans/JIS/JISX0212UDC%UCS.src b/enc/trans/JIS/JISX0212UDC%UCS.src
new file mode 100644
index 0000000000..d9e8cd7cd3
--- /dev/null
+++ b/enc/trans/JIS/JISX0212UDC%UCS.src
@@ -0,0 +1,954 @@
+# $NetBSD: JISX0212UDC%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0212UDC/UCS"
+SRC_ZONE	0x75 - 0xFE / 0x21 - 0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x7521 = 0xE3AC
+0x7522 = 0xE3AD
+0x7523 = 0xE3AE
+0x7524 = 0xE3AF
+0x7525 = 0xE3B0
+0x7526 = 0xE3B1
+0x7527 = 0xE3B2
+0x7528 = 0xE3B3
+0x7529 = 0xE3B4
+0x752A = 0xE3B5
+0x752B = 0xE3B6
+0x752C = 0xE3B7
+0x752D = 0xE3B8
+0x752E = 0xE3B9
+0x752F = 0xE3BA
+0x7530 = 0xE3BB
+0x7531 = 0xE3BC
+0x7532 = 0xE3BD
+0x7533 = 0xE3BE
+0x7534 = 0xE3BF
+0x7535 = 0xE3C0
+0x7536 = 0xE3C1
+0x7537 = 0xE3C2
+0x7538 = 0xE3C3
+0x7539 = 0xE3C4
+0x753A = 0xE3C5
+0x753B = 0xE3C6
+0x753C = 0xE3C7
+0x753D = 0xE3C8
+0x753E = 0xE3C9
+0x753F = 0xE3CA
+0x7540 = 0xE3CB
+0x7541 = 0xE3CC
+0x7542 = 0xE3CD
+0x7543 = 0xE3CE
+0x7544 = 0xE3CF
+0x7545 = 0xE3D0
+0x7546 = 0xE3D1
+0x7547 = 0xE3D2
+0x7548 = 0xE3D3
+0x7549 = 0xE3D4
+0x754A = 0xE3D5
+0x754B = 0xE3D6
+0x754C = 0xE3D7
+0x754D = 0xE3D8
+0x754E = 0xE3D9
+0x754F = 0xE3DA
+0x7550 = 0xE3DB
+0x7551 = 0xE3DC
+0x7552 = 0xE3DD
+0x7553 = 0xE3DE
+0x7554 = 0xE3DF
+0x7555 = 0xE3E0
+0x7556 = 0xE3E1
+0x7557 = 0xE3E2
+0x7558 = 0xE3E3
+0x7559 = 0xE3E4
+0x755A = 0xE3E5
+0x755B = 0xE3E6
+0x755C = 0xE3E7
+0x755D = 0xE3E8
+0x755E = 0xE3E9
+0x755F = 0xE3EA
+0x7560 = 0xE3EB
+0x7561 = 0xE3EC
+0x7562 = 0xE3ED
+0x7563 = 0xE3EE
+0x7564 = 0xE3EF
+0x7565 = 0xE3F0
+0x7566 = 0xE3F1
+0x7567 = 0xE3F2
+0x7568 = 0xE3F3
+0x7569 = 0xE3F4
+0x756A = 0xE3F5
+0x756B = 0xE3F6
+0x756C = 0xE3F7
+0x756D = 0xE3F8
+0x756E = 0xE3F9
+0x756F = 0xE3FA
+0x7570 = 0xE3FB
+0x7571 = 0xE3FC
+0x7572 = 0xE3FD
+0x7573 = 0xE3FE
+0x7574 = 0xE3FF
+0x7575 = 0xE400
+0x7576 = 0xE401
+0x7577 = 0xE402
+0x7578 = 0xE403
+0x7579 = 0xE404
+0x757A = 0xE405
+0x757B = 0xE406
+0x757C = 0xE407
+0x757D = 0xE408
+0x757E = 0xE409
+0x7621 = 0xE40A
+0x7622 = 0xE40B
+0x7623 = 0xE40C
+0x7624 = 0xE40D
+0x7625 = 0xE40E
+0x7626 = 0xE40F
+0x7627 = 0xE410
+0x7628 = 0xE411
+0x7629 = 0xE412
+0x762A = 0xE413
+0x762B = 0xE414
+0x762C = 0xE415
+0x762D = 0xE416
+0x762E = 0xE417
+0x762F = 0xE418
+0x7630 = 0xE419
+0x7631 = 0xE41A
+0x7632 = 0xE41B
+0x7633 = 0xE41C
+0x7634 = 0xE41D
+0x7635 = 0xE41E
+0x7636 = 0xE41F
+0x7637 = 0xE420
+0x7638 = 0xE421
+0x7639 = 0xE422
+0x763A = 0xE423
+0x763B = 0xE424
+0x763C = 0xE425
+0x763D = 0xE426
+0x763E = 0xE427
+0x763F = 0xE428
+0x7640 = 0xE429
+0x7641 = 0xE42A
+0x7642 = 0xE42B
+0x7643 = 0xE42C
+0x7644 = 0xE42D
+0x7645 = 0xE42E
+0x7646 = 0xE42F
+0x7647 = 0xE430
+0x7648 = 0xE431
+0x7649 = 0xE432
+0x764A = 0xE433
+0x764B = 0xE434
+0x764C = 0xE435
+0x764D = 0xE436
+0x764E = 0xE437
+0x764F = 0xE438
+0x7650 = 0xE439
+0x7651 = 0xE43A
+0x7652 = 0xE43B
+0x7653 = 0xE43C
+0x7654 = 0xE43D
+0x7655 = 0xE43E
+0x7656 = 0xE43F
+0x7657 = 0xE440
+0x7658 = 0xE441
+0x7659 = 0xE442
+0x765A = 0xE443
+0x765B = 0xE444
+0x765C = 0xE445
+0x765D = 0xE446
+0x765E = 0xE447
+0x765F = 0xE448
+0x7660 = 0xE449
+0x7661 = 0xE44A
+0x7662 = 0xE44B
+0x7663 = 0xE44C
+0x7664 = 0xE44D
+0x7665 = 0xE44E
+0x7666 = 0xE44F
+0x7667 = 0xE450
+0x7668 = 0xE451
+0x7669 = 0xE452
+0x766A = 0xE453
+0x766B = 0xE454
+0x766C = 0xE455
+0x766D = 0xE456
+0x766E = 0xE457
+0x766F = 0xE458
+0x7670 = 0xE459
+0x7671 = 0xE45A
+0x7672 = 0xE45B
+0x7673 = 0xE45C
+0x7674 = 0xE45D
+0x7675 = 0xE45E
+0x7676 = 0xE45F
+0x7677 = 0xE460
+0x7678 = 0xE461
+0x7679 = 0xE462
+0x767A = 0xE463
+0x767B = 0xE464
+0x767C = 0xE465
+0x767D = 0xE466
+0x767E = 0xE467
+0x7721 = 0xE468
+0x7722 = 0xE469
+0x7723 = 0xE46A
+0x7724 = 0xE46B
+0x7725 = 0xE46C
+0x7726 = 0xE46D
+0x7727 = 0xE46E
+0x7728 = 0xE46F
+0x7729 = 0xE470
+0x772A = 0xE471
+0x772B = 0xE472
+0x772C = 0xE473
+0x772D = 0xE474
+0x772E = 0xE475
+0x772F = 0xE476
+0x7730 = 0xE477
+0x7731 = 0xE478
+0x7732 = 0xE479
+0x7733 = 0xE47A
+0x7734 = 0xE47B
+0x7735 = 0xE47C
+0x7736 = 0xE47D
+0x7737 = 0xE47E
+0x7738 = 0xE47F
+0x7739 = 0xE480
+0x773A = 0xE481
+0x773B = 0xE482
+0x773C = 0xE483
+0x773D = 0xE484
+0x773E = 0xE485
+0x773F = 0xE486
+0x7740 = 0xE487
+0x7741 = 0xE488
+0x7742 = 0xE489
+0x7743 = 0xE48A
+0x7744 = 0xE48B
+0x7745 = 0xE48C
+0x7746 = 0xE48D
+0x7747 = 0xE48E
+0x7748 = 0xE48F
+0x7749 = 0xE490
+0x774A = 0xE491
+0x774B = 0xE492
+0x774C = 0xE493
+0x774D = 0xE494
+0x774E = 0xE495
+0x774F = 0xE496
+0x7750 = 0xE497
+0x7751 = 0xE498
+0x7752 = 0xE499
+0x7753 = 0xE49A
+0x7754 = 0xE49B
+0x7755 = 0xE49C
+0x7756 = 0xE49D
+0x7757 = 0xE49E
+0x7758 = 0xE49F
+0x7759 = 0xE4A0
+0x775A = 0xE4A1
+0x775B = 0xE4A2
+0x775C = 0xE4A3
+0x775D = 0xE4A4
+0x775E = 0xE4A5
+0x775F = 0xE4A6
+0x7760 = 0xE4A7
+0x7761 = 0xE4A8
+0x7762 = 0xE4A9
+0x7763 = 0xE4AA
+0x7764 = 0xE4AB
+0x7765 = 0xE4AC
+0x7766 = 0xE4AD
+0x7767 = 0xE4AE
+0x7768 = 0xE4AF
+0x7769 = 0xE4B0
+0x776A = 0xE4B1
+0x776B = 0xE4B2
+0x776C = 0xE4B3
+0x776D = 0xE4B4
+0x776E = 0xE4B5
+0x776F = 0xE4B6
+0x7770 = 0xE4B7
+0x7771 = 0xE4B8
+0x7772 = 0xE4B9
+0x7773 = 0xE4BA
+0x7774 = 0xE4BB
+0x7775 = 0xE4BC
+0x7776 = 0xE4BD
+0x7777 = 0xE4BE
+0x7778 = 0xE4BF
+0x7779 = 0xE4C0
+0x777A = 0xE4C1
+0x777B = 0xE4C2
+0x777C = 0xE4C3
+0x777D = 0xE4C4
+0x777E = 0xE4C5
+0x7821 = 0xE4C6
+0x7822 = 0xE4C7
+0x7823 = 0xE4C8
+0x7824 = 0xE4C9
+0x7825 = 0xE4CA
+0x7826 = 0xE4CB
+0x7827 = 0xE4CC
+0x7828 = 0xE4CD
+0x7829 = 0xE4CE
+0x782A = 0xE4CF
+0x782B = 0xE4D0
+0x782C = 0xE4D1
+0x782D = 0xE4D2
+0x782E = 0xE4D3
+0x782F = 0xE4D4
+0x7830 = 0xE4D5
+0x7831 = 0xE4D6
+0x7832 = 0xE4D7
+0x7833 = 0xE4D8
+0x7834 = 0xE4D9
+0x7835 = 0xE4DA
+0x7836 = 0xE4DB
+0x7837 = 0xE4DC
+0x7838 = 0xE4DD
+0x7839 = 0xE4DE
+0x783A = 0xE4DF
+0x783B = 0xE4E0
+0x783C = 0xE4E1
+0x783D = 0xE4E2
+0x783E = 0xE4E3
+0x783F = 0xE4E4
+0x7840 = 0xE4E5
+0x7841 = 0xE4E6
+0x7842 = 0xE4E7
+0x7843 = 0xE4E8
+0x7844 = 0xE4E9
+0x7845 = 0xE4EA
+0x7846 = 0xE4EB
+0x7847 = 0xE4EC
+0x7848 = 0xE4ED
+0x7849 = 0xE4EE
+0x784A = 0xE4EF
+0x784B = 0xE4F0
+0x784C = 0xE4F1
+0x784D = 0xE4F2
+0x784E = 0xE4F3
+0x784F = 0xE4F4
+0x7850 = 0xE4F5
+0x7851 = 0xE4F6
+0x7852 = 0xE4F7
+0x7853 = 0xE4F8
+0x7854 = 0xE4F9
+0x7855 = 0xE4FA
+0x7856 = 0xE4FB
+0x7857 = 0xE4FC
+0x7858 = 0xE4FD
+0x7859 = 0xE4FE
+0x785A = 0xE4FF
+0x785B = 0xE500
+0x785C = 0xE501
+0x785D = 0xE502
+0x785E = 0xE503
+0x785F = 0xE504
+0x7860 = 0xE505
+0x7861 = 0xE506
+0x7862 = 0xE507
+0x7863 = 0xE508
+0x7864 = 0xE509
+0x7865 = 0xE50A
+0x7866 = 0xE50B
+0x7867 = 0xE50C
+0x7868 = 0xE50D
+0x7869 = 0xE50E
+0x786A = 0xE50F
+0x786B = 0xE510
+0x786C = 0xE511
+0x786D = 0xE512
+0x786E = 0xE513
+0x786F = 0xE514
+0x7870 = 0xE515
+0x7871 = 0xE516
+0x7872 = 0xE517
+0x7873 = 0xE518
+0x7874 = 0xE519
+0x7875 = 0xE51A
+0x7876 = 0xE51B
+0x7877 = 0xE51C
+0x7878 = 0xE51D
+0x7879 = 0xE51E
+0x787A = 0xE51F
+0x787B = 0xE520
+0x787C = 0xE521
+0x787D = 0xE522
+0x787E = 0xE523
+0x7921 = 0xE524
+0x7922 = 0xE525
+0x7923 = 0xE526
+0x7924 = 0xE527
+0x7925 = 0xE528
+0x7926 = 0xE529
+0x7927 = 0xE52A
+0x7928 = 0xE52B
+0x7929 = 0xE52C
+0x792A = 0xE52D
+0x792B = 0xE52E
+0x792C = 0xE52F
+0x792D = 0xE530
+0x792E = 0xE531
+0x792F = 0xE532
+0x7930 = 0xE533
+0x7931 = 0xE534
+0x7932 = 0xE535
+0x7933 = 0xE536
+0x7934 = 0xE537
+0x7935 = 0xE538
+0x7936 = 0xE539
+0x7937 = 0xE53A
+0x7938 = 0xE53B
+0x7939 = 0xE53C
+0x793A = 0xE53D
+0x793B = 0xE53E
+0x793C = 0xE53F
+0x793D = 0xE540
+0x793E = 0xE541
+0x793F = 0xE542
+0x7940 = 0xE543
+0x7941 = 0xE544
+0x7942 = 0xE545
+0x7943 = 0xE546
+0x7944 = 0xE547
+0x7945 = 0xE548
+0x7946 = 0xE549
+0x7947 = 0xE54A
+0x7948 = 0xE54B
+0x7949 = 0xE54C
+0x794A = 0xE54D
+0x794B = 0xE54E
+0x794C = 0xE54F
+0x794D = 0xE550
+0x794E = 0xE551
+0x794F = 0xE552
+0x7950 = 0xE553
+0x7951 = 0xE554
+0x7952 = 0xE555
+0x7953 = 0xE556
+0x7954 = 0xE557
+0x7955 = 0xE558
+0x7956 = 0xE559
+0x7957 = 0xE55A
+0x7958 = 0xE55B
+0x7959 = 0xE55C
+0x795A = 0xE55D
+0x795B = 0xE55E
+0x795C = 0xE55F
+0x795D = 0xE560
+0x795E = 0xE561
+0x795F = 0xE562
+0x7960 = 0xE563
+0x7961 = 0xE564
+0x7962 = 0xE565
+0x7963 = 0xE566
+0x7964 = 0xE567
+0x7965 = 0xE568
+0x7966 = 0xE569
+0x7967 = 0xE56A
+0x7968 = 0xE56B
+0x7969 = 0xE56C
+0x796A = 0xE56D
+0x796B = 0xE56E
+0x796C = 0xE56F
+0x796D = 0xE570
+0x796E = 0xE571
+0x796F = 0xE572
+0x7970 = 0xE573
+0x7971 = 0xE574
+0x7972 = 0xE575
+0x7973 = 0xE576
+0x7974 = 0xE577
+0x7975 = 0xE578
+0x7976 = 0xE579
+0x7977 = 0xE57A
+0x7978 = 0xE57B
+0x7979 = 0xE57C
+0x797A = 0xE57D
+0x797B = 0xE57E
+0x797C = 0xE57F
+0x797D = 0xE580
+0x797E = 0xE581
+0x7A21 = 0xE582
+0x7A22 = 0xE583
+0x7A23 = 0xE584
+0x7A24 = 0xE585
+0x7A25 = 0xE586
+0x7A26 = 0xE587
+0x7A27 = 0xE588
+0x7A28 = 0xE589
+0x7A29 = 0xE58A
+0x7A2A = 0xE58B
+0x7A2B = 0xE58C
+0x7A2C = 0xE58D
+0x7A2D = 0xE58E
+0x7A2E = 0xE58F
+0x7A2F = 0xE590
+0x7A30 = 0xE591
+0x7A31 = 0xE592
+0x7A32 = 0xE593
+0x7A33 = 0xE594
+0x7A34 = 0xE595
+0x7A35 = 0xE596
+0x7A36 = 0xE597
+0x7A37 = 0xE598
+0x7A38 = 0xE599
+0x7A39 = 0xE59A
+0x7A3A = 0xE59B
+0x7A3B = 0xE59C
+0x7A3C = 0xE59D
+0x7A3D = 0xE59E
+0x7A3E = 0xE59F
+0x7A3F = 0xE5A0
+0x7A40 = 0xE5A1
+0x7A41 = 0xE5A2
+0x7A42 = 0xE5A3
+0x7A43 = 0xE5A4
+0x7A44 = 0xE5A5
+0x7A45 = 0xE5A6
+0x7A46 = 0xE5A7
+0x7A47 = 0xE5A8
+0x7A48 = 0xE5A9
+0x7A49 = 0xE5AA
+0x7A4A = 0xE5AB
+0x7A4B = 0xE5AC
+0x7A4C = 0xE5AD
+0x7A4D = 0xE5AE
+0x7A4E = 0xE5AF
+0x7A4F = 0xE5B0
+0x7A50 = 0xE5B1
+0x7A51 = 0xE5B2
+0x7A52 = 0xE5B3
+0x7A53 = 0xE5B4
+0x7A54 = 0xE5B5
+0x7A55 = 0xE5B6
+0x7A56 = 0xE5B7
+0x7A57 = 0xE5B8
+0x7A58 = 0xE5B9
+0x7A59 = 0xE5BA
+0x7A5A = 0xE5BB
+0x7A5B = 0xE5BC
+0x7A5C = 0xE5BD
+0x7A5D = 0xE5BE
+0x7A5E = 0xE5BF
+0x7A5F = 0xE5C0
+0x7A60 = 0xE5C1
+0x7A61 = 0xE5C2
+0x7A62 = 0xE5C3
+0x7A63 = 0xE5C4
+0x7A64 = 0xE5C5
+0x7A65 = 0xE5C6
+0x7A66 = 0xE5C7
+0x7A67 = 0xE5C8
+0x7A68 = 0xE5C9
+0x7A69 = 0xE5CA
+0x7A6A = 0xE5CB
+0x7A6B = 0xE5CC
+0x7A6C = 0xE5CD
+0x7A6D = 0xE5CE
+0x7A6E = 0xE5CF
+0x7A6F = 0xE5D0
+0x7A70 = 0xE5D1
+0x7A71 = 0xE5D2
+0x7A72 = 0xE5D3
+0x7A73 = 0xE5D4
+0x7A74 = 0xE5D5
+0x7A75 = 0xE5D6
+0x7A76 = 0xE5D7
+0x7A77 = 0xE5D8
+0x7A78 = 0xE5D9
+0x7A79 = 0xE5DA
+0x7A7A = 0xE5DB
+0x7A7B = 0xE5DC
+0x7A7C = 0xE5DD
+0x7A7D = 0xE5DE
+0x7A7E = 0xE5DF
+0x7B21 = 0xE5E0
+0x7B22 = 0xE5E1
+0x7B23 = 0xE5E2
+0x7B24 = 0xE5E3
+0x7B25 = 0xE5E4
+0x7B26 = 0xE5E5
+0x7B27 = 0xE5E6
+0x7B28 = 0xE5E7
+0x7B29 = 0xE5E8
+0x7B2A = 0xE5E9
+0x7B2B = 0xE5EA
+0x7B2C = 0xE5EB
+0x7B2D = 0xE5EC
+0x7B2E = 0xE5ED
+0x7B2F = 0xE5EE
+0x7B30 = 0xE5EF
+0x7B31 = 0xE5F0
+0x7B32 = 0xE5F1
+0x7B33 = 0xE5F2
+0x7B34 = 0xE5F3
+0x7B35 = 0xE5F4
+0x7B36 = 0xE5F5
+0x7B37 = 0xE5F6
+0x7B38 = 0xE5F7
+0x7B39 = 0xE5F8
+0x7B3A = 0xE5F9
+0x7B3B = 0xE5FA
+0x7B3C = 0xE5FB
+0x7B3D = 0xE5FC
+0x7B3E = 0xE5FD
+0x7B3F = 0xE5FE
+0x7B40 = 0xE5FF
+0x7B41 = 0xE600
+0x7B42 = 0xE601
+0x7B43 = 0xE602
+0x7B44 = 0xE603
+0x7B45 = 0xE604
+0x7B46 = 0xE605
+0x7B47 = 0xE606
+0x7B48 = 0xE607
+0x7B49 = 0xE608
+0x7B4A = 0xE609
+0x7B4B = 0xE60A
+0x7B4C = 0xE60B
+0x7B4D = 0xE60C
+0x7B4E = 0xE60D
+0x7B4F = 0xE60E
+0x7B50 = 0xE60F
+0x7B51 = 0xE610
+0x7B52 = 0xE611
+0x7B53 = 0xE612
+0x7B54 = 0xE613
+0x7B55 = 0xE614
+0x7B56 = 0xE615
+0x7B57 = 0xE616
+0x7B58 = 0xE617
+0x7B59 = 0xE618
+0x7B5A = 0xE619
+0x7B5B = 0xE61A
+0x7B5C = 0xE61B
+0x7B5D = 0xE61C
+0x7B5E = 0xE61D
+0x7B5F = 0xE61E
+0x7B60 = 0xE61F
+0x7B61 = 0xE620
+0x7B62 = 0xE621
+0x7B63 = 0xE622
+0x7B64 = 0xE623
+0x7B65 = 0xE624
+0x7B66 = 0xE625
+0x7B67 = 0xE626
+0x7B68 = 0xE627
+0x7B69 = 0xE628
+0x7B6A = 0xE629
+0x7B6B = 0xE62A
+0x7B6C = 0xE62B
+0x7B6D = 0xE62C
+0x7B6E = 0xE62D
+0x7B6F = 0xE62E
+0x7B70 = 0xE62F
+0x7B71 = 0xE630
+0x7B72 = 0xE631
+0x7B73 = 0xE632
+0x7B74 = 0xE633
+0x7B75 = 0xE634
+0x7B76 = 0xE635
+0x7B77 = 0xE636
+0x7B78 = 0xE637
+0x7B79 = 0xE638
+0x7B7A = 0xE639
+0x7B7B = 0xE63A
+0x7B7C = 0xE63B
+0x7B7D = 0xE63C
+0x7B7E = 0xE63D
+0x7C21 = 0xE63E
+0x7C22 = 0xE63F
+0x7C23 = 0xE640
+0x7C24 = 0xE641
+0x7C25 = 0xE642
+0x7C26 = 0xE643
+0x7C27 = 0xE644
+0x7C28 = 0xE645
+0x7C29 = 0xE646
+0x7C2A = 0xE647
+0x7C2B = 0xE648
+0x7C2C = 0xE649
+0x7C2D = 0xE64A
+0x7C2E = 0xE64B
+0x7C2F = 0xE64C
+0x7C30 = 0xE64D
+0x7C31 = 0xE64E
+0x7C32 = 0xE64F
+0x7C33 = 0xE650
+0x7C34 = 0xE651
+0x7C35 = 0xE652
+0x7C36 = 0xE653
+0x7C37 = 0xE654
+0x7C38 = 0xE655
+0x7C39 = 0xE656
+0x7C3A = 0xE657
+0x7C3B = 0xE658
+0x7C3C = 0xE659
+0x7C3D = 0xE65A
+0x7C3E = 0xE65B
+0x7C3F = 0xE65C
+0x7C40 = 0xE65D
+0x7C41 = 0xE65E
+0x7C42 = 0xE65F
+0x7C43 = 0xE660
+0x7C44 = 0xE661
+0x7C45 = 0xE662
+0x7C46 = 0xE663
+0x7C47 = 0xE664
+0x7C48 = 0xE665
+0x7C49 = 0xE666
+0x7C4A = 0xE667
+0x7C4B = 0xE668
+0x7C4C = 0xE669
+0x7C4D = 0xE66A
+0x7C4E = 0xE66B
+0x7C4F = 0xE66C
+0x7C50 = 0xE66D
+0x7C51 = 0xE66E
+0x7C52 = 0xE66F
+0x7C53 = 0xE670
+0x7C54 = 0xE671
+0x7C55 = 0xE672
+0x7C56 = 0xE673
+0x7C57 = 0xE674
+0x7C58 = 0xE675
+0x7C59 = 0xE676
+0x7C5A = 0xE677
+0x7C5B = 0xE678
+0x7C5C = 0xE679
+0x7C5D = 0xE67A
+0x7C5E = 0xE67B
+0x7C5F = 0xE67C
+0x7C60 = 0xE67D
+0x7C61 = 0xE67E
+0x7C62 = 0xE67F
+0x7C63 = 0xE680
+0x7C64 = 0xE681
+0x7C65 = 0xE682
+0x7C66 = 0xE683
+0x7C67 = 0xE684
+0x7C68 = 0xE685
+0x7C69 = 0xE686
+0x7C6A = 0xE687
+0x7C6B = 0xE688
+0x7C6C = 0xE689
+0x7C6D = 0xE68A
+0x7C6E = 0xE68B
+0x7C6F = 0xE68C
+0x7C70 = 0xE68D
+0x7C71 = 0xE68E
+0x7C72 = 0xE68F
+0x7C73 = 0xE690
+0x7C74 = 0xE691
+0x7C75 = 0xE692
+0x7C76 = 0xE693
+0x7C77 = 0xE694
+0x7C78 = 0xE695
+0x7C79 = 0xE696
+0x7C7A = 0xE697
+0x7C7B = 0xE698
+0x7C7C = 0xE699
+0x7C7D = 0xE69A
+0x7C7E = 0xE69B
+0x7D21 = 0xE69C
+0x7D22 = 0xE69D
+0x7D23 = 0xE69E
+0x7D24 = 0xE69F
+0x7D25 = 0xE6A0
+0x7D26 = 0xE6A1
+0x7D27 = 0xE6A2
+0x7D28 = 0xE6A3
+0x7D29 = 0xE6A4
+0x7D2A = 0xE6A5
+0x7D2B = 0xE6A6
+0x7D2C = 0xE6A7
+0x7D2D = 0xE6A8
+0x7D2E = 0xE6A9
+0x7D2F = 0xE6AA
+0x7D30 = 0xE6AB
+0x7D31 = 0xE6AC
+0x7D32 = 0xE6AD
+0x7D33 = 0xE6AE
+0x7D34 = 0xE6AF
+0x7D35 = 0xE6B0
+0x7D36 = 0xE6B1
+0x7D37 = 0xE6B2
+0x7D38 = 0xE6B3
+0x7D39 = 0xE6B4
+0x7D3A = 0xE6B5
+0x7D3B = 0xE6B6
+0x7D3C = 0xE6B7
+0x7D3D = 0xE6B8
+0x7D3E = 0xE6B9
+0x7D3F = 0xE6BA
+0x7D40 = 0xE6BB
+0x7D41 = 0xE6BC
+0x7D42 = 0xE6BD
+0x7D43 = 0xE6BE
+0x7D44 = 0xE6BF
+0x7D45 = 0xE6C0
+0x7D46 = 0xE6C1
+0x7D47 = 0xE6C2
+0x7D48 = 0xE6C3
+0x7D49 = 0xE6C4
+0x7D4A = 0xE6C5
+0x7D4B = 0xE6C6
+0x7D4C = 0xE6C7
+0x7D4D = 0xE6C8
+0x7D4E = 0xE6C9
+0x7D4F = 0xE6CA
+0x7D50 = 0xE6CB
+0x7D51 = 0xE6CC
+0x7D52 = 0xE6CD
+0x7D53 = 0xE6CE
+0x7D54 = 0xE6CF
+0x7D55 = 0xE6D0
+0x7D56 = 0xE6D1
+0x7D57 = 0xE6D2
+0x7D58 = 0xE6D3
+0x7D59 = 0xE6D4
+0x7D5A = 0xE6D5
+0x7D5B = 0xE6D6
+0x7D5C = 0xE6D7
+0x7D5D = 0xE6D8
+0x7D5E = 0xE6D9
+0x7D5F = 0xE6DA
+0x7D60 = 0xE6DB
+0x7D61 = 0xE6DC
+0x7D62 = 0xE6DD
+0x7D63 = 0xE6DE
+0x7D64 = 0xE6DF
+0x7D65 = 0xE6E0
+0x7D66 = 0xE6E1
+0x7D67 = 0xE6E2
+0x7D68 = 0xE6E3
+0x7D69 = 0xE6E4
+0x7D6A = 0xE6E5
+0x7D6B = 0xE6E6
+0x7D6C = 0xE6E7
+0x7D6D = 0xE6E8
+0x7D6E = 0xE6E9
+0x7D6F = 0xE6EA
+0x7D70 = 0xE6EB
+0x7D71 = 0xE6EC
+0x7D72 = 0xE6ED
+0x7D73 = 0xE6EE
+0x7D74 = 0xE6EF
+0x7D75 = 0xE6F0
+0x7D76 = 0xE6F1
+0x7D77 = 0xE6F2
+0x7D78 = 0xE6F3
+0x7D79 = 0xE6F4
+0x7D7A = 0xE6F5
+0x7D7B = 0xE6F6
+0x7D7C = 0xE6F7
+0x7D7D = 0xE6F8
+0x7D7E = 0xE6F9
+0x7E21 = 0xE6FA
+0x7E22 = 0xE6FB
+0x7E23 = 0xE6FC
+0x7E24 = 0xE6FD
+0x7E25 = 0xE6FE
+0x7E26 = 0xE6FF
+0x7E27 = 0xE700
+0x7E28 = 0xE701
+0x7E29 = 0xE702
+0x7E2A = 0xE703
+0x7E2B = 0xE704
+0x7E2C = 0xE705
+0x7E2D = 0xE706
+0x7E2E = 0xE707
+0x7E2F = 0xE708
+0x7E30 = 0xE709
+0x7E31 = 0xE70A
+0x7E32 = 0xE70B
+0x7E33 = 0xE70C
+0x7E34 = 0xE70D
+0x7E35 = 0xE70E
+0x7E36 = 0xE70F
+0x7E37 = 0xE710
+0x7E38 = 0xE711
+0x7E39 = 0xE712
+0x7E3A = 0xE713
+0x7E3B = 0xE714
+0x7E3C = 0xE715
+0x7E3D = 0xE716
+0x7E3E = 0xE717
+0x7E3F = 0xE718
+0x7E40 = 0xE719
+0x7E41 = 0xE71A
+0x7E42 = 0xE71B
+0x7E43 = 0xE71C
+0x7E44 = 0xE71D
+0x7E45 = 0xE71E
+0x7E46 = 0xE71F
+0x7E47 = 0xE720
+0x7E48 = 0xE721
+0x7E49 = 0xE722
+0x7E4A = 0xE723
+0x7E4B = 0xE724
+0x7E4C = 0xE725
+0x7E4D = 0xE726
+0x7E4E = 0xE727
+0x7E4F = 0xE728
+0x7E50 = 0xE729
+0x7E51 = 0xE72A
+0x7E52 = 0xE72B
+0x7E53 = 0xE72C
+0x7E54 = 0xE72D
+0x7E55 = 0xE72E
+0x7E56 = 0xE72F
+0x7E57 = 0xE730
+0x7E58 = 0xE731
+0x7E59 = 0xE732
+0x7E5A = 0xE733
+0x7E5B = 0xE734
+0x7E5C = 0xE735
+0x7E5D = 0xE736
+0x7E5E = 0xE737
+0x7E5F = 0xE738
+0x7E60 = 0xE739
+0x7E61 = 0xE73A
+0x7E62 = 0xE73B
+0x7E63 = 0xE73C
+0x7E64 = 0xE73D
+0x7E65 = 0xE73E
+0x7E66 = 0xE73F
+0x7E67 = 0xE740
+0x7E68 = 0xE741
+0x7E69 = 0xE742
+0x7E6A = 0xE743
+0x7E6B = 0xE744
+0x7E6C = 0xE745
+0x7E6D = 0xE746
+0x7E6E = 0xE747
+0x7E6F = 0xE748
+0x7E70 = 0xE749
+0x7E71 = 0xE74A
+0x7E72 = 0xE74B
+0x7E73 = 0xE74C
+0x7E74 = 0xE74D
+0x7E75 = 0xE74E
+0x7E76 = 0xE74F
+0x7E77 = 0xE750
+0x7E78 = 0xE751
+0x7E79 = 0xE752
+0x7E7A = 0xE753
+0x7E7B = 0xE754
+0x7E7C = 0xE755
+0x7E7D = 0xE756
+0x7E7E = 0xE757
+END_MAP
diff --git a/enc/trans/JIS/JISX0212VDC@IBM%UCS.src b/enc/trans/JIS/JISX0212VDC@IBM%UCS.src
new file mode 100644
index 0000000000..6f73ed3617
--- /dev/null
+++ b/enc/trans/JIS/JISX0212VDC@IBM%UCS.src
@@ -0,0 +1,120 @@
+# $NetBSD: JISX0212VDC@IBM%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0212VDC:IBM/UCS"
+SRC_ZONE	0x7321 - 0x747E
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x7373 = 0x2170
+0x7374 = 0x2171
+0x7375 = 0x2172
+0x7376 = 0x2173
+0x7377 = 0x2174
+0x7378 = 0x2175
+0x7379 = 0x2176
+0x737A = 0x2177
+0x737B = 0x2178
+0x737C = 0x2179
+0x737D = 0x2160
+0x737E = 0x2161
+0x7421 = 0x2162
+0x7422 = 0x2163
+0x7423 = 0x2164
+0x7424 = 0x2165
+0x7425 = 0x2166
+0x7426 = 0x2167
+0x7427 = 0x2168
+0x7428 = 0x2169
+0x7429 = 0xFF07
+0x742A = 0xFF02
+0x742B = 0x3231
+0x742C = 0x2116
+0x742D = 0x2121
+0x742E = 0x70BB
+0x742F = 0x4EFC
+0x7430 = 0x50F4
+0x7431 = 0x51EC
+0x7432 = 0x5307
+0x7433 = 0x5324
+0x7434 = 0xFA0E
+0x7435 = 0x548A
+0x7436 = 0x5759
+0x7437 = 0xFA0F
+0x7438 = 0xFA10
+0x7439 = 0x589E
+0x743A = 0x5BEC
+0x743B = 0x5CF5
+0x743C = 0x5D53
+0x743D = 0xFA11
+0x743E = 0x5FB7
+0x743F = 0x6085
+0x7440 = 0x6120
+0x7441 = 0x654E
+0x7442 = 0x663B
+0x7443 = 0x6665
+0x7444 = 0xFA12
+0x7445 = 0xF929
+0x7446 = 0x6801
+0x7447 = 0xFA13
+0x7448 = 0xFA14
+0x7449 = 0x6A6B
+0x744A = 0x6AE2
+0x744B = 0x6DF8
+0x744C = 0x6DF2
+0x744D = 0x7028
+0x744E = 0xFA15
+0x744F = 0xFA16
+0x7450 = 0x7501
+0x7451 = 0x7682
+0x7452 = 0x769E
+0x7453 = 0xFA17
+0x7454 = 0x7930
+0x7455 = 0xFA18
+0x7456 = 0xFA19
+0x7457 = 0xFA1A
+0x7458 = 0xFA1B
+0x7459 = 0x7AE7
+0x745A = 0xFA1C
+0x745B = 0xFA1D
+0x745C = 0x7DA0
+0x745D = 0x7DD6
+0x745E = 0xFA1E
+0x745F = 0x8362
+0x7460 = 0xFA1F
+0x7461 = 0x85B0
+0x7462 = 0xFA20
+0x7463 = 0xFA21
+0x7464 = 0x8807
+0x7465 = 0xFA22
+0x7466 = 0x8B7F
+0x7467 = 0x8CF4
+0x7468 = 0x8D76
+0x7469 = 0xFA23
+0x746A = 0xFA24
+0x746B = 0xFA25
+0x746C = 0x90DE
+0x746D = 0xFA26
+0x746E = 0x9115
+0x746F = 0xFA27
+0x7470 = 0xFA28
+0x7471 = 0x9592
+0x7472 = 0xF9DC
+0x7473 = 0xFA29
+0x7474 = 0x973B
+0x7475 = 0x974D
+0x7476 = 0x9751
+0x7477 = 0xFA2A
+0x7478 = 0xFA2B
+0x7479 = 0xFA2C
+0x747A = 0x999E
+0x747B = 0x9AD9
+0x747C = 0x9B72
+0x747D = 0xFA2D
+0x747E = 0x9ED1
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0201-KANA.src b/enc/trans/JIS/UCS%JISX0201-KANA.src
new file mode 100644
index 0000000000..57ae00f23b
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0201-KANA.src
@@ -0,0 +1,127 @@
+# $NetBSD: UCS%JISX0201-KANA.src,v 1.5 2006/10/26 16:04:21 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0201-KANA"
+SRC_ZONE	0xFF60 - 0xFF9F
+OOB_MODE	INVALID
+DST_INVALID	0xFF
+DST_UNIT_BITS	8
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             JIS X 0201 (1976) to Unicode 1.1 Table
+#	Unicode version:  1.1
+#	Table version:    0.9
+#	Table format:     Format A
+#	Date:             8 March 1994
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from JIS X 0201 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between JIS X 0201 and
+# Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Three tab-separated columns
+#		Column #1 is the shift JIS code (in hex as 0xXX)
+#		Column #2 is the Unicode (in hex as 0xXXXX)
+#		Column #3 the Unicode (ISO 10646) name (follows a comment sign)
+#
+#	The entries are in JIS order
+#
+#
+0xFF61 = 0x21
+0xFF62 = 0x22
+0xFF63 = 0x23
+0xFF64 = 0x24
+0xFF65 = 0x25
+0xFF66 = 0x26
+0xFF67 = 0x27
+0xFF68 = 0x28
+0xFF69 = 0x29
+0xFF6A = 0x2A
+0xFF6B = 0x2B
+0xFF6C = 0x2C
+0xFF6D = 0x2D
+0xFF6E = 0x2E
+0xFF6F = 0x2F
+0xFF70 = 0x30
+0xFF71 = 0x31
+0xFF72 = 0x32
+0xFF73 = 0x33
+0xFF74 = 0x34
+0xFF75 = 0x35
+0xFF76 = 0x36
+0xFF77 = 0x37
+0xFF78 = 0x38
+0xFF79 = 0x39
+0xFF7A = 0x3A
+0xFF7B = 0x3B
+0xFF7C = 0x3C
+0xFF7D = 0x3D
+0xFF7E = 0x3E
+0xFF7F = 0x3F
+0xFF80 = 0x40
+0xFF81 = 0x41
+0xFF82 = 0x42
+0xFF83 = 0x43
+0xFF84 = 0x44
+0xFF85 = 0x45
+0xFF86 = 0x46
+0xFF87 = 0x47
+0xFF88 = 0x48
+0xFF89 = 0x49
+0xFF8A = 0x4A
+0xFF8B = 0x4B
+0xFF8C = 0x4C
+0xFF8D = 0x4D
+0xFF8E = 0x4E
+0xFF8F = 0x4F
+0xFF90 = 0x50
+0xFF91 = 0x51
+0xFF92 = 0x52
+0xFF93 = 0x53
+0xFF94 = 0x54
+0xFF95 = 0x55
+0xFF96 = 0x56
+0xFF97 = 0x57
+0xFF98 = 0x58
+0xFF99 = 0x59
+0xFF9A = 0x5A
+0xFF9B = 0x5B
+0xFF9C = 0x5C
+0xFF9D = 0x5D
+0xFF9E = 0x5E
+0xFF9F = 0x5F
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208@1990.src b/enc/trans/JIS/UCS%JISX0208@1990.src
new file mode 100644
index 0000000000..977171ccda
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0208@1990.src
@@ -0,0 +1,6974 @@
+# $NetBSD: UCS%JISX0208@1990.src,v 1.7 2006/11/29 15:45:26 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0208:1990"
+SRC_ZONE	0x005C - 0xFFE5
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             JIS X 0208 (1990) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.9
+#	Table format:     Format A
+#	Date:             8 March 1994
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from JIS X 0208 (1990) into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between JIS X 0208 (1990)
+# and Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Four tab-separated columns
+#		 Column #1 is the shift-JIS code (in hex)
+#		 Column #2 is the JIS X 0208 code (in hex as 0xXXXX)
+#		 Column #3 is the Unicode (in hex as 0xXXXX)
+#		 Column #4 the Unicode name (follows a comment sign, '#')
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point.  Including all these
+#			names in this file increases its size substantially
+#			and needlessly.  The token "<CJK>" is used for the
+#			name of these characters.  If necessary, it can be
+#			expanded algorithmically by a parser or editor.
+#
+#	The entries are in JIS X 0208 order
+#
+#	The following algorithms can be used to change the hex form
+#		of JIS 0208 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x7426 -> 0x5406 -> 8406
+#
+#   The kanji mappings are a normative part of ISO/IEC 10646.  The
+#       non-kanji mappings are provisional, pending definition of
+#       official mappings by Japanese standards bodies
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+#
+# NetBSD specific modification:
+#	2003-08-18 : add U+FF3C -> 0x2140 conversion.
+#			see UCS%JISX0208@1990.src.
+#
+# Ruby specific modification:
+#	2008-08-31 : remove U+005C -> 0x2140 conversion.
+#
+0x00A2 = 0x2171
+0x00A3 = 0x2172
+0x00A7 = 0x2178
+0x00A8 = 0x212F
+0x00AC = 0x224C
+0x00B0 = 0x216B
+0x00B1 = 0x215E
+0x00B4 = 0x212D
+0x00B6 = 0x2279
+0x00D7 = 0x215F
+0x00F7 = 0x2160
+0x0391 = 0x2621
+0x0392 = 0x2622
+0x0393 = 0x2623
+0x0394 = 0x2624
+0x0395 = 0x2625
+0x0396 = 0x2626
+0x0397 = 0x2627
+0x0398 = 0x2628
+0x0399 = 0x2629
+0x039A = 0x262A
+0x039B = 0x262B
+0x039C = 0x262C
+0x039D = 0x262D
+0x039E = 0x262E
+0x039F = 0x262F
+0x03A0 = 0x2630
+0x03A1 = 0x2631
+0x03A3 = 0x2632
+0x03A4 = 0x2633
+0x03A5 = 0x2634
+0x03A6 = 0x2635
+0x03A7 = 0x2636
+0x03A8 = 0x2637
+0x03A9 = 0x2638
+0x03B1 = 0x2641
+0x03B2 = 0x2642
+0x03B3 = 0x2643
+0x03B4 = 0x2644
+0x03B5 = 0x2645
+0x03B6 = 0x2646
+0x03B7 = 0x2647
+0x03B8 = 0x2648
+0x03B9 = 0x2649
+0x03BA = 0x264A
+0x03BB = 0x264B
+0x03BC = 0x264C
+0x03BD = 0x264D
+0x03BE = 0x264E
+0x03BF = 0x264F
+0x03C0 = 0x2650
+0x03C1 = 0x2651
+0x03C3 = 0x2652
+0x03C4 = 0x2653
+0x03C5 = 0x2654
+0x03C6 = 0x2655
+0x03C7 = 0x2656
+0x03C8 = 0x2657
+0x03C9 = 0x2658
+0x0401 = 0x2727
+0x0410 = 0x2721
+0x0411 = 0x2722
+0x0412 = 0x2723
+0x0413 = 0x2724
+0x0414 = 0x2725
+0x0415 = 0x2726
+0x0416 = 0x2728
+0x0417 = 0x2729
+0x0418 = 0x272A
+0x0419 = 0x272B
+0x041A = 0x272C
+0x041B = 0x272D
+0x041C = 0x272E
+0x041D = 0x272F
+0x041E = 0x2730
+0x041F = 0x2731
+0x0420 = 0x2732
+0x0421 = 0x2733
+0x0422 = 0x2734
+0x0423 = 0x2735
+0x0424 = 0x2736
+0x0425 = 0x2737
+0x0426 = 0x2738
+0x0427 = 0x2739
+0x0428 = 0x273A
+0x0429 = 0x273B
+0x042A = 0x273C
+0x042B = 0x273D
+0x042C = 0x273E
+0x042D = 0x273F
+0x042E = 0x2740
+0x042F = 0x2741
+0x0430 = 0x2751
+0x0431 = 0x2752
+0x0432 = 0x2753
+0x0433 = 0x2754
+0x0434 = 0x2755
+0x0435 = 0x2756
+0x0436 = 0x2758
+0x0437 = 0x2759
+0x0438 = 0x275A
+0x0439 = 0x275B
+0x043A = 0x275C
+0x043B = 0x275D
+0x043C = 0x275E
+0x043D = 0x275F
+0x043E = 0x2760
+0x043F = 0x2761
+0x0440 = 0x2762
+0x0441 = 0x2763
+0x0442 = 0x2764
+0x0443 = 0x2765
+0x0444 = 0x2766
+0x0445 = 0x2767
+0x0446 = 0x2768
+0x0447 = 0x2769
+0x0448 = 0x276A
+0x0449 = 0x276B
+0x044A = 0x276C
+0x044B = 0x276D
+0x044C = 0x276E
+0x044D = 0x276F
+0x044E = 0x2770
+0x044F = 0x2771
+0x0451 = 0x2757
+0x2010 = 0x213E
+0x2014 = 0x213D
+0x2015 = 0x213D
+0x2016 = 0x2142
+0x2018 = 0x2146
+0x2019 = 0x2147
+0x201C = 0x2148
+0x201D = 0x2149
+0x2020 = 0x2277
+0x2021 = 0x2278
+0x2025 = 0x2145
+0x2026 = 0x2144
+0x2030 = 0x2273
+0x2032 = 0x216C
+0x2033 = 0x216D
+0x203B = 0x2228
+0x2103 = 0x216E
+0x212B = 0x2272
+0x2190 = 0x222B
+0x2191 = 0x222C
+0x2192 = 0x222A
+0x2193 = 0x222D
+0x21D2 = 0x224D
+0x21D4 = 0x224E
+0x2200 = 0x224F
+0x2202 = 0x225F
+0x2203 = 0x2250
+0x2207 = 0x2260
+0x2208 = 0x223A
+0x220B = 0x223B
+0x2212 = 0x215D
+0x221A = 0x2265
+0x221D = 0x2267
+0x221E = 0x2167
+0x2220 = 0x225C
+0x2227 = 0x224A
+0x2228 = 0x224B
+0x2229 = 0x2241
+0x222A = 0x2240
+0x222B = 0x2269
+0x222C = 0x226A
+0x2234 = 0x2168
+0x2235 = 0x2268
+0x223D = 0x2266
+0x2252 = 0x2262
+0x2260 = 0x2162
+0x2261 = 0x2261
+0x2266 = 0x2165
+0x2267 = 0x2166
+0x226A = 0x2263
+0x226B = 0x2264
+0x2282 = 0x223E
+0x2283 = 0x223F
+0x2286 = 0x223C
+0x2287 = 0x223D
+0x22A5 = 0x225D
+0x2312 = 0x225E
+0x2500 = 0x2821
+0x2501 = 0x282C
+0x2502 = 0x2822
+0x2503 = 0x282D
+0x250C = 0x2823
+0x250F = 0x282E
+0x2510 = 0x2824
+0x2513 = 0x282F
+0x2514 = 0x2826
+0x2517 = 0x2831
+0x2518 = 0x2825
+0x251B = 0x2830
+0x251C = 0x2827
+0x251D = 0x283C
+0x2520 = 0x2837
+0x2523 = 0x2832
+0x2524 = 0x2829
+0x2525 = 0x283E
+0x2528 = 0x2839
+0x252B = 0x2834
+0x252C = 0x2828
+0x252F = 0x2838
+0x2530 = 0x283D
+0x2533 = 0x2833
+0x2534 = 0x282A
+0x2537 = 0x283A
+0x2538 = 0x283F
+0x253B = 0x2835
+0x253C = 0x282B
+0x253F = 0x283B
+0x2542 = 0x2840
+0x254B = 0x2836
+0x25A0 = 0x2223
+0x25A1 = 0x2222
+0x25B2 = 0x2225
+0x25B3 = 0x2224
+0x25BC = 0x2227
+0x25BD = 0x2226
+0x25C6 = 0x2221
+0x25C7 = 0x217E
+0x25CB = 0x217B
+0x25CE = 0x217D
+0x25CF = 0x217C
+0x25EF = 0x227E
+0x2605 = 0x217A
+0x2606 = 0x2179
+0x2640 = 0x216A
+0x2642 = 0x2169
+0x266A = 0x2276
+0x266D = 0x2275
+0x266F = 0x2274
+0x3000 = 0x2121
+0x3001 = 0x2122
+0x3002 = 0x2123
+0x3003 = 0x2137
+0x3005 = 0x2139
+0x3006 = 0x213A
+0x3007 = 0x213B
+0x3008 = 0x2152
+0x3009 = 0x2153
+0x300A = 0x2154
+0x300B = 0x2155
+0x300C = 0x2156
+0x300D = 0x2157
+0x300E = 0x2158
+0x300F = 0x2159
+0x3010 = 0x215A
+0x3011 = 0x215B
+0x3012 = 0x2229
+0x3013 = 0x222E
+0x3014 = 0x214C
+0x3015 = 0x214D
+0x301C = 0x2141
+0x3041 = 0x2421
+0x3042 = 0x2422
+0x3043 = 0x2423
+0x3044 = 0x2424
+0x3045 = 0x2425
+0x3046 = 0x2426
+0x3047 = 0x2427
+0x3048 = 0x2428
+0x3049 = 0x2429
+0x304A = 0x242A
+0x304B = 0x242B
+0x304C = 0x242C
+0x304D = 0x242D
+0x304E = 0x242E
+0x304F = 0x242F
+0x3050 = 0x2430
+0x3051 = 0x2431
+0x3052 = 0x2432
+0x3053 = 0x2433
+0x3054 = 0x2434
+0x3055 = 0x2435
+0x3056 = 0x2436
+0x3057 = 0x2437
+0x3058 = 0x2438
+0x3059 = 0x2439
+0x305A = 0x243A
+0x305B = 0x243B
+0x305C = 0x243C
+0x305D = 0x243D
+0x305E = 0x243E
+0x305F = 0x243F
+0x3060 = 0x2440
+0x3061 = 0x2441
+0x3062 = 0x2442
+0x3063 = 0x2443
+0x3064 = 0x2444
+0x3065 = 0x2445
+0x3066 = 0x2446
+0x3067 = 0x2447
+0x3068 = 0x2448
+0x3069 = 0x2449
+0x306A = 0x244A
+0x306B = 0x244B
+0x306C = 0x244C
+0x306D = 0x244D
+0x306E = 0x244E
+0x306F = 0x244F
+0x3070 = 0x2450
+0x3071 = 0x2451
+0x3072 = 0x2452
+0x3073 = 0x2453
+0x3074 = 0x2454
+0x3075 = 0x2455
+0x3076 = 0x2456
+0x3077 = 0x2457
+0x3078 = 0x2458
+0x3079 = 0x2459
+0x307A = 0x245A
+0x307B = 0x245B
+0x307C = 0x245C
+0x307D = 0x245D
+0x307E = 0x245E
+0x307F = 0x245F
+0x3080 = 0x2460
+0x3081 = 0x2461
+0x3082 = 0x2462
+0x3083 = 0x2463
+0x3084 = 0x2464
+0x3085 = 0x2465
+0x3086 = 0x2466
+0x3087 = 0x2467
+0x3088 = 0x2468
+0x3089 = 0x2469
+0x308A = 0x246A
+0x308B = 0x246B
+0x308C = 0x246C
+0x308D = 0x246D
+0x308E = 0x246E
+0x308F = 0x246F
+0x3090 = 0x2470
+0x3091 = 0x2471
+0x3092 = 0x2472
+0x3093 = 0x2473
+0x309B = 0x212B
+0x309C = 0x212C
+0x309D = 0x2135
+0x309E = 0x2136
+0x30A1 = 0x2521
+0x30A2 = 0x2522
+0x30A3 = 0x2523
+0x30A4 = 0x2524
+0x30A5 = 0x2525
+0x30A6 = 0x2526
+0x30A7 = 0x2527
+0x30A8 = 0x2528
+0x30A9 = 0x2529
+0x30AA = 0x252A
+0x30AB = 0x252B
+0x30AC = 0x252C
+0x30AD = 0x252D
+0x30AE = 0x252E
+0x30AF = 0x252F
+0x30B0 = 0x2530
+0x30B1 = 0x2531
+0x30B2 = 0x2532
+0x30B3 = 0x2533
+0x30B4 = 0x2534
+0x30B5 = 0x2535
+0x30B6 = 0x2536
+0x30B7 = 0x2537
+0x30B8 = 0x2538
+0x30B9 = 0x2539
+0x30BA = 0x253A
+0x30BB = 0x253B
+0x30BC = 0x253C
+0x30BD = 0x253D
+0x30BE = 0x253E
+0x30BF = 0x253F
+0x30C0 = 0x2540
+0x30C1 = 0x2541
+0x30C2 = 0x2542
+0x30C3 = 0x2543
+0x30C4 = 0x2544
+0x30C5 = 0x2545
+0x30C6 = 0x2546
+0x30C7 = 0x2547
+0x30C8 = 0x2548
+0x30C9 = 0x2549
+0x30CA = 0x254A
+0x30CB = 0x254B
+0x30CC = 0x254C
+0x30CD = 0x254D
+0x30CE = 0x254E
+0x30CF = 0x254F
+0x30D0 = 0x2550
+0x30D1 = 0x2551
+0x30D2 = 0x2552
+0x30D3 = 0x2553
+0x30D4 = 0x2554
+0x30D5 = 0x2555
+0x30D6 = 0x2556
+0x30D7 = 0x2557
+0x30D8 = 0x2558
+0x30D9 = 0x2559
+0x30DA = 0x255A
+0x30DB = 0x255B
+0x30DC = 0x255C
+0x30DD = 0x255D
+0x30DE = 0x255E
+0x30DF = 0x255F
+0x30E0 = 0x2560
+0x30E1 = 0x2561
+0x30E2 = 0x2562
+0x30E3 = 0x2563
+0x30E4 = 0x2564
+0x30E5 = 0x2565
+0x30E6 = 0x2566
+0x30E7 = 0x2567
+0x30E8 = 0x2568
+0x30E9 = 0x2569
+0x30EA = 0x256A
+0x30EB = 0x256B
+0x30EC = 0x256C
+0x30ED = 0x256D
+0x30EE = 0x256E
+0x30EF = 0x256F
+0x30F0 = 0x2570
+0x30F1 = 0x2571
+0x30F2 = 0x2572
+0x30F3 = 0x2573
+0x30F4 = 0x2574
+0x30F5 = 0x2575
+0x30F6 = 0x2576
+0x30FB = 0x2126
+0x30FC = 0x213C
+0x30FD = 0x2133
+0x30FE = 0x2134
+0x4E00 = 0x306C
+0x4E01 = 0x437A
+0x4E03 = 0x3C37
+0x4E07 = 0x4B7C
+0x4E08 = 0x3E66
+0x4E09 = 0x3B30
+0x4E0A = 0x3E65
+0x4E0B = 0x323C
+0x4E0D = 0x4954
+0x4E0E = 0x4D3F
+0x4E10 = 0x5022
+0x4E11 = 0x312F
+0x4E14 = 0x336E
+0x4E15 = 0x5023
+0x4E16 = 0x4024
+0x4E17 = 0x5242
+0x4E18 = 0x3556
+0x4E19 = 0x4A3A
+0x4E1E = 0x3E67
+0x4E21 = 0x4E3E
+0x4E26 = 0x4A42
+0x4E2A = 0x5024
+0x4E2D = 0x4366
+0x4E31 = 0x5025
+0x4E32 = 0x367A
+0x4E36 = 0x5026
+0x4E38 = 0x345D
+0x4E39 = 0x4330
+0x4E3B = 0x3C67
+0x4E3C = 0x5027
+0x4E3F = 0x5028
+0x4E42 = 0x5029
+0x4E43 = 0x4735
+0x4E45 = 0x3557
+0x4E4B = 0x4737
+0x4E4D = 0x4663
+0x4E4E = 0x3843
+0x4E4F = 0x4B33
+0x4E55 = 0x6949
+0x4E56 = 0x502A
+0x4E57 = 0x3E68
+0x4E58 = 0x502B
+0x4E59 = 0x3235
+0x4E5D = 0x3665
+0x4E5E = 0x3870
+0x4E5F = 0x4C69
+0x4E62 = 0x5626
+0x4E71 = 0x4D70
+0x4E73 = 0x467D
+0x4E7E = 0x3425
+0x4E80 = 0x3535
+0x4E82 = 0x502C
+0x4E85 = 0x502D
+0x4E86 = 0x4E3B
+0x4E88 = 0x4D3D
+0x4E89 = 0x4168
+0x4E8A = 0x502F
+0x4E8B = 0x3B76
+0x4E8C = 0x4673
+0x4E8E = 0x5032
+0x4E91 = 0x313E
+0x4E92 = 0x385F
+0x4E94 = 0x385E
+0x4E95 = 0x3066
+0x4E98 = 0x4F4B
+0x4E99 = 0x4F4A
+0x4E9B = 0x3A33
+0x4E9C = 0x3021
+0x4E9E = 0x5033
+0x4E9F = 0x5034
+0x4EA0 = 0x5035
+0x4EA1 = 0x4B34
+0x4EA2 = 0x5036
+0x4EA4 = 0x3872
+0x4EA5 = 0x3067
+0x4EA6 = 0x4B72
+0x4EA8 = 0x357C
+0x4EAB = 0x357D
+0x4EAC = 0x357E
+0x4EAD = 0x4462
+0x4EAE = 0x4E3C
+0x4EB0 = 0x5037
+0x4EB3 = 0x5038
+0x4EB6 = 0x5039
+0x4EBA = 0x3F4D
+0x4EC0 = 0x3D3A
+0x4EC1 = 0x3F4E
+0x4EC2 = 0x503E
+0x4EC4 = 0x503C
+0x4EC6 = 0x503D
+0x4EC7 = 0x3558
+0x4ECA = 0x3A23
+0x4ECB = 0x3270
+0x4ECD = 0x503B
+0x4ECE = 0x503A
+0x4ECF = 0x4A29
+0x4ED4 = 0x3B46
+0x4ED5 = 0x3B45
+0x4ED6 = 0x423E
+0x4ED7 = 0x503F
+0x4ED8 = 0x4955
+0x4ED9 = 0x4067
+0x4EDD = 0x2138
+0x4EDE = 0x5040
+0x4EDF = 0x5042
+0x4EE3 = 0x4265
+0x4EE4 = 0x4E61
+0x4EE5 = 0x304A
+0x4EED = 0x5041
+0x4EEE = 0x323E
+0x4EF0 = 0x3644
+0x4EF2 = 0x4367
+0x4EF6 = 0x376F
+0x4EF7 = 0x5043
+0x4EFB = 0x4724
+0x4F01 = 0x346B
+0x4F09 = 0x5044
+0x4F0A = 0x304B
+0x4F0D = 0x3860
+0x4F0E = 0x346C
+0x4F0F = 0x497A
+0x4F10 = 0x4832
+0x4F11 = 0x3559
+0x4F1A = 0x3271
+0x4F1C = 0x5067
+0x4F1D = 0x4541
+0x4F2F = 0x476C
+0x4F30 = 0x5046
+0x4F34 = 0x483C
+0x4F36 = 0x4E62
+0x4F38 = 0x3F2D
+0x4F3A = 0x3B47
+0x4F3C = 0x3B77
+0x4F3D = 0x3240
+0x4F43 = 0x4451
+0x4F46 = 0x4322
+0x4F47 = 0x504A
+0x4F4D = 0x304C
+0x4F4E = 0x4463
+0x4F4F = 0x3D3B
+0x4F50 = 0x3A34
+0x4F51 = 0x4D24
+0x4F53 = 0x424E
+0x4F55 = 0x323F
+0x4F57 = 0x5049
+0x4F59 = 0x4D3E
+0x4F5A = 0x5045
+0x4F5B = 0x5047
+0x4F5C = 0x3A6E
+0x4F5D = 0x5048
+0x4F5E = 0x5524
+0x4F69 = 0x5050
+0x4F6F = 0x5053
+0x4F70 = 0x5051
+0x4F73 = 0x3242
+0x4F75 = 0x4A3B
+0x4F76 = 0x504B
+0x4F7B = 0x504F
+0x4F7C = 0x3873
+0x4F7F = 0x3B48
+0x4F83 = 0x3426
+0x4F86 = 0x5054
+0x4F88 = 0x504C
+0x4F8B = 0x4E63
+0x4F8D = 0x3B78
+0x4F8F = 0x504D
+0x4F91 = 0x5052
+0x4F96 = 0x5055
+0x4F98 = 0x504E
+0x4F9B = 0x3621
+0x4F9D = 0x304D
+0x4FA0 = 0x3622
+0x4FA1 = 0x3241
+0x4FAB = 0x5525
+0x4FAD = 0x4B79
+0x4FAE = 0x496E
+0x4FAF = 0x3874
+0x4FB5 = 0x3F2F
+0x4FB6 = 0x4E37
+0x4FBF = 0x4A58
+0x4FC2 = 0x3738
+0x4FC3 = 0x4225
+0x4FC4 = 0x3264
+0x4FCA = 0x3D53
+0x4FCE = 0x5059
+0x4FD0 = 0x505E
+0x4FD1 = 0x505C
+0x4FD4 = 0x5057
+0x4FD7 = 0x422F
+0x4FD8 = 0x505A
+0x4FDA = 0x505D
+0x4FDB = 0x505B
+0x4FDD = 0x4A5D
+0x4FDF = 0x5058
+0x4FE1 = 0x3F2E
+0x4FE3 = 0x4B73
+0x4FE4 = 0x505F
+0x4FE5 = 0x5060
+0x4FEE = 0x3D24
+0x4FEF = 0x506D
+0x4FF3 = 0x4750
+0x4FF5 = 0x4936
+0x4FF6 = 0x5068
+0x4FF8 = 0x4A70
+0x4FFA = 0x3236
+0x4FFE = 0x506C
+0x5005 = 0x5066
+0x5006 = 0x506F
+0x5009 = 0x4152
+0x500B = 0x3844
+0x500D = 0x475C
+0x500F = 0x6047
+0x5011 = 0x506E
+0x5012 = 0x455D
+0x5014 = 0x5063
+0x5016 = 0x3876
+0x5019 = 0x3875
+0x501A = 0x5061
+0x501F = 0x3C5A
+0x5021 = 0x5069
+0x5023 = 0x4A6F
+0x5024 = 0x434D
+0x5025 = 0x5065
+0x5026 = 0x3771
+0x5028 = 0x5062
+0x5029 = 0x506A
+0x502A = 0x5064
+0x502B = 0x4E51
+0x502C = 0x506B
+0x502D = 0x4F41
+0x5036 = 0x3666
+0x5039 = 0x3770
+0x5043 = 0x5070
+0x5047 = 0x5071
+0x5048 = 0x5075
+0x5049 = 0x304E
+0x504F = 0x4A50
+0x5050 = 0x5074
+0x5055 = 0x5073
+0x5056 = 0x5077
+0x505A = 0x5076
+0x505C = 0x4464
+0x5065 = 0x3772
+0x506C = 0x5078
+0x5072 = 0x3C45
+0x5074 = 0x4226
+0x5075 = 0x4465
+0x5076 = 0x3676
+0x5078 = 0x5079
+0x507D = 0x3536
+0x5080 = 0x507A
+0x5085 = 0x507C
+0x508D = 0x4B35
+0x5091 = 0x3766
+0x5098 = 0x3B31
+0x5099 = 0x4877
+0x509A = 0x507B
+0x50AC = 0x3A45
+0x50AD = 0x4D43
+0x50B2 = 0x507E
+0x50B3 = 0x5123
+0x50B4 = 0x507D
+0x50B5 = 0x3A44
+0x50B7 = 0x3D7D
+0x50BE = 0x3739
+0x50C2 = 0x5124
+0x50C5 = 0x364F
+0x50C9 = 0x5121
+0x50CA = 0x5122
+0x50CD = 0x462F
+0x50CF = 0x417C
+0x50D1 = 0x3623
+0x50D5 = 0x4B4D
+0x50D6 = 0x5125
+0x50DA = 0x4E3D
+0x50DE = 0x5126
+0x50E3 = 0x5129
+0x50E5 = 0x5127
+0x50E7 = 0x414E
+0x50ED = 0x5128
+0x50EE = 0x512A
+0x50F5 = 0x512C
+0x50F9 = 0x512B
+0x50FB = 0x4A48
+0x5100 = 0x3537
+0x5101 = 0x512E
+0x5102 = 0x512F
+0x5104 = 0x322F
+0x5109 = 0x512D
+0x5112 = 0x3C74
+0x5114 = 0x5132
+0x5115 = 0x5131
+0x5116 = 0x5130
+0x5118 = 0x5056
+0x511A = 0x5133
+0x511F = 0x3D7E
+0x5121 = 0x5134
+0x512A = 0x4D25
+0x5132 = 0x4C59
+0x5137 = 0x5136
+0x513A = 0x5135
+0x513B = 0x5138
+0x513C = 0x5137
+0x513F = 0x5139
+0x5140 = 0x513A
+0x5141 = 0x3074
+0x5143 = 0x3835
+0x5144 = 0x373B
+0x5145 = 0x3D3C
+0x5146 = 0x437B
+0x5147 = 0x3624
+0x5148 = 0x4068
+0x5149 = 0x3877
+0x514B = 0x396E
+0x514C = 0x513C
+0x514D = 0x4C48
+0x514E = 0x4546
+0x5150 = 0x3B79
+0x5152 = 0x513B
+0x5154 = 0x513D
+0x515A = 0x455E
+0x515C = 0x3375
+0x5162 = 0x513E
+0x5165 = 0x467E
+0x5168 = 0x4134
+0x5169 = 0x5140
+0x516A = 0x5141
+0x516B = 0x482C
+0x516C = 0x3878
+0x516D = 0x4F3B
+0x516E = 0x5142
+0x5171 = 0x3626
+0x5175 = 0x4A3C
+0x5176 = 0x4236
+0x5177 = 0x3671
+0x5178 = 0x4535
+0x517C = 0x3773
+0x5180 = 0x5143
+0x5182 = 0x5144
+0x5185 = 0x4662
+0x5186 = 0x315F
+0x5189 = 0x5147
+0x518A = 0x3A7D
+0x518C = 0x5146
+0x518D = 0x3A46
+0x518F = 0x5148
+0x5190 = 0x666E
+0x5191 = 0x5149
+0x5192 = 0x4B41
+0x5193 = 0x514A
+0x5195 = 0x514B
+0x5196 = 0x514C
+0x5197 = 0x3E69
+0x5199 = 0x3C4C
+0x51A0 = 0x3427
+0x51A2 = 0x514F
+0x51A4 = 0x514D
+0x51A5 = 0x4C3D
+0x51A6 = 0x514E
+0x51A8 = 0x495A
+0x51A9 = 0x5150
+0x51AA = 0x5151
+0x51AB = 0x5152
+0x51AC = 0x455F
+0x51B0 = 0x5156
+0x51B1 = 0x5154
+0x51B2 = 0x5155
+0x51B3 = 0x5153
+0x51B4 = 0x3A63
+0x51B5 = 0x5157
+0x51B6 = 0x4C6A
+0x51B7 = 0x4E64
+0x51BD = 0x5158
+0x51C4 = 0x4028
+0x51C5 = 0x5159
+0x51C6 = 0x3D5A
+0x51C9 = 0x515A
+0x51CB = 0x437C
+0x51CC = 0x4E3F
+0x51CD = 0x4560
+0x51D6 = 0x5245
+0x51DB = 0x515B
+0x51DC = 0x7425
+0x51DD = 0x3645
+0x51E0 = 0x515C
+0x51E1 = 0x4B5E
+0x51E6 = 0x3D68
+0x51E7 = 0x427C
+0x51E9 = 0x515E
+0x51EA = 0x4664
+0x51ED = 0x515F
+0x51F0 = 0x5160
+0x51F1 = 0x332E
+0x51F5 = 0x5161
+0x51F6 = 0x3627
+0x51F8 = 0x464C
+0x51F9 = 0x317A
+0x51FA = 0x3D50
+0x51FD = 0x4821
+0x51FE = 0x5162
+0x5200 = 0x4561
+0x5203 = 0x3F4F
+0x5204 = 0x5163
+0x5206 = 0x4A2C
+0x5207 = 0x405A
+0x5208 = 0x3422
+0x520A = 0x3429
+0x520B = 0x5164
+0x520E = 0x5166
+0x5211 = 0x373A
+0x5214 = 0x5165
+0x5217 = 0x4E73
+0x521D = 0x3D69
+0x5224 = 0x483D
+0x5225 = 0x4A4C
+0x5227 = 0x5167
+0x5229 = 0x4D78
+0x522A = 0x5168
+0x522E = 0x5169
+0x5230 = 0x457E
+0x5233 = 0x516A
+0x5236 = 0x4029
+0x5237 = 0x3A7E
+0x5238 = 0x3774
+0x5239 = 0x516B
+0x523A = 0x3B49
+0x523B = 0x396F
+0x5243 = 0x4466
+0x5244 = 0x516D
+0x5247 = 0x4227
+0x524A = 0x3A6F
+0x524B = 0x516E
+0x524C = 0x516F
+0x524D = 0x4130
+0x524F = 0x516C
+0x5254 = 0x5171
+0x5256 = 0x4B36
+0x525B = 0x3964
+0x525E = 0x5170
+0x5263 = 0x3775
+0x5264 = 0x3A5E
+0x5265 = 0x476D
+0x5269 = 0x5174
+0x526A = 0x5172
+0x526F = 0x497B
+0x5270 = 0x3E6A
+0x5271 = 0x517B
+0x5272 = 0x3364
+0x5273 = 0x5175
+0x5274 = 0x5173
+0x5275 = 0x414F
+0x527D = 0x5177
+0x527F = 0x5176
+0x5283 = 0x3344
+0x5287 = 0x3760
+0x5288 = 0x517C
+0x5289 = 0x4E2D
+0x528D = 0x5178
+0x5291 = 0x517D
+0x5292 = 0x517A
+0x5294 = 0x5179
+0x529B = 0x4E4F
+0x529F = 0x3879
+0x52A0 = 0x3243
+0x52A3 = 0x4E74
+0x52A9 = 0x3D75
+0x52AA = 0x4558
+0x52AB = 0x3965
+0x52AC = 0x5222
+0x52AD = 0x5223
+0x52B1 = 0x4E65
+0x52B4 = 0x4F2B
+0x52B5 = 0x5225
+0x52B9 = 0x387A
+0x52BC = 0x5224
+0x52BE = 0x332F
+0x52C1 = 0x5226
+0x52C3 = 0x4B56
+0x52C5 = 0x443C
+0x52C7 = 0x4D26
+0x52C9 = 0x4A59
+0x52CD = 0x5227
+0x52D2 = 0x7055
+0x52D5 = 0x4630
+0x52D7 = 0x5228
+0x52D8 = 0x342A
+0x52D9 = 0x4C33
+0x52DD = 0x3E21
+0x52DE = 0x5229
+0x52DF = 0x4A67
+0x52E0 = 0x522D
+0x52E2 = 0x402A
+0x52E3 = 0x522A
+0x52E4 = 0x3650
+0x52E6 = 0x522B
+0x52E7 = 0x342B
+0x52F2 = 0x372E
+0x52F3 = 0x522E
+0x52F5 = 0x522F
+0x52F8 = 0x5230
+0x52F9 = 0x5231
+0x52FA = 0x3C5B
+0x52FE = 0x387B
+0x52FF = 0x4C5E
+0x5301 = 0x4C68
+0x5302 = 0x4677
+0x5305 = 0x4A71
+0x5306 = 0x5232
+0x5308 = 0x5233
+0x530D = 0x5235
+0x530F = 0x5237
+0x5310 = 0x5236
+0x5315 = 0x5238
+0x5316 = 0x323D
+0x5317 = 0x4B4C
+0x5319 = 0x3A7C
+0x531A = 0x5239
+0x531D = 0x4159
+0x5320 = 0x3E22
+0x5321 = 0x3629
+0x5323 = 0x523A
+0x532A = 0x485B
+0x532F = 0x523B
+0x5331 = 0x523C
+0x5333 = 0x523D
+0x5338 = 0x523E
+0x5339 = 0x4924
+0x533A = 0x3668
+0x533B = 0x3065
+0x533F = 0x463F
+0x5340 = 0x523F
+0x5341 = 0x3D3D
+0x5343 = 0x4069
+0x5345 = 0x5241
+0x5346 = 0x5240
+0x5347 = 0x3E23
+0x5348 = 0x3861
+0x5349 = 0x5243
+0x534A = 0x483E
+0x534D = 0x5244
+0x5351 = 0x485C
+0x5352 = 0x4234
+0x5353 = 0x426E
+0x5354 = 0x3628
+0x5357 = 0x466E
+0x5358 = 0x4331
+0x535A = 0x476E
+0x535C = 0x4B4E
+0x535E = 0x5246
+0x5360 = 0x406A
+0x5366 = 0x3735
+0x5369 = 0x5247
+0x536E = 0x5248
+0x536F = 0x312C
+0x5370 = 0x3075
+0x5371 = 0x346D
+0x5373 = 0x4228
+0x5374 = 0x3551
+0x5375 = 0x4D71
+0x5377 = 0x524B
+0x5378 = 0x3237
+0x537B = 0x524A
+0x537F = 0x362A
+0x5382 = 0x524C
+0x5384 = 0x4C71
+0x5396 = 0x524D
+0x5398 = 0x4E52
+0x539A = 0x387C
+0x539F = 0x3836
+0x53A0 = 0x524E
+0x53A5 = 0x5250
+0x53A6 = 0x524F
+0x53A8 = 0x3F5F
+0x53A9 = 0x3139
+0x53AD = 0x315E
+0x53AE = 0x5251
+0x53B0 = 0x5252
+0x53B3 = 0x3837
+0x53B6 = 0x5253
+0x53BB = 0x356E
+0x53C2 = 0x3B32
+0x53C3 = 0x5254
+0x53C8 = 0x4B74
+0x53C9 = 0x3A35
+0x53CA = 0x355A
+0x53CB = 0x4D27
+0x53CC = 0x4150
+0x53CD = 0x483F
+0x53CE = 0x3C7D
+0x53D4 = 0x3D47
+0x53D6 = 0x3C68
+0x53D7 = 0x3C75
+0x53D9 = 0x3D76
+0x53DB = 0x4840
+0x53DF = 0x5257
+0x53E1 = 0x3143
+0x53E2 = 0x4151
+0x53E3 = 0x387D
+0x53E4 = 0x3845
+0x53E5 = 0x3667
+0x53E8 = 0x525B
+0x53E9 = 0x4321
+0x53EA = 0x427E
+0x53EB = 0x362B
+0x53EC = 0x3E24
+0x53ED = 0x525C
+0x53EE = 0x525A
+0x53EF = 0x3244
+0x53F0 = 0x4266
+0x53F1 = 0x3C38
+0x53F2 = 0x3B4B
+0x53F3 = 0x3126
+0x53F6 = 0x3370
+0x53F7 = 0x3966
+0x53F8 = 0x3B4A
+0x53FA = 0x525D
+0x5401 = 0x525E
+0x5403 = 0x3549
+0x5404 = 0x3346
+0x5408 = 0x3967
+0x5409 = 0x3548
+0x540A = 0x445F
+0x540B = 0x3125
+0x540C = 0x4631
+0x540D = 0x4C3E
+0x540E = 0x3921
+0x540F = 0x4D79
+0x5410 = 0x4547
+0x5411 = 0x387E
+0x541B = 0x372F
+0x541D = 0x5267
+0x541F = 0x3663
+0x5420 = 0x4B4A
+0x5426 = 0x485D
+0x5429 = 0x5266
+0x542B = 0x345E
+0x542C = 0x5261
+0x542D = 0x5262
+0x542E = 0x5264
+0x5436 = 0x5265
+0x5438 = 0x355B
+0x5439 = 0x3F61
+0x543B = 0x4A2D
+0x543C = 0x5263
+0x543D = 0x525F
+0x543E = 0x3863
+0x5440 = 0x5260
+0x5442 = 0x4F24
+0x5446 = 0x4A72
+0x5448 = 0x4468
+0x5449 = 0x3862
+0x544A = 0x3970
+0x544E = 0x5268
+0x5451 = 0x465D
+0x545F = 0x526C
+0x5468 = 0x3C7E
+0x546A = 0x3C76
+0x5470 = 0x526F
+0x5471 = 0x526D
+0x5473 = 0x4C23
+0x5475 = 0x526A
+0x5476 = 0x5273
+0x5477 = 0x526E
+0x547B = 0x5271
+0x547C = 0x3846
+0x547D = 0x4C3F
+0x5480 = 0x5272
+0x5484 = 0x5274
+0x5486 = 0x5276
+0x548B = 0x3A70
+0x548C = 0x4F42
+0x548E = 0x526B
+0x548F = 0x5269
+0x5490 = 0x5275
+0x5492 = 0x5270
+0x54A2 = 0x5278
+0x54A4 = 0x5323
+0x54A5 = 0x527A
+0x54A8 = 0x527E
+0x54AB = 0x5321
+0x54AC = 0x527B
+0x54AF = 0x533E
+0x54B2 = 0x3A69
+0x54B3 = 0x3331
+0x54B8 = 0x5279
+0x54BC = 0x5325
+0x54BD = 0x3076
+0x54BE = 0x5324
+0x54C0 = 0x3025
+0x54C1 = 0x494A
+0x54C2 = 0x5322
+0x54C4 = 0x527C
+0x54C7 = 0x5277
+0x54C8 = 0x527D
+0x54C9 = 0x3A48
+0x54D8 = 0x5326
+0x54E1 = 0x3077
+0x54E2 = 0x532F
+0x54E5 = 0x5327
+0x54E6 = 0x5328
+0x54E8 = 0x3E25
+0x54E9 = 0x4B69
+0x54ED = 0x532D
+0x54EE = 0x532C
+0x54F2 = 0x452F
+0x54FA = 0x532E
+0x54FD = 0x532B
+0x5504 = 0x3134
+0x5506 = 0x3A36
+0x5507 = 0x3F30
+0x550F = 0x5329
+0x5510 = 0x4562
+0x5514 = 0x532A
+0x5516 = 0x3022
+0x552E = 0x5334
+0x552F = 0x4D23
+0x5531 = 0x3E27
+0x5533 = 0x533A
+0x5538 = 0x5339
+0x5539 = 0x5330
+0x553E = 0x4243
+0x5540 = 0x5331
+0x5544 = 0x426F
+0x5545 = 0x5336
+0x5546 = 0x3E26
+0x554C = 0x5333
+0x554F = 0x4C64
+0x5553 = 0x373C
+0x5556 = 0x5337
+0x5557 = 0x5338
+0x555C = 0x5335
+0x555D = 0x533B
+0x5563 = 0x5332
+0x557B = 0x5341
+0x557C = 0x5346
+0x557E = 0x5342
+0x5580 = 0x533D
+0x5583 = 0x5347
+0x5584 = 0x4131
+0x5587 = 0x5349
+0x5589 = 0x3922
+0x558A = 0x533F
+0x558B = 0x437D
+0x5598 = 0x5343
+0x5599 = 0x533C
+0x559A = 0x342D
+0x559C = 0x346E
+0x559D = 0x3365
+0x559E = 0x5344
+0x559F = 0x5340
+0x55A7 = 0x3776
+0x55A8 = 0x534A
+0x55A9 = 0x5348
+0x55AA = 0x4153
+0x55AB = 0x354A
+0x55AC = 0x362C
+0x55AE = 0x5345
+0x55B0 = 0x3674
+0x55B6 = 0x3144
+0x55C4 = 0x534E
+0x55C5 = 0x534C
+0x55C7 = 0x5427
+0x55D4 = 0x5351
+0x55DA = 0x534B
+0x55DC = 0x534F
+0x55DF = 0x534D
+0x55E3 = 0x3B4C
+0x55E4 = 0x5350
+0x55F7 = 0x5353
+0x55F9 = 0x5358
+0x55FD = 0x5356
+0x55FE = 0x5355
+0x5606 = 0x4332
+0x5609 = 0x3245
+0x5614 = 0x5352
+0x5616 = 0x5354
+0x5617 = 0x3E28
+0x5618 = 0x3133
+0x561B = 0x5357
+0x5629 = 0x325E
+0x562F = 0x5362
+0x5631 = 0x3E7C
+0x5632 = 0x535E
+0x5634 = 0x535C
+0x5636 = 0x535D
+0x5638 = 0x535F
+0x5642 = 0x313D
+0x564C = 0x4139
+0x564E = 0x5359
+0x5650 = 0x535A
+0x565B = 0x337A
+0x5664 = 0x5361
+0x5668 = 0x346F
+0x566A = 0x5364
+0x566B = 0x5360
+0x566C = 0x5363
+0x5674 = 0x4A2E
+0x5678 = 0x4655
+0x567A = 0x4838
+0x5680 = 0x5366
+0x5686 = 0x5365
+0x5687 = 0x3345
+0x568A = 0x5367
+0x568F = 0x536A
+0x5694 = 0x5369
+0x56A0 = 0x5368
+0x56A2 = 0x4739
+0x56A5 = 0x536B
+0x56AE = 0x536C
+0x56B4 = 0x536E
+0x56B6 = 0x536D
+0x56BC = 0x5370
+0x56C0 = 0x5373
+0x56C1 = 0x5371
+0x56C2 = 0x536F
+0x56C3 = 0x5372
+0x56C8 = 0x5374
+0x56CE = 0x5375
+0x56D1 = 0x5376
+0x56D3 = 0x5377
+0x56D7 = 0x5378
+0x56D8 = 0x5145
+0x56DA = 0x3C7C
+0x56DB = 0x3B4D
+0x56DE = 0x3273
+0x56E0 = 0x3078
+0x56E3 = 0x4344
+0x56EE = 0x5379
+0x56F0 = 0x3A24
+0x56F2 = 0x304F
+0x56F3 = 0x3F5E
+0x56F9 = 0x537A
+0x56FA = 0x3847
+0x56FD = 0x3971
+0x56FF = 0x537C
+0x5700 = 0x537B
+0x5703 = 0x4A60
+0x5704 = 0x537D
+0x5708 = 0x5421
+0x5709 = 0x537E
+0x570B = 0x5422
+0x570D = 0x5423
+0x570F = 0x3777
+0x5712 = 0x3160
+0x5713 = 0x5424
+0x5716 = 0x5426
+0x5718 = 0x5425
+0x571C = 0x5428
+0x571F = 0x455A
+0x5726 = 0x5429
+0x5727 = 0x3035
+0x5728 = 0x3A5F
+0x572D = 0x373D
+0x5730 = 0x434F
+0x5737 = 0x542A
+0x5738 = 0x542B
+0x573B = 0x542D
+0x5740 = 0x542E
+0x5742 = 0x3A64
+0x5747 = 0x3651
+0x574A = 0x4B37
+0x574E = 0x542C
+0x574F = 0x542F
+0x5750 = 0x3A41
+0x5751 = 0x3923
+0x5761 = 0x5433
+0x5764 = 0x3A25
+0x5766 = 0x4333
+0x5769 = 0x5430
+0x576A = 0x445A
+0x577F = 0x5434
+0x5782 = 0x3F62
+0x5788 = 0x5432
+0x5789 = 0x5435
+0x578B = 0x373F
+0x5793 = 0x5436
+0x57A0 = 0x5437
+0x57A2 = 0x3924
+0x57A3 = 0x3340
+0x57A4 = 0x5439
+0x57AA = 0x543A
+0x57B0 = 0x543B
+0x57B3 = 0x5438
+0x57C0 = 0x5431
+0x57C3 = 0x543C
+0x57C6 = 0x543D
+0x57CB = 0x4B64
+0x57CE = 0x3E6B
+0x57D2 = 0x543F
+0x57D3 = 0x5440
+0x57D4 = 0x543E
+0x57D6 = 0x5442
+0x57DC = 0x4738
+0x57DF = 0x3068
+0x57E0 = 0x4956
+0x57E3 = 0x5443
+0x57F4 = 0x3E7D
+0x57F7 = 0x3C39
+0x57F9 = 0x475D
+0x57FA = 0x3470
+0x57FC = 0x3A6B
+0x5800 = 0x4B59
+0x5802 = 0x4632
+0x5805 = 0x3778
+0x5806 = 0x424F
+0x580A = 0x5441
+0x580B = 0x5444
+0x5815 = 0x4244
+0x5819 = 0x5445
+0x581D = 0x5446
+0x5821 = 0x5448
+0x5824 = 0x4469
+0x582A = 0x342E
+0x582F = 0x7421
+0x5830 = 0x3161
+0x5831 = 0x4A73
+0x5834 = 0x3E6C
+0x5835 = 0x4548
+0x583A = 0x3A66
+0x583D = 0x544E
+0x5840 = 0x4A3D
+0x5841 = 0x4E5D
+0x584A = 0x3274
+0x584B = 0x544A
+0x5851 = 0x413A
+0x5852 = 0x544D
+0x5854 = 0x4563
+0x5857 = 0x4549
+0x5858 = 0x4564
+0x5859 = 0x4839
+0x585A = 0x444D
+0x585E = 0x3A49
+0x5862 = 0x5449
+0x5869 = 0x3176
+0x586B = 0x4536
+0x5870 = 0x544B
+0x5872 = 0x5447
+0x5875 = 0x3F50
+0x5879 = 0x544F
+0x587E = 0x3D4E
+0x5883 = 0x362D
+0x5885 = 0x5450
+0x5893 = 0x4A68
+0x5897 = 0x417D
+0x589C = 0x4446
+0x589F = 0x5452
+0x58A8 = 0x4B4F
+0x58AB = 0x5453
+0x58AE = 0x5458
+0x58B3 = 0x4A2F
+0x58B8 = 0x5457
+0x58B9 = 0x5451
+0x58BA = 0x5454
+0x58BB = 0x5456
+0x58BE = 0x3A26
+0x58C1 = 0x4A49
+0x58C5 = 0x5459
+0x58C7 = 0x4345
+0x58CA = 0x3275
+0x58CC = 0x3E6D
+0x58D1 = 0x545B
+0x58D3 = 0x545A
+0x58D5 = 0x3968
+0x58D7 = 0x545C
+0x58D8 = 0x545E
+0x58D9 = 0x545D
+0x58DC = 0x5460
+0x58DE = 0x5455
+0x58DF = 0x5462
+0x58E4 = 0x5461
+0x58E5 = 0x545F
+0x58EB = 0x3B4E
+0x58EC = 0x3F51
+0x58EE = 0x4154
+0x58EF = 0x5463
+0x58F0 = 0x403C
+0x58F1 = 0x306D
+0x58F2 = 0x4764
+0x58F7 = 0x445B
+0x58F9 = 0x5465
+0x58FA = 0x5464
+0x58FB = 0x5466
+0x58FC = 0x5467
+0x58FD = 0x5468
+0x5902 = 0x5469
+0x5909 = 0x4A51
+0x590A = 0x546A
+0x590F = 0x3246
+0x5910 = 0x546B
+0x5915 = 0x4D3C
+0x5916 = 0x3330
+0x5918 = 0x5249
+0x5919 = 0x3D48
+0x591A = 0x423F
+0x591B = 0x546C
+0x591C = 0x4C6B
+0x5922 = 0x4C34
+0x5925 = 0x546E
+0x5927 = 0x4267
+0x5929 = 0x4537
+0x592A = 0x4240
+0x592B = 0x4957
+0x592C = 0x546F
+0x592D = 0x5470
+0x592E = 0x317B
+0x5931 = 0x3C3A
+0x5932 = 0x5471
+0x5937 = 0x3050
+0x5938 = 0x5472
+0x593E = 0x5473
+0x5944 = 0x3162
+0x5947 = 0x3471
+0x5948 = 0x4660
+0x5949 = 0x4A74
+0x594E = 0x5477
+0x594F = 0x4155
+0x5950 = 0x5476
+0x5951 = 0x3740
+0x5954 = 0x4B5B
+0x5955 = 0x5475
+0x5957 = 0x4565
+0x5958 = 0x5479
+0x595A = 0x5478
+0x5960 = 0x547B
+0x5962 = 0x547A
+0x5965 = 0x317C
+0x5967 = 0x547C
+0x5968 = 0x3E29
+0x5969 = 0x547E
+0x596A = 0x4325
+0x596C = 0x547D
+0x596E = 0x4A33
+0x5973 = 0x3D77
+0x5974 = 0x455B
+0x5978 = 0x5521
+0x597D = 0x3925
+0x5981 = 0x5522
+0x5982 = 0x4721
+0x5983 = 0x485E
+0x5984 = 0x4C51
+0x598A = 0x4725
+0x598D = 0x552B
+0x5993 = 0x3538
+0x5996 = 0x4D45
+0x5999 = 0x4C2F
+0x599B = 0x562C
+0x599D = 0x5523
+0x59A3 = 0x5526
+0x59A5 = 0x4245
+0x59A8 = 0x4B38
+0x59AC = 0x454A
+0x59B2 = 0x5527
+0x59B9 = 0x4B65
+0x59BB = 0x3A4A
+0x59BE = 0x3E2A
+0x59C6 = 0x5528
+0x59C9 = 0x3B50
+0x59CB = 0x3B4F
+0x59D0 = 0x3039
+0x59D1 = 0x3848
+0x59D3 = 0x402B
+0x59D4 = 0x3051
+0x59D9 = 0x552C
+0x59DA = 0x552D
+0x59DC = 0x552A
+0x59E5 = 0x3138
+0x59E6 = 0x342F
+0x59E8 = 0x5529
+0x59EA = 0x4C45
+0x59EB = 0x4931
+0x59F6 = 0x3028
+0x59FB = 0x3079
+0x59FF = 0x3B51
+0x5A01 = 0x3052
+0x5A03 = 0x3023
+0x5A09 = 0x5532
+0x5A11 = 0x5530
+0x5A18 = 0x4C3C
+0x5A1A = 0x5533
+0x5A1C = 0x5531
+0x5A1F = 0x552F
+0x5A20 = 0x3F31
+0x5A25 = 0x552E
+0x5A29 = 0x4A5A
+0x5A2F = 0x3864
+0x5A35 = 0x5537
+0x5A36 = 0x5538
+0x5A3C = 0x3E2B
+0x5A40 = 0x5534
+0x5A41 = 0x4F2C
+0x5A46 = 0x474C
+0x5A49 = 0x5536
+0x5A5A = 0x3A27
+0x5A62 = 0x5539
+0x5A66 = 0x4958
+0x5A6A = 0x553A
+0x5A6C = 0x5535
+0x5A7F = 0x4C3B
+0x5A92 = 0x475E
+0x5A9A = 0x553B
+0x5A9B = 0x4932
+0x5ABC = 0x553C
+0x5ABD = 0x5540
+0x5ABE = 0x553D
+0x5AC1 = 0x3247
+0x5AC2 = 0x553F
+0x5AC9 = 0x3C3B
+0x5ACB = 0x553E
+0x5ACC = 0x3779
+0x5AD0 = 0x554C
+0x5AD6 = 0x5545
+0x5AD7 = 0x5542
+0x5AE1 = 0x4364
+0x5AE3 = 0x5541
+0x5AE6 = 0x5543
+0x5AE9 = 0x5544
+0x5AFA = 0x5546
+0x5AFB = 0x5547
+0x5B09 = 0x3472
+0x5B0B = 0x5549
+0x5B0C = 0x5548
+0x5B16 = 0x554A
+0x5B22 = 0x3E6E
+0x5B2A = 0x554D
+0x5B2C = 0x445C
+0x5B30 = 0x3145
+0x5B32 = 0x554B
+0x5B36 = 0x554E
+0x5B3E = 0x554F
+0x5B40 = 0x5552
+0x5B43 = 0x5550
+0x5B45 = 0x5551
+0x5B50 = 0x3B52
+0x5B51 = 0x5553
+0x5B54 = 0x3926
+0x5B55 = 0x5554
+0x5B57 = 0x3B7A
+0x5B58 = 0x4238
+0x5B5A = 0x5555
+0x5B5B = 0x5556
+0x5B5C = 0x3B5A
+0x5B5D = 0x3927
+0x5B5F = 0x4C52
+0x5B63 = 0x3528
+0x5B64 = 0x3849
+0x5B65 = 0x5557
+0x5B66 = 0x3358
+0x5B69 = 0x5558
+0x5B6B = 0x4239
+0x5B70 = 0x5559
+0x5B71 = 0x5623
+0x5B73 = 0x555A
+0x5B75 = 0x555B
+0x5B78 = 0x555C
+0x5B7A = 0x555E
+0x5B80 = 0x555F
+0x5B83 = 0x5560
+0x5B85 = 0x4270
+0x5B87 = 0x3127
+0x5B88 = 0x3C69
+0x5B89 = 0x3042
+0x5B8B = 0x4157
+0x5B8C = 0x3430
+0x5B8D = 0x3C35
+0x5B8F = 0x3928
+0x5B95 = 0x4566
+0x5B97 = 0x3D21
+0x5B98 = 0x3431
+0x5B99 = 0x4368
+0x5B9A = 0x446A
+0x5B9B = 0x3038
+0x5B9C = 0x3539
+0x5B9D = 0x4A75
+0x5B9F = 0x3C42
+0x5BA2 = 0x3552
+0x5BA3 = 0x406B
+0x5BA4 = 0x3C3C
+0x5BA5 = 0x4D28
+0x5BA6 = 0x5561
+0x5BAE = 0x355C
+0x5BB0 = 0x3A4B
+0x5BB3 = 0x3332
+0x5BB4 = 0x3163
+0x5BB5 = 0x3E2C
+0x5BB6 = 0x3248
+0x5BB8 = 0x5562
+0x5BB9 = 0x4D46
+0x5BBF = 0x3D49
+0x5BC2 = 0x3C64
+0x5BC3 = 0x5563
+0x5BC4 = 0x3473
+0x5BC5 = 0x4652
+0x5BC6 = 0x4C29
+0x5BC7 = 0x5564
+0x5BC9 = 0x5565
+0x5BCC = 0x4959
+0x5BD0 = 0x5567
+0x5BD2 = 0x3428
+0x5BD3 = 0x3677
+0x5BD4 = 0x5566
+0x5BDB = 0x3432
+0x5BDD = 0x3F32
+0x5BDE = 0x556B
+0x5BDF = 0x3B21
+0x5BE1 = 0x3249
+0x5BE2 = 0x556A
+0x5BE4 = 0x5568
+0x5BE5 = 0x556C
+0x5BE6 = 0x5569
+0x5BE7 = 0x472B
+0x5BE8 = 0x5C4D
+0x5BE9 = 0x3F33
+0x5BEB = 0x556D
+0x5BEE = 0x4E40
+0x5BF0 = 0x556E
+0x5BF3 = 0x5570
+0x5BF5 = 0x437E
+0x5BF6 = 0x556F
+0x5BF8 = 0x4023
+0x5BFA = 0x3B7B
+0x5BFE = 0x4250
+0x5BFF = 0x3C77
+0x5C01 = 0x4975
+0x5C02 = 0x406C
+0x5C04 = 0x3C4D
+0x5C05 = 0x5571
+0x5C06 = 0x3E2D
+0x5C07 = 0x5572
+0x5C08 = 0x5573
+0x5C09 = 0x3053
+0x5C0A = 0x423A
+0x5C0B = 0x3F52
+0x5C0D = 0x5574
+0x5C0E = 0x4633
+0x5C0F = 0x3E2E
+0x5C11 = 0x3E2F
+0x5C13 = 0x5575
+0x5C16 = 0x406D
+0x5C1A = 0x3E30
+0x5C20 = 0x5576
+0x5C22 = 0x5577
+0x5C24 = 0x4C60
+0x5C28 = 0x5578
+0x5C2D = 0x3646
+0x5C31 = 0x3D22
+0x5C38 = 0x5579
+0x5C39 = 0x557A
+0x5C3A = 0x3C5C
+0x5C3B = 0x3F2C
+0x5C3C = 0x4674
+0x5C3D = 0x3F54
+0x5C3E = 0x4878
+0x5C3F = 0x4722
+0x5C40 = 0x3649
+0x5C41 = 0x557B
+0x5C45 = 0x356F
+0x5C46 = 0x557C
+0x5C48 = 0x367E
+0x5C4A = 0x464F
+0x5C4B = 0x3230
+0x5C4D = 0x3B53
+0x5C4E = 0x557D
+0x5C4F = 0x5622
+0x5C50 = 0x5621
+0x5C51 = 0x367D
+0x5C53 = 0x557E
+0x5C55 = 0x4538
+0x5C5E = 0x4230
+0x5C60 = 0x454B
+0x5C61 = 0x3C48
+0x5C64 = 0x4158
+0x5C65 = 0x4D7A
+0x5C6C = 0x5624
+0x5C6E = 0x5625
+0x5C6F = 0x4656
+0x5C71 = 0x3B33
+0x5C76 = 0x5627
+0x5C79 = 0x5628
+0x5C8C = 0x5629
+0x5C90 = 0x3474
+0x5C91 = 0x562A
+0x5C94 = 0x562B
+0x5CA1 = 0x322C
+0x5CA8 = 0x413B
+0x5CA9 = 0x3464
+0x5CAB = 0x562D
+0x5CAC = 0x4C28
+0x5CB1 = 0x4252
+0x5CB3 = 0x3359
+0x5CB6 = 0x562F
+0x5CB7 = 0x5631
+0x5CB8 = 0x345F
+0x5CBB = 0x562E
+0x5CBC = 0x5630
+0x5CBE = 0x5633
+0x5CC5 = 0x5632
+0x5CC7 = 0x5634
+0x5CD9 = 0x5635
+0x5CE0 = 0x463D
+0x5CE1 = 0x362E
+0x5CE8 = 0x3265
+0x5CE9 = 0x5636
+0x5CEA = 0x563B
+0x5CED = 0x5639
+0x5CEF = 0x4A77
+0x5CF0 = 0x4A76
+0x5CF6 = 0x4567
+0x5CFA = 0x5638
+0x5CFB = 0x3D54
+0x5CFD = 0x5637
+0x5D07 = 0x3F72
+0x5D0B = 0x563C
+0x5D0E = 0x3A6A
+0x5D11 = 0x5642
+0x5D14 = 0x5643
+0x5D15 = 0x563D
+0x5D16 = 0x3333
+0x5D17 = 0x563E
+0x5D18 = 0x5647
+0x5D19 = 0x5646
+0x5D1A = 0x5645
+0x5D1B = 0x5641
+0x5D1F = 0x5640
+0x5D22 = 0x5644
+0x5D29 = 0x4A78
+0x5D4B = 0x564B
+0x5D4C = 0x5648
+0x5D4E = 0x564A
+0x5D50 = 0x4D72
+0x5D52 = 0x5649
+0x5D5C = 0x563F
+0x5D69 = 0x3F73
+0x5D6C = 0x564C
+0x5D6F = 0x3A37
+0x5D73 = 0x564D
+0x5D76 = 0x564E
+0x5D82 = 0x5651
+0x5D84 = 0x5650
+0x5D87 = 0x564F
+0x5D8B = 0x4568
+0x5D8C = 0x563A
+0x5D90 = 0x5657
+0x5D9D = 0x5653
+0x5DA2 = 0x5652
+0x5DAC = 0x5654
+0x5DAE = 0x5655
+0x5DB7 = 0x5658
+0x5DBA = 0x4E66
+0x5DBC = 0x5659
+0x5DBD = 0x5656
+0x5DC9 = 0x565A
+0x5DCC = 0x3460
+0x5DCD = 0x565B
+0x5DD2 = 0x565D
+0x5DD3 = 0x565C
+0x5DD6 = 0x565E
+0x5DDB = 0x565F
+0x5DDD = 0x406E
+0x5DDE = 0x3D23
+0x5DE1 = 0x3D64
+0x5DE3 = 0x4163
+0x5DE5 = 0x3929
+0x5DE6 = 0x3A38
+0x5DE7 = 0x392A
+0x5DE8 = 0x3570
+0x5DEB = 0x5660
+0x5DEE = 0x3A39
+0x5DF1 = 0x384A
+0x5DF2 = 0x5661
+0x5DF3 = 0x4C26
+0x5DF4 = 0x4743
+0x5DF5 = 0x5662
+0x5DF7 = 0x392B
+0x5DFB = 0x342C
+0x5DFD = 0x4327
+0x5DFE = 0x3652
+0x5E02 = 0x3B54
+0x5E03 = 0x495B
+0x5E06 = 0x4841
+0x5E0B = 0x5663
+0x5E0C = 0x3475
+0x5E11 = 0x5666
+0x5E16 = 0x4421
+0x5E19 = 0x5665
+0x5E1A = 0x5664
+0x5E1B = 0x5667
+0x5E1D = 0x446B
+0x5E25 = 0x3F63
+0x5E2B = 0x3B55
+0x5E2D = 0x404A
+0x5E2F = 0x4253
+0x5E30 = 0x3522
+0x5E33 = 0x4422
+0x5E36 = 0x5668
+0x5E37 = 0x5669
+0x5E38 = 0x3E6F
+0x5E3D = 0x4B39
+0x5E40 = 0x566C
+0x5E43 = 0x566B
+0x5E44 = 0x566A
+0x5E45 = 0x497D
+0x5E47 = 0x5673
+0x5E4C = 0x4B5A
+0x5E4E = 0x566D
+0x5E54 = 0x566F
+0x5E55 = 0x4B6B
+0x5E57 = 0x566E
+0x5E5F = 0x5670
+0x5E61 = 0x4828
+0x5E62 = 0x5671
+0x5E63 = 0x4A3E
+0x5E64 = 0x5672
+0x5E72 = 0x3433
+0x5E73 = 0x4A3F
+0x5E74 = 0x472F
+0x5E75 = 0x5674
+0x5E76 = 0x5675
+0x5E78 = 0x392C
+0x5E79 = 0x3434
+0x5E7A = 0x5676
+0x5E7B = 0x3838
+0x5E7C = 0x4D44
+0x5E7D = 0x4D29
+0x5E7E = 0x3476
+0x5E7F = 0x5678
+0x5E81 = 0x4423
+0x5E83 = 0x392D
+0x5E84 = 0x3E31
+0x5E87 = 0x485F
+0x5E8A = 0x3E32
+0x5E8F = 0x3D78
+0x5E95 = 0x446C
+0x5E96 = 0x4A79
+0x5E97 = 0x4539
+0x5E9A = 0x392E
+0x5E9C = 0x495C
+0x5EA0 = 0x5679
+0x5EA6 = 0x4559
+0x5EA7 = 0x3A42
+0x5EAB = 0x384B
+0x5EAD = 0x446D
+0x5EB5 = 0x3043
+0x5EB6 = 0x3D6E
+0x5EB7 = 0x392F
+0x5EB8 = 0x4D47
+0x5EC1 = 0x567A
+0x5EC2 = 0x567B
+0x5EC3 = 0x4751
+0x5EC8 = 0x567C
+0x5EC9 = 0x4E77
+0x5ECA = 0x4F2D
+0x5ECF = 0x567E
+0x5ED0 = 0x567D
+0x5ED3 = 0x3347
+0x5ED6 = 0x5721
+0x5EDA = 0x5724
+0x5EDB = 0x5725
+0x5EDD = 0x5723
+0x5EDF = 0x4940
+0x5EE0 = 0x3E33
+0x5EE1 = 0x5727
+0x5EE2 = 0x5726
+0x5EE3 = 0x5722
+0x5EE8 = 0x5728
+0x5EE9 = 0x5729
+0x5EEC = 0x572A
+0x5EF0 = 0x572D
+0x5EF1 = 0x572B
+0x5EF3 = 0x572C
+0x5EF4 = 0x572E
+0x5EF6 = 0x3164
+0x5EF7 = 0x446E
+0x5EF8 = 0x572F
+0x5EFA = 0x377A
+0x5EFB = 0x3276
+0x5EFC = 0x4736
+0x5EFE = 0x5730
+0x5EFF = 0x467B
+0x5F01 = 0x4A5B
+0x5F03 = 0x5731
+0x5F04 = 0x4F2E
+0x5F09 = 0x5732
+0x5F0A = 0x4A40
+0x5F0B = 0x5735
+0x5F0C = 0x5021
+0x5F0D = 0x5031
+0x5F0F = 0x3C30
+0x5F10 = 0x4675
+0x5F11 = 0x5736
+0x5F13 = 0x355D
+0x5F14 = 0x4424
+0x5F15 = 0x307A
+0x5F16 = 0x5737
+0x5F17 = 0x4A26
+0x5F18 = 0x3930
+0x5F1B = 0x4350
+0x5F1F = 0x446F
+0x5F25 = 0x4C6F
+0x5F26 = 0x3839
+0x5F27 = 0x384C
+0x5F29 = 0x5738
+0x5F2D = 0x5739
+0x5F2F = 0x573F
+0x5F31 = 0x3C65
+0x5F35 = 0x4425
+0x5F37 = 0x362F
+0x5F38 = 0x573A
+0x5F3C = 0x492B
+0x5F3E = 0x4346
+0x5F41 = 0x573B
+0x5F48 = 0x573C
+0x5F4A = 0x3630
+0x5F4C = 0x573D
+0x5F4E = 0x573E
+0x5F51 = 0x5740
+0x5F53 = 0x4576
+0x5F56 = 0x5741
+0x5F57 = 0x5742
+0x5F59 = 0x5743
+0x5F5C = 0x5734
+0x5F5D = 0x5733
+0x5F61 = 0x5744
+0x5F62 = 0x3741
+0x5F66 = 0x4927
+0x5F69 = 0x3A4C
+0x5F6A = 0x4937
+0x5F6B = 0x4426
+0x5F6C = 0x494B
+0x5F6D = 0x5745
+0x5F70 = 0x3E34
+0x5F71 = 0x3146
+0x5F73 = 0x5746
+0x5F77 = 0x5747
+0x5F79 = 0x4C72
+0x5F7C = 0x4860
+0x5F7F = 0x574A
+0x5F80 = 0x317D
+0x5F81 = 0x402C
+0x5F82 = 0x5749
+0x5F83 = 0x5748
+0x5F84 = 0x3742
+0x5F85 = 0x4254
+0x5F87 = 0x574E
+0x5F88 = 0x574C
+0x5F8A = 0x574B
+0x5F8B = 0x4E27
+0x5F8C = 0x3865
+0x5F90 = 0x3D79
+0x5F91 = 0x574D
+0x5F92 = 0x454C
+0x5F93 = 0x3D3E
+0x5F97 = 0x4640
+0x5F98 = 0x5751
+0x5F99 = 0x5750
+0x5F9E = 0x574F
+0x5FA0 = 0x5752
+0x5FA1 = 0x3866
+0x5FA8 = 0x5753
+0x5FA9 = 0x497C
+0x5FAA = 0x3D5B
+0x5FAD = 0x5754
+0x5FAE = 0x4879
+0x5FB3 = 0x4641
+0x5FB4 = 0x4427
+0x5FB9 = 0x4530
+0x5FBC = 0x5755
+0x5FBD = 0x352B
+0x5FC3 = 0x3F34
+0x5FC5 = 0x492C
+0x5FCC = 0x3477
+0x5FCD = 0x4726
+0x5FD6 = 0x5756
+0x5FD7 = 0x3B56
+0x5FD8 = 0x4B3A
+0x5FD9 = 0x4B3B
+0x5FDC = 0x317E
+0x5FDD = 0x575B
+0x5FE0 = 0x4369
+0x5FE4 = 0x5758
+0x5FEB = 0x3277
+0x5FF0 = 0x582D
+0x5FF1 = 0x575A
+0x5FF5 = 0x4730
+0x5FF8 = 0x5759
+0x5FFB = 0x5757
+0x5FFD = 0x397A
+0x5FFF = 0x575D
+0x600E = 0x5763
+0x600F = 0x5769
+0x6010 = 0x5761
+0x6012 = 0x455C
+0x6015 = 0x5766
+0x6016 = 0x495D
+0x6019 = 0x5760
+0x601B = 0x5765
+0x601C = 0x4E67
+0x601D = 0x3B57
+0x6020 = 0x4255
+0x6021 = 0x575E
+0x6025 = 0x355E
+0x6026 = 0x5768
+0x6027 = 0x402D
+0x6028 = 0x3165
+0x6029 = 0x5762
+0x602A = 0x3278
+0x602B = 0x5767
+0x602F = 0x3631
+0x6031 = 0x5764
+0x603A = 0x576A
+0x6041 = 0x576C
+0x6042 = 0x5776
+0x6043 = 0x5774
+0x6046 = 0x5771
+0x604A = 0x5770
+0x604B = 0x4E78
+0x604D = 0x5772
+0x6050 = 0x3632
+0x6052 = 0x3931
+0x6055 = 0x3D7A
+0x6059 = 0x5779
+0x605A = 0x576B
+0x605F = 0x576F
+0x6060 = 0x575F
+0x6062 = 0x327A
+0x6063 = 0x5773
+0x6064 = 0x5775
+0x6065 = 0x4351
+0x6068 = 0x3A28
+0x6069 = 0x3238
+0x606A = 0x576D
+0x606B = 0x5778
+0x606C = 0x5777
+0x606D = 0x3633
+0x606F = 0x4229
+0x6070 = 0x3366
+0x6075 = 0x3743
+0x6077 = 0x576E
+0x6081 = 0x577A
+0x6083 = 0x577D
+0x6084 = 0x5821
+0x6089 = 0x3C3D
+0x608B = 0x5827
+0x608C = 0x4470
+0x608D = 0x577B
+0x6092 = 0x5825
+0x6094 = 0x3279
+0x6096 = 0x5823
+0x6097 = 0x5824
+0x609A = 0x577E
+0x609B = 0x5822
+0x609F = 0x3867
+0x60A0 = 0x4D2A
+0x60A3 = 0x3435
+0x60A6 = 0x3159
+0x60A7 = 0x5826
+0x60A9 = 0x473A
+0x60AA = 0x302D
+0x60B2 = 0x4861
+0x60B3 = 0x575C
+0x60B4 = 0x582C
+0x60B5 = 0x5830
+0x60B6 = 0x4C65
+0x60B8 = 0x5829
+0x60BC = 0x4569
+0x60BD = 0x582E
+0x60C5 = 0x3E70
+0x60C6 = 0x582F
+0x60C7 = 0x4657
+0x60D1 = 0x4F47
+0x60D3 = 0x582B
+0x60D8 = 0x5831
+0x60DA = 0x397B
+0x60DC = 0x404B
+0x60DF = 0x3054
+0x60E0 = 0x582A
+0x60E1 = 0x5828
+0x60E3 = 0x415A
+0x60E7 = 0x577C
+0x60E8 = 0x3B34
+0x60F0 = 0x4246
+0x60F1 = 0x583D
+0x60F3 = 0x415B
+0x60F4 = 0x5838
+0x60F6 = 0x5835
+0x60F7 = 0x5836
+0x60F9 = 0x3C66
+0x60FA = 0x5839
+0x60FB = 0x583C
+0x6100 = 0x5837
+0x6101 = 0x3D25
+0x6103 = 0x583A
+0x6106 = 0x5834
+0x6108 = 0x4C7C
+0x6109 = 0x4C7B
+0x610D = 0x583E
+0x610E = 0x583F
+0x610F = 0x3055
+0x6115 = 0x5833
+0x611A = 0x3672
+0x611B = 0x3026
+0x611F = 0x3436
+0x6121 = 0x583B
+0x6127 = 0x5843
+0x6128 = 0x5842
+0x612C = 0x5847
+0x6134 = 0x5848
+0x613C = 0x5846
+0x613D = 0x5849
+0x613E = 0x5841
+0x613F = 0x5845
+0x6142 = 0x584A
+0x6144 = 0x584B
+0x6147 = 0x5840
+0x6148 = 0x3B7C
+0x614A = 0x5844
+0x614B = 0x4256
+0x614C = 0x3932
+0x614D = 0x5832
+0x614E = 0x3F35
+0x6153 = 0x5858
+0x6155 = 0x4A69
+0x6158 = 0x584E
+0x6159 = 0x584F
+0x615A = 0x5850
+0x615D = 0x5857
+0x615F = 0x5856
+0x6162 = 0x4B7D
+0x6163 = 0x3437
+0x6165 = 0x5854
+0x6167 = 0x3745
+0x6168 = 0x3334
+0x616B = 0x5851
+0x616E = 0x4E38
+0x616F = 0x5853
+0x6170 = 0x3056
+0x6171 = 0x5855
+0x6173 = 0x584C
+0x6174 = 0x5852
+0x6175 = 0x5859
+0x6176 = 0x3744
+0x6177 = 0x584D
+0x617E = 0x4D5D
+0x6182 = 0x4D2B
+0x6187 = 0x585C
+0x618A = 0x5860
+0x618E = 0x417E
+0x6190 = 0x4E79
+0x6191 = 0x5861
+0x6194 = 0x585E
+0x6196 = 0x585B
+0x6199 = 0x585A
+0x619A = 0x585F
+0x61A4 = 0x4A30
+0x61A7 = 0x4634
+0x61A9 = 0x3746
+0x61AB = 0x5862
+0x61AC = 0x585D
+0x61AE = 0x5863
+0x61B2 = 0x377B
+0x61B6 = 0x3231
+0x61BA = 0x586B
+0x61BE = 0x3438
+0x61C3 = 0x5869
+0x61C6 = 0x586A
+0x61C7 = 0x3A29
+0x61C8 = 0x5868
+0x61C9 = 0x5866
+0x61CA = 0x5865
+0x61CB = 0x586C
+0x61CC = 0x5864
+0x61CD = 0x586E
+0x61D0 = 0x327B
+0x61E3 = 0x5870
+0x61E6 = 0x586F
+0x61F2 = 0x4428
+0x61F4 = 0x5873
+0x61F6 = 0x5871
+0x61F7 = 0x5867
+0x61F8 = 0x377C
+0x61FA = 0x5872
+0x61FC = 0x5876
+0x61FD = 0x5875
+0x61FE = 0x5877
+0x61FF = 0x5874
+0x6200 = 0x5878
+0x6208 = 0x5879
+0x6209 = 0x587A
+0x620A = 0x4A6A
+0x620C = 0x587C
+0x620D = 0x587B
+0x620E = 0x3D3F
+0x6210 = 0x402E
+0x6211 = 0x3266
+0x6212 = 0x327C
+0x6214 = 0x587D
+0x6216 = 0x303F
+0x621A = 0x404C
+0x621B = 0x587E
+0x621D = 0x6C43
+0x621E = 0x5921
+0x621F = 0x3761
+0x6221 = 0x5922
+0x6226 = 0x406F
+0x622A = 0x5923
+0x622E = 0x5924
+0x622F = 0x353A
+0x6230 = 0x5925
+0x6232 = 0x5926
+0x6233 = 0x5927
+0x6234 = 0x4257
+0x6238 = 0x384D
+0x623B = 0x4C61
+0x623F = 0x4B3C
+0x6240 = 0x3D6A
+0x6241 = 0x5928
+0x6247 = 0x4070
+0x6248 = 0x6E3D
+0x6249 = 0x4862
+0x624B = 0x3C6A
+0x624D = 0x3A4D
+0x624E = 0x5929
+0x6253 = 0x4247
+0x6255 = 0x4A27
+0x6258 = 0x4271
+0x625B = 0x592C
+0x625E = 0x592A
+0x6260 = 0x592D
+0x6263 = 0x592B
+0x6268 = 0x592E
+0x626E = 0x4A31
+0x6271 = 0x3037
+0x6276 = 0x495E
+0x6279 = 0x4863
+0x627C = 0x592F
+0x627E = 0x5932
+0x627F = 0x3E35
+0x6280 = 0x353B
+0x6282 = 0x5930
+0x6283 = 0x5937
+0x6284 = 0x3E36
+0x6289 = 0x5931
+0x628A = 0x4744
+0x6291 = 0x4D5E
+0x6292 = 0x5933
+0x6293 = 0x5934
+0x6294 = 0x5938
+0x6295 = 0x456A
+0x6296 = 0x5935
+0x6297 = 0x3933
+0x6298 = 0x405E
+0x629B = 0x5946
+0x629C = 0x4834
+0x629E = 0x4272
+0x62AB = 0x4864
+0x62AC = 0x5A2D
+0x62B1 = 0x4A7A
+0x62B5 = 0x4471
+0x62B9 = 0x4B75
+0x62BB = 0x593B
+0x62BC = 0x3221
+0x62BD = 0x436A
+0x62C2 = 0x5944
+0x62C5 = 0x4334
+0x62C6 = 0x593E
+0x62C7 = 0x5945
+0x62C8 = 0x5940
+0x62C9 = 0x5947
+0x62CA = 0x5943
+0x62CC = 0x5942
+0x62CD = 0x476F
+0x62CF = 0x593C
+0x62D0 = 0x327D
+0x62D1 = 0x593A
+0x62D2 = 0x3571
+0x62D3 = 0x4273
+0x62D4 = 0x5936
+0x62D7 = 0x5939
+0x62D8 = 0x3934
+0x62D9 = 0x405B
+0x62DB = 0x3E37
+0x62DC = 0x5941
+0x62DD = 0x4752
+0x62E0 = 0x3572
+0x62E1 = 0x3348
+0x62EC = 0x3367
+0x62ED = 0x3F21
+0x62EE = 0x5949
+0x62EF = 0x594E
+0x62F1 = 0x594A
+0x62F3 = 0x377D
+0x62F5 = 0x594F
+0x62F6 = 0x3B22
+0x62F7 = 0x3969
+0x62FE = 0x3D26
+0x62FF = 0x593D
+0x6301 = 0x3B7D
+0x6302 = 0x594C
+0x6307 = 0x3B58
+0x6308 = 0x594D
+0x6309 = 0x3044
+0x630C = 0x5948
+0x6311 = 0x4429
+0x6319 = 0x3573
+0x631F = 0x3634
+0x6327 = 0x594B
+0x6328 = 0x3027
+0x632B = 0x3A43
+0x632F = 0x3F36
+0x633A = 0x4472
+0x633D = 0x4854
+0x633E = 0x5951
+0x633F = 0x415E
+0x6349 = 0x422A
+0x634C = 0x3B2B
+0x634D = 0x5952
+0x634F = 0x5954
+0x6350 = 0x5950
+0x6355 = 0x4A61
+0x6357 = 0x443D
+0x635C = 0x415C
+0x6367 = 0x4A7B
+0x6368 = 0x3C4E
+0x6369 = 0x5960
+0x636B = 0x595F
+0x636E = 0x3F78
+0x6372 = 0x377E
+0x6376 = 0x5959
+0x6377 = 0x3E39
+0x637A = 0x4668
+0x637B = 0x4731
+0x6380 = 0x5957
+0x6383 = 0x415D
+0x6388 = 0x3C78
+0x6389 = 0x595C
+0x638C = 0x3E38
+0x638E = 0x5956
+0x638F = 0x595B
+0x6392 = 0x4753
+0x6396 = 0x5955
+0x6398 = 0x3721
+0x639B = 0x335D
+0x639F = 0x595D
+0x63A0 = 0x4E2B
+0x63A1 = 0x3A4E
+0x63A2 = 0x4335
+0x63A3 = 0x595A
+0x63A5 = 0x405C
+0x63A7 = 0x3935
+0x63A8 = 0x3F64
+0x63A9 = 0x3166
+0x63AA = 0x413C
+0x63AB = 0x5958
+0x63AC = 0x3545
+0x63B2 = 0x3747
+0x63B4 = 0x444F
+0x63B5 = 0x595E
+0x63BB = 0x415F
+0x63BE = 0x5961
+0x63C0 = 0x5963
+0x63C3 = 0x4237
+0x63C4 = 0x5969
+0x63C6 = 0x5964
+0x63C9 = 0x5966
+0x63CF = 0x4941
+0x63D0 = 0x4473
+0x63D2 = 0x5967
+0x63D6 = 0x4D2C
+0x63DA = 0x4D48
+0x63DB = 0x3439
+0x63E1 = 0x302E
+0x63E3 = 0x5965
+0x63E9 = 0x5962
+0x63EE = 0x3478
+0x63F4 = 0x3167
+0x63F6 = 0x5968
+0x63FA = 0x4D49
+0x6406 = 0x596C
+0x640D = 0x423B
+0x640F = 0x5973
+0x6413 = 0x596D
+0x6416 = 0x596A
+0x6417 = 0x5971
+0x641C = 0x5953
+0x6426 = 0x596E
+0x6428 = 0x5972
+0x642C = 0x4842
+0x642D = 0x456B
+0x6434 = 0x596B
+0x6436 = 0x596F
+0x643A = 0x3748
+0x643E = 0x3A71
+0x6442 = 0x405D
+0x644E = 0x5977
+0x6458 = 0x4526
+0x6467 = 0x5974
+0x6469 = 0x4B60
+0x646F = 0x5975
+0x6476 = 0x5976
+0x6478 = 0x4C4E
+0x647A = 0x4022
+0x6483 = 0x3762
+0x6488 = 0x597D
+0x6492 = 0x3B35
+0x6493 = 0x597A
+0x6495 = 0x5979
+0x649A = 0x4732
+0x649E = 0x4635
+0x64A4 = 0x4531
+0x64A5 = 0x597B
+0x64A9 = 0x597C
+0x64AB = 0x496F
+0x64AD = 0x4745
+0x64AE = 0x3B23
+0x64B0 = 0x4071
+0x64B2 = 0x4B50
+0x64B9 = 0x3349
+0x64BB = 0x5A25
+0x64BC = 0x597E
+0x64C1 = 0x4D4A
+0x64C2 = 0x5A27
+0x64C5 = 0x5A23
+0x64C7 = 0x5A24
+0x64CD = 0x4160
+0x64D2 = 0x5A22
+0x64D4 = 0x593F
+0x64D8 = 0x5A26
+0x64DA = 0x5A21
+0x64E0 = 0x5A2B
+0x64E1 = 0x5A2C
+0x64E2 = 0x4527
+0x64E3 = 0x5A2E
+0x64E6 = 0x3B24
+0x64E7 = 0x5A29
+0x64EC = 0x353C
+0x64EF = 0x5A2F
+0x64F1 = 0x5A28
+0x64F2 = 0x5A33
+0x64F4 = 0x5A32
+0x64F6 = 0x5A31
+0x64FA = 0x5A34
+0x64FD = 0x5A36
+0x64FE = 0x3E71
+0x6500 = 0x5A35
+0x6505 = 0x5A39
+0x6518 = 0x5A37
+0x651C = 0x5A38
+0x651D = 0x5970
+0x6523 = 0x5A3B
+0x6524 = 0x5A3A
+0x652A = 0x5978
+0x652B = 0x5A3C
+0x652C = 0x5A30
+0x652F = 0x3B59
+0x6534 = 0x5A3D
+0x6535 = 0x5A3E
+0x6536 = 0x5A40
+0x6537 = 0x5A3F
+0x6538 = 0x5A41
+0x6539 = 0x327E
+0x653B = 0x3936
+0x653E = 0x4A7C
+0x653F = 0x402F
+0x6545 = 0x384E
+0x6548 = 0x5A43
+0x654D = 0x5A46
+0x654F = 0x4952
+0x6551 = 0x355F
+0x6555 = 0x5A45
+0x6556 = 0x5A44
+0x6557 = 0x4754
+0x6558 = 0x5A47
+0x6559 = 0x3635
+0x655D = 0x5A49
+0x655E = 0x5A48
+0x6562 = 0x343A
+0x6563 = 0x3B36
+0x6566 = 0x4658
+0x656C = 0x3749
+0x6570 = 0x3F74
+0x6572 = 0x5A4A
+0x6574 = 0x4030
+0x6575 = 0x4528
+0x6577 = 0x495F
+0x6578 = 0x5A4B
+0x6582 = 0x5A4C
+0x6583 = 0x5A4D
+0x6587 = 0x4A38
+0x6588 = 0x555D
+0x6589 = 0x4046
+0x658C = 0x494C
+0x658E = 0x3A58
+0x6590 = 0x4865
+0x6591 = 0x4843
+0x6597 = 0x454D
+0x6599 = 0x4E41
+0x659B = 0x5A4F
+0x659C = 0x3C50
+0x659F = 0x5A50
+0x65A1 = 0x3036
+0x65A4 = 0x3654
+0x65A5 = 0x404D
+0x65A7 = 0x4960
+0x65AB = 0x5A51
+0x65AC = 0x3B42
+0x65AD = 0x4347
+0x65AF = 0x3B5B
+0x65B0 = 0x3F37
+0x65B7 = 0x5A52
+0x65B9 = 0x4A7D
+0x65BC = 0x3177
+0x65BD = 0x3B5C
+0x65C1 = 0x5A55
+0x65C3 = 0x5A53
+0x65C4 = 0x5A56
+0x65C5 = 0x4E39
+0x65C6 = 0x5A54
+0x65CB = 0x407B
+0x65CC = 0x5A57
+0x65CF = 0x4232
+0x65D2 = 0x5A58
+0x65D7 = 0x347A
+0x65D9 = 0x5A5A
+0x65DB = 0x5A59
+0x65E0 = 0x5A5B
+0x65E1 = 0x5A5C
+0x65E2 = 0x347B
+0x65E5 = 0x467C
+0x65E6 = 0x4336
+0x65E7 = 0x356C
+0x65E8 = 0x3B5D
+0x65E9 = 0x4161
+0x65EC = 0x3D5C
+0x65ED = 0x3030
+0x65F1 = 0x5A5D
+0x65FA = 0x3222
+0x65FB = 0x5A61
+0x6602 = 0x3937
+0x6603 = 0x5A60
+0x6606 = 0x3A2B
+0x6607 = 0x3E3A
+0x660A = 0x5A5F
+0x660C = 0x3E3B
+0x660E = 0x4C40
+0x660F = 0x3A2A
+0x6613 = 0x3057
+0x6614 = 0x404E
+0x661C = 0x5A66
+0x661F = 0x4031
+0x6620 = 0x3147
+0x6625 = 0x3D55
+0x6627 = 0x4B66
+0x6628 = 0x3A72
+0x662D = 0x3E3C
+0x662F = 0x4027
+0x6634 = 0x5A65
+0x6635 = 0x5A63
+0x6636 = 0x5A64
+0x663C = 0x436B
+0x663F = 0x5B26
+0x6641 = 0x5A6A
+0x6642 = 0x3B7E
+0x6643 = 0x3938
+0x6644 = 0x5A68
+0x6649 = 0x5A69
+0x664B = 0x3F38
+0x664F = 0x5A67
+0x6652 = 0x3B2F
+0x665D = 0x5A6C
+0x665E = 0x5A6B
+0x665F = 0x5A70
+0x6662 = 0x5A71
+0x6664 = 0x5A6D
+0x6666 = 0x3322
+0x6667 = 0x5A6E
+0x6668 = 0x5A6F
+0x6669 = 0x4855
+0x666E = 0x4961
+0x666F = 0x374A
+0x6670 = 0x5A72
+0x6674 = 0x4032
+0x6676 = 0x3E3D
+0x667A = 0x4352
+0x6681 = 0x3647
+0x6683 = 0x5A73
+0x6684 = 0x5A77
+0x6687 = 0x324B
+0x6688 = 0x5A74
+0x6689 = 0x5A76
+0x668E = 0x5A75
+0x6691 = 0x3D6B
+0x6696 = 0x4348
+0x6697 = 0x3045
+0x6698 = 0x5A78
+0x669D = 0x5A79
+0x66A2 = 0x442A
+0x66A6 = 0x4E71
+0x66AB = 0x3B43
+0x66AE = 0x4A6B
+0x66B4 = 0x4B3D
+0x66B8 = 0x5B22
+0x66B9 = 0x5A7B
+0x66BC = 0x5A7E
+0x66BE = 0x5A7D
+0x66C1 = 0x5A7A
+0x66C4 = 0x5B21
+0x66C7 = 0x465E
+0x66C9 = 0x5A7C
+0x66D6 = 0x5B23
+0x66D9 = 0x3D6C
+0x66DA = 0x5B24
+0x66DC = 0x4D4B
+0x66DD = 0x4778
+0x66E0 = 0x5B25
+0x66E6 = 0x5B27
+0x66E9 = 0x5B28
+0x66F0 = 0x5B29
+0x66F2 = 0x364A
+0x66F3 = 0x3148
+0x66F4 = 0x3939
+0x66F5 = 0x5B2A
+0x66F7 = 0x5B2B
+0x66F8 = 0x3D71
+0x66F9 = 0x4162
+0x66FC = 0x5258
+0x66FD = 0x413E
+0x66FE = 0x413D
+0x66FF = 0x4258
+0x6700 = 0x3A47
+0x6703 = 0x5072
+0x6708 = 0x376E
+0x6709 = 0x4D2D
+0x670B = 0x4A7E
+0x670D = 0x497E
+0x670F = 0x5B2C
+0x6714 = 0x3A73
+0x6715 = 0x443F
+0x6716 = 0x5B2D
+0x6717 = 0x4F2F
+0x671B = 0x4B3E
+0x671D = 0x442B
+0x671E = 0x5B2E
+0x671F = 0x347C
+0x6726 = 0x5B2F
+0x6727 = 0x5B30
+0x6728 = 0x4C5A
+0x672A = 0x4C24
+0x672B = 0x4B76
+0x672C = 0x4B5C
+0x672D = 0x3B25
+0x672E = 0x5B32
+0x6731 = 0x3C6B
+0x6734 = 0x4B51
+0x6736 = 0x5B34
+0x6737 = 0x5B37
+0x6738 = 0x5B36
+0x673A = 0x3479
+0x673D = 0x3560
+0x673F = 0x5B33
+0x6741 = 0x5B35
+0x6746 = 0x5B38
+0x6749 = 0x3F79
+0x674E = 0x4D7B
+0x674F = 0x3049
+0x6750 = 0x3A60
+0x6751 = 0x423C
+0x6753 = 0x3C5D
+0x6756 = 0x3E73
+0x6759 = 0x5B3B
+0x675C = 0x454E
+0x675E = 0x5B39
+0x675F = 0x422B
+0x6760 = 0x5B3A
+0x6761 = 0x3E72
+0x6762 = 0x4C5D
+0x6763 = 0x5B3C
+0x6764 = 0x5B3D
+0x6765 = 0x4D68
+0x676A = 0x5B42
+0x676D = 0x393A
+0x676F = 0x4755
+0x6770 = 0x5B3F
+0x6771 = 0x456C
+0x6772 = 0x5A5E
+0x6773 = 0x5A62
+0x6775 = 0x354F
+0x6777 = 0x4747
+0x677C = 0x5B41
+0x677E = 0x3E3E
+0x677F = 0x4844
+0x6785 = 0x5B47
+0x6787 = 0x487A
+0x6789 = 0x5B3E
+0x678B = 0x5B44
+0x678C = 0x5B43
+0x6790 = 0x404F
+0x6795 = 0x4B6D
+0x6797 = 0x4E53
+0x679A = 0x4B67
+0x679C = 0x324C
+0x679D = 0x3B5E
+0x67A0 = 0x4F48
+0x67A1 = 0x5B46
+0x67A2 = 0x3F75
+0x67A6 = 0x5B45
+0x67A9 = 0x5B40
+0x67AF = 0x384F
+0x67B3 = 0x5B4C
+0x67B4 = 0x5B4A
+0x67B6 = 0x324D
+0x67B7 = 0x5B48
+0x67B8 = 0x5B4E
+0x67B9 = 0x5B54
+0x67C1 = 0x4248
+0x67C4 = 0x4A41
+0x67C6 = 0x5B56
+0x67CA = 0x4922
+0x67CE = 0x5B55
+0x67CF = 0x4770
+0x67D0 = 0x4B3F
+0x67D1 = 0x343B
+0x67D3 = 0x4077
+0x67D4 = 0x3D40
+0x67D8 = 0x4453
+0x67DA = 0x4D2E
+0x67DD = 0x5B51
+0x67DE = 0x5B50
+0x67E2 = 0x5B52
+0x67E4 = 0x5B4F
+0x67E7 = 0x5B57
+0x67E9 = 0x5B4D
+0x67EC = 0x5B4B
+0x67EE = 0x5B53
+0x67EF = 0x5B49
+0x67F1 = 0x436C
+0x67F3 = 0x4C78
+0x67F4 = 0x3C46
+0x67F5 = 0x3A74
+0x67FB = 0x3A3A
+0x67FE = 0x4B6F
+0x67FF = 0x3341
+0x6802 = 0x444E
+0x6803 = 0x464A
+0x6804 = 0x3149
+0x6813 = 0x4072
+0x6816 = 0x4034
+0x6817 = 0x372A
+0x681E = 0x5B59
+0x6821 = 0x393B
+0x6822 = 0x337C
+0x6829 = 0x5B5B
+0x682A = 0x3374
+0x682B = 0x5B61
+0x6832 = 0x5B5E
+0x6834 = 0x4073
+0x6838 = 0x334B
+0x6839 = 0x3A2C
+0x683C = 0x334A
+0x683D = 0x3A4F
+0x6840 = 0x5B5C
+0x6841 = 0x3765
+0x6842 = 0x374B
+0x6843 = 0x456D
+0x6846 = 0x5B5A
+0x6848 = 0x3046
+0x684D = 0x5B5D
+0x684E = 0x5B5F
+0x6850 = 0x364D
+0x6851 = 0x372C
+0x6853 = 0x343C
+0x6854 = 0x354B
+0x6859 = 0x5B62
+0x685C = 0x3A79
+0x685D = 0x4B71
+0x685F = 0x3B37
+0x6863 = 0x5B63
+0x6867 = 0x4930
+0x6874 = 0x5B6F
+0x6876 = 0x3233
+0x6877 = 0x5B64
+0x687E = 0x5B75
+0x687F = 0x5B65
+0x6881 = 0x4E42
+0x6883 = 0x5B6C
+0x6885 = 0x475F
+0x688D = 0x5B74
+0x688F = 0x5B67
+0x6893 = 0x3034
+0x6894 = 0x5B69
+0x6897 = 0x393C
+0x689B = 0x5B6B
+0x689D = 0x5B6A
+0x689F = 0x5B66
+0x68A0 = 0x5B71
+0x68A2 = 0x3E3F
+0x68A6 = 0x546D
+0x68A7 = 0x3868
+0x68A8 = 0x4D7C
+0x68AD = 0x5B68
+0x68AF = 0x4474
+0x68B0 = 0x3323
+0x68B1 = 0x3A2D
+0x68B3 = 0x5B60
+0x68B5 = 0x5B70
+0x68B6 = 0x3361
+0x68B9 = 0x5B6E
+0x68BA = 0x5B72
+0x68BC = 0x456E
+0x68C4 = 0x347E
+0x68C6 = 0x5C32
+0x68C9 = 0x4C49
+0x68CA = 0x5B77
+0x68CB = 0x347D
+0x68CD = 0x5B7E
+0x68D2 = 0x4B40
+0x68D4 = 0x5C21
+0x68D5 = 0x5C23
+0x68D7 = 0x5C27
+0x68D8 = 0x5B79
+0x68DA = 0x432A
+0x68DF = 0x456F
+0x68E0 = 0x5C2B
+0x68E1 = 0x5B7C
+0x68E3 = 0x5C28
+0x68E7 = 0x5C22
+0x68EE = 0x3F39
+0x68EF = 0x5C2C
+0x68F2 = 0x4033
+0x68F9 = 0x5C2A
+0x68FA = 0x343D
+0x6900 = 0x4F50
+0x6901 = 0x5B76
+0x6904 = 0x5C26
+0x6905 = 0x3058
+0x6908 = 0x5B78
+0x690B = 0x4C3A
+0x690C = 0x5B7D
+0x690D = 0x3F22
+0x690E = 0x4447
+0x690F = 0x5B73
+0x6912 = 0x5C25
+0x6919 = 0x3F7A
+0x691A = 0x5C2F
+0x691B = 0x3371
+0x691C = 0x3821
+0x6921 = 0x5C31
+0x6922 = 0x5B7A
+0x6923 = 0x5C30
+0x6925 = 0x5C29
+0x6926 = 0x5B7B
+0x6928 = 0x5C2D
+0x692A = 0x5C2E
+0x6930 = 0x5C3F
+0x6934 = 0x464E
+0x6936 = 0x5C24
+0x6939 = 0x5C3B
+0x693D = 0x5C3D
+0x693F = 0x4458
+0x694A = 0x4D4C
+0x6953 = 0x4976
+0x6954 = 0x5C38
+0x6955 = 0x424A
+0x6959 = 0x5C3E
+0x695A = 0x413F
+0x695C = 0x5C35
+0x695D = 0x5C42
+0x695E = 0x5C41
+0x6960 = 0x466F
+0x6961 = 0x5C40
+0x6962 = 0x466A
+0x696A = 0x5C44
+0x696B = 0x5C37
+0x696D = 0x3648
+0x696E = 0x5C3A
+0x696F = 0x3D5D
+0x6973 = 0x4760
+0x6974 = 0x5C3C
+0x6975 = 0x364B
+0x6977 = 0x5C34
+0x6978 = 0x5C36
+0x6979 = 0x5C33
+0x697C = 0x4F30
+0x697D = 0x335A
+0x697E = 0x5C39
+0x6981 = 0x5C43
+0x6982 = 0x3335
+0x698A = 0x3A67
+0x698E = 0x315D
+0x6991 = 0x5C54
+0x6994 = 0x4F31
+0x6995 = 0x5C57
+0x699B = 0x3F3A
+0x699C = 0x5C56
+0x69A0 = 0x5C55
+0x69A7 = 0x5C52
+0x69AE = 0x5C46
+0x69B1 = 0x5C63
+0x69B2 = 0x5C45
+0x69B4 = 0x5C58
+0x69BB = 0x5C50
+0x69BE = 0x5C4B
+0x69BF = 0x5C48
+0x69C1 = 0x5C49
+0x69C3 = 0x5C51
+0x69C7 = 0x7422
+0x69CA = 0x5C4E
+0x69CB = 0x393D
+0x69CC = 0x4448
+0x69CD = 0x4164
+0x69CE = 0x5C4C
+0x69D0 = 0x5C47
+0x69D3 = 0x5C4A
+0x69D8 = 0x4D4D
+0x69D9 = 0x4B6A
+0x69DD = 0x5C4F
+0x69DE = 0x5C59
+0x69E7 = 0x5C61
+0x69E8 = 0x5C5A
+0x69EB = 0x5C67
+0x69ED = 0x5C65
+0x69F2 = 0x5C60
+0x69F9 = 0x5C5F
+0x69FB = 0x4450
+0x69FD = 0x4165
+0x69FF = 0x5C5D
+0x6A02 = 0x5C5B
+0x6A05 = 0x5C62
+0x6A0A = 0x5C68
+0x6A0B = 0x4875
+0x6A0C = 0x5C6E
+0x6A12 = 0x5C69
+0x6A13 = 0x5C6C
+0x6A14 = 0x5C66
+0x6A17 = 0x4374
+0x6A19 = 0x4938
+0x6A1B = 0x5C5C
+0x6A1E = 0x5C64
+0x6A1F = 0x3E40
+0x6A21 = 0x4C4F
+0x6A22 = 0x5C78
+0x6A23 = 0x5C6B
+0x6A29 = 0x3822
+0x6A2A = 0x3223
+0x6A2B = 0x335F
+0x6A2E = 0x5C53
+0x6A35 = 0x3E41
+0x6A36 = 0x5C70
+0x6A38 = 0x5C77
+0x6A39 = 0x3C79
+0x6A3A = 0x3372
+0x6A3D = 0x432E
+0x6A44 = 0x5C6D
+0x6A47 = 0x5C72
+0x6A48 = 0x5C76
+0x6A4B = 0x3636
+0x6A58 = 0x354C
+0x6A59 = 0x5C74
+0x6A5F = 0x3521
+0x6A61 = 0x464B
+0x6A62 = 0x5C73
+0x6A66 = 0x5C75
+0x6A72 = 0x5C6F
+0x6A78 = 0x5C71
+0x6A7F = 0x3360
+0x6A80 = 0x4349
+0x6A84 = 0x5C7C
+0x6A8D = 0x5C7A
+0x6A8E = 0x3869
+0x6A90 = 0x5C79
+0x6A97 = 0x5D21
+0x6A9C = 0x5B58
+0x6AA0 = 0x5C7B
+0x6AA2 = 0x5C7D
+0x6AA3 = 0x5C7E
+0x6AAA = 0x5D2C
+0x6AAC = 0x5D28
+0x6AAE = 0x5B6D
+0x6AB3 = 0x5D27
+0x6AB8 = 0x5D26
+0x6ABB = 0x5D23
+0x6AC1 = 0x5C6A
+0x6AC2 = 0x5D25
+0x6AC3 = 0x5D24
+0x6AD1 = 0x5D2A
+0x6AD3 = 0x4F26
+0x6ADA = 0x5D2D
+0x6ADB = 0x367B
+0x6ADE = 0x5D29
+0x6ADF = 0x5D2B
+0x6AE8 = 0x4827
+0x6AEA = 0x5D2E
+0x6AFA = 0x5D32
+0x6AFB = 0x5D2F
+0x6B04 = 0x4D73
+0x6B05 = 0x5D30
+0x6B0A = 0x5C5E
+0x6B12 = 0x5D33
+0x6B16 = 0x5D34
+0x6B1D = 0x3135
+0x6B1F = 0x5D36
+0x6B20 = 0x3767
+0x6B21 = 0x3C21
+0x6B23 = 0x3655
+0x6B27 = 0x3224
+0x6B32 = 0x4D5F
+0x6B37 = 0x5D38
+0x6B38 = 0x5D37
+0x6B39 = 0x5D3A
+0x6B3A = 0x353D
+0x6B3D = 0x3656
+0x6B3E = 0x343E
+0x6B43 = 0x5D3D
+0x6B47 = 0x5D3C
+0x6B49 = 0x5D3E
+0x6B4C = 0x324E
+0x6B4E = 0x4337
+0x6B50 = 0x5D3F
+0x6B53 = 0x343F
+0x6B54 = 0x5D41
+0x6B59 = 0x5D40
+0x6B5B = 0x5D42
+0x6B5F = 0x5D43
+0x6B61 = 0x5D44
+0x6B62 = 0x3B5F
+0x6B63 = 0x4035
+0x6B64 = 0x3A21
+0x6B66 = 0x4970
+0x6B69 = 0x4A62
+0x6B6A = 0x4F44
+0x6B6F = 0x3B75
+0x6B73 = 0x3A50
+0x6B74 = 0x4E72
+0x6B78 = 0x5D45
+0x6B79 = 0x5D46
+0x6B7B = 0x3B60
+0x6B7F = 0x5D47
+0x6B80 = 0x5D48
+0x6B83 = 0x5D4A
+0x6B84 = 0x5D49
+0x6B86 = 0x4B58
+0x6B89 = 0x3D5E
+0x6B8A = 0x3C6C
+0x6B8B = 0x3B44
+0x6B8D = 0x5D4B
+0x6B95 = 0x5D4D
+0x6B96 = 0x3F23
+0x6B98 = 0x5D4C
+0x6B9E = 0x5D4E
+0x6BA4 = 0x5D4F
+0x6BAA = 0x5D50
+0x6BAB = 0x5D51
+0x6BAF = 0x5D52
+0x6BB1 = 0x5D54
+0x6BB2 = 0x5D53
+0x6BB3 = 0x5D55
+0x6BB4 = 0x3225
+0x6BB5 = 0x434A
+0x6BB7 = 0x5D56
+0x6BBA = 0x3B26
+0x6BBB = 0x334C
+0x6BBC = 0x5D57
+0x6BBF = 0x4542
+0x6BC0 = 0x544C
+0x6BC5 = 0x3523
+0x6BC6 = 0x5D58
+0x6BCB = 0x5D59
+0x6BCD = 0x4A6C
+0x6BCE = 0x4B68
+0x6BD2 = 0x4647
+0x6BD3 = 0x5D5A
+0x6BD4 = 0x4866
+0x6BD8 = 0x487B
+0x6BDB = 0x4C53
+0x6BDF = 0x5D5B
+0x6BEB = 0x5D5D
+0x6BEC = 0x5D5C
+0x6BEF = 0x5D5F
+0x6BF3 = 0x5D5E
+0x6C08 = 0x5D61
+0x6C0F = 0x3B61
+0x6C11 = 0x4C31
+0x6C13 = 0x5D62
+0x6C14 = 0x5D63
+0x6C17 = 0x3524
+0x6C1B = 0x5D64
+0x6C23 = 0x5D66
+0x6C24 = 0x5D65
+0x6C34 = 0x3F65
+0x6C37 = 0x4939
+0x6C38 = 0x314A
+0x6C3E = 0x4845
+0x6C40 = 0x4475
+0x6C41 = 0x3D41
+0x6C42 = 0x3561
+0x6C4E = 0x4846
+0x6C50 = 0x3C2E
+0x6C55 = 0x5D68
+0x6C57 = 0x3440
+0x6C5A = 0x3178
+0x6C5D = 0x4672
+0x6C5E = 0x5D67
+0x6C5F = 0x393E
+0x6C60 = 0x4353
+0x6C62 = 0x5D69
+0x6C68 = 0x5D71
+0x6C6A = 0x5D6A
+0x6C70 = 0x4241
+0x6C72 = 0x3562
+0x6C73 = 0x5D72
+0x6C7A = 0x3768
+0x6C7D = 0x3525
+0x6C7E = 0x5D70
+0x6C81 = 0x5D6E
+0x6C82 = 0x5D6B
+0x6C83 = 0x4D60
+0x6C88 = 0x4440
+0x6C8C = 0x4659
+0x6C8D = 0x5D6C
+0x6C90 = 0x5D74
+0x6C92 = 0x5D73
+0x6C93 = 0x3723
+0x6C96 = 0x322D
+0x6C99 = 0x3A3B
+0x6C9A = 0x5D6D
+0x6C9B = 0x5D6F
+0x6CA1 = 0x4B57
+0x6CA2 = 0x4274
+0x6CAB = 0x4B77
+0x6CAE = 0x5D7C
+0x6CB1 = 0x5D7D
+0x6CB3 = 0x324F
+0x6CB8 = 0x4A28
+0x6CB9 = 0x4C7D
+0x6CBA = 0x5E21
+0x6CBB = 0x3C23
+0x6CBC = 0x3E42
+0x6CBD = 0x5D78
+0x6CBE = 0x5D7E
+0x6CBF = 0x3168
+0x6CC1 = 0x3637
+0x6CC4 = 0x5D75
+0x6CC5 = 0x5D7A
+0x6CC9 = 0x4074
+0x6CCA = 0x4771
+0x6CCC = 0x4867
+0x6CD3 = 0x5D77
+0x6CD5 = 0x4B21
+0x6CD7 = 0x5D79
+0x6CD9 = 0x5E24
+0x6CDB = 0x5E22
+0x6CDD = 0x5D7B
+0x6CE1 = 0x4B22
+0x6CE2 = 0x4748
+0x6CE3 = 0x3563
+0x6CE5 = 0x4525
+0x6CE8 = 0x436D
+0x6CEA = 0x5E25
+0x6CEF = 0x5E23
+0x6CF0 = 0x4259
+0x6CF1 = 0x5D76
+0x6CF3 = 0x314B
+0x6D0B = 0x4D4E
+0x6D0C = 0x5E30
+0x6D12 = 0x5E2F
+0x6D17 = 0x4076
+0x6D19 = 0x5E2C
+0x6D1B = 0x4D6C
+0x6D1E = 0x4636
+0x6D1F = 0x5E26
+0x6D25 = 0x4445
+0x6D29 = 0x314C
+0x6D2A = 0x393F
+0x6D2B = 0x5E29
+0x6D32 = 0x3D27
+0x6D33 = 0x5E2E
+0x6D35 = 0x5E2D
+0x6D36 = 0x5E28
+0x6D38 = 0x5E2B
+0x6D3B = 0x3368
+0x6D3D = 0x5E2A
+0x6D3E = 0x4749
+0x6D41 = 0x4E2E
+0x6D44 = 0x3E74
+0x6D45 = 0x4075
+0x6D59 = 0x5E36
+0x6D5A = 0x5E34
+0x6D5C = 0x494D
+0x6D63 = 0x5E31
+0x6D64 = 0x5E33
+0x6D66 = 0x313A
+0x6D69 = 0x3940
+0x6D6A = 0x4F32
+0x6D6C = 0x333D
+0x6D6E = 0x4962
+0x6D74 = 0x4D61
+0x6D77 = 0x3324
+0x6D78 = 0x3F3B
+0x6D79 = 0x5E35
+0x6D85 = 0x5E3A
+0x6D88 = 0x3E43
+0x6D8C = 0x4D30
+0x6D8E = 0x5E37
+0x6D93 = 0x5E32
+0x6D95 = 0x5E38
+0x6D99 = 0x4E5E
+0x6D9B = 0x4573
+0x6D9C = 0x4642
+0x6DAF = 0x3336
+0x6DB2 = 0x3155
+0x6DB5 = 0x5E3E
+0x6DB8 = 0x5E41
+0x6DBC = 0x4E43
+0x6DC0 = 0x4D64
+0x6DC5 = 0x5E48
+0x6DC6 = 0x5E42
+0x6DC7 = 0x5E3F
+0x6DCB = 0x4E54
+0x6DCC = 0x5E45
+0x6DD1 = 0x3D4A
+0x6DD2 = 0x5E47
+0x6DD5 = 0x5E4C
+0x6DD8 = 0x4571
+0x6DD9 = 0x5E4A
+0x6DDE = 0x5E44
+0x6DE1 = 0x4338
+0x6DE4 = 0x5E4B
+0x6DE6 = 0x5E40
+0x6DE8 = 0x5E46
+0x6DEA = 0x5E4D
+0x6DEB = 0x307C
+0x6DEC = 0x5E43
+0x6DEE = 0x5E4E
+0x6DF1 = 0x3F3C
+0x6DF3 = 0x3D5F
+0x6DF5 = 0x4A25
+0x6DF7 = 0x3A2E
+0x6DF9 = 0x5E3B
+0x6DFA = 0x5E49
+0x6DFB = 0x453A
+0x6E05 = 0x4036
+0x6E07 = 0x3369
+0x6E08 = 0x3A51
+0x6E09 = 0x3E44
+0x6E0A = 0x5E3D
+0x6E0B = 0x3D42
+0x6E13 = 0x374C
+0x6E15 = 0x5E3C
+0x6E19 = 0x5E52
+0x6E1A = 0x3D6D
+0x6E1B = 0x383A
+0x6E1D = 0x5E61
+0x6E1F = 0x5E5B
+0x6E20 = 0x3574
+0x6E21 = 0x454F
+0x6E23 = 0x5E56
+0x6E24 = 0x5E5F
+0x6E25 = 0x302F
+0x6E26 = 0x3132
+0x6E29 = 0x3239
+0x6E2B = 0x5E58
+0x6E2C = 0x422C
+0x6E2D = 0x5E4F
+0x6E2E = 0x5E51
+0x6E2F = 0x3941
+0x6E38 = 0x5E62
+0x6E3A = 0x5E5D
+0x6E3E = 0x5E55
+0x6E43 = 0x5E5C
+0x6E4A = 0x4C2B
+0x6E4D = 0x5E5A
+0x6E4E = 0x5E5E
+0x6E56 = 0x3850
+0x6E58 = 0x3E45
+0x6E5B = 0x4339
+0x6E5F = 0x5E54
+0x6E67 = 0x4D2F
+0x6E6B = 0x5E57
+0x6E6E = 0x5E50
+0x6E6F = 0x4572
+0x6E72 = 0x5E53
+0x6E76 = 0x5E59
+0x6E7E = 0x4F51
+0x6E7F = 0x3C3E
+0x6E80 = 0x4B7E
+0x6E82 = 0x5E63
+0x6E8C = 0x482E
+0x6E8F = 0x5E6F
+0x6E90 = 0x383B
+0x6E96 = 0x3D60
+0x6E98 = 0x5E65
+0x6E9C = 0x4E2F
+0x6E9D = 0x3942
+0x6E9F = 0x5E72
+0x6EA2 = 0x306E
+0x6EA5 = 0x5E70
+0x6EAA = 0x5E64
+0x6EAF = 0x5E6A
+0x6EB2 = 0x5E6C
+0x6EB6 = 0x4D4F
+0x6EB7 = 0x5E67
+0x6EBA = 0x452E
+0x6EBD = 0x5E69
+0x6EC2 = 0x5E71
+0x6EC4 = 0x5E6B
+0x6EC5 = 0x4C47
+0x6EC9 = 0x5E66
+0x6ECB = 0x3C22
+0x6ECC = 0x5E7E
+0x6ED1 = 0x336A
+0x6ED3 = 0x5E68
+0x6ED4 = 0x5E6D
+0x6ED5 = 0x5E6E
+0x6EDD = 0x426C
+0x6EDE = 0x425A
+0x6EEC = 0x5E76
+0x6EEF = 0x5E7C
+0x6EF2 = 0x5E7A
+0x6EF4 = 0x4529
+0x6EF7 = 0x5F23
+0x6EF8 = 0x5E77
+0x6EFE = 0x5E78
+0x6EFF = 0x5E60
+0x6F01 = 0x3579
+0x6F02 = 0x493A
+0x6F06 = 0x3C3F
+0x6F09 = 0x3977
+0x6F0F = 0x4F33
+0x6F11 = 0x5E74
+0x6F13 = 0x5F22
+0x6F14 = 0x3169
+0x6F15 = 0x4166
+0x6F20 = 0x4779
+0x6F22 = 0x3441
+0x6F23 = 0x4E7A
+0x6F2B = 0x4C21
+0x6F2C = 0x4452
+0x6F31 = 0x5E7B
+0x6F32 = 0x5E7D
+0x6F38 = 0x4132
+0x6F3E = 0x5F21
+0x6F3F = 0x5E79
+0x6F41 = 0x5E73
+0x6F45 = 0x3443
+0x6F54 = 0x3769
+0x6F58 = 0x5F2F
+0x6F5B = 0x5F2A
+0x6F5C = 0x4078
+0x6F5F = 0x3363
+0x6F64 = 0x3D61
+0x6F66 = 0x5F33
+0x6F6D = 0x5F2C
+0x6F6E = 0x442C
+0x6F6F = 0x5F29
+0x6F70 = 0x4459
+0x6F74 = 0x5F4C
+0x6F78 = 0x5F26
+0x6F7A = 0x5F25
+0x6F7C = 0x5F2E
+0x6F80 = 0x5F28
+0x6F81 = 0x5F27
+0x6F82 = 0x5F2D
+0x6F84 = 0x4021
+0x6F86 = 0x5F24
+0x6F8E = 0x5F30
+0x6F91 = 0x5F31
+0x6F97 = 0x3442
+0x6FA1 = 0x5F36
+0x6FA3 = 0x5F35
+0x6FA4 = 0x5F37
+0x6FAA = 0x5F3A
+0x6FB1 = 0x4543
+0x6FB3 = 0x5F34
+0x6FB9 = 0x5F38
+0x6FC0 = 0x3763
+0x6FC1 = 0x4279
+0x6FC2 = 0x5F32
+0x6FC3 = 0x473B
+0x6FC6 = 0x5F39
+0x6FD4 = 0x5F3E
+0x6FD5 = 0x5F3C
+0x6FD8 = 0x5F3F
+0x6FDB = 0x5F42
+0x6FDF = 0x5F3B
+0x6FE0 = 0x396A
+0x6FE1 = 0x4728
+0x6FE4 = 0x5E39
+0x6FEB = 0x4D74
+0x6FEC = 0x5F3D
+0x6FEE = 0x5F41
+0x6FEF = 0x4275
+0x6FF1 = 0x5F40
+0x6FF3 = 0x5F2B
+0x6FF6 = 0x6F69
+0x6FFA = 0x5F45
+0x6FFE = 0x5F49
+0x7001 = 0x5F47
+0x7009 = 0x5F43
+0x700B = 0x5F44
+0x700F = 0x5F48
+0x7011 = 0x5F46
+0x7015 = 0x494E
+0x7018 = 0x5F4E
+0x701A = 0x5F4B
+0x701B = 0x5F4A
+0x701D = 0x5F4D
+0x701E = 0x4654
+0x701F = 0x5F4F
+0x7026 = 0x4375
+0x7027 = 0x426D
+0x702C = 0x4025
+0x7030 = 0x5F50
+0x7032 = 0x5F52
+0x703E = 0x5F51
+0x704C = 0x5E75
+0x7051 = 0x5F53
+0x7058 = 0x4667
+0x7063 = 0x5F54
+0x706B = 0x3250
+0x706F = 0x4574
+0x7070 = 0x3325
+0x7078 = 0x3564
+0x707C = 0x3C5E
+0x707D = 0x3A52
+0x7089 = 0x4F27
+0x708A = 0x3F66
+0x708E = 0x316A
+0x7092 = 0x5F56
+0x7099 = 0x5F55
+0x70AC = 0x5F59
+0x70AD = 0x433A
+0x70AE = 0x5F5C
+0x70AF = 0x5F57
+0x70B3 = 0x5F5B
+0x70B8 = 0x5F5A
+0x70B9 = 0x4540
+0x70BA = 0x3059
+0x70C8 = 0x4E75
+0x70CB = 0x5F5E
+0x70CF = 0x3128
+0x70D9 = 0x5F60
+0x70DD = 0x5F5F
+0x70DF = 0x5F5D
+0x70F1 = 0x5F58
+0x70F9 = 0x4B23
+0x70FD = 0x5F62
+0x7109 = 0x5F61
+0x7114 = 0x316B
+0x7119 = 0x5F64
+0x711A = 0x4A32
+0x711C = 0x5F63
+0x7121 = 0x4C35
+0x7126 = 0x3E47
+0x7136 = 0x4133
+0x713C = 0x3E46
+0x7149 = 0x4E7B
+0x714C = 0x5F6A
+0x714E = 0x4079
+0x7155 = 0x5F66
+0x7156 = 0x5F6B
+0x7159 = 0x316C
+0x7162 = 0x5F69
+0x7164 = 0x4761
+0x7165 = 0x5F65
+0x7166 = 0x5F68
+0x7167 = 0x3E48
+0x7169 = 0x4851
+0x716C = 0x5F6C
+0x716E = 0x3C51
+0x717D = 0x407A
+0x7184 = 0x5F6F
+0x7188 = 0x5F67
+0x718A = 0x3727
+0x718F = 0x5F6D
+0x7194 = 0x4D50
+0x7195 = 0x5F70
+0x7199 = 0x7426
+0x719F = 0x3D4F
+0x71A8 = 0x5F71
+0x71AC = 0x5F72
+0x71B1 = 0x472E
+0x71B9 = 0x5F74
+0x71BE = 0x5F75
+0x71C3 = 0x4733
+0x71C8 = 0x4575
+0x71C9 = 0x5F77
+0x71CE = 0x5F79
+0x71D0 = 0x4E55
+0x71D2 = 0x5F76
+0x71D4 = 0x5F78
+0x71D5 = 0x316D
+0x71D7 = 0x5F73
+0x71DF = 0x535B
+0x71E0 = 0x5F7A
+0x71E5 = 0x4167
+0x71E6 = 0x3B38
+0x71E7 = 0x5F7C
+0x71EC = 0x5F7B
+0x71ED = 0x3F24
+0x71EE = 0x5259
+0x71F5 = 0x5F7D
+0x71F9 = 0x6021
+0x71FB = 0x5F6E
+0x71FC = 0x5F7E
+0x71FF = 0x6022
+0x7206 = 0x477A
+0x720D = 0x6023
+0x7210 = 0x6024
+0x721B = 0x6025
+0x7228 = 0x6026
+0x722A = 0x445E
+0x722C = 0x6028
+0x722D = 0x6027
+0x7230 = 0x6029
+0x7232 = 0x602A
+0x7235 = 0x3C5F
+0x7236 = 0x4963
+0x723A = 0x4C6C
+0x723B = 0x602B
+0x723C = 0x602C
+0x723D = 0x4156
+0x723E = 0x3C24
+0x723F = 0x602D
+0x7240 = 0x602E
+0x7246 = 0x602F
+0x7247 = 0x4A52
+0x7248 = 0x4847
+0x724B = 0x6030
+0x724C = 0x4757
+0x7252 = 0x442D
+0x7258 = 0x6031
+0x7259 = 0x3267
+0x725B = 0x356D
+0x725D = 0x4C46
+0x725F = 0x4C36
+0x7261 = 0x3234
+0x7262 = 0x4F34
+0x7267 = 0x4B52
+0x7269 = 0x4A2A
+0x7272 = 0x4037
+0x7274 = 0x6032
+0x7279 = 0x4643
+0x727D = 0x3823
+0x727E = 0x6033
+0x7280 = 0x3A54
+0x7281 = 0x6035
+0x7282 = 0x6034
+0x7287 = 0x6036
+0x7292 = 0x6037
+0x7296 = 0x6038
+0x72A0 = 0x353E
+0x72A2 = 0x6039
+0x72A7 = 0x603A
+0x72AC = 0x3824
+0x72AF = 0x4848
+0x72B2 = 0x603C
+0x72B6 = 0x3E75
+0x72B9 = 0x603B
+0x72C2 = 0x3638
+0x72C3 = 0x603D
+0x72C4 = 0x603F
+0x72C6 = 0x603E
+0x72CE = 0x6040
+0x72D0 = 0x3851
+0x72D2 = 0x6041
+0x72D7 = 0x3669
+0x72D9 = 0x4140
+0x72DB = 0x397D
+0x72E0 = 0x6043
+0x72E1 = 0x6044
+0x72E2 = 0x6042
+0x72E9 = 0x3C6D
+0x72EC = 0x4648
+0x72ED = 0x3639
+0x72F7 = 0x6046
+0x72F8 = 0x432C
+0x72F9 = 0x6045
+0x72FC = 0x4F35
+0x72FD = 0x4762
+0x730A = 0x6049
+0x7316 = 0x604B
+0x7317 = 0x6048
+0x731B = 0x4C54
+0x731C = 0x604A
+0x731D = 0x604C
+0x731F = 0x4E44
+0x7325 = 0x6050
+0x7329 = 0x604F
+0x732A = 0x4376
+0x732B = 0x472D
+0x732E = 0x3825
+0x732F = 0x604E
+0x7334 = 0x604D
+0x7336 = 0x4D31
+0x7337 = 0x4D32
+0x733E = 0x6051
+0x733F = 0x316E
+0x7344 = 0x3976
+0x7345 = 0x3B62
+0x734E = 0x6052
+0x734F = 0x6053
+0x7357 = 0x6055
+0x7363 = 0x3D43
+0x7368 = 0x6057
+0x736A = 0x6056
+0x7370 = 0x6058
+0x7372 = 0x334D
+0x7375 = 0x605A
+0x7378 = 0x6059
+0x737A = 0x605C
+0x737B = 0x605B
+0x7384 = 0x383C
+0x7387 = 0x4E28
+0x7389 = 0x364C
+0x738B = 0x3226
+0x7396 = 0x366A
+0x73A9 = 0x3461
+0x73B2 = 0x4E68
+0x73B3 = 0x605E
+0x73BB = 0x6060
+0x73C0 = 0x6061
+0x73C2 = 0x3251
+0x73C8 = 0x605D
+0x73CA = 0x3B39
+0x73CD = 0x4441
+0x73CE = 0x605F
+0x73DE = 0x6064
+0x73E0 = 0x3C6E
+0x73E5 = 0x6062
+0x73EA = 0x373E
+0x73ED = 0x4849
+0x73EE = 0x6063
+0x73F1 = 0x607E
+0x73F8 = 0x6069
+0x73FE = 0x383D
+0x7403 = 0x3565
+0x7405 = 0x6066
+0x7406 = 0x4D7D
+0x7409 = 0x4E30
+0x7422 = 0x4276
+0x7425 = 0x6068
+0x7432 = 0x606A
+0x7433 = 0x4E56
+0x7434 = 0x3657
+0x7435 = 0x487C
+0x7436 = 0x474A
+0x743A = 0x606B
+0x743F = 0x606D
+0x7441 = 0x6070
+0x7455 = 0x606C
+0x7459 = 0x606F
+0x745A = 0x386A
+0x745B = 0x314D
+0x745C = 0x6071
+0x745E = 0x3F70
+0x745F = 0x606E
+0x7460 = 0x4E5C
+0x7463 = 0x6074
+0x7464 = 0x7424
+0x7469 = 0x6072
+0x746A = 0x6075
+0x746F = 0x6067
+0x7470 = 0x6073
+0x7473 = 0x3A3C
+0x7476 = 0x6076
+0x747E = 0x6077
+0x7483 = 0x4D7E
+0x748B = 0x6078
+0x749E = 0x6079
+0x74A2 = 0x6065
+0x74A7 = 0x607A
+0x74B0 = 0x3444
+0x74BD = 0x3C25
+0x74CA = 0x607B
+0x74CF = 0x607C
+0x74D4 = 0x607D
+0x74DC = 0x313B
+0x74E0 = 0x6121
+0x74E2 = 0x493B
+0x74E3 = 0x6122
+0x74E6 = 0x3424
+0x74E7 = 0x6123
+0x74E9 = 0x6124
+0x74EE = 0x6125
+0x74F0 = 0x6127
+0x74F1 = 0x6128
+0x74F2 = 0x6126
+0x74F6 = 0x4953
+0x74F7 = 0x612A
+0x74F8 = 0x6129
+0x7503 = 0x612C
+0x7504 = 0x612B
+0x7505 = 0x612D
+0x750C = 0x612E
+0x750D = 0x6130
+0x750E = 0x612F
+0x7511 = 0x3979
+0x7513 = 0x6132
+0x7515 = 0x6131
+0x7518 = 0x3445
+0x751A = 0x3F53
+0x751C = 0x453C
+0x751E = 0x6133
+0x751F = 0x4038
+0x7523 = 0x3B3A
+0x7525 = 0x3179
+0x7526 = 0x6134
+0x7528 = 0x4D51
+0x752B = 0x4A63
+0x752C = 0x6135
+0x7530 = 0x4544
+0x7531 = 0x4D33
+0x7532 = 0x3943
+0x7533 = 0x3F3D
+0x7537 = 0x434B
+0x7538 = 0x5234
+0x753A = 0x442E
+0x753B = 0x3268
+0x753C = 0x6136
+0x7544 = 0x6137
+0x7546 = 0x613C
+0x7549 = 0x613A
+0x754A = 0x6139
+0x754B = 0x5A42
+0x754C = 0x3326
+0x754D = 0x6138
+0x754F = 0x305A
+0x7551 = 0x482A
+0x7554 = 0x484A
+0x7559 = 0x4E31
+0x755A = 0x613D
+0x755B = 0x613B
+0x755C = 0x435C
+0x755D = 0x4026
+0x7560 = 0x482B
+0x7562 = 0x492D
+0x7564 = 0x613F
+0x7565 = 0x4E2C
+0x7566 = 0x374D
+0x7567 = 0x6140
+0x7569 = 0x613E
+0x756A = 0x4856
+0x756B = 0x6141
+0x756D = 0x6142
+0x7570 = 0x305B
+0x7573 = 0x3E76
+0x7574 = 0x6147
+0x7576 = 0x6144
+0x7577 = 0x466D
+0x7578 = 0x6143
+0x757F = 0x3526
+0x7582 = 0x614A
+0x7586 = 0x6145
+0x7587 = 0x6146
+0x7589 = 0x6149
+0x758A = 0x6148
+0x758B = 0x4925
+0x758E = 0x4142
+0x758F = 0x4141
+0x7591 = 0x353F
+0x7594 = 0x614B
+0x759A = 0x614C
+0x759D = 0x614D
+0x75A3 = 0x614F
+0x75A5 = 0x614E
+0x75AB = 0x3156
+0x75B1 = 0x6157
+0x75B2 = 0x4868
+0x75B3 = 0x6151
+0x75B5 = 0x6153
+0x75B8 = 0x6155
+0x75B9 = 0x3F3E
+0x75BC = 0x6156
+0x75BD = 0x6154
+0x75BE = 0x3C40
+0x75C2 = 0x6150
+0x75C3 = 0x6152
+0x75C5 = 0x4942
+0x75C7 = 0x3E49
+0x75CA = 0x6159
+0x75CD = 0x6158
+0x75D2 = 0x615A
+0x75D4 = 0x3C26
+0x75D5 = 0x3A2F
+0x75D8 = 0x4577
+0x75D9 = 0x615B
+0x75DB = 0x444B
+0x75DE = 0x615D
+0x75E2 = 0x4E21
+0x75E3 = 0x615C
+0x75E9 = 0x4169
+0x75F0 = 0x6162
+0x75F2 = 0x6164
+0x75F3 = 0x6165
+0x75F4 = 0x4354
+0x75FA = 0x6163
+0x75FC = 0x6160
+0x75FE = 0x615E
+0x75FF = 0x615F
+0x7601 = 0x6161
+0x7609 = 0x6168
+0x760B = 0x6166
+0x760D = 0x6167
+0x761F = 0x6169
+0x7620 = 0x616B
+0x7621 = 0x616C
+0x7622 = 0x616D
+0x7624 = 0x616E
+0x7627 = 0x616A
+0x7630 = 0x6170
+0x7634 = 0x616F
+0x763B = 0x6171
+0x7642 = 0x4E45
+0x7646 = 0x6174
+0x7647 = 0x6172
+0x7648 = 0x6173
+0x764C = 0x3462
+0x7652 = 0x4C7E
+0x7656 = 0x4A4A
+0x7658 = 0x6176
+0x765C = 0x6175
+0x7661 = 0x6177
+0x7662 = 0x6178
+0x7667 = 0x617C
+0x7668 = 0x6179
+0x7669 = 0x617A
+0x766A = 0x617B
+0x766C = 0x617D
+0x7670 = 0x617E
+0x7672 = 0x6221
+0x7676 = 0x6222
+0x7678 = 0x6223
+0x767A = 0x482F
+0x767B = 0x4550
+0x767C = 0x6224
+0x767D = 0x4772
+0x767E = 0x4934
+0x7680 = 0x6225
+0x7683 = 0x6226
+0x7684 = 0x452A
+0x7686 = 0x3327
+0x7687 = 0x3944
+0x7688 = 0x6227
+0x768B = 0x6228
+0x768E = 0x6229
+0x7690 = 0x3B29
+0x7693 = 0x622B
+0x7696 = 0x622A
+0x7699 = 0x622C
+0x769A = 0x622D
+0x76AE = 0x4869
+0x76B0 = 0x622E
+0x76B4 = 0x622F
+0x76B7 = 0x7369
+0x76B8 = 0x6230
+0x76B9 = 0x6231
+0x76BA = 0x6232
+0x76BF = 0x3B2E
+0x76C2 = 0x6233
+0x76C3 = 0x4756
+0x76C6 = 0x4B5F
+0x76C8 = 0x314E
+0x76CA = 0x3157
+0x76CD = 0x6234
+0x76D2 = 0x6236
+0x76D6 = 0x6235
+0x76D7 = 0x4570
+0x76DB = 0x4039
+0x76DC = 0x5D39
+0x76DE = 0x6237
+0x76DF = 0x4C41
+0x76E1 = 0x6238
+0x76E3 = 0x3446
+0x76E4 = 0x4857
+0x76E5 = 0x6239
+0x76E7 = 0x623A
+0x76EA = 0x623B
+0x76EE = 0x4C5C
+0x76F2 = 0x4C55
+0x76F4 = 0x443E
+0x76F8 = 0x416A
+0x76FB = 0x623D
+0x76FE = 0x3D62
+0x7701 = 0x3E4A
+0x7704 = 0x6240
+0x7707 = 0x623F
+0x7708 = 0x623E
+0x7709 = 0x487D
+0x770B = 0x3447
+0x770C = 0x3829
+0x771B = 0x6246
+0x771E = 0x6243
+0x771F = 0x3F3F
+0x7720 = 0x4C32
+0x7724 = 0x6242
+0x7725 = 0x6244
+0x7726 = 0x6245
+0x7729 = 0x6241
+0x7737 = 0x6247
+0x7738 = 0x6248
+0x773A = 0x442F
+0x773C = 0x3463
+0x7740 = 0x4365
+0x7747 = 0x6249
+0x775A = 0x624A
+0x775B = 0x624D
+0x7761 = 0x3F67
+0x7763 = 0x4644
+0x7765 = 0x624E
+0x7766 = 0x4B53
+0x7768 = 0x624B
+0x776B = 0x624C
+0x7779 = 0x6251
+0x777E = 0x6250
+0x777F = 0x624F
+0x778B = 0x6253
+0x778E = 0x6252
+0x7791 = 0x6254
+0x779E = 0x6256
+0x77A0 = 0x6255
+0x77A5 = 0x4A4D
+0x77AC = 0x3D56
+0x77AD = 0x4E46
+0x77B0 = 0x6257
+0x77B3 = 0x4637
+0x77B6 = 0x6258
+0x77B9 = 0x6259
+0x77BB = 0x625D
+0x77BC = 0x625B
+0x77BD = 0x625C
+0x77BF = 0x625A
+0x77C7 = 0x625E
+0x77CD = 0x625F
+0x77D7 = 0x6260
+0x77DA = 0x6261
+0x77DB = 0x4C37
+0x77DC = 0x6262
+0x77E2 = 0x4C70
+0x77E3 = 0x6263
+0x77E5 = 0x434E
+0x77E7 = 0x476A
+0x77E9 = 0x366B
+0x77ED = 0x433B
+0x77EE = 0x6264
+0x77EF = 0x363A
+0x77F3 = 0x4050
+0x77FC = 0x6265
+0x7802 = 0x3A3D
+0x780C = 0x6266
+0x7812 = 0x6267
+0x7814 = 0x3826
+0x7815 = 0x3A55
+0x7820 = 0x6269
+0x7825 = 0x4556
+0x7826 = 0x3A56
+0x7827 = 0x354E
+0x7832 = 0x4B24
+0x7834 = 0x474B
+0x783A = 0x4557
+0x783F = 0x395C
+0x7845 = 0x626B
+0x785D = 0x3E4B
+0x786B = 0x4E32
+0x786C = 0x3945
+0x786F = 0x3827
+0x7872 = 0x4823
+0x7874 = 0x626D
+0x787C = 0x626F
+0x7881 = 0x386B
+0x7886 = 0x626E
+0x7887 = 0x4476
+0x788C = 0x6271
+0x788D = 0x3337
+0x788E = 0x626C
+0x7891 = 0x486A
+0x7893 = 0x3130
+0x7895 = 0x3A6C
+0x7897 = 0x4F52
+0x789A = 0x6270
+0x78A3 = 0x6272
+0x78A7 = 0x4A4B
+0x78A9 = 0x4059
+0x78AA = 0x6274
+0x78AF = 0x6275
+0x78B5 = 0x6273
+0x78BA = 0x334E
+0x78BC = 0x627B
+0x78BE = 0x627A
+0x78C1 = 0x3C27
+0x78C5 = 0x627C
+0x78C6 = 0x6277
+0x78CA = 0x627D
+0x78CB = 0x6278
+0x78D0 = 0x4858
+0x78D1 = 0x6276
+0x78D4 = 0x6279
+0x78DA = 0x6322
+0x78E7 = 0x6321
+0x78E8 = 0x4B61
+0x78EC = 0x627E
+0x78EF = 0x306B
+0x78F4 = 0x6324
+0x78FD = 0x6323
+0x7901 = 0x3E4C
+0x7907 = 0x6325
+0x790E = 0x4143
+0x7911 = 0x6327
+0x7912 = 0x6326
+0x7919 = 0x6328
+0x7926 = 0x6268
+0x792A = 0x626A
+0x792B = 0x632A
+0x792C = 0x6329
+0x793A = 0x3C28
+0x793C = 0x4E69
+0x793E = 0x3C52
+0x7940 = 0x632B
+0x7941 = 0x3737
+0x7947 = 0x3540
+0x7948 = 0x3527
+0x7949 = 0x3B63
+0x7950 = 0x4D34
+0x7953 = 0x6331
+0x7955 = 0x6330
+0x7956 = 0x4144
+0x7957 = 0x632D
+0x795A = 0x632F
+0x795D = 0x3D4B
+0x795E = 0x3F40
+0x795F = 0x632E
+0x7960 = 0x632C
+0x7962 = 0x472A
+0x7965 = 0x3E4D
+0x7968 = 0x493C
+0x796D = 0x3A57
+0x7977 = 0x4578
+0x797A = 0x6332
+0x797F = 0x6333
+0x7980 = 0x6349
+0x7981 = 0x3658
+0x7984 = 0x4F3D
+0x7985 = 0x4135
+0x798A = 0x6334
+0x798D = 0x3252
+0x798E = 0x4477
+0x798F = 0x4A21
+0x799D = 0x6335
+0x79A6 = 0x357A
+0x79A7 = 0x6336
+0x79AA = 0x6338
+0x79AE = 0x6339
+0x79B0 = 0x4729
+0x79B3 = 0x633A
+0x79B9 = 0x633B
+0x79BA = 0x633C
+0x79BD = 0x3659
+0x79BE = 0x3253
+0x79BF = 0x4645
+0x79C0 = 0x3D28
+0x79C1 = 0x3B64
+0x79C9 = 0x633D
+0x79CB = 0x3D29
+0x79D1 = 0x324A
+0x79D2 = 0x4943
+0x79D5 = 0x633E
+0x79D8 = 0x486B
+0x79DF = 0x4145
+0x79E1 = 0x6341
+0x79E3 = 0x6342
+0x79E4 = 0x4769
+0x79E6 = 0x3F41
+0x79E7 = 0x633F
+0x79E9 = 0x4361
+0x79EC = 0x6340
+0x79F0 = 0x3E4E
+0x79FB = 0x305C
+0x7A00 = 0x3529
+0x7A08 = 0x6343
+0x7A0B = 0x4478
+0x7A0D = 0x6344
+0x7A0E = 0x4047
+0x7A14 = 0x4C2D
+0x7A17 = 0x4923
+0x7A18 = 0x6345
+0x7A19 = 0x6346
+0x7A1A = 0x4355
+0x7A1C = 0x4E47
+0x7A1F = 0x6348
+0x7A20 = 0x6347
+0x7A2E = 0x3C6F
+0x7A31 = 0x634A
+0x7A32 = 0x3070
+0x7A37 = 0x634D
+0x7A3B = 0x634B
+0x7A3C = 0x3254
+0x7A3D = 0x374E
+0x7A3E = 0x634C
+0x7A3F = 0x3946
+0x7A40 = 0x3972
+0x7A42 = 0x4A66
+0x7A43 = 0x634E
+0x7A46 = 0x4B54
+0x7A49 = 0x6350
+0x7A4D = 0x4051
+0x7A4E = 0x314F
+0x7A4F = 0x323A
+0x7A50 = 0x302C
+0x7A57 = 0x634F
+0x7A61 = 0x6351
+0x7A62 = 0x6352
+0x7A63 = 0x3E77
+0x7A69 = 0x6353
+0x7A6B = 0x334F
+0x7A70 = 0x6355
+0x7A74 = 0x376A
+0x7A76 = 0x3566
+0x7A79 = 0x6356
+0x7A7A = 0x3675
+0x7A7D = 0x6357
+0x7A7F = 0x407C
+0x7A81 = 0x464D
+0x7A83 = 0x4060
+0x7A84 = 0x3A75
+0x7A88 = 0x6358
+0x7A92 = 0x4362
+0x7A93 = 0x416B
+0x7A95 = 0x635A
+0x7A96 = 0x635C
+0x7A97 = 0x6359
+0x7A98 = 0x635B
+0x7A9F = 0x3722
+0x7AA9 = 0x635D
+0x7AAA = 0x3726
+0x7AAE = 0x3567
+0x7AAF = 0x4D52
+0x7AB0 = 0x635F
+0x7AB6 = 0x6360
+0x7ABA = 0x312E
+0x7ABF = 0x6363
+0x7AC3 = 0x3376
+0x7AC4 = 0x6362
+0x7AC5 = 0x6361
+0x7AC7 = 0x6365
+0x7AC8 = 0x635E
+0x7ACA = 0x6366
+0x7ACB = 0x4E29
+0x7ACD = 0x6367
+0x7ACF = 0x6368
+0x7AD2 = 0x5474
+0x7AD3 = 0x636A
+0x7AD5 = 0x6369
+0x7AD9 = 0x636B
+0x7ADA = 0x636C
+0x7ADC = 0x4E35
+0x7ADD = 0x636D
+0x7ADF = 0x706F
+0x7AE0 = 0x3E4F
+0x7AE1 = 0x636E
+0x7AE2 = 0x636F
+0x7AE3 = 0x3D57
+0x7AE5 = 0x4638
+0x7AE6 = 0x6370
+0x7AEA = 0x4328
+0x7AED = 0x6371
+0x7AEF = 0x433C
+0x7AF0 = 0x6372
+0x7AF6 = 0x3625
+0x7AF8 = 0x513F
+0x7AF9 = 0x435D
+0x7AFA = 0x3C33
+0x7AFF = 0x3448
+0x7B02 = 0x6373
+0x7B04 = 0x6422
+0x7B06 = 0x6376
+0x7B08 = 0x3568
+0x7B0A = 0x6375
+0x7B0B = 0x6424
+0x7B0F = 0x6374
+0x7B11 = 0x3E50
+0x7B18 = 0x6378
+0x7B19 = 0x6379
+0x7B1B = 0x452B
+0x7B1E = 0x637A
+0x7B20 = 0x335E
+0x7B25 = 0x3F5A
+0x7B26 = 0x4964
+0x7B28 = 0x637C
+0x7B2C = 0x4268
+0x7B33 = 0x6377
+0x7B35 = 0x637B
+0x7B36 = 0x637D
+0x7B39 = 0x3A7B
+0x7B45 = 0x6426
+0x7B46 = 0x492E
+0x7B48 = 0x4826
+0x7B49 = 0x4579
+0x7B4B = 0x365A
+0x7B4C = 0x6425
+0x7B4D = 0x6423
+0x7B4F = 0x4835
+0x7B50 = 0x637E
+0x7B51 = 0x435E
+0x7B52 = 0x457B
+0x7B54 = 0x457A
+0x7B56 = 0x3A76
+0x7B5D = 0x6438
+0x7B65 = 0x6428
+0x7B67 = 0x642A
+0x7B6C = 0x642D
+0x7B6E = 0x642E
+0x7B70 = 0x642B
+0x7B71 = 0x642C
+0x7B74 = 0x6429
+0x7B75 = 0x6427
+0x7B7A = 0x6421
+0x7B86 = 0x4A4F
+0x7B87 = 0x3255
+0x7B8B = 0x6435
+0x7B8D = 0x6432
+0x7B8F = 0x6437
+0x7B92 = 0x6436
+0x7B94 = 0x4773
+0x7B95 = 0x4C27
+0x7B97 = 0x3B3B
+0x7B98 = 0x6430
+0x7B99 = 0x6439
+0x7B9A = 0x6434
+0x7B9C = 0x6433
+0x7B9D = 0x642F
+0x7B9F = 0x6431
+0x7BA1 = 0x3449
+0x7BAA = 0x433D
+0x7BAD = 0x407D
+0x7BB1 = 0x4822
+0x7BB4 = 0x643E
+0x7BB8 = 0x4824
+0x7BC0 = 0x4061
+0x7BC1 = 0x643B
+0x7BC4 = 0x484F
+0x7BC6 = 0x643F
+0x7BC7 = 0x4A53
+0x7BC9 = 0x435B
+0x7BCB = 0x643A
+0x7BCC = 0x643C
+0x7BCF = 0x643D
+0x7BDD = 0x6440
+0x7BE0 = 0x3C44
+0x7BE4 = 0x4646
+0x7BE5 = 0x6445
+0x7BE6 = 0x6444
+0x7BE9 = 0x6441
+0x7BED = 0x4F36
+0x7BF3 = 0x644A
+0x7BF6 = 0x644E
+0x7BF7 = 0x644B
+0x7C00 = 0x6447
+0x7C07 = 0x6448
+0x7C0D = 0x644D
+0x7C11 = 0x6442
+0x7C12 = 0x5255
+0x7C13 = 0x6449
+0x7C14 = 0x6443
+0x7C17 = 0x644C
+0x7C1F = 0x6452
+0x7C21 = 0x344A
+0x7C23 = 0x644F
+0x7C27 = 0x6450
+0x7C2A = 0x6451
+0x7C2B = 0x6454
+0x7C37 = 0x6453
+0x7C38 = 0x4876
+0x7C3D = 0x6455
+0x7C3E = 0x4E7C
+0x7C3F = 0x4A6D
+0x7C40 = 0x645A
+0x7C43 = 0x6457
+0x7C4C = 0x6456
+0x7C4D = 0x4052
+0x7C4F = 0x6459
+0x7C50 = 0x645B
+0x7C54 = 0x6458
+0x7C56 = 0x645F
+0x7C58 = 0x645C
+0x7C5F = 0x645D
+0x7C60 = 0x6446
+0x7C64 = 0x645E
+0x7C65 = 0x6460
+0x7C6C = 0x6461
+0x7C73 = 0x4A46
+0x7C75 = 0x6462
+0x7C7E = 0x4C62
+0x7C81 = 0x364E
+0x7C82 = 0x3729
+0x7C83 = 0x6463
+0x7C89 = 0x4A34
+0x7C8B = 0x3F68
+0x7C8D = 0x4C30
+0x7C90 = 0x6464
+0x7C92 = 0x4E33
+0x7C95 = 0x4774
+0x7C97 = 0x4146
+0x7C98 = 0x4734
+0x7C9B = 0x3D4D
+0x7C9F = 0x3040
+0x7CA1 = 0x6469
+0x7CA2 = 0x6467
+0x7CA4 = 0x6465
+0x7CA5 = 0x3421
+0x7CA7 = 0x3E51
+0x7CA8 = 0x646A
+0x7CAB = 0x6468
+0x7CAD = 0x6466
+0x7CAE = 0x646E
+0x7CB1 = 0x646D
+0x7CB2 = 0x646C
+0x7CB3 = 0x646B
+0x7CB9 = 0x646F
+0x7CBD = 0x6470
+0x7CBE = 0x403A
+0x7CC0 = 0x6471
+0x7CC2 = 0x6473
+0x7CC5 = 0x6472
+0x7CCA = 0x3852
+0x7CCE = 0x4138
+0x7CD2 = 0x6475
+0x7CD6 = 0x457C
+0x7CD8 = 0x6474
+0x7CDC = 0x6476
+0x7CDE = 0x4A35
+0x7CDF = 0x416C
+0x7CE0 = 0x3947
+0x7CE2 = 0x6477
+0x7CE7 = 0x4E48
+0x7CEF = 0x6479
+0x7CF2 = 0x647A
+0x7CF4 = 0x647B
+0x7CF6 = 0x647C
+0x7CF8 = 0x3B65
+0x7CFA = 0x647D
+0x7CFB = 0x374F
+0x7CFE = 0x356A
+0x7D00 = 0x352A
+0x7D02 = 0x6521
+0x7D04 = 0x4C73
+0x7D05 = 0x3948
+0x7D06 = 0x647E
+0x7D0A = 0x6524
+0x7D0B = 0x4C66
+0x7D0D = 0x473C
+0x7D10 = 0x4933
+0x7D14 = 0x3D63
+0x7D15 = 0x6523
+0x7D17 = 0x3C53
+0x7D18 = 0x3949
+0x7D19 = 0x3B66
+0x7D1A = 0x3569
+0x7D1B = 0x4A36
+0x7D1C = 0x6522
+0x7D20 = 0x4147
+0x7D21 = 0x4B42
+0x7D22 = 0x3A77
+0x7D2B = 0x3B67
+0x7D2C = 0x445D
+0x7D2E = 0x6527
+0x7D2F = 0x4E5F
+0x7D30 = 0x3A59
+0x7D32 = 0x6528
+0x7D33 = 0x3F42
+0x7D35 = 0x652A
+0x7D39 = 0x3E52
+0x7D3A = 0x3A30
+0x7D3F = 0x6529
+0x7D42 = 0x3D2A
+0x7D43 = 0x383E
+0x7D44 = 0x4148
+0x7D45 = 0x6525
+0x7D46 = 0x652B
+0x7D4B = 0x6526
+0x7D4C = 0x3750
+0x7D4E = 0x652E
+0x7D4F = 0x6532
+0x7D50 = 0x376B
+0x7D56 = 0x652D
+0x7D5B = 0x6536
+0x7D5E = 0x394A
+0x7D61 = 0x4D6D
+0x7D62 = 0x303C
+0x7D63 = 0x6533
+0x7D66 = 0x356B
+0x7D68 = 0x6530
+0x7D6E = 0x6531
+0x7D71 = 0x457D
+0x7D72 = 0x652F
+0x7D73 = 0x652C
+0x7D75 = 0x3328
+0x7D76 = 0x4064
+0x7D79 = 0x3828
+0x7D7D = 0x6538
+0x7D89 = 0x6535
+0x7D8F = 0x6537
+0x7D93 = 0x6534
+0x7D99 = 0x3751
+0x7D9A = 0x4233
+0x7D9B = 0x6539
+0x7D9C = 0x416E
+0x7D9F = 0x6546
+0x7DA2 = 0x6542
+0x7DA3 = 0x653C
+0x7DAB = 0x6540
+0x7DAC = 0x3C7A
+0x7DAD = 0x305D
+0x7DAE = 0x653B
+0x7DAF = 0x6543
+0x7DB0 = 0x6547
+0x7DB1 = 0x394B
+0x7DB2 = 0x4C56
+0x7DB4 = 0x4456
+0x7DB5 = 0x653D
+0x7DB8 = 0x6545
+0x7DBA = 0x653A
+0x7DBB = 0x433E
+0x7DBD = 0x653F
+0x7DBE = 0x303D
+0x7DBF = 0x4C4A
+0x7DC7 = 0x653E
+0x7DCA = 0x365B
+0x7DCB = 0x486C
+0x7DCF = 0x416D
+0x7DD1 = 0x4E50
+0x7DD2 = 0x3D6F
+0x7DD5 = 0x656E
+0x7DD8 = 0x6548
+0x7DDA = 0x407E
+0x7DDC = 0x6544
+0x7DDD = 0x6549
+0x7DDE = 0x654B
+0x7DE0 = 0x4479
+0x7DE1 = 0x654E
+0x7DE4 = 0x654A
+0x7DE8 = 0x4A54
+0x7DE9 = 0x344B
+0x7DEC = 0x4C4B
+0x7DEF = 0x305E
+0x7DF2 = 0x654D
+0x7DF4 = 0x4E7D
+0x7DFB = 0x654C
+0x7E01 = 0x316F
+0x7E04 = 0x466C
+0x7E05 = 0x654F
+0x7E09 = 0x6556
+0x7E0A = 0x6550
+0x7E0B = 0x6557
+0x7E12 = 0x6553
+0x7E1B = 0x477B
+0x7E1E = 0x3C4A
+0x7E1F = 0x6555
+0x7E21 = 0x6552
+0x7E22 = 0x6558
+0x7E23 = 0x6551
+0x7E26 = 0x3D44
+0x7E2B = 0x4B25
+0x7E2E = 0x3D4C
+0x7E31 = 0x6554
+0x7E32 = 0x6560
+0x7E35 = 0x655C
+0x7E37 = 0x655F
+0x7E39 = 0x655D
+0x7E3A = 0x6561
+0x7E3B = 0x655B
+0x7E3D = 0x6541
+0x7E3E = 0x4053
+0x7E41 = 0x484B
+0x7E43 = 0x655E
+0x7E46 = 0x6559
+0x7E4A = 0x4121
+0x7E4B = 0x3752
+0x7E4D = 0x3D2B
+0x7E54 = 0x3F25
+0x7E55 = 0x4136
+0x7E56 = 0x6564
+0x7E59 = 0x6566
+0x7E5A = 0x6567
+0x7E5D = 0x6563
+0x7E5E = 0x6565
+0x7E66 = 0x655A
+0x7E67 = 0x6562
+0x7E69 = 0x656A
+0x7E6A = 0x6569
+0x7E6D = 0x4B7A
+0x7E70 = 0x372B
+0x7E79 = 0x6568
+0x7E7B = 0x656C
+0x7E7C = 0x656B
+0x7E7D = 0x656F
+0x7E7F = 0x6571
+0x7E82 = 0x3B3C
+0x7E83 = 0x656D
+0x7E88 = 0x6572
+0x7E89 = 0x6573
+0x7E8C = 0x6574
+0x7E8E = 0x657A
+0x7E8F = 0x453B
+0x7E90 = 0x6576
+0x7E92 = 0x6575
+0x7E93 = 0x6577
+0x7E94 = 0x6578
+0x7E96 = 0x6579
+0x7E9B = 0x657B
+0x7E9C = 0x657C
+0x7F36 = 0x344C
+0x7F38 = 0x657D
+0x7F3A = 0x657E
+0x7F45 = 0x6621
+0x7F4C = 0x6622
+0x7F4D = 0x6623
+0x7F4E = 0x6624
+0x7F50 = 0x6625
+0x7F51 = 0x6626
+0x7F54 = 0x6628
+0x7F55 = 0x6627
+0x7F58 = 0x6629
+0x7F5F = 0x662A
+0x7F60 = 0x662B
+0x7F67 = 0x662E
+0x7F68 = 0x662C
+0x7F69 = 0x662D
+0x7F6A = 0x3A61
+0x7F6B = 0x3753
+0x7F6E = 0x4356
+0x7F70 = 0x4833
+0x7F72 = 0x3D70
+0x7F75 = 0x474D
+0x7F77 = 0x486D
+0x7F78 = 0x662F
+0x7F79 = 0x586D
+0x7F82 = 0x6630
+0x7F83 = 0x6632
+0x7F85 = 0x4D65
+0x7F86 = 0x6631
+0x7F87 = 0x6634
+0x7F88 = 0x6633
+0x7F8A = 0x4D53
+0x7F8C = 0x6635
+0x7F8E = 0x487E
+0x7F94 = 0x6636
+0x7F9A = 0x6639
+0x7F9D = 0x6638
+0x7F9E = 0x6637
+0x7FA3 = 0x663A
+0x7FA4 = 0x3732
+0x7FA8 = 0x4122
+0x7FA9 = 0x3541
+0x7FAE = 0x663E
+0x7FAF = 0x663B
+0x7FB2 = 0x663C
+0x7FB6 = 0x663F
+0x7FB8 = 0x6640
+0x7FB9 = 0x663D
+0x7FBD = 0x3129
+0x7FC1 = 0x3227
+0x7FC5 = 0x6642
+0x7FC6 = 0x6643
+0x7FCA = 0x6644
+0x7FCC = 0x4D62
+0x7FD2 = 0x3D2C
+0x7FD4 = 0x6646
+0x7FD5 = 0x6645
+0x7FE0 = 0x3F69
+0x7FE1 = 0x6647
+0x7FE6 = 0x6648
+0x7FE9 = 0x6649
+0x7FEB = 0x3465
+0x7FF0 = 0x344D
+0x7FF3 = 0x664A
+0x7FF9 = 0x664B
+0x7FFB = 0x4B5D
+0x7FFC = 0x4D63
+0x8000 = 0x4D54
+0x8001 = 0x4F37
+0x8003 = 0x394D
+0x8004 = 0x664E
+0x8005 = 0x3C54
+0x8006 = 0x664D
+0x800B = 0x664F
+0x800C = 0x3C29
+0x8010 = 0x4251
+0x8012 = 0x6650
+0x8015 = 0x394C
+0x8017 = 0x4C57
+0x8018 = 0x6651
+0x8019 = 0x6652
+0x801C = 0x6653
+0x8021 = 0x6654
+0x8028 = 0x6655
+0x8033 = 0x3C2A
+0x8036 = 0x4C6D
+0x803B = 0x6657
+0x803D = 0x433F
+0x803F = 0x6656
+0x8046 = 0x6659
+0x804A = 0x6658
+0x8052 = 0x665A
+0x8056 = 0x403B
+0x8058 = 0x665B
+0x805A = 0x665C
+0x805E = 0x4A39
+0x805F = 0x665D
+0x8061 = 0x416F
+0x8062 = 0x665E
+0x8068 = 0x665F
+0x806F = 0x4E7E
+0x8070 = 0x6662
+0x8072 = 0x6661
+0x8073 = 0x6660
+0x8074 = 0x4430
+0x8076 = 0x6663
+0x8077 = 0x3F26
+0x8079 = 0x6664
+0x807D = 0x6665
+0x807E = 0x4F38
+0x807F = 0x6666
+0x8084 = 0x6667
+0x8085 = 0x6669
+0x8086 = 0x6668
+0x8087 = 0x4825
+0x8089 = 0x4679
+0x808B = 0x4F3E
+0x808C = 0x4829
+0x8093 = 0x666B
+0x8096 = 0x3E53
+0x8098 = 0x492A
+0x809A = 0x666C
+0x809B = 0x666A
+0x809D = 0x344E
+0x80A1 = 0x3854
+0x80A2 = 0x3B68
+0x80A5 = 0x486E
+0x80A9 = 0x382A
+0x80AA = 0x4B43
+0x80AC = 0x666F
+0x80AD = 0x666D
+0x80AF = 0x394E
+0x80B1 = 0x394F
+0x80B2 = 0x3069
+0x80B4 = 0x3A68
+0x80BA = 0x4759
+0x80C3 = 0x305F
+0x80C4 = 0x6674
+0x80C6 = 0x4340
+0x80CC = 0x4758
+0x80CE = 0x425B
+0x80D6 = 0x6676
+0x80D9 = 0x6672
+0x80DA = 0x6675
+0x80DB = 0x6670
+0x80DD = 0x6673
+0x80DE = 0x4B26
+0x80E1 = 0x3855
+0x80E4 = 0x307D
+0x80E5 = 0x6671
+0x80EF = 0x6678
+0x80F1 = 0x6679
+0x80F4 = 0x4639
+0x80F8 = 0x363B
+0x80FC = 0x6726
+0x80FD = 0x473D
+0x8102 = 0x3B69
+0x8105 = 0x363C
+0x8106 = 0x4048
+0x8107 = 0x4F46
+0x8108 = 0x4C2E
+0x8109 = 0x6677
+0x810A = 0x4054
+0x811A = 0x3553
+0x811B = 0x667A
+0x8123 = 0x667C
+0x8129 = 0x667B
+0x812F = 0x667D
+0x8131 = 0x4326
+0x8133 = 0x473E
+0x8139 = 0x4431
+0x813E = 0x6723
+0x8146 = 0x6722
+0x814B = 0x667E
+0x814E = 0x3F55
+0x8150 = 0x4965
+0x8151 = 0x6725
+0x8153 = 0x6724
+0x8154 = 0x3950
+0x8155 = 0x4F53
+0x815F = 0x6735
+0x8165 = 0x6729
+0x8166 = 0x672A
+0x816B = 0x3C70
+0x816E = 0x6728
+0x8170 = 0x3978
+0x8171 = 0x6727
+0x8174 = 0x672B
+0x8178 = 0x4432
+0x8179 = 0x4A22
+0x817A = 0x4123
+0x817F = 0x425C
+0x8180 = 0x672F
+0x8182 = 0x6730
+0x8183 = 0x672C
+0x8188 = 0x672D
+0x818A = 0x672E
+0x818F = 0x3951
+0x8193 = 0x6736
+0x8195 = 0x6732
+0x819A = 0x4966
+0x819C = 0x4B6C
+0x819D = 0x4928
+0x81A0 = 0x6731
+0x81A3 = 0x6734
+0x81A4 = 0x6733
+0x81A8 = 0x4B44
+0x81A9 = 0x6737
+0x81B0 = 0x6738
+0x81B3 = 0x4137
+0x81B5 = 0x6739
+0x81B8 = 0x673B
+0x81BA = 0x673F
+0x81BD = 0x673C
+0x81BE = 0x673A
+0x81BF = 0x473F
+0x81C0 = 0x673D
+0x81C2 = 0x673E
+0x81C6 = 0x3232
+0x81C8 = 0x6745
+0x81C9 = 0x6740
+0x81CD = 0x6741
+0x81D1 = 0x6742
+0x81D3 = 0x4221
+0x81D8 = 0x6744
+0x81D9 = 0x6743
+0x81DA = 0x6746
+0x81DF = 0x6747
+0x81E0 = 0x6748
+0x81E3 = 0x3F43
+0x81E5 = 0x3269
+0x81E7 = 0x6749
+0x81E8 = 0x4E57
+0x81EA = 0x3C2B
+0x81ED = 0x3D2D
+0x81F3 = 0x3B6A
+0x81F4 = 0x4357
+0x81FA = 0x674A
+0x81FB = 0x674B
+0x81FC = 0x3131
+0x81FE = 0x674C
+0x8201 = 0x674D
+0x8202 = 0x674E
+0x8205 = 0x674F
+0x8207 = 0x6750
+0x8208 = 0x363D
+0x8209 = 0x5A2A
+0x820A = 0x6751
+0x820C = 0x4065
+0x820D = 0x6752
+0x820E = 0x3C4B
+0x8210 = 0x6753
+0x8212 = 0x5030
+0x8216 = 0x6754
+0x8217 = 0x4A5E
+0x8218 = 0x345C
+0x821B = 0x4124
+0x821C = 0x3D58
+0x821E = 0x4971
+0x821F = 0x3D2E
+0x8229 = 0x6755
+0x822A = 0x3952
+0x822B = 0x6756
+0x822C = 0x484C
+0x822E = 0x6764
+0x8233 = 0x6758
+0x8235 = 0x4249
+0x8236 = 0x4775
+0x8237 = 0x383F
+0x8238 = 0x6757
+0x8239 = 0x4125
+0x8240 = 0x6759
+0x8247 = 0x447A
+0x8258 = 0x675B
+0x8259 = 0x675A
+0x825A = 0x675D
+0x825D = 0x675C
+0x825F = 0x675E
+0x8262 = 0x6760
+0x8264 = 0x675F
+0x8266 = 0x344F
+0x8268 = 0x6761
+0x826A = 0x6762
+0x826B = 0x6763
+0x826E = 0x3A31
+0x826F = 0x4E49
+0x8271 = 0x6765
+0x8272 = 0x3F27
+0x8276 = 0x3170
+0x8277 = 0x6766
+0x8278 = 0x6767
+0x827E = 0x6768
+0x828B = 0x3072
+0x828D = 0x6769
+0x8292 = 0x676A
+0x8299 = 0x4967
+0x829D = 0x3C47
+0x829F = 0x676C
+0x82A5 = 0x3329
+0x82A6 = 0x3032
+0x82AB = 0x676B
+0x82AC = 0x676E
+0x82AD = 0x474E
+0x82AF = 0x3F44
+0x82B1 = 0x3256
+0x82B3 = 0x4B27
+0x82B8 = 0x375D
+0x82B9 = 0x365C
+0x82BB = 0x676D
+0x82BD = 0x326A
+0x82C5 = 0x3423
+0x82D1 = 0x3171
+0x82D2 = 0x6772
+0x82D3 = 0x4E6A
+0x82D4 = 0x425D
+0x82D7 = 0x4944
+0x82D9 = 0x677E
+0x82DB = 0x3257
+0x82DC = 0x677C
+0x82DE = 0x677A
+0x82DF = 0x6771
+0x82E1 = 0x676F
+0x82E3 = 0x6770
+0x82E5 = 0x3C63
+0x82E6 = 0x366C
+0x82E7 = 0x4377
+0x82EB = 0x4651
+0x82F1 = 0x3151
+0x82F3 = 0x6774
+0x82F4 = 0x6773
+0x82F9 = 0x6779
+0x82FA = 0x6775
+0x82FB = 0x6778
+0x8302 = 0x4C50
+0x8303 = 0x6777
+0x8304 = 0x3258
+0x8305 = 0x337D
+0x8306 = 0x677B
+0x8309 = 0x677D
+0x830E = 0x3754
+0x8316 = 0x6823
+0x8317 = 0x682C
+0x8318 = 0x682D
+0x831C = 0x302B
+0x8323 = 0x6834
+0x8328 = 0x3071
+0x832B = 0x682B
+0x832F = 0x682A
+0x8331 = 0x6825
+0x8332 = 0x6824
+0x8334 = 0x6822
+0x8335 = 0x6821
+0x8336 = 0x4363
+0x8338 = 0x427B
+0x8339 = 0x6827
+0x8340 = 0x6826
+0x8345 = 0x6829
+0x8349 = 0x4170
+0x834A = 0x3755
+0x834F = 0x3141
+0x8350 = 0x6828
+0x8352 = 0x3953
+0x8358 = 0x4171
+0x8373 = 0x683A
+0x8375 = 0x683B
+0x8377 = 0x3259
+0x837B = 0x322E
+0x837C = 0x6838
+0x8385 = 0x682E
+0x8387 = 0x6836
+0x8389 = 0x683D
+0x838A = 0x6837
+0x838E = 0x6835
+0x8393 = 0x6776
+0x8396 = 0x6833
+0x839A = 0x682F
+0x839E = 0x3450
+0x839F = 0x6831
+0x83A0 = 0x683C
+0x83A2 = 0x6832
+0x83A8 = 0x683E
+0x83AA = 0x6830
+0x83AB = 0x477C
+0x83B1 = 0x4D69
+0x83B5 = 0x6839
+0x83BD = 0x684F
+0x83C1 = 0x6847
+0x83C5 = 0x3F7B
+0x83CA = 0x3546
+0x83CC = 0x365D
+0x83CE = 0x6842
+0x83D3 = 0x325B
+0x83D6 = 0x3E54
+0x83D8 = 0x6845
+0x83DC = 0x3A5A
+0x83DF = 0x4551
+0x83E0 = 0x684A
+0x83E9 = 0x4A6E
+0x83EB = 0x6841
+0x83EF = 0x325A
+0x83F0 = 0x3856
+0x83F1 = 0x4929
+0x83F2 = 0x684B
+0x83F4 = 0x683F
+0x83F7 = 0x6848
+0x83FB = 0x6852
+0x83FD = 0x6843
+0x8403 = 0x6844
+0x8404 = 0x463A
+0x8407 = 0x6849
+0x840B = 0x6846
+0x840C = 0x4B28
+0x840D = 0x684C
+0x840E = 0x3060
+0x8413 = 0x6840
+0x8420 = 0x684E
+0x8422 = 0x684D
+0x8429 = 0x476B
+0x842A = 0x6854
+0x842C = 0x685F
+0x8431 = 0x337E
+0x8435 = 0x6862
+0x8438 = 0x6850
+0x843C = 0x6855
+0x843D = 0x4D6E
+0x8446 = 0x685E
+0x8449 = 0x4D55
+0x844E = 0x4E2A
+0x8457 = 0x4378
+0x845B = 0x336B
+0x8461 = 0x4972
+0x8462 = 0x6864
+0x8463 = 0x4621
+0x8466 = 0x3031
+0x8469 = 0x685D
+0x846B = 0x6859
+0x846C = 0x4172
+0x846D = 0x6853
+0x846E = 0x685B
+0x846F = 0x6860
+0x8471 = 0x472C
+0x8475 = 0x302A
+0x8477 = 0x6858
+0x8479 = 0x6861
+0x847A = 0x4978
+0x8482 = 0x685C
+0x8484 = 0x6857
+0x848B = 0x3E55
+0x8490 = 0x3D2F
+0x8494 = 0x3C2C
+0x8499 = 0x4C58
+0x849C = 0x4947
+0x849F = 0x6867
+0x84A1 = 0x6870
+0x84AD = 0x685A
+0x84B2 = 0x3377
+0x84B8 = 0x3E78
+0x84B9 = 0x6865
+0x84BB = 0x686A
+0x84BC = 0x4173
+0x84BF = 0x6866
+0x84C1 = 0x686D
+0x84C4 = 0x435F
+0x84C6 = 0x686E
+0x84C9 = 0x4D56
+0x84CA = 0x6863
+0x84CB = 0x3338
+0x84CD = 0x6869
+0x84D0 = 0x686C
+0x84D1 = 0x4C2C
+0x84D6 = 0x686F
+0x84D9 = 0x6868
+0x84DA = 0x686B
+0x84EC = 0x4B29
+0x84EE = 0x4F21
+0x84F4 = 0x6873
+0x84FC = 0x687A
+0x84FF = 0x6872
+0x8500 = 0x3C43
+0x8506 = 0x6851
+0x8511 = 0x4A4E
+0x8513 = 0x4C22
+0x8514 = 0x6879
+0x8515 = 0x6878
+0x8517 = 0x6874
+0x8518 = 0x6875
+0x851A = 0x3136
+0x851F = 0x6877
+0x8521 = 0x6871
+0x8526 = 0x4455
+0x852C = 0x6876
+0x852D = 0x307E
+0x8535 = 0x4222
+0x853D = 0x4A43
+0x8540 = 0x687B
+0x8541 = 0x6921
+0x8543 = 0x4859
+0x8548 = 0x687E
+0x8549 = 0x3E56
+0x854A = 0x3C49
+0x854B = 0x6923
+0x854E = 0x363E
+0x8555 = 0x6924
+0x8557 = 0x4979
+0x8558 = 0x687D
+0x855A = 0x6856
+0x8563 = 0x687C
+0x8568 = 0x4F4F
+0x8569 = 0x4622
+0x856A = 0x4973
+0x856D = 0x692B
+0x8577 = 0x6931
+0x857E = 0x6932
+0x8580 = 0x6925
+0x8584 = 0x4776
+0x8587 = 0x692F
+0x8588 = 0x6927
+0x858A = 0x6929
+0x8590 = 0x6933
+0x8591 = 0x6928
+0x8594 = 0x692C
+0x8597 = 0x3172
+0x8599 = 0x4665
+0x859B = 0x692D
+0x859C = 0x6930
+0x85A4 = 0x6926
+0x85A6 = 0x4126
+0x85A8 = 0x692A
+0x85A9 = 0x3B27
+0x85AA = 0x3F45
+0x85AB = 0x3730
+0x85AC = 0x4C74
+0x85AE = 0x4C79
+0x85AF = 0x3D72
+0x85B9 = 0x6937
+0x85BA = 0x6935
+0x85C1 = 0x4F4E
+0x85C9 = 0x6934
+0x85CD = 0x4D75
+0x85CF = 0x6936
+0x85D0 = 0x6938
+0x85D5 = 0x6939
+0x85DC = 0x693C
+0x85DD = 0x693A
+0x85E4 = 0x4623
+0x85E5 = 0x693B
+0x85E9 = 0x484D
+0x85EA = 0x692E
+0x85F7 = 0x3D73
+0x85F9 = 0x693D
+0x85FA = 0x6942
+0x85FB = 0x4174
+0x85FE = 0x6941
+0x8602 = 0x6922
+0x8606 = 0x6943
+0x8607 = 0x4149
+0x860A = 0x693E
+0x860B = 0x6940
+0x8613 = 0x693F
+0x8616 = 0x5D31
+0x8617 = 0x5D22
+0x861A = 0x6945
+0x8622 = 0x6944
+0x862D = 0x4D76
+0x862F = 0x623C
+0x8630 = 0x6946
+0x863F = 0x6947
+0x864D = 0x6948
+0x864E = 0x3857
+0x8650 = 0x3554
+0x8654 = 0x694A
+0x8655 = 0x515D
+0x865A = 0x3575
+0x865C = 0x4E3A
+0x865E = 0x3673
+0x865F = 0x694B
+0x8667 = 0x694C
+0x866B = 0x436E
+0x8671 = 0x694D
+0x8679 = 0x467A
+0x867B = 0x303A
+0x868A = 0x3263
+0x868B = 0x6952
+0x868C = 0x6953
+0x8693 = 0x694E
+0x8695 = 0x3B3D
+0x86A3 = 0x694F
+0x86A4 = 0x4742
+0x86A9 = 0x6950
+0x86AA = 0x6951
+0x86AB = 0x695B
+0x86AF = 0x6955
+0x86B0 = 0x6958
+0x86B6 = 0x6954
+0x86C4 = 0x6956
+0x86C6 = 0x6957
+0x86C7 = 0x3C58
+0x86C9 = 0x6959
+0x86CB = 0x4341
+0x86CD = 0x3756
+0x86CE = 0x3342
+0x86D4 = 0x695C
+0x86D9 = 0x333F
+0x86DB = 0x6961
+0x86DE = 0x695D
+0x86DF = 0x6960
+0x86E4 = 0x483A
+0x86E9 = 0x695E
+0x86EC = 0x695F
+0x86ED = 0x4948
+0x86EE = 0x485A
+0x86EF = 0x6962
+0x86F8 = 0x427D
+0x86F9 = 0x696C
+0x86FB = 0x6968
+0x86FE = 0x326B
+0x8700 = 0x6966
+0x8702 = 0x4B2A
+0x8703 = 0x6967
+0x8706 = 0x6964
+0x8708 = 0x6965
+0x8709 = 0x696A
+0x870A = 0x696D
+0x870D = 0x696B
+0x8711 = 0x6969
+0x8712 = 0x6963
+0x8718 = 0x4358
+0x871A = 0x6974
+0x871C = 0x4C2A
+0x8725 = 0x6972
+0x8729 = 0x6973
+0x8734 = 0x696E
+0x8737 = 0x6970
+0x873B = 0x6971
+0x873F = 0x696F
+0x8749 = 0x4066
+0x874B = 0x4F39
+0x874C = 0x6978
+0x874E = 0x6979
+0x8753 = 0x6A21
+0x8755 = 0x3F2A
+0x8757 = 0x697B
+0x8759 = 0x697E
+0x875F = 0x6976
+0x8760 = 0x6975
+0x8763 = 0x6A22
+0x8766 = 0x325C
+0x8768 = 0x697C
+0x876A = 0x6A23
+0x876E = 0x697D
+0x8774 = 0x697A
+0x8776 = 0x4433
+0x8778 = 0x6977
+0x877F = 0x4768
+0x8782 = 0x6A27
+0x878D = 0x4D3B
+0x879F = 0x6A26
+0x87A2 = 0x6A25
+0x87AB = 0x6A2E
+0x87AF = 0x6A28
+0x87B3 = 0x6A30
+0x87BA = 0x4D66
+0x87BB = 0x6A33
+0x87BD = 0x6A2A
+0x87C0 = 0x6A2B
+0x87C4 = 0x6A2F
+0x87C6 = 0x6A32
+0x87C7 = 0x6A31
+0x87CB = 0x6A29
+0x87D0 = 0x6A2C
+0x87D2 = 0x6A3D
+0x87E0 = 0x6A36
+0x87EF = 0x6A34
+0x87F2 = 0x6A35
+0x87F6 = 0x6A3A
+0x87F7 = 0x6A3B
+0x87F9 = 0x332A
+0x87FB = 0x3542
+0x87FE = 0x6A39
+0x8805 = 0x6A24
+0x880D = 0x6A38
+0x880E = 0x6A3C
+0x880F = 0x6A37
+0x8811 = 0x6A3E
+0x8815 = 0x6A40
+0x8816 = 0x6A3F
+0x8821 = 0x6A42
+0x8822 = 0x6A41
+0x8823 = 0x695A
+0x8827 = 0x6A46
+0x8831 = 0x6A43
+0x8836 = 0x6A44
+0x8839 = 0x6A45
+0x883B = 0x6A47
+0x8840 = 0x376C
+0x8842 = 0x6A49
+0x8844 = 0x6A48
+0x8846 = 0x3D30
+0x884C = 0x3954
+0x884D = 0x5E27
+0x8852 = 0x6A4A
+0x8853 = 0x3D51
+0x8857 = 0x3339
+0x8859 = 0x6A4B
+0x885B = 0x3152
+0x885D = 0x3E57
+0x885E = 0x6A4C
+0x8861 = 0x3955
+0x8862 = 0x6A4D
+0x8863 = 0x3061
+0x8868 = 0x493D
+0x886B = 0x6A4E
+0x8870 = 0x3F6A
+0x8872 = 0x6A55
+0x8875 = 0x6A52
+0x8877 = 0x436F
+0x887D = 0x6A53
+0x887E = 0x6A50
+0x887F = 0x365E
+0x8881 = 0x6A4F
+0x8882 = 0x6A56
+0x8888 = 0x3736
+0x888B = 0x425E
+0x888D = 0x6A5C
+0x8892 = 0x6A58
+0x8896 = 0x4235
+0x8897 = 0x6A57
+0x8899 = 0x6A5A
+0x889E = 0x6A51
+0x88A2 = 0x6A5B
+0x88A4 = 0x6A5D
+0x88AB = 0x486F
+0x88AE = 0x6A59
+0x88B0 = 0x6A5E
+0x88B1 = 0x6A60
+0x88B4 = 0x3853
+0x88B5 = 0x6A54
+0x88B7 = 0x3041
+0x88BF = 0x6A5F
+0x88C1 = 0x3A5B
+0x88C2 = 0x4E76
+0x88C3 = 0x6A61
+0x88C4 = 0x6A62
+0x88C5 = 0x4175
+0x88CF = 0x4E22
+0x88D4 = 0x6A63
+0x88D5 = 0x4D35
+0x88D8 = 0x6A64
+0x88D9 = 0x6A65
+0x88DC = 0x4A64
+0x88DD = 0x6A66
+0x88DF = 0x3A40
+0x88E1 = 0x4E23
+0x88E8 = 0x6A6B
+0x88F2 = 0x6A6C
+0x88F3 = 0x3E58
+0x88F4 = 0x6A6A
+0x88F8 = 0x4D67
+0x88F9 = 0x6A67
+0x88FC = 0x6A69
+0x88FD = 0x403D
+0x88FE = 0x3F7E
+0x8902 = 0x6A68
+0x8904 = 0x6A6D
+0x8907 = 0x4A23
+0x890A = 0x6A6F
+0x890C = 0x6A6E
+0x8910 = 0x336C
+0x8912 = 0x4B2B
+0x8913 = 0x6A70
+0x891D = 0x6A7C
+0x891E = 0x6A72
+0x8925 = 0x6A73
+0x892A = 0x6A74
+0x892B = 0x6A75
+0x8936 = 0x6A79
+0x8938 = 0x6A7A
+0x893B = 0x6A78
+0x8941 = 0x6A76
+0x8943 = 0x6A71
+0x8944 = 0x6A77
+0x894C = 0x6A7B
+0x894D = 0x7037
+0x8956 = 0x3228
+0x895E = 0x6A7E
+0x895F = 0x365F
+0x8960 = 0x6A7D
+0x8964 = 0x6B22
+0x8966 = 0x6B21
+0x896A = 0x6B24
+0x896D = 0x6B23
+0x896F = 0x6B25
+0x8972 = 0x3D31
+0x8974 = 0x6B26
+0x8977 = 0x6B27
+0x897E = 0x6B28
+0x897F = 0x403E
+0x8981 = 0x4D57
+0x8983 = 0x6B29
+0x8986 = 0x4A24
+0x8987 = 0x4746
+0x8988 = 0x6B2A
+0x898A = 0x6B2B
+0x898B = 0x382B
+0x898F = 0x352C
+0x8993 = 0x6B2C
+0x8996 = 0x3B6B
+0x8997 = 0x4741
+0x8998 = 0x6B2D
+0x899A = 0x3350
+0x89A1 = 0x6B2E
+0x89A6 = 0x6B30
+0x89A7 = 0x4D77
+0x89A9 = 0x6B2F
+0x89AA = 0x3F46
+0x89AC = 0x6B31
+0x89AF = 0x6B32
+0x89B2 = 0x6B33
+0x89B3 = 0x3451
+0x89BA = 0x6B34
+0x89BD = 0x6B35
+0x89BF = 0x6B36
+0x89C0 = 0x6B37
+0x89D2 = 0x3351
+0x89DA = 0x6B38
+0x89DC = 0x6B39
+0x89DD = 0x6B3A
+0x89E3 = 0x3272
+0x89E6 = 0x3F28
+0x89E7 = 0x6B3B
+0x89F4 = 0x6B3C
+0x89F8 = 0x6B3D
+0x8A00 = 0x3840
+0x8A02 = 0x447B
+0x8A03 = 0x6B3E
+0x8A08 = 0x3757
+0x8A0A = 0x3F56
+0x8A0C = 0x6B41
+0x8A0E = 0x4624
+0x8A10 = 0x6B40
+0x8A13 = 0x3731
+0x8A16 = 0x6B3F
+0x8A17 = 0x4277
+0x8A18 = 0x352D
+0x8A1B = 0x6B42
+0x8A1D = 0x6B43
+0x8A1F = 0x3E59
+0x8A23 = 0x376D
+0x8A25 = 0x6B44
+0x8A2A = 0x4B2C
+0x8A2D = 0x405F
+0x8A31 = 0x3576
+0x8A33 = 0x4C75
+0x8A34 = 0x414A
+0x8A36 = 0x6B45
+0x8A3A = 0x3F47
+0x8A3B = 0x4370
+0x8A3C = 0x3E5A
+0x8A41 = 0x6B46
+0x8A46 = 0x6B49
+0x8A48 = 0x6B4A
+0x8A50 = 0x3A3E
+0x8A51 = 0x4242
+0x8A52 = 0x6B48
+0x8A54 = 0x3E5B
+0x8A55 = 0x493E
+0x8A5B = 0x6B47
+0x8A5E = 0x3B6C
+0x8A60 = 0x3153
+0x8A62 = 0x6B4E
+0x8A63 = 0x3758
+0x8A66 = 0x3B6E
+0x8A69 = 0x3B6D
+0x8A6B = 0x4F4D
+0x8A6C = 0x6B4D
+0x8A6D = 0x6B4C
+0x8A6E = 0x4127
+0x8A70 = 0x354D
+0x8A71 = 0x4F43
+0x8A72 = 0x333A
+0x8A73 = 0x3E5C
+0x8A7C = 0x6B4B
+0x8A82 = 0x6B50
+0x8A84 = 0x6B51
+0x8A85 = 0x6B4F
+0x8A87 = 0x3858
+0x8A89 = 0x4D40
+0x8A8C = 0x3B6F
+0x8A8D = 0x4727
+0x8A91 = 0x6B54
+0x8A93 = 0x4040
+0x8A95 = 0x4342
+0x8A98 = 0x4D36
+0x8A9A = 0x6B57
+0x8A9E = 0x386C
+0x8AA0 = 0x403F
+0x8AA1 = 0x6B53
+0x8AA3 = 0x6B58
+0x8AA4 = 0x386D
+0x8AA5 = 0x6B55
+0x8AA6 = 0x6B56
+0x8AA8 = 0x6B52
+0x8AAC = 0x4062
+0x8AAD = 0x4649
+0x8AB0 = 0x432F
+0x8AB2 = 0x325D
+0x8AB9 = 0x4870
+0x8ABC = 0x3543
+0x8ABF = 0x4434
+0x8AC2 = 0x6B5B
+0x8AC4 = 0x6B59
+0x8AC7 = 0x434C
+0x8ACB = 0x4041
+0x8ACC = 0x3452
+0x8ACD = 0x6B5A
+0x8ACF = 0x3F5B
+0x8AD2 = 0x4E4A
+0x8AD6 = 0x4F40
+0x8ADA = 0x6B5C
+0x8ADB = 0x6B67
+0x8ADC = 0x4435
+0x8ADE = 0x6B66
+0x8AE0 = 0x6B63
+0x8AE1 = 0x6B6B
+0x8AE2 = 0x6B64
+0x8AE4 = 0x6B60
+0x8AE6 = 0x447C
+0x8AE7 = 0x6B5F
+0x8AEB = 0x6B5D
+0x8AED = 0x4D21
+0x8AEE = 0x3B70
+0x8AF1 = 0x6B61
+0x8AF3 = 0x6B5E
+0x8AF7 = 0x6B65
+0x8AF8 = 0x3D74
+0x8AFA = 0x3841
+0x8AFE = 0x427A
+0x8B00 = 0x4B45
+0x8B01 = 0x315A
+0x8B02 = 0x3062
+0x8B04 = 0x4625
+0x8B07 = 0x6B69
+0x8B0C = 0x6B68
+0x8B0E = 0x4666
+0x8B10 = 0x6B6D
+0x8B14 = 0x6B62
+0x8B16 = 0x6B6C
+0x8B17 = 0x6B6E
+0x8B19 = 0x382C
+0x8B1A = 0x6B6A
+0x8B1B = 0x3956
+0x8B1D = 0x3C55
+0x8B20 = 0x6B6F
+0x8B21 = 0x4D58
+0x8B26 = 0x6B72
+0x8B28 = 0x6B75
+0x8B2B = 0x6B73
+0x8B2C = 0x4935
+0x8B33 = 0x6B70
+0x8B39 = 0x3660
+0x8B3E = 0x6B74
+0x8B41 = 0x6B76
+0x8B49 = 0x6B7A
+0x8B4C = 0x6B77
+0x8B4E = 0x6B79
+0x8B4F = 0x6B78
+0x8B56 = 0x6B7B
+0x8B58 = 0x3C31
+0x8B5A = 0x6B7D
+0x8B5B = 0x6B7C
+0x8B5C = 0x4968
+0x8B5F = 0x6C21
+0x8B66 = 0x3759
+0x8B6B = 0x6B7E
+0x8B6C = 0x6C22
+0x8B6F = 0x6C23
+0x8B70 = 0x3544
+0x8B71 = 0x6641
+0x8B72 = 0x3E79
+0x8B74 = 0x6C24
+0x8B77 = 0x386E
+0x8B7D = 0x6C25
+0x8B80 = 0x6C26
+0x8B83 = 0x3B3E
+0x8B8A = 0x5A4E
+0x8B8C = 0x6C27
+0x8B8E = 0x6C28
+0x8B90 = 0x3D32
+0x8B92 = 0x6C29
+0x8B93 = 0x6C2A
+0x8B96 = 0x6C2B
+0x8B99 = 0x6C2C
+0x8B9A = 0x6C2D
+0x8C37 = 0x432B
+0x8C3A = 0x6C2E
+0x8C3F = 0x6C30
+0x8C41 = 0x6C2F
+0x8C46 = 0x4626
+0x8C48 = 0x6C31
+0x8C4A = 0x4B2D
+0x8C4C = 0x6C32
+0x8C4E = 0x6C33
+0x8C50 = 0x6C34
+0x8C55 = 0x6C35
+0x8C5A = 0x465A
+0x8C61 = 0x3E5D
+0x8C62 = 0x6C36
+0x8C6A = 0x396B
+0x8C6B = 0x502E
+0x8C6C = 0x6C37
+0x8C78 = 0x6C38
+0x8C79 = 0x493F
+0x8C7A = 0x6C39
+0x8C7C = 0x6C41
+0x8C82 = 0x6C3A
+0x8C85 = 0x6C3C
+0x8C89 = 0x6C3B
+0x8C8A = 0x6C3D
+0x8C8C = 0x4B46
+0x8C8D = 0x6C3E
+0x8C8E = 0x6C3F
+0x8C94 = 0x6C40
+0x8C98 = 0x6C42
+0x8C9D = 0x332D
+0x8C9E = 0x4467
+0x8CA0 = 0x4969
+0x8CA1 = 0x3A62
+0x8CA2 = 0x3957
+0x8CA7 = 0x494F
+0x8CA8 = 0x325F
+0x8CA9 = 0x484E
+0x8CAA = 0x6C45
+0x8CAB = 0x3453
+0x8CAC = 0x4055
+0x8CAD = 0x6C44
+0x8CAE = 0x6C49
+0x8CAF = 0x4379
+0x8CB0 = 0x4C63
+0x8CB2 = 0x6C47
+0x8CB3 = 0x6C48
+0x8CB4 = 0x352E
+0x8CB6 = 0x6C4A
+0x8CB7 = 0x4763
+0x8CB8 = 0x425F
+0x8CBB = 0x4871
+0x8CBC = 0x453D
+0x8CBD = 0x6C46
+0x8CBF = 0x4B47
+0x8CC0 = 0x326C
+0x8CC1 = 0x6C4C
+0x8CC2 = 0x4F28
+0x8CC3 = 0x4442
+0x8CC4 = 0x4F45
+0x8CC7 = 0x3B71
+0x8CC8 = 0x6C4B
+0x8CCA = 0x4231
+0x8CCD = 0x6C5C
+0x8CCE = 0x4128
+0x8CD1 = 0x4678
+0x8CD3 = 0x4950
+0x8CDA = 0x6C4F
+0x8CDB = 0x3B3F
+0x8CDC = 0x3B72
+0x8CDE = 0x3E5E
+0x8CE0 = 0x4765
+0x8CE2 = 0x382D
+0x8CE3 = 0x6C4E
+0x8CE4 = 0x6C4D
+0x8CE6 = 0x496A
+0x8CEA = 0x3C41
+0x8CED = 0x4552
+0x8CFA = 0x6C51
+0x8CFB = 0x6C52
+0x8CFC = 0x3958
+0x8CFD = 0x6C50
+0x8D04 = 0x6C53
+0x8D05 = 0x6C54
+0x8D07 = 0x6C56
+0x8D08 = 0x4223
+0x8D0A = 0x6C55
+0x8D0B = 0x3466
+0x8D0D = 0x6C58
+0x8D0F = 0x6C57
+0x8D10 = 0x6C59
+0x8D13 = 0x6C5B
+0x8D14 = 0x6C5D
+0x8D16 = 0x6C5E
+0x8D64 = 0x4056
+0x8D66 = 0x3C4F
+0x8D67 = 0x6C5F
+0x8D6B = 0x3352
+0x8D6D = 0x6C60
+0x8D70 = 0x4176
+0x8D71 = 0x6C61
+0x8D73 = 0x6C62
+0x8D74 = 0x496B
+0x8D77 = 0x352F
+0x8D81 = 0x6C63
+0x8D85 = 0x4436
+0x8D8A = 0x315B
+0x8D99 = 0x6C64
+0x8DA3 = 0x3C71
+0x8DA8 = 0x3F76
+0x8DB3 = 0x422D
+0x8DBA = 0x6C67
+0x8DBE = 0x6C66
+0x8DC2 = 0x6C65
+0x8DCB = 0x6C6D
+0x8DCC = 0x6C6B
+0x8DCF = 0x6C68
+0x8DD6 = 0x6C6A
+0x8DDA = 0x6C69
+0x8DDB = 0x6C6C
+0x8DDD = 0x3577
+0x8DDF = 0x6C70
+0x8DE1 = 0x4057
+0x8DE3 = 0x6C71
+0x8DE8 = 0x3859
+0x8DEA = 0x6C6E
+0x8DEB = 0x6C6F
+0x8DEF = 0x4F29
+0x8DF3 = 0x4437
+0x8DF5 = 0x4129
+0x8DFC = 0x6C72
+0x8DFF = 0x6C75
+0x8E08 = 0x6C73
+0x8E09 = 0x6C74
+0x8E0A = 0x4D59
+0x8E0F = 0x4627
+0x8E10 = 0x6C78
+0x8E1D = 0x6C76
+0x8E1E = 0x6C77
+0x8E1F = 0x6C79
+0x8E2A = 0x6D29
+0x8E30 = 0x6C7C
+0x8E34 = 0x6C7D
+0x8E35 = 0x6C7B
+0x8E42 = 0x6C7A
+0x8E44 = 0x447D
+0x8E47 = 0x6D21
+0x8E48 = 0x6D25
+0x8E49 = 0x6D22
+0x8E4A = 0x6C7E
+0x8E4C = 0x6D23
+0x8E50 = 0x6D24
+0x8E55 = 0x6D2B
+0x8E59 = 0x6D26
+0x8E5F = 0x4058
+0x8E60 = 0x6D28
+0x8E63 = 0x6D2A
+0x8E64 = 0x6D27
+0x8E72 = 0x6D2D
+0x8E74 = 0x3D33
+0x8E76 = 0x6D2C
+0x8E7C = 0x6D2E
+0x8E81 = 0x6D2F
+0x8E84 = 0x6D32
+0x8E85 = 0x6D31
+0x8E87 = 0x6D30
+0x8E8A = 0x6D34
+0x8E8B = 0x6D33
+0x8E8D = 0x4C76
+0x8E91 = 0x6D36
+0x8E93 = 0x6D35
+0x8E94 = 0x6D37
+0x8E99 = 0x6D38
+0x8EA1 = 0x6D3A
+0x8EAA = 0x6D39
+0x8EAB = 0x3F48
+0x8EAC = 0x6D3B
+0x8EAF = 0x366D
+0x8EB0 = 0x6D3C
+0x8EB1 = 0x6D3E
+0x8EBE = 0x6D3F
+0x8EC5 = 0x6D40
+0x8EC6 = 0x6D3D
+0x8EC8 = 0x6D41
+0x8ECA = 0x3C56
+0x8ECB = 0x6D42
+0x8ECC = 0x3530
+0x8ECD = 0x3733
+0x8ED2 = 0x382E
+0x8EDB = 0x6D43
+0x8EDF = 0x4670
+0x8EE2 = 0x453E
+0x8EE3 = 0x6D44
+0x8EEB = 0x6D47
+0x8EF8 = 0x3C34
+0x8EFB = 0x6D46
+0x8EFC = 0x6D45
+0x8EFD = 0x375A
+0x8EFE = 0x6D48
+0x8F03 = 0x3353
+0x8F05 = 0x6D4A
+0x8F09 = 0x3A5C
+0x8F0A = 0x6D49
+0x8F0C = 0x6D52
+0x8F12 = 0x6D4C
+0x8F13 = 0x6D4E
+0x8F14 = 0x4A65
+0x8F15 = 0x6D4B
+0x8F19 = 0x6D4D
+0x8F1B = 0x6D51
+0x8F1C = 0x6D4F
+0x8F1D = 0x3531
+0x8F1F = 0x6D50
+0x8F26 = 0x6D53
+0x8F29 = 0x475A
+0x8F2A = 0x4E58
+0x8F2F = 0x3D34
+0x8F33 = 0x6D54
+0x8F38 = 0x4D22
+0x8F39 = 0x6D56
+0x8F3B = 0x6D55
+0x8F3E = 0x6D59
+0x8F3F = 0x4D41
+0x8F42 = 0x6D58
+0x8F44 = 0x336D
+0x8F45 = 0x6D57
+0x8F46 = 0x6D5C
+0x8F49 = 0x6D5B
+0x8F4C = 0x6D5A
+0x8F4D = 0x4532
+0x8F4E = 0x6D5D
+0x8F57 = 0x6D5E
+0x8F5C = 0x6D5F
+0x8F5F = 0x396C
+0x8F61 = 0x3725
+0x8F62 = 0x6D60
+0x8F63 = 0x6D61
+0x8F64 = 0x6D62
+0x8F9B = 0x3F49
+0x8F9C = 0x6D63
+0x8F9E = 0x3C2D
+0x8F9F = 0x6D64
+0x8FA3 = 0x6D65
+0x8FA7 = 0x5221
+0x8FA8 = 0x517E
+0x8FAD = 0x6D66
+0x8FAE = 0x6570
+0x8FAF = 0x6D67
+0x8FB0 = 0x4324
+0x8FB1 = 0x3F2B
+0x8FB2 = 0x4740
+0x8FB7 = 0x6D68
+0x8FBA = 0x4A55
+0x8FBB = 0x4454
+0x8FBC = 0x397E
+0x8FBF = 0x4329
+0x8FC2 = 0x312A
+0x8FC4 = 0x4B78
+0x8FC5 = 0x3F57
+0x8FCE = 0x375E
+0x8FD1 = 0x3661
+0x8FD4 = 0x4A56
+0x8FDA = 0x6D69
+0x8FE2 = 0x6D6B
+0x8FE5 = 0x6D6A
+0x8FE6 = 0x3260
+0x8FE9 = 0x4676
+0x8FEA = 0x6D6C
+0x8FEB = 0x4777
+0x8FED = 0x4533
+0x8FEF = 0x6D6D
+0x8FF0 = 0x3D52
+0x8FF4 = 0x6D6F
+0x8FF7 = 0x4C42
+0x8FF8 = 0x6D7E
+0x8FF9 = 0x6D71
+0x8FFA = 0x6D72
+0x8FFD = 0x4449
+0x9000 = 0x4260
+0x9001 = 0x4177
+0x9003 = 0x4628
+0x9005 = 0x6D70
+0x9006 = 0x3555
+0x900B = 0x6D79
+0x900D = 0x6D76
+0x900E = 0x6E25
+0x900F = 0x4629
+0x9010 = 0x4360
+0x9011 = 0x6D73
+0x9013 = 0x447E
+0x9014 = 0x4553
+0x9015 = 0x6D74
+0x9016 = 0x6D78
+0x9017 = 0x3F60
+0x9019 = 0x4767
+0x901A = 0x444C
+0x901D = 0x4042
+0x901E = 0x6D77
+0x901F = 0x422E
+0x9020 = 0x4224
+0x9021 = 0x6D75
+0x9022 = 0x3029
+0x9023 = 0x4F22
+0x9027 = 0x6D7A
+0x902E = 0x4261
+0x9031 = 0x3D35
+0x9032 = 0x3F4A
+0x9035 = 0x6D7C
+0x9036 = 0x6D7B
+0x9038 = 0x306F
+0x9039 = 0x6D7D
+0x903C = 0x492F
+0x903E = 0x6E27
+0x9041 = 0x465B
+0x9042 = 0x3F6B
+0x9045 = 0x4359
+0x9047 = 0x3678
+0x9049 = 0x6E26
+0x904A = 0x4D37
+0x904B = 0x313F
+0x904D = 0x4A57
+0x904E = 0x3261
+0x904F = 0x6E21
+0x9050 = 0x6E22
+0x9051 = 0x6E23
+0x9052 = 0x6E24
+0x9053 = 0x463B
+0x9054 = 0x4323
+0x9055 = 0x3063
+0x9056 = 0x6E28
+0x9058 = 0x6E29
+0x9059 = 0x7423
+0x905C = 0x423D
+0x905E = 0x6E2A
+0x9060 = 0x3173
+0x9061 = 0x414C
+0x9063 = 0x382F
+0x9065 = 0x4D5A
+0x9068 = 0x6E2B
+0x9069 = 0x452C
+0x906D = 0x4178
+0x906E = 0x3C57
+0x906F = 0x6E2C
+0x9072 = 0x6E2F
+0x9075 = 0x3D65
+0x9076 = 0x6E2D
+0x9077 = 0x412B
+0x9078 = 0x412A
+0x907A = 0x3064
+0x907C = 0x4E4B
+0x907D = 0x6E31
+0x907F = 0x4872
+0x9080 = 0x6E33
+0x9081 = 0x6E32
+0x9082 = 0x6E30
+0x9083 = 0x6364
+0x9084 = 0x3454
+0x9087 = 0x6D6E
+0x9089 = 0x6E35
+0x908A = 0x6E34
+0x908F = 0x6E36
+0x9091 = 0x4D38
+0x90A3 = 0x4661
+0x90A6 = 0x4B2E
+0x90A8 = 0x6E37
+0x90AA = 0x3C59
+0x90AF = 0x6E38
+0x90B1 = 0x6E39
+0x90B5 = 0x6E3A
+0x90B8 = 0x4521
+0x90C1 = 0x306A
+0x90CA = 0x3959
+0x90CE = 0x4F3A
+0x90DB = 0x6E3E
+0x90E1 = 0x3734
+0x90E2 = 0x6E3B
+0x90E4 = 0x6E3C
+0x90E8 = 0x4974
+0x90ED = 0x3354
+0x90F5 = 0x4D39
+0x90F7 = 0x363F
+0x90FD = 0x4554
+0x9102 = 0x6E3F
+0x9112 = 0x6E40
+0x9119 = 0x6E41
+0x912D = 0x4522
+0x9130 = 0x6E43
+0x9132 = 0x6E42
+0x9149 = 0x4653
+0x914A = 0x6E44
+0x914B = 0x3D36
+0x914C = 0x3C60
+0x914D = 0x475B
+0x914E = 0x4371
+0x9152 = 0x3C72
+0x9154 = 0x3F6C
+0x9156 = 0x6E45
+0x9158 = 0x6E46
+0x9162 = 0x3F5D
+0x9163 = 0x6E47
+0x9165 = 0x6E48
+0x9169 = 0x6E49
+0x916A = 0x4D6F
+0x916C = 0x3D37
+0x9172 = 0x6E4B
+0x9173 = 0x6E4A
+0x9175 = 0x395A
+0x9177 = 0x3973
+0x9178 = 0x3B40
+0x9182 = 0x6E4E
+0x9187 = 0x3D66
+0x9189 = 0x6E4D
+0x918B = 0x6E4C
+0x918D = 0x4269
+0x9190 = 0x386F
+0x9192 = 0x4043
+0x9197 = 0x4830
+0x919C = 0x3D39
+0x91A2 = 0x6E4F
+0x91A4 = 0x3E5F
+0x91AA = 0x6E52
+0x91AB = 0x6E50
+0x91AF = 0x6E51
+0x91B4 = 0x6E54
+0x91B5 = 0x6E53
+0x91B8 = 0x3E7A
+0x91BA = 0x6E55
+0x91C0 = 0x6E56
+0x91C1 = 0x6E57
+0x91C6 = 0x4850
+0x91C7 = 0x3A53
+0x91C8 = 0x3C61
+0x91C9 = 0x6E58
+0x91CB = 0x6E59
+0x91CC = 0x4E24
+0x91CD = 0x3D45
+0x91CE = 0x4C6E
+0x91CF = 0x4E4C
+0x91D0 = 0x6E5A
+0x91D1 = 0x3662
+0x91D6 = 0x6E5B
+0x91D8 = 0x4523
+0x91DB = 0x6E5E
+0x91DC = 0x3378
+0x91DD = 0x3F4B
+0x91DF = 0x6E5C
+0x91E1 = 0x6E5D
+0x91E3 = 0x4460
+0x91E6 = 0x4B55
+0x91E7 = 0x367C
+0x91F5 = 0x6E60
+0x91F6 = 0x6E61
+0x91FC = 0x6E5F
+0x91FF = 0x6E63
+0x920D = 0x465F
+0x920E = 0x3343
+0x9211 = 0x6E67
+0x9214 = 0x6E64
+0x9215 = 0x6E66
+0x921E = 0x6E62
+0x9229 = 0x6F4F
+0x922C = 0x6E65
+0x9234 = 0x4E6B
+0x9237 = 0x385A
+0x923F = 0x6E6F
+0x9244 = 0x4534
+0x9245 = 0x6E6A
+0x9248 = 0x6E6D
+0x9249 = 0x6E6B
+0x924B = 0x6E70
+0x9250 = 0x6E71
+0x9257 = 0x6E69
+0x925A = 0x6E76
+0x925B = 0x3174
+0x925E = 0x6E68
+0x9262 = 0x482D
+0x9264 = 0x6E6C
+0x9266 = 0x3E60
+0x9271 = 0x395B
+0x927E = 0x4B48
+0x9280 = 0x3664
+0x9283 = 0x3D46
+0x9285 = 0x463C
+0x9291 = 0x412D
+0x9293 = 0x6E74
+0x9295 = 0x6E6E
+0x9296 = 0x6E73
+0x9298 = 0x4C43
+0x929A = 0x4438
+0x929B = 0x6E75
+0x929C = 0x6E72
+0x92AD = 0x412C
+0x92B7 = 0x6E79
+0x92B9 = 0x6E78
+0x92CF = 0x6E77
+0x92D2 = 0x4B2F
+0x92E4 = 0x3D7B
+0x92E9 = 0x6E7A
+0x92EA = 0x4A5F
+0x92ED = 0x3154
+0x92F2 = 0x4946
+0x92F3 = 0x4372
+0x92F8 = 0x3578
+0x92FA = 0x6E7C
+0x92FC = 0x395D
+0x9306 = 0x3B2C
+0x930F = 0x6E7B
+0x9310 = 0x3F6D
+0x9318 = 0x3F6E
+0x9319 = 0x6F21
+0x931A = 0x6F23
+0x9320 = 0x3E7B
+0x9322 = 0x6F22
+0x9323 = 0x6F24
+0x9326 = 0x3653
+0x9328 = 0x4945
+0x932B = 0x3C62
+0x932C = 0x4F23
+0x932E = 0x6E7E
+0x932F = 0x3A78
+0x9332 = 0x4F3F
+0x9335 = 0x6F26
+0x933A = 0x6F25
+0x933B = 0x6F27
+0x9344 = 0x6E7D
+0x934B = 0x4669
+0x934D = 0x4555
+0x9354 = 0x4457
+0x9356 = 0x6F2C
+0x935B = 0x4343
+0x935C = 0x6F28
+0x9360 = 0x6F29
+0x936C = 0x372D
+0x936E = 0x6F2B
+0x9375 = 0x3830
+0x937C = 0x6F2A
+0x937E = 0x3E61
+0x938C = 0x3379
+0x9394 = 0x6F30
+0x9396 = 0x3A3F
+0x9397 = 0x4179
+0x939A = 0x444A
+0x93A7 = 0x333B
+0x93AC = 0x6F2E
+0x93AD = 0x6F2F
+0x93AE = 0x4443
+0x93B0 = 0x6F2D
+0x93B9 = 0x6F31
+0x93C3 = 0x6F37
+0x93C8 = 0x6F3A
+0x93D0 = 0x6F39
+0x93D1 = 0x452D
+0x93D6 = 0x6F32
+0x93D7 = 0x6F33
+0x93D8 = 0x6F36
+0x93DD = 0x6F38
+0x93E1 = 0x3640
+0x93E4 = 0x6F3B
+0x93E5 = 0x6F35
+0x93E8 = 0x6F34
+0x9403 = 0x6F3F
+0x9407 = 0x6F40
+0x9410 = 0x6F41
+0x9413 = 0x6F3E
+0x9414 = 0x6F3D
+0x9418 = 0x3E62
+0x9419 = 0x462A
+0x941A = 0x6F3C
+0x9421 = 0x6F45
+0x942B = 0x6F43
+0x9435 = 0x6F44
+0x9436 = 0x6F42
+0x9438 = 0x4278
+0x943A = 0x6F46
+0x9441 = 0x6F47
+0x9444 = 0x6F49
+0x9451 = 0x3455
+0x9452 = 0x6F48
+0x9453 = 0x4C7A
+0x945A = 0x6F54
+0x945B = 0x6F4A
+0x945E = 0x6F4D
+0x9460 = 0x6F4B
+0x9462 = 0x6F4C
+0x946A = 0x6F4E
+0x9470 = 0x6F50
+0x9475 = 0x6F51
+0x9477 = 0x6F52
+0x947C = 0x6F55
+0x947D = 0x6F53
+0x947E = 0x6F56
+0x947F = 0x6F58
+0x9481 = 0x6F57
+0x9577 = 0x4439
+0x9580 = 0x4C67
+0x9582 = 0x6F59
+0x9583 = 0x412E
+0x9587 = 0x6F5A
+0x9589 = 0x4A44
+0x958A = 0x6F5B
+0x958B = 0x332B
+0x958F = 0x313C
+0x9591 = 0x3457
+0x9593 = 0x3456
+0x9594 = 0x6F5C
+0x9596 = 0x6F5D
+0x9598 = 0x6F5E
+0x9599 = 0x6F5F
+0x95A0 = 0x6F60
+0x95A2 = 0x3458
+0x95A3 = 0x3355
+0x95A4 = 0x395E
+0x95A5 = 0x4836
+0x95A7 = 0x6F62
+0x95A8 = 0x6F61
+0x95AD = 0x6F63
+0x95B2 = 0x315C
+0x95B9 = 0x6F66
+0x95BB = 0x6F65
+0x95BC = 0x6F64
+0x95BE = 0x6F67
+0x95C3 = 0x6F6A
+0x95C7 = 0x3047
+0x95CA = 0x6F68
+0x95CC = 0x6F6C
+0x95CD = 0x6F6B
+0x95D4 = 0x6F6E
+0x95D5 = 0x6F6D
+0x95D6 = 0x6F6F
+0x95D8 = 0x462E
+0x95DC = 0x6F70
+0x95E1 = 0x6F71
+0x95E2 = 0x6F73
+0x95E5 = 0x6F72
+0x961C = 0x496C
+0x9621 = 0x6F74
+0x9628 = 0x6F75
+0x962A = 0x3A65
+0x962E = 0x6F76
+0x962F = 0x6F77
+0x9632 = 0x4B49
+0x963B = 0x414B
+0x963F = 0x3024
+0x9640 = 0x424B
+0x9642 = 0x6F78
+0x9644 = 0x496D
+0x964B = 0x6F7B
+0x964C = 0x6F79
+0x964D = 0x395F
+0x964F = 0x6F7A
+0x9650 = 0x3842
+0x965B = 0x4A45
+0x965C = 0x6F7D
+0x965D = 0x7021
+0x965E = 0x6F7E
+0x965F = 0x7022
+0x9662 = 0x3121
+0x9663 = 0x3F58
+0x9664 = 0x3D7C
+0x9665 = 0x3459
+0x9666 = 0x7023
+0x966A = 0x4766
+0x966C = 0x7025
+0x9670 = 0x3122
+0x9672 = 0x7024
+0x9673 = 0x4444
+0x9675 = 0x4E4D
+0x9676 = 0x462B
+0x9677 = 0x6F7C
+0x9678 = 0x4E26
+0x967A = 0x3831
+0x967D = 0x4D5B
+0x9685 = 0x3679
+0x9686 = 0x4E34
+0x9688 = 0x3728
+0x968A = 0x4262
+0x968B = 0x6721
+0x968D = 0x7026
+0x968E = 0x332C
+0x968F = 0x3F6F
+0x9694 = 0x3356
+0x9695 = 0x7028
+0x9697 = 0x7029
+0x9698 = 0x7027
+0x9699 = 0x3764
+0x969B = 0x3A5D
+0x969C = 0x3E63
+0x96A0 = 0x3123
+0x96A3 = 0x4E59
+0x96A7 = 0x702B
+0x96A8 = 0x6E2E
+0x96AA = 0x702A
+0x96B0 = 0x702E
+0x96B1 = 0x702C
+0x96B2 = 0x702D
+0x96B4 = 0x702F
+0x96B6 = 0x7030
+0x96B7 = 0x4E6C
+0x96B8 = 0x7031
+0x96B9 = 0x7032
+0x96BB = 0x4049
+0x96BC = 0x483B
+0x96C0 = 0x3F7D
+0x96C1 = 0x3467
+0x96C4 = 0x4D3A
+0x96C5 = 0x326D
+0x96C6 = 0x3D38
+0x96C7 = 0x385B
+0x96C9 = 0x7035
+0x96CB = 0x7034
+0x96CC = 0x3B73
+0x96CD = 0x7036
+0x96CE = 0x7033
+0x96D1 = 0x3B28
+0x96D5 = 0x703A
+0x96D6 = 0x6A2D
+0x96D9 = 0x5256
+0x96DB = 0x3F77
+0x96DC = 0x7038
+0x96E2 = 0x4E25
+0x96E3 = 0x4671
+0x96E8 = 0x312B
+0x96EA = 0x4063
+0x96EB = 0x3C36
+0x96F0 = 0x4A37
+0x96F2 = 0x3140
+0x96F6 = 0x4E6D
+0x96F7 = 0x4D6B
+0x96F9 = 0x703B
+0x96FB = 0x4545
+0x9700 = 0x3C7B
+0x9704 = 0x703C
+0x9706 = 0x703D
+0x9707 = 0x3F4C
+0x9708 = 0x703E
+0x970A = 0x4E6E
+0x970D = 0x7039
+0x970E = 0x7040
+0x970F = 0x7042
+0x9711 = 0x7041
+0x9713 = 0x703F
+0x9716 = 0x7043
+0x9719 = 0x7044
+0x971C = 0x417A
+0x971E = 0x3262
+0x9724 = 0x7045
+0x9727 = 0x4C38
+0x972A = 0x7046
+0x9730 = 0x7047
+0x9732 = 0x4F2A
+0x9738 = 0x5B31
+0x9739 = 0x7048
+0x973D = 0x7049
+0x973E = 0x704A
+0x9742 = 0x704E
+0x9744 = 0x704B
+0x9746 = 0x704C
+0x9748 = 0x704D
+0x9749 = 0x704F
+0x9752 = 0x4044
+0x9756 = 0x4C77
+0x9759 = 0x4045
+0x975C = 0x7050
+0x975E = 0x4873
+0x9760 = 0x7051
+0x9761 = 0x7353
+0x9762 = 0x4C4C
+0x9764 = 0x7052
+0x9766 = 0x7053
+0x9768 = 0x7054
+0x9769 = 0x3357
+0x976B = 0x7056
+0x976D = 0x3F59
+0x9771 = 0x7057
+0x9774 = 0x3724
+0x9779 = 0x7058
+0x977A = 0x705C
+0x977C = 0x705A
+0x9781 = 0x705B
+0x9784 = 0x3373
+0x9785 = 0x7059
+0x9786 = 0x705D
+0x978B = 0x705E
+0x978D = 0x3048
+0x978F = 0x705F
+0x9790 = 0x7060
+0x9798 = 0x3E64
+0x979C = 0x7061
+0x97A0 = 0x3547
+0x97A3 = 0x7064
+0x97A6 = 0x7063
+0x97A8 = 0x7062
+0x97AB = 0x6B71
+0x97AD = 0x4A5C
+0x97B3 = 0x7065
+0x97B4 = 0x7066
+0x97C3 = 0x7067
+0x97C6 = 0x7068
+0x97C8 = 0x7069
+0x97CB = 0x706A
+0x97D3 = 0x345A
+0x97DC = 0x706B
+0x97ED = 0x706C
+0x97EE = 0x4723
+0x97F2 = 0x706E
+0x97F3 = 0x323B
+0x97F5 = 0x7071
+0x97F6 = 0x7070
+0x97FB = 0x3124
+0x97FF = 0x3641
+0x9801 = 0x4A47
+0x9802 = 0x443A
+0x9803 = 0x3A22
+0x9805 = 0x3960
+0x9806 = 0x3D67
+0x9808 = 0x3F5C
+0x980C = 0x7073
+0x980F = 0x7072
+0x9810 = 0x4D42
+0x9811 = 0x3468
+0x9812 = 0x4852
+0x9813 = 0x465C
+0x9817 = 0x3F7C
+0x9818 = 0x4E4E
+0x981A = 0x375B
+0x9821 = 0x7076
+0x9824 = 0x7075
+0x982C = 0x4B4B
+0x982D = 0x462C
+0x9834 = 0x3150
+0x9837 = 0x7077
+0x9838 = 0x7074
+0x983B = 0x4951
+0x983C = 0x4D6A
+0x983D = 0x7078
+0x9846 = 0x7079
+0x984B = 0x707B
+0x984C = 0x426A
+0x984D = 0x335B
+0x984E = 0x335C
+0x984F = 0x707A
+0x9854 = 0x3469
+0x9855 = 0x3832
+0x9858 = 0x346A
+0x985B = 0x453F
+0x985E = 0x4E60
+0x9867 = 0x385C
+0x986B = 0x707C
+0x986F = 0x707D
+0x9870 = 0x707E
+0x9871 = 0x7121
+0x9873 = 0x7123
+0x9874 = 0x7122
+0x98A8 = 0x4977
+0x98AA = 0x7124
+0x98AF = 0x7125
+0x98B1 = 0x7126
+0x98B6 = 0x7127
+0x98C3 = 0x7129
+0x98C4 = 0x7128
+0x98C6 = 0x712A
+0x98DB = 0x4874
+0x98DC = 0x664C
+0x98DF = 0x3F29
+0x98E2 = 0x3532
+0x98E9 = 0x712B
+0x98EB = 0x712C
+0x98ED = 0x522C
+0x98EE = 0x5D3B
+0x98EF = 0x4853
+0x98F2 = 0x307B
+0x98F4 = 0x303B
+0x98FC = 0x3B74
+0x98FD = 0x4B30
+0x98FE = 0x3E7E
+0x9903 = 0x712D
+0x9905 = 0x4C5F
+0x9909 = 0x712E
+0x990A = 0x4D5C
+0x990C = 0x3142
+0x9910 = 0x3B41
+0x9912 = 0x712F
+0x9913 = 0x326E
+0x9914 = 0x7130
+0x9918 = 0x7131
+0x991D = 0x7133
+0x991E = 0x7134
+0x9920 = 0x7136
+0x9921 = 0x7132
+0x9924 = 0x7135
+0x9928 = 0x345B
+0x992C = 0x7137
+0x992E = 0x7138
+0x993D = 0x7139
+0x993E = 0x713A
+0x9942 = 0x713B
+0x9945 = 0x713D
+0x9949 = 0x713C
+0x994B = 0x713F
+0x994C = 0x7142
+0x9950 = 0x713E
+0x9951 = 0x7140
+0x9952 = 0x7141
+0x9955 = 0x7143
+0x9957 = 0x3642
+0x9996 = 0x3C73
+0x9997 = 0x7144
+0x9998 = 0x7145
+0x9999 = 0x3961
+0x99A5 = 0x7146
+0x99A8 = 0x333E
+0x99AC = 0x474F
+0x99AD = 0x7147
+0x99AE = 0x7148
+0x99B3 = 0x435A
+0x99B4 = 0x466B
+0x99BC = 0x7149
+0x99C1 = 0x477D
+0x99C4 = 0x424C
+0x99C5 = 0x3158
+0x99C6 = 0x366E
+0x99C8 = 0x366F
+0x99D0 = 0x4373
+0x99D1 = 0x714E
+0x99D2 = 0x3670
+0x99D5 = 0x326F
+0x99D8 = 0x714D
+0x99DB = 0x714B
+0x99DD = 0x714C
+0x99DF = 0x714A
+0x99E2 = 0x7158
+0x99ED = 0x714F
+0x99EE = 0x7150
+0x99F1 = 0x7151
+0x99F2 = 0x7152
+0x99F8 = 0x7154
+0x99FB = 0x7153
+0x99FF = 0x3D59
+0x9A01 = 0x7155
+0x9A05 = 0x7157
+0x9A0E = 0x3533
+0x9A0F = 0x7156
+0x9A12 = 0x417B
+0x9A13 = 0x3833
+0x9A19 = 0x7159
+0x9A28 = 0x424D
+0x9A2B = 0x715A
+0x9A30 = 0x462D
+0x9A37 = 0x715B
+0x9A3E = 0x7160
+0x9A40 = 0x715E
+0x9A42 = 0x715D
+0x9A43 = 0x715F
+0x9A45 = 0x715C
+0x9A4D = 0x7162
+0x9A55 = 0x7161
+0x9A57 = 0x7164
+0x9A5A = 0x3643
+0x9A5B = 0x7163
+0x9A5F = 0x7165
+0x9A62 = 0x7166
+0x9A64 = 0x7168
+0x9A65 = 0x7167
+0x9A69 = 0x7169
+0x9A6A = 0x716B
+0x9A6B = 0x716A
+0x9AA8 = 0x397C
+0x9AAD = 0x716C
+0x9AB0 = 0x716D
+0x9AB8 = 0x333C
+0x9ABC = 0x716E
+0x9AC0 = 0x716F
+0x9AC4 = 0x3F71
+0x9ACF = 0x7170
+0x9AD1 = 0x7171
+0x9AD3 = 0x7172
+0x9AD4 = 0x7173
+0x9AD8 = 0x3962
+0x9ADE = 0x7174
+0x9ADF = 0x7175
+0x9AE2 = 0x7176
+0x9AE3 = 0x7177
+0x9AE6 = 0x7178
+0x9AEA = 0x4831
+0x9AEB = 0x717A
+0x9AED = 0x4926
+0x9AEE = 0x717B
+0x9AEF = 0x7179
+0x9AF1 = 0x717D
+0x9AF4 = 0x717C
+0x9AF7 = 0x717E
+0x9AFB = 0x7221
+0x9B06 = 0x7222
+0x9B18 = 0x7223
+0x9B1A = 0x7224
+0x9B1F = 0x7225
+0x9B22 = 0x7226
+0x9B23 = 0x7227
+0x9B25 = 0x7228
+0x9B27 = 0x7229
+0x9B28 = 0x722A
+0x9B29 = 0x722B
+0x9B2A = 0x722C
+0x9B2E = 0x722D
+0x9B2F = 0x722E
+0x9B31 = 0x5D35
+0x9B32 = 0x722F
+0x9B3B = 0x6478
+0x9B3C = 0x3534
+0x9B41 = 0x3321
+0x9B42 = 0x3A32
+0x9B43 = 0x7231
+0x9B44 = 0x7230
+0x9B45 = 0x4C25
+0x9B4D = 0x7233
+0x9B4E = 0x7234
+0x9B4F = 0x7232
+0x9B51 = 0x7235
+0x9B54 = 0x4B62
+0x9B58 = 0x7236
+0x9B5A = 0x357B
+0x9B6F = 0x4F25
+0x9B74 = 0x7237
+0x9B83 = 0x7239
+0x9B8E = 0x303E
+0x9B91 = 0x723A
+0x9B92 = 0x4A2B
+0x9B93 = 0x7238
+0x9B96 = 0x723B
+0x9B97 = 0x723C
+0x9B9F = 0x723D
+0x9BA0 = 0x723E
+0x9BA8 = 0x723F
+0x9BAA = 0x4B6E
+0x9BAB = 0x3B2D
+0x9BAD = 0x3A7A
+0x9BAE = 0x412F
+0x9BB4 = 0x7240
+0x9BB9 = 0x7243
+0x9BC0 = 0x7241
+0x9BC6 = 0x7244
+0x9BC9 = 0x3871
+0x9BCA = 0x7242
+0x9BCF = 0x7245
+0x9BD1 = 0x7246
+0x9BD2 = 0x7247
+0x9BD4 = 0x724B
+0x9BD6 = 0x3B2A
+0x9BDB = 0x4264
+0x9BE1 = 0x724C
+0x9BE2 = 0x7249
+0x9BE3 = 0x7248
+0x9BE4 = 0x724A
+0x9BE8 = 0x375F
+0x9BF0 = 0x7250
+0x9BF1 = 0x724F
+0x9BF2 = 0x724E
+0x9BF5 = 0x3033
+0x9C04 = 0x725A
+0x9C06 = 0x7256
+0x9C08 = 0x7257
+0x9C09 = 0x7253
+0x9C0A = 0x7259
+0x9C0C = 0x7255
+0x9C0D = 0x3362
+0x9C10 = 0x4F4C
+0x9C12 = 0x7258
+0x9C13 = 0x7254
+0x9C14 = 0x7252
+0x9C15 = 0x7251
+0x9C1B = 0x725C
+0x9C21 = 0x725F
+0x9C24 = 0x725E
+0x9C25 = 0x725D
+0x9C2D = 0x4949
+0x9C2E = 0x725B
+0x9C2F = 0x3073
+0x9C30 = 0x7260
+0x9C32 = 0x7262
+0x9C39 = 0x336F
+0x9C3A = 0x724D
+0x9C3B = 0x3137
+0x9C3E = 0x7264
+0x9C46 = 0x7263
+0x9C47 = 0x7261
+0x9C48 = 0x432D
+0x9C52 = 0x4B70
+0x9C57 = 0x4E5A
+0x9C5A = 0x7265
+0x9C60 = 0x7266
+0x9C67 = 0x7267
+0x9C76 = 0x7268
+0x9C78 = 0x7269
+0x9CE5 = 0x443B
+0x9CE7 = 0x726A
+0x9CE9 = 0x4837
+0x9CEB = 0x726F
+0x9CEC = 0x726B
+0x9CF0 = 0x726C
+0x9CF3 = 0x4B31
+0x9CF4 = 0x4C44
+0x9CF6 = 0x4650
+0x9D03 = 0x7270
+0x9D06 = 0x7271
+0x9D07 = 0x463E
+0x9D08 = 0x726E
+0x9D09 = 0x726D
+0x9D0E = 0x322A
+0x9D12 = 0x7279
+0x9D15 = 0x7278
+0x9D1B = 0x3175
+0x9D1F = 0x7276
+0x9D23 = 0x7275
+0x9D26 = 0x7273
+0x9D28 = 0x337B
+0x9D2A = 0x7272
+0x9D2B = 0x3C32
+0x9D2C = 0x3229
+0x9D3B = 0x3963
+0x9D3E = 0x727C
+0x9D3F = 0x727B
+0x9D41 = 0x727A
+0x9D44 = 0x7277
+0x9D46 = 0x727D
+0x9D48 = 0x727E
+0x9D50 = 0x7325
+0x9D51 = 0x7324
+0x9D59 = 0x7326
+0x9D5C = 0x312D
+0x9D5D = 0x7321
+0x9D5E = 0x7322
+0x9D60 = 0x3974
+0x9D61 = 0x4C39
+0x9D64 = 0x7323
+0x9D6C = 0x4B32
+0x9D6F = 0x732B
+0x9D72 = 0x7327
+0x9D7A = 0x732C
+0x9D87 = 0x7329
+0x9D89 = 0x7328
+0x9D8F = 0x375C
+0x9D9A = 0x732D
+0x9DA4 = 0x732E
+0x9DA9 = 0x732F
+0x9DAB = 0x732A
+0x9DAF = 0x7274
+0x9DB2 = 0x7330
+0x9DB4 = 0x4461
+0x9DB8 = 0x7334
+0x9DBA = 0x7335
+0x9DBB = 0x7333
+0x9DC1 = 0x7332
+0x9DC2 = 0x7338
+0x9DC4 = 0x7331
+0x9DC6 = 0x7336
+0x9DCF = 0x7337
+0x9DD3 = 0x733A
+0x9DD9 = 0x7339
+0x9DE6 = 0x733C
+0x9DED = 0x733D
+0x9DEF = 0x733E
+0x9DF2 = 0x4F49
+0x9DF8 = 0x733B
+0x9DF9 = 0x426B
+0x9DFA = 0x3A6D
+0x9DFD = 0x733F
+0x9E1A = 0x7340
+0x9E1B = 0x7341
+0x9E1E = 0x7342
+0x9E75 = 0x7343
+0x9E78 = 0x3834
+0x9E79 = 0x7344
+0x9E7D = 0x7345
+0x9E7F = 0x3C2F
+0x9E81 = 0x7346
+0x9E88 = 0x7347
+0x9E8B = 0x7348
+0x9E8C = 0x7349
+0x9E91 = 0x734C
+0x9E92 = 0x734A
+0x9E93 = 0x4F3C
+0x9E95 = 0x734B
+0x9E97 = 0x4E6F
+0x9E9D = 0x734D
+0x9E9F = 0x4E5B
+0x9EA5 = 0x734E
+0x9EA6 = 0x477E
+0x9EA9 = 0x734F
+0x9EAA = 0x7351
+0x9EAD = 0x7352
+0x9EB8 = 0x7350
+0x9EB9 = 0x396D
+0x9EBA = 0x4C4D
+0x9EBB = 0x4B63
+0x9EBC = 0x5677
+0x9EBE = 0x5D60
+0x9EBF = 0x4B7B
+0x9EC4 = 0x322B
+0x9ECC = 0x7354
+0x9ECD = 0x3550
+0x9ECE = 0x7355
+0x9ECF = 0x7356
+0x9ED0 = 0x7357
+0x9ED2 = 0x3975
+0x9ED4 = 0x7358
+0x9ED8 = 0x6054
+0x9ED9 = 0x4C5B
+0x9EDB = 0x4263
+0x9EDC = 0x7359
+0x9EDD = 0x735B
+0x9EDE = 0x735A
+0x9EE0 = 0x735C
+0x9EE5 = 0x735D
+0x9EE8 = 0x735E
+0x9EEF = 0x735F
+0x9EF4 = 0x7360
+0x9EF6 = 0x7361
+0x9EF7 = 0x7362
+0x9EF9 = 0x7363
+0x9EFB = 0x7364
+0x9EFC = 0x7365
+0x9EFD = 0x7366
+0x9F07 = 0x7367
+0x9F08 = 0x7368
+0x9F0E = 0x4524
+0x9F13 = 0x385D
+0x9F15 = 0x736A
+0x9F20 = 0x414D
+0x9F21 = 0x736B
+0x9F2C = 0x736C
+0x9F3B = 0x4921
+0x9F3E = 0x736D
+0x9F4A = 0x736E
+0x9F4B = 0x6337
+0x9F4E = 0x6C5A
+0x9F4F = 0x706D
+0x9F52 = 0x736F
+0x9F54 = 0x7370
+0x9F5F = 0x7372
+0x9F60 = 0x7373
+0x9F61 = 0x7374
+0x9F62 = 0x4E70
+0x9F63 = 0x7371
+0x9F66 = 0x7375
+0x9F67 = 0x7376
+0x9F6A = 0x7378
+0x9F6C = 0x7377
+0x9F72 = 0x737A
+0x9F76 = 0x737B
+0x9F77 = 0x7379
+0x9F8D = 0x4E36
+0x9F95 = 0x737C
+0x9F9C = 0x737D
+0x9F9D = 0x6354
+0x9FA0 = 0x737E
+0xFF01 = 0x212A
+0xFF03 = 0x2174
+0xFF04 = 0x2170
+0xFF05 = 0x2173
+0xFF06 = 0x2175
+0xFF08 = 0x214A
+0xFF09 = 0x214B
+0xFF0A = 0x2176
+0xFF0B = 0x215C
+0xFF0C = 0x2124
+0xFF0E = 0x2125
+0xFF0F = 0x213F
+0xFF10 = 0x2330
+0xFF11 = 0x2331
+0xFF12 = 0x2332
+0xFF13 = 0x2333
+0xFF14 = 0x2334
+0xFF15 = 0x2335
+0xFF16 = 0x2336
+0xFF17 = 0x2337
+0xFF18 = 0x2338
+0xFF19 = 0x2339
+0xFF1A = 0x2127
+0xFF1B = 0x2128
+0xFF1C = 0x2163
+0xFF1D = 0x2161
+0xFF1E = 0x2164
+0xFF1F = 0x2129
+0xFF20 = 0x2177
+0xFF21 = 0x2341
+0xFF22 = 0x2342
+0xFF23 = 0x2343
+0xFF24 = 0x2344
+0xFF25 = 0x2345
+0xFF26 = 0x2346
+0xFF27 = 0x2347
+0xFF28 = 0x2348
+0xFF29 = 0x2349
+0xFF2A = 0x234A
+0xFF2B = 0x234B
+0xFF2C = 0x234C
+0xFF2D = 0x234D
+0xFF2E = 0x234E
+0xFF2F = 0x234F
+0xFF30 = 0x2350
+0xFF31 = 0x2351
+0xFF32 = 0x2352
+0xFF33 = 0x2353
+0xFF34 = 0x2354
+0xFF35 = 0x2355
+0xFF36 = 0x2356
+0xFF37 = 0x2357
+0xFF38 = 0x2358
+0xFF39 = 0x2359
+0xFF3A = 0x235A
+0xFF3B = 0x214E
+0xFF3C = 0x2140
+0xFF3D = 0x214F
+0xFF3E = 0x2130
+0xFF3F = 0x2132
+0xFF40 = 0x212E
+0xFF41 = 0x2361
+0xFF42 = 0x2362
+0xFF43 = 0x2363
+0xFF44 = 0x2364
+0xFF45 = 0x2365
+0xFF46 = 0x2366
+0xFF47 = 0x2367
+0xFF48 = 0x2368
+0xFF49 = 0x2369
+0xFF4A = 0x236A
+0xFF4B = 0x236B
+0xFF4C = 0x236C
+0xFF4D = 0x236D
+0xFF4E = 0x236E
+0xFF4F = 0x236F
+0xFF50 = 0x2370
+0xFF51 = 0x2371
+0xFF52 = 0x2372
+0xFF53 = 0x2373
+0xFF54 = 0x2374
+0xFF55 = 0x2375
+0xFF56 = 0x2376
+0xFF57 = 0x2377
+0xFF58 = 0x2378
+0xFF59 = 0x2379
+0xFF5A = 0x237A
+0xFF5B = 0x2150
+0xFF5C = 0x2143
+0xFF5D = 0x2151
+0xFFE3 = 0x2131
+0xFFE5 = 0x216F
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208@MS.src b/enc/trans/JIS/UCS%JISX0208@MS.src
new file mode 100644
index 0000000000..7fa662ee96
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0208@MS.src
@@ -0,0 +1,6894 @@
+# $NetBSD: UCS%JISX0208@MS.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0208:MS"
+SRC_ZONE	0x0000 - 0xFFFF
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x0000 - 0xFFFF		= INVALID
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x00A7 = 0x2178
+0x00A8 = 0x212F
+0x00B0 = 0x216B
+0x00B1 = 0x215E
+0x00B4 = 0x212D
+0x00B6 = 0x2279
+0x00D7 = 0x215F
+0x00F7 = 0x2160
+0x0391 = 0x2621
+0x0392 = 0x2622
+0x0393 = 0x2623
+0x0394 = 0x2624
+0x0395 = 0x2625
+0x0396 = 0x2626
+0x0397 = 0x2627
+0x0398 = 0x2628
+0x0399 = 0x2629
+0x039A = 0x262A
+0x039B = 0x262B
+0x039C = 0x262C
+0x039D = 0x262D
+0x039E = 0x262E
+0x039F = 0x262F
+0x03A0 = 0x2630
+0x03A1 = 0x2631
+0x03A3 = 0x2632
+0x03A4 = 0x2633
+0x03A5 = 0x2634
+0x03A6 = 0x2635
+0x03A7 = 0x2636
+0x03A8 = 0x2637
+0x03A9 = 0x2638
+0x03B1 = 0x2641
+0x03B2 = 0x2642
+0x03B3 = 0x2643
+0x03B4 = 0x2644
+0x03B5 = 0x2645
+0x03B6 = 0x2646
+0x03B7 = 0x2647
+0x03B8 = 0x2648
+0x03B9 = 0x2649
+0x03BA = 0x264A
+0x03BB = 0x264B
+0x03BC = 0x264C
+0x03BD = 0x264D
+0x03BE = 0x264E
+0x03BF = 0x264F
+0x03C0 = 0x2650
+0x03C1 = 0x2651
+0x03C3 = 0x2652
+0x03C4 = 0x2653
+0x03C5 = 0x2654
+0x03C6 = 0x2655
+0x03C7 = 0x2656
+0x03C8 = 0x2657
+0x03C9 = 0x2658
+0x0401 = 0x2727
+0x0410 = 0x2721
+0x0411 = 0x2722
+0x0412 = 0x2723
+0x0413 = 0x2724
+0x0414 = 0x2725
+0x0415 = 0x2726
+0x0416 = 0x2728
+0x0417 = 0x2729
+0x0418 = 0x272A
+0x0419 = 0x272B
+0x041A = 0x272C
+0x041B = 0x272D
+0x041C = 0x272E
+0x041D = 0x272F
+0x041E = 0x2730
+0x041F = 0x2731
+0x0420 = 0x2732
+0x0421 = 0x2733
+0x0422 = 0x2734
+0x0423 = 0x2735
+0x0424 = 0x2736
+0x0425 = 0x2737
+0x0426 = 0x2738
+0x0427 = 0x2739
+0x0428 = 0x273A
+0x0429 = 0x273B
+0x042A = 0x273C
+0x042B = 0x273D
+0x042C = 0x273E
+0x042D = 0x273F
+0x042E = 0x2740
+0x042F = 0x2741
+0x0430 = 0x2751
+0x0431 = 0x2752
+0x0432 = 0x2753
+0x0433 = 0x2754
+0x0434 = 0x2755
+0x0435 = 0x2756
+0x0436 = 0x2758
+0x0437 = 0x2759
+0x0438 = 0x275A
+0x0439 = 0x275B
+0x043A = 0x275C
+0x043B = 0x275D
+0x043C = 0x275E
+0x043D = 0x275F
+0x043E = 0x2760
+0x043F = 0x2761
+0x0440 = 0x2762
+0x0441 = 0x2763
+0x0442 = 0x2764
+0x0443 = 0x2765
+0x0444 = 0x2766
+0x0445 = 0x2767
+0x0446 = 0x2768
+0x0447 = 0x2769
+0x0448 = 0x276A
+0x0449 = 0x276B
+0x044A = 0x276C
+0x044B = 0x276D
+0x044C = 0x276E
+0x044D = 0x276F
+0x044E = 0x2770
+0x044F = 0x2771
+0x0451 = 0x2757
+0x2010 = 0x213E
+0x2015 = 0x213D
+0x2018 = 0x2146
+0x2019 = 0x2147
+0x201C = 0x2148
+0x201D = 0x2149
+0x2020 = 0x2277
+0x2021 = 0x2278
+0x2025 = 0x2145
+0x2026 = 0x2144
+0x2030 = 0x2273
+0x2032 = 0x216C
+0x2033 = 0x216D
+0x203B = 0x2228
+0x2103 = 0x216E
+0x212B = 0x2272
+0x2190 = 0x222B
+0x2191 = 0x222C
+0x2192 = 0x222A
+0x2193 = 0x222D
+0x21D2 = 0x224D
+0x21D4 = 0x224E
+0x2200 = 0x224F
+0x2202 = 0x225F
+0x2203 = 0x2250
+0x2207 = 0x2260
+0x2208 = 0x223A
+0x220B = 0x223B
+0x221A = 0x2265
+0x221D = 0x2267
+0x221E = 0x2167
+0x2220 = 0x225C
+0x2225 = 0x2142
+0x2227 = 0x224A
+0x2228 = 0x224B
+0x2229 = 0x2241
+0x222A = 0x2240
+0x222B = 0x2269
+0x222C = 0x226A
+0x2234 = 0x2168
+0x2235 = 0x2268
+0x223D = 0x2266
+0x2252 = 0x2262
+0x2260 = 0x2162
+0x2261 = 0x2261
+0x2266 = 0x2165
+0x2267 = 0x2166
+0x226A = 0x2263
+0x226B = 0x2264
+0x2282 = 0x223E
+0x2283 = 0x223F
+0x2286 = 0x223C
+0x2287 = 0x223D
+0x22A5 = 0x225D
+0x2312 = 0x225E
+0x2500 = 0x2821
+0x2501 = 0x282C
+0x2502 = 0x2822
+0x2503 = 0x282D
+0x250C = 0x2823
+0x250F = 0x282E
+0x2510 = 0x2824
+0x2513 = 0x282F
+0x2514 = 0x2826
+0x2517 = 0x2831
+0x2518 = 0x2825
+0x251B = 0x2830
+0x251C = 0x2827
+0x251D = 0x283C
+0x2520 = 0x2837
+0x2523 = 0x2832
+0x2524 = 0x2829
+0x2525 = 0x283E
+0x2528 = 0x2839
+0x252B = 0x2834
+0x252C = 0x2828
+0x252F = 0x2838
+0x2530 = 0x283D
+0x2533 = 0x2833
+0x2534 = 0x282A
+0x2537 = 0x283A
+0x2538 = 0x283F
+0x253B = 0x2835
+0x253C = 0x282B
+0x253F = 0x283B
+0x2542 = 0x2840
+0x254B = 0x2836
+0x25A0 = 0x2223
+0x25A1 = 0x2222
+0x25B2 = 0x2225
+0x25B3 = 0x2224
+0x25BC = 0x2227
+0x25BD = 0x2226
+0x25C6 = 0x2221
+0x25C7 = 0x217E
+0x25CB = 0x217B
+0x25CE = 0x217D
+0x25CF = 0x217C
+0x25EF = 0x227E
+0x2605 = 0x217A
+0x2606 = 0x2179
+0x2640 = 0x216A
+0x2642 = 0x2169
+0x266A = 0x2276
+0x266D = 0x2275
+0x266F = 0x2274
+0x3000 = 0x2121
+0x3001 = 0x2122
+0x3002 = 0x2123
+0x3003 = 0x2137
+0x3005 = 0x2139
+0x3006 = 0x213A
+0x3007 = 0x213B
+0x3008 = 0x2152
+0x3009 = 0x2153
+0x300A = 0x2154
+0x300B = 0x2155
+0x300C = 0x2156
+0x300D = 0x2157
+0x300E = 0x2158
+0x300F = 0x2159
+0x3010 = 0x215A
+0x3011 = 0x215B
+0x3012 = 0x2229
+0x3013 = 0x222E
+0x3014 = 0x214C
+0x3015 = 0x214D
+0x3041 = 0x2421
+0x3042 = 0x2422
+0x3043 = 0x2423
+0x3044 = 0x2424
+0x3045 = 0x2425
+0x3046 = 0x2426
+0x3047 = 0x2427
+0x3048 = 0x2428
+0x3049 = 0x2429
+0x304A = 0x242A
+0x304B = 0x242B
+0x304C = 0x242C
+0x304D = 0x242D
+0x304E = 0x242E
+0x304F = 0x242F
+0x3050 = 0x2430
+0x3051 = 0x2431
+0x3052 = 0x2432
+0x3053 = 0x2433
+0x3054 = 0x2434
+0x3055 = 0x2435
+0x3056 = 0x2436
+0x3057 = 0x2437
+0x3058 = 0x2438
+0x3059 = 0x2439
+0x305A = 0x243A
+0x305B = 0x243B
+0x305C = 0x243C
+0x305D = 0x243D
+0x305E = 0x243E
+0x305F = 0x243F
+0x3060 = 0x2440
+0x3061 = 0x2441
+0x3062 = 0x2442
+0x3063 = 0x2443
+0x3064 = 0x2444
+0x3065 = 0x2445
+0x3066 = 0x2446
+0x3067 = 0x2447
+0x3068 = 0x2448
+0x3069 = 0x2449
+0x306A = 0x244A
+0x306B = 0x244B
+0x306C = 0x244C
+0x306D = 0x244D
+0x306E = 0x244E
+0x306F = 0x244F
+0x3070 = 0x2450
+0x3071 = 0x2451
+0x3072 = 0x2452
+0x3073 = 0x2453
+0x3074 = 0x2454
+0x3075 = 0x2455
+0x3076 = 0x2456
+0x3077 = 0x2457
+0x3078 = 0x2458
+0x3079 = 0x2459
+0x307A = 0x245A
+0x307B = 0x245B
+0x307C = 0x245C
+0x307D = 0x245D
+0x307E = 0x245E
+0x307F = 0x245F
+0x3080 = 0x2460
+0x3081 = 0x2461
+0x3082 = 0x2462
+0x3083 = 0x2463
+0x3084 = 0x2464
+0x3085 = 0x2465
+0x3086 = 0x2466
+0x3087 = 0x2467
+0x3088 = 0x2468
+0x3089 = 0x2469
+0x308A = 0x246A
+0x308B = 0x246B
+0x308C = 0x246C
+0x308D = 0x246D
+0x308E = 0x246E
+0x308F = 0x246F
+0x3090 = 0x2470
+0x3091 = 0x2471
+0x3092 = 0x2472
+0x3093 = 0x2473
+0x309B = 0x212B
+0x309C = 0x212C
+0x309D = 0x2135
+0x309E = 0x2136
+0x30A1 = 0x2521
+0x30A2 = 0x2522
+0x30A3 = 0x2523
+0x30A4 = 0x2524
+0x30A5 = 0x2525
+0x30A6 = 0x2526
+0x30A7 = 0x2527
+0x30A8 = 0x2528
+0x30A9 = 0x2529
+0x30AA = 0x252A
+0x30AB = 0x252B
+0x30AC = 0x252C
+0x30AD = 0x252D
+0x30AE = 0x252E
+0x30AF = 0x252F
+0x30B0 = 0x2530
+0x30B1 = 0x2531
+0x30B2 = 0x2532
+0x30B3 = 0x2533
+0x30B4 = 0x2534
+0x30B5 = 0x2535
+0x30B6 = 0x2536
+0x30B7 = 0x2537
+0x30B8 = 0x2538
+0x30B9 = 0x2539
+0x30BA = 0x253A
+0x30BB = 0x253B
+0x30BC = 0x253C
+0x30BD = 0x253D
+0x30BE = 0x253E
+0x30BF = 0x253F
+0x30C0 = 0x2540
+0x30C1 = 0x2541
+0x30C2 = 0x2542
+0x30C3 = 0x2543
+0x30C4 = 0x2544
+0x30C5 = 0x2545
+0x30C6 = 0x2546
+0x30C7 = 0x2547
+0x30C8 = 0x2548
+0x30C9 = 0x2549
+0x30CA = 0x254A
+0x30CB = 0x254B
+0x30CC = 0x254C
+0x30CD = 0x254D
+0x30CE = 0x254E
+0x30CF = 0x254F
+0x30D0 = 0x2550
+0x30D1 = 0x2551
+0x30D2 = 0x2552
+0x30D3 = 0x2553
+0x30D4 = 0x2554
+0x30D5 = 0x2555
+0x30D6 = 0x2556
+0x30D7 = 0x2557
+0x30D8 = 0x2558
+0x30D9 = 0x2559
+0x30DA = 0x255A
+0x30DB = 0x255B
+0x30DC = 0x255C
+0x30DD = 0x255D
+0x30DE = 0x255E
+0x30DF = 0x255F
+0x30E0 = 0x2560
+0x30E1 = 0x2561
+0x30E2 = 0x2562
+0x30E3 = 0x2563
+0x30E4 = 0x2564
+0x30E5 = 0x2565
+0x30E6 = 0x2566
+0x30E7 = 0x2567
+0x30E8 = 0x2568
+0x30E9 = 0x2569
+0x30EA = 0x256A
+0x30EB = 0x256B
+0x30EC = 0x256C
+0x30ED = 0x256D
+0x30EE = 0x256E
+0x30EF = 0x256F
+0x30F0 = 0x2570
+0x30F1 = 0x2571
+0x30F2 = 0x2572
+0x30F3 = 0x2573
+0x30F4 = 0x2574
+0x30F5 = 0x2575
+0x30F6 = 0x2576
+0x30FB = 0x2126
+0x30FC = 0x213C
+0x30FD = 0x2133
+0x30FE = 0x2134
+0x4E00 = 0x306C
+0x4E01 = 0x437A
+0x4E03 = 0x3C37
+0x4E07 = 0x4B7C
+0x4E08 = 0x3E66
+0x4E09 = 0x3B30
+0x4E0A = 0x3E65
+0x4E0B = 0x323C
+0x4E0D = 0x4954
+0x4E0E = 0x4D3F
+0x4E10 = 0x5022
+0x4E11 = 0x312F
+0x4E14 = 0x336E
+0x4E15 = 0x5023
+0x4E16 = 0x4024
+0x4E17 = 0x5242
+0x4E18 = 0x3556
+0x4E19 = 0x4A3A
+0x4E1E = 0x3E67
+0x4E21 = 0x4E3E
+0x4E26 = 0x4A42
+0x4E2A = 0x5024
+0x4E2D = 0x4366
+0x4E31 = 0x5025
+0x4E32 = 0x367A
+0x4E36 = 0x5026
+0x4E38 = 0x345D
+0x4E39 = 0x4330
+0x4E3B = 0x3C67
+0x4E3C = 0x5027
+0x4E3F = 0x5028
+0x4E42 = 0x5029
+0x4E43 = 0x4735
+0x4E45 = 0x3557
+0x4E4B = 0x4737
+0x4E4D = 0x4663
+0x4E4E = 0x3843
+0x4E4F = 0x4B33
+0x4E55 = 0x6949
+0x4E56 = 0x502A
+0x4E57 = 0x3E68
+0x4E58 = 0x502B
+0x4E59 = 0x3235
+0x4E5D = 0x3665
+0x4E5E = 0x3870
+0x4E5F = 0x4C69
+0x4E62 = 0x5626
+0x4E71 = 0x4D70
+0x4E73 = 0x467D
+0x4E7E = 0x3425
+0x4E80 = 0x3535
+0x4E82 = 0x502C
+0x4E85 = 0x502D
+0x4E86 = 0x4E3B
+0x4E88 = 0x4D3D
+0x4E89 = 0x4168
+0x4E8A = 0x502F
+0x4E8B = 0x3B76
+0x4E8C = 0x4673
+0x4E8E = 0x5032
+0x4E91 = 0x313E
+0x4E92 = 0x385F
+0x4E94 = 0x385E
+0x4E95 = 0x3066
+0x4E98 = 0x4F4B
+0x4E99 = 0x4F4A
+0x4E9B = 0x3A33
+0x4E9C = 0x3021
+0x4E9E = 0x5033
+0x4E9F = 0x5034
+0x4EA0 = 0x5035
+0x4EA1 = 0x4B34
+0x4EA2 = 0x5036
+0x4EA4 = 0x3872
+0x4EA5 = 0x3067
+0x4EA6 = 0x4B72
+0x4EA8 = 0x357C
+0x4EAB = 0x357D
+0x4EAC = 0x357E
+0x4EAD = 0x4462
+0x4EAE = 0x4E3C
+0x4EB0 = 0x5037
+0x4EB3 = 0x5038
+0x4EB6 = 0x5039
+0x4EBA = 0x3F4D
+0x4EC0 = 0x3D3A
+0x4EC1 = 0x3F4E
+0x4EC2 = 0x503E
+0x4EC4 = 0x503C
+0x4EC6 = 0x503D
+0x4EC7 = 0x3558
+0x4ECA = 0x3A23
+0x4ECB = 0x3270
+0x4ECD = 0x503B
+0x4ECE = 0x503A
+0x4ECF = 0x4A29
+0x4ED4 = 0x3B46
+0x4ED5 = 0x3B45
+0x4ED6 = 0x423E
+0x4ED7 = 0x503F
+0x4ED8 = 0x4955
+0x4ED9 = 0x4067
+0x4EDD = 0x2138
+0x4EDE = 0x5040
+0x4EDF = 0x5042
+0x4EE3 = 0x4265
+0x4EE4 = 0x4E61
+0x4EE5 = 0x304A
+0x4EED = 0x5041
+0x4EEE = 0x323E
+0x4EF0 = 0x3644
+0x4EF2 = 0x4367
+0x4EF6 = 0x376F
+0x4EF7 = 0x5043
+0x4EFB = 0x4724
+0x4F01 = 0x346B
+0x4F09 = 0x5044
+0x4F0A = 0x304B
+0x4F0D = 0x3860
+0x4F0E = 0x346C
+0x4F0F = 0x497A
+0x4F10 = 0x4832
+0x4F11 = 0x3559
+0x4F1A = 0x3271
+0x4F1C = 0x5067
+0x4F1D = 0x4541
+0x4F2F = 0x476C
+0x4F30 = 0x5046
+0x4F34 = 0x483C
+0x4F36 = 0x4E62
+0x4F38 = 0x3F2D
+0x4F3A = 0x3B47
+0x4F3C = 0x3B77
+0x4F3D = 0x3240
+0x4F43 = 0x4451
+0x4F46 = 0x4322
+0x4F47 = 0x504A
+0x4F4D = 0x304C
+0x4F4E = 0x4463
+0x4F4F = 0x3D3B
+0x4F50 = 0x3A34
+0x4F51 = 0x4D24
+0x4F53 = 0x424E
+0x4F55 = 0x323F
+0x4F57 = 0x5049
+0x4F59 = 0x4D3E
+0x4F5A = 0x5045
+0x4F5B = 0x5047
+0x4F5C = 0x3A6E
+0x4F5D = 0x5048
+0x4F5E = 0x5524
+0x4F69 = 0x5050
+0x4F6F = 0x5053
+0x4F70 = 0x5051
+0x4F73 = 0x3242
+0x4F75 = 0x4A3B
+0x4F76 = 0x504B
+0x4F7B = 0x504F
+0x4F7C = 0x3873
+0x4F7F = 0x3B48
+0x4F83 = 0x3426
+0x4F86 = 0x5054
+0x4F88 = 0x504C
+0x4F8B = 0x4E63
+0x4F8D = 0x3B78
+0x4F8F = 0x504D
+0x4F91 = 0x5052
+0x4F96 = 0x5055
+0x4F98 = 0x504E
+0x4F9B = 0x3621
+0x4F9D = 0x304D
+0x4FA0 = 0x3622
+0x4FA1 = 0x3241
+0x4FAB = 0x5525
+0x4FAD = 0x4B79
+0x4FAE = 0x496E
+0x4FAF = 0x3874
+0x4FB5 = 0x3F2F
+0x4FB6 = 0x4E37
+0x4FBF = 0x4A58
+0x4FC2 = 0x3738
+0x4FC3 = 0x4225
+0x4FC4 = 0x3264
+0x4FCA = 0x3D53
+0x4FCE = 0x5059
+0x4FD0 = 0x505E
+0x4FD1 = 0x505C
+0x4FD4 = 0x5057
+0x4FD7 = 0x422F
+0x4FD8 = 0x505A
+0x4FDA = 0x505D
+0x4FDB = 0x505B
+0x4FDD = 0x4A5D
+0x4FDF = 0x5058
+0x4FE1 = 0x3F2E
+0x4FE3 = 0x4B73
+0x4FE4 = 0x505F
+0x4FE5 = 0x5060
+0x4FEE = 0x3D24
+0x4FEF = 0x506D
+0x4FF3 = 0x4750
+0x4FF5 = 0x4936
+0x4FF6 = 0x5068
+0x4FF8 = 0x4A70
+0x4FFA = 0x3236
+0x4FFE = 0x506C
+0x5005 = 0x5066
+0x5006 = 0x506F
+0x5009 = 0x4152
+0x500B = 0x3844
+0x500D = 0x475C
+0x500F = 0x6047
+0x5011 = 0x506E
+0x5012 = 0x455D
+0x5014 = 0x5063
+0x5016 = 0x3876
+0x5019 = 0x3875
+0x501A = 0x5061
+0x501F = 0x3C5A
+0x5021 = 0x5069
+0x5023 = 0x4A6F
+0x5024 = 0x434D
+0x5025 = 0x5065
+0x5026 = 0x3771
+0x5028 = 0x5062
+0x5029 = 0x506A
+0x502A = 0x5064
+0x502B = 0x4E51
+0x502C = 0x506B
+0x502D = 0x4F41
+0x5036 = 0x3666
+0x5039 = 0x3770
+0x5043 = 0x5070
+0x5047 = 0x5071
+0x5048 = 0x5075
+0x5049 = 0x304E
+0x504F = 0x4A50
+0x5050 = 0x5074
+0x5055 = 0x5073
+0x5056 = 0x5077
+0x505A = 0x5076
+0x505C = 0x4464
+0x5065 = 0x3772
+0x506C = 0x5078
+0x5072 = 0x3C45
+0x5074 = 0x4226
+0x5075 = 0x4465
+0x5076 = 0x3676
+0x5078 = 0x5079
+0x507D = 0x3536
+0x5080 = 0x507A
+0x5085 = 0x507C
+0x508D = 0x4B35
+0x5091 = 0x3766
+0x5098 = 0x3B31
+0x5099 = 0x4877
+0x509A = 0x507B
+0x50AC = 0x3A45
+0x50AD = 0x4D43
+0x50B2 = 0x507E
+0x50B3 = 0x5123
+0x50B4 = 0x507D
+0x50B5 = 0x3A44
+0x50B7 = 0x3D7D
+0x50BE = 0x3739
+0x50C2 = 0x5124
+0x50C5 = 0x364F
+0x50C9 = 0x5121
+0x50CA = 0x5122
+0x50CD = 0x462F
+0x50CF = 0x417C
+0x50D1 = 0x3623
+0x50D5 = 0x4B4D
+0x50D6 = 0x5125
+0x50DA = 0x4E3D
+0x50DE = 0x5126
+0x50E3 = 0x5129
+0x50E5 = 0x5127
+0x50E7 = 0x414E
+0x50ED = 0x5128
+0x50EE = 0x512A
+0x50F5 = 0x512C
+0x50F9 = 0x512B
+0x50FB = 0x4A48
+0x5100 = 0x3537
+0x5101 = 0x512E
+0x5102 = 0x512F
+0x5104 = 0x322F
+0x5109 = 0x512D
+0x5112 = 0x3C74
+0x5114 = 0x5132
+0x5115 = 0x5131
+0x5116 = 0x5130
+0x5118 = 0x5056
+0x511A = 0x5133
+0x511F = 0x3D7E
+0x5121 = 0x5134
+0x512A = 0x4D25
+0x5132 = 0x4C59
+0x5137 = 0x5136
+0x513A = 0x5135
+0x513B = 0x5138
+0x513C = 0x5137
+0x513F = 0x5139
+0x5140 = 0x513A
+0x5141 = 0x3074
+0x5143 = 0x3835
+0x5144 = 0x373B
+0x5145 = 0x3D3C
+0x5146 = 0x437B
+0x5147 = 0x3624
+0x5148 = 0x4068
+0x5149 = 0x3877
+0x514B = 0x396E
+0x514C = 0x513C
+0x514D = 0x4C48
+0x514E = 0x4546
+0x5150 = 0x3B79
+0x5152 = 0x513B
+0x5154 = 0x513D
+0x515A = 0x455E
+0x515C = 0x3375
+0x5162 = 0x513E
+0x5165 = 0x467E
+0x5168 = 0x4134
+0x5169 = 0x5140
+0x516A = 0x5141
+0x516B = 0x482C
+0x516C = 0x3878
+0x516D = 0x4F3B
+0x516E = 0x5142
+0x5171 = 0x3626
+0x5175 = 0x4A3C
+0x5176 = 0x4236
+0x5177 = 0x3671
+0x5178 = 0x4535
+0x517C = 0x3773
+0x5180 = 0x5143
+0x5182 = 0x5144
+0x5185 = 0x4662
+0x5186 = 0x315F
+0x5189 = 0x5147
+0x518A = 0x3A7D
+0x518C = 0x5146
+0x518D = 0x3A46
+0x518F = 0x5148
+0x5190 = 0x666E
+0x5191 = 0x5149
+0x5192 = 0x4B41
+0x5193 = 0x514A
+0x5195 = 0x514B
+0x5196 = 0x514C
+0x5197 = 0x3E69
+0x5199 = 0x3C4C
+0x51A0 = 0x3427
+0x51A2 = 0x514F
+0x51A4 = 0x514D
+0x51A5 = 0x4C3D
+0x51A6 = 0x514E
+0x51A8 = 0x495A
+0x51A9 = 0x5150
+0x51AA = 0x5151
+0x51AB = 0x5152
+0x51AC = 0x455F
+0x51B0 = 0x5156
+0x51B1 = 0x5154
+0x51B2 = 0x5155
+0x51B3 = 0x5153
+0x51B4 = 0x3A63
+0x51B5 = 0x5157
+0x51B6 = 0x4C6A
+0x51B7 = 0x4E64
+0x51BD = 0x5158
+0x51C4 = 0x4028
+0x51C5 = 0x5159
+0x51C6 = 0x3D5A
+0x51C9 = 0x515A
+0x51CB = 0x437C
+0x51CC = 0x4E3F
+0x51CD = 0x4560
+0x51D6 = 0x5245
+0x51DB = 0x515B
+0x51DC = 0x7425
+0x51DD = 0x3645
+0x51E0 = 0x515C
+0x51E1 = 0x4B5E
+0x51E6 = 0x3D68
+0x51E7 = 0x427C
+0x51E9 = 0x515E
+0x51EA = 0x4664
+0x51ED = 0x515F
+0x51F0 = 0x5160
+0x51F1 = 0x332E
+0x51F5 = 0x5161
+0x51F6 = 0x3627
+0x51F8 = 0x464C
+0x51F9 = 0x317A
+0x51FA = 0x3D50
+0x51FD = 0x4821
+0x51FE = 0x5162
+0x5200 = 0x4561
+0x5203 = 0x3F4F
+0x5204 = 0x5163
+0x5206 = 0x4A2C
+0x5207 = 0x405A
+0x5208 = 0x3422
+0x520A = 0x3429
+0x520B = 0x5164
+0x520E = 0x5166
+0x5211 = 0x373A
+0x5214 = 0x5165
+0x5217 = 0x4E73
+0x521D = 0x3D69
+0x5224 = 0x483D
+0x5225 = 0x4A4C
+0x5227 = 0x5167
+0x5229 = 0x4D78
+0x522A = 0x5168
+0x522E = 0x5169
+0x5230 = 0x457E
+0x5233 = 0x516A
+0x5236 = 0x4029
+0x5237 = 0x3A7E
+0x5238 = 0x3774
+0x5239 = 0x516B
+0x523A = 0x3B49
+0x523B = 0x396F
+0x5243 = 0x4466
+0x5244 = 0x516D
+0x5247 = 0x4227
+0x524A = 0x3A6F
+0x524B = 0x516E
+0x524C = 0x516F
+0x524D = 0x4130
+0x524F = 0x516C
+0x5254 = 0x5171
+0x5256 = 0x4B36
+0x525B = 0x3964
+0x525E = 0x5170
+0x5263 = 0x3775
+0x5264 = 0x3A5E
+0x5265 = 0x476D
+0x5269 = 0x5174
+0x526A = 0x5172
+0x526F = 0x497B
+0x5270 = 0x3E6A
+0x5271 = 0x517B
+0x5272 = 0x3364
+0x5273 = 0x5175
+0x5274 = 0x5173
+0x5275 = 0x414F
+0x527D = 0x5177
+0x527F = 0x5176
+0x5283 = 0x3344
+0x5287 = 0x3760
+0x5288 = 0x517C
+0x5289 = 0x4E2D
+0x528D = 0x5178
+0x5291 = 0x517D
+0x5292 = 0x517A
+0x5294 = 0x5179
+0x529B = 0x4E4F
+0x529F = 0x3879
+0x52A0 = 0x3243
+0x52A3 = 0x4E74
+0x52A9 = 0x3D75
+0x52AA = 0x4558
+0x52AB = 0x3965
+0x52AC = 0x5222
+0x52AD = 0x5223
+0x52B1 = 0x4E65
+0x52B4 = 0x4F2B
+0x52B5 = 0x5225
+0x52B9 = 0x387A
+0x52BC = 0x5224
+0x52BE = 0x332F
+0x52C1 = 0x5226
+0x52C3 = 0x4B56
+0x52C5 = 0x443C
+0x52C7 = 0x4D26
+0x52C9 = 0x4A59
+0x52CD = 0x5227
+0x52D2 = 0x7055
+0x52D5 = 0x4630
+0x52D7 = 0x5228
+0x52D8 = 0x342A
+0x52D9 = 0x4C33
+0x52DD = 0x3E21
+0x52DE = 0x5229
+0x52DF = 0x4A67
+0x52E0 = 0x522D
+0x52E2 = 0x402A
+0x52E3 = 0x522A
+0x52E4 = 0x3650
+0x52E6 = 0x522B
+0x52E7 = 0x342B
+0x52F2 = 0x372E
+0x52F3 = 0x522E
+0x52F5 = 0x522F
+0x52F8 = 0x5230
+0x52F9 = 0x5231
+0x52FA = 0x3C5B
+0x52FE = 0x387B
+0x52FF = 0x4C5E
+0x5301 = 0x4C68
+0x5302 = 0x4677
+0x5305 = 0x4A71
+0x5306 = 0x5232
+0x5308 = 0x5233
+0x530D = 0x5235
+0x530F = 0x5237
+0x5310 = 0x5236
+0x5315 = 0x5238
+0x5316 = 0x323D
+0x5317 = 0x4B4C
+0x5319 = 0x3A7C
+0x531A = 0x5239
+0x531D = 0x4159
+0x5320 = 0x3E22
+0x5321 = 0x3629
+0x5323 = 0x523A
+0x532A = 0x485B
+0x532F = 0x523B
+0x5331 = 0x523C
+0x5333 = 0x523D
+0x5338 = 0x523E
+0x5339 = 0x4924
+0x533A = 0x3668
+0x533B = 0x3065
+0x533F = 0x463F
+0x5340 = 0x523F
+0x5341 = 0x3D3D
+0x5343 = 0x4069
+0x5345 = 0x5241
+0x5346 = 0x5240
+0x5347 = 0x3E23
+0x5348 = 0x3861
+0x5349 = 0x5243
+0x534A = 0x483E
+0x534D = 0x5244
+0x5351 = 0x485C
+0x5352 = 0x4234
+0x5353 = 0x426E
+0x5354 = 0x3628
+0x5357 = 0x466E
+0x5358 = 0x4331
+0x535A = 0x476E
+0x535C = 0x4B4E
+0x535E = 0x5246
+0x5360 = 0x406A
+0x5366 = 0x3735
+0x5369 = 0x5247
+0x536E = 0x5248
+0x536F = 0x312C
+0x5370 = 0x3075
+0x5371 = 0x346D
+0x5373 = 0x4228
+0x5374 = 0x3551
+0x5375 = 0x4D71
+0x5377 = 0x524B
+0x5378 = 0x3237
+0x537B = 0x524A
+0x537F = 0x362A
+0x5382 = 0x524C
+0x5384 = 0x4C71
+0x5396 = 0x524D
+0x5398 = 0x4E52
+0x539A = 0x387C
+0x539F = 0x3836
+0x53A0 = 0x524E
+0x53A5 = 0x5250
+0x53A6 = 0x524F
+0x53A8 = 0x3F5F
+0x53A9 = 0x3139
+0x53AD = 0x315E
+0x53AE = 0x5251
+0x53B0 = 0x5252
+0x53B3 = 0x3837
+0x53B6 = 0x5253
+0x53BB = 0x356E
+0x53C2 = 0x3B32
+0x53C3 = 0x5254
+0x53C8 = 0x4B74
+0x53C9 = 0x3A35
+0x53CA = 0x355A
+0x53CB = 0x4D27
+0x53CC = 0x4150
+0x53CD = 0x483F
+0x53CE = 0x3C7D
+0x53D4 = 0x3D47
+0x53D6 = 0x3C68
+0x53D7 = 0x3C75
+0x53D9 = 0x3D76
+0x53DB = 0x4840
+0x53DF = 0x5257
+0x53E1 = 0x3143
+0x53E2 = 0x4151
+0x53E3 = 0x387D
+0x53E4 = 0x3845
+0x53E5 = 0x3667
+0x53E8 = 0x525B
+0x53E9 = 0x4321
+0x53EA = 0x427E
+0x53EB = 0x362B
+0x53EC = 0x3E24
+0x53ED = 0x525C
+0x53EE = 0x525A
+0x53EF = 0x3244
+0x53F0 = 0x4266
+0x53F1 = 0x3C38
+0x53F2 = 0x3B4B
+0x53F3 = 0x3126
+0x53F6 = 0x3370
+0x53F7 = 0x3966
+0x53F8 = 0x3B4A
+0x53FA = 0x525D
+0x5401 = 0x525E
+0x5403 = 0x3549
+0x5404 = 0x3346
+0x5408 = 0x3967
+0x5409 = 0x3548
+0x540A = 0x445F
+0x540B = 0x3125
+0x540C = 0x4631
+0x540D = 0x4C3E
+0x540E = 0x3921
+0x540F = 0x4D79
+0x5410 = 0x4547
+0x5411 = 0x387E
+0x541B = 0x372F
+0x541D = 0x5267
+0x541F = 0x3663
+0x5420 = 0x4B4A
+0x5426 = 0x485D
+0x5429 = 0x5266
+0x542B = 0x345E
+0x542C = 0x5261
+0x542D = 0x5262
+0x542E = 0x5264
+0x5436 = 0x5265
+0x5438 = 0x355B
+0x5439 = 0x3F61
+0x543B = 0x4A2D
+0x543C = 0x5263
+0x543D = 0x525F
+0x543E = 0x3863
+0x5440 = 0x5260
+0x5442 = 0x4F24
+0x5446 = 0x4A72
+0x5448 = 0x4468
+0x5449 = 0x3862
+0x544A = 0x3970
+0x544E = 0x5268
+0x5451 = 0x465D
+0x545F = 0x526C
+0x5468 = 0x3C7E
+0x546A = 0x3C76
+0x5470 = 0x526F
+0x5471 = 0x526D
+0x5473 = 0x4C23
+0x5475 = 0x526A
+0x5476 = 0x5273
+0x5477 = 0x526E
+0x547B = 0x5271
+0x547C = 0x3846
+0x547D = 0x4C3F
+0x5480 = 0x5272
+0x5484 = 0x5274
+0x5486 = 0x5276
+0x548B = 0x3A70
+0x548C = 0x4F42
+0x548E = 0x526B
+0x548F = 0x5269
+0x5490 = 0x5275
+0x5492 = 0x5270
+0x54A2 = 0x5278
+0x54A4 = 0x5323
+0x54A5 = 0x527A
+0x54A8 = 0x527E
+0x54AB = 0x5321
+0x54AC = 0x527B
+0x54AF = 0x533E
+0x54B2 = 0x3A69
+0x54B3 = 0x3331
+0x54B8 = 0x5279
+0x54BC = 0x5325
+0x54BD = 0x3076
+0x54BE = 0x5324
+0x54C0 = 0x3025
+0x54C1 = 0x494A
+0x54C2 = 0x5322
+0x54C4 = 0x527C
+0x54C7 = 0x5277
+0x54C8 = 0x527D
+0x54C9 = 0x3A48
+0x54D8 = 0x5326
+0x54E1 = 0x3077
+0x54E2 = 0x532F
+0x54E5 = 0x5327
+0x54E6 = 0x5328
+0x54E8 = 0x3E25
+0x54E9 = 0x4B69
+0x54ED = 0x532D
+0x54EE = 0x532C
+0x54F2 = 0x452F
+0x54FA = 0x532E
+0x54FD = 0x532B
+0x5504 = 0x3134
+0x5506 = 0x3A36
+0x5507 = 0x3F30
+0x550F = 0x5329
+0x5510 = 0x4562
+0x5514 = 0x532A
+0x5516 = 0x3022
+0x552E = 0x5334
+0x552F = 0x4D23
+0x5531 = 0x3E27
+0x5533 = 0x533A
+0x5538 = 0x5339
+0x5539 = 0x5330
+0x553E = 0x4243
+0x5540 = 0x5331
+0x5544 = 0x426F
+0x5545 = 0x5336
+0x5546 = 0x3E26
+0x554C = 0x5333
+0x554F = 0x4C64
+0x5553 = 0x373C
+0x5556 = 0x5337
+0x5557 = 0x5338
+0x555C = 0x5335
+0x555D = 0x533B
+0x5563 = 0x5332
+0x557B = 0x5341
+0x557C = 0x5346
+0x557E = 0x5342
+0x5580 = 0x533D
+0x5583 = 0x5347
+0x5584 = 0x4131
+0x5587 = 0x5349
+0x5589 = 0x3922
+0x558A = 0x533F
+0x558B = 0x437D
+0x5598 = 0x5343
+0x5599 = 0x533C
+0x559A = 0x342D
+0x559C = 0x346E
+0x559D = 0x3365
+0x559E = 0x5344
+0x559F = 0x5340
+0x55A7 = 0x3776
+0x55A8 = 0x534A
+0x55A9 = 0x5348
+0x55AA = 0x4153
+0x55AB = 0x354A
+0x55AC = 0x362C
+0x55AE = 0x5345
+0x55B0 = 0x3674
+0x55B6 = 0x3144
+0x55C4 = 0x534E
+0x55C5 = 0x534C
+0x55C7 = 0x5427
+0x55D4 = 0x5351
+0x55DA = 0x534B
+0x55DC = 0x534F
+0x55DF = 0x534D
+0x55E3 = 0x3B4C
+0x55E4 = 0x5350
+0x55F7 = 0x5353
+0x55F9 = 0x5358
+0x55FD = 0x5356
+0x55FE = 0x5355
+0x5606 = 0x4332
+0x5609 = 0x3245
+0x5614 = 0x5352
+0x5616 = 0x5354
+0x5617 = 0x3E28
+0x5618 = 0x3133
+0x561B = 0x5357
+0x5629 = 0x325E
+0x562F = 0x5362
+0x5631 = 0x3E7C
+0x5632 = 0x535E
+0x5634 = 0x535C
+0x5636 = 0x535D
+0x5638 = 0x535F
+0x5642 = 0x313D
+0x564C = 0x4139
+0x564E = 0x5359
+0x5650 = 0x535A
+0x565B = 0x337A
+0x5664 = 0x5361
+0x5668 = 0x346F
+0x566A = 0x5364
+0x566B = 0x5360
+0x566C = 0x5363
+0x5674 = 0x4A2E
+0x5678 = 0x4655
+0x567A = 0x4838
+0x5680 = 0x5366
+0x5686 = 0x5365
+0x5687 = 0x3345
+0x568A = 0x5367
+0x568F = 0x536A
+0x5694 = 0x5369
+0x56A0 = 0x5368
+0x56A2 = 0x4739
+0x56A5 = 0x536B
+0x56AE = 0x536C
+0x56B4 = 0x536E
+0x56B6 = 0x536D
+0x56BC = 0x5370
+0x56C0 = 0x5373
+0x56C1 = 0x5371
+0x56C2 = 0x536F
+0x56C3 = 0x5372
+0x56C8 = 0x5374
+0x56CE = 0x5375
+0x56D1 = 0x5376
+0x56D3 = 0x5377
+0x56D7 = 0x5378
+0x56D8 = 0x5145
+0x56DA = 0x3C7C
+0x56DB = 0x3B4D
+0x56DE = 0x3273
+0x56E0 = 0x3078
+0x56E3 = 0x4344
+0x56EE = 0x5379
+0x56F0 = 0x3A24
+0x56F2 = 0x304F
+0x56F3 = 0x3F5E
+0x56F9 = 0x537A
+0x56FA = 0x3847
+0x56FD = 0x3971
+0x56FF = 0x537C
+0x5700 = 0x537B
+0x5703 = 0x4A60
+0x5704 = 0x537D
+0x5708 = 0x5421
+0x5709 = 0x537E
+0x570B = 0x5422
+0x570D = 0x5423
+0x570F = 0x3777
+0x5712 = 0x3160
+0x5713 = 0x5424
+0x5716 = 0x5426
+0x5718 = 0x5425
+0x571C = 0x5428
+0x571F = 0x455A
+0x5726 = 0x5429
+0x5727 = 0x3035
+0x5728 = 0x3A5F
+0x572D = 0x373D
+0x5730 = 0x434F
+0x5737 = 0x542A
+0x5738 = 0x542B
+0x573B = 0x542D
+0x5740 = 0x542E
+0x5742 = 0x3A64
+0x5747 = 0x3651
+0x574A = 0x4B37
+0x574E = 0x542C
+0x574F = 0x542F
+0x5750 = 0x3A41
+0x5751 = 0x3923
+0x5761 = 0x5433
+0x5764 = 0x3A25
+0x5766 = 0x4333
+0x5769 = 0x5430
+0x576A = 0x445A
+0x577F = 0x5434
+0x5782 = 0x3F62
+0x5788 = 0x5432
+0x5789 = 0x5435
+0x578B = 0x373F
+0x5793 = 0x5436
+0x57A0 = 0x5437
+0x57A2 = 0x3924
+0x57A3 = 0x3340
+0x57A4 = 0x5439
+0x57AA = 0x543A
+0x57B0 = 0x543B
+0x57B3 = 0x5438
+0x57C0 = 0x5431
+0x57C3 = 0x543C
+0x57C6 = 0x543D
+0x57CB = 0x4B64
+0x57CE = 0x3E6B
+0x57D2 = 0x543F
+0x57D3 = 0x5440
+0x57D4 = 0x543E
+0x57D6 = 0x5442
+0x57DC = 0x4738
+0x57DF = 0x3068
+0x57E0 = 0x4956
+0x57E3 = 0x5443
+0x57F4 = 0x3E7D
+0x57F7 = 0x3C39
+0x57F9 = 0x475D
+0x57FA = 0x3470
+0x57FC = 0x3A6B
+0x5800 = 0x4B59
+0x5802 = 0x4632
+0x5805 = 0x3778
+0x5806 = 0x424F
+0x580A = 0x5441
+0x580B = 0x5444
+0x5815 = 0x4244
+0x5819 = 0x5445
+0x581D = 0x5446
+0x5821 = 0x5448
+0x5824 = 0x4469
+0x582A = 0x342E
+0x582F = 0x7421
+0x5830 = 0x3161
+0x5831 = 0x4A73
+0x5834 = 0x3E6C
+0x5835 = 0x4548
+0x583A = 0x3A66
+0x583D = 0x544E
+0x5840 = 0x4A3D
+0x5841 = 0x4E5D
+0x584A = 0x3274
+0x584B = 0x544A
+0x5851 = 0x413A
+0x5852 = 0x544D
+0x5854 = 0x4563
+0x5857 = 0x4549
+0x5858 = 0x4564
+0x5859 = 0x4839
+0x585A = 0x444D
+0x585E = 0x3A49
+0x5862 = 0x5449
+0x5869 = 0x3176
+0x586B = 0x4536
+0x5870 = 0x544B
+0x5872 = 0x5447
+0x5875 = 0x3F50
+0x5879 = 0x544F
+0x587E = 0x3D4E
+0x5883 = 0x362D
+0x5885 = 0x5450
+0x5893 = 0x4A68
+0x5897 = 0x417D
+0x589C = 0x4446
+0x589F = 0x5452
+0x58A8 = 0x4B4F
+0x58AB = 0x5453
+0x58AE = 0x5458
+0x58B3 = 0x4A2F
+0x58B8 = 0x5457
+0x58B9 = 0x5451
+0x58BA = 0x5454
+0x58BB = 0x5456
+0x58BE = 0x3A26
+0x58C1 = 0x4A49
+0x58C5 = 0x5459
+0x58C7 = 0x4345
+0x58CA = 0x3275
+0x58CC = 0x3E6D
+0x58D1 = 0x545B
+0x58D3 = 0x545A
+0x58D5 = 0x3968
+0x58D7 = 0x545C
+0x58D8 = 0x545E
+0x58D9 = 0x545D
+0x58DC = 0x5460
+0x58DE = 0x5455
+0x58DF = 0x5462
+0x58E4 = 0x5461
+0x58E5 = 0x545F
+0x58EB = 0x3B4E
+0x58EC = 0x3F51
+0x58EE = 0x4154
+0x58EF = 0x5463
+0x58F0 = 0x403C
+0x58F1 = 0x306D
+0x58F2 = 0x4764
+0x58F7 = 0x445B
+0x58F9 = 0x5465
+0x58FA = 0x5464
+0x58FB = 0x5466
+0x58FC = 0x5467
+0x58FD = 0x5468
+0x5902 = 0x5469
+0x5909 = 0x4A51
+0x590A = 0x546A
+0x590F = 0x3246
+0x5910 = 0x546B
+0x5915 = 0x4D3C
+0x5916 = 0x3330
+0x5918 = 0x5249
+0x5919 = 0x3D48
+0x591A = 0x423F
+0x591B = 0x546C
+0x591C = 0x4C6B
+0x5922 = 0x4C34
+0x5925 = 0x546E
+0x5927 = 0x4267
+0x5929 = 0x4537
+0x592A = 0x4240
+0x592B = 0x4957
+0x592C = 0x546F
+0x592D = 0x5470
+0x592E = 0x317B
+0x5931 = 0x3C3A
+0x5932 = 0x5471
+0x5937 = 0x3050
+0x5938 = 0x5472
+0x593E = 0x5473
+0x5944 = 0x3162
+0x5947 = 0x3471
+0x5948 = 0x4660
+0x5949 = 0x4A74
+0x594E = 0x5477
+0x594F = 0x4155
+0x5950 = 0x5476
+0x5951 = 0x3740
+0x5954 = 0x4B5B
+0x5955 = 0x5475
+0x5957 = 0x4565
+0x5958 = 0x5479
+0x595A = 0x5478
+0x5960 = 0x547B
+0x5962 = 0x547A
+0x5965 = 0x317C
+0x5967 = 0x547C
+0x5968 = 0x3E29
+0x5969 = 0x547E
+0x596A = 0x4325
+0x596C = 0x547D
+0x596E = 0x4A33
+0x5973 = 0x3D77
+0x5974 = 0x455B
+0x5978 = 0x5521
+0x597D = 0x3925
+0x5981 = 0x5522
+0x5982 = 0x4721
+0x5983 = 0x485E
+0x5984 = 0x4C51
+0x598A = 0x4725
+0x598D = 0x552B
+0x5993 = 0x3538
+0x5996 = 0x4D45
+0x5999 = 0x4C2F
+0x599B = 0x562C
+0x599D = 0x5523
+0x59A3 = 0x5526
+0x59A5 = 0x4245
+0x59A8 = 0x4B38
+0x59AC = 0x454A
+0x59B2 = 0x5527
+0x59B9 = 0x4B65
+0x59BB = 0x3A4A
+0x59BE = 0x3E2A
+0x59C6 = 0x5528
+0x59C9 = 0x3B50
+0x59CB = 0x3B4F
+0x59D0 = 0x3039
+0x59D1 = 0x3848
+0x59D3 = 0x402B
+0x59D4 = 0x3051
+0x59D9 = 0x552C
+0x59DA = 0x552D
+0x59DC = 0x552A
+0x59E5 = 0x3138
+0x59E6 = 0x342F
+0x59E8 = 0x5529
+0x59EA = 0x4C45
+0x59EB = 0x4931
+0x59F6 = 0x3028
+0x59FB = 0x3079
+0x59FF = 0x3B51
+0x5A01 = 0x3052
+0x5A03 = 0x3023
+0x5A09 = 0x5532
+0x5A11 = 0x5530
+0x5A18 = 0x4C3C
+0x5A1A = 0x5533
+0x5A1C = 0x5531
+0x5A1F = 0x552F
+0x5A20 = 0x3F31
+0x5A25 = 0x552E
+0x5A29 = 0x4A5A
+0x5A2F = 0x3864
+0x5A35 = 0x5537
+0x5A36 = 0x5538
+0x5A3C = 0x3E2B
+0x5A40 = 0x5534
+0x5A41 = 0x4F2C
+0x5A46 = 0x474C
+0x5A49 = 0x5536
+0x5A5A = 0x3A27
+0x5A62 = 0x5539
+0x5A66 = 0x4958
+0x5A6A = 0x553A
+0x5A6C = 0x5535
+0x5A7F = 0x4C3B
+0x5A92 = 0x475E
+0x5A9A = 0x553B
+0x5A9B = 0x4932
+0x5ABC = 0x553C
+0x5ABD = 0x5540
+0x5ABE = 0x553D
+0x5AC1 = 0x3247
+0x5AC2 = 0x553F
+0x5AC9 = 0x3C3B
+0x5ACB = 0x553E
+0x5ACC = 0x3779
+0x5AD0 = 0x554C
+0x5AD6 = 0x5545
+0x5AD7 = 0x5542
+0x5AE1 = 0x4364
+0x5AE3 = 0x5541
+0x5AE6 = 0x5543
+0x5AE9 = 0x5544
+0x5AFA = 0x5546
+0x5AFB = 0x5547
+0x5B09 = 0x3472
+0x5B0B = 0x5549
+0x5B0C = 0x5548
+0x5B16 = 0x554A
+0x5B22 = 0x3E6E
+0x5B2A = 0x554D
+0x5B2C = 0x445C
+0x5B30 = 0x3145
+0x5B32 = 0x554B
+0x5B36 = 0x554E
+0x5B3E = 0x554F
+0x5B40 = 0x5552
+0x5B43 = 0x5550
+0x5B45 = 0x5551
+0x5B50 = 0x3B52
+0x5B51 = 0x5553
+0x5B54 = 0x3926
+0x5B55 = 0x5554
+0x5B57 = 0x3B7A
+0x5B58 = 0x4238
+0x5B5A = 0x5555
+0x5B5B = 0x5556
+0x5B5C = 0x3B5A
+0x5B5D = 0x3927
+0x5B5F = 0x4C52
+0x5B63 = 0x3528
+0x5B64 = 0x3849
+0x5B65 = 0x5557
+0x5B66 = 0x3358
+0x5B69 = 0x5558
+0x5B6B = 0x4239
+0x5B70 = 0x5559
+0x5B71 = 0x5623
+0x5B73 = 0x555A
+0x5B75 = 0x555B
+0x5B78 = 0x555C
+0x5B7A = 0x555E
+0x5B80 = 0x555F
+0x5B83 = 0x5560
+0x5B85 = 0x4270
+0x5B87 = 0x3127
+0x5B88 = 0x3C69
+0x5B89 = 0x3042
+0x5B8B = 0x4157
+0x5B8C = 0x3430
+0x5B8D = 0x3C35
+0x5B8F = 0x3928
+0x5B95 = 0x4566
+0x5B97 = 0x3D21
+0x5B98 = 0x3431
+0x5B99 = 0x4368
+0x5B9A = 0x446A
+0x5B9B = 0x3038
+0x5B9C = 0x3539
+0x5B9D = 0x4A75
+0x5B9F = 0x3C42
+0x5BA2 = 0x3552
+0x5BA3 = 0x406B
+0x5BA4 = 0x3C3C
+0x5BA5 = 0x4D28
+0x5BA6 = 0x5561
+0x5BAE = 0x355C
+0x5BB0 = 0x3A4B
+0x5BB3 = 0x3332
+0x5BB4 = 0x3163
+0x5BB5 = 0x3E2C
+0x5BB6 = 0x3248
+0x5BB8 = 0x5562
+0x5BB9 = 0x4D46
+0x5BBF = 0x3D49
+0x5BC2 = 0x3C64
+0x5BC3 = 0x5563
+0x5BC4 = 0x3473
+0x5BC5 = 0x4652
+0x5BC6 = 0x4C29
+0x5BC7 = 0x5564
+0x5BC9 = 0x5565
+0x5BCC = 0x4959
+0x5BD0 = 0x5567
+0x5BD2 = 0x3428
+0x5BD3 = 0x3677
+0x5BD4 = 0x5566
+0x5BDB = 0x3432
+0x5BDD = 0x3F32
+0x5BDE = 0x556B
+0x5BDF = 0x3B21
+0x5BE1 = 0x3249
+0x5BE2 = 0x556A
+0x5BE4 = 0x5568
+0x5BE5 = 0x556C
+0x5BE6 = 0x5569
+0x5BE7 = 0x472B
+0x5BE8 = 0x5C4D
+0x5BE9 = 0x3F33
+0x5BEB = 0x556D
+0x5BEE = 0x4E40
+0x5BF0 = 0x556E
+0x5BF3 = 0x5570
+0x5BF5 = 0x437E
+0x5BF6 = 0x556F
+0x5BF8 = 0x4023
+0x5BFA = 0x3B7B
+0x5BFE = 0x4250
+0x5BFF = 0x3C77
+0x5C01 = 0x4975
+0x5C02 = 0x406C
+0x5C04 = 0x3C4D
+0x5C05 = 0x5571
+0x5C06 = 0x3E2D
+0x5C07 = 0x5572
+0x5C08 = 0x5573
+0x5C09 = 0x3053
+0x5C0A = 0x423A
+0x5C0B = 0x3F52
+0x5C0D = 0x5574
+0x5C0E = 0x4633
+0x5C0F = 0x3E2E
+0x5C11 = 0x3E2F
+0x5C13 = 0x5575
+0x5C16 = 0x406D
+0x5C1A = 0x3E30
+0x5C20 = 0x5576
+0x5C22 = 0x5577
+0x5C24 = 0x4C60
+0x5C28 = 0x5578
+0x5C2D = 0x3646
+0x5C31 = 0x3D22
+0x5C38 = 0x5579
+0x5C39 = 0x557A
+0x5C3A = 0x3C5C
+0x5C3B = 0x3F2C
+0x5C3C = 0x4674
+0x5C3D = 0x3F54
+0x5C3E = 0x4878
+0x5C3F = 0x4722
+0x5C40 = 0x3649
+0x5C41 = 0x557B
+0x5C45 = 0x356F
+0x5C46 = 0x557C
+0x5C48 = 0x367E
+0x5C4A = 0x464F
+0x5C4B = 0x3230
+0x5C4D = 0x3B53
+0x5C4E = 0x557D
+0x5C4F = 0x5622
+0x5C50 = 0x5621
+0x5C51 = 0x367D
+0x5C53 = 0x557E
+0x5C55 = 0x4538
+0x5C5E = 0x4230
+0x5C60 = 0x454B
+0x5C61 = 0x3C48
+0x5C64 = 0x4158
+0x5C65 = 0x4D7A
+0x5C6C = 0x5624
+0x5C6E = 0x5625
+0x5C6F = 0x4656
+0x5C71 = 0x3B33
+0x5C76 = 0x5627
+0x5C79 = 0x5628
+0x5C8C = 0x5629
+0x5C90 = 0x3474
+0x5C91 = 0x562A
+0x5C94 = 0x562B
+0x5CA1 = 0x322C
+0x5CA8 = 0x413B
+0x5CA9 = 0x3464
+0x5CAB = 0x562D
+0x5CAC = 0x4C28
+0x5CB1 = 0x4252
+0x5CB3 = 0x3359
+0x5CB6 = 0x562F
+0x5CB7 = 0x5631
+0x5CB8 = 0x345F
+0x5CBB = 0x562E
+0x5CBC = 0x5630
+0x5CBE = 0x5633
+0x5CC5 = 0x5632
+0x5CC7 = 0x5634
+0x5CD9 = 0x5635
+0x5CE0 = 0x463D
+0x5CE1 = 0x362E
+0x5CE8 = 0x3265
+0x5CE9 = 0x5636
+0x5CEA = 0x563B
+0x5CED = 0x5639
+0x5CEF = 0x4A77
+0x5CF0 = 0x4A76
+0x5CF6 = 0x4567
+0x5CFA = 0x5638
+0x5CFB = 0x3D54
+0x5CFD = 0x5637
+0x5D07 = 0x3F72
+0x5D0B = 0x563C
+0x5D0E = 0x3A6A
+0x5D11 = 0x5642
+0x5D14 = 0x5643
+0x5D15 = 0x563D
+0x5D16 = 0x3333
+0x5D17 = 0x563E
+0x5D18 = 0x5647
+0x5D19 = 0x5646
+0x5D1A = 0x5645
+0x5D1B = 0x5641
+0x5D1F = 0x5640
+0x5D22 = 0x5644
+0x5D29 = 0x4A78
+0x5D4B = 0x564B
+0x5D4C = 0x5648
+0x5D4E = 0x564A
+0x5D50 = 0x4D72
+0x5D52 = 0x5649
+0x5D5C = 0x563F
+0x5D69 = 0x3F73
+0x5D6C = 0x564C
+0x5D6F = 0x3A37
+0x5D73 = 0x564D
+0x5D76 = 0x564E
+0x5D82 = 0x5651
+0x5D84 = 0x5650
+0x5D87 = 0x564F
+0x5D8B = 0x4568
+0x5D8C = 0x563A
+0x5D90 = 0x5657
+0x5D9D = 0x5653
+0x5DA2 = 0x5652
+0x5DAC = 0x5654
+0x5DAE = 0x5655
+0x5DB7 = 0x5658
+0x5DBA = 0x4E66
+0x5DBC = 0x5659
+0x5DBD = 0x5656
+0x5DC9 = 0x565A
+0x5DCC = 0x3460
+0x5DCD = 0x565B
+0x5DD2 = 0x565D
+0x5DD3 = 0x565C
+0x5DD6 = 0x565E
+0x5DDB = 0x565F
+0x5DDD = 0x406E
+0x5DDE = 0x3D23
+0x5DE1 = 0x3D64
+0x5DE3 = 0x4163
+0x5DE5 = 0x3929
+0x5DE6 = 0x3A38
+0x5DE7 = 0x392A
+0x5DE8 = 0x3570
+0x5DEB = 0x5660
+0x5DEE = 0x3A39
+0x5DF1 = 0x384A
+0x5DF2 = 0x5661
+0x5DF3 = 0x4C26
+0x5DF4 = 0x4743
+0x5DF5 = 0x5662
+0x5DF7 = 0x392B
+0x5DFB = 0x342C
+0x5DFD = 0x4327
+0x5DFE = 0x3652
+0x5E02 = 0x3B54
+0x5E03 = 0x495B
+0x5E06 = 0x4841
+0x5E0B = 0x5663
+0x5E0C = 0x3475
+0x5E11 = 0x5666
+0x5E16 = 0x4421
+0x5E19 = 0x5665
+0x5E1A = 0x5664
+0x5E1B = 0x5667
+0x5E1D = 0x446B
+0x5E25 = 0x3F63
+0x5E2B = 0x3B55
+0x5E2D = 0x404A
+0x5E2F = 0x4253
+0x5E30 = 0x3522
+0x5E33 = 0x4422
+0x5E36 = 0x5668
+0x5E37 = 0x5669
+0x5E38 = 0x3E6F
+0x5E3D = 0x4B39
+0x5E40 = 0x566C
+0x5E43 = 0x566B
+0x5E44 = 0x566A
+0x5E45 = 0x497D
+0x5E47 = 0x5673
+0x5E4C = 0x4B5A
+0x5E4E = 0x566D
+0x5E54 = 0x566F
+0x5E55 = 0x4B6B
+0x5E57 = 0x566E
+0x5E5F = 0x5670
+0x5E61 = 0x4828
+0x5E62 = 0x5671
+0x5E63 = 0x4A3E
+0x5E64 = 0x5672
+0x5E72 = 0x3433
+0x5E73 = 0x4A3F
+0x5E74 = 0x472F
+0x5E75 = 0x5674
+0x5E76 = 0x5675
+0x5E78 = 0x392C
+0x5E79 = 0x3434
+0x5E7A = 0x5676
+0x5E7B = 0x3838
+0x5E7C = 0x4D44
+0x5E7D = 0x4D29
+0x5E7E = 0x3476
+0x5E7F = 0x5678
+0x5E81 = 0x4423
+0x5E83 = 0x392D
+0x5E84 = 0x3E31
+0x5E87 = 0x485F
+0x5E8A = 0x3E32
+0x5E8F = 0x3D78
+0x5E95 = 0x446C
+0x5E96 = 0x4A79
+0x5E97 = 0x4539
+0x5E9A = 0x392E
+0x5E9C = 0x495C
+0x5EA0 = 0x5679
+0x5EA6 = 0x4559
+0x5EA7 = 0x3A42
+0x5EAB = 0x384B
+0x5EAD = 0x446D
+0x5EB5 = 0x3043
+0x5EB6 = 0x3D6E
+0x5EB7 = 0x392F
+0x5EB8 = 0x4D47
+0x5EC1 = 0x567A
+0x5EC2 = 0x567B
+0x5EC3 = 0x4751
+0x5EC8 = 0x567C
+0x5EC9 = 0x4E77
+0x5ECA = 0x4F2D
+0x5ECF = 0x567E
+0x5ED0 = 0x567D
+0x5ED3 = 0x3347
+0x5ED6 = 0x5721
+0x5EDA = 0x5724
+0x5EDB = 0x5725
+0x5EDD = 0x5723
+0x5EDF = 0x4940
+0x5EE0 = 0x3E33
+0x5EE1 = 0x5727
+0x5EE2 = 0x5726
+0x5EE3 = 0x5722
+0x5EE8 = 0x5728
+0x5EE9 = 0x5729
+0x5EEC = 0x572A
+0x5EF0 = 0x572D
+0x5EF1 = 0x572B
+0x5EF3 = 0x572C
+0x5EF4 = 0x572E
+0x5EF6 = 0x3164
+0x5EF7 = 0x446E
+0x5EF8 = 0x572F
+0x5EFA = 0x377A
+0x5EFB = 0x3276
+0x5EFC = 0x4736
+0x5EFE = 0x5730
+0x5EFF = 0x467B
+0x5F01 = 0x4A5B
+0x5F03 = 0x5731
+0x5F04 = 0x4F2E
+0x5F09 = 0x5732
+0x5F0A = 0x4A40
+0x5F0B = 0x5735
+0x5F0C = 0x5021
+0x5F0D = 0x5031
+0x5F0F = 0x3C30
+0x5F10 = 0x4675
+0x5F11 = 0x5736
+0x5F13 = 0x355D
+0x5F14 = 0x4424
+0x5F15 = 0x307A
+0x5F16 = 0x5737
+0x5F17 = 0x4A26
+0x5F18 = 0x3930
+0x5F1B = 0x4350
+0x5F1F = 0x446F
+0x5F25 = 0x4C6F
+0x5F26 = 0x3839
+0x5F27 = 0x384C
+0x5F29 = 0x5738
+0x5F2D = 0x5739
+0x5F2F = 0x573F
+0x5F31 = 0x3C65
+0x5F35 = 0x4425
+0x5F37 = 0x362F
+0x5F38 = 0x573A
+0x5F3C = 0x492B
+0x5F3E = 0x4346
+0x5F41 = 0x573B
+0x5F48 = 0x573C
+0x5F4A = 0x3630
+0x5F4C = 0x573D
+0x5F4E = 0x573E
+0x5F51 = 0x5740
+0x5F53 = 0x4576
+0x5F56 = 0x5741
+0x5F57 = 0x5742
+0x5F59 = 0x5743
+0x5F5C = 0x5734
+0x5F5D = 0x5733
+0x5F61 = 0x5744
+0x5F62 = 0x3741
+0x5F66 = 0x4927
+0x5F69 = 0x3A4C
+0x5F6A = 0x4937
+0x5F6B = 0x4426
+0x5F6C = 0x494B
+0x5F6D = 0x5745
+0x5F70 = 0x3E34
+0x5F71 = 0x3146
+0x5F73 = 0x5746
+0x5F77 = 0x5747
+0x5F79 = 0x4C72
+0x5F7C = 0x4860
+0x5F7F = 0x574A
+0x5F80 = 0x317D
+0x5F81 = 0x402C
+0x5F82 = 0x5749
+0x5F83 = 0x5748
+0x5F84 = 0x3742
+0x5F85 = 0x4254
+0x5F87 = 0x574E
+0x5F88 = 0x574C
+0x5F8A = 0x574B
+0x5F8B = 0x4E27
+0x5F8C = 0x3865
+0x5F90 = 0x3D79
+0x5F91 = 0x574D
+0x5F92 = 0x454C
+0x5F93 = 0x3D3E
+0x5F97 = 0x4640
+0x5F98 = 0x5751
+0x5F99 = 0x5750
+0x5F9E = 0x574F
+0x5FA0 = 0x5752
+0x5FA1 = 0x3866
+0x5FA8 = 0x5753
+0x5FA9 = 0x497C
+0x5FAA = 0x3D5B
+0x5FAD = 0x5754
+0x5FAE = 0x4879
+0x5FB3 = 0x4641
+0x5FB4 = 0x4427
+0x5FB9 = 0x4530
+0x5FBC = 0x5755
+0x5FBD = 0x352B
+0x5FC3 = 0x3F34
+0x5FC5 = 0x492C
+0x5FCC = 0x3477
+0x5FCD = 0x4726
+0x5FD6 = 0x5756
+0x5FD7 = 0x3B56
+0x5FD8 = 0x4B3A
+0x5FD9 = 0x4B3B
+0x5FDC = 0x317E
+0x5FDD = 0x575B
+0x5FE0 = 0x4369
+0x5FE4 = 0x5758
+0x5FEB = 0x3277
+0x5FF0 = 0x582D
+0x5FF1 = 0x575A
+0x5FF5 = 0x4730
+0x5FF8 = 0x5759
+0x5FFB = 0x5757
+0x5FFD = 0x397A
+0x5FFF = 0x575D
+0x600E = 0x5763
+0x600F = 0x5769
+0x6010 = 0x5761
+0x6012 = 0x455C
+0x6015 = 0x5766
+0x6016 = 0x495D
+0x6019 = 0x5760
+0x601B = 0x5765
+0x601C = 0x4E67
+0x601D = 0x3B57
+0x6020 = 0x4255
+0x6021 = 0x575E
+0x6025 = 0x355E
+0x6026 = 0x5768
+0x6027 = 0x402D
+0x6028 = 0x3165
+0x6029 = 0x5762
+0x602A = 0x3278
+0x602B = 0x5767
+0x602F = 0x3631
+0x6031 = 0x5764
+0x603A = 0x576A
+0x6041 = 0x576C
+0x6042 = 0x5776
+0x6043 = 0x5774
+0x6046 = 0x5771
+0x604A = 0x5770
+0x604B = 0x4E78
+0x604D = 0x5772
+0x6050 = 0x3632
+0x6052 = 0x3931
+0x6055 = 0x3D7A
+0x6059 = 0x5779
+0x605A = 0x576B
+0x605F = 0x576F
+0x6060 = 0x575F
+0x6062 = 0x327A
+0x6063 = 0x5773
+0x6064 = 0x5775
+0x6065 = 0x4351
+0x6068 = 0x3A28
+0x6069 = 0x3238
+0x606A = 0x576D
+0x606B = 0x5778
+0x606C = 0x5777
+0x606D = 0x3633
+0x606F = 0x4229
+0x6070 = 0x3366
+0x6075 = 0x3743
+0x6077 = 0x576E
+0x6081 = 0x577A
+0x6083 = 0x577D
+0x6084 = 0x5821
+0x6089 = 0x3C3D
+0x608B = 0x5827
+0x608C = 0x4470
+0x608D = 0x577B
+0x6092 = 0x5825
+0x6094 = 0x3279
+0x6096 = 0x5823
+0x6097 = 0x5824
+0x609A = 0x577E
+0x609B = 0x5822
+0x609F = 0x3867
+0x60A0 = 0x4D2A
+0x60A3 = 0x3435
+0x60A6 = 0x3159
+0x60A7 = 0x5826
+0x60A9 = 0x473A
+0x60AA = 0x302D
+0x60B2 = 0x4861
+0x60B3 = 0x575C
+0x60B4 = 0x582C
+0x60B5 = 0x5830
+0x60B6 = 0x4C65
+0x60B8 = 0x5829
+0x60BC = 0x4569
+0x60BD = 0x582E
+0x60C5 = 0x3E70
+0x60C6 = 0x582F
+0x60C7 = 0x4657
+0x60D1 = 0x4F47
+0x60D3 = 0x582B
+0x60D8 = 0x5831
+0x60DA = 0x397B
+0x60DC = 0x404B
+0x60DF = 0x3054
+0x60E0 = 0x582A
+0x60E1 = 0x5828
+0x60E3 = 0x415A
+0x60E7 = 0x577C
+0x60E8 = 0x3B34
+0x60F0 = 0x4246
+0x60F1 = 0x583D
+0x60F3 = 0x415B
+0x60F4 = 0x5838
+0x60F6 = 0x5835
+0x60F7 = 0x5836
+0x60F9 = 0x3C66
+0x60FA = 0x5839
+0x60FB = 0x583C
+0x6100 = 0x5837
+0x6101 = 0x3D25
+0x6103 = 0x583A
+0x6106 = 0x5834
+0x6108 = 0x4C7C
+0x6109 = 0x4C7B
+0x610D = 0x583E
+0x610E = 0x583F
+0x610F = 0x3055
+0x6115 = 0x5833
+0x611A = 0x3672
+0x611B = 0x3026
+0x611F = 0x3436
+0x6121 = 0x583B
+0x6127 = 0x5843
+0x6128 = 0x5842
+0x612C = 0x5847
+0x6134 = 0x5848
+0x613C = 0x5846
+0x613D = 0x5849
+0x613E = 0x5841
+0x613F = 0x5845
+0x6142 = 0x584A
+0x6144 = 0x584B
+0x6147 = 0x5840
+0x6148 = 0x3B7C
+0x614A = 0x5844
+0x614B = 0x4256
+0x614C = 0x3932
+0x614D = 0x5832
+0x614E = 0x3F35
+0x6153 = 0x5858
+0x6155 = 0x4A69
+0x6158 = 0x584E
+0x6159 = 0x584F
+0x615A = 0x5850
+0x615D = 0x5857
+0x615F = 0x5856
+0x6162 = 0x4B7D
+0x6163 = 0x3437
+0x6165 = 0x5854
+0x6167 = 0x3745
+0x6168 = 0x3334
+0x616B = 0x5851
+0x616E = 0x4E38
+0x616F = 0x5853
+0x6170 = 0x3056
+0x6171 = 0x5855
+0x6173 = 0x584C
+0x6174 = 0x5852
+0x6175 = 0x5859
+0x6176 = 0x3744
+0x6177 = 0x584D
+0x617E = 0x4D5D
+0x6182 = 0x4D2B
+0x6187 = 0x585C
+0x618A = 0x5860
+0x618E = 0x417E
+0x6190 = 0x4E79
+0x6191 = 0x5861
+0x6194 = 0x585E
+0x6196 = 0x585B
+0x6199 = 0x585A
+0x619A = 0x585F
+0x61A4 = 0x4A30
+0x61A7 = 0x4634
+0x61A9 = 0x3746
+0x61AB = 0x5862
+0x61AC = 0x585D
+0x61AE = 0x5863
+0x61B2 = 0x377B
+0x61B6 = 0x3231
+0x61BA = 0x586B
+0x61BE = 0x3438
+0x61C3 = 0x5869
+0x61C6 = 0x586A
+0x61C7 = 0x3A29
+0x61C8 = 0x5868
+0x61C9 = 0x5866
+0x61CA = 0x5865
+0x61CB = 0x586C
+0x61CC = 0x5864
+0x61CD = 0x586E
+0x61D0 = 0x327B
+0x61E3 = 0x5870
+0x61E6 = 0x586F
+0x61F2 = 0x4428
+0x61F4 = 0x5873
+0x61F6 = 0x5871
+0x61F7 = 0x5867
+0x61F8 = 0x377C
+0x61FA = 0x5872
+0x61FC = 0x5876
+0x61FD = 0x5875
+0x61FE = 0x5877
+0x61FF = 0x5874
+0x6200 = 0x5878
+0x6208 = 0x5879
+0x6209 = 0x587A
+0x620A = 0x4A6A
+0x620C = 0x587C
+0x620D = 0x587B
+0x620E = 0x3D3F
+0x6210 = 0x402E
+0x6211 = 0x3266
+0x6212 = 0x327C
+0x6214 = 0x587D
+0x6216 = 0x303F
+0x621A = 0x404C
+0x621B = 0x587E
+0x621D = 0x6C43
+0x621E = 0x5921
+0x621F = 0x3761
+0x6221 = 0x5922
+0x6226 = 0x406F
+0x622A = 0x5923
+0x622E = 0x5924
+0x622F = 0x353A
+0x6230 = 0x5925
+0x6232 = 0x5926
+0x6233 = 0x5927
+0x6234 = 0x4257
+0x6238 = 0x384D
+0x623B = 0x4C61
+0x623F = 0x4B3C
+0x6240 = 0x3D6A
+0x6241 = 0x5928
+0x6247 = 0x4070
+0x6248 = 0x6E3D
+0x6249 = 0x4862
+0x624B = 0x3C6A
+0x624D = 0x3A4D
+0x624E = 0x5929
+0x6253 = 0x4247
+0x6255 = 0x4A27
+0x6258 = 0x4271
+0x625B = 0x592C
+0x625E = 0x592A
+0x6260 = 0x592D
+0x6263 = 0x592B
+0x6268 = 0x592E
+0x626E = 0x4A31
+0x6271 = 0x3037
+0x6276 = 0x495E
+0x6279 = 0x4863
+0x627C = 0x592F
+0x627E = 0x5932
+0x627F = 0x3E35
+0x6280 = 0x353B
+0x6282 = 0x5930
+0x6283 = 0x5937
+0x6284 = 0x3E36
+0x6289 = 0x5931
+0x628A = 0x4744
+0x6291 = 0x4D5E
+0x6292 = 0x5933
+0x6293 = 0x5934
+0x6294 = 0x5938
+0x6295 = 0x456A
+0x6296 = 0x5935
+0x6297 = 0x3933
+0x6298 = 0x405E
+0x629B = 0x5946
+0x629C = 0x4834
+0x629E = 0x4272
+0x62AB = 0x4864
+0x62AC = 0x5A2D
+0x62B1 = 0x4A7A
+0x62B5 = 0x4471
+0x62B9 = 0x4B75
+0x62BB = 0x593B
+0x62BC = 0x3221
+0x62BD = 0x436A
+0x62C2 = 0x5944
+0x62C5 = 0x4334
+0x62C6 = 0x593E
+0x62C7 = 0x5945
+0x62C8 = 0x5940
+0x62C9 = 0x5947
+0x62CA = 0x5943
+0x62CC = 0x5942
+0x62CD = 0x476F
+0x62CF = 0x593C
+0x62D0 = 0x327D
+0x62D1 = 0x593A
+0x62D2 = 0x3571
+0x62D3 = 0x4273
+0x62D4 = 0x5936
+0x62D7 = 0x5939
+0x62D8 = 0x3934
+0x62D9 = 0x405B
+0x62DB = 0x3E37
+0x62DC = 0x5941
+0x62DD = 0x4752
+0x62E0 = 0x3572
+0x62E1 = 0x3348
+0x62EC = 0x3367
+0x62ED = 0x3F21
+0x62EE = 0x5949
+0x62EF = 0x594E
+0x62F1 = 0x594A
+0x62F3 = 0x377D
+0x62F5 = 0x594F
+0x62F6 = 0x3B22
+0x62F7 = 0x3969
+0x62FE = 0x3D26
+0x62FF = 0x593D
+0x6301 = 0x3B7D
+0x6302 = 0x594C
+0x6307 = 0x3B58
+0x6308 = 0x594D
+0x6309 = 0x3044
+0x630C = 0x5948
+0x6311 = 0x4429
+0x6319 = 0x3573
+0x631F = 0x3634
+0x6327 = 0x594B
+0x6328 = 0x3027
+0x632B = 0x3A43
+0x632F = 0x3F36
+0x633A = 0x4472
+0x633D = 0x4854
+0x633E = 0x5951
+0x633F = 0x415E
+0x6349 = 0x422A
+0x634C = 0x3B2B
+0x634D = 0x5952
+0x634F = 0x5954
+0x6350 = 0x5950
+0x6355 = 0x4A61
+0x6357 = 0x443D
+0x635C = 0x415C
+0x6367 = 0x4A7B
+0x6368 = 0x3C4E
+0x6369 = 0x5960
+0x636B = 0x595F
+0x636E = 0x3F78
+0x6372 = 0x377E
+0x6376 = 0x5959
+0x6377 = 0x3E39
+0x637A = 0x4668
+0x637B = 0x4731
+0x6380 = 0x5957
+0x6383 = 0x415D
+0x6388 = 0x3C78
+0x6389 = 0x595C
+0x638C = 0x3E38
+0x638E = 0x5956
+0x638F = 0x595B
+0x6392 = 0x4753
+0x6396 = 0x5955
+0x6398 = 0x3721
+0x639B = 0x335D
+0x639F = 0x595D
+0x63A0 = 0x4E2B
+0x63A1 = 0x3A4E
+0x63A2 = 0x4335
+0x63A3 = 0x595A
+0x63A5 = 0x405C
+0x63A7 = 0x3935
+0x63A8 = 0x3F64
+0x63A9 = 0x3166
+0x63AA = 0x413C
+0x63AB = 0x5958
+0x63AC = 0x3545
+0x63B2 = 0x3747
+0x63B4 = 0x444F
+0x63B5 = 0x595E
+0x63BB = 0x415F
+0x63BE = 0x5961
+0x63C0 = 0x5963
+0x63C3 = 0x4237
+0x63C4 = 0x5969
+0x63C6 = 0x5964
+0x63C9 = 0x5966
+0x63CF = 0x4941
+0x63D0 = 0x4473
+0x63D2 = 0x5967
+0x63D6 = 0x4D2C
+0x63DA = 0x4D48
+0x63DB = 0x3439
+0x63E1 = 0x302E
+0x63E3 = 0x5965
+0x63E9 = 0x5962
+0x63EE = 0x3478
+0x63F4 = 0x3167
+0x63F6 = 0x5968
+0x63FA = 0x4D49
+0x6406 = 0x596C
+0x640D = 0x423B
+0x640F = 0x5973
+0x6413 = 0x596D
+0x6416 = 0x596A
+0x6417 = 0x5971
+0x641C = 0x5953
+0x6426 = 0x596E
+0x6428 = 0x5972
+0x642C = 0x4842
+0x642D = 0x456B
+0x6434 = 0x596B
+0x6436 = 0x596F
+0x643A = 0x3748
+0x643E = 0x3A71
+0x6442 = 0x405D
+0x644E = 0x5977
+0x6458 = 0x4526
+0x6467 = 0x5974
+0x6469 = 0x4B60
+0x646F = 0x5975
+0x6476 = 0x5976
+0x6478 = 0x4C4E
+0x647A = 0x4022
+0x6483 = 0x3762
+0x6488 = 0x597D
+0x6492 = 0x3B35
+0x6493 = 0x597A
+0x6495 = 0x5979
+0x649A = 0x4732
+0x649E = 0x4635
+0x64A4 = 0x4531
+0x64A5 = 0x597B
+0x64A9 = 0x597C
+0x64AB = 0x496F
+0x64AD = 0x4745
+0x64AE = 0x3B23
+0x64B0 = 0x4071
+0x64B2 = 0x4B50
+0x64B9 = 0x3349
+0x64BB = 0x5A25
+0x64BC = 0x597E
+0x64C1 = 0x4D4A
+0x64C2 = 0x5A27
+0x64C5 = 0x5A23
+0x64C7 = 0x5A24
+0x64CD = 0x4160
+0x64D2 = 0x5A22
+0x64D4 = 0x593F
+0x64D8 = 0x5A26
+0x64DA = 0x5A21
+0x64E0 = 0x5A2B
+0x64E1 = 0x5A2C
+0x64E2 = 0x4527
+0x64E3 = 0x5A2E
+0x64E6 = 0x3B24
+0x64E7 = 0x5A29
+0x64EC = 0x353C
+0x64EF = 0x5A2F
+0x64F1 = 0x5A28
+0x64F2 = 0x5A33
+0x64F4 = 0x5A32
+0x64F6 = 0x5A31
+0x64FA = 0x5A34
+0x64FD = 0x5A36
+0x64FE = 0x3E71
+0x6500 = 0x5A35
+0x6505 = 0x5A39
+0x6518 = 0x5A37
+0x651C = 0x5A38
+0x651D = 0x5970
+0x6523 = 0x5A3B
+0x6524 = 0x5A3A
+0x652A = 0x5978
+0x652B = 0x5A3C
+0x652C = 0x5A30
+0x652F = 0x3B59
+0x6534 = 0x5A3D
+0x6535 = 0x5A3E
+0x6536 = 0x5A40
+0x6537 = 0x5A3F
+0x6538 = 0x5A41
+0x6539 = 0x327E
+0x653B = 0x3936
+0x653E = 0x4A7C
+0x653F = 0x402F
+0x6545 = 0x384E
+0x6548 = 0x5A43
+0x654D = 0x5A46
+0x654F = 0x4952
+0x6551 = 0x355F
+0x6555 = 0x5A45
+0x6556 = 0x5A44
+0x6557 = 0x4754
+0x6558 = 0x5A47
+0x6559 = 0x3635
+0x655D = 0x5A49
+0x655E = 0x5A48
+0x6562 = 0x343A
+0x6563 = 0x3B36
+0x6566 = 0x4658
+0x656C = 0x3749
+0x6570 = 0x3F74
+0x6572 = 0x5A4A
+0x6574 = 0x4030
+0x6575 = 0x4528
+0x6577 = 0x495F
+0x6578 = 0x5A4B
+0x6582 = 0x5A4C
+0x6583 = 0x5A4D
+0x6587 = 0x4A38
+0x6588 = 0x555D
+0x6589 = 0x4046
+0x658C = 0x494C
+0x658E = 0x3A58
+0x6590 = 0x4865
+0x6591 = 0x4843
+0x6597 = 0x454D
+0x6599 = 0x4E41
+0x659B = 0x5A4F
+0x659C = 0x3C50
+0x659F = 0x5A50
+0x65A1 = 0x3036
+0x65A4 = 0x3654
+0x65A5 = 0x404D
+0x65A7 = 0x4960
+0x65AB = 0x5A51
+0x65AC = 0x3B42
+0x65AD = 0x4347
+0x65AF = 0x3B5B
+0x65B0 = 0x3F37
+0x65B7 = 0x5A52
+0x65B9 = 0x4A7D
+0x65BC = 0x3177
+0x65BD = 0x3B5C
+0x65C1 = 0x5A55
+0x65C3 = 0x5A53
+0x65C4 = 0x5A56
+0x65C5 = 0x4E39
+0x65C6 = 0x5A54
+0x65CB = 0x407B
+0x65CC = 0x5A57
+0x65CF = 0x4232
+0x65D2 = 0x5A58
+0x65D7 = 0x347A
+0x65D9 = 0x5A5A
+0x65DB = 0x5A59
+0x65E0 = 0x5A5B
+0x65E1 = 0x5A5C
+0x65E2 = 0x347B
+0x65E5 = 0x467C
+0x65E6 = 0x4336
+0x65E7 = 0x356C
+0x65E8 = 0x3B5D
+0x65E9 = 0x4161
+0x65EC = 0x3D5C
+0x65ED = 0x3030
+0x65F1 = 0x5A5D
+0x65FA = 0x3222
+0x65FB = 0x5A61
+0x6602 = 0x3937
+0x6603 = 0x5A60
+0x6606 = 0x3A2B
+0x6607 = 0x3E3A
+0x660A = 0x5A5F
+0x660C = 0x3E3B
+0x660E = 0x4C40
+0x660F = 0x3A2A
+0x6613 = 0x3057
+0x6614 = 0x404E
+0x661C = 0x5A66
+0x661F = 0x4031
+0x6620 = 0x3147
+0x6625 = 0x3D55
+0x6627 = 0x4B66
+0x6628 = 0x3A72
+0x662D = 0x3E3C
+0x662F = 0x4027
+0x6634 = 0x5A65
+0x6635 = 0x5A63
+0x6636 = 0x5A64
+0x663C = 0x436B
+0x663F = 0x5B26
+0x6641 = 0x5A6A
+0x6642 = 0x3B7E
+0x6643 = 0x3938
+0x6644 = 0x5A68
+0x6649 = 0x5A69
+0x664B = 0x3F38
+0x664F = 0x5A67
+0x6652 = 0x3B2F
+0x665D = 0x5A6C
+0x665E = 0x5A6B
+0x665F = 0x5A70
+0x6662 = 0x5A71
+0x6664 = 0x5A6D
+0x6666 = 0x3322
+0x6667 = 0x5A6E
+0x6668 = 0x5A6F
+0x6669 = 0x4855
+0x666E = 0x4961
+0x666F = 0x374A
+0x6670 = 0x5A72
+0x6674 = 0x4032
+0x6676 = 0x3E3D
+0x667A = 0x4352
+0x6681 = 0x3647
+0x6683 = 0x5A73
+0x6684 = 0x5A77
+0x6687 = 0x324B
+0x6688 = 0x5A74
+0x6689 = 0x5A76
+0x668E = 0x5A75
+0x6691 = 0x3D6B
+0x6696 = 0x4348
+0x6697 = 0x3045
+0x6698 = 0x5A78
+0x669D = 0x5A79
+0x66A2 = 0x442A
+0x66A6 = 0x4E71
+0x66AB = 0x3B43
+0x66AE = 0x4A6B
+0x66B4 = 0x4B3D
+0x66B8 = 0x5B22
+0x66B9 = 0x5A7B
+0x66BC = 0x5A7E
+0x66BE = 0x5A7D
+0x66C1 = 0x5A7A
+0x66C4 = 0x5B21
+0x66C7 = 0x465E
+0x66C9 = 0x5A7C
+0x66D6 = 0x5B23
+0x66D9 = 0x3D6C
+0x66DA = 0x5B24
+0x66DC = 0x4D4B
+0x66DD = 0x4778
+0x66E0 = 0x5B25
+0x66E6 = 0x5B27
+0x66E9 = 0x5B28
+0x66F0 = 0x5B29
+0x66F2 = 0x364A
+0x66F3 = 0x3148
+0x66F4 = 0x3939
+0x66F5 = 0x5B2A
+0x66F7 = 0x5B2B
+0x66F8 = 0x3D71
+0x66F9 = 0x4162
+0x66FC = 0x5258
+0x66FD = 0x413E
+0x66FE = 0x413D
+0x66FF = 0x4258
+0x6700 = 0x3A47
+0x6703 = 0x5072
+0x6708 = 0x376E
+0x6709 = 0x4D2D
+0x670B = 0x4A7E
+0x670D = 0x497E
+0x670F = 0x5B2C
+0x6714 = 0x3A73
+0x6715 = 0x443F
+0x6716 = 0x5B2D
+0x6717 = 0x4F2F
+0x671B = 0x4B3E
+0x671D = 0x442B
+0x671E = 0x5B2E
+0x671F = 0x347C
+0x6726 = 0x5B2F
+0x6727 = 0x5B30
+0x6728 = 0x4C5A
+0x672A = 0x4C24
+0x672B = 0x4B76
+0x672C = 0x4B5C
+0x672D = 0x3B25
+0x672E = 0x5B32
+0x6731 = 0x3C6B
+0x6734 = 0x4B51
+0x6736 = 0x5B34
+0x6737 = 0x5B37
+0x6738 = 0x5B36
+0x673A = 0x3479
+0x673D = 0x3560
+0x673F = 0x5B33
+0x6741 = 0x5B35
+0x6746 = 0x5B38
+0x6749 = 0x3F79
+0x674E = 0x4D7B
+0x674F = 0x3049
+0x6750 = 0x3A60
+0x6751 = 0x423C
+0x6753 = 0x3C5D
+0x6756 = 0x3E73
+0x6759 = 0x5B3B
+0x675C = 0x454E
+0x675E = 0x5B39
+0x675F = 0x422B
+0x6760 = 0x5B3A
+0x6761 = 0x3E72
+0x6762 = 0x4C5D
+0x6763 = 0x5B3C
+0x6764 = 0x5B3D
+0x6765 = 0x4D68
+0x676A = 0x5B42
+0x676D = 0x393A
+0x676F = 0x4755
+0x6770 = 0x5B3F
+0x6771 = 0x456C
+0x6772 = 0x5A5E
+0x6773 = 0x5A62
+0x6775 = 0x354F
+0x6777 = 0x4747
+0x677C = 0x5B41
+0x677E = 0x3E3E
+0x677F = 0x4844
+0x6785 = 0x5B47
+0x6787 = 0x487A
+0x6789 = 0x5B3E
+0x678B = 0x5B44
+0x678C = 0x5B43
+0x6790 = 0x404F
+0x6795 = 0x4B6D
+0x6797 = 0x4E53
+0x679A = 0x4B67
+0x679C = 0x324C
+0x679D = 0x3B5E
+0x67A0 = 0x4F48
+0x67A1 = 0x5B46
+0x67A2 = 0x3F75
+0x67A6 = 0x5B45
+0x67A9 = 0x5B40
+0x67AF = 0x384F
+0x67B3 = 0x5B4C
+0x67B4 = 0x5B4A
+0x67B6 = 0x324D
+0x67B7 = 0x5B48
+0x67B8 = 0x5B4E
+0x67B9 = 0x5B54
+0x67C1 = 0x4248
+0x67C4 = 0x4A41
+0x67C6 = 0x5B56
+0x67CA = 0x4922
+0x67CE = 0x5B55
+0x67CF = 0x4770
+0x67D0 = 0x4B3F
+0x67D1 = 0x343B
+0x67D3 = 0x4077
+0x67D4 = 0x3D40
+0x67D8 = 0x4453
+0x67DA = 0x4D2E
+0x67DD = 0x5B51
+0x67DE = 0x5B50
+0x67E2 = 0x5B52
+0x67E4 = 0x5B4F
+0x67E7 = 0x5B57
+0x67E9 = 0x5B4D
+0x67EC = 0x5B4B
+0x67EE = 0x5B53
+0x67EF = 0x5B49
+0x67F1 = 0x436C
+0x67F3 = 0x4C78
+0x67F4 = 0x3C46
+0x67F5 = 0x3A74
+0x67FB = 0x3A3A
+0x67FE = 0x4B6F
+0x67FF = 0x3341
+0x6802 = 0x444E
+0x6803 = 0x464A
+0x6804 = 0x3149
+0x6813 = 0x4072
+0x6816 = 0x4034
+0x6817 = 0x372A
+0x681E = 0x5B59
+0x6821 = 0x393B
+0x6822 = 0x337C
+0x6829 = 0x5B5B
+0x682A = 0x3374
+0x682B = 0x5B61
+0x6832 = 0x5B5E
+0x6834 = 0x4073
+0x6838 = 0x334B
+0x6839 = 0x3A2C
+0x683C = 0x334A
+0x683D = 0x3A4F
+0x6840 = 0x5B5C
+0x6841 = 0x3765
+0x6842 = 0x374B
+0x6843 = 0x456D
+0x6846 = 0x5B5A
+0x6848 = 0x3046
+0x684D = 0x5B5D
+0x684E = 0x5B5F
+0x6850 = 0x364D
+0x6851 = 0x372C
+0x6853 = 0x343C
+0x6854 = 0x354B
+0x6859 = 0x5B62
+0x685C = 0x3A79
+0x685D = 0x4B71
+0x685F = 0x3B37
+0x6863 = 0x5B63
+0x6867 = 0x4930
+0x6874 = 0x5B6F
+0x6876 = 0x3233
+0x6877 = 0x5B64
+0x687E = 0x5B75
+0x687F = 0x5B65
+0x6881 = 0x4E42
+0x6883 = 0x5B6C
+0x6885 = 0x475F
+0x688D = 0x5B74
+0x688F = 0x5B67
+0x6893 = 0x3034
+0x6894 = 0x5B69
+0x6897 = 0x393C
+0x689B = 0x5B6B
+0x689D = 0x5B6A
+0x689F = 0x5B66
+0x68A0 = 0x5B71
+0x68A2 = 0x3E3F
+0x68A6 = 0x546D
+0x68A7 = 0x3868
+0x68A8 = 0x4D7C
+0x68AD = 0x5B68
+0x68AF = 0x4474
+0x68B0 = 0x3323
+0x68B1 = 0x3A2D
+0x68B3 = 0x5B60
+0x68B5 = 0x5B70
+0x68B6 = 0x3361
+0x68B9 = 0x5B6E
+0x68BA = 0x5B72
+0x68BC = 0x456E
+0x68C4 = 0x347E
+0x68C6 = 0x5C32
+0x68C9 = 0x4C49
+0x68CA = 0x5B77
+0x68CB = 0x347D
+0x68CD = 0x5B7E
+0x68D2 = 0x4B40
+0x68D4 = 0x5C21
+0x68D5 = 0x5C23
+0x68D7 = 0x5C27
+0x68D8 = 0x5B79
+0x68DA = 0x432A
+0x68DF = 0x456F
+0x68E0 = 0x5C2B
+0x68E1 = 0x5B7C
+0x68E3 = 0x5C28
+0x68E7 = 0x5C22
+0x68EE = 0x3F39
+0x68EF = 0x5C2C
+0x68F2 = 0x4033
+0x68F9 = 0x5C2A
+0x68FA = 0x343D
+0x6900 = 0x4F50
+0x6901 = 0x5B76
+0x6904 = 0x5C26
+0x6905 = 0x3058
+0x6908 = 0x5B78
+0x690B = 0x4C3A
+0x690C = 0x5B7D
+0x690D = 0x3F22
+0x690E = 0x4447
+0x690F = 0x5B73
+0x6912 = 0x5C25
+0x6919 = 0x3F7A
+0x691A = 0x5C2F
+0x691B = 0x3371
+0x691C = 0x3821
+0x6921 = 0x5C31
+0x6922 = 0x5B7A
+0x6923 = 0x5C30
+0x6925 = 0x5C29
+0x6926 = 0x5B7B
+0x6928 = 0x5C2D
+0x692A = 0x5C2E
+0x6930 = 0x5C3F
+0x6934 = 0x464E
+0x6936 = 0x5C24
+0x6939 = 0x5C3B
+0x693D = 0x5C3D
+0x693F = 0x4458
+0x694A = 0x4D4C
+0x6953 = 0x4976
+0x6954 = 0x5C38
+0x6955 = 0x424A
+0x6959 = 0x5C3E
+0x695A = 0x413F
+0x695C = 0x5C35
+0x695D = 0x5C42
+0x695E = 0x5C41
+0x6960 = 0x466F
+0x6961 = 0x5C40
+0x6962 = 0x466A
+0x696A = 0x5C44
+0x696B = 0x5C37
+0x696D = 0x3648
+0x696E = 0x5C3A
+0x696F = 0x3D5D
+0x6973 = 0x4760
+0x6974 = 0x5C3C
+0x6975 = 0x364B
+0x6977 = 0x5C34
+0x6978 = 0x5C36
+0x6979 = 0x5C33
+0x697C = 0x4F30
+0x697D = 0x335A
+0x697E = 0x5C39
+0x6981 = 0x5C43
+0x6982 = 0x3335
+0x698A = 0x3A67
+0x698E = 0x315D
+0x6991 = 0x5C54
+0x6994 = 0x4F31
+0x6995 = 0x5C57
+0x699B = 0x3F3A
+0x699C = 0x5C56
+0x69A0 = 0x5C55
+0x69A7 = 0x5C52
+0x69AE = 0x5C46
+0x69B1 = 0x5C63
+0x69B2 = 0x5C45
+0x69B4 = 0x5C58
+0x69BB = 0x5C50
+0x69BE = 0x5C4B
+0x69BF = 0x5C48
+0x69C1 = 0x5C49
+0x69C3 = 0x5C51
+0x69C7 = 0x7422
+0x69CA = 0x5C4E
+0x69CB = 0x393D
+0x69CC = 0x4448
+0x69CD = 0x4164
+0x69CE = 0x5C4C
+0x69D0 = 0x5C47
+0x69D3 = 0x5C4A
+0x69D8 = 0x4D4D
+0x69D9 = 0x4B6A
+0x69DD = 0x5C4F
+0x69DE = 0x5C59
+0x69E7 = 0x5C61
+0x69E8 = 0x5C5A
+0x69EB = 0x5C67
+0x69ED = 0x5C65
+0x69F2 = 0x5C60
+0x69F9 = 0x5C5F
+0x69FB = 0x4450
+0x69FD = 0x4165
+0x69FF = 0x5C5D
+0x6A02 = 0x5C5B
+0x6A05 = 0x5C62
+0x6A0A = 0x5C68
+0x6A0B = 0x4875
+0x6A0C = 0x5C6E
+0x6A12 = 0x5C69
+0x6A13 = 0x5C6C
+0x6A14 = 0x5C66
+0x6A17 = 0x4374
+0x6A19 = 0x4938
+0x6A1B = 0x5C5C
+0x6A1E = 0x5C64
+0x6A1F = 0x3E40
+0x6A21 = 0x4C4F
+0x6A22 = 0x5C78
+0x6A23 = 0x5C6B
+0x6A29 = 0x3822
+0x6A2A = 0x3223
+0x6A2B = 0x335F
+0x6A2E = 0x5C53
+0x6A35 = 0x3E41
+0x6A36 = 0x5C70
+0x6A38 = 0x5C77
+0x6A39 = 0x3C79
+0x6A3A = 0x3372
+0x6A3D = 0x432E
+0x6A44 = 0x5C6D
+0x6A47 = 0x5C72
+0x6A48 = 0x5C76
+0x6A4B = 0x3636
+0x6A58 = 0x354C
+0x6A59 = 0x5C74
+0x6A5F = 0x3521
+0x6A61 = 0x464B
+0x6A62 = 0x5C73
+0x6A66 = 0x5C75
+0x6A72 = 0x5C6F
+0x6A78 = 0x5C71
+0x6A7F = 0x3360
+0x6A80 = 0x4349
+0x6A84 = 0x5C7C
+0x6A8D = 0x5C7A
+0x6A8E = 0x3869
+0x6A90 = 0x5C79
+0x6A97 = 0x5D21
+0x6A9C = 0x5B58
+0x6AA0 = 0x5C7B
+0x6AA2 = 0x5C7D
+0x6AA3 = 0x5C7E
+0x6AAA = 0x5D2C
+0x6AAC = 0x5D28
+0x6AAE = 0x5B6D
+0x6AB3 = 0x5D27
+0x6AB8 = 0x5D26
+0x6ABB = 0x5D23
+0x6AC1 = 0x5C6A
+0x6AC2 = 0x5D25
+0x6AC3 = 0x5D24
+0x6AD1 = 0x5D2A
+0x6AD3 = 0x4F26
+0x6ADA = 0x5D2D
+0x6ADB = 0x367B
+0x6ADE = 0x5D29
+0x6ADF = 0x5D2B
+0x6AE8 = 0x4827
+0x6AEA = 0x5D2E
+0x6AFA = 0x5D32
+0x6AFB = 0x5D2F
+0x6B04 = 0x4D73
+0x6B05 = 0x5D30
+0x6B0A = 0x5C5E
+0x6B12 = 0x5D33
+0x6B16 = 0x5D34
+0x6B1D = 0x3135
+0x6B1F = 0x5D36
+0x6B20 = 0x3767
+0x6B21 = 0x3C21
+0x6B23 = 0x3655
+0x6B27 = 0x3224
+0x6B32 = 0x4D5F
+0x6B37 = 0x5D38
+0x6B38 = 0x5D37
+0x6B39 = 0x5D3A
+0x6B3A = 0x353D
+0x6B3D = 0x3656
+0x6B3E = 0x343E
+0x6B43 = 0x5D3D
+0x6B47 = 0x5D3C
+0x6B49 = 0x5D3E
+0x6B4C = 0x324E
+0x6B4E = 0x4337
+0x6B50 = 0x5D3F
+0x6B53 = 0x343F
+0x6B54 = 0x5D41
+0x6B59 = 0x5D40
+0x6B5B = 0x5D42
+0x6B5F = 0x5D43
+0x6B61 = 0x5D44
+0x6B62 = 0x3B5F
+0x6B63 = 0x4035
+0x6B64 = 0x3A21
+0x6B66 = 0x4970
+0x6B69 = 0x4A62
+0x6B6A = 0x4F44
+0x6B6F = 0x3B75
+0x6B73 = 0x3A50
+0x6B74 = 0x4E72
+0x6B78 = 0x5D45
+0x6B79 = 0x5D46
+0x6B7B = 0x3B60
+0x6B7F = 0x5D47
+0x6B80 = 0x5D48
+0x6B83 = 0x5D4A
+0x6B84 = 0x5D49
+0x6B86 = 0x4B58
+0x6B89 = 0x3D5E
+0x6B8A = 0x3C6C
+0x6B8B = 0x3B44
+0x6B8D = 0x5D4B
+0x6B95 = 0x5D4D
+0x6B96 = 0x3F23
+0x6B98 = 0x5D4C
+0x6B9E = 0x5D4E
+0x6BA4 = 0x5D4F
+0x6BAA = 0x5D50
+0x6BAB = 0x5D51
+0x6BAF = 0x5D52
+0x6BB1 = 0x5D54
+0x6BB2 = 0x5D53
+0x6BB3 = 0x5D55
+0x6BB4 = 0x3225
+0x6BB5 = 0x434A
+0x6BB7 = 0x5D56
+0x6BBA = 0x3B26
+0x6BBB = 0x334C
+0x6BBC = 0x5D57
+0x6BBF = 0x4542
+0x6BC0 = 0x544C
+0x6BC5 = 0x3523
+0x6BC6 = 0x5D58
+0x6BCB = 0x5D59
+0x6BCD = 0x4A6C
+0x6BCE = 0x4B68
+0x6BD2 = 0x4647
+0x6BD3 = 0x5D5A
+0x6BD4 = 0x4866
+0x6BD8 = 0x487B
+0x6BDB = 0x4C53
+0x6BDF = 0x5D5B
+0x6BEB = 0x5D5D
+0x6BEC = 0x5D5C
+0x6BEF = 0x5D5F
+0x6BF3 = 0x5D5E
+0x6C08 = 0x5D61
+0x6C0F = 0x3B61
+0x6C11 = 0x4C31
+0x6C13 = 0x5D62
+0x6C14 = 0x5D63
+0x6C17 = 0x3524
+0x6C1B = 0x5D64
+0x6C23 = 0x5D66
+0x6C24 = 0x5D65
+0x6C34 = 0x3F65
+0x6C37 = 0x4939
+0x6C38 = 0x314A
+0x6C3E = 0x4845
+0x6C40 = 0x4475
+0x6C41 = 0x3D41
+0x6C42 = 0x3561
+0x6C4E = 0x4846
+0x6C50 = 0x3C2E
+0x6C55 = 0x5D68
+0x6C57 = 0x3440
+0x6C5A = 0x3178
+0x6C5D = 0x4672
+0x6C5E = 0x5D67
+0x6C5F = 0x393E
+0x6C60 = 0x4353
+0x6C62 = 0x5D69
+0x6C68 = 0x5D71
+0x6C6A = 0x5D6A
+0x6C70 = 0x4241
+0x6C72 = 0x3562
+0x6C73 = 0x5D72
+0x6C7A = 0x3768
+0x6C7D = 0x3525
+0x6C7E = 0x5D70
+0x6C81 = 0x5D6E
+0x6C82 = 0x5D6B
+0x6C83 = 0x4D60
+0x6C88 = 0x4440
+0x6C8C = 0x4659
+0x6C8D = 0x5D6C
+0x6C90 = 0x5D74
+0x6C92 = 0x5D73
+0x6C93 = 0x3723
+0x6C96 = 0x322D
+0x6C99 = 0x3A3B
+0x6C9A = 0x5D6D
+0x6C9B = 0x5D6F
+0x6CA1 = 0x4B57
+0x6CA2 = 0x4274
+0x6CAB = 0x4B77
+0x6CAE = 0x5D7C
+0x6CB1 = 0x5D7D
+0x6CB3 = 0x324F
+0x6CB8 = 0x4A28
+0x6CB9 = 0x4C7D
+0x6CBA = 0x5E21
+0x6CBB = 0x3C23
+0x6CBC = 0x3E42
+0x6CBD = 0x5D78
+0x6CBE = 0x5D7E
+0x6CBF = 0x3168
+0x6CC1 = 0x3637
+0x6CC4 = 0x5D75
+0x6CC5 = 0x5D7A
+0x6CC9 = 0x4074
+0x6CCA = 0x4771
+0x6CCC = 0x4867
+0x6CD3 = 0x5D77
+0x6CD5 = 0x4B21
+0x6CD7 = 0x5D79
+0x6CD9 = 0x5E24
+0x6CDB = 0x5E22
+0x6CDD = 0x5D7B
+0x6CE1 = 0x4B22
+0x6CE2 = 0x4748
+0x6CE3 = 0x3563
+0x6CE5 = 0x4525
+0x6CE8 = 0x436D
+0x6CEA = 0x5E25
+0x6CEF = 0x5E23
+0x6CF0 = 0x4259
+0x6CF1 = 0x5D76
+0x6CF3 = 0x314B
+0x6D0B = 0x4D4E
+0x6D0C = 0x5E30
+0x6D12 = 0x5E2F
+0x6D17 = 0x4076
+0x6D19 = 0x5E2C
+0x6D1B = 0x4D6C
+0x6D1E = 0x4636
+0x6D1F = 0x5E26
+0x6D25 = 0x4445
+0x6D29 = 0x314C
+0x6D2A = 0x393F
+0x6D2B = 0x5E29
+0x6D32 = 0x3D27
+0x6D33 = 0x5E2E
+0x6D35 = 0x5E2D
+0x6D36 = 0x5E28
+0x6D38 = 0x5E2B
+0x6D3B = 0x3368
+0x6D3D = 0x5E2A
+0x6D3E = 0x4749
+0x6D41 = 0x4E2E
+0x6D44 = 0x3E74
+0x6D45 = 0x4075
+0x6D59 = 0x5E36
+0x6D5A = 0x5E34
+0x6D5C = 0x494D
+0x6D63 = 0x5E31
+0x6D64 = 0x5E33
+0x6D66 = 0x313A
+0x6D69 = 0x3940
+0x6D6A = 0x4F32
+0x6D6C = 0x333D
+0x6D6E = 0x4962
+0x6D74 = 0x4D61
+0x6D77 = 0x3324
+0x6D78 = 0x3F3B
+0x6D79 = 0x5E35
+0x6D85 = 0x5E3A
+0x6D88 = 0x3E43
+0x6D8C = 0x4D30
+0x6D8E = 0x5E37
+0x6D93 = 0x5E32
+0x6D95 = 0x5E38
+0x6D99 = 0x4E5E
+0x6D9B = 0x4573
+0x6D9C = 0x4642
+0x6DAF = 0x3336
+0x6DB2 = 0x3155
+0x6DB5 = 0x5E3E
+0x6DB8 = 0x5E41
+0x6DBC = 0x4E43
+0x6DC0 = 0x4D64
+0x6DC5 = 0x5E48
+0x6DC6 = 0x5E42
+0x6DC7 = 0x5E3F
+0x6DCB = 0x4E54
+0x6DCC = 0x5E45
+0x6DD1 = 0x3D4A
+0x6DD2 = 0x5E47
+0x6DD5 = 0x5E4C
+0x6DD8 = 0x4571
+0x6DD9 = 0x5E4A
+0x6DDE = 0x5E44
+0x6DE1 = 0x4338
+0x6DE4 = 0x5E4B
+0x6DE6 = 0x5E40
+0x6DE8 = 0x5E46
+0x6DEA = 0x5E4D
+0x6DEB = 0x307C
+0x6DEC = 0x5E43
+0x6DEE = 0x5E4E
+0x6DF1 = 0x3F3C
+0x6DF3 = 0x3D5F
+0x6DF5 = 0x4A25
+0x6DF7 = 0x3A2E
+0x6DF9 = 0x5E3B
+0x6DFA = 0x5E49
+0x6DFB = 0x453A
+0x6E05 = 0x4036
+0x6E07 = 0x3369
+0x6E08 = 0x3A51
+0x6E09 = 0x3E44
+0x6E0A = 0x5E3D
+0x6E0B = 0x3D42
+0x6E13 = 0x374C
+0x6E15 = 0x5E3C
+0x6E19 = 0x5E52
+0x6E1A = 0x3D6D
+0x6E1B = 0x383A
+0x6E1D = 0x5E61
+0x6E1F = 0x5E5B
+0x6E20 = 0x3574
+0x6E21 = 0x454F
+0x6E23 = 0x5E56
+0x6E24 = 0x5E5F
+0x6E25 = 0x302F
+0x6E26 = 0x3132
+0x6E29 = 0x3239
+0x6E2B = 0x5E58
+0x6E2C = 0x422C
+0x6E2D = 0x5E4F
+0x6E2E = 0x5E51
+0x6E2F = 0x3941
+0x6E38 = 0x5E62
+0x6E3A = 0x5E5D
+0x6E3E = 0x5E55
+0x6E43 = 0x5E5C
+0x6E4A = 0x4C2B
+0x6E4D = 0x5E5A
+0x6E4E = 0x5E5E
+0x6E56 = 0x3850
+0x6E58 = 0x3E45
+0x6E5B = 0x4339
+0x6E5F = 0x5E54
+0x6E67 = 0x4D2F
+0x6E6B = 0x5E57
+0x6E6E = 0x5E50
+0x6E6F = 0x4572
+0x6E72 = 0x5E53
+0x6E76 = 0x5E59
+0x6E7E = 0x4F51
+0x6E7F = 0x3C3E
+0x6E80 = 0x4B7E
+0x6E82 = 0x5E63
+0x6E8C = 0x482E
+0x6E8F = 0x5E6F
+0x6E90 = 0x383B
+0x6E96 = 0x3D60
+0x6E98 = 0x5E65
+0x6E9C = 0x4E2F
+0x6E9D = 0x3942
+0x6E9F = 0x5E72
+0x6EA2 = 0x306E
+0x6EA5 = 0x5E70
+0x6EAA = 0x5E64
+0x6EAF = 0x5E6A
+0x6EB2 = 0x5E6C
+0x6EB6 = 0x4D4F
+0x6EB7 = 0x5E67
+0x6EBA = 0x452E
+0x6EBD = 0x5E69
+0x6EC2 = 0x5E71
+0x6EC4 = 0x5E6B
+0x6EC5 = 0x4C47
+0x6EC9 = 0x5E66
+0x6ECB = 0x3C22
+0x6ECC = 0x5E7E
+0x6ED1 = 0x336A
+0x6ED3 = 0x5E68
+0x6ED4 = 0x5E6D
+0x6ED5 = 0x5E6E
+0x6EDD = 0x426C
+0x6EDE = 0x425A
+0x6EEC = 0x5E76
+0x6EEF = 0x5E7C
+0x6EF2 = 0x5E7A
+0x6EF4 = 0x4529
+0x6EF7 = 0x5F23
+0x6EF8 = 0x5E77
+0x6EFE = 0x5E78
+0x6EFF = 0x5E60
+0x6F01 = 0x3579
+0x6F02 = 0x493A
+0x6F06 = 0x3C3F
+0x6F09 = 0x3977
+0x6F0F = 0x4F33
+0x6F11 = 0x5E74
+0x6F13 = 0x5F22
+0x6F14 = 0x3169
+0x6F15 = 0x4166
+0x6F20 = 0x4779
+0x6F22 = 0x3441
+0x6F23 = 0x4E7A
+0x6F2B = 0x4C21
+0x6F2C = 0x4452
+0x6F31 = 0x5E7B
+0x6F32 = 0x5E7D
+0x6F38 = 0x4132
+0x6F3E = 0x5F21
+0x6F3F = 0x5E79
+0x6F41 = 0x5E73
+0x6F45 = 0x3443
+0x6F54 = 0x3769
+0x6F58 = 0x5F2F
+0x6F5B = 0x5F2A
+0x6F5C = 0x4078
+0x6F5F = 0x3363
+0x6F64 = 0x3D61
+0x6F66 = 0x5F33
+0x6F6D = 0x5F2C
+0x6F6E = 0x442C
+0x6F6F = 0x5F29
+0x6F70 = 0x4459
+0x6F74 = 0x5F4C
+0x6F78 = 0x5F26
+0x6F7A = 0x5F25
+0x6F7C = 0x5F2E
+0x6F80 = 0x5F28
+0x6F81 = 0x5F27
+0x6F82 = 0x5F2D
+0x6F84 = 0x4021
+0x6F86 = 0x5F24
+0x6F8E = 0x5F30
+0x6F91 = 0x5F31
+0x6F97 = 0x3442
+0x6FA1 = 0x5F36
+0x6FA3 = 0x5F35
+0x6FA4 = 0x5F37
+0x6FAA = 0x5F3A
+0x6FB1 = 0x4543
+0x6FB3 = 0x5F34
+0x6FB9 = 0x5F38
+0x6FC0 = 0x3763
+0x6FC1 = 0x4279
+0x6FC2 = 0x5F32
+0x6FC3 = 0x473B
+0x6FC6 = 0x5F39
+0x6FD4 = 0x5F3E
+0x6FD5 = 0x5F3C
+0x6FD8 = 0x5F3F
+0x6FDB = 0x5F42
+0x6FDF = 0x5F3B
+0x6FE0 = 0x396A
+0x6FE1 = 0x4728
+0x6FE4 = 0x5E39
+0x6FEB = 0x4D74
+0x6FEC = 0x5F3D
+0x6FEE = 0x5F41
+0x6FEF = 0x4275
+0x6FF1 = 0x5F40
+0x6FF3 = 0x5F2B
+0x6FF6 = 0x6F69
+0x6FFA = 0x5F45
+0x6FFE = 0x5F49
+0x7001 = 0x5F47
+0x7009 = 0x5F43
+0x700B = 0x5F44
+0x700F = 0x5F48
+0x7011 = 0x5F46
+0x7015 = 0x494E
+0x7018 = 0x5F4E
+0x701A = 0x5F4B
+0x701B = 0x5F4A
+0x701D = 0x5F4D
+0x701E = 0x4654
+0x701F = 0x5F4F
+0x7026 = 0x4375
+0x7027 = 0x426D
+0x702C = 0x4025
+0x7030 = 0x5F50
+0x7032 = 0x5F52
+0x703E = 0x5F51
+0x704C = 0x5E75
+0x7051 = 0x5F53
+0x7058 = 0x4667
+0x7063 = 0x5F54
+0x706B = 0x3250
+0x706F = 0x4574
+0x7070 = 0x3325
+0x7078 = 0x3564
+0x707C = 0x3C5E
+0x707D = 0x3A52
+0x7089 = 0x4F27
+0x708A = 0x3F66
+0x708E = 0x316A
+0x7092 = 0x5F56
+0x7099 = 0x5F55
+0x70AC = 0x5F59
+0x70AD = 0x433A
+0x70AE = 0x5F5C
+0x70AF = 0x5F57
+0x70B3 = 0x5F5B
+0x70B8 = 0x5F5A
+0x70B9 = 0x4540
+0x70BA = 0x3059
+0x70C8 = 0x4E75
+0x70CB = 0x5F5E
+0x70CF = 0x3128
+0x70D9 = 0x5F60
+0x70DD = 0x5F5F
+0x70DF = 0x5F5D
+0x70F1 = 0x5F58
+0x70F9 = 0x4B23
+0x70FD = 0x5F62
+0x7109 = 0x5F61
+0x7114 = 0x316B
+0x7119 = 0x5F64
+0x711A = 0x4A32
+0x711C = 0x5F63
+0x7121 = 0x4C35
+0x7126 = 0x3E47
+0x7136 = 0x4133
+0x713C = 0x3E46
+0x7149 = 0x4E7B
+0x714C = 0x5F6A
+0x714E = 0x4079
+0x7155 = 0x5F66
+0x7156 = 0x5F6B
+0x7159 = 0x316C
+0x7162 = 0x5F69
+0x7164 = 0x4761
+0x7165 = 0x5F65
+0x7166 = 0x5F68
+0x7167 = 0x3E48
+0x7169 = 0x4851
+0x716C = 0x5F6C
+0x716E = 0x3C51
+0x717D = 0x407A
+0x7184 = 0x5F6F
+0x7188 = 0x5F67
+0x718A = 0x3727
+0x718F = 0x5F6D
+0x7194 = 0x4D50
+0x7195 = 0x5F70
+0x7199 = 0x7426
+0x719F = 0x3D4F
+0x71A8 = 0x5F71
+0x71AC = 0x5F72
+0x71B1 = 0x472E
+0x71B9 = 0x5F74
+0x71BE = 0x5F75
+0x71C3 = 0x4733
+0x71C8 = 0x4575
+0x71C9 = 0x5F77
+0x71CE = 0x5F79
+0x71D0 = 0x4E55
+0x71D2 = 0x5F76
+0x71D4 = 0x5F78
+0x71D5 = 0x316D
+0x71D7 = 0x5F73
+0x71DF = 0x535B
+0x71E0 = 0x5F7A
+0x71E5 = 0x4167
+0x71E6 = 0x3B38
+0x71E7 = 0x5F7C
+0x71EC = 0x5F7B
+0x71ED = 0x3F24
+0x71EE = 0x5259
+0x71F5 = 0x5F7D
+0x71F9 = 0x6021
+0x71FB = 0x5F6E
+0x71FC = 0x5F7E
+0x71FF = 0x6022
+0x7206 = 0x477A
+0x720D = 0x6023
+0x7210 = 0x6024
+0x721B = 0x6025
+0x7228 = 0x6026
+0x722A = 0x445E
+0x722C = 0x6028
+0x722D = 0x6027
+0x7230 = 0x6029
+0x7232 = 0x602A
+0x7235 = 0x3C5F
+0x7236 = 0x4963
+0x723A = 0x4C6C
+0x723B = 0x602B
+0x723C = 0x602C
+0x723D = 0x4156
+0x723E = 0x3C24
+0x723F = 0x602D
+0x7240 = 0x602E
+0x7246 = 0x602F
+0x7247 = 0x4A52
+0x7248 = 0x4847
+0x724B = 0x6030
+0x724C = 0x4757
+0x7252 = 0x442D
+0x7258 = 0x6031
+0x7259 = 0x3267
+0x725B = 0x356D
+0x725D = 0x4C46
+0x725F = 0x4C36
+0x7261 = 0x3234
+0x7262 = 0x4F34
+0x7267 = 0x4B52
+0x7269 = 0x4A2A
+0x7272 = 0x4037
+0x7274 = 0x6032
+0x7279 = 0x4643
+0x727D = 0x3823
+0x727E = 0x6033
+0x7280 = 0x3A54
+0x7281 = 0x6035
+0x7282 = 0x6034
+0x7287 = 0x6036
+0x7292 = 0x6037
+0x7296 = 0x6038
+0x72A0 = 0x353E
+0x72A2 = 0x6039
+0x72A7 = 0x603A
+0x72AC = 0x3824
+0x72AF = 0x4848
+0x72B2 = 0x603C
+0x72B6 = 0x3E75
+0x72B9 = 0x603B
+0x72C2 = 0x3638
+0x72C3 = 0x603D
+0x72C4 = 0x603F
+0x72C6 = 0x603E
+0x72CE = 0x6040
+0x72D0 = 0x3851
+0x72D2 = 0x6041
+0x72D7 = 0x3669
+0x72D9 = 0x4140
+0x72DB = 0x397D
+0x72E0 = 0x6043
+0x72E1 = 0x6044
+0x72E2 = 0x6042
+0x72E9 = 0x3C6D
+0x72EC = 0x4648
+0x72ED = 0x3639
+0x72F7 = 0x6046
+0x72F8 = 0x432C
+0x72F9 = 0x6045
+0x72FC = 0x4F35
+0x72FD = 0x4762
+0x730A = 0x6049
+0x7316 = 0x604B
+0x7317 = 0x6048
+0x731B = 0x4C54
+0x731C = 0x604A
+0x731D = 0x604C
+0x731F = 0x4E44
+0x7325 = 0x6050
+0x7329 = 0x604F
+0x732A = 0x4376
+0x732B = 0x472D
+0x732E = 0x3825
+0x732F = 0x604E
+0x7334 = 0x604D
+0x7336 = 0x4D31
+0x7337 = 0x4D32
+0x733E = 0x6051
+0x733F = 0x316E
+0x7344 = 0x3976
+0x7345 = 0x3B62
+0x734E = 0x6052
+0x734F = 0x6053
+0x7357 = 0x6055
+0x7363 = 0x3D43
+0x7368 = 0x6057
+0x736A = 0x6056
+0x7370 = 0x6058
+0x7372 = 0x334D
+0x7375 = 0x605A
+0x7378 = 0x6059
+0x737A = 0x605C
+0x737B = 0x605B
+0x7384 = 0x383C
+0x7387 = 0x4E28
+0x7389 = 0x364C
+0x738B = 0x3226
+0x7396 = 0x366A
+0x73A9 = 0x3461
+0x73B2 = 0x4E68
+0x73B3 = 0x605E
+0x73BB = 0x6060
+0x73C0 = 0x6061
+0x73C2 = 0x3251
+0x73C8 = 0x605D
+0x73CA = 0x3B39
+0x73CD = 0x4441
+0x73CE = 0x605F
+0x73DE = 0x6064
+0x73E0 = 0x3C6E
+0x73E5 = 0x6062
+0x73EA = 0x373E
+0x73ED = 0x4849
+0x73EE = 0x6063
+0x73F1 = 0x607E
+0x73F8 = 0x6069
+0x73FE = 0x383D
+0x7403 = 0x3565
+0x7405 = 0x6066
+0x7406 = 0x4D7D
+0x7409 = 0x4E30
+0x7422 = 0x4276
+0x7425 = 0x6068
+0x7432 = 0x606A
+0x7433 = 0x4E56
+0x7434 = 0x3657
+0x7435 = 0x487C
+0x7436 = 0x474A
+0x743A = 0x606B
+0x743F = 0x606D
+0x7441 = 0x6070
+0x7455 = 0x606C
+0x7459 = 0x606F
+0x745A = 0x386A
+0x745B = 0x314D
+0x745C = 0x6071
+0x745E = 0x3F70
+0x745F = 0x606E
+0x7460 = 0x4E5C
+0x7463 = 0x6074
+0x7464 = 0x7424
+0x7469 = 0x6072
+0x746A = 0x6075
+0x746F = 0x6067
+0x7470 = 0x6073
+0x7473 = 0x3A3C
+0x7476 = 0x6076
+0x747E = 0x6077
+0x7483 = 0x4D7E
+0x748B = 0x6078
+0x749E = 0x6079
+0x74A2 = 0x6065
+0x74A7 = 0x607A
+0x74B0 = 0x3444
+0x74BD = 0x3C25
+0x74CA = 0x607B
+0x74CF = 0x607C
+0x74D4 = 0x607D
+0x74DC = 0x313B
+0x74E0 = 0x6121
+0x74E2 = 0x493B
+0x74E3 = 0x6122
+0x74E6 = 0x3424
+0x74E7 = 0x6123
+0x74E9 = 0x6124
+0x74EE = 0x6125
+0x74F0 = 0x6127
+0x74F1 = 0x6128
+0x74F2 = 0x6126
+0x74F6 = 0x4953
+0x74F7 = 0x612A
+0x74F8 = 0x6129
+0x7503 = 0x612C
+0x7504 = 0x612B
+0x7505 = 0x612D
+0x750C = 0x612E
+0x750D = 0x6130
+0x750E = 0x612F
+0x7511 = 0x3979
+0x7513 = 0x6132
+0x7515 = 0x6131
+0x7518 = 0x3445
+0x751A = 0x3F53
+0x751C = 0x453C
+0x751E = 0x6133
+0x751F = 0x4038
+0x7523 = 0x3B3A
+0x7525 = 0x3179
+0x7526 = 0x6134
+0x7528 = 0x4D51
+0x752B = 0x4A63
+0x752C = 0x6135
+0x7530 = 0x4544
+0x7531 = 0x4D33
+0x7532 = 0x3943
+0x7533 = 0x3F3D
+0x7537 = 0x434B
+0x7538 = 0x5234
+0x753A = 0x442E
+0x753B = 0x3268
+0x753C = 0x6136
+0x7544 = 0x6137
+0x7546 = 0x613C
+0x7549 = 0x613A
+0x754A = 0x6139
+0x754B = 0x5A42
+0x754C = 0x3326
+0x754D = 0x6138
+0x754F = 0x305A
+0x7551 = 0x482A
+0x7554 = 0x484A
+0x7559 = 0x4E31
+0x755A = 0x613D
+0x755B = 0x613B
+0x755C = 0x435C
+0x755D = 0x4026
+0x7560 = 0x482B
+0x7562 = 0x492D
+0x7564 = 0x613F
+0x7565 = 0x4E2C
+0x7566 = 0x374D
+0x7567 = 0x6140
+0x7569 = 0x613E
+0x756A = 0x4856
+0x756B = 0x6141
+0x756D = 0x6142
+0x7570 = 0x305B
+0x7573 = 0x3E76
+0x7574 = 0x6147
+0x7576 = 0x6144
+0x7577 = 0x466D
+0x7578 = 0x6143
+0x757F = 0x3526
+0x7582 = 0x614A
+0x7586 = 0x6145
+0x7587 = 0x6146
+0x7589 = 0x6149
+0x758A = 0x6148
+0x758B = 0x4925
+0x758E = 0x4142
+0x758F = 0x4141
+0x7591 = 0x353F
+0x7594 = 0x614B
+0x759A = 0x614C
+0x759D = 0x614D
+0x75A3 = 0x614F
+0x75A5 = 0x614E
+0x75AB = 0x3156
+0x75B1 = 0x6157
+0x75B2 = 0x4868
+0x75B3 = 0x6151
+0x75B5 = 0x6153
+0x75B8 = 0x6155
+0x75B9 = 0x3F3E
+0x75BC = 0x6156
+0x75BD = 0x6154
+0x75BE = 0x3C40
+0x75C2 = 0x6150
+0x75C3 = 0x6152
+0x75C5 = 0x4942
+0x75C7 = 0x3E49
+0x75CA = 0x6159
+0x75CD = 0x6158
+0x75D2 = 0x615A
+0x75D4 = 0x3C26
+0x75D5 = 0x3A2F
+0x75D8 = 0x4577
+0x75D9 = 0x615B
+0x75DB = 0x444B
+0x75DE = 0x615D
+0x75E2 = 0x4E21
+0x75E3 = 0x615C
+0x75E9 = 0x4169
+0x75F0 = 0x6162
+0x75F2 = 0x6164
+0x75F3 = 0x6165
+0x75F4 = 0x4354
+0x75FA = 0x6163
+0x75FC = 0x6160
+0x75FE = 0x615E
+0x75FF = 0x615F
+0x7601 = 0x6161
+0x7609 = 0x6168
+0x760B = 0x6166
+0x760D = 0x6167
+0x761F = 0x6169
+0x7620 = 0x616B
+0x7621 = 0x616C
+0x7622 = 0x616D
+0x7624 = 0x616E
+0x7627 = 0x616A
+0x7630 = 0x6170
+0x7634 = 0x616F
+0x763B = 0x6171
+0x7642 = 0x4E45
+0x7646 = 0x6174
+0x7647 = 0x6172
+0x7648 = 0x6173
+0x764C = 0x3462
+0x7652 = 0x4C7E
+0x7656 = 0x4A4A
+0x7658 = 0x6176
+0x765C = 0x6175
+0x7661 = 0x6177
+0x7662 = 0x6178
+0x7667 = 0x617C
+0x7668 = 0x6179
+0x7669 = 0x617A
+0x766A = 0x617B
+0x766C = 0x617D
+0x7670 = 0x617E
+0x7672 = 0x6221
+0x7676 = 0x6222
+0x7678 = 0x6223
+0x767A = 0x482F
+0x767B = 0x4550
+0x767C = 0x6224
+0x767D = 0x4772
+0x767E = 0x4934
+0x7680 = 0x6225
+0x7683 = 0x6226
+0x7684 = 0x452A
+0x7686 = 0x3327
+0x7687 = 0x3944
+0x7688 = 0x6227
+0x768B = 0x6228
+0x768E = 0x6229
+0x7690 = 0x3B29
+0x7693 = 0x622B
+0x7696 = 0x622A
+0x7699 = 0x622C
+0x769A = 0x622D
+0x76AE = 0x4869
+0x76B0 = 0x622E
+0x76B4 = 0x622F
+0x76B7 = 0x7369
+0x76B8 = 0x6230
+0x76B9 = 0x6231
+0x76BA = 0x6232
+0x76BF = 0x3B2E
+0x76C2 = 0x6233
+0x76C3 = 0x4756
+0x76C6 = 0x4B5F
+0x76C8 = 0x314E
+0x76CA = 0x3157
+0x76CD = 0x6234
+0x76D2 = 0x6236
+0x76D6 = 0x6235
+0x76D7 = 0x4570
+0x76DB = 0x4039
+0x76DC = 0x5D39
+0x76DE = 0x6237
+0x76DF = 0x4C41
+0x76E1 = 0x6238
+0x76E3 = 0x3446
+0x76E4 = 0x4857
+0x76E5 = 0x6239
+0x76E7 = 0x623A
+0x76EA = 0x623B
+0x76EE = 0x4C5C
+0x76F2 = 0x4C55
+0x76F4 = 0x443E
+0x76F8 = 0x416A
+0x76FB = 0x623D
+0x76FE = 0x3D62
+0x7701 = 0x3E4A
+0x7704 = 0x6240
+0x7707 = 0x623F
+0x7708 = 0x623E
+0x7709 = 0x487D
+0x770B = 0x3447
+0x770C = 0x3829
+0x771B = 0x6246
+0x771E = 0x6243
+0x771F = 0x3F3F
+0x7720 = 0x4C32
+0x7724 = 0x6242
+0x7725 = 0x6244
+0x7726 = 0x6245
+0x7729 = 0x6241
+0x7737 = 0x6247
+0x7738 = 0x6248
+0x773A = 0x442F
+0x773C = 0x3463
+0x7740 = 0x4365
+0x7747 = 0x6249
+0x775A = 0x624A
+0x775B = 0x624D
+0x7761 = 0x3F67
+0x7763 = 0x4644
+0x7765 = 0x624E
+0x7766 = 0x4B53
+0x7768 = 0x624B
+0x776B = 0x624C
+0x7779 = 0x6251
+0x777E = 0x6250
+0x777F = 0x624F
+0x778B = 0x6253
+0x778E = 0x6252
+0x7791 = 0x6254
+0x779E = 0x6256
+0x77A0 = 0x6255
+0x77A5 = 0x4A4D
+0x77AC = 0x3D56
+0x77AD = 0x4E46
+0x77B0 = 0x6257
+0x77B3 = 0x4637
+0x77B6 = 0x6258
+0x77B9 = 0x6259
+0x77BB = 0x625D
+0x77BC = 0x625B
+0x77BD = 0x625C
+0x77BF = 0x625A
+0x77C7 = 0x625E
+0x77CD = 0x625F
+0x77D7 = 0x6260
+0x77DA = 0x6261
+0x77DB = 0x4C37
+0x77DC = 0x6262
+0x77E2 = 0x4C70
+0x77E3 = 0x6263
+0x77E5 = 0x434E
+0x77E7 = 0x476A
+0x77E9 = 0x366B
+0x77ED = 0x433B
+0x77EE = 0x6264
+0x77EF = 0x363A
+0x77F3 = 0x4050
+0x77FC = 0x6265
+0x7802 = 0x3A3D
+0x780C = 0x6266
+0x7812 = 0x6267
+0x7814 = 0x3826
+0x7815 = 0x3A55
+0x7820 = 0x6269
+0x7825 = 0x4556
+0x7826 = 0x3A56
+0x7827 = 0x354E
+0x7832 = 0x4B24
+0x7834 = 0x474B
+0x783A = 0x4557
+0x783F = 0x395C
+0x7845 = 0x626B
+0x785D = 0x3E4B
+0x786B = 0x4E32
+0x786C = 0x3945
+0x786F = 0x3827
+0x7872 = 0x4823
+0x7874 = 0x626D
+0x787C = 0x626F
+0x7881 = 0x386B
+0x7886 = 0x626E
+0x7887 = 0x4476
+0x788C = 0x6271
+0x788D = 0x3337
+0x788E = 0x626C
+0x7891 = 0x486A
+0x7893 = 0x3130
+0x7895 = 0x3A6C
+0x7897 = 0x4F52
+0x789A = 0x6270
+0x78A3 = 0x6272
+0x78A7 = 0x4A4B
+0x78A9 = 0x4059
+0x78AA = 0x6274
+0x78AF = 0x6275
+0x78B5 = 0x6273
+0x78BA = 0x334E
+0x78BC = 0x627B
+0x78BE = 0x627A
+0x78C1 = 0x3C27
+0x78C5 = 0x627C
+0x78C6 = 0x6277
+0x78CA = 0x627D
+0x78CB = 0x6278
+0x78D0 = 0x4858
+0x78D1 = 0x6276
+0x78D4 = 0x6279
+0x78DA = 0x6322
+0x78E7 = 0x6321
+0x78E8 = 0x4B61
+0x78EC = 0x627E
+0x78EF = 0x306B
+0x78F4 = 0x6324
+0x78FD = 0x6323
+0x7901 = 0x3E4C
+0x7907 = 0x6325
+0x790E = 0x4143
+0x7911 = 0x6327
+0x7912 = 0x6326
+0x7919 = 0x6328
+0x7926 = 0x6268
+0x792A = 0x626A
+0x792B = 0x632A
+0x792C = 0x6329
+0x793A = 0x3C28
+0x793C = 0x4E69
+0x793E = 0x3C52
+0x7940 = 0x632B
+0x7941 = 0x3737
+0x7947 = 0x3540
+0x7948 = 0x3527
+0x7949 = 0x3B63
+0x7950 = 0x4D34
+0x7953 = 0x6331
+0x7955 = 0x6330
+0x7956 = 0x4144
+0x7957 = 0x632D
+0x795A = 0x632F
+0x795D = 0x3D4B
+0x795E = 0x3F40
+0x795F = 0x632E
+0x7960 = 0x632C
+0x7962 = 0x472A
+0x7965 = 0x3E4D
+0x7968 = 0x493C
+0x796D = 0x3A57
+0x7977 = 0x4578
+0x797A = 0x6332
+0x797F = 0x6333
+0x7980 = 0x6349
+0x7981 = 0x3658
+0x7984 = 0x4F3D
+0x7985 = 0x4135
+0x798A = 0x6334
+0x798D = 0x3252
+0x798E = 0x4477
+0x798F = 0x4A21
+0x799D = 0x6335
+0x79A6 = 0x357A
+0x79A7 = 0x6336
+0x79AA = 0x6338
+0x79AE = 0x6339
+0x79B0 = 0x4729
+0x79B3 = 0x633A
+0x79B9 = 0x633B
+0x79BA = 0x633C
+0x79BD = 0x3659
+0x79BE = 0x3253
+0x79BF = 0x4645
+0x79C0 = 0x3D28
+0x79C1 = 0x3B64
+0x79C9 = 0x633D
+0x79CB = 0x3D29
+0x79D1 = 0x324A
+0x79D2 = 0x4943
+0x79D5 = 0x633E
+0x79D8 = 0x486B
+0x79DF = 0x4145
+0x79E1 = 0x6341
+0x79E3 = 0x6342
+0x79E4 = 0x4769
+0x79E6 = 0x3F41
+0x79E7 = 0x633F
+0x79E9 = 0x4361
+0x79EC = 0x6340
+0x79F0 = 0x3E4E
+0x79FB = 0x305C
+0x7A00 = 0x3529
+0x7A08 = 0x6343
+0x7A0B = 0x4478
+0x7A0D = 0x6344
+0x7A0E = 0x4047
+0x7A14 = 0x4C2D
+0x7A17 = 0x4923
+0x7A18 = 0x6345
+0x7A19 = 0x6346
+0x7A1A = 0x4355
+0x7A1C = 0x4E47
+0x7A1F = 0x6348
+0x7A20 = 0x6347
+0x7A2E = 0x3C6F
+0x7A31 = 0x634A
+0x7A32 = 0x3070
+0x7A37 = 0x634D
+0x7A3B = 0x634B
+0x7A3C = 0x3254
+0x7A3D = 0x374E
+0x7A3E = 0x634C
+0x7A3F = 0x3946
+0x7A40 = 0x3972
+0x7A42 = 0x4A66
+0x7A43 = 0x634E
+0x7A46 = 0x4B54
+0x7A49 = 0x6350
+0x7A4D = 0x4051
+0x7A4E = 0x314F
+0x7A4F = 0x323A
+0x7A50 = 0x302C
+0x7A57 = 0x634F
+0x7A61 = 0x6351
+0x7A62 = 0x6352
+0x7A63 = 0x3E77
+0x7A69 = 0x6353
+0x7A6B = 0x334F
+0x7A70 = 0x6355
+0x7A74 = 0x376A
+0x7A76 = 0x3566
+0x7A79 = 0x6356
+0x7A7A = 0x3675
+0x7A7D = 0x6357
+0x7A7F = 0x407C
+0x7A81 = 0x464D
+0x7A83 = 0x4060
+0x7A84 = 0x3A75
+0x7A88 = 0x6358
+0x7A92 = 0x4362
+0x7A93 = 0x416B
+0x7A95 = 0x635A
+0x7A96 = 0x635C
+0x7A97 = 0x6359
+0x7A98 = 0x635B
+0x7A9F = 0x3722
+0x7AA9 = 0x635D
+0x7AAA = 0x3726
+0x7AAE = 0x3567
+0x7AAF = 0x4D52
+0x7AB0 = 0x635F
+0x7AB6 = 0x6360
+0x7ABA = 0x312E
+0x7ABF = 0x6363
+0x7AC3 = 0x3376
+0x7AC4 = 0x6362
+0x7AC5 = 0x6361
+0x7AC7 = 0x6365
+0x7AC8 = 0x635E
+0x7ACA = 0x6366
+0x7ACB = 0x4E29
+0x7ACD = 0x6367
+0x7ACF = 0x6368
+0x7AD2 = 0x5474
+0x7AD3 = 0x636A
+0x7AD5 = 0x6369
+0x7AD9 = 0x636B
+0x7ADA = 0x636C
+0x7ADC = 0x4E35
+0x7ADD = 0x636D
+0x7ADF = 0x706F
+0x7AE0 = 0x3E4F
+0x7AE1 = 0x636E
+0x7AE2 = 0x636F
+0x7AE3 = 0x3D57
+0x7AE5 = 0x4638
+0x7AE6 = 0x6370
+0x7AEA = 0x4328
+0x7AED = 0x6371
+0x7AEF = 0x433C
+0x7AF0 = 0x6372
+0x7AF6 = 0x3625
+0x7AF8 = 0x513F
+0x7AF9 = 0x435D
+0x7AFA = 0x3C33
+0x7AFF = 0x3448
+0x7B02 = 0x6373
+0x7B04 = 0x6422
+0x7B06 = 0x6376
+0x7B08 = 0x3568
+0x7B0A = 0x6375
+0x7B0B = 0x6424
+0x7B0F = 0x6374
+0x7B11 = 0x3E50
+0x7B18 = 0x6378
+0x7B19 = 0x6379
+0x7B1B = 0x452B
+0x7B1E = 0x637A
+0x7B20 = 0x335E
+0x7B25 = 0x3F5A
+0x7B26 = 0x4964
+0x7B28 = 0x637C
+0x7B2C = 0x4268
+0x7B33 = 0x6377
+0x7B35 = 0x637B
+0x7B36 = 0x637D
+0x7B39 = 0x3A7B
+0x7B45 = 0x6426
+0x7B46 = 0x492E
+0x7B48 = 0x4826
+0x7B49 = 0x4579
+0x7B4B = 0x365A
+0x7B4C = 0x6425
+0x7B4D = 0x6423
+0x7B4F = 0x4835
+0x7B50 = 0x637E
+0x7B51 = 0x435E
+0x7B52 = 0x457B
+0x7B54 = 0x457A
+0x7B56 = 0x3A76
+0x7B5D = 0x6438
+0x7B65 = 0x6428
+0x7B67 = 0x642A
+0x7B6C = 0x642D
+0x7B6E = 0x642E
+0x7B70 = 0x642B
+0x7B71 = 0x642C
+0x7B74 = 0x6429
+0x7B75 = 0x6427
+0x7B7A = 0x6421
+0x7B86 = 0x4A4F
+0x7B87 = 0x3255
+0x7B8B = 0x6435
+0x7B8D = 0x6432
+0x7B8F = 0x6437
+0x7B92 = 0x6436
+0x7B94 = 0x4773
+0x7B95 = 0x4C27
+0x7B97 = 0x3B3B
+0x7B98 = 0x6430
+0x7B99 = 0x6439
+0x7B9A = 0x6434
+0x7B9C = 0x6433
+0x7B9D = 0x642F
+0x7B9F = 0x6431
+0x7BA1 = 0x3449
+0x7BAA = 0x433D
+0x7BAD = 0x407D
+0x7BB1 = 0x4822
+0x7BB4 = 0x643E
+0x7BB8 = 0x4824
+0x7BC0 = 0x4061
+0x7BC1 = 0x643B
+0x7BC4 = 0x484F
+0x7BC6 = 0x643F
+0x7BC7 = 0x4A53
+0x7BC9 = 0x435B
+0x7BCB = 0x643A
+0x7BCC = 0x643C
+0x7BCF = 0x643D
+0x7BDD = 0x6440
+0x7BE0 = 0x3C44
+0x7BE4 = 0x4646
+0x7BE5 = 0x6445
+0x7BE6 = 0x6444
+0x7BE9 = 0x6441
+0x7BED = 0x4F36
+0x7BF3 = 0x644A
+0x7BF6 = 0x644E
+0x7BF7 = 0x644B
+0x7C00 = 0x6447
+0x7C07 = 0x6448
+0x7C0D = 0x644D
+0x7C11 = 0x6442
+0x7C12 = 0x5255
+0x7C13 = 0x6449
+0x7C14 = 0x6443
+0x7C17 = 0x644C
+0x7C1F = 0x6452
+0x7C21 = 0x344A
+0x7C23 = 0x644F
+0x7C27 = 0x6450
+0x7C2A = 0x6451
+0x7C2B = 0x6454
+0x7C37 = 0x6453
+0x7C38 = 0x4876
+0x7C3D = 0x6455
+0x7C3E = 0x4E7C
+0x7C3F = 0x4A6D
+0x7C40 = 0x645A
+0x7C43 = 0x6457
+0x7C4C = 0x6456
+0x7C4D = 0x4052
+0x7C4F = 0x6459
+0x7C50 = 0x645B
+0x7C54 = 0x6458
+0x7C56 = 0x645F
+0x7C58 = 0x645C
+0x7C5F = 0x645D
+0x7C60 = 0x6446
+0x7C64 = 0x645E
+0x7C65 = 0x6460
+0x7C6C = 0x6461
+0x7C73 = 0x4A46
+0x7C75 = 0x6462
+0x7C7E = 0x4C62
+0x7C81 = 0x364E
+0x7C82 = 0x3729
+0x7C83 = 0x6463
+0x7C89 = 0x4A34
+0x7C8B = 0x3F68
+0x7C8D = 0x4C30
+0x7C90 = 0x6464
+0x7C92 = 0x4E33
+0x7C95 = 0x4774
+0x7C97 = 0x4146
+0x7C98 = 0x4734
+0x7C9B = 0x3D4D
+0x7C9F = 0x3040
+0x7CA1 = 0x6469
+0x7CA2 = 0x6467
+0x7CA4 = 0x6465
+0x7CA5 = 0x3421
+0x7CA7 = 0x3E51
+0x7CA8 = 0x646A
+0x7CAB = 0x6468
+0x7CAD = 0x6466
+0x7CAE = 0x646E
+0x7CB1 = 0x646D
+0x7CB2 = 0x646C
+0x7CB3 = 0x646B
+0x7CB9 = 0x646F
+0x7CBD = 0x6470
+0x7CBE = 0x403A
+0x7CC0 = 0x6471
+0x7CC2 = 0x6473
+0x7CC5 = 0x6472
+0x7CCA = 0x3852
+0x7CCE = 0x4138
+0x7CD2 = 0x6475
+0x7CD6 = 0x457C
+0x7CD8 = 0x6474
+0x7CDC = 0x6476
+0x7CDE = 0x4A35
+0x7CDF = 0x416C
+0x7CE0 = 0x3947
+0x7CE2 = 0x6477
+0x7CE7 = 0x4E48
+0x7CEF = 0x6479
+0x7CF2 = 0x647A
+0x7CF4 = 0x647B
+0x7CF6 = 0x647C
+0x7CF8 = 0x3B65
+0x7CFA = 0x647D
+0x7CFB = 0x374F
+0x7CFE = 0x356A
+0x7D00 = 0x352A
+0x7D02 = 0x6521
+0x7D04 = 0x4C73
+0x7D05 = 0x3948
+0x7D06 = 0x647E
+0x7D0A = 0x6524
+0x7D0B = 0x4C66
+0x7D0D = 0x473C
+0x7D10 = 0x4933
+0x7D14 = 0x3D63
+0x7D15 = 0x6523
+0x7D17 = 0x3C53
+0x7D18 = 0x3949
+0x7D19 = 0x3B66
+0x7D1A = 0x3569
+0x7D1B = 0x4A36
+0x7D1C = 0x6522
+0x7D20 = 0x4147
+0x7D21 = 0x4B42
+0x7D22 = 0x3A77
+0x7D2B = 0x3B67
+0x7D2C = 0x445D
+0x7D2E = 0x6527
+0x7D2F = 0x4E5F
+0x7D30 = 0x3A59
+0x7D32 = 0x6528
+0x7D33 = 0x3F42
+0x7D35 = 0x652A
+0x7D39 = 0x3E52
+0x7D3A = 0x3A30
+0x7D3F = 0x6529
+0x7D42 = 0x3D2A
+0x7D43 = 0x383E
+0x7D44 = 0x4148
+0x7D45 = 0x6525
+0x7D46 = 0x652B
+0x7D4B = 0x6526
+0x7D4C = 0x3750
+0x7D4E = 0x652E
+0x7D4F = 0x6532
+0x7D50 = 0x376B
+0x7D56 = 0x652D
+0x7D5B = 0x6536
+0x7D5E = 0x394A
+0x7D61 = 0x4D6D
+0x7D62 = 0x303C
+0x7D63 = 0x6533
+0x7D66 = 0x356B
+0x7D68 = 0x6530
+0x7D6E = 0x6531
+0x7D71 = 0x457D
+0x7D72 = 0x652F
+0x7D73 = 0x652C
+0x7D75 = 0x3328
+0x7D76 = 0x4064
+0x7D79 = 0x3828
+0x7D7D = 0x6538
+0x7D89 = 0x6535
+0x7D8F = 0x6537
+0x7D93 = 0x6534
+0x7D99 = 0x3751
+0x7D9A = 0x4233
+0x7D9B = 0x6539
+0x7D9C = 0x416E
+0x7D9F = 0x6546
+0x7DA2 = 0x6542
+0x7DA3 = 0x653C
+0x7DAB = 0x6540
+0x7DAC = 0x3C7A
+0x7DAD = 0x305D
+0x7DAE = 0x653B
+0x7DAF = 0x6543
+0x7DB0 = 0x6547
+0x7DB1 = 0x394B
+0x7DB2 = 0x4C56
+0x7DB4 = 0x4456
+0x7DB5 = 0x653D
+0x7DB8 = 0x6545
+0x7DBA = 0x653A
+0x7DBB = 0x433E
+0x7DBD = 0x653F
+0x7DBE = 0x303D
+0x7DBF = 0x4C4A
+0x7DC7 = 0x653E
+0x7DCA = 0x365B
+0x7DCB = 0x486C
+0x7DCF = 0x416D
+0x7DD1 = 0x4E50
+0x7DD2 = 0x3D6F
+0x7DD5 = 0x656E
+0x7DD8 = 0x6548
+0x7DDA = 0x407E
+0x7DDC = 0x6544
+0x7DDD = 0x6549
+0x7DDE = 0x654B
+0x7DE0 = 0x4479
+0x7DE1 = 0x654E
+0x7DE4 = 0x654A
+0x7DE8 = 0x4A54
+0x7DE9 = 0x344B
+0x7DEC = 0x4C4B
+0x7DEF = 0x305E
+0x7DF2 = 0x654D
+0x7DF4 = 0x4E7D
+0x7DFB = 0x654C
+0x7E01 = 0x316F
+0x7E04 = 0x466C
+0x7E05 = 0x654F
+0x7E09 = 0x6556
+0x7E0A = 0x6550
+0x7E0B = 0x6557
+0x7E12 = 0x6553
+0x7E1B = 0x477B
+0x7E1E = 0x3C4A
+0x7E1F = 0x6555
+0x7E21 = 0x6552
+0x7E22 = 0x6558
+0x7E23 = 0x6551
+0x7E26 = 0x3D44
+0x7E2B = 0x4B25
+0x7E2E = 0x3D4C
+0x7E31 = 0x6554
+0x7E32 = 0x6560
+0x7E35 = 0x655C
+0x7E37 = 0x655F
+0x7E39 = 0x655D
+0x7E3A = 0x6561
+0x7E3B = 0x655B
+0x7E3D = 0x6541
+0x7E3E = 0x4053
+0x7E41 = 0x484B
+0x7E43 = 0x655E
+0x7E46 = 0x6559
+0x7E4A = 0x4121
+0x7E4B = 0x3752
+0x7E4D = 0x3D2B
+0x7E54 = 0x3F25
+0x7E55 = 0x4136
+0x7E56 = 0x6564
+0x7E59 = 0x6566
+0x7E5A = 0x6567
+0x7E5D = 0x6563
+0x7E5E = 0x6565
+0x7E66 = 0x655A
+0x7E67 = 0x6562
+0x7E69 = 0x656A
+0x7E6A = 0x6569
+0x7E6D = 0x4B7A
+0x7E70 = 0x372B
+0x7E79 = 0x6568
+0x7E7B = 0x656C
+0x7E7C = 0x656B
+0x7E7D = 0x656F
+0x7E7F = 0x6571
+0x7E82 = 0x3B3C
+0x7E83 = 0x656D
+0x7E88 = 0x6572
+0x7E89 = 0x6573
+0x7E8C = 0x6574
+0x7E8E = 0x657A
+0x7E8F = 0x453B
+0x7E90 = 0x6576
+0x7E92 = 0x6575
+0x7E93 = 0x6577
+0x7E94 = 0x6578
+0x7E96 = 0x6579
+0x7E9B = 0x657B
+0x7E9C = 0x657C
+0x7F36 = 0x344C
+0x7F38 = 0x657D
+0x7F3A = 0x657E
+0x7F45 = 0x6621
+0x7F4C = 0x6622
+0x7F4D = 0x6623
+0x7F4E = 0x6624
+0x7F50 = 0x6625
+0x7F51 = 0x6626
+0x7F54 = 0x6628
+0x7F55 = 0x6627
+0x7F58 = 0x6629
+0x7F5F = 0x662A
+0x7F60 = 0x662B
+0x7F67 = 0x662E
+0x7F68 = 0x662C
+0x7F69 = 0x662D
+0x7F6A = 0x3A61
+0x7F6B = 0x3753
+0x7F6E = 0x4356
+0x7F70 = 0x4833
+0x7F72 = 0x3D70
+0x7F75 = 0x474D
+0x7F77 = 0x486D
+0x7F78 = 0x662F
+0x7F79 = 0x586D
+0x7F82 = 0x6630
+0x7F83 = 0x6632
+0x7F85 = 0x4D65
+0x7F86 = 0x6631
+0x7F87 = 0x6634
+0x7F88 = 0x6633
+0x7F8A = 0x4D53
+0x7F8C = 0x6635
+0x7F8E = 0x487E
+0x7F94 = 0x6636
+0x7F9A = 0x6639
+0x7F9D = 0x6638
+0x7F9E = 0x6637
+0x7FA3 = 0x663A
+0x7FA4 = 0x3732
+0x7FA8 = 0x4122
+0x7FA9 = 0x3541
+0x7FAE = 0x663E
+0x7FAF = 0x663B
+0x7FB2 = 0x663C
+0x7FB6 = 0x663F
+0x7FB8 = 0x6640
+0x7FB9 = 0x663D
+0x7FBD = 0x3129
+0x7FC1 = 0x3227
+0x7FC5 = 0x6642
+0x7FC6 = 0x6643
+0x7FCA = 0x6644
+0x7FCC = 0x4D62
+0x7FD2 = 0x3D2C
+0x7FD4 = 0x6646
+0x7FD5 = 0x6645
+0x7FE0 = 0x3F69
+0x7FE1 = 0x6647
+0x7FE6 = 0x6648
+0x7FE9 = 0x6649
+0x7FEB = 0x3465
+0x7FF0 = 0x344D
+0x7FF3 = 0x664A
+0x7FF9 = 0x664B
+0x7FFB = 0x4B5D
+0x7FFC = 0x4D63
+0x8000 = 0x4D54
+0x8001 = 0x4F37
+0x8003 = 0x394D
+0x8004 = 0x664E
+0x8005 = 0x3C54
+0x8006 = 0x664D
+0x800B = 0x664F
+0x800C = 0x3C29
+0x8010 = 0x4251
+0x8012 = 0x6650
+0x8015 = 0x394C
+0x8017 = 0x4C57
+0x8018 = 0x6651
+0x8019 = 0x6652
+0x801C = 0x6653
+0x8021 = 0x6654
+0x8028 = 0x6655
+0x8033 = 0x3C2A
+0x8036 = 0x4C6D
+0x803B = 0x6657
+0x803D = 0x433F
+0x803F = 0x6656
+0x8046 = 0x6659
+0x804A = 0x6658
+0x8052 = 0x665A
+0x8056 = 0x403B
+0x8058 = 0x665B
+0x805A = 0x665C
+0x805E = 0x4A39
+0x805F = 0x665D
+0x8061 = 0x416F
+0x8062 = 0x665E
+0x8068 = 0x665F
+0x806F = 0x4E7E
+0x8070 = 0x6662
+0x8072 = 0x6661
+0x8073 = 0x6660
+0x8074 = 0x4430
+0x8076 = 0x6663
+0x8077 = 0x3F26
+0x8079 = 0x6664
+0x807D = 0x6665
+0x807E = 0x4F38
+0x807F = 0x6666
+0x8084 = 0x6667
+0x8085 = 0x6669
+0x8086 = 0x6668
+0x8087 = 0x4825
+0x8089 = 0x4679
+0x808B = 0x4F3E
+0x808C = 0x4829
+0x8093 = 0x666B
+0x8096 = 0x3E53
+0x8098 = 0x492A
+0x809A = 0x666C
+0x809B = 0x666A
+0x809D = 0x344E
+0x80A1 = 0x3854
+0x80A2 = 0x3B68
+0x80A5 = 0x486E
+0x80A9 = 0x382A
+0x80AA = 0x4B43
+0x80AC = 0x666F
+0x80AD = 0x666D
+0x80AF = 0x394E
+0x80B1 = 0x394F
+0x80B2 = 0x3069
+0x80B4 = 0x3A68
+0x80BA = 0x4759
+0x80C3 = 0x305F
+0x80C4 = 0x6674
+0x80C6 = 0x4340
+0x80CC = 0x4758
+0x80CE = 0x425B
+0x80D6 = 0x6676
+0x80D9 = 0x6672
+0x80DA = 0x6675
+0x80DB = 0x6670
+0x80DD = 0x6673
+0x80DE = 0x4B26
+0x80E1 = 0x3855
+0x80E4 = 0x307D
+0x80E5 = 0x6671
+0x80EF = 0x6678
+0x80F1 = 0x6679
+0x80F4 = 0x4639
+0x80F8 = 0x363B
+0x80FC = 0x6726
+0x80FD = 0x473D
+0x8102 = 0x3B69
+0x8105 = 0x363C
+0x8106 = 0x4048
+0x8107 = 0x4F46
+0x8108 = 0x4C2E
+0x8109 = 0x6677
+0x810A = 0x4054
+0x811A = 0x3553
+0x811B = 0x667A
+0x8123 = 0x667C
+0x8129 = 0x667B
+0x812F = 0x667D
+0x8131 = 0x4326
+0x8133 = 0x473E
+0x8139 = 0x4431
+0x813E = 0x6723
+0x8146 = 0x6722
+0x814B = 0x667E
+0x814E = 0x3F55
+0x8150 = 0x4965
+0x8151 = 0x6725
+0x8153 = 0x6724
+0x8154 = 0x3950
+0x8155 = 0x4F53
+0x815F = 0x6735
+0x8165 = 0x6729
+0x8166 = 0x672A
+0x816B = 0x3C70
+0x816E = 0x6728
+0x8170 = 0x3978
+0x8171 = 0x6727
+0x8174 = 0x672B
+0x8178 = 0x4432
+0x8179 = 0x4A22
+0x817A = 0x4123
+0x817F = 0x425C
+0x8180 = 0x672F
+0x8182 = 0x6730
+0x8183 = 0x672C
+0x8188 = 0x672D
+0x818A = 0x672E
+0x818F = 0x3951
+0x8193 = 0x6736
+0x8195 = 0x6732
+0x819A = 0x4966
+0x819C = 0x4B6C
+0x819D = 0x4928
+0x81A0 = 0x6731
+0x81A3 = 0x6734
+0x81A4 = 0x6733
+0x81A8 = 0x4B44
+0x81A9 = 0x6737
+0x81B0 = 0x6738
+0x81B3 = 0x4137
+0x81B5 = 0x6739
+0x81B8 = 0x673B
+0x81BA = 0x673F
+0x81BD = 0x673C
+0x81BE = 0x673A
+0x81BF = 0x473F
+0x81C0 = 0x673D
+0x81C2 = 0x673E
+0x81C6 = 0x3232
+0x81C8 = 0x6745
+0x81C9 = 0x6740
+0x81CD = 0x6741
+0x81D1 = 0x6742
+0x81D3 = 0x4221
+0x81D8 = 0x6744
+0x81D9 = 0x6743
+0x81DA = 0x6746
+0x81DF = 0x6747
+0x81E0 = 0x6748
+0x81E3 = 0x3F43
+0x81E5 = 0x3269
+0x81E7 = 0x6749
+0x81E8 = 0x4E57
+0x81EA = 0x3C2B
+0x81ED = 0x3D2D
+0x81F3 = 0x3B6A
+0x81F4 = 0x4357
+0x81FA = 0x674A
+0x81FB = 0x674B
+0x81FC = 0x3131
+0x81FE = 0x674C
+0x8201 = 0x674D
+0x8202 = 0x674E
+0x8205 = 0x674F
+0x8207 = 0x6750
+0x8208 = 0x363D
+0x8209 = 0x5A2A
+0x820A = 0x6751
+0x820C = 0x4065
+0x820D = 0x6752
+0x820E = 0x3C4B
+0x8210 = 0x6753
+0x8212 = 0x5030
+0x8216 = 0x6754
+0x8217 = 0x4A5E
+0x8218 = 0x345C
+0x821B = 0x4124
+0x821C = 0x3D58
+0x821E = 0x4971
+0x821F = 0x3D2E
+0x8229 = 0x6755
+0x822A = 0x3952
+0x822B = 0x6756
+0x822C = 0x484C
+0x822E = 0x6764
+0x8233 = 0x6758
+0x8235 = 0x4249
+0x8236 = 0x4775
+0x8237 = 0x383F
+0x8238 = 0x6757
+0x8239 = 0x4125
+0x8240 = 0x6759
+0x8247 = 0x447A
+0x8258 = 0x675B
+0x8259 = 0x675A
+0x825A = 0x675D
+0x825D = 0x675C
+0x825F = 0x675E
+0x8262 = 0x6760
+0x8264 = 0x675F
+0x8266 = 0x344F
+0x8268 = 0x6761
+0x826A = 0x6762
+0x826B = 0x6763
+0x826E = 0x3A31
+0x826F = 0x4E49
+0x8271 = 0x6765
+0x8272 = 0x3F27
+0x8276 = 0x3170
+0x8277 = 0x6766
+0x8278 = 0x6767
+0x827E = 0x6768
+0x828B = 0x3072
+0x828D = 0x6769
+0x8292 = 0x676A
+0x8299 = 0x4967
+0x829D = 0x3C47
+0x829F = 0x676C
+0x82A5 = 0x3329
+0x82A6 = 0x3032
+0x82AB = 0x676B
+0x82AC = 0x676E
+0x82AD = 0x474E
+0x82AF = 0x3F44
+0x82B1 = 0x3256
+0x82B3 = 0x4B27
+0x82B8 = 0x375D
+0x82B9 = 0x365C
+0x82BB = 0x676D
+0x82BD = 0x326A
+0x82C5 = 0x3423
+0x82D1 = 0x3171
+0x82D2 = 0x6772
+0x82D3 = 0x4E6A
+0x82D4 = 0x425D
+0x82D7 = 0x4944
+0x82D9 = 0x677E
+0x82DB = 0x3257
+0x82DC = 0x677C
+0x82DE = 0x677A
+0x82DF = 0x6771
+0x82E1 = 0x676F
+0x82E3 = 0x6770
+0x82E5 = 0x3C63
+0x82E6 = 0x366C
+0x82E7 = 0x4377
+0x82EB = 0x4651
+0x82F1 = 0x3151
+0x82F3 = 0x6774
+0x82F4 = 0x6773
+0x82F9 = 0x6779
+0x82FA = 0x6775
+0x82FB = 0x6778
+0x8302 = 0x4C50
+0x8303 = 0x6777
+0x8304 = 0x3258
+0x8305 = 0x337D
+0x8306 = 0x677B
+0x8309 = 0x677D
+0x830E = 0x3754
+0x8316 = 0x6823
+0x8317 = 0x682C
+0x8318 = 0x682D
+0x831C = 0x302B
+0x8323 = 0x6834
+0x8328 = 0x3071
+0x832B = 0x682B
+0x832F = 0x682A
+0x8331 = 0x6825
+0x8332 = 0x6824
+0x8334 = 0x6822
+0x8335 = 0x6821
+0x8336 = 0x4363
+0x8338 = 0x427B
+0x8339 = 0x6827
+0x8340 = 0x6826
+0x8345 = 0x6829
+0x8349 = 0x4170
+0x834A = 0x3755
+0x834F = 0x3141
+0x8350 = 0x6828
+0x8352 = 0x3953
+0x8358 = 0x4171
+0x8373 = 0x683A
+0x8375 = 0x683B
+0x8377 = 0x3259
+0x837B = 0x322E
+0x837C = 0x6838
+0x8385 = 0x682E
+0x8387 = 0x6836
+0x8389 = 0x683D
+0x838A = 0x6837
+0x838E = 0x6835
+0x8393 = 0x6776
+0x8396 = 0x6833
+0x839A = 0x682F
+0x839E = 0x3450
+0x839F = 0x6831
+0x83A0 = 0x683C
+0x83A2 = 0x6832
+0x83A8 = 0x683E
+0x83AA = 0x6830
+0x83AB = 0x477C
+0x83B1 = 0x4D69
+0x83B5 = 0x6839
+0x83BD = 0x684F
+0x83C1 = 0x6847
+0x83C5 = 0x3F7B
+0x83CA = 0x3546
+0x83CC = 0x365D
+0x83CE = 0x6842
+0x83D3 = 0x325B
+0x83D6 = 0x3E54
+0x83D8 = 0x6845
+0x83DC = 0x3A5A
+0x83DF = 0x4551
+0x83E0 = 0x684A
+0x83E9 = 0x4A6E
+0x83EB = 0x6841
+0x83EF = 0x325A
+0x83F0 = 0x3856
+0x83F1 = 0x4929
+0x83F2 = 0x684B
+0x83F4 = 0x683F
+0x83F7 = 0x6848
+0x83FB = 0x6852
+0x83FD = 0x6843
+0x8403 = 0x6844
+0x8404 = 0x463A
+0x8407 = 0x6849
+0x840B = 0x6846
+0x840C = 0x4B28
+0x840D = 0x684C
+0x840E = 0x3060
+0x8413 = 0x6840
+0x8420 = 0x684E
+0x8422 = 0x684D
+0x8429 = 0x476B
+0x842A = 0x6854
+0x842C = 0x685F
+0x8431 = 0x337E
+0x8435 = 0x6862
+0x8438 = 0x6850
+0x843C = 0x6855
+0x843D = 0x4D6E
+0x8446 = 0x685E
+0x8449 = 0x4D55
+0x844E = 0x4E2A
+0x8457 = 0x4378
+0x845B = 0x336B
+0x8461 = 0x4972
+0x8462 = 0x6864
+0x8463 = 0x4621
+0x8466 = 0x3031
+0x8469 = 0x685D
+0x846B = 0x6859
+0x846C = 0x4172
+0x846D = 0x6853
+0x846E = 0x685B
+0x846F = 0x6860
+0x8471 = 0x472C
+0x8475 = 0x302A
+0x8477 = 0x6858
+0x8479 = 0x6861
+0x847A = 0x4978
+0x8482 = 0x685C
+0x8484 = 0x6857
+0x848B = 0x3E55
+0x8490 = 0x3D2F
+0x8494 = 0x3C2C
+0x8499 = 0x4C58
+0x849C = 0x4947
+0x849F = 0x6867
+0x84A1 = 0x6870
+0x84AD = 0x685A
+0x84B2 = 0x3377
+0x84B8 = 0x3E78
+0x84B9 = 0x6865
+0x84BB = 0x686A
+0x84BC = 0x4173
+0x84BF = 0x6866
+0x84C1 = 0x686D
+0x84C4 = 0x435F
+0x84C6 = 0x686E
+0x84C9 = 0x4D56
+0x84CA = 0x6863
+0x84CB = 0x3338
+0x84CD = 0x6869
+0x84D0 = 0x686C
+0x84D1 = 0x4C2C
+0x84D6 = 0x686F
+0x84D9 = 0x6868
+0x84DA = 0x686B
+0x84EC = 0x4B29
+0x84EE = 0x4F21
+0x84F4 = 0x6873
+0x84FC = 0x687A
+0x84FF = 0x6872
+0x8500 = 0x3C43
+0x8506 = 0x6851
+0x8511 = 0x4A4E
+0x8513 = 0x4C22
+0x8514 = 0x6879
+0x8515 = 0x6878
+0x8517 = 0x6874
+0x8518 = 0x6875
+0x851A = 0x3136
+0x851F = 0x6877
+0x8521 = 0x6871
+0x8526 = 0x4455
+0x852C = 0x6876
+0x852D = 0x307E
+0x8535 = 0x4222
+0x853D = 0x4A43
+0x8540 = 0x687B
+0x8541 = 0x6921
+0x8543 = 0x4859
+0x8548 = 0x687E
+0x8549 = 0x3E56
+0x854A = 0x3C49
+0x854B = 0x6923
+0x854E = 0x363E
+0x8555 = 0x6924
+0x8557 = 0x4979
+0x8558 = 0x687D
+0x855A = 0x6856
+0x8563 = 0x687C
+0x8568 = 0x4F4F
+0x8569 = 0x4622
+0x856A = 0x4973
+0x856D = 0x692B
+0x8577 = 0x6931
+0x857E = 0x6932
+0x8580 = 0x6925
+0x8584 = 0x4776
+0x8587 = 0x692F
+0x8588 = 0x6927
+0x858A = 0x6929
+0x8590 = 0x6933
+0x8591 = 0x6928
+0x8594 = 0x692C
+0x8597 = 0x3172
+0x8599 = 0x4665
+0x859B = 0x692D
+0x859C = 0x6930
+0x85A4 = 0x6926
+0x85A6 = 0x4126
+0x85A8 = 0x692A
+0x85A9 = 0x3B27
+0x85AA = 0x3F45
+0x85AB = 0x3730
+0x85AC = 0x4C74
+0x85AE = 0x4C79
+0x85AF = 0x3D72
+0x85B9 = 0x6937
+0x85BA = 0x6935
+0x85C1 = 0x4F4E
+0x85C9 = 0x6934
+0x85CD = 0x4D75
+0x85CF = 0x6936
+0x85D0 = 0x6938
+0x85D5 = 0x6939
+0x85DC = 0x693C
+0x85DD = 0x693A
+0x85E4 = 0x4623
+0x85E5 = 0x693B
+0x85E9 = 0x484D
+0x85EA = 0x692E
+0x85F7 = 0x3D73
+0x85F9 = 0x693D
+0x85FA = 0x6942
+0x85FB = 0x4174
+0x85FE = 0x6941
+0x8602 = 0x6922
+0x8606 = 0x6943
+0x8607 = 0x4149
+0x860A = 0x693E
+0x860B = 0x6940
+0x8613 = 0x693F
+0x8616 = 0x5D31
+0x8617 = 0x5D22
+0x861A = 0x6945
+0x8622 = 0x6944
+0x862D = 0x4D76
+0x862F = 0x623C
+0x8630 = 0x6946
+0x863F = 0x6947
+0x864D = 0x6948
+0x864E = 0x3857
+0x8650 = 0x3554
+0x8654 = 0x694A
+0x8655 = 0x515D
+0x865A = 0x3575
+0x865C = 0x4E3A
+0x865E = 0x3673
+0x865F = 0x694B
+0x8667 = 0x694C
+0x866B = 0x436E
+0x8671 = 0x694D
+0x8679 = 0x467A
+0x867B = 0x303A
+0x868A = 0x3263
+0x868B = 0x6952
+0x868C = 0x6953
+0x8693 = 0x694E
+0x8695 = 0x3B3D
+0x86A3 = 0x694F
+0x86A4 = 0x4742
+0x86A9 = 0x6950
+0x86AA = 0x6951
+0x86AB = 0x695B
+0x86AF = 0x6955
+0x86B0 = 0x6958
+0x86B6 = 0x6954
+0x86C4 = 0x6956
+0x86C6 = 0x6957
+0x86C7 = 0x3C58
+0x86C9 = 0x6959
+0x86CB = 0x4341
+0x86CD = 0x3756
+0x86CE = 0x3342
+0x86D4 = 0x695C
+0x86D9 = 0x333F
+0x86DB = 0x6961
+0x86DE = 0x695D
+0x86DF = 0x6960
+0x86E4 = 0x483A
+0x86E9 = 0x695E
+0x86EC = 0x695F
+0x86ED = 0x4948
+0x86EE = 0x485A
+0x86EF = 0x6962
+0x86F8 = 0x427D
+0x86F9 = 0x696C
+0x86FB = 0x6968
+0x86FE = 0x326B
+0x8700 = 0x6966
+0x8702 = 0x4B2A
+0x8703 = 0x6967
+0x8706 = 0x6964
+0x8708 = 0x6965
+0x8709 = 0x696A
+0x870A = 0x696D
+0x870D = 0x696B
+0x8711 = 0x6969
+0x8712 = 0x6963
+0x8718 = 0x4358
+0x871A = 0x6974
+0x871C = 0x4C2A
+0x8725 = 0x6972
+0x8729 = 0x6973
+0x8734 = 0x696E
+0x8737 = 0x6970
+0x873B = 0x6971
+0x873F = 0x696F
+0x8749 = 0x4066
+0x874B = 0x4F39
+0x874C = 0x6978
+0x874E = 0x6979
+0x8753 = 0x6A21
+0x8755 = 0x3F2A
+0x8757 = 0x697B
+0x8759 = 0x697E
+0x875F = 0x6976
+0x8760 = 0x6975
+0x8763 = 0x6A22
+0x8766 = 0x325C
+0x8768 = 0x697C
+0x876A = 0x6A23
+0x876E = 0x697D
+0x8774 = 0x697A
+0x8776 = 0x4433
+0x8778 = 0x6977
+0x877F = 0x4768
+0x8782 = 0x6A27
+0x878D = 0x4D3B
+0x879F = 0x6A26
+0x87A2 = 0x6A25
+0x87AB = 0x6A2E
+0x87AF = 0x6A28
+0x87B3 = 0x6A30
+0x87BA = 0x4D66
+0x87BB = 0x6A33
+0x87BD = 0x6A2A
+0x87C0 = 0x6A2B
+0x87C4 = 0x6A2F
+0x87C6 = 0x6A32
+0x87C7 = 0x6A31
+0x87CB = 0x6A29
+0x87D0 = 0x6A2C
+0x87D2 = 0x6A3D
+0x87E0 = 0x6A36
+0x87EF = 0x6A34
+0x87F2 = 0x6A35
+0x87F6 = 0x6A3A
+0x87F7 = 0x6A3B
+0x87F9 = 0x332A
+0x87FB = 0x3542
+0x87FE = 0x6A39
+0x8805 = 0x6A24
+0x880D = 0x6A38
+0x880E = 0x6A3C
+0x880F = 0x6A37
+0x8811 = 0x6A3E
+0x8815 = 0x6A40
+0x8816 = 0x6A3F
+0x8821 = 0x6A42
+0x8822 = 0x6A41
+0x8823 = 0x695A
+0x8827 = 0x6A46
+0x8831 = 0x6A43
+0x8836 = 0x6A44
+0x8839 = 0x6A45
+0x883B = 0x6A47
+0x8840 = 0x376C
+0x8842 = 0x6A49
+0x8844 = 0x6A48
+0x8846 = 0x3D30
+0x884C = 0x3954
+0x884D = 0x5E27
+0x8852 = 0x6A4A
+0x8853 = 0x3D51
+0x8857 = 0x3339
+0x8859 = 0x6A4B
+0x885B = 0x3152
+0x885D = 0x3E57
+0x885E = 0x6A4C
+0x8861 = 0x3955
+0x8862 = 0x6A4D
+0x8863 = 0x3061
+0x8868 = 0x493D
+0x886B = 0x6A4E
+0x8870 = 0x3F6A
+0x8872 = 0x6A55
+0x8875 = 0x6A52
+0x8877 = 0x436F
+0x887D = 0x6A53
+0x887E = 0x6A50
+0x887F = 0x365E
+0x8881 = 0x6A4F
+0x8882 = 0x6A56
+0x8888 = 0x3736
+0x888B = 0x425E
+0x888D = 0x6A5C
+0x8892 = 0x6A58
+0x8896 = 0x4235
+0x8897 = 0x6A57
+0x8899 = 0x6A5A
+0x889E = 0x6A51
+0x88A2 = 0x6A5B
+0x88A4 = 0x6A5D
+0x88AB = 0x486F
+0x88AE = 0x6A59
+0x88B0 = 0x6A5E
+0x88B1 = 0x6A60
+0x88B4 = 0x3853
+0x88B5 = 0x6A54
+0x88B7 = 0x3041
+0x88BF = 0x6A5F
+0x88C1 = 0x3A5B
+0x88C2 = 0x4E76
+0x88C3 = 0x6A61
+0x88C4 = 0x6A62
+0x88C5 = 0x4175
+0x88CF = 0x4E22
+0x88D4 = 0x6A63
+0x88D5 = 0x4D35
+0x88D8 = 0x6A64
+0x88D9 = 0x6A65
+0x88DC = 0x4A64
+0x88DD = 0x6A66
+0x88DF = 0x3A40
+0x88E1 = 0x4E23
+0x88E8 = 0x6A6B
+0x88F2 = 0x6A6C
+0x88F3 = 0x3E58
+0x88F4 = 0x6A6A
+0x88F8 = 0x4D67
+0x88F9 = 0x6A67
+0x88FC = 0x6A69
+0x88FD = 0x403D
+0x88FE = 0x3F7E
+0x8902 = 0x6A68
+0x8904 = 0x6A6D
+0x8907 = 0x4A23
+0x890A = 0x6A6F
+0x890C = 0x6A6E
+0x8910 = 0x336C
+0x8912 = 0x4B2B
+0x8913 = 0x6A70
+0x891D = 0x6A7C
+0x891E = 0x6A72
+0x8925 = 0x6A73
+0x892A = 0x6A74
+0x892B = 0x6A75
+0x8936 = 0x6A79
+0x8938 = 0x6A7A
+0x893B = 0x6A78
+0x8941 = 0x6A76
+0x8943 = 0x6A71
+0x8944 = 0x6A77
+0x894C = 0x6A7B
+0x894D = 0x7037
+0x8956 = 0x3228
+0x895E = 0x6A7E
+0x895F = 0x365F
+0x8960 = 0x6A7D
+0x8964 = 0x6B22
+0x8966 = 0x6B21
+0x896A = 0x6B24
+0x896D = 0x6B23
+0x896F = 0x6B25
+0x8972 = 0x3D31
+0x8974 = 0x6B26
+0x8977 = 0x6B27
+0x897E = 0x6B28
+0x897F = 0x403E
+0x8981 = 0x4D57
+0x8983 = 0x6B29
+0x8986 = 0x4A24
+0x8987 = 0x4746
+0x8988 = 0x6B2A
+0x898A = 0x6B2B
+0x898B = 0x382B
+0x898F = 0x352C
+0x8993 = 0x6B2C
+0x8996 = 0x3B6B
+0x8997 = 0x4741
+0x8998 = 0x6B2D
+0x899A = 0x3350
+0x89A1 = 0x6B2E
+0x89A6 = 0x6B30
+0x89A7 = 0x4D77
+0x89A9 = 0x6B2F
+0x89AA = 0x3F46
+0x89AC = 0x6B31
+0x89AF = 0x6B32
+0x89B2 = 0x6B33
+0x89B3 = 0x3451
+0x89BA = 0x6B34
+0x89BD = 0x6B35
+0x89BF = 0x6B36
+0x89C0 = 0x6B37
+0x89D2 = 0x3351
+0x89DA = 0x6B38
+0x89DC = 0x6B39
+0x89DD = 0x6B3A
+0x89E3 = 0x3272
+0x89E6 = 0x3F28
+0x89E7 = 0x6B3B
+0x89F4 = 0x6B3C
+0x89F8 = 0x6B3D
+0x8A00 = 0x3840
+0x8A02 = 0x447B
+0x8A03 = 0x6B3E
+0x8A08 = 0x3757
+0x8A0A = 0x3F56
+0x8A0C = 0x6B41
+0x8A0E = 0x4624
+0x8A10 = 0x6B40
+0x8A13 = 0x3731
+0x8A16 = 0x6B3F
+0x8A17 = 0x4277
+0x8A18 = 0x352D
+0x8A1B = 0x6B42
+0x8A1D = 0x6B43
+0x8A1F = 0x3E59
+0x8A23 = 0x376D
+0x8A25 = 0x6B44
+0x8A2A = 0x4B2C
+0x8A2D = 0x405F
+0x8A31 = 0x3576
+0x8A33 = 0x4C75
+0x8A34 = 0x414A
+0x8A36 = 0x6B45
+0x8A3A = 0x3F47
+0x8A3B = 0x4370
+0x8A3C = 0x3E5A
+0x8A41 = 0x6B46
+0x8A46 = 0x6B49
+0x8A48 = 0x6B4A
+0x8A50 = 0x3A3E
+0x8A51 = 0x4242
+0x8A52 = 0x6B48
+0x8A54 = 0x3E5B
+0x8A55 = 0x493E
+0x8A5B = 0x6B47
+0x8A5E = 0x3B6C
+0x8A60 = 0x3153
+0x8A62 = 0x6B4E
+0x8A63 = 0x3758
+0x8A66 = 0x3B6E
+0x8A69 = 0x3B6D
+0x8A6B = 0x4F4D
+0x8A6C = 0x6B4D
+0x8A6D = 0x6B4C
+0x8A6E = 0x4127
+0x8A70 = 0x354D
+0x8A71 = 0x4F43
+0x8A72 = 0x333A
+0x8A73 = 0x3E5C
+0x8A7C = 0x6B4B
+0x8A82 = 0x6B50
+0x8A84 = 0x6B51
+0x8A85 = 0x6B4F
+0x8A87 = 0x3858
+0x8A89 = 0x4D40
+0x8A8C = 0x3B6F
+0x8A8D = 0x4727
+0x8A91 = 0x6B54
+0x8A93 = 0x4040
+0x8A95 = 0x4342
+0x8A98 = 0x4D36
+0x8A9A = 0x6B57
+0x8A9E = 0x386C
+0x8AA0 = 0x403F
+0x8AA1 = 0x6B53
+0x8AA3 = 0x6B58
+0x8AA4 = 0x386D
+0x8AA5 = 0x6B55
+0x8AA6 = 0x6B56
+0x8AA8 = 0x6B52
+0x8AAC = 0x4062
+0x8AAD = 0x4649
+0x8AB0 = 0x432F
+0x8AB2 = 0x325D
+0x8AB9 = 0x4870
+0x8ABC = 0x3543
+0x8ABF = 0x4434
+0x8AC2 = 0x6B5B
+0x8AC4 = 0x6B59
+0x8AC7 = 0x434C
+0x8ACB = 0x4041
+0x8ACC = 0x3452
+0x8ACD = 0x6B5A
+0x8ACF = 0x3F5B
+0x8AD2 = 0x4E4A
+0x8AD6 = 0x4F40
+0x8ADA = 0x6B5C
+0x8ADB = 0x6B67
+0x8ADC = 0x4435
+0x8ADE = 0x6B66
+0x8AE0 = 0x6B63
+0x8AE1 = 0x6B6B
+0x8AE2 = 0x6B64
+0x8AE4 = 0x6B60
+0x8AE6 = 0x447C
+0x8AE7 = 0x6B5F
+0x8AEB = 0x6B5D
+0x8AED = 0x4D21
+0x8AEE = 0x3B70
+0x8AF1 = 0x6B61
+0x8AF3 = 0x6B5E
+0x8AF7 = 0x6B65
+0x8AF8 = 0x3D74
+0x8AFA = 0x3841
+0x8AFE = 0x427A
+0x8B00 = 0x4B45
+0x8B01 = 0x315A
+0x8B02 = 0x3062
+0x8B04 = 0x4625
+0x8B07 = 0x6B69
+0x8B0C = 0x6B68
+0x8B0E = 0x4666
+0x8B10 = 0x6B6D
+0x8B14 = 0x6B62
+0x8B16 = 0x6B6C
+0x8B17 = 0x6B6E
+0x8B19 = 0x382C
+0x8B1A = 0x6B6A
+0x8B1B = 0x3956
+0x8B1D = 0x3C55
+0x8B20 = 0x6B6F
+0x8B21 = 0x4D58
+0x8B26 = 0x6B72
+0x8B28 = 0x6B75
+0x8B2B = 0x6B73
+0x8B2C = 0x4935
+0x8B33 = 0x6B70
+0x8B39 = 0x3660
+0x8B3E = 0x6B74
+0x8B41 = 0x6B76
+0x8B49 = 0x6B7A
+0x8B4C = 0x6B77
+0x8B4E = 0x6B79
+0x8B4F = 0x6B78
+0x8B56 = 0x6B7B
+0x8B58 = 0x3C31
+0x8B5A = 0x6B7D
+0x8B5B = 0x6B7C
+0x8B5C = 0x4968
+0x8B5F = 0x6C21
+0x8B66 = 0x3759
+0x8B6B = 0x6B7E
+0x8B6C = 0x6C22
+0x8B6F = 0x6C23
+0x8B70 = 0x3544
+0x8B71 = 0x6641
+0x8B72 = 0x3E79
+0x8B74 = 0x6C24
+0x8B77 = 0x386E
+0x8B7D = 0x6C25
+0x8B80 = 0x6C26
+0x8B83 = 0x3B3E
+0x8B8A = 0x5A4E
+0x8B8C = 0x6C27
+0x8B8E = 0x6C28
+0x8B90 = 0x3D32
+0x8B92 = 0x6C29
+0x8B93 = 0x6C2A
+0x8B96 = 0x6C2B
+0x8B99 = 0x6C2C
+0x8B9A = 0x6C2D
+0x8C37 = 0x432B
+0x8C3A = 0x6C2E
+0x8C3F = 0x6C30
+0x8C41 = 0x6C2F
+0x8C46 = 0x4626
+0x8C48 = 0x6C31
+0x8C4A = 0x4B2D
+0x8C4C = 0x6C32
+0x8C4E = 0x6C33
+0x8C50 = 0x6C34
+0x8C55 = 0x6C35
+0x8C5A = 0x465A
+0x8C61 = 0x3E5D
+0x8C62 = 0x6C36
+0x8C6A = 0x396B
+0x8C6B = 0x502E
+0x8C6C = 0x6C37
+0x8C78 = 0x6C38
+0x8C79 = 0x493F
+0x8C7A = 0x6C39
+0x8C7C = 0x6C41
+0x8C82 = 0x6C3A
+0x8C85 = 0x6C3C
+0x8C89 = 0x6C3B
+0x8C8A = 0x6C3D
+0x8C8C = 0x4B46
+0x8C8D = 0x6C3E
+0x8C8E = 0x6C3F
+0x8C94 = 0x6C40
+0x8C98 = 0x6C42
+0x8C9D = 0x332D
+0x8C9E = 0x4467
+0x8CA0 = 0x4969
+0x8CA1 = 0x3A62
+0x8CA2 = 0x3957
+0x8CA7 = 0x494F
+0x8CA8 = 0x325F
+0x8CA9 = 0x484E
+0x8CAA = 0x6C45
+0x8CAB = 0x3453
+0x8CAC = 0x4055
+0x8CAD = 0x6C44
+0x8CAE = 0x6C49
+0x8CAF = 0x4379
+0x8CB0 = 0x4C63
+0x8CB2 = 0x6C47
+0x8CB3 = 0x6C48
+0x8CB4 = 0x352E
+0x8CB6 = 0x6C4A
+0x8CB7 = 0x4763
+0x8CB8 = 0x425F
+0x8CBB = 0x4871
+0x8CBC = 0x453D
+0x8CBD = 0x6C46
+0x8CBF = 0x4B47
+0x8CC0 = 0x326C
+0x8CC1 = 0x6C4C
+0x8CC2 = 0x4F28
+0x8CC3 = 0x4442
+0x8CC4 = 0x4F45
+0x8CC7 = 0x3B71
+0x8CC8 = 0x6C4B
+0x8CCA = 0x4231
+0x8CCD = 0x6C5C
+0x8CCE = 0x4128
+0x8CD1 = 0x4678
+0x8CD3 = 0x4950
+0x8CDA = 0x6C4F
+0x8CDB = 0x3B3F
+0x8CDC = 0x3B72
+0x8CDE = 0x3E5E
+0x8CE0 = 0x4765
+0x8CE2 = 0x382D
+0x8CE3 = 0x6C4E
+0x8CE4 = 0x6C4D
+0x8CE6 = 0x496A
+0x8CEA = 0x3C41
+0x8CED = 0x4552
+0x8CFA = 0x6C51
+0x8CFB = 0x6C52
+0x8CFC = 0x3958
+0x8CFD = 0x6C50
+0x8D04 = 0x6C53
+0x8D05 = 0x6C54
+0x8D07 = 0x6C56
+0x8D08 = 0x4223
+0x8D0A = 0x6C55
+0x8D0B = 0x3466
+0x8D0D = 0x6C58
+0x8D0F = 0x6C57
+0x8D10 = 0x6C59
+0x8D13 = 0x6C5B
+0x8D14 = 0x6C5D
+0x8D16 = 0x6C5E
+0x8D64 = 0x4056
+0x8D66 = 0x3C4F
+0x8D67 = 0x6C5F
+0x8D6B = 0x3352
+0x8D6D = 0x6C60
+0x8D70 = 0x4176
+0x8D71 = 0x6C61
+0x8D73 = 0x6C62
+0x8D74 = 0x496B
+0x8D77 = 0x352F
+0x8D81 = 0x6C63
+0x8D85 = 0x4436
+0x8D8A = 0x315B
+0x8D99 = 0x6C64
+0x8DA3 = 0x3C71
+0x8DA8 = 0x3F76
+0x8DB3 = 0x422D
+0x8DBA = 0x6C67
+0x8DBE = 0x6C66
+0x8DC2 = 0x6C65
+0x8DCB = 0x6C6D
+0x8DCC = 0x6C6B
+0x8DCF = 0x6C68
+0x8DD6 = 0x6C6A
+0x8DDA = 0x6C69
+0x8DDB = 0x6C6C
+0x8DDD = 0x3577
+0x8DDF = 0x6C70
+0x8DE1 = 0x4057
+0x8DE3 = 0x6C71
+0x8DE8 = 0x3859
+0x8DEA = 0x6C6E
+0x8DEB = 0x6C6F
+0x8DEF = 0x4F29
+0x8DF3 = 0x4437
+0x8DF5 = 0x4129
+0x8DFC = 0x6C72
+0x8DFF = 0x6C75
+0x8E08 = 0x6C73
+0x8E09 = 0x6C74
+0x8E0A = 0x4D59
+0x8E0F = 0x4627
+0x8E10 = 0x6C78
+0x8E1D = 0x6C76
+0x8E1E = 0x6C77
+0x8E1F = 0x6C79
+0x8E2A = 0x6D29
+0x8E30 = 0x6C7C
+0x8E34 = 0x6C7D
+0x8E35 = 0x6C7B
+0x8E42 = 0x6C7A
+0x8E44 = 0x447D
+0x8E47 = 0x6D21
+0x8E48 = 0x6D25
+0x8E49 = 0x6D22
+0x8E4A = 0x6C7E
+0x8E4C = 0x6D23
+0x8E50 = 0x6D24
+0x8E55 = 0x6D2B
+0x8E59 = 0x6D26
+0x8E5F = 0x4058
+0x8E60 = 0x6D28
+0x8E63 = 0x6D2A
+0x8E64 = 0x6D27
+0x8E72 = 0x6D2D
+0x8E74 = 0x3D33
+0x8E76 = 0x6D2C
+0x8E7C = 0x6D2E
+0x8E81 = 0x6D2F
+0x8E84 = 0x6D32
+0x8E85 = 0x6D31
+0x8E87 = 0x6D30
+0x8E8A = 0x6D34
+0x8E8B = 0x6D33
+0x8E8D = 0x4C76
+0x8E91 = 0x6D36
+0x8E93 = 0x6D35
+0x8E94 = 0x6D37
+0x8E99 = 0x6D38
+0x8EA1 = 0x6D3A
+0x8EAA = 0x6D39
+0x8EAB = 0x3F48
+0x8EAC = 0x6D3B
+0x8EAF = 0x366D
+0x8EB0 = 0x6D3C
+0x8EB1 = 0x6D3E
+0x8EBE = 0x6D3F
+0x8EC5 = 0x6D40
+0x8EC6 = 0x6D3D
+0x8EC8 = 0x6D41
+0x8ECA = 0x3C56
+0x8ECB = 0x6D42
+0x8ECC = 0x3530
+0x8ECD = 0x3733
+0x8ED2 = 0x382E
+0x8EDB = 0x6D43
+0x8EDF = 0x4670
+0x8EE2 = 0x453E
+0x8EE3 = 0x6D44
+0x8EEB = 0x6D47
+0x8EF8 = 0x3C34
+0x8EFB = 0x6D46
+0x8EFC = 0x6D45
+0x8EFD = 0x375A
+0x8EFE = 0x6D48
+0x8F03 = 0x3353
+0x8F05 = 0x6D4A
+0x8F09 = 0x3A5C
+0x8F0A = 0x6D49
+0x8F0C = 0x6D52
+0x8F12 = 0x6D4C
+0x8F13 = 0x6D4E
+0x8F14 = 0x4A65
+0x8F15 = 0x6D4B
+0x8F19 = 0x6D4D
+0x8F1B = 0x6D51
+0x8F1C = 0x6D4F
+0x8F1D = 0x3531
+0x8F1F = 0x6D50
+0x8F26 = 0x6D53
+0x8F29 = 0x475A
+0x8F2A = 0x4E58
+0x8F2F = 0x3D34
+0x8F33 = 0x6D54
+0x8F38 = 0x4D22
+0x8F39 = 0x6D56
+0x8F3B = 0x6D55
+0x8F3E = 0x6D59
+0x8F3F = 0x4D41
+0x8F42 = 0x6D58
+0x8F44 = 0x336D
+0x8F45 = 0x6D57
+0x8F46 = 0x6D5C
+0x8F49 = 0x6D5B
+0x8F4C = 0x6D5A
+0x8F4D = 0x4532
+0x8F4E = 0x6D5D
+0x8F57 = 0x6D5E
+0x8F5C = 0x6D5F
+0x8F5F = 0x396C
+0x8F61 = 0x3725
+0x8F62 = 0x6D60
+0x8F63 = 0x6D61
+0x8F64 = 0x6D62
+0x8F9B = 0x3F49
+0x8F9C = 0x6D63
+0x8F9E = 0x3C2D
+0x8F9F = 0x6D64
+0x8FA3 = 0x6D65
+0x8FA7 = 0x5221
+0x8FA8 = 0x517E
+0x8FAD = 0x6D66
+0x8FAE = 0x6570
+0x8FAF = 0x6D67
+0x8FB0 = 0x4324
+0x8FB1 = 0x3F2B
+0x8FB2 = 0x4740
+0x8FB7 = 0x6D68
+0x8FBA = 0x4A55
+0x8FBB = 0x4454
+0x8FBC = 0x397E
+0x8FBF = 0x4329
+0x8FC2 = 0x312A
+0x8FC4 = 0x4B78
+0x8FC5 = 0x3F57
+0x8FCE = 0x375E
+0x8FD1 = 0x3661
+0x8FD4 = 0x4A56
+0x8FDA = 0x6D69
+0x8FE2 = 0x6D6B
+0x8FE5 = 0x6D6A
+0x8FE6 = 0x3260
+0x8FE9 = 0x4676
+0x8FEA = 0x6D6C
+0x8FEB = 0x4777
+0x8FED = 0x4533
+0x8FEF = 0x6D6D
+0x8FF0 = 0x3D52
+0x8FF4 = 0x6D6F
+0x8FF7 = 0x4C42
+0x8FF8 = 0x6D7E
+0x8FF9 = 0x6D71
+0x8FFA = 0x6D72
+0x8FFD = 0x4449
+0x9000 = 0x4260
+0x9001 = 0x4177
+0x9003 = 0x4628
+0x9005 = 0x6D70
+0x9006 = 0x3555
+0x900B = 0x6D79
+0x900D = 0x6D76
+0x900E = 0x6E25
+0x900F = 0x4629
+0x9010 = 0x4360
+0x9011 = 0x6D73
+0x9013 = 0x447E
+0x9014 = 0x4553
+0x9015 = 0x6D74
+0x9016 = 0x6D78
+0x9017 = 0x3F60
+0x9019 = 0x4767
+0x901A = 0x444C
+0x901D = 0x4042
+0x901E = 0x6D77
+0x901F = 0x422E
+0x9020 = 0x4224
+0x9021 = 0x6D75
+0x9022 = 0x3029
+0x9023 = 0x4F22
+0x9027 = 0x6D7A
+0x902E = 0x4261
+0x9031 = 0x3D35
+0x9032 = 0x3F4A
+0x9035 = 0x6D7C
+0x9036 = 0x6D7B
+0x9038 = 0x306F
+0x9039 = 0x6D7D
+0x903C = 0x492F
+0x903E = 0x6E27
+0x9041 = 0x465B
+0x9042 = 0x3F6B
+0x9045 = 0x4359
+0x9047 = 0x3678
+0x9049 = 0x6E26
+0x904A = 0x4D37
+0x904B = 0x313F
+0x904D = 0x4A57
+0x904E = 0x3261
+0x904F = 0x6E21
+0x9050 = 0x6E22
+0x9051 = 0x6E23
+0x9052 = 0x6E24
+0x9053 = 0x463B
+0x9054 = 0x4323
+0x9055 = 0x3063
+0x9056 = 0x6E28
+0x9058 = 0x6E29
+0x9059 = 0x7423
+0x905C = 0x423D
+0x905E = 0x6E2A
+0x9060 = 0x3173
+0x9061 = 0x414C
+0x9063 = 0x382F
+0x9065 = 0x4D5A
+0x9068 = 0x6E2B
+0x9069 = 0x452C
+0x906D = 0x4178
+0x906E = 0x3C57
+0x906F = 0x6E2C
+0x9072 = 0x6E2F
+0x9075 = 0x3D65
+0x9076 = 0x6E2D
+0x9077 = 0x412B
+0x9078 = 0x412A
+0x907A = 0x3064
+0x907C = 0x4E4B
+0x907D = 0x6E31
+0x907F = 0x4872
+0x9080 = 0x6E33
+0x9081 = 0x6E32
+0x9082 = 0x6E30
+0x9083 = 0x6364
+0x9084 = 0x3454
+0x9087 = 0x6D6E
+0x9089 = 0x6E35
+0x908A = 0x6E34
+0x908F = 0x6E36
+0x9091 = 0x4D38
+0x90A3 = 0x4661
+0x90A6 = 0x4B2E
+0x90A8 = 0x6E37
+0x90AA = 0x3C59
+0x90AF = 0x6E38
+0x90B1 = 0x6E39
+0x90B5 = 0x6E3A
+0x90B8 = 0x4521
+0x90C1 = 0x306A
+0x90CA = 0x3959
+0x90CE = 0x4F3A
+0x90DB = 0x6E3E
+0x90E1 = 0x3734
+0x90E2 = 0x6E3B
+0x90E4 = 0x6E3C
+0x90E8 = 0x4974
+0x90ED = 0x3354
+0x90F5 = 0x4D39
+0x90F7 = 0x363F
+0x90FD = 0x4554
+0x9102 = 0x6E3F
+0x9112 = 0x6E40
+0x9119 = 0x6E41
+0x912D = 0x4522
+0x9130 = 0x6E43
+0x9132 = 0x6E42
+0x9149 = 0x4653
+0x914A = 0x6E44
+0x914B = 0x3D36
+0x914C = 0x3C60
+0x914D = 0x475B
+0x914E = 0x4371
+0x9152 = 0x3C72
+0x9154 = 0x3F6C
+0x9156 = 0x6E45
+0x9158 = 0x6E46
+0x9162 = 0x3F5D
+0x9163 = 0x6E47
+0x9165 = 0x6E48
+0x9169 = 0x6E49
+0x916A = 0x4D6F
+0x916C = 0x3D37
+0x9172 = 0x6E4B
+0x9173 = 0x6E4A
+0x9175 = 0x395A
+0x9177 = 0x3973
+0x9178 = 0x3B40
+0x9182 = 0x6E4E
+0x9187 = 0x3D66
+0x9189 = 0x6E4D
+0x918B = 0x6E4C
+0x918D = 0x4269
+0x9190 = 0x386F
+0x9192 = 0x4043
+0x9197 = 0x4830
+0x919C = 0x3D39
+0x91A2 = 0x6E4F
+0x91A4 = 0x3E5F
+0x91AA = 0x6E52
+0x91AB = 0x6E50
+0x91AF = 0x6E51
+0x91B4 = 0x6E54
+0x91B5 = 0x6E53
+0x91B8 = 0x3E7A
+0x91BA = 0x6E55
+0x91C0 = 0x6E56
+0x91C1 = 0x6E57
+0x91C6 = 0x4850
+0x91C7 = 0x3A53
+0x91C8 = 0x3C61
+0x91C9 = 0x6E58
+0x91CB = 0x6E59
+0x91CC = 0x4E24
+0x91CD = 0x3D45
+0x91CE = 0x4C6E
+0x91CF = 0x4E4C
+0x91D0 = 0x6E5A
+0x91D1 = 0x3662
+0x91D6 = 0x6E5B
+0x91D8 = 0x4523
+0x91DB = 0x6E5E
+0x91DC = 0x3378
+0x91DD = 0x3F4B
+0x91DF = 0x6E5C
+0x91E1 = 0x6E5D
+0x91E3 = 0x4460
+0x91E6 = 0x4B55
+0x91E7 = 0x367C
+0x91F5 = 0x6E60
+0x91F6 = 0x6E61
+0x91FC = 0x6E5F
+0x91FF = 0x6E63
+0x920D = 0x465F
+0x920E = 0x3343
+0x9211 = 0x6E67
+0x9214 = 0x6E64
+0x9215 = 0x6E66
+0x921E = 0x6E62
+0x9229 = 0x6F4F
+0x922C = 0x6E65
+0x9234 = 0x4E6B
+0x9237 = 0x385A
+0x923F = 0x6E6F
+0x9244 = 0x4534
+0x9245 = 0x6E6A
+0x9248 = 0x6E6D
+0x9249 = 0x6E6B
+0x924B = 0x6E70
+0x9250 = 0x6E71
+0x9257 = 0x6E69
+0x925A = 0x6E76
+0x925B = 0x3174
+0x925E = 0x6E68
+0x9262 = 0x482D
+0x9264 = 0x6E6C
+0x9266 = 0x3E60
+0x9271 = 0x395B
+0x927E = 0x4B48
+0x9280 = 0x3664
+0x9283 = 0x3D46
+0x9285 = 0x463C
+0x9291 = 0x412D
+0x9293 = 0x6E74
+0x9295 = 0x6E6E
+0x9296 = 0x6E73
+0x9298 = 0x4C43
+0x929A = 0x4438
+0x929B = 0x6E75
+0x929C = 0x6E72
+0x92AD = 0x412C
+0x92B7 = 0x6E79
+0x92B9 = 0x6E78
+0x92CF = 0x6E77
+0x92D2 = 0x4B2F
+0x92E4 = 0x3D7B
+0x92E9 = 0x6E7A
+0x92EA = 0x4A5F
+0x92ED = 0x3154
+0x92F2 = 0x4946
+0x92F3 = 0x4372
+0x92F8 = 0x3578
+0x92FA = 0x6E7C
+0x92FC = 0x395D
+0x9306 = 0x3B2C
+0x930F = 0x6E7B
+0x9310 = 0x3F6D
+0x9318 = 0x3F6E
+0x9319 = 0x6F21
+0x931A = 0x6F23
+0x9320 = 0x3E7B
+0x9322 = 0x6F22
+0x9323 = 0x6F24
+0x9326 = 0x3653
+0x9328 = 0x4945
+0x932B = 0x3C62
+0x932C = 0x4F23
+0x932E = 0x6E7E
+0x932F = 0x3A78
+0x9332 = 0x4F3F
+0x9335 = 0x6F26
+0x933A = 0x6F25
+0x933B = 0x6F27
+0x9344 = 0x6E7D
+0x934B = 0x4669
+0x934D = 0x4555
+0x9354 = 0x4457
+0x9356 = 0x6F2C
+0x935B = 0x4343
+0x935C = 0x6F28
+0x9360 = 0x6F29
+0x936C = 0x372D
+0x936E = 0x6F2B
+0x9375 = 0x3830
+0x937C = 0x6F2A
+0x937E = 0x3E61
+0x938C = 0x3379
+0x9394 = 0x6F30
+0x9396 = 0x3A3F
+0x9397 = 0x4179
+0x939A = 0x444A
+0x93A7 = 0x333B
+0x93AC = 0x6F2E
+0x93AD = 0x6F2F
+0x93AE = 0x4443
+0x93B0 = 0x6F2D
+0x93B9 = 0x6F31
+0x93C3 = 0x6F37
+0x93C8 = 0x6F3A
+0x93D0 = 0x6F39
+0x93D1 = 0x452D
+0x93D6 = 0x6F32
+0x93D7 = 0x6F33
+0x93D8 = 0x6F36
+0x93DD = 0x6F38
+0x93E1 = 0x3640
+0x93E4 = 0x6F3B
+0x93E5 = 0x6F35
+0x93E8 = 0x6F34
+0x9403 = 0x6F3F
+0x9407 = 0x6F40
+0x9410 = 0x6F41
+0x9413 = 0x6F3E
+0x9414 = 0x6F3D
+0x9418 = 0x3E62
+0x9419 = 0x462A
+0x941A = 0x6F3C
+0x9421 = 0x6F45
+0x942B = 0x6F43
+0x9435 = 0x6F44
+0x9436 = 0x6F42
+0x9438 = 0x4278
+0x943A = 0x6F46
+0x9441 = 0x6F47
+0x9444 = 0x6F49
+0x9451 = 0x3455
+0x9452 = 0x6F48
+0x9453 = 0x4C7A
+0x945A = 0x6F54
+0x945B = 0x6F4A
+0x945E = 0x6F4D
+0x9460 = 0x6F4B
+0x9462 = 0x6F4C
+0x946A = 0x6F4E
+0x9470 = 0x6F50
+0x9475 = 0x6F51
+0x9477 = 0x6F52
+0x947C = 0x6F55
+0x947D = 0x6F53
+0x947E = 0x6F56
+0x947F = 0x6F58
+0x9481 = 0x6F57
+0x9577 = 0x4439
+0x9580 = 0x4C67
+0x9582 = 0x6F59
+0x9583 = 0x412E
+0x9587 = 0x6F5A
+0x9589 = 0x4A44
+0x958A = 0x6F5B
+0x958B = 0x332B
+0x958F = 0x313C
+0x9591 = 0x3457
+0x9593 = 0x3456
+0x9594 = 0x6F5C
+0x9596 = 0x6F5D
+0x9598 = 0x6F5E
+0x9599 = 0x6F5F
+0x95A0 = 0x6F60
+0x95A2 = 0x3458
+0x95A3 = 0x3355
+0x95A4 = 0x395E
+0x95A5 = 0x4836
+0x95A7 = 0x6F62
+0x95A8 = 0x6F61
+0x95AD = 0x6F63
+0x95B2 = 0x315C
+0x95B9 = 0x6F66
+0x95BB = 0x6F65
+0x95BC = 0x6F64
+0x95BE = 0x6F67
+0x95C3 = 0x6F6A
+0x95C7 = 0x3047
+0x95CA = 0x6F68
+0x95CC = 0x6F6C
+0x95CD = 0x6F6B
+0x95D4 = 0x6F6E
+0x95D5 = 0x6F6D
+0x95D6 = 0x6F6F
+0x95D8 = 0x462E
+0x95DC = 0x6F70
+0x95E1 = 0x6F71
+0x95E2 = 0x6F73
+0x95E5 = 0x6F72
+0x961C = 0x496C
+0x9621 = 0x6F74
+0x9628 = 0x6F75
+0x962A = 0x3A65
+0x962E = 0x6F76
+0x962F = 0x6F77
+0x9632 = 0x4B49
+0x963B = 0x414B
+0x963F = 0x3024
+0x9640 = 0x424B
+0x9642 = 0x6F78
+0x9644 = 0x496D
+0x964B = 0x6F7B
+0x964C = 0x6F79
+0x964D = 0x395F
+0x964F = 0x6F7A
+0x9650 = 0x3842
+0x965B = 0x4A45
+0x965C = 0x6F7D
+0x965D = 0x7021
+0x965E = 0x6F7E
+0x965F = 0x7022
+0x9662 = 0x3121
+0x9663 = 0x3F58
+0x9664 = 0x3D7C
+0x9665 = 0x3459
+0x9666 = 0x7023
+0x966A = 0x4766
+0x966C = 0x7025
+0x9670 = 0x3122
+0x9672 = 0x7024
+0x9673 = 0x4444
+0x9675 = 0x4E4D
+0x9676 = 0x462B
+0x9677 = 0x6F7C
+0x9678 = 0x4E26
+0x967A = 0x3831
+0x967D = 0x4D5B
+0x9685 = 0x3679
+0x9686 = 0x4E34
+0x9688 = 0x3728
+0x968A = 0x4262
+0x968B = 0x6721
+0x968D = 0x7026
+0x968E = 0x332C
+0x968F = 0x3F6F
+0x9694 = 0x3356
+0x9695 = 0x7028
+0x9697 = 0x7029
+0x9698 = 0x7027
+0x9699 = 0x3764
+0x969B = 0x3A5D
+0x969C = 0x3E63
+0x96A0 = 0x3123
+0x96A3 = 0x4E59
+0x96A7 = 0x702B
+0x96A8 = 0x6E2E
+0x96AA = 0x702A
+0x96B0 = 0x702E
+0x96B1 = 0x702C
+0x96B2 = 0x702D
+0x96B4 = 0x702F
+0x96B6 = 0x7030
+0x96B7 = 0x4E6C
+0x96B8 = 0x7031
+0x96B9 = 0x7032
+0x96BB = 0x4049
+0x96BC = 0x483B
+0x96C0 = 0x3F7D
+0x96C1 = 0x3467
+0x96C4 = 0x4D3A
+0x96C5 = 0x326D
+0x96C6 = 0x3D38
+0x96C7 = 0x385B
+0x96C9 = 0x7035
+0x96CB = 0x7034
+0x96CC = 0x3B73
+0x96CD = 0x7036
+0x96CE = 0x7033
+0x96D1 = 0x3B28
+0x96D5 = 0x703A
+0x96D6 = 0x6A2D
+0x96D9 = 0x5256
+0x96DB = 0x3F77
+0x96DC = 0x7038
+0x96E2 = 0x4E25
+0x96E3 = 0x4671
+0x96E8 = 0x312B
+0x96EA = 0x4063
+0x96EB = 0x3C36
+0x96F0 = 0x4A37
+0x96F2 = 0x3140
+0x96F6 = 0x4E6D
+0x96F7 = 0x4D6B
+0x96F9 = 0x703B
+0x96FB = 0x4545
+0x9700 = 0x3C7B
+0x9704 = 0x703C
+0x9706 = 0x703D
+0x9707 = 0x3F4C
+0x9708 = 0x703E
+0x970A = 0x4E6E
+0x970D = 0x7039
+0x970E = 0x7040
+0x970F = 0x7042
+0x9711 = 0x7041
+0x9713 = 0x703F
+0x9716 = 0x7043
+0x9719 = 0x7044
+0x971C = 0x417A
+0x971E = 0x3262
+0x9724 = 0x7045
+0x9727 = 0x4C38
+0x972A = 0x7046
+0x9730 = 0x7047
+0x9732 = 0x4F2A
+0x9738 = 0x5B31
+0x9739 = 0x7048
+0x973D = 0x7049
+0x973E = 0x704A
+0x9742 = 0x704E
+0x9744 = 0x704B
+0x9746 = 0x704C
+0x9748 = 0x704D
+0x9749 = 0x704F
+0x9752 = 0x4044
+0x9756 = 0x4C77
+0x9759 = 0x4045
+0x975C = 0x7050
+0x975E = 0x4873
+0x9760 = 0x7051
+0x9761 = 0x7353
+0x9762 = 0x4C4C
+0x9764 = 0x7052
+0x9766 = 0x7053
+0x9768 = 0x7054
+0x9769 = 0x3357
+0x976B = 0x7056
+0x976D = 0x3F59
+0x9771 = 0x7057
+0x9774 = 0x3724
+0x9779 = 0x7058
+0x977A = 0x705C
+0x977C = 0x705A
+0x9781 = 0x705B
+0x9784 = 0x3373
+0x9785 = 0x7059
+0x9786 = 0x705D
+0x978B = 0x705E
+0x978D = 0x3048
+0x978F = 0x705F
+0x9790 = 0x7060
+0x9798 = 0x3E64
+0x979C = 0x7061
+0x97A0 = 0x3547
+0x97A3 = 0x7064
+0x97A6 = 0x7063
+0x97A8 = 0x7062
+0x97AB = 0x6B71
+0x97AD = 0x4A5C
+0x97B3 = 0x7065
+0x97B4 = 0x7066
+0x97C3 = 0x7067
+0x97C6 = 0x7068
+0x97C8 = 0x7069
+0x97CB = 0x706A
+0x97D3 = 0x345A
+0x97DC = 0x706B
+0x97ED = 0x706C
+0x97EE = 0x4723
+0x97F2 = 0x706E
+0x97F3 = 0x323B
+0x97F5 = 0x7071
+0x97F6 = 0x7070
+0x97FB = 0x3124
+0x97FF = 0x3641
+0x9801 = 0x4A47
+0x9802 = 0x443A
+0x9803 = 0x3A22
+0x9805 = 0x3960
+0x9806 = 0x3D67
+0x9808 = 0x3F5C
+0x980C = 0x7073
+0x980F = 0x7072
+0x9810 = 0x4D42
+0x9811 = 0x3468
+0x9812 = 0x4852
+0x9813 = 0x465C
+0x9817 = 0x3F7C
+0x9818 = 0x4E4E
+0x981A = 0x375B
+0x9821 = 0x7076
+0x9824 = 0x7075
+0x982C = 0x4B4B
+0x982D = 0x462C
+0x9834 = 0x3150
+0x9837 = 0x7077
+0x9838 = 0x7074
+0x983B = 0x4951
+0x983C = 0x4D6A
+0x983D = 0x7078
+0x9846 = 0x7079
+0x984B = 0x707B
+0x984C = 0x426A
+0x984D = 0x335B
+0x984E = 0x335C
+0x984F = 0x707A
+0x9854 = 0x3469
+0x9855 = 0x3832
+0x9858 = 0x346A
+0x985B = 0x453F
+0x985E = 0x4E60
+0x9867 = 0x385C
+0x986B = 0x707C
+0x986F = 0x707D
+0x9870 = 0x707E
+0x9871 = 0x7121
+0x9873 = 0x7123
+0x9874 = 0x7122
+0x98A8 = 0x4977
+0x98AA = 0x7124
+0x98AF = 0x7125
+0x98B1 = 0x7126
+0x98B6 = 0x7127
+0x98C3 = 0x7129
+0x98C4 = 0x7128
+0x98C6 = 0x712A
+0x98DB = 0x4874
+0x98DC = 0x664C
+0x98DF = 0x3F29
+0x98E2 = 0x3532
+0x98E9 = 0x712B
+0x98EB = 0x712C
+0x98ED = 0x522C
+0x98EE = 0x5D3B
+0x98EF = 0x4853
+0x98F2 = 0x307B
+0x98F4 = 0x303B
+0x98FC = 0x3B74
+0x98FD = 0x4B30
+0x98FE = 0x3E7E
+0x9903 = 0x712D
+0x9905 = 0x4C5F
+0x9909 = 0x712E
+0x990A = 0x4D5C
+0x990C = 0x3142
+0x9910 = 0x3B41
+0x9912 = 0x712F
+0x9913 = 0x326E
+0x9914 = 0x7130
+0x9918 = 0x7131
+0x991D = 0x7133
+0x991E = 0x7134
+0x9920 = 0x7136
+0x9921 = 0x7132
+0x9924 = 0x7135
+0x9928 = 0x345B
+0x992C = 0x7137
+0x992E = 0x7138
+0x993D = 0x7139
+0x993E = 0x713A
+0x9942 = 0x713B
+0x9945 = 0x713D
+0x9949 = 0x713C
+0x994B = 0x713F
+0x994C = 0x7142
+0x9950 = 0x713E
+0x9951 = 0x7140
+0x9952 = 0x7141
+0x9955 = 0x7143
+0x9957 = 0x3642
+0x9996 = 0x3C73
+0x9997 = 0x7144
+0x9998 = 0x7145
+0x9999 = 0x3961
+0x99A5 = 0x7146
+0x99A8 = 0x333E
+0x99AC = 0x474F
+0x99AD = 0x7147
+0x99AE = 0x7148
+0x99B3 = 0x435A
+0x99B4 = 0x466B
+0x99BC = 0x7149
+0x99C1 = 0x477D
+0x99C4 = 0x424C
+0x99C5 = 0x3158
+0x99C6 = 0x366E
+0x99C8 = 0x366F
+0x99D0 = 0x4373
+0x99D1 = 0x714E
+0x99D2 = 0x3670
+0x99D5 = 0x326F
+0x99D8 = 0x714D
+0x99DB = 0x714B
+0x99DD = 0x714C
+0x99DF = 0x714A
+0x99E2 = 0x7158
+0x99ED = 0x714F
+0x99EE = 0x7150
+0x99F1 = 0x7151
+0x99F2 = 0x7152
+0x99F8 = 0x7154
+0x99FB = 0x7153
+0x99FF = 0x3D59
+0x9A01 = 0x7155
+0x9A05 = 0x7157
+0x9A0E = 0x3533
+0x9A0F = 0x7156
+0x9A12 = 0x417B
+0x9A13 = 0x3833
+0x9A19 = 0x7159
+0x9A28 = 0x424D
+0x9A2B = 0x715A
+0x9A30 = 0x462D
+0x9A37 = 0x715B
+0x9A3E = 0x7160
+0x9A40 = 0x715E
+0x9A42 = 0x715D
+0x9A43 = 0x715F
+0x9A45 = 0x715C
+0x9A4D = 0x7162
+0x9A55 = 0x7161
+0x9A57 = 0x7164
+0x9A5A = 0x3643
+0x9A5B = 0x7163
+0x9A5F = 0x7165
+0x9A62 = 0x7166
+0x9A64 = 0x7168
+0x9A65 = 0x7167
+0x9A69 = 0x7169
+0x9A6A = 0x716B
+0x9A6B = 0x716A
+0x9AA8 = 0x397C
+0x9AAD = 0x716C
+0x9AB0 = 0x716D
+0x9AB8 = 0x333C
+0x9ABC = 0x716E
+0x9AC0 = 0x716F
+0x9AC4 = 0x3F71
+0x9ACF = 0x7170
+0x9AD1 = 0x7171
+0x9AD3 = 0x7172
+0x9AD4 = 0x7173
+0x9AD8 = 0x3962
+0x9ADE = 0x7174
+0x9ADF = 0x7175
+0x9AE2 = 0x7176
+0x9AE3 = 0x7177
+0x9AE6 = 0x7178
+0x9AEA = 0x4831
+0x9AEB = 0x717A
+0x9AED = 0x4926
+0x9AEE = 0x717B
+0x9AEF = 0x7179
+0x9AF1 = 0x717D
+0x9AF4 = 0x717C
+0x9AF7 = 0x717E
+0x9AFB = 0x7221
+0x9B06 = 0x7222
+0x9B18 = 0x7223
+0x9B1A = 0x7224
+0x9B1F = 0x7225
+0x9B22 = 0x7226
+0x9B23 = 0x7227
+0x9B25 = 0x7228
+0x9B27 = 0x7229
+0x9B28 = 0x722A
+0x9B29 = 0x722B
+0x9B2A = 0x722C
+0x9B2E = 0x722D
+0x9B2F = 0x722E
+0x9B31 = 0x5D35
+0x9B32 = 0x722F
+0x9B3B = 0x6478
+0x9B3C = 0x3534
+0x9B41 = 0x3321
+0x9B42 = 0x3A32
+0x9B43 = 0x7231
+0x9B44 = 0x7230
+0x9B45 = 0x4C25
+0x9B4D = 0x7233
+0x9B4E = 0x7234
+0x9B4F = 0x7232
+0x9B51 = 0x7235
+0x9B54 = 0x4B62
+0x9B58 = 0x7236
+0x9B5A = 0x357B
+0x9B6F = 0x4F25
+0x9B74 = 0x7237
+0x9B83 = 0x7239
+0x9B8E = 0x303E
+0x9B91 = 0x723A
+0x9B92 = 0x4A2B
+0x9B93 = 0x7238
+0x9B96 = 0x723B
+0x9B97 = 0x723C
+0x9B9F = 0x723D
+0x9BA0 = 0x723E
+0x9BA8 = 0x723F
+0x9BAA = 0x4B6E
+0x9BAB = 0x3B2D
+0x9BAD = 0x3A7A
+0x9BAE = 0x412F
+0x9BB4 = 0x7240
+0x9BB9 = 0x7243
+0x9BC0 = 0x7241
+0x9BC6 = 0x7244
+0x9BC9 = 0x3871
+0x9BCA = 0x7242
+0x9BCF = 0x7245
+0x9BD1 = 0x7246
+0x9BD2 = 0x7247
+0x9BD4 = 0x724B
+0x9BD6 = 0x3B2A
+0x9BDB = 0x4264
+0x9BE1 = 0x724C
+0x9BE2 = 0x7249
+0x9BE3 = 0x7248
+0x9BE4 = 0x724A
+0x9BE8 = 0x375F
+0x9BF0 = 0x7250
+0x9BF1 = 0x724F
+0x9BF2 = 0x724E
+0x9BF5 = 0x3033
+0x9C04 = 0x725A
+0x9C06 = 0x7256
+0x9C08 = 0x7257
+0x9C09 = 0x7253
+0x9C0A = 0x7259
+0x9C0C = 0x7255
+0x9C0D = 0x3362
+0x9C10 = 0x4F4C
+0x9C12 = 0x7258
+0x9C13 = 0x7254
+0x9C14 = 0x7252
+0x9C15 = 0x7251
+0x9C1B = 0x725C
+0x9C21 = 0x725F
+0x9C24 = 0x725E
+0x9C25 = 0x725D
+0x9C2D = 0x4949
+0x9C2E = 0x725B
+0x9C2F = 0x3073
+0x9C30 = 0x7260
+0x9C32 = 0x7262
+0x9C39 = 0x336F
+0x9C3A = 0x724D
+0x9C3B = 0x3137
+0x9C3E = 0x7264
+0x9C46 = 0x7263
+0x9C47 = 0x7261
+0x9C48 = 0x432D
+0x9C52 = 0x4B70
+0x9C57 = 0x4E5A
+0x9C5A = 0x7265
+0x9C60 = 0x7266
+0x9C67 = 0x7267
+0x9C76 = 0x7268
+0x9C78 = 0x7269
+0x9CE5 = 0x443B
+0x9CE7 = 0x726A
+0x9CE9 = 0x4837
+0x9CEB = 0x726F
+0x9CEC = 0x726B
+0x9CF0 = 0x726C
+0x9CF3 = 0x4B31
+0x9CF4 = 0x4C44
+0x9CF6 = 0x4650
+0x9D03 = 0x7270
+0x9D06 = 0x7271
+0x9D07 = 0x463E
+0x9D08 = 0x726E
+0x9D09 = 0x726D
+0x9D0E = 0x322A
+0x9D12 = 0x7279
+0x9D15 = 0x7278
+0x9D1B = 0x3175
+0x9D1F = 0x7276
+0x9D23 = 0x7275
+0x9D26 = 0x7273
+0x9D28 = 0x337B
+0x9D2A = 0x7272
+0x9D2B = 0x3C32
+0x9D2C = 0x3229
+0x9D3B = 0x3963
+0x9D3E = 0x727C
+0x9D3F = 0x727B
+0x9D41 = 0x727A
+0x9D44 = 0x7277
+0x9D46 = 0x727D
+0x9D48 = 0x727E
+0x9D50 = 0x7325
+0x9D51 = 0x7324
+0x9D59 = 0x7326
+0x9D5C = 0x312D
+0x9D5D = 0x7321
+0x9D5E = 0x7322
+0x9D60 = 0x3974
+0x9D61 = 0x4C39
+0x9D64 = 0x7323
+0x9D6C = 0x4B32
+0x9D6F = 0x732B
+0x9D72 = 0x7327
+0x9D7A = 0x732C
+0x9D87 = 0x7329
+0x9D89 = 0x7328
+0x9D8F = 0x375C
+0x9D9A = 0x732D
+0x9DA4 = 0x732E
+0x9DA9 = 0x732F
+0x9DAB = 0x732A
+0x9DAF = 0x7274
+0x9DB2 = 0x7330
+0x9DB4 = 0x4461
+0x9DB8 = 0x7334
+0x9DBA = 0x7335
+0x9DBB = 0x7333
+0x9DC1 = 0x7332
+0x9DC2 = 0x7338
+0x9DC4 = 0x7331
+0x9DC6 = 0x7336
+0x9DCF = 0x7337
+0x9DD3 = 0x733A
+0x9DD9 = 0x7339
+0x9DE6 = 0x733C
+0x9DED = 0x733D
+0x9DEF = 0x733E
+0x9DF2 = 0x4F49
+0x9DF8 = 0x733B
+0x9DF9 = 0x426B
+0x9DFA = 0x3A6D
+0x9DFD = 0x733F
+0x9E1A = 0x7340
+0x9E1B = 0x7341
+0x9E1E = 0x7342
+0x9E75 = 0x7343
+0x9E78 = 0x3834
+0x9E79 = 0x7344
+0x9E7D = 0x7345
+0x9E7F = 0x3C2F
+0x9E81 = 0x7346
+0x9E88 = 0x7347
+0x9E8B = 0x7348
+0x9E8C = 0x7349
+0x9E91 = 0x734C
+0x9E92 = 0x734A
+0x9E93 = 0x4F3C
+0x9E95 = 0x734B
+0x9E97 = 0x4E6F
+0x9E9D = 0x734D
+0x9E9F = 0x4E5B
+0x9EA5 = 0x734E
+0x9EA6 = 0x477E
+0x9EA9 = 0x734F
+0x9EAA = 0x7351
+0x9EAD = 0x7352
+0x9EB8 = 0x7350
+0x9EB9 = 0x396D
+0x9EBA = 0x4C4D
+0x9EBB = 0x4B63
+0x9EBC = 0x5677
+0x9EBE = 0x5D60
+0x9EBF = 0x4B7B
+0x9EC4 = 0x322B
+0x9ECC = 0x7354
+0x9ECD = 0x3550
+0x9ECE = 0x7355
+0x9ECF = 0x7356
+0x9ED0 = 0x7357
+0x9ED2 = 0x3975
+0x9ED4 = 0x7358
+0x9ED8 = 0x6054
+0x9ED9 = 0x4C5B
+0x9EDB = 0x4263
+0x9EDC = 0x7359
+0x9EDD = 0x735B
+0x9EDE = 0x735A
+0x9EE0 = 0x735C
+0x9EE5 = 0x735D
+0x9EE8 = 0x735E
+0x9EEF = 0x735F
+0x9EF4 = 0x7360
+0x9EF6 = 0x7361
+0x9EF7 = 0x7362
+0x9EF9 = 0x7363
+0x9EFB = 0x7364
+0x9EFC = 0x7365
+0x9EFD = 0x7366
+0x9F07 = 0x7367
+0x9F08 = 0x7368
+0x9F0E = 0x4524
+0x9F13 = 0x385D
+0x9F15 = 0x736A
+0x9F20 = 0x414D
+0x9F21 = 0x736B
+0x9F2C = 0x736C
+0x9F3B = 0x4921
+0x9F3E = 0x736D
+0x9F4A = 0x736E
+0x9F4B = 0x6337
+0x9F4E = 0x6C5A
+0x9F4F = 0x706D
+0x9F52 = 0x736F
+0x9F54 = 0x7370
+0x9F5F = 0x7372
+0x9F60 = 0x7373
+0x9F61 = 0x7374
+0x9F62 = 0x4E70
+0x9F63 = 0x7371
+0x9F66 = 0x7375
+0x9F67 = 0x7376
+0x9F6A = 0x7378
+0x9F6C = 0x7377
+0x9F72 = 0x737A
+0x9F76 = 0x737B
+0x9F77 = 0x7379
+0x9F8D = 0x4E36
+0x9F95 = 0x737C
+0x9F9C = 0x737D
+0x9F9D = 0x6354
+0x9FA0 = 0x737E
+0xFF01 = 0x212A
+0xFF03 = 0x2174
+0xFF04 = 0x2170
+0xFF05 = 0x2173
+0xFF06 = 0x2175
+0xFF08 = 0x214A
+0xFF09 = 0x214B
+0xFF0A = 0x2176
+0xFF0B = 0x215C
+0xFF0C = 0x2124
+0xFF0D = 0x215D
+0xFF0E = 0x2125
+0xFF0F = 0x213F
+0xFF10 = 0x2330
+0xFF11 = 0x2331
+0xFF12 = 0x2332
+0xFF13 = 0x2333
+0xFF14 = 0x2334
+0xFF15 = 0x2335
+0xFF16 = 0x2336
+0xFF17 = 0x2337
+0xFF18 = 0x2338
+0xFF19 = 0x2339
+0xFF1A = 0x2127
+0xFF1B = 0x2128
+0xFF1C = 0x2163
+0xFF1D = 0x2161
+0xFF1E = 0x2164
+0xFF1F = 0x2129
+0xFF20 = 0x2177
+0xFF21 = 0x2341
+0xFF22 = 0x2342
+0xFF23 = 0x2343
+0xFF24 = 0x2344
+0xFF25 = 0x2345
+0xFF26 = 0x2346
+0xFF27 = 0x2347
+0xFF28 = 0x2348
+0xFF29 = 0x2349
+0xFF2A = 0x234A
+0xFF2B = 0x234B
+0xFF2C = 0x234C
+0xFF2D = 0x234D
+0xFF2E = 0x234E
+0xFF2F = 0x234F
+0xFF30 = 0x2350
+0xFF31 = 0x2351
+0xFF32 = 0x2352
+0xFF33 = 0x2353
+0xFF34 = 0x2354
+0xFF35 = 0x2355
+0xFF36 = 0x2356
+0xFF37 = 0x2357
+0xFF38 = 0x2358
+0xFF39 = 0x2359
+0xFF3A = 0x235A
+0xFF3B = 0x214E
+0xFF3C = 0x2140
+0xFF3D = 0x214F
+0xFF3E = 0x2130
+0xFF3F = 0x2132
+0xFF40 = 0x212E
+0xFF41 = 0x2361
+0xFF42 = 0x2362
+0xFF43 = 0x2363
+0xFF44 = 0x2364
+0xFF45 = 0x2365
+0xFF46 = 0x2366
+0xFF47 = 0x2367
+0xFF48 = 0x2368
+0xFF49 = 0x2369
+0xFF4A = 0x236A
+0xFF4B = 0x236B
+0xFF4C = 0x236C
+0xFF4D = 0x236D
+0xFF4E = 0x236E
+0xFF4F = 0x236F
+0xFF50 = 0x2370
+0xFF51 = 0x2371
+0xFF52 = 0x2372
+0xFF53 = 0x2373
+0xFF54 = 0x2374
+0xFF55 = 0x2375
+0xFF56 = 0x2376
+0xFF57 = 0x2377
+0xFF58 = 0x2378
+0xFF59 = 0x2379
+0xFF5A = 0x237A
+0xFF5B = 0x2150
+0xFF5C = 0x2143
+0xFF5D = 0x2151
+0xFF5E = 0x2141
+0xFFE0 = 0x2171
+0xFFE1 = 0x2172
+0xFFE2 = 0x224C
+0xFFE3 = 0x2131
+0xFFE5 = 0x216F
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208UDC.src b/enc/trans/JIS/UCS%JISX0208UDC.src
new file mode 100644
index 0000000000..0604f6e4eb
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0208UDC.src
@@ -0,0 +1,955 @@
+# $NetBSD: UCS%JISX0208UDC.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0208UDC"
+SRC_ZONE	0xE000 - 0xE3AB
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xE000 - 0xE3AB		= INVALID
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0xE000 = 0x7521
+0xE001 = 0x7522
+0xE002 = 0x7523
+0xE003 = 0x7524
+0xE004 = 0x7525
+0xE005 = 0x7526
+0xE006 = 0x7527
+0xE007 = 0x7528
+0xE008 = 0x7529
+0xE009 = 0x752A
+0xE00A = 0x752B
+0xE00B = 0x752C
+0xE00C = 0x752D
+0xE00D = 0x752E
+0xE00E = 0x752F
+0xE00F = 0x7530
+0xE010 = 0x7531
+0xE011 = 0x7532
+0xE012 = 0x7533
+0xE013 = 0x7534
+0xE014 = 0x7535
+0xE015 = 0x7536
+0xE016 = 0x7537
+0xE017 = 0x7538
+0xE018 = 0x7539
+0xE019 = 0x753A
+0xE01A = 0x753B
+0xE01B = 0x753C
+0xE01C = 0x753D
+0xE01D = 0x753E
+0xE01E = 0x753F
+0xE01F = 0x7540
+0xE020 = 0x7541
+0xE021 = 0x7542
+0xE022 = 0x7543
+0xE023 = 0x7544
+0xE024 = 0x7545
+0xE025 = 0x7546
+0xE026 = 0x7547
+0xE027 = 0x7548
+0xE028 = 0x7549
+0xE029 = 0x754A
+0xE02A = 0x754B
+0xE02B = 0x754C
+0xE02C = 0x754D
+0xE02D = 0x754E
+0xE02E = 0x754F
+0xE02F = 0x7550
+0xE030 = 0x7551
+0xE031 = 0x7552
+0xE032 = 0x7553
+0xE033 = 0x7554
+0xE034 = 0x7555
+0xE035 = 0x7556
+0xE036 = 0x7557
+0xE037 = 0x7558
+0xE038 = 0x7559
+0xE039 = 0x755A
+0xE03A = 0x755B
+0xE03B = 0x755C
+0xE03C = 0x755D
+0xE03D = 0x755E
+0xE03E = 0x755F
+0xE03F = 0x7560
+0xE040 = 0x7561
+0xE041 = 0x7562
+0xE042 = 0x7563
+0xE043 = 0x7564
+0xE044 = 0x7565
+0xE045 = 0x7566
+0xE046 = 0x7567
+0xE047 = 0x7568
+0xE048 = 0x7569
+0xE049 = 0x756A
+0xE04A = 0x756B
+0xE04B = 0x756C
+0xE04C = 0x756D
+0xE04D = 0x756E
+0xE04E = 0x756F
+0xE04F = 0x7570
+0xE050 = 0x7571
+0xE051 = 0x7572
+0xE052 = 0x7573
+0xE053 = 0x7574
+0xE054 = 0x7575
+0xE055 = 0x7576
+0xE056 = 0x7577
+0xE057 = 0x7578
+0xE058 = 0x7579
+0xE059 = 0x757A
+0xE05A = 0x757B
+0xE05B = 0x757C
+0xE05C = 0x757D
+0xE05D = 0x757E
+0xE05E = 0x7621
+0xE05F = 0x7622
+0xE060 = 0x7623
+0xE061 = 0x7624
+0xE062 = 0x7625
+0xE063 = 0x7626
+0xE064 = 0x7627
+0xE065 = 0x7628
+0xE066 = 0x7629
+0xE067 = 0x762A
+0xE068 = 0x762B
+0xE069 = 0x762C
+0xE06A = 0x762D
+0xE06B = 0x762E
+0xE06C = 0x762F
+0xE06D = 0x7630
+0xE06E = 0x7631
+0xE06F = 0x7632
+0xE070 = 0x7633
+0xE071 = 0x7634
+0xE072 = 0x7635
+0xE073 = 0x7636
+0xE074 = 0x7637
+0xE075 = 0x7638
+0xE076 = 0x7639
+0xE077 = 0x763A
+0xE078 = 0x763B
+0xE079 = 0x763C
+0xE07A = 0x763D
+0xE07B = 0x763E
+0xE07C = 0x763F
+0xE07D = 0x7640
+0xE07E = 0x7641
+0xE07F = 0x7642
+0xE080 = 0x7643
+0xE081 = 0x7644
+0xE082 = 0x7645
+0xE083 = 0x7646
+0xE084 = 0x7647
+0xE085 = 0x7648
+0xE086 = 0x7649
+0xE087 = 0x764A
+0xE088 = 0x764B
+0xE089 = 0x764C
+0xE08A = 0x764D
+0xE08B = 0x764E
+0xE08C = 0x764F
+0xE08D = 0x7650
+0xE08E = 0x7651
+0xE08F = 0x7652
+0xE090 = 0x7653
+0xE091 = 0x7654
+0xE092 = 0x7655
+0xE093 = 0x7656
+0xE094 = 0x7657
+0xE095 = 0x7658
+0xE096 = 0x7659
+0xE097 = 0x765A
+0xE098 = 0x765B
+0xE099 = 0x765C
+0xE09A = 0x765D
+0xE09B = 0x765E
+0xE09C = 0x765F
+0xE09D = 0x7660
+0xE09E = 0x7661
+0xE09F = 0x7662
+0xE0A0 = 0x7663
+0xE0A1 = 0x7664
+0xE0A2 = 0x7665
+0xE0A3 = 0x7666
+0xE0A4 = 0x7667
+0xE0A5 = 0x7668
+0xE0A6 = 0x7669
+0xE0A7 = 0x766A
+0xE0A8 = 0x766B
+0xE0A9 = 0x766C
+0xE0AA = 0x766D
+0xE0AB = 0x766E
+0xE0AC = 0x766F
+0xE0AD = 0x7670
+0xE0AE = 0x7671
+0xE0AF = 0x7672
+0xE0B0 = 0x7673
+0xE0B1 = 0x7674
+0xE0B2 = 0x7675
+0xE0B3 = 0x7676
+0xE0B4 = 0x7677
+0xE0B5 = 0x7678
+0xE0B6 = 0x7679
+0xE0B7 = 0x767A
+0xE0B8 = 0x767B
+0xE0B9 = 0x767C
+0xE0BA = 0x767D
+0xE0BB = 0x767E
+0xE0BC = 0x7721
+0xE0BD = 0x7722
+0xE0BE = 0x7723
+0xE0BF = 0x7724
+0xE0C0 = 0x7725
+0xE0C1 = 0x7726
+0xE0C2 = 0x7727
+0xE0C3 = 0x7728
+0xE0C4 = 0x7729
+0xE0C5 = 0x772A
+0xE0C6 = 0x772B
+0xE0C7 = 0x772C
+0xE0C8 = 0x772D
+0xE0C9 = 0x772E
+0xE0CA = 0x772F
+0xE0CB = 0x7730
+0xE0CC = 0x7731
+0xE0CD = 0x7732
+0xE0CE = 0x7733
+0xE0CF = 0x7734
+0xE0D0 = 0x7735
+0xE0D1 = 0x7736
+0xE0D2 = 0x7737
+0xE0D3 = 0x7738
+0xE0D4 = 0x7739
+0xE0D5 = 0x773A
+0xE0D6 = 0x773B
+0xE0D7 = 0x773C
+0xE0D8 = 0x773D
+0xE0D9 = 0x773E
+0xE0DA = 0x773F
+0xE0DB = 0x7740
+0xE0DC = 0x7741
+0xE0DD = 0x7742
+0xE0DE = 0x7743
+0xE0DF = 0x7744
+0xE0E0 = 0x7745
+0xE0E1 = 0x7746
+0xE0E2 = 0x7747
+0xE0E3 = 0x7748
+0xE0E4 = 0x7749
+0xE0E5 = 0x774A
+0xE0E6 = 0x774B
+0xE0E7 = 0x774C
+0xE0E8 = 0x774D
+0xE0E9 = 0x774E
+0xE0EA = 0x774F
+0xE0EB = 0x7750
+0xE0EC = 0x7751
+0xE0ED = 0x7752
+0xE0EE = 0x7753
+0xE0EF = 0x7754
+0xE0F0 = 0x7755
+0xE0F1 = 0x7756
+0xE0F2 = 0x7757
+0xE0F3 = 0x7758
+0xE0F4 = 0x7759
+0xE0F5 = 0x775A
+0xE0F6 = 0x775B
+0xE0F7 = 0x775C
+0xE0F8 = 0x775D
+0xE0F9 = 0x775E
+0xE0FA = 0x775F
+0xE0FB = 0x7760
+0xE0FC = 0x7761
+0xE0FD = 0x7762
+0xE0FE = 0x7763
+0xE0FF = 0x7764
+0xE100 = 0x7765
+0xE101 = 0x7766
+0xE102 = 0x7767
+0xE103 = 0x7768
+0xE104 = 0x7769
+0xE105 = 0x776A
+0xE106 = 0x776B
+0xE107 = 0x776C
+0xE108 = 0x776D
+0xE109 = 0x776E
+0xE10A = 0x776F
+0xE10B = 0x7770
+0xE10C = 0x7771
+0xE10D = 0x7772
+0xE10E = 0x7773
+0xE10F = 0x7774
+0xE110 = 0x7775
+0xE111 = 0x7776
+0xE112 = 0x7777
+0xE113 = 0x7778
+0xE114 = 0x7779
+0xE115 = 0x777A
+0xE116 = 0x777B
+0xE117 = 0x777C
+0xE118 = 0x777D
+0xE119 = 0x777E
+0xE11A = 0x7821
+0xE11B = 0x7822
+0xE11C = 0x7823
+0xE11D = 0x7824
+0xE11E = 0x7825
+0xE11F = 0x7826
+0xE120 = 0x7827
+0xE121 = 0x7828
+0xE122 = 0x7829
+0xE123 = 0x782A
+0xE124 = 0x782B
+0xE125 = 0x782C
+0xE126 = 0x782D
+0xE127 = 0x782E
+0xE128 = 0x782F
+0xE129 = 0x7830
+0xE12A = 0x7831
+0xE12B = 0x7832
+0xE12C = 0x7833
+0xE12D = 0x7834
+0xE12E = 0x7835
+0xE12F = 0x7836
+0xE130 = 0x7837
+0xE131 = 0x7838
+0xE132 = 0x7839
+0xE133 = 0x783A
+0xE134 = 0x783B
+0xE135 = 0x783C
+0xE136 = 0x783D
+0xE137 = 0x783E
+0xE138 = 0x783F
+0xE139 = 0x7840
+0xE13A = 0x7841
+0xE13B = 0x7842
+0xE13C = 0x7843
+0xE13D = 0x7844
+0xE13E = 0x7845
+0xE13F = 0x7846
+0xE140 = 0x7847
+0xE141 = 0x7848
+0xE142 = 0x7849
+0xE143 = 0x784A
+0xE144 = 0x784B
+0xE145 = 0x784C
+0xE146 = 0x784D
+0xE147 = 0x784E
+0xE148 = 0x784F
+0xE149 = 0x7850
+0xE14A = 0x7851
+0xE14B = 0x7852
+0xE14C = 0x7853
+0xE14D = 0x7854
+0xE14E = 0x7855
+0xE14F = 0x7856
+0xE150 = 0x7857
+0xE151 = 0x7858
+0xE152 = 0x7859
+0xE153 = 0x785A
+0xE154 = 0x785B
+0xE155 = 0x785C
+0xE156 = 0x785D
+0xE157 = 0x785E
+0xE158 = 0x785F
+0xE159 = 0x7860
+0xE15A = 0x7861
+0xE15B = 0x7862
+0xE15C = 0x7863
+0xE15D = 0x7864
+0xE15E = 0x7865
+0xE15F = 0x7866
+0xE160 = 0x7867
+0xE161 = 0x7868
+0xE162 = 0x7869
+0xE163 = 0x786A
+0xE164 = 0x786B
+0xE165 = 0x786C
+0xE166 = 0x786D
+0xE167 = 0x786E
+0xE168 = 0x786F
+0xE169 = 0x7870
+0xE16A = 0x7871
+0xE16B = 0x7872
+0xE16C = 0x7873
+0xE16D = 0x7874
+0xE16E = 0x7875
+0xE16F = 0x7876
+0xE170 = 0x7877
+0xE171 = 0x7878
+0xE172 = 0x7879
+0xE173 = 0x787A
+0xE174 = 0x787B
+0xE175 = 0x787C
+0xE176 = 0x787D
+0xE177 = 0x787E
+0xE178 = 0x7921
+0xE179 = 0x7922
+0xE17A = 0x7923
+0xE17B = 0x7924
+0xE17C = 0x7925
+0xE17D = 0x7926
+0xE17E = 0x7927
+0xE17F = 0x7928
+0xE180 = 0x7929
+0xE181 = 0x792A
+0xE182 = 0x792B
+0xE183 = 0x792C
+0xE184 = 0x792D
+0xE185 = 0x792E
+0xE186 = 0x792F
+0xE187 = 0x7930
+0xE188 = 0x7931
+0xE189 = 0x7932
+0xE18A = 0x7933
+0xE18B = 0x7934
+0xE18C = 0x7935
+0xE18D = 0x7936
+0xE18E = 0x7937
+0xE18F = 0x7938
+0xE190 = 0x7939
+0xE191 = 0x793A
+0xE192 = 0x793B
+0xE193 = 0x793C
+0xE194 = 0x793D
+0xE195 = 0x793E
+0xE196 = 0x793F
+0xE197 = 0x7940
+0xE198 = 0x7941
+0xE199 = 0x7942
+0xE19A = 0x7943
+0xE19B = 0x7944
+0xE19C = 0x7945
+0xE19D = 0x7946
+0xE19E = 0x7947
+0xE19F = 0x7948
+0xE1A0 = 0x7949
+0xE1A1 = 0x794A
+0xE1A2 = 0x794B
+0xE1A3 = 0x794C
+0xE1A4 = 0x794D
+0xE1A5 = 0x794E
+0xE1A6 = 0x794F
+0xE1A7 = 0x7950
+0xE1A8 = 0x7951
+0xE1A9 = 0x7952
+0xE1AA = 0x7953
+0xE1AB = 0x7954
+0xE1AC = 0x7955
+0xE1AD = 0x7956
+0xE1AE = 0x7957
+0xE1AF = 0x7958
+0xE1B0 = 0x7959
+0xE1B1 = 0x795A
+0xE1B2 = 0x795B
+0xE1B3 = 0x795C
+0xE1B4 = 0x795D
+0xE1B5 = 0x795E
+0xE1B6 = 0x795F
+0xE1B7 = 0x7960
+0xE1B8 = 0x7961
+0xE1B9 = 0x7962
+0xE1BA = 0x7963
+0xE1BB = 0x7964
+0xE1BC = 0x7965
+0xE1BD = 0x7966
+0xE1BE = 0x7967
+0xE1BF = 0x7968
+0xE1C0 = 0x7969
+0xE1C1 = 0x796A
+0xE1C2 = 0x796B
+0xE1C3 = 0x796C
+0xE1C4 = 0x796D
+0xE1C5 = 0x796E
+0xE1C6 = 0x796F
+0xE1C7 = 0x7970
+0xE1C8 = 0x7971
+0xE1C9 = 0x7972
+0xE1CA = 0x7973
+0xE1CB = 0x7974
+0xE1CC = 0x7975
+0xE1CD = 0x7976
+0xE1CE = 0x7977
+0xE1CF = 0x7978
+0xE1D0 = 0x7979
+0xE1D1 = 0x797A
+0xE1D2 = 0x797B
+0xE1D3 = 0x797C
+0xE1D4 = 0x797D
+0xE1D5 = 0x797E
+0xE1D6 = 0x7A21
+0xE1D7 = 0x7A22
+0xE1D8 = 0x7A23
+0xE1D9 = 0x7A24
+0xE1DA = 0x7A25
+0xE1DB = 0x7A26
+0xE1DC = 0x7A27
+0xE1DD = 0x7A28
+0xE1DE = 0x7A29
+0xE1DF = 0x7A2A
+0xE1E0 = 0x7A2B
+0xE1E1 = 0x7A2C
+0xE1E2 = 0x7A2D
+0xE1E3 = 0x7A2E
+0xE1E4 = 0x7A2F
+0xE1E5 = 0x7A30
+0xE1E6 = 0x7A31
+0xE1E7 = 0x7A32
+0xE1E8 = 0x7A33
+0xE1E9 = 0x7A34
+0xE1EA = 0x7A35
+0xE1EB = 0x7A36
+0xE1EC = 0x7A37
+0xE1ED = 0x7A38
+0xE1EE = 0x7A39
+0xE1EF = 0x7A3A
+0xE1F0 = 0x7A3B
+0xE1F1 = 0x7A3C
+0xE1F2 = 0x7A3D
+0xE1F3 = 0x7A3E
+0xE1F4 = 0x7A3F
+0xE1F5 = 0x7A40
+0xE1F6 = 0x7A41
+0xE1F7 = 0x7A42
+0xE1F8 = 0x7A43
+0xE1F9 = 0x7A44
+0xE1FA = 0x7A45
+0xE1FB = 0x7A46
+0xE1FC = 0x7A47
+0xE1FD = 0x7A48
+0xE1FE = 0x7A49
+0xE1FF = 0x7A4A
+0xE200 = 0x7A4B
+0xE201 = 0x7A4C
+0xE202 = 0x7A4D
+0xE203 = 0x7A4E
+0xE204 = 0x7A4F
+0xE205 = 0x7A50
+0xE206 = 0x7A51
+0xE207 = 0x7A52
+0xE208 = 0x7A53
+0xE209 = 0x7A54
+0xE20A = 0x7A55
+0xE20B = 0x7A56
+0xE20C = 0x7A57
+0xE20D = 0x7A58
+0xE20E = 0x7A59
+0xE20F = 0x7A5A
+0xE210 = 0x7A5B
+0xE211 = 0x7A5C
+0xE212 = 0x7A5D
+0xE213 = 0x7A5E
+0xE214 = 0x7A5F
+0xE215 = 0x7A60
+0xE216 = 0x7A61
+0xE217 = 0x7A62
+0xE218 = 0x7A63
+0xE219 = 0x7A64
+0xE21A = 0x7A65
+0xE21B = 0x7A66
+0xE21C = 0x7A67
+0xE21D = 0x7A68
+0xE21E = 0x7A69
+0xE21F = 0x7A6A
+0xE220 = 0x7A6B
+0xE221 = 0x7A6C
+0xE222 = 0x7A6D
+0xE223 = 0x7A6E
+0xE224 = 0x7A6F
+0xE225 = 0x7A70
+0xE226 = 0x7A71
+0xE227 = 0x7A72
+0xE228 = 0x7A73
+0xE229 = 0x7A74
+0xE22A = 0x7A75
+0xE22B = 0x7A76
+0xE22C = 0x7A77
+0xE22D = 0x7A78
+0xE22E = 0x7A79
+0xE22F = 0x7A7A
+0xE230 = 0x7A7B
+0xE231 = 0x7A7C
+0xE232 = 0x7A7D
+0xE233 = 0x7A7E
+0xE234 = 0x7B21
+0xE235 = 0x7B22
+0xE236 = 0x7B23
+0xE237 = 0x7B24
+0xE238 = 0x7B25
+0xE239 = 0x7B26
+0xE23A = 0x7B27
+0xE23B = 0x7B28
+0xE23C = 0x7B29
+0xE23D = 0x7B2A
+0xE23E = 0x7B2B
+0xE23F = 0x7B2C
+0xE240 = 0x7B2D
+0xE241 = 0x7B2E
+0xE242 = 0x7B2F
+0xE243 = 0x7B30
+0xE244 = 0x7B31
+0xE245 = 0x7B32
+0xE246 = 0x7B33
+0xE247 = 0x7B34
+0xE248 = 0x7B35
+0xE249 = 0x7B36
+0xE24A = 0x7B37
+0xE24B = 0x7B38
+0xE24C = 0x7B39
+0xE24D = 0x7B3A
+0xE24E = 0x7B3B
+0xE24F = 0x7B3C
+0xE250 = 0x7B3D
+0xE251 = 0x7B3E
+0xE252 = 0x7B3F
+0xE253 = 0x7B40
+0xE254 = 0x7B41
+0xE255 = 0x7B42
+0xE256 = 0x7B43
+0xE257 = 0x7B44
+0xE258 = 0x7B45
+0xE259 = 0x7B46
+0xE25A = 0x7B47
+0xE25B = 0x7B48
+0xE25C = 0x7B49
+0xE25D = 0x7B4A
+0xE25E = 0x7B4B
+0xE25F = 0x7B4C
+0xE260 = 0x7B4D
+0xE261 = 0x7B4E
+0xE262 = 0x7B4F
+0xE263 = 0x7B50
+0xE264 = 0x7B51
+0xE265 = 0x7B52
+0xE266 = 0x7B53
+0xE267 = 0x7B54
+0xE268 = 0x7B55
+0xE269 = 0x7B56
+0xE26A = 0x7B57
+0xE26B = 0x7B58
+0xE26C = 0x7B59
+0xE26D = 0x7B5A
+0xE26E = 0x7B5B
+0xE26F = 0x7B5C
+0xE270 = 0x7B5D
+0xE271 = 0x7B5E
+0xE272 = 0x7B5F
+0xE273 = 0x7B60
+0xE274 = 0x7B61
+0xE275 = 0x7B62
+0xE276 = 0x7B63
+0xE277 = 0x7B64
+0xE278 = 0x7B65
+0xE279 = 0x7B66
+0xE27A = 0x7B67
+0xE27B = 0x7B68
+0xE27C = 0x7B69
+0xE27D = 0x7B6A
+0xE27E = 0x7B6B
+0xE27F = 0x7B6C
+0xE280 = 0x7B6D
+0xE281 = 0x7B6E
+0xE282 = 0x7B6F
+0xE283 = 0x7B70
+0xE284 = 0x7B71
+0xE285 = 0x7B72
+0xE286 = 0x7B73
+0xE287 = 0x7B74
+0xE288 = 0x7B75
+0xE289 = 0x7B76
+0xE28A = 0x7B77
+0xE28B = 0x7B78
+0xE28C = 0x7B79
+0xE28D = 0x7B7A
+0xE28E = 0x7B7B
+0xE28F = 0x7B7C
+0xE290 = 0x7B7D
+0xE291 = 0x7B7E
+0xE292 = 0x7C21
+0xE293 = 0x7C22
+0xE294 = 0x7C23
+0xE295 = 0x7C24
+0xE296 = 0x7C25
+0xE297 = 0x7C26
+0xE298 = 0x7C27
+0xE299 = 0x7C28
+0xE29A = 0x7C29
+0xE29B = 0x7C2A
+0xE29C = 0x7C2B
+0xE29D = 0x7C2C
+0xE29E = 0x7C2D
+0xE29F = 0x7C2E
+0xE2A0 = 0x7C2F
+0xE2A1 = 0x7C30
+0xE2A2 = 0x7C31
+0xE2A3 = 0x7C32
+0xE2A4 = 0x7C33
+0xE2A5 = 0x7C34
+0xE2A6 = 0x7C35
+0xE2A7 = 0x7C36
+0xE2A8 = 0x7C37
+0xE2A9 = 0x7C38
+0xE2AA = 0x7C39
+0xE2AB = 0x7C3A
+0xE2AC = 0x7C3B
+0xE2AD = 0x7C3C
+0xE2AE = 0x7C3D
+0xE2AF = 0x7C3E
+0xE2B0 = 0x7C3F
+0xE2B1 = 0x7C40
+0xE2B2 = 0x7C41
+0xE2B3 = 0x7C42
+0xE2B4 = 0x7C43
+0xE2B5 = 0x7C44
+0xE2B6 = 0x7C45
+0xE2B7 = 0x7C46
+0xE2B8 = 0x7C47
+0xE2B9 = 0x7C48
+0xE2BA = 0x7C49
+0xE2BB = 0x7C4A
+0xE2BC = 0x7C4B
+0xE2BD = 0x7C4C
+0xE2BE = 0x7C4D
+0xE2BF = 0x7C4E
+0xE2C0 = 0x7C4F
+0xE2C1 = 0x7C50
+0xE2C2 = 0x7C51
+0xE2C3 = 0x7C52
+0xE2C4 = 0x7C53
+0xE2C5 = 0x7C54
+0xE2C6 = 0x7C55
+0xE2C7 = 0x7C56
+0xE2C8 = 0x7C57
+0xE2C9 = 0x7C58
+0xE2CA = 0x7C59
+0xE2CB = 0x7C5A
+0xE2CC = 0x7C5B
+0xE2CD = 0x7C5C
+0xE2CE = 0x7C5D
+0xE2CF = 0x7C5E
+0xE2D0 = 0x7C5F
+0xE2D1 = 0x7C60
+0xE2D2 = 0x7C61
+0xE2D3 = 0x7C62
+0xE2D4 = 0x7C63
+0xE2D5 = 0x7C64
+0xE2D6 = 0x7C65
+0xE2D7 = 0x7C66
+0xE2D8 = 0x7C67
+0xE2D9 = 0x7C68
+0xE2DA = 0x7C69
+0xE2DB = 0x7C6A
+0xE2DC = 0x7C6B
+0xE2DD = 0x7C6C
+0xE2DE = 0x7C6D
+0xE2DF = 0x7C6E
+0xE2E0 = 0x7C6F
+0xE2E1 = 0x7C70
+0xE2E2 = 0x7C71
+0xE2E3 = 0x7C72
+0xE2E4 = 0x7C73
+0xE2E5 = 0x7C74
+0xE2E6 = 0x7C75
+0xE2E7 = 0x7C76
+0xE2E8 = 0x7C77
+0xE2E9 = 0x7C78
+0xE2EA = 0x7C79
+0xE2EB = 0x7C7A
+0xE2EC = 0x7C7B
+0xE2ED = 0x7C7C
+0xE2EE = 0x7C7D
+0xE2EF = 0x7C7E
+0xE2F0 = 0x7D21
+0xE2F1 = 0x7D22
+0xE2F2 = 0x7D23
+0xE2F3 = 0x7D24
+0xE2F4 = 0x7D25
+0xE2F5 = 0x7D26
+0xE2F6 = 0x7D27
+0xE2F7 = 0x7D28
+0xE2F8 = 0x7D29
+0xE2F9 = 0x7D2A
+0xE2FA = 0x7D2B
+0xE2FB = 0x7D2C
+0xE2FC = 0x7D2D
+0xE2FD = 0x7D2E
+0xE2FE = 0x7D2F
+0xE2FF = 0x7D30
+0xE300 = 0x7D31
+0xE301 = 0x7D32
+0xE302 = 0x7D33
+0xE303 = 0x7D34
+0xE304 = 0x7D35
+0xE305 = 0x7D36
+0xE306 = 0x7D37
+0xE307 = 0x7D38
+0xE308 = 0x7D39
+0xE309 = 0x7D3A
+0xE30A = 0x7D3B
+0xE30B = 0x7D3C
+0xE30C = 0x7D3D
+0xE30D = 0x7D3E
+0xE30E = 0x7D3F
+0xE30F = 0x7D40
+0xE310 = 0x7D41
+0xE311 = 0x7D42
+0xE312 = 0x7D43
+0xE313 = 0x7D44
+0xE314 = 0x7D45
+0xE315 = 0x7D46
+0xE316 = 0x7D47
+0xE317 = 0x7D48
+0xE318 = 0x7D49
+0xE319 = 0x7D4A
+0xE31A = 0x7D4B
+0xE31B = 0x7D4C
+0xE31C = 0x7D4D
+0xE31D = 0x7D4E
+0xE31E = 0x7D4F
+0xE31F = 0x7D50
+0xE320 = 0x7D51
+0xE321 = 0x7D52
+0xE322 = 0x7D53
+0xE323 = 0x7D54
+0xE324 = 0x7D55
+0xE325 = 0x7D56
+0xE326 = 0x7D57
+0xE327 = 0x7D58
+0xE328 = 0x7D59
+0xE329 = 0x7D5A
+0xE32A = 0x7D5B
+0xE32B = 0x7D5C
+0xE32C = 0x7D5D
+0xE32D = 0x7D5E
+0xE32E = 0x7D5F
+0xE32F = 0x7D60
+0xE330 = 0x7D61
+0xE331 = 0x7D62
+0xE332 = 0x7D63
+0xE333 = 0x7D64
+0xE334 = 0x7D65
+0xE335 = 0x7D66
+0xE336 = 0x7D67
+0xE337 = 0x7D68
+0xE338 = 0x7D69
+0xE339 = 0x7D6A
+0xE33A = 0x7D6B
+0xE33B = 0x7D6C
+0xE33C = 0x7D6D
+0xE33D = 0x7D6E
+0xE33E = 0x7D6F
+0xE33F = 0x7D70
+0xE340 = 0x7D71
+0xE341 = 0x7D72
+0xE342 = 0x7D73
+0xE343 = 0x7D74
+0xE344 = 0x7D75
+0xE345 = 0x7D76
+0xE346 = 0x7D77
+0xE347 = 0x7D78
+0xE348 = 0x7D79
+0xE349 = 0x7D7A
+0xE34A = 0x7D7B
+0xE34B = 0x7D7C
+0xE34C = 0x7D7D
+0xE34D = 0x7D7E
+0xE34E = 0x7E21
+0xE34F = 0x7E22
+0xE350 = 0x7E23
+0xE351 = 0x7E24
+0xE352 = 0x7E25
+0xE353 = 0x7E26
+0xE354 = 0x7E27
+0xE355 = 0x7E28
+0xE356 = 0x7E29
+0xE357 = 0x7E2A
+0xE358 = 0x7E2B
+0xE359 = 0x7E2C
+0xE35A = 0x7E2D
+0xE35B = 0x7E2E
+0xE35C = 0x7E2F
+0xE35D = 0x7E30
+0xE35E = 0x7E31
+0xE35F = 0x7E32
+0xE360 = 0x7E33
+0xE361 = 0x7E34
+0xE362 = 0x7E35
+0xE363 = 0x7E36
+0xE364 = 0x7E37
+0xE365 = 0x7E38
+0xE366 = 0x7E39
+0xE367 = 0x7E3A
+0xE368 = 0x7E3B
+0xE369 = 0x7E3C
+0xE36A = 0x7E3D
+0xE36B = 0x7E3E
+0xE36C = 0x7E3F
+0xE36D = 0x7E40
+0xE36E = 0x7E41
+0xE36F = 0x7E42
+0xE370 = 0x7E43
+0xE371 = 0x7E44
+0xE372 = 0x7E45
+0xE373 = 0x7E46
+0xE374 = 0x7E47
+0xE375 = 0x7E48
+0xE376 = 0x7E49
+0xE377 = 0x7E4A
+0xE378 = 0x7E4B
+0xE379 = 0x7E4C
+0xE37A = 0x7E4D
+0xE37B = 0x7E4E
+0xE37C = 0x7E4F
+0xE37D = 0x7E50
+0xE37E = 0x7E51
+0xE37F = 0x7E52
+0xE380 = 0x7E53
+0xE381 = 0x7E54
+0xE382 = 0x7E55
+0xE383 = 0x7E56
+0xE384 = 0x7E57
+0xE385 = 0x7E58
+0xE386 = 0x7E59
+0xE387 = 0x7E5A
+0xE388 = 0x7E5B
+0xE389 = 0x7E5C
+0xE38A = 0x7E5D
+0xE38B = 0x7E5E
+0xE38C = 0x7E5F
+0xE38D = 0x7E60
+0xE38E = 0x7E61
+0xE38F = 0x7E62
+0xE390 = 0x7E63
+0xE391 = 0x7E64
+0xE392 = 0x7E65
+0xE393 = 0x7E66
+0xE394 = 0x7E67
+0xE395 = 0x7E68
+0xE396 = 0x7E69
+0xE397 = 0x7E6A
+0xE398 = 0x7E6B
+0xE399 = 0x7E6C
+0xE39A = 0x7E6D
+0xE39B = 0x7E6E
+0xE39C = 0x7E6F
+0xE39D = 0x7E70
+0xE39E = 0x7E71
+0xE39F = 0x7E72
+0xE3A0 = 0x7E73
+0xE3A1 = 0x7E74
+0xE3A2 = 0x7E75
+0xE3A3 = 0x7E76
+0xE3A4 = 0x7E77
+0xE3A5 = 0x7E78
+0xE3A6 = 0x7E79
+0xE3A7 = 0x7E7A
+0xE3A8 = 0x7E7B
+0xE3A9 = 0x7E7C
+0xE3AA = 0x7E7D
+0xE3AB = 0x7E7E
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208VDC@NEC.src b/enc/trans/JIS/UCS%JISX0208VDC@NEC.src
new file mode 100644
index 0000000000..d91f0bd2d8
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0208VDC@NEC.src
@@ -0,0 +1,98 @@
+# $NetBSD: UCS%JISX0208VDC@NEC.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0208VDC:NEC"
+SRC_ZONE	0x2116 - 0x33CD
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x2116 - 0x33CD		= INVALID
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x2116 = 0x2D62
+0x2121 = 0x2D64
+0x2160 = 0x2D35
+0x2161 = 0x2D36
+0x2162 = 0x2D37
+0x2163 = 0x2D38
+0x2164 = 0x2D39
+0x2165 = 0x2D3A
+0x2166 = 0x2D3B
+0x2167 = 0x2D3C
+0x2168 = 0x2D3D
+0x2169 = 0x2D3E
+0x2211 = 0x2D74
+0x221A = 0x2D75
+0x221F = 0x2D78
+0x2220 = 0x2D77
+0x2229 = 0x2D7B
+0x222A = 0x2D7C
+0x222B = 0x2D72
+0x222E = 0x2D73
+0x2235 = 0x2D7A
+0x2252 = 0x2D70
+0x2261 = 0x2D71
+0x22A5 = 0x2D76
+0x22BF = 0x2D79
+0x2460 = 0x2D21
+0x2461 = 0x2D22
+0x2462 = 0x2D23
+0x2463 = 0x2D24
+0x2464 = 0x2D25
+0x2465 = 0x2D26
+0x2466 = 0x2D27
+0x2467 = 0x2D28
+0x2468 = 0x2D29
+0x2469 = 0x2D2A
+0x246A = 0x2D2B
+0x246B = 0x2D2C
+0x246C = 0x2D2D
+0x246D = 0x2D2E
+0x246E = 0x2D2F
+0x246F = 0x2D30
+0x2470 = 0x2D31
+0x2471 = 0x2D32
+0x2472 = 0x2D33
+0x2473 = 0x2D34
+0x301D = 0x2D60
+0x301F = 0x2D61
+0x3231 = 0x2D6A
+0x3232 = 0x2D6B
+0x3239 = 0x2D6C
+0x32A4 = 0x2D65
+0x32A5 = 0x2D66
+0x32A6 = 0x2D67
+0x32A7 = 0x2D68
+0x32A8 = 0x2D69
+0x3303 = 0x2D46
+0x330D = 0x2D4A
+0x3314 = 0x2D41
+0x3318 = 0x2D44
+0x3322 = 0x2D42
+0x3323 = 0x2D4C
+0x3326 = 0x2D4B
+0x3327 = 0x2D45
+0x332B = 0x2D4D
+0x3336 = 0x2D47
+0x333B = 0x2D4F
+0x3349 = 0x2D40
+0x334A = 0x2D4E
+0x334D = 0x2D43
+0x3351 = 0x2D48
+0x3357 = 0x2D49
+0x337B = 0x2D5F
+0x337C = 0x2D6F
+0x337D = 0x2D6E
+0x337E = 0x2D6D
+0x338E = 0x2D53
+0x338F = 0x2D54
+0x339C = 0x2D50
+0x339D = 0x2D51
+0x339E = 0x2D52
+0x33A1 = 0x2D56
+0x33C4 = 0x2D55
+0x33CD = 0x2D63
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212.src b/enc/trans/JIS/UCS%JISX0212.src
new file mode 100644
index 0000000000..f3b2e7089b
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0212.src
@@ -0,0 +1,6170 @@
+# $NetBSD: UCS%JISX0212.src,v 1.3 2003/07/14 06:03:43 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0212"
+SRC_ZONE	0x0000 - 0x9FFF
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+#
+# This mapping data is made from the mapping data provided by Unicode, Inc.
+# Original notice:
+#
+#	Name:             JIS X 0212 (1990) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.9
+#	Table format:     Format A
+#	Date:             8 March 1994
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from JIS X 0212 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# JIS X 0212 and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between JIS X 0212 and
+# Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point.  Including all these
+#			names in this file increases its size substantially
+#			and needlessly.  The token "<CJK>" is used for the
+#			name of these characters.  If necessary, it can be
+#			expanded algorithmically by a parser or editor.
+#
+#	The entries are in JIS X 0212 order
+#
+#	The following algorithms can be used to change the hex form
+#		of JIS 0212 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x6D63 -> 0x4D43 -> 7767
+#
+#   The kanji mappings are a normative part of ISO/IEC 10646.  The
+#       non-kanji mappings are provisional, pending definition of
+#       official mappings by Japanese standards bodies
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+#	Notes:
+#
+#	1. JIS X 0212 apparently unified the following two symbols
+#	   into a single character at 0x2922:
+#	
+#	   LATIN CAPITAL LETTER D WITH STROKE
+#	   LATIN CAPITAL LETTER ETH
+#
+#	   However, JIS X 0212 maintains the distinction between
+#	   the lowercase forms of these two elements at 0x2942 and 0x2943.
+#	   Given the structre of these JIS encodings, it is clear that
+#	   0x2922 and 0x2942 are intended to be a capital/small pair.
+#	   Consequently, in the Unicode mapping, 0x2922 is treated as
+#	   LATIN CAPITAL LETTER D WITH STROKE.
+#
+# Ruby specific modification:
+#     remove 0x007E to 0x2237 conversion.
+#
+# 0x007E = 0x2237
+0x00A1 = 0x2242
+0x00A4 = 0x2270
+0x00A6 = 0x2243
+0x00A9 = 0x226D
+0x00AA = 0x226C
+0x00AE = 0x226E
+0x00AF = 0x2234
+0x00B8 = 0x2231
+0x00BA = 0x226B
+0x00BF = 0x2244
+0x00C0 = 0x2A22
+0x00C1 = 0x2A21
+0x00C2 = 0x2A24
+0x00C3 = 0x2A2A
+0x00C4 = 0x2A23
+0x00C5 = 0x2A29
+0x00C6 = 0x2921
+0x00C7 = 0x2A2E
+0x00C8 = 0x2A32
+0x00C9 = 0x2A31
+0x00CA = 0x2A34
+0x00CB = 0x2A33
+0x00CC = 0x2A40
+0x00CD = 0x2A3F
+0x00CE = 0x2A42
+0x00CF = 0x2A41
+0x00D1 = 0x2A50
+0x00D2 = 0x2A52
+0x00D3 = 0x2A51
+0x00D4 = 0x2A54
+0x00D5 = 0x2A58
+0x00D6 = 0x2A53
+0x00D8 = 0x292C
+0x00D9 = 0x2A63
+0x00DA = 0x2A62
+0x00DB = 0x2A65
+0x00DC = 0x2A64
+0x00DD = 0x2A72
+0x00DE = 0x2930
+0x00DF = 0x294E
+0x00E0 = 0x2B22
+0x00E1 = 0x2B21
+0x00E2 = 0x2B24
+0x00E3 = 0x2B2A
+0x00E4 = 0x2B23
+0x00E5 = 0x2B29
+0x00E6 = 0x2941
+0x00E7 = 0x2B2E
+0x00E8 = 0x2B32
+0x00E9 = 0x2B31
+0x00EA = 0x2B34
+0x00EB = 0x2B33
+0x00EC = 0x2B40
+0x00ED = 0x2B3F
+0x00EE = 0x2B42
+0x00EF = 0x2B41
+0x00F0 = 0x2943
+0x00F1 = 0x2B50
+0x00F2 = 0x2B52
+0x00F3 = 0x2B51
+0x00F4 = 0x2B54
+0x00F5 = 0x2B58
+0x00F6 = 0x2B53
+0x00F8 = 0x294C
+0x00F9 = 0x2B63
+0x00FA = 0x2B62
+0x00FB = 0x2B65
+0x00FC = 0x2B64
+0x00FD = 0x2B72
+0x00FE = 0x2950
+0x00FF = 0x2B73
+0x0100 = 0x2A27
+0x0101 = 0x2B27
+0x0102 = 0x2A25
+0x0103 = 0x2B25
+0x0104 = 0x2A28
+0x0105 = 0x2B28
+0x0106 = 0x2A2B
+0x0107 = 0x2B2B
+0x0108 = 0x2A2C
+0x0109 = 0x2B2C
+0x010A = 0x2A2F
+0x010B = 0x2B2F
+0x010C = 0x2A2D
+0x010D = 0x2B2D
+0x010E = 0x2A30
+0x010F = 0x2B30
+0x0110 = 0x2922
+0x0111 = 0x2942
+0x0112 = 0x2A37
+0x0113 = 0x2B37
+0x0116 = 0x2A36
+0x0117 = 0x2B36
+0x0118 = 0x2A38
+0x0119 = 0x2B38
+0x011A = 0x2A35
+0x011B = 0x2B35
+0x011C = 0x2A3A
+0x011D = 0x2B3A
+0x011E = 0x2A3B
+0x011F = 0x2B3B
+0x0120 = 0x2A3D
+0x0121 = 0x2B3D
+0x0122 = 0x2A3C
+0x0124 = 0x2A3E
+0x0125 = 0x2B3E
+0x0126 = 0x2924
+0x0127 = 0x2944
+0x0128 = 0x2A47
+0x0129 = 0x2B47
+0x012A = 0x2A45
+0x012B = 0x2B45
+0x012E = 0x2A46
+0x012F = 0x2B46
+0x0130 = 0x2A44
+0x0131 = 0x2945
+0x0132 = 0x2926
+0x0133 = 0x2946
+0x0134 = 0x2A48
+0x0135 = 0x2B48
+0x0136 = 0x2A49
+0x0137 = 0x2B49
+0x0138 = 0x2947
+0x0139 = 0x2A4A
+0x013A = 0x2B4A
+0x013B = 0x2A4C
+0x013C = 0x2B4C
+0x013D = 0x2A4B
+0x013E = 0x2B4B
+0x013F = 0x2929
+0x0140 = 0x2949
+0x0141 = 0x2928
+0x0142 = 0x2948
+0x0143 = 0x2A4D
+0x0144 = 0x2B4D
+0x0145 = 0x2A4F
+0x0146 = 0x2B4F
+0x0147 = 0x2A4E
+0x0148 = 0x2B4E
+0x0149 = 0x294A
+0x014A = 0x292B
+0x014B = 0x294B
+0x014C = 0x2A57
+0x014D = 0x2B57
+0x0150 = 0x2A56
+0x0151 = 0x2B56
+0x0152 = 0x292D
+0x0153 = 0x294D
+0x0154 = 0x2A59
+0x0155 = 0x2B59
+0x0156 = 0x2A5B
+0x0157 = 0x2B5B
+0x0158 = 0x2A5A
+0x0159 = 0x2B5A
+0x015A = 0x2A5C
+0x015B = 0x2B5C
+0x015C = 0x2A5D
+0x015D = 0x2B5D
+0x015E = 0x2A5F
+0x015F = 0x2B5F
+0x0160 = 0x2A5E
+0x0161 = 0x2B5E
+0x0162 = 0x2A61
+0x0163 = 0x2B61
+0x0164 = 0x2A60
+0x0165 = 0x2B60
+0x0166 = 0x292F
+0x0167 = 0x294F
+0x0168 = 0x2A6C
+0x0169 = 0x2B6C
+0x016A = 0x2A69
+0x016B = 0x2B69
+0x016C = 0x2A66
+0x016D = 0x2B66
+0x016E = 0x2A6B
+0x016F = 0x2B6B
+0x0170 = 0x2A68
+0x0171 = 0x2B68
+0x0172 = 0x2A6A
+0x0173 = 0x2B6A
+0x0174 = 0x2A71
+0x0175 = 0x2B71
+0x0176 = 0x2A74
+0x0177 = 0x2B74
+0x0178 = 0x2A73
+0x0179 = 0x2A75
+0x017A = 0x2B75
+0x017B = 0x2A77
+0x017C = 0x2B77
+0x017D = 0x2A76
+0x017E = 0x2B76
+0x01CD = 0x2A26
+0x01CE = 0x2B26
+0x01CF = 0x2A43
+0x01D0 = 0x2B43
+0x01D1 = 0x2A55
+0x01D2 = 0x2B55
+0x01D3 = 0x2A67
+0x01D4 = 0x2B67
+0x01D5 = 0x2A70
+0x01D6 = 0x2B70
+0x01D7 = 0x2A6D
+0x01D8 = 0x2B6D
+0x01D9 = 0x2A6F
+0x01DA = 0x2B6F
+0x01DB = 0x2A6E
+0x01DC = 0x2B6E
+0x01F5 = 0x2B39
+0x02C7 = 0x2230
+0x02D8 = 0x222F
+0x02D9 = 0x2232
+0x02DA = 0x2236
+0x02DB = 0x2235
+0x02DD = 0x2233
+0x0384 = 0x2238
+0x0385 = 0x2239
+0x0386 = 0x2661
+0x0388 = 0x2662
+0x0389 = 0x2663
+0x038A = 0x2664
+0x038C = 0x2667
+0x038E = 0x2669
+0x038F = 0x266C
+0x0390 = 0x2676
+0x03AA = 0x2665
+0x03AB = 0x266A
+0x03AC = 0x2671
+0x03AD = 0x2672
+0x03AE = 0x2673
+0x03AF = 0x2674
+0x03B0 = 0x267B
+0x03C2 = 0x2678
+0x03CA = 0x2675
+0x03CB = 0x267A
+0x03CC = 0x2677
+0x03CD = 0x2679
+0x03CE = 0x267C
+0x0402 = 0x2742
+0x0403 = 0x2743
+0x0404 = 0x2744
+0x0405 = 0x2745
+0x0406 = 0x2746
+0x0407 = 0x2747
+0x0408 = 0x2748
+0x0409 = 0x2749
+0x040A = 0x274A
+0x040B = 0x274B
+0x040C = 0x274C
+0x040E = 0x274D
+0x040F = 0x274E
+0x0452 = 0x2772
+0x0453 = 0x2773
+0x0454 = 0x2774
+0x0455 = 0x2775
+0x0456 = 0x2776
+0x0457 = 0x2777
+0x0458 = 0x2778
+0x0459 = 0x2779
+0x045A = 0x277A
+0x045B = 0x277B
+0x045C = 0x277C
+0x045E = 0x277D
+0x045F = 0x277E
+0x2116 = 0x2271
+0x2122 = 0x226F
+0x4E02 = 0x3021
+0x4E04 = 0x3022
+0x4E05 = 0x3023
+0x4E0C = 0x3024
+0x4E12 = 0x3025
+0x4E1F = 0x3026
+0x4E23 = 0x3027
+0x4E24 = 0x3028
+0x4E28 = 0x3029
+0x4E2B = 0x302A
+0x4E2E = 0x302B
+0x4E2F = 0x302C
+0x4E30 = 0x302D
+0x4E35 = 0x302E
+0x4E40 = 0x302F
+0x4E41 = 0x3030
+0x4E44 = 0x3031
+0x4E47 = 0x3032
+0x4E51 = 0x3033
+0x4E5A = 0x3034
+0x4E5C = 0x3035
+0x4E63 = 0x3036
+0x4E68 = 0x3037
+0x4E69 = 0x3038
+0x4E74 = 0x3039
+0x4E75 = 0x303A
+0x4E79 = 0x303B
+0x4E7F = 0x303C
+0x4E8D = 0x303D
+0x4E96 = 0x303E
+0x4E97 = 0x303F
+0x4E9D = 0x3040
+0x4EAF = 0x3041
+0x4EB9 = 0x3042
+0x4EC3 = 0x3043
+0x4ED0 = 0x3044
+0x4EDA = 0x3045
+0x4EDB = 0x3046
+0x4EE0 = 0x3047
+0x4EE1 = 0x3048
+0x4EE2 = 0x3049
+0x4EE8 = 0x304A
+0x4EEF = 0x304B
+0x4EF1 = 0x304C
+0x4EF3 = 0x304D
+0x4EF5 = 0x304E
+0x4EFD = 0x304F
+0x4EFE = 0x3050
+0x4EFF = 0x3051
+0x4F00 = 0x3052
+0x4F02 = 0x3053
+0x4F03 = 0x3054
+0x4F08 = 0x3055
+0x4F0B = 0x3056
+0x4F0C = 0x3057
+0x4F12 = 0x3058
+0x4F15 = 0x3059
+0x4F16 = 0x305A
+0x4F17 = 0x305B
+0x4F19 = 0x305C
+0x4F2E = 0x305D
+0x4F31 = 0x305E
+0x4F33 = 0x3060
+0x4F35 = 0x3061
+0x4F37 = 0x3062
+0x4F39 = 0x3063
+0x4F3B = 0x3064
+0x4F3E = 0x3065
+0x4F40 = 0x3066
+0x4F42 = 0x3067
+0x4F48 = 0x3068
+0x4F49 = 0x3069
+0x4F4B = 0x306A
+0x4F4C = 0x306B
+0x4F52 = 0x306C
+0x4F54 = 0x306D
+0x4F56 = 0x306E
+0x4F58 = 0x306F
+0x4F5F = 0x3070
+0x4F60 = 0x305F
+0x4F63 = 0x3071
+0x4F6A = 0x3072
+0x4F6C = 0x3073
+0x4F6E = 0x3074
+0x4F71 = 0x3075
+0x4F77 = 0x3076
+0x4F78 = 0x3077
+0x4F79 = 0x3078
+0x4F7A = 0x3079
+0x4F7D = 0x307A
+0x4F7E = 0x307B
+0x4F81 = 0x307C
+0x4F82 = 0x307D
+0x4F84 = 0x307E
+0x4F85 = 0x3121
+0x4F89 = 0x3122
+0x4F8A = 0x3123
+0x4F8C = 0x3124
+0x4F8E = 0x3125
+0x4F90 = 0x3126
+0x4F92 = 0x3127
+0x4F93 = 0x3128
+0x4F94 = 0x3129
+0x4F97 = 0x312A
+0x4F99 = 0x312B
+0x4F9A = 0x312C
+0x4F9E = 0x312D
+0x4F9F = 0x312E
+0x4FB2 = 0x312F
+0x4FB7 = 0x3130
+0x4FB9 = 0x3131
+0x4FBB = 0x3132
+0x4FBC = 0x3133
+0x4FBD = 0x3134
+0x4FBE = 0x3135
+0x4FC0 = 0x3136
+0x4FC1 = 0x3137
+0x4FC5 = 0x3138
+0x4FC6 = 0x3139
+0x4FC8 = 0x313A
+0x4FC9 = 0x313B
+0x4FCB = 0x313C
+0x4FCC = 0x313D
+0x4FCD = 0x313E
+0x4FCF = 0x313F
+0x4FD2 = 0x3140
+0x4FDC = 0x3141
+0x4FE0 = 0x3142
+0x4FE2 = 0x3143
+0x4FF0 = 0x3144
+0x4FF2 = 0x3145
+0x4FFC = 0x3146
+0x4FFD = 0x3147
+0x4FFF = 0x3148
+0x5000 = 0x3149
+0x5001 = 0x314A
+0x5004 = 0x314B
+0x5007 = 0x314C
+0x500A = 0x314D
+0x500C = 0x314E
+0x500E = 0x314F
+0x5010 = 0x3150
+0x5013 = 0x3151
+0x5017 = 0x3152
+0x5018 = 0x3153
+0x501B = 0x3154
+0x501C = 0x3155
+0x501D = 0x3156
+0x501E = 0x3157
+0x5022 = 0x3158
+0x5027 = 0x3159
+0x502E = 0x315A
+0x5030 = 0x315B
+0x5032 = 0x315C
+0x5033 = 0x315D
+0x5035 = 0x315E
+0x503B = 0x3176
+0x5040 = 0x315F
+0x5041 = 0x3160
+0x5042 = 0x3161
+0x5045 = 0x3162
+0x5046 = 0x3163
+0x504A = 0x3164
+0x504C = 0x3165
+0x504E = 0x3166
+0x5051 = 0x3167
+0x5052 = 0x3168
+0x5053 = 0x3169
+0x5057 = 0x316A
+0x5059 = 0x316B
+0x505F = 0x316C
+0x5060 = 0x316D
+0x5062 = 0x316E
+0x5063 = 0x316F
+0x5066 = 0x3170
+0x5067 = 0x3171
+0x506A = 0x3172
+0x506D = 0x3173
+0x5070 = 0x3174
+0x5071 = 0x3175
+0x5081 = 0x3177
+0x5083 = 0x3178
+0x5084 = 0x3179
+0x5086 = 0x317A
+0x508A = 0x317B
+0x508E = 0x317C
+0x508F = 0x317D
+0x5090 = 0x317E
+0x5092 = 0x3221
+0x5093 = 0x3222
+0x5094 = 0x3223
+0x5096 = 0x3224
+0x509B = 0x3225
+0x509C = 0x3226
+0x509E = 0x3227
+0x509F = 0x3228
+0x50A0 = 0x3229
+0x50A1 = 0x322A
+0x50A2 = 0x322B
+0x50AA = 0x322C
+0x50AF = 0x322D
+0x50B0 = 0x322E
+0x50B9 = 0x322F
+0x50BA = 0x3230
+0x50BD = 0x3231
+0x50C0 = 0x3232
+0x50C3 = 0x3233
+0x50C4 = 0x3234
+0x50C7 = 0x3235
+0x50CC = 0x3236
+0x50CE = 0x3237
+0x50D0 = 0x3238
+0x50D3 = 0x3239
+0x50D4 = 0x323A
+0x50D8 = 0x323B
+0x50DC = 0x323C
+0x50DD = 0x323D
+0x50DF = 0x323E
+0x50E2 = 0x323F
+0x50E4 = 0x3240
+0x50E6 = 0x3241
+0x50E8 = 0x3242
+0x50E9 = 0x3243
+0x50EF = 0x3244
+0x50F1 = 0x3245
+0x50F2 = 0x3251
+0x50F6 = 0x3246
+0x50FA = 0x3247
+0x50FE = 0x3248
+0x5103 = 0x3249
+0x5106 = 0x324A
+0x5107 = 0x324B
+0x5108 = 0x324C
+0x510B = 0x324D
+0x510C = 0x324E
+0x510D = 0x324F
+0x510E = 0x3250
+0x5110 = 0x3252
+0x5117 = 0x3253
+0x5119 = 0x3254
+0x511B = 0x3255
+0x511C = 0x3256
+0x511D = 0x3257
+0x511E = 0x3258
+0x5123 = 0x3259
+0x5127 = 0x325A
+0x5128 = 0x325B
+0x512C = 0x325C
+0x512D = 0x325D
+0x512F = 0x325E
+0x5131 = 0x325F
+0x5133 = 0x3260
+0x5134 = 0x3261
+0x5135 = 0x3262
+0x5138 = 0x3263
+0x5139 = 0x3264
+0x5142 = 0x3265
+0x514A = 0x3266
+0x514F = 0x3267
+0x5153 = 0x3268
+0x5155 = 0x3269
+0x5157 = 0x326A
+0x5158 = 0x326B
+0x515F = 0x326C
+0x5164 = 0x326D
+0x5166 = 0x326E
+0x517E = 0x326F
+0x5183 = 0x3270
+0x5184 = 0x3271
+0x518B = 0x3272
+0x518E = 0x3273
+0x5198 = 0x3274
+0x519D = 0x3275
+0x51A1 = 0x3276
+0x51A3 = 0x3277
+0x51AD = 0x3278
+0x51B8 = 0x3279
+0x51BA = 0x327A
+0x51BC = 0x327B
+0x51BE = 0x327C
+0x51BF = 0x327D
+0x51C2 = 0x327E
+0x51C8 = 0x3321
+0x51CF = 0x3322
+0x51D1 = 0x3323
+0x51D2 = 0x3324
+0x51D3 = 0x3325
+0x51D5 = 0x3326
+0x51D8 = 0x3327
+0x51DE = 0x3328
+0x51E2 = 0x3329
+0x51E5 = 0x332A
+0x51EE = 0x332B
+0x51F2 = 0x332C
+0x51F3 = 0x332D
+0x51F4 = 0x332E
+0x51F7 = 0x332F
+0x5201 = 0x3330
+0x5202 = 0x3331
+0x5205 = 0x3332
+0x5212 = 0x3333
+0x5213 = 0x3334
+0x5215 = 0x3335
+0x5216 = 0x3336
+0x5218 = 0x3337
+0x5222 = 0x3338
+0x5228 = 0x3339
+0x5231 = 0x333A
+0x5232 = 0x333B
+0x5235 = 0x333C
+0x523C = 0x333D
+0x5245 = 0x333E
+0x5249 = 0x333F
+0x5255 = 0x3340
+0x5257 = 0x3341
+0x5258 = 0x3342
+0x525A = 0x3343
+0x525C = 0x3344
+0x525F = 0x3345
+0x5260 = 0x3346
+0x5261 = 0x3347
+0x5266 = 0x3348
+0x526E = 0x3349
+0x5277 = 0x334A
+0x5278 = 0x334B
+0x5279 = 0x334C
+0x5280 = 0x334D
+0x5282 = 0x334E
+0x5285 = 0x334F
+0x528A = 0x3350
+0x528C = 0x3351
+0x5293 = 0x3352
+0x5295 = 0x3353
+0x5296 = 0x3354
+0x5297 = 0x3355
+0x5298 = 0x3356
+0x529A = 0x3357
+0x529C = 0x3358
+0x52A4 = 0x3359
+0x52A5 = 0x335A
+0x52A6 = 0x335B
+0x52A7 = 0x335C
+0x52AF = 0x335D
+0x52B0 = 0x335E
+0x52B6 = 0x335F
+0x52B7 = 0x3360
+0x52B8 = 0x3361
+0x52BA = 0x3362
+0x52BB = 0x3363
+0x52BD = 0x3364
+0x52C0 = 0x3365
+0x52C4 = 0x3366
+0x52C6 = 0x3367
+0x52C8 = 0x3368
+0x52CC = 0x3369
+0x52CF = 0x336A
+0x52D1 = 0x336B
+0x52D4 = 0x336C
+0x52D6 = 0x336D
+0x52DB = 0x336E
+0x52DC = 0x336F
+0x52E1 = 0x3370
+0x52E5 = 0x3371
+0x52E8 = 0x3372
+0x52E9 = 0x3373
+0x52EA = 0x3374
+0x52EC = 0x3375
+0x52F0 = 0x3376
+0x52F1 = 0x3377
+0x52F4 = 0x3378
+0x52F6 = 0x3379
+0x52F7 = 0x337A
+0x5300 = 0x337B
+0x5303 = 0x337C
+0x530A = 0x337D
+0x530B = 0x337E
+0x530C = 0x3421
+0x5311 = 0x3422
+0x5313 = 0x3423
+0x5318 = 0x3424
+0x531B = 0x3425
+0x531C = 0x3426
+0x531E = 0x3427
+0x531F = 0x3428
+0x5325 = 0x3429
+0x5327 = 0x342A
+0x5328 = 0x342B
+0x5329 = 0x342C
+0x532B = 0x342D
+0x532C = 0x342E
+0x532D = 0x342F
+0x5330 = 0x3430
+0x5332 = 0x3431
+0x5335 = 0x3432
+0x533C = 0x3433
+0x533D = 0x3434
+0x533E = 0x3435
+0x5342 = 0x3436
+0x534B = 0x3438
+0x534C = 0x3437
+0x5359 = 0x3439
+0x535B = 0x343A
+0x5361 = 0x343B
+0x5363 = 0x343C
+0x5365 = 0x343D
+0x536C = 0x343E
+0x536D = 0x343F
+0x5372 = 0x3440
+0x5379 = 0x3441
+0x537E = 0x3442
+0x5383 = 0x3443
+0x5387 = 0x3444
+0x5388 = 0x3445
+0x538E = 0x3446
+0x5393 = 0x3447
+0x5394 = 0x3448
+0x5399 = 0x3449
+0x539D = 0x344A
+0x53A1 = 0x344B
+0x53A4 = 0x344C
+0x53AA = 0x344D
+0x53AB = 0x344E
+0x53AF = 0x344F
+0x53B2 = 0x3450
+0x53B4 = 0x3451
+0x53B5 = 0x3452
+0x53B7 = 0x3453
+0x53B8 = 0x3454
+0x53BA = 0x3455
+0x53BD = 0x3456
+0x53C0 = 0x3457
+0x53C5 = 0x3458
+0x53CF = 0x3459
+0x53D2 = 0x345A
+0x53D3 = 0x345B
+0x53D5 = 0x345C
+0x53DA = 0x345D
+0x53DD = 0x345E
+0x53DE = 0x345F
+0x53E0 = 0x3460
+0x53E6 = 0x3461
+0x53E7 = 0x3462
+0x53F5 = 0x3463
+0x5402 = 0x3464
+0x5413 = 0x3465
+0x541A = 0x3466
+0x5421 = 0x3467
+0x5427 = 0x3468
+0x5428 = 0x3469
+0x542A = 0x346A
+0x542F = 0x346B
+0x5431 = 0x346C
+0x5434 = 0x346D
+0x5435 = 0x346E
+0x5443 = 0x346F
+0x5444 = 0x3470
+0x5447 = 0x3471
+0x544D = 0x3472
+0x544F = 0x3473
+0x545E = 0x3474
+0x5462 = 0x3475
+0x5464 = 0x3476
+0x5466 = 0x3477
+0x5467 = 0x3478
+0x5469 = 0x3479
+0x546B = 0x347A
+0x546D = 0x347B
+0x546E = 0x347C
+0x5474 = 0x347D
+0x547F = 0x347E
+0x5481 = 0x3521
+0x5483 = 0x3522
+0x5485 = 0x3523
+0x5488 = 0x3524
+0x5489 = 0x3525
+0x548D = 0x3526
+0x5491 = 0x3527
+0x5495 = 0x3528
+0x5496 = 0x3529
+0x549C = 0x352A
+0x549F = 0x352B
+0x54A1 = 0x352C
+0x54A6 = 0x352D
+0x54A7 = 0x352E
+0x54A9 = 0x352F
+0x54AA = 0x3530
+0x54AD = 0x3531
+0x54AE = 0x3532
+0x54B1 = 0x3533
+0x54B7 = 0x3534
+0x54B9 = 0x3535
+0x54BA = 0x3536
+0x54BB = 0x3537
+0x54BF = 0x3538
+0x54C6 = 0x3539
+0x54CA = 0x353A
+0x54CD = 0x353B
+0x54CE = 0x353C
+0x54E0 = 0x353D
+0x54EA = 0x353E
+0x54EC = 0x353F
+0x54EF = 0x3540
+0x54F6 = 0x3541
+0x54FC = 0x3542
+0x54FE = 0x3543
+0x54FF = 0x3544
+0x5500 = 0x3545
+0x5501 = 0x3546
+0x5505 = 0x3547
+0x5508 = 0x3548
+0x5509 = 0x3549
+0x550C = 0x354A
+0x550D = 0x354B
+0x550E = 0x354C
+0x5515 = 0x354D
+0x552A = 0x354E
+0x552B = 0x354F
+0x5532 = 0x3550
+0x5535 = 0x3551
+0x5536 = 0x3552
+0x553B = 0x3553
+0x553C = 0x3554
+0x553D = 0x3555
+0x5541 = 0x3556
+0x5547 = 0x3557
+0x5549 = 0x3558
+0x554A = 0x3559
+0x554D = 0x355A
+0x5550 = 0x355B
+0x5551 = 0x355C
+0x5558 = 0x355D
+0x555A = 0x355E
+0x555B = 0x355F
+0x555E = 0x3560
+0x5560 = 0x3561
+0x5561 = 0x3562
+0x5564 = 0x3563
+0x5566 = 0x3564
+0x557F = 0x3565
+0x5581 = 0x3566
+0x5582 = 0x3567
+0x5586 = 0x3568
+0x5588 = 0x3569
+0x558E = 0x356A
+0x558F = 0x356B
+0x5591 = 0x356C
+0x5592 = 0x356D
+0x5593 = 0x356E
+0x5594 = 0x356F
+0x5597 = 0x3570
+0x55A3 = 0x3571
+0x55A4 = 0x3572
+0x55AD = 0x3573
+0x55B2 = 0x3574
+0x55BF = 0x3575
+0x55C1 = 0x3576
+0x55C3 = 0x3577
+0x55C6 = 0x3578
+0x55C9 = 0x3579
+0x55CB = 0x357A
+0x55CC = 0x357B
+0x55CE = 0x357C
+0x55D1 = 0x357D
+0x55D2 = 0x357E
+0x55D3 = 0x3621
+0x55D7 = 0x3622
+0x55D8 = 0x3623
+0x55DB = 0x3624
+0x55DE = 0x3625
+0x55E2 = 0x3626
+0x55E9 = 0x3627
+0x55F6 = 0x3628
+0x55FF = 0x3629
+0x5605 = 0x362A
+0x5608 = 0x362B
+0x560A = 0x362C
+0x560D = 0x362D
+0x560E = 0x362E
+0x560F = 0x362F
+0x5610 = 0x3630
+0x5611 = 0x3631
+0x5612 = 0x3632
+0x5619 = 0x3633
+0x562C = 0x3634
+0x5630 = 0x3635
+0x5633 = 0x3636
+0x5635 = 0x3637
+0x5637 = 0x3638
+0x5639 = 0x3639
+0x563B = 0x363A
+0x563C = 0x363B
+0x563D = 0x363C
+0x563F = 0x363D
+0x5640 = 0x363E
+0x5641 = 0x363F
+0x5643 = 0x3640
+0x5644 = 0x3641
+0x5646 = 0x3642
+0x5649 = 0x3643
+0x564B = 0x3644
+0x564D = 0x3645
+0x564F = 0x3646
+0x5654 = 0x3647
+0x565E = 0x3648
+0x5660 = 0x3649
+0x5661 = 0x364A
+0x5662 = 0x364B
+0x5663 = 0x364C
+0x5666 = 0x364D
+0x5669 = 0x364E
+0x566D = 0x364F
+0x566F = 0x3650
+0x5671 = 0x3651
+0x5672 = 0x3652
+0x5675 = 0x3653
+0x5684 = 0x3654
+0x5685 = 0x3655
+0x5688 = 0x3656
+0x568B = 0x3657
+0x568C = 0x3658
+0x5695 = 0x3659
+0x5699 = 0x365A
+0x569A = 0x365B
+0x569D = 0x365C
+0x569E = 0x365D
+0x569F = 0x365E
+0x56A6 = 0x365F
+0x56A7 = 0x3660
+0x56A8 = 0x3661
+0x56A9 = 0x3662
+0x56AB = 0x3663
+0x56AC = 0x3664
+0x56AD = 0x3665
+0x56B1 = 0x3666
+0x56B3 = 0x3667
+0x56B7 = 0x3668
+0x56BE = 0x3669
+0x56C5 = 0x366A
+0x56C9 = 0x366B
+0x56CA = 0x366C
+0x56CB = 0x366D
+0x56CC = 0x3670
+0x56CD = 0x3671
+0x56CF = 0x366E
+0x56D0 = 0x366F
+0x56D9 = 0x3672
+0x56DC = 0x3673
+0x56DD = 0x3674
+0x56DF = 0x3675
+0x56E1 = 0x3676
+0x56E4 = 0x3677
+0x56E5 = 0x3678
+0x56E6 = 0x3679
+0x56E7 = 0x367A
+0x56E8 = 0x367B
+0x56EB = 0x367D
+0x56ED = 0x367E
+0x56F1 = 0x367C
+0x56F6 = 0x3721
+0x56F7 = 0x3722
+0x5701 = 0x3723
+0x5702 = 0x3724
+0x5707 = 0x3725
+0x570A = 0x3726
+0x570C = 0x3727
+0x5711 = 0x3728
+0x5715 = 0x3729
+0x571A = 0x372A
+0x571B = 0x372B
+0x571D = 0x372C
+0x5720 = 0x372D
+0x5722 = 0x372E
+0x5723 = 0x372F
+0x5724 = 0x3730
+0x5725 = 0x3731
+0x5729 = 0x3732
+0x572A = 0x3733
+0x572C = 0x3734
+0x572E = 0x3735
+0x572F = 0x3736
+0x5733 = 0x3737
+0x5734 = 0x3738
+0x573D = 0x3739
+0x573E = 0x373A
+0x573F = 0x373B
+0x5745 = 0x373C
+0x5746 = 0x373D
+0x574C = 0x373E
+0x574D = 0x373F
+0x5752 = 0x3740
+0x5762 = 0x3741
+0x5765 = 0x3742
+0x5767 = 0x3743
+0x5768 = 0x3744
+0x576B = 0x3745
+0x576D = 0x3746
+0x576E = 0x3747
+0x576F = 0x3748
+0x5770 = 0x3749
+0x5771 = 0x374A
+0x5773 = 0x374B
+0x5774 = 0x374C
+0x5775 = 0x374D
+0x5777 = 0x374E
+0x5779 = 0x374F
+0x577A = 0x3750
+0x577B = 0x3751
+0x577C = 0x3752
+0x577E = 0x3753
+0x5781 = 0x3754
+0x5783 = 0x3755
+0x578C = 0x3756
+0x5794 = 0x3757
+0x5795 = 0x3760
+0x5797 = 0x3758
+0x5799 = 0x3759
+0x579A = 0x375A
+0x579C = 0x375B
+0x579D = 0x375C
+0x579E = 0x375D
+0x579F = 0x375E
+0x57A1 = 0x375F
+0x57A7 = 0x3761
+0x57A8 = 0x3762
+0x57A9 = 0x3763
+0x57AC = 0x3764
+0x57B8 = 0x3765
+0x57BD = 0x3766
+0x57C7 = 0x3767
+0x57C8 = 0x3768
+0x57CC = 0x3769
+0x57CF = 0x376A
+0x57D5 = 0x376B
+0x57DD = 0x376C
+0x57DE = 0x376D
+0x57E1 = 0x377E
+0x57E4 = 0x376E
+0x57E6 = 0x376F
+0x57E7 = 0x3770
+0x57E9 = 0x3771
+0x57ED = 0x3772
+0x57F0 = 0x3773
+0x57F5 = 0x3774
+0x57F6 = 0x3775
+0x57F8 = 0x3776
+0x57FD = 0x3777
+0x57FE = 0x3778
+0x57FF = 0x3779
+0x5803 = 0x377A
+0x5804 = 0x377B
+0x5808 = 0x377C
+0x5809 = 0x377D
+0x580C = 0x3821
+0x580D = 0x3822
+0x581B = 0x3823
+0x581E = 0x3824
+0x581F = 0x3825
+0x5820 = 0x3826
+0x5826 = 0x3827
+0x5827 = 0x3828
+0x582D = 0x3829
+0x5832 = 0x382A
+0x5839 = 0x382B
+0x583F = 0x382C
+0x5849 = 0x382D
+0x584C = 0x382E
+0x584D = 0x382F
+0x584F = 0x3830
+0x5850 = 0x3831
+0x5855 = 0x3832
+0x585F = 0x3833
+0x5861 = 0x3834
+0x5864 = 0x3835
+0x5867 = 0x3836
+0x5868 = 0x3837
+0x5878 = 0x3838
+0x587C = 0x3839
+0x587F = 0x383A
+0x5880 = 0x383B
+0x5881 = 0x383C
+0x5887 = 0x383D
+0x5888 = 0x383E
+0x5889 = 0x383F
+0x588A = 0x3840
+0x588C = 0x3841
+0x588D = 0x3842
+0x588F = 0x3843
+0x5890 = 0x3844
+0x5894 = 0x3845
+0x5896 = 0x3846
+0x589D = 0x3847
+0x58A0 = 0x3848
+0x58A1 = 0x3849
+0x58A2 = 0x384A
+0x58A6 = 0x384B
+0x58A9 = 0x384C
+0x58B1 = 0x384D
+0x58B2 = 0x384E
+0x58BC = 0x3850
+0x58C2 = 0x3851
+0x58C4 = 0x384F
+0x58C8 = 0x3852
+0x58CD = 0x3853
+0x58CE = 0x3854
+0x58D0 = 0x3855
+0x58D2 = 0x3856
+0x58D4 = 0x3857
+0x58D6 = 0x3858
+0x58DA = 0x3859
+0x58DD = 0x385A
+0x58E1 = 0x385B
+0x58E2 = 0x385C
+0x58E9 = 0x385D
+0x58F3 = 0x385E
+0x5905 = 0x385F
+0x5906 = 0x3860
+0x590B = 0x3861
+0x590C = 0x3862
+0x5912 = 0x3863
+0x5913 = 0x3864
+0x5914 = 0x3865
+0x591D = 0x3867
+0x5921 = 0x3868
+0x5923 = 0x3869
+0x5924 = 0x386A
+0x5928 = 0x386B
+0x592F = 0x386C
+0x5930 = 0x386D
+0x5933 = 0x386E
+0x5935 = 0x386F
+0x5936 = 0x3870
+0x593F = 0x3871
+0x5943 = 0x3872
+0x5946 = 0x3873
+0x5952 = 0x3874
+0x5953 = 0x3875
+0x5959 = 0x3876
+0x595B = 0x3877
+0x595D = 0x3878
+0x595E = 0x3879
+0x595F = 0x387A
+0x5961 = 0x387B
+0x5963 = 0x387C
+0x596B = 0x387D
+0x596D = 0x387E
+0x596F = 0x3921
+0x5972 = 0x3922
+0x5975 = 0x3923
+0x5976 = 0x3924
+0x5979 = 0x3925
+0x597B = 0x3926
+0x597C = 0x3927
+0x598B = 0x3928
+0x598C = 0x3929
+0x598E = 0x392A
+0x5992 = 0x392B
+0x5995 = 0x392C
+0x5997 = 0x392D
+0x599F = 0x392E
+0x59A4 = 0x392F
+0x59A7 = 0x3930
+0x59AD = 0x3931
+0x59AE = 0x3932
+0x59AF = 0x3933
+0x59B0 = 0x3934
+0x59B3 = 0x3935
+0x59B7 = 0x3936
+0x59BA = 0x3937
+0x59BC = 0x3938
+0x59C1 = 0x3939
+0x59C3 = 0x393A
+0x59C4 = 0x393B
+0x59C8 = 0x393C
+0x59CA = 0x393D
+0x59CD = 0x393E
+0x59D2 = 0x393F
+0x59DD = 0x3940
+0x59DE = 0x3941
+0x59DF = 0x3942
+0x59E3 = 0x3943
+0x59E4 = 0x3944
+0x59E7 = 0x3945
+0x59EE = 0x3946
+0x59EF = 0x3947
+0x59F1 = 0x3948
+0x59F2 = 0x3949
+0x59F4 = 0x394A
+0x59F7 = 0x394B
+0x5A00 = 0x394C
+0x5A04 = 0x394D
+0x5A0C = 0x394E
+0x5A0D = 0x394F
+0x5A0E = 0x3950
+0x5A12 = 0x3951
+0x5A13 = 0x3952
+0x5A1E = 0x3953
+0x5A23 = 0x3954
+0x5A24 = 0x3955
+0x5A27 = 0x3956
+0x5A28 = 0x3957
+0x5A2A = 0x3958
+0x5A2D = 0x3959
+0x5A30 = 0x395A
+0x5A44 = 0x395B
+0x5A45 = 0x395C
+0x5A47 = 0x395D
+0x5A48 = 0x395E
+0x5A4C = 0x395F
+0x5A50 = 0x3960
+0x5A55 = 0x3961
+0x5A5E = 0x3962
+0x5A63 = 0x3963
+0x5A65 = 0x3964
+0x5A67 = 0x3965
+0x5A6D = 0x3966
+0x5A77 = 0x3967
+0x5A7A = 0x3968
+0x5A7B = 0x3969
+0x5A7E = 0x396A
+0x5A8B = 0x396B
+0x5A90 = 0x396C
+0x5A93 = 0x396D
+0x5A96 = 0x396E
+0x5A99 = 0x396F
+0x5A9C = 0x3970
+0x5A9E = 0x3971
+0x5A9F = 0x3972
+0x5AA0 = 0x3973
+0x5AA2 = 0x3974
+0x5AA7 = 0x3975
+0x5AAC = 0x3976
+0x5AB1 = 0x3977
+0x5AB2 = 0x3978
+0x5AB3 = 0x3979
+0x5AB5 = 0x397A
+0x5AB8 = 0x397B
+0x5ABA = 0x397C
+0x5ABB = 0x397D
+0x5ABF = 0x397E
+0x5AC4 = 0x3A21
+0x5AC6 = 0x3A22
+0x5AC8 = 0x3A23
+0x5ACF = 0x3A24
+0x5ADA = 0x3A25
+0x5ADC = 0x3A26
+0x5AE0 = 0x3A27
+0x5AE5 = 0x3A28
+0x5AEA = 0x3A29
+0x5AEE = 0x3A2A
+0x5AF5 = 0x3A2B
+0x5AF6 = 0x3A2C
+0x5AFD = 0x3A2D
+0x5B00 = 0x3A2E
+0x5B01 = 0x3A2F
+0x5B08 = 0x3A30
+0x5B17 = 0x3A31
+0x5B19 = 0x3A33
+0x5B1B = 0x3A34
+0x5B1D = 0x3A35
+0x5B21 = 0x3A36
+0x5B25 = 0x3A37
+0x5B2D = 0x3A38
+0x5B34 = 0x3A32
+0x5B38 = 0x3A39
+0x5B41 = 0x3A3A
+0x5B4B = 0x3A3B
+0x5B4C = 0x3A3C
+0x5B52 = 0x3A3D
+0x5B56 = 0x3A3E
+0x5B5E = 0x3A3F
+0x5B68 = 0x3A40
+0x5B6E = 0x3A41
+0x5B6F = 0x3A42
+0x5B7C = 0x3A43
+0x5B7D = 0x3A44
+0x5B7E = 0x3A45
+0x5B7F = 0x3A46
+0x5B81 = 0x3A47
+0x5B84 = 0x3A48
+0x5B86 = 0x3A49
+0x5B8A = 0x3A4A
+0x5B8E = 0x3A4B
+0x5B90 = 0x3A4C
+0x5B91 = 0x3A4D
+0x5B93 = 0x3A4E
+0x5B94 = 0x3A4F
+0x5B96 = 0x3A50
+0x5BA8 = 0x3A51
+0x5BA9 = 0x3A52
+0x5BAC = 0x3A53
+0x5BAD = 0x3A54
+0x5BAF = 0x3A55
+0x5BB1 = 0x3A56
+0x5BB2 = 0x3A57
+0x5BB7 = 0x3A58
+0x5BBA = 0x3A59
+0x5BBC = 0x3A5A
+0x5BC0 = 0x3A5B
+0x5BC1 = 0x3A5C
+0x5BCD = 0x3A5D
+0x5BCF = 0x3A5E
+0x5BD6 = 0x3A5F
+0x5BD7 = 0x3A60
+0x5BD8 = 0x3A61
+0x5BD9 = 0x3A62
+0x5BDA = 0x3A63
+0x5BE0 = 0x3A64
+0x5BEF = 0x3A65
+0x5BF1 = 0x3A66
+0x5BF4 = 0x3A67
+0x5BFD = 0x3A68
+0x5C0C = 0x3A69
+0x5C17 = 0x3A6A
+0x5C1E = 0x3A6B
+0x5C1F = 0x3A6C
+0x5C23 = 0x3A6D
+0x5C26 = 0x3A6E
+0x5C29 = 0x3A6F
+0x5C2B = 0x3A70
+0x5C2C = 0x3A71
+0x5C2E = 0x3A72
+0x5C30 = 0x3A73
+0x5C32 = 0x3A74
+0x5C35 = 0x3A75
+0x5C36 = 0x3A76
+0x5C59 = 0x3A77
+0x5C5A = 0x3A78
+0x5C5C = 0x3A79
+0x5C62 = 0x3A7A
+0x5C63 = 0x3A7B
+0x5C67 = 0x3A7C
+0x5C68 = 0x3A7D
+0x5C69 = 0x3A7E
+0x5C6D = 0x3B21
+0x5C70 = 0x3B22
+0x5C74 = 0x3B23
+0x5C75 = 0x3B24
+0x5C7A = 0x3B25
+0x5C7B = 0x3B26
+0x5C7C = 0x3B27
+0x5C7D = 0x3B28
+0x5C87 = 0x3B29
+0x5C88 = 0x3B2A
+0x5C8A = 0x3B2B
+0x5C8F = 0x3B2C
+0x5C92 = 0x3B2D
+0x5C9D = 0x3B2E
+0x5C9F = 0x3B2F
+0x5CA0 = 0x3B30
+0x5CA2 = 0x3B31
+0x5CA3 = 0x3B32
+0x5CA6 = 0x3B33
+0x5CAA = 0x3B34
+0x5CB2 = 0x3B35
+0x5CB4 = 0x3B36
+0x5CB5 = 0x3B37
+0x5CBA = 0x3B38
+0x5CC9 = 0x3B39
+0x5CCB = 0x3B3A
+0x5CD2 = 0x3B3B
+0x5CD7 = 0x3B3D
+0x5CDD = 0x3B3C
+0x5CEE = 0x3B3E
+0x5CF1 = 0x3B3F
+0x5CF2 = 0x3B40
+0x5CF4 = 0x3B41
+0x5D01 = 0x3B42
+0x5D06 = 0x3B43
+0x5D0D = 0x3B44
+0x5D12 = 0x3B45
+0x5D23 = 0x3B47
+0x5D24 = 0x3B48
+0x5D26 = 0x3B49
+0x5D27 = 0x3B4A
+0x5D2B = 0x3B46
+0x5D31 = 0x3B4B
+0x5D34 = 0x3B4C
+0x5D39 = 0x3B4D
+0x5D3D = 0x3B4E
+0x5D3F = 0x3B4F
+0x5D42 = 0x3B50
+0x5D43 = 0x3B51
+0x5D46 = 0x3B52
+0x5D48 = 0x3B53
+0x5D4A = 0x3B57
+0x5D51 = 0x3B55
+0x5D55 = 0x3B54
+0x5D59 = 0x3B56
+0x5D5F = 0x3B58
+0x5D60 = 0x3B59
+0x5D61 = 0x3B5A
+0x5D62 = 0x3B5B
+0x5D64 = 0x3B5C
+0x5D6A = 0x3B5D
+0x5D6D = 0x3B5E
+0x5D70 = 0x3B5F
+0x5D79 = 0x3B60
+0x5D7A = 0x3B61
+0x5D7E = 0x3B62
+0x5D7F = 0x3B63
+0x5D81 = 0x3B64
+0x5D83 = 0x3B65
+0x5D88 = 0x3B66
+0x5D8A = 0x3B67
+0x5D92 = 0x3B68
+0x5D93 = 0x3B69
+0x5D94 = 0x3B6A
+0x5D95 = 0x3B6B
+0x5D99 = 0x3B6C
+0x5D9B = 0x3B6D
+0x5D9F = 0x3B6E
+0x5DA0 = 0x3B6F
+0x5DA7 = 0x3B70
+0x5DAB = 0x3B71
+0x5DB0 = 0x3B72
+0x5DB2 = 0x6674
+0x5DB4 = 0x3B73
+0x5DB8 = 0x3B74
+0x5DB9 = 0x3B75
+0x5DC3 = 0x3B76
+0x5DC7 = 0x3B77
+0x5DCB = 0x3B78
+0x5DCE = 0x3B7A
+0x5DD0 = 0x3B79
+0x5DD8 = 0x3B7B
+0x5DD9 = 0x3B7C
+0x5DE0 = 0x3B7D
+0x5DE4 = 0x3B7E
+0x5DE9 = 0x3C21
+0x5DF8 = 0x3C22
+0x5DF9 = 0x3C23
+0x5E00 = 0x3C24
+0x5E07 = 0x3C25
+0x5E0D = 0x3C26
+0x5E12 = 0x3C27
+0x5E14 = 0x3C28
+0x5E15 = 0x3C29
+0x5E18 = 0x3C2A
+0x5E1F = 0x3C2B
+0x5E20 = 0x3C2C
+0x5E28 = 0x3C2E
+0x5E2E = 0x3C2D
+0x5E32 = 0x3C2F
+0x5E35 = 0x3C30
+0x5E3E = 0x3C31
+0x5E49 = 0x3C34
+0x5E4B = 0x3C32
+0x5E50 = 0x3C33
+0x5E51 = 0x3C35
+0x5E56 = 0x3C36
+0x5E58 = 0x3C37
+0x5E5B = 0x3C38
+0x5E5C = 0x3C39
+0x5E5E = 0x3C3A
+0x5E68 = 0x3C3B
+0x5E6A = 0x3C3C
+0x5E6B = 0x3C3D
+0x5E6C = 0x3C3E
+0x5E6D = 0x3C3F
+0x5E6E = 0x3C40
+0x5E70 = 0x3C41
+0x5E80 = 0x3C42
+0x5E8B = 0x3C43
+0x5E8E = 0x3C44
+0x5EA2 = 0x3C45
+0x5EA4 = 0x3C46
+0x5EA5 = 0x3C47
+0x5EA8 = 0x3C48
+0x5EAA = 0x3C49
+0x5EAC = 0x3C4A
+0x5EB1 = 0x3C4B
+0x5EB3 = 0x3C4C
+0x5EBD = 0x3C4D
+0x5EBE = 0x3C4E
+0x5EBF = 0x3C4F
+0x5EC6 = 0x3C50
+0x5ECB = 0x3C52
+0x5ECC = 0x3C51
+0x5ECE = 0x3C53
+0x5ED1 = 0x3C54
+0x5ED2 = 0x3C55
+0x5ED4 = 0x3C56
+0x5ED5 = 0x3C57
+0x5EDC = 0x3C58
+0x5EDE = 0x3C59
+0x5EE5 = 0x3C5A
+0x5EEB = 0x3C5B
+0x5F02 = 0x3C5C
+0x5F06 = 0x3C5D
+0x5F07 = 0x3C5E
+0x5F08 = 0x3C5F
+0x5F0E = 0x3C60
+0x5F19 = 0x3C61
+0x5F1C = 0x3C62
+0x5F1D = 0x3C63
+0x5F21 = 0x3C64
+0x5F22 = 0x3C65
+0x5F23 = 0x3C66
+0x5F24 = 0x3C67
+0x5F28 = 0x3C68
+0x5F2B = 0x3C69
+0x5F2C = 0x3C6A
+0x5F2E = 0x3C6B
+0x5F30 = 0x3C6C
+0x5F34 = 0x3C6D
+0x5F36 = 0x3C6E
+0x5F3B = 0x3C6F
+0x5F3D = 0x3C70
+0x5F3F = 0x3C71
+0x5F40 = 0x3C72
+0x5F44 = 0x3C73
+0x5F45 = 0x3C74
+0x5F47 = 0x3C75
+0x5F4D = 0x3C76
+0x5F50 = 0x3C77
+0x5F54 = 0x3C78
+0x5F58 = 0x3C79
+0x5F5B = 0x3C7A
+0x5F60 = 0x3C7B
+0x5F63 = 0x3C7C
+0x5F64 = 0x3C7D
+0x5F67 = 0x3C7E
+0x5F6F = 0x3D21
+0x5F72 = 0x3D22
+0x5F74 = 0x3D23
+0x5F75 = 0x3D24
+0x5F78 = 0x3D25
+0x5F7A = 0x3D26
+0x5F7D = 0x3D27
+0x5F7E = 0x3D28
+0x5F89 = 0x3D29
+0x5F8D = 0x3D2A
+0x5F8F = 0x3D2B
+0x5F96 = 0x3D2C
+0x5F9C = 0x3D2D
+0x5F9D = 0x3D2E
+0x5FA2 = 0x3D2F
+0x5FA4 = 0x3D32
+0x5FA7 = 0x3D30
+0x5FAB = 0x3D31
+0x5FAC = 0x3D33
+0x5FAF = 0x3D34
+0x5FB0 = 0x3D35
+0x5FB1 = 0x3D36
+0x5FB8 = 0x3D37
+0x5FC4 = 0x3D38
+0x5FC7 = 0x3D39
+0x5FC8 = 0x3D3A
+0x5FC9 = 0x3D3B
+0x5FCB = 0x3D3C
+0x5FD0 = 0x3D3D
+0x5FD1 = 0x3D3E
+0x5FD2 = 0x3D3F
+0x5FD3 = 0x3D40
+0x5FD4 = 0x3D41
+0x5FDE = 0x3D42
+0x5FE1 = 0x3D43
+0x5FE2 = 0x3D44
+0x5FE8 = 0x3D45
+0x5FE9 = 0x3D46
+0x5FEA = 0x3D47
+0x5FEC = 0x3D48
+0x5FED = 0x3D49
+0x5FEE = 0x3D4A
+0x5FEF = 0x3D4B
+0x5FF2 = 0x3D4C
+0x5FF3 = 0x3D4D
+0x5FF6 = 0x3D4E
+0x5FFA = 0x3D4F
+0x5FFC = 0x3D50
+0x6007 = 0x3D51
+0x600A = 0x3D52
+0x600D = 0x3D53
+0x6013 = 0x3D54
+0x6014 = 0x3D55
+0x6017 = 0x3D56
+0x6018 = 0x3D57
+0x601A = 0x3D58
+0x601F = 0x3D59
+0x6024 = 0x3D5A
+0x602D = 0x3D5B
+0x6033 = 0x3D5C
+0x6035 = 0x3D5D
+0x6040 = 0x3D5E
+0x6047 = 0x3D5F
+0x6048 = 0x3D60
+0x6049 = 0x3D61
+0x604C = 0x3D62
+0x6051 = 0x3D63
+0x6054 = 0x3D64
+0x6056 = 0x3D65
+0x6057 = 0x3D66
+0x605D = 0x3D67
+0x6061 = 0x3D68
+0x6067 = 0x3D69
+0x6071 = 0x3D6A
+0x607E = 0x3D6B
+0x607F = 0x3D6C
+0x6082 = 0x3D6D
+0x6086 = 0x3D6E
+0x6088 = 0x3D6F
+0x608A = 0x3D70
+0x608E = 0x3D71
+0x6091 = 0x3D72
+0x6093 = 0x3D73
+0x6095 = 0x3D74
+0x6098 = 0x3D75
+0x609D = 0x3D76
+0x609E = 0x3D77
+0x60A2 = 0x3D78
+0x60A4 = 0x3D79
+0x60A5 = 0x3D7A
+0x60A8 = 0x3D7B
+0x60B0 = 0x3D7C
+0x60B1 = 0x3D7D
+0x60B7 = 0x3D7E
+0x60BB = 0x3E21
+0x60BE = 0x3E22
+0x60C2 = 0x3E23
+0x60C4 = 0x3E24
+0x60C8 = 0x3E25
+0x60C9 = 0x3E26
+0x60CA = 0x3E27
+0x60CB = 0x3E28
+0x60CE = 0x3E29
+0x60CF = 0x3E2A
+0x60D4 = 0x3E2B
+0x60D5 = 0x3E2C
+0x60D9 = 0x3E2D
+0x60DB = 0x3E2E
+0x60DD = 0x3E2F
+0x60DE = 0x3E30
+0x60E2 = 0x3E31
+0x60E5 = 0x3E32
+0x60F2 = 0x3E33
+0x60F5 = 0x3E34
+0x60F8 = 0x3E35
+0x60FC = 0x3E36
+0x60FD = 0x3E37
+0x6102 = 0x3E38
+0x6107 = 0x3E39
+0x610A = 0x3E3A
+0x610C = 0x3E3B
+0x6110 = 0x3E3C
+0x6111 = 0x3E3D
+0x6112 = 0x3E3E
+0x6113 = 0x3E3F
+0x6114 = 0x3E40
+0x6116 = 0x3E41
+0x6117 = 0x3E42
+0x6119 = 0x3E43
+0x611C = 0x3E44
+0x611E = 0x3E45
+0x6122 = 0x3E46
+0x612A = 0x3E47
+0x612B = 0x3E48
+0x6130 = 0x3E49
+0x6131 = 0x3E4A
+0x6135 = 0x3E4B
+0x6136 = 0x3E4C
+0x6137 = 0x3E4D
+0x6139 = 0x3E4E
+0x6141 = 0x3E4F
+0x6145 = 0x3E50
+0x6146 = 0x3E51
+0x6149 = 0x3E52
+0x615E = 0x3E53
+0x6160 = 0x3E54
+0x616C = 0x3E55
+0x6172 = 0x3E56
+0x6178 = 0x3E57
+0x617B = 0x3E58
+0x617C = 0x3E59
+0x617F = 0x3E5A
+0x6180 = 0x3E5B
+0x6181 = 0x3E5C
+0x6183 = 0x3E5D
+0x6184 = 0x3E5E
+0x618B = 0x3E5F
+0x618D = 0x3E60
+0x6192 = 0x3E61
+0x6193 = 0x3E62
+0x6197 = 0x3E63
+0x6198 = 0x3E64
+0x619C = 0x3E65
+0x619D = 0x3E66
+0x619F = 0x3E67
+0x61A0 = 0x3E68
+0x61A5 = 0x3E69
+0x61A8 = 0x3E6A
+0x61AA = 0x3E6B
+0x61AD = 0x3E6C
+0x61B8 = 0x3E6D
+0x61B9 = 0x3E6E
+0x61BC = 0x3E6F
+0x61C0 = 0x3E70
+0x61C1 = 0x3E71
+0x61C2 = 0x3E72
+0x61CE = 0x3E73
+0x61CF = 0x3E74
+0x61D5 = 0x3E75
+0x61DC = 0x3E76
+0x61DD = 0x3E77
+0x61DE = 0x3E78
+0x61DF = 0x3E79
+0x61E1 = 0x3E7A
+0x61E2 = 0x3E7B
+0x61E5 = 0x3E7E
+0x61E7 = 0x3E7C
+0x61E9 = 0x3E7D
+0x61EC = 0x3F21
+0x61ED = 0x3F22
+0x61EF = 0x3F23
+0x6201 = 0x3F24
+0x6203 = 0x3F25
+0x6204 = 0x3F26
+0x6207 = 0x3F27
+0x6213 = 0x3F28
+0x6215 = 0x3F29
+0x621C = 0x3F2A
+0x6220 = 0x3F2B
+0x6222 = 0x3F2C
+0x6223 = 0x3F2D
+0x6227 = 0x3F2E
+0x6229 = 0x3F2F
+0x622B = 0x3F30
+0x6239 = 0x3F31
+0x623D = 0x3F32
+0x6242 = 0x3F33
+0x6243 = 0x3F34
+0x6244 = 0x3F35
+0x6246 = 0x3F36
+0x624C = 0x3F37
+0x6250 = 0x3F38
+0x6251 = 0x3F39
+0x6252 = 0x3F3A
+0x6254 = 0x3F3B
+0x6256 = 0x3F3C
+0x625A = 0x3F3D
+0x625C = 0x3F3E
+0x6264 = 0x3F3F
+0x626D = 0x3F40
+0x626F = 0x3F41
+0x6273 = 0x3F42
+0x627A = 0x3F43
+0x627D = 0x3F44
+0x628D = 0x3F45
+0x628E = 0x3F46
+0x628F = 0x3F47
+0x6290 = 0x3F48
+0x62A6 = 0x3F49
+0x62A8 = 0x3F4A
+0x62B3 = 0x3F4B
+0x62B6 = 0x3F4C
+0x62B7 = 0x3F4D
+0x62BA = 0x3F4E
+0x62BE = 0x3F4F
+0x62BF = 0x3F50
+0x62C4 = 0x3F51
+0x62CE = 0x3F52
+0x62D5 = 0x3F53
+0x62D6 = 0x3F54
+0x62DA = 0x3F55
+0x62EA = 0x3F56
+0x62F2 = 0x3F57
+0x62F4 = 0x3F58
+0x62FC = 0x3F59
+0x62FD = 0x3F5A
+0x6303 = 0x3F5B
+0x6304 = 0x3F5C
+0x630A = 0x3F5D
+0x630B = 0x3F5E
+0x630D = 0x3F5F
+0x6310 = 0x3F60
+0x6313 = 0x3F61
+0x6316 = 0x3F62
+0x6318 = 0x3F63
+0x6329 = 0x3F64
+0x632A = 0x3F65
+0x632D = 0x3F66
+0x6335 = 0x3F67
+0x6336 = 0x3F68
+0x6339 = 0x3F69
+0x633C = 0x3F6A
+0x6341 = 0x3F6B
+0x6342 = 0x3F6C
+0x6343 = 0x3F6D
+0x6344 = 0x3F6E
+0x6346 = 0x3F6F
+0x634A = 0x3F70
+0x634B = 0x3F71
+0x634E = 0x3F72
+0x6352 = 0x3F73
+0x6353 = 0x3F74
+0x6354 = 0x3F75
+0x6358 = 0x3F76
+0x635B = 0x3F77
+0x6365 = 0x3F78
+0x6366 = 0x3F79
+0x636C = 0x3F7A
+0x636D = 0x3F7B
+0x6371 = 0x3F7C
+0x6374 = 0x3F7D
+0x6375 = 0x3F7E
+0x6378 = 0x4021
+0x637C = 0x4022
+0x637D = 0x4023
+0x637F = 0x4024
+0x6382 = 0x4025
+0x6384 = 0x4026
+0x6387 = 0x4027
+0x638A = 0x4028
+0x6390 = 0x4029
+0x6394 = 0x402A
+0x6395 = 0x402B
+0x6399 = 0x402C
+0x639A = 0x402D
+0x639E = 0x402E
+0x63A4 = 0x402F
+0x63A6 = 0x4030
+0x63AD = 0x4031
+0x63AE = 0x4032
+0x63AF = 0x4033
+0x63BD = 0x4034
+0x63C1 = 0x4035
+0x63C5 = 0x4036
+0x63C8 = 0x4037
+0x63CE = 0x4038
+0x63D1 = 0x4039
+0x63D3 = 0x403A
+0x63D4 = 0x403B
+0x63D5 = 0x403C
+0x63DC = 0x403D
+0x63E0 = 0x403E
+0x63E5 = 0x403F
+0x63EA = 0x4040
+0x63EC = 0x4041
+0x63F2 = 0x4042
+0x63F3 = 0x4043
+0x63F5 = 0x4044
+0x63F8 = 0x4045
+0x63F9 = 0x4046
+0x6409 = 0x4047
+0x640A = 0x4048
+0x6410 = 0x4049
+0x6412 = 0x404A
+0x6414 = 0x404B
+0x6418 = 0x404C
+0x641E = 0x404D
+0x6420 = 0x404E
+0x6422 = 0x404F
+0x6424 = 0x4050
+0x6425 = 0x4051
+0x6429 = 0x4052
+0x642A = 0x4053
+0x642F = 0x4054
+0x6430 = 0x4055
+0x6435 = 0x4056
+0x643D = 0x4057
+0x643F = 0x4058
+0x644B = 0x4059
+0x644F = 0x405A
+0x6451 = 0x405B
+0x6452 = 0x405C
+0x6453 = 0x405D
+0x6454 = 0x405E
+0x645A = 0x405F
+0x645B = 0x4060
+0x645C = 0x4061
+0x645D = 0x4062
+0x645F = 0x4063
+0x6460 = 0x4064
+0x6461 = 0x4065
+0x6463 = 0x4066
+0x646D = 0x4067
+0x6473 = 0x4068
+0x6474 = 0x4069
+0x647B = 0x406A
+0x647D = 0x406B
+0x6485 = 0x406C
+0x6487 = 0x406D
+0x648F = 0x406E
+0x6490 = 0x406F
+0x6491 = 0x4070
+0x6498 = 0x4071
+0x6499 = 0x4072
+0x649B = 0x4073
+0x649D = 0x4074
+0x649F = 0x4075
+0x64A1 = 0x4076
+0x64A3 = 0x4077
+0x64A6 = 0x4078
+0x64A8 = 0x4079
+0x64AC = 0x407A
+0x64B3 = 0x407B
+0x64BD = 0x407C
+0x64BE = 0x407D
+0x64BF = 0x407E
+0x64C4 = 0x4121
+0x64C9 = 0x4122
+0x64CA = 0x4123
+0x64CB = 0x4124
+0x64CC = 0x4125
+0x64CE = 0x4126
+0x64D0 = 0x4127
+0x64D1 = 0x4128
+0x64D5 = 0x4129
+0x64D7 = 0x412A
+0x64E4 = 0x412B
+0x64E5 = 0x412C
+0x64E9 = 0x412D
+0x64EA = 0x412E
+0x64ED = 0x412F
+0x64F0 = 0x4130
+0x64F5 = 0x4131
+0x64F7 = 0x4132
+0x64FB = 0x4133
+0x64FF = 0x4134
+0x6501 = 0x4135
+0x6504 = 0x4136
+0x6508 = 0x4137
+0x6509 = 0x4138
+0x650A = 0x4139
+0x650F = 0x413A
+0x6513 = 0x413B
+0x6514 = 0x413C
+0x6516 = 0x413D
+0x6519 = 0x413E
+0x651B = 0x413F
+0x651E = 0x4140
+0x651F = 0x4141
+0x6522 = 0x4142
+0x6526 = 0x4143
+0x6529 = 0x4144
+0x652E = 0x4145
+0x6531 = 0x4146
+0x653A = 0x4147
+0x653C = 0x4148
+0x653D = 0x4149
+0x6543 = 0x414A
+0x6547 = 0x414B
+0x6549 = 0x414C
+0x6550 = 0x414D
+0x6552 = 0x414E
+0x6554 = 0x414F
+0x655F = 0x4150
+0x6560 = 0x4151
+0x6567 = 0x4152
+0x656B = 0x4153
+0x657A = 0x4154
+0x657D = 0x4155
+0x6581 = 0x4156
+0x6585 = 0x4157
+0x658A = 0x4158
+0x6592 = 0x4159
+0x6595 = 0x415A
+0x6598 = 0x415B
+0x659D = 0x415C
+0x65A0 = 0x415D
+0x65A3 = 0x415E
+0x65A6 = 0x415F
+0x65AE = 0x4160
+0x65B2 = 0x4161
+0x65B3 = 0x4162
+0x65B4 = 0x4163
+0x65BF = 0x4164
+0x65C2 = 0x4165
+0x65C8 = 0x4166
+0x65C9 = 0x4167
+0x65CE = 0x4168
+0x65D0 = 0x4169
+0x65D4 = 0x416A
+0x65D6 = 0x416B
+0x65D8 = 0x416C
+0x65DF = 0x416D
+0x65F0 = 0x416E
+0x65F2 = 0x416F
+0x65F4 = 0x4170
+0x65F5 = 0x4171
+0x65F9 = 0x4172
+0x65FE = 0x4173
+0x65FF = 0x4174
+0x6600 = 0x4175
+0x6604 = 0x4176
+0x6608 = 0x4177
+0x6609 = 0x4178
+0x660D = 0x4179
+0x6611 = 0x417A
+0x6612 = 0x417B
+0x6615 = 0x417C
+0x6616 = 0x417D
+0x661D = 0x417E
+0x661E = 0x4221
+0x6621 = 0x4222
+0x6622 = 0x4223
+0x6623 = 0x4224
+0x6624 = 0x4225
+0x6626 = 0x4226
+0x6629 = 0x4227
+0x662A = 0x4228
+0x662B = 0x4229
+0x662C = 0x422A
+0x662E = 0x422B
+0x6630 = 0x422C
+0x6631 = 0x422D
+0x6633 = 0x422E
+0x6637 = 0x4230
+0x6639 = 0x422F
+0x6640 = 0x4231
+0x6645 = 0x4232
+0x6646 = 0x4233
+0x664A = 0x4234
+0x664C = 0x4235
+0x664E = 0x4237
+0x6651 = 0x4236
+0x6657 = 0x4238
+0x6658 = 0x4239
+0x6659 = 0x423A
+0x665B = 0x423B
+0x665C = 0x423C
+0x6660 = 0x423D
+0x6661 = 0x423E
+0x666A = 0x4240
+0x666B = 0x4241
+0x666C = 0x4242
+0x6673 = 0x4244
+0x6675 = 0x4245
+0x6677 = 0x4247
+0x6678 = 0x4248
+0x6679 = 0x4249
+0x667B = 0x424A
+0x667C = 0x424C
+0x667E = 0x4243
+0x667F = 0x4246
+0x6680 = 0x424B
+0x668B = 0x424D
+0x668C = 0x424E
+0x668D = 0x424F
+0x6690 = 0x4250
+0x6692 = 0x4251
+0x6699 = 0x4252
+0x669A = 0x4253
+0x669B = 0x4254
+0x669C = 0x4255
+0x669F = 0x4256
+0x66A0 = 0x4257
+0x66A4 = 0x4258
+0x66AD = 0x4259
+0x66B1 = 0x425A
+0x66B2 = 0x425B
+0x66B5 = 0x425C
+0x66BB = 0x425D
+0x66BF = 0x425E
+0x66C0 = 0x425F
+0x66C2 = 0x4260
+0x66C3 = 0x4261
+0x66C8 = 0x4262
+0x66CC = 0x4263
+0x66CE = 0x4264
+0x66CF = 0x4265
+0x66D4 = 0x4266
+0x66DB = 0x4267
+0x66DF = 0x4268
+0x66E8 = 0x4269
+0x66EB = 0x426A
+0x66EC = 0x426B
+0x66EE = 0x426C
+0x66FA = 0x426D
+0x66FB = 0x423F
+0x6705 = 0x426E
+0x6707 = 0x426F
+0x670E = 0x4270
+0x6713 = 0x4271
+0x6719 = 0x4272
+0x671C = 0x4273
+0x6720 = 0x4274
+0x6722 = 0x4275
+0x6733 = 0x4276
+0x673E = 0x4277
+0x6745 = 0x4278
+0x6747 = 0x4279
+0x6748 = 0x427A
+0x674C = 0x427B
+0x6754 = 0x427C
+0x6755 = 0x427D
+0x675D = 0x427E
+0x6766 = 0x4321
+0x676C = 0x4322
+0x676E = 0x4323
+0x6774 = 0x4324
+0x6776 = 0x4325
+0x677B = 0x4326
+0x6781 = 0x4327
+0x6784 = 0x4328
+0x678E = 0x4329
+0x678F = 0x432A
+0x6791 = 0x432B
+0x6793 = 0x432C
+0x6796 = 0x432D
+0x6798 = 0x432E
+0x6799 = 0x432F
+0x679B = 0x4330
+0x67B0 = 0x4331
+0x67B1 = 0x4332
+0x67B2 = 0x4333
+0x67B5 = 0x4334
+0x67BB = 0x4335
+0x67BC = 0x4336
+0x67BD = 0x4337
+0x67C0 = 0x4339
+0x67C2 = 0x433A
+0x67C3 = 0x433B
+0x67C5 = 0x433C
+0x67C8 = 0x433D
+0x67C9 = 0x433E
+0x67D2 = 0x433F
+0x67D7 = 0x4340
+0x67D9 = 0x4341
+0x67DC = 0x4342
+0x67E1 = 0x4343
+0x67E6 = 0x4344
+0x67F0 = 0x4345
+0x67F2 = 0x4346
+0x67F6 = 0x4347
+0x67F7 = 0x4348
+0x67F9 = 0x4338
+0x6814 = 0x434A
+0x6819 = 0x434B
+0x681D = 0x434C
+0x681F = 0x434D
+0x6827 = 0x434F
+0x6828 = 0x434E
+0x682C = 0x4350
+0x682D = 0x4351
+0x682F = 0x4352
+0x6830 = 0x4353
+0x6831 = 0x4354
+0x6833 = 0x4355
+0x683B = 0x4356
+0x683F = 0x4357
+0x6844 = 0x4358
+0x6845 = 0x4359
+0x684A = 0x435A
+0x684C = 0x435B
+0x6852 = 0x4349
+0x6855 = 0x435C
+0x6857 = 0x435D
+0x6858 = 0x435E
+0x685B = 0x435F
+0x686B = 0x4360
+0x686E = 0x4361
+0x686F = 0x4362
+0x6870 = 0x4363
+0x6871 = 0x4364
+0x6872 = 0x4365
+0x6875 = 0x4366
+0x6879 = 0x4367
+0x687A = 0x4368
+0x687B = 0x4369
+0x687C = 0x436A
+0x6882 = 0x436B
+0x6884 = 0x436C
+0x6886 = 0x436D
+0x6888 = 0x436E
+0x6896 = 0x436F
+0x6898 = 0x4370
+0x689A = 0x4371
+0x689C = 0x4372
+0x68A1 = 0x4373
+0x68A3 = 0x4374
+0x68A5 = 0x4375
+0x68A9 = 0x4376
+0x68AA = 0x4377
+0x68AE = 0x4378
+0x68B2 = 0x4379
+0x68BB = 0x437A
+0x68C5 = 0x437B
+0x68C8 = 0x437C
+0x68CC = 0x437D
+0x68CF = 0x437E
+0x68D0 = 0x4421
+0x68D1 = 0x4422
+0x68D3 = 0x4423
+0x68D6 = 0x4424
+0x68D9 = 0x4425
+0x68DC = 0x4426
+0x68DD = 0x4427
+0x68E5 = 0x4428
+0x68E8 = 0x4429
+0x68EA = 0x442A
+0x68EB = 0x442B
+0x68EC = 0x442C
+0x68ED = 0x442D
+0x68F0 = 0x442E
+0x68F1 = 0x442F
+0x68F5 = 0x4430
+0x68F6 = 0x4431
+0x68FB = 0x4432
+0x68FC = 0x4433
+0x68FD = 0x4434
+0x6906 = 0x4435
+0x6909 = 0x4436
+0x690A = 0x4437
+0x6910 = 0x4438
+0x6911 = 0x4439
+0x6913 = 0x443A
+0x6916 = 0x443B
+0x6917 = 0x443C
+0x6931 = 0x443D
+0x6933 = 0x443E
+0x6935 = 0x443F
+0x6938 = 0x4440
+0x693B = 0x4441
+0x6942 = 0x4442
+0x6945 = 0x4443
+0x6949 = 0x4444
+0x694E = 0x4445
+0x6957 = 0x4446
+0x695B = 0x4447
+0x6963 = 0x4448
+0x6964 = 0x4449
+0x6965 = 0x444A
+0x6966 = 0x444B
+0x6968 = 0x444C
+0x6969 = 0x444D
+0x696C = 0x444E
+0x6970 = 0x444F
+0x6971 = 0x4450
+0x6972 = 0x4451
+0x697A = 0x4452
+0x697B = 0x4453
+0x697F = 0x4454
+0x6980 = 0x4455
+0x698D = 0x4456
+0x6992 = 0x4457
+0x6996 = 0x4458
+0x6998 = 0x4459
+0x69A1 = 0x445A
+0x69A5 = 0x445B
+0x69A6 = 0x445C
+0x69A8 = 0x445D
+0x69AB = 0x445E
+0x69AD = 0x445F
+0x69AF = 0x4460
+0x69B7 = 0x4461
+0x69B8 = 0x4462
+0x69BA = 0x4463
+0x69BC = 0x4464
+0x69C5 = 0x4465
+0x69C8 = 0x4466
+0x69D1 = 0x4467
+0x69D6 = 0x4468
+0x69D7 = 0x4469
+0x69E2 = 0x446A
+0x69E5 = 0x446B
+0x69EE = 0x446C
+0x69EF = 0x446D
+0x69F1 = 0x446E
+0x69F3 = 0x446F
+0x69F5 = 0x4470
+0x69FE = 0x4471
+0x6A00 = 0x4472
+0x6A01 = 0x4473
+0x6A03 = 0x4474
+0x6A0F = 0x4475
+0x6A11 = 0x4476
+0x6A15 = 0x4477
+0x6A1A = 0x4478
+0x6A1D = 0x4479
+0x6A20 = 0x447A
+0x6A24 = 0x447B
+0x6A28 = 0x447C
+0x6A30 = 0x447D
+0x6A32 = 0x447E
+0x6A34 = 0x4521
+0x6A37 = 0x4522
+0x6A3B = 0x4523
+0x6A3E = 0x4524
+0x6A3F = 0x4525
+0x6A45 = 0x4526
+0x6A46 = 0x4527
+0x6A49 = 0x4528
+0x6A4A = 0x4529
+0x6A4E = 0x452A
+0x6A50 = 0x452B
+0x6A51 = 0x452C
+0x6A52 = 0x452D
+0x6A55 = 0x452E
+0x6A56 = 0x452F
+0x6A5B = 0x4530
+0x6A64 = 0x4531
+0x6A67 = 0x4532
+0x6A6A = 0x4533
+0x6A71 = 0x4534
+0x6A73 = 0x4535
+0x6A7E = 0x4536
+0x6A81 = 0x4537
+0x6A83 = 0x4538
+0x6A86 = 0x4539
+0x6A87 = 0x453A
+0x6A89 = 0x453B
+0x6A8B = 0x453C
+0x6A91 = 0x453D
+0x6A9B = 0x453E
+0x6A9D = 0x453F
+0x6A9E = 0x4540
+0x6A9F = 0x4541
+0x6AA5 = 0x4542
+0x6AAB = 0x4543
+0x6AAF = 0x4544
+0x6AB0 = 0x4545
+0x6AB1 = 0x4546
+0x6AB4 = 0x4547
+0x6ABD = 0x4548
+0x6ABE = 0x4549
+0x6ABF = 0x454A
+0x6AC6 = 0x454B
+0x6AC8 = 0x454D
+0x6AC9 = 0x454C
+0x6ACC = 0x454E
+0x6AD0 = 0x454F
+0x6AD4 = 0x4550
+0x6AD5 = 0x4551
+0x6AD6 = 0x4552
+0x6ADC = 0x4553
+0x6ADD = 0x4554
+0x6AE4 = 0x4555
+0x6AE7 = 0x4556
+0x6AEC = 0x4557
+0x6AF0 = 0x4558
+0x6AF1 = 0x4559
+0x6AF2 = 0x455A
+0x6AFC = 0x455B
+0x6AFD = 0x455C
+0x6B02 = 0x455D
+0x6B03 = 0x455E
+0x6B06 = 0x455F
+0x6B07 = 0x4560
+0x6B09 = 0x4561
+0x6B0F = 0x4562
+0x6B10 = 0x4563
+0x6B11 = 0x4564
+0x6B17 = 0x4565
+0x6B1B = 0x4566
+0x6B1E = 0x4567
+0x6B24 = 0x4568
+0x6B28 = 0x4569
+0x6B2B = 0x456A
+0x6B2C = 0x456B
+0x6B2F = 0x456C
+0x6B35 = 0x456D
+0x6B36 = 0x456E
+0x6B3B = 0x456F
+0x6B3F = 0x4570
+0x6B46 = 0x4571
+0x6B4A = 0x4572
+0x6B4D = 0x4573
+0x6B52 = 0x4574
+0x6B56 = 0x4575
+0x6B58 = 0x4576
+0x6B5D = 0x4577
+0x6B60 = 0x4578
+0x6B67 = 0x4579
+0x6B6B = 0x457A
+0x6B6E = 0x457B
+0x6B70 = 0x457C
+0x6B75 = 0x457D
+0x6B7D = 0x457E
+0x6B7E = 0x4621
+0x6B82 = 0x4622
+0x6B85 = 0x4623
+0x6B97 = 0x4624
+0x6B9B = 0x4625
+0x6B9F = 0x4626
+0x6BA0 = 0x4627
+0x6BA2 = 0x4628
+0x6BA3 = 0x4629
+0x6BA8 = 0x462A
+0x6BA9 = 0x462B
+0x6BAC = 0x462C
+0x6BAD = 0x462D
+0x6BAE = 0x462E
+0x6BB0 = 0x462F
+0x6BB8 = 0x4630
+0x6BB9 = 0x4631
+0x6BBD = 0x4632
+0x6BBE = 0x4633
+0x6BC3 = 0x4634
+0x6BC4 = 0x4635
+0x6BC9 = 0x4636
+0x6BCC = 0x4637
+0x6BD6 = 0x4638
+0x6BDA = 0x4639
+0x6BE1 = 0x463A
+0x6BE3 = 0x463B
+0x6BE6 = 0x463C
+0x6BE7 = 0x463D
+0x6BEE = 0x463E
+0x6BF1 = 0x463F
+0x6BF7 = 0x4640
+0x6BF9 = 0x4641
+0x6BFF = 0x4642
+0x6C02 = 0x4643
+0x6C04 = 0x4644
+0x6C05 = 0x4645
+0x6C09 = 0x4646
+0x6C0D = 0x4647
+0x6C0E = 0x4648
+0x6C10 = 0x4649
+0x6C12 = 0x464A
+0x6C19 = 0x464B
+0x6C1F = 0x464C
+0x6C26 = 0x464D
+0x6C27 = 0x464E
+0x6C28 = 0x464F
+0x6C2C = 0x4650
+0x6C2E = 0x4651
+0x6C33 = 0x4652
+0x6C35 = 0x4653
+0x6C36 = 0x4654
+0x6C3A = 0x4655
+0x6C3B = 0x4656
+0x6C3F = 0x4657
+0x6C4A = 0x4658
+0x6C4B = 0x4659
+0x6C4D = 0x465A
+0x6C4F = 0x465B
+0x6C52 = 0x465C
+0x6C54 = 0x465D
+0x6C59 = 0x465E
+0x6C5B = 0x465F
+0x6C5C = 0x4660
+0x6C67 = 0x4736
+0x6C6B = 0x4661
+0x6C6D = 0x4662
+0x6C6F = 0x4663
+0x6C74 = 0x4664
+0x6C76 = 0x4665
+0x6C78 = 0x4666
+0x6C79 = 0x4667
+0x6C7B = 0x4668
+0x6C85 = 0x4669
+0x6C86 = 0x466A
+0x6C87 = 0x466B
+0x6C89 = 0x466C
+0x6C94 = 0x466D
+0x6C95 = 0x466E
+0x6C97 = 0x466F
+0x6C98 = 0x4670
+0x6C9C = 0x4671
+0x6C9F = 0x4672
+0x6CB0 = 0x4673
+0x6CB2 = 0x4674
+0x6CB4 = 0x4675
+0x6CC2 = 0x4676
+0x6CC6 = 0x4677
+0x6CCD = 0x4678
+0x6CCF = 0x4679
+0x6CD0 = 0x467A
+0x6CD1 = 0x467B
+0x6CD2 = 0x467C
+0x6CD4 = 0x467D
+0x6CD6 = 0x467E
+0x6CDA = 0x4721
+0x6CDC = 0x4722
+0x6CE0 = 0x4723
+0x6CE7 = 0x4724
+0x6CE9 = 0x4725
+0x6CEB = 0x4726
+0x6CEC = 0x4727
+0x6CEE = 0x4728
+0x6CF2 = 0x4729
+0x6CF4 = 0x472A
+0x6D04 = 0x472B
+0x6D07 = 0x472C
+0x6D0A = 0x472D
+0x6D0E = 0x472E
+0x6D0F = 0x472F
+0x6D11 = 0x4730
+0x6D13 = 0x4731
+0x6D1A = 0x4732
+0x6D26 = 0x4733
+0x6D27 = 0x4734
+0x6D28 = 0x4735
+0x6D2E = 0x4737
+0x6D2F = 0x4738
+0x6D31 = 0x4739
+0x6D39 = 0x473A
+0x6D3C = 0x473B
+0x6D3F = 0x473C
+0x6D57 = 0x473D
+0x6D5E = 0x473E
+0x6D5F = 0x473F
+0x6D61 = 0x4740
+0x6D65 = 0x4741
+0x6D67 = 0x4742
+0x6D6F = 0x4743
+0x6D70 = 0x4744
+0x6D7C = 0x4745
+0x6D82 = 0x4746
+0x6D87 = 0x4747
+0x6D91 = 0x4748
+0x6D92 = 0x4749
+0x6D94 = 0x474A
+0x6D96 = 0x474B
+0x6D97 = 0x474C
+0x6D98 = 0x474D
+0x6DAA = 0x474E
+0x6DAC = 0x474F
+0x6DB4 = 0x4750
+0x6DB7 = 0x4751
+0x6DB9 = 0x4752
+0x6DBD = 0x4753
+0x6DBF = 0x4754
+0x6DC4 = 0x4755
+0x6DC8 = 0x4756
+0x6DCA = 0x4757
+0x6DCE = 0x4758
+0x6DCF = 0x4759
+0x6DD6 = 0x475A
+0x6DDB = 0x475B
+0x6DDD = 0x475C
+0x6DDF = 0x475D
+0x6DE0 = 0x475E
+0x6DE2 = 0x475F
+0x6DE5 = 0x4760
+0x6DE9 = 0x4761
+0x6DEF = 0x4762
+0x6DF0 = 0x4763
+0x6DF4 = 0x4764
+0x6DF6 = 0x4765
+0x6DFC = 0x4766
+0x6E00 = 0x4767
+0x6E04 = 0x4768
+0x6E1E = 0x4769
+0x6E22 = 0x476A
+0x6E27 = 0x476B
+0x6E32 = 0x476C
+0x6E36 = 0x476D
+0x6E39 = 0x476E
+0x6E3B = 0x476F
+0x6E3C = 0x4770
+0x6E44 = 0x4771
+0x6E45 = 0x4772
+0x6E48 = 0x4773
+0x6E49 = 0x4774
+0x6E4B = 0x4775
+0x6E4F = 0x4776
+0x6E51 = 0x4777
+0x6E52 = 0x4778
+0x6E53 = 0x4779
+0x6E54 = 0x477A
+0x6E57 = 0x477B
+0x6E5C = 0x477C
+0x6E5D = 0x477D
+0x6E5E = 0x477E
+0x6E62 = 0x4821
+0x6E63 = 0x4822
+0x6E68 = 0x4823
+0x6E73 = 0x4824
+0x6E7B = 0x4825
+0x6E7D = 0x4826
+0x6E8D = 0x4827
+0x6E93 = 0x4828
+0x6E99 = 0x4829
+0x6EA0 = 0x482A
+0x6EA7 = 0x482B
+0x6EAD = 0x482C
+0x6EAE = 0x482D
+0x6EB1 = 0x482E
+0x6EB3 = 0x482F
+0x6EBB = 0x4830
+0x6EBF = 0x4831
+0x6EC0 = 0x4832
+0x6EC1 = 0x4833
+0x6EC3 = 0x4834
+0x6EC7 = 0x4835
+0x6EC8 = 0x4836
+0x6ECA = 0x4837
+0x6ECD = 0x4838
+0x6ECE = 0x4839
+0x6ECF = 0x483A
+0x6EEB = 0x483B
+0x6EED = 0x483C
+0x6EEE = 0x483D
+0x6EF9 = 0x483E
+0x6EFB = 0x483F
+0x6EFD = 0x4840
+0x6F04 = 0x4841
+0x6F08 = 0x4842
+0x6F0A = 0x4843
+0x6F0C = 0x4844
+0x6F0D = 0x4845
+0x6F16 = 0x4846
+0x6F18 = 0x4847
+0x6F1A = 0x4848
+0x6F1B = 0x4849
+0x6F26 = 0x484A
+0x6F29 = 0x484B
+0x6F2A = 0x484C
+0x6F2D = 0x4853
+0x6F2F = 0x484D
+0x6F30 = 0x484E
+0x6F33 = 0x484F
+0x6F36 = 0x4850
+0x6F3B = 0x4851
+0x6F3C = 0x4852
+0x6F4F = 0x4854
+0x6F51 = 0x4855
+0x6F52 = 0x4856
+0x6F53 = 0x4857
+0x6F57 = 0x4858
+0x6F59 = 0x4859
+0x6F5A = 0x485A
+0x6F5D = 0x485B
+0x6F5E = 0x485C
+0x6F61 = 0x485D
+0x6F62 = 0x485E
+0x6F68 = 0x485F
+0x6F6C = 0x4860
+0x6F7D = 0x4861
+0x6F7E = 0x4862
+0x6F83 = 0x4863
+0x6F87 = 0x4864
+0x6F88 = 0x4865
+0x6F8B = 0x4866
+0x6F8C = 0x4867
+0x6F8D = 0x4868
+0x6F90 = 0x4869
+0x6F92 = 0x486A
+0x6F93 = 0x486B
+0x6F94 = 0x486C
+0x6F96 = 0x486D
+0x6F9A = 0x486E
+0x6F9F = 0x486F
+0x6FA0 = 0x4870
+0x6FA5 = 0x4871
+0x6FA6 = 0x4872
+0x6FA7 = 0x4873
+0x6FA8 = 0x4874
+0x6FAE = 0x4875
+0x6FAF = 0x4876
+0x6FB0 = 0x4877
+0x6FB5 = 0x4878
+0x6FB6 = 0x4879
+0x6FBC = 0x487A
+0x6FC5 = 0x487B
+0x6FC7 = 0x487C
+0x6FC8 = 0x487D
+0x6FCA = 0x487E
+0x6FDA = 0x4921
+0x6FDE = 0x4922
+0x6FE8 = 0x4923
+0x6FE9 = 0x4924
+0x6FF0 = 0x4925
+0x6FF5 = 0x4926
+0x6FF9 = 0x4927
+0x6FFC = 0x4928
+0x6FFD = 0x4929
+0x7000 = 0x492A
+0x7005 = 0x492B
+0x7006 = 0x492C
+0x7007 = 0x492D
+0x700D = 0x492E
+0x7017 = 0x492F
+0x7020 = 0x4930
+0x7023 = 0x4931
+0x702F = 0x4932
+0x7034 = 0x4933
+0x7037 = 0x4934
+0x7039 = 0x4935
+0x703C = 0x4936
+0x7043 = 0x4937
+0x7044 = 0x4938
+0x7048 = 0x4939
+0x7049 = 0x493A
+0x704A = 0x493B
+0x704B = 0x493C
+0x704E = 0x4941
+0x7054 = 0x493D
+0x7055 = 0x493E
+0x705D = 0x493F
+0x705E = 0x4940
+0x7064 = 0x4942
+0x7065 = 0x4943
+0x706C = 0x4944
+0x706E = 0x4945
+0x7075 = 0x4946
+0x7076 = 0x4947
+0x707E = 0x4948
+0x7081 = 0x4949
+0x7085 = 0x494A
+0x7086 = 0x494B
+0x7094 = 0x494C
+0x7095 = 0x494D
+0x7096 = 0x494E
+0x7097 = 0x494F
+0x7098 = 0x4950
+0x709B = 0x4951
+0x70A4 = 0x4952
+0x70AB = 0x4953
+0x70B0 = 0x4954
+0x70B1 = 0x4955
+0x70B4 = 0x4956
+0x70B7 = 0x4957
+0x70CA = 0x4958
+0x70D1 = 0x4959
+0x70D3 = 0x495A
+0x70D4 = 0x495B
+0x70D5 = 0x495C
+0x70D6 = 0x495D
+0x70D8 = 0x495E
+0x70DC = 0x495F
+0x70E4 = 0x4960
+0x70FA = 0x4961
+0x7103 = 0x4962
+0x7104 = 0x4963
+0x7105 = 0x4964
+0x7106 = 0x4965
+0x7107 = 0x4966
+0x710B = 0x4967
+0x710C = 0x4968
+0x710F = 0x4969
+0x711E = 0x496A
+0x7120 = 0x496B
+0x712B = 0x496C
+0x712D = 0x496D
+0x712F = 0x496E
+0x7130 = 0x496F
+0x7131 = 0x4970
+0x7138 = 0x4971
+0x7141 = 0x4972
+0x7145 = 0x4973
+0x7146 = 0x4974
+0x7147 = 0x4975
+0x714A = 0x4976
+0x714B = 0x4977
+0x7150 = 0x4978
+0x7152 = 0x4979
+0x7157 = 0x497A
+0x715A = 0x497B
+0x715C = 0x497C
+0x715E = 0x497D
+0x7160 = 0x497E
+0x7168 = 0x4A21
+0x7179 = 0x4A22
+0x7180 = 0x4A23
+0x7185 = 0x4A24
+0x7187 = 0x4A25
+0x718C = 0x4A26
+0x7192 = 0x4A27
+0x719A = 0x4A28
+0x719B = 0x4A29
+0x71A0 = 0x4A2A
+0x71A2 = 0x4A2B
+0x71AF = 0x4A2C
+0x71B0 = 0x4A2D
+0x71B2 = 0x4A2E
+0x71B3 = 0x4A2F
+0x71BA = 0x4A30
+0x71BF = 0x4A31
+0x71C0 = 0x4A32
+0x71C1 = 0x4A33
+0x71C4 = 0x4A34
+0x71CB = 0x4A35
+0x71CC = 0x4A36
+0x71D3 = 0x4A37
+0x71D6 = 0x4A38
+0x71D9 = 0x4A39
+0x71DA = 0x4A3A
+0x71DC = 0x4A3B
+0x71F8 = 0x4A3C
+0x71FE = 0x4A3D
+0x7200 = 0x4A3E
+0x7207 = 0x4A3F
+0x7208 = 0x4A40
+0x7209 = 0x4A41
+0x7213 = 0x4A42
+0x7217 = 0x4A43
+0x721A = 0x4A44
+0x721D = 0x4A45
+0x721F = 0x4A46
+0x7224 = 0x4A47
+0x722B = 0x4A48
+0x722F = 0x4A49
+0x7234 = 0x4A4A
+0x7238 = 0x4A4B
+0x7239 = 0x4A4C
+0x7241 = 0x4A4D
+0x7242 = 0x4A4E
+0x7243 = 0x4A4F
+0x7245 = 0x4A50
+0x724E = 0x4A51
+0x724F = 0x4A52
+0x7250 = 0x4A53
+0x7253 = 0x4A54
+0x7255 = 0x4A55
+0x7256 = 0x4A56
+0x725A = 0x4A57
+0x725C = 0x4A58
+0x725E = 0x4A59
+0x7260 = 0x4A5A
+0x7263 = 0x4A5B
+0x7268 = 0x4A5C
+0x726B = 0x4A5D
+0x726E = 0x4A5E
+0x726F = 0x4A5F
+0x7271 = 0x4A60
+0x7277 = 0x4A61
+0x7278 = 0x4A62
+0x727B = 0x4A63
+0x727C = 0x4A64
+0x727F = 0x4A65
+0x7284 = 0x4A66
+0x7289 = 0x4A67
+0x728D = 0x4A68
+0x728E = 0x4A69
+0x7293 = 0x4A6A
+0x729B = 0x4A6B
+0x72A8 = 0x4A6C
+0x72AD = 0x4A6D
+0x72AE = 0x4A6E
+0x72B1 = 0x4A6F
+0x72B4 = 0x4A70
+0x72BE = 0x4A71
+0x72C1 = 0x4A72
+0x72C7 = 0x4A73
+0x72C9 = 0x4A74
+0x72CC = 0x4A75
+0x72D5 = 0x4A76
+0x72D6 = 0x4A77
+0x72D8 = 0x4A78
+0x72DF = 0x4A79
+0x72E5 = 0x4A7A
+0x72F3 = 0x4A7B
+0x72F4 = 0x4A7C
+0x72FA = 0x4A7D
+0x72FB = 0x4A7E
+0x72FE = 0x4B21
+0x7302 = 0x4B22
+0x7304 = 0x4B23
+0x7305 = 0x4B24
+0x7307 = 0x4B25
+0x730B = 0x4B26
+0x730D = 0x4B27
+0x7312 = 0x4B28
+0x7313 = 0x4B29
+0x7318 = 0x4B2A
+0x7319 = 0x4B2B
+0x731E = 0x4B2C
+0x7322 = 0x4B2D
+0x7324 = 0x4B2E
+0x7327 = 0x4B2F
+0x7328 = 0x4B30
+0x732C = 0x4B31
+0x7331 = 0x4B32
+0x7332 = 0x4B33
+0x7335 = 0x4B34
+0x733A = 0x4B35
+0x733B = 0x4B36
+0x733D = 0x4B37
+0x7343 = 0x4B38
+0x734D = 0x4B39
+0x7350 = 0x4B3A
+0x7352 = 0x4B3B
+0x7356 = 0x4B3C
+0x7358 = 0x4B3D
+0x735D = 0x4B3E
+0x735E = 0x4B3F
+0x735F = 0x4B40
+0x7360 = 0x4B41
+0x7366 = 0x4B42
+0x7367 = 0x4B43
+0x7369 = 0x4B44
+0x736B = 0x4B45
+0x736C = 0x4B46
+0x736E = 0x4B47
+0x736F = 0x4B48
+0x7371 = 0x4B49
+0x7377 = 0x4B4A
+0x7379 = 0x4B4B
+0x737C = 0x4B4C
+0x7380 = 0x4B4D
+0x7381 = 0x4B4E
+0x7383 = 0x4B4F
+0x7385 = 0x4B50
+0x7386 = 0x4B51
+0x738E = 0x4B52
+0x7390 = 0x4B53
+0x7393 = 0x4B54
+0x7395 = 0x4B55
+0x7397 = 0x4B56
+0x7398 = 0x4B57
+0x739C = 0x4B58
+0x739E = 0x4B59
+0x739F = 0x4B5A
+0x73A0 = 0x4B5B
+0x73A2 = 0x4B5C
+0x73A5 = 0x4B5D
+0x73A6 = 0x4B5E
+0x73AA = 0x4B5F
+0x73AB = 0x4B60
+0x73AD = 0x4B61
+0x73B5 = 0x4B62
+0x73B7 = 0x4B63
+0x73B9 = 0x4B64
+0x73BC = 0x4B65
+0x73BD = 0x4B66
+0x73BF = 0x4B67
+0x73C5 = 0x4B68
+0x73C6 = 0x4B69
+0x73C9 = 0x4B6A
+0x73CB = 0x4B6B
+0x73CC = 0x4B6C
+0x73CF = 0x4B6D
+0x73D2 = 0x4B6E
+0x73D3 = 0x4B6F
+0x73D6 = 0x4B70
+0x73D9 = 0x4B71
+0x73DD = 0x4B72
+0x73E1 = 0x4B73
+0x73E3 = 0x4B74
+0x73E6 = 0x4B75
+0x73E7 = 0x4B76
+0x73E9 = 0x4B77
+0x73F4 = 0x4B78
+0x73F5 = 0x4B79
+0x73F7 = 0x4B7A
+0x73F9 = 0x4B7B
+0x73FA = 0x4B7C
+0x73FB = 0x4B7D
+0x73FD = 0x4B7E
+0x73FF = 0x4C21
+0x7400 = 0x4C22
+0x7401 = 0x4C23
+0x7404 = 0x4C24
+0x7407 = 0x4C25
+0x740A = 0x4C26
+0x7411 = 0x4C27
+0x741A = 0x4C28
+0x741B = 0x4C29
+0x7424 = 0x4C2A
+0x7426 = 0x4C2B
+0x7428 = 0x4C2C
+0x7429 = 0x4C2D
+0x742A = 0x4C2E
+0x742B = 0x4C2F
+0x742C = 0x4C30
+0x742D = 0x4C31
+0x742E = 0x4C32
+0x742F = 0x4C33
+0x7430 = 0x4C34
+0x7431 = 0x4C35
+0x7439 = 0x4C36
+0x7440 = 0x4C37
+0x7443 = 0x4C38
+0x7444 = 0x4C39
+0x7446 = 0x4C3A
+0x7447 = 0x4C3B
+0x744B = 0x4C3C
+0x744D = 0x4C3D
+0x7451 = 0x4C3E
+0x7452 = 0x4C3F
+0x7457 = 0x4C40
+0x745D = 0x4C41
+0x7462 = 0x4C42
+0x7466 = 0x4C43
+0x7467 = 0x4C44
+0x7468 = 0x4C45
+0x746B = 0x4C46
+0x746D = 0x4C47
+0x746E = 0x4C48
+0x7471 = 0x4C49
+0x7472 = 0x4C4A
+0x7480 = 0x4C4B
+0x7481 = 0x4C4C
+0x7485 = 0x4C4D
+0x7486 = 0x4C4E
+0x7487 = 0x4C4F
+0x7489 = 0x4C50
+0x748F = 0x4C51
+0x7490 = 0x4C52
+0x7491 = 0x4C53
+0x7492 = 0x4C54
+0x7498 = 0x4C55
+0x7499 = 0x4C56
+0x749A = 0x4C57
+0x749C = 0x4C58
+0x749F = 0x4C59
+0x74A0 = 0x4C5A
+0x74A1 = 0x4C5B
+0x74A3 = 0x4C5C
+0x74A6 = 0x4C5D
+0x74A8 = 0x4C5E
+0x74A9 = 0x4C5F
+0x74AA = 0x4C60
+0x74AB = 0x4C61
+0x74AE = 0x4C62
+0x74AF = 0x4C63
+0x74B1 = 0x4C64
+0x74B2 = 0x4C65
+0x74B5 = 0x4C66
+0x74B9 = 0x4C67
+0x74BB = 0x4C68
+0x74BF = 0x4C69
+0x74C8 = 0x4C6A
+0x74C9 = 0x4C6B
+0x74CC = 0x4C6C
+0x74D0 = 0x4C6D
+0x74D3 = 0x4C6E
+0x74D8 = 0x4C6F
+0x74DA = 0x4C70
+0x74DB = 0x4C71
+0x74DE = 0x4C72
+0x74DF = 0x4C73
+0x74E4 = 0x4C74
+0x74E8 = 0x4C75
+0x74EA = 0x4C76
+0x74EB = 0x4C77
+0x74EF = 0x4C78
+0x74F4 = 0x4C79
+0x74FA = 0x4C7A
+0x74FB = 0x4C7B
+0x74FC = 0x4C7C
+0x74FF = 0x4C7D
+0x7506 = 0x4C7E
+0x7512 = 0x4D21
+0x7516 = 0x4D22
+0x7517 = 0x4D23
+0x7520 = 0x4D24
+0x7521 = 0x4D25
+0x7524 = 0x4D26
+0x7527 = 0x4D27
+0x7529 = 0x4D28
+0x752A = 0x4D29
+0x752F = 0x4D2A
+0x7536 = 0x4D2B
+0x7539 = 0x4D2C
+0x753D = 0x4D2D
+0x753E = 0x4D2E
+0x753F = 0x4D2F
+0x7540 = 0x4D30
+0x7543 = 0x4D31
+0x7547 = 0x4D32
+0x7548 = 0x4D33
+0x754E = 0x4D34
+0x7550 = 0x4D35
+0x7552 = 0x4D36
+0x7557 = 0x4D37
+0x755E = 0x4D38
+0x755F = 0x4D39
+0x7561 = 0x4D3A
+0x756F = 0x4D3B
+0x7571 = 0x4D3C
+0x7579 = 0x4D3D
+0x757A = 0x4D3E
+0x757B = 0x4D3F
+0x757C = 0x4D40
+0x757D = 0x4D41
+0x757E = 0x4D42
+0x7581 = 0x4D43
+0x7585 = 0x4D44
+0x7590 = 0x4D45
+0x7592 = 0x4D46
+0x7593 = 0x4D47
+0x7595 = 0x4D48
+0x7599 = 0x4D49
+0x759C = 0x4D4A
+0x75A2 = 0x4D4B
+0x75A4 = 0x4D4C
+0x75B4 = 0x4D4D
+0x75BA = 0x4D4E
+0x75BF = 0x4D4F
+0x75C0 = 0x4D50
+0x75C1 = 0x4D51
+0x75C4 = 0x4D52
+0x75C6 = 0x4D53
+0x75CC = 0x4D54
+0x75CE = 0x4D55
+0x75CF = 0x4D56
+0x75D7 = 0x4D57
+0x75DC = 0x4D58
+0x75DF = 0x4D59
+0x75E0 = 0x4D5A
+0x75E1 = 0x4D5B
+0x75E4 = 0x4D5C
+0x75E7 = 0x4D5D
+0x75EC = 0x4D5E
+0x75EE = 0x4D5F
+0x75EF = 0x4D60
+0x75F1 = 0x4D61
+0x75F9 = 0x4D62
+0x7600 = 0x4D63
+0x7602 = 0x4D64
+0x7603 = 0x4D65
+0x7604 = 0x4D66
+0x7607 = 0x4D67
+0x7608 = 0x4D68
+0x760A = 0x4D69
+0x760C = 0x4D6A
+0x760F = 0x4D6B
+0x7612 = 0x4D6C
+0x7613 = 0x4D6D
+0x7615 = 0x4D6E
+0x7616 = 0x4D6F
+0x7619 = 0x4D70
+0x761B = 0x4D71
+0x761C = 0x4D72
+0x761D = 0x4D73
+0x761E = 0x4D74
+0x7623 = 0x4D75
+0x7625 = 0x4D76
+0x7626 = 0x4D77
+0x7629 = 0x4D78
+0x762D = 0x4D79
+0x7632 = 0x4D7A
+0x7633 = 0x4D7B
+0x7635 = 0x4D7C
+0x7638 = 0x4D7D
+0x7639 = 0x4D7E
+0x763A = 0x4E21
+0x763C = 0x4E22
+0x7640 = 0x4E24
+0x7641 = 0x4E25
+0x7643 = 0x4E26
+0x7644 = 0x4E27
+0x7645 = 0x4E28
+0x7649 = 0x4E29
+0x764A = 0x4E23
+0x764B = 0x4E2A
+0x7655 = 0x4E2B
+0x7659 = 0x4E2C
+0x765F = 0x4E2D
+0x7664 = 0x4E2E
+0x7665 = 0x4E2F
+0x766D = 0x4E30
+0x766E = 0x4E31
+0x766F = 0x4E32
+0x7671 = 0x4E33
+0x7674 = 0x4E34
+0x7681 = 0x4E35
+0x7685 = 0x4E36
+0x768C = 0x4E37
+0x768D = 0x4E38
+0x7695 = 0x4E39
+0x769B = 0x4E3A
+0x769C = 0x4E3B
+0x769D = 0x4E3C
+0x769F = 0x4E3D
+0x76A0 = 0x4E3E
+0x76A2 = 0x4E3F
+0x76A3 = 0x4E40
+0x76A4 = 0x4E41
+0x76A5 = 0x4E42
+0x76A6 = 0x4E43
+0x76A7 = 0x4E44
+0x76A8 = 0x4E45
+0x76AA = 0x4E46
+0x76AD = 0x4E47
+0x76BD = 0x4E48
+0x76C1 = 0x4E49
+0x76C5 = 0x4E4A
+0x76C9 = 0x4E4B
+0x76CB = 0x4E4C
+0x76CC = 0x4E4D
+0x76CE = 0x4E4E
+0x76D4 = 0x4E4F
+0x76D9 = 0x4E50
+0x76E0 = 0x4E51
+0x76E6 = 0x4E52
+0x76E8 = 0x4E53
+0x76EC = 0x4E54
+0x76F0 = 0x4E55
+0x76F1 = 0x4E56
+0x76F6 = 0x4E57
+0x76F9 = 0x4E58
+0x76FC = 0x4E59
+0x7700 = 0x4E5A
+0x7706 = 0x4E5B
+0x770A = 0x4E5C
+0x770E = 0x4E5D
+0x7712 = 0x4E5E
+0x7714 = 0x4E5F
+0x7715 = 0x4E60
+0x7717 = 0x4E61
+0x7719 = 0x4E62
+0x771A = 0x4E63
+0x771C = 0x4E64
+0x7722 = 0x4E65
+0x7728 = 0x4E66
+0x772D = 0x4E67
+0x772E = 0x4E68
+0x772F = 0x4E69
+0x7734 = 0x4E6A
+0x7735 = 0x4E6B
+0x7736 = 0x4E6C
+0x7739 = 0x4E6D
+0x773D = 0x4E6E
+0x773E = 0x4E6F
+0x7742 = 0x4E70
+0x7745 = 0x4E71
+0x7746 = 0x4E72
+0x774A = 0x4E73
+0x774D = 0x4E74
+0x774E = 0x4E75
+0x774F = 0x4E76
+0x7752 = 0x4E77
+0x7756 = 0x4E78
+0x7757 = 0x4E79
+0x775C = 0x4E7A
+0x775E = 0x4E7B
+0x775F = 0x4E7C
+0x7760 = 0x4E7D
+0x7762 = 0x4E7E
+0x7764 = 0x4F21
+0x7767 = 0x4F22
+0x776A = 0x4F23
+0x776C = 0x4F24
+0x7770 = 0x4F25
+0x7772 = 0x4F26
+0x7773 = 0x4F27
+0x7774 = 0x4F28
+0x777A = 0x4F29
+0x777D = 0x4F2A
+0x7780 = 0x4F2B
+0x7784 = 0x4F2C
+0x778C = 0x4F2D
+0x778D = 0x4F2E
+0x7794 = 0x4F2F
+0x7795 = 0x4F30
+0x7796 = 0x4F31
+0x779A = 0x4F32
+0x779F = 0x4F33
+0x77A2 = 0x4F34
+0x77A7 = 0x4F35
+0x77AA = 0x4F36
+0x77AE = 0x4F37
+0x77AF = 0x4F38
+0x77B1 = 0x4F39
+0x77B5 = 0x4F3A
+0x77BE = 0x4F3B
+0x77C3 = 0x4F3C
+0x77C9 = 0x4F3D
+0x77D1 = 0x4F3E
+0x77D2 = 0x4F3F
+0x77D5 = 0x4F40
+0x77D9 = 0x4F41
+0x77DE = 0x4F42
+0x77DF = 0x4F43
+0x77E0 = 0x4F44
+0x77E4 = 0x4F45
+0x77E6 = 0x4F46
+0x77EA = 0x4F47
+0x77EC = 0x4F48
+0x77F0 = 0x4F49
+0x77F1 = 0x4F4A
+0x77F4 = 0x4F4B
+0x77F8 = 0x4F4C
+0x77FB = 0x4F4D
+0x7805 = 0x4F4E
+0x7806 = 0x4F4F
+0x7809 = 0x4F50
+0x780D = 0x4F51
+0x780E = 0x4F52
+0x7811 = 0x4F53
+0x781D = 0x4F54
+0x7821 = 0x4F55
+0x7822 = 0x4F56
+0x7823 = 0x4F57
+0x782D = 0x4F58
+0x782E = 0x4F59
+0x7830 = 0x4F5A
+0x7835 = 0x4F5B
+0x7837 = 0x4F5C
+0x7843 = 0x4F5D
+0x7844 = 0x4F5E
+0x7847 = 0x4F5F
+0x7848 = 0x4F60
+0x784C = 0x4F61
+0x784E = 0x4F62
+0x7852 = 0x4F63
+0x785C = 0x4F64
+0x785E = 0x4F65
+0x7860 = 0x4F66
+0x7861 = 0x4F67
+0x7863 = 0x4F68
+0x7864 = 0x4F69
+0x7868 = 0x4F6A
+0x786A = 0x4F6B
+0x786E = 0x4F6C
+0x787A = 0x4F6D
+0x787E = 0x4F6E
+0x788A = 0x4F6F
+0x788F = 0x4F70
+0x7894 = 0x4F71
+0x7898 = 0x4F72
+0x789D = 0x4F74
+0x789E = 0x4F75
+0x789F = 0x4F76
+0x78A1 = 0x4F73
+0x78A4 = 0x4F77
+0x78A8 = 0x4F78
+0x78AC = 0x4F79
+0x78AD = 0x4F7A
+0x78B0 = 0x4F7B
+0x78B1 = 0x4F7C
+0x78B2 = 0x4F7D
+0x78B3 = 0x4F7E
+0x78BB = 0x5021
+0x78BD = 0x5022
+0x78BF = 0x5023
+0x78C7 = 0x5024
+0x78C8 = 0x5025
+0x78C9 = 0x5026
+0x78CC = 0x5027
+0x78CE = 0x5028
+0x78D2 = 0x5029
+0x78D3 = 0x502A
+0x78D5 = 0x502B
+0x78D6 = 0x502C
+0x78DB = 0x502E
+0x78DF = 0x502F
+0x78E0 = 0x5030
+0x78E1 = 0x5031
+0x78E4 = 0x502D
+0x78E6 = 0x5032
+0x78EA = 0x5033
+0x78F2 = 0x5034
+0x78F3 = 0x5035
+0x78F6 = 0x5037
+0x78F7 = 0x5038
+0x78FA = 0x5039
+0x78FB = 0x503A
+0x78FF = 0x503B
+0x7900 = 0x5036
+0x7906 = 0x503C
+0x790C = 0x503D
+0x7910 = 0x503E
+0x791A = 0x503F
+0x791C = 0x5040
+0x791E = 0x5041
+0x791F = 0x5042
+0x7920 = 0x5043
+0x7925 = 0x5044
+0x7927 = 0x5045
+0x7929 = 0x5046
+0x792D = 0x5047
+0x7931 = 0x5048
+0x7934 = 0x5049
+0x7935 = 0x504A
+0x793B = 0x504B
+0x793D = 0x504C
+0x793F = 0x504D
+0x7944 = 0x504E
+0x7945 = 0x504F
+0x7946 = 0x5050
+0x794A = 0x5051
+0x794B = 0x5052
+0x794F = 0x5053
+0x7951 = 0x5054
+0x7954 = 0x5055
+0x7958 = 0x5056
+0x795B = 0x5057
+0x795C = 0x5058
+0x7967 = 0x5059
+0x7969 = 0x505A
+0x796B = 0x505B
+0x7972 = 0x505C
+0x7979 = 0x505D
+0x797B = 0x505E
+0x797C = 0x505F
+0x797E = 0x5060
+0x798B = 0x5061
+0x798C = 0x5062
+0x7991 = 0x5063
+0x7993 = 0x5064
+0x7994 = 0x5065
+0x7995 = 0x5066
+0x7996 = 0x5067
+0x7998 = 0x5068
+0x799B = 0x5069
+0x799C = 0x506A
+0x79A1 = 0x506B
+0x79A8 = 0x506C
+0x79A9 = 0x506D
+0x79AB = 0x506E
+0x79AF = 0x506F
+0x79B1 = 0x5070
+0x79B4 = 0x5071
+0x79B8 = 0x5072
+0x79BB = 0x5073
+0x79C2 = 0x5074
+0x79C4 = 0x5075
+0x79C7 = 0x5076
+0x79C8 = 0x5077
+0x79CA = 0x5078
+0x79CF = 0x5079
+0x79D4 = 0x507A
+0x79D6 = 0x507B
+0x79DA = 0x507C
+0x79DD = 0x507D
+0x79DE = 0x507E
+0x79E0 = 0x5121
+0x79E2 = 0x5122
+0x79E5 = 0x5123
+0x79EA = 0x5124
+0x79EB = 0x5125
+0x79ED = 0x5126
+0x79F1 = 0x5127
+0x79F8 = 0x5128
+0x79FC = 0x5129
+0x7A02 = 0x512A
+0x7A03 = 0x512B
+0x7A07 = 0x512C
+0x7A09 = 0x512D
+0x7A0A = 0x512E
+0x7A0C = 0x512F
+0x7A11 = 0x5130
+0x7A15 = 0x5131
+0x7A1B = 0x5132
+0x7A1E = 0x5133
+0x7A21 = 0x5134
+0x7A27 = 0x5135
+0x7A2B = 0x5136
+0x7A2D = 0x5137
+0x7A2F = 0x5138
+0x7A30 = 0x5139
+0x7A34 = 0x513A
+0x7A35 = 0x513B
+0x7A38 = 0x513C
+0x7A39 = 0x513D
+0x7A3A = 0x513E
+0x7A44 = 0x513F
+0x7A45 = 0x5140
+0x7A47 = 0x5141
+0x7A48 = 0x5142
+0x7A4C = 0x5143
+0x7A55 = 0x5144
+0x7A56 = 0x5145
+0x7A59 = 0x5146
+0x7A5C = 0x5147
+0x7A5D = 0x5148
+0x7A5F = 0x5149
+0x7A60 = 0x514A
+0x7A65 = 0x514B
+0x7A67 = 0x514C
+0x7A6A = 0x514D
+0x7A6D = 0x514E
+0x7A75 = 0x514F
+0x7A78 = 0x5150
+0x7A7E = 0x5151
+0x7A80 = 0x5152
+0x7A82 = 0x5153
+0x7A85 = 0x5154
+0x7A86 = 0x5155
+0x7A8A = 0x5156
+0x7A8B = 0x5157
+0x7A90 = 0x5158
+0x7A91 = 0x5159
+0x7A94 = 0x515A
+0x7A9E = 0x515B
+0x7AA0 = 0x515C
+0x7AA3 = 0x515D
+0x7AAC = 0x515E
+0x7AB3 = 0x515F
+0x7AB5 = 0x5160
+0x7AB9 = 0x5161
+0x7ABB = 0x5162
+0x7ABC = 0x5163
+0x7AC6 = 0x5164
+0x7AC9 = 0x5165
+0x7ACC = 0x5166
+0x7ACE = 0x5167
+0x7AD1 = 0x5168
+0x7ADB = 0x5169
+0x7AE8 = 0x516A
+0x7AE9 = 0x516B
+0x7AEB = 0x516C
+0x7AEC = 0x516D
+0x7AF1 = 0x516E
+0x7AF4 = 0x516F
+0x7AFB = 0x5170
+0x7AFD = 0x5171
+0x7AFE = 0x5172
+0x7B07 = 0x5173
+0x7B14 = 0x5174
+0x7B1F = 0x5175
+0x7B23 = 0x5176
+0x7B27 = 0x5177
+0x7B29 = 0x5178
+0x7B2A = 0x5179
+0x7B2B = 0x517A
+0x7B2D = 0x517B
+0x7B2E = 0x517C
+0x7B2F = 0x517D
+0x7B30 = 0x517E
+0x7B31 = 0x5221
+0x7B34 = 0x5222
+0x7B3D = 0x5223
+0x7B3F = 0x5224
+0x7B40 = 0x5225
+0x7B41 = 0x5226
+0x7B47 = 0x5227
+0x7B4E = 0x5228
+0x7B55 = 0x5229
+0x7B60 = 0x522A
+0x7B64 = 0x522B
+0x7B66 = 0x522C
+0x7B69 = 0x522D
+0x7B6A = 0x522E
+0x7B6D = 0x522F
+0x7B6F = 0x5230
+0x7B72 = 0x5231
+0x7B73 = 0x5232
+0x7B77 = 0x5233
+0x7B84 = 0x5234
+0x7B89 = 0x5235
+0x7B8E = 0x5236
+0x7B90 = 0x5237
+0x7B91 = 0x5238
+0x7B96 = 0x5239
+0x7B9B = 0x523A
+0x7B9E = 0x523B
+0x7BA0 = 0x523C
+0x7BA5 = 0x523D
+0x7BAC = 0x523E
+0x7BAF = 0x523F
+0x7BB0 = 0x5240
+0x7BB2 = 0x5241
+0x7BB5 = 0x5242
+0x7BB6 = 0x5243
+0x7BBA = 0x5244
+0x7BBB = 0x5245
+0x7BBC = 0x5246
+0x7BBD = 0x5247
+0x7BC2 = 0x5248
+0x7BC5 = 0x5249
+0x7BC8 = 0x524A
+0x7BCA = 0x524B
+0x7BD4 = 0x524C
+0x7BD6 = 0x524D
+0x7BD7 = 0x524E
+0x7BD9 = 0x524F
+0x7BDA = 0x5250
+0x7BDB = 0x5251
+0x7BE8 = 0x5252
+0x7BEA = 0x5253
+0x7BF2 = 0x5254
+0x7BF4 = 0x5255
+0x7BF5 = 0x5256
+0x7BF8 = 0x5257
+0x7BF9 = 0x5258
+0x7BFA = 0x5259
+0x7BFC = 0x525A
+0x7BFE = 0x525B
+0x7C01 = 0x525C
+0x7C02 = 0x525D
+0x7C03 = 0x525E
+0x7C04 = 0x525F
+0x7C06 = 0x5260
+0x7C09 = 0x5261
+0x7C0B = 0x5262
+0x7C0C = 0x5263
+0x7C0E = 0x5264
+0x7C0F = 0x5265
+0x7C19 = 0x5266
+0x7C1B = 0x5267
+0x7C20 = 0x5268
+0x7C25 = 0x5269
+0x7C26 = 0x526A
+0x7C28 = 0x526B
+0x7C2C = 0x526C
+0x7C31 = 0x526D
+0x7C33 = 0x526E
+0x7C34 = 0x526F
+0x7C36 = 0x5270
+0x7C39 = 0x5271
+0x7C3A = 0x5272
+0x7C46 = 0x5273
+0x7C4A = 0x5274
+0x7C51 = 0x5276
+0x7C52 = 0x5277
+0x7C53 = 0x5278
+0x7C55 = 0x5275
+0x7C59 = 0x5279
+0x7C5A = 0x527A
+0x7C5B = 0x527B
+0x7C5C = 0x527C
+0x7C5D = 0x527D
+0x7C5E = 0x527E
+0x7C61 = 0x5321
+0x7C63 = 0x5322
+0x7C67 = 0x5323
+0x7C69 = 0x5324
+0x7C6D = 0x5325
+0x7C6E = 0x5326
+0x7C70 = 0x5327
+0x7C72 = 0x5328
+0x7C79 = 0x5329
+0x7C7C = 0x532A
+0x7C7D = 0x532B
+0x7C86 = 0x532C
+0x7C87 = 0x532D
+0x7C8F = 0x532E
+0x7C94 = 0x532F
+0x7C9E = 0x5330
+0x7CA0 = 0x5331
+0x7CA6 = 0x5332
+0x7CB0 = 0x5333
+0x7CB6 = 0x5334
+0x7CB7 = 0x5335
+0x7CBA = 0x5336
+0x7CBB = 0x5337
+0x7CBC = 0x5338
+0x7CBF = 0x5339
+0x7CC4 = 0x533A
+0x7CC7 = 0x533B
+0x7CC8 = 0x533C
+0x7CC9 = 0x533D
+0x7CCD = 0x533E
+0x7CCF = 0x533F
+0x7CD3 = 0x5340
+0x7CD4 = 0x5341
+0x7CD5 = 0x5342
+0x7CD7 = 0x5343
+0x7CD9 = 0x5344
+0x7CDA = 0x5345
+0x7CDD = 0x5346
+0x7CE6 = 0x5347
+0x7CE9 = 0x5348
+0x7CEB = 0x5349
+0x7CF5 = 0x534A
+0x7D03 = 0x534B
+0x7D07 = 0x534C
+0x7D08 = 0x534D
+0x7D09 = 0x534E
+0x7D0F = 0x534F
+0x7D11 = 0x5350
+0x7D12 = 0x5351
+0x7D13 = 0x5352
+0x7D16 = 0x5353
+0x7D1D = 0x5354
+0x7D1E = 0x5355
+0x7D23 = 0x5356
+0x7D26 = 0x5357
+0x7D2A = 0x5358
+0x7D2D = 0x5359
+0x7D31 = 0x535A
+0x7D3C = 0x535B
+0x7D3D = 0x535C
+0x7D3E = 0x535D
+0x7D40 = 0x535E
+0x7D41 = 0x535F
+0x7D47 = 0x5360
+0x7D48 = 0x5361
+0x7D4D = 0x5362
+0x7D51 = 0x5363
+0x7D53 = 0x5364
+0x7D57 = 0x5365
+0x7D59 = 0x5366
+0x7D5A = 0x5367
+0x7D5C = 0x5368
+0x7D5D = 0x5369
+0x7D65 = 0x536A
+0x7D67 = 0x536B
+0x7D6A = 0x536C
+0x7D70 = 0x536D
+0x7D78 = 0x536E
+0x7D7A = 0x536F
+0x7D7B = 0x5370
+0x7D7F = 0x5371
+0x7D81 = 0x5372
+0x7D82 = 0x5373
+0x7D83 = 0x5374
+0x7D85 = 0x5375
+0x7D86 = 0x5376
+0x7D88 = 0x5377
+0x7D8B = 0x5378
+0x7D8C = 0x5379
+0x7D8D = 0x537A
+0x7D91 = 0x537B
+0x7D96 = 0x537C
+0x7D97 = 0x537D
+0x7D9D = 0x537E
+0x7D9E = 0x5421
+0x7DA6 = 0x5422
+0x7DA7 = 0x5423
+0x7DAA = 0x5424
+0x7DB3 = 0x5425
+0x7DB6 = 0x5426
+0x7DB7 = 0x5427
+0x7DB9 = 0x5428
+0x7DC2 = 0x5429
+0x7DC3 = 0x542A
+0x7DC4 = 0x542B
+0x7DC5 = 0x542C
+0x7DC6 = 0x542D
+0x7DCC = 0x542E
+0x7DCD = 0x542F
+0x7DCE = 0x5430
+0x7DD7 = 0x5431
+0x7DD9 = 0x5432
+0x7DE2 = 0x5434
+0x7DE5 = 0x5435
+0x7DE6 = 0x5436
+0x7DEA = 0x5437
+0x7DEB = 0x5438
+0x7DED = 0x5439
+0x7DF1 = 0x543A
+0x7DF5 = 0x543B
+0x7DF6 = 0x543C
+0x7DF9 = 0x543D
+0x7DFA = 0x543E
+0x7E00 = 0x5433
+0x7E08 = 0x543F
+0x7E10 = 0x5440
+0x7E11 = 0x5441
+0x7E15 = 0x5442
+0x7E17 = 0x5443
+0x7E1C = 0x5444
+0x7E1D = 0x5445
+0x7E20 = 0x5446
+0x7E27 = 0x5447
+0x7E28 = 0x5448
+0x7E2C = 0x5449
+0x7E2D = 0x544A
+0x7E2F = 0x544B
+0x7E33 = 0x544C
+0x7E36 = 0x544D
+0x7E3F = 0x544E
+0x7E44 = 0x544F
+0x7E45 = 0x5450
+0x7E47 = 0x5451
+0x7E4E = 0x5452
+0x7E50 = 0x5453
+0x7E52 = 0x5454
+0x7E58 = 0x5455
+0x7E5F = 0x5456
+0x7E61 = 0x5457
+0x7E62 = 0x5458
+0x7E65 = 0x5459
+0x7E6B = 0x545A
+0x7E6E = 0x545B
+0x7E6F = 0x545C
+0x7E73 = 0x545D
+0x7E78 = 0x545E
+0x7E7E = 0x545F
+0x7E81 = 0x5460
+0x7E86 = 0x5461
+0x7E87 = 0x5462
+0x7E8A = 0x5463
+0x7E8D = 0x5464
+0x7E91 = 0x5465
+0x7E95 = 0x5466
+0x7E98 = 0x5467
+0x7E9A = 0x5468
+0x7E9D = 0x5469
+0x7E9E = 0x546A
+0x7F3B = 0x546C
+0x7F3C = 0x546B
+0x7F3D = 0x546D
+0x7F3E = 0x546E
+0x7F3F = 0x546F
+0x7F43 = 0x5470
+0x7F44 = 0x5471
+0x7F47 = 0x5472
+0x7F4F = 0x5473
+0x7F52 = 0x5474
+0x7F53 = 0x5475
+0x7F5B = 0x5476
+0x7F5C = 0x5477
+0x7F5D = 0x5478
+0x7F61 = 0x5479
+0x7F63 = 0x547A
+0x7F64 = 0x547B
+0x7F65 = 0x547C
+0x7F66 = 0x547D
+0x7F6D = 0x547E
+0x7F71 = 0x5521
+0x7F7D = 0x5522
+0x7F7E = 0x5523
+0x7F7F = 0x5524
+0x7F80 = 0x5525
+0x7F8B = 0x5526
+0x7F8D = 0x5527
+0x7F8F = 0x5528
+0x7F90 = 0x5529
+0x7F91 = 0x552A
+0x7F96 = 0x552B
+0x7F97 = 0x552C
+0x7F9C = 0x552D
+0x7FA1 = 0x552E
+0x7FA2 = 0x552F
+0x7FA6 = 0x5530
+0x7FAA = 0x5531
+0x7FAD = 0x5532
+0x7FB4 = 0x5533
+0x7FBC = 0x5534
+0x7FBF = 0x5535
+0x7FC0 = 0x5536
+0x7FC3 = 0x5537
+0x7FC8 = 0x5538
+0x7FCE = 0x5539
+0x7FCF = 0x553A
+0x7FDB = 0x553B
+0x7FDF = 0x553C
+0x7FE3 = 0x553D
+0x7FE5 = 0x553E
+0x7FE8 = 0x553F
+0x7FEC = 0x5540
+0x7FEE = 0x5541
+0x7FEF = 0x5542
+0x7FF2 = 0x5543
+0x7FFA = 0x5544
+0x7FFD = 0x5545
+0x7FFE = 0x5546
+0x7FFF = 0x5547
+0x8007 = 0x5548
+0x8008 = 0x5549
+0x800A = 0x554A
+0x800D = 0x554B
+0x800E = 0x554C
+0x800F = 0x554D
+0x8011 = 0x554E
+0x8013 = 0x554F
+0x8014 = 0x5550
+0x8016 = 0x5551
+0x801D = 0x5552
+0x801E = 0x5553
+0x801F = 0x5554
+0x8020 = 0x5555
+0x8024 = 0x5556
+0x8026 = 0x5557
+0x802C = 0x5558
+0x802E = 0x5559
+0x8030 = 0x555A
+0x8034 = 0x555B
+0x8035 = 0x555C
+0x8037 = 0x555D
+0x8039 = 0x555E
+0x803A = 0x555F
+0x803C = 0x5560
+0x803E = 0x5561
+0x8040 = 0x5562
+0x8044 = 0x5563
+0x8060 = 0x5564
+0x8064 = 0x5565
+0x8066 = 0x5566
+0x806D = 0x5567
+0x8071 = 0x5568
+0x8075 = 0x5569
+0x8081 = 0x556A
+0x8088 = 0x556B
+0x808E = 0x556C
+0x809C = 0x556D
+0x809E = 0x556E
+0x80A6 = 0x556F
+0x80A7 = 0x5570
+0x80AB = 0x5571
+0x80B8 = 0x5572
+0x80B9 = 0x5573
+0x80C8 = 0x5574
+0x80CD = 0x5575
+0x80CF = 0x5576
+0x80D2 = 0x5577
+0x80D4 = 0x5578
+0x80D5 = 0x5579
+0x80D7 = 0x557A
+0x80D8 = 0x557B
+0x80E0 = 0x557C
+0x80ED = 0x557D
+0x80EE = 0x557E
+0x80F0 = 0x5621
+0x80F2 = 0x5622
+0x80F3 = 0x5623
+0x80F6 = 0x5624
+0x80F9 = 0x5625
+0x80FA = 0x5626
+0x80FE = 0x5627
+0x8103 = 0x5628
+0x810B = 0x5629
+0x8116 = 0x562A
+0x8117 = 0x562B
+0x8118 = 0x562C
+0x811C = 0x562D
+0x811E = 0x562E
+0x8120 = 0x562F
+0x8124 = 0x5630
+0x8127 = 0x5631
+0x812C = 0x5632
+0x8130 = 0x5633
+0x8135 = 0x5634
+0x813A = 0x5635
+0x813C = 0x5636
+0x8145 = 0x5637
+0x8147 = 0x5638
+0x814A = 0x5639
+0x814C = 0x563A
+0x8152 = 0x563B
+0x8157 = 0x563C
+0x8160 = 0x563D
+0x8161 = 0x563E
+0x8167 = 0x563F
+0x8168 = 0x5640
+0x8169 = 0x5641
+0x816D = 0x5642
+0x816F = 0x5643
+0x8177 = 0x5644
+0x8181 = 0x5645
+0x8184 = 0x5647
+0x8185 = 0x5648
+0x8186 = 0x5649
+0x818B = 0x564A
+0x818E = 0x564B
+0x8190 = 0x5646
+0x8196 = 0x564C
+0x8198 = 0x564D
+0x819B = 0x564E
+0x819E = 0x564F
+0x81A2 = 0x5650
+0x81AE = 0x5651
+0x81B2 = 0x5652
+0x81B4 = 0x5653
+0x81BB = 0x5654
+0x81C3 = 0x5656
+0x81C5 = 0x5657
+0x81CA = 0x5658
+0x81CB = 0x5655
+0x81CE = 0x5659
+0x81CF = 0x565A
+0x81D5 = 0x565B
+0x81D7 = 0x565C
+0x81DB = 0x565D
+0x81DD = 0x565E
+0x81DE = 0x565F
+0x81E1 = 0x5660
+0x81E4 = 0x5661
+0x81EB = 0x5662
+0x81EC = 0x5663
+0x81F0 = 0x5664
+0x81F1 = 0x5665
+0x81F2 = 0x5666
+0x81F5 = 0x5667
+0x81F6 = 0x5668
+0x81F8 = 0x5669
+0x81F9 = 0x566A
+0x81FD = 0x566B
+0x81FF = 0x566C
+0x8200 = 0x566D
+0x8203 = 0x566E
+0x820F = 0x566F
+0x8213 = 0x5670
+0x8214 = 0x5671
+0x8219 = 0x5672
+0x821A = 0x5673
+0x821D = 0x5674
+0x8221 = 0x5675
+0x8222 = 0x5676
+0x8228 = 0x5677
+0x8232 = 0x5678
+0x8234 = 0x5679
+0x823A = 0x567A
+0x8243 = 0x567B
+0x8244 = 0x567C
+0x8245 = 0x567D
+0x8246 = 0x567E
+0x824B = 0x5721
+0x824E = 0x5722
+0x824F = 0x5723
+0x8251 = 0x5724
+0x8256 = 0x5725
+0x825C = 0x5726
+0x8260 = 0x5727
+0x8263 = 0x5728
+0x8267 = 0x5729
+0x826D = 0x572A
+0x8274 = 0x572B
+0x827B = 0x572C
+0x827D = 0x572D
+0x827F = 0x572E
+0x8280 = 0x572F
+0x8281 = 0x5730
+0x8283 = 0x5731
+0x8284 = 0x5732
+0x8287 = 0x5733
+0x8289 = 0x5734
+0x828A = 0x5735
+0x828E = 0x5736
+0x8291 = 0x5737
+0x8294 = 0x5738
+0x8296 = 0x5739
+0x8298 = 0x573A
+0x829A = 0x573B
+0x829B = 0x573C
+0x82A0 = 0x573D
+0x82A1 = 0x573E
+0x82A3 = 0x573F
+0x82A4 = 0x5740
+0x82A7 = 0x5741
+0x82A8 = 0x5742
+0x82A9 = 0x5743
+0x82AA = 0x5744
+0x82AE = 0x5745
+0x82B0 = 0x5746
+0x82B2 = 0x5747
+0x82B4 = 0x5748
+0x82B7 = 0x5749
+0x82BA = 0x574A
+0x82BC = 0x574B
+0x82BE = 0x574C
+0x82BF = 0x574D
+0x82C6 = 0x574E
+0x82D0 = 0x574F
+0x82D5 = 0x5750
+0x82DA = 0x5751
+0x82E0 = 0x5752
+0x82E2 = 0x5753
+0x82E4 = 0x5754
+0x82E8 = 0x5755
+0x82EA = 0x5756
+0x82ED = 0x5757
+0x82EF = 0x5758
+0x82F6 = 0x5759
+0x82F7 = 0x575A
+0x82FD = 0x575B
+0x82FE = 0x575C
+0x8300 = 0x575D
+0x8301 = 0x575E
+0x8307 = 0x575F
+0x8308 = 0x5760
+0x830A = 0x5761
+0x830B = 0x5762
+0x831B = 0x5764
+0x831D = 0x5765
+0x831E = 0x5766
+0x831F = 0x5767
+0x8321 = 0x5768
+0x8322 = 0x5769
+0x832C = 0x576A
+0x832D = 0x576B
+0x832E = 0x576C
+0x8330 = 0x576D
+0x8333 = 0x576E
+0x8337 = 0x576F
+0x833A = 0x5770
+0x833C = 0x5771
+0x833D = 0x5772
+0x8342 = 0x5773
+0x8343 = 0x5774
+0x8344 = 0x5775
+0x8347 = 0x5776
+0x834D = 0x5777
+0x834E = 0x5778
+0x8351 = 0x5779
+0x8353 = 0x583E
+0x8354 = 0x5763
+0x8355 = 0x577A
+0x8356 = 0x577B
+0x8357 = 0x577C
+0x8370 = 0x577D
+0x8378 = 0x577E
+0x837D = 0x5821
+0x837F = 0x5822
+0x8380 = 0x5823
+0x8382 = 0x5824
+0x8384 = 0x5825
+0x8386 = 0x5826
+0x838D = 0x5827
+0x8392 = 0x5828
+0x8394 = 0x5829
+0x8395 = 0x582A
+0x8398 = 0x582B
+0x8399 = 0x582C
+0x839B = 0x582D
+0x839C = 0x582E
+0x839D = 0x582F
+0x83A6 = 0x5830
+0x83A7 = 0x5831
+0x83A9 = 0x5832
+0x83AC = 0x5833
+0x83AD = 0x584C
+0x83BE = 0x5834
+0x83BF = 0x5835
+0x83C0 = 0x5836
+0x83C7 = 0x5837
+0x83C9 = 0x5838
+0x83CF = 0x5839
+0x83D0 = 0x583A
+0x83D1 = 0x583B
+0x83D4 = 0x583C
+0x83DD = 0x583D
+0x83E8 = 0x583F
+0x83EA = 0x5840
+0x83F6 = 0x5841
+0x83F8 = 0x5842
+0x83F9 = 0x5843
+0x83FC = 0x5844
+0x8401 = 0x5845
+0x8406 = 0x5846
+0x840A = 0x5847
+0x840F = 0x5848
+0x8411 = 0x5849
+0x8415 = 0x584A
+0x8419 = 0x584B
+0x842F = 0x584D
+0x8439 = 0x584E
+0x8445 = 0x584F
+0x8447 = 0x5850
+0x8448 = 0x5851
+0x844A = 0x5852
+0x844D = 0x5853
+0x844F = 0x5854
+0x8451 = 0x5855
+0x8452 = 0x5856
+0x8456 = 0x5857
+0x8458 = 0x5858
+0x8459 = 0x5859
+0x845A = 0x585A
+0x845C = 0x585B
+0x8460 = 0x585C
+0x8464 = 0x585D
+0x8465 = 0x585E
+0x8467 = 0x585F
+0x846A = 0x5860
+0x8470 = 0x5861
+0x8473 = 0x5862
+0x8474 = 0x5863
+0x8476 = 0x5864
+0x8478 = 0x5865
+0x847C = 0x5866
+0x847D = 0x5867
+0x8481 = 0x5868
+0x8485 = 0x5869
+0x8492 = 0x586A
+0x8493 = 0x586B
+0x8495 = 0x586C
+0x849E = 0x586D
+0x84A6 = 0x586E
+0x84A8 = 0x586F
+0x84A9 = 0x5870
+0x84AA = 0x5871
+0x84AF = 0x5872
+0x84B1 = 0x5873
+0x84B4 = 0x5874
+0x84BA = 0x5875
+0x84BD = 0x5876
+0x84BE = 0x5877
+0x84C0 = 0x5878
+0x84C2 = 0x5879
+0x84C7 = 0x587A
+0x84C8 = 0x587B
+0x84CC = 0x587C
+0x84CF = 0x587D
+0x84D3 = 0x587E
+0x84DC = 0x5921
+0x84E7 = 0x5922
+0x84EA = 0x5923
+0x84EF = 0x5924
+0x84F0 = 0x5925
+0x84F1 = 0x5926
+0x84F2 = 0x5927
+0x84F7 = 0x5928
+0x84FA = 0x592A
+0x84FB = 0x592B
+0x84FD = 0x592C
+0x8502 = 0x592D
+0x8503 = 0x592E
+0x8507 = 0x592F
+0x850C = 0x5930
+0x850E = 0x5931
+0x8510 = 0x5932
+0x851C = 0x5933
+0x851E = 0x5934
+0x8522 = 0x5935
+0x8523 = 0x5936
+0x8524 = 0x5937
+0x8525 = 0x5938
+0x8527 = 0x5939
+0x852A = 0x593A
+0x852B = 0x593B
+0x852F = 0x593C
+0x8532 = 0x5929
+0x8533 = 0x593D
+0x8534 = 0x593E
+0x8536 = 0x593F
+0x853F = 0x5940
+0x8546 = 0x5941
+0x854F = 0x5942
+0x8550 = 0x5943
+0x8551 = 0x5944
+0x8552 = 0x5945
+0x8553 = 0x5946
+0x8556 = 0x5947
+0x8559 = 0x5948
+0x855C = 0x5949
+0x855D = 0x594A
+0x855E = 0x594B
+0x855F = 0x594C
+0x8560 = 0x594D
+0x8561 = 0x594E
+0x8562 = 0x594F
+0x8564 = 0x5950
+0x856B = 0x5951
+0x856F = 0x5952
+0x8579 = 0x5953
+0x857A = 0x5954
+0x857B = 0x5955
+0x857D = 0x5956
+0x857F = 0x5957
+0x8581 = 0x5958
+0x8585 = 0x5959
+0x8586 = 0x595A
+0x8589 = 0x595B
+0x858B = 0x595C
+0x858C = 0x595D
+0x858F = 0x595E
+0x8593 = 0x595F
+0x8598 = 0x5960
+0x859D = 0x5961
+0x859F = 0x5962
+0x85A0 = 0x5963
+0x85A2 = 0x5964
+0x85A5 = 0x5965
+0x85A7 = 0x5966
+0x85AD = 0x5974
+0x85B4 = 0x5967
+0x85B6 = 0x5968
+0x85B7 = 0x5969
+0x85B8 = 0x596A
+0x85BC = 0x596B
+0x85BD = 0x596C
+0x85BE = 0x596D
+0x85BF = 0x596E
+0x85C2 = 0x596F
+0x85C7 = 0x5970
+0x85CA = 0x5971
+0x85CB = 0x5972
+0x85CE = 0x5973
+0x85D8 = 0x5975
+0x85DA = 0x5976
+0x85DF = 0x5977
+0x85E0 = 0x5978
+0x85E6 = 0x5979
+0x85E8 = 0x597A
+0x85ED = 0x597B
+0x85F3 = 0x597C
+0x85F6 = 0x597D
+0x85FC = 0x597E
+0x85FF = 0x5A21
+0x8600 = 0x5A22
+0x8604 = 0x5A23
+0x8605 = 0x5A24
+0x860D = 0x5A25
+0x860E = 0x5A26
+0x8610 = 0x5A27
+0x8611 = 0x5A28
+0x8612 = 0x5A29
+0x8618 = 0x5A2A
+0x8619 = 0x5A2B
+0x861B = 0x5A2C
+0x861E = 0x5A2D
+0x8621 = 0x5A2E
+0x8627 = 0x5A2F
+0x8629 = 0x5A30
+0x8636 = 0x5A31
+0x8638 = 0x5A32
+0x863A = 0x5A33
+0x863C = 0x5A34
+0x863D = 0x5A35
+0x8640 = 0x5A36
+0x8641 = 0x3866
+0x8642 = 0x5A37
+0x8646 = 0x5A38
+0x8652 = 0x5A39
+0x8653 = 0x5A3A
+0x8656 = 0x5A3B
+0x8657 = 0x5A3C
+0x8658 = 0x5A3D
+0x8659 = 0x5A3E
+0x865D = 0x5A3F
+0x8660 = 0x5A40
+0x8661 = 0x5A41
+0x8662 = 0x5A42
+0x8663 = 0x5A43
+0x8664 = 0x5A44
+0x8669 = 0x5A45
+0x866C = 0x5A46
+0x866F = 0x5A47
+0x8675 = 0x5A48
+0x8676 = 0x5A49
+0x8677 = 0x5A4A
+0x867A = 0x5A4B
+0x8688 = 0x5A6D
+0x868D = 0x5A4C
+0x8691 = 0x5A4D
+0x8696 = 0x5A4E
+0x8698 = 0x5A4F
+0x869A = 0x5A50
+0x869C = 0x5A51
+0x86A1 = 0x5A52
+0x86A6 = 0x5A53
+0x86A7 = 0x5A54
+0x86A8 = 0x5A55
+0x86AD = 0x5A56
+0x86B1 = 0x5A57
+0x86B3 = 0x5A58
+0x86B4 = 0x5A59
+0x86B5 = 0x5A5A
+0x86B7 = 0x5A5B
+0x86B8 = 0x5A5C
+0x86B9 = 0x5A5D
+0x86BF = 0x5A5E
+0x86C0 = 0x5A5F
+0x86C1 = 0x5A60
+0x86C3 = 0x5A61
+0x86C5 = 0x5A62
+0x86D1 = 0x5A63
+0x86D2 = 0x5A64
+0x86D5 = 0x5A65
+0x86D7 = 0x5A66
+0x86DA = 0x5A67
+0x86DC = 0x5A68
+0x86E0 = 0x5A69
+0x86E3 = 0x5A6A
+0x86E5 = 0x5A6B
+0x86E7 = 0x5A6C
+0x86FA = 0x5A6E
+0x86FC = 0x5A6F
+0x86FD = 0x5A70
+0x8704 = 0x5A71
+0x8705 = 0x5A72
+0x8707 = 0x5A73
+0x870B = 0x5A74
+0x870E = 0x5A75
+0x870F = 0x5A76
+0x8710 = 0x5A77
+0x8713 = 0x5A78
+0x8714 = 0x5A79
+0x8719 = 0x5A7A
+0x871E = 0x5A7B
+0x871F = 0x5A7C
+0x8721 = 0x5A7D
+0x8723 = 0x5A7E
+0x8728 = 0x5B21
+0x872E = 0x5B22
+0x872F = 0x5B23
+0x8731 = 0x5B24
+0x8732 = 0x5B25
+0x8739 = 0x5B26
+0x873A = 0x5B27
+0x873C = 0x5B28
+0x873D = 0x5B29
+0x873E = 0x5B2A
+0x8740 = 0x5B2B
+0x8743 = 0x5B2C
+0x8745 = 0x5B2D
+0x874D = 0x5B2E
+0x8758 = 0x5B2F
+0x875D = 0x5B30
+0x8761 = 0x5B31
+0x8764 = 0x5B32
+0x8765 = 0x5B33
+0x876F = 0x5B34
+0x8771 = 0x5B35
+0x8772 = 0x5B36
+0x877B = 0x5B37
+0x8783 = 0x5B38
+0x8784 = 0x5B39
+0x8785 = 0x5B3A
+0x8786 = 0x5B3B
+0x8787 = 0x5B3C
+0x8788 = 0x5B3D
+0x8789 = 0x5B3E
+0x878B = 0x5B3F
+0x878C = 0x5B40
+0x8790 = 0x5B41
+0x8793 = 0x5B42
+0x8795 = 0x5B43
+0x8797 = 0x5B44
+0x8798 = 0x5B45
+0x8799 = 0x5B46
+0x879E = 0x5B47
+0x87A0 = 0x5B48
+0x87A3 = 0x5B49
+0x87A7 = 0x5B4A
+0x87AC = 0x5B4B
+0x87AD = 0x5B4C
+0x87AE = 0x5B4D
+0x87B1 = 0x5B4E
+0x87B5 = 0x5B4F
+0x87BE = 0x5B50
+0x87BF = 0x5B51
+0x87C1 = 0x5B52
+0x87C8 = 0x5B53
+0x87C9 = 0x5B54
+0x87CA = 0x5B55
+0x87CE = 0x5B56
+0x87D5 = 0x5B57
+0x87D6 = 0x5B58
+0x87D9 = 0x5B59
+0x87DA = 0x5B5A
+0x87DC = 0x5B5B
+0x87DF = 0x5B5C
+0x87E2 = 0x5B5D
+0x87E3 = 0x5B5E
+0x87E4 = 0x5B5F
+0x87EA = 0x5B60
+0x87EB = 0x5B61
+0x87ED = 0x5B62
+0x87F1 = 0x5B63
+0x87F3 = 0x5B64
+0x87F8 = 0x5B65
+0x87FA = 0x5B66
+0x87FF = 0x5B67
+0x8801 = 0x5B68
+0x8803 = 0x5B69
+0x8806 = 0x5B6A
+0x8809 = 0x5B6B
+0x880A = 0x5B6C
+0x880B = 0x5B6D
+0x8810 = 0x5B6E
+0x8812 = 0x5B70
+0x8813 = 0x5B71
+0x8814 = 0x5B72
+0x8818 = 0x5B73
+0x8819 = 0x5B6F
+0x881A = 0x5B74
+0x881B = 0x5B75
+0x881C = 0x5B76
+0x881E = 0x5B77
+0x881F = 0x5B78
+0x8828 = 0x5B79
+0x882D = 0x5B7A
+0x882E = 0x5B7B
+0x8830 = 0x5B7C
+0x8832 = 0x5B7D
+0x8835 = 0x5B7E
+0x883A = 0x5C21
+0x883C = 0x5C22
+0x8841 = 0x5C23
+0x8843 = 0x5C24
+0x8845 = 0x5C25
+0x8848 = 0x5C26
+0x8849 = 0x5C27
+0x884A = 0x5C28
+0x884B = 0x5C29
+0x884E = 0x5C2A
+0x8851 = 0x5C2B
+0x8855 = 0x5C2C
+0x8856 = 0x5C2D
+0x8858 = 0x5C2E
+0x885A = 0x5C2F
+0x885C = 0x5C30
+0x885F = 0x5C31
+0x8860 = 0x5C32
+0x8864 = 0x5C33
+0x8869 = 0x5C34
+0x8871 = 0x5C35
+0x8879 = 0x5C36
+0x887B = 0x5C37
+0x8880 = 0x5C38
+0x8898 = 0x5C39
+0x889A = 0x5C3A
+0x889B = 0x5C3B
+0x889C = 0x5C3C
+0x889F = 0x5C3D
+0x88A0 = 0x5C3E
+0x88A8 = 0x5C3F
+0x88AA = 0x5C40
+0x88BA = 0x5C41
+0x88BD = 0x5C42
+0x88BE = 0x5C43
+0x88C0 = 0x5C44
+0x88CA = 0x5C45
+0x88CB = 0x5C46
+0x88CC = 0x5C47
+0x88CD = 0x5C48
+0x88CE = 0x5C49
+0x88D1 = 0x5C4A
+0x88D2 = 0x5C4B
+0x88D3 = 0x5C4C
+0x88DB = 0x5C4D
+0x88DE = 0x5C4E
+0x88E7 = 0x5C4F
+0x88EF = 0x5C50
+0x88F0 = 0x5C51
+0x88F1 = 0x5C52
+0x88F5 = 0x5C53
+0x88F7 = 0x5C54
+0x8901 = 0x5C55
+0x8906 = 0x5C56
+0x890D = 0x5C57
+0x890E = 0x5C58
+0x890F = 0x5C59
+0x8915 = 0x5C5A
+0x8916 = 0x5C5B
+0x8918 = 0x5C5C
+0x8919 = 0x5C5D
+0x891A = 0x5C5E
+0x891C = 0x5C5F
+0x8920 = 0x5C60
+0x8926 = 0x5C61
+0x8927 = 0x5C62
+0x8928 = 0x5C63
+0x8930 = 0x5C64
+0x8931 = 0x5C65
+0x8932 = 0x5C66
+0x8935 = 0x5C67
+0x8939 = 0x5C68
+0x893A = 0x5C69
+0x893E = 0x5C6A
+0x8940 = 0x5C6B
+0x8942 = 0x5C6C
+0x8945 = 0x5C6D
+0x8946 = 0x5C6E
+0x8949 = 0x5C6F
+0x894F = 0x5C70
+0x8952 = 0x5C71
+0x8957 = 0x5C72
+0x895A = 0x5C73
+0x895B = 0x5C74
+0x895C = 0x5C75
+0x8961 = 0x5C76
+0x8962 = 0x5C77
+0x8963 = 0x5C78
+0x896B = 0x5C79
+0x896E = 0x5C7A
+0x8970 = 0x5C7B
+0x8973 = 0x5C7C
+0x8975 = 0x5C7D
+0x897A = 0x5C7E
+0x897B = 0x5D21
+0x897C = 0x5D22
+0x897D = 0x5D23
+0x8989 = 0x5D24
+0x898D = 0x5D25
+0x8990 = 0x5D26
+0x8994 = 0x5D27
+0x8995 = 0x5D28
+0x899B = 0x5D29
+0x899C = 0x5D2A
+0x899F = 0x5D2B
+0x89A0 = 0x5D2C
+0x89A5 = 0x5D2D
+0x89B0 = 0x5D2E
+0x89B4 = 0x5D2F
+0x89B5 = 0x5D30
+0x89B6 = 0x5D31
+0x89B7 = 0x5D32
+0x89BC = 0x5D33
+0x89D4 = 0x5D34
+0x89D5 = 0x5D35
+0x89D6 = 0x5D36
+0x89D7 = 0x5D37
+0x89D8 = 0x5D38
+0x89E5 = 0x5D39
+0x89E9 = 0x5D3A
+0x89EB = 0x5D3B
+0x89ED = 0x5D3C
+0x89F1 = 0x5D3D
+0x89F3 = 0x5D3E
+0x89F6 = 0x5D3F
+0x89F9 = 0x5D40
+0x89FD = 0x5D41
+0x89FF = 0x5D42
+0x8A04 = 0x5D43
+0x8A05 = 0x5D44
+0x8A07 = 0x5D45
+0x8A0F = 0x5D46
+0x8A11 = 0x5D47
+0x8A12 = 0x5D48
+0x8A14 = 0x5D49
+0x8A15 = 0x5D4A
+0x8A1E = 0x5D4B
+0x8A20 = 0x5D4C
+0x8A22 = 0x5D4D
+0x8A24 = 0x5D4E
+0x8A26 = 0x5D4F
+0x8A2B = 0x5D50
+0x8A2C = 0x5D51
+0x8A2F = 0x5D52
+0x8A35 = 0x5D53
+0x8A37 = 0x5D54
+0x8A3D = 0x5D55
+0x8A3E = 0x5D56
+0x8A40 = 0x5D57
+0x8A43 = 0x5D58
+0x8A45 = 0x5D59
+0x8A47 = 0x5D5A
+0x8A49 = 0x5D5B
+0x8A4D = 0x5D5C
+0x8A4E = 0x5D5D
+0x8A53 = 0x5D5E
+0x8A56 = 0x5D5F
+0x8A57 = 0x5D60
+0x8A58 = 0x5D61
+0x8A5C = 0x5D62
+0x8A5D = 0x5D63
+0x8A61 = 0x5D64
+0x8A65 = 0x5D65
+0x8A67 = 0x5D66
+0x8A75 = 0x5D67
+0x8A76 = 0x5D68
+0x8A77 = 0x5D69
+0x8A79 = 0x5D6A
+0x8A7A = 0x5D6B
+0x8A7B = 0x5D6C
+0x8A7E = 0x5D6D
+0x8A7F = 0x5D6E
+0x8A80 = 0x5D6F
+0x8A83 = 0x5D70
+0x8A86 = 0x5D71
+0x8A8B = 0x5D72
+0x8A8F = 0x5D73
+0x8A90 = 0x5D74
+0x8A92 = 0x5D75
+0x8A96 = 0x5D76
+0x8A97 = 0x5D77
+0x8A99 = 0x5D78
+0x8A9F = 0x5D79
+0x8AA7 = 0x5D7A
+0x8AA9 = 0x5D7B
+0x8AAE = 0x5D7C
+0x8AAF = 0x5D7D
+0x8AB3 = 0x5D7E
+0x8AB6 = 0x5E21
+0x8AB7 = 0x5E22
+0x8ABB = 0x5E23
+0x8ABE = 0x5E24
+0x8AC3 = 0x5E25
+0x8AC6 = 0x5E26
+0x8AC8 = 0x5E27
+0x8AC9 = 0x5E28
+0x8ACA = 0x5E29
+0x8AD1 = 0x5E2A
+0x8AD3 = 0x5E2B
+0x8AD4 = 0x5E2C
+0x8AD5 = 0x5E2D
+0x8AD7 = 0x5E2E
+0x8ADD = 0x5E2F
+0x8ADF = 0x5E30
+0x8AEC = 0x5E31
+0x8AF0 = 0x5E32
+0x8AF4 = 0x5E33
+0x8AF5 = 0x5E34
+0x8AF6 = 0x5E35
+0x8AFC = 0x5E36
+0x8AFF = 0x5E37
+0x8B05 = 0x5E38
+0x8B06 = 0x5E39
+0x8B0A = 0x5E3F
+0x8B0B = 0x5E3A
+0x8B11 = 0x5E3B
+0x8B1C = 0x5E3C
+0x8B1E = 0x5E3D
+0x8B1F = 0x5E3E
+0x8B2D = 0x5E40
+0x8B30 = 0x5E41
+0x8B37 = 0x5E42
+0x8B3C = 0x5E43
+0x8B42 = 0x5E44
+0x8B43 = 0x5E45
+0x8B44 = 0x5E46
+0x8B45 = 0x5E47
+0x8B46 = 0x5E48
+0x8B48 = 0x5E49
+0x8B4D = 0x5E4E
+0x8B52 = 0x5E4A
+0x8B53 = 0x5E4B
+0x8B54 = 0x5E4C
+0x8B59 = 0x5E4D
+0x8B5E = 0x5E4F
+0x8B63 = 0x5E50
+0x8B6D = 0x5E51
+0x8B76 = 0x5E52
+0x8B78 = 0x5E53
+0x8B79 = 0x5E54
+0x8B7C = 0x5E55
+0x8B7E = 0x5E56
+0x8B81 = 0x5E57
+0x8B84 = 0x5E58
+0x8B85 = 0x5E59
+0x8B8B = 0x5E5A
+0x8B8D = 0x5E5B
+0x8B8F = 0x5E5C
+0x8B94 = 0x5E5D
+0x8B95 = 0x5E5E
+0x8B9C = 0x5E5F
+0x8B9E = 0x5E60
+0x8B9F = 0x5E61
+0x8C38 = 0x5E62
+0x8C39 = 0x5E63
+0x8C3D = 0x5E64
+0x8C3E = 0x5E65
+0x8C45 = 0x5E66
+0x8C47 = 0x5E67
+0x8C49 = 0x5E68
+0x8C4B = 0x5E69
+0x8C4F = 0x5E6A
+0x8C51 = 0x5E6B
+0x8C53 = 0x5E6C
+0x8C54 = 0x5E6D
+0x8C57 = 0x5E6E
+0x8C58 = 0x5E6F
+0x8C59 = 0x5E72
+0x8C5B = 0x5E70
+0x8C5D = 0x5E71
+0x8C63 = 0x5E73
+0x8C64 = 0x5E74
+0x8C66 = 0x5E75
+0x8C68 = 0x5E76
+0x8C69 = 0x5E77
+0x8C6D = 0x5E78
+0x8C73 = 0x5E79
+0x8C75 = 0x5E7A
+0x8C76 = 0x5E7B
+0x8C7B = 0x5E7C
+0x8C7E = 0x5E7D
+0x8C86 = 0x5E7E
+0x8C87 = 0x5F21
+0x8C8B = 0x5F22
+0x8C90 = 0x5F23
+0x8C92 = 0x5F24
+0x8C93 = 0x5F25
+0x8C99 = 0x5F26
+0x8C9B = 0x5F27
+0x8C9C = 0x5F28
+0x8CA4 = 0x5F29
+0x8CB9 = 0x5F2A
+0x8CBA = 0x5F2B
+0x8CC5 = 0x5F2C
+0x8CC6 = 0x5F2D
+0x8CC9 = 0x5F2E
+0x8CCB = 0x5F2F
+0x8CCF = 0x5F30
+0x8CD5 = 0x5F32
+0x8CD6 = 0x5F31
+0x8CD9 = 0x5F33
+0x8CDD = 0x5F34
+0x8CE1 = 0x5F35
+0x8CE8 = 0x5F36
+0x8CEC = 0x5F37
+0x8CEF = 0x5F38
+0x8CF0 = 0x5F39
+0x8CF2 = 0x5F3A
+0x8CF5 = 0x5F3B
+0x8CF7 = 0x5F3C
+0x8CF8 = 0x5F3D
+0x8CFE = 0x5F3E
+0x8CFF = 0x5F3F
+0x8D01 = 0x5F40
+0x8D03 = 0x5F41
+0x8D09 = 0x5F42
+0x8D12 = 0x5F43
+0x8D17 = 0x5F44
+0x8D1B = 0x5F45
+0x8D65 = 0x5F46
+0x8D69 = 0x5F47
+0x8D6C = 0x5F48
+0x8D6E = 0x5F49
+0x8D7F = 0x5F4A
+0x8D82 = 0x5F4B
+0x8D84 = 0x5F4C
+0x8D88 = 0x5F4D
+0x8D8D = 0x5F4E
+0x8D90 = 0x5F4F
+0x8D91 = 0x5F50
+0x8D95 = 0x5F51
+0x8D9E = 0x5F52
+0x8D9F = 0x5F53
+0x8DA0 = 0x5F54
+0x8DA6 = 0x5F55
+0x8DAB = 0x5F56
+0x8DAC = 0x5F57
+0x8DAF = 0x5F58
+0x8DB2 = 0x5F59
+0x8DB5 = 0x5F5A
+0x8DB7 = 0x5F5B
+0x8DB9 = 0x5F5C
+0x8DBB = 0x5F5D
+0x8DBC = 0x5F6F
+0x8DC0 = 0x5F5E
+0x8DC5 = 0x5F5F
+0x8DC6 = 0x5F60
+0x8DC7 = 0x5F61
+0x8DC8 = 0x5F62
+0x8DCA = 0x5F63
+0x8DCE = 0x5F64
+0x8DD1 = 0x5F65
+0x8DD4 = 0x5F66
+0x8DD5 = 0x5F67
+0x8DD7 = 0x5F68
+0x8DD9 = 0x5F69
+0x8DE4 = 0x5F6A
+0x8DE5 = 0x5F6B
+0x8DE7 = 0x5F6C
+0x8DEC = 0x5F6D
+0x8DF0 = 0x5F6E
+0x8DF1 = 0x5F70
+0x8DF2 = 0x5F71
+0x8DF4 = 0x5F72
+0x8DFD = 0x5F73
+0x8E01 = 0x5F74
+0x8E04 = 0x5F75
+0x8E05 = 0x5F76
+0x8E06 = 0x5F77
+0x8E0B = 0x5F78
+0x8E11 = 0x5F79
+0x8E14 = 0x5F7A
+0x8E16 = 0x5F7B
+0x8E20 = 0x5F7C
+0x8E21 = 0x5F7D
+0x8E22 = 0x5F7E
+0x8E23 = 0x6021
+0x8E26 = 0x6022
+0x8E27 = 0x6023
+0x8E31 = 0x6024
+0x8E33 = 0x6025
+0x8E36 = 0x6026
+0x8E37 = 0x6027
+0x8E38 = 0x6028
+0x8E39 = 0x6029
+0x8E3D = 0x602A
+0x8E40 = 0x602B
+0x8E41 = 0x602C
+0x8E4B = 0x602D
+0x8E4D = 0x602E
+0x8E4E = 0x602F
+0x8E4F = 0x6030
+0x8E54 = 0x6031
+0x8E5B = 0x6032
+0x8E5C = 0x6033
+0x8E5D = 0x6034
+0x8E5E = 0x6035
+0x8E61 = 0x6036
+0x8E62 = 0x6037
+0x8E69 = 0x6038
+0x8E6C = 0x6039
+0x8E6D = 0x603A
+0x8E6F = 0x603B
+0x8E70 = 0x603C
+0x8E71 = 0x603D
+0x8E79 = 0x603E
+0x8E7A = 0x603F
+0x8E7B = 0x6040
+0x8E82 = 0x6041
+0x8E83 = 0x6042
+0x8E89 = 0x6043
+0x8E90 = 0x6044
+0x8E92 = 0x6045
+0x8E95 = 0x6046
+0x8E9A = 0x6047
+0x8E9B = 0x6048
+0x8E9D = 0x6049
+0x8E9E = 0x604A
+0x8EA2 = 0x604B
+0x8EA7 = 0x604C
+0x8EA9 = 0x604D
+0x8EAD = 0x604E
+0x8EAE = 0x604F
+0x8EB3 = 0x6050
+0x8EB5 = 0x6051
+0x8EBA = 0x6052
+0x8EBB = 0x6053
+0x8EC0 = 0x6054
+0x8EC1 = 0x6055
+0x8EC3 = 0x6056
+0x8EC4 = 0x6057
+0x8EC7 = 0x6058
+0x8ECF = 0x6059
+0x8ED1 = 0x605A
+0x8ED4 = 0x605B
+0x8EDC = 0x605C
+0x8EE8 = 0x605D
+0x8EED = 0x6064
+0x8EEE = 0x605E
+0x8EF0 = 0x605F
+0x8EF1 = 0x6060
+0x8EF7 = 0x6061
+0x8EF9 = 0x6062
+0x8EFA = 0x6063
+0x8F00 = 0x6065
+0x8F02 = 0x6066
+0x8F07 = 0x6067
+0x8F08 = 0x6068
+0x8F0F = 0x6069
+0x8F10 = 0x606A
+0x8F16 = 0x606B
+0x8F17 = 0x606C
+0x8F18 = 0x606D
+0x8F1E = 0x606E
+0x8F20 = 0x606F
+0x8F21 = 0x6070
+0x8F23 = 0x6071
+0x8F25 = 0x6072
+0x8F27 = 0x6073
+0x8F28 = 0x6074
+0x8F2C = 0x6075
+0x8F2D = 0x6076
+0x8F2E = 0x6077
+0x8F34 = 0x6078
+0x8F35 = 0x6079
+0x8F36 = 0x607A
+0x8F37 = 0x607B
+0x8F3A = 0x607C
+0x8F40 = 0x607D
+0x8F41 = 0x607E
+0x8F43 = 0x6121
+0x8F47 = 0x6122
+0x8F4F = 0x6123
+0x8F51 = 0x6124
+0x8F52 = 0x6125
+0x8F53 = 0x6126
+0x8F54 = 0x6127
+0x8F55 = 0x6128
+0x8F58 = 0x6129
+0x8F5D = 0x612A
+0x8F5E = 0x612B
+0x8F65 = 0x612C
+0x8F9D = 0x612D
+0x8FA0 = 0x612E
+0x8FA1 = 0x612F
+0x8FA4 = 0x6130
+0x8FA5 = 0x6131
+0x8FA6 = 0x6132
+0x8FB5 = 0x6133
+0x8FB6 = 0x6134
+0x8FB8 = 0x6135
+0x8FBE = 0x6136
+0x8FC0 = 0x6137
+0x8FC1 = 0x6138
+0x8FC6 = 0x6139
+0x8FCA = 0x613A
+0x8FCB = 0x613B
+0x8FCD = 0x613C
+0x8FD0 = 0x613D
+0x8FD2 = 0x613E
+0x8FD3 = 0x613F
+0x8FD5 = 0x6140
+0x8FE0 = 0x6141
+0x8FE3 = 0x6142
+0x8FE4 = 0x6143
+0x8FE8 = 0x6144
+0x8FEE = 0x6145
+0x8FF1 = 0x6146
+0x8FF5 = 0x6147
+0x8FF6 = 0x6148
+0x8FFB = 0x6149
+0x8FFE = 0x614A
+0x9002 = 0x614B
+0x9004 = 0x614C
+0x9008 = 0x614D
+0x900C = 0x614E
+0x9018 = 0x614F
+0x901B = 0x6150
+0x9028 = 0x6151
+0x9029 = 0x6152
+0x902A = 0x6154
+0x902C = 0x6155
+0x902D = 0x6156
+0x902F = 0x6153
+0x9033 = 0x6157
+0x9034 = 0x6158
+0x9037 = 0x6159
+0x903F = 0x615A
+0x9043 = 0x615B
+0x9044 = 0x615C
+0x904C = 0x615D
+0x905B = 0x615E
+0x905D = 0x615F
+0x9062 = 0x6160
+0x9066 = 0x6161
+0x9067 = 0x6162
+0x906C = 0x6163
+0x9070 = 0x6164
+0x9074 = 0x6165
+0x9079 = 0x6166
+0x9085 = 0x6167
+0x9088 = 0x6168
+0x908B = 0x6169
+0x908C = 0x616A
+0x908E = 0x616B
+0x9090 = 0x616C
+0x9095 = 0x616D
+0x9097 = 0x616E
+0x9098 = 0x616F
+0x9099 = 0x6170
+0x909B = 0x6171
+0x90A0 = 0x6172
+0x90A1 = 0x6173
+0x90A2 = 0x6174
+0x90A5 = 0x6175
+0x90B0 = 0x6176
+0x90B2 = 0x6177
+0x90B3 = 0x6178
+0x90B4 = 0x6179
+0x90B6 = 0x617A
+0x90BD = 0x617B
+0x90BE = 0x617D
+0x90C3 = 0x617E
+0x90C4 = 0x6221
+0x90C5 = 0x6222
+0x90C7 = 0x6223
+0x90C8 = 0x6224
+0x90CC = 0x617C
+0x90D2 = 0x622D
+0x90D5 = 0x6225
+0x90D7 = 0x6226
+0x90D8 = 0x6227
+0x90D9 = 0x6228
+0x90DC = 0x6229
+0x90DD = 0x622A
+0x90DF = 0x622B
+0x90E5 = 0x622C
+0x90EB = 0x622F
+0x90EF = 0x6230
+0x90F0 = 0x6231
+0x90F4 = 0x6232
+0x90F6 = 0x622E
+0x90FE = 0x6233
+0x90FF = 0x6234
+0x9100 = 0x6235
+0x9104 = 0x6236
+0x9105 = 0x6237
+0x9106 = 0x6238
+0x9108 = 0x6239
+0x910D = 0x623A
+0x9110 = 0x623B
+0x9114 = 0x623C
+0x9116 = 0x623D
+0x9117 = 0x623E
+0x9118 = 0x623F
+0x911A = 0x6240
+0x911C = 0x6241
+0x911E = 0x6242
+0x9120 = 0x6243
+0x9122 = 0x6245
+0x9123 = 0x6246
+0x9125 = 0x6244
+0x9127 = 0x6247
+0x9129 = 0x6248
+0x912E = 0x6249
+0x912F = 0x624A
+0x9131 = 0x624B
+0x9134 = 0x624C
+0x9136 = 0x624D
+0x9137 = 0x624E
+0x9139 = 0x624F
+0x913A = 0x6250
+0x913C = 0x6251
+0x913D = 0x6252
+0x9143 = 0x6253
+0x9147 = 0x6254
+0x9148 = 0x6255
+0x914F = 0x6256
+0x9153 = 0x6257
+0x9157 = 0x6258
+0x9159 = 0x6259
+0x915A = 0x625A
+0x915B = 0x625B
+0x9161 = 0x625C
+0x9164 = 0x625D
+0x9167 = 0x625E
+0x916D = 0x625F
+0x9174 = 0x6260
+0x9179 = 0x6261
+0x917A = 0x6262
+0x917B = 0x6263
+0x9181 = 0x6264
+0x9183 = 0x6265
+0x9185 = 0x6266
+0x9186 = 0x6267
+0x918A = 0x6268
+0x918E = 0x6269
+0x9191 = 0x626A
+0x9193 = 0x626B
+0x9194 = 0x626C
+0x9195 = 0x626D
+0x9198 = 0x626E
+0x919E = 0x626F
+0x91A1 = 0x6270
+0x91A6 = 0x6271
+0x91A8 = 0x6272
+0x91AC = 0x6273
+0x91AD = 0x6274
+0x91AE = 0x6275
+0x91B0 = 0x6276
+0x91B1 = 0x6277
+0x91B2 = 0x6278
+0x91B3 = 0x6279
+0x91B6 = 0x627A
+0x91BB = 0x627B
+0x91BC = 0x627C
+0x91BD = 0x627D
+0x91BF = 0x627E
+0x91C2 = 0x6321
+0x91C3 = 0x6322
+0x91C5 = 0x6323
+0x91D3 = 0x6324
+0x91D4 = 0x6325
+0x91D7 = 0x6326
+0x91D9 = 0x6327
+0x91DA = 0x6328
+0x91DE = 0x6329
+0x91E4 = 0x632A
+0x91E5 = 0x632B
+0x91E9 = 0x632C
+0x91EA = 0x632D
+0x91EC = 0x632E
+0x91ED = 0x632F
+0x91EE = 0x6330
+0x91EF = 0x6331
+0x91F0 = 0x6332
+0x91F1 = 0x6333
+0x91F7 = 0x6334
+0x91F9 = 0x6335
+0x91FB = 0x6336
+0x91FD = 0x6337
+0x9200 = 0x6338
+0x9201 = 0x6339
+0x9204 = 0x633A
+0x9205 = 0x633B
+0x9206 = 0x633C
+0x9207 = 0x633D
+0x9209 = 0x633E
+0x920A = 0x633F
+0x920C = 0x6340
+0x9210 = 0x6341
+0x9212 = 0x6342
+0x9213 = 0x6343
+0x9216 = 0x6344
+0x9218 = 0x6345
+0x921C = 0x6346
+0x921D = 0x6347
+0x9223 = 0x6348
+0x9224 = 0x6349
+0x9225 = 0x634A
+0x9226 = 0x634B
+0x9228 = 0x634C
+0x922E = 0x634D
+0x922F = 0x634E
+0x9230 = 0x634F
+0x9233 = 0x6350
+0x9235 = 0x6351
+0x9236 = 0x6352
+0x9238 = 0x6353
+0x9239 = 0x6354
+0x923A = 0x6355
+0x923C = 0x6356
+0x923E = 0x6357
+0x9240 = 0x6358
+0x9242 = 0x6359
+0x9243 = 0x635A
+0x9246 = 0x635B
+0x9247 = 0x635C
+0x924A = 0x635D
+0x924D = 0x635E
+0x924E = 0x635F
+0x924F = 0x6360
+0x9251 = 0x6361
+0x9258 = 0x6362
+0x9259 = 0x6363
+0x925C = 0x6364
+0x925D = 0x6365
+0x9260 = 0x6366
+0x9261 = 0x6367
+0x9265 = 0x6368
+0x9267 = 0x6369
+0x9268 = 0x636A
+0x9269 = 0x636B
+0x926E = 0x636C
+0x926F = 0x636D
+0x9270 = 0x636E
+0x9275 = 0x636F
+0x9276 = 0x6370
+0x9277 = 0x6371
+0x9278 = 0x6372
+0x9279 = 0x6373
+0x927B = 0x6374
+0x927C = 0x6375
+0x927D = 0x6376
+0x927F = 0x6377
+0x9288 = 0x6378
+0x9289 = 0x6379
+0x928A = 0x637A
+0x928D = 0x637B
+0x928E = 0x637C
+0x9292 = 0x637D
+0x9297 = 0x637E
+0x9299 = 0x6421
+0x929F = 0x6422
+0x92A0 = 0x6423
+0x92A4 = 0x6424
+0x92A5 = 0x6425
+0x92A7 = 0x6426
+0x92A8 = 0x6427
+0x92AB = 0x6428
+0x92AF = 0x6429
+0x92B2 = 0x642A
+0x92B6 = 0x642B
+0x92B8 = 0x642C
+0x92BA = 0x642D
+0x92BB = 0x642E
+0x92BC = 0x642F
+0x92BD = 0x6430
+0x92BF = 0x6431
+0x92C0 = 0x6432
+0x92C1 = 0x6433
+0x92C2 = 0x6434
+0x92C3 = 0x6435
+0x92C5 = 0x6436
+0x92C6 = 0x6437
+0x92C7 = 0x6438
+0x92C8 = 0x6439
+0x92CB = 0x643A
+0x92CC = 0x643B
+0x92CD = 0x643C
+0x92CE = 0x643D
+0x92D0 = 0x643E
+0x92D3 = 0x643F
+0x92D5 = 0x6440
+0x92D7 = 0x6441
+0x92D8 = 0x6442
+0x92D9 = 0x6443
+0x92DC = 0x6444
+0x92DD = 0x6445
+0x92DF = 0x6446
+0x92E0 = 0x6447
+0x92E1 = 0x6448
+0x92E3 = 0x6449
+0x92E5 = 0x644A
+0x92E7 = 0x644B
+0x92E8 = 0x644C
+0x92EC = 0x644D
+0x92EE = 0x644E
+0x92F0 = 0x644F
+0x92F9 = 0x6450
+0x92FB = 0x6451
+0x92FF = 0x6452
+0x9300 = 0x6453
+0x9302 = 0x6454
+0x9308 = 0x6455
+0x930D = 0x6456
+0x9311 = 0x6457
+0x9314 = 0x6458
+0x9315 = 0x6459
+0x931C = 0x645A
+0x931D = 0x645B
+0x931E = 0x645C
+0x931F = 0x645D
+0x9321 = 0x645E
+0x9324 = 0x645F
+0x9325 = 0x6460
+0x9327 = 0x6461
+0x9329 = 0x6462
+0x932A = 0x6463
+0x9333 = 0x6464
+0x9334 = 0x6465
+0x9336 = 0x6466
+0x9337 = 0x6467
+0x9347 = 0x6468
+0x9348 = 0x6469
+0x9349 = 0x646A
+0x9350 = 0x646B
+0x9351 = 0x646C
+0x9352 = 0x646D
+0x9355 = 0x646E
+0x9357 = 0x646F
+0x9358 = 0x6470
+0x935A = 0x6471
+0x935E = 0x6472
+0x9364 = 0x6473
+0x9365 = 0x6474
+0x9367 = 0x6475
+0x9369 = 0x6476
+0x936A = 0x6477
+0x936D = 0x6478
+0x936F = 0x6479
+0x9370 = 0x647A
+0x9371 = 0x647B
+0x9373 = 0x647C
+0x9374 = 0x647D
+0x9376 = 0x647E
+0x937A = 0x6521
+0x937D = 0x6522
+0x937F = 0x6523
+0x9380 = 0x6524
+0x9381 = 0x6525
+0x9382 = 0x6526
+0x9388 = 0x6527
+0x938A = 0x6528
+0x938B = 0x6529
+0x938D = 0x652A
+0x938F = 0x652B
+0x9392 = 0x652C
+0x9395 = 0x652D
+0x9398 = 0x652E
+0x939B = 0x652F
+0x939E = 0x6530
+0x93A1 = 0x6531
+0x93A3 = 0x6532
+0x93A4 = 0x6533
+0x93A6 = 0x6534
+0x93A8 = 0x6535
+0x93A9 = 0x653B
+0x93AB = 0x6536
+0x93B4 = 0x6537
+0x93B5 = 0x6538
+0x93B6 = 0x6539
+0x93BA = 0x653A
+0x93C1 = 0x653C
+0x93C4 = 0x653D
+0x93C5 = 0x653E
+0x93C6 = 0x653F
+0x93C7 = 0x6540
+0x93C9 = 0x6541
+0x93CA = 0x6542
+0x93CB = 0x6543
+0x93CC = 0x6544
+0x93CD = 0x6545
+0x93D3 = 0x6546
+0x93D9 = 0x6547
+0x93DC = 0x6548
+0x93DE = 0x6549
+0x93DF = 0x654A
+0x93E2 = 0x654B
+0x93E6 = 0x654C
+0x93E7 = 0x654D
+0x93F7 = 0x654F
+0x93F8 = 0x6550
+0x93F9 = 0x654E
+0x93FA = 0x6551
+0x93FB = 0x6552
+0x93FD = 0x6553
+0x9401 = 0x6554
+0x9402 = 0x6555
+0x9404 = 0x6556
+0x9408 = 0x6557
+0x9409 = 0x6558
+0x940D = 0x6559
+0x940E = 0x655A
+0x940F = 0x655B
+0x9415 = 0x655C
+0x9416 = 0x655D
+0x9417 = 0x655E
+0x941F = 0x655F
+0x942E = 0x6560
+0x942F = 0x6561
+0x9431 = 0x6562
+0x9432 = 0x6563
+0x9433 = 0x6564
+0x9434 = 0x6565
+0x943B = 0x6566
+0x943D = 0x6568
+0x943F = 0x6567
+0x9443 = 0x6569
+0x9445 = 0x656A
+0x9448 = 0x656B
+0x944A = 0x656C
+0x944C = 0x656D
+0x9455 = 0x656E
+0x9459 = 0x656F
+0x945C = 0x6570
+0x945F = 0x6571
+0x9461 = 0x6572
+0x9463 = 0x6573
+0x9468 = 0x6574
+0x946B = 0x6575
+0x946D = 0x6576
+0x946E = 0x6577
+0x946F = 0x6578
+0x9471 = 0x6579
+0x9472 = 0x657A
+0x9483 = 0x657C
+0x9484 = 0x657B
+0x9578 = 0x657D
+0x9579 = 0x657E
+0x957E = 0x6621
+0x9584 = 0x6622
+0x9588 = 0x6623
+0x958C = 0x6624
+0x958D = 0x6625
+0x958E = 0x6626
+0x959D = 0x6627
+0x959E = 0x6628
+0x959F = 0x6629
+0x95A1 = 0x662A
+0x95A6 = 0x662B
+0x95A9 = 0x662C
+0x95AB = 0x662D
+0x95AC = 0x662E
+0x95B4 = 0x662F
+0x95B6 = 0x6630
+0x95BA = 0x6631
+0x95BD = 0x6632
+0x95BF = 0x6633
+0x95C6 = 0x6634
+0x95C8 = 0x6635
+0x95C9 = 0x6636
+0x95CB = 0x6637
+0x95D0 = 0x6638
+0x95D1 = 0x6639
+0x95D2 = 0x663A
+0x95D3 = 0x663B
+0x95D9 = 0x663C
+0x95DA = 0x663D
+0x95DD = 0x663E
+0x95DE = 0x663F
+0x95DF = 0x6640
+0x95E0 = 0x6641
+0x95E4 = 0x6642
+0x95E6 = 0x6643
+0x961D = 0x6644
+0x961E = 0x6645
+0x9622 = 0x6646
+0x9624 = 0x6647
+0x9625 = 0x6648
+0x9626 = 0x6649
+0x962C = 0x664A
+0x9631 = 0x664B
+0x9633 = 0x664C
+0x9637 = 0x664D
+0x9638 = 0x664E
+0x9639 = 0x664F
+0x963A = 0x6650
+0x963C = 0x6651
+0x963D = 0x6652
+0x9641 = 0x6653
+0x9652 = 0x6654
+0x9654 = 0x6655
+0x9656 = 0x6656
+0x9657 = 0x6657
+0x9658 = 0x6658
+0x9661 = 0x6659
+0x966E = 0x665A
+0x9674 = 0x665B
+0x967B = 0x665C
+0x967C = 0x665D
+0x967E = 0x665E
+0x967F = 0x665F
+0x9681 = 0x6660
+0x9682 = 0x6661
+0x9683 = 0x6662
+0x9684 = 0x6663
+0x9689 = 0x6664
+0x9691 = 0x6665
+0x9696 = 0x6666
+0x969A = 0x6667
+0x969D = 0x6668
+0x969F = 0x6669
+0x96A4 = 0x666A
+0x96A5 = 0x666B
+0x96A6 = 0x666C
+0x96A9 = 0x666D
+0x96AE = 0x666E
+0x96AF = 0x666F
+0x96B3 = 0x6670
+0x96BA = 0x6671
+0x96CA = 0x6672
+0x96D2 = 0x6673
+0x96D8 = 0x6675
+0x96DA = 0x6676
+0x96DD = 0x6677
+0x96DE = 0x6678
+0x96DF = 0x6679
+0x96E9 = 0x667A
+0x96EF = 0x667B
+0x96F1 = 0x667C
+0x96FA = 0x667D
+0x9702 = 0x667E
+0x9703 = 0x6721
+0x9705 = 0x6722
+0x9709 = 0x6723
+0x971A = 0x6724
+0x971B = 0x6725
+0x971D = 0x6726
+0x9721 = 0x6727
+0x9722 = 0x6728
+0x9723 = 0x6729
+0x9728 = 0x672A
+0x9731 = 0x672B
+0x9733 = 0x672C
+0x9741 = 0x672D
+0x9743 = 0x672E
+0x974A = 0x672F
+0x974E = 0x6730
+0x974F = 0x6731
+0x9755 = 0x6732
+0x9757 = 0x6733
+0x9758 = 0x6734
+0x975A = 0x6735
+0x975B = 0x6736
+0x9763 = 0x6737
+0x9767 = 0x6738
+0x976A = 0x6739
+0x976E = 0x673A
+0x9773 = 0x673B
+0x9776 = 0x673C
+0x9777 = 0x673D
+0x9778 = 0x673E
+0x977B = 0x673F
+0x977D = 0x6740
+0x977F = 0x6741
+0x9780 = 0x6742
+0x9789 = 0x6743
+0x9795 = 0x6744
+0x9796 = 0x6745
+0x9797 = 0x6746
+0x9799 = 0x6747
+0x979A = 0x6748
+0x979E = 0x6749
+0x979F = 0x674A
+0x97A2 = 0x674B
+0x97AC = 0x674C
+0x97AE = 0x674D
+0x97B1 = 0x674E
+0x97B2 = 0x674F
+0x97B5 = 0x6750
+0x97B6 = 0x6751
+0x97B8 = 0x6752
+0x97B9 = 0x6753
+0x97BA = 0x6754
+0x97BC = 0x6755
+0x97BE = 0x6756
+0x97BF = 0x6757
+0x97C1 = 0x6758
+0x97C4 = 0x6759
+0x97C5 = 0x675A
+0x97C7 = 0x675B
+0x97C9 = 0x675C
+0x97CA = 0x675D
+0x97CC = 0x675E
+0x97CD = 0x675F
+0x97CE = 0x6760
+0x97D0 = 0x6761
+0x97D1 = 0x6762
+0x97D4 = 0x6763
+0x97D7 = 0x6764
+0x97D8 = 0x6765
+0x97D9 = 0x6766
+0x97DB = 0x676A
+0x97DD = 0x6767
+0x97DE = 0x6768
+0x97E0 = 0x6769
+0x97E1 = 0x676B
+0x97E4 = 0x676C
+0x97EF = 0x676D
+0x97F1 = 0x676E
+0x97F4 = 0x676F
+0x97F7 = 0x6770
+0x97F8 = 0x6771
+0x97FA = 0x6772
+0x9807 = 0x6773
+0x980A = 0x6774
+0x980D = 0x6776
+0x980E = 0x6777
+0x9814 = 0x6778
+0x9816 = 0x6779
+0x9819 = 0x6775
+0x981C = 0x677A
+0x981E = 0x677B
+0x9820 = 0x677C
+0x9823 = 0x677D
+0x9825 = 0x6828
+0x9826 = 0x677E
+0x982B = 0x6821
+0x982E = 0x6822
+0x982F = 0x6823
+0x9830 = 0x6824
+0x9832 = 0x6825
+0x9833 = 0x6826
+0x9835 = 0x6827
+0x983E = 0x6829
+0x9844 = 0x682A
+0x9847 = 0x682B
+0x984A = 0x682C
+0x9851 = 0x682D
+0x9852 = 0x682E
+0x9853 = 0x682F
+0x9856 = 0x6830
+0x9857 = 0x6831
+0x9859 = 0x6832
+0x985A = 0x6833
+0x9862 = 0x6834
+0x9863 = 0x6835
+0x9865 = 0x6836
+0x9866 = 0x6837
+0x986A = 0x6838
+0x986C = 0x6839
+0x98AB = 0x683A
+0x98AD = 0x683B
+0x98AE = 0x683C
+0x98B0 = 0x683D
+0x98B4 = 0x683E
+0x98B7 = 0x683F
+0x98B8 = 0x6840
+0x98BA = 0x6841
+0x98BB = 0x6842
+0x98BF = 0x6843
+0x98C2 = 0x6844
+0x98C5 = 0x6845
+0x98C8 = 0x6846
+0x98CC = 0x6847
+0x98E1 = 0x6848
+0x98E3 = 0x6849
+0x98E5 = 0x684A
+0x98E6 = 0x684B
+0x98E7 = 0x684C
+0x98EA = 0x684D
+0x98F3 = 0x684E
+0x98F6 = 0x684F
+0x9902 = 0x6850
+0x9907 = 0x6851
+0x9908 = 0x6852
+0x9911 = 0x6853
+0x9915 = 0x6854
+0x9916 = 0x6855
+0x9917 = 0x6856
+0x991A = 0x6857
+0x991B = 0x6858
+0x991C = 0x6859
+0x991F = 0x685A
+0x9922 = 0x685B
+0x9926 = 0x685C
+0x9927 = 0x685D
+0x992B = 0x685E
+0x9931 = 0x685F
+0x9932 = 0x6860
+0x9933 = 0x6861
+0x9934 = 0x6862
+0x9935 = 0x6863
+0x9939 = 0x6864
+0x993A = 0x6865
+0x993B = 0x6866
+0x993C = 0x6867
+0x9940 = 0x6868
+0x9941 = 0x6869
+0x9946 = 0x686A
+0x9947 = 0x686B
+0x9948 = 0x686C
+0x994D = 0x686D
+0x994E = 0x686E
+0x9954 = 0x686F
+0x9958 = 0x6870
+0x9959 = 0x6871
+0x995B = 0x6872
+0x995C = 0x6873
+0x995E = 0x6874
+0x995F = 0x6875
+0x9960 = 0x6876
+0x999B = 0x6877
+0x999D = 0x6878
+0x999F = 0x6879
+0x99A6 = 0x687A
+0x99B0 = 0x687B
+0x99B1 = 0x687C
+0x99B2 = 0x687D
+0x99B5 = 0x687E
+0x99B9 = 0x6921
+0x99BA = 0x6922
+0x99BD = 0x6923
+0x99BF = 0x6924
+0x99C3 = 0x6925
+0x99C9 = 0x6926
+0x99D3 = 0x6927
+0x99D4 = 0x6928
+0x99D9 = 0x6929
+0x99DA = 0x692A
+0x99DC = 0x692B
+0x99DE = 0x692C
+0x99E7 = 0x692D
+0x99EA = 0x692E
+0x99EB = 0x692F
+0x99EC = 0x6930
+0x99F0 = 0x6931
+0x99F4 = 0x6932
+0x99F5 = 0x6933
+0x99F9 = 0x6934
+0x99FD = 0x6935
+0x99FE = 0x6936
+0x9A02 = 0x6937
+0x9A03 = 0x6938
+0x9A04 = 0x6939
+0x9A0B = 0x693A
+0x9A0C = 0x693B
+0x9A10 = 0x693C
+0x9A11 = 0x693D
+0x9A16 = 0x693E
+0x9A1E = 0x693F
+0x9A20 = 0x6940
+0x9A22 = 0x6941
+0x9A23 = 0x6942
+0x9A24 = 0x6943
+0x9A27 = 0x6944
+0x9A2D = 0x6945
+0x9A2E = 0x6946
+0x9A33 = 0x6947
+0x9A35 = 0x6948
+0x9A36 = 0x6949
+0x9A38 = 0x694A
+0x9A41 = 0x694C
+0x9A44 = 0x694D
+0x9A47 = 0x694B
+0x9A4A = 0x694E
+0x9A4B = 0x694F
+0x9A4C = 0x6950
+0x9A4E = 0x6951
+0x9A51 = 0x6952
+0x9A54 = 0x6953
+0x9A56 = 0x6954
+0x9A5D = 0x6955
+0x9AAA = 0x6956
+0x9AAC = 0x6957
+0x9AAE = 0x6958
+0x9AAF = 0x6959
+0x9AB2 = 0x695A
+0x9AB4 = 0x695B
+0x9AB5 = 0x695C
+0x9AB6 = 0x695D
+0x9AB9 = 0x695E
+0x9ABB = 0x695F
+0x9ABE = 0x6960
+0x9ABF = 0x6961
+0x9AC1 = 0x6962
+0x9AC3 = 0x6963
+0x9AC6 = 0x6964
+0x9AC8 = 0x6965
+0x9ACE = 0x6966
+0x9AD0 = 0x6967
+0x9AD2 = 0x6968
+0x9AD5 = 0x6969
+0x9AD6 = 0x696A
+0x9AD7 = 0x696B
+0x9ADB = 0x696C
+0x9ADC = 0x696D
+0x9AE0 = 0x696E
+0x9AE4 = 0x696F
+0x9AE5 = 0x6970
+0x9AE7 = 0x6971
+0x9AE9 = 0x6972
+0x9AEC = 0x6973
+0x9AF2 = 0x6974
+0x9AF3 = 0x6975
+0x9AF5 = 0x6976
+0x9AF9 = 0x6977
+0x9AFA = 0x6978
+0x9AFD = 0x6979
+0x9AFF = 0x697A
+0x9B00 = 0x697B
+0x9B01 = 0x697C
+0x9B02 = 0x697D
+0x9B03 = 0x697E
+0x9B04 = 0x6A21
+0x9B05 = 0x6A22
+0x9B08 = 0x6A23
+0x9B09 = 0x6A24
+0x9B0B = 0x6A25
+0x9B0C = 0x6A26
+0x9B0D = 0x6A27
+0x9B0E = 0x6A28
+0x9B10 = 0x6A29
+0x9B12 = 0x6A2A
+0x9B16 = 0x6A2B
+0x9B19 = 0x6A2C
+0x9B1B = 0x6A2D
+0x9B1C = 0x6A2E
+0x9B20 = 0x6A2F
+0x9B26 = 0x6A30
+0x9B2B = 0x6A31
+0x9B2D = 0x6A32
+0x9B33 = 0x6A33
+0x9B34 = 0x6A34
+0x9B35 = 0x6A35
+0x9B37 = 0x6A36
+0x9B39 = 0x6A37
+0x9B3A = 0x6A38
+0x9B3D = 0x6A39
+0x9B48 = 0x6A3A
+0x9B4B = 0x6A3B
+0x9B4C = 0x6A3C
+0x9B55 = 0x6A3D
+0x9B56 = 0x6A3E
+0x9B57 = 0x6A3F
+0x9B5B = 0x6A40
+0x9B5E = 0x6A41
+0x9B61 = 0x6A42
+0x9B63 = 0x6A43
+0x9B65 = 0x6A44
+0x9B66 = 0x6A45
+0x9B68 = 0x6A46
+0x9B6A = 0x6A47
+0x9B6B = 0x6A48
+0x9B6C = 0x6A49
+0x9B6D = 0x6A4A
+0x9B6E = 0x6A4B
+0x9B73 = 0x6A4C
+0x9B75 = 0x6A4D
+0x9B77 = 0x6A4E
+0x9B78 = 0x6A4F
+0x9B79 = 0x6A50
+0x9B7F = 0x6A51
+0x9B80 = 0x6A52
+0x9B84 = 0x6A53
+0x9B85 = 0x6A54
+0x9B86 = 0x6A55
+0x9B87 = 0x6A56
+0x9B89 = 0x6A57
+0x9B8A = 0x6A58
+0x9B8B = 0x6A59
+0x9B8D = 0x6A5A
+0x9B8F = 0x6A5B
+0x9B90 = 0x6A5C
+0x9B94 = 0x6A5D
+0x9B9A = 0x6A5E
+0x9B9D = 0x6A5F
+0x9B9E = 0x6A60
+0x9BA6 = 0x6A61
+0x9BA7 = 0x6A62
+0x9BA9 = 0x6A63
+0x9BAC = 0x6A64
+0x9BB0 = 0x6A65
+0x9BB1 = 0x6A66
+0x9BB2 = 0x6A67
+0x9BB7 = 0x6A68
+0x9BB8 = 0x6A69
+0x9BBB = 0x6A6A
+0x9BBC = 0x6A6B
+0x9BBE = 0x6A6C
+0x9BBF = 0x6A6D
+0x9BC1 = 0x6A6E
+0x9BC7 = 0x6A6F
+0x9BC8 = 0x6A70
+0x9BCE = 0x6A71
+0x9BD0 = 0x6A72
+0x9BD7 = 0x6A73
+0x9BD8 = 0x6A74
+0x9BDD = 0x6A75
+0x9BDF = 0x6A76
+0x9BE5 = 0x6A77
+0x9BE7 = 0x6A78
+0x9BEA = 0x6A79
+0x9BEB = 0x6A7A
+0x9BEF = 0x6A7B
+0x9BF3 = 0x6A7C
+0x9BF7 = 0x6A7D
+0x9BF8 = 0x6A7E
+0x9BF9 = 0x6B21
+0x9BFA = 0x6B22
+0x9BFD = 0x6B23
+0x9BFF = 0x6B24
+0x9C00 = 0x6B25
+0x9C02 = 0x6B26
+0x9C0B = 0x6B27
+0x9C0F = 0x6B28
+0x9C11 = 0x6B29
+0x9C16 = 0x6B2A
+0x9C18 = 0x6B2B
+0x9C19 = 0x6B2C
+0x9C1A = 0x6B2D
+0x9C1C = 0x6B2E
+0x9C1E = 0x6B2F
+0x9C22 = 0x6B30
+0x9C23 = 0x6B31
+0x9C26 = 0x6B32
+0x9C27 = 0x6B33
+0x9C28 = 0x6B34
+0x9C29 = 0x6B35
+0x9C2A = 0x6B36
+0x9C31 = 0x6B37
+0x9C35 = 0x6B38
+0x9C36 = 0x6B39
+0x9C37 = 0x6B3A
+0x9C3D = 0x6B3B
+0x9C41 = 0x6B3C
+0x9C43 = 0x6B3D
+0x9C44 = 0x6B3E
+0x9C45 = 0x6B3F
+0x9C49 = 0x6B40
+0x9C4A = 0x6B41
+0x9C4E = 0x6B42
+0x9C4F = 0x6B43
+0x9C50 = 0x6B44
+0x9C53 = 0x6B45
+0x9C54 = 0x6B46
+0x9C56 = 0x6B47
+0x9C58 = 0x6B48
+0x9C5B = 0x6B49
+0x9C5C = 0x6B50
+0x9C5D = 0x6B4A
+0x9C5E = 0x6B4B
+0x9C5F = 0x6B4C
+0x9C63 = 0x6B4D
+0x9C68 = 0x6B52
+0x9C69 = 0x6B4E
+0x9C6A = 0x6B4F
+0x9C6B = 0x6B51
+0x9C6E = 0x6B53
+0x9C70 = 0x6B54
+0x9C72 = 0x6B55
+0x9C75 = 0x6B56
+0x9C77 = 0x6B57
+0x9C7B = 0x6B58
+0x9CE6 = 0x6B59
+0x9CF2 = 0x6B5A
+0x9CF7 = 0x6B5B
+0x9CF9 = 0x6B5C
+0x9D02 = 0x6B5E
+0x9D0B = 0x6B5D
+0x9D11 = 0x6B5F
+0x9D17 = 0x6B60
+0x9D18 = 0x6B61
+0x9D1C = 0x6B62
+0x9D1D = 0x6B63
+0x9D1E = 0x6B64
+0x9D2F = 0x6B65
+0x9D30 = 0x6B66
+0x9D32 = 0x6B67
+0x9D33 = 0x6B68
+0x9D34 = 0x6B69
+0x9D3A = 0x6B6A
+0x9D3C = 0x6B6B
+0x9D3D = 0x6B6D
+0x9D42 = 0x6B6E
+0x9D43 = 0x6B6F
+0x9D45 = 0x6B6C
+0x9D47 = 0x6B70
+0x9D4A = 0x6B71
+0x9D53 = 0x6B72
+0x9D54 = 0x6B73
+0x9D5F = 0x6B74
+0x9D62 = 0x6B76
+0x9D63 = 0x6B75
+0x9D65 = 0x6B77
+0x9D69 = 0x6B78
+0x9D6A = 0x6B79
+0x9D6B = 0x6B7A
+0x9D70 = 0x6B7B
+0x9D76 = 0x6B7C
+0x9D77 = 0x6B7D
+0x9D7B = 0x6B7E
+0x9D7C = 0x6C21
+0x9D7E = 0x6C22
+0x9D83 = 0x6C23
+0x9D84 = 0x6C24
+0x9D86 = 0x6C25
+0x9D8A = 0x6C26
+0x9D8D = 0x6C27
+0x9D8E = 0x6C28
+0x9D92 = 0x6C29
+0x9D93 = 0x6C2A
+0x9D95 = 0x6C2B
+0x9D96 = 0x6C2C
+0x9D97 = 0x6C2D
+0x9D98 = 0x6C2E
+0x9DA1 = 0x6C2F
+0x9DAA = 0x6C30
+0x9DAC = 0x6C31
+0x9DAE = 0x6C32
+0x9DB1 = 0x6C33
+0x9DB5 = 0x6C34
+0x9DB9 = 0x6C35
+0x9DBC = 0x6C36
+0x9DBF = 0x6C37
+0x9DC3 = 0x6C38
+0x9DC7 = 0x6C39
+0x9DC9 = 0x6C3A
+0x9DCA = 0x6C3B
+0x9DD4 = 0x6C3C
+0x9DD5 = 0x6C3D
+0x9DD6 = 0x6C3E
+0x9DD7 = 0x6C3F
+0x9DDA = 0x6C40
+0x9DDE = 0x6C41
+0x9DDF = 0x6C42
+0x9DE0 = 0x6C43
+0x9DE5 = 0x6C44
+0x9DE7 = 0x6C45
+0x9DE9 = 0x6C46
+0x9DEB = 0x6C47
+0x9DEE = 0x6C48
+0x9DF0 = 0x6C49
+0x9DF3 = 0x6C4A
+0x9DF4 = 0x6C4B
+0x9DFE = 0x6C4C
+0x9E02 = 0x6C4E
+0x9E07 = 0x6C4F
+0x9E0A = 0x6C4D
+0x9E0E = 0x6C50
+0x9E10 = 0x6C51
+0x9E11 = 0x6C52
+0x9E12 = 0x6C53
+0x9E15 = 0x6C54
+0x9E16 = 0x6C55
+0x9E19 = 0x6C56
+0x9E1C = 0x6C57
+0x9E1D = 0x6C58
+0x9E7A = 0x6C59
+0x9E7B = 0x6C5A
+0x9E7C = 0x6C5B
+0x9E80 = 0x6C5C
+0x9E82 = 0x6C5D
+0x9E83 = 0x6C5E
+0x9E84 = 0x6C5F
+0x9E85 = 0x6C60
+0x9E87 = 0x6C61
+0x9E8E = 0x6C62
+0x9E8F = 0x6C63
+0x9E96 = 0x6C64
+0x9E98 = 0x6C65
+0x9E9B = 0x6C66
+0x9E9E = 0x6C67
+0x9EA4 = 0x6C68
+0x9EA8 = 0x6C69
+0x9EAC = 0x6C6A
+0x9EAE = 0x6C6B
+0x9EAF = 0x6C6C
+0x9EB0 = 0x6C6D
+0x9EB3 = 0x6C6E
+0x9EB4 = 0x6C6F
+0x9EB5 = 0x6C70
+0x9EC6 = 0x6C71
+0x9EC8 = 0x6C72
+0x9ECB = 0x6C73
+0x9ED5 = 0x6C74
+0x9EDF = 0x6C75
+0x9EE4 = 0x6C76
+0x9EE7 = 0x6C77
+0x9EEC = 0x6C78
+0x9EED = 0x6C79
+0x9EEE = 0x6C7A
+0x9EF0 = 0x6C7B
+0x9EF1 = 0x6C7C
+0x9EF2 = 0x6C7D
+0x9EF5 = 0x6C7E
+0x9EF8 = 0x6D21
+0x9EFF = 0x6D22
+0x9F02 = 0x6D23
+0x9F03 = 0x6D24
+0x9F09 = 0x6D25
+0x9F0F = 0x6D26
+0x9F10 = 0x6D27
+0x9F11 = 0x6D28
+0x9F12 = 0x6D29
+0x9F14 = 0x6D2A
+0x9F16 = 0x6D2B
+0x9F17 = 0x6D2C
+0x9F19 = 0x6D2D
+0x9F1A = 0x6D2E
+0x9F1B = 0x6D2F
+0x9F1F = 0x6D30
+0x9F22 = 0x6D31
+0x9F26 = 0x6D32
+0x9F2A = 0x6D33
+0x9F2B = 0x6D34
+0x9F2F = 0x6D35
+0x9F31 = 0x6D36
+0x9F32 = 0x6D37
+0x9F34 = 0x6D38
+0x9F37 = 0x6D39
+0x9F39 = 0x6D3A
+0x9F3A = 0x6D3B
+0x9F3C = 0x6D3C
+0x9F3D = 0x6D3D
+0x9F3F = 0x6D3E
+0x9F41 = 0x6D3F
+0x9F43 = 0x6D40
+0x9F44 = 0x6D41
+0x9F45 = 0x6D42
+0x9F46 = 0x6D43
+0x9F47 = 0x6D44
+0x9F53 = 0x6D45
+0x9F55 = 0x6D46
+0x9F56 = 0x6D47
+0x9F57 = 0x6D48
+0x9F58 = 0x6D49
+0x9F5A = 0x6D4A
+0x9F5D = 0x6D4B
+0x9F5E = 0x6D4C
+0x9F68 = 0x6D4D
+0x9F69 = 0x6D4E
+0x9F6D = 0x6D4F
+0x9F6E = 0x6D50
+0x9F6F = 0x6D51
+0x9F70 = 0x6D52
+0x9F71 = 0x6D53
+0x9F73 = 0x6D54
+0x9F75 = 0x6D55
+0x9F7A = 0x6D56
+0x9F7D = 0x6D57
+0x9F8F = 0x6D58
+0x9F90 = 0x6D59
+0x9F91 = 0x6D5A
+0x9F92 = 0x6D5B
+0x9F94 = 0x6D5C
+0x9F96 = 0x6D5D
+0x9F97 = 0x6D5E
+0x9F9E = 0x6D5F
+0x9FA1 = 0x6D60
+0x9FA2 = 0x6D61
+0x9FA3 = 0x6D62
+0x9FA5 = 0x6D63
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212@MS.src b/enc/trans/JIS/UCS%JISX0212@MS.src
new file mode 100644
index 0000000000..1f0c3c3c16
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0212@MS.src
@@ -0,0 +1,6082 @@
+# $NetBSD: UCS%JISX0212@MS.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0212:MS"
+SRC_ZONE	0x0000 - 0xFFFF
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x0000 - 0xFFFF		= INVALID
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x00A1 = 0x2242
+0x00A4 = 0x2270
+0x00A9 = 0x226D
+0x00AA = 0x226C
+0x00AE = 0x226E
+0x00AF = 0x2234
+0x00B8 = 0x2231
+0x00BA = 0x226B
+0x00BF = 0x2244
+0x00C0 = 0x2A22
+0x00C1 = 0x2A21
+0x00C2 = 0x2A24
+0x00C3 = 0x2A2A
+0x00C4 = 0x2A23
+0x00C5 = 0x2A29
+0x00C6 = 0x2921
+0x00C7 = 0x2A2E
+0x00C8 = 0x2A32
+0x00C9 = 0x2A31
+0x00CA = 0x2A34
+0x00CB = 0x2A33
+0x00CC = 0x2A40
+0x00CD = 0x2A3F
+0x00CE = 0x2A42
+0x00CF = 0x2A41
+0x00D1 = 0x2A50
+0x00D2 = 0x2A52
+0x00D3 = 0x2A51
+0x00D4 = 0x2A54
+0x00D5 = 0x2A58
+0x00D6 = 0x2A53
+0x00D8 = 0x292C
+0x00D9 = 0x2A63
+0x00DA = 0x2A62
+0x00DB = 0x2A65
+0x00DC = 0x2A64
+0x00DD = 0x2A72
+0x00DE = 0x2930
+0x00DF = 0x294E
+0x00E0 = 0x2B22
+0x00E1 = 0x2B21
+0x00E2 = 0x2B24
+0x00E3 = 0x2B2A
+0x00E4 = 0x2B23
+0x00E5 = 0x2B29
+0x00E6 = 0x2941
+0x00E7 = 0x2B2E
+0x00E8 = 0x2B32
+0x00E9 = 0x2B31
+0x00EA = 0x2B34
+0x00EB = 0x2B33
+0x00EC = 0x2B40
+0x00ED = 0x2B3F
+0x00EE = 0x2B42
+0x00EF = 0x2B41
+0x00F0 = 0x2943
+0x00F1 = 0x2B50
+0x00F2 = 0x2B52
+0x00F3 = 0x2B51
+0x00F4 = 0x2B54
+0x00F5 = 0x2B58
+0x00F6 = 0x2B53
+0x00F8 = 0x294C
+0x00F9 = 0x2B63
+0x00FA = 0x2B62
+0x00FB = 0x2B65
+0x00FC = 0x2B64
+0x00FD = 0x2B72
+0x00FE = 0x2950
+0x00FF = 0x2B73
+0x0100 = 0x2A27
+0x0101 = 0x2B27
+0x0102 = 0x2A25
+0x0103 = 0x2B25
+0x0104 = 0x2A28
+0x0105 = 0x2B28
+0x0106 = 0x2A2B
+0x0107 = 0x2B2B
+0x0108 = 0x2A2C
+0x0109 = 0x2B2C
+0x010A = 0x2A2F
+0x010B = 0x2B2F
+0x010C = 0x2A2D
+0x010D = 0x2B2D
+0x010E = 0x2A30
+0x010F = 0x2B30
+0x0110 = 0x2922
+0x0111 = 0x2942
+0x0112 = 0x2A37
+0x0113 = 0x2B37
+0x0116 = 0x2A36
+0x0117 = 0x2B36
+0x0118 = 0x2A38
+0x0119 = 0x2B38
+0x011A = 0x2A35
+0x011B = 0x2B35
+0x011C = 0x2A3A
+0x011D = 0x2B3A
+0x011E = 0x2A3B
+0x011F = 0x2B3B
+0x0120 = 0x2A3D
+0x0121 = 0x2B3D
+0x0122 = 0x2A3C
+0x0124 = 0x2A3E
+0x0125 = 0x2B3E
+0x0126 = 0x2924
+0x0127 = 0x2944
+0x0128 = 0x2A47
+0x0129 = 0x2B47
+0x012A = 0x2A45
+0x012B = 0x2B45
+0x012E = 0x2A46
+0x012F = 0x2B46
+0x0130 = 0x2A44
+0x0131 = 0x2945
+0x0132 = 0x2926
+0x0133 = 0x2946
+0x0134 = 0x2A48
+0x0135 = 0x2B48
+0x0136 = 0x2A49
+0x0137 = 0x2B49
+0x0138 = 0x2947
+0x0139 = 0x2A4A
+0x013A = 0x2B4A
+0x013B = 0x2A4C
+0x013C = 0x2B4C
+0x013D = 0x2A4B
+0x013E = 0x2B4B
+0x013F = 0x2929
+0x0140 = 0x2949
+0x0141 = 0x2928
+0x0142 = 0x2948
+0x0143 = 0x2A4D
+0x0144 = 0x2B4D
+0x0145 = 0x2A4F
+0x0146 = 0x2B4F
+0x0147 = 0x2A4E
+0x0148 = 0x2B4E
+0x0149 = 0x294A
+0x014A = 0x292B
+0x014B = 0x294B
+0x014C = 0x2A57
+0x014D = 0x2B57
+0x0150 = 0x2A56
+0x0151 = 0x2B56
+0x0152 = 0x292D
+0x0153 = 0x294D
+0x0154 = 0x2A59
+0x0155 = 0x2B59
+0x0156 = 0x2A5B
+0x0157 = 0x2B5B
+0x0158 = 0x2A5A
+0x0159 = 0x2B5A
+0x015A = 0x2A5C
+0x015B = 0x2B5C
+0x015C = 0x2A5D
+0x015D = 0x2B5D
+0x015E = 0x2A5F
+0x015F = 0x2B5F
+0x0160 = 0x2A5E
+0x0161 = 0x2B5E
+0x0162 = 0x2A61
+0x0163 = 0x2B61
+0x0164 = 0x2A60
+0x0165 = 0x2B60
+0x0166 = 0x292F
+0x0167 = 0x294F
+0x0168 = 0x2A6C
+0x0169 = 0x2B6C
+0x016A = 0x2A69
+0x016B = 0x2B69
+0x016C = 0x2A66
+0x016D = 0x2B66
+0x016E = 0x2A6B
+0x016F = 0x2B6B
+0x0170 = 0x2A68
+0x0171 = 0x2B68
+0x0172 = 0x2A6A
+0x0173 = 0x2B6A
+0x0174 = 0x2A71
+0x0175 = 0x2B71
+0x0176 = 0x2A74
+0x0177 = 0x2B74
+0x0178 = 0x2A73
+0x0179 = 0x2A75
+0x017A = 0x2B75
+0x017B = 0x2A77
+0x017C = 0x2B77
+0x017D = 0x2A76
+0x017E = 0x2B76
+0x01CD = 0x2A26
+0x01CE = 0x2B26
+0x01CF = 0x2A43
+0x01D0 = 0x2B43
+0x01D1 = 0x2A55
+0x01D2 = 0x2B55
+0x01D3 = 0x2A67
+0x01D4 = 0x2B67
+0x01D5 = 0x2A70
+0x01D6 = 0x2B70
+0x01D7 = 0x2A6D
+0x01D8 = 0x2B6D
+0x01D9 = 0x2A6F
+0x01DA = 0x2B6F
+0x01DB = 0x2A6E
+0x01DC = 0x2B6E
+0x01F5 = 0x2B39
+0x02C7 = 0x2230
+0x02D8 = 0x222F
+0x02D9 = 0x2232
+0x02DA = 0x2236
+0x02DB = 0x2235
+0x02DD = 0x2233
+0x0384 = 0x2238
+0x0385 = 0x2239
+0x0386 = 0x2661
+0x0388 = 0x2662
+0x0389 = 0x2663
+0x038A = 0x2664
+0x038C = 0x2667
+0x038E = 0x2669
+0x038F = 0x266C
+0x0390 = 0x2676
+0x03AA = 0x2665
+0x03AB = 0x266A
+0x03AC = 0x2671
+0x03AD = 0x2672
+0x03AE = 0x2673
+0x03AF = 0x2674
+0x03B0 = 0x267B
+0x03C2 = 0x2678
+0x03CA = 0x2675
+0x03CB = 0x267A
+0x03CC = 0x2677
+0x03CD = 0x2679
+0x03CE = 0x267C
+0x0402 = 0x2742
+0x0403 = 0x2743
+0x0404 = 0x2744
+0x0405 = 0x2745
+0x0406 = 0x2746
+0x0407 = 0x2747
+0x0408 = 0x2748
+0x0409 = 0x2749
+0x040A = 0x274A
+0x040B = 0x274B
+0x040C = 0x274C
+0x040E = 0x274D
+0x040F = 0x274E
+0x0452 = 0x2772
+0x0453 = 0x2773
+0x0454 = 0x2774
+0x0455 = 0x2775
+0x0456 = 0x2776
+0x0457 = 0x2777
+0x0458 = 0x2778
+0x0459 = 0x2779
+0x045A = 0x277A
+0x045B = 0x277B
+0x045C = 0x277C
+0x045E = 0x277D
+0x045F = 0x277E
+0x2116 = 0x2271
+0x2122 = 0x226F
+0x4E02 = 0x3021
+0x4E04 = 0x3022
+0x4E05 = 0x3023
+0x4E0C = 0x3024
+0x4E12 = 0x3025
+0x4E1F = 0x3026
+0x4E23 = 0x3027
+0x4E24 = 0x3028
+0x4E28 = 0x3029
+0x4E2B = 0x302A
+0x4E2E = 0x302B
+0x4E2F = 0x302C
+0x4E30 = 0x302D
+0x4E35 = 0x302E
+0x4E40 = 0x302F
+0x4E41 = 0x3030
+0x4E44 = 0x3031
+0x4E47 = 0x3032
+0x4E51 = 0x3033
+0x4E5A = 0x3034
+0x4E5C = 0x3035
+0x4E63 = 0x3036
+0x4E68 = 0x3037
+0x4E69 = 0x3038
+0x4E74 = 0x3039
+0x4E75 = 0x303A
+0x4E79 = 0x303B
+0x4E7F = 0x303C
+0x4E8D = 0x303D
+0x4E96 = 0x303E
+0x4E97 = 0x303F
+0x4E9D = 0x3040
+0x4EAF = 0x3041
+0x4EB9 = 0x3042
+0x4EC3 = 0x3043
+0x4ED0 = 0x3044
+0x4EDA = 0x3045
+0x4EDB = 0x3046
+0x4EE0 = 0x3047
+0x4EE1 = 0x3048
+0x4EE2 = 0x3049
+0x4EE8 = 0x304A
+0x4EEF = 0x304B
+0x4EF1 = 0x304C
+0x4EF3 = 0x304D
+0x4EF5 = 0x304E
+0x4EFD = 0x304F
+0x4EFE = 0x3050
+0x4EFF = 0x3051
+0x4F00 = 0x3052
+0x4F02 = 0x3053
+0x4F03 = 0x3054
+0x4F08 = 0x3055
+0x4F0B = 0x3056
+0x4F0C = 0x3057
+0x4F12 = 0x3058
+0x4F15 = 0x3059
+0x4F16 = 0x305A
+0x4F17 = 0x305B
+0x4F19 = 0x305C
+0x4F2E = 0x305D
+0x4F31 = 0x305E
+0x4F33 = 0x3060
+0x4F35 = 0x3061
+0x4F37 = 0x3062
+0x4F39 = 0x3063
+0x4F3B = 0x3064
+0x4F3E = 0x3065
+0x4F40 = 0x3066
+0x4F42 = 0x3067
+0x4F48 = 0x3068
+0x4F49 = 0x3069
+0x4F4B = 0x306A
+0x4F4C = 0x306B
+0x4F52 = 0x306C
+0x4F54 = 0x306D
+0x4F56 = 0x306E
+0x4F58 = 0x306F
+0x4F5F = 0x3070
+0x4F60 = 0x305F
+0x4F63 = 0x3071
+0x4F6A = 0x3072
+0x4F6C = 0x3073
+0x4F6E = 0x3074
+0x4F71 = 0x3075
+0x4F77 = 0x3076
+0x4F78 = 0x3077
+0x4F79 = 0x3078
+0x4F7A = 0x3079
+0x4F7D = 0x307A
+0x4F7E = 0x307B
+0x4F81 = 0x307C
+0x4F82 = 0x307D
+0x4F84 = 0x307E
+0x4F85 = 0x3121
+0x4F89 = 0x3122
+0x4F8A = 0x3123
+0x4F8C = 0x3124
+0x4F8E = 0x3125
+0x4F90 = 0x3126
+0x4F92 = 0x3127
+0x4F93 = 0x3128
+0x4F94 = 0x3129
+0x4F97 = 0x312A
+0x4F99 = 0x312B
+0x4F9A = 0x312C
+0x4F9E = 0x312D
+0x4F9F = 0x312E
+0x4FB2 = 0x312F
+0x4FB7 = 0x3130
+0x4FB9 = 0x3131
+0x4FBB = 0x3132
+0x4FBC = 0x3133
+0x4FBD = 0x3134
+0x4FBE = 0x3135
+0x4FC0 = 0x3136
+0x4FC1 = 0x3137
+0x4FC5 = 0x3138
+0x4FC6 = 0x3139
+0x4FC8 = 0x313A
+0x4FC9 = 0x313B
+0x4FCB = 0x313C
+0x4FCC = 0x313D
+0x4FCD = 0x313E
+0x4FCF = 0x313F
+0x4FD2 = 0x3140
+0x4FDC = 0x3141
+0x4FE0 = 0x3142
+0x4FE2 = 0x3143
+0x4FF0 = 0x3144
+0x4FF2 = 0x3145
+0x4FFC = 0x3146
+0x4FFD = 0x3147
+0x4FFF = 0x3148
+0x5000 = 0x3149
+0x5001 = 0x314A
+0x5004 = 0x314B
+0x5007 = 0x314C
+0x500A = 0x314D
+0x500C = 0x314E
+0x500E = 0x314F
+0x5010 = 0x3150
+0x5013 = 0x3151
+0x5017 = 0x3152
+0x5018 = 0x3153
+0x501B = 0x3154
+0x501C = 0x3155
+0x501D = 0x3156
+0x501E = 0x3157
+0x5022 = 0x3158
+0x5027 = 0x3159
+0x502E = 0x315A
+0x5030 = 0x315B
+0x5032 = 0x315C
+0x5033 = 0x315D
+0x5035 = 0x315E
+0x503B = 0x3176
+0x5040 = 0x315F
+0x5041 = 0x3160
+0x5042 = 0x3161
+0x5045 = 0x3162
+0x5046 = 0x3163
+0x504A = 0x3164
+0x504C = 0x3165
+0x504E = 0x3166
+0x5051 = 0x3167
+0x5052 = 0x3168
+0x5053 = 0x3169
+0x5057 = 0x316A
+0x5059 = 0x316B
+0x505F = 0x316C
+0x5060 = 0x316D
+0x5062 = 0x316E
+0x5063 = 0x316F
+0x5066 = 0x3170
+0x5067 = 0x3171
+0x506A = 0x3172
+0x506D = 0x3173
+0x5070 = 0x3174
+0x5071 = 0x3175
+0x5081 = 0x3177
+0x5083 = 0x3178
+0x5084 = 0x3179
+0x5086 = 0x317A
+0x508A = 0x317B
+0x508E = 0x317C
+0x508F = 0x317D
+0x5090 = 0x317E
+0x5092 = 0x3221
+0x5093 = 0x3222
+0x5094 = 0x3223
+0x5096 = 0x3224
+0x509B = 0x3225
+0x509C = 0x3226
+0x509E = 0x3227
+0x509F = 0x3228
+0x50A0 = 0x3229
+0x50A1 = 0x322A
+0x50A2 = 0x322B
+0x50AA = 0x322C
+0x50AF = 0x322D
+0x50B0 = 0x322E
+0x50B9 = 0x322F
+0x50BA = 0x3230
+0x50BD = 0x3231
+0x50C0 = 0x3232
+0x50C3 = 0x3233
+0x50C4 = 0x3234
+0x50C7 = 0x3235
+0x50CC = 0x3236
+0x50CE = 0x3237
+0x50D0 = 0x3238
+0x50D3 = 0x3239
+0x50D4 = 0x323A
+0x50D8 = 0x323B
+0x50DC = 0x323C
+0x50DD = 0x323D
+0x50DF = 0x323E
+0x50E2 = 0x323F
+0x50E4 = 0x3240
+0x50E6 = 0x3241
+0x50E8 = 0x3242
+0x50E9 = 0x3243
+0x50EF = 0x3244
+0x50F1 = 0x3245
+0x50F2 = 0x3251
+0x50F6 = 0x3246
+0x50FA = 0x3247
+0x50FE = 0x3248
+0x5103 = 0x3249
+0x5106 = 0x324A
+0x5107 = 0x324B
+0x5108 = 0x324C
+0x510B = 0x324D
+0x510C = 0x324E
+0x510D = 0x324F
+0x510E = 0x3250
+0x5110 = 0x3252
+0x5117 = 0x3253
+0x5119 = 0x3254
+0x511B = 0x3255
+0x511C = 0x3256
+0x511D = 0x3257
+0x511E = 0x3258
+0x5123 = 0x3259
+0x5127 = 0x325A
+0x5128 = 0x325B
+0x512C = 0x325C
+0x512D = 0x325D
+0x512F = 0x325E
+0x5131 = 0x325F
+0x5133 = 0x3260
+0x5134 = 0x3261
+0x5135 = 0x3262
+0x5138 = 0x3263
+0x5139 = 0x3264
+0x5142 = 0x3265
+0x514A = 0x3266
+0x514F = 0x3267
+0x5153 = 0x3268
+0x5155 = 0x3269
+0x5157 = 0x326A
+0x5158 = 0x326B
+0x515F = 0x326C
+0x5164 = 0x326D
+0x5166 = 0x326E
+0x517E = 0x326F
+0x5183 = 0x3270
+0x5184 = 0x3271
+0x518B = 0x3272
+0x518E = 0x3273
+0x5198 = 0x3274
+0x519D = 0x3275
+0x51A1 = 0x3276
+0x51A3 = 0x3277
+0x51AD = 0x3278
+0x51B8 = 0x3279
+0x51BA = 0x327A
+0x51BC = 0x327B
+0x51BE = 0x327C
+0x51BF = 0x327D
+0x51C2 = 0x327E
+0x51C8 = 0x3321
+0x51CF = 0x3322
+0x51D1 = 0x3323
+0x51D2 = 0x3324
+0x51D3 = 0x3325
+0x51D5 = 0x3326
+0x51D8 = 0x3327
+0x51DE = 0x3328
+0x51E2 = 0x3329
+0x51E5 = 0x332A
+0x51EE = 0x332B
+0x51F2 = 0x332C
+0x51F3 = 0x332D
+0x51F4 = 0x332E
+0x51F7 = 0x332F
+0x5201 = 0x3330
+0x5202 = 0x3331
+0x5205 = 0x3332
+0x5212 = 0x3333
+0x5213 = 0x3334
+0x5215 = 0x3335
+0x5216 = 0x3336
+0x5218 = 0x3337
+0x5222 = 0x3338
+0x5228 = 0x3339
+0x5231 = 0x333A
+0x5232 = 0x333B
+0x5235 = 0x333C
+0x523C = 0x333D
+0x5245 = 0x333E
+0x5249 = 0x333F
+0x5255 = 0x3340
+0x5257 = 0x3341
+0x5258 = 0x3342
+0x525A = 0x3343
+0x525C = 0x3344
+0x525F = 0x3345
+0x5260 = 0x3346
+0x5261 = 0x3347
+0x5266 = 0x3348
+0x526E = 0x3349
+0x5277 = 0x334A
+0x5278 = 0x334B
+0x5279 = 0x334C
+0x5280 = 0x334D
+0x5282 = 0x334E
+0x5285 = 0x334F
+0x528A = 0x3350
+0x528C = 0x3351
+0x5293 = 0x3352
+0x5295 = 0x3353
+0x5296 = 0x3354
+0x5297 = 0x3355
+0x5298 = 0x3356
+0x529A = 0x3357
+0x529C = 0x3358
+0x52A4 = 0x3359
+0x52A5 = 0x335A
+0x52A6 = 0x335B
+0x52A7 = 0x335C
+0x52AF = 0x335D
+0x52B0 = 0x335E
+0x52B6 = 0x335F
+0x52B7 = 0x3360
+0x52B8 = 0x3361
+0x52BA = 0x3362
+0x52BB = 0x3363
+0x52BD = 0x3364
+0x52C0 = 0x3365
+0x52C4 = 0x3366
+0x52C6 = 0x3367
+0x52C8 = 0x3368
+0x52CC = 0x3369
+0x52CF = 0x336A
+0x52D1 = 0x336B
+0x52D4 = 0x336C
+0x52D6 = 0x336D
+0x52DB = 0x336E
+0x52DC = 0x336F
+0x52E1 = 0x3370
+0x52E5 = 0x3371
+0x52E8 = 0x3372
+0x52E9 = 0x3373
+0x52EA = 0x3374
+0x52EC = 0x3375
+0x52F0 = 0x3376
+0x52F1 = 0x3377
+0x52F4 = 0x3378
+0x52F6 = 0x3379
+0x52F7 = 0x337A
+0x5300 = 0x337B
+0x5303 = 0x337C
+0x530A = 0x337D
+0x530B = 0x337E
+0x530C = 0x3421
+0x5311 = 0x3422
+0x5313 = 0x3423
+0x5318 = 0x3424
+0x531B = 0x3425
+0x531C = 0x3426
+0x531E = 0x3427
+0x531F = 0x3428
+0x5325 = 0x3429
+0x5327 = 0x342A
+0x5328 = 0x342B
+0x5329 = 0x342C
+0x532B = 0x342D
+0x532C = 0x342E
+0x532D = 0x342F
+0x5330 = 0x3430
+0x5332 = 0x3431
+0x5335 = 0x3432
+0x533C = 0x3433
+0x533D = 0x3434
+0x533E = 0x3435
+0x5342 = 0x3436
+0x534B = 0x3438
+0x534C = 0x3437
+0x5359 = 0x3439
+0x535B = 0x343A
+0x5361 = 0x343B
+0x5363 = 0x343C
+0x5365 = 0x343D
+0x536C = 0x343E
+0x536D = 0x343F
+0x5372 = 0x3440
+0x5379 = 0x3441
+0x537E = 0x3442
+0x5383 = 0x3443
+0x5387 = 0x3444
+0x5388 = 0x3445
+0x538E = 0x3446
+0x5393 = 0x3447
+0x5394 = 0x3448
+0x5399 = 0x3449
+0x539D = 0x344A
+0x53A1 = 0x344B
+0x53A4 = 0x344C
+0x53AA = 0x344D
+0x53AB = 0x344E
+0x53AF = 0x344F
+0x53B2 = 0x3450
+0x53B4 = 0x3451
+0x53B5 = 0x3452
+0x53B7 = 0x3453
+0x53B8 = 0x3454
+0x53BA = 0x3455
+0x53BD = 0x3456
+0x53C0 = 0x3457
+0x53C5 = 0x3458
+0x53CF = 0x3459
+0x53D2 = 0x345A
+0x53D3 = 0x345B
+0x53D5 = 0x345C
+0x53DA = 0x345D
+0x53DD = 0x345E
+0x53DE = 0x345F
+0x53E0 = 0x3460
+0x53E6 = 0x3461
+0x53E7 = 0x3462
+0x53F5 = 0x3463
+0x5402 = 0x3464
+0x5413 = 0x3465
+0x541A = 0x3466
+0x5421 = 0x3467
+0x5427 = 0x3468
+0x5428 = 0x3469
+0x542A = 0x346A
+0x542F = 0x346B
+0x5431 = 0x346C
+0x5434 = 0x346D
+0x5435 = 0x346E
+0x5443 = 0x346F
+0x5444 = 0x3470
+0x5447 = 0x3471
+0x544D = 0x3472
+0x544F = 0x3473
+0x545E = 0x3474
+0x5462 = 0x3475
+0x5464 = 0x3476
+0x5466 = 0x3477
+0x5467 = 0x3478
+0x5469 = 0x3479
+0x546B = 0x347A
+0x546D = 0x347B
+0x546E = 0x347C
+0x5474 = 0x347D
+0x547F = 0x347E
+0x5481 = 0x3521
+0x5483 = 0x3522
+0x5485 = 0x3523
+0x5488 = 0x3524
+0x5489 = 0x3525
+0x548D = 0x3526
+0x5491 = 0x3527
+0x5495 = 0x3528
+0x5496 = 0x3529
+0x549C = 0x352A
+0x549F = 0x352B
+0x54A1 = 0x352C
+0x54A6 = 0x352D
+0x54A7 = 0x352E
+0x54A9 = 0x352F
+0x54AA = 0x3530
+0x54AD = 0x3531
+0x54AE = 0x3532
+0x54B1 = 0x3533
+0x54B7 = 0x3534
+0x54B9 = 0x3535
+0x54BA = 0x3536
+0x54BB = 0x3537
+0x54BF = 0x3538
+0x54C6 = 0x3539
+0x54CA = 0x353A
+0x54CD = 0x353B
+0x54CE = 0x353C
+0x54E0 = 0x353D
+0x54EA = 0x353E
+0x54EC = 0x353F
+0x54EF = 0x3540
+0x54F6 = 0x3541
+0x54FC = 0x3542
+0x54FE = 0x3543
+0x54FF = 0x3544
+0x5500 = 0x3545
+0x5501 = 0x3546
+0x5505 = 0x3547
+0x5508 = 0x3548
+0x5509 = 0x3549
+0x550C = 0x354A
+0x550D = 0x354B
+0x550E = 0x354C
+0x5515 = 0x354D
+0x552A = 0x354E
+0x552B = 0x354F
+0x5532 = 0x3550
+0x5535 = 0x3551
+0x5536 = 0x3552
+0x553B = 0x3553
+0x553C = 0x3554
+0x553D = 0x3555
+0x5541 = 0x3556
+0x5547 = 0x3557
+0x5549 = 0x3558
+0x554A = 0x3559
+0x554D = 0x355A
+0x5550 = 0x355B
+0x5551 = 0x355C
+0x5558 = 0x355D
+0x555A = 0x355E
+0x555B = 0x355F
+0x555E = 0x3560
+0x5560 = 0x3561
+0x5561 = 0x3562
+0x5564 = 0x3563
+0x5566 = 0x3564
+0x557F = 0x3565
+0x5581 = 0x3566
+0x5582 = 0x3567
+0x5586 = 0x3568
+0x5588 = 0x3569
+0x558E = 0x356A
+0x558F = 0x356B
+0x5591 = 0x356C
+0x5592 = 0x356D
+0x5593 = 0x356E
+0x5594 = 0x356F
+0x5597 = 0x3570
+0x55A3 = 0x3571
+0x55A4 = 0x3572
+0x55AD = 0x3573
+0x55B2 = 0x3574
+0x55BF = 0x3575
+0x55C1 = 0x3576
+0x55C3 = 0x3577
+0x55C6 = 0x3578
+0x55C9 = 0x3579
+0x55CB = 0x357A
+0x55CC = 0x357B
+0x55CE = 0x357C
+0x55D1 = 0x357D
+0x55D2 = 0x357E
+0x55D3 = 0x3621
+0x55D7 = 0x3622
+0x55D8 = 0x3623
+0x55DB = 0x3624
+0x55DE = 0x3625
+0x55E2 = 0x3626
+0x55E9 = 0x3627
+0x55F6 = 0x3628
+0x55FF = 0x3629
+0x5605 = 0x362A
+0x5608 = 0x362B
+0x560A = 0x362C
+0x560D = 0x362D
+0x560E = 0x362E
+0x560F = 0x362F
+0x5610 = 0x3630
+0x5611 = 0x3631
+0x5612 = 0x3632
+0x5619 = 0x3633
+0x562C = 0x3634
+0x5630 = 0x3635
+0x5633 = 0x3636
+0x5635 = 0x3637
+0x5637 = 0x3638
+0x5639 = 0x3639
+0x563B = 0x363A
+0x563C = 0x363B
+0x563D = 0x363C
+0x563F = 0x363D
+0x5640 = 0x363E
+0x5641 = 0x363F
+0x5643 = 0x3640
+0x5644 = 0x3641
+0x5646 = 0x3642
+0x5649 = 0x3643
+0x564B = 0x3644
+0x564D = 0x3645
+0x564F = 0x3646
+0x5654 = 0x3647
+0x565E = 0x3648
+0x5660 = 0x3649
+0x5661 = 0x364A
+0x5662 = 0x364B
+0x5663 = 0x364C
+0x5666 = 0x364D
+0x5669 = 0x364E
+0x566D = 0x364F
+0x566F = 0x3650
+0x5671 = 0x3651
+0x5672 = 0x3652
+0x5675 = 0x3653
+0x5684 = 0x3654
+0x5685 = 0x3655
+0x5688 = 0x3656
+0x568B = 0x3657
+0x568C = 0x3658
+0x5695 = 0x3659
+0x5699 = 0x365A
+0x569A = 0x365B
+0x569D = 0x365C
+0x569E = 0x365D
+0x569F = 0x365E
+0x56A6 = 0x365F
+0x56A7 = 0x3660
+0x56A8 = 0x3661
+0x56A9 = 0x3662
+0x56AB = 0x3663
+0x56AC = 0x3664
+0x56AD = 0x3665
+0x56B1 = 0x3666
+0x56B3 = 0x3667
+0x56B7 = 0x3668
+0x56BE = 0x3669
+0x56C5 = 0x366A
+0x56C9 = 0x366B
+0x56CA = 0x366C
+0x56CB = 0x366D
+0x56CC = 0x3670
+0x56CD = 0x3671
+0x56CF = 0x366E
+0x56D0 = 0x366F
+0x56D9 = 0x3672
+0x56DC = 0x3673
+0x56DD = 0x3674
+0x56DF = 0x3675
+0x56E1 = 0x3676
+0x56E4 = 0x3677
+0x56E5 = 0x3678
+0x56E6 = 0x3679
+0x56E7 = 0x367A
+0x56E8 = 0x367B
+0x56EB = 0x367D
+0x56ED = 0x367E
+0x56F1 = 0x367C
+0x56F6 = 0x3721
+0x56F7 = 0x3722
+0x5701 = 0x3723
+0x5702 = 0x3724
+0x5707 = 0x3725
+0x570A = 0x3726
+0x570C = 0x3727
+0x5711 = 0x3728
+0x5715 = 0x3729
+0x571A = 0x372A
+0x571B = 0x372B
+0x571D = 0x372C
+0x5720 = 0x372D
+0x5722 = 0x372E
+0x5723 = 0x372F
+0x5724 = 0x3730
+0x5725 = 0x3731
+0x5729 = 0x3732
+0x572A = 0x3733
+0x572C = 0x3734
+0x572E = 0x3735
+0x572F = 0x3736
+0x5733 = 0x3737
+0x5734 = 0x3738
+0x573D = 0x3739
+0x573E = 0x373A
+0x573F = 0x373B
+0x5745 = 0x373C
+0x5746 = 0x373D
+0x574C = 0x373E
+0x574D = 0x373F
+0x5752 = 0x3740
+0x5762 = 0x3741
+0x5765 = 0x3742
+0x5767 = 0x3743
+0x5768 = 0x3744
+0x576B = 0x3745
+0x576D = 0x3746
+0x576E = 0x3747
+0x576F = 0x3748
+0x5770 = 0x3749
+0x5771 = 0x374A
+0x5773 = 0x374B
+0x5774 = 0x374C
+0x5775 = 0x374D
+0x5777 = 0x374E
+0x5779 = 0x374F
+0x577A = 0x3750
+0x577B = 0x3751
+0x577C = 0x3752
+0x577E = 0x3753
+0x5781 = 0x3754
+0x5783 = 0x3755
+0x578C = 0x3756
+0x5794 = 0x3757
+0x5795 = 0x3760
+0x5797 = 0x3758
+0x5799 = 0x3759
+0x579A = 0x375A
+0x579C = 0x375B
+0x579D = 0x375C
+0x579E = 0x375D
+0x579F = 0x375E
+0x57A1 = 0x375F
+0x57A7 = 0x3761
+0x57A8 = 0x3762
+0x57A9 = 0x3763
+0x57AC = 0x3764
+0x57B8 = 0x3765
+0x57BD = 0x3766
+0x57C7 = 0x3767
+0x57C8 = 0x3768
+0x57CC = 0x3769
+0x57CF = 0x376A
+0x57D5 = 0x376B
+0x57DD = 0x376C
+0x57DE = 0x376D
+0x57E1 = 0x377E
+0x57E4 = 0x376E
+0x57E6 = 0x376F
+0x57E7 = 0x3770
+0x57E9 = 0x3771
+0x57ED = 0x3772
+0x57F0 = 0x3773
+0x57F5 = 0x3774
+0x57F6 = 0x3775
+0x57F8 = 0x3776
+0x57FD = 0x3777
+0x57FE = 0x3778
+0x57FF = 0x3779
+0x5803 = 0x377A
+0x5804 = 0x377B
+0x5808 = 0x377C
+0x5809 = 0x377D
+0x580C = 0x3821
+0x580D = 0x3822
+0x581B = 0x3823
+0x581E = 0x3824
+0x581F = 0x3825
+0x5820 = 0x3826
+0x5826 = 0x3827
+0x5827 = 0x3828
+0x582D = 0x3829
+0x5832 = 0x382A
+0x5839 = 0x382B
+0x583F = 0x382C
+0x5849 = 0x382D
+0x584C = 0x382E
+0x584D = 0x382F
+0x584F = 0x3830
+0x5850 = 0x3831
+0x5855 = 0x3832
+0x585F = 0x3833
+0x5861 = 0x3834
+0x5864 = 0x3835
+0x5867 = 0x3836
+0x5868 = 0x3837
+0x5878 = 0x3838
+0x587C = 0x3839
+0x587F = 0x383A
+0x5880 = 0x383B
+0x5881 = 0x383C
+0x5887 = 0x383D
+0x5888 = 0x383E
+0x5889 = 0x383F
+0x588A = 0x3840
+0x588C = 0x3841
+0x588D = 0x3842
+0x588F = 0x3843
+0x5890 = 0x3844
+0x5894 = 0x3845
+0x5896 = 0x3846
+0x589D = 0x3847
+0x58A0 = 0x3848
+0x58A1 = 0x3849
+0x58A2 = 0x384A
+0x58A6 = 0x384B
+0x58A9 = 0x384C
+0x58B1 = 0x384D
+0x58B2 = 0x384E
+0x58BC = 0x3850
+0x58C2 = 0x3851
+0x58C4 = 0x384F
+0x58C8 = 0x3852
+0x58CD = 0x3853
+0x58CE = 0x3854
+0x58D0 = 0x3855
+0x58D2 = 0x3856
+0x58D4 = 0x3857
+0x58D6 = 0x3858
+0x58DA = 0x3859
+0x58DD = 0x385A
+0x58E1 = 0x385B
+0x58E2 = 0x385C
+0x58E9 = 0x385D
+0x58F3 = 0x385E
+0x5905 = 0x385F
+0x5906 = 0x3860
+0x590B = 0x3861
+0x590C = 0x3862
+0x5912 = 0x3863
+0x5913 = 0x3864
+0x5914 = 0x3865
+0x591D = 0x3867
+0x5921 = 0x3868
+0x5923 = 0x3869
+0x5924 = 0x386A
+0x5928 = 0x386B
+0x592F = 0x386C
+0x5930 = 0x386D
+0x5933 = 0x386E
+0x5935 = 0x386F
+0x5936 = 0x3870
+0x593F = 0x3871
+0x5943 = 0x3872
+0x5946 = 0x3873
+0x5952 = 0x3874
+0x5953 = 0x3875
+0x5959 = 0x3876
+0x595B = 0x3877
+0x595D = 0x3878
+0x595E = 0x3879
+0x595F = 0x387A
+0x5961 = 0x387B
+0x5963 = 0x387C
+0x596B = 0x387D
+0x596D = 0x387E
+0x596F = 0x3921
+0x5972 = 0x3922
+0x5975 = 0x3923
+0x5976 = 0x3924
+0x5979 = 0x3925
+0x597B = 0x3926
+0x597C = 0x3927
+0x598B = 0x3928
+0x598C = 0x3929
+0x598E = 0x392A
+0x5992 = 0x392B
+0x5995 = 0x392C
+0x5997 = 0x392D
+0x599F = 0x392E
+0x59A4 = 0x392F
+0x59A7 = 0x3930
+0x59AD = 0x3931
+0x59AE = 0x3932
+0x59AF = 0x3933
+0x59B0 = 0x3934
+0x59B3 = 0x3935
+0x59B7 = 0x3936
+0x59BA = 0x3937
+0x59BC = 0x3938
+0x59C1 = 0x3939
+0x59C3 = 0x393A
+0x59C4 = 0x393B
+0x59C8 = 0x393C
+0x59CA = 0x393D
+0x59CD = 0x393E
+0x59D2 = 0x393F
+0x59DD = 0x3940
+0x59DE = 0x3941
+0x59DF = 0x3942
+0x59E3 = 0x3943
+0x59E4 = 0x3944
+0x59E7 = 0x3945
+0x59EE = 0x3946
+0x59EF = 0x3947
+0x59F1 = 0x3948
+0x59F2 = 0x3949
+0x59F4 = 0x394A
+0x59F7 = 0x394B
+0x5A00 = 0x394C
+0x5A04 = 0x394D
+0x5A0C = 0x394E
+0x5A0D = 0x394F
+0x5A0E = 0x3950
+0x5A12 = 0x3951
+0x5A13 = 0x3952
+0x5A1E = 0x3953
+0x5A23 = 0x3954
+0x5A24 = 0x3955
+0x5A27 = 0x3956
+0x5A28 = 0x3957
+0x5A2A = 0x3958
+0x5A2D = 0x3959
+0x5A30 = 0x395A
+0x5A44 = 0x395B
+0x5A45 = 0x395C
+0x5A47 = 0x395D
+0x5A48 = 0x395E
+0x5A4C = 0x395F
+0x5A50 = 0x3960
+0x5A55 = 0x3961
+0x5A5E = 0x3962
+0x5A63 = 0x3963
+0x5A65 = 0x3964
+0x5A67 = 0x3965
+0x5A6D = 0x3966
+0x5A77 = 0x3967
+0x5A7A = 0x3968
+0x5A7B = 0x3969
+0x5A7E = 0x396A
+0x5A8B = 0x396B
+0x5A90 = 0x396C
+0x5A93 = 0x396D
+0x5A96 = 0x396E
+0x5A99 = 0x396F
+0x5A9C = 0x3970
+0x5A9E = 0x3971
+0x5A9F = 0x3972
+0x5AA0 = 0x3973
+0x5AA2 = 0x3974
+0x5AA7 = 0x3975
+0x5AAC = 0x3976
+0x5AB1 = 0x3977
+0x5AB2 = 0x3978
+0x5AB3 = 0x3979
+0x5AB5 = 0x397A
+0x5AB8 = 0x397B
+0x5ABA = 0x397C
+0x5ABB = 0x397D
+0x5ABF = 0x397E
+0x5AC4 = 0x3A21
+0x5AC6 = 0x3A22
+0x5AC8 = 0x3A23
+0x5ACF = 0x3A24
+0x5ADA = 0x3A25
+0x5ADC = 0x3A26
+0x5AE0 = 0x3A27
+0x5AE5 = 0x3A28
+0x5AEA = 0x3A29
+0x5AEE = 0x3A2A
+0x5AF5 = 0x3A2B
+0x5AF6 = 0x3A2C
+0x5AFD = 0x3A2D
+0x5B00 = 0x3A2E
+0x5B01 = 0x3A2F
+0x5B08 = 0x3A30
+0x5B17 = 0x3A31
+0x5B19 = 0x3A33
+0x5B1B = 0x3A34
+0x5B1D = 0x3A35
+0x5B21 = 0x3A36
+0x5B25 = 0x3A37
+0x5B2D = 0x3A38
+0x5B34 = 0x3A32
+0x5B38 = 0x3A39
+0x5B41 = 0x3A3A
+0x5B4B = 0x3A3B
+0x5B4C = 0x3A3C
+0x5B52 = 0x3A3D
+0x5B56 = 0x3A3E
+0x5B5E = 0x3A3F
+0x5B68 = 0x3A40
+0x5B6E = 0x3A41
+0x5B6F = 0x3A42
+0x5B7C = 0x3A43
+0x5B7D = 0x3A44
+0x5B7E = 0x3A45
+0x5B7F = 0x3A46
+0x5B81 = 0x3A47
+0x5B84 = 0x3A48
+0x5B86 = 0x3A49
+0x5B8A = 0x3A4A
+0x5B8E = 0x3A4B
+0x5B90 = 0x3A4C
+0x5B91 = 0x3A4D
+0x5B93 = 0x3A4E
+0x5B94 = 0x3A4F
+0x5B96 = 0x3A50
+0x5BA8 = 0x3A51
+0x5BA9 = 0x3A52
+0x5BAC = 0x3A53
+0x5BAD = 0x3A54
+0x5BAF = 0x3A55
+0x5BB1 = 0x3A56
+0x5BB2 = 0x3A57
+0x5BB7 = 0x3A58
+0x5BBA = 0x3A59
+0x5BBC = 0x3A5A
+0x5BC0 = 0x3A5B
+0x5BC1 = 0x3A5C
+0x5BCD = 0x3A5D
+0x5BCF = 0x3A5E
+0x5BD6 = 0x3A5F
+0x5BD7 = 0x3A60
+0x5BD8 = 0x3A61
+0x5BD9 = 0x3A62
+0x5BDA = 0x3A63
+0x5BE0 = 0x3A64
+0x5BEF = 0x3A65
+0x5BF1 = 0x3A66
+0x5BF4 = 0x3A67
+0x5BFD = 0x3A68
+0x5C0C = 0x3A69
+0x5C17 = 0x3A6A
+0x5C1E = 0x3A6B
+0x5C1F = 0x3A6C
+0x5C23 = 0x3A6D
+0x5C26 = 0x3A6E
+0x5C29 = 0x3A6F
+0x5C2B = 0x3A70
+0x5C2C = 0x3A71
+0x5C2E = 0x3A72
+0x5C30 = 0x3A73
+0x5C32 = 0x3A74
+0x5C35 = 0x3A75
+0x5C36 = 0x3A76
+0x5C59 = 0x3A77
+0x5C5A = 0x3A78
+0x5C5C = 0x3A79
+0x5C62 = 0x3A7A
+0x5C63 = 0x3A7B
+0x5C67 = 0x3A7C
+0x5C68 = 0x3A7D
+0x5C69 = 0x3A7E
+0x5C6D = 0x3B21
+0x5C70 = 0x3B22
+0x5C74 = 0x3B23
+0x5C75 = 0x3B24
+0x5C7A = 0x3B25
+0x5C7B = 0x3B26
+0x5C7C = 0x3B27
+0x5C7D = 0x3B28
+0x5C87 = 0x3B29
+0x5C88 = 0x3B2A
+0x5C8A = 0x3B2B
+0x5C8F = 0x3B2C
+0x5C92 = 0x3B2D
+0x5C9D = 0x3B2E
+0x5C9F = 0x3B2F
+0x5CA0 = 0x3B30
+0x5CA2 = 0x3B31
+0x5CA3 = 0x3B32
+0x5CA6 = 0x3B33
+0x5CAA = 0x3B34
+0x5CB2 = 0x3B35
+0x5CB4 = 0x3B36
+0x5CB5 = 0x3B37
+0x5CBA = 0x3B38
+0x5CC9 = 0x3B39
+0x5CCB = 0x3B3A
+0x5CD2 = 0x3B3B
+0x5CD7 = 0x3B3D
+0x5CDD = 0x3B3C
+0x5CEE = 0x3B3E
+0x5CF1 = 0x3B3F
+0x5CF2 = 0x3B40
+0x5CF4 = 0x3B41
+0x5D01 = 0x3B42
+0x5D06 = 0x3B43
+0x5D0D = 0x3B44
+0x5D12 = 0x3B45
+0x5D23 = 0x3B47
+0x5D24 = 0x3B48
+0x5D26 = 0x3B49
+0x5D27 = 0x3B4A
+0x5D2B = 0x3B46
+0x5D31 = 0x3B4B
+0x5D34 = 0x3B4C
+0x5D39 = 0x3B4D
+0x5D3D = 0x3B4E
+0x5D3F = 0x3B4F
+0x5D42 = 0x3B50
+0x5D43 = 0x3B51
+0x5D46 = 0x3B52
+0x5D48 = 0x3B53
+0x5D4A = 0x3B57
+0x5D51 = 0x3B55
+0x5D55 = 0x3B54
+0x5D59 = 0x3B56
+0x5D5F = 0x3B58
+0x5D60 = 0x3B59
+0x5D61 = 0x3B5A
+0x5D62 = 0x3B5B
+0x5D64 = 0x3B5C
+0x5D6A = 0x3B5D
+0x5D6D = 0x3B5E
+0x5D70 = 0x3B5F
+0x5D79 = 0x3B60
+0x5D7A = 0x3B61
+0x5D7E = 0x3B62
+0x5D7F = 0x3B63
+0x5D81 = 0x3B64
+0x5D83 = 0x3B65
+0x5D88 = 0x3B66
+0x5D8A = 0x3B67
+0x5D92 = 0x3B68
+0x5D93 = 0x3B69
+0x5D94 = 0x3B6A
+0x5D95 = 0x3B6B
+0x5D99 = 0x3B6C
+0x5D9B = 0x3B6D
+0x5D9F = 0x3B6E
+0x5DA0 = 0x3B6F
+0x5DA7 = 0x3B70
+0x5DAB = 0x3B71
+0x5DB0 = 0x3B72
+0x5DB2 = 0x6674
+0x5DB4 = 0x3B73
+0x5DB8 = 0x3B74
+0x5DB9 = 0x3B75
+0x5DC3 = 0x3B76
+0x5DC7 = 0x3B77
+0x5DCB = 0x3B78
+0x5DCE = 0x3B7A
+0x5DD0 = 0x3B79
+0x5DD8 = 0x3B7B
+0x5DD9 = 0x3B7C
+0x5DE0 = 0x3B7D
+0x5DE4 = 0x3B7E
+0x5DE9 = 0x3C21
+0x5DF8 = 0x3C22
+0x5DF9 = 0x3C23
+0x5E00 = 0x3C24
+0x5E07 = 0x3C25
+0x5E0D = 0x3C26
+0x5E12 = 0x3C27
+0x5E14 = 0x3C28
+0x5E15 = 0x3C29
+0x5E18 = 0x3C2A
+0x5E1F = 0x3C2B
+0x5E20 = 0x3C2C
+0x5E28 = 0x3C2E
+0x5E2E = 0x3C2D
+0x5E32 = 0x3C2F
+0x5E35 = 0x3C30
+0x5E3E = 0x3C31
+0x5E49 = 0x3C34
+0x5E4B = 0x3C32
+0x5E50 = 0x3C33
+0x5E51 = 0x3C35
+0x5E56 = 0x3C36
+0x5E58 = 0x3C37
+0x5E5B = 0x3C38
+0x5E5C = 0x3C39
+0x5E5E = 0x3C3A
+0x5E68 = 0x3C3B
+0x5E6A = 0x3C3C
+0x5E6B = 0x3C3D
+0x5E6C = 0x3C3E
+0x5E6D = 0x3C3F
+0x5E6E = 0x3C40
+0x5E70 = 0x3C41
+0x5E80 = 0x3C42
+0x5E8B = 0x3C43
+0x5E8E = 0x3C44
+0x5EA2 = 0x3C45
+0x5EA4 = 0x3C46
+0x5EA5 = 0x3C47
+0x5EA8 = 0x3C48
+0x5EAA = 0x3C49
+0x5EAC = 0x3C4A
+0x5EB1 = 0x3C4B
+0x5EB3 = 0x3C4C
+0x5EBD = 0x3C4D
+0x5EBE = 0x3C4E
+0x5EBF = 0x3C4F
+0x5EC6 = 0x3C50
+0x5ECB = 0x3C52
+0x5ECC = 0x3C51
+0x5ECE = 0x3C53
+0x5ED1 = 0x3C54
+0x5ED2 = 0x3C55
+0x5ED4 = 0x3C56
+0x5ED5 = 0x3C57
+0x5EDC = 0x3C58
+0x5EDE = 0x3C59
+0x5EE5 = 0x3C5A
+0x5EEB = 0x3C5B
+0x5F02 = 0x3C5C
+0x5F06 = 0x3C5D
+0x5F07 = 0x3C5E
+0x5F08 = 0x3C5F
+0x5F0E = 0x3C60
+0x5F19 = 0x3C61
+0x5F1C = 0x3C62
+0x5F1D = 0x3C63
+0x5F21 = 0x3C64
+0x5F22 = 0x3C65
+0x5F23 = 0x3C66
+0x5F24 = 0x3C67
+0x5F28 = 0x3C68
+0x5F2B = 0x3C69
+0x5F2C = 0x3C6A
+0x5F2E = 0x3C6B
+0x5F30 = 0x3C6C
+0x5F34 = 0x3C6D
+0x5F36 = 0x3C6E
+0x5F3B = 0x3C6F
+0x5F3D = 0x3C70
+0x5F3F = 0x3C71
+0x5F40 = 0x3C72
+0x5F44 = 0x3C73
+0x5F45 = 0x3C74
+0x5F47 = 0x3C75
+0x5F4D = 0x3C76
+0x5F50 = 0x3C77
+0x5F54 = 0x3C78
+0x5F58 = 0x3C79
+0x5F5B = 0x3C7A
+0x5F60 = 0x3C7B
+0x5F63 = 0x3C7C
+0x5F64 = 0x3C7D
+0x5F67 = 0x3C7E
+0x5F6F = 0x3D21
+0x5F72 = 0x3D22
+0x5F74 = 0x3D23
+0x5F75 = 0x3D24
+0x5F78 = 0x3D25
+0x5F7A = 0x3D26
+0x5F7D = 0x3D27
+0x5F7E = 0x3D28
+0x5F89 = 0x3D29
+0x5F8D = 0x3D2A
+0x5F8F = 0x3D2B
+0x5F96 = 0x3D2C
+0x5F9C = 0x3D2D
+0x5F9D = 0x3D2E
+0x5FA2 = 0x3D2F
+0x5FA4 = 0x3D32
+0x5FA7 = 0x3D30
+0x5FAB = 0x3D31
+0x5FAC = 0x3D33
+0x5FAF = 0x3D34
+0x5FB0 = 0x3D35
+0x5FB1 = 0x3D36
+0x5FB8 = 0x3D37
+0x5FC4 = 0x3D38
+0x5FC7 = 0x3D39
+0x5FC8 = 0x3D3A
+0x5FC9 = 0x3D3B
+0x5FCB = 0x3D3C
+0x5FD0 = 0x3D3D
+0x5FD1 = 0x3D3E
+0x5FD2 = 0x3D3F
+0x5FD3 = 0x3D40
+0x5FD4 = 0x3D41
+0x5FDE = 0x3D42
+0x5FE1 = 0x3D43
+0x5FE2 = 0x3D44
+0x5FE8 = 0x3D45
+0x5FE9 = 0x3D46
+0x5FEA = 0x3D47
+0x5FEC = 0x3D48
+0x5FED = 0x3D49
+0x5FEE = 0x3D4A
+0x5FEF = 0x3D4B
+0x5FF2 = 0x3D4C
+0x5FF3 = 0x3D4D
+0x5FF6 = 0x3D4E
+0x5FFA = 0x3D4F
+0x5FFC = 0x3D50
+0x6007 = 0x3D51
+0x600A = 0x3D52
+0x600D = 0x3D53
+0x6013 = 0x3D54
+0x6014 = 0x3D55
+0x6017 = 0x3D56
+0x6018 = 0x3D57
+0x601A = 0x3D58
+0x601F = 0x3D59
+0x6024 = 0x3D5A
+0x602D = 0x3D5B
+0x6033 = 0x3D5C
+0x6035 = 0x3D5D
+0x6040 = 0x3D5E
+0x6047 = 0x3D5F
+0x6048 = 0x3D60
+0x6049 = 0x3D61
+0x604C = 0x3D62
+0x6051 = 0x3D63
+0x6054 = 0x3D64
+0x6056 = 0x3D65
+0x6057 = 0x3D66
+0x605D = 0x3D67
+0x6061 = 0x3D68
+0x6067 = 0x3D69
+0x6071 = 0x3D6A
+0x607E = 0x3D6B
+0x607F = 0x3D6C
+0x6082 = 0x3D6D
+0x6086 = 0x3D6E
+0x6088 = 0x3D6F
+0x608A = 0x3D70
+0x608E = 0x3D71
+0x6091 = 0x3D72
+0x6093 = 0x3D73
+0x6095 = 0x3D74
+0x6098 = 0x3D75
+0x609D = 0x3D76
+0x609E = 0x3D77
+0x60A2 = 0x3D78
+0x60A4 = 0x3D79
+0x60A5 = 0x3D7A
+0x60A8 = 0x3D7B
+0x60B0 = 0x3D7C
+0x60B1 = 0x3D7D
+0x60B7 = 0x3D7E
+0x60BB = 0x3E21
+0x60BE = 0x3E22
+0x60C2 = 0x3E23
+0x60C4 = 0x3E24
+0x60C8 = 0x3E25
+0x60C9 = 0x3E26
+0x60CA = 0x3E27
+0x60CB = 0x3E28
+0x60CE = 0x3E29
+0x60CF = 0x3E2A
+0x60D4 = 0x3E2B
+0x60D5 = 0x3E2C
+0x60D9 = 0x3E2D
+0x60DB = 0x3E2E
+0x60DD = 0x3E2F
+0x60DE = 0x3E30
+0x60E2 = 0x3E31
+0x60E5 = 0x3E32
+0x60F2 = 0x3E33
+0x60F5 = 0x3E34
+0x60F8 = 0x3E35
+0x60FC = 0x3E36
+0x60FD = 0x3E37
+0x6102 = 0x3E38
+0x6107 = 0x3E39
+0x610A = 0x3E3A
+0x610C = 0x3E3B
+0x6110 = 0x3E3C
+0x6111 = 0x3E3D
+0x6112 = 0x3E3E
+0x6113 = 0x3E3F
+0x6114 = 0x3E40
+0x6116 = 0x3E41
+0x6117 = 0x3E42
+0x6119 = 0x3E43
+0x611C = 0x3E44
+0x611E = 0x3E45
+0x6122 = 0x3E46
+0x612A = 0x3E47
+0x612B = 0x3E48
+0x6130 = 0x3E49
+0x6131 = 0x3E4A
+0x6135 = 0x3E4B
+0x6136 = 0x3E4C
+0x6137 = 0x3E4D
+0x6139 = 0x3E4E
+0x6141 = 0x3E4F
+0x6145 = 0x3E50
+0x6146 = 0x3E51
+0x6149 = 0x3E52
+0x615E = 0x3E53
+0x6160 = 0x3E54
+0x616C = 0x3E55
+0x6172 = 0x3E56
+0x6178 = 0x3E57
+0x617B = 0x3E58
+0x617C = 0x3E59
+0x617F = 0x3E5A
+0x6180 = 0x3E5B
+0x6181 = 0x3E5C
+0x6183 = 0x3E5D
+0x6184 = 0x3E5E
+0x618B = 0x3E5F
+0x618D = 0x3E60
+0x6192 = 0x3E61
+0x6193 = 0x3E62
+0x6197 = 0x3E63
+0x6198 = 0x3E64
+0x619C = 0x3E65
+0x619D = 0x3E66
+0x619F = 0x3E67
+0x61A0 = 0x3E68
+0x61A5 = 0x3E69
+0x61A8 = 0x3E6A
+0x61AA = 0x3E6B
+0x61AD = 0x3E6C
+0x61B8 = 0x3E6D
+0x61B9 = 0x3E6E
+0x61BC = 0x3E6F
+0x61C0 = 0x3E70
+0x61C1 = 0x3E71
+0x61C2 = 0x3E72
+0x61CE = 0x3E73
+0x61CF = 0x3E74
+0x61D5 = 0x3E75
+0x61DC = 0x3E76
+0x61DD = 0x3E77
+0x61DE = 0x3E78
+0x61DF = 0x3E79
+0x61E1 = 0x3E7A
+0x61E2 = 0x3E7B
+0x61E5 = 0x3E7E
+0x61E7 = 0x3E7C
+0x61E9 = 0x3E7D
+0x61EC = 0x3F21
+0x61ED = 0x3F22
+0x61EF = 0x3F23
+0x6201 = 0x3F24
+0x6203 = 0x3F25
+0x6204 = 0x3F26
+0x6207 = 0x3F27
+0x6213 = 0x3F28
+0x6215 = 0x3F29
+0x621C = 0x3F2A
+0x6220 = 0x3F2B
+0x6222 = 0x3F2C
+0x6223 = 0x3F2D
+0x6227 = 0x3F2E
+0x6229 = 0x3F2F
+0x622B = 0x3F30
+0x6239 = 0x3F31
+0x623D = 0x3F32
+0x6242 = 0x3F33
+0x6243 = 0x3F34
+0x6244 = 0x3F35
+0x6246 = 0x3F36
+0x624C = 0x3F37
+0x6250 = 0x3F38
+0x6251 = 0x3F39
+0x6252 = 0x3F3A
+0x6254 = 0x3F3B
+0x6256 = 0x3F3C
+0x625A = 0x3F3D
+0x625C = 0x3F3E
+0x6264 = 0x3F3F
+0x626D = 0x3F40
+0x626F = 0x3F41
+0x6273 = 0x3F42
+0x627A = 0x3F43
+0x627D = 0x3F44
+0x628D = 0x3F45
+0x628E = 0x3F46
+0x628F = 0x3F47
+0x6290 = 0x3F48
+0x62A6 = 0x3F49
+0x62A8 = 0x3F4A
+0x62B3 = 0x3F4B
+0x62B6 = 0x3F4C
+0x62B7 = 0x3F4D
+0x62BA = 0x3F4E
+0x62BE = 0x3F4F
+0x62BF = 0x3F50
+0x62C4 = 0x3F51
+0x62CE = 0x3F52
+0x62D5 = 0x3F53
+0x62D6 = 0x3F54
+0x62DA = 0x3F55
+0x62EA = 0x3F56
+0x62F2 = 0x3F57
+0x62F4 = 0x3F58
+0x62FC = 0x3F59
+0x62FD = 0x3F5A
+0x6303 = 0x3F5B
+0x6304 = 0x3F5C
+0x630A = 0x3F5D
+0x630B = 0x3F5E
+0x630D = 0x3F5F
+0x6310 = 0x3F60
+0x6313 = 0x3F61
+0x6316 = 0x3F62
+0x6318 = 0x3F63
+0x6329 = 0x3F64
+0x632A = 0x3F65
+0x632D = 0x3F66
+0x6335 = 0x3F67
+0x6336 = 0x3F68
+0x6339 = 0x3F69
+0x633C = 0x3F6A
+0x6341 = 0x3F6B
+0x6342 = 0x3F6C
+0x6343 = 0x3F6D
+0x6344 = 0x3F6E
+0x6346 = 0x3F6F
+0x634A = 0x3F70
+0x634B = 0x3F71
+0x634E = 0x3F72
+0x6352 = 0x3F73
+0x6353 = 0x3F74
+0x6354 = 0x3F75
+0x6358 = 0x3F76
+0x635B = 0x3F77
+0x6365 = 0x3F78
+0x6366 = 0x3F79
+0x636C = 0x3F7A
+0x636D = 0x3F7B
+0x6371 = 0x3F7C
+0x6374 = 0x3F7D
+0x6375 = 0x3F7E
+0x6378 = 0x4021
+0x637C = 0x4022
+0x637D = 0x4023
+0x637F = 0x4024
+0x6382 = 0x4025
+0x6384 = 0x4026
+0x6387 = 0x4027
+0x638A = 0x4028
+0x6390 = 0x4029
+0x6394 = 0x402A
+0x6395 = 0x402B
+0x6399 = 0x402C
+0x639A = 0x402D
+0x639E = 0x402E
+0x63A4 = 0x402F
+0x63A6 = 0x4030
+0x63AD = 0x4031
+0x63AE = 0x4032
+0x63AF = 0x4033
+0x63BD = 0x4034
+0x63C1 = 0x4035
+0x63C5 = 0x4036
+0x63C8 = 0x4037
+0x63CE = 0x4038
+0x63D1 = 0x4039
+0x63D3 = 0x403A
+0x63D4 = 0x403B
+0x63D5 = 0x403C
+0x63DC = 0x403D
+0x63E0 = 0x403E
+0x63E5 = 0x403F
+0x63EA = 0x4040
+0x63EC = 0x4041
+0x63F2 = 0x4042
+0x63F3 = 0x4043
+0x63F5 = 0x4044
+0x63F8 = 0x4045
+0x63F9 = 0x4046
+0x6409 = 0x4047
+0x640A = 0x4048
+0x6410 = 0x4049
+0x6412 = 0x404A
+0x6414 = 0x404B
+0x6418 = 0x404C
+0x641E = 0x404D
+0x6420 = 0x404E
+0x6422 = 0x404F
+0x6424 = 0x4050
+0x6425 = 0x4051
+0x6429 = 0x4052
+0x642A = 0x4053
+0x642F = 0x4054
+0x6430 = 0x4055
+0x6435 = 0x4056
+0x643D = 0x4057
+0x643F = 0x4058
+0x644B = 0x4059
+0x644F = 0x405A
+0x6451 = 0x405B
+0x6452 = 0x405C
+0x6453 = 0x405D
+0x6454 = 0x405E
+0x645A = 0x405F
+0x645B = 0x4060
+0x645C = 0x4061
+0x645D = 0x4062
+0x645F = 0x4063
+0x6460 = 0x4064
+0x6461 = 0x4065
+0x6463 = 0x4066
+0x646D = 0x4067
+0x6473 = 0x4068
+0x6474 = 0x4069
+0x647B = 0x406A
+0x647D = 0x406B
+0x6485 = 0x406C
+0x6487 = 0x406D
+0x648F = 0x406E
+0x6490 = 0x406F
+0x6491 = 0x4070
+0x6498 = 0x4071
+0x6499 = 0x4072
+0x649B = 0x4073
+0x649D = 0x4074
+0x649F = 0x4075
+0x64A1 = 0x4076
+0x64A3 = 0x4077
+0x64A6 = 0x4078
+0x64A8 = 0x4079
+0x64AC = 0x407A
+0x64B3 = 0x407B
+0x64BD = 0x407C
+0x64BE = 0x407D
+0x64BF = 0x407E
+0x64C4 = 0x4121
+0x64C9 = 0x4122
+0x64CA = 0x4123
+0x64CB = 0x4124
+0x64CC = 0x4125
+0x64CE = 0x4126
+0x64D0 = 0x4127
+0x64D1 = 0x4128
+0x64D5 = 0x4129
+0x64D7 = 0x412A
+0x64E4 = 0x412B
+0x64E5 = 0x412C
+0x64E9 = 0x412D
+0x64EA = 0x412E
+0x64ED = 0x412F
+0x64F0 = 0x4130
+0x64F5 = 0x4131
+0x64F7 = 0x4132
+0x64FB = 0x4133
+0x64FF = 0x4134
+0x6501 = 0x4135
+0x6504 = 0x4136
+0x6508 = 0x4137
+0x6509 = 0x4138
+0x650A = 0x4139
+0x650F = 0x413A
+0x6513 = 0x413B
+0x6514 = 0x413C
+0x6516 = 0x413D
+0x6519 = 0x413E
+0x651B = 0x413F
+0x651E = 0x4140
+0x651F = 0x4141
+0x6522 = 0x4142
+0x6526 = 0x4143
+0x6529 = 0x4144
+0x652E = 0x4145
+0x6531 = 0x4146
+0x653A = 0x4147
+0x653C = 0x4148
+0x653D = 0x4149
+0x6543 = 0x414A
+0x6547 = 0x414B
+0x6549 = 0x414C
+0x6550 = 0x414D
+0x6552 = 0x414E
+0x6554 = 0x414F
+0x655F = 0x4150
+0x6560 = 0x4151
+0x6567 = 0x4152
+0x656B = 0x4153
+0x657A = 0x4154
+0x657D = 0x4155
+0x6581 = 0x4156
+0x6585 = 0x4157
+0x658A = 0x4158
+0x6592 = 0x4159
+0x6595 = 0x415A
+0x6598 = 0x415B
+0x659D = 0x415C
+0x65A0 = 0x415D
+0x65A3 = 0x415E
+0x65A6 = 0x415F
+0x65AE = 0x4160
+0x65B2 = 0x4161
+0x65B3 = 0x4162
+0x65B4 = 0x4163
+0x65BF = 0x4164
+0x65C2 = 0x4165
+0x65C8 = 0x4166
+0x65C9 = 0x4167
+0x65CE = 0x4168
+0x65D0 = 0x4169
+0x65D4 = 0x416A
+0x65D6 = 0x416B
+0x65D8 = 0x416C
+0x65DF = 0x416D
+0x65F0 = 0x416E
+0x65F2 = 0x416F
+0x65F4 = 0x4170
+0x65F5 = 0x4171
+0x65F9 = 0x4172
+0x65FE = 0x4173
+0x65FF = 0x4174
+0x6600 = 0x4175
+0x6604 = 0x4176
+0x6608 = 0x4177
+0x6609 = 0x4178
+0x660D = 0x4179
+0x6611 = 0x417A
+0x6612 = 0x417B
+0x6615 = 0x417C
+0x6616 = 0x417D
+0x661D = 0x417E
+0x661E = 0x4221
+0x6621 = 0x4222
+0x6622 = 0x4223
+0x6623 = 0x4224
+0x6624 = 0x4225
+0x6626 = 0x4226
+0x6629 = 0x4227
+0x662A = 0x4228
+0x662B = 0x4229
+0x662C = 0x422A
+0x662E = 0x422B
+0x6630 = 0x422C
+0x6631 = 0x422D
+0x6633 = 0x422E
+0x6637 = 0x4230
+0x6639 = 0x422F
+0x6640 = 0x4231
+0x6645 = 0x4232
+0x6646 = 0x4233
+0x664A = 0x4234
+0x664C = 0x4235
+0x664E = 0x4237
+0x6651 = 0x4236
+0x6657 = 0x4238
+0x6658 = 0x4239
+0x6659 = 0x423A
+0x665B = 0x423B
+0x665C = 0x423C
+0x6660 = 0x423D
+0x6661 = 0x423E
+0x666A = 0x4240
+0x666B = 0x4241
+0x666C = 0x4242
+0x6673 = 0x4244
+0x6675 = 0x4245
+0x6677 = 0x4247
+0x6678 = 0x4248
+0x6679 = 0x4249
+0x667B = 0x424A
+0x667C = 0x424C
+0x667E = 0x4243
+0x667F = 0x4246
+0x6680 = 0x424B
+0x668B = 0x424D
+0x668C = 0x424E
+0x668D = 0x424F
+0x6690 = 0x4250
+0x6692 = 0x4251
+0x6699 = 0x4252
+0x669A = 0x4253
+0x669B = 0x4254
+0x669C = 0x4255
+0x669F = 0x4256
+0x66A0 = 0x4257
+0x66A4 = 0x4258
+0x66AD = 0x4259
+0x66B1 = 0x425A
+0x66B2 = 0x425B
+0x66B5 = 0x425C
+0x66BB = 0x425D
+0x66BF = 0x425E
+0x66C0 = 0x425F
+0x66C2 = 0x4260
+0x66C3 = 0x4261
+0x66C8 = 0x4262
+0x66CC = 0x4263
+0x66CE = 0x4264
+0x66CF = 0x4265
+0x66D4 = 0x4266
+0x66DB = 0x4267
+0x66DF = 0x4268
+0x66E8 = 0x4269
+0x66EB = 0x426A
+0x66EC = 0x426B
+0x66EE = 0x426C
+0x66FA = 0x426D
+0x66FB = 0x423F
+0x6705 = 0x426E
+0x6707 = 0x426F
+0x670E = 0x4270
+0x6713 = 0x4271
+0x6719 = 0x4272
+0x671C = 0x4273
+0x6720 = 0x4274
+0x6722 = 0x4275
+0x6733 = 0x4276
+0x673E = 0x4277
+0x6745 = 0x4278
+0x6747 = 0x4279
+0x6748 = 0x427A
+0x674C = 0x427B
+0x6754 = 0x427C
+0x6755 = 0x427D
+0x675D = 0x427E
+0x6766 = 0x4321
+0x676C = 0x4322
+0x676E = 0x4323
+0x6774 = 0x4324
+0x6776 = 0x4325
+0x677B = 0x4326
+0x6781 = 0x4327
+0x6784 = 0x4328
+0x678E = 0x4329
+0x678F = 0x432A
+0x6791 = 0x432B
+0x6793 = 0x432C
+0x6796 = 0x432D
+0x6798 = 0x432E
+0x6799 = 0x432F
+0x679B = 0x4330
+0x67B0 = 0x4331
+0x67B1 = 0x4332
+0x67B2 = 0x4333
+0x67B5 = 0x4334
+0x67BB = 0x4335
+0x67BC = 0x4336
+0x67BD = 0x4337
+0x67C0 = 0x4339
+0x67C2 = 0x433A
+0x67C3 = 0x433B
+0x67C5 = 0x433C
+0x67C8 = 0x433D
+0x67C9 = 0x433E
+0x67D2 = 0x433F
+0x67D7 = 0x4340
+0x67D9 = 0x4341
+0x67DC = 0x4342
+0x67E1 = 0x4343
+0x67E6 = 0x4344
+0x67F0 = 0x4345
+0x67F2 = 0x4346
+0x67F6 = 0x4347
+0x67F7 = 0x4348
+0x67F9 = 0x4338
+0x6814 = 0x434A
+0x6819 = 0x434B
+0x681D = 0x434C
+0x681F = 0x434D
+0x6827 = 0x434F
+0x6828 = 0x434E
+0x682C = 0x4350
+0x682D = 0x4351
+0x682F = 0x4352
+0x6830 = 0x4353
+0x6831 = 0x4354
+0x6833 = 0x4355
+0x683B = 0x4356
+0x683F = 0x4357
+0x6844 = 0x4358
+0x6845 = 0x4359
+0x684A = 0x435A
+0x684C = 0x435B
+0x6852 = 0x4349
+0x6855 = 0x435C
+0x6857 = 0x435D
+0x6858 = 0x435E
+0x685B = 0x435F
+0x686B = 0x4360
+0x686E = 0x4361
+0x686F = 0x4362
+0x6870 = 0x4363
+0x6871 = 0x4364
+0x6872 = 0x4365
+0x6875 = 0x4366
+0x6879 = 0x4367
+0x687A = 0x4368
+0x687B = 0x4369
+0x687C = 0x436A
+0x6882 = 0x436B
+0x6884 = 0x436C
+0x6886 = 0x436D
+0x6888 = 0x436E
+0x6896 = 0x436F
+0x6898 = 0x4370
+0x689A = 0x4371
+0x689C = 0x4372
+0x68A1 = 0x4373
+0x68A3 = 0x4374
+0x68A5 = 0x4375
+0x68A9 = 0x4376
+0x68AA = 0x4377
+0x68AE = 0x4378
+0x68B2 = 0x4379
+0x68BB = 0x437A
+0x68C5 = 0x437B
+0x68C8 = 0x437C
+0x68CC = 0x437D
+0x68CF = 0x437E
+0x68D0 = 0x4421
+0x68D1 = 0x4422
+0x68D3 = 0x4423
+0x68D6 = 0x4424
+0x68D9 = 0x4425
+0x68DC = 0x4426
+0x68DD = 0x4427
+0x68E5 = 0x4428
+0x68E8 = 0x4429
+0x68EA = 0x442A
+0x68EB = 0x442B
+0x68EC = 0x442C
+0x68ED = 0x442D
+0x68F0 = 0x442E
+0x68F1 = 0x442F
+0x68F5 = 0x4430
+0x68F6 = 0x4431
+0x68FB = 0x4432
+0x68FC = 0x4433
+0x68FD = 0x4434
+0x6906 = 0x4435
+0x6909 = 0x4436
+0x690A = 0x4437
+0x6910 = 0x4438
+0x6911 = 0x4439
+0x6913 = 0x443A
+0x6916 = 0x443B
+0x6917 = 0x443C
+0x6931 = 0x443D
+0x6933 = 0x443E
+0x6935 = 0x443F
+0x6938 = 0x4440
+0x693B = 0x4441
+0x6942 = 0x4442
+0x6945 = 0x4443
+0x6949 = 0x4444
+0x694E = 0x4445
+0x6957 = 0x4446
+0x695B = 0x4447
+0x6963 = 0x4448
+0x6964 = 0x4449
+0x6965 = 0x444A
+0x6966 = 0x444B
+0x6968 = 0x444C
+0x6969 = 0x444D
+0x696C = 0x444E
+0x6970 = 0x444F
+0x6971 = 0x4450
+0x6972 = 0x4451
+0x697A = 0x4452
+0x697B = 0x4453
+0x697F = 0x4454
+0x6980 = 0x4455
+0x698D = 0x4456
+0x6992 = 0x4457
+0x6996 = 0x4458
+0x6998 = 0x4459
+0x69A1 = 0x445A
+0x69A5 = 0x445B
+0x69A6 = 0x445C
+0x69A8 = 0x445D
+0x69AB = 0x445E
+0x69AD = 0x445F
+0x69AF = 0x4460
+0x69B7 = 0x4461
+0x69B8 = 0x4462
+0x69BA = 0x4463
+0x69BC = 0x4464
+0x69C5 = 0x4465
+0x69C8 = 0x4466
+0x69D1 = 0x4467
+0x69D6 = 0x4468
+0x69D7 = 0x4469
+0x69E2 = 0x446A
+0x69E5 = 0x446B
+0x69EE = 0x446C
+0x69EF = 0x446D
+0x69F1 = 0x446E
+0x69F3 = 0x446F
+0x69F5 = 0x4470
+0x69FE = 0x4471
+0x6A00 = 0x4472
+0x6A01 = 0x4473
+0x6A03 = 0x4474
+0x6A0F = 0x4475
+0x6A11 = 0x4476
+0x6A15 = 0x4477
+0x6A1A = 0x4478
+0x6A1D = 0x4479
+0x6A20 = 0x447A
+0x6A24 = 0x447B
+0x6A28 = 0x447C
+0x6A30 = 0x447D
+0x6A32 = 0x447E
+0x6A34 = 0x4521
+0x6A37 = 0x4522
+0x6A3B = 0x4523
+0x6A3E = 0x4524
+0x6A3F = 0x4525
+0x6A45 = 0x4526
+0x6A46 = 0x4527
+0x6A49 = 0x4528
+0x6A4A = 0x4529
+0x6A4E = 0x452A
+0x6A50 = 0x452B
+0x6A51 = 0x452C
+0x6A52 = 0x452D
+0x6A55 = 0x452E
+0x6A56 = 0x452F
+0x6A5B = 0x4530
+0x6A64 = 0x4531
+0x6A67 = 0x4532
+0x6A6A = 0x4533
+0x6A71 = 0x4534
+0x6A73 = 0x4535
+0x6A7E = 0x4536
+0x6A81 = 0x4537
+0x6A83 = 0x4538
+0x6A86 = 0x4539
+0x6A87 = 0x453A
+0x6A89 = 0x453B
+0x6A8B = 0x453C
+0x6A91 = 0x453D
+0x6A9B = 0x453E
+0x6A9D = 0x453F
+0x6A9E = 0x4540
+0x6A9F = 0x4541
+0x6AA5 = 0x4542
+0x6AAB = 0x4543
+0x6AAF = 0x4544
+0x6AB0 = 0x4545
+0x6AB1 = 0x4546
+0x6AB4 = 0x4547
+0x6ABD = 0x4548
+0x6ABE = 0x4549
+0x6ABF = 0x454A
+0x6AC6 = 0x454B
+0x6AC8 = 0x454D
+0x6AC9 = 0x454C
+0x6ACC = 0x454E
+0x6AD0 = 0x454F
+0x6AD4 = 0x4550
+0x6AD5 = 0x4551
+0x6AD6 = 0x4552
+0x6ADC = 0x4553
+0x6ADD = 0x4554
+0x6AE4 = 0x4555
+0x6AE7 = 0x4556
+0x6AEC = 0x4557
+0x6AF0 = 0x4558
+0x6AF1 = 0x4559
+0x6AF2 = 0x455A
+0x6AFC = 0x455B
+0x6AFD = 0x455C
+0x6B02 = 0x455D
+0x6B03 = 0x455E
+0x6B06 = 0x455F
+0x6B07 = 0x4560
+0x6B09 = 0x4561
+0x6B0F = 0x4562
+0x6B10 = 0x4563
+0x6B11 = 0x4564
+0x6B17 = 0x4565
+0x6B1B = 0x4566
+0x6B1E = 0x4567
+0x6B24 = 0x4568
+0x6B28 = 0x4569
+0x6B2B = 0x456A
+0x6B2C = 0x456B
+0x6B2F = 0x456C
+0x6B35 = 0x456D
+0x6B36 = 0x456E
+0x6B3B = 0x456F
+0x6B3F = 0x4570
+0x6B46 = 0x4571
+0x6B4A = 0x4572
+0x6B4D = 0x4573
+0x6B52 = 0x4574
+0x6B56 = 0x4575
+0x6B58 = 0x4576
+0x6B5D = 0x4577
+0x6B60 = 0x4578
+0x6B67 = 0x4579
+0x6B6B = 0x457A
+0x6B6E = 0x457B
+0x6B70 = 0x457C
+0x6B75 = 0x457D
+0x6B7D = 0x457E
+0x6B7E = 0x4621
+0x6B82 = 0x4622
+0x6B85 = 0x4623
+0x6B97 = 0x4624
+0x6B9B = 0x4625
+0x6B9F = 0x4626
+0x6BA0 = 0x4627
+0x6BA2 = 0x4628
+0x6BA3 = 0x4629
+0x6BA8 = 0x462A
+0x6BA9 = 0x462B
+0x6BAC = 0x462C
+0x6BAD = 0x462D
+0x6BAE = 0x462E
+0x6BB0 = 0x462F
+0x6BB8 = 0x4630
+0x6BB9 = 0x4631
+0x6BBD = 0x4632
+0x6BBE = 0x4633
+0x6BC3 = 0x4634
+0x6BC4 = 0x4635
+0x6BC9 = 0x4636
+0x6BCC = 0x4637
+0x6BD6 = 0x4638
+0x6BDA = 0x4639
+0x6BE1 = 0x463A
+0x6BE3 = 0x463B
+0x6BE6 = 0x463C
+0x6BE7 = 0x463D
+0x6BEE = 0x463E
+0x6BF1 = 0x463F
+0x6BF7 = 0x4640
+0x6BF9 = 0x4641
+0x6BFF = 0x4642
+0x6C02 = 0x4643
+0x6C04 = 0x4644
+0x6C05 = 0x4645
+0x6C09 = 0x4646
+0x6C0D = 0x4647
+0x6C0E = 0x4648
+0x6C10 = 0x4649
+0x6C12 = 0x464A
+0x6C19 = 0x464B
+0x6C1F = 0x464C
+0x6C26 = 0x464D
+0x6C27 = 0x464E
+0x6C28 = 0x464F
+0x6C2C = 0x4650
+0x6C2E = 0x4651
+0x6C33 = 0x4652
+0x6C35 = 0x4653
+0x6C36 = 0x4654
+0x6C3A = 0x4655
+0x6C3B = 0x4656
+0x6C3F = 0x4657
+0x6C4A = 0x4658
+0x6C4B = 0x4659
+0x6C4D = 0x465A
+0x6C4F = 0x465B
+0x6C52 = 0x465C
+0x6C54 = 0x465D
+0x6C59 = 0x465E
+0x6C5B = 0x465F
+0x6C5C = 0x4660
+0x6C67 = 0x4736
+0x6C6B = 0x4661
+0x6C6D = 0x4662
+0x6C6F = 0x4663
+0x6C74 = 0x4664
+0x6C76 = 0x4665
+0x6C78 = 0x4666
+0x6C79 = 0x4667
+0x6C7B = 0x4668
+0x6C85 = 0x4669
+0x6C86 = 0x466A
+0x6C87 = 0x466B
+0x6C89 = 0x466C
+0x6C94 = 0x466D
+0x6C95 = 0x466E
+0x6C97 = 0x466F
+0x6C98 = 0x4670
+0x6C9C = 0x4671
+0x6C9F = 0x4672
+0x6CB0 = 0x4673
+0x6CB2 = 0x4674
+0x6CB4 = 0x4675
+0x6CC2 = 0x4676
+0x6CC6 = 0x4677
+0x6CCD = 0x4678
+0x6CCF = 0x4679
+0x6CD0 = 0x467A
+0x6CD1 = 0x467B
+0x6CD2 = 0x467C
+0x6CD4 = 0x467D
+0x6CD6 = 0x467E
+0x6CDA = 0x4721
+0x6CDC = 0x4722
+0x6CE0 = 0x4723
+0x6CE7 = 0x4724
+0x6CE9 = 0x4725
+0x6CEB = 0x4726
+0x6CEC = 0x4727
+0x6CEE = 0x4728
+0x6CF2 = 0x4729
+0x6CF4 = 0x472A
+0x6D04 = 0x472B
+0x6D07 = 0x472C
+0x6D0A = 0x472D
+0x6D0E = 0x472E
+0x6D0F = 0x472F
+0x6D11 = 0x4730
+0x6D13 = 0x4731
+0x6D1A = 0x4732
+0x6D26 = 0x4733
+0x6D27 = 0x4734
+0x6D28 = 0x4735
+0x6D2E = 0x4737
+0x6D2F = 0x4738
+0x6D31 = 0x4739
+0x6D39 = 0x473A
+0x6D3C = 0x473B
+0x6D3F = 0x473C
+0x6D57 = 0x473D
+0x6D5E = 0x473E
+0x6D5F = 0x473F
+0x6D61 = 0x4740
+0x6D65 = 0x4741
+0x6D67 = 0x4742
+0x6D6F = 0x4743
+0x6D70 = 0x4744
+0x6D7C = 0x4745
+0x6D82 = 0x4746
+0x6D87 = 0x4747
+0x6D91 = 0x4748
+0x6D92 = 0x4749
+0x6D94 = 0x474A
+0x6D96 = 0x474B
+0x6D97 = 0x474C
+0x6D98 = 0x474D
+0x6DAA = 0x474E
+0x6DAC = 0x474F
+0x6DB4 = 0x4750
+0x6DB7 = 0x4751
+0x6DB9 = 0x4752
+0x6DBD = 0x4753
+0x6DBF = 0x4754
+0x6DC4 = 0x4755
+0x6DC8 = 0x4756
+0x6DCA = 0x4757
+0x6DCE = 0x4758
+0x6DCF = 0x4759
+0x6DD6 = 0x475A
+0x6DDB = 0x475B
+0x6DDD = 0x475C
+0x6DDF = 0x475D
+0x6DE0 = 0x475E
+0x6DE2 = 0x475F
+0x6DE5 = 0x4760
+0x6DE9 = 0x4761
+0x6DEF = 0x4762
+0x6DF0 = 0x4763
+0x6DF4 = 0x4764
+0x6DF6 = 0x4765
+0x6DFC = 0x4766
+0x6E00 = 0x4767
+0x6E04 = 0x4768
+0x6E1E = 0x4769
+0x6E22 = 0x476A
+0x6E27 = 0x476B
+0x6E32 = 0x476C
+0x6E36 = 0x476D
+0x6E39 = 0x476E
+0x6E3B = 0x476F
+0x6E3C = 0x4770
+0x6E44 = 0x4771
+0x6E45 = 0x4772
+0x6E48 = 0x4773
+0x6E49 = 0x4774
+0x6E4B = 0x4775
+0x6E4F = 0x4776
+0x6E51 = 0x4777
+0x6E52 = 0x4778
+0x6E53 = 0x4779
+0x6E54 = 0x477A
+0x6E57 = 0x477B
+0x6E5C = 0x477C
+0x6E5D = 0x477D
+0x6E5E = 0x477E
+0x6E62 = 0x4821
+0x6E63 = 0x4822
+0x6E68 = 0x4823
+0x6E73 = 0x4824
+0x6E7B = 0x4825
+0x6E7D = 0x4826
+0x6E8D = 0x4827
+0x6E93 = 0x4828
+0x6E99 = 0x4829
+0x6EA0 = 0x482A
+0x6EA7 = 0x482B
+0x6EAD = 0x482C
+0x6EAE = 0x482D
+0x6EB1 = 0x482E
+0x6EB3 = 0x482F
+0x6EBB = 0x4830
+0x6EBF = 0x4831
+0x6EC0 = 0x4832
+0x6EC1 = 0x4833
+0x6EC3 = 0x4834
+0x6EC7 = 0x4835
+0x6EC8 = 0x4836
+0x6ECA = 0x4837
+0x6ECD = 0x4838
+0x6ECE = 0x4839
+0x6ECF = 0x483A
+0x6EEB = 0x483B
+0x6EED = 0x483C
+0x6EEE = 0x483D
+0x6EF9 = 0x483E
+0x6EFB = 0x483F
+0x6EFD = 0x4840
+0x6F04 = 0x4841
+0x6F08 = 0x4842
+0x6F0A = 0x4843
+0x6F0C = 0x4844
+0x6F0D = 0x4845
+0x6F16 = 0x4846
+0x6F18 = 0x4847
+0x6F1A = 0x4848
+0x6F1B = 0x4849
+0x6F26 = 0x484A
+0x6F29 = 0x484B
+0x6F2A = 0x484C
+0x6F2D = 0x4853
+0x6F2F = 0x484D
+0x6F30 = 0x484E
+0x6F33 = 0x484F
+0x6F36 = 0x4850
+0x6F3B = 0x4851
+0x6F3C = 0x4852
+0x6F4F = 0x4854
+0x6F51 = 0x4855
+0x6F52 = 0x4856
+0x6F53 = 0x4857
+0x6F57 = 0x4858
+0x6F59 = 0x4859
+0x6F5A = 0x485A
+0x6F5D = 0x485B
+0x6F5E = 0x485C
+0x6F61 = 0x485D
+0x6F62 = 0x485E
+0x6F68 = 0x485F
+0x6F6C = 0x4860
+0x6F7D = 0x4861
+0x6F7E = 0x4862
+0x6F83 = 0x4863
+0x6F87 = 0x4864
+0x6F88 = 0x4865
+0x6F8B = 0x4866
+0x6F8C = 0x4867
+0x6F8D = 0x4868
+0x6F90 = 0x4869
+0x6F92 = 0x486A
+0x6F93 = 0x486B
+0x6F94 = 0x486C
+0x6F96 = 0x486D
+0x6F9A = 0x486E
+0x6F9F = 0x486F
+0x6FA0 = 0x4870
+0x6FA5 = 0x4871
+0x6FA6 = 0x4872
+0x6FA7 = 0x4873
+0x6FA8 = 0x4874
+0x6FAE = 0x4875
+0x6FAF = 0x4876
+0x6FB0 = 0x4877
+0x6FB5 = 0x4878
+0x6FB6 = 0x4879
+0x6FBC = 0x487A
+0x6FC5 = 0x487B
+0x6FC7 = 0x487C
+0x6FC8 = 0x487D
+0x6FCA = 0x487E
+0x6FDA = 0x4921
+0x6FDE = 0x4922
+0x6FE8 = 0x4923
+0x6FE9 = 0x4924
+0x6FF0 = 0x4925
+0x6FF5 = 0x4926
+0x6FF9 = 0x4927
+0x6FFC = 0x4928
+0x6FFD = 0x4929
+0x7000 = 0x492A
+0x7005 = 0x492B
+0x7006 = 0x492C
+0x7007 = 0x492D
+0x700D = 0x492E
+0x7017 = 0x492F
+0x7020 = 0x4930
+0x7023 = 0x4931
+0x702F = 0x4932
+0x7034 = 0x4933
+0x7037 = 0x4934
+0x7039 = 0x4935
+0x703C = 0x4936
+0x7043 = 0x4937
+0x7044 = 0x4938
+0x7048 = 0x4939
+0x7049 = 0x493A
+0x704A = 0x493B
+0x704B = 0x493C
+0x704E = 0x4941
+0x7054 = 0x493D
+0x7055 = 0x493E
+0x705D = 0x493F
+0x705E = 0x4940
+0x7064 = 0x4942
+0x7065 = 0x4943
+0x706C = 0x4944
+0x706E = 0x4945
+0x7075 = 0x4946
+0x7076 = 0x4947
+0x707E = 0x4948
+0x7081 = 0x4949
+0x7085 = 0x494A
+0x7086 = 0x494B
+0x7094 = 0x494C
+0x7095 = 0x494D
+0x7096 = 0x494E
+0x7097 = 0x494F
+0x7098 = 0x4950
+0x709B = 0x4951
+0x70A4 = 0x4952
+0x70AB = 0x4953
+0x70B0 = 0x4954
+0x70B1 = 0x4955
+0x70B4 = 0x4956
+0x70B7 = 0x4957
+0x70CA = 0x4958
+0x70D1 = 0x4959
+0x70D3 = 0x495A
+0x70D4 = 0x495B
+0x70D5 = 0x495C
+0x70D6 = 0x495D
+0x70D8 = 0x495E
+0x70DC = 0x495F
+0x70E4 = 0x4960
+0x70FA = 0x4961
+0x7103 = 0x4962
+0x7104 = 0x4963
+0x7105 = 0x4964
+0x7106 = 0x4965
+0x7107 = 0x4966
+0x710B = 0x4967
+0x710C = 0x4968
+0x710F = 0x4969
+0x711E = 0x496A
+0x7120 = 0x496B
+0x712B = 0x496C
+0x712D = 0x496D
+0x712F = 0x496E
+0x7130 = 0x496F
+0x7131 = 0x4970
+0x7138 = 0x4971
+0x7141 = 0x4972
+0x7145 = 0x4973
+0x7146 = 0x4974
+0x7147 = 0x4975
+0x714A = 0x4976
+0x714B = 0x4977
+0x7150 = 0x4978
+0x7152 = 0x4979
+0x7157 = 0x497A
+0x715A = 0x497B
+0x715C = 0x497C
+0x715E = 0x497D
+0x7160 = 0x497E
+0x7168 = 0x4A21
+0x7179 = 0x4A22
+0x7180 = 0x4A23
+0x7185 = 0x4A24
+0x7187 = 0x4A25
+0x718C = 0x4A26
+0x7192 = 0x4A27
+0x719A = 0x4A28
+0x719B = 0x4A29
+0x71A0 = 0x4A2A
+0x71A2 = 0x4A2B
+0x71AF = 0x4A2C
+0x71B0 = 0x4A2D
+0x71B2 = 0x4A2E
+0x71B3 = 0x4A2F
+0x71BA = 0x4A30
+0x71BF = 0x4A31
+0x71C0 = 0x4A32
+0x71C1 = 0x4A33
+0x71C4 = 0x4A34
+0x71CB = 0x4A35
+0x71CC = 0x4A36
+0x71D3 = 0x4A37
+0x71D6 = 0x4A38
+0x71D9 = 0x4A39
+0x71DA = 0x4A3A
+0x71DC = 0x4A3B
+0x71F8 = 0x4A3C
+0x71FE = 0x4A3D
+0x7200 = 0x4A3E
+0x7207 = 0x4A3F
+0x7208 = 0x4A40
+0x7209 = 0x4A41
+0x7213 = 0x4A42
+0x7217 = 0x4A43
+0x721A = 0x4A44
+0x721D = 0x4A45
+0x721F = 0x4A46
+0x7224 = 0x4A47
+0x722B = 0x4A48
+0x722F = 0x4A49
+0x7234 = 0x4A4A
+0x7238 = 0x4A4B
+0x7239 = 0x4A4C
+0x7241 = 0x4A4D
+0x7242 = 0x4A4E
+0x7243 = 0x4A4F
+0x7245 = 0x4A50
+0x724E = 0x4A51
+0x724F = 0x4A52
+0x7250 = 0x4A53
+0x7253 = 0x4A54
+0x7255 = 0x4A55
+0x7256 = 0x4A56
+0x725A = 0x4A57
+0x725C = 0x4A58
+0x725E = 0x4A59
+0x7260 = 0x4A5A
+0x7263 = 0x4A5B
+0x7268 = 0x4A5C
+0x726B = 0x4A5D
+0x726E = 0x4A5E
+0x726F = 0x4A5F
+0x7271 = 0x4A60
+0x7277 = 0x4A61
+0x7278 = 0x4A62
+0x727B = 0x4A63
+0x727C = 0x4A64
+0x727F = 0x4A65
+0x7284 = 0x4A66
+0x7289 = 0x4A67
+0x728D = 0x4A68
+0x728E = 0x4A69
+0x7293 = 0x4A6A
+0x729B = 0x4A6B
+0x72A8 = 0x4A6C
+0x72AD = 0x4A6D
+0x72AE = 0x4A6E
+0x72B1 = 0x4A6F
+0x72B4 = 0x4A70
+0x72BE = 0x4A71
+0x72C1 = 0x4A72
+0x72C7 = 0x4A73
+0x72C9 = 0x4A74
+0x72CC = 0x4A75
+0x72D5 = 0x4A76
+0x72D6 = 0x4A77
+0x72D8 = 0x4A78
+0x72DF = 0x4A79
+0x72E5 = 0x4A7A
+0x72F3 = 0x4A7B
+0x72F4 = 0x4A7C
+0x72FA = 0x4A7D
+0x72FB = 0x4A7E
+0x72FE = 0x4B21
+0x7302 = 0x4B22
+0x7304 = 0x4B23
+0x7305 = 0x4B24
+0x7307 = 0x4B25
+0x730B = 0x4B26
+0x730D = 0x4B27
+0x7312 = 0x4B28
+0x7313 = 0x4B29
+0x7318 = 0x4B2A
+0x7319 = 0x4B2B
+0x731E = 0x4B2C
+0x7322 = 0x4B2D
+0x7324 = 0x4B2E
+0x7327 = 0x4B2F
+0x7328 = 0x4B30
+0x732C = 0x4B31
+0x7331 = 0x4B32
+0x7332 = 0x4B33
+0x7335 = 0x4B34
+0x733A = 0x4B35
+0x733B = 0x4B36
+0x733D = 0x4B37
+0x7343 = 0x4B38
+0x734D = 0x4B39
+0x7350 = 0x4B3A
+0x7352 = 0x4B3B
+0x7356 = 0x4B3C
+0x7358 = 0x4B3D
+0x735D = 0x4B3E
+0x735E = 0x4B3F
+0x735F = 0x4B40
+0x7360 = 0x4B41
+0x7366 = 0x4B42
+0x7367 = 0x4B43
+0x7369 = 0x4B44
+0x736B = 0x4B45
+0x736C = 0x4B46
+0x736E = 0x4B47
+0x736F = 0x4B48
+0x7371 = 0x4B49
+0x7377 = 0x4B4A
+0x7379 = 0x4B4B
+0x737C = 0x4B4C
+0x7380 = 0x4B4D
+0x7381 = 0x4B4E
+0x7383 = 0x4B4F
+0x7385 = 0x4B50
+0x7386 = 0x4B51
+0x738E = 0x4B52
+0x7390 = 0x4B53
+0x7393 = 0x4B54
+0x7395 = 0x4B55
+0x7397 = 0x4B56
+0x7398 = 0x4B57
+0x739C = 0x4B58
+0x739E = 0x4B59
+0x739F = 0x4B5A
+0x73A0 = 0x4B5B
+0x73A2 = 0x4B5C
+0x73A5 = 0x4B5D
+0x73A6 = 0x4B5E
+0x73AA = 0x4B5F
+0x73AB = 0x4B60
+0x73AD = 0x4B61
+0x73B5 = 0x4B62
+0x73B7 = 0x4B63
+0x73B9 = 0x4B64
+0x73BC = 0x4B65
+0x73BD = 0x4B66
+0x73BF = 0x4B67
+0x73C5 = 0x4B68
+0x73C6 = 0x4B69
+0x73C9 = 0x4B6A
+0x73CB = 0x4B6B
+0x73CC = 0x4B6C
+0x73CF = 0x4B6D
+0x73D2 = 0x4B6E
+0x73D3 = 0x4B6F
+0x73D6 = 0x4B70
+0x73D9 = 0x4B71
+0x73DD = 0x4B72
+0x73E1 = 0x4B73
+0x73E3 = 0x4B74
+0x73E6 = 0x4B75
+0x73E7 = 0x4B76
+0x73E9 = 0x4B77
+0x73F4 = 0x4B78
+0x73F5 = 0x4B79
+0x73F7 = 0x4B7A
+0x73F9 = 0x4B7B
+0x73FA = 0x4B7C
+0x73FB = 0x4B7D
+0x73FD = 0x4B7E
+0x73FF = 0x4C21
+0x7400 = 0x4C22
+0x7401 = 0x4C23
+0x7404 = 0x4C24
+0x7407 = 0x4C25
+0x740A = 0x4C26
+0x7411 = 0x4C27
+0x741A = 0x4C28
+0x741B = 0x4C29
+0x7424 = 0x4C2A
+0x7426 = 0x4C2B
+0x7428 = 0x4C2C
+0x7429 = 0x4C2D
+0x742A = 0x4C2E
+0x742B = 0x4C2F
+0x742C = 0x4C30
+0x742D = 0x4C31
+0x742E = 0x4C32
+0x742F = 0x4C33
+0x7430 = 0x4C34
+0x7431 = 0x4C35
+0x7439 = 0x4C36
+0x7440 = 0x4C37
+0x7443 = 0x4C38
+0x7444 = 0x4C39
+0x7446 = 0x4C3A
+0x7447 = 0x4C3B
+0x744B = 0x4C3C
+0x744D = 0x4C3D
+0x7451 = 0x4C3E
+0x7452 = 0x4C3F
+0x7457 = 0x4C40
+0x745D = 0x4C41
+0x7462 = 0x4C42
+0x7466 = 0x4C43
+0x7467 = 0x4C44
+0x7468 = 0x4C45
+0x746B = 0x4C46
+0x746D = 0x4C47
+0x746E = 0x4C48
+0x7471 = 0x4C49
+0x7472 = 0x4C4A
+0x7480 = 0x4C4B
+0x7481 = 0x4C4C
+0x7485 = 0x4C4D
+0x7486 = 0x4C4E
+0x7487 = 0x4C4F
+0x7489 = 0x4C50
+0x748F = 0x4C51
+0x7490 = 0x4C52
+0x7491 = 0x4C53
+0x7492 = 0x4C54
+0x7498 = 0x4C55
+0x7499 = 0x4C56
+0x749A = 0x4C57
+0x749C = 0x4C58
+0x749F = 0x4C59
+0x74A0 = 0x4C5A
+0x74A1 = 0x4C5B
+0x74A3 = 0x4C5C
+0x74A6 = 0x4C5D
+0x74A8 = 0x4C5E
+0x74A9 = 0x4C5F
+0x74AA = 0x4C60
+0x74AB = 0x4C61
+0x74AE = 0x4C62
+0x74AF = 0x4C63
+0x74B1 = 0x4C64
+0x74B2 = 0x4C65
+0x74B5 = 0x4C66
+0x74B9 = 0x4C67
+0x74BB = 0x4C68
+0x74BF = 0x4C69
+0x74C8 = 0x4C6A
+0x74C9 = 0x4C6B
+0x74CC = 0x4C6C
+0x74D0 = 0x4C6D
+0x74D3 = 0x4C6E
+0x74D8 = 0x4C6F
+0x74DA = 0x4C70
+0x74DB = 0x4C71
+0x74DE = 0x4C72
+0x74DF = 0x4C73
+0x74E4 = 0x4C74
+0x74E8 = 0x4C75
+0x74EA = 0x4C76
+0x74EB = 0x4C77
+0x74EF = 0x4C78
+0x74F4 = 0x4C79
+0x74FA = 0x4C7A
+0x74FB = 0x4C7B
+0x74FC = 0x4C7C
+0x74FF = 0x4C7D
+0x7506 = 0x4C7E
+0x7512 = 0x4D21
+0x7516 = 0x4D22
+0x7517 = 0x4D23
+0x7520 = 0x4D24
+0x7521 = 0x4D25
+0x7524 = 0x4D26
+0x7527 = 0x4D27
+0x7529 = 0x4D28
+0x752A = 0x4D29
+0x752F = 0x4D2A
+0x7536 = 0x4D2B
+0x7539 = 0x4D2C
+0x753D = 0x4D2D
+0x753E = 0x4D2E
+0x753F = 0x4D2F
+0x7540 = 0x4D30
+0x7543 = 0x4D31
+0x7547 = 0x4D32
+0x7548 = 0x4D33
+0x754E = 0x4D34
+0x7550 = 0x4D35
+0x7552 = 0x4D36
+0x7557 = 0x4D37
+0x755E = 0x4D38
+0x755F = 0x4D39
+0x7561 = 0x4D3A
+0x756F = 0x4D3B
+0x7571 = 0x4D3C
+0x7579 = 0x4D3D
+0x757A = 0x4D3E
+0x757B = 0x4D3F
+0x757C = 0x4D40
+0x757D = 0x4D41
+0x757E = 0x4D42
+0x7581 = 0x4D43
+0x7585 = 0x4D44
+0x7590 = 0x4D45
+0x7592 = 0x4D46
+0x7593 = 0x4D47
+0x7595 = 0x4D48
+0x7599 = 0x4D49
+0x759C = 0x4D4A
+0x75A2 = 0x4D4B
+0x75A4 = 0x4D4C
+0x75B4 = 0x4D4D
+0x75BA = 0x4D4E
+0x75BF = 0x4D4F
+0x75C0 = 0x4D50
+0x75C1 = 0x4D51
+0x75C4 = 0x4D52
+0x75C6 = 0x4D53
+0x75CC = 0x4D54
+0x75CE = 0x4D55
+0x75CF = 0x4D56
+0x75D7 = 0x4D57
+0x75DC = 0x4D58
+0x75DF = 0x4D59
+0x75E0 = 0x4D5A
+0x75E1 = 0x4D5B
+0x75E4 = 0x4D5C
+0x75E7 = 0x4D5D
+0x75EC = 0x4D5E
+0x75EE = 0x4D5F
+0x75EF = 0x4D60
+0x75F1 = 0x4D61
+0x75F9 = 0x4D62
+0x7600 = 0x4D63
+0x7602 = 0x4D64
+0x7603 = 0x4D65
+0x7604 = 0x4D66
+0x7607 = 0x4D67
+0x7608 = 0x4D68
+0x760A = 0x4D69
+0x760C = 0x4D6A
+0x760F = 0x4D6B
+0x7612 = 0x4D6C
+0x7613 = 0x4D6D
+0x7615 = 0x4D6E
+0x7616 = 0x4D6F
+0x7619 = 0x4D70
+0x761B = 0x4D71
+0x761C = 0x4D72
+0x761D = 0x4D73
+0x761E = 0x4D74
+0x7623 = 0x4D75
+0x7625 = 0x4D76
+0x7626 = 0x4D77
+0x7629 = 0x4D78
+0x762D = 0x4D79
+0x7632 = 0x4D7A
+0x7633 = 0x4D7B
+0x7635 = 0x4D7C
+0x7638 = 0x4D7D
+0x7639 = 0x4D7E
+0x763A = 0x4E21
+0x763C = 0x4E22
+0x7640 = 0x4E24
+0x7641 = 0x4E25
+0x7643 = 0x4E26
+0x7644 = 0x4E27
+0x7645 = 0x4E28
+0x7649 = 0x4E29
+0x764A = 0x4E23
+0x764B = 0x4E2A
+0x7655 = 0x4E2B
+0x7659 = 0x4E2C
+0x765F = 0x4E2D
+0x7664 = 0x4E2E
+0x7665 = 0x4E2F
+0x766D = 0x4E30
+0x766E = 0x4E31
+0x766F = 0x4E32
+0x7671 = 0x4E33
+0x7674 = 0x4E34
+0x7681 = 0x4E35
+0x7685 = 0x4E36
+0x768C = 0x4E37
+0x768D = 0x4E38
+0x7695 = 0x4E39
+0x769B = 0x4E3A
+0x769C = 0x4E3B
+0x769D = 0x4E3C
+0x769F = 0x4E3D
+0x76A0 = 0x4E3E
+0x76A2 = 0x4E3F
+0x76A3 = 0x4E40
+0x76A4 = 0x4E41
+0x76A5 = 0x4E42
+0x76A6 = 0x4E43
+0x76A7 = 0x4E44
+0x76A8 = 0x4E45
+0x76AA = 0x4E46
+0x76AD = 0x4E47
+0x76BD = 0x4E48
+0x76C1 = 0x4E49
+0x76C5 = 0x4E4A
+0x76C9 = 0x4E4B
+0x76CB = 0x4E4C
+0x76CC = 0x4E4D
+0x76CE = 0x4E4E
+0x76D4 = 0x4E4F
+0x76D9 = 0x4E50
+0x76E0 = 0x4E51
+0x76E6 = 0x4E52
+0x76E8 = 0x4E53
+0x76EC = 0x4E54
+0x76F0 = 0x4E55
+0x76F1 = 0x4E56
+0x76F6 = 0x4E57
+0x76F9 = 0x4E58
+0x76FC = 0x4E59
+0x7700 = 0x4E5A
+0x7706 = 0x4E5B
+0x770A = 0x4E5C
+0x770E = 0x4E5D
+0x7712 = 0x4E5E
+0x7714 = 0x4E5F
+0x7715 = 0x4E60
+0x7717 = 0x4E61
+0x7719 = 0x4E62
+0x771A = 0x4E63
+0x771C = 0x4E64
+0x7722 = 0x4E65
+0x7728 = 0x4E66
+0x772D = 0x4E67
+0x772E = 0x4E68
+0x772F = 0x4E69
+0x7734 = 0x4E6A
+0x7735 = 0x4E6B
+0x7736 = 0x4E6C
+0x7739 = 0x4E6D
+0x773D = 0x4E6E
+0x773E = 0x4E6F
+0x7742 = 0x4E70
+0x7745 = 0x4E71
+0x7746 = 0x4E72
+0x774A = 0x4E73
+0x774D = 0x4E74
+0x774E = 0x4E75
+0x774F = 0x4E76
+0x7752 = 0x4E77
+0x7756 = 0x4E78
+0x7757 = 0x4E79
+0x775C = 0x4E7A
+0x775E = 0x4E7B
+0x775F = 0x4E7C
+0x7760 = 0x4E7D
+0x7762 = 0x4E7E
+0x7764 = 0x4F21
+0x7767 = 0x4F22
+0x776A = 0x4F23
+0x776C = 0x4F24
+0x7770 = 0x4F25
+0x7772 = 0x4F26
+0x7773 = 0x4F27
+0x7774 = 0x4F28
+0x777A = 0x4F29
+0x777D = 0x4F2A
+0x7780 = 0x4F2B
+0x7784 = 0x4F2C
+0x778C = 0x4F2D
+0x778D = 0x4F2E
+0x7794 = 0x4F2F
+0x7795 = 0x4F30
+0x7796 = 0x4F31
+0x779A = 0x4F32
+0x779F = 0x4F33
+0x77A2 = 0x4F34
+0x77A7 = 0x4F35
+0x77AA = 0x4F36
+0x77AE = 0x4F37
+0x77AF = 0x4F38
+0x77B1 = 0x4F39
+0x77B5 = 0x4F3A
+0x77BE = 0x4F3B
+0x77C3 = 0x4F3C
+0x77C9 = 0x4F3D
+0x77D1 = 0x4F3E
+0x77D2 = 0x4F3F
+0x77D5 = 0x4F40
+0x77D9 = 0x4F41
+0x77DE = 0x4F42
+0x77DF = 0x4F43
+0x77E0 = 0x4F44
+0x77E4 = 0x4F45
+0x77E6 = 0x4F46
+0x77EA = 0x4F47
+0x77EC = 0x4F48
+0x77F0 = 0x4F49
+0x77F1 = 0x4F4A
+0x77F4 = 0x4F4B
+0x77F8 = 0x4F4C
+0x77FB = 0x4F4D
+0x7805 = 0x4F4E
+0x7806 = 0x4F4F
+0x7809 = 0x4F50
+0x780D = 0x4F51
+0x780E = 0x4F52
+0x7811 = 0x4F53
+0x781D = 0x4F54
+0x7821 = 0x4F55
+0x7822 = 0x4F56
+0x7823 = 0x4F57
+0x782D = 0x4F58
+0x782E = 0x4F59
+0x7830 = 0x4F5A
+0x7835 = 0x4F5B
+0x7837 = 0x4F5C
+0x7843 = 0x4F5D
+0x7844 = 0x4F5E
+0x7847 = 0x4F5F
+0x7848 = 0x4F60
+0x784C = 0x4F61
+0x784E = 0x4F62
+0x7852 = 0x4F63
+0x785C = 0x4F64
+0x785E = 0x4F65
+0x7860 = 0x4F66
+0x7861 = 0x4F67
+0x7863 = 0x4F68
+0x7864 = 0x4F69
+0x7868 = 0x4F6A
+0x786A = 0x4F6B
+0x786E = 0x4F6C
+0x787A = 0x4F6D
+0x787E = 0x4F6E
+0x788A = 0x4F6F
+0x788F = 0x4F70
+0x7894 = 0x4F71
+0x7898 = 0x4F72
+0x789D = 0x4F74
+0x789E = 0x4F75
+0x789F = 0x4F76
+0x78A1 = 0x4F73
+0x78A4 = 0x4F77
+0x78A8 = 0x4F78
+0x78AC = 0x4F79
+0x78AD = 0x4F7A
+0x78B0 = 0x4F7B
+0x78B1 = 0x4F7C
+0x78B2 = 0x4F7D
+0x78B3 = 0x4F7E
+0x78BB = 0x5021
+0x78BD = 0x5022
+0x78BF = 0x5023
+0x78C7 = 0x5024
+0x78C8 = 0x5025
+0x78C9 = 0x5026
+0x78CC = 0x5027
+0x78CE = 0x5028
+0x78D2 = 0x5029
+0x78D3 = 0x502A
+0x78D5 = 0x502B
+0x78D6 = 0x502C
+0x78DB = 0x502E
+0x78DF = 0x502F
+0x78E0 = 0x5030
+0x78E1 = 0x5031
+0x78E4 = 0x502D
+0x78E6 = 0x5032
+0x78EA = 0x5033
+0x78F2 = 0x5034
+0x78F3 = 0x5035
+0x78F6 = 0x5037
+0x78F7 = 0x5038
+0x78FA = 0x5039
+0x78FB = 0x503A
+0x78FF = 0x503B
+0x7900 = 0x5036
+0x7906 = 0x503C
+0x790C = 0x503D
+0x7910 = 0x503E
+0x791A = 0x503F
+0x791C = 0x5040
+0x791E = 0x5041
+0x791F = 0x5042
+0x7920 = 0x5043
+0x7925 = 0x5044
+0x7927 = 0x5045
+0x7929 = 0x5046
+0x792D = 0x5047
+0x7931 = 0x5048
+0x7934 = 0x5049
+0x7935 = 0x504A
+0x793B = 0x504B
+0x793D = 0x504C
+0x793F = 0x504D
+0x7944 = 0x504E
+0x7945 = 0x504F
+0x7946 = 0x5050
+0x794A = 0x5051
+0x794B = 0x5052
+0x794F = 0x5053
+0x7951 = 0x5054
+0x7954 = 0x5055
+0x7958 = 0x5056
+0x795B = 0x5057
+0x795C = 0x5058
+0x7967 = 0x5059
+0x7969 = 0x505A
+0x796B = 0x505B
+0x7972 = 0x505C
+0x7979 = 0x505D
+0x797B = 0x505E
+0x797C = 0x505F
+0x797E = 0x5060
+0x798B = 0x5061
+0x798C = 0x5062
+0x7991 = 0x5063
+0x7993 = 0x5064
+0x7994 = 0x5065
+0x7995 = 0x5066
+0x7996 = 0x5067
+0x7998 = 0x5068
+0x799B = 0x5069
+0x799C = 0x506A
+0x79A1 = 0x506B
+0x79A8 = 0x506C
+0x79A9 = 0x506D
+0x79AB = 0x506E
+0x79AF = 0x506F
+0x79B1 = 0x5070
+0x79B4 = 0x5071
+0x79B8 = 0x5072
+0x79BB = 0x5073
+0x79C2 = 0x5074
+0x79C4 = 0x5075
+0x79C7 = 0x5076
+0x79C8 = 0x5077
+0x79CA = 0x5078
+0x79CF = 0x5079
+0x79D4 = 0x507A
+0x79D6 = 0x507B
+0x79DA = 0x507C
+0x79DD = 0x507D
+0x79DE = 0x507E
+0x79E0 = 0x5121
+0x79E2 = 0x5122
+0x79E5 = 0x5123
+0x79EA = 0x5124
+0x79EB = 0x5125
+0x79ED = 0x5126
+0x79F1 = 0x5127
+0x79F8 = 0x5128
+0x79FC = 0x5129
+0x7A02 = 0x512A
+0x7A03 = 0x512B
+0x7A07 = 0x512C
+0x7A09 = 0x512D
+0x7A0A = 0x512E
+0x7A0C = 0x512F
+0x7A11 = 0x5130
+0x7A15 = 0x5131
+0x7A1B = 0x5132
+0x7A1E = 0x5133
+0x7A21 = 0x5134
+0x7A27 = 0x5135
+0x7A2B = 0x5136
+0x7A2D = 0x5137
+0x7A2F = 0x5138
+0x7A30 = 0x5139
+0x7A34 = 0x513A
+0x7A35 = 0x513B
+0x7A38 = 0x513C
+0x7A39 = 0x513D
+0x7A3A = 0x513E
+0x7A44 = 0x513F
+0x7A45 = 0x5140
+0x7A47 = 0x5141
+0x7A48 = 0x5142
+0x7A4C = 0x5143
+0x7A55 = 0x5144
+0x7A56 = 0x5145
+0x7A59 = 0x5146
+0x7A5C = 0x5147
+0x7A5D = 0x5148
+0x7A5F = 0x5149
+0x7A60 = 0x514A
+0x7A65 = 0x514B
+0x7A67 = 0x514C
+0x7A6A = 0x514D
+0x7A6D = 0x514E
+0x7A75 = 0x514F
+0x7A78 = 0x5150
+0x7A7E = 0x5151
+0x7A80 = 0x5152
+0x7A82 = 0x5153
+0x7A85 = 0x5154
+0x7A86 = 0x5155
+0x7A8A = 0x5156
+0x7A8B = 0x5157
+0x7A90 = 0x5158
+0x7A91 = 0x5159
+0x7A94 = 0x515A
+0x7A9E = 0x515B
+0x7AA0 = 0x515C
+0x7AA3 = 0x515D
+0x7AAC = 0x515E
+0x7AB3 = 0x515F
+0x7AB5 = 0x5160
+0x7AB9 = 0x5161
+0x7ABB = 0x5162
+0x7ABC = 0x5163
+0x7AC6 = 0x5164
+0x7AC9 = 0x5165
+0x7ACC = 0x5166
+0x7ACE = 0x5167
+0x7AD1 = 0x5168
+0x7ADB = 0x5169
+0x7AE8 = 0x516A
+0x7AE9 = 0x516B
+0x7AEB = 0x516C
+0x7AEC = 0x516D
+0x7AF1 = 0x516E
+0x7AF4 = 0x516F
+0x7AFB = 0x5170
+0x7AFD = 0x5171
+0x7AFE = 0x5172
+0x7B07 = 0x5173
+0x7B14 = 0x5174
+0x7B1F = 0x5175
+0x7B23 = 0x5176
+0x7B27 = 0x5177
+0x7B29 = 0x5178
+0x7B2A = 0x5179
+0x7B2B = 0x517A
+0x7B2D = 0x517B
+0x7B2E = 0x517C
+0x7B2F = 0x517D
+0x7B30 = 0x517E
+0x7B31 = 0x5221
+0x7B34 = 0x5222
+0x7B3D = 0x5223
+0x7B3F = 0x5224
+0x7B40 = 0x5225
+0x7B41 = 0x5226
+0x7B47 = 0x5227
+0x7B4E = 0x5228
+0x7B55 = 0x5229
+0x7B60 = 0x522A
+0x7B64 = 0x522B
+0x7B66 = 0x522C
+0x7B69 = 0x522D
+0x7B6A = 0x522E
+0x7B6D = 0x522F
+0x7B6F = 0x5230
+0x7B72 = 0x5231
+0x7B73 = 0x5232
+0x7B77 = 0x5233
+0x7B84 = 0x5234
+0x7B89 = 0x5235
+0x7B8E = 0x5236
+0x7B90 = 0x5237
+0x7B91 = 0x5238
+0x7B96 = 0x5239
+0x7B9B = 0x523A
+0x7B9E = 0x523B
+0x7BA0 = 0x523C
+0x7BA5 = 0x523D
+0x7BAC = 0x523E
+0x7BAF = 0x523F
+0x7BB0 = 0x5240
+0x7BB2 = 0x5241
+0x7BB5 = 0x5242
+0x7BB6 = 0x5243
+0x7BBA = 0x5244
+0x7BBB = 0x5245
+0x7BBC = 0x5246
+0x7BBD = 0x5247
+0x7BC2 = 0x5248
+0x7BC5 = 0x5249
+0x7BC8 = 0x524A
+0x7BCA = 0x524B
+0x7BD4 = 0x524C
+0x7BD6 = 0x524D
+0x7BD7 = 0x524E
+0x7BD9 = 0x524F
+0x7BDA = 0x5250
+0x7BDB = 0x5251
+0x7BE8 = 0x5252
+0x7BEA = 0x5253
+0x7BF2 = 0x5254
+0x7BF4 = 0x5255
+0x7BF5 = 0x5256
+0x7BF8 = 0x5257
+0x7BF9 = 0x5258
+0x7BFA = 0x5259
+0x7BFC = 0x525A
+0x7BFE = 0x525B
+0x7C01 = 0x525C
+0x7C02 = 0x525D
+0x7C03 = 0x525E
+0x7C04 = 0x525F
+0x7C06 = 0x5260
+0x7C09 = 0x5261
+0x7C0B = 0x5262
+0x7C0C = 0x5263
+0x7C0E = 0x5264
+0x7C0F = 0x5265
+0x7C19 = 0x5266
+0x7C1B = 0x5267
+0x7C20 = 0x5268
+0x7C25 = 0x5269
+0x7C26 = 0x526A
+0x7C28 = 0x526B
+0x7C2C = 0x526C
+0x7C31 = 0x526D
+0x7C33 = 0x526E
+0x7C34 = 0x526F
+0x7C36 = 0x5270
+0x7C39 = 0x5271
+0x7C3A = 0x5272
+0x7C46 = 0x5273
+0x7C4A = 0x5274
+0x7C51 = 0x5276
+0x7C52 = 0x5277
+0x7C53 = 0x5278
+0x7C55 = 0x5275
+0x7C59 = 0x5279
+0x7C5A = 0x527A
+0x7C5B = 0x527B
+0x7C5C = 0x527C
+0x7C5D = 0x527D
+0x7C5E = 0x527E
+0x7C61 = 0x5321
+0x7C63 = 0x5322
+0x7C67 = 0x5323
+0x7C69 = 0x5324
+0x7C6D = 0x5325
+0x7C6E = 0x5326
+0x7C70 = 0x5327
+0x7C72 = 0x5328
+0x7C79 = 0x5329
+0x7C7C = 0x532A
+0x7C7D = 0x532B
+0x7C86 = 0x532C
+0x7C87 = 0x532D
+0x7C8F = 0x532E
+0x7C94 = 0x532F
+0x7C9E = 0x5330
+0x7CA0 = 0x5331
+0x7CA6 = 0x5332
+0x7CB0 = 0x5333
+0x7CB6 = 0x5334
+0x7CB7 = 0x5335
+0x7CBA = 0x5336
+0x7CBB = 0x5337
+0x7CBC = 0x5338
+0x7CBF = 0x5339
+0x7CC4 = 0x533A
+0x7CC7 = 0x533B
+0x7CC8 = 0x533C
+0x7CC9 = 0x533D
+0x7CCD = 0x533E
+0x7CCF = 0x533F
+0x7CD3 = 0x5340
+0x7CD4 = 0x5341
+0x7CD5 = 0x5342
+0x7CD7 = 0x5343
+0x7CD9 = 0x5344
+0x7CDA = 0x5345
+0x7CDD = 0x5346
+0x7CE6 = 0x5347
+0x7CE9 = 0x5348
+0x7CEB = 0x5349
+0x7CF5 = 0x534A
+0x7D03 = 0x534B
+0x7D07 = 0x534C
+0x7D08 = 0x534D
+0x7D09 = 0x534E
+0x7D0F = 0x534F
+0x7D11 = 0x5350
+0x7D12 = 0x5351
+0x7D13 = 0x5352
+0x7D16 = 0x5353
+0x7D1D = 0x5354
+0x7D1E = 0x5355
+0x7D23 = 0x5356
+0x7D26 = 0x5357
+0x7D2A = 0x5358
+0x7D2D = 0x5359
+0x7D31 = 0x535A
+0x7D3C = 0x535B
+0x7D3D = 0x535C
+0x7D3E = 0x535D
+0x7D40 = 0x535E
+0x7D41 = 0x535F
+0x7D47 = 0x5360
+0x7D48 = 0x5361
+0x7D4D = 0x5362
+0x7D51 = 0x5363
+0x7D53 = 0x5364
+0x7D57 = 0x5365
+0x7D59 = 0x5366
+0x7D5A = 0x5367
+0x7D5C = 0x5368
+0x7D5D = 0x5369
+0x7D65 = 0x536A
+0x7D67 = 0x536B
+0x7D6A = 0x536C
+0x7D70 = 0x536D
+0x7D78 = 0x536E
+0x7D7A = 0x536F
+0x7D7B = 0x5370
+0x7D7F = 0x5371
+0x7D81 = 0x5372
+0x7D82 = 0x5373
+0x7D83 = 0x5374
+0x7D85 = 0x5375
+0x7D86 = 0x5376
+0x7D88 = 0x5377
+0x7D8B = 0x5378
+0x7D8C = 0x5379
+0x7D8D = 0x537A
+0x7D91 = 0x537B
+0x7D96 = 0x537C
+0x7D97 = 0x537D
+0x7D9D = 0x537E
+0x7D9E = 0x5421
+0x7DA6 = 0x5422
+0x7DA7 = 0x5423
+0x7DAA = 0x5424
+0x7DB3 = 0x5425
+0x7DB6 = 0x5426
+0x7DB7 = 0x5427
+0x7DB9 = 0x5428
+0x7DC2 = 0x5429
+0x7DC3 = 0x542A
+0x7DC4 = 0x542B
+0x7DC5 = 0x542C
+0x7DC6 = 0x542D
+0x7DCC = 0x542E
+0x7DCD = 0x542F
+0x7DCE = 0x5430
+0x7DD7 = 0x5431
+0x7DD9 = 0x5432
+0x7DE2 = 0x5434
+0x7DE5 = 0x5435
+0x7DE6 = 0x5436
+0x7DEA = 0x5437
+0x7DEB = 0x5438
+0x7DED = 0x5439
+0x7DF1 = 0x543A
+0x7DF5 = 0x543B
+0x7DF6 = 0x543C
+0x7DF9 = 0x543D
+0x7DFA = 0x543E
+0x7E00 = 0x5433
+0x7E08 = 0x543F
+0x7E10 = 0x5440
+0x7E11 = 0x5441
+0x7E15 = 0x5442
+0x7E17 = 0x5443
+0x7E1C = 0x5444
+0x7E1D = 0x5445
+0x7E20 = 0x5446
+0x7E27 = 0x5447
+0x7E28 = 0x5448
+0x7E2C = 0x5449
+0x7E2D = 0x544A
+0x7E2F = 0x544B
+0x7E33 = 0x544C
+0x7E36 = 0x544D
+0x7E3F = 0x544E
+0x7E44 = 0x544F
+0x7E45 = 0x5450
+0x7E47 = 0x5451
+0x7E4E = 0x5452
+0x7E50 = 0x5453
+0x7E52 = 0x5454
+0x7E58 = 0x5455
+0x7E5F = 0x5456
+0x7E61 = 0x5457
+0x7E62 = 0x5458
+0x7E65 = 0x5459
+0x7E6B = 0x545A
+0x7E6E = 0x545B
+0x7E6F = 0x545C
+0x7E73 = 0x545D
+0x7E78 = 0x545E
+0x7E7E = 0x545F
+0x7E81 = 0x5460
+0x7E86 = 0x5461
+0x7E87 = 0x5462
+0x7E8A = 0x5463
+0x7E8D = 0x5464
+0x7E91 = 0x5465
+0x7E95 = 0x5466
+0x7E98 = 0x5467
+0x7E9A = 0x5468
+0x7E9D = 0x5469
+0x7E9E = 0x546A
+0x7F3B = 0x546C
+0x7F3C = 0x546B
+0x7F3D = 0x546D
+0x7F3E = 0x546E
+0x7F3F = 0x546F
+0x7F43 = 0x5470
+0x7F44 = 0x5471
+0x7F47 = 0x5472
+0x7F4F = 0x5473
+0x7F52 = 0x5474
+0x7F53 = 0x5475
+0x7F5B = 0x5476
+0x7F5C = 0x5477
+0x7F5D = 0x5478
+0x7F61 = 0x5479
+0x7F63 = 0x547A
+0x7F64 = 0x547B
+0x7F65 = 0x547C
+0x7F66 = 0x547D
+0x7F6D = 0x547E
+0x7F71 = 0x5521
+0x7F7D = 0x5522
+0x7F7E = 0x5523
+0x7F7F = 0x5524
+0x7F80 = 0x5525
+0x7F8B = 0x5526
+0x7F8D = 0x5527
+0x7F8F = 0x5528
+0x7F90 = 0x5529
+0x7F91 = 0x552A
+0x7F96 = 0x552B
+0x7F97 = 0x552C
+0x7F9C = 0x552D
+0x7FA1 = 0x552E
+0x7FA2 = 0x552F
+0x7FA6 = 0x5530
+0x7FAA = 0x5531
+0x7FAD = 0x5532
+0x7FB4 = 0x5533
+0x7FBC = 0x5534
+0x7FBF = 0x5535
+0x7FC0 = 0x5536
+0x7FC3 = 0x5537
+0x7FC8 = 0x5538
+0x7FCE = 0x5539
+0x7FCF = 0x553A
+0x7FDB = 0x553B
+0x7FDF = 0x553C
+0x7FE3 = 0x553D
+0x7FE5 = 0x553E
+0x7FE8 = 0x553F
+0x7FEC = 0x5540
+0x7FEE = 0x5541
+0x7FEF = 0x5542
+0x7FF2 = 0x5543
+0x7FFA = 0x5544
+0x7FFD = 0x5545
+0x7FFE = 0x5546
+0x7FFF = 0x5547
+0x8007 = 0x5548
+0x8008 = 0x5549
+0x800A = 0x554A
+0x800D = 0x554B
+0x800E = 0x554C
+0x800F = 0x554D
+0x8011 = 0x554E
+0x8013 = 0x554F
+0x8014 = 0x5550
+0x8016 = 0x5551
+0x801D = 0x5552
+0x801E = 0x5553
+0x801F = 0x5554
+0x8020 = 0x5555
+0x8024 = 0x5556
+0x8026 = 0x5557
+0x802C = 0x5558
+0x802E = 0x5559
+0x8030 = 0x555A
+0x8034 = 0x555B
+0x8035 = 0x555C
+0x8037 = 0x555D
+0x8039 = 0x555E
+0x803A = 0x555F
+0x803C = 0x5560
+0x803E = 0x5561
+0x8040 = 0x5562
+0x8044 = 0x5563
+0x8060 = 0x5564
+0x8064 = 0x5565
+0x8066 = 0x5566
+0x806D = 0x5567
+0x8071 = 0x5568
+0x8075 = 0x5569
+0x8081 = 0x556A
+0x8088 = 0x556B
+0x808E = 0x556C
+0x809C = 0x556D
+0x809E = 0x556E
+0x80A6 = 0x556F
+0x80A7 = 0x5570
+0x80AB = 0x5571
+0x80B8 = 0x5572
+0x80B9 = 0x5573
+0x80C8 = 0x5574
+0x80CD = 0x5575
+0x80CF = 0x5576
+0x80D2 = 0x5577
+0x80D4 = 0x5578
+0x80D5 = 0x5579
+0x80D7 = 0x557A
+0x80D8 = 0x557B
+0x80E0 = 0x557C
+0x80ED = 0x557D
+0x80EE = 0x557E
+0x80F0 = 0x5621
+0x80F2 = 0x5622
+0x80F3 = 0x5623
+0x80F6 = 0x5624
+0x80F9 = 0x5625
+0x80FA = 0x5626
+0x80FE = 0x5627
+0x8103 = 0x5628
+0x810B = 0x5629
+0x8116 = 0x562A
+0x8117 = 0x562B
+0x8118 = 0x562C
+0x811C = 0x562D
+0x811E = 0x562E
+0x8120 = 0x562F
+0x8124 = 0x5630
+0x8127 = 0x5631
+0x812C = 0x5632
+0x8130 = 0x5633
+0x8135 = 0x5634
+0x813A = 0x5635
+0x813C = 0x5636
+0x8145 = 0x5637
+0x8147 = 0x5638
+0x814A = 0x5639
+0x814C = 0x563A
+0x8152 = 0x563B
+0x8157 = 0x563C
+0x8160 = 0x563D
+0x8161 = 0x563E
+0x8167 = 0x563F
+0x8168 = 0x5640
+0x8169 = 0x5641
+0x816D = 0x5642
+0x816F = 0x5643
+0x8177 = 0x5644
+0x8181 = 0x5645
+0x8184 = 0x5647
+0x8185 = 0x5648
+0x8186 = 0x5649
+0x818B = 0x564A
+0x818E = 0x564B
+0x8190 = 0x5646
+0x8196 = 0x564C
+0x8198 = 0x564D
+0x819B = 0x564E
+0x819E = 0x564F
+0x81A2 = 0x5650
+0x81AE = 0x5651
+0x81B2 = 0x5652
+0x81B4 = 0x5653
+0x81BB = 0x5654
+0x81C3 = 0x5656
+0x81C5 = 0x5657
+0x81CA = 0x5658
+0x81CB = 0x5655
+0x81CE = 0x5659
+0x81CF = 0x565A
+0x81D5 = 0x565B
+0x81D7 = 0x565C
+0x81DB = 0x565D
+0x81DD = 0x565E
+0x81DE = 0x565F
+0x81E1 = 0x5660
+0x81E4 = 0x5661
+0x81EB = 0x5662
+0x81EC = 0x5663
+0x81F0 = 0x5664
+0x81F1 = 0x5665
+0x81F2 = 0x5666
+0x81F5 = 0x5667
+0x81F6 = 0x5668
+0x81F8 = 0x5669
+0x81F9 = 0x566A
+0x81FD = 0x566B
+0x81FF = 0x566C
+0x8200 = 0x566D
+0x8203 = 0x566E
+0x820F = 0x566F
+0x8213 = 0x5670
+0x8214 = 0x5671
+0x8219 = 0x5672
+0x821A = 0x5673
+0x821D = 0x5674
+0x8221 = 0x5675
+0x8222 = 0x5676
+0x8228 = 0x5677
+0x8232 = 0x5678
+0x8234 = 0x5679
+0x823A = 0x567A
+0x8243 = 0x567B
+0x8244 = 0x567C
+0x8245 = 0x567D
+0x8246 = 0x567E
+0x824B = 0x5721
+0x824E = 0x5722
+0x824F = 0x5723
+0x8251 = 0x5724
+0x8256 = 0x5725
+0x825C = 0x5726
+0x8260 = 0x5727
+0x8263 = 0x5728
+0x8267 = 0x5729
+0x826D = 0x572A
+0x8274 = 0x572B
+0x827B = 0x572C
+0x827D = 0x572D
+0x827F = 0x572E
+0x8280 = 0x572F
+0x8281 = 0x5730
+0x8283 = 0x5731
+0x8284 = 0x5732
+0x8287 = 0x5733
+0x8289 = 0x5734
+0x828A = 0x5735
+0x828E = 0x5736
+0x8291 = 0x5737
+0x8294 = 0x5738
+0x8296 = 0x5739
+0x8298 = 0x573A
+0x829A = 0x573B
+0x829B = 0x573C
+0x82A0 = 0x573D
+0x82A1 = 0x573E
+0x82A3 = 0x573F
+0x82A4 = 0x5740
+0x82A7 = 0x5741
+0x82A8 = 0x5742
+0x82A9 = 0x5743
+0x82AA = 0x5744
+0x82AE = 0x5745
+0x82B0 = 0x5746
+0x82B2 = 0x5747
+0x82B4 = 0x5748
+0x82B7 = 0x5749
+0x82BA = 0x574A
+0x82BC = 0x574B
+0x82BE = 0x574C
+0x82BF = 0x574D
+0x82C6 = 0x574E
+0x82D0 = 0x574F
+0x82D5 = 0x5750
+0x82DA = 0x5751
+0x82E0 = 0x5752
+0x82E2 = 0x5753
+0x82E4 = 0x5754
+0x82E8 = 0x5755
+0x82EA = 0x5756
+0x82ED = 0x5757
+0x82EF = 0x5758
+0x82F6 = 0x5759
+0x82F7 = 0x575A
+0x82FD = 0x575B
+0x82FE = 0x575C
+0x8300 = 0x575D
+0x8301 = 0x575E
+0x8307 = 0x575F
+0x8308 = 0x5760
+0x830A = 0x5761
+0x830B = 0x5762
+0x831B = 0x5764
+0x831D = 0x5765
+0x831E = 0x5766
+0x831F = 0x5767
+0x8321 = 0x5768
+0x8322 = 0x5769
+0x832C = 0x576A
+0x832D = 0x576B
+0x832E = 0x576C
+0x8330 = 0x576D
+0x8333 = 0x576E
+0x8337 = 0x576F
+0x833A = 0x5770
+0x833C = 0x5771
+0x833D = 0x5772
+0x8342 = 0x5773
+0x8343 = 0x5774
+0x8344 = 0x5775
+0x8347 = 0x5776
+0x834D = 0x5777
+0x834E = 0x5778
+0x8351 = 0x5779
+0x8353 = 0x583E
+0x8354 = 0x5763
+0x8355 = 0x577A
+0x8356 = 0x577B
+0x8357 = 0x577C
+0x8370 = 0x577D
+0x8378 = 0x577E
+0x837D = 0x5821
+0x837F = 0x5822
+0x8380 = 0x5823
+0x8382 = 0x5824
+0x8384 = 0x5825
+0x8386 = 0x5826
+0x838D = 0x5827
+0x8392 = 0x5828
+0x8394 = 0x5829
+0x8395 = 0x582A
+0x8398 = 0x582B
+0x8399 = 0x582C
+0x839B = 0x582D
+0x839C = 0x582E
+0x839D = 0x582F
+0x83A6 = 0x5830
+0x83A7 = 0x5831
+0x83A9 = 0x5832
+0x83AC = 0x5833
+0x83AD = 0x584C
+0x83BE = 0x5834
+0x83BF = 0x5835
+0x83C0 = 0x5836
+0x83C7 = 0x5837
+0x83C9 = 0x5838
+0x83CF = 0x5839
+0x83D0 = 0x583A
+0x83D1 = 0x583B
+0x83D4 = 0x583C
+0x83DD = 0x583D
+0x83E8 = 0x583F
+0x83EA = 0x5840
+0x83F6 = 0x5841
+0x83F8 = 0x5842
+0x83F9 = 0x5843
+0x83FC = 0x5844
+0x8401 = 0x5845
+0x8406 = 0x5846
+0x840A = 0x5847
+0x840F = 0x5848
+0x8411 = 0x5849
+0x8415 = 0x584A
+0x8419 = 0x584B
+0x842F = 0x584D
+0x8439 = 0x584E
+0x8445 = 0x584F
+0x8447 = 0x5850
+0x8448 = 0x5851
+0x844A = 0x5852
+0x844D = 0x5853
+0x844F = 0x5854
+0x8451 = 0x5855
+0x8452 = 0x5856
+0x8456 = 0x5857
+0x8458 = 0x5858
+0x8459 = 0x5859
+0x845A = 0x585A
+0x845C = 0x585B
+0x8460 = 0x585C
+0x8464 = 0x585D
+0x8465 = 0x585E
+0x8467 = 0x585F
+0x846A = 0x5860
+0x8470 = 0x5861
+0x8473 = 0x5862
+0x8474 = 0x5863
+0x8476 = 0x5864
+0x8478 = 0x5865
+0x847C = 0x5866
+0x847D = 0x5867
+0x8481 = 0x5868
+0x8485 = 0x5869
+0x8492 = 0x586A
+0x8493 = 0x586B
+0x8495 = 0x586C
+0x849E = 0x586D
+0x84A6 = 0x586E
+0x84A8 = 0x586F
+0x84A9 = 0x5870
+0x84AA = 0x5871
+0x84AF = 0x5872
+0x84B1 = 0x5873
+0x84B4 = 0x5874
+0x84BA = 0x5875
+0x84BD = 0x5876
+0x84BE = 0x5877
+0x84C0 = 0x5878
+0x84C2 = 0x5879
+0x84C7 = 0x587A
+0x84C8 = 0x587B
+0x84CC = 0x587C
+0x84CF = 0x587D
+0x84D3 = 0x587E
+0x84DC = 0x5921
+0x84E7 = 0x5922
+0x84EA = 0x5923
+0x84EF = 0x5924
+0x84F0 = 0x5925
+0x84F1 = 0x5926
+0x84F2 = 0x5927
+0x84F7 = 0x5928
+0x84FA = 0x592A
+0x84FB = 0x592B
+0x84FD = 0x592C
+0x8502 = 0x592D
+0x8503 = 0x592E
+0x8507 = 0x592F
+0x850C = 0x5930
+0x850E = 0x5931
+0x8510 = 0x5932
+0x851C = 0x5933
+0x851E = 0x5934
+0x8522 = 0x5935
+0x8523 = 0x5936
+0x8524 = 0x5937
+0x8525 = 0x5938
+0x8527 = 0x5939
+0x852A = 0x593A
+0x852B = 0x593B
+0x852F = 0x593C
+0x8532 = 0x5929
+0x8533 = 0x593D
+0x8534 = 0x593E
+0x8536 = 0x593F
+0x853F = 0x5940
+0x8546 = 0x5941
+0x854F = 0x5942
+0x8550 = 0x5943
+0x8551 = 0x5944
+0x8552 = 0x5945
+0x8553 = 0x5946
+0x8556 = 0x5947
+0x8559 = 0x5948
+0x855C = 0x5949
+0x855D = 0x594A
+0x855E = 0x594B
+0x855F = 0x594C
+0x8560 = 0x594D
+0x8561 = 0x594E
+0x8562 = 0x594F
+0x8564 = 0x5950
+0x856B = 0x5951
+0x856F = 0x5952
+0x8579 = 0x5953
+0x857A = 0x5954
+0x857B = 0x5955
+0x857D = 0x5956
+0x857F = 0x5957
+0x8581 = 0x5958
+0x8585 = 0x5959
+0x8586 = 0x595A
+0x8589 = 0x595B
+0x858B = 0x595C
+0x858C = 0x595D
+0x858F = 0x595E
+0x8593 = 0x595F
+0x8598 = 0x5960
+0x859D = 0x5961
+0x859F = 0x5962
+0x85A0 = 0x5963
+0x85A2 = 0x5964
+0x85A5 = 0x5965
+0x85A7 = 0x5966
+0x85AD = 0x5974
+0x85B4 = 0x5967
+0x85B6 = 0x5968
+0x85B7 = 0x5969
+0x85B8 = 0x596A
+0x85BC = 0x596B
+0x85BD = 0x596C
+0x85BE = 0x596D
+0x85BF = 0x596E
+0x85C2 = 0x596F
+0x85C7 = 0x5970
+0x85CA = 0x5971
+0x85CB = 0x5972
+0x85CE = 0x5973
+0x85D8 = 0x5975
+0x85DA = 0x5976
+0x85DF = 0x5977
+0x85E0 = 0x5978
+0x85E6 = 0x5979
+0x85E8 = 0x597A
+0x85ED = 0x597B
+0x85F3 = 0x597C
+0x85F6 = 0x597D
+0x85FC = 0x597E
+0x85FF = 0x5A21
+0x8600 = 0x5A22
+0x8604 = 0x5A23
+0x8605 = 0x5A24
+0x860D = 0x5A25
+0x860E = 0x5A26
+0x8610 = 0x5A27
+0x8611 = 0x5A28
+0x8612 = 0x5A29
+0x8618 = 0x5A2A
+0x8619 = 0x5A2B
+0x861B = 0x5A2C
+0x861E = 0x5A2D
+0x8621 = 0x5A2E
+0x8627 = 0x5A2F
+0x8629 = 0x5A30
+0x8636 = 0x5A31
+0x8638 = 0x5A32
+0x863A = 0x5A33
+0x863C = 0x5A34
+0x863D = 0x5A35
+0x8640 = 0x5A36
+0x8641 = 0x3866
+0x8642 = 0x5A37
+0x8646 = 0x5A38
+0x8652 = 0x5A39
+0x8653 = 0x5A3A
+0x8656 = 0x5A3B
+0x8657 = 0x5A3C
+0x8658 = 0x5A3D
+0x8659 = 0x5A3E
+0x865D = 0x5A3F
+0x8660 = 0x5A40
+0x8661 = 0x5A41
+0x8662 = 0x5A42
+0x8663 = 0x5A43
+0x8664 = 0x5A44
+0x8669 = 0x5A45
+0x866C = 0x5A46
+0x866F = 0x5A47
+0x8675 = 0x5A48
+0x8676 = 0x5A49
+0x8677 = 0x5A4A
+0x867A = 0x5A4B
+0x8688 = 0x5A6D
+0x868D = 0x5A4C
+0x8691 = 0x5A4D
+0x8696 = 0x5A4E
+0x8698 = 0x5A4F
+0x869A = 0x5A50
+0x869C = 0x5A51
+0x86A1 = 0x5A52
+0x86A6 = 0x5A53
+0x86A7 = 0x5A54
+0x86A8 = 0x5A55
+0x86AD = 0x5A56
+0x86B1 = 0x5A57
+0x86B3 = 0x5A58
+0x86B4 = 0x5A59
+0x86B5 = 0x5A5A
+0x86B7 = 0x5A5B
+0x86B8 = 0x5A5C
+0x86B9 = 0x5A5D
+0x86BF = 0x5A5E
+0x86C0 = 0x5A5F
+0x86C1 = 0x5A60
+0x86C3 = 0x5A61
+0x86C5 = 0x5A62
+0x86D1 = 0x5A63
+0x86D2 = 0x5A64
+0x86D5 = 0x5A65
+0x86D7 = 0x5A66
+0x86DA = 0x5A67
+0x86DC = 0x5A68
+0x86E0 = 0x5A69
+0x86E3 = 0x5A6A
+0x86E5 = 0x5A6B
+0x86E7 = 0x5A6C
+0x86FA = 0x5A6E
+0x86FC = 0x5A6F
+0x86FD = 0x5A70
+0x8704 = 0x5A71
+0x8705 = 0x5A72
+0x8707 = 0x5A73
+0x870B = 0x5A74
+0x870E = 0x5A75
+0x870F = 0x5A76
+0x8710 = 0x5A77
+0x8713 = 0x5A78
+0x8714 = 0x5A79
+0x8719 = 0x5A7A
+0x871E = 0x5A7B
+0x871F = 0x5A7C
+0x8721 = 0x5A7D
+0x8723 = 0x5A7E
+0x8728 = 0x5B21
+0x872E = 0x5B22
+0x872F = 0x5B23
+0x8731 = 0x5B24
+0x8732 = 0x5B25
+0x8739 = 0x5B26
+0x873A = 0x5B27
+0x873C = 0x5B28
+0x873D = 0x5B29
+0x873E = 0x5B2A
+0x8740 = 0x5B2B
+0x8743 = 0x5B2C
+0x8745 = 0x5B2D
+0x874D = 0x5B2E
+0x8758 = 0x5B2F
+0x875D = 0x5B30
+0x8761 = 0x5B31
+0x8764 = 0x5B32
+0x8765 = 0x5B33
+0x876F = 0x5B34
+0x8771 = 0x5B35
+0x8772 = 0x5B36
+0x877B = 0x5B37
+0x8783 = 0x5B38
+0x8784 = 0x5B39
+0x8785 = 0x5B3A
+0x8786 = 0x5B3B
+0x8787 = 0x5B3C
+0x8788 = 0x5B3D
+0x8789 = 0x5B3E
+0x878B = 0x5B3F
+0x878C = 0x5B40
+0x8790 = 0x5B41
+0x8793 = 0x5B42
+0x8795 = 0x5B43
+0x8797 = 0x5B44
+0x8798 = 0x5B45
+0x8799 = 0x5B46
+0x879E = 0x5B47
+0x87A0 = 0x5B48
+0x87A3 = 0x5B49
+0x87A7 = 0x5B4A
+0x87AC = 0x5B4B
+0x87AD = 0x5B4C
+0x87AE = 0x5B4D
+0x87B1 = 0x5B4E
+0x87B5 = 0x5B4F
+0x87BE = 0x5B50
+0x87BF = 0x5B51
+0x87C1 = 0x5B52
+0x87C8 = 0x5B53
+0x87C9 = 0x5B54
+0x87CA = 0x5B55
+0x87CE = 0x5B56
+0x87D5 = 0x5B57
+0x87D6 = 0x5B58
+0x87D9 = 0x5B59
+0x87DA = 0x5B5A
+0x87DC = 0x5B5B
+0x87DF = 0x5B5C
+0x87E2 = 0x5B5D
+0x87E3 = 0x5B5E
+0x87E4 = 0x5B5F
+0x87EA = 0x5B60
+0x87EB = 0x5B61
+0x87ED = 0x5B62
+0x87F1 = 0x5B63
+0x87F3 = 0x5B64
+0x87F8 = 0x5B65
+0x87FA = 0x5B66
+0x87FF = 0x5B67
+0x8801 = 0x5B68
+0x8803 = 0x5B69
+0x8806 = 0x5B6A
+0x8809 = 0x5B6B
+0x880A = 0x5B6C
+0x880B = 0x5B6D
+0x8810 = 0x5B6E
+0x8812 = 0x5B70
+0x8813 = 0x5B71
+0x8814 = 0x5B72
+0x8818 = 0x5B73
+0x8819 = 0x5B6F
+0x881A = 0x5B74
+0x881B = 0x5B75
+0x881C = 0x5B76
+0x881E = 0x5B77
+0x881F = 0x5B78
+0x8828 = 0x5B79
+0x882D = 0x5B7A
+0x882E = 0x5B7B
+0x8830 = 0x5B7C
+0x8832 = 0x5B7D
+0x8835 = 0x5B7E
+0x883A = 0x5C21
+0x883C = 0x5C22
+0x8841 = 0x5C23
+0x8843 = 0x5C24
+0x8845 = 0x5C25
+0x8848 = 0x5C26
+0x8849 = 0x5C27
+0x884A = 0x5C28
+0x884B = 0x5C29
+0x884E = 0x5C2A
+0x8851 = 0x5C2B
+0x8855 = 0x5C2C
+0x8856 = 0x5C2D
+0x8858 = 0x5C2E
+0x885A = 0x5C2F
+0x885C = 0x5C30
+0x885F = 0x5C31
+0x8860 = 0x5C32
+0x8864 = 0x5C33
+0x8869 = 0x5C34
+0x8871 = 0x5C35
+0x8879 = 0x5C36
+0x887B = 0x5C37
+0x8880 = 0x5C38
+0x8898 = 0x5C39
+0x889A = 0x5C3A
+0x889B = 0x5C3B
+0x889C = 0x5C3C
+0x889F = 0x5C3D
+0x88A0 = 0x5C3E
+0x88A8 = 0x5C3F
+0x88AA = 0x5C40
+0x88BA = 0x5C41
+0x88BD = 0x5C42
+0x88BE = 0x5C43
+0x88C0 = 0x5C44
+0x88CA = 0x5C45
+0x88CB = 0x5C46
+0x88CC = 0x5C47
+0x88CD = 0x5C48
+0x88CE = 0x5C49
+0x88D1 = 0x5C4A
+0x88D2 = 0x5C4B
+0x88D3 = 0x5C4C
+0x88DB = 0x5C4D
+0x88DE = 0x5C4E
+0x88E7 = 0x5C4F
+0x88EF = 0x5C50
+0x88F0 = 0x5C51
+0x88F1 = 0x5C52
+0x88F5 = 0x5C53
+0x88F7 = 0x5C54
+0x8901 = 0x5C55
+0x8906 = 0x5C56
+0x890D = 0x5C57
+0x890E = 0x5C58
+0x890F = 0x5C59
+0x8915 = 0x5C5A
+0x8916 = 0x5C5B
+0x8918 = 0x5C5C
+0x8919 = 0x5C5D
+0x891A = 0x5C5E
+0x891C = 0x5C5F
+0x8920 = 0x5C60
+0x8926 = 0x5C61
+0x8927 = 0x5C62
+0x8928 = 0x5C63
+0x8930 = 0x5C64
+0x8931 = 0x5C65
+0x8932 = 0x5C66
+0x8935 = 0x5C67
+0x8939 = 0x5C68
+0x893A = 0x5C69
+0x893E = 0x5C6A
+0x8940 = 0x5C6B
+0x8942 = 0x5C6C
+0x8945 = 0x5C6D
+0x8946 = 0x5C6E
+0x8949 = 0x5C6F
+0x894F = 0x5C70
+0x8952 = 0x5C71
+0x8957 = 0x5C72
+0x895A = 0x5C73
+0x895B = 0x5C74
+0x895C = 0x5C75
+0x8961 = 0x5C76
+0x8962 = 0x5C77
+0x8963 = 0x5C78
+0x896B = 0x5C79
+0x896E = 0x5C7A
+0x8970 = 0x5C7B
+0x8973 = 0x5C7C
+0x8975 = 0x5C7D
+0x897A = 0x5C7E
+0x897B = 0x5D21
+0x897C = 0x5D22
+0x897D = 0x5D23
+0x8989 = 0x5D24
+0x898D = 0x5D25
+0x8990 = 0x5D26
+0x8994 = 0x5D27
+0x8995 = 0x5D28
+0x899B = 0x5D29
+0x899C = 0x5D2A
+0x899F = 0x5D2B
+0x89A0 = 0x5D2C
+0x89A5 = 0x5D2D
+0x89B0 = 0x5D2E
+0x89B4 = 0x5D2F
+0x89B5 = 0x5D30
+0x89B6 = 0x5D31
+0x89B7 = 0x5D32
+0x89BC = 0x5D33
+0x89D4 = 0x5D34
+0x89D5 = 0x5D35
+0x89D6 = 0x5D36
+0x89D7 = 0x5D37
+0x89D8 = 0x5D38
+0x89E5 = 0x5D39
+0x89E9 = 0x5D3A
+0x89EB = 0x5D3B
+0x89ED = 0x5D3C
+0x89F1 = 0x5D3D
+0x89F3 = 0x5D3E
+0x89F6 = 0x5D3F
+0x89F9 = 0x5D40
+0x89FD = 0x5D41
+0x89FF = 0x5D42
+0x8A04 = 0x5D43
+0x8A05 = 0x5D44
+0x8A07 = 0x5D45
+0x8A0F = 0x5D46
+0x8A11 = 0x5D47
+0x8A12 = 0x5D48
+0x8A14 = 0x5D49
+0x8A15 = 0x5D4A
+0x8A1E = 0x5D4B
+0x8A20 = 0x5D4C
+0x8A22 = 0x5D4D
+0x8A24 = 0x5D4E
+0x8A26 = 0x5D4F
+0x8A2B = 0x5D50
+0x8A2C = 0x5D51
+0x8A2F = 0x5D52
+0x8A35 = 0x5D53
+0x8A37 = 0x5D54
+0x8A3D = 0x5D55
+0x8A3E = 0x5D56
+0x8A40 = 0x5D57
+0x8A43 = 0x5D58
+0x8A45 = 0x5D59
+0x8A47 = 0x5D5A
+0x8A49 = 0x5D5B
+0x8A4D = 0x5D5C
+0x8A4E = 0x5D5D
+0x8A53 = 0x5D5E
+0x8A56 = 0x5D5F
+0x8A57 = 0x5D60
+0x8A58 = 0x5D61
+0x8A5C = 0x5D62
+0x8A5D = 0x5D63
+0x8A61 = 0x5D64
+0x8A65 = 0x5D65
+0x8A67 = 0x5D66
+0x8A75 = 0x5D67
+0x8A76 = 0x5D68
+0x8A77 = 0x5D69
+0x8A79 = 0x5D6A
+0x8A7A = 0x5D6B
+0x8A7B = 0x5D6C
+0x8A7E = 0x5D6D
+0x8A7F = 0x5D6E
+0x8A80 = 0x5D6F
+0x8A83 = 0x5D70
+0x8A86 = 0x5D71
+0x8A8B = 0x5D72
+0x8A8F = 0x5D73
+0x8A90 = 0x5D74
+0x8A92 = 0x5D75
+0x8A96 = 0x5D76
+0x8A97 = 0x5D77
+0x8A99 = 0x5D78
+0x8A9F = 0x5D79
+0x8AA7 = 0x5D7A
+0x8AA9 = 0x5D7B
+0x8AAE = 0x5D7C
+0x8AAF = 0x5D7D
+0x8AB3 = 0x5D7E
+0x8AB6 = 0x5E21
+0x8AB7 = 0x5E22
+0x8ABB = 0x5E23
+0x8ABE = 0x5E24
+0x8AC3 = 0x5E25
+0x8AC6 = 0x5E26
+0x8AC8 = 0x5E27
+0x8AC9 = 0x5E28
+0x8ACA = 0x5E29
+0x8AD1 = 0x5E2A
+0x8AD3 = 0x5E2B
+0x8AD4 = 0x5E2C
+0x8AD5 = 0x5E2D
+0x8AD7 = 0x5E2E
+0x8ADD = 0x5E2F
+0x8ADF = 0x5E30
+0x8AEC = 0x5E31
+0x8AF0 = 0x5E32
+0x8AF4 = 0x5E33
+0x8AF5 = 0x5E34
+0x8AF6 = 0x5E35
+0x8AFC = 0x5E36
+0x8AFF = 0x5E37
+0x8B05 = 0x5E38
+0x8B06 = 0x5E39
+0x8B0A = 0x5E3F
+0x8B0B = 0x5E3A
+0x8B11 = 0x5E3B
+0x8B1C = 0x5E3C
+0x8B1E = 0x5E3D
+0x8B1F = 0x5E3E
+0x8B2D = 0x5E40
+0x8B30 = 0x5E41
+0x8B37 = 0x5E42
+0x8B3C = 0x5E43
+0x8B42 = 0x5E44
+0x8B43 = 0x5E45
+0x8B44 = 0x5E46
+0x8B45 = 0x5E47
+0x8B46 = 0x5E48
+0x8B48 = 0x5E49
+0x8B4D = 0x5E4E
+0x8B52 = 0x5E4A
+0x8B53 = 0x5E4B
+0x8B54 = 0x5E4C
+0x8B59 = 0x5E4D
+0x8B5E = 0x5E4F
+0x8B63 = 0x5E50
+0x8B6D = 0x5E51
+0x8B76 = 0x5E52
+0x8B78 = 0x5E53
+0x8B79 = 0x5E54
+0x8B7C = 0x5E55
+0x8B7E = 0x5E56
+0x8B81 = 0x5E57
+0x8B84 = 0x5E58
+0x8B85 = 0x5E59
+0x8B8B = 0x5E5A
+0x8B8D = 0x5E5B
+0x8B8F = 0x5E5C
+0x8B94 = 0x5E5D
+0x8B95 = 0x5E5E
+0x8B9C = 0x5E5F
+0x8B9E = 0x5E60
+0x8B9F = 0x5E61
+0x8C38 = 0x5E62
+0x8C39 = 0x5E63
+0x8C3D = 0x5E64
+0x8C3E = 0x5E65
+0x8C45 = 0x5E66
+0x8C47 = 0x5E67
+0x8C49 = 0x5E68
+0x8C4B = 0x5E69
+0x8C4F = 0x5E6A
+0x8C51 = 0x5E6B
+0x8C53 = 0x5E6C
+0x8C54 = 0x5E6D
+0x8C57 = 0x5E6E
+0x8C58 = 0x5E6F
+0x8C59 = 0x5E72
+0x8C5B = 0x5E70
+0x8C5D = 0x5E71
+0x8C63 = 0x5E73
+0x8C64 = 0x5E74
+0x8C66 = 0x5E75
+0x8C68 = 0x5E76
+0x8C69 = 0x5E77
+0x8C6D = 0x5E78
+0x8C73 = 0x5E79
+0x8C75 = 0x5E7A
+0x8C76 = 0x5E7B
+0x8C7B = 0x5E7C
+0x8C7E = 0x5E7D
+0x8C86 = 0x5E7E
+0x8C87 = 0x5F21
+0x8C8B = 0x5F22
+0x8C90 = 0x5F23
+0x8C92 = 0x5F24
+0x8C93 = 0x5F25
+0x8C99 = 0x5F26
+0x8C9B = 0x5F27
+0x8C9C = 0x5F28
+0x8CA4 = 0x5F29
+0x8CB9 = 0x5F2A
+0x8CBA = 0x5F2B
+0x8CC5 = 0x5F2C
+0x8CC6 = 0x5F2D
+0x8CC9 = 0x5F2E
+0x8CCB = 0x5F2F
+0x8CCF = 0x5F30
+0x8CD5 = 0x5F32
+0x8CD6 = 0x5F31
+0x8CD9 = 0x5F33
+0x8CDD = 0x5F34
+0x8CE1 = 0x5F35
+0x8CE8 = 0x5F36
+0x8CEC = 0x5F37
+0x8CEF = 0x5F38
+0x8CF0 = 0x5F39
+0x8CF2 = 0x5F3A
+0x8CF5 = 0x5F3B
+0x8CF7 = 0x5F3C
+0x8CF8 = 0x5F3D
+0x8CFE = 0x5F3E
+0x8CFF = 0x5F3F
+0x8D01 = 0x5F40
+0x8D03 = 0x5F41
+0x8D09 = 0x5F42
+0x8D12 = 0x5F43
+0x8D17 = 0x5F44
+0x8D1B = 0x5F45
+0x8D65 = 0x5F46
+0x8D69 = 0x5F47
+0x8D6C = 0x5F48
+0x8D6E = 0x5F49
+0x8D7F = 0x5F4A
+0x8D82 = 0x5F4B
+0x8D84 = 0x5F4C
+0x8D88 = 0x5F4D
+0x8D8D = 0x5F4E
+0x8D90 = 0x5F4F
+0x8D91 = 0x5F50
+0x8D95 = 0x5F51
+0x8D9E = 0x5F52
+0x8D9F = 0x5F53
+0x8DA0 = 0x5F54
+0x8DA6 = 0x5F55
+0x8DAB = 0x5F56
+0x8DAC = 0x5F57
+0x8DAF = 0x5F58
+0x8DB2 = 0x5F59
+0x8DB5 = 0x5F5A
+0x8DB7 = 0x5F5B
+0x8DB9 = 0x5F5C
+0x8DBB = 0x5F5D
+0x8DBC = 0x5F6F
+0x8DC0 = 0x5F5E
+0x8DC5 = 0x5F5F
+0x8DC6 = 0x5F60
+0x8DC7 = 0x5F61
+0x8DC8 = 0x5F62
+0x8DCA = 0x5F63
+0x8DCE = 0x5F64
+0x8DD1 = 0x5F65
+0x8DD4 = 0x5F66
+0x8DD5 = 0x5F67
+0x8DD7 = 0x5F68
+0x8DD9 = 0x5F69
+0x8DE4 = 0x5F6A
+0x8DE5 = 0x5F6B
+0x8DE7 = 0x5F6C
+0x8DEC = 0x5F6D
+0x8DF0 = 0x5F6E
+0x8DF1 = 0x5F70
+0x8DF2 = 0x5F71
+0x8DF4 = 0x5F72
+0x8DFD = 0x5F73
+0x8E01 = 0x5F74
+0x8E04 = 0x5F75
+0x8E05 = 0x5F76
+0x8E06 = 0x5F77
+0x8E0B = 0x5F78
+0x8E11 = 0x5F79
+0x8E14 = 0x5F7A
+0x8E16 = 0x5F7B
+0x8E20 = 0x5F7C
+0x8E21 = 0x5F7D
+0x8E22 = 0x5F7E
+0x8E23 = 0x6021
+0x8E26 = 0x6022
+0x8E27 = 0x6023
+0x8E31 = 0x6024
+0x8E33 = 0x6025
+0x8E36 = 0x6026
+0x8E37 = 0x6027
+0x8E38 = 0x6028
+0x8E39 = 0x6029
+0x8E3D = 0x602A
+0x8E40 = 0x602B
+0x8E41 = 0x602C
+0x8E4B = 0x602D
+0x8E4D = 0x602E
+0x8E4E = 0x602F
+0x8E4F = 0x6030
+0x8E54 = 0x6031
+0x8E5B = 0x6032
+0x8E5C = 0x6033
+0x8E5D = 0x6034
+0x8E5E = 0x6035
+0x8E61 = 0x6036
+0x8E62 = 0x6037
+0x8E69 = 0x6038
+0x8E6C = 0x6039
+0x8E6D = 0x603A
+0x8E6F = 0x603B
+0x8E70 = 0x603C
+0x8E71 = 0x603D
+0x8E79 = 0x603E
+0x8E7A = 0x603F
+0x8E7B = 0x6040
+0x8E82 = 0x6041
+0x8E83 = 0x6042
+0x8E89 = 0x6043
+0x8E90 = 0x6044
+0x8E92 = 0x6045
+0x8E95 = 0x6046
+0x8E9A = 0x6047
+0x8E9B = 0x6048
+0x8E9D = 0x6049
+0x8E9E = 0x604A
+0x8EA2 = 0x604B
+0x8EA7 = 0x604C
+0x8EA9 = 0x604D
+0x8EAD = 0x604E
+0x8EAE = 0x604F
+0x8EB3 = 0x6050
+0x8EB5 = 0x6051
+0x8EBA = 0x6052
+0x8EBB = 0x6053
+0x8EC0 = 0x6054
+0x8EC1 = 0x6055
+0x8EC3 = 0x6056
+0x8EC4 = 0x6057
+0x8EC7 = 0x6058
+0x8ECF = 0x6059
+0x8ED1 = 0x605A
+0x8ED4 = 0x605B
+0x8EDC = 0x605C
+0x8EE8 = 0x605D
+0x8EED = 0x6064
+0x8EEE = 0x605E
+0x8EF0 = 0x605F
+0x8EF1 = 0x6060
+0x8EF7 = 0x6061
+0x8EF9 = 0x6062
+0x8EFA = 0x6063
+0x8F00 = 0x6065
+0x8F02 = 0x6066
+0x8F07 = 0x6067
+0x8F08 = 0x6068
+0x8F0F = 0x6069
+0x8F10 = 0x606A
+0x8F16 = 0x606B
+0x8F17 = 0x606C
+0x8F18 = 0x606D
+0x8F1E = 0x606E
+0x8F20 = 0x606F
+0x8F21 = 0x6070
+0x8F23 = 0x6071
+0x8F25 = 0x6072
+0x8F27 = 0x6073
+0x8F28 = 0x6074
+0x8F2C = 0x6075
+0x8F2D = 0x6076
+0x8F2E = 0x6077
+0x8F34 = 0x6078
+0x8F35 = 0x6079
+0x8F36 = 0x607A
+0x8F37 = 0x607B
+0x8F3A = 0x607C
+0x8F40 = 0x607D
+0x8F41 = 0x607E
+0x8F43 = 0x6121
+0x8F47 = 0x6122
+0x8F4F = 0x6123
+0x8F51 = 0x6124
+0x8F52 = 0x6125
+0x8F53 = 0x6126
+0x8F54 = 0x6127
+0x8F55 = 0x6128
+0x8F58 = 0x6129
+0x8F5D = 0x612A
+0x8F5E = 0x612B
+0x8F65 = 0x612C
+0x8F9D = 0x612D
+0x8FA0 = 0x612E
+0x8FA1 = 0x612F
+0x8FA4 = 0x6130
+0x8FA5 = 0x6131
+0x8FA6 = 0x6132
+0x8FB5 = 0x6133
+0x8FB6 = 0x6134
+0x8FB8 = 0x6135
+0x8FBE = 0x6136
+0x8FC0 = 0x6137
+0x8FC1 = 0x6138
+0x8FC6 = 0x6139
+0x8FCA = 0x613A
+0x8FCB = 0x613B
+0x8FCD = 0x613C
+0x8FD0 = 0x613D
+0x8FD2 = 0x613E
+0x8FD3 = 0x613F
+0x8FD5 = 0x6140
+0x8FE0 = 0x6141
+0x8FE3 = 0x6142
+0x8FE4 = 0x6143
+0x8FE8 = 0x6144
+0x8FEE = 0x6145
+0x8FF1 = 0x6146
+0x8FF5 = 0x6147
+0x8FF6 = 0x6148
+0x8FFB = 0x6149
+0x8FFE = 0x614A
+0x9002 = 0x614B
+0x9004 = 0x614C
+0x9008 = 0x614D
+0x900C = 0x614E
+0x9018 = 0x614F
+0x901B = 0x6150
+0x9028 = 0x6151
+0x9029 = 0x6152
+0x902A = 0x6154
+0x902C = 0x6155
+0x902D = 0x6156
+0x902F = 0x6153
+0x9033 = 0x6157
+0x9034 = 0x6158
+0x9037 = 0x6159
+0x903F = 0x615A
+0x9043 = 0x615B
+0x9044 = 0x615C
+0x904C = 0x615D
+0x905B = 0x615E
+0x905D = 0x615F
+0x9062 = 0x6160
+0x9066 = 0x6161
+0x9067 = 0x6162
+0x906C = 0x6163
+0x9070 = 0x6164
+0x9074 = 0x6165
+0x9079 = 0x6166
+0x9085 = 0x6167
+0x9088 = 0x6168
+0x908B = 0x6169
+0x908C = 0x616A
+0x908E = 0x616B
+0x9090 = 0x616C
+0x9095 = 0x616D
+0x9097 = 0x616E
+0x9098 = 0x616F
+0x9099 = 0x6170
+0x909B = 0x6171
+0x90A0 = 0x6172
+0x90A1 = 0x6173
+0x90A2 = 0x6174
+0x90A5 = 0x6175
+0x90B0 = 0x6176
+0x90B2 = 0x6177
+0x90B3 = 0x6178
+0x90B4 = 0x6179
+0x90B6 = 0x617A
+0x90BD = 0x617B
+0x90BE = 0x617D
+0x90C3 = 0x617E
+0x90C4 = 0x6221
+0x90C5 = 0x6222
+0x90C7 = 0x6223
+0x90C8 = 0x6224
+0x90CC = 0x617C
+0x90D2 = 0x622D
+0x90D5 = 0x6225
+0x90D7 = 0x6226
+0x90D8 = 0x6227
+0x90D9 = 0x6228
+0x90DC = 0x6229
+0x90DD = 0x622A
+0x90DF = 0x622B
+0x90E5 = 0x622C
+0x90EB = 0x622F
+0x90EF = 0x6230
+0x90F0 = 0x6231
+0x90F4 = 0x6232
+0x90F6 = 0x622E
+0x90FE = 0x6233
+0x90FF = 0x6234
+0x9100 = 0x6235
+0x9104 = 0x6236
+0x9105 = 0x6237
+0x9106 = 0x6238
+0x9108 = 0x6239
+0x910D = 0x623A
+0x9110 = 0x623B
+0x9114 = 0x623C
+0x9116 = 0x623D
+0x9117 = 0x623E
+0x9118 = 0x623F
+0x911A = 0x6240
+0x911C = 0x6241
+0x911E = 0x6242
+0x9120 = 0x6243
+0x9122 = 0x6245
+0x9123 = 0x6246
+0x9125 = 0x6244
+0x9127 = 0x6247
+0x9129 = 0x6248
+0x912E = 0x6249
+0x912F = 0x624A
+0x9131 = 0x624B
+0x9134 = 0x624C
+0x9136 = 0x624D
+0x9137 = 0x624E
+0x9139 = 0x624F
+0x913A = 0x6250
+0x913C = 0x6251
+0x913D = 0x6252
+0x9143 = 0x6253
+0x9147 = 0x6254
+0x9148 = 0x6255
+0x914F = 0x6256
+0x9153 = 0x6257
+0x9157 = 0x6258
+0x9159 = 0x6259
+0x915A = 0x625A
+0x915B = 0x625B
+0x9161 = 0x625C
+0x9164 = 0x625D
+0x9167 = 0x625E
+0x916D = 0x625F
+0x9174 = 0x6260
+0x9179 = 0x6261
+0x917A = 0x6262
+0x917B = 0x6263
+0x9181 = 0x6264
+0x9183 = 0x6265
+0x9185 = 0x6266
+0x9186 = 0x6267
+0x918A = 0x6268
+0x918E = 0x6269
+0x9191 = 0x626A
+0x9193 = 0x626B
+0x9194 = 0x626C
+0x9195 = 0x626D
+0x9198 = 0x626E
+0x919E = 0x626F
+0x91A1 = 0x6270
+0x91A6 = 0x6271
+0x91A8 = 0x6272
+0x91AC = 0x6273
+0x91AD = 0x6274
+0x91AE = 0x6275
+0x91B0 = 0x6276
+0x91B1 = 0x6277
+0x91B2 = 0x6278
+0x91B3 = 0x6279
+0x91B6 = 0x627A
+0x91BB = 0x627B
+0x91BC = 0x627C
+0x91BD = 0x627D
+0x91BF = 0x627E
+0x91C2 = 0x6321
+0x91C3 = 0x6322
+0x91C5 = 0x6323
+0x91D3 = 0x6324
+0x91D4 = 0x6325
+0x91D7 = 0x6326
+0x91D9 = 0x6327
+0x91DA = 0x6328
+0x91DE = 0x6329
+0x91E4 = 0x632A
+0x91E5 = 0x632B
+0x91E9 = 0x632C
+0x91EA = 0x632D
+0x91EC = 0x632E
+0x91ED = 0x632F
+0x91EE = 0x6330
+0x91EF = 0x6331
+0x91F0 = 0x6332
+0x91F1 = 0x6333
+0x91F7 = 0x6334
+0x91F9 = 0x6335
+0x91FB = 0x6336
+0x91FD = 0x6337
+0x9200 = 0x6338
+0x9201 = 0x6339
+0x9204 = 0x633A
+0x9205 = 0x633B
+0x9206 = 0x633C
+0x9207 = 0x633D
+0x9209 = 0x633E
+0x920A = 0x633F
+0x920C = 0x6340
+0x9210 = 0x6341
+0x9212 = 0x6342
+0x9213 = 0x6343
+0x9216 = 0x6344
+0x9218 = 0x6345
+0x921C = 0x6346
+0x921D = 0x6347
+0x9223 = 0x6348
+0x9224 = 0x6349
+0x9225 = 0x634A
+0x9226 = 0x634B
+0x9228 = 0x634C
+0x922E = 0x634D
+0x922F = 0x634E
+0x9230 = 0x634F
+0x9233 = 0x6350
+0x9235 = 0x6351
+0x9236 = 0x6352
+0x9238 = 0x6353
+0x9239 = 0x6354
+0x923A = 0x6355
+0x923C = 0x6356
+0x923E = 0x6357
+0x9240 = 0x6358
+0x9242 = 0x6359
+0x9243 = 0x635A
+0x9246 = 0x635B
+0x9247 = 0x635C
+0x924A = 0x635D
+0x924D = 0x635E
+0x924E = 0x635F
+0x924F = 0x6360
+0x9251 = 0x6361
+0x9258 = 0x6362
+0x9259 = 0x6363
+0x925C = 0x6364
+0x925D = 0x6365
+0x9260 = 0x6366
+0x9261 = 0x6367
+0x9265 = 0x6368
+0x9267 = 0x6369
+0x9268 = 0x636A
+0x9269 = 0x636B
+0x926E = 0x636C
+0x926F = 0x636D
+0x9270 = 0x636E
+0x9275 = 0x636F
+0x9276 = 0x6370
+0x9277 = 0x6371
+0x9278 = 0x6372
+0x9279 = 0x6373
+0x927B = 0x6374
+0x927C = 0x6375
+0x927D = 0x6376
+0x927F = 0x6377
+0x9288 = 0x6378
+0x9289 = 0x6379
+0x928A = 0x637A
+0x928D = 0x637B
+0x928E = 0x637C
+0x9292 = 0x637D
+0x9297 = 0x637E
+0x9299 = 0x6421
+0x929F = 0x6422
+0x92A0 = 0x6423
+0x92A4 = 0x6424
+0x92A5 = 0x6425
+0x92A7 = 0x6426
+0x92A8 = 0x6427
+0x92AB = 0x6428
+0x92AF = 0x6429
+0x92B2 = 0x642A
+0x92B6 = 0x642B
+0x92B8 = 0x642C
+0x92BA = 0x642D
+0x92BB = 0x642E
+0x92BC = 0x642F
+0x92BD = 0x6430
+0x92BF = 0x6431
+0x92C0 = 0x6432
+0x92C1 = 0x6433
+0x92C2 = 0x6434
+0x92C3 = 0x6435
+0x92C5 = 0x6436
+0x92C6 = 0x6437
+0x92C7 = 0x6438
+0x92C8 = 0x6439
+0x92CB = 0x643A
+0x92CC = 0x643B
+0x92CD = 0x643C
+0x92CE = 0x643D
+0x92D0 = 0x643E
+0x92D3 = 0x643F
+0x92D5 = 0x6440
+0x92D7 = 0x6441
+0x92D8 = 0x6442
+0x92D9 = 0x6443
+0x92DC = 0x6444
+0x92DD = 0x6445
+0x92DF = 0x6446
+0x92E0 = 0x6447
+0x92E1 = 0x6448
+0x92E3 = 0x6449
+0x92E5 = 0x644A
+0x92E7 = 0x644B
+0x92E8 = 0x644C
+0x92EC = 0x644D
+0x92EE = 0x644E
+0x92F0 = 0x644F
+0x92F9 = 0x6450
+0x92FB = 0x6451
+0x92FF = 0x6452
+0x9300 = 0x6453
+0x9302 = 0x6454
+0x9308 = 0x6455
+0x930D = 0x6456
+0x9311 = 0x6457
+0x9314 = 0x6458
+0x9315 = 0x6459
+0x931C = 0x645A
+0x931D = 0x645B
+0x931E = 0x645C
+0x931F = 0x645D
+0x9321 = 0x645E
+0x9324 = 0x645F
+0x9325 = 0x6460
+0x9327 = 0x6461
+0x9329 = 0x6462
+0x932A = 0x6463
+0x9333 = 0x6464
+0x9334 = 0x6465
+0x9336 = 0x6466
+0x9337 = 0x6467
+0x9347 = 0x6468
+0x9348 = 0x6469
+0x9349 = 0x646A
+0x9350 = 0x646B
+0x9351 = 0x646C
+0x9352 = 0x646D
+0x9355 = 0x646E
+0x9357 = 0x646F
+0x9358 = 0x6470
+0x935A = 0x6471
+0x935E = 0x6472
+0x9364 = 0x6473
+0x9365 = 0x6474
+0x9367 = 0x6475
+0x9369 = 0x6476
+0x936A = 0x6477
+0x936D = 0x6478
+0x936F = 0x6479
+0x9370 = 0x647A
+0x9371 = 0x647B
+0x9373 = 0x647C
+0x9374 = 0x647D
+0x9376 = 0x647E
+0x937A = 0x6521
+0x937D = 0x6522
+0x937F = 0x6523
+0x9380 = 0x6524
+0x9381 = 0x6525
+0x9382 = 0x6526
+0x9388 = 0x6527
+0x938A = 0x6528
+0x938B = 0x6529
+0x938D = 0x652A
+0x938F = 0x652B
+0x9392 = 0x652C
+0x9395 = 0x652D
+0x9398 = 0x652E
+0x939B = 0x652F
+0x939E = 0x6530
+0x93A1 = 0x6531
+0x93A3 = 0x6532
+0x93A4 = 0x6533
+0x93A6 = 0x6534
+0x93A8 = 0x6535
+0x93A9 = 0x653B
+0x93AB = 0x6536
+0x93B4 = 0x6537
+0x93B5 = 0x6538
+0x93B6 = 0x6539
+0x93BA = 0x653A
+0x93C1 = 0x653C
+0x93C4 = 0x653D
+0x93C5 = 0x653E
+0x93C6 = 0x653F
+0x93C7 = 0x6540
+0x93C9 = 0x6541
+0x93CA = 0x6542
+0x93CB = 0x6543
+0x93CC = 0x6544
+0x93CD = 0x6545
+0x93D3 = 0x6546
+0x93D9 = 0x6547
+0x93DC = 0x6548
+0x93DE = 0x6549
+0x93DF = 0x654A
+0x93E2 = 0x654B
+0x93E6 = 0x654C
+0x93E7 = 0x654D
+0x93F7 = 0x654F
+0x93F8 = 0x6550
+0x93F9 = 0x654E
+0x93FA = 0x6551
+0x93FB = 0x6552
+0x93FD = 0x6553
+0x9401 = 0x6554
+0x9402 = 0x6555
+0x9404 = 0x6556
+0x9408 = 0x6557
+0x9409 = 0x6558
+0x940D = 0x6559
+0x940E = 0x655A
+0x940F = 0x655B
+0x9415 = 0x655C
+0x9416 = 0x655D
+0x9417 = 0x655E
+0x941F = 0x655F
+0x942E = 0x6560
+0x942F = 0x6561
+0x9431 = 0x6562
+0x9432 = 0x6563
+0x9433 = 0x6564
+0x9434 = 0x6565
+0x943B = 0x6566
+0x943D = 0x6568
+0x943F = 0x6567
+0x9443 = 0x6569
+0x9445 = 0x656A
+0x9448 = 0x656B
+0x944A = 0x656C
+0x944C = 0x656D
+0x9455 = 0x656E
+0x9459 = 0x656F
+0x945C = 0x6570
+0x945F = 0x6571
+0x9461 = 0x6572
+0x9463 = 0x6573
+0x9468 = 0x6574
+0x946B = 0x6575
+0x946D = 0x6576
+0x946E = 0x6577
+0x946F = 0x6578
+0x9471 = 0x6579
+0x9472 = 0x657A
+0x9483 = 0x657C
+0x9484 = 0x657B
+0x9578 = 0x657D
+0x9579 = 0x657E
+0x957E = 0x6621
+0x9584 = 0x6622
+0x9588 = 0x6623
+0x958C = 0x6624
+0x958D = 0x6625
+0x958E = 0x6626
+0x959D = 0x6627
+0x959E = 0x6628
+0x959F = 0x6629
+0x95A1 = 0x662A
+0x95A6 = 0x662B
+0x95A9 = 0x662C
+0x95AB = 0x662D
+0x95AC = 0x662E
+0x95B4 = 0x662F
+0x95B6 = 0x6630
+0x95BA = 0x6631
+0x95BD = 0x6632
+0x95BF = 0x6633
+0x95C6 = 0x6634
+0x95C8 = 0x6635
+0x95C9 = 0x6636
+0x95CB = 0x6637
+0x95D0 = 0x6638
+0x95D1 = 0x6639
+0x95D2 = 0x663A
+0x95D3 = 0x663B
+0x95D9 = 0x663C
+0x95DA = 0x663D
+0x95DD = 0x663E
+0x95DE = 0x663F
+0x95DF = 0x6640
+0x95E0 = 0x6641
+0x95E4 = 0x6642
+0x95E6 = 0x6643
+0x961D = 0x6644
+0x961E = 0x6645
+0x9622 = 0x6646
+0x9624 = 0x6647
+0x9625 = 0x6648
+0x9626 = 0x6649
+0x962C = 0x664A
+0x9631 = 0x664B
+0x9633 = 0x664C
+0x9637 = 0x664D
+0x9638 = 0x664E
+0x9639 = 0x664F
+0x963A = 0x6650
+0x963C = 0x6651
+0x963D = 0x6652
+0x9641 = 0x6653
+0x9652 = 0x6654
+0x9654 = 0x6655
+0x9656 = 0x6656
+0x9657 = 0x6657
+0x9658 = 0x6658
+0x9661 = 0x6659
+0x966E = 0x665A
+0x9674 = 0x665B
+0x967B = 0x665C
+0x967C = 0x665D
+0x967E = 0x665E
+0x967F = 0x665F
+0x9681 = 0x6660
+0x9682 = 0x6661
+0x9683 = 0x6662
+0x9684 = 0x6663
+0x9689 = 0x6664
+0x9691 = 0x6665
+0x9696 = 0x6666
+0x969A = 0x6667
+0x969D = 0x6668
+0x969F = 0x6669
+0x96A4 = 0x666A
+0x96A5 = 0x666B
+0x96A6 = 0x666C
+0x96A9 = 0x666D
+0x96AE = 0x666E
+0x96AF = 0x666F
+0x96B3 = 0x6670
+0x96BA = 0x6671
+0x96CA = 0x6672
+0x96D2 = 0x6673
+0x96D8 = 0x6675
+0x96DA = 0x6676
+0x96DD = 0x6677
+0x96DE = 0x6678
+0x96DF = 0x6679
+0x96E9 = 0x667A
+0x96EF = 0x667B
+0x96F1 = 0x667C
+0x96FA = 0x667D
+0x9702 = 0x667E
+0x9703 = 0x6721
+0x9705 = 0x6722
+0x9709 = 0x6723
+0x971A = 0x6724
+0x971B = 0x6725
+0x971D = 0x6726
+0x9721 = 0x6727
+0x9722 = 0x6728
+0x9723 = 0x6729
+0x9728 = 0x672A
+0x9731 = 0x672B
+0x9733 = 0x672C
+0x9741 = 0x672D
+0x9743 = 0x672E
+0x974A = 0x672F
+0x974E = 0x6730
+0x974F = 0x6731
+0x9755 = 0x6732
+0x9757 = 0x6733
+0x9758 = 0x6734
+0x975A = 0x6735
+0x975B = 0x6736
+0x9763 = 0x6737
+0x9767 = 0x6738
+0x976A = 0x6739
+0x976E = 0x673A
+0x9773 = 0x673B
+0x9776 = 0x673C
+0x9777 = 0x673D
+0x9778 = 0x673E
+0x977B = 0x673F
+0x977D = 0x6740
+0x977F = 0x6741
+0x9780 = 0x6742
+0x9789 = 0x6743
+0x9795 = 0x6744
+0x9796 = 0x6745
+0x9797 = 0x6746
+0x9799 = 0x6747
+0x979A = 0x6748
+0x979E = 0x6749
+0x979F = 0x674A
+0x97A2 = 0x674B
+0x97AC = 0x674C
+0x97AE = 0x674D
+0x97B1 = 0x674E
+0x97B2 = 0x674F
+0x97B5 = 0x6750
+0x97B6 = 0x6751
+0x97B8 = 0x6752
+0x97B9 = 0x6753
+0x97BA = 0x6754
+0x97BC = 0x6755
+0x97BE = 0x6756
+0x97BF = 0x6757
+0x97C1 = 0x6758
+0x97C4 = 0x6759
+0x97C5 = 0x675A
+0x97C7 = 0x675B
+0x97C9 = 0x675C
+0x97CA = 0x675D
+0x97CC = 0x675E
+0x97CD = 0x675F
+0x97CE = 0x6760
+0x97D0 = 0x6761
+0x97D1 = 0x6762
+0x97D4 = 0x6763
+0x97D7 = 0x6764
+0x97D8 = 0x6765
+0x97D9 = 0x6766
+0x97DB = 0x676A
+0x97DD = 0x6767
+0x97DE = 0x6768
+0x97E0 = 0x6769
+0x97E1 = 0x676B
+0x97E4 = 0x676C
+0x97EF = 0x676D
+0x97F1 = 0x676E
+0x97F4 = 0x676F
+0x97F7 = 0x6770
+0x97F8 = 0x6771
+0x97FA = 0x6772
+0x9807 = 0x6773
+0x980A = 0x6774
+0x980D = 0x6776
+0x980E = 0x6777
+0x9814 = 0x6778
+0x9816 = 0x6779
+0x9819 = 0x6775
+0x981C = 0x677A
+0x981E = 0x677B
+0x9820 = 0x677C
+0x9823 = 0x677D
+0x9825 = 0x6828
+0x9826 = 0x677E
+0x982B = 0x6821
+0x982E = 0x6822
+0x982F = 0x6823
+0x9830 = 0x6824
+0x9832 = 0x6825
+0x9833 = 0x6826
+0x9835 = 0x6827
+0x983E = 0x6829
+0x9844 = 0x682A
+0x9847 = 0x682B
+0x984A = 0x682C
+0x9851 = 0x682D
+0x9852 = 0x682E
+0x9853 = 0x682F
+0x9856 = 0x6830
+0x9857 = 0x6831
+0x9859 = 0x6832
+0x985A = 0x6833
+0x9862 = 0x6834
+0x9863 = 0x6835
+0x9865 = 0x6836
+0x9866 = 0x6837
+0x986A = 0x6838
+0x986C = 0x6839
+0x98AB = 0x683A
+0x98AD = 0x683B
+0x98AE = 0x683C
+0x98B0 = 0x683D
+0x98B4 = 0x683E
+0x98B7 = 0x683F
+0x98B8 = 0x6840
+0x98BA = 0x6841
+0x98BB = 0x6842
+0x98BF = 0x6843
+0x98C2 = 0x6844
+0x98C5 = 0x6845
+0x98C8 = 0x6846
+0x98CC = 0x6847
+0x98E1 = 0x6848
+0x98E3 = 0x6849
+0x98E5 = 0x684A
+0x98E6 = 0x684B
+0x98E7 = 0x684C
+0x98EA = 0x684D
+0x98F3 = 0x684E
+0x98F6 = 0x684F
+0x9902 = 0x6850
+0x9907 = 0x6851
+0x9908 = 0x6852
+0x9911 = 0x6853
+0x9915 = 0x6854
+0x9916 = 0x6855
+0x9917 = 0x6856
+0x991A = 0x6857
+0x991B = 0x6858
+0x991C = 0x6859
+0x991F = 0x685A
+0x9922 = 0x685B
+0x9926 = 0x685C
+0x9927 = 0x685D
+0x992B = 0x685E
+0x9931 = 0x685F
+0x9932 = 0x6860
+0x9933 = 0x6861
+0x9934 = 0x6862
+0x9935 = 0x6863
+0x9939 = 0x6864
+0x993A = 0x6865
+0x993B = 0x6866
+0x993C = 0x6867
+0x9940 = 0x6868
+0x9941 = 0x6869
+0x9946 = 0x686A
+0x9947 = 0x686B
+0x9948 = 0x686C
+0x994D = 0x686D
+0x994E = 0x686E
+0x9954 = 0x686F
+0x9958 = 0x6870
+0x9959 = 0x6871
+0x995B = 0x6872
+0x995C = 0x6873
+0x995E = 0x6874
+0x995F = 0x6875
+0x9960 = 0x6876
+0x999B = 0x6877
+0x999D = 0x6878
+0x999F = 0x6879
+0x99A6 = 0x687A
+0x99B0 = 0x687B
+0x99B1 = 0x687C
+0x99B2 = 0x687D
+0x99B5 = 0x687E
+0x99B9 = 0x6921
+0x99BA = 0x6922
+0x99BD = 0x6923
+0x99BF = 0x6924
+0x99C3 = 0x6925
+0x99C9 = 0x6926
+0x99D3 = 0x6927
+0x99D4 = 0x6928
+0x99D9 = 0x6929
+0x99DA = 0x692A
+0x99DC = 0x692B
+0x99DE = 0x692C
+0x99E7 = 0x692D
+0x99EA = 0x692E
+0x99EB = 0x692F
+0x99EC = 0x6930
+0x99F0 = 0x6931
+0x99F4 = 0x6932
+0x99F5 = 0x6933
+0x99F9 = 0x6934
+0x99FD = 0x6935
+0x99FE = 0x6936
+0x9A02 = 0x6937
+0x9A03 = 0x6938
+0x9A04 = 0x6939
+0x9A0B = 0x693A
+0x9A0C = 0x693B
+0x9A10 = 0x693C
+0x9A11 = 0x693D
+0x9A16 = 0x693E
+0x9A1E = 0x693F
+0x9A20 = 0x6940
+0x9A22 = 0x6941
+0x9A23 = 0x6942
+0x9A24 = 0x6943
+0x9A27 = 0x6944
+0x9A2D = 0x6945
+0x9A2E = 0x6946
+0x9A33 = 0x6947
+0x9A35 = 0x6948
+0x9A36 = 0x6949
+0x9A38 = 0x694A
+0x9A41 = 0x694C
+0x9A44 = 0x694D
+0x9A47 = 0x694B
+0x9A4A = 0x694E
+0x9A4B = 0x694F
+0x9A4C = 0x6950
+0x9A4E = 0x6951
+0x9A51 = 0x6952
+0x9A54 = 0x6953
+0x9A56 = 0x6954
+0x9A5D = 0x6955
+0x9AAA = 0x6956
+0x9AAC = 0x6957
+0x9AAE = 0x6958
+0x9AAF = 0x6959
+0x9AB2 = 0x695A
+0x9AB4 = 0x695B
+0x9AB5 = 0x695C
+0x9AB6 = 0x695D
+0x9AB9 = 0x695E
+0x9ABB = 0x695F
+0x9ABE = 0x6960
+0x9ABF = 0x6961
+0x9AC1 = 0x6962
+0x9AC3 = 0x6963
+0x9AC6 = 0x6964
+0x9AC8 = 0x6965
+0x9ACE = 0x6966
+0x9AD0 = 0x6967
+0x9AD2 = 0x6968
+0x9AD5 = 0x6969
+0x9AD6 = 0x696A
+0x9AD7 = 0x696B
+0x9ADB = 0x696C
+0x9ADC = 0x696D
+0x9AE0 = 0x696E
+0x9AE4 = 0x696F
+0x9AE5 = 0x6970
+0x9AE7 = 0x6971
+0x9AE9 = 0x6972
+0x9AEC = 0x6973
+0x9AF2 = 0x6974
+0x9AF3 = 0x6975
+0x9AF5 = 0x6976
+0x9AF9 = 0x6977
+0x9AFA = 0x6978
+0x9AFD = 0x6979
+0x9AFF = 0x697A
+0x9B00 = 0x697B
+0x9B01 = 0x697C
+0x9B02 = 0x697D
+0x9B03 = 0x697E
+0x9B04 = 0x6A21
+0x9B05 = 0x6A22
+0x9B08 = 0x6A23
+0x9B09 = 0x6A24
+0x9B0B = 0x6A25
+0x9B0C = 0x6A26
+0x9B0D = 0x6A27
+0x9B0E = 0x6A28
+0x9B10 = 0x6A29
+0x9B12 = 0x6A2A
+0x9B16 = 0x6A2B
+0x9B19 = 0x6A2C
+0x9B1B = 0x6A2D
+0x9B1C = 0x6A2E
+0x9B20 = 0x6A2F
+0x9B26 = 0x6A30
+0x9B2B = 0x6A31
+0x9B2D = 0x6A32
+0x9B33 = 0x6A33
+0x9B34 = 0x6A34
+0x9B35 = 0x6A35
+0x9B37 = 0x6A36
+0x9B39 = 0x6A37
+0x9B3A = 0x6A38
+0x9B3D = 0x6A39
+0x9B48 = 0x6A3A
+0x9B4B = 0x6A3B
+0x9B4C = 0x6A3C
+0x9B55 = 0x6A3D
+0x9B56 = 0x6A3E
+0x9B57 = 0x6A3F
+0x9B5B = 0x6A40
+0x9B5E = 0x6A41
+0x9B61 = 0x6A42
+0x9B63 = 0x6A43
+0x9B65 = 0x6A44
+0x9B66 = 0x6A45
+0x9B68 = 0x6A46
+0x9B6A = 0x6A47
+0x9B6B = 0x6A48
+0x9B6C = 0x6A49
+0x9B6D = 0x6A4A
+0x9B6E = 0x6A4B
+0x9B73 = 0x6A4C
+0x9B75 = 0x6A4D
+0x9B77 = 0x6A4E
+0x9B78 = 0x6A4F
+0x9B79 = 0x6A50
+0x9B7F = 0x6A51
+0x9B80 = 0x6A52
+0x9B84 = 0x6A53
+0x9B85 = 0x6A54
+0x9B86 = 0x6A55
+0x9B87 = 0x6A56
+0x9B89 = 0x6A57
+0x9B8A = 0x6A58
+0x9B8B = 0x6A59
+0x9B8D = 0x6A5A
+0x9B8F = 0x6A5B
+0x9B90 = 0x6A5C
+0x9B94 = 0x6A5D
+0x9B9A = 0x6A5E
+0x9B9D = 0x6A5F
+0x9B9E = 0x6A60
+0x9BA6 = 0x6A61
+0x9BA7 = 0x6A62
+0x9BA9 = 0x6A63
+0x9BAC = 0x6A64
+0x9BB0 = 0x6A65
+0x9BB1 = 0x6A66
+0x9BB2 = 0x6A67
+0x9BB7 = 0x6A68
+0x9BB8 = 0x6A69
+0x9BBB = 0x6A6A
+0x9BBC = 0x6A6B
+0x9BBE = 0x6A6C
+0x9BBF = 0x6A6D
+0x9BC1 = 0x6A6E
+0x9BC7 = 0x6A6F
+0x9BC8 = 0x6A70
+0x9BCE = 0x6A71
+0x9BD0 = 0x6A72
+0x9BD7 = 0x6A73
+0x9BD8 = 0x6A74
+0x9BDD = 0x6A75
+0x9BDF = 0x6A76
+0x9BE5 = 0x6A77
+0x9BE7 = 0x6A78
+0x9BEA = 0x6A79
+0x9BEB = 0x6A7A
+0x9BEF = 0x6A7B
+0x9BF3 = 0x6A7C
+0x9BF7 = 0x6A7D
+0x9BF8 = 0x6A7E
+0x9BF9 = 0x6B21
+0x9BFA = 0x6B22
+0x9BFD = 0x6B23
+0x9BFF = 0x6B24
+0x9C00 = 0x6B25
+0x9C02 = 0x6B26
+0x9C0B = 0x6B27
+0x9C0F = 0x6B28
+0x9C11 = 0x6B29
+0x9C16 = 0x6B2A
+0x9C18 = 0x6B2B
+0x9C19 = 0x6B2C
+0x9C1A = 0x6B2D
+0x9C1C = 0x6B2E
+0x9C1E = 0x6B2F
+0x9C22 = 0x6B30
+0x9C23 = 0x6B31
+0x9C26 = 0x6B32
+0x9C27 = 0x6B33
+0x9C28 = 0x6B34
+0x9C29 = 0x6B35
+0x9C2A = 0x6B36
+0x9C31 = 0x6B37
+0x9C35 = 0x6B38
+0x9C36 = 0x6B39
+0x9C37 = 0x6B3A
+0x9C3D = 0x6B3B
+0x9C41 = 0x6B3C
+0x9C43 = 0x6B3D
+0x9C44 = 0x6B3E
+0x9C45 = 0x6B3F
+0x9C49 = 0x6B40
+0x9C4A = 0x6B41
+0x9C4E = 0x6B42
+0x9C4F = 0x6B43
+0x9C50 = 0x6B44
+0x9C53 = 0x6B45
+0x9C54 = 0x6B46
+0x9C56 = 0x6B47
+0x9C58 = 0x6B48
+0x9C5B = 0x6B49
+0x9C5C = 0x6B50
+0x9C5D = 0x6B4A
+0x9C5E = 0x6B4B
+0x9C5F = 0x6B4C
+0x9C63 = 0x6B4D
+0x9C68 = 0x6B52
+0x9C69 = 0x6B4E
+0x9C6A = 0x6B4F
+0x9C6B = 0x6B51
+0x9C6E = 0x6B53
+0x9C70 = 0x6B54
+0x9C72 = 0x6B55
+0x9C75 = 0x6B56
+0x9C77 = 0x6B57
+0x9C7B = 0x6B58
+0x9CE6 = 0x6B59
+0x9CF2 = 0x6B5A
+0x9CF7 = 0x6B5B
+0x9CF9 = 0x6B5C
+0x9D02 = 0x6B5E
+0x9D0B = 0x6B5D
+0x9D11 = 0x6B5F
+0x9D17 = 0x6B60
+0x9D18 = 0x6B61
+0x9D1C = 0x6B62
+0x9D1D = 0x6B63
+0x9D1E = 0x6B64
+0x9D2F = 0x6B65
+0x9D30 = 0x6B66
+0x9D32 = 0x6B67
+0x9D33 = 0x6B68
+0x9D34 = 0x6B69
+0x9D3A = 0x6B6A
+0x9D3C = 0x6B6B
+0x9D3D = 0x6B6D
+0x9D42 = 0x6B6E
+0x9D43 = 0x6B6F
+0x9D45 = 0x6B6C
+0x9D47 = 0x6B70
+0x9D4A = 0x6B71
+0x9D53 = 0x6B72
+0x9D54 = 0x6B73
+0x9D5F = 0x6B74
+0x9D62 = 0x6B76
+0x9D63 = 0x6B75
+0x9D65 = 0x6B77
+0x9D69 = 0x6B78
+0x9D6A = 0x6B79
+0x9D6B = 0x6B7A
+0x9D70 = 0x6B7B
+0x9D76 = 0x6B7C
+0x9D77 = 0x6B7D
+0x9D7B = 0x6B7E
+0x9D7C = 0x6C21
+0x9D7E = 0x6C22
+0x9D83 = 0x6C23
+0x9D84 = 0x6C24
+0x9D86 = 0x6C25
+0x9D8A = 0x6C26
+0x9D8D = 0x6C27
+0x9D8E = 0x6C28
+0x9D92 = 0x6C29
+0x9D93 = 0x6C2A
+0x9D95 = 0x6C2B
+0x9D96 = 0x6C2C
+0x9D97 = 0x6C2D
+0x9D98 = 0x6C2E
+0x9DA1 = 0x6C2F
+0x9DAA = 0x6C30
+0x9DAC = 0x6C31
+0x9DAE = 0x6C32
+0x9DB1 = 0x6C33
+0x9DB5 = 0x6C34
+0x9DB9 = 0x6C35
+0x9DBC = 0x6C36
+0x9DBF = 0x6C37
+0x9DC3 = 0x6C38
+0x9DC7 = 0x6C39
+0x9DC9 = 0x6C3A
+0x9DCA = 0x6C3B
+0x9DD4 = 0x6C3C
+0x9DD5 = 0x6C3D
+0x9DD6 = 0x6C3E
+0x9DD7 = 0x6C3F
+0x9DDA = 0x6C40
+0x9DDE = 0x6C41
+0x9DDF = 0x6C42
+0x9DE0 = 0x6C43
+0x9DE5 = 0x6C44
+0x9DE7 = 0x6C45
+0x9DE9 = 0x6C46
+0x9DEB = 0x6C47
+0x9DEE = 0x6C48
+0x9DF0 = 0x6C49
+0x9DF3 = 0x6C4A
+0x9DF4 = 0x6C4B
+0x9DFE = 0x6C4C
+0x9E02 = 0x6C4E
+0x9E07 = 0x6C4F
+0x9E0A = 0x6C4D
+0x9E0E = 0x6C50
+0x9E10 = 0x6C51
+0x9E11 = 0x6C52
+0x9E12 = 0x6C53
+0x9E15 = 0x6C54
+0x9E16 = 0x6C55
+0x9E19 = 0x6C56
+0x9E1C = 0x6C57
+0x9E1D = 0x6C58
+0x9E7A = 0x6C59
+0x9E7B = 0x6C5A
+0x9E7C = 0x6C5B
+0x9E80 = 0x6C5C
+0x9E82 = 0x6C5D
+0x9E83 = 0x6C5E
+0x9E84 = 0x6C5F
+0x9E85 = 0x6C60
+0x9E87 = 0x6C61
+0x9E8E = 0x6C62
+0x9E8F = 0x6C63
+0x9E96 = 0x6C64
+0x9E98 = 0x6C65
+0x9E9B = 0x6C66
+0x9E9E = 0x6C67
+0x9EA4 = 0x6C68
+0x9EA8 = 0x6C69
+0x9EAC = 0x6C6A
+0x9EAE = 0x6C6B
+0x9EAF = 0x6C6C
+0x9EB0 = 0x6C6D
+0x9EB3 = 0x6C6E
+0x9EB4 = 0x6C6F
+0x9EB5 = 0x6C70
+0x9EC6 = 0x6C71
+0x9EC8 = 0x6C72
+0x9ECB = 0x6C73
+0x9ED5 = 0x6C74
+0x9EDF = 0x6C75
+0x9EE4 = 0x6C76
+0x9EE7 = 0x6C77
+0x9EEC = 0x6C78
+0x9EED = 0x6C79
+0x9EEE = 0x6C7A
+0x9EF0 = 0x6C7B
+0x9EF1 = 0x6C7C
+0x9EF2 = 0x6C7D
+0x9EF5 = 0x6C7E
+0x9EF8 = 0x6D21
+0x9EFF = 0x6D22
+0x9F02 = 0x6D23
+0x9F03 = 0x6D24
+0x9F09 = 0x6D25
+0x9F0F = 0x6D26
+0x9F10 = 0x6D27
+0x9F11 = 0x6D28
+0x9F12 = 0x6D29
+0x9F14 = 0x6D2A
+0x9F16 = 0x6D2B
+0x9F17 = 0x6D2C
+0x9F19 = 0x6D2D
+0x9F1A = 0x6D2E
+0x9F1B = 0x6D2F
+0x9F1F = 0x6D30
+0x9F22 = 0x6D31
+0x9F26 = 0x6D32
+0x9F2A = 0x6D33
+0x9F2B = 0x6D34
+0x9F2F = 0x6D35
+0x9F31 = 0x6D36
+0x9F32 = 0x6D37
+0x9F34 = 0x6D38
+0x9F37 = 0x6D39
+0x9F39 = 0x6D3A
+0x9F3A = 0x6D3B
+0x9F3C = 0x6D3C
+0x9F3D = 0x6D3D
+0x9F3F = 0x6D3E
+0x9F41 = 0x6D3F
+0x9F43 = 0x6D40
+0x9F44 = 0x6D41
+0x9F45 = 0x6D42
+0x9F46 = 0x6D43
+0x9F47 = 0x6D44
+0x9F53 = 0x6D45
+0x9F55 = 0x6D46
+0x9F56 = 0x6D47
+0x9F57 = 0x6D48
+0x9F58 = 0x6D49
+0x9F5A = 0x6D4A
+0x9F5D = 0x6D4B
+0x9F5E = 0x6D4C
+0x9F68 = 0x6D4D
+0x9F69 = 0x6D4E
+0x9F6D = 0x6D4F
+0x9F6E = 0x6D50
+0x9F6F = 0x6D51
+0x9F70 = 0x6D52
+0x9F71 = 0x6D53
+0x9F73 = 0x6D54
+0x9F75 = 0x6D55
+0x9F7A = 0x6D56
+0x9F7D = 0x6D57
+0x9F8F = 0x6D58
+0x9F90 = 0x6D59
+0x9F91 = 0x6D5A
+0x9F92 = 0x6D5B
+0x9F94 = 0x6D5C
+0x9F96 = 0x6D5D
+0x9F97 = 0x6D5E
+0x9F9E = 0x6D5F
+0x9FA1 = 0x6D60
+0x9FA2 = 0x6D61
+0x9FA3 = 0x6D62
+0x9FA5 = 0x6D63
+0xFF5E = 0x2237
+0xFFE4 = 0x2243
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212UDC.src b/enc/trans/JIS/UCS%JISX0212UDC.src
new file mode 100644
index 0000000000..3f7d39772b
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0212UDC.src
@@ -0,0 +1,955 @@
+# $NetBSD: UCS%JISX0212UDC.src,v 1.1 2003/07/19 20:20:43 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0212UDC"
+SRC_ZONE	0xE3AC - 0xE757
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0xE3AC - 0xE757		= INVALID
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0xE3AC = 0x7521
+0xE3AD = 0x7522
+0xE3AE = 0x7523
+0xE3AF = 0x7524
+0xE3B0 = 0x7525
+0xE3B1 = 0x7526
+0xE3B2 = 0x7527
+0xE3B3 = 0x7528
+0xE3B4 = 0x7529
+0xE3B5 = 0x752A
+0xE3B6 = 0x752B
+0xE3B7 = 0x752C
+0xE3B8 = 0x752D
+0xE3B9 = 0x752E
+0xE3BA = 0x752F
+0xE3BB = 0x7530
+0xE3BC = 0x7531
+0xE3BD = 0x7532
+0xE3BE = 0x7533
+0xE3BF = 0x7534
+0xE3C0 = 0x7535
+0xE3C1 = 0x7536
+0xE3C2 = 0x7537
+0xE3C3 = 0x7538
+0xE3C4 = 0x7539
+0xE3C5 = 0x753A
+0xE3C6 = 0x753B
+0xE3C7 = 0x753C
+0xE3C8 = 0x753D
+0xE3C9 = 0x753E
+0xE3CA = 0x753F
+0xE3CB = 0x7540
+0xE3CC = 0x7541
+0xE3CD = 0x7542
+0xE3CE = 0x7543
+0xE3CF = 0x7544
+0xE3D0 = 0x7545
+0xE3D1 = 0x7546
+0xE3D2 = 0x7547
+0xE3D3 = 0x7548
+0xE3D4 = 0x7549
+0xE3D5 = 0x754A
+0xE3D6 = 0x754B
+0xE3D7 = 0x754C
+0xE3D8 = 0x754D
+0xE3D9 = 0x754E
+0xE3DA = 0x754F
+0xE3DB = 0x7550
+0xE3DC = 0x7551
+0xE3DD = 0x7552
+0xE3DE = 0x7553
+0xE3DF = 0x7554
+0xE3E0 = 0x7555
+0xE3E1 = 0x7556
+0xE3E2 = 0x7557
+0xE3E3 = 0x7558
+0xE3E4 = 0x7559
+0xE3E5 = 0x755A
+0xE3E6 = 0x755B
+0xE3E7 = 0x755C
+0xE3E8 = 0x755D
+0xE3E9 = 0x755E
+0xE3EA = 0x755F
+0xE3EB = 0x7560
+0xE3EC = 0x7561
+0xE3ED = 0x7562
+0xE3EE = 0x7563
+0xE3EF = 0x7564
+0xE3F0 = 0x7565
+0xE3F1 = 0x7566
+0xE3F2 = 0x7567
+0xE3F3 = 0x7568
+0xE3F4 = 0x7569
+0xE3F5 = 0x756A
+0xE3F6 = 0x756B
+0xE3F7 = 0x756C
+0xE3F8 = 0x756D
+0xE3F9 = 0x756E
+0xE3FA = 0x756F
+0xE3FB = 0x7570
+0xE3FC = 0x7571
+0xE3FD = 0x7572
+0xE3FE = 0x7573
+0xE3FF = 0x7574
+0xE400 = 0x7575
+0xE401 = 0x7576
+0xE402 = 0x7577
+0xE403 = 0x7578
+0xE404 = 0x7579
+0xE405 = 0x757A
+0xE406 = 0x757B
+0xE407 = 0x757C
+0xE408 = 0x757D
+0xE409 = 0x757E
+0xE40A = 0x7621
+0xE40B = 0x7622
+0xE40C = 0x7623
+0xE40D = 0x7624
+0xE40E = 0x7625
+0xE40F = 0x7626
+0xE410 = 0x7627
+0xE411 = 0x7628
+0xE412 = 0x7629
+0xE413 = 0x762A
+0xE414 = 0x762B
+0xE415 = 0x762C
+0xE416 = 0x762D
+0xE417 = 0x762E
+0xE418 = 0x762F
+0xE419 = 0x7630
+0xE41A = 0x7631
+0xE41B = 0x7632
+0xE41C = 0x7633
+0xE41D = 0x7634
+0xE41E = 0x7635
+0xE41F = 0x7636
+0xE420 = 0x7637
+0xE421 = 0x7638
+0xE422 = 0x7639
+0xE423 = 0x763A
+0xE424 = 0x763B
+0xE425 = 0x763C
+0xE426 = 0x763D
+0xE427 = 0x763E
+0xE428 = 0x763F
+0xE429 = 0x7640
+0xE42A = 0x7641
+0xE42B = 0x7642
+0xE42C = 0x7643
+0xE42D = 0x7644
+0xE42E = 0x7645
+0xE42F = 0x7646
+0xE430 = 0x7647
+0xE431 = 0x7648
+0xE432 = 0x7649
+0xE433 = 0x764A
+0xE434 = 0x764B
+0xE435 = 0x764C
+0xE436 = 0x764D
+0xE437 = 0x764E
+0xE438 = 0x764F
+0xE439 = 0x7650
+0xE43A = 0x7651
+0xE43B = 0x7652
+0xE43C = 0x7653
+0xE43D = 0x7654
+0xE43E = 0x7655
+0xE43F = 0x7656
+0xE440 = 0x7657
+0xE441 = 0x7658
+0xE442 = 0x7659
+0xE443 = 0x765A
+0xE444 = 0x765B
+0xE445 = 0x765C
+0xE446 = 0x765D
+0xE447 = 0x765E
+0xE448 = 0x765F
+0xE449 = 0x7660
+0xE44A = 0x7661
+0xE44B = 0x7662
+0xE44C = 0x7663
+0xE44D = 0x7664
+0xE44E = 0x7665
+0xE44F = 0x7666
+0xE450 = 0x7667
+0xE451 = 0x7668
+0xE452 = 0x7669
+0xE453 = 0x766A
+0xE454 = 0x766B
+0xE455 = 0x766C
+0xE456 = 0x766D
+0xE457 = 0x766E
+0xE458 = 0x766F
+0xE459 = 0x7670
+0xE45A = 0x7671
+0xE45B = 0x7672
+0xE45C = 0x7673
+0xE45D = 0x7674
+0xE45E = 0x7675
+0xE45F = 0x7676
+0xE460 = 0x7677
+0xE461 = 0x7678
+0xE462 = 0x7679
+0xE463 = 0x767A
+0xE464 = 0x767B
+0xE465 = 0x767C
+0xE466 = 0x767D
+0xE467 = 0x767E
+0xE468 = 0x7721
+0xE469 = 0x7722
+0xE46A = 0x7723
+0xE46B = 0x7724
+0xE46C = 0x7725
+0xE46D = 0x7726
+0xE46E = 0x7727
+0xE46F = 0x7728
+0xE470 = 0x7729
+0xE471 = 0x772A
+0xE472 = 0x772B
+0xE473 = 0x772C
+0xE474 = 0x772D
+0xE475 = 0x772E
+0xE476 = 0x772F
+0xE477 = 0x7730
+0xE478 = 0x7731
+0xE479 = 0x7732
+0xE47A = 0x7733
+0xE47B = 0x7734
+0xE47C = 0x7735
+0xE47D = 0x7736
+0xE47E = 0x7737
+0xE47F = 0x7738
+0xE480 = 0x7739
+0xE481 = 0x773A
+0xE482 = 0x773B
+0xE483 = 0x773C
+0xE484 = 0x773D
+0xE485 = 0x773E
+0xE486 = 0x773F
+0xE487 = 0x7740
+0xE488 = 0x7741
+0xE489 = 0x7742
+0xE48A = 0x7743
+0xE48B = 0x7744
+0xE48C = 0x7745
+0xE48D = 0x7746
+0xE48E = 0x7747
+0xE48F = 0x7748
+0xE490 = 0x7749
+0xE491 = 0x774A
+0xE492 = 0x774B
+0xE493 = 0x774C
+0xE494 = 0x774D
+0xE495 = 0x774E
+0xE496 = 0x774F
+0xE497 = 0x7750
+0xE498 = 0x7751
+0xE499 = 0x7752
+0xE49A = 0x7753
+0xE49B = 0x7754
+0xE49C = 0x7755
+0xE49D = 0x7756
+0xE49E = 0x7757
+0xE49F = 0x7758
+0xE4A0 = 0x7759
+0xE4A1 = 0x775A
+0xE4A2 = 0x775B
+0xE4A3 = 0x775C
+0xE4A4 = 0x775D
+0xE4A5 = 0x775E
+0xE4A6 = 0x775F
+0xE4A7 = 0x7760
+0xE4A8 = 0x7761
+0xE4A9 = 0x7762
+0xE4AA = 0x7763
+0xE4AB = 0x7764
+0xE4AC = 0x7765
+0xE4AD = 0x7766
+0xE4AE = 0x7767
+0xE4AF = 0x7768
+0xE4B0 = 0x7769
+0xE4B1 = 0x776A
+0xE4B2 = 0x776B
+0xE4B3 = 0x776C
+0xE4B4 = 0x776D
+0xE4B5 = 0x776E
+0xE4B6 = 0x776F
+0xE4B7 = 0x7770
+0xE4B8 = 0x7771
+0xE4B9 = 0x7772
+0xE4BA = 0x7773
+0xE4BB = 0x7774
+0xE4BC = 0x7775
+0xE4BD = 0x7776
+0xE4BE = 0x7777
+0xE4BF = 0x7778
+0xE4C0 = 0x7779
+0xE4C1 = 0x777A
+0xE4C2 = 0x777B
+0xE4C3 = 0x777C
+0xE4C4 = 0x777D
+0xE4C5 = 0x777E
+0xE4C6 = 0x7821
+0xE4C7 = 0x7822
+0xE4C8 = 0x7823
+0xE4C9 = 0x7824
+0xE4CA = 0x7825
+0xE4CB = 0x7826
+0xE4CC = 0x7827
+0xE4CD = 0x7828
+0xE4CE = 0x7829
+0xE4CF = 0x782A
+0xE4D0 = 0x782B
+0xE4D1 = 0x782C
+0xE4D2 = 0x782D
+0xE4D3 = 0x782E
+0xE4D4 = 0x782F
+0xE4D5 = 0x7830
+0xE4D6 = 0x7831
+0xE4D7 = 0x7832
+0xE4D8 = 0x7833
+0xE4D9 = 0x7834
+0xE4DA = 0x7835
+0xE4DB = 0x7836
+0xE4DC = 0x7837
+0xE4DD = 0x7838
+0xE4DE = 0x7839
+0xE4DF = 0x783A
+0xE4E0 = 0x783B
+0xE4E1 = 0x783C
+0xE4E2 = 0x783D
+0xE4E3 = 0x783E
+0xE4E4 = 0x783F
+0xE4E5 = 0x7840
+0xE4E6 = 0x7841
+0xE4E7 = 0x7842
+0xE4E8 = 0x7843
+0xE4E9 = 0x7844
+0xE4EA = 0x7845
+0xE4EB = 0x7846
+0xE4EC = 0x7847
+0xE4ED = 0x7848
+0xE4EE = 0x7849
+0xE4EF = 0x784A
+0xE4F0 = 0x784B
+0xE4F1 = 0x784C
+0xE4F2 = 0x784D
+0xE4F3 = 0x784E
+0xE4F4 = 0x784F
+0xE4F5 = 0x7850
+0xE4F6 = 0x7851
+0xE4F7 = 0x7852
+0xE4F8 = 0x7853
+0xE4F9 = 0x7854
+0xE4FA = 0x7855
+0xE4FB = 0x7856
+0xE4FC = 0x7857
+0xE4FD = 0x7858
+0xE4FE = 0x7859
+0xE4FF = 0x785A
+0xE500 = 0x785B
+0xE501 = 0x785C
+0xE502 = 0x785D
+0xE503 = 0x785E
+0xE504 = 0x785F
+0xE505 = 0x7860
+0xE506 = 0x7861
+0xE507 = 0x7862
+0xE508 = 0x7863
+0xE509 = 0x7864
+0xE50A = 0x7865
+0xE50B = 0x7866
+0xE50C = 0x7867
+0xE50D = 0x7868
+0xE50E = 0x7869
+0xE50F = 0x786A
+0xE510 = 0x786B
+0xE511 = 0x786C
+0xE512 = 0x786D
+0xE513 = 0x786E
+0xE514 = 0x786F
+0xE515 = 0x7870
+0xE516 = 0x7871
+0xE517 = 0x7872
+0xE518 = 0x7873
+0xE519 = 0x7874
+0xE51A = 0x7875
+0xE51B = 0x7876
+0xE51C = 0x7877
+0xE51D = 0x7878
+0xE51E = 0x7879
+0xE51F = 0x787A
+0xE520 = 0x787B
+0xE521 = 0x787C
+0xE522 = 0x787D
+0xE523 = 0x787E
+0xE524 = 0x7921
+0xE525 = 0x7922
+0xE526 = 0x7923
+0xE527 = 0x7924
+0xE528 = 0x7925
+0xE529 = 0x7926
+0xE52A = 0x7927
+0xE52B = 0x7928
+0xE52C = 0x7929
+0xE52D = 0x792A
+0xE52E = 0x792B
+0xE52F = 0x792C
+0xE530 = 0x792D
+0xE531 = 0x792E
+0xE532 = 0x792F
+0xE533 = 0x7930
+0xE534 = 0x7931
+0xE535 = 0x7932
+0xE536 = 0x7933
+0xE537 = 0x7934
+0xE538 = 0x7935
+0xE539 = 0x7936
+0xE53A = 0x7937
+0xE53B = 0x7938
+0xE53C = 0x7939
+0xE53D = 0x793A
+0xE53E = 0x793B
+0xE53F = 0x793C
+0xE540 = 0x793D
+0xE541 = 0x793E
+0xE542 = 0x793F
+0xE543 = 0x7940
+0xE544 = 0x7941
+0xE545 = 0x7942
+0xE546 = 0x7943
+0xE547 = 0x7944
+0xE548 = 0x7945
+0xE549 = 0x7946
+0xE54A = 0x7947
+0xE54B = 0x7948
+0xE54C = 0x7949
+0xE54D = 0x794A
+0xE54E = 0x794B
+0xE54F = 0x794C
+0xE550 = 0x794D
+0xE551 = 0x794E
+0xE552 = 0x794F
+0xE553 = 0x7950
+0xE554 = 0x7951
+0xE555 = 0x7952
+0xE556 = 0x7953
+0xE557 = 0x7954
+0xE558 = 0x7955
+0xE559 = 0x7956
+0xE55A = 0x7957
+0xE55B = 0x7958
+0xE55C = 0x7959
+0xE55D = 0x795A
+0xE55E = 0x795B
+0xE55F = 0x795C
+0xE560 = 0x795D
+0xE561 = 0x795E
+0xE562 = 0x795F
+0xE563 = 0x7960
+0xE564 = 0x7961
+0xE565 = 0x7962
+0xE566 = 0x7963
+0xE567 = 0x7964
+0xE568 = 0x7965
+0xE569 = 0x7966
+0xE56A = 0x7967
+0xE56B = 0x7968
+0xE56C = 0x7969
+0xE56D = 0x796A
+0xE56E = 0x796B
+0xE56F = 0x796C
+0xE570 = 0x796D
+0xE571 = 0x796E
+0xE572 = 0x796F
+0xE573 = 0x7970
+0xE574 = 0x7971
+0xE575 = 0x7972
+0xE576 = 0x7973
+0xE577 = 0x7974
+0xE578 = 0x7975
+0xE579 = 0x7976
+0xE57A = 0x7977
+0xE57B = 0x7978
+0xE57C = 0x7979
+0xE57D = 0x797A
+0xE57E = 0x797B
+0xE57F = 0x797C
+0xE580 = 0x797D
+0xE581 = 0x797E
+0xE582 = 0x7A21
+0xE583 = 0x7A22
+0xE584 = 0x7A23
+0xE585 = 0x7A24
+0xE586 = 0x7A25
+0xE587 = 0x7A26
+0xE588 = 0x7A27
+0xE589 = 0x7A28
+0xE58A = 0x7A29
+0xE58B = 0x7A2A
+0xE58C = 0x7A2B
+0xE58D = 0x7A2C
+0xE58E = 0x7A2D
+0xE58F = 0x7A2E
+0xE590 = 0x7A2F
+0xE591 = 0x7A30
+0xE592 = 0x7A31
+0xE593 = 0x7A32
+0xE594 = 0x7A33
+0xE595 = 0x7A34
+0xE596 = 0x7A35
+0xE597 = 0x7A36
+0xE598 = 0x7A37
+0xE599 = 0x7A38
+0xE59A = 0x7A39
+0xE59B = 0x7A3A
+0xE59C = 0x7A3B
+0xE59D = 0x7A3C
+0xE59E = 0x7A3D
+0xE59F = 0x7A3E
+0xE5A0 = 0x7A3F
+0xE5A1 = 0x7A40
+0xE5A2 = 0x7A41
+0xE5A3 = 0x7A42
+0xE5A4 = 0x7A43
+0xE5A5 = 0x7A44
+0xE5A6 = 0x7A45
+0xE5A7 = 0x7A46
+0xE5A8 = 0x7A47
+0xE5A9 = 0x7A48
+0xE5AA = 0x7A49
+0xE5AB = 0x7A4A
+0xE5AC = 0x7A4B
+0xE5AD = 0x7A4C
+0xE5AE = 0x7A4D
+0xE5AF = 0x7A4E
+0xE5B0 = 0x7A4F
+0xE5B1 = 0x7A50
+0xE5B2 = 0x7A51
+0xE5B3 = 0x7A52
+0xE5B4 = 0x7A53
+0xE5B5 = 0x7A54
+0xE5B6 = 0x7A55
+0xE5B7 = 0x7A56
+0xE5B8 = 0x7A57
+0xE5B9 = 0x7A58
+0xE5BA = 0x7A59
+0xE5BB = 0x7A5A
+0xE5BC = 0x7A5B
+0xE5BD = 0x7A5C
+0xE5BE = 0x7A5D
+0xE5BF = 0x7A5E
+0xE5C0 = 0x7A5F
+0xE5C1 = 0x7A60
+0xE5C2 = 0x7A61
+0xE5C3 = 0x7A62
+0xE5C4 = 0x7A63
+0xE5C5 = 0x7A64
+0xE5C6 = 0x7A65
+0xE5C7 = 0x7A66
+0xE5C8 = 0x7A67
+0xE5C9 = 0x7A68
+0xE5CA = 0x7A69
+0xE5CB = 0x7A6A
+0xE5CC = 0x7A6B
+0xE5CD = 0x7A6C
+0xE5CE = 0x7A6D
+0xE5CF = 0x7A6E
+0xE5D0 = 0x7A6F
+0xE5D1 = 0x7A70
+0xE5D2 = 0x7A71
+0xE5D3 = 0x7A72
+0xE5D4 = 0x7A73
+0xE5D5 = 0x7A74
+0xE5D6 = 0x7A75
+0xE5D7 = 0x7A76
+0xE5D8 = 0x7A77
+0xE5D9 = 0x7A78
+0xE5DA = 0x7A79
+0xE5DB = 0x7A7A
+0xE5DC = 0x7A7B
+0xE5DD = 0x7A7C
+0xE5DE = 0x7A7D
+0xE5DF = 0x7A7E
+0xE5E0 = 0x7B21
+0xE5E1 = 0x7B22
+0xE5E2 = 0x7B23
+0xE5E3 = 0x7B24
+0xE5E4 = 0x7B25
+0xE5E5 = 0x7B26
+0xE5E6 = 0x7B27
+0xE5E7 = 0x7B28
+0xE5E8 = 0x7B29
+0xE5E9 = 0x7B2A
+0xE5EA = 0x7B2B
+0xE5EB = 0x7B2C
+0xE5EC = 0x7B2D
+0xE5ED = 0x7B2E
+0xE5EE = 0x7B2F
+0xE5EF = 0x7B30
+0xE5F0 = 0x7B31
+0xE5F1 = 0x7B32
+0xE5F2 = 0x7B33
+0xE5F3 = 0x7B34
+0xE5F4 = 0x7B35
+0xE5F5 = 0x7B36
+0xE5F6 = 0x7B37
+0xE5F7 = 0x7B38
+0xE5F8 = 0x7B39
+0xE5F9 = 0x7B3A
+0xE5FA = 0x7B3B
+0xE5FB = 0x7B3C
+0xE5FC = 0x7B3D
+0xE5FD = 0x7B3E
+0xE5FE = 0x7B3F
+0xE5FF = 0x7B40
+0xE600 = 0x7B41
+0xE601 = 0x7B42
+0xE602 = 0x7B43
+0xE603 = 0x7B44
+0xE604 = 0x7B45
+0xE605 = 0x7B46
+0xE606 = 0x7B47
+0xE607 = 0x7B48
+0xE608 = 0x7B49
+0xE609 = 0x7B4A
+0xE60A = 0x7B4B
+0xE60B = 0x7B4C
+0xE60C = 0x7B4D
+0xE60D = 0x7B4E
+0xE60E = 0x7B4F
+0xE60F = 0x7B50
+0xE610 = 0x7B51
+0xE611 = 0x7B52
+0xE612 = 0x7B53
+0xE613 = 0x7B54
+0xE614 = 0x7B55
+0xE615 = 0x7B56
+0xE616 = 0x7B57
+0xE617 = 0x7B58
+0xE618 = 0x7B59
+0xE619 = 0x7B5A
+0xE61A = 0x7B5B
+0xE61B = 0x7B5C
+0xE61C = 0x7B5D
+0xE61D = 0x7B5E
+0xE61E = 0x7B5F
+0xE61F = 0x7B60
+0xE620 = 0x7B61
+0xE621 = 0x7B62
+0xE622 = 0x7B63
+0xE623 = 0x7B64
+0xE624 = 0x7B65
+0xE625 = 0x7B66
+0xE626 = 0x7B67
+0xE627 = 0x7B68
+0xE628 = 0x7B69
+0xE629 = 0x7B6A
+0xE62A = 0x7B6B
+0xE62B = 0x7B6C
+0xE62C = 0x7B6D
+0xE62D = 0x7B6E
+0xE62E = 0x7B6F
+0xE62F = 0x7B70
+0xE630 = 0x7B71
+0xE631 = 0x7B72
+0xE632 = 0x7B73
+0xE633 = 0x7B74
+0xE634 = 0x7B75
+0xE635 = 0x7B76
+0xE636 = 0x7B77
+0xE637 = 0x7B78
+0xE638 = 0x7B79
+0xE639 = 0x7B7A
+0xE63A = 0x7B7B
+0xE63B = 0x7B7C
+0xE63C = 0x7B7D
+0xE63D = 0x7B7E
+0xE63E = 0x7C21
+0xE63F = 0x7C22
+0xE640 = 0x7C23
+0xE641 = 0x7C24
+0xE642 = 0x7C25
+0xE643 = 0x7C26
+0xE644 = 0x7C27
+0xE645 = 0x7C28
+0xE646 = 0x7C29
+0xE647 = 0x7C2A
+0xE648 = 0x7C2B
+0xE649 = 0x7C2C
+0xE64A = 0x7C2D
+0xE64B = 0x7C2E
+0xE64C = 0x7C2F
+0xE64D = 0x7C30
+0xE64E = 0x7C31
+0xE64F = 0x7C32
+0xE650 = 0x7C33
+0xE651 = 0x7C34
+0xE652 = 0x7C35
+0xE653 = 0x7C36
+0xE654 = 0x7C37
+0xE655 = 0x7C38
+0xE656 = 0x7C39
+0xE657 = 0x7C3A
+0xE658 = 0x7C3B
+0xE659 = 0x7C3C
+0xE65A = 0x7C3D
+0xE65B = 0x7C3E
+0xE65C = 0x7C3F
+0xE65D = 0x7C40
+0xE65E = 0x7C41
+0xE65F = 0x7C42
+0xE660 = 0x7C43
+0xE661 = 0x7C44
+0xE662 = 0x7C45
+0xE663 = 0x7C46
+0xE664 = 0x7C47
+0xE665 = 0x7C48
+0xE666 = 0x7C49
+0xE667 = 0x7C4A
+0xE668 = 0x7C4B
+0xE669 = 0x7C4C
+0xE66A = 0x7C4D
+0xE66B = 0x7C4E
+0xE66C = 0x7C4F
+0xE66D = 0x7C50
+0xE66E = 0x7C51
+0xE66F = 0x7C52
+0xE670 = 0x7C53
+0xE671 = 0x7C54
+0xE672 = 0x7C55
+0xE673 = 0x7C56
+0xE674 = 0x7C57
+0xE675 = 0x7C58
+0xE676 = 0x7C59
+0xE677 = 0x7C5A
+0xE678 = 0x7C5B
+0xE679 = 0x7C5C
+0xE67A = 0x7C5D
+0xE67B = 0x7C5E
+0xE67C = 0x7C5F
+0xE67D = 0x7C60
+0xE67E = 0x7C61
+0xE67F = 0x7C62
+0xE680 = 0x7C63
+0xE681 = 0x7C64
+0xE682 = 0x7C65
+0xE683 = 0x7C66
+0xE684 = 0x7C67
+0xE685 = 0x7C68
+0xE686 = 0x7C69
+0xE687 = 0x7C6A
+0xE688 = 0x7C6B
+0xE689 = 0x7C6C
+0xE68A = 0x7C6D
+0xE68B = 0x7C6E
+0xE68C = 0x7C6F
+0xE68D = 0x7C70
+0xE68E = 0x7C71
+0xE68F = 0x7C72
+0xE690 = 0x7C73
+0xE691 = 0x7C74
+0xE692 = 0x7C75
+0xE693 = 0x7C76
+0xE694 = 0x7C77
+0xE695 = 0x7C78
+0xE696 = 0x7C79
+0xE697 = 0x7C7A
+0xE698 = 0x7C7B
+0xE699 = 0x7C7C
+0xE69A = 0x7C7D
+0xE69B = 0x7C7E
+0xE69C = 0x7D21
+0xE69D = 0x7D22
+0xE69E = 0x7D23
+0xE69F = 0x7D24
+0xE6A0 = 0x7D25
+0xE6A1 = 0x7D26
+0xE6A2 = 0x7D27
+0xE6A3 = 0x7D28
+0xE6A4 = 0x7D29
+0xE6A5 = 0x7D2A
+0xE6A6 = 0x7D2B
+0xE6A7 = 0x7D2C
+0xE6A8 = 0x7D2D
+0xE6A9 = 0x7D2E
+0xE6AA = 0x7D2F
+0xE6AB = 0x7D30
+0xE6AC = 0x7D31
+0xE6AD = 0x7D32
+0xE6AE = 0x7D33
+0xE6AF = 0x7D34
+0xE6B0 = 0x7D35
+0xE6B1 = 0x7D36
+0xE6B2 = 0x7D37
+0xE6B3 = 0x7D38
+0xE6B4 = 0x7D39
+0xE6B5 = 0x7D3A
+0xE6B6 = 0x7D3B
+0xE6B7 = 0x7D3C
+0xE6B8 = 0x7D3D
+0xE6B9 = 0x7D3E
+0xE6BA = 0x7D3F
+0xE6BB = 0x7D40
+0xE6BC = 0x7D41
+0xE6BD = 0x7D42
+0xE6BE = 0x7D43
+0xE6BF = 0x7D44
+0xE6C0 = 0x7D45
+0xE6C1 = 0x7D46
+0xE6C2 = 0x7D47
+0xE6C3 = 0x7D48
+0xE6C4 = 0x7D49
+0xE6C5 = 0x7D4A
+0xE6C6 = 0x7D4B
+0xE6C7 = 0x7D4C
+0xE6C8 = 0x7D4D
+0xE6C9 = 0x7D4E
+0xE6CA = 0x7D4F
+0xE6CB = 0x7D50
+0xE6CC = 0x7D51
+0xE6CD = 0x7D52
+0xE6CE = 0x7D53
+0xE6CF = 0x7D54
+0xE6D0 = 0x7D55
+0xE6D1 = 0x7D56
+0xE6D2 = 0x7D57
+0xE6D3 = 0x7D58
+0xE6D4 = 0x7D59
+0xE6D5 = 0x7D5A
+0xE6D6 = 0x7D5B
+0xE6D7 = 0x7D5C
+0xE6D8 = 0x7D5D
+0xE6D9 = 0x7D5E
+0xE6DA = 0x7D5F
+0xE6DB = 0x7D60
+0xE6DC = 0x7D61
+0xE6DD = 0x7D62
+0xE6DE = 0x7D63
+0xE6DF = 0x7D64
+0xE6E0 = 0x7D65
+0xE6E1 = 0x7D66
+0xE6E2 = 0x7D67
+0xE6E3 = 0x7D68
+0xE6E4 = 0x7D69
+0xE6E5 = 0x7D6A
+0xE6E6 = 0x7D6B
+0xE6E7 = 0x7D6C
+0xE6E8 = 0x7D6D
+0xE6E9 = 0x7D6E
+0xE6EA = 0x7D6F
+0xE6EB = 0x7D70
+0xE6EC = 0x7D71
+0xE6ED = 0x7D72
+0xE6EE = 0x7D73
+0xE6EF = 0x7D74
+0xE6F0 = 0x7D75
+0xE6F1 = 0x7D76
+0xE6F2 = 0x7D77
+0xE6F3 = 0x7D78
+0xE6F4 = 0x7D79
+0xE6F5 = 0x7D7A
+0xE6F6 = 0x7D7B
+0xE6F7 = 0x7D7C
+0xE6F8 = 0x7D7D
+0xE6F9 = 0x7D7E
+0xE6FA = 0x7E21
+0xE6FB = 0x7E22
+0xE6FC = 0x7E23
+0xE6FD = 0x7E24
+0xE6FE = 0x7E25
+0xE6FF = 0x7E26
+0xE700 = 0x7E27
+0xE701 = 0x7E28
+0xE702 = 0x7E29
+0xE703 = 0x7E2A
+0xE704 = 0x7E2B
+0xE705 = 0x7E2C
+0xE706 = 0x7E2D
+0xE707 = 0x7E2E
+0xE708 = 0x7E2F
+0xE709 = 0x7E30
+0xE70A = 0x7E31
+0xE70B = 0x7E32
+0xE70C = 0x7E33
+0xE70D = 0x7E34
+0xE70E = 0x7E35
+0xE70F = 0x7E36
+0xE710 = 0x7E37
+0xE711 = 0x7E38
+0xE712 = 0x7E39
+0xE713 = 0x7E3A
+0xE714 = 0x7E3B
+0xE715 = 0x7E3C
+0xE716 = 0x7E3D
+0xE717 = 0x7E3E
+0xE718 = 0x7E3F
+0xE719 = 0x7E40
+0xE71A = 0x7E41
+0xE71B = 0x7E42
+0xE71C = 0x7E43
+0xE71D = 0x7E44
+0xE71E = 0x7E45
+0xE71F = 0x7E46
+0xE720 = 0x7E47
+0xE721 = 0x7E48
+0xE722 = 0x7E49
+0xE723 = 0x7E4A
+0xE724 = 0x7E4B
+0xE725 = 0x7E4C
+0xE726 = 0x7E4D
+0xE727 = 0x7E4E
+0xE728 = 0x7E4F
+0xE729 = 0x7E50
+0xE72A = 0x7E51
+0xE72B = 0x7E52
+0xE72C = 0x7E53
+0xE72D = 0x7E54
+0xE72E = 0x7E55
+0xE72F = 0x7E56
+0xE730 = 0x7E57
+0xE731 = 0x7E58
+0xE732 = 0x7E59
+0xE733 = 0x7E5A
+0xE734 = 0x7E5B
+0xE735 = 0x7E5C
+0xE736 = 0x7E5D
+0xE737 = 0x7E5E
+0xE738 = 0x7E5F
+0xE739 = 0x7E60
+0xE73A = 0x7E61
+0xE73B = 0x7E62
+0xE73C = 0x7E63
+0xE73D = 0x7E64
+0xE73E = 0x7E65
+0xE73F = 0x7E66
+0xE740 = 0x7E67
+0xE741 = 0x7E68
+0xE742 = 0x7E69
+0xE743 = 0x7E6A
+0xE744 = 0x7E6B
+0xE745 = 0x7E6C
+0xE746 = 0x7E6D
+0xE747 = 0x7E6E
+0xE748 = 0x7E6F
+0xE749 = 0x7E70
+0xE74A = 0x7E71
+0xE74B = 0x7E72
+0xE74C = 0x7E73
+0xE74D = 0x7E74
+0xE74E = 0x7E75
+0xE74F = 0x7E76
+0xE750 = 0x7E77
+0xE751 = 0x7E78
+0xE752 = 0x7E79
+0xE753 = 0x7E7A
+0xE754 = 0x7E7B
+0xE755 = 0x7E7C
+0xE756 = 0x7E7D
+0xE757 = 0x7E7E
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212VDC@IBM.src b/enc/trans/JIS/UCS%JISX0212VDC@IBM.src
new file mode 100644
index 0000000000..0863140750
--- /dev/null
+++ b/enc/trans/JIS/UCS%JISX0212VDC@IBM.src
@@ -0,0 +1,121 @@
+# $NetBSD: UCS%JISX0212VDC@IBM.src,v 1.1 2003/07/19 20:20:43 tshiozak Exp $
+
+TYPE		ROWCOL
+NAME		"UCS/JISX0212VDC:IBM"
+SRC_ZONE	0x2116 - 0xFF07
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+0x2116 - 0xFF07		= INVALID
+#
+# This data is derived from http://www.opengroup.or.jp/jvc/cde/
+#
+0x2116 = 0x742C
+0x2121 = 0x742D
+0x2160 = 0x737D
+0x2161 = 0x737E
+0x2162 = 0x7421
+0x2163 = 0x7422
+0x2164 = 0x7423
+0x2165 = 0x7424
+0x2166 = 0x7425
+0x2167 = 0x7426
+0x2168 = 0x7427
+0x2169 = 0x7428
+0x2170 = 0x7373
+0x2171 = 0x7374
+0x2172 = 0x7375
+0x2173 = 0x7376
+0x2174 = 0x7377
+0x2175 = 0x7378
+0x2176 = 0x7379
+0x2177 = 0x737A
+0x2178 = 0x737B
+0x2179 = 0x737C
+0x3231 = 0x742B
+0x4EFC = 0x742F
+0x50F4 = 0x7430
+0x51EC = 0x7431
+0x5307 = 0x7432
+0x5324 = 0x7433
+0x548A = 0x7435
+0x5759 = 0x7436
+0x589E = 0x7439
+0x5BEC = 0x743A
+0x5CF5 = 0x743B
+0x5D53 = 0x743C
+0x5FB7 = 0x743E
+0x6085 = 0x743F
+0x6120 = 0x7440
+0x654E = 0x7441
+0x663B = 0x7442
+0x6665 = 0x7443
+0x6801 = 0x7446
+0x6A6B = 0x7449
+0x6AE2 = 0x744A
+0x6DF2 = 0x744C
+0x6DF8 = 0x744B
+0x7028 = 0x744D
+0x70BB = 0x742E
+0x7501 = 0x7450
+0x7682 = 0x7451
+0x769E = 0x7452
+0x7930 = 0x7454
+0x7AE7 = 0x7459
+0x7DA0 = 0x745C
+0x7DD6 = 0x745D
+0x8362 = 0x745F
+0x85B0 = 0x7461
+0x8807 = 0x7464
+0x8B7F = 0x7466
+0x8CF4 = 0x7467
+0x8D76 = 0x7468
+0x90DE = 0x746C
+0x9115 = 0x746E
+0x9592 = 0x7471
+0x973B = 0x7474
+0x974D = 0x7475
+0x9751 = 0x7476
+0x999E = 0x747A
+0x9AD9 = 0x747B
+0x9B72 = 0x747C
+0x9ED1 = 0x747E
+0xF929 = 0x7445
+0xF9DC = 0x7472
+0xFA0E = 0x7434
+0xFA0F = 0x7437
+0xFA10 = 0x7438
+0xFA11 = 0x743D
+0xFA12 = 0x7444
+0xFA13 = 0x7447
+0xFA14 = 0x7448
+0xFA15 = 0x744E
+0xFA16 = 0x744F
+0xFA17 = 0x7453
+0xFA18 = 0x7455
+0xFA19 = 0x7456
+0xFA1A = 0x7457
+0xFA1B = 0x7458
+0xFA1C = 0x745A
+0xFA1D = 0x745B
+0xFA1E = 0x745E
+0xFA1F = 0x7460
+0xFA20 = 0x7462
+0xFA21 = 0x7463
+0xFA22 = 0x7465
+0xFA23 = 0x7469
+0xFA24 = 0x746A
+0xFA25 = 0x746B
+0xFA26 = 0x746D
+0xFA27 = 0x746F
+0xFA28 = 0x7470
+0xFA29 = 0x7473
+0xFA2A = 0x7477
+0xFA2B = 0x7478
+0xFA2C = 0x7479
+0xFA2D = 0x747D
+0xFF02 = 0x742A
+0xFF07 = 0x7429
+END_MAP
diff --git a/enc/trans/big5-hkscs-tbl.rb b/enc/trans/big5-hkscs-tbl.rb
new file mode 100644
index 0000000000..5a82d3b3d2
--- /dev/null
+++ b/enc/trans/big5-hkscs-tbl.rb
@@ -0,0 +1,18385 @@
+BIG5_HKSCS_TO_UCS_TBL= [
+  ["A246",0xA2],
+  ["A247",0xA3],
+  ["A244",0xA5],
+  ["A1B1",0xA7],
+  ["C6D8",0xA8],
+  ["A258",0xB0],
+  ["A1D3",0xB1],
+  ["A150",0xB7],
+  ["8859",0xC0],
+  ["8857",0xC1],
+  ["885D",0xC8],
+  ["885B",0xC9],
+  ["8866",0xCA],
+  ["8861",0xD2],
+  ["885F",0xD3],
+  ["A1D1",0xD7],
+  ["886A",0xE0],
+  ["8868",0xE1],
+  ["886F",0xE8],
+  ["886D",0xE9],
+  ["88A7",0xEA],
+  ["8873",0xEC],
+  ["8871",0xED],
+  ["8877",0xF2],
+  ["8875",0xF3],
+  ["A1D2",0xF7],
+  ["C8FB",0xF8],
+  ["887B",0xF9],
+  ["8879",0xFA],
+  ["88A2",0xFC],
+  ["8856",0x100],
+  ["8867",0x101],
+  ["885A",0x112],
+  ["886C",0x113],
+  ["885C",0x11A],
+  ["886E",0x11B],
+  ["8870",0x12B],
+  ["C8FC",0x14B],
+  ["885E",0x14C],
+  ["8874",0x14D],
+  ["C8FA",0x153],
+  ["8878",0x16B],
+  ["8858",0x1CD],
+  ["8869",0x1CE],
+  ["8872",0x1D0],
+  ["8860",0x1D1],
+  ["8876",0x1D2],
+  ["887A",0x1D4],
+  ["887C",0x1D6],
+  ["887D",0x1D8],
+  ["887E",0x1DA],
+  ["88A1",0x1DC],
+  ["C8F6",0x250],
+  ["886B",0x251],
+  ["C8F8",0x254],
+  ["C8F7",0x25B],
+  ["88A8",0x261],
+  ["C8FE",0x26A],
+  ["C8F9",0x275],
+  ["C8F5",0x283],
+  ["C8FD",0x28A],
+  ["C6D9",0x2C6],
+  ["A3BE",0x2C7],
+  ["A3BC",0x2C9],
+  ["A3BD",0x2CA],
+  ["A3BF",0x2CB],
+  ["A3BB",0x2D9],
+  ["A344",0x391],
+  ["A345",0x392],
+  ["A346",0x393],
+  ["A347",0x394],
+  ["A348",0x395],
+  ["A349",0x396],
+  ["A34A",0x397],
+  ["A34B",0x398],
+  ["A34C",0x399],
+  ["A34D",0x39A],
+  ["A34E",0x39B],
+  ["A34F",0x39C],
+  ["A350",0x39D],
+  ["A351",0x39E],
+  ["A352",0x39F],
+  ["A353",0x3A0],
+  ["A354",0x3A1],
+  ["A355",0x3A3],
+  ["A356",0x3A4],
+  ["A357",0x3A5],
+  ["A358",0x3A6],
+  ["A359",0x3A7],
+  ["A35A",0x3A8],
+  ["A35B",0x3A9],
+  ["A35C",0x3B1],
+  ["A35D",0x3B2],
+  ["A35E",0x3B3],
+  ["A35F",0x3B4],
+  ["A360",0x3B5],
+  ["A361",0x3B6],
+  ["A362",0x3B7],
+  ["A363",0x3B8],
+  ["A364",0x3B9],
+  ["A365",0x3BA],
+  ["A366",0x3BB],
+  ["A367",0x3BC],
+  ["A368",0x3BD],
+  ["A369",0x3BE],
+  ["A36A",0x3BF],
+  ["A36B",0x3C0],
+  ["A36C",0x3C1],
+  ["A36D",0x3C3],
+  ["A36E",0x3C4],
+  ["A36F",0x3C5],
+  ["A370",0x3C6],
+  ["A371",0x3C7],
+  ["A372",0x3C8],
+  ["A373",0x3C9],
+  ["C7F9",0x401],
+  ["C7F3",0x410],
+  ["C7F4",0x411],
+  ["C7F5",0x412],
+  ["C7F6",0x413],
+  ["C7F7",0x414],
+  ["C7F8",0x415],
+  ["C7FA",0x416],
+  ["C7FB",0x417],
+  ["C7FC",0x418],
+  ["C7FD",0x419],
+  ["C7FE",0x41A],
+  ["C840",0x41B],
+  ["C841",0x41C],
+  ["C842",0x41D],
+  ["C843",0x41E],
+  ["C844",0x41F],
+  ["C845",0x420],
+  ["C846",0x421],
+  ["C847",0x422],
+  ["C848",0x423],
+  ["C849",0x424],
+  ["C84A",0x425],
+  ["C84B",0x426],
+  ["C84C",0x427],
+  ["C84D",0x428],
+  ["C84E",0x429],
+  ["C84F",0x42A],
+  ["C850",0x42B],
+  ["C851",0x42C],
+  ["C852",0x42D],
+  ["C853",0x42E],
+  ["C854",0x42F],
+  ["C855",0x430],
+  ["C856",0x431],
+  ["C857",0x432],
+  ["C858",0x433],
+  ["C859",0x434],
+  ["C85A",0x435],
+  ["C85C",0x436],
+  ["C85D",0x437],
+  ["C85E",0x438],
+  ["C85F",0x439],
+  ["C860",0x43A],
+  ["C861",0x43B],
+  ["C862",0x43C],
+  ["C863",0x43D],
+  ["C864",0x43E],
+  ["C865",0x43F],
+  ["C866",0x440],
+  ["C867",0x441],
+  ["C868",0x442],
+  ["C869",0x443],
+  ["C86A",0x444],
+  ["C86B",0x445],
+  ["C86C",0x446],
+  ["C86D",0x447],
+  ["C86E",0x448],
+  ["C86F",0x449],
+  ["C870",0x44A],
+  ["C871",0x44B],
+  ["C872",0x44C],
+  ["C873",0x44D],
+  ["C874",0x44E],
+  ["C875",0x44F],
+  ["C85B",0x451],
+  ["8863",0x1EBE],
+  ["88A4",0x1EBF],
+  ["8865",0x1EC0],
+  ["88A6",0x1EC1],
+  ["A156",0x2013],
+  ["A158",0x2014],
+  ["A1A5",0x2018],
+  ["A1A6",0x2019],
+  ["A1A7",0x201C],
+  ["A1A8",0x201D],
+  ["A145",0x2022],
+  ["A14C",0x2025],
+  ["A14B",0x2026],
+  ["A1AC",0x2032],
+  ["A1AB",0x2035],
+  ["A1B0",0x203B],
+  ["A1C2",0x203E],
+  ["A24A",0x2103],
+  ["A1C1",0x2105],
+  ["A24B",0x2109],
+  ["C8D2",0x2116],
+  ["C8D3",0x2121],
+  ["A2B9",0x2160],
+  ["A2BA",0x2161],
+  ["A2BB",0x2162],
+  ["A2BC",0x2163],
+  ["A2BD",0x2164],
+  ["A2BE",0x2165],
+  ["A2BF",0x2166],
+  ["A2C0",0x2167],
+  ["A2C1",0x2168],
+  ["A2C2",0x2169],
+  ["C6B5",0x2170],
+  ["C6B6",0x2171],
+  ["C6B7",0x2172],
+  ["C6B8",0x2173],
+  ["C6B9",0x2174],
+  ["C6BA",0x2175],
+  ["C6BB",0x2176],
+  ["C6BC",0x2177],
+  ["C6BD",0x2178],
+  ["C6BE",0x2179],
+  ["A1F6",0x2190],
+  ["A1F4",0x2191],
+  ["A1F7",0x2192],
+  ["A1F5",0x2193],
+  ["A1F8",0x2196],
+  ["A1F9",0x2197],
+  ["A1FB",0x2198],
+  ["A1FA",0x2199],
+  ["C877",0x21B8],
+  ["C878",0x21B9],
+  ["C876",0x21E7],
+  ["A1D4",0x221A],
+  ["A1DB",0x221E],
+  ["A1E8",0x221F],
+  ["A1E7",0x2220],
+  ["A1FD",0x2223],
+  ["A1FC",0x2225],
+  ["A1E4",0x2229],
+  ["A1E5",0x222A],
+  ["A1EC",0x222B],
+  ["A1ED",0x222E],
+  ["A1EF",0x2234],
+  ["A1EE",0x2235],
+  ["A1E3",0x223C],
+  ["A1DC",0x2252],
+  ["A1DA",0x2260],
+  ["A1DD",0x2261],
+  ["A1D8",0x2266],
+  ["A1D9",0x2267],
+  ["A1E6",0x22A5],
+  ["A1E9",0x22BF],
+  ["88A9",0x23DA],
+  ["88AA",0x23DB],
+  ["C6A1",0x2460],
+  ["C6A2",0x2461],
+  ["C6A3",0x2462],
+  ["C6A4",0x2463],
+  ["C6A5",0x2464],
+  ["C6A6",0x2465],
+  ["C6A7",0x2466],
+  ["C6A8",0x2467],
+  ["C6A9",0x2468],
+  ["C6AA",0x2469],
+  ["C6AB",0x2474],
+  ["C6AC",0x2475],
+  ["C6AD",0x2476],
+  ["C6AE",0x2477],
+  ["C6AF",0x2478],
+  ["C6B0",0x2479],
+  ["C6B1",0x247A],
+  ["C6B2",0x247B],
+  ["C6B3",0x247C],
+  ["C6B4",0x247D],
+  ["A277",0x2500],
+  ["A278",0x2502],
+  ["A27A",0x250C],
+  ["A27B",0x2510],
+  ["A27C",0x2514],
+  ["A27D",0x2518],
+  ["A275",0x251C],
+  ["A274",0x2524],
+  ["A273",0x252C],
+  ["A272",0x2534],
+  ["A271",0x253C],
+  ["A2A4",0x2550],
+  ["F9F8",0x2551],
+  ["F9E6",0x2552],
+  ["F9EF",0x2553],
+  ["F9DD",0x2554],
+  ["F9E8",0x2555],
+  ["F9F1",0x2556],
+  ["F9DF",0x2557],
+  ["F9EC",0x2558],
+  ["F9F5",0x2559],
+  ["F9E3",0x255A],
+  ["F9EE",0x255B],
+  ["F9F7",0x255C],
+  ["F9E5",0x255D],
+  ["A2A5",0x255E],
+  ["F9F2",0x255F],
+  ["F9E0",0x2560],
+  ["A2A7",0x2561],
+  ["F9F4",0x2562],
+  ["F9E2",0x2563],
+  ["F9E7",0x2564],
+  ["F9F0",0x2565],
+  ["F9DE",0x2566],
+  ["F9ED",0x2567],
+  ["F9F6",0x2568],
+  ["F9E4",0x2569],
+  ["A2A6",0x256A],
+  ["F9F3",0x256B],
+  ["F9E1",0x256C],
+  ["A27E",0x256D],
+  ["A2A1",0x256E],
+  ["A2A3",0x256F],
+  ["A2A2",0x2570],
+  ["A2AC",0x2571],
+  ["A2AD",0x2572],
+  ["A2AE",0x2573],
+  ["A262",0x2581],
+  ["A263",0x2582],
+  ["A264",0x2583],
+  ["A265",0x2584],
+  ["A266",0x2585],
+  ["A267",0x2586],
+  ["A268",0x2587],
+  ["A269",0x2588],
+  ["A270",0x2589],
+  ["A26F",0x258A],
+  ["A26E",0x258B],
+  ["A26D",0x258C],
+  ["A26C",0x258D],
+  ["A26B",0x258E],
+  ["A26A",0x258F],
+  ["A276",0x2594],
+  ["A279",0x2595],
+  ["A1BD",0x25A0],
+  ["A1BC",0x25A1],
+  ["A1B6",0x25B2],
+  ["A1B5",0x25B3],
+  ["A1BF",0x25BC],
+  ["A1BE",0x25BD],
+  ["A1BB",0x25C6],
+  ["A1BA",0x25C7],
+  ["A1B3",0x25CB],
+  ["A1B7",0x25CE],
+  ["A1B4",0x25CF],
+  ["A2A8",0x25E2],
+  ["A2A9",0x25E3],
+  ["A2AB",0x25E4],
+  ["A2AA",0x25E5],
+  ["A1B9",0x2605],
+  ["A1B8",0x2606],
+  ["A1F3",0x2609],
+  ["A1F0",0x2640],
+  ["A1F2",0x2641],
+  ["A1F1",0x2642],
+  ["C6E6",0x273D],
+  ["C8D6",0x2E80],
+  ["C8D7",0x2E84],
+  ["C8D8",0x2E86],
+  ["C8D9",0x2E87],
+  ["C8DA",0x2E88],
+  ["C8DB",0x2E8A],
+  ["C8DC",0x2E8C],
+  ["C8DD",0x2E8D],
+  ["C8DE",0x2E95],
+  ["C8DF",0x2E9C],
+  ["C8E0",0x2E9D],
+  ["C8E1",0x2EA5],
+  ["C8E2",0x2EA7],
+  ["C8E3",0x2EAA],
+  ["C8E4",0x2EAC],
+  ["C8E5",0x2EAE],
+  ["C8E6",0x2EB6],
+  ["C8E7",0x2EBC],
+  ["C8E8",0x2EBE],
+  ["C8E9",0x2EC6],
+  ["C8EA",0x2ECA],
+  ["C8EB",0x2ECC],
+  ["C8EC",0x2ECD],
+  ["C8ED",0x2ECF],
+  ["C8EE",0x2ED6],
+  ["C8EF",0x2ED7],
+  ["C8F0",0x2EDE],
+  ["C8F1",0x2EE3],
+  ["C6CD",0x2F33],
+  ["A140",0x3000],
+  ["A142",0x3001],
+  ["A143",0x3002],
+  ["A1B2",0x3003],
+  ["C6E0",0x3005],
+  ["C6E1",0x3006],
+  ["C6E2",0x3007],
+  ["A171",0x3008],
+  ["A172",0x3009],
+  ["A16D",0x300A],
+  ["A16E",0x300B],
+  ["A175",0x300C],
+  ["A176",0x300D],
+  ["A179",0x300E],
+  ["A17A",0x300F],
+  ["A169",0x3010],
+  ["A16A",0x3011],
+  ["A245",0x3012],
+  ["A165",0x3014],
+  ["A166",0x3015],
+  ["A1A9",0x301D],
+  ["A1AA",0x301E],
+  ["A2C3",0x3021],
+  ["A2C4",0x3022],
+  ["A2C5",0x3023],
+  ["A2C6",0x3024],
+  ["A2C7",0x3025],
+  ["A2C8",0x3026],
+  ["A2C9",0x3027],
+  ["A2CA",0x3028],
+  ["A2CB",0x3029],
+  ["C6E7",0x3041],
+  ["C6E8",0x3042],
+  ["C6E9",0x3043],
+  ["C6EA",0x3044],
+  ["C6EB",0x3045],
+  ["C6EC",0x3046],
+  ["C6ED",0x3047],
+  ["C6EE",0x3048],
+  ["C6EF",0x3049],
+  ["C6F0",0x304A],
+  ["C6F1",0x304B],
+  ["C6F2",0x304C],
+  ["C6F3",0x304D],
+  ["C6F4",0x304E],
+  ["C6F5",0x304F],
+  ["C6F6",0x3050],
+  ["C6F7",0x3051],
+  ["C6F8",0x3052],
+  ["C6F9",0x3053],
+  ["C6FA",0x3054],
+  ["C6FB",0x3055],
+  ["C6FC",0x3056],
+  ["C6FD",0x3057],
+  ["C6FE",0x3058],
+  ["C740",0x3059],
+  ["C741",0x305A],
+  ["C742",0x305B],
+  ["C743",0x305C],
+  ["C744",0x305D],
+  ["C745",0x305E],
+  ["C746",0x305F],
+  ["C747",0x3060],
+  ["C748",0x3061],
+  ["C749",0x3062],
+  ["C74A",0x3063],
+  ["C74B",0x3064],
+  ["C74C",0x3065],
+  ["C74D",0x3066],
+  ["C74E",0x3067],
+  ["C74F",0x3068],
+  ["C750",0x3069],
+  ["C751",0x306A],
+  ["C752",0x306B],
+  ["C753",0x306C],
+  ["C754",0x306D],
+  ["C755",0x306E],
+  ["C756",0x306F],
+  ["C757",0x3070],
+  ["C758",0x3071],
+  ["C759",0x3072],
+  ["C75A",0x3073],
+  ["C75B",0x3074],
+  ["C75C",0x3075],
+  ["C75D",0x3076],
+  ["C75E",0x3077],
+  ["C75F",0x3078],
+  ["C760",0x3079],
+  ["C761",0x307A],
+  ["C762",0x307B],
+  ["C763",0x307C],
+  ["C764",0x307D],
+  ["C765",0x307E],
+  ["C766",0x307F],
+  ["C767",0x3080],
+  ["C768",0x3081],
+  ["C769",0x3082],
+  ["C76A",0x3083],
+  ["C76B",0x3084],
+  ["C76C",0x3085],
+  ["C76D",0x3086],
+  ["C76E",0x3087],
+  ["C76F",0x3088],
+  ["C770",0x3089],
+  ["C771",0x308A],
+  ["C772",0x308B],
+  ["C773",0x308C],
+  ["C774",0x308D],
+  ["C775",0x308E],
+  ["C776",0x308F],
+  ["C777",0x3090],
+  ["C778",0x3091],
+  ["C779",0x3092],
+  ["C77A",0x3093],
+  ["C8D4",0x309B],
+  ["C8D5",0x309C],
+  ["C6DC",0x309D],
+  ["C6DD",0x309E],
+  ["C77B",0x30A1],
+  ["C77C",0x30A2],
+  ["C77D",0x30A3],
+  ["C77E",0x30A4],
+  ["C7A1",0x30A5],
+  ["C7A2",0x30A6],
+  ["C7A3",0x30A7],
+  ["C7A4",0x30A8],
+  ["C7A5",0x30A9],
+  ["C7A6",0x30AA],
+  ["C7A7",0x30AB],
+  ["C7A8",0x30AC],
+  ["C7A9",0x30AD],
+  ["C7AA",0x30AE],
+  ["C7AB",0x30AF],
+  ["C7AC",0x30B0],
+  ["C7AD",0x30B1],
+  ["C7AE",0x30B2],
+  ["C7AF",0x30B3],
+  ["C7B0",0x30B4],
+  ["C7B1",0x30B5],
+  ["C7B2",0x30B6],
+  ["C7B3",0x30B7],
+  ["C7B4",0x30B8],
+  ["C7B5",0x30B9],
+  ["C7B6",0x30BA],
+  ["C7B7",0x30BB],
+  ["C7B8",0x30BC],
+  ["C7B9",0x30BD],
+  ["C7BA",0x30BE],
+  ["C7BB",0x30BF],
+  ["C7BC",0x30C0],
+  ["C7BD",0x30C1],
+  ["C7BE",0x30C2],
+  ["C7BF",0x30C3],
+  ["C7C0",0x30C4],
+  ["C7C1",0x30C5],
+  ["C7C2",0x30C6],
+  ["C7C3",0x30C7],
+  ["C7C4",0x30C8],
+  ["C7C5",0x30C9],
+  ["C7C6",0x30CA],
+  ["C7C7",0x30CB],
+  ["C7C8",0x30CC],
+  ["C7C9",0x30CD],
+  ["C7CA",0x30CE],
+  ["C7CB",0x30CF],
+  ["C7CC",0x30D0],
+  ["C7CD",0x30D1],
+  ["C7CE",0x30D2],
+  ["C7CF",0x30D3],
+  ["C7D0",0x30D4],
+  ["C7D1",0x30D5],
+  ["C7D2",0x30D6],
+  ["C7D3",0x30D7],
+  ["C7D4",0x30D8],
+  ["C7D5",0x30D9],
+  ["C7D6",0x30DA],
+  ["C7D7",0x30DB],
+  ["C7D8",0x30DC],
+  ["C7D9",0x30DD],
+  ["C7DA",0x30DE],
+  ["C7DB",0x30DF],
+  ["C7DC",0x30E0],
+  ["C7DD",0x30E1],
+  ["C7DE",0x30E2],
+  ["C7DF",0x30E3],
+  ["C7E0",0x30E4],
+  ["C7E1",0x30E5],
+  ["C7E2",0x30E6],
+  ["C7E3",0x30E7],
+  ["C7E4",0x30E8],
+  ["C7E5",0x30E9],
+  ["C7E6",0x30EA],
+  ["C7E7",0x30EB],
+  ["C7E8",0x30EC],
+  ["C7E9",0x30ED],
+  ["C7EA",0x30EE],
+  ["C7EB",0x30EF],
+  ["C7EC",0x30F0],
+  ["C7ED",0x30F1],
+  ["C7EE",0x30F2],
+  ["C7EF",0x30F3],
+  ["C7F0",0x30F4],
+  ["C7F1",0x30F5],
+  ["C7F2",0x30F6],
+  ["C6E3",0x30FC],
+  ["C6DA",0x30FD],
+  ["C6DB",0x30FE],
+  ["A374",0x3105],
+  ["A375",0x3106],
+  ["A376",0x3107],
+  ["A377",0x3108],
+  ["A378",0x3109],
+  ["A379",0x310A],
+  ["A37A",0x310B],
+  ["A37B",0x310C],
+  ["A37C",0x310D],
+  ["A37D",0x310E],
+  ["A37E",0x310F],
+  ["A3A1",0x3110],
+  ["A3A2",0x3111],
+  ["A3A3",0x3112],
+  ["A3A4",0x3113],
+  ["A3A5",0x3114],
+  ["A3A6",0x3115],
+  ["A3A7",0x3116],
+  ["A3A8",0x3117],
+  ["A3A9",0x3118],
+  ["A3AA",0x3119],
+  ["A3AB",0x311A],
+  ["A3AC",0x311B],
+  ["A3AD",0x311C],
+  ["A3AE",0x311D],
+  ["A3AF",0x311E],
+  ["A3B0",0x311F],
+  ["A3B1",0x3120],
+  ["A3B2",0x3121],
+  ["A3B3",0x3122],
+  ["A3B4",0x3123],
+  ["A3B5",0x3124],
+  ["A3B6",0x3125],
+  ["A3B7",0x3126],
+  ["A3B8",0x3127],
+  ["A3B9",0x3128],
+  ["A3BA",0x3129],
+  ["8840",0x31C0],
+  ["8841",0x31C1],
+  ["8842",0x31C2],
+  ["8843",0x31C3],
+  ["8844",0x31C4],
+  ["8846",0x31C5],
+  ["8849",0x31C6],
+  ["884A",0x31C7],
+  ["884D",0x31C8],
+  ["884F",0x31C9],
+  ["8850",0x31CA],
+  ["8851",0x31CB],
+  ["8852",0x31CC],
+  ["8854",0x31CD],
+  ["8855",0x31CE],
+  ["C879",0x31CF],
+  ["C8D1",0x3231],
+  ["A1C0",0x32A3],
+  ["A255",0x338E],
+  ["A256",0x338F],
+  ["A250",0x339C],
+  ["A251",0x339D],
+  ["A252",0x339E],
+  ["A254",0x33A1],
+  ["A257",0x33C4],
+  ["A253",0x33CE],
+  ["A1EB",0x33D1],
+  ["A1EA",0x33D2],
+  ["A24F",0x33D5],
+  ["9277",0x3435],
+  ["96DF",0x3440],
+  ["8CF4",0x344A],
+  ["89D5",0x344C],
+  ["93CD",0x3464],
+  ["9BDF",0x3473],
+  ["FA68",0x347A],
+  ["89DA",0x347D],
+  ["8F59",0x347E],
+  ["89DB",0x3493],
+  ["8F5D",0x3496],
+  ["89DC",0x34A5],
+  ["96F7",0x34AF],
+  ["8ADA",0x34BC],
+  ["8BDC",0x34C1],
+  ["97DB",0x34C8],
+  ["9E53",0x34DF],
+  ["9DAA",0x34E4],
+  ["9BEA",0x34FB],
+  ["8A6E",0x3506],
+  ["8BC8",0x353E],
+  ["89E8",0x3551],
+  ["89EA",0x3553],
+  ["8C4B",0x3559],
+  ["FB70",0x3561],
+  ["89ED",0x356D],
+  ["94DD",0x3570],
+  ["89EE",0x3572],
+  ["9EB4",0x3577],
+  ["8AD3",0x3578],
+  ["92DB",0x3584],
+  ["94DB",0x3597],
+  ["89F9",0x3598],
+  ["FB7A",0x35A1],
+  ["89FB",0x35A5],
+  ["9EFC",0x35AD],
+  ["89FC",0x35BF],
+  ["89BF",0x35C1],
+  ["89FE",0x35C5],
+  ["89E6",0x35C7],
+  ["9D46",0x35CA],
+  ["9DEE",0x35CE],
+  ["A07E",0x35D2],
+  ["A068",0x35D6],
+  ["98E9",0x35DB],
+  ["8B68",0x35DD],
+  ["8DFD",0x35F1],
+  ["8BBE",0x35F2],
+  ["9FD9",0x35F3],
+  ["8AEB",0x35FB],
+  ["9FD7",0x35FE],
+  ["8B6A",0x3609],
+  ["9C5C",0x3618],
+  ["8BB1",0x361A],
+  ["FB5E",0x3623],
+  ["8770",0x3625],
+  ["9DF3",0x362D],
+  ["A0D0",0x3635],
+  ["FC66",0x3639],
+  ["92E9",0x363E],
+  ["9AEC",0x3647],
+  ["8FAB",0x3648],
+  ["FA48",0x3649],
+  ["8E45",0x364E],
+  ["9C6F",0x365F],
+  ["8D5C",0x3661],
+  ["9EDE",0x367A],
+  ["89EF",0x3681],
+  ["96E9",0x369A],
+  ["9EBB",0x36A5],
+  ["94DE",0x36AA],
+  ["9EB8",0x36AC],
+  ["97BA",0x36B0],
+  ["FB65",0x36B1],
+  ["95D6",0x36B5],
+  ["9CBB",0x36B9],
+  ["97DA",0x36BC],
+  ["8F45",0x36C1],
+  ["FB7D",0x36C3],
+  ["9158",0x36C4],
+  ["FE64",0x36C5],
+  ["9856",0x36C7],
+  ["9B4D",0x36C8],
+  ["935B",0x36D3],
+  ["95C7",0x36D4],
+  ["97E7",0x36D6],
+  ["9359",0x36DD],
+  ["91F5",0x36E1],
+  ["97B8",0x36E2],
+  ["FDA2",0x36E5],
+  ["FBB6",0x36E6],
+  ["92FA",0x36F5],
+  ["9357",0x3701],
+  ["8BA6",0x3703],
+  ["FBB9",0x3708],
+  ["97B0",0x370A],
+  ["FDC4",0x370D],
+  ["9CA1",0x371C],
+  ["91F2",0x3722],
+  ["91F9",0x3723],
+  ["8FF1",0x3725],
+  ["9745",0x372C],
+  ["9853",0x372D],
+  ["FE78",0x3730],
+  ["FBC1",0x3732],
+  ["9251",0x3733],
+  ["9DAD",0x373A],
+  ["FD6C",0x3740],
+  ["FA6B",0x3743],
+  ["9BC2",0x3762],
+  ["9A7B",0x376F],
+  ["8B60",0x3797],
+  ["934B",0x37A0],
+  ["9ABD",0x37B9],
+  ["91B7",0x37BE],
+  ["8D4B",0x37D6],
+  ["95B4",0x37F2],
+  ["FEC5",0x37F8],
+  ["9EF0",0x37FB],
+  ["8D64",0x380F],
+  ["9269",0x3819],
+  ["8D67",0x3820],
+  ["FBEA",0x382D],
+  ["FBEF",0x3836],
+  ["8D68",0x3838],
+  ["93EB",0x3863],
+  ["FC42",0x38A0],
+  ["9166",0x38C3],
+  ["FACD",0x38CC],
+  ["93DD",0x38D1],
+  ["8D52",0x38D4],
+  ["8BCC",0x38FA],
+  ["8D6D",0x3908],
+  ["8D6E",0x3914],
+  ["96A8",0x3927],
+  ["FCA6",0x3932],
+  ["8D6F",0x393F],
+  ["8D70",0x394D],
+  ["FC64",0x3963],
+  ["8CF3",0x3978],
+  ["9060",0x3980],
+  ["8D74",0x3989],
+  ["97C3",0x398A],
+  ["8AD0",0x3992],
+  ["9274",0x3999],
+  ["9BBE",0x399B],
+  ["9CC8",0x39A1],
+  ["9CBA",0x39A4],
+  ["8D78",0x39B8],
+  ["9EB9",0x39DC],
+  ["955A",0x39E2],
+  ["91B4",0x39E5],
+  ["8A48",0x39EC],
+  ["8D7D",0x39F8],
+  ["8A7D",0x39FB],
+  ["8AC2",0x39FE],
+  ["FD4A",0x3A01],
+  ["8DA1",0x3A03],
+  ["8AD1",0x3A06],
+  ["FCB4",0x3A17],
+  ["8B47",0x3A18],
+  ["93A4",0x3A29],
+  ["9EDA",0x3A2A],
+  ["8A51",0x3A34],
+  ["8DA6",0x3A4B],
+  ["9EC5",0x3A52],
+  ["FCC4",0x3A57],
+  ["A078",0x3A5C],
+  ["94B5",0x3A5E],
+  ["FCC2",0x3A66],
+  ["8A6B",0x3A67],
+  ["8DAB",0x3A97],
+  ["FAE8",0x3AAB],
+  ["8DAD",0x3ABD],
+  ["FC49",0x3ADE],
+  ["93C1",0x3AE0],
+  ["906F",0x3AF0],
+  ["8DB0",0x3AF2],
+  ["947E",0x3AFB],
+  ["90FA",0x3B0E],
+  ["9479",0x3B19],
+  ["8DB2",0x3B22],
+  ["FCEE",0x3B2B],
+  ["997B",0x3B39],
+  ["8DB4",0x3B42],
+  ["8DB7",0x3B58],
+  ["91B3",0x3B60],
+  ["8DBB",0x3B71],
+  ["8DBA",0x3B72],
+  ["8DBC",0x3B7B],
+  ["9044",0x3B7C],
+  ["FD4C",0x3B80],
+  ["874B",0x3B95],
+  ["93E4",0x3B96],
+  ["93E0",0x3B99],
+  ["FD53",0x3BA1],
+  ["8DC3",0x3BBC],
+  ["9BB8",0x3BBE],
+  ["FBF0",0x3BC2],
+  ["93E9",0x3BC4],
+  ["93F6",0x3BD7],
+  ["8DC5",0x3BDD],
+  ["8DCA",0x3BEC],
+  ["8DCC",0x3BF2],
+  ["FD5D",0x3BF3],
+  ["93B5",0x3BF4],
+  ["FD61",0x3C0D],
+  ["9CF8",0x3C11],
+  ["9252",0x3C15],
+  ["A0E8",0x3C18],
+  ["9CA5",0x3C54],
+  ["8C56",0x3C8B],
+  ["8DD6",0x3CCB],
+  ["97C0",0x3CCD],
+  ["A0DE",0x3CD1],
+  ["97D2",0x3CD6],
+  ["FAA5",0x3CDC],
+  ["FDA3",0x3CEB],
+  ["8DDB",0x3CEF],
+  ["8CEA",0x3D12],
+  ["8EAF",0x3D13],
+  ["91B5",0x3D1D],
+  ["FD49",0x3D32],
+  ["FDD1",0x3D3B],
+  ["8DEB",0x3D46],
+  ["97C6",0x3D4C],
+  ["FDCE",0x3D4E],
+  ["90FC",0x3D51],
+  ["FC59",0x3D5F],
+  ["96D6",0x3D62],
+  ["97C5",0x3D69],
+  ["8DEF",0x3D6A],
+  ["97D7",0x3D6F],
+  ["8DF0",0x3D75],
+  ["96A6",0x3D7D],
+  ["FBBF",0x3D85],
+  ["8CDF",0x3D88],
+  ["8DF3",0x3D8A],
+  ["9449",0x3D8F],
+  ["8DF5",0x3D91],
+  ["9872",0x3DA5],
+  ["8E6B",0x3DAD],
+  ["FAFD",0x3DB4],
+  ["8F50",0x3DBF],
+  ["9DCC",0x3DC6],
+  ["FC65",0x3DC7],
+  ["8C44",0x3DC9],
+  ["996E",0x3DCC],
+  ["94A1",0x3DCD],
+  ["8F63",0x3DD3],
+  ["A0DA",0x3DDB],
+  ["9253",0x3DE7],
+  ["FDE9",0x3DE8],
+  ["9DB5",0x3DEB],
+  ["9879",0x3DF3],
+  ["876A",0x3DF4],
+  ["9D5D",0x3DF7],
+  ["8D63",0x3DFC],
+  ["9669",0x3DFD],
+  ["9F70",0x3E06],
+  ["FC6A",0x3E40],
+  ["8AC7",0x3E43],
+  ["89D7",0x3E48],
+  ["FE4D",0x3E55],
+  ["9EDD",0x3E74],
+  ["FEFB",0x3EA8],
+  ["98BC",0x3EA9],
+  ["FACC",0x3EAA],
+  ["95B0",0x3EAD],
+  ["9464",0x3EB1],
+  ["936F",0x3EB8],
+  ["94B9",0x3EBF],
+  ["95EC",0x3EC2],
+  ["91EE",0x3EC7],
+  ["98C3",0x3ECA],
+  ["95F6",0x3ECC],
+  ["8FFD",0x3ED0],
+  ["98C5",0x3ED1],
+  ["9766",0x3ED6],
+  ["FE6E",0x3ED7],
+  ["97DD",0x3EDA],
+  ["8CAA",0x3EDB],
+  ["92D2",0x3EDE],
+  ["9761",0x3EE1],
+  ["98CB",0x3EE2],
+  ["95F0",0x3EE7],
+  ["975D",0x3EE9],
+  ["91E3",0x3EEB],
+  ["98CC",0x3EF0],
+  ["9469",0x3EF3],
+  ["98CD",0x3EF4],
+  ["98CE",0x3EFA],
+  ["95FC",0x3EFC],
+  ["94A3",0x3EFF],
+  ["9662",0x3F00],
+  ["FEB6",0x3F04],
+  ["9463",0x3F06],
+  ["8D47",0x3F07],
+  ["98D0",0x3F0E],
+  ["98D1",0x3F53],
+  ["9475",0x3F58],
+  ["FAE0",0x3F59],
+  ["9472",0x3F63],
+  ["98D6",0x3F7C],
+  ["8AF0",0x3F93],
+  ["98D9",0x3FC0],
+  ["8D5A",0x3FC8],
+  ["98DB",0x3FD7],
+  ["98DD",0x3FDC],
+  ["98A8",0x3FE5],
+  ["8A6D",0x3FED],
+  ["8AFB",0x3FF9],
+  ["8AAE",0x3FFA],
+  ["FBC9",0x4004],
+  ["8C5D",0x4009],
+  ["98E4",0x401D],
+  ["98E6",0x4039],
+  ["98E8",0x4045],
+  ["8A4D",0x4053],
+  ["9257",0x4057],
+  ["95DF",0x4062],
+  ["A0AC",0x4065],
+  ["98EB",0x406A],
+  ["98EC",0x406F],
+  ["8CC3",0x4071],
+  ["98F4",0x40A8],
+  ["8AB8",0x40BB],
+  ["9EE7",0x40BF],
+  ["94BC",0x40C8],
+  ["FCD1",0x40D8],
+  ["9CC6",0x40DF],
+  ["8D4A",0x40F8],
+  ["9E7E",0x40FA],
+  ["8D44",0x4102],
+  ["98FE",0x4103],
+  ["FDE8",0x4104],
+  ["9940",0x4109],
+  ["94C9",0x410E],
+  ["94D3",0x4132],
+  ["9946",0x4167],
+  ["90C0",0x416C],
+  ["94D1",0x416E],
+  ["8D4E",0x417C],
+  ["9573",0x417F],
+  ["93C2",0x4190],
+  ["9948",0x41B2],
+  ["994B",0x41C4],
+  ["8E55",0x41CA],
+  ["994E",0x41CF],
+  ["8EFE",0x41DB],
+  ["8D5F",0x41ED],
+  ["8E59",0x41EF],
+  ["94EC",0x41F9],
+  ["94EF",0x4211],
+  ["8C60",0x4223],
+  ["8F74",0x4240],
+  ["9955",0x4260],
+  ["9544",0x426A],
+  ["8CCB",0x4276],
+  ["9956",0x427A],
+  ["9959",0x428C],
+  ["995B",0x4294],
+  ["8CC4",0x42A2],
+  ["FA45",0x42B5],
+  ["90B7",0x42B9],
+  ["9743",0x42BC],
+  ["95CD",0x42F4],
+  ["97C9",0x42FB],
+  ["FD50",0x42FC],
+  ["8EB9",0x432B],
+  ["95C6",0x436E],
+  ["9967",0x4397],
+  ["8CE3",0x439A],
+  ["8AB9",0x43BA],
+  ["8DFC",0x43C1],
+  ["8A76",0x43D9],
+  ["9D51",0x43DF],
+  ["9973",0x43ED],
+  ["8740",0x43F0],
+  ["9D4F",0x43F2],
+  ["997A",0x4401],
+  ["9564",0x4402],
+  ["99A1",0x4413],
+  ["99A5",0x4425],
+  ["99A7",0x442D],
+  ["8EED",0x447A],
+  ["99AD",0x448F],
+  ["C87E",0x4491],
+  ["946E",0x449F],
+  ["8F70",0x44A0],
+  ["FAD0",0x44A2],
+  ["99B3",0x44B0],
+  ["A053",0x44B7],
+  ["8D5E",0x44BD],
+  ["965C",0x44C0],
+  ["8CE0",0x44C3],
+  ["FD7A",0x44C5],
+  ["97FE",0x44CE],
+  ["92BD",0x44DD],
+  ["8D5D",0x44DE],
+  ["97FD",0x44DF],
+  ["8F64",0x44E4],
+  ["FCF7",0x44E9],
+  ["9562",0x44EA],
+  ["97CD",0x44EB],
+  ["9E64",0x44EC],
+  ["924C",0x44F4],
+  ["8EC9",0x4503],
+  ["99BC",0x4504],
+  ["9DA5",0x4509],
+  ["8F54",0x450B],
+  ["8F7C",0x4516],
+  ["8D55",0x451B],
+  ["8EA2",0x451D],
+  ["8F7A",0x4527],
+  ["97AE",0x452E],
+  ["96C8",0x4533],
+  ["8CE4",0x4536],
+  ["99C3",0x453B],
+  ["90D6",0x453D],
+  ["9CBE",0x453F],
+  ["8F76",0x4543],
+  ["9470",0x4551],
+  ["FB4B",0x4552],
+  ["FDCA",0x4555],
+  ["8CEF",0x4558],
+  ["8EC7",0x455C],
+  ["8D54",0x4561],
+  ["A0F9",0x4562],
+  ["8FA9",0x456A],
+  ["8D51",0x456D],
+  ["99C7",0x4577],
+  ["8744",0x4578],
+  ["90D7",0x4585],
+  ["8743",0x45A6],
+  ["8747",0x45B3],
+  ["8758",0x45DA],
+  ["9EDF",0x45E9],
+  ["8D59",0x45EA],
+  ["8742",0x4603],
+  ["99CE",0x4606],
+  ["8FBA",0x460F],
+  ["8FEB",0x4615],
+  ["99CF",0x4617],
+  ["8FC2",0x465B],
+  ["92C9",0x467A],
+  ["97DC",0x4680],
+  ["875D",0x46A1],
+  ["8D45",0x46BB],
+  ["95B3",0x46CF],
+  ["9C79",0x46D0],
+  ["95B2",0x46F5],
+  ["8D4C",0x46F7],
+  ["8FDB",0x4713],
+  ["9BE3",0x4718],
+  ["874C",0x4736],
+  ["874D",0x4744],
+  ["9E7A",0x474E],
+  ["8757",0x474F],
+  ["9BEE",0x477C],
+  ["99DE",0x4798],
+  ["FAFA",0x47A6],
+  ["8A52",0x47D5],
+  ["99E1",0x47ED],
+  ["8A67",0x47F4],
+  ["8BB5",0x4800],
+  ["8AAC",0x480B],
+  ["99E9",0x4837],
+  ["FBCA",0x485D],
+  ["97DE",0x4871],
+  ["95D1",0x489B],
+  ["99F5",0x48AD],
+  ["FC4A",0x48AE],
+  ["9BA9",0x48D0],
+  ["FBDC",0x48DD],
+  ["FE56",0x48ED],
+  ["9EA4",0x48F3],
+  ["9D49",0x48FA],
+  ["95DB",0x4906],
+  ["89C5",0x4911],
+  ["99F8",0x491E],
+  ["9664",0x4925],
+  ["9055",0x492A],
+  ["96D4",0x492D],
+  ["977C",0x4935],
+  ["964D",0x493C],
+  ["97E1",0x493E],
+  ["9A48",0x4945],
+  ["9A49",0x4951],
+  ["FE7D",0x4953],
+  ["90AA",0x4965],
+  ["9A50",0x496A],
+  ["9347",0x4972],
+  ["8ED8",0x4989],
+  ["90C9",0x49A1],
+  ["9A55",0x49A7],
+  ["90BC",0x49DF],
+  ["9A58",0x49E5],
+  ["8BB8",0x49E7],
+  ["90D5",0x4A0F],
+  ["9641",0x4A1D],
+  ["9A5A",0x4A24],
+  ["9A5C",0x4A35],
+  ["97C2",0x4A96],
+  ["875C",0x4AA4],
+  ["8ABB",0x4AB4],
+  ["9BAA",0x4AB8],
+  ["90F5",0x4AD1],
+  ["9A60",0x4AE4],
+  ["9145",0x4AFF],
+  ["8C58",0x4B10],
+  ["9A63",0x4B19],
+  ["8C49",0x4B20],
+  ["8BB6",0x4B2C],
+  ["FCCF",0x4B37],
+  ["966B",0x4B6F],
+  ["9A6E",0x4B70],
+  ["914F",0x4B72],
+  ["9746",0x4B7B],
+  ["A0E6",0x4B7E],
+  ["92D7",0x4B8E],
+  ["9675",0x4B90],
+  ["93D4",0x4B93],
+  ["91BB",0x4B96],
+  ["9679",0x4B97],
+  ["9A70",0x4B9D],
+  ["9678",0x4BBD],
+  ["91CD",0x4BBE],
+  ["9C4A",0x4BC0],
+  ["A06F",0x4C04],
+  ["A06A",0x4C07],
+  ["915F",0x4C0E],
+  ["8741",0x4C32],
+  ["9FA5",0x4C3B],
+  ["89BA",0x4C3E],
+  ["874F",0x4C40],
+  ["874E",0x4C47],
+  ["8755",0x4C57],
+  ["9ECD",0x4C5B],
+  ["9A79",0x4C6D],
+  ["8CF2",0x4C77],
+  ["8D57",0x4C7B],
+  ["9DCE",0x4C7D],
+  ["8CD2",0x4C81],
+  ["8759",0x4C85],
+  ["9D73",0x4CA4],
+  ["96B9",0x4CAE],
+  ["96BC",0x4CB0],
+  ["9CD1",0x4CB7],
+  ["89B7",0x4CCD],
+  ["9EEE",0x4CE1],
+  ["8749",0x4CE2],
+  ["FB43",0x4CED],
+  ["875B",0x4D07],
+  ["9EC9",0x4D09],
+  ["FBD3",0x4D10],
+  ["91AE",0x4D34],
+  ["8D58",0x4D76],
+  ["8746",0x4D77],
+  ["8D56",0x4D89],
+  ["9D78",0x4D91],
+  ["9D7B",0x4D9C],
+  ["A440",0x4E00],
+  ["A442",0x4E01],
+  ["A443",0x4E03],
+  ["9EB3",0x4E04],
+  ["C945",0x4E07],
+  ["A456",0x4E08],
+  ["A454",0x4E09],
+  ["A457",0x4E0A],
+  ["A455",0x4E0B],
+  ["C946",0x4E0C],
+  ["A4A3",0x4E0D],
+  ["C94F",0x4E0E],
+  ["C94D",0x4E0F],
+  ["A4A2",0x4E10],
+  ["A4A1",0x4E11],
+  ["A542",0x4E14],
+  ["A541",0x4E15],
+  ["A540",0x4E16],
+  ["A543",0x4E18],
+  ["A4FE",0x4E19],
+  ["9EB2",0x4E1A],
+  ["9DD6",0x4E1C],
+  ["A5E0",0x4E1E],
+  ["A5E1",0x4E1F],
+  ["994F",0x4E21],
+  ["89CE",0x4E24],
+  ["A8C3",0x4E26],
+  ["8BC0",0x4E28],
+  ["9FC4",0x4E2A],
+  ["A458",0x4E2B],
+  ["8BD4",0x4E2C],
+  ["A4A4",0x4E2D],
+  ["C950",0x4E2E],
+  ["8C72",0x4E2F],
+  ["A4A5",0x4E30],
+  ["C963",0x4E31],
+  ["A6EA",0x4E32],
+  ["CBB1",0x4E33],
+  ["C6BF",0x4E36],
+  ["8BF9",0x4E37],
+  ["A459",0x4E38],
+  ["A4A6",0x4E39],
+  ["A544",0x4E3B],
+  ["C964",0x4E3C],
+  ["8946",0x4E3D],
+  ["C6C0",0x4E3F],
+  ["C940",0x4E42],
+  ["A444",0x4E43],
+  ["A45B",0x4E45],
+  ["C947",0x4E47],
+  ["A45C",0x4E48],
+  ["FAE5",0x4E49],
+  ["A4A7",0x4E4B],
+  ["A545",0x4E4D],
+  ["A547",0x4E4E],
+  ["A546",0x4E4F],
+  ["A5E2",0x4E52],
+  ["A5E3",0x4E53],
+  ["A8C4",0x4E56],
+  ["ADBC",0x4E58],
+  ["A441",0x4E59],
+  ["C87B",0x4E5A],
+  ["8BC6",0x4E5B],
+  ["C941",0x4E5C],
+  ["A445",0x4E5D],
+  ["A45E",0x4E5E],
+  ["A45D",0x4E5F],
+  ["A5E4",0x4E69],
+  ["9C57",0x4E6A],
+  ["A8C5",0x4E73],
+  ["9AFB",0x4E78],
+  ["B0AE",0x4E7E],
+  ["D44B",0x4E7F],
+  ["89D0",0x4E80],
+  ["89CF",0x4E81],
+  ["B6C3",0x4E82],
+  ["DCB1",0x4E83],
+  ["DCB2",0x4E84],
+  ["C6C1",0x4E85],
+  ["A446",0x4E86],
+  ["89D1",0x4E87],
+  ["A4A9",0x4E88],
+  ["89E2",0x4E89],
+  ["A8C6",0x4E8B],
+  ["A447",0x4E8C],
+  ["C948",0x4E8D],
+  ["A45F",0x4E8E],
+  ["A4AA",0x4E91],
+  ["A4AC",0x4E92],
+  ["C951",0x4E93],
+  ["A4AD",0x4E94],
+  ["A4AB",0x4E95],
+  ["927E",0x4E98],
+  ["A5E5",0x4E99],
+  ["9DBA",0x4E9A],
+  ["A8C7",0x4E9B],
+  ["A8C8",0x4E9E],
+  ["AB45",0x4E9F],
+  ["C6C2",0x4EA0],
+  ["A460",0x4EA1],
+  ["A4AE",0x4EA2],
+  ["8C6F",0x4EA3],
+  ["A5E6",0x4EA4],
+  ["A5E8",0x4EA5],
+  ["A5E7",0x4EA6],
+  ["A6EB",0x4EA8],
+  ["A8C9",0x4EAB],
+  ["A8CA",0x4EAC],
+  ["AB46",0x4EAD],
+  ["AB47",0x4EAE],
+  ["ADBD",0x4EB3],
+  ["DCB3",0x4EB6],
+  ["FBF8",0x4EB7],
+  ["F6D6",0x4EB9],
+  ["A448",0x4EBA],
+  ["8BC7",0x4EBB],
+  ["926B",0x4EBC],
+  ["89D2",0x4EBF],
+  ["A4B0",0x4EC0],
+  ["A4AF",0x4EC1],
+  ["C952",0x4EC2],
+  ["A4B1",0x4EC3],
+  ["A4B7",0x4EC4],
+  ["A4B2",0x4EC6],
+  ["A4B3",0x4EC7],
+  ["C954",0x4EC8],
+  ["C953",0x4EC9],
+  ["A4B5",0x4ECA],
+  ["A4B6",0x4ECB],
+  ["A4B4",0x4ECD],
+  ["9FCF",0x4ECE],
+  ["A54A",0x4ED4],
+  ["A54B",0x4ED5],
+  ["A54C",0x4ED6],
+  ["A54D",0x4ED7],
+  ["A549",0x4ED8],
+  ["A550",0x4ED9],
+  ["C96A",0x4EDA],
+  ["C966",0x4EDC],
+  ["C969",0x4EDD],
+  ["A551",0x4EDE],
+  ["A561",0x4EDF],
+  ["C968",0x4EE1],
+  ["A54E",0x4EE3],
+  ["A54F",0x4EE4],
+  ["A548",0x4EE5],
+  ["C965",0x4EE8],
+  ["C967",0x4EE9],
+  ["9DA9",0x4EEA],
+  ["89D3",0x4EEB],
+  ["99E2",0x4EEE],
+  ["A5F5",0x4EF0],
+  ["C9B0",0x4EF1],
+  ["A5F2",0x4EF2],
+  ["A5F6",0x4EF3],
+  ["C9BA",0x4EF4],
+  ["C9AE",0x4EF5],
+  ["A5F3",0x4EF6],
+  ["C9B2",0x4EF7],
+  ["9267",0x4EF8],
+  ["A5F4",0x4EFB],
+  ["A5F7",0x4EFD],
+  ["A5E9",0x4EFF],
+  ["C9B1",0x4F00],
+  ["A5F8",0x4F01],
+  ["C9B5",0x4F02],
+  ["92A4",0x4F03],
+  ["C9B9",0x4F04],
+  ["C9B6",0x4F05],
+  ["C9B3",0x4F08],
+  ["A5EA",0x4F09],
+  ["A5EC",0x4F0A],
+  ["A5F9",0x4F0B],
+  ["A5EE",0x4F0D],
+  ["C9AB",0x4F0E],
+  ["A5F1",0x4F0F],
+  ["A5EF",0x4F10],
+  ["A5F0",0x4F11],
+  ["C9BB",0x4F12],
+  ["C9B8",0x4F13],
+  ["C9AF",0x4F14],
+  ["A5ED",0x4F15],
+  ["8C73",0x4F17],
+  ["C9AC",0x4F18],
+  ["A5EB",0x4F19],
+  ["894E",0x4F1A],
+  ["C9B4",0x4F1D],
+  ["C9B7",0x4F22],
+  ["894F",0x4F28],
+  ["9278",0x4F29],
+  ["C9AD",0x4F2C],
+  ["CA66",0x4F2D],
+  ["A742",0x4F2F],
+  ["A6F4",0x4F30],
+  ["91B6",0x4F32],
+  ["CA67",0x4F33],
+  ["A6F1",0x4F34],
+  ["A744",0x4F36],
+  ["89D4",0x4F37],
+  ["A6F9",0x4F38],
+  ["9FD2",0x4F39],
+  ["A6F8",0x4F3A],
+  ["CA5B",0x4F3B],
+  ["A6FC",0x4F3C],
+  ["A6F7",0x4F3D],
+  ["CA60",0x4F3E],
+  ["CA68",0x4F3F],
+  ["CA64",0x4F41],
+  ["92A7",0x4F42],
+  ["A6FA",0x4F43],
+  ["95A2",0x4F45],
+  ["A6FD",0x4F46],
+  ["A6EE",0x4F47],
+  ["A747",0x4F48],
+  ["CA5D",0x4F49],
+  ["926E",0x4F4B],
+  ["CBBD",0x4F4C],
+  ["A6EC",0x4F4D],
+  ["A743",0x4F4E],
+  ["A6ED",0x4F4F],
+  ["A6F5",0x4F50],
+  ["A6F6",0x4F51],
+  ["CA62",0x4F52],
+  ["CA5E",0x4F53],
+  ["A6FB",0x4F54],
+  ["A6F3",0x4F55],
+  ["CA5A",0x4F56],
+  ["A6EF",0x4F57],
+  ["CA65",0x4F58],
+  ["A745",0x4F59],
+  ["A748",0x4F5A],
+  ["A6F2",0x4F5B],
+  ["A740",0x4F5C],
+  ["A746",0x4F5D],
+  ["A6F0",0x4F5E],
+  ["CA63",0x4F5F],
+  ["A741",0x4F60],
+  ["CA69",0x4F61],
+  ["CA5C",0x4F62],
+  ["A6FE",0x4F63],
+  ["CA5F",0x4F64],
+  ["CA61",0x4F67],
+  ["A8D8",0x4F69],
+  ["CBBF",0x4F6A],
+  ["CBCB",0x4F6B],
+  ["A8D0",0x4F6C],
+  ["CBCC",0x4F6E],
+  ["A8CB",0x4F6F],
+  ["A8D5",0x4F70],
+  ["96EA",0x4F72],
+  ["A8CE",0x4F73],
+  ["CBB9",0x4F74],
+  ["A8D6",0x4F75],
+  ["CBB8",0x4F76],
+  ["CBBC",0x4F77],
+  ["CBC3",0x4F78],
+  ["CBC1",0x4F79],
+  ["A8DE",0x4F7A],
+  ["A8D9",0x4F7B],
+  ["CBB3",0x4F7C],
+  ["CBB5",0x4F7D],
+  ["A8DB",0x4F7E],
+  ["A8CF",0x4F7F],
+  ["CBB6",0x4F80],
+  ["CBC2",0x4F81],
+  ["CBC9",0x4F82],
+  ["A8D4",0x4F83],
+  ["CBBB",0x4F84],
+  ["CBB4",0x4F85],
+  ["A8D3",0x4F86],
+  ["CBB7",0x4F87],
+  ["A8D7",0x4F88],
+  ["CBBA",0x4F89],
+  ["926F",0x4F8A],
+  ["A8D2",0x4F8B],
+  ["A8CD",0x4F8D],
+  ["A8DC",0x4F8F],
+  ["CBC4",0x4F90],
+  ["A8DD",0x4F91],
+  ["CBC8",0x4F92],
+  ["CBC6",0x4F94],
+  ["CBCA",0x4F95],
+  ["A8DA",0x4F96],
+  ["CBBE",0x4F97],
+  ["CBB2",0x4F98],
+  ["CBC0",0x4F9A],
+  ["A8D1",0x4F9B],
+  ["CBC5",0x4F9C],
+  ["A8CC",0x4F9D],
+  ["CBC7",0x4F9E],
+  ["92A3",0x4FA2],
+  ["8950",0x4FA8],
+  ["FA57",0x4FAB],
+  ["AB56",0x4FAE],
+  ["AB4A",0x4FAF],
+  ["9866",0x4FB0],
+  ["CDE0",0x4FB2],
+  ["CDE8",0x4FB3],
+  ["8CF8",0x4FB4],
+  ["AB49",0x4FB5],
+  ["AB51",0x4FB6],
+  ["AB5D",0x4FB7],
+  ["CDEE",0x4FB9],
+  ["CDEC",0x4FBA],
+  ["CDE7",0x4FBB],
+  ["89D6",0x4FBD],
+  ["AB4B",0x4FBF],
+  ["CDED",0x4FC0],
+  ["CDE3",0x4FC1],
+  ["AB59",0x4FC2],
+  ["AB50",0x4FC3],
+  ["AB58",0x4FC4],
+  ["CDDE",0x4FC5],
+  ["CDEA",0x4FC7],
+  ["98B2",0x4FC8],
+  ["CDE1",0x4FC9],
+  ["AB54",0x4FCA],
+  ["CDE2",0x4FCB],
+  ["92AB",0x4FCC],
+  ["CDDD",0x4FCD],
+  ["AB5B",0x4FCE],
+  ["AB4E",0x4FCF],
+  ["AB57",0x4FD0],
+  ["AB4D",0x4FD1],
+  ["CDDF",0x4FD3],
+  ["CDE4",0x4FD4],
+  ["CDEB",0x4FD6],
+  ["AB55",0x4FD7],
+  ["AB52",0x4FD8],
+  ["CDE6",0x4FD9],
+  ["AB5A",0x4FDA],
+  ["CDE9",0x4FDB],
+  ["CDE5",0x4FDC],
+  ["AB4F",0x4FDD],
+  ["AB5C",0x4FDE],
+  ["AB53",0x4FDF],
+  ["AB4C",0x4FE0],
+  ["AB48",0x4FE1],
+  ["96DE",0x4FE4],
+  ["92AC",0x4FE5],
+  ["CDEF",0x4FEC],
+  ["ADD7",0x4FEE],
+  ["ADC1",0x4FEF],
+  ["8C70",0x4FF0],
+  ["ADD1",0x4FF1],
+  ["9F6E",0x4FF2],
+  ["ADD6",0x4FF3],
+  ["D0D0",0x4FF4],
+  ["D0CF",0x4FF5],
+  ["D0D4",0x4FF6],
+  ["D0D5",0x4FF7],
+  ["ADC4",0x4FF8],
+  ["8EF2",0x4FF9],
+  ["ADCD",0x4FFA],
+  ["9F6C",0x4FFD],
+  ["ADDA",0x4FFE],
+  ["ADCE",0x5000],
+  ["89D8",0x5003],
+  ["D0C9",0x5005],
+  ["ADC7",0x5006],
+  ["D0CA",0x5007],
+  ["FA59",0x5008],
+  ["ADDC",0x5009],
+  ["ADD3",0x500B],
+  ["ADBE",0x500C],
+  ["ADBF",0x500D],
+  ["D0DD",0x500E],
+  ["B0BF",0x500F],
+  ["ADCC",0x5011],
+  ["ADCB",0x5012],
+  ["D0CB",0x5013],
+  ["ADCF",0x5014],
+  ["D45B",0x5015],
+  ["ADC6",0x5016],
+  ["D0D6",0x5017],
+  ["ADD5",0x5018],
+  ["ADD4",0x5019],
+  ["ADCA",0x501A],
+  ["D0CE",0x501B],
+  ["D0D7",0x501C],
+  ["D0C8",0x501E],
+  ["ADC9",0x501F],
+  ["D0D8",0x5020],
+  ["ADD2",0x5021],
+  ["D0CC",0x5022],
+  ["ADC0",0x5023],
+  ["ADC3",0x5025],
+  ["ADC2",0x5026],
+  ["D0D9",0x5027],
+  ["ADD0",0x5028],
+  ["ADC5",0x5029],
+  ["ADD9",0x502A],
+  ["ADDB",0x502B],
+  ["D0D3",0x502C],
+  ["ADD8",0x502D],
+  ["92A8",0x502E],
+  ["D0DB",0x502F],
+  ["D0CD",0x5030],
+  ["D0DC",0x5031],
+  ["D0D1",0x5033],
+  ["9163",0x5034],
+  ["D0DA",0x5035],
+  ["D0D2",0x5037],
+  ["8C40",0x503B],
+  ["ADC8",0x503C],
+  ["D463",0x5040],
+  ["D457",0x5041],
+  ["B0B3",0x5043],
+  ["D45C",0x5045],
+  ["D462",0x5046],
+  ["B0B2",0x5047],
+  ["D455",0x5048],
+  ["B0B6",0x5049],
+  ["D459",0x504A],
+  ["D452",0x504B],
+  ["B0B4",0x504C],
+  ["D456",0x504D],
+  ["B0B9",0x504E],
+  ["B0BE",0x504F],
+  ["D467",0x5051],
+  ["D451",0x5053],
+  ["B0BA",0x5055],
+  ["9F73",0x5056],
+  ["D466",0x5057],
+  ["92AD",0x5058],
+  ["B0B5",0x505A],
+  ["D458",0x505B],
+  ["B0B1",0x505C],
+  ["D453",0x505D],
+  ["D44F",0x505E],
+  ["D45D",0x505F],
+  ["D450",0x5060],
+  ["D44E",0x5061],
+  ["D45A",0x5062],
+  ["D460",0x5063],
+  ["D461",0x5064],
+  ["B0B7",0x5065],
+  ["9BE9",0x5066],
+  ["D85B",0x5068],
+  ["D45E",0x5069],
+  ["D44D",0x506A],
+  ["D45F",0x506B],
+  ["92A9",0x506C],
+  ["B0C1",0x506D],
+  ["D464",0x506E],
+  ["B0C0",0x506F],
+  ["D44C",0x5070],
+  ["D454",0x5072],
+  ["D465",0x5073],
+  ["B0BC",0x5074],
+  ["B0BB",0x5075],
+  ["B0B8",0x5076],
+  ["B0BD",0x5077],
+  ["B0AF",0x507A],
+  ["B0B0",0x507D],
+  ["B3C8",0x5080],
+  ["92AA",0x5081],
+  ["D85E",0x5082],
+  ["D857",0x5083],
+  ["B3C5",0x5085],
+  ["D85F",0x5087],
+  ["89D9",0x5088],
+  ["D855",0x508B],
+  ["D858",0x508C],
+  ["B3C4",0x508D],
+  ["D859",0x508E],
+  ["FD56",0x5090],
+  ["B3C7",0x5091],
+  ["D85D",0x5092],
+  ["D853",0x5094],
+  ["D852",0x5095],
+  ["B3C9",0x5096],
+  ["B3CA",0x5098],
+  ["B3C6",0x5099],
+  ["B3CB",0x509A],
+  ["D851",0x509B],
+  ["D85C",0x509C],
+  ["D85A",0x509D],
+  ["D854",0x509E],
+  ["B3C3",0x50A2],
+  ["D856",0x50A3],
+  ["9FA8",0x50A6],
+  ["B6CA",0x50AC],
+  ["B6C4",0x50AD],
+  ["DCB7",0x50AE],
+  ["B6CD",0x50AF],
+  ["DCBD",0x50B0],
+  ["DCC0",0x50B1],
+  ["B6C6",0x50B2],
+  ["B6C7",0x50B3],
+  ["DCBA",0x50B4],
+  ["B6C5",0x50B5],
+  ["DCC3",0x50B6],
+  ["B6CB",0x50B7],
+  ["DCC4",0x50B8],
+  ["DCBF",0x50BA],
+  ["B6CC",0x50BB],
+  ["8C71",0x50BC],
+  ["DCB4",0x50BD],
+  ["B6C9",0x50BE],
+  ["DCB5",0x50BF],
+  ["DCBE",0x50C1],
+  ["DCBC",0x50C2],
+  ["DCB8",0x50C4],
+  ["B6C8",0x50C5],
+  ["DCB6",0x50C6],
+  ["B6CE",0x50C7],
+  ["DCBB",0x50C8],
+  ["DCC2",0x50C9],
+  ["DCB9",0x50CA],
+  ["DCC1",0x50CB],
+  ["92A1",0x50CD],
+  ["B9B6",0x50CE],
+  ["B9B3",0x50CF],
+  ["90E3",0x50D0],
+  ["B9B4",0x50D1],
+  ["E0F9",0x50D3],
+  ["E0F1",0x50D4],
+  ["B9B2",0x50D5],
+  ["B9AF",0x50D6],
+  ["E0F2",0x50D7],
+  ["A0A6",0x50D9],
+  ["B9B1",0x50DA],
+  ["E0F5",0x50DB],
+  ["E0F7",0x50DD],
+  ["94AB",0x50DF],
+  ["E0FE",0x50E0],
+  ["FC72",0x50E1],
+  ["E0FD",0x50E3],
+  ["E0F8",0x50E4],
+  ["B9AE",0x50E5],
+  ["E0F0",0x50E6],
+  ["B9AC",0x50E7],
+  ["E0F3",0x50E8],
+  ["B9B7",0x50E9],
+  ["E0F6",0x50EA],
+  ["E0FA",0x50EC],
+  ["B9B0",0x50ED],
+  ["B9AD",0x50EE],
+  ["E0FC",0x50EF],
+  ["E0FB",0x50F0],
+  ["B9B5",0x50F1],
+  ["E0F4",0x50F3],
+  ["97C4",0x50F4],
+  ["BBF8",0x50F5],
+  ["E4EC",0x50F6],
+  ["E4E9",0x50F8],
+  ["BBF9",0x50F9],
+  ["BBF7",0x50FB],
+  ["92AE",0x50FC],
+  ["E4F0",0x50FD],
+  ["E4ED",0x50FE],
+  ["E4E6",0x50FF],
+  ["BBF6",0x5100],
+  ["FA67",0x5101],
+  ["BBFA",0x5102],
+  ["E4E7",0x5103],
+  ["BBF5",0x5104],
+  ["BBFD",0x5105],
+  ["E4EA",0x5106],
+  ["E4EB",0x5107],
+  ["BBFB",0x5108],
+  ["BBFC",0x5109],
+  ["E4F1",0x510A],
+  ["E4EE",0x510B],
+  ["E4EF",0x510C],
+  ["92A2",0x510D],
+  ["FA69",0x510E],
+  ["BEAA",0x5110],
+  ["E8F8",0x5111],
+  ["BEA7",0x5112],
+  ["E8F5",0x5113],
+  ["BEA9",0x5114],
+  ["BEAB",0x5115],
+  ["E8F6",0x5117],
+  ["BEA8",0x5118],
+  ["E8F7",0x511A],
+  ["E8F4",0x511C],
+  ["C076",0x511F],
+  ["ECBD",0x5120],
+  ["C077",0x5121],
+  ["ECBB",0x5122],
+  ["ECBC",0x5124],
+  ["ECBA",0x5125],
+  ["ECB9",0x5126],
+  ["ECBE",0x5129],
+  ["C075",0x512A],
+  ["9268",0x512B],
+  ["EFB8",0x512D],
+  ["EFB9",0x512E],
+  ["E4E8",0x5130],
+  ["EFB7",0x5131],
+  ["C078",0x5132],
+  ["C35F",0x5133],
+  ["F1EB",0x5134],
+  ["F1EC",0x5135],
+  ["C4D7",0x5137],
+  ["C4D8",0x5138],
+  ["F5C1",0x5139],
+  ["F5C0",0x513A],
+  ["C56C",0x513B],
+  ["C56B",0x513C],
+  ["F7D0",0x513D],
+  ["A449",0x513F],
+  ["A461",0x5140],
+  ["A4B9",0x5141],
+  ["A4B8",0x5143],
+  ["A553",0x5144],
+  ["A552",0x5145],
+  ["A5FC",0x5146],
+  ["A5FB",0x5147],
+  ["A5FD",0x5148],
+  ["A5FA",0x5149],
+  ["A74A",0x514B],
+  ["A749",0x514C],
+  ["A74B",0x514D],
+  ["A8E0",0x5152],
+  ["A8DF",0x5154],
+  ["A8E1",0x5155],
+  ["8951",0x5156],
+  ["AB5E",0x5157],
+  ["A259",0x5159],
+  ["D0DE",0x515A],
+  ["A25A",0x515B],
+  ["B0C2",0x515C],
+  ["A25C",0x515D],
+  ["A25B",0x515E],
+  ["D860",0x515F],
+  ["FA6F",0x5160],
+  ["A25D",0x5161],
+  ["B9B8",0x5162],
+  ["A25E",0x5163],
+  ["A44A",0x5165],
+  ["A4BA",0x5167],
+  ["A5FE",0x5168],
+  ["A8E2",0x5169],
+  ["FA71",0x516A],
+  ["A44B",0x516B],
+  ["A4BD",0x516C],
+  ["A4BB",0x516D],
+  ["A4BC",0x516E],
+  ["A640",0x5171],
+  ["8952",0x5174],
+  ["A74C",0x5175],
+  ["A8E4",0x5176],
+  ["A8E3",0x5177],
+  ["A8E5",0x5178],
+  ["945A",0x5179],
+  ["ADDD",0x517C],
+  ["BEAC",0x5180],
+  ["C6C3",0x5182],
+  ["89DD",0x5186],
+  ["C94E",0x5187],
+  ["C8A2",0x5188],
+  ["A554",0x5189],
+  ["A555",0x518A],
+  ["A641",0x518D],
+  ["CA6A",0x518F],
+  ["AB60",0x5191],
+  ["AB5F",0x5192],
+  ["D0E0",0x5193],
+  ["D0DF",0x5194],
+  ["B0C3",0x5195],
+  ["C6C4",0x5196],
+  ["A4BE",0x5197],
+  ["C955",0x5198],
+  ["9E52",0x519A],
+  ["8953",0x519C],
+  ["CBCD",0x519E],
+  ["AB61",0x51A0],
+  ["ADE0",0x51A2],
+  ["ADDE",0x51A4],
+  ["ADDF",0x51A5],
+  ["9E55",0x51A7],
+  ["92BA",0x51A8],
+  ["BEAD",0x51AA],
+  ["C6C5",0x51AB],
+  ["A556",0x51AC],
+  ["8C5B",0x51AE],
+  ["A642",0x51B0],
+  ["C9BC",0x51B1],
+  ["FA7D",0x51B2],
+  ["FAA8",0x51B3],
+  ["9A68",0x51B4],
+  ["FA47",0x51B5],
+  ["A74D",0x51B6],
+  ["A74E",0x51B7],
+  ["FA7E",0x51B8],
+  ["CA6B",0x51B9],
+  ["CBCE",0x51BC],
+  ["A8E6",0x51BD],
+  ["CBCF",0x51BE],
+  ["92BB",0x51C3],
+  ["D0E2",0x51C4],
+  ["D0E3",0x51C5],
+  ["ADE3",0x51C6],
+  ["FDB6",0x51C7],
+  ["D0E4",0x51C8],
+  ["FAA2",0x51C9],
+  ["D0E1",0x51CA],
+  ["ADE4",0x51CB],
+  ["ADE2",0x51CC],
+  ["ADE1",0x51CD],
+  ["D0E5",0x51CE],
+  ["FAA3",0x51CF],
+  ["D468",0x51D0],
+  ["FAA4",0x51D1],
+  ["9BB4",0x51D2],
+  ["FAA6",0x51D3],
+  ["D861",0x51D4],
+  ["DCC5",0x51D7],
+  ["E140",0x51D8],
+  ["89DF",0x51DB],
+  ["BBFE",0x51DC],
+  ["BEAE",0x51DD],
+  ["E8F9",0x51DE],
+  ["FDDB",0x51DF],
+  ["A44C",0x51E0],
+  ["A45A",0x51E1],
+  ["FAA9",0x51E2],
+  ["8954",0x51E4],
+  ["FAAB",0x51ED],
+  ["B0C4",0x51F0],
+  ["B3CD",0x51F1],
+  ["B9B9",0x51F3],
+  ["FC7A",0x51F4],
+  ["C942",0x51F5],
+  ["A4BF",0x51F6],
+  ["A559",0x51F8],
+  ["A557",0x51F9],
+  ["A558",0x51FA],
+  ["89E0",0x51FC],
+  ["A8E7",0x51FD],
+  ["9F4F",0x51FE],
+  ["A44D",0x5200],
+  ["A44E",0x5201],
+  ["C87D",0x5202],
+  ["A462",0x5203],
+  ["89E1",0x5205],
+  ["A4C0",0x5206],
+  ["A4C1",0x5207],
+  ["A4C2",0x5208],
+  ["C9BE",0x5209],
+  ["A55A",0x520A],
+  ["FAB0",0x520B],
+  ["C96B",0x520C],
+  ["A646",0x520E],
+  ["C9BF",0x5210],
+  ["A644",0x5211],
+  ["A645",0x5212],
+  ["C9BD",0x5213],
+  ["A647",0x5216],
+  ["A643",0x5217],
+  ["CA6C",0x521C],
+  ["AAEC",0x521D],
+  ["CA6D",0x521E],
+  ["9FCD",0x521F],
+  ["A0E7",0x5220],
+  ["CA6E",0x5221],
+  ["A750",0x5224],
+  ["A74F",0x5225],
+  ["FAB1",0x5226],
+  ["89A6",0x5227],
+  ["A753",0x5228],
+  ["A751",0x5229],
+  ["A752",0x522A],
+  ["A8ED",0x522E],
+  ["A8EC",0x5230],
+  ["CBD4",0x5231],
+  ["CBD1",0x5232],
+  ["CBD2",0x5233],
+  ["9EFA",0x5234],
+  ["CBD0",0x5235],
+  ["A8EE",0x5236],
+  ["A8EA",0x5237],
+  ["A8E9",0x5238],
+  ["A8EB",0x523A],
+  ["A8E8",0x523B],
+  ["FAB2",0x523C],
+  ["A8EF",0x5241],
+  ["AB63",0x5243],
+  ["CDF0",0x5244],
+  ["CBD3",0x5246],
+  ["AB68",0x5247],
+  ["CDF1",0x5249],
+  ["AB64",0x524A],
+  ["AB67",0x524B],
+  ["AB66",0x524C],
+  ["AB65",0x524D],
+  ["AB62",0x524E],
+  ["D0E8",0x5252],
+  ["ADE7",0x5254],
+  ["D0EB",0x5255],
+  ["ADE5",0x5256],
+  ["FAB4",0x5257],
+  ["92C4",0x5259],
+  ["D0E7",0x525A],
+  ["ADE8",0x525B],
+  ["ADE6",0x525C],
+  ["ADE9",0x525D],
+  ["D0E9",0x525E],
+  ["D0EA",0x525F],
+  ["9F6F",0x5260],
+  ["D0E6",0x5261],
+  ["D0EC",0x5262],
+  ["8BB0",0x5268],
+  ["B3D1",0x5269],
+  ["B0C5",0x526A],
+  ["D469",0x526B],
+  ["D46B",0x526C],
+  ["D46A",0x526D],
+  ["D46C",0x526E],
+  ["B0C6",0x526F],
+  ["B3CE",0x5272],
+  ["9FAC",0x5273],
+  ["B3CF",0x5274],
+  ["B3D0",0x5275],
+  ["B6D0",0x5277],
+  ["DCC7",0x5278],
+  ["89E3",0x5279],
+  ["DCC6",0x527A],
+  ["DCC8",0x527B],
+  ["DCC9",0x527C],
+  ["B6D1",0x527D],
+  ["B6CF",0x527F],
+  ["E141",0x5280],
+  ["E142",0x5281],
+  ["B9BB",0x5282],
+  ["B9BA",0x5283],
+  ["E35A",0x5284],
+  ["BC40",0x5287],
+  ["BC41",0x5288],
+  ["BC42",0x5289],
+  ["BC44",0x528A],
+  ["E4F2",0x528B],
+  ["E4F3",0x528C],
+  ["BC43",0x528D],
+  ["9BD3",0x528F],
+  ["89E4",0x5290],
+  ["BEAF",0x5291],
+  ["BEB0",0x5293],
+  ["FAB5",0x5294],
+  ["F1ED",0x5296],
+  ["F5C3",0x5297],
+  ["F5C2",0x5298],
+  ["F7D1",0x5299],
+  ["9FD5",0x529A],
+  ["A44F",0x529B],
+  ["A55C",0x529F],
+  ["A55B",0x52A0],
+  ["8955",0x52A1],
+  ["A648",0x52A3],
+  ["92C5",0x52A4],
+  ["C9C0",0x52A6],
+  ["8956",0x52A8],
+  ["A755",0x52A9],
+  ["A756",0x52AA],
+  ["A754",0x52AB],
+  ["A757",0x52AC],
+  ["CA6F",0x52AD],
+  ["CA70",0x52AE],
+  ["FAB3",0x52B5],
+  ["FAB6",0x52B9],
+  ["A8F1",0x52BB],
+  ["CBD5",0x52BC],
+  ["A8F0",0x52BE],
+  ["CDF2",0x52C0],
+  ["AB6C",0x52C1],
+  ["CDF3",0x52C2],
+  ["AB6B",0x52C3],
+  ["FAB7",0x52C5],
+  ["AB69",0x52C7],
+  ["AB6A",0x52C9],
+  ["9EDC",0x52CC],
+  ["D0ED",0x52CD],
+  ["FBC4",0x52D0],
+  ["9F71",0x52D1],
+  ["B0C7",0x52D2],
+  ["D46E",0x52D3],
+  ["B0CA",0x52D5],
+  ["D46D",0x52D6],
+  ["B1E5",0x52D7],
+  ["B0C9",0x52D8],
+  ["B0C8",0x52D9],
+  ["B3D4",0x52DB],
+  ["B3D3",0x52DD],
+  ["B3D2",0x52DE],
+  ["B6D2",0x52DF],
+  ["FABA",0x52E0],
+  ["92C7",0x52E1],
+  ["B6D5",0x52E2],
+  ["B6D6",0x52E3],
+  ["B6D4",0x52E4],
+  ["B6D3",0x52E6],
+  ["E143",0x52E9],
+  ["E144",0x52EB],
+  ["E4F5",0x52EF],
+  ["BC45",0x52F0],
+  ["E4F4",0x52F1],
+  ["BEB1",0x52F3],
+  ["ECBF",0x52F4],
+  ["C079",0x52F5],
+  ["F1EE",0x52F7],
+  ["C455",0x52F8],
+  ["C6C6",0x52F9],
+  ["A463",0x52FA],
+  ["A4C3",0x52FB],
+  ["C956",0x52FC],
+  ["A4C4",0x52FE],
+  ["A4C5",0x52FF],
+  ["9A4C",0x5301],
+  ["A55D",0x5305],
+  ["A55E",0x5306],
+  ["A649",0x5308],
+  ["CA71",0x5309],
+  ["CBD6",0x530A],
+  ["CBD7",0x530B],
+  ["AB6D",0x530D],
+  ["D0EE",0x530E],
+  ["B0CC",0x530F],
+  ["B0CB",0x5310],
+  ["D863",0x5311],
+  ["D862",0x5312],
+  ["A450",0x5315],
+  ["A4C6",0x5316],
+  ["A55F",0x5317],
+  ["B0CD",0x5319],
+  ["C943",0x531A],
+  ["C96C",0x531C],
+  ["A560",0x531D],
+  ["C9C2",0x531F],
+  ["A64B",0x5320],
+  ["A64A",0x5321],
+  ["C9C1",0x5322],
+  ["A758",0x5323],
+  ["8C68",0x5324],
+  ["89E5",0x5327],
+  ["ADEA",0x532A],
+  ["9F7D",0x532C],
+  ["D46F",0x532D],
+  ["B6D7",0x532F],
+  ["E145",0x5330],
+  ["B9BC",0x5331],
+  ["A0A9",0x5332],
+  ["FAC4",0x5333],
+  ["E8FA",0x5334],
+  ["F3FD",0x5337],
+  ["C6C7",0x5338],
+  ["A4C7",0x5339],
+  ["8957",0x533B],
+  ["CBD8",0x533C],
+  ["CDF4",0x533D],
+  ["B0D0",0x533E],
+  ["B0CE",0x533F],
+  ["B0CF",0x5340],
+  ["A451",0x5341],
+  ["FAAA",0x5342],
+  ["A464",0x5343],
+  ["A2CD",0x5344],
+  ["A4CA",0x5345],
+  ["A4C9",0x5347],
+  ["A4C8",0x5348],
+  ["A563",0x5349],
+  ["A562",0x534A],
+  ["C96D",0x534C],
+  ["C9C3",0x534D],
+  ["8958",0x534E],
+  ["A8F5",0x5351],
+  ["A8F2",0x5352],
+  ["A8F4",0x5353],
+  ["A8F3",0x5354],
+  ["AB6E",0x5357],
+  ["B3D5",0x535A],
+  ["A452",0x535C],
+  ["8BE3",0x535D],
+  ["A4CB",0x535E],
+  ["8B61",0x535F],
+  ["A565",0x5360],
+  ["A564",0x5361],
+  ["CA72",0x5363],
+  ["9AF1",0x5364],
+  ["A8F6",0x5366],
+  ["9EB7",0x5367],
+  ["C6C8",0x5369],
+  ["C957",0x536C],
+  ["FAD1",0x536D],
+  ["A567",0x536E],
+  ["A566",0x536F],
+  ["A64C",0x5370],
+  ["A64D",0x5371],
+  ["CA73",0x5372],
+  ["A759",0x5373],
+  ["FAD2",0x5374],
+  ["A75A",0x5375],
+  ["A8F7",0x5377],
+  ["A8F8",0x5378],
+  ["A8F9",0x5379],
+  ["AB6F",0x537B],
+  ["CDF5",0x537C],
+  ["9EBA",0x537D],
+  ["FAD4",0x537E],
+  ["ADEB",0x537F],
+  ["C944",0x5382],
+  ["A4CC",0x5384],
+  ["C9C4",0x538A],
+  ["CA74",0x538E],
+  ["CA75",0x538F],
+  ["CBD9",0x5392],
+  ["FAD9",0x5393],
+  ["CBDA",0x5394],
+  ["CDF7",0x5396],
+  ["CDF6",0x5397],
+  ["CDF9",0x5398],
+  ["CDF8",0x5399],
+  ["AB70",0x539A],
+  ["D470",0x539C],
+  ["ADED",0x539D],
+  ["D0EF",0x539E],
+  ["ADEC",0x539F],
+  ["FADB",0x53A0],
+  ["9CE0",0x53A2],
+  ["D864",0x53A4],
+  ["B3D6",0x53A5],
+  ["FBF7",0x53A6],
+  ["D865",0x53A7],
+  ["FBFA",0x53A8],
+  ["89E7",0x53A9],
+  ["A07A",0x53AA],
+  ["FADC",0x53AB],
+  ["E146",0x53AC],
+  ["B9BD",0x53AD],
+  ["FADD",0x53AE],
+  ["89E9",0x53B0],
+  ["BC46",0x53B2],
+  ["F1EF",0x53B4],
+  ["C6C9",0x53B6],
+  ["C958",0x53B9],
+  ["A568",0x53BB],
+  ["FAE2",0x53C1],
+  ["89EB",0x53C2],
+  ["B0D1",0x53C3],
+  ["FAE3",0x53C5],
+  ["A453",0x53C8],
+  ["A465",0x53C9],
+  ["A4CE",0x53CA],
+  ["A4CD",0x53CB],
+  ["90C8",0x53CC],
+  ["A4CF",0x53CD],
+  ["92DA",0x53D0],
+  ["8959",0x53D1],
+  ["9CF5",0x53D2],
+  ["A8FB",0x53D4],
+  ["A8FA",0x53D6],
+  ["A8FC",0x53D7],
+  ["895A",0x53D8],
+  ["FAE7",0x53D9],
+  ["9FA2",0x53DA],
+  ["AB71",0x53DB],
+  ["ADEE",0x53DF],
+  ["FAEA",0x53E0],
+  ["E8FB",0x53E1],
+  ["C24F",0x53E2],
+  ["A466",0x53E3],
+  ["A56A",0x53E4],
+  ["A579",0x53E5],
+  ["A574",0x53E6],
+  ["A56F",0x53E8],
+  ["A56E",0x53E9],
+  ["A575",0x53EA],
+  ["A573",0x53EB],
+  ["A56C",0x53EC],
+  ["A57A",0x53ED],
+  ["A56D",0x53EE],
+  ["A569",0x53EF],
+  ["A578",0x53F0],
+  ["A577",0x53F1],
+  ["A576",0x53F2],
+  ["A56B",0x53F3],
+  ["A572",0x53F5],
+  ["FAED",0x53F6],
+  ["8FAD",0x53F7],
+  ["A571",0x53F8],
+  ["A57B",0x53FB],
+  ["A570",0x53FC],
+  ["FB59",0x53FE],
+  ["A653",0x5401],
+  ["A659",0x5403],
+  ["A655",0x5404],
+  ["A65B",0x5406],
+  ["C9C5",0x5407],
+  ["A658",0x5408],
+  ["A64E",0x5409],
+  ["A651",0x540A],
+  ["A654",0x540B],
+  ["A650",0x540C],
+  ["A657",0x540D],
+  ["A65A",0x540E],
+  ["A64F",0x540F],
+  ["A652",0x5410],
+  ["A656",0x5411],
+  ["A65C",0x5412],
+  ["FAEF",0x5413],
+  ["96EF",0x5414],
+  ["9DEC",0x5416],
+  ["CA7E",0x5418],
+  ["CA7B",0x5419],
+  ["9DCA",0x541A],
+  ["A767",0x541B],
+  ["CA7C",0x541C],
+  ["A75B",0x541D],
+  ["A75D",0x541E],
+  ["A775",0x541F],
+  ["A770",0x5420],
+  ["FD6D",0x5421],
+  ["89EC",0x5423],
+  ["CAA5",0x5424],
+  ["CA7D",0x5425],
+  ["A75F",0x5426],
+  ["A761",0x5427],
+  ["CAA4",0x5428],
+  ["A768",0x5429],
+  ["CA78",0x542A],
+  ["A774",0x542B],
+  ["A776",0x542C],
+  ["A75C",0x542D],
+  ["A76D",0x542E],
+  ["FB44",0x542F],
+  ["CA76",0x5430],
+  ["A773",0x5431],
+  ["9DE2",0x5432],
+  ["A764",0x5433],
+  ["8C75",0x5434],
+  ["A76E",0x5435],
+  ["A76F",0x5436],
+  ["CA77",0x5437],
+  ["A76C",0x5438],
+  ["A76A",0x5439],
+  ["A76B",0x543B],
+  ["A771",0x543C],
+  ["CAA1",0x543D],
+  ["A75E",0x543E],
+  ["A772",0x5440],
+  ["CAA3",0x5441],
+  ["A766",0x5442],
+  ["A763",0x5443],
+  ["CA7A",0x5445],
+  ["A762",0x5446],
+  ["CAA6",0x5447],
+  ["A765",0x5448],
+  ["A769",0x544A],
+  ["9EC0",0x544B],
+  ["9E56",0x544D],
+  ["A760",0x544E],
+  ["CAA2",0x544F],
+  ["CA79",0x5454],
+  ["CBEB",0x5460],
+  ["CBEA",0x5461],
+  ["A94F",0x5462],
+  ["CBED",0x5463],
+  ["CBEF",0x5464],
+  ["CBE4",0x5465],
+  ["CBE7",0x5466],
+  ["CBEE",0x5467],
+  ["A950",0x5468],
+  ["9F79",0x5469],
+  ["9AC7",0x546A],
+  ["CBE1",0x546B],
+  ["CBE5",0x546C],
+  ["FAF4",0x546D],
+  ["CBE9",0x546F],
+  ["CE49",0x5470],
+  ["A94B",0x5471],
+  ["CE4D",0x5472],
+  ["A8FD",0x5473],
+  ["CBE6",0x5474],
+  ["A8FE",0x5475],
+  ["A94C",0x5476],
+  ["A945",0x5477],
+  ["A941",0x5478],
+  ["CBE2",0x547A],
+  ["A944",0x547B],
+  ["A949",0x547C],
+  ["A952",0x547D],
+  ["CBE3",0x547E],
+  ["CBDC",0x547F],
+  ["A943",0x5480],
+  ["CBDD",0x5481],
+  ["CBDF",0x5482],
+  ["A946",0x5484],
+  ["98A1",0x5485],
+  ["A948",0x5486],
+  ["CBDB",0x5487],
+  ["CBE0",0x5488],
+  ["A951",0x548B],
+  ["A94D",0x548C],
+  ["CBE8",0x548D],
+  ["A953",0x548E],
+  ["FAF8",0x548F],
+  ["A94A",0x5490],
+  ["CBDE",0x5491],
+  ["A947",0x5492],
+  ["89F0",0x5493],
+  ["9E47",0x5494],
+  ["A942",0x5495],
+  ["A940",0x5496],
+  ["9DF7",0x5497],
+  ["CBEC",0x5498],
+  ["A94E",0x549A],
+  ["9FD3",0x549C],
+  ["9ACA",0x549E],
+  ["CE48",0x54A0],
+  ["CDFB",0x54A1],
+  ["CE4B",0x54A2],
+  ["89F1",0x54A3],
+  ["FAF9",0x54A4],
+  ["CDFD",0x54A5],
+  ["AB78",0x54A6],
+  ["ABA8",0x54A7],
+  ["AB74",0x54A8],
+  ["ABA7",0x54A9],
+  ["AB7D",0x54AA],
+  ["ABA4",0x54AB],
+  ["AB72",0x54AC],
+  ["CDFC",0x54AD],
+  ["CE43",0x54AE],
+  ["ABA3",0x54AF],
+  ["CE4F",0x54B0],
+  ["ABA5",0x54B1],
+  ["8E5A",0x54B2],
+  ["AB79",0x54B3],
+  ["89F2",0x54B4],
+  ["CE45",0x54B6],
+  ["CE42",0x54B7],
+  ["AB77",0x54B8],
+  ["89F3",0x54B9],
+  ["CDFA",0x54BA],
+  ["ABA6",0x54BB],
+  ["CE4A",0x54BC],
+  ["AB7C",0x54BD],
+  ["CE4C",0x54BE],
+  ["ABA9",0x54BF],
+  ["AB73",0x54C0],
+  ["AB7E",0x54C1],
+  ["AB7B",0x54C2],
+  ["CE40",0x54C3],
+  ["ABA1",0x54C4],
+  ["CE46",0x54C5],
+  ["CE47",0x54C6],
+  ["AB7A",0x54C7],
+  ["ABA2",0x54C8],
+  ["AB76",0x54C9],
+  ["925D",0x54CB],
+  ["8B51",0x54CC],
+  ["92E0",0x54CD],
+  ["AB75",0x54CE],
+  ["CDFE",0x54CF],
+  ["89F4",0x54D0],
+  ["CE44",0x54D6],
+  ["9FD4",0x54DA],
+  ["CE4E",0x54DE],
+  ["D144",0x54E0],
+  ["ADFB",0x54E1],
+  ["D0F1",0x54E2],
+  ["8A79",0x54E3],
+  ["D0F6",0x54E4],
+  ["ADF4",0x54E5],
+  ["AE40",0x54E6],
+  ["D0F4",0x54E7],
+  ["ADEF",0x54E8],
+  ["ADF9",0x54E9],
+  ["ADFE",0x54EA],
+  ["D0FB",0x54EB],
+  ["ADFA",0x54ED],
+  ["ADFD",0x54EE],
+  ["89F5",0x54EF],
+  ["D0FE",0x54F1],
+  ["ADF5",0x54F2],
+  ["D0F5",0x54F3],
+  ["D142",0x54F7],
+  ["D143",0x54F8],
+  ["ADF7",0x54FA],
+  ["D141",0x54FB],
+  ["ADF3",0x54FC],
+  ["AE43",0x54FD],
+  ["D0F8",0x54FF],
+  ["ADF1",0x5501],
+  ["97A7",0x5502],
+  ["D146",0x5503],
+  ["D0F9",0x5504],
+  ["D0FD",0x5505],
+  ["ADF6",0x5506],
+  ["AE42",0x5507],
+  ["D0FA",0x5508],
+  ["ADFC",0x5509],
+  ["D140",0x550A],
+  ["D147",0x550B],
+  ["D4A1",0x550C],
+  ["93BA",0x550D],
+  ["D145",0x550E],
+  ["AE44",0x550F],
+  ["ADF0",0x5510],
+  ["D0FC",0x5511],
+  ["D0F3",0x5512],
+  ["9E58",0x5513],
+  ["ADF8",0x5514],
+  ["D0F2",0x5517],
+  ["89F6",0x5518],
+  ["D0F7",0x551A],
+  ["9E57",0x551E],
+  ["89F7",0x5523],
+  ["8A41",0x5525],
+  ["D0F0",0x5526],
+  ["AE41",0x5527],
+  ["89F8",0x5528],
+  ["D477",0x552A],
+  ["FAF1",0x552B],
+  ["B0E4",0x552C],
+  ["D4A7",0x552D],
+  ["B0E2",0x552E],
+  ["B0DF",0x552F],
+  ["D47C",0x5530],
+  ["B0DB",0x5531],
+  ["D4A2",0x5532],
+  ["B0E6",0x5533],
+  ["D476",0x5534],
+  ["D47B",0x5535],
+  ["D47A",0x5536],
+  ["ADF2",0x5537],
+  ["B0E1",0x5538],
+  ["D4A5",0x5539],
+  ["D4A8",0x553B],
+  ["D473",0x553C],
+  ["B3E8",0x553E],
+  ["89FA",0x553F],
+  ["D4A9",0x5540],
+  ["B0E7",0x5541],
+  ["B0D9",0x5543],
+  ["B0D6",0x5544],
+  ["D47E",0x5545],
+  ["B0D3",0x5546],
+  ["FB42",0x5547],
+  ["D4A6",0x5548],
+  ["FABF",0x5549],
+  ["B0DA",0x554A],
+  ["D4AA",0x554B],
+  ["D474",0x554D],
+  ["D4A4",0x554E],
+  ["B0DD",0x554F],
+  ["D475",0x5550],
+  ["D478",0x5551],
+  ["D47D",0x5552],
+  ["FBA3",0x5553],
+  ["B0DE",0x5555],
+  ["B0DC",0x5556],
+  ["B0E8",0x5557],
+  ["B0E3",0x555C],
+  ["FAF7",0x555D],
+  ["B0D7",0x555E],
+  ["B1D2",0x555F],
+  ["B0D8",0x5561],
+  ["D479",0x5562],
+  ["B0E5",0x5563],
+  ["B0E0",0x5564],
+  ["D4A3",0x5565],
+  ["B0D5",0x5566],
+  ["9E4E",0x5569],
+  ["B0D4",0x556A],
+  ["94DC",0x556B],
+  ["95DA",0x5571],
+  ["9DF8",0x5572],
+  ["9F6A",0x5573],
+  ["D471",0x5575],
+  ["D472",0x5576],
+  ["D86A",0x5577],
+  ["8AB7",0x5579],
+  ["B3D7",0x557B],
+  ["B3DA",0x557C],
+  ["D875",0x557D],
+  ["B3EE",0x557E],
+  ["D878",0x557F],
+  ["B3D8",0x5580],
+  ["D871",0x5581],
+  ["B3DE",0x5582],
+  ["B3E4",0x5583],
+  ["B5BD",0x5584],
+  ["FB46",0x5586],
+  ["B3E2",0x5587],
+  ["D86E",0x5588],
+  ["B3EF",0x5589],
+  ["B3DB",0x558A],
+  ["B3E3",0x558B],
+  ["D876",0x558C],
+  ["DCD7",0x558D],
+  ["D87B",0x558E],
+  ["D86F",0x558F],
+  ["8A46",0x5590],
+  ["D866",0x5591],
+  ["D873",0x5592],
+  ["D86D",0x5593],
+  ["B3E1",0x5594],
+  ["D879",0x5595],
+  ["B3DD",0x5598],
+  ["B3F1",0x5599],
+  ["B3EA",0x559A],
+  ["B3DF",0x559C],
+  ["B3DC",0x559D],
+  ["B3E7",0x559F],
+  ["D87A",0x55A1],
+  ["D86C",0x55A2],
+  ["D872",0x55A3],
+  ["D874",0x55A4],
+  ["D868",0x55A5],
+  ["D877",0x55A6],
+  ["B3D9",0x55A7],
+  ["D867",0x55A8],
+  ["FB47",0x55A9],
+  ["B3E0",0x55AA],
+  ["B3F0",0x55AB],
+  ["B3EC",0x55AC],
+  ["D869",0x55AD],
+  ["B3E6",0x55AE],
+  ["9148",0x55B0],
+  ["B3ED",0x55B1],
+  ["B3E9",0x55B2],
+  ["B3E5",0x55B3],
+  ["92DE",0x55B4],
+  ["D870",0x55B5],
+  ["8B53",0x55B9],
+  ["9DF6",0x55BA],
+  ["B3EB",0x55BB],
+  ["9BDA",0x55BC],
+  ["DCD5",0x55BF],
+  ["DCD1",0x55C0],
+  ["9D7E",0x55C1],
+  ["DCE0",0x55C2],
+  ["DCCA",0x55C3],
+  ["DCD3",0x55C4],
+  ["B6E5",0x55C5],
+  ["B6E6",0x55C6],
+  ["B6DE",0x55C7],
+  ["DCDC",0x55C8],
+  ["B6E8",0x55C9],
+  ["DCCF",0x55CA],
+  ["DCCE",0x55CB],
+  ["DCCC",0x55CC],
+  ["DCDE",0x55CD],
+  ["B6DC",0x55CE],
+  ["DCD8",0x55CF],
+  ["DCCD",0x55D0],
+  ["B6DF",0x55D1],
+  ["DCD6",0x55D2],
+  ["B6DA",0x55D3],
+  ["DCD2",0x55D4],
+  ["DCD9",0x55D5],
+  ["DCDB",0x55D6],
+  ["89FD",0x55D7],
+  ["99E4",0x55D8],
+  ["DCDF",0x55D9],
+  ["B6E3",0x55DA],
+  ["DCCB",0x55DB],
+  ["B6DD",0x55DC],
+  ["DCD0",0x55DD],
+  ["9E43",0x55DE],
+  ["B6D8",0x55DF],
+  ["B6E4",0x55E1],
+  ["DCDA",0x55E2],
+  ["B6E0",0x55E3],
+  ["B6E1",0x55E4],
+  ["B6E7",0x55E5],
+  ["B6DB",0x55E6],
+  ["A25F",0x55E7],
+  ["B6D9",0x55E8],
+  ["DCD4",0x55E9],
+  ["9DE9",0x55EA],
+  ["8F52",0x55EC],
+  ["B6E2",0x55EF],
+  ["9DF5",0x55F0],
+  ["9DF0",0x55F1],
+  ["DCDD",0x55F2],
+  ["99E7",0x55F5],
+  ["B9CD",0x55F6],
+  ["B9C8",0x55F7],
+  ["E155",0x55F9],
+  ["E151",0x55FA],
+  ["8BBD",0x55FB],
+  ["E14B",0x55FC],
+  ["B9C2",0x55FD],
+  ["B9BE",0x55FE],
+  ["E154",0x55FF],
+  ["B9BF",0x5600],
+  ["E14E",0x5601],
+  ["E150",0x5602],
+  ["E153",0x5604],
+  ["9DEF",0x5605],
+  ["B9C4",0x5606],
+  ["B9CB",0x5608],
+  ["B9C5",0x5609],
+  ["E149",0x560C],
+  ["B9C6",0x560D],
+  ["B9C7",0x560E],
+  ["E14C",0x560F],
+  ["B9CC",0x5610],
+  ["9FB7",0x5611],
+  ["E14A",0x5612],
+  ["E14F",0x5613],
+  ["B9C3",0x5614],
+  ["E148",0x5615],
+  ["B9C9",0x5616],
+  ["B9C1",0x5617],
+  ["B9C0",0x561B],
+  ["E14D",0x561C],
+  ["E152",0x561D],
+  ["9DD0",0x561E],
+  ["B9CA",0x561F],
+  ["9FEB",0x5620],
+  ["8DA9",0x5621],
+  ["9DCF",0x5622],
+  ["98E1",0x5623],
+  ["9DE5",0x5625],
+  ["E147",0x5627],
+  ["BC4D",0x5629],
+  ["E547",0x562A],
+  ["E544",0x562C],
+  ["9DC8",0x562D],
+  ["BC47",0x562E],
+  ["BC53",0x562F],
+  ["BC54",0x5630],
+  ["BC4A",0x5632],
+  ["E542",0x5633],
+  ["BC4C",0x5634],
+  ["E4F9",0x5635],
+  ["BC52",0x5636],
+  ["FB4F",0x5637],
+  ["E546",0x5638],
+  ["BC49",0x5639],
+  ["E548",0x563A],
+  ["BC48",0x563B],
+  ["E543",0x563D],
+  ["E545",0x563E],
+  ["BC4B",0x563F],
+  ["E541",0x5640],
+  ["E4FA",0x5641],
+  ["E4F7",0x5642],
+  ["9DEB",0x5643],
+  ["D86B",0x5645],
+  ["E4FD",0x5646],
+  ["E4F6",0x5648],
+  ["E4FC",0x5649],
+  ["E4FB",0x564A],
+  ["E4F8",0x564C],
+  ["FB54",0x564D],
+  ["BC4F",0x564E],
+  ["FB55",0x564F],
+  ["9AA2",0x5650],
+  ["8AD6",0x5652],
+  ["BC4E",0x5653],
+  ["9A5F",0x5654],
+  ["BC50",0x5657],
+  ["E4FE",0x5658],
+  ["BEB2",0x5659],
+  ["E540",0x565A],
+  ["9EF5",0x565D],
+  ["E945",0x565E],
+  ["E8FD",0x5660],
+  ["8FB7",0x5661],
+  ["BEBE",0x5662],
+  ["E942",0x5663],
+  ["BEB6",0x5664],
+  ["BEBA",0x5665],
+  ["E941",0x5666],
+  ["BEB9",0x5668],
+  ["BEB5",0x5669],
+  ["BEB8",0x566A],
+  ["BEB3",0x566B],
+  ["BEBD",0x566C],
+  ["E943",0x566D],
+  ["E8FE",0x566E],
+  ["BEBC",0x566F],
+  ["E8FC",0x5670],
+  ["BEBB",0x5671],
+  ["E944",0x5672],
+  ["E940",0x5673],
+  ["BC51",0x5674],
+  ["BEBF",0x5676],
+  ["E946",0x5677],
+  ["BEB7",0x5678],
+  ["BEB4",0x5679],
+  ["9AD2",0x567A],
+  ["9E6A",0x567B],
+  ["9EE8",0x567C],
+  ["ECC6",0x567E],
+  ["ECC8",0x567F],
+  ["C07B",0x5680],
+  ["ECC9",0x5681],
+  ["ECC7",0x5682],
+  ["ECC5",0x5683],
+  ["ECC4",0x5684],
+  ["C07D",0x5685],
+  ["ECC3",0x5686],
+  ["C07E",0x5687],
+  ["8BBF",0x5689],
+  ["91C2",0x568A],
+  ["9D62",0x568B],
+  ["ECC1",0x568C],
+  ["ECC2",0x568D],
+  ["C07A",0x568E],
+  ["C0A1",0x568F],
+  ["C07C",0x5690],
+  ["9260",0x5692],
+  ["ECC0",0x5693],
+  ["C250",0x5695],
+  ["EFBC",0x5697],
+  ["EFBA",0x5698],
+  ["EFBF",0x5699],
+  ["EFBD",0x569A],
+  ["EFBB",0x569C],
+  ["EFBE",0x569D],
+  ["925E",0x569E],
+  ["91C1",0x569F],
+  ["8AC5",0x56A1],
+  ["97A3",0x56A4],
+  ["C360",0x56A5],
+  ["F1F2",0x56A6],
+  ["F1F3",0x56A7],
+  ["C456",0x56A8],
+  ["F1F4",0x56AA],
+  ["F1F0",0x56AB],
+  ["F1F5",0x56AC],
+  ["F1F1",0x56AD],
+  ["C251",0x56AE],
+  ["8B6C",0x56AF],
+  ["8D7E",0x56B1],
+  ["F3FE",0x56B2],
+  ["F441",0x56B3],
+  ["C459",0x56B4],
+  ["F440",0x56B5],
+  ["C458",0x56B6],
+  ["C457",0x56B7],
+  ["9C54",0x56B9],
+  ["C45A",0x56BC],
+  ["F5C5",0x56BD],
+  ["F5C6",0x56BE],
+  ["9DBD",0x56BF],
+  ["C4DA",0x56C0],
+  ["C4D9",0x56C1],
+  ["C4DB",0x56C2],
+  ["F5C4",0x56C3],
+  ["F6D8",0x56C5],
+  ["F6D7",0x56C6],
+  ["C56D",0x56C8],
+  ["C56F",0x56C9],
+  ["C56E",0x56CA],
+  ["F6D9",0x56CB],
+  ["C5C8",0x56CC],
+  ["F8A6",0x56CD],
+  ["C5F1",0x56D1],
+  ["F8A5",0x56D3],
+  ["F8EE",0x56D4],
+  ["9CC5",0x56D6],
+  ["C949",0x56D7],
+  ["A57D",0x56DA],
+  ["A57C",0x56DB],
+  ["A65F",0x56DD],
+  ["A65E",0x56DE],
+  ["C9C7",0x56DF],
+  ["A65D",0x56E0],
+  ["C9C6",0x56E1],
+  ["895B",0x56E2],
+  ["A779",0x56E4],
+  ["CAA9",0x56E5],
+  ["CAA8",0x56E7],
+  ["A777",0x56EA],
+  ["A77A",0x56EB],
+  ["FB5C",0x56ED],
+  ["CAA7",0x56EE],
+  ["FB5B",0x56EF],
+  ["A778",0x56F0],
+  ["FB57",0x56F1],
+  ["CBF0",0x56F7],
+  ["CBF1",0x56F9],
+  ["A954",0x56FA],
+  ["8765",0x56FB],
+  ["98C7",0x56FD],
+  ["ABAA",0x56FF],
+  ["FB5A",0x5700],
+  ["D148",0x5701],
+  ["D149",0x5702],
+  ["AE45",0x5703],
+  ["AE46",0x5704],
+  ["D4AC",0x5707],
+  ["B0E9",0x5708],
+  ["B0EB",0x5709],
+  ["D4AB",0x570A],
+  ["B0EA",0x570B],
+  ["D87C",0x570C],
+  ["B3F2",0x570D],
+  ["B6E9",0x5712],
+  ["B6EA",0x5713],
+  ["DCE1",0x5714],
+  ["9CEE",0x5715],
+  ["B9CF",0x5716],
+  ["B9CE",0x5718],
+  ["E549",0x571A],
+  ["E948",0x571B],
+  ["E947",0x571C],
+  ["92E2",0x571D],
+  ["F96B",0x571E],
+  ["A467",0x571F],
+  ["C959",0x5720],
+  ["C96E",0x5722],
+  ["C96F",0x5723],
+  ["A662",0x5728],
+  ["A666",0x5729],
+  ["C9C9",0x572A],
+  ["A664",0x572C],
+  ["A663",0x572D],
+  ["C9C8",0x572E],
+  ["A665",0x572F],
+  ["A661",0x5730],
+  ["94A7",0x5732],
+  ["A660",0x5733],
+  ["C9CA",0x5734],
+  ["A7A6",0x573B],
+  ["8CCC",0x573D],
+  ["A7A3",0x573E],
+  ["9BD4",0x573F],
+  ["A77D",0x5740],
+  ["CAAA",0x5741],
+  ["FB64",0x5742],
+  ["FB76",0x5743],
+  ["CAAB",0x5745],
+  ["FB60",0x5746],
+  ["A7A1",0x5747],
+  ["CAAD",0x5749],
+  ["A77B",0x574A],
+  ["CAAE",0x574B],
+  ["CAAC",0x574C],
+  ["A77E",0x574D],
+  ["A7A2",0x574E],
+  ["A7A5",0x574F],
+  ["A7A4",0x5750],
+  ["A77C",0x5751],
+  ["CAAF",0x5752],
+  ["99E5",0x5754],
+  ["9AC2",0x5757],
+  ["91FB",0x575B],
+  ["A073",0x575F],
+  ["A959",0x5761],
+  ["CBFE",0x5762],
+  ["A95B",0x5764],
+  ["A95A",0x5766],
+  ["9F72",0x5767],
+  ["CC40",0x5768],
+  ["A958",0x5769],
+  ["A957",0x576A],
+  ["CBF5",0x576B],
+  ["CBF4",0x576D],
+  ["CBF2",0x576F],
+  ["CBF7",0x5770],
+  ["CBF6",0x5771],
+  ["CBF3",0x5772],
+  ["CBFC",0x5773],
+  ["CBFD",0x5774],
+  ["CBFA",0x5775],
+  ["CBF8",0x5776],
+  ["A956",0x5777],
+  ["9FCC",0x577A],
+  ["CBFB",0x577B],
+  ["A95C",0x577C],
+  ["CC41",0x577D],
+  ["98A5",0x577E],
+  ["92E8",0x577F],
+  ["CBF9",0x5780],
+  ["ABAB",0x5782],
+  ["A955",0x5783],
+  ["9BBC",0x5788],
+  ["96F3",0x578A],
+  ["ABAC",0x578B],
+  ["CE54",0x578C],
+  ["92E7",0x578D],
+  ["CE5A",0x578F],
+  ["FC67",0x5790],
+  ["ABB2",0x5793],
+  ["CE58",0x5794],
+  ["CE5E",0x5795],
+  ["CE55",0x5797],
+  ["CE59",0x5798],
+  ["CE5B",0x5799],
+  ["CE5D",0x579A],
+  ["CE57",0x579B],
+  ["8B7D",0x579C],
+  ["CE56",0x579D],
+  ["CE51",0x579E],
+  ["CE52",0x579F],
+  ["ABAD",0x57A0],
+  ["9BF4",0x57A1],
+  ["ABAF",0x57A2],
+  ["ABAE",0x57A3],
+  ["CE53",0x57A4],
+  ["CE5C",0x57A5],
+  ["9EF7",0x57A7],
+  ["9EC1",0x57AA],
+  ["ABB1",0x57AE],
+  ["996F",0x57B4],
+  ["CE50",0x57B5],
+  ["D153",0x57B6],
+  ["D152",0x57B8],
+  ["D157",0x57B9],
+  ["D14E",0x57BA],
+  ["96F1",0x57BB],
+  ["D151",0x57BC],
+  ["D150",0x57BD],
+  ["8E41",0x57BE],
+  ["D154",0x57BF],
+  ["D158",0x57C1],
+  ["AE47",0x57C2],
+  ["AE4A",0x57C3],
+  ["954A",0x57C4],
+  ["D14F",0x57C6],
+  ["D155",0x57C7],
+  ["97E6",0x57C8],
+  ["AE49",0x57CB],
+  ["D14A",0x57CC],
+  ["ABB0",0x57CE],
+  ["D4BA",0x57CF],
+  ["D156",0x57D0],
+  ["D14D",0x57D2],
+  ["AE48",0x57D4],
+  ["D14C",0x57D5],
+  ["96F5",0x57D7],
+  ["D4B1",0x57DC],
+  ["92E6",0x57DD],
+  ["9F42",0x57DE],
+  ["B0EC",0x57DF],
+  ["B0F0",0x57E0],
+  ["D4C1",0x57E1],
+  ["D4AF",0x57E2],
+  ["D4BD",0x57E3],
+  ["B0F1",0x57E4],
+  ["D4BF",0x57E5],
+  ["FB67",0x57E6],
+  ["D4C5",0x57E7],
+  ["D4C9",0x57E9],
+  ["D4C0",0x57EC],
+  ["D4B4",0x57ED],
+  ["D4BC",0x57EE],
+  ["99A9",0x57EF],
+  ["D4CA",0x57F0],
+  ["D4C8",0x57F1],
+  ["D4BE",0x57F2],
+  ["D4B9",0x57F3],
+  ["D4B2",0x57F4],
+  ["D8A6",0x57F5],
+  ["D4B0",0x57F6],
+  ["B0F5",0x57F7],
+  ["D4B7",0x57F8],
+  ["B0F6",0x57F9],
+  ["B0F2",0x57FA],
+  ["D4AD",0x57FB],
+  ["D4C3",0x57FC],
+  ["D4B5",0x57FD],
+  ["FAE6",0x57FE],
+  ["D4B3",0x5800],
+  ["D4C6",0x5801],
+  ["B0F3",0x5802],
+  ["FB69",0x5803],
+  ["D4CC",0x5804],
+  ["B0ED",0x5805],
+  ["B0EF",0x5806],
+  ["D4BB",0x5807],
+  ["D4B6",0x5808],
+  ["AE4B",0x5809],
+  ["B0EE",0x580A],
+  ["D4B8",0x580B],
+  ["D4C7",0x580C],
+  ["D4CB",0x580D],
+  ["D4C2",0x580E],
+  ["D4C4",0x5810],
+  ["97E5",0x5812],
+  ["D4AE",0x5814],
+  ["D8A1",0x5819],
+  ["D8AA",0x581B],
+  ["D8A9",0x581C],
+  ["B3FA",0x581D],
+  ["D8A2",0x581E],
+  ["B3FB",0x5820],
+  ["B3F9",0x5821],
+  ["967D",0x5822],
+  ["D8A4",0x5823],
+  ["B3F6",0x5824],
+  ["D8A8",0x5825],
+  ["FB6C",0x5826],
+  ["D8A3",0x5827],
+  ["D8A5",0x5828],
+  ["D87D",0x5829],
+  ["B3F4",0x582A],
+  ["D8B2",0x582C],
+  ["D8B1",0x582D],
+  ["D8AE",0x582E],
+  ["B3F3",0x582F],
+  ["B3F7",0x5830],
+  ["B3F8",0x5831],
+  ["D14B",0x5832],
+  ["D8AB",0x5833],
+  ["B3F5",0x5834],
+  ["B0F4",0x5835],
+  ["D8AD",0x5836],
+  ["D87E",0x5837],
+  ["D8B0",0x5838],
+  ["D8AF",0x5839],
+  ["99A2",0x583A],
+  ["D8B3",0x583B],
+  ["DCEF",0x583D],
+  ["D8AC",0x583F],
+  ["9ABB",0x5840],
+  ["9A65",0x5844],
+  ["944E",0x5847],
+  ["D8A7",0x5848],
+  ["DCE7",0x5849],
+  ["B6F4",0x584A],
+  ["B6F7",0x584B],
+  ["B6F2",0x584C],
+  ["DCE6",0x584D],
+  ["DCEA",0x584E],
+  ["DCE5",0x584F],
+  ["B6EC",0x5851],
+  ["B6F6",0x5852],
+  ["DCE2",0x5853],
+  ["B6F0",0x5854],
+  ["DCE9",0x5855],
+  ["B6EE",0x5857],
+  ["B6ED",0x5858],
+  ["DCEC",0x5859],
+  ["B6EF",0x585A],
+  ["DCEE",0x585B],
+  ["FB6E",0x585C],
+  ["DCEB",0x585D],
+  ["B6EB",0x585E],
+  ["99DF",0x585F],
+  ["B6F5",0x5862],
+  ["DCF0",0x5863],
+  ["DCE4",0x5864],
+  ["DCED",0x5865],
+  ["DCE3",0x5868],
+  ["98E3",0x5869],
+  ["B6F1",0x586B],
+  ["9254",0x586C],
+  ["B6F3",0x586D],
+  ["DCE8",0x586F],
+  ["DCF1",0x5871],
+  ["967B",0x5872],
+  ["8AAF",0x5873],
+  ["E15D",0x5874],
+  ["B9D0",0x5875],
+  ["E163",0x5876],
+  ["B9D5",0x5879],
+  ["E15F",0x587A],
+  ["E166",0x587B],
+  ["E157",0x587C],
+  ["B9D7",0x587D],
+  ["B9D1",0x587E],
+  ["E15C",0x587F],
+  ["BC55",0x5880],
+  ["E15B",0x5881],
+  ["E164",0x5882],
+  ["B9D2",0x5883],
+  ["B9D6",0x5885],
+  ["E15A",0x5886],
+  ["E160",0x5887],
+  ["E165",0x5888],
+  ["E156",0x5889],
+  ["B9D4",0x588A],
+  ["E15E",0x588B],
+  ["E162",0x588E],
+  ["E168",0x588F],
+  ["E158",0x5890],
+  ["E161",0x5891],
+  ["8C77",0x5892],
+  ["B9D3",0x5893],
+  ["E167",0x5894],
+  ["E159",0x5898],
+  ["8BAF",0x5899],
+  ["9EBD",0x589A],
+  ["BC59",0x589C],
+  ["E54B",0x589D],
+  ["BC57",0x589E],
+  ["BC56",0x589F],
+  ["E54D",0x58A0],
+  ["E552",0x58A1],
+  ["E54E",0x58A3],
+  ["E551",0x58A5],
+  ["BC5C",0x58A6],
+  ["9EE6",0x58A7],
+  ["BEA5",0x58A8],
+  ["BC5B",0x58A9],
+  ["FB6F",0x58AA],
+  ["E54A",0x58AB],
+  ["E550",0x58AC],
+  ["BC5A",0x58AE],
+  ["E54F",0x58AF],
+  ["8EE1",0x58B0],
+  ["E54C",0x58B1],
+  ["BC58",0x58B3],
+  ["9B7D",0x58B5],
+  ["9C7E",0x58B6],
+  ["E94D",0x58BA],
+  ["F9D9",0x58BB],
+  ["E94F",0x58BC],
+  ["E94A",0x58BD],
+  ["BEC1",0x58BE],
+  ["E94C",0x58BF],
+  ["BEC0",0x58C1],
+  ["E94E",0x58C2],
+  ["BEC3",0x58C5],
+  ["E950",0x58C6],
+  ["BEC2",0x58C7],
+  ["E949",0x58C8],
+  ["E94B",0x58C9],
+  ["92EA",0x58CB],
+  ["C0A5",0x58CE],
+  ["ECCC",0x58CF],
+  ["8C78",0x58D0],
+  ["C0A4",0x58D1],
+  ["ECCD",0x58D2],
+  ["C0A3",0x58D3],
+  ["ECCB",0x58D4],
+  ["C0A2",0x58D5],
+  ["ECCA",0x58D6],
+  ["C253",0x58D8],
+  ["C252",0x58D9],
+  ["F1F6",0x58DA],
+  ["F1F8",0x58DB],
+  ["FB72",0x58DC],
+  ["F1F7",0x58DD],
+  ["C361",0x58DE],
+  ["C362",0x58DF],
+  ["FB71",0x58E0],
+  ["C363",0x58E2],
+  ["F442",0x58E3],
+  ["C45B",0x58E4],
+  ["F7D3",0x58E7],
+  ["F7D2",0x58E8],
+  ["C5F2",0x58E9],
+  ["A468",0x58EB],
+  ["A4D0",0x58EC],
+  ["A7A7",0x58EF],
+  ["895C",0x58F0],
+  ["98F0",0x58F2],
+  ["96F2",0x58F3],
+  ["CE5F",0x58F4],
+  ["B3FC",0x58F9],
+  ["B3FD",0x58FA],
+  ["FB74",0x58FB],
+  ["DCF2",0x58FC],
+  ["B9D8",0x58FD],
+  ["E169",0x58FE],
+  ["E553",0x58FF],
+  ["8BC1",0x5902],
+  ["C95A",0x5903],
+  ["895D",0x5904],
+  ["89DE",0x5905],
+  ["CAB0",0x5906],
+  ["895E",0x5907],
+  ["C6CA",0x590A],
+  ["CC42",0x590C],
+  ["CE60",0x590D],
+  ["D159",0x590E],
+  ["AE4C",0x590F],
+  ["FE42",0x5911],
+  ["F1F9",0x5912],
+  ["C4DC",0x5914],
+  ["A469",0x5915],
+  ["A57E",0x5916],
+  ["C970",0x5917],
+  ["A667",0x5919],
+  ["A668",0x591A],
+  ["A95D",0x591C],
+  ["8768",0x591D],
+  ["FB7B",0x591F],
+  ["B0F7",0x5920],
+  ["B9DA",0x5922],
+  ["B9DB",0x5924],
+  ["B9D9",0x5925],
+  ["A46A",0x5927],
+  ["A4D1",0x5929],
+  ["A4D3",0x592A],
+  ["A4D2",0x592B],
+  ["C95B",0x592C],
+  ["A4D4",0x592D],
+  ["A5A1",0x592E],
+  ["C971",0x592F],
+  ["A5A2",0x5931],
+  ["895F",0x5932],
+  ["8960",0x5934],
+  ["A669",0x5937],
+  ["A66A",0x5938],
+  ["C9CB",0x593C],
+  ["A7A8",0x593E],
+  ["CAB1",0x5940],
+  ["A961",0x5944],
+  ["CC43",0x5945],
+  ["A95F",0x5947],
+  ["A960",0x5948],
+  ["A95E",0x5949],
+  ["D15A",0x594A],
+  ["ABB6",0x594E],
+  ["ABB5",0x594F],
+  ["ABB7",0x5950],
+  ["ABB4",0x5951],
+  ["CE61",0x5953],
+  ["A962",0x5954],
+  ["ABB3",0x5955],
+  ["AE4D",0x5957],
+  ["AE4E",0x5958],
+  ["AE4F",0x595A],
+  ["D4CD",0x595C],
+  ["B3FE",0x5960],
+  ["D8B4",0x5961],
+  ["B0F8",0x5962],
+  ["9BCD",0x5965],
+  ["B6F8",0x5967],
+  ["B9DD",0x5969],
+  ["B9DC",0x596A],
+  ["E16A",0x596B],
+  ["BC5D",0x596D],
+  ["BEC4",0x596E],
+  ["EFC0",0x5970],
+  ["F6DA",0x5971],
+  ["F7D4",0x5972],
+  ["A46B",0x5973],
+  ["A5A3",0x5974],
+  ["9DD3",0x5975],
+  ["A5A4",0x5976],
+  ["C9D1",0x5977],
+  ["A66C",0x5978],
+  ["A66F",0x5979],
+  ["C9CF",0x597B],
+  ["C9CD",0x597C],
+  ["A66E",0x597D],
+  ["C9D0",0x597E],
+  ["C9D2",0x597F],
+  ["C9CC",0x5980],
+  ["A671",0x5981],
+  ["A670",0x5982],
+  ["A66D",0x5983],
+  ["A66B",0x5984],
+  ["C9CE",0x5985],
+  ["984C",0x5989],
+  ["A7B3",0x598A],
+  ["A7B0",0x598D],
+  ["CAB6",0x598E],
+  ["CAB9",0x598F],
+  ["CAB8",0x5990],
+  ["A7AA",0x5992],
+  ["A7B2",0x5993],
+  ["9752",0x5994],
+  ["A7AF",0x5996],
+  ["CAB5",0x5997],
+  ["CAB3",0x5998],
+  ["A7AE",0x5999],
+  ["95C3",0x599A],
+  ["A7A9",0x599D],
+  ["A7AC",0x599E],
+  ["9BB6",0x599F],
+  ["CAB4",0x59A0],
+  ["CABB",0x59A1],
+  ["CAB7",0x59A2],
+  ["A7AD",0x59A3],
+  ["A7B1",0x59A4],
+  ["A7B4",0x59A5],
+  ["CAB2",0x59A6],
+  ["CABA",0x59A7],
+  ["A7AB",0x59A8],
+  ["9AB9",0x59AC],
+  ["A967",0x59AE],
+  ["A96F",0x59AF],
+  ["97B3",0x59B0],
+  ["CC4F",0x59B1],
+  ["CC48",0x59B2],
+  ["A970",0x59B3],
+  ["CC53",0x59B4],
+  ["CC44",0x59B5],
+  ["CC4B",0x59B6],
+  ["9F74",0x59B7],
+  ["92F1",0x59B8],
+  ["A966",0x59B9],
+  ["CC45",0x59BA],
+  ["A964",0x59BB],
+  ["CC4C",0x59BC],
+  ["CC50",0x59BD],
+  ["A963",0x59BE],
+  ["8CFA",0x59BF],
+  ["CC51",0x59C0],
+  ["CC4A",0x59C1],
+  ["CC4D",0x59C3],
+  ["97DF",0x59C4],
+  ["A972",0x59C5],
+  ["A969",0x59C6],
+  ["CC54",0x59C7],
+  ["CC52",0x59C8],
+  ["FBA6",0x59C9],
+  ["A96E",0x59CA],
+  ["A96C",0x59CB],
+  ["CC49",0x59CC],
+  ["A96B",0x59CD],
+  ["CC47",0x59CE],
+  ["CC46",0x59CF],
+  ["A96A",0x59D0],
+  ["A968",0x59D1],
+  ["A971",0x59D2],
+  ["A96D",0x59D3],
+  ["A965",0x59D4],
+  ["CC4E",0x59D6],
+  ["ABB9",0x59D8],
+  ["FBAB",0x59D9],
+  ["ABC0",0x59DA],
+  ["CE6F",0x59DB],
+  ["ABB8",0x59DC],
+  ["CE67",0x59DD],
+  ["CE63",0x59DE],
+  ["CE73",0x59E0],
+  ["CE62",0x59E1],
+  ["ABBB",0x59E3],
+  ["CE6C",0x59E4],
+  ["ABBE",0x59E5],
+  ["ABC1",0x59E6],
+  ["ABBC",0x59E8],
+  ["CE70",0x59E9],
+  ["ABBF",0x59EA],
+  ["9877",0x59EB],
+  ["AE56",0x59EC],
+  ["CE76",0x59ED],
+  ["CE64",0x59EE],
+  ["9854",0x59EF],
+  ["95C5",0x59F0],
+  ["CE66",0x59F1],
+  ["CE6D",0x59F2],
+  ["CE71",0x59F3],
+  ["CE75",0x59F4],
+  ["CE72",0x59F5],
+  ["CE6B",0x59F6],
+  ["CE6E",0x59F7],
+  ["9D55",0x59F8],
+  ["FBB2",0x59F9],
+  ["CE68",0x59FA],
+  ["ABC3",0x59FB],
+  ["CE6A",0x59FC],
+  ["CE69",0x59FD],
+  ["CE74",0x59FE],
+  ["ABBA",0x59FF],
+  ["CE65",0x5A00],
+  ["ABC2",0x5A01],
+  ["957E",0x5A02],
+  ["ABBD",0x5A03],
+  ["AE5C",0x5A09],
+  ["D162",0x5A0A],
+  ["9742",0x5A0B],
+  ["AE5B",0x5A0C],
+  ["94E6",0x5A0D],
+  ["D160",0x5A0F],
+  ["AE50",0x5A11],
+  ["92F5",0x5A12],
+  ["AE55",0x5A13],
+  ["D15F",0x5A15],
+  ["D15C",0x5A16],
+  ["D161",0x5A17],
+  ["AE51",0x5A18],
+  ["D15B",0x5A19],
+  ["8CC5",0x5A1A],
+  ["AE54",0x5A1B],
+  ["AE52",0x5A1C],
+  ["D163",0x5A1E],
+  ["AE53",0x5A1F],
+  ["AE57",0x5A20],
+  ["92FD",0x5A21],
+  ["AE58",0x5A23],
+  ["FBA2",0x5A24],
+  ["AE5A",0x5A25],
+  ["9C51",0x5A27],
+  ["AE59",0x5A29],
+  ["94E9",0x5A2A],
+  ["985C",0x5A2B],
+  ["92F0",0x5A2C],
+  ["D15D",0x5A2D],
+  ["D15E",0x5A2E],
+  ["D164",0x5A33],
+  ["D4D4",0x5A35],
+  ["B0F9",0x5A36],
+  ["D8C2",0x5A37],
+  ["D4D3",0x5A38],
+  ["D4E6",0x5A39],
+  ["B140",0x5A3C],
+  ["944C",0x5A3D],
+  ["D4E4",0x5A3E],
+  ["B0FE",0x5A40],
+  ["B0FA",0x5A41],
+  ["D4ED",0x5A42],
+  ["D4DD",0x5A43],
+  ["D4E0",0x5A44],
+  ["916B",0x5A45],
+  ["B143",0x5A46],
+  ["D4EA",0x5A47],
+  ["D4E2",0x5A48],
+  ["B0FB",0x5A49],
+  ["B144",0x5A4A],
+  ["D4E7",0x5A4C],
+  ["D4E5",0x5A4D],
+  ["D4D6",0x5A50],
+  ["D4EB",0x5A51],
+  ["D4DF",0x5A52],
+  ["D4DA",0x5A53],
+  ["8B78",0x5A54],
+  ["D4D0",0x5A55],
+  ["D4EC",0x5A56],
+  ["D4DC",0x5A57],
+  ["D4CF",0x5A58],
+  ["94E2",0x5A59],
+  ["B142",0x5A5A],
+  ["D4E1",0x5A5B],
+  ["D4EE",0x5A5C],
+  ["D4DE",0x5A5D],
+  ["D4D2",0x5A5E],
+  ["D4D7",0x5A5F],
+  ["D4CE",0x5A60],
+  ["984F",0x5A61],
+  ["B141",0x5A62],
+  ["FBB5",0x5A63],
+  ["D4DB",0x5A64],
+  ["D4D8",0x5A65],
+  ["B0FC",0x5A66],
+  ["D4D1",0x5A67],
+  ["9271",0x5A68],
+  ["D4E9",0x5A69],
+  ["B0FD",0x5A6A],
+  ["9365",0x5A6B],
+  ["D4D9",0x5A6C],
+  ["D4D5",0x5A6D],
+  ["985B",0x5A6E],
+  ["D4E8",0x5A70],
+  ["9850",0x5A71],
+  ["B440",0x5A77],
+  ["D8BB",0x5A78],
+  ["97BC",0x5A79],
+  ["D8B8",0x5A7A],
+  ["D8C9",0x5A7B],
+  ["D8BD",0x5A7C],
+  ["D8CA",0x5A7D],
+  ["92F3",0x5A7E],
+  ["B442",0x5A7F],
+  ["9340",0x5A81],
+  ["984D",0x5A82],
+  ["D8C6",0x5A83],
+  ["D8C3",0x5A84],
+  ["9572",0x5A86],
+  ["FDEF",0x5A88],
+  ["D8C4",0x5A8A],
+  ["D8C7",0x5A8B],
+  ["D8CB",0x5A8C],
+  ["D4E3",0x5A8E],
+  ["D8CD",0x5A8F],
+  ["DD47",0x5A90],
+  ["FDC1",0x5A91],
+  ["B443",0x5A92],
+  ["D8CE",0x5A93],
+  ["D8B6",0x5A94],
+  ["D8C0",0x5A95],
+  ["FBBA",0x5A96],
+  ["D8C5",0x5A97],
+  ["92EB",0x5A99],
+  ["B441",0x5A9A],
+  ["B444",0x5A9B],
+  ["D8CC",0x5A9C],
+  ["D8CF",0x5A9D],
+  ["D8BA",0x5A9E],
+  ["D8B7",0x5A9F],
+  ["FC73",0x5AA0],
+  ["97B7",0x5AA1],
+  ["D8B9",0x5AA2],
+  ["876F",0x5AA4],
+  ["D8BE",0x5AA5],
+  ["D8BC",0x5AA6],
+  ["B445",0x5AA7],
+  ["D8C8",0x5AA9],
+  ["FBB4",0x5AAB],
+  ["D8BF",0x5AAC],
+  ["D8C1",0x5AAE],
+  ["D8B5",0x5AAF],
+  ["DCFA",0x5AB0],
+  ["DCF8",0x5AB1],
+  ["B742",0x5AB2],
+  ["B740",0x5AB3],
+  ["DD43",0x5AB4],
+  ["DCF9",0x5AB5],
+  ["DD44",0x5AB6],
+  ["DD40",0x5AB7],
+  ["DCF7",0x5AB8],
+  ["DD46",0x5AB9],
+  ["DCF6",0x5ABA],
+  ["DCFD",0x5ABB],
+  ["B6FE",0x5ABC],
+  ["B6FD",0x5ABD],
+  ["B6FC",0x5ABE],
+  ["DCFB",0x5ABF],
+  ["DD41",0x5AC0],
+  ["B6F9",0x5AC1],
+  ["B741",0x5AC2],
+  ["90A7",0x5AC3],
+  ["DCF4",0x5AC4],
+  ["DCFE",0x5AC6],
+  ["DCF3",0x5AC7],
+  ["DCFC",0x5AC8],
+  ["B6FA",0x5AC9],
+  ["DD42",0x5ACA],
+  ["DCF5",0x5ACB],
+  ["B6FB",0x5ACC],
+  ["DD45",0x5ACD],
+  ["9741",0x5ACE],
+  ["92F4",0x5ACF],
+  ["8772",0x5AD1],
+  ["FBBC",0x5AD3],
+  ["E16E",0x5AD5],
+  ["B9E2",0x5AD6],
+  ["B9E1",0x5AD7],
+  ["B9E3",0x5AD8],
+  ["E17A",0x5AD9],
+  ["E170",0x5ADA],
+  ["E176",0x5ADB],
+  ["E16B",0x5ADC],
+  ["E179",0x5ADD],
+  ["E178",0x5ADE],
+  ["E17C",0x5ADF],
+  ["E175",0x5AE0],
+  ["B9DE",0x5AE1],
+  ["E174",0x5AE2],
+  ["B9E4",0x5AE3],
+  ["9577",0x5AE4],
+  ["E16D",0x5AE5],
+  ["B9DF",0x5AE6],
+  ["E17B",0x5AE8],
+  ["B9E0",0x5AE9],
+  ["E16F",0x5AEA],
+  ["E172",0x5AEB],
+  ["E177",0x5AEC],
+  ["E171",0x5AED],
+  ["E16C",0x5AEE],
+  ["9EE2",0x5AF0],
+  ["8F78",0x5AF2],
+  ["E173",0x5AF3],
+  ["E555",0x5AF4],
+  ["BC61",0x5AF5],
+  ["E558",0x5AF6],
+  ["E557",0x5AF7],
+  ["E55A",0x5AF8],
+  ["E55C",0x5AF9],
+  ["F9DC",0x5AFA],
+  ["BC5F",0x5AFB],
+  ["E556",0x5AFD],
+  ["9672",0x5AFE],
+  ["E554",0x5AFF],
+  ["E55D",0x5B01],
+  ["E55B",0x5B02],
+  ["E559",0x5B03],
+  ["E55F",0x5B05],
+  ["E55E",0x5B07],
+  ["BC63",0x5B08],
+  ["BC5E",0x5B09],
+  ["BC60",0x5B0B],
+  ["BC62",0x5B0C],
+  ["9EB5",0x5B0D],
+  ["E560",0x5B0F],
+  ["E957",0x5B10],
+  ["964B",0x5B11],
+  ["E956",0x5B13],
+  ["E955",0x5B14],
+  ["8CAC",0x5B15],
+  ["E958",0x5B16],
+  ["E951",0x5B17],
+  ["E952",0x5B19],
+  ["E95A",0x5B1A],
+  ["E953",0x5B1B],
+  ["BEC5",0x5B1D],
+  ["E95C",0x5B1E],
+  ["A0FA",0x5B1F],
+  ["E95B",0x5B20],
+  ["E954",0x5B21],
+  ["ECD1",0x5B23],
+  ["C0A8",0x5B24],
+  ["ECCF",0x5B25],
+  ["ECD4",0x5B26],
+  ["ECD3",0x5B27],
+  ["E959",0x5B28],
+  ["C0A7",0x5B2A],
+  ["9575",0x5B2B],
+  ["ECD2",0x5B2C],
+  ["ECCE",0x5B2D],
+  ["ECD6",0x5B2E],
+  ["ECD5",0x5B2F],
+  ["C0A6",0x5B30],
+  ["ECD0",0x5B32],
+  ["BEC6",0x5B34],
+  ["C254",0x5B38],
+  ["EFC1",0x5B3C],
+  ["F1FA",0x5B3D],
+  ["F1FB",0x5B3E],
+  ["F1FC",0x5B3F],
+  ["C45C",0x5B40],
+  ["90DA",0x5B41],
+  ["C45D",0x5B43],
+  ["9367",0x5B44],
+  ["F443",0x5B45],
+  ["FEA4",0x5B46],
+  ["F5C8",0x5B47],
+  ["F5C7",0x5B48],
+  ["90DF",0x5B4A],
+  ["F6DB",0x5B4B],
+  ["F6DC",0x5B4C],
+  ["F7D5",0x5B4D],
+  ["F8A7",0x5B4E],
+  ["9354",0x5B4F],
+  ["A46C",0x5B50],
+  ["A46D",0x5B51],
+  ["A46E",0x5B53],
+  ["A4D5",0x5B54],
+  ["A5A5",0x5B55],
+  ["C9D3",0x5B56],
+  ["A672",0x5B57],
+  ["A673",0x5B58],
+  ["A7B7",0x5B5A],
+  ["A7B8",0x5B5B],
+  ["A7B6",0x5B5C],
+  ["A7B5",0x5B5D],
+  ["A973",0x5B5F],
+  ["CC55",0x5B62],
+  ["A975",0x5B63],
+  ["A974",0x5B64],
+  ["CC56",0x5B65],
+  ["8961",0x5B66],
+  ["8BB4",0x5B68],
+  ["ABC4",0x5B69],
+  ["AE5D",0x5B6B],
+  ["D165",0x5B6C],
+  ["9DC0",0x5B6D],
+  ["D4F0",0x5B6E],
+  ["B145",0x5B70],
+  ["B447",0x5B71],
+  ["D4EF",0x5B72],
+  ["B446",0x5B73],
+  ["8E48",0x5B74],
+  ["B9E5",0x5B75],
+  ["FBC5",0x5B76],
+  ["E17D",0x5B77],
+  ["BEC7",0x5B78],
+  ["C0A9",0x5B7A],
+  ["ECD7",0x5B7B],
+  ["FBC7",0x5B7C],
+  ["C45E",0x5B7D],
+  ["C570",0x5B7F],
+  ["C6CB",0x5B80],
+  ["C972",0x5B81],
+  ["FA79",0x5B82],
+  ["A5A6",0x5B83],
+  ["C973",0x5B84],
+  ["A676",0x5B85],
+  ["A674",0x5B87],
+  ["A675",0x5B88],
+  ["A677",0x5B89],
+  ["A7BA",0x5B8B],
+  ["A7B9",0x5B8C],
+  ["CABC",0x5B8E],
+  ["A7BB",0x5B8F],
+  ["9E67",0x5B90],
+  ["CABD",0x5B92],
+  ["CC57",0x5B93],
+  ["CC58",0x5B95],
+  ["8CD9",0x5B96],
+  ["A976",0x5B97],
+  ["A978",0x5B98],
+  ["A97A",0x5B99],
+  ["A977",0x5B9A],
+  ["A97B",0x5B9B],
+  ["A979",0x5B9C],
+  ["FBD2",0x5B9D],
+  ["8962",0x5B9E],
+  ["8963",0x5B9F],
+  ["ABC8",0x5BA2],
+  ["ABC5",0x5BA3],
+  ["ABC7",0x5BA4],
+  ["ABC9",0x5BA5],
+  ["ABC6",0x5BA6],
+  ["D166",0x5BA7],
+  ["CE77",0x5BA8],
+  ["FC7D",0x5BAA],
+  ["D168",0x5BAC],
+  ["D167",0x5BAD],
+  ["AE63",0x5BAE],
+  ["AE5F",0x5BB0],
+  ["AE60",0x5BB3],
+  ["AE62",0x5BB4],
+  ["AE64",0x5BB5],
+  ["AE61",0x5BB6],
+  ["8773",0x5BB7],
+  ["AE66",0x5BB8],
+  ["AE65",0x5BB9],
+  ["B14A",0x5BBF],
+  ["D4F2",0x5BC0],
+  ["D4F1",0x5BC1],
+  ["B149",0x5BC2],
+  ["9F6B",0x5BC3],
+  ["B148",0x5BC4],
+  ["B147",0x5BC5],
+  ["B14B",0x5BC6],
+  ["B146",0x5BC7],
+  ["D8D5",0x5BCA],
+  ["D8D2",0x5BCB],
+  ["B449",0x5BCC],
+  ["D8D1",0x5BCD],
+  ["D8D6",0x5BCE],
+  ["B44B",0x5BD0],
+  ["D8D4",0x5BD1],
+  ["B448",0x5BD2],
+  ["B44A",0x5BD3],
+  ["D8D3",0x5BD4],
+  ["FBCC",0x5BD5],
+  ["DD48",0x5BD6],
+  ["FEAE",0x5BD7],
+  ["DD49",0x5BD8],
+  ["DD4A",0x5BD9],
+  ["876D",0x5BDB],
+  ["B9E6",0x5BDE],
+  ["B9EE",0x5BDF],
+  ["E17E",0x5BE0],
+  ["B9E8",0x5BE1],
+  ["B9EC",0x5BE2],
+  ["E1A1",0x5BE3],
+  ["B9ED",0x5BE4],
+  ["B9E9",0x5BE5],
+  ["B9EA",0x5BE6],
+  ["B9E7",0x5BE7],
+  ["B9EB",0x5BE8],
+  ["BC66",0x5BE9],
+  ["D8D0",0x5BEA],
+  ["BC67",0x5BEB],
+  ["BC65",0x5BEC],
+  ["BC64",0x5BEE],
+  ["E95D",0x5BEF],
+  ["BEC8",0x5BF0],
+  ["ECD8",0x5BF1],
+  ["ECD9",0x5BF2],
+  ["FBD1",0x5BF3],
+  ["C364",0x5BF5],
+  ["C45F",0x5BF6],
+  ["A46F",0x5BF8],
+  ["A678",0x5BFA],
+  ["FB75",0x5BFF],
+  ["ABCA",0x5C01],
+  ["D169",0x5C03],
+  ["AE67",0x5C04],
+  ["FBD4",0x5C05],
+  ["B14E",0x5C07],
+  ["B14D",0x5C08],
+  ["B14C",0x5C09],
+  ["B44C",0x5C0A],
+  ["B44D",0x5C0B],
+  ["D8D7",0x5C0C],
+  ["B9EF",0x5C0D],
+  ["BEC9",0x5C0E],
+  ["A470",0x5C0F],
+  ["C95C",0x5C10],
+  ["A4D6",0x5C11],
+  ["C974",0x5C12],
+  ["FBD6",0x5C13],
+  ["FBD8",0x5C14],
+  ["C9D4",0x5C15],
+  ["A679",0x5C16],
+  ["A97C",0x5C1A],
+  ["8B5D",0x5C1C],
+  ["934C",0x5C1E],
+  ["DD4B",0x5C1F],
+  ["9AE2",0x5C20],
+  ["A471",0x5C22],
+  ["8BC9",0x5C23],
+  ["A4D7",0x5C24],
+  ["C9D5",0x5C25],
+  ["CABE",0x5C28],
+  ["CABF",0x5C2A],
+  ["A7BC",0x5C2C],
+  ["D8D8",0x5C30],
+  ["B44E",0x5C31],
+  ["DD4C",0x5C33],
+  ["C0AA",0x5C37],
+  ["A472",0x5C38],
+  ["A4A8",0x5C39],
+  ["A4D8",0x5C3A],
+  ["C975",0x5C3B],
+  ["A5A7",0x5C3C],
+  ["A7C0",0x5C3E],
+  ["A7BF",0x5C3F],
+  ["A7BD",0x5C40],
+  ["A7BE",0x5C41],
+  ["CC59",0x5C44],
+  ["A97E",0x5C45],
+  ["A9A1",0x5C46],
+  ["CC5A",0x5C47],
+  ["A97D",0x5C48],
+  ["FBDB",0x5C49],
+  ["9FC9",0x5C4A],
+  ["ABCE",0x5C4B],
+  ["CE78",0x5C4C],
+  ["ABCD",0x5C4D],
+  ["ABCB",0x5C4E],
+  ["ABCC",0x5C4F],
+  ["AE6A",0x5C50],
+  ["AE68",0x5C51],
+  ["9F44",0x5C53],
+  ["D16B",0x5C54],
+  ["AE69",0x5C55],
+  ["D16A",0x5C56],
+  ["AE5E",0x5C58],
+  ["D4F3",0x5C59],
+  ["B150",0x5C5C],
+  ["B151",0x5C5D],
+  ["98ED",0x5C5E],
+  ["B14F",0x5C60],
+  ["B9F0",0x5C62],
+  ["E1A2",0x5C63],
+  ["BC68",0x5C64],
+  ["BC69",0x5C65],
+  ["E561",0x5C67],
+  ["C0AB",0x5C68],
+  ["EFC2",0x5C69],
+  ["EFC3",0x5C6A],
+  ["C4DD",0x5C6C],
+  ["F8A8",0x5C6D],
+  ["C94B",0x5C6E],
+  ["A4D9",0x5C6F],
+  ["A473",0x5C71],
+  ["C977",0x5C73],
+  ["C976",0x5C74],
+  ["8CE9",0x5C78],
+  ["A67A",0x5C79],
+  ["C9D7",0x5C7A],
+  ["C9D8",0x5C7B],
+  ["C9D6",0x5C7C],
+  ["C9D9",0x5C7E],
+  ["FBDD",0x5C85],
+  ["CAC7",0x5C86],
+  ["CAC2",0x5C88],
+  ["CAC4",0x5C89],
+  ["CAC6",0x5C8A],
+  ["CAC3",0x5C8B],
+  ["A7C4",0x5C8C],
+  ["CAC0",0x5C8D],
+  ["CAC1",0x5C8F],
+  ["A7C1",0x5C90],
+  ["A7C2",0x5C91],
+  ["CAC5",0x5C92],
+  ["CAC8",0x5C93],
+  ["A7C3",0x5C94],
+  ["CAC9",0x5C95],
+  ["8DF2",0x5C99],
+  ["8964",0x5C9A],
+  ["FDF2",0x5C9C],
+  ["CC68",0x5C9D],
+  ["934D",0x5C9E],
+  ["CC62",0x5C9F],
+  ["CC5D",0x5CA0],
+  ["A9A3",0x5CA1],
+  ["CC65",0x5CA2],
+  ["CC63",0x5CA3],
+  ["CC5C",0x5CA4],
+  ["CC69",0x5CA5],
+  ["CC6C",0x5CA6],
+  ["CC67",0x5CA7],
+  ["CC60",0x5CA8],
+  ["A9A5",0x5CA9],
+  ["CC66",0x5CAA],
+  ["A9A6",0x5CAB],
+  ["CC61",0x5CAC],
+  ["CC64",0x5CAD],
+  ["CC5B",0x5CAE],
+  ["CC5F",0x5CAF],
+  ["CC6B",0x5CB0],
+  ["A9A7",0x5CB1],
+  ["A9A8",0x5CB3],
+  ["CC5E",0x5CB5],
+  ["CC6A",0x5CB6],
+  ["A9A2",0x5CB7],
+  ["A9A4",0x5CB8],
+  ["FBE7",0x5CBA],
+  ["A0F2",0x5CC1],
+  ["9868",0x5CC2],
+  ["CEAB",0x5CC6],
+  ["CEA4",0x5CC7],
+  ["CEAA",0x5CC8],
+  ["CEA3",0x5CC9],
+  ["CEA5",0x5CCA],
+  ["CE7D",0x5CCB],
+  ["CE7B",0x5CCC],
+  ["CEAC",0x5CCE],
+  ["CEA9",0x5CCF],
+  ["CE79",0x5CD0],
+  ["9F58",0x5CD1],
+  ["ABD0",0x5CD2],
+  ["CEA7",0x5CD3],
+  ["CEA8",0x5CD4],
+  ["8CE6",0x5CD5],
+  ["CEA6",0x5CD6],
+  ["CE7C",0x5CD7],
+  ["CE7A",0x5CD8],
+  ["ABCF",0x5CD9],
+  ["CEA2",0x5CDA],
+  ["CE7E",0x5CDB],
+  ["CEA1",0x5CDE],
+  ["CEAD",0x5CDF],
+  ["8D73",0x5CE5],
+  ["AE6F",0x5CE8],
+  ["FBDE",0x5CE9],
+  ["AE6E",0x5CEA],
+  ["D16C",0x5CEC],
+  ["AE6B",0x5CED],
+  ["D16E",0x5CEE],
+  ["FBDF",0x5CEF],
+  ["AE70",0x5CF0],
+  ["D16F",0x5CF1],
+  ["AE73",0x5CF4],
+  ["8C48",0x5CF5],
+  ["AE71",0x5CF6],
+  ["D170",0x5CF7],
+  ["CEAE",0x5CF8],
+  ["D172",0x5CF9],
+  ["AE6D",0x5CFB],
+  ["8774",0x5CFC],
+  ["AE6C",0x5CFD],
+  ["D16D",0x5CFF],
+  ["D171",0x5D00],
+  ["AE72",0x5D01],
+  ["B153",0x5D06],
+  ["B152",0x5D07],
+  ["D4F5",0x5D0B],
+  ["D4F9",0x5D0C],
+  ["D4FB",0x5D0D],
+  ["B154",0x5D0E],
+  ["D4FE",0x5D0F],
+  ["FBE3",0x5D10],
+  ["B158",0x5D11],
+  ["D541",0x5D12],
+  ["B15A",0x5D14],
+  ["8DA8",0x5D15],
+  ["B156",0x5D16],
+  ["B15E",0x5D17],
+  ["FBE4",0x5D18],
+  ["B15B",0x5D19],
+  ["D4F7",0x5D1A],
+  ["B155",0x5D1B],
+  ["D4F6",0x5D1D],
+  ["D4F4",0x5D1E],
+  ["D543",0x5D1F],
+  ["D4F8",0x5D20],
+  ["B157",0x5D22],
+  ["D542",0x5D23],
+  ["B15C",0x5D24],
+  ["D4FD",0x5D25],
+  ["D4FC",0x5D26],
+  ["B15D",0x5D27],
+  ["D4FA",0x5D28],
+  ["B159",0x5D29],
+  ["9C75",0x5D2C],
+  ["D544",0x5D2E],
+  ["9878",0x5D2F],
+  ["D540",0x5D30],
+  ["D8E7",0x5D31],
+  ["D8EE",0x5D32],
+  ["D8E3",0x5D33],
+  ["B451",0x5D34],
+  ["D8DF",0x5D35],
+  ["D8EF",0x5D36],
+  ["D8D9",0x5D37],
+  ["D8EC",0x5D38],
+  ["D8EA",0x5D39],
+  ["D8E4",0x5D3A],
+  ["D8ED",0x5D3C],
+  ["D8E6",0x5D3D],
+  ["8D60",0x5D3E],
+  ["D8DE",0x5D3F],
+  ["D8F0",0x5D40],
+  ["D8DC",0x5D41],
+  ["D8E9",0x5D42],
+  ["D8DA",0x5D43],
+  ["D8F1",0x5D45],
+  ["FBE5",0x5D46],
+  ["B452",0x5D47],
+  ["8D61",0x5D48],
+  ["D8EB",0x5D49],
+  ["DD4F",0x5D4A],
+  ["D8DD",0x5D4B],
+  ["B44F",0x5D4C],
+  ["D8E1",0x5D4E],
+  ["B450",0x5D50],
+  ["D8E0",0x5D51],
+  ["D8E5",0x5D52],
+  ["D8E2",0x5D55],
+  ["8D62",0x5D56],
+  ["A0A1",0x5D57],
+  ["D8E8",0x5D59],
+  ["9C40",0x5D5B],
+  ["DD53",0x5D5E],
+  ["DD56",0x5D62],
+  ["DD4E",0x5D63],
+  ["DD50",0x5D65],
+  ["DD55",0x5D67],
+  ["DD54",0x5D68],
+  ["B743",0x5D69],
+  ["D8DB",0x5D6B],
+  ["DD52",0x5D6C],
+  ["B744",0x5D6F],
+  ["98AD",0x5D70],
+  ["DD4D",0x5D71],
+  ["DD51",0x5D72],
+  ["9EEA",0x5D74],
+  ["E1A9",0x5D77],
+  ["8CEC",0x5D78],
+  ["E1B0",0x5D79],
+  ["E1A7",0x5D7A],
+  ["8CD4",0x5D7B],
+  ["E1AE",0x5D7C],
+  ["E1A5",0x5D7D],
+  ["E1AD",0x5D7E],
+  ["E1B1",0x5D7F],
+  ["E1A4",0x5D80],
+  ["E1A8",0x5D81],
+  ["E1A3",0x5D82],
+  ["B9F1",0x5D84],
+  ["9CEB",0x5D85],
+  ["E1A6",0x5D86],
+  ["B9F2",0x5D87],
+  ["E1AC",0x5D88],
+  ["E1AB",0x5D89],
+  ["E1AA",0x5D8A],
+  ["FBE0",0x5D8B],
+  ["E1AF",0x5D8D],
+  ["9F51",0x5D8E],
+  ["E565",0x5D92],
+  ["E567",0x5D93],
+  ["BC6B",0x5D94],
+  ["E568",0x5D95],
+  ["E563",0x5D97],
+  ["E562",0x5D99],
+  ["E56C",0x5D9A],
+  ["E56A",0x5D9C],
+  ["BC6A",0x5D9D],
+  ["E56D",0x5D9E],
+  ["E564",0x5D9F],
+  ["E569",0x5DA0],
+  ["E56B",0x5DA1],
+  ["E566",0x5DA2],
+  ["8D65",0x5DA4],
+  ["E961",0x5DA7],
+  ["E966",0x5DA8],
+  ["E960",0x5DA9],
+  ["E965",0x5DAA],
+  ["9CF1",0x5DAB],
+  ["E95E",0x5DAC],
+  ["E968",0x5DAD],
+  ["E964",0x5DAE],
+  ["E969",0x5DAF],
+  ["E963",0x5DB0],
+  ["E95F",0x5DB1],
+  ["E967",0x5DB2],
+  ["E96A",0x5DB4],
+  ["E962",0x5DB5],
+  ["FC58",0x5DB6],
+  ["ECDA",0x5DB7],
+  ["C0AF",0x5DB8],
+  ["8D66",0x5DB9],
+  ["C0AD",0x5DBA],
+  ["C0AC",0x5DBC],
+  ["C0AE",0x5DBD],
+  ["EFC4",0x5DC0],
+  ["9654",0x5DC1],
+  ["F172",0x5DC2],
+  ["F1FD",0x5DC3],
+  ["F444",0x5DC6],
+  ["F445",0x5DC7],
+  ["C460",0x5DC9],
+  ["F5C9",0x5DCB],
+  ["C4DE",0x5DCD],
+  ["F5CA",0x5DCF],
+  ["F6DE",0x5DD1],
+  ["C572",0x5DD2],
+  ["C571",0x5DD4],
+  ["F6DD",0x5DD5],
+  ["C5C9",0x5DD6],
+  ["FBE8",0x5DD7],
+  ["F7D6",0x5DD8],
+  ["C6CC",0x5DDB],
+  ["A474",0x5DDD],
+  ["A67B",0x5DDE],
+  ["C9DA",0x5DDF],
+  ["CACA",0x5DE0],
+  ["A8B5",0x5DE1],
+  ["B15F",0x5DE2],
+  ["A475",0x5DE5],
+  ["A5AA",0x5DE6],
+  ["A5A9",0x5DE7],
+  ["A5A8",0x5DE8],
+  ["A7C5",0x5DEB],
+  ["AE74",0x5DEE],
+  ["DD57",0x5DF0],
+  ["A476",0x5DF1],
+  ["A477",0x5DF2],
+  ["A478",0x5DF3],
+  ["A4DA",0x5DF4],
+  ["9FCE",0x5DF5],
+  ["ABD1",0x5DF7],
+  ["CEAF",0x5DF9],
+  ["B453",0x5DFD],
+  ["A479",0x5DFE],
+  ["C95D",0x5DFF],
+  ["A5AB",0x5E02],
+  ["A5AC",0x5E03],
+  ["C978",0x5E04],
+  ["A67C",0x5E06],
+  ["FBFC",0x5E09],
+  ["CACB",0x5E0A],
+  ["9AE4",0x5E0B],
+  ["A7C6",0x5E0C],
+  ["CACC",0x5E0E],
+  ["A9AE",0x5E11],
+  ["9F75",0x5E12],
+  ["CC6E",0x5E14],
+  ["A9AC",0x5E15],
+  ["A9AB",0x5E16],
+  ["CC6D",0x5E17],
+  ["A9A9",0x5E18],
+  ["CC6F",0x5E19],
+  ["A9AA",0x5E1A],
+  ["A9AD",0x5E1B],
+  ["ABD2",0x5E1D],
+  ["ABD4",0x5E1F],
+  ["CEB3",0x5E20],
+  ["CEB0",0x5E21],
+  ["CEB1",0x5E22],
+  ["CEB2",0x5E23],
+  ["CEB4",0x5E24],
+  ["ABD3",0x5E25],
+  ["D174",0x5E28],
+  ["D173",0x5E29],
+  ["AE76",0x5E2B],
+  ["AE75",0x5E2D],
+  ["FBF1",0x5E2E],
+  ["B162",0x5E33],
+  ["D546",0x5E34],
+  ["B161",0x5E36],
+  ["B163",0x5E37],
+  ["B160",0x5E38],
+  ["B455",0x5E3D],
+  ["D545",0x5E3E],
+  ["B456",0x5E40],
+  ["D8F3",0x5E41],
+  ["8D69",0x5E42],
+  ["B457",0x5E43],
+  ["D8F2",0x5E44],
+  ["B454",0x5E45],
+  ["934F",0x5E48],
+  ["DD5A",0x5E4A],
+  ["DD5C",0x5E4B],
+  ["B745",0x5E4C],
+  ["DD5B",0x5E4D],
+  ["DD59",0x5E4E],
+  ["DD58",0x5E4F],
+  ["E1B4",0x5E53],
+  ["B9F7",0x5E54],
+  ["B9F5",0x5E55],
+  ["B9F6",0x5E57],
+  ["E1B2",0x5E58],
+  ["E1B3",0x5E59],
+  ["B9F3",0x5E5B],
+  ["E571",0x5E5C],
+  ["E56F",0x5E5D],
+  ["934E",0x5E5E],
+  ["BC6D",0x5E5F],
+  ["E570",0x5E60],
+  ["BC6E",0x5E61],
+  ["BC6C",0x5E62],
+  ["B9F4",0x5E63],
+  ["E96D",0x5E66],
+  ["E96B",0x5E67],
+  ["E96C",0x5E68],
+  ["E56E",0x5E69],
+  ["ECDC",0x5E6A],
+  ["C0B0",0x5E6B],
+  ["ECDB",0x5E6C],
+  ["EFC5",0x5E6D],
+  ["EFC6",0x5E6E],
+  ["E96E",0x5E6F],
+  ["F1FE",0x5E70],
+  ["A47A",0x5E72],
+  ["A5AD",0x5E73],
+  ["A67E",0x5E74],
+  ["C9DB",0x5E75],
+  ["A67D",0x5E76],
+  ["A9AF",0x5E78],
+  ["B746",0x5E79],
+  ["FBF4",0x5E7A],
+  ["A4DB",0x5E7B],
+  ["A5AE",0x5E7C],
+  ["ABD5",0x5E7D],
+  ["B458",0x5E7E],
+  ["C6CE",0x5E7F],
+  ["C979",0x5E80],
+  ["C97A",0x5E82],
+  ["FBC3",0x5E83],
+  ["C9DC",0x5E84],
+  ["8965",0x5E86],
+  ["A7C8",0x5E87],
+  ["CAD0",0x5E88],
+  ["CACE",0x5E89],
+  ["A7C9",0x5E8A],
+  ["CACD",0x5E8B],
+  ["CACF",0x5E8C],
+  ["CAD1",0x5E8D],
+  ["A7C7",0x5E8F],
+  ["8C7A",0x5E92],
+  ["A9B3",0x5E95],
+  ["A9B4",0x5E96],
+  ["A9B1",0x5E97],
+  ["8C7B",0x5E99],
+  ["A9B0",0x5E9A],
+  ["CEB8",0x5E9B],
+  ["A9B2",0x5E9C],
+  ["ABD6",0x5EA0],
+  ["CEB7",0x5EA2],
+  ["CEB9",0x5EA3],
+  ["CEB6",0x5EA4],
+  ["CEBA",0x5EA5],
+  ["ABD7",0x5EA6],
+  ["AE79",0x5EA7],
+  ["D175",0x5EA8],
+  ["D177",0x5EAA],
+  ["AE77",0x5EAB],
+  ["D178",0x5EAC],
+  ["AE78",0x5EAD],
+  ["D176",0x5EAE],
+  ["CEB5",0x5EB0],
+  ["D547",0x5EB1],
+  ["D54A",0x5EB2],
+  ["D54B",0x5EB3],
+  ["D548",0x5EB4],
+  ["B167",0x5EB5],
+  ["B166",0x5EB6],
+  ["B164",0x5EB7],
+  ["B165",0x5EB8],
+  ["D549",0x5EB9],
+  ["8D6A",0x5EBD],
+  ["B168",0x5EBE],
+  ["B45A",0x5EC1],
+  ["B45B",0x5EC2],
+  ["B45C",0x5EC4],
+  ["DD5D",0x5EC5],
+  ["DD5F",0x5EC6],
+  ["DD61",0x5EC7],
+  ["B748",0x5EC8],
+  ["B747",0x5EC9],
+  ["B459",0x5ECA],
+  ["DD60",0x5ECB],
+  ["DD5E",0x5ECC],
+  ["9353",0x5ECD],
+  ["E1B8",0x5ECE],
+  ["9DFB",0x5ED0],
+  ["E1B6",0x5ED1],
+  ["E1BC",0x5ED2],
+  ["B9F8",0x5ED3],
+  ["E1BD",0x5ED4],
+  ["E1BA",0x5ED5],
+  ["B9F9",0x5ED6],
+  ["E1B7",0x5ED7],
+  ["E1B5",0x5ED8],
+  ["E1BB",0x5ED9],
+  ["BC70",0x5EDA],
+  ["E573",0x5EDB],
+  ["E1B9",0x5EDC],
+  ["BC72",0x5EDD],
+  ["E574",0x5EDE],
+  ["BC71",0x5EDF],
+  ["BC74",0x5EE0],
+  ["E575",0x5EE1],
+  ["BC6F",0x5EE2],
+  ["BC73",0x5EE3],
+  ["E973",0x5EE5],
+  ["E971",0x5EE6],
+  ["E970",0x5EE7],
+  ["E972",0x5EE8],
+  ["E96F",0x5EE9],
+  ["C366",0x5EEC],
+  ["F446",0x5EEE],
+  ["F447",0x5EEF],
+  ["F5CB",0x5EF1],
+  ["F6DF",0x5EF2],
+  ["C655",0x5EF3],
+  ["FBFD",0x5EF4],
+  ["A9B5",0x5EF6],
+  ["A7CA",0x5EF7],
+  ["9059",0x5EF8],
+  ["FC40",0x5EF9],
+  ["ABD8",0x5EFA],
+  ["FC41",0x5EFB],
+  ["FC43",0x5EFC],
+  ["A47B",0x5EFE],
+  ["A4DC",0x5EFF],
+  ["A5AF",0x5F01],
+  ["C9DD",0x5F02],
+  ["A7CB",0x5F04],
+  ["CAD2",0x5F05],
+  ["CEBB",0x5F07],
+  ["ABD9",0x5F08],
+  ["B9FA",0x5F0A],
+  ["A47C",0x5F0B],
+  ["9361",0x5F0C],
+  ["FC46",0x5F0D],
+  ["9362",0x5F0E],
+  ["A6A1",0x5F0F],
+  ["B749",0x5F12],
+  ["A47D",0x5F13],
+  ["A4DD",0x5F14],
+  ["A4DE",0x5F15],
+  ["A5B1",0x5F17],
+  ["A5B0",0x5F18],
+  ["C9DE",0x5F1A],
+  ["A6A2",0x5F1B],
+  ["CAD3",0x5F1D],
+  ["A7CC",0x5F1F],
+  ["CC71",0x5F22],
+  ["CC72",0x5F23],
+  ["CC73",0x5F24],
+  ["8D6B",0x5F25],
+  ["A9B6",0x5F26],
+  ["A9B7",0x5F27],
+  ["CC70",0x5F28],
+  ["A9B8",0x5F29],
+  ["ABDA",0x5F2D],
+  ["CEBC",0x5F2E],
+  ["D17A",0x5F30],
+  ["AE7A",0x5F31],
+  ["D179",0x5F33],
+  ["B169",0x5F35],
+  ["D54C",0x5F36],
+  ["B16A",0x5F37],
+  ["D54D",0x5F38],
+  ["FC4C",0x5F3A],
+  ["8CFE",0x5F3B],
+  ["B45D",0x5F3C],
+  ["DD62",0x5F40],
+  ["E1BF",0x5F43],
+  ["E1BE",0x5F44],
+  ["B9FB",0x5F46],
+  ["BC75",0x5F48],
+  ["E576",0x5F49],
+  ["BECA",0x5F4A],
+  ["E974",0x5F4B],
+  ["C0B1",0x5F4C],
+  ["95B8",0x5F4D],
+  ["C573",0x5F4E],
+  ["F7D8",0x5F4F],
+  ["C6D0",0x5F50],
+  ["8BCA",0x5F51],
+  ["CC74",0x5F54],
+  ["CEBD",0x5F56],
+  ["B16B",0x5F57],
+  ["D8F4",0x5F58],
+  ["B74A",0x5F59],
+  ["987A",0x5F5C],
+  ["C255",0x5F5D],
+  ["C6D1",0x5F61],
+  ["A7CE",0x5F62],
+  ["FC51",0x5F63],
+  ["A7CD",0x5F64],
+  ["ABDB",0x5F65],
+  ["D17B",0x5F67],
+  ["B16D",0x5F69],
+  ["B343",0x5F6A],
+  ["B16E",0x5F6B],
+  ["B16C",0x5F6C],
+  ["B45E",0x5F6D],
+  ["E1C0",0x5F6F],
+  ["B9FC",0x5F70],
+  ["BC76",0x5F71],
+  ["FC54",0x5F72],
+  ["C94C",0x5F73],
+  ["C9DF",0x5F74],
+  ["CAD5",0x5F76],
+  ["A7CF",0x5F77],
+  ["CAD4",0x5F78],
+  ["A7D0",0x5F79],
+  ["FAAF",0x5F7B],
+  ["A9BC",0x5F7C],
+  ["CC77",0x5F7D],
+  ["CC76",0x5F7E],
+  ["A9BB",0x5F7F],
+  ["A9B9",0x5F80],
+  ["A9BA",0x5F81],
+  ["CC75",0x5F82],
+  ["8D6C",0x5F83],
+  ["ABDD",0x5F85],
+  ["CEBE",0x5F86],
+  ["ABE0",0x5F87],
+  ["ABDC",0x5F88],
+  ["ABE2",0x5F89],
+  ["ABDE",0x5F8A],
+  ["ABDF",0x5F8B],
+  ["ABE1",0x5F8C],
+  ["AE7D",0x5F90],
+  ["AE7C",0x5F91],
+  ["AE7B",0x5F92],
+  ["D54F",0x5F96],
+  ["B16F",0x5F97],
+  ["B172",0x5F98],
+  ["B170",0x5F99],
+  ["D54E",0x5F9B],
+  ["B175",0x5F9C],
+  ["B171",0x5F9E],
+  ["D550",0x5F9F],
+  ["B174",0x5FA0],
+  ["B173",0x5FA1],
+  ["FA61",0x5FA4],
+  ["D8F6",0x5FA5],
+  ["D8F5",0x5FA6],
+  ["FC57",0x5FA7],
+  ["B461",0x5FA8],
+  ["B45F",0x5FA9],
+  ["B460",0x5FAA],
+  ["D8F7",0x5FAB],
+  ["B74B",0x5FAC],
+  ["DD64",0x5FAD],
+  ["B74C",0x5FAE],
+  ["DD63",0x5FAF],
+  ["9B70",0x5FB1],
+  ["E577",0x5FB2],
+  ["BC78",0x5FB5],
+  ["E1C1",0x5FB6],
+  ["BC77",0x5FB7],
+  ["B9FD",0x5FB9],
+  ["A051",0x5FBA],
+  ["ECDE",0x5FBB],
+  ["E975",0x5FBC],
+  ["C0B2",0x5FBD],
+  ["ECDD",0x5FBE],
+  ["F240",0x5FBF],
+  ["F448",0x5FC0],
+  ["F449",0x5FC1],
+  ["8C7C",0x5FC2],
+  ["A4DF",0x5FC3],
+  ["8BCB",0x5FC4],
+  ["A5B2",0x5FC5],
+  ["C97B",0x5FC9],
+  ["A7D2",0x5FCC],
+  ["A7D4",0x5FCD],
+  ["C9E2",0x5FCF],
+  ["CAD8",0x5FD0],
+  ["CAD7",0x5FD1],
+  ["CAD6",0x5FD2],
+  ["C9E1",0x5FD4],
+  ["C9E0",0x5FD5],
+  ["A6A4",0x5FD6],
+  ["A7D3",0x5FD7],
+  ["A7D1",0x5FD8],
+  ["A6A3",0x5FD9],
+  ["936E",0x5FDB],
+  ["A9BD",0x5FDD],
+  ["CC78",0x5FDE],
+  ["FCD5",0x5FDF],
+  ["A9BE",0x5FE0],
+  ["CADD",0x5FE1],
+  ["CADF",0x5FE3],
+  ["CADE",0x5FE4],
+  ["CC79",0x5FE5],
+  ["CADA",0x5FE8],
+  ["A7D8",0x5FEA],
+  ["A7D6",0x5FEB],
+  ["CAD9",0x5FED],
+  ["CADB",0x5FEE],
+  ["CAE1",0x5FEF],
+  ["A7D5",0x5FF1],
+  ["CADC",0x5FF3],
+  ["CAE5",0x5FF4],
+  ["A9C0",0x5FF5],
+  ["CAE2",0x5FF7],
+  ["A7D7",0x5FF8],
+  ["CAE0",0x5FFA],
+  ["CAE3",0x5FFB],
+  ["A9BF",0x5FFD],
+  ["A9C1",0x5FFF],
+  ["CAE4",0x6000],
+  ["CCAF",0x6009],
+  ["CCA2",0x600A],
+  ["CC7E",0x600B],
+  ["CCAE",0x600C],
+  ["CCA9",0x600D],
+  ["ABE7",0x600E],
+  ["A9C2",0x600F],
+  ["CCAA",0x6010],
+  ["CCAD",0x6011],
+  ["ABE3",0x6012],
+  ["CCAC",0x6013],
+  ["A9C3",0x6014],
+  ["A9C8",0x6015],
+  ["A9C6",0x6016],
+  ["CCA3",0x6017],
+  ["CC7C",0x6019],
+  ["CCA5",0x601A],
+  ["A9CD",0x601B],
+  ["CCB0",0x601C],
+  ["ABE4",0x601D],
+  ["CCA6",0x601E],
+  ["ABE5",0x6020],
+  ["A9C9",0x6021],
+  ["CCA8",0x6022],
+  ["FCA9",0x6023],
+  ["CECD",0x6024],
+  ["ABE6",0x6025],
+  ["CC7B",0x6026],
+  ["A9CA",0x6027],
+  ["ABE8",0x6028],
+  ["A9CB",0x6029],
+  ["A9C7",0x602A],
+  ["A9CC",0x602B],
+  ["CCA7",0x602C],
+  ["CC7A",0x602D],
+  ["CCAB",0x602E],
+  ["A9C4",0x602F],
+  ["FC61",0x6031],
+  ["CC7D",0x6032],
+  ["CCA4",0x6033],
+  ["CCA1",0x6034],
+  ["A9C5",0x6035],
+  ["CEBF",0x6037],
+  ["CEC0",0x6039],
+  ["8966",0x603B],
+  ["CECA",0x6040],
+  ["D1A1",0x6041],
+  ["CECB",0x6042],
+  ["ABEE",0x6043],
+  ["CECE",0x6044],
+  ["CEC4",0x6045],
+  ["ABED",0x6046],
+  ["CEC6",0x6047],
+  ["CEC7",0x6049],
+  ["FACB",0x604A],
+  ["CEC9",0x604C],
+  ["ABE9",0x604D],
+  ["AEA3",0x6050],
+  ["F9DA",0x6052],
+  ["CEC5",0x6053],
+  ["CEC1",0x6054],
+  ["AEA4",0x6055],
+  ["CECF",0x6058],
+  ["AE7E",0x6059],
+  ["D17D",0x605A],
+  ["CEC8",0x605B],
+  ["D17C",0x605D],
+  ["CEC3",0x605E],
+  ["CECC",0x605F],
+  ["ABEC",0x6062],
+  ["AEA1",0x6063],
+  ["ABF2",0x6064],
+  ["AEA2",0x6065],
+  ["CED0",0x6066],
+  ["D17E",0x6067],
+  ["ABEB",0x6068],
+  ["AEA6",0x6069],
+  ["ABF1",0x606A],
+  ["ABF0",0x606B],
+  ["ABEF",0x606C],
+  ["AEA5",0x606D],
+  ["CED1",0x606E],
+  ["AEA7",0x606F],
+  ["ABEA",0x6070],
+  ["CEC2",0x6072],
+  ["937A",0x6075],
+  ["A0E0",0x6077],
+  ["936B",0x607E],
+  ["B176",0x607F],
+  ["D1A4",0x6080],
+  ["D1A6",0x6081],
+  ["D1A8",0x6083],
+  ["AEA8",0x6084],
+  ["AEAE",0x6085],
+  ["D553",0x6086],
+  ["D1AC",0x6087],
+  ["D1A3",0x6088],
+  ["B178",0x6089],
+  ["D551",0x608A],
+  ["AEAD",0x608C],
+  ["AEAB",0x608D],
+  ["D1AE",0x608E],
+  ["D552",0x6090],
+  ["D1A5",0x6092],
+  ["AEAC",0x6094],
+  ["D1A9",0x6095],
+  ["AEAF",0x6096],
+  ["D1AB",0x6097],
+  ["AEAA",0x609A],
+  ["D1AA",0x609B],
+  ["D1AD",0x609C],
+  ["D1A7",0x609D],
+  ["FC6B",0x609E],
+  ["AEA9",0x609F],
+  ["B179",0x60A0],
+  ["D1A2",0x60A2],
+  ["B177",0x60A3],
+  ["A0DC",0x60A4],
+  ["9468",0x60A7],
+  ["B17A",0x60A8],
+  ["D555",0x60B0],
+  ["D55E",0x60B1],
+  ["B464",0x60B2],
+  ["FC6D",0x60B3],
+  ["B17C",0x60B4],
+  ["B1A3",0x60B5],
+  ["B465",0x60B6],
+  ["D560",0x60B7],
+  ["B1AA",0x60B8],
+  ["D8F9",0x60B9],
+  ["D556",0x60BA],
+  ["B1A2",0x60BB],
+  ["B1A5",0x60BC],
+  ["B17E",0x60BD],
+  ["D554",0x60BE],
+  ["D562",0x60BF],
+  ["D565",0x60C0],
+  ["D949",0x60C1],
+  ["D563",0x60C3],
+  ["D8FD",0x60C4],
+  ["B1A1",0x60C5],
+  ["B1A8",0x60C6],
+  ["B1AC",0x60C7],
+  ["D55D",0x60C8],
+  ["D8F8",0x60C9],
+  ["D561",0x60CA],
+  ["B17B",0x60CB],
+  ["D8FA",0x60CC],
+  ["D564",0x60CD],
+  ["D8FC",0x60CE],
+  ["D559",0x60CF],
+  ["B462",0x60D1],
+  ["D557",0x60D3],
+  ["D558",0x60D4],
+  ["B1A7",0x60D5],
+  ["8D71",0x60D7],
+  ["B1A6",0x60D8],
+  ["D55B",0x60D9],
+  ["B1AB",0x60DA],
+  ["D55F",0x60DB],
+  ["B1A4",0x60DC],
+  ["D55C",0x60DD],
+  ["FD64",0x60DE],
+  ["B1A9",0x60DF],
+  ["B466",0x60E0],
+  ["B463",0x60E1],
+  ["D8FB",0x60E2],
+  ["99BA",0x60E3],
+  ["D55A",0x60E4],
+  ["B17D",0x60E6],
+  ["9AD0",0x60E7],
+  ["9A61",0x60E8],
+  ["A0E5",0x60E9],
+  ["B46B",0x60F0],
+  ["B46F",0x60F1],
+  ["D940",0x60F2],
+  ["B751",0x60F3],
+  ["B46D",0x60F4],
+  ["D944",0x60F5],
+  ["B471",0x60F6],
+  ["DD65",0x60F7],
+  ["D946",0x60F8],
+  ["B753",0x60F9],
+  ["B469",0x60FA],
+  ["B46C",0x60FB],
+  ["D947",0x60FC],
+  ["A05B",0x60FD],
+  ["D948",0x60FE],
+  ["D94E",0x60FF],
+  ["B473",0x6100],
+  ["B754",0x6101],
+  ["D94A",0x6103],
+  ["D94F",0x6104],
+  ["D943",0x6105],
+  ["B75E",0x6106],
+  ["96AC",0x6107],
+  ["B755",0x6108],
+  ["B472",0x6109],
+  ["D941",0x610A],
+  ["D950",0x610B],
+  ["9740",0x610C],
+  ["B75D",0x610D],
+  ["B470",0x610E],
+  ["B74E",0x610F],
+  ["D94D",0x6110],
+  ["B474",0x6112],
+  ["D945",0x6113],
+  ["D8FE",0x6114],
+  ["B46A",0x6115],
+  ["D942",0x6116],
+  ["D94B",0x6118],
+  ["9EF1",0x6119],
+  ["B74D",0x611A],
+  ["B752",0x611B],
+  ["B467",0x611C],
+  ["D94C",0x611D],
+  ["B750",0x611F],
+  ["8C4D",0x6122],
+  ["B468",0x6123],
+  ["B75C",0x6127],
+  ["E1C3",0x6128],
+  ["DD70",0x6129],
+  ["DD68",0x612B],
+  ["E1C2",0x612C],
+  ["DD6C",0x612E],
+  ["DD6E",0x612F],
+  ["9F7E",0x6130],
+  ["DD6B",0x6132],
+  ["B75B",0x6134],
+  ["DD6A",0x6136],
+  ["B75F",0x6137],
+  ["E1D2",0x613B],
+  ["8D72",0x613D],
+  ["B75A",0x613E],
+  ["BA40",0x613F],
+  ["DD71",0x6140],
+  ["E1C4",0x6141],
+  ["FC76",0x6142],
+  ["B758",0x6144],
+  ["DD69",0x6145],
+  ["DD6D",0x6146],
+  ["B9FE",0x6147],
+  ["B74F",0x6148],
+  ["DD66",0x6149],
+  ["DD67",0x614A],
+  ["BA41",0x614B],
+  ["B757",0x614C],
+  ["B759",0x614D],
+  ["B756",0x614E],
+  ["DD6F",0x614F],
+  ["96A9",0x6150],
+  ["E1C8",0x6152],
+  ["E1C9",0x6153],
+  ["E1CE",0x6154],
+  ["BC7D",0x6155],
+  ["E1D5",0x6156],
+  ["BA47",0x6158],
+  ["A06E",0x6159],
+  ["BA46",0x615A],
+  ["E1D0",0x615B],
+  ["FCAA",0x615C],
+  ["BC7C",0x615D],
+  ["E1C5",0x615E],
+  ["BA45",0x615F],
+  ["FBCD",0x6160],
+  ["E1D4",0x6161],
+  ["BA43",0x6162],
+  ["BA44",0x6163],
+  ["FC74",0x6164],
+  ["E1D1",0x6165],
+  ["E5AA",0x6166],
+  ["BC7A",0x6167],
+  ["B46E",0x6168],
+  ["E1D3",0x616A],
+  ["BCA3",0x616B],
+  ["E1CB",0x616C],
+  ["BC7B",0x616E],
+  ["A074",0x616F],
+  ["BCA2",0x6170],
+  ["E1C6",0x6171],
+  ["E1CA",0x6172],
+  ["E1C7",0x6173],
+  ["E1CD",0x6174],
+  ["BA48",0x6175],
+  ["BC79",0x6176],
+  ["BA42",0x6177],
+  ["E57A",0x6179],
+  ["E1CF",0x617A],
+  ["BCA1",0x617C],
+  ["A071",0x617D],
+  ["BCA4",0x617E],
+  ["E1CC",0x6180],
+  ["FC79",0x6181],
+  ["BC7E",0x6182],
+  ["E579",0x6183],
+  ["FC7C",0x6187],
+  ["E57E",0x6189],
+  ["BECE",0x618A],
+  ["E578",0x618B],
+  ["E9A3",0x618C],
+  ["E5A9",0x618D],
+  ["BCA8",0x618E],
+  ["BCA6",0x6190],
+  ["BECC",0x6191],
+  ["E5A6",0x6192],
+  ["E5A2",0x6193],
+  ["BCAC",0x6194],
+  ["9C50",0x6195],
+  ["E978",0x6196],
+  ["9379",0x6198],
+  ["9378",0x6199],
+  ["BCAA",0x619A],
+  ["E5A1",0x619B],
+  ["A0DD",0x619C],
+  ["E976",0x619D],
+  ["E5A5",0x619F],
+  ["E5A8",0x61A1],
+  ["E57D",0x61A2],
+  ["BCAB",0x61A4],
+  ["BCA5",0x61A7],
+  ["E977",0x61A8],
+  ["BECD",0x61A9],
+  ["E5A7",0x61AA],
+  ["BCA7",0x61AB],
+  ["BCA9",0x61AC],
+  ["E5A4",0x61AD],
+  ["BCAD",0x61AE],
+  ["E5A3",0x61AF],
+  ["E57C",0x61B0],
+  ["E57B",0x61B1],
+  ["BECB",0x61B2],
+  ["E5AB",0x61B3],
+  ["E97A",0x61B4],
+  ["ECE0",0x61B5],
+  ["BED0",0x61B6],
+  ["8D75",0x61B7],
+  ["E9A2",0x61B8],
+  ["8D76",0x61B9],
+  ["E97E",0x61BA],
+  ["ECE1",0x61BC],
+  ["BED1",0x61BE],
+  ["E9A1",0x61BF],
+  ["9374",0x61C0],
+  ["E97C",0x61C1],
+  ["C0B4",0x61C2],
+  ["ECDF",0x61C3],
+  ["E979",0x61C5],
+  ["E97B",0x61C6],
+  ["C0B5",0x61C7],
+  ["BED3",0x61C8],
+  ["C0B3",0x61C9],
+  ["BED2",0x61CA],
+  ["C0B7",0x61CB],
+  ["E97D",0x61CC],
+  ["BECF",0x61CD],
+  ["8D77",0x61CF],
+  ["FCA5",0x61D0],
+  ["FCA2",0x61D3],
+  ["EFCF",0x61D6],
+  ["EFC7",0x61D8],
+  ["90C3",0x61DA],
+  ["ECE7",0x61DE],
+  ["EFC8",0x61DF],
+  ["ECE3",0x61E0],
+  ["A079",0x61E2],
+  ["C256",0x61E3],
+  ["ECE5",0x61E4],
+  ["ECE4",0x61E5],
+  ["C0B6",0x61E6],
+  ["ECE2",0x61E7],
+  ["ECE6",0x61E8],
+  ["EFD0",0x61E9],
+  ["EFCC",0x61EA],
+  ["EFCE",0x61EB],
+  ["EFC9",0x61ED],
+  ["EFCA",0x61EE],
+  ["EFCD",0x61F0],
+  ["EFCB",0x61F1],
+  ["C367",0x61F2],
+  ["C36A",0x61F5],
+  ["C369",0x61F6],
+  ["C368",0x61F7],
+  ["C461",0x61F8],
+  ["F44A",0x61F9],
+  ["C462",0x61FA],
+  ["F241",0x61FB],
+  ["C4DF",0x61FC],
+  ["F5CC",0x61FD],
+  ["C4E0",0x61FE],
+  ["C574",0x61FF],
+  ["C5CA",0x6200],
+  ["F7D9",0x6201],
+  ["F7DA",0x6203],
+  ["F7DB",0x6204],
+  ["F9BA",0x6207],
+  ["A4E0",0x6208],
+  ["C97C",0x6209],
+  ["A5B3",0x620A],
+  ["A6A6",0x620C],
+  ["A6A7",0x620D],
+  ["A6A5",0x620E],
+  ["A6A8",0x6210],
+  ["A7DA",0x6211],
+  ["A7D9",0x6212],
+  ["CCB1",0x6214],
+  ["A9CF",0x6215],
+  ["A9CE",0x6216],
+  ["D1AF",0x6219],
+  ["B1AD",0x621A],
+  ["B1AE",0x621B],
+  ["B475",0x621F],
+  ["DD72",0x6220],
+  ["B760",0x6221],
+  ["B761",0x6222],
+  ["DD74",0x6223],
+  ["DD76",0x6224],
+  ["DD75",0x6225],
+  ["E1D7",0x6227],
+  ["E1D6",0x6229],
+  ["BA49",0x622A],
+  ["E1D8",0x622B],
+  ["8D79",0x622C],
+  ["E5AC",0x622D],
+  ["BCAE",0x622E],
+  ["BED4",0x6230],
+  ["C0B8",0x6232],
+  ["C257",0x6233],
+  ["C0B9",0x6234],
+  ["A4E1",0x6236],
+  ["8BFC",0x6237],
+  ["A076",0x6239],
+  ["CAE6",0x623A],
+  ["CCB2",0x623D],
+  ["A9D1",0x623E],
+  ["A9D0",0x623F],
+  ["A9D2",0x6240],
+  ["ABF3",0x6241],
+  ["CED2",0x6242],
+  ["CED3",0x6243],
+  ["D1B0",0x6246],
+  ["AEB0",0x6247],
+  ["B1AF",0x6248],
+  ["B476",0x6249],
+  ["D951",0x624A],
+  ["A4E2",0x624B],
+  ["8BCD",0x624C],
+  ["A47E",0x624D],
+  ["A4E3",0x624E],
+  ["C97D",0x6250],
+  ["A5B7",0x6251],
+  ["A5B6",0x6252],
+  ["A5B4",0x6253],
+  ["A5B5",0x6254],
+  ["A6AB",0x6258],
+  ["C9E9",0x6259],
+  ["C9EB",0x625A],
+  ["A6AA",0x625B],
+  ["C9E3",0x625C],
+  ["C9E4",0x625E],
+  ["C9EA",0x6260],
+  ["C9E6",0x6261],
+  ["C9E8",0x6262],
+  ["A6A9",0x6263],
+  ["C9E5",0x6264],
+  ["C9EC",0x6265],
+  ["C9E7",0x6266],
+  ["9F5A",0x6268],
+  ["A7E1",0x626D],
+  ["A7EA",0x626E],
+  ["A7E8",0x626F],
+  ["CAF0",0x6270],
+  ["CAED",0x6271],
+  ["CAF5",0x6272],
+  ["A7E6",0x6273],
+  ["CAF6",0x6274],
+  ["A7DF",0x6276],
+  ["CAF3",0x6277],
+  ["A7E5",0x6279],
+  ["CAEF",0x627A],
+  ["CAEE",0x627B],
+  ["A7E3",0x627C],
+  ["CAF4",0x627D],
+  ["A7E4",0x627E],
+  ["A9D3",0x627F],
+  ["A7DE",0x6280],
+  ["CAF1",0x6281],
+  ["9FF4",0x6282],
+  ["CAE7",0x6283],
+  ["A7DB",0x6284],
+  ["9FBA",0x6285],
+  ["A7EE",0x6286],
+  ["CAEC",0x6287],
+  ["CAF2",0x6288],
+  ["A7E0",0x6289],
+  ["A7E2",0x628A],
+  ["CAE8",0x628C],
+  ["CAE9",0x628E],
+  ["CAEA",0x628F],
+  ["8D7A",0x6290],
+  ["A7ED",0x6291],
+  ["A7E7",0x6292],
+  ["A7EC",0x6293],
+  ["CAEB",0x6294],
+  ["A7EB",0x6295],
+  ["A7DD",0x6296],
+  ["A7DC",0x6297],
+  ["A7E9",0x6298],
+  ["9E45",0x629D],
+  ["93B0",0x62A4],
+  ["A075",0x62A6],
+  ["A9E1",0x62A8],
+  ["CCBE",0x62A9],
+  ["CCB7",0x62AA],
+  ["A9DC",0x62AB],
+  ["A9EF",0x62AC],
+  ["CCB3",0x62AD],
+  ["CCBA",0x62AE],
+  ["CCBC",0x62AF],
+  ["CCBF",0x62B0],
+  ["A9EA",0x62B1],
+  ["CCBB",0x62B3],
+  ["CCB4",0x62B4],
+  ["A9E8",0x62B5],
+  ["CCB8",0x62B6],
+  ["CCC0",0x62B8],
+  ["A9D9",0x62B9],
+  ["CCBD",0x62BB],
+  ["A9E3",0x62BC],
+  ["A9E2",0x62BD],
+  ["CCB6",0x62BE],
+  ["A9D7",0x62BF],
+  ["A9D8",0x62C2],
+  ["9B46",0x62C3],
+  ["A9D6",0x62C4],
+  ["FCAE",0x62C5],
+  ["A9EE",0x62C6],
+  ["A9E6",0x62C7],
+  ["A9E0",0x62C8],
+  ["A9D4",0x62C9],
+  ["CCB9",0x62CA],
+  ["A9DF",0x62CB],
+  ["A9D5",0x62CC],
+  ["A9E7",0x62CD],
+  ["A9F0",0x62CE],
+  ["CED4",0x62CF],
+  ["A9E4",0x62D0],
+  ["CCB5",0x62D1],
+  ["A9DA",0x62D2],
+  ["A9DD",0x62D3],
+  ["A9DE",0x62D4],
+  ["FCB0",0x62D5],
+  ["A9EC",0x62D6],
+  ["A9ED",0x62D7],
+  ["A9EB",0x62D8],
+  ["A9E5",0x62D9],
+  ["A9E9",0x62DA],
+  ["A9DB",0x62DB],
+  ["ABF4",0x62DC],
+  ["FA51",0x62DF],
+  ["8D7B",0x62E5],
+  ["CEDA",0x62EB],
+  ["AC41",0x62EC],
+  ["ABF8",0x62ED],
+  ["ABFA",0x62EE],
+  ["AC40",0x62EF],
+  ["CEE6",0x62F0],
+  ["ABFD",0x62F1],
+  ["D1B1",0x62F2],
+  ["AEB1",0x62F3],
+  ["AC43",0x62F4],
+  ["CED7",0x62F5],
+  ["CEDF",0x62F6],
+  ["ABFE",0x62F7],
+  ["CEDE",0x62F8],
+  ["CEDB",0x62F9],
+  ["CEE3",0x62FA],
+  ["CEE5",0x62FB],
+  ["ABF7",0x62FC],
+  ["ABFB",0x62FD],
+  ["AC42",0x62FE],
+  ["AEB3",0x62FF],
+  ["CEE0",0x6300],
+  ["ABF9",0x6301],
+  ["AC45",0x6302],
+  ["CED9",0x6303],
+  ["ABFC",0x6307],
+  ["AEB2",0x6308],
+  ["ABF6",0x6309],
+  ["CED6",0x630B],
+  ["CEDD",0x630C],
+  ["CED5",0x630D],
+  ["CED8",0x630E],
+  ["CEDC",0x630F],
+  ["D1B2",0x6310],
+  ["AC44",0x6311],
+  ["CEE1",0x6313],
+  ["CEE2",0x6314],
+  ["CEE4",0x6315],
+  ["ABF5",0x6316],
+  ["8D7C",0x6318],
+  ["AEC1",0x6328],
+  ["D1BE",0x6329],
+  ["AEBF",0x632A],
+  ["AEC0",0x632B],
+  ["D1B4",0x632C],
+  ["D1C4",0x632D],
+  ["9ED6",0x632E],
+  ["AEB6",0x632F],
+  ["93AC",0x6331],
+  ["D566",0x6332],
+  ["D1C6",0x6333],
+  ["D1C0",0x6334],
+  ["9F5B",0x6335],
+  ["D1B7",0x6336],
+  ["93A9",0x6337],
+  ["D1C9",0x6338],
+  ["D1BA",0x6339],
+  ["AEBC",0x633A],
+  ["D57D",0x633B],
+  ["D1BD",0x633C],
+  ["AEBE",0x633D],
+  ["AEB5",0x633E],
+  ["D1CB",0x6340],
+  ["D1BF",0x6341],
+  ["AEB8",0x6342],
+  ["D1B8",0x6343],
+  ["D1B5",0x6344],
+  ["D1B6",0x6345],
+  ["AEB9",0x6346],
+  ["D1C5",0x6347],
+  ["D1CC",0x6348],
+  ["AEBB",0x6349],
+  ["D1BC",0x634A],
+  ["D1BB",0x634B],
+  ["AEC3",0x634C],
+  ["AEC2",0x634D],
+  ["AEB4",0x634E],
+  ["AEBA",0x634F],
+  ["AEBD",0x6350],
+  ["D1C8",0x6351],
+  ["D1C2",0x6354],
+  ["AEB7",0x6355],
+  ["D1B3",0x6356],
+  ["D1CA",0x6357],
+  ["D1C1",0x6358],
+  ["D1C3",0x6359],
+  ["D1C7",0x635A],
+  ["A07C",0x6364],
+  ["D567",0x6365],
+  ["B1B7",0x6367],
+  ["B1CB",0x6368],
+  ["B1CA",0x6369],
+  ["B1BF",0x636B],
+  ["FCB2",0x636C],
+  ["D579",0x636D],
+  ["D575",0x636E],
+  ["D572",0x636F],
+  ["D5A6",0x6370],
+  ["B1BA",0x6371],
+  ["B1B2",0x6372],
+  ["D577",0x6375],
+  ["B4A8",0x6376],
+  ["B1B6",0x6377],
+  ["D5A1",0x6378],
+  ["8AC1",0x6379],
+  ["B1CC",0x637A],
+  ["B1C9",0x637B],
+  ["D57B",0x637C],
+  ["D56A",0x637D],
+  ["9FB4",0x637F],
+  ["B1C8",0x6380],
+  ["D5A3",0x6381],
+  ["D569",0x6382],
+  ["B1BD",0x6383],
+  ["B1C1",0x6384],
+  ["D5A2",0x6385],
+  ["D573",0x6387],
+  ["B1C2",0x6388],
+  ["B1BC",0x6389],
+  ["D568",0x638A],
+  ["FCAC",0x638B],
+  ["B478",0x638C],
+  ["D5A5",0x638D],
+  ["D571",0x638E],
+  ["B1C7",0x638F],
+  ["D574",0x6390],
+  ["D5A4",0x6391],
+  ["B1C6",0x6392],
+  ["D952",0x6394],
+  ["B1B3",0x6396],
+  ["D56F",0x6397],
+  ["B1B8",0x6398],
+  ["B1C3",0x6399],
+  ["B1BE",0x639B],
+  ["D578",0x639C],
+  ["D56E",0x639D],
+  ["D56C",0x639E],
+  ["D57E",0x639F],
+  ["B1B0",0x63A0],
+  ["B1C4",0x63A1],
+  ["B1B4",0x63A2],
+  ["B477",0x63A3],
+  ["D57C",0x63A4],
+  ["B1B5",0x63A5],
+  ["B1B1",0x63A7],
+  ["B1C0",0x63A8],
+  ["B1BB",0x63A9],
+  ["B1B9",0x63AA],
+  ["D570",0x63AB],
+  ["B1C5",0x63AC],
+  ["D56D",0x63AD],
+  ["D57A",0x63AE],
+  ["D576",0x63AF],
+  ["D954",0x63B0],
+  ["D953",0x63B1],
+  ["9E4C",0x63B9],
+  ["D56B",0x63BD],
+  ["D964",0x63BE],
+  ["B47A",0x63C0],
+  ["8FC5",0x63C1],
+  ["D96A",0x63C2],
+  ["D959",0x63C3],
+  ["D967",0x63C4],
+  ["DD77",0x63C5],
+  ["B47D",0x63C6],
+  ["D96B",0x63C7],
+  ["D96E",0x63C8],
+  ["B47C",0x63C9],
+  ["D95C",0x63CA],
+  ["D96D",0x63CB],
+  ["D96C",0x63CC],
+  ["B47E",0x63CD],
+  ["D955",0x63CE],
+  ["B479",0x63CF],
+  ["B4A3",0x63D0],
+  ["93AD",0x63D1],
+  ["B4A1",0x63D2],
+  ["D969",0x63D3],
+  ["D95F",0x63D5],
+  ["B4A5",0x63D6],
+  ["D970",0x63D7],
+  ["D968",0x63D8],
+  ["D971",0x63D9],
+  ["B4AD",0x63DA],
+  ["B4AB",0x63DB],
+  ["D966",0x63DC],
+  ["D965",0x63DD],
+  ["9DC3",0x63DE],
+  ["D963",0x63DF],
+  ["D95D",0x63E0],
+  ["B4A4",0x63E1],
+  ["8DA2",0x63E2],
+  ["B4A2",0x63E3],
+  ["D1B9",0x63E4],
+  ["D956",0x63E5],
+  ["9D4A",0x63E6],
+  ["DDB7",0x63E7],
+  ["D957",0x63E8],
+  ["B47B",0x63E9],
+  ["B4AA",0x63EA],
+  ["DD79",0x63EB],
+  ["B4A6",0x63ED],
+  ["B4A7",0x63EE],
+  ["D958",0x63EF],
+  ["D96F",0x63F0],
+  ["DD78",0x63F1],
+  ["D960",0x63F2],
+  ["D95B",0x63F3],
+  ["B4A9",0x63F4],
+  ["D961",0x63F5],
+  ["D95E",0x63F6],
+  ["FCB6",0x63F8],
+  ["B4AE",0x63F9],
+  ["8DA3",0x63FB],
+  ["9E4B",0x63FC],
+  ["9E4D",0x63FE],
+  ["B770",0x6406],
+  ["8DA4",0x6407],
+  ["DD7C",0x6409],
+  ["DDB1",0x640A],
+  ["DDB6",0x640B],
+  ["DDAA",0x640C],
+  ["B76C",0x640D],
+  ["DDBB",0x640E],
+  ["B769",0x640F],
+  ["DD7A",0x6410],
+  ["DD7B",0x6412],
+  ["B762",0x6413],
+  ["B76B",0x6414],
+  ["DDA4",0x6415],
+  ["B76E",0x6416],
+  ["B76F",0x6417],
+  ["DDA5",0x6418],
+  ["DDB2",0x641A],
+  ["DDB8",0x641B],
+  ["B76A",0x641C],
+  ["B764",0x641E],
+  ["DDA3",0x641F],
+  ["DD7D",0x6420],
+  ["DDBA",0x6421],
+  ["DDA8",0x6422],
+  ["DDA9",0x6423],
+  ["DD7E",0x6424],
+  ["DDB4",0x6425],
+  ["DDAB",0x6426],
+  ["DDB5",0x6427],
+  ["DDAD",0x6428],
+  ["B765",0x642A],
+  ["E1D9",0x642B],
+  ["B768",0x642C],
+  ["B766",0x642D],
+  ["DDB9",0x642E],
+  ["DDB0",0x642F],
+  ["DDAC",0x6430],
+  ["8AFD",0x6432],
+  ["DDA1",0x6433],
+  ["BA53",0x6434],
+  ["DDAF",0x6435],
+  ["B76D",0x6436],
+  ["DDA7",0x6437],
+  ["FCB5",0x6438],
+  ["DDA6",0x6439],
+  ["FCC3",0x643A],
+  ["93B2",0x643B],
+  ["B767",0x643D],
+  ["B763",0x643E],
+  ["E1EE",0x643F],
+  ["DDB3",0x6440],
+  ["DDAE",0x6441],
+  ["DDA2",0x6443],
+  ["E1E9",0x644B],
+  ["E1DA",0x644D],
+  ["E1E5",0x644E],
+  ["E1EC",0x6450],
+  ["BA51",0x6451],
+  ["B4AC",0x6452],
+  ["E1EA",0x6453],
+  ["BA4C",0x6454],
+  ["BA4B",0x6458],
+  ["E1F1",0x6459],
+  ["8DA5",0x645A],
+  ["E1DB",0x645B],
+  ["E1E8",0x645C],
+  ["E1DC",0x645D],
+  ["E1E7",0x645E],
+  ["BA4F",0x645F],
+  ["E1EB",0x6460],
+  ["D962",0x6461],
+  ["E1F2",0x6465],
+  ["E1E3",0x6466],
+  ["BA52",0x6467],
+  ["E5BA",0x6468],
+  ["BCAF",0x6469],
+  ["E1F0",0x646B],
+  ["E1EF",0x646C],
+  ["BA54",0x646D],
+  ["E5AD",0x646E],
+  ["BCB0",0x646F],
+  ["E5AE",0x6470],
+  ["93A1",0x6471],
+  ["E1DF",0x6472],
+  ["E1E0",0x6473],
+  ["E1DD",0x6474],
+  ["E1E2",0x6475],
+  ["E1DE",0x6476],
+  ["E1F3",0x6477],
+  ["BA4E",0x6478],
+  ["BCB1",0x6479],
+  ["BA50",0x647A],
+  ["BA55",0x647B],
+  ["8AC6",0x647C],
+  ["E1E1",0x647D],
+  ["E1ED",0x647F],
+  ["E1E6",0x6482],
+  ["E5B1",0x6485],
+  ["BA4A",0x6487],
+  ["BCB4",0x6488],
+  ["E9AA",0x6489],
+  ["E5B6",0x648A],
+  ["E5B5",0x648B],
+  ["E5B7",0x648C],
+  ["8A5B",0x648D],
+  ["E5B4",0x648F],
+  ["BCB5",0x6490],
+  ["894D",0x6491],
+  ["BCBB",0x6492],
+  ["BCB8",0x6493],
+  ["BCB9",0x6495],
+  ["E5AF",0x6496],
+  ["E5B2",0x6497],
+  ["E5BC",0x6498],
+  ["BCC1",0x6499],
+  ["BCBF",0x649A],
+  ["E5B3",0x649C],
+  ["D95A",0x649D],
+  ["BCB2",0x649E],
+  ["E5B9",0x649F],
+  ["E5B0",0x64A0],
+  ["BCC2",0x64A2],
+  ["E5B8",0x64A3],
+  ["BA4D",0x64A4],
+  ["BCB7",0x64A5],
+  ["E1E4",0x64A6],
+  ["BCBA",0x64A9],
+  ["BCBE",0x64AB],
+  ["BCC0",0x64AC],
+  ["BCBD",0x64AD],
+  ["BCBC",0x64AE],
+  ["FED4",0x64AF],
+  ["BCB6",0x64B0],
+  ["E5BB",0x64B1],
+  ["BCB3",0x64B2],
+  ["BCC3",0x64B3],
+  ["8A78",0x64B4],
+  ["93AB",0x64B6],
+  ["BED8",0x64BB],
+  ["BED9",0x64BC],
+  ["E9A9",0x64BD],
+  ["BEE2",0x64BE],
+  ["BEDF",0x64BF],
+  ["8DA7",0x64C0],
+  ["BED6",0x64C1],
+  ["BEDD",0x64C2],
+  ["E9AB",0x64C3],
+  ["BEDB",0x64C4],
+  ["BED5",0x64C5],
+  ["BEDC",0x64C7],
+  ["E9A8",0x64C9],
+  ["C0BB",0x64CA],
+  ["BED7",0x64CB],
+  ["BEDE",0x64CD],
+  ["C0BA",0x64CE],
+  ["E9A7",0x64CF],
+  ["E9A6",0x64D0],
+  ["BEE0",0x64D2],
+  ["9F45",0x64D3],
+  ["BEE1",0x64D4],
+  ["E9A5",0x64D6],
+  ["E9A4",0x64D7],
+  ["C0BC",0x64D8],
+  ["E9AE",0x64D9],
+  ["BEDA",0x64DA],
+  ["E9AC",0x64DB],
+  ["8A56",0x64DD],
+  ["C0BD",0x64E0],
+  ["FCBF",0x64E1],
+  ["C0C2",0x64E2],
+  ["ECEA",0x64E3],
+  ["ECEC",0x64E4],
+  ["FCC0",0x64E5],
+  ["C0BF",0x64E6],
+  ["8EE6",0x64E7],
+  ["ECED",0x64E8],
+  ["ECE9",0x64E9],
+  ["8AA4",0x64EA],
+  ["ECEB",0x64EB],
+  ["C0C0",0x64EC],
+  ["C0C3",0x64ED],
+  ["ECE8",0x64EF],
+  ["C0BE",0x64F0],
+  ["C0C1",0x64F1],
+  ["C259",0x64F2],
+  ["E9AD",0x64F3],
+  ["C258",0x64F4],
+  ["C25E",0x64F7],
+  ["EFD4",0x64F8],
+  ["C25C",0x64FA],
+  ["C25D",0x64FB],
+  ["EFD7",0x64FC],
+  ["EFD3",0x64FD],
+  ["C25A",0x64FE],
+  ["EFD1",0x64FF],
+  ["C36B",0x6500],
+  ["EFD5",0x6501],
+  ["EFD6",0x6503],
+  ["EFD2",0x6504],
+  ["C25B",0x6506],
+  ["F242",0x6507],
+  ["F245",0x6509],
+  ["8943",0x650A],
+  ["F246",0x650C],
+  ["F244",0x650D],
+  ["F247",0x650E],
+  ["C36C",0x650F],
+  ["F243",0x6510],
+  ["93F3",0x6511],
+  ["F44E",0x6513],
+  ["C464",0x6514],
+  ["F44D",0x6515],
+  ["F44C",0x6516],
+  ["F44B",0x6517],
+  ["C463",0x6518],
+  ["C465",0x6519],
+  ["F5CD",0x651B],
+  ["C4E2",0x651C],
+  ["C4E1",0x651D],
+  ["FCAB",0x651E],
+  ["9EA2",0x651F],
+  ["F6E1",0x6520],
+  ["F6E0",0x6521],
+  ["F6E3",0x6522],
+  ["C5CB",0x6523],
+  ["C575",0x6524],
+  ["F7DD",0x6525],
+  ["F6E2",0x6526],
+  ["F7DC",0x6529],
+  ["C5CD",0x652A],
+  ["C5CC",0x652B],
+  ["C5F3",0x652C],
+  ["F8A9",0x652D],
+  ["F8EF",0x652E],
+  ["A4E4",0x652F],
+  ["9DC7",0x6530],
+  ["D972",0x6532],
+  ["E9AF",0x6533],
+  ["C6D2",0x6534],
+  ["8BCE",0x6535],
+  ["A6AC",0x6536],
+  ["CAF7",0x6537],
+  ["A7F1",0x6538],
+  ["A7EF",0x6539],
+  ["A7F0",0x653B],
+  ["CCC1",0x653D],
+  ["A9F1",0x653E],
+  ["AC46",0x653F],
+  ["CEE7",0x6541],
+  ["CEE8",0x6543],
+  ["AC47",0x6545],
+  ["D1CE",0x6546],
+  ["AEC4",0x6548],
+  ["AEC5",0x6549],
+  ["D1CD",0x654A],
+  ["FCC5",0x654D],
+  ["B1D3",0x654F],
+  ["B1CF",0x6551],
+  ["D5A7",0x6553],
+  ["B1D6",0x6554],
+  ["B1D5",0x6555],
+  ["B1CE",0x6556],
+  ["B1D1",0x6557],
+  ["B1D4",0x6558],
+  ["B1D0",0x6559],
+  ["D976",0x655C],
+  ["B1CD",0x655D],
+  ["B4AF",0x655E],
+  ["FCCB",0x655F],
+  ["B4B1",0x6562],
+  ["B4B2",0x6563],
+  ["D975",0x6564],
+  ["D978",0x6565],
+  ["B4B0",0x6566],
+  ["D973",0x6567],
+  ["D977",0x6568],
+  ["D974",0x656A],
+  ["93B3",0x656B],
+  ["B771",0x656C],
+  ["FCCA",0x656D],
+  ["DDBC",0x656F],
+  ["BA56",0x6572],
+  ["E1F4",0x6573],
+  ["BEE3",0x6574],
+  ["BCC4",0x6575],
+  ["E5BD",0x6576],
+  ["BCC5",0x6577],
+  ["BCC6",0x6578],
+  ["E5BF",0x6579],
+  ["E5BE",0x657A],
+  ["E5C0",0x657B],
+  ["E9B1",0x657C],
+  ["E9B0",0x657F],
+  ["ECEF",0x6580],
+  ["ECEE",0x6581],
+  ["C0C4",0x6582],
+  ["C0C5",0x6583],
+  ["F248",0x6584],
+  ["FCC9",0x6585],
+  ["8DAC",0x6586],
+  ["A4E5",0x6587],
+  ["FBC6",0x6588],
+  ["8967",0x6589],
+  ["8C7E",0x658B],
+  ["D979",0x658C],
+  ["B4B4",0x6590],
+  ["B4B3",0x6591],
+  ["DDBD",0x6592],
+  ["EFD8",0x6594],
+  ["C4E3",0x6595],
+  ["F7DE",0x6596],
+  ["A4E6",0x6597],
+  ["AEC6",0x6599],
+  ["B1D8",0x659B],
+  ["B1D7",0x659C],
+  ["D97A",0x659D],
+  ["D97B",0x659E],
+  ["B772",0x659F],
+  ["E1F5",0x65A0],
+  ["BA57",0x65A1],
+  ["E9B2",0x65A2],
+  ["A4E7",0x65A4],
+  ["A5B8",0x65A5],
+  ["A9F2",0x65A7],
+  ["CCC2",0x65A8],
+  ["CEE9",0x65AA],
+  ["AC48",0x65AB],
+  ["B1D9",0x65AC],
+  ["D97C",0x65AE],
+  ["B4B5",0x65AF],
+  ["B773",0x65B0],
+  ["E5C1",0x65B2],
+  ["E5C2",0x65B3],
+  ["FCCD",0x65B5],
+  ["ECF0",0x65B6],
+  ["C25F",0x65B7],
+  ["F8F0",0x65B8],
+  ["A4E8",0x65B9],
+  ["CCC3",0x65BB],
+  ["A9F3",0x65BC],
+  ["AC49",0x65BD],
+  ["9CF3",0x65BE],
+  ["CEEA",0x65BF],
+  ["AEC7",0x65C1],
+  ["D1D2",0x65C2],
+  ["D1D0",0x65C3],
+  ["D1D1",0x65C4],
+  ["AEC8",0x65C5],
+  ["D1CF",0x65C6],
+  ["B1DB",0x65CB],
+  ["B1DC",0x65CC],
+  ["D5A8",0x65CD],
+  ["B1DD",0x65CE],
+  ["B1DA",0x65CF],
+  ["D97D",0x65D0],
+  ["FCD0",0x65D1],
+  ["D97E",0x65D2],
+  ["DDBE",0x65D3],
+  ["95BB",0x65D4],
+  ["BA59",0x65D6],
+  ["BA58",0x65D7],
+  ["ECF1",0x65DA],
+  ["EFD9",0x65DB],
+  ["F24A",0x65DD],
+  ["F249",0x65DE],
+  ["F44F",0x65DF],
+  ["FCD3",0x65E0],
+  ["C95E",0x65E1],
+  ["AC4A",0x65E2],
+  ["FCD4",0x65E3],
+  ["A4E9",0x65E5],
+  ["A5B9",0x65E6],
+  ["A6AE",0x65E8],
+  ["A6AD",0x65E9],
+  ["A6AF",0x65EC],
+  ["A6B0",0x65ED],
+  ["C9EE",0x65EE],
+  ["C9ED",0x65EF],
+  ["CAF8",0x65F0],
+  ["A7F2",0x65F1],
+  ["CAFB",0x65F2],
+  ["CAFA",0x65F3],
+  ["CAF9",0x65F4],
+  ["CAFC",0x65F5],
+  ["A9F4",0x65FA],
+  ["CCC9",0x65FB],
+  ["CCC5",0x65FC],
+  ["CCCE",0x65FD],
+  ["8DAE",0x65FF],
+  ["A9FB",0x6600],
+  ["A9F9",0x6602],
+  ["CCCA",0x6603],
+  ["CCC6",0x6604],
+  ["CCCD",0x6605],
+  ["A9F8",0x6606],
+  ["AA40",0x6607],
+  ["CCC8",0x6608],
+  ["CCC4",0x6609],
+  ["A9FE",0x660A],
+  ["CCCB",0x660B],
+  ["A9F7",0x660C],
+  ["CCCC",0x660D],
+  ["A9FA",0x660E],
+  ["A9FC",0x660F],
+  ["CCD0",0x6610],
+  ["CCCF",0x6611],
+  ["CCC7",0x6612],
+  ["A9F6",0x6613],
+  ["A9F5",0x6614],
+  ["A9FD",0x6615],
+  ["FCD7",0x6618],
+  ["CEEF",0x661C],
+  ["CEF5",0x661D],
+  ["93DB",0x661E],
+  ["AC50",0x661F],
+  ["AC4D",0x6620],
+  ["CEEC",0x6621],
+  ["CEF1",0x6622],
+  ["FE63",0x6623],
+  ["AC53",0x6624],
+  ["AC4B",0x6625],
+  ["CEF0",0x6626],
+  ["AC4E",0x6627],
+  ["AC51",0x6628],
+  ["CEF3",0x662B],
+  ["AC4C",0x662D],
+  ["CEF8",0x662E],
+  ["AC4F",0x662F],
+  ["93D5",0x6630],
+  ["AC52",0x6631],
+  ["CEED",0x6632],
+  ["CEF2",0x6633],
+  ["CEF6",0x6634],
+  ["CEEE",0x6635],
+  ["CEEB",0x6636],
+  ["CEF7",0x6639],
+  ["CEF4",0x663A],
+  ["AED0",0x6641],
+  ["AEC9",0x6642],
+  ["AECC",0x6643],
+  ["FCDA",0x6644],
+  ["AECF",0x6645],
+  ["D1D5",0x6647],
+  ["9B71",0x6648],
+  ["AECA",0x6649],
+  ["D1D3",0x664A],
+  ["FCDD",0x664B],
+  ["AECE",0x664C],
+  ["8764",0x664D],
+  ["AECB",0x664F],
+  ["D1D6",0x6651],
+  ["AECD",0x6652],
+  ["8DAF",0x6653],
+  ["FAF2",0x6657],
+  ["D5AC",0x6659],
+  ["B1DF",0x665A],
+  ["D5AB",0x665B],
+  ["D5AD",0x665C],
+  ["B1DE",0x665D],
+  ["B1E3",0x665E],
+  ["D1D4",0x665F],
+  ["D5AA",0x6661],
+  ["D5AE",0x6662],
+  ["93D8",0x6663],
+  ["B1E0",0x6664],
+  ["D5A9",0x6665],
+  ["B1E2",0x6666],
+  ["FCDF",0x6667],
+  ["B1E1",0x6668],
+  ["D9A7",0x666A],
+  ["93D3",0x666B],
+  ["D9A2",0x666C],
+  ["B4B6",0x666E],
+  ["B4BA",0x666F],
+  ["B4B7",0x6670],
+  ["D9A5",0x6671],
+  ["D9A8",0x6672],
+  ["FCE1",0x6673],
+  ["B4B8",0x6674],
+  ["B4B9",0x6676],
+  ["B4BE",0x6677],
+  ["DDC7",0x6678],
+  ["D9A6",0x6679],
+  ["B4BC",0x667A],
+  ["D9A3",0x667B],
+  ["D9A1",0x667C],
+  ["8E76",0x667D],
+  ["B4BD",0x667E],
+  ["D9A4",0x6680],
+  ["B779",0x6684],
+  ["FC62",0x6685],
+  ["DDBF",0x6686],
+  ["B776",0x6687],
+  ["B777",0x6688],
+  ["B775",0x6689],
+  ["DDC4",0x668A],
+  ["DDC3",0x668B],
+  ["DDC0",0x668C],
+  ["B77B",0x668D],
+  ["93D1",0x668E],
+  ["DDC2",0x6690],
+  ["B4BB",0x6691],
+  ["8DB1",0x6692],
+  ["DDC6",0x6694],
+  ["DDC1",0x6695],
+  ["B778",0x6696],
+  ["B774",0x6697],
+  ["B77A",0x6698],
+  ["DDC5",0x6699],
+  ["9859",0x669A],
+  ["BA5C",0x669D],
+  ["E1F8",0x669F],
+  ["E1F7",0x66A0],
+  ["E1F6",0x66A1],
+  ["BA5A",0x66A2],
+  ["FB52",0x66A4],
+  ["BA5B",0x66A8],
+  ["E5C5",0x66A9],
+  ["E5C8",0x66AA],
+  ["BCC8",0x66AB],
+  ["FB53",0x66AD],
+  ["BCC7",0x66AE],
+  ["E5C9",0x66AF],
+  ["E5C4",0x66B0],
+  ["BCCA",0x66B1],
+  ["E5C6",0x66B2],
+  ["FB4D",0x66B3],
+  ["BCC9",0x66B4],
+  ["E5C3",0x66B5],
+  ["9CBF",0x66B6],
+  ["E5C7",0x66B7],
+  ["BEE9",0x66B8],
+  ["BEE6",0x66B9],
+  ["E9BB",0x66BA],
+  ["E9BA",0x66BB],
+  ["E9B9",0x66BD],
+  ["E9B4",0x66BE],
+  ["9B72",0x66BF],
+  ["E9B5",0x66C0],
+  ["BEE7",0x66C4],
+  ["BEE4",0x66C6],
+  ["BEE8",0x66C7],
+  ["E9B3",0x66C8],
+  ["BEE5",0x66C9],
+  ["E9B6",0x66CA],
+  ["E9B7",0x66CB],
+  ["E9BC",0x66CC],
+  ["FB50",0x66CD],
+  ["93BE",0x66CE],
+  ["E9B8",0x66CF],
+  ["ECF2",0x66D2],
+  ["C0C7",0x66D6],
+  ["EFDC",0x66D8],
+  ["C0C6",0x66D9],
+  ["EFDA",0x66DA],
+  ["EFDB",0x66DB],
+  ["C260",0x66DC],
+  ["C36E",0x66DD],
+  ["F24B",0x66DE],
+  ["C36D",0x66E0],
+  ["F451",0x66E3],
+  ["F452",0x66E4],
+  ["C466",0x66E6],
+  ["8CDB",0x66E7],
+  ["F450",0x66E8],
+  ["C4E4",0x66E9],
+  ["F7DF",0x66EB],
+  ["C5CE",0x66EC],
+  ["F8AA",0x66ED],
+  ["F8AB",0x66EE],
+  ["A4EA",0x66F0],
+  ["9DF1",0x66F1],
+  ["A6B1",0x66F2],
+  ["A6B2",0x66F3],
+  ["A7F3",0x66F4],
+  ["CCD1",0x66F6],
+  ["AC54",0x66F7],
+  ["AED1",0x66F8],
+  ["B1E4",0x66F9],
+  ["B0D2",0x66FC],
+  ["B4BF",0x66FE],
+  ["B4C0",0x66FF],
+  ["B3CC",0x6700],
+  ["D9A9",0x6701],
+  ["FCEB",0x6702],
+  ["B77C",0x6703],
+  ["E1FA",0x6704],
+  ["E1F9",0x6705],
+  ["A4EB",0x6708],
+  ["A6B3",0x6709],
+  ["CCD2",0x670A],
+  ["AA42",0x670B],
+  ["A0BB",0x670C],
+  ["AA41",0x670D],
+  ["9B7E",0x670E],
+  ["CEF9",0x670F],
+  ["CEFA",0x6710],
+  ["D1D7",0x6712],
+  ["D1D8",0x6713],
+  ["AED2",0x6714],
+  ["AED3",0x6715],
+  ["8DB3",0x6716],
+  ["AED4",0x6717],
+  ["D5AF",0x6718],
+  ["8C52",0x6719],
+  ["B1E6",0x671B],
+  ["B4C2",0x671D],
+  ["9AE8",0x671E],
+  ["B4C1",0x671F],
+  ["DDC8",0x6720],
+  ["DF7A",0x6721],
+  ["E1FB",0x6722],
+  ["E9BD",0x6723],
+  ["8EDC",0x6725],
+  ["C261",0x6726],
+  ["C467",0x6727],
+  ["A4EC",0x6728],
+  ["A5BC",0x672A],
+  ["A5BD",0x672B],
+  ["A5BB",0x672C],
+  ["A5BE",0x672D],
+  ["A5BA",0x672E],
+  ["A6B6",0x6731],
+  ["C9F6",0x6733],
+  ["A6B5",0x6734],
+  ["A6B7",0x6735],
+  ["9CF9",0x6736],
+  ["C9F1",0x6738],
+  ["C9F0",0x6739],
+  ["C9F3",0x673A],
+  ["C9F2",0x673B],
+  ["C9F5",0x673C],
+  ["A6B4",0x673D],
+  ["C9EF",0x673E],
+  ["C9F4",0x673F],
+  ["FA50",0x6744],
+  ["CAFD",0x6745],
+  ["A7FD",0x6746],
+  ["CAFE",0x6747],
+  ["CB43",0x6748],
+  ["A7FC",0x6749],
+  ["CB47",0x674B],
+  ["CB42",0x674C],
+  ["CB45",0x674D],
+  ["A7F5",0x674E],
+  ["A7F6",0x674F],
+  ["A7F7",0x6750],
+  ["A7F8",0x6751],
+  ["A840",0x6753],
+  ["CB41",0x6755],
+  ["A7FA",0x6756],
+  ["A841",0x6757],
+  ["CB40",0x6759],
+  ["CB46",0x675A],
+  ["A7F9",0x675C],
+  ["CB44",0x675D],
+  ["A7FB",0x675E],
+  ["A7F4",0x675F],
+  ["A7FE",0x6760],
+  ["98E7",0x6761],
+  ["FCF3",0x6762],
+  ["FCF2",0x6767],
+  ["AA57",0x676A],
+  ["8CCA",0x676B],
+  ["CCD4",0x676C],
+  ["AA43",0x676D],
+  ["8775",0x676E],
+  ["AA4D",0x676F],
+  ["AA4E",0x6770],
+  ["AA46",0x6771],
+  ["AA58",0x6772],
+  ["AA48",0x6773],
+  ["CCDC",0x6774],
+  ["AA53",0x6775],
+  ["CCD7",0x6776],
+  ["AA49",0x6777],
+  ["CCE6",0x6778],
+  ["CCE7",0x6779],
+  ["CCDF",0x677A],
+  ["CCD8",0x677B],
+  ["AA56",0x677C],
+  ["CCE4",0x677D],
+  ["AA51",0x677E],
+  ["AA4F",0x677F],
+  ["CCE5",0x6781],
+  ["CCE3",0x6783],
+  ["CCDB",0x6784],
+  ["CCD3",0x6785],
+  ["CCDA",0x6786],
+  ["AA4A",0x6787],
+  ["AA50",0x6789],
+  ["AA44",0x678B],
+  ["CCDE",0x678C],
+  ["CCDD",0x678D],
+  ["CCD5",0x678E],
+  ["93E5",0x678F],
+  ["AA52",0x6790],
+  ["CCE1",0x6791],
+  ["CCD6",0x6792],
+  ["AA55",0x6793],
+  ["CCE8",0x6794],
+  ["AA45",0x6795],
+  ["AA4C",0x6797],
+  ["CCD9",0x6798],
+  ["CCE2",0x6799],
+  ["AA54",0x679A],
+  ["AA47",0x679C],
+  ["AA4B",0x679D],
+  ["CCE0",0x679F],
+  ["9A59",0x67A0],
+  ["8DB5",0x67A4],
+  ["FD4D",0x67AC],
+  ["CF5B",0x67AE],
+  ["AC5C",0x67AF],
+  ["AC69",0x67B0],
+  ["FD5E",0x67B1],
+  ["CF56",0x67B2],
+  ["CF4C",0x67B3],
+  ["AC62",0x67B4],
+  ["CF4A",0x67B5],
+  ["AC5B",0x67B6],
+  ["CF45",0x67B7],
+  ["AC65",0x67B8],
+  ["CF52",0x67B9],
+  ["CEFE",0x67BA],
+  ["CF41",0x67BB],
+  ["8F7D",0x67BF],
+  ["CF44",0x67C0],
+  ["CEFB",0x67C1],
+  ["CF51",0x67C2],
+  ["CF61",0x67C3],
+  ["AC60",0x67C4],
+  ["CF46",0x67C5],
+  ["CF58",0x67C6],
+  ["CEFD",0x67C8],
+  ["CF5F",0x67C9],
+  ["CF60",0x67CA],
+  ["CF63",0x67CB],
+  ["CF5A",0x67CC],
+  ["CF4B",0x67CD],
+  ["CF53",0x67CE],
+  ["AC66",0x67CF],
+  ["AC59",0x67D0],
+  ["AC61",0x67D1],
+  ["AC6D",0x67D2],
+  ["AC56",0x67D3],
+  ["AC58",0x67D4],
+  ["9547",0x67D6],
+  ["FCF6",0x67D7],
+  ["CF43",0x67D8],
+  ["AC6A",0x67D9],
+  ["AC63",0x67DA],
+  ["CF5D",0x67DB],
+  ["CF40",0x67DC],
+  ["AC6C",0x67DD],
+  ["AC67",0x67DE],
+  ["CF49",0x67DF],
+  ["AC6B",0x67E2],
+  ["CF50",0x67E3],
+  ["CF48",0x67E4],
+  ["AC64",0x67E5],
+  ["CF5C",0x67E6],
+  ["CF54",0x67E7],
+  ["AC5E",0x67E9],
+  ["CF62",0x67EA],
+  ["CF47",0x67EB],
+  ["AC5A",0x67EC],
+  ["CF59",0x67ED],
+  ["CF4F",0x67EE],
+  ["AC5F",0x67EF],
+  ["CF55",0x67F0],
+  ["AC57",0x67F1],
+  ["CEFC",0x67F2],
+  ["AC68",0x67F3],
+  ["AEE3",0x67F4],
+  ["AC5D",0x67F5],
+  ["CF4E",0x67F6],
+  ["CF4D",0x67F7],
+  ["CF42",0x67F8],
+  ["9250",0x67F9],
+  ["CF5E",0x67FA],
+  ["CF57",0x67FC],
+  ["8968",0x67FE],
+  ["AC55",0x67FF],
+  ["8DB6",0x6800],
+  ["FCFB",0x6801],
+  ["A07D",0x6802],
+  ["98FC",0x6803],
+  ["8969",0x6804],
+  ["FE4F",0x680D],
+  ["9256",0x6810],
+  ["D1EC",0x6812],
+  ["AEEA",0x6813],
+  ["D1ED",0x6814],
+  ["D1E1",0x6816],
+  ["AEDF",0x6817],
+  ["AEEB",0x6818],
+  ["D1DA",0x681A],
+  ["FAC9",0x681B],
+  ["D1E3",0x681C],
+  ["D1EB",0x681D],
+  ["93E8",0x681E],
+  ["D1D9",0x681F],
+  ["D1F4",0x6820],
+  ["AED5",0x6821],
+  ["FCF8",0x6822],
+  ["D1F3",0x6825],
+  ["D1EE",0x6826],
+  ["D1EF",0x6828],
+  ["AEDD",0x6829],
+  ["AEE8",0x682A],
+  ["D1E5",0x682B],
+  ["D1E6",0x682D],
+  ["D1F0",0x682E],
+  ["D1E7",0x682F],
+  ["D1E2",0x6831],
+  ["D1DC",0x6832],
+  ["D1DD",0x6833],
+  ["D1EA",0x6834],
+  ["D1E4",0x6835],
+  ["9CE3",0x6836],
+  ["FDA9",0x6837],
+  ["AED6",0x6838],
+  ["AEDA",0x6839],
+  ["D1F2",0x683A],
+  ["D1DE",0x683B],
+  ["AEE6",0x683C],
+  ["AEE2",0x683D],
+  ["FC44",0x683E],
+  ["AEE5",0x6840],
+  ["AEEC",0x6841],
+  ["AEDB",0x6842],
+  ["AEE7",0x6843],
+  ["D1E9",0x6844],
+  ["AEE9",0x6845],
+  ["AED8",0x6846],
+  ["9640",0x6847],
+  ["AED7",0x6848],
+  ["D1DB",0x6849],
+  ["8DB8",0x684A],
+  ["D1DF",0x684B],
+  ["AEE0",0x684C],
+  ["D1F1",0x684D],
+  ["D1E8",0x684E],
+  ["D1E0",0x684F],
+  ["AEE4",0x6850],
+  ["AEE1",0x6851],
+  ["AED9",0x6853],
+  ["AEDC",0x6854],
+  ["9B4A",0x6855],
+  ["8FB9",0x6856],
+  ["FCFE",0x685D],
+  ["896A",0x6865],
+  ["D5C4",0x686B],
+  ["D5B4",0x686D],
+  ["D5B5",0x686E],
+  ["D5B9",0x686F],
+  ["D5C8",0x6871],
+  ["D5C5",0x6872],
+  ["D5BE",0x6874],
+  ["D5BD",0x6875],
+  ["B1ED",0x6876],
+  ["D5C1",0x6877],
+  ["D5D0",0x6878],
+  ["D5B0",0x6879],
+  ["D5D1",0x687B],
+  ["D5C3",0x687C],
+  ["D5D5",0x687D],
+  ["D5C9",0x687E],
+  ["B1EC",0x687F],
+  ["D5C7",0x6880],
+  ["B1E7",0x6881],
+  ["B1FC",0x6882],
+  ["B1F2",0x6883],
+  ["8DB9",0x6884],
+  ["B1F6",0x6885],
+  ["B1F5",0x6886],
+  ["D5B1",0x6887],
+  ["917E",0x6888],
+  ["D5CE",0x6889],
+  ["D5D4",0x688A],
+  ["D5CC",0x688B],
+  ["D5D3",0x688C],
+  ["D5C0",0x688F],
+  ["D5B2",0x6890],
+  ["D5D2",0x6891],
+  ["D5C2",0x6892],
+  ["B1EA",0x6893],
+  ["B1F7",0x6894],
+  ["D5CB",0x6896],
+  ["B1F0",0x6897],
+  ["93F4",0x6898],
+  ["D5CA",0x689B],
+  ["D5B3",0x689C],
+  ["B1F8",0x689D],
+  ["B1FA",0x689F],
+  ["D5CD",0x68A0],
+  ["B1FB",0x68A1],
+  ["B1E9",0x68A2],
+  ["D5BA",0x68A3],
+  ["D5CF",0x68A4],
+  ["FB7C",0x68A6],
+  ["B1EF",0x68A7],
+  ["B1F9",0x68A8],
+  ["D5BC",0x68A9],
+  ["D5C6",0x68AA],
+  ["D5B7",0x68AB],
+  ["D5BB",0x68AC],
+  ["B1F4",0x68AD],
+  ["D5B6",0x68AE],
+  ["B1E8",0x68AF],
+  ["B1F1",0x68B0],
+  ["B1EE",0x68B1],
+  ["D5BF",0x68B2],
+  ["AEDE",0x68B3],
+  ["D9C0",0x68B4],
+  ["B1EB",0x68B5],
+  ["93E7",0x68B6],
+  ["97EF",0x68B9],
+  ["FE4A",0x68BD],
+  ["FD45",0x68C3],
+  ["B1F3",0x68C4],
+  ["96A5",0x68C5],
+  ["D9C3",0x68C6],
+  ["D9D9",0x68C7],
+  ["D9CE",0x68C8],
+  ["B4D6",0x68C9],
+  ["FEE0",0x68CA],
+  ["B4D1",0x68CB],
+  ["D9BD",0x68CC],
+  ["B4D2",0x68CD],
+  ["D9CD",0x68CE],
+  ["D9C6",0x68D0],
+  ["D9D3",0x68D1],
+  ["B4CE",0x68D2],
+  ["D9AB",0x68D3],
+  ["D9D5",0x68D4],
+  ["B4C4",0x68D5],
+  ["D9B3",0x68D6],
+  ["B4C7",0x68D7],
+  ["B4C6",0x68D8],
+  ["B4D7",0x68DA],
+  ["D9AD",0x68DC],
+  ["D9CF",0x68DD],
+  ["D9D0",0x68DE],
+  ["B4C9",0x68DF],
+  ["B4C5",0x68E0],
+  ["D9BB",0x68E1],
+  ["B4D0",0x68E3],
+  ["D9B6",0x68E4],
+  ["D9D1",0x68E6],
+  ["B4CC",0x68E7],
+  ["D9C9",0x68E8],
+  ["D9D6",0x68E9],
+  ["D9B0",0x68EA],
+  ["D9B5",0x68EB],
+  ["D9AF",0x68EC],
+  ["B4CB",0x68EE],
+  ["D9C2",0x68EF],
+  ["DDDE",0x68F0],
+  ["D9B1",0x68F1],
+  ["B4CF",0x68F2],
+  ["D9BA",0x68F3],
+  ["D9D2",0x68F4],
+  ["B4CA",0x68F5],
+  ["D9B7",0x68F6],
+  ["D9B4",0x68F7],
+  ["D9C5",0x68F8],
+  ["B4CD",0x68F9],
+  ["B4C3",0x68FA],
+  ["B4D9",0x68FB],
+  ["D9C8",0x68FC],
+  ["D9C7",0x68FD],
+  ["FD48",0x6900],
+  ["FD47",0x6901],
+  ["FEF2",0x6902],
+  ["FE6A",0x6903],
+  ["D9AC",0x6904],
+  ["B4C8",0x6905],
+  ["D9D4",0x6906],
+  ["D9BC",0x6907],
+  ["D9BE",0x6908],
+  ["8DBD",0x6909],
+  ["D9CB",0x690A],
+  ["D9CA",0x690B],
+  ["D9AA",0x690C],
+  ["B4D3",0x690D],
+  ["B4D5",0x690E],
+  ["D9B2",0x690F],
+  ["D9B9",0x6910],
+  ["D9C1",0x6911],
+  ["B4D4",0x6912],
+  ["D9B8",0x6913],
+  ["D9C4",0x6914],
+  ["D9D7",0x6915],
+  ["D9CC",0x6917],
+  ["9BA1",0x6918],
+  ["8CA2",0x6919],
+  ["9AB7",0x691A],
+  ["8EFC",0x691B],
+  ["D9D8",0x6925],
+  ["D9AE",0x692A],
+  ["9FA1",0x692C],
+  ["DDF2",0x692F],
+  ["B7A6",0x6930],
+  ["DDF0",0x6932],
+  ["DDDB",0x6933],
+  ["DDE0",0x6934],
+  ["DDD9",0x6935],
+  ["FD51",0x6936],
+  ["DDEC",0x6937],
+  ["DDCB",0x6938],
+  ["DDD2",0x6939],
+  ["DDEA",0x693B],
+  ["DDF4",0x693C],
+  ["DDDC",0x693D],
+  ["FAAD",0x693E],
+  ["DDCF",0x693F],
+  ["DDE2",0x6940],
+  ["DDE7",0x6941],
+  ["DDD3",0x6942],
+  ["8DBE",0x6943],
+  ["DDE4",0x6944],
+  ["DDD0",0x6945],
+  ["89A4",0x6946],
+  ["DDD7",0x6948],
+  ["DDD8",0x6949],
+  ["B7A8",0x694A],
+  ["DDEB",0x694B],
+  ["DDE9",0x694C],
+  ["DDCC",0x694E],
+  ["DDEE",0x694F],
+  ["DDEF",0x6951],
+  ["DDF1",0x6952],
+  ["B7AC",0x6953],
+  ["B7A4",0x6954],
+  ["9AD9",0x6955],
+  ["D5B8",0x6956],
+  ["DDD4",0x6957],
+  ["DDE6",0x6958],
+  ["DDD5",0x6959],
+  ["B7A1",0x695A],
+  ["B7B1",0x695B],
+  ["DDED",0x695C],
+  ["B7AF",0x695D],
+  ["B7AB",0x695E],
+  ["DDCA",0x695F],
+  ["B7A3",0x6960],
+  ["FD4E",0x6961],
+  ["DDCD",0x6962],
+  ["B7B0",0x6963],
+  ["8DC0",0x6964],
+  ["DDDD",0x6965],
+  ["DDC9",0x6966],
+  ["97F0",0x6967],
+  ["B7A9",0x6968],
+  ["DDE1",0x6969],
+  ["DDD1",0x696A],
+  ["B7AA",0x696B],
+  ["DDDA",0x696C],
+  ["B77E",0x696D],
+  ["B4D8",0x696E],
+  ["DDE3",0x696F],
+  ["D9BF",0x6970],
+  ["DDCE",0x6971],
+  ["93B4",0x6972],
+  ["FD44",0x6973],
+  ["DDE8",0x6974],
+  ["B7A5",0x6975],
+  ["DDE5",0x6976],
+  ["B7A2",0x6977],
+  ["DDDF",0x6978],
+  ["B7AD",0x6979],
+  ["DDD6",0x697A],
+  ["DDF3",0x697B],
+  ["9FA7",0x6980],
+  ["B7A7",0x6982],
+  ["DEC6",0x6983],
+  ["8DC2",0x6985],
+  ["B7AE",0x6986],
+  ["99B6",0x698A],
+  ["E24A",0x698D],
+  ["E248",0x698E],
+  ["E25E",0x6990],
+  ["E246",0x6991],
+  ["E258",0x6993],
+  ["B77D",0x6994],
+  ["BA5F",0x6995],
+  ["E242",0x6996],
+  ["E25D",0x6997],
+  ["FD52",0x6998],
+  ["E247",0x6999],
+  ["E255",0x699A],
+  ["BA64",0x699B],
+  ["BA5D",0x699C],
+  ["E25B",0x699E],
+  ["8DC1",0x699F],
+  ["E240",0x69A0],
+  ["E25A",0x69A1],
+  ["8E46",0x69A2],
+  ["BA6F",0x69A3],
+  ["E251",0x69A4],
+  ["E261",0x69A5],
+  ["BA6D",0x69A6],
+  ["E249",0x69A7],
+  ["BA5E",0x69A8],
+  ["E24B",0x69A9],
+  ["E259",0x69AA],
+  ["BA67",0x69AB],
+  ["E244",0x69AC],
+  ["BA6B",0x69AD],
+  ["BA61",0x69AE],
+  ["E24D",0x69AF],
+  ["E243",0x69B0],
+  ["E1FC",0x69B1],
+  ["A0D1",0x69B2],
+  ["E257",0x69B3],
+  ["BA68",0x69B4],
+  ["E260",0x69B5],
+  ["E1FD",0x69B6],
+  ["BA65",0x69B7],
+  ["E253",0x69B9],
+  ["BA66",0x69BB],
+  ["E245",0x69BC],
+  ["E250",0x69BD],
+  ["E24C",0x69BE],
+  ["E24E",0x69BF],
+  ["9FCA",0x69C0],
+  ["BA60",0x69C1],
+  ["E25F",0x69C2],
+  ["BA6E",0x69C3],
+  ["E24F",0x69C4],
+  ["E262",0x69C6],
+  ["E1FE",0x69C9],
+  ["E254",0x69CA],
+  ["BA63",0x69CB],
+  ["BA6C",0x69CC],
+  ["BA6A",0x69CD],
+  ["E241",0x69CE],
+  ["E256",0x69CF],
+  ["BA69",0x69D0],
+  ["92CF",0x69D1],
+  ["BA62",0x69D3],
+  ["E252",0x69D4],
+  ["9CF4",0x69D5],
+  ["8DC4",0x69D6],
+  ["E25C",0x69D9],
+  ["FD41",0x69E1],
+  ["E5D5",0x69E2],
+  ["E5D1",0x69E4],
+  ["E5CD",0x69E5],
+  ["E5E1",0x69E6],
+  ["E5DE",0x69E7],
+  ["BCCD",0x69E8],
+  ["9B4C",0x69E9],
+  ["E5E5",0x69EB],
+  ["E5D4",0x69EC],
+  ["BCD8",0x69ED],
+  ["E5DB",0x69EE],
+  ["E5D0",0x69F1],
+  ["E5DA",0x69F2],
+  ["BCD5",0x69F3],
+  ["E5EE",0x69F4],
+  ["E5EB",0x69F6],
+  ["E5DD",0x69F7],
+  ["E5CE",0x69F8],
+  ["FD57",0x69F9],
+  ["FCEF",0x69FA],
+  ["E5E2",0x69FB],
+  ["E5E4",0x69FC],
+  ["BCD1",0x69FD],
+  ["E5D8",0x69FE],
+  ["E5D3",0x69FF],
+  ["E5CA",0x6A00],
+  ["BCCE",0x6A01],
+  ["BCD6",0x6A02],
+  ["9CDE",0x6A03],
+  ["E5E7",0x6A04],
+  ["BCD7",0x6A05],
+  ["E5CB",0x6A06],
+  ["E5ED",0x6A07],
+  ["E5E0",0x6A08],
+  ["E5E6",0x6A09],
+  ["BCD4",0x6A0A],
+  ["FD42",0x6A0B],
+  ["986C",0x6A0C],
+  ["E5E3",0x6A0D],
+  ["E5EA",0x6A0F],
+  ["BCD9",0x6A11],
+  ["BCD3",0x6A13],
+  ["E5DC",0x6A14],
+  ["E5CF",0x6A15],
+  ["E5EF",0x6A16],
+  ["E5CC",0x6A17],
+  ["E5E8",0x6A18],
+  ["BCD0",0x6A19],
+  ["97F9",0x6A1A],
+  ["E5D6",0x6A1B],
+  ["9558",0x6A1C],
+  ["E5D7",0x6A1D],
+  ["BCCF",0x6A1E],
+  ["BCCC",0x6A1F],
+  ["E5D2",0x6A20],
+  ["BCD2",0x6A21],
+  ["BCCB",0x6A23],
+  ["E5E9",0x6A25],
+  ["E5EC",0x6A26],
+  ["E5D9",0x6A27],
+  ["E9CA",0x6A28],
+  ["985E",0x6A2B],
+  ["FE7B",0x6A2C],
+  ["94CD",0x6A2D],
+  ["E9C2",0x6A32],
+  ["93EE",0x6A33],
+  ["E9BE",0x6A34],
+  ["BEF6",0x6A35],
+  ["BEEB",0x6A38],
+  ["BEF0",0x6A39],
+  ["BEEC",0x6A3A],
+  ["E9CC",0x6A3B],
+  ["E9D7",0x6A3C],
+  ["BEEA",0x6A3D],
+  ["E9C4",0x6A3E],
+  ["E9CD",0x6A3F],
+  ["E5DF",0x6A40],
+  ["E9CE",0x6A41],
+  ["8CA3",0x6A43],
+  ["BEF1",0x6A44],
+  ["FD5A",0x6A45],
+  ["E9DD",0x6A46],
+  ["BEF5",0x6A47],
+  ["BEF8",0x6A48],
+  ["E9C0",0x6A49],
+  ["BEF4",0x6A4B],
+  ["93F5",0x6A4C],
+  ["E9DB",0x6A4D],
+  ["E9DC",0x6A4E],
+  ["E9D2",0x6A4F],
+  ["E9D1",0x6A50],
+  ["E9C9",0x6A51],
+  ["93EF",0x6A52],
+  ["8EEA",0x6A53],
+  ["E9D3",0x6A54],
+  ["E9DA",0x6A55],
+  ["E9D9",0x6A56],
+  ["8F5B",0x6A57],
+  ["BEEF",0x6A58],
+  ["BEED",0x6A59],
+  ["E9CB",0x6A5A],
+  ["E9C8",0x6A5B],
+  ["E9C5",0x6A5D],
+  ["E9D8",0x6A5E],
+  ["BEF7",0x6A5F],
+  ["E9D6",0x6A60],
+  ["BEF3",0x6A61],
+  ["BEF2",0x6A62],
+  ["8C5E",0x6A63],
+  ["E9D0",0x6A64],
+  ["8DC6",0x6A65],
+  ["E9BF",0x6A66],
+  ["E9C1",0x6A67],
+  ["E9C3",0x6A68],
+  ["E9D5",0x6A69],
+  ["E9CF",0x6A6A],
+  ["BEEE",0x6A6B],
+  ["E9C6",0x6A6D],
+  ["E9D4",0x6A6F],
+  ["8DC8",0x6A71],
+  ["8DC7",0x6A74],
+  ["E9C7",0x6A76],
+  ["93F7",0x6A7A],
+  ["C0CF",0x6A7E],
+  ["ED45",0x6A7F],
+  ["C0C8",0x6A80],
+  ["ECF5",0x6A81],
+  ["8DC9",0x6A82],
+  ["ED41",0x6A83],
+  ["C0CA",0x6A84],
+  ["ED48",0x6A85],
+  ["ECFC",0x6A87],
+  ["ECF7",0x6A89],
+  ["FBF2",0x6A8A],
+  ["ED49",0x6A8C],
+  ["ECF3",0x6A8D],
+  ["ECFE",0x6A8E],
+  ["9670",0x6A8F],
+  ["C0D1",0x6A90],
+  ["ED44",0x6A91],
+  ["ED4A",0x6A92],
+  ["ECFD",0x6A93],
+  ["C0C9",0x6A94],
+  ["ED40",0x6A95],
+  ["ECF4",0x6A96],
+  ["C0D0",0x6A97],
+  ["8DCB",0x6A99],
+  ["ED47",0x6A9A],
+  ["ECF9",0x6A9B],
+  ["C0CC",0x6A9C],
+  ["FD5C",0x6A9D],
+  ["ECFB",0x6A9E],
+  ["ECF8",0x6A9F],
+  ["C0D2",0x6AA0],
+  ["ECFA",0x6AA1],
+  ["C0CB",0x6AA2],
+  ["C0CE",0x6AA3],
+  ["ED43",0x6AA4],
+  ["ECF6",0x6AA5],
+  ["ED46",0x6AA6],
+  ["8F65",0x6AA7],
+  ["ED42",0x6AA8],
+  ["8DCD",0x6AAB],
+  ["C263",0x6AAC],
+  ["EFE7",0x6AAD],
+  ["C268",0x6AAE],
+  ["C269",0x6AAF],
+  ["9DA8",0x6AB1],
+  ["94F9",0x6AB2],
+  ["C262",0x6AB3],
+  ["EFE6",0x6AB4],
+  ["8DCE",0x6AB5],
+  ["EFE3",0x6AB6],
+  ["EFE4",0x6AB7],
+  ["C266",0x6AB8],
+  ["EFDE",0x6AB9],
+  ["EFE2",0x6ABA],
+  ["C265",0x6ABB],
+  ["EFDF",0x6ABD],
+  ["93EA",0x6ABE],
+  ["C267",0x6AC2],
+  ["C264",0x6AC3],
+  ["EFDD",0x6AC5],
+  ["EFE1",0x6AC6],
+  ["EFE5",0x6AC7],
+  ["FD5F",0x6AC8],
+  ["93F0",0x6AC9],
+  ["9FB6",0x6ACA],
+  ["F251",0x6ACB],
+  ["F24E",0x6ACC],
+  ["F257",0x6ACD],
+  ["F256",0x6ACF],
+  ["F254",0x6AD0],
+  ["F24F",0x6AD1],
+  ["C372",0x6AD3],
+  ["8DCF",0x6AD4],
+  ["9763",0x6AD8],
+  ["F250",0x6AD9],
+  ["C371",0x6ADA],
+  ["C0CD",0x6ADB],
+  ["F253",0x6ADC],
+  ["C370",0x6ADD],
+  ["F258",0x6ADE],
+  ["F252",0x6ADF],
+  ["F24D",0x6AE0],
+  ["EFE0",0x6AE1],
+  ["C36F",0x6AE5],
+  ["F24C",0x6AE7],
+  ["F456",0x6AE8],
+  ["F455",0x6AEA],
+  ["F255",0x6AEB],
+  ["C468",0x6AEC],
+  ["F459",0x6AEE],
+  ["F45A",0x6AEF],
+  ["F454",0x6AF0],
+  ["F458",0x6AF1],
+  ["F453",0x6AF3],
+  ["8DD0",0x6AF6],
+  ["F5D1",0x6AF8],
+  ["F457",0x6AF9],
+  ["C4E7",0x6AFA],
+  ["C4E5",0x6AFB],
+  ["F5CF",0x6AFC],
+  ["F5D2",0x6B00],
+  ["F5CE",0x6B02],
+  ["F5D0",0x6B03],
+  ["C4E6",0x6B04],
+  ["93F1",0x6B05],
+  ["F6E5",0x6B08],
+  ["F6E6",0x6B09],
+  ["C576",0x6B0A],
+  ["F6E4",0x6B0B],
+  ["F7E2",0x6B0F],
+  ["C5CF",0x6B10],
+  ["F7E0",0x6B11],
+  ["F7E1",0x6B12],
+  ["F8AC",0x6B13],
+  ["C656",0x6B16],
+  ["F8F3",0x6B17],
+  ["F8F1",0x6B18],
+  ["F8F2",0x6B19],
+  ["F8F4",0x6B1A],
+  ["FD62",0x6B1D],
+  ["F9BB",0x6B1E],
+  ["A4ED",0x6B20],
+  ["A6B8",0x6B21],
+  ["AA59",0x6B23],
+  ["CCE9",0x6B25],
+  ["CF64",0x6B28],
+  ["D1F5",0x6B2C],
+  ["D1F7",0x6B2D],
+  ["D1F6",0x6B2F],
+  ["D1F8",0x6B31],
+  ["B1FD",0x6B32],
+  ["D5D7",0x6B33],
+  ["D1F9",0x6B34],
+  ["FD65",0x6B35],
+  ["D5D6",0x6B36],
+  ["D5D8",0x6B37],
+  ["D5D9",0x6B38],
+  ["D9DA",0x6B39],
+  ["B4DB",0x6B3A],
+  ["D9DB",0x6B3B],
+  ["D9DD",0x6B3C],
+  ["B4DC",0x6B3D],
+  ["B4DA",0x6B3E],
+  ["D9DC",0x6B3F],
+  ["DDFA",0x6B41],
+  ["DDF8",0x6B42],
+  ["DDF7",0x6B43],
+  ["DDF6",0x6B45],
+  ["DDF5",0x6B46],
+  ["B7B2",0x6B47],
+  ["DDF9",0x6B48],
+  ["BA70",0x6B49],
+  ["E263",0x6B4A],
+  ["E265",0x6B4B],
+  ["BA71",0x6B4C],
+  ["E264",0x6B4D],
+  ["BCDB",0x6B4E],
+  ["BCDA",0x6B50],
+  ["E5F0",0x6B51],
+  ["9FDB",0x6B52],
+  ["E9DF",0x6B54],
+  ["E9DE",0x6B55],
+  ["E9E0",0x6B56],
+  ["93F8",0x6B57],
+  ["BEF9",0x6B59],
+  ["ED4B",0x6B5B],
+  ["C0D3",0x6B5C],
+  ["EFE8",0x6B5E],
+  ["C26A",0x6B5F],
+  ["F259",0x6B60],
+  ["C577",0x6B61],
+  ["A4EE",0x6B62],
+  ["A5BF",0x6B63],
+  ["A6B9",0x6B64],
+  ["A842",0x6B65],
+  ["AA5A",0x6B66],
+  ["AA5B",0x6B67],
+  ["AC6E",0x6B6A],
+  ["D1FA",0x6B6D],
+  ["8BF7",0x6B6F],
+  ["B7B3",0x6B72],
+  ["FD66",0x6B74],
+  ["E6D1",0x6B76],
+  ["BEFA",0x6B77],
+  ["C26B",0x6B78],
+  ["A4EF",0x6B79],
+  ["8BCF",0x6B7A],
+  ["A6BA",0x6B7B],
+  ["CCEB",0x6B7E],
+  ["AA5C",0x6B7F],
+  ["CCEA",0x6B80],
+  ["8DD1",0x6B81],
+  ["CF65",0x6B82],
+  ["AC6F",0x6B83],
+  ["CF66",0x6B84],
+  ["AC70",0x6B86],
+  ["D1FC",0x6B88],
+  ["AEEE",0x6B89],
+  ["AEED",0x6B8A],
+  ["D5DE",0x6B8C],
+  ["D5DC",0x6B8D],
+  ["D5DD",0x6B8E],
+  ["D5DB",0x6B8F],
+  ["D5DA",0x6B91],
+  ["D9DE",0x6B94],
+  ["D9E1",0x6B95],
+  ["B4DE",0x6B96],
+  ["D9DF",0x6B97],
+  ["B4DD",0x6B98],
+  ["D9E0",0x6B99],
+  ["DDFB",0x6B9B],
+  ["E266",0x6B9E],
+  ["E267",0x6B9F],
+  ["E268",0x6BA0],
+  ["E5F3",0x6BA2],
+  ["E5F2",0x6BA3],
+  ["BCDC",0x6BA4],
+  ["E5F1",0x6BA5],
+  ["E5F4",0x6BA6],
+  ["E9E1",0x6BA7],
+  ["E9E2",0x6BAA],
+  ["E9E3",0x6BAB],
+  ["ED4C",0x6BAD],
+  ["C0D4",0x6BAE],
+  ["C26C",0x6BAF],
+  ["F25A",0x6BB0],
+  ["C4E8",0x6BB2],
+  ["C95F",0x6BB3],
+  ["AC71",0x6BB5],
+  ["CF67",0x6BB6],
+  ["AEEF",0x6BB7],
+  ["B1FE",0x6BBA],
+  ["B4DF",0x6BBC],
+  ["D9E2",0x6BBD],
+  ["B7B5",0x6BBF],
+  ["B7B4",0x6BC0],
+  ["8DD2",0x6BC1],
+  ["E269",0x6BC3],
+  ["E26A",0x6BC4],
+  ["BCDD",0x6BC5],
+  ["BCDE",0x6BC6],
+  ["E9E5",0x6BC7],
+  ["E9E4",0x6BC8],
+  ["EFE9",0x6BC9],
+  ["F7E3",0x6BCA],
+  ["A4F0",0x6BCB],
+  ["C960",0x6BCC],
+  ["A5C0",0x6BCD],
+  ["A843",0x6BCF],
+  ["CB48",0x6BD0],
+  ["AC72",0x6BD2],
+  ["B7B6",0x6BD3],
+  ["A4F1",0x6BD4],
+  ["CF68",0x6BD6],
+  ["AC73",0x6BD7],
+  ["CF69",0x6BD8],
+  ["C0D5",0x6BDA],
+  ["A4F2",0x6BDB],
+  ["FD71",0x6BDC],
+  ["CCEC",0x6BDE],
+  ["CF6A",0x6BE0],
+  ["FD6F",0x6BE1],
+  ["D242",0x6BE2],
+  ["D241",0x6BE3],
+  ["D1FE",0x6BE4],
+  ["D1FD",0x6BE6],
+  ["D243",0x6BE7],
+  ["D240",0x6BE8],
+  ["8DD3",0x6BEA],
+  ["B240",0x6BEB],
+  ["B241",0x6BEC],
+  ["B4E0",0x6BEF],
+  ["D9E3",0x6BF0],
+  ["D9E4",0x6BF2],
+  ["D9E5",0x6BF3],
+  ["DE41",0x6BF7],
+  ["DE42",0x6BF8],
+  ["DE40",0x6BF9],
+  ["9FE7",0x6BFA],
+  ["DDFD",0x6BFB],
+  ["DDFE",0x6BFC],
+  ["B7B7",0x6BFD],
+  ["E26B",0x6BFE],
+  ["E5F7",0x6BFF],
+  ["E5F6",0x6C00],
+  ["E5F5",0x6C01],
+  ["E5F8",0x6C02],
+  ["E9E7",0x6C03],
+  ["E9E6",0x6C04],
+  ["BEFB",0x6C05],
+  ["E9E8",0x6C06],
+  ["C0D6",0x6C08],
+  ["ED4D",0x6C09],
+  ["EFEA",0x6C0B],
+  ["F25B",0x6C0C],
+  ["F6E7",0x6C0D],
+  ["A4F3",0x6C0F],
+  ["A5C2",0x6C10],
+  ["A5C1",0x6C11],
+  ["AA5D",0x6C13],
+  ["C961",0x6C14],
+  ["C97E",0x6C15],
+  ["A6BB",0x6C16],
+  ["C9F7",0x6C18],
+  ["CB49",0x6C19],
+  ["CB4A",0x6C1A],
+  ["AA5E",0x6C1B],
+  ["90BD",0x6C1C],
+  ["CCED",0x6C1D],
+  ["AC74",0x6C1F],
+  ["CF6B",0x6C20],
+  ["CF6C",0x6C21],
+  ["AEF0",0x6C23],
+  ["AEF4",0x6C24],
+  ["D244",0x6C25],
+  ["AEF3",0x6C26],
+  ["AEF1",0x6C27],
+  ["AEF2",0x6C28],
+  ["D5DF",0x6C2A],
+  ["B242",0x6C2B],
+  ["B4E3",0x6C2C],
+  ["B4E1",0x6C2E],
+  ["B4E2",0x6C2F],
+  ["D9E6",0x6C30],
+  ["9FD0",0x6C31],
+  ["BA72",0x6C33],
+  ["A4F4",0x6C34],
+  ["8BD0",0x6C35],
+  ["C9A1",0x6C36],
+  ["FD72",0x6C37],
+  ["A5C3",0x6C38],
+  ["9CAE",0x6C39],
+  ["8BD1",0x6C3A],
+  ["C9A4",0x6C3B],
+  ["8ADB",0x6C3D],
+  ["A5C6",0x6C3E],
+  ["C9A3",0x6C3F],
+  ["A5C5",0x6C40],
+  ["A5C4",0x6C41],
+  ["A844",0x6C42],
+  ["C9A2",0x6C43],
+  ["C9F8",0x6C46],
+  ["FAE4",0x6C49],
+  ["C9FC",0x6C4A],
+  ["C9FE",0x6C4B],
+  ["CA40",0x6C4C],
+  ["A6C5",0x6C4D],
+  ["A6C6",0x6C4E],
+  ["C9FB",0x6C4F],
+  ["A6C1",0x6C50],
+  ["C9F9",0x6C52],
+  ["C9FD",0x6C54],
+  ["A6C2",0x6C55],
+  ["A6BD",0x6C57],
+  ["95CE",0x6C58],
+  ["A6BE",0x6C59],
+  ["FD76",0x6C5A],
+  ["A6C4",0x6C5B],
+  ["C9FA",0x6C5C],
+  ["A6BC",0x6C5D],
+  ["A845",0x6C5E],
+  ["A6BF",0x6C5F],
+  ["A6C0",0x6C60],
+  ["A6C3",0x6C61],
+  ["CB5B",0x6C65],
+  ["CB59",0x6C66],
+  ["CB4C",0x6C67],
+  ["A851",0x6C68],
+  ["CB53",0x6C69],
+  ["A84C",0x6C6A],
+  ["CB4D",0x6C6B],
+  ["CB55",0x6C6D],
+  ["FB62",0x6C6E],
+  ["CB52",0x6C6F],
+  ["A84F",0x6C70],
+  ["CB51",0x6C71],
+  ["A856",0x6C72],
+  ["CB5A",0x6C73],
+  ["A858",0x6C74],
+  ["8DD4",0x6C75],
+  ["A85A",0x6C76],
+  ["CB4B",0x6C78],
+  ["FD78",0x6C79],
+  ["A84D",0x6C7A],
+  ["CB5C",0x6C7B],
+  ["A854",0x6C7D],
+  ["A857",0x6C7E],
+  ["8EE3",0x6C7F],
+  ["CD45",0x6C80],
+  ["A847",0x6C81],
+  ["A85E",0x6C82],
+  ["A855",0x6C83],
+  ["CB4E",0x6C84],
+  ["A84A",0x6C85],
+  ["A859",0x6C86],
+  ["CB56",0x6C87],
+  ["A848",0x6C88],
+  ["A849",0x6C89],
+  ["CD43",0x6C8A],
+  ["CB4F",0x6C8B],
+  ["A850",0x6C8C],
+  ["A85B",0x6C8D],
+  ["CB5D",0x6C8E],
+  ["CB50",0x6C8F],
+  ["A84E",0x6C90],
+  ["A853",0x6C92],
+  ["CCEE",0x6C93],
+  ["A85C",0x6C94],
+  ["CB57",0x6C95],
+  ["A852",0x6C96],
+  ["A85D",0x6C98],
+  ["A846",0x6C99],
+  ["CB54",0x6C9A],
+  ["A84B",0x6C9B],
+  ["CB58",0x6C9C],
+  ["CD44",0x6C9D],
+  ["9076",0x6C9F],
+  ["98C6",0x6CA2],
+  ["8DD5",0x6CAA],
+  ["AA6A",0x6CAB],
+  ["AA7A",0x6CAC],
+  ["CCF5",0x6CAD],
+  ["AA71",0x6CAE],
+  ["97D1",0x6CAF],
+  ["CD4B",0x6CB0],
+  ["AA62",0x6CB1],
+  ["9EB6",0x6CB2],
+  ["AA65",0x6CB3],
+  ["CD42",0x6CB4],
+  ["CCF3",0x6CB6],
+  ["CCF7",0x6CB7],
+  ["AA6D",0x6CB8],
+  ["AA6F",0x6CB9],
+  ["CCFA",0x6CBA],
+  ["AA76",0x6CBB],
+  ["AA68",0x6CBC],
+  ["AA66",0x6CBD],
+  ["AA67",0x6CBE],
+  ["AA75",0x6CBF],
+  ["CD47",0x6CC0],
+  ["AA70",0x6CC1],
+  ["CCF9",0x6CC2],
+  ["CCFB",0x6CC3],
+  ["AA6E",0x6CC4],
+  ["AA73",0x6CC5],
+  ["CCFC",0x6CC6],
+  ["CD4A",0x6CC7],
+  ["AC75",0x6CC9],
+  ["AA79",0x6CCA],
+  ["FAC7",0x6CCB],
+  ["AA63",0x6CCC],
+  ["CD49",0x6CCD],
+  ["A042",0x6CCE],
+  ["CD4D",0x6CCF],
+  ["CCF8",0x6CD0],
+  ["CD4F",0x6CD1],
+  ["CD40",0x6CD2],
+  ["AA6C",0x6CD3],
+  ["CCF4",0x6CD4],
+  ["AA6B",0x6CD5],
+  ["AA7D",0x6CD6],
+  ["AA72",0x6CD7],
+  ["CCF2",0x6CD9],
+  ["CF75",0x6CDA],
+  ["AA78",0x6CDB],
+  ["AA7C",0x6CDC],
+  ["CD41",0x6CDD],
+  ["CD46",0x6CDE],
+  ["9873",0x6CDF],
+  ["AA7E",0x6CE0],
+  ["AA77",0x6CE1],
+  ["AA69",0x6CE2],
+  ["AA5F",0x6CE3],
+  ["AA64",0x6CE5],
+  ["CCF6",0x6CE7],
+  ["AA60",0x6CE8],
+  ["CD4E",0x6CE9],
+  ["9FFC",0x6CEA],
+  ["CCF0",0x6CEB],
+  ["CCEF",0x6CEC],
+  ["CCFD",0x6CED],
+  ["CCF1",0x6CEE],
+  ["AA7B",0x6CEF],
+  ["AEF5",0x6CF0],
+  ["AA74",0x6CF1],
+  ["CCFE",0x6CF2],
+  ["AA61",0x6CF3],
+  ["ACA6",0x6CF5],
+  ["CD4C",0x6CF9],
+  ["8CA5",0x6CFF],
+  ["CF7C",0x6D00],
+  ["CFA1",0x6D01],
+  ["8DD7",0x6D02],
+  ["CFA4",0x6D03],
+  ["CF77",0x6D04],
+  ["92FB",0x6D05],
+  ["8DD8",0x6D06],
+  ["CFA7",0x6D07],
+  ["CFAA",0x6D08],
+  ["CFAC",0x6D09],
+  ["CF74",0x6D0A],
+  ["AC76",0x6D0B],
+  ["AC7B",0x6D0C],
+  ["D249",0x6D0D],
+  ["ACAD",0x6D0E],
+  ["CFA5",0x6D0F],
+  ["CFAD",0x6D10],
+  ["CF7B",0x6D11],
+  ["CF73",0x6D12],
+  ["D264",0x6D16],
+  ["AC7E",0x6D17],
+  ["CFA2",0x6D18],
+  ["CF78",0x6D19],
+  ["CF7A",0x6D1A],
+  ["ACA5",0x6D1B],
+  ["CF7D",0x6D1D],
+  ["AC7D",0x6D1E],
+  ["CF70",0x6D1F],
+  ["CFA8",0x6D20],
+  ["CFAB",0x6D22],
+  ["944F",0x6D24],
+  ["AC7A",0x6D25],
+  ["8DD9",0x6D26],
+  ["ACA8",0x6D27],
+  ["CF6D",0x6D28],
+  ["ACAA",0x6D29],
+  ["AC78",0x6D2A],
+  ["ACAE",0x6D2B],
+  ["CFA9",0x6D2C],
+  ["CF6F",0x6D2D],
+  ["ACAB",0x6D2E],
+  ["D25E",0x6D2F],
+  ["CD48",0x6D30],
+  ["AC7C",0x6D31],
+  ["AC77",0x6D32],
+  ["CF76",0x6D33],
+  ["CF6E",0x6D34],
+  ["ACAC",0x6D35],
+  ["ACA4",0x6D36],
+  ["CFA3",0x6D37],
+  ["ACA9",0x6D38],
+  ["ACA7",0x6D39],
+  ["CF79",0x6D3A],
+  ["ACA1",0x6D3B],
+  ["CF71",0x6D3C],
+  ["ACA2",0x6D3D],
+  ["ACA3",0x6D3E],
+  ["CF72",0x6D3F],
+  ["CFA6",0x6D40],
+  ["AC79",0x6D41],
+  ["CF7E",0x6D42],
+  ["896B",0x6D4E],
+  ["97CE",0x6D57],
+  ["D24C",0x6D58],
+  ["AEFD",0x6D59],
+  ["AF43",0x6D5A],
+  ["FAF3",0x6D5B],
+  ["FDAE",0x6D5C],
+  ["D255",0x6D5E],
+  ["D25B",0x6D5F],
+  ["D257",0x6D60],
+  ["D24A",0x6D61],
+  ["D24D",0x6D62],
+  ["D246",0x6D63],
+  ["D247",0x6D64],
+  ["AF4A",0x6D65],
+  ["AEFA",0x6D66],
+  ["D256",0x6D67],
+  ["D25F",0x6D68],
+  ["AF45",0x6D69],
+  ["AEF6",0x6D6A],
+  ["AF40",0x6D6C],
+  ["D24E",0x6D6D],
+  ["AF42",0x6D6E],
+  ["D24F",0x6D6F],
+  ["D259",0x6D70],
+  ["FBAF",0x6D71],
+  ["92B7",0x6D72],
+  ["AF44",0x6D74],
+  ["D268",0x6D75],
+  ["D248",0x6D76],
+  ["AEFC",0x6D77],
+  ["AEFB",0x6D78],
+  ["AF48",0x6D79],
+  ["D245",0x6D7A],
+  ["D266",0x6D7B],
+  ["D25A",0x6D7C],
+  ["D267",0x6D7D],
+  ["D261",0x6D7E],
+  ["D253",0x6D7F],
+  ["D262",0x6D80],
+  ["8DDA",0x6D81],
+  ["D25C",0x6D82],
+  ["D265",0x6D83],
+  ["D263",0x6D84],
+  ["AF49",0x6D85],
+  ["D254",0x6D86],
+  ["AEF9",0x6D87],
+  ["AEF8",0x6D88],
+  ["AF41",0x6D89],
+  ["AF47",0x6D8A],
+  ["D260",0x6D8B],
+  ["AF46",0x6D8C],
+  ["D251",0x6D8D],
+  ["B243",0x6D8E],
+  ["9C5A",0x6D8F],
+  ["D269",0x6D90],
+  ["D250",0x6D91],
+  ["D24B",0x6D92],
+  ["AEFE",0x6D93],
+  ["AF4B",0x6D94],
+  ["AEF7",0x6D95],
+  ["FDAD",0x6D96],
+  ["D258",0x6D97],
+  ["D25D",0x6D98],
+  ["8DDC",0x6DA4],
+  ["9444",0x6DA5],
+  ["B265",0x6DAA],
+  ["D5E1",0x6DAB],
+  ["D5E5",0x6DAC],
+  ["B252",0x6DAE],
+  ["B250",0x6DAF],
+  ["8DDD",0x6DB1],
+  ["B247",0x6DB2],
+  ["D5E3",0x6DB3],
+  ["D5E2",0x6DB4],
+  ["B25B",0x6DB5],
+  ["D5E8",0x6DB7],
+  ["B255",0x6DB8],
+  ["A0D6",0x6DB9],
+  ["D5FA",0x6DBA],
+  ["D647",0x6DBB],
+  ["B244",0x6DBC],
+  ["D5F7",0x6DBD],
+  ["D5F0",0x6DBE],
+  ["B267",0x6DBF],
+  ["D5E0",0x6DC0],
+  ["D5FC",0x6DC2],
+  ["B264",0x6DC4],
+  ["B258",0x6DC5],
+  ["B263",0x6DC6],
+  ["B24E",0x6DC7],
+  ["D5EC",0x6DC8],
+  ["D5FE",0x6DC9],
+  ["D5F6",0x6DCA],
+  ["B24F",0x6DCB],
+  ["B249",0x6DCC],
+  ["D645",0x6DCD],
+  ["D5FD",0x6DCF],
+  ["D640",0x6DD0],
+  ["B251",0x6DD1],
+  ["B259",0x6DD2],
+  ["D642",0x6DD3],
+  ["D5EA",0x6DD4],
+  ["D5FB",0x6DD5],
+  ["D5EF",0x6DD6],
+  ["D644",0x6DD7],
+  ["B25E",0x6DD8],
+  ["B246",0x6DD9],
+  ["B25C",0x6DDA],
+  ["D5F4",0x6DDB],
+  ["D5F2",0x6DDC],
+  ["D5F3",0x6DDD],
+  ["B253",0x6DDE],
+  ["D5EE",0x6DDF],
+  ["D5ED",0x6DE0],
+  ["B248",0x6DE1],
+  ["D5E7",0x6DE2],
+  ["D646",0x6DE3],
+  ["B24A",0x6DE4],
+  ["D5F1",0x6DE5],
+  ["B268",0x6DE6],
+  ["B262",0x6DE8],
+  ["D5E6",0x6DE9],
+  ["B25F",0x6DEA],
+  ["B25D",0x6DEB],
+  ["B266",0x6DEC],
+  ["D5F8",0x6DED],
+  ["B261",0x6DEE],
+  ["D252",0x6DEF],
+  ["D5F9",0x6DF0],
+  ["B260",0x6DF1],
+  ["D641",0x6DF2],
+  ["B245",0x6DF3],
+  ["D5F5",0x6DF4],
+  ["B257",0x6DF5],
+  ["D5E9",0x6DF6],
+  ["B256",0x6DF7],
+  ["B254",0x6DF9],
+  ["B24C",0x6DFA],
+  ["B24B",0x6DFB],
+  ["D9E7",0x6DFC],
+  ["D643",0x6DFD],
+  ["8C41",0x6DFE],
+  ["D5EB",0x6E00],
+  ["97D5",0x6E02],
+  ["D9FC",0x6E03],
+  ["944A",0x6E04],
+  ["B24D",0x6E05],
+  ["944D",0x6E0A],
+  ["97CB",0x6E0F],
+  ["8DDE",0x6E15],
+  ["8DDF",0x6E18],
+  ["B541",0x6E19],
+  ["B25A",0x6E1A],
+  ["B4EE",0x6E1B],
+  ["D9F6",0x6E1C],
+  ["B4FC",0x6E1D],
+  ["D9EA",0x6E1F],
+  ["B4EB",0x6E20],
+  ["B4E7",0x6E21],
+  ["DA49",0x6E22],
+  ["B4ED",0x6E23],
+  ["B4F1",0x6E24],
+  ["B4EC",0x6E25],
+  ["B4F5",0x6E26],
+  ["DA4D",0x6E27],
+  ["DA44",0x6E28],
+  ["8DE0",0x6E29],
+  ["FEF9",0x6E2A],
+  ["D9F1",0x6E2B],
+  ["B4FA",0x6E2C],
+  ["B4F4",0x6E2D],
+  ["D9FD",0x6E2E],
+  ["B4E4",0x6E2F],
+  ["DA4A",0x6E30],
+  ["DA43",0x6E31],
+  ["B4E8",0x6E32],
+  ["D9F7",0x6E33],
+  ["B4F7",0x6E34],
+  ["DA55",0x6E35],
+  ["DA56",0x6E36],
+  ["B4E5",0x6E38],
+  ["DA48",0x6E39],
+  ["B4F9",0x6E3A],
+  ["D9FB",0x6E3B],
+  ["D9ED",0x6E3C],
+  ["D9EE",0x6E3D],
+  ["B4FD",0x6E3E],
+  ["D9F2",0x6E3F],
+  ["D9F9",0x6E40],
+  ["D9F3",0x6E41],
+  ["B4FB",0x6E43],
+  ["B544",0x6E44],
+  ["D9EF",0x6E45],
+  ["D9E8",0x6E46],
+  ["D9E9",0x6E47],
+  ["D9EB",0x6E49],
+  ["B4EA",0x6E4A],
+  ["D9F8",0x6E4B],
+  ["B4F8",0x6E4D],
+  ["B542",0x6E4E],
+  ["FDC0",0x6E4F],
+  ["FCF9",0x6E50],
+  ["D9FA",0x6E51],
+  ["DA53",0x6E52],
+  ["DA4B",0x6E53],
+  ["B4E6",0x6E54],
+  ["DA51",0x6E55],
+  ["B4F2",0x6E56],
+  ["8CDD",0x6E57],
+  ["B4F0",0x6E58],
+  ["FB7E",0x6E59],
+  ["DA57",0x6E5A],
+  ["B4EF",0x6E5B],
+  ["DA41",0x6E5C],
+  ["D9F4",0x6E5D],
+  ["D9FE",0x6E5E],
+  ["B547",0x6E5F],
+  ["DA45",0x6E60],
+  ["DA42",0x6E61],
+  ["D9F0",0x6E62],
+  ["B543",0x6E63],
+  ["DA4F",0x6E64],
+  ["DA4C",0x6E65],
+  ["DA54",0x6E66],
+  ["B4E9",0x6E67],
+  ["DA40",0x6E68],
+  ["B546",0x6E69],
+  ["DA47",0x6E6B],
+  ["B4F3",0x6E6E],
+  ["B4F6",0x6E6F],
+  ["DA46",0x6E71],
+  ["B545",0x6E72],
+  ["D9F5",0x6E73],
+  ["D5E4",0x6E74],
+  ["92B3",0x6E76],
+  ["DA50",0x6E77],
+  ["DA4E",0x6E78],
+  ["DA52",0x6E79],
+  ["FDAF",0x6E7C],
+  ["8DE1",0x6E86],
+  ["D9EC",0x6E88],
+  ["B540",0x6E89],
+  ["95D3",0x6E8B],
+  ["DE61",0x6E8D],
+  ["DE60",0x6E8E],
+  ["DE46",0x6E8F],
+  ["B7BD",0x6E90],
+  ["DE5F",0x6E92],
+  ["DE49",0x6E93],
+  ["DE4A",0x6E94],
+  ["B7C7",0x6E96],
+  ["DE68",0x6E97],
+  ["B7C2",0x6E98],
+  ["DE5E",0x6E99],
+  ["89C1",0x6E9A],
+  ["DE43",0x6E9B],
+  ["B7C8",0x6E9C],
+  ["B7BE",0x6E9D],
+  ["DE52",0x6E9E],
+  ["DE48",0x6E9F],
+  ["DE4B",0x6EA0],
+  ["DE63",0x6EA1],
+  ["B7B8",0x6EA2],
+  ["DE6A",0x6EA3],
+  ["DE62",0x6EA4],
+  ["B7C1",0x6EA5],
+  ["DE57",0x6EA6],
+  ["B7CC",0x6EA7],
+  ["B7CB",0x6EAA],
+  ["B7C5",0x6EAB],
+  ["DE69",0x6EAE],
+  ["B7B9",0x6EAF],
+  ["DE55",0x6EB0],
+  ["DE4C",0x6EB1],
+  ["DE59",0x6EB2],
+  ["DE65",0x6EB3],
+  ["B7CD",0x6EB4],
+  ["FD68",0x6EB5],
+  ["B7BB",0x6EB6],
+  ["DE54",0x6EB7],
+  ["9CB7",0x6EB8],
+  ["DE4D",0x6EB9],
+  ["B7C4",0x6EBA],
+  ["8DE3",0x6EBB],
+  ["B7C3",0x6EBC],
+  ["DE50",0x6EBD],
+  ["DE5A",0x6EBE],
+  ["DE64",0x6EBF],
+  ["DE47",0x6EC0],
+  ["DE51",0x6EC1],
+  ["B7BC",0x6EC2],
+  ["DE5B",0x6EC3],
+  ["B7C9",0x6EC4],
+  ["B7C0",0x6EC5],
+  ["DE4E",0x6EC6],
+  ["B7BF",0x6EC7],
+  ["DE45",0x6EC8],
+  ["DE53",0x6EC9],
+  ["DE67",0x6ECA],
+  ["B4FE",0x6ECB],
+  ["BAB0",0x6ECC],
+  ["DE56",0x6ECD],
+  ["E26C",0x6ECE],
+  ["DE58",0x6ECF],
+  ["DE66",0x6ED0],
+  ["B7C6",0x6ED1],
+  ["DE4F",0x6ED2],
+  ["B7BA",0x6ED3],
+  ["B7CA",0x6ED4],
+  ["BCF0",0x6ED5],
+  ["DE44",0x6ED6],
+  ["DE5D",0x6ED8],
+  ["FAC0",0x6ED9],
+  ["8DE5",0x6EDA],
+  ["FA64",0x6EDB],
+  ["DE5C",0x6EDC],
+  ["8947",0x6EDD],
+  ["8DE4",0x6EE2],
+  ["8DE7",0x6EE8],
+  ["8DE8",0x6EE9],
+  ["E2AA",0x6EEB],
+  ["BAAD",0x6EEC],
+  ["E27D",0x6EED],
+  ["E2A4",0x6EEE],
+  ["BAA2",0x6EEF],
+  ["E26E",0x6EF1],
+  ["BAAF",0x6EF2],
+  ["BA77",0x6EF4],
+  ["E26D",0x6EF5],
+  ["E2B0",0x6EF6],
+  ["BAB1",0x6EF7],
+  ["E271",0x6EF8],
+  ["E2A3",0x6EF9],
+  ["FDC7",0x6EFA],
+  ["E273",0x6EFB],
+  ["E2B3",0x6EFC],
+  ["E2AF",0x6EFD],
+  ["BA75",0x6EFE],
+  ["BAA1",0x6EFF],
+  ["E653",0x6F00],
+  ["BAAE",0x6F01],
+  ["BA7D",0x6F02],
+  ["E26F",0x6F03],
+  ["FDB0",0x6F04],
+  ["E2AE",0x6F05],
+  ["BAA3",0x6F06],
+  ["E2AB",0x6F07],
+  ["E2B8",0x6F08],
+  ["E275",0x6F09],
+  ["E27E",0x6F0A],
+  ["9445",0x6F0B],
+  ["97D6",0x6F0C],
+  ["E2B6",0x6F0D],
+  ["E2AC",0x6F0E],
+  ["BA7C",0x6F0F],
+  ["E27C",0x6F12],
+  ["BA76",0x6F13],
+  ["BA74",0x6F14],
+  ["BAA8",0x6F15],
+  ["FCC6",0x6F16],
+  ["9844",0x6F17],
+  ["E27A",0x6F18],
+  ["E277",0x6F19],
+  ["E278",0x6F1A],
+  ["E2B2",0x6F1C],
+  ["E2B7",0x6F1E],
+  ["E2B5",0x6F1F],
+  ["BA7A",0x6F20],
+  ["E2B9",0x6F21],
+  ["BA7E",0x6F22],
+  ["BAA7",0x6F23],
+  ["8DE9",0x6F24],
+  ["E270",0x6F25],
+  ["E5FA",0x6F26],
+  ["E279",0x6F27],
+  ["BA78",0x6F29],
+  ["BAAC",0x6F2A],
+  ["BAA9",0x6F2B],
+  ["BA7B",0x6F2C],
+  ["E2A5",0x6F2D],
+  ["E274",0x6F2E],
+  ["BAAA",0x6F2F],
+  ["E2A7",0x6F30],
+  ["BAA4",0x6F31],
+  ["BAA6",0x6F32],
+  ["BA73",0x6F33],
+  ["8DEA",0x6F34],
+  ["E2A9",0x6F35],
+  ["E2A1",0x6F36],
+  ["E272",0x6F37],
+  ["BAA5",0x6F38],
+  ["E2B1",0x6F39],
+  ["E2B4",0x6F3A],
+  ["E27B",0x6F3B],
+  ["E2A8",0x6F3C],
+  ["FE50",0x6F3D],
+  ["BA79",0x6F3E],
+  ["BCDF",0x6F3F],
+  ["E2A6",0x6F40],
+  ["E5F9",0x6F41],
+  ["E2AD",0x6F43],
+  ["FDCC",0x6F44],
+  ["E276",0x6F4E],
+  ["E644",0x6F4F],
+  ["E64E",0x6F50],
+  ["BCE2",0x6F51],
+  ["E64D",0x6F52],
+  ["E659",0x6F53],
+  ["BCE4",0x6F54],
+  ["E64B",0x6F55],
+  ["9DA7",0x6F56],
+  ["E64F",0x6F57],
+  ["BCEF",0x6F58],
+  ["E646",0x6F5A],
+  ["BCE7",0x6F5B],
+  ["FDCD",0x6F5C],
+  ["E652",0x6F5D],
+  ["E9F0",0x6F5E],
+  ["BCF3",0x6F5F],
+  ["BCF2",0x6F60],
+  ["E654",0x6F61],
+  ["E643",0x6F62],
+  ["E65E",0x6F63],
+  ["BCED",0x6F64],
+  ["BCE3",0x6F66],
+  ["E657",0x6F67],
+  ["E65B",0x6F69],
+  ["E660",0x6F6A],
+  ["E655",0x6F6B],
+  ["E649",0x6F6C],
+  ["BCE6",0x6F6D],
+  ["BCE9",0x6F6E],
+  ["BCF1",0x6F6F],
+  ["BCEC",0x6F70],
+  ["E64C",0x6F72],
+  ["E2A2",0x6F73],
+  ["FDCF",0x6F74],
+  ["E648",0x6F76],
+  ["E65F",0x6F77],
+  ["BCE8",0x6F78],
+  ["95D2",0x6F79],
+  ["BCEB",0x6F7A],
+  ["E661",0x6F7B],
+  ["BCE0",0x6F7C],
+  ["E656",0x6F7D],
+  ["E5FB",0x6F7E],
+  ["E65C",0x6F7F],
+  ["C0DF",0x6F80],
+  ["8DED",0x6F81],
+  ["E64A",0x6F82],
+  ["BCE1",0x6F84],
+  ["E645",0x6F85],
+  ["BCE5",0x6F86],
+  ["E5FC",0x6F87],
+  ["BAAB",0x6F88],
+  ["E641",0x6F89],
+  ["FCBA",0x6F8A],
+  ["E65A",0x6F8B],
+  ["E642",0x6F8C],
+  ["E640",0x6F8D],
+  ["BCEA",0x6F8E],
+  ["E658",0x6F90],
+  ["E5FE",0x6F92],
+  ["E651",0x6F93],
+  ["E650",0x6F94],
+  ["E65D",0x6F95],
+  ["E647",0x6F96],
+  ["BCEE",0x6F97],
+  ["FDC5",0x6F9D],
+  ["E9F3",0x6F9E],
+  ["FDD2",0x6F9F],
+  ["BF49",0x6FA0],
+  ["BEFE",0x6FA1],
+  ["EA40",0x6FA2],
+  ["E9EB",0x6FA3],
+  ["BF41",0x6FA4],
+  ["E9F7",0x6FA5],
+  ["BF48",0x6FA6],
+  ["BF43",0x6FA7],
+  ["E9F5",0x6FA8],
+  ["ED4F",0x6FA9],
+  ["E9FB",0x6FAA],
+  ["EA42",0x6FAB],
+  ["E9FA",0x6FAC],
+  ["E9E9",0x6FAD],
+  ["E9F8",0x6FAE],
+  ["EA44",0x6FAF],
+  ["EA46",0x6FB0],
+  ["BEFD",0x6FB1],
+  ["EA45",0x6FB2],
+  ["BF44",0x6FB3],
+  ["BF4A",0x6FB4],
+  ["9CDC",0x6FB5],
+  ["BF47",0x6FB6],
+  ["E9FE",0x6FB8],
+  ["BF46",0x6FB9],
+  ["E9F9",0x6FBA],
+  ["95CF",0x6FBB],
+  ["E9ED",0x6FBC],
+  ["E9F2",0x6FBD],
+  ["8DEE",0x6FBE],
+  ["E9FD",0x6FBF],
+  ["BF45",0x6FC0],
+  ["BF42",0x6FC1],
+  ["BEFC",0x6FC2],
+  ["BF40",0x6FC3],
+  ["E9F1",0x6FC4],
+  ["E5FD",0x6FC6],
+  ["E9EC",0x6FC7],
+  ["E9EF",0x6FC8],
+  ["EA41",0x6FC9],
+  ["E9F4",0x6FCA],
+  ["E9EA",0x6FCB],
+  ["ED4E",0x6FCC],
+  ["EA43",0x6FCD],
+  ["E9EE",0x6FCE],
+  ["E9FC",0x6FCF],
+  ["FDD4",0x6FD3],
+  ["ED51",0x6FD4],
+  ["C0E3",0x6FD5],
+  ["C0D7",0x6FD8],
+  ["96EC",0x6FD9],
+  ["96EB",0x6FDA],
+  ["C0DB",0x6FDB],
+  ["ED53",0x6FDC],
+  ["ED59",0x6FDD],
+  ["ED57",0x6FDE],
+  ["C0D9",0x6FDF],
+  ["C0DA",0x6FE0],
+  ["C0E1",0x6FE1],
+  ["ED5A",0x6FE2],
+  ["ED52",0x6FE3],
+  ["C0DC",0x6FE4],
+  ["ED56",0x6FE6],
+  ["ED55",0x6FE7],
+  ["ED5B",0x6FE8],
+  ["C0E2",0x6FE9],
+  ["C0DD",0x6FEB],
+  ["C0E0",0x6FEC],
+  ["ED54",0x6FED],
+  ["C0E4",0x6FEE],
+  ["C0DE",0x6FEF],
+  ["C0E5",0x6FF0],
+  ["C0D8",0x6FF1],
+  ["ED58",0x6FF2],
+  ["ED50",0x6FF4],
+  ["90B6",0x6FF6],
+  ["EFF7",0x6FF7],
+  ["FDC3",0x6FF8],
+  ["C271",0x6FFA],
+  ["EFF4",0x6FFB],
+  ["EFF6",0x6FFC],
+  ["C26F",0x6FFE],
+  ["EFF2",0x6FFF],
+  ["EFF3",0x7000],
+  ["EFEE",0x7001],
+  ["98AB",0x7003],
+  ["E9F6",0x7004],
+  ["EFEF",0x7005],
+  ["C270",0x7006],
+  ["EFEB",0x7007],
+  ["C26D",0x7009],
+  ["EFF8",0x700A],
+  ["C26E",0x700B],
+  ["EFEC",0x700C],
+  ["EFED",0x700D],
+  ["EFF1",0x700E],
+  ["C273",0x700F],
+  ["C272",0x7011],
+  ["EFF0",0x7014],
+  ["C378",0x7015],
+  ["F25F",0x7016],
+  ["F265",0x7017],
+  ["C379",0x7018],
+  ["F25C",0x7019],
+  ["C376",0x701A],
+  ["C373",0x701B],
+  ["F267",0x701C],
+  ["C377",0x701D],
+  ["96EE",0x701E],
+  ["C374",0x701F],
+  ["F25E",0x7020],
+  ["F261",0x7021],
+  ["F262",0x7022],
+  ["F263",0x7023],
+  ["F266",0x7024],
+  ["EFF5",0x7026],
+  ["F25D",0x7027],
+  ["C375",0x7028],
+  ["F264",0x7029],
+  ["F268",0x702A],
+  ["F260",0x702B],
+  ["8DF4",0x702C],
+  ["F45D",0x702F],
+  ["C46A",0x7030],
+  ["F460",0x7031],
+  ["C46B",0x7032],
+  ["F468",0x7033],
+  ["F45F",0x7034],
+  ["F45C",0x7035],
+  ["F45E",0x7037],
+  ["F462",0x7038],
+  ["F465",0x7039],
+  ["F464",0x703A],
+  ["F467",0x703B],
+  ["F45B",0x703C],
+  ["C469",0x703E],
+  ["F463",0x703F],
+  ["F466",0x7040],
+  ["F469",0x7041],
+  ["F461",0x7042],
+  ["F5D3",0x7043],
+  ["F5D4",0x7044],
+  ["F5D8",0x7045],
+  ["F5D9",0x7046],
+  ["F5D6",0x7048],
+  ["F5D7",0x7049],
+  ["F5D5",0x704A],
+  ["FDE0",0x704B],
+  ["C4E9",0x704C],
+  ["8C67",0x704D],
+  ["8DF6",0x7050],
+  ["C578",0x7051],
+  ["F6EB",0x7052],
+  ["8DF7",0x7054],
+  ["F6E8",0x7055],
+  ["F6E9",0x7056],
+  ["F6EA",0x7057],
+  ["C579",0x7058],
+  ["F7E5",0x705A],
+  ["F7E4",0x705B],
+  ["8FFA",0x705C],
+  ["F8AF",0x705D],
+  ["C5F4",0x705E],
+  ["F8AD",0x705F],
+  ["F8B0",0x7060],
+  ["F8AE",0x7061],
+  ["F8F5",0x7062],
+  ["C657",0x7063],
+  ["C665",0x7064],
+  ["F9A3",0x7065],
+  ["F96C",0x7066],
+  ["97D0",0x7067],
+  ["F9A2",0x7068],
+  ["F9D0",0x7069],
+  ["F9D1",0x706A],
+  ["A4F5",0x706B],
+  ["8BD2",0x706C],
+  ["8DF8",0x706F],
+  ["A6C7",0x7070],
+  ["CA41",0x7071],
+  ["CB5E",0x7074],
+  ["90D9",0x7075],
+  ["A85F",0x7076],
+  ["8C47",0x7077],
+  ["A862",0x7078],
+  ["FAF0",0x7079],
+  ["CB5F",0x707A],
+  ["A860",0x707C],
+  ["A861",0x707D],
+  ["FDE1",0x707E],
+  ["8DF9",0x707F],
+  ["FDE3",0x7081],
+  ["CD58",0x7082],
+  ["CD5A",0x7083],
+  ["CD55",0x7084],
+  ["CD52",0x7085],
+  ["CD54",0x7086],
+  ["8DFA",0x7089],
+  ["AAA4",0x708A],
+  ["FB63",0x708B],
+  ["AAA2",0x708E],
+  ["90A6",0x708F],
+  ["CD56",0x7091],
+  ["AAA3",0x7092],
+  ["CD53",0x7093],
+  ["CD50",0x7094],
+  ["AAA1",0x7095],
+  ["CD57",0x7096],
+  ["CD51",0x7098],
+  ["AAA5",0x7099],
+  ["CD59",0x709A],
+  ["CFAF",0x709F],
+  ["9970",0x70A0],
+  ["CFB3",0x70A1],
+  ["91EB",0x70A3],
+  ["ACB7",0x70A4],
+  ["9770",0x70A5],
+  ["986F",0x70A6],
+  ["FDE2",0x70A7],
+  ["CFB6",0x70A9],
+  ["ACAF",0x70AB],
+  ["ACB2",0x70AC],
+  ["ACB4",0x70AD],
+  ["ACB6",0x70AE],
+  ["ACB3",0x70AF],
+  ["CFB2",0x70B0],
+  ["CFB1",0x70B1],
+  ["ACB1",0x70B3],
+  ["CFB4",0x70B4],
+  ["CFB5",0x70B5],
+  ["CFAE",0x70B7],
+  ["ACB5",0x70B8],
+  ["98F2",0x70B9],
+  ["ACB0",0x70BA],
+  ["9AFC",0x70BB],
+  ["896C",0x70BC],
+  ["FDFD",0x70BD],
+  ["CFB0",0x70BE],
+  ["995E",0x70C0],
+  ["95BD",0x70C4],
+  ["D277",0x70C5],
+  ["D278",0x70C6],
+  ["D279",0x70C7],
+  ["AF50",0x70C8],
+  ["AF4C",0x70CA],
+  ["D26E",0x70CB],
+  ["FDE4",0x70CC],
+  ["D276",0x70CD],
+  ["D27B",0x70CE],
+  ["AF51",0x70CF],
+  ["91E6",0x70D0],
+  ["D26C",0x70D1],
+  ["D272",0x70D2],
+  ["D26B",0x70D3],
+  ["D275",0x70D4],
+  ["FDE5",0x70D5],
+  ["FDE6",0x70D6],
+  ["D271",0x70D7],
+  ["AF4D",0x70D8],
+  ["AF4F",0x70D9],
+  ["D27A",0x70DA],
+  ["D26A",0x70DC],
+  ["D26D",0x70DD],
+  ["D273",0x70DE],
+  ["FDE7",0x70DF],
+  ["D274",0x70E0],
+  ["D27C",0x70E1],
+  ["D270",0x70E2],
+  ["AF4E",0x70E4],
+  ["B26D",0x70EF],
+  ["D64E",0x70F0],
+  ["9454",0x70F1],
+  ["D650",0x70F3],
+  ["D64C",0x70F4],
+  ["99B8",0x70F5],
+  ["D658",0x70F6],
+  ["D64A",0x70F7],
+  ["D657",0x70F8],
+  ["B269",0x70F9],
+  ["D648",0x70FA],
+  ["DA5B",0x70FB],
+  ["D652",0x70FC],
+  ["B26C",0x70FD],
+  ["97E9",0x70FE],
+  ["D653",0x70FF],
+  ["D656",0x7100],
+  ["D65A",0x7102],
+  ["D64F",0x7104],
+  ["9346",0x7105],
+  ["D654",0x7106],
+  ["B26A",0x7109],
+  ["B26B",0x710A],
+  ["D659",0x710B],
+  ["D64D",0x710C],
+  ["D649",0x710D],
+  ["D65B",0x710E],
+  ["D651",0x7110],
+  ["D655",0x7113],
+  ["D64B",0x7117],
+  ["B548",0x7119],
+  ["B549",0x711A],
+  ["DA65",0x711B],
+  ["B54F",0x711C],
+  ["9863",0x711D],
+  ["DA59",0x711E],
+  ["DA62",0x711F],
+  ["DA58",0x7120],
+  ["B54C",0x7121],
+  ["DA60",0x7122],
+  ["DA5E",0x7123],
+  ["DA5F",0x7125],
+  ["B54A",0x7126],
+  ["DA63",0x7128],
+  ["95BC",0x7129],
+  ["FDED",0x712B],
+  ["FDF7",0x712C],
+  ["DA5C",0x712E],
+  ["DA5A",0x712F],
+  ["B54B",0x7130],
+  ["DA5D",0x7131],
+  ["DA61",0x7132],
+  ["9870",0x7133],
+  ["96F6",0x7134],
+  ["8EA9",0x7135],
+  ["B54D",0x7136],
+  ["DA64",0x713A],
+  ["9451",0x713B],
+  ["8E43",0x713E],
+  ["8B5A",0x7140],
+  ["DE70",0x7141],
+  ["DE77",0x7142],
+  ["DE79",0x7143],
+  ["DEA1",0x7144],
+  ["FDEE",0x7145],
+  ["B7DA",0x7146],
+  ["DE6B",0x7147],
+  ["B7D2",0x7149],
+  ["FDF0",0x714A],
+  ["DE7A",0x714B],
+  ["B7D7",0x714C],
+  ["DEA2",0x714D],
+  ["B7CE",0x714E],
+  ["FDF4",0x714F],
+  ["DE7D",0x7150],
+  ["9BF5",0x7151],
+  ["DE6D",0x7152],
+  ["DE7E",0x7153],
+  ["DE6C",0x7154],
+  ["B7DC",0x7156],
+  ["8CEE",0x7157],
+  ["DE78",0x7158],
+  ["B7CF",0x7159],
+  ["DEA3",0x715A],
+  ["B7D4",0x715C],
+  ["DE71",0x715D],
+  ["B7D9",0x715E],
+  ["DE7C",0x715F],
+  ["DE6F",0x7160],
+  ["DE76",0x7161],
+  ["DE72",0x7162],
+  ["DE6E",0x7163],
+  ["B7D1",0x7164],
+  ["B7D8",0x7165],
+  ["B7D6",0x7166],
+  ["B7D3",0x7167],
+  ["B7DB",0x7168],
+  ["B7D0",0x7169],
+  ["DE75",0x716A],
+  ["977E",0x716B],
+  ["B7D5",0x716C],
+  ["B54E",0x716E],
+  ["DE7B",0x7170],
+  ["9BD5",0x7171],
+  ["DE73",0x7172],
+  ["9AC3",0x7173],
+  ["97C8",0x7175],
+  ["A0DB",0x7176],
+  ["91D0",0x7177],
+  ["DE74",0x7178],
+  ["9FE4",0x717A],
+  ["E2C1",0x717B],
+  ["8FDD",0x717C],
+  ["BAB4",0x717D],
+  ["91E9",0x717E],
+  ["E2BD",0x7180],
+  ["E2C3",0x7181],
+  ["E2BF",0x7182],
+  ["BAB6",0x7184],
+  ["E2BE",0x7185],
+  ["E2C2",0x7186],
+  ["E2BA",0x7187],
+  ["98E0",0x7188],
+  ["E2BC",0x7189],
+  ["BAB5",0x718A],
+  ["92CA",0x718C],
+  ["9857",0x718E],
+  ["E2C0",0x718F],
+  ["E2BB",0x7190],
+  ["8C51",0x7191],
+  ["BAB7",0x7192],
+  ["BAB2",0x7194],
+  ["FDEB",0x7196],
+  ["E2C4",0x7197],
+  ["9B49",0x7198],
+  ["BAB3",0x7199],
+  ["E667",0x719A],
+  ["E664",0x719B],
+  ["E670",0x719C],
+  ["E66A",0x719D],
+  ["E66C",0x719E],
+  ["BCF4",0x719F],
+  ["E666",0x71A0],
+  ["E66E",0x71A1],
+  ["9D76",0x71A2],
+  ["9EAF",0x71A3],
+  ["E66D",0x71A4],
+  ["E66B",0x71A5],
+  ["E671",0x71A7],
+  ["BCF7",0x71A8],
+  ["E668",0x71A9],
+  ["E66F",0x71AA],
+  ["BCF5",0x71AC],
+  ["9CCC",0x71AD],
+  ["E663",0x71AF],
+  ["E665",0x71B0],
+  ["BCF6",0x71B1],
+  ["E662",0x71B2],
+  ["E672",0x71B3],
+  ["FDEA",0x71B4],
+  ["E669",0x71B5],
+  ["8DF1",0x71B7],
+  ["EA4A",0x71B8],
+  ["BF51",0x71B9],
+  ["FDFB",0x71BA],
+  ["EA55",0x71BC],
+  ["EA53",0x71BD],
+  ["BF4B",0x71BE],
+  ["EA49",0x71BF],
+  ["EA4C",0x71C0],
+  ["EA4D",0x71C1],
+  ["EA48",0x71C2],
+  ["BF55",0x71C3],
+  ["BF56",0x71C4],
+  ["EA47",0x71C5],
+  ["EA56",0x71C6],
+  ["EA51",0x71C7],
+  ["BF4F",0x71C8],
+  ["BF4C",0x71C9],
+  ["EA50",0x71CA],
+  ["EA4E",0x71CB],
+  ["BF52",0x71CE],
+  ["EA52",0x71CF],
+  ["BF4D",0x71D0],
+  ["8E53",0x71D1],
+  ["BF4E",0x71D2],
+  ["EA4F",0x71D4],
+  ["BF50",0x71D5],
+  ["EA4B",0x71D6],
+  ["EA54",0x71D8],
+  ["BF53",0x71D9],
+  ["EA57",0x71DA],
+  ["EA58",0x71DB],
+  ["BF54",0x71DC],
+  ["FACF",0x71DD],
+  ["C0E7",0x71DF],
+  ["C0EE",0x71E0],
+  ["ED5C",0x71E1],
+  ["ED62",0x71E2],
+  ["ED60",0x71E4],
+  ["C0EA",0x71E5],
+  ["C0E9",0x71E6],
+  ["C0E6",0x71E7],
+  ["ED5E",0x71E8],
+  ["96F9",0x71EB],
+  ["C0EC",0x71EC],
+  ["C0EB",0x71ED],
+  ["C0E8",0x71EE],
+  ["ED61",0x71F0],
+  ["ED5D",0x71F1],
+  ["ED5F",0x71F2],
+  ["C0ED",0x71F4],
+  ["98BF",0x71F5],
+  ["9E49",0x71F6],
+  ["C277",0x71F8],
+  ["EFFB",0x71F9],
+  ["C274",0x71FB],
+  ["C275",0x71FC],
+  ["EFFD",0x71FD],
+  ["C276",0x71FE],
+  ["EFFA",0x71FF],
+  ["8CA7",0x7200],
+  ["EFF9",0x7201],
+  ["F26C",0x7202],
+  ["EFFC",0x7203],
+  ["F26D",0x7205],
+  ["C37A",0x7206],
+  ["F26B",0x7207],
+  ["9BCA",0x7209],
+  ["F26A",0x720A],
+  ["F269",0x720C],
+  ["C37B",0x720D],
+  ["FDFE",0x720E],
+  ["92DC",0x720F],
+  ["C46C",0x7210],
+  ["F46A",0x7213],
+  ["F46B",0x7214],
+  ["FE41",0x7215],
+  ["91CC",0x7216],
+  ["91E2",0x7217],
+  ["F5DC",0x7219],
+  ["F5DB",0x721A],
+  ["C4EA",0x721B],
+  ["F5DA",0x721D],
+  ["F6EC",0x721E],
+  ["F6ED",0x721F],
+  ["F7E6",0x7222],
+  ["F8B1",0x7223],
+  ["FE44",0x7224],
+  ["875F",0x7225],
+  ["F8F6",0x7226],
+  ["F9BC",0x7227],
+  ["C679",0x7228],
+  ["F9C6",0x7229],
+  ["A4F6",0x722A],
+  ["8BD3",0x722B],
+  ["AAA6",0x722C],
+  ["AAA7",0x722D],
+  ["FE47",0x722E],
+  ["ACB8",0x7230],
+  ["C0EF",0x7235],
+  ["A4F7",0x7236],
+  ["AAA8",0x7238],
+  ["AF52",0x7239],
+  ["B7DD",0x723A],
+  ["A4F8",0x723B],
+  ["B26E",0x723D],
+  ["BAB8",0x723E],
+  ["C962",0x723F],
+  ["FE48",0x7240],
+  ["CFB7",0x7241],
+  ["D27D",0x7242],
+  ["E2C5",0x7244],
+  ["C0F0",0x7246],
+  ["A4F9",0x7247],
+  ["AAA9",0x7248],
+  ["CFB8",0x7249],
+  ["CFB9",0x724A],
+  ["DA66",0x724B],
+  ["B550",0x724C],
+  ["DEA4",0x724F],
+  ["9455",0x7250],
+  ["B7DE",0x7252],
+  ["E2C6",0x7253],
+  ["FE4B",0x7255],
+  ["BCF8",0x7256],
+  ["FE4C",0x7257],
+  ["C37C",0x7258],
+  ["A4FA",0x7259],
+  ["DA67",0x725A],
+  ["A4FB",0x725B],
+  ["8DBF",0x725C],
+  ["A6C9",0x725D],
+  ["CA42",0x725E],
+  ["A6C8",0x725F],
+  ["A865",0x7260],
+  ["A864",0x7261],
+  ["A863",0x7262],
+  ["CB60",0x7263],
+  ["9E78",0x7266],
+  ["AAAA",0x7267],
+  ["AAAB",0x7269],
+  ["CD5B",0x726A],
+  ["CFBA",0x726C],
+  ["CFBD",0x726E],
+  ["ACBA",0x726F],
+  ["CFBB",0x7270],
+  ["ACB9",0x7272],
+  ["CFBC",0x7273],
+  ["ACBB",0x7274],
+  ["D2A2",0x7276],
+  ["D2A1",0x7277],
+  ["D27E",0x7278],
+  ["AF53",0x7279],
+  ["D65D",0x727B],
+  ["D65E",0x727C],
+  ["B26F",0x727D],
+  ["D65C",0x727E],
+  ["D65F",0x727F],
+  ["B552",0x7280],
+  ["B270",0x7281],
+  ["FE51",0x7282],
+  ["B551",0x7284],
+  ["DA6B",0x7285],
+  ["DA6A",0x7286],
+  ["9456",0x7287],
+  ["DA68",0x7288],
+  ["DA69",0x7289],
+  ["DA6C",0x728B],
+  ["DEA6",0x728C],
+  ["DEA5",0x728D],
+  ["DEA9",0x728E],
+  ["9D61",0x728F],
+  ["DEA8",0x7290],
+  ["DEA7",0x7291],
+  ["BAB9",0x7292],
+  ["E2C9",0x7293],
+  ["9457",0x7294],
+  ["E2C8",0x7295],
+  ["BABA",0x7296],
+  ["E2C7",0x7297],
+  ["E673",0x7298],
+  ["E674",0x729A],
+  ["BCF9",0x729B],
+  ["EA59",0x729D],
+  ["EA5A",0x729E],
+  ["9966",0x729F],
+  ["F272",0x72A1],
+  ["C37D",0x72A2],
+  ["F271",0x72A3],
+  ["F270",0x72A4],
+  ["F26E",0x72A5],
+  ["F26F",0x72A6],
+  ["C4EB",0x72A7],
+  ["F46C",0x72A8],
+  ["F6EE",0x72A9],
+  ["F8F7",0x72AA],
+  ["A4FC",0x72AC],
+  ["8BD5",0x72AD],
+  ["C9A5",0x72AE],
+  ["A5C7",0x72AF],
+  ["C9A6",0x72B0],
+  ["A069",0x72B2],
+  ["CA43",0x72B4],
+  ["CA44",0x72B5],
+  ["CB66",0x72BA],
+  ["CB62",0x72BD],
+  ["CB61",0x72BF],
+  ["AAAC",0x72C0],
+  ["CB65",0x72C1],
+  ["A867",0x72C2],
+  ["CB63",0x72C3],
+  ["A866",0x72C4],
+  ["CB67",0x72C5],
+  ["CB64",0x72C6],
+  ["CD5F",0x72C9],
+  ["CFBE",0x72CA],
+  ["CD5D",0x72CB],
+  ["CD64",0x72CC],
+  ["98B4",0x72CD],
+  ["AAAD",0x72CE],
+  ["AAB0",0x72D0],
+  ["CD65",0x72D1],
+  ["CD61",0x72D2],
+  ["CD62",0x72D4],
+  ["CD5C",0x72D6],
+  ["AAAF",0x72D7],
+  ["CD5E",0x72D8],
+  ["AAAE",0x72D9],
+  ["CD63",0x72DA],
+  ["CD60",0x72DC],
+  ["CFC2",0x72DF],
+  ["ACBD",0x72E0],
+  ["ACBE",0x72E1],
+  ["A049",0x72E2],
+  ["CFC5",0x72E3],
+  ["CFBF",0x72E4],
+  ["CFC4",0x72E6],
+  ["CFC0",0x72E8],
+  ["ACBC",0x72E9],
+  ["CFC3",0x72EA],
+  ["CFC1",0x72EB],
+  ["D2A8",0x72F3],
+  ["D2A5",0x72F4],
+  ["D2A7",0x72F6],
+  ["AF58",0x72F7],
+  ["AF57",0x72F8],
+  ["AF55",0x72F9],
+  ["D2A4",0x72FA],
+  ["D2A9",0x72FB],
+  ["AF54",0x72FC],
+  ["AF56",0x72FD],
+  ["D2A6",0x72FE],
+  ["D667",0x72FF],
+  ["D2A3",0x7300],
+  ["D2AA",0x7301],
+  ["A04C",0x7302],
+  ["9E65",0x7304],
+  ["D662",0x7307],
+  ["D666",0x7308],
+  ["D665",0x730A],
+  ["DA6E",0x730B],
+  ["DA79",0x730C],
+  ["D668",0x730F],
+  ["98B5",0x7310],
+  ["D663",0x7311],
+  ["DA6D",0x7312],
+  ["B274",0x7313],
+  ["B273",0x7316],
+  ["D661",0x7317],
+  ["D664",0x7318],
+  ["B275",0x7319],
+  ["B272",0x731B],
+  ["B271",0x731C],
+  ["D660",0x731D],
+  ["D669",0x731E],
+  ["DA70",0x7322],
+  ["DA77",0x7323],
+  ["B554",0x7325],
+  ["DA76",0x7326],
+  ["DA73",0x7327],
+  ["FE58",0x7328],
+  ["B556",0x7329],
+  ["9975",0x732A],
+  ["FE53",0x732B],
+  ["A065",0x732C],
+  ["DA75",0x732D],
+  ["FE59",0x732E],
+  ["DA6F",0x7330],
+  ["DA71",0x7331],
+  ["DA74",0x7332],
+  ["DA72",0x7333],
+  ["B555",0x7334],
+  ["DA78",0x7335],
+  ["B553",0x7336],
+  ["B7DF",0x7337],
+  ["98B7",0x7338],
+  ["98B8",0x7339],
+  ["DEAD",0x733A],
+  ["DEAC",0x733B],
+  ["DEAA",0x733C],
+  ["B7E2",0x733E],
+  ["B7E1",0x733F],
+  ["DEAE",0x7340],
+  ["98BA",0x7341],
+  ["DEAB",0x7342],
+  ["E2CA",0x7343],
+  ["BABB",0x7344],
+  ["B7E0",0x7345],
+  ["98BB",0x7348],
+  ["DEB0",0x7349],
+  ["DEAF",0x734A],
+  ["E2CD",0x734C],
+  ["E2CB",0x734D],
+  ["BCFA",0x734E],
+  ["9FBC",0x734F],
+  ["BABC",0x7350],
+  ["E2CC",0x7351],
+  ["E676",0x7352],
+  ["BCFB",0x7357],
+  ["E675",0x7358],
+  ["E67E",0x7359],
+  ["E67D",0x735A],
+  ["E67B",0x735B],
+  ["E67A",0x735D],
+  ["E677",0x735E],
+  ["E678",0x735F],
+  ["E679",0x7360],
+  ["E67C",0x7361],
+  ["E6A1",0x7362],
+  ["EA5F",0x7365],
+  ["EA5C",0x7366],
+  ["EA5D",0x7367],
+  ["BF57",0x7368],
+  ["EA5B",0x7369],
+  ["EA61",0x736A],
+  ["EA60",0x736B],
+  ["EA5E",0x736C],
+  ["ED64",0x736E],
+  ["ED65",0x736F],
+  ["C0F1",0x7370],
+  ["A04A",0x7371],
+  ["C0F2",0x7372],
+  ["ED63",0x7373],
+  ["9EC7",0x7374],
+  ["C279",0x7375],
+  ["EFFE",0x7376],
+  ["C278",0x7377],
+  ["C37E",0x7378],
+  ["C3A1",0x737A],
+  ["C46D",0x737B],
+  ["F46E",0x737C],
+  ["F46D",0x737D],
+  ["F5DD",0x737E],
+  ["F6EF",0x737F],
+  ["C57A",0x7380],
+  ["F7E8",0x7381],
+  ["F7E7",0x7382],
+  ["F7E9",0x7383],
+  ["A5C8",0x7384],
+  ["CFC6",0x7385],
+  ["AF59",0x7386],
+  ["B276",0x7387],
+  ["D66A",0x7388],
+  ["A5C9",0x7389],
+  ["C9A7",0x738A],
+  ["A4FD",0x738B],
+  ["8CA9",0x738C],
+  ["CA45",0x738E],
+  ["98AE",0x738F],
+  ["CB6C",0x7392],
+  ["CB6A",0x7393],
+  ["CB6B",0x7394],
+  ["CB68",0x7395],
+  ["A868",0x7396],
+  ["CB69",0x7397],
+  ["92D6",0x7398],
+  ["FAE1",0x739C],
+  ["CD6D",0x739D],
+  ["91D4",0x739E],
+  ["AAB3",0x739F],
+  ["CD6B",0x73A0],
+  ["CD67",0x73A1],
+  ["CD6A",0x73A2],
+  ["CD66",0x73A4],
+  ["AAB5",0x73A5],
+  ["CD69",0x73A6],
+  ["FADE",0x73A7],
+  ["AAB2",0x73A8],
+  ["AAB1",0x73A9],
+  ["FE5B",0x73AA],
+  ["AAB4",0x73AB],
+  ["CD6C",0x73AC],
+  ["CD68",0x73AD],
+  ["ACC2",0x73B2],
+  ["ACC5",0x73B3],
+  ["CFCE",0x73B4],
+  ["CFCD",0x73B5],
+  ["CFCC",0x73B6],
+  ["ACBF",0x73B7],
+  ["CFD5",0x73B8],
+  ["CFCB",0x73B9],
+  ["8C53",0x73BA],
+  ["ACC1",0x73BB],
+  ["D2AF",0x73BC],
+  ["CFD2",0x73BE],
+  ["CFD0",0x73BF],
+  ["ACC4",0x73C0],
+  ["CFC8",0x73C2],
+  ["CFD3",0x73C3],
+  ["CFCA",0x73C5],
+  ["CFD4",0x73C6],
+  ["CFD1",0x73C7],
+  ["CFC9",0x73C8],
+  ["FE5E",0x73C9],
+  ["ACC0",0x73CA],
+  ["CFD6",0x73CB],
+  ["CFC7",0x73CC],
+  ["ACC3",0x73CD],
+  ["FBD7",0x73CE],
+  ["FE5A",0x73CF],
+  ["94C5",0x73D0],
+  ["D2B4",0x73D2],
+  ["D2AB",0x73D3],
+  ["D2B6",0x73D4],
+  ["FACA",0x73D5],
+  ["D2AE",0x73D6],
+  ["D2B9",0x73D7],
+  ["D2BA",0x73D8],
+  ["D2AC",0x73D9],
+  ["D2B8",0x73DA],
+  ["D2B5",0x73DB],
+  ["D2B3",0x73DC],
+  ["D2B7",0x73DD],
+  ["AF5F",0x73DE],
+  ["AF5D",0x73E0],
+  ["98C1",0x73E1],
+  ["975C",0x73E2],
+  ["D2B1",0x73E3],
+  ["FE74",0x73E4],
+  ["D2AD",0x73E5],
+  ["9773",0x73E6],
+  ["D2B0",0x73E7],
+  ["D2BB",0x73E8],
+  ["D2B2",0x73E9],
+  ["AF5E",0x73EA],
+  ["CFCF",0x73EB],
+  ["AF5A",0x73ED],
+  ["AF5C",0x73EE],
+  ["FA46",0x73EF],
+  ["9764",0x73F3],
+  ["D678",0x73F4],
+  ["D66D",0x73F5],
+  ["D66B",0x73F6],
+  ["FE68",0x73F7],
+  ["D66C",0x73F8],
+  ["964E",0x73F9],
+  ["D673",0x73FA],
+  ["9765",0x73FB],
+  ["D674",0x73FC],
+  ["D670",0x73FD],
+  ["B27B",0x73FE],
+  ["D675",0x73FF],
+  ["D672",0x7400],
+  ["D66F",0x7401],
+  ["8C5A",0x7402],
+  ["B279",0x7403],
+  ["D66E",0x7404],
+  ["B277",0x7405],
+  ["B27A",0x7406],
+  ["D671",0x7407],
+  ["D679",0x7408],
+  ["AF5B",0x7409],
+  ["B278",0x740A],
+  ["D677",0x740B],
+  ["D676",0x740C],
+  ["B27C",0x740D],
+  ["89A1",0x7411],
+  ["95FA",0x7412],
+  ["92D4",0x7414],
+  ["FE69",0x7415],
+  ["DA7E",0x7416],
+  ["FB45",0x7417],
+  ["98C8",0x7419],
+  ["DAA1",0x741A],
+  ["B560",0x741B],
+  ["90EF",0x741C],
+  ["DAA7",0x741D],
+  ["98C9",0x741E],
+  ["98CA",0x741F],
+  ["DAA9",0x7420],
+  ["DAA2",0x7421],
+  ["B55A",0x7422],
+  ["DAA6",0x7423],
+  ["DAA5",0x7424],
+  ["B55B",0x7425],
+  ["B561",0x7426],
+  ["B562",0x7428],
+  ["DAA8",0x7429],
+  ["B558",0x742A],
+  ["DA7D",0x742B],
+  ["DA7B",0x742C],
+  ["DAA3",0x742D],
+  ["DA7A",0x742E],
+  ["B55F",0x742F],
+  ["DA7C",0x7430],
+  ["DAA4",0x7431],
+  ["DAAA",0x7432],
+  ["B559",0x7433],
+  ["B55E",0x7434],
+  ["B55C",0x7435],
+  ["B55D",0x7436],
+  ["946D",0x7437],
+  ["94B7",0x7438],
+  ["FE6C",0x7439],
+  ["B557",0x743A],
+  ["946B",0x743C],
+  ["B7E9",0x743F],
+  ["DEB7",0x7440],
+  ["B7E8",0x7441],
+  ["DEBB",0x7442],
+  ["92FC",0x7443],
+  ["DEB1",0x7444],
+  ["95EB",0x7445],
+  ["DEBC",0x7446],
+  ["FE73",0x7447],
+  ["976E",0x7448],
+  ["FE5F",0x7449],
+  ["DEB2",0x744A],
+  ["DEB3",0x744B],
+  ["DEBD",0x744D],
+  ["DEBA",0x744E],
+  ["DEB8",0x744F],
+  ["DEB9",0x7450],
+  ["DEB5",0x7451],
+  ["DEB4",0x7452],
+  ["FDBD",0x7453],
+  ["DEBE",0x7454],
+  ["B7E5",0x7455],
+  ["92D5",0x7456],
+  ["DEB6",0x7457],
+  ["B7EA",0x7459],
+  ["B7E4",0x745A],
+  ["B7EB",0x745B],
+  ["B7EC",0x745C],
+  ["FEB9",0x745D],
+  ["B7E7",0x745E],
+  ["B7E6",0x745F],
+  ["FE71",0x7460],
+  ["8778",0x7461],
+  ["E2CE",0x7462],
+  ["BABE",0x7463],
+  ["BABD",0x7464],
+  ["FBBB",0x7465],
+  ["E2D3",0x7467],
+  ["947A",0x7468],
+  ["BCFC",0x7469],
+  ["BABF",0x746A],
+  ["95FB",0x746B],
+  ["FE77",0x746C],
+  ["BAC1",0x746D],
+  ["E2D4",0x746E],
+  ["B7E3",0x746F],
+  ["BAC0",0x7470],
+  ["E2D0",0x7471],
+  ["E2D2",0x7472],
+  ["E2CF",0x7473],
+  ["FE79",0x7474],
+  ["E2D1",0x7475],
+  ["FE75",0x7476],
+  ["E6AB",0x7479],
+  ["945D",0x747A],
+  ["E6AA",0x747C],
+  ["E6A7",0x747D],
+  ["BD40",0x747E],
+  ["EA62",0x747F],
+  ["BD41",0x7480],
+  ["E6A6",0x7481],
+  ["FE7C",0x7482],
+  ["BCFE",0x7483],
+  ["E6A8",0x7485],
+  ["E6A5",0x7486],
+  ["E6A2",0x7487],
+  ["E6A9",0x7488],
+  ["E6A3",0x7489],
+  ["E6A4",0x748A],
+  ["BCFD",0x748B],
+  ["9344",0x748C],
+  ["8EA6",0x748D],
+  ["ED69",0x7490],
+  ["EA66",0x7492],
+  ["EA65",0x7494],
+  ["EA67",0x7495],
+  ["ED66",0x7497],
+  ["BF5A",0x7498],
+  ["92D3",0x7499],
+  ["EA63",0x749A],
+  ["94B8",0x749B],
+  ["BF58",0x749C],
+  ["8779",0x749D],
+  ["BF5C",0x749E],
+  ["BF5B",0x749F],
+  ["EA64",0x74A0],
+  ["EA68",0x74A1],
+  ["BF59",0x74A3],
+  ["FC71",0x74A4],
+  ["ED6D",0x74A5],
+  ["C0F5",0x74A6],
+  ["C27A",0x74A7],
+  ["C0F6",0x74A8],
+  ["C0F3",0x74A9],
+  ["ED6A",0x74AA],
+  ["ED68",0x74AB],
+  ["ED6B",0x74AD],
+  ["ED6E",0x74AF],
+  ["C0F4",0x74B0],
+  ["ED6C",0x74B1],
+  ["ED67",0x74B2],
+  ["975E",0x74B4],
+  ["F042",0x74B5],
+  ["F045",0x74B6],
+  ["F275",0x74B7],
+  ["F040",0x74B8],
+  ["8CAD",0x74B9],
+  ["F46F",0x74BA],
+  ["F046",0x74BB],
+  ["C3A2",0x74BD],
+  ["F044",0x74BE],
+  ["C27B",0x74BF],
+  ["F041",0x74C0],
+  ["F043",0x74C1],
+  ["F047",0x74C2],
+  ["F276",0x74C3],
+  ["F274",0x74C5],
+  ["FEA7",0x74C8],
+  ["C3A3",0x74CA],
+  ["F273",0x74CB],
+  ["946A",0x74CC],
+  ["C46E",0x74CF],
+  ["93E3",0x74D0],
+  ["98CF",0x74D3],
+  ["C4ED",0x74D4],
+  ["F6F1",0x74D5],
+  ["C4EC",0x74D6],
+  ["F6F3",0x74D7],
+  ["F6F0",0x74D8],
+  ["F6F2",0x74D9],
+  ["C5D0",0x74DA],
+  ["F8B2",0x74DB],
+  ["A5CA",0x74DC],
+  ["CD6E",0x74DD],
+  ["D2BC",0x74DE],
+  ["D2BD",0x74DF],
+  ["B27D",0x74E0],
+  ["DEBF",0x74E1],
+  ["BF5D",0x74E2],
+  ["C3A4",0x74E3],
+  ["C57B",0x74E4],
+  ["F8B3",0x74E5],
+  ["A5CB",0x74E6],
+  ["A0D9",0x74E7],
+  ["CD6F",0x74E8],
+  ["A260",0x74E9],
+  ["CFD7",0x74EC],
+  ["CFD8",0x74EE],
+  ["A0BF",0x74F0],
+  ["A04D",0x74F1],
+  ["A0B8",0x74F2],
+  ["D2BE",0x74F4],
+  ["D2BF",0x74F5],
+  ["B27E",0x74F6],
+  ["B2A1",0x74F7],
+  ["A0CE",0x74F8],
+  ["DAAB",0x74FB],
+  ["DEC2",0x74FD],
+  ["DEC1",0x74FE],
+  ["DEC0",0x74FF],
+  ["E2D5",0x7500],
+  ["E2D6",0x7502],
+  ["E2D7",0x7503],
+  ["BAC2",0x7504],
+  ["A0B7",0x7505],
+  ["E6AD",0x7507],
+  ["E6AC",0x7508],
+  ["EA69",0x750B],
+  ["BF5E",0x750C],
+  ["BF5F",0x750D],
+  ["FEA9",0x750E],
+  ["ED72",0x750F],
+  ["ED6F",0x7510],
+  ["ED70",0x7511],
+  ["ED71",0x7512],
+  ["F049",0x7513],
+  ["F048",0x7514],
+  ["C27C",0x7515],
+  ["F277",0x7516],
+  ["F5DE",0x7517],
+  ["A5CC",0x7518],
+  ["89C3",0x7519],
+  ["ACC6",0x751A],
+  ["B2A2",0x751C],
+  ["DEC3",0x751D],
+  ["FEAB",0x751E],
+  ["A5CD",0x751F],
+  ["D2C0",0x7521],
+  ["B2A3",0x7522],
+  ["B563",0x7525],
+  ["B564",0x7526],
+  ["A5CE",0x7528],
+  ["A5CF",0x7529],
+  ["CA46",0x752A],
+  ["A86A",0x752B],
+  ["A869",0x752C],
+  ["ACC7",0x752D],
+  ["CFD9",0x752E],
+  ["DAAC",0x752F],
+  ["A5D0",0x7530],
+  ["A5D1",0x7531],
+  ["A5D2",0x7532],
+  ["A5D3",0x7533],
+  ["9DF4",0x7534],
+  ["896D",0x7535],
+  ["A86B",0x7537],
+  ["A86C",0x7538],
+  ["CB6E",0x7539],
+  ["CB6D",0x753A],
+  ["9C7B",0x753B],
+  ["AAB6",0x753D],
+  ["CD72",0x753E],
+  ["CD70",0x753F],
+  ["CD71",0x7540],
+  ["98D2",0x7542],
+  ["9FA9",0x7546],
+  ["CFDA",0x7547],
+  ["CFDB",0x7548],
+  ["FEB2",0x754A],
+  ["ACCB",0x754B],
+  ["ACC9",0x754C],
+  ["FEB1",0x754D],
+  ["ACCA",0x754E],
+  ["ACC8",0x754F],
+  ["97D9",0x7551],
+  ["A0C4",0x7553],
+  ["AF60",0x7554],
+  ["9476",0x7555],
+  ["AF64",0x7559],
+  ["AF63",0x755A],
+  ["D2C1",0x755B],
+  ["AF62",0x755C],
+  ["AF61",0x755D],
+  ["D2C2",0x755F],
+  ["9978",0x7560],
+  ["B2A6",0x7562],
+  ["D67B",0x7563],
+  ["D67A",0x7564],
+  ["B2A4",0x7565],
+  ["B2A5",0x7566],
+  ["FEB3",0x7567],
+  ["B566",0x756A],
+  ["B565",0x756B],
+  ["DAAE",0x756C],
+  ["98D3",0x756D],
+  ["FEB4",0x756E],
+  ["DAAD",0x756F],
+  ["B2A7",0x7570],
+  ["98D4",0x7572],
+  ["B7ED",0x7576],
+  ["DEC5",0x7577],
+  ["B7EE",0x7578],
+  ["DEC4",0x7579],
+  ["9FB9",0x757A],
+  ["E2D8",0x757D],
+  ["E6AE",0x757E],
+  ["BD42",0x757F],
+  ["EA6A",0x7580],
+  ["9471",0x7583],
+  ["ED73",0x7584],
+  ["C3A6",0x7586],
+  ["C3A5",0x7587],
+  ["C57C",0x758A],
+  ["A5D4",0x758B],
+  ["CD73",0x758C],
+  ["98D5",0x758D],
+  ["FEB8",0x758E],
+  ["B2A8",0x758F],
+  ["E2D9",0x7590],
+  ["BAC3",0x7591],
+  ["C6D4",0x7592],
+  ["CB6F",0x7594],
+  ["CB70",0x7595],
+  ["CD74",0x7598],
+  ["AAB8",0x7599],
+  ["AAB9",0x759A],
+  ["AAB7",0x759D],
+  ["FEBA",0x759E],
+  ["ACCF",0x75A2],
+  ["ACD0",0x75A3],
+  ["ACCD",0x75A4],
+  ["ACCE",0x75A5],
+  ["CFDC",0x75A7],
+  ["CFDD",0x75AA],
+  ["ACCC",0x75AB],
+  ["D2C3",0x75B0],
+  ["9E5C",0x75B1],
+  ["AF68",0x75B2],
+  ["AF69",0x75B3],
+  ["FEBB",0x75B4],
+  ["B2AB",0x75B5],
+  ["D2C9",0x75B6],
+  ["AF6E",0x75B8],
+  ["AF6C",0x75B9],
+  ["D2CA",0x75BA],
+  ["D2C5",0x75BB],
+  ["AF6B",0x75BC],
+  ["AF6A",0x75BD],
+  ["AF65",0x75BE],
+  ["D2C8",0x75BF],
+  ["D2C7",0x75C0],
+  ["D2C4",0x75C1],
+  ["AF6D",0x75C2],
+  ["A044",0x75C3],
+  ["D2C6",0x75C4],
+  ["AF66",0x75C5],
+  ["AF67",0x75C7],
+  ["98D7",0x75C8],
+  ["B2AC",0x75CA],
+  ["D6A1",0x75CB],
+  ["D6A2",0x75CC],
+  ["B2AD",0x75CD],
+  ["D67C",0x75CE],
+  ["D67E",0x75CF],
+  ["D6A4",0x75D0],
+  ["D6A3",0x75D1],
+  ["D67D",0x75D2],
+  ["B2A9",0x75D4],
+  ["B2AA",0x75D5],
+  ["DAB6",0x75D7],
+  ["B56B",0x75D8],
+  ["B56A",0x75D9],
+  ["DAB0",0x75DA],
+  ["B568",0x75DB],
+  ["98D8",0x75DC],
+  ["DAB3",0x75DD],
+  ["B56C",0x75DE],
+  ["DAB4",0x75DF],
+  ["B56D",0x75E0],
+  ["DAB1",0x75E1],
+  ["B567",0x75E2],
+  ["B569",0x75E3],
+  ["DAB5",0x75E4],
+  ["DAB2",0x75E6],
+  ["DAAF",0x75E7],
+  ["DED2",0x75ED],
+  ["DEC7",0x75EF],
+  ["B7F0",0x75F0],
+  ["B7F3",0x75F1],
+  ["B7F2",0x75F2],
+  ["B7F7",0x75F3],
+  ["B7F6",0x75F4],
+  ["DED3",0x75F5],
+  ["DED1",0x75F6],
+  ["DECA",0x75F7],
+  ["DECE",0x75F8],
+  ["DECD",0x75F9],
+  ["B7F4",0x75FA],
+  ["DED0",0x75FB],
+  ["DECC",0x75FC],
+  ["DED4",0x75FD],
+  ["DECB",0x75FE],
+  ["B7F5",0x75FF],
+  ["B7EF",0x7600],
+  ["B7F1",0x7601],
+  ["FEBC",0x7602],
+  ["DEC9",0x7603],
+  ["9FFE",0x7607],
+  ["E2DB",0x7608],
+  ["BAC7",0x7609],
+  ["E2DF",0x760A],
+  ["BAC6",0x760B],
+  ["E2DC",0x760C],
+  ["BAC5",0x760D],
+  ["DEC8",0x760F],
+  ["DECF",0x7610],
+  ["E2DE",0x7611],
+  ["BAC8",0x7613],
+  ["E2E0",0x7614],
+  ["E2DD",0x7615],
+  ["E2DA",0x7616],
+  ["E6B1",0x7619],
+  ["E6B5",0x761A],
+  ["E6B7",0x761B],
+  ["E6B3",0x761C],
+  ["E6B2",0x761D],
+  ["E6B0",0x761E],
+  ["BD45",0x761F],
+  ["BD43",0x7620],
+  ["BD48",0x7621],
+  ["BD49",0x7622],
+  ["E6B4",0x7623],
+  ["BD46",0x7624],
+  ["E6AF",0x7625],
+  ["BD47",0x7626],
+  ["BAC4",0x7627],
+  ["E6B6",0x7628],
+  ["BD44",0x7629],
+  ["FEBD",0x762C],
+  ["EA6C",0x762D],
+  ["EA6B",0x762F],
+  ["EA73",0x7630],
+  ["EA6D",0x7631],
+  ["EA72",0x7632],
+  ["EA6F",0x7633],
+  ["BF60",0x7634],
+  ["EA71",0x7635],
+  ["BF61",0x7638],
+  ["BF62",0x763A],
+  ["9DDD",0x763B],
+  ["EA70",0x763C],
+  ["EA6E",0x763D],
+  ["9EE1",0x7640],
+  ["C0F8",0x7642],
+  ["ED74",0x7643],
+  ["C0F7",0x7646],
+  ["ED77",0x7647],
+  ["ED75",0x7648],
+  ["ED76",0x7649],
+  ["C0F9",0x764C],
+  ["98DA",0x764D],
+  ["9DDF",0x764E],
+  ["FEBF",0x764F],
+  ["F04D",0x7650],
+  ["FEBE",0x7651],
+  ["C2A1",0x7652],
+  ["F04E",0x7653],
+  ["9EEB",0x7654],
+  ["C27D",0x7656],
+  ["F04F",0x7657],
+  ["C27E",0x7658],
+  ["F04C",0x7659],
+  ["F050",0x765A],
+  ["F04A",0x765C],
+  ["C3A7",0x765F],
+  ["F278",0x7660],
+  ["C3A8",0x7661],
+  ["C46F",0x7662],
+  ["F04B",0x7664],
+  ["C470",0x7665],
+  ["9E59",0x7666],
+  ["A05C",0x7667],
+  ["C4EE",0x7669],
+  ["F5DF",0x766A],
+  ["C57E",0x766C],
+  ["F6F4",0x766D],
+  ["C57D",0x766E],
+  ["FEC0",0x766F],
+  ["F7EA",0x7670],
+  ["C5F5",0x7671],
+  ["C5F6",0x7672],
+  ["9477",0x7673],
+  ["98DC",0x7674],
+  ["F9CC",0x7675],
+  ["FEC1",0x7676],
+  ["ACD1",0x7678],
+  ["CFDE",0x7679],
+  ["98DE",0x767A],
+  ["B56E",0x767B],
+  ["B56F",0x767C],
+  ["A5D5",0x767D],
+  ["A6CA",0x767E],
+  ["CA47",0x767F],
+  ["CB71",0x7681],
+  ["A86D",0x7682],
+  ["AABA",0x7684],
+  ["ACD2",0x7686],
+  ["ACD3",0x7687],
+  ["ACD4",0x7688],
+  ["D6A6",0x7689],
+  ["D2CB",0x768A],
+  ["AF6F",0x768B],
+  ["B2AE",0x768E],
+  ["D6A5",0x768F],
+  ["FEC3",0x7690],
+  ["DAB8",0x7692],
+  ["B571",0x7693],
+  ["DAB7",0x7695],
+  ["B570",0x7696],
+  ["DED5",0x7699],
+  ["BD4A",0x769A],
+  ["E6BB",0x769B],
+  ["E6B8",0x769C],
+  ["E6B9",0x769D],
+  ["E6BA",0x769E],
+  ["FEC8",0x76A1],
+  ["ED78",0x76A4],
+  ["FEC9",0x76A5],
+  ["F051",0x76A6],
+  ["F471",0x76AA],
+  ["F470",0x76AB],
+  ["F6F5",0x76AD],
+  ["A5D6",0x76AE],
+  ["CD75",0x76AF],
+  ["AF70",0x76B0],
+  ["B572",0x76B4],
+  ["DED6",0x76B5],
+  ["FECA",0x76B7],
+  ["E2E1",0x76B8],
+  ["BD4B",0x76BA],
+  ["EA74",0x76BB],
+  ["F052",0x76BD],
+  ["F472",0x76BE],
+  ["A5D7",0x76BF],
+  ["AABB",0x76C2],
+  ["ACD7",0x76C3],
+  ["CFDF",0x76C4],
+  ["ACD8",0x76C5],
+  ["ACD6",0x76C6],
+  ["ACD5",0x76C8],
+  ["D2CC",0x76C9],
+  ["AF71",0x76CA],
+  ["FECB",0x76CC],
+  ["AF72",0x76CD],
+  ["AF73",0x76CE],
+  ["B2B0",0x76D2],
+  ["D6A7",0x76D3],
+  ["B2AF",0x76D4],
+  ["9FC2",0x76D6],
+  ["8C6B",0x76D9],
+  ["DAB9",0x76DA],
+  ["B2B1",0x76DB],
+  ["B573",0x76DC],
+  ["DED7",0x76DD],
+  ["B7F8",0x76DE],
+  ["B7F9",0x76DF],
+  ["BAC9",0x76E1],
+  ["BACA",0x76E3],
+  ["BD4C",0x76E4],
+  ["BF64",0x76E5],
+  ["EA75",0x76E6],
+  ["BF63",0x76E7],
+  ["ED79",0x76E9],
+  ["C0FA",0x76EA],
+  ["F053",0x76EC],
+  ["F473",0x76ED],
+  ["A5D8",0x76EE],
+  ["A86E",0x76EF],
+  ["CD78",0x76F0],
+  ["CD77",0x76F1],
+  ["AABC",0x76F2],
+  ["CD76",0x76F3],
+  ["AABD",0x76F4],
+  ["CD79",0x76F5],
+  ["CFE5",0x76F7],
+  ["ACDB",0x76F8],
+  ["ACDA",0x76F9],
+  ["CFE7",0x76FA],
+  ["CFE6",0x76FB],
+  ["ACDF",0x76FC],
+  ["ACDE",0x76FE],
+  ["ACD9",0x7701],
+  ["CFE1",0x7703],
+  ["CFE2",0x7704],
+  ["CFE3",0x7705],
+  ["ACE0",0x7707],
+  ["CFE0",0x7708],
+  ["ACDC",0x7709],
+  ["CFE4",0x770A],
+  ["ACDD",0x770B],
+  ["98C4",0x770C],
+  ["94B0",0x770E],
+  ["94B1",0x770F],
+  ["D2CF",0x7710],
+  ["D2D3",0x7711],
+  ["D2D1",0x7712],
+  ["D2D0",0x7713],
+  ["D2D4",0x7715],
+  ["D2D5",0x7719],
+  ["D2D6",0x771A],
+  ["D2CE",0x771B],
+  ["D2CD",0x771D],
+  ["FED1",0x771E],
+  ["AF75",0x771F],
+  ["AF76",0x7720],
+  ["D2D7",0x7722],
+  ["D2D2",0x7723],
+  ["A0C1",0x7724],
+  ["D6B0",0x7725],
+  ["FED2",0x7726],
+  ["D2D8",0x7727],
+  ["AF77",0x7728],
+  ["AF74",0x7729],
+  ["A0CD",0x772B],
+  ["D6AA",0x772D],
+  ["D6A9",0x772F],
+  ["D6AB",0x7731],
+  ["D6AC",0x7732],
+  ["D6AE",0x7733],
+  ["D6AD",0x7734],
+  ["D6B2",0x7735],
+  ["B2B5",0x7736],
+  ["B2B2",0x7737],
+  ["B2B6",0x7738],
+  ["D6A8",0x7739],
+  ["B2B7",0x773A],
+  ["D6B1",0x773B],
+  ["B2B4",0x773C],
+  ["D6AF",0x773D],
+  ["B2B3",0x773E],
+  ["FED3",0x7740],
+  ["98E5",0x7743],
+  ["DABC",0x7744],
+  ["DABE",0x7745],
+  ["DABA",0x7746],
+  ["DABB",0x7747],
+  ["DABF",0x774A],
+  ["DAC1",0x774B],
+  ["DAC2",0x774C],
+  ["DABD",0x774D],
+  ["DAC0",0x774E],
+  ["B574",0x774F],
+  ["DEDB",0x7752],
+  ["DEE0",0x7754],
+  ["DED8",0x7755],
+  ["DEDC",0x7756],
+  ["FED6",0x7758],
+  ["DEE1",0x7759],
+  ["DEDD",0x775A],
+  ["B7FA",0x775B],
+  ["B843",0x775C],
+  ["B7FD",0x775E],
+  ["DED9",0x775F],
+  ["DEDA",0x7760],
+  ["BACE",0x7761],
+  ["B846",0x7762],
+  ["B7FE",0x7763],
+  ["B844",0x7765],
+  ["B7FC",0x7766],
+  ["DEDF",0x7767],
+  ["B845",0x7768],
+  ["DEDE",0x7769],
+  ["B841",0x776A],
+  ["B7FB",0x776B],
+  ["B842",0x776C],
+  ["DEE2",0x776D],
+  ["E2E6",0x776E],
+  ["E2E8",0x776F],
+  ["91E4",0x7772],
+  ["8FC7",0x7777],
+  ["94AE",0x7778],
+  ["B840",0x7779],
+  ["8A4F",0x777A],
+  ["94B2",0x777B],
+  ["E2E3",0x777C],
+  ["BACC",0x777D],
+  ["E2E9",0x777E],
+  ["BACD",0x777F],
+  ["E2E7",0x7780],
+  ["E2E2",0x7781],
+  ["E2E5",0x7782],
+  ["E2EA",0x7783],
+  ["BACB",0x7784],
+  ["E2E4",0x7785],
+  ["BD4E",0x7787],
+  ["E6BF",0x7788],
+  ["E6BE",0x7789],
+  ["BD51",0x778B],
+  ["BD4F",0x778C],
+  ["E6BC",0x778D],
+  ["BD4D",0x778E],
+  ["E6BD",0x778F],
+  ["BD50",0x7791],
+  ["8FD4",0x7793],
+  ["EA7D",0x7795],
+  ["EAA1",0x7797],
+  ["98EA",0x7798],
+  ["EA7E",0x7799],
+  ["EA76",0x779A],
+  ["EA7A",0x779B],
+  ["EA79",0x779C],
+  ["EA77",0x779D],
+  ["BF66",0x779E],
+  ["BF67",0x779F],
+  ["BF65",0x77A0],
+  ["EA78",0x77A1],
+  ["EA7B",0x77A2],
+  ["EA7C",0x77A3],
+  ["BF68",0x77A5],
+  ["C140",0x77A7],
+  ["EDA3",0x77A8],
+  ["C0FC",0x77AA],
+  ["ED7B",0x77AB],
+  ["C0FE",0x77AC],
+  ["C141",0x77AD],
+  ["FED8",0x77AF],
+  ["C0FD",0x77B0],
+  ["EDA2",0x77B1],
+  ["ED7C",0x77B2],
+  ["C0FB",0x77B3],
+  ["EDA1",0x77B4],
+  ["ED7A",0x77B5],
+  ["ED7E",0x77B6],
+  ["ED7D",0x77B7],
+  ["9DE0",0x77B9],
+  ["F055",0x77BA],
+  ["C2A4",0x77BB],
+  ["C2A5",0x77BC],
+  ["C2A2",0x77BD],
+  ["98EE",0x77BE],
+  ["C2A3",0x77BF],
+  ["F054",0x77C2],
+  ["95C4",0x77C3],
+  ["F27B",0x77C4],
+  ["FCE8",0x77C5],
+  ["C3A9",0x77C7],
+  ["F279",0x77C9],
+  ["F27A",0x77CA],
+  ["98EF",0x77CB],
+  ["F474",0x77CC],
+  ["F477",0x77CD],
+  ["F475",0x77CE],
+  ["F476",0x77CF],
+  ["F5E0",0x77D0],
+  ["C4EF",0x77D3],
+  ["F7EB",0x77D4],
+  ["F8B4",0x77D5],
+  ["C5F7",0x77D7],
+  ["F8F8",0x77D8],
+  ["F8F9",0x77D9],
+  ["C666",0x77DA],
+  ["A5D9",0x77DB],
+  ["ACE1",0x77DC],
+  ["8C6E",0x77DD],
+  ["DAC3",0x77DE],
+  ["DEE3",0x77E0],
+  ["A5DA",0x77E2],
+  ["A86F",0x77E3],
+  ["AABE",0x77E5],
+  ["FAD8",0x77E6],
+  ["CFE8",0x77E7],
+  ["CFE9",0x77E8],
+  ["AF78",0x77E9],
+  ["DAC4",0x77EC],
+  ["B575",0x77ED],
+  ["B847",0x77EE],
+  ["C142",0x77EF],
+  ["EDA4",0x77F0],
+  ["F27C",0x77F1],
+  ["F478",0x77F2],
+  ["A5DB",0x77F3],
+  ["FEDC",0x77F4],
+  ["CDA1",0x77F7],
+  ["CD7A",0x77F8],
+  ["CD7C",0x77F9],
+  ["CD7E",0x77FA],
+  ["CD7D",0x77FB],
+  ["CD7B",0x77FC],
+  ["AABF",0x77FD],
+  ["A0AE",0x77FE],
+  ["ACE2",0x7802],
+  ["CFF2",0x7803],
+  ["CFED",0x7805],
+  ["CFEA",0x7806],
+  ["9D4C",0x7808],
+  ["CFF1",0x7809],
+  ["ACE4",0x780C],
+  ["ACE5",0x780D],
+  ["CFF0",0x780E],
+  ["CFEF",0x780F],
+  ["CFEE",0x7810],
+  ["CFEB",0x7811],
+  ["CFEC",0x7812],
+  ["CFF3",0x7813],
+  ["ACE3",0x7814],
+  ["98F1",0x7818],
+  ["98F3",0x781C],
+  ["AF7C",0x781D],
+  ["94C1",0x781E],
+  ["AFA4",0x781F],
+  ["AFA3",0x7820],
+  ["D2E1",0x7821],
+  ["D2DB",0x7822],
+  ["D2D9",0x7823],
+  ["AFA1",0x7825],
+  ["D6B9",0x7826],
+  ["AF7A",0x7827],
+  ["D2DE",0x7828],
+  ["D2E2",0x7829],
+  ["D2E4",0x782A],
+  ["D2E0",0x782B],
+  ["D2DA",0x782C],
+  ["AFA2",0x782D],
+  ["D2DF",0x782E],
+  ["D2DD",0x782F],
+  ["AF79",0x7830],
+  ["D2E5",0x7831],
+  ["AFA5",0x7832],
+  ["D2E3",0x7833],
+  ["AF7D",0x7834],
+  ["D2DC",0x7835],
+  ["AF7E",0x7837],
+  ["AF7B",0x7838],
+  ["98F5",0x7839],
+  ["FA4F",0x783C],
+  ["96E2",0x783D],
+  ["9450",0x7842],
+  ["B2B9",0x7843],
+  ["96A2",0x7844],
+  ["D6BA",0x7845],
+  ["98F6",0x7847],
+  ["D6B3",0x7848],
+  ["D6B5",0x7849],
+  ["D6B7",0x784A],
+  ["96E5",0x784B],
+  ["D6B8",0x784C],
+  ["D6B6",0x784D],
+  ["B2BA",0x784E],
+  ["D6BB",0x7850],
+  ["98F7",0x7851],
+  ["D6B4",0x7852],
+  ["A046",0x7853],
+  ["96E3",0x7854],
+  ["DAC8",0x785C],
+  ["B576",0x785D],
+  ["DAD0",0x785E],
+  ["DAC5",0x7860],
+  ["DAD1",0x7862],
+  ["DAC6",0x7864],
+  ["DAC7",0x7865],
+  ["98F8",0x7866],
+  ["DACF",0x7868],
+  ["DACE",0x7869],
+  ["DACB",0x786A],
+  ["B2B8",0x786B],
+  ["B577",0x786C],
+  ["DAC9",0x786D],
+  ["DACC",0x786E],
+  ["B578",0x786F],
+  ["DACD",0x7870],
+  ["DACA",0x7871],
+  ["DEEE",0x7879],
+  ["9EE4",0x787A],
+  ["DEF2",0x787B],
+  ["B84E",0x787C],
+  ["E2F0",0x787E],
+  ["B851",0x787F],
+  ["DEF0",0x7880],
+  ["F9D6",0x7881],
+  ["DEED",0x7883],
+  ["DEE8",0x7884],
+  ["DEEA",0x7885],
+  ["DEEB",0x7886],
+  ["DEE4",0x7887],
+  ["94C3",0x7888],
+  ["B84D",0x7889],
+  ["B84C",0x788C],
+  ["94C2",0x788D],
+  ["B848",0x788E],
+  ["DEE7",0x788F],
+  ["B84F",0x7891],
+  ["B850",0x7893],
+  ["DEE6",0x7894],
+  ["DEE9",0x7895],
+  ["DEF1",0x7896],
+  ["B84A",0x7897],
+  ["B84B",0x7898],
+  ["DEEF",0x7899],
+  ["DEE5",0x789A],
+  ["E2F2",0x789E],
+  ["BAD0",0x789F],
+  ["E2F4",0x78A0],
+  ["DEEC",0x78A1],
+  ["E2F6",0x78A2],
+  ["BAD4",0x78A3],
+  ["E2F7",0x78A4],
+  ["E2F3",0x78A5],
+  ["BAD1",0x78A7],
+  ["E2EF",0x78A8],
+  ["BAD3",0x78A9],
+  ["E2EC",0x78AA],
+  ["E2F1",0x78AB],
+  ["E2F5",0x78AC],
+  ["E2EE",0x78AD],
+  ["FEE1",0x78AF],
+  ["B849",0x78B0],
+  ["FEE9",0x78B1],
+  ["E2EB",0x78B2],
+  ["BAD2",0x78B3],
+  ["E2ED",0x78B4],
+  ["96E4",0x78B6],
+  ["89AC",0x78B8],
+  ["96DB",0x78B9],
+  ["BD54",0x78BA],
+  ["E6C1",0x78BB],
+  ["BD58",0x78BC],
+  ["BD56",0x78BE],
+  ["BACF",0x78C1],
+  ["E6C8",0x78C3],
+  ["E6C9",0x78C4],
+  ["BD53",0x78C5],
+  ["FEE2",0x78C7],
+  ["E6C7",0x78C8],
+  ["E6CA",0x78C9],
+  ["BD55",0x78CA],
+  ["BD52",0x78CB],
+  ["E6C3",0x78CC],
+  ["E6C0",0x78CD],
+  ["E6C5",0x78CE],
+  ["E6C2",0x78CF],
+  ["BD59",0x78D0],
+  ["E6C4",0x78D1],
+  ["94C4",0x78D2],
+  ["FEE3",0x78D3],
+  ["E6C6",0x78D4],
+  ["BD57",0x78D5],
+  ["FEE7",0x78D7],
+  ["9FFB",0x78D8],
+  ["BF6A",0x78DA],
+  ["EAA8",0x78DB],
+  ["EAA2",0x78DD],
+  ["EAA6",0x78DE],
+  ["EAAC",0x78DF],
+  ["EAAD",0x78E0],
+  ["EAA9",0x78E1],
+  ["EAAA",0x78E2],
+  ["EAA7",0x78E3],
+  ["8C59",0x78E4],
+  ["EAA4",0x78E5],
+  ["BF6C",0x78E7],
+  ["BF69",0x78E8],
+  ["EAA3",0x78E9],
+  ["EAA5",0x78EA],
+  ["BF6B",0x78EC],
+  ["EAAB",0x78ED],
+  ["93C9",0x78EE],
+  ["C146",0x78EF],
+  ["94E8",0x78F0],
+  ["FB56",0x78F1],
+  ["EDAA",0x78F2],
+  ["EDA5",0x78F3],
+  ["C145",0x78F4],
+  ["90C5",0x78F5],
+  ["C143",0x78F7],
+  ["EDAC",0x78F9],
+  ["C144",0x78FA],
+  ["EDA8",0x78FB],
+  ["EDA9",0x78FC],
+  ["EDA6",0x78FD],
+  ["EDAD",0x78FE],
+  ["F056",0x78FF],
+  ["C147",0x7901],
+  ["EDA7",0x7902],
+  ["EDAE",0x7904],
+  ["EDAB",0x7905],
+  ["A0A8",0x7906],
+  ["F05A",0x7909],
+  ["F057",0x790C],
+  ["C2A6",0x790E],
+  ["F05B",0x7910],
+  ["F05D",0x7911],
+  ["F05C",0x7912],
+  ["F058",0x7913],
+  ["F059",0x7914],
+  ["F2A3",0x7917],
+  ["C3AA",0x7919],
+  ["F27E",0x791B],
+  ["F2A2",0x791C],
+  ["F27D",0x791D],
+  ["F2A4",0x791E],
+  ["F2A1",0x7921],
+  ["F47A",0x7923],
+  ["F47D",0x7924],
+  ["F479",0x7925],
+  ["C471",0x7926],
+  ["F47B",0x7927],
+  ["F47C",0x7928],
+  ["F47E",0x7929],
+  ["C472",0x792A],
+  ["C474",0x792B],
+  ["C473",0x792C],
+  ["F5E1",0x792D],
+  ["FEE5",0x792E],
+  ["F5E3",0x792F],
+  ["F5E2",0x7931],
+  ["98FD",0x7932],
+  ["98FB",0x7933],
+  ["FEE8",0x7934],
+  ["F6F6",0x7935],
+  ["8EBF",0x7936],
+  ["F8B5",0x7938],
+  ["F8FA",0x7939],
+  ["A5DC",0x793A],
+  ["8BD8",0x793B],
+  ["FEF7",0x793C],
+  ["CB72",0x793D],
+  ["AAC0",0x793E],
+  ["CDA3",0x793F],
+  ["AAC1",0x7940],
+  ["AAC2",0x7941],
+  ["CDA2",0x7942],
+  ["CFF8",0x7944],
+  ["CFF7",0x7945],
+  ["ACE6",0x7946],
+  ["ACE9",0x7947],
+  ["ACE8",0x7948],
+  ["ACE7",0x7949],
+  ["CFF4",0x794A],
+  ["CFF6",0x794B],
+  ["CFF5",0x794C],
+  ["D2E8",0x794F],
+  ["AFA7",0x7950],
+  ["D2EC",0x7951],
+  ["D2EB",0x7952],
+  ["D2EA",0x7953],
+  ["D2E6",0x7954],
+  ["AFA6",0x7955],
+  ["AFAA",0x7956],
+  ["AFAD",0x7957],
+  ["8F68",0x7958],
+  ["94C6",0x7959],
+  ["AFAE",0x795A],
+  ["D2E7",0x795B],
+  ["D2E9",0x795C],
+  ["AFAC",0x795D],
+  ["AFAB",0x795E],
+  ["AFA9",0x795F],
+  ["AFA8",0x7960],
+  ["D6C2",0x7961],
+  ["9DEA",0x7962],
+  ["D6C0",0x7963],
+  ["D6BC",0x7964],
+  ["B2BB",0x7965],
+  ["D6BD",0x7967],
+  ["B2BC",0x7968],
+  ["D6BE",0x7969],
+  ["D6BF",0x796A],
+  ["D6C1",0x796B],
+  ["B2BD",0x796D],
+  ["DAD5",0x7970],
+  ["FC69",0x7971],
+  ["DAD4",0x7972],
+  ["DAD3",0x7973],
+  ["DAD2",0x7974],
+  ["DEF6",0x7979],
+  ["B852",0x797A],
+  ["DEF3",0x797C],
+  ["DEF5",0x797D],
+  ["9CDA",0x797E],
+  ["B853",0x797F],
+  ["FEF3",0x7980],
+  ["B854",0x7981],
+  ["DEF4",0x7982],
+  ["9C72",0x7983],
+  ["FEF0",0x7986],
+  ["89C9",0x7987],
+  ["E341",0x7988],
+  ["E2F9",0x798A],
+  ["E2FA",0x798B],
+  ["BAD7",0x798D],
+  ["BAD5",0x798E],
+  ["BAD6",0x798F],
+  ["E343",0x7990],
+  ["9941",0x7991],
+  ["E342",0x7992],
+  ["E2FE",0x7993],
+  ["E2FD",0x7994],
+  ["E2FC",0x7995],
+  ["E2FB",0x7996],
+  ["E340",0x7997],
+  ["E2F8",0x7998],
+  ["9942",0x7999],
+  ["E6CB",0x799A],
+  ["E6D0",0x799B],
+  ["E6CE",0x799C],
+  ["FEF5",0x799D],
+  ["91D7",0x799F],
+  ["E6CD",0x79A0],
+  ["E6CC",0x79A1],
+  ["E6CF",0x79A2],
+  ["EAAE",0x79A4],
+  ["94CC",0x79A5],
+  ["BF6D",0x79A6],
+  ["C148",0x79A7],
+  ["EDB0",0x79A8],
+  ["FEF8",0x79A9],
+  ["C149",0x79AA],
+  ["EDAF",0x79AB],
+  ["F05F",0x79AC],
+  ["F05E",0x79AD],
+  ["C2A7",0x79AE],
+  ["F2A5",0x79B0],
+  ["C3AB",0x79B1],
+  ["F4A1",0x79B2],
+  ["C5A1",0x79B3],
+  ["F6F7",0x79B4],
+  ["F8B7",0x79B6],
+  ["F8B6",0x79B7],
+  ["C9A8",0x79B8],
+  ["ACEA",0x79B9],
+  ["ACEB",0x79BA],
+  ["D6C3",0x79BB],
+  ["B856",0x79BD],
+  ["A5DD",0x79BE],
+  ["A872",0x79BF],
+  ["A871",0x79C0],
+  ["A870",0x79C1],
+  ["97A8",0x79C4],
+  ["CDA4",0x79C5],
+  ["FEFC",0x79C6],
+  ["AAC4",0x79C8],
+  ["AAC3",0x79C9],
+  ["8CDE",0x79CA],
+  ["ACEE",0x79CB],
+  ["FDBF",0x79CC],
+  ["CFFA",0x79CD],
+  ["CFFD",0x79CE],
+  ["CFFB",0x79CF],
+  ["ACEC",0x79D1],
+  ["ACED",0x79D2],
+  ["FEFE",0x79D4],
+  ["CFF9",0x79D5],
+  ["CFFC",0x79D6],
+  ["AFB5",0x79D8],
+  ["D2F3",0x79DC],
+  ["D2F5",0x79DD],
+  ["D2F4",0x79DE],
+  ["AFB2",0x79DF],
+  ["D2EF",0x79E0],
+  ["96D1",0x79E2],
+  ["AFB0",0x79E3],
+  ["AFAF",0x79E4],
+  ["AFB3",0x79E6],
+  ["AFB1",0x79E7],
+  ["AFB4",0x79E9],
+  ["D2F2",0x79EA],
+  ["D2ED",0x79EB],
+  ["D2EE",0x79EC],
+  ["D2F1",0x79ED],
+  ["D2F0",0x79EE],
+  ["94D5",0x79F1],
+  ["94D0",0x79F4],
+  ["D6C6",0x79F6],
+  ["D6C7",0x79F7],
+  ["D6C5",0x79F8],
+  ["D6C4",0x79FA],
+  ["B2BE",0x79FB],
+  ["B57D",0x7A00],
+  ["DAD6",0x7A02],
+  ["DAD8",0x7A03],
+  ["DADA",0x7A04],
+  ["B57C",0x7A05],
+  ["9944",0x7A06],
+  ["B57A",0x7A08],
+  ["DAD7",0x7A0A],
+  ["B57B",0x7A0B],
+  ["DAD9",0x7A0C],
+  ["B579",0x7A0D],
+  ["DF41",0x7A10],
+  ["DEF7",0x7A11],
+  ["DEFA",0x7A12],
+  ["DEFE",0x7A13],
+  ["B85A",0x7A14],
+  ["DEFC",0x7A15],
+  ["DEFB",0x7A17],
+  ["DEF8",0x7A18],
+  ["DEF9",0x7A19],
+  ["B858",0x7A1A],
+  ["DF40",0x7A1B],
+  ["B857",0x7A1C],
+  ["B85C",0x7A1E],
+  ["B85B",0x7A1F],
+  ["B859",0x7A20],
+  ["DEFD",0x7A22],
+  ["E349",0x7A26],
+  ["E348",0x7A28],
+  ["8C63",0x7A2A],
+  ["E344",0x7A2B],
+  ["A0B3",0x7A2D],
+  ["BAD8",0x7A2E],
+  ["E347",0x7A2F],
+  ["E346",0x7A30],
+  ["BAD9",0x7A31],
+  ["BD5E",0x7A37],
+  ["E6D2",0x7A39],
+  ["94CF",0x7A3A],
+  ["BD5F",0x7A3B],
+  ["BD5B",0x7A3C],
+  ["BD5D",0x7A3D],
+  ["9FFA",0x7A3E],
+  ["BD5A",0x7A3F],
+  ["BD5C",0x7A40],
+  ["91E5",0x7A43],
+  ["EAAF",0x7A44],
+  ["9C6A",0x7A45],
+  ["BF70",0x7A46],
+  ["EAB1",0x7A47],
+  ["EAB0",0x7A48],
+  ["8E49",0x7A49],
+  ["E345",0x7A4A],
+  ["BF72",0x7A4B],
+  ["BF71",0x7A4C],
+  ["BF6E",0x7A4D],
+  ["BF6F",0x7A4E],
+  ["EDB5",0x7A54],
+  ["EDB3",0x7A56],
+  ["C14A",0x7A57],
+  ["EDB4",0x7A58],
+  ["EDB6",0x7A5A],
+  ["EDB2",0x7A5B],
+  ["EDB1",0x7A5C],
+  ["F060",0x7A5F],
+  ["C2AA",0x7A60],
+  ["C2A8",0x7A61],
+  ["C2A9",0x7A62],
+  ["8E4C",0x7A65],
+  ["F2A6",0x7A67],
+  ["F2A7",0x7A68],
+  ["C3AD",0x7A69],
+  ["C3AC",0x7A6B],
+  ["F4A3",0x7A6C],
+  ["F4A4",0x7A6D],
+  ["F4A2",0x7A6E],
+  ["F6F8",0x7A70],
+  ["F6F9",0x7A71],
+  ["A5DE",0x7A74],
+  ["CA48",0x7A75],
+  ["A873",0x7A76],
+  ["CDA5",0x7A78],
+  ["AAC6",0x7A79],
+  ["AAC5",0x7A7A],
+  ["CDA6",0x7A7B],
+  ["8E4D",0x7A7D],
+  ["D040",0x7A7E],
+  ["ACEF",0x7A7F],
+  ["CFFE",0x7A80],
+  ["ACF0",0x7A81],
+  ["9A73",0x7A83],
+  ["AFB6",0x7A84],
+  ["D2F8",0x7A85],
+  ["D2F6",0x7A86],
+  ["D2FC",0x7A87],
+  ["AFB7",0x7A88],
+  ["D2F7",0x7A89],
+  ["D2FB",0x7A8A],
+  ["D2F9",0x7A8B],
+  ["D2FA",0x7A8C],
+  ["D6C8",0x7A8F],
+  ["D6CA",0x7A90],
+  ["9947",0x7A91],
+  ["B2BF",0x7A92],
+  ["8CB1",0x7A93],
+  ["D6C9",0x7A94],
+  ["B2C0",0x7A95],
+  ["B5A2",0x7A96],
+  ["B5A1",0x7A97],
+  ["B57E",0x7A98],
+  ["DADB",0x7A99],
+  ["DF44",0x7A9E],
+  ["B85D",0x7A9F],
+  ["B85E",0x7AA0],
+  ["DF43",0x7AA2],
+  ["DF42",0x7AA3],
+  ["E34A",0x7AA8],
+  ["BADB",0x7AA9],
+  ["BADA",0x7AAA],
+  ["E34B",0x7AAB],
+  ["E34C",0x7AAC],
+  ["BD61",0x7AAE],
+  ["BD60",0x7AAF],
+  ["8E50",0x7AB0],
+  ["EAB5",0x7AB1],
+  ["E6D3",0x7AB2],
+  ["E6D5",0x7AB3],
+  ["E6D4",0x7AB4],
+  ["EAB4",0x7AB5],
+  ["EAB2",0x7AB6],
+  ["EAB6",0x7AB7],
+  ["EAB3",0x7AB8],
+  ["BF73",0x7ABA],
+  ["8E4F",0x7ABB],
+  ["9949",0x7ABC],
+  ["EDB7",0x7ABE],
+  ["C14B",0x7ABF],
+  ["EDB8",0x7AC0],
+  ["EDB9",0x7AC1],
+  ["8E51",0x7AC2],
+  ["8E52",0x7AC3],
+  ["C2AB",0x7AC4],
+  ["C2AC",0x7AC5],
+  ["C475",0x7AC7],
+  ["9AB2",0x7AC8],
+  ["89A5",0x7AC9],
+  ["C5D1",0x7ACA],
+  ["A5DF",0x7ACB],
+  ["994C",0x7ACF],
+  ["D041",0x7AD1],
+  ["9FF8",0x7AD3],
+  ["D2FD",0x7AD8],
+  ["AFB8",0x7AD9],
+  ["8E56",0x7ADA],
+  ["994D",0x7ADB],
+  ["91CA",0x7ADC],
+  ["8E57",0x7ADD],
+  ["B3BA",0x7ADF],
+  ["B3B9",0x7AE0],
+  ["94E1",0x7AE2],
+  ["B5A4",0x7AE3],
+  ["DADD",0x7AE4],
+  ["B5A3",0x7AE5],
+  ["DADC",0x7AE6],
+  ["9047",0x7AE7],
+  ["8FD8",0x7AE9],
+  ["8E58",0x7AEA],
+  ["DF45",0x7AEB],
+  ["BADC",0x7AED],
+  ["E34D",0x7AEE],
+  ["BADD",0x7AEF],
+  ["C476",0x7AF6],
+  ["F4A5",0x7AF7],
+  ["A6CB",0x7AF9],
+  ["AAC7",0x7AFA],
+  ["CDA7",0x7AFB],
+  ["ACF2",0x7AFD],
+  ["94EB",0x7AFE],
+  ["ACF1",0x7AFF],
+  ["D042",0x7B00],
+  ["D043",0x7B01],
+  ["D340",0x7B04],
+  ["D342",0x7B05],
+  ["AFB9",0x7B06],
+  ["D344",0x7B08],
+  ["D347",0x7B09],
+  ["D345",0x7B0A],
+  ["8E5C",0x7B0B],
+  ["9553",0x7B0C],
+  ["D346",0x7B0E],
+  ["D343",0x7B0F],
+  ["D2FE",0x7B10],
+  ["AFBA",0x7B11],
+  ["D348",0x7B12],
+  ["D341",0x7B13],
+  ["9FE5",0x7B14],
+  ["D6D3",0x7B18],
+  ["B2C6",0x7B19],
+  ["D6DC",0x7B1A],
+  ["B2C3",0x7B1B],
+  ["D6D5",0x7B1D],
+  ["B2C7",0x7B1E],
+  ["9F56",0x7B1F],
+  ["B2C1",0x7B20],
+  ["D6D0",0x7B22],
+  ["D6DD",0x7B23],
+  ["D6D1",0x7B24],
+  ["D6CE",0x7B25],
+  ["B2C5",0x7B26],
+  ["954F",0x7B27],
+  ["B2C2",0x7B28],
+  ["8E5E",0x7B29],
+  ["D6D4",0x7B2A],
+  ["D6D7",0x7B2B],
+  ["B2C4",0x7B2C],
+  ["D6D8",0x7B2D],
+  ["B2C8",0x7B2E],
+  ["D6D9",0x7B2F],
+  ["D6CF",0x7B30],
+  ["D6D6",0x7B31],
+  ["D6DA",0x7B32],
+  ["D6D2",0x7B33],
+  ["D6CD",0x7B34],
+  ["D6CB",0x7B35],
+  ["D6DB",0x7B38],
+  ["996A",0x7B39],
+  ["DADF",0x7B3B],
+  ["DAE4",0x7B40],
+  ["9C64",0x7B42],
+  ["9CD9",0x7B43],
+  ["DAE0",0x7B44],
+  ["DAE6",0x7B45],
+  ["B5A7",0x7B46],
+  ["D6CC",0x7B47],
+  ["DAE1",0x7B48],
+  ["B5A5",0x7B49],
+  ["DADE",0x7B4A],
+  ["B5AC",0x7B4B],
+  ["DAE2",0x7B4C],
+  ["B5AB",0x7B4D],
+  ["DAE3",0x7B4E],
+  ["B5AD",0x7B4F],
+  ["B5A8",0x7B50],
+  ["B5AE",0x7B51],
+  ["B5A9",0x7B52],
+  ["B5AA",0x7B54],
+  ["8E5D",0x7B55],
+  ["B5A6",0x7B56],
+  ["DAE5",0x7B58],
+  ["B861",0x7B60],
+  ["DF50",0x7B61],
+  ["9950",0x7B62],
+  ["DF53",0x7B63],
+  ["DF47",0x7B64],
+  ["DF4C",0x7B65],
+  ["DF46",0x7B66],
+  ["B863",0x7B67],
+  ["DF4A",0x7B69],
+  ["9951",0x7B6C],
+  ["DF48",0x7B6D],
+  ["B862",0x7B6E],
+  ["8E62",0x7B6F],
+  ["DF4F",0x7B70],
+  ["DF4E",0x7B71],
+  ["DF4B",0x7B72],
+  ["DF4D",0x7B73],
+  ["DF49",0x7B74],
+  ["BAE1",0x7B75],
+  ["DF52",0x7B76],
+  ["B85F",0x7B77],
+  ["DF51",0x7B78],
+  ["9952",0x7B7B],
+  ["E35D",0x7B82],
+  ["BAE8",0x7B84],
+  ["E358",0x7B85],
+  ["BAE7",0x7B87],
+  ["E34E",0x7B88],
+  ["E350",0x7B8A],
+  ["BAE0",0x7B8B],
+  ["E355",0x7B8C],
+  ["E354",0x7B8D],
+  ["E357",0x7B8E],
+  ["BAE5",0x7B8F],
+  ["E352",0x7B90],
+  ["E351",0x7B91],
+  ["8E68",0x7B92],
+  ["BAE4",0x7B94],
+  ["BADF",0x7B95],
+  ["E353",0x7B96],
+  ["BAE2",0x7B97],
+  ["E359",0x7B98],
+  ["E35B",0x7B99],
+  ["E356",0x7B9B],
+  ["E34F",0x7B9C],
+  ["BAE3",0x7B9D],
+  ["BD69",0x7BA0],
+  ["BADE",0x7BA1],
+  ["8E61",0x7BA2],
+  ["9F59",0x7BA3],
+  ["E35C",0x7BA4],
+  ["E6D9",0x7BAC],
+  ["BD62",0x7BAD],
+  ["E6DB",0x7BAF],
+  ["BD63",0x7BB1],
+  ["8BB3",0x7BB2],
+  ["BD65",0x7BB4],
+  ["E6DE",0x7BB5],
+  ["E6D6",0x7BB7],
+  ["BAE6",0x7BB8],
+  ["E6DC",0x7BB9],
+  ["E6D8",0x7BBE],
+  ["B860",0x7BC0],
+  ["BD68",0x7BC1],
+  ["BD64",0x7BC4],
+  ["BD66",0x7BC6],
+  ["BD67",0x7BC7],
+  ["BF76",0x7BC9],
+  ["E6DD",0x7BCA],
+  ["E6D7",0x7BCB],
+  ["BD6A",0x7BCC],
+  ["E6DA",0x7BCE],
+  ["9F5D",0x7BCF],
+  ["8E66",0x7BD0],
+  ["EAC0",0x7BD4],
+  ["EABB",0x7BD5],
+  ["EAC5",0x7BD8],
+  ["BF74",0x7BD9],
+  ["EABD",0x7BDA],
+  ["BF78",0x7BDB],
+  ["EAC3",0x7BDC],
+  ["EABA",0x7BDD],
+  ["EAB7",0x7BDE],
+  ["EAC6",0x7BDF],
+  ["C151",0x7BE0],
+  ["BF79",0x7BE1],
+  ["EAC2",0x7BE2],
+  ["EAB8",0x7BE3],
+  ["BF77",0x7BE4],
+  ["EABC",0x7BE5],
+  ["BF7B",0x7BE6],
+  ["EAB9",0x7BE7],
+  ["EABE",0x7BE8],
+  ["BF7A",0x7BE9],
+  ["EAC1",0x7BEA],
+  ["EAC4",0x7BEB],
+  ["8CB2",0x7BEC],
+  ["EDCB",0x7BF0],
+  ["EDCC",0x7BF1],
+  ["EDBC",0x7BF2],
+  ["EDC3",0x7BF3],
+  ["EDC1",0x7BF4],
+  ["C14F",0x7BF7],
+  ["EDC8",0x7BF8],
+  ["EABF",0x7BF9],
+  ["8E6E",0x7BFA],
+  ["EDBF",0x7BFB],
+  ["9F64",0x7BFC],
+  ["EDC9",0x7BFD],
+  ["C14E",0x7BFE],
+  ["EDBE",0x7BFF],
+  ["EDBD",0x7C00],
+  ["EDC7",0x7C01],
+  ["EDC4",0x7C02],
+  ["EDC6",0x7C03],
+  ["EDBA",0x7C05],
+  ["EDCA",0x7C06],
+  ["C14C",0x7C07],
+  ["EDC5",0x7C09],
+  ["EDCE",0x7C0A],
+  ["EDC2",0x7C0B],
+  ["C150",0x7C0C],
+  ["C14D",0x7C0D],
+  ["EDC0",0x7C0E],
+  ["EDBB",0x7C0F],
+  ["EDCD",0x7C10],
+  ["BF75",0x7C11],
+  ["9953",0x7C12],
+  ["FAB8",0x7C15],
+  ["F063",0x7C19],
+  ["9954",0x7C1B],
+  ["F061",0x7C1C],
+  ["F067",0x7C1D],
+  ["C2B0",0x7C1E],
+  ["F065",0x7C1F],
+  ["F064",0x7C20],
+  ["C2B2",0x7C21],
+  ["F06A",0x7C22],
+  ["C2B1",0x7C23],
+  ["F06B",0x7C25],
+  ["F068",0x7C26],
+  ["C2AE",0x7C27],
+  ["F069",0x7C28],
+  ["F062",0x7C29],
+  ["C2AF",0x7C2A],
+  ["C2AD",0x7C2B],
+  ["F2AB",0x7C2C],
+  ["F066",0x7C2D],
+  ["F06C",0x7C30],
+  ["F2A8",0x7C33],
+  ["8E70",0x7C35],
+  ["C3B2",0x7C37],
+  ["C3B0",0x7C38],
+  ["F2AA",0x7C39],
+  ["F2AC",0x7C3B],
+  ["F2A9",0x7C3C],
+  ["C3B1",0x7C3D],
+  ["C3AE",0x7C3E],
+  ["C3AF",0x7C3F],
+  ["C3B3",0x7C40],
+  ["9F61",0x7C42],
+  ["C478",0x7C43],
+  ["8E72",0x7C44],
+  ["F4AA",0x7C45],
+  ["F4A9",0x7C47],
+  ["F4A7",0x7C48],
+  ["F4A6",0x7C49],
+  ["F4A8",0x7C4A],
+  ["C477",0x7C4C],
+  ["C479",0x7C4D],
+  ["C4F0",0x7C50],
+  ["A06B",0x7C51],
+  ["F5E5",0x7C53],
+  ["F5E4",0x7C54],
+  ["9F40",0x7C56],
+  ["F6FA",0x7C57],
+  ["F6FC",0x7C59],
+  ["F6FE",0x7C5A],
+  ["F6FD",0x7C5B],
+  ["F6FB",0x7C5C],
+  ["94ED",0x7C5D],
+  ["C5A3",0x7C5F],
+  ["C5A2",0x7C60],
+  ["C5D3",0x7C63],
+  ["C5D2",0x7C64],
+  ["C5D4",0x7C65],
+  ["F7ED",0x7C66],
+  ["F7EC",0x7C67],
+  ["F8FB",0x7C69],
+  ["F8B8",0x7C6A],
+  ["F8FC",0x7C6B],
+  ["C658",0x7C6C],
+  ["94EE",0x7C6D],
+  ["C659",0x7C6E],
+  ["F96D",0x7C6F],
+  ["9FBD",0x7C70],
+  ["C67E",0x7C72],
+  ["A6CC",0x7C73],
+  ["8E7B",0x7C74],
+  ["CDA8",0x7C75],
+  ["D045",0x7C78],
+  ["D046",0x7C79],
+  ["D044",0x7C7A],
+  ["9957",0x7C7B],
+  ["94F7",0x7C7C],
+  ["ACF3",0x7C7D],
+  ["9F5F",0x7C7E],
+  ["D047",0x7C7F],
+  ["D048",0x7C80],
+  ["D049",0x7C81],
+  ["8E73",0x7C83],
+  ["D349",0x7C84],
+  ["D34F",0x7C85],
+  ["9F62",0x7C86],
+  ["D34D",0x7C88],
+  ["AFBB",0x7C89],
+  ["D34B",0x7C8A],
+  ["D34C",0x7C8C],
+  ["D34E",0x7C8D],
+  ["94F6",0x7C8E],
+  ["D34A",0x7C91],
+  ["B2C9",0x7C92],
+  ["D6DE",0x7C94],
+  ["B2CB",0x7C95],
+  ["D6E0",0x7C96],
+  ["B2CA",0x7C97],
+  ["D6DF",0x7C98],
+  ["9958",0x7C9C],
+  ["DAE8",0x7C9E],
+  ["B5AF",0x7C9F],
+  ["DAEA",0x7CA1],
+  ["DAE7",0x7CA2],
+  ["D6E1",0x7CA3],
+  ["B5B0",0x7CA5],
+  ["8E75",0x7CA6],
+  ["F9DB",0x7CA7],
+  ["DAE9",0x7CA8],
+  ["9072",0x7CAC],
+  ["94F8",0x7CAE],
+  ["DF56",0x7CAF],
+  ["B864",0x7CB1],
+  ["DF54",0x7CB2],
+  ["B865",0x7CB3],
+  ["DF55",0x7CB4],
+  ["B866",0x7CB5],
+  ["995A",0x7CB8],
+  ["BAE9",0x7CB9],
+  ["E361",0x7CBA],
+  ["E35E",0x7CBB],
+  ["E360",0x7CBC],
+  ["BAEA",0x7CBD],
+  ["BAEB",0x7CBE],
+  ["E35F",0x7CBF],
+  ["A0B0",0x7CC2],
+  ["8CB3",0x7CC3],
+  ["E6DF",0x7CC5],
+  ["8E79",0x7CC7],
+  ["E6E0",0x7CC8],
+  ["8E78",0x7CC9],
+  ["BD6B",0x7CCA],
+  ["E6E2",0x7CCB],
+  ["E6E1",0x7CCC],
+  ["94F3",0x7CCD],
+  ["A261",0x7CCE],
+  ["EACA",0x7CD0],
+  ["EACB",0x7CD1],
+  ["EAC7",0x7CD2],
+  ["98AF",0x7CD3],
+  ["EAC8",0x7CD4],
+  ["BF7C",0x7CD5],
+  ["BF7D",0x7CD6],
+  ["EAC9",0x7CD7],
+  ["C157",0x7CD9],
+  ["A0B2",0x7CDA],
+  ["C153",0x7CDC],
+  ["C158",0x7CDD],
+  ["C154",0x7CDE],
+  ["C156",0x7CDF],
+  ["C152",0x7CE0],
+  ["C155",0x7CE2],
+  ["8E7A",0x7CE6],
+  ["C2B3",0x7CE7],
+  ["EDCF",0x7CE8],
+  ["F2AE",0x7CEA],
+  ["F2AD",0x7CEC],
+  ["995C",0x7CED],
+  ["F4AB",0x7CEE],
+  ["C47A",0x7CEF],
+  ["C47B",0x7CF0],
+  ["F741",0x7CF1],
+  ["F5E6",0x7CF2],
+  ["8E7C",0x7CF3],
+  ["F740",0x7CF4],
+  ["8E7D",0x7CF5],
+  ["F8FD",0x7CF6],
+  ["F9A4",0x7CF7],
+  ["A6CD",0x7CF8],
+  ["8BD9",0x7CF9],
+  ["A874",0x7CFB],
+  ["89A2",0x7CFC],
+  ["CDA9",0x7CFD],
+  ["AAC8",0x7CFE],
+  ["ACF6",0x7D00],
+  ["D04C",0x7D01],
+  ["ACF4",0x7D02],
+  ["D04A",0x7D03],
+  ["ACF9",0x7D04],
+  ["ACF5",0x7D05],
+  ["ACFA",0x7D06],
+  ["ACF8",0x7D07],
+  ["D04B",0x7D08],
+  ["ACF7",0x7D09],
+  ["AFBF",0x7D0A],
+  ["AFBE",0x7D0B],
+  ["D35A",0x7D0C],
+  ["AFC7",0x7D0D],
+  ["D353",0x7D0E],
+  ["D359",0x7D0F],
+  ["AFC3",0x7D10],
+  ["D352",0x7D11],
+  ["D358",0x7D12],
+  ["D356",0x7D13],
+  ["AFC2",0x7D14],
+  ["AFC4",0x7D15],
+  ["D355",0x7D16],
+  ["AFBD",0x7D17],
+  ["D354",0x7D18],
+  ["AFC8",0x7D19],
+  ["AFC5",0x7D1A],
+  ["AFC9",0x7D1B],
+  ["AFC6",0x7D1C],
+  ["D351",0x7D1D],
+  ["D350",0x7D1E],
+  ["D357",0x7D1F],
+  ["AFC0",0x7D20],
+  ["AFBC",0x7D21],
+  ["AFC1",0x7D22],
+  ["9ED7",0x7D25],
+  ["D6F0",0x7D28],
+  ["D6E9",0x7D29],
+  ["B5B5",0x7D2B],
+  ["D6E8",0x7D2C],
+  ["B2CF",0x7D2E],
+  ["B2D6",0x7D2F],
+  ["B2D3",0x7D30],
+  ["B2D9",0x7D31],
+  ["B2D8",0x7D32],
+  ["B2D4",0x7D33],
+  ["D6E2",0x7D35],
+  ["D6E5",0x7D36],
+  ["D6E4",0x7D38],
+  ["B2D0",0x7D39],
+  ["D6E6",0x7D3A],
+  ["D6EF",0x7D3B],
+  ["B2D1",0x7D3C],
+  ["D6E3",0x7D3D],
+  ["D6EC",0x7D3E],
+  ["D6ED",0x7D3F],
+  ["B2D2",0x7D40],
+  ["D6EA",0x7D41],
+  ["B2D7",0x7D42],
+  ["B2CD",0x7D43],
+  ["B2D5",0x7D44],
+  ["D6E7",0x7D45],
+  ["B2CC",0x7D46],
+  ["D6EB",0x7D47],
+  ["D6EE",0x7D4A],
+  ["A0B6",0x7D4D],
+  ["DAFB",0x7D4E],
+  ["DAF2",0x7D4F],
+  ["B5B2",0x7D50],
+  ["DAF9",0x7D51],
+  ["DAF6",0x7D52],
+  ["DAEE",0x7D53],
+  ["DAF7",0x7D54],
+  ["B5B4",0x7D55],
+  ["DAEF",0x7D56],
+  ["DAEB",0x7D58],
+  ["9E42",0x7D5A],
+  ["B86C",0x7D5B],
+  ["DAF4",0x7D5C],
+  ["8EA4",0x7D5D],
+  ["B5B1",0x7D5E],
+  ["DAFA",0x7D5F],
+  ["B5B8",0x7D61],
+  ["B5BA",0x7D62],
+  ["DAED",0x7D63],
+  ["B5B9",0x7D66],
+  ["DAF0",0x7D67],
+  ["B5B3",0x7D68],
+  ["DAF8",0x7D69],
+  ["DAF1",0x7D6A],
+  ["DAF5",0x7D6B],
+  ["DAF3",0x7D6D],
+  ["B5B6",0x7D6E],
+  ["DAEC",0x7D6F],
+  ["B5BB",0x7D70],
+  ["B2CE",0x7D71],
+  ["B5B7",0x7D72],
+  ["B5BC",0x7D73],
+  ["B868",0x7D79],
+  ["DF5D",0x7D7A],
+  ["DF5F",0x7D7B],
+  ["DF61",0x7D7C],
+  ["DF65",0x7D7D],
+  ["DF5B",0x7D7F],
+  ["DF59",0x7D80],
+  ["B86A",0x7D81],
+  ["DF60",0x7D83],
+  ["DF64",0x7D84],
+  ["DF5C",0x7D85],
+  ["DF58",0x7D86],
+  ["DF57",0x7D88],
+  ["8EA7",0x7D89],
+  ["8C76",0x7D8B],
+  ["DF62",0x7D8C],
+  ["DF5A",0x7D8D],
+  ["DF5E",0x7D8E],
+  ["B86B",0x7D8F],
+  ["B869",0x7D91],
+  ["DF66",0x7D92],
+  ["B867",0x7D93],
+  ["DF63",0x7D94],
+  ["8767",0x7D95],
+  ["E372",0x7D96],
+  ["9542",0x7D97],
+  ["BAEE",0x7D9C],
+  ["E36A",0x7D9D],
+  ["BD78",0x7D9E],
+  ["E374",0x7D9F],
+  ["BAF1",0x7DA0],
+  ["E378",0x7DA1],
+  ["BAF7",0x7DA2],
+  ["E365",0x7DA3],
+  ["987D",0x7DA4],
+  ["E375",0x7DA6],
+  ["E362",0x7DA7],
+  ["9755",0x7DA8],
+  ["E377",0x7DA9],
+  ["E366",0x7DAA],
+  ["8EA8",0x7DAB],
+  ["BAFE",0x7DAC],
+  ["BAFB",0x7DAD],
+  ["E376",0x7DAE],
+  ["E370",0x7DAF],
+  ["BAED",0x7DB0],
+  ["BAF5",0x7DB1],
+  ["BAF4",0x7DB2],
+  ["8EAA",0x7DB3],
+  ["BAF3",0x7DB4],
+  ["BAF9",0x7DB5],
+  ["E363",0x7DB7],
+  ["BAFA",0x7DB8],
+  ["E371",0x7DB9],
+  ["BAF6",0x7DBA],
+  ["BAEC",0x7DBB],
+  ["E373",0x7DBC],
+  ["BAEF",0x7DBD],
+  ["BAF0",0x7DBE],
+  ["BAF8",0x7DBF],
+  ["E368",0x7DC0],
+  ["E367",0x7DC1],
+  ["E364",0x7DC2],
+  ["E36C",0x7DC4],
+  ["E369",0x7DC5],
+  ["E36D",0x7DC6],
+  ["BAFD",0x7DC7],
+  ["E379",0x7DC9],
+  ["BAF2",0x7DCA],
+  ["E36E",0x7DCB],
+  ["E36F",0x7DCC],
+  ["89A3",0x7DCD],
+  ["E36B",0x7DCE],
+  ["9960",0x7DCF],
+  ["9962",0x7DD0],
+  ["BAFC",0x7DD2],
+  ["94FC",0x7DD3],
+  ["9961",0x7DD4],
+  ["E6E7",0x7DD7],
+  ["BD70",0x7DD8],
+  ["BD79",0x7DD9],
+  ["BD75",0x7DDA],
+  ["E6E4",0x7DDB],
+  ["94FA",0x7DDC],
+  ["BD72",0x7DDD],
+  ["BD76",0x7DDE],
+  ["E6F0",0x7DDF],
+  ["BD6C",0x7DE0],
+  ["E6E8",0x7DE1],
+  ["BD74",0x7DE3],
+  ["8EAE",0x7DE4],
+  ["8EB2",0x7DE5],
+  ["E6EB",0x7DE6],
+  ["E6E6",0x7DE7],
+  ["BD73",0x7DE8],
+  ["BD77",0x7DE9],
+  ["E6E5",0x7DEA],
+  ["BD71",0x7DEC],
+  ["E6EF",0x7DEE],
+  ["BD6E",0x7DEF],
+  ["E6EE",0x7DF0],
+  ["E6ED",0x7DF1],
+  ["BD7A",0x7DF2],
+  ["E572",0x7DF3],
+  ["BD6D",0x7DF4],
+  ["8EB0",0x7DF5],
+  ["E6EC",0x7DF6],
+  ["E6E3",0x7DF7],
+  ["BD7B",0x7DF9],
+  ["E6EA",0x7DFA],
+  ["BD6F",0x7DFB],
+  ["9963",0x7DFD],
+  ["97AA",0x7DFE],
+  ["E6E9",0x7E03],
+  ["94FB",0x7E07],
+  ["BFA2",0x7E08],
+  ["BFA7",0x7E09],
+  ["BF7E",0x7E0A],
+  ["EAD8",0x7E0B],
+  ["EACF",0x7E0C],
+  ["EADB",0x7E0D],
+  ["EAD3",0x7E0E],
+  ["EAD9",0x7E0F],
+  ["BFA8",0x7E10],
+  ["BFA1",0x7E11],
+  ["EACC",0x7E12],
+  ["EAD2",0x7E13],
+  ["EADC",0x7E14],
+  ["EAD5",0x7E15],
+  ["EADA",0x7E16],
+  ["EACE",0x7E17],
+  ["EAD6",0x7E1A],
+  ["BFA3",0x7E1B],
+  ["EAD4",0x7E1C],
+  ["BFA6",0x7E1D],
+  ["BFA5",0x7E1E],
+  ["EAD0",0x7E1F],
+  ["EAD1",0x7E20],
+  ["EACD",0x7E21],
+  ["EAD7",0x7E22],
+  ["BFA4",0x7E23],
+  ["EADE",0x7E24],
+  ["EADD",0x7E25],
+  ["8EBB",0x7E27],
+  ["EDDA",0x7E29],
+  ["EDD6",0x7E2A],
+  ["C15F",0x7E2B],
+  ["EDD0",0x7E2D],
+  ["C159",0x7E2E],
+  ["C169",0x7E2F],
+  ["EDDC",0x7E30],
+  ["C161",0x7E31],
+  ["C15D",0x7E32],
+  ["EDD3",0x7E33],
+  ["C164",0x7E34],
+  ["C167",0x7E35],
+  ["EDDE",0x7E36],
+  ["C15C",0x7E37],
+  ["EDD5",0x7E38],
+  ["C165",0x7E39],
+  ["EDE0",0x7E3A],
+  ["EDDD",0x7E3B],
+  ["EDD1",0x7E3C],
+  ["C160",0x7E3D],
+  ["C15A",0x7E3E],
+  ["C168",0x7E3F],
+  ["EDD8",0x7E40],
+  ["C163",0x7E41],
+  ["EDD2",0x7E42],
+  ["C15E",0x7E43],
+  ["EDDF",0x7E44],
+  ["C162",0x7E45],
+  ["C15B",0x7E46],
+  ["EDD9",0x7E47],
+  ["C166",0x7E48],
+  ["EDD7",0x7E49],
+  ["EDDB",0x7E4C],
+  ["F06E",0x7E50],
+  ["F074",0x7E51],
+  ["C2B9",0x7E52],
+  ["F077",0x7E53],
+  ["C2B4",0x7E54],
+  ["C2B5",0x7E55],
+  ["F06F",0x7E56],
+  ["F076",0x7E57],
+  ["F071",0x7E58],
+  ["C2BA",0x7E59],
+  ["C2B7",0x7E5A],
+  ["8CDC",0x7E5B],
+  ["F06D",0x7E5C],
+  ["C2B6",0x7E5E],
+  ["F073",0x7E5F],
+  ["F075",0x7E60],
+  ["C2B8",0x7E61],
+  ["F072",0x7E62],
+  ["F070",0x7E63],
+  ["9876",0x7E65],
+  ["8EA1",0x7E67],
+  ["F2B8",0x7E68],
+  ["C3B7",0x7E69],
+  ["C3B8",0x7E6A],
+  ["C3B4",0x7E6B],
+  ["8CB4",0x7E6C],
+  ["C3B5",0x7E6D],
+  ["8EB7",0x7E6E],
+  ["F2B4",0x7E6F],
+  ["F2B2",0x7E70],
+  ["F2B6",0x7E72],
+  ["C3BA",0x7E73],
+  ["F2B7",0x7E74],
+  ["F2B0",0x7E75],
+  ["F2AF",0x7E76],
+  ["F2B3",0x7E77],
+  ["F2B1",0x7E78],
+  ["C3B6",0x7E79],
+  ["F2B5",0x7E7A],
+  ["F4AC",0x7E7B],
+  ["C47E",0x7E7C],
+  ["C47D",0x7E7D],
+  ["F4AD",0x7E7E],
+  ["9DA6",0x7E7F],
+  ["F4AF",0x7E80],
+  ["F4AE",0x7E81],
+  ["C4A1",0x7E82],
+  ["F5EB",0x7E86],
+  ["F5E8",0x7E87],
+  ["F5E9",0x7E88],
+  ["F5E7",0x7E8A],
+  ["F5EA",0x7E8B],
+  ["C4F2",0x7E8C],
+  ["F5EC",0x7E8D],
+  ["9EB0",0x7E8E],
+  ["C4F1",0x7E8F],
+  ["F742",0x7E91],
+  ["8EB8",0x7E92],
+  ["C5D5",0x7E93],
+  ["C5D7",0x7E94],
+  ["F7EE",0x7E95],
+  ["C5D6",0x7E96],
+  ["F8B9",0x7E97],
+  ["F940",0x7E98],
+  ["F942",0x7E99],
+  ["F8FE",0x7E9A],
+  ["F941",0x7E9B],
+  ["C66C",0x7E9C],
+  ["9D70",0x7E9F],
+  ["896E",0x7EA4],
+  ["896F",0x7EAC],
+  ["8970",0x7EBA],
+  ["8971",0x7EC7],
+  ["8972",0x7ECF],
+  ["8973",0x7EDF],
+  ["8974",0x7F06],
+  ["A6CE",0x7F36],
+  ["8975",0x7F37],
+  ["ACFB",0x7F38],
+  ["D26F",0x7F39],
+  ["AFCA",0x7F3A],
+  ["B2DA",0x7F3D],
+  ["DAFC",0x7F3E],
+  ["DAFD",0x7F3F],
+  ["8EBC",0x7F40],
+  ["8EBD",0x7F41],
+  ["EADF",0x7F43],
+  ["C16A",0x7F44],
+  ["EDE1",0x7F45],
+  ["8EBE",0x7F47],
+  ["C2BB",0x7F48],
+  ["9DD1",0x7F49],
+  ["F2BA",0x7F4A],
+  ["F2B9",0x7F4B],
+  ["C4A2",0x7F4C],
+  ["F5ED",0x7F4D],
+  ["94FD",0x7F4E],
+  ["F743",0x7F4F],
+  ["C5F8",0x7F50],
+  ["CA49",0x7F51],
+  ["8BD7",0x7F52],
+  ["8BDA",0x7F53],
+  ["AAC9",0x7F54],
+  ["A875",0x7F55],
+  ["D04D",0x7F58],
+  ["D360",0x7F5B],
+  ["D35B",0x7F5C],
+  ["D35F",0x7F5D],
+  ["D35D",0x7F5E],
+  ["AFCB",0x7F5F],
+  ["D35E",0x7F60],
+  ["D35C",0x7F61],
+  ["D6F1",0x7F63],
+  ["DAFE",0x7F65],
+  ["DB40",0x7F66],
+  ["DF69",0x7F67],
+  ["DF6A",0x7F68],
+  ["B86E",0x7F69],
+  ["B86F",0x7F6A],
+  ["DF68",0x7F6B],
+  ["DF6B",0x7F6C],
+  ["DF67",0x7F6D],
+  ["B86D",0x7F6E],
+  ["BB40",0x7F70],
+  ["A0E2",0x7F71],
+  ["B870",0x7F72],
+  ["E37A",0x7F73],
+  ["BD7C",0x7F75],
+  ["E6F1",0x7F76],
+  ["BD7D",0x7F77],
+  ["9FE9",0x7F78],
+  ["BFA9",0x7F79],
+  ["EAE2",0x7F7A],
+  ["EAE0",0x7F7B],
+  ["EAE1",0x7F7C],
+  ["EDE4",0x7F7D],
+  ["EDE3",0x7F7E],
+  ["EDE2",0x7F7F],
+  ["F2BB",0x7F83],
+  ["C3B9",0x7F85],
+  ["F2BC",0x7F86],
+  ["F744",0x7F87],
+  ["C5F9",0x7F88],
+  ["F8BA",0x7F89],
+  ["A6CF",0x7F8A],
+  ["AACB",0x7F8B],
+  ["AACA",0x7F8C],
+  ["D04F",0x7F8D],
+  ["ACFC",0x7F8E],
+  ["FDA8",0x7F8F],
+  ["D04E",0x7F91],
+  ["D362",0x7F92],
+  ["8AE7",0x7F93],
+  ["AFCC",0x7F94],
+  ["D6F2",0x7F95],
+  ["D361",0x7F96],
+  ["8EC2",0x7F97],
+  ["B2DC",0x7F9A],
+  ["D6F5",0x7F9B],
+  ["D6F3",0x7F9C],
+  ["D6F4",0x7F9D],
+  ["B2DB",0x7F9E],
+  ["DB42",0x7FA0],
+  ["DB43",0x7FA1],
+  ["DB41",0x7FA2],
+  ["8EC4",0x7FA3],
+  ["B873",0x7FA4],
+  ["DF6D",0x7FA5],
+  ["DF6C",0x7FA6],
+  ["DF6E",0x7FA7],
+  ["B872",0x7FA8],
+  ["B871",0x7FA9],
+  ["E6F2",0x7FAC],
+  ["E6F4",0x7FAD],
+  ["9964",0x7FAE],
+  ["BD7E",0x7FAF],
+  ["E6F3",0x7FB0],
+  ["EAE3",0x7FB1],
+  ["BFAA",0x7FB2],
+  ["F079",0x7FB3],
+  ["9965",0x7FB4],
+  ["F078",0x7FB5],
+  ["C3BB",0x7FB6],
+  ["F2BD",0x7FB7],
+  ["C3BD",0x7FB8],
+  ["C3BC",0x7FB9],
+  ["F4B0",0x7FBA],
+  ["F5EE",0x7FBB],
+  ["C4F3",0x7FBC],
+  ["A6D0",0x7FBD],
+  ["D050",0x7FBE],
+  ["ACFD",0x7FBF],
+  ["D365",0x7FC0],
+  ["AFCE",0x7FC1],
+  ["D364",0x7FC2],
+  ["D363",0x7FC3],
+  ["AFCD",0x7FC5],
+  ["D6FB",0x7FC7],
+  ["D6FD",0x7FC9],
+  ["D6F6",0x7FCA],
+  ["D6F7",0x7FCB],
+  ["B2DD",0x7FCC],
+  ["D6F8",0x7FCD],
+  ["B2DE",0x7FCE],
+  ["D6FC",0x7FCF],
+  ["D6F9",0x7FD0],
+  ["D6FA",0x7FD1],
+  ["B2DF",0x7FD2],
+  ["B5BE",0x7FD4],
+  ["B5BF",0x7FD5],
+  ["DB44",0x7FD7],
+  ["DF6F",0x7FDB],
+  ["DF70",0x7FDC],
+  ["954E",0x7FDD],
+  ["E37E",0x7FDE],
+  ["BB43",0x7FDF],
+  ["BB41",0x7FE0],
+  ["BB42",0x7FE1],
+  ["E37B",0x7FE2],
+  ["E37C",0x7FE3],
+  ["E37D",0x7FE5],
+  ["E6F9",0x7FE6],
+  ["98B3",0x7FE7],
+  ["E6FA",0x7FE8],
+  ["BDA1",0x7FE9],
+  ["E6F7",0x7FEA],
+  ["E6F6",0x7FEB],
+  ["E6F8",0x7FEC],
+  ["E6F5",0x7FED],
+  ["BFAD",0x7FEE],
+  ["EAE4",0x7FEF],
+  ["BFAB",0x7FF0],
+  ["BFAC",0x7FF1],
+  ["EDE6",0x7FF2],
+  ["C16B",0x7FF3],
+  ["EDE5",0x7FF4],
+  ["EFA8",0x7FF5],
+  ["F07A",0x7FF7],
+  ["F07B",0x7FF8],
+  ["C2BC",0x7FF9],
+  ["8ECB",0x7FFA],
+  ["C2BD",0x7FFB],
+  ["C16C",0x7FFC],
+  ["F2BE",0x7FFD],
+  ["F2BF",0x7FFE],
+  ["F4B1",0x7FFF],
+  ["C4A3",0x8000],
+  ["A6D1",0x8001],
+  ["8BDF",0x8002],
+  ["A6D2",0x8003],
+  ["ACFE",0x8004],
+  ["AACC",0x8005],
+  ["AFCF",0x8006],
+  ["D051",0x8007],
+  ["8ECE",0x8008],
+  ["B5C0",0x800B],
+  ["A6D3",0x800C],
+  ["AD41",0x800D],
+  ["D052",0x800E],
+  ["D053",0x800F],
+  ["AD40",0x8010],
+  ["AD42",0x8011],
+  ["A6D4",0x8012],
+  ["D054",0x8014],
+  ["AFD1",0x8015],
+  ["D366",0x8016],
+  ["AFD3",0x8017],
+  ["AFD0",0x8018],
+  ["AFD2",0x8019],
+  ["D741",0x801B],
+  ["B2E0",0x801C],
+  ["8ECF",0x801D],
+  ["D740",0x801E],
+  ["D6FE",0x801F],
+  ["9968",0x8020],
+  ["DF71",0x8021],
+  ["E3A1",0x8024],
+  ["9969",0x8025],
+  ["BDA2",0x8026],
+  ["BFAE",0x8028],
+  ["EAE6",0x8029],
+  ["EAE5",0x802A],
+  ["EDE7",0x802C],
+  ["996B",0x802E],
+  ["8ED1",0x802F],
+  ["F5EF",0x8030],
+  ["996C",0x8031],
+  ["A6D5",0x8033],
+  ["CB73",0x8034],
+  ["CDAA",0x8035],
+  ["AD43",0x8036],
+  ["D055",0x8037],
+  ["D368",0x8039],
+  ["8ED4",0x803B],
+  ["8ED5",0x803C],
+  ["AFD4",0x803D],
+  ["D367",0x803E],
+  ["AFD5",0x803F],
+  ["D743",0x8043],
+  ["B2E2",0x8046],
+  ["D742",0x8047],
+  ["D744",0x8048],
+  ["B2E1",0x804A],
+  ["DB46",0x804F],
+  ["DB47",0x8050],
+  ["DB45",0x8051],
+  ["B5C1",0x8052],
+  ["996D",0x8054],
+  ["B874",0x8056],
+  ["B875",0x8058],
+  ["BB45",0x805A],
+  ["A0BE",0x805B],
+  ["E3A3",0x805C],
+  ["E3A2",0x805D],
+  ["BB44",0x805E],
+  ["8ED6",0x8061],
+  ["A0BC",0x8062],
+  ["A0B5",0x8063],
+  ["E6FB",0x8064],
+  ["A0B4",0x8066],
+  ["E6FC",0x8067],
+  ["EAE7",0x806C],
+  ["C170",0x806F],
+  ["C16F",0x8070],
+  ["C16D",0x8071],
+  ["C16E",0x8072],
+  ["C171",0x8073],
+  ["F07C",0x8075],
+  ["C2BF",0x8076],
+  ["C2BE",0x8077],
+  ["F2C0",0x8078],
+  ["F4B2",0x8079],
+  ["C5A5",0x807D],
+  ["C5A4",0x807E],
+  ["A6D6",0x807F],
+  ["8BE0",0x8080],
+  ["D1FB",0x8082],
+  ["B877",0x8084],
+  ["B5C2",0x8085],
+  ["B876",0x8086],
+  ["BB46",0x8087],
+  ["A6D7",0x8089],
+  ["C9A9",0x808A],
+  ["A6D8",0x808B],
+  ["A6D9",0x808C],
+  ["CDAB",0x808F],
+  ["CB76",0x8090],
+  ["CB77",0x8092],
+  ["A877",0x8093],
+  ["CB74",0x8095],
+  ["A876",0x8096],
+  ["A879",0x8098],
+  ["CB75",0x8099],
+  ["A87B",0x809A],
+  ["A87A",0x809B],
+  ["CB78",0x809C],
+  ["A878",0x809D],
+  ["89B5",0x809F],
+  ["AAD1",0x80A1],
+  ["AACF",0x80A2],
+  ["CDAD",0x80A3],
+  ["AACE",0x80A5],
+  ["8EDD",0x80A7],
+  ["AAD3",0x80A9],
+  ["AAD5",0x80AA],
+  ["AAD2",0x80AB],
+  ["CDB0",0x80AD],
+  ["CDAC",0x80AE],
+  ["AAD6",0x80AF],
+  ["AAD0",0x80B1],
+  ["A87C",0x80B2],
+  ["AAD4",0x80B4],
+  ["CDAF",0x80B5],
+  ["9E5D",0x80B6],
+  ["9971",0x80B7],
+  ["CDAE",0x80B8],
+  ["AACD",0x80BA],
+  ["89AE",0x80BC],
+  ["9DE8",0x80BD],
+  ["D05B",0x80C2],
+  ["AD47",0x80C3],
+  ["AD48",0x80C4],
+  ["D05D",0x80C5],
+  ["9565",0x80C6],
+  ["D057",0x80C7],
+  ["D05A",0x80C8],
+  ["D063",0x80C9],
+  ["D061",0x80CA],
+  ["AD49",0x80CC],
+  ["D067",0x80CD],
+  ["AD4C",0x80CE],
+  ["D064",0x80CF],
+  ["D05C",0x80D0],
+  ["D059",0x80D1],
+  ["DB49",0x80D4],
+  ["D062",0x80D5],
+  ["AD44",0x80D6],
+  ["D065",0x80D7],
+  ["D056",0x80D8],
+  ["D05F",0x80D9],
+  ["AD46",0x80DA],
+  ["AD4B",0x80DB],
+  ["D060",0x80DC],
+  ["AD4F",0x80DD],
+  ["AD4D",0x80DE],
+  ["D058",0x80E0],
+  ["AD4A",0x80E1],
+  ["D05E",0x80E3],
+  ["AD4E",0x80E4],
+  ["AD45",0x80E5],
+  ["D066",0x80E6],
+  ["9972",0x80E9],
+  ["8B5C",0x80EC],
+  ["AFDA",0x80ED],
+  ["AFE3",0x80EF],
+  ["AFD8",0x80F0],
+  ["AFD6",0x80F1],
+  ["D36A",0x80F2],
+  ["AFDE",0x80F3],
+  ["AFDB",0x80F4],
+  ["D36C",0x80F5],
+  ["89B1",0x80F6],
+  ["AFDD",0x80F8],
+  ["D36B",0x80F9],
+  ["D369",0x80FA],
+  ["D36E",0x80FB],
+  ["AFE2",0x80FC],
+  ["AFE0",0x80FD],
+  ["DB48",0x80FE],
+  ["D36F",0x8100],
+  ["D36D",0x8101],
+  ["AFD7",0x8102],
+  ["A0C0",0x8103],
+  ["AFD9",0x8105],
+  ["AFDC",0x8106],
+  ["8EDF",0x8107],
+  ["AFDF",0x8108],
+  ["9566",0x8109],
+  ["AFE1",0x810A],
+  ["9974",0x810C],
+  ["9976",0x810E],
+  ["9977",0x8112],
+  ["9979",0x8114],
+  ["D74E",0x8115],
+  ["B2E4",0x8116],
+  ["9DDA",0x8117],
+  ["D745",0x8118],
+  ["D747",0x8119],
+  ["8EE0",0x811A],
+  ["D748",0x811B],
+  ["D750",0x811D],
+  ["D74C",0x811E],
+  ["D74A",0x811F],
+  ["D74D",0x8121],
+  ["D751",0x8122],
+  ["B2E5",0x8123],
+  ["B2E9",0x8124],
+  ["D746",0x8125],
+  ["D74F",0x8127],
+  ["B2E7",0x8129],
+  ["935C",0x812A],
+  ["B2E6",0x812B],
+  ["D74B",0x812C],
+  ["D749",0x812D],
+  ["B2E3",0x812F],
+  ["B2E8",0x8130],
+  ["9DE6",0x8132],
+  ["8B5F",0x8134],
+  ["9563",0x8137],
+  ["B5C8",0x8139],
+  ["DB51",0x813A],
+  ["DB4F",0x813D],
+  ["B5CA",0x813E],
+  ["9567",0x8142],
+  ["DB4A",0x8143],
+  ["DFA1",0x8144],
+  ["B5C9",0x8146],
+  ["DB4E",0x8147],
+  ["9DE3",0x8148],
+  ["DB4B",0x814A],
+  ["B5C5",0x814B],
+  ["B5CB",0x814C],
+  ["DB50",0x814D],
+  ["B5C7",0x814E],
+  ["DB4D",0x814F],
+  ["BB47",0x8150],
+  ["B5C6",0x8151],
+  ["DB4C",0x8152],
+  ["B5CC",0x8153],
+  ["B5C4",0x8154],
+  ["B5C3",0x8155],
+  ["997C",0x8156],
+  ["997D",0x8159],
+  ["997E",0x815A],
+  ["DF77",0x815B],
+  ["DF75",0x815C],
+  ["DF7B",0x815E],
+  ["DF73",0x8160],
+  ["DFA2",0x8161],
+  ["DF78",0x8162],
+  ["DF72",0x8164],
+  ["B87B",0x8165],
+  ["B8A3",0x8166],
+  ["DF7D",0x8167],
+  ["DF76",0x8169],
+  ["B87E",0x816B],
+  ["8CFB",0x816C],
+  ["8B5B",0x816D],
+  ["B87C",0x816E],
+  ["DF7E",0x816F],
+  ["B879",0x8170],
+  ["B878",0x8171],
+  ["DF79",0x8172],
+  ["B87D",0x8173],
+  ["B5CD",0x8174],
+  ["DF7C",0x8176],
+  ["DF74",0x8177],
+  ["B87A",0x8178],
+  ["B8A1",0x8179],
+  ["B8A2",0x817A],
+  ["99A3",0x817C],
+  ["BB4C",0x817F],
+  ["BB48",0x8180],
+  ["BB4D",0x8182],
+  ["E3A6",0x8183],
+  ["99A4",0x8184],
+  ["E3A5",0x8186],
+  ["E3A7",0x8187],
+  ["BB4A",0x8188],
+  ["E3A4",0x8189],
+  ["BB4B",0x818A],
+  ["E3AA",0x818B],
+  ["E3A9",0x818C],
+  ["E3A8",0x818D],
+  ["BB49",0x818F],
+  ["99A6",0x8193],
+  ["E741",0x8195],
+  ["E744",0x8197],
+  ["BDA8",0x8198],
+  ["E743",0x8199],
+  ["BDA7",0x819A],
+  ["BDA3",0x819B],
+  ["BDA4",0x819C],
+  ["BDA5",0x819D],
+  ["E740",0x819E],
+  ["E6FE",0x819F],
+  ["BDA6",0x81A0],
+  ["E742",0x81A2],
+  ["E6FD",0x81A3],
+  ["99A8",0x81A5],
+  ["EAE9",0x81A6],
+  ["EAF3",0x81A7],
+  ["BFB1",0x81A8],
+  ["BFB0",0x81A9],
+  ["8ABE",0x81AA],
+  ["EAED",0x81AB],
+  ["EAEF",0x81AC],
+  ["EAEA",0x81AE],
+  ["EAEE",0x81B0],
+  ["EAE8",0x81B1],
+  ["EAF1",0x81B2],
+  ["BFAF",0x81B3],
+  ["EAF0",0x81B4],
+  ["EAEC",0x81B5],
+  ["9E61",0x81B6],
+  ["EAF2",0x81B7],
+  ["EAEB",0x81B9],
+  ["C174",0x81BA],
+  ["EDE8",0x81BB],
+  ["EDEE",0x81BC],
+  ["C178",0x81BD],
+  ["C17A",0x81BE],
+  ["C177",0x81BF],
+  ["C176",0x81C0],
+  ["99AA",0x81C1],
+  ["C175",0x81C2],
+  ["C173",0x81C3],
+  ["EDE9",0x81C4],
+  ["EDEC",0x81C5],
+  ["C172",0x81C6],
+  ["EDED",0x81C7],
+  ["A0C8",0x81C8],
+  ["C179",0x81C9],
+  ["EDEB",0x81CA],
+  ["EDEA",0x81CC],
+  ["C2C0",0x81CD],
+  ["C2C1",0x81CF],
+  ["F0A1",0x81D0],
+  ["F07D",0x81D1],
+  ["F07E",0x81D2],
+  ["F2C2",0x81D5],
+  ["F2C1",0x81D7],
+  ["C3BE",0x81D8],
+  ["F4B4",0x81D9],
+  ["C4A4",0x81DA],
+  ["F4B3",0x81DB],
+  ["F5F0",0x81DD],
+  ["F745",0x81DE],
+  ["C5A6",0x81DF],
+  ["F943",0x81E0],
+  ["F944",0x81E1],
+  ["C5D8",0x81E2],
+  ["A6DA",0x81E3],
+  ["99AB",0x81E4],
+  ["AAD7",0x81E5],
+  ["DB52",0x81E6],
+  ["BB4E",0x81E7],
+  ["C17B",0x81E8],
+  ["EDEF",0x81E9],
+  ["A6DB",0x81EA],
+  ["AFE5",0x81EC],
+  ["AFE4",0x81ED],
+  ["DB53",0x81EE],
+  ["FEC4",0x81EF],
+  ["EAF4",0x81F2],
+  ["A6DC",0x81F3],
+  ["AD50",0x81F4],
+  ["98C2",0x81F6],
+  ["DB54",0x81F7],
+  ["DB55",0x81F8],
+  ["DB56",0x81F9],
+  ["BB4F",0x81FA],
+  ["BFB2",0x81FB],
+  ["A6DD",0x81FC],
+  ["AAD8",0x81FE],
+  ["D068",0x81FF],
+  ["AFE6",0x8200],
+  ["D370",0x8201],
+  ["B2EA",0x8202],
+  ["DB57",0x8204],
+  ["B8A4",0x8205],
+  ["BB50",0x8207],
+  ["BFB3",0x8208],
+  ["C17C",0x8209],
+  ["C2C2",0x820A],
+  ["F4B5",0x820B],
+  ["A6DE",0x820C],
+  ["AAD9",0x820D],
+  ["AFE7",0x8210],
+  ["D752",0x8211],
+  ["B5CE",0x8212],
+  ["BB51",0x8214],
+  ["E3AB",0x8215],
+  ["E745",0x8216],
+  ["8EE8",0x8218],
+  ["A0BA",0x821A],
+  ["A6DF",0x821B],
+  ["B5CF",0x821C],
+  ["DFA3",0x821D],
+  ["BB52",0x821E],
+  ["A6E0",0x821F],
+  ["CDB1",0x8220],
+  ["D069",0x8221],
+  ["AD51",0x8222],
+  ["D372",0x8225],
+  ["FD77",0x8226],
+  ["AFEA",0x8228],
+  ["8EEE",0x8229],
+  ["AFE8",0x822A],
+  ["AFE9",0x822B],
+  ["AFEB",0x822C],
+  ["9EBF",0x822D],
+  ["D371",0x822F],
+  ["D757",0x8232],
+  ["D754",0x8233],
+  ["D756",0x8234],
+  ["B2EB",0x8235],
+  ["B2ED",0x8236],
+  ["B2EC",0x8237],
+  ["D753",0x8238],
+  ["B2EE",0x8239],
+  ["D755",0x823A],
+  ["DB58",0x823C],
+  ["DB59",0x823D],
+  ["89C2",0x823E],
+  ["DB5A",0x823F],
+  ["DFA6",0x8240],
+  ["DFA7",0x8242],
+  ["DFA5",0x8244],
+  ["DFA8",0x8245],
+  ["B8A5",0x8247],
+  ["DFA4",0x8249],
+  ["BB53",0x824B],
+  ["E74A",0x824E],
+  ["E746",0x824F],
+  ["E749",0x8250],
+  ["E74B",0x8251],
+  ["E748",0x8252],
+  ["E747",0x8253],
+  ["99AC",0x8254],
+  ["EAF5",0x8255],
+  ["EAF6",0x8256],
+  ["EAF7",0x8257],
+  ["BFB4",0x8258],
+  ["BFB5",0x8259],
+  ["EDF1",0x825A],
+  ["EDF0",0x825B],
+  ["EDF2",0x825C],
+  ["F0A3",0x825E],
+  ["F0A2",0x825F],
+  ["F2C4",0x8261],
+  ["956B",0x8262],
+  ["F2C5",0x8263],
+  ["F2C3",0x8264],
+  ["956C",0x8265],
+  ["C4A5",0x8266],
+  ["F4B6",0x8268],
+  ["F4B7",0x8269],
+  ["F746",0x826B],
+  ["F7EF",0x826C],
+  ["F8BB",0x826D],
+  ["A6E1",0x826E],
+  ["A87D",0x826F],
+  ["C17D",0x8271],
+  ["A6E2",0x8272],
+  ["D758",0x8274],
+  ["DB5B",0x8275],
+  ["99AF",0x8276],
+  ["C641",0x8277],
+  ["CA4A",0x8278],
+  ["994A",0x8279],
+  ["8976",0x827A],
+  ["8F48",0x827B],
+  ["CA4B",0x827C],
+  ["CA4D",0x827D],
+  ["A6E3",0x827E],
+  ["CA4E",0x827F],
+  ["CA4C",0x8280],
+  ["CBA2",0x8283],
+  ["CBA3",0x8284],
+  ["CB7B",0x8285],
+  ["FBEE",0x8287],
+  ["CBA1",0x828A],
+  ["A8A1",0x828B],
+  ["A8A2",0x828D],
+  ["CB7C",0x828E],
+  ["CB7A",0x828F],
+  ["CB79",0x8290],
+  ["CB7D",0x8291],
+  ["A87E",0x8292],
+  ["CB7E",0x8293],
+  ["D06A",0x8294],
+  ["CDB6",0x8298],
+  ["AADC",0x8299],
+  ["CDB5",0x829A],
+  ["CDB7",0x829B],
+  ["AADB",0x829D],
+  ["CDBC",0x829E],
+  ["AADF",0x829F],
+  ["CDB2",0x82A0],
+  ["CDC0",0x82A1],
+  ["CDC6",0x82A2],
+  ["AAE6",0x82A3],
+  ["CDC3",0x82A4],
+  ["AAE3",0x82A5],
+  ["99AE",0x82A6],
+  ["CDB9",0x82A7],
+  ["CDBF",0x82A8],
+  ["CDC1",0x82A9],
+  ["8EFB",0x82AA],
+  ["CDB4",0x82AB],
+  ["AAE2",0x82AC],
+  ["AADD",0x82AD],
+  ["CDBA",0x82AE],
+  ["AAE4",0x82AF],
+  ["AAE7",0x82B0],
+  ["AAE1",0x82B1],
+  ["AADA",0x82B3],
+  ["CDBE",0x82B4],
+  ["CDB8",0x82B5],
+  ["CDC5",0x82B6],
+  ["AAE9",0x82B7],
+  ["AAE5",0x82B8],
+  ["AAE0",0x82B9],
+  ["CDBD",0x82BA],
+  ["AFEC",0x82BB],
+  ["CDBB",0x82BC],
+  ["AADE",0x82BD],
+  ["AAE8",0x82BE],
+  ["8CD0",0x82BF],
+  ["CDB3",0x82C0],
+  ["CDC2",0x82C2],
+  ["CDC4",0x82C3],
+  ["8B52",0x82C4],
+  ["99B0",0x82CA],
+  ["8977",0x82CF],
+  ["8F41",0x82D0],
+  ["AD62",0x82D1],
+  ["AD5C",0x82D2],
+  ["AD64",0x82D3],
+  ["AD61",0x82D4],
+  ["D071",0x82D5],
+  ["D074",0x82D6],
+  ["AD5D",0x82D7],
+  ["99B1",0x82D8],
+  ["D06B",0x82D9],
+  ["AD56",0x82DB],
+  ["AD60",0x82DC],
+  ["AD63",0x82DE],
+  ["AD65",0x82DF],
+  ["D0A2",0x82E0],
+  ["D077",0x82E1],
+  ["8F49",0x82E2],
+  ["AD55",0x82E3],
+  ["D0A1",0x82E4],
+  ["AD59",0x82E5],
+  ["AD57",0x82E6],
+  ["AD52",0x82E7],
+  ["D06F",0x82E8],
+  ["D07E",0x82EA],
+  ["D073",0x82EB],
+  ["D076",0x82EC],
+  ["D0A5",0x82ED],
+  ["FA4D",0x82EE],
+  ["AD66",0x82EF],
+  ["D07D",0x82F0],
+  ["AD5E",0x82F1],
+  ["D078",0x82F2],
+  ["D0A4",0x82F3],
+  ["D075",0x82F4],
+  ["D079",0x82F5],
+  ["D07C",0x82F6],
+  ["9DE4",0x82F7],
+  ["8CB5",0x82F8],
+  ["D06D",0x82F9],
+  ["D0A3",0x82FA],
+  ["D07B",0x82FB],
+  ["FBE9",0x82FC],
+  ["9B54",0x82FD],
+  ["D06C",0x82FE],
+  ["99B2",0x82FF],
+  ["D070",0x8300],
+  ["AD5F",0x8301],
+  ["AD5A",0x8302],
+  ["AD53",0x8303],
+  ["AD58",0x8304],
+  ["AD54",0x8305],
+  ["AD67",0x8306],
+  ["D06E",0x8307],
+  ["D3A5",0x8308],
+  ["AD5B",0x8309],
+  ["9E68",0x830B],
+  ["D07A",0x830C],
+  ["CE41",0x830D],
+  ["D3A8",0x8316],
+  ["AFFA",0x8317],
+  ["8F4A",0x8318],
+  ["D376",0x8319],
+  ["8F42",0x831A],
+  ["D3A3",0x831B],
+  ["D37D",0x831C],
+  ["8F51",0x831D],
+  ["D3B2",0x831E],
+  ["D3AA",0x8320],
+  ["D37E",0x8322],
+  ["D3A9",0x8324],
+  ["D378",0x8325],
+  ["D37C",0x8326],
+  ["D3B5",0x8327],
+  ["AFFD",0x8328],
+  ["D3AD",0x8329],
+  ["D3A4",0x832A],
+  ["AFED",0x832B],
+  ["D3B3",0x832C],
+  ["D374",0x832D],
+  ["D3AC",0x832F],
+  ["AFFC",0x8331],
+  ["AFF7",0x8332],
+  ["D373",0x8333],
+  ["AFF5",0x8334],
+  ["AFF4",0x8335],
+  ["AFF9",0x8336],
+  ["D3AB",0x8337],
+  ["AFF1",0x8338],
+  ["AFF8",0x8339],
+  ["D072",0x833A],
+  ["DB5C",0x833B],
+  ["D3A6",0x833C],
+  ["9846",0x833D],
+  ["D37A",0x833F],
+  ["AFFB",0x8340],
+  ["D37B",0x8341],
+  ["D3A1",0x8342],
+  ["AFFE",0x8343],
+  ["D375",0x8344],
+  ["D3AF",0x8345],
+  ["D3AE",0x8347],
+  ["D3B6",0x8348],
+  ["AFF3",0x8349],
+  ["AFF0",0x834A],
+  ["D3B4",0x834B],
+  ["D3B0",0x834C],
+  ["D3A7",0x834D],
+  ["D3A2",0x834E],
+  ["AFF6",0x834F],
+  ["AFF2",0x8350],
+  ["D377",0x8351],
+  ["AFEE",0x8352],
+  ["D3B1",0x8353],
+  ["AFEF",0x8354],
+  ["D379",0x8356],
+  ["99B4",0x8357],
+  ["8EF5",0x8362],
+  ["FD55",0x8363],
+  ["9CCD",0x8366],
+  ["8978",0x836F],
+  ["D75E",0x8373],
+  ["D760",0x8374],
+  ["D765",0x8375],
+  ["D779",0x8376],
+  ["B2FC",0x8377],
+  ["B2F2",0x8378],
+  ["D75D",0x837A],
+  ["B2FD",0x837B],
+  ["B2FE",0x837C],
+  ["D768",0x837D],
+  ["D76F",0x837E],
+  ["D775",0x837F],
+  ["D762",0x8381],
+  ["D769",0x8383],
+  ["8F53",0x8385],
+  ["B340",0x8386],
+  ["D777",0x8387],
+  ["D772",0x8388],
+  ["B2FA",0x8389],
+  ["B2F8",0x838A],
+  ["D76E",0x838B],
+  ["D76A",0x838C],
+  ["D75C",0x838D],
+  ["B2EF",0x838E],
+  ["D761",0x838F],
+  ["D759",0x8390],
+  ["8F6F",0x8391],
+  ["B2F7",0x8392],
+  ["B2F9",0x8393],
+  ["D766",0x8394],
+  ["D763",0x8395],
+  ["B2F4",0x8396],
+  ["D773",0x8397],
+  ["B2F1",0x8398],
+  ["D764",0x8399],
+  ["D77A",0x839A],
+  ["D76C",0x839B],
+  ["8E63",0x839C],
+  ["D76B",0x839D],
+  ["B2F0",0x839E],
+  ["B2FB",0x83A0],
+  ["B2F3",0x83A2],
+  ["D75A",0x83A3],
+  ["D75F",0x83A4],
+  ["D770",0x83A5],
+  ["D776",0x83A6],
+  ["B341",0x83A7],
+  ["D75B",0x83A8],
+  ["D767",0x83A9],
+  ["D76D",0x83AA],
+  ["B2F6",0x83AB],
+  ["8F56",0x83AC],
+  ["D778",0x83AE],
+  ["D771",0x83AF],
+  ["D774",0x83B0],
+  ["FE76",0x83B9],
+  ["B2F5",0x83BD],
+  ["9FC6",0x83BE],
+  ["DB6C",0x83BF],
+  ["DB60",0x83C0],
+  ["B5D7",0x83C1],
+  ["DB7D",0x83C2],
+  ["DBA7",0x83C3],
+  ["DBAA",0x83C4],
+  ["B5D5",0x83C5],
+  ["DB68",0x83C6],
+  ["DBA3",0x83C7],
+  ["DB69",0x83C8],
+  ["DB77",0x83C9],
+  ["B5E2",0x83CA],
+  ["DB73",0x83CB],
+  ["B5DF",0x83CC],
+  ["FAAC",0x83CD],
+  ["DB74",0x83CE],
+  ["DB5D",0x83CF],
+  ["DBA4",0x83D1],
+  ["8F58",0x83D3],
+  ["B5E8",0x83D4],
+  ["DBA1",0x83D5],
+  ["DB75",0x83D6],
+  ["DBAC",0x83D7],
+  ["DB70",0x83D8],
+  ["DFC8",0x83D9],
+  ["DBAF",0x83DB],
+  ["B5E6",0x83DC],
+  ["DB6E",0x83DD],
+  ["DB7A",0x83DE],
+  ["B5E9",0x83DF],
+  ["B5D4",0x83E0],
+  ["DB72",0x83E1],
+  ["DBAD",0x83E2],
+  ["DB6B",0x83E3],
+  ["DB64",0x83E4],
+  ["DB6F",0x83E5],
+  ["DB63",0x83E7],
+  ["DB61",0x83E8],
+  ["B5D0",0x83E9],
+  ["DBA5",0x83EA],
+  ["DB6A",0x83EB],
+  ["DBA8",0x83EC],
+  ["9848",0x83ED],
+  ["DBA9",0x83EE],
+  ["B5D8",0x83EF],
+  ["B5DD",0x83F0],
+  ["B5D9",0x83F1],
+  ["B5E1",0x83F2],
+  ["DB7E",0x83F3],
+  ["B5DA",0x83F4],
+  ["DB76",0x83F5],
+  ["DB66",0x83F6],
+  ["B5D2",0x83F8],
+  ["DB5E",0x83F9],
+  ["DBA2",0x83FA],
+  ["DBAB",0x83FB],
+  ["DB65",0x83FC],
+  ["B5E0",0x83FD],
+  ["DBB0",0x83FE],
+  ["DB71",0x83FF],
+  ["DB6D",0x8401],
+  ["B5D1",0x8403],
+  ["B5E5",0x8404],
+  ["99B7",0x8405],
+  ["DB7C",0x8406],
+  ["B5E7",0x8407],
+  ["DB78",0x8409],
+  ["B5DC",0x840A],
+  ["B5D6",0x840B],
+  ["B5DE",0x840C],
+  ["B5D3",0x840D],
+  ["B5E4",0x840E],
+  ["DB79",0x840F],
+  ["DB67",0x8410],
+  ["DB7B",0x8411],
+  ["DB62",0x8412],
+  ["DBA6",0x8413],
+  ["9665",0x8414],
+  ["FA6C",0x8416],
+  ["9DE7",0x8418],
+  ["DBAE",0x841B],
+  ["9E62",0x841C],
+  ["96CC",0x8420],
+  ["8E67",0x8421],
+  ["DB5F",0x8423],
+  ["FC75",0x8424],
+  ["987E",0x8426],
+  ["DFC7",0x8429],
+  ["DFDD",0x842B],
+  ["B855",0x842C],
+  ["DFCC",0x842D],
+  ["FDB9",0x842E],
+  ["DFCA",0x842F],
+  ["DFB5",0x8430],
+  ["B8A9",0x8431],
+  ["DFC5",0x8432],
+  ["DFD9",0x8433],
+  ["DFC1",0x8434],
+  ["B8B1",0x8435],
+  ["DFD8",0x8436],
+  ["DFBF",0x8437],
+  ["B5E3",0x8438],
+  ["DFCF",0x8439],
+  ["DFC0",0x843A],
+  ["DFD6",0x843B],
+  ["B8B0",0x843C],
+  ["B8A8",0x843D],
+  ["97FC",0x843E],
+  ["DFAA",0x843F],
+  ["DFB2",0x8440],
+  ["DFCB",0x8442],
+  ["DFC3",0x8443],
+  ["DFDC",0x8444],
+  ["DFC6",0x8445],
+  ["B8B6",0x8446],
+  ["DFD7",0x8447],
+  ["98F9",0x8448],
+  ["B8AD",0x8449],
+  ["8F66",0x844A],
+  ["DFC9",0x844B],
+  ["DFD1",0x844C],
+  ["DFB6",0x844D],
+  ["DFD0",0x844E],
+  ["DFE1",0x8450],
+  ["DFB1",0x8451],
+  ["DFD2",0x8452],
+  ["956E",0x8453],
+  ["DFDF",0x8454],
+  ["9245",0x8455],
+  ["DFAB",0x8456],
+  ["B5DB",0x8457],
+  ["8F60",0x8458],
+  ["DFB9",0x8459],
+  ["DFB8",0x845A],
+  ["B8AF",0x845B],
+  ["9ED1",0x845C],
+  ["DFBC",0x845D],
+  ["DFBE",0x845E],
+  ["DFCD",0x845F],
+  ["DFDE",0x8460],
+  ["B8B2",0x8461],
+  ["FECD",0x8462],
+  ["B8B3",0x8463],
+  ["99B9",0x8464],
+  ["DFB0",0x8465],
+  ["B8AB",0x8466],
+  ["DFB4",0x8467],
+  ["DFDA",0x8468],
+  ["B8B4",0x8469],
+  ["B8AC",0x846B],
+  ["B8AE",0x846C],
+  ["B8B5",0x846D],
+  ["DFE0",0x846E],
+  ["DFD3",0x846F],
+  ["DFCE",0x8470],
+  ["8F62",0x8471],
+  ["974C",0x8472],
+  ["DFBB",0x8473],
+  ["DFBA",0x8474],
+  ["B8AA",0x8475],
+  ["DFAC",0x8476],
+  ["B8A7",0x8477],
+  ["DFC4",0x8478],
+  ["DFAD",0x8479],
+  ["DFC2",0x847A],
+  ["DFB7",0x847D],
+  ["DFDB",0x847E],
+  ["91C7",0x847F],
+  ["955F",0x8480],
+  ["B8A6",0x8482],
+  ["DFB3",0x8486],
+  ["99BB",0x8488],
+  ["DFAF",0x848D],
+  ["DFD5",0x848E],
+  ["DFAE",0x848F],
+  ["BB60",0x8490],
+  ["E3D3",0x8491],
+  ["8E6D",0x8492],
+  ["8F71",0x8493],
+  ["E3C2",0x8494],
+  ["94CB",0x8496],
+  ["E3AC",0x8497],
+  ["E3CA",0x8498],
+  ["BB58",0x8499],
+  ["E3BB",0x849A],
+  ["E3C5",0x849B],
+  ["BB5B",0x849C],
+  ["E3BE",0x849D],
+  ["BB59",0x849E],
+  ["E3AF",0x849F],
+  ["E3CD",0x84A0],
+  ["E3AE",0x84A1],
+  ["E3C1",0x84A2],
+  ["95B1",0x84A3],
+  ["E3AD",0x84A4],
+  ["E3BF",0x84A7],
+  ["E3C8",0x84A8],
+  ["E3C6",0x84A9],
+  ["E3BA",0x84AA],
+  ["E3B5",0x84AB],
+  ["E3B3",0x84AC],
+  ["9AF2",0x84AD],
+  ["E3B4",0x84AE],
+  ["E3C7",0x84AF],
+  ["E3D2",0x84B0],
+  ["E3BC",0x84B1],
+  ["BB5A",0x84B2],
+  ["E3B7",0x84B4],
+  ["E3CB",0x84B6],
+  ["BB5D",0x84B8],
+  ["E3B6",0x84B9],
+  ["E3B0",0x84BA],
+  ["E3C0",0x84BB],
+  ["BB61",0x84BC],
+  ["96C3",0x84BD],
+  ["99BD",0x84BE],
+  ["BB55",0x84BF],
+  ["BB5E",0x84C0],
+  ["E3B8",0x84C1],
+  ["E3B2",0x84C2],
+  ["BB57",0x84C4],
+  ["DFD4",0x84C5],
+  ["BB56",0x84C6],
+  ["E3C3",0x84C7],
+  ["BB54",0x84C9],
+  ["BB63",0x84CA],
+  ["BB5C",0x84CB],
+  ["E3C4",0x84CC],
+  ["E3B9",0x84CD],
+  ["E3B1",0x84CE],
+  ["E3CC",0x84CF],
+  ["E3BD",0x84D0],
+  ["BB62",0x84D1],
+  ["E3D0",0x84D2],
+  ["BB5F",0x84D3],
+  ["E3CF",0x84D4],
+  ["E3C9",0x84D6],
+  ["E3CE",0x84D7],
+  ["A0CF",0x84DA],
+  ["E3D1",0x84DB],
+  ["8F6D",0x84DE],
+  ["99BE",0x84E1],
+  ["8EF4",0x84E2],
+  ["8F72",0x84E4],
+  ["95E4",0x84E5],
+  ["E773",0x84E7],
+  ["E774",0x84E8],
+  ["E767",0x84E9],
+  ["E766",0x84EA],
+  ["E762",0x84EB],
+  ["BDB4",0x84EC],
+  ["BDAC",0x84EE],
+  ["E776",0x84EF],
+  ["E775",0x84F0],
+  ["DFA9",0x84F1],
+  ["E75F",0x84F2],
+  ["E763",0x84F3],
+  ["E75D",0x84F4],
+  ["E770",0x84F6],
+  ["E761",0x84F7],
+  ["99BF",0x84F8],
+  ["E777",0x84F9],
+  ["E75A",0x84FA],
+  ["E758",0x84FB],
+  ["E764",0x84FC],
+  ["E76E",0x84FD],
+  ["E769",0x84FE],
+  ["BDB6",0x84FF],
+  ["E74F",0x8500],
+  ["E76D",0x8502],
+  ["9242",0x8503],
+  ["FBA5",0x8505],
+  ["BDB7",0x8506],
+  ["DFBD",0x8507],
+  ["E75B",0x8508],
+  ["E752",0x8509],
+  ["E755",0x850A],
+  ["E77B",0x850B],
+  ["E75C",0x850C],
+  ["E753",0x850D],
+  ["E751",0x850E],
+  ["E74E",0x850F],
+  ["99C0",0x8510],
+  ["BDB0",0x8511],
+  ["E765",0x8512],
+  ["BDAF",0x8513],
+  ["BDB3",0x8514],
+  ["E760",0x8515],
+  ["E768",0x8516],
+  ["BDA9",0x8517],
+  ["E778",0x8518],
+  ["E77C",0x8519],
+  ["BDAB",0x851A],
+  ["E757",0x851C],
+  ["E76B",0x851D],
+  ["E76F",0x851E],
+  ["E754",0x851F],
+  ["E779",0x8520],
+  ["BDB2",0x8521],
+  ["BDB1",0x8523],
+  ["E74C",0x8524],
+  ["BDB5",0x8525],
+  ["E772",0x8526],
+  ["E756",0x8527],
+  ["E76A",0x8528],
+  ["E750",0x8529],
+  ["E75E",0x852A],
+  ["E759",0x852B],
+  ["BDAD",0x852C],
+  ["BDAE",0x852D],
+  ["E76C",0x852E],
+  ["E77D",0x852F],
+  ["E77A",0x8530],
+  ["E771",0x8531],
+  ["FDB4",0x8533],
+  ["8F77",0x8534],
+  ["99C1",0x8538],
+  ["E74D",0x853B],
+  ["BDAA",0x853D],
+  ["EB49",0x853E],
+  ["EB40",0x8540],
+  ["EB43",0x8541],
+  ["FAB9",0x8542],
+  ["BFBB",0x8543],
+  ["EB45",0x8544],
+  ["EAF9",0x8545],
+  ["EB41",0x8546],
+  ["EB47",0x8547],
+  ["BFB8",0x8548],
+  ["BFBC",0x8549],
+  ["BFB6",0x854A],
+  ["8F40",0x854B],
+  ["FA44",0x854C],
+  ["EAFB",0x854D],
+  ["EB4C",0x854E],
+  ["EB46",0x8551],
+  ["99C2",0x8552],
+  ["EAFC",0x8553],
+  ["EB55",0x8554],
+  ["EB4F",0x8555],
+  ["EAF8",0x8556],
+  ["EE46",0x8557],
+  ["EAFE",0x8558],
+  ["BFB7",0x8559],
+  ["8F5C",0x855A],
+  ["EB4A",0x855B],
+  ["EB54",0x855D],
+  ["BFBF",0x855E],
+  ["8CBD",0x855F],
+  ["EB51",0x8560],
+  ["EAFD",0x8561],
+  ["EB44",0x8562],
+  ["EB48",0x8563],
+  ["EB42",0x8564],
+  ["EB56",0x8565],
+  ["EB53",0x8566],
+  ["EB50",0x8567],
+  ["BFB9",0x8568],
+  ["BFBA",0x8569],
+  ["BFBE",0x856A],
+  ["EAFA",0x856B],
+  ["EB57",0x856C],
+  ["BFBD",0x856D],
+  ["EB4D",0x856E],
+  ["99C4",0x856F],
+  ["99C5",0x8570],
+  ["EB4B",0x8571],
+  ["8F7B",0x8573],
+  ["EB4E",0x8575],
+  ["EE53",0x8576],
+  ["EE40",0x8577],
+  ["EE45",0x8578],
+  ["EE52",0x8579],
+  ["EE44",0x857A],
+  ["EDFB",0x857B],
+  ["EE41",0x857C],
+  ["C1A2",0x857E],
+  ["EDF4",0x8580],
+  ["EE4D",0x8581],
+  ["EE4F",0x8582],
+  ["EDF3",0x8583],
+  ["C1A1",0x8584],
+  ["EE51",0x8585],
+  ["EE49",0x8586],
+  ["C1A8",0x8587],
+  ["EE50",0x8588],
+  ["EE42",0x8589],
+  ["C1AA",0x858A],
+  ["EDF9",0x858B],
+  ["EB52",0x858C],
+  ["EE4A",0x858D],
+  ["EE47",0x858E],
+  ["EDF5",0x858F],
+  ["EE55",0x8590],
+  ["C1A4",0x8591],
+  ["8776",0x8593],
+  ["C1A5",0x8594],
+  ["EDF7",0x8595],
+  ["EE48",0x8596],
+  ["8CB6",0x8597],
+  ["EE54",0x8598],
+  ["EE4B",0x8599],
+  ["EDFD",0x859A],
+  ["C1A7",0x859B],
+  ["C1A3",0x859C],
+  ["EE4C",0x859D],
+  ["EDFE",0x859E],
+  ["EE56",0x859F],
+  ["EDF8",0x85A0],
+  ["EE43",0x85A1],
+  ["EE4E",0x85A2],
+  ["EDFA",0x85A3],
+  ["EDFC",0x85A4],
+  ["C2CB",0x85A6],
+  ["EDF6",0x85A7],
+  ["C1A9",0x85A8],
+  ["C2C4",0x85A9],
+  ["C17E",0x85AA],
+  ["C1A6",0x85AF],
+  ["C2C8",0x85B0],
+  ["F0B3",0x85B1],
+  ["F0A9",0x85B3],
+  ["F0A4",0x85B4],
+  ["F0AA",0x85B5],
+  ["F0B4",0x85B6],
+  ["F0B8",0x85B7],
+  ["F0B7",0x85B8],
+  ["C2CA",0x85B9],
+  ["C2C9",0x85BA],
+  ["F0AB",0x85BD],
+  ["F0B9",0x85BE],
+  ["F0AE",0x85BF],
+  ["F0A6",0x85C0],
+  ["8FA3",0x85C1],
+  ["F0A8",0x85C2],
+  ["F0A7",0x85C3],
+  ["F0AD",0x85C4],
+  ["F0B2",0x85C5],
+  ["F0A5",0x85C6],
+  ["F0AC",0x85C7],
+  ["F0B1",0x85C8],
+  ["C2C7",0x85C9],
+  ["F0AF",0x85CB],
+  ["C2C5",0x85CD],
+  ["F0B0",0x85CE],
+  ["C2C3",0x85CF],
+  ["C2C6",0x85D0],
+  ["F2D5",0x85D1],
+  ["F0B5",0x85D2],
+  ["C3C2",0x85D5],
+  ["8CCE",0x85D6],
+  ["F2CD",0x85D7],
+  ["F2D1",0x85D8],
+  ["F2C9",0x85D9],
+  ["F2CC",0x85DA],
+  ["F2D4",0x85DC],
+  ["C3C0",0x85DD],
+  ["F2D9",0x85DE],
+  ["F2D2",0x85DF],
+  ["99C6",0x85E0],
+  ["F2CA",0x85E1],
+  ["F2DA",0x85E2],
+  ["F2D3",0x85E3],
+  ["C3C3",0x85E4],
+  ["C3C4",0x85E5],
+  ["F2D7",0x85E6],
+  ["F2CB",0x85E8],
+  ["C3BF",0x85E9],
+  ["C3C1",0x85EA],
+  ["F2C6",0x85EB],
+  ["F2CE",0x85EC],
+  ["F2C8",0x85ED],
+  ["96CD",0x85EE],
+  ["F2D8",0x85EF],
+  ["F2D6",0x85F0],
+  ["F2C7",0x85F1],
+  ["F2CF",0x85F2],
+  ["F4BE",0x85F6],
+  ["C3C5",0x85F7],
+  ["F2D0",0x85F8],
+  ["C4A7",0x85F9],
+  ["C4A9",0x85FA],
+  ["C4A6",0x85FB],
+  ["96C7",0x85FC],
+  ["F4C3",0x85FD],
+  ["F4BB",0x85FE],
+  ["F4B9",0x85FF],
+  ["F4BD",0x8600],
+  ["F4BA",0x8601],
+  ["8FA5",0x8602],
+  ["F4BF",0x8604],
+  ["F4C1",0x8605],
+  ["C4AA",0x8606],
+  ["C4AC",0x8607],
+  ["F4C0",0x8609],
+  ["C4AD",0x860A],
+  ["C4AB",0x860B],
+  ["F4C2",0x860C],
+  ["FABB",0x860D],
+  ["8C61",0x860F],
+  ["9570",0x8610],
+  ["C4A8",0x8611],
+  ["9368",0x8614],
+  ["8F7E",0x8616],
+  ["C4F4",0x8617],
+  ["F5F1",0x8618],
+  ["F5F7",0x8619],
+  ["C4F6",0x861A],
+  ["F4BC",0x861B],
+  ["F5F6",0x861C],
+  ["F5FD",0x861E],
+  ["F5F4",0x861F],
+  ["F5FB",0x8620],
+  ["F5FA",0x8621],
+  ["F4B8",0x8622],
+  ["F5F5",0x8623],
+  ["F0B6",0x8624],
+  ["F5FE",0x8625],
+  ["F5F3",0x8626],
+  ["F5F8",0x8627],
+  ["8FAA",0x8628],
+  ["F5FC",0x8629],
+  ["F5F2",0x862A],
+  ["F74A",0x862C],
+  ["C4F5",0x862D],
+  ["F5F9",0x862E],
+  ["A050",0x862F],
+  ["F7F4",0x8631],
+  ["F74B",0x8632],
+  ["F749",0x8633],
+  ["F747",0x8634],
+  ["F748",0x8635],
+  ["F74C",0x8636],
+  ["C5D9",0x8638],
+  ["F7F2",0x8639],
+  ["F7F0",0x863A],
+  ["F7F5",0x863B],
+  ["F7F3",0x863C],
+  ["F7F6",0x863E],
+  ["C5DA",0x863F],
+  ["F7F1",0x8640],
+  ["90D3",0x8642],
+  ["F8BC",0x8643],
+  ["9556",0x8645],
+  ["F945",0x8646],
+  ["F946",0x8647],
+  ["F947",0x8648],
+  ["F9C7",0x864B],
+  ["F9BD",0x864C],
+  ["CA4F",0x864D],
+  ["AAEA",0x864E],
+  ["AD68",0x8650],
+  ["D3B8",0x8652],
+  ["D3B7",0x8653],
+  ["B040",0x8654],
+  ["B342",0x8655],
+  ["D77C",0x8656],
+  ["D77B",0x8659],
+  ["B5EA",0x865B],
+  ["B8B8",0x865C],
+  ["B8B7",0x865E],
+  ["B8B9",0x865F],
+  ["E3D4",0x8661],
+  ["E77E",0x8662],
+  ["EB58",0x8663],
+  ["EB5A",0x8664],
+  ["EB59",0x8665],
+  ["C1AB",0x8667],
+  ["EE57",0x8668],
+  ["F0BA",0x8669],
+  ["F9A5",0x866A],
+  ["A6E4",0x866B],
+  ["8FB8",0x866C],
+  ["CDC9",0x866D],
+  ["CDCA",0x866E],
+  ["CDC8",0x866F],
+  ["CDC7",0x8670],
+  ["AAEB",0x8671],
+  ["99C8",0x8672],
+  ["D0A9",0x8673],
+  ["D0A7",0x8674],
+  ["D0A6",0x8677],
+  ["AD69",0x8679],
+  ["AD6B",0x867A],
+  ["AD6A",0x867B],
+  ["D0A8",0x867C],
+  ["8FAF",0x867E],
+  ["D3C4",0x8685],
+  ["D3C1",0x8686],
+  ["D3BF",0x8687],
+  ["B041",0x868A],
+  ["D3C2",0x868B],
+  ["B046",0x868C],
+  ["D3BC",0x868D],
+  ["D3CB",0x868E],
+  ["D3CD",0x8690],
+  ["D3BD",0x8691],
+  ["99C9",0x8692],
+  ["B043",0x8693],
+  ["D3CE",0x8694],
+  ["D3C9",0x8695],
+  ["D3BB",0x8696],
+  ["D3C0",0x8697],
+  ["D3CA",0x8698],
+  ["D3C6",0x8699],
+  ["D3C3",0x869A],
+  ["B048",0x869C],
+  ["D3CC",0x869D],
+  ["D3BE",0x869E],
+  ["9579",0x86A0],
+  ["D3C7",0x86A1],
+  ["D3B9",0x86A2],
+  ["B047",0x86A3],
+  ["B044",0x86A4],
+  ["D3C5",0x86A5],
+  ["D3C8",0x86A7],
+  ["D3BA",0x86A8],
+  ["B045",0x86A9],
+  ["B042",0x86AA],
+  ["9F49",0x86AD],
+  ["B34C",0x86AF],
+  ["D7A5",0x86B0],
+  ["B34B",0x86B1],
+  ["99CA",0x86B2],
+  ["D7A8",0x86B3],
+  ["D7AB",0x86B4],
+  ["B348",0x86B5],
+  ["B346",0x86B6],
+  ["D77E",0x86B7],
+  ["D7A9",0x86B8],
+  ["D7A7",0x86B9],
+  ["D7A4",0x86BA],
+  ["D7AC",0x86BB],
+  ["D7AD",0x86BC],
+  ["D7AF",0x86BD],
+  ["D7B0",0x86BE],
+  ["D77D",0x86BF],
+  ["B345",0x86C0],
+  ["D7A2",0x86C1],
+  ["D7A1",0x86C2],
+  ["D7AE",0x86C3],
+  ["B347",0x86C4],
+  ["D7A3",0x86C5],
+  ["B349",0x86C6],
+  ["B344",0x86C7],
+  ["D7A6",0x86C8],
+  ["B34D",0x86C9],
+  ["B34A",0x86CB],
+  ["D7AA",0x86CC],
+  ["B5F1",0x86D0],
+  ["DBBF",0x86D1],
+  ["DBB4",0x86D3],
+  ["B5EE",0x86D4],
+  ["DFE7",0x86D6],
+  ["DBBD",0x86D7],
+  ["DBB1",0x86D8],
+  ["B5EC",0x86D9],
+  ["DBB6",0x86DA],
+  ["B5EF",0x86DB],
+  ["DBBA",0x86DC],
+  ["DBB8",0x86DD],
+  ["B5F2",0x86DE],
+  ["B5EB",0x86DF],
+  ["DBB2",0x86E2],
+  ["DBB5",0x86E3],
+  ["B5F0",0x86E4],
+  ["DBB3",0x86E6],
+  ["DBBE",0x86E8],
+  ["DBBC",0x86E9],
+  ["DBB7",0x86EA],
+  ["DBB9",0x86EB],
+  ["DBBB",0x86EC],
+  ["B5ED",0x86ED],
+  ["99CB",0x86EF],
+  ["DFE8",0x86F5],
+  ["DFEE",0x86F6],
+  ["DFE4",0x86F7],
+  ["DFEA",0x86F8],
+  ["B8BA",0x86F9],
+  ["DFE6",0x86FA],
+  ["B8C0",0x86FB],
+  ["B8BF",0x86FE],
+  ["B8BE",0x8700],
+  ["DFED",0x8701],
+  ["B8C1",0x8702],
+  ["B8C2",0x8703],
+  ["DFE3",0x8704],
+  ["DFF0",0x8705],
+  ["B8C3",0x8706],
+  ["B8BD",0x8707],
+  ["B8BC",0x8708],
+  ["DFEC",0x8709],
+  ["B8C4",0x870A],
+  ["DFE2",0x870B],
+  ["DFE5",0x870C],
+  ["DFEF",0x870D],
+  ["DFEB",0x870E],
+  ["E3F4",0x8711],
+  ["E3E9",0x8712],
+  ["B8BB",0x8713],
+  ["BB6A",0x8718],
+  ["E3DD",0x8719],
+  ["E3F2",0x871A],
+  ["E3DE",0x871B],
+  ["BB65",0x871C],
+  ["E3DB",0x871E],
+  ["E3E4",0x8720],
+  ["E3DC",0x8721],
+  ["BB67",0x8722],
+  ["E3D6",0x8723],
+  ["E3F1",0x8724],
+  ["BB68",0x8725],
+  ["E3EE",0x8726],
+  ["E3EF",0x8727],
+  ["E3D7",0x8728],
+  ["BB6D",0x8729],
+  ["E3E6",0x872A],
+  ["E3E0",0x872C],
+  ["E3E7",0x872D],
+  ["E3DA",0x872E],
+  ["E3F3",0x8730],
+  ["E3EB",0x8731],
+  ["E3E5",0x8732],
+  ["E3D5",0x8733],
+  ["BB69",0x8734],
+  ["E3EC",0x8735],
+  ["BB6C",0x8737],
+  ["E3F0",0x8738],
+  ["E3EA",0x873A],
+  ["BB66",0x873B],
+  ["E3E8",0x873C],
+  ["E3E2",0x873E],
+  ["BB64",0x873F],
+  ["E3D9",0x8740],
+  ["E3E1",0x8741],
+  ["E3ED",0x8742],
+  ["E3DF",0x8743],
+  ["E3E3",0x8746],
+  ["BDC1",0x874C],
+  ["DFE9",0x874D],
+  ["E7B2",0x874E],
+  ["E7BB",0x874F],
+  ["E7B1",0x8750],
+  ["E7AD",0x8751],
+  ["E7AA",0x8752],
+  ["BDC2",0x8753],
+  ["E7A8",0x8754],
+  ["BB6B",0x8755],
+  ["E7A1",0x8756],
+  ["BDC0",0x8757],
+  ["E7A7",0x8758],
+  ["BDBF",0x8759],
+  ["E7AC",0x875A],
+  ["E7A9",0x875B],
+  ["E7B9",0x875C],
+  ["E7B4",0x875D],
+  ["E7AE",0x875E],
+  ["E7B3",0x875F],
+  ["BDBB",0x8760],
+  ["E7AB",0x8761],
+  ["E7BE",0x8762],
+  ["E7A2",0x8763],
+  ["E7A3",0x8764],
+  ["E7BA",0x8765],
+  ["BDBC",0x8766],
+  ["E7BF",0x8767],
+  ["BDBE",0x8768],
+  ["E7C0",0x8769],
+  ["E7B0",0x876A],
+  ["E3D8",0x876B],
+  ["E7B6",0x876C],
+  ["E7AF",0x876D],
+  ["E7B8",0x876E],
+  ["E7B5",0x876F],
+  ["9DD5",0x8770],
+  ["8FB0",0x8771],
+  ["E7A6",0x8773],
+  ["BDB9",0x8774],
+  ["E7BD",0x8775],
+  ["BDBA",0x8776],
+  ["E7A4",0x8777],
+  ["BDBD",0x8778],
+  ["EB64",0x8779],
+  ["E7B7",0x877A],
+  ["E7BC",0x877B],
+  ["FA7A",0x877D],
+  ["EB61",0x8781],
+  ["BDB8",0x8782],
+  ["BFC0",0x8783],
+  ["EB6B",0x8784],
+  ["EB67",0x8785],
+  ["9E5F",0x8786],
+  ["EB65",0x8787],
+  ["EB60",0x8788],
+  ["EB6F",0x8789],
+  ["99CD",0x878B],
+  ["A0C9",0x878C],
+  ["BFC4",0x878D],
+  ["EB5C",0x878F],
+  ["EB68",0x8790],
+  ["EB69",0x8791],
+  ["EB5F",0x8792],
+  ["EB5E",0x8793],
+  ["EB6C",0x8794],
+  ["EB62",0x8796],
+  ["EB5D",0x8797],
+  ["EB63",0x8798],
+  ["EB6E",0x879A],
+  ["EB5B",0x879B],
+  ["EB6D",0x879C],
+  ["EB6A",0x879D],
+  ["BFC2",0x879E],
+  ["BFC1",0x879F],
+  ["BFC3",0x87A2],
+  ["EB66",0x87A3],
+  ["F0CB",0x87A4],
+  ["9ADB",0x87A5],
+  ["A0C6",0x87A9],
+  ["EE59",0x87AA],
+  ["C1B1",0x87AB],
+  ["EE5D",0x87AC],
+  ["EE5A",0x87AD],
+  ["EE61",0x87AE],
+  ["EE67",0x87AF],
+  ["EE5C",0x87B0],
+  ["8FB4",0x87B1],
+  ["EE70",0x87B2],
+  ["C1AE",0x87B3],
+  ["EE6A",0x87B4],
+  ["EE5F",0x87B5],
+  ["EE6B",0x87B6],
+  ["EE66",0x87B7],
+  ["EE6D",0x87B8],
+  ["EE5E",0x87B9],
+  ["C1B3",0x87BA],
+  ["C1B2",0x87BB],
+  ["EE60",0x87BC],
+  ["EE6E",0x87BD],
+  ["EE58",0x87BE],
+  ["EE6C",0x87BF],
+  ["C1AC",0x87C0],
+  ["A0D7",0x87C1],
+  ["EE64",0x87C2],
+  ["EE63",0x87C3],
+  ["EE68",0x87C4],
+  ["EE5B",0x87C5],
+  ["C1B0",0x87C6],
+  ["C1B4",0x87C8],
+  ["EE62",0x87C9],
+  ["EE69",0x87CA],
+  ["C1B5",0x87CB],
+  ["EE65",0x87CC],
+  ["A0C7",0x87CE],
+  ["C1AD",0x87D1],
+  ["C1AF",0x87D2],
+  ["F0C7",0x87D3],
+  ["F0C5",0x87D4],
+  ["A043",0x87D6],
+  ["F0CC",0x87D7],
+  ["F0C9",0x87D8],
+  ["F0CD",0x87D9],
+  ["8FB5",0x87DA],
+  ["F0BE",0x87DB],
+  ["F0C6",0x87DC],
+  ["F0D1",0x87DD],
+  ["EE6F",0x87DE],
+  ["F0C2",0x87DF],
+  ["C2CF",0x87E0],
+  ["E7A5",0x87E1],
+  ["F0BD",0x87E2],
+  ["F0CA",0x87E3],
+  ["F0C4",0x87E4],
+  ["F0C1",0x87E5],
+  ["F0BC",0x87E6],
+  ["F0BB",0x87E7],
+  ["F0D0",0x87E8],
+  ["F0C0",0x87EA],
+  ["F0BF",0x87EB],
+  ["C2CD",0x87EC],
+  ["F0C8",0x87ED],
+  ["8FB2",0x87EE],
+  ["C2CC",0x87EF],
+  ["C2CE",0x87F2],
+  ["F0C3",0x87F3],
+  ["F0CF",0x87F4],
+  ["A061",0x87F5],
+  ["F2DE",0x87F6],
+  ["F2DF",0x87F7],
+  ["C3C9",0x87F9],
+  ["F2DC",0x87FA],
+  ["C3C6",0x87FB],
+  ["F2E4",0x87FC],
+  ["C3CA",0x87FE],
+  ["F2E6",0x87FF],
+  ["F2DB",0x8800],
+  ["F0CE",0x8801],
+  ["F2E8",0x8802],
+  ["F2DD",0x8803],
+  ["9E5E",0x8804],
+  ["C3C7",0x8805],
+  ["F2E3",0x8806],
+  ["F2E5",0x8808],
+  ["F2E0",0x8809],
+  ["F2E7",0x880A],
+  ["F2E2",0x880B],
+  ["F2E1",0x880C],
+  ["C3C8",0x880D],
+  ["8FB6",0x880F],
+  ["F4C5",0x8810],
+  ["F4C6",0x8811],
+  ["F4C8",0x8813],
+  ["C4AE",0x8814],
+  ["C4AF",0x8815],
+  ["F4C9",0x8816],
+  ["F4C7",0x8817],
+  ["9FE8",0x8818],
+  ["F4C4",0x8819],
+  ["F642",0x881B],
+  ["F645",0x881C],
+  ["F641",0x881D],
+  ["C4FA",0x881F],
+  ["F643",0x8820],
+  ["C4F9",0x8821],
+  ["C4F8",0x8822],
+  ["C4F7",0x8823],
+  ["F644",0x8824],
+  ["F751",0x8825],
+  ["F74F",0x8826],
+  ["9CB2",0x8827],
+  ["F74E",0x8828],
+  ["F640",0x8829],
+  ["F750",0x882A],
+  ["F646",0x882B],
+  ["F74D",0x882C],
+  ["957C",0x882D],
+  ["F7F9",0x882E],
+  ["F7D7",0x882F],
+  ["F7F7",0x8830],
+  ["C5DB",0x8831],
+  ["F7F8",0x8832],
+  ["F7FA",0x8833],
+  ["F8BF",0x8835],
+  ["C5FA",0x8836],
+  ["F8BE",0x8837],
+  ["F8BD",0x8838],
+  ["C5FB",0x8839],
+  ["C65A",0x883B],
+  ["F96E",0x883C],
+  ["F9A7",0x883D],
+  ["F9A6",0x883E],
+  ["F9A8",0x883F],
+  ["A6E5",0x8840],
+  ["D0AA",0x8841],
+  ["9FC7",0x8842],
+  ["D3CF",0x8843],
+  ["D3D0",0x8844],
+  ["8FBB",0x8845],
+  ["8FBC",0x8846],
+  ["DBC0",0x8848],
+  ["F647",0x884A],
+  ["F8C0",0x884B],
+  ["A6E6",0x884C],
+  ["AD6C",0x884D],
+  ["D0AB",0x884E],
+  ["8FEC",0x884F],
+  ["D7B1",0x8852],
+  ["B34E",0x8853],
+  ["DBC2",0x8855],
+  ["DBC1",0x8856],
+  ["B5F3",0x8857],
+  ["B8C5",0x8859],
+  ["E7C1",0x885A],
+  ["BDC3",0x885B],
+  ["BDC4",0x885D],
+  ["8FC0",0x885E],
+  ["936A",0x8860],
+  ["BFC5",0x8861],
+  ["C5FC",0x8862],
+  ["A6E7",0x8863],
+  ["8BE4",0x8864],
+  ["9C7C",0x8865],
+  ["D0AC",0x8867],
+  ["AAED",0x8868],
+  ["D0AE",0x8869],
+  ["D0AD",0x886A],
+  ["AD6D",0x886B],
+  ["D3D1",0x886D],
+  ["95A1",0x886E],
+  ["D3D8",0x886F],
+  ["B049",0x8870],
+  ["D3D6",0x8871],
+  ["D3D4",0x8872],
+  ["D3DB",0x8874],
+  ["D3D2",0x8875],
+  ["D3D3",0x8876],
+  ["B04A",0x8877],
+  ["B04E",0x8879],
+  ["D3DC",0x887C],
+  ["B04D",0x887D],
+  ["D3DA",0x887E],
+  ["D3D7",0x887F],
+  ["D3D5",0x8880],
+  ["B04B",0x8881],
+  ["B04C",0x8882],
+  ["D3D9",0x8883],
+  ["FEEC",0x8884],
+  ["95A3",0x8887],
+  ["B350",0x8888],
+  ["D7B2",0x8889],
+  ["B355",0x888B],
+  ["D7C2",0x888C],
+  ["B354",0x888D],
+  ["D7C4",0x888E],
+  ["8C45",0x888F],
+  ["8CB8",0x8890],
+  ["D7B8",0x8891],
+  ["B352",0x8892],
+  ["D7C3",0x8893],
+  ["D7B3",0x8895],
+  ["B353",0x8896],
+  ["D7BF",0x8897],
+  ["D7BB",0x8898],
+  ["D7BD",0x8899],
+  ["D7B7",0x889A],
+  ["D7BE",0x889B],
+  ["8FC1",0x889C],
+  ["B34F",0x889E],
+  ["D7BA",0x889F],
+  ["A052",0x88A0],
+  ["D7B9",0x88A1],
+  ["D7B5",0x88A2],
+  ["D7C0",0x88A4],
+  ["D7BC",0x88A7],
+  ["D7B4",0x88A8],
+  ["D7B6",0x88AA],
+  ["B351",0x88AB],
+  ["D7C1",0x88AC],
+  ["99D0",0x88AE],
+  ["B5F6",0x88B1],
+  ["DBCD",0x88B2],
+  ["8FC3",0x88B4],
+  ["8FC4",0x88B5],
+  ["DBC9",0x88B6],
+  ["DBCB",0x88B7],
+  ["DBC6",0x88B8],
+  ["DBC5",0x88B9],
+  ["DBC3",0x88BA],
+  ["DBCA",0x88BC],
+  ["DBCC",0x88BD],
+  ["DBC8",0x88BE],
+  ["95A4",0x88BF],
+  ["DBC7",0x88C0],
+  ["B5F4",0x88C1],
+  ["B5F5",0x88C2],
+  ["8FC6",0x88C5],
+  ["9E60",0x88C7],
+  ["DBCF",0x88C9],
+  ["B8CD",0x88CA],
+  ["DFF2",0x88CB],
+  ["DFF8",0x88CC],
+  ["DFF3",0x88CD],
+  ["DFF4",0x88CE],
+  ["F9D8",0x88CF],
+  ["DFF9",0x88D0],
+  ["B8CF",0x88D2],
+  ["B8C7",0x88D4],
+  ["B8CE",0x88D5],
+  ["DFF1",0x88D6],
+  ["DBC4",0x88D7],
+  ["B8CA",0x88D8],
+  ["B8C8",0x88D9],
+  ["DFF7",0x88DA],
+  ["DFF6",0x88DB],
+  ["B8C9",0x88DC],
+  ["B8CB",0x88DD],
+  ["DFF5",0x88DE],
+  ["B8C6",0x88DF],
+  ["B8CC",0x88E1],
+  ["95A5",0x88E6],
+  ["E3F6",0x88E7],
+  ["BB74",0x88E8],
+  ["E442",0x88EB],
+  ["E441",0x88EC],
+  ["E3FB",0x88EE],
+  ["BB76",0x88EF],
+  ["E440",0x88F0],
+  ["E3F7",0x88F1],
+  ["E3F8",0x88F2],
+  ["BB6E",0x88F3],
+  ["BB70",0x88F4],
+  ["9CB3",0x88F5],
+  ["E3FD",0x88F6],
+  ["E3F5",0x88F7],
+  ["BB72",0x88F8],
+  ["BB71",0x88F9],
+  ["E3F9",0x88FA],
+  ["E3FE",0x88FB],
+  ["E3FC",0x88FC],
+  ["BB73",0x88FD],
+  ["E3FA",0x88FE],
+  ["99D1",0x88FF],
+  ["FEF1",0x8900],
+  ["DBCE",0x8901],
+  ["BB6F",0x8902],
+  ["E7C2",0x8905],
+  ["E7C9",0x8906],
+  ["BDC6",0x8907],
+  ["E7CD",0x8909],
+  ["BDCA",0x890A],
+  ["E7C5",0x890B],
+  ["E7C3",0x890C],
+  ["E7CC",0x890E],
+  ["BDC5",0x8910],
+  ["E7CB",0x8911],
+  ["BDC7",0x8912],
+  ["BDC8",0x8913],
+  ["E7C4",0x8914],
+  ["BDC9",0x8915],
+  ["E7CA",0x8916],
+  ["E7C6",0x8917],
+  ["E7C7",0x8918],
+  ["E7C8",0x8919],
+  ["BB75",0x891A],
+  ["EB70",0x891E],
+  ["EB7C",0x891F],
+  ["BFCA",0x8921],
+  ["EB77",0x8922],
+  ["EB79",0x8923],
+  ["99D2",0x8924],
+  ["BFC8",0x8925],
+  ["EB71",0x8926],
+  ["EB75",0x8927],
+  ["EB78",0x8929],
+  ["BFC6",0x892A],
+  ["BFC9",0x892B],
+  ["EB7B",0x892C],
+  ["EB73",0x892D],
+  ["EB74",0x892E],
+  ["EB7A",0x892F],
+  ["EB72",0x8930],
+  ["EB76",0x8931],
+  ["BFC7",0x8932],
+  ["EE72",0x8933],
+  ["EE71",0x8935],
+  ["C1B7",0x8936],
+  ["EE77",0x8937],
+  ["C1B9",0x8938],
+  ["C1B6",0x893B],
+  ["EE73",0x893C],
+  ["C1BA",0x893D],
+  ["EE74",0x893E],
+  ["EE75",0x8941],
+  ["EE78",0x8942],
+  ["9CC2",0x8943],
+  ["C1B8",0x8944],
+  ["F0D6",0x8946],
+  ["99D3",0x8947],
+  ["F0D9",0x8949],
+  ["F0D3",0x894B],
+  ["F0D5",0x894C],
+  ["95A7",0x894D],
+  ["F0D4",0x894F],
+  ["F0D7",0x8950],
+  ["F0D8",0x8951],
+  ["EE76",0x8952],
+  ["F0D2",0x8953],
+  ["95A9",0x8954],
+  ["C3CD",0x8956],
+  ["F2EC",0x8957],
+  ["F2EF",0x8958],
+  ["F2F1",0x8959],
+  ["F2EA",0x895A],
+  ["F2EB",0x895B],
+  ["F2EE",0x895C],
+  ["F2F0",0x895D],
+  ["C3CE",0x895E],
+  ["C3CC",0x895F],
+  ["C3CB",0x8960],
+  ["F2ED",0x8961],
+  ["F2E9",0x8962],
+  ["F4CA",0x8963],
+  ["C4B0",0x8964],
+  ["95A6",0x8965],
+  ["F4CB",0x8966],
+  ["F649",0x8969],
+  ["C4FB",0x896A],
+  ["F64B",0x896B],
+  ["C4FC",0x896C],
+  ["F648",0x896D],
+  ["F64A",0x896E],
+  ["C5A8",0x896F],
+  ["F752",0x8971],
+  ["C5A7",0x8972],
+  ["F7FD",0x8973],
+  ["F7FC",0x8974],
+  ["F7FB",0x8976],
+  ["9C5D",0x8977],
+  ["F948",0x8979],
+  ["F949",0x897A],
+  ["F94B",0x897B],
+  ["F94A",0x897C],
+  ["CA50",0x897E],
+  ["A6E8",0x897F],
+  ["98E2",0x8980],
+  ["AD6E",0x8981],
+  ["D7C5",0x8982],
+  ["B5F7",0x8983],
+  ["DFFA",0x8985],
+  ["C2D0",0x8986],
+  ["8FC9",0x8987],
+  ["F2F2",0x8988],
+  ["A0C2",0x8989],
+  ["8FCA",0x898A],
+  ["A8A3",0x898B],
+  ["B357",0x898F],
+  ["99D4",0x8991],
+  ["B356",0x8993],
+  ["A0B9",0x8994],
+  ["DBD0",0x8995],
+  ["B5F8",0x8996],
+  ["DBD2",0x8997],
+  ["DBD1",0x8998],
+  ["DFFB",0x899B],
+  ["B8D0",0x899C],
+  ["E443",0x899D],
+  ["E446",0x899E],
+  ["E445",0x899F],
+  ["E444",0x89A1],
+  ["E7CE",0x89A2],
+  ["E7D0",0x89A3],
+  ["E7CF",0x89A4],
+  ["9B58",0x89A5],
+  ["BFCC",0x89A6],
+  ["8FCD",0x89A7],
+  ["A0D4",0x89A9],
+  ["BFCB",0x89AA],
+  ["C1BB",0x89AC],
+  ["EE79",0x89AD],
+  ["EE7B",0x89AE],
+  ["EE7A",0x89AF],
+  ["C2D1",0x89B2],
+  ["F2F4",0x89B6],
+  ["F2F3",0x89B7],
+  ["F4CC",0x89B9],
+  ["C4B1",0x89BA],
+  ["8FCE",0x89BC],
+  ["C4FD",0x89BD],
+  ["F754",0x89BE],
+  ["F753",0x89BF],
+  ["C65B",0x89C0],
+  ["8BE5",0x89C1],
+  ["8979",0x89C6],
+  ["A8A4",0x89D2],
+  ["D0AF",0x89D3],
+  ["AD6F",0x89D4],
+  ["D7C8",0x89D5],
+  ["D7C6",0x89D6],
+  ["D7C7",0x89D9],
+  ["DBD4",0x89DA],
+  ["DBD5",0x89DB],
+  ["E043",0x89DC],
+  ["DBD3",0x89DD],
+  ["DFFC",0x89DF],
+  ["E041",0x89E0],
+  ["E040",0x89E1],
+  ["E042",0x89E2],
+  ["B8D1",0x89E3],
+  ["DFFE",0x89E4],
+  ["DFFD",0x89E5],
+  ["E044",0x89E6],
+  ["8FD0",0x89E7],
+  ["E449",0x89E8],
+  ["E447",0x89E9],
+  ["E448",0x89EB],
+  ["E7D3",0x89EC],
+  ["E7D1",0x89ED],
+  ["E7D2",0x89F0],
+  ["EB7D",0x89F1],
+  ["EE7C",0x89F2],
+  ["EE7D",0x89F3],
+  ["C2D2",0x89F4],
+  ["F2F5",0x89F6],
+  ["F4CD",0x89F7],
+  ["C4B2",0x89F8],
+  ["F64C",0x89FA],
+  ["F755",0x89FB],
+  ["C5A9",0x89FC],
+  ["F7FE",0x89FE],
+  ["F94C",0x89FF],
+  ["A8A5",0x8A00],
+  ["AD71",0x8A02],
+  ["AD72",0x8A03],
+  ["D0B0",0x8A04],
+  ["D0B1",0x8A07],
+  ["AD70",0x8A08],
+  ["B054",0x8A0A],
+  ["B052",0x8A0C],
+  ["B051",0x8A0E],
+  ["B058",0x8A0F],
+  ["B050",0x8A10],
+  ["B059",0x8A11],
+  ["D3DD",0x8A12],
+  ["B056",0x8A13],
+  ["B053",0x8A15],
+  ["B057",0x8A16],
+  ["B055",0x8A17],
+  ["B04F",0x8A18],
+  ["B35F",0x8A1B],
+  ["95B6",0x8A1C],
+  ["B359",0x8A1D],
+  ["D7CC",0x8A1E],
+  ["B35E",0x8A1F],
+  ["B360",0x8A22],
+  ["B35A",0x8A23],
+  ["B35B",0x8A25],
+  ["D7CA",0x8A27],
+  ["99D6",0x8A29],
+  ["B358",0x8A2A],
+  ["95E5",0x8A2B],
+  ["D7CB",0x8A2C],
+  ["B35D",0x8A2D],
+  ["D7C9",0x8A30],
+  ["B35C",0x8A31],
+  ["B644",0x8A34],
+  ["B646",0x8A36],
+  ["99D7",0x8A38],
+  ["DBD8",0x8A39],
+  ["B645",0x8A3A],
+  ["B5F9",0x8A3B],
+  ["B5FD",0x8A3C],
+  ["95B5",0x8A3D],
+  ["B8E4",0x8A3E],
+  ["E049",0x8A3F],
+  ["DBDA",0x8A40],
+  ["B5FE",0x8A41],
+  ["DBDD",0x8A44],
+  ["DBDE",0x8A45],
+  ["B643",0x8A46],
+  ["DBE0",0x8A48],
+  ["A0CA",0x8A49],
+  ["DBE2",0x8A4A],
+  ["DBE3",0x8A4C],
+  ["DBD7",0x8A4D],
+  ["DBD6",0x8A4E],
+  ["DBE4",0x8A4F],
+  ["B642",0x8A50],
+  ["DBE1",0x8A51],
+  ["DBDF",0x8A52],
+  ["B640",0x8A54],
+  ["B5FB",0x8A55],
+  ["B647",0x8A56],
+  ["DBDB",0x8A57],
+  ["DBDC",0x8A58],
+  ["DBD9",0x8A59],
+  ["B641",0x8A5B],
+  ["B5FC",0x8A5E],
+  ["B5FA",0x8A60],
+  ["E048",0x8A61],
+  ["B8DF",0x8A62],
+  ["B8DA",0x8A63],
+  ["B8D5",0x8A66],
+  ["9FFD",0x8A67],
+  ["B8E5",0x8A68],
+  ["B8D6",0x8A69],
+  ["B8D2",0x8A6B],
+  ["B8E1",0x8A6C],
+  ["B8DE",0x8A6D],
+  ["B8E0",0x8A6E],
+  ["B8D7",0x8A70],
+  ["B8DC",0x8A71],
+  ["B8D3",0x8A72],
+  ["B8D4",0x8A73],
+  ["E050",0x8A74],
+  ["E04D",0x8A75],
+  ["E045",0x8A76],
+  ["E04A",0x8A77],
+  ["B8E2",0x8A79],
+  ["E051",0x8A7A],
+  ["B8E3",0x8A7B],
+  ["B8D9",0x8A7C],
+  ["A058",0x8A7E],
+  ["E047",0x8A7F],
+  ["E04F",0x8A81],
+  ["E04B",0x8A82],
+  ["E04E",0x8A83],
+  ["E04C",0x8A84],
+  ["B8DD",0x8A85],
+  ["E046",0x8A86],
+  ["B8D8",0x8A87],
+  ["E44C",0x8A8B],
+  ["BB78",0x8A8C],
+  ["BB7B",0x8A8D],
+  ["E44E",0x8A8F],
+  ["8FD6",0x8A90],
+  ["BBA5",0x8A91],
+  ["E44D",0x8A92],
+  ["BB7D",0x8A93],
+  ["99D8",0x8A94],
+  ["BDCF",0x8A95],
+  ["E44F",0x8A96],
+  ["BBA4",0x8A98],
+  ["E44B",0x8A99],
+  ["BBA6",0x8A9A],
+  ["8FD3",0x8A9C],
+  ["BB79",0x8A9E],
+  ["B8DB",0x8AA0],
+  ["BB7C",0x8AA1],
+  ["BB7A",0x8AA3],
+  ["BB7E",0x8AA4],
+  ["BBA2",0x8AA5],
+  ["BB77",0x8AA6],
+  ["BBA7",0x8AA7],
+  ["BBA3",0x8AA8],
+  ["8FE5",0x8AA9],
+  ["BBA1",0x8AAA],
+  ["E44A",0x8AAB],
+  ["8FE9",0x8AAF],
+  ["BDD6",0x8AB0],
+  ["BDD2",0x8AB2],
+  ["99D9",0x8AB4],
+  ["BDD9",0x8AB6],
+  ["E7D6",0x8AB8],
+  ["BDDA",0x8AB9],
+  ["E7E2",0x8ABA],
+  ["E7DB",0x8ABB],
+  ["BDCB",0x8ABC],
+  ["E7E3",0x8ABD],
+  ["E7DD",0x8ABE],
+  ["BDD5",0x8ABF],
+  ["E7DE",0x8AC0],
+  ["BDD4",0x8AC2],
+  ["E7E1",0x8AC3],
+  ["BDCE",0x8AC4],
+  ["E7DF",0x8AC5],
+  ["E7D5",0x8AC6],
+  ["BDCD",0x8AC7],
+  ["EBAA",0x8AC8],
+  ["BDD3",0x8AC9],
+  ["BDD0",0x8ACB],
+  ["8CF7",0x8ACC],
+  ["BDD8",0x8ACD],
+  ["E7D4",0x8ACF],
+  ["E7D8",0x8AD1],
+  ["BDCC",0x8AD2],
+  ["E7D7",0x8AD3],
+  ["E7D9",0x8AD4],
+  ["E7DA",0x8AD5],
+  ["BDD7",0x8AD6],
+  ["E7DC",0x8AD7],
+  ["E7E0",0x8AD8],
+  ["E7E4",0x8AD9],
+  ["927C",0x8ADA],
+  ["BDDB",0x8ADB],
+  ["BFD2",0x8ADC],
+  ["EBA5",0x8ADD],
+  ["EBAB",0x8ADE],
+  ["EBA8",0x8ADF],
+  ["EB7E",0x8AE0],
+  ["EBAC",0x8AE1],
+  ["EBA1",0x8AE2],
+  ["EBA7",0x8AE4],
+  ["BFCD",0x8AE6],
+  ["BFD3",0x8AE7],
+  ["EBAD",0x8AE8],
+  ["9C45",0x8AEA],
+  ["BFCF",0x8AEB],
+  ["BFD9",0x8AED],
+  ["BFD4",0x8AEE],
+  ["EBAF",0x8AEF],
+  ["EBA9",0x8AF0],
+  ["BFD0",0x8AF1],
+  ["EBA2",0x8AF2],
+  ["BFDA",0x8AF3],
+  ["EBA3",0x8AF4],
+  ["EBA4",0x8AF5],
+  ["BFDB",0x8AF6],
+  ["BFD8",0x8AF7],
+  ["BDD1",0x8AF8],
+  ["8CE8",0x8AF9],
+  ["BFCE",0x8AFA],
+  ["EBB0",0x8AFB],
+  ["BFDC",0x8AFC],
+  ["BFD5",0x8AFE],
+  ["EBAE",0x8AFF],
+  ["BFD1",0x8B00],
+  ["BFD6",0x8B01],
+  ["BFD7",0x8B02],
+  ["C1C3",0x8B04],
+  ["EEA4",0x8B05],
+  ["EEAD",0x8B06],
+  ["EEAA",0x8B07],
+  ["EEAC",0x8B08],
+  ["C1C0",0x8B0A],
+  ["EEA5",0x8B0B],
+  ["8FDE",0x8B0C],
+  ["EEAB",0x8B0D],
+  ["C1BC",0x8B0E],
+  ["EEA7",0x8B0F],
+  ["C1C4",0x8B10],
+  ["EEA3",0x8B11],
+  ["EEA8",0x8B12],
+  ["EEAF",0x8B13],
+  ["EBA6",0x8B14],
+  ["EEA9",0x8B15],
+  ["EEA2",0x8B16],
+  ["C1BD",0x8B17],
+  ["EEA1",0x8B18],
+  ["C1BE",0x8B19],
+  ["EEB0",0x8B1A],
+  ["C1BF",0x8B1B],
+  ["EEAE",0x8B1C],
+  ["C1C2",0x8B1D],
+  ["EE7E",0x8B1E],
+  ["8FDF",0x8B1F],
+  ["C1C1",0x8B20],
+  ["EEA6",0x8B22],
+  ["F0DC",0x8B23],
+  ["F0EA",0x8B24],
+  ["F0E5",0x8B25],
+  ["F0E7",0x8B26],
+  ["F0DB",0x8B27],
+  ["C2D3",0x8B28],
+  ["F0DA",0x8B2A],
+  ["C2D6",0x8B2B],
+  ["C2D5",0x8B2C],
+  ["A04B",0x8B2D],
+  ["F0E9",0x8B2E],
+  ["F0E1",0x8B2F],
+  ["F0DE",0x8B30],
+  ["F0E4",0x8B31],
+  ["F0DD",0x8B33],
+  ["F0DF",0x8B35],
+  ["F0E8",0x8B36],
+  ["F0E6",0x8B37],
+  ["C2D4",0x8B39],
+  ["F0ED",0x8B3A],
+  ["F0EB",0x8B3B],
+  ["F0E2",0x8B3C],
+  ["F0EC",0x8B3D],
+  ["F0E3",0x8B3E],
+  ["8FE2",0x8B3F],
+  ["F2F9",0x8B40],
+  ["C3CF",0x8B41],
+  ["F341",0x8B42],
+  ["A0CC",0x8B43],
+  ["F64F",0x8B45],
+  ["C3D6",0x8B46],
+  ["F0E0",0x8B47],
+  ["F2F7",0x8B48],
+  ["C3D2",0x8B49],
+  ["F2F8",0x8B4A],
+  ["F2FD",0x8B4B],
+  ["8FE3",0x8B4C],
+  ["8FE4",0x8B4D],
+  ["C3D4",0x8B4E],
+  ["C3D5",0x8B4F],
+  ["F2F6",0x8B50],
+  ["F340",0x8B51],
+  ["F342",0x8B52],
+  ["F2FA",0x8B53],
+  ["F2FC",0x8B54],
+  ["F2FE",0x8B55],
+  ["F2FB",0x8B56],
+  ["F343",0x8B57],
+  ["C3D1",0x8B58],
+  ["C3D7",0x8B59],
+  ["C3D3",0x8B5A],
+  ["C3D0",0x8B5C],
+  ["F4D0",0x8B5D],
+  ["9BC4",0x8B5E],
+  ["C4B7",0x8B5F],
+  ["F4CE",0x8B60],
+  ["9BFC",0x8B62],
+  ["F4D2",0x8B63],
+  ["F4D3",0x8B65],
+  ["C4B5",0x8B66],
+  ["F4D4",0x8B67],
+  ["F4D1",0x8B68],
+  ["964C",0x8B69],
+  ["F4CF",0x8B6A],
+  ["C4B8",0x8B6B],
+  ["C4B4",0x8B6C],
+  ["F4D5",0x8B6D],
+  ["C4B6",0x8B6F],
+  ["C4B3",0x8B70],
+  ["C4FE",0x8B74],
+  ["C540",0x8B77],
+  ["F64E",0x8B78],
+  ["F64D",0x8B79],
+  ["F650",0x8B7A],
+  ["F651",0x8B7B],
+  ["C541",0x8B7D],
+  ["F756",0x8B7E],
+  ["F75B",0x8B7F],
+  ["C5AA",0x8B80],
+  ["9AF6",0x8B81],
+  ["F758",0x8B82],
+  ["8CAE",0x8B83],
+  ["F757",0x8B84],
+  ["F75A",0x8B85],
+  ["F759",0x8B86],
+  ["F843",0x8B88],
+  ["C5DC",0x8B8A],
+  ["F842",0x8B8B],
+  ["F840",0x8B8C],
+  ["F841",0x8B8E],
+  ["8FE7",0x8B90],
+  ["C5FE",0x8B92],
+  ["C5FD",0x8B93],
+  ["F8C1",0x8B94],
+  ["F8C2",0x8B95],
+  ["C640",0x8B96],
+  ["F94D",0x8B98],
+  ["F94E",0x8B99],
+  ["C667",0x8B9A],
+  ["8FE8",0x8B9B],
+  ["C66D",0x8B9C],
+  ["F9A9",0x8B9E],
+  ["F9C8",0x8B9F],
+  ["8BE7",0x8BA0],
+  ["897A",0x8BBE],
+  ["897B",0x8BE2],
+  ["A8A6",0x8C37],
+  ["D7CD",0x8C39],
+  ["D7CE",0x8C3B],
+  ["E052",0x8C3C],
+  ["E450",0x8C3D],
+  ["E7E5",0x8C3E],
+  ["C1C6",0x8C3F],
+  ["C1C5",0x8C41],
+  ["F0EE",0x8C42],
+  ["F344",0x8C43],
+  ["F844",0x8C45],
+  ["A8A7",0x8C46],
+  ["D3DE",0x8C47],
+  ["B05A",0x8C48],
+  ["B361",0x8C49],
+  ["E054",0x8C4A],
+  ["E053",0x8C4B],
+  ["BDDC",0x8C4C],
+  ["E7E6",0x8C4D],
+  ["BDDD",0x8C4E],
+  ["EEB1",0x8C4F],
+  ["C2D7",0x8C50],
+  ["99DA",0x8C51],
+  ["C676",0x8C54],
+  ["A8A8",0x8C55],
+  ["CDCB",0x8C56],
+  ["D3DF",0x8C57],
+  ["B362",0x8C5A],
+  ["D7CF",0x8C5C],
+  ["D7D0",0x8C5D],
+  ["DBE5",0x8C5F],
+  ["B648",0x8C61],
+  ["B8E6",0x8C62],
+  ["E056",0x8C64],
+  ["E055",0x8C65],
+  ["E057",0x8C66],
+  ["E451",0x8C68],
+  ["E452",0x8C69],
+  ["BBA8",0x8C6A],
+  ["BFDD",0x8C6B],
+  ["BDDE",0x8C6C],
+  ["BFDE",0x8C6D],
+  ["EEB5",0x8C6F],
+  ["EEB2",0x8C70],
+  ["EEB4",0x8C71],
+  ["EEB3",0x8C72],
+  ["C1C7",0x8C73],
+  ["F0EF",0x8C75],
+  ["F346",0x8C76],
+  ["F345",0x8C77],
+  ["CBA4",0x8C78],
+  ["B05C",0x8C79],
+  ["B05B",0x8C7A],
+  ["D3E0",0x8C7B],
+  ["D7D1",0x8C7D],
+  ["DBE7",0x8C80],
+  ["DBE6",0x8C81],
+  ["B649",0x8C82],
+  ["E059",0x8C84],
+  ["E05A",0x8C85],
+  ["E058",0x8C86],
+  ["B8E8",0x8C89],
+  ["B8E7",0x8C8A],
+  ["BBAA",0x8C8C],
+  ["BBA9",0x8C8D],
+  ["E7E7",0x8C8F],
+  ["EBB3",0x8C90],
+  ["EBB1",0x8C91],
+  ["EBB2",0x8C92],
+  ["BFDF",0x8C93],
+  ["EEB7",0x8C94],
+  ["EEB6",0x8C95],
+  ["F0F2",0x8C97],
+  ["F0F1",0x8C98],
+  ["F0F0",0x8C99],
+  ["F347",0x8C9A],
+  ["8FED",0x8C9B],
+  ["F9AA",0x8C9C],
+  ["A8A9",0x8C9D],
+  ["AD73",0x8C9E],
+  ["95C0",0x8C9F],
+  ["AD74",0x8CA0],
+  ["B05D",0x8CA1],
+  ["B05E",0x8CA2],
+  ["D3E2",0x8CA3],
+  ["D3E1",0x8CA4],
+  ["D7D2",0x8CA5],
+  ["B368",0x8CA7],
+  ["B366",0x8CA8],
+  ["B363",0x8CA9],
+  ["B367",0x8CAA],
+  ["B365",0x8CAB],
+  ["B364",0x8CAC],
+  ["A0CB",0x8CAD],
+  ["B64A",0x8CAF],
+  ["DBEA",0x8CB0],
+  ["B8ED",0x8CB2],
+  ["B64C",0x8CB3],
+  ["B651",0x8CB4],
+  ["DBEC",0x8CB5],
+  ["B653",0x8CB6],
+  ["B652",0x8CB7],
+  ["B655",0x8CB8],
+  ["DBEB",0x8CB9],
+  ["DBE8",0x8CBA],
+  ["B64F",0x8CBB],
+  ["B64B",0x8CBC],
+  ["B64D",0x8CBD],
+  ["DBE9",0x8CBE],
+  ["B654",0x8CBF],
+  ["B650",0x8CC0],
+  ["B64E",0x8CC1],
+  ["B8EF",0x8CC2],
+  ["B8EE",0x8CC3],
+  ["B8EC",0x8CC4],
+  ["B8F0",0x8CC5],
+  ["B8EA",0x8CC7],
+  ["B8EB",0x8CC8],
+  ["B8E9",0x8CCA],
+  ["E05B",0x8CCC],
+  ["9E48",0x8CCD],
+  ["E454",0x8CCF],
+  ["BBAC",0x8CD1],
+  ["BBAD",0x8CD2],
+  ["BBAB",0x8CD3],
+  ["99DB",0x8CD4],
+  ["E453",0x8CD5],
+  ["8FF3",0x8CD6],
+  ["E455",0x8CD7],
+  ["E7EA",0x8CD9],
+  ["E7EC",0x8CDA],
+  ["8FF9",0x8CDB],
+  ["BDE7",0x8CDC],
+  ["E7ED",0x8CDD],
+  ["BDE0",0x8CDE],
+  ["E7E9",0x8CDF],
+  ["BDDF",0x8CE0],
+  ["BDE9",0x8CE1],
+  ["BDE5",0x8CE2],
+  ["BDE6",0x8CE3],
+  ["BDE2",0x8CE4],
+  ["E7E8",0x8CE5],
+  ["BDE1",0x8CE6],
+  ["E7EE",0x8CE7],
+  ["E7EB",0x8CE8],
+  ["95C1",0x8CE9],
+  ["BDE8",0x8CEA],
+  ["A04E",0x8CEB],
+  ["BDE3",0x8CEC],
+  ["BDE4",0x8CED],
+  ["EBB5",0x8CEE],
+  ["EBB7",0x8CF0],
+  ["EBB6",0x8CF1],
+  ["99DC",0x8CF2],
+  ["EBB8",0x8CF3],
+  ["BFE0",0x8CF4],
+  ["EBB4",0x8CF5],
+  ["A064",0x8CF7],
+  ["C1CB",0x8CF8],
+  ["EEB8",0x8CF9],
+  ["C1C8",0x8CFA],
+  ["C1CC",0x8CFB],
+  ["C1CA",0x8CFC],
+  ["C1C9",0x8CFD],
+  ["F0F3",0x8CFE],
+  ["F0F6",0x8D00],
+  ["F0F5",0x8D02],
+  ["8FF7",0x8D03],
+  ["F0F4",0x8D04],
+  ["C2D8",0x8D05],
+  ["F348",0x8D06],
+  ["F349",0x8D07],
+  ["C3D8",0x8D08],
+  ["F34A",0x8D09],
+  ["C3D9",0x8D0A],
+  ["89B0",0x8D0B],
+  ["A048",0x8D0C],
+  ["C4BA",0x8D0D],
+  ["C4B9",0x8D0F],
+  ["F652",0x8D10],
+  ["8FFB",0x8D11],
+  ["8FF6",0x8D12],
+  ["C542",0x8D13],
+  ["F653",0x8D14],
+  ["F75C",0x8D15],
+  ["C5AB",0x8D16],
+  ["C5AC",0x8D17],
+  ["9DDC",0x8D18],
+  ["F845",0x8D19],
+  ["C642",0x8D1B],
+  ["99DD",0x8D1C],
+  ["8BE8",0x8D1D],
+  ["A8AA",0x8D64],
+  ["B36A",0x8D66],
+  ["B369",0x8D67],
+  ["E05C",0x8D68],
+  ["E05D",0x8D69],
+  ["BBAE",0x8D6B],
+  ["EBB9",0x8D6C],
+  ["BDEA",0x8D6D],
+  ["EBBA",0x8D6E],
+  ["EEB9",0x8D6F],
+  ["A8AB",0x8D70],
+  ["D0B2",0x8D72],
+  ["AD76",0x8D73],
+  ["AD75",0x8D74],
+  ["D3E3",0x8D76],
+  ["B05F",0x8D77],
+  ["D3E4",0x8D78],
+  ["D7D5",0x8D79],
+  ["92C1",0x8D7A],
+  ["D7D4",0x8D7B],
+  ["D7D3",0x8D7D],
+  ["DBEE",0x8D80],
+  ["B658",0x8D81],
+  ["9FD6",0x8D82],
+  ["DBED",0x8D84],
+  ["B657",0x8D85],
+  ["DBEF",0x8D89],
+  ["B656",0x8D8A],
+  ["E05F",0x8D8C],
+  ["E062",0x8D8D],
+  ["E060",0x8D8E],
+  ["E061",0x8D8F],
+  ["E065",0x8D90],
+  ["E05E",0x8D91],
+  ["E066",0x8D92],
+  ["E063",0x8D93],
+  ["E064",0x8D94],
+  ["BBB0",0x8D95],
+  ["E456",0x8D96],
+  ["BBAF",0x8D99],
+  ["E7F2",0x8D9B],
+  ["E7F0",0x8D9C],
+  ["BDEB",0x8D9F],
+  ["E7EF",0x8DA0],
+  ["E7F1",0x8DA1],
+  ["BDEC",0x8DA3],
+  ["EBBB",0x8DA5],
+  ["A0D2",0x8DA6],
+  ["EBBC",0x8DA7],
+  ["C1CD",0x8DA8],
+  ["9040",0x8DA9],
+  ["F34C",0x8DAA],
+  ["F34E",0x8DAB],
+  ["F34B",0x8DAC],
+  ["F34D",0x8DAD],
+  ["F4D6",0x8DAE],
+  ["F654",0x8DAF],
+  ["F96F",0x8DB2],
+  ["A8AC",0x8DB3],
+  ["AD77",0x8DB4],
+  ["D3E5",0x8DB5],
+  ["D3E7",0x8DB6],
+  ["D3E6",0x8DB7],
+  ["D7D8",0x8DB9],
+  ["B36C",0x8DBA],
+  ["D7D6",0x8DBC],
+  ["B36B",0x8DBE],
+  ["D7D9",0x8DBF],
+  ["8AC4",0x8DC0],
+  ["D7DA",0x8DC1],
+  ["D7D7",0x8DC2],
+  ["99E0",0x8DC3],
+  ["DBFB",0x8DC5],
+  ["B660",0x8DC6],
+  ["DBF3",0x8DC7],
+  ["DBF9",0x8DC8],
+  ["B65B",0x8DCB],
+  ["B65E",0x8DCC],
+  ["DBF2",0x8DCD],
+  ["B659",0x8DCE],
+  ["DBF6",0x8DCF],
+  ["E06C",0x8DD0],
+  ["B65D",0x8DD1],
+  ["DBF1",0x8DD3],
+  ["9FF0",0x8DD4],
+  ["DBF7",0x8DD5],
+  ["DBF4",0x8DD6],
+  ["DBFA",0x8DD7],
+  ["DBF0",0x8DD8],
+  ["DBF8",0x8DD9],
+  ["B65C",0x8DDA],
+  ["B65F",0x8DDB],
+  ["DBF5",0x8DDC],
+  ["B65A",0x8DDD],
+  ["B8F2",0x8DDF],
+  ["E068",0x8DE0],
+  ["B8F1",0x8DE1],
+  ["E06F",0x8DE2],
+  ["E06E",0x8DE3],
+  ["B8F8",0x8DE4],
+  ["B8F9",0x8DE6],
+  ["E070",0x8DE7],
+  ["B8F3",0x8DE8],
+  ["E06D",0x8DE9],
+  ["B8F7",0x8DEA],
+  ["E072",0x8DEB],
+  ["E069",0x8DEC],
+  ["E06B",0x8DEE],
+  ["B8F4",0x8DEF],
+  ["E067",0x8DF0],
+  ["E06A",0x8DF1],
+  ["E071",0x8DF2],
+  ["B8F5",0x8DF3],
+  ["E073",0x8DF4],
+  ["B8F6",0x8DFA],
+  ["BBB1",0x8DFC],
+  ["E45B",0x8DFD],
+  ["E461",0x8DFE],
+  ["E459",0x8DFF],
+  ["E462",0x8E00],
+  ["9FF3",0x8E01],
+  ["E458",0x8E02],
+  ["E45D",0x8E03],
+  ["E463",0x8E04],
+  ["E460",0x8E05],
+  ["E45F",0x8E06],
+  ["E45E",0x8E07],
+  ["E457",0x8E09],
+  ["E45C",0x8E0A],
+  ["E45A",0x8E0D],
+  ["9DBF",0x8E0E],
+  ["BDF1",0x8E0F],
+  ["BDEE",0x8E10],
+  ["E7FB",0x8E11],
+  ["E841",0x8E12],
+  ["E843",0x8E13],
+  ["E840",0x8E14],
+  ["E7F8",0x8E15],
+  ["E7FA",0x8E16],
+  ["E845",0x8E17],
+  ["E842",0x8E18],
+  ["E7FC",0x8E19],
+  ["E846",0x8E1A],
+  ["E7F9",0x8E1B],
+  ["E844",0x8E1C],
+  ["BDEF",0x8E1D],
+  ["BDF5",0x8E1E],
+  ["BDF3",0x8E1F],
+  ["E7F3",0x8E20],
+  ["BDF4",0x8E21],
+  ["BDF0",0x8E22],
+  ["E7F4",0x8E23],
+  ["E7F6",0x8E24],
+  ["E7F5",0x8E25],
+  ["E7FD",0x8E26],
+  ["E7FE",0x8E27],
+  ["9FF6",0x8E28],
+  ["BDF2",0x8E29],
+  ["95C8",0x8E2A],
+  ["BDED",0x8E2B],
+  ["9E5A",0x8E2D],
+  ["E7F7",0x8E2E],
+  ["EBC6",0x8E30],
+  ["BFE2",0x8E31],
+  ["EBBD",0x8E33],
+  ["BFE3",0x8E34],
+  ["BFE6",0x8E35],
+  ["EBC2",0x8E36],
+  ["EBBF",0x8E38],
+  ["BFE5",0x8E39],
+  ["99E3",0x8E3A],
+  ["EBC3",0x8E3C],
+  ["EBC4",0x8E3D],
+  ["EBBE",0x8E3E],
+  ["EBC7",0x8E3F],
+  ["EBC0",0x8E40],
+  ["EBC5",0x8E41],
+  ["BFE4",0x8E42],
+  ["BFE1",0x8E44],
+  ["EBC1",0x8E45],
+  ["8A4A",0x8E46],
+  ["EEBF",0x8E47],
+  ["C1D0",0x8E48],
+  ["C1CE",0x8E49],
+  ["C1D1",0x8E4A],
+  ["C1CF",0x8E4B],
+  ["EEBE",0x8E4C],
+  ["EEBB",0x8E4D],
+  ["EEBA",0x8E4E],
+  ["9FF1",0x8E4F],
+  ["EEBD",0x8E50],
+  ["EEBC",0x8E53],
+  ["F145",0x8E54],
+  ["C2DE",0x8E55],
+  ["F0FB",0x8E56],
+  ["F0FA",0x8E57],
+  ["C2D9",0x8E59],
+  ["F141",0x8E5A],
+  ["F140",0x8E5B],
+  ["F0F7",0x8E5C],
+  ["F143",0x8E5D],
+  ["F0FC",0x8E5E],
+  ["C2DD",0x8E5F],
+  ["F0F9",0x8E60],
+  ["F142",0x8E61],
+  ["F0F8",0x8E62],
+  ["C2DA",0x8E63],
+  ["C2DC",0x8E64],
+  ["F0FD",0x8E65],
+  ["C2DB",0x8E66],
+  ["F0FE",0x8E67],
+  ["8AA7",0x8E68],
+  ["F144",0x8E69],
+  ["F352",0x8E6A],
+  ["C3DE",0x8E6C],
+  ["F34F",0x8E6D],
+  ["F353",0x8E6F],
+  ["99E6",0x8E71],
+  ["C3DB",0x8E72],
+  ["F351",0x8E73],
+  ["C3E0",0x8E74],
+  ["9FF7",0x8E75],
+  ["C3DD",0x8E76],
+  ["9FED",0x8E77],
+  ["F350",0x8E78],
+  ["C3DF",0x8E7A],
+  ["F354",0x8E7B],
+  ["C3DA",0x8E7C],
+  ["8A5C",0x8E7E],
+  ["9DAE",0x8E80],
+  ["C4BC",0x8E81],
+  ["C4BE",0x8E82],
+  ["F4D9",0x8E84],
+  ["C4BD",0x8E85],
+  ["F4D7",0x8E86],
+  ["C3DC",0x8E87],
+  ["F4D8",0x8E88],
+  ["C4BB",0x8E89],
+  ["C543",0x8E8A],
+  ["C545",0x8E8B],
+  ["F656",0x8E8C],
+  ["C544",0x8E8D],
+  ["F655",0x8E8E],
+  ["F761",0x8E90],
+  ["C5AD",0x8E91],
+  ["F760",0x8E92],
+  ["C5AE",0x8E93],
+  ["F75E",0x8E94],
+  ["F75D",0x8E95],
+  ["F762",0x8E96],
+  ["F763",0x8E97],
+  ["F846",0x8E98],
+  ["F75F",0x8E9A],
+  ["F8C6",0x8E9D],
+  ["F8C3",0x8E9E],
+  ["F8C4",0x8E9F],
+  ["F8C5",0x8EA0],
+  ["C65C",0x8EA1],
+  ["F951",0x8EA3],
+  ["F950",0x8EA4],
+  ["F94F",0x8EA5],
+  ["F970",0x8EA6],
+  ["95C9",0x8EA7],
+  ["F9BE",0x8EA8],
+  ["F9AB",0x8EA9],
+  ["C66E",0x8EAA],
+  ["A8AD",0x8EAB],
+  ["B060",0x8EAC],
+  ["9048",0x8EAD],
+  ["99E8",0x8EB0],
+  ["B8FA",0x8EB2],
+  ["9049",0x8EB6],
+  ["8CBA",0x8EB9],
+  ["BDF6",0x8EBA],
+  ["90B1",0x8EBC],
+  ["EBC8",0x8EBD],
+  ["C2DF",0x8EC0],
+  ["F355",0x8EC2],
+  ["904A",0x8EC3],
+  ["F9AC",0x8EC9],
+  ["A8AE",0x8ECA],
+  ["AAEE",0x8ECB],
+  ["AD79",0x8ECC],
+  ["AD78",0x8ECD],
+  ["99EA",0x8ECE],
+  ["B063",0x8ECF],
+  ["D3E8",0x8ED1],
+  ["B061",0x8ED2],
+  ["D3E9",0x8ED3],
+  ["B062",0x8ED4],
+  ["D7DF",0x8ED7],
+  ["D7DB",0x8ED8],
+  ["9BD1",0x8EDA],
+  ["B36D",0x8EDB],
+  ["D7DE",0x8EDC],
+  ["D7DD",0x8EDD],
+  ["D7DC",0x8EDE],
+  ["B36E",0x8EDF],
+  ["D7E0",0x8EE0],
+  ["D7E1",0x8EE1],
+  ["99EB",0x8EE2],
+  ["99EC",0x8EE4],
+  ["DC43",0x8EE5],
+  ["DC41",0x8EE6],
+  ["DC45",0x8EE7],
+  ["DC46",0x8EE8],
+  ["DC4C",0x8EE9],
+  ["DC48",0x8EEB],
+  ["DC4A",0x8EEC],
+  ["99ED",0x8EED],
+  ["DC42",0x8EEE],
+  ["DBFC",0x8EEF],
+  ["DC49",0x8EF1],
+  ["99EE",0x8EF2],
+  ["DC4B",0x8EF4],
+  ["DC44",0x8EF5],
+  ["DC47",0x8EF6],
+  ["DBFD",0x8EF7],
+  ["B662",0x8EF8],
+  ["DC40",0x8EF9],
+  ["DBFE",0x8EFA],
+  ["B661",0x8EFB],
+  ["B663",0x8EFC],
+  ["B8FD",0x8EFE],
+  ["E075",0x8EFF],
+  ["E077",0x8F00],
+  ["E076",0x8F01],
+  ["E07B",0x8F02],
+  ["B8FB",0x8F03],
+  ["E078",0x8F05],
+  ["E074",0x8F06],
+  ["E079",0x8F07],
+  ["E07A",0x8F08],
+  ["B8FC",0x8F09],
+  ["B8FE",0x8F0A],
+  ["E07C",0x8F0B],
+  ["E467",0x8F0D],
+  ["E466",0x8F0E],
+  ["E464",0x8F10],
+  ["E465",0x8F11],
+  ["BBB3",0x8F12],
+  ["BBB5",0x8F13],
+  ["BBB2",0x8F14],
+  ["BBB4",0x8F15],
+  ["E84D",0x8F16],
+  ["E84E",0x8F17],
+  ["E849",0x8F18],
+  ["904C",0x8F19],
+  ["E84A",0x8F1A],
+  ["BDF8",0x8F1B],
+  ["BDFD",0x8F1C],
+  ["BDF7",0x8F1D],
+  ["BDFE",0x8F1E],
+  ["BDF9",0x8F1F],
+  ["E84B",0x8F20],
+  ["E84C",0x8F23],
+  ["E848",0x8F24],
+  ["BE40",0x8F25],
+  ["BDFB",0x8F26],
+  ["BDFA",0x8F29],
+  ["BDFC",0x8F2A],
+  ["E847",0x8F2C],
+  ["904D",0x8F2D],
+  ["EBCA",0x8F2E],
+  ["BFE8",0x8F2F],
+  ["95CB",0x8F30],
+  ["EBCC",0x8F32],
+  ["BFEA",0x8F33],
+  ["EBCF",0x8F34],
+  ["EBCB",0x8F35],
+  ["EBC9",0x8F36],
+  ["EBCE",0x8F37],
+  ["BFE9",0x8F38],
+  ["EBCD",0x8F39],
+  ["BFE7",0x8F3B],
+  ["C1D3",0x8F3E],
+  ["C1D6",0x8F3F],
+  ["EEC1",0x8F40],
+  ["97E2",0x8F41],
+  ["C1D4",0x8F42],
+  ["EEC0",0x8F43],
+  ["C1D2",0x8F44],
+  ["C1D5",0x8F45],
+  ["F146",0x8F46],
+  ["F147",0x8F47],
+  ["F148",0x8F48],
+  ["C2E0",0x8F49],
+  ["95CC",0x8F4A],
+  ["F149",0x8F4B],
+  ["C2E1",0x8F4D],
+  ["C3E2",0x8F4E],
+  ["F358",0x8F4F],
+  ["F359",0x8F50],
+  ["F357",0x8F51],
+  ["F356",0x8F52],
+  ["F35A",0x8F53],
+  ["C3E1",0x8F54],
+  ["F4DD",0x8F55],
+  ["F4DB",0x8F56],
+  ["F4DC",0x8F57],
+  ["F4DE",0x8F58],
+  ["F4DA",0x8F59],
+  ["F4DF",0x8F5A],
+  ["F658",0x8F5B],
+  ["9F78",0x8F5C],
+  ["F659",0x8F5D],
+  ["F657",0x8F5E],
+  ["C546",0x8F5F],
+  ["F764",0x8F60],
+  ["C5AF",0x8F61],
+  ["F765",0x8F62],
+  ["F848",0x8F63],
+  ["F847",0x8F64],
+  ["897C",0x8F66],
+  ["897D",0x8F67],
+  ["897E",0x8F6E],
+  ["995D",0x8F93],
+  ["A8AF",0x8F9B],
+  ["B664",0x8F9C],
+  ["B940",0x8F9F],
+  ["9B5A",0x8FA0],
+  ["BBB6",0x8FA3],
+  ["9050",0x8FA5],
+  ["BFEC",0x8FA6],
+  ["8C4F",0x8FA7],
+  ["BFEB",0x8FA8],
+  ["C3E3",0x8FAD],
+  ["C47C",0x8FAE],
+  ["C547",0x8FAF],
+  ["A8B0",0x8FB0],
+  ["B064",0x8FB1],
+  ["B941",0x8FB2],
+  ["9054",0x8FB3],
+  ["F35B",0x8FB4],
+  ["C6D6",0x8FB5],
+  ["9AA8",0x8FB6],
+  ["99EF",0x8FB7],
+  ["FEEB",0x8FB8],
+  ["9DA3",0x8FB9],
+  ["9DA1",0x8FBA],
+  ["9943",0x8FBB],
+  ["9945",0x8FBC],
+  ["9D7D",0x8FBE],
+  ["CBA6",0x8FBF],
+  ["99F0",0x8FC1],
+  ["A8B1",0x8FC2],
+  ["A8B4",0x8FC4],
+  ["A8B3",0x8FC5],
+  ["A8B2",0x8FC6],
+  ["CBA5",0x8FC9],
+  ["99F1",0x8FCA],
+  ["CDCD",0x8FCB],
+  ["99F2",0x8FCC],
+  ["CDCF",0x8FCD],
+  ["AAEF",0x8FCE],
+  ["8CBC",0x8FCF],
+  ["9D60",0x8FD0],
+  ["AAF1",0x8FD1],
+  ["CDCC",0x8FD2],
+  ["CDCE",0x8FD3],
+  ["AAF0",0x8FD4],
+  ["CDD1",0x8FD5],
+  ["CDD0",0x8FD6],
+  ["CDD2",0x8FD7],
+  ["A0A3",0x8FDA],
+  ["D0B6",0x8FE0],
+  ["D0B4",0x8FE1],
+  ["AD7C",0x8FE2],
+  ["D0B3",0x8FE3],
+  ["ADA3",0x8FE4],
+  ["AD7E",0x8FE5],
+  ["AD7B",0x8FE6],
+  ["ADA4",0x8FE8],
+  ["AD7D",0x8FEA],
+  ["ADA2",0x8FEB],
+  ["ADA1",0x8FED],
+  ["D0B5",0x8FEE],
+  ["AD7A",0x8FF0],
+  ["B06A",0x8FF4],
+  ["D3EB",0x8FF5],
+  ["D3F1",0x8FF6],
+  ["B067",0x8FF7],
+  ["B06E",0x8FF8],
+  ["905B",0x8FF9],
+  ["B069",0x8FFA],
+  ["D3EE",0x8FFB],
+  ["D3F0",0x8FFC],
+  ["B06C",0x8FFD],
+  ["D3EA",0x8FFE],
+  ["D3ED",0x8FFF],
+  ["B068",0x9000],
+  ["B065",0x9001],
+  ["D3EC",0x9002],
+  ["B06B",0x9003],
+  ["D3EF",0x9004],
+  ["B06D",0x9005],
+  ["B066",0x9006],
+  ["9EDB",0x9008],
+  ["D7E3",0x900B],
+  ["D7E6",0x900C],
+  ["B370",0x900D],
+  ["B37A",0x900F],
+  ["B376",0x9010],
+  ["D7E4",0x9011],
+  ["9D79",0x9012],
+  ["B37E",0x9014],
+  ["B377",0x9015],
+  ["B37C",0x9016],
+  ["B372",0x9017],
+  ["B36F",0x9019],
+  ["B371",0x901A],
+  ["B37D",0x901B],
+  ["D7E5",0x901C],
+  ["B375",0x901D],
+  ["B378",0x901E],
+  ["B374",0x901F],
+  ["B379",0x9020],
+  ["D7E7",0x9021],
+  ["B37B",0x9022],
+  ["B373",0x9023],
+  ["D7E2",0x9024],
+  ["DC4D",0x902D],
+  ["B665",0x902E],
+  ["DC4F",0x902F],
+  ["B667",0x9031],
+  ["B669",0x9032],
+  ["99F3",0x9033],
+  ["DC4E",0x9034],
+  ["B666",0x9035],
+  ["B66A",0x9036],
+  ["9062",0x9037],
+  ["B668",0x9038],
+  ["B947",0x903C],
+  ["E0A3",0x903D],
+  ["B94F",0x903E],
+  ["E07E",0x903F],
+  ["B950",0x9041],
+  ["B945",0x9042],
+  ["E0A1",0x9044],
+  ["B94A",0x9047],
+  ["E0A2",0x9049],
+  ["B943",0x904A],
+  ["B942",0x904B],
+  ["9F55",0x904C],
+  ["B94D",0x904D],
+  ["B94C",0x904E],
+  ["B94B",0x904F],
+  ["B949",0x9050],
+  ["B94E",0x9051],
+  ["E07D",0x9052],
+  ["B944",0x9053],
+  ["B946",0x9054],
+  ["B948",0x9055],
+  ["9BF9",0x9056],
+  ["BBB8",0x9058],
+  ["BBBB",0x9059],
+  ["BBBF",0x905B],
+  ["BBB9",0x905C],
+  ["BBBE",0x905D],
+  ["BBBC",0x905E],
+  ["BBB7",0x9060],
+  ["9065",0x9061],
+  ["BBBD",0x9062],
+  ["BBBA",0x9063],
+  ["96E0",0x9064],
+  ["E852",0x9067],
+  ["BE43",0x9068],
+  ["BE41",0x9069],
+  ["E853",0x906B],
+  ["98BE",0x906C],
+  ["BE44",0x906D],
+  ["BE42",0x906E],
+  ["E851",0x906F],
+  ["E850",0x9070],
+  ["BFF0",0x9072],
+  ["E84F",0x9073],
+  ["BFEE",0x9074],
+  ["BFED",0x9075],
+  ["EBD0",0x9076],
+  ["BE45",0x9077],
+  ["BFEF",0x9078],
+  ["EBD1",0x9079],
+  ["BFF2",0x907A],
+  ["EBD2",0x907B],
+  ["BFF1",0x907C],
+  ["C1D8",0x907D],
+  ["EEC3",0x907E],
+  ["C1D7",0x907F],
+  ["C1DC",0x9080],
+  ["C1DA",0x9081],
+  ["C1DB",0x9082],
+  ["C2E3",0x9083],
+  ["C1D9",0x9084],
+  ["EEC2",0x9085],
+  ["EBD3",0x9086],
+  ["C2E2",0x9087],
+  ["C2E4",0x9088],
+  ["C3E4",0x908A],
+  ["C3E5",0x908B],
+  ["F4E0",0x908D],
+  ["C5DE",0x908F],
+  ["C5DD",0x9090],
+  ["A8B6",0x9091],
+  ["CA55",0x9094],
+  ["B06F",0x9095],
+  ["CA52",0x9097],
+  ["CA53",0x9098],
+  ["CA51",0x9099],
+  ["CA54",0x909B],
+  ["CBAA",0x909E],
+  ["CBA7",0x909F],
+  ["CBAC",0x90A0],
+  ["CBA8",0x90A1],
+  ["A8B7",0x90A2],
+  ["A8BA",0x90A3],
+  ["CBA9",0x90A5],
+  ["A8B9",0x90A6],
+  ["CBAB",0x90A7],
+  ["9068",0x90A8],
+  ["A8B8",0x90AA],
+  ["906C",0x90AE],
+  ["CDD5",0x90AF],
+  ["CDD7",0x90B0],
+  ["AAF4",0x90B1],
+  ["CDD3",0x90B2],
+  ["CDD6",0x90B3],
+  ["CDD4",0x90B4],
+  ["AAF2",0x90B5],
+  ["AAF5",0x90B6],
+  ["AAF3",0x90B8],
+  ["95D8",0x90BB],
+  ["D0B8",0x90BD],
+  ["D0BC",0x90BE],
+  ["D0B9",0x90BF],
+  ["ADA7",0x90C1],
+  ["ADA8",0x90C3],
+  ["906A",0x90C4],
+  ["D0BB",0x90C5],
+  ["D0BD",0x90C7],
+  ["D0BF",0x90C8],
+  ["ADA5",0x90CA],
+  ["D0BE",0x90CB],
+  ["ADA6",0x90CE],
+  ["D7EE",0x90D4],
+  ["D0BA",0x90D5],
+  ["D3F2",0x90D6],
+  ["D3FB",0x90D7],
+  ["D3F9",0x90D8],
+  ["D3F4",0x90D9],
+  ["D3F5",0x90DA],
+  ["D3FA",0x90DB],
+  ["D3FC",0x90DC],
+  ["B071",0x90DD],
+  ["D3F7",0x90DF],
+  ["D3F3",0x90E0],
+  ["B070",0x90E1],
+  ["B072",0x90E2],
+  ["D3F6",0x90E3],
+  ["D3FD",0x90E4],
+  ["D3F8",0x90E5],
+  ["B3A1",0x90E8],
+  ["D7F1",0x90E9],
+  ["D7E9",0x90EA],
+  ["D7EF",0x90EB],
+  ["D7F0",0x90EC],
+  ["B3A2",0x90ED],
+  ["D7E8",0x90EF],
+  ["D7EA",0x90F0],
+  ["D0B7",0x90F1],
+  ["D7EC",0x90F2],
+  ["D7ED",0x90F3],
+  ["D7EB",0x90F4],
+  ["B66C",0x90F5],
+  ["DC56",0x90F9],
+  ["EBD4",0x90FA],
+  ["DC57",0x90FB],
+  ["DC54",0x90FC],
+  ["B3A3",0x90FD],
+  ["B66E",0x90FE],
+  ["DC53",0x90FF],
+  ["DC59",0x9100],
+  ["DC58",0x9101],
+  ["B66B",0x9102],
+  ["DC5C",0x9103],
+  ["DC52",0x9104],
+  ["DC5B",0x9105],
+  ["DC50",0x9106],
+  ["DC5A",0x9107],
+  ["DC55",0x9108],
+  ["B66D",0x9109],
+  ["E0AA",0x910B],
+  ["E0A5",0x910D],
+  ["E0AB",0x910E],
+  ["E0A6",0x910F],
+  ["E0A4",0x9110],
+  ["E0A7",0x9111],
+  ["B951",0x9112],
+  ["E0A9",0x9114],
+  ["E0A8",0x9116],
+  ["B952",0x9117],
+  ["BBC1",0x9118],
+  ["BBC0",0x9119],
+  ["E46E",0x911A],
+  ["E471",0x911B],
+  ["E469",0x911C],
+  ["E46D",0x911D],
+  ["BBC2",0x911E],
+  ["E46C",0x911F],
+  ["E46A",0x9120],
+  ["E470",0x9121],
+  ["E46B",0x9122],
+  ["E468",0x9123],
+  ["E46F",0x9124],
+  ["E859",0x9126],
+  ["BE48",0x9127],
+  ["F14A",0x9128],
+  ["E856",0x9129],
+  ["E857",0x912A],
+  ["E855",0x912B],
+  ["DC51",0x912C],
+  ["BE47",0x912D],
+  ["E85A",0x912E],
+  ["E854",0x912F],
+  ["BE46",0x9130],
+  ["BE49",0x9131],
+  ["E858",0x9132],
+  ["EBD5",0x9133],
+  ["BFF3",0x9134],
+  ["EBD6",0x9135],
+  ["EBD7",0x9136],
+  ["EEC4",0x9138],
+  ["C1DD",0x9139],
+  ["F14B",0x913A],
+  ["F14C",0x913B],
+  ["F14D",0x913E],
+  ["F35D",0x913F],
+  ["F35C",0x9140],
+  ["F4E2",0x9141],
+  ["F4E1",0x9143],
+  ["F65B",0x9144],
+  ["F65C",0x9145],
+  ["F65A",0x9146],
+  ["F766",0x9147],
+  ["C5B0",0x9148],
+  ["A8BB",0x9149],
+  ["ADAA",0x914A],
+  ["ADA9",0x914B],
+  ["B075",0x914C],
+  ["B074",0x914D],
+  ["D440",0x914E],
+  ["D441",0x914F],
+  ["D3FE",0x9150],
+  ["9FB2",0x9151],
+  ["B073",0x9152],
+  ["D7F5",0x9153],
+  ["D7F6",0x9155],
+  ["D7F2",0x9156],
+  ["B3A4",0x9157],
+  ["D7F3",0x9158],
+  ["9FAE",0x9159],
+  ["D7F4",0x915A],
+  ["9FB0",0x915C],
+  ["89AD",0x915E],
+  ["DC5F",0x915F],
+  ["DC61",0x9160],
+  ["DC5D",0x9161],
+  ["DC60",0x9162],
+  ["B66F",0x9163],
+  ["DC5E",0x9164],
+  ["B670",0x9165],
+  ["906E",0x9167],
+  ["DD73",0x9168],
+  ["B955",0x9169],
+  ["B954",0x916A],
+  ["B953",0x916C],
+  ["E0AC",0x916E],
+  ["E0AD",0x916F],
+  ["9E71",0x9170],
+  ["E473",0x9172],
+  ["E475",0x9173],
+  ["BBC6",0x9174],
+  ["BBC3",0x9175],
+  ["9E4A",0x9176],
+  ["BBC5",0x9177],
+  ["BBC4",0x9178],
+  ["E474",0x9179],
+  ["E472",0x917A],
+  ["9FDC",0x917C],
+  ["E861",0x9180],
+  ["E85E",0x9181],
+  ["E85F",0x9182],
+  ["BE4D",0x9183],
+  ["E860",0x9184],
+  ["E85B",0x9185],
+  ["E85C",0x9186],
+  ["BE4A",0x9187],
+  ["BE4B",0x9189],
+  ["E85D",0x918A],
+  ["BE4C",0x918B],
+  ["89AB",0x918C],
+  ["EBDB",0x918D],
+  ["9FB8",0x918E],
+  ["EBDC",0x918F],
+  ["EBD9",0x9190],
+  ["EBDA",0x9191],
+  ["BFF4",0x9192],
+  ["EBD8",0x9193],
+  ["EEC8",0x9199],
+  ["EEC5",0x919A],
+  ["EEC7",0x919B],
+  ["C1E0",0x919C],
+  ["EECB",0x919D],
+  ["C1DF",0x919E],
+  ["EEC9",0x919F],
+  ["EECC",0x91A0],
+  ["EECA",0x91A1],
+  ["EEC6",0x91A2],
+  ["C1DE",0x91A3],
+  ["F14F",0x91A5],
+  ["F150",0x91A7],
+  ["F14E",0x91A8],
+  ["9070",0x91A9],
+  ["F152",0x91AA],
+  ["C2E5",0x91AB],
+  ["C2E6",0x91AC],
+  ["F35F",0x91AD],
+  ["C3E7",0x91AE],
+  ["F151",0x91AF],
+  ["F35E",0x91B0],
+  ["C3E6",0x91B1],
+  ["F4E5",0x91B2],
+  ["F4E6",0x91B3],
+  ["C4BF",0x91B4],
+  ["F4E4",0x91B5],
+  ["8B63",0x91B6],
+  ["F4E3",0x91B7],
+  ["F65D",0x91B9],
+  ["C548",0x91BA],
+  ["95DC",0x91BB],
+  ["F849",0x91BC],
+  ["F8C8",0x91BD],
+  ["F8C7",0x91BE],
+  ["C643",0x91C0],
+  ["C65D",0x91C1],
+  ["F8C9",0x91C2],
+  ["F971",0x91C3],
+  ["9071",0x91C4],
+  ["C66F",0x91C5],
+  ["A8BC",0x91C6],
+  ["AAF6",0x91C7],
+  ["B956",0x91C9],
+  ["C4C0",0x91CB],
+  ["A8BD",0x91CC],
+  ["ADAB",0x91CD],
+  ["B3A5",0x91CE],
+  ["B671",0x91CF],
+  ["C2E7",0x91D0],
+  ["AAF7",0x91D1],
+  ["D0C1",0x91D3],
+  ["D0C0",0x91D4],
+  ["D442",0x91D5],
+  ["FC5E",0x91D6],
+  ["B078",0x91D7],
+  ["B076",0x91D8],
+  ["B07A",0x91D9],
+  ["D444",0x91DA],
+  ["B079",0x91DC],
+  ["B077",0x91DD],
+  ["8949",0x91DF],
+  ["D443",0x91E2],
+  ["B3A8",0x91E3],
+  ["D7FC",0x91E4],
+  ["965B",0x91E5],
+  ["B3A7",0x91E6],
+  ["B3A9",0x91E7],
+  ["D842",0x91E8],
+  ["B3AB",0x91E9],
+  ["D7FE",0x91EA],
+  ["D840",0x91EB],
+  ["D7F7",0x91EC],
+  ["B3AA",0x91ED],
+  ["D843",0x91EE],
+  ["D7F9",0x91F1],
+  ["D7FA",0x91F3],
+  ["D7F8",0x91F4],
+  ["B3A6",0x91F5],
+  ["8C50",0x91F6],
+  ["D841",0x91F7],
+  ["D7FB",0x91F8],
+  ["D7FD",0x91F9],
+  ["94A6",0x91FA],
+  ["DC6D",0x91FD],
+  ["8FD5",0x91FE],
+  ["DC6C",0x91FF],
+  ["DC6A",0x9200],
+  ["DC62",0x9201],
+  ["DC71",0x9202],
+  ["DC65",0x9203],
+  ["DC6F",0x9204],
+  ["DC76",0x9205],
+  ["DC6E",0x9206],
+  ["B679",0x9207],
+  ["9E73",0x9208],
+  ["B675",0x9209],
+  ["DC63",0x920A],
+  ["DC69",0x920C],
+  ["B677",0x920D],
+  ["9075",0x920E],
+  ["DC68",0x920F],
+  ["B678",0x9210],
+  ["B67A",0x9211],
+  ["DC6B",0x9212],
+  ["99F7",0x9213],
+  ["B672",0x9214],
+  ["B673",0x9215],
+  ["DC77",0x9216],
+  ["DC75",0x9217],
+  ["DC74",0x9219],
+  ["DC66",0x921A],
+  ["DC72",0x921C],
+  ["B676",0x921E],
+  ["8CBF",0x9221],
+  ["B674",0x9223],
+  ["DC73",0x9224],
+  ["DC64",0x9225],
+  ["DC67",0x9226],
+  ["DC70",0x9227],
+  ["99F9",0x9228],
+  ["9663",0x922A],
+  ["95B9",0x922B],
+  ["E4BA",0x922D],
+  ["E0B7",0x922E],
+  ["E0B0",0x9230],
+  ["E0C3",0x9231],
+  ["E0CC",0x9232],
+  ["E0B3",0x9233],
+  ["B961",0x9234],
+  ["94D4",0x9235],
+  ["E0C0",0x9236],
+  ["B957",0x9237],
+  ["B959",0x9238],
+  ["B965",0x9239],
+  ["E0B1",0x923A],
+  ["FCFA",0x923C],
+  ["B95A",0x923D],
+  ["B95C",0x923E],
+  ["B966",0x923F],
+  ["B95B",0x9240],
+  ["9077",0x9241],
+  ["90AB",0x9244],
+  ["B964",0x9245],
+  ["E0B9",0x9246],
+  ["E0AE",0x9248],
+  ["B962",0x9249],
+  ["E0B8",0x924A],
+  ["B95E",0x924B],
+  ["E0CA",0x924C],
+  ["B963",0x924D],
+  ["E0C8",0x924E],
+  ["E0BC",0x924F],
+  ["E0C6",0x9250],
+  ["B960",0x9251],
+  ["E0AF",0x9252],
+  ["E0C9",0x9253],
+  ["E0C4",0x9254],
+  ["9D4D",0x9255],
+  ["E0CB",0x9256],
+  ["B958",0x9257],
+  ["99FA",0x9258],
+  ["B967",0x925A],
+  ["B95D",0x925B],
+  ["92E3",0x925D],
+  ["E0B5",0x925E],
+  ["97BB",0x925F],
+  ["E0BD",0x9260],
+  ["E0C1",0x9261],
+  ["9078",0x9262],
+  ["E0C5",0x9263],
+  ["B95F",0x9264],
+  ["E0B4",0x9265],
+  ["E0B2",0x9266],
+  ["E0BE",0x9267],
+  ["99FB",0x926B],
+  ["E0BB",0x926C],
+  ["E0BA",0x926D],
+  ["97E0",0x926E],
+  ["E0BF",0x926F],
+  ["E0C2",0x9270],
+  ["E0C7",0x9272],
+  ["E478",0x9276],
+  ["96DC",0x9277],
+  ["BBC7",0x9278],
+  ["E4A4",0x9279],
+  ["E47A",0x927A],
+  ["BBCC",0x927B],
+  ["BBD0",0x927C],
+  ["E4AD",0x927D],
+  ["E4B5",0x927E],
+  ["E4A6",0x927F],
+  ["BBC8",0x9280],
+  ["9CA8",0x9281],
+  ["E4AA",0x9282],
+  ["E0B6",0x9283],
+  ["9772",0x9284],
+  ["BBC9",0x9285],
+  ["E4B1",0x9286],
+  ["E4B6",0x9287],
+  ["E4AE",0x9288],
+  ["9440",0x9289],
+  ["E4B0",0x928A],
+  ["E4B9",0x928B],
+  ["E4B2",0x928C],
+  ["E47E",0x928D],
+  ["E4A9",0x928E],
+  ["92F2",0x928F],
+  ["BBD1",0x9291],
+  ["BBCD",0x9293],
+  ["E47C",0x9294],
+  ["E4AB",0x9295],
+  ["BBCB",0x9296],
+  ["E4A5",0x9297],
+  ["BBCA",0x9298],
+  ["E4B3",0x9299],
+  ["E4A2",0x929A],
+  ["E479",0x929B],
+  ["BBCE",0x929C],
+  ["E4B8",0x929D],
+  ["E47B",0x92A0],
+  ["E4AF",0x92A1],
+  ["E4AC",0x92A2],
+  ["E4A7",0x92A3],
+  ["E477",0x92A4],
+  ["E476",0x92A5],
+  ["E4A1",0x92A6],
+  ["E4B4",0x92A7],
+  ["BBCF",0x92A8],
+  ["E4B7",0x92A9],
+  ["E47D",0x92AA],
+  ["E4A3",0x92AB],
+  ["BE52",0x92AC],
+  ["99FD",0x92AE],
+  ["99FC",0x92B1],
+  ["BE5A",0x92B2],
+  ["BE55",0x92B3],
+  ["E8A4",0x92B4],
+  ["E8A1",0x92B5],
+  ["E867",0x92B6],
+  ["BE50",0x92B7],
+  ["F9D7",0x92B9],
+  ["964A",0x92BA],
+  ["BE4F",0x92BB],
+  ["BE56",0x92BC],
+  ["96D8",0x92BE],
+  ["99FE",0x92BF],
+  ["E865",0x92C0],
+  ["BE54",0x92C1],
+  ["E871",0x92C2],
+  ["E863",0x92C3],
+  ["E864",0x92C4],
+  ["BE4E",0x92C5],
+  ["E8A3",0x92C6],
+  ["BE58",0x92C7],
+  ["E874",0x92C8],
+  ["E879",0x92C9],
+  ["E873",0x92CA],
+  ["EBEE",0x92CB],
+  ["E86F",0x92CC],
+  ["E877",0x92CD],
+  ["E875",0x92CE],
+  ["E868",0x92CF],
+  ["E862",0x92D0],
+  ["E87D",0x92D1],
+  ["BE57",0x92D2],
+  ["E87E",0x92D3],
+  ["904B",0x92D4],
+  ["E878",0x92D5],
+  ["E86D",0x92D7],
+  ["E86B",0x92D8],
+  ["E866",0x92D9],
+  ["FA41",0x92DB],
+  ["E86E",0x92DD],
+  ["E87B",0x92DE],
+  ["E86A",0x92DF],
+  ["E87A",0x92E0],
+  ["E8A2",0x92E1],
+  ["9A40",0x92E3],
+  ["BE53",0x92E4],
+  ["975B",0x92E5],
+  ["E876",0x92E6],
+  ["E87C",0x92E7],
+  ["E872",0x92E8],
+  ["E86C",0x92E9],
+  ["BE51",0x92EA],
+  ["9A41",0x92EB],
+  ["91DD",0x92EC],
+  ["E4A8",0x92EE],
+  ["E870",0x92EF],
+  ["BE59",0x92F0],
+  ["E869",0x92F1],
+  ["93FC",0x92F2],
+  ["9A42",0x92F3],
+  ["9A43",0x92F4],
+  ["9659",0x92F6],
+  ["EBF4",0x92F7],
+  ["BFF7",0x92F8],
+  ["EBF3",0x92F9],
+  ["EBF0",0x92FA],
+  ["EC44",0x92FB],
+  ["BFFB",0x92FC],
+  ["9A44",0x92FD],
+  ["EC41",0x92FE],
+  ["EBF8",0x92FF],
+  ["EC43",0x9300],
+  ["EBE9",0x9301],
+  ["EBF6",0x9302],
+  ["9051",0x9303],
+  ["BFFD",0x9304],
+  ["EBE1",0x9306],
+  ["94BF",0x9307],
+  ["EBDF",0x9308],
+  ["EC42",0x9309],
+  ["EC40",0x930B],
+  ["EBFE",0x930C],
+  ["EBED",0x930D],
+  ["EBEC",0x930E],
+  ["EBE2",0x930F],
+  ["C040",0x9310],
+  ["EBE8",0x9312],
+  ["EBF2",0x9313],
+  ["EBFD",0x9314],
+  ["C043",0x9315],
+  ["EC45",0x9316],
+  ["C1E8",0x9318],
+  ["C045",0x9319],
+  ["BFFE",0x931A],
+  ["EBE6",0x931B],
+  ["EBEF",0x931D],
+  ["EBDE",0x931E],
+  ["EBE0",0x931F],
+  ["BFF5",0x9320],
+  ["C042",0x9321],
+  ["BFFA",0x9322],
+  ["EBE7",0x9323],
+  ["EBF7",0x9324],
+  ["EBF1",0x9325],
+  ["C041",0x9326],
+  ["EBDD",0x9327],
+  ["C1E3",0x9328],
+  ["EBF9",0x9329],
+  ["EBFC",0x932A],
+  ["BFFC",0x932B],
+  ["90A2",0x932C],
+  ["EBEB",0x932D],
+  ["C044",0x932E],
+  ["BFF9",0x932F],
+  ["9CAB",0x9330],
+  ["9776",0x9331],
+  ["BFF8",0x9333],
+  ["EBF5",0x9334],
+  ["EBFB",0x9335],
+  ["BFF6",0x9336],
+  ["EBE4",0x9338],
+  ["EBFA",0x9339],
+  ["EBE5",0x933C],
+  ["FC55",0x9340],
+  ["FE45",0x9341],
+  ["94A8",0x9342],
+  ["9A45",0x9343],
+  ["FA4B",0x9344],
+  ["9DE1",0x9345],
+  ["EBEA",0x9346],
+  ["EED2",0x9347],
+  ["96D9",0x9348],
+  ["EED7",0x9349],
+  ["C1E5",0x934A],
+  ["C1E7",0x934B],
+  ["EEDD",0x934C],
+  ["C1E1",0x934D],
+  ["EEEC",0x934E],
+  ["EEE3",0x934F],
+  ["EED8",0x9350],
+  ["EED9",0x9351],
+  ["EEE2",0x9352],
+  ["C1EE",0x9354],
+  ["EEE1",0x9355],
+  ["EED1",0x9356],
+  ["EEE0",0x9357],
+  ["EED4",0x9358],
+  ["EEED",0x9359],
+  ["C1ED",0x935A],
+  ["C1EB",0x935B],
+  ["EED5",0x935C],
+  ["EEE8",0x935E],
+  ["9774",0x935F],
+  ["EEDA",0x9360],
+  ["EEE7",0x9361],
+  ["FDF5",0x9362],
+  ["EEE9",0x9363],
+  ["EED0",0x9364],
+  ["C1E6",0x9365],
+  ["92E5",0x9366],
+  ["EEEA",0x9367],
+  ["9645",0x9368],
+  ["91DA",0x9369],
+  ["EEDE",0x936A],
+  ["90A3",0x936B],
+  ["C1EA",0x936C],
+  ["EEDB",0x936D],
+  ["A05F",0x936E],
+  ["C1EC",0x9370],
+  ["EEE4",0x9371],
+  ["90AF",0x9373],
+  ["97BF",0x9374],
+  ["C1E4",0x9375],
+  ["EED6",0x9376],
+  ["EEE5",0x9377],
+  ["914C",0x9378],
+  ["EEDF",0x9379],
+  ["EBE3",0x937A],
+  ["EEE6",0x937B],
+  ["EED3",0x937C],
+  ["967A",0x937D],
+  ["C1E9",0x937E],
+  ["EEEB",0x9380],
+  ["91DE",0x9381],
+  ["C1E2",0x9382],
+  ["EECE",0x9383],
+  ["9A46",0x9384],
+  ["FEB0",0x9385],
+  ["9779",0x9386],
+  ["946C",0x9387],
+  ["F160",0x9388],
+  ["F159",0x9389],
+  ["C2E9",0x938A],
+  ["F154",0x938C],
+  ["F163",0x938D],
+  ["F15B",0x938E],
+  ["EEDC",0x938F],
+  ["9858",0x9390],
+  ["F165",0x9391],
+  ["F155",0x9392],
+  ["C2E8",0x9394],
+  ["F15F",0x9395],
+  ["C2EA",0x9396],
+  ["C2F2",0x9397],
+  ["C2F0",0x9398],
+  ["F161",0x9399],
+  ["C2F1",0x939A],
+  ["F157",0x939B],
+  ["9266",0x939C],
+  ["F158",0x939D],
+  ["F15D",0x939E],
+  ["F162",0x939F],
+  ["93FB",0x93A0],
+  ["EECD",0x93A1],
+  ["C2EB",0x93A2],
+  ["F16A",0x93A3],
+  ["F167",0x93A4],
+  ["F16B",0x93A5],
+  ["F15E",0x93A6],
+  ["F15A",0x93A7],
+  ["F168",0x93A8],
+  ["F36A",0x93A9],
+  ["F15C",0x93AA],
+  ["C2EE",0x93AC],
+  ["9A47",0x93AD],
+  ["C2ED",0x93AE],
+  ["EECF",0x93AF],
+  ["C2EF",0x93B0],
+  ["F164",0x93B1],
+  ["F166",0x93B2],
+  ["C2EC",0x93B3],
+  ["F169",0x93B4],
+  ["F153",0x93B5],
+  ["F156",0x93B7],
+  ["9749",0x93B8],
+  ["9748",0x93BB],
+  ["934A",0x93BD],
+  ["9CE2",0x93BF],
+  ["F373",0x93C0],
+  ["F363",0x93C2],
+  ["C3EB",0x93C3],
+  ["F371",0x93C4],
+  ["9264",0x93C6],
+  ["F361",0x93C7],
+  ["C3EC",0x93C8],
+  ["F36C",0x93CA],
+  ["91DF",0x93CB],
+  ["F368",0x93CC],
+  ["C3F1",0x93CD],
+  ["F372",0x93CE],
+  ["F362",0x93CF],
+  ["F365",0x93D0],
+  ["C3E9",0x93D1],
+  ["F374",0x93D2],
+  ["FB79",0x93D3],
+  ["F36D",0x93D4],
+  ["F370",0x93D5],
+  ["C3EF",0x93D6],
+  ["C3F4",0x93D7],
+  ["C3F2",0x93D8],
+  ["F369",0x93D9],
+  ["F364",0x93DA],
+  ["96D7",0x93DB],
+  ["C3ED",0x93DC],
+  ["C3EE",0x93DD],
+  ["F360",0x93DE],
+  ["C3EA",0x93DF],
+  ["9343",0x93E0],
+  ["C3E8",0x93E1],
+  ["C3F0",0x93E2],
+  ["F36F",0x93E3],
+  ["C3F3",0x93E4],
+  ["F36B",0x93E6],
+  ["F375",0x93E7],
+  ["C3F5",0x93E8],
+  ["F367",0x93EC],
+  ["F36E",0x93EE],
+  ["FDCB",0x93F0],
+  ["FE7A",0x93F1],
+  ["91DB",0x93F3],
+  ["8C6A",0x93F4],
+  ["F4F3",0x93F5],
+  ["F542",0x93F6],
+  ["F4F5",0x93F7],
+  ["F4FC",0x93F8],
+  ["F366",0x93F9],
+  ["F4FA",0x93FA],
+  ["F4E9",0x93FB],
+  ["F540",0x93FC],
+  ["C4C3",0x93FD],
+  ["F4ED",0x93FE],
+  ["F4FE",0x93FF],
+  ["F4F4",0x9400],
+  ["97AF",0x9401],
+  ["C4C2",0x9403],
+  ["95DD",0x9404],
+  ["F544",0x9406],
+  ["F4F6",0x9407],
+  ["9348",0x9408],
+  ["F4FB",0x9409],
+  ["F4FD",0x940A],
+  ["F4E7",0x940B],
+  ["F541",0x940C],
+  ["F4F2",0x940D],
+  ["F4F7",0x940E],
+  ["F4EB",0x940F],
+  ["F4EF",0x9410],
+  ["F543",0x9411],
+  ["F4F9",0x9412],
+  ["F4E8",0x9413],
+  ["F4EC",0x9414],
+  ["F4EE",0x9415],
+  ["F4F8",0x9416],
+  ["9A4B",0x9417],
+  ["C4C1",0x9418],
+  ["F4F1",0x9419],
+  ["FC45",0x941B],
+  ["9A4D",0x941D],
+  ["F4EA",0x9420],
+  ["91BC",0x9424],
+  ["90E2",0x9425],
+  ["90B4",0x9426],
+  ["95E1",0x9427],
+  ["F4F0",0x9428],
+  ["F661",0x9429],
+  ["F666",0x942A],
+  ["C54F",0x942B],
+  ["F668",0x942C],
+  ["9A4E",0x942D],
+  ["C549",0x942E],
+  ["F664",0x9430],
+  ["F66A",0x9431],
+  ["C54E",0x9432],
+  ["C54A",0x9433],
+  ["C54B",0x9435],
+  ["F660",0x9436],
+  ["F667",0x9437],
+  ["C54D",0x9438],
+  ["F665",0x9439],
+  ["C54C",0x943A],
+  ["F65F",0x943B],
+  ["F663",0x943C],
+  ["F662",0x943D],
+  ["9A4F",0x943E],
+  ["F65E",0x943F],
+  ["F669",0x9440],
+  ["FE40",0x9442],
+  ["FE43",0x9443],
+  ["C5B1",0x9444],
+  ["F76D",0x9445],
+  ["F770",0x9446],
+  ["F76C",0x9447],
+  ["F76E",0x9448],
+  ["F76F",0x9449],
+  ["F769",0x944A],
+  ["F76A",0x944B],
+  ["F767",0x944C],
+  ["96DD",0x944D],
+  ["F76B",0x944F],
+  ["F768",0x9450],
+  ["C5B2",0x9451],
+  ["C5B3",0x9452],
+  ["9A51",0x9454],
+  ["F84B",0x9455],
+  ["F84D",0x9457],
+  ["96A7",0x9458],
+  ["90B0",0x945B],
+  ["F84C",0x945D],
+  ["F84E",0x945E],
+  ["C5E0",0x9460],
+  ["F84A",0x9462],
+  ["C5DF",0x9463],
+  ["C5E1",0x9464],
+  ["9C4E",0x9465],
+  ["9443",0x9467],
+  ["F8CB",0x9468],
+  ["F8CC",0x9469],
+  ["C644",0x946A],
+  ["F8CA",0x946B],
+  ["8EBA",0x946C],
+  ["F953",0x946D],
+  ["F952",0x946E],
+  ["F954",0x946F],
+  ["C65F",0x9470],
+  ["F955",0x9471],
+  ["C65E",0x9472],
+  ["F956",0x9473],
+  ["F972",0x9474],
+  ["F975",0x9475],
+  ["F974",0x9476],
+  ["C668",0x9477],
+  ["F973",0x9478],
+  ["9A52",0x9479],
+  ["FCC1",0x947B],
+  ["C672",0x947C],
+  ["C670",0x947D],
+  ["C671",0x947E],
+  ["C677",0x947F],
+  ["F9C0",0x9480],
+  ["F9C1",0x9481],
+  ["F9BF",0x9482],
+  ["F9C9",0x9483],
+  ["8BE9",0x9485],
+  ["9CAF",0x949F],
+  ["8BFD",0x94A2],
+  ["9ABC",0x94C1],
+  ["9AB8",0x94C3],
+  ["9AAE",0x94DC],
+  ["9AA7",0x94F6],
+  ["9A53",0x952D],
+  ["9D74",0x9547],
+  ["AAF8",0x9577],
+  ["8BEA",0x9578],
+  ["D844",0x957A],
+  ["DC78",0x957B],
+  ["E8A5",0x957C],
+  ["F376",0x957D],
+  ["8BEB",0x957F],
+  ["AAF9",0x9580],
+  ["ADAC",0x9582],
+  ["B07B",0x9583],
+  ["90B2",0x9585],
+  ["D845",0x9586],
+  ["D846",0x9588],
+  ["B3AC",0x9589],
+  ["B67D",0x958B],
+  ["DC7A",0x958C],
+  ["DC79",0x958D],
+  ["B6A3",0x958E],
+  ["B67C",0x958F],
+  ["DC7B",0x9590],
+  ["B67E",0x9591],
+  ["B6A2",0x9592],
+  ["B6A1",0x9593],
+  ["B67B",0x9594],
+  ["95E9",0x9596],
+  ["95E8",0x9597],
+  ["B968",0x9598],
+  ["95E6",0x9599],
+  ["E0D0",0x959B],
+  ["E0CE",0x959C],
+  ["E0CF",0x959E],
+  ["E0CD",0x959F],
+  ["90B5",0x95A0],
+  ["BBD2",0x95A1],
+  ["9A54",0x95A2],
+  ["BBD5",0x95A3],
+  ["BBD7",0x95A4],
+  ["BBD6",0x95A5],
+  ["90B3",0x95A6],
+  ["95E7",0x95A7],
+  ["BBD3",0x95A8],
+  ["BBD4",0x95A9],
+  ["8B50",0x95AA],
+  ["E8A7",0x95AB],
+  ["E8A6",0x95AC],
+  ["BE5B",0x95AD],
+  ["E8A8",0x95AE],
+  ["E8A9",0x95B0],
+  ["BE5C",0x95B1],
+  ["EC4D",0x95B5],
+  ["EC4B",0x95B6],
+  ["EEF3",0x95B7],
+  ["EC49",0x95B9],
+  ["EC4A",0x95BA],
+  ["C046",0x95BB],
+  ["EC46",0x95BC],
+  ["EC4E",0x95BD],
+  ["EC48",0x95BE],
+  ["EC4C",0x95BF],
+  ["EEEF",0x95C0],
+  ["EEF1",0x95C3],
+  ["EEF2",0x95C5],
+  ["C1F3",0x95C6],
+  ["EEEE",0x95C7],
+  ["C1F2",0x95C8],
+  ["EEF0",0x95C9],
+  ["C1EF",0x95CA],
+  ["C1F0",0x95CB],
+  ["C1F1",0x95CC],
+  ["EC47",0x95CD],
+  ["C2F5",0x95D0],
+  ["F16E",0x95D1],
+  ["F16C",0x95D2],
+  ["F16D",0x95D3],
+  ["C2F3",0x95D4],
+  ["C2F6",0x95D5],
+  ["C2F4",0x95D6],
+  ["F377",0x95DA],
+  ["F378",0x95DB],
+  ["C3F6",0x95DC],
+  ["F545",0x95DE],
+  ["F547",0x95DF],
+  ["F546",0x95E0],
+  ["C4C4",0x95E1],
+  ["C550",0x95E2],
+  ["F66D",0x95E3],
+  ["F66C",0x95E4],
+  ["F66B",0x95E5],
+  ["8BEC",0x95E8],
+  ["9A56",0x95F4],
+  ["AAFA",0x961C],
+  ["8BFB",0x961D],
+  ["C9AA",0x961E],
+  ["CA58",0x9620],
+  ["A6E9",0x9621],
+  ["CA56",0x9622],
+  ["CA59",0x9623],
+  ["CA57",0x9624],
+  ["CBAE",0x9628],
+  ["A8C1",0x962A],
+  ["A8C2",0x962C],
+  ["CBB0",0x962D],
+  ["A8BF",0x962E],
+  ["CBAF",0x962F],
+  ["CBAD",0x9630],
+  ["A8C0",0x9631],
+  ["A8BE",0x9632],
+  ["9A57",0x9633],
+  ["A0AA",0x9638],
+  ["CDD8",0x9639],
+  ["CDDB",0x963A],
+  ["AAFD",0x963B],
+  ["CDDA",0x963C],
+  ["CDD9",0x963D],
+  ["AAFC",0x963F],
+  ["AAFB",0x9640],
+  ["9FA6",0x9641],
+  ["AB40",0x9642],
+  ["CDDC",0x9643],
+  ["AAFE",0x9644],
+  ["99CC",0x9645],
+  ["D0C6",0x964A],
+  ["ADAE",0x964B],
+  ["ADAF",0x964C],
+  ["ADB0",0x964D],
+  ["D0C7",0x964E],
+  ["D0C3",0x964F],
+  ["ADAD",0x9650],
+  ["D0C4",0x9651],
+  ["D0C5",0x9653],
+  ["D0C2",0x9654],
+  ["9C59",0x9656],
+  ["B0A4",0x9658],
+  ["B0A1",0x965B],
+  ["D445",0x965C],
+  ["B0A2",0x965D],
+  ["B0A5",0x965E],
+  ["D446",0x965F],
+  ["B07E",0x9661],
+  ["B07C",0x9662],
+  ["B07D",0x9663],
+  ["B0A3",0x9664],
+  ["99B5",0x9669],
+  ["B3AD",0x966A],
+  ["D849",0x966B],
+  ["B3B5",0x966C],
+  ["D848",0x966D],
+  ["D84B",0x966F],
+  ["B3B1",0x9670],
+  ["D84A",0x9671],
+  ["B6AB",0x9672],
+  ["B3AF",0x9673],
+  ["B3B2",0x9674],
+  ["B3AE",0x9675],
+  ["B3B3",0x9676],
+  ["B3B4",0x9677],
+  ["B3B0",0x9678],
+  ["90BE",0x967B],
+  ["D847",0x967C],
+  ["B6A7",0x967D],
+  ["DC7D",0x967E],
+  ["DCA3",0x9680],
+  ["9FAF",0x9681],
+  ["DCA2",0x9683],
+  ["B6AC",0x9684],
+  ["B6A8",0x9685],
+  ["B6A9",0x9686],
+  ["DC7C",0x9687],
+  ["DC7E",0x9688],
+  ["DCA1",0x9689],
+  ["B6A4",0x968A],
+  ["B6A6",0x968B],
+  ["B6AA",0x968D],
+  ["B6A5",0x968E],
+  ["95F2",0x968F],
+  ["E0D3",0x9691],
+  ["E0D1",0x9692],
+  ["E0D2",0x9693],
+  ["B96A",0x9694],
+  ["B96B",0x9695],
+  ["90BF",0x9696],
+  ["E0D4",0x9697],
+  ["B969",0x9698],
+  ["BBD8",0x9699],
+  ["BBDA",0x969B],
+  ["BBD9",0x969C],
+  ["E4BB",0x969E],
+  ["E4BC",0x96A1],
+  ["E8AB",0x96A2],
+  ["90C1",0x96A3],
+  ["E8AA",0x96A4],
+  ["FEE4",0x96A5],
+  ["C047",0x96A7],
+  ["C048",0x96A8],
+  ["EC4F",0x96A9],
+  ["C049",0x96AA],
+  ["EEF6",0x96AC],
+  ["EEF4",0x96AE],
+  ["EEF5",0x96B0],
+  ["C1F4",0x96B1],
+  ["F16F",0x96B3],
+  ["C3F7",0x96B4],
+  ["90C4",0x96B6],
+  ["C1F5",0x96B8],
+  ["AB41",0x96B9],
+  ["B0A6",0x96BB],
+  ["D447",0x96BC],
+  ["90C7",0x96BD],
+  ["D84C",0x96BF],
+  ["B3B6",0x96C0],
+  ["B6AD",0x96C1],
+  ["DCA4",0x96C2],
+  ["DCA6",0x96C3],
+  ["B6AF",0x96C4],
+  ["B6AE",0x96C5],
+  ["B6B0",0x96C6],
+  ["B6B1",0x96C7],
+  ["DCA5",0x96C8],
+  ["B96E",0x96C9],
+  ["B96F",0x96CA],
+  ["B96D",0x96CB],
+  ["BBDB",0x96CC],
+  ["B96C",0x96CD],
+  ["E0D5",0x96CE],
+  ["BBDC",0x96D2],
+  ["E8AC",0x96D3],
+  ["EC50",0x96D4],
+  ["C04A",0x96D5],
+  ["C1F6",0x96D6],
+  ["F170",0x96D7],
+  ["F174",0x96D8],
+  ["C2F9",0x96D9],
+  ["F171",0x96DA],
+  ["C2FA",0x96DB],
+  ["C2F8",0x96DC],
+  ["F175",0x96DD],
+  ["C2FB",0x96DE],
+  ["F173",0x96DF],
+  ["F379",0x96E1],
+  ["C2F7",0x96E2],
+  ["C3F8",0x96E3],
+  ["F8CD",0x96E5],
+  ["AB42",0x96E8],
+  ["B3B8",0x96E9],
+  ["B3B7",0x96EA],
+  ["B6B2",0x96EF],
+  ["DCA8",0x96F0],
+  ["DCA7",0x96F1],
+  ["B6B3",0x96F2],
+  ["92E4",0x96F4],
+  ["E0D9",0x96F5],
+  ["B973",0x96F6],
+  ["B970",0x96F7],
+  ["E0D8",0x96F8],
+  ["B972",0x96F9],
+  ["E0D6",0x96FA],
+  ["B971",0x96FB],
+  ["E0D7",0x96FD],
+  ["E4BD",0x96FF],
+  ["BBDD",0x9700],
+  ["E8AF",0x9702],
+  ["9F52",0x9703],
+  ["BE5D",0x9704],
+  ["E8AD",0x9705],
+  ["BE5E",0x9706],
+  ["BE5F",0x9707],
+  ["E8AE",0x9708],
+  ["BE60",0x9709],
+  ["EC51",0x970B],
+  ["C04E",0x970D],
+  ["C04B",0x970E],
+  ["C050",0x970F],
+  ["EC53",0x9710],
+  ["C04C",0x9711],
+  ["EC52",0x9712],
+  ["C04F",0x9713],
+  ["C04D",0x9716],
+  ["EEF9",0x9718],
+  ["EEFB",0x9719],
+  ["90DB",0x971B],
+  ["C1F7",0x971C],
+  ["EEFA",0x971D],
+  ["C1F8",0x971E],
+  ["EEF8",0x971F],
+  ["EEF7",0x9720],
+  ["A066",0x9721],
+  ["F177",0x9722],
+  ["F176",0x9723],
+  ["C2FC",0x9724],
+  ["F178",0x9725],
+  ["F37E",0x9726],
+  ["C3FA",0x9727],
+  ["F37D",0x9728],
+  ["F37A",0x9729],
+  ["C3F9",0x972A],
+  ["F37B",0x972B],
+  ["F37C",0x972C],
+  ["F548",0x972E],
+  ["F549",0x972F],
+  ["C4C5",0x9730],
+  ["90D2",0x9731],
+  ["C553",0x9732],
+  ["876B",0x9734],
+  ["F66E",0x9735],
+  ["90D4",0x9736],
+  ["C551",0x9738],
+  ["C552",0x9739],
+  ["F66F",0x973A],
+  ["C5B4",0x973D],
+  ["C5B5",0x973E],
+  ["F771",0x973F],
+  ["9A5B",0x9740],
+  ["95FD",0x9741],
+  ["C645",0x9742],
+  ["F8CF",0x9743],
+  ["C647",0x9744],
+  ["F8CE",0x9746],
+  ["F8D0",0x9747],
+  ["C646",0x9748],
+  ["F957",0x9749],
+  ["F9AD",0x974B],
+  ["8BC4",0x9751],
+  ["AB43",0x9752],
+  ["8C66",0x9755],
+  ["B974",0x9756],
+  ["90DE",0x9757],
+  ["E4BE",0x9758],
+  ["E8B0",0x975A],
+  ["C051",0x975B],
+  ["C052",0x975C],
+  ["9CE4",0x975D],
+  ["AB44",0x975E],
+  ["90E1",0x975F],
+  ["BE61",0x9760],
+  ["C3FB",0x9761],
+  ["ADB1",0x9762],
+  ["C053",0x9766],
+  ["C5E2",0x9768],
+  ["ADB2",0x9769],
+  ["D84D",0x976A],
+  ["DCA9",0x976C],
+  ["9E46",0x976D],
+  ["DCAB",0x976E],
+  ["DCAA",0x9770],
+  ["9651",0x9771],
+  ["E0DD",0x9772],
+  ["E0DA",0x9773],
+  ["B975",0x9774],
+  ["B976",0x9776],
+  ["E0DB",0x9777],
+  ["E0DC",0x9778],
+  ["E4C0",0x977A],
+  ["E4C5",0x977B],
+  ["BBDE",0x977C],
+  ["E4BF",0x977D],
+  ["E4C1",0x977E],
+  ["E4C8",0x977F],
+  ["E4C3",0x9780],
+  ["E4C7",0x9781],
+  ["E4C4",0x9782],
+  ["E4C2",0x9783],
+  ["E4C6",0x9784],
+  ["BBDF",0x9785],
+  ["FB58",0x9787],
+  ["E8B3",0x9788],
+  ["90E6",0x9789],
+  ["E8B1",0x978A],
+  ["BE63",0x978B],
+  ["BE62",0x978D],
+  ["E8B2",0x978E],
+  ["BE64",0x978F],
+  ["EC56",0x9794],
+  ["EC55",0x9797],
+  ["C054",0x9798],
+  ["EC54",0x9799],
+  ["EEFC",0x979A],
+  ["9650",0x979B],
+  ["EEFE",0x979C],
+  ["EF41",0x979D],
+  ["EF40",0x979E],
+  ["90E7",0x979F],
+  ["C1F9",0x97A0],
+  ["EEFD",0x97A1],
+  ["F1A1",0x97A2],
+  ["C2FD",0x97A3],
+  ["F17D",0x97A4],
+  ["F1A2",0x97A5],
+  ["C2FE",0x97A6],
+  ["F17B",0x97A8],
+  ["F17E",0x97AA],
+  ["F17C",0x97AB],
+  ["F179",0x97AC],
+  ["C340",0x97AD],
+  ["F17A",0x97AE],
+  ["90E8",0x97B1],
+  ["9A5D",0x97B2],
+  ["F3A1",0x97B3],
+  ["9F7A",0x97B4],
+  ["F3A3",0x97B6],
+  ["F3A2",0x97B7],
+  ["9B5C",0x97B8],
+  ["F54A",0x97B9],
+  ["9F7C",0x97BA],
+  ["F54B",0x97BB],
+  ["FC52",0x97BD],
+  ["90E9",0x97BE],
+  ["F670",0x97BF],
+  ["90EA",0x97C0],
+  ["C5B7",0x97C1],
+  ["9A5E",0x97C2],
+  ["C5B6",0x97C3],
+  ["F84F",0x97C4],
+  ["F850",0x97C5],
+  ["C648",0x97C6],
+  ["F8D1",0x97C7],
+  ["9F76",0x97C8],
+  ["C669",0x97C9],
+  ["ADB3",0x97CB],
+  ["B6B4",0x97CC],
+  ["E4CA",0x97CD],
+  ["E4C9",0x97CE],
+  ["E8B5",0x97CF],
+  ["E8B4",0x97D0],
+  ["90EB",0x97D2],
+  ["C1FA",0x97D3],
+  ["EF43",0x97D4],
+  ["EF42",0x97D5],
+  ["F1A5",0x97D6],
+  ["F1A3",0x97D7],
+  ["F1A6",0x97D8],
+  ["F1A4",0x97D9],
+  ["C3FC",0x97DC],
+  ["F3A4",0x97DD],
+  ["F3A5",0x97DE],
+  ["F3A6",0x97DF],
+  ["90EC",0x97E0],
+  ["F671",0x97E1],
+  ["F772",0x97E3],
+  ["F8D2",0x97E5],
+  ["8BEE",0x97E6],
+  ["ADB4",0x97ED],
+  ["90EE",0x97EE],
+  ["EC57",0x97F0],
+  ["EF44",0x97F1],
+  ["91C6",0x97F2],
+  ["ADB5",0x97F3],
+  ["90F2",0x97F5],
+  ["BBE0",0x97F6],
+  ["EC58",0x97F8],
+  ["C341",0x97F9],
+  ["F1A7",0x97FA],
+  ["C3FD",0x97FB],
+  ["F54C",0x97FD],
+  ["F54D",0x97FE],
+  ["C554",0x97FF],
+  ["F851",0x9800],
+  ["ADB6",0x9801],
+  ["B3BB",0x9802],
+  ["B3BC",0x9803],
+  ["D84E",0x9804],
+  ["B6B5",0x9805],
+  ["B6B6",0x9806],
+  ["DCAC",0x9807],
+  ["B6B7",0x9808],
+  ["B97A",0x980A],
+  ["B97C",0x980C],
+  ["E0DF",0x980D],
+  ["E0E0",0x980E],
+  ["E0DE",0x980F],
+  ["B977",0x9810],
+  ["B978",0x9811],
+  ["B97B",0x9812],
+  ["B979",0x9813],
+  ["FCBC",0x9814],
+  ["8A74",0x9815],
+  ["E4CB",0x9816],
+  ["BBE1",0x9817],
+  ["BBE2",0x9818],
+  ["E8BC",0x981B],
+  ["BE67",0x981C],
+  ["E8B7",0x981D],
+  ["E8B6",0x981E],
+  ["9657",0x981F],
+  ["E8BB",0x9820],
+  ["BE65",0x9821],
+  ["9CEF",0x9823],
+  ["C05B",0x9824],
+  ["E8B8",0x9826],
+  ["E8BD",0x9827],
+  ["E8BA",0x9828],
+  ["E8B9",0x9829],
+  ["BE66",0x982B],
+  ["C059",0x982D],
+  ["9FDF",0x982E],
+  ["EC5A",0x982F],
+  ["C055",0x9830],
+  ["EC5B",0x9832],
+  ["90F7",0x9833],
+  ["90F6",0x9834],
+  ["EC59",0x9835],
+  ["C058",0x9837],
+  ["C056",0x9838],
+  ["C05A",0x9839],
+  ["C057",0x983B],
+  ["EF45",0x9841],
+  ["EF4A",0x9843],
+  ["EF46",0x9844],
+  ["EF49",0x9845],
+  ["C1FB",0x9846],
+  ["9B5E",0x9847],
+  ["EDD4",0x9848],
+  ["EF48",0x9849],
+  ["EF47",0x984A],
+  ["90F8",0x984B],
+  ["C344",0x984C],
+  ["C342",0x984D],
+  ["C345",0x984E],
+  ["C343",0x984F],
+  ["F1A8",0x9850],
+  ["F1A9",0x9851],
+  ["F1AA",0x9852],
+  ["C346",0x9853],
+  ["8CFC",0x9856],
+  ["F3AA",0x9857],
+  ["C440",0x9858],
+  ["F3A8",0x9859],
+  ["C441",0x985B],
+  ["F3A7",0x985C],
+  ["F3A9",0x985D],
+  ["C3FE",0x985E],
+  ["F551",0x985F],
+  ["F54E",0x9860],
+  ["F54F",0x9862],
+  ["F550",0x9863],
+  ["F672",0x9864],
+  ["C556",0x9865],
+  ["90F9",0x9866],
+  ["C555",0x9867],
+  ["8CC9",0x9868],
+  ["F774",0x9869],
+  ["F773",0x986A],
+  ["C5B8",0x986B],
+  ["FA6A",0x986C],
+  ["C5E3",0x986F],
+  ["C649",0x9870],
+  ["C660",0x9871],
+  ["F958",0x9872],
+  ["F9AE",0x9873],
+  ["F9AF",0x9874],
+  ["8BEF",0x9875],
+  ["ADB7",0x98A8],
+  ["DCAD",0x98A9],
+  ["E0E1",0x98AC],
+  ["E4CC",0x98AD],
+  ["E4CD",0x98AE],
+  ["BBE3",0x98AF],
+  ["BBE4",0x98B1],
+  ["E8BE",0x98B2],
+  ["BE68",0x98B3],
+  ["9FE0",0x98B4],
+  ["C1FC",0x98B6],
+  ["9142",0x98B7],
+  ["F1AB",0x98B8],
+  ["9A62",0x98B9],
+  ["C347",0x98BA],
+  ["F3AD",0x98BB],
+  ["C442",0x98BC],
+  ["F3AC",0x98BD],
+  ["F3AE",0x98BE],
+  ["F3AB",0x98BF],
+  ["F675",0x98C0],
+  ["F552",0x98C1],
+  ["F553",0x98C2],
+  ["9569",0x98C3],
+  ["C4C6",0x98C4],
+  ["F674",0x98C6],
+  ["9144",0x98C7],
+  ["9143",0x98C8],
+  ["F673",0x98C9],
+  ["9141",0x98CA],
+  ["F775",0x98CB],
+  ["F9B0",0x98CC],
+  ["8BF0",0x98CE],
+  ["ADB8",0x98DB],
+  ["9660",0x98DC],
+  ["8BF1",0x98DE],
+  ["ADB9",0x98DF],
+  ["99F6",0x98E0],
+  ["9149",0x98E1],
+  ["B0A7",0x98E2],
+  ["D448",0x98E3],
+  ["D84F",0x98E5],
+  ["914A",0x98E6],
+  ["B6B8",0x98E7],
+  ["B6BB",0x98E9],
+  ["B6B9",0x98EA],
+  ["DCAE",0x98EB],
+  ["914B",0x98EC],
+  ["B6BD",0x98ED],
+  ["B6BA",0x98EF],
+  ["9A64",0x98F1],
+  ["B6BC",0x98F2],
+  ["B97E",0x98F4],
+  ["8ABF",0x98F5],
+  ["E0E2",0x98F6],
+  ["E0E3",0x98F9],
+  ["E8C0",0x98FA],
+  ["B97D",0x98FC],
+  ["B9A1",0x98FD],
+  ["B9A2",0x98FE],
+  ["E4CF",0x9900],
+  ["E4CE",0x9902],
+  ["BBE5",0x9903],
+  ["BBE6",0x9905],
+  ["E4D0",0x9907],
+  ["E8BF",0x9908],
+  ["BBE8",0x9909],
+  ["BE69",0x990A],
+  ["BBE7",0x990C],
+  ["9A66",0x990E],
+  ["C05C",0x9910],
+  ["E8C1",0x9911],
+  ["BE6B",0x9912],
+  ["BE6A",0x9913],
+  ["E8C2",0x9914],
+  ["E8C5",0x9915],
+  ["E8C3",0x9916],
+  ["E8C4",0x9917],
+  ["BE6C",0x9918],
+  ["9A67",0x9919],
+  ["C061",0x991A],
+  ["C05F",0x991B],
+  ["9A69",0x991C],
+  ["C05E",0x991E],
+  ["EC5D",0x991F],
+  ["C060",0x9921],
+  ["EC5C",0x9924],
+  ["EF4B",0x9925],
+  ["EC5E",0x9927],
+  ["C05D",0x9928],
+  ["EC5F",0x9929],
+  ["EF4E",0x992A],
+  ["EF4C",0x992B],
+  ["EF4D",0x992C],
+  ["EF52",0x992D],
+  ["C34B",0x992E],
+  ["EF51",0x992F],
+  ["EF54",0x9930],
+  ["EF53",0x9931],
+  ["EF50",0x9932],
+  ["EF4F",0x9933],
+  ["C1FD",0x9935],
+  ["9A6A",0x9937],
+  ["9652",0x9938],
+  ["914D",0x9939],
+  ["F1AE",0x993A],
+  ["9666",0x993B],
+  ["F1AD",0x993C],
+  ["C34A",0x993D],
+  ["C348",0x993E],
+  ["C349",0x993F],
+  ["9F7B",0x9940],
+  ["F1AC",0x9941],
+  ["9A6B",0x9942],
+  ["F3B1",0x9943],
+  ["C443",0x9945],
+  ["F3B0",0x9947],
+  ["F3AF",0x9948],
+  ["C444",0x9949],
+  ["A06C",0x994A],
+  ["F558",0x994B],
+  ["F557",0x994C],
+  ["9667",0x994D],
+  ["F555",0x994E],
+  ["F554",0x9950],
+  ["C4C8",0x9951],
+  ["C4C7",0x9952],
+  ["F559",0x9953],
+  ["F776",0x9954],
+  ["C5B9",0x9955],
+  ["F677",0x9956],
+  ["C557",0x9957],
+  ["F676",0x9958],
+  ["F556",0x9959],
+  ["F777",0x995B],
+  ["C5E4",0x995C],
+  ["9A6C",0x995D],
+  ["C661",0x995E],
+  ["F959",0x995F],
+  ["F9B1",0x9961],
+  ["9A6D",0x9962],
+  ["8BF2",0x9963],
+  ["ADBA",0x9996],
+  ["D850",0x9997],
+  ["EF55",0x9998],
+  ["ADBB",0x9999],
+  ["966A",0x999B],
+  ["E4D2",0x999C],
+  ["E4D1",0x999D],
+  ["EC60",0x999E],
+  ["EF57",0x99A1],
+  ["EF56",0x99A3],
+  ["FCEA",0x99A4],
+  ["C34C",0x99A5],
+  ["F3B2",0x99A6],
+  ["F3B3",0x99A7],
+  ["C4C9",0x99A8],
+  ["966C",0x99AA],
+  ["F9B2",0x99AB],
+  ["B0A8",0x99AC],
+  ["B6BF",0x99AD],
+  ["B6BE",0x99AE],
+  ["E0E4",0x99AF],
+  ["E0E6",0x99B0],
+  ["B9A4",0x99B1],
+  ["E0E5",0x99B2],
+  ["B9A3",0x99B3],
+  ["B9A5",0x99B4],
+  ["E0E7",0x99B5],
+  ["91C4",0x99B8],
+  ["E4D4",0x99B9],
+  ["E4D6",0x99BA],
+  ["E4D5",0x99BB],
+  ["9677",0x99BC],
+  ["E4D8",0x99BD],
+  ["BBE9",0x99C1],
+  ["E4D7",0x99C2],
+  ["E4D3",0x99C3],
+  ["99F4",0x99C4],
+  ["9A6F",0x99C5],
+  ["E4D9",0x99C7],
+  ["E8CC",0x99C9],
+  ["E8CF",0x99CB],
+  ["E8D1",0x99CC],
+  ["E8C7",0x99CD],
+  ["E8CB",0x99CE],
+  ["E8C8",0x99CF],
+  ["BE6E",0x99D0],
+  ["BE71",0x99D1],
+  ["BE73",0x99D2],
+  ["E8C9",0x99D3],
+  ["E8CA",0x99D4],
+  ["BE72",0x99D5],
+  ["E8CD",0x99D6],
+  ["E8D0",0x99D7],
+  ["E8CE",0x99D8],
+  ["BE74",0x99D9],
+  ["9FAB",0x99DA],
+  ["BE70",0x99DB],
+  ["E8C6",0x99DC],
+  ["BE6D",0x99DD],
+  ["BE6F",0x99DF],
+  ["8CBE",0x99E0],
+  ["8EC1",0x99E1],
+  ["C063",0x99E2],
+  ["EC66",0x99E3],
+  ["EC64",0x99E4],
+  ["EC63",0x99E5],
+  ["9555",0x99E6],
+  ["EC69",0x99E7],
+  ["EC68",0x99E9],
+  ["EC67",0x99EA],
+  ["EC62",0x99EC],
+  ["C062",0x99ED],
+  ["EC61",0x99EE],
+  ["EC65",0x99F0],
+  ["C064",0x99F1],
+  ["EF5A",0x99F4],
+  ["9152",0x99F5],
+  ["EF5E",0x99F6],
+  ["EF5B",0x99F7],
+  ["EF5D",0x99F8],
+  ["EF5C",0x99F9],
+  ["EF59",0x99FA],
+  ["EF5F",0x99FB],
+  ["EF62",0x99FC],
+  ["EF60",0x99FD],
+  ["EF61",0x99FE],
+  ["C240",0x99FF],
+  ["C1FE",0x9A01],
+  ["EF58",0x9A02],
+  ["EF63",0x9A03],
+  ["F1B3",0x9A04],
+  ["F1B6",0x9A05],
+  ["F1B8",0x9A06],
+  ["F1B7",0x9A07],
+  ["F1B1",0x9A09],
+  ["F1B5",0x9A0A],
+  ["F1B0",0x9A0B],
+  ["9153",0x9A0C],
+  ["F1B2",0x9A0D],
+  ["C34D",0x9A0E],
+  ["F1AF",0x9A0F],
+  ["9155",0x9A10],
+  ["F1B4",0x9A11],
+  ["F3C0",0x9A14],
+  ["F3B5",0x9A15],
+  ["C445",0x9A16],
+  ["C446",0x9A19],
+  ["F3B4",0x9A1A],
+  ["F3B9",0x9A1B],
+  ["F3BF",0x9A1C],
+  ["F3B7",0x9A1D],
+  ["F3BE",0x9A1E],
+  ["955D",0x9A1F],
+  ["F3BB",0x9A20],
+  ["9671",0x9A21],
+  ["F3BA",0x9A22],
+  ["F3BD",0x9A23],
+  ["F3B8",0x9A24],
+  ["F3B6",0x9A25],
+  ["9C6D",0x9A26],
+  ["F3BC",0x9A27],
+  ["F560",0x9A29],
+  ["F55E",0x9A2A],
+  ["C4CA",0x9A2B],
+  ["F55D",0x9A2C],
+  ["F563",0x9A2D],
+  ["F561",0x9A2E],
+  ["9673",0x9A2F],
+  ["C4CB",0x9A30],
+  ["F55C",0x9A31],
+  ["F55A",0x9A32],
+  ["F55B",0x9A34],
+  ["C4CD",0x9A35],
+  ["F55F",0x9A36],
+  ["C4CC",0x9A37],
+  ["F562",0x9A38],
+  ["F678",0x9A39],
+  ["F67E",0x9A3A],
+  ["9154",0x9A3B],
+  ["9A71",0x9A3C],
+  ["F679",0x9A3D],
+  ["C55B",0x9A3E],
+  ["F6A1",0x9A3F],
+  ["C55A",0x9A40],
+  ["F67D",0x9A41],
+  ["F67C",0x9A42],
+  ["C559",0x9A43],
+  ["F67B",0x9A44],
+  ["C558",0x9A45],
+  ["F67A",0x9A46],
+  ["F77D",0x9A48],
+  ["F7A1",0x9A49],
+  ["F77E",0x9A4A],
+  ["F77B",0x9A4C],
+  ["C5BB",0x9A4D],
+  ["F778",0x9A4E],
+  ["F77C",0x9A4F],
+  ["F7A3",0x9A50],
+  ["F7A2",0x9A52],
+  ["F779",0x9A53],
+  ["F77A",0x9A54],
+  ["C5BA",0x9A55],
+  ["F852",0x9A56],
+  ["C5E7",0x9A57],
+  ["9156",0x9A58],
+  ["F853",0x9A59],
+  ["C5E5",0x9A5A],
+  ["C5E6",0x9A5B],
+  ["966D",0x9A5C],
+  ["F8D3",0x9A5E],
+  ["C64A",0x9A5F],
+  ["F976",0x9A60],
+  ["C66A",0x9A62],
+  ["9557",0x9A63],
+  ["F9B3",0x9A64],
+  ["C66B",0x9A65],
+  ["F9B4",0x9A66],
+  ["F9B5",0x9A67],
+  ["F9C3",0x9A68],
+  ["F9C2",0x9A69],
+  ["C67A",0x9A6A],
+  ["F9CD",0x9A6B],
+  ["89C6",0x9A6C],
+  ["89C7",0x9A8F],
+  ["B0A9",0x9AA8],
+  ["E0E9",0x9AAB],
+  ["E0E8",0x9AAD],
+  ["BBEA",0x9AAF],
+  ["BBEB",0x9AB0],
+  ["E4DA",0x9AB1],
+  ["8A6A",0x9AB2],
+  ["E8D2",0x9AB3],
+  ["EC6C",0x9AB4],
+  ["8B57",0x9AB6],
+  ["BE75",0x9AB7],
+  ["C065",0x9AB8],
+  ["EC6A",0x9AB9],
+  ["9FE1",0x9ABA],
+  ["EC6D",0x9ABB],
+  ["C066",0x9ABC],
+  ["9B5F",0x9ABD],
+  ["EF64",0x9ABE],
+  ["EC6B",0x9ABF],
+  ["F1B9",0x9AC0],
+  ["C34E",0x9AC1],
+  ["F3C1",0x9AC2],
+  ["F566",0x9AC6],
+  ["F564",0x9AC7],
+  ["F565",0x9ACA],
+  ["F6A2",0x9ACD],
+  ["C55C",0x9ACF],
+  ["F7A4",0x9AD0],
+  ["C5EA",0x9AD1],
+  ["C5BC",0x9AD2],
+  ["C5E8",0x9AD3],
+  ["C5E9",0x9AD4],
+  ["F8D4",0x9AD5],
+  ["C662",0x9AD6],
+  ["A05D",0x9AD7],
+  ["B0AA",0x9AD8],
+  ["F1BA",0x9ADC],
+  ["D449",0x9ADF],
+  ["915B",0x9AE0],
+  ["B9A6",0x9AE1],
+  ["915C",0x9AE2],
+  ["E4DB",0x9AE3],
+  ["BBEC",0x9AE6],
+  ["E4DC",0x9AE7],
+  ["E8D4",0x9AEB],
+  ["E8D3",0x9AEC],
+  ["C068",0x9AED],
+  ["BE76",0x9AEE],
+  ["BE77",0x9AEF],
+  ["E8D7",0x9AF1],
+  ["E8D6",0x9AF2],
+  ["E8D5",0x9AF3],
+  ["915E",0x9AF4],
+  ["EC6E",0x9AF6],
+  ["EC71",0x9AF7],
+  ["EC70",0x9AF9],
+  ["EC6F",0x9AFA],
+  ["C067",0x9AFB],
+  ["EF68",0x9AFC],
+  ["EF66",0x9AFD],
+  ["EF65",0x9AFE],
+  ["9F5C",0x9AFF],
+  ["EF67",0x9B01],
+  ["9F57",0x9B02],
+  ["C34F",0x9B03],
+  ["F1BC",0x9B04],
+  ["F1BD",0x9B05],
+  ["C350",0x9B06],
+  ["F1BB",0x9B08],
+  ["9F65",0x9B09],
+  ["F3C3",0x9B0A],
+  ["F3C2",0x9B0B],
+  ["F3C5",0x9B0C],
+  ["C447",0x9B0D],
+  ["F3C4",0x9B0E],
+  ["9A72",0x9B0F],
+  ["F567",0x9B10],
+  ["F569",0x9B11],
+  ["F568",0x9B12],
+  ["9160",0x9B14],
+  ["F6A3",0x9B15],
+  ["F6A6",0x9B16],
+  ["F6A4",0x9B17],
+  ["F6A5",0x9B18],
+  ["F7A5",0x9B19],
+  ["C5BD",0x9B1A],
+  ["F854",0x9B1E],
+  ["F855",0x9B1F],
+  ["F856",0x9B20],
+  ["C64B",0x9B22],
+  ["C663",0x9B23],
+  ["F9B6",0x9B24],
+  ["B0AB",0x9B25],
+  ["BE78",0x9B27],
+  ["C069",0x9B28],
+  ["F1BE",0x9B29],
+  ["9F5E",0x9B2A],
+  ["F7A6",0x9B2B],
+  ["9161",0x9B2D],
+  ["F9C4",0x9B2E],
+  ["D44A",0x9B2F],
+  ["C67B",0x9B31],
+  ["B0AC",0x9B32],
+  ["EC72",0x9B33],
+  ["9164",0x9B34],
+  ["F1BF",0x9B35],
+  ["F3C6",0x9B37],
+  ["9F41",0x9B39],
+  ["F6A7",0x9B3A],
+  ["F7A7",0x9B3B],
+  ["B0AD",0x9B3C],
+  ["E4DD",0x9B3E],
+  ["E4DE",0x9B3F],
+  ["9169",0x9B40],
+  ["BBED",0x9B41],
+  ["BBEE",0x9B42],
+  ["E8D9",0x9B43],
+  ["BE7A",0x9B44],
+  ["BE79",0x9B45],
+  ["E8D8",0x9B46],
+  ["EF69",0x9B48],
+  ["F1C0",0x9B4A],
+  ["F1C2",0x9B4B],
+  ["F1C1",0x9B4C],
+  ["C353",0x9B4D],
+  ["C352",0x9B4E],
+  ["C351",0x9B4F],
+  ["9168",0x9B50],
+  ["C55E",0x9B51],
+  ["F6A8",0x9B52],
+  ["C55D",0x9B54],
+  ["F7A9",0x9B55],
+  ["F7A8",0x9B56],
+  ["C64C",0x9B58],
+  ["F8D5",0x9B59],
+  ["B3BD",0x9B5A],
+  ["E0EA",0x9B5B],
+  ["E4E1",0x9B5F],
+  ["E4DF",0x9B60],
+  ["E4E0",0x9B61],
+  ["E8E2",0x9B64],
+  ["E8DD",0x9B66],
+  ["E8DA",0x9B67],
+  ["E8E1",0x9B68],
+  ["9A74",0x9B69],
+  ["E8E3",0x9B6C],
+  ["BE7C",0x9B6F],
+  ["E8E0",0x9B70],
+  ["E8DC",0x9B71],
+  ["E8DB",0x9B74],
+  ["E8DF",0x9B75],
+  ["E8DE",0x9B76],
+  ["BE7B",0x9B77],
+  ["EC7D",0x9B7A],
+  ["EC78",0x9B7B],
+  ["EC76",0x9B7C],
+  ["ECA1",0x9B7D],
+  ["EC77",0x9B7E],
+  ["96B2",0x9B7F],
+  ["EC73",0x9B80],
+  ["9A75",0x9B81],
+  ["EC79",0x9B82],
+  ["FDA5",0x9B83],
+  ["EC74",0x9B85],
+  ["EF72",0x9B86],
+  ["EC75",0x9B87],
+  ["ECA2",0x9B88],
+  ["9EE9",0x9B8B],
+  ["8BBA",0x9B8D],
+  ["916D",0x9B8E],
+  ["A060",0x9B8F],
+  ["EC7C",0x9B90],
+  ["C06A",0x9B91],
+  ["EC7B",0x9B92],
+  ["EC7A",0x9B93],
+  ["EC7E",0x9B95],
+  ["9FDE",0x9B97],
+  ["EF6A",0x9B9A],
+  ["EF6D",0x9B9B],
+  ["9FC3",0x9B9D],
+  ["EF6C",0x9B9E],
+  ["96B5",0x9B9F],
+  ["EF74",0x9BA0],
+  ["EF6F",0x9BA1],
+  ["EF73",0x9BA2],
+  ["EF71",0x9BA4],
+  ["EF70",0x9BA5],
+  ["EF6E",0x9BA6],
+  ["EF6B",0x9BA8],
+  ["C243",0x9BAA],
+  ["C242",0x9BAB],
+  ["C244",0x9BAD],
+  ["C241",0x9BAE],
+  ["EF75",0x9BAF],
+  ["A067",0x9BB0],
+  ["F1C8",0x9BB5],
+  ["F1CB",0x9BB6],
+  ["F1C9",0x9BB8],
+  ["F1CD",0x9BB9],
+  ["F1CE",0x9BBD],
+  ["F1C6",0x9BBF],
+  ["C358",0x9BC0],
+  ["F1C7",0x9BC1],
+  ["F1C5",0x9BC3],
+  ["F1CC",0x9BC4],
+  ["F1C4",0x9BC6],
+  ["F1C3",0x9BC7],
+  ["C357",0x9BC8],
+  ["C355",0x9BC9],
+  ["C354",0x9BCA],
+  ["96B3",0x9BCF],
+  ["F1CA",0x9BD3],
+  ["F3CF",0x9BD4],
+  ["F3D5",0x9BD5],
+  ["C44A",0x9BD6],
+  ["F3D0",0x9BD7],
+  ["F3D3",0x9BD9],
+  ["F3D7",0x9BDA],
+  ["C44B",0x9BDB],
+  ["F3D2",0x9BDC],
+  ["9A76",0x9BDD],
+  ["F3CA",0x9BDE],
+  ["F3C9",0x9BE0],
+  ["F3D6",0x9BE1],
+  ["F3CD",0x9BE2],
+  ["F3CB",0x9BE4],
+  ["F3D4",0x9BE5],
+  ["F3CC",0x9BE6],
+  ["C449",0x9BE7],
+  ["C448",0x9BE8],
+  ["95D5",0x9BE9],
+  ["F3C7",0x9BEA],
+  ["F3C8",0x9BEB],
+  ["F3D1",0x9BEC],
+  ["9ECA",0x9BED],
+  ["F3CE",0x9BF0],
+  ["9A77",0x9BF1],
+  ["9A78",0x9BF4],
+  ["F56C",0x9BF7],
+  ["F56F",0x9BF8],
+  ["C356",0x9BFD],
+  ["9170",0x9BFF],
+  ["916F",0x9C02],
+  ["F56D",0x9C05],
+  ["F573",0x9C06],
+  ["F571",0x9C07],
+  ["F56B",0x9C08],
+  ["F576",0x9C09],
+  ["9FA3",0x9C0A],
+  ["F56A",0x9C0B],
+  ["9171",0x9C0C],
+  ["C4CF",0x9C0D],
+  ["F572",0x9C0E],
+  ["96B1",0x9C10],
+  ["F56E",0x9C12],
+  ["C4CE",0x9C13],
+  ["F575",0x9C14],
+  ["9F63",0x9C15],
+  ["F574",0x9C17],
+  ["9F67",0x9C1B],
+  ["F6AB",0x9C1C],
+  ["F6AA",0x9C1D],
+  ["8BB9",0x9C1F],
+  ["9A7A",0x9C20],
+  ["F6B1",0x9C21],
+  ["F6AD",0x9C23],
+  ["F6B0",0x9C24],
+  ["C560",0x9C25],
+  ["8B56",0x9C26],
+  ["F6AE",0x9C28],
+  ["F6AF",0x9C29],
+  ["F6A9",0x9C2B],
+  ["F6AC",0x9C2C],
+  ["C55F",0x9C2D],
+  ["9ADA",0x9C2F],
+  ["C5BF",0x9C31],
+  ["F7B4",0x9C32],
+  ["F7AF",0x9C33],
+  ["F7B3",0x9C34],
+  ["96B0",0x9C35],
+  ["F7B6",0x9C36],
+  ["F7B2",0x9C37],
+  ["F7AE",0x9C39],
+  ["9A7E",0x9C3A],
+  ["C5C1",0x9C3B],
+  ["F7B1",0x9C3C],
+  ["F7B5",0x9C3D],
+  ["C5C0",0x9C3E],
+  ["F7AC",0x9C3F],
+  ["F570",0x9C40],
+  ["F7B0",0x9C41],
+  ["F7AD",0x9C44],
+  ["9DDE",0x9C45],
+  ["F7AA",0x9C46],
+  ["F7AB",0x9C48],
+  ["C5BE",0x9C49],
+  ["F85A",0x9C4A],
+  ["F85C",0x9C4B],
+  ["F85F",0x9C4C],
+  ["F85B",0x9C4D],
+  ["F860",0x9C4E],
+  ["96AD",0x9C4F],
+  ["F859",0x9C50],
+  ["F857",0x9C52],
+  ["96AE",0x9C53],
+  ["C5EB",0x9C54],
+  ["F85D",0x9C55],
+  ["C5ED",0x9C56],
+  ["C5EC",0x9C57],
+  ["F858",0x9C58],
+  ["F85E",0x9C59],
+  ["9EA1",0x9C5D],
+  ["F8DA",0x9C5E],
+  ["C64D",0x9C5F],
+  ["F8DB",0x9C60],
+  ["F8D9",0x9C62],
+  ["F8D6",0x9C63],
+  ["F8D8",0x9C66],
+  ["F8D7",0x9C67],
+  ["F95A",0x9C68],
+  ["F95C",0x9C6D],
+  ["F95B",0x9C6E],
+  ["F979",0x9C71],
+  ["9E50",0x9C72],
+  ["F978",0x9C73],
+  ["F977",0x9C74],
+  ["F97A",0x9C75],
+  ["C673",0x9C77],
+  ["C674",0x9C78],
+  ["F9CA",0x9C79],
+  ["F9CE",0x9C7A],
+  ["96AF",0x9C7B],
+  ["8BF4",0x9C7C],
+  ["B3BE",0x9CE5],
+  ["DCAF",0x9CE6],
+  ["E0ED",0x9CE7],
+  ["B9A7",0x9CE9],
+  ["E0EB",0x9CEA],
+  ["E0EC",0x9CED],
+  ["E4E2",0x9CF1],
+  ["E4E3",0x9CF2],
+  ["BBF1",0x9CF3],
+  ["BBEF",0x9CF4],
+  ["E4E4",0x9CF5],
+  ["BBF0",0x9CF6],
+  ["E8E8",0x9CF7],
+  ["E8EB",0x9CF9],
+  ["E8E5",0x9CFA],
+  ["E8EC",0x9CFB],
+  ["E8E4",0x9CFC],
+  ["E8E6",0x9CFD],
+  ["E8E7",0x9CFF],
+  ["E8EA",0x9D00],
+  ["9FA4",0x9D02],
+  ["BEA1",0x9D03],
+  ["E8EF",0x9D04],
+  ["E8EE",0x9D05],
+  ["BE7D",0x9D06],
+  ["E8E9",0x9D07],
+  ["E8ED",0x9D08],
+  ["BE7E",0x9D09],
+  ["96BD",0x9D0C],
+  ["ECAC",0x9D10],
+  ["C06F",0x9D12],
+  ["ECA7",0x9D14],
+  ["C06B",0x9D15],
+  ["96F4",0x9D16],
+  ["ECA4",0x9D17],
+  ["ECAA",0x9D18],
+  ["ECAD",0x9D19],
+  ["C070",0x9D1B],
+  ["ECA9",0x9D1D],
+  ["ECA6",0x9D1E],
+  ["ECAE",0x9D1F],
+  ["ECA5",0x9D20],
+  ["96B8",0x9D21],
+  ["ECAB",0x9D22],
+  ["C06C",0x9D23],
+  ["ECA3",0x9D25],
+  ["C06D",0x9D26],
+  ["C06E",0x9D28],
+  ["ECA8",0x9D29],
+  ["EFA9",0x9D2D],
+  ["EF7A",0x9D2E],
+  ["EF7B",0x9D2F],
+  ["EF7E",0x9D30],
+  ["EF7C",0x9D31],
+  ["EF76",0x9D33],
+  ["FAA1",0x9D34],
+  ["EF79",0x9D36],
+  ["EFA5",0x9D37],
+  ["EF7D",0x9D38],
+  ["91A7",0x9D39],
+  ["C245",0x9D3B],
+  ["EFA7",0x9D3D],
+  ["EFA4",0x9D3E],
+  ["C246",0x9D3F],
+  ["EFA6",0x9D40],
+  ["EF77",0x9D41],
+  ["EFA2",0x9D42],
+  ["EFA3",0x9D43],
+  ["A05E",0x9D44],
+  ["EFA1",0x9D45],
+  ["9A7D",0x9D49],
+  ["F1D2",0x9D4A],
+  ["F1D4",0x9D4B],
+  ["F1D7",0x9D4C],
+  ["8948",0x9D4E],
+  ["F1D1",0x9D4F],
+  ["9EB1",0x9D50],
+  ["C359",0x9D51],
+  ["F1D9",0x9D52],
+  ["F1D0",0x9D53],
+  ["F1DA",0x9D54],
+  ["F1D6",0x9D56],
+  ["F1D8",0x9D57],
+  ["F1DC",0x9D58],
+  ["F1D5",0x9D59],
+  ["F1DD",0x9D5A],
+  ["F1D3",0x9D5B],
+  ["F1CF",0x9D5C],
+  ["C35A",0x9D5D],
+  ["9DDB",0x9D5E],
+  ["F1DB",0x9D5F],
+  ["C35B",0x9D60],
+  ["C44D",0x9D61],
+  ["EF78",0x9D67],
+  ["F3F1",0x9D68],
+  ["F3E8",0x9D69],
+  ["C44F",0x9D6A],
+  ["F3E4",0x9D6B],
+  ["C450",0x9D6C],
+  ["95BF",0x9D6D],
+  ["8A73",0x9D6E],
+  ["F3ED",0x9D6F],
+  ["F3E7",0x9D70],
+  ["F3DD",0x9D71],
+  ["C44E",0x9D72],
+  ["F3EA",0x9D73],
+  ["F3E5",0x9D74],
+  ["F3E6",0x9D75],
+  ["F3D8",0x9D77],
+  ["F3DF",0x9D78],
+  ["F3EE",0x9D79],
+  ["F3EB",0x9D7B],
+  ["9EFE",0x9D7C],
+  ["F3E3",0x9D7D],
+  ["917A",0x9D7E],
+  ["F3EF",0x9D7F],
+  ["F3DE",0x9D80],
+  ["F3D9",0x9D81],
+  ["F3EC",0x9D82],
+  ["917B",0x9D83],
+  ["F3DB",0x9D84],
+  ["F3E9",0x9D85],
+  ["F3E0",0x9D86],
+  ["F3F0",0x9D87],
+  ["F3DC",0x9D88],
+  ["C44C",0x9D89],
+  ["F3DA",0x9D8A],
+  ["F3E1",0x9D8B],
+  ["F3E2",0x9D8C],
+  ["F57D",0x9D90],
+  ["F57B",0x9D92],
+  ["9AA3",0x9D93],
+  ["F5A2",0x9D94],
+  ["F5AE",0x9D96],
+  ["F5A5",0x9D97],
+  ["F57C",0x9D98],
+  ["F578",0x9D99],
+  ["F5A7",0x9D9A],
+  ["F57E",0x9D9B],
+  ["F5A3",0x9D9C],
+  ["F57A",0x9D9D],
+  ["F5AA",0x9D9E],
+  ["F577",0x9D9F],
+  ["F5A1",0x9DA0],
+  ["F5A6",0x9DA1],
+  ["F5A8",0x9DA2],
+  ["F5AB",0x9DA3],
+  ["F579",0x9DA4],
+  ["96C2",0x9DA5],
+  ["F5AF",0x9DA6],
+  ["F5B0",0x9DA7],
+  ["F5A9",0x9DA8],
+  ["F5AD",0x9DA9],
+  ["F5A4",0x9DAA],
+  ["9F77",0x9DAB],
+  ["F6C1",0x9DAC],
+  ["F6C4",0x9DAD],
+  ["C561",0x9DAF],
+  ["F6C3",0x9DB1],
+  ["F6C8",0x9DB2],
+  ["F6C6",0x9DB3],
+  ["C562",0x9DB4],
+  ["F6BD",0x9DB5],
+  ["F6B3",0x9DB6],
+  ["F6B2",0x9DB7],
+  ["C564",0x9DB8],
+  ["F6BF",0x9DB9],
+  ["F6C0",0x9DBA],
+  ["F6BC",0x9DBB],
+  ["F6B4",0x9DBC],
+  ["9AA4",0x9DBD],
+  ["F6B9",0x9DBE],
+  ["F5AC",0x9DBF],
+  ["9AA5",0x9DC0],
+  ["F6B5",0x9DC1],
+  ["C563",0x9DC2],
+  ["F6BB",0x9DC3],
+  ["91A1",0x9DC4],
+  ["F6BA",0x9DC5],
+  ["F6B6",0x9DC7],
+  ["F6C2",0x9DC8],
+  ["89B8",0x9DC9],
+  ["F6B7",0x9DCA],
+  ["F7BB",0x9DCB],
+  ["F6C5",0x9DCC],
+  ["F6C7",0x9DCD],
+  ["F6BE",0x9DCE],
+  ["F6B8",0x9DCF],
+  ["F7BC",0x9DD0],
+  ["F7BE",0x9DD1],
+  ["F7B8",0x9DD2],
+  ["C5C2",0x9DD3],
+  ["9173",0x9DD4],
+  ["F7C5",0x9DD5],
+  ["F7C3",0x9DD6],
+  ["C5C3",0x9DD7],
+  ["F7C2",0x9DD8],
+  ["F7C1",0x9DD9],
+  ["F7BA",0x9DDA],
+  ["F7B7",0x9DDB],
+  ["F7BD",0x9DDC],
+  ["F7C6",0x9DDD],
+  ["F7B9",0x9DDE],
+  ["F7BF",0x9DDF],
+  ["F869",0x9DE1],
+  ["F86E",0x9DE2],
+  ["F864",0x9DE3],
+  ["F867",0x9DE4],
+  ["C5EE",0x9DE5],
+  ["F86B",0x9DE6],
+  ["F872",0x9DE8],
+  ["F7C0",0x9DE9],
+  ["F865",0x9DEB],
+  ["F86F",0x9DEC],
+  ["F873",0x9DED],
+  ["F86A",0x9DEE],
+  ["F863",0x9DEF],
+  ["F86D",0x9DF0],
+  ["F86C",0x9DF2],
+  ["F871",0x9DF3],
+  ["F870",0x9DF4],
+  ["F7C4",0x9DF5],
+  ["F868",0x9DF6],
+  ["F862",0x9DF7],
+  ["F866",0x9DF8],
+  ["C64E",0x9DF9],
+  ["C64F",0x9DFA],
+  ["F861",0x9DFB],
+  ["9AA6",0x9DFC],
+  ["F8E6",0x9DFD],
+  ["F8DD",0x9DFE],
+  ["F8E5",0x9DFF],
+  ["F8E2",0x9E00],
+  ["F8E3",0x9E01],
+  ["F8DC",0x9E02],
+  ["F8DF",0x9E03],
+  ["F8E7",0x9E04],
+  ["F8E1",0x9E05],
+  ["F8E0",0x9E06],
+  ["F8DE",0x9E07],
+  ["F8E4",0x9E09],
+  ["89BD",0x9E0A],
+  ["F95D",0x9E0B],
+  ["89B9",0x9E0C],
+  ["F95E",0x9E0D],
+  ["917D",0x9E0E],
+  ["F960",0x9E0F],
+  ["F95F",0x9E10],
+  ["F962",0x9E11],
+  ["F961",0x9E12],
+  ["F97C",0x9E13],
+  ["F97B",0x9E14],
+  ["F9B7",0x9E15],
+  ["F9B8",0x9E17],
+  ["96BB",0x9E18],
+  ["F9C5",0x9E19],
+  ["C678",0x9E1A],
+  ["C67C",0x9E1B],
+  ["9FF2",0x9E1C],
+  ["F9CF",0x9E1D],
+  ["C67D",0x9E1E],
+  ["8BF5",0x9E1F],
+  ["B3BF",0x9E75],
+  ["C4D0",0x9E79],
+  ["F6C9",0x9E7A],
+  ["9AA9",0x9E7B],
+  ["C650",0x9E7C],
+  ["C651",0x9E7D],
+  ["B3C0",0x9E7F],
+  ["E0EE",0x9E80],
+  ["9F54",0x9E81],
+  ["B9A8",0x9E82],
+  ["E8F0",0x9E83],
+  ["9FE3",0x9E84],
+  ["9EED",0x9E85],
+  ["ECB0",0x9E86],
+  ["ECB1",0x9E87],
+  ["ECAF",0x9E88],
+  ["EFAB",0x9E89],
+  ["EFAA",0x9E8A],
+  ["C247",0x9E8B],
+  ["F1DF",0x9E8C],
+  ["EFAC",0x9E8D],
+  ["F1DE",0x9E8E],
+  ["91AA",0x9E90],
+  ["F3F3",0x9E91],
+  ["C451",0x9E92],
+  ["C453",0x9E93],
+  ["F3F2",0x9E94],
+  ["91AB",0x9E95],
+  ["A070",0x9E96],
+  ["C452",0x9E97],
+  ["9F6D",0x9E98],
+  ["F5B1",0x9E99],
+  ["F5B3",0x9E9A],
+  ["F5B2",0x9E9B],
+  ["F6CA",0x9E9C],
+  ["C565",0x9E9D],
+  ["91AC",0x9E9E],
+  ["C5EF",0x9E9F],
+  ["F8E8",0x9EA0],
+  ["F963",0x9EA1],
+  ["91AD",0x9EA2],
+  ["F9D2",0x9EA4],
+  ["B3C1",0x9EA5],
+  ["A0FD",0x9EA6],
+  ["E4E5",0x9EA7],
+  ["9FE2",0x9EA8],
+  ["BEA2",0x9EA9],
+  ["91AF",0x9EAA],
+  ["9E41",0x9EAB],
+  ["9AAA",0x9EAC],
+  ["ECB3",0x9EAD],
+  ["ECB2",0x9EAE],
+  ["91B0",0x9EAF],
+  ["EFAD",0x9EB0],
+  ["9AAB",0x9EB1],
+  ["C454",0x9EB4],
+  ["C4D1",0x9EB5],
+  ["F7C7",0x9EB6],
+  ["F9CB",0x9EB7],
+  ["B3C2",0x9EBB],
+  ["BBF2",0x9EBC],
+  ["9AAC",0x9EBD],
+  ["BEA3",0x9EBE],
+  ["9A4A",0x9EBF],
+  ["F3F4",0x9EC0],
+  ["91B2",0x9EC1],
+  ["F874",0x9EC2],
+  ["B6C0",0x9EC3],
+  ["8BF6",0x9EC4],
+  ["9AAD",0x9EC6],
+  ["89B6",0x9EC7],
+  ["EFAE",0x9EC8],
+  ["C664",0x9ECC],
+  ["B6C1",0x9ECD],
+  ["BEA4",0x9ECE],
+  ["C248",0x9ECF],
+  ["F875",0x9ED0],
+  ["B6C2",0x9ED1],
+  ["E8F1",0x9ED3],
+  ["C072",0x9ED4],
+  ["ECB4",0x9ED5],
+  ["ECB5",0x9ED6],
+  ["C071",0x9ED8],
+  ["EFAF",0x9EDA],
+  ["C24C",0x9EDB],
+  ["C24A",0x9EDC],
+  ["C24B",0x9EDD],
+  ["C249",0x9EDE],
+  ["F1E0",0x9EDF],
+  ["C35C",0x9EE0],
+  ["9AAF",0x9EE2],
+  ["F5B5",0x9EE4],
+  ["F5B4",0x9EE5],
+  ["F5B7",0x9EE6],
+  ["F5B6",0x9EE7],
+  ["C4D2",0x9EE8],
+  ["F6CB",0x9EEB],
+  ["F6CD",0x9EED],
+  ["F6CC",0x9EEE],
+  ["C566",0x9EEF],
+  ["F7C8",0x9EF0],
+  ["9AB0",0x9EF1],
+  ["F876",0x9EF2],
+  ["F877",0x9EF3],
+  ["C5F0",0x9EF4],
+  ["F964",0x9EF5],
+  ["F97D",0x9EF6],
+  ["C675",0x9EF7],
+  ["9AB1",0x9EF8],
+  ["DCB0",0x9EF9],
+  ["ECB6",0x9EFA],
+  ["EFB0",0x9EFB],
+  ["F3F5",0x9EFC],
+  ["E0EF",0x9EFD],
+  ["9AA1",0x9EFE],
+  ["EFB1",0x9EFF],
+  ["F1E2",0x9F00],
+  ["F1E1",0x9F01],
+  ["91B9",0x9F02],
+  ["F878",0x9F06],
+  ["C652",0x9F07],
+  ["91BA",0x9F08],
+  ["F965",0x9F09],
+  ["F97E",0x9F0A],
+  ["B9A9",0x9F0E],
+  ["E8F2",0x9F0F],
+  ["E8F3",0x9F10],
+  ["ECB7",0x9F12],
+  ["B9AA",0x9F13],
+  ["C35D",0x9F15],
+  ["F1E3",0x9F16],
+  ["91BE",0x9F17],
+  ["F6CF",0x9F18],
+  ["C567",0x9F19],
+  ["F6D0",0x9F1A],
+  ["F6CE",0x9F1B],
+  ["F879",0x9F1C],
+  ["F8E9",0x9F1E],
+  ["B9AB",0x9F20],
+  ["EFB4",0x9F22],
+  ["EFB3",0x9F23],
+  ["EFB2",0x9F24],
+  ["F1E4",0x9F25],
+  ["A041",0x9F26],
+  ["8BB7",0x9F27],
+  ["F1E8",0x9F28],
+  ["F1E7",0x9F29],
+  ["F1E6",0x9F2A],
+  ["F1E5",0x9F2B],
+  ["C35E",0x9F2C],
+  ["F3F6",0x9F2D],
+  ["F5B9",0x9F2E],
+  ["C4D3",0x9F2F],
+  ["F5B8",0x9F30],
+  ["F6D1",0x9F31],
+  ["F7CB",0x9F32],
+  ["F7CA",0x9F33],
+  ["C5C4",0x9F34],
+  ["F7C9",0x9F35],
+  ["F87C",0x9F36],
+  ["F87B",0x9F37],
+  ["F87A",0x9F38],
+  ["91C0",0x9F39],
+  ["BBF3",0x9F3B],
+  ["ECB8",0x9F3D],
+  ["C24D",0x9F3E],
+  ["F3F7",0x9F40],
+  ["F3F8",0x9F41],
+  ["F7CC",0x9F42],
+  ["F87D",0x9F43],
+  ["9AB3",0x9F44],
+  ["91C3",0x9F45],
+  ["F8EA",0x9F46],
+  ["F966",0x9F47],
+  ["F9B9",0x9F48],
+  ["F9D4",0x9F49],
+  ["BBF4",0x9F4A],
+  ["C24E",0x9F4B],
+  ["F1E9",0x9F4C],
+  ["F3F9",0x9F4D],
+  ["F6D2",0x9F4E],
+  ["F87E",0x9F4F],
+  ["A0FC",0x9F50],
+  ["BEA6",0x9F52],
+  ["9FEE",0x9F53],
+  ["EFB5",0x9F54],
+  ["F1EA",0x9F55],
+  ["F3FA",0x9F56],
+  ["F3FB",0x9F57],
+  ["F3FC",0x9F58],
+  ["F5BE",0x9F59],
+  ["9F69",0x9F5A],
+  ["F5BA",0x9F5B],
+  ["C568",0x9F5C],
+  ["F5BD",0x9F5D],
+  ["F5BC",0x9F5E],
+  ["C4D4",0x9F5F],
+  ["F5BB",0x9F60],
+  ["C4D6",0x9F61],
+  ["91C8",0x9F62],
+  ["C4D5",0x9F63],
+  ["F6D4",0x9F64],
+  ["F6D3",0x9F65],
+  ["C569",0x9F66],
+  ["C56A",0x9F67],
+  ["91C9",0x9F69],
+  ["C5C6",0x9F6A],
+  ["F7CD",0x9F6B],
+  ["C5C5",0x9F6C],
+  ["F8A3",0x9F6E],
+  ["F8A4",0x9F6F],
+  ["F8A2",0x9F70],
+  ["F8A1",0x9F71],
+  ["C654",0x9F72],
+  ["F8EB",0x9F74],
+  ["F8EC",0x9F75],
+  ["F8ED",0x9F76],
+  ["C653",0x9F77],
+  ["F967",0x9F78],
+  ["F96A",0x9F79],
+  ["F969",0x9F7A],
+  ["F968",0x9F7B],
+  ["F9D3",0x9F7E],
+  ["8DE6",0x9F7F],
+  ["C073",0x9F8D],
+  ["91CB",0x9F8E],
+  ["C365",0x9F90],
+  ["F5BF",0x9F91],
+  ["F6D5",0x9F92],
+  ["C5C7",0x9F94],
+  ["F7CE",0x9F95],
+  ["F9D5",0x9F98],
+  ["89C8",0x9F99],
+  ["C074",0x9F9C],
+  ["8DAA",0x9F9F],
+  ["EFB6",0x9FA0],
+  ["F7CF",0x9FA2],
+  ["F9A1",0x9FA4],
+  ["9FDD",0x9FA5],
+  ["8C43",0x9FA6],
+  ["8C6D",0x9FA7],
+  ["8C74",0x9FA8],
+  ["8CB7",0x9FA9],
+  ["8CB9",0x9FAA],
+  ["8CBB",0x9FAB],
+  ["8CC0",0x9FAC],
+  ["8CD7",0x9FAD],
+  ["8CD8",0x9FAE],
+  ["8CDA",0x9FAF],
+  ["C8A1",0x9FB0],
+  ["C8A3",0x9FB1],
+  ["8CED",0x9FB2],
+  ["8D48",0x9FB3],
+  ["8BF8",0xF907],
+  ["C94A",0xFA0C],
+  ["DDFC",0xFA0D],
+  ["A14A",0xFE30],
+  ["A157",0xFE31],
+  ["A159",0xFE33],
+  ["A15B",0xFE34],
+  ["A15F",0xFE35],
+  ["A160",0xFE36],
+  ["A163",0xFE37],
+  ["A164",0xFE38],
+  ["A167",0xFE39],
+  ["A168",0xFE3A],
+  ["A16B",0xFE3B],
+  ["A16C",0xFE3C],
+  ["A16F",0xFE3D],
+  ["A170",0xFE3E],
+  ["A173",0xFE3F],
+  ["A174",0xFE40],
+  ["A177",0xFE41],
+  ["A178",0xFE42],
+  ["A17B",0xFE43],
+  ["A17C",0xFE44],
+  ["A1C6",0xFE49],
+  ["A1C7",0xFE4A],
+  ["A1CA",0xFE4B],
+  ["A1CB",0xFE4C],
+  ["A1C8",0xFE4D],
+  ["A1C9",0xFE4E],
+  ["A15C",0xFE4F],
+  ["A14D",0xFE50],
+  ["A14F",0xFE52],
+  ["A151",0xFE54],
+  ["A152",0xFE55],
+  ["A153",0xFE56],
+  ["A154",0xFE57],
+  ["A17D",0xFE59],
+  ["A17E",0xFE5A],
+  ["A1A1",0xFE5B],
+  ["A1A2",0xFE5C],
+  ["A1A3",0xFE5D],
+  ["A1A4",0xFE5E],
+  ["A1CC",0xFE5F],
+  ["A1CD",0xFE60],
+  ["A1CE",0xFE61],
+  ["A1DE",0xFE62],
+  ["A1DF",0xFE63],
+  ["A1E0",0xFE64],
+  ["A1E1",0xFE65],
+  ["A1E2",0xFE66],
+  ["A24C",0xFE69],
+  ["A24D",0xFE6A],
+  ["A24E",0xFE6B],
+  ["A149",0xFF01],
+  ["C8D0",0xFF02],
+  ["A1AD",0xFF03],
+  ["A243",0xFF04],
+  ["A248",0xFF05],
+  ["A1AE",0xFF06],
+  ["C8CF",0xFF07],
+  ["A15D",0xFF08],
+  ["A15E",0xFF09],
+  ["A1AF",0xFF0A],
+  ["A1CF",0xFF0B],
+  ["A141",0xFF0C],
+  ["A1D0",0xFF0D],
+  ["A144",0xFF0E],
+  ["A241",0xFF0F],
+  ["A2AF",0xFF10],
+  ["A2B0",0xFF11],
+  ["A2B1",0xFF12],
+  ["A2B2",0xFF13],
+  ["A2B3",0xFF14],
+  ["A2B4",0xFF15],
+  ["A2B5",0xFF16],
+  ["A2B6",0xFF17],
+  ["A2B7",0xFF18],
+  ["A2B8",0xFF19],
+  ["A147",0xFF1A],
+  ["A146",0xFF1B],
+  ["A1D5",0xFF1C],
+  ["A1D7",0xFF1D],
+  ["A1D6",0xFF1E],
+  ["A148",0xFF1F],
+  ["A249",0xFF20],
+  ["A2CF",0xFF21],
+  ["A2D0",0xFF22],
+  ["A2D1",0xFF23],
+  ["A2D2",0xFF24],
+  ["A2D3",0xFF25],
+  ["A2D4",0xFF26],
+  ["A2D5",0xFF27],
+  ["A2D6",0xFF28],
+  ["A2D7",0xFF29],
+  ["A2D8",0xFF2A],
+  ["A2D9",0xFF2B],
+  ["A2DA",0xFF2C],
+  ["A2DB",0xFF2D],
+  ["A2DC",0xFF2E],
+  ["A2DD",0xFF2F],
+  ["A2DE",0xFF30],
+  ["A2DF",0xFF31],
+  ["A2E0",0xFF32],
+  ["A2E1",0xFF33],
+  ["A2E2",0xFF34],
+  ["A2E3",0xFF35],
+  ["A2E4",0xFF36],
+  ["A2E5",0xFF37],
+  ["A2E6",0xFF38],
+  ["A2E7",0xFF39],
+  ["A2E8",0xFF3A],
+  ["C6E4",0xFF3B],
+  ["A242",0xFF3C],
+  ["C6E5",0xFF3D],
+  ["A1C4",0xFF3F],
+  ["A2E9",0xFF41],
+  ["A2EA",0xFF42],
+  ["A2EB",0xFF43],
+  ["A2EC",0xFF44],
+  ["A2ED",0xFF45],
+  ["A2EE",0xFF46],
+  ["A2EF",0xFF47],
+  ["A2F0",0xFF48],
+  ["A2F1",0xFF49],
+  ["A2F2",0xFF4A],
+  ["A2F3",0xFF4B],
+  ["A2F4",0xFF4C],
+  ["A2F5",0xFF4D],
+  ["A2F6",0xFF4E],
+  ["A2F7",0xFF4F],
+  ["A2F8",0xFF50],
+  ["A2F9",0xFF51],
+  ["A2FA",0xFF52],
+  ["A2FB",0xFF53],
+  ["A2FC",0xFF54],
+  ["A2FD",0xFF55],
+  ["A2FE",0xFF56],
+  ["A340",0xFF57],
+  ["A341",0xFF58],
+  ["A342",0xFF59],
+  ["A343",0xFF5A],
+  ["A161",0xFF5B],
+  ["A155",0xFF5C],
+  ["A162",0xFF5D],
+  ["A14E",0xFF64],
+  ["C8CD",0xFFE2],
+  ["C8CE",0xFFE4],
+  ["F9FE",0xFFED],
+  ["9C71",0x20021],
+  ["9375",0x2003E],
+  ["9376",0x20046],
+  ["9548",0x2004E],
+  ["8EC6",0x20068],
+  ["8BC5",0x20086],
+  ["8BFA",0x20087],
+  ["C87C",0x2008A],
+  ["9AB4",0x20094],
+  ["884E",0x200CA],
+  ["884B",0x200CB],
+  ["C87A",0x200CC],
+  ["8848",0x200CD],
+  ["8847",0x200D1],
+  ["A0F6",0x200EE],
+  ["8845",0x2010C],
+  ["8853",0x2010E],
+  ["FCAD",0x20118],
+  ["8CF5",0x201A4],
+  ["8AAD",0x201A9],
+  ["9272",0x201AB],
+  ["FC47",0x201C1],
+  ["94DF",0x201D4],
+  ["9FD1",0x201F2],
+  ["FBCB",0x20204],
+  ["927D",0x2020C],
+  ["98A4",0x20214],
+  ["8CF9",0x20239],
+  ["94E7",0x2025B],
+  ["90CB",0x20274],
+  ["927B",0x20275],
+  ["94D8",0x20299],
+  ["FC5F",0x2029E],
+  ["FA54",0x202A0],
+  ["9AB5",0x202B7],
+  ["96DA",0x202BF],
+  ["9279",0x202C0],
+  ["FA74",0x202E5],
+  ["9275",0x2030A],
+  ["8DFB",0x20325],
+  ["8A49",0x20341],
+  ["92DF",0x20345],
+  ["9B7C",0x20346],
+  ["FA63",0x20347],
+  ["FA60",0x2037E],
+  ["926D",0x2037F],
+  ["FA62",0x20380],
+  ["9AB6",0x203A0],
+  ["976B",0x203A7],
+  ["FD6A",0x203B5],
+  ["FD54",0x203C9],
+  ["9273",0x203CB],
+  ["97D8",0x203F5],
+  ["9FBB",0x203FC],
+  ["9342",0x20413],
+  ["9276",0x20414],
+  ["FA65",0x2041F],
+  ["926C",0x20465],
+  ["FA6E",0x20487],
+  ["9EE0",0x2048E],
+  ["92C0",0x20491],
+  ["92BF",0x20492],
+  ["92BE",0x204A3],
+  ["9ABA",0x204D7],
+  ["8AB3",0x204FC],
+  ["9775",0x204FE],
+  ["FA40",0x20547],
+  ["FA76",0x2058E],
+  ["FBD0",0x205A5],
+  ["FA7B",0x205B3],
+  ["FE6D",0x205C3],
+  ["9BB3",0x205CA],
+  ["89CC",0x205D0],
+  ["9ABE",0x205D5],
+  ["FA42",0x205DF],
+  ["92BC",0x205E0],
+  ["945C",0x205EB],
+  ["9BB5",0x20611],
+  ["9ABF",0x20615],
+  ["98A7",0x20619],
+  ["97A4",0x2061A],
+  ["90FD",0x20630],
+  ["FC7B",0x20656],
+  ["9AC0",0x20676],
+  ["92C3",0x2070E],
+  ["8AAA",0x20731],
+  ["9BD0",0x20779],
+  ["9550",0x2082C],
+  ["92C6",0x20873],
+  ["98A6",0x208D5],
+  ["9546",0x20916],
+  ["FD63",0x20923],
+  ["FAC2",0x20954],
+  ["9EC3",0x20979],
+  ["89B2",0x209E7],
+  ["9C66",0x20A11],
+  ["9053",0x20A50],
+  ["8C62",0x20A6F],
+  ["97C1",0x20AB4],
+  ["9AC4",0x20AC2],
+  ["9AC5",0x20ACD],
+  ["8EEF",0x20B0D],
+  ["FAE9",0x20B8F],
+  ["8D40",0x20B9F],
+  ["9262",0x20BA8],
+  ["8AF7",0x20BA9],
+  ["9AC6",0x20BBF],
+  ["92E1",0x20BC6],
+  ["9AC9",0x20BCB],
+  ["FAC6",0x20BE2],
+  ["97A5",0x20BEB],
+  ["9ACB",0x20BFB],
+  ["FA72",0x20BFF],
+  ["8A5E",0x20C0B],
+  ["94E0",0x20C0D],
+  ["92CC",0x20C20],
+  ["8AE5",0x20C34],
+  ["FE5C",0x20C3A],
+  ["9ACC",0x20C3B],
+  ["9DF9",0x20C41],
+  ["8A43",0x20C42],
+  ["8AA6",0x20C43],
+  ["9ACD",0x20C53],
+  ["9ACE",0x20C65],
+  ["FAEE",0x20C77],
+  ["9BCC",0x20C78],
+  ["9ACF",0x20C7C],
+  ["9AD1",0x20C8D],
+  ["9DFA",0x20C96],
+  ["9D7C",0x20C9C],
+  ["9AD3",0x20CB5],
+  ["97A6",0x20CB8],
+  ["995F",0x20CCF],
+  ["FBF6",0x20CD3],
+  ["9FC5",0x20CD4],
+  ["8A59",0x20CD5],
+  ["8B6B",0x20CD6],
+  ["9AD4",0x20CDD],
+  ["9AD5",0x20CED],
+  ["97A2",0x20CFF],
+  ["8A44",0x20D15],
+  ["9F4A",0x20D28],
+  ["90A1",0x20D31],
+  ["FDA4",0x20D32],
+  ["8A64",0x20D46],
+  ["8AF2",0x20D47],
+  ["8AF8",0x20D48],
+  ["9DD8",0x20D49],
+  ["94D6",0x20D4C],
+  ["FAFE",0x20D4D],
+  ["FBA7",0x20D4E],
+  ["9AD6",0x20D6F],
+  ["9F4D",0x20D71],
+  ["FAF6",0x20D74],
+  ["8A57",0x20D7C],
+  ["8B43",0x20D7E],
+  ["8B44",0x20D7F],
+  ["8AB6",0x20D96],
+  ["8AC0",0x20D9C],
+  ["9E54",0x20DA7],
+  ["9AD7",0x20DB2],
+  ["9AD8",0x20DC8],
+  ["9ADC",0x20E04],
+  ["8ACA",0x20E09],
+  ["9EA8",0x20E0A],
+  ["9263",0x20E0D],
+  ["9ADD",0x20E0E],
+  ["8B65",0x20E0F],
+  ["8B6F",0x20E10],
+  ["8B7E",0x20E11],
+  ["8F43",0x20E16],
+  ["92D0",0x20E1D],
+  ["8AF4",0x20E4C],
+  ["9DBE",0x20E6D],
+  ["9AE1",0x20E73],
+  ["FCDE",0x20E75],
+  ["9DFD",0x20E76],
+  ["8B66",0x20E77],
+  ["8B70",0x20E78],
+  ["8B75",0x20E79],
+  ["8AE4",0x20E7A],
+  ["8BA4",0x20E7B],
+  ["8AED",0x20E8C],
+  ["8A5D",0x20E96],
+  ["8B48",0x20E98],
+  ["9DED",0x20E9D],
+  ["9E40",0x20EA2],
+  ["8AEF",0x20EAA],
+  ["8AF6",0x20EAB],
+  ["9E76",0x20EAC],
+  ["9EE3",0x20EB6],
+  ["9ADE",0x20ED7],
+  ["8DFE",0x20ED8],
+  ["FAFC",0x20EDD],
+  ["9CB1",0x20EF8],
+  ["9E77",0x20EF9],
+  ["8B64",0x20EFA],
+  ["8B67",0x20EFB],
+  ["974B",0x20F1D],
+  ["9653",0x20F26],
+  ["9AE0",0x20F2D],
+  ["8B4A",0x20F2E],
+  ["8AF1",0x20F30],
+  ["8AD7",0x20F31],
+  ["A0AB",0x20F3B],
+  ["8AB5",0x20F4C],
+  ["8A5F",0x20F64],
+  ["8AEE",0x20F8D],
+  ["9ADF",0x20F90],
+  ["8AFE",0x20FAD],
+  ["8A58",0x20FB4],
+  ["8BA3",0x20FB5],
+  ["8BA7",0x20FB6],
+  ["9AE3",0x20FBC],
+  ["9261",0x20FDF],
+  ["9DD7",0x20FEA],
+  ["9E7D",0x20FEB],
+  ["9EA7",0x20FEC],
+  ["9EAB",0x20FED],
+  ["9042",0x21014],
+  ["8B79",0x2101D],
+  ["8B7A",0x2101E],
+  ["9AE6",0x2104F],
+  ["9AE5",0x2105C],
+  ["8A7E",0x2106F],
+  ["9E44",0x21075],
+  ["9AE7",0x21076],
+  ["8A7C",0x21077],
+  ["8B71",0x21078],
+  ["9AE9",0x2107B],
+  ["9AEA",0x21088],
+  ["9AEB",0x21096],
+  ["8ABD",0x2109D],
+  ["FB4E",0x210B4],
+  ["9AED",0x210BF],
+  ["8AF9",0x210C0],
+  ["9E63",0x210C1],
+  ["8B49",0x210C7],
+  ["8ACE",0x210C8],
+  ["8B6E",0x210C9],
+  ["8AE8",0x210CF],
+  ["9AEE",0x210D3],
+  ["92CE",0x210E4],
+  ["8A5A",0x210F4],
+  ["8B7B",0x210F5],
+  ["8B7C",0x210F6],
+  ["9AEF",0x2112F],
+  ["9AF0",0x2113B],
+  ["8AFA",0x2113D],
+  ["8941",0x21145],
+  ["8B72",0x21148],
+  ["8AF3",0x2114F],
+  ["8BA8",0x21180],
+  ["9EAE",0x21187],
+  ["9E72",0x211D9],
+  ["FB73",0x2123C],
+  ["FB5F",0x2124F],
+  ["90BA",0x2127C],
+  ["91FE",0x212A8],
+  ["9EF6",0x212A9],
+  ["97ED",0x212B0],
+  ["9AF3",0x212E3],
+  ["A0EE",0x212FE],
+  ["967C",0x21302],
+  ["9345",0x21303],
+  ["986E",0x21304],
+  ["FA56",0x21305],
+  ["9AF5",0x21336],
+  ["FC4B",0x2133A],
+  ["9AF4",0x21375],
+  ["FEDE",0x21376],
+  ["FCB7",0x2138E],
+  ["97F1",0x21398],
+  ["97C7",0x2139C],
+  ["9CCB",0x213C5],
+  ["9240",0x213C6],
+  ["9CE8",0x213ED],
+  ["91FD",0x213FE],
+  ["974E",0x21413],
+  ["FB68",0x21416],
+  ["976C",0x21424],
+  ["8CC2",0x2143F],
+  ["97E8",0x21452],
+  ["FB6A",0x21454],
+  ["8B74",0x21455],
+  ["8EE7",0x2148A],
+  ["FDC8",0x21497],
+  ["9241",0x214B6],
+  ["96A1",0x214E8],
+  ["8EF3",0x214FD],
+  ["9AF7",0x21577],
+  ["8FA6",0x21582],
+  ["FAD6",0x21596],
+  ["9CC7",0x2160A],
+  ["FAD7",0x21613],
+  ["9AF8",0x21619],
+  ["FBA1",0x2163E],
+  ["8EC5",0x21661],
+  ["FBA4",0x21692],
+  ["FBC2",0x216B8],
+  ["9AC1",0x216BA],
+  ["91FA",0x216C0],
+  ["FEDB",0x216C1],
+  ["97AB",0x216C2],
+  ["9147",0x216D3],
+  ["FBB1",0x216D5],
+  ["8FEA",0x216DF],
+  ["94D2",0x216E6],
+  ["FE61",0x216E7],
+  ["FACE",0x216E8],
+  ["92ED",0x216FA],
+  ["91F3",0x216FB],
+  ["93C6",0x216FC],
+  ["935A",0x216FE],
+  ["FAFB",0x2170D],
+  ["92EF",0x21710],
+  ["FAC8",0x21726],
+  ["9847",0x2173A],
+  ["9366",0x2173B],
+  ["9855",0x2173C],
+  ["96E6",0x21757],
+  ["9F43",0x2176C],
+  ["9FAA",0x2176D],
+  ["94DA",0x2176E],
+  ["92EE",0x2176F],
+  ["FCAF",0x21770],
+  ["FBFB",0x21771],
+  ["8EF9",0x21773],
+  ["91F6",0x21774],
+  ["9364",0x217AB],
+  ["94F5",0x217B0],
+  ["9CB6",0x217B1],
+  ["FBAD",0x217B2],
+  ["984E",0x217B3],
+  ["8F44",0x217B4],
+  ["96FD",0x217B5],
+  ["9AF9",0x217C3],
+  ["9AFA",0x217C7],
+  ["9769",0x217D9],
+  ["95D4",0x217DA],
+  ["984B",0x217DB],
+  ["FBAA",0x217DC],
+  ["987C",0x217DF],
+  ["91EA",0x217EF],
+  ["9DAF",0x217F5],
+  ["9DC5",0x217F6],
+  ["91F1",0x217F8],
+  ["8EB1",0x217F9],
+  ["97A9",0x217FA],
+  ["FBAC",0x217FB],
+  ["FCB8",0x217FC],
+  ["9CB9",0x21820],
+  ["FBB0",0x21828],
+  ["FCD2",0x21829],
+  ["93CB",0x2182A],
+  ["9AFD",0x2182D],
+  ["91F4",0x21839],
+  ["8BAC",0x2183A],
+  ["A055",0x2183B],
+  ["9574",0x21840],
+  ["95BE",0x21845],
+  ["97AD",0x21852],
+  ["8EE9",0x2185E],
+  ["92F8",0x21861],
+  ["97BE",0x21862],
+  ["916C",0x21863],
+  ["94AA",0x21864],
+  ["FC63",0x21877],
+  ["9DC6",0x2187B],
+  ["97B5",0x21883],
+  ["92B8",0x21884],
+  ["91EF",0x21885],
+  ["FEA6",0x2189E],
+  ["9760",0x2189F],
+  ["9358",0x218A0],
+  ["9576",0x218A1],
+  ["8FAC",0x218A2],
+  ["91EC",0x218BE],
+  ["97B4",0x218BF],
+  ["91F7",0x218D1],
+  ["974A",0x218D6],
+  ["FB49",0x218D7],
+  ["9578",0x218D8],
+  ["93BC",0x218D9],
+  ["91D6",0x218FA],
+  ["9355",0x21903],
+  ["9356",0x21904],
+  ["9851",0x21905],
+  ["8FF8",0x21910],
+  ["FBC0",0x21911],
+  ["93F2",0x21912],
+  ["90D0",0x21915],
+  ["9C44",0x2191C],
+  ["9255",0x21922],
+  ["9363",0x21927],
+  ["91A5",0x2193B],
+  ["A0ED",0x21944],
+  ["FD6B",0x21958],
+  ["9AFE",0x2196A],
+  ["9351",0x2197C],
+  ["8C57",0x21980],
+  ["FA78",0x21983],
+  ["FEA8",0x21988],
+  ["9350",0x21996],
+  ["FA4C",0x219DB],
+  ["92F7",0x219F3],
+  ["9B40",0x21A2D],
+  ["FBCE",0x21A34],
+  ["9B41",0x21A45],
+  ["FEAD",0x21A4B],
+  ["8761",0x21A63],
+  ["FBD5",0x21B44],
+  ["8BC2",0x21BC1],
+  ["9A7C",0x21BC2],
+  ["9B42",0x21C2A],
+  ["9B43",0x21C70],
+  ["9E79",0x21CA2],
+  ["FBD9",0x21CA5],
+  ["9B44",0x21CAC],
+  ["A0A7",0x21D46],
+  ["876E",0x21D5E],
+  ["9BF3",0x21D90],
+  ["8C79",0x21DB6],
+  ["935E",0x21DBA],
+  ["89CB",0x21DCA],
+  ["9F53",0x21DD1],
+  ["93D7",0x21DEB],
+  ["FBE1",0x21DF9],
+  ["FED0",0x21E1C],
+  ["8CF1",0x21E23],
+  ["FBE2",0x21E37],
+  ["FCE3",0x21E3D],
+  ["9074",0x21E89],
+  ["FBE6",0x21EA4],
+  ["9BB7",0x21EA8],
+  ["9B45",0x21EC8],
+  ["9B47",0x21ED5],
+  ["9F50",0x21F0F],
+  ["9B48",0x21F15],
+  ["FC5B",0x21F6A],
+  ["98A9",0x21F9E],
+  ["9CFD",0x21FA1],
+  ["884C",0x21FE8],
+  ["9B4B",0x22045],
+  ["FBEC",0x22049],
+  ["8C69",0x2207E],
+  ["9BA8",0x2209A],
+  ["8AD5",0x220C7],
+  ["FA73",0x220FC],
+  ["FD59",0x2212A],
+  ["91A2",0x2215B],
+  ["FBED",0x22173],
+  ["9CA9",0x2217A],
+  ["8AA8",0x221A1],
+  ["8D42",0x221C1],
+  ["9BC3",0x221C3],
+  ["8AE1",0x22208],
+  ["9B4E",0x2227C],
+  ["95D0",0x22321],
+  ["905F",0x22325],
+  ["97EE",0x223BD],
+  ["FC4E",0x223D0],
+  ["9B4F",0x223D7],
+  ["9B50",0x223FA],
+  ["9EC6",0x22465],
+  ["FC50",0x22471],
+  ["FD73",0x2248B],
+  ["FDA7",0x22491],
+  ["9DA2",0x224B0],
+  ["FA58",0x224ED],
+  ["FA5E",0x22513],
+  ["A059",0x2251B],
+  ["FA75",0x22530],
+  ["FBBE",0x22554],
+  ["9CA2",0x2258D],
+  ["9370",0x225AF],
+  ["9371",0x225BE],
+  ["9377",0x2261B],
+  ["FEEF",0x2261C],
+  ["936D",0x2262B],
+  ["FC5D",0x22668],
+  ["90B8",0x2267A],
+  ["8AFC",0x22696],
+  ["FB41",0x22698],
+  ["9E6B",0x226F4],
+  ["94E3",0x226F5],
+  ["8EE2",0x226F6],
+  ["8C7D",0x22712],
+  ["8ED7",0x22714],
+  ["9C4D",0x2271B],
+  ["96A3",0x2271F],
+  ["9B51",0x2272A],
+  ["8AC3",0x22775],
+  ["96AA",0x22781],
+  ["8CE2",0x22796],
+  ["FC68",0x227B4],
+  ["8B6D",0x227B5],
+  ["FD67",0x227CD],
+  ["8AE9",0x22803],
+  ["FCA1",0x2285F],
+  ["936C",0x22860],
+  ["9B52",0x22871],
+  ["FE70",0x228AD],
+  ["FCA8",0x228C1],
+  ["FCE9",0x228F7],
+  ["9CB4",0x22926],
+  ["8AEA",0x22939],
+  ["9B53",0x2294F],
+  ["9B55",0x22967],
+  ["96AB",0x2296B],
+  ["FCA7",0x22980],
+  ["9B56",0x22993],
+  ["8ABC",0x22A66],
+  ["8ACB",0x22ACF],
+  ["9B57",0x22AD5],
+  ["89CD",0x22AE6],
+  ["9B59",0x22AE8],
+  ["9B5B",0x22B0E],
+  ["93A5",0x22B22],
+  ["9B5D",0x22B3F],
+  ["9E4F",0x22B43],
+  ["93A3",0x22B6A],
+  ["8A7B",0x22BCA],
+  ["8B42",0x22BCE],
+  ["9750",0x22C26],
+  ["8FB3",0x22C27],
+  ["8A50",0x22C38],
+  ["9B60",0x22C4C],
+  ["8B45",0x22C51],
+  ["8B46",0x22C55],
+  ["9DFE",0x22C62],
+  ["9B62",0x22C88],
+  ["937B",0x22C9B],
+  ["93B1",0x22CA1],
+  ["8A60",0x22CA9],
+  ["8AD8",0x22CB2],
+  ["9B63",0x22CB7],
+  ["8A69",0x22CC2],
+  ["8A47",0x22CC6],
+  ["8ACC",0x22CC9],
+  ["937C",0x22D07],
+  ["9B65",0x22D08],
+  ["9B66",0x22D12],
+  ["8A72",0x22D44],
+  ["8A7A",0x22D4C],
+  ["93AF",0x22D67],
+  ["8AB0",0x22D8D],
+  ["9B68",0x22D95],
+  ["9EA3",0x22DA0],
+  ["FAEC",0x22DA3],
+  ["8B77",0x22DA4],
+  ["9B67",0x22DB7],
+  ["8B59",0x22DEE],
+  ["FCB1",0x22E0D],
+  ["FCBB",0x22E36],
+  ["9B69",0x22E42],
+  ["93A8",0x22E78],
+  ["8AE0",0x22E8B],
+  ["9E51",0x22EB3],
+  ["8F5F",0x22EEF],
+  ["9B6A",0x22F74],
+  ["9B6B",0x22FCC],
+  ["97EC",0x22FE3],
+  ["9B6C",0x23033],
+  ["FE4E",0x23044],
+  ["FDC2",0x2304B],
+  ["9B6D",0x23066],
+  ["9167",0x2307D],
+  ["FCCC",0x2307E],
+  ["93B6",0x2308E],
+  ["90E4",0x230B7],
+  ["90E5",0x230BC],
+  ["9EF2",0x230DA],
+  ["93CA",0x23103],
+  ["8BBC",0x2313D],
+  ["8F46",0x2317D],
+  ["93CF",0x23182],
+  ["FCDB",0x231A4],
+  ["FCDC",0x231A5],
+  ["93C0",0x231B3],
+  ["FCE6",0x231C8],
+  ["96E7",0x231C9],
+  ["FCD8",0x231F7],
+  ["FCD9",0x231F8],
+  ["FDA6",0x231F9],
+  ["93CE",0x2320F],
+  ["95F1",0x23225],
+  ["9CE9",0x2322F],
+  ["FCE4",0x23231],
+  ["94AF",0x23232],
+  ["FA77",0x23233],
+  ["93CC",0x23234],
+  ["8CE1",0x23256],
+  ["905A",0x23262],
+  ["8C54",0x23281],
+  ["93BF",0x23289],
+  ["FB51",0x2328A],
+  ["93B9",0x232AB],
+  ["FED7",0x232AC],
+  ["93B7",0x232AD],
+  ["93D9",0x232D2],
+  ["93BB",0x232E0],
+  ["93DA",0x232E1],
+  ["98A3",0x23300],
+  ["90D1",0x2330A],
+  ["9B6E",0x2331F],
+  ["FA70",0x233B4],
+  ["9BEB",0x233CC],
+  ["9B6F",0x233DE],
+  ["FCFC",0x233E6],
+  ["8B40",0x233F4],
+  ["A07B",0x233F5],
+  ["8CA1",0x233F9],
+  ["97F7",0x233FA],
+  ["93E2",0x233FE],
+  ["FCD6",0x23400],
+  ["9559",0x2343F],
+  ["93A6",0x23450],
+  ["FD40",0x2346F],
+  ["935F",0x23472],
+  ["97F2",0x234E5],
+  ["9C76",0x23519],
+  ["8EF8",0x23530],
+  ["8CEB",0x23551],
+  ["8F47",0x2355A],
+  ["9B74",0x23567],
+  ["92B4",0x23595],
+  ["91ED",0x23599],
+  ["96D2",0x2359C],
+  ["FD46",0x235CD],
+  ["8F4F",0x235CE],
+  ["9549",0x235CF],
+  ["9B75",0x235F3],
+  ["FA5C",0x23600],
+  ["8751",0x23617],
+  ["9B79",0x2361A],
+  ["FD4B",0x2363C],
+  ["96D3",0x23640],
+  ["FD58",0x23659],
+  ["945F",0x2365F],
+  ["A0F5",0x23677],
+  ["9243",0x236A6],
+  ["97FA",0x236AD],
+  ["9DD9",0x236BA],
+  ["97F4",0x236DF],
+  ["924D",0x236EE],
+  ["FD5B",0x23703],
+  ["9B7A",0x23716],
+  ["9ED5",0x23720],
+  ["FAAE",0x2372D],
+  ["9CC9",0x2372F],
+  ["9258",0x2373F],
+  ["8EC8",0x23766],
+  ["94B4",0x23781],
+  ["93E1",0x237A2],
+  ["93DF",0x237BC],
+  ["FCF0",0x237C2],
+  ["93EC",0x237D5],
+  ["97F6",0x237D6],
+  ["96CF",0x237D7],
+  ["93DE",0x2383A],
+  ["8ACF",0x239C2],
+  ["9BA2",0x23AA7],
+  ["FD69",0x23ADB],
+  ["9352",0x23AEE],
+  ["98A2",0x23AFA],
+  ["8CE7",0x23B1A],
+  ["FD6E",0x23B5A],
+  ["8CA4",0x23C63],
+  ["FA7C",0x23C99],
+  ["93FA",0x23C9A],
+  ["907C",0x23C9B],
+  ["8F67",0x23CB5],
+  ["9DB7",0x23CB7],
+  ["A0E9",0x23CC7],
+  ["FA4E",0x23CC8],
+  ["FDA1",0x23CC9],
+  ["9E74",0x23CFC],
+  ["9FBF",0x23CFD],
+  ["9ECB",0x23CFE],
+  ["9BB9",0x23CFF],
+  ["9DD4",0x23D40],
+  ["97B9",0x23D5B],
+  ["8EF1",0x23D7E],
+  ["957B",0x23D8F],
+  ["9ED2",0x23DB6],
+  ["9753",0x23DB7],
+  ["96A4",0x23DB8],
+  ["8FBE",0x23DB9],
+  ["94D9",0x23DBA],
+  ["9058",0x23DBB],
+  ["FD79",0x23DBC],
+  ["FD7B",0x23DBD],
+  ["8EDA",0x23DE3],
+  ["8EFA",0x23DF8],
+  ["8762",0x23E06],
+  ["9BA5",0x23E11],
+  ["9ED9",0x23E2C],
+  ["97D4",0x23E2D],
+  ["90BB",0x23E2E],
+  ["FDBC",0x23E2F],
+  ["FDC6",0x23E30],
+  ["9248",0x23E31],
+  ["92B5",0x23E39],
+  ["9DC1",0x23E88],
+  ["92B9",0x23E89],
+  ["92A6",0x23E8A],
+  ["8F4B",0x23E8B],
+  ["9BA6",0x23EB9],
+  ["92B6",0x23EBF],
+  ["8E40",0x23ED7],
+  ["9ED8",0x23EF7],
+  ["945E",0x23EF8],
+  ["985F",0x23EF9],
+  ["94CE",0x23EFA],
+  ["924A",0x23EFB],
+  ["FD70",0x23EFC],
+  ["9467",0x23F35],
+  ["8DEC",0x23F41],
+  ["9BD8",0x23F4A],
+  ["8763",0x23F61],
+  ["9448",0x23F7F],
+  ["FAC1",0x23F80],
+  ["9CF7",0x23F81],
+  ["FDBE",0x23F82],
+  ["8FDA",0x23F8F],
+  ["FDD9",0x23FB4],
+  ["FC7E",0x23FB7],
+  ["93F9",0x23FC0],
+  ["FA43",0x23FC5],
+  ["FAEB",0x23FEB],
+  ["FAC3",0x23FEC],
+  ["97D3",0x23FED],
+  ["95F9",0x23FEE],
+  ["9C48",0x23FEF],
+  ["FDD8",0x23FF0],
+  ["A0D8",0x24011],
+  ["FDD7",0x24039],
+  ["FB4A",0x2403A],
+  ["9BAF",0x2403B],
+  ["944B",0x2403C],
+  ["FDC9",0x2403D],
+  ["8EAC",0x24057],
+  ["FDB2",0x24085],
+  ["925A",0x2408B],
+  ["FCBD",0x2408C],
+  ["92D9",0x2408D],
+  ["FDD5",0x24091],
+  ["92DD",0x240C9],
+  ["9259",0x240E1],
+  ["8CF0",0x240EC],
+  ["96BA",0x24104],
+  ["925B",0x2410F],
+  ["9BAB",0x24119],
+  ["FDDA",0x2413F],
+  ["FDDE",0x24140],
+  ["FDD3",0x24144],
+  ["8C46",0x2414E],
+  ["FDD6",0x24155],
+  ["FDDC",0x24156],
+  ["FDDD",0x24157],
+  ["90FE",0x2415C],
+  ["FEA1",0x2415F],
+  ["8BAD",0x24177],
+  ["9CD8",0x2417A],
+  ["9E6D",0x241A3],
+  ["FD7C",0x241A4],
+  ["FB61",0x241A5],
+  ["96F8",0x241AC],
+  ["96F0",0x241B5],
+  ["FCF4",0x241CD],
+  ["FE60",0x241E2],
+  ["9852",0x241FC],
+  ["964F",0x2421B],
+  ["916E",0x2424B],
+  ["986D",0x24256],
+  ["9864",0x24259],
+  ["9453",0x24276],
+  ["FDEC",0x24277],
+  ["FB78",0x24278],
+  ["95BA",0x24284],
+  ["985D",0x24293],
+  ["92F9",0x24295],
+  ["985A",0x242A5],
+  ["8750",0x242BF],
+  ["FDF6",0x242C1],
+  ["93D0",0x242C9],
+  ["9862",0x242CA],
+  ["9BAD",0x242EE],
+  ["974F",0x242FA],
+  ["9BAE",0x2430D],
+  ["9452",0x2431A],
+  ["9BB0",0x24334],
+  ["91D2",0x24348],
+  ["97EA",0x24362],
+  ["FB6B",0x24363],
+  ["91B1",0x24364],
+  ["FDF3",0x24365],
+  ["92CB",0x2438C],
+  ["9BB1",0x24396],
+  ["FCEC",0x2439C],
+  ["986B",0x243BD],
+  ["9751",0x243C1],
+  ["9871",0x243E9],
+  ["95EF",0x243EA],
+  ["9EF3",0x243F2],
+  ["91E8",0x243F8],
+  ["9BBA",0x24404],
+  ["FB4C",0x24435],
+  ["926A",0x24436],
+  ["FDF8",0x2445A],
+  ["9861",0x2445B],
+  ["91E7",0x24473],
+  ["93ED",0x24487],
+  ["9744",0x24488],
+  ["91E1",0x244B9],
+  ["FBF5",0x244BC],
+  ["9869",0x244CE],
+  ["8A62",0x244D3],
+  ["9BBB",0x244D6],
+  ["8CA8",0x24505],
+  ["9C55",0x24521],
+  ["8E77",0x24578],
+  ["8AB2",0x245C8],
+  ["9EBC",0x24618],
+  ["93E6",0x2462A],
+  ["93A2",0x24665],
+  ["9BBD",0x24674],
+  ["94B3",0x24697],
+  ["937D",0x246D4],
+  ["9E66",0x24706],
+  ["9459",0x24725],
+  ["9BBF",0x2472F],
+  ["9458",0x2478F],
+  ["9EA5",0x247E0],
+  ["9BC7",0x24812],
+  ["FE54",0x24823],
+  ["8E74",0x24882],
+  ["8BD6",0x248E9],
+  ["94B6",0x248F0],
+  ["FD74",0x248F1],
+  ["98C0",0x248F2],
+  ["94A5",0x248F3],
+  ["9BC8",0x248FB],
+  ["95ED",0x248FF],
+  ["FD7E",0x24900],
+  ["FBEB",0x24901],
+  ["FD7D",0x2490C],
+  ["976F",0x24916],
+  ["9461",0x24917],
+  ["9FC1",0x24919],
+  ["95D7",0x2492F],
+  ["FA52",0x24933],
+  ["9C58",0x24934],
+  ["9F68",0x2493E],
+  ["9BE7",0x2493F],
+  ["FCCE",0x24940],
+  ["96E8",0x24941],
+  ["FA49",0x24942],
+  ["97A1",0x24943],
+  ["954D",0x24962],
+  ["9EF8",0x24963],
+  ["FE49",0x24974],
+  ["91CE",0x24975],
+  ["9771",0x24976],
+  ["8CCF",0x2497B],
+  ["FDB1",0x2497F],
+  ["FC6E",0x24982],
+  ["9CF2",0x24988],
+  ["93B8",0x24989],
+  ["9043",0x2498A],
+  ["9759",0x2498B],
+  ["94D7",0x2498C],
+  ["FE66",0x2498D],
+  ["947D",0x2498E],
+  ["FC6F",0x2498F],
+  ["9246",0x24994],
+  ["FA6D",0x249A4],
+  ["8EF7",0x249A7],
+  ["FBB7",0x249A9],
+  ["947C",0x249AB],
+  ["92CD",0x249AC],
+  ["97B2",0x249AD],
+  ["FE65",0x249B7],
+  ["967E",0x249B8],
+  ["9758",0x249B9],
+  ["9B77",0x249BA],
+  ["91CF",0x249BB],
+  ["94A4",0x249C5],
+  ["9CAD",0x249D0],
+  ["8BAB",0x249DA],
+  ["96D5",0x249DE],
+  ["FCB3",0x249DF],
+  ["93AE",0x249E3],
+  ["976D",0x249E5],
+  ["9446",0x249EC],
+  ["95F7",0x249ED],
+  ["9C46",0x249F6],
+  ["955B",0x249F7],
+  ["91D1",0x249F8],
+  ["94F4",0x249F9],
+  ["FE67",0x249FB],
+  ["92A5",0x24A0E],
+  ["FEDF",0x24A12],
+  ["8CAB",0x24A13],
+  ["9BC9",0x24A15],
+  ["FCED",0x24A21],
+  ["FDFA",0x24A22],
+  ["FCC8",0x24A23],
+  ["FE62",0x24A24],
+  ["91FC",0x24A25],
+  ["FE6B",0x24A26],
+  ["FDF9",0x24A27],
+  ["FCC7",0x24A28],
+  ["914E",0x24A29],
+  ["9CB8",0x24A2A],
+  ["9767",0x24A3E],
+  ["95EE",0x24A42],
+  ["9BB2",0x24A45],
+  ["9460",0x24A4A],
+  ["94A2",0x24A4E],
+  ["9875",0x24A4F],
+  ["97AC",0x24A50],
+  ["91D3",0x24A51],
+  ["987B",0x24A5D],
+  ["8EEB",0x24A65],
+  ["976A",0x24A66],
+  ["965E",0x24A67],
+  ["97EB",0x24A71],
+  ["9FF9",0x24A77],
+  ["95F8",0x24A78],
+  ["FEA2",0x24A79],
+  ["8FE6",0x24A7A],
+  ["FE7E",0x24A8C],
+  ["9DA4",0x24A93],
+  ["9768",0x24A94],
+  ["8EEC",0x24A95],
+  ["94BD",0x24A96],
+  ["945B",0x24AA4],
+  ["9CF6",0x24AA5],
+  ["FAA7",0x24AA6],
+  ["9BD9",0x24AA7],
+  ["FA5D",0x24AB1],
+  ["9656",0x24AB2],
+  ["9762",0x24AB3],
+  ["94BA",0x24ABA],
+  ["A04F",0x24ABB],
+  ["92D8",0x24ABC],
+  ["9BCB",0x24AC0],
+  ["94BB",0x24AC7],
+  ["9D5F",0x24ACA],
+  ["90CF",0x24AD1],
+  ["9465",0x24ADF],
+  ["9F4C",0x24AE2],
+  ["90D8",0x24AE9],
+  ["8D5B",0x24B0F],
+  ["9EBE",0x24B6E],
+  ["FB6D",0x24BF5],
+  ["95CA",0x24C09],
+  ["9DC2",0x24C9E],
+  ["97F8",0x24C9F],
+  ["8FFC",0x24CC9],
+  ["9473",0x24CD9],
+  ["9474",0x24D06],
+  ["FEB7",0x24D13],
+  ["8A4B",0x24DB8],
+  ["8A55",0x24DEA],
+  ["8B69",0x24DEB],
+  ["8ADC",0x24E3B],
+  ["8B76",0x24E50],
+  ["9BCE",0x24EA5],
+  ["8A68",0x24EA7],
+  ["A0F8",0x24F0E],
+  ["98DF",0x24F5C],
+  ["FEB5",0x24F82],
+  ["9BCF",0x24F86],
+  ["96FB",0x24F97],
+  ["9BFB",0x24F9A],
+  ["9ECE",0x24FA9],
+  ["8EE5",0x24FB8],
+  ["9E7B",0x24FC2],
+  ["9BD2",0x2502C],
+  ["8AA5",0x25052],
+  ["FECE",0x2509D],
+  ["8A45",0x2512B],
+  ["9DFC",0x25148],
+  ["FECF",0x2517D],
+  ["8BA5",0x2517E],
+  ["8C4A",0x251CD],
+  ["8AEC",0x251E3],
+  ["FCE0",0x251E6],
+  ["94AD",0x251E7],
+  ["FED5",0x25220],
+  ["94AC",0x25221],
+  ["FC5A",0x25250],
+  ["9BD6",0x25299],
+  ["8A6F",0x252C7],
+  ["8BA9",0x252D8],
+  ["8E5F",0x2530E],
+  ["9DCB",0x25311],
+  ["FCE7",0x25313],
+  ["9BD7",0x25419],
+  ["93C8",0x25425],
+  ["91F0",0x2542F],
+  ["8FE0",0x25430],
+  ["9BDB",0x25446],
+  ["90ED",0x2546C],
+  ["9BDC",0x2546E],
+  ["8D53",0x2549A],
+  ["A0EC",0x25531],
+  ["98FA",0x25535],
+  ["9BE0",0x2553F],
+  ["93C7",0x2555B],
+  ["9249",0x2555C],
+  ["96E1",0x2555D],
+  ["9BE2",0x2555E],
+  ["9BE4",0x25562],
+  ["8FE1",0x25565],
+  ["9BE5",0x25566],
+  ["94C0",0x25581],
+  ["93C3",0x25584],
+  ["93C5",0x2558F],
+  ["9079",0x255B9],
+  ["977B",0x255D5],
+  ["907E",0x255DB],
+  ["FEE6",0x255E0],
+  ["FE46",0x25605],
+  ["9DB8",0x25635],
+  ["9270",0x25651],
+  ["95A8",0x25683],
+  ["8CB0",0x25695],
+  ["94C8",0x256E3],
+  ["98B9",0x256F6],
+  ["9140",0x25706],
+  ["FCBE",0x2571D],
+  ["9157",0x25725],
+  ["8BB2",0x2573D],
+  ["FADF",0x25772],
+  ["9BE6",0x257C7],
+  ["9643",0x257DF],
+  ["8E44",0x257E0],
+  ["9C4F",0x257E1],
+  ["FEF4",0x25857],
+  ["9BE8",0x2585D],
+  ["93DC",0x25872],
+  ["966F",0x258C8],
+  ["8E4A",0x258E1],
+  ["9BED",0x25903],
+  ["92F6",0x25946],
+  ["9DB9",0x25956],
+  ["8E4E",0x259AC],
+  ["FBCF",0x259CC],
+  ["8760",0x25A54],
+  ["9EC2",0x25A95],
+  ["94E5",0x25A9C],
+  ["9BF0",0x25AAE],
+  ["94E4",0x25AAF],
+  ["9551",0x25AE9],
+  ["8BBB",0x25B74],
+  ["9BF1",0x25B89],
+  ["94F0",0x25BB3],
+  ["8E64",0x25BB4],
+  ["94EA",0x25BC6],
+  ["8F61",0x25BE4],
+  ["9B64",0x25BE8],
+  ["8E5B",0x25C01],
+  ["9BF2",0x25C06],
+  ["9FBE",0x25C21],
+  ["9DC9",0x25C4A],
+  ["8E6C",0x25C65],
+  ["8F73",0x25C91],
+  ["8CAF",0x25CA4],
+  ["8F75",0x25CC0],
+  ["8E71",0x25CC1],
+  ["8E60",0x25CFE],
+  ["8E6A",0x25D20],
+  ["8C4C",0x25D30],
+  ["9552",0x25D43],
+  ["9554",0x25E0E],
+  ["8AD4",0x25E49],
+  ["9DBB",0x25E81],
+  ["9543",0x25E82],
+  ["92FE",0x25E83],
+  ["94F2",0x25EA6],
+  ["94F1",0x25EBC],
+  ["A0EA",0x25ED7],
+  ["9DD2",0x25ED8],
+  ["A0B1",0x25F1A],
+  ["91F8",0x25F4B],
+  ["9462",0x25FE1],
+  ["9BA4",0x25FE2],
+  ["8EAD",0x26029],
+  ["9EAD",0x26048],
+  ["96D0",0x26064],
+  ["FEEE",0x26083],
+  ["8AB4",0x26097],
+  ["9757",0x260A4],
+  ["8A77",0x260A5],
+  ["9BF7",0x26102],
+  ["8EB5",0x26121],
+  ["A06D",0x26159],
+  ["8EB6",0x2615A],
+  ["9756",0x2615B],
+  ["9540",0x2615C],
+  ["A0F3",0x261AD],
+  ["94BE",0x261AE],
+  ["9BFA",0x261B2],
+  ["FDDF",0x261DD],
+  ["9DBC",0x26258],
+  ["94FE",0x26261],
+  ["8BDB",0x2626A],
+  ["A0FE",0x2626B],
+  ["8EC0",0x262D0],
+  ["9F47",0x26335],
+  ["8BDE",0x2634B],
+  ["A0FB",0x2634C],
+  ["8EC3",0x26351],
+  ["9649",0x263BE],
+  ["FEC2",0x263F5],
+  ["954C",0x263F8],
+  ["9BFD",0x26402],
+  ["90CC",0x26410],
+  ["9C60",0x26411],
+  ["954B",0x26412],
+  ["9BFE",0x2644A],
+  ["9C70",0x26469],
+  ["9C43",0x26484],
+  ["9C47",0x26488],
+  ["8ECC",0x26489],
+  ["8E54",0x2648D],
+  ["8EE4",0x26498],
+  ["9C49",0x26512],
+  ["8B5E",0x26572],
+  ["955E",0x265A0],
+  ["955C",0x265AD],
+  ["9C4B",0x265BF],
+  ["8BE1",0x26612],
+  ["8ED9",0x26626],
+  ["9DB4",0x266AF],
+  ["925F",0x266B1],
+  ["9C4C",0x266B5],
+  ["8AA1",0x266DA],
+  ["8EDB",0x266E8],
+  ["9C56",0x266FC],
+  ["8AA2",0x26716],
+  ["9754",0x26741],
+  ["9C5E",0x26799],
+  ["9ED4",0x267B3],
+  ["9568",0x267B4],
+  ["A0C3",0x267CC],
+  ["8AE6",0x2681C],
+  ["A0F7",0x26846],
+  ["9C61",0x2685E],
+  ["9C5F",0x2686E],
+  ["FC4D",0x26888],
+  ["9E5B",0x2688A],
+  ["9E69",0x26893],
+  ["9C63",0x268C7],
+  ["FEC7",0x2690E],
+  ["FEC6",0x26911],
+  ["9C67",0x26926],
+  ["9C69",0x26939],
+  ["8BE2",0x26951],
+  ["9165",0x269A8],
+  ["9CE7",0x269B5],
+  ["8A54",0x269F2],
+  ["9C6C",0x269FA],
+  ["9C6E",0x26A2D],
+  ["FE5D",0x26A2E],
+  ["9C73",0x26A34],
+  ["956A",0x26A42],
+  ["956D",0x26A51],
+  ["8EF0",0x26A52],
+  ["8F4D",0x26B05],
+  ["8EF6",0x26B0A],
+  ["FABC",0x26B13],
+  ["8CD5",0x26B15],
+  ["875E",0x26B23],
+  ["FBDA",0x26B28],
+  ["8B4C",0x26B50],
+  ["FD75",0x26B51],
+  ["9BDD",0x26B52],
+  ["FAF5",0x26B53],
+  ["9C74",0x26B5B],
+  ["9545",0x26B75],
+  ["96C6",0x26B82],
+  ["8F6A",0x26B96],
+  ["8F4E",0x26B97],
+  ["9C78",0x26B9D],
+  ["FA55",0x26BB3],
+  ["97E4",0x26BC0],
+  ["9C41",0x26BF7],
+  ["925C",0x26C21],
+  ["96FA",0x26C40],
+  ["8CF6",0x26C41],
+  ["8D4D",0x26C46],
+  ["FB66",0x26C7E],
+  ["8E65",0x26C7F],
+  ["9849",0x26C80],
+  ["FBA8",0x26C81],
+  ["9842",0x26C82],
+  ["9C7A",0x26CA4],
+  ["97FB",0x26CB7],
+  ["90CA",0x26CB8],
+  ["9C5B",0x26CBD],
+  ["974D",0x26CC0],
+  ["8ED3",0x26CC3],
+  ["9561",0x26CD1],
+  ["9F4B",0x26D22],
+  ["9FB5",0x26D23],
+  ["93D2",0x26D24],
+  ["FDAA",0x26D25],
+  ["9840",0x26D26],
+  ["9146",0x26D27],
+  ["9867",0x26D28],
+  ["FA5A",0x26D29],
+  ["FBA9",0x26D2A],
+  ["9841",0x26D51],
+  ["8CD3",0x26D74],
+  ["FCFD",0x26DA0],
+  ["FDAB",0x26DA1],
+  ["91BD",0x26DA2],
+  ["8F4C",0x26DA3],
+  ["96C9",0x26DA4],
+  ["8F55",0x26DA5],
+  ["FBAE",0x26DA6],
+  ["956F",0x26DA7],
+  ["9C7D",0x26DAE],
+  ["A0F0",0x26DDC],
+  ["946F",0x26DEA],
+  ["FDAC",0x26DEB],
+  ["96CB",0x26DF0],
+  ["96CE",0x26E00],
+  ["A056",0x26E05],
+  ["9CE1",0x26E07],
+  ["96C4",0x26E12],
+  ["8F5E",0x26E42],
+  ["8F6C",0x26E43],
+  ["8EA3",0x26E44],
+  ["FBB3",0x26E45],
+  ["FC53",0x26E6E],
+  ["FDB3",0x26E72],
+  ["8F6B",0x26E77],
+  ["96CA",0x26E84],
+  ["8753",0x26E8B],
+  ["8F79",0x26E99],
+  ["9E6F",0x26ED0],
+  ["A0C5",0x26ED1],
+  ["FC78",0x26ED2],
+  ["8E42",0x26ED3],
+  ["8F5A",0x26ED4],
+  ["90C2",0x26ED5],
+  ["8EA5",0x26ED6],
+  ["9061",0x26ED7],
+  ["924F",0x26F26],
+  ["9373",0x26F73],
+  ["FDB5",0x26F74],
+  ["FECC",0x26F9F],
+  ["FBBD",0x26FA1],
+  ["8CD6",0x26FBE],
+  ["9843",0x26FDE],
+  ["96C5",0x26FDF],
+  ["89BC",0x2700E],
+  ["9CA3",0x2704B],
+  ["924B",0x27052],
+  ["984A",0x27053],
+  ["8FA4",0x27088],
+  ["A0F1",0x270AD],
+  ["9EFB",0x270AE],
+  ["9CD2",0x270AF],
+  ["8FA7",0x270CD],
+  ["8754",0x270D2],
+  ["FC5C",0x270F8],
+  ["9845",0x27109],
+  ["9046",0x2710C],
+  ["8CD1",0x2710D],
+  ["FEFA",0x27126],
+  ["9560",0x27127],
+  ["9F48",0x27164],
+  ["9247",0x27165],
+  ["90FB",0x27175],
+  ["9CA4",0x271CD],
+  ["9571",0x2721B],
+  ["8745",0x27267],
+  ["9CA6",0x27280],
+  ["9CA7",0x27285],
+  ["9CAA",0x2728B],
+  ["9ED3",0x272B2],
+  ["9E70",0x272B6],
+  ["9CAC",0x272E6],
+  ["8752",0x27352],
+  ["8FAE",0x2739A],
+  ["8D50",0x273FF],
+  ["957D",0x27422],
+  ["9CB0",0x27450],
+  ["97B6",0x27484],
+  ["A0BD",0x27486],
+  ["8ADF",0x27574],
+  ["9EAA",0x275A3],
+  ["8FBD",0x275E0],
+  ["8FBF",0x275E4],
+  ["9369",0x275FD],
+  ["9BA7",0x275FE],
+  ["C8A4",0x27607],
+  ["FEEA",0x2760C],
+  ["9BE1",0x27632],
+  ["8B41",0x27639],
+  ["9DB6",0x27655],
+  ["A0EB",0x27656],
+  ["9BA3",0x27657],
+  ["8BA1",0x27694],
+  ["8FC8",0x2770F],
+  ["894C",0x27735],
+  ["9860",0x27736],
+  ["94C7",0x27741],
+  ["8B58",0x2775E],
+  ["95AB",0x27784],
+  ["95AA",0x27785],
+  ["9CC3",0x277CC],
+  ["9CC4",0x27858],
+  ["93D6",0x27870],
+  ["9DAC",0x2789D],
+  ["8BE6",0x278B2],
+  ["8A71",0x278C8],
+  ["8FD1",0x27924],
+  ["99D5",0x27967],
+  ["90F4",0x2797A],
+  ["8AA3",0x279A0],
+  ["9CCE",0x279DD],
+  ["9CD4",0x279FD],
+  ["9CD5",0x27A0A],
+  ["FBC8",0x27A0E],
+  ["9DB3",0x27A3E],
+  ["FC70",0x27A53],
+  ["8FD7",0x27A59],
+  ["9B73",0x27A79],
+  ["FA5B",0x27A84],
+  ["8FD2",0x27ABD],
+  ["9064",0x27ABE],
+  ["98B6",0x27AF4],
+  ["9668",0x27B06],
+  ["9CD6",0x27B0B],
+  ["98BD",0x27B18],
+  ["8FDC",0x27B38],
+  ["FEF6",0x27B39],
+  ["8FD9",0x27B3A],
+  ["9541",0x27B48],
+  ["876C",0x27BEF],
+  ["97F3",0x27BF4],
+  ["9BF8",0x27C12],
+  ["875A",0x27C6C],
+  ["8748",0x27CB1],
+  ["874A",0x27CC5],
+  ["9E6C",0x27D2F],
+  ["8FF2",0x27D53],
+  ["8FEE",0x27D54],
+  ["9CD7",0x27D66],
+  ["9E6E",0x27D73],
+  ["8A40",0x27D84],
+  ["8FEF",0x27D8F],
+  ["8FF4",0x27D98],
+  ["8FF5",0x27DBD],
+  ["95C2",0x27DDC],
+  ["986A",0x27E4D],
+  ["97CF",0x27E4F],
+  ["9EE5",0x27F2E],
+  ["9E7C",0x27FF9],
+  ["9041",0x28002],
+  ["9CDB",0x28009],
+  ["9441",0x2801E],
+  ["9CE6",0x28023],
+  ["9DB0",0x28024],
+  ["9CEA",0x28048],
+  ["9CED",0x28083],
+  ["9CFA",0x28090],
+  ["8B62",0x280BD],
+  ["8A4E",0x280BE],
+  ["9CCA",0x280E8],
+  ["8A66",0x280E9],
+  ["9CFB",0x280F4],
+  ["9CFC",0x2812E],
+  ["9CFE",0x2814F],
+  ["8A53",0x2815D],
+  ["9CE5",0x2816F],
+  ["9D40",0x28189],
+  ["9D41",0x281AF],
+  ["9045",0x281BC],
+  ["8B73",0x28207],
+  ["97CA",0x28218],
+  ["9D42",0x2821A],
+  ["8A61",0x28256],
+  ["8BAE",0x2827C],
+  ["8AD2",0x2829B],
+  ["8BA2",0x282CD],
+  ["9DF2",0x282E2],
+  ["9D43",0x28306],
+  ["9CDF",0x28318],
+  ["9D44",0x2832F],
+  ["8ECA",0x2833A],
+  ["904E",0x28365],
+  ["8EB3",0x2836D],
+  ["9FF5",0x2837D],
+  ["9D45",0x2838A],
+  ["904F",0x28412],
+  ["9D47",0x28468],
+  ["89CA",0x2846C],
+  ["9CB5",0x28473],
+  ["FBFE",0x28482],
+  ["905E",0x28501],
+  ["9063",0x2853C],
+  ["9057",0x2853D],
+  ["9066",0x2856C],
+  ["9BC0",0x285E8],
+  ["FCE5",0x285F4],
+  ["9162",0x28600],
+  ["9067",0x2860B],
+  ["8FA1",0x28625],
+  ["8FA2",0x2863B],
+  ["9D48",0x286AA],
+  ["FAD3",0x286AB],
+  ["8D4F",0x286B2],
+  ["905D",0x286BC],
+  ["90B9",0x286D8],
+  ["906B",0x286E6],
+  ["8C5C",0x2870F],
+  ["9069",0x28713],
+  ["FE57",0x28804],
+  ["FE55",0x2882B],
+  ["9073",0x28933],
+  ["9BEF",0x28948],
+  ["9CF0",0x28949],
+  ["9D4B",0x28956],
+  ["FED9",0x28964],
+  ["FEDA",0x28968],
+  ["91E0",0x2896C],
+  ["8D43",0x2896D],
+  ["91D8",0x2897E],
+  ["9646",0x28989],
+  ["9360",0x289A8],
+  ["FA53",0x289AA],
+  ["9CD3",0x289AB],
+  ["9D4E",0x289B8],
+  ["FB40",0x289BC],
+  ["8DE2",0x289C0],
+  ["9442",0x289DC],
+  ["9056",0x289DE],
+  ["9865",0x289E1],
+  ["8C6C",0x289E3],
+  ["FA4A",0x289E4],
+  ["9D50",0x289E7],
+  ["9D52",0x289E8],
+  ["95AF",0x289F9],
+  ["975A",0x289FA],
+  ["9349",0x289FB],
+  ["9747",0x289FC],
+  ["A0F4",0x28A0F],
+  ["9778",0x28A16],
+  ["8FCF",0x28A25],
+  ["FC60",0x28A29],
+  ["8C4E",0x28A32],
+  ["FC56",0x28A36],
+  ["91DC",0x28A44],
+  ["9661",0x28A45],
+  ["92EC",0x28A46],
+  ["935D",0x28A47],
+  ["8EDE",0x28A48],
+  ["96FE",0x28A49],
+  ["FD4F",0x28A4A],
+  ["95DE",0x28A4B],
+  ["98B0",0x28A59],
+  ["A040",0x28A5A],
+  ["97BD",0x28A81],
+  ["977D",0x28A82],
+  ["97F5",0x28A83],
+  ["9BAC",0x28A9A],
+  ["FADA",0x28A9B],
+  ["92C2",0x28A9C],
+  ["97B1",0x28AC0],
+  ["907B",0x28AC6],
+  ["93FE",0x28ACB],
+  ["947B",0x28ACC],
+  ["9777",0x28ACE],
+  ["FABE",0x28ADE],
+  ["FD43",0x28ADF],
+  ["90C6",0x28AE0],
+  ["90A4",0x28AE1],
+  ["90A8",0x28AE2],
+  ["94A9",0x28AE3],
+  ["90A9",0x28AE5],
+  ["8C65",0x28AEA],
+  ["95E0",0x28AFC],
+  ["907D",0x28B0C],
+  ["9265",0x28B13],
+  ["FDBA",0x28B21],
+  ["93C4",0x28B22],
+  ["FEED",0x28B2B],
+  ["9DAB",0x28B2C],
+  ["A0E3",0x28B2D],
+  ["9648",0x28B2F],
+  ["9D53",0x28B46],
+  ["8AA9",0x28B4C],
+  ["9BC5",0x28B4E],
+  ["965D",0x28B50],
+  ["975F",0x28B63],
+  ["965F",0x28B64],
+  ["966E",0x28B65],
+  ["FB5D",0x28B66],
+  ["9DB1",0x28B6C],
+  ["FEA3",0x28B8F],
+  ["9DB2",0x28B99],
+  ["95AE",0x28B9C],
+  ["FCA3",0x28B9D],
+  ["8769",0x28BB9],
+  ["A0A2",0x28BC2],
+  ["9655",0x28BC5],
+  ["9D54",0x28BD4],
+  ["9341",0x28BD7],
+  ["95AD",0x28BD9],
+  ["91D5",0x28BDA],
+  ["977A",0x28BE7],
+  ["FDFC",0x28BE8],
+  ["8E47",0x28BE9],
+  ["93FD",0x28BEA],
+  ["90A5",0x28BEB],
+  ["90AC",0x28BEC],
+  ["95AC",0x28BF5],
+  ["90AE",0x28BFF],
+  ["FEA5",0x28C03],
+  ["9D56",0x28C09],
+  ["97E3",0x28C1C],
+  ["95E2",0x28C1D],
+  ["9466",0x28C23],
+  ["9647",0x28C26],
+  ["91B8",0x28C2B],
+  ["9CEC",0x28C30],
+  ["90AD",0x28C39],
+  ["95E3",0x28C3B],
+  ["8B4F",0x28CCA],
+  ["8AE3",0x28CCD],
+  ["8B4D",0x28CD2],
+  ["95EA",0x28D34],
+  ["8B4E",0x28D99],
+  ["8CC1",0x28DB9],
+  ["8BED",0x28E0F],
+  ["91D9",0x28E36],
+  ["A0A4",0x28E39],
+  ["95F5",0x28E65],
+  ["95F4",0x28E66],
+  ["9FB3",0x28E97],
+  ["FEAF",0x28EAC],
+  ["FE72",0x28EB2],
+  ["927A",0x28EB3],
+  ["FEAC",0x28ED9],
+  ["95F3",0x28EE7],
+  ["9D58",0x28FC5],
+  ["8D46",0x29079],
+  ["9372",0x29088],
+  ["91C5",0x2908B],
+  ["9642",0x29093],
+  ["90CD",0x290AF],
+  ["95FE",0x290B0],
+  ["9159",0x290B1],
+  ["9C65",0x290C0],
+  ["97CC",0x290E4],
+  ["90CE",0x290E5],
+  ["9D59",0x290EC],
+  ["FCF5",0x290ED],
+  ["FEFD",0x2910D],
+  ["9D5B",0x29110],
+  ["9D5C",0x2913C],
+  ["937E",0x2914D],
+  ["98AC",0x2915B],
+  ["9D5E",0x2915E],
+  ["FDD0",0x29170],
+  ["FD60",0x2919C],
+  ["9CCF",0x291A8],
+  ["90DD",0x291D5],
+  ["90E0",0x291EB],
+  ["90F3",0x2941D],
+  ["98B1",0x29420],
+  ["90F0",0x29433],
+  ["93BD",0x2943F],
+  ["95B7",0x29448],
+  ["9F46",0x294D0],
+  ["8E4B",0x294D9],
+  ["9658",0x294DA],
+  ["8A4C",0x294E5],
+  ["9D63",0x294E7],
+  ["9ECF",0x2959E],
+  ["9D65",0x295B0],
+  ["9D66",0x295B8],
+  ["965A",0x295D7],
+  ["9D64",0x295E9],
+  ["8A6C",0x295F4],
+  ["8AD9",0x29720],
+  ["9D67",0x29732],
+  ["8A70",0x297D4],
+  ["8BF3",0x29810],
+  ["9150",0x29857],
+  ["9CC1",0x298A4],
+  ["9D68",0x298D1],
+  ["93A7",0x298EA],
+  ["9674",0x298F1],
+  ["8CFD",0x298FA],
+  ["A0EF",0x29903],
+  ["9151",0x29905],
+  ["96C1",0x2992F],
+  ["8777",0x29945],
+  ["8C64",0x29947],
+  ["9676",0x29948],
+  ["9D69",0x29949],
+  ["FCA4",0x2995D],
+  ["9D6A",0x2996A],
+  ["924E",0x2999D],
+  ["9D6B",0x299C3],
+  ["9BC1",0x299C9],
+  ["9D6C",0x29A28],
+  ["8A65",0x29A4D],
+  ["915D",0x29B05],
+  ["9D6D",0x29B0E],
+  ["915A",0x29BD5],
+  ["8C42",0x29C73],
+  ["9CC0",0x29CAD],
+  ["916A",0x29D3E],
+  ["9D6E",0x29D5A],
+  ["9EA6",0x29D7C],
+  ["9DCD",0x29D98],
+  ["9D6F",0x29D9B],
+  ["89BB",0x29DF6],
+  ["9EF9",0x29E06],
+  ["96B4",0x29E2D],
+  ["9172",0x29E68],
+  ["9EC8",0x29EAC],
+  ["8771",0x29EB0],
+  ["8B55",0x29EC3],
+  ["9D71",0x29EF8],
+  ["9D72",0x29F23],
+  ["9ECC",0x29F30],
+  ["9174",0x29FB7],
+  ["9ED0",0x29FDE],
+  ["905C",0x2A014],
+  ["8ED2",0x2A087],
+  ["91A8",0x2A0B9],
+  ["9177",0x2A0E1],
+  ["96BF",0x2A0ED],
+  ["96C0",0x2A0F3],
+  ["8FB1",0x2A0F8],
+  ["96B7",0x2A0FE],
+  ["8C55",0x2A107],
+  ["9178",0x2A123],
+  ["89BE",0x2A133],
+  ["917C",0x2A134],
+  ["FB77",0x2A150],
+  ["9175",0x2A192],
+  ["91A3",0x2A193],
+  ["9176",0x2A1AB],
+  ["96BE",0x2A1B4],
+  ["8D49",0x2A1B5],
+  ["9179",0x2A1DF],
+  ["96B6",0x2A1F5],
+  ["91A4",0x2A220],
+  ["91A6",0x2A233],
+  ["9D75",0x2A293],
+  ["9052",0x2A29F],
+  ["A045",0x2A2B2],
+  ["91A9",0x2A2B4],
+  ["98AA",0x2A2B6],
+  ["8C5F",0x2A2BA],
+  ["8BAA",0x2A2BD],
+  ["9CDD",0x2A2DF],
+  ["9D77",0x2A2FF],
+  ["8756",0x2A351],
+  ["8940",0x2A3A9],
+  ["9EEC",0x2A434],
+  ["93AA",0x2A45B],
+  ["9478",0x2A5C6],
+  ["9D7A",0x2A5CB],
+  ["8AC9",0x2A601],
+  ["8B4B",0x2A632],
+  ["9FEC",0x2A64A],
+  ["8AE2",0x2A65B],
+  ["9E75",0x2A6A9],
+  ["9874",0x2F825],
+  ["9AC8",0x2F83B],
+  ["A047",0x2F840],
+  ["8BC3",0x2F878],
+  ["FC48",0x2F894],
+  ["FC77",0x2F8A6],
+  ["9C52",0x2F8CD],
+  ["8EFD",0x2F994],
+  ["8FA8",0x2F9B2],
+  ["957A",0x2F9BC],
+  ["8FF0",0x2F9D4],
+]
+\ No newline at end of file
diff --git a/enc/trans/big5-tbl.rb b/enc/trans/big5-tbl.rb
new file mode 100644
index 0000000000..b093cb0d77
--- /dev/null
+++ b/enc/trans/big5-tbl.rb
@@ -0,0 +1,13705 @@
+BIG5_TO_UCS_TBL= [
+  ["A246",0xA2],
+  ["A247",0xA3],
+  ["A244",0xA5],
+  ["A1B1",0xA7],
+  ["A258",0xB0],
+  ["A1D3",0xB1],
+  ["A150",0xB7],
+  ["A1D1",0xD7],
+  ["A1D2",0xF7],
+  ["A3BE",0x2C7],
+  ["A3BC",0x2C9],
+  ["A3BD",0x2CA],
+  ["A3BF",0x2CB],
+  ["A3BB",0x2D9],
+  ["A344",0x391],
+  ["A345",0x392],
+  ["A346",0x393],
+  ["A347",0x394],
+  ["A348",0x395],
+  ["A349",0x396],
+  ["A34A",0x397],
+  ["A34B",0x398],
+  ["A34C",0x399],
+  ["A34D",0x39A],
+  ["A34E",0x39B],
+  ["A34F",0x39C],
+  ["A350",0x39D],
+  ["A351",0x39E],
+  ["A352",0x39F],
+  ["A353",0x3A0],
+  ["A354",0x3A1],
+  ["A355",0x3A3],
+  ["A356",0x3A4],
+  ["A357",0x3A5],
+  ["A358",0x3A6],
+  ["A359",0x3A7],
+  ["A35A",0x3A8],
+  ["A35B",0x3A9],
+  ["A35C",0x3B1],
+  ["A35D",0x3B2],
+  ["A35E",0x3B3],
+  ["A35F",0x3B4],
+  ["A360",0x3B5],
+  ["A361",0x3B6],
+  ["A362",0x3B7],
+  ["A363",0x3B8],
+  ["A364",0x3B9],
+  ["A365",0x3BA],
+  ["A366",0x3BB],
+  ["A367",0x3BC],
+  ["A368",0x3BD],
+  ["A369",0x3BE],
+  ["A36A",0x3BF],
+  ["A36B",0x3C0],
+  ["A36C",0x3C1],
+  ["A36D",0x3C3],
+  ["A36E",0x3C4],
+  ["A36F",0x3C5],
+  ["A370",0x3C6],
+  ["A371",0x3C7],
+  ["A372",0x3C8],
+  ["A373",0x3C9],
+  ["C7B3",0x401],
+  ["C7B1",0x414],
+  ["C7B2",0x415],
+  ["C7B4",0x416],
+  ["C7B5",0x417],
+  ["C7B6",0x418],
+  ["C7B7",0x419],
+  ["C7B8",0x41A],
+  ["C7B9",0x41B],
+  ["C7BA",0x41C],
+  ["C7BB",0x423],
+  ["C7BC",0x424],
+  ["C7BD",0x425],
+  ["C7BE",0x426],
+  ["C7BF",0x427],
+  ["C7C0",0x428],
+  ["C7C1",0x429],
+  ["C7C2",0x42A],
+  ["C7C3",0x42B],
+  ["C7C4",0x42C],
+  ["C7C5",0x42D],
+  ["C7C6",0x42E],
+  ["C7C7",0x42F],
+  ["C7C8",0x430],
+  ["C7C9",0x431],
+  ["C7CA",0x432],
+  ["C7CB",0x433],
+  ["C7CC",0x434],
+  ["C7CD",0x435],
+  ["C7CF",0x436],
+  ["C7D0",0x437],
+  ["C7D1",0x438],
+  ["C7D2",0x439],
+  ["C7D3",0x43A],
+  ["C7D4",0x43B],
+  ["C7D5",0x43C],
+  ["C7D6",0x43D],
+  ["C7D7",0x43E],
+  ["C7D8",0x43F],
+  ["C7D9",0x440],
+  ["C7DA",0x441],
+  ["C7DB",0x442],
+  ["C7DC",0x443],
+  ["C7DD",0x444],
+  ["C7DE",0x445],
+  ["C7DF",0x446],
+  ["C7E0",0x447],
+  ["C7E1",0x448],
+  ["C7E2",0x449],
+  ["C7E3",0x44A],
+  ["C7E4",0x44B],
+  ["C7E5",0x44C],
+  ["C7E6",0x44D],
+  ["C7E7",0x44E],
+  ["C7E8",0x44F],
+  ["C7CE",0x451],
+  ["A156",0x2013],
+  ["A158",0x2014],
+  ["A1A5",0x2018],
+  ["A1A6",0x2019],
+  ["A1A7",0x201C],
+  ["A1A8",0x201D],
+  ["A145",0x2022],
+  ["A14C",0x2025],
+  ["A14B",0x2026],
+  ["A1AC",0x2032],
+  ["A1AB",0x2035],
+  ["A1B0",0x203B],
+  ["A1C2",0x203E],
+  ["A24A",0x2103],
+  ["A1C1",0x2105],
+  ["A24B",0x2109],
+  ["A2B9",0x2160],
+  ["A2BA",0x2161],
+  ["A2BB",0x2162],
+  ["A2BC",0x2163],
+  ["A2BD",0x2164],
+  ["A2BE",0x2165],
+  ["A2BF",0x2166],
+  ["A2C0",0x2167],
+  ["A2C1",0x2168],
+  ["A2C2",0x2169],
+  ["A1F6",0x2190],
+  ["A1F4",0x2191],
+  ["A1F7",0x2192],
+  ["A1F5",0x2193],
+  ["A1F8",0x2196],
+  ["A1F9",0x2197],
+  ["A1FB",0x2198],
+  ["A1FA",0x2199],
+  ["A1D4",0x221A],
+  ["A1DB",0x221E],
+  ["A1E8",0x221F],
+  ["A1E7",0x2220],
+  ["A1FD",0x2223],
+  ["A1FC",0x2225],
+  ["A1E4",0x2229],
+  ["A1E5",0x222A],
+  ["A1EC",0x222B],
+  ["A1ED",0x222E],
+  ["A1EF",0x2234],
+  ["A1EE",0x2235],
+  ["A1E3",0x223C],
+  ["A1DC",0x2252],
+  ["A1DA",0x2260],
+  ["A1DD",0x2261],
+  ["A1D8",0x2266],
+  ["A1D9",0x2267],
+  ["A1E6",0x22A5],
+  ["A1E9",0x22BF],
+  ["C7E9",0x2460],
+  ["C7EA",0x2461],
+  ["C7EB",0x2462],
+  ["C7EC",0x2463],
+  ["C7ED",0x2464],
+  ["C7EE",0x2465],
+  ["C7EF",0x2466],
+  ["C7F0",0x2467],
+  ["C7F1",0x2468],
+  ["C7F2",0x2469],
+  ["C7F3",0x2474],
+  ["C7F4",0x2475],
+  ["C7F5",0x2476],
+  ["C7F6",0x2477],
+  ["C7F7",0x2478],
+  ["C7F8",0x2479],
+  ["C7F9",0x247A],
+  ["C7FA",0x247B],
+  ["C7FB",0x247C],
+  ["C7FC",0x247D],
+  ["A277",0x2500],
+  ["A278",0x2502],
+  ["A27A",0x250C],
+  ["A27B",0x2510],
+  ["A27C",0x2514],
+  ["A27D",0x2518],
+  ["A275",0x251C],
+  ["A274",0x2524],
+  ["A273",0x252C],
+  ["A272",0x2534],
+  ["A271",0x253C],
+  ["A2A4",0x2550],
+  ["A2A5",0x255E],
+  ["A2A7",0x2561],
+  ["A2A6",0x256A],
+  ["A27E",0x256D],
+  ["A2A1",0x256E],
+  ["A2A3",0x256F],
+  ["A2A2",0x2570],
+  ["A2AC",0x2571],
+  ["A2AD",0x2572],
+  ["A2AE",0x2573],
+  ["A262",0x2581],
+  ["A263",0x2582],
+  ["A264",0x2583],
+  ["A265",0x2584],
+  ["A266",0x2585],
+  ["A267",0x2586],
+  ["A268",0x2587],
+  ["A269",0x2588],
+  ["A270",0x2589],
+  ["A26F",0x258A],
+  ["A26E",0x258B],
+  ["A26D",0x258C],
+  ["A26C",0x258D],
+  ["A26B",0x258E],
+  ["A26A",0x258F],
+  ["A276",0x2594],
+  ["A279",0x2595],
+  ["A1BD",0x25A0],
+  ["A1BC",0x25A1],
+  ["A1B6",0x25B2],
+  ["A1B5",0x25B3],
+  ["A1BF",0x25BC],
+  ["A1BE",0x25BD],
+  ["A1BB",0x25C6],
+  ["A1BA",0x25C7],
+  ["A1B3",0x25CB],
+  ["A1B7",0x25CE],
+  ["A1B4",0x25CF],
+  ["A2A8",0x25E2],
+  ["A2A9",0x25E3],
+  ["A2AB",0x25E4],
+  ["A2AA",0x25E5],
+  ["A1B9",0x2605],
+  ["A1B8",0x2606],
+  ["A1F3",0x2609],
+  ["A1F0",0x2640],
+  ["A1F2",0x2641],
+  ["A1F1",0x2642],
+  ["A140",0x3000],
+  ["A142",0x3001],
+  ["A143",0x3002],
+  ["A1B2",0x3003],
+  ["C6A4",0x3005],
+  ["A171",0x3008],
+  ["A172",0x3009],
+  ["A16D",0x300A],
+  ["A16E",0x300B],
+  ["A175",0x300C],
+  ["A176",0x300D],
+  ["A179",0x300E],
+  ["A17A",0x300F],
+  ["A169",0x3010],
+  ["A16A",0x3011],
+  ["A245",0x3012],
+  ["A165",0x3014],
+  ["A166",0x3015],
+  ["A1A9",0x301D],
+  ["A1AA",0x301E],
+  ["A2C3",0x3021],
+  ["A2C4",0x3022],
+  ["A2C5",0x3023],
+  ["A2C6",0x3024],
+  ["A2C7",0x3025],
+  ["A2C8",0x3026],
+  ["A2C9",0x3027],
+  ["A2CA",0x3028],
+  ["A2CB",0x3029],
+  ["C6A5",0x3041],
+  ["C6A6",0x3042],
+  ["C6A7",0x3043],
+  ["C6A8",0x3044],
+  ["C6A9",0x3045],
+  ["C6AA",0x3046],
+  ["C6AB",0x3047],
+  ["C6AC",0x3048],
+  ["C6AD",0x3049],
+  ["C6AE",0x304A],
+  ["C6AF",0x304B],
+  ["C6B0",0x304C],
+  ["C6B1",0x304D],
+  ["C6B2",0x304E],
+  ["C6B3",0x304F],
+  ["C6B4",0x3050],
+  ["C6B5",0x3051],
+  ["C6B6",0x3052],
+  ["C6B7",0x3053],
+  ["C6B8",0x3054],
+  ["C6B9",0x3055],
+  ["C6BA",0x3056],
+  ["C6BB",0x3057],
+  ["C6BC",0x3058],
+  ["C6BD",0x3059],
+  ["C6BE",0x305A],
+  ["C6BF",0x305B],
+  ["C6C0",0x305C],
+  ["C6C1",0x305D],
+  ["C6C2",0x305E],
+  ["C6C3",0x305F],
+  ["C6C4",0x3060],
+  ["C6C5",0x3061],
+  ["C6C6",0x3062],
+  ["C6C7",0x3063],
+  ["C6C8",0x3064],
+  ["C6C9",0x3065],
+  ["C6CA",0x3066],
+  ["C6CB",0x3067],
+  ["C6CC",0x3068],
+  ["C6CD",0x3069],
+  ["C6CE",0x306A],
+  ["C6CF",0x306B],
+  ["C6D0",0x306C],
+  ["C6D1",0x306D],
+  ["C6D2",0x306E],
+  ["C6D3",0x306F],
+  ["C6D4",0x3070],
+  ["C6D5",0x3071],
+  ["C6D6",0x3072],
+  ["C6D7",0x3073],
+  ["C6D8",0x3074],
+  ["C6D9",0x3075],
+  ["C6DA",0x3076],
+  ["C6DB",0x3077],
+  ["C6DC",0x3078],
+  ["C6DD",0x3079],
+  ["C6DE",0x307A],
+  ["C6DF",0x307B],
+  ["C6E0",0x307C],
+  ["C6E1",0x307D],
+  ["C6E2",0x307E],
+  ["C6E3",0x307F],
+  ["C6E4",0x3080],
+  ["C6E5",0x3081],
+  ["C6E6",0x3082],
+  ["C6E7",0x3083],
+  ["C6E8",0x3084],
+  ["C6E9",0x3085],
+  ["C6EA",0x3086],
+  ["C6EB",0x3087],
+  ["C6EC",0x3088],
+  ["C6ED",0x3089],
+  ["C6EE",0x308A],
+  ["C6EF",0x308B],
+  ["C6F0",0x308C],
+  ["C6F1",0x308D],
+  ["C6F2",0x308E],
+  ["C6F3",0x308F],
+  ["C6F4",0x3090],
+  ["C6F5",0x3091],
+  ["C6F6",0x3092],
+  ["C6F7",0x3093],
+  ["C6A2",0x309D],
+  ["C6A3",0x309E],
+  ["C6F8",0x30A1],
+  ["C6F9",0x30A2],
+  ["C6FA",0x30A3],
+  ["C6FB",0x30A4],
+  ["C6FC",0x30A5],
+  ["C6FD",0x30A6],
+  ["C6FE",0x30A7],
+  ["C740",0x30A8],
+  ["C741",0x30A9],
+  ["C742",0x30AA],
+  ["C743",0x30AB],
+  ["C744",0x30AC],
+  ["C745",0x30AD],
+  ["C746",0x30AE],
+  ["C747",0x30AF],
+  ["C748",0x30B0],
+  ["C749",0x30B1],
+  ["C74A",0x30B2],
+  ["C74B",0x30B3],
+  ["C74C",0x30B4],
+  ["C74D",0x30B5],
+  ["C74E",0x30B6],
+  ["C74F",0x30B7],
+  ["C750",0x30B8],
+  ["C751",0x30B9],
+  ["C752",0x30BA],
+  ["C753",0x30BB],
+  ["C754",0x30BC],
+  ["C755",0x30BD],
+  ["C756",0x30BE],
+  ["C757",0x30BF],
+  ["C758",0x30C0],
+  ["C759",0x30C1],
+  ["C75A",0x30C2],
+  ["C75B",0x30C3],
+  ["C75C",0x30C4],
+  ["C75D",0x30C5],
+  ["C75E",0x30C6],
+  ["C75F",0x30C7],
+  ["C760",0x30C8],
+  ["C761",0x30C9],
+  ["C762",0x30CA],
+  ["C763",0x30CB],
+  ["C764",0x30CC],
+  ["C765",0x30CD],
+  ["C766",0x30CE],
+  ["C767",0x30CF],
+  ["C768",0x30D0],
+  ["C769",0x30D1],
+  ["C76A",0x30D2],
+  ["C76B",0x30D3],
+  ["C76C",0x30D4],
+  ["C76D",0x30D5],
+  ["C76E",0x30D6],
+  ["C76F",0x30D7],
+  ["C770",0x30D8],
+  ["C771",0x30D9],
+  ["C772",0x30DA],
+  ["C773",0x30DB],
+  ["C774",0x30DC],
+  ["C775",0x30DD],
+  ["C776",0x30DE],
+  ["C777",0x30DF],
+  ["C778",0x30E0],
+  ["C779",0x30E1],
+  ["C77A",0x30E2],
+  ["C77B",0x30E3],
+  ["C77C",0x30E4],
+  ["C77D",0x30E5],
+  ["C77E",0x30E6],
+  ["C7A1",0x30E7],
+  ["C7A2",0x30E8],
+  ["C7A3",0x30E9],
+  ["C7A4",0x30EA],
+  ["C7A5",0x30EB],
+  ["C7A6",0x30EC],
+  ["C7A7",0x30ED],
+  ["C7A8",0x30EE],
+  ["C7A9",0x30EF],
+  ["C7AA",0x30F0],
+  ["C7AB",0x30F1],
+  ["C7AC",0x30F2],
+  ["C7AD",0x30F3],
+  ["C7AE",0x30F4],
+  ["C7AF",0x30F5],
+  ["C7B0",0x30F6],
+  ["C6A1",0x30FE],
+  ["A374",0x3105],
+  ["A375",0x3106],
+  ["A376",0x3107],
+  ["A377",0x3108],
+  ["A378",0x3109],
+  ["A379",0x310A],
+  ["A37A",0x310B],
+  ["A37B",0x310C],
+  ["A37C",0x310D],
+  ["A37D",0x310E],
+  ["A37E",0x310F],
+  ["A3A1",0x3110],
+  ["A3A2",0x3111],
+  ["A3A3",0x3112],
+  ["A3A4",0x3113],
+  ["A3A5",0x3114],
+  ["A3A6",0x3115],
+  ["A3A7",0x3116],
+  ["A3A8",0x3117],
+  ["A3A9",0x3118],
+  ["A3AA",0x3119],
+  ["A3AB",0x311A],
+  ["A3AC",0x311B],
+  ["A3AD",0x311C],
+  ["A3AE",0x311D],
+  ["A3AF",0x311E],
+  ["A3B0",0x311F],
+  ["A3B1",0x3120],
+  ["A3B2",0x3121],
+  ["A3B3",0x3122],
+  ["A3B4",0x3123],
+  ["A3B5",0x3124],
+  ["A3B6",0x3125],
+  ["A3B7",0x3126],
+  ["A3B8",0x3127],
+  ["A3B9",0x3128],
+  ["A3BA",0x3129],
+  ["A1C0",0x32A3],
+  ["A255",0x338E],
+  ["A256",0x338F],
+  ["A250",0x339C],
+  ["A251",0x339D],
+  ["A252",0x339E],
+  ["A254",0x33A1],
+  ["A257",0x33C4],
+  ["A253",0x33CE],
+  ["A1EB",0x33D1],
+  ["A1EA",0x33D2],
+  ["A24F",0x33D5],
+  ["A440",0x4E00],
+  ["A442",0x4E01],
+  ["A443",0x4E03],
+  ["C945",0x4E07],
+  ["A456",0x4E08],
+  ["A454",0x4E09],
+  ["A457",0x4E0A],
+  ["A455",0x4E0B],
+  ["C946",0x4E0C],
+  ["A4A3",0x4E0D],
+  ["C94F",0x4E0E],
+  ["C94D",0x4E0F],
+  ["A4A2",0x4E10],
+  ["A4A1",0x4E11],
+  ["A542",0x4E14],
+  ["A541",0x4E15],
+  ["A540",0x4E16],
+  ["A543",0x4E18],
+  ["A4FE",0x4E19],
+  ["A5E0",0x4E1E],
+  ["A5E1",0x4E1F],
+  ["A8C3",0x4E26],
+  ["A458",0x4E2B],
+  ["A4A4",0x4E2D],
+  ["C950",0x4E2E],
+  ["A4A5",0x4E30],
+  ["C963",0x4E31],
+  ["A6EA",0x4E32],
+  ["CBB1",0x4E33],
+  ["A459",0x4E38],
+  ["A4A6",0x4E39],
+  ["A544",0x4E3B],
+  ["C964",0x4E3C],
+  ["C940",0x4E42],
+  ["A444",0x4E43],
+  ["A45B",0x4E45],
+  ["C947",0x4E47],
+  ["A45C",0x4E48],
+  ["A4A7",0x4E4B],
+  ["A545",0x4E4D],
+  ["A547",0x4E4E],
+  ["A546",0x4E4F],
+  ["A5E2",0x4E52],
+  ["A5E3",0x4E53],
+  ["A8C4",0x4E56],
+  ["ADBC",0x4E58],
+  ["A441",0x4E59],
+  ["C941",0x4E5C],
+  ["A445",0x4E5D],
+  ["A45E",0x4E5E],
+  ["A45D",0x4E5F],
+  ["A5E4",0x4E69],
+  ["A8C5",0x4E73],
+  ["B0AE",0x4E7E],
+  ["D44B",0x4E7F],
+  ["B6C3",0x4E82],
+  ["DCB1",0x4E83],
+  ["DCB2",0x4E84],
+  ["A446",0x4E86],
+  ["A4A9",0x4E88],
+  ["A8C6",0x4E8B],
+  ["A447",0x4E8C],
+  ["C948",0x4E8D],
+  ["A45F",0x4E8E],
+  ["A4AA",0x4E91],
+  ["A4AC",0x4E92],
+  ["C951",0x4E93],
+  ["A4AD",0x4E94],
+  ["A4AB",0x4E95],
+  ["A5E5",0x4E99],
+  ["A8C7",0x4E9B],
+  ["A8C8",0x4E9E],
+  ["AB45",0x4E9F],
+  ["A460",0x4EA1],
+  ["A4AE",0x4EA2],
+  ["A5E6",0x4EA4],
+  ["A5E8",0x4EA5],
+  ["A5E7",0x4EA6],
+  ["A6EB",0x4EA8],
+  ["A8C9",0x4EAB],
+  ["A8CA",0x4EAC],
+  ["AB46",0x4EAD],
+  ["AB47",0x4EAE],
+  ["ADBD",0x4EB3],
+  ["DCB3",0x4EB6],
+  ["F6D6",0x4EB9],
+  ["A448",0x4EBA],
+  ["A4B0",0x4EC0],
+  ["A4AF",0x4EC1],
+  ["C952",0x4EC2],
+  ["A4B1",0x4EC3],
+  ["A4B7",0x4EC4],
+  ["A4B2",0x4EC6],
+  ["A4B3",0x4EC7],
+  ["C954",0x4EC8],
+  ["C953",0x4EC9],
+  ["A4B5",0x4ECA],
+  ["A4B6",0x4ECB],
+  ["A4B4",0x4ECD],
+  ["A54A",0x4ED4],
+  ["A54B",0x4ED5],
+  ["A54C",0x4ED6],
+  ["A54D",0x4ED7],
+  ["A549",0x4ED8],
+  ["A550",0x4ED9],
+  ["C96A",0x4EDA],
+  ["C966",0x4EDC],
+  ["C969",0x4EDD],
+  ["A551",0x4EDE],
+  ["A561",0x4EDF],
+  ["C968",0x4EE1],
+  ["A54E",0x4EE3],
+  ["A54F",0x4EE4],
+  ["A548",0x4EE5],
+  ["C965",0x4EE8],
+  ["C967",0x4EE9],
+  ["A5F5",0x4EF0],
+  ["C9B0",0x4EF1],
+  ["A5F2",0x4EF2],
+  ["A5F6",0x4EF3],
+  ["C9BA",0x4EF4],
+  ["C9AE",0x4EF5],
+  ["A5F3",0x4EF6],
+  ["C9B2",0x4EF7],
+  ["A5F4",0x4EFB],
+  ["A5F7",0x4EFD],
+  ["A5E9",0x4EFF],
+  ["C9B1",0x4F00],
+  ["A5F8",0x4F01],
+  ["C9B5",0x4F02],
+  ["C9B9",0x4F04],
+  ["C9B6",0x4F05],
+  ["C9B3",0x4F08],
+  ["A5EA",0x4F09],
+  ["A5EC",0x4F0A],
+  ["A5F9",0x4F0B],
+  ["A5EE",0x4F0D],
+  ["C9AB",0x4F0E],
+  ["A5F1",0x4F0F],
+  ["A5EF",0x4F10],
+  ["A5F0",0x4F11],
+  ["C9BB",0x4F12],
+  ["C9B8",0x4F13],
+  ["C9AF",0x4F14],
+  ["A5ED",0x4F15],
+  ["C9AC",0x4F18],
+  ["A5EB",0x4F19],
+  ["C9B4",0x4F1D],
+  ["C9B7",0x4F22],
+  ["C9AD",0x4F2C],
+  ["CA66",0x4F2D],
+  ["A742",0x4F2F],
+  ["A6F4",0x4F30],
+  ["CA67",0x4F33],
+  ["A6F1",0x4F34],
+  ["A744",0x4F36],
+  ["A6F9",0x4F38],
+  ["A6F8",0x4F3A],
+  ["CA5B",0x4F3B],
+  ["A6FC",0x4F3C],
+  ["A6F7",0x4F3D],
+  ["CA60",0x4F3E],
+  ["CA68",0x4F3F],
+  ["CA64",0x4F41],
+  ["A6FA",0x4F43],
+  ["A6FD",0x4F46],
+  ["A6EE",0x4F47],
+  ["A747",0x4F48],
+  ["CA5D",0x4F49],
+  ["CBBD",0x4F4C],
+  ["A6EC",0x4F4D],
+  ["A743",0x4F4E],
+  ["A6ED",0x4F4F],
+  ["A6F5",0x4F50],
+  ["A6F6",0x4F51],
+  ["CA62",0x4F52],
+  ["CA5E",0x4F53],
+  ["A6FB",0x4F54],
+  ["A6F3",0x4F55],
+  ["CA5A",0x4F56],
+  ["A6EF",0x4F57],
+  ["CA65",0x4F58],
+  ["A745",0x4F59],
+  ["A748",0x4F5A],
+  ["A6F2",0x4F5B],
+  ["A740",0x4F5C],
+  ["A746",0x4F5D],
+  ["A6F0",0x4F5E],
+  ["CA63",0x4F5F],
+  ["A741",0x4F60],
+  ["CA69",0x4F61],
+  ["CA5C",0x4F62],
+  ["A6FE",0x4F63],
+  ["CA5F",0x4F64],
+  ["CA61",0x4F67],
+  ["A8D8",0x4F69],
+  ["CBBF",0x4F6A],
+  ["CBCB",0x4F6B],
+  ["A8D0",0x4F6C],
+  ["CBCC",0x4F6E],
+  ["A8CB",0x4F6F],
+  ["A8D5",0x4F70],
+  ["A8CE",0x4F73],
+  ["CBB9",0x4F74],
+  ["A8D6",0x4F75],
+  ["CBB8",0x4F76],
+  ["CBBC",0x4F77],
+  ["CBC3",0x4F78],
+  ["CBC1",0x4F79],
+  ["A8DE",0x4F7A],
+  ["A8D9",0x4F7B],
+  ["CBB3",0x4F7C],
+  ["CBB5",0x4F7D],
+  ["A8DB",0x4F7E],
+  ["A8CF",0x4F7F],
+  ["CBB6",0x4F80],
+  ["CBC2",0x4F81],
+  ["CBC9",0x4F82],
+  ["A8D4",0x4F83],
+  ["CBBB",0x4F84],
+  ["CBB4",0x4F85],
+  ["A8D3",0x4F86],
+  ["CBB7",0x4F87],
+  ["A8D7",0x4F88],
+  ["CBBA",0x4F89],
+  ["A8D2",0x4F8B],
+  ["A8CD",0x4F8D],
+  ["A8DC",0x4F8F],
+  ["CBC4",0x4F90],
+  ["A8DD",0x4F91],
+  ["CBC8",0x4F92],
+  ["CBC6",0x4F94],
+  ["CBCA",0x4F95],
+  ["A8DA",0x4F96],
+  ["CBBE",0x4F97],
+  ["CBB2",0x4F98],
+  ["CBC0",0x4F9A],
+  ["A8D1",0x4F9B],
+  ["CBC5",0x4F9C],
+  ["A8CC",0x4F9D],
+  ["CBC7",0x4F9E],
+  ["AB56",0x4FAE],
+  ["AB4A",0x4FAF],
+  ["CDE0",0x4FB2],
+  ["CDE8",0x4FB3],
+  ["AB49",0x4FB5],
+  ["AB51",0x4FB6],
+  ["AB5D",0x4FB7],
+  ["CDEE",0x4FB9],
+  ["CDEC",0x4FBA],
+  ["CDE7",0x4FBB],
+  ["AB4B",0x4FBF],
+  ["CDED",0x4FC0],
+  ["CDE3",0x4FC1],
+  ["AB59",0x4FC2],
+  ["AB50",0x4FC3],
+  ["AB58",0x4FC4],
+  ["CDDE",0x4FC5],
+  ["CDEA",0x4FC7],
+  ["CDE1",0x4FC9],
+  ["AB54",0x4FCA],
+  ["CDE2",0x4FCB],
+  ["CDDD",0x4FCD],
+  ["AB5B",0x4FCE],
+  ["AB4E",0x4FCF],
+  ["AB57",0x4FD0],
+  ["AB4D",0x4FD1],
+  ["CDDF",0x4FD3],
+  ["CDE4",0x4FD4],
+  ["CDEB",0x4FD6],
+  ["AB55",0x4FD7],
+  ["AB52",0x4FD8],
+  ["CDE6",0x4FD9],
+  ["AB5A",0x4FDA],
+  ["CDE9",0x4FDB],
+  ["CDE5",0x4FDC],
+  ["AB4F",0x4FDD],
+  ["AB5C",0x4FDE],
+  ["AB53",0x4FDF],
+  ["AB4C",0x4FE0],
+  ["AB48",0x4FE1],
+  ["CDEF",0x4FEC],
+  ["ADD7",0x4FEE],
+  ["ADC1",0x4FEF],
+  ["ADD1",0x4FF1],
+  ["ADD6",0x4FF3],
+  ["D0D0",0x4FF4],
+  ["D0CF",0x4FF5],
+  ["D0D4",0x4FF6],
+  ["D0D5",0x4FF7],
+  ["ADC4",0x4FF8],
+  ["ADCD",0x4FFA],
+  ["ADDA",0x4FFE],
+  ["ADCE",0x5000],
+  ["D0C9",0x5005],
+  ["ADC7",0x5006],
+  ["D0CA",0x5007],
+  ["ADDC",0x5009],
+  ["ADD3",0x500B],
+  ["ADBE",0x500C],
+  ["ADBF",0x500D],
+  ["D0DD",0x500E],
+  ["B0BF",0x500F],
+  ["ADCC",0x5011],
+  ["ADCB",0x5012],
+  ["D0CB",0x5013],
+  ["ADCF",0x5014],
+  ["D45B",0x5015],
+  ["ADC6",0x5016],
+  ["D0D6",0x5017],
+  ["ADD5",0x5018],
+  ["ADD4",0x5019],
+  ["ADCA",0x501A],
+  ["D0CE",0x501B],
+  ["D0D7",0x501C],
+  ["D0C8",0x501E],
+  ["ADC9",0x501F],
+  ["D0D8",0x5020],
+  ["ADD2",0x5021],
+  ["D0CC",0x5022],
+  ["ADC0",0x5023],
+  ["ADC3",0x5025],
+  ["ADC2",0x5026],
+  ["D0D9",0x5027],
+  ["ADD0",0x5028],
+  ["ADC5",0x5029],
+  ["ADD9",0x502A],
+  ["ADDB",0x502B],
+  ["D0D3",0x502C],
+  ["ADD8",0x502D],
+  ["D0DB",0x502F],
+  ["D0CD",0x5030],
+  ["D0DC",0x5031],
+  ["D0D1",0x5033],
+  ["D0DA",0x5035],
+  ["D0D2",0x5037],
+  ["ADC8",0x503C],
+  ["D463",0x5040],
+  ["D457",0x5041],
+  ["B0B3",0x5043],
+  ["D45C",0x5045],
+  ["D462",0x5046],
+  ["B0B2",0x5047],
+  ["D455",0x5048],
+  ["B0B6",0x5049],
+  ["D459",0x504A],
+  ["D452",0x504B],
+  ["B0B4",0x504C],
+  ["D456",0x504D],
+  ["B0B9",0x504E],
+  ["B0BE",0x504F],
+  ["D467",0x5051],
+  ["D451",0x5053],
+  ["B0BA",0x5055],
+  ["D466",0x5057],
+  ["B0B5",0x505A],
+  ["D458",0x505B],
+  ["B0B1",0x505C],
+  ["D453",0x505D],
+  ["D44F",0x505E],
+  ["D45D",0x505F],
+  ["D450",0x5060],
+  ["D44E",0x5061],
+  ["D45A",0x5062],
+  ["D460",0x5063],
+  ["D461",0x5064],
+  ["B0B7",0x5065],
+  ["D85B",0x5068],
+  ["D45E",0x5069],
+  ["D44D",0x506A],
+  ["D45F",0x506B],
+  ["B0C1",0x506D],
+  ["D464",0x506E],
+  ["B0C0",0x506F],
+  ["D44C",0x5070],
+  ["D454",0x5072],
+  ["D465",0x5073],
+  ["B0BC",0x5074],
+  ["B0BB",0x5075],
+  ["B0B8",0x5076],
+  ["B0BD",0x5077],
+  ["B0AF",0x507A],
+  ["B0B0",0x507D],
+  ["B3C8",0x5080],
+  ["D85E",0x5082],
+  ["D857",0x5083],
+  ["B3C5",0x5085],
+  ["D85F",0x5087],
+  ["D855",0x508B],
+  ["D858",0x508C],
+  ["B3C4",0x508D],
+  ["D859",0x508E],
+  ["B3C7",0x5091],
+  ["D85D",0x5092],
+  ["D853",0x5094],
+  ["D852",0x5095],
+  ["B3C9",0x5096],
+  ["B3CA",0x5098],
+  ["B3C6",0x5099],
+  ["B3CB",0x509A],
+  ["D851",0x509B],
+  ["D85C",0x509C],
+  ["D85A",0x509D],
+  ["D854",0x509E],
+  ["B3C3",0x50A2],
+  ["D856",0x50A3],
+  ["B6CA",0x50AC],
+  ["B6C4",0x50AD],
+  ["DCB7",0x50AE],
+  ["B6CD",0x50AF],
+  ["DCBD",0x50B0],
+  ["DCC0",0x50B1],
+  ["B6C6",0x50B2],
+  ["B6C7",0x50B3],
+  ["DCBA",0x50B4],
+  ["B6C5",0x50B5],
+  ["DCC3",0x50B6],
+  ["B6CB",0x50B7],
+  ["DCC4",0x50B8],
+  ["DCBF",0x50BA],
+  ["B6CC",0x50BB],
+  ["DCB4",0x50BD],
+  ["B6C9",0x50BE],
+  ["DCB5",0x50BF],
+  ["DCBE",0x50C1],
+  ["DCBC",0x50C2],
+  ["DCB8",0x50C4],
+  ["B6C8",0x50C5],
+  ["DCB6",0x50C6],
+  ["B6CE",0x50C7],
+  ["DCBB",0x50C8],
+  ["DCC2",0x50C9],
+  ["DCB9",0x50CA],
+  ["DCC1",0x50CB],
+  ["B9B6",0x50CE],
+  ["B9B3",0x50CF],
+  ["B9B4",0x50D1],
+  ["E0F9",0x50D3],
+  ["E0F1",0x50D4],
+  ["B9B2",0x50D5],
+  ["B9AF",0x50D6],
+  ["E0F2",0x50D7],
+  ["B9B1",0x50DA],
+  ["E0F5",0x50DB],
+  ["E0F7",0x50DD],
+  ["E0FE",0x50E0],
+  ["E0FD",0x50E3],
+  ["E0F8",0x50E4],
+  ["B9AE",0x50E5],
+  ["E0F0",0x50E6],
+  ["B9AC",0x50E7],
+  ["E0F3",0x50E8],
+  ["B9B7",0x50E9],
+  ["E0F6",0x50EA],
+  ["E0FA",0x50EC],
+  ["B9B0",0x50ED],
+  ["B9AD",0x50EE],
+  ["E0FC",0x50EF],
+  ["E0FB",0x50F0],
+  ["B9B5",0x50F1],
+  ["E0F4",0x50F3],
+  ["BBF8",0x50F5],
+  ["E4EC",0x50F6],
+  ["E4E9",0x50F8],
+  ["BBF9",0x50F9],
+  ["BBF7",0x50FB],
+  ["E4F0",0x50FD],
+  ["E4ED",0x50FE],
+  ["E4E6",0x50FF],
+  ["BBF6",0x5100],
+  ["BBFA",0x5102],
+  ["E4E7",0x5103],
+  ["BBF5",0x5104],
+  ["BBFD",0x5105],
+  ["E4EA",0x5106],
+  ["E4EB",0x5107],
+  ["BBFB",0x5108],
+  ["BBFC",0x5109],
+  ["E4F1",0x510A],
+  ["E4EE",0x510B],
+  ["E4EF",0x510C],
+  ["BEAA",0x5110],
+  ["E8F8",0x5111],
+  ["BEA7",0x5112],
+  ["E8F5",0x5113],
+  ["BEA9",0x5114],
+  ["BEAB",0x5115],
+  ["E8F6",0x5117],
+  ["BEA8",0x5118],
+  ["E8F7",0x511A],
+  ["E8F4",0x511C],
+  ["C076",0x511F],
+  ["ECBD",0x5120],
+  ["C077",0x5121],
+  ["ECBB",0x5122],
+  ["ECBC",0x5124],
+  ["ECBA",0x5125],
+  ["ECB9",0x5126],
+  ["ECBE",0x5129],
+  ["C075",0x512A],
+  ["EFB8",0x512D],
+  ["EFB9",0x512E],
+  ["E4E8",0x5130],
+  ["EFB7",0x5131],
+  ["C078",0x5132],
+  ["C35F",0x5133],
+  ["F1EB",0x5134],
+  ["F1EC",0x5135],
+  ["C4D7",0x5137],
+  ["C4D8",0x5138],
+  ["F5C1",0x5139],
+  ["F5C0",0x513A],
+  ["C56C",0x513B],
+  ["C56B",0x513C],
+  ["F7D0",0x513D],
+  ["A449",0x513F],
+  ["A461",0x5140],
+  ["A4B9",0x5141],
+  ["A4B8",0x5143],
+  ["A553",0x5144],
+  ["A552",0x5145],
+  ["A5FC",0x5146],
+  ["A5FB",0x5147],
+  ["A5FD",0x5148],
+  ["A5FA",0x5149],
+  ["A74A",0x514B],
+  ["A749",0x514C],
+  ["A74B",0x514D],
+  ["A8E0",0x5152],
+  ["A8DF",0x5154],
+  ["A8E1",0x5155],
+  ["AB5E",0x5157],
+  ["A259",0x5159],
+  ["D0DE",0x515A],
+  ["A25A",0x515B],
+  ["B0C2",0x515C],
+  ["A25C",0x515D],
+  ["A25B",0x515E],
+  ["D860",0x515F],
+  ["A25D",0x5161],
+  ["B9B8",0x5162],
+  ["A25E",0x5163],
+  ["A44A",0x5165],
+  ["A4BA",0x5167],
+  ["A5FE",0x5168],
+  ["A8E2",0x5169],
+  ["A44B",0x516B],
+  ["A4BD",0x516C],
+  ["A4BB",0x516D],
+  ["A4BC",0x516E],
+  ["A640",0x5171],
+  ["A74C",0x5175],
+  ["A8E4",0x5176],
+  ["A8E3",0x5177],
+  ["A8E5",0x5178],
+  ["ADDD",0x517C],
+  ["BEAC",0x5180],
+  ["C94E",0x5187],
+  ["A554",0x5189],
+  ["A555",0x518A],
+  ["A641",0x518D],
+  ["CA6A",0x518F],
+  ["AB60",0x5191],
+  ["AB5F",0x5192],
+  ["D0E0",0x5193],
+  ["D0DF",0x5194],
+  ["B0C3",0x5195],
+  ["A4BE",0x5197],
+  ["C955",0x5198],
+  ["CBCD",0x519E],
+  ["AB61",0x51A0],
+  ["ADE0",0x51A2],
+  ["ADDE",0x51A4],
+  ["ADDF",0x51A5],
+  ["BEAD",0x51AA],
+  ["A556",0x51AC],
+  ["A642",0x51B0],
+  ["C9BC",0x51B1],
+  ["A74D",0x51B6],
+  ["A74E",0x51B7],
+  ["CA6B",0x51B9],
+  ["CBCE",0x51BC],
+  ["A8E6",0x51BD],
+  ["CBCF",0x51BE],
+  ["D0E2",0x51C4],
+  ["D0E3",0x51C5],
+  ["ADE3",0x51C6],
+  ["D0E4",0x51C8],
+  ["D0E1",0x51CA],
+  ["ADE4",0x51CB],
+  ["ADE2",0x51CC],
+  ["ADE1",0x51CD],
+  ["D0E5",0x51CE],
+  ["D468",0x51D0],
+  ["D861",0x51D4],
+  ["DCC5",0x51D7],
+  ["E140",0x51D8],
+  ["BBFE",0x51DC],
+  ["BEAE",0x51DD],
+  ["E8F9",0x51DE],
+  ["A44C",0x51E0],
+  ["A45A",0x51E1],
+  ["B0C4",0x51F0],
+  ["B3CD",0x51F1],
+  ["B9B9",0x51F3],
+  ["C942",0x51F5],
+  ["A4BF",0x51F6],
+  ["A559",0x51F8],
+  ["A557",0x51F9],
+  ["A558",0x51FA],
+  ["A8E7",0x51FD],
+  ["A44D",0x5200],
+  ["A44E",0x5201],
+  ["A462",0x5203],
+  ["A4C0",0x5206],
+  ["A4C1",0x5207],
+  ["A4C2",0x5208],
+  ["C9BE",0x5209],
+  ["A55A",0x520A],
+  ["C96B",0x520C],
+  ["A646",0x520E],
+  ["C9BF",0x5210],
+  ["A644",0x5211],
+  ["A645",0x5212],
+  ["C9BD",0x5213],
+  ["A647",0x5216],
+  ["A643",0x5217],
+  ["CA6C",0x521C],
+  ["AAEC",0x521D],
+  ["CA6D",0x521E],
+  ["CA6E",0x5221],
+  ["A750",0x5224],
+  ["A74F",0x5225],
+  ["A753",0x5228],
+  ["A751",0x5229],
+  ["A752",0x522A],
+  ["A8ED",0x522E],
+  ["A8EC",0x5230],
+  ["CBD4",0x5231],
+  ["CBD1",0x5232],
+  ["CBD2",0x5233],
+  ["CBD0",0x5235],
+  ["A8EE",0x5236],
+  ["A8EA",0x5237],
+  ["A8E9",0x5238],
+  ["A8EB",0x523A],
+  ["A8E8",0x523B],
+  ["A8EF",0x5241],
+  ["AB63",0x5243],
+  ["CDF0",0x5244],
+  ["CBD3",0x5246],
+  ["AB68",0x5247],
+  ["CDF1",0x5249],
+  ["AB64",0x524A],
+  ["AB67",0x524B],
+  ["AB66",0x524C],
+  ["AB65",0x524D],
+  ["AB62",0x524E],
+  ["D0E8",0x5252],
+  ["ADE7",0x5254],
+  ["D0EB",0x5255],
+  ["ADE5",0x5256],
+  ["D0E7",0x525A],
+  ["ADE8",0x525B],
+  ["ADE6",0x525C],
+  ["ADE9",0x525D],
+  ["D0E9",0x525E],
+  ["D0EA",0x525F],
+  ["D0E6",0x5261],
+  ["D0EC",0x5262],
+  ["B3D1",0x5269],
+  ["B0C5",0x526A],
+  ["D469",0x526B],
+  ["D46B",0x526C],
+  ["D46A",0x526D],
+  ["D46C",0x526E],
+  ["B0C6",0x526F],
+  ["B3CE",0x5272],
+  ["B3CF",0x5274],
+  ["B3D0",0x5275],
+  ["B6D0",0x5277],
+  ["DCC7",0x5278],
+  ["DCC6",0x527A],
+  ["DCC8",0x527B],
+  ["DCC9",0x527C],
+  ["B6D1",0x527D],
+  ["B6CF",0x527F],
+  ["E141",0x5280],
+  ["E142",0x5281],
+  ["B9BB",0x5282],
+  ["B9BA",0x5283],
+  ["E35A",0x5284],
+  ["BC40",0x5287],
+  ["BC41",0x5288],
+  ["BC42",0x5289],
+  ["BC44",0x528A],
+  ["E4F2",0x528B],
+  ["E4F3",0x528C],
+  ["BC43",0x528D],
+  ["BEAF",0x5291],
+  ["BEB0",0x5293],
+  ["F1ED",0x5296],
+  ["F5C3",0x5297],
+  ["F5C2",0x5298],
+  ["F7D1",0x5299],
+  ["A44F",0x529B],
+  ["A55C",0x529F],
+  ["A55B",0x52A0],
+  ["A648",0x52A3],
+  ["C9C0",0x52A6],
+  ["A755",0x52A9],
+  ["A756",0x52AA],
+  ["A754",0x52AB],
+  ["A757",0x52AC],
+  ["CA6F",0x52AD],
+  ["CA70",0x52AE],
+  ["A8F1",0x52BB],
+  ["CBD5",0x52BC],
+  ["A8F0",0x52BE],
+  ["CDF2",0x52C0],
+  ["AB6C",0x52C1],
+  ["CDF3",0x52C2],
+  ["AB6B",0x52C3],
+  ["AB69",0x52C7],
+  ["AB6A",0x52C9],
+  ["D0ED",0x52CD],
+  ["B0C7",0x52D2],
+  ["D46E",0x52D3],
+  ["B0CA",0x52D5],
+  ["D46D",0x52D6],
+  ["B1E5",0x52D7],
+  ["B0C9",0x52D8],
+  ["B0C8",0x52D9],
+  ["B3D4",0x52DB],
+  ["B3D3",0x52DD],
+  ["B3D2",0x52DE],
+  ["B6D2",0x52DF],
+  ["B6D5",0x52E2],
+  ["B6D6",0x52E3],
+  ["B6D4",0x52E4],
+  ["B6D3",0x52E6],
+  ["E143",0x52E9],
+  ["E144",0x52EB],
+  ["E4F5",0x52EF],
+  ["BC45",0x52F0],
+  ["E4F4",0x52F1],
+  ["BEB1",0x52F3],
+  ["ECBF",0x52F4],
+  ["C079",0x52F5],
+  ["F1EE",0x52F7],
+  ["C455",0x52F8],
+  ["A463",0x52FA],
+  ["A4C3",0x52FB],
+  ["C956",0x52FC],
+  ["A4C4",0x52FE],
+  ["A4C5",0x52FF],
+  ["A55D",0x5305],
+  ["A55E",0x5306],
+  ["A649",0x5308],
+  ["CA71",0x5309],
+  ["CBD6",0x530A],
+  ["CBD7",0x530B],
+  ["AB6D",0x530D],
+  ["D0EE",0x530E],
+  ["B0CC",0x530F],
+  ["B0CB",0x5310],
+  ["D863",0x5311],
+  ["D862",0x5312],
+  ["A450",0x5315],
+  ["A4C6",0x5316],
+  ["A55F",0x5317],
+  ["B0CD",0x5319],
+  ["C943",0x531A],
+  ["C96C",0x531C],
+  ["A560",0x531D],
+  ["C9C2",0x531F],
+  ["A64B",0x5320],
+  ["A64A",0x5321],
+  ["C9C1",0x5322],
+  ["A758",0x5323],
+  ["ADEA",0x532A],
+  ["D46F",0x532D],
+  ["B6D7",0x532F],
+  ["E145",0x5330],
+  ["B9BC",0x5331],
+  ["E8FA",0x5334],
+  ["F3FD",0x5337],
+  ["A4C7",0x5339],
+  ["CBD8",0x533C],
+  ["CDF4",0x533D],
+  ["B0D0",0x533E],
+  ["B0CE",0x533F],
+  ["B0CF",0x5340],
+  ["A451",0x5341],
+  ["A464",0x5343],
+  ["A2CD",0x5344],
+  ["A4CA",0x5345],
+  ["A4C9",0x5347],
+  ["A4C8",0x5348],
+  ["A563",0x5349],
+  ["A562",0x534A],
+  ["C96D",0x534C],
+  ["C9C3",0x534D],
+  ["A8F5",0x5351],
+  ["A8F2",0x5352],
+  ["A8F4",0x5353],
+  ["A8F3",0x5354],
+  ["AB6E",0x5357],
+  ["B3D5",0x535A],
+  ["A452",0x535C],
+  ["A4CB",0x535E],
+  ["A565",0x5360],
+  ["A564",0x5361],
+  ["CA72",0x5363],
+  ["A8F6",0x5366],
+  ["C957",0x536C],
+  ["A567",0x536E],
+  ["A566",0x536F],
+  ["A64C",0x5370],
+  ["A64D",0x5371],
+  ["CA73",0x5372],
+  ["A759",0x5373],
+  ["A75A",0x5375],
+  ["A8F7",0x5377],
+  ["A8F8",0x5378],
+  ["A8F9",0x5379],
+  ["AB6F",0x537B],
+  ["CDF5",0x537C],
+  ["ADEB",0x537F],
+  ["C944",0x5382],
+  ["A4CC",0x5384],
+  ["C9C4",0x538A],
+  ["CA74",0x538E],
+  ["CA75",0x538F],
+  ["CBD9",0x5392],
+  ["CBDA",0x5394],
+  ["CDF7",0x5396],
+  ["CDF6",0x5397],
+  ["CDF9",0x5398],
+  ["CDF8",0x5399],
+  ["AB70",0x539A],
+  ["D470",0x539C],
+  ["ADED",0x539D],
+  ["D0EF",0x539E],
+  ["ADEC",0x539F],
+  ["D864",0x53A4],
+  ["B3D6",0x53A5],
+  ["D865",0x53A7],
+  ["E146",0x53AC],
+  ["B9BD",0x53AD],
+  ["BC46",0x53B2],
+  ["F1EF",0x53B4],
+  ["C958",0x53B9],
+  ["A568",0x53BB],
+  ["B0D1",0x53C3],
+  ["A453",0x53C8],
+  ["A465",0x53C9],
+  ["A4CE",0x53CA],
+  ["A4CD",0x53CB],
+  ["A4CF",0x53CD],
+  ["A8FB",0x53D4],
+  ["A8FA",0x53D6],
+  ["A8FC",0x53D7],
+  ["AB71",0x53DB],
+  ["ADEE",0x53DF],
+  ["E8FB",0x53E1],
+  ["C24F",0x53E2],
+  ["A466",0x53E3],
+  ["A56A",0x53E4],
+  ["A579",0x53E5],
+  ["A574",0x53E6],
+  ["A56F",0x53E8],
+  ["A56E",0x53E9],
+  ["A575",0x53EA],
+  ["A573",0x53EB],
+  ["A56C",0x53EC],
+  ["A57A",0x53ED],
+  ["A56D",0x53EE],
+  ["A569",0x53EF],
+  ["A578",0x53F0],
+  ["A577",0x53F1],
+  ["A576",0x53F2],
+  ["A56B",0x53F3],
+  ["A572",0x53F5],
+  ["A571",0x53F8],
+  ["A57B",0x53FB],
+  ["A570",0x53FC],
+  ["A653",0x5401],
+  ["A659",0x5403],
+  ["A655",0x5404],
+  ["A65B",0x5406],
+  ["C9C5",0x5407],
+  ["A658",0x5408],
+  ["A64E",0x5409],
+  ["A651",0x540A],
+  ["A654",0x540B],
+  ["A650",0x540C],
+  ["A657",0x540D],
+  ["A65A",0x540E],
+  ["A64F",0x540F],
+  ["A652",0x5410],
+  ["A656",0x5411],
+  ["A65C",0x5412],
+  ["CA7E",0x5418],
+  ["CA7B",0x5419],
+  ["A767",0x541B],
+  ["CA7C",0x541C],
+  ["A75B",0x541D],
+  ["A75D",0x541E],
+  ["A775",0x541F],
+  ["A770",0x5420],
+  ["CAA5",0x5424],
+  ["CA7D",0x5425],
+  ["A75F",0x5426],
+  ["A761",0x5427],
+  ["CAA4",0x5428],
+  ["A768",0x5429],
+  ["CA78",0x542A],
+  ["A774",0x542B],
+  ["A776",0x542C],
+  ["A75C",0x542D],
+  ["A76D",0x542E],
+  ["CA76",0x5430],
+  ["A773",0x5431],
+  ["A764",0x5433],
+  ["A76E",0x5435],
+  ["A76F",0x5436],
+  ["CA77",0x5437],
+  ["A76C",0x5438],
+  ["A76A",0x5439],
+  ["A76B",0x543B],
+  ["A771",0x543C],
+  ["CAA1",0x543D],
+  ["A75E",0x543E],
+  ["A772",0x5440],
+  ["CAA3",0x5441],
+  ["A766",0x5442],
+  ["A763",0x5443],
+  ["CA7A",0x5445],
+  ["A762",0x5446],
+  ["CAA6",0x5447],
+  ["A765",0x5448],
+  ["A769",0x544A],
+  ["A760",0x544E],
+  ["CAA2",0x544F],
+  ["CA79",0x5454],
+  ["CBEB",0x5460],
+  ["CBEA",0x5461],
+  ["A94F",0x5462],
+  ["CBED",0x5463],
+  ["CBEF",0x5464],
+  ["CBE4",0x5465],
+  ["CBE7",0x5466],
+  ["CBEE",0x5467],
+  ["A950",0x5468],
+  ["CBE1",0x546B],
+  ["CBE5",0x546C],
+  ["CBE9",0x546F],
+  ["CE49",0x5470],
+  ["A94B",0x5471],
+  ["CE4D",0x5472],
+  ["A8FD",0x5473],
+  ["CBE6",0x5474],
+  ["A8FE",0x5475],
+  ["A94C",0x5476],
+  ["A945",0x5477],
+  ["A941",0x5478],
+  ["CBE2",0x547A],
+  ["A944",0x547B],
+  ["A949",0x547C],
+  ["A952",0x547D],
+  ["CBE3",0x547E],
+  ["CBDC",0x547F],
+  ["A943",0x5480],
+  ["CBDD",0x5481],
+  ["CBDF",0x5482],
+  ["A946",0x5484],
+  ["A948",0x5486],
+  ["CBDB",0x5487],
+  ["CBE0",0x5488],
+  ["A951",0x548B],
+  ["A94D",0x548C],
+  ["CBE8",0x548D],
+  ["A953",0x548E],
+  ["A94A",0x5490],
+  ["CBDE",0x5491],
+  ["A947",0x5492],
+  ["A942",0x5495],
+  ["A940",0x5496],
+  ["CBEC",0x5498],
+  ["A94E",0x549A],
+  ["CE48",0x54A0],
+  ["CDFB",0x54A1],
+  ["CE4B",0x54A2],
+  ["CDFD",0x54A5],
+  ["AB78",0x54A6],
+  ["ABA8",0x54A7],
+  ["AB74",0x54A8],
+  ["ABA7",0x54A9],
+  ["AB7D",0x54AA],
+  ["ABA4",0x54AB],
+  ["AB72",0x54AC],
+  ["CDFC",0x54AD],
+  ["CE43",0x54AE],
+  ["ABA3",0x54AF],
+  ["CE4F",0x54B0],
+  ["ABA5",0x54B1],
+  ["AB79",0x54B3],
+  ["CE45",0x54B6],
+  ["CE42",0x54B7],
+  ["AB77",0x54B8],
+  ["CDFA",0x54BA],
+  ["ABA6",0x54BB],
+  ["CE4A",0x54BC],
+  ["AB7C",0x54BD],
+  ["CE4C",0x54BE],
+  ["ABA9",0x54BF],
+  ["AB73",0x54C0],
+  ["AB7E",0x54C1],
+  ["AB7B",0x54C2],
+  ["CE40",0x54C3],
+  ["ABA1",0x54C4],
+  ["CE46",0x54C5],
+  ["CE47",0x54C6],
+  ["AB7A",0x54C7],
+  ["ABA2",0x54C8],
+  ["AB76",0x54C9],
+  ["AB75",0x54CE],
+  ["CDFE",0x54CF],
+  ["CE44",0x54D6],
+  ["CE4E",0x54DE],
+  ["D144",0x54E0],
+  ["ADFB",0x54E1],
+  ["D0F1",0x54E2],
+  ["D0F6",0x54E4],
+  ["ADF4",0x54E5],
+  ["AE40",0x54E6],
+  ["D0F4",0x54E7],
+  ["ADEF",0x54E8],
+  ["ADF9",0x54E9],
+  ["ADFE",0x54EA],
+  ["D0FB",0x54EB],
+  ["ADFA",0x54ED],
+  ["ADFD",0x54EE],
+  ["D0FE",0x54F1],
+  ["ADF5",0x54F2],
+  ["D0F5",0x54F3],
+  ["D142",0x54F7],
+  ["D143",0x54F8],
+  ["ADF7",0x54FA],
+  ["D141",0x54FB],
+  ["ADF3",0x54FC],
+  ["AE43",0x54FD],
+  ["D0F8",0x54FF],
+  ["ADF1",0x5501],
+  ["D146",0x5503],
+  ["D0F9",0x5504],
+  ["D0FD",0x5505],
+  ["ADF6",0x5506],
+  ["AE42",0x5507],
+  ["D0FA",0x5508],
+  ["ADFC",0x5509],
+  ["D140",0x550A],
+  ["D147",0x550B],
+  ["D4A1",0x550C],
+  ["D145",0x550E],
+  ["AE44",0x550F],
+  ["ADF0",0x5510],
+  ["D0FC",0x5511],
+  ["D0F3",0x5512],
+  ["ADF8",0x5514],
+  ["D0F2",0x5517],
+  ["D0F7",0x551A],
+  ["D0F0",0x5526],
+  ["AE41",0x5527],
+  ["D477",0x552A],
+  ["B0E4",0x552C],
+  ["D4A7",0x552D],
+  ["B0E2",0x552E],
+  ["B0DF",0x552F],
+  ["D47C",0x5530],
+  ["B0DB",0x5531],
+  ["D4A2",0x5532],
+  ["B0E6",0x5533],
+  ["D476",0x5534],
+  ["D47B",0x5535],
+  ["D47A",0x5536],
+  ["ADF2",0x5537],
+  ["B0E1",0x5538],
+  ["D4A5",0x5539],
+  ["D4A8",0x553B],
+  ["D473",0x553C],
+  ["B3E8",0x553E],
+  ["D4A9",0x5540],
+  ["B0E7",0x5541],
+  ["B0D9",0x5543],
+  ["B0D6",0x5544],
+  ["D47E",0x5545],
+  ["B0D3",0x5546],
+  ["D4A6",0x5548],
+  ["B0DA",0x554A],
+  ["D4AA",0x554B],
+  ["D474",0x554D],
+  ["D4A4",0x554E],
+  ["B0DD",0x554F],
+  ["D475",0x5550],
+  ["D478",0x5551],
+  ["D47D",0x5552],
+  ["B0DE",0x5555],
+  ["B0DC",0x5556],
+  ["B0E8",0x5557],
+  ["B0E3",0x555C],
+  ["B0D7",0x555E],
+  ["B1D2",0x555F],
+  ["B0D8",0x5561],
+  ["D479",0x5562],
+  ["B0E5",0x5563],
+  ["B0E0",0x5564],
+  ["D4A3",0x5565],
+  ["B0D5",0x5566],
+  ["B0D4",0x556A],
+  ["D471",0x5575],
+  ["D472",0x5576],
+  ["D86A",0x5577],
+  ["B3D7",0x557B],
+  ["B3DA",0x557C],
+  ["D875",0x557D],
+  ["B3EE",0x557E],
+  ["D878",0x557F],
+  ["B3D8",0x5580],
+  ["D871",0x5581],
+  ["B3DE",0x5582],
+  ["B3E4",0x5583],
+  ["B5BD",0x5584],
+  ["B3E2",0x5587],
+  ["D86E",0x5588],
+  ["B3EF",0x5589],
+  ["B3DB",0x558A],
+  ["B3E3",0x558B],
+  ["D876",0x558C],
+  ["DCD7",0x558D],
+  ["D87B",0x558E],
+  ["D86F",0x558F],
+  ["D866",0x5591],
+  ["D873",0x5592],
+  ["D86D",0x5593],
+  ["B3E1",0x5594],
+  ["D879",0x5595],
+  ["B3DD",0x5598],
+  ["B3F1",0x5599],
+  ["B3EA",0x559A],
+  ["B3DF",0x559C],
+  ["B3DC",0x559D],
+  ["B3E7",0x559F],
+  ["D87A",0x55A1],
+  ["D86C",0x55A2],
+  ["D872",0x55A3],
+  ["D874",0x55A4],
+  ["D868",0x55A5],
+  ["D877",0x55A6],
+  ["B3D9",0x55A7],
+  ["D867",0x55A8],
+  ["B3E0",0x55AA],
+  ["B3F0",0x55AB],
+  ["B3EC",0x55AC],
+  ["D869",0x55AD],
+  ["B3E6",0x55AE],
+  ["B3ED",0x55B1],
+  ["B3E9",0x55B2],
+  ["B3E5",0x55B3],
+  ["D870",0x55B5],
+  ["B3EB",0x55BB],
+  ["DCD5",0x55BF],
+  ["DCD1",0x55C0],
+  ["DCE0",0x55C2],
+  ["DCCA",0x55C3],
+  ["DCD3",0x55C4],
+  ["B6E5",0x55C5],
+  ["B6E6",0x55C6],
+  ["B6DE",0x55C7],
+  ["DCDC",0x55C8],
+  ["B6E8",0x55C9],
+  ["DCCF",0x55CA],
+  ["DCCE",0x55CB],
+  ["DCCC",0x55CC],
+  ["DCDE",0x55CD],
+  ["B6DC",0x55CE],
+  ["DCD8",0x55CF],
+  ["DCCD",0x55D0],
+  ["B6DF",0x55D1],
+  ["DCD6",0x55D2],
+  ["B6DA",0x55D3],
+  ["DCD2",0x55D4],
+  ["DCD9",0x55D5],
+  ["DCDB",0x55D6],
+  ["DCDF",0x55D9],
+  ["B6E3",0x55DA],
+  ["DCCB",0x55DB],
+  ["B6DD",0x55DC],
+  ["DCD0",0x55DD],
+  ["B6D8",0x55DF],
+  ["B6E4",0x55E1],
+  ["DCDA",0x55E2],
+  ["B6E0",0x55E3],
+  ["B6E1",0x55E4],
+  ["B6E7",0x55E5],
+  ["B6DB",0x55E6],
+  ["A25F",0x55E7],
+  ["B6D9",0x55E8],
+  ["DCD4",0x55E9],
+  ["B6E2",0x55EF],
+  ["DCDD",0x55F2],
+  ["B9CD",0x55F6],
+  ["B9C8",0x55F7],
+  ["E155",0x55F9],
+  ["E151",0x55FA],
+  ["E14B",0x55FC],
+  ["B9C2",0x55FD],
+  ["B9BE",0x55FE],
+  ["E154",0x55FF],
+  ["B9BF",0x5600],
+  ["E14E",0x5601],
+  ["E150",0x5602],
+  ["E153",0x5604],
+  ["B9C4",0x5606],
+  ["B9CB",0x5608],
+  ["B9C5",0x5609],
+  ["E149",0x560C],
+  ["B9C6",0x560D],
+  ["B9C7",0x560E],
+  ["E14C",0x560F],
+  ["B9CC",0x5610],
+  ["E14A",0x5612],
+  ["E14F",0x5613],
+  ["B9C3",0x5614],
+  ["E148",0x5615],
+  ["B9C9",0x5616],
+  ["B9C1",0x5617],
+  ["B9C0",0x561B],
+  ["E14D",0x561C],
+  ["E152",0x561D],
+  ["B9CA",0x561F],
+  ["E147",0x5627],
+  ["BC4D",0x5629],
+  ["E547",0x562A],
+  ["E544",0x562C],
+  ["BC47",0x562E],
+  ["BC53",0x562F],
+  ["BC54",0x5630],
+  ["BC4A",0x5632],
+  ["E542",0x5633],
+  ["BC4C",0x5634],
+  ["E4F9",0x5635],
+  ["BC52",0x5636],
+  ["E546",0x5638],
+  ["BC49",0x5639],
+  ["E548",0x563A],
+  ["BC48",0x563B],
+  ["E543",0x563D],
+  ["E545",0x563E],
+  ["BC4B",0x563F],
+  ["E541",0x5640],
+  ["E4FA",0x5641],
+  ["E4F7",0x5642],
+  ["D86B",0x5645],
+  ["E4FD",0x5646],
+  ["E4F6",0x5648],
+  ["E4FC",0x5649],
+  ["E4FB",0x564A],
+  ["E4F8",0x564C],
+  ["BC4F",0x564E],
+  ["BC4E",0x5653],
+  ["BC50",0x5657],
+  ["E4FE",0x5658],
+  ["BEB2",0x5659],
+  ["E540",0x565A],
+  ["E945",0x565E],
+  ["E8FD",0x5660],
+  ["BEBE",0x5662],
+  ["E942",0x5663],
+  ["BEB6",0x5664],
+  ["BEBA",0x5665],
+  ["E941",0x5666],
+  ["BEB9",0x5668],
+  ["BEB5",0x5669],
+  ["BEB8",0x566A],
+  ["BEB3",0x566B],
+  ["BEBD",0x566C],
+  ["E943",0x566D],
+  ["E8FE",0x566E],
+  ["BEBC",0x566F],
+  ["E8FC",0x5670],
+  ["BEBB",0x5671],
+  ["E944",0x5672],
+  ["E940",0x5673],
+  ["BC51",0x5674],
+  ["BEBF",0x5676],
+  ["E946",0x5677],
+  ["BEB7",0x5678],
+  ["BEB4",0x5679],
+  ["ECC6",0x567E],
+  ["ECC8",0x567F],
+  ["C07B",0x5680],
+  ["ECC9",0x5681],
+  ["ECC7",0x5682],
+  ["ECC5",0x5683],
+  ["ECC4",0x5684],
+  ["C07D",0x5685],
+  ["ECC3",0x5686],
+  ["C07E",0x5687],
+  ["ECC1",0x568C],
+  ["ECC2",0x568D],
+  ["C07A",0x568E],
+  ["C0A1",0x568F],
+  ["C07C",0x5690],
+  ["ECC0",0x5693],
+  ["C250",0x5695],
+  ["EFBC",0x5697],
+  ["EFBA",0x5698],
+  ["EFBF",0x5699],
+  ["EFBD",0x569A],
+  ["EFBB",0x569C],
+  ["EFBE",0x569D],
+  ["C360",0x56A5],
+  ["F1F2",0x56A6],
+  ["F1F3",0x56A7],
+  ["C456",0x56A8],
+  ["F1F4",0x56AA],
+  ["F1F0",0x56AB],
+  ["F1F5",0x56AC],
+  ["F1F1",0x56AD],
+  ["C251",0x56AE],
+  ["F3FE",0x56B2],
+  ["F441",0x56B3],
+  ["C459",0x56B4],
+  ["F440",0x56B5],
+  ["C458",0x56B6],
+  ["C457",0x56B7],
+  ["C45A",0x56BC],
+  ["F5C5",0x56BD],
+  ["F5C6",0x56BE],
+  ["C4DA",0x56C0],
+  ["C4D9",0x56C1],
+  ["C4DB",0x56C2],
+  ["F5C4",0x56C3],
+  ["F6D8",0x56C5],
+  ["F6D7",0x56C6],
+  ["C56D",0x56C8],
+  ["C56F",0x56C9],
+  ["C56E",0x56CA],
+  ["F6D9",0x56CB],
+  ["C5C8",0x56CC],
+  ["F8A6",0x56CD],
+  ["C5F1",0x56D1],
+  ["F8A5",0x56D3],
+  ["F8EE",0x56D4],
+  ["C949",0x56D7],
+  ["A57D",0x56DA],
+  ["A57C",0x56DB],
+  ["A65F",0x56DD],
+  ["A65E",0x56DE],
+  ["C9C7",0x56DF],
+  ["A65D",0x56E0],
+  ["C9C6",0x56E1],
+  ["A779",0x56E4],
+  ["CAA9",0x56E5],
+  ["CAA8",0x56E7],
+  ["A777",0x56EA],
+  ["A77A",0x56EB],
+  ["CAA7",0x56EE],
+  ["A778",0x56F0],
+  ["CBF0",0x56F7],
+  ["CBF1",0x56F9],
+  ["A954",0x56FA],
+  ["ABAA",0x56FF],
+  ["D148",0x5701],
+  ["D149",0x5702],
+  ["AE45",0x5703],
+  ["AE46",0x5704],
+  ["D4AC",0x5707],
+  ["B0E9",0x5708],
+  ["B0EB",0x5709],
+  ["D4AB",0x570A],
+  ["B0EA",0x570B],
+  ["D87C",0x570C],
+  ["B3F2",0x570D],
+  ["B6E9",0x5712],
+  ["B6EA",0x5713],
+  ["DCE1",0x5714],
+  ["B9CF",0x5716],
+  ["B9CE",0x5718],
+  ["E549",0x571A],
+  ["E948",0x571B],
+  ["E947",0x571C],
+  ["F96B",0x571E],
+  ["A467",0x571F],
+  ["C959",0x5720],
+  ["C96E",0x5722],
+  ["C96F",0x5723],
+  ["A662",0x5728],
+  ["A666",0x5729],
+  ["C9C9",0x572A],
+  ["A664",0x572C],
+  ["A663",0x572D],
+  ["C9C8",0x572E],
+  ["A665",0x572F],
+  ["A661",0x5730],
+  ["A660",0x5733],
+  ["C9CA",0x5734],
+  ["A7A6",0x573B],
+  ["A7A3",0x573E],
+  ["A77D",0x5740],
+  ["CAAA",0x5741],
+  ["CAAB",0x5745],
+  ["A7A1",0x5747],
+  ["CAAD",0x5749],
+  ["A77B",0x574A],
+  ["CAAE",0x574B],
+  ["CAAC",0x574C],
+  ["A77E",0x574D],
+  ["A7A2",0x574E],
+  ["A7A5",0x574F],
+  ["A7A4",0x5750],
+  ["A77C",0x5751],
+  ["CAAF",0x5752],
+  ["A959",0x5761],
+  ["CBFE",0x5762],
+  ["A95B",0x5764],
+  ["A95A",0x5766],
+  ["CC40",0x5768],
+  ["A958",0x5769],
+  ["A957",0x576A],
+  ["CBF5",0x576B],
+  ["CBF4",0x576D],
+  ["CBF2",0x576F],
+  ["CBF7",0x5770],
+  ["CBF6",0x5771],
+  ["CBF3",0x5772],
+  ["CBFC",0x5773],
+  ["CBFD",0x5774],
+  ["CBFA",0x5775],
+  ["CBF8",0x5776],
+  ["A956",0x5777],
+  ["CBFB",0x577B],
+  ["A95C",0x577C],
+  ["CC41",0x577D],
+  ["CBF9",0x5780],
+  ["ABAB",0x5782],
+  ["A955",0x5783],
+  ["ABAC",0x578B],
+  ["CE54",0x578C],
+  ["CE5A",0x578F],
+  ["ABB2",0x5793],
+  ["CE58",0x5794],
+  ["CE5E",0x5795],
+  ["CE55",0x5797],
+  ["CE59",0x5798],
+  ["CE5B",0x5799],
+  ["CE5D",0x579A],
+  ["CE57",0x579B],
+  ["CE56",0x579D],
+  ["CE51",0x579E],
+  ["CE52",0x579F],
+  ["ABAD",0x57A0],
+  ["ABAF",0x57A2],
+  ["ABAE",0x57A3],
+  ["CE53",0x57A4],
+  ["CE5C",0x57A5],
+  ["ABB1",0x57AE],
+  ["CE50",0x57B5],
+  ["D153",0x57B6],
+  ["D152",0x57B8],
+  ["D157",0x57B9],
+  ["D14E",0x57BA],
+  ["D151",0x57BC],
+  ["D150",0x57BD],
+  ["D154",0x57BF],
+  ["D158",0x57C1],
+  ["AE47",0x57C2],
+  ["AE4A",0x57C3],
+  ["D14F",0x57C6],
+  ["D155",0x57C7],
+  ["AE49",0x57CB],
+  ["D14A",0x57CC],
+  ["ABB0",0x57CE],
+  ["D4BA",0x57CF],
+  ["D156",0x57D0],
+  ["D14D",0x57D2],
+  ["AE48",0x57D4],
+  ["D14C",0x57D5],
+  ["D4B1",0x57DC],
+  ["B0EC",0x57DF],
+  ["B0F0",0x57E0],
+  ["D4C1",0x57E1],
+  ["D4AF",0x57E2],
+  ["D4BD",0x57E3],
+  ["B0F1",0x57E4],
+  ["D4BF",0x57E5],
+  ["D4C5",0x57E7],
+  ["D4C9",0x57E9],
+  ["D4C0",0x57EC],
+  ["D4B4",0x57ED],
+  ["D4BC",0x57EE],
+  ["D4CA",0x57F0],
+  ["D4C8",0x57F1],
+  ["D4BE",0x57F2],
+  ["D4B9",0x57F3],
+  ["D4B2",0x57F4],
+  ["D8A6",0x57F5],
+  ["D4B0",0x57F6],
+  ["B0F5",0x57F7],
+  ["D4B7",0x57F8],
+  ["B0F6",0x57F9],
+  ["B0F2",0x57FA],
+  ["D4AD",0x57FB],
+  ["D4C3",0x57FC],
+  ["D4B5",0x57FD],
+  ["D4B3",0x5800],
+  ["D4C6",0x5801],
+  ["B0F3",0x5802],
+  ["D4CC",0x5804],
+  ["B0ED",0x5805],
+  ["B0EF",0x5806],
+  ["D4BB",0x5807],
+  ["D4B6",0x5808],
+  ["AE4B",0x5809],
+  ["B0EE",0x580A],
+  ["D4B8",0x580B],
+  ["D4C7",0x580C],
+  ["D4CB",0x580D],
+  ["D4C2",0x580E],
+  ["D4C4",0x5810],
+  ["D4AE",0x5814],
+  ["D8A1",0x5819],
+  ["D8AA",0x581B],
+  ["D8A9",0x581C],
+  ["B3FA",0x581D],
+  ["D8A2",0x581E],
+  ["B3FB",0x5820],
+  ["B3F9",0x5821],
+  ["D8A4",0x5823],
+  ["B3F6",0x5824],
+  ["D8A8",0x5825],
+  ["D8A3",0x5827],
+  ["D8A5",0x5828],
+  ["D87D",0x5829],
+  ["B3F4",0x582A],
+  ["D8B2",0x582C],
+  ["D8B1",0x582D],
+  ["D8AE",0x582E],
+  ["B3F3",0x582F],
+  ["B3F7",0x5830],
+  ["B3F8",0x5831],
+  ["D14B",0x5832],
+  ["D8AB",0x5833],
+  ["B3F5",0x5834],
+  ["B0F4",0x5835],
+  ["D8AD",0x5836],
+  ["D87E",0x5837],
+  ["D8B0",0x5838],
+  ["D8AF",0x5839],
+  ["D8B3",0x583B],
+  ["DCEF",0x583D],
+  ["D8AC",0x583F],
+  ["D8A7",0x5848],
+  ["DCE7",0x5849],
+  ["B6F4",0x584A],
+  ["B6F7",0x584B],
+  ["B6F2",0x584C],
+  ["DCE6",0x584D],
+  ["DCEA",0x584E],
+  ["DCE5",0x584F],
+  ["B6EC",0x5851],
+  ["B6F6",0x5852],
+  ["DCE2",0x5853],
+  ["B6F0",0x5854],
+  ["DCE9",0x5855],
+  ["B6EE",0x5857],
+  ["B6ED",0x5858],
+  ["DCEC",0x5859],
+  ["B6EF",0x585A],
+  ["DCEE",0x585B],
+  ["DCEB",0x585D],
+  ["B6EB",0x585E],
+  ["B6F5",0x5862],
+  ["DCF0",0x5863],
+  ["DCE4",0x5864],
+  ["DCED",0x5865],
+  ["DCE3",0x5868],
+  ["B6F1",0x586B],
+  ["B6F3",0x586D],
+  ["DCE8",0x586F],
+  ["DCF1",0x5871],
+  ["E15D",0x5874],
+  ["B9D0",0x5875],
+  ["E163",0x5876],
+  ["B9D5",0x5879],
+  ["E15F",0x587A],
+  ["E166",0x587B],
+  ["E157",0x587C],
+  ["B9D7",0x587D],
+  ["B9D1",0x587E],
+  ["E15C",0x587F],
+  ["BC55",0x5880],
+  ["E15B",0x5881],
+  ["E164",0x5882],
+  ["B9D2",0x5883],
+  ["B9D6",0x5885],
+  ["E15A",0x5886],
+  ["E160",0x5887],
+  ["E165",0x5888],
+  ["E156",0x5889],
+  ["B9D4",0x588A],
+  ["E15E",0x588B],
+  ["E162",0x588E],
+  ["E168",0x588F],
+  ["E158",0x5890],
+  ["E161",0x5891],
+  ["B9D3",0x5893],
+  ["E167",0x5894],
+  ["E159",0x5898],
+  ["BC59",0x589C],
+  ["E54B",0x589D],
+  ["BC57",0x589E],
+  ["BC56",0x589F],
+  ["E54D",0x58A0],
+  ["E552",0x58A1],
+  ["E54E",0x58A3],
+  ["E551",0x58A5],
+  ["BC5C",0x58A6],
+  ["BEA5",0x58A8],
+  ["BC5B",0x58A9],
+  ["E54A",0x58AB],
+  ["E550",0x58AC],
+  ["BC5A",0x58AE],
+  ["E54F",0x58AF],
+  ["E54C",0x58B1],
+  ["BC58",0x58B3],
+  ["E94D",0x58BA],
+  ["E94F",0x58BC],
+  ["E94A",0x58BD],
+  ["BEC1",0x58BE],
+  ["E94C",0x58BF],
+  ["BEC0",0x58C1],
+  ["E94E",0x58C2],
+  ["BEC3",0x58C5],
+  ["E950",0x58C6],
+  ["BEC2",0x58C7],
+  ["E949",0x58C8],
+  ["E94B",0x58C9],
+  ["C0A5",0x58CE],
+  ["ECCC",0x58CF],
+  ["C0A4",0x58D1],
+  ["ECCD",0x58D2],
+  ["C0A3",0x58D3],
+  ["ECCB",0x58D4],
+  ["C0A2",0x58D5],
+  ["ECCA",0x58D6],
+  ["C253",0x58D8],
+  ["C252",0x58D9],
+  ["F1F6",0x58DA],
+  ["F1F8",0x58DB],
+  ["F1F7",0x58DD],
+  ["C361",0x58DE],
+  ["C362",0x58DF],
+  ["C363",0x58E2],
+  ["F442",0x58E3],
+  ["C45B",0x58E4],
+  ["F7D3",0x58E7],
+  ["F7D2",0x58E8],
+  ["C5F2",0x58E9],
+  ["A468",0x58EB],
+  ["A4D0",0x58EC],
+  ["A7A7",0x58EF],
+  ["CE5F",0x58F4],
+  ["B3FC",0x58F9],
+  ["B3FD",0x58FA],
+  ["DCF2",0x58FC],
+  ["B9D8",0x58FD],
+  ["E169",0x58FE],
+  ["E553",0x58FF],
+  ["C95A",0x5903],
+  ["CAB0",0x5906],
+  ["CC42",0x590C],
+  ["CE60",0x590D],
+  ["D159",0x590E],
+  ["AE4C",0x590F],
+  ["F1F9",0x5912],
+  ["C4DC",0x5914],
+  ["A469",0x5915],
+  ["A57E",0x5916],
+  ["C970",0x5917],
+  ["A667",0x5919],
+  ["A668",0x591A],
+  ["A95D",0x591C],
+  ["B0F7",0x5920],
+  ["B9DA",0x5922],
+  ["B9DB",0x5924],
+  ["B9D9",0x5925],
+  ["A46A",0x5927],
+  ["A4D1",0x5929],
+  ["A4D3",0x592A],
+  ["A4D2",0x592B],
+  ["C95B",0x592C],
+  ["A4D4",0x592D],
+  ["A5A1",0x592E],
+  ["C971",0x592F],
+  ["A5A2",0x5931],
+  ["A669",0x5937],
+  ["A66A",0x5938],
+  ["C9CB",0x593C],
+  ["A7A8",0x593E],
+  ["CAB1",0x5940],
+  ["A961",0x5944],
+  ["CC43",0x5945],
+  ["A95F",0x5947],
+  ["A960",0x5948],
+  ["A95E",0x5949],
+  ["D15A",0x594A],
+  ["ABB6",0x594E],
+  ["ABB5",0x594F],
+  ["ABB7",0x5950],
+  ["ABB4",0x5951],
+  ["CE61",0x5953],
+  ["A962",0x5954],
+  ["ABB3",0x5955],
+  ["AE4D",0x5957],
+  ["AE4E",0x5958],
+  ["AE4F",0x595A],
+  ["D4CD",0x595C],
+  ["B3FE",0x5960],
+  ["D8B4",0x5961],
+  ["B0F8",0x5962],
+  ["B6F8",0x5967],
+  ["B9DD",0x5969],
+  ["B9DC",0x596A],
+  ["E16A",0x596B],
+  ["BC5D",0x596D],
+  ["BEC4",0x596E],
+  ["EFC0",0x5970],
+  ["F6DA",0x5971],
+  ["F7D4",0x5972],
+  ["A46B",0x5973],
+  ["A5A3",0x5974],
+  ["A5A4",0x5976],
+  ["C9D1",0x5977],
+  ["A66C",0x5978],
+  ["A66F",0x5979],
+  ["C9CF",0x597B],
+  ["C9CD",0x597C],
+  ["A66E",0x597D],
+  ["C9D0",0x597E],
+  ["C9D2",0x597F],
+  ["C9CC",0x5980],
+  ["A671",0x5981],
+  ["A670",0x5982],
+  ["A66D",0x5983],
+  ["A66B",0x5984],
+  ["C9CE",0x5985],
+  ["A7B3",0x598A],
+  ["A7B0",0x598D],
+  ["CAB6",0x598E],
+  ["CAB9",0x598F],
+  ["CAB8",0x5990],
+  ["A7AA",0x5992],
+  ["A7B2",0x5993],
+  ["A7AF",0x5996],
+  ["CAB5",0x5997],
+  ["CAB3",0x5998],
+  ["A7AE",0x5999],
+  ["A7A9",0x599D],
+  ["A7AC",0x599E],
+  ["CAB4",0x59A0],
+  ["CABB",0x59A1],
+  ["CAB7",0x59A2],
+  ["A7AD",0x59A3],
+  ["A7B1",0x59A4],
+  ["A7B4",0x59A5],
+  ["CAB2",0x59A6],
+  ["CABA",0x59A7],
+  ["A7AB",0x59A8],
+  ["A967",0x59AE],
+  ["A96F",0x59AF],
+  ["CC4F",0x59B1],
+  ["CC48",0x59B2],
+  ["A970",0x59B3],
+  ["CC53",0x59B4],
+  ["CC44",0x59B5],
+  ["CC4B",0x59B6],
+  ["A966",0x59B9],
+  ["CC45",0x59BA],
+  ["A964",0x59BB],
+  ["CC4C",0x59BC],
+  ["CC50",0x59BD],
+  ["A963",0x59BE],
+  ["CC51",0x59C0],
+  ["CC4A",0x59C1],
+  ["CC4D",0x59C3],
+  ["A972",0x59C5],
+  ["A969",0x59C6],
+  ["CC54",0x59C7],
+  ["CC52",0x59C8],
+  ["A96E",0x59CA],
+  ["A96C",0x59CB],
+  ["CC49",0x59CC],
+  ["A96B",0x59CD],
+  ["CC47",0x59CE],
+  ["CC46",0x59CF],
+  ["A96A",0x59D0],
+  ["A968",0x59D1],
+  ["A971",0x59D2],
+  ["A96D",0x59D3],
+  ["A965",0x59D4],
+  ["CC4E",0x59D6],
+  ["ABB9",0x59D8],
+  ["ABC0",0x59DA],
+  ["CE6F",0x59DB],
+  ["ABB8",0x59DC],
+  ["CE67",0x59DD],
+  ["CE63",0x59DE],
+  ["CE73",0x59E0],
+  ["CE62",0x59E1],
+  ["ABBB",0x59E3],
+  ["CE6C",0x59E4],
+  ["ABBE",0x59E5],
+  ["ABC1",0x59E6],
+  ["ABBC",0x59E8],
+  ["CE70",0x59E9],
+  ["ABBF",0x59EA],
+  ["AE56",0x59EC],
+  ["CE76",0x59ED],
+  ["CE64",0x59EE],
+  ["CE66",0x59F1],
+  ["CE6D",0x59F2],
+  ["CE71",0x59F3],
+  ["CE75",0x59F4],
+  ["CE72",0x59F5],
+  ["CE6B",0x59F6],
+  ["CE6E",0x59F7],
+  ["CE68",0x59FA],
+  ["ABC3",0x59FB],
+  ["CE6A",0x59FC],
+  ["CE69",0x59FD],
+  ["CE74",0x59FE],
+  ["ABBA",0x59FF],
+  ["CE65",0x5A00],
+  ["ABC2",0x5A01],
+  ["ABBD",0x5A03],
+  ["AE5C",0x5A09],
+  ["D162",0x5A0A],
+  ["AE5B",0x5A0C],
+  ["D160",0x5A0F],
+  ["AE50",0x5A11],
+  ["AE55",0x5A13],
+  ["D15F",0x5A15],
+  ["D15C",0x5A16],
+  ["D161",0x5A17],
+  ["AE51",0x5A18],
+  ["D15B",0x5A19],
+  ["AE54",0x5A1B],
+  ["AE52",0x5A1C],
+  ["D163",0x5A1E],
+  ["AE53",0x5A1F],
+  ["AE57",0x5A20],
+  ["AE58",0x5A23],
+  ["AE5A",0x5A25],
+  ["AE59",0x5A29],
+  ["D15D",0x5A2D],
+  ["D15E",0x5A2E],
+  ["D164",0x5A33],
+  ["D4D4",0x5A35],
+  ["B0F9",0x5A36],
+  ["D8C2",0x5A37],
+  ["D4D3",0x5A38],
+  ["D4E6",0x5A39],
+  ["B140",0x5A3C],
+  ["D4E4",0x5A3E],
+  ["B0FE",0x5A40],
+  ["B0FA",0x5A41],
+  ["D4ED",0x5A42],
+  ["D4DD",0x5A43],
+  ["D4E0",0x5A44],
+  ["B143",0x5A46],
+  ["D4EA",0x5A47],
+  ["D4E2",0x5A48],
+  ["B0FB",0x5A49],
+  ["B144",0x5A4A],
+  ["D4E7",0x5A4C],
+  ["D4E5",0x5A4D],
+  ["D4D6",0x5A50],
+  ["D4EB",0x5A51],
+  ["D4DF",0x5A52],
+  ["D4DA",0x5A53],
+  ["D4D0",0x5A55],
+  ["D4EC",0x5A56],
+  ["D4DC",0x5A57],
+  ["D4CF",0x5A58],
+  ["B142",0x5A5A],
+  ["D4E1",0x5A5B],
+  ["D4EE",0x5A5C],
+  ["D4DE",0x5A5D],
+  ["D4D2",0x5A5E],
+  ["D4D7",0x5A5F],
+  ["D4CE",0x5A60],
+  ["B141",0x5A62],
+  ["D4DB",0x5A64],
+  ["D4D8",0x5A65],
+  ["B0FC",0x5A66],
+  ["D4D1",0x5A67],
+  ["D4E9",0x5A69],
+  ["B0FD",0x5A6A],
+  ["D4D9",0x5A6C],
+  ["D4D5",0x5A6D],
+  ["D4E8",0x5A70],
+  ["B440",0x5A77],
+  ["D8BB",0x5A78],
+  ["D8B8",0x5A7A],
+  ["D8C9",0x5A7B],
+  ["D8BD",0x5A7C],
+  ["D8CA",0x5A7D],
+  ["B442",0x5A7F],
+  ["D8C6",0x5A83],
+  ["D8C3",0x5A84],
+  ["D8C4",0x5A8A],
+  ["D8C7",0x5A8B],
+  ["D8CB",0x5A8C],
+  ["D4E3",0x5A8E],
+  ["D8CD",0x5A8F],
+  ["DD47",0x5A90],
+  ["B443",0x5A92],
+  ["D8CE",0x5A93],
+  ["D8B6",0x5A94],
+  ["D8C0",0x5A95],
+  ["D8C5",0x5A97],
+  ["B441",0x5A9A],
+  ["B444",0x5A9B],
+  ["D8CC",0x5A9C],
+  ["D8CF",0x5A9D],
+  ["D8BA",0x5A9E],
+  ["D8B7",0x5A9F],
+  ["D8B9",0x5AA2],
+  ["D8BE",0x5AA5],
+  ["D8BC",0x5AA6],
+  ["B445",0x5AA7],
+  ["D8C8",0x5AA9],
+  ["D8BF",0x5AAC],
+  ["D8C1",0x5AAE],
+  ["D8B5",0x5AAF],
+  ["DCFA",0x5AB0],
+  ["DCF8",0x5AB1],
+  ["B742",0x5AB2],
+  ["B740",0x5AB3],
+  ["DD43",0x5AB4],
+  ["DCF9",0x5AB5],
+  ["DD44",0x5AB6],
+  ["DD40",0x5AB7],
+  ["DCF7",0x5AB8],
+  ["DD46",0x5AB9],
+  ["DCF6",0x5ABA],
+  ["DCFD",0x5ABB],
+  ["B6FE",0x5ABC],
+  ["B6FD",0x5ABD],
+  ["B6FC",0x5ABE],
+  ["DCFB",0x5ABF],
+  ["DD41",0x5AC0],
+  ["B6F9",0x5AC1],
+  ["B741",0x5AC2],
+  ["DCF4",0x5AC4],
+  ["DCFE",0x5AC6],
+  ["DCF3",0x5AC7],
+  ["DCFC",0x5AC8],
+  ["B6FA",0x5AC9],
+  ["DD42",0x5ACA],
+  ["DCF5",0x5ACB],
+  ["B6FB",0x5ACC],
+  ["DD45",0x5ACD],
+  ["E16E",0x5AD5],
+  ["B9E2",0x5AD6],
+  ["B9E1",0x5AD7],
+  ["B9E3",0x5AD8],
+  ["E17A",0x5AD9],
+  ["E170",0x5ADA],
+  ["E176",0x5ADB],
+  ["E16B",0x5ADC],
+  ["E179",0x5ADD],
+  ["E178",0x5ADE],
+  ["E17C",0x5ADF],
+  ["E175",0x5AE0],
+  ["B9DE",0x5AE1],
+  ["E174",0x5AE2],
+  ["B9E4",0x5AE3],
+  ["E16D",0x5AE5],
+  ["B9DF",0x5AE6],
+  ["E17B",0x5AE8],
+  ["B9E0",0x5AE9],
+  ["E16F",0x5AEA],
+  ["E172",0x5AEB],
+  ["E177",0x5AEC],
+  ["E171",0x5AED],
+  ["E16C",0x5AEE],
+  ["E173",0x5AF3],
+  ["E555",0x5AF4],
+  ["BC61",0x5AF5],
+  ["E558",0x5AF6],
+  ["E557",0x5AF7],
+  ["E55A",0x5AF8],
+  ["E55C",0x5AF9],
+  ["BC5F",0x5AFB],
+  ["E556",0x5AFD],
+  ["E554",0x5AFF],
+  ["E55D",0x5B01],
+  ["E55B",0x5B02],
+  ["E559",0x5B03],
+  ["E55F",0x5B05],
+  ["E55E",0x5B07],
+  ["BC63",0x5B08],
+  ["BC5E",0x5B09],
+  ["BC60",0x5B0B],
+  ["BC62",0x5B0C],
+  ["E560",0x5B0F],
+  ["E957",0x5B10],
+  ["E956",0x5B13],
+  ["E955",0x5B14],
+  ["E958",0x5B16],
+  ["E951",0x5B17],
+  ["E952",0x5B19],
+  ["E95A",0x5B1A],
+  ["E953",0x5B1B],
+  ["BEC5",0x5B1D],
+  ["E95C",0x5B1E],
+  ["E95B",0x5B20],
+  ["E954",0x5B21],
+  ["ECD1",0x5B23],
+  ["C0A8",0x5B24],
+  ["ECCF",0x5B25],
+  ["ECD4",0x5B26],
+  ["ECD3",0x5B27],
+  ["E959",0x5B28],
+  ["C0A7",0x5B2A],
+  ["ECD2",0x5B2C],
+  ["ECCE",0x5B2D],
+  ["ECD6",0x5B2E],
+  ["ECD5",0x5B2F],
+  ["C0A6",0x5B30],
+  ["ECD0",0x5B32],
+  ["BEC6",0x5B34],
+  ["C254",0x5B38],
+  ["EFC1",0x5B3C],
+  ["F1FA",0x5B3D],
+  ["F1FB",0x5B3E],
+  ["F1FC",0x5B3F],
+  ["C45C",0x5B40],
+  ["C45D",0x5B43],
+  ["F443",0x5B45],
+  ["F5C8",0x5B47],
+  ["F5C7",0x5B48],
+  ["F6DB",0x5B4B],
+  ["F6DC",0x5B4C],
+  ["F7D5",0x5B4D],
+  ["F8A7",0x5B4E],
+  ["A46C",0x5B50],
+  ["A46D",0x5B51],
+  ["A46E",0x5B53],
+  ["A4D5",0x5B54],
+  ["A5A5",0x5B55],
+  ["C9D3",0x5B56],
+  ["A672",0x5B57],
+  ["A673",0x5B58],
+  ["A7B7",0x5B5A],
+  ["A7B8",0x5B5B],
+  ["A7B6",0x5B5C],
+  ["A7B5",0x5B5D],
+  ["A973",0x5B5F],
+  ["CC55",0x5B62],
+  ["A975",0x5B63],
+  ["A974",0x5B64],
+  ["CC56",0x5B65],
+  ["ABC4",0x5B69],
+  ["AE5D",0x5B6B],
+  ["D165",0x5B6C],
+  ["D4F0",0x5B6E],
+  ["B145",0x5B70],
+  ["B447",0x5B71],
+  ["D4EF",0x5B72],
+  ["B446",0x5B73],
+  ["B9E5",0x5B75],
+  ["E17D",0x5B77],
+  ["BEC7",0x5B78],
+  ["C0A9",0x5B7A],
+  ["ECD7",0x5B7B],
+  ["C45E",0x5B7D],
+  ["C570",0x5B7F],
+  ["C972",0x5B81],
+  ["A5A6",0x5B83],
+  ["C973",0x5B84],
+  ["A676",0x5B85],
+  ["A674",0x5B87],
+  ["A675",0x5B88],
+  ["A677",0x5B89],
+  ["A7BA",0x5B8B],
+  ["A7B9",0x5B8C],
+  ["CABC",0x5B8E],
+  ["A7BB",0x5B8F],
+  ["CABD",0x5B92],
+  ["CC57",0x5B93],
+  ["CC58",0x5B95],
+  ["A976",0x5B97],
+  ["A978",0x5B98],
+  ["A97A",0x5B99],
+  ["A977",0x5B9A],
+  ["A97B",0x5B9B],
+  ["A979",0x5B9C],
+  ["ABC8",0x5BA2],
+  ["ABC5",0x5BA3],
+  ["ABC7",0x5BA4],
+  ["ABC9",0x5BA5],
+  ["ABC6",0x5BA6],
+  ["D166",0x5BA7],
+  ["CE77",0x5BA8],
+  ["D168",0x5BAC],
+  ["D167",0x5BAD],
+  ["AE63",0x5BAE],
+  ["AE5F",0x5BB0],
+  ["AE60",0x5BB3],
+  ["AE62",0x5BB4],
+  ["AE64",0x5BB5],
+  ["AE61",0x5BB6],
+  ["AE66",0x5BB8],
+  ["AE65",0x5BB9],
+  ["B14A",0x5BBF],
+  ["D4F2",0x5BC0],
+  ["D4F1",0x5BC1],
+  ["B149",0x5BC2],
+  ["B148",0x5BC4],
+  ["B147",0x5BC5],
+  ["B14B",0x5BC6],
+  ["B146",0x5BC7],
+  ["D8D5",0x5BCA],
+  ["D8D2",0x5BCB],
+  ["B449",0x5BCC],
+  ["D8D1",0x5BCD],
+  ["D8D6",0x5BCE],
+  ["B44B",0x5BD0],
+  ["D8D4",0x5BD1],
+  ["B448",0x5BD2],
+  ["B44A",0x5BD3],
+  ["D8D3",0x5BD4],
+  ["DD48",0x5BD6],
+  ["DD49",0x5BD8],
+  ["DD4A",0x5BD9],
+  ["B9E6",0x5BDE],
+  ["B9EE",0x5BDF],
+  ["E17E",0x5BE0],
+  ["B9E8",0x5BE1],
+  ["B9EC",0x5BE2],
+  ["E1A1",0x5BE3],
+  ["B9ED",0x5BE4],
+  ["B9E9",0x5BE5],
+  ["B9EA",0x5BE6],
+  ["B9E7",0x5BE7],
+  ["B9EB",0x5BE8],
+  ["BC66",0x5BE9],
+  ["D8D0",0x5BEA],
+  ["BC67",0x5BEB],
+  ["BC65",0x5BEC],
+  ["BC64",0x5BEE],
+  ["E95D",0x5BEF],
+  ["BEC8",0x5BF0],
+  ["ECD8",0x5BF1],
+  ["ECD9",0x5BF2],
+  ["C364",0x5BF5],
+  ["C45F",0x5BF6],
+  ["A46F",0x5BF8],
+  ["A678",0x5BFA],
+  ["ABCA",0x5C01],
+  ["D169",0x5C03],
+  ["AE67",0x5C04],
+  ["B14E",0x5C07],
+  ["B14D",0x5C08],
+  ["B14C",0x5C09],
+  ["B44C",0x5C0A],
+  ["B44D",0x5C0B],
+  ["D8D7",0x5C0C],
+  ["B9EF",0x5C0D],
+  ["BEC9",0x5C0E],
+  ["A470",0x5C0F],
+  ["C95C",0x5C10],
+  ["A4D6",0x5C11],
+  ["C974",0x5C12],
+  ["C9D4",0x5C15],
+  ["A679",0x5C16],
+  ["A97C",0x5C1A],
+  ["DD4B",0x5C1F],
+  ["A471",0x5C22],
+  ["A4D7",0x5C24],
+  ["C9D5",0x5C25],
+  ["CABE",0x5C28],
+  ["CABF",0x5C2A],
+  ["A7BC",0x5C2C],
+  ["D8D8",0x5C30],
+  ["B44E",0x5C31],
+  ["DD4C",0x5C33],
+  ["C0AA",0x5C37],
+  ["A472",0x5C38],
+  ["A4A8",0x5C39],
+  ["A4D8",0x5C3A],
+  ["C975",0x5C3B],
+  ["A5A7",0x5C3C],
+  ["A7C0",0x5C3E],
+  ["A7BF",0x5C3F],
+  ["A7BD",0x5C40],
+  ["A7BE",0x5C41],
+  ["CC59",0x5C44],
+  ["A97E",0x5C45],
+  ["A9A1",0x5C46],
+  ["CC5A",0x5C47],
+  ["A97D",0x5C48],
+  ["ABCE",0x5C4B],
+  ["CE78",0x5C4C],
+  ["ABCD",0x5C4D],
+  ["ABCB",0x5C4E],
+  ["ABCC",0x5C4F],
+  ["AE6A",0x5C50],
+  ["AE68",0x5C51],
+  ["D16B",0x5C54],
+  ["AE69",0x5C55],
+  ["D16A",0x5C56],
+  ["AE5E",0x5C58],
+  ["D4F3",0x5C59],
+  ["B150",0x5C5C],
+  ["B151",0x5C5D],
+  ["B14F",0x5C60],
+  ["B9F0",0x5C62],
+  ["E1A2",0x5C63],
+  ["BC68",0x5C64],
+  ["BC69",0x5C65],
+  ["E561",0x5C67],
+  ["C0AB",0x5C68],
+  ["EFC2",0x5C69],
+  ["EFC3",0x5C6A],
+  ["C4DD",0x5C6C],
+  ["F8A8",0x5C6D],
+  ["C94B",0x5C6E],
+  ["A4D9",0x5C6F],
+  ["A473",0x5C71],
+  ["C977",0x5C73],
+  ["C976",0x5C74],
+  ["A67A",0x5C79],
+  ["C9D7",0x5C7A],
+  ["C9D8",0x5C7B],
+  ["C9D6",0x5C7C],
+  ["C9D9",0x5C7E],
+  ["CAC7",0x5C86],
+  ["CAC2",0x5C88],
+  ["CAC4",0x5C89],
+  ["CAC6",0x5C8A],
+  ["CAC3",0x5C8B],
+  ["A7C4",0x5C8C],
+  ["CAC0",0x5C8D],
+  ["CAC1",0x5C8F],
+  ["A7C1",0x5C90],
+  ["A7C2",0x5C91],
+  ["CAC5",0x5C92],
+  ["CAC8",0x5C93],
+  ["A7C3",0x5C94],
+  ["CAC9",0x5C95],
+  ["CC68",0x5C9D],
+  ["CC62",0x5C9F],
+  ["CC5D",0x5CA0],
+  ["A9A3",0x5CA1],
+  ["CC65",0x5CA2],
+  ["CC63",0x5CA3],
+  ["CC5C",0x5CA4],
+  ["CC69",0x5CA5],
+  ["CC6C",0x5CA6],
+  ["CC67",0x5CA7],
+  ["CC60",0x5CA8],
+  ["A9A5",0x5CA9],
+  ["CC66",0x5CAA],
+  ["A9A6",0x5CAB],
+  ["CC61",0x5CAC],
+  ["CC64",0x5CAD],
+  ["CC5B",0x5CAE],
+  ["CC5F",0x5CAF],
+  ["CC6B",0x5CB0],
+  ["A9A7",0x5CB1],
+  ["A9A8",0x5CB3],
+  ["CC5E",0x5CB5],
+  ["CC6A",0x5CB6],
+  ["A9A2",0x5CB7],
+  ["A9A4",0x5CB8],
+  ["CEAB",0x5CC6],
+  ["CEA4",0x5CC7],
+  ["CEAA",0x5CC8],
+  ["CEA3",0x5CC9],
+  ["CEA5",0x5CCA],
+  ["CE7D",0x5CCB],
+  ["CE7B",0x5CCC],
+  ["CEAC",0x5CCE],
+  ["CEA9",0x5CCF],
+  ["CE79",0x5CD0],
+  ["ABD0",0x5CD2],
+  ["CEA7",0x5CD3],
+  ["CEA8",0x5CD4],
+  ["CEA6",0x5CD6],
+  ["CE7C",0x5CD7],
+  ["CE7A",0x5CD8],
+  ["ABCF",0x5CD9],
+  ["CEA2",0x5CDA],
+  ["CE7E",0x5CDB],
+  ["CEA1",0x5CDE],
+  ["CEAD",0x5CDF],
+  ["AE6F",0x5CE8],
+  ["AE6E",0x5CEA],
+  ["D16C",0x5CEC],
+  ["AE6B",0x5CED],
+  ["D16E",0x5CEE],
+  ["AE70",0x5CF0],
+  ["D16F",0x5CF1],
+  ["AE73",0x5CF4],
+  ["AE71",0x5CF6],
+  ["D170",0x5CF7],
+  ["CEAE",0x5CF8],
+  ["D172",0x5CF9],
+  ["AE6D",0x5CFB],
+  ["AE6C",0x5CFD],
+  ["D16D",0x5CFF],
+  ["D171",0x5D00],
+  ["AE72",0x5D01],
+  ["B153",0x5D06],
+  ["B152",0x5D07],
+  ["D4F5",0x5D0B],
+  ["D4F9",0x5D0C],
+  ["D4FB",0x5D0D],
+  ["B154",0x5D0E],
+  ["D4FE",0x5D0F],
+  ["B158",0x5D11],
+  ["D541",0x5D12],
+  ["B15A",0x5D14],
+  ["B156",0x5D16],
+  ["B15E",0x5D17],
+  ["B15B",0x5D19],
+  ["D4F7",0x5D1A],
+  ["B155",0x5D1B],
+  ["D4F6",0x5D1D],
+  ["D4F4",0x5D1E],
+  ["D543",0x5D1F],
+  ["D4F8",0x5D20],
+  ["B157",0x5D22],
+  ["D542",0x5D23],
+  ["B15C",0x5D24],
+  ["D4FD",0x5D25],
+  ["D4FC",0x5D26],
+  ["B15D",0x5D27],
+  ["D4FA",0x5D28],
+  ["B159",0x5D29],
+  ["D544",0x5D2E],
+  ["D540",0x5D30],
+  ["D8E7",0x5D31],
+  ["D8EE",0x5D32],
+  ["D8E3",0x5D33],
+  ["B451",0x5D34],
+  ["D8DF",0x5D35],
+  ["D8EF",0x5D36],
+  ["D8D9",0x5D37],
+  ["D8EC",0x5D38],
+  ["D8EA",0x5D39],
+  ["D8E4",0x5D3A],
+  ["D8ED",0x5D3C],
+  ["D8E6",0x5D3D],
+  ["D8DE",0x5D3F],
+  ["D8F0",0x5D40],
+  ["D8DC",0x5D41],
+  ["D8E9",0x5D42],
+  ["D8DA",0x5D43],
+  ["D8F1",0x5D45],
+  ["B452",0x5D47],
+  ["D8EB",0x5D49],
+  ["DD4F",0x5D4A],
+  ["D8DD",0x5D4B],
+  ["B44F",0x5D4C],
+  ["D8E1",0x5D4E],
+  ["B450",0x5D50],
+  ["D8E0",0x5D51],
+  ["D8E5",0x5D52],
+  ["D8E2",0x5D55],
+  ["D8E8",0x5D59],
+  ["DD53",0x5D5E],
+  ["DD56",0x5D62],
+  ["DD4E",0x5D63],
+  ["DD50",0x5D65],
+  ["DD55",0x5D67],
+  ["DD54",0x5D68],
+  ["B743",0x5D69],
+  ["D8DB",0x5D6B],
+  ["DD52",0x5D6C],
+  ["B744",0x5D6F],
+  ["DD4D",0x5D71],
+  ["DD51",0x5D72],
+  ["E1A9",0x5D77],
+  ["E1B0",0x5D79],
+  ["E1A7",0x5D7A],
+  ["E1AE",0x5D7C],
+  ["E1A5",0x5D7D],
+  ["E1AD",0x5D7E],
+  ["E1B1",0x5D7F],
+  ["E1A4",0x5D80],
+  ["E1A8",0x5D81],
+  ["E1A3",0x5D82],
+  ["B9F1",0x5D84],
+  ["E1A6",0x5D86],
+  ["B9F2",0x5D87],
+  ["E1AC",0x5D88],
+  ["E1AB",0x5D89],
+  ["E1AA",0x5D8A],
+  ["E1AF",0x5D8D],
+  ["E565",0x5D92],
+  ["E567",0x5D93],
+  ["BC6B",0x5D94],
+  ["E568",0x5D95],
+  ["E563",0x5D97],
+  ["E562",0x5D99],
+  ["E56C",0x5D9A],
+  ["E56A",0x5D9C],
+  ["BC6A",0x5D9D],
+  ["E56D",0x5D9E],
+  ["E564",0x5D9F],
+  ["E569",0x5DA0],
+  ["E56B",0x5DA1],
+  ["E566",0x5DA2],
+  ["E961",0x5DA7],
+  ["E966",0x5DA8],
+  ["E960",0x5DA9],
+  ["E965",0x5DAA],
+  ["E95E",0x5DAC],
+  ["E968",0x5DAD],
+  ["E964",0x5DAE],
+  ["E969",0x5DAF],
+  ["E963",0x5DB0],
+  ["E95F",0x5DB1],
+  ["E967",0x5DB2],
+  ["E96A",0x5DB4],
+  ["E962",0x5DB5],
+  ["ECDA",0x5DB7],
+  ["C0AF",0x5DB8],
+  ["C0AD",0x5DBA],
+  ["C0AC",0x5DBC],
+  ["C0AE",0x5DBD],
+  ["EFC4",0x5DC0],
+  ["F172",0x5DC2],
+  ["F1FD",0x5DC3],
+  ["F444",0x5DC6],
+  ["F445",0x5DC7],
+  ["C460",0x5DC9],
+  ["F5C9",0x5DCB],
+  ["C4DE",0x5DCD],
+  ["F5CA",0x5DCF],
+  ["F6DE",0x5DD1],
+  ["C572",0x5DD2],
+  ["C571",0x5DD4],
+  ["F6DD",0x5DD5],
+  ["C5C9",0x5DD6],
+  ["F7D6",0x5DD8],
+  ["A474",0x5DDD],
+  ["A67B",0x5DDE],
+  ["C9DA",0x5DDF],
+  ["CACA",0x5DE0],
+  ["A8B5",0x5DE1],
+  ["B15F",0x5DE2],
+  ["A475",0x5DE5],
+  ["A5AA",0x5DE6],
+  ["A5A9",0x5DE7],
+  ["A5A8",0x5DE8],
+  ["A7C5",0x5DEB],
+  ["AE74",0x5DEE],
+  ["DD57",0x5DF0],
+  ["A476",0x5DF1],
+  ["A477",0x5DF2],
+  ["A478",0x5DF3],
+  ["A4DA",0x5DF4],
+  ["ABD1",0x5DF7],
+  ["CEAF",0x5DF9],
+  ["B453",0x5DFD],
+  ["A479",0x5DFE],
+  ["C95D",0x5DFF],
+  ["A5AB",0x5E02],
+  ["A5AC",0x5E03],
+  ["C978",0x5E04],
+  ["A67C",0x5E06],
+  ["CACB",0x5E0A],
+  ["A7C6",0x5E0C],
+  ["CACC",0x5E0E],
+  ["A9AE",0x5E11],
+  ["CC6E",0x5E14],
+  ["A9AC",0x5E15],
+  ["A9AB",0x5E16],
+  ["CC6D",0x5E17],
+  ["A9A9",0x5E18],
+  ["CC6F",0x5E19],
+  ["A9AA",0x5E1A],
+  ["A9AD",0x5E1B],
+  ["ABD2",0x5E1D],
+  ["ABD4",0x5E1F],
+  ["CEB3",0x5E20],
+  ["CEB0",0x5E21],
+  ["CEB1",0x5E22],
+  ["CEB2",0x5E23],
+  ["CEB4",0x5E24],
+  ["ABD3",0x5E25],
+  ["D174",0x5E28],
+  ["D173",0x5E29],
+  ["AE76",0x5E2B],
+  ["AE75",0x5E2D],
+  ["B162",0x5E33],
+  ["D546",0x5E34],
+  ["B161",0x5E36],
+  ["B163",0x5E37],
+  ["B160",0x5E38],
+  ["B455",0x5E3D],
+  ["D545",0x5E3E],
+  ["B456",0x5E40],
+  ["D8F3",0x5E41],
+  ["B457",0x5E43],
+  ["D8F2",0x5E44],
+  ["B454",0x5E45],
+  ["DD5A",0x5E4A],
+  ["DD5C",0x5E4B],
+  ["B745",0x5E4C],
+  ["DD5B",0x5E4D],
+  ["DD59",0x5E4E],
+  ["DD58",0x5E4F],
+  ["E1B4",0x5E53],
+  ["B9F7",0x5E54],
+  ["B9F5",0x5E55],
+  ["B9F6",0x5E57],
+  ["E1B2",0x5E58],
+  ["E1B3",0x5E59],
+  ["B9F3",0x5E5B],
+  ["E571",0x5E5C],
+  ["E56F",0x5E5D],
+  ["BC6D",0x5E5F],
+  ["E570",0x5E60],
+  ["BC6E",0x5E61],
+  ["BC6C",0x5E62],
+  ["B9F4",0x5E63],
+  ["E96D",0x5E66],
+  ["E96B",0x5E67],
+  ["E96C",0x5E68],
+  ["E56E",0x5E69],
+  ["ECDC",0x5E6A],
+  ["C0B0",0x5E6B],
+  ["ECDB",0x5E6C],
+  ["EFC5",0x5E6D],
+  ["EFC6",0x5E6E],
+  ["E96E",0x5E6F],
+  ["F1FE",0x5E70],
+  ["A47A",0x5E72],
+  ["A5AD",0x5E73],
+  ["A67E",0x5E74],
+  ["C9DB",0x5E75],
+  ["A67D",0x5E76],
+  ["A9AF",0x5E78],
+  ["B746",0x5E79],
+  ["A4DB",0x5E7B],
+  ["A5AE",0x5E7C],
+  ["ABD5",0x5E7D],
+  ["B458",0x5E7E],
+  ["C979",0x5E80],
+  ["C97A",0x5E82],
+  ["C9DC",0x5E84],
+  ["A7C8",0x5E87],
+  ["CAD0",0x5E88],
+  ["CACE",0x5E89],
+  ["A7C9",0x5E8A],
+  ["CACD",0x5E8B],
+  ["CACF",0x5E8C],
+  ["CAD1",0x5E8D],
+  ["A7C7",0x5E8F],
+  ["A9B3",0x5E95],
+  ["A9B4",0x5E96],
+  ["A9B1",0x5E97],
+  ["A9B0",0x5E9A],
+  ["CEB8",0x5E9B],
+  ["A9B2",0x5E9C],
+  ["ABD6",0x5EA0],
+  ["CEB7",0x5EA2],
+  ["CEB9",0x5EA3],
+  ["CEB6",0x5EA4],
+  ["CEBA",0x5EA5],
+  ["ABD7",0x5EA6],
+  ["AE79",0x5EA7],
+  ["D175",0x5EA8],
+  ["D177",0x5EAA],
+  ["AE77",0x5EAB],
+  ["D178",0x5EAC],
+  ["AE78",0x5EAD],
+  ["D176",0x5EAE],
+  ["CEB5",0x5EB0],
+  ["D547",0x5EB1],
+  ["D54A",0x5EB2],
+  ["D54B",0x5EB3],
+  ["D548",0x5EB4],
+  ["B167",0x5EB5],
+  ["B166",0x5EB6],
+  ["B164",0x5EB7],
+  ["B165",0x5EB8],
+  ["D549",0x5EB9],
+  ["B168",0x5EBE],
+  ["B45A",0x5EC1],
+  ["B45B",0x5EC2],
+  ["B45C",0x5EC4],
+  ["DD5D",0x5EC5],
+  ["DD5F",0x5EC6],
+  ["DD61",0x5EC7],
+  ["B748",0x5EC8],
+  ["B747",0x5EC9],
+  ["B459",0x5ECA],
+  ["DD60",0x5ECB],
+  ["DD5E",0x5ECC],
+  ["E1B8",0x5ECE],
+  ["E1B6",0x5ED1],
+  ["E1BC",0x5ED2],
+  ["B9F8",0x5ED3],
+  ["E1BD",0x5ED4],
+  ["E1BA",0x5ED5],
+  ["B9F9",0x5ED6],
+  ["E1B7",0x5ED7],
+  ["E1B5",0x5ED8],
+  ["E1BB",0x5ED9],
+  ["BC70",0x5EDA],
+  ["E573",0x5EDB],
+  ["E1B9",0x5EDC],
+  ["BC72",0x5EDD],
+  ["E574",0x5EDE],
+  ["BC71",0x5EDF],
+  ["BC74",0x5EE0],
+  ["E575",0x5EE1],
+  ["BC6F",0x5EE2],
+  ["BC73",0x5EE3],
+  ["E973",0x5EE5],
+  ["E971",0x5EE6],
+  ["E970",0x5EE7],
+  ["E972",0x5EE8],
+  ["E96F",0x5EE9],
+  ["C366",0x5EEC],
+  ["F446",0x5EEE],
+  ["F447",0x5EEF],
+  ["F5CB",0x5EF1],
+  ["F6DF",0x5EF2],
+  ["C655",0x5EF3],
+  ["A9B5",0x5EF6],
+  ["A7CA",0x5EF7],
+  ["ABD8",0x5EFA],
+  ["A47B",0x5EFE],
+  ["A4DC",0x5EFF],
+  ["A5AF",0x5F01],
+  ["C9DD",0x5F02],
+  ["A7CB",0x5F04],
+  ["CAD2",0x5F05],
+  ["CEBB",0x5F07],
+  ["ABD9",0x5F08],
+  ["B9FA",0x5F0A],
+  ["A47C",0x5F0B],
+  ["A6A1",0x5F0F],
+  ["B749",0x5F12],
+  ["A47D",0x5F13],
+  ["A4DD",0x5F14],
+  ["A4DE",0x5F15],
+  ["A5B1",0x5F17],
+  ["A5B0",0x5F18],
+  ["C9DE",0x5F1A],
+  ["A6A2",0x5F1B],
+  ["CAD3",0x5F1D],
+  ["A7CC",0x5F1F],
+  ["CC71",0x5F22],
+  ["CC72",0x5F23],
+  ["CC73",0x5F24],
+  ["A9B6",0x5F26],
+  ["A9B7",0x5F27],
+  ["CC70",0x5F28],
+  ["A9B8",0x5F29],
+  ["ABDA",0x5F2D],
+  ["CEBC",0x5F2E],
+  ["D17A",0x5F30],
+  ["AE7A",0x5F31],
+  ["D179",0x5F33],
+  ["B169",0x5F35],
+  ["D54C",0x5F36],
+  ["B16A",0x5F37],
+  ["D54D",0x5F38],
+  ["B45D",0x5F3C],
+  ["DD62",0x5F40],
+  ["E1BF",0x5F43],
+  ["E1BE",0x5F44],
+  ["B9FB",0x5F46],
+  ["BC75",0x5F48],
+  ["E576",0x5F49],
+  ["BECA",0x5F4A],
+  ["E974",0x5F4B],
+  ["C0B1",0x5F4C],
+  ["C573",0x5F4E],
+  ["F7D8",0x5F4F],
+  ["CC74",0x5F54],
+  ["CEBD",0x5F56],
+  ["B16B",0x5F57],
+  ["D8F4",0x5F58],
+  ["B74A",0x5F59],
+  ["C255",0x5F5D],
+  ["A7CE",0x5F62],
+  ["A7CD",0x5F64],
+  ["ABDB",0x5F65],
+  ["D17B",0x5F67],
+  ["B16D",0x5F69],
+  ["B343",0x5F6A],
+  ["B16E",0x5F6B],
+  ["B16C",0x5F6C],
+  ["B45E",0x5F6D],
+  ["E1C0",0x5F6F],
+  ["B9FC",0x5F70],
+  ["BC76",0x5F71],
+  ["C94C",0x5F73],
+  ["C9DF",0x5F74],
+  ["CAD5",0x5F76],
+  ["A7CF",0x5F77],
+  ["CAD4",0x5F78],
+  ["A7D0",0x5F79],
+  ["A9BC",0x5F7C],
+  ["CC77",0x5F7D],
+  ["CC76",0x5F7E],
+  ["A9BB",0x5F7F],
+  ["A9B9",0x5F80],
+  ["A9BA",0x5F81],
+  ["CC75",0x5F82],
+  ["ABDD",0x5F85],
+  ["CEBE",0x5F86],
+  ["ABE0",0x5F87],
+  ["ABDC",0x5F88],
+  ["ABE2",0x5F89],
+  ["ABDE",0x5F8A],
+  ["ABDF",0x5F8B],
+  ["ABE1",0x5F8C],
+  ["AE7D",0x5F90],
+  ["AE7C",0x5F91],
+  ["AE7B",0x5F92],
+  ["D54F",0x5F96],
+  ["B16F",0x5F97],
+  ["B172",0x5F98],
+  ["B170",0x5F99],
+  ["D54E",0x5F9B],
+  ["B175",0x5F9C],
+  ["B171",0x5F9E],
+  ["D550",0x5F9F],
+  ["B174",0x5FA0],
+  ["B173",0x5FA1],
+  ["D8F6",0x5FA5],
+  ["D8F5",0x5FA6],
+  ["B461",0x5FA8],
+  ["B45F",0x5FA9],
+  ["B460",0x5FAA],
+  ["D8F7",0x5FAB],
+  ["B74B",0x5FAC],
+  ["DD64",0x5FAD],
+  ["B74C",0x5FAE],
+  ["DD63",0x5FAF],
+  ["E577",0x5FB2],
+  ["BC78",0x5FB5],
+  ["E1C1",0x5FB6],
+  ["BC77",0x5FB7],
+  ["B9FD",0x5FB9],
+  ["ECDE",0x5FBB],
+  ["E975",0x5FBC],
+  ["C0B2",0x5FBD],
+  ["ECDD",0x5FBE],
+  ["F240",0x5FBF],
+  ["F448",0x5FC0],
+  ["F449",0x5FC1],
+  ["A4DF",0x5FC3],
+  ["A5B2",0x5FC5],
+  ["C97B",0x5FC9],
+  ["A7D2",0x5FCC],
+  ["A7D4",0x5FCD],
+  ["C9E2",0x5FCF],
+  ["CAD8",0x5FD0],
+  ["CAD7",0x5FD1],
+  ["CAD6",0x5FD2],
+  ["C9E1",0x5FD4],
+  ["C9E0",0x5FD5],
+  ["A6A4",0x5FD6],
+  ["A7D3",0x5FD7],
+  ["A7D1",0x5FD8],
+  ["A6A3",0x5FD9],
+  ["A9BD",0x5FDD],
+  ["CC78",0x5FDE],
+  ["A9BE",0x5FE0],
+  ["CADD",0x5FE1],
+  ["CADF",0x5FE3],
+  ["CADE",0x5FE4],
+  ["CC79",0x5FE5],
+  ["CADA",0x5FE8],
+  ["A7D8",0x5FEA],
+  ["A7D6",0x5FEB],
+  ["CAD9",0x5FED],
+  ["CADB",0x5FEE],
+  ["CAE1",0x5FEF],
+  ["A7D5",0x5FF1],
+  ["CADC",0x5FF3],
+  ["CAE5",0x5FF4],
+  ["A9C0",0x5FF5],
+  ["CAE2",0x5FF7],
+  ["A7D7",0x5FF8],
+  ["CAE0",0x5FFA],
+  ["CAE3",0x5FFB],
+  ["A9BF",0x5FFD],
+  ["A9C1",0x5FFF],
+  ["CAE4",0x6000],
+  ["CCAF",0x6009],
+  ["CCA2",0x600A],
+  ["CC7E",0x600B],
+  ["CCAE",0x600C],
+  ["CCA9",0x600D],
+  ["ABE7",0x600E],
+  ["A9C2",0x600F],
+  ["CCAA",0x6010],
+  ["CCAD",0x6011],
+  ["ABE3",0x6012],
+  ["CCAC",0x6013],
+  ["A9C3",0x6014],
+  ["A9C8",0x6015],
+  ["A9C6",0x6016],
+  ["CCA3",0x6017],
+  ["CC7C",0x6019],
+  ["CCA5",0x601A],
+  ["A9CD",0x601B],
+  ["CCB0",0x601C],
+  ["ABE4",0x601D],
+  ["CCA6",0x601E],
+  ["ABE5",0x6020],
+  ["A9C9",0x6021],
+  ["CCA8",0x6022],
+  ["CECD",0x6024],
+  ["ABE6",0x6025],
+  ["CC7B",0x6026],
+  ["A9CA",0x6027],
+  ["ABE8",0x6028],
+  ["A9CB",0x6029],
+  ["A9C7",0x602A],
+  ["A9CC",0x602B],
+  ["CCA7",0x602C],
+  ["CC7A",0x602D],
+  ["CCAB",0x602E],
+  ["A9C4",0x602F],
+  ["CC7D",0x6032],
+  ["CCA4",0x6033],
+  ["CCA1",0x6034],
+  ["A9C5",0x6035],
+  ["CEBF",0x6037],
+  ["CEC0",0x6039],
+  ["CECA",0x6040],
+  ["D1A1",0x6041],
+  ["CECB",0x6042],
+  ["ABEE",0x6043],
+  ["CECE",0x6044],
+  ["CEC4",0x6045],
+  ["ABED",0x6046],
+  ["CEC6",0x6047],
+  ["CEC7",0x6049],
+  ["CEC9",0x604C],
+  ["ABE9",0x604D],
+  ["AEA3",0x6050],
+  ["CEC5",0x6053],
+  ["CEC1",0x6054],
+  ["AEA4",0x6055],
+  ["CECF",0x6058],
+  ["AE7E",0x6059],
+  ["D17D",0x605A],
+  ["CEC8",0x605B],
+  ["D17C",0x605D],
+  ["CEC3",0x605E],
+  ["CECC",0x605F],
+  ["ABEC",0x6062],
+  ["AEA1",0x6063],
+  ["ABF2",0x6064],
+  ["AEA2",0x6065],
+  ["CED0",0x6066],
+  ["D17E",0x6067],
+  ["ABEB",0x6068],
+  ["AEA6",0x6069],
+  ["ABF1",0x606A],
+  ["ABF0",0x606B],
+  ["ABEF",0x606C],
+  ["AEA5",0x606D],
+  ["CED1",0x606E],
+  ["AEA7",0x606F],
+  ["ABEA",0x6070],
+  ["CEC2",0x6072],
+  ["B176",0x607F],
+  ["D1A4",0x6080],
+  ["D1A6",0x6081],
+  ["D1A8",0x6083],
+  ["AEA8",0x6084],
+  ["AEAE",0x6085],
+  ["D553",0x6086],
+  ["D1AC",0x6087],
+  ["D1A3",0x6088],
+  ["B178",0x6089],
+  ["D551",0x608A],
+  ["AEAD",0x608C],
+  ["AEAB",0x608D],
+  ["D1AE",0x608E],
+  ["D552",0x6090],
+  ["D1A5",0x6092],
+  ["AEAC",0x6094],
+  ["D1A9",0x6095],
+  ["AEAF",0x6096],
+  ["D1AB",0x6097],
+  ["AEAA",0x609A],
+  ["D1AA",0x609B],
+  ["D1AD",0x609C],
+  ["D1A7",0x609D],
+  ["AEA9",0x609F],
+  ["B179",0x60A0],
+  ["D1A2",0x60A2],
+  ["B177",0x60A3],
+  ["B17A",0x60A8],
+  ["D555",0x60B0],
+  ["D55E",0x60B1],
+  ["B464",0x60B2],
+  ["B17C",0x60B4],
+  ["B1A3",0x60B5],
+  ["B465",0x60B6],
+  ["D560",0x60B7],
+  ["B1AA",0x60B8],
+  ["D8F9",0x60B9],
+  ["D556",0x60BA],
+  ["B1A2",0x60BB],
+  ["B1A5",0x60BC],
+  ["B17E",0x60BD],
+  ["D554",0x60BE],
+  ["D562",0x60BF],
+  ["D565",0x60C0],
+  ["D949",0x60C1],
+  ["D563",0x60C3],
+  ["D8FD",0x60C4],
+  ["B1A1",0x60C5],
+  ["B1A8",0x60C6],
+  ["B1AC",0x60C7],
+  ["D55D",0x60C8],
+  ["D8F8",0x60C9],
+  ["D561",0x60CA],
+  ["B17B",0x60CB],
+  ["D8FA",0x60CC],
+  ["D564",0x60CD],
+  ["D8FC",0x60CE],
+  ["D559",0x60CF],
+  ["B462",0x60D1],
+  ["D557",0x60D3],
+  ["D558",0x60D4],
+  ["B1A7",0x60D5],
+  ["B1A6",0x60D8],
+  ["D55B",0x60D9],
+  ["B1AB",0x60DA],
+  ["D55F",0x60DB],
+  ["B1A4",0x60DC],
+  ["D55C",0x60DD],
+  ["B1A9",0x60DF],
+  ["B466",0x60E0],
+  ["B463",0x60E1],
+  ["D8FB",0x60E2],
+  ["D55A",0x60E4],
+  ["B17D",0x60E6],
+  ["B46B",0x60F0],
+  ["B46F",0x60F1],
+  ["D940",0x60F2],
+  ["B751",0x60F3],
+  ["B46D",0x60F4],
+  ["D944",0x60F5],
+  ["B471",0x60F6],
+  ["DD65",0x60F7],
+  ["D946",0x60F8],
+  ["B753",0x60F9],
+  ["B469",0x60FA],
+  ["B46C",0x60FB],
+  ["D947",0x60FC],
+  ["D948",0x60FE],
+  ["D94E",0x60FF],
+  ["B473",0x6100],
+  ["B754",0x6101],
+  ["D94A",0x6103],
+  ["D94F",0x6104],
+  ["D943",0x6105],
+  ["B75E",0x6106],
+  ["B755",0x6108],
+  ["B472",0x6109],
+  ["D941",0x610A],
+  ["D950",0x610B],
+  ["B75D",0x610D],
+  ["B470",0x610E],
+  ["B74E",0x610F],
+  ["D94D",0x6110],
+  ["B474",0x6112],
+  ["D945",0x6113],
+  ["D8FE",0x6114],
+  ["B46A",0x6115],
+  ["D942",0x6116],
+  ["D94B",0x6118],
+  ["B74D",0x611A],
+  ["B752",0x611B],
+  ["B467",0x611C],
+  ["D94C",0x611D],
+  ["B750",0x611F],
+  ["B468",0x6123],
+  ["B75C",0x6127],
+  ["E1C3",0x6128],
+  ["DD70",0x6129],
+  ["DD68",0x612B],
+  ["E1C2",0x612C],
+  ["DD6C",0x612E],
+  ["DD6E",0x612F],
+  ["DD6B",0x6132],
+  ["B75B",0x6134],
+  ["DD6A",0x6136],
+  ["B75F",0x6137],
+  ["E1D2",0x613B],
+  ["B75A",0x613E],
+  ["BA40",0x613F],
+  ["DD71",0x6140],
+  ["E1C4",0x6141],
+  ["B758",0x6144],
+  ["DD69",0x6145],
+  ["DD6D",0x6146],
+  ["B9FE",0x6147],
+  ["B74F",0x6148],
+  ["DD66",0x6149],
+  ["DD67",0x614A],
+  ["BA41",0x614B],
+  ["B757",0x614C],
+  ["B759",0x614D],
+  ["B756",0x614E],
+  ["DD6F",0x614F],
+  ["E1C8",0x6152],
+  ["E1C9",0x6153],
+  ["E1CE",0x6154],
+  ["BC7D",0x6155],
+  ["E1D5",0x6156],
+  ["BA47",0x6158],
+  ["BA46",0x615A],
+  ["E1D0",0x615B],
+  ["BC7C",0x615D],
+  ["E1C5",0x615E],
+  ["BA45",0x615F],
+  ["E1D4",0x6161],
+  ["BA43",0x6162],
+  ["BA44",0x6163],
+  ["E1D1",0x6165],
+  ["E5AA",0x6166],
+  ["BC7A",0x6167],
+  ["B46E",0x6168],
+  ["E1D3",0x616A],
+  ["BCA3",0x616B],
+  ["E1CB",0x616C],
+  ["BC7B",0x616E],
+  ["BCA2",0x6170],
+  ["E1C6",0x6171],
+  ["E1CA",0x6172],
+  ["E1C7",0x6173],
+  ["E1CD",0x6174],
+  ["BA48",0x6175],
+  ["BC79",0x6176],
+  ["BA42",0x6177],
+  ["E57A",0x6179],
+  ["E1CF",0x617A],
+  ["BCA1",0x617C],
+  ["BCA4",0x617E],
+  ["E1CC",0x6180],
+  ["BC7E",0x6182],
+  ["E579",0x6183],
+  ["E57E",0x6189],
+  ["BECE",0x618A],
+  ["E578",0x618B],
+  ["E9A3",0x618C],
+  ["E5A9",0x618D],
+  ["BCA8",0x618E],
+  ["BCA6",0x6190],
+  ["BECC",0x6191],
+  ["E5A6",0x6192],
+  ["E5A2",0x6193],
+  ["BCAC",0x6194],
+  ["E978",0x6196],
+  ["BCAA",0x619A],
+  ["E5A1",0x619B],
+  ["E976",0x619D],
+  ["E5A5",0x619F],
+  ["E5A8",0x61A1],
+  ["E57D",0x61A2],
+  ["BCAB",0x61A4],
+  ["BCA5",0x61A7],
+  ["E977",0x61A8],
+  ["BECD",0x61A9],
+  ["E5A7",0x61AA],
+  ["BCA7",0x61AB],
+  ["BCA9",0x61AC],
+  ["E5A4",0x61AD],
+  ["BCAD",0x61AE],
+  ["E5A3",0x61AF],
+  ["E57C",0x61B0],
+  ["E57B",0x61B1],
+  ["BECB",0x61B2],
+  ["E5AB",0x61B3],
+  ["E97A",0x61B4],
+  ["ECE0",0x61B5],
+  ["BED0",0x61B6],
+  ["E9A2",0x61B8],
+  ["E97E",0x61BA],
+  ["ECE1",0x61BC],
+  ["BED1",0x61BE],
+  ["E9A1",0x61BF],
+  ["E97C",0x61C1],
+  ["C0B4",0x61C2],
+  ["ECDF",0x61C3],
+  ["E979",0x61C5],
+  ["E97B",0x61C6],
+  ["C0B5",0x61C7],
+  ["BED3",0x61C8],
+  ["C0B3",0x61C9],
+  ["BED2",0x61CA],
+  ["C0B7",0x61CB],
+  ["E97D",0x61CC],
+  ["BECF",0x61CD],
+  ["EFCF",0x61D6],
+  ["EFC7",0x61D8],
+  ["ECE7",0x61DE],
+  ["EFC8",0x61DF],
+  ["ECE3",0x61E0],
+  ["C256",0x61E3],
+  ["ECE5",0x61E4],
+  ["ECE4",0x61E5],
+  ["C0B6",0x61E6],
+  ["ECE2",0x61E7],
+  ["ECE6",0x61E8],
+  ["EFD0",0x61E9],
+  ["EFCC",0x61EA],
+  ["EFCE",0x61EB],
+  ["EFC9",0x61ED],
+  ["EFCA",0x61EE],
+  ["EFCD",0x61F0],
+  ["EFCB",0x61F1],
+  ["C367",0x61F2],
+  ["C36A",0x61F5],
+  ["C369",0x61F6],
+  ["C368",0x61F7],
+  ["C461",0x61F8],
+  ["F44A",0x61F9],
+  ["C462",0x61FA],
+  ["F241",0x61FB],
+  ["C4DF",0x61FC],
+  ["F5CC",0x61FD],
+  ["C4E0",0x61FE],
+  ["C574",0x61FF],
+  ["C5CA",0x6200],
+  ["F7D9",0x6201],
+  ["F7DA",0x6203],
+  ["F7DB",0x6204],
+  ["F9BA",0x6207],
+  ["A4E0",0x6208],
+  ["C97C",0x6209],
+  ["A5B3",0x620A],
+  ["A6A6",0x620C],
+  ["A6A7",0x620D],
+  ["A6A5",0x620E],
+  ["A6A8",0x6210],
+  ["A7DA",0x6211],
+  ["A7D9",0x6212],
+  ["CCB1",0x6214],
+  ["A9CF",0x6215],
+  ["A9CE",0x6216],
+  ["D1AF",0x6219],
+  ["B1AD",0x621A],
+  ["B1AE",0x621B],
+  ["B475",0x621F],
+  ["DD72",0x6220],
+  ["B760",0x6221],
+  ["B761",0x6222],
+  ["DD74",0x6223],
+  ["DD76",0x6224],
+  ["DD75",0x6225],
+  ["E1D7",0x6227],
+  ["E1D6",0x6229],
+  ["BA49",0x622A],
+  ["E1D8",0x622B],
+  ["E5AC",0x622D],
+  ["BCAE",0x622E],
+  ["BED4",0x6230],
+  ["C0B8",0x6232],
+  ["C257",0x6233],
+  ["C0B9",0x6234],
+  ["A4E1",0x6236],
+  ["CAE6",0x623A],
+  ["CCB2",0x623D],
+  ["A9D1",0x623E],
+  ["A9D0",0x623F],
+  ["A9D2",0x6240],
+  ["ABF3",0x6241],
+  ["CED2",0x6242],
+  ["CED3",0x6243],
+  ["D1B0",0x6246],
+  ["AEB0",0x6247],
+  ["B1AF",0x6248],
+  ["B476",0x6249],
+  ["D951",0x624A],
+  ["A4E2",0x624B],
+  ["A47E",0x624D],
+  ["A4E3",0x624E],
+  ["C97D",0x6250],
+  ["A5B7",0x6251],
+  ["A5B6",0x6252],
+  ["A5B4",0x6253],
+  ["A5B5",0x6254],
+  ["A6AB",0x6258],
+  ["C9E9",0x6259],
+  ["C9EB",0x625A],
+  ["A6AA",0x625B],
+  ["C9E3",0x625C],
+  ["C9E4",0x625E],
+  ["C9EA",0x6260],
+  ["C9E6",0x6261],
+  ["C9E8",0x6262],
+  ["A6A9",0x6263],
+  ["C9E5",0x6264],
+  ["C9EC",0x6265],
+  ["C9E7",0x6266],
+  ["A7E1",0x626D],
+  ["A7EA",0x626E],
+  ["A7E8",0x626F],
+  ["CAF0",0x6270],
+  ["CAED",0x6271],
+  ["CAF5",0x6272],
+  ["A7E6",0x6273],
+  ["CAF6",0x6274],
+  ["A7DF",0x6276],
+  ["CAF3",0x6277],
+  ["A7E5",0x6279],
+  ["CAEF",0x627A],
+  ["CAEE",0x627B],
+  ["A7E3",0x627C],
+  ["CAF4",0x627D],
+  ["A7E4",0x627E],
+  ["A9D3",0x627F],
+  ["A7DE",0x6280],
+  ["CAF1",0x6281],
+  ["CAE7",0x6283],
+  ["A7DB",0x6284],
+  ["A7EE",0x6286],
+  ["CAEC",0x6287],
+  ["CAF2",0x6288],
+  ["A7E0",0x6289],
+  ["A7E2",0x628A],
+  ["CAE8",0x628C],
+  ["CAE9",0x628E],
+  ["CAEA",0x628F],
+  ["A7ED",0x6291],
+  ["A7E7",0x6292],
+  ["A7EC",0x6293],
+  ["CAEB",0x6294],
+  ["A7EB",0x6295],
+  ["A7DD",0x6296],
+  ["A7DC",0x6297],
+  ["A7E9",0x6298],
+  ["A9E1",0x62A8],
+  ["CCBE",0x62A9],
+  ["CCB7",0x62AA],
+  ["A9DC",0x62AB],
+  ["A9EF",0x62AC],
+  ["CCB3",0x62AD],
+  ["CCBA",0x62AE],
+  ["CCBC",0x62AF],
+  ["CCBF",0x62B0],
+  ["A9EA",0x62B1],
+  ["CCBB",0x62B3],
+  ["CCB4",0x62B4],
+  ["A9E8",0x62B5],
+  ["CCB8",0x62B6],
+  ["CCC0",0x62B8],
+  ["A9D9",0x62B9],
+  ["CCBD",0x62BB],
+  ["A9E3",0x62BC],
+  ["A9E2",0x62BD],
+  ["CCB6",0x62BE],
+  ["A9D7",0x62BF],
+  ["A9D8",0x62C2],
+  ["A9D6",0x62C4],
+  ["A9EE",0x62C6],
+  ["A9E6",0x62C7],
+  ["A9E0",0x62C8],
+  ["A9D4",0x62C9],
+  ["CCB9",0x62CA],
+  ["A9DF",0x62CB],
+  ["A9D5",0x62CC],
+  ["A9E7",0x62CD],
+  ["A9F0",0x62CE],
+  ["CED4",0x62CF],
+  ["A9E4",0x62D0],
+  ["CCB5",0x62D1],
+  ["A9DA",0x62D2],
+  ["A9DD",0x62D3],
+  ["A9DE",0x62D4],
+  ["A9EC",0x62D6],
+  ["A9ED",0x62D7],
+  ["A9EB",0x62D8],
+  ["A9E5",0x62D9],
+  ["A9E9",0x62DA],
+  ["A9DB",0x62DB],
+  ["ABF4",0x62DC],
+  ["CEDA",0x62EB],
+  ["AC41",0x62EC],
+  ["ABF8",0x62ED],
+  ["ABFA",0x62EE],
+  ["AC40",0x62EF],
+  ["CEE6",0x62F0],
+  ["ABFD",0x62F1],
+  ["D1B1",0x62F2],
+  ["AEB1",0x62F3],
+  ["AC43",0x62F4],
+  ["CED7",0x62F5],
+  ["CEDF",0x62F6],
+  ["ABFE",0x62F7],
+  ["CEDE",0x62F8],
+  ["CEDB",0x62F9],
+  ["CEE3",0x62FA],
+  ["CEE5",0x62FB],
+  ["ABF7",0x62FC],
+  ["ABFB",0x62FD],
+  ["AC42",0x62FE],
+  ["AEB3",0x62FF],
+  ["CEE0",0x6300],
+  ["ABF9",0x6301],
+  ["AC45",0x6302],
+  ["CED9",0x6303],
+  ["ABFC",0x6307],
+  ["AEB2",0x6308],
+  ["ABF6",0x6309],
+  ["CED6",0x630B],
+  ["CEDD",0x630C],
+  ["CED5",0x630D],
+  ["CED8",0x630E],
+  ["CEDC",0x630F],
+  ["D1B2",0x6310],
+  ["AC44",0x6311],
+  ["CEE1",0x6313],
+  ["CEE2",0x6314],
+  ["CEE4",0x6315],
+  ["ABF5",0x6316],
+  ["AEC1",0x6328],
+  ["D1BE",0x6329],
+  ["AEBF",0x632A],
+  ["AEC0",0x632B],
+  ["D1B4",0x632C],
+  ["D1C4",0x632D],
+  ["AEB6",0x632F],
+  ["D566",0x6332],
+  ["D1C6",0x6333],
+  ["D1C0",0x6334],
+  ["D1B7",0x6336],
+  ["D1C9",0x6338],
+  ["D1BA",0x6339],
+  ["AEBC",0x633A],
+  ["D57D",0x633B],
+  ["D1BD",0x633C],
+  ["AEBE",0x633D],
+  ["AEB5",0x633E],
+  ["D1CB",0x6340],
+  ["D1BF",0x6341],
+  ["AEB8",0x6342],
+  ["D1B8",0x6343],
+  ["D1B5",0x6344],
+  ["D1B6",0x6345],
+  ["AEB9",0x6346],
+  ["D1C5",0x6347],
+  ["D1CC",0x6348],
+  ["AEBB",0x6349],
+  ["D1BC",0x634A],
+  ["D1BB",0x634B],
+  ["AEC3",0x634C],
+  ["AEC2",0x634D],
+  ["AEB4",0x634E],
+  ["AEBA",0x634F],
+  ["AEBD",0x6350],
+  ["D1C8",0x6351],
+  ["D1C2",0x6354],
+  ["AEB7",0x6355],
+  ["D1B3",0x6356],
+  ["D1CA",0x6357],
+  ["D1C1",0x6358],
+  ["D1C3",0x6359],
+  ["D1C7",0x635A],
+  ["D567",0x6365],
+  ["B1B7",0x6367],
+  ["B1CB",0x6368],
+  ["B1CA",0x6369],
+  ["B1BF",0x636B],
+  ["D579",0x636D],
+  ["D575",0x636E],
+  ["D572",0x636F],
+  ["D5A6",0x6370],
+  ["B1BA",0x6371],
+  ["B1B2",0x6372],
+  ["D577",0x6375],
+  ["B4A8",0x6376],
+  ["B1B6",0x6377],
+  ["D5A1",0x6378],
+  ["B1CC",0x637A],
+  ["B1C9",0x637B],
+  ["D57B",0x637C],
+  ["D56A",0x637D],
+  ["B1C8",0x6380],
+  ["D5A3",0x6381],
+  ["D569",0x6382],
+  ["B1BD",0x6383],
+  ["B1C1",0x6384],
+  ["D5A2",0x6385],
+  ["D573",0x6387],
+  ["B1C2",0x6388],
+  ["B1BC",0x6389],
+  ["D568",0x638A],
+  ["B478",0x638C],
+  ["D5A5",0x638D],
+  ["D571",0x638E],
+  ["B1C7",0x638F],
+  ["D574",0x6390],
+  ["D5A4",0x6391],
+  ["B1C6",0x6392],
+  ["D952",0x6394],
+  ["B1B3",0x6396],
+  ["D56F",0x6397],
+  ["B1B8",0x6398],
+  ["B1C3",0x6399],
+  ["B1BE",0x639B],
+  ["D578",0x639C],
+  ["D56E",0x639D],
+  ["D56C",0x639E],
+  ["D57E",0x639F],
+  ["B1B0",0x63A0],
+  ["B1C4",0x63A1],
+  ["B1B4",0x63A2],
+  ["B477",0x63A3],
+  ["D57C",0x63A4],
+  ["B1B5",0x63A5],
+  ["B1B1",0x63A7],
+  ["B1C0",0x63A8],
+  ["B1BB",0x63A9],
+  ["B1B9",0x63AA],
+  ["D570",0x63AB],
+  ["B1C5",0x63AC],
+  ["D56D",0x63AD],
+  ["D57A",0x63AE],
+  ["D576",0x63AF],
+  ["D954",0x63B0],
+  ["D953",0x63B1],
+  ["D56B",0x63BD],
+  ["D964",0x63BE],
+  ["B47A",0x63C0],
+  ["D96A",0x63C2],
+  ["D959",0x63C3],
+  ["D967",0x63C4],
+  ["DD77",0x63C5],
+  ["B47D",0x63C6],
+  ["D96B",0x63C7],
+  ["D96E",0x63C8],
+  ["B47C",0x63C9],
+  ["D95C",0x63CA],
+  ["D96D",0x63CB],
+  ["D96C",0x63CC],
+  ["B47E",0x63CD],
+  ["D955",0x63CE],
+  ["B479",0x63CF],
+  ["B4A3",0x63D0],
+  ["B4A1",0x63D2],
+  ["D969",0x63D3],
+  ["D95F",0x63D5],
+  ["B4A5",0x63D6],
+  ["D970",0x63D7],
+  ["D968",0x63D8],
+  ["D971",0x63D9],
+  ["B4AD",0x63DA],
+  ["B4AB",0x63DB],
+  ["D966",0x63DC],
+  ["D965",0x63DD],
+  ["D963",0x63DF],
+  ["D95D",0x63E0],
+  ["B4A4",0x63E1],
+  ["B4A2",0x63E3],
+  ["D1B9",0x63E4],
+  ["D956",0x63E5],
+  ["DDB7",0x63E7],
+  ["D957",0x63E8],
+  ["B47B",0x63E9],
+  ["B4AA",0x63EA],
+  ["DD79",0x63EB],
+  ["B4A6",0x63ED],
+  ["B4A7",0x63EE],
+  ["D958",0x63EF],
+  ["D96F",0x63F0],
+  ["DD78",0x63F1],
+  ["D960",0x63F2],
+  ["D95B",0x63F3],
+  ["B4A9",0x63F4],
+  ["D961",0x63F5],
+  ["D95E",0x63F6],
+  ["B4AE",0x63F9],
+  ["B770",0x6406],
+  ["DD7C",0x6409],
+  ["DDB1",0x640A],
+  ["DDB6",0x640B],
+  ["DDAA",0x640C],
+  ["B76C",0x640D],
+  ["DDBB",0x640E],
+  ["B769",0x640F],
+  ["DD7A",0x6410],
+  ["DD7B",0x6412],
+  ["B762",0x6413],
+  ["B76B",0x6414],
+  ["DDA4",0x6415],
+  ["B76E",0x6416],
+  ["B76F",0x6417],
+  ["DDA5",0x6418],
+  ["DDB2",0x641A],
+  ["DDB8",0x641B],
+  ["B76A",0x641C],
+  ["B764",0x641E],
+  ["DDA3",0x641F],
+  ["DD7D",0x6420],
+  ["DDBA",0x6421],
+  ["DDA8",0x6422],
+  ["DDA9",0x6423],
+  ["DD7E",0x6424],
+  ["DDB4",0x6425],
+  ["DDAB",0x6426],
+  ["DDB5",0x6427],
+  ["DDAD",0x6428],
+  ["B765",0x642A],
+  ["E1D9",0x642B],
+  ["B768",0x642C],
+  ["B766",0x642D],
+  ["DDB9",0x642E],
+  ["DDB0",0x642F],
+  ["DDAC",0x6430],
+  ["DDA1",0x6433],
+  ["BA53",0x6434],
+  ["DDAF",0x6435],
+  ["B76D",0x6436],
+  ["DDA7",0x6437],
+  ["DDA6",0x6439],
+  ["B767",0x643D],
+  ["B763",0x643E],
+  ["E1EE",0x643F],
+  ["DDB3",0x6440],
+  ["DDAE",0x6441],
+  ["DDA2",0x6443],
+  ["E1E9",0x644B],
+  ["E1DA",0x644D],
+  ["E1E5",0x644E],
+  ["E1EC",0x6450],
+  ["BA51",0x6451],
+  ["B4AC",0x6452],
+  ["E1EA",0x6453],
+  ["BA4C",0x6454],
+  ["BA4B",0x6458],
+  ["E1F1",0x6459],
+  ["E1DB",0x645B],
+  ["E1E8",0x645C],
+  ["E1DC",0x645D],
+  ["E1E7",0x645E],
+  ["BA4F",0x645F],
+  ["E1EB",0x6460],
+  ["D962",0x6461],
+  ["E1F2",0x6465],
+  ["E1E3",0x6466],
+  ["BA52",0x6467],
+  ["E5BA",0x6468],
+  ["BCAF",0x6469],
+  ["E1F0",0x646B],
+  ["E1EF",0x646C],
+  ["BA54",0x646D],
+  ["E5AD",0x646E],
+  ["BCB0",0x646F],
+  ["E5AE",0x6470],
+  ["E1DF",0x6472],
+  ["E1E0",0x6473],
+  ["E1DD",0x6474],
+  ["E1E2",0x6475],
+  ["E1DE",0x6476],
+  ["E1F3",0x6477],
+  ["BA4E",0x6478],
+  ["BCB1",0x6479],
+  ["BA50",0x647A],
+  ["BA55",0x647B],
+  ["E1E1",0x647D],
+  ["E1ED",0x647F],
+  ["E1E6",0x6482],
+  ["E5B1",0x6485],
+  ["BA4A",0x6487],
+  ["BCB4",0x6488],
+  ["E9AA",0x6489],
+  ["E5B6",0x648A],
+  ["E5B5",0x648B],
+  ["E5B7",0x648C],
+  ["E5B4",0x648F],
+  ["BCB5",0x6490],
+  ["BCBB",0x6492],
+  ["BCB8",0x6493],
+  ["BCB9",0x6495],
+  ["E5AF",0x6496],
+  ["E5B2",0x6497],
+  ["E5BC",0x6498],
+  ["BCC1",0x6499],
+  ["BCBF",0x649A],
+  ["E5B3",0x649C],
+  ["D95A",0x649D],
+  ["BCB2",0x649E],
+  ["E5B9",0x649F],
+  ["E5B0",0x64A0],
+  ["BCC2",0x64A2],
+  ["E5B8",0x64A3],
+  ["BA4D",0x64A4],
+  ["BCB7",0x64A5],
+  ["E1E4",0x64A6],
+  ["BCBA",0x64A9],
+  ["BCBE",0x64AB],
+  ["BCC0",0x64AC],
+  ["BCBD",0x64AD],
+  ["BCBC",0x64AE],
+  ["BCB6",0x64B0],
+  ["E5BB",0x64B1],
+  ["BCB3",0x64B2],
+  ["BCC3",0x64B3],
+  ["BED8",0x64BB],
+  ["BED9",0x64BC],
+  ["E9A9",0x64BD],
+  ["BEE2",0x64BE],
+  ["BEDF",0x64BF],
+  ["BED6",0x64C1],
+  ["BEDD",0x64C2],
+  ["E9AB",0x64C3],
+  ["BEDB",0x64C4],
+  ["BED5",0x64C5],
+  ["BEDC",0x64C7],
+  ["E9A8",0x64C9],
+  ["C0BB",0x64CA],
+  ["BED7",0x64CB],
+  ["BEDE",0x64CD],
+  ["C0BA",0x64CE],
+  ["E9A7",0x64CF],
+  ["E9A6",0x64D0],
+  ["BEE0",0x64D2],
+  ["BEE1",0x64D4],
+  ["E9A5",0x64D6],
+  ["E9A4",0x64D7],
+  ["C0BC",0x64D8],
+  ["E9AE",0x64D9],
+  ["BEDA",0x64DA],
+  ["E9AC",0x64DB],
+  ["C0BD",0x64E0],
+  ["C0C2",0x64E2],
+  ["ECEA",0x64E3],
+  ["ECEC",0x64E4],
+  ["C0BF",0x64E6],
+  ["ECED",0x64E8],
+  ["ECE9",0x64E9],
+  ["ECEB",0x64EB],
+  ["C0C0",0x64EC],
+  ["C0C3",0x64ED],
+  ["ECE8",0x64EF],
+  ["C0BE",0x64F0],
+  ["C0C1",0x64F1],
+  ["C259",0x64F2],
+  ["E9AD",0x64F3],
+  ["C258",0x64F4],
+  ["C25E",0x64F7],
+  ["EFD4",0x64F8],
+  ["C25C",0x64FA],
+  ["C25D",0x64FB],
+  ["EFD7",0x64FC],
+  ["EFD3",0x64FD],
+  ["C25A",0x64FE],
+  ["EFD1",0x64FF],
+  ["C36B",0x6500],
+  ["EFD5",0x6501],
+  ["EFD6",0x6503],
+  ["EFD2",0x6504],
+  ["C25B",0x6506],
+  ["F242",0x6507],
+  ["F245",0x6509],
+  ["F246",0x650C],
+  ["F244",0x650D],
+  ["F247",0x650E],
+  ["C36C",0x650F],
+  ["F243",0x6510],
+  ["F44E",0x6513],
+  ["C464",0x6514],
+  ["F44D",0x6515],
+  ["F44C",0x6516],
+  ["F44B",0x6517],
+  ["C463",0x6518],
+  ["C465",0x6519],
+  ["F5CD",0x651B],
+  ["C4E2",0x651C],
+  ["C4E1",0x651D],
+  ["F6E1",0x6520],
+  ["F6E0",0x6521],
+  ["F6E3",0x6522],
+  ["C5CB",0x6523],
+  ["C575",0x6524],
+  ["F7DD",0x6525],
+  ["F6E2",0x6526],
+  ["F7DC",0x6529],
+  ["C5CD",0x652A],
+  ["C5CC",0x652B],
+  ["C5F3",0x652C],
+  ["F8A9",0x652D],
+  ["F8EF",0x652E],
+  ["A4E4",0x652F],
+  ["D972",0x6532],
+  ["E9AF",0x6533],
+  ["A6AC",0x6536],
+  ["CAF7",0x6537],
+  ["A7F1",0x6538],
+  ["A7EF",0x6539],
+  ["A7F0",0x653B],
+  ["CCC1",0x653D],
+  ["A9F1",0x653E],
+  ["AC46",0x653F],
+  ["CEE7",0x6541],
+  ["CEE8",0x6543],
+  ["AC47",0x6545],
+  ["D1CE",0x6546],
+  ["AEC4",0x6548],
+  ["AEC5",0x6549],
+  ["D1CD",0x654A],
+  ["B1D3",0x654F],
+  ["B1CF",0x6551],
+  ["D5A7",0x6553],
+  ["B1D6",0x6554],
+  ["B1D5",0x6555],
+  ["B1CE",0x6556],
+  ["B1D1",0x6557],
+  ["B1D4",0x6558],
+  ["B1D0",0x6559],
+  ["D976",0x655C],
+  ["B1CD",0x655D],
+  ["B4AF",0x655E],
+  ["B4B1",0x6562],
+  ["B4B2",0x6563],
+  ["D975",0x6564],
+  ["D978",0x6565],
+  ["B4B0",0x6566],
+  ["D973",0x6567],
+  ["D977",0x6568],
+  ["D974",0x656A],
+  ["B771",0x656C],
+  ["DDBC",0x656F],
+  ["BA56",0x6572],
+  ["E1F4",0x6573],
+  ["BEE3",0x6574],
+  ["BCC4",0x6575],
+  ["E5BD",0x6576],
+  ["BCC5",0x6577],
+  ["BCC6",0x6578],
+  ["E5BF",0x6579],
+  ["E5BE",0x657A],
+  ["E5C0",0x657B],
+  ["E9B1",0x657C],
+  ["E9B0",0x657F],
+  ["ECEF",0x6580],
+  ["ECEE",0x6581],
+  ["C0C4",0x6582],
+  ["C0C5",0x6583],
+  ["F248",0x6584],
+  ["A4E5",0x6587],
+  ["D979",0x658C],
+  ["B4B4",0x6590],
+  ["B4B3",0x6591],
+  ["DDBD",0x6592],
+  ["EFD8",0x6594],
+  ["C4E3",0x6595],
+  ["F7DE",0x6596],
+  ["A4E6",0x6597],
+  ["AEC6",0x6599],
+  ["B1D8",0x659B],
+  ["B1D7",0x659C],
+  ["D97A",0x659D],
+  ["D97B",0x659E],
+  ["B772",0x659F],
+  ["E1F5",0x65A0],
+  ["BA57",0x65A1],
+  ["E9B2",0x65A2],
+  ["A4E7",0x65A4],
+  ["A5B8",0x65A5],
+  ["A9F2",0x65A7],
+  ["CCC2",0x65A8],
+  ["CEE9",0x65AA],
+  ["AC48",0x65AB],
+  ["B1D9",0x65AC],
+  ["D97C",0x65AE],
+  ["B4B5",0x65AF],
+  ["B773",0x65B0],
+  ["E5C1",0x65B2],
+  ["E5C2",0x65B3],
+  ["ECF0",0x65B6],
+  ["C25F",0x65B7],
+  ["F8F0",0x65B8],
+  ["A4E8",0x65B9],
+  ["CCC3",0x65BB],
+  ["A9F3",0x65BC],
+  ["AC49",0x65BD],
+  ["CEEA",0x65BF],
+  ["AEC7",0x65C1],
+  ["D1D2",0x65C2],
+  ["D1D0",0x65C3],
+  ["D1D1",0x65C4],
+  ["AEC8",0x65C5],
+  ["D1CF",0x65C6],
+  ["B1DB",0x65CB],
+  ["B1DC",0x65CC],
+  ["D5A8",0x65CD],
+  ["B1DD",0x65CE],
+  ["B1DA",0x65CF],
+  ["D97D",0x65D0],
+  ["D97E",0x65D2],
+  ["DDBE",0x65D3],
+  ["BA59",0x65D6],
+  ["BA58",0x65D7],
+  ["ECF1",0x65DA],
+  ["EFD9",0x65DB],
+  ["F24A",0x65DD],
+  ["F249",0x65DE],
+  ["F44F",0x65DF],
+  ["C95E",0x65E1],
+  ["AC4A",0x65E2],
+  ["A4E9",0x65E5],
+  ["A5B9",0x65E6],
+  ["A6AE",0x65E8],
+  ["A6AD",0x65E9],
+  ["A6AF",0x65EC],
+  ["A6B0",0x65ED],
+  ["C9EE",0x65EE],
+  ["C9ED",0x65EF],
+  ["CAF8",0x65F0],
+  ["A7F2",0x65F1],
+  ["CAFB",0x65F2],
+  ["CAFA",0x65F3],
+  ["CAF9",0x65F4],
+  ["CAFC",0x65F5],
+  ["A9F4",0x65FA],
+  ["CCC9",0x65FB],
+  ["CCC5",0x65FC],
+  ["CCCE",0x65FD],
+  ["A9FB",0x6600],
+  ["A9F9",0x6602],
+  ["CCCA",0x6603],
+  ["CCC6",0x6604],
+  ["CCCD",0x6605],
+  ["A9F8",0x6606],
+  ["AA40",0x6607],
+  ["CCC8",0x6608],
+  ["CCC4",0x6609],
+  ["A9FE",0x660A],
+  ["CCCB",0x660B],
+  ["A9F7",0x660C],
+  ["CCCC",0x660D],
+  ["A9FA",0x660E],
+  ["A9FC",0x660F],
+  ["CCD0",0x6610],
+  ["CCCF",0x6611],
+  ["CCC7",0x6612],
+  ["A9F6",0x6613],
+  ["A9F5",0x6614],
+  ["A9FD",0x6615],
+  ["CEEF",0x661C],
+  ["CEF5",0x661D],
+  ["AC50",0x661F],
+  ["AC4D",0x6620],
+  ["CEEC",0x6621],
+  ["CEF1",0x6622],
+  ["AC53",0x6624],
+  ["AC4B",0x6625],
+  ["CEF0",0x6626],
+  ["AC4E",0x6627],
+  ["AC51",0x6628],
+  ["CEF3",0x662B],
+  ["AC4C",0x662D],
+  ["CEF8",0x662E],
+  ["AC4F",0x662F],
+  ["AC52",0x6631],
+  ["CEED",0x6632],
+  ["CEF2",0x6633],
+  ["CEF6",0x6634],
+  ["CEEE",0x6635],
+  ["CEEB",0x6636],
+  ["CEF7",0x6639],
+  ["CEF4",0x663A],
+  ["AED0",0x6641],
+  ["AEC9",0x6642],
+  ["AECC",0x6643],
+  ["AECF",0x6645],
+  ["D1D5",0x6647],
+  ["AECA",0x6649],
+  ["D1D3",0x664A],
+  ["AECE",0x664C],
+  ["AECB",0x664F],
+  ["D1D6",0x6651],
+  ["AECD",0x6652],
+  ["D5AC",0x6659],
+  ["B1DF",0x665A],
+  ["D5AB",0x665B],
+  ["D5AD",0x665C],
+  ["B1DE",0x665D],
+  ["B1E3",0x665E],
+  ["D1D4",0x665F],
+  ["D5AA",0x6661],
+  ["D5AE",0x6662],
+  ["B1E0",0x6664],
+  ["D5A9",0x6665],
+  ["B1E2",0x6666],
+  ["B1E1",0x6668],
+  ["D9A7",0x666A],
+  ["D9A2",0x666C],
+  ["B4B6",0x666E],
+  ["B4BA",0x666F],
+  ["B4B7",0x6670],
+  ["D9A5",0x6671],
+  ["D9A8",0x6672],
+  ["B4B8",0x6674],
+  ["B4B9",0x6676],
+  ["B4BE",0x6677],
+  ["DDC7",0x6678],
+  ["D9A6",0x6679],
+  ["B4BC",0x667A],
+  ["D9A3",0x667B],
+  ["D9A1",0x667C],
+  ["B4BD",0x667E],
+  ["D9A4",0x6680],
+  ["B779",0x6684],
+  ["DDBF",0x6686],
+  ["B776",0x6687],
+  ["B777",0x6688],
+  ["B775",0x6689],
+  ["DDC4",0x668A],
+  ["DDC3",0x668B],
+  ["DDC0",0x668C],
+  ["B77B",0x668D],
+  ["DDC2",0x6690],
+  ["B4BB",0x6691],
+  ["DDC6",0x6694],
+  ["DDC1",0x6695],
+  ["B778",0x6696],
+  ["B774",0x6697],
+  ["B77A",0x6698],
+  ["DDC5",0x6699],
+  ["BA5C",0x669D],
+  ["E1F8",0x669F],
+  ["E1F7",0x66A0],
+  ["E1F6",0x66A1],
+  ["BA5A",0x66A2],
+  ["BA5B",0x66A8],
+  ["E5C5",0x66A9],
+  ["E5C8",0x66AA],
+  ["BCC8",0x66AB],
+  ["BCC7",0x66AE],
+  ["E5C9",0x66AF],
+  ["E5C4",0x66B0],
+  ["BCCA",0x66B1],
+  ["E5C6",0x66B2],
+  ["BCC9",0x66B4],
+  ["E5C3",0x66B5],
+  ["E5C7",0x66B7],
+  ["BEE9",0x66B8],
+  ["BEE6",0x66B9],
+  ["E9BB",0x66BA],
+  ["E9BA",0x66BB],
+  ["E9B9",0x66BD],
+  ["E9B4",0x66BE],
+  ["E9B5",0x66C0],
+  ["BEE7",0x66C4],
+  ["BEE4",0x66C6],
+  ["BEE8",0x66C7],
+  ["E9B3",0x66C8],
+  ["BEE5",0x66C9],
+  ["E9B6",0x66CA],
+  ["E9B7",0x66CB],
+  ["E9BC",0x66CC],
+  ["E9B8",0x66CF],
+  ["ECF2",0x66D2],
+  ["C0C7",0x66D6],
+  ["EFDC",0x66D8],
+  ["C0C6",0x66D9],
+  ["EFDA",0x66DA],
+  ["EFDB",0x66DB],
+  ["C260",0x66DC],
+  ["C36E",0x66DD],
+  ["F24B",0x66DE],
+  ["C36D",0x66E0],
+  ["F451",0x66E3],
+  ["F452",0x66E4],
+  ["C466",0x66E6],
+  ["F450",0x66E8],
+  ["C4E4",0x66E9],
+  ["F7DF",0x66EB],
+  ["C5CE",0x66EC],
+  ["F8AA",0x66ED],
+  ["F8AB",0x66EE],
+  ["A4EA",0x66F0],
+  ["A6B1",0x66F2],
+  ["A6B2",0x66F3],
+  ["A7F3",0x66F4],
+  ["CCD1",0x66F6],
+  ["AC54",0x66F7],
+  ["AED1",0x66F8],
+  ["B1E4",0x66F9],
+  ["B0D2",0x66FC],
+  ["B4BF",0x66FE],
+  ["B4C0",0x66FF],
+  ["B3CC",0x6700],
+  ["D9A9",0x6701],
+  ["B77C",0x6703],
+  ["E1FA",0x6704],
+  ["E1F9",0x6705],
+  ["A4EB",0x6708],
+  ["A6B3",0x6709],
+  ["CCD2",0x670A],
+  ["AA42",0x670B],
+  ["AA41",0x670D],
+  ["CEF9",0x670F],
+  ["CEFA",0x6710],
+  ["D1D7",0x6712],
+  ["D1D8",0x6713],
+  ["AED2",0x6714],
+  ["AED3",0x6715],
+  ["AED4",0x6717],
+  ["D5AF",0x6718],
+  ["B1E6",0x671B],
+  ["B4C2",0x671D],
+  ["B4C1",0x671F],
+  ["DDC8",0x6720],
+  ["DF7A",0x6721],
+  ["E1FB",0x6722],
+  ["E9BD",0x6723],
+  ["C261",0x6726],
+  ["C467",0x6727],
+  ["A4EC",0x6728],
+  ["A5BC",0x672A],
+  ["A5BD",0x672B],
+  ["A5BB",0x672C],
+  ["A5BE",0x672D],
+  ["A5BA",0x672E],
+  ["A6B6",0x6731],
+  ["C9F6",0x6733],
+  ["A6B5",0x6734],
+  ["A6B7",0x6735],
+  ["C9F1",0x6738],
+  ["C9F0",0x6739],
+  ["C9F3",0x673A],
+  ["C9F2",0x673B],
+  ["C9F5",0x673C],
+  ["A6B4",0x673D],
+  ["C9EF",0x673E],
+  ["C9F4",0x673F],
+  ["CAFD",0x6745],
+  ["A7FD",0x6746],
+  ["CAFE",0x6747],
+  ["CB43",0x6748],
+  ["A7FC",0x6749],
+  ["CB47",0x674B],
+  ["CB42",0x674C],
+  ["CB45",0x674D],
+  ["A7F5",0x674E],
+  ["A7F6",0x674F],
+  ["A7F7",0x6750],
+  ["A7F8",0x6751],
+  ["A840",0x6753],
+  ["CB41",0x6755],
+  ["A7FA",0x6756],
+  ["A841",0x6757],
+  ["CB40",0x6759],
+  ["CB46",0x675A],
+  ["A7F9",0x675C],
+  ["CB44",0x675D],
+  ["A7FB",0x675E],
+  ["A7F4",0x675F],
+  ["A7FE",0x6760],
+  ["AA57",0x676A],
+  ["CCD4",0x676C],
+  ["AA43",0x676D],
+  ["AA4D",0x676F],
+  ["AA4E",0x6770],
+  ["AA46",0x6771],
+  ["AA58",0x6772],
+  ["AA48",0x6773],
+  ["CCDC",0x6774],
+  ["AA53",0x6775],
+  ["CCD7",0x6776],
+  ["AA49",0x6777],
+  ["CCE6",0x6778],
+  ["CCE7",0x6779],
+  ["CCDF",0x677A],
+  ["CCD8",0x677B],
+  ["AA56",0x677C],
+  ["CCE4",0x677D],
+  ["AA51",0x677E],
+  ["AA4F",0x677F],
+  ["CCE5",0x6781],
+  ["CCE3",0x6783],
+  ["CCDB",0x6784],
+  ["CCD3",0x6785],
+  ["CCDA",0x6786],
+  ["AA4A",0x6787],
+  ["AA50",0x6789],
+  ["AA44",0x678B],
+  ["CCDE",0x678C],
+  ["CCDD",0x678D],
+  ["CCD5",0x678E],
+  ["AA52",0x6790],
+  ["CCE1",0x6791],
+  ["CCD6",0x6792],
+  ["AA55",0x6793],
+  ["CCE8",0x6794],
+  ["AA45",0x6795],
+  ["AA4C",0x6797],
+  ["CCD9",0x6798],
+  ["CCE2",0x6799],
+  ["AA54",0x679A],
+  ["AA47",0x679C],
+  ["AA4B",0x679D],
+  ["CCE0",0x679F],
+  ["CF5B",0x67AE],
+  ["AC5C",0x67AF],
+  ["AC69",0x67B0],
+  ["CF56",0x67B2],
+  ["CF4C",0x67B3],
+  ["AC62",0x67B4],
+  ["CF4A",0x67B5],
+  ["AC5B",0x67B6],
+  ["CF45",0x67B7],
+  ["AC65",0x67B8],
+  ["CF52",0x67B9],
+  ["CEFE",0x67BA],
+  ["CF41",0x67BB],
+  ["CF44",0x67C0],
+  ["CEFB",0x67C1],
+  ["CF51",0x67C2],
+  ["CF61",0x67C3],
+  ["AC60",0x67C4],
+  ["CF46",0x67C5],
+  ["CF58",0x67C6],
+  ["CEFD",0x67C8],
+  ["CF5F",0x67C9],
+  ["CF60",0x67CA],
+  ["CF63",0x67CB],
+  ["CF5A",0x67CC],
+  ["CF4B",0x67CD],
+  ["CF53",0x67CE],
+  ["AC66",0x67CF],
+  ["AC59",0x67D0],
+  ["AC61",0x67D1],
+  ["AC6D",0x67D2],
+  ["AC56",0x67D3],
+  ["AC58",0x67D4],
+  ["CF43",0x67D8],
+  ["AC6A",0x67D9],
+  ["AC63",0x67DA],
+  ["CF5D",0x67DB],
+  ["CF40",0x67DC],
+  ["AC6C",0x67DD],
+  ["AC67",0x67DE],
+  ["CF49",0x67DF],
+  ["AC6B",0x67E2],
+  ["CF50",0x67E3],
+  ["CF48",0x67E4],
+  ["AC64",0x67E5],
+  ["CF5C",0x67E6],
+  ["CF54",0x67E7],
+  ["AC5E",0x67E9],
+  ["CF62",0x67EA],
+  ["CF47",0x67EB],
+  ["AC5A",0x67EC],
+  ["CF59",0x67ED],
+  ["CF4F",0x67EE],
+  ["AC5F",0x67EF],
+  ["CF55",0x67F0],
+  ["AC57",0x67F1],
+  ["CEFC",0x67F2],
+  ["AC68",0x67F3],
+  ["AEE3",0x67F4],
+  ["AC5D",0x67F5],
+  ["CF4E",0x67F6],
+  ["CF4D",0x67F7],
+  ["CF42",0x67F8],
+  ["CF5E",0x67FA],
+  ["CF57",0x67FC],
+  ["AC55",0x67FF],
+  ["D1EC",0x6812],
+  ["AEEA",0x6813],
+  ["D1ED",0x6814],
+  ["D1E1",0x6816],
+  ["AEDF",0x6817],
+  ["AEEB",0x6818],
+  ["D1DA",0x681A],
+  ["D1E3",0x681C],
+  ["D1EB",0x681D],
+  ["D1D9",0x681F],
+  ["D1F4",0x6820],
+  ["AED5",0x6821],
+  ["D1F3",0x6825],
+  ["D1EE",0x6826],
+  ["D1EF",0x6828],
+  ["AEDD",0x6829],
+  ["AEE8",0x682A],
+  ["D1E5",0x682B],
+  ["D1E6",0x682D],
+  ["D1F0",0x682E],
+  ["D1E7",0x682F],
+  ["D1E2",0x6831],
+  ["D1DC",0x6832],
+  ["D1DD",0x6833],
+  ["D1EA",0x6834],
+  ["D1E4",0x6835],
+  ["AED6",0x6838],
+  ["AEDA",0x6839],
+  ["D1F2",0x683A],
+  ["D1DE",0x683B],
+  ["AEE6",0x683C],
+  ["AEE2",0x683D],
+  ["AEE5",0x6840],
+  ["AEEC",0x6841],
+  ["AEDB",0x6842],
+  ["AEE7",0x6843],
+  ["D1E9",0x6844],
+  ["AEE9",0x6845],
+  ["AED8",0x6846],
+  ["AED7",0x6848],
+  ["D1DB",0x6849],
+  ["D1DF",0x684B],
+  ["AEE0",0x684C],
+  ["D1F1",0x684D],
+  ["D1E8",0x684E],
+  ["D1E0",0x684F],
+  ["AEE4",0x6850],
+  ["AEE1",0x6851],
+  ["AED9",0x6853],
+  ["AEDC",0x6854],
+  ["D5C4",0x686B],
+  ["D5B4",0x686D],
+  ["D5B5",0x686E],
+  ["D5B9",0x686F],
+  ["D5C8",0x6871],
+  ["D5C5",0x6872],
+  ["D5BE",0x6874],
+  ["D5BD",0x6875],
+  ["B1ED",0x6876],
+  ["D5C1",0x6877],
+  ["D5D0",0x6878],
+  ["D5B0",0x6879],
+  ["D5D1",0x687B],
+  ["D5C3",0x687C],
+  ["D5D5",0x687D],
+  ["D5C9",0x687E],
+  ["B1EC",0x687F],
+  ["D5C7",0x6880],
+  ["B1E7",0x6881],
+  ["B1FC",0x6882],
+  ["B1F2",0x6883],
+  ["B1F6",0x6885],
+  ["B1F5",0x6886],
+  ["D5B1",0x6887],
+  ["D5CE",0x6889],
+  ["D5D4",0x688A],
+  ["D5CC",0x688B],
+  ["D5D3",0x688C],
+  ["D5C0",0x688F],
+  ["D5B2",0x6890],
+  ["D5D2",0x6891],
+  ["D5C2",0x6892],
+  ["B1EA",0x6893],
+  ["B1F7",0x6894],
+  ["D5CB",0x6896],
+  ["B1F0",0x6897],
+  ["D5CA",0x689B],
+  ["D5B3",0x689C],
+  ["B1F8",0x689D],
+  ["B1FA",0x689F],
+  ["D5CD",0x68A0],
+  ["B1FB",0x68A1],
+  ["B1E9",0x68A2],
+  ["D5BA",0x68A3],
+  ["D5CF",0x68A4],
+  ["B1EF",0x68A7],
+  ["B1F9",0x68A8],
+  ["D5BC",0x68A9],
+  ["D5C6",0x68AA],
+  ["D5B7",0x68AB],
+  ["D5BB",0x68AC],
+  ["B1F4",0x68AD],
+  ["D5B6",0x68AE],
+  ["B1E8",0x68AF],
+  ["B1F1",0x68B0],
+  ["B1EE",0x68B1],
+  ["D5BF",0x68B2],
+  ["AEDE",0x68B3],
+  ["D9C0",0x68B4],
+  ["B1EB",0x68B5],
+  ["B1F3",0x68C4],
+  ["D9C3",0x68C6],
+  ["D9D9",0x68C7],
+  ["D9CE",0x68C8],
+  ["B4D6",0x68C9],
+  ["B4D1",0x68CB],
+  ["D9BD",0x68CC],
+  ["B4D2",0x68CD],
+  ["D9CD",0x68CE],
+  ["D9C6",0x68D0],
+  ["D9D3",0x68D1],
+  ["B4CE",0x68D2],
+  ["D9AB",0x68D3],
+  ["D9D5",0x68D4],
+  ["B4C4",0x68D5],
+  ["D9B3",0x68D6],
+  ["B4C7",0x68D7],
+  ["B4C6",0x68D8],
+  ["B4D7",0x68DA],
+  ["D9AD",0x68DC],
+  ["D9CF",0x68DD],
+  ["D9D0",0x68DE],
+  ["B4C9",0x68DF],
+  ["B4C5",0x68E0],
+  ["D9BB",0x68E1],
+  ["B4D0",0x68E3],
+  ["D9B6",0x68E4],
+  ["D9D1",0x68E6],
+  ["B4CC",0x68E7],
+  ["D9C9",0x68E8],
+  ["D9D6",0x68E9],
+  ["D9B0",0x68EA],
+  ["D9B5",0x68EB],
+  ["D9AF",0x68EC],
+  ["B4CB",0x68EE],
+  ["D9C2",0x68EF],
+  ["DDDE",0x68F0],
+  ["D9B1",0x68F1],
+  ["B4CF",0x68F2],
+  ["D9BA",0x68F3],
+  ["D9D2",0x68F4],
+  ["B4CA",0x68F5],
+  ["D9B7",0x68F6],
+  ["D9B4",0x68F7],
+  ["D9C5",0x68F8],
+  ["B4CD",0x68F9],
+  ["B4C3",0x68FA],
+  ["B4D9",0x68FB],
+  ["D9C8",0x68FC],
+  ["D9C7",0x68FD],
+  ["D9AC",0x6904],
+  ["B4C8",0x6905],
+  ["D9D4",0x6906],
+  ["D9BC",0x6907],
+  ["D9BE",0x6908],
+  ["D9CB",0x690A],
+  ["D9CA",0x690B],
+  ["D9AA",0x690C],
+  ["B4D3",0x690D],
+  ["B4D5",0x690E],
+  ["D9B2",0x690F],
+  ["D9B9",0x6910],
+  ["D9C1",0x6911],
+  ["B4D4",0x6912],
+  ["D9B8",0x6913],
+  ["D9C4",0x6914],
+  ["D9D7",0x6915],
+  ["D9CC",0x6917],
+  ["D9D8",0x6925],
+  ["D9AE",0x692A],
+  ["DDF2",0x692F],
+  ["B7A6",0x6930],
+  ["DDF0",0x6932],
+  ["DDDB",0x6933],
+  ["DDE0",0x6934],
+  ["DDD9",0x6935],
+  ["DDEC",0x6937],
+  ["DDCB",0x6938],
+  ["DDD2",0x6939],
+  ["DDEA",0x693B],
+  ["DDF4",0x693C],
+  ["DDDC",0x693D],
+  ["DDCF",0x693F],
+  ["DDE2",0x6940],
+  ["DDE7",0x6941],
+  ["DDD3",0x6942],
+  ["DDE4",0x6944],
+  ["DDD0",0x6945],
+  ["DDD7",0x6948],
+  ["DDD8",0x6949],
+  ["B7A8",0x694A],
+  ["DDEB",0x694B],
+  ["DDE9",0x694C],
+  ["DDCC",0x694E],
+  ["DDEE",0x694F],
+  ["DDEF",0x6951],
+  ["DDF1",0x6952],
+  ["B7AC",0x6953],
+  ["B7A4",0x6954],
+  ["D5B8",0x6956],
+  ["DDD4",0x6957],
+  ["DDE6",0x6958],
+  ["DDD5",0x6959],
+  ["B7A1",0x695A],
+  ["B7B1",0x695B],
+  ["DDED",0x695C],
+  ["B7AF",0x695D],
+  ["B7AB",0x695E],
+  ["DDCA",0x695F],
+  ["B7A3",0x6960],
+  ["DDCD",0x6962],
+  ["B7B0",0x6963],
+  ["DDDD",0x6965],
+  ["DDC9",0x6966],
+  ["B7A9",0x6968],
+  ["DDE1",0x6969],
+  ["DDD1",0x696A],
+  ["B7AA",0x696B],
+  ["DDDA",0x696C],
+  ["B77E",0x696D],
+  ["B4D8",0x696E],
+  ["DDE3",0x696F],
+  ["D9BF",0x6970],
+  ["DDCE",0x6971],
+  ["DDE8",0x6974],
+  ["B7A5",0x6975],
+  ["DDE5",0x6976],
+  ["B7A2",0x6977],
+  ["DDDF",0x6978],
+  ["B7AD",0x6979],
+  ["DDD6",0x697A],
+  ["DDF3",0x697B],
+  ["B7A7",0x6982],
+  ["DEC6",0x6983],
+  ["B7AE",0x6986],
+  ["E24A",0x698D],
+  ["E248",0x698E],
+  ["E25E",0x6990],
+  ["E246",0x6991],
+  ["E258",0x6993],
+  ["B77D",0x6994],
+  ["BA5F",0x6995],
+  ["E242",0x6996],
+  ["E25D",0x6997],
+  ["E247",0x6999],
+  ["E255",0x699A],
+  ["BA64",0x699B],
+  ["BA5D",0x699C],
+  ["E25B",0x699E],
+  ["E240",0x69A0],
+  ["E25A",0x69A1],
+  ["BA6F",0x69A3],
+  ["E251",0x69A4],
+  ["E261",0x69A5],
+  ["BA6D",0x69A6],
+  ["E249",0x69A7],
+  ["BA5E",0x69A8],
+  ["E24B",0x69A9],
+  ["E259",0x69AA],
+  ["BA67",0x69AB],
+  ["E244",0x69AC],
+  ["BA6B",0x69AD],
+  ["BA61",0x69AE],
+  ["E24D",0x69AF],
+  ["E243",0x69B0],
+  ["E1FC",0x69B1],
+  ["E257",0x69B3],
+  ["BA68",0x69B4],
+  ["E260",0x69B5],
+  ["E1FD",0x69B6],
+  ["BA65",0x69B7],
+  ["E253",0x69B9],
+  ["BA66",0x69BB],
+  ["E245",0x69BC],
+  ["E250",0x69BD],
+  ["E24C",0x69BE],
+  ["E24E",0x69BF],
+  ["BA60",0x69C1],
+  ["E25F",0x69C2],
+  ["BA6E",0x69C3],
+  ["E24F",0x69C4],
+  ["E262",0x69C6],
+  ["E1FE",0x69C9],
+  ["E254",0x69CA],
+  ["BA63",0x69CB],
+  ["BA6C",0x69CC],
+  ["BA6A",0x69CD],
+  ["E241",0x69CE],
+  ["E256",0x69CF],
+  ["BA69",0x69D0],
+  ["BA62",0x69D3],
+  ["E252",0x69D4],
+  ["E25C",0x69D9],
+  ["E5D5",0x69E2],
+  ["E5D1",0x69E4],
+  ["E5CD",0x69E5],
+  ["E5E1",0x69E6],
+  ["E5DE",0x69E7],
+  ["BCCD",0x69E8],
+  ["E5E5",0x69EB],
+  ["E5D4",0x69EC],
+  ["BCD8",0x69ED],
+  ["E5DB",0x69EE],
+  ["E5D0",0x69F1],
+  ["E5DA",0x69F2],
+  ["BCD5",0x69F3],
+  ["E5EE",0x69F4],
+  ["E5EB",0x69F6],
+  ["E5DD",0x69F7],
+  ["E5CE",0x69F8],
+  ["E5E2",0x69FB],
+  ["E5E4",0x69FC],
+  ["BCD1",0x69FD],
+  ["E5D8",0x69FE],
+  ["E5D3",0x69FF],
+  ["E5CA",0x6A00],
+  ["BCCE",0x6A01],
+  ["BCD6",0x6A02],
+  ["E5E7",0x6A04],
+  ["BCD7",0x6A05],
+  ["E5CB",0x6A06],
+  ["E5ED",0x6A07],
+  ["E5E0",0x6A08],
+  ["E5E6",0x6A09],
+  ["BCD4",0x6A0A],
+  ["E5E3",0x6A0D],
+  ["E5EA",0x6A0F],
+  ["BCD9",0x6A11],
+  ["BCD3",0x6A13],
+  ["E5DC",0x6A14],
+  ["E5CF",0x6A15],
+  ["E5EF",0x6A16],
+  ["E5CC",0x6A17],
+  ["E5E8",0x6A18],
+  ["BCD0",0x6A19],
+  ["E5D6",0x6A1B],
+  ["E5D7",0x6A1D],
+  ["BCCF",0x6A1E],
+  ["BCCC",0x6A1F],
+  ["E5D2",0x6A20],
+  ["BCD2",0x6A21],
+  ["BCCB",0x6A23],
+  ["E5E9",0x6A25],
+  ["E5EC",0x6A26],
+  ["E5D9",0x6A27],
+  ["E9CA",0x6A28],
+  ["E9C2",0x6A32],
+  ["E9BE",0x6A34],
+  ["BEF6",0x6A35],
+  ["BEEB",0x6A38],
+  ["BEF0",0x6A39],
+  ["BEEC",0x6A3A],
+  ["E9CC",0x6A3B],
+  ["E9D7",0x6A3C],
+  ["BEEA",0x6A3D],
+  ["E9C4",0x6A3E],
+  ["E9CD",0x6A3F],
+  ["E5DF",0x6A40],
+  ["E9CE",0x6A41],
+  ["BEF1",0x6A44],
+  ["E9DD",0x6A46],
+  ["BEF5",0x6A47],
+  ["BEF8",0x6A48],
+  ["E9C0",0x6A49],
+  ["BEF4",0x6A4B],
+  ["E9DB",0x6A4D],
+  ["E9DC",0x6A4E],
+  ["E9D2",0x6A4F],
+  ["E9D1",0x6A50],
+  ["E9C9",0x6A51],
+  ["E9D3",0x6A54],
+  ["E9DA",0x6A55],
+  ["E9D9",0x6A56],
+  ["BEEF",0x6A58],
+  ["BEED",0x6A59],
+  ["E9CB",0x6A5A],
+  ["E9C8",0x6A5B],
+  ["E9C5",0x6A5D],
+  ["E9D8",0x6A5E],
+  ["BEF7",0x6A5F],
+  ["E9D6",0x6A60],
+  ["BEF3",0x6A61],
+  ["BEF2",0x6A62],
+  ["E9D0",0x6A64],
+  ["E9BF",0x6A66],
+  ["E9C1",0x6A67],
+  ["E9C3",0x6A68],
+  ["E9D5",0x6A69],
+  ["E9CF",0x6A6A],
+  ["BEEE",0x6A6B],
+  ["E9C6",0x6A6D],
+  ["E9D4",0x6A6F],
+  ["E9C7",0x6A76],
+  ["C0CF",0x6A7E],
+  ["ED45",0x6A7F],
+  ["C0C8",0x6A80],
+  ["ECF5",0x6A81],
+  ["ED41",0x6A83],
+  ["C0CA",0x6A84],
+  ["ED48",0x6A85],
+  ["ECFC",0x6A87],
+  ["ECF7",0x6A89],
+  ["ED49",0x6A8C],
+  ["ECF3",0x6A8D],
+  ["ECFE",0x6A8E],
+  ["C0D1",0x6A90],
+  ["ED44",0x6A91],
+  ["ED4A",0x6A92],
+  ["ECFD",0x6A93],
+  ["C0C9",0x6A94],
+  ["ED40",0x6A95],
+  ["ECF4",0x6A96],
+  ["C0D0",0x6A97],
+  ["ED47",0x6A9A],
+  ["ECF9",0x6A9B],
+  ["C0CC",0x6A9C],
+  ["ECFB",0x6A9E],
+  ["ECF8",0x6A9F],
+  ["C0D2",0x6AA0],
+  ["ECFA",0x6AA1],
+  ["C0CB",0x6AA2],
+  ["C0CE",0x6AA3],
+  ["ED43",0x6AA4],
+  ["ECF6",0x6AA5],
+  ["ED46",0x6AA6],
+  ["ED42",0x6AA8],
+  ["C263",0x6AAC],
+  ["EFE7",0x6AAD],
+  ["C268",0x6AAE],
+  ["C269",0x6AAF],
+  ["C262",0x6AB3],
+  ["EFE6",0x6AB4],
+  ["EFE3",0x6AB6],
+  ["EFE4",0x6AB7],
+  ["C266",0x6AB8],
+  ["EFDE",0x6AB9],
+  ["EFE2",0x6ABA],
+  ["C265",0x6ABB],
+  ["EFDF",0x6ABD],
+  ["C267",0x6AC2],
+  ["C264",0x6AC3],
+  ["EFDD",0x6AC5],
+  ["EFE1",0x6AC6],
+  ["EFE5",0x6AC7],
+  ["F251",0x6ACB],
+  ["F24E",0x6ACC],
+  ["F257",0x6ACD],
+  ["F256",0x6ACF],
+  ["F254",0x6AD0],
+  ["F24F",0x6AD1],
+  ["C372",0x6AD3],
+  ["F250",0x6AD9],
+  ["C371",0x6ADA],
+  ["C0CD",0x6ADB],
+  ["F253",0x6ADC],
+  ["C370",0x6ADD],
+  ["F258",0x6ADE],
+  ["F252",0x6ADF],
+  ["F24D",0x6AE0],
+  ["EFE0",0x6AE1],
+  ["C36F",0x6AE5],
+  ["F24C",0x6AE7],
+  ["F456",0x6AE8],
+  ["F455",0x6AEA],
+  ["F255",0x6AEB],
+  ["C468",0x6AEC],
+  ["F459",0x6AEE],
+  ["F45A",0x6AEF],
+  ["F454",0x6AF0],
+  ["F458",0x6AF1],
+  ["F453",0x6AF3],
+  ["F5D1",0x6AF8],
+  ["F457",0x6AF9],
+  ["C4E7",0x6AFA],
+  ["C4E5",0x6AFB],
+  ["F5CF",0x6AFC],
+  ["F5D2",0x6B00],
+  ["F5CE",0x6B02],
+  ["F5D0",0x6B03],
+  ["C4E6",0x6B04],
+  ["F6E5",0x6B08],
+  ["F6E6",0x6B09],
+  ["C576",0x6B0A],
+  ["F6E4",0x6B0B],
+  ["F7E2",0x6B0F],
+  ["C5CF",0x6B10],
+  ["F7E0",0x6B11],
+  ["F7E1",0x6B12],
+  ["F8AC",0x6B13],
+  ["C656",0x6B16],
+  ["F8F3",0x6B17],
+  ["F8F1",0x6B18],
+  ["F8F2",0x6B19],
+  ["F8F4",0x6B1A],
+  ["F9BB",0x6B1E],
+  ["A4ED",0x6B20],
+  ["A6B8",0x6B21],
+  ["AA59",0x6B23],
+  ["CCE9",0x6B25],
+  ["CF64",0x6B28],
+  ["D1F5",0x6B2C],
+  ["D1F7",0x6B2D],
+  ["D1F6",0x6B2F],
+  ["D1F8",0x6B31],
+  ["B1FD",0x6B32],
+  ["D5D7",0x6B33],
+  ["D1F9",0x6B34],
+  ["D5D6",0x6B36],
+  ["D5D8",0x6B37],
+  ["D5D9",0x6B38],
+  ["D9DA",0x6B39],
+  ["B4DB",0x6B3A],
+  ["D9DB",0x6B3B],
+  ["D9DD",0x6B3C],
+  ["B4DC",0x6B3D],
+  ["B4DA",0x6B3E],
+  ["D9DC",0x6B3F],
+  ["DDFA",0x6B41],
+  ["DDF8",0x6B42],
+  ["DDF7",0x6B43],
+  ["DDF6",0x6B45],
+  ["DDF5",0x6B46],
+  ["B7B2",0x6B47],
+  ["DDF9",0x6B48],
+  ["BA70",0x6B49],
+  ["E263",0x6B4A],
+  ["E265",0x6B4B],
+  ["BA71",0x6B4C],
+  ["E264",0x6B4D],
+  ["BCDB",0x6B4E],
+  ["BCDA",0x6B50],
+  ["E5F0",0x6B51],
+  ["E9DF",0x6B54],
+  ["E9DE",0x6B55],
+  ["E9E0",0x6B56],
+  ["BEF9",0x6B59],
+  ["ED4B",0x6B5B],
+  ["C0D3",0x6B5C],
+  ["EFE8",0x6B5E],
+  ["C26A",0x6B5F],
+  ["F259",0x6B60],
+  ["C577",0x6B61],
+  ["A4EE",0x6B62],
+  ["A5BF",0x6B63],
+  ["A6B9",0x6B64],
+  ["A842",0x6B65],
+  ["AA5A",0x6B66],
+  ["AA5B",0x6B67],
+  ["AC6E",0x6B6A],
+  ["D1FA",0x6B6D],
+  ["B7B3",0x6B72],
+  ["E6D1",0x6B76],
+  ["BEFA",0x6B77],
+  ["C26B",0x6B78],
+  ["A4EF",0x6B79],
+  ["A6BA",0x6B7B],
+  ["CCEB",0x6B7E],
+  ["AA5C",0x6B7F],
+  ["CCEA",0x6B80],
+  ["CF65",0x6B82],
+  ["AC6F",0x6B83],
+  ["CF66",0x6B84],
+  ["AC70",0x6B86],
+  ["D1FC",0x6B88],
+  ["AEEE",0x6B89],
+  ["AEED",0x6B8A],
+  ["D5DE",0x6B8C],
+  ["D5DC",0x6B8D],
+  ["D5DD",0x6B8E],
+  ["D5DB",0x6B8F],
+  ["D5DA",0x6B91],
+  ["D9DE",0x6B94],
+  ["D9E1",0x6B95],
+  ["B4DE",0x6B96],
+  ["D9DF",0x6B97],
+  ["B4DD",0x6B98],
+  ["D9E0",0x6B99],
+  ["DDFB",0x6B9B],
+  ["E266",0x6B9E],
+  ["E267",0x6B9F],
+  ["E268",0x6BA0],
+  ["E5F3",0x6BA2],
+  ["E5F2",0x6BA3],
+  ["BCDC",0x6BA4],
+  ["E5F1",0x6BA5],
+  ["E5F4",0x6BA6],
+  ["E9E1",0x6BA7],
+  ["E9E2",0x6BAA],
+  ["E9E3",0x6BAB],
+  ["ED4C",0x6BAD],
+  ["C0D4",0x6BAE],
+  ["C26C",0x6BAF],
+  ["F25A",0x6BB0],
+  ["C4E8",0x6BB2],
+  ["C95F",0x6BB3],
+  ["AC71",0x6BB5],
+  ["CF67",0x6BB6],
+  ["AEEF",0x6BB7],
+  ["B1FE",0x6BBA],
+  ["B4DF",0x6BBC],
+  ["D9E2",0x6BBD],
+  ["B7B5",0x6BBF],
+  ["B7B4",0x6BC0],
+  ["E269",0x6BC3],
+  ["E26A",0x6BC4],
+  ["BCDD",0x6BC5],
+  ["BCDE",0x6BC6],
+  ["E9E5",0x6BC7],
+  ["E9E4",0x6BC8],
+  ["EFE9",0x6BC9],
+  ["F7E3",0x6BCA],
+  ["A4F0",0x6BCB],
+  ["C960",0x6BCC],
+  ["A5C0",0x6BCD],
+  ["A843",0x6BCF],
+  ["CB48",0x6BD0],
+  ["AC72",0x6BD2],
+  ["B7B6",0x6BD3],
+  ["A4F1",0x6BD4],
+  ["CF68",0x6BD6],
+  ["AC73",0x6BD7],
+  ["CF69",0x6BD8],
+  ["C0D5",0x6BDA],
+  ["A4F2",0x6BDB],
+  ["CCEC",0x6BDE],
+  ["CF6A",0x6BE0],
+  ["D242",0x6BE2],
+  ["D241",0x6BE3],
+  ["D1FE",0x6BE4],
+  ["D1FD",0x6BE6],
+  ["D243",0x6BE7],
+  ["D240",0x6BE8],
+  ["B240",0x6BEB],
+  ["B241",0x6BEC],
+  ["B4E0",0x6BEF],
+  ["D9E3",0x6BF0],
+  ["D9E4",0x6BF2],
+  ["D9E5",0x6BF3],
+  ["DE41",0x6BF7],
+  ["DE42",0x6BF8],
+  ["DE40",0x6BF9],
+  ["DDFD",0x6BFB],
+  ["DDFE",0x6BFC],
+  ["B7B7",0x6BFD],
+  ["E26B",0x6BFE],
+  ["E5F7",0x6BFF],
+  ["E5F6",0x6C00],
+  ["E5F5",0x6C01],
+  ["E5F8",0x6C02],
+  ["E9E7",0x6C03],
+  ["E9E6",0x6C04],
+  ["BEFB",0x6C05],
+  ["E9E8",0x6C06],
+  ["C0D6",0x6C08],
+  ["ED4D",0x6C09],
+  ["EFEA",0x6C0B],
+  ["F25B",0x6C0C],
+  ["F6E7",0x6C0D],
+  ["A4F3",0x6C0F],
+  ["A5C2",0x6C10],
+  ["A5C1",0x6C11],
+  ["AA5D",0x6C13],
+  ["C961",0x6C14],
+  ["C97E",0x6C15],
+  ["A6BB",0x6C16],
+  ["C9F7",0x6C18],
+  ["CB49",0x6C19],
+  ["CB4A",0x6C1A],
+  ["AA5E",0x6C1B],
+  ["CCED",0x6C1D],
+  ["AC74",0x6C1F],
+  ["CF6B",0x6C20],
+  ["CF6C",0x6C21],
+  ["AEF0",0x6C23],
+  ["AEF4",0x6C24],
+  ["D244",0x6C25],
+  ["AEF3",0x6C26],
+  ["AEF1",0x6C27],
+  ["AEF2",0x6C28],
+  ["D5DF",0x6C2A],
+  ["B242",0x6C2B],
+  ["B4E3",0x6C2C],
+  ["B4E1",0x6C2E],
+  ["B4E2",0x6C2F],
+  ["D9E6",0x6C30],
+  ["BA72",0x6C33],
+  ["A4F4",0x6C34],
+  ["C9A1",0x6C36],
+  ["A5C3",0x6C38],
+  ["C9A4",0x6C3B],
+  ["A5C6",0x6C3E],
+  ["C9A3",0x6C3F],
+  ["A5C5",0x6C40],
+  ["A5C4",0x6C41],
+  ["A844",0x6C42],
+  ["C9A2",0x6C43],
+  ["C9F8",0x6C46],
+  ["C9FC",0x6C4A],
+  ["C9FE",0x6C4B],
+  ["CA40",0x6C4C],
+  ["A6C5",0x6C4D],
+  ["A6C6",0x6C4E],
+  ["C9FB",0x6C4F],
+  ["A6C1",0x6C50],
+  ["C9F9",0x6C52],
+  ["C9FD",0x6C54],
+  ["A6C2",0x6C55],
+  ["A6BD",0x6C57],
+  ["A6BE",0x6C59],
+  ["A6C4",0x6C5B],
+  ["C9FA",0x6C5C],
+  ["A6BC",0x6C5D],
+  ["A845",0x6C5E],
+  ["A6BF",0x6C5F],
+  ["A6C0",0x6C60],
+  ["A6C3",0x6C61],
+  ["CB5B",0x6C65],
+  ["CB59",0x6C66],
+  ["CB4C",0x6C67],
+  ["A851",0x6C68],
+  ["CB53",0x6C69],
+  ["A84C",0x6C6A],
+  ["CB4D",0x6C6B],
+  ["CB55",0x6C6D],
+  ["CB52",0x6C6F],
+  ["A84F",0x6C70],
+  ["CB51",0x6C71],
+  ["A856",0x6C72],
+  ["CB5A",0x6C73],
+  ["A858",0x6C74],
+  ["A85A",0x6C76],
+  ["CB4B",0x6C78],
+  ["A84D",0x6C7A],
+  ["CB5C",0x6C7B],
+  ["A854",0x6C7D],
+  ["A857",0x6C7E],
+  ["CD45",0x6C80],
+  ["A847",0x6C81],
+  ["A85E",0x6C82],
+  ["A855",0x6C83],
+  ["CB4E",0x6C84],
+  ["A84A",0x6C85],
+  ["A859",0x6C86],
+  ["CB56",0x6C87],
+  ["A848",0x6C88],
+  ["A849",0x6C89],
+  ["CD43",0x6C8A],
+  ["CB4F",0x6C8B],
+  ["A850",0x6C8C],
+  ["A85B",0x6C8D],
+  ["CB5D",0x6C8E],
+  ["CB50",0x6C8F],
+  ["A84E",0x6C90],
+  ["A853",0x6C92],
+  ["CCEE",0x6C93],
+  ["A85C",0x6C94],
+  ["CB57",0x6C95],
+  ["A852",0x6C96],
+  ["A85D",0x6C98],
+  ["A846",0x6C99],
+  ["CB54",0x6C9A],
+  ["A84B",0x6C9B],
+  ["CB58",0x6C9C],
+  ["CD44",0x6C9D],
+  ["AA6A",0x6CAB],
+  ["AA7A",0x6CAC],
+  ["CCF5",0x6CAD],
+  ["AA71",0x6CAE],
+  ["CD4B",0x6CB0],
+  ["AA62",0x6CB1],
+  ["AA65",0x6CB3],
+  ["CD42",0x6CB4],
+  ["CCF3",0x6CB6],
+  ["CCF7",0x6CB7],
+  ["AA6D",0x6CB8],
+  ["AA6F",0x6CB9],
+  ["CCFA",0x6CBA],
+  ["AA76",0x6CBB],
+  ["AA68",0x6CBC],
+  ["AA66",0x6CBD],
+  ["AA67",0x6CBE],
+  ["AA75",0x6CBF],
+  ["CD47",0x6CC0],
+  ["AA70",0x6CC1],
+  ["CCF9",0x6CC2],
+  ["CCFB",0x6CC3],
+  ["AA6E",0x6CC4],
+  ["AA73",0x6CC5],
+  ["CCFC",0x6CC6],
+  ["CD4A",0x6CC7],
+  ["AC75",0x6CC9],
+  ["AA79",0x6CCA],
+  ["AA63",0x6CCC],
+  ["CD49",0x6CCD],
+  ["CD4D",0x6CCF],
+  ["CCF8",0x6CD0],
+  ["CD4F",0x6CD1],
+  ["CD40",0x6CD2],
+  ["AA6C",0x6CD3],
+  ["CCF4",0x6CD4],
+  ["AA6B",0x6CD5],
+  ["AA7D",0x6CD6],
+  ["AA72",0x6CD7],
+  ["CCF2",0x6CD9],
+  ["CF75",0x6CDA],
+  ["AA78",0x6CDB],
+  ["AA7C",0x6CDC],
+  ["CD41",0x6CDD],
+  ["CD46",0x6CDE],
+  ["AA7E",0x6CE0],
+  ["AA77",0x6CE1],
+  ["AA69",0x6CE2],
+  ["AA5F",0x6CE3],
+  ["AA64",0x6CE5],
+  ["CCF6",0x6CE7],
+  ["AA60",0x6CE8],
+  ["CD4E",0x6CE9],
+  ["CCF0",0x6CEB],
+  ["CCEF",0x6CEC],
+  ["CCFD",0x6CED],
+  ["CCF1",0x6CEE],
+  ["AA7B",0x6CEF],
+  ["AEF5",0x6CF0],
+  ["AA74",0x6CF1],
+  ["CCFE",0x6CF2],
+  ["AA61",0x6CF3],
+  ["ACA6",0x6CF5],
+  ["CD4C",0x6CF9],
+  ["CF7C",0x6D00],
+  ["CFA1",0x6D01],
+  ["CFA4",0x6D03],
+  ["CF77",0x6D04],
+  ["CFA7",0x6D07],
+  ["CFAA",0x6D08],
+  ["CFAC",0x6D09],
+  ["CF74",0x6D0A],
+  ["AC76",0x6D0B],
+  ["AC7B",0x6D0C],
+  ["D249",0x6D0D],
+  ["ACAD",0x6D0E],
+  ["CFA5",0x6D0F],
+  ["CFAD",0x6D10],
+  ["CF7B",0x6D11],
+  ["CF73",0x6D12],
+  ["D264",0x6D16],
+  ["AC7E",0x6D17],
+  ["CFA2",0x6D18],
+  ["CF78",0x6D19],
+  ["CF7A",0x6D1A],
+  ["ACA5",0x6D1B],
+  ["CF7D",0x6D1D],
+  ["AC7D",0x6D1E],
+  ["CF70",0x6D1F],
+  ["CFA8",0x6D20],
+  ["CFAB",0x6D22],
+  ["AC7A",0x6D25],
+  ["ACA8",0x6D27],
+  ["CF6D",0x6D28],
+  ["ACAA",0x6D29],
+  ["AC78",0x6D2A],
+  ["ACAE",0x6D2B],
+  ["CFA9",0x6D2C],
+  ["CF6F",0x6D2D],
+  ["ACAB",0x6D2E],
+  ["D25E",0x6D2F],
+  ["CD48",0x6D30],
+  ["AC7C",0x6D31],
+  ["AC77",0x6D32],
+  ["CF76",0x6D33],
+  ["CF6E",0x6D34],
+  ["ACAC",0x6D35],
+  ["ACA4",0x6D36],
+  ["CFA3",0x6D37],
+  ["ACA9",0x6D38],
+  ["ACA7",0x6D39],
+  ["CF79",0x6D3A],
+  ["ACA1",0x6D3B],
+  ["CF71",0x6D3C],
+  ["ACA2",0x6D3D],
+  ["ACA3",0x6D3E],
+  ["CF72",0x6D3F],
+  ["CFA6",0x6D40],
+  ["AC79",0x6D41],
+  ["CF7E",0x6D42],
+  ["D24C",0x6D58],
+  ["AEFD",0x6D59],
+  ["AF43",0x6D5A],
+  ["D255",0x6D5E],
+  ["D25B",0x6D5F],
+  ["D257",0x6D60],
+  ["D24A",0x6D61],
+  ["D24D",0x6D62],
+  ["D246",0x6D63],
+  ["D247",0x6D64],
+  ["AF4A",0x6D65],
+  ["AEFA",0x6D66],
+  ["D256",0x6D67],
+  ["D25F",0x6D68],
+  ["AF45",0x6D69],
+  ["AEF6",0x6D6A],
+  ["AF40",0x6D6C],
+  ["D24E",0x6D6D],
+  ["AF42",0x6D6E],
+  ["D24F",0x6D6F],
+  ["D259",0x6D70],
+  ["AF44",0x6D74],
+  ["D268",0x6D75],
+  ["D248",0x6D76],
+  ["AEFC",0x6D77],
+  ["AEFB",0x6D78],
+  ["AF48",0x6D79],
+  ["D245",0x6D7A],
+  ["D266",0x6D7B],
+  ["D25A",0x6D7C],
+  ["D267",0x6D7D],
+  ["D261",0x6D7E],
+  ["D253",0x6D7F],
+  ["D262",0x6D80],
+  ["D25C",0x6D82],
+  ["D265",0x6D83],
+  ["D263",0x6D84],
+  ["AF49",0x6D85],
+  ["D254",0x6D86],
+  ["AEF9",0x6D87],
+  ["AEF8",0x6D88],
+  ["AF41",0x6D89],
+  ["AF47",0x6D8A],
+  ["D260",0x6D8B],
+  ["AF46",0x6D8C],
+  ["D251",0x6D8D],
+  ["B243",0x6D8E],
+  ["D269",0x6D90],
+  ["D250",0x6D91],
+  ["D24B",0x6D92],
+  ["AEFE",0x6D93],
+  ["AF4B",0x6D94],
+  ["AEF7",0x6D95],
+  ["D258",0x6D97],
+  ["D25D",0x6D98],
+  ["B265",0x6DAA],
+  ["D5E1",0x6DAB],
+  ["D5E5",0x6DAC],
+  ["B252",0x6DAE],
+  ["B250",0x6DAF],
+  ["B247",0x6DB2],
+  ["D5E3",0x6DB3],
+  ["D5E2",0x6DB4],
+  ["B25B",0x6DB5],
+  ["D5E8",0x6DB7],
+  ["B255",0x6DB8],
+  ["D5FA",0x6DBA],
+  ["D647",0x6DBB],
+  ["B244",0x6DBC],
+  ["D5F7",0x6DBD],
+  ["D5F0",0x6DBE],
+  ["B267",0x6DBF],
+  ["D5E0",0x6DC0],
+  ["D5FC",0x6DC2],
+  ["B264",0x6DC4],
+  ["B258",0x6DC5],
+  ["B263",0x6DC6],
+  ["B24E",0x6DC7],
+  ["D5EC",0x6DC8],
+  ["D5FE",0x6DC9],
+  ["D5F6",0x6DCA],
+  ["B24F",0x6DCB],
+  ["B249",0x6DCC],
+  ["D645",0x6DCD],
+  ["D5FD",0x6DCF],
+  ["D640",0x6DD0],
+  ["B251",0x6DD1],
+  ["B259",0x6DD2],
+  ["D642",0x6DD3],
+  ["D5EA",0x6DD4],
+  ["D5FB",0x6DD5],
+  ["D5EF",0x6DD6],
+  ["D644",0x6DD7],
+  ["B25E",0x6DD8],
+  ["B246",0x6DD9],
+  ["B25C",0x6DDA],
+  ["D5F4",0x6DDB],
+  ["D5F2",0x6DDC],
+  ["D5F3",0x6DDD],
+  ["B253",0x6DDE],
+  ["D5EE",0x6DDF],
+  ["D5ED",0x6DE0],
+  ["B248",0x6DE1],
+  ["D5E7",0x6DE2],
+  ["D646",0x6DE3],
+  ["B24A",0x6DE4],
+  ["D5F1",0x6DE5],
+  ["B268",0x6DE6],
+  ["B262",0x6DE8],
+  ["D5E6",0x6DE9],
+  ["B25F",0x6DEA],
+  ["B25D",0x6DEB],
+  ["B266",0x6DEC],
+  ["D5F8",0x6DED],
+  ["B261",0x6DEE],
+  ["D252",0x6DEF],
+  ["D5F9",0x6DF0],
+  ["B260",0x6DF1],
+  ["D641",0x6DF2],
+  ["B245",0x6DF3],
+  ["D5F5",0x6DF4],
+  ["B257",0x6DF5],
+  ["D5E9",0x6DF6],
+  ["B256",0x6DF7],
+  ["B254",0x6DF9],
+  ["B24C",0x6DFA],
+  ["B24B",0x6DFB],
+  ["D9E7",0x6DFC],
+  ["D643",0x6DFD],
+  ["D5EB",0x6E00],
+  ["D9FC",0x6E03],
+  ["B24D",0x6E05],
+  ["B541",0x6E19],
+  ["B25A",0x6E1A],
+  ["B4EE",0x6E1B],
+  ["D9F6",0x6E1C],
+  ["B4FC",0x6E1D],
+  ["D9EA",0x6E1F],
+  ["B4EB",0x6E20],
+  ["B4E7",0x6E21],
+  ["DA49",0x6E22],
+  ["B4ED",0x6E23],
+  ["B4F1",0x6E24],
+  ["B4EC",0x6E25],
+  ["B4F5",0x6E26],
+  ["DA4D",0x6E27],
+  ["DA44",0x6E28],
+  ["D9F1",0x6E2B],
+  ["B4FA",0x6E2C],
+  ["B4F4",0x6E2D],
+  ["D9FD",0x6E2E],
+  ["B4E4",0x6E2F],
+  ["DA4A",0x6E30],
+  ["DA43",0x6E31],
+  ["B4E8",0x6E32],
+  ["D9F7",0x6E33],
+  ["B4F7",0x6E34],
+  ["DA55",0x6E35],
+  ["DA56",0x6E36],
+  ["B4E5",0x6E38],
+  ["DA48",0x6E39],
+  ["B4F9",0x6E3A],
+  ["D9FB",0x6E3B],
+  ["D9ED",0x6E3C],
+  ["D9EE",0x6E3D],
+  ["B4FD",0x6E3E],
+  ["D9F2",0x6E3F],
+  ["D9F9",0x6E40],
+  ["D9F3",0x6E41],
+  ["B4FB",0x6E43],
+  ["B544",0x6E44],
+  ["D9EF",0x6E45],
+  ["D9E8",0x6E46],
+  ["D9E9",0x6E47],
+  ["D9EB",0x6E49],
+  ["B4EA",0x6E4A],
+  ["D9F8",0x6E4B],
+  ["B4F8",0x6E4D],
+  ["B542",0x6E4E],
+  ["D9FA",0x6E51],
+  ["DA53",0x6E52],
+  ["DA4B",0x6E53],
+  ["B4E6",0x6E54],
+  ["DA51",0x6E55],
+  ["B4F2",0x6E56],
+  ["B4F0",0x6E58],
+  ["DA57",0x6E5A],
+  ["B4EF",0x6E5B],
+  ["DA41",0x6E5C],
+  ["D9F4",0x6E5D],
+  ["D9FE",0x6E5E],
+  ["B547",0x6E5F],
+  ["DA45",0x6E60],
+  ["DA42",0x6E61],
+  ["D9F0",0x6E62],
+  ["B543",0x6E63],
+  ["DA4F",0x6E64],
+  ["DA4C",0x6E65],
+  ["DA54",0x6E66],
+  ["B4E9",0x6E67],
+  ["DA40",0x6E68],
+  ["B546",0x6E69],
+  ["DA47",0x6E6B],
+  ["B4F3",0x6E6E],
+  ["B4F6",0x6E6F],
+  ["DA46",0x6E71],
+  ["B545",0x6E72],
+  ["D9F5",0x6E73],
+  ["D5E4",0x6E74],
+  ["DA50",0x6E77],
+  ["DA4E",0x6E78],
+  ["DA52",0x6E79],
+  ["D9EC",0x6E88],
+  ["B540",0x6E89],
+  ["DE61",0x6E8D],
+  ["DE60",0x6E8E],
+  ["DE46",0x6E8F],
+  ["B7BD",0x6E90],
+  ["DE5F",0x6E92],
+  ["DE49",0x6E93],
+  ["DE4A",0x6E94],
+  ["B7C7",0x6E96],
+  ["DE68",0x6E97],
+  ["B7C2",0x6E98],
+  ["DE5E",0x6E99],
+  ["DE43",0x6E9B],
+  ["B7C8",0x6E9C],
+  ["B7BE",0x6E9D],
+  ["DE52",0x6E9E],
+  ["DE48",0x6E9F],
+  ["DE4B",0x6EA0],
+  ["DE63",0x6EA1],
+  ["B7B8",0x6EA2],
+  ["DE6A",0x6EA3],
+  ["DE62",0x6EA4],
+  ["B7C1",0x6EA5],
+  ["DE57",0x6EA6],
+  ["B7CC",0x6EA7],
+  ["B7CB",0x6EAA],
+  ["B7C5",0x6EAB],
+  ["DE69",0x6EAE],
+  ["B7B9",0x6EAF],
+  ["DE55",0x6EB0],
+  ["DE4C",0x6EB1],
+  ["DE59",0x6EB2],
+  ["DE65",0x6EB3],
+  ["B7CD",0x6EB4],
+  ["B7BB",0x6EB6],
+  ["DE54",0x6EB7],
+  ["DE4D",0x6EB9],
+  ["B7C4",0x6EBA],
+  ["B7C3",0x6EBC],
+  ["DE50",0x6EBD],
+  ["DE5A",0x6EBE],
+  ["DE64",0x6EBF],
+  ["DE47",0x6EC0],
+  ["DE51",0x6EC1],
+  ["B7BC",0x6EC2],
+  ["DE5B",0x6EC3],
+  ["B7C9",0x6EC4],
+  ["B7C0",0x6EC5],
+  ["DE4E",0x6EC6],
+  ["B7BF",0x6EC7],
+  ["DE45",0x6EC8],
+  ["DE53",0x6EC9],
+  ["DE67",0x6ECA],
+  ["B4FE",0x6ECB],
+  ["BAB0",0x6ECC],
+  ["DE56",0x6ECD],
+  ["E26C",0x6ECE],
+  ["DE58",0x6ECF],
+  ["DE66",0x6ED0],
+  ["B7C6",0x6ED1],
+  ["DE4F",0x6ED2],
+  ["B7BA",0x6ED3],
+  ["B7CA",0x6ED4],
+  ["BCF0",0x6ED5],
+  ["DE44",0x6ED6],
+  ["DE5D",0x6ED8],
+  ["DE5C",0x6EDC],
+  ["E2AA",0x6EEB],
+  ["BAAD",0x6EEC],
+  ["E27D",0x6EED],
+  ["E2A4",0x6EEE],
+  ["BAA2",0x6EEF],
+  ["E26E",0x6EF1],
+  ["BAAF",0x6EF2],
+  ["BA77",0x6EF4],
+  ["E26D",0x6EF5],
+  ["E2B0",0x6EF6],
+  ["BAB1",0x6EF7],
+  ["E271",0x6EF8],
+  ["E2A3",0x6EF9],
+  ["E273",0x6EFB],
+  ["E2B3",0x6EFC],
+  ["E2AF",0x6EFD],
+  ["BA75",0x6EFE],
+  ["BAA1",0x6EFF],
+  ["E653",0x6F00],
+  ["BAAE",0x6F01],
+  ["BA7D",0x6F02],
+  ["E26F",0x6F03],
+  ["E2AE",0x6F05],
+  ["BAA3",0x6F06],
+  ["E2AB",0x6F07],
+  ["E2B8",0x6F08],
+  ["E275",0x6F09],
+  ["E27E",0x6F0A],
+  ["E2B6",0x6F0D],
+  ["E2AC",0x6F0E],
+  ["BA7C",0x6F0F],
+  ["E27C",0x6F12],
+  ["BA76",0x6F13],
+  ["BA74",0x6F14],
+  ["BAA8",0x6F15],
+  ["E27A",0x6F18],
+  ["E277",0x6F19],
+  ["E278",0x6F1A],
+  ["E2B2",0x6F1C],
+  ["E2B7",0x6F1E],
+  ["E2B5",0x6F1F],
+  ["BA7A",0x6F20],
+  ["E2B9",0x6F21],
+  ["BA7E",0x6F22],
+  ["BAA7",0x6F23],
+  ["E270",0x6F25],
+  ["E5FA",0x6F26],
+  ["E279",0x6F27],
+  ["BA78",0x6F29],
+  ["BAAC",0x6F2A],
+  ["BAA9",0x6F2B],
+  ["BA7B",0x6F2C],
+  ["E2A5",0x6F2D],
+  ["E274",0x6F2E],
+  ["BAAA",0x6F2F],
+  ["E2A7",0x6F30],
+  ["BAA4",0x6F31],
+  ["BAA6",0x6F32],
+  ["BA73",0x6F33],
+  ["E2A9",0x6F35],
+  ["E2A1",0x6F36],
+  ["E272",0x6F37],
+  ["BAA5",0x6F38],
+  ["E2B1",0x6F39],
+  ["E2B4",0x6F3A],
+  ["E27B",0x6F3B],
+  ["E2A8",0x6F3C],
+  ["BA79",0x6F3E],
+  ["BCDF",0x6F3F],
+  ["E2A6",0x6F40],
+  ["E5F9",0x6F41],
+  ["E2AD",0x6F43],
+  ["E276",0x6F4E],
+  ["E644",0x6F4F],
+  ["E64E",0x6F50],
+  ["BCE2",0x6F51],
+  ["E64D",0x6F52],
+  ["E659",0x6F53],
+  ["BCE4",0x6F54],
+  ["E64B",0x6F55],
+  ["E64F",0x6F57],
+  ["BCEF",0x6F58],
+  ["E646",0x6F5A],
+  ["BCE7",0x6F5B],
+  ["E652",0x6F5D],
+  ["E9F0",0x6F5E],
+  ["BCF3",0x6F5F],
+  ["BCF2",0x6F60],
+  ["E654",0x6F61],
+  ["E643",0x6F62],
+  ["E65E",0x6F63],
+  ["BCED",0x6F64],
+  ["BCE3",0x6F66],
+  ["E657",0x6F67],
+  ["E65B",0x6F69],
+  ["E660",0x6F6A],
+  ["E655",0x6F6B],
+  ["E649",0x6F6C],
+  ["BCE6",0x6F6D],
+  ["BCE9",0x6F6E],
+  ["BCF1",0x6F6F],
+  ["BCEC",0x6F70],
+  ["E64C",0x6F72],
+  ["E2A2",0x6F73],
+  ["E648",0x6F76],
+  ["E65F",0x6F77],
+  ["BCE8",0x6F78],
+  ["BCEB",0x6F7A],
+  ["E661",0x6F7B],
+  ["BCE0",0x6F7C],
+  ["E656",0x6F7D],
+  ["E5FB",0x6F7E],
+  ["E65C",0x6F7F],
+  ["C0DF",0x6F80],
+  ["E64A",0x6F82],
+  ["BCE1",0x6F84],
+  ["E645",0x6F85],
+  ["BCE5",0x6F86],
+  ["E5FC",0x6F87],
+  ["BAAB",0x6F88],
+  ["E641",0x6F89],
+  ["E65A",0x6F8B],
+  ["E642",0x6F8C],
+  ["E640",0x6F8D],
+  ["BCEA",0x6F8E],
+  ["E658",0x6F90],
+  ["E5FE",0x6F92],
+  ["E651",0x6F93],
+  ["E650",0x6F94],
+  ["E65D",0x6F95],
+  ["E647",0x6F96],
+  ["BCEE",0x6F97],
+  ["E9F3",0x6F9E],
+  ["BF49",0x6FA0],
+  ["BEFE",0x6FA1],
+  ["EA40",0x6FA2],
+  ["E9EB",0x6FA3],
+  ["BF41",0x6FA4],
+  ["E9F7",0x6FA5],
+  ["BF48",0x6FA6],
+  ["BF43",0x6FA7],
+  ["E9F5",0x6FA8],
+  ["ED4F",0x6FA9],
+  ["E9FB",0x6FAA],
+  ["EA42",0x6FAB],
+  ["E9FA",0x6FAC],
+  ["E9E9",0x6FAD],
+  ["E9F8",0x6FAE],
+  ["EA44",0x6FAF],
+  ["EA46",0x6FB0],
+  ["BEFD",0x6FB1],
+  ["EA45",0x6FB2],
+  ["BF44",0x6FB3],
+  ["BF4A",0x6FB4],
+  ["BF47",0x6FB6],
+  ["E9FE",0x6FB8],
+  ["BF46",0x6FB9],
+  ["E9F9",0x6FBA],
+  ["E9ED",0x6FBC],
+  ["E9F2",0x6FBD],
+  ["E9FD",0x6FBF],
+  ["BF45",0x6FC0],
+  ["BF42",0x6FC1],
+  ["BEFC",0x6FC2],
+  ["BF40",0x6FC3],
+  ["E9F1",0x6FC4],
+  ["E5FD",0x6FC6],
+  ["E9EC",0x6FC7],
+  ["E9EF",0x6FC8],
+  ["EA41",0x6FC9],
+  ["E9F4",0x6FCA],
+  ["E9EA",0x6FCB],
+  ["ED4E",0x6FCC],
+  ["EA43",0x6FCD],
+  ["E9EE",0x6FCE],
+  ["E9FC",0x6FCF],
+  ["ED51",0x6FD4],
+  ["C0E3",0x6FD5],
+  ["C0D7",0x6FD8],
+  ["C0DB",0x6FDB],
+  ["ED53",0x6FDC],
+  ["ED59",0x6FDD],
+  ["ED57",0x6FDE],
+  ["C0D9",0x6FDF],
+  ["C0DA",0x6FE0],
+  ["C0E1",0x6FE1],
+  ["ED5A",0x6FE2],
+  ["ED52",0x6FE3],
+  ["C0DC",0x6FE4],
+  ["ED56",0x6FE6],
+  ["ED55",0x6FE7],
+  ["ED5B",0x6FE8],
+  ["C0E2",0x6FE9],
+  ["C0DD",0x6FEB],
+  ["C0E0",0x6FEC],
+  ["ED54",0x6FED],
+  ["C0E4",0x6FEE],
+  ["C0DE",0x6FEF],
+  ["C0E5",0x6FF0],
+  ["C0D8",0x6FF1],
+  ["ED58",0x6FF2],
+  ["ED50",0x6FF4],
+  ["EFF7",0x6FF7],
+  ["C271",0x6FFA],
+  ["EFF4",0x6FFB],
+  ["EFF6",0x6FFC],
+  ["C26F",0x6FFE],
+  ["EFF2",0x6FFF],
+  ["EFF3",0x7000],
+  ["EFEE",0x7001],
+  ["E9F6",0x7004],
+  ["EFEF",0x7005],
+  ["C270",0x7006],
+  ["EFEB",0x7007],
+  ["C26D",0x7009],
+  ["EFF8",0x700A],
+  ["C26E",0x700B],
+  ["EFEC",0x700C],
+  ["EFED",0x700D],
+  ["EFF1",0x700E],
+  ["C273",0x700F],
+  ["C272",0x7011],
+  ["EFF0",0x7014],
+  ["C378",0x7015],
+  ["F25F",0x7016],
+  ["F265",0x7017],
+  ["C379",0x7018],
+  ["F25C",0x7019],
+  ["C376",0x701A],
+  ["C373",0x701B],
+  ["F267",0x701C],
+  ["C377",0x701D],
+  ["C374",0x701F],
+  ["F25E",0x7020],
+  ["F261",0x7021],
+  ["F262",0x7022],
+  ["F263",0x7023],
+  ["F266",0x7024],
+  ["EFF5",0x7026],
+  ["F25D",0x7027],
+  ["C375",0x7028],
+  ["F264",0x7029],
+  ["F268",0x702A],
+  ["F260",0x702B],
+  ["F45D",0x702F],
+  ["C46A",0x7030],
+  ["F460",0x7031],
+  ["C46B",0x7032],
+  ["F468",0x7033],
+  ["F45F",0x7034],
+  ["F45C",0x7035],
+  ["F45E",0x7037],
+  ["F462",0x7038],
+  ["F465",0x7039],
+  ["F464",0x703A],
+  ["F467",0x703B],
+  ["F45B",0x703C],
+  ["C469",0x703E],
+  ["F463",0x703F],
+  ["F466",0x7040],
+  ["F469",0x7041],
+  ["F461",0x7042],
+  ["F5D3",0x7043],
+  ["F5D4",0x7044],
+  ["F5D8",0x7045],
+  ["F5D9",0x7046],
+  ["F5D6",0x7048],
+  ["F5D7",0x7049],
+  ["F5D5",0x704A],
+  ["C4E9",0x704C],
+  ["C578",0x7051],
+  ["F6EB",0x7052],
+  ["F6E8",0x7055],
+  ["F6E9",0x7056],
+  ["F6EA",0x7057],
+  ["C579",0x7058],
+  ["F7E5",0x705A],
+  ["F7E4",0x705B],
+  ["F8AF",0x705D],
+  ["C5F4",0x705E],
+  ["F8AD",0x705F],
+  ["F8B0",0x7060],
+  ["F8AE",0x7061],
+  ["F8F5",0x7062],
+  ["C657",0x7063],
+  ["C665",0x7064],
+  ["F9A3",0x7065],
+  ["F96C",0x7066],
+  ["F9A2",0x7068],
+  ["F9D0",0x7069],
+  ["F9D1",0x706A],
+  ["A4F5",0x706B],
+  ["A6C7",0x7070],
+  ["CA41",0x7071],
+  ["CB5E",0x7074],
+  ["A85F",0x7076],
+  ["A862",0x7078],
+  ["CB5F",0x707A],
+  ["A860",0x707C],
+  ["A861",0x707D],
+  ["CD58",0x7082],
+  ["CD5A",0x7083],
+  ["CD55",0x7084],
+  ["CD52",0x7085],
+  ["CD54",0x7086],
+  ["AAA4",0x708A],
+  ["AAA2",0x708E],
+  ["CD56",0x7091],
+  ["AAA3",0x7092],
+  ["CD53",0x7093],
+  ["CD50",0x7094],
+  ["AAA1",0x7095],
+  ["CD57",0x7096],
+  ["CD51",0x7098],
+  ["AAA5",0x7099],
+  ["CD59",0x709A],
+  ["CFAF",0x709F],
+  ["CFB3",0x70A1],
+  ["ACB7",0x70A4],
+  ["CFB6",0x70A9],
+  ["ACAF",0x70AB],
+  ["ACB2",0x70AC],
+  ["ACB4",0x70AD],
+  ["ACB6",0x70AE],
+  ["ACB3",0x70AF],
+  ["CFB2",0x70B0],
+  ["CFB1",0x70B1],
+  ["ACB1",0x70B3],
+  ["CFB4",0x70B4],
+  ["CFB5",0x70B5],
+  ["CFAE",0x70B7],
+  ["ACB5",0x70B8],
+  ["ACB0",0x70BA],
+  ["CFB0",0x70BE],
+  ["D277",0x70C5],
+  ["D278",0x70C6],
+  ["D279",0x70C7],
+  ["AF50",0x70C8],
+  ["AF4C",0x70CA],
+  ["D26E",0x70CB],
+  ["D276",0x70CD],
+  ["D27B",0x70CE],
+  ["AF51",0x70CF],
+  ["D26C",0x70D1],
+  ["D272",0x70D2],
+  ["D26B",0x70D3],
+  ["D275",0x70D4],
+  ["D271",0x70D7],
+  ["AF4D",0x70D8],
+  ["AF4F",0x70D9],
+  ["D27A",0x70DA],
+  ["D26A",0x70DC],
+  ["D26D",0x70DD],
+  ["D273",0x70DE],
+  ["D274",0x70E0],
+  ["D27C",0x70E1],
+  ["D270",0x70E2],
+  ["AF4E",0x70E4],
+  ["B26D",0x70EF],
+  ["D64E",0x70F0],
+  ["D650",0x70F3],
+  ["D64C",0x70F4],
+  ["D658",0x70F6],
+  ["D64A",0x70F7],
+  ["D657",0x70F8],
+  ["B269",0x70F9],
+  ["D648",0x70FA],
+  ["DA5B",0x70FB],
+  ["D652",0x70FC],
+  ["B26C",0x70FD],
+  ["D653",0x70FF],
+  ["D656",0x7100],
+  ["D65A",0x7102],
+  ["D64F",0x7104],
+  ["D654",0x7106],
+  ["B26A",0x7109],
+  ["B26B",0x710A],
+  ["D659",0x710B],
+  ["D64D",0x710C],
+  ["D649",0x710D],
+  ["D65B",0x710E],
+  ["D651",0x7110],
+  ["D655",0x7113],
+  ["D64B",0x7117],
+  ["B548",0x7119],
+  ["B549",0x711A],
+  ["DA65",0x711B],
+  ["B54F",0x711C],
+  ["DA59",0x711E],
+  ["DA62",0x711F],
+  ["DA58",0x7120],
+  ["B54C",0x7121],
+  ["DA60",0x7122],
+  ["DA5E",0x7123],
+  ["DA5F",0x7125],
+  ["B54A",0x7126],
+  ["DA63",0x7128],
+  ["DA5C",0x712E],
+  ["DA5A",0x712F],
+  ["B54B",0x7130],
+  ["DA5D",0x7131],
+  ["DA61",0x7132],
+  ["B54D",0x7136],
+  ["DA64",0x713A],
+  ["DE70",0x7141],
+  ["DE77",0x7142],
+  ["DE79",0x7143],
+  ["DEA1",0x7144],
+  ["B7DA",0x7146],
+  ["DE6B",0x7147],
+  ["B7D2",0x7149],
+  ["DE7A",0x714B],
+  ["B7D7",0x714C],
+  ["DEA2",0x714D],
+  ["B7CE",0x714E],
+  ["DE7D",0x7150],
+  ["DE6D",0x7152],
+  ["DE7E",0x7153],
+  ["DE6C",0x7154],
+  ["B7DC",0x7156],
+  ["DE78",0x7158],
+  ["B7CF",0x7159],
+  ["DEA3",0x715A],
+  ["B7D4",0x715C],
+  ["DE71",0x715D],
+  ["B7D9",0x715E],
+  ["DE7C",0x715F],
+  ["DE6F",0x7160],
+  ["DE76",0x7161],
+  ["DE72",0x7162],
+  ["DE6E",0x7163],
+  ["B7D1",0x7164],
+  ["B7D8",0x7165],
+  ["B7D6",0x7166],
+  ["B7D3",0x7167],
+  ["B7DB",0x7168],
+  ["B7D0",0x7169],
+  ["DE75",0x716A],
+  ["B7D5",0x716C],
+  ["B54E",0x716E],
+  ["DE7B",0x7170],
+  ["DE73",0x7172],
+  ["DE74",0x7178],
+  ["E2C1",0x717B],
+  ["BAB4",0x717D],
+  ["E2BD",0x7180],
+  ["E2C3",0x7181],
+  ["E2BF",0x7182],
+  ["BAB6",0x7184],
+  ["E2BE",0x7185],
+  ["E2C2",0x7186],
+  ["E2BA",0x7187],
+  ["E2BC",0x7189],
+  ["BAB5",0x718A],
+  ["E2C0",0x718F],
+  ["E2BB",0x7190],
+  ["BAB7",0x7192],
+  ["BAB2",0x7194],
+  ["E2C4",0x7197],
+  ["BAB3",0x7199],
+  ["E667",0x719A],
+  ["E664",0x719B],
+  ["E670",0x719C],
+  ["E66A",0x719D],
+  ["E66C",0x719E],
+  ["BCF4",0x719F],
+  ["E666",0x71A0],
+  ["E66E",0x71A1],
+  ["E66D",0x71A4],
+  ["E66B",0x71A5],
+  ["E671",0x71A7],
+  ["BCF7",0x71A8],
+  ["E668",0x71A9],
+  ["E66F",0x71AA],
+  ["BCF5",0x71AC],
+  ["E663",0x71AF],
+  ["E665",0x71B0],
+  ["BCF6",0x71B1],
+  ["E662",0x71B2],
+  ["E672",0x71B3],
+  ["E669",0x71B5],
+  ["EA4A",0x71B8],
+  ["BF51",0x71B9],
+  ["EA55",0x71BC],
+  ["EA53",0x71BD],
+  ["BF4B",0x71BE],
+  ["EA49",0x71BF],
+  ["EA4C",0x71C0],
+  ["EA4D",0x71C1],
+  ["EA48",0x71C2],
+  ["BF55",0x71C3],
+  ["BF56",0x71C4],
+  ["EA47",0x71C5],
+  ["EA56",0x71C6],
+  ["EA51",0x71C7],
+  ["BF4F",0x71C8],
+  ["BF4C",0x71C9],
+  ["EA50",0x71CA],
+  ["EA4E",0x71CB],
+  ["BF52",0x71CE],
+  ["EA52",0x71CF],
+  ["BF4D",0x71D0],
+  ["BF4E",0x71D2],
+  ["EA4F",0x71D4],
+  ["BF50",0x71D5],
+  ["EA4B",0x71D6],
+  ["EA54",0x71D8],
+  ["BF53",0x71D9],
+  ["EA57",0x71DA],
+  ["EA58",0x71DB],
+  ["BF54",0x71DC],
+  ["C0E7",0x71DF],
+  ["C0EE",0x71E0],
+  ["ED5C",0x71E1],
+  ["ED62",0x71E2],
+  ["ED60",0x71E4],
+  ["C0EA",0x71E5],
+  ["C0E9",0x71E6],
+  ["C0E6",0x71E7],
+  ["ED5E",0x71E8],
+  ["C0EC",0x71EC],
+  ["C0EB",0x71ED],
+  ["C0E8",0x71EE],
+  ["ED61",0x71F0],
+  ["ED5D",0x71F1],
+  ["ED5F",0x71F2],
+  ["C0ED",0x71F4],
+  ["C277",0x71F8],
+  ["EFFB",0x71F9],
+  ["C274",0x71FB],
+  ["C275",0x71FC],
+  ["EFFD",0x71FD],
+  ["C276",0x71FE],
+  ["EFFA",0x71FF],
+  ["EFF9",0x7201],
+  ["F26C",0x7202],
+  ["EFFC",0x7203],
+  ["F26D",0x7205],
+  ["C37A",0x7206],
+  ["F26B",0x7207],
+  ["F26A",0x720A],
+  ["F269",0x720C],
+  ["C37B",0x720D],
+  ["C46C",0x7210],
+  ["F46A",0x7213],
+  ["F46B",0x7214],
+  ["F5DC",0x7219],
+  ["F5DB",0x721A],
+  ["C4EA",0x721B],
+  ["F5DA",0x721D],
+  ["F6EC",0x721E],
+  ["F6ED",0x721F],
+  ["F7E6",0x7222],
+  ["F8B1",0x7223],
+  ["F8F6",0x7226],
+  ["F9BC",0x7227],
+  ["C679",0x7228],
+  ["F9C6",0x7229],
+  ["A4F6",0x722A],
+  ["AAA6",0x722C],
+  ["AAA7",0x722D],
+  ["ACB8",0x7230],
+  ["C0EF",0x7235],
+  ["A4F7",0x7236],
+  ["AAA8",0x7238],
+  ["AF52",0x7239],
+  ["B7DD",0x723A],
+  ["A4F8",0x723B],
+  ["B26E",0x723D],
+  ["BAB8",0x723E],
+  ["C962",0x723F],
+  ["CFB7",0x7241],
+  ["D27D",0x7242],
+  ["E2C5",0x7244],
+  ["C0F0",0x7246],
+  ["A4F9",0x7247],
+  ["AAA9",0x7248],
+  ["CFB8",0x7249],
+  ["CFB9",0x724A],
+  ["DA66",0x724B],
+  ["B550",0x724C],
+  ["DEA4",0x724F],
+  ["B7DE",0x7252],
+  ["E2C6",0x7253],
+  ["BCF8",0x7256],
+  ["C37C",0x7258],
+  ["A4FA",0x7259],
+  ["DA67",0x725A],
+  ["A4FB",0x725B],
+  ["A6C9",0x725D],
+  ["CA42",0x725E],
+  ["A6C8",0x725F],
+  ["A865",0x7260],
+  ["A864",0x7261],
+  ["A863",0x7262],
+  ["CB60",0x7263],
+  ["AAAA",0x7267],
+  ["AAAB",0x7269],
+  ["CD5B",0x726A],
+  ["CFBA",0x726C],
+  ["CFBD",0x726E],
+  ["ACBA",0x726F],
+  ["CFBB",0x7270],
+  ["ACB9",0x7272],
+  ["CFBC",0x7273],
+  ["ACBB",0x7274],
+  ["D2A2",0x7276],
+  ["D2A1",0x7277],
+  ["D27E",0x7278],
+  ["AF53",0x7279],
+  ["D65D",0x727B],
+  ["D65E",0x727C],
+  ["B26F",0x727D],
+  ["D65C",0x727E],
+  ["D65F",0x727F],
+  ["B552",0x7280],
+  ["B270",0x7281],
+  ["B551",0x7284],
+  ["DA6B",0x7285],
+  ["DA6A",0x7286],
+  ["DA68",0x7288],
+  ["DA69",0x7289],
+  ["DA6C",0x728B],
+  ["DEA6",0x728C],
+  ["DEA5",0x728D],
+  ["DEA9",0x728E],
+  ["DEA8",0x7290],
+  ["DEA7",0x7291],
+  ["BAB9",0x7292],
+  ["E2C9",0x7293],
+  ["E2C8",0x7295],
+  ["BABA",0x7296],
+  ["E2C7",0x7297],
+  ["E673",0x7298],
+  ["E674",0x729A],
+  ["BCF9",0x729B],
+  ["EA59",0x729D],
+  ["EA5A",0x729E],
+  ["F272",0x72A1],
+  ["C37D",0x72A2],
+  ["F271",0x72A3],
+  ["F270",0x72A4],
+  ["F26E",0x72A5],
+  ["F26F",0x72A6],
+  ["C4EB",0x72A7],
+  ["F46C",0x72A8],
+  ["F6EE",0x72A9],
+  ["F8F7",0x72AA],
+  ["A4FC",0x72AC],
+  ["C9A5",0x72AE],
+  ["A5C7",0x72AF],
+  ["C9A6",0x72B0],
+  ["CA43",0x72B4],
+  ["CA44",0x72B5],
+  ["CB66",0x72BA],
+  ["CB62",0x72BD],
+  ["CB61",0x72BF],
+  ["AAAC",0x72C0],
+  ["CB65",0x72C1],
+  ["A867",0x72C2],
+  ["CB63",0x72C3],
+  ["A866",0x72C4],
+  ["CB67",0x72C5],
+  ["CB64",0x72C6],
+  ["CD5F",0x72C9],
+  ["CFBE",0x72CA],
+  ["CD5D",0x72CB],
+  ["CD64",0x72CC],
+  ["AAAD",0x72CE],
+  ["AAB0",0x72D0],
+  ["CD65",0x72D1],
+  ["CD61",0x72D2],
+  ["CD62",0x72D4],
+  ["CD5C",0x72D6],
+  ["AAAF",0x72D7],
+  ["CD5E",0x72D8],
+  ["AAAE",0x72D9],
+  ["CD63",0x72DA],
+  ["CD60",0x72DC],
+  ["CFC2",0x72DF],
+  ["ACBD",0x72E0],
+  ["ACBE",0x72E1],
+  ["CFC5",0x72E3],
+  ["CFBF",0x72E4],
+  ["CFC4",0x72E6],
+  ["CFC0",0x72E8],
+  ["ACBC",0x72E9],
+  ["CFC3",0x72EA],
+  ["CFC1",0x72EB],
+  ["D2A8",0x72F3],
+  ["D2A5",0x72F4],
+  ["D2A7",0x72F6],
+  ["AF58",0x72F7],
+  ["AF57",0x72F8],
+  ["AF55",0x72F9],
+  ["D2A4",0x72FA],
+  ["D2A9",0x72FB],
+  ["AF54",0x72FC],
+  ["AF56",0x72FD],
+  ["D2A6",0x72FE],
+  ["D667",0x72FF],
+  ["D2A3",0x7300],
+  ["D2AA",0x7301],
+  ["D662",0x7307],
+  ["D666",0x7308],
+  ["D665",0x730A],
+  ["DA6E",0x730B],
+  ["DA79",0x730C],
+  ["D668",0x730F],
+  ["D663",0x7311],
+  ["DA6D",0x7312],
+  ["B274",0x7313],
+  ["B273",0x7316],
+  ["D661",0x7317],
+  ["D664",0x7318],
+  ["B275",0x7319],
+  ["B272",0x731B],
+  ["B271",0x731C],
+  ["D660",0x731D],
+  ["D669",0x731E],
+  ["DA70",0x7322],
+  ["DA77",0x7323],
+  ["B554",0x7325],
+  ["DA76",0x7326],
+  ["DA73",0x7327],
+  ["B556",0x7329],
+  ["DA75",0x732D],
+  ["DA6F",0x7330],
+  ["DA71",0x7331],
+  ["DA74",0x7332],
+  ["DA72",0x7333],
+  ["B555",0x7334],
+  ["DA78",0x7335],
+  ["B553",0x7336],
+  ["B7DF",0x7337],
+  ["DEAD",0x733A],
+  ["DEAC",0x733B],
+  ["DEAA",0x733C],
+  ["B7E2",0x733E],
+  ["B7E1",0x733F],
+  ["DEAE",0x7340],
+  ["DEAB",0x7342],
+  ["E2CA",0x7343],
+  ["BABB",0x7344],
+  ["B7E0",0x7345],
+  ["DEB0",0x7349],
+  ["DEAF",0x734A],
+  ["E2CD",0x734C],
+  ["E2CB",0x734D],
+  ["BCFA",0x734E],
+  ["BABC",0x7350],
+  ["E2CC",0x7351],
+  ["E676",0x7352],
+  ["BCFB",0x7357],
+  ["E675",0x7358],
+  ["E67E",0x7359],
+  ["E67D",0x735A],
+  ["E67B",0x735B],
+  ["E67A",0x735D],
+  ["E677",0x735E],
+  ["E678",0x735F],
+  ["E679",0x7360],
+  ["E67C",0x7361],
+  ["E6A1",0x7362],
+  ["EA5F",0x7365],
+  ["EA5C",0x7366],
+  ["EA5D",0x7367],
+  ["BF57",0x7368],
+  ["EA5B",0x7369],
+  ["EA61",0x736A],
+  ["EA60",0x736B],
+  ["EA5E",0x736C],
+  ["ED64",0x736E],
+  ["ED65",0x736F],
+  ["C0F1",0x7370],
+  ["C0F2",0x7372],
+  ["ED63",0x7373],
+  ["C279",0x7375],
+  ["EFFE",0x7376],
+  ["C278",0x7377],
+  ["C37E",0x7378],
+  ["C3A1",0x737A],
+  ["C46D",0x737B],
+  ["F46E",0x737C],
+  ["F46D",0x737D],
+  ["F5DD",0x737E],
+  ["F6EF",0x737F],
+  ["C57A",0x7380],
+  ["F7E8",0x7381],
+  ["F7E7",0x7382],
+  ["F7E9",0x7383],
+  ["A5C8",0x7384],
+  ["CFC6",0x7385],
+  ["AF59",0x7386],
+  ["B276",0x7387],
+  ["D66A",0x7388],
+  ["A5C9",0x7389],
+  ["C9A7",0x738A],
+  ["A4FD",0x738B],
+  ["CA45",0x738E],
+  ["CB6C",0x7392],
+  ["CB6A",0x7393],
+  ["CB6B",0x7394],
+  ["CB68",0x7395],
+  ["A868",0x7396],
+  ["CB69",0x7397],
+  ["CD6D",0x739D],
+  ["AAB3",0x739F],
+  ["CD6B",0x73A0],
+  ["CD67",0x73A1],
+  ["CD6A",0x73A2],
+  ["CD66",0x73A4],
+  ["AAB5",0x73A5],
+  ["CD69",0x73A6],
+  ["AAB2",0x73A8],
+  ["AAB1",0x73A9],
+  ["AAB4",0x73AB],
+  ["CD6C",0x73AC],
+  ["CD68",0x73AD],
+  ["ACC2",0x73B2],
+  ["ACC5",0x73B3],
+  ["CFCE",0x73B4],
+  ["CFCD",0x73B5],
+  ["CFCC",0x73B6],
+  ["ACBF",0x73B7],
+  ["CFD5",0x73B8],
+  ["CFCB",0x73B9],
+  ["ACC1",0x73BB],
+  ["D2AF",0x73BC],
+  ["CFD2",0x73BE],
+  ["CFD0",0x73BF],
+  ["ACC4",0x73C0],
+  ["CFC8",0x73C2],
+  ["CFD3",0x73C3],
+  ["CFCA",0x73C5],
+  ["CFD4",0x73C6],
+  ["CFD1",0x73C7],
+  ["CFC9",0x73C8],
+  ["ACC0",0x73CA],
+  ["CFD6",0x73CB],
+  ["CFC7",0x73CC],
+  ["ACC3",0x73CD],
+  ["D2B4",0x73D2],
+  ["D2AB",0x73D3],
+  ["D2B6",0x73D4],
+  ["D2AE",0x73D6],
+  ["D2B9",0x73D7],
+  ["D2BA",0x73D8],
+  ["D2AC",0x73D9],
+  ["D2B8",0x73DA],
+  ["D2B5",0x73DB],
+  ["D2B3",0x73DC],
+  ["D2B7",0x73DD],
+  ["AF5F",0x73DE],
+  ["AF5D",0x73E0],
+  ["D2B1",0x73E3],
+  ["D2AD",0x73E5],
+  ["D2B0",0x73E7],
+  ["D2BB",0x73E8],
+  ["D2B2",0x73E9],
+  ["AF5E",0x73EA],
+  ["CFCF",0x73EB],
+  ["AF5A",0x73ED],
+  ["AF5C",0x73EE],
+  ["D678",0x73F4],
+  ["D66D",0x73F5],
+  ["D66B",0x73F6],
+  ["D66C",0x73F8],
+  ["D673",0x73FA],
+  ["D674",0x73FC],
+  ["D670",0x73FD],
+  ["B27B",0x73FE],
+  ["D675",0x73FF],
+  ["D672",0x7400],
+  ["D66F",0x7401],
+  ["B279",0x7403],
+  ["D66E",0x7404],
+  ["B277",0x7405],
+  ["B27A",0x7406],
+  ["D671",0x7407],
+  ["D679",0x7408],
+  ["AF5B",0x7409],
+  ["B278",0x740A],
+  ["D677",0x740B],
+  ["D676",0x740C],
+  ["B27C",0x740D],
+  ["DA7E",0x7416],
+  ["DAA1",0x741A],
+  ["B560",0x741B],
+  ["DAA7",0x741D],
+  ["DAA9",0x7420],
+  ["DAA2",0x7421],
+  ["B55A",0x7422],
+  ["DAA6",0x7423],
+  ["DAA5",0x7424],
+  ["B55B",0x7425],
+  ["B561",0x7426],
+  ["B562",0x7428],
+  ["DAA8",0x7429],
+  ["B558",0x742A],
+  ["DA7D",0x742B],
+  ["DA7B",0x742C],
+  ["DAA3",0x742D],
+  ["DA7A",0x742E],
+  ["B55F",0x742F],
+  ["DA7C",0x7430],
+  ["DAA4",0x7431],
+  ["DAAA",0x7432],
+  ["B559",0x7433],
+  ["B55E",0x7434],
+  ["B55C",0x7435],
+  ["B55D",0x7436],
+  ["B557",0x743A],
+  ["B7E9",0x743F],
+  ["DEB7",0x7440],
+  ["B7E8",0x7441],
+  ["DEBB",0x7442],
+  ["DEB1",0x7444],
+  ["DEBC",0x7446],
+  ["DEB2",0x744A],
+  ["DEB3",0x744B],
+  ["DEBD",0x744D],
+  ["DEBA",0x744E],
+  ["DEB8",0x744F],
+  ["DEB9",0x7450],
+  ["DEB5",0x7451],
+  ["DEB4",0x7452],
+  ["DEBE",0x7454],
+  ["B7E5",0x7455],
+  ["DEB6",0x7457],
+  ["B7EA",0x7459],
+  ["B7E4",0x745A],
+  ["B7EB",0x745B],
+  ["B7EC",0x745C],
+  ["B7E7",0x745E],
+  ["B7E6",0x745F],
+  ["E2CE",0x7462],
+  ["BABE",0x7463],
+  ["BABD",0x7464],
+  ["E2D3",0x7467],
+  ["BCFC",0x7469],
+  ["BABF",0x746A],
+  ["BAC1",0x746D],
+  ["E2D4",0x746E],
+  ["B7E3",0x746F],
+  ["BAC0",0x7470],
+  ["E2D0",0x7471],
+  ["E2D2",0x7472],
+  ["E2CF",0x7473],
+  ["E2D1",0x7475],
+  ["E6AB",0x7479],
+  ["E6AA",0x747C],
+  ["E6A7",0x747D],
+  ["BD40",0x747E],
+  ["EA62",0x747F],
+  ["BD41",0x7480],
+  ["E6A6",0x7481],
+  ["BCFE",0x7483],
+  ["E6A8",0x7485],
+  ["E6A5",0x7486],
+  ["E6A2",0x7487],
+  ["E6A9",0x7488],
+  ["E6A3",0x7489],
+  ["E6A4",0x748A],
+  ["BCFD",0x748B],
+  ["ED69",0x7490],
+  ["EA66",0x7492],
+  ["EA65",0x7494],
+  ["EA67",0x7495],
+  ["ED66",0x7497],
+  ["BF5A",0x7498],
+  ["EA63",0x749A],
+  ["BF58",0x749C],
+  ["BF5C",0x749E],
+  ["BF5B",0x749F],
+  ["EA64",0x74A0],
+  ["EA68",0x74A1],
+  ["BF59",0x74A3],
+  ["ED6D",0x74A5],
+  ["C0F5",0x74A6],
+  ["C27A",0x74A7],
+  ["C0F6",0x74A8],
+  ["C0F3",0x74A9],
+  ["ED6A",0x74AA],
+  ["ED68",0x74AB],
+  ["ED6B",0x74AD],
+  ["ED6E",0x74AF],
+  ["C0F4",0x74B0],
+  ["ED6C",0x74B1],
+  ["ED67",0x74B2],
+  ["F042",0x74B5],
+  ["F045",0x74B6],
+  ["F275",0x74B7],
+  ["F040",0x74B8],
+  ["F46F",0x74BA],
+  ["F046",0x74BB],
+  ["C3A2",0x74BD],
+  ["F044",0x74BE],
+  ["C27B",0x74BF],
+  ["F041",0x74C0],
+  ["F043",0x74C1],
+  ["F047",0x74C2],
+  ["F276",0x74C3],
+  ["F274",0x74C5],
+  ["C3A3",0x74CA],
+  ["F273",0x74CB],
+  ["C46E",0x74CF],
+  ["C4ED",0x74D4],
+  ["F6F1",0x74D5],
+  ["C4EC",0x74D6],
+  ["F6F3",0x74D7],
+  ["F6F0",0x74D8],
+  ["F6F2",0x74D9],
+  ["C5D0",0x74DA],
+  ["F8B2",0x74DB],
+  ["A5CA",0x74DC],
+  ["CD6E",0x74DD],
+  ["D2BC",0x74DE],
+  ["D2BD",0x74DF],
+  ["B27D",0x74E0],
+  ["DEBF",0x74E1],
+  ["BF5D",0x74E2],
+  ["C3A4",0x74E3],
+  ["C57B",0x74E4],
+  ["F8B3",0x74E5],
+  ["A5CB",0x74E6],
+  ["CD6F",0x74E8],
+  ["A260",0x74E9],
+  ["CFD7",0x74EC],
+  ["CFD8",0x74EE],
+  ["D2BE",0x74F4],
+  ["D2BF",0x74F5],
+  ["B27E",0x74F6],
+  ["B2A1",0x74F7],
+  ["DAAB",0x74FB],
+  ["DEC2",0x74FD],
+  ["DEC1",0x74FE],
+  ["DEC0",0x74FF],
+  ["E2D5",0x7500],
+  ["E2D6",0x7502],
+  ["E2D7",0x7503],
+  ["BAC2",0x7504],
+  ["E6AD",0x7507],
+  ["E6AC",0x7508],
+  ["EA69",0x750B],
+  ["BF5E",0x750C],
+  ["BF5F",0x750D],
+  ["ED72",0x750F],
+  ["ED6F",0x7510],
+  ["ED70",0x7511],
+  ["ED71",0x7512],
+  ["F049",0x7513],
+  ["F048",0x7514],
+  ["C27C",0x7515],
+  ["F277",0x7516],
+  ["F5DE",0x7517],
+  ["A5CC",0x7518],
+  ["ACC6",0x751A],
+  ["B2A2",0x751C],
+  ["DEC3",0x751D],
+  ["A5CD",0x751F],
+  ["D2C0",0x7521],
+  ["B2A3",0x7522],
+  ["B563",0x7525],
+  ["B564",0x7526],
+  ["A5CE",0x7528],
+  ["A5CF",0x7529],
+  ["CA46",0x752A],
+  ["A86A",0x752B],
+  ["A869",0x752C],
+  ["ACC7",0x752D],
+  ["CFD9",0x752E],
+  ["DAAC",0x752F],
+  ["A5D0",0x7530],
+  ["A5D1",0x7531],
+  ["A5D2",0x7532],
+  ["A5D3",0x7533],
+  ["A86B",0x7537],
+  ["A86C",0x7538],
+  ["CB6E",0x7539],
+  ["CB6D",0x753A],
+  ["AAB6",0x753D],
+  ["CD72",0x753E],
+  ["CD70",0x753F],
+  ["CD71",0x7540],
+  ["CFDA",0x7547],
+  ["CFDB",0x7548],
+  ["ACCB",0x754B],
+  ["ACC9",0x754C],
+  ["ACCA",0x754E],
+  ["ACC8",0x754F],
+  ["AF60",0x7554],
+  ["AF64",0x7559],
+  ["AF63",0x755A],
+  ["D2C1",0x755B],
+  ["AF62",0x755C],
+  ["AF61",0x755D],
+  ["D2C2",0x755F],
+  ["B2A6",0x7562],
+  ["D67B",0x7563],
+  ["D67A",0x7564],
+  ["B2A4",0x7565],
+  ["B2A5",0x7566],
+  ["B566",0x756A],
+  ["B565",0x756B],
+  ["DAAE",0x756C],
+  ["DAAD",0x756F],
+  ["B2A7",0x7570],
+  ["B7ED",0x7576],
+  ["DEC5",0x7577],
+  ["B7EE",0x7578],
+  ["DEC4",0x7579],
+  ["E2D8",0x757D],
+  ["E6AE",0x757E],
+  ["BD42",0x757F],
+  ["EA6A",0x7580],
+  ["ED73",0x7584],
+  ["C3A6",0x7586],
+  ["C3A5",0x7587],
+  ["C57C",0x758A],
+  ["A5D4",0x758B],
+  ["CD73",0x758C],
+  ["B2A8",0x758F],
+  ["E2D9",0x7590],
+  ["BAC3",0x7591],
+  ["CB6F",0x7594],
+  ["CB70",0x7595],
+  ["CD74",0x7598],
+  ["AAB8",0x7599],
+  ["AAB9",0x759A],
+  ["AAB7",0x759D],
+  ["ACCF",0x75A2],
+  ["ACD0",0x75A3],
+  ["ACCD",0x75A4],
+  ["ACCE",0x75A5],
+  ["CFDC",0x75A7],
+  ["CFDD",0x75AA],
+  ["ACCC",0x75AB],
+  ["D2C3",0x75B0],
+  ["AF68",0x75B2],
+  ["AF69",0x75B3],
+  ["B2AB",0x75B5],
+  ["D2C9",0x75B6],
+  ["AF6E",0x75B8],
+  ["AF6C",0x75B9],
+  ["D2CA",0x75BA],
+  ["D2C5",0x75BB],
+  ["AF6B",0x75BC],
+  ["AF6A",0x75BD],
+  ["AF65",0x75BE],
+  ["D2C8",0x75BF],
+  ["D2C7",0x75C0],
+  ["D2C4",0x75C1],
+  ["AF6D",0x75C2],
+  ["D2C6",0x75C4],
+  ["AF66",0x75C5],
+  ["AF67",0x75C7],
+  ["B2AC",0x75CA],
+  ["D6A1",0x75CB],
+  ["D6A2",0x75CC],
+  ["B2AD",0x75CD],
+  ["D67C",0x75CE],
+  ["D67E",0x75CF],
+  ["D6A4",0x75D0],
+  ["D6A3",0x75D1],
+  ["D67D",0x75D2],
+  ["B2A9",0x75D4],
+  ["B2AA",0x75D5],
+  ["DAB6",0x75D7],
+  ["B56B",0x75D8],
+  ["B56A",0x75D9],
+  ["DAB0",0x75DA],
+  ["B568",0x75DB],
+  ["DAB3",0x75DD],
+  ["B56C",0x75DE],
+  ["DAB4",0x75DF],
+  ["B56D",0x75E0],
+  ["DAB1",0x75E1],
+  ["B567",0x75E2],
+  ["B569",0x75E3],
+  ["DAB5",0x75E4],
+  ["DAB2",0x75E6],
+  ["DAAF",0x75E7],
+  ["DED2",0x75ED],
+  ["DEC7",0x75EF],
+  ["B7F0",0x75F0],
+  ["B7F3",0x75F1],
+  ["B7F2",0x75F2],
+  ["B7F7",0x75F3],
+  ["B7F6",0x75F4],
+  ["DED3",0x75F5],
+  ["DED1",0x75F6],
+  ["DECA",0x75F7],
+  ["DECE",0x75F8],
+  ["DECD",0x75F9],
+  ["B7F4",0x75FA],
+  ["DED0",0x75FB],
+  ["DECC",0x75FC],
+  ["DED4",0x75FD],
+  ["DECB",0x75FE],
+  ["B7F5",0x75FF],
+  ["B7EF",0x7600],
+  ["B7F1",0x7601],
+  ["DEC9",0x7603],
+  ["E2DB",0x7608],
+  ["BAC7",0x7609],
+  ["E2DF",0x760A],
+  ["BAC6",0x760B],
+  ["E2DC",0x760C],
+  ["BAC5",0x760D],
+  ["DEC8",0x760F],
+  ["DECF",0x7610],
+  ["E2DE",0x7611],
+  ["BAC8",0x7613],
+  ["E2E0",0x7614],
+  ["E2DD",0x7615],
+  ["E2DA",0x7616],
+  ["E6B1",0x7619],
+  ["E6B5",0x761A],
+  ["E6B7",0x761B],
+  ["E6B3",0x761C],
+  ["E6B2",0x761D],
+  ["E6B0",0x761E],
+  ["BD45",0x761F],
+  ["BD43",0x7620],
+  ["BD48",0x7621],
+  ["BD49",0x7622],
+  ["E6B4",0x7623],
+  ["BD46",0x7624],
+  ["E6AF",0x7625],
+  ["BD47",0x7626],
+  ["BAC4",0x7627],
+  ["E6B6",0x7628],
+  ["BD44",0x7629],
+  ["EA6C",0x762D],
+  ["EA6B",0x762F],
+  ["EA73",0x7630],
+  ["EA6D",0x7631],
+  ["EA72",0x7632],
+  ["EA6F",0x7633],
+  ["BF60",0x7634],
+  ["EA71",0x7635],
+  ["BF61",0x7638],
+  ["BF62",0x763A],
+  ["EA70",0x763C],
+  ["EA6E",0x763D],
+  ["C0F8",0x7642],
+  ["ED74",0x7643],
+  ["C0F7",0x7646],
+  ["ED77",0x7647],
+  ["ED75",0x7648],
+  ["ED76",0x7649],
+  ["C0F9",0x764C],
+  ["F04D",0x7650],
+  ["C2A1",0x7652],
+  ["F04E",0x7653],
+  ["C27D",0x7656],
+  ["F04F",0x7657],
+  ["C27E",0x7658],
+  ["F04C",0x7659],
+  ["F050",0x765A],
+  ["F04A",0x765C],
+  ["C3A7",0x765F],
+  ["F278",0x7660],
+  ["C3A8",0x7661],
+  ["C46F",0x7662],
+  ["F04B",0x7664],
+  ["C470",0x7665],
+  ["C4EE",0x7669],
+  ["F5DF",0x766A],
+  ["C57E",0x766C],
+  ["F6F4",0x766D],
+  ["C57D",0x766E],
+  ["F7EA",0x7670],
+  ["C5F5",0x7671],
+  ["C5F6",0x7672],
+  ["F9CC",0x7675],
+  ["ACD1",0x7678],
+  ["CFDE",0x7679],
+  ["B56E",0x767B],
+  ["B56F",0x767C],
+  ["A5D5",0x767D],
+  ["A6CA",0x767E],
+  ["CA47",0x767F],
+  ["CB71",0x7681],
+  ["A86D",0x7682],
+  ["AABA",0x7684],
+  ["ACD2",0x7686],
+  ["ACD3",0x7687],
+  ["ACD4",0x7688],
+  ["D6A6",0x7689],
+  ["D2CB",0x768A],
+  ["AF6F",0x768B],
+  ["B2AE",0x768E],
+  ["D6A5",0x768F],
+  ["DAB8",0x7692],
+  ["B571",0x7693],
+  ["DAB7",0x7695],
+  ["B570",0x7696],
+  ["DED5",0x7699],
+  ["BD4A",0x769A],
+  ["E6BB",0x769B],
+  ["E6B8",0x769C],
+  ["E6B9",0x769D],
+  ["E6BA",0x769E],
+  ["ED78",0x76A4],
+  ["F051",0x76A6],
+  ["F471",0x76AA],
+  ["F470",0x76AB],
+  ["F6F5",0x76AD],
+  ["A5D6",0x76AE],
+  ["CD75",0x76AF],
+  ["AF70",0x76B0],
+  ["B572",0x76B4],
+  ["DED6",0x76B5],
+  ["E2E1",0x76B8],
+  ["BD4B",0x76BA],
+  ["EA74",0x76BB],
+  ["F052",0x76BD],
+  ["F472",0x76BE],
+  ["A5D7",0x76BF],
+  ["AABB",0x76C2],
+  ["ACD7",0x76C3],
+  ["CFDF",0x76C4],
+  ["ACD8",0x76C5],
+  ["ACD6",0x76C6],
+  ["ACD5",0x76C8],
+  ["D2CC",0x76C9],
+  ["AF71",0x76CA],
+  ["AF72",0x76CD],
+  ["AF73",0x76CE],
+  ["B2B0",0x76D2],
+  ["D6A7",0x76D3],
+  ["B2AF",0x76D4],
+  ["DAB9",0x76DA],
+  ["B2B1",0x76DB],
+  ["B573",0x76DC],
+  ["DED7",0x76DD],
+  ["B7F8",0x76DE],
+  ["B7F9",0x76DF],
+  ["BAC9",0x76E1],
+  ["BACA",0x76E3],
+  ["BD4C",0x76E4],
+  ["BF64",0x76E5],
+  ["EA75",0x76E6],
+  ["BF63",0x76E7],
+  ["ED79",0x76E9],
+  ["C0FA",0x76EA],
+  ["F053",0x76EC],
+  ["F473",0x76ED],
+  ["A5D8",0x76EE],
+  ["A86E",0x76EF],
+  ["CD78",0x76F0],
+  ["CD77",0x76F1],
+  ["AABC",0x76F2],
+  ["CD76",0x76F3],
+  ["AABD",0x76F4],
+  ["CD79",0x76F5],
+  ["CFE5",0x76F7],
+  ["ACDB",0x76F8],
+  ["ACDA",0x76F9],
+  ["CFE7",0x76FA],
+  ["CFE6",0x76FB],
+  ["ACDF",0x76FC],
+  ["ACDE",0x76FE],
+  ["ACD9",0x7701],
+  ["CFE1",0x7703],
+  ["CFE2",0x7704],
+  ["CFE3",0x7705],
+  ["ACE0",0x7707],
+  ["CFE0",0x7708],
+  ["ACDC",0x7709],
+  ["CFE4",0x770A],
+  ["ACDD",0x770B],
+  ["D2CF",0x7710],
+  ["D2D3",0x7711],
+  ["D2D1",0x7712],
+  ["D2D0",0x7713],
+  ["D2D4",0x7715],
+  ["D2D5",0x7719],
+  ["D2D6",0x771A],
+  ["D2CE",0x771B],
+  ["D2CD",0x771D],
+  ["AF75",0x771F],
+  ["AF76",0x7720],
+  ["D2D7",0x7722],
+  ["D2D2",0x7723],
+  ["D6B0",0x7725],
+  ["D2D8",0x7727],
+  ["AF77",0x7728],
+  ["AF74",0x7729],
+  ["D6AA",0x772D],
+  ["D6A9",0x772F],
+  ["D6AB",0x7731],
+  ["D6AC",0x7732],
+  ["D6AE",0x7733],
+  ["D6AD",0x7734],
+  ["D6B2",0x7735],
+  ["B2B5",0x7736],
+  ["B2B2",0x7737],
+  ["B2B6",0x7738],
+  ["D6A8",0x7739],
+  ["B2B7",0x773A],
+  ["D6B1",0x773B],
+  ["B2B4",0x773C],
+  ["D6AF",0x773D],
+  ["B2B3",0x773E],
+  ["DABC",0x7744],
+  ["DABE",0x7745],
+  ["DABA",0x7746],
+  ["DABB",0x7747],
+  ["DABF",0x774A],
+  ["DAC1",0x774B],
+  ["DAC2",0x774C],
+  ["DABD",0x774D],
+  ["DAC0",0x774E],
+  ["B574",0x774F],
+  ["DEDB",0x7752],
+  ["DEE0",0x7754],
+  ["DED8",0x7755],
+  ["DEDC",0x7756],
+  ["DEE1",0x7759],
+  ["DEDD",0x775A],
+  ["B7FA",0x775B],
+  ["B843",0x775C],
+  ["B7FD",0x775E],
+  ["DED9",0x775F],
+  ["DEDA",0x7760],
+  ["BACE",0x7761],
+  ["B846",0x7762],
+  ["B7FE",0x7763],
+  ["B844",0x7765],
+  ["B7FC",0x7766],
+  ["DEDF",0x7767],
+  ["B845",0x7768],
+  ["DEDE",0x7769],
+  ["B841",0x776A],
+  ["B7FB",0x776B],
+  ["B842",0x776C],
+  ["DEE2",0x776D],
+  ["E2E6",0x776E],
+  ["E2E8",0x776F],
+  ["B840",0x7779],
+  ["E2E3",0x777C],
+  ["BACC",0x777D],
+  ["E2E9",0x777E],
+  ["BACD",0x777F],
+  ["E2E7",0x7780],
+  ["E2E2",0x7781],
+  ["E2E5",0x7782],
+  ["E2EA",0x7783],
+  ["BACB",0x7784],
+  ["E2E4",0x7785],
+  ["BD4E",0x7787],
+  ["E6BF",0x7788],
+  ["E6BE",0x7789],
+  ["BD51",0x778B],
+  ["BD4F",0x778C],
+  ["E6BC",0x778D],
+  ["BD4D",0x778E],
+  ["E6BD",0x778F],
+  ["BD50",0x7791],
+  ["EA7D",0x7795],
+  ["EAA1",0x7797],
+  ["EA7E",0x7799],
+  ["EA76",0x779A],
+  ["EA7A",0x779B],
+  ["EA79",0x779C],
+  ["EA77",0x779D],
+  ["BF66",0x779E],
+  ["BF67",0x779F],
+  ["BF65",0x77A0],
+  ["EA78",0x77A1],
+  ["EA7B",0x77A2],
+  ["EA7C",0x77A3],
+  ["BF68",0x77A5],
+  ["C140",0x77A7],
+  ["EDA3",0x77A8],
+  ["C0FC",0x77AA],
+  ["ED7B",0x77AB],
+  ["C0FE",0x77AC],
+  ["C141",0x77AD],
+  ["C0FD",0x77B0],
+  ["EDA2",0x77B1],
+  ["ED7C",0x77B2],
+  ["C0FB",0x77B3],
+  ["EDA1",0x77B4],
+  ["ED7A",0x77B5],
+  ["ED7E",0x77B6],
+  ["ED7D",0x77B7],
+  ["F055",0x77BA],
+  ["C2A4",0x77BB],
+  ["C2A5",0x77BC],
+  ["C2A2",0x77BD],
+  ["C2A3",0x77BF],
+  ["F054",0x77C2],
+  ["F27B",0x77C4],
+  ["C3A9",0x77C7],
+  ["F279",0x77C9],
+  ["F27A",0x77CA],
+  ["F474",0x77CC],
+  ["F477",0x77CD],
+  ["F475",0x77CE],
+  ["F476",0x77CF],
+  ["F5E0",0x77D0],
+  ["C4EF",0x77D3],
+  ["F7EB",0x77D4],
+  ["F8B4",0x77D5],
+  ["C5F7",0x77D7],
+  ["F8F8",0x77D8],
+  ["F8F9",0x77D9],
+  ["C666",0x77DA],
+  ["A5D9",0x77DB],
+  ["ACE1",0x77DC],
+  ["DAC3",0x77DE],
+  ["DEE3",0x77E0],
+  ["A5DA",0x77E2],
+  ["A86F",0x77E3],
+  ["AABE",0x77E5],
+  ["CFE8",0x77E7],
+  ["CFE9",0x77E8],
+  ["AF78",0x77E9],
+  ["DAC4",0x77EC],
+  ["B575",0x77ED],
+  ["B847",0x77EE],
+  ["C142",0x77EF],
+  ["EDA4",0x77F0],
+  ["F27C",0x77F1],
+  ["F478",0x77F2],
+  ["A5DB",0x77F3],
+  ["CDA1",0x77F7],
+  ["CD7A",0x77F8],
+  ["CD7C",0x77F9],
+  ["CD7E",0x77FA],
+  ["CD7D",0x77FB],
+  ["CD7B",0x77FC],
+  ["AABF",0x77FD],
+  ["ACE2",0x7802],
+  ["CFF2",0x7803],
+  ["CFED",0x7805],
+  ["CFEA",0x7806],
+  ["CFF1",0x7809],
+  ["ACE4",0x780C],
+  ["ACE5",0x780D],
+  ["CFF0",0x780E],
+  ["CFEF",0x780F],
+  ["CFEE",0x7810],
+  ["CFEB",0x7811],
+  ["CFEC",0x7812],
+  ["CFF3",0x7813],
+  ["ACE3",0x7814],
+  ["AF7C",0x781D],
+  ["AFA4",0x781F],
+  ["AFA3",0x7820],
+  ["D2E1",0x7821],
+  ["D2DB",0x7822],
+  ["D2D9",0x7823],
+  ["AFA1",0x7825],
+  ["D6B9",0x7826],
+  ["AF7A",0x7827],
+  ["D2DE",0x7828],
+  ["D2E2",0x7829],
+  ["D2E4",0x782A],
+  ["D2E0",0x782B],
+  ["D2DA",0x782C],
+  ["AFA2",0x782D],
+  ["D2DF",0x782E],
+  ["D2DD",0x782F],
+  ["AF79",0x7830],
+  ["D2E5",0x7831],
+  ["AFA5",0x7832],
+  ["D2E3",0x7833],
+  ["AF7D",0x7834],
+  ["D2DC",0x7835],
+  ["AF7E",0x7837],
+  ["AF7B",0x7838],
+  ["B2B9",0x7843],
+  ["D6BA",0x7845],
+  ["D6B3",0x7848],
+  ["D6B5",0x7849],
+  ["D6B7",0x784A],
+  ["D6B8",0x784C],
+  ["D6B6",0x784D],
+  ["B2BA",0x784E],
+  ["D6BB",0x7850],
+  ["D6B4",0x7852],
+  ["DAC8",0x785C],
+  ["B576",0x785D],
+  ["DAD0",0x785E],
+  ["DAC5",0x7860],
+  ["DAD1",0x7862],
+  ["DAC6",0x7864],
+  ["DAC7",0x7865],
+  ["DACF",0x7868],
+  ["DACE",0x7869],
+  ["DACB",0x786A],
+  ["B2B8",0x786B],
+  ["B577",0x786C],
+  ["DAC9",0x786D],
+  ["DACC",0x786E],
+  ["B578",0x786F],
+  ["DACD",0x7870],
+  ["DACA",0x7871],
+  ["DEEE",0x7879],
+  ["DEF2",0x787B],
+  ["B84E",0x787C],
+  ["E2F0",0x787E],
+  ["B851",0x787F],
+  ["DEF0",0x7880],
+  ["DEED",0x7883],
+  ["DEE8",0x7884],
+  ["DEEA",0x7885],
+  ["DEEB",0x7886],
+  ["DEE4",0x7887],
+  ["B84D",0x7889],
+  ["B84C",0x788C],
+  ["B848",0x788E],
+  ["DEE7",0x788F],
+  ["B84F",0x7891],
+  ["B850",0x7893],
+  ["DEE6",0x7894],
+  ["DEE9",0x7895],
+  ["DEF1",0x7896],
+  ["B84A",0x7897],
+  ["B84B",0x7898],
+  ["DEEF",0x7899],
+  ["DEE5",0x789A],
+  ["E2F2",0x789E],
+  ["BAD0",0x789F],
+  ["E2F4",0x78A0],
+  ["DEEC",0x78A1],
+  ["E2F6",0x78A2],
+  ["BAD4",0x78A3],
+  ["E2F7",0x78A4],
+  ["E2F3",0x78A5],
+  ["BAD1",0x78A7],
+  ["E2EF",0x78A8],
+  ["BAD3",0x78A9],
+  ["E2EC",0x78AA],
+  ["E2F1",0x78AB],
+  ["E2F5",0x78AC],
+  ["E2EE",0x78AD],
+  ["B849",0x78B0],
+  ["E2EB",0x78B2],
+  ["BAD2",0x78B3],
+  ["E2ED",0x78B4],
+  ["BD54",0x78BA],
+  ["E6C1",0x78BB],
+  ["BD58",0x78BC],
+  ["BD56",0x78BE],
+  ["BACF",0x78C1],
+  ["E6C8",0x78C3],
+  ["E6C9",0x78C4],
+  ["BD53",0x78C5],
+  ["E6C7",0x78C8],
+  ["E6CA",0x78C9],
+  ["BD55",0x78CA],
+  ["BD52",0x78CB],
+  ["E6C3",0x78CC],
+  ["E6C0",0x78CD],
+  ["E6C5",0x78CE],
+  ["E6C2",0x78CF],
+  ["BD59",0x78D0],
+  ["E6C4",0x78D1],
+  ["E6C6",0x78D4],
+  ["BD57",0x78D5],
+  ["BF6A",0x78DA],
+  ["EAA8",0x78DB],
+  ["EAA2",0x78DD],
+  ["EAA6",0x78DE],
+  ["EAAC",0x78DF],
+  ["EAAD",0x78E0],
+  ["EAA9",0x78E1],
+  ["EAAA",0x78E2],
+  ["EAA7",0x78E3],
+  ["EAA4",0x78E5],
+  ["BF6C",0x78E7],
+  ["BF69",0x78E8],
+  ["EAA3",0x78E9],
+  ["EAA5",0x78EA],
+  ["BF6B",0x78EC],
+  ["EAAB",0x78ED],
+  ["C146",0x78EF],
+  ["EDAA",0x78F2],
+  ["EDA5",0x78F3],
+  ["C145",0x78F4],
+  ["C143",0x78F7],
+  ["EDAC",0x78F9],
+  ["C144",0x78FA],
+  ["EDA8",0x78FB],
+  ["EDA9",0x78FC],
+  ["EDA6",0x78FD],
+  ["EDAD",0x78FE],
+  ["F056",0x78FF],
+  ["C147",0x7901],
+  ["EDA7",0x7902],
+  ["EDAE",0x7904],
+  ["EDAB",0x7905],
+  ["F05A",0x7909],
+  ["F057",0x790C],
+  ["C2A6",0x790E],
+  ["F05B",0x7910],
+  ["F05D",0x7911],
+  ["F05C",0x7912],
+  ["F058",0x7913],
+  ["F059",0x7914],
+  ["F2A3",0x7917],
+  ["C3AA",0x7919],
+  ["F27E",0x791B],
+  ["F2A2",0x791C],
+  ["F27D",0x791D],
+  ["F2A4",0x791E],
+  ["F2A1",0x7921],
+  ["F47A",0x7923],
+  ["F47D",0x7924],
+  ["F479",0x7925],
+  ["C471",0x7926],
+  ["F47B",0x7927],
+  ["F47C",0x7928],
+  ["F47E",0x7929],
+  ["C472",0x792A],
+  ["C474",0x792B],
+  ["C473",0x792C],
+  ["F5E1",0x792D],
+  ["F5E3",0x792F],
+  ["F5E2",0x7931],
+  ["F6F6",0x7935],
+  ["F8B5",0x7938],
+  ["F8FA",0x7939],
+  ["A5DC",0x793A],
+  ["CB72",0x793D],
+  ["AAC0",0x793E],
+  ["CDA3",0x793F],
+  ["AAC1",0x7940],
+  ["AAC2",0x7941],
+  ["CDA2",0x7942],
+  ["CFF8",0x7944],
+  ["CFF7",0x7945],
+  ["ACE6",0x7946],
+  ["ACE9",0x7947],
+  ["ACE8",0x7948],
+  ["ACE7",0x7949],
+  ["CFF4",0x794A],
+  ["CFF6",0x794B],
+  ["CFF5",0x794C],
+  ["D2E8",0x794F],
+  ["AFA7",0x7950],
+  ["D2EC",0x7951],
+  ["D2EB",0x7952],
+  ["D2EA",0x7953],
+  ["D2E6",0x7954],
+  ["AFA6",0x7955],
+  ["AFAA",0x7956],
+  ["AFAD",0x7957],
+  ["AFAE",0x795A],
+  ["D2E7",0x795B],
+  ["D2E9",0x795C],
+  ["AFAC",0x795D],
+  ["AFAB",0x795E],
+  ["AFA9",0x795F],
+  ["AFA8",0x7960],
+  ["D6C2",0x7961],
+  ["D6C0",0x7963],
+  ["D6BC",0x7964],
+  ["B2BB",0x7965],
+  ["D6BD",0x7967],
+  ["B2BC",0x7968],
+  ["D6BE",0x7969],
+  ["D6BF",0x796A],
+  ["D6C1",0x796B],
+  ["B2BD",0x796D],
+  ["DAD5",0x7970],
+  ["DAD4",0x7972],
+  ["DAD3",0x7973],
+  ["DAD2",0x7974],
+  ["DEF6",0x7979],
+  ["B852",0x797A],
+  ["DEF3",0x797C],
+  ["DEF5",0x797D],
+  ["B853",0x797F],
+  ["B854",0x7981],
+  ["DEF4",0x7982],
+  ["E341",0x7988],
+  ["E2F9",0x798A],
+  ["E2FA",0x798B],
+  ["BAD7",0x798D],
+  ["BAD5",0x798E],
+  ["BAD6",0x798F],
+  ["E343",0x7990],
+  ["E342",0x7992],
+  ["E2FE",0x7993],
+  ["E2FD",0x7994],
+  ["E2FC",0x7995],
+  ["E2FB",0x7996],
+  ["E340",0x7997],
+  ["E2F8",0x7998],
+  ["E6CB",0x799A],
+  ["E6D0",0x799B],
+  ["E6CE",0x799C],
+  ["E6CD",0x79A0],
+  ["E6CC",0x79A1],
+  ["E6CF",0x79A2],
+  ["EAAE",0x79A4],
+  ["BF6D",0x79A6],
+  ["C148",0x79A7],
+  ["EDB0",0x79A8],
+  ["C149",0x79AA],
+  ["EDAF",0x79AB],
+  ["F05F",0x79AC],
+  ["F05E",0x79AD],
+  ["C2A7",0x79AE],
+  ["F2A5",0x79B0],
+  ["C3AB",0x79B1],
+  ["F4A1",0x79B2],
+  ["C5A1",0x79B3],
+  ["F6F7",0x79B4],
+  ["F8B7",0x79B6],
+  ["F8B6",0x79B7],
+  ["C9A8",0x79B8],
+  ["ACEA",0x79B9],
+  ["ACEB",0x79BA],
+  ["D6C3",0x79BB],
+  ["B856",0x79BD],
+  ["A5DD",0x79BE],
+  ["A872",0x79BF],
+  ["A871",0x79C0],
+  ["A870",0x79C1],
+  ["CDA4",0x79C5],
+  ["AAC4",0x79C8],
+  ["AAC3",0x79C9],
+  ["ACEE",0x79CB],
+  ["CFFA",0x79CD],
+  ["CFFD",0x79CE],
+  ["CFFB",0x79CF],
+  ["ACEC",0x79D1],
+  ["ACED",0x79D2],
+  ["CFF9",0x79D5],
+  ["CFFC",0x79D6],
+  ["AFB5",0x79D8],
+  ["D2F3",0x79DC],
+  ["D2F5",0x79DD],
+  ["D2F4",0x79DE],
+  ["AFB2",0x79DF],
+  ["D2EF",0x79E0],
+  ["AFB0",0x79E3],
+  ["AFAF",0x79E4],
+  ["AFB3",0x79E6],
+  ["AFB1",0x79E7],
+  ["AFB4",0x79E9],
+  ["D2F2",0x79EA],
+  ["D2ED",0x79EB],
+  ["D2EE",0x79EC],
+  ["D2F1",0x79ED],
+  ["D2F0",0x79EE],
+  ["D6C6",0x79F6],
+  ["D6C7",0x79F7],
+  ["D6C5",0x79F8],
+  ["D6C4",0x79FA],
+  ["B2BE",0x79FB],
+  ["B57D",0x7A00],
+  ["DAD6",0x7A02],
+  ["DAD8",0x7A03],
+  ["DADA",0x7A04],
+  ["B57C",0x7A05],
+  ["B57A",0x7A08],
+  ["DAD7",0x7A0A],
+  ["B57B",0x7A0B],
+  ["DAD9",0x7A0C],
+  ["B579",0x7A0D],
+  ["DF41",0x7A10],
+  ["DEF7",0x7A11],
+  ["DEFA",0x7A12],
+  ["DEFE",0x7A13],
+  ["B85A",0x7A14],
+  ["DEFC",0x7A15],
+  ["DEFB",0x7A17],
+  ["DEF8",0x7A18],
+  ["DEF9",0x7A19],
+  ["B858",0x7A1A],
+  ["DF40",0x7A1B],
+  ["B857",0x7A1C],
+  ["B85C",0x7A1E],
+  ["B85B",0x7A1F],
+  ["B859",0x7A20],
+  ["DEFD",0x7A22],
+  ["E349",0x7A26],
+  ["E348",0x7A28],
+  ["E344",0x7A2B],
+  ["BAD8",0x7A2E],
+  ["E347",0x7A2F],
+  ["E346",0x7A30],
+  ["BAD9",0x7A31],
+  ["BD5E",0x7A37],
+  ["E6D2",0x7A39],
+  ["BD5F",0x7A3B],
+  ["BD5B",0x7A3C],
+  ["BD5D",0x7A3D],
+  ["BD5A",0x7A3F],
+  ["BD5C",0x7A40],
+  ["EAAF",0x7A44],
+  ["BF70",0x7A46],
+  ["EAB1",0x7A47],
+  ["EAB0",0x7A48],
+  ["E345",0x7A4A],
+  ["BF72",0x7A4B],
+  ["BF71",0x7A4C],
+  ["BF6E",0x7A4D],
+  ["BF6F",0x7A4E],
+  ["EDB5",0x7A54],
+  ["EDB3",0x7A56],
+  ["C14A",0x7A57],
+  ["EDB4",0x7A58],
+  ["EDB6",0x7A5A],
+  ["EDB2",0x7A5B],
+  ["EDB1",0x7A5C],
+  ["F060",0x7A5F],
+  ["C2AA",0x7A60],
+  ["C2A8",0x7A61],
+  ["C2A9",0x7A62],
+  ["F2A6",0x7A67],
+  ["F2A7",0x7A68],
+  ["C3AD",0x7A69],
+  ["C3AC",0x7A6B],
+  ["F4A3",0x7A6C],
+  ["F4A4",0x7A6D],
+  ["F4A2",0x7A6E],
+  ["F6F8",0x7A70],
+  ["F6F9",0x7A71],
+  ["A5DE",0x7A74],
+  ["CA48",0x7A75],
+  ["A873",0x7A76],
+  ["CDA5",0x7A78],
+  ["AAC6",0x7A79],
+  ["AAC5",0x7A7A],
+  ["CDA6",0x7A7B],
+  ["D040",0x7A7E],
+  ["ACEF",0x7A7F],
+  ["CFFE",0x7A80],
+  ["ACF0",0x7A81],
+  ["AFB6",0x7A84],
+  ["D2F8",0x7A85],
+  ["D2F6",0x7A86],
+  ["D2FC",0x7A87],
+  ["AFB7",0x7A88],
+  ["D2F7",0x7A89],
+  ["D2FB",0x7A8A],
+  ["D2F9",0x7A8B],
+  ["D2FA",0x7A8C],
+  ["D6C8",0x7A8F],
+  ["D6CA",0x7A90],
+  ["B2BF",0x7A92],
+  ["D6C9",0x7A94],
+  ["B2C0",0x7A95],
+  ["B5A2",0x7A96],
+  ["B5A1",0x7A97],
+  ["B57E",0x7A98],
+  ["DADB",0x7A99],
+  ["DF44",0x7A9E],
+  ["B85D",0x7A9F],
+  ["B85E",0x7AA0],
+  ["DF43",0x7AA2],
+  ["DF42",0x7AA3],
+  ["E34A",0x7AA8],
+  ["BADB",0x7AA9],
+  ["BADA",0x7AAA],
+  ["E34B",0x7AAB],
+  ["E34C",0x7AAC],
+  ["BD61",0x7AAE],
+  ["BD60",0x7AAF],
+  ["EAB5",0x7AB1],
+  ["E6D3",0x7AB2],
+  ["E6D5",0x7AB3],
+  ["E6D4",0x7AB4],
+  ["EAB4",0x7AB5],
+  ["EAB2",0x7AB6],
+  ["EAB6",0x7AB7],
+  ["EAB3",0x7AB8],
+  ["BF73",0x7ABA],
+  ["EDB7",0x7ABE],
+  ["C14B",0x7ABF],
+  ["EDB8",0x7AC0],
+  ["EDB9",0x7AC1],
+  ["C2AB",0x7AC4],
+  ["C2AC",0x7AC5],
+  ["C475",0x7AC7],
+  ["C5D1",0x7ACA],
+  ["A5DF",0x7ACB],
+  ["D041",0x7AD1],
+  ["D2FD",0x7AD8],
+  ["AFB8",0x7AD9],
+  ["B3BA",0x7ADF],
+  ["B3B9",0x7AE0],
+  ["B5A4",0x7AE3],
+  ["DADD",0x7AE4],
+  ["B5A3",0x7AE5],
+  ["DADC",0x7AE6],
+  ["DF45",0x7AEB],
+  ["BADC",0x7AED],
+  ["E34D",0x7AEE],
+  ["BADD",0x7AEF],
+  ["C476",0x7AF6],
+  ["F4A5",0x7AF7],
+  ["A6CB",0x7AF9],
+  ["AAC7",0x7AFA],
+  ["CDA7",0x7AFB],
+  ["ACF2",0x7AFD],
+  ["ACF1",0x7AFF],
+  ["D042",0x7B00],
+  ["D043",0x7B01],
+  ["D340",0x7B04],
+  ["D342",0x7B05],
+  ["AFB9",0x7B06],
+  ["D344",0x7B08],
+  ["D347",0x7B09],
+  ["D345",0x7B0A],
+  ["D346",0x7B0E],
+  ["D343",0x7B0F],
+  ["D2FE",0x7B10],
+  ["AFBA",0x7B11],
+  ["D348",0x7B12],
+  ["D341",0x7B13],
+  ["D6D3",0x7B18],
+  ["B2C6",0x7B19],
+  ["D6DC",0x7B1A],
+  ["B2C3",0x7B1B],
+  ["D6D5",0x7B1D],
+  ["B2C7",0x7B1E],
+  ["B2C1",0x7B20],
+  ["D6D0",0x7B22],
+  ["D6DD",0x7B23],
+  ["D6D1",0x7B24],
+  ["D6CE",0x7B25],
+  ["B2C5",0x7B26],
+  ["B2C2",0x7B28],
+  ["D6D4",0x7B2A],
+  ["D6D7",0x7B2B],
+  ["B2C4",0x7B2C],
+  ["D6D8",0x7B2D],
+  ["B2C8",0x7B2E],
+  ["D6D9",0x7B2F],
+  ["D6CF",0x7B30],
+  ["D6D6",0x7B31],
+  ["D6DA",0x7B32],
+  ["D6D2",0x7B33],
+  ["D6CD",0x7B34],
+  ["D6CB",0x7B35],
+  ["D6DB",0x7B38],
+  ["DADF",0x7B3B],
+  ["DAE4",0x7B40],
+  ["DAE0",0x7B44],
+  ["DAE6",0x7B45],
+  ["B5A7",0x7B46],
+  ["D6CC",0x7B47],
+  ["DAE1",0x7B48],
+  ["B5A5",0x7B49],
+  ["DADE",0x7B4A],
+  ["B5AC",0x7B4B],
+  ["DAE2",0x7B4C],
+  ["B5AB",0x7B4D],
+  ["DAE3",0x7B4E],
+  ["B5AD",0x7B4F],
+  ["B5A8",0x7B50],
+  ["B5AE",0x7B51],
+  ["B5A9",0x7B52],
+  ["B5AA",0x7B54],
+  ["B5A6",0x7B56],
+  ["DAE5",0x7B58],
+  ["B861",0x7B60],
+  ["DF50",0x7B61],
+  ["DF53",0x7B63],
+  ["DF47",0x7B64],
+  ["DF4C",0x7B65],
+  ["DF46",0x7B66],
+  ["B863",0x7B67],
+  ["DF4A",0x7B69],
+  ["DF48",0x7B6D],
+  ["B862",0x7B6E],
+  ["DF4F",0x7B70],
+  ["DF4E",0x7B71],
+  ["DF4B",0x7B72],
+  ["DF4D",0x7B73],
+  ["DF49",0x7B74],
+  ["BAE1",0x7B75],
+  ["DF52",0x7B76],
+  ["B85F",0x7B77],
+  ["DF51",0x7B78],
+  ["E35D",0x7B82],
+  ["BAE8",0x7B84],
+  ["E358",0x7B85],
+  ["BAE7",0x7B87],
+  ["E34E",0x7B88],
+  ["E350",0x7B8A],
+  ["BAE0",0x7B8B],
+  ["E355",0x7B8C],
+  ["E354",0x7B8D],
+  ["E357",0x7B8E],
+  ["BAE5",0x7B8F],
+  ["E352",0x7B90],
+  ["E351",0x7B91],
+  ["BAE4",0x7B94],
+  ["BADF",0x7B95],
+  ["E353",0x7B96],
+  ["BAE2",0x7B97],
+  ["E359",0x7B98],
+  ["E35B",0x7B99],
+  ["E356",0x7B9B],
+  ["E34F",0x7B9C],
+  ["BAE3",0x7B9D],
+  ["BD69",0x7BA0],
+  ["BADE",0x7BA1],
+  ["E35C",0x7BA4],
+  ["E6D9",0x7BAC],
+  ["BD62",0x7BAD],
+  ["E6DB",0x7BAF],
+  ["BD63",0x7BB1],
+  ["BD65",0x7BB4],
+  ["E6DE",0x7BB5],
+  ["E6D6",0x7BB7],
+  ["BAE6",0x7BB8],
+  ["E6DC",0x7BB9],
+  ["E6D8",0x7BBE],
+  ["B860",0x7BC0],
+  ["BD68",0x7BC1],
+  ["BD64",0x7BC4],
+  ["BD66",0x7BC6],
+  ["BD67",0x7BC7],
+  ["BF76",0x7BC9],
+  ["E6DD",0x7BCA],
+  ["E6D7",0x7BCB],
+  ["BD6A",0x7BCC],
+  ["E6DA",0x7BCE],
+  ["EAC0",0x7BD4],
+  ["EABB",0x7BD5],
+  ["EAC5",0x7BD8],
+  ["BF74",0x7BD9],
+  ["EABD",0x7BDA],
+  ["BF78",0x7BDB],
+  ["EAC3",0x7BDC],
+  ["EABA",0x7BDD],
+  ["EAB7",0x7BDE],
+  ["EAC6",0x7BDF],
+  ["C151",0x7BE0],
+  ["BF79",0x7BE1],
+  ["EAC2",0x7BE2],
+  ["EAB8",0x7BE3],
+  ["BF77",0x7BE4],
+  ["EABC",0x7BE5],
+  ["BF7B",0x7BE6],
+  ["EAB9",0x7BE7],
+  ["EABE",0x7BE8],
+  ["BF7A",0x7BE9],
+  ["EAC1",0x7BEA],
+  ["EAC4",0x7BEB],
+  ["EDCB",0x7BF0],
+  ["EDCC",0x7BF1],
+  ["EDBC",0x7BF2],
+  ["EDC3",0x7BF3],
+  ["EDC1",0x7BF4],
+  ["C14F",0x7BF7],
+  ["EDC8",0x7BF8],
+  ["EABF",0x7BF9],
+  ["EDBF",0x7BFB],
+  ["EDC9",0x7BFD],
+  ["C14E",0x7BFE],
+  ["EDBE",0x7BFF],
+  ["EDBD",0x7C00],
+  ["EDC7",0x7C01],
+  ["EDC4",0x7C02],
+  ["EDC6",0x7C03],
+  ["EDBA",0x7C05],
+  ["EDCA",0x7C06],
+  ["C14C",0x7C07],
+  ["EDC5",0x7C09],
+  ["EDCE",0x7C0A],
+  ["EDC2",0x7C0B],
+  ["C150",0x7C0C],
+  ["C14D",0x7C0D],
+  ["EDC0",0x7C0E],
+  ["EDBB",0x7C0F],
+  ["EDCD",0x7C10],
+  ["BF75",0x7C11],
+  ["F063",0x7C19],
+  ["F061",0x7C1C],
+  ["F067",0x7C1D],
+  ["C2B0",0x7C1E],
+  ["F065",0x7C1F],
+  ["F064",0x7C20],
+  ["C2B2",0x7C21],
+  ["F06A",0x7C22],
+  ["C2B1",0x7C23],
+  ["F06B",0x7C25],
+  ["F068",0x7C26],
+  ["C2AE",0x7C27],
+  ["F069",0x7C28],
+  ["F062",0x7C29],
+  ["C2AF",0x7C2A],
+  ["C2AD",0x7C2B],
+  ["F2AB",0x7C2C],
+  ["F066",0x7C2D],
+  ["F06C",0x7C30],
+  ["F2A8",0x7C33],
+  ["C3B2",0x7C37],
+  ["C3B0",0x7C38],
+  ["F2AA",0x7C39],
+  ["F2AC",0x7C3B],
+  ["F2A9",0x7C3C],
+  ["C3B1",0x7C3D],
+  ["C3AE",0x7C3E],
+  ["C3AF",0x7C3F],
+  ["C3B3",0x7C40],
+  ["C478",0x7C43],
+  ["F4AA",0x7C45],
+  ["F4A9",0x7C47],
+  ["F4A7",0x7C48],
+  ["F4A6",0x7C49],
+  ["F4A8",0x7C4A],
+  ["C477",0x7C4C],
+  ["C479",0x7C4D],
+  ["C4F0",0x7C50],
+  ["F5E5",0x7C53],
+  ["F5E4",0x7C54],
+  ["F6FA",0x7C57],
+  ["F6FC",0x7C59],
+  ["F6FE",0x7C5A],
+  ["F6FD",0x7C5B],
+  ["F6FB",0x7C5C],
+  ["C5A3",0x7C5F],
+  ["C5A2",0x7C60],
+  ["C5D3",0x7C63],
+  ["C5D2",0x7C64],
+  ["C5D4",0x7C65],
+  ["F7ED",0x7C66],
+  ["F7EC",0x7C67],
+  ["F8FB",0x7C69],
+  ["F8B8",0x7C6A],
+  ["F8FC",0x7C6B],
+  ["C658",0x7C6C],
+  ["C659",0x7C6E],
+  ["F96D",0x7C6F],
+  ["C67E",0x7C72],
+  ["A6CC",0x7C73],
+  ["CDA8",0x7C75],
+  ["D045",0x7C78],
+  ["D046",0x7C79],
+  ["D044",0x7C7A],
+  ["ACF3",0x7C7D],
+  ["D047",0x7C7F],
+  ["D048",0x7C80],
+  ["D049",0x7C81],
+  ["D349",0x7C84],
+  ["D34F",0x7C85],
+  ["D34D",0x7C88],
+  ["AFBB",0x7C89],
+  ["D34B",0x7C8A],
+  ["D34C",0x7C8C],
+  ["D34E",0x7C8D],
+  ["D34A",0x7C91],
+  ["B2C9",0x7C92],
+  ["D6DE",0x7C94],
+  ["B2CB",0x7C95],
+  ["D6E0",0x7C96],
+  ["B2CA",0x7C97],
+  ["D6DF",0x7C98],
+  ["DAE8",0x7C9E],
+  ["B5AF",0x7C9F],
+  ["DAEA",0x7CA1],
+  ["DAE7",0x7CA2],
+  ["D6E1",0x7CA3],
+  ["B5B0",0x7CA5],
+  ["DAE9",0x7CA8],
+  ["DF56",0x7CAF],
+  ["B864",0x7CB1],
+  ["DF54",0x7CB2],
+  ["B865",0x7CB3],
+  ["DF55",0x7CB4],
+  ["B866",0x7CB5],
+  ["BAE9",0x7CB9],
+  ["E361",0x7CBA],
+  ["E35E",0x7CBB],
+  ["E360",0x7CBC],
+  ["BAEA",0x7CBD],
+  ["BAEB",0x7CBE],
+  ["E35F",0x7CBF],
+  ["E6DF",0x7CC5],
+  ["E6E0",0x7CC8],
+  ["BD6B",0x7CCA],
+  ["E6E2",0x7CCB],
+  ["E6E1",0x7CCC],
+  ["A261",0x7CCE],
+  ["EACA",0x7CD0],
+  ["EACB",0x7CD1],
+  ["EAC7",0x7CD2],
+  ["EAC8",0x7CD4],
+  ["BF7C",0x7CD5],
+  ["BF7D",0x7CD6],
+  ["EAC9",0x7CD7],
+  ["C157",0x7CD9],
+  ["C153",0x7CDC],
+  ["C158",0x7CDD],
+  ["C154",0x7CDE],
+  ["C156",0x7CDF],
+  ["C152",0x7CE0],
+  ["C155",0x7CE2],
+  ["C2B3",0x7CE7],
+  ["EDCF",0x7CE8],
+  ["F2AE",0x7CEA],
+  ["F2AD",0x7CEC],
+  ["F4AB",0x7CEE],
+  ["C47A",0x7CEF],
+  ["C47B",0x7CF0],
+  ["F741",0x7CF1],
+  ["F5E6",0x7CF2],
+  ["F740",0x7CF4],
+  ["F8FD",0x7CF6],
+  ["F9A4",0x7CF7],
+  ["A6CD",0x7CF8],
+  ["A874",0x7CFB],
+  ["CDA9",0x7CFD],
+  ["AAC8",0x7CFE],
+  ["ACF6",0x7D00],
+  ["D04C",0x7D01],
+  ["ACF4",0x7D02],
+  ["D04A",0x7D03],
+  ["ACF9",0x7D04],
+  ["ACF5",0x7D05],
+  ["ACFA",0x7D06],
+  ["ACF8",0x7D07],
+  ["D04B",0x7D08],
+  ["ACF7",0x7D09],
+  ["AFBF",0x7D0A],
+  ["AFBE",0x7D0B],
+  ["D35A",0x7D0C],
+  ["AFC7",0x7D0D],
+  ["D353",0x7D0E],
+  ["D359",0x7D0F],
+  ["AFC3",0x7D10],
+  ["D352",0x7D11],
+  ["D358",0x7D12],
+  ["D356",0x7D13],
+  ["AFC2",0x7D14],
+  ["AFC4",0x7D15],
+  ["D355",0x7D16],
+  ["AFBD",0x7D17],
+  ["D354",0x7D18],
+  ["AFC8",0x7D19],
+  ["AFC5",0x7D1A],
+  ["AFC9",0x7D1B],
+  ["AFC6",0x7D1C],
+  ["D351",0x7D1D],
+  ["D350",0x7D1E],
+  ["D357",0x7D1F],
+  ["AFC0",0x7D20],
+  ["AFBC",0x7D21],
+  ["AFC1",0x7D22],
+  ["D6F0",0x7D28],
+  ["D6E9",0x7D29],
+  ["B5B5",0x7D2B],
+  ["D6E8",0x7D2C],
+  ["B2CF",0x7D2E],
+  ["B2D6",0x7D2F],
+  ["B2D3",0x7D30],
+  ["B2D9",0x7D31],
+  ["B2D8",0x7D32],
+  ["B2D4",0x7D33],
+  ["D6E2",0x7D35],
+  ["D6E5",0x7D36],
+  ["D6E4",0x7D38],
+  ["B2D0",0x7D39],
+  ["D6E6",0x7D3A],
+  ["D6EF",0x7D3B],
+  ["B2D1",0x7D3C],
+  ["D6E3",0x7D3D],
+  ["D6EC",0x7D3E],
+  ["D6ED",0x7D3F],
+  ["B2D2",0x7D40],
+  ["D6EA",0x7D41],
+  ["B2D7",0x7D42],
+  ["B2CD",0x7D43],
+  ["B2D5",0x7D44],
+  ["D6E7",0x7D45],
+  ["B2CC",0x7D46],
+  ["D6EB",0x7D47],
+  ["D6EE",0x7D4A],
+  ["DAFB",0x7D4E],
+  ["DAF2",0x7D4F],
+  ["B5B2",0x7D50],
+  ["DAF9",0x7D51],
+  ["DAF6",0x7D52],
+  ["DAEE",0x7D53],
+  ["DAF7",0x7D54],
+  ["B5B4",0x7D55],
+  ["DAEF",0x7D56],
+  ["DAEB",0x7D58],
+  ["B86C",0x7D5B],
+  ["DAF4",0x7D5C],
+  ["B5B1",0x7D5E],
+  ["DAFA",0x7D5F],
+  ["B5B8",0x7D61],
+  ["B5BA",0x7D62],
+  ["DAED",0x7D63],
+  ["B5B9",0x7D66],
+  ["DAF0",0x7D67],
+  ["B5B3",0x7D68],
+  ["DAF8",0x7D69],
+  ["DAF1",0x7D6A],
+  ["DAF5",0x7D6B],
+  ["DAF3",0x7D6D],
+  ["B5B6",0x7D6E],
+  ["DAEC",0x7D6F],
+  ["B5BB",0x7D70],
+  ["B2CE",0x7D71],
+  ["B5B7",0x7D72],
+  ["B5BC",0x7D73],
+  ["B868",0x7D79],
+  ["DF5D",0x7D7A],
+  ["DF5F",0x7D7B],
+  ["DF61",0x7D7C],
+  ["DF65",0x7D7D],
+  ["DF5B",0x7D7F],
+  ["DF59",0x7D80],
+  ["B86A",0x7D81],
+  ["DF60",0x7D83],
+  ["DF64",0x7D84],
+  ["DF5C",0x7D85],
+  ["DF58",0x7D86],
+  ["DF57",0x7D88],
+  ["DF62",0x7D8C],
+  ["DF5A",0x7D8D],
+  ["DF5E",0x7D8E],
+  ["B86B",0x7D8F],
+  ["B869",0x7D91],
+  ["DF66",0x7D92],
+  ["B867",0x7D93],
+  ["DF63",0x7D94],
+  ["E372",0x7D96],
+  ["BAEE",0x7D9C],
+  ["E36A",0x7D9D],
+  ["BD78",0x7D9E],
+  ["E374",0x7D9F],
+  ["BAF1",0x7DA0],
+  ["E378",0x7DA1],
+  ["BAF7",0x7DA2],
+  ["E365",0x7DA3],
+  ["E375",0x7DA6],
+  ["E362",0x7DA7],
+  ["E377",0x7DA9],
+  ["E366",0x7DAA],
+  ["BAFE",0x7DAC],
+  ["BAFB",0x7DAD],
+  ["E376",0x7DAE],
+  ["E370",0x7DAF],
+  ["BAED",0x7DB0],
+  ["BAF5",0x7DB1],
+  ["BAF4",0x7DB2],
+  ["BAF3",0x7DB4],
+  ["BAF9",0x7DB5],
+  ["E363",0x7DB7],
+  ["BAFA",0x7DB8],
+  ["E371",0x7DB9],
+  ["BAF6",0x7DBA],
+  ["BAEC",0x7DBB],
+  ["E373",0x7DBC],
+  ["BAEF",0x7DBD],
+  ["BAF0",0x7DBE],
+  ["BAF8",0x7DBF],
+  ["E368",0x7DC0],
+  ["E367",0x7DC1],
+  ["E364",0x7DC2],
+  ["E36C",0x7DC4],
+  ["E369",0x7DC5],
+  ["E36D",0x7DC6],
+  ["BAFD",0x7DC7],
+  ["E379",0x7DC9],
+  ["BAF2",0x7DCA],
+  ["E36E",0x7DCB],
+  ["E36F",0x7DCC],
+  ["E36B",0x7DCE],
+  ["BAFC",0x7DD2],
+  ["E6E7",0x7DD7],
+  ["BD70",0x7DD8],
+  ["BD79",0x7DD9],
+  ["BD75",0x7DDA],
+  ["E6E4",0x7DDB],
+  ["BD72",0x7DDD],
+  ["BD76",0x7DDE],
+  ["E6F0",0x7DDF],
+  ["BD6C",0x7DE0],
+  ["E6E8",0x7DE1],
+  ["BD74",0x7DE3],
+  ["E6EB",0x7DE6],
+  ["E6E6",0x7DE7],
+  ["BD73",0x7DE8],
+  ["BD77",0x7DE9],
+  ["E6E5",0x7DEA],
+  ["BD71",0x7DEC],
+  ["E6EF",0x7DEE],
+  ["BD6E",0x7DEF],
+  ["E6EE",0x7DF0],
+  ["E6ED",0x7DF1],
+  ["BD7A",0x7DF2],
+  ["E572",0x7DF3],
+  ["BD6D",0x7DF4],
+  ["E6EC",0x7DF6],
+  ["E6E3",0x7DF7],
+  ["BD7B",0x7DF9],
+  ["E6EA",0x7DFA],
+  ["BD6F",0x7DFB],
+  ["E6E9",0x7E03],
+  ["BFA2",0x7E08],
+  ["BFA7",0x7E09],
+  ["BF7E",0x7E0A],
+  ["EAD8",0x7E0B],
+  ["EACF",0x7E0C],
+  ["EADB",0x7E0D],
+  ["EAD3",0x7E0E],
+  ["EAD9",0x7E0F],
+  ["BFA8",0x7E10],
+  ["BFA1",0x7E11],
+  ["EACC",0x7E12],
+  ["EAD2",0x7E13],
+  ["EADC",0x7E14],
+  ["EAD5",0x7E15],
+  ["EADA",0x7E16],
+  ["EACE",0x7E17],
+  ["EAD6",0x7E1A],
+  ["BFA3",0x7E1B],
+  ["EAD4",0x7E1C],
+  ["BFA6",0x7E1D],
+  ["BFA5",0x7E1E],
+  ["EAD0",0x7E1F],
+  ["EAD1",0x7E20],
+  ["EACD",0x7E21],
+  ["EAD7",0x7E22],
+  ["BFA4",0x7E23],
+  ["EADE",0x7E24],
+  ["EADD",0x7E25],
+  ["EDDA",0x7E29],
+  ["EDD6",0x7E2A],
+  ["C15F",0x7E2B],
+  ["EDD0",0x7E2D],
+  ["C159",0x7E2E],
+  ["C169",0x7E2F],
+  ["EDDC",0x7E30],
+  ["C161",0x7E31],
+  ["C15D",0x7E32],
+  ["EDD3",0x7E33],
+  ["C164",0x7E34],
+  ["C167",0x7E35],
+  ["EDDE",0x7E36],
+  ["C15C",0x7E37],
+  ["EDD5",0x7E38],
+  ["C165",0x7E39],
+  ["EDE0",0x7E3A],
+  ["EDDD",0x7E3B],
+  ["EDD1",0x7E3C],
+  ["C160",0x7E3D],
+  ["C15A",0x7E3E],
+  ["C168",0x7E3F],
+  ["EDD8",0x7E40],
+  ["C163",0x7E41],
+  ["EDD2",0x7E42],
+  ["C15E",0x7E43],
+  ["EDDF",0x7E44],
+  ["C162",0x7E45],
+  ["C15B",0x7E46],
+  ["EDD9",0x7E47],
+  ["C166",0x7E48],
+  ["EDD7",0x7E49],
+  ["EDDB",0x7E4C],
+  ["F06E",0x7E50],
+  ["F074",0x7E51],
+  ["C2B9",0x7E52],
+  ["F077",0x7E53],
+  ["C2B4",0x7E54],
+  ["C2B5",0x7E55],
+  ["F06F",0x7E56],
+  ["F076",0x7E57],
+  ["F071",0x7E58],
+  ["C2BA",0x7E59],
+  ["C2B7",0x7E5A],
+  ["F06D",0x7E5C],
+  ["C2B6",0x7E5E],
+  ["F073",0x7E5F],
+  ["F075",0x7E60],
+  ["C2B8",0x7E61],
+  ["F072",0x7E62],
+  ["F070",0x7E63],
+  ["F2B8",0x7E68],
+  ["C3B7",0x7E69],
+  ["C3B8",0x7E6A],
+  ["C3B4",0x7E6B],
+  ["C3B5",0x7E6D],
+  ["F2B4",0x7E6F],
+  ["F2B2",0x7E70],
+  ["F2B6",0x7E72],
+  ["C3BA",0x7E73],
+  ["F2B7",0x7E74],
+  ["F2B0",0x7E75],
+  ["F2AF",0x7E76],
+  ["F2B3",0x7E77],
+  ["F2B1",0x7E78],
+  ["C3B6",0x7E79],
+  ["F2B5",0x7E7A],
+  ["F4AC",0x7E7B],
+  ["C47E",0x7E7C],
+  ["C47D",0x7E7D],
+  ["F4AD",0x7E7E],
+  ["F4AF",0x7E80],
+  ["F4AE",0x7E81],
+  ["C4A1",0x7E82],
+  ["F5EB",0x7E86],
+  ["F5E8",0x7E87],
+  ["F5E9",0x7E88],
+  ["F5E7",0x7E8A],
+  ["F5EA",0x7E8B],
+  ["C4F2",0x7E8C],
+  ["F5EC",0x7E8D],
+  ["C4F1",0x7E8F],
+  ["F742",0x7E91],
+  ["C5D5",0x7E93],
+  ["C5D7",0x7E94],
+  ["F7EE",0x7E95],
+  ["C5D6",0x7E96],
+  ["F8B9",0x7E97],
+  ["F940",0x7E98],
+  ["F942",0x7E99],
+  ["F8FE",0x7E9A],
+  ["F941",0x7E9B],
+  ["C66C",0x7E9C],
+  ["A6CE",0x7F36],
+  ["ACFB",0x7F38],
+  ["D26F",0x7F39],
+  ["AFCA",0x7F3A],
+  ["B2DA",0x7F3D],
+  ["DAFC",0x7F3E],
+  ["DAFD",0x7F3F],
+  ["EADF",0x7F43],
+  ["C16A",0x7F44],
+  ["EDE1",0x7F45],
+  ["C2BB",0x7F48],
+  ["F2BA",0x7F4A],
+  ["F2B9",0x7F4B],
+  ["C4A2",0x7F4C],
+  ["F5ED",0x7F4D],
+  ["F743",0x7F4F],
+  ["C5F8",0x7F50],
+  ["CA49",0x7F51],
+  ["AAC9",0x7F54],
+  ["A875",0x7F55],
+  ["D04D",0x7F58],
+  ["D360",0x7F5B],
+  ["D35B",0x7F5C],
+  ["D35F",0x7F5D],
+  ["D35D",0x7F5E],
+  ["AFCB",0x7F5F],
+  ["D35E",0x7F60],
+  ["D35C",0x7F61],
+  ["D6F1",0x7F63],
+  ["DAFE",0x7F65],
+  ["DB40",0x7F66],
+  ["DF69",0x7F67],
+  ["DF6A",0x7F68],
+  ["B86E",0x7F69],
+  ["B86F",0x7F6A],
+  ["DF68",0x7F6B],
+  ["DF6B",0x7F6C],
+  ["DF67",0x7F6D],
+  ["B86D",0x7F6E],
+  ["BB40",0x7F70],
+  ["B870",0x7F72],
+  ["E37A",0x7F73],
+  ["BD7C",0x7F75],
+  ["E6F1",0x7F76],
+  ["BD7D",0x7F77],
+  ["BFA9",0x7F79],
+  ["EAE2",0x7F7A],
+  ["EAE0",0x7F7B],
+  ["EAE1",0x7F7C],
+  ["EDE4",0x7F7D],
+  ["EDE3",0x7F7E],
+  ["EDE2",0x7F7F],
+  ["F2BB",0x7F83],
+  ["C3B9",0x7F85],
+  ["F2BC",0x7F86],
+  ["F744",0x7F87],
+  ["C5F9",0x7F88],
+  ["F8BA",0x7F89],
+  ["A6CF",0x7F8A],
+  ["AACB",0x7F8B],
+  ["AACA",0x7F8C],
+  ["D04F",0x7F8D],
+  ["ACFC",0x7F8E],
+  ["D04E",0x7F91],
+  ["D362",0x7F92],
+  ["AFCC",0x7F94],
+  ["D6F2",0x7F95],
+  ["D361",0x7F96],
+  ["B2DC",0x7F9A],
+  ["D6F5",0x7F9B],
+  ["D6F3",0x7F9C],
+  ["D6F4",0x7F9D],
+  ["B2DB",0x7F9E],
+  ["DB42",0x7FA0],
+  ["DB43",0x7FA1],
+  ["DB41",0x7FA2],
+  ["B873",0x7FA4],
+  ["DF6D",0x7FA5],
+  ["DF6C",0x7FA6],
+  ["DF6E",0x7FA7],
+  ["B872",0x7FA8],
+  ["B871",0x7FA9],
+  ["E6F2",0x7FAC],
+  ["E6F4",0x7FAD],
+  ["BD7E",0x7FAF],
+  ["E6F3",0x7FB0],
+  ["EAE3",0x7FB1],
+  ["BFAA",0x7FB2],
+  ["F079",0x7FB3],
+  ["F078",0x7FB5],
+  ["C3BB",0x7FB6],
+  ["F2BD",0x7FB7],
+  ["C3BD",0x7FB8],
+  ["C3BC",0x7FB9],
+  ["F4B0",0x7FBA],
+  ["F5EE",0x7FBB],
+  ["C4F3",0x7FBC],
+  ["A6D0",0x7FBD],
+  ["D050",0x7FBE],
+  ["ACFD",0x7FBF],
+  ["D365",0x7FC0],
+  ["AFCE",0x7FC1],
+  ["D364",0x7FC2],
+  ["D363",0x7FC3],
+  ["AFCD",0x7FC5],
+  ["D6FB",0x7FC7],
+  ["D6FD",0x7FC9],
+  ["D6F6",0x7FCA],
+  ["D6F7",0x7FCB],
+  ["B2DD",0x7FCC],
+  ["D6F8",0x7FCD],
+  ["B2DE",0x7FCE],
+  ["D6FC",0x7FCF],
+  ["D6F9",0x7FD0],
+  ["D6FA",0x7FD1],
+  ["B2DF",0x7FD2],
+  ["B5BE",0x7FD4],
+  ["B5BF",0x7FD5],
+  ["DB44",0x7FD7],
+  ["DF6F",0x7FDB],
+  ["DF70",0x7FDC],
+  ["E37E",0x7FDE],
+  ["BB43",0x7FDF],
+  ["BB41",0x7FE0],
+  ["BB42",0x7FE1],
+  ["E37B",0x7FE2],
+  ["E37C",0x7FE3],
+  ["E37D",0x7FE5],
+  ["E6F9",0x7FE6],
+  ["E6FA",0x7FE8],
+  ["BDA1",0x7FE9],
+  ["E6F7",0x7FEA],
+  ["E6F6",0x7FEB],
+  ["E6F8",0x7FEC],
+  ["E6F5",0x7FED],
+  ["BFAD",0x7FEE],
+  ["EAE4",0x7FEF],
+  ["BFAB",0x7FF0],
+  ["BFAC",0x7FF1],
+  ["EDE6",0x7FF2],
+  ["C16B",0x7FF3],
+  ["EDE5",0x7FF4],
+  ["EFA8",0x7FF5],
+  ["F07A",0x7FF7],
+  ["F07B",0x7FF8],
+  ["C2BC",0x7FF9],
+  ["C2BD",0x7FFB],
+  ["C16C",0x7FFC],
+  ["F2BE",0x7FFD],
+  ["F2BF",0x7FFE],
+  ["F4B1",0x7FFF],
+  ["C4A3",0x8000],
+  ["A6D1",0x8001],
+  ["A6D2",0x8003],
+  ["ACFE",0x8004],
+  ["AACC",0x8005],
+  ["AFCF",0x8006],
+  ["D051",0x8007],
+  ["B5C0",0x800B],
+  ["A6D3",0x800C],
+  ["AD41",0x800D],
+  ["D052",0x800E],
+  ["D053",0x800F],
+  ["AD40",0x8010],
+  ["AD42",0x8011],
+  ["A6D4",0x8012],
+  ["D054",0x8014],
+  ["AFD1",0x8015],
+  ["D366",0x8016],
+  ["AFD3",0x8017],
+  ["AFD0",0x8018],
+  ["AFD2",0x8019],
+  ["D741",0x801B],
+  ["B2E0",0x801C],
+  ["D740",0x801E],
+  ["D6FE",0x801F],
+  ["DF71",0x8021],
+  ["E3A1",0x8024],
+  ["BDA2",0x8026],
+  ["BFAE",0x8028],
+  ["EAE6",0x8029],
+  ["EAE5",0x802A],
+  ["EDE7",0x802C],
+  ["F5EF",0x8030],
+  ["A6D5",0x8033],
+  ["CB73",0x8034],
+  ["CDAA",0x8035],
+  ["AD43",0x8036],
+  ["D055",0x8037],
+  ["D368",0x8039],
+  ["AFD4",0x803D],
+  ["D367",0x803E],
+  ["AFD5",0x803F],
+  ["D743",0x8043],
+  ["B2E2",0x8046],
+  ["D742",0x8047],
+  ["D744",0x8048],
+  ["B2E1",0x804A],
+  ["DB46",0x804F],
+  ["DB47",0x8050],
+  ["DB45",0x8051],
+  ["B5C1",0x8052],
+  ["B874",0x8056],
+  ["B875",0x8058],
+  ["BB45",0x805A],
+  ["E3A3",0x805C],
+  ["E3A2",0x805D],
+  ["BB44",0x805E],
+  ["E6FB",0x8064],
+  ["E6FC",0x8067],
+  ["EAE7",0x806C],
+  ["C170",0x806F],
+  ["C16F",0x8070],
+  ["C16D",0x8071],
+  ["C16E",0x8072],
+  ["C171",0x8073],
+  ["F07C",0x8075],
+  ["C2BF",0x8076],
+  ["C2BE",0x8077],
+  ["F2C0",0x8078],
+  ["F4B2",0x8079],
+  ["C5A5",0x807D],
+  ["C5A4",0x807E],
+  ["A6D6",0x807F],
+  ["D1FB",0x8082],
+  ["B877",0x8084],
+  ["B5C2",0x8085],
+  ["B876",0x8086],
+  ["BB46",0x8087],
+  ["A6D7",0x8089],
+  ["C9A9",0x808A],
+  ["A6D8",0x808B],
+  ["A6D9",0x808C],
+  ["CDAB",0x808F],
+  ["CB76",0x8090],
+  ["CB77",0x8092],
+  ["A877",0x8093],
+  ["CB74",0x8095],
+  ["A876",0x8096],
+  ["A879",0x8098],
+  ["CB75",0x8099],
+  ["A87B",0x809A],
+  ["A87A",0x809B],
+  ["CB78",0x809C],
+  ["A878",0x809D],
+  ["AAD1",0x80A1],
+  ["AACF",0x80A2],
+  ["CDAD",0x80A3],
+  ["AACE",0x80A5],
+  ["AAD3",0x80A9],
+  ["AAD5",0x80AA],
+  ["AAD2",0x80AB],
+  ["CDB0",0x80AD],
+  ["CDAC",0x80AE],
+  ["AAD6",0x80AF],
+  ["AAD0",0x80B1],
+  ["A87C",0x80B2],
+  ["AAD4",0x80B4],
+  ["CDAF",0x80B5],
+  ["CDAE",0x80B8],
+  ["AACD",0x80BA],
+  ["D05B",0x80C2],
+  ["AD47",0x80C3],
+  ["AD48",0x80C4],
+  ["D05D",0x80C5],
+  ["D057",0x80C7],
+  ["D05A",0x80C8],
+  ["D063",0x80C9],
+  ["D061",0x80CA],
+  ["AD49",0x80CC],
+  ["D067",0x80CD],
+  ["AD4C",0x80CE],
+  ["D064",0x80CF],
+  ["D05C",0x80D0],
+  ["D059",0x80D1],
+  ["DB49",0x80D4],
+  ["D062",0x80D5],
+  ["AD44",0x80D6],
+  ["D065",0x80D7],
+  ["D056",0x80D8],
+  ["D05F",0x80D9],
+  ["AD46",0x80DA],
+  ["AD4B",0x80DB],
+  ["D060",0x80DC],
+  ["AD4F",0x80DD],
+  ["AD4D",0x80DE],
+  ["D058",0x80E0],
+  ["AD4A",0x80E1],
+  ["D05E",0x80E3],
+  ["AD4E",0x80E4],
+  ["AD45",0x80E5],
+  ["D066",0x80E6],
+  ["AFDA",0x80ED],
+  ["AFE3",0x80EF],
+  ["AFD8",0x80F0],
+  ["AFD6",0x80F1],
+  ["D36A",0x80F2],
+  ["AFDE",0x80F3],
+  ["AFDB",0x80F4],
+  ["D36C",0x80F5],
+  ["AFDD",0x80F8],
+  ["D36B",0x80F9],
+  ["D369",0x80FA],
+  ["D36E",0x80FB],
+  ["AFE2",0x80FC],
+  ["AFE0",0x80FD],
+  ["DB48",0x80FE],
+  ["D36F",0x8100],
+  ["D36D",0x8101],
+  ["AFD7",0x8102],
+  ["AFD9",0x8105],
+  ["AFDC",0x8106],
+  ["AFDF",0x8108],
+  ["AFE1",0x810A],
+  ["D74E",0x8115],
+  ["B2E4",0x8116],
+  ["D745",0x8118],
+  ["D747",0x8119],
+  ["D748",0x811B],
+  ["D750",0x811D],
+  ["D74C",0x811E],
+  ["D74A",0x811F],
+  ["D74D",0x8121],
+  ["D751",0x8122],
+  ["B2E5",0x8123],
+  ["B2E9",0x8124],
+  ["D746",0x8125],
+  ["D74F",0x8127],
+  ["B2E7",0x8129],
+  ["B2E6",0x812B],
+  ["D74B",0x812C],
+  ["D749",0x812D],
+  ["B2E3",0x812F],
+  ["B2E8",0x8130],
+  ["B5C8",0x8139],
+  ["DB51",0x813A],
+  ["DB4F",0x813D],
+  ["B5CA",0x813E],
+  ["DB4A",0x8143],
+  ["DFA1",0x8144],
+  ["B5C9",0x8146],
+  ["DB4E",0x8147],
+  ["DB4B",0x814A],
+  ["B5C5",0x814B],
+  ["B5CB",0x814C],
+  ["DB50",0x814D],
+  ["B5C7",0x814E],
+  ["DB4D",0x814F],
+  ["BB47",0x8150],
+  ["B5C6",0x8151],
+  ["DB4C",0x8152],
+  ["B5CC",0x8153],
+  ["B5C4",0x8154],
+  ["B5C3",0x8155],
+  ["DF77",0x815B],
+  ["DF75",0x815C],
+  ["DF7B",0x815E],
+  ["DF73",0x8160],
+  ["DFA2",0x8161],
+  ["DF78",0x8162],
+  ["DF72",0x8164],
+  ["B87B",0x8165],
+  ["B8A3",0x8166],
+  ["DF7D",0x8167],
+  ["DF76",0x8169],
+  ["B87E",0x816B],
+  ["B87C",0x816E],
+  ["DF7E",0x816F],
+  ["B879",0x8170],
+  ["B878",0x8171],
+  ["DF79",0x8172],
+  ["B87D",0x8173],
+  ["B5CD",0x8174],
+  ["DF7C",0x8176],
+  ["DF74",0x8177],
+  ["B87A",0x8178],
+  ["B8A1",0x8179],
+  ["B8A2",0x817A],
+  ["BB4C",0x817F],
+  ["BB48",0x8180],
+  ["BB4D",0x8182],
+  ["E3A6",0x8183],
+  ["E3A5",0x8186],
+  ["E3A7",0x8187],
+  ["BB4A",0x8188],
+  ["E3A4",0x8189],
+  ["BB4B",0x818A],
+  ["E3AA",0x818B],
+  ["E3A9",0x818C],
+  ["E3A8",0x818D],
+  ["BB49",0x818F],
+  ["E741",0x8195],
+  ["E744",0x8197],
+  ["BDA8",0x8198],
+  ["E743",0x8199],
+  ["BDA7",0x819A],
+  ["BDA3",0x819B],
+  ["BDA4",0x819C],
+  ["BDA5",0x819D],
+  ["E740",0x819E],
+  ["E6FE",0x819F],
+  ["BDA6",0x81A0],
+  ["E742",0x81A2],
+  ["E6FD",0x81A3],
+  ["EAE9",0x81A6],
+  ["EAF3",0x81A7],
+  ["BFB1",0x81A8],
+  ["BFB0",0x81A9],
+  ["EAED",0x81AB],
+  ["EAEF",0x81AC],
+  ["EAEA",0x81AE],
+  ["EAEE",0x81B0],
+  ["EAE8",0x81B1],
+  ["EAF1",0x81B2],
+  ["BFAF",0x81B3],
+  ["EAF0",0x81B4],
+  ["EAEC",0x81B5],
+  ["EAF2",0x81B7],
+  ["EAEB",0x81B9],
+  ["C174",0x81BA],
+  ["EDE8",0x81BB],
+  ["EDEE",0x81BC],
+  ["C178",0x81BD],
+  ["C17A",0x81BE],
+  ["C177",0x81BF],
+  ["C176",0x81C0],
+  ["C175",0x81C2],
+  ["C173",0x81C3],
+  ["EDE9",0x81C4],
+  ["EDEC",0x81C5],
+  ["C172",0x81C6],
+  ["EDED",0x81C7],
+  ["C179",0x81C9],
+  ["EDEB",0x81CA],
+  ["EDEA",0x81CC],
+  ["C2C0",0x81CD],
+  ["C2C1",0x81CF],
+  ["F0A1",0x81D0],
+  ["F07D",0x81D1],
+  ["F07E",0x81D2],
+  ["F2C2",0x81D5],
+  ["F2C1",0x81D7],
+  ["C3BE",0x81D8],
+  ["F4B4",0x81D9],
+  ["C4A4",0x81DA],
+  ["F4B3",0x81DB],
+  ["F5F0",0x81DD],
+  ["F745",0x81DE],
+  ["C5A6",0x81DF],
+  ["F943",0x81E0],
+  ["F944",0x81E1],
+  ["C5D8",0x81E2],
+  ["A6DA",0x81E3],
+  ["AAD7",0x81E5],
+  ["DB52",0x81E6],
+  ["BB4E",0x81E7],
+  ["C17B",0x81E8],
+  ["EDEF",0x81E9],
+  ["A6DB",0x81EA],
+  ["AFE5",0x81EC],
+  ["AFE4",0x81ED],
+  ["DB53",0x81EE],
+  ["EAF4",0x81F2],
+  ["A6DC",0x81F3],
+  ["AD50",0x81F4],
+  ["DB54",0x81F7],
+  ["DB55",0x81F8],
+  ["DB56",0x81F9],
+  ["BB4F",0x81FA],
+  ["BFB2",0x81FB],
+  ["A6DD",0x81FC],
+  ["AAD8",0x81FE],
+  ["D068",0x81FF],
+  ["AFE6",0x8200],
+  ["D370",0x8201],
+  ["B2EA",0x8202],
+  ["DB57",0x8204],
+  ["B8A4",0x8205],
+  ["BB50",0x8207],
+  ["BFB3",0x8208],
+  ["C17C",0x8209],
+  ["C2C2",0x820A],
+  ["F4B5",0x820B],
+  ["A6DE",0x820C],
+  ["AAD9",0x820D],
+  ["AFE7",0x8210],
+  ["D752",0x8211],
+  ["B5CE",0x8212],
+  ["BB51",0x8214],
+  ["E3AB",0x8215],
+  ["E745",0x8216],
+  ["A6DF",0x821B],
+  ["B5CF",0x821C],
+  ["DFA3",0x821D],
+  ["BB52",0x821E],
+  ["A6E0",0x821F],
+  ["CDB1",0x8220],
+  ["D069",0x8221],
+  ["AD51",0x8222],
+  ["D372",0x8225],
+  ["AFEA",0x8228],
+  ["AFE8",0x822A],
+  ["AFE9",0x822B],
+  ["AFEB",0x822C],
+  ["D371",0x822F],
+  ["D757",0x8232],
+  ["D754",0x8233],
+  ["D756",0x8234],
+  ["B2EB",0x8235],
+  ["B2ED",0x8236],
+  ["B2EC",0x8237],
+  ["D753",0x8238],
+  ["B2EE",0x8239],
+  ["D755",0x823A],
+  ["DB58",0x823C],
+  ["DB59",0x823D],
+  ["DB5A",0x823F],
+  ["DFA6",0x8240],
+  ["DFA7",0x8242],
+  ["DFA5",0x8244],
+  ["DFA8",0x8245],
+  ["B8A5",0x8247],
+  ["DFA4",0x8249],
+  ["BB53",0x824B],
+  ["E74A",0x824E],
+  ["E746",0x824F],
+  ["E749",0x8250],
+  ["E74B",0x8251],
+  ["E748",0x8252],
+  ["E747",0x8253],
+  ["EAF5",0x8255],
+  ["EAF6",0x8256],
+  ["EAF7",0x8257],
+  ["BFB4",0x8258],
+  ["BFB5",0x8259],
+  ["EDF1",0x825A],
+  ["EDF0",0x825B],
+  ["EDF2",0x825C],
+  ["F0A3",0x825E],
+  ["F0A2",0x825F],
+  ["F2C4",0x8261],
+  ["F2C5",0x8263],
+  ["F2C3",0x8264],
+  ["C4A5",0x8266],
+  ["F4B6",0x8268],
+  ["F4B7",0x8269],
+  ["F746",0x826B],
+  ["F7EF",0x826C],
+  ["F8BB",0x826D],
+  ["A6E1",0x826E],
+  ["A87D",0x826F],
+  ["C17D",0x8271],
+  ["A6E2",0x8272],
+  ["D758",0x8274],
+  ["DB5B",0x8275],
+  ["C641",0x8277],
+  ["CA4A",0x8278],
+  ["CA4B",0x827C],
+  ["CA4D",0x827D],
+  ["A6E3",0x827E],
+  ["CA4E",0x827F],
+  ["CA4C",0x8280],
+  ["CBA2",0x8283],
+  ["CBA3",0x8284],
+  ["CB7B",0x8285],
+  ["CBA1",0x828A],
+  ["A8A1",0x828B],
+  ["A8A2",0x828D],
+  ["CB7C",0x828E],
+  ["CB7A",0x828F],
+  ["CB79",0x8290],
+  ["CB7D",0x8291],
+  ["A87E",0x8292],
+  ["CB7E",0x8293],
+  ["D06A",0x8294],
+  ["CDB6",0x8298],
+  ["AADC",0x8299],
+  ["CDB5",0x829A],
+  ["CDB7",0x829B],
+  ["AADB",0x829D],
+  ["CDBC",0x829E],
+  ["AADF",0x829F],
+  ["CDB2",0x82A0],
+  ["CDC0",0x82A1],
+  ["CDC6",0x82A2],
+  ["AAE6",0x82A3],
+  ["CDC3",0x82A4],
+  ["AAE3",0x82A5],
+  ["CDB9",0x82A7],
+  ["CDBF",0x82A8],
+  ["CDC1",0x82A9],
+  ["CDB4",0x82AB],
+  ["AAE2",0x82AC],
+  ["AADD",0x82AD],
+  ["CDBA",0x82AE],
+  ["AAE4",0x82AF],
+  ["AAE7",0x82B0],
+  ["AAE1",0x82B1],
+  ["AADA",0x82B3],
+  ["CDBE",0x82B4],
+  ["CDB8",0x82B5],
+  ["CDC5",0x82B6],
+  ["AAE9",0x82B7],
+  ["AAE5",0x82B8],
+  ["AAE0",0x82B9],
+  ["CDBD",0x82BA],
+  ["AFEC",0x82BB],
+  ["CDBB",0x82BC],
+  ["AADE",0x82BD],
+  ["AAE8",0x82BE],
+  ["CDB3",0x82C0],
+  ["CDC2",0x82C2],
+  ["CDC4",0x82C3],
+  ["AD62",0x82D1],
+  ["AD5C",0x82D2],
+  ["AD64",0x82D3],
+  ["AD61",0x82D4],
+  ["D071",0x82D5],
+  ["D074",0x82D6],
+  ["AD5D",0x82D7],
+  ["D06B",0x82D9],
+  ["AD56",0x82DB],
+  ["AD60",0x82DC],
+  ["AD63",0x82DE],
+  ["AD65",0x82DF],
+  ["D0A2",0x82E0],
+  ["D077",0x82E1],
+  ["AD55",0x82E3],
+  ["D0A1",0x82E4],
+  ["AD59",0x82E5],
+  ["AD57",0x82E6],
+  ["AD52",0x82E7],
+  ["D06F",0x82E8],
+  ["D07E",0x82EA],
+  ["D073",0x82EB],
+  ["D076",0x82EC],
+  ["D0A5",0x82ED],
+  ["AD66",0x82EF],
+  ["D07D",0x82F0],
+  ["AD5E",0x82F1],
+  ["D078",0x82F2],
+  ["D0A4",0x82F3],
+  ["D075",0x82F4],
+  ["D079",0x82F5],
+  ["D07C",0x82F6],
+  ["D06D",0x82F9],
+  ["D0A3",0x82FA],
+  ["D07B",0x82FB],
+  ["D06C",0x82FE],
+  ["D070",0x8300],
+  ["AD5F",0x8301],
+  ["AD5A",0x8302],
+  ["AD53",0x8303],
+  ["AD58",0x8304],
+  ["AD54",0x8305],
+  ["AD67",0x8306],
+  ["D06E",0x8307],
+  ["D3A5",0x8308],
+  ["AD5B",0x8309],
+  ["D07A",0x830C],
+  ["CE41",0x830D],
+  ["D3A8",0x8316],
+  ["AFFA",0x8317],
+  ["D376",0x8319],
+  ["D3A3",0x831B],
+  ["D37D",0x831C],
+  ["D3B2",0x831E],
+  ["D3AA",0x8320],
+  ["D37E",0x8322],
+  ["D3A9",0x8324],
+  ["D378",0x8325],
+  ["D37C",0x8326],
+  ["D3B5",0x8327],
+  ["AFFD",0x8328],
+  ["D3AD",0x8329],
+  ["D3A4",0x832A],
+  ["AFED",0x832B],
+  ["D3B3",0x832C],
+  ["D374",0x832D],
+  ["D3AC",0x832F],
+  ["AFFC",0x8331],
+  ["AFF7",0x8332],
+  ["D373",0x8333],
+  ["AFF5",0x8334],
+  ["AFF4",0x8335],
+  ["AFF9",0x8336],
+  ["D3AB",0x8337],
+  ["AFF1",0x8338],
+  ["AFF8",0x8339],
+  ["D072",0x833A],
+  ["DB5C",0x833B],
+  ["D3A6",0x833C],
+  ["D37A",0x833F],
+  ["AFFB",0x8340],
+  ["D37B",0x8341],
+  ["D3A1",0x8342],
+  ["AFFE",0x8343],
+  ["D375",0x8344],
+  ["D3AF",0x8345],
+  ["D3AE",0x8347],
+  ["D3B6",0x8348],
+  ["AFF3",0x8349],
+  ["AFF0",0x834A],
+  ["D3B4",0x834B],
+  ["D3B0",0x834C],
+  ["D3A7",0x834D],
+  ["D3A2",0x834E],
+  ["AFF6",0x834F],
+  ["AFF2",0x8350],
+  ["D377",0x8351],
+  ["AFEE",0x8352],
+  ["D3B1",0x8353],
+  ["AFEF",0x8354],
+  ["D379",0x8356],
+  ["D75E",0x8373],
+  ["D760",0x8374],
+  ["D765",0x8375],
+  ["D779",0x8376],
+  ["B2FC",0x8377],
+  ["B2F2",0x8378],
+  ["D75D",0x837A],
+  ["B2FD",0x837B],
+  ["B2FE",0x837C],
+  ["D768",0x837D],
+  ["D76F",0x837E],
+  ["D775",0x837F],
+  ["D762",0x8381],
+  ["D769",0x8383],
+  ["B340",0x8386],
+  ["D777",0x8387],
+  ["D772",0x8388],
+  ["B2FA",0x8389],
+  ["B2F8",0x838A],
+  ["D76E",0x838B],
+  ["D76A",0x838C],
+  ["D75C",0x838D],
+  ["B2EF",0x838E],
+  ["D761",0x838F],
+  ["D759",0x8390],
+  ["B2F7",0x8392],
+  ["B2F9",0x8393],
+  ["D766",0x8394],
+  ["D763",0x8395],
+  ["B2F4",0x8396],
+  ["D773",0x8397],
+  ["B2F1",0x8398],
+  ["D764",0x8399],
+  ["D77A",0x839A],
+  ["D76C",0x839B],
+  ["D76B",0x839D],
+  ["B2F0",0x839E],
+  ["B2FB",0x83A0],
+  ["B2F3",0x83A2],
+  ["D75A",0x83A3],
+  ["D75F",0x83A4],
+  ["D770",0x83A5],
+  ["D776",0x83A6],
+  ["B341",0x83A7],
+  ["D75B",0x83A8],
+  ["D767",0x83A9],
+  ["D76D",0x83AA],
+  ["B2F6",0x83AB],
+  ["D778",0x83AE],
+  ["D771",0x83AF],
+  ["D774",0x83B0],
+  ["B2F5",0x83BD],
+  ["DB6C",0x83BF],
+  ["DB60",0x83C0],
+  ["B5D7",0x83C1],
+  ["DB7D",0x83C2],
+  ["DBA7",0x83C3],
+  ["DBAA",0x83C4],
+  ["B5D5",0x83C5],
+  ["DB68",0x83C6],
+  ["DBA3",0x83C7],
+  ["DB69",0x83C8],
+  ["DB77",0x83C9],
+  ["B5E2",0x83CA],
+  ["DB73",0x83CB],
+  ["B5DF",0x83CC],
+  ["DB74",0x83CE],
+  ["DB5D",0x83CF],
+  ["DBA4",0x83D1],
+  ["B5E8",0x83D4],
+  ["DBA1",0x83D5],
+  ["DB75",0x83D6],
+  ["DBAC",0x83D7],
+  ["DB70",0x83D8],
+  ["DFC8",0x83D9],
+  ["DBAF",0x83DB],
+  ["B5E6",0x83DC],
+  ["DB6E",0x83DD],
+  ["DB7A",0x83DE],
+  ["B5E9",0x83DF],
+  ["B5D4",0x83E0],
+  ["DB72",0x83E1],
+  ["DBAD",0x83E2],
+  ["DB6B",0x83E3],
+  ["DB64",0x83E4],
+  ["DB6F",0x83E5],
+  ["DB63",0x83E7],
+  ["DB61",0x83E8],
+  ["B5D0",0x83E9],
+  ["DBA5",0x83EA],
+  ["DB6A",0x83EB],
+  ["DBA8",0x83EC],
+  ["DBA9",0x83EE],
+  ["B5D8",0x83EF],
+  ["B5DD",0x83F0],
+  ["B5D9",0x83F1],
+  ["B5E1",0x83F2],
+  ["DB7E",0x83F3],
+  ["B5DA",0x83F4],
+  ["DB76",0x83F5],
+  ["DB66",0x83F6],
+  ["B5D2",0x83F8],
+  ["DB5E",0x83F9],
+  ["DBA2",0x83FA],
+  ["DBAB",0x83FB],
+  ["DB65",0x83FC],
+  ["B5E0",0x83FD],
+  ["DBB0",0x83FE],
+  ["DB71",0x83FF],
+  ["DB6D",0x8401],
+  ["B5D1",0x8403],
+  ["B5E5",0x8404],
+  ["DB7C",0x8406],
+  ["B5E7",0x8407],
+  ["DB78",0x8409],
+  ["B5DC",0x840A],
+  ["B5D6",0x840B],
+  ["B5DE",0x840C],
+  ["B5D3",0x840D],
+  ["B5E4",0x840E],
+  ["DB79",0x840F],
+  ["DB67",0x8410],
+  ["DB7B",0x8411],
+  ["DB62",0x8412],
+  ["DBA6",0x8413],
+  ["DBAE",0x841B],
+  ["DB5F",0x8423],
+  ["DFC7",0x8429],
+  ["DFDD",0x842B],
+  ["B855",0x842C],
+  ["DFCC",0x842D],
+  ["DFCA",0x842F],
+  ["DFB5",0x8430],
+  ["B8A9",0x8431],
+  ["DFC5",0x8432],
+  ["DFD9",0x8433],
+  ["DFC1",0x8434],
+  ["B8B1",0x8435],
+  ["DFD8",0x8436],
+  ["DFBF",0x8437],
+  ["B5E3",0x8438],
+  ["DFCF",0x8439],
+  ["DFC0",0x843A],
+  ["DFD6",0x843B],
+  ["B8B0",0x843C],
+  ["B8A8",0x843D],
+  ["DFAA",0x843F],
+  ["DFB2",0x8440],
+  ["DFCB",0x8442],
+  ["DFC3",0x8443],
+  ["DFDC",0x8444],
+  ["DFC6",0x8445],
+  ["B8B6",0x8446],
+  ["DFD7",0x8447],
+  ["B8AD",0x8449],
+  ["DFC9",0x844B],
+  ["DFD1",0x844C],
+  ["DFB6",0x844D],
+  ["DFD0",0x844E],
+  ["DFE1",0x8450],
+  ["DFB1",0x8451],
+  ["DFD2",0x8452],
+  ["DFDF",0x8454],
+  ["DFAB",0x8456],
+  ["B5DB",0x8457],
+  ["DFB9",0x8459],
+  ["DFB8",0x845A],
+  ["B8AF",0x845B],
+  ["DFBC",0x845D],
+  ["DFBE",0x845E],
+  ["DFCD",0x845F],
+  ["DFDE",0x8460],
+  ["B8B2",0x8461],
+  ["B8B3",0x8463],
+  ["DFB0",0x8465],
+  ["B8AB",0x8466],
+  ["DFB4",0x8467],
+  ["DFDA",0x8468],
+  ["B8B4",0x8469],
+  ["B8AC",0x846B],
+  ["B8AE",0x846C],
+  ["B8B5",0x846D],
+  ["DFE0",0x846E],
+  ["DFD3",0x846F],
+  ["DFCE",0x8470],
+  ["DFBB",0x8473],
+  ["DFBA",0x8474],
+  ["B8AA",0x8475],
+  ["DFAC",0x8476],
+  ["B8A7",0x8477],
+  ["DFC4",0x8478],
+  ["DFAD",0x8479],
+  ["DFC2",0x847A],
+  ["DFB7",0x847D],
+  ["DFDB",0x847E],
+  ["B8A6",0x8482],
+  ["DFB3",0x8486],
+  ["DFAF",0x848D],
+  ["DFD5",0x848E],
+  ["DFAE",0x848F],
+  ["BB60",0x8490],
+  ["E3D3",0x8491],
+  ["E3C2",0x8494],
+  ["E3AC",0x8497],
+  ["E3CA",0x8498],
+  ["BB58",0x8499],
+  ["E3BB",0x849A],
+  ["E3C5",0x849B],
+  ["BB5B",0x849C],
+  ["E3BE",0x849D],
+  ["BB59",0x849E],
+  ["E3AF",0x849F],
+  ["E3CD",0x84A0],
+  ["E3AE",0x84A1],
+  ["E3C1",0x84A2],
+  ["E3AD",0x84A4],
+  ["E3BF",0x84A7],
+  ["E3C8",0x84A8],
+  ["E3C6",0x84A9],
+  ["E3BA",0x84AA],
+  ["E3B5",0x84AB],
+  ["E3B3",0x84AC],
+  ["E3B4",0x84AE],
+  ["E3C7",0x84AF],
+  ["E3D2",0x84B0],
+  ["E3BC",0x84B1],
+  ["BB5A",0x84B2],
+  ["E3B7",0x84B4],
+  ["E3CB",0x84B6],
+  ["BB5D",0x84B8],
+  ["E3B6",0x84B9],
+  ["E3B0",0x84BA],
+  ["E3C0",0x84BB],
+  ["BB61",0x84BC],
+  ["BB55",0x84BF],
+  ["BB5E",0x84C0],
+  ["E3B8",0x84C1],
+  ["E3B2",0x84C2],
+  ["BB57",0x84C4],
+  ["DFD4",0x84C5],
+  ["BB56",0x84C6],
+  ["E3C3",0x84C7],
+  ["BB54",0x84C9],
+  ["BB63",0x84CA],
+  ["BB5C",0x84CB],
+  ["E3C4",0x84CC],
+  ["E3B9",0x84CD],
+  ["E3B1",0x84CE],
+  ["E3CC",0x84CF],
+  ["E3BD",0x84D0],
+  ["BB62",0x84D1],
+  ["E3D0",0x84D2],
+  ["BB5F",0x84D3],
+  ["E3CF",0x84D4],
+  ["E3C9",0x84D6],
+  ["E3CE",0x84D7],
+  ["E3D1",0x84DB],
+  ["E773",0x84E7],
+  ["E774",0x84E8],
+  ["E767",0x84E9],
+  ["E766",0x84EA],
+  ["E762",0x84EB],
+  ["BDB4",0x84EC],
+  ["BDAC",0x84EE],
+  ["E776",0x84EF],
+  ["E775",0x84F0],
+  ["DFA9",0x84F1],
+  ["E75F",0x84F2],
+  ["E763",0x84F3],
+  ["E75D",0x84F4],
+  ["E770",0x84F6],
+  ["E761",0x84F7],
+  ["E777",0x84F9],
+  ["E75A",0x84FA],
+  ["E758",0x84FB],
+  ["E764",0x84FC],
+  ["E76E",0x84FD],
+  ["E769",0x84FE],
+  ["BDB6",0x84FF],
+  ["E74F",0x8500],
+  ["E76D",0x8502],
+  ["BDB7",0x8506],
+  ["DFBD",0x8507],
+  ["E75B",0x8508],
+  ["E752",0x8509],
+  ["E755",0x850A],
+  ["E77B",0x850B],
+  ["E75C",0x850C],
+  ["E753",0x850D],
+  ["E751",0x850E],
+  ["E74E",0x850F],
+  ["BDB0",0x8511],
+  ["E765",0x8512],
+  ["BDAF",0x8513],
+  ["BDB3",0x8514],
+  ["E760",0x8515],
+  ["E768",0x8516],
+  ["BDA9",0x8517],
+  ["E778",0x8518],
+  ["E77C",0x8519],
+  ["BDAB",0x851A],
+  ["E757",0x851C],
+  ["E76B",0x851D],
+  ["E76F",0x851E],
+  ["E754",0x851F],
+  ["E779",0x8520],
+  ["BDB2",0x8521],
+  ["BDB1",0x8523],
+  ["E74C",0x8524],
+  ["BDB5",0x8525],
+  ["E772",0x8526],
+  ["E756",0x8527],
+  ["E76A",0x8528],
+  ["E750",0x8529],
+  ["E75E",0x852A],
+  ["E759",0x852B],
+  ["BDAD",0x852C],
+  ["BDAE",0x852D],
+  ["E76C",0x852E],
+  ["E77D",0x852F],
+  ["E77A",0x8530],
+  ["E771",0x8531],
+  ["E74D",0x853B],
+  ["BDAA",0x853D],
+  ["EB49",0x853E],
+  ["EB40",0x8540],
+  ["EB43",0x8541],
+  ["BFBB",0x8543],
+  ["EB45",0x8544],
+  ["EAF9",0x8545],
+  ["EB41",0x8546],
+  ["EB47",0x8547],
+  ["BFB8",0x8548],
+  ["BFBC",0x8549],
+  ["BFB6",0x854A],
+  ["EAFB",0x854D],
+  ["EB4C",0x854E],
+  ["EB46",0x8551],
+  ["EAFC",0x8553],
+  ["EB55",0x8554],
+  ["EB4F",0x8555],
+  ["EAF8",0x8556],
+  ["EE46",0x8557],
+  ["EAFE",0x8558],
+  ["BFB7",0x8559],
+  ["EB4A",0x855B],
+  ["EB54",0x855D],
+  ["BFBF",0x855E],
+  ["EB51",0x8560],
+  ["EAFD",0x8561],
+  ["EB44",0x8562],
+  ["EB48",0x8563],
+  ["EB42",0x8564],
+  ["EB56",0x8565],
+  ["EB53",0x8566],
+  ["EB50",0x8567],
+  ["BFB9",0x8568],
+  ["BFBA",0x8569],
+  ["BFBE",0x856A],
+  ["EAFA",0x856B],
+  ["EB57",0x856C],
+  ["BFBD",0x856D],
+  ["EB4D",0x856E],
+  ["EB4B",0x8571],
+  ["EB4E",0x8575],
+  ["EE53",0x8576],
+  ["EE40",0x8577],
+  ["EE45",0x8578],
+  ["EE52",0x8579],
+  ["EE44",0x857A],
+  ["EDFB",0x857B],
+  ["EE41",0x857C],
+  ["C1A2",0x857E],
+  ["EDF4",0x8580],
+  ["EE4D",0x8581],
+  ["EE4F",0x8582],
+  ["EDF3",0x8583],
+  ["C1A1",0x8584],
+  ["EE51",0x8585],
+  ["EE49",0x8586],
+  ["C1A8",0x8587],
+  ["EE50",0x8588],
+  ["EE42",0x8589],
+  ["C1AA",0x858A],
+  ["EDF9",0x858B],
+  ["EB52",0x858C],
+  ["EE4A",0x858D],
+  ["EE47",0x858E],
+  ["EDF5",0x858F],
+  ["EE55",0x8590],
+  ["C1A4",0x8591],
+  ["C1A5",0x8594],
+  ["EDF7",0x8595],
+  ["EE48",0x8596],
+  ["EE54",0x8598],
+  ["EE4B",0x8599],
+  ["EDFD",0x859A],
+  ["C1A7",0x859B],
+  ["C1A3",0x859C],
+  ["EE4C",0x859D],
+  ["EDFE",0x859E],
+  ["EE56",0x859F],
+  ["EDF8",0x85A0],
+  ["EE43",0x85A1],
+  ["EE4E",0x85A2],
+  ["EDFA",0x85A3],
+  ["EDFC",0x85A4],
+  ["C2CB",0x85A6],
+  ["EDF6",0x85A7],
+  ["C1A9",0x85A8],
+  ["C2C4",0x85A9],
+  ["C17E",0x85AA],
+  ["C1A6",0x85AF],
+  ["C2C8",0x85B0],
+  ["F0B3",0x85B1],
+  ["F0A9",0x85B3],
+  ["F0A4",0x85B4],
+  ["F0AA",0x85B5],
+  ["F0B4",0x85B6],
+  ["F0B8",0x85B7],
+  ["F0B7",0x85B8],
+  ["C2CA",0x85B9],
+  ["C2C9",0x85BA],
+  ["F0AB",0x85BD],
+  ["F0B9",0x85BE],
+  ["F0AE",0x85BF],
+  ["F0A6",0x85C0],
+  ["F0A8",0x85C2],
+  ["F0A7",0x85C3],
+  ["F0AD",0x85C4],
+  ["F0B2",0x85C5],
+  ["F0A5",0x85C6],
+  ["F0AC",0x85C7],
+  ["F0B1",0x85C8],
+  ["C2C7",0x85C9],
+  ["F0AF",0x85CB],
+  ["C2C5",0x85CD],
+  ["F0B0",0x85CE],
+  ["C2C3",0x85CF],
+  ["C2C6",0x85D0],
+  ["F2D5",0x85D1],
+  ["F0B5",0x85D2],
+  ["C3C2",0x85D5],
+  ["F2CD",0x85D7],
+  ["F2D1",0x85D8],
+  ["F2C9",0x85D9],
+  ["F2CC",0x85DA],
+  ["F2D4",0x85DC],
+  ["C3C0",0x85DD],
+  ["F2D9",0x85DE],
+  ["F2D2",0x85DF],
+  ["F2CA",0x85E1],
+  ["F2DA",0x85E2],
+  ["F2D3",0x85E3],
+  ["C3C3",0x85E4],
+  ["C3C4",0x85E5],
+  ["F2D7",0x85E6],
+  ["F2CB",0x85E8],
+  ["C3BF",0x85E9],
+  ["C3C1",0x85EA],
+  ["F2C6",0x85EB],
+  ["F2CE",0x85EC],
+  ["F2C8",0x85ED],
+  ["F2D8",0x85EF],
+  ["F2D6",0x85F0],
+  ["F2C7",0x85F1],
+  ["F2CF",0x85F2],
+  ["F4BE",0x85F6],
+  ["C3C5",0x85F7],
+  ["F2D0",0x85F8],
+  ["C4A7",0x85F9],
+  ["C4A9",0x85FA],
+  ["C4A6",0x85FB],
+  ["F4C3",0x85FD],
+  ["F4BB",0x85FE],
+  ["F4B9",0x85FF],
+  ["F4BD",0x8600],
+  ["F4BA",0x8601],
+  ["F4BF",0x8604],
+  ["F4C1",0x8605],
+  ["C4AA",0x8606],
+  ["C4AC",0x8607],
+  ["F4C0",0x8609],
+  ["C4AD",0x860A],
+  ["C4AB",0x860B],
+  ["F4C2",0x860C],
+  ["C4A8",0x8611],
+  ["C4F4",0x8617],
+  ["F5F1",0x8618],
+  ["F5F7",0x8619],
+  ["C4F6",0x861A],
+  ["F4BC",0x861B],
+  ["F5F6",0x861C],
+  ["F5FD",0x861E],
+  ["F5F4",0x861F],
+  ["F5FB",0x8620],
+  ["F5FA",0x8621],
+  ["F4B8",0x8622],
+  ["F5F5",0x8623],
+  ["F0B6",0x8624],
+  ["F5FE",0x8625],
+  ["F5F3",0x8626],
+  ["F5F8",0x8627],
+  ["F5FC",0x8629],
+  ["F5F2",0x862A],
+  ["F74A",0x862C],
+  ["C4F5",0x862D],
+  ["F5F9",0x862E],
+  ["F7F4",0x8631],
+  ["F74B",0x8632],
+  ["F749",0x8633],
+  ["F747",0x8634],
+  ["F748",0x8635],
+  ["F74C",0x8636],
+  ["C5D9",0x8638],
+  ["F7F2",0x8639],
+  ["F7F0",0x863A],
+  ["F7F5",0x863B],
+  ["F7F3",0x863C],
+  ["F7F6",0x863E],
+  ["C5DA",0x863F],
+  ["F7F1",0x8640],
+  ["F8BC",0x8643],
+  ["F945",0x8646],
+  ["F946",0x8647],
+  ["F947",0x8648],
+  ["F9C7",0x864B],
+  ["F9BD",0x864C],
+  ["CA4F",0x864D],
+  ["AAEA",0x864E],
+  ["AD68",0x8650],
+  ["D3B8",0x8652],
+  ["D3B7",0x8653],
+  ["B040",0x8654],
+  ["B342",0x8655],
+  ["D77C",0x8656],
+  ["D77B",0x8659],
+  ["B5EA",0x865B],
+  ["B8B8",0x865C],
+  ["B8B7",0x865E],
+  ["B8B9",0x865F],
+  ["E3D4",0x8661],
+  ["E77E",0x8662],
+  ["EB58",0x8663],
+  ["EB5A",0x8664],
+  ["EB59",0x8665],
+  ["C1AB",0x8667],
+  ["EE57",0x8668],
+  ["F0BA",0x8669],
+  ["F9A5",0x866A],
+  ["A6E4",0x866B],
+  ["CDC9",0x866D],
+  ["CDCA",0x866E],
+  ["CDC8",0x866F],
+  ["CDC7",0x8670],
+  ["AAEB",0x8671],
+  ["D0A9",0x8673],
+  ["D0A7",0x8674],
+  ["D0A6",0x8677],
+  ["AD69",0x8679],
+  ["AD6B",0x867A],
+  ["AD6A",0x867B],
+  ["D0A8",0x867C],
+  ["D3C4",0x8685],
+  ["D3C1",0x8686],
+  ["D3BF",0x8687],
+  ["B041",0x868A],
+  ["D3C2",0x868B],
+  ["B046",0x868C],
+  ["D3BC",0x868D],
+  ["D3CB",0x868E],
+  ["D3CD",0x8690],
+  ["D3BD",0x8691],
+  ["B043",0x8693],
+  ["D3CE",0x8694],
+  ["D3C9",0x8695],
+  ["D3BB",0x8696],
+  ["D3C0",0x8697],
+  ["D3CA",0x8698],
+  ["D3C6",0x8699],
+  ["D3C3",0x869A],
+  ["B048",0x869C],
+  ["D3CC",0x869D],
+  ["D3BE",0x869E],
+  ["D3C7",0x86A1],
+  ["D3B9",0x86A2],
+  ["B047",0x86A3],
+  ["B044",0x86A4],
+  ["D3C5",0x86A5],
+  ["D3C8",0x86A7],
+  ["D3BA",0x86A8],
+  ["B045",0x86A9],
+  ["B042",0x86AA],
+  ["B34C",0x86AF],
+  ["D7A5",0x86B0],
+  ["B34B",0x86B1],
+  ["D7A8",0x86B3],
+  ["D7AB",0x86B4],
+  ["B348",0x86B5],
+  ["B346",0x86B6],
+  ["D77E",0x86B7],
+  ["D7A9",0x86B8],
+  ["D7A7",0x86B9],
+  ["D7A4",0x86BA],
+  ["D7AC",0x86BB],
+  ["D7AD",0x86BC],
+  ["D7AF",0x86BD],
+  ["D7B0",0x86BE],
+  ["D77D",0x86BF],
+  ["B345",0x86C0],
+  ["D7A2",0x86C1],
+  ["D7A1",0x86C2],
+  ["D7AE",0x86C3],
+  ["B347",0x86C4],
+  ["D7A3",0x86C5],
+  ["B349",0x86C6],
+  ["B344",0x86C7],
+  ["D7A6",0x86C8],
+  ["B34D",0x86C9],
+  ["B34A",0x86CB],
+  ["D7AA",0x86CC],
+  ["B5F1",0x86D0],
+  ["DBBF",0x86D1],
+  ["DBB4",0x86D3],
+  ["B5EE",0x86D4],
+  ["DFE7",0x86D6],
+  ["DBBD",0x86D7],
+  ["DBB1",0x86D8],
+  ["B5EC",0x86D9],
+  ["DBB6",0x86DA],
+  ["B5EF",0x86DB],
+  ["DBBA",0x86DC],
+  ["DBB8",0x86DD],
+  ["B5F2",0x86DE],
+  ["B5EB",0x86DF],
+  ["DBB2",0x86E2],
+  ["DBB5",0x86E3],
+  ["B5F0",0x86E4],
+  ["DBB3",0x86E6],
+  ["DBBE",0x86E8],
+  ["DBBC",0x86E9],
+  ["DBB7",0x86EA],
+  ["DBB9",0x86EB],
+  ["DBBB",0x86EC],
+  ["B5ED",0x86ED],
+  ["DFE8",0x86F5],
+  ["DFEE",0x86F6],
+  ["DFE4",0x86F7],
+  ["DFEA",0x86F8],
+  ["B8BA",0x86F9],
+  ["DFE6",0x86FA],
+  ["B8C0",0x86FB],
+  ["B8BF",0x86FE],
+  ["B8BE",0x8700],
+  ["DFED",0x8701],
+  ["B8C1",0x8702],
+  ["B8C2",0x8703],
+  ["DFE3",0x8704],
+  ["DFF0",0x8705],
+  ["B8C3",0x8706],
+  ["B8BD",0x8707],
+  ["B8BC",0x8708],
+  ["DFEC",0x8709],
+  ["B8C4",0x870A],
+  ["DFE2",0x870B],
+  ["DFE5",0x870C],
+  ["DFEF",0x870D],
+  ["DFEB",0x870E],
+  ["E3F4",0x8711],
+  ["E3E9",0x8712],
+  ["B8BB",0x8713],
+  ["BB6A",0x8718],
+  ["E3DD",0x8719],
+  ["E3F2",0x871A],
+  ["E3DE",0x871B],
+  ["BB65",0x871C],
+  ["E3DB",0x871E],
+  ["E3E4",0x8720],
+  ["E3DC",0x8721],
+  ["BB67",0x8722],
+  ["E3D6",0x8723],
+  ["E3F1",0x8724],
+  ["BB68",0x8725],
+  ["E3EE",0x8726],
+  ["E3EF",0x8727],
+  ["E3D7",0x8728],
+  ["BB6D",0x8729],
+  ["E3E6",0x872A],
+  ["E3E0",0x872C],
+  ["E3E7",0x872D],
+  ["E3DA",0x872E],
+  ["E3F3",0x8730],
+  ["E3EB",0x8731],
+  ["E3E5",0x8732],
+  ["E3D5",0x8733],
+  ["BB69",0x8734],
+  ["E3EC",0x8735],
+  ["BB6C",0x8737],
+  ["E3F0",0x8738],
+  ["E3EA",0x873A],
+  ["BB66",0x873B],
+  ["E3E8",0x873C],
+  ["E3E2",0x873E],
+  ["BB64",0x873F],
+  ["E3D9",0x8740],
+  ["E3E1",0x8741],
+  ["E3ED",0x8742],
+  ["E3DF",0x8743],
+  ["E3E3",0x8746],
+  ["BDC1",0x874C],
+  ["DFE9",0x874D],
+  ["E7B2",0x874E],
+  ["E7BB",0x874F],
+  ["E7B1",0x8750],
+  ["E7AD",0x8751],
+  ["E7AA",0x8752],
+  ["BDC2",0x8753],
+  ["E7A8",0x8754],
+  ["BB6B",0x8755],
+  ["E7A1",0x8756],
+  ["BDC0",0x8757],
+  ["E7A7",0x8758],
+  ["BDBF",0x8759],
+  ["E7AC",0x875A],
+  ["E7A9",0x875B],
+  ["E7B9",0x875C],
+  ["E7B4",0x875D],
+  ["E7AE",0x875E],
+  ["E7B3",0x875F],
+  ["BDBB",0x8760],
+  ["E7AB",0x8761],
+  ["E7BE",0x8762],
+  ["E7A2",0x8763],
+  ["E7A3",0x8764],
+  ["E7BA",0x8765],
+  ["BDBC",0x8766],
+  ["E7BF",0x8767],
+  ["BDBE",0x8768],
+  ["E7C0",0x8769],
+  ["E7B0",0x876A],
+  ["E3D8",0x876B],
+  ["E7B6",0x876C],
+  ["E7AF",0x876D],
+  ["E7B8",0x876E],
+  ["E7B5",0x876F],
+  ["E7A6",0x8773],
+  ["BDB9",0x8774],
+  ["E7BD",0x8775],
+  ["BDBA",0x8776],
+  ["E7A4",0x8777],
+  ["BDBD",0x8778],
+  ["EB64",0x8779],
+  ["E7B7",0x877A],
+  ["E7BC",0x877B],
+  ["EB61",0x8781],
+  ["BDB8",0x8782],
+  ["BFC0",0x8783],
+  ["EB6B",0x8784],
+  ["EB67",0x8785],
+  ["EB65",0x8787],
+  ["EB60",0x8788],
+  ["EB6F",0x8789],
+  ["BFC4",0x878D],
+  ["EB5C",0x878F],
+  ["EB68",0x8790],
+  ["EB69",0x8791],
+  ["EB5F",0x8792],
+  ["EB5E",0x8793],
+  ["EB6C",0x8794],
+  ["EB62",0x8796],
+  ["EB5D",0x8797],
+  ["EB63",0x8798],
+  ["EB6E",0x879A],
+  ["EB5B",0x879B],
+  ["EB6D",0x879C],
+  ["EB6A",0x879D],
+  ["BFC2",0x879E],
+  ["BFC1",0x879F],
+  ["BFC3",0x87A2],
+  ["EB66",0x87A3],
+  ["F0CB",0x87A4],
+  ["EE59",0x87AA],
+  ["C1B1",0x87AB],
+  ["EE5D",0x87AC],
+  ["EE5A",0x87AD],
+  ["EE61",0x87AE],
+  ["EE67",0x87AF],
+  ["EE5C",0x87B0],
+  ["EE70",0x87B2],
+  ["C1AE",0x87B3],
+  ["EE6A",0x87B4],
+  ["EE5F",0x87B5],
+  ["EE6B",0x87B6],
+  ["EE66",0x87B7],
+  ["EE6D",0x87B8],
+  ["EE5E",0x87B9],
+  ["C1B3",0x87BA],
+  ["C1B2",0x87BB],
+  ["EE60",0x87BC],
+  ["EE6E",0x87BD],
+  ["EE58",0x87BE],
+  ["EE6C",0x87BF],
+  ["C1AC",0x87C0],
+  ["EE64",0x87C2],
+  ["EE63",0x87C3],
+  ["EE68",0x87C4],
+  ["EE5B",0x87C5],
+  ["C1B0",0x87C6],
+  ["C1B4",0x87C8],
+  ["EE62",0x87C9],
+  ["EE69",0x87CA],
+  ["C1B5",0x87CB],
+  ["EE65",0x87CC],
+  ["C1AD",0x87D1],
+  ["C1AF",0x87D2],
+  ["F0C7",0x87D3],
+  ["F0C5",0x87D4],
+  ["F0CC",0x87D7],
+  ["F0C9",0x87D8],
+  ["F0CD",0x87D9],
+  ["F0BE",0x87DB],
+  ["F0C6",0x87DC],
+  ["F0D1",0x87DD],
+  ["EE6F",0x87DE],
+  ["F0C2",0x87DF],
+  ["C2CF",0x87E0],
+  ["E7A5",0x87E1],
+  ["F0BD",0x87E2],
+  ["F0CA",0x87E3],
+  ["F0C4",0x87E4],
+  ["F0C1",0x87E5],
+  ["F0BC",0x87E6],
+  ["F0BB",0x87E7],
+  ["F0D0",0x87E8],
+  ["F0C0",0x87EA],
+  ["F0BF",0x87EB],
+  ["C2CD",0x87EC],
+  ["F0C8",0x87ED],
+  ["C2CC",0x87EF],
+  ["C2CE",0x87F2],
+  ["F0C3",0x87F3],
+  ["F0CF",0x87F4],
+  ["F2DE",0x87F6],
+  ["F2DF",0x87F7],
+  ["C3C9",0x87F9],
+  ["F2DC",0x87FA],
+  ["C3C6",0x87FB],
+  ["F2E4",0x87FC],
+  ["C3CA",0x87FE],
+  ["F2E6",0x87FF],
+  ["F2DB",0x8800],
+  ["F0CE",0x8801],
+  ["F2E8",0x8802],
+  ["F2DD",0x8803],
+  ["C3C7",0x8805],
+  ["F2E3",0x8806],
+  ["F2E5",0x8808],
+  ["F2E0",0x8809],
+  ["F2E7",0x880A],
+  ["F2E2",0x880B],
+  ["F2E1",0x880C],
+  ["C3C8",0x880D],
+  ["F4C5",0x8810],
+  ["F4C6",0x8811],
+  ["F4C8",0x8813],
+  ["C4AE",0x8814],
+  ["C4AF",0x8815],
+  ["F4C9",0x8816],
+  ["F4C7",0x8817],
+  ["F4C4",0x8819],
+  ["F642",0x881B],
+  ["F645",0x881C],
+  ["F641",0x881D],
+  ["C4FA",0x881F],
+  ["F643",0x8820],
+  ["C4F9",0x8821],
+  ["C4F8",0x8822],
+  ["C4F7",0x8823],
+  ["F644",0x8824],
+  ["F751",0x8825],
+  ["F74F",0x8826],
+  ["F74E",0x8828],
+  ["F640",0x8829],
+  ["F750",0x882A],
+  ["F646",0x882B],
+  ["F74D",0x882C],
+  ["F7F9",0x882E],
+  ["F7D7",0x882F],
+  ["F7F7",0x8830],
+  ["C5DB",0x8831],
+  ["F7F8",0x8832],
+  ["F7FA",0x8833],
+  ["F8BF",0x8835],
+  ["C5FA",0x8836],
+  ["F8BE",0x8837],
+  ["F8BD",0x8838],
+  ["C5FB",0x8839],
+  ["C65A",0x883B],
+  ["F96E",0x883C],
+  ["F9A7",0x883D],
+  ["F9A6",0x883E],
+  ["F9A8",0x883F],
+  ["A6E5",0x8840],
+  ["D0AA",0x8841],
+  ["D3CF",0x8843],
+  ["D3D0",0x8844],
+  ["DBC0",0x8848],
+  ["F647",0x884A],
+  ["F8C0",0x884B],
+  ["A6E6",0x884C],
+  ["AD6C",0x884D],
+  ["D0AB",0x884E],
+  ["D7B1",0x8852],
+  ["B34E",0x8853],
+  ["DBC2",0x8855],
+  ["DBC1",0x8856],
+  ["B5F3",0x8857],
+  ["B8C5",0x8859],
+  ["E7C1",0x885A],
+  ["BDC3",0x885B],
+  ["BDC4",0x885D],
+  ["BFC5",0x8861],
+  ["C5FC",0x8862],
+  ["A6E7",0x8863],
+  ["D0AC",0x8867],
+  ["AAED",0x8868],
+  ["D0AE",0x8869],
+  ["D0AD",0x886A],
+  ["AD6D",0x886B],
+  ["D3D1",0x886D],
+  ["D3D8",0x886F],
+  ["B049",0x8870],
+  ["D3D6",0x8871],
+  ["D3D4",0x8872],
+  ["D3DB",0x8874],
+  ["D3D2",0x8875],
+  ["D3D3",0x8876],
+  ["B04A",0x8877],
+  ["B04E",0x8879],
+  ["D3DC",0x887C],
+  ["B04D",0x887D],
+  ["D3DA",0x887E],
+  ["D3D7",0x887F],
+  ["D3D5",0x8880],
+  ["B04B",0x8881],
+  ["B04C",0x8882],
+  ["D3D9",0x8883],
+  ["B350",0x8888],
+  ["D7B2",0x8889],
+  ["B355",0x888B],
+  ["D7C2",0x888C],
+  ["B354",0x888D],
+  ["D7C4",0x888E],
+  ["D7B8",0x8891],
+  ["B352",0x8892],
+  ["D7C3",0x8893],
+  ["D7B3",0x8895],
+  ["B353",0x8896],
+  ["D7BF",0x8897],
+  ["D7BB",0x8898],
+  ["D7BD",0x8899],
+  ["D7B7",0x889A],
+  ["D7BE",0x889B],
+  ["B34F",0x889E],
+  ["D7BA",0x889F],
+  ["D7B9",0x88A1],
+  ["D7B5",0x88A2],
+  ["D7C0",0x88A4],
+  ["D7BC",0x88A7],
+  ["D7B4",0x88A8],
+  ["D7B6",0x88AA],
+  ["B351",0x88AB],
+  ["D7C1",0x88AC],
+  ["B5F6",0x88B1],
+  ["DBCD",0x88B2],
+  ["DBC9",0x88B6],
+  ["DBCB",0x88B7],
+  ["DBC6",0x88B8],
+  ["DBC5",0x88B9],
+  ["DBC3",0x88BA],
+  ["DBCA",0x88BC],
+  ["DBCC",0x88BD],
+  ["DBC8",0x88BE],
+  ["DBC7",0x88C0],
+  ["B5F4",0x88C1],
+  ["B5F5",0x88C2],
+  ["DBCF",0x88C9],
+  ["B8CD",0x88CA],
+  ["DFF2",0x88CB],
+  ["DFF8",0x88CC],
+  ["DFF3",0x88CD],
+  ["DFF4",0x88CE],
+  ["DFF9",0x88D0],
+  ["B8CF",0x88D2],
+  ["B8C7",0x88D4],
+  ["B8CE",0x88D5],
+  ["DFF1",0x88D6],
+  ["DBC4",0x88D7],
+  ["B8CA",0x88D8],
+  ["B8C8",0x88D9],
+  ["DFF7",0x88DA],
+  ["DFF6",0x88DB],
+  ["B8C9",0x88DC],
+  ["B8CB",0x88DD],
+  ["DFF5",0x88DE],
+  ["B8C6",0x88DF],
+  ["B8CC",0x88E1],
+  ["E3F6",0x88E7],
+  ["BB74",0x88E8],
+  ["E442",0x88EB],
+  ["E441",0x88EC],
+  ["E3FB",0x88EE],
+  ["BB76",0x88EF],
+  ["E440",0x88F0],
+  ["E3F7",0x88F1],
+  ["E3F8",0x88F2],
+  ["BB6E",0x88F3],
+  ["BB70",0x88F4],
+  ["E3FD",0x88F6],
+  ["E3F5",0x88F7],
+  ["BB72",0x88F8],
+  ["BB71",0x88F9],
+  ["E3F9",0x88FA],
+  ["E3FE",0x88FB],
+  ["E3FC",0x88FC],
+  ["BB73",0x88FD],
+  ["E3FA",0x88FE],
+  ["DBCE",0x8901],
+  ["BB6F",0x8902],
+  ["E7C2",0x8905],
+  ["E7C9",0x8906],
+  ["BDC6",0x8907],
+  ["E7CD",0x8909],
+  ["BDCA",0x890A],
+  ["E7C5",0x890B],
+  ["E7C3",0x890C],
+  ["E7CC",0x890E],
+  ["BDC5",0x8910],
+  ["E7CB",0x8911],
+  ["BDC7",0x8912],
+  ["BDC8",0x8913],
+  ["E7C4",0x8914],
+  ["BDC9",0x8915],
+  ["E7CA",0x8916],
+  ["E7C6",0x8917],
+  ["E7C7",0x8918],
+  ["E7C8",0x8919],
+  ["BB75",0x891A],
+  ["EB70",0x891E],
+  ["EB7C",0x891F],
+  ["BFCA",0x8921],
+  ["EB77",0x8922],
+  ["EB79",0x8923],
+  ["BFC8",0x8925],
+  ["EB71",0x8926],
+  ["EB75",0x8927],
+  ["EB78",0x8929],
+  ["BFC6",0x892A],
+  ["BFC9",0x892B],
+  ["EB7B",0x892C],
+  ["EB73",0x892D],
+  ["EB74",0x892E],
+  ["EB7A",0x892F],
+  ["EB72",0x8930],
+  ["EB76",0x8931],
+  ["BFC7",0x8932],
+  ["EE72",0x8933],
+  ["EE71",0x8935],
+  ["C1B7",0x8936],
+  ["EE77",0x8937],
+  ["C1B9",0x8938],
+  ["C1B6",0x893B],
+  ["EE73",0x893C],
+  ["C1BA",0x893D],
+  ["EE74",0x893E],
+  ["EE75",0x8941],
+  ["EE78",0x8942],
+  ["C1B8",0x8944],
+  ["F0D6",0x8946],
+  ["F0D9",0x8949],
+  ["F0D3",0x894B],
+  ["F0D5",0x894C],
+  ["F0D4",0x894F],
+  ["F0D7",0x8950],
+  ["F0D8",0x8951],
+  ["EE76",0x8952],
+  ["F0D2",0x8953],
+  ["C3CD",0x8956],
+  ["F2EC",0x8957],
+  ["F2EF",0x8958],
+  ["F2F1",0x8959],
+  ["F2EA",0x895A],
+  ["F2EB",0x895B],
+  ["F2EE",0x895C],
+  ["F2F0",0x895D],
+  ["C3CE",0x895E],
+  ["C3CC",0x895F],
+  ["C3CB",0x8960],
+  ["F2ED",0x8961],
+  ["F2E9",0x8962],
+  ["F4CA",0x8963],
+  ["C4B0",0x8964],
+  ["F4CB",0x8966],
+  ["F649",0x8969],
+  ["C4FB",0x896A],
+  ["F64B",0x896B],
+  ["C4FC",0x896C],
+  ["F648",0x896D],
+  ["F64A",0x896E],
+  ["C5A8",0x896F],
+  ["F752",0x8971],
+  ["C5A7",0x8972],
+  ["F7FD",0x8973],
+  ["F7FC",0x8974],
+  ["F7FB",0x8976],
+  ["F948",0x8979],
+  ["F949",0x897A],
+  ["F94B",0x897B],
+  ["F94A",0x897C],
+  ["CA50",0x897E],
+  ["A6E8",0x897F],
+  ["AD6E",0x8981],
+  ["D7C5",0x8982],
+  ["B5F7",0x8983],
+  ["DFFA",0x8985],
+  ["C2D0",0x8986],
+  ["F2F2",0x8988],
+  ["A8A3",0x898B],
+  ["B357",0x898F],
+  ["B356",0x8993],
+  ["DBD0",0x8995],
+  ["B5F8",0x8996],
+  ["DBD2",0x8997],
+  ["DBD1",0x8998],
+  ["DFFB",0x899B],
+  ["B8D0",0x899C],
+  ["E443",0x899D],
+  ["E446",0x899E],
+  ["E445",0x899F],
+  ["E444",0x89A1],
+  ["E7CE",0x89A2],
+  ["E7D0",0x89A3],
+  ["E7CF",0x89A4],
+  ["BFCC",0x89A6],
+  ["BFCB",0x89AA],
+  ["C1BB",0x89AC],
+  ["EE79",0x89AD],
+  ["EE7B",0x89AE],
+  ["EE7A",0x89AF],
+  ["C2D1",0x89B2],
+  ["F2F4",0x89B6],
+  ["F2F3",0x89B7],
+  ["F4CC",0x89B9],
+  ["C4B1",0x89BA],
+  ["C4FD",0x89BD],
+  ["F754",0x89BE],
+  ["F753",0x89BF],
+  ["C65B",0x89C0],
+  ["A8A4",0x89D2],
+  ["D0AF",0x89D3],
+  ["AD6F",0x89D4],
+  ["D7C8",0x89D5],
+  ["D7C6",0x89D6],
+  ["D7C7",0x89D9],
+  ["DBD4",0x89DA],
+  ["DBD5",0x89DB],
+  ["E043",0x89DC],
+  ["DBD3",0x89DD],
+  ["DFFC",0x89DF],
+  ["E041",0x89E0],
+  ["E040",0x89E1],
+  ["E042",0x89E2],
+  ["B8D1",0x89E3],
+  ["DFFE",0x89E4],
+  ["DFFD",0x89E5],
+  ["E044",0x89E6],
+  ["E449",0x89E8],
+  ["E447",0x89E9],
+  ["E448",0x89EB],
+  ["E7D3",0x89EC],
+  ["E7D1",0x89ED],
+  ["E7D2",0x89F0],
+  ["EB7D",0x89F1],
+  ["EE7C",0x89F2],
+  ["EE7D",0x89F3],
+  ["C2D2",0x89F4],
+  ["F2F5",0x89F6],
+  ["F4CD",0x89F7],
+  ["C4B2",0x89F8],
+  ["F64C",0x89FA],
+  ["F755",0x89FB],
+  ["C5A9",0x89FC],
+  ["F7FE",0x89FE],
+  ["F94C",0x89FF],
+  ["A8A5",0x8A00],
+  ["AD71",0x8A02],
+  ["AD72",0x8A03],
+  ["D0B0",0x8A04],
+  ["D0B1",0x8A07],
+  ["AD70",0x8A08],
+  ["B054",0x8A0A],
+  ["B052",0x8A0C],
+  ["B051",0x8A0E],
+  ["B058",0x8A0F],
+  ["B050",0x8A10],
+  ["B059",0x8A11],
+  ["D3DD",0x8A12],
+  ["B056",0x8A13],
+  ["B053",0x8A15],
+  ["B057",0x8A16],
+  ["B055",0x8A17],
+  ["B04F",0x8A18],
+  ["B35F",0x8A1B],
+  ["B359",0x8A1D],
+  ["D7CC",0x8A1E],
+  ["B35E",0x8A1F],
+  ["B360",0x8A22],
+  ["B35A",0x8A23],
+  ["B35B",0x8A25],
+  ["D7CA",0x8A27],
+  ["B358",0x8A2A],
+  ["D7CB",0x8A2C],
+  ["B35D",0x8A2D],
+  ["D7C9",0x8A30],
+  ["B35C",0x8A31],
+  ["B644",0x8A34],
+  ["B646",0x8A36],
+  ["DBD8",0x8A39],
+  ["B645",0x8A3A],
+  ["B5F9",0x8A3B],
+  ["B5FD",0x8A3C],
+  ["B8E4",0x8A3E],
+  ["E049",0x8A3F],
+  ["DBDA",0x8A40],
+  ["B5FE",0x8A41],
+  ["DBDD",0x8A44],
+  ["DBDE",0x8A45],
+  ["B643",0x8A46],
+  ["DBE0",0x8A48],
+  ["DBE2",0x8A4A],
+  ["DBE3",0x8A4C],
+  ["DBD7",0x8A4D],
+  ["DBD6",0x8A4E],
+  ["DBE4",0x8A4F],
+  ["B642",0x8A50],
+  ["DBE1",0x8A51],
+  ["DBDF",0x8A52],
+  ["B640",0x8A54],
+  ["B5FB",0x8A55],
+  ["B647",0x8A56],
+  ["DBDB",0x8A57],
+  ["DBDC",0x8A58],
+  ["DBD9",0x8A59],
+  ["B641",0x8A5B],
+  ["B5FC",0x8A5E],
+  ["B5FA",0x8A60],
+  ["E048",0x8A61],
+  ["B8DF",0x8A62],
+  ["B8DA",0x8A63],
+  ["B8D5",0x8A66],
+  ["B8E5",0x8A68],
+  ["B8D6",0x8A69],
+  ["B8D2",0x8A6B],
+  ["B8E1",0x8A6C],
+  ["B8DE",0x8A6D],
+  ["B8E0",0x8A6E],
+  ["B8D7",0x8A70],
+  ["B8DC",0x8A71],
+  ["B8D3",0x8A72],
+  ["B8D4",0x8A73],
+  ["E050",0x8A74],
+  ["E04D",0x8A75],
+  ["E045",0x8A76],
+  ["E04A",0x8A77],
+  ["B8E2",0x8A79],
+  ["E051",0x8A7A],
+  ["B8E3",0x8A7B],
+  ["B8D9",0x8A7C],
+  ["E047",0x8A7F],
+  ["E04F",0x8A81],
+  ["E04B",0x8A82],
+  ["E04E",0x8A83],
+  ["E04C",0x8A84],
+  ["B8DD",0x8A85],
+  ["E046",0x8A86],
+  ["B8D8",0x8A87],
+  ["E44C",0x8A8B],
+  ["BB78",0x8A8C],
+  ["BB7B",0x8A8D],
+  ["E44E",0x8A8F],
+  ["BBA5",0x8A91],
+  ["E44D",0x8A92],
+  ["BB7D",0x8A93],
+  ["BDCF",0x8A95],
+  ["E44F",0x8A96],
+  ["BBA4",0x8A98],
+  ["E44B",0x8A99],
+  ["BBA6",0x8A9A],
+  ["BB79",0x8A9E],
+  ["B8DB",0x8AA0],
+  ["BB7C",0x8AA1],
+  ["BB7A",0x8AA3],
+  ["BB7E",0x8AA4],
+  ["BBA2",0x8AA5],
+  ["BB77",0x8AA6],
+  ["BBA7",0x8AA7],
+  ["BBA3",0x8AA8],
+  ["BBA1",0x8AAA],
+  ["E44A",0x8AAB],
+  ["BDD6",0x8AB0],
+  ["BDD2",0x8AB2],
+  ["BDD9",0x8AB6],
+  ["E7D6",0x8AB8],
+  ["BDDA",0x8AB9],
+  ["E7E2",0x8ABA],
+  ["E7DB",0x8ABB],
+  ["BDCB",0x8ABC],
+  ["E7E3",0x8ABD],
+  ["E7DD",0x8ABE],
+  ["BDD5",0x8ABF],
+  ["E7DE",0x8AC0],
+  ["BDD4",0x8AC2],
+  ["E7E1",0x8AC3],
+  ["BDCE",0x8AC4],
+  ["E7DF",0x8AC5],
+  ["E7D5",0x8AC6],
+  ["BDCD",0x8AC7],
+  ["EBAA",0x8AC8],
+  ["BDD3",0x8AC9],
+  ["BDD0",0x8ACB],
+  ["BDD8",0x8ACD],
+  ["E7D4",0x8ACF],
+  ["E7D8",0x8AD1],
+  ["BDCC",0x8AD2],
+  ["E7D7",0x8AD3],
+  ["E7D9",0x8AD4],
+  ["E7DA",0x8AD5],
+  ["BDD7",0x8AD6],
+  ["E7DC",0x8AD7],
+  ["E7E0",0x8AD8],
+  ["E7E4",0x8AD9],
+  ["BDDB",0x8ADB],
+  ["BFD2",0x8ADC],
+  ["EBA5",0x8ADD],
+  ["EBAB",0x8ADE],
+  ["EBA8",0x8ADF],
+  ["EB7E",0x8AE0],
+  ["EBAC",0x8AE1],
+  ["EBA1",0x8AE2],
+  ["EBA7",0x8AE4],
+  ["BFCD",0x8AE6],
+  ["BFD3",0x8AE7],
+  ["EBAD",0x8AE8],
+  ["BFCF",0x8AEB],
+  ["BFD9",0x8AED],
+  ["BFD4",0x8AEE],
+  ["EBAF",0x8AEF],
+  ["EBA9",0x8AF0],
+  ["BFD0",0x8AF1],
+  ["EBA2",0x8AF2],
+  ["BFDA",0x8AF3],
+  ["EBA3",0x8AF4],
+  ["EBA4",0x8AF5],
+  ["BFDB",0x8AF6],
+  ["BFD8",0x8AF7],
+  ["BDD1",0x8AF8],
+  ["BFCE",0x8AFA],
+  ["EBB0",0x8AFB],
+  ["BFDC",0x8AFC],
+  ["BFD5",0x8AFE],
+  ["EBAE",0x8AFF],
+  ["BFD1",0x8B00],
+  ["BFD6",0x8B01],
+  ["BFD7",0x8B02],
+  ["C1C3",0x8B04],
+  ["EEA4",0x8B05],
+  ["EEAD",0x8B06],
+  ["EEAA",0x8B07],
+  ["EEAC",0x8B08],
+  ["C1C0",0x8B0A],
+  ["EEA5",0x8B0B],
+  ["EEAB",0x8B0D],
+  ["C1BC",0x8B0E],
+  ["EEA7",0x8B0F],
+  ["C1C4",0x8B10],
+  ["EEA3",0x8B11],
+  ["EEA8",0x8B12],
+  ["EEAF",0x8B13],
+  ["EBA6",0x8B14],
+  ["EEA9",0x8B15],
+  ["EEA2",0x8B16],
+  ["C1BD",0x8B17],
+  ["EEA1",0x8B18],
+  ["C1BE",0x8B19],
+  ["EEB0",0x8B1A],
+  ["C1BF",0x8B1B],
+  ["EEAE",0x8B1C],
+  ["C1C2",0x8B1D],
+  ["EE7E",0x8B1E],
+  ["C1C1",0x8B20],
+  ["EEA6",0x8B22],
+  ["F0DC",0x8B23],
+  ["F0EA",0x8B24],
+  ["F0E5",0x8B25],
+  ["F0E7",0x8B26],
+  ["F0DB",0x8B27],
+  ["C2D3",0x8B28],
+  ["F0DA",0x8B2A],
+  ["C2D6",0x8B2B],
+  ["C2D5",0x8B2C],
+  ["F0E9",0x8B2E],
+  ["F0E1",0x8B2F],
+  ["F0DE",0x8B30],
+  ["F0E4",0x8B31],
+  ["F0DD",0x8B33],
+  ["F0DF",0x8B35],
+  ["F0E8",0x8B36],
+  ["F0E6",0x8B37],
+  ["C2D4",0x8B39],
+  ["F0ED",0x8B3A],
+  ["F0EB",0x8B3B],
+  ["F0E2",0x8B3C],
+  ["F0EC",0x8B3D],
+  ["F0E3",0x8B3E],
+  ["F2F9",0x8B40],
+  ["C3CF",0x8B41],
+  ["F341",0x8B42],
+  ["F64F",0x8B45],
+  ["C3D6",0x8B46],
+  ["F0E0",0x8B47],
+  ["F2F7",0x8B48],
+  ["C3D2",0x8B49],
+  ["F2F8",0x8B4A],
+  ["F2FD",0x8B4B],
+  ["C3D4",0x8B4E],
+  ["C3D5",0x8B4F],
+  ["F2F6",0x8B50],
+  ["F340",0x8B51],
+  ["F342",0x8B52],
+  ["F2FA",0x8B53],
+  ["F2FC",0x8B54],
+  ["F2FE",0x8B55],
+  ["F2FB",0x8B56],
+  ["F343",0x8B57],
+  ["C3D1",0x8B58],
+  ["C3D7",0x8B59],
+  ["C3D3",0x8B5A],
+  ["C3D0",0x8B5C],
+  ["F4D0",0x8B5D],
+  ["C4B7",0x8B5F],
+  ["F4CE",0x8B60],
+  ["F4D2",0x8B63],
+  ["F4D3",0x8B65],
+  ["C4B5",0x8B66],
+  ["F4D4",0x8B67],
+  ["F4D1",0x8B68],
+  ["F4CF",0x8B6A],
+  ["C4B8",0x8B6B],
+  ["C4B4",0x8B6C],
+  ["F4D5",0x8B6D],
+  ["C4B6",0x8B6F],
+  ["C4B3",0x8B70],
+  ["C4FE",0x8B74],
+  ["C540",0x8B77],
+  ["F64E",0x8B78],
+  ["F64D",0x8B79],
+  ["F650",0x8B7A],
+  ["F651",0x8B7B],
+  ["C541",0x8B7D],
+  ["F756",0x8B7E],
+  ["F75B",0x8B7F],
+  ["C5AA",0x8B80],
+  ["F758",0x8B82],
+  ["F757",0x8B84],
+  ["F75A",0x8B85],
+  ["F759",0x8B86],
+  ["F843",0x8B88],
+  ["C5DC",0x8B8A],
+  ["F842",0x8B8B],
+  ["F840",0x8B8C],
+  ["F841",0x8B8E],
+  ["C5FE",0x8B92],
+  ["C5FD",0x8B93],
+  ["F8C1",0x8B94],
+  ["F8C2",0x8B95],
+  ["C640",0x8B96],
+  ["F94D",0x8B98],
+  ["F94E",0x8B99],
+  ["C667",0x8B9A],
+  ["C66D",0x8B9C],
+  ["F9A9",0x8B9E],
+  ["F9C8",0x8B9F],
+  ["A8A6",0x8C37],
+  ["D7CD",0x8C39],
+  ["D7CE",0x8C3B],
+  ["E052",0x8C3C],
+  ["E450",0x8C3D],
+  ["E7E5",0x8C3E],
+  ["C1C6",0x8C3F],
+  ["C1C5",0x8C41],
+  ["F0EE",0x8C42],
+  ["F344",0x8C43],
+  ["F844",0x8C45],
+  ["A8A7",0x8C46],
+  ["D3DE",0x8C47],
+  ["B05A",0x8C48],
+  ["B361",0x8C49],
+  ["E054",0x8C4A],
+  ["E053",0x8C4B],
+  ["BDDC",0x8C4C],
+  ["E7E6",0x8C4D],
+  ["BDDD",0x8C4E],
+  ["EEB1",0x8C4F],
+  ["C2D7",0x8C50],
+  ["C676",0x8C54],
+  ["A8A8",0x8C55],
+  ["CDCB",0x8C56],
+  ["D3DF",0x8C57],
+  ["B362",0x8C5A],
+  ["D7CF",0x8C5C],
+  ["D7D0",0x8C5D],
+  ["DBE5",0x8C5F],
+  ["B648",0x8C61],
+  ["B8E6",0x8C62],
+  ["E056",0x8C64],
+  ["E055",0x8C65],
+  ["E057",0x8C66],
+  ["E451",0x8C68],
+  ["E452",0x8C69],
+  ["BBA8",0x8C6A],
+  ["BFDD",0x8C6B],
+  ["BDDE",0x8C6C],
+  ["BFDE",0x8C6D],
+  ["EEB5",0x8C6F],
+  ["EEB2",0x8C70],
+  ["EEB4",0x8C71],
+  ["EEB3",0x8C72],
+  ["C1C7",0x8C73],
+  ["F0EF",0x8C75],
+  ["F346",0x8C76],
+  ["F345",0x8C77],
+  ["CBA4",0x8C78],
+  ["B05C",0x8C79],
+  ["B05B",0x8C7A],
+  ["D3E0",0x8C7B],
+  ["D7D1",0x8C7D],
+  ["DBE7",0x8C80],
+  ["DBE6",0x8C81],
+  ["B649",0x8C82],
+  ["E059",0x8C84],
+  ["E05A",0x8C85],
+  ["E058",0x8C86],
+  ["B8E8",0x8C89],
+  ["B8E7",0x8C8A],
+  ["BBAA",0x8C8C],
+  ["BBA9",0x8C8D],
+  ["E7E7",0x8C8F],
+  ["EBB3",0x8C90],
+  ["EBB1",0x8C91],
+  ["EBB2",0x8C92],
+  ["BFDF",0x8C93],
+  ["EEB7",0x8C94],
+  ["EEB6",0x8C95],
+  ["F0F2",0x8C97],
+  ["F0F1",0x8C98],
+  ["F0F0",0x8C99],
+  ["F347",0x8C9A],
+  ["F9AA",0x8C9C],
+  ["A8A9",0x8C9D],
+  ["AD73",0x8C9E],
+  ["AD74",0x8CA0],
+  ["B05D",0x8CA1],
+  ["B05E",0x8CA2],
+  ["D3E2",0x8CA3],
+  ["D3E1",0x8CA4],
+  ["D7D2",0x8CA5],
+  ["B368",0x8CA7],
+  ["B366",0x8CA8],
+  ["B363",0x8CA9],
+  ["B367",0x8CAA],
+  ["B365",0x8CAB],
+  ["B364",0x8CAC],
+  ["B64A",0x8CAF],
+  ["DBEA",0x8CB0],
+  ["B8ED",0x8CB2],
+  ["B64C",0x8CB3],
+  ["B651",0x8CB4],
+  ["DBEC",0x8CB5],
+  ["B653",0x8CB6],
+  ["B652",0x8CB7],
+  ["B655",0x8CB8],
+  ["DBEB",0x8CB9],
+  ["DBE8",0x8CBA],
+  ["B64F",0x8CBB],
+  ["B64B",0x8CBC],
+  ["B64D",0x8CBD],
+  ["DBE9",0x8CBE],
+  ["B654",0x8CBF],
+  ["B650",0x8CC0],
+  ["B64E",0x8CC1],
+  ["B8EF",0x8CC2],
+  ["B8EE",0x8CC3],
+  ["B8EC",0x8CC4],
+  ["B8F0",0x8CC5],
+  ["B8EA",0x8CC7],
+  ["B8EB",0x8CC8],
+  ["B8E9",0x8CCA],
+  ["E05B",0x8CCC],
+  ["E454",0x8CCF],
+  ["BBAC",0x8CD1],
+  ["BBAD",0x8CD2],
+  ["BBAB",0x8CD3],
+  ["E453",0x8CD5],
+  ["E455",0x8CD7],
+  ["E7EA",0x8CD9],
+  ["E7EC",0x8CDA],
+  ["BDE7",0x8CDC],
+  ["E7ED",0x8CDD],
+  ["BDE0",0x8CDE],
+  ["E7E9",0x8CDF],
+  ["BDDF",0x8CE0],
+  ["BDE9",0x8CE1],
+  ["BDE5",0x8CE2],
+  ["BDE6",0x8CE3],
+  ["BDE2",0x8CE4],
+  ["E7E8",0x8CE5],
+  ["BDE1",0x8CE6],
+  ["E7EE",0x8CE7],
+  ["E7EB",0x8CE8],
+  ["BDE8",0x8CEA],
+  ["BDE3",0x8CEC],
+  ["BDE4",0x8CED],
+  ["EBB5",0x8CEE],
+  ["EBB7",0x8CF0],
+  ["EBB6",0x8CF1],
+  ["EBB8",0x8CF3],
+  ["BFE0",0x8CF4],
+  ["EBB4",0x8CF5],
+  ["C1CB",0x8CF8],
+  ["EEB8",0x8CF9],
+  ["C1C8",0x8CFA],
+  ["C1CC",0x8CFB],
+  ["C1CA",0x8CFC],
+  ["C1C9",0x8CFD],
+  ["F0F3",0x8CFE],
+  ["F0F6",0x8D00],
+  ["F0F5",0x8D02],
+  ["F0F4",0x8D04],
+  ["C2D8",0x8D05],
+  ["F348",0x8D06],
+  ["F349",0x8D07],
+  ["C3D8",0x8D08],
+  ["F34A",0x8D09],
+  ["C3D9",0x8D0A],
+  ["C4BA",0x8D0D],
+  ["C4B9",0x8D0F],
+  ["F652",0x8D10],
+  ["C542",0x8D13],
+  ["F653",0x8D14],
+  ["F75C",0x8D15],
+  ["C5AB",0x8D16],
+  ["C5AC",0x8D17],
+  ["F845",0x8D19],
+  ["C642",0x8D1B],
+  ["A8AA",0x8D64],
+  ["B36A",0x8D66],
+  ["B369",0x8D67],
+  ["E05C",0x8D68],
+  ["E05D",0x8D69],
+  ["BBAE",0x8D6B],
+  ["EBB9",0x8D6C],
+  ["BDEA",0x8D6D],
+  ["EBBA",0x8D6E],
+  ["EEB9",0x8D6F],
+  ["A8AB",0x8D70],
+  ["D0B2",0x8D72],
+  ["AD76",0x8D73],
+  ["AD75",0x8D74],
+  ["D3E3",0x8D76],
+  ["B05F",0x8D77],
+  ["D3E4",0x8D78],
+  ["D7D5",0x8D79],
+  ["D7D4",0x8D7B],
+  ["D7D3",0x8D7D],
+  ["DBEE",0x8D80],
+  ["B658",0x8D81],
+  ["DBED",0x8D84],
+  ["B657",0x8D85],
+  ["DBEF",0x8D89],
+  ["B656",0x8D8A],
+  ["E05F",0x8D8C],
+  ["E062",0x8D8D],
+  ["E060",0x8D8E],
+  ["E061",0x8D8F],
+  ["E065",0x8D90],
+  ["E05E",0x8D91],
+  ["E066",0x8D92],
+  ["E063",0x8D93],
+  ["E064",0x8D94],
+  ["BBB0",0x8D95],
+  ["E456",0x8D96],
+  ["BBAF",0x8D99],
+  ["E7F2",0x8D9B],
+  ["E7F0",0x8D9C],
+  ["BDEB",0x8D9F],
+  ["E7EF",0x8DA0],
+  ["E7F1",0x8DA1],
+  ["BDEC",0x8DA3],
+  ["EBBB",0x8DA5],
+  ["EBBC",0x8DA7],
+  ["C1CD",0x8DA8],
+  ["F34C",0x8DAA],
+  ["F34E",0x8DAB],
+  ["F34B",0x8DAC],
+  ["F34D",0x8DAD],
+  ["F4D6",0x8DAE],
+  ["F654",0x8DAF],
+  ["F96F",0x8DB2],
+  ["A8AC",0x8DB3],
+  ["AD77",0x8DB4],
+  ["D3E5",0x8DB5],
+  ["D3E7",0x8DB6],
+  ["D3E6",0x8DB7],
+  ["D7D8",0x8DB9],
+  ["B36C",0x8DBA],
+  ["D7D6",0x8DBC],
+  ["B36B",0x8DBE],
+  ["D7D9",0x8DBF],
+  ["D7DA",0x8DC1],
+  ["D7D7",0x8DC2],
+  ["DBFB",0x8DC5],
+  ["B660",0x8DC6],
+  ["DBF3",0x8DC7],
+  ["DBF9",0x8DC8],
+  ["B65B",0x8DCB],
+  ["B65E",0x8DCC],
+  ["DBF2",0x8DCD],
+  ["B659",0x8DCE],
+  ["DBF6",0x8DCF],
+  ["E06C",0x8DD0],
+  ["B65D",0x8DD1],
+  ["DBF1",0x8DD3],
+  ["DBF7",0x8DD5],
+  ["DBF4",0x8DD6],
+  ["DBFA",0x8DD7],
+  ["DBF0",0x8DD8],
+  ["DBF8",0x8DD9],
+  ["B65C",0x8DDA],
+  ["B65F",0x8DDB],
+  ["DBF5",0x8DDC],
+  ["B65A",0x8DDD],
+  ["B8F2",0x8DDF],
+  ["E068",0x8DE0],
+  ["B8F1",0x8DE1],
+  ["E06F",0x8DE2],
+  ["E06E",0x8DE3],
+  ["B8F8",0x8DE4],
+  ["B8F9",0x8DE6],
+  ["E070",0x8DE7],
+  ["B8F3",0x8DE8],
+  ["E06D",0x8DE9],
+  ["B8F7",0x8DEA],
+  ["E072",0x8DEB],
+  ["E069",0x8DEC],
+  ["E06B",0x8DEE],
+  ["B8F4",0x8DEF],
+  ["E067",0x8DF0],
+  ["E06A",0x8DF1],
+  ["E071",0x8DF2],
+  ["B8F5",0x8DF3],
+  ["E073",0x8DF4],
+  ["B8F6",0x8DFA],
+  ["BBB1",0x8DFC],
+  ["E45B",0x8DFD],
+  ["E461",0x8DFE],
+  ["E459",0x8DFF],
+  ["E462",0x8E00],
+  ["E458",0x8E02],
+  ["E45D",0x8E03],
+  ["E463",0x8E04],
+  ["E460",0x8E05],
+  ["E45F",0x8E06],
+  ["E45E",0x8E07],
+  ["E457",0x8E09],
+  ["E45C",0x8E0A],
+  ["E45A",0x8E0D],
+  ["BDF1",0x8E0F],
+  ["BDEE",0x8E10],
+  ["E7FB",0x8E11],
+  ["E841",0x8E12],
+  ["E843",0x8E13],
+  ["E840",0x8E14],
+  ["E7F8",0x8E15],
+  ["E7FA",0x8E16],
+  ["E845",0x8E17],
+  ["E842",0x8E18],
+  ["E7FC",0x8E19],
+  ["E846",0x8E1A],
+  ["E7F9",0x8E1B],
+  ["E844",0x8E1C],
+  ["BDEF",0x8E1D],
+  ["BDF5",0x8E1E],
+  ["BDF3",0x8E1F],
+  ["E7F3",0x8E20],
+  ["BDF4",0x8E21],
+  ["BDF0",0x8E22],
+  ["E7F4",0x8E23],
+  ["E7F6",0x8E24],
+  ["E7F5",0x8E25],
+  ["E7FD",0x8E26],
+  ["E7FE",0x8E27],
+  ["BDF2",0x8E29],
+  ["BDED",0x8E2B],
+  ["E7F7",0x8E2E],
+  ["EBC6",0x8E30],
+  ["BFE2",0x8E31],
+  ["EBBD",0x8E33],
+  ["BFE3",0x8E34],
+  ["BFE6",0x8E35],
+  ["EBC2",0x8E36],
+  ["EBBF",0x8E38],
+  ["BFE5",0x8E39],
+  ["EBC3",0x8E3C],
+  ["EBC4",0x8E3D],
+  ["EBBE",0x8E3E],
+  ["EBC7",0x8E3F],
+  ["EBC0",0x8E40],
+  ["EBC5",0x8E41],
+  ["BFE4",0x8E42],
+  ["BFE1",0x8E44],
+  ["EBC1",0x8E45],
+  ["EEBF",0x8E47],
+  ["C1D0",0x8E48],
+  ["C1CE",0x8E49],
+  ["C1D1",0x8E4A],
+  ["C1CF",0x8E4B],
+  ["EEBE",0x8E4C],
+  ["EEBB",0x8E4D],
+  ["EEBA",0x8E4E],
+  ["EEBD",0x8E50],
+  ["EEBC",0x8E53],
+  ["F145",0x8E54],
+  ["C2DE",0x8E55],
+  ["F0FB",0x8E56],
+  ["F0FA",0x8E57],
+  ["C2D9",0x8E59],
+  ["F141",0x8E5A],
+  ["F140",0x8E5B],
+  ["F0F7",0x8E5C],
+  ["F143",0x8E5D],
+  ["F0FC",0x8E5E],
+  ["C2DD",0x8E5F],
+  ["F0F9",0x8E60],
+  ["F142",0x8E61],
+  ["F0F8",0x8E62],
+  ["C2DA",0x8E63],
+  ["C2DC",0x8E64],
+  ["F0FD",0x8E65],
+  ["C2DB",0x8E66],
+  ["F0FE",0x8E67],
+  ["F144",0x8E69],
+  ["F352",0x8E6A],
+  ["C3DE",0x8E6C],
+  ["F34F",0x8E6D],
+  ["F353",0x8E6F],
+  ["C3DB",0x8E72],
+  ["F351",0x8E73],
+  ["C3E0",0x8E74],
+  ["C3DD",0x8E76],
+  ["F350",0x8E78],
+  ["C3DF",0x8E7A],
+  ["F354",0x8E7B],
+  ["C3DA",0x8E7C],
+  ["C4BC",0x8E81],
+  ["C4BE",0x8E82],
+  ["F4D9",0x8E84],
+  ["C4BD",0x8E85],
+  ["F4D7",0x8E86],
+  ["C3DC",0x8E87],
+  ["F4D8",0x8E88],
+  ["C4BB",0x8E89],
+  ["C543",0x8E8A],
+  ["C545",0x8E8B],
+  ["F656",0x8E8C],
+  ["C544",0x8E8D],
+  ["F655",0x8E8E],
+  ["F761",0x8E90],
+  ["C5AD",0x8E91],
+  ["F760",0x8E92],
+  ["C5AE",0x8E93],
+  ["F75E",0x8E94],
+  ["F75D",0x8E95],
+  ["F762",0x8E96],
+  ["F763",0x8E97],
+  ["F846",0x8E98],
+  ["F75F",0x8E9A],
+  ["F8C6",0x8E9D],
+  ["F8C3",0x8E9E],
+  ["F8C4",0x8E9F],
+  ["F8C5",0x8EA0],
+  ["C65C",0x8EA1],
+  ["F951",0x8EA3],
+  ["F950",0x8EA4],
+  ["F94F",0x8EA5],
+  ["F970",0x8EA6],
+  ["F9BE",0x8EA8],
+  ["F9AB",0x8EA9],
+  ["C66E",0x8EAA],
+  ["A8AD",0x8EAB],
+  ["B060",0x8EAC],
+  ["B8FA",0x8EB2],
+  ["BDF6",0x8EBA],
+  ["EBC8",0x8EBD],
+  ["C2DF",0x8EC0],
+  ["F355",0x8EC2],
+  ["F9AC",0x8EC9],
+  ["A8AE",0x8ECA],
+  ["AAEE",0x8ECB],
+  ["AD79",0x8ECC],
+  ["AD78",0x8ECD],
+  ["B063",0x8ECF],
+  ["D3E8",0x8ED1],
+  ["B061",0x8ED2],
+  ["D3E9",0x8ED3],
+  ["B062",0x8ED4],
+  ["D7DF",0x8ED7],
+  ["D7DB",0x8ED8],
+  ["B36D",0x8EDB],
+  ["D7DE",0x8EDC],
+  ["D7DD",0x8EDD],
+  ["D7DC",0x8EDE],
+  ["B36E",0x8EDF],
+  ["D7E0",0x8EE0],
+  ["D7E1",0x8EE1],
+  ["DC43",0x8EE5],
+  ["DC41",0x8EE6],
+  ["DC45",0x8EE7],
+  ["DC46",0x8EE8],
+  ["DC4C",0x8EE9],
+  ["DC48",0x8EEB],
+  ["DC4A",0x8EEC],
+  ["DC42",0x8EEE],
+  ["DBFC",0x8EEF],
+  ["DC49",0x8EF1],
+  ["DC4B",0x8EF4],
+  ["DC44",0x8EF5],
+  ["DC47",0x8EF6],
+  ["DBFD",0x8EF7],
+  ["B662",0x8EF8],
+  ["DC40",0x8EF9],
+  ["DBFE",0x8EFA],
+  ["B661",0x8EFB],
+  ["B663",0x8EFC],
+  ["B8FD",0x8EFE],
+  ["E075",0x8EFF],
+  ["E077",0x8F00],
+  ["E076",0x8F01],
+  ["E07B",0x8F02],
+  ["B8FB",0x8F03],
+  ["E078",0x8F05],
+  ["E074",0x8F06],
+  ["E079",0x8F07],
+  ["E07A",0x8F08],
+  ["B8FC",0x8F09],
+  ["B8FE",0x8F0A],
+  ["E07C",0x8F0B],
+  ["E467",0x8F0D],
+  ["E466",0x8F0E],
+  ["E464",0x8F10],
+  ["E465",0x8F11],
+  ["BBB3",0x8F12],
+  ["BBB5",0x8F13],
+  ["BBB2",0x8F14],
+  ["BBB4",0x8F15],
+  ["E84D",0x8F16],
+  ["E84E",0x8F17],
+  ["E849",0x8F18],
+  ["E84A",0x8F1A],
+  ["BDF8",0x8F1B],
+  ["BDFD",0x8F1C],
+  ["BDF7",0x8F1D],
+  ["BDFE",0x8F1E],
+  ["BDF9",0x8F1F],
+  ["E84B",0x8F20],
+  ["E84C",0x8F23],
+  ["E848",0x8F24],
+  ["BE40",0x8F25],
+  ["BDFB",0x8F26],
+  ["BDFA",0x8F29],
+  ["BDFC",0x8F2A],
+  ["E847",0x8F2C],
+  ["EBCA",0x8F2E],
+  ["BFE8",0x8F2F],
+  ["EBCC",0x8F32],
+  ["BFEA",0x8F33],
+  ["EBCF",0x8F34],
+  ["EBCB",0x8F35],
+  ["EBC9",0x8F36],
+  ["EBCE",0x8F37],
+  ["BFE9",0x8F38],
+  ["EBCD",0x8F39],
+  ["BFE7",0x8F3B],
+  ["C1D3",0x8F3E],
+  ["C1D6",0x8F3F],
+  ["EEC1",0x8F40],
+  ["C1D4",0x8F42],
+  ["EEC0",0x8F43],
+  ["C1D2",0x8F44],
+  ["C1D5",0x8F45],
+  ["F146",0x8F46],
+  ["F147",0x8F47],
+  ["F148",0x8F48],
+  ["C2E0",0x8F49],
+  ["F149",0x8F4B],
+  ["C2E1",0x8F4D],
+  ["C3E2",0x8F4E],
+  ["F358",0x8F4F],
+  ["F359",0x8F50],
+  ["F357",0x8F51],
+  ["F356",0x8F52],
+  ["F35A",0x8F53],
+  ["C3E1",0x8F54],
+  ["F4DD",0x8F55],
+  ["F4DB",0x8F56],
+  ["F4DC",0x8F57],
+  ["F4DE",0x8F58],
+  ["F4DA",0x8F59],
+  ["F4DF",0x8F5A],
+  ["F658",0x8F5B],
+  ["F659",0x8F5D],
+  ["F657",0x8F5E],
+  ["C546",0x8F5F],
+  ["F764",0x8F60],
+  ["C5AF",0x8F61],
+  ["F765",0x8F62],
+  ["F848",0x8F63],
+  ["F847",0x8F64],
+  ["A8AF",0x8F9B],
+  ["B664",0x8F9C],
+  ["B940",0x8F9F],
+  ["BBB6",0x8FA3],
+  ["BFEC",0x8FA6],
+  ["BFEB",0x8FA8],
+  ["C3E3",0x8FAD],
+  ["C47C",0x8FAE],
+  ["C547",0x8FAF],
+  ["A8B0",0x8FB0],
+  ["B064",0x8FB1],
+  ["B941",0x8FB2],
+  ["F35B",0x8FB4],
+  ["CBA6",0x8FBF],
+  ["A8B1",0x8FC2],
+  ["A8B4",0x8FC4],
+  ["A8B3",0x8FC5],
+  ["A8B2",0x8FC6],
+  ["CBA5",0x8FC9],
+  ["CDCD",0x8FCB],
+  ["CDCF",0x8FCD],
+  ["AAEF",0x8FCE],
+  ["AAF1",0x8FD1],
+  ["CDCC",0x8FD2],
+  ["CDCE",0x8FD3],
+  ["AAF0",0x8FD4],
+  ["CDD1",0x8FD5],
+  ["CDD0",0x8FD6],
+  ["CDD2",0x8FD7],
+  ["D0B6",0x8FE0],
+  ["D0B4",0x8FE1],
+  ["AD7C",0x8FE2],
+  ["D0B3",0x8FE3],
+  ["ADA3",0x8FE4],
+  ["AD7E",0x8FE5],
+  ["AD7B",0x8FE6],
+  ["ADA4",0x8FE8],
+  ["AD7D",0x8FEA],
+  ["ADA2",0x8FEB],
+  ["ADA1",0x8FED],
+  ["D0B5",0x8FEE],
+  ["AD7A",0x8FF0],
+  ["B06A",0x8FF4],
+  ["D3EB",0x8FF5],
+  ["D3F1",0x8FF6],
+  ["B067",0x8FF7],
+  ["B06E",0x8FF8],
+  ["B069",0x8FFA],
+  ["D3EE",0x8FFB],
+  ["D3F0",0x8FFC],
+  ["B06C",0x8FFD],
+  ["D3EA",0x8FFE],
+  ["D3ED",0x8FFF],
+  ["B068",0x9000],
+  ["B065",0x9001],
+  ["D3EC",0x9002],
+  ["B06B",0x9003],
+  ["D3EF",0x9004],
+  ["B06D",0x9005],
+  ["B066",0x9006],
+  ["D7E3",0x900B],
+  ["D7E6",0x900C],
+  ["B370",0x900D],
+  ["B37A",0x900F],
+  ["B376",0x9010],
+  ["D7E4",0x9011],
+  ["B37E",0x9014],
+  ["B377",0x9015],
+  ["B37C",0x9016],
+  ["B372",0x9017],
+  ["B36F",0x9019],
+  ["B371",0x901A],
+  ["B37D",0x901B],
+  ["D7E5",0x901C],
+  ["B375",0x901D],
+  ["B378",0x901E],
+  ["B374",0x901F],
+  ["B379",0x9020],
+  ["D7E7",0x9021],
+  ["B37B",0x9022],
+  ["B373",0x9023],
+  ["D7E2",0x9024],
+  ["DC4D",0x902D],
+  ["B665",0x902E],
+  ["DC4F",0x902F],
+  ["B667",0x9031],
+  ["B669",0x9032],
+  ["DC4E",0x9034],
+  ["B666",0x9035],
+  ["B66A",0x9036],
+  ["B668",0x9038],
+  ["B947",0x903C],
+  ["E0A3",0x903D],
+  ["B94F",0x903E],
+  ["E07E",0x903F],
+  ["B950",0x9041],
+  ["B945",0x9042],
+  ["E0A1",0x9044],
+  ["B94A",0x9047],
+  ["E0A2",0x9049],
+  ["B943",0x904A],
+  ["B942",0x904B],
+  ["B94D",0x904D],
+  ["B94C",0x904E],
+  ["B94B",0x904F],
+  ["B949",0x9050],
+  ["B94E",0x9051],
+  ["E07D",0x9052],
+  ["B944",0x9053],
+  ["B946",0x9054],
+  ["B948",0x9055],
+  ["BBB8",0x9058],
+  ["BBBB",0x9059],
+  ["BBBF",0x905B],
+  ["BBB9",0x905C],
+  ["BBBE",0x905D],
+  ["BBBC",0x905E],
+  ["BBB7",0x9060],
+  ["BBBD",0x9062],
+  ["BBBA",0x9063],
+  ["E852",0x9067],
+  ["BE43",0x9068],
+  ["BE41",0x9069],
+  ["E853",0x906B],
+  ["BE44",0x906D],
+  ["BE42",0x906E],
+  ["E851",0x906F],
+  ["E850",0x9070],
+  ["BFF0",0x9072],
+  ["E84F",0x9073],
+  ["BFEE",0x9074],
+  ["BFED",0x9075],
+  ["EBD0",0x9076],
+  ["BE45",0x9077],
+  ["BFEF",0x9078],
+  ["EBD1",0x9079],
+  ["BFF2",0x907A],
+  ["EBD2",0x907B],
+  ["BFF1",0x907C],
+  ["C1D8",0x907D],
+  ["EEC3",0x907E],
+  ["C1D7",0x907F],
+  ["C1DC",0x9080],
+  ["C1DA",0x9081],
+  ["C1DB",0x9082],
+  ["C2E3",0x9083],
+  ["C1D9",0x9084],
+  ["EEC2",0x9085],
+  ["EBD3",0x9086],
+  ["C2E2",0x9087],
+  ["C2E4",0x9088],
+  ["C3E4",0x908A],
+  ["C3E5",0x908B],
+  ["F4E0",0x908D],
+  ["C5DE",0x908F],
+  ["C5DD",0x9090],
+  ["A8B6",0x9091],
+  ["CA55",0x9094],
+  ["B06F",0x9095],
+  ["CA52",0x9097],
+  ["CA53",0x9098],
+  ["CA51",0x9099],
+  ["CA54",0x909B],
+  ["CBAA",0x909E],
+  ["CBA7",0x909F],
+  ["CBAC",0x90A0],
+  ["CBA8",0x90A1],
+  ["A8B7",0x90A2],
+  ["A8BA",0x90A3],
+  ["CBA9",0x90A5],
+  ["A8B9",0x90A6],
+  ["CBAB",0x90A7],
+  ["A8B8",0x90AA],
+  ["CDD5",0x90AF],
+  ["CDD7",0x90B0],
+  ["AAF4",0x90B1],
+  ["CDD3",0x90B2],
+  ["CDD6",0x90B3],
+  ["CDD4",0x90B4],
+  ["AAF2",0x90B5],
+  ["AAF5",0x90B6],
+  ["AAF3",0x90B8],
+  ["D0B8",0x90BD],
+  ["D0BC",0x90BE],
+  ["D0B9",0x90BF],
+  ["ADA7",0x90C1],
+  ["ADA8",0x90C3],
+  ["D0BB",0x90C5],
+  ["D0BD",0x90C7],
+  ["D0BF",0x90C8],
+  ["ADA5",0x90CA],
+  ["D0BE",0x90CB],
+  ["ADA6",0x90CE],
+  ["D7EE",0x90D4],
+  ["D0BA",0x90D5],
+  ["D3F2",0x90D6],
+  ["D3FB",0x90D7],
+  ["D3F9",0x90D8],
+  ["D3F4",0x90D9],
+  ["D3F5",0x90DA],
+  ["D3FA",0x90DB],
+  ["D3FC",0x90DC],
+  ["B071",0x90DD],
+  ["D3F7",0x90DF],
+  ["D3F3",0x90E0],
+  ["B070",0x90E1],
+  ["B072",0x90E2],
+  ["D3F6",0x90E3],
+  ["D3FD",0x90E4],
+  ["D3F8",0x90E5],
+  ["B3A1",0x90E8],
+  ["D7F1",0x90E9],
+  ["D7E9",0x90EA],
+  ["D7EF",0x90EB],
+  ["D7F0",0x90EC],
+  ["B3A2",0x90ED],
+  ["D7E8",0x90EF],
+  ["D7EA",0x90F0],
+  ["D0B7",0x90F1],
+  ["D7EC",0x90F2],
+  ["D7ED",0x90F3],
+  ["D7EB",0x90F4],
+  ["B66C",0x90F5],
+  ["DC56",0x90F9],
+  ["EBD4",0x90FA],
+  ["DC57",0x90FB],
+  ["DC54",0x90FC],
+  ["B3A3",0x90FD],
+  ["B66E",0x90FE],
+  ["DC53",0x90FF],
+  ["DC59",0x9100],
+  ["DC58",0x9101],
+  ["B66B",0x9102],
+  ["DC5C",0x9103],
+  ["DC52",0x9104],
+  ["DC5B",0x9105],
+  ["DC50",0x9106],
+  ["DC5A",0x9107],
+  ["DC55",0x9108],
+  ["B66D",0x9109],
+  ["E0AA",0x910B],
+  ["E0A5",0x910D],
+  ["E0AB",0x910E],
+  ["E0A6",0x910F],
+  ["E0A4",0x9110],
+  ["E0A7",0x9111],
+  ["B951",0x9112],
+  ["E0A9",0x9114],
+  ["E0A8",0x9116],
+  ["B952",0x9117],
+  ["BBC1",0x9118],
+  ["BBC0",0x9119],
+  ["E46E",0x911A],
+  ["E471",0x911B],
+  ["E469",0x911C],
+  ["E46D",0x911D],
+  ["BBC2",0x911E],
+  ["E46C",0x911F],
+  ["E46A",0x9120],
+  ["E470",0x9121],
+  ["E46B",0x9122],
+  ["E468",0x9123],
+  ["E46F",0x9124],
+  ["E859",0x9126],
+  ["BE48",0x9127],
+  ["F14A",0x9128],
+  ["E856",0x9129],
+  ["E857",0x912A],
+  ["E855",0x912B],
+  ["DC51",0x912C],
+  ["BE47",0x912D],
+  ["E85A",0x912E],
+  ["E854",0x912F],
+  ["BE46",0x9130],
+  ["BE49",0x9131],
+  ["E858",0x9132],
+  ["EBD5",0x9133],
+  ["BFF3",0x9134],
+  ["EBD6",0x9135],
+  ["EBD7",0x9136],
+  ["EEC4",0x9138],
+  ["C1DD",0x9139],
+  ["F14B",0x913A],
+  ["F14C",0x913B],
+  ["F14D",0x913E],
+  ["F35D",0x913F],
+  ["F35C",0x9140],
+  ["F4E2",0x9141],
+  ["F4E1",0x9143],
+  ["F65B",0x9144],
+  ["F65C",0x9145],
+  ["F65A",0x9146],
+  ["F766",0x9147],
+  ["C5B0",0x9148],
+  ["A8BB",0x9149],
+  ["ADAA",0x914A],
+  ["ADA9",0x914B],
+  ["B075",0x914C],
+  ["B074",0x914D],
+  ["D440",0x914E],
+  ["D441",0x914F],
+  ["D3FE",0x9150],
+  ["B073",0x9152],
+  ["D7F5",0x9153],
+  ["D7F6",0x9155],
+  ["D7F2",0x9156],
+  ["B3A4",0x9157],
+  ["D7F3",0x9158],
+  ["D7F4",0x915A],
+  ["DC5F",0x915F],
+  ["DC61",0x9160],
+  ["DC5D",0x9161],
+  ["DC60",0x9162],
+  ["B66F",0x9163],
+  ["DC5E",0x9164],
+  ["B670",0x9165],
+  ["DD73",0x9168],
+  ["B955",0x9169],
+  ["B954",0x916A],
+  ["B953",0x916C],
+  ["E0AC",0x916E],
+  ["E0AD",0x916F],
+  ["E473",0x9172],
+  ["E475",0x9173],
+  ["BBC6",0x9174],
+  ["BBC3",0x9175],
+  ["BBC5",0x9177],
+  ["BBC4",0x9178],
+  ["E474",0x9179],
+  ["E472",0x917A],
+  ["E861",0x9180],
+  ["E85E",0x9181],
+  ["E85F",0x9182],
+  ["BE4D",0x9183],
+  ["E860",0x9184],
+  ["E85B",0x9185],
+  ["E85C",0x9186],
+  ["BE4A",0x9187],
+  ["BE4B",0x9189],
+  ["E85D",0x918A],
+  ["BE4C",0x918B],
+  ["EBDB",0x918D],
+  ["EBDC",0x918F],
+  ["EBD9",0x9190],
+  ["EBDA",0x9191],
+  ["BFF4",0x9192],
+  ["EBD8",0x9193],
+  ["EEC8",0x9199],
+  ["EEC5",0x919A],
+  ["EEC7",0x919B],
+  ["C1E0",0x919C],
+  ["EECB",0x919D],
+  ["C1DF",0x919E],
+  ["EEC9",0x919F],
+  ["EECC",0x91A0],
+  ["EECA",0x91A1],
+  ["EEC6",0x91A2],
+  ["C1DE",0x91A3],
+  ["F14F",0x91A5],
+  ["F150",0x91A7],
+  ["F14E",0x91A8],
+  ["F152",0x91AA],
+  ["C2E5",0x91AB],
+  ["C2E6",0x91AC],
+  ["F35F",0x91AD],
+  ["C3E7",0x91AE],
+  ["F151",0x91AF],
+  ["F35E",0x91B0],
+  ["C3E6",0x91B1],
+  ["F4E5",0x91B2],
+  ["F4E6",0x91B3],
+  ["C4BF",0x91B4],
+  ["F4E4",0x91B5],
+  ["F4E3",0x91B7],
+  ["F65D",0x91B9],
+  ["C548",0x91BA],
+  ["F849",0x91BC],
+  ["F8C8",0x91BD],
+  ["F8C7",0x91BE],
+  ["C643",0x91C0],
+  ["C65D",0x91C1],
+  ["F8C9",0x91C2],
+  ["F971",0x91C3],
+  ["C66F",0x91C5],
+  ["A8BC",0x91C6],
+  ["AAF6",0x91C7],
+  ["B956",0x91C9],
+  ["C4C0",0x91CB],
+  ["A8BD",0x91CC],
+  ["ADAB",0x91CD],
+  ["B3A5",0x91CE],
+  ["B671",0x91CF],
+  ["C2E7",0x91D0],
+  ["AAF7",0x91D1],
+  ["D0C1",0x91D3],
+  ["D0C0",0x91D4],
+  ["D442",0x91D5],
+  ["B078",0x91D7],
+  ["B076",0x91D8],
+  ["B07A",0x91D9],
+  ["D444",0x91DA],
+  ["B079",0x91DC],
+  ["B077",0x91DD],
+  ["D443",0x91E2],
+  ["B3A8",0x91E3],
+  ["D7FC",0x91E4],
+  ["B3A7",0x91E6],
+  ["B3A9",0x91E7],
+  ["D842",0x91E8],
+  ["B3AB",0x91E9],
+  ["D7FE",0x91EA],
+  ["D840",0x91EB],
+  ["D7F7",0x91EC],
+  ["B3AA",0x91ED],
+  ["D843",0x91EE],
+  ["D7F9",0x91F1],
+  ["D7FA",0x91F3],
+  ["D7F8",0x91F4],
+  ["B3A6",0x91F5],
+  ["D841",0x91F7],
+  ["D7FB",0x91F8],
+  ["D7FD",0x91F9],
+  ["DC6D",0x91FD],
+  ["DC6C",0x91FF],
+  ["DC6A",0x9200],
+  ["DC62",0x9201],
+  ["DC71",0x9202],
+  ["DC65",0x9203],
+  ["DC6F",0x9204],
+  ["DC76",0x9205],
+  ["DC6E",0x9206],
+  ["B679",0x9207],
+  ["B675",0x9209],
+  ["DC63",0x920A],
+  ["DC69",0x920C],
+  ["B677",0x920D],
+  ["DC68",0x920F],
+  ["B678",0x9210],
+  ["B67A",0x9211],
+  ["DC6B",0x9212],
+  ["B672",0x9214],
+  ["B673",0x9215],
+  ["DC77",0x9216],
+  ["DC75",0x9217],
+  ["DC74",0x9219],
+  ["DC66",0x921A],
+  ["DC72",0x921C],
+  ["B676",0x921E],
+  ["B674",0x9223],
+  ["DC73",0x9224],
+  ["DC64",0x9225],
+  ["DC67",0x9226],
+  ["DC70",0x9227],
+  ["E4BA",0x922D],
+  ["E0B7",0x922E],
+  ["E0B0",0x9230],
+  ["E0C3",0x9231],
+  ["E0CC",0x9232],
+  ["E0B3",0x9233],
+  ["B961",0x9234],
+  ["E0C0",0x9236],
+  ["B957",0x9237],
+  ["B959",0x9238],
+  ["B965",0x9239],
+  ["E0B1",0x923A],
+  ["B95A",0x923D],
+  ["B95C",0x923E],
+  ["B966",0x923F],
+  ["B95B",0x9240],
+  ["B964",0x9245],
+  ["E0B9",0x9246],
+  ["E0AE",0x9248],
+  ["B962",0x9249],
+  ["E0B8",0x924A],
+  ["B95E",0x924B],
+  ["E0CA",0x924C],
+  ["B963",0x924D],
+  ["E0C8",0x924E],
+  ["E0BC",0x924F],
+  ["E0C6",0x9250],
+  ["B960",0x9251],
+  ["E0AF",0x9252],
+  ["E0C9",0x9253],
+  ["E0C4",0x9254],
+  ["E0CB",0x9256],
+  ["B958",0x9257],
+  ["B967",0x925A],
+  ["B95D",0x925B],
+  ["E0B5",0x925E],
+  ["E0BD",0x9260],
+  ["E0C1",0x9261],
+  ["E0C5",0x9263],
+  ["B95F",0x9264],
+  ["E0B4",0x9265],
+  ["E0B2",0x9266],
+  ["E0BE",0x9267],
+  ["E0BB",0x926C],
+  ["E0BA",0x926D],
+  ["E0BF",0x926F],
+  ["E0C2",0x9270],
+  ["E0C7",0x9272],
+  ["E478",0x9276],
+  ["BBC7",0x9278],
+  ["E4A4",0x9279],
+  ["E47A",0x927A],
+  ["BBCC",0x927B],
+  ["BBD0",0x927C],
+  ["E4AD",0x927D],
+  ["E4B5",0x927E],
+  ["E4A6",0x927F],
+  ["BBC8",0x9280],
+  ["E4AA",0x9282],
+  ["E0B6",0x9283],
+  ["BBC9",0x9285],
+  ["E4B1",0x9286],
+  ["E4B6",0x9287],
+  ["E4AE",0x9288],
+  ["E4B0",0x928A],
+  ["E4B9",0x928B],
+  ["E4B2",0x928C],
+  ["E47E",0x928D],
+  ["E4A9",0x928E],
+  ["BBD1",0x9291],
+  ["BBCD",0x9293],
+  ["E47C",0x9294],
+  ["E4AB",0x9295],
+  ["BBCB",0x9296],
+  ["E4A5",0x9297],
+  ["BBCA",0x9298],
+  ["E4B3",0x9299],
+  ["E4A2",0x929A],
+  ["E479",0x929B],
+  ["BBCE",0x929C],
+  ["E4B8",0x929D],
+  ["E47B",0x92A0],
+  ["E4AF",0x92A1],
+  ["E4AC",0x92A2],
+  ["E4A7",0x92A3],
+  ["E477",0x92A4],
+  ["E476",0x92A5],
+  ["E4A1",0x92A6],
+  ["E4B4",0x92A7],
+  ["BBCF",0x92A8],
+  ["E4B7",0x92A9],
+  ["E47D",0x92AA],
+  ["E4A3",0x92AB],
+  ["BE52",0x92AC],
+  ["BE5A",0x92B2],
+  ["BE55",0x92B3],
+  ["E8A4",0x92B4],
+  ["E8A1",0x92B5],
+  ["E867",0x92B6],
+  ["BE50",0x92B7],
+  ["BE4F",0x92BB],
+  ["BE56",0x92BC],
+  ["E865",0x92C0],
+  ["BE54",0x92C1],
+  ["E871",0x92C2],
+  ["E863",0x92C3],
+  ["E864",0x92C4],
+  ["BE4E",0x92C5],
+  ["E8A3",0x92C6],
+  ["BE58",0x92C7],
+  ["E874",0x92C8],
+  ["E879",0x92C9],
+  ["E873",0x92CA],
+  ["EBEE",0x92CB],
+  ["E86F",0x92CC],
+  ["E877",0x92CD],
+  ["E875",0x92CE],
+  ["E868",0x92CF],
+  ["E862",0x92D0],
+  ["E87D",0x92D1],
+  ["BE57",0x92D2],
+  ["E87E",0x92D3],
+  ["E878",0x92D5],
+  ["E86D",0x92D7],
+  ["E86B",0x92D8],
+  ["E866",0x92D9],
+  ["E86E",0x92DD],
+  ["E87B",0x92DE],
+  ["E86A",0x92DF],
+  ["E87A",0x92E0],
+  ["E8A2",0x92E1],
+  ["BE53",0x92E4],
+  ["E876",0x92E6],
+  ["E87C",0x92E7],
+  ["E872",0x92E8],
+  ["E86C",0x92E9],
+  ["BE51",0x92EA],
+  ["E4A8",0x92EE],
+  ["E870",0x92EF],
+  ["BE59",0x92F0],
+  ["E869",0x92F1],
+  ["EBF4",0x92F7],
+  ["BFF7",0x92F8],
+  ["EBF3",0x92F9],
+  ["EBF0",0x92FA],
+  ["EC44",0x92FB],
+  ["BFFB",0x92FC],
+  ["EC41",0x92FE],
+  ["EBF8",0x92FF],
+  ["EC43",0x9300],
+  ["EBE9",0x9301],
+  ["EBF6",0x9302],
+  ["BFFD",0x9304],
+  ["EBE1",0x9306],
+  ["EBDF",0x9308],
+  ["EC42",0x9309],
+  ["EC40",0x930B],
+  ["EBFE",0x930C],
+  ["EBED",0x930D],
+  ["EBEC",0x930E],
+  ["EBE2",0x930F],
+  ["C040",0x9310],
+  ["EBE8",0x9312],
+  ["EBF2",0x9313],
+  ["EBFD",0x9314],
+  ["C043",0x9315],
+  ["EC45",0x9316],
+  ["C1E8",0x9318],
+  ["C045",0x9319],
+  ["BFFE",0x931A],
+  ["EBE6",0x931B],
+  ["EBEF",0x931D],
+  ["EBDE",0x931E],
+  ["EBE0",0x931F],
+  ["BFF5",0x9320],
+  ["C042",0x9321],
+  ["BFFA",0x9322],
+  ["EBE7",0x9323],
+  ["EBF7",0x9324],
+  ["EBF1",0x9325],
+  ["C041",0x9326],
+  ["EBDD",0x9327],
+  ["C1E3",0x9328],
+  ["EBF9",0x9329],
+  ["EBFC",0x932A],
+  ["BFFC",0x932B],
+  ["EBEB",0x932D],
+  ["C044",0x932E],
+  ["BFF9",0x932F],
+  ["BFF8",0x9333],
+  ["EBF5",0x9334],
+  ["EBFB",0x9335],
+  ["BFF6",0x9336],
+  ["EBE4",0x9338],
+  ["EBFA",0x9339],
+  ["EBE5",0x933C],
+  ["EBEA",0x9346],
+  ["EED2",0x9347],
+  ["EED7",0x9349],
+  ["C1E5",0x934A],
+  ["C1E7",0x934B],
+  ["EEDD",0x934C],
+  ["C1E1",0x934D],
+  ["EEEC",0x934E],
+  ["EEE3",0x934F],
+  ["EED8",0x9350],
+  ["EED9",0x9351],
+  ["EEE2",0x9352],
+  ["C1EE",0x9354],
+  ["EEE1",0x9355],
+  ["EED1",0x9356],
+  ["EEE0",0x9357],
+  ["EED4",0x9358],
+  ["EEED",0x9359],
+  ["C1ED",0x935A],
+  ["C1EB",0x935B],
+  ["EED5",0x935C],
+  ["EEE8",0x935E],
+  ["EEDA",0x9360],
+  ["EEE7",0x9361],
+  ["EEE9",0x9363],
+  ["EED0",0x9364],
+  ["C1E6",0x9365],
+  ["EEEA",0x9367],
+  ["EEDE",0x936A],
+  ["C1EA",0x936C],
+  ["EEDB",0x936D],
+  ["C1EC",0x9370],
+  ["EEE4",0x9371],
+  ["C1E4",0x9375],
+  ["EED6",0x9376],
+  ["EEE5",0x9377],
+  ["EEDF",0x9379],
+  ["EBE3",0x937A],
+  ["EEE6",0x937B],
+  ["EED3",0x937C],
+  ["C1E9",0x937E],
+  ["EEEB",0x9380],
+  ["C1E2",0x9382],
+  ["EECE",0x9383],
+  ["F160",0x9388],
+  ["F159",0x9389],
+  ["C2E9",0x938A],
+  ["F154",0x938C],
+  ["F163",0x938D],
+  ["F15B",0x938E],
+  ["EEDC",0x938F],
+  ["F165",0x9391],
+  ["F155",0x9392],
+  ["C2E8",0x9394],
+  ["F15F",0x9395],
+  ["C2EA",0x9396],
+  ["C2F2",0x9397],
+  ["C2F0",0x9398],
+  ["F161",0x9399],
+  ["C2F1",0x939A],
+  ["F157",0x939B],
+  ["F158",0x939D],
+  ["F15D",0x939E],
+  ["F162",0x939F],
+  ["EECD",0x93A1],
+  ["C2EB",0x93A2],
+  ["F16A",0x93A3],
+  ["F167",0x93A4],
+  ["F16B",0x93A5],
+  ["F15E",0x93A6],
+  ["F15A",0x93A7],
+  ["F168",0x93A8],
+  ["F36A",0x93A9],
+  ["F15C",0x93AA],
+  ["C2EE",0x93AC],
+  ["C2ED",0x93AE],
+  ["EECF",0x93AF],
+  ["C2EF",0x93B0],
+  ["F164",0x93B1],
+  ["F166",0x93B2],
+  ["C2EC",0x93B3],
+  ["F169",0x93B4],
+  ["F153",0x93B5],
+  ["F156",0x93B7],
+  ["F373",0x93C0],
+  ["F363",0x93C2],
+  ["C3EB",0x93C3],
+  ["F371",0x93C4],
+  ["F361",0x93C7],
+  ["C3EC",0x93C8],
+  ["F36C",0x93CA],
+  ["F368",0x93CC],
+  ["C3F1",0x93CD],
+  ["F372",0x93CE],
+  ["F362",0x93CF],
+  ["F365",0x93D0],
+  ["C3E9",0x93D1],
+  ["F374",0x93D2],
+  ["F36D",0x93D4],
+  ["F370",0x93D5],
+  ["C3EF",0x93D6],
+  ["C3F4",0x93D7],
+  ["C3F2",0x93D8],
+  ["F369",0x93D9],
+  ["F364",0x93DA],
+  ["C3ED",0x93DC],
+  ["C3EE",0x93DD],
+  ["F360",0x93DE],
+  ["C3EA",0x93DF],
+  ["C3E8",0x93E1],
+  ["C3F0",0x93E2],
+  ["F36F",0x93E3],
+  ["C3F3",0x93E4],
+  ["F36B",0x93E6],
+  ["F375",0x93E7],
+  ["C3F5",0x93E8],
+  ["F367",0x93EC],
+  ["F36E",0x93EE],
+  ["F4F3",0x93F5],
+  ["F542",0x93F6],
+  ["F4F5",0x93F7],
+  ["F4FC",0x93F8],
+  ["F366",0x93F9],
+  ["F4FA",0x93FA],
+  ["F4E9",0x93FB],
+  ["F540",0x93FC],
+  ["C4C3",0x93FD],
+  ["F4ED",0x93FE],
+  ["F4FE",0x93FF],
+  ["F4F4",0x9400],
+  ["C4C2",0x9403],
+  ["F544",0x9406],
+  ["F4F6",0x9407],
+  ["F4FB",0x9409],
+  ["F4FD",0x940A],
+  ["F4E7",0x940B],
+  ["F541",0x940C],
+  ["F4F2",0x940D],
+  ["F4F7",0x940E],
+  ["F4EB",0x940F],
+  ["F4EF",0x9410],
+  ["F543",0x9411],
+  ["F4F9",0x9412],
+  ["F4E8",0x9413],
+  ["F4EC",0x9414],
+  ["F4EE",0x9415],
+  ["F4F8",0x9416],
+  ["C4C1",0x9418],
+  ["F4F1",0x9419],
+  ["F4EA",0x9420],
+  ["F4F0",0x9428],
+  ["F661",0x9429],
+  ["F666",0x942A],
+  ["C54F",0x942B],
+  ["F668",0x942C],
+  ["C549",0x942E],
+  ["F664",0x9430],
+  ["F66A",0x9431],
+  ["C54E",0x9432],
+  ["C54A",0x9433],
+  ["C54B",0x9435],
+  ["F660",0x9436],
+  ["F667",0x9437],
+  ["C54D",0x9438],
+  ["F665",0x9439],
+  ["C54C",0x943A],
+  ["F65F",0x943B],
+  ["F663",0x943C],
+  ["F662",0x943D],
+  ["F65E",0x943F],
+  ["F669",0x9440],
+  ["C5B1",0x9444],
+  ["F76D",0x9445],
+  ["F770",0x9446],
+  ["F76C",0x9447],
+  ["F76E",0x9448],
+  ["F76F",0x9449],
+  ["F769",0x944A],
+  ["F76A",0x944B],
+  ["F767",0x944C],
+  ["F76B",0x944F],
+  ["F768",0x9450],
+  ["C5B2",0x9451],
+  ["C5B3",0x9452],
+  ["F84B",0x9455],
+  ["F84D",0x9457],
+  ["F84C",0x945D],
+  ["F84E",0x945E],
+  ["C5E0",0x9460],
+  ["F84A",0x9462],
+  ["C5DF",0x9463],
+  ["C5E1",0x9464],
+  ["F8CB",0x9468],
+  ["F8CC",0x9469],
+  ["C644",0x946A],
+  ["F8CA",0x946B],
+  ["F953",0x946D],
+  ["F952",0x946E],
+  ["F954",0x946F],
+  ["C65F",0x9470],
+  ["F955",0x9471],
+  ["C65E",0x9472],
+  ["F956",0x9473],
+  ["F972",0x9474],
+  ["F975",0x9475],
+  ["F974",0x9476],
+  ["C668",0x9477],
+  ["F973",0x9478],
+  ["C672",0x947C],
+  ["C670",0x947D],
+  ["C671",0x947E],
+  ["C677",0x947F],
+  ["F9C0",0x9480],
+  ["F9C1",0x9481],
+  ["F9BF",0x9482],
+  ["F9C9",0x9483],
+  ["AAF8",0x9577],
+  ["D844",0x957A],
+  ["DC78",0x957B],
+  ["E8A5",0x957C],
+  ["F376",0x957D],
+  ["AAF9",0x9580],
+  ["ADAC",0x9582],
+  ["B07B",0x9583],
+  ["D845",0x9586],
+  ["D846",0x9588],
+  ["B3AC",0x9589],
+  ["B67D",0x958B],
+  ["DC7A",0x958C],
+  ["DC79",0x958D],
+  ["B6A3",0x958E],
+  ["B67C",0x958F],
+  ["DC7B",0x9590],
+  ["B67E",0x9591],
+  ["B6A2",0x9592],
+  ["B6A1",0x9593],
+  ["B67B",0x9594],
+  ["B968",0x9598],
+  ["E0D0",0x959B],
+  ["E0CE",0x959C],
+  ["E0CF",0x959E],
+  ["E0CD",0x959F],
+  ["BBD2",0x95A1],
+  ["BBD5",0x95A3],
+  ["BBD7",0x95A4],
+  ["BBD6",0x95A5],
+  ["BBD3",0x95A8],
+  ["BBD4",0x95A9],
+  ["E8A7",0x95AB],
+  ["E8A6",0x95AC],
+  ["BE5B",0x95AD],
+  ["E8A8",0x95AE],
+  ["E8A9",0x95B0],
+  ["BE5C",0x95B1],
+  ["EC4D",0x95B5],
+  ["EC4B",0x95B6],
+  ["EEF3",0x95B7],
+  ["EC49",0x95B9],
+  ["EC4A",0x95BA],
+  ["C046",0x95BB],
+  ["EC46",0x95BC],
+  ["EC4E",0x95BD],
+  ["EC48",0x95BE],
+  ["EC4C",0x95BF],
+  ["EEEF",0x95C0],
+  ["EEF1",0x95C3],
+  ["EEF2",0x95C5],
+  ["C1F3",0x95C6],
+  ["EEEE",0x95C7],
+  ["C1F2",0x95C8],
+  ["EEF0",0x95C9],
+  ["C1EF",0x95CA],
+  ["C1F0",0x95CB],
+  ["C1F1",0x95CC],
+  ["EC47",0x95CD],
+  ["C2F5",0x95D0],
+  ["F16E",0x95D1],
+  ["F16C",0x95D2],
+  ["F16D",0x95D3],
+  ["C2F3",0x95D4],
+  ["C2F6",0x95D5],
+  ["C2F4",0x95D6],
+  ["F377",0x95DA],
+  ["F378",0x95DB],
+  ["C3F6",0x95DC],
+  ["F545",0x95DE],
+  ["F547",0x95DF],
+  ["F546",0x95E0],
+  ["C4C4",0x95E1],
+  ["C550",0x95E2],
+  ["F66D",0x95E3],
+  ["F66C",0x95E4],
+  ["F66B",0x95E5],
+  ["AAFA",0x961C],
+  ["C9AA",0x961E],
+  ["CA58",0x9620],
+  ["A6E9",0x9621],
+  ["CA56",0x9622],
+  ["CA59",0x9623],
+  ["CA57",0x9624],
+  ["CBAE",0x9628],
+  ["A8C1",0x962A],
+  ["A8C2",0x962C],
+  ["CBB0",0x962D],
+  ["A8BF",0x962E],
+  ["CBAF",0x962F],
+  ["CBAD",0x9630],
+  ["A8C0",0x9631],
+  ["A8BE",0x9632],
+  ["CDD8",0x9639],
+  ["CDDB",0x963A],
+  ["AAFD",0x963B],
+  ["CDDA",0x963C],
+  ["CDD9",0x963D],
+  ["AAFC",0x963F],
+  ["AAFB",0x9640],
+  ["AB40",0x9642],
+  ["CDDC",0x9643],
+  ["AAFE",0x9644],
+  ["D0C6",0x964A],
+  ["ADAE",0x964B],
+  ["ADAF",0x964C],
+  ["ADB0",0x964D],
+  ["D0C7",0x964E],
+  ["D0C3",0x964F],
+  ["ADAD",0x9650],
+  ["D0C4",0x9651],
+  ["D0C5",0x9653],
+  ["D0C2",0x9654],
+  ["B0A4",0x9658],
+  ["B0A1",0x965B],
+  ["D445",0x965C],
+  ["B0A2",0x965D],
+  ["B0A5",0x965E],
+  ["D446",0x965F],
+  ["B07E",0x9661],
+  ["B07C",0x9662],
+  ["B07D",0x9663],
+  ["B0A3",0x9664],
+  ["B3AD",0x966A],
+  ["D849",0x966B],
+  ["B3B5",0x966C],
+  ["D848",0x966D],
+  ["D84B",0x966F],
+  ["B3B1",0x9670],
+  ["D84A",0x9671],
+  ["B6AB",0x9672],
+  ["B3AF",0x9673],
+  ["B3B2",0x9674],
+  ["B3AE",0x9675],
+  ["B3B3",0x9676],
+  ["B3B4",0x9677],
+  ["B3B0",0x9678],
+  ["D847",0x967C],
+  ["B6A7",0x967D],
+  ["DC7D",0x967E],
+  ["DCA3",0x9680],
+  ["DCA2",0x9683],
+  ["B6AC",0x9684],
+  ["B6A8",0x9685],
+  ["B6A9",0x9686],
+  ["DC7C",0x9687],
+  ["DC7E",0x9688],
+  ["DCA1",0x9689],
+  ["B6A4",0x968A],
+  ["B6A6",0x968B],
+  ["B6AA",0x968D],
+  ["B6A5",0x968E],
+  ["E0D3",0x9691],
+  ["E0D1",0x9692],
+  ["E0D2",0x9693],
+  ["B96A",0x9694],
+  ["B96B",0x9695],
+  ["E0D4",0x9697],
+  ["B969",0x9698],
+  ["BBD8",0x9699],
+  ["BBDA",0x969B],
+  ["BBD9",0x969C],
+  ["E4BB",0x969E],
+  ["E4BC",0x96A1],
+  ["E8AB",0x96A2],
+  ["E8AA",0x96A4],
+  ["C047",0x96A7],
+  ["C048",0x96A8],
+  ["EC4F",0x96A9],
+  ["C049",0x96AA],
+  ["EEF6",0x96AC],
+  ["EEF4",0x96AE],
+  ["EEF5",0x96B0],
+  ["C1F4",0x96B1],
+  ["F16F",0x96B3],
+  ["C3F7",0x96B4],
+  ["C1F5",0x96B8],
+  ["AB41",0x96B9],
+  ["B0A6",0x96BB],
+  ["D447",0x96BC],
+  ["D84C",0x96BF],
+  ["B3B6",0x96C0],
+  ["B6AD",0x96C1],
+  ["DCA4",0x96C2],
+  ["DCA6",0x96C3],
+  ["B6AF",0x96C4],
+  ["B6AE",0x96C5],
+  ["B6B0",0x96C6],
+  ["B6B1",0x96C7],
+  ["DCA5",0x96C8],
+  ["B96E",0x96C9],
+  ["B96F",0x96CA],
+  ["B96D",0x96CB],
+  ["BBDB",0x96CC],
+  ["B96C",0x96CD],
+  ["E0D5",0x96CE],
+  ["BBDC",0x96D2],
+  ["E8AC",0x96D3],
+  ["EC50",0x96D4],
+  ["C04A",0x96D5],
+  ["C1F6",0x96D6],
+  ["F170",0x96D7],
+  ["F174",0x96D8],
+  ["C2F9",0x96D9],
+  ["F171",0x96DA],
+  ["C2FA",0x96DB],
+  ["C2F8",0x96DC],
+  ["F175",0x96DD],
+  ["C2FB",0x96DE],
+  ["F173",0x96DF],
+  ["F379",0x96E1],
+  ["C2F7",0x96E2],
+  ["C3F8",0x96E3],
+  ["F8CD",0x96E5],
+  ["AB42",0x96E8],
+  ["B3B8",0x96E9],
+  ["B3B7",0x96EA],
+  ["B6B2",0x96EF],
+  ["DCA8",0x96F0],
+  ["DCA7",0x96F1],
+  ["B6B3",0x96F2],
+  ["E0D9",0x96F5],
+  ["B973",0x96F6],
+  ["B970",0x96F7],
+  ["E0D8",0x96F8],
+  ["B972",0x96F9],
+  ["E0D6",0x96FA],
+  ["B971",0x96FB],
+  ["E0D7",0x96FD],
+  ["E4BD",0x96FF],
+  ["BBDD",0x9700],
+  ["E8AF",0x9702],
+  ["BE5D",0x9704],
+  ["E8AD",0x9705],
+  ["BE5E",0x9706],
+  ["BE5F",0x9707],
+  ["E8AE",0x9708],
+  ["BE60",0x9709],
+  ["EC51",0x970B],
+  ["C04E",0x970D],
+  ["C04B",0x970E],
+  ["C050",0x970F],
+  ["EC53",0x9710],
+  ["C04C",0x9711],
+  ["EC52",0x9712],
+  ["C04F",0x9713],
+  ["C04D",0x9716],
+  ["EEF9",0x9718],
+  ["EEFB",0x9719],
+  ["C1F7",0x971C],
+  ["EEFA",0x971D],
+  ["C1F8",0x971E],
+  ["EEF8",0x971F],
+  ["EEF7",0x9720],
+  ["F177",0x9722],
+  ["F176",0x9723],
+  ["C2FC",0x9724],
+  ["F178",0x9725],
+  ["F37E",0x9726],
+  ["C3FA",0x9727],
+  ["F37D",0x9728],
+  ["F37A",0x9729],
+  ["C3F9",0x972A],
+  ["F37B",0x972B],
+  ["F37C",0x972C],
+  ["F548",0x972E],
+  ["F549",0x972F],
+  ["C4C5",0x9730],
+  ["C553",0x9732],
+  ["F66E",0x9735],
+  ["C551",0x9738],
+  ["C552",0x9739],
+  ["F66F",0x973A],
+  ["C5B4",0x973D],
+  ["C5B5",0x973E],
+  ["F771",0x973F],
+  ["C645",0x9742],
+  ["F8CF",0x9743],
+  ["C647",0x9744],
+  ["F8CE",0x9746],
+  ["F8D0",0x9747],
+  ["C646",0x9748],
+  ["F957",0x9749],
+  ["F9AD",0x974B],
+  ["AB43",0x9752],
+  ["B974",0x9756],
+  ["E4BE",0x9758],
+  ["E8B0",0x975A],
+  ["C051",0x975B],
+  ["C052",0x975C],
+  ["AB44",0x975E],
+  ["BE61",0x9760],
+  ["C3FB",0x9761],
+  ["ADB1",0x9762],
+  ["C053",0x9766],
+  ["C5E2",0x9768],
+  ["ADB2",0x9769],
+  ["D84D",0x976A],
+  ["DCA9",0x976C],
+  ["DCAB",0x976E],
+  ["DCAA",0x9770],
+  ["E0DD",0x9772],
+  ["E0DA",0x9773],
+  ["B975",0x9774],
+  ["B976",0x9776],
+  ["E0DB",0x9777],
+  ["E0DC",0x9778],
+  ["E4C0",0x977A],
+  ["E4C5",0x977B],
+  ["BBDE",0x977C],
+  ["E4BF",0x977D],
+  ["E4C1",0x977E],
+  ["E4C8",0x977F],
+  ["E4C3",0x9780],
+  ["E4C7",0x9781],
+  ["E4C4",0x9782],
+  ["E4C2",0x9783],
+  ["E4C6",0x9784],
+  ["BBDF",0x9785],
+  ["E8B3",0x9788],
+  ["E8B1",0x978A],
+  ["BE63",0x978B],
+  ["BE62",0x978D],
+  ["E8B2",0x978E],
+  ["BE64",0x978F],
+  ["EC56",0x9794],
+  ["EC55",0x9797],
+  ["C054",0x9798],
+  ["EC54",0x9799],
+  ["EEFC",0x979A],
+  ["EEFE",0x979C],
+  ["EF41",0x979D],
+  ["EF40",0x979E],
+  ["C1F9",0x97A0],
+  ["EEFD",0x97A1],
+  ["F1A1",0x97A2],
+  ["C2FD",0x97A3],
+  ["F17D",0x97A4],
+  ["F1A2",0x97A5],
+  ["C2FE",0x97A6],
+  ["F17B",0x97A8],
+  ["F17E",0x97AA],
+  ["F17C",0x97AB],
+  ["F179",0x97AC],
+  ["C340",0x97AD],
+  ["F17A",0x97AE],
+  ["F3A1",0x97B3],
+  ["F3A3",0x97B6],
+  ["F3A2",0x97B7],
+  ["F54A",0x97B9],
+  ["F54B",0x97BB],
+  ["F670",0x97BF],
+  ["C5B7",0x97C1],
+  ["C5B6",0x97C3],
+  ["F84F",0x97C4],
+  ["F850",0x97C5],
+  ["C648",0x97C6],
+  ["F8D1",0x97C7],
+  ["C669",0x97C9],
+  ["ADB3",0x97CB],
+  ["B6B4",0x97CC],
+  ["E4CA",0x97CD],
+  ["E4C9",0x97CE],
+  ["E8B5",0x97CF],
+  ["E8B4",0x97D0],
+  ["C1FA",0x97D3],
+  ["EF43",0x97D4],
+  ["EF42",0x97D5],
+  ["F1A5",0x97D6],
+  ["F1A3",0x97D7],
+  ["F1A6",0x97D8],
+  ["F1A4",0x97D9],
+  ["C3FC",0x97DC],
+  ["F3A4",0x97DD],
+  ["F3A5",0x97DE],
+  ["F3A6",0x97DF],
+  ["F671",0x97E1],
+  ["F772",0x97E3],
+  ["F8D2",0x97E5],
+  ["ADB4",0x97ED],
+  ["EC57",0x97F0],
+  ["EF44",0x97F1],
+  ["ADB5",0x97F3],
+  ["BBE0",0x97F6],
+  ["EC58",0x97F8],
+  ["C341",0x97F9],
+  ["F1A7",0x97FA],
+  ["C3FD",0x97FB],
+  ["F54C",0x97FD],
+  ["F54D",0x97FE],
+  ["C554",0x97FF],
+  ["F851",0x9800],
+  ["ADB6",0x9801],
+  ["B3BB",0x9802],
+  ["B3BC",0x9803],
+  ["D84E",0x9804],
+  ["B6B5",0x9805],
+  ["B6B6",0x9806],
+  ["DCAC",0x9807],
+  ["B6B7",0x9808],
+  ["B97A",0x980A],
+  ["B97C",0x980C],
+  ["E0DF",0x980D],
+  ["E0E0",0x980E],
+  ["E0DE",0x980F],
+  ["B977",0x9810],
+  ["B978",0x9811],
+  ["B97B",0x9812],
+  ["B979",0x9813],
+  ["E4CB",0x9816],
+  ["BBE1",0x9817],
+  ["BBE2",0x9818],
+  ["E8BC",0x981B],
+  ["BE67",0x981C],
+  ["E8B7",0x981D],
+  ["E8B6",0x981E],
+  ["E8BB",0x9820],
+  ["BE65",0x9821],
+  ["C05B",0x9824],
+  ["E8B8",0x9826],
+  ["E8BD",0x9827],
+  ["E8BA",0x9828],
+  ["E8B9",0x9829],
+  ["BE66",0x982B],
+  ["C059",0x982D],
+  ["EC5A",0x982F],
+  ["C055",0x9830],
+  ["EC5B",0x9832],
+  ["EC59",0x9835],
+  ["C058",0x9837],
+  ["C056",0x9838],
+  ["C05A",0x9839],
+  ["C057",0x983B],
+  ["EF45",0x9841],
+  ["EF4A",0x9843],
+  ["EF46",0x9844],
+  ["EF49",0x9845],
+  ["C1FB",0x9846],
+  ["EDD4",0x9848],
+  ["EF48",0x9849],
+  ["EF47",0x984A],
+  ["C344",0x984C],
+  ["C342",0x984D],
+  ["C345",0x984E],
+  ["C343",0x984F],
+  ["F1A8",0x9850],
+  ["F1A9",0x9851],
+  ["F1AA",0x9852],
+  ["C346",0x9853],
+  ["F3AA",0x9857],
+  ["C440",0x9858],
+  ["F3A8",0x9859],
+  ["C441",0x985B],
+  ["F3A7",0x985C],
+  ["F3A9",0x985D],
+  ["C3FE",0x985E],
+  ["F551",0x985F],
+  ["F54E",0x9860],
+  ["F54F",0x9862],
+  ["F550",0x9863],
+  ["F672",0x9864],
+  ["C556",0x9865],
+  ["C555",0x9867],
+  ["F774",0x9869],
+  ["F773",0x986A],
+  ["C5B8",0x986B],
+  ["C5E3",0x986F],
+  ["C649",0x9870],
+  ["C660",0x9871],
+  ["F958",0x9872],
+  ["F9AE",0x9873],
+  ["F9AF",0x9874],
+  ["ADB7",0x98A8],
+  ["DCAD",0x98A9],
+  ["E0E1",0x98AC],
+  ["E4CC",0x98AD],
+  ["E4CD",0x98AE],
+  ["BBE3",0x98AF],
+  ["BBE4",0x98B1],
+  ["E8BE",0x98B2],
+  ["BE68",0x98B3],
+  ["C1FC",0x98B6],
+  ["F1AB",0x98B8],
+  ["C347",0x98BA],
+  ["F3AD",0x98BB],
+  ["C442",0x98BC],
+  ["F3AC",0x98BD],
+  ["F3AE",0x98BE],
+  ["F3AB",0x98BF],
+  ["F675",0x98C0],
+  ["F552",0x98C1],
+  ["F553",0x98C2],
+  ["C4C6",0x98C4],
+  ["F674",0x98C6],
+  ["F673",0x98C9],
+  ["F775",0x98CB],
+  ["F9B0",0x98CC],
+  ["ADB8",0x98DB],
+  ["ADB9",0x98DF],
+  ["B0A7",0x98E2],
+  ["D448",0x98E3],
+  ["D84F",0x98E5],
+  ["B6B8",0x98E7],
+  ["B6BB",0x98E9],
+  ["B6B9",0x98EA],
+  ["DCAE",0x98EB],
+  ["B6BD",0x98ED],
+  ["B6BA",0x98EF],
+  ["B6BC",0x98F2],
+  ["B97E",0x98F4],
+  ["E0E2",0x98F6],
+  ["E0E3",0x98F9],
+  ["E8C0",0x98FA],
+  ["B97D",0x98FC],
+  ["B9A1",0x98FD],
+  ["B9A2",0x98FE],
+  ["E4CF",0x9900],
+  ["E4CE",0x9902],
+  ["BBE5",0x9903],
+  ["BBE6",0x9905],
+  ["E4D0",0x9907],
+  ["E8BF",0x9908],
+  ["BBE8",0x9909],
+  ["BE69",0x990A],
+  ["BBE7",0x990C],
+  ["C05C",0x9910],
+  ["E8C1",0x9911],
+  ["BE6B",0x9912],
+  ["BE6A",0x9913],
+  ["E8C2",0x9914],
+  ["E8C5",0x9915],
+  ["E8C3",0x9916],
+  ["E8C4",0x9917],
+  ["BE6C",0x9918],
+  ["C061",0x991A],
+  ["C05F",0x991B],
+  ["C05E",0x991E],
+  ["EC5D",0x991F],
+  ["C060",0x9921],
+  ["EC5C",0x9924],
+  ["EF4B",0x9925],
+  ["EC5E",0x9927],
+  ["C05D",0x9928],
+  ["EC5F",0x9929],
+  ["EF4E",0x992A],
+  ["EF4C",0x992B],
+  ["EF4D",0x992C],
+  ["EF52",0x992D],
+  ["C34B",0x992E],
+  ["EF51",0x992F],
+  ["EF54",0x9930],
+  ["EF53",0x9931],
+  ["EF50",0x9932],
+  ["EF4F",0x9933],
+  ["C1FD",0x9935],
+  ["F1AE",0x993A],
+  ["F1AD",0x993C],
+  ["C34A",0x993D],
+  ["C348",0x993E],
+  ["C349",0x993F],
+  ["F1AC",0x9941],
+  ["F3B1",0x9943],
+  ["C443",0x9945],
+  ["F3B0",0x9947],
+  ["F3AF",0x9948],
+  ["C444",0x9949],
+  ["F558",0x994B],
+  ["F557",0x994C],
+  ["F555",0x994E],
+  ["F554",0x9950],
+  ["C4C8",0x9951],
+  ["C4C7",0x9952],
+  ["F559",0x9953],
+  ["F776",0x9954],
+  ["C5B9",0x9955],
+  ["F677",0x9956],
+  ["C557",0x9957],
+  ["F676",0x9958],
+  ["F556",0x9959],
+  ["F777",0x995B],
+  ["C5E4",0x995C],
+  ["C661",0x995E],
+  ["F959",0x995F],
+  ["F9B1",0x9961],
+  ["ADBA",0x9996],
+  ["D850",0x9997],
+  ["EF55",0x9998],
+  ["ADBB",0x9999],
+  ["E4D2",0x999C],
+  ["E4D1",0x999D],
+  ["EC60",0x999E],
+  ["EF57",0x99A1],
+  ["EF56",0x99A3],
+  ["C34C",0x99A5],
+  ["F3B2",0x99A6],
+  ["F3B3",0x99A7],
+  ["C4C9",0x99A8],
+  ["F9B2",0x99AB],
+  ["B0A8",0x99AC],
+  ["B6BF",0x99AD],
+  ["B6BE",0x99AE],
+  ["E0E4",0x99AF],
+  ["E0E6",0x99B0],
+  ["B9A4",0x99B1],
+  ["E0E5",0x99B2],
+  ["B9A3",0x99B3],
+  ["B9A5",0x99B4],
+  ["E0E7",0x99B5],
+  ["E4D4",0x99B9],
+  ["E4D6",0x99BA],
+  ["E4D5",0x99BB],
+  ["E4D8",0x99BD],
+  ["BBE9",0x99C1],
+  ["E4D7",0x99C2],
+  ["E4D3",0x99C3],
+  ["E4D9",0x99C7],
+  ["E8CC",0x99C9],
+  ["E8CF",0x99CB],
+  ["E8D1",0x99CC],
+  ["E8C7",0x99CD],
+  ["E8CB",0x99CE],
+  ["E8C8",0x99CF],
+  ["BE6E",0x99D0],
+  ["BE71",0x99D1],
+  ["BE73",0x99D2],
+  ["E8C9",0x99D3],
+  ["E8CA",0x99D4],
+  ["BE72",0x99D5],
+  ["E8CD",0x99D6],
+  ["E8D0",0x99D7],
+  ["E8CE",0x99D8],
+  ["BE74",0x99D9],
+  ["BE70",0x99DB],
+  ["E8C6",0x99DC],
+  ["BE6D",0x99DD],
+  ["BE6F",0x99DF],
+  ["C063",0x99E2],
+  ["EC66",0x99E3],
+  ["EC64",0x99E4],
+  ["EC63",0x99E5],
+  ["EC69",0x99E7],
+  ["EC68",0x99E9],
+  ["EC67",0x99EA],
+  ["EC62",0x99EC],
+  ["C062",0x99ED],
+  ["EC61",0x99EE],
+  ["EC65",0x99F0],
+  ["C064",0x99F1],
+  ["EF5A",0x99F4],
+  ["EF5E",0x99F6],
+  ["EF5B",0x99F7],
+  ["EF5D",0x99F8],
+  ["EF5C",0x99F9],
+  ["EF59",0x99FA],
+  ["EF5F",0x99FB],
+  ["EF62",0x99FC],
+  ["EF60",0x99FD],
+  ["EF61",0x99FE],
+  ["C240",0x99FF],
+  ["C1FE",0x9A01],
+  ["EF58",0x9A02],
+  ["EF63",0x9A03],
+  ["F1B3",0x9A04],
+  ["F1B6",0x9A05],
+  ["F1B8",0x9A06],
+  ["F1B7",0x9A07],
+  ["F1B1",0x9A09],
+  ["F1B5",0x9A0A],
+  ["F1B0",0x9A0B],
+  ["F1B2",0x9A0D],
+  ["C34D",0x9A0E],
+  ["F1AF",0x9A0F],
+  ["F1B4",0x9A11],
+  ["F3C0",0x9A14],
+  ["F3B5",0x9A15],
+  ["C445",0x9A16],
+  ["C446",0x9A19],
+  ["F3B4",0x9A1A],
+  ["F3B9",0x9A1B],
+  ["F3BF",0x9A1C],
+  ["F3B7",0x9A1D],
+  ["F3BE",0x9A1E],
+  ["F3BB",0x9A20],
+  ["F3BA",0x9A22],
+  ["F3BD",0x9A23],
+  ["F3B8",0x9A24],
+  ["F3B6",0x9A25],
+  ["F3BC",0x9A27],
+  ["F560",0x9A29],
+  ["F55E",0x9A2A],
+  ["C4CA",0x9A2B],
+  ["F55D",0x9A2C],
+  ["F563",0x9A2D],
+  ["F561",0x9A2E],
+  ["C4CB",0x9A30],
+  ["F55C",0x9A31],
+  ["F55A",0x9A32],
+  ["F55B",0x9A34],
+  ["C4CD",0x9A35],
+  ["F55F",0x9A36],
+  ["C4CC",0x9A37],
+  ["F562",0x9A38],
+  ["F678",0x9A39],
+  ["F67E",0x9A3A],
+  ["F679",0x9A3D],
+  ["C55B",0x9A3E],
+  ["F6A1",0x9A3F],
+  ["C55A",0x9A40],
+  ["F67D",0x9A41],
+  ["F67C",0x9A42],
+  ["C559",0x9A43],
+  ["F67B",0x9A44],
+  ["C558",0x9A45],
+  ["F67A",0x9A46],
+  ["F77D",0x9A48],
+  ["F7A1",0x9A49],
+  ["F77E",0x9A4A],
+  ["F77B",0x9A4C],
+  ["C5BB",0x9A4D],
+  ["F778",0x9A4E],
+  ["F77C",0x9A4F],
+  ["F7A3",0x9A50],
+  ["F7A2",0x9A52],
+  ["F779",0x9A53],
+  ["F77A",0x9A54],
+  ["C5BA",0x9A55],
+  ["F852",0x9A56],
+  ["C5E7",0x9A57],
+  ["F853",0x9A59],
+  ["C5E5",0x9A5A],
+  ["C5E6",0x9A5B],
+  ["F8D3",0x9A5E],
+  ["C64A",0x9A5F],
+  ["F976",0x9A60],
+  ["C66A",0x9A62],
+  ["F9B3",0x9A64],
+  ["C66B",0x9A65],
+  ["F9B4",0x9A66],
+  ["F9B5",0x9A67],
+  ["F9C3",0x9A68],
+  ["F9C2",0x9A69],
+  ["C67A",0x9A6A],
+  ["F9CD",0x9A6B],
+  ["B0A9",0x9AA8],
+  ["E0E9",0x9AAB],
+  ["E0E8",0x9AAD],
+  ["BBEA",0x9AAF],
+  ["BBEB",0x9AB0],
+  ["E4DA",0x9AB1],
+  ["E8D2",0x9AB3],
+  ["EC6C",0x9AB4],
+  ["BE75",0x9AB7],
+  ["C065",0x9AB8],
+  ["EC6A",0x9AB9],
+  ["EC6D",0x9ABB],
+  ["C066",0x9ABC],
+  ["EF64",0x9ABE],
+  ["EC6B",0x9ABF],
+  ["F1B9",0x9AC0],
+  ["C34E",0x9AC1],
+  ["F3C1",0x9AC2],
+  ["F566",0x9AC6],
+  ["F564",0x9AC7],
+  ["F565",0x9ACA],
+  ["F6A2",0x9ACD],
+  ["C55C",0x9ACF],
+  ["F7A4",0x9AD0],
+  ["C5EA",0x9AD1],
+  ["C5BC",0x9AD2],
+  ["C5E8",0x9AD3],
+  ["C5E9",0x9AD4],
+  ["F8D4",0x9AD5],
+  ["C662",0x9AD6],
+  ["B0AA",0x9AD8],
+  ["F1BA",0x9ADC],
+  ["D449",0x9ADF],
+  ["B9A6",0x9AE1],
+  ["E4DB",0x9AE3],
+  ["BBEC",0x9AE6],
+  ["E4DC",0x9AE7],
+  ["E8D4",0x9AEB],
+  ["E8D3",0x9AEC],
+  ["C068",0x9AED],
+  ["BE76",0x9AEE],
+  ["BE77",0x9AEF],
+  ["E8D7",0x9AF1],
+  ["E8D6",0x9AF2],
+  ["E8D5",0x9AF3],
+  ["EC6E",0x9AF6],
+  ["EC71",0x9AF7],
+  ["EC70",0x9AF9],
+  ["EC6F",0x9AFA],
+  ["C067",0x9AFB],
+  ["EF68",0x9AFC],
+  ["EF66",0x9AFD],
+  ["EF65",0x9AFE],
+  ["EF67",0x9B01],
+  ["C34F",0x9B03],
+  ["F1BC",0x9B04],
+  ["F1BD",0x9B05],
+  ["C350",0x9B06],
+  ["F1BB",0x9B08],
+  ["F3C3",0x9B0A],
+  ["F3C2",0x9B0B],
+  ["F3C5",0x9B0C],
+  ["C447",0x9B0D],
+  ["F3C4",0x9B0E],
+  ["F567",0x9B10],
+  ["F569",0x9B11],
+  ["F568",0x9B12],
+  ["F6A3",0x9B15],
+  ["F6A6",0x9B16],
+  ["F6A4",0x9B17],
+  ["F6A5",0x9B18],
+  ["F7A5",0x9B19],
+  ["C5BD",0x9B1A],
+  ["F854",0x9B1E],
+  ["F855",0x9B1F],
+  ["F856",0x9B20],
+  ["C64B",0x9B22],
+  ["C663",0x9B23],
+  ["F9B6",0x9B24],
+  ["B0AB",0x9B25],
+  ["BE78",0x9B27],
+  ["C069",0x9B28],
+  ["F1BE",0x9B29],
+  ["F7A6",0x9B2B],
+  ["F9C4",0x9B2E],
+  ["D44A",0x9B2F],
+  ["C67B",0x9B31],
+  ["B0AC",0x9B32],
+  ["EC72",0x9B33],
+  ["F1BF",0x9B35],
+  ["F3C6",0x9B37],
+  ["F6A7",0x9B3A],
+  ["F7A7",0x9B3B],
+  ["B0AD",0x9B3C],
+  ["E4DD",0x9B3E],
+  ["E4DE",0x9B3F],
+  ["BBED",0x9B41],
+  ["BBEE",0x9B42],
+  ["E8D9",0x9B43],
+  ["BE7A",0x9B44],
+  ["BE79",0x9B45],
+  ["E8D8",0x9B46],
+  ["EF69",0x9B48],
+  ["F1C0",0x9B4A],
+  ["F1C2",0x9B4B],
+  ["F1C1",0x9B4C],
+  ["C353",0x9B4D],
+  ["C352",0x9B4E],
+  ["C351",0x9B4F],
+  ["C55E",0x9B51],
+  ["F6A8",0x9B52],
+  ["C55D",0x9B54],
+  ["F7A9",0x9B55],
+  ["F7A8",0x9B56],
+  ["C64C",0x9B58],
+  ["F8D5",0x9B59],
+  ["B3BD",0x9B5A],
+  ["E0EA",0x9B5B],
+  ["E4E1",0x9B5F],
+  ["E4DF",0x9B60],
+  ["E4E0",0x9B61],
+  ["E8E2",0x9B64],
+  ["E8DD",0x9B66],
+  ["E8DA",0x9B67],
+  ["E8E1",0x9B68],
+  ["E8E3",0x9B6C],
+  ["BE7C",0x9B6F],
+  ["E8E0",0x9B70],
+  ["E8DC",0x9B71],
+  ["E8DB",0x9B74],
+  ["E8DF",0x9B75],
+  ["E8DE",0x9B76],
+  ["BE7B",0x9B77],
+  ["EC7D",0x9B7A],
+  ["EC78",0x9B7B],
+  ["EC76",0x9B7C],
+  ["ECA1",0x9B7D],
+  ["EC77",0x9B7E],
+  ["EC73",0x9B80],
+  ["EC79",0x9B82],
+  ["EC74",0x9B85],
+  ["EF72",0x9B86],
+  ["EC75",0x9B87],
+  ["ECA2",0x9B88],
+  ["EC7C",0x9B90],
+  ["C06A",0x9B91],
+  ["EC7B",0x9B92],
+  ["EC7A",0x9B93],
+  ["EC7E",0x9B95],
+  ["EF6A",0x9B9A],
+  ["EF6D",0x9B9B],
+  ["EF6C",0x9B9E],
+  ["EF74",0x9BA0],
+  ["EF6F",0x9BA1],
+  ["EF73",0x9BA2],
+  ["EF71",0x9BA4],
+  ["EF70",0x9BA5],
+  ["EF6E",0x9BA6],
+  ["EF6B",0x9BA8],
+  ["C243",0x9BAA],
+  ["C242",0x9BAB],
+  ["C244",0x9BAD],
+  ["C241",0x9BAE],
+  ["EF75",0x9BAF],
+  ["F1C8",0x9BB5],
+  ["F1CB",0x9BB6],
+  ["F1C9",0x9BB8],
+  ["F1CD",0x9BB9],
+  ["F1CE",0x9BBD],
+  ["F1C6",0x9BBF],
+  ["C358",0x9BC0],
+  ["F1C7",0x9BC1],
+  ["F1C5",0x9BC3],
+  ["F1CC",0x9BC4],
+  ["F1C4",0x9BC6],
+  ["F1C3",0x9BC7],
+  ["C357",0x9BC8],
+  ["C355",0x9BC9],
+  ["C354",0x9BCA],
+  ["F1CA",0x9BD3],
+  ["F3CF",0x9BD4],
+  ["F3D5",0x9BD5],
+  ["C44A",0x9BD6],
+  ["F3D0",0x9BD7],
+  ["F3D3",0x9BD9],
+  ["F3D7",0x9BDA],
+  ["C44B",0x9BDB],
+  ["F3D2",0x9BDC],
+  ["F3CA",0x9BDE],
+  ["F3C9",0x9BE0],
+  ["F3D6",0x9BE1],
+  ["F3CD",0x9BE2],
+  ["F3CB",0x9BE4],
+  ["F3D4",0x9BE5],
+  ["F3CC",0x9BE6],
+  ["C449",0x9BE7],
+  ["C448",0x9BE8],
+  ["F3C7",0x9BEA],
+  ["F3C8",0x9BEB],
+  ["F3D1",0x9BEC],
+  ["F3CE",0x9BF0],
+  ["F56C",0x9BF7],
+  ["F56F",0x9BF8],
+  ["C356",0x9BFD],
+  ["F56D",0x9C05],
+  ["F573",0x9C06],
+  ["F571",0x9C07],
+  ["F56B",0x9C08],
+  ["F576",0x9C09],
+  ["F56A",0x9C0B],
+  ["C4CF",0x9C0D],
+  ["F572",0x9C0E],
+  ["F56E",0x9C12],
+  ["C4CE",0x9C13],
+  ["F575",0x9C14],
+  ["F574",0x9C17],
+  ["F6AB",0x9C1C],
+  ["F6AA",0x9C1D],
+  ["F6B1",0x9C21],
+  ["F6AD",0x9C23],
+  ["F6B0",0x9C24],
+  ["C560",0x9C25],
+  ["F6AE",0x9C28],
+  ["F6AF",0x9C29],
+  ["F6A9",0x9C2B],
+  ["F6AC",0x9C2C],
+  ["C55F",0x9C2D],
+  ["C5BF",0x9C31],
+  ["F7B4",0x9C32],
+  ["F7AF",0x9C33],
+  ["F7B3",0x9C34],
+  ["F7B6",0x9C36],
+  ["F7B2",0x9C37],
+  ["F7AE",0x9C39],
+  ["C5C1",0x9C3B],
+  ["F7B1",0x9C3C],
+  ["F7B5",0x9C3D],
+  ["C5C0",0x9C3E],
+  ["F7AC",0x9C3F],
+  ["F570",0x9C40],
+  ["F7B0",0x9C41],
+  ["F7AD",0x9C44],
+  ["F7AA",0x9C46],
+  ["F7AB",0x9C48],
+  ["C5BE",0x9C49],
+  ["F85A",0x9C4A],
+  ["F85C",0x9C4B],
+  ["F85F",0x9C4C],
+  ["F85B",0x9C4D],
+  ["F860",0x9C4E],
+  ["F859",0x9C50],
+  ["F857",0x9C52],
+  ["C5EB",0x9C54],
+  ["F85D",0x9C55],
+  ["C5ED",0x9C56],
+  ["C5EC",0x9C57],
+  ["F858",0x9C58],
+  ["F85E",0x9C59],
+  ["F8DA",0x9C5E],
+  ["C64D",0x9C5F],
+  ["F8DB",0x9C60],
+  ["F8D9",0x9C62],
+  ["F8D6",0x9C63],
+  ["F8D8",0x9C66],
+  ["F8D7",0x9C67],
+  ["F95A",0x9C68],
+  ["F95C",0x9C6D],
+  ["F95B",0x9C6E],
+  ["F979",0x9C71],
+  ["F978",0x9C73],
+  ["F977",0x9C74],
+  ["F97A",0x9C75],
+  ["C673",0x9C77],
+  ["C674",0x9C78],
+  ["F9CA",0x9C79],
+  ["F9CE",0x9C7A],
+  ["B3BE",0x9CE5],
+  ["DCAF",0x9CE6],
+  ["E0ED",0x9CE7],
+  ["B9A7",0x9CE9],
+  ["E0EB",0x9CEA],
+  ["E0EC",0x9CED],
+  ["E4E2",0x9CF1],
+  ["E4E3",0x9CF2],
+  ["BBF1",0x9CF3],
+  ["BBEF",0x9CF4],
+  ["E4E4",0x9CF5],
+  ["BBF0",0x9CF6],
+  ["E8E8",0x9CF7],
+  ["E8EB",0x9CF9],
+  ["E8E5",0x9CFA],
+  ["E8EC",0x9CFB],
+  ["E8E4",0x9CFC],
+  ["E8E6",0x9CFD],
+  ["E8E7",0x9CFF],
+  ["E8EA",0x9D00],
+  ["BEA1",0x9D03],
+  ["E8EF",0x9D04],
+  ["E8EE",0x9D05],
+  ["BE7D",0x9D06],
+  ["E8E9",0x9D07],
+  ["E8ED",0x9D08],
+  ["BE7E",0x9D09],
+  ["ECAC",0x9D10],
+  ["C06F",0x9D12],
+  ["ECA7",0x9D14],
+  ["C06B",0x9D15],
+  ["ECA4",0x9D17],
+  ["ECAA",0x9D18],
+  ["ECAD",0x9D19],
+  ["C070",0x9D1B],
+  ["ECA9",0x9D1D],
+  ["ECA6",0x9D1E],
+  ["ECAE",0x9D1F],
+  ["ECA5",0x9D20],
+  ["ECAB",0x9D22],
+  ["C06C",0x9D23],
+  ["ECA3",0x9D25],
+  ["C06D",0x9D26],
+  ["C06E",0x9D28],
+  ["ECA8",0x9D29],
+  ["EFA9",0x9D2D],
+  ["EF7A",0x9D2E],
+  ["EF7B",0x9D2F],
+  ["EF7E",0x9D30],
+  ["EF7C",0x9D31],
+  ["EF76",0x9D33],
+  ["EF79",0x9D36],
+  ["EFA5",0x9D37],
+  ["EF7D",0x9D38],
+  ["C245",0x9D3B],
+  ["EFA7",0x9D3D],
+  ["EFA4",0x9D3E],
+  ["C246",0x9D3F],
+  ["EFA6",0x9D40],
+  ["EF77",0x9D41],
+  ["EFA2",0x9D42],
+  ["EFA3",0x9D43],
+  ["EFA1",0x9D45],
+  ["F1D2",0x9D4A],
+  ["F1D4",0x9D4B],
+  ["F1D7",0x9D4C],
+  ["F1D1",0x9D4F],
+  ["C359",0x9D51],
+  ["F1D9",0x9D52],
+  ["F1D0",0x9D53],
+  ["F1DA",0x9D54],
+  ["F1D6",0x9D56],
+  ["F1D8",0x9D57],
+  ["F1DC",0x9D58],
+  ["F1D5",0x9D59],
+  ["F1DD",0x9D5A],
+  ["F1D3",0x9D5B],
+  ["F1CF",0x9D5C],
+  ["C35A",0x9D5D],
+  ["F1DB",0x9D5F],
+  ["C35B",0x9D60],
+  ["C44D",0x9D61],
+  ["EF78",0x9D67],
+  ["F3F1",0x9D68],
+  ["F3E8",0x9D69],
+  ["C44F",0x9D6A],
+  ["F3E4",0x9D6B],
+  ["C450",0x9D6C],
+  ["F3ED",0x9D6F],
+  ["F3E7",0x9D70],
+  ["F3DD",0x9D71],
+  ["C44E",0x9D72],
+  ["F3EA",0x9D73],
+  ["F3E5",0x9D74],
+  ["F3E6",0x9D75],
+  ["F3D8",0x9D77],
+  ["F3DF",0x9D78],
+  ["F3EE",0x9D79],
+  ["F3EB",0x9D7B],
+  ["F3E3",0x9D7D],
+  ["F3EF",0x9D7F],
+  ["F3DE",0x9D80],
+  ["F3D9",0x9D81],
+  ["F3EC",0x9D82],
+  ["F3DB",0x9D84],
+  ["F3E9",0x9D85],
+  ["F3E0",0x9D86],
+  ["F3F0",0x9D87],
+  ["F3DC",0x9D88],
+  ["C44C",0x9D89],
+  ["F3DA",0x9D8A],
+  ["F3E1",0x9D8B],
+  ["F3E2",0x9D8C],
+  ["F57D",0x9D90],
+  ["F57B",0x9D92],
+  ["F5A2",0x9D94],
+  ["F5AE",0x9D96],
+  ["F5A5",0x9D97],
+  ["F57C",0x9D98],
+  ["F578",0x9D99],
+  ["F5A7",0x9D9A],
+  ["F57E",0x9D9B],
+  ["F5A3",0x9D9C],
+  ["F57A",0x9D9D],
+  ["F5AA",0x9D9E],
+  ["F577",0x9D9F],
+  ["F5A1",0x9DA0],
+  ["F5A6",0x9DA1],
+  ["F5A8",0x9DA2],
+  ["F5AB",0x9DA3],
+  ["F579",0x9DA4],
+  ["F5AF",0x9DA6],
+  ["F5B0",0x9DA7],
+  ["F5A9",0x9DA8],
+  ["F5AD",0x9DA9],
+  ["F5A4",0x9DAA],
+  ["F6C1",0x9DAC],
+  ["F6C4",0x9DAD],
+  ["C561",0x9DAF],
+  ["F6C3",0x9DB1],
+  ["F6C8",0x9DB2],
+  ["F6C6",0x9DB3],
+  ["C562",0x9DB4],
+  ["F6BD",0x9DB5],
+  ["F6B3",0x9DB6],
+  ["F6B2",0x9DB7],
+  ["C564",0x9DB8],
+  ["F6BF",0x9DB9],
+  ["F6C0",0x9DBA],
+  ["F6BC",0x9DBB],
+  ["F6B4",0x9DBC],
+  ["F6B9",0x9DBE],
+  ["F5AC",0x9DBF],
+  ["F6B5",0x9DC1],
+  ["C563",0x9DC2],
+  ["F6BB",0x9DC3],
+  ["F6BA",0x9DC5],
+  ["F6B6",0x9DC7],
+  ["F6C2",0x9DC8],
+  ["F6B7",0x9DCA],
+  ["F7BB",0x9DCB],
+  ["F6C5",0x9DCC],
+  ["F6C7",0x9DCD],
+  ["F6BE",0x9DCE],
+  ["F6B8",0x9DCF],
+  ["F7BC",0x9DD0],
+  ["F7BE",0x9DD1],
+  ["F7B8",0x9DD2],
+  ["C5C2",0x9DD3],
+  ["F7C5",0x9DD5],
+  ["F7C3",0x9DD6],
+  ["C5C3",0x9DD7],
+  ["F7C2",0x9DD8],
+  ["F7C1",0x9DD9],
+  ["F7BA",0x9DDA],
+  ["F7B7",0x9DDB],
+  ["F7BD",0x9DDC],
+  ["F7C6",0x9DDD],
+  ["F7B9",0x9DDE],
+  ["F7BF",0x9DDF],
+  ["F869",0x9DE1],
+  ["F86E",0x9DE2],
+  ["F864",0x9DE3],
+  ["F867",0x9DE4],
+  ["C5EE",0x9DE5],
+  ["F86B",0x9DE6],
+  ["F872",0x9DE8],
+  ["F7C0",0x9DE9],
+  ["F865",0x9DEB],
+  ["F86F",0x9DEC],
+  ["F873",0x9DED],
+  ["F86A",0x9DEE],
+  ["F863",0x9DEF],
+  ["F86D",0x9DF0],
+  ["F86C",0x9DF2],
+  ["F871",0x9DF3],
+  ["F870",0x9DF4],
+  ["F7C4",0x9DF5],
+  ["F868",0x9DF6],
+  ["F862",0x9DF7],
+  ["F866",0x9DF8],
+  ["C64E",0x9DF9],
+  ["C64F",0x9DFA],
+  ["F861",0x9DFB],
+  ["F8E6",0x9DFD],
+  ["F8DD",0x9DFE],
+  ["F8E5",0x9DFF],
+  ["F8E2",0x9E00],
+  ["F8E3",0x9E01],
+  ["F8DC",0x9E02],
+  ["F8DF",0x9E03],
+  ["F8E7",0x9E04],
+  ["F8E1",0x9E05],
+  ["F8E0",0x9E06],
+  ["F8DE",0x9E07],
+  ["F8E4",0x9E09],
+  ["F95D",0x9E0B],
+  ["F95E",0x9E0D],
+  ["F960",0x9E0F],
+  ["F95F",0x9E10],
+  ["F962",0x9E11],
+  ["F961",0x9E12],
+  ["F97C",0x9E13],
+  ["F97B",0x9E14],
+  ["F9B7",0x9E15],
+  ["F9B8",0x9E17],
+  ["F9C5",0x9E19],
+  ["C678",0x9E1A],
+  ["C67C",0x9E1B],
+  ["F9CF",0x9E1D],
+  ["C67D",0x9E1E],
+  ["B3BF",0x9E75],
+  ["C4D0",0x9E79],
+  ["F6C9",0x9E7A],
+  ["C650",0x9E7C],
+  ["C651",0x9E7D],
+  ["B3C0",0x9E7F],
+  ["E0EE",0x9E80],
+  ["B9A8",0x9E82],
+  ["E8F0",0x9E83],
+  ["ECB0",0x9E86],
+  ["ECB1",0x9E87],
+  ["ECAF",0x9E88],
+  ["EFAB",0x9E89],
+  ["EFAA",0x9E8A],
+  ["C247",0x9E8B],
+  ["F1DF",0x9E8C],
+  ["EFAC",0x9E8D],
+  ["F1DE",0x9E8E],
+  ["F3F3",0x9E91],
+  ["C451",0x9E92],
+  ["C453",0x9E93],
+  ["F3F2",0x9E94],
+  ["C452",0x9E97],
+  ["F5B1",0x9E99],
+  ["F5B3",0x9E9A],
+  ["F5B2",0x9E9B],
+  ["F6CA",0x9E9C],
+  ["C565",0x9E9D],
+  ["C5EF",0x9E9F],
+  ["F8E8",0x9EA0],
+  ["F963",0x9EA1],
+  ["F9D2",0x9EA4],
+  ["B3C1",0x9EA5],
+  ["E4E5",0x9EA7],
+  ["BEA2",0x9EA9],
+  ["ECB3",0x9EAD],
+  ["ECB2",0x9EAE],
+  ["EFAD",0x9EB0],
+  ["C454",0x9EB4],
+  ["C4D1",0x9EB5],
+  ["F7C7",0x9EB6],
+  ["F9CB",0x9EB7],
+  ["B3C2",0x9EBB],
+  ["BBF2",0x9EBC],
+  ["BEA3",0x9EBE],
+  ["F3F4",0x9EC0],
+  ["F874",0x9EC2],
+  ["B6C0",0x9EC3],
+  ["EFAE",0x9EC8],
+  ["C664",0x9ECC],
+  ["B6C1",0x9ECD],
+  ["BEA4",0x9ECE],
+  ["C248",0x9ECF],
+  ["F875",0x9ED0],
+  ["B6C2",0x9ED1],
+  ["E8F1",0x9ED3],
+  ["C072",0x9ED4],
+  ["ECB4",0x9ED5],
+  ["ECB5",0x9ED6],
+  ["C071",0x9ED8],
+  ["EFAF",0x9EDA],
+  ["C24C",0x9EDB],
+  ["C24A",0x9EDC],
+  ["C24B",0x9EDD],
+  ["C249",0x9EDE],
+  ["F1E0",0x9EDF],
+  ["C35C",0x9EE0],
+  ["F5B5",0x9EE4],
+  ["F5B4",0x9EE5],
+  ["F5B7",0x9EE6],
+  ["F5B6",0x9EE7],
+  ["C4D2",0x9EE8],
+  ["F6CB",0x9EEB],
+  ["F6CD",0x9EED],
+  ["F6CC",0x9EEE],
+  ["C566",0x9EEF],
+  ["F7C8",0x9EF0],
+  ["F876",0x9EF2],
+  ["F877",0x9EF3],
+  ["C5F0",0x9EF4],
+  ["F964",0x9EF5],
+  ["F97D",0x9EF6],
+  ["C675",0x9EF7],
+  ["DCB0",0x9EF9],
+  ["ECB6",0x9EFA],
+  ["EFB0",0x9EFB],
+  ["F3F5",0x9EFC],
+  ["E0EF",0x9EFD],
+  ["EFB1",0x9EFF],
+  ["F1E2",0x9F00],
+  ["F1E1",0x9F01],
+  ["F878",0x9F06],
+  ["C652",0x9F07],
+  ["F965",0x9F09],
+  ["F97E",0x9F0A],
+  ["B9A9",0x9F0E],
+  ["E8F2",0x9F0F],
+  ["E8F3",0x9F10],
+  ["ECB7",0x9F12],
+  ["B9AA",0x9F13],
+  ["C35D",0x9F15],
+  ["F1E3",0x9F16],
+  ["F6CF",0x9F18],
+  ["C567",0x9F19],
+  ["F6D0",0x9F1A],
+  ["F6CE",0x9F1B],
+  ["F879",0x9F1C],
+  ["F8E9",0x9F1E],
+  ["B9AB",0x9F20],
+  ["EFB4",0x9F22],
+  ["EFB3",0x9F23],
+  ["EFB2",0x9F24],
+  ["F1E4",0x9F25],
+  ["F1E8",0x9F28],
+  ["F1E7",0x9F29],
+  ["F1E6",0x9F2A],
+  ["F1E5",0x9F2B],
+  ["C35E",0x9F2C],
+  ["F3F6",0x9F2D],
+  ["F5B9",0x9F2E],
+  ["C4D3",0x9F2F],
+  ["F5B8",0x9F30],
+  ["F6D1",0x9F31],
+  ["F7CB",0x9F32],
+  ["F7CA",0x9F33],
+  ["C5C4",0x9F34],
+  ["F7C9",0x9F35],
+  ["F87C",0x9F36],
+  ["F87B",0x9F37],
+  ["F87A",0x9F38],
+  ["BBF3",0x9F3B],
+  ["ECB8",0x9F3D],
+  ["C24D",0x9F3E],
+  ["F3F7",0x9F40],
+  ["F3F8",0x9F41],
+  ["F7CC",0x9F42],
+  ["F87D",0x9F43],
+  ["F8EA",0x9F46],
+  ["F966",0x9F47],
+  ["F9B9",0x9F48],
+  ["F9D4",0x9F49],
+  ["BBF4",0x9F4A],
+  ["C24E",0x9F4B],
+  ["F1E9",0x9F4C],
+  ["F3F9",0x9F4D],
+  ["F6D2",0x9F4E],
+  ["F87E",0x9F4F],
+  ["BEA6",0x9F52],
+  ["EFB5",0x9F54],
+  ["F1EA",0x9F55],
+  ["F3FA",0x9F56],
+  ["F3FB",0x9F57],
+  ["F3FC",0x9F58],
+  ["F5BE",0x9F59],
+  ["F5BA",0x9F5B],
+  ["C568",0x9F5C],
+  ["F5BD",0x9F5D],
+  ["F5BC",0x9F5E],
+  ["C4D4",0x9F5F],
+  ["F5BB",0x9F60],
+  ["C4D6",0x9F61],
+  ["C4D5",0x9F63],
+  ["F6D4",0x9F64],
+  ["F6D3",0x9F65],
+  ["C569",0x9F66],
+  ["C56A",0x9F67],
+  ["C5C6",0x9F6A],
+  ["F7CD",0x9F6B],
+  ["C5C5",0x9F6C],
+  ["F8A3",0x9F6E],
+  ["F8A4",0x9F6F],
+  ["F8A2",0x9F70],
+  ["F8A1",0x9F71],
+  ["C654",0x9F72],
+  ["F8EB",0x9F74],
+  ["F8EC",0x9F75],
+  ["F8ED",0x9F76],
+  ["C653",0x9F77],
+  ["F967",0x9F78],
+  ["F96A",0x9F79],
+  ["F969",0x9F7A],
+  ["F968",0x9F7B],
+  ["F9D3",0x9F7E],
+  ["C073",0x9F8D],
+  ["C365",0x9F90],
+  ["F5BF",0x9F91],
+  ["F6D5",0x9F92],
+  ["C5C7",0x9F94],
+  ["F7CE",0x9F95],
+  ["F9D5",0x9F98],
+  ["C074",0x9F9C],
+  ["EFB6",0x9FA0],
+  ["F7CF",0x9FA2],
+  ["F9A1",0x9FA4],
+  ["C94A",0xFA0C],
+  ["DDFC",0xFA0D],
+  ["A14A",0xFE30],
+  ["A157",0xFE31],
+  ["A159",0xFE33],
+  ["A15B",0xFE34],
+  ["A15F",0xFE35],
+  ["A160",0xFE36],
+  ["A163",0xFE37],
+  ["A164",0xFE38],
+  ["A167",0xFE39],
+  ["A168",0xFE3A],
+  ["A16B",0xFE3B],
+  ["A16C",0xFE3C],
+  ["A16F",0xFE3D],
+  ["A170",0xFE3E],
+  ["A173",0xFE3F],
+  ["A174",0xFE40],
+  ["A177",0xFE41],
+  ["A178",0xFE42],
+  ["A17B",0xFE43],
+  ["A17C",0xFE44],
+  ["A1C6",0xFE49],
+  ["A1C7",0xFE4A],
+  ["A1CA",0xFE4B],
+  ["A1CB",0xFE4C],
+  ["A1C8",0xFE4D],
+  ["A1C9",0xFE4E],
+  ["A15C",0xFE4F],
+  ["A14D",0xFE50],
+  ["A14F",0xFE52],
+  ["A151",0xFE54],
+  ["A152",0xFE55],
+  ["A153",0xFE56],
+  ["A154",0xFE57],
+  ["A17D",0xFE59],
+  ["A17E",0xFE5A],
+  ["A1A1",0xFE5B],
+  ["A1A2",0xFE5C],
+  ["A1A3",0xFE5D],
+  ["A1A4",0xFE5E],
+  ["A1CC",0xFE5F],
+  ["A1CD",0xFE60],
+  ["A1CE",0xFE61],
+  ["A1DE",0xFE62],
+  ["A1DF",0xFE63],
+  ["A1E0",0xFE64],
+  ["A1E1",0xFE65],
+  ["A1E2",0xFE66],
+  ["A24C",0xFE69],
+  ["A24D",0xFE6A],
+  ["A24E",0xFE6B],
+  ["A149",0xFF01],
+  ["A1AD",0xFF03],
+  ["A243",0xFF04],
+  ["A248",0xFF05],
+  ["A1AE",0xFF06],
+  ["A15D",0xFF08],
+  ["A15E",0xFF09],
+  ["A1AF",0xFF0A],
+  ["A1CF",0xFF0B],
+  ["A141",0xFF0C],
+  ["A1D0",0xFF0D],
+  ["A144",0xFF0E],
+  ["A241",0xFF0F],
+  ["A2AF",0xFF10],
+  ["A2B0",0xFF11],
+  ["A2B1",0xFF12],
+  ["A2B2",0xFF13],
+  ["A2B3",0xFF14],
+  ["A2B4",0xFF15],
+  ["A2B5",0xFF16],
+  ["A2B6",0xFF17],
+  ["A2B7",0xFF18],
+  ["A2B8",0xFF19],
+  ["A147",0xFF1A],
+  ["A146",0xFF1B],
+  ["A1D5",0xFF1C],
+  ["A1D7",0xFF1D],
+  ["A1D6",0xFF1E],
+  ["A148",0xFF1F],
+  ["A249",0xFF20],
+  ["A2CF",0xFF21],
+  ["A2D0",0xFF22],
+  ["A2D1",0xFF23],
+  ["A2D2",0xFF24],
+  ["A2D3",0xFF25],
+  ["A2D4",0xFF26],
+  ["A2D5",0xFF27],
+  ["A2D6",0xFF28],
+  ["A2D7",0xFF29],
+  ["A2D8",0xFF2A],
+  ["A2D9",0xFF2B],
+  ["A2DA",0xFF2C],
+  ["A2DB",0xFF2D],
+  ["A2DC",0xFF2E],
+  ["A2DD",0xFF2F],
+  ["A2DE",0xFF30],
+  ["A2DF",0xFF31],
+  ["A2E0",0xFF32],
+  ["A2E1",0xFF33],
+  ["A2E2",0xFF34],
+  ["A2E3",0xFF35],
+  ["A2E4",0xFF36],
+  ["A2E5",0xFF37],
+  ["A2E6",0xFF38],
+  ["A2E7",0xFF39],
+  ["A2E8",0xFF3A],
+  ["A242",0xFF3C],
+  ["A1C4",0xFF3F],
+  ["A2E9",0xFF41],
+  ["A2EA",0xFF42],
+  ["A2EB",0xFF43],
+  ["A2EC",0xFF44],
+  ["A2ED",0xFF45],
+  ["A2EE",0xFF46],
+  ["A2EF",0xFF47],
+  ["A2F0",0xFF48],
+  ["A2F1",0xFF49],
+  ["A2F2",0xFF4A],
+  ["A2F3",0xFF4B],
+  ["A2F4",0xFF4C],
+  ["A2F5",0xFF4D],
+  ["A2F6",0xFF4E],
+  ["A2F7",0xFF4F],
+  ["A2F8",0xFF50],
+  ["A2F9",0xFF51],
+  ["A2FA",0xFF52],
+  ["A2FB",0xFF53],
+  ["A2FC",0xFF54],
+  ["A2FD",0xFF55],
+  ["A2FE",0xFF56],
+  ["A340",0xFF57],
+  ["A341",0xFF58],
+  ["A342",0xFF59],
+  ["A343",0xFF5A],
+  ["A161",0xFF5B],
+  ["A155",0xFF5C],
+  ["A162",0xFF5D],
+  ["A14E",0xFF64],
+]
+\ No newline at end of file
diff --git a/enc/trans/big5-uao-tbl.rb b/enc/trans/big5-uao-tbl.rb
new file mode 100644
index 0000000000..295fbfdda5
--- /dev/null
+++ b/enc/trans/big5-uao-tbl.rb
@@ -0,0 +1,19784 @@
+BIG5_UAO_TO_UCS_TBL = [
+  ["8140",0x4E17],
+  ["8141",0x4E22],
+  ["8142",0x4E2C],
+  ["8143",0x4E55],
+  ["8144",0x4E62],
+  ["8145",0x4E8A],
+  ["8146",0x4EB0],
+  ["8147",0x4EEB],
+  ["8148",0x4EED],
+  ["8149",0x4EFC],
+  ["814A",0x4F1C],
+  ["814B",0x4F8A],
+  ["814C",0x4FFF],
+  ["814D",0x5042],
+  ["814E",0x5050],
+  ["814F",0x5078],
+  ["8150",0x50D8],
+  ["8151",0x50DE],
+  ["8152",0x50F4],
+  ["8153",0x5116],
+  ["8154",0x514A],
+  ["8155",0x5151],
+  ["8156",0x5164],
+  ["8157",0x516A],
+  ["8158",0x5185],
+  ["8159",0x5190],
+  ["815A",0x519D],
+  ["815B",0x51A6],
+  ["815C",0x51A8],
+  ["815D",0x51A9],
+  ["815E",0x51C7],
+  ["815F",0x51D6],
+  ["8160",0x51DB],
+  ["8161",0x51EC],
+  ["8162",0x51FC],
+  ["8163",0x520B],
+  ["8164",0x5214],
+  ["8165",0x5215],
+  ["8166",0x5220],
+  ["8167",0x522B],
+  ["8168",0x5239],
+  ["8169",0x524F],
+  ["816A",0x5271],
+  ["816B",0x5290],
+  ["816C",0x5292],
+  ["816D",0x5294],
+  ["816E",0x529C],
+  ["816F",0x52AF],
+  ["8170",0x52B5],
+  ["8171",0x52D0],
+  ["8172",0x5300],
+  ["8173",0x5307],
+  ["8174",0x5324],
+  ["8175",0x5346],
+  ["8176",0x535F],
+  ["8177",0x5393],
+  ["8178",0x53B0],
+  ["8179",0x53DD],
+  ["817A",0x5423],
+  ["817B",0x5450],
+  ["817C",0x5451],
+  ["817D",0x548A],
+  ["817E",0x549D],
+  ["81A1",0x54A3],
+  ["81A2",0x54B4],
+  ["81A3",0x54D0],
+  ["81A4",0x5523],
+  ["81A5",0x553F],
+  ["81A6",0x554C],
+  ["81A7",0x5553],
+  ["81A8",0x555D],
+  ["81A9",0x556C],
+  ["81AA",0x559E],
+  ["81AB",0x55A9],
+  ["81AC",0x55EC],
+  ["81AD",0x55F5],
+  ["81AE",0x5623],
+  ["81AF",0x5650],
+  ["81B0",0x567C],
+  ["81B1",0x568A],
+  ["81B2",0x5694],
+  ["81B3",0x56A0],
+  ["81B4",0x56AF],
+  ["81B5",0x56D8],
+  ["81B6",0x5700],
+  ["81B7",0x5759],
+  ["81B8",0x5765],
+  ["81B9",0x577F],
+  ["81BA",0x5785],
+  ["81BB",0x5789],
+  ["81BC",0x57A1],
+  ["81BD",0x57AC],
+  ["81BE",0x57B4],
+  ["81BF",0x57C0],
+  ["81C0",0x57C8],
+  ["81C1",0x57D3],
+  ["81C2",0x57EF],
+  ["81C3",0x5844],
+  ["81C4",0x586C],
+  ["81C5",0x5892],
+  ["81C6",0x589A],
+  ["81C7",0x58B2],
+  ["81C8",0x58B8],
+  ["81C9",0x58E5],
+  ["81CA",0x58FB],
+  ["81CB",0x5902],
+  ["81CC",0x590B],
+  ["81CD",0x5910],
+  ["81CE",0x5918],
+  ["81CF",0x591B],
+  ["81D0",0x748C],
+  ["81D1",0x748D],
+  ["81D2",0x7499],
+  ["81D3",0x749B],
+  ["81D4",0x74A4],
+  ["81D5",0x74B4],
+  ["81D6",0x74B9],
+  ["81D7",0x74C8],
+  ["81D8",0x74CC],
+  ["81D9",0x74D0],
+  ["81DA",0x74D3],
+  ["81DB",0x7542],
+  ["81DC",0x7555],
+  ["81DD",0x756E],
+  ["81DE",0x758D],
+  ["81DF",0x759E],
+  ["81E0",0x75DC],
+  ["81E1",0x762C],
+  ["81E2",0x764F],
+  ["81E3",0x7651],
+  ["81E4",0x7673],
+  ["81E5",0x7674],
+  ["81E6",0x76A5],
+  ["81E7",0x76D9],
+  ["81E8",0x770E],
+  ["81E9",0x770F],
+  ["81EA",0x7758],
+  ["81EB",0x7772],
+  ["81EC",0x7777],
+  ["81ED",0x7778],
+  ["81EE",0x777A],
+  ["81EF",0x777B],
+  ["81F0",0x7798],
+  ["81F1",0x77AF],
+  ["81F2",0x77BE],
+  ["81F3",0x77C3],
+  ["81F4",0x77C5],
+  ["81F5",0x77CB],
+  ["81F6",0x77DD],
+  ["81F7",0x77E6],
+  ["81F8",0x77F4],
+  ["81F9",0x781E],
+  ["81FA",0x783D],
+  ["81FB",0x7842],
+  ["81FC",0x7844],
+  ["81FD",0x784B],
+  ["81FE",0x7851],
+  ["8240",0x5516],
+  ["8241",0x58F7],
+  ["8242",0x9834],
+  ["8243",0x845B],
+  ["8244",0x7114],
+  ["8245",0x8276],
+  ["8246",0x8956],
+  ["8247",0x9D2C],
+  ["8248",0x9D0E],
+  ["8249",0x8EAF],
+  ["824A",0x6062],
+  ["824B",0x6666],
+  ["824C",0x86CE],
+  ["824D",0x64B9],
+  ["824E",0x938C],
+  ["824F",0x565B],
+  ["8250",0x6F45],
+  ["8251",0x8ACC],
+  ["8252",0x7149],
+  ["8253",0x5DCC],
+  ["8254",0x8749],
+  ["8255",0x9A28],
+  ["8256",0x7BAA],
+  ["8257",0x8D0B],
+  ["8258",0x9957],
+  ["8259",0x5C2D],
+  ["825A",0x7E4B],
+  ["825B",0x981A],
+  ["825C",0x5026],
+  ["825D",0x6372],
+  ["825E",0x9E78],
+  ["825F",0x783F],
+  ["8260",0x9EB9],
+  ["8261",0x9EBA],
+  ["8262",0x8CCE],
+  ["8263",0x8B83],
+  ["8264",0xEF79],
+  ["8265",0x848B],
+  ["8266",0x91A4],
+  ["8267",0x7A63],
+  ["8268",0x64B0],
+  ["8269",0x5DFD],
+  ["826A",0x5E96],
+  ["826B",0x8061],
+  ["826C",0x6955],
+  ["826D",0x7AEA],
+  ["826E",0x7026],
+  ["826F",0x68BC],
+  ["8270",0x7977],
+  ["8271",0x6D9C],
+  ["8272",0x8FE9],
+  ["8273",0x7962],
+  ["8274",0x56A2],
+  ["8275",0x877F],
+  ["8276",0x5265],
+  ["8277",0x7984],
+  ["8278",0x6E8C],
+  ["8279",0x9197],
+  ["827A",0x7B86],
+  ["827B",0x982C],
+  ["827C",0x685D],
+  ["827D",0x4FAD],
+  ["827E",0x85AE],
+  ["82A1",0x7BED],
+  ["82A2",0x874B],
+  ["82A3",0x5036],
+  ["82A4",0x690D],
+  ["82A5",0x6B96],
+  ["82A6",0x614E],
+  ["82A7",0x5177],
+  ["82A8",0x771F],
+  ["82A9",0x5024],
+  ["82AA",0x7F6E],
+  ["82AB",0x76F4],
+  ["82AC",0x69D9],
+  ["82AD",0x60E3],
+  ["82AE",0x62F6],
+  ["82AF",0x545F],
+  ["82B0",0x9784],
+  ["82B1",0x564C],
+  ["82B2",0x50C5],
+  ["82B3",0x5618],
+  ["82B4",0x865E],
+  ["82B5",0x5932],
+  ["82B6",0x595B],
+  ["82B7",0x595D],
+  ["82B8",0x5963],
+  ["82B9",0x596C],
+  ["82BA",0x599B],
+  ["82BB",0x59D7],
+  ["82BC",0x59EB],
+  ["82BD",0x5A1A],
+  ["82BE",0x5AAA],
+  ["82BF",0x5AD0],
+  ["82C0",0x5AF1],
+  ["82C1",0x5B36],
+  ["82C2",0x5BC9],
+  ["82C3",0x5BF3],
+  ["82C4",0x5C13],
+  ["82C5",0x5C1C],
+  ["82C6",0x5C1E],
+  ["82C7",0x5C53],
+  ["82C8",0x5C99],
+  ["82C9",0x5C9C],
+  ["82CA",0x5CBA],
+  ["82CB",0x5CBB],
+  ["82CC",0x5CC1],
+  ["82CD",0x5CF5],
+  ["82CE",0x5CFA],
+  ["82CF",0x5D15],
+  ["82D0",0x5D18],
+  ["82D1",0x5D3E],
+  ["82D2",0x5D53],
+  ["82D3",0x5D5C],
+  ["82D4",0x5D6D],
+  ["82D5",0x5D73],
+  ["82D6",0x5D74],
+  ["82D7",0x5D8C],
+  ["82D8",0x5D90],
+  ["82D9",0x5DB9],
+  ["82DA",0x5DD0],
+  ["82DB",0x5DD3],
+  ["82DC",0x5E47],
+  ["82DD",0x5E64],
+  ["82DE",0x5ECF],
+  ["82DF",0x5ED0],
+  ["82E0",0x5EEA],
+  ["82E1",0x5EF0],
+  ["82E2",0x5F09],
+  ["82E3",0x5F0C],
+  ["82E4",0x5F11],
+  ["82E5",0x5F21],
+  ["82E6",0x5F34],
+  ["82E7",0x5F41],
+  ["82E8",0x5F45],
+  ["82E9",0x5F51],
+  ["82EA",0x5F5C],
+  ["82EB",0x5F66],
+  ["82EC",0x5F83],
+  ["82ED",0x5FF0],
+  ["82EE",0x604A],
+  ["82EF",0x6060],
+  ["82F0",0x608B],
+  ["82F1",0x60A6],
+  ["82F2",0x60DE],
+  ["82F3",0x6111],
+  ["82F4",0x6120],
+  ["82F5",0x6121],
+  ["82F6",0x613C],
+  ["82F7",0x613D],
+  ["82F8",0x6198],
+  ["82F9",0x61B7],
+  ["82FA",0x61F4],
+  ["82FB",0x6213],
+  ["82FC",0x621D],
+  ["82FD",0x621E],
+  ["82FE",0x6237],
+  ["8340",0x5E7A],
+  ["8341",0x6C10],
+  ["8342",0x53CE],
+  ["8343",0x4F2B],
+  ["8344",0x4F4E],
+  ["8345",0x5434],
+  ["8346",0x56F1],
+  ["8347",0x58EE],
+  ["8348",0x5939],
+  ["8349",0x5986],
+  ["834A",0x5C2C],
+  ["834B",0x51B3],
+  ["834C",0x51B2],
+  ["834D",0x707E],
+  ["834E",0x89C1],
+  ["834F",0x89D2],
+  ["8350",0x8D1D],
+  ["8351",0x8F66],
+  ["8352",0x4E9A],
+  ["8353",0x6765],
+  ["8354",0x4ED1],
+  ["8355",0x4E24],
+  ["8356",0x534F],
+  ["8357",0x5C4A],
+  ["8358",0x5188],
+  ["8359",0x5E95],
+  ["835A",0x62B5],
+  ["835B",0x4E1C],
+  ["835C",0x4E89],
+  ["835D",0x72B6],
+  ["835E",0x7C7C],
+  ["835F",0x7EA0],
+  ["8360",0x5367],
+  ["8361",0x8F67],
+  ["8362",0x90B8],
+  ["8363",0x957F],
+  ["8364",0x95E8],
+  ["8365",0x4FA0],
+  ["8366",0x4FA3],
+  ["8367",0x5156],
+  ["8368",0x5219],
+  ["8369",0x52B2],
+  ["836A",0x5374],
+  ["836B",0x5942],
+  ["836C",0x5E05],
+  ["836D",0x67E2],
+  ["836E",0x6C79],
+  ["836F",0x4E3A],
+  ["8370",0x7EA3],
+  ["8371",0x7EA2],
+  ["8372",0x7EAA],
+  ["8373",0x7EAB],
+  ["8374",0x7EA5],
+  ["8375",0x7EA6],
+  ["8376",0x7EA1],
+  ["8377",0x80DD],
+  ["8378",0x82CE],
+  ["8379",0x8BA1],
+  ["837A",0x8BA2],
+  ["837B",0x8BA3],
+  ["837C",0x8D1E],
+  ["837D",0x8D1F],
+  ["837E",0x519B],
+  ["83A1",0x8F68],
+  ["83A2",0x95E9],
+  ["83A3",0x97E6],
+  ["83A4",0x9875],
+  ["83A5",0x98CE],
+  ["83A6",0x98DE],
+  ["83A7",0x4FE9],
+  ["83A8",0x4EEC],
+  ["83A9",0x4F25],
+  ["83AA",0x4E2A],
+  ["83AB",0x4F26],
+  ["83AC",0x4ED3],
+  ["83AD",0x51BB],
+  ["83AE",0x521A],
+  ["83AF",0x5265],
+  ["83B0",0x5458],
+  ["83B1",0x5A31],
+  ["83B2",0x5B59],
+  ["83B3",0x5CE1],
+  ["83B4",0x5C9B],
+  ["83B5",0x5C98],
+  ["83B6",0x5E08],
+  ["83B7",0x5E93],
+  ["83B8",0x5F84],
+  ["83B9",0x631F],
+  ["83BA",0x65F6],
+  ["83BB",0x664B],
+  ["83BC",0x4E66],
+  ["83BD",0x6CFE],
+  ["83BE",0x6D43],
+  ["83BF",0x4E4C],
+  ["83C0",0x72ED],
+  ["83C1",0x72C8],
+  ["83C2",0x4EA9],
+  ["83C3",0x7825],
+  ["83C4",0x79EA],
+  ["83C5",0x7EBA],
+  ["83C6",0x7EB1],
+  ["83C7",0x7EB9],
+  ["83C8",0x7EAF],
+  ["83C9",0x7EBD],
+  ["83CA",0x7EB0],
+  ["83CB",0x7EA7],
+  ["83CC",0x7EAD],
+  ["83CD",0x7EB3],
+  ["83CE",0x7EB8],
+  ["83CF",0x7EB7],
+  ["83D0",0x80C1],
+  ["83D1",0x8109],
+  ["83D2",0x520D],
+  ["83D3",0x8BB0],
+  ["83D4",0x8BA6],
+  ["83D5",0x8BA8],
+  ["83D6",0x8BA7],
+  ["83D7",0x8BAA],
+  ["83D8",0x8BAF],
+  ["83D9",0x8BAD],
+  ["83DA",0x8BAB],
+  ["83DB",0x5C82],
+  ["83DC",0x8D22],
+  ["83DD",0x8D21],
+  ["83DE",0x8F69],
+  ["83DF",0x8F6B],
+  ["83E0",0x9489],
+  ["83E1",0x9488],
+  ["83E2",0x948A],
+  ["83E3",0x948B],
+  ["83E4",0x95EA],
+  ["83E5",0x9635],
+  ["83E6",0x9655],
+  ["83E7",0x9649],
+  ["83E8",0x9965],
+  ["83E9",0x9A6C],
+  ["83EA",0x9AA8],
+  ["83EB",0x4F2A],
+  ["83EC",0x4F1F],
+  ["83ED",0x4FA6],
+  ["83EE",0x4FA7],
+  ["83EF",0x52A1],
+  ["83F0",0x52A8],
+  ["83F1",0x533A],
+  ["83F2",0x53C2],
+  ["83F3",0x54D1],
+  ["83F4",0x95EE],
+  ["83F5",0x8854],
+  ["83F6",0x56FD],
+  ["83F7",0x575A],
+  ["83F8",0x57A9],
+  ["83F9",0x6267],
+  ["83FA",0x591F],
+  ["83FB",0x5A04],
+  ["83FC",0x5987],
+  ["83FD",0x4E13],
+  ["83FE",0x5C06],
+  ["8440",0x5C49],
+  ["8441",0x5CE5],
+  ["8442",0x5C97],
+  ["8443",0x5E26],
+  ["8444",0x5E10],
+  ["8445",0x5F20],
+  ["8446",0x5F3A],
+  ["8447",0x4ECE],
+  ["8448",0x5F95],
+  ["8449",0x51C4],
+  ["844A",0x6005],
+  ["844B",0x626B],
+  ["844C",0x6302],
+  ["844D",0x626A],
+  ["844E",0x62A1],
+  ["844F",0x6323],
+  ["8450",0x8D25],
+  ["8451",0x542F],
+  ["8452",0x659B],
+  ["8453",0x65A9],
+  ["8454",0x663C],
+  ["8455",0x52D6],
+  ["8456",0x5F03],
+  ["8457",0x6761],
+  ["8458",0x67AD],
+  ["8459",0x6740],
+  ["845A",0x6C22],
+  ["845B",0x51C9],
+  ["845C",0x6D45],
+  ["845D",0x6E0A],
+  ["845E",0x6CEA],
+  ["845F",0x6CA6],
+  ["8460",0x51C0],
+  ["8461",0x7275],
+  ["8462",0x72F0],
+  ["8463",0x73B0],
+  ["8464",0x4EA7],
+  ["8465",0x6BD5],
+  ["8466",0x5F02],
+  ["8467",0x4F17],
+  ["8468",0x7ECA],
+  ["8469",0x7EDF],
+  ["846A",0x7ECD],
+  ["846B",0x7ECB],
+  ["846C",0x7ECC],
+  ["846D",0x7EC6],
+  ["846E",0x7EC5],
+  ["846F",0x7EC4],
+  ["8470",0x7EC8],
+  ["8471",0x7EC1],
+  ["8472",0x7EC2],
+  ["8473",0x94B5],
+  ["8474",0x4E60],
+  ["8475",0x835A],
+  ["8476",0x830E],
+  ["8477",0x8392],
+  ["8478",0x5E84],
+  ["8479",0x82CB],
+  ["847A",0x5904],
+  ["847B",0x672F],
+  ["847C",0x886E],
+  ["847D",0x89C5],
+  ["847E",0x89C4],
+  ["84A1",0x8BBF],
+  ["84A2",0x8BB6],
+  ["84A3",0x8BC0],
+  ["84A4",0x8BB7],
+  ["84A5",0x8BB8],
+  ["84A6",0x8BBE],
+  ["84A7",0x8BBC],
+  ["84A8",0x8BB9],
+  ["84A9",0x8D29],
+  ["84AA",0x8D23],
+  ["84AB",0x8D2F],
+  ["84AC",0x8D27],
+  ["84AD",0x8D2A],
+  ["84AE",0x8D2B],
+  ["84AF",0x8F6D],
+  ["84B0",0x8F6F],
+  ["84B1",0x8FD9],
+  ["84B2",0x8FDE],
+  ["84B3",0x8FF3],
+  ["84B4",0x9497],
+  ["84B5",0x9493],
+  ["84B6",0x948F],
+  ["84B7",0x9492],
+  ["84B8",0x95ED],
+  ["84B9",0x9648],
+  ["84BA",0x9646],
+  ["84BB",0x9634],
+  ["84BC",0x9876],
+  ["84BD",0x9877],
+  ["84BE",0x9C7C],
+  ["84BF",0x9E1F],
+  ["84C0",0x5364],
+  ["84C1",0x9EA6],
+  ["84C2",0x5907],
+  ["84C3",0x4F27],
+  ["84C4",0x4F1E],
+  ["84C5",0x51EF],
+  ["84C6",0x5240],
+  ["84C7",0x521B],
+  ["84C8",0x52B3],
+  ["84C9",0x52CB],
+  ["84CA",0x4E27],
+  ["84CB",0x5355],
+  ["84CC",0x54DF],
+  ["84CD",0x5524],
+  ["84CE",0x4E54],
+  ["84CF",0x56F4],
+  ["84D0",0x5C27],
+  ["84D1",0x573A],
+  ["84D2",0x62A5],
+  ["84D3",0x57DA],
+  ["84D4",0x58F6],
+  ["84D5",0x5A32],
+  ["84D6",0x5BFB],
+  ["84D7",0x5C9A],
+  ["84D8",0x5E27],
+  ["84D9",0x5E0F],
+  ["84DA",0x5395],
+  ["84DB",0x53A9],
+  ["84DC",0x6076],
+  ["84DD",0x95F7],
+  ["84DE",0x60EC],
+  ["84DF",0x607B],
+  ["84E0",0x607C],
+  ["84E1",0x62E3],
+  ["84E2",0x6325],
+  ["84E3",0x6362],
+  ["84E4",0x626C],
+  ["84E5",0x67A3],
+  ["84E6",0x680B],
+  ["84E7",0x6808],
+  ["84E8",0x94A6],
+  ["84E9",0x6B8B],
+  ["84EA",0x58F3],
+  ["84EB",0x6C2F],
+  ["84EC",0x6C29],
+  ["84ED",0x6D8C],
+  ["84EE",0x51D1],
+  ["84EF",0x6E6E],
+  ["84F0",0x6DA1],
+  ["84F1",0x6C64],
+  ["84F2",0x6D4B],
+  ["84F3",0x6D51],
+  ["84F4",0x6DA3],
+  ["84F5",0x65E0],
+  ["84F6",0x72B9],
+  ["84F7",0x82CF],
+  ["84F8",0x753B],
+  ["84F9",0x75C9],
+  ["84FA",0x53D1],
+  ["84FB",0x76D7],
+  ["84FC",0x781A],
+  ["84FD",0x79C6],
+  ["84FE",0x7A97],
+  ["8540",0x7B14],
+  ["8541",0x7B0B],
+  ["8542",0x7EDE],
+  ["8543",0x7ED3],
+  ["8544",0x7ED2],
+  ["8545",0x7EDD],
+  ["8546",0x4E1D],
+  ["8547",0x7EDC],
+  ["8548",0x7ED9],
+  ["8549",0x7EDA],
+  ["854A",0x7ED6],
+  ["854B",0x7EDB],
+  ["854C",0x8083],
+  ["854D",0x80BE],
+  ["854E",0x80C0],
+  ["854F",0x534E],
+  ["8550",0x83B1],
+  ["8551",0x82CC],
+  ["8552",0x865A],
+  ["8553",0x89C6],
+  ["8554",0x8BC4],
+  ["8555",0x8BCD],
+  ["8556",0x8BC1],
+  ["8557",0x8BC2],
+  ["8558",0x8BCF],
+  ["8559",0x8BC5],
+  ["855A",0x8BC8],
+  ["855B",0x8BCB],
+  ["855C",0x8BC9],
+  ["855D",0x8BCA],
+  ["855E",0x8BC3],
+  ["855F",0x8D2E],
+  ["8560",0x8D34],
+  ["8561",0x8D30],
+  ["8562",0x8D3B],
+  ["8563",0x8D32],
+  ["8564",0x8D39],
+  ["8565",0x8D3A],
+  ["8566",0x8D35],
+  ["8567",0x4E70],
+  ["8568",0x8D2C],
+  ["8569",0x8D38],
+  ["856A",0x8D37],
+  ["856B",0x8F72],
+  ["856C",0x8F74],
+  ["856D",0x8F76],
+  ["856E",0x8FDB],
+  ["856F",0x90AE],
+  ["8570",0x4E61],
+  ["8571",0x949E],
+  ["8572",0x94AE],
+  ["8573",0x9499],
+  ["8574",0x94A0],
+  ["8575",0x94A7],
+  ["8576",0x949D],
+  ["8577",0x94A4],
+  ["8578",0x94A3],
+  ["8579",0x95F5],
+  ["857A",0x95F0],
+  ["857B",0x5F00],
+  ["857C",0x95F2],
+  ["857D",0x95F4],
+  ["857E",0x95F3],
+  ["85A1",0x961F],
+  ["85A2",0x9636],
+  ["85A3",0x9633],
+  ["85A4",0x97E7],
+  ["85A5",0x9879],
+  ["85A6",0x987A],
+  ["85A7",0x987B],
+  ["85A8",0x996A],
+  ["85A9",0x996D],
+  ["85AA",0x9968],
+  ["85AB",0x996E],
+  ["85AC",0x996C],
+  ["85AD",0x51AF],
+  ["85AE",0x9A6D],
+  ["85AF",0x4E71],
+  ["85B0",0x503A],
+  ["85B1",0x4F20],
+  ["85B2",0x4EC5],
+  ["85B3",0x503E],
+  ["85B4",0x4F24],
+  ["85B5",0x506C],
+  ["85B6",0x94F2],
+  ["85B7",0x52BF],
+  ["85B8",0x79EF],
+  ["85B9",0x6C47],
+  ["85BA",0x5417],
+  ["85BB",0x545C],
+  ["85BC",0x545B],
+  ["85BD",0x56ED],
+  ["85BE",0x5706],
+  ["85BF",0x6D82],
+  ["85C0",0x5757],
+  ["85C1",0x575E],
+  ["85C2",0x57D8],
+  ["85C3",0x8314],
+  ["85C4",0x5965],
+  ["85C5",0x5988],
+  ["85C6",0x7231],
+  ["85C7",0x5FFE],
+  ["85C8",0x6006],
+  ["85C9",0x607A],
+  ["85CA",0x635F],
+  ["85CB",0x62A2],
+  ["85CC",0x6363],
+  ["85CD",0x6784],
+  ["85CE",0x6656],
+  ["85CF",0x6655],
+  ["85D0",0x65F8],
+  ["85D1",0x4F1A],
+  ["85D2",0x4E1A],
+  ["85D3",0x6781],
+  ["85D4",0x6768],
+  ["85D5",0x6862],
+  ["85D6",0x67AB],
+  ["85D7",0x5C81],
+  ["85D8",0x6C9F],
+  ["85D9",0x706D],
+  ["85DA",0x6E7F],
+  ["85DB",0x6ED1],
+  ["85DC",0x6CA7],
+  ["85DD",0x70E6],
+  ["85DE",0x70BC],
+  ["85DF",0x7080],
+  ["85E0",0x7115],
+  ["85E1",0x7237],
+  ["85E2",0x72EE],
+  ["85E3",0x733E],
+  ["85E4",0x73F2],
+  ["85E5",0x5F53],
+  ["85E6",0x76CF],
+  ["85E7",0x7750],
+  ["85E8",0x7741],
+  ["85E9",0x96CE],
+  ["85EA",0x788C],
+  ["85EB",0x8282],
+  ["85EC",0x7B15],
+  ["85ED",0x7CA4],
+  ["85EE",0x7ECF],
+  ["85EF",0x7EE2],
+  ["85F0",0x7ED1],
+  ["85F1",0x7EE5],
+  ["85F2",0x7EE6],
+  ["85F3",0x4E49],
+  ["85F4",0x7FA1],
+  ["85F5",0x5723],
+  ["85F6",0x80A0],
+  ["85F7",0x811A],
+  ["85F8",0x80BF],
+  ["85F9",0x8111],
+  ["85FA",0x8364],
+  ["85FB",0x82C7],
+  ["85FC",0x53F6],
+  ["85FD",0x83B4],
+  ["85FE",0x865E],
+  ["8640",0x864F],
+  ["8641",0x53F7],
+  ["8642",0x8708],
+  ["8643",0x86AC],
+  ["8644",0x8865],
+  ["8645",0x88C5],
+  ["8646",0x8BE7],
+  ["8647",0x8BE5],
+  ["8648",0x8BE6],
+  ["8649",0x8BD5],
+  ["864A",0x8BD7],
+  ["864B",0x8BD8],
+  ["864C",0x8BD9],
+  ["864D",0x8BE3],
+  ["864E",0x8BDA],
+  ["864F",0x8BDD],
+  ["8650",0x8BDB],
+  ["8651",0x8BE1],
+  ["8652",0x8BE2],
+  ["8653",0x8BE0],
+  ["8654",0x8BDF],
+  ["8655",0x8D3C],
+  ["8656",0x8D44],
+  ["8657",0x8D3E],
+  ["8658",0x8D3F],
+  ["8659",0x8D40],
+  ["865A",0x8D41],
+  ["865B",0x8D42],
+  ["865C",0x8D45],
+  ["865D",0x8F83],
+  ["865E",0x8F7D],
+  ["865F",0x8F7C],
+  ["8660",0x8F7E],
+  ["8661",0x519C],
+  ["8662",0x8FD0],
+  ["8663",0x8FBE],
+  ["8664",0x8FDD],
+  ["8665",0x8FC7],
+  ["8666",0x90B9],
+  ["8667",0x94B4],
+  ["8668",0x94B3],
+  ["8669",0x94B9],
+  ["866A",0x94B8],
+  ["866B",0x94BE],
+  ["866C",0x94C0],
+  ["866D",0x94C5],
+  ["866E",0x94A9],
+  ["866F",0x94C2],
+  ["8670",0x94C3],
+  ["8671",0x94C9],
+  ["8672",0x94CB],
+  ["8673",0x949C],
+  ["8674",0x94CD],
+  ["8675",0x94BF],
+  ["8676",0x94C6],
+  ["8677",0x95F8],
+  ["8678",0x9668],
+  ["8679",0x96BD],
+  ["867A",0x7535],
+  ["867B",0x9884],
+  ["867C",0x987D],
+  ["867D",0x987F],
+  ["867E",0x987C],
+  ["86A1",0x9881],
+  ["86A2",0x9882],
+  ["86A3",0x9972],
+  ["86A4",0x9974],
+  ["86A5",0x9971],
+  ["86A6",0x9970],
+  ["86A7",0x9A70],
+  ["86A8",0x9A6E],
+  ["86A9",0x9A6F],
+  ["86AA",0x9E20],
+  ["86AB",0x4FA5],
+  ["86AC",0x4FA8],
+  ["86AD",0x532E],
+  ["86AE",0x538C],
+  ["86AF",0x5C1D],
+  ["86B0",0x5455],
+  ["86B1",0x53F9],
+  ["86B2",0x55BD],
+  ["86B3",0x5567],
+  ["86B4",0x54D4],
+  ["86B5",0x56E2],
+  ["86B6",0x56FE],
+  ["86B7",0x5C18],
+  ["86B8",0x57AB],
+  ["86B9",0x5811],
+  ["86BA",0x5BFF],
+  ["86BB",0x68A6],
+  ["86BC",0x593A],
+  ["86BD",0x5941],
+  ["86BE",0x59AA],
+  ["86BF",0x5B9E],
+  ["86C0",0x5BDD],
+  ["86C1",0x5BF9],
+  ["86C2",0x5C61],
+  ["86C3",0x5D2D],
+  ["86C4",0x5C96],
+  ["86C5",0x5E01],
+  ["86C6",0x5E3C],
+  ["86C7",0x5F7B],
+  ["86C8",0x6001],
+  ["86C9",0x60EF],
+  ["86CA",0x6078],
+  ["86CB",0x60ED],
+  ["86CC",0x60E8],
+  ["86CD",0x6402],
+  ["86CE",0x63B4],
+  ["86CF",0x63BA],
+  ["86D0",0x7545],
+  ["86D1",0x8363],
+  ["86D2",0x67AA],
+  ["86D3",0x6EDA],
+  ["86D4",0x6E0D],
+  ["86D5",0x6C49],
+  ["86D6",0x6EE1],
+  ["86D7",0x6EDE],
+  ["86D8",0x6E10],
+  ["86D9",0x6DA8],
+  ["86DA",0x6D9F],
+  ["86DB",0x6CAA],
+  ["86DC",0x6E14],
+  ["86DD",0x6E17],
+  ["86DE",0x6DA4],
+  ["86DF",0x8367],
+  ["86E0",0x5C14],
+  ["86E1",0x8366],
+  ["86E2",0x72F1],
+  ["86E3",0x7410],
+  ["86E4",0x739B],
+  ["86E5",0x759F],
+  ["86E6",0x75A1],
+  ["86E7",0x75AF],
+  ["86E8",0x75EA],
+  ["86E9",0x5C3D],
+  ["86EA",0x76D1],
+  ["86EB",0x7855],
+  ["86EC",0x796F],
+  ["86ED",0x7978],
+  ["86EE",0x79CD],
+  ["86EF",0x79F0],
+  ["86F0",0x6D3C],
+  ["86F1",0x7A9D],
+  ["86F2",0x7B3A],
+  ["86F3",0x7B5D],
+  ["86F4",0x7EFD],
+  ["86F5",0x7EFE],
+  ["86F6",0x7EFC],
+  ["86F7",0x7EF0],
+  ["86F8",0x7EEB],
+  ["86F9",0x7EFF],
+  ["86FA",0x7D27],
+  ["86FB",0x7F00],
+  ["86FC",0x7EB2],
+  ["86FD",0x7EEE],
+  ["86FE",0x7EF8],
+  ["8740",0x7EF5],
+  ["8741",0x7EB6],
+  ["8742",0x7EF4],
+  ["8743",0x7EEA],
+  ["8744",0x7F01],
+  ["8745",0x7EF6],
+  ["8746",0x7F5A],
+  ["8747",0x95FB],
+  ["8748",0x8385],
+  ["8749",0x76D6],
+  ["874A",0x836A],
+  ["874B",0x82CD],
+  ["874C",0x8680],
+  ["874D",0x8BF5],
+  ["874E",0x8BED],
+  ["874F",0x8BEC],
+  ["8750",0x8BA4],
+  ["8751",0x8BEB],
+  ["8752",0x8BEF],
+  ["8753",0x8BF4],
+  ["8754",0x8BF0],
+  ["8755",0x8BF2],
+  ["8756",0x8BF1],
+  ["8757",0x8BF3],
+  ["8758",0x8BEE],
+  ["8759",0x5BBE],
+  ["875A",0x8D48],
+  ["875B",0x8D4A],
+  ["875C",0x8D75],
+  ["875D",0x8D76],
+  ["875E",0x8F85],
+  ["875F",0x8F84],
+  ["8760",0x8F7B],
+  ["8761",0x8FDC],
+  ["8762",0x900A],
+  ["8763",0x9012],
+  ["8764",0x94F0],
+  ["8765",0x94F6],
+  ["8766",0x94DC],
+  ["8767",0x94ED],
+  ["8768",0x94E2],
+  ["8769",0x94EC],
+  ["876A",0x94E8],
+  ["876B",0x94F5],
+  ["876C",0x94E3],
+  ["876D",0x9602],
+  ["876E",0x95FA],
+  ["876F",0x95FD],
+  ["8770",0x9601],
+  ["8771",0x9600],
+  ["8772",0x9645],
+  ["8773",0x9887],
+  ["8774",0x9886],
+  ["8775",0x98D2],
+  ["8776",0x997A],
+  ["8777",0x997C],
+  ["8778",0x9975],
+  ["8779",0x9977],
+  ["877A",0x9A73],
+  ["877B",0x80AE],
+  ["877C",0x9AB0],
+  ["877D",0x9E23],
+  ["877E",0x9E22],
+  ["87A1",0x51E4],
+  ["87A2",0x9F50],
+  ["87A3",0x4EBF],
+  ["87A4",0x4EEA],
+  ["87A5",0x4EF7],
+  ["87A6",0x4FAC],
+  ["87A7",0x4FA9],
+  ["87A8",0x4FED],
+  ["87A9",0x5267],
+  ["87AA",0x5218],
+  ["87AB",0x5251],
+  ["87AC",0x523D],
+  ["87AD",0x5389],
+  ["87AE",0x5520],
+  ["87AF",0x5634],
+  ["87B0",0x54D7],
+  ["87B1",0x5618],
+  ["87B2",0x55B7],
+  ["87B3",0x5578],
+  ["87B4",0x53FD],
+  ["87B5",0x589F],
+  ["87B6",0x575F],
+  ["87B7",0x5760],
+  ["87B8",0x5815],
+  ["87B9",0x5A34],
+  ["87BA",0x5A75],
+  ["87BB",0x59A9],
+  ["87BC",0x5A07],
+  ["87BD",0x5A06],
+  ["87BE",0x5BBD],
+  ["87BF",0x5BA1],
+  ["87C0",0x5199],
+  ["87C1",0x5C42],
+  ["87C2",0x5D94],
+  ["87C3",0x5E1C],
+  ["87C4",0x5E9F],
+  ["87C5",0x53A8],
+  ["87C6",0x5E99],
+  ["87C7",0x53AE],
+  ["87C8",0x5E7F],
+  ["87C9",0x5F39],
+  ["87CA",0x5E86],
+  ["87CB",0x8651],
+  ["87CC",0x5FE7],
+  ["87CD",0x6002],
+  ["87CE",0x60AF],
+  ["87CF",0x60EE],
+  ["87D0",0x6124],
+  ["87D1",0x6003],
+  ["87D2",0x631A],
+  ["87D3",0x6251],
+  ["87D4",0x635E],
+  ["87D5",0x62E8],
+  ["87D6",0x6320],
+  ["87D7",0x629A],
+  ["87D8",0x63B8],
+  ["87D9",0x63FF],
+  ["87DA",0x654C],
+  ["87DB",0x6570],
+  ["87DC",0x6682],
+  ["87DD",0x6635],
+  ["87DE",0x6837],
+  ["87DF",0x6869],
+  ["87E0",0x67A2],
+  ["87E1",0x6807],
+  ["87E2",0x697C],
+  ["87E3",0x6868],
+  ["87E4",0x4E50],
+  ["87E5",0x679E],
+  ["87E6",0x6B27],
+  ["87E7",0x6B87],
+  ["87E8",0x6BB4],
+  ["87E9",0x6D46],
+  ["87EA",0x6CFC],
+  ["87EB",0x6D01],
+  ["87EC",0x6D47],
+  ["87ED",0x6E83],
+  ["87EE",0x6DA6],
+  ["87EF",0x6DA7],
+  ["87F0",0x6D54],
+  ["87F1",0x70ED],
+  ["87F2",0x5956],
+  ["87F3",0x83B9],
+  ["87F4",0x75AE],
+  ["87F5",0x7691],
+  ["87F6",0x76B1],
+  ["87F7",0x76D8],
+  ["87F8",0x786E],
+  ["87F9",0x7801],
+  ["87FA",0x7A91],
+  ["87FB",0x7A77],
+  ["87FC",0x7F14],
+  ["87FD",0x7EC3],
+  ["87FE",0x7EAC],
+  ["8840",0x7F04],
+  ["8841",0x7F05],
+  ["8842",0x7F09],
+  ["8843",0x7F16],
+  ["8844",0x7F18],
+  ["8845",0x7EBF],
+  ["8846",0x7F0E],
+  ["8847",0x7F13],
+  ["8848",0x7F0D],
+  ["8849",0x7F02],
+  ["884A",0x7F08],
+  ["884B",0x7F07],
+  ["884C",0x9A82],
+  ["884D",0x7F62],
+  ["884E",0x80F6],
+  ["884F",0x80A4],
+  ["8850",0x83B2],
+  ["8851",0x836B],
+  ["8852",0x848B],
+  ["8853",0x867E],
+  ["8854",0x8717],
+  ["8855",0x536B],
+  ["8856",0x8C0A],
+  ["8857",0x8C05],
+  ["8858",0x8C08],
+  ["8859",0x8C06],
+  ["885A",0x8BDE],
+  ["885B",0x8BF7],
+  ["885C",0x8BF8],
+  ["885D",0x8BFE],
+  ["885E",0x8BFF],
+  ["885F",0x8C04],
+  ["8860",0x8C03],
+  ["8861",0x8C01],
+  ["8862",0x8BBA],
+  ["8863",0x8BE4],
+  ["8864",0x8C07],
+  ["8865",0x8BFD],
+  ["8866",0x8C00],
+  ["8867",0x7AD6],
+  ["8868",0x8D54],
+  ["8869",0x8D4F],
+  ["886A",0x8D4B],
+  ["886B",0x8D31],
+  ["886C",0x8D26],
+  ["886D",0x8D4C],
+  ["886E",0x8D24],
+  ["886F",0x5356],
+  ["8870",0x8D50],
+  ["8871",0x8D28],
+  ["8872",0x8D53],
+  ["8873",0x8DF5],
+  ["8874",0x8F89],
+  ["8875",0x8F86],
+  ["8876",0x8F8D],
+  ["8877",0x8F88],
+  ["8878",0x8F87],
+  ["8879",0x8F6E],
+  ["887A",0x8F8E],
+  ["887B",0x8F8B],
+  ["887C",0x8F8A],
+  ["887D",0x9002],
+  ["887E",0x8FC1],
+  ["88A1",0x90BB],
+  ["88A2",0x90D1],
+  ["88A3",0x9093],
+  ["88A4",0x950C],
+  ["88A5",0x9511],
+  ["88A6",0x9500],
+  ["88A7",0x94FA],
+  ["88A8",0x94D0],
+  ["88A9",0x9504],
+  ["88AA",0x94DD],
+  ["88AB",0x9510],
+  ["88AC",0x9509],
+  ["88AD",0x950B],
+  ["88AE",0x94A1],
+  ["88AF",0x9502],
+  ["88B0",0x95FE],
+  ["88B1",0x9605],
+  ["88B2",0x5DE9],
+  ["88B3",0x9889],
+  ["88B4",0x988C],
+  ["88B5",0x517B],
+  ["88B6",0x997F],
+  ["88B7",0x9981],
+  ["88B8",0x9A7C],
+  ["88B9",0x9A7B],
+  ["88BA",0x9A77],
+  ["88BB",0x9A76],
+  ["88BC",0x9A7D],
+  ["88BD",0x9A7E],
+  ["88BE",0x9A79],
+  ["88BF",0x9A78],
+  ["88C0",0x9AB7],
+  ["88C1",0x95F9],
+  ["88C2",0x9C7F],
+  ["88C3",0x9C81],
+  ["88C4",0x9E29],
+  ["88C5",0x9E26],
+  ["88C6",0x9EB8],
+  ["88C7",0x9F7F],
+  ["88C8",0x4FE6],
+  ["88C9",0x50A7],
+  ["88CA",0x4FAA],
+  ["88CB",0x5E42],
+  ["88CC",0x5242],
+  ["88CD",0x5428],
+  ["88CE",0x54DD],
+  ["88CF",0x55F3],
+  ["88D0",0x57A6],
+  ["88D1",0x575B],
+  ["88D2",0x594B],
+  ["88D3",0x8885],
+  ["88D4",0x5B66],
+  ["88D5",0x5BFC],
+  ["88D6",0x5BAA],
+  ["88D7",0x51ED],
+  ["88D8",0x60EB],
+  ["88D9",0x61D4],
+  ["88DA",0x5FC6],
+  ["88DB",0x6218],
+  ["88DC",0x62E5],
+  ["88DD",0x6321],
+  ["88DE",0x631E],
+  ["88DF",0x636E],
+  ["88E0",0x63B3],
+  ["88E1",0x62E9],
+  ["88E2",0x6361],
+  ["88E3",0x62C5],
+  ["88E4",0x631D],
+  ["88E5",0x5386],
+  ["88E6",0x6653],
+  ["88E7",0x6654],
+  ["88E8",0x6619],
+  ["88E9",0x6866],
+  ["88EA",0x6A2A],
+  ["88EB",0x6811],
+  ["88EC",0x692D],
+  ["88ED",0x6865],
+  ["88EE",0x673A],
+  ["88EF",0x6861],
+  ["88F0",0x6DC0],
+  ["88F1",0x6D53],
+  ["88F2",0x6CFD],
+  ["88F3",0x6D4A],
+  ["88F4",0x6CA3],
+  ["88F5",0x6FA6],
+  ["88F6",0x6E11],
+  ["88F7",0x70BD],
+  ["88F8",0x70E7],
+  ["88F9",0x706F],
+  ["88FA",0x70EB],
+  ["88FB",0x7116],
+  ["88FC",0x72EC],
+  ["88FD",0x7391],
+  ["88FE",0x74EF],
+  ["8940",0x7618],
+  ["8941",0x5362],
+  ["8942",0x7792],
+  ["8943",0x7816],
+  ["8944",0x789B],
+  ["8945",0x79EF],
+  ["8946",0x9896],
+  ["8947",0x7A23],
+  ["8948",0x7AA5],
+  ["8949",0x7B03],
+  ["894A",0x7B5B],
+  ["894B",0x7F22],
+  ["894C",0x7F23],
+  ["894D",0x8426],
+  ["894E",0x7F1A],
+  ["894F",0x53BF],
+  ["8950",0x7F1F],
+  ["8951",0x7F1C],
+  ["8952",0x7F19],
+  ["8953",0x7EC9],
+  ["8954",0x817B],
+  ["8955",0x5174],
+  ["8956",0x8231],
+  ["8957",0x8361],
+  ["8958",0x8427],
+  ["8959",0x829C],
+  ["895A",0x8682],
+  ["895B",0x8424],
+  ["895C",0x88E4],
+  ["895D",0x4EB2],
+  ["895E",0x89CE],
+  ["895F",0x8C1B],
+  ["8960",0x8C1A],
+  ["8961",0x8C0F],
+  ["8962",0x8BB3],
+  ["8963",0x8C0B],
+  ["8964",0x8C0D],
+  ["8965",0x8C10],
+  ["8966",0x8C18],
+  ["8967",0x8BFA],
+  ["8968",0x8C12],
+  ["8969",0x8C13],
+  ["896A",0x8BBD],
+  ["896B",0x8C15],
+  ["896C",0x8C19],
+  ["896D",0x8C0C],
+  ["896E",0x8C16],
+  ["896F",0x8D56],
+  ["8970",0x8F90],
+  ["8971",0x8F91],
+  ["8972",0x8F93],
+  ["8973",0x8F8F],
+  ["8974",0x529E],
+  ["8975",0x9009],
+  ["8976",0x8FDF],
+  ["8977",0x8FBD],
+  ["8978",0x9057],
+  ["8979",0x90BA],
+  ["897A",0x952D],
+  ["897B",0x952F],
+  ["897C",0x9530],
+  ["897D",0x9519],
+  ["897E",0x94B1],
+  ["89A1",0x94A2],
+  ["89A2",0x9521],
+  ["89A3",0x5F55],
+  ["89A4",0x94EE],
+  ["89A5",0x9525],
+  ["89A6",0x9526],
+  ["89A7",0x951F],
+  ["89A8",0x9522],
+  ["89A9",0x9531],
+  ["89AA",0x960E],
+  ["89AB",0x968F],
+  ["89AC",0x9669],
+  ["89AD",0x9759],
+  ["89AE",0x817C],
+  ["89AF",0x988A],
+  ["89B0",0x9888],
+  ["89B1",0x9891],
+  ["89B2",0x9894],
+  ["89B3",0x5934],
+  ["89B4",0x9893],
+  ["89B5",0x9890],
+  ["89B6",0x9986],
+  ["89B7",0x996F],
+  ["89B8",0x9984],
+  ["89B9",0x9985],
+  ["89BA",0x9A87],
+  ["89BB",0x9A88],
+  ["89BC",0x9A86],
+  ["89BD",0x9AB8],
+  ["89BE",0x9ABC],
+  ["89BF",0x9C8D],
+  ["89C0",0x9E35],
+  ["89C1",0x9E2A],
+  ["89C2",0x9E2F],
+  ["89C3",0x9E2D],
+  ["89C4",0x9E33],
+  ["89C5",0x9F99],
+  ["89C6",0x9F9F],
+  ["89C7",0x4F18],
+  ["89C8",0x507F],
+  ["89C9",0x50A8],
+  ["89CA",0x52B1],
+  ["89CB",0x549B],
+  ["89CC",0x5413],
+  ["89CD",0x538B],
+  ["89CE",0x57D9],
+  ["89CF",0x5A74],
+  ["89D0",0x5AD4],
+  ["89D1",0x5B37],
+  ["89D2",0x5C34],
+  ["89D3",0x5C66],
+  ["89D4",0x5C7F],
+  ["89D5",0x5D58],
+  ["89D6",0x5E2E],
+  ["89D7",0x5F25],
+  ["89D8",0x5E94],
+  ["89D9",0x6073],
+  ["89DA",0x620F],
+  ["89DB",0x51FB],
+  ["89DC",0x6324],
+  ["89DD",0x62E7],
+  ["89DE",0x62DF],
+  ["89DF",0x6401],
+  ["89E0",0x655B],
+  ["89E1",0x6BD9],
+  ["89E2",0x66A7],
+  ["89E3",0x6863],
+  ["89E4",0x68C0],
+  ["89E5",0x6867],
+  ["89E6",0x6809],
+  ["89E7",0x6A2F],
+  ["89E8",0x6B93],
+  ["89E9",0x6BE1],
+  ["89EA",0x6CDE],
+  ["89EB",0x6EE8],
+  ["89EC",0x6D4E],
+  ["89ED",0x6D9B],
+  ["89EE",0x6EE5],
+  ["89EF",0x6DA9],
+  ["89F0",0x6F4D],
+  ["89F1",0x8425],
+  ["89F2",0x707F],
+  ["89F3",0x70DB],
+  ["89F4",0x70E9],
+  ["89F5",0x5899],
+  ["89F6",0x72DE],
+  ["89F7",0x83B7],
+  ["89F8",0x73AF],
+  ["89F9",0x7477],
+  ["89FA",0x75E8],
+  ["89FB",0x7597],
+  ["89FC",0x77EB],
+  ["89FD",0x78FA],
+  ["89FE",0x77F6],
+  ["8A40",0x7BD3],
+  ["8A41",0x7CAA],
+  ["8A42",0x9546],
+  ["8A43",0x7CC1],
+  ["8A44",0x7F29],
+  ["8A45",0x7EE9],
+  ["8A46",0x7F2A],
+  ["8A47",0x7F15],
+  ["8A48",0x7F27],
+  ["8A49",0x7EF7],
+  ["8A4A",0x7F1D],
+  ["8A4B",0x603B],
+  ["8A4C",0x7EB5],
+  ["8A4D",0x7F2B],
+  ["8A4E",0x7EA4],
+  ["8A4F",0x7F25],
+  ["8A50",0x7E66],
+  ["8A51",0x7F26],
+  ["8A52",0x58F0],
+  ["8A53",0x806A],
+  ["8A54",0x8054],
+  ["8A55",0x8038],
+  ["8A56",0x8113],
+  ["8A57",0x80C6],
+  ["8A58",0x8138],
+  ["8A59",0x810D],
+  ["8A5A",0x4E34],
+  ["8A5B",0x4E3E],
+  ["8A5C",0x8270],
+  ["8A5D",0x8537],
+  ["8A5E",0x84DF],
+  ["8A5F",0x4E8F],
+  ["8A60",0x877C],
+  ["8A61",0x8748],
+  ["8A62",0x4EB5],
+  ["8A63",0x891B],
+  ["8A64",0x89CA],
+  ["8A65",0x8C1C],
+  ["8A66",0x8C24],
+  ["8A67",0x8C26],
+  ["8A68",0x8BB2],
+  ["8A69",0x8C0E],
+  ["8A6A",0x8C23],
+  ["8A6B",0x8C22],
+  ["8A6C",0x8A8A],
+  ["8A6D",0x8C27],
+  ["8A6E",0x8D5A],
+  ["8A6F",0x8D5B],
+  ["8A70",0x8D2D],
+  ["8A71",0x8D59],
+  ["8A72",0x8D8B],
+  ["8A73",0x8F96],
+  ["8A74",0x8F97],
+  ["8A75",0x6BC2],
+  ["8A76",0x8F95],
+  ["8A77",0x8206],
+  ["8A78",0x8FD8],
+  ["8A79",0x8FC8],
+  ["8A7A",0x915D],
+  ["8A7B",0x9540],
+  ["8A7C",0x9541],
+  ["8A7D",0x951A],
+  ["8A7E",0x952E],
+  ["8AA1",0x9532],
+  ["8AA2",0x9505],
+  ["8AA3",0x9524],
+  ["8AA4",0x953A],
+  ["8AA5",0x9539],
+  ["8AA6",0x953B],
+  ["8AA7",0x953E],
+  ["8AA8",0x9537],
+  ["8AA9",0x9614],
+  ["8AAA",0x9615],
+  ["8AAB",0x9611],
+  ["8AAC",0x95F1],
+  ["8AAD",0x9690],
+  ["8AAE",0x96B6],
+  ["8AAF",0x867D],
+  ["8AB0",0x97E9],
+  ["8AB1",0x9897],
+  ["8AB2",0x98D3],
+  ["8AB3",0x9A8B],
+  ["8AB4",0x9A8F],
+  ["8AB5",0x9C9C],
+  ["8AB6",0x9C9B],
+  ["8AB7",0x9C94],
+  ["8AB8",0x9C91],
+  ["8AB9",0x9E3F],
+  ["8ABA",0x9E3D],
+  ["8ABB",0x70B9],
+  ["8ABC",0x658B],
+  ["8ABD",0x4E1B],
+  ["8ABE",0x565C],
+  ["8ABF",0x5739],
+  ["8AC0",0x5792],
+  ["8AC1",0x5A76],
+  ["8AC2",0x61D1],
+  ["8AC3",0x6269],
+  ["8AC4",0x63B7],
+  ["8AC5",0x6270],
+  ["8AC6",0x64B5],
+  ["8AC7",0x6446],
+  ["8AC8",0x64DE],
+  ["8AC9",0x64B7],
+  ["8ACA",0x65AD],
+  ["8ACB",0x69DF],
+  ["8ACC",0x67DC],
+  ["8ACD",0x69DB],
+  ["8ACE",0x67E0],
+  ["8ACF",0x6B24],
+  ["8AD0",0x5F52],
+  ["8AD1",0x6BA1],
+  ["8AD2",0x6CFB],
+  ["8AD3",0x6E16],
+  ["8AD4",0x6EE4],
+  ["8AD5",0x6E0E],
+  ["8AD6",0x6E85],
+  ["8AD7",0x6D4F],
+  ["8AD8",0x70EC],
+  ["8AD9",0x7118],
+  ["8ADA",0x72B7],
+  ["8ADB",0x730E],
+  ["8ADC",0x74EE],
+  ["8ADD",0x75A0],
+  ["8ADE",0x7751],
+  ["8ADF",0x7840],
+  ["8AE0",0x793C],
+  ["8AE1",0x7A51],
+  ["8AE2",0x79FD],
+  ["8AE3",0x7A9C],
+  ["8AE4",0x7A8D],
+  ["8AE5",0x7BAB],
+  ["8AE6",0x7C27],
+  ["8AE7",0x7BAA],
+  ["8AE8",0x7BD1],
+  ["8AE9",0x7B80],
+  ["8AEA",0x7CAE],
+  ["8AEB",0x7EC7],
+  ["8AEC",0x7F2E],
+  ["8AED",0x7ED5],
+  ["8AEE",0x7F2D],
+  ["8AEF",0x7EE3],
+  ["8AF0",0x7F2F],
+  ["8AF1",0x7FD8],
+  ["8AF2",0x804C],
+  ["8AF3",0x8042],
+  ["8AF4",0x8110],
+  ["8AF5",0x8191],
+  ["8AF6",0x65E7],
+  ["8AF7",0x8428],
+  ["8AF8",0x84DD],
+  ["8AF9",0x8360],
+  ["8AFA",0x86F2],
+  ["8AFB",0x8749],
+  ["8AFC",0x89D0],
+  ["8AFD",0x89DE],
+  ["8AFE",0x8C1F],
+  ["8B40",0x8C28],
+  ["8B41",0x8C2C],
+  ["8B42",0x8C2A],
+  ["8B43",0x8D58],
+  ["8B44",0x8E52],
+  ["8B45",0x8FF9],
+  ["8B46",0x8DF8],
+  ["8B47",0x8EAF],
+  ["8B48",0x8F6C],
+  ["8B49",0x8F99],
+  ["8B4A",0x8FE9],
+  ["8B4B",0x533B],
+  ["8B4C",0x9171],
+  ["8B4D",0x9551],
+  ["8B4E",0x9501],
+  ["8B4F",0x94A8],
+  ["8B50",0x954D],
+  ["8B51",0x9547],
+  ["8B52",0x9550],
+  ["8B53",0x9552],
+  ["8B54",0x9549],
+  ["8B55",0x9616],
+  ["8B56",0x95EF],
+  ["8B57",0x9617],
+  ["8B58",0x9619],
+  ["8B59",0x6742],
+  ["8B5A",0x53CC],
+  ["8B5B",0x96CF],
+  ["8B5C",0x9E21],
+  ["8B5D",0x989D],
+  ["8B5E",0x989C],
+  ["8B5F",0x9898],
+  ["8B60",0x989A],
+  ["8B61",0x989B],
+  ["8B62",0x998F],
+  ["8B63",0x998A],
+  ["8B64",0x9988],
+  ["8B65",0x9A91],
+  ["8B66",0x9AC1],
+  ["8B67",0x9CA8],
+  ["8B68",0x9CA4],
+  ["8B69",0x9CAB],
+  ["8B6A",0x9CA7],
+  ["8B6B",0x9E43],
+  ["8B6C",0x9E45],
+  ["8B6D",0x9E44],
+  ["8B6E",0x5784],
+  ["8B6F",0x575C],
+  ["8B70",0x5BA0],
+  ["8B71",0x5E9E],
+  ["8B72",0x5E90],
+  ["8B73",0x60E9],
+  ["8B74",0x6000],
+  ["8B75",0x61D2],
+  ["8B76",0x62E2],
+  ["8B77",0x65F7],
+  ["8B78",0x6A71],
+  ["8B79",0x691F],
+  ["8B7A",0x6988],
+  ["8B7B",0x6A79],
+  ["8B7C",0x6F47],
+  ["8B7D",0x6FD1],
+  ["8B7E",0x6CA5],
+  ["8BA1",0x6FD2],
+  ["8BA2",0x6CF8],
+  ["8BA3",0x70C1],
+  ["8BA4",0x724D],
+  ["8BA5",0x728A],
+  ["8BA6",0x517D],
+  ["8BA7",0x736D],
+  ["8BA8",0x73BA],
+  ["8BA9",0x743C],
+  ["8BAA",0x7574],
+  ["8BAB",0x762A],
+  ["8BAC",0x788D],
+  ["8BAD",0x7977],
+  ["8BAE",0x7A33],
+  ["8BAF",0x7B7E],
+  ["8BB0",0x8327],
+  ["8BB1",0x7ECE],
+  ["8BB2",0x7EF3],
+  ["8BB3",0x7ED8],
+  ["8BB4",0x7F57],
+  ["8BB5",0x7F34],
+  ["8BB6",0x81BB],
+  ["8BB7",0x827A],
+  ["8BB8",0x85AE],
+  ["8BB9",0x836F],
+  ["8BBA",0x8681],
+  ["8BBB",0x8747],
+  ["8BBC",0x88C6],
+  ["8BBD",0x8884],
+  ["8BBE",0x8C31],
+  ["8BBF",0x8BC6],
+  ["8BC0",0x8C2D],
+  ["8BC1",0x8C32],
+  ["8BC2",0x8BA5],
+  ["8BC3",0x8C2F],
+  ["8BC4",0x8D60],
+  ["8BC5",0x8D5E],
+  ["8BC6",0x8DF7],
+  ["8BC7",0x8F9A],
+  ["8BC8",0x8F7F],
+  ["8BC9",0x8F9E],
+  ["8BCA",0x8FB9],
+  ["8BCB",0x955C],
+  ["8BCC",0x955D],
+  ["8BCD",0x955E],
+  ["8BCE",0x94FE],
+  ["8BCF",0x9557],
+  ["8BD0",0x9558],
+  ["8BD1",0x9556],
+  ["8BD2",0x9559],
+  ["8BD3",0x9535],
+  ["8BD4",0x9542],
+  ["8BD5",0x94FF],
+  ["8BD6",0x933E],
+  ["8BD7",0x5173],
+  ["8BD8",0x9647],
+  ["8BD9",0x96BE],
+  ["8BDA",0x96FE],
+  ["8BDB",0x97EC],
+  ["8BDC",0x97F5],
+  ["8BDD",0x7C7B],
+  ["8BDE",0x98A0],
+  ["8BDF",0x98D5],
+  ["8BE0",0x9992],
+  ["8BE1",0x9991],
+  ["8BE2",0x9A9B],
+  ["8BE3",0x9A97],
+  ["8BE4",0x9CB8],
+  ["8BE5",0x9CB3],
+  ["8BE6",0x9CAD],
+  ["8BE7",0x9CB7],
+  ["8BE8",0x9E51],
+  ["8BE9",0x9E49],
+  ["8BEA",0x9E4A],
+  ["8BEB",0x9E4C],
+  ["8BEC",0x9E4F],
+  ["8BED",0x4E3D],
+  ["8BEE",0x9EB4],
+  ["8BEF",0x529D],
+  ["8BF0",0x5499],
+  ["8BF1",0x5624],
+  ["8BF2",0x4E25],
+  ["8BF3",0x5B9D],
+  ["8BF4",0x60AC],
+  ["8BF5",0x5FCF],
+  ["8BF6",0x62E6],
+  ["8BF7",0x6400],
+  ["8BF8",0x80E7],
+  ["8BF9",0x6987],
+  ["8BFA",0x6F9C],
+  ["8BFB",0x6F4B],
+  ["8BFC",0x7089],
+  ["8BFD",0x73D1],
+  ["8BFE",0x77FF],
+  ["8C40",0x783A],
+  ["8C41",0x77FE],
+  ["8C42",0x783E],
+  ["8C43",0x7AA6],
+  ["8C44",0x7ADE],
+  ["8C45",0x7B79],
+  ["8C46",0x7BEE],
+  ["8C47",0x8FAB],
+  ["8C48",0x7F24],
+  ["8C49",0x7EE7],
+  ["8C4A",0x7F42],
+  ["8C4B",0x80EA],
+  ["8C4C",0x8230],
+  ["8C4D",0x853C],
+  ["8C4E",0x853A],
+  ["8C4F",0x82A6],
+  ["8C50",0x82F9],
+  ["8C51",0x8574],
+  ["8C52",0x869D],
+  ["8C53",0x8934],
+  ["8C54",0x89C9],
+  ["8C55",0x89E6],
+  ["8C56",0x8BAE],
+  ["8C57",0x8BD1],
+  ["8C58",0x8C35],
+  ["8C59",0x8D62],
+  ["8C5A",0x8D61],
+  ["8C5B",0x8DB8],
+  ["8C5C",0x91CA],
+  ["8C5D",0x949F],
+  ["8C5E",0x94D9],
+  ["8C5F",0x9508],
+  ["8C60",0x9610],
+  ["8C61",0x98D8],
+  ["8C62",0x9976],
+  ["8C63",0x9965],
+  ["8C64",0x9A9E],
+  ["8C65",0x817E],
+  ["8C66",0x9A9A],
+  ["8C67",0x9CC3],
+  ["8C68",0x9CC5],
+  ["8C69",0x515A],
+  ["8C6A",0x9F83],
+  ["8C6B",0x9F84],
+  ["8C6C",0x4FEA],
+  ["8C6D",0x55EB],
+  ["8C6E",0x556D],
+  ["8C6F",0x56A3],
+  ["8C70",0x5C5E],
+  ["8C71",0x60E7],
+  ["8C72",0x6151],
+  ["8C73",0x6444],
+  ["8C74",0x643A],
+  ["8C75",0x6593],
+  ["8C76",0x6A31],
+  ["8C77",0x680F],
+  ["8C78",0x68C2],
+  ["8C79",0x6B7C],
+  ["8C7A",0x70C2],
+  ["8C7B",0x727A],
+  ["8C7C",0x9576],
+  ["8C7D",0x748E],
+  ["8C7E",0x765E],
+  ["8CA1",0x7F20],
+  ["8CA2",0x7EED],
+  ["8CA3",0x5170],
+  ["8CA4",0x85D3],
+  ["8CA5",0x86CE],
+  ["8CA6",0x89C8],
+  ["8CA7",0x8C34],
+  ["8CA8",0x62A4],
+  ["8CA9",0x8A89],
+  ["8CAA",0x8D43],
+  ["8CAB",0x8E0C],
+  ["8CAC",0x8DC3],
+  ["8CAD",0x8DFB],
+  ["8CAE",0x8F70],
+  ["8CAF",0x8FA9],
+  ["8CB0",0x9570],
+  ["8CB1",0x956D],
+  ["8CB2",0x94C1],
+  ["8CB3",0x94DB],
+  ["8CB4",0x94CE],
+  ["8CB5",0x956F],
+  ["8CB6",0x954C],
+  ["8CB7",0x54CD],
+  ["8CB8",0x987E],
+  ["8CB9",0x98A2],
+  ["8CBA",0x98E8],
+  ["8CBB",0x9A71],
+  ["8CBC",0x9AA0],
+  ["8CBD",0x84E6],
+  ["8CBE",0x9AA1],
+  ["8CBF",0x9AC5],
+  ["8CC0",0x9CCD],
+  ["8CC1",0x9CCF],
+  ["8CC2",0x83BA],
+  ["8CC3",0x9E64],
+  ["8CC4",0x9E5E],
+  ["8CC5",0x9F87],
+  ["8CC6",0x9F88],
+  ["8CC7",0x556E],
+  ["8CC8",0x4FE8],
+  ["8CC9",0x50A5],
+  ["8CCA",0x5453],
+  ["8CCB",0x5B6A],
+  ["8CCC",0x5DC5],
+  ["8CCD",0x5CE6],
+  ["8CCE",0x5F2F],
+  ["8CCF",0x644A],
+  ["8CD0",0x6743],
+  ["8CD1",0x6B22],
+  ["8CD2",0x6EE9],
+  ["8CD3",0x7321],
+  ["8CD4",0x53E0],
+  ["8CD5",0x763E],
+  ["8CD6",0x7663],
+  ["8CD7",0x7B3C],
+  ["8CD8",0x7C41],
+  ["8CD9",0x804B],
+  ["8CDA",0x810F],
+  ["8CDB",0x88AD],
+  ["8CDC",0x886C],
+  ["8CDD",0x8BFB],
+  ["8CDE",0x8D4E],
+  ["8CDF",0x8D5D],
+  ["8CE0",0x8E2F],
+  ["8CE1",0x8E2C],
+  ["8CE2",0x8F94],
+  ["8CE3",0x90E6],
+  ["8CE4",0x94F8],
+  ["8CE5",0x9274],
+  ["8CE6",0x9701],
+  ["8CE7",0x9791],
+  ["8CE8",0x7E6E],
+  ["8CE9",0x98A4],
+  ["8CEA",0x9A84],
+  ["8CEB",0x9A81],
+  ["8CEC",0x9CD6],
+  ["8CED",0x9CA2],
+  ["8CEE",0x9CD4],
+  ["8CEF",0x9CD7],
+  ["8CF0",0x9E67],
+  ["8CF1",0x9E25],
+  ["8CF2",0x9F39],
+  ["8CF3",0x9F89],
+  ["8CF4",0x9F8A],
+  ["8CF5",0x9F9A],
+  ["8CF6",0x604B],
+  ["8CF7",0x631B],
+  ["8CF8",0x6405],
+  ["8CF9",0x74D2],
+  ["8CFA",0x7A83],
+  ["8CFB",0x7F28],
+  ["8CFC",0x81E2],
+  ["8CFD",0x841D],
+  ["8CFE",0x86CA],
+  ["8D40",0x53D8],
+  ["8D41",0x9026],
+  ["8D42",0x903B],
+  ["8D43",0x9573],
+  ["8D44",0x94C4],
+  ["8D45",0x9765],
+  ["8D46",0x663E],
+  ["8D47",0x990D],
+  ["8D48",0x60CA],
+  ["8D49",0x9A7F],
+  ["8D4A",0x9A8C],
+  ["8D4B",0x9AD3],
+  ["8D4C",0x9AD1],
+  ["8D4D",0x9CDD],
+  ["8D4E",0x9CDE],
+  ["8D4F",0x9CDC],
+  ["8D50",0x9E36],
+  ["8D51",0x5631],
+  ["8D52",0x575D],
+  ["8D53",0x63FD],
+  ["8D54",0x762B],
+  ["8D55",0x766B],
+  ["8D56",0x7F81],
+  ["8D57",0x8695],
+  ["8D58",0x8BA9],
+  ["8D59",0x8C17],
+  ["8D5A",0x8C36],
+  ["8D5B",0x8273],
+  ["8D5C",0x8D63],
+  ["8D5D",0x917F],
+  ["8D5E",0x96F3],
+  ["8D5F",0x7075],
+  ["8D60",0x972D],
+  ["8D61",0x98A6],
+  ["8D62",0x9AA4],
+  ["8D63",0x9B13],
+  ["8D64",0x9B47],
+  ["8D65",0x9C8E],
+  ["8D66",0x9E70],
+  ["8D67",0x9E6D],
+  ["8D68",0x7877],
+  ["8D69",0x76D0],
+  ["8D6A",0x9CCC],
+  ["8D6B",0x9F8C],
+  ["8D6C",0x9F8B],
+  ["8D6D",0x5385],
+  ["8D6E",0x6984],
+  ["8D6F",0x6E7E],
+  ["8D70",0x7BF1],
+  ["8D71",0x7BA9],
+  ["8D72",0x86EE],
+  ["8D73",0x89C2],
+  ["8D74",0x8E51],
+  ["8D75",0x8845],
+  ["8D76",0x94A5],
+  ["8D77",0x9885],
+  ["8D78",0x998B],
+  ["8D79",0x9ACB],
+  ["8D7A",0x9EC9],
+  ["8D7B",0x6EE6],
+  ["8D7C",0x77A9],
+  ["8D7D",0x954A],
+  ["8D7E",0x97AF],
+  ["8DA1",0x9A74],
+  ["8DA2",0x9AA5],
+  ["8DA3",0x7F06],
+  ["8DA4",0x8C20],
+  ["8DA5",0x8E8F],
+  ["8DA6",0x917D],
+  ["8DA7",0x94BB],
+  ["8DA8",0x92AE],
+  ["8DA9",0x9523],
+  ["8DAA",0x9CC4],
+  ["8DAB",0x9C88],
+  ["8DAC",0x9EE9],
+  ["8DAD",0x51FF],
+  ["8DAE",0x9E66],
+  ["8DAF",0x9A8A],
+  ["8DB0",0x9E73],
+  ["8DB1",0x9E3E],
+  ["8DB2",0x94BA],
+  ["8DB3",0x4EC2],
+  ["8DB4",0x864D],
+  ["8DB5",0x6B92],
+  ["8DB6",0x57A7],
+  ["8DB7",0x577B],
+  ["8DB8",0x620B],
+  ["8DB9",0x4FE3],
+  ["8DBA",0x522D],
+  ["8DBB",0x538D],
+  ["8DBC",0x5459],
+  ["8DBD",0x537A],
+  ["8DBE",0x7EA8],
+  ["8DBF",0x8307],
+  ["8DC0",0x9487],
+  ["8DC1",0x9486],
+  ["8DC2",0x5457],
+  ["8DC3",0x5F2A],
+  ["8DC4",0x7953],
+  ["8DC5",0x7EBE],
+  ["8DC6",0x90CF],
+  ["8DC7",0x948C],
+  ["8DC8",0x5250],
+  ["8DC9",0x5326],
+  ["8DCA",0x56F5],
+  ["8DCB",0x57AD],
+  ["8DCC",0x5A05],
+  ["8DCD",0x5CBD],
+  ["8DCE",0x5D03],
+  ["8DCF",0x6D9E],
+  ["8DD0",0x6E0C],
+  ["8DD1",0x70C3],
+  ["8DD2",0x7726],
+  ["8DD3",0x7EC0],
+  ["8DD4",0x7ED0],
+  ["8DD5",0x80EB],
+  ["8DD6",0x948E],
+  ["8DD7",0x9490],
+  ["8DD8",0x9495],
+  ["8DD9",0x948D],
+  ["8DDA",0x95EB],
+  ["8DDB",0x59AB],
+  ["8DDC",0x5D5B],
+  ["8DDD",0x607D],
+  ["8DDE",0x6860],
+  ["8DDF",0x67A8],
+  ["8DE0",0x6CA9],
+  ["8DE1",0x6D48],
+  ["8DE2",0x7572],
+  ["8DE3",0x7817],
+  ["8DE4",0x7ED7],
+  ["8DE5",0x83DD],
+  ["8DE6",0x89C7],
+  ["8DE7",0x8BB5],
+  ["8DE8",0x8BCE],
+  ["8DE9",0x8BD2],
+  ["8DEA",0x8D36],
+  ["8DEB",0x8D33],
+  ["8DEC",0x8F7A],
+  ["8DED",0x8F75],
+  ["8DEE",0x8F78],
+  ["8DEF",0x902F],
+  ["8DF0",0x90D3],
+  ["8DF1",0x9104],
+  ["8DF2",0x94AB],
+  ["8DF3",0x94AC],
+  ["8DF4",0x949B],
+  ["8DF5",0x94AF],
+  ["8DF6",0x94AD],
+  ["8DF7",0x94AA],
+  ["8DF8",0x95F6],
+  ["8DF9",0x9667],
+  ["8DFA",0x9878],
+  ["8DFB",0x996B],
+  ["8DFC",0x9EF9],
+  ["8DFD",0x4F1B],
+  ["8DFE",0x507B],
+  ["8E40",0x4F65],
+  ["8E41",0x5522],
+  ["8E42",0x57B2],
+  ["8E43",0x5DEF],
+  ["8E44",0x5FAD],
+  ["8E45",0x709C],
+  ["8E46",0x8315],
+  ["8E47",0x72F2],
+  ["8E48",0x73AE],
+  ["8E49",0x7EE8],
+  ["8E4A",0x7EE0],
+  ["8E4B",0x7EE1],
+  ["8E4C",0x7F9F],
+  ["8E4D",0x836D],
+  ["8E4E",0x86F1],
+  ["8E4F",0x8BD3],
+  ["8E50",0x8BD6],
+  ["8E51",0x8BE9],
+  ["8E52",0x8BD4],
+  ["8E53",0x8BDC],
+  ["8E54",0x8D91],
+  ["8E55",0x8F82],
+  ["8E56",0x8F81],
+  ["8E57",0x90AC],
+  ["8E58",0x94CA],
+  ["8E59",0x94C8],
+  ["8E5A",0x94B0],
+  ["8E5B",0x94B2],
+  ["8E5C",0x94B6],
+  ["8E5D",0x950D],
+  ["8E5E",0x94CC],
+  ["8E5F",0x94BD],
+  ["8E60",0x94BC],
+  ["8E61",0x9883],
+  ["8E62",0x9880],
+  ["8E63",0x51EB],
+  ["8E64",0x9EFE],
+  ["8E65",0x507E],
+  ["8E66",0x551B],
+  ["8E67",0x5D5D],
+  ["8E68",0x5E3B],
+  ["8E69",0x60AB],
+  ["8E6A",0x60AD],
+  ["8E6B",0x6004],
+  ["8E6C",0x622C],
+  ["8E6D",0x6217],
+  ["8E6E",0x629F],
+  ["8E6F",0x62A0],
+  ["8E70",0x63BC],
+  ["8E71",0x6864],
+  ["8E72",0x6769],
+  ["8E73",0x8365],
+  ["8E74",0x6D52],
+  ["8E75",0x6CA4],
+  ["8E76",0x709D],
+  ["8E77",0x76B2],
+  ["8E78",0x7800],
+  ["8E79",0x7EFB],
+  ["8E7A",0x7EF2],
+  ["8E7B",0x7EEF],
+  ["8E7C",0x7EFA],
+  ["8E7D",0x83B3],
+  ["8E7E",0x89CB],
+  ["8EA1",0x8BF6],
+  ["8EA2",0x8D47],
+  ["8EA3",0x94F1],
+  ["8EA4",0x94D2],
+  ["8EA5",0x94D1],
+  ["8EA6",0x94D5],
+  ["8EA7",0x94DF],
+  ["8EA8",0x94EB],
+  ["8EA9",0x94EF],
+  ["8EAA",0x94EA],
+  ["8EAB",0x94F7],
+  ["8EAC",0x94D6],
+  ["8EAD",0x94E5],
+  ["8EAE",0x98D1],
+  ["8EAF",0x523F],
+  ["8EB0",0x52A2],
+  ["8EB1",0x54D3],
+  ["8EB2",0x5452],
+  ["8EB3",0x5D02],
+  ["8EB4",0x5CE4],
+  ["8EB5",0x5E91],
+  ["8EB6",0x6126],
+  ["8EB7",0x6322],
+  ["8EB8",0x6920],
+  ["8EB9",0x6BF5],
+  ["8EBA",0x988D],
+  ["8EBB",0x6D9D],
+  ["8EBC",0x6F62],
+  ["8EBD",0x6DA0],
+  ["8EBE",0x6ED7],
+  ["8EBF",0x740F],
+  ["8EC0",0x7481],
+  ["8EC1",0x7617],
+  ["8EC2",0x7F03],
+  ["8EC3",0x7F17],
+  ["8EC4",0x7F0C],
+  ["8EC5",0x7F0F],
+  ["8EC6",0x7F11],
+  ["8EC7",0x835C],
+  ["8EC8",0x848C],
+  ["8EC9",0x8311],
+  ["8ECA",0x82C1],
+  ["8ECB",0x8BF9],
+  ["8ECC",0x8BFC],
+  ["8ECD",0x8C02],
+  ["8ECE",0x8D55],
+  ["8ECF",0x90F8],
+  ["8ED0",0x9512],
+  ["8ED1",0x94D7],
+  ["8ED2",0x94FD],
+  ["8ED3",0x9513],
+  ["8ED4",0x950A],
+  ["8ED5",0x94E4],
+  ["8ED6",0x9506],
+  ["8ED7",0x9507],
+  ["8ED8",0x9514],
+  ["8ED9",0x9606],
+  ["8EDA",0x9603],
+  ["8EDB",0x9753],
+  ["8EDC",0x988F],
+  ["8EDD",0x997D],
+  ["8EDE",0x9A75],
+  ["8EDF",0x9A80],
+  ["8EE0",0x9C82],
+  ["8EE1",0x9E28],
+  ["8EE2",0x54D2],
+  ["8EE3",0x54D5],
+  ["8EE4",0x54D9],
+  ["8EE5",0x5AD2],
+  ["8EE6",0x5CC4],
+  ["8EE7",0x603F],
+  ["8EE8",0x6B9A],
+  ["8EE9",0x6D4D],
+  ["8EEA",0x70E8],
+  ["8EEB",0x7303],
+  ["8EEC",0x72EF],
+  ["8EED",0x789C],
+  ["8EEE",0x7AAD],
+  ["8EEF",0x7E17],
+  ["8EF0",0x7F1B],
+  ["8EF1",0x8487],
+  ["8EF2",0x8368],
+  ["8EF3",0x8489],
+  ["8EF4",0x835E],
+  ["8EF5",0x83B8],
+  ["8EF6",0x8297],
+  ["8EF7",0x86F3],
+  ["8EF8",0x8BE8],
+  ["8EF9",0x8C11],
+  ["8EFA",0x8C14],
+  ["8EFB",0x8C1D],
+  ["8EFC",0x90D0],
+  ["8EFD",0x9529],
+  ["8EFE",0x952C],
+  ["8F40",0x9516],
+  ["8F41",0x9517],
+  ["8F42",0x94FC],
+  ["8F43",0x951B],
+  ["8F44",0x9515],
+  ["8F45",0x951E],
+  ["8F46",0x9494],
+  ["8F47",0x960F],
+  ["8F48",0x9608],
+  ["8F49",0x9609],
+  ["8F4A",0x960A],
+  ["8F4B",0x960C],
+  ["8F4C",0x960D],
+  ["8F4D",0x9E32],
+  ["8F4E",0x9E31],
+  ["8F4F",0x54DC],
+  ["8F50",0x5E31],
+  ["8F51",0x6079],
+  ["8F52",0x6448],
+  ["8F53",0xE3C1],
+  ["8F54",0x6CF6],
+  ["8F55",0x7315],
+  ["8F56",0x7513],
+  ["8F57",0x7605],
+  ["8F58",0x75EB],
+  ["8F59",0x7857],
+  ["8F5A",0x7BA6],
+  ["8F5B",0x7B5A],
+  ["8F5C",0x7CE8],
+  ["8F5D",0x7F21],
+  ["8F5E",0x8027],
+  ["8F5F",0x835F],
+  ["8F60",0x83B6],
+  ["8F61",0x86F0],
+  ["8F62",0x88E2],
+  ["8F63",0x89CF],
+  ["8F64",0x8C21],
+  ["8F65",0x8BCC],
+  ["8F66",0x8C25],
+  ["8F67",0x8DC4],
+  ["8F68",0x9538],
+  ["8F69",0x9534],
+  ["8F6A",0x94E1],
+  ["8F6B",0x9536],
+  ["8F6C",0x9612],
+  ["8F6D",0x9967],
+  ["8F6E",0x9C92],
+  ["8F6F",0x9C95],
+  ["8F70",0x9E38],
+  ["8F71",0x9E39],
+  ["8F72",0x9E3A],
+  ["8F73",0x9F80],
+  ["8F74",0x603C],
+  ["8F75",0x6445],
+  ["8F76",0x64B8],
+  ["8F77",0x6CFA],
+  ["8F78",0x7596],
+  ["8F79",0x7F0B],
+  ["8F7A",0x8069],
+  ["8F7B",0x8369],
+  ["8F7C",0x87E5],
+  ["8F7D",0x866E],
+  ["8F7E",0x8BB4],
+  ["8FA1",0x8C29],
+  ["8FA2",0x8D5C],
+  ["8FA3",0x8D3D],
+  ["8FA4",0x8F98],
+  ["8FA5",0x909D],
+  ["8FA6",0x9553],
+  ["8FA7",0x94E0],
+  ["8FA8",0x953C],
+  ["8FA9",0x954F],
+  ["8FAA",0x84E5],
+  ["8FAB",0x97EA],
+  ["8FAC",0x9969],
+  ["8FAD",0x9A90],
+  ["8FAE",0x9A92],
+  ["8FAF",0x9A93],
+  ["8FB0",0x960B],
+  ["8FB1",0x9CA9],
+  ["8FB2",0x9CA0],
+  ["8FB3",0x9E48],
+  ["8FB4",0x9E41],
+  ["8FB5",0x9E46],
+  ["8FB6",0x53A3],
+  ["8FB7",0x5456],
+  ["8FB8",0x5786],
+  ["8FB9",0x69E0],
+  ["8FBA",0x680E],
+  ["8FBB",0x6C07],
+  ["8FBC",0x6CF7],
+  ["8FBD",0x6F46],
+  ["8FBE",0x7962],
+  ["8FBF",0x7F32],
+  ["8FC0",0x7F33],
+  ["8FC1",0x7F74],
+  ["8FC2",0x8223],
+  ["8FC3",0x86CF],
+  ["8FC4",0x867F],
+  ["8FC5",0x88E3],
+  ["8FC6",0x89D1],
+  ["8FC7",0x89EF],
+  ["8FC8",0x8C2E],
+  ["8FC9",0x955B],
+  ["8FCA",0x955F],
+  ["8FCB",0x956A],
+  ["8FCC",0x9546],
+  ["8FCD",0x94E9],
+  ["8FCE",0x97EB],
+  ["8FCF",0x98A1],
+  ["8FD0",0x9990],
+  ["8FD1",0x9AC2],
+  ["8FD2",0x9CB5],
+  ["8FD3",0x9CB6],
+  ["8FD4",0x9CBB],
+  ["8FD5",0x9CB1],
+  ["8FD6",0x9E4E],
+  ["8FD7",0x9E2B],
+  ["8FD8",0x9EFC],
+  ["8FD9",0x55BE],
+  ["8FDA",0x6484],
+  ["8FDB",0x680A],
+  ["8FDC",0x67A5],
+  ["8FDD",0x680C],
+  ["8FDE",0x7F31],
+  ["8FDF",0x804D],
+  ["8FE0",0x830F],
+  ["8FE1",0x82C8],
+  ["8FE2",0x8572],
+  ["8FE3",0x86F4],
+  ["8FE4",0x877E],
+  ["8FE5",0x94F4],
+  ["8FE6",0x9566],
+  ["8FE7",0x9568],
+  ["8FE8",0x9561],
+  ["8FE9",0x9563],
+  ["8FEA",0x9544],
+  ["8FEB",0x956B],
+  ["8FEC",0x94E7],
+  ["8FED",0x9564],
+  ["8FEE",0x94F9],
+  ["8FEF",0x961A],
+  ["8FF0",0x989F],
+  ["8FF1",0x9994],
+  ["8FF2",0x9A7A],
+  ["8FF3",0x9A9D],
+  ["8FF4",0x9A9F],
+  ["8FF5",0x9A98],
+  ["8FF6",0x9E57],
+  ["8FF7",0x9E5A],
+  ["8FF8",0x9E5C],
+  ["8FF9",0x9F86],
+  ["8FFA",0x9F85],
+  ["8FFB",0x50A9],
+  ["8FFC",0x5CBF],
+  ["8FFD",0x75C8],
+  ["8FFE",0x64BA],
+  ["9040",0x6989],
+  ["9041",0x6EE0],
+  ["9042",0x783B],
+  ["9043",0x7C9D],
+  ["9044",0x7EA9],
+  ["9045",0x7F2C],
+  ["9046",0x8539],
+  ["9047",0x8D46],
+  ["9048",0x9571],
+  ["9049",0x95FC],
+  ["904A",0x98D9],
+  ["904B",0x9AA2],
+  ["904C",0x9A96],
+  ["904D",0x9A9C],
+  ["904E",0x9CA5],
+  ["904F",0x9CCE],
+  ["9050",0x9CD0],
+  ["9051",0x9E63],
+  ["9052",0x9E58],
+  ["9053",0x9E7E],
+  ["9054",0x5181],
+  ["9055",0x5A08],
+  ["9056",0x7055],
+  ["9057",0x6512],
+  ["9058",0x763F],
+  ["9059",0x7BA8],
+  ["905A",0x7C74],
+  ["905B",0x823B],
+  ["905C",0x89CC],
+  ["905D",0x8DF9],
+  ["905E",0x8DDE],
+  ["905F",0x8F79],
+  ["9060",0x9554],
+  ["9061",0x956C],
+  ["9062",0x9AA3],
+  ["9063",0x9A85],
+  ["9064",0x9CD5],
+  ["9065",0x9CA3],
+  ["9066",0x9CA6],
+  ["9067",0x9E68],
+  ["9068",0x9E37],
+  ["9069",0x9F9B],
+  ["906A",0x683E],
+  ["906B",0x6924],
+  ["906C",0x84E0],
+  ["906D",0x96E0],
+  ["906E",0x8F73],
+  ["906F",0x9CDF],
+  ["9070",0x9C9F],
+  ["9071",0x9E69],
+  ["9072",0x9E6C],
+  ["9073",0x9E6A],
+  ["9074",0x9E6B],
+  ["9075",0x9E47],
+  ["9076",0x704F],
+  ["9077",0x7C16],
+  ["9078",0x8C30],
+  ["9079",0x9ACC],
+  ["907A",0x7B3E],
+  ["907B",0x7C9C],
+  ["907C",0x7F35],
+  ["907D",0x8114],
+  ["907E",0x8E7F],
+  ["90A1",0x9567],
+  ["90A2",0x9C9A],
+  ["90A3",0x8DB1],
+  ["90A4",0x8E9C],
+  ["90A5",0x917E],
+  ["90A6",0x8C33],
+  ["90A7",0x989E],
+  ["90A8",0x98A7],
+  ["90A9",0x9AA7],
+  ["90AA",0x9E2C],
+  ["90AB",0x6206],
+  ["90AC",0x9604],
+  ["90AD",0x9CA1],
+  ["90AE",0x9E42],
+  ["90AF",0x79B8],
+  ["90B0",0x62D4],
+  ["90B1",0x8DCB],
+  ["90B2",0x73D0],
+  ["90B3",0x5BAB],
+  ["90B4",0x62D0],
+  ["90B5",0x6BC1],
+  ["90B6",0x51CF],
+  ["90B7",0x7984],
+  ["90B8",0x5415],
+  ["90B9",0x6F5C],
+  ["90BA",0x889C],
+  ["90BB",0x90E7],
+  ["90BC",0x5179],
+  ["90BD",0x6238],
+  ["90BE",0x629B],
+  ["90BF",0x6327],
+  ["90C0",0x63BB],
+  ["90C1",0x63DE],
+  ["90C2",0x63FA],
+  ["90C3",0x6491],
+  ["90C4",0x64C0],
+  ["90C5",0x64E1],
+  ["90C6",0x64F6],
+  ["90C7",0x6505],
+  ["90C8",0x6535],
+  ["90C9",0x654E],
+  ["90CA",0x656B],
+  ["90CB",0x6588],
+  ["90CC",0x65D9],
+  ["90CD",0x661E],
+  ["90CE",0x663B],
+  ["90CF",0x663F],
+  ["90D0",0x6644],
+  ["90D1",0x6657],
+  ["90D2",0x6669],
+  ["90D3",0x6673],
+  ["90D4",0x6683],
+  ["90D5",0x66BC],
+  ["90D6",0x66BF],
+  ["90D7",0x66C1],
+  ["90D8",0x66F5],
+  ["90D9",0x66FA],
+  ["90DA",0x66FB],
+  ["90DB",0x670E],
+  ["90DC",0x6716],
+  ["90DD",0x6737],
+  ["90DE",0x6764],
+  ["90DF",0x6766],
+  ["90E0",0x67A6],
+  ["90E1",0x67A7],
+  ["90E2",0x67A9],
+  ["90E3",0x67FB],
+  ["90E4",0x67FD],
+  ["90E5",0x6800],
+  ["90E6",0x6801],
+  ["90E7",0x6805],
+  ["90E8",0x681E],
+  ["90E9",0x684A],
+  ["90EA",0x6852],
+  ["90EB",0x6855],
+  ["90EC",0x6859],
+  ["90ED",0x688D],
+  ["90EE",0x68B9],
+  ["90EF",0x68CF],
+  ["90F0",0x5088],
+  ["90F1",0x9528],
+  ["90F2",0x9C97],
+  ["90F3",0x6922],
+  ["90F4",0x6926],
+  ["90F5",0x00DC],
+  ["90F6",0xE4DF],
+  ["90F7",0xE4E0],
+  ["90F8",0x00FC],
+  ["90F9",0xE4E2],
+  ["90FA",0xE4E3],
+  ["90FB",0x00DC],
+  ["90FC",0x00FC],
+  ["90FD",0x6936],
+  ["90FE",0x6961],
+  ["9140",0x82C5],
+  ["9141",0x82CA],
+  ["9142",0x82D8],
+  ["9143",0x8318],
+  ["9144",0x831A],
+  ["9145",0x8323],
+  ["9146",0x8346],
+  ["9147",0x835B],
+  ["9148",0x8362],
+  ["9149",0x836C],
+  ["914A",0x836E],
+  ["914B",0x839C],
+  ["914C",0x839F],
+  ["914D",0x83B5],
+  ["914E",0x83BC],
+  ["914F",0x83F7],
+  ["9150",0x842A],
+  ["9151",0x8448],
+  ["9152",0x845C],
+  ["9153",0x8462],
+  ["9154",0x8484],
+  ["9155",0x8488],
+  ["9156",0x84DC],
+  ["9157",0x84E3],
+  ["9158",0x8538],
+  ["9159",0x855A],
+  ["915A",0x8597],
+  ["915B",0x85AB],
+  ["915C",0x85C1],
+  ["915D",0x8613],
+  ["915E",0x8616],
+  ["915F",0x220B],
+  ["9160",0x8715],
+  ["9161",0x8770],
+  ["9162",0x877D],
+  ["9163",0x878B],
+  ["9164",0x87A8],
+  ["9165",0x87C7],
+  ["9166",0x87D0],
+  ["9167",0x8807],
+  ["9168",0x880E],
+  ["9169",0x8827],
+  ["916A",0x88AE],
+  ["916B",0x2208],
+  ["916C",0x88B5],
+  ["916D",0x88BF],
+  ["916E",0x88E5],
+  ["916F",0x88F5],
+  ["9170",0x891C],
+  ["9171",0x891D],
+  ["9172",0x8977],
+  ["9173",0x89E7],
+  ["9174",0x8A37],
+  ["9175",0x8AAC],
+  ["9176",0x8ADA],
+  ["9177",0x8B5B],
+  ["9178",0x8B71],
+  ["9179",0x8C2B],
+  ["917A",0x8C3A],
+  ["917B",0x8C7C],
+  ["917C",0x8C8E],
+  ["917D",0x8CAE],
+  ["917E",0x8D12],
+  ["91A1",0x8D49],
+  ["91A2",0x8D4D],
+  ["91A3",0x8D71],
+  ["91A4",0x8E08],
+  ["91A5",0x8E3A],
+  ["91A6",0x8E70],
+  ["91A7",0x8E99],
+  ["91A8",0x8EB0],
+  ["91A9",0x8EB1],
+  ["91AA",0x8EC5],
+  ["91AB",0x8EC6],
+  ["91AC",0x8ECE],
+  ["91AD",0x8EE3],
+  ["91AE",0x8F0C],
+  ["91AF",0x8F71],
+  ["91B0",0x8F77],
+  ["91B1",0x8FA7],
+  ["91B2",0x8FEF],
+  ["91B3",0x900E],
+  ["91B4",0x9039],
+  ["91B5",0x9065],
+  ["91B6",0x9089],
+  ["91B7",0x90DE],
+  ["91B8",0x9115],
+  ["91B9",0x91D6],
+  ["91BA",0x91DB],
+  ["91BB",0x91DE],
+  ["91BC",0x91E1],
+  ["91BD",0x91E5],
+  ["91BE",0x91F6],
+  ["91BF",0x91FC],
+  ["91C0",0x9229],
+  ["91C1",0x922C],
+  ["91C2",0xFF07],
+  ["91C3",0x9259],
+  ["91C4",0x9277],
+  ["91C5",0x92ED],
+  ["91C6",0x933A],
+  ["91C7",0xE54D],
+  ["91C8",0xE54E],
+  ["91C9",0x722B],
+  ["91CA",0x5182],
+  ["91CB",0x5196],
+  ["91CC",0x4E37],
+  ["91CD",0x516B],
+  ["91CE",0x513F],
+  ["91CF",0xE555],
+  ["91D0",0xE556],
+  ["91D1",0x6729],
+  ["91D2",0x6C3A],
+  ["91D3",0x5382],
+  ["91D4",0x7592],
+  ["91D5",0x8080],
+  ["91D6",0x8864],
+  ["91D7",0x4E06],
+  ["91D8",0xE55E],
+  ["91D9",0xE55F],
+  ["91DA",0xE560],
+  ["91DB",0x2E97],
+  ["91DC",0x52F9],
+  ["91DD",0x5315],
+  ["91DE",0x2021],
+  ["91DF",0xE565],
+  ["91E0",0x3404],
+  ["91E1",0xE567],
+  ["91E2",0xE568],
+  ["91E3",0xE569],
+  ["91E4",0xE56A],
+  ["91E5",0xE56B],
+  ["91E6",0x51F5],
+  ["91E7",0xE56D],
+  ["91E8",0x5C6E],
+  ["91E9",0xE56F],
+  ["91EA",0x56D7],
+  ["91EB",0x4EA0],
+  ["91EC",0x51AB],
+  ["91ED",0x2E80],
+  ["91EE",0x69C7],
+  ["91EF",0xE575],
+  ["91F0",0x254E],
+  ["91F1",0x25D8],
+  ["91F2",0x25D9],
+  ["91F3",0x2642],
+  ["91F4",0x25B6],
+  ["91F5",0x25C4],
+  ["91F6",0x2195],
+  ["91F7",0x203C],
+  ["91F8",0x00B6],
+  ["91F9",0x2200],
+  ["91FA",0x21A8],
+  ["91FB",0x2194],
+  ["91FC",0x2302],
+  ["91FD",0xE583],
+  ["91FE",0xE584],
+  ["9240",0x4E9C],
+  ["9241",0x60AA],
+  ["9242",0x5727],
+  ["9243",0x56F2],
+  ["9244",0x533B],
+  ["9245",0x58F1],
+  ["9246",0x9038],
+  ["9247",0x96A0],
+  ["9248",0x6804],
+  ["9249",0x55B6],
+  ["924A",0x99C5],
+  ["924B",0x8B01],
+  ["924C",0x5186],
+  ["924D",0x7E01],
+  ["924E",0x5FDC],
+  ["924F",0x6B27],
+  ["9250",0x6BB4],
+  ["9251",0x685C],
+  ["9252",0x5965],
+  ["9253",0x7A4F],
+  ["9254",0x4EEE],
+  ["9255",0x4FA1],
+  ["9256",0x753B],
+  ["9257",0x7070],
+  ["9258",0x4F1A],
+  ["9259",0x6094],
+  ["925A",0x6D77],
+  ["925B",0x7D75],
+  ["925C",0x58CA],
+  ["925D",0x61D0],
+  ["925E",0x62E1],
+  ["925F",0x6BBB],
+  ["9260",0x899A],
+  ["9261",0x5B66],
+  ["9262",0x697D],
+  ["9263",0x559D],
+  ["9264",0x6E07],
+  ["9265",0xE5AA],
+  ["9266",0x5DFB],
+  ["9267",0x9665],
+  ["9268",0x52E7],
+  ["9269",0x5BDB],
+  ["926A",0x6F22],
+  ["926B",0x95A2],
+  ["926C",0x6B53],
+  ["926D",0x89B3],
+  ["926E",0x6C17],
+  ["926F",0x5E30],
+  ["9270",0x622F],
+  ["9271",0x72A0],
+  ["9272",0x8650],
+  ["9273",0x65E7],
+  ["9274",0x6025],
+  ["9275",0x62E0],
+  ["9276",0x6319],
+  ["9277",0x865A],
+  ["9278",0x5CE1],
+  ["9279",0x631F],
+  ["927A",0x72ED],
+  ["927B",0x90F7],
+  ["927C",0x97FF],
+  ["927D",0x6681],
+  ["927E",0x52E4],
+  ["92A1",0x8B39],
+  ["92A2",0x533A],
+  ["92A3",0x99C6],
+  ["92A4",0x52F2],
+  ["92A5",0xE5C8],
+  ["92A6",0x5F84],
+  ["92A7",0x830E],
+  ["92A8",0x6075],
+  ["92A9",0x63B2],
+  ["92AA",0x6E13],
+  ["92AB",0x7D4C],
+  ["92AC",0x86CD],
+  ["92AD",0x8EFD],
+  ["92AE",0x7D99],
+  ["92AF",0x9D8F],
+  ["92B0",0x6483],
+  ["92B1",0x770C],
+  ["92B2",0x5039],
+  ["92B3",0x5263],
+  ["92B4",0x967A],
+  ["92B5",0x570F],
+  ["92B6",0x691C],
+  ["92B7",0x6A29],
+  ["92B8",0x9855],
+  ["92B9",0x9A13],
+  ["92BA",0x53B3],
+  ["92BB",0x5449],
+  ["92BC",0x5A2F],
+  ["92BD",0x8AA4],
+  ["92BE",0x5E83],
+  ["92BF",0x6E2F],
+  ["92C0",0x9271],
+  ["92C1",0x53F7],
+  ["92C2",0x56FD],
+  ["92C3",0x9ED2],
+  ["92C4",0x7A40],
+  ["92C5",0x7815],
+  ["92C6",0x6E08],
+  ["92C7",0x658E],
+  ["92C8",0x6B73],
+  ["92C9",0x5264],
+  ["92CA",0x96D1],
+  ["92CB",0x53C2],
+  ["92CC",0x685F],
+  ["92CD",0x60E8],
+  ["92CE",0x8CDB],
+  ["92CF",0x6B8B],
+  ["92D0",0x6B6F],
+  ["92D1",0x5150],
+  ["92D2",0x8F9E],
+  ["92D3",0x6E7F],
+  ["92D4",0x5B9F],
+  ["92D5",0x5199],
+  ["92D6",0x820E],
+  ["92D7",0x6368],
+  ["92D8",0x91C8],
+  ["92D9",0x5BFF],
+  ["92DA",0x53CE],
+  ["92DB",0x8846],
+  ["92DC",0x5F93],
+  ["92DD",0x6E0B],
+  ["92DE",0x7363],
+  ["92DF",0x7E26],
+  ["92E0",0x7C9B],
+  ["92E1",0x51E6],
+  ["92E2",0x5C06],
+  ["92E3",0x79F0],
+  ["92E4",0x6E09],
+  ["92E5",0x713C],
+  ["92E6",0x5968],
+  ["92E7",0x6761],
+  ["92E8",0x72B6],
+  ["92E9",0x4E57],
+  ["92EA",0x6D44],
+  ["92EB",0x5270],
+  ["92EC",0x7573],
+  ["92ED",0x7E04],
+  ["92EE",0x58CC],
+  ["92EF",0x5B22],
+  ["92F0",0x8B72],
+  ["92F1",0x91B8],
+  ["92F2",0x89E6],
+  ["92F3",0x5631],
+  ["92F4",0x5BDD],
+  ["92F5",0x5C3D],
+  ["92F6",0x56F3],
+  ["92F7",0x7C8B],
+  ["92F8",0x9154],
+  ["92F9",0x7A42],
+  ["92FA",0x968F],
+  ["92FB",0x9AC4],
+  ["92FC",0x67A2],
+  ["92FD",0x6570],
+  ["92FE",0x636E],
+  ["9340",0x702C],
+  ["9341",0x58F0],
+  ["9342",0x6589],
+  ["9343",0x9759],
+  ["9344",0x7A83],
+  ["9345",0x6442],
+  ["9346",0x7D76],
+  ["9347",0x5C02],
+  ["9348",0x6D45],
+  ["9349",0x6226],
+  ["934A",0x8DF5],
+  ["934B",0x92AD],
+  ["934C",0x6F5C],
+  ["934D",0x9077],
+  ["934E",0x9078],
+  ["934F",0x7E4A],
+  ["9350",0x7985],
+  ["9351",0x758E],
+  ["9352",0x58EE],
+  ["9353",0x4E89],
+  ["9354",0x8358],
+  ["9355",0x635C],
+  ["9356",0x633F],
+  ["9357",0x5DE3],
+  ["9358",0x7A93],
+  ["9359",0x88C5],
+  ["935A",0x50E7],
+  ["935B",0x5C64],
+  ["935C",0x7DCF],
+  ["935D",0x9A12],
+  ["935E",0x5897],
+  ["935F",0x618E],
+  ["9360",0x8535],
+  ["9361",0x8D08],
+  ["9362",0x81D3],
+  ["9363",0x5C5E],
+  ["9364",0x7D9A],
+  ["9365",0x5815],
+  ["9366",0x5BFE],
+  ["9367",0x5E2F],
+  ["9368",0x6EDE],
+  ["9369",0x6EDD],
+  ["936A",0x629E],
+  ["936B",0x6CA2],
+  ["936C",0x6FEF],
+  ["936D",0x5358],
+  ["936E",0x5606],
+  ["936F",0x56E3],
+  ["9370",0x65AD],
+  ["9371",0x5F3E],
+  ["9372",0x9045],
+  ["9373",0x663C],
+  ["9374",0x92F3],
+  ["9375",0x5E81],
+  ["9376",0x5FB4],
+  ["9377",0x8074],
+  ["9378",0x61F2],
+  ["9379",0x585A],
+  ["937A",0x9013],
+  ["937B",0x9244],
+  ["937C",0x70B9],
+  ["937D",0x8EE2],
+  ["937E",0x4F1D],
+  ["93A1",0x96FB],
+  ["93A2",0x706F],
+  ["93A3",0x5F53],
+  ["93A4",0x515A],
+  ["93A5",0x76D7],
+  ["93A6",0x7A32],
+  ["93A7",0x95D8],
+  ["93A8",0x5FB3],
+  ["93A9",0x6BD2],
+  ["93AA",0x72EC],
+  ["93AB",0x8AAD],
+  ["93AC",0x5C4A],
+  ["93AD",0x96E3],
+  ["93AE",0x5F10],
+  ["93AF",0x60A9],
+  ["93B0",0x8133],
+  ["93B1",0x62DD],
+  ["93B2",0x5EC3],
+  ["93B3",0x58F2],
+  ["93B4",0x6885],
+  ["93B5",0x535A],
+  ["93B6",0x8584],
+  ["93B7",0x9EA6],
+  ["93B8",0x7E1B],
+  ["93B9",0x767A],
+  ["93BA",0x9AEA],
+  ["93BB",0x629C],
+  ["93BC",0x6D5C],
+  ["93BD",0x6D5C],
+  ["93BE",0x654F],
+  ["93BF",0x6577],
+  ["93C0",0x4FAE],
+  ["93C1",0x6255],
+  ["93C2",0x4ECF],
+  ["93C3",0x8FBA],
+  ["93C4",0x5909],
+  ["93C5",0x6B69],
+  ["93C6",0x8217],
+  ["93C7",0x7C3F],
+  ["93C8",0x5305],
+  ["93C9",0x5B9D],
+  ["93CA",0x62B1],
+  ["93CB",0x6CE1],
+  ["93CC",0x80DE],
+  ["93CD",0x7832],
+  ["93CE",0x8C4A],
+  ["93CF",0x98FD],
+  ["93D0",0x58A8],
+  ["93D1",0x6BCE],
+  ["93D2",0x6E80],
+  ["93D3",0x8108],
+  ["93D4",0x9ED9],
+  ["93D5",0x8A33],
+  ["93D6",0x85AC],
+  ["93D7",0x8E8D],
+  ["93D8",0x4E0E],
+  ["93D9",0x8A89],
+  ["93DA",0x6447],
+  ["93DB",0x69D8],
+  ["93DC",0x8B21],
+  ["93DD",0x66DC],
+  ["93DE",0x6765],
+  ["93DF",0x983C],
+  ["93E0",0x4E71],
+  ["93E1",0x89A7],
+  ["93E2",0x7ADC],
+  ["93E3",0x9686],
+  ["93E4",0x65C5],
+  ["93E5",0x4E21],
+  ["93E6",0x731F],
+  ["93E7",0x7DD1],
+  ["93E8",0x6D99],
+  ["93E9",0x5841],
+  ["93EA",0x793C],
+  ["93EB",0x52B1],
+  ["93EC",0x623B],
+  ["93ED",0x970A],
+  ["93EE",0x9F62],
+  ["93EF",0x66A6],
+  ["93F0",0x6B74],
+  ["93F1",0x604B],
+  ["93F2",0x7DF4],
+  ["93F3",0x932C],
+  ["93F4",0x7089],
+  ["93F5",0x52B4],
+  ["93F6",0x697C],
+  ["93F7",0x9332],
+  ["93F8",0x6E7E],
+  ["93F9",0x5F25],
+  ["93FA",0x4E80],
+  ["93FB",0x66FD],
+  ["93FC",0x59C9],
+  ["93FD",0x5B8D],
+  ["93FE",0x5D8B],
+  ["9440",0x6A2B],
+  ["9441",0x691B],
+  ["9442",0x55B0],
+  ["9443",0x7C82],
+  ["9444",0x8FBC],
+  ["9445",0x698A],
+  ["9446",0x54B2],
+  ["9447",0x9D2B],
+  ["9448",0x96EB],
+  ["9449",0x6919],
+  ["944A",0x63C3],
+  ["944B",0x99C4],
+  ["944C",0x51E7],
+  ["944D",0x6802],
+  ["944E",0x8FBB],
+  ["944F",0x50CD],
+  ["9450",0x5CE0],
+  ["9451",0x6803],
+  ["9452",0x51EA],
+  ["9453",0x5302],
+  ["9454",0x7872],
+  ["9455",0x7551],
+  ["9456",0x7560],
+  ["9457",0x567A],
+  ["9458",0x92F2],
+  ["9459",0x5840],
+  ["945A",0x67FE],
+  ["945B",0x4FE3],
+  ["945C",0x6762],
+  ["945D",0x7C7E],
+  ["945E",0x5301],
+  ["945F",0x4FE4],
+  ["9460",0x4FE5],
+  ["9461",0x51E9],
+  ["9462",0x53FA],
+  ["9463",0x54D8],
+  ["9464",0x56CE],
+  ["9465",0x5726],
+  ["9466",0x5737],
+  ["9467",0x5738],
+  ["9468",0x5788],
+  ["9469",0x57B3],
+  ["946A",0x57AA],
+  ["946B",0x57B0],
+  ["946C",0x57D6],
+  ["946D",0x5870],
+  ["946E",0x58B9],
+  ["946F",0x58D7],
+  ["9470",0x5C76],
+  ["9471",0x5CBC],
+  ["9472",0x5CC5],
+  ["9473",0x5CBE],
+  ["9474",0x5D76],
+  ["9475",0x5F16],
+  ["9476",0x603A],
+  ["9477",0x63B5],
+  ["9478",0x6741],
+  ["9479",0x6763],
+  ["947A",0x67A1],
+  ["947B",0x68BA],
+  ["947C",0x6925],
+  ["947D",0x6928],
+  ["947E",0x6A7A],
+  ["94A1",0x6923],
+  ["94A2",0x6921],
+  ["94A3",0x697E],
+  ["94A4",0x6981],
+  ["94A5",0x69DD],
+  ["94A6",0x6A2E],
+  ["94A7",0x6A72],
+  ["94A8",0x6B1F],
+  ["94A9",0x6BDF],
+  ["94AA",0x6E15],
+  ["94AB",0x7195],
+  ["94AC",0x74E7],
+  ["94AD",0x74F2],
+  ["94AE",0x74F0],
+  ["94AF",0x74F1],
+  ["94B0",0x74F8],
+  ["94B1",0x7505],
+  ["94B2",0x7569],
+  ["94B3",0x766A],
+  ["94B4",0x7874],
+  ["94B5",0x7ACD],
+  ["94B6",0x7ACF],
+  ["94B7",0x7AD5],
+  ["94B8",0x7AD3],
+  ["94B9",0x7AE1],
+  ["94BA",0x7AF0],
+  ["94BB",0x7B02],
+  ["94BC",0x7C13],
+  ["94BD",0x7C17],
+  ["94BE",0x7C90],
+  ["94BF",0x7CAD],
+  ["94C0",0x7CC0],
+  ["94C1",0x7CD8],
+  ["94C2",0x7D9B],
+  ["94C3",0x7E05],
+  ["94C4",0x7E67],
+  ["94C5",0x7E83],
+  ["94C6",0x7E90],
+  ["94C7",0x81A4],
+  ["94C8",0x825D],
+  ["94C9",0x8422],
+  ["94CA",0x84D9],
+  ["94CB",0x8630],
+  ["94CC",0x86AB],
+  ["94CD",0x86EF],
+  ["94CE",0x88B0],
+  ["94CF",0x88C3],
+  ["94D0",0x88C4],
+  ["94D1",0x8904],
+  ["94D2",0xE72F],
+  ["94D3",0x8EBE],
+  ["94D4",0x8EC8],
+  ["94D5",0x8F4C],
+  ["94D6",0x8FB7],
+  ["94D7",0x8FDA],
+  ["94D8",0x9027],
+  ["94D9",0x9056],
+  ["94DA",0x9335],
+  ["94DB",0x933B],
+  ["94DC",0x93B9],
+  ["94DD",0x958A],
+  ["94DE",0x9596],
+  ["94DF",0x9779],
+  ["94E0",0x9786],
+  ["94E1",0x9790],
+  ["94E2",0x98AA],
+  ["94E3",0x9B96],
+  ["94E4",0x9B97],
+  ["94E5",0x9BB4],
+  ["94E6",0x9BCF],
+  ["94E7",0x9BD1],
+  ["94E8",0x9BD2],
+  ["94E9",0x9BF2],
+  ["94EA",0x9BF1],
+  ["94EB",0x9C30],
+  ["94EC",0x9C47],
+  ["94ED",0x9C5A],
+  ["94EE",0x9CF0],
+  ["94EF",0x9D46],
+  ["94F0",0x9D64],
+  ["94F1",0x9DAB],
+  ["94F2",0x4E44],
+  ["94F3",0x544F],
+  ["94F4",0x6318],
+  ["94F5",0x9BB1],
+  ["94F6",0x9C69],
+  ["94F7",0x9D47],
+  ["94F8",0x9D65],
+  ["94F9",0x9C2F],
+  ["94FA",0x9EBF],
+  ["94FB",0x51B4],
+  ["94FC",0x546A],
+  ["94FD",0x67A0],
+  ["94FE",0x9B8E],
+  ["9540",0x90A8],
+  ["9541",0x51B2],
+  ["9542",0x362D],
+  ["9543",0x62C5],
+  ["9544",0x52C5],
+  ["9545",0x67B1],
+  ["9546",0x54CD],
+  ["9547",0x6052],
+  ["9548",0x53C1],
+  ["9549",0x70F1],
+  ["954A",0x5803],
+  ["954B",0x555F],
+  ["954C",0x920E],
+  ["954D",0x7740],
+  ["954E",0x743C],
+  ["954F",0x714A],
+  ["9550",0x6ED9],
+  ["9551",0x53E0],
+  ["9552",0x732E],
+  ["9553",0x88CF],
+  ["9554",0x788D],
+  ["9555",0x7FA3],
+  ["9556",0x7DAB],
+  ["9557",0x8E2A],
+  ["9558",0x945B],
+  ["9559",0x636C],
+  ["955A",0x5FA7],
+  ["955B",0x5C05],
+  ["955C",0x803B],
+  ["955D",0x5CEF],
+  ["955E",0x39B8],
+  ["955F",0x7151],
+  ["9560",0x8CCD],
+  ["9561",0x97EE],
+  ["9562",0x5872],
+  ["9563",0x5A63],
+  ["9564",0x7F78],
+  ["9565",0x5D57],
+  ["9566",0x616F],
+  ["9567",0x6998],
+  ["9568",0x7D89],
+  ["9569",0x7CAE],
+  ["956A",0x7DB3],
+  ["956B",0x6F81],
+  ["956C",0x5AFA],
+  ["956D",0x58BB],
+  ["956E",0x7255],
+  ["956F",0x764E],
+  ["9570",0x8F2D],
+  ["9571",0x92B9],
+  ["9572",0x9D5E],
+  ["9573",0x9EAF],
+  ["9574",0x7F47],
+  ["9575",0x9DC4],
+  ["9576",0x8D18],
+  ["9577",0x51B3],
+  ["9578",0x866C],
+  ["9579",0x54A4],
+  ["957A",0x53A6],
+  ["957B",0x5226],
+  ["957C",0x6736],
+  ["957D",0x4E21],
+  ["957E",0x5374],
+  ["95A1",0x5EF9],
+  ["95A2",0x52B9],
+  ["95A3",0x548F],
+  ["95A4",0x5EF8],
+  ["95A5",0x59AC],
+  ["95A6",0x6031],
+  ["95A7",0x7240],
+  ["95A8",0x8117],
+  ["95A9",0x763B],
+  ["95AA",0x5F0D],
+  ["95AB",0x664B],
+  ["95AC",0x66A8],
+  ["95AD",0x6164],
+  ["95AE",0x634F],
+  ["95AF",0x70DF],
+  ["95B0",0x6D24],
+  ["95B1",0x7CA7],
+  ["95B2",0x7CC9],
+  ["95B3",0x53D9],
+  ["95B4",0x654D],
+  ["95B5",0x5742],
+  ["95B6",0x73CF],
+  ["95B7",0x80C6],
+  ["95B8",0x3551],
+  ["95B9",0x6B35],
+  ["95BA",0x7881],
+  ["95BB",0x53CC],
+  ["95BC",0x732B],
+  ["95BD",0x732A],
+  ["95BE",0x73C9],
+  ["95BF",0x754A],
+  ["95C0",0x59F9],
+  ["95C1",0x71C4],
+  ["95C2",0x750E],
+  ["95C3",0x7DDC],
+  ["95C4",0x99E1],
+  ["95C5",0x89A9],
+  ["95C6",0x6FF6],
+  ["95C7",0x3A57],
+  ["95C8",0x64EA],
+  ["95C9",0x3BED],
+  ["95CA",0x6CA1],
+  ["95CB",0x6E7C],
+  ["95CC",0x7567],
+  ["95CD",0x5869],
+  ["95CE",0x5869],
+  ["95CF",0x5204],
+  ["95D0",0xE7CA],
+  ["95D1",0x6187],
+  ["95D2",0x643A],
+  ["95D3",0x81EF],
+  ["95D4",0xE7CE],
+  ["95D5",0x51B5],
+  ["95D6",0x51D1],
+  ["95D7",0x6C79],
+  ["95D8",0x591F],
+  ["95D9",0x8FF9],
+  ["95DA",0x98F1],
+  ["95DB",0x6537],
+  ["95DC",0x8109],
+  ["95DD",0x88B4],
+  ["95DE",0x3A2A],
+  ["95DF",0x8EAD],
+  ["95E0",0x7F97],
+  ["95E1",0x9A10],
+  ["95E2",0x7D25],
+  ["95E3",0x6AC8],
+  ["95E4",0x518C],
+  ["95E5",0x5227],
+  ["95E6",0xE7E0],
+  ["95E7",0x811A],
+  ["95E8",0x53A0],
+  ["95E9",0x53A2],
+  ["95EA",0x6C5A],
+  ["95EB",0x6C37],
+  ["95EC",0x8218],
+  ["95ED",0x5586],
+  ["95EE",0x5EFB],
+  ["95EF",0x51C9],
+  ["95F0",0x78B1],
+  ["95F1",0x9262],
+  ["95F2",0x536D],
+  ["95F3",0x51C3],
+  ["95F4",0xE7EE],
+  ["95F5",0x8471],
+  ["95F6",0x8987],
+  ["95F7",0x976D],
+  ["95F8",0x8B90],
+  ["95F9",0x96A3],
+  ["95FA",0x5EFC],
+  ["95FB",0x96B7],
+  ["95FC",0x514E],
+  ["95FD",0x9C10],
+  ["95FE",0x6630],
+  ["9640",0x9255],
+  ["9641",0x7808],
+  ["9642",0x9345],
+  ["9643",0x9273],
+  ["9644",0x9369],
+  ["9645",0xE7FE],
+  ["9646",0xE7FF],
+  ["9647",0xE800],
+  ["9648",0xE801],
+  ["9649",0x91DF],
+  ["964A",0x91DA],
+  ["964B",0x7854],
+  ["964C",0x7866],
+  ["964D",0x7888],
+  ["964E",0x78B6],
+  ["964F",0x78C7],
+  ["9650",0x78D2],
+  ["9651",0x78D7],
+  ["9652",0x212B],
+  ["9653",0x21CB],
+  ["9654",0x78E4],
+  ["9655",0x78EE],
+  ["9656",0x78F0],
+  ["9657",0x78F1],
+  ["9658",0x78F5],
+  ["9659",0x7932],
+  ["965A",0x7933],
+  ["965B",0x7936],
+  ["965C",0x7958],
+  ["965D",0x3013],
+  ["965E",0x7959],
+  ["965F",0x7971],
+  ["9660",0x797E],
+  ["9661",0x7983],
+  ["9662",0x7986],
+  ["9663",0x7987],
+  ["9664",0x7991],
+  ["9665",0x7999],
+  ["9666",0x799F],
+  ["9667",0x79A5],
+  ["9668",0x79E2],
+  ["9669",0x79F1],
+  ["966A",0x79F4],
+  ["966B",0x7A2A],
+  ["966C",0x7A3A],
+  ["966D",0x7A45],
+  ["966E",0x7A65],
+  ["966F",0x7ABC],
+  ["9670",0x7AC2],
+  ["9671",0x7AC9],
+  ["9672",0x7ADB],
+  ["9673",0x7AE9],
+  ["9674",0x7AFE],
+  ["9675",0x7B0C],
+  ["9676",0x7B27],
+  ["9677",0x7B29],
+  ["9678",0x7B42],
+  ["9679",0x7B43],
+  ["967A",0x7B55],
+  ["967B",0x7B6F],
+  ["967C",0x7BB2],
+  ["967D",0x69DE],
+  ["967E",0x69F9],
+  ["96A1",0x9176],
+  ["96A2",0x815A],
+  ["96A3",0x82F7],
+  ["96A4",0x544B],
+  ["96A5",0x8132],
+  ["96A6",0x80BD],
+  ["96A7",0x8418],
+  ["96A8",0x915E],
+  ["96A9",0x9170],
+  ["96AA",0x918C],
+  ["96AB",0x8148],
+  ["96AC",0xE843],
+  ["96AD",0x4436],
+  ["96AE",0x8159],
+  ["96AF",0x809F],
+  ["96B0",0xE847],
+  ["96B1",0x5549],
+  ["96B2",0x5421],
+  ["96B3",0x54DA],
+  ["96B4",0x5432],
+  ["96B5",0x55B9],
+  ["96B6",0x5494],
+  ["96B7",0xE84E],
+  ["96B8",0x7852],
+  ["96B9",0x7845],
+  ["96BA",0x784C],
+  ["96BB",0xE852],
+  ["96BC",0x84BD],
+  ["96BD",0x841C],
+  ["96BE",0x82C4],
+  ["96BF",0xE856],
+  ["96C0",0x847B],
+  ["96C1",0x8B2D],
+  ["96C2",0xE859],
+  ["96C3",0x574B],
+  ["96C4",0xE85B],
+  ["96C5",0xE85C],
+  ["96C6",0x5745],
+  ["96C7",0x87CE],
+  ["96C8",0x5660],
+  ["96C9",0x55EA],
+  ["96CA",0x567B],
+  ["96CB",0x80BC],
+  ["96CC",0xE863],
+  ["96CD",0x78B8],
+  ["96CE",0x6A0C],
+  ["96CF",0x54CC],
+  ["96D0",0x7BD0],
+  ["96D1",0x7BEC],
+  ["96D2",0x7BFA],
+  ["96D3",0x7C15],
+  ["96D4",0x7C1B],
+  ["96D5",0x7C35],
+  ["96D6",0x7C44],
+  ["96D7",0x7C6D],
+  ["96D8",0x7C8E],
+  ["96D9",0x7CB8],
+  ["96DA",0x7CC3],
+  ["96DB",0x7CE6],
+  ["96DC",0x7CED],
+  ["96DD",0x7CF3],
+  ["96DE",0x7CF5],
+  ["96DF",0x7CF9],
+  ["96E0",0xE877],
+  ["96E1",0x7CFC],
+  ["96E2",0x7D8B],
+  ["96E3",0x7D97],
+  ["96E4",0x7DA4],
+  ["96E5",0x7DA8],
+  ["96E6",0x7DCD],
+  ["96E7",0x7DD0],
+  ["96E8",0x7DD3],
+  ["96E9",0x7DE5],
+  ["96EA",0x7DFD],
+  ["96EB",0x6A12],
+  ["96EC",0x6A22],
+  ["96ED",0x6A30],
+  ["96EE",0x6A36],
+  ["96EF",0x6A65],
+  ["96F0",0xE887],
+  ["96F1",0xE888],
+  ["96F2",0xE889],
+  ["96F3",0xE88A],
+  ["96F4",0xE88B],
+  ["96F5",0xE88C],
+  ["96F6",0xE88D],
+  ["96F7",0xE88E],
+  ["96F8",0x6A73],
+  ["96F9",0x6A78],
+  ["96FA",0xE891],
+  ["96FB",0xE892],
+  ["96FC",0x6A7C],
+  ["96FD",0x6AA9],
+  ["96FE",0x6AAA],
+  ["9740",0x24EA],
+  ["9741",0x2460],
+  ["9742",0x2461],
+  ["9743",0x2462],
+  ["9744",0x2463],
+  ["9745",0x2464],
+  ["9746",0x2465],
+  ["9747",0x2466],
+  ["9748",0x2467],
+  ["9749",0x2468],
+  ["974A",0x2469],
+  ["974B",0x246A],
+  ["974C",0x246B],
+  ["974D",0x246C],
+  ["974E",0x246D],
+  ["974F",0x246E],
+  ["9750",0x246F],
+  ["9751",0x2470],
+  ["9752",0x2471],
+  ["9753",0x2472],
+  ["9754",0x2473],
+  ["9755",0x9344],
+  ["9756",0x93AD],
+  ["9757",0x93C6],
+  ["9758",0x93E5],
+  ["9759",0x941A],
+  ["975A",0x9421],
+  ["975B",0x943E],
+  ["975C",0x9441],
+  ["975D",0x9453],
+  ["975E",0x945A],
+  ["975F",0x949A],
+  ["9760",0x94B7],
+  ["9761",0x94D8],
+  ["9762",0x94DE],
+  ["9763",0x94F3],
+  ["9764",0x9503],
+  ["9765",0x950E],
+  ["9766",0x950F],
+  ["9767",0x9518],
+  ["9768",0x951D],
+  ["9769",0x952A],
+  ["976A",0x952B],
+  ["976B",0x953F],
+  ["976C",0x9545],
+  ["976D",0x954E],
+  ["976E",0x9562],
+  ["976F",0x9565],
+  ["9770",0x9569],
+  ["9771",0x9572],
+  ["9772",0x9587],
+  ["9773",0x9599],
+  ["9774",0x95A0],
+  ["9775",0x95B2],
+  ["9776",0x9666],
+  ["9777",0x969D],
+  ["9778",0x96AF],
+  ["9779",0x96B2],
+  ["977A",0x9733],
+  ["977B",0x973B],
+  ["977C",0x974D],
+  ["977D",0x974F],
+  ["977E",0x9751],
+  ["97A1",0x9755],
+  ["97A2",0x9764],
+  ["97A3",0x976B],
+  ["97A4",0x9771],
+  ["97A5",0x9792],
+  ["97A6",0x97B2],
+  ["97A7",0x97F2],
+  ["97A8",0x983D],
+  ["97A9",0x9854],
+  ["97AA",0x98A5],
+  ["97AB",0x98C3],
+  ["97AC",0x98DA],
+  ["97AD",0x98EE],
+  ["97AE",0x991D],
+  ["97AF",0x9920],
+  ["97B0",0x9963],
+  ["97B1",0x9980],
+  ["97B2",0x9987],
+  ["97B3",0x998D],
+  ["97B4",0x9993],
+  ["97B5",0x9995],
+  ["97B6",0x99BC],
+  ["97B7",0x99C8],
+  ["97B8",0x99F2],
+  ["97B9",0x9AB6],
+  ["97BA",0x9AD9],
+  ["97BB",0x9ADE],
+  ["97BC",0x9B0F],
+  ["97BD",0x9B49],
+  ["97BE",0x9B72],
+  ["97BF",0x9B83],
+  ["97C0",0x9B9F],
+  ["97C1",0x9BBB],
+  ["97C2",0x9BE3],
+  ["97C3",0x9BF5],
+  ["97C4",0x9C00],
+  ["97C5",0x9C04],
+  ["97C6",0x9C1B],
+  ["97C7",0x24B6],
+  ["97C8",0x24B7],
+  ["97C9",0x24B8],
+  ["97CA",0x24B9],
+  ["97CB",0x24BA],
+  ["97CC",0x24BB],
+  ["97CD",0x24BC],
+  ["97CE",0x24BD],
+  ["97CF",0x24BE],
+  ["97D0",0x24BF],
+  ["97D1",0x24C0],
+  ["97D2",0x24C1],
+  ["97D3",0x24C2],
+  ["97D4",0x24C3],
+  ["97D5",0x24C4],
+  ["97D6",0x24C5],
+  ["97D7",0x24C6],
+  ["97D8",0x24C7],
+  ["97D9",0x24C8],
+  ["97DA",0x24C9],
+  ["97DB",0x24CA],
+  ["97DC",0x24CB],
+  ["97DD",0x24CC],
+  ["97DE",0x24CD],
+  ["97DF",0x24CE],
+  ["97E0",0x24CF],
+  ["97E1",0x24D0],
+  ["97E2",0x24D1],
+  ["97E3",0x24D2],
+  ["97E4",0x24D3],
+  ["97E5",0x24D4],
+  ["97E6",0x24D5],
+  ["97E7",0x24D6],
+  ["97E8",0x24D7],
+  ["97E9",0x24D8],
+  ["97EA",0x24D9],
+  ["97EB",0x24DA],
+  ["97EC",0x24DB],
+  ["97ED",0x24DC],
+  ["97EE",0x24DD],
+  ["97EF",0x24DE],
+  ["97F0",0x24DF],
+  ["97F1",0x24E0],
+  ["97F2",0x24E1],
+  ["97F3",0x24E2],
+  ["97F4",0x24E3],
+  ["97F5",0x24E4],
+  ["97F6",0x24E5],
+  ["97F7",0x24E6],
+  ["97F8",0x24E7],
+  ["97F9",0x24E8],
+  ["97FA",0x24E9],
+  ["97FB",0x00AE],
+  ["97FC",0x2122],
+  ["97FD",0xE931],
+  ["97FE",0xE932],
+  ["9840",0x9C76],
+  ["9841",0x278A],
+  ["9842",0x278B],
+  ["9843",0x278C],
+  ["9844",0x278D],
+  ["9845",0x278E],
+  ["9846",0x278F],
+  ["9847",0x2790],
+  ["9848",0x2791],
+  ["9849",0x2792],
+  ["984A",0x2793],
+  ["984B",0x9C85],
+  ["984C",0x9C86],
+  ["984D",0x9C87],
+  ["984E",0x9C8B],
+  ["984F",0x9C90],
+  ["9850",0x9C9E],
+  ["9851",0x9CAE],
+  ["9852",0x9CB0],
+  ["9853",0x9CB2],
+  ["9854",0x9CB4],
+  ["9855",0x9CBA],
+  ["9856",0x9CBC],
+  ["9857",0x9CBD],
+  ["9858",0x9CC6],
+  ["9859",0x9CC7],
+  ["985A",0x9CCA],
+  ["985B",0x9CCB],
+  ["985C",0x9CD3],
+  ["985D",0x9CD8],
+  ["985E",0x9CD9],
+  ["985F",0x9CE2],
+  ["9860",0x9CEB],
+  ["9861",0x9CEC],
+  ["9862",0x9D2A],
+  ["9863",0x9D48],
+  ["9864",0x9D50],
+  ["9865",0x9D7A],
+  ["9866",0x9DC6],
+  ["9867",0x9E4B],
+  ["9868",0x9E55],
+  ["9869",0x9E5B],
+  ["986A",0x9E71],
+  ["986B",0x9EAA],
+  ["986C",0x9EBD],
+  ["986D",0x9EC4],
+  ["986E",0x9EE2],
+  ["986F",0x9EEA],
+  ["9870",0x9F08],
+  ["9871",0x9F0B],
+  ["9872",0x9F0D],
+  ["9873",0x9F21],
+  ["9874",0x9F44],
+  ["9875",0x9F51],
+  ["9876",0x9F9D],
+  ["9877",0xFA0E],
+  ["9878",0xFA0F],
+  ["9879",0xFA11],
+  ["987A",0xFA13],
+  ["987B",0xFA14],
+  ["987C",0xFA18],
+  ["987D",0xFA1F],
+  ["987E",0xFA20],
+  ["98A1",0xFA21],
+  ["98A2",0xFA23],
+  ["98A3",0xFA24],
+  ["98A4",0xFA27],
+  ["98A5",0xFA28],
+  ["98A6",0xFA29],
+  ["98A7",0x4E04],
+  ["98A8",0x4E2F],
+  ["98A9",0x4E81],
+  ["98AA",0x4E87],
+  ["98AB",0x4EA3],
+  ["98AC",0x4EB7],
+  ["98AD",0x4EBC],
+  ["98AE",0x4EF8],
+  ["98AF",0x4F28],
+  ["98B0",0x4F29],
+  ["98B1",0x4F37],
+  ["98B2",0x4F42],
+  ["98B3",0x4F45],
+  ["98B4",0x4F4B],
+  ["98B5",0x4F72],
+  ["98B6",0x4FA2],
+  ["98B7",0x4FB0],
+  ["98B8",0x4FBD],
+  ["98B9",0x4FC8],
+  ["98BA",0x4FCC],
+  ["98BB",0x4FF0],
+  ["98BC",0x4FF2],
+  ["98BD",0x4FF9],
+  ["98BE",0x5003],
+  ["98BF",0x5008],
+  ["98C0",0x5034],
+  ["98C1",0x503B],
+  ["98C2",0x5058],
+  ["98C3",0x5066],
+  ["98C4",0x5081],
+  ["98C5",0x5090],
+  ["98C6",0x50BC],
+  ["98C7",0x50D0],
+  ["98C8",0x50DF],
+  ["98C9",0x50E1],
+  ["98CA",0x50FC],
+  ["98CB",0x510D],
+  ["98CC",0x512B],
+  ["98CD",0x5160],
+  ["98CE",0x51AE],
+  ["98CF",0x51B8],
+  ["98D0",0x51D2],
+  ["98D1",0x51E2],
+  ["98D2",0x5205],
+  ["98D3",0x5234],
+  ["98D4",0x523C],
+  ["98D5",0x5259],
+  ["98D6",0x5268],
+  ["98D7",0x5279],
+  ["98D8",0x52A4],
+  ["98D9",0x52CC],
+  ["98DA",0x5327],
+  ["98DB",0x5342],
+  ["98DC",0x535D],
+  ["98DD",0x537D],
+  ["98DE",0x537E],
+  ["98DF",0x53C5],
+  ["98E0",0x53D0],
+  ["98E1",0x53D2],
+  ["98E2",0x53FE],
+  ["98E3",0x546D],
+  ["98E4",0x5485],
+  ["98E5",0x5493],
+  ["98E6",0x549E],
+  ["98E7",0x54B9],
+  ["98E8",0x54E3],
+  ["98E9",0x54EF],
+  ["98EA",0x550D],
+  ["98EB",0x5518],
+  ["98EC",0x5525],
+  ["98ED",0x5528],
+  ["98EE",0x552B],
+  ["98EF",0x5547],
+  ["98F0",0x5579],
+  ["98F1",0x5590],
+  ["98F2",0x55B4],
+  ["98F3",0x55C1],
+  ["98F4",0x55D7],
+  ["98F5",0x55D8],
+  ["98F6",0x55FB],
+  ["98F7",0x4FB4],
+  ["98F8",0x5621],
+  ["98F9",0x2203],
+  ["98FA",0x5652],
+  ["98FB",0xE9CC],
+  ["98FC",0x263B],
+  ["98FD",0xE9CE],
+  ["98FE",0xE9CF],
+  ["9940",0x565D],
+  ["9941",0x2474],
+  ["9942",0x2475],
+  ["9943",0x2476],
+  ["9944",0x2477],
+  ["9945",0x2478],
+  ["9946",0x2479],
+  ["9947",0x247A],
+  ["9948",0x247B],
+  ["9949",0x247C],
+  ["994A",0x247D],
+  ["994B",0x247E],
+  ["994C",0x247F],
+  ["994D",0x2480],
+  ["994E",0x2481],
+  ["994F",0x2482],
+  ["9950",0x2483],
+  ["9951",0x2484],
+  ["9952",0x2485],
+  ["9953",0x2486],
+  ["9954",0x2487],
+  ["9955",0x5661],
+  ["9956",0x5689],
+  ["9957",0x568B],
+  ["9958",0x569E],
+  ["9959",0x56A1],
+  ["995A",0x56B1],
+  ["995B",0x56B9],
+  ["995C",0x56BF],
+  ["995D",0x56D6],
+  ["995E",0x56EF],
+  ["995F",0x5715],
+  ["9960",0x571D],
+  ["9961",0x5732],
+  ["9962",0x573D],
+  ["9963",0x573F],
+  ["9964",0x5743],
+  ["9965",0x21D4],
+  ["9966",0x577E],
+  ["9967",0x578A],
+  ["9968",0x578D],
+  ["9969",0x5790],
+  ["996A",0x579C],
+  ["996B",0x57BB],
+  ["996C",0x57BE],
+  ["996D",0x57C4],
+  ["996E",0x57DE],
+  ["996F",0x57FE],
+  ["9970",0x5812],
+  ["9971",0x5822],
+  ["9972",0x5847],
+  ["9973",0x585C],
+  ["9974",0x585F],
+  ["9975",0x5873],
+  ["9976",0x58A7],
+  ["9977",0x58AA],
+  ["9978",0x58B0],
+  ["9979",0x58B5],
+  ["997A",0x58B6],
+  ["997B",0x58CB],
+  ["997C",0x58D0],
+  ["997D",0x58E0],
+  ["997E",0x5905],
+  ["99A1",0x5911],
+  ["99A2",0x5989],
+  ["99A3",0x5994],
+  ["99A4",0x599A],
+  ["99A5",0x599F],
+  ["99A6",0x59B0],
+  ["99A7",0x59B8],
+  ["99A8",0x59C4],
+  ["99A9",0x59EF],
+  ["99AA",0x59F0],
+  ["99AB",0x59F8],
+  ["99AC",0x5A02],
+  ["99AD",0x5A0B],
+  ["99AE",0x5A0D],
+  ["99AF",0x5A12],
+  ["99B0",0x5A21],
+  ["99B1",0x5A24],
+  ["99B2",0x5A27],
+  ["99B3",0x5A2A],
+  ["99B4",0x5A2B],
+  ["99B5",0x5A2C],
+  ["99B6",0x5A3D],
+  ["99B7",0x5A45],
+  ["99B8",0x5A54],
+  ["99B9",0x5A59],
+  ["99BA",0x5A61],
+  ["99BB",0x5A68],
+  ["99BC",0x5A6B],
+  ["99BD",0x5A6E],
+  ["99BE",0x5A71],
+  ["99BF",0x5A79],
+  ["99C0",0x5A7E],
+  ["99C1",0x5A81],
+  ["99C2",0x5A82],
+  ["99C3",0x5A86],
+  ["99C4",0x5A88],
+  ["99C5",0x5A91],
+  ["99C6",0x5A99],
+  ["99C7",0x5AA0],
+  ["99C8",0x5AA1],
+  ["99C9",0x5AAB],
+  ["99CA",0x5AC3],
+  ["99CB",0x5ACE],
+  ["99CC",0x5ACF],
+  ["99CD",0x5AD3],
+  ["99CE",0x5AE4],
+  ["99CF",0x5AF0],
+  ["99D0",0x5AFE],
+  ["99D1",0x5B0D],
+  ["99D2",0x5B11],
+  ["99D3",0x5B15],
+  ["99D4",0x5B1F],
+  ["99D5",0x5B2B],
+  ["99D6",0x5B41],
+  ["99D7",0x5B44],
+  ["99D8",0x5B46],
+  ["99D9",0x5B4A],
+  ["99DA",0x5B4F],
+  ["99DB",0x5B68],
+  ["99DC",0x5B74],
+  ["99DD",0x5B76],
+  ["99DE",0x5B7C],
+  ["99DF",0x5B82],
+  ["99E0",0x5B90],
+  ["99E1",0x249C],
+  ["99E2",0x249D],
+  ["99E3",0x249E],
+  ["99E4",0x249F],
+  ["99E5",0x24A0],
+  ["99E6",0x24A1],
+  ["99E7",0x24A2],
+  ["99E8",0x24A3],
+  ["99E9",0x24A4],
+  ["99EA",0x24A5],
+  ["99EB",0x24A6],
+  ["99EC",0x24A7],
+  ["99ED",0x24A8],
+  ["99EE",0x24A9],
+  ["99EF",0x24AA],
+  ["99F0",0x24AB],
+  ["99F1",0x24AC],
+  ["99F2",0x24AD],
+  ["99F3",0x24AE],
+  ["99F4",0x24AF],
+  ["99F5",0x24B0],
+  ["99F6",0x24B1],
+  ["99F7",0x24B2],
+  ["99F8",0x24B3],
+  ["99F9",0x24B4],
+  ["99FA",0x24B5],
+  ["99FB",0xEA69],
+  ["99FC",0x3232],
+  ["99FD",0x3231],
+  ["99FE",0x6AAB],
+  ["9A40",0x5B96],
+  ["9A41",0x2488],
+  ["9A42",0x2489],
+  ["9A43",0x248A],
+  ["9A44",0x248B],
+  ["9A45",0x248C],
+  ["9A46",0x248D],
+  ["9A47",0x248E],
+  ["9A48",0x248F],
+  ["9A49",0x2490],
+  ["9A4A",0x2491],
+  ["9A4B",0x2492],
+  ["9A4C",0x2493],
+  ["9A4D",0x2494],
+  ["9A4E",0x2495],
+  ["9A4F",0x2496],
+  ["9A50",0x2497],
+  ["9A51",0x2498],
+  ["9A52",0x2499],
+  ["9A53",0x249A],
+  ["9A54",0x249B],
+  ["9A55",0x5BD5],
+  ["9A56",0x5BD7],
+  ["9A57",0x5C23],
+  ["9A58",0x5C85],
+  ["9A59",0x5C9E],
+  ["9A5A",0x5CC2],
+  ["9A5B",0x5D10],
+  ["9A5C",0x5D2C],
+  ["9A5D",0x5D2F],
+  ["9A5E",0x5D48],
+  ["9A5F",0x5D56],
+  ["9A60",0x5D70],
+  ["9A61",0x5D7B],
+  ["9A62",0x5D85],
+  ["9A63",0x5DA4],
+  ["9A64",0x5DAB],
+  ["9A65",0x5DB6],
+  ["9A66",0x5DC1],
+  ["9A67",0x5DD7],
+  ["9A68",0x5E09],
+  ["9A69",0x5E48],
+  ["9A6A",0x5E92],
+  ["9A6B",0x5EBD],
+  ["9A6C",0x5F0E],
+  ["9A6D",0x5F72],
+  ["9A6E",0x5FB1],
+  ["9A6F",0x5FC2],
+  ["9A70",0x5FDB],
+  ["9A71",0x5FDF],
+  ["9A72",0x6023],
+  ["9A73",0x607E],
+  ["9A74",0x60D7],
+  ["9A75",0x6107],
+  ["9A76",0x610C],
+  ["9A77",0x6119],
+  ["9A78",0x6122],
+  ["9A79",0x6150],
+  ["9A7A",0x6160],
+  ["9A7B",0x6181],
+  ["9A7C",0x6195],
+  ["9A7D",0x61B9],
+  ["9A7E",0x61C0],
+  ["9AA1",0x61CF],
+  ["9AA2",0x61D3],
+  ["9AA3",0x61DA],
+  ["9AA4",0x6290],
+  ["9AA5",0x6331],
+  ["9AA6",0x2283],
+  ["9AA7",0x6337],
+  ["9AA8",0x6379],
+  ["9AA9",0x638B],
+  ["9AAA",0x63C1],
+  ["9AAB",0x63E2],
+  ["9AAC",0x63E6],
+  ["9AAD",0x63FB],
+  ["9AAE",0x63FE],
+  ["9AAF",0x6407],
+  ["9AB0",0x6432],
+  ["9AB1",0x6438],
+  ["9AB2",0x643B],
+  ["9AB3",0x645A],
+  ["9AB4",0x6471],
+  ["9AB5",0x647C],
+  ["9AB6",0x648D],
+  ["9AB7",0x64AF],
+  ["9AB8",0x64B4],
+  ["9AB9",0x64B6],
+  ["9ABA",0x64DD],
+  ["9ABB",0x64E5],
+  ["9ABC",0x650A],
+  ["9ABD",0x6511],
+  ["9ABE",0x651F],
+  ["9ABF",0x655F],
+  ["9AC0",0x656D],
+  ["9AC1",0x6586],
+  ["9AC2",0x65B5],
+  ["9AC3",0x65BE],
+  ["9AC4",0x65D1],
+  ["9AC5",0x65D4],
+  ["9AC6",0x65E3],
+  ["9AC7",0x65FF],
+  ["9AC8",0x6618],
+  ["9AC9",0x6623],
+  ["9ACA",0x6663],
+  ["9ACB",0x666B],
+  ["9ACC",0x667D],
+  ["9ACD",0x6685],
+  ["9ACE",0x6692],
+  ["9ACF",0x669A],
+  ["9AD0",0x66A4],
+  ["9AD1",0x66AD],
+  ["9AD2",0x66B3],
+  ["9AD3",0x66B6],
+  ["9AD4",0x66CD],
+  ["9AD5",0x66CE],
+  ["9AD6",0x6702],
+  ["9AD7",0x670C],
+  ["9AD8",0x6719],
+  ["9AD9",0x6744],
+  ["9ADA",0x676B],
+  ["9ADB",0x678F],
+  ["9ADC",0x67A4],
+  ["9ADD",0x67BF],
+  ["9ADE",0x67D6],
+  ["9ADF",0x67D7],
+  ["9AE0",0x2282],
+  ["9AE1",0x680D],
+  ["9AE2",0x6810],
+  ["9AE3",0x681B],
+  ["9AE4",0x6836],
+  ["9AE5",0x6847],
+  ["9AE6",0x6856],
+  ["9AE7",0x6884],
+  ["9AE8",0x6888],
+  ["9AE9",0x68BD],
+  ["9AEA",0x68C3],
+  ["9AEB",0x68C5],
+  ["9AEC",0x6902],
+  ["9AED",0x6903],
+  ["9AEE",0x6909],
+  ["9AEF",0x6918],
+  ["9AF0",0x6943],
+  ["9AF1",0x6946],
+  ["9AF2",0x6964],
+  ["9AF3",0x6967],
+  ["9AF4",0x6972],
+  ["9AF5",0x6985],
+  ["9AF6",0x699F],
+  ["9AF7",0x69A2],
+  ["9AF8",0x69D1],
+  ["9AF9",0x69D5],
+  ["9AFA",0x69D6],
+  ["9AFB",0x9A21],
+  ["9AFC",0x9A26],
+  ["9AFD",0x9A2F],
+  ["9AFE",0x6AC1],
+  ["9B40",0x59BF],
+  ["9B41",0x69E1],
+  ["9B42",0x6A03],
+  ["9B43",0x6A1A],
+  ["9B44",0x6A1C],
+  ["9B45",0x6A2C],
+  ["9B46",0x6A2D],
+  ["9B47",0x6A33],
+  ["9B48",0x6A43],
+  ["9B49",0x6A45],
+  ["9B4A",0x6A4C],
+  ["9B4B",0x6A53],
+  ["9B4C",0x6A57],
+  ["9B4D",0x6A63],
+  ["9B4E",0x6A74],
+  ["9B4F",0x6A82],
+  ["9B50",0x6A8A],
+  ["9B51",0x6A8F],
+  ["9B52",0x6A99],
+  ["9B53",0x6AA7],
+  ["9B54",0x6AB1],
+  ["9B55",0x6AB5],
+  ["9B56",0x6ABE],
+  ["9B57",0x6AC9],
+  ["9B58",0x6AD4],
+  ["9B59",0x6AD8],
+  ["9B5A",0x6AF6],
+  ["9B5B",0x6B57],
+  ["9B5C",0x6B7A],
+  ["9B5D",0x6BDC],
+  ["9B5E",0x6C1C],
+  ["9B5F",0x6C31],
+  ["9B60",0x6C58],
+  ["9B61",0x6C6E],
+  ["9B62",0x6C75],
+  ["9B63",0x6C7F],
+  ["9B64",0x6CAF],
+  ["9B65",0x6CCB],
+  ["9B66",0x6CDF],
+  ["9B67",0x6CFF],
+  ["9B68",0x6D02],
+  ["9B69",0x6D05],
+  ["9B6A",0x6D06],
+  ["9B6B",0x6D26],
+  ["9B6C",0x6D57],
+  ["9B6D",0x6D5B],
+  ["9B6E",0x6D71],
+  ["9B6F",0x6D81],
+  ["9B70",0x6D8F],
+  ["9B71",0x6DA5],
+  ["9B72",0x6DB1],
+  ["9B73",0x6DFE],
+  ["9B74",0x6E02],
+  ["9B75",0x6E04],
+  ["9B76",0x6E0F],
+  ["9B77",0x6E18],
+  ["9B78",0x6E2A],
+  ["9B79",0x6E50],
+  ["9B7A",0x6E59],
+  ["9B7B",0x6E9A],
+  ["9B7C",0x6EB5],
+  ["9B7D",0x6EB8],
+  ["9B7E",0x6EDB],
+  ["9BA1",0x6EFA],
+  ["9BA2",0x6F04],
+  ["9BA3",0x6F0B],
+  ["9BA4",0x6F0C],
+  ["9BA5",0x6F16],
+  ["9BA6",0x6F17],
+  ["9BA7",0x6F34],
+  ["9BA8",0x6F3D],
+  ["9BA9",0x6F56],
+  ["9BAA",0x6F79],
+  ["9BAB",0x6F8A],
+  ["9BAC",0x6F9D],
+  ["9BAD",0x6F9F],
+  ["9BAE",0x6FBB],
+  ["9BAF",0x6FBE],
+  ["9BB0",0x6FD3],
+  ["9BB1",0x6FD9],
+  ["9BB2",0x6FF8],
+  ["9BB3",0x7003],
+  ["9BB4",0x704B],
+  ["9BB5",0x704D],
+  ["9BB6",0x7050],
+  ["9BB7",0x7054],
+  ["9BB8",0x705C],
+  ["9BB9",0x7067],
+  ["9BBA",0x7077],
+  ["9BBB",0x7079],
+  ["9BBC",0x708B],
+  ["9BBD",0x708F],
+  ["9BBE",0x70A0],
+  ["9BBF",0x70A3],
+  ["9BC0",0x70A5],
+  ["9BC1",0x70A6],
+  ["9BC2",0x70A7],
+  ["9BC3",0x70C4],
+  ["9BC4",0x70CC],
+  ["9BC5",0x70D0],
+  ["9BC6",0x70D6],
+  ["9BC7",0x026A],
+  ["9BC8",0x025B],
+  ["9BC9",0x00E6],
+  ["9BCA",0x028C],
+  ["9BCB",0x0251],
+  ["9BCC",0x0254],
+  ["9BCD",0x028A],
+  ["9BCE",0x025D],
+  ["9BCF",0x0259],
+  ["9BD0",0x025A],
+  ["9BD1",0x025C],
+  ["9BD2",0x0261],
+  ["9BD3",0x1E43],
+  ["9BD4",0x1E49],
+  ["9BD5",0x014A],
+  ["9BD6",0x1E3B],
+  ["9BD7",0x0275],
+  ["9BD8",0x00F0],
+  ["9BD9",0x0283],
+  ["9BDA",0x0292],
+  ["9BDB",0x02A7],
+  ["9BDC",0x02A4],
+  ["9BDD",0x00E3],
+  ["9BDE",0xEB86],
+  ["9BDF",0xEB87],
+  ["9BE0",0x026F],
+  ["9BE1",0x0278],
+  ["9BE2",0x0287],
+  ["9BE3",0xEB8B],
+  ["9BE4",0x00C7],
+  ["9BE5",0x0153],
+  ["9BE6",0x0252],
+  ["9BE7",0xFF47],
+  ["9BE8",0x02CB],
+  ["9BE9",0x02CF],
+  ["9BEA",0xFF41],
+  ["9BEB",0xFF42],
+  ["9BEC",0xFF44],
+  ["9BED",0xFF45],
+  ["9BEE",0xFF46],
+  ["9BEF",0xFF48],
+  ["9BF0",0xFF49],
+  ["9BF1",0xFF4A],
+  ["9BF2",0xFF4B],
+  ["9BF3",0xFF4C],
+  ["9BF4",0xFF4D],
+  ["9BF5",0xFF4E],
+  ["9BF6",0xFF4F],
+  ["9BF7",0xFF50],
+  ["9BF8",0xFF52],
+  ["9BF9",0xFF53],
+  ["9BFA",0xFF54],
+  ["9BFB",0xFF55],
+  ["9BFC",0xFF56],
+  ["9BFD",0xFF57],
+  ["9BFE",0xFF5A],
+  ["9C40",0x70F5],
+  ["9C41",0x3220],
+  ["9C42",0x3221],
+  ["9C43",0x3222],
+  ["9C44",0x3223],
+  ["9C45",0x3224],
+  ["9C46",0x3225],
+  ["9C47",0x3226],
+  ["9C48",0x3227],
+  ["9C49",0x3228],
+  ["9C4A",0x3229],
+  ["9C4B",0x70FE],
+  ["9C4C",0x7105],
+  ["9C4D",0x711D],
+  ["9C4E",0x7129],
+  ["9C4F",0x712B],
+  ["9C50",0x712C],
+  ["9C51",0x7133],
+  ["9C52",0x7135],
+  ["9C53",0x713B],
+  ["9C54",0x713E],
+  ["9C55",0x7140],
+  ["9C56",0x714F],
+  ["9C57",0x716B],
+  ["9C58",0x7175],
+  ["9C59",0x7177],
+  ["9C5A",0x717C],
+  ["9C5B",0x717E],
+  ["9C5C",0x718C],
+  ["9C5D",0x718E],
+  ["9C5E",0x7191],
+  ["9C5F",0x7196],
+  ["9C60",0x71A2],
+  ["9C61",0x71A3],
+  ["9C62",0x71AD],
+  ["9C63",0x71B4],
+  ["9C64",0x71B7],
+  ["9C65",0x71BA],
+  ["9C66",0x71D1],
+  ["9C67",0x71DD],
+  ["9C68",0x71EB],
+  ["9C69",0x7200],
+  ["9C6A",0x7209],
+  ["9C6B",0x720E],
+  ["9C6C",0x720F],
+  ["9C6D",0x7216],
+  ["9C6E",0x7217],
+  ["9C6F",0x7224],
+  ["9C70",0x5AA4],
+  ["9C71",0x722E],
+  ["9C72",0x2286],
+  ["9C73",0x7257],
+  ["9C74",0x725C],
+  ["9C75",0x7294],
+  ["9C76",0x7304],
+  ["9C77",0x7310],
+  ["9C78",0x7341],
+  ["9C79",0x7374],
+  ["9C7A",0x738C],
+  ["9C7B",0x738F],
+  ["9C7C",0x7398],
+  ["9C7D",0x739C],
+  ["9C7E",0x739E],
+  ["9CA1",0x73A7],
+  ["9CA2",0x73AA],
+  ["9CA3",0x73D5],
+  ["9CA4",0x73E1],
+  ["9CA5",0x73E2],
+  ["9CA6",0x73E4],
+  ["9CA7",0x73E6],
+  ["9CA8",0x73EF],
+  ["9CA9",0x73F3],
+  ["9CAA",0x2287],
+  ["9CAB",0x73F9],
+  ["9CAC",0x73FB],
+  ["9CAD",0x7402],
+  ["9CAE",0x7411],
+  ["9CAF",0x7412],
+  ["9CB0",0x7414],
+  ["9CB1",0x7415],
+  ["9CB2",0x7417],
+  ["9CB3",0x7419],
+  ["9CB4",0x741C],
+  ["9CB5",0x741E],
+  ["9CB6",0x741F],
+  ["9CB7",0x7437],
+  ["9CB8",0x7438],
+  ["9CB9",0x7439],
+  ["9CBA",0x7443],
+  ["9CBB",0x7445],
+  ["9CBC",0x7447],
+  ["9CBD",0x7448],
+  ["9CBE",0x7449],
+  ["9CBF",0x7453],
+  ["9CC0",0x7456],
+  ["9CC1",0x7465],
+  ["9CC2",0x746B],
+  ["9CC3",0x746C],
+  ["9CC4",0x7474],
+  ["9CC5",0x747A],
+  ["9CC6",0x7482],
+  ["9CC7",0x5382],
+  ["9CC8",0x5E7F],
+  ["9CC9",0x4E28],
+  ["9CCA",0x5E7A],
+  ["9CCB",0x5196],
+  ["9CCC",0x5B80],
+  ["9CCD",0x5369],
+  ["9CCE",0x2E87],
+  ["9CCF",0xEC14],
+  ["9CD0",0x5303],
+  ["9CD1",0x2612],
+  ["9CD2",0x8279],
+  ["9CD3",0x4491],
+  ["9CD4",0x2E8C],
+  ["9CD5",0x2E8A],
+  ["9CD6",0x4E36],
+  ["9CD7",0xEC1C],
+  ["9CD8",0x531A],
+  ["9CD9",0xEC1E],
+  ["9CDA",0xEC1F],
+  ["9CDB",0x2E95],
+  ["9CDC",0xEC21],
+  ["9CDD",0xEC22],
+  ["9CDE",0x2514],
+  ["9CDF",0x4E5A],
+  ["9CE0",0x8FB6],
+  ["9CE1",0x5EF4],
+  ["9CE2",0x5188],
+  ["9CE3",0x4E85],
+  ["9CE4",0xEC29],
+  ["9CE5",0x4E3F],
+  ["9CE6",0xEC2B],
+  ["9CE7",0xEC2C],
+  ["9CE8",0x4E5B],
+  ["9CE9",0x53B6],
+  ["9CEA",0x8F66],
+  ["9CEB",0x7E9F],
+  ["9CEC",0x8BA0],
+  ["9CED",0x8D1D],
+  ["9CEE",0x9E1F],
+  ["9CEF",0x95E8],
+  ["9CF0",0x9485],
+  ["9CF1",0x961D],
+  ["9CF2",0x624C],
+  ["9CF3",0x6C35],
+  ["9CF4",0x4EBB],
+  ["9CF5",0x5FC4],
+  ["9CF6",0x706C],
+  ["9CF7",0x2EAE],
+  ["9CF8",0x53E3],
+  ["9CF9",0x6AE2],
+  ["9CFA",0x9A3B],
+  ["9CFB",0x9A3C],
+  ["9CFC",0x9A58],
+  ["9CFD",0x9A5C],
+  ["9CFE",0x9A63],
+  ["9D40",0x260E],
+  ["9D41",0x2192],
+  ["9D42",0x2190],
+  ["9D43",0x2191],
+  ["9D44",0x2193],
+  ["9D45",0x21E8],
+  ["9D46",0x21E6],
+  ["9D47",0x21E7],
+  ["9D48",0x21E9],
+  ["9D49",0x21E8],
+  ["9D4A",0x21E6],
+  ["9D4B",0x21E7],
+  ["9D4C",0x21E9],
+  ["9D4D",0x261E],
+  ["9D4E",0x261C],
+  ["9D4F",0x261B],
+  ["9D50",0x261F],
+  ["9D51",0x3016],
+  ["9D52",0x3017],
+  ["9D53",0x25CB],
+  ["9D54",0x2715],
+  ["9D55",0x2713],
+  ["9D56",0x56FB],
+  ["9D57",0x263D],
+  ["9D58",0x591D],
+  ["9D59",0x664D],
+  ["9D5A",0x7225],
+  ["9D5B",0x2729],
+  ["9D5C",0x2721],
+  ["9D5D",0x263A],
+  ["9D5E",0x2639],
+  ["9D5F",0xEC63],
+  ["9D60",0xEC64],
+  ["9D61",0xEC65],
+  ["9D62",0xEC66],
+  ["9D63",0xEC67],
+  ["9D64",0x5C78],
+  ["9D65",0x266C],
+  ["9D66",0x266A],
+  ["9D67",0x5AD1],
+  ["9D68",0x5BB7],
+  ["9D69",0x5CFC],
+  ["9D6A",0xEC6E],
+  ["9D6B",0x2709],
+  ["9D6C",0x2702],
+  ["9D6D",0xEC71],
+  ["9D6E",0xEC72],
+  ["9D6F",0xEC73],
+  ["9D70",0xEC74],
+  ["9D71",0x5CD5],
+  ["9D72",0x676E],
+  ["9D73",0x7461],
+  ["9D74",0x749D],
+  ["9D75",0x7F53],
+  ["9D76",0x8593],
+  ["9D77",0x274F],
+  ["9D78",0xEC7C],
+  ["9D79",0xEC7D],
+  ["9D7A",0x5D78],
+  ["9D7B",0x5F3B],
+  ["9D7C",0xEC80],
+  ["9D7D",0x2501],
+  ["9D7E",0x2503],
+  ["9DA1",0xEC83],
+  ["9DA2",0xEC84],
+  ["9DA3",0xEC85],
+  ["9DA4",0xEC86],
+  ["9DA5",0xEC87],
+  ["9DA6",0xEC88],
+  ["9DA7",0xEC89],
+  ["9DA8",0xEC8A],
+  ["9DA9",0xEC8B],
+  ["9DAA",0xEC8C],
+  ["9DAB",0xEC8D],
+  ["9DAC",0xEC8E],
+  ["9DAD",0xEC8F],
+  ["9DAE",0xEC90],
+  ["9DAF",0xEC91],
+  ["9DB0",0x9AB2],
+  ["9DB1",0x9AE0],
+  ["9DB2",0x9B14],
+  ["9DB3",0x9B34],
+  ["9DB4",0x9B39],
+  ["9DB5",0x9B40],
+  ["9DB6",0x9B50],
+  ["9DB7",0x9B7F],
+  ["9DB8",0x263C],
+  ["9DB9",0x7D95],
+  ["9DBA",0x2601],
+  ["9DBB",0x9734],
+  ["9DBC",0x2602],
+  ["9DBD",0xEC9F],
+  ["9DBE",0xECA0],
+  ["9DBF",0xECA1],
+  ["9DC0",0x2708],
+  ["9DC1",0xECA3],
+  ["9DC2",0xECA4],
+  ["9DC3",0xECA5],
+  ["9DC4",0xECA6],
+  ["9DC5",0xECA7],
+  ["9DC6",0xECA8],
+  ["9DC7",0xECA9],
+  ["9DC8",0x213B],
+  ["9DC9",0x2121],
+  ["9DCA",0x66E7],
+  ["9DCB",0x6E57],
+  ["9DCC",0xECAE],
+  ["9DCD",0x7157],
+  ["9DCE",0x79CA],
+  ["9DCF",0x2116],
+  ["9DD0",0x816C],
+  ["9DD1",0x8AF9],
+  ["9DD2",0x9856],
+  ["9DD3",0xECB5],
+  ["9DD4",0xECB6],
+  ["9DD5",0x2620],
+  ["9DD6",0xECB8],
+  ["9DD7",0x2664],
+  ["9DD8",0x2660],
+  ["9DD9",0x2667],
+  ["9DDA",0x2663],
+  ["9DDB",0x2662],
+  ["9DDC",0x2666],
+  ["9DDD",0x2661],
+  ["9DDE",0x2665],
+  ["9DDF",0xECC1],
+  ["9DE0",0xECC2],
+  ["9DE1",0x6AE4],
+  ["9DE2",0x211E],
+  ["9DE3",0x33C2],
+  ["9DE4",0x33D8],
+  ["9DE5",0x33A1],
+  ["9DE6",0xECC8],
+  ["9DE7",0x33A5],
+  ["9DE8",0xECCA],
+  ["9DE9",0xECCB],
+  ["9DEA",0xECCC],
+  ["9DEB",0xECCD],
+  ["9DEC",0xECCE],
+  ["9DED",0x2611],
+  ["9DEE",0x9B81],
+  ["9DEF",0x9B8B],
+  ["9DF0",0x9B8D],
+  ["9DF1",0x9BDD],
+  ["9DF2",0x9BE9],
+  ["9DF3",0x9BED],
+  ["9DF4",0x9BF4],
+  ["9DF5",0x9C1F],
+  ["9DF6",0x9C20],
+  ["9DF7",0x9C26],
+  ["9DF8",0x9C53],
+  ["9DF9",0x9C5D],
+  ["9DFA",0x9C7B],
+  ["9DFB",0x9D0C],
+  ["9DFC",0x9D16],
+  ["9DFD",0x21B2],
+  ["9DFE",0x6B05],
+  ["9E40",0x8CE9],
+  ["9E41",0x8CF2],
+  ["9E42",0x8D03],
+  ["9E43",0x8D11],
+  ["9E44",0x8D1C],
+  ["9E45",0x8D7A],
+  ["9E46",0x8DA9],
+  ["9E47",0x8DC0],
+  ["9E48",0x8E01],
+  ["9E49",0x8E0E],
+  ["9E4A",0x8E46],
+  ["9E4B",0x8E68],
+  ["9E4C",0x8E71],
+  ["9E4D",0x8E7E],
+  ["9E4E",0x8E80],
+  ["9E4F",0x8EB6],
+  ["9E50",0x8EB9],
+  ["9E51",0x8EBC],
+  ["9E52",0x8EC3],
+  ["9E53",0x8EE4],
+  ["9E54",0x8EED],
+  ["9E55",0x8EF2],
+  ["9E56",0x8F30],
+  ["9E57",0x8F41],
+  ["9E58",0x8F4A],
+  ["9E59",0x8FA5],
+  ["9E5A",0x8FB3],
+  ["9E5B",0x8FB8],
+  ["9E5C",0x8FCA],
+  ["9E5D",0x8FCF],
+  ["9E5E",0x9008],
+  ["9E5F",0x9033],
+  ["9E60",0x9037],
+  ["9E61",0x9064],
+  ["9E62",0x906C],
+  ["9E63",0x91A9],
+  ["9E64",0x91B6],
+  ["9E65",0x91C4],
+  ["9E66",0x91FA],
+  ["9E67",0x9208],
+  ["9E68",0x9213],
+  ["9E69",0x9221],
+  ["9E6A",0x9228],
+  ["9E6B",0x922B],
+  ["9E6C",0x9235],
+  ["9E6D",0x923C],
+  ["9E6E",0x9241],
+  ["9E6F",0x9258],
+  ["9E70",0x925D],
+  ["9E71",0x925F],
+  ["9E72",0x926B],
+  ["9E73",0x926E],
+  ["9E74",0x9281],
+  ["9E75",0x9284],
+  ["9E76",0x9289],
+  ["9E77",0x928F],
+  ["9E78",0x92B1],
+  ["9E79",0x92BA],
+  ["9E7A",0x92BF],
+  ["9E7B",0x92D4],
+  ["9E7C",0x92DB],
+  ["9E7D",0x92E3],
+  ["9E7E",0x92E5],
+  ["9EA1",0x92EB],
+  ["9EA2",0x92EC],
+  ["9EA3",0x92F4],
+  ["9EA4",0x92F6],
+  ["9EA5",0x92FD],
+  ["9EA6",0x9303],
+  ["9EA7",0x9307],
+  ["9EA8",0x9330],
+  ["9EA9",0x9331],
+  ["9EAA",0x9340],
+  ["9EAB",0x9342],
+  ["9EAC",0x9343],
+  ["9EAD",0x935F],
+  ["9EAE",0x9362],
+  ["9EAF",0x9366],
+  ["9EB0",0x9368],
+  ["9EB1",0x9373],
+  ["9EB2",0x9374],
+  ["9EB3",0x9378],
+  ["9EB4",0x937D],
+  ["9EB5",0x9381],
+  ["9EB6",0x9384],
+  ["9EB7",0x9386],
+  ["9EB8",0x9387],
+  ["9EB9",0x9390],
+  ["9EBA",0x939C],
+  ["9EBB",0x93A0],
+  ["9EBC",0x93B8],
+  ["9EBD",0x93BB],
+  ["9EBE",0x93BD],
+  ["9EBF",0x93BF],
+  ["9EC0",0x93CB],
+  ["9EC1",0x93D3],
+  ["9EC2",0x93DB],
+  ["9EC3",0x93E0],
+  ["9EC4",0x93F0],
+  ["9EC5",0x93F1],
+  ["9EC6",0x93F3],
+  ["9EC7",0x93F4],
+  ["9EC8",0x9401],
+  ["9EC9",0x9404],
+  ["9ECA",0x9408],
+  ["9ECB",0x9417],
+  ["9ECC",0x941B],
+  ["9ECD",0x941D],
+  ["9ECE",0x9424],
+  ["9ECF",0x9425],
+  ["9ED0",0x9426],
+  ["9ED1",0x942D],
+  ["9ED2",0x9442],
+  ["9ED3",0x9443],
+  ["9ED4",0x944D],
+  ["9ED5",0x9454],
+  ["9ED6",0x9458],
+  ["9ED7",0x9465],
+  ["9ED8",0x9467],
+  ["9ED9",0x946C],
+  ["9EDA",0x9479],
+  ["9EDB",0x947B],
+  ["9EDC",0x9578],
+  ["9EDD",0x9585],
+  ["9EDE",0x95A6],
+  ["9EDF",0x95AA],
+  ["9EE0",0x9656],
+  ["9EE1",0x967B],
+  ["9EE2",0x96A5],
+  ["9EE3",0x96F4],
+  ["9EE4",0x971B],
+  ["9EE5",0x9736],
+  ["9EE6",0x9740],
+  ["9EE7",0x9741],
+  ["9EE8",0x9757],
+  ["9EE9",0x9787],
+  ["9EEA",0x9789],
+  ["9EEB",0x979B],
+  ["9EEC",0x97B1],
+  ["9EED",0x97BD],
+  ["9EEE",0x97C0],
+  ["9EEF",0x97C2],
+  ["9EF0",0x97D2],
+  ["9EF1",0x97E0],
+  ["9EF2",0x9814],
+  ["9EF3",0x9815],
+  ["9EF4",0x9823],
+  ["9EF5",0x9833],
+  ["9EF6",0x9868],
+  ["9EF7",0x98B7],
+  ["9EF8",0x98B9],
+  ["9EF9",0x98C7],
+  ["9EFA",0x98CA],
+  ["9EFB",0x98E0],
+  ["9EFC",0x98E1],
+  ["9EFD",0x98EC],
+  ["9EFE",0x98F5],
+  ["9F40",0x9D21],
+  ["9F41",0x9D34],
+  ["9F42",0x9D39],
+  ["9F43",0x9D49],
+  ["9F44",0x9D4E],
+  ["9F45",0x9D6D],
+  ["9F46",0x2237],
+  ["9F47",0x9D6E],
+  ["9F48",0x9D7C],
+  ["9F49",0x9D83],
+  ["9F4A",0x9D93],
+  ["9F4B",0x9DA5],
+  ["9F4C",0x222C],
+  ["9F4D",0x9DBD],
+  ["9F4E",0x6B81],
+  ["9F4F",0x6BB1],
+  ["9F50",0x9C4F],
+  ["9F51",0x9E90],
+  ["9F52",0x9DC0],
+  ["9F53",0xED91],
+  ["9F54",0xED92],
+  ["9F55",0x262F],
+  ["9F56",0x2630],
+  ["9F57",0x2637],
+  ["9F58",0x2633],
+  ["9F59",0x2634],
+  ["9F5A",0x2635],
+  ["9F5B",0x2632],
+  ["9F5C",0x2636],
+  ["9F5D",0x2631],
+  ["9F5E",0x9DC9],
+  ["9F5F",0x9DD4],
+  ["9F60",0x9DFC],
+  ["9F61",0x9E0A],
+  ["9F62",0x9E0C],
+  ["9F63",0x9E0E],
+  ["9F64",0x9E18],
+  ["9F65",0x9E7B],
+  ["9F66",0x9E85],
+  ["9F67",0x9EA2],
+  ["9F68",0x9EAC],
+  ["9F69",0x9EB1],
+  ["9F6A",0x9EC1],
+  ["9F6B",0x9EC6],
+  ["9F6C",0x9EC7],
+  ["9F6D",0x9EF1],
+  ["9F6E",0x9EF8],
+  ["9F6F",0x9F27],
+  ["9F70",0x990E],
+  ["9F71",0x9919],
+  ["9F72",0x991C],
+  ["9F73",0x9937],
+  ["9F74",0x995D],
+  ["9F75",0x9962],
+  ["9F76",0x999B],
+  ["9F77",0x99A4],
+  ["9F78",0x99AA],
+  ["9F79",0x99B8],
+  ["9F7A",0x99E0],
+  ["9F7B",0x99E6],
+  ["9F7C",0x99F5],
+  ["9F7D",0x9A1F],
+  ["9F7E",0x7DFE],
+  ["9FA1",0x7E07],
+  ["9FA2",0x7E5B],
+  ["9FA3",0x7E65],
+  ["9FA4",0x7E6C],
+  ["9FA5",0x7F37],
+  ["9FA6",0x7F40],
+  ["9FA7",0x7F41],
+  ["9FA8",0x7F49],
+  ["9FA9",0x7F52],
+  ["9FAA",0x7F8F],
+  ["9FAB",0x7F93],
+  ["9FAC",0x7FB4],
+  ["9FAD",0x7FDD],
+  ["9FAE",0x7FE7],
+  ["9FAF",0x7FFA],
+  ["9FB0",0x8002],
+  ["9FB1",0x8008],
+  ["9FB2",0x802E],
+  ["9FB3",0x802F],
+  ["9FB4",0x803C],
+  ["9FB5",0x80A7],
+  ["9FB6",0x810C],
+  ["9FB7",0x812A],
+  ["9FB8",0x8134],
+  ["9FB9",0x8142],
+  ["9FBA",0x8156],
+  ["9FBB",0x8184],
+  ["9FBC",0x81A5],
+  ["9FBD",0x81E4],
+  ["9FBE",0x8254],
+  ["9FBF",0x8265],
+  ["9FC0",0x827B],
+  ["9FC1",0x8287],
+  ["9FC2",0x82BF],
+  ["9FC3",0x82E2],
+  ["9FC4",0x82EE],
+  ["9FC5",0x82F8],
+  ["9FC6",0x82FC],
+  ["9FC7",0x82FF],
+  ["9FC8",0x830B],
+  ["9FC9",0x831D],
+  ["9FCA",0x833D],
+  ["9FCB",0x8357],
+  ["9FCC",0x8391],
+  ["9FCD",0x83AC],
+  ["9FCE",0x83CD],
+  ["9FCF",0x83ED],
+  ["9FD0",0x8405],
+  ["9FD1",0x8414],
+  ["9FD2",0x8416],
+  ["9FD3",0x8421],
+  ["9FD4",0x842E],
+  ["9FD5",0x843E],
+  ["9FD6",0x844A],
+  ["9FD7",0x8453],
+  ["9FD8",0x8455],
+  ["9FD9",0x8458],
+  ["9FDA",0x8464],
+  ["9FDB",0x8472],
+  ["9FDC",0x847F],
+  ["9FDD",0x8480],
+  ["9FDE",0x8492],
+  ["9FDF",0x8493],
+  ["9FE0",0x8496],
+  ["9FE1",0x84A3],
+  ["9FE2",0x84BE],
+  ["9FE3",0x84DE],
+  ["9FE4",0x84E1],
+  ["9FE5",0x84E2],
+  ["9FE6",0x84E4],
+  ["9FE7",0x84F8],
+  ["9FE8",0x8503],
+  ["9FE9",0x8505],
+  ["9FEA",0x8510],
+  ["9FEB",0x8533],
+  ["9FEC",0x2010],
+  ["9FED",0x8542],
+  ["9FEE",0x854C],
+  ["9FEF",0x8552],
+  ["9FF0",0x855F],
+  ["9FF1",0x856F],
+  ["9FF2",0x8570],
+  ["9FF3",0x8573],
+  ["9FF4",0x85D6],
+  ["9FF5",0x85E0],
+  ["9FF6",0x85EE],
+  ["9FF7",0x85FC],
+  ["9FF8",0x860D],
+  ["9FF9",0x860F],
+  ["9FFA",0x8614],
+  ["9FFB",0x8628],
+  ["9FFC",0x8642],
+  ["9FFD",0x8645],
+  ["9FFE",0x8672],
+  ["A040",0x889C],
+  ["A041",0x5B6D],
+  ["A042",0x8137],
+  ["A043",0xEE1E],
+  ["A044",0x9938],
+  ["A045",0x5572],
+  ["A046",0x556B],
+  ["A047",0xEE22],
+  ["A048",0x35CE],
+  ["A049",0x5571],
+  ["A04A",0x55BA],
+  ["A04B",0x55F1],
+  ["A04C",0x35D2],
+  ["A04D",0x55F0],
+  ["A04E",0x5605],
+  ["A04F",0x5622],
+  ["A050",0x562D],
+  ["A051",0x5643],
+  ["A052",0x561E],
+  ["A053",0x5692],
+  ["A054",0x7CCD],
+  ["A055",0x541A],
+  ["A056",0x5413],
+  ["A057",0x5497],
+  ["A058",0x66F1],
+  ["A059",0x7534],
+  ["A05A",0x544D],
+  ["A05B",0x56A4],
+  ["A05C",0x569F],
+  ["A05D",0x64D3],
+  ["A05E",0x632E],
+  ["A05F",0x63F8],
+  ["A060",0x651E],
+  ["A061",0x4E78],
+  ["A062",0x6BEA],
+  ["A063",0x6C32],
+  ["A064",0x6C3D],
+  ["A065",0x6C62],
+  ["A066",0x6CB2],
+  ["A067",0x6DF8],
+  ["A068",0x6E29],
+  ["A069",0x6E76],
+  ["A06A",0x6E82],
+  ["A06B",0x6E86],
+  ["A06C",0x6EBB],
+  ["A06D",0x6EDF],
+  ["A06E",0x6EE2],
+  ["A06F",0x6F11],
+  ["A070",0x6F24],
+  ["A071",0x6F74],
+  ["A072",0x6F91],
+  ["A073",0x6FB5],
+  ["A074",0x6FF3],
+  ["A075",0x6FF5],
+  ["A076",0x70BB],
+  ["A077",0x70C0],
+  ["A078",0x710F],
+  ["A079",0x2202],
+  ["A07A",0x7155],
+  ["A07B",0x7173],
+  ["A07C",0x717A],
+  ["A07D",0xEE58],
+  ["A07E",0x5223],
+  ["A0A1",0xEE5A],
+  ["A0A2",0x3451],
+  ["A0A3",0xEE5C],
+  ["A0A4",0x8FCC],
+  ["A0A5",0xEE5E],
+  ["A0A6",0xEE5F],
+  ["A0A7",0x00C0],
+  ["A0A8",0x00C8],
+  ["A0A9",0x00CC],
+  ["A0AA",0x00D2],
+  ["A0AB",0x00D9],
+  ["A0AC",0x00C1],
+  ["A0AD",0x00CD],
+  ["A0AE",0x00D3],
+  ["A0AF",0x00DA],
+  ["A0B0",0x0101],
+  ["A0B1",0x0113],
+  ["A0B2",0x012B],
+  ["A0B3",0x014D],
+  ["A0B4",0x016B],
+  ["A0B5",0x01D6],
+  ["A0B6",0x00C4],
+  ["A0B7",0x00CB],
+  ["A0B8",0x00CF],
+  ["A0B9",0x00D6],
+  ["A0BA",0x00DC],
+  ["A0BB",0x00C6],
+  ["A0BC",0x00C7],
+  ["A0BD",0x00D1],
+  ["A0BE",0x00C3],
+  ["A0BF",0x00D5],
+  ["A0C0",0x00E1],
+  ["A0C1",0x00E9],
+  ["A0C2",0x00ED],
+  ["A0C3",0x00F3],
+  ["A0C4",0x00FA],
+  ["A0C5",0x01D8],
+  ["A0C6",0x00E4],
+  ["A0C7",0x00EB],
+  ["A0C8",0x00EF],
+  ["A0C9",0x00F6],
+  ["A0CA",0x00FC],
+  ["A0CB",0x00E6],
+  ["A0CC",0x00E7],
+  ["A0CD",0x00F1],
+  ["A0CE",0x00E3],
+  ["A0CF",0x00F5],
+  ["A0D0",0x01CE],
+  ["A0D1",0x011B],
+  ["A0D2",0x01D0],
+  ["A0D3",0x01D2],
+  ["A0D4",0x01D4],
+  ["A0D5",0x01DA],
+  ["A0D6",0x00C5],
+  ["A0D7",0x00C9],
+  ["A0D8",0x7188],
+  ["A0D9",0x00D8],
+  ["A0DA",0x00D0],
+  ["A0DB",0x1EF2],
+  ["A0DC",0x00DE],
+  ["A0DD",0x00DF],
+  ["A0DE",0x00AA],
+  ["A0DF",0x00A1],
+  ["A0E0",0x00E0],
+  ["A0E1",0x00E8],
+  ["A0E2",0x00EC],
+  ["A0E3",0x00F2],
+  ["A0E4",0x00F9],
+  ["A0E5",0x01DC],
+  ["A0E6",0x00E5],
+  ["A0E7",0x7198],
+  ["A0E8",0x71D7],
+  ["A0E9",0x00F8],
+  ["A0EA",0x00F0],
+  ["A0EB",0x1EF3],
+  ["A0EC",0x00FE],
+  ["A0ED",0x00FF],
+  ["A0EE",0x00BA],
+  ["A0EF",0x00BF],
+  ["A0F0",0x00E2],
+  ["A0F1",0x00EA],
+  ["A0F2",0x00EE],
+  ["A0F3",0x00F4],
+  ["A0F4",0x00FB],
+  ["A0F5",0x71F5],
+  ["A0F6",0x00C2],
+  ["A0F7",0x00CA],
+  ["A0F8",0x00CE],
+  ["A0F9",0x00D4],
+  ["A0FA",0x00DB],
+  ["A0FB",0x00B8],
+  ["A0FC",0x00A4],
+  ["A0FD",0xEEB6],
+  ["A0FE",0x0192],
+  ["A140",0x3000],
+  ["A141",0xFF0C],
+  ["A142",0x3001],
+  ["A143",0x3002],
+  ["A144",0xFF0E],
+  ["A145",0x2027],
+  ["A146",0xFF1B],
+  ["A147",0xFF1A],
+  ["A148",0xFF1F],
+  ["A149",0xFF01],
+  ["A14A",0xFE30],
+  ["A14B",0x2026],
+  ["A14C",0x2025],
+  ["A14D",0xFE50],
+  ["A14E",0xFE51],
+  ["A14F",0xFE52],
+  ["A150",0x00B7],
+  ["A151",0xFE54],
+  ["A152",0xFE55],
+  ["A153",0xFE56],
+  ["A154",0xFE57],
+  ["A155",0xFF5C],
+  ["A156",0x2013],
+  ["A157",0xFE31],
+  ["A158",0x2014],
+  ["A159",0xFE33],
+  ["A15A",0x2574],
+  ["A15B",0xFE34],
+  ["A15C",0xFE4F],
+  ["A15D",0xFF08],
+  ["A15E",0xFF09],
+  ["A15F",0xFE35],
+  ["A160",0xFE36],
+  ["A161",0xFF5B],
+  ["A162",0xFF5D],
+  ["A163",0xFE37],
+  ["A164",0xFE38],
+  ["A165",0x3014],
+  ["A166",0x3015],
+  ["A167",0xFE39],
+  ["A168",0xFE3A],
+  ["A169",0x3010],
+  ["A16A",0x3011],
+  ["A16B",0xFE3B],
+  ["A16C",0xFE3C],
+  ["A16D",0x300A],
+  ["A16E",0x300B],
+  ["A16F",0xFE3D],
+  ["A170",0xFE3E],
+  ["A171",0x3008],
+  ["A172",0x3009],
+  ["A173",0xFE3F],
+  ["A174",0xFE40],
+  ["A175",0x300C],
+  ["A176",0x300D],
+  ["A177",0xFE41],
+  ["A178",0xFE42],
+  ["A179",0x300E],
+  ["A17A",0x300F],
+  ["A17B",0xFE43],
+  ["A17C",0xFE44],
+  ["A17D",0xFE59],
+  ["A17E",0xFE5A],
+  ["A1A1",0xFE5B],
+  ["A1A2",0xFE5C],
+  ["A1A3",0xFE5D],
+  ["A1A4",0xFE5E],
+  ["A1A5",0x2018],
+  ["A1A6",0x2019],
+  ["A1A7",0x201C],
+  ["A1A8",0x201D],
+  ["A1A9",0x301D],
+  ["A1AA",0x301E],
+  ["A1AB",0x2035],
+  ["A1AC",0x2032],
+  ["A1AD",0xFF03],
+  ["A1AE",0xFF06],
+  ["A1AF",0xFF0A],
+  ["A1B0",0x203B],
+  ["A1B1",0x00A7],
+  ["A1B2",0x3003],
+  ["A1B3",0x25CB],
+  ["A1B4",0x25CF],
+  ["A1B5",0x25B3],
+  ["A1B6",0x25B2],
+  ["A1B7",0x25CE],
+  ["A1B8",0x2606],
+  ["A1B9",0x2605],
+  ["A1BA",0x25C7],
+  ["A1BB",0x25C6],
+  ["A1BC",0x25A1],
+  ["A1BD",0x25A0],
+  ["A1BE",0x25BD],
+  ["A1BF",0x25BC],
+  ["A1C0",0x32A3],
+  ["A1C1",0x2105],
+  ["A1C2",0x00AF],
+  ["A1C3",0xFFE3],
+  ["A1C4",0xFF3F],
+  ["A1C5",0x02CD],
+  ["A1C6",0xFE49],
+  ["A1C7",0xFE4A],
+  ["A1C8",0xFE4D],
+  ["A1C9",0xFE4E],
+  ["A1CA",0xFE4B],
+  ["A1CB",0xFE4C],
+  ["A1CC",0xFE5F],
+  ["A1CD",0xFE60],
+  ["A1CE",0xFE61],
+  ["A1CF",0xFF0B],
+  ["A1D0",0xFF0D],
+  ["A1D1",0x00D7],
+  ["A1D2",0x00F7],
+  ["A1D3",0x00B1],
+  ["A1D4",0x221A],
+  ["A1D5",0xFF1C],
+  ["A1D6",0xFF1E],
+  ["A1D7",0xFF1D],
+  ["A1D8",0x2266],
+  ["A1D9",0x2267],
+  ["A1DA",0x2260],
+  ["A1DB",0x221E],
+  ["A1DC",0x2252],
+  ["A1DD",0x2261],
+  ["A1DE",0xFE62],
+  ["A1DF",0xFE63],
+  ["A1E0",0xFE64],
+  ["A1E1",0xFE65],
+  ["A1E2",0xFE66],
+  ["A1E3",0xFF5E],
+  ["A1E4",0x2229],
+  ["A1E5",0x222A],
+  ["A1E6",0x22A5],
+  ["A1E7",0x2220],
+  ["A1E8",0x221F],
+  ["A1E9",0x22BF],
+  ["A1EA",0x33D2],
+  ["A1EB",0x33D1],
+  ["A1EC",0x222B],
+  ["A1ED",0x222E],
+  ["A1EE",0x2235],
+  ["A1EF",0x2234],
+  ["A1F0",0x2640],
+  ["A1F1",0x2642],
+  ["A1F2",0x2295],
+  ["A1F3",0x2299],
+  ["A1F4",0x2191],
+  ["A1F5",0x2193],
+  ["A1F6",0x2190],
+  ["A1F7",0x2192],
+  ["A1F8",0x2196],
+  ["A1F9",0x2197],
+  ["A1FA",0x2199],
+  ["A1FB",0x2198],
+  ["A1FC",0x2225],
+  ["A1FD",0x2223],
+  ["A1FE",0xFF0F],
+  ["A240",0xFF3C],
+  ["A241",0x2215],
+  ["A242",0xFE68],
+  ["A243",0xFF04],
+  ["A244",0xFFE5],
+  ["A245",0x3012],
+  ["A246",0xFFE0],
+  ["A247",0xFFE1],
+  ["A248",0xFF05],
+  ["A249",0xFF20],
+  ["A24A",0x2103],
+  ["A24B",0x2109],
+  ["A24C",0xFE69],
+  ["A24D",0xFE6A],
+  ["A24E",0xFE6B],
+  ["A24F",0x33D5],
+  ["A250",0x339C],
+  ["A251",0x339D],
+  ["A252",0x339E],
+  ["A253",0x33CE],
+  ["A254",0x33A1],
+  ["A255",0x338E],
+  ["A256",0x338F],
+  ["A257",0x33C4],
+  ["A258",0x00B0],
+  ["A259",0x5159],
+  ["A25A",0x515B],
+  ["A25B",0x515E],
+  ["A25C",0x515D],
+  ["A25D",0x5161],
+  ["A25E",0x5163],
+  ["A25F",0x55E7],
+  ["A260",0x74E9],
+  ["A261",0x7CCE],
+  ["A262",0x2581],
+  ["A263",0x2582],
+  ["A264",0x2583],
+  ["A265",0x2584],
+  ["A266",0x2585],
+  ["A267",0x2586],
+  ["A268",0x2587],
+  ["A269",0x2588],
+  ["A26A",0x258F],
+  ["A26B",0x258E],
+  ["A26C",0x258D],
+  ["A26D",0x258C],
+  ["A26E",0x258B],
+  ["A26F",0x258A],
+  ["A270",0x2589],
+  ["A271",0x253C],
+  ["A272",0x2534],
+  ["A273",0x252C],
+  ["A274",0x2524],
+  ["A275",0x251C],
+  ["A276",0x2594],
+  ["A277",0x2500],
+  ["A278",0x2502],
+  ["A279",0x2595],
+  ["A27A",0x250C],
+  ["A27B",0x2510],
+  ["A27C",0x2514],
+  ["A27D",0x2518],
+  ["A27E",0x256D],
+  ["A2A1",0x256E],
+  ["A2A2",0x2570],
+  ["A2A3",0x256F],
+  ["A2A4",0x2550],
+  ["A2A5",0x255E],
+  ["A2A6",0x256A],
+  ["A2A7",0x2561],
+  ["A2A8",0x25E2],
+  ["A2A9",0x25E3],
+  ["A2AA",0x25E5],
+  ["A2AB",0x25E4],
+  ["A2AC",0x2571],
+  ["A2AD",0x2572],
+  ["A2AE",0x2573],
+  ["A2AF",0xFF10],
+  ["A2B0",0xFF11],
+  ["A2B1",0xFF12],
+  ["A2B2",0xFF13],
+  ["A2B3",0xFF14],
+  ["A2B4",0xFF15],
+  ["A2B5",0xFF16],
+  ["A2B6",0xFF17],
+  ["A2B7",0xFF18],
+  ["A2B8",0xFF19],
+  ["A2B9",0x2160],
+  ["A2BA",0x2161],
+  ["A2BB",0x2162],
+  ["A2BC",0x2163],
+  ["A2BD",0x2164],
+  ["A2BE",0x2165],
+  ["A2BF",0x2166],
+  ["A2C0",0x2167],
+  ["A2C1",0x2168],
+  ["A2C2",0x2169],
+  ["A2C3",0x3021],
+  ["A2C4",0x3022],
+  ["A2C5",0x3023],
+  ["A2C6",0x3024],
+  ["A2C7",0x3025],
+  ["A2C8",0x3026],
+  ["A2C9",0x3027],
+  ["A2CA",0x3028],
+  ["A2CB",0x3029],
+  ["A2CC",0x5341],
+  ["A2CD",0x5344],
+  ["A2CE",0x5345],
+  ["A2CF",0xFF21],
+  ["A2D0",0xFF22],
+  ["A2D1",0xFF23],
+  ["A2D2",0xFF24],
+  ["A2D3",0xFF25],
+  ["A2D4",0xFF26],
+  ["A2D5",0xFF27],
+  ["A2D6",0xFF28],
+  ["A2D7",0xFF29],
+  ["A2D8",0xFF2A],
+  ["A2D9",0xFF2B],
+  ["A2DA",0xFF2C],
+  ["A2DB",0xFF2D],
+  ["A2DC",0xFF2E],
+  ["A2DD",0xFF2F],
+  ["A2DE",0xFF30],
+  ["A2DF",0xFF31],
+  ["A2E0",0xFF32],
+  ["A2E1",0xFF33],
+  ["A2E2",0xFF34],
+  ["A2E3",0xFF35],
+  ["A2E4",0xFF36],
+  ["A2E5",0xFF37],
+  ["A2E6",0xFF38],
+  ["A2E7",0xFF39],
+  ["A2E8",0xFF3A],
+  ["A2E9",0xFF41],
+  ["A2EA",0xFF42],
+  ["A2EB",0xFF43],
+  ["A2EC",0xFF44],
+  ["A2ED",0xFF45],
+  ["A2EE",0xFF46],
+  ["A2EF",0xFF47],
+  ["A2F0",0xFF48],
+  ["A2F1",0xFF49],
+  ["A2F2",0xFF4A],
+  ["A2F3",0xFF4B],
+  ["A2F4",0xFF4C],
+  ["A2F5",0xFF4D],
+  ["A2F6",0xFF4E],
+  ["A2F7",0xFF4F],
+  ["A2F8",0xFF50],
+  ["A2F9",0xFF51],
+  ["A2FA",0xFF52],
+  ["A2FB",0xFF53],
+  ["A2FC",0xFF54],
+  ["A2FD",0xFF55],
+  ["A2FE",0xFF56],
+  ["A340",0xFF57],
+  ["A341",0xFF58],
+  ["A342",0xFF59],
+  ["A343",0xFF5A],
+  ["A344",0x0391],
+  ["A345",0x0392],
+  ["A346",0x0393],
+  ["A347",0x0394],
+  ["A348",0x0395],
+  ["A349",0x0396],
+  ["A34A",0x0397],
+  ["A34B",0x0398],
+  ["A34C",0x0399],
+  ["A34D",0x039A],
+  ["A34E",0x039B],
+  ["A34F",0x039C],
+  ["A350",0x039D],
+  ["A351",0x039E],
+  ["A352",0x039F],
+  ["A353",0x03A0],
+  ["A354",0x03A1],
+  ["A355",0x03A3],
+  ["A356",0x03A4],
+  ["A357",0x03A5],
+  ["A358",0x03A6],
+  ["A359",0x03A7],
+  ["A35A",0x03A8],
+  ["A35B",0x03A9],
+  ["A35C",0x03B1],
+  ["A35D",0x03B2],
+  ["A35E",0x03B3],
+  ["A35F",0x03B4],
+  ["A360",0x03B5],
+  ["A361",0x03B6],
+  ["A362",0x03B7],
+  ["A363",0x03B8],
+  ["A364",0x03B9],
+  ["A365",0x03BA],
+  ["A366",0x03BB],
+  ["A367",0x03BC],
+  ["A368",0x03BD],
+  ["A369",0x03BE],
+  ["A36A",0x03BF],
+  ["A36B",0x03C0],
+  ["A36C",0x03C1],
+  ["A36D",0x03C3],
+  ["A36E",0x03C4],
+  ["A36F",0x03C5],
+  ["A370",0x03C6],
+  ["A371",0x03C7],
+  ["A372",0x03C8],
+  ["A373",0x03C9],
+  ["A374",0x3105],
+  ["A375",0x3106],
+  ["A376",0x3107],
+  ["A377",0x3108],
+  ["A378",0x3109],
+  ["A379",0x310A],
+  ["A37A",0x310B],
+  ["A37B",0x310C],
+  ["A37C",0x310D],
+  ["A37D",0x310E],
+  ["A37E",0x310F],
+  ["A3A1",0x3110],
+  ["A3A2",0x3111],
+  ["A3A3",0x3112],
+  ["A3A4",0x3113],
+  ["A3A5",0x3114],
+  ["A3A6",0x3115],
+  ["A3A7",0x3116],
+  ["A3A8",0x3117],
+  ["A3A9",0x3118],
+  ["A3AA",0x3119],
+  ["A3AB",0x311A],
+  ["A3AC",0x311B],
+  ["A3AD",0x311C],
+  ["A3AE",0x311D],
+  ["A3AF",0x311E],
+  ["A3B0",0x311F],
+  ["A3B1",0x3120],
+  ["A3B2",0x3121],
+  ["A3B3",0x3122],
+  ["A3B4",0x3123],
+  ["A3B5",0x3124],
+  ["A3B6",0x3125],
+  ["A3B7",0x3126],
+  ["A3B8",0x3127],
+  ["A3B9",0x3128],
+  ["A3BA",0x3129],
+  ["A3BB",0x02D9],
+  ["A3BC",0x02C9],
+  ["A3BD",0x02CA],
+  ["A3BE",0x02C7],
+  ["A3BF",0x02CB],
+  ["A3C0",0x2400],
+  ["A3C1",0x2401],
+  ["A3C2",0x2402],
+  ["A3C3",0x2403],
+  ["A3C4",0x2404],
+  ["A3C5",0x2405],
+  ["A3C6",0x2406],
+  ["A3C7",0x2407],
+  ["A3C8",0x2408],
+  ["A3C9",0x2409],
+  ["A3CA",0x240A],
+  ["A3CB",0x240B],
+  ["A3CC",0x240C],
+  ["A3CD",0x240D],
+  ["A3CE",0x240E],
+  ["A3CF",0x240F],
+  ["A3D0",0x2410],
+  ["A3D1",0x2411],
+  ["A3D2",0x2412],
+  ["A3D3",0x2413],
+  ["A3D4",0x2414],
+  ["A3D5",0x2415],
+  ["A3D6",0x2416],
+  ["A3D7",0x2417],
+  ["A3D8",0x2418],
+  ["A3D9",0x2419],
+  ["A3DA",0x241A],
+  ["A3DB",0x241B],
+  ["A3DC",0x241C],
+  ["A3DD",0x241D],
+  ["A3DE",0x241E],
+  ["A3DF",0x241F],
+  ["A3E0",0x2421],
+  ["A3E1",0x20AC],
+  ["A3E2",0xF849],
+  ["A3E3",0xF84A],
+  ["A3E4",0xF84B],
+  ["A3E5",0xF84C],
+  ["A3E6",0xF84D],
+  ["A3E7",0xF84E],
+  ["A3E8",0xF84F],
+  ["A3E9",0xF850],
+  ["A3EA",0xF851],
+  ["A3EB",0xF852],
+  ["A3EC",0xF853],
+  ["A3ED",0xF854],
+  ["A3EE",0xF855],
+  ["A3EF",0xF856],
+  ["A3F0",0xF857],
+  ["A3F1",0xF858],
+  ["A3F2",0xF859],
+  ["A3F3",0xF85A],
+  ["A3F4",0xF85B],
+  ["A3F5",0xF85C],
+  ["A3F6",0xF85D],
+  ["A3F7",0xF85E],
+  ["A3F8",0xF85F],
+  ["A3F9",0xF860],
+  ["A3FA",0xF861],
+  ["A3FB",0xF862],
+  ["A3FC",0xF863],
+  ["A3FD",0xF864],
+  ["A3FE",0xF865],
+  ["A440",0x4E00],
+  ["A441",0x4E59],
+  ["A442",0x4E01],
+  ["A443",0x4E03],
+  ["A444",0x4E43],
+  ["A445",0x4E5D],
+  ["A446",0x4E86],
+  ["A447",0x4E8C],
+  ["A448",0x4EBA],
+  ["A449",0x513F],
+  ["A44A",0x5165],
+  ["A44B",0x516B],
+  ["A44C",0x51E0],
+  ["A44D",0x5200],
+  ["A44E",0x5201],
+  ["A44F",0x529B],
+  ["A450",0x5315],
+  ["A451",0x5341],
+  ["A452",0x535C],
+  ["A453",0x53C8],
+  ["A454",0x4E09],
+  ["A455",0x4E0B],
+  ["A456",0x4E08],
+  ["A457",0x4E0A],
+  ["A458",0x4E2B],
+  ["A459",0x4E38],
+  ["A45A",0x51E1],
+  ["A45B",0x4E45],
+  ["A45C",0x4E48],
+  ["A45D",0x4E5F],
+  ["A45E",0x4E5E],
+  ["A45F",0x4E8E],
+  ["A460",0x4EA1],
+  ["A461",0x5140],
+  ["A462",0x5203],
+  ["A463",0x52FA],
+  ["A464",0x5343],
+  ["A465",0x53C9],
+  ["A466",0x53E3],
+  ["A467",0x571F],
+  ["A468",0x58EB],
+  ["A469",0x5915],
+  ["A46A",0x5927],
+  ["A46B",0x5973],
+  ["A46C",0x5B50],
+  ["A46D",0x5B51],
+  ["A46E",0x5B53],
+  ["A46F",0x5BF8],
+  ["A470",0x5C0F],
+  ["A471",0x5C22],
+  ["A472",0x5C38],
+  ["A473",0x5C71],
+  ["A474",0x5DDD],
+  ["A475",0x5DE5],
+  ["A476",0x5DF1],
+  ["A477",0x5DF2],
+  ["A478",0x5DF3],
+  ["A479",0x5DFE],
+  ["A47A",0x5E72],
+  ["A47B",0x5EFE],
+  ["A47C",0x5F0B],
+  ["A47D",0x5F13],
+  ["A47E",0x624D],
+  ["A4A1",0x4E11],
+  ["A4A2",0x4E10],
+  ["A4A3",0x4E0D],
+  ["A4A4",0x4E2D],
+  ["A4A5",0x4E30],
+  ["A4A6",0x4E39],
+  ["A4A7",0x4E4B],
+  ["A4A8",0x5C39],
+  ["A4A9",0x4E88],
+  ["A4AA",0x4E91],
+  ["A4AB",0x4E95],
+  ["A4AC",0x4E92],
+  ["A4AD",0x4E94],
+  ["A4AE",0x4EA2],
+  ["A4AF",0x4EC1],
+  ["A4B0",0x4EC0],
+  ["A4B1",0x4EC3],
+  ["A4B2",0x4EC6],
+  ["A4B3",0x4EC7],
+  ["A4B4",0x4ECD],
+  ["A4B5",0x4ECA],
+  ["A4B6",0x4ECB],
+  ["A4B7",0x4EC4],
+  ["A4B8",0x5143],
+  ["A4B9",0x5141],
+  ["A4BA",0x5167],
+  ["A4BB",0x516D],
+  ["A4BC",0x516E],
+  ["A4BD",0x516C],
+  ["A4BE",0x5197],
+  ["A4BF",0x51F6],
+  ["A4C0",0x5206],
+  ["A4C1",0x5207],
+  ["A4C2",0x5208],
+  ["A4C3",0x52FB],
+  ["A4C4",0x52FE],
+  ["A4C5",0x52FF],
+  ["A4C6",0x5316],
+  ["A4C7",0x5339],
+  ["A4C8",0x5348],
+  ["A4C9",0x5347],
+  ["A4CA",0x5345],
+  ["A4CB",0x535E],
+  ["A4CC",0x5384],
+  ["A4CD",0x53CB],
+  ["A4CE",0x53CA],
+  ["A4CF",0x53CD],
+  ["A4D0",0x58EC],
+  ["A4D1",0x5929],
+  ["A4D2",0x592B],
+  ["A4D3",0x592A],
+  ["A4D4",0x592D],
+  ["A4D5",0x5B54],
+  ["A4D6",0x5C11],
+  ["A4D7",0x5C24],
+  ["A4D8",0x5C3A],
+  ["A4D9",0x5C6F],
+  ["A4DA",0x5DF4],
+  ["A4DB",0x5E7B],
+  ["A4DC",0x5EFF],
+  ["A4DD",0x5F14],
+  ["A4DE",0x5F15],
+  ["A4DF",0x5FC3],
+  ["A4E0",0x6208],
+  ["A4E1",0x6236],
+  ["A4E2",0x624B],
+  ["A4E3",0x624E],
+  ["A4E4",0x652F],
+  ["A4E5",0x6587],
+  ["A4E6",0x6597],
+  ["A4E7",0x65A4],
+  ["A4E8",0x65B9],
+  ["A4E9",0x65E5],
+  ["A4EA",0x66F0],
+  ["A4EB",0x6708],
+  ["A4EC",0x6728],
+  ["A4ED",0x6B20],
+  ["A4EE",0x6B62],
+  ["A4EF",0x6B79],
+  ["A4F0",0x6BCB],
+  ["A4F1",0x6BD4],
+  ["A4F2",0x6BDB],
+  ["A4F3",0x6C0F],
+  ["A4F4",0x6C34],
+  ["A4F5",0x706B],
+  ["A4F6",0x722A],
+  ["A4F7",0x7236],
+  ["A4F8",0x723B],
+  ["A4F9",0x7247],
+  ["A4FA",0x7259],
+  ["A4FB",0x725B],
+  ["A4FC",0x72AC],
+  ["A4FD",0x738B],
+  ["A4FE",0x4E19],
+  ["A540",0x4E16],
+  ["A541",0x4E15],
+  ["A542",0x4E14],
+  ["A543",0x4E18],
+  ["A544",0x4E3B],
+  ["A545",0x4E4D],
+  ["A546",0x4E4F],
+  ["A547",0x4E4E],
+  ["A548",0x4EE5],
+  ["A549",0x4ED8],
+  ["A54A",0x4ED4],
+  ["A54B",0x4ED5],
+  ["A54C",0x4ED6],
+  ["A54D",0x4ED7],
+  ["A54E",0x4EE3],
+  ["A54F",0x4EE4],
+  ["A550",0x4ED9],
+  ["A551",0x4EDE],
+  ["A552",0x5145],
+  ["A553",0x5144],
+  ["A554",0x5189],
+  ["A555",0x518A],
+  ["A556",0x51AC],
+  ["A557",0x51F9],
+  ["A558",0x51FA],
+  ["A559",0x51F8],
+  ["A55A",0x520A],
+  ["A55B",0x52A0],
+  ["A55C",0x529F],
+  ["A55D",0x5305],
+  ["A55E",0x5306],
+  ["A55F",0x5317],
+  ["A560",0x531D],
+  ["A561",0x4EDF],
+  ["A562",0x534A],
+  ["A563",0x5349],
+  ["A564",0x5361],
+  ["A565",0x5360],
+  ["A566",0x536F],
+  ["A567",0x536E],
+  ["A568",0x53BB],
+  ["A569",0x53EF],
+  ["A56A",0x53E4],
+  ["A56B",0x53F3],
+  ["A56C",0x53EC],
+  ["A56D",0x53EE],
+  ["A56E",0x53E9],
+  ["A56F",0x53E8],
+  ["A570",0x53FC],
+  ["A571",0x53F8],
+  ["A572",0x53F5],
+  ["A573",0x53EB],
+  ["A574",0x53E6],
+  ["A575",0x53EA],
+  ["A576",0x53F2],
+  ["A577",0x53F1],
+  ["A578",0x53F0],
+  ["A579",0x53E5],
+  ["A57A",0x53ED],
+  ["A57B",0x53FB],
+  ["A57C",0x56DB],
+  ["A57D",0x56DA],
+  ["A57E",0x5916],
+  ["A5A1",0x592E],
+  ["A5A2",0x5931],
+  ["A5A3",0x5974],
+  ["A5A4",0x5976],
+  ["A5A5",0x5B55],
+  ["A5A6",0x5B83],
+  ["A5A7",0x5C3C],
+  ["A5A8",0x5DE8],
+  ["A5A9",0x5DE7],
+  ["A5AA",0x5DE6],
+  ["A5AB",0x5E02],
+  ["A5AC",0x5E03],
+  ["A5AD",0x5E73],
+  ["A5AE",0x5E7C],
+  ["A5AF",0x5F01],
+  ["A5B0",0x5F18],
+  ["A5B1",0x5F17],
+  ["A5B2",0x5FC5],
+  ["A5B3",0x620A],
+  ["A5B4",0x6253],
+  ["A5B5",0x6254],
+  ["A5B6",0x6252],
+  ["A5B7",0x6251],
+  ["A5B8",0x65A5],
+  ["A5B9",0x65E6],
+  ["A5BA",0x672E],
+  ["A5BB",0x672C],
+  ["A5BC",0x672A],
+  ["A5BD",0x672B],
+  ["A5BE",0x672D],
+  ["A5BF",0x6B63],
+  ["A5C0",0x6BCD],
+  ["A5C1",0x6C11],
+  ["A5C2",0x6C10],
+  ["A5C3",0x6C38],
+  ["A5C4",0x6C41],
+  ["A5C5",0x6C40],
+  ["A5C6",0x6C3E],
+  ["A5C7",0x72AF],
+  ["A5C8",0x7384],
+  ["A5C9",0x7389],
+  ["A5CA",0x74DC],
+  ["A5CB",0x74E6],
+  ["A5CC",0x7518],
+  ["A5CD",0x751F],
+  ["A5CE",0x7528],
+  ["A5CF",0x7529],
+  ["A5D0",0x7530],
+  ["A5D1",0x7531],
+  ["A5D2",0x7532],
+  ["A5D3",0x7533],
+  ["A5D4",0x758B],
+  ["A5D5",0x767D],
+  ["A5D6",0x76AE],
+  ["A5D7",0x76BF],
+  ["A5D8",0x76EE],
+  ["A5D9",0x77DB],
+  ["A5DA",0x77E2],
+  ["A5DB",0x77F3],
+  ["A5DC",0x793A],
+  ["A5DD",0x79BE],
+  ["A5DE",0x7A74],
+  ["A5DF",0x7ACB],
+  ["A5E0",0x4E1E],
+  ["A5E1",0x4E1F],
+  ["A5E2",0x4E52],
+  ["A5E3",0x4E53],
+  ["A5E4",0x4E69],
+  ["A5E5",0x4E99],
+  ["A5E6",0x4EA4],
+  ["A5E7",0x4EA6],
+  ["A5E8",0x4EA5],
+  ["A5E9",0x4EFF],
+  ["A5EA",0x4F09],
+  ["A5EB",0x4F19],
+  ["A5EC",0x4F0A],
+  ["A5ED",0x4F15],
+  ["A5EE",0x4F0D],
+  ["A5EF",0x4F10],
+  ["A5F0",0x4F11],
+  ["A5F1",0x4F0F],
+  ["A5F2",0x4EF2],
+  ["A5F3",0x4EF6],
+  ["A5F4",0x4EFB],
+  ["A5F5",0x4EF0],
+  ["A5F6",0x4EF3],
+  ["A5F7",0x4EFD],
+  ["A5F8",0x4F01],
+  ["A5F9",0x4F0B],
+  ["A5FA",0x5149],
+  ["A5FB",0x5147],
+  ["A5FC",0x5146],
+  ["A5FD",0x5148],
+  ["A5FE",0x5168],
+  ["A640",0x5171],
+  ["A641",0x518D],
+  ["A642",0x51B0],
+  ["A643",0x5217],
+  ["A644",0x5211],
+  ["A645",0x5212],
+  ["A646",0x520E],
+  ["A647",0x5216],
+  ["A648",0x52A3],
+  ["A649",0x5308],
+  ["A64A",0x5321],
+  ["A64B",0x5320],
+  ["A64C",0x5370],
+  ["A64D",0x5371],
+  ["A64E",0x5409],
+  ["A64F",0x540F],
+  ["A650",0x540C],
+  ["A651",0x540A],
+  ["A652",0x5410],
+  ["A653",0x5401],
+  ["A654",0x540B],
+  ["A655",0x5404],
+  ["A656",0x5411],
+  ["A657",0x540D],
+  ["A658",0x5408],
+  ["A659",0x5403],
+  ["A65A",0x540E],
+  ["A65B",0x5406],
+  ["A65C",0x5412],
+  ["A65D",0x56E0],
+  ["A65E",0x56DE],
+  ["A65F",0x56DD],
+  ["A660",0x5733],
+  ["A661",0x5730],
+  ["A662",0x5728],
+  ["A663",0x572D],
+  ["A664",0x572C],
+  ["A665",0x572F],
+  ["A666",0x5729],
+  ["A667",0x5919],
+  ["A668",0x591A],
+  ["A669",0x5937],
+  ["A66A",0x5938],
+  ["A66B",0x5984],
+  ["A66C",0x5978],
+  ["A66D",0x5983],
+  ["A66E",0x597D],
+  ["A66F",0x5979],
+  ["A670",0x5982],
+  ["A671",0x5981],
+  ["A672",0x5B57],
+  ["A673",0x5B58],
+  ["A674",0x5B87],
+  ["A675",0x5B88],
+  ["A676",0x5B85],
+  ["A677",0x5B89],
+  ["A678",0x5BFA],
+  ["A679",0x5C16],
+  ["A67A",0x5C79],
+  ["A67B",0x5DDE],
+  ["A67C",0x5E06],
+  ["A67D",0x5E76],
+  ["A67E",0x5E74],
+  ["A6A1",0x5F0F],
+  ["A6A2",0x5F1B],
+  ["A6A3",0x5FD9],
+  ["A6A4",0x5FD6],
+  ["A6A5",0x620E],
+  ["A6A6",0x620C],
+  ["A6A7",0x620D],
+  ["A6A8",0x6210],
+  ["A6A9",0x6263],
+  ["A6AA",0x625B],
+  ["A6AB",0x6258],
+  ["A6AC",0x6536],
+  ["A6AD",0x65E9],
+  ["A6AE",0x65E8],
+  ["A6AF",0x65EC],
+  ["A6B0",0x65ED],
+  ["A6B1",0x66F2],
+  ["A6B2",0x66F3],
+  ["A6B3",0x6709],
+  ["A6B4",0x673D],
+  ["A6B5",0x6734],
+  ["A6B6",0x6731],
+  ["A6B7",0x6735],
+  ["A6B8",0x6B21],
+  ["A6B9",0x6B64],
+  ["A6BA",0x6B7B],
+  ["A6BB",0x6C16],
+  ["A6BC",0x6C5D],
+  ["A6BD",0x6C57],
+  ["A6BE",0x6C59],
+  ["A6BF",0x6C5F],
+  ["A6C0",0x6C60],
+  ["A6C1",0x6C50],
+  ["A6C2",0x6C55],
+  ["A6C3",0x6C61],
+  ["A6C4",0x6C5B],
+  ["A6C5",0x6C4D],
+  ["A6C6",0x6C4E],
+  ["A6C7",0x7070],
+  ["A6C8",0x725F],
+  ["A6C9",0x725D],
+  ["A6CA",0x767E],
+  ["A6CB",0x7AF9],
+  ["A6CC",0x7C73],
+  ["A6CD",0x7CF8],
+  ["A6CE",0x7F36],
+  ["A6CF",0x7F8A],
+  ["A6D0",0x7FBD],
+  ["A6D1",0x8001],
+  ["A6D2",0x8003],
+  ["A6D3",0x800C],
+  ["A6D4",0x8012],
+  ["A6D5",0x8033],
+  ["A6D6",0x807F],
+  ["A6D7",0x8089],
+  ["A6D8",0x808B],
+  ["A6D9",0x808C],
+  ["A6DA",0x81E3],
+  ["A6DB",0x81EA],
+  ["A6DC",0x81F3],
+  ["A6DD",0x81FC],
+  ["A6DE",0x820C],
+  ["A6DF",0x821B],
+  ["A6E0",0x821F],
+  ["A6E1",0x826E],
+  ["A6E2",0x8272],
+  ["A6E3",0x827E],
+  ["A6E4",0x866B],
+  ["A6E5",0x8840],
+  ["A6E6",0x884C],
+  ["A6E7",0x8863],
+  ["A6E8",0x897F],
+  ["A6E9",0x9621],
+  ["A6EA",0x4E32],
+  ["A6EB",0x4EA8],
+  ["A6EC",0x4F4D],
+  ["A6ED",0x4F4F],
+  ["A6EE",0x4F47],
+  ["A6EF",0x4F57],
+  ["A6F0",0x4F5E],
+  ["A6F1",0x4F34],
+  ["A6F2",0x4F5B],
+  ["A6F3",0x4F55],
+  ["A6F4",0x4F30],
+  ["A6F5",0x4F50],
+  ["A6F6",0x4F51],
+  ["A6F7",0x4F3D],
+  ["A6F8",0x4F3A],
+  ["A6F9",0x4F38],
+  ["A6FA",0x4F43],
+  ["A6FB",0x4F54],
+  ["A6FC",0x4F3C],
+  ["A6FD",0x4F46],
+  ["A6FE",0x4F63],
+  ["A740",0x4F5C],
+  ["A741",0x4F60],
+  ["A742",0x4F2F],
+  ["A743",0x4F4E],
+  ["A744",0x4F36],
+  ["A745",0x4F59],
+  ["A746",0x4F5D],
+  ["A747",0x4F48],
+  ["A748",0x4F5A],
+  ["A749",0x514C],
+  ["A74A",0x514B],
+  ["A74B",0x514D],
+  ["A74C",0x5175],
+  ["A74D",0x51B6],
+  ["A74E",0x51B7],
+  ["A74F",0x5225],
+  ["A750",0x5224],
+  ["A751",0x5229],
+  ["A752",0x522A],
+  ["A753",0x5228],
+  ["A754",0x52AB],
+  ["A755",0x52A9],
+  ["A756",0x52AA],
+  ["A757",0x52AC],
+  ["A758",0x5323],
+  ["A759",0x5373],
+  ["A75A",0x5375],
+  ["A75B",0x541D],
+  ["A75C",0x542D],
+  ["A75D",0x541E],
+  ["A75E",0x543E],
+  ["A75F",0x5426],
+  ["A760",0x544E],
+  ["A761",0x5427],
+  ["A762",0x5446],
+  ["A763",0x5443],
+  ["A764",0x5433],
+  ["A765",0x5448],
+  ["A766",0x5442],
+  ["A767",0x541B],
+  ["A768",0x5429],
+  ["A769",0x544A],
+  ["A76A",0x5439],
+  ["A76B",0x543B],
+  ["A76C",0x5438],
+  ["A76D",0x542E],
+  ["A76E",0x5435],
+  ["A76F",0x5436],
+  ["A770",0x5420],
+  ["A771",0x543C],
+  ["A772",0x5440],
+  ["A773",0x5431],
+  ["A774",0x542B],
+  ["A775",0x541F],
+  ["A776",0x542C],
+  ["A777",0x56EA],
+  ["A778",0x56F0],
+  ["A779",0x56E4],
+  ["A77A",0x56EB],
+  ["A77B",0x574A],
+  ["A77C",0x5751],
+  ["A77D",0x5740],
+  ["A77E",0x574D],
+  ["A7A1",0x5747],
+  ["A7A2",0x574E],
+  ["A7A3",0x573E],
+  ["A7A4",0x5750],
+  ["A7A5",0x574F],
+  ["A7A6",0x573B],
+  ["A7A7",0x58EF],
+  ["A7A8",0x593E],
+  ["A7A9",0x599D],
+  ["A7AA",0x5992],
+  ["A7AB",0x59A8],
+  ["A7AC",0x599E],
+  ["A7AD",0x59A3],
+  ["A7AE",0x5999],
+  ["A7AF",0x5996],
+  ["A7B0",0x598D],
+  ["A7B1",0x59A4],
+  ["A7B2",0x5993],
+  ["A7B3",0x598A],
+  ["A7B4",0x59A5],
+  ["A7B5",0x5B5D],
+  ["A7B6",0x5B5C],
+  ["A7B7",0x5B5A],
+  ["A7B8",0x5B5B],
+  ["A7B9",0x5B8C],
+  ["A7BA",0x5B8B],
+  ["A7BB",0x5B8F],
+  ["A7BC",0x5C2C],
+  ["A7BD",0x5C40],
+  ["A7BE",0x5C41],
+  ["A7BF",0x5C3F],
+  ["A7C0",0x5C3E],
+  ["A7C1",0x5C90],
+  ["A7C2",0x5C91],
+  ["A7C3",0x5C94],
+  ["A7C4",0x5C8C],
+  ["A7C5",0x5DEB],
+  ["A7C6",0x5E0C],
+  ["A7C7",0x5E8F],
+  ["A7C8",0x5E87],
+  ["A7C9",0x5E8A],
+  ["A7CA",0x5EF7],
+  ["A7CB",0x5F04],
+  ["A7CC",0x5F1F],
+  ["A7CD",0x5F64],
+  ["A7CE",0x5F62],
+  ["A7CF",0x5F77],
+  ["A7D0",0x5F79],
+  ["A7D1",0x5FD8],
+  ["A7D2",0x5FCC],
+  ["A7D3",0x5FD7],
+  ["A7D4",0x5FCD],
+  ["A7D5",0x5FF1],
+  ["A7D6",0x5FEB],
+  ["A7D7",0x5FF8],
+  ["A7D8",0x5FEA],
+  ["A7D9",0x6212],
+  ["A7DA",0x6211],
+  ["A7DB",0x6284],
+  ["A7DC",0x6297],
+  ["A7DD",0x6296],
+  ["A7DE",0x6280],
+  ["A7DF",0x6276],
+  ["A7E0",0x6289],
+  ["A7E1",0x626D],
+  ["A7E2",0x628A],
+  ["A7E3",0x627C],
+  ["A7E4",0x627E],
+  ["A7E5",0x6279],
+  ["A7E6",0x6273],
+  ["A7E7",0x6292],
+  ["A7E8",0x626F],
+  ["A7E9",0x6298],
+  ["A7EA",0x626E],
+  ["A7EB",0x6295],
+  ["A7EC",0x6293],
+  ["A7ED",0x6291],
+  ["A7EE",0x6286],
+  ["A7EF",0x6539],
+  ["A7F0",0x653B],
+  ["A7F1",0x6538],
+  ["A7F2",0x65F1],
+  ["A7F3",0x66F4],
+  ["A7F4",0x675F],
+  ["A7F5",0x674E],
+  ["A7F6",0x674F],
+  ["A7F7",0x6750],
+  ["A7F8",0x6751],
+  ["A7F9",0x675C],
+  ["A7FA",0x6756],
+  ["A7FB",0x675E],
+  ["A7FC",0x6749],
+  ["A7FD",0x6746],
+  ["A7FE",0x6760],
+  ["A840",0x6753],
+  ["A841",0x6757],
+  ["A842",0x6B65],
+  ["A843",0x6BCF],
+  ["A844",0x6C42],
+  ["A845",0x6C5E],
+  ["A846",0x6C99],
+  ["A847",0x6C81],
+  ["A848",0x6C88],
+  ["A849",0x6C89],
+  ["A84A",0x6C85],
+  ["A84B",0x6C9B],
+  ["A84C",0x6C6A],
+  ["A84D",0x6C7A],
+  ["A84E",0x6C90],
+  ["A84F",0x6C70],
+  ["A850",0x6C8C],
+  ["A851",0x6C68],
+  ["A852",0x6C96],
+  ["A853",0x6C92],
+  ["A854",0x6C7D],
+  ["A855",0x6C83],
+  ["A856",0x6C72],
+  ["A857",0x6C7E],
+  ["A858",0x6C74],
+  ["A859",0x6C86],
+  ["A85A",0x6C76],
+  ["A85B",0x6C8D],
+  ["A85C",0x6C94],
+  ["A85D",0x6C98],
+  ["A85E",0x6C82],
+  ["A85F",0x7076],
+  ["A860",0x707C],
+  ["A861",0x707D],
+  ["A862",0x7078],
+  ["A863",0x7262],
+  ["A864",0x7261],
+  ["A865",0x7260],
+  ["A866",0x72C4],
+  ["A867",0x72C2],
+  ["A868",0x7396],
+  ["A869",0x752C],
+  ["A86A",0x752B],
+  ["A86B",0x7537],
+  ["A86C",0x7538],
+  ["A86D",0x7682],
+  ["A86E",0x76EF],
+  ["A86F",0x77E3],
+  ["A870",0x79C1],
+  ["A871",0x79C0],
+  ["A872",0x79BF],
+  ["A873",0x7A76],
+  ["A874",0x7CFB],
+  ["A875",0x7F55],
+  ["A876",0x8096],
+  ["A877",0x8093],
+  ["A878",0x809D],
+  ["A879",0x8098],
+  ["A87A",0x809B],
+  ["A87B",0x809A],
+  ["A87C",0x80B2],
+  ["A87D",0x826F],
+  ["A87E",0x8292],
+  ["A8A1",0x828B],
+  ["A8A2",0x828D],
+  ["A8A3",0x898B],
+  ["A8A4",0x89D2],
+  ["A8A5",0x8A00],
+  ["A8A6",0x8C37],
+  ["A8A7",0x8C46],
+  ["A8A8",0x8C55],
+  ["A8A9",0x8C9D],
+  ["A8AA",0x8D64],
+  ["A8AB",0x8D70],
+  ["A8AC",0x8DB3],
+  ["A8AD",0x8EAB],
+  ["A8AE",0x8ECA],
+  ["A8AF",0x8F9B],
+  ["A8B0",0x8FB0],
+  ["A8B1",0x8FC2],
+  ["A8B2",0x8FC6],
+  ["A8B3",0x8FC5],
+  ["A8B4",0x8FC4],
+  ["A8B5",0x5DE1],
+  ["A8B6",0x9091],
+  ["A8B7",0x90A2],
+  ["A8B8",0x90AA],
+  ["A8B9",0x90A6],
+  ["A8BA",0x90A3],
+  ["A8BB",0x9149],
+  ["A8BC",0x91C6],
+  ["A8BD",0x91CC],
+  ["A8BE",0x9632],
+  ["A8BF",0x962E],
+  ["A8C0",0x9631],
+  ["A8C1",0x962A],
+  ["A8C2",0x962C],
+  ["A8C3",0x4E26],
+  ["A8C4",0x4E56],
+  ["A8C5",0x4E73],
+  ["A8C6",0x4E8B],
+  ["A8C7",0x4E9B],
+  ["A8C8",0x4E9E],
+  ["A8C9",0x4EAB],
+  ["A8CA",0x4EAC],
+  ["A8CB",0x4F6F],
+  ["A8CC",0x4F9D],
+  ["A8CD",0x4F8D],
+  ["A8CE",0x4F73],
+  ["A8CF",0x4F7F],
+  ["A8D0",0x4F6C],
+  ["A8D1",0x4F9B],
+  ["A8D2",0x4F8B],
+  ["A8D3",0x4F86],
+  ["A8D4",0x4F83],
+  ["A8D5",0x4F70],
+  ["A8D6",0x4F75],
+  ["A8D7",0x4F88],
+  ["A8D8",0x4F69],
+  ["A8D9",0x4F7B],
+  ["A8DA",0x4F96],
+  ["A8DB",0x4F7E],
+  ["A8DC",0x4F8F],
+  ["A8DD",0x4F91],
+  ["A8DE",0x4F7A],
+  ["A8DF",0x5154],
+  ["A8E0",0x5152],
+  ["A8E1",0x5155],
+  ["A8E2",0x5169],
+  ["A8E3",0x5177],
+  ["A8E4",0x5176],
+  ["A8E5",0x5178],
+  ["A8E6",0x51BD],
+  ["A8E7",0x51FD],
+  ["A8E8",0x523B],
+  ["A8E9",0x5238],
+  ["A8EA",0x5237],
+  ["A8EB",0x523A],
+  ["A8EC",0x5230],
+  ["A8ED",0x522E],
+  ["A8EE",0x5236],
+  ["A8EF",0x5241],
+  ["A8F0",0x52BE],
+  ["A8F1",0x52BB],
+  ["A8F2",0x5352],
+  ["A8F3",0x5354],
+  ["A8F4",0x5353],
+  ["A8F5",0x5351],
+  ["A8F6",0x5366],
+  ["A8F7",0x5377],
+  ["A8F8",0x5378],
+  ["A8F9",0x5379],
+  ["A8FA",0x53D6],
+  ["A8FB",0x53D4],
+  ["A8FC",0x53D7],
+  ["A8FD",0x5473],
+  ["A8FE",0x5475],
+  ["A940",0x5496],
+  ["A941",0x5478],
+  ["A942",0x5495],
+  ["A943",0x5480],
+  ["A944",0x547B],
+  ["A945",0x5477],
+  ["A946",0x5484],
+  ["A947",0x5492],
+  ["A948",0x5486],
+  ["A949",0x547C],
+  ["A94A",0x5490],
+  ["A94B",0x5471],
+  ["A94C",0x5476],
+  ["A94D",0x548C],
+  ["A94E",0x549A],
+  ["A94F",0x5462],
+  ["A950",0x5468],
+  ["A951",0x548B],
+  ["A952",0x547D],
+  ["A953",0x548E],
+  ["A954",0x56FA],
+  ["A955",0x5783],
+  ["A956",0x5777],
+  ["A957",0x576A],
+  ["A958",0x5769],
+  ["A959",0x5761],
+  ["A95A",0x5766],
+  ["A95B",0x5764],
+  ["A95C",0x577C],
+  ["A95D",0x591C],
+  ["A95E",0x5949],
+  ["A95F",0x5947],
+  ["A960",0x5948],
+  ["A961",0x5944],
+  ["A962",0x5954],
+  ["A963",0x59BE],
+  ["A964",0x59BB],
+  ["A965",0x59D4],
+  ["A966",0x59B9],
+  ["A967",0x59AE],
+  ["A968",0x59D1],
+  ["A969",0x59C6],
+  ["A96A",0x59D0],
+  ["A96B",0x59CD],
+  ["A96C",0x59CB],
+  ["A96D",0x59D3],
+  ["A96E",0x59CA],
+  ["A96F",0x59AF],
+  ["A970",0x59B3],
+  ["A971",0x59D2],
+  ["A972",0x59C5],
+  ["A973",0x5B5F],
+  ["A974",0x5B64],
+  ["A975",0x5B63],
+  ["A976",0x5B97],
+  ["A977",0x5B9A],
+  ["A978",0x5B98],
+  ["A979",0x5B9C],
+  ["A97A",0x5B99],
+  ["A97B",0x5B9B],
+  ["A97C",0x5C1A],
+  ["A97D",0x5C48],
+  ["A97E",0x5C45],
+  ["A9A1",0x5C46],
+  ["A9A2",0x5CB7],
+  ["A9A3",0x5CA1],
+  ["A9A4",0x5CB8],
+  ["A9A5",0x5CA9],
+  ["A9A6",0x5CAB],
+  ["A9A7",0x5CB1],
+  ["A9A8",0x5CB3],
+  ["A9A9",0x5E18],
+  ["A9AA",0x5E1A],
+  ["A9AB",0x5E16],
+  ["A9AC",0x5E15],
+  ["A9AD",0x5E1B],
+  ["A9AE",0x5E11],
+  ["A9AF",0x5E78],
+  ["A9B0",0x5E9A],
+  ["A9B1",0x5E97],
+  ["A9B2",0x5E9C],
+  ["A9B3",0x5E95],
+  ["A9B4",0x5E96],
+  ["A9B5",0x5EF6],
+  ["A9B6",0x5F26],
+  ["A9B7",0x5F27],
+  ["A9B8",0x5F29],
+  ["A9B9",0x5F80],
+  ["A9BA",0x5F81],
+  ["A9BB",0x5F7F],
+  ["A9BC",0x5F7C],
+  ["A9BD",0x5FDD],
+  ["A9BE",0x5FE0],
+  ["A9BF",0x5FFD],
+  ["A9C0",0x5FF5],
+  ["A9C1",0x5FFF],
+  ["A9C2",0x600F],
+  ["A9C3",0x6014],
+  ["A9C4",0x602F],
+  ["A9C5",0x6035],
+  ["A9C6",0x6016],
+  ["A9C7",0x602A],
+  ["A9C8",0x6015],
+  ["A9C9",0x6021],
+  ["A9CA",0x6027],
+  ["A9CB",0x6029],
+  ["A9CC",0x602B],
+  ["A9CD",0x601B],
+  ["A9CE",0x6216],
+  ["A9CF",0x6215],
+  ["A9D0",0x623F],
+  ["A9D1",0x623E],
+  ["A9D2",0x6240],
+  ["A9D3",0x627F],
+  ["A9D4",0x62C9],
+  ["A9D5",0x62CC],
+  ["A9D6",0x62C4],
+  ["A9D7",0x62BF],
+  ["A9D8",0x62C2],
+  ["A9D9",0x62B9],
+  ["A9DA",0x62D2],
+  ["A9DB",0x62DB],
+  ["A9DC",0x62AB],
+  ["A9DD",0x62D3],
+  ["A9DE",0x62D4],
+  ["A9DF",0x62CB],
+  ["A9E0",0x62C8],
+  ["A9E1",0x62A8],
+  ["A9E2",0x62BD],
+  ["A9E3",0x62BC],
+  ["A9E4",0x62D0],
+  ["A9E5",0x62D9],
+  ["A9E6",0x62C7],
+  ["A9E7",0x62CD],
+  ["A9E8",0x62B5],
+  ["A9E9",0x62DA],
+  ["A9EA",0x62B1],
+  ["A9EB",0x62D8],
+  ["A9EC",0x62D6],
+  ["A9ED",0x62D7],
+  ["A9EE",0x62C6],
+  ["A9EF",0x62AC],
+  ["A9F0",0x62CE],
+  ["A9F1",0x653E],
+  ["A9F2",0x65A7],
+  ["A9F3",0x65BC],
+  ["A9F4",0x65FA],
+  ["A9F5",0x6614],
+  ["A9F6",0x6613],
+  ["A9F7",0x660C],
+  ["A9F8",0x6606],
+  ["A9F9",0x6602],
+  ["A9FA",0x660E],
+  ["A9FB",0x6600],
+  ["A9FC",0x660F],
+  ["A9FD",0x6615],
+  ["A9FE",0x660A],
+  ["AA40",0x6607],
+  ["AA41",0x670D],
+  ["AA42",0x670B],
+  ["AA43",0x676D],
+  ["AA44",0x678B],
+  ["AA45",0x6795],
+  ["AA46",0x6771],
+  ["AA47",0x679C],
+  ["AA48",0x6773],
+  ["AA49",0x6777],
+  ["AA4A",0x6787],
+  ["AA4B",0x679D],
+  ["AA4C",0x6797],
+  ["AA4D",0x676F],
+  ["AA4E",0x6770],
+  ["AA4F",0x677F],
+  ["AA50",0x6789],
+  ["AA51",0x677E],
+  ["AA52",0x6790],
+  ["AA53",0x6775],
+  ["AA54",0x679A],
+  ["AA55",0x6793],
+  ["AA56",0x677C],
+  ["AA57",0x676A],
+  ["AA58",0x6772],
+  ["AA59",0x6B23],
+  ["AA5A",0x6B66],
+  ["AA5B",0x6B67],
+  ["AA5C",0x6B7F],
+  ["AA5D",0x6C13],
+  ["AA5E",0x6C1B],
+  ["AA5F",0x6CE3],
+  ["AA60",0x6CE8],
+  ["AA61",0x6CF3],
+  ["AA62",0x6CB1],
+  ["AA63",0x6CCC],
+  ["AA64",0x6CE5],
+  ["AA65",0x6CB3],
+  ["AA66",0x6CBD],
+  ["AA67",0x6CBE],
+  ["AA68",0x6CBC],
+  ["AA69",0x6CE2],
+  ["AA6A",0x6CAB],
+  ["AA6B",0x6CD5],
+  ["AA6C",0x6CD3],
+  ["AA6D",0x6CB8],
+  ["AA6E",0x6CC4],
+  ["AA6F",0x6CB9],
+  ["AA70",0x6CC1],
+  ["AA71",0x6CAE],
+  ["AA72",0x6CD7],
+  ["AA73",0x6CC5],
+  ["AA74",0x6CF1],
+  ["AA75",0x6CBF],
+  ["AA76",0x6CBB],
+  ["AA77",0x6CE1],
+  ["AA78",0x6CDB],
+  ["AA79",0x6CCA],
+  ["AA7A",0x6CAC],
+  ["AA7B",0x6CEF],
+  ["AA7C",0x6CDC],
+  ["AA7D",0x6CD6],
+  ["AA7E",0x6CE0],
+  ["AAA1",0x7095],
+  ["AAA2",0x708E],
+  ["AAA3",0x7092],
+  ["AAA4",0x708A],
+  ["AAA5",0x7099],
+  ["AAA6",0x722C],
+  ["AAA7",0x722D],
+  ["AAA8",0x7238],
+  ["AAA9",0x7248],
+  ["AAAA",0x7267],
+  ["AAAB",0x7269],
+  ["AAAC",0x72C0],
+  ["AAAD",0x72CE],
+  ["AAAE",0x72D9],
+  ["AAAF",0x72D7],
+  ["AAB0",0x72D0],
+  ["AAB1",0x73A9],
+  ["AAB2",0x73A8],
+  ["AAB3",0x739F],
+  ["AAB4",0x73AB],
+  ["AAB5",0x73A5],
+  ["AAB6",0x753D],
+  ["AAB7",0x759D],
+  ["AAB8",0x7599],
+  ["AAB9",0x759A],
+  ["AABA",0x7684],
+  ["AABB",0x76C2],
+  ["AABC",0x76F2],
+  ["AABD",0x76F4],
+  ["AABE",0x77E5],
+  ["AABF",0x77FD],
+  ["AAC0",0x793E],
+  ["AAC1",0x7940],
+  ["AAC2",0x7941],
+  ["AAC3",0x79C9],
+  ["AAC4",0x79C8],
+  ["AAC5",0x7A7A],
+  ["AAC6",0x7A79],
+  ["AAC7",0x7AFA],
+  ["AAC8",0x7CFE],
+  ["AAC9",0x7F54],
+  ["AACA",0x7F8C],
+  ["AACB",0x7F8B],
+  ["AACC",0x8005],
+  ["AACD",0x80BA],
+  ["AACE",0x80A5],
+  ["AACF",0x80A2],
+  ["AAD0",0x80B1],
+  ["AAD1",0x80A1],
+  ["AAD2",0x80AB],
+  ["AAD3",0x80A9],
+  ["AAD4",0x80B4],
+  ["AAD5",0x80AA],
+  ["AAD6",0x80AF],
+  ["AAD7",0x81E5],
+  ["AAD8",0x81FE],
+  ["AAD9",0x820D],
+  ["AADA",0x82B3],
+  ["AADB",0x829D],
+  ["AADC",0x8299],
+  ["AADD",0x82AD],
+  ["AADE",0x82BD],
+  ["AADF",0x829F],
+  ["AAE0",0x82B9],
+  ["AAE1",0x82B1],
+  ["AAE2",0x82AC],
+  ["AAE3",0x82A5],
+  ["AAE4",0x82AF],
+  ["AAE5",0x82B8],
+  ["AAE6",0x82A3],
+  ["AAE7",0x82B0],
+  ["AAE8",0x82BE],
+  ["AAE9",0x82B7],
+  ["AAEA",0x864E],
+  ["AAEB",0x8671],
+  ["AAEC",0x521D],
+  ["AAED",0x8868],
+  ["AAEE",0x8ECB],
+  ["AAEF",0x8FCE],
+  ["AAF0",0x8FD4],
+  ["AAF1",0x8FD1],
+  ["AAF2",0x90B5],
+  ["AAF3",0x90B8],
+  ["AAF4",0x90B1],
+  ["AAF5",0x90B6],
+  ["AAF6",0x91C7],
+  ["AAF7",0x91D1],
+  ["AAF8",0x9577],
+  ["AAF9",0x9580],
+  ["AAFA",0x961C],
+  ["AAFB",0x9640],
+  ["AAFC",0x963F],
+  ["AAFD",0x963B],
+  ["AAFE",0x9644],
+  ["AB40",0x9642],
+  ["AB41",0x96B9],
+  ["AB42",0x96E8],
+  ["AB43",0x9752],
+  ["AB44",0x975E],
+  ["AB45",0x4E9F],
+  ["AB46",0x4EAD],
+  ["AB47",0x4EAE],
+  ["AB48",0x4FE1],
+  ["AB49",0x4FB5],
+  ["AB4A",0x4FAF],
+  ["AB4B",0x4FBF],
+  ["AB4C",0x4FE0],
+  ["AB4D",0x4FD1],
+  ["AB4E",0x4FCF],
+  ["AB4F",0x4FDD],
+  ["AB50",0x4FC3],
+  ["AB51",0x4FB6],
+  ["AB52",0x4FD8],
+  ["AB53",0x4FDF],
+  ["AB54",0x4FCA],
+  ["AB55",0x4FD7],
+  ["AB56",0x4FAE],
+  ["AB57",0x4FD0],
+  ["AB58",0x4FC4],
+  ["AB59",0x4FC2],
+  ["AB5A",0x4FDA],
+  ["AB5B",0x4FCE],
+  ["AB5C",0x4FDE],
+  ["AB5D",0x4FB7],
+  ["AB5E",0x5157],
+  ["AB5F",0x5192],
+  ["AB60",0x5191],
+  ["AB61",0x51A0],
+  ["AB62",0x524E],
+  ["AB63",0x5243],
+  ["AB64",0x524A],
+  ["AB65",0x524D],
+  ["AB66",0x524C],
+  ["AB67",0x524B],
+  ["AB68",0x5247],
+  ["AB69",0x52C7],
+  ["AB6A",0x52C9],
+  ["AB6B",0x52C3],
+  ["AB6C",0x52C1],
+  ["AB6D",0x530D],
+  ["AB6E",0x5357],
+  ["AB6F",0x537B],
+  ["AB70",0x539A],
+  ["AB71",0x53DB],
+  ["AB72",0x54AC],
+  ["AB73",0x54C0],
+  ["AB74",0x54A8],
+  ["AB75",0x54CE],
+  ["AB76",0x54C9],
+  ["AB77",0x54B8],
+  ["AB78",0x54A6],
+  ["AB79",0x54B3],
+  ["AB7A",0x54C7],
+  ["AB7B",0x54C2],
+  ["AB7C",0x54BD],
+  ["AB7D",0x54AA],
+  ["AB7E",0x54C1],
+  ["ABA1",0x54C4],
+  ["ABA2",0x54C8],
+  ["ABA3",0x54AF],
+  ["ABA4",0x54AB],
+  ["ABA5",0x54B1],
+  ["ABA6",0x54BB],
+  ["ABA7",0x54A9],
+  ["ABA8",0x54A7],
+  ["ABA9",0x54BF],
+  ["ABAA",0x56FF],
+  ["ABAB",0x5782],
+  ["ABAC",0x578B],
+  ["ABAD",0x57A0],
+  ["ABAE",0x57A3],
+  ["ABAF",0x57A2],
+  ["ABB0",0x57CE],
+  ["ABB1",0x57AE],
+  ["ABB2",0x5793],
+  ["ABB3",0x5955],
+  ["ABB4",0x5951],
+  ["ABB5",0x594F],
+  ["ABB6",0x594E],
+  ["ABB7",0x5950],
+  ["ABB8",0x59DC],
+  ["ABB9",0x59D8],
+  ["ABBA",0x59FF],
+  ["ABBB",0x59E3],
+  ["ABBC",0x59E8],
+  ["ABBD",0x5A03],
+  ["ABBE",0x59E5],
+  ["ABBF",0x59EA],
+  ["ABC0",0x59DA],
+  ["ABC1",0x59E6],
+  ["ABC2",0x5A01],
+  ["ABC3",0x59FB],
+  ["ABC4",0x5B69],
+  ["ABC5",0x5BA3],
+  ["ABC6",0x5BA6],
+  ["ABC7",0x5BA4],
+  ["ABC8",0x5BA2],
+  ["ABC9",0x5BA5],
+  ["ABCA",0x5C01],
+  ["ABCB",0x5C4E],
+  ["ABCC",0x5C4F],
+  ["ABCD",0x5C4D],
+  ["ABCE",0x5C4B],
+  ["ABCF",0x5CD9],
+  ["ABD0",0x5CD2],
+  ["ABD1",0x5DF7],
+  ["ABD2",0x5E1D],
+  ["ABD3",0x5E25],
+  ["ABD4",0x5E1F],
+  ["ABD5",0x5E7D],
+  ["ABD6",0x5EA0],
+  ["ABD7",0x5EA6],
+  ["ABD8",0x5EFA],
+  ["ABD9",0x5F08],
+  ["ABDA",0x5F2D],
+  ["ABDB",0x5F65],
+  ["ABDC",0x5F88],
+  ["ABDD",0x5F85],
+  ["ABDE",0x5F8A],
+  ["ABDF",0x5F8B],
+  ["ABE0",0x5F87],
+  ["ABE1",0x5F8C],
+  ["ABE2",0x5F89],
+  ["ABE3",0x6012],
+  ["ABE4",0x601D],
+  ["ABE5",0x6020],
+  ["ABE6",0x6025],
+  ["ABE7",0x600E],
+  ["ABE8",0x6028],
+  ["ABE9",0x604D],
+  ["ABEA",0x6070],
+  ["ABEB",0x6068],
+  ["ABEC",0x6062],
+  ["ABED",0x6046],
+  ["ABEE",0x6043],
+  ["ABEF",0x606C],
+  ["ABF0",0x606B],
+  ["ABF1",0x606A],
+  ["ABF2",0x6064],
+  ["ABF3",0x6241],
+  ["ABF4",0x62DC],
+  ["ABF5",0x6316],
+  ["ABF6",0x6309],
+  ["ABF7",0x62FC],
+  ["ABF8",0x62ED],
+  ["ABF9",0x6301],
+  ["ABFA",0x62EE],
+  ["ABFB",0x62FD],
+  ["ABFC",0x6307],
+  ["ABFD",0x62F1],
+  ["ABFE",0x62F7],
+  ["AC40",0x62EF],
+  ["AC41",0x62EC],
+  ["AC42",0x62FE],
+  ["AC43",0x62F4],
+  ["AC44",0x6311],
+  ["AC45",0x6302],
+  ["AC46",0x653F],
+  ["AC47",0x6545],
+  ["AC48",0x65AB],
+  ["AC49",0x65BD],
+  ["AC4A",0x65E2],
+  ["AC4B",0x6625],
+  ["AC4C",0x662D],
+  ["AC4D",0x6620],
+  ["AC4E",0x6627],
+  ["AC4F",0x662F],
+  ["AC50",0x661F],
+  ["AC51",0x6628],
+  ["AC52",0x6631],
+  ["AC53",0x6624],
+  ["AC54",0x66F7],
+  ["AC55",0x67FF],
+  ["AC56",0x67D3],
+  ["AC57",0x67F1],
+  ["AC58",0x67D4],
+  ["AC59",0x67D0],
+  ["AC5A",0x67EC],
+  ["AC5B",0x67B6],
+  ["AC5C",0x67AF],
+  ["AC5D",0x67F5],
+  ["AC5E",0x67E9],
+  ["AC5F",0x67EF],
+  ["AC60",0x67C4],
+  ["AC61",0x67D1],
+  ["AC62",0x67B4],
+  ["AC63",0x67DA],
+  ["AC64",0x67E5],
+  ["AC65",0x67B8],
+  ["AC66",0x67CF],
+  ["AC67",0x67DE],
+  ["AC68",0x67F3],
+  ["AC69",0x67B0],
+  ["AC6A",0x67D9],
+  ["AC6B",0x67E2],
+  ["AC6C",0x67DD],
+  ["AC6D",0x67D2],
+  ["AC6E",0x6B6A],
+  ["AC6F",0x6B83],
+  ["AC70",0x6B86],
+  ["AC71",0x6BB5],
+  ["AC72",0x6BD2],
+  ["AC73",0x6BD7],
+  ["AC74",0x6C1F],
+  ["AC75",0x6CC9],
+  ["AC76",0x6D0B],
+  ["AC77",0x6D32],
+  ["AC78",0x6D2A],
+  ["AC79",0x6D41],
+  ["AC7A",0x6D25],
+  ["AC7B",0x6D0C],
+  ["AC7C",0x6D31],
+  ["AC7D",0x6D1E],
+  ["AC7E",0x6D17],
+  ["ACA1",0x6D3B],
+  ["ACA2",0x6D3D],
+  ["ACA3",0x6D3E],
+  ["ACA4",0x6D36],
+  ["ACA5",0x6D1B],
+  ["ACA6",0x6CF5],
+  ["ACA7",0x6D39],
+  ["ACA8",0x6D27],
+  ["ACA9",0x6D38],
+  ["ACAA",0x6D29],
+  ["ACAB",0x6D2E],
+  ["ACAC",0x6D35],
+  ["ACAD",0x6D0E],
+  ["ACAE",0x6D2B],
+  ["ACAF",0x70AB],
+  ["ACB0",0x70BA],
+  ["ACB1",0x70B3],
+  ["ACB2",0x70AC],
+  ["ACB3",0x70AF],
+  ["ACB4",0x70AD],
+  ["ACB5",0x70B8],
+  ["ACB6",0x70AE],
+  ["ACB7",0x70A4],
+  ["ACB8",0x7230],
+  ["ACB9",0x7272],
+  ["ACBA",0x726F],
+  ["ACBB",0x7274],
+  ["ACBC",0x72E9],
+  ["ACBD",0x72E0],
+  ["ACBE",0x72E1],
+  ["ACBF",0x73B7],
+  ["ACC0",0x73CA],
+  ["ACC1",0x73BB],
+  ["ACC2",0x73B2],
+  ["ACC3",0x73CD],
+  ["ACC4",0x73C0],
+  ["ACC5",0x73B3],
+  ["ACC6",0x751A],
+  ["ACC7",0x752D],
+  ["ACC8",0x754F],
+  ["ACC9",0x754C],
+  ["ACCA",0x754E],
+  ["ACCB",0x754B],
+  ["ACCC",0x75AB],
+  ["ACCD",0x75A4],
+  ["ACCE",0x75A5],
+  ["ACCF",0x75A2],
+  ["ACD0",0x75A3],
+  ["ACD1",0x7678],
+  ["ACD2",0x7686],
+  ["ACD3",0x7687],
+  ["ACD4",0x7688],
+  ["ACD5",0x76C8],
+  ["ACD6",0x76C6],
+  ["ACD7",0x76C3],
+  ["ACD8",0x76C5],
+  ["ACD9",0x7701],
+  ["ACDA",0x76F9],
+  ["ACDB",0x76F8],
+  ["ACDC",0x7709],
+  ["ACDD",0x770B],
+  ["ACDE",0x76FE],
+  ["ACDF",0x76FC],
+  ["ACE0",0x7707],
+  ["ACE1",0x77DC],
+  ["ACE2",0x7802],
+  ["ACE3",0x7814],
+  ["ACE4",0x780C],
+  ["ACE5",0x780D],
+  ["ACE6",0x7946],
+  ["ACE7",0x7949],
+  ["ACE8",0x7948],
+  ["ACE9",0x7947],
+  ["ACEA",0x79B9],
+  ["ACEB",0x79BA],
+  ["ACEC",0x79D1],
+  ["ACED",0x79D2],
+  ["ACEE",0x79CB],
+  ["ACEF",0x7A7F],
+  ["ACF0",0x7A81],
+  ["ACF1",0x7AFF],
+  ["ACF2",0x7AFD],
+  ["ACF3",0x7C7D],
+  ["ACF4",0x7D02],
+  ["ACF5",0x7D05],
+  ["ACF6",0x7D00],
+  ["ACF7",0x7D09],
+  ["ACF8",0x7D07],
+  ["ACF9",0x7D04],
+  ["ACFA",0x7D06],
+  ["ACFB",0x7F38],
+  ["ACFC",0x7F8E],
+  ["ACFD",0x7FBF],
+  ["ACFE",0x8004],
+  ["AD40",0x8010],
+  ["AD41",0x800D],
+  ["AD42",0x8011],
+  ["AD43",0x8036],
+  ["AD44",0x80D6],
+  ["AD45",0x80E5],
+  ["AD46",0x80DA],
+  ["AD47",0x80C3],
+  ["AD48",0x80C4],
+  ["AD49",0x80CC],
+  ["AD4A",0x80E1],
+  ["AD4B",0x80DB],
+  ["AD4C",0x80CE],
+  ["AD4D",0x80DE],
+  ["AD4E",0x80E4],
+  ["AD4F",0x80DD],
+  ["AD50",0x81F4],
+  ["AD51",0x8222],
+  ["AD52",0x82E7],
+  ["AD53",0x8303],
+  ["AD54",0x8305],
+  ["AD55",0x82E3],
+  ["AD56",0x82DB],
+  ["AD57",0x82E6],
+  ["AD58",0x8304],
+  ["AD59",0x82E5],
+  ["AD5A",0x8302],
+  ["AD5B",0x8309],
+  ["AD5C",0x82D2],
+  ["AD5D",0x82D7],
+  ["AD5E",0x82F1],
+  ["AD5F",0x8301],
+  ["AD60",0x82DC],
+  ["AD61",0x82D4],
+  ["AD62",0x82D1],
+  ["AD63",0x82DE],
+  ["AD64",0x82D3],
+  ["AD65",0x82DF],
+  ["AD66",0x82EF],
+  ["AD67",0x8306],
+  ["AD68",0x8650],
+  ["AD69",0x8679],
+  ["AD6A",0x867B],
+  ["AD6B",0x867A],
+  ["AD6C",0x884D],
+  ["AD6D",0x886B],
+  ["AD6E",0x8981],
+  ["AD6F",0x89D4],
+  ["AD70",0x8A08],
+  ["AD71",0x8A02],
+  ["AD72",0x8A03],
+  ["AD73",0x8C9E],
+  ["AD74",0x8CA0],
+  ["AD75",0x8D74],
+  ["AD76",0x8D73],
+  ["AD77",0x8DB4],
+  ["AD78",0x8ECD],
+  ["AD79",0x8ECC],
+  ["AD7A",0x8FF0],
+  ["AD7B",0x8FE6],
+  ["AD7C",0x8FE2],
+  ["AD7D",0x8FEA],
+  ["AD7E",0x8FE5],
+  ["ADA1",0x8FED],
+  ["ADA2",0x8FEB],
+  ["ADA3",0x8FE4],
+  ["ADA4",0x8FE8],
+  ["ADA5",0x90CA],
+  ["ADA6",0x90CE],
+  ["ADA7",0x90C1],
+  ["ADA8",0x90C3],
+  ["ADA9",0x914B],
+  ["ADAA",0x914A],
+  ["ADAB",0x91CD],
+  ["ADAC",0x9582],
+  ["ADAD",0x9650],
+  ["ADAE",0x964B],
+  ["ADAF",0x964C],
+  ["ADB0",0x964D],
+  ["ADB1",0x9762],
+  ["ADB2",0x9769],
+  ["ADB3",0x97CB],
+  ["ADB4",0x97ED],
+  ["ADB5",0x97F3],
+  ["ADB6",0x9801],
+  ["ADB7",0x98A8],
+  ["ADB8",0x98DB],
+  ["ADB9",0x98DF],
+  ["ADBA",0x9996],
+  ["ADBB",0x9999],
+  ["ADBC",0x4E58],
+  ["ADBD",0x4EB3],
+  ["ADBE",0x500C],
+  ["ADBF",0x500D],
+  ["ADC0",0x5023],
+  ["ADC1",0x4FEF],
+  ["ADC2",0x5026],
+  ["ADC3",0x5025],
+  ["ADC4",0x4FF8],
+  ["ADC5",0x5029],
+  ["ADC6",0x5016],
+  ["ADC7",0x5006],
+  ["ADC8",0x503C],
+  ["ADC9",0x501F],
+  ["ADCA",0x501A],
+  ["ADCB",0x5012],
+  ["ADCC",0x5011],
+  ["ADCD",0x4FFA],
+  ["ADCE",0x5000],
+  ["ADCF",0x5014],
+  ["ADD0",0x5028],
+  ["ADD1",0x4FF1],
+  ["ADD2",0x5021],
+  ["ADD3",0x500B],
+  ["ADD4",0x5019],
+  ["ADD5",0x5018],
+  ["ADD6",0x4FF3],
+  ["ADD7",0x4FEE],
+  ["ADD8",0x502D],
+  ["ADD9",0x502A],
+  ["ADDA",0x4FFE],
+  ["ADDB",0x502B],
+  ["ADDC",0x5009],
+  ["ADDD",0x517C],
+  ["ADDE",0x51A4],
+  ["ADDF",0x51A5],
+  ["ADE0",0x51A2],
+  ["ADE1",0x51CD],
+  ["ADE2",0x51CC],
+  ["ADE3",0x51C6],
+  ["ADE4",0x51CB],
+  ["ADE5",0x5256],
+  ["ADE6",0x525C],
+  ["ADE7",0x5254],
+  ["ADE8",0x525B],
+  ["ADE9",0x525D],
+  ["ADEA",0x532A],
+  ["ADEB",0x537F],
+  ["ADEC",0x539F],
+  ["ADED",0x539D],
+  ["ADEE",0x53DF],
+  ["ADEF",0x54E8],
+  ["ADF0",0x5510],
+  ["ADF1",0x5501],
+  ["ADF2",0x5537],
+  ["ADF3",0x54FC],
+  ["ADF4",0x54E5],
+  ["ADF5",0x54F2],
+  ["ADF6",0x5506],
+  ["ADF7",0x54FA],
+  ["ADF8",0x5514],
+  ["ADF9",0x54E9],
+  ["ADFA",0x54ED],
+  ["ADFB",0x54E1],
+  ["ADFC",0x5509],
+  ["ADFD",0x54EE],
+  ["ADFE",0x54EA],
+  ["AE40",0x54E6],
+  ["AE41",0x5527],
+  ["AE42",0x5507],
+  ["AE43",0x54FD],
+  ["AE44",0x550F],
+  ["AE45",0x5703],
+  ["AE46",0x5704],
+  ["AE47",0x57C2],
+  ["AE48",0x57D4],
+  ["AE49",0x57CB],
+  ["AE4A",0x57C3],
+  ["AE4B",0x5809],
+  ["AE4C",0x590F],
+  ["AE4D",0x5957],
+  ["AE4E",0x5958],
+  ["AE4F",0x595A],
+  ["AE50",0x5A11],
+  ["AE51",0x5A18],
+  ["AE52",0x5A1C],
+  ["AE53",0x5A1F],
+  ["AE54",0x5A1B],
+  ["AE55",0x5A13],
+  ["AE56",0x59EC],
+  ["AE57",0x5A20],
+  ["AE58",0x5A23],
+  ["AE59",0x5A29],
+  ["AE5A",0x5A25],
+  ["AE5B",0x5A0C],
+  ["AE5C",0x5A09],
+  ["AE5D",0x5B6B],
+  ["AE5E",0x5C58],
+  ["AE5F",0x5BB0],
+  ["AE60",0x5BB3],
+  ["AE61",0x5BB6],
+  ["AE62",0x5BB4],
+  ["AE63",0x5BAE],
+  ["AE64",0x5BB5],
+  ["AE65",0x5BB9],
+  ["AE66",0x5BB8],
+  ["AE67",0x5C04],
+  ["AE68",0x5C51],
+  ["AE69",0x5C55],
+  ["AE6A",0x5C50],
+  ["AE6B",0x5CED],
+  ["AE6C",0x5CFD],
+  ["AE6D",0x5CFB],
+  ["AE6E",0x5CEA],
+  ["AE6F",0x5CE8],
+  ["AE70",0x5CF0],
+  ["AE71",0x5CF6],
+  ["AE72",0x5D01],
+  ["AE73",0x5CF4],
+  ["AE74",0x5DEE],
+  ["AE75",0x5E2D],
+  ["AE76",0x5E2B],
+  ["AE77",0x5EAB],
+  ["AE78",0x5EAD],
+  ["AE79",0x5EA7],
+  ["AE7A",0x5F31],
+  ["AE7B",0x5F92],
+  ["AE7C",0x5F91],
+  ["AE7D",0x5F90],
+  ["AE7E",0x6059],
+  ["AEA1",0x6063],
+  ["AEA2",0x6065],
+  ["AEA3",0x6050],
+  ["AEA4",0x6055],
+  ["AEA5",0x606D],
+  ["AEA6",0x6069],
+  ["AEA7",0x606F],
+  ["AEA8",0x6084],
+  ["AEA9",0x609F],
+  ["AEAA",0x609A],
+  ["AEAB",0x608D],
+  ["AEAC",0x6094],
+  ["AEAD",0x608C],
+  ["AEAE",0x6085],
+  ["AEAF",0x6096],
+  ["AEB0",0x6247],
+  ["AEB1",0x62F3],
+  ["AEB2",0x6308],
+  ["AEB3",0x62FF],
+  ["AEB4",0x634E],
+  ["AEB5",0x633E],
+  ["AEB6",0x632F],
+  ["AEB7",0x6355],
+  ["AEB8",0x6342],
+  ["AEB9",0x6346],
+  ["AEBA",0x634F],
+  ["AEBB",0x6349],
+  ["AEBC",0x633A],
+  ["AEBD",0x6350],
+  ["AEBE",0x633D],
+  ["AEBF",0x632A],
+  ["AEC0",0x632B],
+  ["AEC1",0x6328],
+  ["AEC2",0x634D],
+  ["AEC3",0x634C],
+  ["AEC4",0x6548],
+  ["AEC5",0x6549],
+  ["AEC6",0x6599],
+  ["AEC7",0x65C1],
+  ["AEC8",0x65C5],
+  ["AEC9",0x6642],
+  ["AECA",0x6649],
+  ["AECB",0x664F],
+  ["AECC",0x6643],
+  ["AECD",0x6652],
+  ["AECE",0x664C],
+  ["AECF",0x6645],
+  ["AED0",0x6641],
+  ["AED1",0x66F8],
+  ["AED2",0x6714],
+  ["AED3",0x6715],
+  ["AED4",0x6717],
+  ["AED5",0x6821],
+  ["AED6",0x6838],
+  ["AED7",0x6848],
+  ["AED8",0x6846],
+  ["AED9",0x6853],
+  ["AEDA",0x6839],
+  ["AEDB",0x6842],
+  ["AEDC",0x6854],
+  ["AEDD",0x6829],
+  ["AEDE",0x68B3],
+  ["AEDF",0x6817],
+  ["AEE0",0x684C],
+  ["AEE1",0x6851],
+  ["AEE2",0x683D],
+  ["AEE3",0x67F4],
+  ["AEE4",0x6850],
+  ["AEE5",0x6840],
+  ["AEE6",0x683C],
+  ["AEE7",0x6843],
+  ["AEE8",0x682A],
+  ["AEE9",0x6845],
+  ["AEEA",0x6813],
+  ["AEEB",0x6818],
+  ["AEEC",0x6841],
+  ["AEED",0x6B8A],
+  ["AEEE",0x6B89],
+  ["AEEF",0x6BB7],
+  ["AEF0",0x6C23],
+  ["AEF1",0x6C27],
+  ["AEF2",0x6C28],
+  ["AEF3",0x6C26],
+  ["AEF4",0x6C24],
+  ["AEF5",0x6CF0],
+  ["AEF6",0x6D6A],
+  ["AEF7",0x6D95],
+  ["AEF8",0x6D88],
+  ["AEF9",0x6D87],
+  ["AEFA",0x6D66],
+  ["AEFB",0x6D78],
+  ["AEFC",0x6D77],
+  ["AEFD",0x6D59],
+  ["AEFE",0x6D93],
+  ["AF40",0x6D6C],
+  ["AF41",0x6D89],
+  ["AF42",0x6D6E],
+  ["AF43",0x6D5A],
+  ["AF44",0x6D74],
+  ["AF45",0x6D69],
+  ["AF46",0x6D8C],
+  ["AF47",0x6D8A],
+  ["AF48",0x6D79],
+  ["AF49",0x6D85],
+  ["AF4A",0x6D65],
+  ["AF4B",0x6D94],
+  ["AF4C",0x70CA],
+  ["AF4D",0x70D8],
+  ["AF4E",0x70E4],
+  ["AF4F",0x70D9],
+  ["AF50",0x70C8],
+  ["AF51",0x70CF],
+  ["AF52",0x7239],
+  ["AF53",0x7279],
+  ["AF54",0x72FC],
+  ["AF55",0x72F9],
+  ["AF56",0x72FD],
+  ["AF57",0x72F8],
+  ["AF58",0x72F7],
+  ["AF59",0x7386],
+  ["AF5A",0x73ED],
+  ["AF5B",0x7409],
+  ["AF5C",0x73EE],
+  ["AF5D",0x73E0],
+  ["AF5E",0x73EA],
+  ["AF5F",0x73DE],
+  ["AF60",0x7554],
+  ["AF61",0x755D],
+  ["AF62",0x755C],
+  ["AF63",0x755A],
+  ["AF64",0x7559],
+  ["AF65",0x75BE],
+  ["AF66",0x75C5],
+  ["AF67",0x75C7],
+  ["AF68",0x75B2],
+  ["AF69",0x75B3],
+  ["AF6A",0x75BD],
+  ["AF6B",0x75BC],
+  ["AF6C",0x75B9],
+  ["AF6D",0x75C2],
+  ["AF6E",0x75B8],
+  ["AF6F",0x768B],
+  ["AF70",0x76B0],
+  ["AF71",0x76CA],
+  ["AF72",0x76CD],
+  ["AF73",0x76CE],
+  ["AF74",0x7729],
+  ["AF75",0x771F],
+  ["AF76",0x7720],
+  ["AF77",0x7728],
+  ["AF78",0x77E9],
+  ["AF79",0x7830],
+  ["AF7A",0x7827],
+  ["AF7B",0x7838],
+  ["AF7C",0x781D],
+  ["AF7D",0x7834],
+  ["AF7E",0x7837],
+  ["AFA1",0x7825],
+  ["AFA2",0x782D],
+  ["AFA3",0x7820],
+  ["AFA4",0x781F],
+  ["AFA5",0x7832],
+  ["AFA6",0x7955],
+  ["AFA7",0x7950],
+  ["AFA8",0x7960],
+  ["AFA9",0x795F],
+  ["AFAA",0x7956],
+  ["AFAB",0x795E],
+  ["AFAC",0x795D],
+  ["AFAD",0x7957],
+  ["AFAE",0x795A],
+  ["AFAF",0x79E4],
+  ["AFB0",0x79E3],
+  ["AFB1",0x79E7],
+  ["AFB2",0x79DF],
+  ["AFB3",0x79E6],
+  ["AFB4",0x79E9],
+  ["AFB5",0x79D8],
+  ["AFB6",0x7A84],
+  ["AFB7",0x7A88],
+  ["AFB8",0x7AD9],
+  ["AFB9",0x7B06],
+  ["AFBA",0x7B11],
+  ["AFBB",0x7C89],
+  ["AFBC",0x7D21],
+  ["AFBD",0x7D17],
+  ["AFBE",0x7D0B],
+  ["AFBF",0x7D0A],
+  ["AFC0",0x7D20],
+  ["AFC1",0x7D22],
+  ["AFC2",0x7D14],
+  ["AFC3",0x7D10],
+  ["AFC4",0x7D15],
+  ["AFC5",0x7D1A],
+  ["AFC6",0x7D1C],
+  ["AFC7",0x7D0D],
+  ["AFC8",0x7D19],
+  ["AFC9",0x7D1B],
+  ["AFCA",0x7F3A],
+  ["AFCB",0x7F5F],
+  ["AFCC",0x7F94],
+  ["AFCD",0x7FC5],
+  ["AFCE",0x7FC1],
+  ["AFCF",0x8006],
+  ["AFD0",0x8018],
+  ["AFD1",0x8015],
+  ["AFD2",0x8019],
+  ["AFD3",0x8017],
+  ["AFD4",0x803D],
+  ["AFD5",0x803F],
+  ["AFD6",0x80F1],
+  ["AFD7",0x8102],
+  ["AFD8",0x80F0],
+  ["AFD9",0x8105],
+  ["AFDA",0x80ED],
+  ["AFDB",0x80F4],
+  ["AFDC",0x8106],
+  ["AFDD",0x80F8],
+  ["AFDE",0x80F3],
+  ["AFDF",0x8108],
+  ["AFE0",0x80FD],
+  ["AFE1",0x810A],
+  ["AFE2",0x80FC],
+  ["AFE3",0x80EF],
+  ["AFE4",0x81ED],
+  ["AFE5",0x81EC],
+  ["AFE6",0x8200],
+  ["AFE7",0x8210],
+  ["AFE8",0x822A],
+  ["AFE9",0x822B],
+  ["AFEA",0x8228],
+  ["AFEB",0x822C],
+  ["AFEC",0x82BB],
+  ["AFED",0x832B],
+  ["AFEE",0x8352],
+  ["AFEF",0x8354],
+  ["AFF0",0x834A],
+  ["AFF1",0x8338],
+  ["AFF2",0x8350],
+  ["AFF3",0x8349],
+  ["AFF4",0x8335],
+  ["AFF5",0x8334],
+  ["AFF6",0x834F],
+  ["AFF7",0x8332],
+  ["AFF8",0x8339],
+  ["AFF9",0x8336],
+  ["AFFA",0x8317],
+  ["AFFB",0x8340],
+  ["AFFC",0x8331],
+  ["AFFD",0x8328],
+  ["AFFE",0x8343],
+  ["B040",0x8654],
+  ["B041",0x868A],
+  ["B042",0x86AA],
+  ["B043",0x8693],
+  ["B044",0x86A4],
+  ["B045",0x86A9],
+  ["B046",0x868C],
+  ["B047",0x86A3],
+  ["B048",0x869C],
+  ["B049",0x8870],
+  ["B04A",0x8877],
+  ["B04B",0x8881],
+  ["B04C",0x8882],
+  ["B04D",0x887D],
+  ["B04E",0x8879],
+  ["B04F",0x8A18],
+  ["B050",0x8A10],
+  ["B051",0x8A0E],
+  ["B052",0x8A0C],
+  ["B053",0x8A15],
+  ["B054",0x8A0A],
+  ["B055",0x8A17],
+  ["B056",0x8A13],
+  ["B057",0x8A16],
+  ["B058",0x8A0F],
+  ["B059",0x8A11],
+  ["B05A",0x8C48],
+  ["B05B",0x8C7A],
+  ["B05C",0x8C79],
+  ["B05D",0x8CA1],
+  ["B05E",0x8CA2],
+  ["B05F",0x8D77],
+  ["B060",0x8EAC],
+  ["B061",0x8ED2],
+  ["B062",0x8ED4],
+  ["B063",0x8ECF],
+  ["B064",0x8FB1],
+  ["B065",0x9001],
+  ["B066",0x9006],
+  ["B067",0x8FF7],
+  ["B068",0x9000],
+  ["B069",0x8FFA],
+  ["B06A",0x8FF4],
+  ["B06B",0x9003],
+  ["B06C",0x8FFD],
+  ["B06D",0x9005],
+  ["B06E",0x8FF8],
+  ["B06F",0x9095],
+  ["B070",0x90E1],
+  ["B071",0x90DD],
+  ["B072",0x90E2],
+  ["B073",0x9152],
+  ["B074",0x914D],
+  ["B075",0x914C],
+  ["B076",0x91D8],
+  ["B077",0x91DD],
+  ["B078",0x91D7],
+  ["B079",0x91DC],
+  ["B07A",0x91D9],
+  ["B07B",0x9583],
+  ["B07C",0x9662],
+  ["B07D",0x9663],
+  ["B07E",0x9661],
+  ["B0A1",0x965B],
+  ["B0A2",0x965D],
+  ["B0A3",0x9664],
+  ["B0A4",0x9658],
+  ["B0A5",0x965E],
+  ["B0A6",0x96BB],
+  ["B0A7",0x98E2],
+  ["B0A8",0x99AC],
+  ["B0A9",0x9AA8],
+  ["B0AA",0x9AD8],
+  ["B0AB",0x9B25],
+  ["B0AC",0x9B32],
+  ["B0AD",0x9B3C],
+  ["B0AE",0x4E7E],
+  ["B0AF",0x507A],
+  ["B0B0",0x507D],
+  ["B0B1",0x505C],
+  ["B0B2",0x5047],
+  ["B0B3",0x5043],
+  ["B0B4",0x504C],
+  ["B0B5",0x505A],
+  ["B0B6",0x5049],
+  ["B0B7",0x5065],
+  ["B0B8",0x5076],
+  ["B0B9",0x504E],
+  ["B0BA",0x5055],
+  ["B0BB",0x5075],
+  ["B0BC",0x5074],
+  ["B0BD",0x5077],
+  ["B0BE",0x504F],
+  ["B0BF",0x500F],
+  ["B0C0",0x506F],
+  ["B0C1",0x506D],
+  ["B0C2",0x515C],
+  ["B0C3",0x5195],
+  ["B0C4",0x51F0],
+  ["B0C5",0x526A],
+  ["B0C6",0x526F],
+  ["B0C7",0x52D2],
+  ["B0C8",0x52D9],
+  ["B0C9",0x52D8],
+  ["B0CA",0x52D5],
+  ["B0CB",0x5310],
+  ["B0CC",0x530F],
+  ["B0CD",0x5319],
+  ["B0CE",0x533F],
+  ["B0CF",0x5340],
+  ["B0D0",0x533E],
+  ["B0D1",0x53C3],
+  ["B0D2",0x66FC],
+  ["B0D3",0x5546],
+  ["B0D4",0x556A],
+  ["B0D5",0x5566],
+  ["B0D6",0x5544],
+  ["B0D7",0x555E],
+  ["B0D8",0x5561],
+  ["B0D9",0x5543],
+  ["B0DA",0x554A],
+  ["B0DB",0x5531],
+  ["B0DC",0x5556],
+  ["B0DD",0x554F],
+  ["B0DE",0x5555],
+  ["B0DF",0x552F],
+  ["B0E0",0x5564],
+  ["B0E1",0x5538],
+  ["B0E2",0x552E],
+  ["B0E3",0x555C],
+  ["B0E4",0x552C],
+  ["B0E5",0x5563],
+  ["B0E6",0x5533],
+  ["B0E7",0x5541],
+  ["B0E8",0x5557],
+  ["B0E9",0x5708],
+  ["B0EA",0x570B],
+  ["B0EB",0x5709],
+  ["B0EC",0x57DF],
+  ["B0ED",0x5805],
+  ["B0EE",0x580A],
+  ["B0EF",0x5806],
+  ["B0F0",0x57E0],
+  ["B0F1",0x57E4],
+  ["B0F2",0x57FA],
+  ["B0F3",0x5802],
+  ["B0F4",0x5835],
+  ["B0F5",0x57F7],
+  ["B0F6",0x57F9],
+  ["B0F7",0x5920],
+  ["B0F8",0x5962],
+  ["B0F9",0x5A36],
+  ["B0FA",0x5A41],
+  ["B0FB",0x5A49],
+  ["B0FC",0x5A66],
+  ["B0FD",0x5A6A],
+  ["B0FE",0x5A40],
+  ["B140",0x5A3C],
+  ["B141",0x5A62],
+  ["B142",0x5A5A],
+  ["B143",0x5A46],
+  ["B144",0x5A4A],
+  ["B145",0x5B70],
+  ["B146",0x5BC7],
+  ["B147",0x5BC5],
+  ["B148",0x5BC4],
+  ["B149",0x5BC2],
+  ["B14A",0x5BBF],
+  ["B14B",0x5BC6],
+  ["B14C",0x5C09],
+  ["B14D",0x5C08],
+  ["B14E",0x5C07],
+  ["B14F",0x5C60],
+  ["B150",0x5C5C],
+  ["B151",0x5C5D],
+  ["B152",0x5D07],
+  ["B153",0x5D06],
+  ["B154",0x5D0E],
+  ["B155",0x5D1B],
+  ["B156",0x5D16],
+  ["B157",0x5D22],
+  ["B158",0x5D11],
+  ["B159",0x5D29],
+  ["B15A",0x5D14],
+  ["B15B",0x5D19],
+  ["B15C",0x5D24],
+  ["B15D",0x5D27],
+  ["B15E",0x5D17],
+  ["B15F",0x5DE2],
+  ["B160",0x5E38],
+  ["B161",0x5E36],
+  ["B162",0x5E33],
+  ["B163",0x5E37],
+  ["B164",0x5EB7],
+  ["B165",0x5EB8],
+  ["B166",0x5EB6],
+  ["B167",0x5EB5],
+  ["B168",0x5EBE],
+  ["B169",0x5F35],
+  ["B16A",0x5F37],
+  ["B16B",0x5F57],
+  ["B16C",0x5F6C],
+  ["B16D",0x5F69],
+  ["B16E",0x5F6B],
+  ["B16F",0x5F97],
+  ["B170",0x5F99],
+  ["B171",0x5F9E],
+  ["B172",0x5F98],
+  ["B173",0x5FA1],
+  ["B174",0x5FA0],
+  ["B175",0x5F9C],
+  ["B176",0x607F],
+  ["B177",0x60A3],
+  ["B178",0x6089],
+  ["B179",0x60A0],
+  ["B17A",0x60A8],
+  ["B17B",0x60CB],
+  ["B17C",0x60B4],
+  ["B17D",0x60E6],
+  ["B17E",0x60BD],
+  ["B1A1",0x60C5],
+  ["B1A2",0x60BB],
+  ["B1A3",0x60B5],
+  ["B1A4",0x60DC],
+  ["B1A5",0x60BC],
+  ["B1A6",0x60D8],
+  ["B1A7",0x60D5],
+  ["B1A8",0x60C6],
+  ["B1A9",0x60DF],
+  ["B1AA",0x60B8],
+  ["B1AB",0x60DA],
+  ["B1AC",0x60C7],
+  ["B1AD",0x621A],
+  ["B1AE",0x621B],
+  ["B1AF",0x6248],
+  ["B1B0",0x63A0],
+  ["B1B1",0x63A7],
+  ["B1B2",0x6372],
+  ["B1B3",0x6396],
+  ["B1B4",0x63A2],
+  ["B1B5",0x63A5],
+  ["B1B6",0x6377],
+  ["B1B7",0x6367],
+  ["B1B8",0x6398],
+  ["B1B9",0x63AA],
+  ["B1BA",0x6371],
+  ["B1BB",0x63A9],
+  ["B1BC",0x6389],
+  ["B1BD",0x6383],
+  ["B1BE",0x639B],
+  ["B1BF",0x636B],
+  ["B1C0",0x63A8],
+  ["B1C1",0x6384],
+  ["B1C2",0x6388],
+  ["B1C3",0x6399],
+  ["B1C4",0x63A1],
+  ["B1C5",0x63AC],
+  ["B1C6",0x6392],
+  ["B1C7",0x638F],
+  ["B1C8",0x6380],
+  ["B1C9",0x637B],
+  ["B1CA",0x6369],
+  ["B1CB",0x6368],
+  ["B1CC",0x637A],
+  ["B1CD",0x655D],
+  ["B1CE",0x6556],
+  ["B1CF",0x6551],
+  ["B1D0",0x6559],
+  ["B1D1",0x6557],
+  ["B1D2",0x555F],
+  ["B1D3",0x654F],
+  ["B1D4",0x6558],
+  ["B1D5",0x6555],
+  ["B1D6",0x6554],
+  ["B1D7",0x659C],
+  ["B1D8",0x659B],
+  ["B1D9",0x65AC],
+  ["B1DA",0x65CF],
+  ["B1DB",0x65CB],
+  ["B1DC",0x65CC],
+  ["B1DD",0x65CE],
+  ["B1DE",0x665D],
+  ["B1DF",0x665A],
+  ["B1E0",0x6664],
+  ["B1E1",0x6668],
+  ["B1E2",0x6666],
+  ["B1E3",0x665E],
+  ["B1E4",0x66F9],
+  ["B1E5",0x52D7],
+  ["B1E6",0x671B],
+  ["B1E7",0x6881],
+  ["B1E8",0x68AF],
+  ["B1E9",0x68A2],
+  ["B1EA",0x6893],
+  ["B1EB",0x68B5],
+  ["B1EC",0x687F],
+  ["B1ED",0x6876],
+  ["B1EE",0x68B1],
+  ["B1EF",0x68A7],
+  ["B1F0",0x6897],
+  ["B1F1",0x68B0],
+  ["B1F2",0x6883],
+  ["B1F3",0x68C4],
+  ["B1F4",0x68AD],
+  ["B1F5",0x6886],
+  ["B1F6",0x6885],
+  ["B1F7",0x6894],
+  ["B1F8",0x689D],
+  ["B1F9",0x68A8],
+  ["B1FA",0x689F],
+  ["B1FB",0x68A1],
+  ["B1FC",0x6882],
+  ["B1FD",0x6B32],
+  ["B1FE",0x6BBA],
+  ["B240",0x6BEB],
+  ["B241",0x6BEC],
+  ["B242",0x6C2B],
+  ["B243",0x6D8E],
+  ["B244",0x6DBC],
+  ["B245",0x6DF3],
+  ["B246",0x6DD9],
+  ["B247",0x6DB2],
+  ["B248",0x6DE1],
+  ["B249",0x6DCC],
+  ["B24A",0x6DE4],
+  ["B24B",0x6DFB],
+  ["B24C",0x6DFA],
+  ["B24D",0x6E05],
+  ["B24E",0x6DC7],
+  ["B24F",0x6DCB],
+  ["B250",0x6DAF],
+  ["B251",0x6DD1],
+  ["B252",0x6DAE],
+  ["B253",0x6DDE],
+  ["B254",0x6DF9],
+  ["B255",0x6DB8],
+  ["B256",0x6DF7],
+  ["B257",0x6DF5],
+  ["B258",0x6DC5],
+  ["B259",0x6DD2],
+  ["B25A",0x6E1A],
+  ["B25B",0x6DB5],
+  ["B25C",0x6DDA],
+  ["B25D",0x6DEB],
+  ["B25E",0x6DD8],
+  ["B25F",0x6DEA],
+  ["B260",0x6DF1],
+  ["B261",0x6DEE],
+  ["B262",0x6DE8],
+  ["B263",0x6DC6],
+  ["B264",0x6DC4],
+  ["B265",0x6DAA],
+  ["B266",0x6DEC],
+  ["B267",0x6DBF],
+  ["B268",0x6DE6],
+  ["B269",0x70F9],
+  ["B26A",0x7109],
+  ["B26B",0x710A],
+  ["B26C",0x70FD],
+  ["B26D",0x70EF],
+  ["B26E",0x723D],
+  ["B26F",0x727D],
+  ["B270",0x7281],
+  ["B271",0x731C],
+  ["B272",0x731B],
+  ["B273",0x7316],
+  ["B274",0x7313],
+  ["B275",0x7319],
+  ["B276",0x7387],
+  ["B277",0x7405],
+  ["B278",0x740A],
+  ["B279",0x7403],
+  ["B27A",0x7406],
+  ["B27B",0x73FE],
+  ["B27C",0x740D],
+  ["B27D",0x74E0],
+  ["B27E",0x74F6],
+  ["B2A1",0x74F7],
+  ["B2A2",0x751C],
+  ["B2A3",0x7522],
+  ["B2A4",0x7565],
+  ["B2A5",0x7566],
+  ["B2A6",0x7562],
+  ["B2A7",0x7570],
+  ["B2A8",0x758F],
+  ["B2A9",0x75D4],
+  ["B2AA",0x75D5],
+  ["B2AB",0x75B5],
+  ["B2AC",0x75CA],
+  ["B2AD",0x75CD],
+  ["B2AE",0x768E],
+  ["B2AF",0x76D4],
+  ["B2B0",0x76D2],
+  ["B2B1",0x76DB],
+  ["B2B2",0x7737],
+  ["B2B3",0x773E],
+  ["B2B4",0x773C],
+  ["B2B5",0x7736],
+  ["B2B6",0x7738],
+  ["B2B7",0x773A],
+  ["B2B8",0x786B],
+  ["B2B9",0x7843],
+  ["B2BA",0x784E],
+  ["B2BB",0x7965],
+  ["B2BC",0x7968],
+  ["B2BD",0x796D],
+  ["B2BE",0x79FB],
+  ["B2BF",0x7A92],
+  ["B2C0",0x7A95],
+  ["B2C1",0x7B20],
+  ["B2C2",0x7B28],
+  ["B2C3",0x7B1B],
+  ["B2C4",0x7B2C],
+  ["B2C5",0x7B26],
+  ["B2C6",0x7B19],
+  ["B2C7",0x7B1E],
+  ["B2C8",0x7B2E],
+  ["B2C9",0x7C92],
+  ["B2CA",0x7C97],
+  ["B2CB",0x7C95],
+  ["B2CC",0x7D46],
+  ["B2CD",0x7D43],
+  ["B2CE",0x7D71],
+  ["B2CF",0x7D2E],
+  ["B2D0",0x7D39],
+  ["B2D1",0x7D3C],
+  ["B2D2",0x7D40],
+  ["B2D3",0x7D30],
+  ["B2D4",0x7D33],
+  ["B2D5",0x7D44],
+  ["B2D6",0x7D2F],
+  ["B2D7",0x7D42],
+  ["B2D8",0x7D32],
+  ["B2D9",0x7D31],
+  ["B2DA",0x7F3D],
+  ["B2DB",0x7F9E],
+  ["B2DC",0x7F9A],
+  ["B2DD",0x7FCC],
+  ["B2DE",0x7FCE],
+  ["B2DF",0x7FD2],
+  ["B2E0",0x801C],
+  ["B2E1",0x804A],
+  ["B2E2",0x8046],
+  ["B2E3",0x812F],
+  ["B2E4",0x8116],
+  ["B2E5",0x8123],
+  ["B2E6",0x812B],
+  ["B2E7",0x8129],
+  ["B2E8",0x8130],
+  ["B2E9",0x8124],
+  ["B2EA",0x8202],
+  ["B2EB",0x8235],
+  ["B2EC",0x8237],
+  ["B2ED",0x8236],
+  ["B2EE",0x8239],
+  ["B2EF",0x838E],
+  ["B2F0",0x839E],
+  ["B2F1",0x8398],
+  ["B2F2",0x8378],
+  ["B2F3",0x83A2],
+  ["B2F4",0x8396],
+  ["B2F5",0x83BD],
+  ["B2F6",0x83AB],
+  ["B2F7",0x8392],
+  ["B2F8",0x838A],
+  ["B2F9",0x8393],
+  ["B2FA",0x8389],
+  ["B2FB",0x83A0],
+  ["B2FC",0x8377],
+  ["B2FD",0x837B],
+  ["B2FE",0x837C],
+  ["B340",0x8386],
+  ["B341",0x83A7],
+  ["B342",0x8655],
+  ["B343",0x5F6A],
+  ["B344",0x86C7],
+  ["B345",0x86C0],
+  ["B346",0x86B6],
+  ["B347",0x86C4],
+  ["B348",0x86B5],
+  ["B349",0x86C6],
+  ["B34A",0x86CB],
+  ["B34B",0x86B1],
+  ["B34C",0x86AF],
+  ["B34D",0x86C9],
+  ["B34E",0x8853],
+  ["B34F",0x889E],
+  ["B350",0x8888],
+  ["B351",0x88AB],
+  ["B352",0x8892],
+  ["B353",0x8896],
+  ["B354",0x888D],
+  ["B355",0x888B],
+  ["B356",0x8993],
+  ["B357",0x898F],
+  ["B358",0x8A2A],
+  ["B359",0x8A1D],
+  ["B35A",0x8A23],
+  ["B35B",0x8A25],
+  ["B35C",0x8A31],
+  ["B35D",0x8A2D],
+  ["B35E",0x8A1F],
+  ["B35F",0x8A1B],
+  ["B360",0x8A22],
+  ["B361",0x8C49],
+  ["B362",0x8C5A],
+  ["B363",0x8CA9],
+  ["B364",0x8CAC],
+  ["B365",0x8CAB],
+  ["B366",0x8CA8],
+  ["B367",0x8CAA],
+  ["B368",0x8CA7],
+  ["B369",0x8D67],
+  ["B36A",0x8D66],
+  ["B36B",0x8DBE],
+  ["B36C",0x8DBA],
+  ["B36D",0x8EDB],
+  ["B36E",0x8EDF],
+  ["B36F",0x9019],
+  ["B370",0x900D],
+  ["B371",0x901A],
+  ["B372",0x9017],
+  ["B373",0x9023],
+  ["B374",0x901F],
+  ["B375",0x901D],
+  ["B376",0x9010],
+  ["B377",0x9015],
+  ["B378",0x901E],
+  ["B379",0x9020],
+  ["B37A",0x900F],
+  ["B37B",0x9022],
+  ["B37C",0x9016],
+  ["B37D",0x901B],
+  ["B37E",0x9014],
+  ["B3A1",0x90E8],
+  ["B3A2",0x90ED],
+  ["B3A3",0x90FD],
+  ["B3A4",0x9157],
+  ["B3A5",0x91CE],
+  ["B3A6",0x91F5],
+  ["B3A7",0x91E6],
+  ["B3A8",0x91E3],
+  ["B3A9",0x91E7],
+  ["B3AA",0x91ED],
+  ["B3AB",0x91E9],
+  ["B3AC",0x9589],
+  ["B3AD",0x966A],
+  ["B3AE",0x9675],
+  ["B3AF",0x9673],
+  ["B3B0",0x9678],
+  ["B3B1",0x9670],
+  ["B3B2",0x9674],
+  ["B3B3",0x9676],
+  ["B3B4",0x9677],
+  ["B3B5",0x966C],
+  ["B3B6",0x96C0],
+  ["B3B7",0x96EA],
+  ["B3B8",0x96E9],
+  ["B3B9",0x7AE0],
+  ["B3BA",0x7ADF],
+  ["B3BB",0x9802],
+  ["B3BC",0x9803],
+  ["B3BD",0x9B5A],
+  ["B3BE",0x9CE5],
+  ["B3BF",0x9E75],
+  ["B3C0",0x9E7F],
+  ["B3C1",0x9EA5],
+  ["B3C2",0x9EBB],
+  ["B3C3",0x50A2],
+  ["B3C4",0x508D],
+  ["B3C5",0x5085],
+  ["B3C6",0x5099],
+  ["B3C7",0x5091],
+  ["B3C8",0x5080],
+  ["B3C9",0x5096],
+  ["B3CA",0x5098],
+  ["B3CB",0x509A],
+  ["B3CC",0x6700],
+  ["B3CD",0x51F1],
+  ["B3CE",0x5272],
+  ["B3CF",0x5274],
+  ["B3D0",0x5275],
+  ["B3D1",0x5269],
+  ["B3D2",0x52DE],
+  ["B3D3",0x52DD],
+  ["B3D4",0x52DB],
+  ["B3D5",0x535A],
+  ["B3D6",0x53A5],
+  ["B3D7",0x557B],
+  ["B3D8",0x5580],
+  ["B3D9",0x55A7],
+  ["B3DA",0x557C],
+  ["B3DB",0x558A],
+  ["B3DC",0x559D],
+  ["B3DD",0x5598],
+  ["B3DE",0x5582],
+  ["B3DF",0x559C],
+  ["B3E0",0x55AA],
+  ["B3E1",0x5594],
+  ["B3E2",0x5587],
+  ["B3E3",0x558B],
+  ["B3E4",0x5583],
+  ["B3E5",0x55B3],
+  ["B3E6",0x55AE],
+  ["B3E7",0x559F],
+  ["B3E8",0x553E],
+  ["B3E9",0x55B2],
+  ["B3EA",0x559A],
+  ["B3EB",0x55BB],
+  ["B3EC",0x55AC],
+  ["B3ED",0x55B1],
+  ["B3EE",0x557E],
+  ["B3EF",0x5589],
+  ["B3F0",0x55AB],
+  ["B3F1",0x5599],
+  ["B3F2",0x570D],
+  ["B3F3",0x582F],
+  ["B3F4",0x582A],
+  ["B3F5",0x5834],
+  ["B3F6",0x5824],
+  ["B3F7",0x5830],
+  ["B3F8",0x5831],
+  ["B3F9",0x5821],
+  ["B3FA",0x581D],
+  ["B3FB",0x5820],
+  ["B3FC",0x58F9],
+  ["B3FD",0x58FA],
+  ["B3FE",0x5960],
+  ["B440",0x5A77],
+  ["B441",0x5A9A],
+  ["B442",0x5A7F],
+  ["B443",0x5A92],
+  ["B444",0x5A9B],
+  ["B445",0x5AA7],
+  ["B446",0x5B73],
+  ["B447",0x5B71],
+  ["B448",0x5BD2],
+  ["B449",0x5BCC],
+  ["B44A",0x5BD3],
+  ["B44B",0x5BD0],
+  ["B44C",0x5C0A],
+  ["B44D",0x5C0B],
+  ["B44E",0x5C31],
+  ["B44F",0x5D4C],
+  ["B450",0x5D50],
+  ["B451",0x5D34],
+  ["B452",0x5D47],
+  ["B453",0x5DFD],
+  ["B454",0x5E45],
+  ["B455",0x5E3D],
+  ["B456",0x5E40],
+  ["B457",0x5E43],
+  ["B458",0x5E7E],
+  ["B459",0x5ECA],
+  ["B45A",0x5EC1],
+  ["B45B",0x5EC2],
+  ["B45C",0x5EC4],
+  ["B45D",0x5F3C],
+  ["B45E",0x5F6D],
+  ["B45F",0x5FA9],
+  ["B460",0x5FAA],
+  ["B461",0x5FA8],
+  ["B462",0x60D1],
+  ["B463",0x60E1],
+  ["B464",0x60B2],
+  ["B465",0x60B6],
+  ["B466",0x60E0],
+  ["B467",0x611C],
+  ["B468",0x6123],
+  ["B469",0x60FA],
+  ["B46A",0x6115],
+  ["B46B",0x60F0],
+  ["B46C",0x60FB],
+  ["B46D",0x60F4],
+  ["B46E",0x6168],
+  ["B46F",0x60F1],
+  ["B470",0x610E],
+  ["B471",0x60F6],
+  ["B472",0x6109],
+  ["B473",0x6100],
+  ["B474",0x6112],
+  ["B475",0x621F],
+  ["B476",0x6249],
+  ["B477",0x63A3],
+  ["B478",0x638C],
+  ["B479",0x63CF],
+  ["B47A",0x63C0],
+  ["B47B",0x63E9],
+  ["B47C",0x63C9],
+  ["B47D",0x63C6],
+  ["B47E",0x63CD],
+  ["B4A1",0x63D2],
+  ["B4A2",0x63E3],
+  ["B4A3",0x63D0],
+  ["B4A4",0x63E1],
+  ["B4A5",0x63D6],
+  ["B4A6",0x63ED],
+  ["B4A7",0x63EE],
+  ["B4A8",0x6376],
+  ["B4A9",0x63F4],
+  ["B4AA",0x63EA],
+  ["B4AB",0x63DB],
+  ["B4AC",0x6452],
+  ["B4AD",0x63DA],
+  ["B4AE",0x63F9],
+  ["B4AF",0x655E],
+  ["B4B0",0x6566],
+  ["B4B1",0x6562],
+  ["B4B2",0x6563],
+  ["B4B3",0x6591],
+  ["B4B4",0x6590],
+  ["B4B5",0x65AF],
+  ["B4B6",0x666E],
+  ["B4B7",0x6670],
+  ["B4B8",0x6674],
+  ["B4B9",0x6676],
+  ["B4BA",0x666F],
+  ["B4BB",0x6691],
+  ["B4BC",0x667A],
+  ["B4BD",0x667E],
+  ["B4BE",0x6677],
+  ["B4BF",0x66FE],
+  ["B4C0",0x66FF],
+  ["B4C1",0x671F],
+  ["B4C2",0x671D],
+  ["B4C3",0x68FA],
+  ["B4C4",0x68D5],
+  ["B4C5",0x68E0],
+  ["B4C6",0x68D8],
+  ["B4C7",0x68D7],
+  ["B4C8",0x6905],
+  ["B4C9",0x68DF],
+  ["B4CA",0x68F5],
+  ["B4CB",0x68EE],
+  ["B4CC",0x68E7],
+  ["B4CD",0x68F9],
+  ["B4CE",0x68D2],
+  ["B4CF",0x68F2],
+  ["B4D0",0x68E3],
+  ["B4D1",0x68CB],
+  ["B4D2",0x68CD],
+  ["B4D3",0x690D],
+  ["B4D4",0x6912],
+  ["B4D5",0x690E],
+  ["B4D6",0x68C9],
+  ["B4D7",0x68DA],
+  ["B4D8",0x696E],
+  ["B4D9",0x68FB],
+  ["B4DA",0x6B3E],
+  ["B4DB",0x6B3A],
+  ["B4DC",0x6B3D],
+  ["B4DD",0x6B98],
+  ["B4DE",0x6B96],
+  ["B4DF",0x6BBC],
+  ["B4E0",0x6BEF],
+  ["B4E1",0x6C2E],
+  ["B4E2",0x6C2F],
+  ["B4E3",0x6C2C],
+  ["B4E4",0x6E2F],
+  ["B4E5",0x6E38],
+  ["B4E6",0x6E54],
+  ["B4E7",0x6E21],
+  ["B4E8",0x6E32],
+  ["B4E9",0x6E67],
+  ["B4EA",0x6E4A],
+  ["B4EB",0x6E20],
+  ["B4EC",0x6E25],
+  ["B4ED",0x6E23],
+  ["B4EE",0x6E1B],
+  ["B4EF",0x6E5B],
+  ["B4F0",0x6E58],
+  ["B4F1",0x6E24],
+  ["B4F2",0x6E56],
+  ["B4F3",0x6E6E],
+  ["B4F4",0x6E2D],
+  ["B4F5",0x6E26],
+  ["B4F6",0x6E6F],
+  ["B4F7",0x6E34],
+  ["B4F8",0x6E4D],
+  ["B4F9",0x6E3A],
+  ["B4FA",0x6E2C],
+  ["B4FB",0x6E43],
+  ["B4FC",0x6E1D],
+  ["B4FD",0x6E3E],
+  ["B4FE",0x6ECB],
+  ["B540",0x6E89],
+  ["B541",0x6E19],
+  ["B542",0x6E4E],
+  ["B543",0x6E63],
+  ["B544",0x6E44],
+  ["B545",0x6E72],
+  ["B546",0x6E69],
+  ["B547",0x6E5F],
+  ["B548",0x7119],
+  ["B549",0x711A],
+  ["B54A",0x7126],
+  ["B54B",0x7130],
+  ["B54C",0x7121],
+  ["B54D",0x7136],
+  ["B54E",0x716E],
+  ["B54F",0x711C],
+  ["B550",0x724C],
+  ["B551",0x7284],
+  ["B552",0x7280],
+  ["B553",0x7336],
+  ["B554",0x7325],
+  ["B555",0x7334],
+  ["B556",0x7329],
+  ["B557",0x743A],
+  ["B558",0x742A],
+  ["B559",0x7433],
+  ["B55A",0x7422],
+  ["B55B",0x7425],
+  ["B55C",0x7435],
+  ["B55D",0x7436],
+  ["B55E",0x7434],
+  ["B55F",0x742F],
+  ["B560",0x741B],
+  ["B561",0x7426],
+  ["B562",0x7428],
+  ["B563",0x7525],
+  ["B564",0x7526],
+  ["B565",0x756B],
+  ["B566",0x756A],
+  ["B567",0x75E2],
+  ["B568",0x75DB],
+  ["B569",0x75E3],
+  ["B56A",0x75D9],
+  ["B56B",0x75D8],
+  ["B56C",0x75DE],
+  ["B56D",0x75E0],
+  ["B56E",0x767B],
+  ["B56F",0x767C],
+  ["B570",0x7696],
+  ["B571",0x7693],
+  ["B572",0x76B4],
+  ["B573",0x76DC],
+  ["B574",0x774F],
+  ["B575",0x77ED],
+  ["B576",0x785D],
+  ["B577",0x786C],
+  ["B578",0x786F],
+  ["B579",0x7A0D],
+  ["B57A",0x7A08],
+  ["B57B",0x7A0B],
+  ["B57C",0x7A05],
+  ["B57D",0x7A00],
+  ["B57E",0x7A98],
+  ["B5A1",0x7A97],
+  ["B5A2",0x7A96],
+  ["B5A3",0x7AE5],
+  ["B5A4",0x7AE3],
+  ["B5A5",0x7B49],
+  ["B5A6",0x7B56],
+  ["B5A7",0x7B46],
+  ["B5A8",0x7B50],
+  ["B5A9",0x7B52],
+  ["B5AA",0x7B54],
+  ["B5AB",0x7B4D],
+  ["B5AC",0x7B4B],
+  ["B5AD",0x7B4F],
+  ["B5AE",0x7B51],
+  ["B5AF",0x7C9F],
+  ["B5B0",0x7CA5],
+  ["B5B1",0x7D5E],
+  ["B5B2",0x7D50],
+  ["B5B3",0x7D68],
+  ["B5B4",0x7D55],
+  ["B5B5",0x7D2B],
+  ["B5B6",0x7D6E],
+  ["B5B7",0x7D72],
+  ["B5B8",0x7D61],
+  ["B5B9",0x7D66],
+  ["B5BA",0x7D62],
+  ["B5BB",0x7D70],
+  ["B5BC",0x7D73],
+  ["B5BD",0x5584],
+  ["B5BE",0x7FD4],
+  ["B5BF",0x7FD5],
+  ["B5C0",0x800B],
+  ["B5C1",0x8052],
+  ["B5C2",0x8085],
+  ["B5C3",0x8155],
+  ["B5C4",0x8154],
+  ["B5C5",0x814B],
+  ["B5C6",0x8151],
+  ["B5C7",0x814E],
+  ["B5C8",0x8139],
+  ["B5C9",0x8146],
+  ["B5CA",0x813E],
+  ["B5CB",0x814C],
+  ["B5CC",0x8153],
+  ["B5CD",0x8174],
+  ["B5CE",0x8212],
+  ["B5CF",0x821C],
+  ["B5D0",0x83E9],
+  ["B5D1",0x8403],
+  ["B5D2",0x83F8],
+  ["B5D3",0x840D],
+  ["B5D4",0x83E0],
+  ["B5D5",0x83C5],
+  ["B5D6",0x840B],
+  ["B5D7",0x83C1],
+  ["B5D8",0x83EF],
+  ["B5D9",0x83F1],
+  ["B5DA",0x83F4],
+  ["B5DB",0x8457],
+  ["B5DC",0x840A],
+  ["B5DD",0x83F0],
+  ["B5DE",0x840C],
+  ["B5DF",0x83CC],
+  ["B5E0",0x83FD],
+  ["B5E1",0x83F2],
+  ["B5E2",0x83CA],
+  ["B5E3",0x8438],
+  ["B5E4",0x840E],
+  ["B5E5",0x8404],
+  ["B5E6",0x83DC],
+  ["B5E7",0x8407],
+  ["B5E8",0x83D4],
+  ["B5E9",0x83DF],
+  ["B5EA",0x865B],
+  ["B5EB",0x86DF],
+  ["B5EC",0x86D9],
+  ["B5ED",0x86ED],
+  ["B5EE",0x86D4],
+  ["B5EF",0x86DB],
+  ["B5F0",0x86E4],
+  ["B5F1",0x86D0],
+  ["B5F2",0x86DE],
+  ["B5F3",0x8857],
+  ["B5F4",0x88C1],
+  ["B5F5",0x88C2],
+  ["B5F6",0x88B1],
+  ["B5F7",0x8983],
+  ["B5F8",0x8996],
+  ["B5F9",0x8A3B],
+  ["B5FA",0x8A60],
+  ["B5FB",0x8A55],
+  ["B5FC",0x8A5E],
+  ["B5FD",0x8A3C],
+  ["B5FE",0x8A41],
+  ["B640",0x8A54],
+  ["B641",0x8A5B],
+  ["B642",0x8A50],
+  ["B643",0x8A46],
+  ["B644",0x8A34],
+  ["B645",0x8A3A],
+  ["B646",0x8A36],
+  ["B647",0x8A56],
+  ["B648",0x8C61],
+  ["B649",0x8C82],
+  ["B64A",0x8CAF],
+  ["B64B",0x8CBC],
+  ["B64C",0x8CB3],
+  ["B64D",0x8CBD],
+  ["B64E",0x8CC1],
+  ["B64F",0x8CBB],
+  ["B650",0x8CC0],
+  ["B651",0x8CB4],
+  ["B652",0x8CB7],
+  ["B653",0x8CB6],
+  ["B654",0x8CBF],
+  ["B655",0x8CB8],
+  ["B656",0x8D8A],
+  ["B657",0x8D85],
+  ["B658",0x8D81],
+  ["B659",0x8DCE],
+  ["B65A",0x8DDD],
+  ["B65B",0x8DCB],
+  ["B65C",0x8DDA],
+  ["B65D",0x8DD1],
+  ["B65E",0x8DCC],
+  ["B65F",0x8DDB],
+  ["B660",0x8DC6],
+  ["B661",0x8EFB],
+  ["B662",0x8EF8],
+  ["B663",0x8EFC],
+  ["B664",0x8F9C],
+  ["B665",0x902E],
+  ["B666",0x9035],
+  ["B667",0x9031],
+  ["B668",0x9038],
+  ["B669",0x9032],
+  ["B66A",0x9036],
+  ["B66B",0x9102],
+  ["B66C",0x90F5],
+  ["B66D",0x9109],
+  ["B66E",0x90FE],
+  ["B66F",0x9163],
+  ["B670",0x9165],
+  ["B671",0x91CF],
+  ["B672",0x9214],
+  ["B673",0x9215],
+  ["B674",0x9223],
+  ["B675",0x9209],
+  ["B676",0x921E],
+  ["B677",0x920D],
+  ["B678",0x9210],
+  ["B679",0x9207],
+  ["B67A",0x9211],
+  ["B67B",0x9594],
+  ["B67C",0x958F],
+  ["B67D",0x958B],
+  ["B67E",0x9591],
+  ["B6A1",0x9593],
+  ["B6A2",0x9592],
+  ["B6A3",0x958E],
+  ["B6A4",0x968A],
+  ["B6A5",0x968E],
+  ["B6A6",0x968B],
+  ["B6A7",0x967D],
+  ["B6A8",0x9685],
+  ["B6A9",0x9686],
+  ["B6AA",0x968D],
+  ["B6AB",0x9672],
+  ["B6AC",0x9684],
+  ["B6AD",0x96C1],
+  ["B6AE",0x96C5],
+  ["B6AF",0x96C4],
+  ["B6B0",0x96C6],
+  ["B6B1",0x96C7],
+  ["B6B2",0x96EF],
+  ["B6B3",0x96F2],
+  ["B6B4",0x97CC],
+  ["B6B5",0x9805],
+  ["B6B6",0x9806],
+  ["B6B7",0x9808],
+  ["B6B8",0x98E7],
+  ["B6B9",0x98EA],
+  ["B6BA",0x98EF],
+  ["B6BB",0x98E9],
+  ["B6BC",0x98F2],
+  ["B6BD",0x98ED],
+  ["B6BE",0x99AE],
+  ["B6BF",0x99AD],
+  ["B6C0",0x9EC3],
+  ["B6C1",0x9ECD],
+  ["B6C2",0x9ED1],
+  ["B6C3",0x4E82],
+  ["B6C4",0x50AD],
+  ["B6C5",0x50B5],
+  ["B6C6",0x50B2],
+  ["B6C7",0x50B3],
+  ["B6C8",0x50C5],
+  ["B6C9",0x50BE],
+  ["B6CA",0x50AC],
+  ["B6CB",0x50B7],
+  ["B6CC",0x50BB],
+  ["B6CD",0x50AF],
+  ["B6CE",0x50C7],
+  ["B6CF",0x527F],
+  ["B6D0",0x5277],
+  ["B6D1",0x527D],
+  ["B6D2",0x52DF],
+  ["B6D3",0x52E6],
+  ["B6D4",0x52E4],
+  ["B6D5",0x52E2],
+  ["B6D6",0x52E3],
+  ["B6D7",0x532F],
+  ["B6D8",0x55DF],
+  ["B6D9",0x55E8],
+  ["B6DA",0x55D3],
+  ["B6DB",0x55E6],
+  ["B6DC",0x55CE],
+  ["B6DD",0x55DC],
+  ["B6DE",0x55C7],
+  ["B6DF",0x55D1],
+  ["B6E0",0x55E3],
+  ["B6E1",0x55E4],
+  ["B6E2",0x55EF],
+  ["B6E3",0x55DA],
+  ["B6E4",0x55E1],
+  ["B6E5",0x55C5],
+  ["B6E6",0x55C6],
+  ["B6E7",0x55E5],
+  ["B6E8",0x55C9],
+  ["B6E9",0x5712],
+  ["B6EA",0x5713],
+  ["B6EB",0x585E],
+  ["B6EC",0x5851],
+  ["B6ED",0x5858],
+  ["B6EE",0x5857],
+  ["B6EF",0x585A],
+  ["B6F0",0x5854],
+  ["B6F1",0x586B],
+  ["B6F2",0x584C],
+  ["B6F3",0x586D],
+  ["B6F4",0x584A],
+  ["B6F5",0x5862],
+  ["B6F6",0x5852],
+  ["B6F7",0x584B],
+  ["B6F8",0x5967],
+  ["B6F9",0x5AC1],
+  ["B6FA",0x5AC9],
+  ["B6FB",0x5ACC],
+  ["B6FC",0x5ABE],
+  ["B6FD",0x5ABD],
+  ["B6FE",0x5ABC],
+  ["B740",0x5AB3],
+  ["B741",0x5AC2],
+  ["B742",0x5AB2],
+  ["B743",0x5D69],
+  ["B744",0x5D6F],
+  ["B745",0x5E4C],
+  ["B746",0x5E79],
+  ["B747",0x5EC9],
+  ["B748",0x5EC8],
+  ["B749",0x5F12],
+  ["B74A",0x5F59],
+  ["B74B",0x5FAC],
+  ["B74C",0x5FAE],
+  ["B74D",0x611A],
+  ["B74E",0x610F],
+  ["B74F",0x6148],
+  ["B750",0x611F],
+  ["B751",0x60F3],
+  ["B752",0x611B],
+  ["B753",0x60F9],
+  ["B754",0x6101],
+  ["B755",0x6108],
+  ["B756",0x614E],
+  ["B757",0x614C],
+  ["B758",0x6144],
+  ["B759",0x614D],
+  ["B75A",0x613E],
+  ["B75B",0x6134],
+  ["B75C",0x6127],
+  ["B75D",0x610D],
+  ["B75E",0x6106],
+  ["B75F",0x6137],
+  ["B760",0x6221],
+  ["B761",0x6222],
+  ["B762",0x6413],
+  ["B763",0x643E],
+  ["B764",0x641E],
+  ["B765",0x642A],
+  ["B766",0x642D],
+  ["B767",0x643D],
+  ["B768",0x642C],
+  ["B769",0x640F],
+  ["B76A",0x641C],
+  ["B76B",0x6414],
+  ["B76C",0x640D],
+  ["B76D",0x6436],
+  ["B76E",0x6416],
+  ["B76F",0x6417],
+  ["B770",0x6406],
+  ["B771",0x656C],
+  ["B772",0x659F],
+  ["B773",0x65B0],
+  ["B774",0x6697],
+  ["B775",0x6689],
+  ["B776",0x6687],
+  ["B777",0x6688],
+  ["B778",0x6696],
+  ["B779",0x6684],
+  ["B77A",0x6698],
+  ["B77B",0x668D],
+  ["B77C",0x6703],
+  ["B77D",0x6994],
+  ["B77E",0x696D],
+  ["B7A1",0x695A],
+  ["B7A2",0x6977],
+  ["B7A3",0x6960],
+  ["B7A4",0x6954],
+  ["B7A5",0x6975],
+  ["B7A6",0x6930],
+  ["B7A7",0x6982],
+  ["B7A8",0x694A],
+  ["B7A9",0x6968],
+  ["B7AA",0x696B],
+  ["B7AB",0x695E],
+  ["B7AC",0x6953],
+  ["B7AD",0x6979],
+  ["B7AE",0x6986],
+  ["B7AF",0x695D],
+  ["B7B0",0x6963],
+  ["B7B1",0x695B],
+  ["B7B2",0x6B47],
+  ["B7B3",0x6B72],
+  ["B7B4",0x6BC0],
+  ["B7B5",0x6BBF],
+  ["B7B6",0x6BD3],
+  ["B7B7",0x6BFD],
+  ["B7B8",0x6EA2],
+  ["B7B9",0x6EAF],
+  ["B7BA",0x6ED3],
+  ["B7BB",0x6EB6],
+  ["B7BC",0x6EC2],
+  ["B7BD",0x6E90],
+  ["B7BE",0x6E9D],
+  ["B7BF",0x6EC7],
+  ["B7C0",0x6EC5],
+  ["B7C1",0x6EA5],
+  ["B7C2",0x6E98],
+  ["B7C3",0x6EBC],
+  ["B7C4",0x6EBA],
+  ["B7C5",0x6EAB],
+  ["B7C6",0x6ED1],
+  ["B7C7",0x6E96],
+  ["B7C8",0x6E9C],
+  ["B7C9",0x6EC4],
+  ["B7CA",0x6ED4],
+  ["B7CB",0x6EAA],
+  ["B7CC",0x6EA7],
+  ["B7CD",0x6EB4],
+  ["B7CE",0x714E],
+  ["B7CF",0x7159],
+  ["B7D0",0x7169],
+  ["B7D1",0x7164],
+  ["B7D2",0x7149],
+  ["B7D3",0x7167],
+  ["B7D4",0x715C],
+  ["B7D5",0x716C],
+  ["B7D6",0x7166],
+  ["B7D7",0x714C],
+  ["B7D8",0x7165],
+  ["B7D9",0x715E],
+  ["B7DA",0x7146],
+  ["B7DB",0x7168],
+  ["B7DC",0x7156],
+  ["B7DD",0x723A],
+  ["B7DE",0x7252],
+  ["B7DF",0x7337],
+  ["B7E0",0x7345],
+  ["B7E1",0x733F],
+  ["B7E2",0x733E],
+  ["B7E3",0x746F],
+  ["B7E4",0x745A],
+  ["B7E5",0x7455],
+  ["B7E6",0x745F],
+  ["B7E7",0x745E],
+  ["B7E8",0x7441],
+  ["B7E9",0x743F],
+  ["B7EA",0x7459],
+  ["B7EB",0x745B],
+  ["B7EC",0x745C],
+  ["B7ED",0x7576],
+  ["B7EE",0x7578],
+  ["B7EF",0x7600],
+  ["B7F0",0x75F0],
+  ["B7F1",0x7601],
+  ["B7F2",0x75F2],
+  ["B7F3",0x75F1],
+  ["B7F4",0x75FA],
+  ["B7F5",0x75FF],
+  ["B7F6",0x75F4],
+  ["B7F7",0x75F3],
+  ["B7F8",0x76DE],
+  ["B7F9",0x76DF],
+  ["B7FA",0x775B],
+  ["B7FB",0x776B],
+  ["B7FC",0x7766],
+  ["B7FD",0x775E],
+  ["B7FE",0x7763],
+  ["B840",0x7779],
+  ["B841",0x776A],
+  ["B842",0x776C],
+  ["B843",0x775C],
+  ["B844",0x7765],
+  ["B845",0x7768],
+  ["B846",0x7762],
+  ["B847",0x77EE],
+  ["B848",0x788E],
+  ["B849",0x78B0],
+  ["B84A",0x7897],
+  ["B84B",0x7898],
+  ["B84C",0x788C],
+  ["B84D",0x7889],
+  ["B84E",0x787C],
+  ["B84F",0x7891],
+  ["B850",0x7893],
+  ["B851",0x787F],
+  ["B852",0x797A],
+  ["B853",0x797F],
+  ["B854",0x7981],
+  ["B855",0x842C],
+  ["B856",0x79BD],
+  ["B857",0x7A1C],
+  ["B858",0x7A1A],
+  ["B859",0x7A20],
+  ["B85A",0x7A14],
+  ["B85B",0x7A1F],
+  ["B85C",0x7A1E],
+  ["B85D",0x7A9F],
+  ["B85E",0x7AA0],
+  ["B85F",0x7B77],
+  ["B860",0x7BC0],
+  ["B861",0x7B60],
+  ["B862",0x7B6E],
+  ["B863",0x7B67],
+  ["B864",0x7CB1],
+  ["B865",0x7CB3],
+  ["B866",0x7CB5],
+  ["B867",0x7D93],
+  ["B868",0x7D79],
+  ["B869",0x7D91],
+  ["B86A",0x7D81],
+  ["B86B",0x7D8F],
+  ["B86C",0x7D5B],
+  ["B86D",0x7F6E],
+  ["B86E",0x7F69],
+  ["B86F",0x7F6A],
+  ["B870",0x7F72],
+  ["B871",0x7FA9],
+  ["B872",0x7FA8],
+  ["B873",0x7FA4],
+  ["B874",0x8056],
+  ["B875",0x8058],
+  ["B876",0x8086],
+  ["B877",0x8084],
+  ["B878",0x8171],
+  ["B879",0x8170],
+  ["B87A",0x8178],
+  ["B87B",0x8165],
+  ["B87C",0x816E],
+  ["B87D",0x8173],
+  ["B87E",0x816B],
+  ["B8A1",0x8179],
+  ["B8A2",0x817A],
+  ["B8A3",0x8166],
+  ["B8A4",0x8205],
+  ["B8A5",0x8247],
+  ["B8A6",0x8482],
+  ["B8A7",0x8477],
+  ["B8A8",0x843D],
+  ["B8A9",0x8431],
+  ["B8AA",0x8475],
+  ["B8AB",0x8466],
+  ["B8AC",0x846B],
+  ["B8AD",0x8449],
+  ["B8AE",0x846C],
+  ["B8AF",0x845B],
+  ["B8B0",0x843C],
+  ["B8B1",0x8435],
+  ["B8B2",0x8461],
+  ["B8B3",0x8463],
+  ["B8B4",0x8469],
+  ["B8B5",0x846D],
+  ["B8B6",0x8446],
+  ["B8B7",0x865E],
+  ["B8B8",0x865C],
+  ["B8B9",0x865F],
+  ["B8BA",0x86F9],
+  ["B8BB",0x8713],
+  ["B8BC",0x8708],
+  ["B8BD",0x8707],
+  ["B8BE",0x8700],
+  ["B8BF",0x86FE],
+  ["B8C0",0x86FB],
+  ["B8C1",0x8702],
+  ["B8C2",0x8703],
+  ["B8C3",0x8706],
+  ["B8C4",0x870A],
+  ["B8C5",0x8859],
+  ["B8C6",0x88DF],
+  ["B8C7",0x88D4],
+  ["B8C8",0x88D9],
+  ["B8C9",0x88DC],
+  ["B8CA",0x88D8],
+  ["B8CB",0x88DD],
+  ["B8CC",0x88E1],
+  ["B8CD",0x88CA],
+  ["B8CE",0x88D5],
+  ["B8CF",0x88D2],
+  ["B8D0",0x899C],
+  ["B8D1",0x89E3],
+  ["B8D2",0x8A6B],
+  ["B8D3",0x8A72],
+  ["B8D4",0x8A73],
+  ["B8D5",0x8A66],
+  ["B8D6",0x8A69],
+  ["B8D7",0x8A70],
+  ["B8D8",0x8A87],
+  ["B8D9",0x8A7C],
+  ["B8DA",0x8A63],
+  ["B8DB",0x8AA0],
+  ["B8DC",0x8A71],
+  ["B8DD",0x8A85],
+  ["B8DE",0x8A6D],
+  ["B8DF",0x8A62],
+  ["B8E0",0x8A6E],
+  ["B8E1",0x8A6C],
+  ["B8E2",0x8A79],
+  ["B8E3",0x8A7B],
+  ["B8E4",0x8A3E],
+  ["B8E5",0x8A68],
+  ["B8E6",0x8C62],
+  ["B8E7",0x8C8A],
+  ["B8E8",0x8C89],
+  ["B8E9",0x8CCA],
+  ["B8EA",0x8CC7],
+  ["B8EB",0x8CC8],
+  ["B8EC",0x8CC4],
+  ["B8ED",0x8CB2],
+  ["B8EE",0x8CC3],
+  ["B8EF",0x8CC2],
+  ["B8F0",0x8CC5],
+  ["B8F1",0x8DE1],
+  ["B8F2",0x8DDF],
+  ["B8F3",0x8DE8],
+  ["B8F4",0x8DEF],
+  ["B8F5",0x8DF3],
+  ["B8F6",0x8DFA],
+  ["B8F7",0x8DEA],
+  ["B8F8",0x8DE4],
+  ["B8F9",0x8DE6],
+  ["B8FA",0x8EB2],
+  ["B8FB",0x8F03],
+  ["B8FC",0x8F09],
+  ["B8FD",0x8EFE],
+  ["B8FE",0x8F0A],
+  ["B940",0x8F9F],
+  ["B941",0x8FB2],
+  ["B942",0x904B],
+  ["B943",0x904A],
+  ["B944",0x9053],
+  ["B945",0x9042],
+  ["B946",0x9054],
+  ["B947",0x903C],
+  ["B948",0x9055],
+  ["B949",0x9050],
+  ["B94A",0x9047],
+  ["B94B",0x904F],
+  ["B94C",0x904E],
+  ["B94D",0x904D],
+  ["B94E",0x9051],
+  ["B94F",0x903E],
+  ["B950",0x9041],
+  ["B951",0x9112],
+  ["B952",0x9117],
+  ["B953",0x916C],
+  ["B954",0x916A],
+  ["B955",0x9169],
+  ["B956",0x91C9],
+  ["B957",0x9237],
+  ["B958",0x9257],
+  ["B959",0x9238],
+  ["B95A",0x923D],
+  ["B95B",0x9240],
+  ["B95C",0x923E],
+  ["B95D",0x925B],
+  ["B95E",0x924B],
+  ["B95F",0x9264],
+  ["B960",0x9251],
+  ["B961",0x9234],
+  ["B962",0x9249],
+  ["B963",0x924D],
+  ["B964",0x9245],
+  ["B965",0x9239],
+  ["B966",0x923F],
+  ["B967",0x925A],
+  ["B968",0x9598],
+  ["B969",0x9698],
+  ["B96A",0x9694],
+  ["B96B",0x9695],
+  ["B96C",0x96CD],
+  ["B96D",0x96CB],
+  ["B96E",0x96C9],
+  ["B96F",0x96CA],
+  ["B970",0x96F7],
+  ["B971",0x96FB],
+  ["B972",0x96F9],
+  ["B973",0x96F6],
+  ["B974",0x9756],
+  ["B975",0x9774],
+  ["B976",0x9776],
+  ["B977",0x9810],
+  ["B978",0x9811],
+  ["B979",0x9813],
+  ["B97A",0x980A],
+  ["B97B",0x9812],
+  ["B97C",0x980C],
+  ["B97D",0x98FC],
+  ["B97E",0x98F4],
+  ["B9A1",0x98FD],
+  ["B9A2",0x98FE],
+  ["B9A3",0x99B3],
+  ["B9A4",0x99B1],
+  ["B9A5",0x99B4],
+  ["B9A6",0x9AE1],
+  ["B9A7",0x9CE9],
+  ["B9A8",0x9E82],
+  ["B9A9",0x9F0E],
+  ["B9AA",0x9F13],
+  ["B9AB",0x9F20],
+  ["B9AC",0x50E7],
+  ["B9AD",0x50EE],
+  ["B9AE",0x50E5],
+  ["B9AF",0x50D6],
+  ["B9B0",0x50ED],
+  ["B9B1",0x50DA],
+  ["B9B2",0x50D5],
+  ["B9B3",0x50CF],
+  ["B9B4",0x50D1],
+  ["B9B5",0x50F1],
+  ["B9B6",0x50CE],
+  ["B9B7",0x50E9],
+  ["B9B8",0x5162],
+  ["B9B9",0x51F3],
+  ["B9BA",0x5283],
+  ["B9BB",0x5282],
+  ["B9BC",0x5331],
+  ["B9BD",0x53AD],
+  ["B9BE",0x55FE],
+  ["B9BF",0x5600],
+  ["B9C0",0x561B],
+  ["B9C1",0x5617],
+  ["B9C2",0x55FD],
+  ["B9C3",0x5614],
+  ["B9C4",0x5606],
+  ["B9C5",0x5609],
+  ["B9C6",0x560D],
+  ["B9C7",0x560E],
+  ["B9C8",0x55F7],
+  ["B9C9",0x5616],
+  ["B9CA",0x561F],
+  ["B9CB",0x5608],
+  ["B9CC",0x5610],
+  ["B9CD",0x55F6],
+  ["B9CE",0x5718],
+  ["B9CF",0x5716],
+  ["B9D0",0x5875],
+  ["B9D1",0x587E],
+  ["B9D2",0x5883],
+  ["B9D3",0x5893],
+  ["B9D4",0x588A],
+  ["B9D5",0x5879],
+  ["B9D6",0x5885],
+  ["B9D7",0x587D],
+  ["B9D8",0x58FD],
+  ["B9D9",0x5925],
+  ["B9DA",0x5922],
+  ["B9DB",0x5924],
+  ["B9DC",0x596A],
+  ["B9DD",0x5969],
+  ["B9DE",0x5AE1],
+  ["B9DF",0x5AE6],
+  ["B9E0",0x5AE9],
+  ["B9E1",0x5AD7],
+  ["B9E2",0x5AD6],
+  ["B9E3",0x5AD8],
+  ["B9E4",0x5AE3],
+  ["B9E5",0x5B75],
+  ["B9E6",0x5BDE],
+  ["B9E7",0x5BE7],
+  ["B9E8",0x5BE1],
+  ["B9E9",0x5BE5],
+  ["B9EA",0x5BE6],
+  ["B9EB",0x5BE8],
+  ["B9EC",0x5BE2],
+  ["B9ED",0x5BE4],
+  ["B9EE",0x5BDF],
+  ["B9EF",0x5C0D],
+  ["B9F0",0x5C62],
+  ["B9F1",0x5D84],
+  ["B9F2",0x5D87],
+  ["B9F3",0x5E5B],
+  ["B9F4",0x5E63],
+  ["B9F5",0x5E55],
+  ["B9F6",0x5E57],
+  ["B9F7",0x5E54],
+  ["B9F8",0x5ED3],
+  ["B9F9",0x5ED6],
+  ["B9FA",0x5F0A],
+  ["B9FB",0x5F46],
+  ["B9FC",0x5F70],
+  ["B9FD",0x5FB9],
+  ["B9FE",0x6147],
+  ["BA40",0x613F],
+  ["BA41",0x614B],
+  ["BA42",0x6177],
+  ["BA43",0x6162],
+  ["BA44",0x6163],
+  ["BA45",0x615F],
+  ["BA46",0x615A],
+  ["BA47",0x6158],
+  ["BA48",0x6175],
+  ["BA49",0x622A],
+  ["BA4A",0x6487],
+  ["BA4B",0x6458],
+  ["BA4C",0x6454],
+  ["BA4D",0x64A4],
+  ["BA4E",0x6478],
+  ["BA4F",0x645F],
+  ["BA50",0x647A],
+  ["BA51",0x6451],
+  ["BA52",0x6467],
+  ["BA53",0x6434],
+  ["BA54",0x646D],
+  ["BA55",0x647B],
+  ["BA56",0x6572],
+  ["BA57",0x65A1],
+  ["BA58",0x65D7],
+  ["BA59",0x65D6],
+  ["BA5A",0x66A2],
+  ["BA5B",0x66A8],
+  ["BA5C",0x669D],
+  ["BA5D",0x699C],
+  ["BA5E",0x69A8],
+  ["BA5F",0x6995],
+  ["BA60",0x69C1],
+  ["BA61",0x69AE],
+  ["BA62",0x69D3],
+  ["BA63",0x69CB],
+  ["BA64",0x699B],
+  ["BA65",0x69B7],
+  ["BA66",0x69BB],
+  ["BA67",0x69AB],
+  ["BA68",0x69B4],
+  ["BA69",0x69D0],
+  ["BA6A",0x69CD],
+  ["BA6B",0x69AD],
+  ["BA6C",0x69CC],
+  ["BA6D",0x69A6],
+  ["BA6E",0x69C3],
+  ["BA6F",0x69A3],
+  ["BA70",0x6B49],
+  ["BA71",0x6B4C],
+  ["BA72",0x6C33],
+  ["BA73",0x6F33],
+  ["BA74",0x6F14],
+  ["BA75",0x6EFE],
+  ["BA76",0x6F13],
+  ["BA77",0x6EF4],
+  ["BA78",0x6F29],
+  ["BA79",0x6F3E],
+  ["BA7A",0x6F20],
+  ["BA7B",0x6F2C],
+  ["BA7C",0x6F0F],
+  ["BA7D",0x6F02],
+  ["BA7E",0x6F22],
+  ["BAA1",0x6EFF],
+  ["BAA2",0x6EEF],
+  ["BAA3",0x6F06],
+  ["BAA4",0x6F31],
+  ["BAA5",0x6F38],
+  ["BAA6",0x6F32],
+  ["BAA7",0x6F23],
+  ["BAA8",0x6F15],
+  ["BAA9",0x6F2B],
+  ["BAAA",0x6F2F],
+  ["BAAB",0x6F88],
+  ["BAAC",0x6F2A],
+  ["BAAD",0x6EEC],
+  ["BAAE",0x6F01],
+  ["BAAF",0x6EF2],
+  ["BAB0",0x6ECC],
+  ["BAB1",0x6EF7],
+  ["BAB2",0x7194],
+  ["BAB3",0x7199],
+  ["BAB4",0x717D],
+  ["BAB5",0x718A],
+  ["BAB6",0x7184],
+  ["BAB7",0x7192],
+  ["BAB8",0x723E],
+  ["BAB9",0x7292],
+  ["BABA",0x7296],
+  ["BABB",0x7344],
+  ["BABC",0x7350],
+  ["BABD",0x7464],
+  ["BABE",0x7463],
+  ["BABF",0x746A],
+  ["BAC0",0x7470],
+  ["BAC1",0x746D],
+  ["BAC2",0x7504],
+  ["BAC3",0x7591],
+  ["BAC4",0x7627],
+  ["BAC5",0x760D],
+  ["BAC6",0x760B],
+  ["BAC7",0x7609],
+  ["BAC8",0x7613],
+  ["BAC9",0x76E1],
+  ["BACA",0x76E3],
+  ["BACB",0x7784],
+  ["BACC",0x777D],
+  ["BACD",0x777F],
+  ["BACE",0x7761],
+  ["BACF",0x78C1],
+  ["BAD0",0x789F],
+  ["BAD1",0x78A7],
+  ["BAD2",0x78B3],
+  ["BAD3",0x78A9],
+  ["BAD4",0x78A3],
+  ["BAD5",0x798E],
+  ["BAD6",0x798F],
+  ["BAD7",0x798D],
+  ["BAD8",0x7A2E],
+  ["BAD9",0x7A31],
+  ["BADA",0x7AAA],
+  ["BADB",0x7AA9],
+  ["BADC",0x7AED],
+  ["BADD",0x7AEF],
+  ["BADE",0x7BA1],
+  ["BADF",0x7B95],
+  ["BAE0",0x7B8B],
+  ["BAE1",0x7B75],
+  ["BAE2",0x7B97],
+  ["BAE3",0x7B9D],
+  ["BAE4",0x7B94],
+  ["BAE5",0x7B8F],
+  ["BAE6",0x7BB8],
+  ["BAE7",0x7B87],
+  ["BAE8",0x7B84],
+  ["BAE9",0x7CB9],
+  ["BAEA",0x7CBD],
+  ["BAEB",0x7CBE],
+  ["BAEC",0x7DBB],
+  ["BAED",0x7DB0],
+  ["BAEE",0x7D9C],
+  ["BAEF",0x7DBD],
+  ["BAF0",0x7DBE],
+  ["BAF1",0x7DA0],
+  ["BAF2",0x7DCA],
+  ["BAF3",0x7DB4],
+  ["BAF4",0x7DB2],
+  ["BAF5",0x7DB1],
+  ["BAF6",0x7DBA],
+  ["BAF7",0x7DA2],
+  ["BAF8",0x7DBF],
+  ["BAF9",0x7DB5],
+  ["BAFA",0x7DB8],
+  ["BAFB",0x7DAD],
+  ["BAFC",0x7DD2],
+  ["BAFD",0x7DC7],
+  ["BAFE",0x7DAC],
+  ["BB40",0x7F70],
+  ["BB41",0x7FE0],
+  ["BB42",0x7FE1],
+  ["BB43",0x7FDF],
+  ["BB44",0x805E],
+  ["BB45",0x805A],
+  ["BB46",0x8087],
+  ["BB47",0x8150],
+  ["BB48",0x8180],
+  ["BB49",0x818F],
+  ["BB4A",0x8188],
+  ["BB4B",0x818A],
+  ["BB4C",0x817F],
+  ["BB4D",0x8182],
+  ["BB4E",0x81E7],
+  ["BB4F",0x81FA],
+  ["BB50",0x8207],
+  ["BB51",0x8214],
+  ["BB52",0x821E],
+  ["BB53",0x824B],
+  ["BB54",0x84C9],
+  ["BB55",0x84BF],
+  ["BB56",0x84C6],
+  ["BB57",0x84C4],
+  ["BB58",0x8499],
+  ["BB59",0x849E],
+  ["BB5A",0x84B2],
+  ["BB5B",0x849C],
+  ["BB5C",0x84CB],
+  ["BB5D",0x84B8],
+  ["BB5E",0x84C0],
+  ["BB5F",0x84D3],
+  ["BB60",0x8490],
+  ["BB61",0x84BC],
+  ["BB62",0x84D1],
+  ["BB63",0x84CA],
+  ["BB64",0x873F],
+  ["BB65",0x871C],
+  ["BB66",0x873B],
+  ["BB67",0x8722],
+  ["BB68",0x8725],
+  ["BB69",0x8734],
+  ["BB6A",0x8718],
+  ["BB6B",0x8755],
+  ["BB6C",0x8737],
+  ["BB6D",0x8729],
+  ["BB6E",0x88F3],
+  ["BB6F",0x8902],
+  ["BB70",0x88F4],
+  ["BB71",0x88F9],
+  ["BB72",0x88F8],
+  ["BB73",0x88FD],
+  ["BB74",0x88E8],
+  ["BB75",0x891A],
+  ["BB76",0x88EF],
+  ["BB77",0x8AA6],
+  ["BB78",0x8A8C],
+  ["BB79",0x8A9E],
+  ["BB7A",0x8AA3],
+  ["BB7B",0x8A8D],
+  ["BB7C",0x8AA1],
+  ["BB7D",0x8A93],
+  ["BB7E",0x8AA4],
+  ["BBA1",0x8AAA],
+  ["BBA2",0x8AA5],
+  ["BBA3",0x8AA8],
+  ["BBA4",0x8A98],
+  ["BBA5",0x8A91],
+  ["BBA6",0x8A9A],
+  ["BBA7",0x8AA7],
+  ["BBA8",0x8C6A],
+  ["BBA9",0x8C8D],
+  ["BBAA",0x8C8C],
+  ["BBAB",0x8CD3],
+  ["BBAC",0x8CD1],
+  ["BBAD",0x8CD2],
+  ["BBAE",0x8D6B],
+  ["BBAF",0x8D99],
+  ["BBB0",0x8D95],
+  ["BBB1",0x8DFC],
+  ["BBB2",0x8F14],
+  ["BBB3",0x8F12],
+  ["BBB4",0x8F15],
+  ["BBB5",0x8F13],
+  ["BBB6",0x8FA3],
+  ["BBB7",0x9060],
+  ["BBB8",0x9058],
+  ["BBB9",0x905C],
+  ["BBBA",0x9063],
+  ["BBBB",0x9059],
+  ["BBBC",0x905E],
+  ["BBBD",0x9062],
+  ["BBBE",0x905D],
+  ["BBBF",0x905B],
+  ["BBC0",0x9119],
+  ["BBC1",0x9118],
+  ["BBC2",0x911E],
+  ["BBC3",0x9175],
+  ["BBC4",0x9178],
+  ["BBC5",0x9177],
+  ["BBC6",0x9174],
+  ["BBC7",0x9278],
+  ["BBC8",0x9280],
+  ["BBC9",0x9285],
+  ["BBCA",0x9298],
+  ["BBCB",0x9296],
+  ["BBCC",0x927B],
+  ["BBCD",0x9293],
+  ["BBCE",0x929C],
+  ["BBCF",0x92A8],
+  ["BBD0",0x927C],
+  ["BBD1",0x9291],
+  ["BBD2",0x95A1],
+  ["BBD3",0x95A8],
+  ["BBD4",0x95A9],
+  ["BBD5",0x95A3],
+  ["BBD6",0x95A5],
+  ["BBD7",0x95A4],
+  ["BBD8",0x9699],
+  ["BBD9",0x969C],
+  ["BBDA",0x969B],
+  ["BBDB",0x96CC],
+  ["BBDC",0x96D2],
+  ["BBDD",0x9700],
+  ["BBDE",0x977C],
+  ["BBDF",0x9785],
+  ["BBE0",0x97F6],
+  ["BBE1",0x9817],
+  ["BBE2",0x9818],
+  ["BBE3",0x98AF],
+  ["BBE4",0x98B1],
+  ["BBE5",0x9903],
+  ["BBE6",0x9905],
+  ["BBE7",0x990C],
+  ["BBE8",0x9909],
+  ["BBE9",0x99C1],
+  ["BBEA",0x9AAF],
+  ["BBEB",0x9AB0],
+  ["BBEC",0x9AE6],
+  ["BBED",0x9B41],
+  ["BBEE",0x9B42],
+  ["BBEF",0x9CF4],
+  ["BBF0",0x9CF6],
+  ["BBF1",0x9CF3],
+  ["BBF2",0x9EBC],
+  ["BBF3",0x9F3B],
+  ["BBF4",0x9F4A],
+  ["BBF5",0x5104],
+  ["BBF6",0x5100],
+  ["BBF7",0x50FB],
+  ["BBF8",0x50F5],
+  ["BBF9",0x50F9],
+  ["BBFA",0x5102],
+  ["BBFB",0x5108],
+  ["BBFC",0x5109],
+  ["BBFD",0x5105],
+  ["BBFE",0x51DC],
+  ["BC40",0x5287],
+  ["BC41",0x5288],
+  ["BC42",0x5289],
+  ["BC43",0x528D],
+  ["BC44",0x528A],
+  ["BC45",0x52F0],
+  ["BC46",0x53B2],
+  ["BC47",0x562E],
+  ["BC48",0x563B],
+  ["BC49",0x5639],
+  ["BC4A",0x5632],
+  ["BC4B",0x563F],
+  ["BC4C",0x5634],
+  ["BC4D",0x5629],
+  ["BC4E",0x5653],
+  ["BC4F",0x564E],
+  ["BC50",0x5657],
+  ["BC51",0x5674],
+  ["BC52",0x5636],
+  ["BC53",0x562F],
+  ["BC54",0x5630],
+  ["BC55",0x5880],
+  ["BC56",0x589F],
+  ["BC57",0x589E],
+  ["BC58",0x58B3],
+  ["BC59",0x589C],
+  ["BC5A",0x58AE],
+  ["BC5B",0x58A9],
+  ["BC5C",0x58A6],
+  ["BC5D",0x596D],
+  ["BC5E",0x5B09],
+  ["BC5F",0x5AFB],
+  ["BC60",0x5B0B],
+  ["BC61",0x5AF5],
+  ["BC62",0x5B0C],
+  ["BC63",0x5B08],
+  ["BC64",0x5BEE],
+  ["BC65",0x5BEC],
+  ["BC66",0x5BE9],
+  ["BC67",0x5BEB],
+  ["BC68",0x5C64],
+  ["BC69",0x5C65],
+  ["BC6A",0x5D9D],
+  ["BC6B",0x5D94],
+  ["BC6C",0x5E62],
+  ["BC6D",0x5E5F],
+  ["BC6E",0x5E61],
+  ["BC6F",0x5EE2],
+  ["BC70",0x5EDA],
+  ["BC71",0x5EDF],
+  ["BC72",0x5EDD],
+  ["BC73",0x5EE3],
+  ["BC74",0x5EE0],
+  ["BC75",0x5F48],
+  ["BC76",0x5F71],
+  ["BC77",0x5FB7],
+  ["BC78",0x5FB5],
+  ["BC79",0x6176],
+  ["BC7A",0x6167],
+  ["BC7B",0x616E],
+  ["BC7C",0x615D],
+  ["BC7D",0x6155],
+  ["BC7E",0x6182],
+  ["BCA1",0x617C],
+  ["BCA2",0x6170],
+  ["BCA3",0x616B],
+  ["BCA4",0x617E],
+  ["BCA5",0x61A7],
+  ["BCA6",0x6190],
+  ["BCA7",0x61AB],
+  ["BCA8",0x618E],
+  ["BCA9",0x61AC],
+  ["BCAA",0x619A],
+  ["BCAB",0x61A4],
+  ["BCAC",0x6194],
+  ["BCAD",0x61AE],
+  ["BCAE",0x622E],
+  ["BCAF",0x6469],
+  ["BCB0",0x646F],
+  ["BCB1",0x6479],
+  ["BCB2",0x649E],
+  ["BCB3",0x64B2],
+  ["BCB4",0x6488],
+  ["BCB5",0x6490],
+  ["BCB6",0x64B0],
+  ["BCB7",0x64A5],
+  ["BCB8",0x6493],
+  ["BCB9",0x6495],
+  ["BCBA",0x64A9],
+  ["BCBB",0x6492],
+  ["BCBC",0x64AE],
+  ["BCBD",0x64AD],
+  ["BCBE",0x64AB],
+  ["BCBF",0x649A],
+  ["BCC0",0x64AC],
+  ["BCC1",0x6499],
+  ["BCC2",0x64A2],
+  ["BCC3",0x64B3],
+  ["BCC4",0x6575],
+  ["BCC5",0x6577],
+  ["BCC6",0x6578],
+  ["BCC7",0x66AE],
+  ["BCC8",0x66AB],
+  ["BCC9",0x66B4],
+  ["BCCA",0x66B1],
+  ["BCCB",0x6A23],
+  ["BCCC",0x6A1F],
+  ["BCCD",0x69E8],
+  ["BCCE",0x6A01],
+  ["BCCF",0x6A1E],
+  ["BCD0",0x6A19],
+  ["BCD1",0x69FD],
+  ["BCD2",0x6A21],
+  ["BCD3",0x6A13],
+  ["BCD4",0x6A0A],
+  ["BCD5",0x69F3],
+  ["BCD6",0x6A02],
+  ["BCD7",0x6A05],
+  ["BCD8",0x69ED],
+  ["BCD9",0x6A11],
+  ["BCDA",0x6B50],
+  ["BCDB",0x6B4E],
+  ["BCDC",0x6BA4],
+  ["BCDD",0x6BC5],
+  ["BCDE",0x6BC6],
+  ["BCDF",0x6F3F],
+  ["BCE0",0x6F7C],
+  ["BCE1",0x6F84],
+  ["BCE2",0x6F51],
+  ["BCE3",0x6F66],
+  ["BCE4",0x6F54],
+  ["BCE5",0x6F86],
+  ["BCE6",0x6F6D],
+  ["BCE7",0x6F5B],
+  ["BCE8",0x6F78],
+  ["BCE9",0x6F6E],
+  ["BCEA",0x6F8E],
+  ["BCEB",0x6F7A],
+  ["BCEC",0x6F70],
+  ["BCED",0x6F64],
+  ["BCEE",0x6F97],
+  ["BCEF",0x6F58],
+  ["BCF0",0x6ED5],
+  ["BCF1",0x6F6F],
+  ["BCF2",0x6F60],
+  ["BCF3",0x6F5F],
+  ["BCF4",0x719F],
+  ["BCF5",0x71AC],
+  ["BCF6",0x71B1],
+  ["BCF7",0x71A8],
+  ["BCF8",0x7256],
+  ["BCF9",0x729B],
+  ["BCFA",0x734E],
+  ["BCFB",0x7357],
+  ["BCFC",0x7469],
+  ["BCFD",0x748B],
+  ["BCFE",0x7483],
+  ["BD40",0x747E],
+  ["BD41",0x7480],
+  ["BD42",0x757F],
+  ["BD43",0x7620],
+  ["BD44",0x7629],
+  ["BD45",0x761F],
+  ["BD46",0x7624],
+  ["BD47",0x7626],
+  ["BD48",0x7621],
+  ["BD49",0x7622],
+  ["BD4A",0x769A],
+  ["BD4B",0x76BA],
+  ["BD4C",0x76E4],
+  ["BD4D",0x778E],
+  ["BD4E",0x7787],
+  ["BD4F",0x778C],
+  ["BD50",0x7791],
+  ["BD51",0x778B],
+  ["BD52",0x78CB],
+  ["BD53",0x78C5],
+  ["BD54",0x78BA],
+  ["BD55",0x78CA],
+  ["BD56",0x78BE],
+  ["BD57",0x78D5],
+  ["BD58",0x78BC],
+  ["BD59",0x78D0],
+  ["BD5A",0x7A3F],
+  ["BD5B",0x7A3C],
+  ["BD5C",0x7A40],
+  ["BD5D",0x7A3D],
+  ["BD5E",0x7A37],
+  ["BD5F",0x7A3B],
+  ["BD60",0x7AAF],
+  ["BD61",0x7AAE],
+  ["BD62",0x7BAD],
+  ["BD63",0x7BB1],
+  ["BD64",0x7BC4],
+  ["BD65",0x7BB4],
+  ["BD66",0x7BC6],
+  ["BD67",0x7BC7],
+  ["BD68",0x7BC1],
+  ["BD69",0x7BA0],
+  ["BD6A",0x7BCC],
+  ["BD6B",0x7CCA],
+  ["BD6C",0x7DE0],
+  ["BD6D",0x7DF4],
+  ["BD6E",0x7DEF],
+  ["BD6F",0x7DFB],
+  ["BD70",0x7DD8],
+  ["BD71",0x7DEC],
+  ["BD72",0x7DDD],
+  ["BD73",0x7DE8],
+  ["BD74",0x7DE3],
+  ["BD75",0x7DDA],
+  ["BD76",0x7DDE],
+  ["BD77",0x7DE9],
+  ["BD78",0x7D9E],
+  ["BD79",0x7DD9],
+  ["BD7A",0x7DF2],
+  ["BD7B",0x7DF9],
+  ["BD7C",0x7F75],
+  ["BD7D",0x7F77],
+  ["BD7E",0x7FAF],
+  ["BDA1",0x7FE9],
+  ["BDA2",0x8026],
+  ["BDA3",0x819B],
+  ["BDA4",0x819C],
+  ["BDA5",0x819D],
+  ["BDA6",0x81A0],
+  ["BDA7",0x819A],
+  ["BDA8",0x8198],
+  ["BDA9",0x8517],
+  ["BDAA",0x853D],
+  ["BDAB",0x851A],
+  ["BDAC",0x84EE],
+  ["BDAD",0x852C],
+  ["BDAE",0x852D],
+  ["BDAF",0x8513],
+  ["BDB0",0x8511],
+  ["BDB1",0x8523],
+  ["BDB2",0x8521],
+  ["BDB3",0x8514],
+  ["BDB4",0x84EC],
+  ["BDB5",0x8525],
+  ["BDB6",0x84FF],
+  ["BDB7",0x8506],
+  ["BDB8",0x8782],
+  ["BDB9",0x8774],
+  ["BDBA",0x8776],
+  ["BDBB",0x8760],
+  ["BDBC",0x8766],
+  ["BDBD",0x8778],
+  ["BDBE",0x8768],
+  ["BDBF",0x8759],
+  ["BDC0",0x8757],
+  ["BDC1",0x874C],
+  ["BDC2",0x8753],
+  ["BDC3",0x885B],
+  ["BDC4",0x885D],
+  ["BDC5",0x8910],
+  ["BDC6",0x8907],
+  ["BDC7",0x8912],
+  ["BDC8",0x8913],
+  ["BDC9",0x8915],
+  ["BDCA",0x890A],
+  ["BDCB",0x8ABC],
+  ["BDCC",0x8AD2],
+  ["BDCD",0x8AC7],
+  ["BDCE",0x8AC4],
+  ["BDCF",0x8A95],
+  ["BDD0",0x8ACB],
+  ["BDD1",0x8AF8],
+  ["BDD2",0x8AB2],
+  ["BDD3",0x8AC9],
+  ["BDD4",0x8AC2],
+  ["BDD5",0x8ABF],
+  ["BDD6",0x8AB0],
+  ["BDD7",0x8AD6],
+  ["BDD8",0x8ACD],
+  ["BDD9",0x8AB6],
+  ["BDDA",0x8AB9],
+  ["BDDB",0x8ADB],
+  ["BDDC",0x8C4C],
+  ["BDDD",0x8C4E],
+  ["BDDE",0x8C6C],
+  ["BDDF",0x8CE0],
+  ["BDE0",0x8CDE],
+  ["BDE1",0x8CE6],
+  ["BDE2",0x8CE4],
+  ["BDE3",0x8CEC],
+  ["BDE4",0x8CED],
+  ["BDE5",0x8CE2],
+  ["BDE6",0x8CE3],
+  ["BDE7",0x8CDC],
+  ["BDE8",0x8CEA],
+  ["BDE9",0x8CE1],
+  ["BDEA",0x8D6D],
+  ["BDEB",0x8D9F],
+  ["BDEC",0x8DA3],
+  ["BDED",0x8E2B],
+  ["BDEE",0x8E10],
+  ["BDEF",0x8E1D],
+  ["BDF0",0x8E22],
+  ["BDF1",0x8E0F],
+  ["BDF2",0x8E29],
+  ["BDF3",0x8E1F],
+  ["BDF4",0x8E21],
+  ["BDF5",0x8E1E],
+  ["BDF6",0x8EBA],
+  ["BDF7",0x8F1D],
+  ["BDF8",0x8F1B],
+  ["BDF9",0x8F1F],
+  ["BDFA",0x8F29],
+  ["BDFB",0x8F26],
+  ["BDFC",0x8F2A],
+  ["BDFD",0x8F1C],
+  ["BDFE",0x8F1E],
+  ["BE40",0x8F25],
+  ["BE41",0x9069],
+  ["BE42",0x906E],
+  ["BE43",0x9068],
+  ["BE44",0x906D],
+  ["BE45",0x9077],
+  ["BE46",0x9130],
+  ["BE47",0x912D],
+  ["BE48",0x9127],
+  ["BE49",0x9131],
+  ["BE4A",0x9187],
+  ["BE4B",0x9189],
+  ["BE4C",0x918B],
+  ["BE4D",0x9183],
+  ["BE4E",0x92C5],
+  ["BE4F",0x92BB],
+  ["BE50",0x92B7],
+  ["BE51",0x92EA],
+  ["BE52",0x92AC],
+  ["BE53",0x92E4],
+  ["BE54",0x92C1],
+  ["BE55",0x92B3],
+  ["BE56",0x92BC],
+  ["BE57",0x92D2],
+  ["BE58",0x92C7],
+  ["BE59",0x92F0],
+  ["BE5A",0x92B2],
+  ["BE5B",0x95AD],
+  ["BE5C",0x95B1],
+  ["BE5D",0x9704],
+  ["BE5E",0x9706],
+  ["BE5F",0x9707],
+  ["BE60",0x9709],
+  ["BE61",0x9760],
+  ["BE62",0x978D],
+  ["BE63",0x978B],
+  ["BE64",0x978F],
+  ["BE65",0x9821],
+  ["BE66",0x982B],
+  ["BE67",0x981C],
+  ["BE68",0x98B3],
+  ["BE69",0x990A],
+  ["BE6A",0x9913],
+  ["BE6B",0x9912],
+  ["BE6C",0x9918],
+  ["BE6D",0x99DD],
+  ["BE6E",0x99D0],
+  ["BE6F",0x99DF],
+  ["BE70",0x99DB],
+  ["BE71",0x99D1],
+  ["BE72",0x99D5],
+  ["BE73",0x99D2],
+  ["BE74",0x99D9],
+  ["BE75",0x9AB7],
+  ["BE76",0x9AEE],
+  ["BE77",0x9AEF],
+  ["BE78",0x9B27],
+  ["BE79",0x9B45],
+  ["BE7A",0x9B44],
+  ["BE7B",0x9B77],
+  ["BE7C",0x9B6F],
+  ["BE7D",0x9D06],
+  ["BE7E",0x9D09],
+  ["BEA1",0x9D03],
+  ["BEA2",0x9EA9],
+  ["BEA3",0x9EBE],
+  ["BEA4",0x9ECE],
+  ["BEA5",0x58A8],
+  ["BEA6",0x9F52],
+  ["BEA7",0x5112],
+  ["BEA8",0x5118],
+  ["BEA9",0x5114],
+  ["BEAA",0x5110],
+  ["BEAB",0x5115],
+  ["BEAC",0x5180],
+  ["BEAD",0x51AA],
+  ["BEAE",0x51DD],
+  ["BEAF",0x5291],
+  ["BEB0",0x5293],
+  ["BEB1",0x52F3],
+  ["BEB2",0x5659],
+  ["BEB3",0x566B],
+  ["BEB4",0x5679],
+  ["BEB5",0x5669],
+  ["BEB6",0x5664],
+  ["BEB7",0x5678],
+  ["BEB8",0x566A],
+  ["BEB9",0x5668],
+  ["BEBA",0x5665],
+  ["BEBB",0x5671],
+  ["BEBC",0x566F],
+  ["BEBD",0x566C],
+  ["BEBE",0x5662],
+  ["BEBF",0x5676],
+  ["BEC0",0x58C1],
+  ["BEC1",0x58BE],
+  ["BEC2",0x58C7],
+  ["BEC3",0x58C5],
+  ["BEC4",0x596E],
+  ["BEC5",0x5B1D],
+  ["BEC6",0x5B34],
+  ["BEC7",0x5B78],
+  ["BEC8",0x5BF0],
+  ["BEC9",0x5C0E],
+  ["BECA",0x5F4A],
+  ["BECB",0x61B2],
+  ["BECC",0x6191],
+  ["BECD",0x61A9],
+  ["BECE",0x618A],
+  ["BECF",0x61CD],
+  ["BED0",0x61B6],
+  ["BED1",0x61BE],
+  ["BED2",0x61CA],
+  ["BED3",0x61C8],
+  ["BED4",0x6230],
+  ["BED5",0x64C5],
+  ["BED6",0x64C1],
+  ["BED7",0x64CB],
+  ["BED8",0x64BB],
+  ["BED9",0x64BC],
+  ["BEDA",0x64DA],
+  ["BEDB",0x64C4],
+  ["BEDC",0x64C7],
+  ["BEDD",0x64C2],
+  ["BEDE",0x64CD],
+  ["BEDF",0x64BF],
+  ["BEE0",0x64D2],
+  ["BEE1",0x64D4],
+  ["BEE2",0x64BE],
+  ["BEE3",0x6574],
+  ["BEE4",0x66C6],
+  ["BEE5",0x66C9],
+  ["BEE6",0x66B9],
+  ["BEE7",0x66C4],
+  ["BEE8",0x66C7],
+  ["BEE9",0x66B8],
+  ["BEEA",0x6A3D],
+  ["BEEB",0x6A38],
+  ["BEEC",0x6A3A],
+  ["BEED",0x6A59],
+  ["BEEE",0x6A6B],
+  ["BEEF",0x6A58],
+  ["BEF0",0x6A39],
+  ["BEF1",0x6A44],
+  ["BEF2",0x6A62],
+  ["BEF3",0x6A61],
+  ["BEF4",0x6A4B],
+  ["BEF5",0x6A47],
+  ["BEF6",0x6A35],
+  ["BEF7",0x6A5F],
+  ["BEF8",0x6A48],
+  ["BEF9",0x6B59],
+  ["BEFA",0x6B77],
+  ["BEFB",0x6C05],
+  ["BEFC",0x6FC2],
+  ["BEFD",0x6FB1],
+  ["BEFE",0x6FA1],
+  ["BF40",0x6FC3],
+  ["BF41",0x6FA4],
+  ["BF42",0x6FC1],
+  ["BF43",0x6FA7],
+  ["BF44",0x6FB3],
+  ["BF45",0x6FC0],
+  ["BF46",0x6FB9],
+  ["BF47",0x6FB6],
+  ["BF48",0x6FA6],
+  ["BF49",0x6FA0],
+  ["BF4A",0x6FB4],
+  ["BF4B",0x71BE],
+  ["BF4C",0x71C9],
+  ["BF4D",0x71D0],
+  ["BF4E",0x71D2],
+  ["BF4F",0x71C8],
+  ["BF50",0x71D5],
+  ["BF51",0x71B9],
+  ["BF52",0x71CE],
+  ["BF53",0x71D9],
+  ["BF54",0x71DC],
+  ["BF55",0x71C3],
+  ["BF56",0x71C4],
+  ["BF57",0x7368],
+  ["BF58",0x749C],
+  ["BF59",0x74A3],
+  ["BF5A",0x7498],
+  ["BF5B",0x749F],
+  ["BF5C",0x749E],
+  ["BF5D",0x74E2],
+  ["BF5E",0x750C],
+  ["BF5F",0x750D],
+  ["BF60",0x7634],
+  ["BF61",0x7638],
+  ["BF62",0x763A],
+  ["BF63",0x76E7],
+  ["BF64",0x76E5],
+  ["BF65",0x77A0],
+  ["BF66",0x779E],
+  ["BF67",0x779F],
+  ["BF68",0x77A5],
+  ["BF69",0x78E8],
+  ["BF6A",0x78DA],
+  ["BF6B",0x78EC],
+  ["BF6C",0x78E7],
+  ["BF6D",0x79A6],
+  ["BF6E",0x7A4D],
+  ["BF6F",0x7A4E],
+  ["BF70",0x7A46],
+  ["BF71",0x7A4C],
+  ["BF72",0x7A4B],
+  ["BF73",0x7ABA],
+  ["BF74",0x7BD9],
+  ["BF75",0x7C11],
+  ["BF76",0x7BC9],
+  ["BF77",0x7BE4],
+  ["BF78",0x7BDB],
+  ["BF79",0x7BE1],
+  ["BF7A",0x7BE9],
+  ["BF7B",0x7BE6],
+  ["BF7C",0x7CD5],
+  ["BF7D",0x7CD6],
+  ["BF7E",0x7E0A],
+  ["BFA1",0x7E11],
+  ["BFA2",0x7E08],
+  ["BFA3",0x7E1B],
+  ["BFA4",0x7E23],
+  ["BFA5",0x7E1E],
+  ["BFA6",0x7E1D],
+  ["BFA7",0x7E09],
+  ["BFA8",0x7E10],
+  ["BFA9",0x7F79],
+  ["BFAA",0x7FB2],
+  ["BFAB",0x7FF0],
+  ["BFAC",0x7FF1],
+  ["BFAD",0x7FEE],
+  ["BFAE",0x8028],
+  ["BFAF",0x81B3],
+  ["BFB0",0x81A9],
+  ["BFB1",0x81A8],
+  ["BFB2",0x81FB],
+  ["BFB3",0x8208],
+  ["BFB4",0x8258],
+  ["BFB5",0x8259],
+  ["BFB6",0x854A],
+  ["BFB7",0x8559],
+  ["BFB8",0x8548],
+  ["BFB9",0x8568],
+  ["BFBA",0x8569],
+  ["BFBB",0x8543],
+  ["BFBC",0x8549],
+  ["BFBD",0x856D],
+  ["BFBE",0x856A],
+  ["BFBF",0x855E],
+  ["BFC0",0x8783],
+  ["BFC1",0x879F],
+  ["BFC2",0x879E],
+  ["BFC3",0x87A2],
+  ["BFC4",0x878D],
+  ["BFC5",0x8861],
+  ["BFC6",0x892A],
+  ["BFC7",0x8932],
+  ["BFC8",0x8925],
+  ["BFC9",0x892B],
+  ["BFCA",0x8921],
+  ["BFCB",0x89AA],
+  ["BFCC",0x89A6],
+  ["BFCD",0x8AE6],
+  ["BFCE",0x8AFA],
+  ["BFCF",0x8AEB],
+  ["BFD0",0x8AF1],
+  ["BFD1",0x8B00],
+  ["BFD2",0x8ADC],
+  ["BFD3",0x8AE7],
+  ["BFD4",0x8AEE],
+  ["BFD5",0x8AFE],
+  ["BFD6",0x8B01],
+  ["BFD7",0x8B02],
+  ["BFD8",0x8AF7],
+  ["BFD9",0x8AED],
+  ["BFDA",0x8AF3],
+  ["BFDB",0x8AF6],
+  ["BFDC",0x8AFC],
+  ["BFDD",0x8C6B],
+  ["BFDE",0x8C6D],
+  ["BFDF",0x8C93],
+  ["BFE0",0x8CF4],
+  ["BFE1",0x8E44],
+  ["BFE2",0x8E31],
+  ["BFE3",0x8E34],
+  ["BFE4",0x8E42],
+  ["BFE5",0x8E39],
+  ["BFE6",0x8E35],
+  ["BFE7",0x8F3B],
+  ["BFE8",0x8F2F],
+  ["BFE9",0x8F38],
+  ["BFEA",0x8F33],
+  ["BFEB",0x8FA8],
+  ["BFEC",0x8FA6],
+  ["BFED",0x9075],
+  ["BFEE",0x9074],
+  ["BFEF",0x9078],
+  ["BFF0",0x9072],
+  ["BFF1",0x907C],
+  ["BFF2",0x907A],
+  ["BFF3",0x9134],
+  ["BFF4",0x9192],
+  ["BFF5",0x9320],
+  ["BFF6",0x9336],
+  ["BFF7",0x92F8],
+  ["BFF8",0x9333],
+  ["BFF9",0x932F],
+  ["BFFA",0x9322],
+  ["BFFB",0x92FC],
+  ["BFFC",0x932B],
+  ["BFFD",0x9304],
+  ["BFFE",0x931A],
+  ["C040",0x9310],
+  ["C041",0x9326],
+  ["C042",0x9321],
+  ["C043",0x9315],
+  ["C044",0x932E],
+  ["C045",0x9319],
+  ["C046",0x95BB],
+  ["C047",0x96A7],
+  ["C048",0x96A8],
+  ["C049",0x96AA],
+  ["C04A",0x96D5],
+  ["C04B",0x970E],
+  ["C04C",0x9711],
+  ["C04D",0x9716],
+  ["C04E",0x970D],
+  ["C04F",0x9713],
+  ["C050",0x970F],
+  ["C051",0x975B],
+  ["C052",0x975C],
+  ["C053",0x9766],
+  ["C054",0x9798],
+  ["C055",0x9830],
+  ["C056",0x9838],
+  ["C057",0x983B],
+  ["C058",0x9837],
+  ["C059",0x982D],
+  ["C05A",0x9839],
+  ["C05B",0x9824],
+  ["C05C",0x9910],
+  ["C05D",0x9928],
+  ["C05E",0x991E],
+  ["C05F",0x991B],
+  ["C060",0x9921],
+  ["C061",0x991A],
+  ["C062",0x99ED],
+  ["C063",0x99E2],
+  ["C064",0x99F1],
+  ["C065",0x9AB8],
+  ["C066",0x9ABC],
+  ["C067",0x9AFB],
+  ["C068",0x9AED],
+  ["C069",0x9B28],
+  ["C06A",0x9B91],
+  ["C06B",0x9D15],
+  ["C06C",0x9D23],
+  ["C06D",0x9D26],
+  ["C06E",0x9D28],
+  ["C06F",0x9D12],
+  ["C070",0x9D1B],
+  ["C071",0x9ED8],
+  ["C072",0x9ED4],
+  ["C073",0x9F8D],
+  ["C074",0x9F9C],
+  ["C075",0x512A],
+  ["C076",0x511F],
+  ["C077",0x5121],
+  ["C078",0x5132],
+  ["C079",0x52F5],
+  ["C07A",0x568E],
+  ["C07B",0x5680],
+  ["C07C",0x5690],
+  ["C07D",0x5685],
+  ["C07E",0x5687],
+  ["C0A1",0x568F],
+  ["C0A2",0x58D5],
+  ["C0A3",0x58D3],
+  ["C0A4",0x58D1],
+  ["C0A5",0x58CE],
+  ["C0A6",0x5B30],
+  ["C0A7",0x5B2A],
+  ["C0A8",0x5B24],
+  ["C0A9",0x5B7A],
+  ["C0AA",0x5C37],
+  ["C0AB",0x5C68],
+  ["C0AC",0x5DBC],
+  ["C0AD",0x5DBA],
+  ["C0AE",0x5DBD],
+  ["C0AF",0x5DB8],
+  ["C0B0",0x5E6B],
+  ["C0B1",0x5F4C],
+  ["C0B2",0x5FBD],
+  ["C0B3",0x61C9],
+  ["C0B4",0x61C2],
+  ["C0B5",0x61C7],
+  ["C0B6",0x61E6],
+  ["C0B7",0x61CB],
+  ["C0B8",0x6232],
+  ["C0B9",0x6234],
+  ["C0BA",0x64CE],
+  ["C0BB",0x64CA],
+  ["C0BC",0x64D8],
+  ["C0BD",0x64E0],
+  ["C0BE",0x64F0],
+  ["C0BF",0x64E6],
+  ["C0C0",0x64EC],
+  ["C0C1",0x64F1],
+  ["C0C2",0x64E2],
+  ["C0C3",0x64ED],
+  ["C0C4",0x6582],
+  ["C0C5",0x6583],
+  ["C0C6",0x66D9],
+  ["C0C7",0x66D6],
+  ["C0C8",0x6A80],
+  ["C0C9",0x6A94],
+  ["C0CA",0x6A84],
+  ["C0CB",0x6AA2],
+  ["C0CC",0x6A9C],
+  ["C0CD",0x6ADB],
+  ["C0CE",0x6AA3],
+  ["C0CF",0x6A7E],
+  ["C0D0",0x6A97],
+  ["C0D1",0x6A90],
+  ["C0D2",0x6AA0],
+  ["C0D3",0x6B5C],
+  ["C0D4",0x6BAE],
+  ["C0D5",0x6BDA],
+  ["C0D6",0x6C08],
+  ["C0D7",0x6FD8],
+  ["C0D8",0x6FF1],
+  ["C0D9",0x6FDF],
+  ["C0DA",0x6FE0],
+  ["C0DB",0x6FDB],
+  ["C0DC",0x6FE4],
+  ["C0DD",0x6FEB],
+  ["C0DE",0x6FEF],
+  ["C0DF",0x6F80],
+  ["C0E0",0x6FEC],
+  ["C0E1",0x6FE1],
+  ["C0E2",0x6FE9],
+  ["C0E3",0x6FD5],
+  ["C0E4",0x6FEE],
+  ["C0E5",0x6FF0],
+  ["C0E6",0x71E7],
+  ["C0E7",0x71DF],
+  ["C0E8",0x71EE],
+  ["C0E9",0x71E6],
+  ["C0EA",0x71E5],
+  ["C0EB",0x71ED],
+  ["C0EC",0x71EC],
+  ["C0ED",0x71F4],
+  ["C0EE",0x71E0],
+  ["C0EF",0x7235],
+  ["C0F0",0x7246],
+  ["C0F1",0x7370],
+  ["C0F2",0x7372],
+  ["C0F3",0x74A9],
+  ["C0F4",0x74B0],
+  ["C0F5",0x74A6],
+  ["C0F6",0x74A8],
+  ["C0F7",0x7646],
+  ["C0F8",0x7642],
+  ["C0F9",0x764C],
+  ["C0FA",0x76EA],
+  ["C0FB",0x77B3],
+  ["C0FC",0x77AA],
+  ["C0FD",0x77B0],
+  ["C0FE",0x77AC],
+  ["C140",0x77A7],
+  ["C141",0x77AD],
+  ["C142",0x77EF],
+  ["C143",0x78F7],
+  ["C144",0x78FA],
+  ["C145",0x78F4],
+  ["C146",0x78EF],
+  ["C147",0x7901],
+  ["C148",0x79A7],
+  ["C149",0x79AA],
+  ["C14A",0x7A57],
+  ["C14B",0x7ABF],
+  ["C14C",0x7C07],
+  ["C14D",0x7C0D],
+  ["C14E",0x7BFE],
+  ["C14F",0x7BF7],
+  ["C150",0x7C0C],
+  ["C151",0x7BE0],
+  ["C152",0x7CE0],
+  ["C153",0x7CDC],
+  ["C154",0x7CDE],
+  ["C155",0x7CE2],
+  ["C156",0x7CDF],
+  ["C157",0x7CD9],
+  ["C158",0x7CDD],
+  ["C159",0x7E2E],
+  ["C15A",0x7E3E],
+  ["C15B",0x7E46],
+  ["C15C",0x7E37],
+  ["C15D",0x7E32],
+  ["C15E",0x7E43],
+  ["C15F",0x7E2B],
+  ["C160",0x7E3D],
+  ["C161",0x7E31],
+  ["C162",0x7E45],
+  ["C163",0x7E41],
+  ["C164",0x7E34],
+  ["C165",0x7E39],
+  ["C166",0x7E48],
+  ["C167",0x7E35],
+  ["C168",0x7E3F],
+  ["C169",0x7E2F],
+  ["C16A",0x7F44],
+  ["C16B",0x7FF3],
+  ["C16C",0x7FFC],
+  ["C16D",0x8071],
+  ["C16E",0x8072],
+  ["C16F",0x8070],
+  ["C170",0x806F],
+  ["C171",0x8073],
+  ["C172",0x81C6],
+  ["C173",0x81C3],
+  ["C174",0x81BA],
+  ["C175",0x81C2],
+  ["C176",0x81C0],
+  ["C177",0x81BF],
+  ["C178",0x81BD],
+  ["C179",0x81C9],
+  ["C17A",0x81BE],
+  ["C17B",0x81E8],
+  ["C17C",0x8209],
+  ["C17D",0x8271],
+  ["C17E",0x85AA],
+  ["C1A1",0x8584],
+  ["C1A2",0x857E],
+  ["C1A3",0x859C],
+  ["C1A4",0x8591],
+  ["C1A5",0x8594],
+  ["C1A6",0x85AF],
+  ["C1A7",0x859B],
+  ["C1A8",0x8587],
+  ["C1A9",0x85A8],
+  ["C1AA",0x858A],
+  ["C1AB",0x8667],
+  ["C1AC",0x87C0],
+  ["C1AD",0x87D1],
+  ["C1AE",0x87B3],
+  ["C1AF",0x87D2],
+  ["C1B0",0x87C6],
+  ["C1B1",0x87AB],
+  ["C1B2",0x87BB],
+  ["C1B3",0x87BA],
+  ["C1B4",0x87C8],
+  ["C1B5",0x87CB],
+  ["C1B6",0x893B],
+  ["C1B7",0x8936],
+  ["C1B8",0x8944],
+  ["C1B9",0x8938],
+  ["C1BA",0x893D],
+  ["C1BB",0x89AC],
+  ["C1BC",0x8B0E],
+  ["C1BD",0x8B17],
+  ["C1BE",0x8B19],
+  ["C1BF",0x8B1B],
+  ["C1C0",0x8B0A],
+  ["C1C1",0x8B20],
+  ["C1C2",0x8B1D],
+  ["C1C3",0x8B04],
+  ["C1C4",0x8B10],
+  ["C1C5",0x8C41],
+  ["C1C6",0x8C3F],
+  ["C1C7",0x8C73],
+  ["C1C8",0x8CFA],
+  ["C1C9",0x8CFD],
+  ["C1CA",0x8CFC],
+  ["C1CB",0x8CF8],
+  ["C1CC",0x8CFB],
+  ["C1CD",0x8DA8],
+  ["C1CE",0x8E49],
+  ["C1CF",0x8E4B],
+  ["C1D0",0x8E48],
+  ["C1D1",0x8E4A],
+  ["C1D2",0x8F44],
+  ["C1D3",0x8F3E],
+  ["C1D4",0x8F42],
+  ["C1D5",0x8F45],
+  ["C1D6",0x8F3F],
+  ["C1D7",0x907F],
+  ["C1D8",0x907D],
+  ["C1D9",0x9084],
+  ["C1DA",0x9081],
+  ["C1DB",0x9082],
+  ["C1DC",0x9080],
+  ["C1DD",0x9139],
+  ["C1DE",0x91A3],
+  ["C1DF",0x919E],
+  ["C1E0",0x919C],
+  ["C1E1",0x934D],
+  ["C1E2",0x9382],
+  ["C1E3",0x9328],
+  ["C1E4",0x9375],
+  ["C1E5",0x934A],
+  ["C1E6",0x9365],
+  ["C1E7",0x934B],
+  ["C1E8",0x9318],
+  ["C1E9",0x937E],
+  ["C1EA",0x936C],
+  ["C1EB",0x935B],
+  ["C1EC",0x9370],
+  ["C1ED",0x935A],
+  ["C1EE",0x9354],
+  ["C1EF",0x95CA],
+  ["C1F0",0x95CB],
+  ["C1F1",0x95CC],
+  ["C1F2",0x95C8],
+  ["C1F3",0x95C6],
+  ["C1F4",0x96B1],
+  ["C1F5",0x96B8],
+  ["C1F6",0x96D6],
+  ["C1F7",0x971C],
+  ["C1F8",0x971E],
+  ["C1F9",0x97A0],
+  ["C1FA",0x97D3],
+  ["C1FB",0x9846],
+  ["C1FC",0x98B6],
+  ["C1FD",0x9935],
+  ["C1FE",0x9A01],
+  ["C240",0x99FF],
+  ["C241",0x9BAE],
+  ["C242",0x9BAB],
+  ["C243",0x9BAA],
+  ["C244",0x9BAD],
+  ["C245",0x9D3B],
+  ["C246",0x9D3F],
+  ["C247",0x9E8B],
+  ["C248",0x9ECF],
+  ["C249",0x9EDE],
+  ["C24A",0x9EDC],
+  ["C24B",0x9EDD],
+  ["C24C",0x9EDB],
+  ["C24D",0x9F3E],
+  ["C24E",0x9F4B],
+  ["C24F",0x53E2],
+  ["C250",0x5695],
+  ["C251",0x56AE],
+  ["C252",0x58D9],
+  ["C253",0x58D8],
+  ["C254",0x5B38],
+  ["C255",0x5F5D],
+  ["C256",0x61E3],
+  ["C257",0x6233],
+  ["C258",0x64F4],
+  ["C259",0x64F2],
+  ["C25A",0x64FE],
+  ["C25B",0x6506],
+  ["C25C",0x64FA],
+  ["C25D",0x64FB],
+  ["C25E",0x64F7],
+  ["C25F",0x65B7],
+  ["C260",0x66DC],
+  ["C261",0x6726],
+  ["C262",0x6AB3],
+  ["C263",0x6AAC],
+  ["C264",0x6AC3],
+  ["C265",0x6ABB],
+  ["C266",0x6AB8],
+  ["C267",0x6AC2],
+  ["C268",0x6AAE],
+  ["C269",0x6AAF],
+  ["C26A",0x6B5F],
+  ["C26B",0x6B78],
+  ["C26C",0x6BAF],
+  ["C26D",0x7009],
+  ["C26E",0x700B],
+  ["C26F",0x6FFE],
+  ["C270",0x7006],
+  ["C271",0x6FFA],
+  ["C272",0x7011],
+  ["C273",0x700F],
+  ["C274",0x71FB],
+  ["C275",0x71FC],
+  ["C276",0x71FE],
+  ["C277",0x71F8],
+  ["C278",0x7377],
+  ["C279",0x7375],
+  ["C27A",0x74A7],
+  ["C27B",0x74BF],
+  ["C27C",0x7515],
+  ["C27D",0x7656],
+  ["C27E",0x7658],
+  ["C2A1",0x7652],
+  ["C2A2",0x77BD],
+  ["C2A3",0x77BF],
+  ["C2A4",0x77BB],
+  ["C2A5",0x77BC],
+  ["C2A6",0x790E],
+  ["C2A7",0x79AE],
+  ["C2A8",0x7A61],
+  ["C2A9",0x7A62],
+  ["C2AA",0x7A60],
+  ["C2AB",0x7AC4],
+  ["C2AC",0x7AC5],
+  ["C2AD",0x7C2B],
+  ["C2AE",0x7C27],
+  ["C2AF",0x7C2A],
+  ["C2B0",0x7C1E],
+  ["C2B1",0x7C23],
+  ["C2B2",0x7C21],
+  ["C2B3",0x7CE7],
+  ["C2B4",0x7E54],
+  ["C2B5",0x7E55],
+  ["C2B6",0x7E5E],
+  ["C2B7",0x7E5A],
+  ["C2B8",0x7E61],
+  ["C2B9",0x7E52],
+  ["C2BA",0x7E59],
+  ["C2BB",0x7F48],
+  ["C2BC",0x7FF9],
+  ["C2BD",0x7FFB],
+  ["C2BE",0x8077],
+  ["C2BF",0x8076],
+  ["C2C0",0x81CD],
+  ["C2C1",0x81CF],
+  ["C2C2",0x820A],
+  ["C2C3",0x85CF],
+  ["C2C4",0x85A9],
+  ["C2C5",0x85CD],
+  ["C2C6",0x85D0],
+  ["C2C7",0x85C9],
+  ["C2C8",0x85B0],
+  ["C2C9",0x85BA],
+  ["C2CA",0x85B9],
+  ["C2CB",0x85A6],
+  ["C2CC",0x87EF],
+  ["C2CD",0x87EC],
+  ["C2CE",0x87F2],
+  ["C2CF",0x87E0],
+  ["C2D0",0x8986],
+  ["C2D1",0x89B2],
+  ["C2D2",0x89F4],
+  ["C2D3",0x8B28],
+  ["C2D4",0x8B39],
+  ["C2D5",0x8B2C],
+  ["C2D6",0x8B2B],
+  ["C2D7",0x8C50],
+  ["C2D8",0x8D05],
+  ["C2D9",0x8E59],
+  ["C2DA",0x8E63],
+  ["C2DB",0x8E66],
+  ["C2DC",0x8E64],
+  ["C2DD",0x8E5F],
+  ["C2DE",0x8E55],
+  ["C2DF",0x8EC0],
+  ["C2E0",0x8F49],
+  ["C2E1",0x8F4D],
+  ["C2E2",0x9087],
+  ["C2E3",0x9083],
+  ["C2E4",0x9088],
+  ["C2E5",0x91AB],
+  ["C2E6",0x91AC],
+  ["C2E7",0x91D0],
+  ["C2E8",0x9394],
+  ["C2E9",0x938A],
+  ["C2EA",0x9396],
+  ["C2EB",0x93A2],
+  ["C2EC",0x93B3],
+  ["C2ED",0x93AE],
+  ["C2EE",0x93AC],
+  ["C2EF",0x93B0],
+  ["C2F0",0x9398],
+  ["C2F1",0x939A],
+  ["C2F2",0x9397],
+  ["C2F3",0x95D4],
+  ["C2F4",0x95D6],
+  ["C2F5",0x95D0],
+  ["C2F6",0x95D5],
+  ["C2F7",0x96E2],
+  ["C2F8",0x96DC],
+  ["C2F9",0x96D9],
+  ["C2FA",0x96DB],
+  ["C2FB",0x96DE],
+  ["C2FC",0x9724],
+  ["C2FD",0x97A3],
+  ["C2FE",0x97A6],
+  ["C340",0x97AD],
+  ["C341",0x97F9],
+  ["C342",0x984D],
+  ["C343",0x984F],
+  ["C344",0x984C],
+  ["C345",0x984E],
+  ["C346",0x9853],
+  ["C347",0x98BA],
+  ["C348",0x993E],
+  ["C349",0x993F],
+  ["C34A",0x993D],
+  ["C34B",0x992E],
+  ["C34C",0x99A5],
+  ["C34D",0x9A0E],
+  ["C34E",0x9AC1],
+  ["C34F",0x9B03],
+  ["C350",0x9B06],
+  ["C351",0x9B4F],
+  ["C352",0x9B4E],
+  ["C353",0x9B4D],
+  ["C354",0x9BCA],
+  ["C355",0x9BC9],
+  ["C356",0x9BFD],
+  ["C357",0x9BC8],
+  ["C358",0x9BC0],
+  ["C359",0x9D51],
+  ["C35A",0x9D5D],
+  ["C35B",0x9D60],
+  ["C35C",0x9EE0],
+  ["C35D",0x9F15],
+  ["C35E",0x9F2C],
+  ["C35F",0x5133],
+  ["C360",0x56A5],
+  ["C361",0x58DE],
+  ["C362",0x58DF],
+  ["C363",0x58E2],
+  ["C364",0x5BF5],
+  ["C365",0x9F90],
+  ["C366",0x5EEC],
+  ["C367",0x61F2],
+  ["C368",0x61F7],
+  ["C369",0x61F6],
+  ["C36A",0x61F5],
+  ["C36B",0x6500],
+  ["C36C",0x650F],
+  ["C36D",0x66E0],
+  ["C36E",0x66DD],
+  ["C36F",0x6AE5],
+  ["C370",0x6ADD],
+  ["C371",0x6ADA],
+  ["C372",0x6AD3],
+  ["C373",0x701B],
+  ["C374",0x701F],
+  ["C375",0x7028],
+  ["C376",0x701A],
+  ["C377",0x701D],
+  ["C378",0x7015],
+  ["C379",0x7018],
+  ["C37A",0x7206],
+  ["C37B",0x720D],
+  ["C37C",0x7258],
+  ["C37D",0x72A2],
+  ["C37E",0x7378],
+  ["C3A1",0x737A],
+  ["C3A2",0x74BD],
+  ["C3A3",0x74CA],
+  ["C3A4",0x74E3],
+  ["C3A5",0x7587],
+  ["C3A6",0x7586],
+  ["C3A7",0x765F],
+  ["C3A8",0x7661],
+  ["C3A9",0x77C7],
+  ["C3AA",0x7919],
+  ["C3AB",0x79B1],
+  ["C3AC",0x7A6B],
+  ["C3AD",0x7A69],
+  ["C3AE",0x7C3E],
+  ["C3AF",0x7C3F],
+  ["C3B0",0x7C38],
+  ["C3B1",0x7C3D],
+  ["C3B2",0x7C37],
+  ["C3B3",0x7C40],
+  ["C3B4",0x7E6B],
+  ["C3B5",0x7E6D],
+  ["C3B6",0x7E79],
+  ["C3B7",0x7E69],
+  ["C3B8",0x7E6A],
+  ["C3B9",0x7F85],
+  ["C3BA",0x7E73],
+  ["C3BB",0x7FB6],
+  ["C3BC",0x7FB9],
+  ["C3BD",0x7FB8],
+  ["C3BE",0x81D8],
+  ["C3BF",0x85E9],
+  ["C3C0",0x85DD],
+  ["C3C1",0x85EA],
+  ["C3C2",0x85D5],
+  ["C3C3",0x85E4],
+  ["C3C4",0x85E5],
+  ["C3C5",0x85F7],
+  ["C3C6",0x87FB],
+  ["C3C7",0x8805],
+  ["C3C8",0x880D],
+  ["C3C9",0x87F9],
+  ["C3CA",0x87FE],
+  ["C3CB",0x8960],
+  ["C3CC",0x895F],
+  ["C3CD",0x8956],
+  ["C3CE",0x895E],
+  ["C3CF",0x8B41],
+  ["C3D0",0x8B5C],
+  ["C3D1",0x8B58],
+  ["C3D2",0x8B49],
+  ["C3D3",0x8B5A],
+  ["C3D4",0x8B4E],
+  ["C3D5",0x8B4F],
+  ["C3D6",0x8B46],
+  ["C3D7",0x8B59],
+  ["C3D8",0x8D08],
+  ["C3D9",0x8D0A],
+  ["C3DA",0x8E7C],
+  ["C3DB",0x8E72],
+  ["C3DC",0x8E87],
+  ["C3DD",0x8E76],
+  ["C3DE",0x8E6C],
+  ["C3DF",0x8E7A],
+  ["C3E0",0x8E74],
+  ["C3E1",0x8F54],
+  ["C3E2",0x8F4E],
+  ["C3E3",0x8FAD],
+  ["C3E4",0x908A],
+  ["C3E5",0x908B],
+  ["C3E6",0x91B1],
+  ["C3E7",0x91AE],
+  ["C3E8",0x93E1],
+  ["C3E9",0x93D1],
+  ["C3EA",0x93DF],
+  ["C3EB",0x93C3],
+  ["C3EC",0x93C8],
+  ["C3ED",0x93DC],
+  ["C3EE",0x93DD],
+  ["C3EF",0x93D6],
+  ["C3F0",0x93E2],
+  ["C3F1",0x93CD],
+  ["C3F2",0x93D8],
+  ["C3F3",0x93E4],
+  ["C3F4",0x93D7],
+  ["C3F5",0x93E8],
+  ["C3F6",0x95DC],
+  ["C3F7",0x96B4],
+  ["C3F8",0x96E3],
+  ["C3F9",0x972A],
+  ["C3FA",0x9727],
+  ["C3FB",0x9761],
+  ["C3FC",0x97DC],
+  ["C3FD",0x97FB],
+  ["C3FE",0x985E],
+  ["C440",0x9858],
+  ["C441",0x985B],
+  ["C442",0x98BC],
+  ["C443",0x9945],
+  ["C444",0x9949],
+  ["C445",0x9A16],
+  ["C446",0x9A19],
+  ["C447",0x9B0D],
+  ["C448",0x9BE8],
+  ["C449",0x9BE7],
+  ["C44A",0x9BD6],
+  ["C44B",0x9BDB],
+  ["C44C",0x9D89],
+  ["C44D",0x9D61],
+  ["C44E",0x9D72],
+  ["C44F",0x9D6A],
+  ["C450",0x9D6C],
+  ["C451",0x9E92],
+  ["C452",0x9E97],
+  ["C453",0x9E93],
+  ["C454",0x9EB4],
+  ["C455",0x52F8],
+  ["C456",0x56A8],
+  ["C457",0x56B7],
+  ["C458",0x56B6],
+  ["C459",0x56B4],
+  ["C45A",0x56BC],
+  ["C45B",0x58E4],
+  ["C45C",0x5B40],
+  ["C45D",0x5B43],
+  ["C45E",0x5B7D],
+  ["C45F",0x5BF6],
+  ["C460",0x5DC9],
+  ["C461",0x61F8],
+  ["C462",0x61FA],
+  ["C463",0x6518],
+  ["C464",0x6514],
+  ["C465",0x6519],
+  ["C466",0x66E6],
+  ["C467",0x6727],
+  ["C468",0x6AEC],
+  ["C469",0x703E],
+  ["C46A",0x7030],
+  ["C46B",0x7032],
+  ["C46C",0x7210],
+  ["C46D",0x737B],
+  ["C46E",0x74CF],
+  ["C46F",0x7662],
+  ["C470",0x7665],
+  ["C471",0x7926],
+  ["C472",0x792A],
+  ["C473",0x792C],
+  ["C474",0x792B],
+  ["C475",0x7AC7],
+  ["C476",0x7AF6],
+  ["C477",0x7C4C],
+  ["C478",0x7C43],
+  ["C479",0x7C4D],
+  ["C47A",0x7CEF],
+  ["C47B",0x7CF0],
+  ["C47C",0x8FAE],
+  ["C47D",0x7E7D],
+  ["C47E",0x7E7C],
+  ["C4A1",0x7E82],
+  ["C4A2",0x7F4C],
+  ["C4A3",0x8000],
+  ["C4A4",0x81DA],
+  ["C4A5",0x8266],
+  ["C4A6",0x85FB],
+  ["C4A7",0x85F9],
+  ["C4A8",0x8611],
+  ["C4A9",0x85FA],
+  ["C4AA",0x8606],
+  ["C4AB",0x860B],
+  ["C4AC",0x8607],
+  ["C4AD",0x860A],
+  ["C4AE",0x8814],
+  ["C4AF",0x8815],
+  ["C4B0",0x8964],
+  ["C4B1",0x89BA],
+  ["C4B2",0x89F8],
+  ["C4B3",0x8B70],
+  ["C4B4",0x8B6C],
+  ["C4B5",0x8B66],
+  ["C4B6",0x8B6F],
+  ["C4B7",0x8B5F],
+  ["C4B8",0x8B6B],
+  ["C4B9",0x8D0F],
+  ["C4BA",0x8D0D],
+  ["C4BB",0x8E89],
+  ["C4BC",0x8E81],
+  ["C4BD",0x8E85],
+  ["C4BE",0x8E82],
+  ["C4BF",0x91B4],
+  ["C4C0",0x91CB],
+  ["C4C1",0x9418],
+  ["C4C2",0x9403],
+  ["C4C3",0x93FD],
+  ["C4C4",0x95E1],
+  ["C4C5",0x9730],
+  ["C4C6",0x98C4],
+  ["C4C7",0x9952],
+  ["C4C8",0x9951],
+  ["C4C9",0x99A8],
+  ["C4CA",0x9A2B],
+  ["C4CB",0x9A30],
+  ["C4CC",0x9A37],
+  ["C4CD",0x9A35],
+  ["C4CE",0x9C13],
+  ["C4CF",0x9C0D],
+  ["C4D0",0x9E79],
+  ["C4D1",0x9EB5],
+  ["C4D2",0x9EE8],
+  ["C4D3",0x9F2F],
+  ["C4D4",0x9F5F],
+  ["C4D5",0x9F63],
+  ["C4D6",0x9F61],
+  ["C4D7",0x5137],
+  ["C4D8",0x5138],
+  ["C4D9",0x56C1],
+  ["C4DA",0x56C0],
+  ["C4DB",0x56C2],
+  ["C4DC",0x5914],
+  ["C4DD",0x5C6C],
+  ["C4DE",0x5DCD],
+  ["C4DF",0x61FC],
+  ["C4E0",0x61FE],
+  ["C4E1",0x651D],
+  ["C4E2",0x651C],
+  ["C4E3",0x6595],
+  ["C4E4",0x66E9],
+  ["C4E5",0x6AFB],
+  ["C4E6",0x6B04],
+  ["C4E7",0x6AFA],
+  ["C4E8",0x6BB2],
+  ["C4E9",0x704C],
+  ["C4EA",0x721B],
+  ["C4EB",0x72A7],
+  ["C4EC",0x74D6],
+  ["C4ED",0x74D4],
+  ["C4EE",0x7669],
+  ["C4EF",0x77D3],
+  ["C4F0",0x7C50],
+  ["C4F1",0x7E8F],
+  ["C4F2",0x7E8C],
+  ["C4F3",0x7FBC],
+  ["C4F4",0x8617],
+  ["C4F5",0x862D],
+  ["C4F6",0x861A],
+  ["C4F7",0x8823],
+  ["C4F8",0x8822],
+  ["C4F9",0x8821],
+  ["C4FA",0x881F],
+  ["C4FB",0x896A],
+  ["C4FC",0x896C],
+  ["C4FD",0x89BD],
+  ["C4FE",0x8B74],
+  ["C540",0x8B77],
+  ["C541",0x8B7D],
+  ["C542",0x8D13],
+  ["C543",0x8E8A],
+  ["C544",0x8E8D],
+  ["C545",0x8E8B],
+  ["C546",0x8F5F],
+  ["C547",0x8FAF],
+  ["C548",0x91BA],
+  ["C549",0x942E],
+  ["C54A",0x9433],
+  ["C54B",0x9435],
+  ["C54C",0x943A],
+  ["C54D",0x9438],
+  ["C54E",0x9432],
+  ["C54F",0x942B],
+  ["C550",0x95E2],
+  ["C551",0x9738],
+  ["C552",0x9739],
+  ["C553",0x9732],
+  ["C554",0x97FF],
+  ["C555",0x9867],
+  ["C556",0x9865],
+  ["C557",0x9957],
+  ["C558",0x9A45],
+  ["C559",0x9A43],
+  ["C55A",0x9A40],
+  ["C55B",0x9A3E],
+  ["C55C",0x9ACF],
+  ["C55D",0x9B54],
+  ["C55E",0x9B51],
+  ["C55F",0x9C2D],
+  ["C560",0x9C25],
+  ["C561",0x9DAF],
+  ["C562",0x9DB4],
+  ["C563",0x9DC2],
+  ["C564",0x9DB8],
+  ["C565",0x9E9D],
+  ["C566",0x9EEF],
+  ["C567",0x9F19],
+  ["C568",0x9F5C],
+  ["C569",0x9F66],
+  ["C56A",0x9F67],
+  ["C56B",0x513C],
+  ["C56C",0x513B],
+  ["C56D",0x56C8],
+  ["C56E",0x56CA],
+  ["C56F",0x56C9],
+  ["C570",0x5B7F],
+  ["C571",0x5DD4],
+  ["C572",0x5DD2],
+  ["C573",0x5F4E],
+  ["C574",0x61FF],
+  ["C575",0x6524],
+  ["C576",0x6B0A],
+  ["C577",0x6B61],
+  ["C578",0x7051],
+  ["C579",0x7058],
+  ["C57A",0x7380],
+  ["C57B",0x74E4],
+  ["C57C",0x758A],
+  ["C57D",0x766E],
+  ["C57E",0x766C],
+  ["C5A1",0x79B3],
+  ["C5A2",0x7C60],
+  ["C5A3",0x7C5F],
+  ["C5A4",0x807E],
+  ["C5A5",0x807D],
+  ["C5A6",0x81DF],
+  ["C5A7",0x8972],
+  ["C5A8",0x896F],
+  ["C5A9",0x89FC],
+  ["C5AA",0x8B80],
+  ["C5AB",0x8D16],
+  ["C5AC",0x8D17],
+  ["C5AD",0x8E91],
+  ["C5AE",0x8E93],
+  ["C5AF",0x8F61],
+  ["C5B0",0x9148],
+  ["C5B1",0x9444],
+  ["C5B2",0x9451],
+  ["C5B3",0x9452],
+  ["C5B4",0x973D],
+  ["C5B5",0x973E],
+  ["C5B6",0x97C3],
+  ["C5B7",0x97C1],
+  ["C5B8",0x986B],
+  ["C5B9",0x9955],
+  ["C5BA",0x9A55],
+  ["C5BB",0x9A4D],
+  ["C5BC",0x9AD2],
+  ["C5BD",0x9B1A],
+  ["C5BE",0x9C49],
+  ["C5BF",0x9C31],
+  ["C5C0",0x9C3E],
+  ["C5C1",0x9C3B],
+  ["C5C2",0x9DD3],
+  ["C5C3",0x9DD7],
+  ["C5C4",0x9F34],
+  ["C5C5",0x9F6C],
+  ["C5C6",0x9F6A],
+  ["C5C7",0x9F94],
+  ["C5C8",0x56CC],
+  ["C5C9",0x5DD6],
+  ["C5CA",0x6200],
+  ["C5CB",0x6523],
+  ["C5CC",0x652B],
+  ["C5CD",0x652A],
+  ["C5CE",0x66EC],
+  ["C5CF",0x6B10],
+  ["C5D0",0x74DA],
+  ["C5D1",0x7ACA],
+  ["C5D2",0x7C64],
+  ["C5D3",0x7C63],
+  ["C5D4",0x7C65],
+  ["C5D5",0x7E93],
+  ["C5D6",0x7E96],
+  ["C5D7",0x7E94],
+  ["C5D8",0x81E2],
+  ["C5D9",0x8638],
+  ["C5DA",0x863F],
+  ["C5DB",0x8831],
+  ["C5DC",0x8B8A],
+  ["C5DD",0x9090],
+  ["C5DE",0x908F],
+  ["C5DF",0x9463],
+  ["C5E0",0x9460],
+  ["C5E1",0x9464],
+  ["C5E2",0x9768],
+  ["C5E3",0x986F],
+  ["C5E4",0x995C],
+  ["C5E5",0x9A5A],
+  ["C5E6",0x9A5B],
+  ["C5E7",0x9A57],
+  ["C5E8",0x9AD3],
+  ["C5E9",0x9AD4],
+  ["C5EA",0x9AD1],
+  ["C5EB",0x9C54],
+  ["C5EC",0x9C57],
+  ["C5ED",0x9C56],
+  ["C5EE",0x9DE5],
+  ["C5EF",0x9E9F],
+  ["C5F0",0x9EF4],
+  ["C5F1",0x56D1],
+  ["C5F2",0x58E9],
+  ["C5F3",0x652C],
+  ["C5F4",0x705E],
+  ["C5F5",0x7671],
+  ["C5F6",0x7672],
+  ["C5F7",0x77D7],
+  ["C5F8",0x7F50],
+  ["C5F9",0x7F88],
+  ["C5FA",0x8836],
+  ["C5FB",0x8839],
+  ["C5FC",0x8862],
+  ["C5FD",0x8B93],
+  ["C5FE",0x8B92],
+  ["C640",0x8B96],
+  ["C641",0x8277],
+  ["C642",0x8D1B],
+  ["C643",0x91C0],
+  ["C644",0x946A],
+  ["C645",0x9742],
+  ["C646",0x9748],
+  ["C647",0x9744],
+  ["C648",0x97C6],
+  ["C649",0x9870],
+  ["C64A",0x9A5F],
+  ["C64B",0x9B22],
+  ["C64C",0x9B58],
+  ["C64D",0x9C5F],
+  ["C64E",0x9DF9],
+  ["C64F",0x9DFA],
+  ["C650",0x9E7C],
+  ["C651",0x9E7D],
+  ["C652",0x9F07],
+  ["C653",0x9F77],
+  ["C654",0x9F72],
+  ["C655",0x5EF3],
+  ["C656",0x6B16],
+  ["C657",0x7063],
+  ["C658",0x7C6C],
+  ["C659",0x7C6E],
+  ["C65A",0x883B],
+  ["C65B",0x89C0],
+  ["C65C",0x8EA1],
+  ["C65D",0x91C1],
+  ["C65E",0x9472],
+  ["C65F",0x9470],
+  ["C660",0x9871],
+  ["C661",0x995E],
+  ["C662",0x9AD6],
+  ["C663",0x9B23],
+  ["C664",0x9ECC],
+  ["C665",0x7064],
+  ["C666",0x77DA],
+  ["C667",0x8B9A],
+  ["C668",0x9477],
+  ["C669",0x97C9],
+  ["C66A",0x9A62],
+  ["C66B",0x9A65],
+  ["C66C",0x7E9C],
+  ["C66D",0x8B9C],
+  ["C66E",0x8EAA],
+  ["C66F",0x91C5],
+  ["C670",0x947D],
+  ["C671",0x947E],
+  ["C672",0x947C],
+  ["C673",0x9C77],
+  ["C674",0x9C78],
+  ["C675",0x9EF7],
+  ["C676",0x8C54],
+  ["C677",0x947F],
+  ["C678",0x9E1A],
+  ["C679",0x7228],
+  ["C67A",0x9A6A],
+  ["C67B",0x9B31],
+  ["C67C",0x9E1B],
+  ["C67D",0x9E1E],
+  ["C67E",0x7C72],
+  ["C6A1",0x2460],
+  ["C6A2",0x2461],
+  ["C6A3",0x2462],
+  ["C6A4",0x2463],
+  ["C6A5",0x2464],
+  ["C6A6",0x2465],
+  ["C6A7",0x2466],
+  ["C6A8",0x2467],
+  ["C6A9",0x2468],
+  ["C6AA",0x2469],
+  ["C6AB",0x2474],
+  ["C6AC",0x2475],
+  ["C6AD",0x2476],
+  ["C6AE",0x2477],
+  ["C6AF",0x2478],
+  ["C6B0",0x2479],
+  ["C6B1",0x247A],
+  ["C6B2",0x247B],
+  ["C6B3",0x247C],
+  ["C6B4",0x247D],
+  ["C6B5",0x2170],
+  ["C6B6",0x2171],
+  ["C6B7",0x2172],
+  ["C6B8",0x2173],
+  ["C6B9",0x2174],
+  ["C6BA",0x2175],
+  ["C6BB",0x2176],
+  ["C6BC",0x2177],
+  ["C6BD",0x2178],
+  ["C6BE",0x2179],
+  ["C6BF",0x4E36],
+  ["C6C0",0x4E3F],
+  ["C6C1",0x4E85],
+  ["C6C2",0x4EA0],
+  ["C6C3",0x5182],
+  ["C6C4",0x5196],
+  ["C6C5",0x51AB],
+  ["C6C6",0x52F9],
+  ["C6C7",0x5338],
+  ["C6C8",0x5369],
+  ["C6C9",0x53B6],
+  ["C6CA",0x590A],
+  ["C6CB",0x5B80],
+  ["C6CC",0x5DDB],
+  ["C6CD",0x5E7A],
+  ["C6CE",0x5E7F],
+  ["C6CF",0x5EF4],
+  ["C6D0",0x5F50],
+  ["C6D1",0x5F61],
+  ["C6D2",0x6534],
+  ["C6D3",0x65E0],
+  ["C6D4",0x7592],
+  ["C6D5",0x7676],
+  ["C6D6",0x8FB5],
+  ["C6D7",0x96B6],
+  ["C6D8",0x00A8],
+  ["C6D9",0x02C6],
+  ["C6DA",0x30FD],
+  ["C6DB",0x30FE],
+  ["C6DC",0x309D],
+  ["C6DD",0x309E],
+  ["C6DE",0x3003],
+  ["C6DF",0x4EDD],
+  ["C6E0",0x3005],
+  ["C6E1",0x3006],
+  ["C6E2",0x3007],
+  ["C6E3",0x30FC],
+  ["C6E4",0xFF3B],
+  ["C6E5",0xFF3D],
+  ["C6E6",0x273D],
+  ["C6E7",0x3041],
+  ["C6E8",0x3042],
+  ["C6E9",0x3043],
+  ["C6EA",0x3044],
+  ["C6EB",0x3045],
+  ["C6EC",0x3046],
+  ["C6ED",0x3047],
+  ["C6EE",0x3048],
+  ["C6EF",0x3049],
+  ["C6F0",0x304A],
+  ["C6F1",0x304B],
+  ["C6F2",0x304C],
+  ["C6F3",0x304D],
+  ["C6F4",0x304E],
+  ["C6F5",0x304F],
+  ["C6F6",0x3050],
+  ["C6F7",0x3051],
+  ["C6F8",0x3052],
+  ["C6F9",0x3053],
+  ["C6FA",0x3054],
+  ["C6FB",0x3055],
+  ["C6FC",0x3056],
+  ["C6FD",0x3057],
+  ["C6FE",0x3058],
+  ["C740",0x3059],
+  ["C741",0x305A],
+  ["C742",0x305B],
+  ["C743",0x305C],
+  ["C744",0x305D],
+  ["C745",0x305E],
+  ["C746",0x305F],
+  ["C747",0x3060],
+  ["C748",0x3061],
+  ["C749",0x3062],
+  ["C74A",0x3063],
+  ["C74B",0x3064],
+  ["C74C",0x3065],
+  ["C74D",0x3066],
+  ["C74E",0x3067],
+  ["C74F",0x3068],
+  ["C750",0x3069],
+  ["C751",0x306A],
+  ["C752",0x306B],
+  ["C753",0x306C],
+  ["C754",0x306D],
+  ["C755",0x306E],
+  ["C756",0x306F],
+  ["C757",0x3070],
+  ["C758",0x3071],
+  ["C759",0x3072],
+  ["C75A",0x3073],
+  ["C75B",0x3074],
+  ["C75C",0x3075],
+  ["C75D",0x3076],
+  ["C75E",0x3077],
+  ["C75F",0x3078],
+  ["C760",0x3079],
+  ["C761",0x307A],
+  ["C762",0x307B],
+  ["C763",0x307C],
+  ["C764",0x307D],
+  ["C765",0x307E],
+  ["C766",0x307F],
+  ["C767",0x3080],
+  ["C768",0x3081],
+  ["C769",0x3082],
+  ["C76A",0x3083],
+  ["C76B",0x3084],
+  ["C76C",0x3085],
+  ["C76D",0x3086],
+  ["C76E",0x3087],
+  ["C76F",0x3088],
+  ["C770",0x3089],
+  ["C771",0x308A],
+  ["C772",0x308B],
+  ["C773",0x308C],
+  ["C774",0x308D],
+  ["C775",0x308E],
+  ["C776",0x308F],
+  ["C777",0x3090],
+  ["C778",0x3091],
+  ["C779",0x3092],
+  ["C77A",0x3093],
+  ["C77B",0x30A1],
+  ["C77C",0x30A2],
+  ["C77D",0x30A3],
+  ["C77E",0x30A4],
+  ["C7A1",0x30A5],
+  ["C7A2",0x30A6],
+  ["C7A3",0x30A7],
+  ["C7A4",0x30A8],
+  ["C7A5",0x30A9],
+  ["C7A6",0x30AA],
+  ["C7A7",0x30AB],
+  ["C7A8",0x30AC],
+  ["C7A9",0x30AD],
+  ["C7AA",0x30AE],
+  ["C7AB",0x30AF],
+  ["C7AC",0x30B0],
+  ["C7AD",0x30B1],
+  ["C7AE",0x30B2],
+  ["C7AF",0x30B3],
+  ["C7B0",0x30B4],
+  ["C7B1",0x30B5],
+  ["C7B2",0x30B6],
+  ["C7B3",0x30B7],
+  ["C7B4",0x30B8],
+  ["C7B5",0x30B9],
+  ["C7B6",0x30BA],
+  ["C7B7",0x30BB],
+  ["C7B8",0x30BC],
+  ["C7B9",0x30BD],
+  ["C7BA",0x30BE],
+  ["C7BB",0x30BF],
+  ["C7BC",0x30C0],
+  ["C7BD",0x30C1],
+  ["C7BE",0x30C2],
+  ["C7BF",0x30C3],
+  ["C7C0",0x30C4],
+  ["C7C1",0x30C5],
+  ["C7C2",0x30C6],
+  ["C7C3",0x30C7],
+  ["C7C4",0x30C8],
+  ["C7C5",0x30C9],
+  ["C7C6",0x30CA],
+  ["C7C7",0x30CB],
+  ["C7C8",0x30CC],
+  ["C7C9",0x30CD],
+  ["C7CA",0x30CE],
+  ["C7CB",0x30CF],
+  ["C7CC",0x30D0],
+  ["C7CD",0x30D1],
+  ["C7CE",0x30D2],
+  ["C7CF",0x30D3],
+  ["C7D0",0x30D4],
+  ["C7D1",0x30D5],
+  ["C7D2",0x30D6],
+  ["C7D3",0x30D7],
+  ["C7D4",0x30D8],
+  ["C7D5",0x30D9],
+  ["C7D6",0x30DA],
+  ["C7D7",0x30DB],
+  ["C7D8",0x30DC],
+  ["C7D9",0x30DD],
+  ["C7DA",0x30DE],
+  ["C7DB",0x30DF],
+  ["C7DC",0x30E0],
+  ["C7DD",0x30E1],
+  ["C7DE",0x30E2],
+  ["C7DF",0x30E3],
+  ["C7E0",0x30E4],
+  ["C7E1",0x30E5],
+  ["C7E2",0x30E6],
+  ["C7E3",0x30E7],
+  ["C7E4",0x30E8],
+  ["C7E5",0x30E9],
+  ["C7E6",0x30EA],
+  ["C7E7",0x30EB],
+  ["C7E8",0x30EC],
+  ["C7E9",0x30ED],
+  ["C7EA",0x30EE],
+  ["C7EB",0x30EF],
+  ["C7EC",0x30F0],
+  ["C7ED",0x30F1],
+  ["C7EE",0x30F2],
+  ["C7EF",0x30F3],
+  ["C7F0",0x30F4],
+  ["C7F1",0x30F5],
+  ["C7F2",0x30F6],
+  ["C7F3",0x0410],
+  ["C7F4",0x0411],
+  ["C7F5",0x0412],
+  ["C7F6",0x0413],
+  ["C7F7",0x0414],
+  ["C7F8",0x0415],
+  ["C7F9",0x0401],
+  ["C7FA",0x0416],
+  ["C7FB",0x0417],
+  ["C7FC",0x0418],
+  ["C7FD",0x0419],
+  ["C7FE",0x041A],
+  ["C840",0x041B],
+  ["C841",0x041C],
+  ["C842",0x041D],
+  ["C843",0x041E],
+  ["C844",0x041F],
+  ["C845",0x0420],
+  ["C846",0x0421],
+  ["C847",0x0422],
+  ["C848",0x0423],
+  ["C849",0x0424],
+  ["C84A",0x0425],
+  ["C84B",0x0426],
+  ["C84C",0x0427],
+  ["C84D",0x0428],
+  ["C84E",0x0429],
+  ["C84F",0x042A],
+  ["C850",0x042B],
+  ["C851",0x042C],
+  ["C852",0x042D],
+  ["C853",0x042E],
+  ["C854",0x042F],
+  ["C855",0x0430],
+  ["C856",0x0431],
+  ["C857",0x0432],
+  ["C858",0x0433],
+  ["C859",0x0434],
+  ["C85A",0x0435],
+  ["C85B",0x0451],
+  ["C85C",0x0436],
+  ["C85D",0x0437],
+  ["C85E",0x0438],
+  ["C85F",0x0439],
+  ["C860",0x043A],
+  ["C861",0x043B],
+  ["C862",0x043C],
+  ["C863",0x043D],
+  ["C864",0x043E],
+  ["C865",0x043F],
+  ["C866",0x0440],
+  ["C867",0x0441],
+  ["C868",0x0442],
+  ["C869",0x0443],
+  ["C86A",0x0444],
+  ["C86B",0x0445],
+  ["C86C",0x0446],
+  ["C86D",0x0447],
+  ["C86E",0x0448],
+  ["C86F",0x0449],
+  ["C870",0x044A],
+  ["C871",0x044B],
+  ["C872",0x044C],
+  ["C873",0x044D],
+  ["C874",0x044E],
+  ["C875",0x044F],
+  ["C876",0x21E7],
+  ["C877",0x21B8],
+  ["C878",0x21B9],
+  ["C879",0x31CF],
+  ["C87A",0xF7E6],
+  ["C87B",0x4E5A],
+  ["C87C",0xF7E8],
+  ["C87D",0x5202],
+  ["C87E",0x4491],
+  ["C8A1",0x9FB0],
+  ["C8A2",0x5188],
+  ["C8A3",0x9FB1],
+  ["C8A4",0xF7EE],
+  ["C8A5",0xF7EF],
+  ["C8A6",0xF7F0],
+  ["C8A7",0xF7F1],
+  ["C8A8",0xF7F2],
+  ["C8A9",0xF7F3],
+  ["C8AA",0xF7F4],
+  ["C8AB",0xF7F5],
+  ["C8AC",0xF7F6],
+  ["C8AD",0xF7F7],
+  ["C8AE",0xF7F8],
+  ["C8AF",0xF7F9],
+  ["C8B0",0xF7FA],
+  ["C8B1",0x309B],
+  ["C8B2",0x309C],
+  ["C8B3",0x3094],
+  ["C8B4",0x30F7],
+  ["C8B5",0x30F8],
+  ["C8B6",0x30F9],
+  ["C8B7",0x30FA],
+  ["C8B8",0x30FB],
+  ["C8B9",0xFF61],
+  ["C8BA",0xFF62],
+  ["C8BB",0xFF63],
+  ["C8BC",0xFF64],
+  ["C8BD",0xFF65],
+  ["C8BE",0xFF66],
+  ["C8BF",0xFF67],
+  ["C8C0",0xFF68],
+  ["C8C1",0xFF69],
+  ["C8C2",0xFF6A],
+  ["C8C3",0xFF6B],
+  ["C8C4",0xFF6C],
+  ["C8C5",0xFF6D],
+  ["C8C6",0xFF6E],
+  ["C8C7",0xFF6F],
+  ["C8C8",0xFF70],
+  ["C8C9",0xFF71],
+  ["C8CA",0xFF72],
+  ["C8CB",0xFF73],
+  ["C8CC",0xFF74],
+  ["C8CD",0xFFE2],
+  ["C8CE",0xFFE4],
+  ["C8CF",0xFF07],
+  ["C8D0",0xFF02],
+  ["C8D1",0x3231],
+  ["C8D2",0x2116],
+  ["C8D3",0x2121],
+  ["C8D4",0xFF75],
+  ["C8D5",0xFF76],
+  ["C8D6",0xFF77],
+  ["C8D7",0xFF78],
+  ["C8D8",0xFF79],
+  ["C8D9",0xFF7A],
+  ["C8DA",0xFF7B],
+  ["C8DB",0xFF7C],
+  ["C8DC",0xFF7D],
+  ["C8DD",0xFF7E],
+  ["C8DE",0xFF7F],
+  ["C8DF",0xFF80],
+  ["C8E0",0xFF81],
+  ["C8E1",0xFF82],
+  ["C8E2",0xFF83],
+  ["C8E3",0xFF84],
+  ["C8E4",0xFF85],
+  ["C8E5",0xFF86],
+  ["C8E6",0xFF87],
+  ["C8E7",0xFF88],
+  ["C8E8",0xFF89],
+  ["C8E9",0xFF8A],
+  ["C8EA",0xFF8B],
+  ["C8EB",0xFF8C],
+  ["C8EC",0xFF8D],
+  ["C8ED",0xFF8E],
+  ["C8EE",0xFF8F],
+  ["C8EF",0xFF90],
+  ["C8F0",0xFF91],
+  ["C8F1",0xFF92],
+  ["C8F2",0xFF93],
+  ["C8F3",0xFF94],
+  ["C8F4",0xFF95],
+  ["C8F5",0xFF96],
+  ["C8F6",0xFF97],
+  ["C8F7",0xFF98],
+  ["C8F8",0xFF99],
+  ["C8F9",0xFF9A],
+  ["C8FA",0xFF9B],
+  ["C8FB",0xFF9C],
+  ["C8FC",0xFF9D],
+  ["C8FD",0xFF9E],
+  ["C8FE",0xFF9F],
+  ["C940",0x4E42],
+  ["C941",0x4E5C],
+  ["C942",0x51F5],
+  ["C943",0x531A],
+  ["C944",0x5382],
+  ["C945",0x4E07],
+  ["C946",0x4E0C],
+  ["C947",0x4E47],
+  ["C948",0x4E8D],
+  ["C949",0x56D7],
+  ["C94A",0xFA0C],
+  ["C94B",0x5C6E],
+  ["C94C",0x5F73],
+  ["C94D",0x4E0F],
+  ["C94E",0x5187],
+  ["C94F",0x4E0E],
+  ["C950",0x4E2E],
+  ["C951",0x4E93],
+  ["C952",0x4EC2],
+  ["C953",0x4EC9],
+  ["C954",0x4EC8],
+  ["C955",0x5198],
+  ["C956",0x52FC],
+  ["C957",0x536C],
+  ["C958",0x53B9],
+  ["C959",0x5720],
+  ["C95A",0x5903],
+  ["C95B",0x592C],
+  ["C95C",0x5C10],
+  ["C95D",0x5DFF],
+  ["C95E",0x65E1],
+  ["C95F",0x6BB3],
+  ["C960",0x6BCC],
+  ["C961",0x6C14],
+  ["C962",0x723F],
+  ["C963",0x4E31],
+  ["C964",0x4E3C],
+  ["C965",0x4EE8],
+  ["C966",0x4EDC],
+  ["C967",0x4EE9],
+  ["C968",0x4EE1],
+  ["C969",0x4EDD],
+  ["C96A",0x4EDA],
+  ["C96B",0x520C],
+  ["C96C",0x531C],
+  ["C96D",0x534C],
+  ["C96E",0x5722],
+  ["C96F",0x5723],
+  ["C970",0x5917],
+  ["C971",0x592F],
+  ["C972",0x5B81],
+  ["C973",0x5B84],
+  ["C974",0x5C12],
+  ["C975",0x5C3B],
+  ["C976",0x5C74],
+  ["C977",0x5C73],
+  ["C978",0x5E04],
+  ["C979",0x5E80],
+  ["C97A",0x5E82],
+  ["C97B",0x5FC9],
+  ["C97C",0x6209],
+  ["C97D",0x6250],
+  ["C97E",0x6C15],
+  ["C9A1",0x6C36],
+  ["C9A2",0x6C43],
+  ["C9A3",0x6C3F],
+  ["C9A4",0x6C3B],
+  ["C9A5",0x72AE],
+  ["C9A6",0x72B0],
+  ["C9A7",0x738A],
+  ["C9A8",0x79B8],
+  ["C9A9",0x808A],
+  ["C9AA",0x961E],
+  ["C9AB",0x4F0E],
+  ["C9AC",0x4F18],
+  ["C9AD",0x4F2C],
+  ["C9AE",0x4EF5],
+  ["C9AF",0x4F14],
+  ["C9B0",0x4EF1],
+  ["C9B1",0x4F00],
+  ["C9B2",0x4EF7],
+  ["C9B3",0x4F08],
+  ["C9B4",0x4F1D],
+  ["C9B5",0x4F02],
+  ["C9B6",0x4F05],
+  ["C9B7",0x4F22],
+  ["C9B8",0x4F13],
+  ["C9B9",0x4F04],
+  ["C9BA",0x4EF4],
+  ["C9BB",0x4F12],
+  ["C9BC",0x51B1],
+  ["C9BD",0x5213],
+  ["C9BE",0x5209],
+  ["C9BF",0x5210],
+  ["C9C0",0x52A6],
+  ["C9C1",0x5322],
+  ["C9C2",0x531F],
+  ["C9C3",0x534D],
+  ["C9C4",0x538A],
+  ["C9C5",0x5407],
+  ["C9C6",0x56E1],
+  ["C9C7",0x56DF],
+  ["C9C8",0x572E],
+  ["C9C9",0x572A],
+  ["C9CA",0x5734],
+  ["C9CB",0x593C],
+  ["C9CC",0x5980],
+  ["C9CD",0x597C],
+  ["C9CE",0x5985],
+  ["C9CF",0x597B],
+  ["C9D0",0x597E],
+  ["C9D1",0x5977],
+  ["C9D2",0x597F],
+  ["C9D3",0x5B56],
+  ["C9D4",0x5C15],
+  ["C9D5",0x5C25],
+  ["C9D6",0x5C7C],
+  ["C9D7",0x5C7A],
+  ["C9D8",0x5C7B],
+  ["C9D9",0x5C7E],
+  ["C9DA",0x5DDF],
+  ["C9DB",0x5E75],
+  ["C9DC",0x5E84],
+  ["C9DD",0x5F02],
+  ["C9DE",0x5F1A],
+  ["C9DF",0x5F74],
+  ["C9E0",0x5FD5],
+  ["C9E1",0x5FD4],
+  ["C9E2",0x5FCF],
+  ["C9E3",0x625C],
+  ["C9E4",0x625E],
+  ["C9E5",0x6264],
+  ["C9E6",0x6261],
+  ["C9E7",0x6266],
+  ["C9E8",0x6262],
+  ["C9E9",0x6259],
+  ["C9EA",0x6260],
+  ["C9EB",0x625A],
+  ["C9EC",0x6265],
+  ["C9ED",0x65EF],
+  ["C9EE",0x65EE],
+  ["C9EF",0x673E],
+  ["C9F0",0x6739],
+  ["C9F1",0x6738],
+  ["C9F2",0x673B],
+  ["C9F3",0x673A],
+  ["C9F4",0x673F],
+  ["C9F5",0x673C],
+  ["C9F6",0x6733],
+  ["C9F7",0x6C18],
+  ["C9F8",0x6C46],
+  ["C9F9",0x6C52],
+  ["C9FA",0x6C5C],
+  ["C9FB",0x6C4F],
+  ["C9FC",0x6C4A],
+  ["C9FD",0x6C54],
+  ["C9FE",0x6C4B],
+  ["CA40",0x6C4C],
+  ["CA41",0x7071],
+  ["CA42",0x725E],
+  ["CA43",0x72B4],
+  ["CA44",0x72B5],
+  ["CA45",0x738E],
+  ["CA46",0x752A],
+  ["CA47",0x767F],
+  ["CA48",0x7A75],
+  ["CA49",0x7F51],
+  ["CA4A",0x8278],
+  ["CA4B",0x827C],
+  ["CA4C",0x8280],
+  ["CA4D",0x827D],
+  ["CA4E",0x827F],
+  ["CA4F",0x864D],
+  ["CA50",0x897E],
+  ["CA51",0x9099],
+  ["CA52",0x9097],
+  ["CA53",0x9098],
+  ["CA54",0x909B],
+  ["CA55",0x9094],
+  ["CA56",0x9622],
+  ["CA57",0x9624],
+  ["CA58",0x9620],
+  ["CA59",0x9623],
+  ["CA5A",0x4F56],
+  ["CA5B",0x4F3B],
+  ["CA5C",0x4F62],
+  ["CA5D",0x4F49],
+  ["CA5E",0x4F53],
+  ["CA5F",0x4F64],
+  ["CA60",0x4F3E],
+  ["CA61",0x4F67],
+  ["CA62",0x4F52],
+  ["CA63",0x4F5F],
+  ["CA64",0x4F41],
+  ["CA65",0x4F58],
+  ["CA66",0x4F2D],
+  ["CA67",0x4F33],
+  ["CA68",0x4F3F],
+  ["CA69",0x4F61],
+  ["CA6A",0x518F],
+  ["CA6B",0x51B9],
+  ["CA6C",0x521C],
+  ["CA6D",0x521E],
+  ["CA6E",0x5221],
+  ["CA6F",0x52AD],
+  ["CA70",0x52AE],
+  ["CA71",0x5309],
+  ["CA72",0x5363],
+  ["CA73",0x5372],
+  ["CA74",0x538E],
+  ["CA75",0x538F],
+  ["CA76",0x5430],
+  ["CA77",0x5437],
+  ["CA78",0x542A],
+  ["CA79",0x5454],
+  ["CA7A",0x5445],
+  ["CA7B",0x5419],
+  ["CA7C",0x541C],
+  ["CA7D",0x5425],
+  ["CA7E",0x5418],
+  ["CAA1",0x543D],
+  ["CAA2",0x544F],
+  ["CAA3",0x5441],
+  ["CAA4",0x5428],
+  ["CAA5",0x5424],
+  ["CAA6",0x5447],
+  ["CAA7",0x56EE],
+  ["CAA8",0x56E7],
+  ["CAA9",0x56E5],
+  ["CAAA",0x5741],
+  ["CAAB",0x5745],
+  ["CAAC",0x574C],
+  ["CAAD",0x5749],
+  ["CAAE",0x574B],
+  ["CAAF",0x5752],
+  ["CAB0",0x5906],
+  ["CAB1",0x5940],
+  ["CAB2",0x59A6],
+  ["CAB3",0x5998],
+  ["CAB4",0x59A0],
+  ["CAB5",0x5997],
+  ["CAB6",0x598E],
+  ["CAB7",0x59A2],
+  ["CAB8",0x5990],
+  ["CAB9",0x598F],
+  ["CABA",0x59A7],
+  ["CABB",0x59A1],
+  ["CABC",0x5B8E],
+  ["CABD",0x5B92],
+  ["CABE",0x5C28],
+  ["CABF",0x5C2A],
+  ["CAC0",0x5C8D],
+  ["CAC1",0x5C8F],
+  ["CAC2",0x5C88],
+  ["CAC3",0x5C8B],
+  ["CAC4",0x5C89],
+  ["CAC5",0x5C92],
+  ["CAC6",0x5C8A],
+  ["CAC7",0x5C86],
+  ["CAC8",0x5C93],
+  ["CAC9",0x5C95],
+  ["CACA",0x5DE0],
+  ["CACB",0x5E0A],
+  ["CACC",0x5E0E],
+  ["CACD",0x5E8B],
+  ["CACE",0x5E89],
+  ["CACF",0x5E8C],
+  ["CAD0",0x5E88],
+  ["CAD1",0x5E8D],
+  ["CAD2",0x5F05],
+  ["CAD3",0x5F1D],
+  ["CAD4",0x5F78],
+  ["CAD5",0x5F76],
+  ["CAD6",0x5FD2],
+  ["CAD7",0x5FD1],
+  ["CAD8",0x5FD0],
+  ["CAD9",0x5FED],
+  ["CADA",0x5FE8],
+  ["CADB",0x5FEE],
+  ["CADC",0x5FF3],
+  ["CADD",0x5FE1],
+  ["CADE",0x5FE4],
+  ["CADF",0x5FE3],
+  ["CAE0",0x5FFA],
+  ["CAE1",0x5FEF],
+  ["CAE2",0x5FF7],
+  ["CAE3",0x5FFB],
+  ["CAE4",0x6000],
+  ["CAE5",0x5FF4],
+  ["CAE6",0x623A],
+  ["CAE7",0x6283],
+  ["CAE8",0x628C],
+  ["CAE9",0x628E],
+  ["CAEA",0x628F],
+  ["CAEB",0x6294],
+  ["CAEC",0x6287],
+  ["CAED",0x6271],
+  ["CAEE",0x627B],
+  ["CAEF",0x627A],
+  ["CAF0",0x6270],
+  ["CAF1",0x6281],
+  ["CAF2",0x6288],
+  ["CAF3",0x6277],
+  ["CAF4",0x627D],
+  ["CAF5",0x6272],
+  ["CAF6",0x6274],
+  ["CAF7",0x6537],
+  ["CAF8",0x65F0],
+  ["CAF9",0x65F4],
+  ["CAFA",0x65F3],
+  ["CAFB",0x65F2],
+  ["CAFC",0x65F5],
+  ["CAFD",0x6745],
+  ["CAFE",0x6747],
+  ["CB40",0x6759],
+  ["CB41",0x6755],
+  ["CB42",0x674C],
+  ["CB43",0x6748],
+  ["CB44",0x675D],
+  ["CB45",0x674D],
+  ["CB46",0x675A],
+  ["CB47",0x674B],
+  ["CB48",0x6BD0],
+  ["CB49",0x6C19],
+  ["CB4A",0x6C1A],
+  ["CB4B",0x6C78],
+  ["CB4C",0x6C67],
+  ["CB4D",0x6C6B],
+  ["CB4E",0x6C84],
+  ["CB4F",0x6C8B],
+  ["CB50",0x6C8F],
+  ["CB51",0x6C71],
+  ["CB52",0x6C6F],
+  ["CB53",0x6C69],
+  ["CB54",0x6C9A],
+  ["CB55",0x6C6D],
+  ["CB56",0x6C87],
+  ["CB57",0x6C95],
+  ["CB58",0x6C9C],
+  ["CB59",0x6C66],
+  ["CB5A",0x6C73],
+  ["CB5B",0x6C65],
+  ["CB5C",0x6C7B],
+  ["CB5D",0x6C8E],
+  ["CB5E",0x7074],
+  ["CB5F",0x707A],
+  ["CB60",0x7263],
+  ["CB61",0x72BF],
+  ["CB62",0x72BD],
+  ["CB63",0x72C3],
+  ["CB64",0x72C6],
+  ["CB65",0x72C1],
+  ["CB66",0x72BA],
+  ["CB67",0x72C5],
+  ["CB68",0x7395],
+  ["CB69",0x7397],
+  ["CB6A",0x7393],
+  ["CB6B",0x7394],
+  ["CB6C",0x7392],
+  ["CB6D",0x753A],
+  ["CB6E",0x7539],
+  ["CB6F",0x7594],
+  ["CB70",0x7595],
+  ["CB71",0x7681],
+  ["CB72",0x793D],
+  ["CB73",0x8034],
+  ["CB74",0x8095],
+  ["CB75",0x8099],
+  ["CB76",0x8090],
+  ["CB77",0x8092],
+  ["CB78",0x809C],
+  ["CB79",0x8290],
+  ["CB7A",0x828F],
+  ["CB7B",0x8285],
+  ["CB7C",0x828E],
+  ["CB7D",0x8291],
+  ["CB7E",0x8293],
+  ["CBA1",0x828A],
+  ["CBA2",0x8283],
+  ["CBA3",0x8284],
+  ["CBA4",0x8C78],
+  ["CBA5",0x8FC9],
+  ["CBA6",0x8FBF],
+  ["CBA7",0x909F],
+  ["CBA8",0x90A1],
+  ["CBA9",0x90A5],
+  ["CBAA",0x909E],
+  ["CBAB",0x90A7],
+  ["CBAC",0x90A0],
+  ["CBAD",0x9630],
+  ["CBAE",0x9628],
+  ["CBAF",0x962F],
+  ["CBB0",0x962D],
+  ["CBB1",0x4E33],
+  ["CBB2",0x4F98],
+  ["CBB3",0x4F7C],
+  ["CBB4",0x4F85],
+  ["CBB5",0x4F7D],
+  ["CBB6",0x4F80],
+  ["CBB7",0x4F87],
+  ["CBB8",0x4F76],
+  ["CBB9",0x4F74],
+  ["CBBA",0x4F89],
+  ["CBBB",0x4F84],
+  ["CBBC",0x4F77],
+  ["CBBD",0x4F4C],
+  ["CBBE",0x4F97],
+  ["CBBF",0x4F6A],
+  ["CBC0",0x4F9A],
+  ["CBC1",0x4F79],
+  ["CBC2",0x4F81],
+  ["CBC3",0x4F78],
+  ["CBC4",0x4F90],
+  ["CBC5",0x4F9C],
+  ["CBC6",0x4F94],
+  ["CBC7",0x4F9E],
+  ["CBC8",0x4F92],
+  ["CBC9",0x4F82],
+  ["CBCA",0x4F95],
+  ["CBCB",0x4F6B],
+  ["CBCC",0x4F6E],
+  ["CBCD",0x519E],
+  ["CBCE",0x51BC],
+  ["CBCF",0x51BE],
+  ["CBD0",0x5235],
+  ["CBD1",0x5232],
+  ["CBD2",0x5233],
+  ["CBD3",0x5246],
+  ["CBD4",0x5231],
+  ["CBD5",0x52BC],
+  ["CBD6",0x530A],
+  ["CBD7",0x530B],
+  ["CBD8",0x533C],
+  ["CBD9",0x5392],
+  ["CBDA",0x5394],
+  ["CBDB",0x5487],
+  ["CBDC",0x547F],
+  ["CBDD",0x5481],
+  ["CBDE",0x5491],
+  ["CBDF",0x5482],
+  ["CBE0",0x5488],
+  ["CBE1",0x546B],
+  ["CBE2",0x547A],
+  ["CBE3",0x547E],
+  ["CBE4",0x5465],
+  ["CBE5",0x546C],
+  ["CBE6",0x5474],
+  ["CBE7",0x5466],
+  ["CBE8",0x548D],
+  ["CBE9",0x546F],
+  ["CBEA",0x5461],
+  ["CBEB",0x5460],
+  ["CBEC",0x5498],
+  ["CBED",0x5463],
+  ["CBEE",0x5467],
+  ["CBEF",0x5464],
+  ["CBF0",0x56F7],
+  ["CBF1",0x56F9],
+  ["CBF2",0x576F],
+  ["CBF3",0x5772],
+  ["CBF4",0x576D],
+  ["CBF5",0x576B],
+  ["CBF6",0x5771],
+  ["CBF7",0x5770],
+  ["CBF8",0x5776],
+  ["CBF9",0x5780],
+  ["CBFA",0x5775],
+  ["CBFB",0x577B],
+  ["CBFC",0x5773],
+  ["CBFD",0x5774],
+  ["CBFE",0x5762],
+  ["CC40",0x5768],
+  ["CC41",0x577D],
+  ["CC42",0x590C],
+  ["CC43",0x5945],
+  ["CC44",0x59B5],
+  ["CC45",0x59BA],
+  ["CC46",0x59CF],
+  ["CC47",0x59CE],
+  ["CC48",0x59B2],
+  ["CC49",0x59CC],
+  ["CC4A",0x59C1],
+  ["CC4B",0x59B6],
+  ["CC4C",0x59BC],
+  ["CC4D",0x59C3],
+  ["CC4E",0x59D6],
+  ["CC4F",0x59B1],
+  ["CC50",0x59BD],
+  ["CC51",0x59C0],
+  ["CC52",0x59C8],
+  ["CC53",0x59B4],
+  ["CC54",0x59C7],
+  ["CC55",0x5B62],
+  ["CC56",0x5B65],
+  ["CC57",0x5B93],
+  ["CC58",0x5B95],
+  ["CC59",0x5C44],
+  ["CC5A",0x5C47],
+  ["CC5B",0x5CAE],
+  ["CC5C",0x5CA4],
+  ["CC5D",0x5CA0],
+  ["CC5E",0x5CB5],
+  ["CC5F",0x5CAF],
+  ["CC60",0x5CA8],
+  ["CC61",0x5CAC],
+  ["CC62",0x5C9F],
+  ["CC63",0x5CA3],
+  ["CC64",0x5CAD],
+  ["CC65",0x5CA2],
+  ["CC66",0x5CAA],
+  ["CC67",0x5CA7],
+  ["CC68",0x5C9D],
+  ["CC69",0x5CA5],
+  ["CC6A",0x5CB6],
+  ["CC6B",0x5CB0],
+  ["CC6C",0x5CA6],
+  ["CC6D",0x5E17],
+  ["CC6E",0x5E14],
+  ["CC6F",0x5E19],
+  ["CC70",0x5F28],
+  ["CC71",0x5F22],
+  ["CC72",0x5F23],
+  ["CC73",0x5F24],
+  ["CC74",0x5F54],
+  ["CC75",0x5F82],
+  ["CC76",0x5F7E],
+  ["CC77",0x5F7D],
+  ["CC78",0x5FDE],
+  ["CC79",0x5FE5],
+  ["CC7A",0x602D],
+  ["CC7B",0x6026],
+  ["CC7C",0x6019],
+  ["CC7D",0x6032],
+  ["CC7E",0x600B],
+  ["CCA1",0x6034],
+  ["CCA2",0x600A],
+  ["CCA3",0x6017],
+  ["CCA4",0x6033],
+  ["CCA5",0x601A],
+  ["CCA6",0x601E],
+  ["CCA7",0x602C],
+  ["CCA8",0x6022],
+  ["CCA9",0x600D],
+  ["CCAA",0x6010],
+  ["CCAB",0x602E],
+  ["CCAC",0x6013],
+  ["CCAD",0x6011],
+  ["CCAE",0x600C],
+  ["CCAF",0x6009],
+  ["CCB0",0x601C],
+  ["CCB1",0x6214],
+  ["CCB2",0x623D],
+  ["CCB3",0x62AD],
+  ["CCB4",0x62B4],
+  ["CCB5",0x62D1],
+  ["CCB6",0x62BE],
+  ["CCB7",0x62AA],
+  ["CCB8",0x62B6],
+  ["CCB9",0x62CA],
+  ["CCBA",0x62AE],
+  ["CCBB",0x62B3],
+  ["CCBC",0x62AF],
+  ["CCBD",0x62BB],
+  ["CCBE",0x62A9],
+  ["CCBF",0x62B0],
+  ["CCC0",0x62B8],
+  ["CCC1",0x653D],
+  ["CCC2",0x65A8],
+  ["CCC3",0x65BB],
+  ["CCC4",0x6609],
+  ["CCC5",0x65FC],
+  ["CCC6",0x6604],
+  ["CCC7",0x6612],
+  ["CCC8",0x6608],
+  ["CCC9",0x65FB],
+  ["CCCA",0x6603],
+  ["CCCB",0x660B],
+  ["CCCC",0x660D],
+  ["CCCD",0x6605],
+  ["CCCE",0x65FD],
+  ["CCCF",0x6611],
+  ["CCD0",0x6610],
+  ["CCD1",0x66F6],
+  ["CCD2",0x670A],
+  ["CCD3",0x6785],
+  ["CCD4",0x676C],
+  ["CCD5",0x678E],
+  ["CCD6",0x6792],
+  ["CCD7",0x6776],
+  ["CCD8",0x677B],
+  ["CCD9",0x6798],
+  ["CCDA",0x6786],
+  ["CCDB",0x6784],
+  ["CCDC",0x6774],
+  ["CCDD",0x678D],
+  ["CCDE",0x678C],
+  ["CCDF",0x677A],
+  ["CCE0",0x679F],
+  ["CCE1",0x6791],
+  ["CCE2",0x6799],
+  ["CCE3",0x6783],
+  ["CCE4",0x677D],
+  ["CCE5",0x6781],
+  ["CCE6",0x6778],
+  ["CCE7",0x6779],
+  ["CCE8",0x6794],
+  ["CCE9",0x6B25],
+  ["CCEA",0x6B80],
+  ["CCEB",0x6B7E],
+  ["CCEC",0x6BDE],
+  ["CCED",0x6C1D],
+  ["CCEE",0x6C93],
+  ["CCEF",0x6CEC],
+  ["CCF0",0x6CEB],
+  ["CCF1",0x6CEE],
+  ["CCF2",0x6CD9],
+  ["CCF3",0x6CB6],
+  ["CCF4",0x6CD4],
+  ["CCF5",0x6CAD],
+  ["CCF6",0x6CE7],
+  ["CCF7",0x6CB7],
+  ["CCF8",0x6CD0],
+  ["CCF9",0x6CC2],
+  ["CCFA",0x6CBA],
+  ["CCFB",0x6CC3],
+  ["CCFC",0x6CC6],
+  ["CCFD",0x6CED],
+  ["CCFE",0x6CF2],
+  ["CD40",0x6CD2],
+  ["CD41",0x6CDD],
+  ["CD42",0x6CB4],
+  ["CD43",0x6C8A],
+  ["CD44",0x6C9D],
+  ["CD45",0x6C80],
+  ["CD46",0x6CDE],
+  ["CD47",0x6CC0],
+  ["CD48",0x6D30],
+  ["CD49",0x6CCD],
+  ["CD4A",0x6CC7],
+  ["CD4B",0x6CB0],
+  ["CD4C",0x6CF9],
+  ["CD4D",0x6CCF],
+  ["CD4E",0x6CE9],
+  ["CD4F",0x6CD1],
+  ["CD50",0x7094],
+  ["CD51",0x7098],
+  ["CD52",0x7085],
+  ["CD53",0x7093],
+  ["CD54",0x7086],
+  ["CD55",0x7084],
+  ["CD56",0x7091],
+  ["CD57",0x7096],
+  ["CD58",0x7082],
+  ["CD59",0x709A],
+  ["CD5A",0x7083],
+  ["CD5B",0x726A],
+  ["CD5C",0x72D6],
+  ["CD5D",0x72CB],
+  ["CD5E",0x72D8],
+  ["CD5F",0x72C9],
+  ["CD60",0x72DC],
+  ["CD61",0x72D2],
+  ["CD62",0x72D4],
+  ["CD63",0x72DA],
+  ["CD64",0x72CC],
+  ["CD65",0x72D1],
+  ["CD66",0x73A4],
+  ["CD67",0x73A1],
+  ["CD68",0x73AD],
+  ["CD69",0x73A6],
+  ["CD6A",0x73A2],
+  ["CD6B",0x73A0],
+  ["CD6C",0x73AC],
+  ["CD6D",0x739D],
+  ["CD6E",0x74DD],
+  ["CD6F",0x74E8],
+  ["CD70",0x753F],
+  ["CD71",0x7540],
+  ["CD72",0x753E],
+  ["CD73",0x758C],
+  ["CD74",0x7598],
+  ["CD75",0x76AF],
+  ["CD76",0x76F3],
+  ["CD77",0x76F1],
+  ["CD78",0x76F0],
+  ["CD79",0x76F5],
+  ["CD7A",0x77F8],
+  ["CD7B",0x77FC],
+  ["CD7C",0x77F9],
+  ["CD7D",0x77FB],
+  ["CD7E",0x77FA],
+  ["CDA1",0x77F7],
+  ["CDA2",0x7942],
+  ["CDA3",0x793F],
+  ["CDA4",0x79C5],
+  ["CDA5",0x7A78],
+  ["CDA6",0x7A7B],
+  ["CDA7",0x7AFB],
+  ["CDA8",0x7C75],
+  ["CDA9",0x7CFD],
+  ["CDAA",0x8035],
+  ["CDAB",0x808F],
+  ["CDAC",0x80AE],
+  ["CDAD",0x80A3],
+  ["CDAE",0x80B8],
+  ["CDAF",0x80B5],
+  ["CDB0",0x80AD],
+  ["CDB1",0x8220],
+  ["CDB2",0x82A0],
+  ["CDB3",0x82C0],
+  ["CDB4",0x82AB],
+  ["CDB5",0x829A],
+  ["CDB6",0x8298],
+  ["CDB7",0x829B],
+  ["CDB8",0x82B5],
+  ["CDB9",0x82A7],
+  ["CDBA",0x82AE],
+  ["CDBB",0x82BC],
+  ["CDBC",0x829E],
+  ["CDBD",0x82BA],
+  ["CDBE",0x82B4],
+  ["CDBF",0x82A8],
+  ["CDC0",0x82A1],
+  ["CDC1",0x82A9],
+  ["CDC2",0x82C2],
+  ["CDC3",0x82A4],
+  ["CDC4",0x82C3],
+  ["CDC5",0x82B6],
+  ["CDC6",0x82A2],
+  ["CDC7",0x8670],
+  ["CDC8",0x866F],
+  ["CDC9",0x866D],
+  ["CDCA",0x866E],
+  ["CDCB",0x8C56],
+  ["CDCC",0x8FD2],
+  ["CDCD",0x8FCB],
+  ["CDCE",0x8FD3],
+  ["CDCF",0x8FCD],
+  ["CDD0",0x8FD6],
+  ["CDD1",0x8FD5],
+  ["CDD2",0x8FD7],
+  ["CDD3",0x90B2],
+  ["CDD4",0x90B4],
+  ["CDD5",0x90AF],
+  ["CDD6",0x90B3],
+  ["CDD7",0x90B0],
+  ["CDD8",0x9639],
+  ["CDD9",0x963D],
+  ["CDDA",0x963C],
+  ["CDDB",0x963A],
+  ["CDDC",0x9643],
+  ["CDDD",0x4FCD],
+  ["CDDE",0x4FC5],
+  ["CDDF",0x4FD3],
+  ["CDE0",0x4FB2],
+  ["CDE1",0x4FC9],
+  ["CDE2",0x4FCB],
+  ["CDE3",0x4FC1],
+  ["CDE4",0x4FD4],
+  ["CDE5",0x4FDC],
+  ["CDE6",0x4FD9],
+  ["CDE7",0x4FBB],
+  ["CDE8",0x4FB3],
+  ["CDE9",0x4FDB],
+  ["CDEA",0x4FC7],
+  ["CDEB",0x4FD6],
+  ["CDEC",0x4FBA],
+  ["CDED",0x4FC0],
+  ["CDEE",0x4FB9],
+  ["CDEF",0x4FEC],
+  ["CDF0",0x5244],
+  ["CDF1",0x5249],
+  ["CDF2",0x52C0],
+  ["CDF3",0x52C2],
+  ["CDF4",0x533D],
+  ["CDF5",0x537C],
+  ["CDF6",0x5397],
+  ["CDF7",0x5396],
+  ["CDF8",0x5399],
+  ["CDF9",0x5398],
+  ["CDFA",0x54BA],
+  ["CDFB",0x54A1],
+  ["CDFC",0x54AD],
+  ["CDFD",0x54A5],
+  ["CDFE",0x54CF],
+  ["CE40",0x54C3],
+  ["CE41",0x830D],
+  ["CE42",0x54B7],
+  ["CE43",0x54AE],
+  ["CE44",0x54D6],
+  ["CE45",0x54B6],
+  ["CE46",0x54C5],
+  ["CE47",0x54C6],
+  ["CE48",0x54A0],
+  ["CE49",0x5470],
+  ["CE4A",0x54BC],
+  ["CE4B",0x54A2],
+  ["CE4C",0x54BE],
+  ["CE4D",0x5472],
+  ["CE4E",0x54DE],
+  ["CE4F",0x54B0],
+  ["CE50",0x57B5],
+  ["CE51",0x579E],
+  ["CE52",0x579F],
+  ["CE53",0x57A4],
+  ["CE54",0x578C],
+  ["CE55",0x5797],
+  ["CE56",0x579D],
+  ["CE57",0x579B],
+  ["CE58",0x5794],
+  ["CE59",0x5798],
+  ["CE5A",0x578F],
+  ["CE5B",0x5799],
+  ["CE5C",0x57A5],
+  ["CE5D",0x579A],
+  ["CE5E",0x5795],
+  ["CE5F",0x58F4],
+  ["CE60",0x590D],
+  ["CE61",0x5953],
+  ["CE62",0x59E1],
+  ["CE63",0x59DE],
+  ["CE64",0x59EE],
+  ["CE65",0x5A00],
+  ["CE66",0x59F1],
+  ["CE67",0x59DD],
+  ["CE68",0x59FA],
+  ["CE69",0x59FD],
+  ["CE6A",0x59FC],
+  ["CE6B",0x59F6],
+  ["CE6C",0x59E4],
+  ["CE6D",0x59F2],
+  ["CE6E",0x59F7],
+  ["CE6F",0x59DB],
+  ["CE70",0x59E9],
+  ["CE71",0x59F3],
+  ["CE72",0x59F5],
+  ["CE73",0x59E0],
+  ["CE74",0x59FE],
+  ["CE75",0x59F4],
+  ["CE76",0x59ED],
+  ["CE77",0x5BA8],
+  ["CE78",0x5C4C],
+  ["CE79",0x5CD0],
+  ["CE7A",0x5CD8],
+  ["CE7B",0x5CCC],
+  ["CE7C",0x5CD7],
+  ["CE7D",0x5CCB],
+  ["CE7E",0x5CDB],
+  ["CEA1",0x5CDE],
+  ["CEA2",0x5CDA],
+  ["CEA3",0x5CC9],
+  ["CEA4",0x5CC7],
+  ["CEA5",0x5CCA],
+  ["CEA6",0x5CD6],
+  ["CEA7",0x5CD3],
+  ["CEA8",0x5CD4],
+  ["CEA9",0x5CCF],
+  ["CEAA",0x5CC8],
+  ["CEAB",0x5CC6],
+  ["CEAC",0x5CCE],
+  ["CEAD",0x5CDF],
+  ["CEAE",0x5CF8],
+  ["CEAF",0x5DF9],
+  ["CEB0",0x5E21],
+  ["CEB1",0x5E22],
+  ["CEB2",0x5E23],
+  ["CEB3",0x5E20],
+  ["CEB4",0x5E24],
+  ["CEB5",0x5EB0],
+  ["CEB6",0x5EA4],
+  ["CEB7",0x5EA2],
+  ["CEB8",0x5E9B],
+  ["CEB9",0x5EA3],
+  ["CEBA",0x5EA5],
+  ["CEBB",0x5F07],
+  ["CEBC",0x5F2E],
+  ["CEBD",0x5F56],
+  ["CEBE",0x5F86],
+  ["CEBF",0x6037],
+  ["CEC0",0x6039],
+  ["CEC1",0x6054],
+  ["CEC2",0x6072],
+  ["CEC3",0x605E],
+  ["CEC4",0x6045],
+  ["CEC5",0x6053],
+  ["CEC6",0x6047],
+  ["CEC7",0x6049],
+  ["CEC8",0x605B],
+  ["CEC9",0x604C],
+  ["CECA",0x6040],
+  ["CECB",0x6042],
+  ["CECC",0x605F],
+  ["CECD",0x6024],
+  ["CECE",0x6044],
+  ["CECF",0x6058],
+  ["CED0",0x6066],
+  ["CED1",0x606E],
+  ["CED2",0x6242],
+  ["CED3",0x6243],
+  ["CED4",0x62CF],
+  ["CED5",0x630D],
+  ["CED6",0x630B],
+  ["CED7",0x62F5],
+  ["CED8",0x630E],
+  ["CED9",0x6303],
+  ["CEDA",0x62EB],
+  ["CEDB",0x62F9],
+  ["CEDC",0x630F],
+  ["CEDD",0x630C],
+  ["CEDE",0x62F8],
+  ["CEDF",0x62F6],
+  ["CEE0",0x6300],
+  ["CEE1",0x6313],
+  ["CEE2",0x6314],
+  ["CEE3",0x62FA],
+  ["CEE4",0x6315],
+  ["CEE5",0x62FB],
+  ["CEE6",0x62F0],
+  ["CEE7",0x6541],
+  ["CEE8",0x6543],
+  ["CEE9",0x65AA],
+  ["CEEA",0x65BF],
+  ["CEEB",0x6636],
+  ["CEEC",0x6621],
+  ["CEED",0x6632],
+  ["CEEE",0x6635],
+  ["CEEF",0x661C],
+  ["CEF0",0x6626],
+  ["CEF1",0x6622],
+  ["CEF2",0x6633],
+  ["CEF3",0x662B],
+  ["CEF4",0x663A],
+  ["CEF5",0x661D],
+  ["CEF6",0x6634],
+  ["CEF7",0x6639],
+  ["CEF8",0x662E],
+  ["CEF9",0x670F],
+  ["CEFA",0x6710],
+  ["CEFB",0x67C1],
+  ["CEFC",0x67F2],
+  ["CEFD",0x67C8],
+  ["CEFE",0x67BA],
+  ["CF40",0x67DC],
+  ["CF41",0x67BB],
+  ["CF42",0x67F8],
+  ["CF43",0x67D8],
+  ["CF44",0x67C0],
+  ["CF45",0x67B7],
+  ["CF46",0x67C5],
+  ["CF47",0x67EB],
+  ["CF48",0x67E4],
+  ["CF49",0x67DF],
+  ["CF4A",0x67B5],
+  ["CF4B",0x67CD],
+  ["CF4C",0x67B3],
+  ["CF4D",0x67F7],
+  ["CF4E",0x67F6],
+  ["CF4F",0x67EE],
+  ["CF50",0x67E3],
+  ["CF51",0x67C2],
+  ["CF52",0x67B9],
+  ["CF53",0x67CE],
+  ["CF54",0x67E7],
+  ["CF55",0x67F0],
+  ["CF56",0x67B2],
+  ["CF57",0x67FC],
+  ["CF58",0x67C6],
+  ["CF59",0x67ED],
+  ["CF5A",0x67CC],
+  ["CF5B",0x67AE],
+  ["CF5C",0x67E6],
+  ["CF5D",0x67DB],
+  ["CF5E",0x67FA],
+  ["CF5F",0x67C9],
+  ["CF60",0x67CA],
+  ["CF61",0x67C3],
+  ["CF62",0x67EA],
+  ["CF63",0x67CB],
+  ["CF64",0x6B28],
+  ["CF65",0x6B82],
+  ["CF66",0x6B84],
+  ["CF67",0x6BB6],
+  ["CF68",0x6BD6],
+  ["CF69",0x6BD8],
+  ["CF6A",0x6BE0],
+  ["CF6B",0x6C20],
+  ["CF6C",0x6C21],
+  ["CF6D",0x6D28],
+  ["CF6E",0x6D34],
+  ["CF6F",0x6D2D],
+  ["CF70",0x6D1F],
+  ["CF71",0x6D3C],
+  ["CF72",0x6D3F],
+  ["CF73",0x6D12],
+  ["CF74",0x6D0A],
+  ["CF75",0x6CDA],
+  ["CF76",0x6D33],
+  ["CF77",0x6D04],
+  ["CF78",0x6D19],
+  ["CF79",0x6D3A],
+  ["CF7A",0x6D1A],
+  ["CF7B",0x6D11],
+  ["CF7C",0x6D00],
+  ["CF7D",0x6D1D],
+  ["CF7E",0x6D42],
+  ["CFA1",0x6D01],
+  ["CFA2",0x6D18],
+  ["CFA3",0x6D37],
+  ["CFA4",0x6D03],
+  ["CFA5",0x6D0F],
+  ["CFA6",0x6D40],
+  ["CFA7",0x6D07],
+  ["CFA8",0x6D20],
+  ["CFA9",0x6D2C],
+  ["CFAA",0x6D08],
+  ["CFAB",0x6D22],
+  ["CFAC",0x6D09],
+  ["CFAD",0x6D10],
+  ["CFAE",0x70B7],
+  ["CFAF",0x709F],
+  ["CFB0",0x70BE],
+  ["CFB1",0x70B1],
+  ["CFB2",0x70B0],
+  ["CFB3",0x70A1],
+  ["CFB4",0x70B4],
+  ["CFB5",0x70B5],
+  ["CFB6",0x70A9],
+  ["CFB7",0x7241],
+  ["CFB8",0x7249],
+  ["CFB9",0x724A],
+  ["CFBA",0x726C],
+  ["CFBB",0x7270],
+  ["CFBC",0x7273],
+  ["CFBD",0x726E],
+  ["CFBE",0x72CA],
+  ["CFBF",0x72E4],
+  ["CFC0",0x72E8],
+  ["CFC1",0x72EB],
+  ["CFC2",0x72DF],
+  ["CFC3",0x72EA],
+  ["CFC4",0x72E6],
+  ["CFC5",0x72E3],
+  ["CFC6",0x7385],
+  ["CFC7",0x73CC],
+  ["CFC8",0x73C2],
+  ["CFC9",0x73C8],
+  ["CFCA",0x73C5],
+  ["CFCB",0x73B9],
+  ["CFCC",0x73B6],
+  ["CFCD",0x73B5],
+  ["CFCE",0x73B4],
+  ["CFCF",0x73EB],
+  ["CFD0",0x73BF],
+  ["CFD1",0x73C7],
+  ["CFD2",0x73BE],
+  ["CFD3",0x73C3],
+  ["CFD4",0x73C6],
+  ["CFD5",0x73B8],
+  ["CFD6",0x73CB],
+  ["CFD7",0x74EC],
+  ["CFD8",0x74EE],
+  ["CFD9",0x752E],
+  ["CFDA",0x7547],
+  ["CFDB",0x7548],
+  ["CFDC",0x75A7],
+  ["CFDD",0x75AA],
+  ["CFDE",0x7679],
+  ["CFDF",0x76C4],
+  ["CFE0",0x7708],
+  ["CFE1",0x7703],
+  ["CFE2",0x7704],
+  ["CFE3",0x7705],
+  ["CFE4",0x770A],
+  ["CFE5",0x76F7],
+  ["CFE6",0x76FB],
+  ["CFE7",0x76FA],
+  ["CFE8",0x77E7],
+  ["CFE9",0x77E8],
+  ["CFEA",0x7806],
+  ["CFEB",0x7811],
+  ["CFEC",0x7812],
+  ["CFED",0x7805],
+  ["CFEE",0x7810],
+  ["CFEF",0x780F],
+  ["CFF0",0x780E],
+  ["CFF1",0x7809],
+  ["CFF2",0x7803],
+  ["CFF3",0x7813],
+  ["CFF4",0x794A],
+  ["CFF5",0x794C],
+  ["CFF6",0x794B],
+  ["CFF7",0x7945],
+  ["CFF8",0x7944],
+  ["CFF9",0x79D5],
+  ["CFFA",0x79CD],
+  ["CFFB",0x79CF],
+  ["CFFC",0x79D6],
+  ["CFFD",0x79CE],
+  ["CFFE",0x7A80],
+  ["D040",0x7A7E],
+  ["D041",0x7AD1],
+  ["D042",0x7B00],
+  ["D043",0x7B01],
+  ["D044",0x7C7A],
+  ["D045",0x7C78],
+  ["D046",0x7C79],
+  ["D047",0x7C7F],
+  ["D048",0x7C80],
+  ["D049",0x7C81],
+  ["D04A",0x7D03],
+  ["D04B",0x7D08],
+  ["D04C",0x7D01],
+  ["D04D",0x7F58],
+  ["D04E",0x7F91],
+  ["D04F",0x7F8D],
+  ["D050",0x7FBE],
+  ["D051",0x8007],
+  ["D052",0x800E],
+  ["D053",0x800F],
+  ["D054",0x8014],
+  ["D055",0x8037],
+  ["D056",0x80D8],
+  ["D057",0x80C7],
+  ["D058",0x80E0],
+  ["D059",0x80D1],
+  ["D05A",0x80C8],
+  ["D05B",0x80C2],
+  ["D05C",0x80D0],
+  ["D05D",0x80C5],
+  ["D05E",0x80E3],
+  ["D05F",0x80D9],
+  ["D060",0x80DC],
+  ["D061",0x80CA],
+  ["D062",0x80D5],
+  ["D063",0x80C9],
+  ["D064",0x80CF],
+  ["D065",0x80D7],
+  ["D066",0x80E6],
+  ["D067",0x80CD],
+  ["D068",0x81FF],
+  ["D069",0x8221],
+  ["D06A",0x8294],
+  ["D06B",0x82D9],
+  ["D06C",0x82FE],
+  ["D06D",0x82F9],
+  ["D06E",0x8307],
+  ["D06F",0x82E8],
+  ["D070",0x8300],
+  ["D071",0x82D5],
+  ["D072",0x833A],
+  ["D073",0x82EB],
+  ["D074",0x82D6],
+  ["D075",0x82F4],
+  ["D076",0x82EC],
+  ["D077",0x82E1],
+  ["D078",0x82F2],
+  ["D079",0x82F5],
+  ["D07A",0x830C],
+  ["D07B",0x82FB],
+  ["D07C",0x82F6],
+  ["D07D",0x82F0],
+  ["D07E",0x82EA],
+  ["D0A1",0x82E4],
+  ["D0A2",0x82E0],
+  ["D0A3",0x82FA],
+  ["D0A4",0x82F3],
+  ["D0A5",0x82ED],
+  ["D0A6",0x8677],
+  ["D0A7",0x8674],
+  ["D0A8",0x867C],
+  ["D0A9",0x8673],
+  ["D0AA",0x8841],
+  ["D0AB",0x884E],
+  ["D0AC",0x8867],
+  ["D0AD",0x886A],
+  ["D0AE",0x8869],
+  ["D0AF",0x89D3],
+  ["D0B0",0x8A04],
+  ["D0B1",0x8A07],
+  ["D0B2",0x8D72],
+  ["D0B3",0x8FE3],
+  ["D0B4",0x8FE1],
+  ["D0B5",0x8FEE],
+  ["D0B6",0x8FE0],
+  ["D0B7",0x90F1],
+  ["D0B8",0x90BD],
+  ["D0B9",0x90BF],
+  ["D0BA",0x90D5],
+  ["D0BB",0x90C5],
+  ["D0BC",0x90BE],
+  ["D0BD",0x90C7],
+  ["D0BE",0x90CB],
+  ["D0BF",0x90C8],
+  ["D0C0",0x91D4],
+  ["D0C1",0x91D3],
+  ["D0C2",0x9654],
+  ["D0C3",0x964F],
+  ["D0C4",0x9651],
+  ["D0C5",0x9653],
+  ["D0C6",0x964A],
+  ["D0C7",0x964E],
+  ["D0C8",0x501E],
+  ["D0C9",0x5005],
+  ["D0CA",0x5007],
+  ["D0CB",0x5013],
+  ["D0CC",0x5022],
+  ["D0CD",0x5030],
+  ["D0CE",0x501B],
+  ["D0CF",0x4FF5],
+  ["D0D0",0x4FF4],
+  ["D0D1",0x5033],
+  ["D0D2",0x5037],
+  ["D0D3",0x502C],
+  ["D0D4",0x4FF6],
+  ["D0D5",0x4FF7],
+  ["D0D6",0x5017],
+  ["D0D7",0x501C],
+  ["D0D8",0x5020],
+  ["D0D9",0x5027],
+  ["D0DA",0x5035],
+  ["D0DB",0x502F],
+  ["D0DC",0x5031],
+  ["D0DD",0x500E],
+  ["D0DE",0x515A],
+  ["D0DF",0x5194],
+  ["D0E0",0x5193],
+  ["D0E1",0x51CA],
+  ["D0E2",0x51C4],
+  ["D0E3",0x51C5],
+  ["D0E4",0x51C8],
+  ["D0E5",0x51CE],
+  ["D0E6",0x5261],
+  ["D0E7",0x525A],
+  ["D0E8",0x5252],
+  ["D0E9",0x525E],
+  ["D0EA",0x525F],
+  ["D0EB",0x5255],
+  ["D0EC",0x5262],
+  ["D0ED",0x52CD],
+  ["D0EE",0x530E],
+  ["D0EF",0x539E],
+  ["D0F0",0x5526],
+  ["D0F1",0x54E2],
+  ["D0F2",0x5517],
+  ["D0F3",0x5512],
+  ["D0F4",0x54E7],
+  ["D0F5",0x54F3],
+  ["D0F6",0x54E4],
+  ["D0F7",0x551A],
+  ["D0F8",0x54FF],
+  ["D0F9",0x5504],
+  ["D0FA",0x5508],
+  ["D0FB",0x54EB],
+  ["D0FC",0x5511],
+  ["D0FD",0x5505],
+  ["D0FE",0x54F1],
+  ["D140",0x550A],
+  ["D141",0x54FB],
+  ["D142",0x54F7],
+  ["D143",0x54F8],
+  ["D144",0x54E0],
+  ["D145",0x550E],
+  ["D146",0x5503],
+  ["D147",0x550B],
+  ["D148",0x5701],
+  ["D149",0x5702],
+  ["D14A",0x57CC],
+  ["D14B",0x5832],
+  ["D14C",0x57D5],
+  ["D14D",0x57D2],
+  ["D14E",0x57BA],
+  ["D14F",0x57C6],
+  ["D150",0x57BD],
+  ["D151",0x57BC],
+  ["D152",0x57B8],
+  ["D153",0x57B6],
+  ["D154",0x57BF],
+  ["D155",0x57C7],
+  ["D156",0x57D0],
+  ["D157",0x57B9],
+  ["D158",0x57C1],
+  ["D159",0x590E],
+  ["D15A",0x594A],
+  ["D15B",0x5A19],
+  ["D15C",0x5A16],
+  ["D15D",0x5A2D],
+  ["D15E",0x5A2E],
+  ["D15F",0x5A15],
+  ["D160",0x5A0F],
+  ["D161",0x5A17],
+  ["D162",0x5A0A],
+  ["D163",0x5A1E],
+  ["D164",0x5A33],
+  ["D165",0x5B6C],
+  ["D166",0x5BA7],
+  ["D167",0x5BAD],
+  ["D168",0x5BAC],
+  ["D169",0x5C03],
+  ["D16A",0x5C56],
+  ["D16B",0x5C54],
+  ["D16C",0x5CEC],
+  ["D16D",0x5CFF],
+  ["D16E",0x5CEE],
+  ["D16F",0x5CF1],
+  ["D170",0x5CF7],
+  ["D171",0x5D00],
+  ["D172",0x5CF9],
+  ["D173",0x5E29],
+  ["D174",0x5E28],
+  ["D175",0x5EA8],
+  ["D176",0x5EAE],
+  ["D177",0x5EAA],
+  ["D178",0x5EAC],
+  ["D179",0x5F33],
+  ["D17A",0x5F30],
+  ["D17B",0x5F67],
+  ["D17C",0x605D],
+  ["D17D",0x605A],
+  ["D17E",0x6067],
+  ["D1A1",0x6041],
+  ["D1A2",0x60A2],
+  ["D1A3",0x6088],
+  ["D1A4",0x6080],
+  ["D1A5",0x6092],
+  ["D1A6",0x6081],
+  ["D1A7",0x609D],
+  ["D1A8",0x6083],
+  ["D1A9",0x6095],
+  ["D1AA",0x609B],
+  ["D1AB",0x6097],
+  ["D1AC",0x6087],
+  ["D1AD",0x609C],
+  ["D1AE",0x608E],
+  ["D1AF",0x6219],
+  ["D1B0",0x6246],
+  ["D1B1",0x62F2],
+  ["D1B2",0x6310],
+  ["D1B3",0x6356],
+  ["D1B4",0x632C],
+  ["D1B5",0x6344],
+  ["D1B6",0x6345],
+  ["D1B7",0x6336],
+  ["D1B8",0x6343],
+  ["D1B9",0x63E4],
+  ["D1BA",0x6339],
+  ["D1BB",0x634B],
+  ["D1BC",0x634A],
+  ["D1BD",0x633C],
+  ["D1BE",0x6329],
+  ["D1BF",0x6341],
+  ["D1C0",0x6334],
+  ["D1C1",0x6358],
+  ["D1C2",0x6354],
+  ["D1C3",0x6359],
+  ["D1C4",0x632D],
+  ["D1C5",0x6347],
+  ["D1C6",0x6333],
+  ["D1C7",0x635A],
+  ["D1C8",0x6351],
+  ["D1C9",0x6338],
+  ["D1CA",0x6357],
+  ["D1CB",0x6340],
+  ["D1CC",0x6348],
+  ["D1CD",0x654A],
+  ["D1CE",0x6546],
+  ["D1CF",0x65C6],
+  ["D1D0",0x65C3],
+  ["D1D1",0x65C4],
+  ["D1D2",0x65C2],
+  ["D1D3",0x664A],
+  ["D1D4",0x665F],
+  ["D1D5",0x6647],
+  ["D1D6",0x6651],
+  ["D1D7",0x6712],
+  ["D1D8",0x6713],
+  ["D1D9",0x681F],
+  ["D1DA",0x681A],
+  ["D1DB",0x6849],
+  ["D1DC",0x6832],
+  ["D1DD",0x6833],
+  ["D1DE",0x683B],
+  ["D1DF",0x684B],
+  ["D1E0",0x684F],
+  ["D1E1",0x6816],
+  ["D1E2",0x6831],
+  ["D1E3",0x681C],
+  ["D1E4",0x6835],
+  ["D1E5",0x682B],
+  ["D1E6",0x682D],
+  ["D1E7",0x682F],
+  ["D1E8",0x684E],
+  ["D1E9",0x6844],
+  ["D1EA",0x6834],
+  ["D1EB",0x681D],
+  ["D1EC",0x6812],
+  ["D1ED",0x6814],
+  ["D1EE",0x6826],
+  ["D1EF",0x6828],
+  ["D1F0",0x682E],
+  ["D1F1",0x684D],
+  ["D1F2",0x683A],
+  ["D1F3",0x6825],
+  ["D1F4",0x6820],
+  ["D1F5",0x6B2C],
+  ["D1F6",0x6B2F],
+  ["D1F7",0x6B2D],
+  ["D1F8",0x6B31],
+  ["D1F9",0x6B34],
+  ["D1FA",0x6B6D],
+  ["D1FB",0x8082],
+  ["D1FC",0x6B88],
+  ["D1FD",0x6BE6],
+  ["D1FE",0x6BE4],
+  ["D240",0x6BE8],
+  ["D241",0x6BE3],
+  ["D242",0x6BE2],
+  ["D243",0x6BE7],
+  ["D244",0x6C25],
+  ["D245",0x6D7A],
+  ["D246",0x6D63],
+  ["D247",0x6D64],
+  ["D248",0x6D76],
+  ["D249",0x6D0D],
+  ["D24A",0x6D61],
+  ["D24B",0x6D92],
+  ["D24C",0x6D58],
+  ["D24D",0x6D62],
+  ["D24E",0x6D6D],
+  ["D24F",0x6D6F],
+  ["D250",0x6D91],
+  ["D251",0x6D8D],
+  ["D252",0x6DEF],
+  ["D253",0x6D7F],
+  ["D254",0x6D86],
+  ["D255",0x6D5E],
+  ["D256",0x6D67],
+  ["D257",0x6D60],
+  ["D258",0x6D97],
+  ["D259",0x6D70],
+  ["D25A",0x6D7C],
+  ["D25B",0x6D5F],
+  ["D25C",0x6D82],
+  ["D25D",0x6D98],
+  ["D25E",0x6D2F],
+  ["D25F",0x6D68],
+  ["D260",0x6D8B],
+  ["D261",0x6D7E],
+  ["D262",0x6D80],
+  ["D263",0x6D84],
+  ["D264",0x6D16],
+  ["D265",0x6D83],
+  ["D266",0x6D7B],
+  ["D267",0x6D7D],
+  ["D268",0x6D75],
+  ["D269",0x6D90],
+  ["D26A",0x70DC],
+  ["D26B",0x70D3],
+  ["D26C",0x70D1],
+  ["D26D",0x70DD],
+  ["D26E",0x70CB],
+  ["D26F",0x7F39],
+  ["D270",0x70E2],
+  ["D271",0x70D7],
+  ["D272",0x70D2],
+  ["D273",0x70DE],
+  ["D274",0x70E0],
+  ["D275",0x70D4],
+  ["D276",0x70CD],
+  ["D277",0x70C5],
+  ["D278",0x70C6],
+  ["D279",0x70C7],
+  ["D27A",0x70DA],
+  ["D27B",0x70CE],
+  ["D27C",0x70E1],
+  ["D27D",0x7242],
+  ["D27E",0x7278],
+  ["D2A1",0x7277],
+  ["D2A2",0x7276],
+  ["D2A3",0x7300],
+  ["D2A4",0x72FA],
+  ["D2A5",0x72F4],
+  ["D2A6",0x72FE],
+  ["D2A7",0x72F6],
+  ["D2A8",0x72F3],
+  ["D2A9",0x72FB],
+  ["D2AA",0x7301],
+  ["D2AB",0x73D3],
+  ["D2AC",0x73D9],
+  ["D2AD",0x73E5],
+  ["D2AE",0x73D6],
+  ["D2AF",0x73BC],
+  ["D2B0",0x73E7],
+  ["D2B1",0x73E3],
+  ["D2B2",0x73E9],
+  ["D2B3",0x73DC],
+  ["D2B4",0x73D2],
+  ["D2B5",0x73DB],
+  ["D2B6",0x73D4],
+  ["D2B7",0x73DD],
+  ["D2B8",0x73DA],
+  ["D2B9",0x73D7],
+  ["D2BA",0x73D8],
+  ["D2BB",0x73E8],
+  ["D2BC",0x74DE],
+  ["D2BD",0x74DF],
+  ["D2BE",0x74F4],
+  ["D2BF",0x74F5],
+  ["D2C0",0x7521],
+  ["D2C1",0x755B],
+  ["D2C2",0x755F],
+  ["D2C3",0x75B0],
+  ["D2C4",0x75C1],
+  ["D2C5",0x75BB],
+  ["D2C6",0x75C4],
+  ["D2C7",0x75C0],
+  ["D2C8",0x75BF],
+  ["D2C9",0x75B6],
+  ["D2CA",0x75BA],
+  ["D2CB",0x768A],
+  ["D2CC",0x76C9],
+  ["D2CD",0x771D],
+  ["D2CE",0x771B],
+  ["D2CF",0x7710],
+  ["D2D0",0x7713],
+  ["D2D1",0x7712],
+  ["D2D2",0x7723],
+  ["D2D3",0x7711],
+  ["D2D4",0x7715],
+  ["D2D5",0x7719],
+  ["D2D6",0x771A],
+  ["D2D7",0x7722],
+  ["D2D8",0x7727],
+  ["D2D9",0x7823],
+  ["D2DA",0x782C],
+  ["D2DB",0x7822],
+  ["D2DC",0x7835],
+  ["D2DD",0x782F],
+  ["D2DE",0x7828],
+  ["D2DF",0x782E],
+  ["D2E0",0x782B],
+  ["D2E1",0x7821],
+  ["D2E2",0x7829],
+  ["D2E3",0x7833],
+  ["D2E4",0x782A],
+  ["D2E5",0x7831],
+  ["D2E6",0x7954],
+  ["D2E7",0x795B],
+  ["D2E8",0x794F],
+  ["D2E9",0x795C],
+  ["D2EA",0x7953],
+  ["D2EB",0x7952],
+  ["D2EC",0x7951],
+  ["D2ED",0x79EB],
+  ["D2EE",0x79EC],
+  ["D2EF",0x79E0],
+  ["D2F0",0x79EE],
+  ["D2F1",0x79ED],
+  ["D2F2",0x79EA],
+  ["D2F3",0x79DC],
+  ["D2F4",0x79DE],
+  ["D2F5",0x79DD],
+  ["D2F6",0x7A86],
+  ["D2F7",0x7A89],
+  ["D2F8",0x7A85],
+  ["D2F9",0x7A8B],
+  ["D2FA",0x7A8C],
+  ["D2FB",0x7A8A],
+  ["D2FC",0x7A87],
+  ["D2FD",0x7AD8],
+  ["D2FE",0x7B10],
+  ["D340",0x7B04],
+  ["D341",0x7B13],
+  ["D342",0x7B05],
+  ["D343",0x7B0F],
+  ["D344",0x7B08],
+  ["D345",0x7B0A],
+  ["D346",0x7B0E],
+  ["D347",0x7B09],
+  ["D348",0x7B12],
+  ["D349",0x7C84],
+  ["D34A",0x7C91],
+  ["D34B",0x7C8A],
+  ["D34C",0x7C8C],
+  ["D34D",0x7C88],
+  ["D34E",0x7C8D],
+  ["D34F",0x7C85],
+  ["D350",0x7D1E],
+  ["D351",0x7D1D],
+  ["D352",0x7D11],
+  ["D353",0x7D0E],
+  ["D354",0x7D18],
+  ["D355",0x7D16],
+  ["D356",0x7D13],
+  ["D357",0x7D1F],
+  ["D358",0x7D12],
+  ["D359",0x7D0F],
+  ["D35A",0x7D0C],
+  ["D35B",0x7F5C],
+  ["D35C",0x7F61],
+  ["D35D",0x7F5E],
+  ["D35E",0x7F60],
+  ["D35F",0x7F5D],
+  ["D360",0x7F5B],
+  ["D361",0x7F96],
+  ["D362",0x7F92],
+  ["D363",0x7FC3],
+  ["D364",0x7FC2],
+  ["D365",0x7FC0],
+  ["D366",0x8016],
+  ["D367",0x803E],
+  ["D368",0x8039],
+  ["D369",0x80FA],
+  ["D36A",0x80F2],
+  ["D36B",0x80F9],
+  ["D36C",0x80F5],
+  ["D36D",0x8101],
+  ["D36E",0x80FB],
+  ["D36F",0x8100],
+  ["D370",0x8201],
+  ["D371",0x822F],
+  ["D372",0x8225],
+  ["D373",0x8333],
+  ["D374",0x832D],
+  ["D375",0x8344],
+  ["D376",0x8319],
+  ["D377",0x8351],
+  ["D378",0x8325],
+  ["D379",0x8356],
+  ["D37A",0x833F],
+  ["D37B",0x8341],
+  ["D37C",0x8326],
+  ["D37D",0x831C],
+  ["D37E",0x8322],
+  ["D3A1",0x8342],
+  ["D3A2",0x834E],
+  ["D3A3",0x831B],
+  ["D3A4",0x832A],
+  ["D3A5",0x8308],
+  ["D3A6",0x833C],
+  ["D3A7",0x834D],
+  ["D3A8",0x8316],
+  ["D3A9",0x8324],
+  ["D3AA",0x8320],
+  ["D3AB",0x8337],
+  ["D3AC",0x832F],
+  ["D3AD",0x8329],
+  ["D3AE",0x8347],
+  ["D3AF",0x8345],
+  ["D3B0",0x834C],
+  ["D3B1",0x8353],
+  ["D3B2",0x831E],
+  ["D3B3",0x832C],
+  ["D3B4",0x834B],
+  ["D3B5",0x8327],
+  ["D3B6",0x8348],
+  ["D3B7",0x8653],
+  ["D3B8",0x8652],
+  ["D3B9",0x86A2],
+  ["D3BA",0x86A8],
+  ["D3BB",0x8696],
+  ["D3BC",0x868D],
+  ["D3BD",0x8691],
+  ["D3BE",0x869E],
+  ["D3BF",0x8687],
+  ["D3C0",0x8697],
+  ["D3C1",0x8686],
+  ["D3C2",0x868B],
+  ["D3C3",0x869A],
+  ["D3C4",0x8685],
+  ["D3C5",0x86A5],
+  ["D3C6",0x8699],
+  ["D3C7",0x86A1],
+  ["D3C8",0x86A7],
+  ["D3C9",0x8695],
+  ["D3CA",0x8698],
+  ["D3CB",0x868E],
+  ["D3CC",0x869D],
+  ["D3CD",0x8690],
+  ["D3CE",0x8694],
+  ["D3CF",0x8843],
+  ["D3D0",0x8844],
+  ["D3D1",0x886D],
+  ["D3D2",0x8875],
+  ["D3D3",0x8876],
+  ["D3D4",0x8872],
+  ["D3D5",0x8880],
+  ["D3D6",0x8871],
+  ["D3D7",0x887F],
+  ["D3D8",0x886F],
+  ["D3D9",0x8883],
+  ["D3DA",0x887E],
+  ["D3DB",0x8874],
+  ["D3DC",0x887C],
+  ["D3DD",0x8A12],
+  ["D3DE",0x8C47],
+  ["D3DF",0x8C57],
+  ["D3E0",0x8C7B],
+  ["D3E1",0x8CA4],
+  ["D3E2",0x8CA3],
+  ["D3E3",0x8D76],
+  ["D3E4",0x8D78],
+  ["D3E5",0x8DB5],
+  ["D3E6",0x8DB7],
+  ["D3E7",0x8DB6],
+  ["D3E8",0x8ED1],
+  ["D3E9",0x8ED3],
+  ["D3EA",0x8FFE],
+  ["D3EB",0x8FF5],
+  ["D3EC",0x9002],
+  ["D3ED",0x8FFF],
+  ["D3EE",0x8FFB],
+  ["D3EF",0x9004],
+  ["D3F0",0x8FFC],
+  ["D3F1",0x8FF6],
+  ["D3F2",0x90D6],
+  ["D3F3",0x90E0],
+  ["D3F4",0x90D9],
+  ["D3F5",0x90DA],
+  ["D3F6",0x90E3],
+  ["D3F7",0x90DF],
+  ["D3F8",0x90E5],
+  ["D3F9",0x90D8],
+  ["D3FA",0x90DB],
+  ["D3FB",0x90D7],
+  ["D3FC",0x90DC],
+  ["D3FD",0x90E4],
+  ["D3FE",0x9150],
+  ["D440",0x914E],
+  ["D441",0x914F],
+  ["D442",0x91D5],
+  ["D443",0x91E2],
+  ["D444",0x91DA],
+  ["D445",0x965C],
+  ["D446",0x965F],
+  ["D447",0x96BC],
+  ["D448",0x98E3],
+  ["D449",0x9ADF],
+  ["D44A",0x9B2F],
+  ["D44B",0x4E7F],
+  ["D44C",0x5070],
+  ["D44D",0x506A],
+  ["D44E",0x5061],
+  ["D44F",0x505E],
+  ["D450",0x5060],
+  ["D451",0x5053],
+  ["D452",0x504B],
+  ["D453",0x505D],
+  ["D454",0x5072],
+  ["D455",0x5048],
+  ["D456",0x504D],
+  ["D457",0x5041],
+  ["D458",0x505B],
+  ["D459",0x504A],
+  ["D45A",0x5062],
+  ["D45B",0x5015],
+  ["D45C",0x5045],
+  ["D45D",0x505F],
+  ["D45E",0x5069],
+  ["D45F",0x506B],
+  ["D460",0x5063],
+  ["D461",0x5064],
+  ["D462",0x5046],
+  ["D463",0x5040],
+  ["D464",0x506E],
+  ["D465",0x5073],
+  ["D466",0x5057],
+  ["D467",0x5051],
+  ["D468",0x51D0],
+  ["D469",0x526B],
+  ["D46A",0x526D],
+  ["D46B",0x526C],
+  ["D46C",0x526E],
+  ["D46D",0x52D6],
+  ["D46E",0x52D3],
+  ["D46F",0x532D],
+  ["D470",0x539C],
+  ["D471",0x5575],
+  ["D472",0x5576],
+  ["D473",0x553C],
+  ["D474",0x554D],
+  ["D475",0x5550],
+  ["D476",0x5534],
+  ["D477",0x552A],
+  ["D478",0x5551],
+  ["D479",0x5562],
+  ["D47A",0x5536],
+  ["D47B",0x5535],
+  ["D47C",0x5530],
+  ["D47D",0x5552],
+  ["D47E",0x5545],
+  ["D4A1",0x550C],
+  ["D4A2",0x5532],
+  ["D4A3",0x5565],
+  ["D4A4",0x554E],
+  ["D4A5",0x5539],
+  ["D4A6",0x5548],
+  ["D4A7",0x552D],
+  ["D4A8",0x553B],
+  ["D4A9",0x5540],
+  ["D4AA",0x554B],
+  ["D4AB",0x570A],
+  ["D4AC",0x5707],
+  ["D4AD",0x57FB],
+  ["D4AE",0x5814],
+  ["D4AF",0x57E2],
+  ["D4B0",0x57F6],
+  ["D4B1",0x57DC],
+  ["D4B2",0x57F4],
+  ["D4B3",0x5800],
+  ["D4B4",0x57ED],
+  ["D4B5",0x57FD],
+  ["D4B6",0x5808],
+  ["D4B7",0x57F8],
+  ["D4B8",0x580B],
+  ["D4B9",0x57F3],
+  ["D4BA",0x57CF],
+  ["D4BB",0x5807],
+  ["D4BC",0x57EE],
+  ["D4BD",0x57E3],
+  ["D4BE",0x57F2],
+  ["D4BF",0x57E5],
+  ["D4C0",0x57EC],
+  ["D4C1",0x57E1],
+  ["D4C2",0x580E],
+  ["D4C3",0x57FC],
+  ["D4C4",0x5810],
+  ["D4C5",0x57E7],
+  ["D4C6",0x5801],
+  ["D4C7",0x580C],
+  ["D4C8",0x57F1],
+  ["D4C9",0x57E9],
+  ["D4CA",0x57F0],
+  ["D4CB",0x580D],
+  ["D4CC",0x5804],
+  ["D4CD",0x595C],
+  ["D4CE",0x5A60],
+  ["D4CF",0x5A58],
+  ["D4D0",0x5A55],
+  ["D4D1",0x5A67],
+  ["D4D2",0x5A5E],
+  ["D4D3",0x5A38],
+  ["D4D4",0x5A35],
+  ["D4D5",0x5A6D],
+  ["D4D6",0x5A50],
+  ["D4D7",0x5A5F],
+  ["D4D8",0x5A65],
+  ["D4D9",0x5A6C],
+  ["D4DA",0x5A53],
+  ["D4DB",0x5A64],
+  ["D4DC",0x5A57],
+  ["D4DD",0x5A43],
+  ["D4DE",0x5A5D],
+  ["D4DF",0x5A52],
+  ["D4E0",0x5A44],
+  ["D4E1",0x5A5B],
+  ["D4E2",0x5A48],
+  ["D4E3",0x5A8E],
+  ["D4E4",0x5A3E],
+  ["D4E5",0x5A4D],
+  ["D4E6",0x5A39],
+  ["D4E7",0x5A4C],
+  ["D4E8",0x5A70],
+  ["D4E9",0x5A69],
+  ["D4EA",0x5A47],
+  ["D4EB",0x5A51],
+  ["D4EC",0x5A56],
+  ["D4ED",0x5A42],
+  ["D4EE",0x5A5C],
+  ["D4EF",0x5B72],
+  ["D4F0",0x5B6E],
+  ["D4F1",0x5BC1],
+  ["D4F2",0x5BC0],
+  ["D4F3",0x5C59],
+  ["D4F4",0x5D1E],
+  ["D4F5",0x5D0B],
+  ["D4F6",0x5D1D],
+  ["D4F7",0x5D1A],
+  ["D4F8",0x5D20],
+  ["D4F9",0x5D0C],
+  ["D4FA",0x5D28],
+  ["D4FB",0x5D0D],
+  ["D4FC",0x5D26],
+  ["D4FD",0x5D25],
+  ["D4FE",0x5D0F],
+  ["D540",0x5D30],
+  ["D541",0x5D12],
+  ["D542",0x5D23],
+  ["D543",0x5D1F],
+  ["D544",0x5D2E],
+  ["D545",0x5E3E],
+  ["D546",0x5E34],
+  ["D547",0x5EB1],
+  ["D548",0x5EB4],
+  ["D549",0x5EB9],
+  ["D54A",0x5EB2],
+  ["D54B",0x5EB3],
+  ["D54C",0x5F36],
+  ["D54D",0x5F38],
+  ["D54E",0x5F9B],
+  ["D54F",0x5F96],
+  ["D550",0x5F9F],
+  ["D551",0x608A],
+  ["D552",0x6090],
+  ["D553",0x6086],
+  ["D554",0x60BE],
+  ["D555",0x60B0],
+  ["D556",0x60BA],
+  ["D557",0x60D3],
+  ["D558",0x60D4],
+  ["D559",0x60CF],
+  ["D55A",0x60E4],
+  ["D55B",0x60D9],
+  ["D55C",0x60DD],
+  ["D55D",0x60C8],
+  ["D55E",0x60B1],
+  ["D55F",0x60DB],
+  ["D560",0x60B7],
+  ["D561",0x60CA],
+  ["D562",0x60BF],
+  ["D563",0x60C3],
+  ["D564",0x60CD],
+  ["D565",0x60C0],
+  ["D566",0x6332],
+  ["D567",0x6365],
+  ["D568",0x638A],
+  ["D569",0x6382],
+  ["D56A",0x637D],
+  ["D56B",0x63BD],
+  ["D56C",0x639E],
+  ["D56D",0x63AD],
+  ["D56E",0x639D],
+  ["D56F",0x6397],
+  ["D570",0x63AB],
+  ["D571",0x638E],
+  ["D572",0x636F],
+  ["D573",0x6387],
+  ["D574",0x6390],
+  ["D575",0x636E],
+  ["D576",0x63AF],
+  ["D577",0x6375],
+  ["D578",0x639C],
+  ["D579",0x636D],
+  ["D57A",0x63AE],
+  ["D57B",0x637C],
+  ["D57C",0x63A4],
+  ["D57D",0x633B],
+  ["D57E",0x639F],
+  ["D5A1",0x6378],
+  ["D5A2",0x6385],
+  ["D5A3",0x6381],
+  ["D5A4",0x6391],
+  ["D5A5",0x638D],
+  ["D5A6",0x6370],
+  ["D5A7",0x6553],
+  ["D5A8",0x65CD],
+  ["D5A9",0x6665],
+  ["D5AA",0x6661],
+  ["D5AB",0x665B],
+  ["D5AC",0x6659],
+  ["D5AD",0x665C],
+  ["D5AE",0x6662],
+  ["D5AF",0x6718],
+  ["D5B0",0x6879],
+  ["D5B1",0x6887],
+  ["D5B2",0x6890],
+  ["D5B3",0x689C],
+  ["D5B4",0x686D],
+  ["D5B5",0x686E],
+  ["D5B6",0x68AE],
+  ["D5B7",0x68AB],
+  ["D5B8",0x6956],
+  ["D5B9",0x686F],
+  ["D5BA",0x68A3],
+  ["D5BB",0x68AC],
+  ["D5BC",0x68A9],
+  ["D5BD",0x6875],
+  ["D5BE",0x6874],
+  ["D5BF",0x68B2],
+  ["D5C0",0x688F],
+  ["D5C1",0x6877],
+  ["D5C2",0x6892],
+  ["D5C3",0x687C],
+  ["D5C4",0x686B],
+  ["D5C5",0x6872],
+  ["D5C6",0x68AA],
+  ["D5C7",0x6880],
+  ["D5C8",0x6871],
+  ["D5C9",0x687E],
+  ["D5CA",0x689B],
+  ["D5CB",0x6896],
+  ["D5CC",0x688B],
+  ["D5CD",0x68A0],
+  ["D5CE",0x6889],
+  ["D5CF",0x68A4],
+  ["D5D0",0x6878],
+  ["D5D1",0x687B],
+  ["D5D2",0x6891],
+  ["D5D3",0x688C],
+  ["D5D4",0x688A],
+  ["D5D5",0x687D],
+  ["D5D6",0x6B36],
+  ["D5D7",0x6B33],
+  ["D5D8",0x6B37],
+  ["D5D9",0x6B38],
+  ["D5DA",0x6B91],
+  ["D5DB",0x6B8F],
+  ["D5DC",0x6B8D],
+  ["D5DD",0x6B8E],
+  ["D5DE",0x6B8C],
+  ["D5DF",0x6C2A],
+  ["D5E0",0x6DC0],
+  ["D5E1",0x6DAB],
+  ["D5E2",0x6DB4],
+  ["D5E3",0x6DB3],
+  ["D5E4",0x6E74],
+  ["D5E5",0x6DAC],
+  ["D5E6",0x6DE9],
+  ["D5E7",0x6DE2],
+  ["D5E8",0x6DB7],
+  ["D5E9",0x6DF6],
+  ["D5EA",0x6DD4],
+  ["D5EB",0x6E00],
+  ["D5EC",0x6DC8],
+  ["D5ED",0x6DE0],
+  ["D5EE",0x6DDF],
+  ["D5EF",0x6DD6],
+  ["D5F0",0x6DBE],
+  ["D5F1",0x6DE5],
+  ["D5F2",0x6DDC],
+  ["D5F3",0x6DDD],
+  ["D5F4",0x6DDB],
+  ["D5F5",0x6DF4],
+  ["D5F6",0x6DCA],
+  ["D5F7",0x6DBD],
+  ["D5F8",0x6DED],
+  ["D5F9",0x6DF0],
+  ["D5FA",0x6DBA],
+  ["D5FB",0x6DD5],
+  ["D5FC",0x6DC2],
+  ["D5FD",0x6DCF],
+  ["D5FE",0x6DC9],
+  ["D640",0x6DD0],
+  ["D641",0x6DF2],
+  ["D642",0x6DD3],
+  ["D643",0x6DFD],
+  ["D644",0x6DD7],
+  ["D645",0x6DCD],
+  ["D646",0x6DE3],
+  ["D647",0x6DBB],
+  ["D648",0x70FA],
+  ["D649",0x710D],
+  ["D64A",0x70F7],
+  ["D64B",0x7117],
+  ["D64C",0x70F4],
+  ["D64D",0x710C],
+  ["D64E",0x70F0],
+  ["D64F",0x7104],
+  ["D650",0x70F3],
+  ["D651",0x7110],
+  ["D652",0x70FC],
+  ["D653",0x70FF],
+  ["D654",0x7106],
+  ["D655",0x7113],
+  ["D656",0x7100],
+  ["D657",0x70F8],
+  ["D658",0x70F6],
+  ["D659",0x710B],
+  ["D65A",0x7102],
+  ["D65B",0x710E],
+  ["D65C",0x727E],
+  ["D65D",0x727B],
+  ["D65E",0x727C],
+  ["D65F",0x727F],
+  ["D660",0x731D],
+  ["D661",0x7317],
+  ["D662",0x7307],
+  ["D663",0x7311],
+  ["D664",0x7318],
+  ["D665",0x730A],
+  ["D666",0x7308],
+  ["D667",0x72FF],
+  ["D668",0x730F],
+  ["D669",0x731E],
+  ["D66A",0x7388],
+  ["D66B",0x73F6],
+  ["D66C",0x73F8],
+  ["D66D",0x73F5],
+  ["D66E",0x7404],
+  ["D66F",0x7401],
+  ["D670",0x73FD],
+  ["D671",0x7407],
+  ["D672",0x7400],
+  ["D673",0x73FA],
+  ["D674",0x73FC],
+  ["D675",0x73FF],
+  ["D676",0x740C],
+  ["D677",0x740B],
+  ["D678",0x73F4],
+  ["D679",0x7408],
+  ["D67A",0x7564],
+  ["D67B",0x7563],
+  ["D67C",0x75CE],
+  ["D67D",0x75D2],
+  ["D67E",0x75CF],
+  ["D6A1",0x75CB],
+  ["D6A2",0x75CC],
+  ["D6A3",0x75D1],
+  ["D6A4",0x75D0],
+  ["D6A5",0x768F],
+  ["D6A6",0x7689],
+  ["D6A7",0x76D3],
+  ["D6A8",0x7739],
+  ["D6A9",0x772F],
+  ["D6AA",0x772D],
+  ["D6AB",0x7731],
+  ["D6AC",0x7732],
+  ["D6AD",0x7734],
+  ["D6AE",0x7733],
+  ["D6AF",0x773D],
+  ["D6B0",0x7725],
+  ["D6B1",0x773B],
+  ["D6B2",0x7735],
+  ["D6B3",0x7848],
+  ["D6B4",0x7852],
+  ["D6B5",0x7849],
+  ["D6B6",0x784D],
+  ["D6B7",0x784A],
+  ["D6B8",0x784C],
+  ["D6B9",0x7826],
+  ["D6BA",0x7845],
+  ["D6BB",0x7850],
+  ["D6BC",0x7964],
+  ["D6BD",0x7967],
+  ["D6BE",0x7969],
+  ["D6BF",0x796A],
+  ["D6C0",0x7963],
+  ["D6C1",0x796B],
+  ["D6C2",0x7961],
+  ["D6C3",0x79BB],
+  ["D6C4",0x79FA],
+  ["D6C5",0x79F8],
+  ["D6C6",0x79F6],
+  ["D6C7",0x79F7],
+  ["D6C8",0x7A8F],
+  ["D6C9",0x7A94],
+  ["D6CA",0x7A90],
+  ["D6CB",0x7B35],
+  ["D6CC",0x7B47],
+  ["D6CD",0x7B34],
+  ["D6CE",0x7B25],
+  ["D6CF",0x7B30],
+  ["D6D0",0x7B22],
+  ["D6D1",0x7B24],
+  ["D6D2",0x7B33],
+  ["D6D3",0x7B18],
+  ["D6D4",0x7B2A],
+  ["D6D5",0x7B1D],
+  ["D6D6",0x7B31],
+  ["D6D7",0x7B2B],
+  ["D6D8",0x7B2D],
+  ["D6D9",0x7B2F],
+  ["D6DA",0x7B32],
+  ["D6DB",0x7B38],
+  ["D6DC",0x7B1A],
+  ["D6DD",0x7B23],
+  ["D6DE",0x7C94],
+  ["D6DF",0x7C98],
+  ["D6E0",0x7C96],
+  ["D6E1",0x7CA3],
+  ["D6E2",0x7D35],
+  ["D6E3",0x7D3D],
+  ["D6E4",0x7D38],
+  ["D6E5",0x7D36],
+  ["D6E6",0x7D3A],
+  ["D6E7",0x7D45],
+  ["D6E8",0x7D2C],
+  ["D6E9",0x7D29],
+  ["D6EA",0x7D41],
+  ["D6EB",0x7D47],
+  ["D6EC",0x7D3E],
+  ["D6ED",0x7D3F],
+  ["D6EE",0x7D4A],
+  ["D6EF",0x7D3B],
+  ["D6F0",0x7D28],
+  ["D6F1",0x7F63],
+  ["D6F2",0x7F95],
+  ["D6F3",0x7F9C],
+  ["D6F4",0x7F9D],
+  ["D6F5",0x7F9B],
+  ["D6F6",0x7FCA],
+  ["D6F7",0x7FCB],
+  ["D6F8",0x7FCD],
+  ["D6F9",0x7FD0],
+  ["D6FA",0x7FD1],
+  ["D6FB",0x7FC7],
+  ["D6FC",0x7FCF],
+  ["D6FD",0x7FC9],
+  ["D6FE",0x801F],
+  ["D740",0x801E],
+  ["D741",0x801B],
+  ["D742",0x8047],
+  ["D743",0x8043],
+  ["D744",0x8048],
+  ["D745",0x8118],
+  ["D746",0x8125],
+  ["D747",0x8119],
+  ["D748",0x811B],
+  ["D749",0x812D],
+  ["D74A",0x811F],
+  ["D74B",0x812C],
+  ["D74C",0x811E],
+  ["D74D",0x8121],
+  ["D74E",0x8115],
+  ["D74F",0x8127],
+  ["D750",0x811D],
+  ["D751",0x8122],
+  ["D752",0x8211],
+  ["D753",0x8238],
+  ["D754",0x8233],
+  ["D755",0x823A],
+  ["D756",0x8234],
+  ["D757",0x8232],
+  ["D758",0x8274],
+  ["D759",0x8390],
+  ["D75A",0x83A3],
+  ["D75B",0x83A8],
+  ["D75C",0x838D],
+  ["D75D",0x837A],
+  ["D75E",0x8373],
+  ["D75F",0x83A4],
+  ["D760",0x8374],
+  ["D761",0x838F],
+  ["D762",0x8381],
+  ["D763",0x8395],
+  ["D764",0x8399],
+  ["D765",0x8375],
+  ["D766",0x8394],
+  ["D767",0x83A9],
+  ["D768",0x837D],
+  ["D769",0x8383],
+  ["D76A",0x838C],
+  ["D76B",0x839D],
+  ["D76C",0x839B],
+  ["D76D",0x83AA],
+  ["D76E",0x838B],
+  ["D76F",0x837E],
+  ["D770",0x83A5],
+  ["D771",0x83AF],
+  ["D772",0x8388],
+  ["D773",0x8397],
+  ["D774",0x83B0],
+  ["D775",0x837F],
+  ["D776",0x83A6],
+  ["D777",0x8387],
+  ["D778",0x83AE],
+  ["D779",0x8376],
+  ["D77A",0x839A],
+  ["D77B",0x8659],
+  ["D77C",0x8656],
+  ["D77D",0x86BF],
+  ["D77E",0x86B7],
+  ["D7A1",0x86C2],
+  ["D7A2",0x86C1],
+  ["D7A3",0x86C5],
+  ["D7A4",0x86BA],
+  ["D7A5",0x86B0],
+  ["D7A6",0x86C8],
+  ["D7A7",0x86B9],
+  ["D7A8",0x86B3],
+  ["D7A9",0x86B8],
+  ["D7AA",0x86CC],
+  ["D7AB",0x86B4],
+  ["D7AC",0x86BB],
+  ["D7AD",0x86BC],
+  ["D7AE",0x86C3],
+  ["D7AF",0x86BD],
+  ["D7B0",0x86BE],
+  ["D7B1",0x8852],
+  ["D7B2",0x8889],
+  ["D7B3",0x8895],
+  ["D7B4",0x88A8],
+  ["D7B5",0x88A2],
+  ["D7B6",0x88AA],
+  ["D7B7",0x889A],
+  ["D7B8",0x8891],
+  ["D7B9",0x88A1],
+  ["D7BA",0x889F],
+  ["D7BB",0x8898],
+  ["D7BC",0x88A7],
+  ["D7BD",0x8899],
+  ["D7BE",0x889B],
+  ["D7BF",0x8897],
+  ["D7C0",0x88A4],
+  ["D7C1",0x88AC],
+  ["D7C2",0x888C],
+  ["D7C3",0x8893],
+  ["D7C4",0x888E],
+  ["D7C5",0x8982],
+  ["D7C6",0x89D6],
+  ["D7C7",0x89D9],
+  ["D7C8",0x89D5],
+  ["D7C9",0x8A30],
+  ["D7CA",0x8A27],
+  ["D7CB",0x8A2C],
+  ["D7CC",0x8A1E],
+  ["D7CD",0x8C39],
+  ["D7CE",0x8C3B],
+  ["D7CF",0x8C5C],
+  ["D7D0",0x8C5D],
+  ["D7D1",0x8C7D],
+  ["D7D2",0x8CA5],
+  ["D7D3",0x8D7D],
+  ["D7D4",0x8D7B],
+  ["D7D5",0x8D79],
+  ["D7D6",0x8DBC],
+  ["D7D7",0x8DC2],
+  ["D7D8",0x8DB9],
+  ["D7D9",0x8DBF],
+  ["D7DA",0x8DC1],
+  ["D7DB",0x8ED8],
+  ["D7DC",0x8EDE],
+  ["D7DD",0x8EDD],
+  ["D7DE",0x8EDC],
+  ["D7DF",0x8ED7],
+  ["D7E0",0x8EE0],
+  ["D7E1",0x8EE1],
+  ["D7E2",0x9024],
+  ["D7E3",0x900B],
+  ["D7E4",0x9011],
+  ["D7E5",0x901C],
+  ["D7E6",0x900C],
+  ["D7E7",0x9021],
+  ["D7E8",0x90EF],
+  ["D7E9",0x90EA],
+  ["D7EA",0x90F0],
+  ["D7EB",0x90F4],
+  ["D7EC",0x90F2],
+  ["D7ED",0x90F3],
+  ["D7EE",0x90D4],
+  ["D7EF",0x90EB],
+  ["D7F0",0x90EC],
+  ["D7F1",0x90E9],
+  ["D7F2",0x9156],
+  ["D7F3",0x9158],
+  ["D7F4",0x915A],
+  ["D7F5",0x9153],
+  ["D7F6",0x9155],
+  ["D7F7",0x91EC],
+  ["D7F8",0x91F4],
+  ["D7F9",0x91F1],
+  ["D7FA",0x91F3],
+  ["D7FB",0x91F8],
+  ["D7FC",0x91E4],
+  ["D7FD",0x91F9],
+  ["D7FE",0x91EA],
+  ["D840",0x91EB],
+  ["D841",0x91F7],
+  ["D842",0x91E8],
+  ["D843",0x91EE],
+  ["D844",0x957A],
+  ["D845",0x9586],
+  ["D846",0x9588],
+  ["D847",0x967C],
+  ["D848",0x966D],
+  ["D849",0x966B],
+  ["D84A",0x9671],
+  ["D84B",0x966F],
+  ["D84C",0x96BF],
+  ["D84D",0x976A],
+  ["D84E",0x9804],
+  ["D84F",0x98E5],
+  ["D850",0x9997],
+  ["D851",0x509B],
+  ["D852",0x5095],
+  ["D853",0x5094],
+  ["D854",0x509E],
+  ["D855",0x508B],
+  ["D856",0x50A3],
+  ["D857",0x5083],
+  ["D858",0x508C],
+  ["D859",0x508E],
+  ["D85A",0x509D],
+  ["D85B",0x5068],
+  ["D85C",0x509C],
+  ["D85D",0x5092],
+  ["D85E",0x5082],
+  ["D85F",0x5087],
+  ["D860",0x515F],
+  ["D861",0x51D4],
+  ["D862",0x5312],
+  ["D863",0x5311],
+  ["D864",0x53A4],
+  ["D865",0x53A7],
+  ["D866",0x5591],
+  ["D867",0x55A8],
+  ["D868",0x55A5],
+  ["D869",0x55AD],
+  ["D86A",0x5577],
+  ["D86B",0x5645],
+  ["D86C",0x55A2],
+  ["D86D",0x5593],
+  ["D86E",0x5588],
+  ["D86F",0x558F],
+  ["D870",0x55B5],
+  ["D871",0x5581],
+  ["D872",0x55A3],
+  ["D873",0x5592],
+  ["D874",0x55A4],
+  ["D875",0x557D],
+  ["D876",0x558C],
+  ["D877",0x55A6],
+  ["D878",0x557F],
+  ["D879",0x5595],
+  ["D87A",0x55A1],
+  ["D87B",0x558E],
+  ["D87C",0x570C],
+  ["D87D",0x5829],
+  ["D87E",0x5837],
+  ["D8A1",0x5819],
+  ["D8A2",0x581E],
+  ["D8A3",0x5827],
+  ["D8A4",0x5823],
+  ["D8A5",0x5828],
+  ["D8A6",0x57F5],
+  ["D8A7",0x5848],
+  ["D8A8",0x5825],
+  ["D8A9",0x581C],
+  ["D8AA",0x581B],
+  ["D8AB",0x5833],
+  ["D8AC",0x583F],
+  ["D8AD",0x5836],
+  ["D8AE",0x582E],
+  ["D8AF",0x5839],
+  ["D8B0",0x5838],
+  ["D8B1",0x582D],
+  ["D8B2",0x582C],
+  ["D8B3",0x583B],
+  ["D8B4",0x5961],
+  ["D8B5",0x5AAF],
+  ["D8B6",0x5A94],
+  ["D8B7",0x5A9F],
+  ["D8B8",0x5A7A],
+  ["D8B9",0x5AA2],
+  ["D8BA",0x5A9E],
+  ["D8BB",0x5A78],
+  ["D8BC",0x5AA6],
+  ["D8BD",0x5A7C],
+  ["D8BE",0x5AA5],
+  ["D8BF",0x5AAC],
+  ["D8C0",0x5A95],
+  ["D8C1",0x5AAE],
+  ["D8C2",0x5A37],
+  ["D8C3",0x5A84],
+  ["D8C4",0x5A8A],
+  ["D8C5",0x5A97],
+  ["D8C6",0x5A83],
+  ["D8C7",0x5A8B],
+  ["D8C8",0x5AA9],
+  ["D8C9",0x5A7B],
+  ["D8CA",0x5A7D],
+  ["D8CB",0x5A8C],
+  ["D8CC",0x5A9C],
+  ["D8CD",0x5A8F],
+  ["D8CE",0x5A93],
+  ["D8CF",0x5A9D],
+  ["D8D0",0x5BEA],
+  ["D8D1",0x5BCD],
+  ["D8D2",0x5BCB],
+  ["D8D3",0x5BD4],
+  ["D8D4",0x5BD1],
+  ["D8D5",0x5BCA],
+  ["D8D6",0x5BCE],
+  ["D8D7",0x5C0C],
+  ["D8D8",0x5C30],
+  ["D8D9",0x5D37],
+  ["D8DA",0x5D43],
+  ["D8DB",0x5D6B],
+  ["D8DC",0x5D41],
+  ["D8DD",0x5D4B],
+  ["D8DE",0x5D3F],
+  ["D8DF",0x5D35],
+  ["D8E0",0x5D51],
+  ["D8E1",0x5D4E],
+  ["D8E2",0x5D55],
+  ["D8E3",0x5D33],
+  ["D8E4",0x5D3A],
+  ["D8E5",0x5D52],
+  ["D8E6",0x5D3D],
+  ["D8E7",0x5D31],
+  ["D8E8",0x5D59],
+  ["D8E9",0x5D42],
+  ["D8EA",0x5D39],
+  ["D8EB",0x5D49],
+  ["D8EC",0x5D38],
+  ["D8ED",0x5D3C],
+  ["D8EE",0x5D32],
+  ["D8EF",0x5D36],
+  ["D8F0",0x5D40],
+  ["D8F1",0x5D45],
+  ["D8F2",0x5E44],
+  ["D8F3",0x5E41],
+  ["D8F4",0x5F58],
+  ["D8F5",0x5FA6],
+  ["D8F6",0x5FA5],
+  ["D8F7",0x5FAB],
+  ["D8F8",0x60C9],
+  ["D8F9",0x60B9],
+  ["D8FA",0x60CC],
+  ["D8FB",0x60E2],
+  ["D8FC",0x60CE],
+  ["D8FD",0x60C4],
+  ["D8FE",0x6114],
+  ["D940",0x60F2],
+  ["D941",0x610A],
+  ["D942",0x6116],
+  ["D943",0x6105],
+  ["D944",0x60F5],
+  ["D945",0x6113],
+  ["D946",0x60F8],
+  ["D947",0x60FC],
+  ["D948",0x60FE],
+  ["D949",0x60C1],
+  ["D94A",0x6103],
+  ["D94B",0x6118],
+  ["D94C",0x611D],
+  ["D94D",0x6110],
+  ["D94E",0x60FF],
+  ["D94F",0x6104],
+  ["D950",0x610B],
+  ["D951",0x624A],
+  ["D952",0x6394],
+  ["D953",0x63B1],
+  ["D954",0x63B0],
+  ["D955",0x63CE],
+  ["D956",0x63E5],
+  ["D957",0x63E8],
+  ["D958",0x63EF],
+  ["D959",0x63C3],
+  ["D95A",0x649D],
+  ["D95B",0x63F3],
+  ["D95C",0x63CA],
+  ["D95D",0x63E0],
+  ["D95E",0x63F6],
+  ["D95F",0x63D5],
+  ["D960",0x63F2],
+  ["D961",0x63F5],
+  ["D962",0x6461],
+  ["D963",0x63DF],
+  ["D964",0x63BE],
+  ["D965",0x63DD],
+  ["D966",0x63DC],
+  ["D967",0x63C4],
+  ["D968",0x63D8],
+  ["D969",0x63D3],
+  ["D96A",0x63C2],
+  ["D96B",0x63C7],
+  ["D96C",0x63CC],
+  ["D96D",0x63CB],
+  ["D96E",0x63C8],
+  ["D96F",0x63F0],
+  ["D970",0x63D7],
+  ["D971",0x63D9],
+  ["D972",0x6532],
+  ["D973",0x6567],
+  ["D974",0x656A],
+  ["D975",0x6564],
+  ["D976",0x655C],
+  ["D977",0x6568],
+  ["D978",0x6565],
+  ["D979",0x658C],
+  ["D97A",0x659D],
+  ["D97B",0x659E],
+  ["D97C",0x65AE],
+  ["D97D",0x65D0],
+  ["D97E",0x65D2],
+  ["D9A1",0x667C],
+  ["D9A2",0x666C],
+  ["D9A3",0x667B],
+  ["D9A4",0x6680],
+  ["D9A5",0x6671],
+  ["D9A6",0x6679],
+  ["D9A7",0x666A],
+  ["D9A8",0x6672],
+  ["D9A9",0x6701],
+  ["D9AA",0x690C],
+  ["D9AB",0x68D3],
+  ["D9AC",0x6904],
+  ["D9AD",0x68DC],
+  ["D9AE",0x692A],
+  ["D9AF",0x68EC],
+  ["D9B0",0x68EA],
+  ["D9B1",0x68F1],
+  ["D9B2",0x690F],
+  ["D9B3",0x68D6],
+  ["D9B4",0x68F7],
+  ["D9B5",0x68EB],
+  ["D9B6",0x68E4],
+  ["D9B7",0x68F6],
+  ["D9B8",0x6913],
+  ["D9B9",0x6910],
+  ["D9BA",0x68F3],
+  ["D9BB",0x68E1],
+  ["D9BC",0x6907],
+  ["D9BD",0x68CC],
+  ["D9BE",0x6908],
+  ["D9BF",0x6970],
+  ["D9C0",0x68B4],
+  ["D9C1",0x6911],
+  ["D9C2",0x68EF],
+  ["D9C3",0x68C6],
+  ["D9C4",0x6914],
+  ["D9C5",0x68F8],
+  ["D9C6",0x68D0],
+  ["D9C7",0x68FD],
+  ["D9C8",0x68FC],
+  ["D9C9",0x68E8],
+  ["D9CA",0x690B],
+  ["D9CB",0x690A],
+  ["D9CC",0x6917],
+  ["D9CD",0x68CE],
+  ["D9CE",0x68C8],
+  ["D9CF",0x68DD],
+  ["D9D0",0x68DE],
+  ["D9D1",0x68E6],
+  ["D9D2",0x68F4],
+  ["D9D3",0x68D1],
+  ["D9D4",0x6906],
+  ["D9D5",0x68D4],
+  ["D9D6",0x68E9],
+  ["D9D7",0x6915],
+  ["D9D8",0x6925],
+  ["D9D9",0x68C7],
+  ["D9DA",0x6B39],
+  ["D9DB",0x6B3B],
+  ["D9DC",0x6B3F],
+  ["D9DD",0x6B3C],
+  ["D9DE",0x6B94],
+  ["D9DF",0x6B97],
+  ["D9E0",0x6B99],
+  ["D9E1",0x6B95],
+  ["D9E2",0x6BBD],
+  ["D9E3",0x6BF0],
+  ["D9E4",0x6BF2],
+  ["D9E5",0x6BF3],
+  ["D9E6",0x6C30],
+  ["D9E7",0x6DFC],
+  ["D9E8",0x6E46],
+  ["D9E9",0x6E47],
+  ["D9EA",0x6E1F],
+  ["D9EB",0x6E49],
+  ["D9EC",0x6E88],
+  ["D9ED",0x6E3C],
+  ["D9EE",0x6E3D],
+  ["D9EF",0x6E45],
+  ["D9F0",0x6E62],
+  ["D9F1",0x6E2B],
+  ["D9F2",0x6E3F],
+  ["D9F3",0x6E41],
+  ["D9F4",0x6E5D],
+  ["D9F5",0x6E73],
+  ["D9F6",0x6E1C],
+  ["D9F7",0x6E33],
+  ["D9F8",0x6E4B],
+  ["D9F9",0x6E40],
+  ["D9FA",0x6E51],
+  ["D9FB",0x6E3B],
+  ["D9FC",0x6E03],
+  ["D9FD",0x6E2E],
+  ["D9FE",0x6E5E],
+  ["DA40",0x6E68],
+  ["DA41",0x6E5C],
+  ["DA42",0x6E61],
+  ["DA43",0x6E31],
+  ["DA44",0x6E28],
+  ["DA45",0x6E60],
+  ["DA46",0x6E71],
+  ["DA47",0x6E6B],
+  ["DA48",0x6E39],
+  ["DA49",0x6E22],
+  ["DA4A",0x6E30],
+  ["DA4B",0x6E53],
+  ["DA4C",0x6E65],
+  ["DA4D",0x6E27],
+  ["DA4E",0x6E78],
+  ["DA4F",0x6E64],
+  ["DA50",0x6E77],
+  ["DA51",0x6E55],
+  ["DA52",0x6E79],
+  ["DA53",0x6E52],
+  ["DA54",0x6E66],
+  ["DA55",0x6E35],
+  ["DA56",0x6E36],
+  ["DA57",0x6E5A],
+  ["DA58",0x7120],
+  ["DA59",0x711E],
+  ["DA5A",0x712F],
+  ["DA5B",0x70FB],
+  ["DA5C",0x712E],
+  ["DA5D",0x7131],
+  ["DA5E",0x7123],
+  ["DA5F",0x7125],
+  ["DA60",0x7122],
+  ["DA61",0x7132],
+  ["DA62",0x711F],
+  ["DA63",0x7128],
+  ["DA64",0x713A],
+  ["DA65",0x711B],
+  ["DA66",0x724B],
+  ["DA67",0x725A],
+  ["DA68",0x7288],
+  ["DA69",0x7289],
+  ["DA6A",0x7286],
+  ["DA6B",0x7285],
+  ["DA6C",0x728B],
+  ["DA6D",0x7312],
+  ["DA6E",0x730B],
+  ["DA6F",0x7330],
+  ["DA70",0x7322],
+  ["DA71",0x7331],
+  ["DA72",0x7333],
+  ["DA73",0x7327],
+  ["DA74",0x7332],
+  ["DA75",0x732D],
+  ["DA76",0x7326],
+  ["DA77",0x7323],
+  ["DA78",0x7335],
+  ["DA79",0x730C],
+  ["DA7A",0x742E],
+  ["DA7B",0x742C],
+  ["DA7C",0x7430],
+  ["DA7D",0x742B],
+  ["DA7E",0x7416],
+  ["DAA1",0x741A],
+  ["DAA2",0x7421],
+  ["DAA3",0x742D],
+  ["DAA4",0x7431],
+  ["DAA5",0x7424],
+  ["DAA6",0x7423],
+  ["DAA7",0x741D],
+  ["DAA8",0x7429],
+  ["DAA9",0x7420],
+  ["DAAA",0x7432],
+  ["DAAB",0x74FB],
+  ["DAAC",0x752F],
+  ["DAAD",0x756F],
+  ["DAAE",0x756C],
+  ["DAAF",0x75E7],
+  ["DAB0",0x75DA],
+  ["DAB1",0x75E1],
+  ["DAB2",0x75E6],
+  ["DAB3",0x75DD],
+  ["DAB4",0x75DF],
+  ["DAB5",0x75E4],
+  ["DAB6",0x75D7],
+  ["DAB7",0x7695],
+  ["DAB8",0x7692],
+  ["DAB9",0x76DA],
+  ["DABA",0x7746],
+  ["DABB",0x7747],
+  ["DABC",0x7744],
+  ["DABD",0x774D],
+  ["DABE",0x7745],
+  ["DABF",0x774A],
+  ["DAC0",0x774E],
+  ["DAC1",0x774B],
+  ["DAC2",0x774C],
+  ["DAC3",0x77DE],
+  ["DAC4",0x77EC],
+  ["DAC5",0x7860],
+  ["DAC6",0x7864],
+  ["DAC7",0x7865],
+  ["DAC8",0x785C],
+  ["DAC9",0x786D],
+  ["DACA",0x7871],
+  ["DACB",0x786A],
+  ["DACC",0x786E],
+  ["DACD",0x7870],
+  ["DACE",0x7869],
+  ["DACF",0x7868],
+  ["DAD0",0x785E],
+  ["DAD1",0x7862],
+  ["DAD2",0x7974],
+  ["DAD3",0x7973],
+  ["DAD4",0x7972],
+  ["DAD5",0x7970],
+  ["DAD6",0x7A02],
+  ["DAD7",0x7A0A],
+  ["DAD8",0x7A03],
+  ["DAD9",0x7A0C],
+  ["DADA",0x7A04],
+  ["DADB",0x7A99],
+  ["DADC",0x7AE6],
+  ["DADD",0x7AE4],
+  ["DADE",0x7B4A],
+  ["DADF",0x7B3B],
+  ["DAE0",0x7B44],
+  ["DAE1",0x7B48],
+  ["DAE2",0x7B4C],
+  ["DAE3",0x7B4E],
+  ["DAE4",0x7B40],
+  ["DAE5",0x7B58],
+  ["DAE6",0x7B45],
+  ["DAE7",0x7CA2],
+  ["DAE8",0x7C9E],
+  ["DAE9",0x7CA8],
+  ["DAEA",0x7CA1],
+  ["DAEB",0x7D58],
+  ["DAEC",0x7D6F],
+  ["DAED",0x7D63],
+  ["DAEE",0x7D53],
+  ["DAEF",0x7D56],
+  ["DAF0",0x7D67],
+  ["DAF1",0x7D6A],
+  ["DAF2",0x7D4F],
+  ["DAF3",0x7D6D],
+  ["DAF4",0x7D5C],
+  ["DAF5",0x7D6B],
+  ["DAF6",0x7D52],
+  ["DAF7",0x7D54],
+  ["DAF8",0x7D69],
+  ["DAF9",0x7D51],
+  ["DAFA",0x7D5F],
+  ["DAFB",0x7D4E],
+  ["DAFC",0x7F3E],
+  ["DAFD",0x7F3F],
+  ["DAFE",0x7F65],
+  ["DB40",0x7F66],
+  ["DB41",0x7FA2],
+  ["DB42",0x7FA0],
+  ["DB43",0x7FA1],
+  ["DB44",0x7FD7],
+  ["DB45",0x8051],
+  ["DB46",0x804F],
+  ["DB47",0x8050],
+  ["DB48",0x80FE],
+  ["DB49",0x80D4],
+  ["DB4A",0x8143],
+  ["DB4B",0x814A],
+  ["DB4C",0x8152],
+  ["DB4D",0x814F],
+  ["DB4E",0x8147],
+  ["DB4F",0x813D],
+  ["DB50",0x814D],
+  ["DB51",0x813A],
+  ["DB52",0x81E6],
+  ["DB53",0x81EE],
+  ["DB54",0x81F7],
+  ["DB55",0x81F8],
+  ["DB56",0x81F9],
+  ["DB57",0x8204],
+  ["DB58",0x823C],
+  ["DB59",0x823D],
+  ["DB5A",0x823F],
+  ["DB5B",0x8275],
+  ["DB5C",0x833B],
+  ["DB5D",0x83CF],
+  ["DB5E",0x83F9],
+  ["DB5F",0x8423],
+  ["DB60",0x83C0],
+  ["DB61",0x83E8],
+  ["DB62",0x8412],
+  ["DB63",0x83E7],
+  ["DB64",0x83E4],
+  ["DB65",0x83FC],
+  ["DB66",0x83F6],
+  ["DB67",0x8410],
+  ["DB68",0x83C6],
+  ["DB69",0x83C8],
+  ["DB6A",0x83EB],
+  ["DB6B",0x83E3],
+  ["DB6C",0x83BF],
+  ["DB6D",0x8401],
+  ["DB6E",0x83DD],
+  ["DB6F",0x83E5],
+  ["DB70",0x83D8],
+  ["DB71",0x83FF],
+  ["DB72",0x83E1],
+  ["DB73",0x83CB],
+  ["DB74",0x83CE],
+  ["DB75",0x83D6],
+  ["DB76",0x83F5],
+  ["DB77",0x83C9],
+  ["DB78",0x8409],
+  ["DB79",0x840F],
+  ["DB7A",0x83DE],
+  ["DB7B",0x8411],
+  ["DB7C",0x8406],
+  ["DB7D",0x83C2],
+  ["DB7E",0x83F3],
+  ["DBA1",0x83D5],
+  ["DBA2",0x83FA],
+  ["DBA3",0x83C7],
+  ["DBA4",0x83D1],
+  ["DBA5",0x83EA],
+  ["DBA6",0x8413],
+  ["DBA7",0x83C3],
+  ["DBA8",0x83EC],
+  ["DBA9",0x83EE],
+  ["DBAA",0x83C4],
+  ["DBAB",0x83FB],
+  ["DBAC",0x83D7],
+  ["DBAD",0x83E2],
+  ["DBAE",0x841B],
+  ["DBAF",0x83DB],
+  ["DBB0",0x83FE],
+  ["DBB1",0x86D8],
+  ["DBB2",0x86E2],
+  ["DBB3",0x86E6],
+  ["DBB4",0x86D3],
+  ["DBB5",0x86E3],
+  ["DBB6",0x86DA],
+  ["DBB7",0x86EA],
+  ["DBB8",0x86DD],
+  ["DBB9",0x86EB],
+  ["DBBA",0x86DC],
+  ["DBBB",0x86EC],
+  ["DBBC",0x86E9],
+  ["DBBD",0x86D7],
+  ["DBBE",0x86E8],
+  ["DBBF",0x86D1],
+  ["DBC0",0x8848],
+  ["DBC1",0x8856],
+  ["DBC2",0x8855],
+  ["DBC3",0x88BA],
+  ["DBC4",0x88D7],
+  ["DBC5",0x88B9],
+  ["DBC6",0x88B8],
+  ["DBC7",0x88C0],
+  ["DBC8",0x88BE],
+  ["DBC9",0x88B6],
+  ["DBCA",0x88BC],
+  ["DBCB",0x88B7],
+  ["DBCC",0x88BD],
+  ["DBCD",0x88B2],
+  ["DBCE",0x8901],
+  ["DBCF",0x88C9],
+  ["DBD0",0x8995],
+  ["DBD1",0x8998],
+  ["DBD2",0x8997],
+  ["DBD3",0x89DD],
+  ["DBD4",0x89DA],
+  ["DBD5",0x89DB],
+  ["DBD6",0x8A4E],
+  ["DBD7",0x8A4D],
+  ["DBD8",0x8A39],
+  ["DBD9",0x8A59],
+  ["DBDA",0x8A40],
+  ["DBDB",0x8A57],
+  ["DBDC",0x8A58],
+  ["DBDD",0x8A44],
+  ["DBDE",0x8A45],
+  ["DBDF",0x8A52],
+  ["DBE0",0x8A48],
+  ["DBE1",0x8A51],
+  ["DBE2",0x8A4A],
+  ["DBE3",0x8A4C],
+  ["DBE4",0x8A4F],
+  ["DBE5",0x8C5F],
+  ["DBE6",0x8C81],
+  ["DBE7",0x8C80],
+  ["DBE8",0x8CBA],
+  ["DBE9",0x8CBE],
+  ["DBEA",0x8CB0],
+  ["DBEB",0x8CB9],
+  ["DBEC",0x8CB5],
+  ["DBED",0x8D84],
+  ["DBEE",0x8D80],
+  ["DBEF",0x8D89],
+  ["DBF0",0x8DD8],
+  ["DBF1",0x8DD3],
+  ["DBF2",0x8DCD],
+  ["DBF3",0x8DC7],
+  ["DBF4",0x8DD6],
+  ["DBF5",0x8DDC],
+  ["DBF6",0x8DCF],
+  ["DBF7",0x8DD5],
+  ["DBF8",0x8DD9],
+  ["DBF9",0x8DC8],
+  ["DBFA",0x8DD7],
+  ["DBFB",0x8DC5],
+  ["DBFC",0x8EEF],
+  ["DBFD",0x8EF7],
+  ["DBFE",0x8EFA],
+  ["DC40",0x8EF9],
+  ["DC41",0x8EE6],
+  ["DC42",0x8EEE],
+  ["DC43",0x8EE5],
+  ["DC44",0x8EF5],
+  ["DC45",0x8EE7],
+  ["DC46",0x8EE8],
+  ["DC47",0x8EF6],
+  ["DC48",0x8EEB],
+  ["DC49",0x8EF1],
+  ["DC4A",0x8EEC],
+  ["DC4B",0x8EF4],
+  ["DC4C",0x8EE9],
+  ["DC4D",0x902D],
+  ["DC4E",0x9034],
+  ["DC4F",0x902F],
+  ["DC50",0x9106],
+  ["DC51",0x912C],
+  ["DC52",0x9104],
+  ["DC53",0x90FF],
+  ["DC54",0x90FC],
+  ["DC55",0x9108],
+  ["DC56",0x90F9],
+  ["DC57",0x90FB],
+  ["DC58",0x9101],
+  ["DC59",0x9100],
+  ["DC5A",0x9107],
+  ["DC5B",0x9105],
+  ["DC5C",0x9103],
+  ["DC5D",0x9161],
+  ["DC5E",0x9164],
+  ["DC5F",0x915F],
+  ["DC60",0x9162],
+  ["DC61",0x9160],
+  ["DC62",0x9201],
+  ["DC63",0x920A],
+  ["DC64",0x9225],
+  ["DC65",0x9203],
+  ["DC66",0x921A],
+  ["DC67",0x9226],
+  ["DC68",0x920F],
+  ["DC69",0x920C],
+  ["DC6A",0x9200],
+  ["DC6B",0x9212],
+  ["DC6C",0x91FF],
+  ["DC6D",0x91FD],
+  ["DC6E",0x9206],
+  ["DC6F",0x9204],
+  ["DC70",0x9227],
+  ["DC71",0x9202],
+  ["DC72",0x921C],
+  ["DC73",0x9224],
+  ["DC74",0x9219],
+  ["DC75",0x9217],
+  ["DC76",0x9205],
+  ["DC77",0x9216],
+  ["DC78",0x957B],
+  ["DC79",0x958D],
+  ["DC7A",0x958C],
+  ["DC7B",0x9590],
+  ["DC7C",0x9687],
+  ["DC7D",0x967E],
+  ["DC7E",0x9688],
+  ["DCA1",0x9689],
+  ["DCA2",0x9683],
+  ["DCA3",0x9680],
+  ["DCA4",0x96C2],
+  ["DCA5",0x96C8],
+  ["DCA6",0x96C3],
+  ["DCA7",0x96F1],
+  ["DCA8",0x96F0],
+  ["DCA9",0x976C],
+  ["DCAA",0x9770],
+  ["DCAB",0x976E],
+  ["DCAC",0x9807],
+  ["DCAD",0x98A9],
+  ["DCAE",0x98EB],
+  ["DCAF",0x9CE6],
+  ["DCB0",0x9EF9],
+  ["DCB1",0x4E83],
+  ["DCB2",0x4E84],
+  ["DCB3",0x4EB6],
+  ["DCB4",0x50BD],
+  ["DCB5",0x50BF],
+  ["DCB6",0x50C6],
+  ["DCB7",0x50AE],
+  ["DCB8",0x50C4],
+  ["DCB9",0x50CA],
+  ["DCBA",0x50B4],
+  ["DCBB",0x50C8],
+  ["DCBC",0x50C2],
+  ["DCBD",0x50B0],
+  ["DCBE",0x50C1],
+  ["DCBF",0x50BA],
+  ["DCC0",0x50B1],
+  ["DCC1",0x50CB],
+  ["DCC2",0x50C9],
+  ["DCC3",0x50B6],
+  ["DCC4",0x50B8],
+  ["DCC5",0x51D7],
+  ["DCC6",0x527A],
+  ["DCC7",0x5278],
+  ["DCC8",0x527B],
+  ["DCC9",0x527C],
+  ["DCCA",0x55C3],
+  ["DCCB",0x55DB],
+  ["DCCC",0x55CC],
+  ["DCCD",0x55D0],
+  ["DCCE",0x55CB],
+  ["DCCF",0x55CA],
+  ["DCD0",0x55DD],
+  ["DCD1",0x55C0],
+  ["DCD2",0x55D4],
+  ["DCD3",0x55C4],
+  ["DCD4",0x55E9],
+  ["DCD5",0x55BF],
+  ["DCD6",0x55D2],
+  ["DCD7",0x558D],
+  ["DCD8",0x55CF],
+  ["DCD9",0x55D5],
+  ["DCDA",0x55E2],
+  ["DCDB",0x55D6],
+  ["DCDC",0x55C8],
+  ["DCDD",0x55F2],
+  ["DCDE",0x55CD],
+  ["DCDF",0x55D9],
+  ["DCE0",0x55C2],
+  ["DCE1",0x5714],
+  ["DCE2",0x5853],
+  ["DCE3",0x5868],
+  ["DCE4",0x5864],
+  ["DCE5",0x584F],
+  ["DCE6",0x584D],
+  ["DCE7",0x5849],
+  ["DCE8",0x586F],
+  ["DCE9",0x5855],
+  ["DCEA",0x584E],
+  ["DCEB",0x585D],
+  ["DCEC",0x5859],
+  ["DCED",0x5865],
+  ["DCEE",0x585B],
+  ["DCEF",0x583D],
+  ["DCF0",0x5863],
+  ["DCF1",0x5871],
+  ["DCF2",0x58FC],
+  ["DCF3",0x5AC7],
+  ["DCF4",0x5AC4],
+  ["DCF5",0x5ACB],
+  ["DCF6",0x5ABA],
+  ["DCF7",0x5AB8],
+  ["DCF8",0x5AB1],
+  ["DCF9",0x5AB5],
+  ["DCFA",0x5AB0],
+  ["DCFB",0x5ABF],
+  ["DCFC",0x5AC8],
+  ["DCFD",0x5ABB],
+  ["DCFE",0x5AC6],
+  ["DD40",0x5AB7],
+  ["DD41",0x5AC0],
+  ["DD42",0x5ACA],
+  ["DD43",0x5AB4],
+  ["DD44",0x5AB6],
+  ["DD45",0x5ACD],
+  ["DD46",0x5AB9],
+  ["DD47",0x5A90],
+  ["DD48",0x5BD6],
+  ["DD49",0x5BD8],
+  ["DD4A",0x5BD9],
+  ["DD4B",0x5C1F],
+  ["DD4C",0x5C33],
+  ["DD4D",0x5D71],
+  ["DD4E",0x5D63],
+  ["DD4F",0x5D4A],
+  ["DD50",0x5D65],
+  ["DD51",0x5D72],
+  ["DD52",0x5D6C],
+  ["DD53",0x5D5E],
+  ["DD54",0x5D68],
+  ["DD55",0x5D67],
+  ["DD56",0x5D62],
+  ["DD57",0x5DF0],
+  ["DD58",0x5E4F],
+  ["DD59",0x5E4E],
+  ["DD5A",0x5E4A],
+  ["DD5B",0x5E4D],
+  ["DD5C",0x5E4B],
+  ["DD5D",0x5EC5],
+  ["DD5E",0x5ECC],
+  ["DD5F",0x5EC6],
+  ["DD60",0x5ECB],
+  ["DD61",0x5EC7],
+  ["DD62",0x5F40],
+  ["DD63",0x5FAF],
+  ["DD64",0x5FAD],
+  ["DD65",0x60F7],
+  ["DD66",0x6149],
+  ["DD67",0x614A],
+  ["DD68",0x612B],
+  ["DD69",0x6145],
+  ["DD6A",0x6136],
+  ["DD6B",0x6132],
+  ["DD6C",0x612E],
+  ["DD6D",0x6146],
+  ["DD6E",0x612F],
+  ["DD6F",0x614F],
+  ["DD70",0x6129],
+  ["DD71",0x6140],
+  ["DD72",0x6220],
+  ["DD73",0x9168],
+  ["DD74",0x6223],
+  ["DD75",0x6225],
+  ["DD76",0x6224],
+  ["DD77",0x63C5],
+  ["DD78",0x63F1],
+  ["DD79",0x63EB],
+  ["DD7A",0x6410],
+  ["DD7B",0x6412],
+  ["DD7C",0x6409],
+  ["DD7D",0x6420],
+  ["DD7E",0x6424],
+  ["DDA1",0x6433],
+  ["DDA2",0x6443],
+  ["DDA3",0x641F],
+  ["DDA4",0x6415],
+  ["DDA5",0x6418],
+  ["DDA6",0x6439],
+  ["DDA7",0x6437],
+  ["DDA8",0x6422],
+  ["DDA9",0x6423],
+  ["DDAA",0x640C],
+  ["DDAB",0x6426],
+  ["DDAC",0x6430],
+  ["DDAD",0x6428],
+  ["DDAE",0x6441],
+  ["DDAF",0x6435],
+  ["DDB0",0x642F],
+  ["DDB1",0x640A],
+  ["DDB2",0x641A],
+  ["DDB3",0x6440],
+  ["DDB4",0x6425],
+  ["DDB5",0x6427],
+  ["DDB6",0x640B],
+  ["DDB7",0x63E7],
+  ["DDB8",0x641B],
+  ["DDB9",0x642E],
+  ["DDBA",0x6421],
+  ["DDBB",0x640E],
+  ["DDBC",0x656F],
+  ["DDBD",0x6592],
+  ["DDBE",0x65D3],
+  ["DDBF",0x6686],
+  ["DDC0",0x668C],
+  ["DDC1",0x6695],
+  ["DDC2",0x6690],
+  ["DDC3",0x668B],
+  ["DDC4",0x668A],
+  ["DDC5",0x6699],
+  ["DDC6",0x6694],
+  ["DDC7",0x6678],
+  ["DDC8",0x6720],
+  ["DDC9",0x6966],
+  ["DDCA",0x695F],
+  ["DDCB",0x6938],
+  ["DDCC",0x694E],
+  ["DDCD",0x6962],
+  ["DDCE",0x6971],
+  ["DDCF",0x693F],
+  ["DDD0",0x6945],
+  ["DDD1",0x696A],
+  ["DDD2",0x6939],
+  ["DDD3",0x6942],
+  ["DDD4",0x6957],
+  ["DDD5",0x6959],
+  ["DDD6",0x697A],
+  ["DDD7",0x6948],
+  ["DDD8",0x6949],
+  ["DDD9",0x6935],
+  ["DDDA",0x696C],
+  ["DDDB",0x6933],
+  ["DDDC",0x693D],
+  ["DDDD",0x6965],
+  ["DDDE",0x68F0],
+  ["DDDF",0x6978],
+  ["DDE0",0x6934],
+  ["DDE1",0x6969],
+  ["DDE2",0x6940],
+  ["DDE3",0x696F],
+  ["DDE4",0x6944],
+  ["DDE5",0x6976],
+  ["DDE6",0x6958],
+  ["DDE7",0x6941],
+  ["DDE8",0x6974],
+  ["DDE9",0x694C],
+  ["DDEA",0x693B],
+  ["DDEB",0x694B],
+  ["DDEC",0x6937],
+  ["DDED",0x695C],
+  ["DDEE",0x694F],
+  ["DDEF",0x6951],
+  ["DDF0",0x6932],
+  ["DDF1",0x6952],
+  ["DDF2",0x692F],
+  ["DDF3",0x697B],
+  ["DDF4",0x693C],
+  ["DDF5",0x6B46],
+  ["DDF6",0x6B45],
+  ["DDF7",0x6B43],
+  ["DDF8",0x6B42],
+  ["DDF9",0x6B48],
+  ["DDFA",0x6B41],
+  ["DDFB",0x6B9B],
+  ["DDFC",0xFA0D],
+  ["DDFD",0x6BFB],
+  ["DDFE",0x6BFC],
+  ["DE40",0x6BF9],
+  ["DE41",0x6BF7],
+  ["DE42",0x6BF8],
+  ["DE43",0x6E9B],
+  ["DE44",0x6ED6],
+  ["DE45",0x6EC8],
+  ["DE46",0x6E8F],
+  ["DE47",0x6EC0],
+  ["DE48",0x6E9F],
+  ["DE49",0x6E93],
+  ["DE4A",0x6E94],
+  ["DE4B",0x6EA0],
+  ["DE4C",0x6EB1],
+  ["DE4D",0x6EB9],
+  ["DE4E",0x6EC6],
+  ["DE4F",0x6ED2],
+  ["DE50",0x6EBD],
+  ["DE51",0x6EC1],
+  ["DE52",0x6E9E],
+  ["DE53",0x6EC9],
+  ["DE54",0x6EB7],
+  ["DE55",0x6EB0],
+  ["DE56",0x6ECD],
+  ["DE57",0x6EA6],
+  ["DE58",0x6ECF],
+  ["DE59",0x6EB2],
+  ["DE5A",0x6EBE],
+  ["DE5B",0x6EC3],
+  ["DE5C",0x6EDC],
+  ["DE5D",0x6ED8],
+  ["DE5E",0x6E99],
+  ["DE5F",0x6E92],
+  ["DE60",0x6E8E],
+  ["DE61",0x6E8D],
+  ["DE62",0x6EA4],
+  ["DE63",0x6EA1],
+  ["DE64",0x6EBF],
+  ["DE65",0x6EB3],
+  ["DE66",0x6ED0],
+  ["DE67",0x6ECA],
+  ["DE68",0x6E97],
+  ["DE69",0x6EAE],
+  ["DE6A",0x6EA3],
+  ["DE6B",0x7147],
+  ["DE6C",0x7154],
+  ["DE6D",0x7152],
+  ["DE6E",0x7163],
+  ["DE6F",0x7160],
+  ["DE70",0x7141],
+  ["DE71",0x715D],
+  ["DE72",0x7162],
+  ["DE73",0x7172],
+  ["DE74",0x7178],
+  ["DE75",0x716A],
+  ["DE76",0x7161],
+  ["DE77",0x7142],
+  ["DE78",0x7158],
+  ["DE79",0x7143],
+  ["DE7A",0x714B],
+  ["DE7B",0x7170],
+  ["DE7C",0x715F],
+  ["DE7D",0x7150],
+  ["DE7E",0x7153],
+  ["DEA1",0x7144],
+  ["DEA2",0x714D],
+  ["DEA3",0x715A],
+  ["DEA4",0x724F],
+  ["DEA5",0x728D],
+  ["DEA6",0x728C],
+  ["DEA7",0x7291],
+  ["DEA8",0x7290],
+  ["DEA9",0x728E],
+  ["DEAA",0x733C],
+  ["DEAB",0x7342],
+  ["DEAC",0x733B],
+  ["DEAD",0x733A],
+  ["DEAE",0x7340],
+  ["DEAF",0x734A],
+  ["DEB0",0x7349],
+  ["DEB1",0x7444],
+  ["DEB2",0x744A],
+  ["DEB3",0x744B],
+  ["DEB4",0x7452],
+  ["DEB5",0x7451],
+  ["DEB6",0x7457],
+  ["DEB7",0x7440],
+  ["DEB8",0x744F],
+  ["DEB9",0x7450],
+  ["DEBA",0x744E],
+  ["DEBB",0x7442],
+  ["DEBC",0x7446],
+  ["DEBD",0x744D],
+  ["DEBE",0x7454],
+  ["DEBF",0x74E1],
+  ["DEC0",0x74FF],
+  ["DEC1",0x74FE],
+  ["DEC2",0x74FD],
+  ["DEC3",0x751D],
+  ["DEC4",0x7579],
+  ["DEC5",0x7577],
+  ["DEC6",0x6983],
+  ["DEC7",0x75EF],
+  ["DEC8",0x760F],
+  ["DEC9",0x7603],
+  ["DECA",0x75F7],
+  ["DECB",0x75FE],
+  ["DECC",0x75FC],
+  ["DECD",0x75F9],
+  ["DECE",0x75F8],
+  ["DECF",0x7610],
+  ["DED0",0x75FB],
+  ["DED1",0x75F6],
+  ["DED2",0x75ED],
+  ["DED3",0x75F5],
+  ["DED4",0x75FD],
+  ["DED5",0x7699],
+  ["DED6",0x76B5],
+  ["DED7",0x76DD],
+  ["DED8",0x7755],
+  ["DED9",0x775F],
+  ["DEDA",0x7760],
+  ["DEDB",0x7752],
+  ["DEDC",0x7756],
+  ["DEDD",0x775A],
+  ["DEDE",0x7769],
+  ["DEDF",0x7767],
+  ["DEE0",0x7754],
+  ["DEE1",0x7759],
+  ["DEE2",0x776D],
+  ["DEE3",0x77E0],
+  ["DEE4",0x7887],
+  ["DEE5",0x789A],
+  ["DEE6",0x7894],
+  ["DEE7",0x788F],
+  ["DEE8",0x7884],
+  ["DEE9",0x7895],
+  ["DEEA",0x7885],
+  ["DEEB",0x7886],
+  ["DEEC",0x78A1],
+  ["DEED",0x7883],
+  ["DEEE",0x7879],
+  ["DEEF",0x7899],
+  ["DEF0",0x7880],
+  ["DEF1",0x7896],
+  ["DEF2",0x787B],
+  ["DEF3",0x797C],
+  ["DEF4",0x7982],
+  ["DEF5",0x797D],
+  ["DEF6",0x7979],
+  ["DEF7",0x7A11],
+  ["DEF8",0x7A18],
+  ["DEF9",0x7A19],
+  ["DEFA",0x7A12],
+  ["DEFB",0x7A17],
+  ["DEFC",0x7A15],
+  ["DEFD",0x7A22],
+  ["DEFE",0x7A13],
+  ["DF40",0x7A1B],
+  ["DF41",0x7A10],
+  ["DF42",0x7AA3],
+  ["DF43",0x7AA2],
+  ["DF44",0x7A9E],
+  ["DF45",0x7AEB],
+  ["DF46",0x7B66],
+  ["DF47",0x7B64],
+  ["DF48",0x7B6D],
+  ["DF49",0x7B74],
+  ["DF4A",0x7B69],
+  ["DF4B",0x7B72],
+  ["DF4C",0x7B65],
+  ["DF4D",0x7B73],
+  ["DF4E",0x7B71],
+  ["DF4F",0x7B70],
+  ["DF50",0x7B61],
+  ["DF51",0x7B78],
+  ["DF52",0x7B76],
+  ["DF53",0x7B63],
+  ["DF54",0x7CB2],
+  ["DF55",0x7CB4],
+  ["DF56",0x7CAF],
+  ["DF57",0x7D88],
+  ["DF58",0x7D86],
+  ["DF59",0x7D80],
+  ["DF5A",0x7D8D],
+  ["DF5B",0x7D7F],
+  ["DF5C",0x7D85],
+  ["DF5D",0x7D7A],
+  ["DF5E",0x7D8E],
+  ["DF5F",0x7D7B],
+  ["DF60",0x7D83],
+  ["DF61",0x7D7C],
+  ["DF62",0x7D8C],
+  ["DF63",0x7D94],
+  ["DF64",0x7D84],
+  ["DF65",0x7D7D],
+  ["DF66",0x7D92],
+  ["DF67",0x7F6D],
+  ["DF68",0x7F6B],
+  ["DF69",0x7F67],
+  ["DF6A",0x7F68],
+  ["DF6B",0x7F6C],
+  ["DF6C",0x7FA6],
+  ["DF6D",0x7FA5],
+  ["DF6E",0x7FA7],
+  ["DF6F",0x7FDB],
+  ["DF70",0x7FDC],
+  ["DF71",0x8021],
+  ["DF72",0x8164],
+  ["DF73",0x8160],
+  ["DF74",0x8177],
+  ["DF75",0x815C],
+  ["DF76",0x8169],
+  ["DF77",0x815B],
+  ["DF78",0x8162],
+  ["DF79",0x8172],
+  ["DF7A",0x6721],
+  ["DF7B",0x815E],
+  ["DF7C",0x8176],
+  ["DF7D",0x8167],
+  ["DF7E",0x816F],
+  ["DFA1",0x8144],
+  ["DFA2",0x8161],
+  ["DFA3",0x821D],
+  ["DFA4",0x8249],
+  ["DFA5",0x8244],
+  ["DFA6",0x8240],
+  ["DFA7",0x8242],
+  ["DFA8",0x8245],
+  ["DFA9",0x84F1],
+  ["DFAA",0x843F],
+  ["DFAB",0x8456],
+  ["DFAC",0x8476],
+  ["DFAD",0x8479],
+  ["DFAE",0x848F],
+  ["DFAF",0x848D],
+  ["DFB0",0x8465],
+  ["DFB1",0x8451],
+  ["DFB2",0x8440],
+  ["DFB3",0x8486],
+  ["DFB4",0x8467],
+  ["DFB5",0x8430],
+  ["DFB6",0x844D],
+  ["DFB7",0x847D],
+  ["DFB8",0x845A],
+  ["DFB9",0x8459],
+  ["DFBA",0x8474],
+  ["DFBB",0x8473],
+  ["DFBC",0x845D],
+  ["DFBD",0x8507],
+  ["DFBE",0x845E],
+  ["DFBF",0x8437],
+  ["DFC0",0x843A],
+  ["DFC1",0x8434],
+  ["DFC2",0x847A],
+  ["DFC3",0x8443],
+  ["DFC4",0x8478],
+  ["DFC5",0x8432],
+  ["DFC6",0x8445],
+  ["DFC7",0x8429],
+  ["DFC8",0x83D9],
+  ["DFC9",0x844B],
+  ["DFCA",0x842F],
+  ["DFCB",0x8442],
+  ["DFCC",0x842D],
+  ["DFCD",0x845F],
+  ["DFCE",0x8470],
+  ["DFCF",0x8439],
+  ["DFD0",0x844E],
+  ["DFD1",0x844C],
+  ["DFD2",0x8452],
+  ["DFD3",0x846F],
+  ["DFD4",0x84C5],
+  ["DFD5",0x848E],
+  ["DFD6",0x843B],
+  ["DFD7",0x8447],
+  ["DFD8",0x8436],
+  ["DFD9",0x8433],
+  ["DFDA",0x8468],
+  ["DFDB",0x847E],
+  ["DFDC",0x8444],
+  ["DFDD",0x842B],
+  ["DFDE",0x8460],
+  ["DFDF",0x8454],
+  ["DFE0",0x846E],
+  ["DFE1",0x8450],
+  ["DFE2",0x870B],
+  ["DFE3",0x8704],
+  ["DFE4",0x86F7],
+  ["DFE5",0x870C],
+  ["DFE6",0x86FA],
+  ["DFE7",0x86D6],
+  ["DFE8",0x86F5],
+  ["DFE9",0x874D],
+  ["DFEA",0x86F8],
+  ["DFEB",0x870E],
+  ["DFEC",0x8709],
+  ["DFED",0x8701],
+  ["DFEE",0x86F6],
+  ["DFEF",0x870D],
+  ["DFF0",0x8705],
+  ["DFF1",0x88D6],
+  ["DFF2",0x88CB],
+  ["DFF3",0x88CD],
+  ["DFF4",0x88CE],
+  ["DFF5",0x88DE],
+  ["DFF6",0x88DB],
+  ["DFF7",0x88DA],
+  ["DFF8",0x88CC],
+  ["DFF9",0x88D0],
+  ["DFFA",0x8985],
+  ["DFFB",0x899B],
+  ["DFFC",0x89DF],
+  ["DFFD",0x89E5],
+  ["DFFE",0x89E4],
+  ["E040",0x89E1],
+  ["E041",0x89E0],
+  ["E042",0x89E2],
+  ["E043",0x89DC],
+  ["E044",0x89E6],
+  ["E045",0x8A76],
+  ["E046",0x8A86],
+  ["E047",0x8A7F],
+  ["E048",0x8A61],
+  ["E049",0x8A3F],
+  ["E04A",0x8A77],
+  ["E04B",0x8A82],
+  ["E04C",0x8A84],
+  ["E04D",0x8A75],
+  ["E04E",0x8A83],
+  ["E04F",0x8A81],
+  ["E050",0x8A74],
+  ["E051",0x8A7A],
+  ["E052",0x8C3C],
+  ["E053",0x8C4B],
+  ["E054",0x8C4A],
+  ["E055",0x8C65],
+  ["E056",0x8C64],
+  ["E057",0x8C66],
+  ["E058",0x8C86],
+  ["E059",0x8C84],
+  ["E05A",0x8C85],
+  ["E05B",0x8CCC],
+  ["E05C",0x8D68],
+  ["E05D",0x8D69],
+  ["E05E",0x8D91],
+  ["E05F",0x8D8C],
+  ["E060",0x8D8E],
+  ["E061",0x8D8F],
+  ["E062",0x8D8D],
+  ["E063",0x8D93],
+  ["E064",0x8D94],
+  ["E065",0x8D90],
+  ["E066",0x8D92],
+  ["E067",0x8DF0],
+  ["E068",0x8DE0],
+  ["E069",0x8DEC],
+  ["E06A",0x8DF1],
+  ["E06B",0x8DEE],
+  ["E06C",0x8DD0],
+  ["E06D",0x8DE9],
+  ["E06E",0x8DE3],
+  ["E06F",0x8DE2],
+  ["E070",0x8DE7],
+  ["E071",0x8DF2],
+  ["E072",0x8DEB],
+  ["E073",0x8DF4],
+  ["E074",0x8F06],
+  ["E075",0x8EFF],
+  ["E076",0x8F01],
+  ["E077",0x8F00],
+  ["E078",0x8F05],
+  ["E079",0x8F07],
+  ["E07A",0x8F08],
+  ["E07B",0x8F02],
+  ["E07C",0x8F0B],
+  ["E07D",0x9052],
+  ["E07E",0x903F],
+  ["E0A1",0x9044],
+  ["E0A2",0x9049],
+  ["E0A3",0x903D],
+  ["E0A4",0x9110],
+  ["E0A5",0x910D],
+  ["E0A6",0x910F],
+  ["E0A7",0x9111],
+  ["E0A8",0x9116],
+  ["E0A9",0x9114],
+  ["E0AA",0x910B],
+  ["E0AB",0x910E],
+  ["E0AC",0x916E],
+  ["E0AD",0x916F],
+  ["E0AE",0x9248],
+  ["E0AF",0x9252],
+  ["E0B0",0x9230],
+  ["E0B1",0x923A],
+  ["E0B2",0x9266],
+  ["E0B3",0x9233],
+  ["E0B4",0x9265],
+  ["E0B5",0x925E],
+  ["E0B6",0x9283],
+  ["E0B7",0x922E],
+  ["E0B8",0x924A],
+  ["E0B9",0x9246],
+  ["E0BA",0x926D],
+  ["E0BB",0x926C],
+  ["E0BC",0x924F],
+  ["E0BD",0x9260],
+  ["E0BE",0x9267],
+  ["E0BF",0x926F],
+  ["E0C0",0x9236],
+  ["E0C1",0x9261],
+  ["E0C2",0x9270],
+  ["E0C3",0x9231],
+  ["E0C4",0x9254],
+  ["E0C5",0x9263],
+  ["E0C6",0x9250],
+  ["E0C7",0x9272],
+  ["E0C8",0x924E],
+  ["E0C9",0x9253],
+  ["E0CA",0x924C],
+  ["E0CB",0x9256],
+  ["E0CC",0x9232],
+  ["E0CD",0x959F],
+  ["E0CE",0x959C],
+  ["E0CF",0x959E],
+  ["E0D0",0x959B],
+  ["E0D1",0x9692],
+  ["E0D2",0x9693],
+  ["E0D3",0x9691],
+  ["E0D4",0x9697],
+  ["E0D5",0x96CE],
+  ["E0D6",0x96FA],
+  ["E0D7",0x96FD],
+  ["E0D8",0x96F8],
+  ["E0D9",0x96F5],
+  ["E0DA",0x9773],
+  ["E0DB",0x9777],
+  ["E0DC",0x9778],
+  ["E0DD",0x9772],
+  ["E0DE",0x980F],
+  ["E0DF",0x980D],
+  ["E0E0",0x980E],
+  ["E0E1",0x98AC],
+  ["E0E2",0x98F6],
+  ["E0E3",0x98F9],
+  ["E0E4",0x99AF],
+  ["E0E5",0x99B2],
+  ["E0E6",0x99B0],
+  ["E0E7",0x99B5],
+  ["E0E8",0x9AAD],
+  ["E0E9",0x9AAB],
+  ["E0EA",0x9B5B],
+  ["E0EB",0x9CEA],
+  ["E0EC",0x9CED],
+  ["E0ED",0x9CE7],
+  ["E0EE",0x9E80],
+  ["E0EF",0x9EFD],
+  ["E0F0",0x50E6],
+  ["E0F1",0x50D4],
+  ["E0F2",0x50D7],
+  ["E0F3",0x50E8],
+  ["E0F4",0x50F3],
+  ["E0F5",0x50DB],
+  ["E0F6",0x50EA],
+  ["E0F7",0x50DD],
+  ["E0F8",0x50E4],
+  ["E0F9",0x50D3],
+  ["E0FA",0x50EC],
+  ["E0FB",0x50F0],
+  ["E0FC",0x50EF],
+  ["E0FD",0x50E3],
+  ["E0FE",0x50E0],
+  ["E140",0x51D8],
+  ["E141",0x5280],
+  ["E142",0x5281],
+  ["E143",0x52E9],
+  ["E144",0x52EB],
+  ["E145",0x5330],
+  ["E146",0x53AC],
+  ["E147",0x5627],
+  ["E148",0x5615],
+  ["E149",0x560C],
+  ["E14A",0x5612],
+  ["E14B",0x55FC],
+  ["E14C",0x560F],
+  ["E14D",0x561C],
+  ["E14E",0x5601],
+  ["E14F",0x5613],
+  ["E150",0x5602],
+  ["E151",0x55FA],
+  ["E152",0x561D],
+  ["E153",0x5604],
+  ["E154",0x55FF],
+  ["E155",0x55F9],
+  ["E156",0x5889],
+  ["E157",0x587C],
+  ["E158",0x5890],
+  ["E159",0x5898],
+  ["E15A",0x5886],
+  ["E15B",0x5881],
+  ["E15C",0x587F],
+  ["E15D",0x5874],
+  ["E15E",0x588B],
+  ["E15F",0x587A],
+  ["E160",0x5887],
+  ["E161",0x5891],
+  ["E162",0x588E],
+  ["E163",0x5876],
+  ["E164",0x5882],
+  ["E165",0x5888],
+  ["E166",0x587B],
+  ["E167",0x5894],
+  ["E168",0x588F],
+  ["E169",0x58FE],
+  ["E16A",0x596B],
+  ["E16B",0x5ADC],
+  ["E16C",0x5AEE],
+  ["E16D",0x5AE5],
+  ["E16E",0x5AD5],
+  ["E16F",0x5AEA],
+  ["E170",0x5ADA],
+  ["E171",0x5AED],
+  ["E172",0x5AEB],
+  ["E173",0x5AF3],
+  ["E174",0x5AE2],
+  ["E175",0x5AE0],
+  ["E176",0x5ADB],
+  ["E177",0x5AEC],
+  ["E178",0x5ADE],
+  ["E179",0x5ADD],
+  ["E17A",0x5AD9],
+  ["E17B",0x5AE8],
+  ["E17C",0x5ADF],
+  ["E17D",0x5B77],
+  ["E17E",0x5BE0],
+  ["E1A1",0x5BE3],
+  ["E1A2",0x5C63],
+  ["E1A3",0x5D82],
+  ["E1A4",0x5D80],
+  ["E1A5",0x5D7D],
+  ["E1A6",0x5D86],
+  ["E1A7",0x5D7A],
+  ["E1A8",0x5D81],
+  ["E1A9",0x5D77],
+  ["E1AA",0x5D8A],
+  ["E1AB",0x5D89],
+  ["E1AC",0x5D88],
+  ["E1AD",0x5D7E],
+  ["E1AE",0x5D7C],
+  ["E1AF",0x5D8D],
+  ["E1B0",0x5D79],
+  ["E1B1",0x5D7F],
+  ["E1B2",0x5E58],
+  ["E1B3",0x5E59],
+  ["E1B4",0x5E53],
+  ["E1B5",0x5ED8],
+  ["E1B6",0x5ED1],
+  ["E1B7",0x5ED7],
+  ["E1B8",0x5ECE],
+  ["E1B9",0x5EDC],
+  ["E1BA",0x5ED5],
+  ["E1BB",0x5ED9],
+  ["E1BC",0x5ED2],
+  ["E1BD",0x5ED4],
+  ["E1BE",0x5F44],
+  ["E1BF",0x5F43],
+  ["E1C0",0x5F6F],
+  ["E1C1",0x5FB6],
+  ["E1C2",0x612C],
+  ["E1C3",0x6128],
+  ["E1C4",0x6141],
+  ["E1C5",0x615E],
+  ["E1C6",0x6171],
+  ["E1C7",0x6173],
+  ["E1C8",0x6152],
+  ["E1C9",0x6153],
+  ["E1CA",0x6172],
+  ["E1CB",0x616C],
+  ["E1CC",0x6180],
+  ["E1CD",0x6174],
+  ["E1CE",0x6154],
+  ["E1CF",0x617A],
+  ["E1D0",0x615B],
+  ["E1D1",0x6165],
+  ["E1D2",0x613B],
+  ["E1D3",0x616A],
+  ["E1D4",0x6161],
+  ["E1D5",0x6156],
+  ["E1D6",0x6229],
+  ["E1D7",0x6227],
+  ["E1D8",0x622B],
+  ["E1D9",0x642B],
+  ["E1DA",0x644D],
+  ["E1DB",0x645B],
+  ["E1DC",0x645D],
+  ["E1DD",0x6474],
+  ["E1DE",0x6476],
+  ["E1DF",0x6472],
+  ["E1E0",0x6473],
+  ["E1E1",0x647D],
+  ["E1E2",0x6475],
+  ["E1E3",0x6466],
+  ["E1E4",0x64A6],
+  ["E1E5",0x644E],
+  ["E1E6",0x6482],
+  ["E1E7",0x645E],
+  ["E1E8",0x645C],
+  ["E1E9",0x644B],
+  ["E1EA",0x6453],
+  ["E1EB",0x6460],
+  ["E1EC",0x6450],
+  ["E1ED",0x647F],
+  ["E1EE",0x643F],
+  ["E1EF",0x646C],
+  ["E1F0",0x646B],
+  ["E1F1",0x6459],
+  ["E1F2",0x6465],
+  ["E1F3",0x6477],
+  ["E1F4",0x6573],
+  ["E1F5",0x65A0],
+  ["E1F6",0x66A1],
+  ["E1F7",0x66A0],
+  ["E1F8",0x669F],
+  ["E1F9",0x6705],
+  ["E1FA",0x6704],
+  ["E1FB",0x6722],
+  ["E1FC",0x69B1],
+  ["E1FD",0x69B6],
+  ["E1FE",0x69C9],
+  ["E240",0x69A0],
+  ["E241",0x69CE],
+  ["E242",0x6996],
+  ["E243",0x69B0],
+  ["E244",0x69AC],
+  ["E245",0x69BC],
+  ["E246",0x6991],
+  ["E247",0x6999],
+  ["E248",0x698E],
+  ["E249",0x69A7],
+  ["E24A",0x698D],
+  ["E24B",0x69A9],
+  ["E24C",0x69BE],
+  ["E24D",0x69AF],
+  ["E24E",0x69BF],
+  ["E24F",0x69C4],
+  ["E250",0x69BD],
+  ["E251",0x69A4],
+  ["E252",0x69D4],
+  ["E253",0x69B9],
+  ["E254",0x69CA],
+  ["E255",0x699A],
+  ["E256",0x69CF],
+  ["E257",0x69B3],
+  ["E258",0x6993],
+  ["E259",0x69AA],
+  ["E25A",0x69A1],
+  ["E25B",0x699E],
+  ["E25C",0x69D9],
+  ["E25D",0x6997],
+  ["E25E",0x6990],
+  ["E25F",0x69C2],
+  ["E260",0x69B5],
+  ["E261",0x69A5],
+  ["E262",0x69C6],
+  ["E263",0x6B4A],
+  ["E264",0x6B4D],
+  ["E265",0x6B4B],
+  ["E266",0x6B9E],
+  ["E267",0x6B9F],
+  ["E268",0x6BA0],
+  ["E269",0x6BC3],
+  ["E26A",0x6BC4],
+  ["E26B",0x6BFE],
+  ["E26C",0x6ECE],
+  ["E26D",0x6EF5],
+  ["E26E",0x6EF1],
+  ["E26F",0x6F03],
+  ["E270",0x6F25],
+  ["E271",0x6EF8],
+  ["E272",0x6F37],
+  ["E273",0x6EFB],
+  ["E274",0x6F2E],
+  ["E275",0x6F09],
+  ["E276",0x6F4E],
+  ["E277",0x6F19],
+  ["E278",0x6F1A],
+  ["E279",0x6F27],
+  ["E27A",0x6F18],
+  ["E27B",0x6F3B],
+  ["E27C",0x6F12],
+  ["E27D",0x6EED],
+  ["E27E",0x6F0A],
+  ["E2A1",0x6F36],
+  ["E2A2",0x6F73],
+  ["E2A3",0x6EF9],
+  ["E2A4",0x6EEE],
+  ["E2A5",0x6F2D],
+  ["E2A6",0x6F40],
+  ["E2A7",0x6F30],
+  ["E2A8",0x6F3C],
+  ["E2A9",0x6F35],
+  ["E2AA",0x6EEB],
+  ["E2AB",0x6F07],
+  ["E2AC",0x6F0E],
+  ["E2AD",0x6F43],
+  ["E2AE",0x6F05],
+  ["E2AF",0x6EFD],
+  ["E2B0",0x6EF6],
+  ["E2B1",0x6F39],
+  ["E2B2",0x6F1C],
+  ["E2B3",0x6EFC],
+  ["E2B4",0x6F3A],
+  ["E2B5",0x6F1F],
+  ["E2B6",0x6F0D],
+  ["E2B7",0x6F1E],
+  ["E2B8",0x6F08],
+  ["E2B9",0x6F21],
+  ["E2BA",0x7187],
+  ["E2BB",0x7190],
+  ["E2BC",0x7189],
+  ["E2BD",0x7180],
+  ["E2BE",0x7185],
+  ["E2BF",0x7182],
+  ["E2C0",0x718F],
+  ["E2C1",0x717B],
+  ["E2C2",0x7186],
+  ["E2C3",0x7181],
+  ["E2C4",0x7197],
+  ["E2C5",0x7244],
+  ["E2C6",0x7253],
+  ["E2C7",0x7297],
+  ["E2C8",0x7295],
+  ["E2C9",0x7293],
+  ["E2CA",0x7343],
+  ["E2CB",0x734D],
+  ["E2CC",0x7351],
+  ["E2CD",0x734C],
+  ["E2CE",0x7462],
+  ["E2CF",0x7473],
+  ["E2D0",0x7471],
+  ["E2D1",0x7475],
+  ["E2D2",0x7472],
+  ["E2D3",0x7467],
+  ["E2D4",0x746E],
+  ["E2D5",0x7500],
+  ["E2D6",0x7502],
+  ["E2D7",0x7503],
+  ["E2D8",0x757D],
+  ["E2D9",0x7590],
+  ["E2DA",0x7616],
+  ["E2DB",0x7608],
+  ["E2DC",0x760C],
+  ["E2DD",0x7615],
+  ["E2DE",0x7611],
+  ["E2DF",0x760A],
+  ["E2E0",0x7614],
+  ["E2E1",0x76B8],
+  ["E2E2",0x7781],
+  ["E2E3",0x777C],
+  ["E2E4",0x7785],
+  ["E2E5",0x7782],
+  ["E2E6",0x776E],
+  ["E2E7",0x7780],
+  ["E2E8",0x776F],
+  ["E2E9",0x777E],
+  ["E2EA",0x7783],
+  ["E2EB",0x78B2],
+  ["E2EC",0x78AA],
+  ["E2ED",0x78B4],
+  ["E2EE",0x78AD],
+  ["E2EF",0x78A8],
+  ["E2F0",0x787E],
+  ["E2F1",0x78AB],
+  ["E2F2",0x789E],
+  ["E2F3",0x78A5],
+  ["E2F4",0x78A0],
+  ["E2F5",0x78AC],
+  ["E2F6",0x78A2],
+  ["E2F7",0x78A4],
+  ["E2F8",0x7998],
+  ["E2F9",0x798A],
+  ["E2FA",0x798B],
+  ["E2FB",0x7996],
+  ["E2FC",0x7995],
+  ["E2FD",0x7994],
+  ["E2FE",0x7993],
+  ["E340",0x7997],
+  ["E341",0x7988],
+  ["E342",0x7992],
+  ["E343",0x7990],
+  ["E344",0x7A2B],
+  ["E345",0x7A4A],
+  ["E346",0x7A30],
+  ["E347",0x7A2F],
+  ["E348",0x7A28],
+  ["E349",0x7A26],
+  ["E34A",0x7AA8],
+  ["E34B",0x7AAB],
+  ["E34C",0x7AAC],
+  ["E34D",0x7AEE],
+  ["E34E",0x7B88],
+  ["E34F",0x7B9C],
+  ["E350",0x7B8A],
+  ["E351",0x7B91],
+  ["E352",0x7B90],
+  ["E353",0x7B96],
+  ["E354",0x7B8D],
+  ["E355",0x7B8C],
+  ["E356",0x7B9B],
+  ["E357",0x7B8E],
+  ["E358",0x7B85],
+  ["E359",0x7B98],
+  ["E35A",0x5284],
+  ["E35B",0x7B99],
+  ["E35C",0x7BA4],
+  ["E35D",0x7B82],
+  ["E35E",0x7CBB],
+  ["E35F",0x7CBF],
+  ["E360",0x7CBC],
+  ["E361",0x7CBA],
+  ["E362",0x7DA7],
+  ["E363",0x7DB7],
+  ["E364",0x7DC2],
+  ["E365",0x7DA3],
+  ["E366",0x7DAA],
+  ["E367",0x7DC1],
+  ["E368",0x7DC0],
+  ["E369",0x7DC5],
+  ["E36A",0x7D9D],
+  ["E36B",0x7DCE],
+  ["E36C",0x7DC4],
+  ["E36D",0x7DC6],
+  ["E36E",0x7DCB],
+  ["E36F",0x7DCC],
+  ["E370",0x7DAF],
+  ["E371",0x7DB9],
+  ["E372",0x7D96],
+  ["E373",0x7DBC],
+  ["E374",0x7D9F],
+  ["E375",0x7DA6],
+  ["E376",0x7DAE],
+  ["E377",0x7DA9],
+  ["E378",0x7DA1],
+  ["E379",0x7DC9],
+  ["E37A",0x7F73],
+  ["E37B",0x7FE2],
+  ["E37C",0x7FE3],
+  ["E37D",0x7FE5],
+  ["E37E",0x7FDE],
+  ["E3A1",0x8024],
+  ["E3A2",0x805D],
+  ["E3A3",0x805C],
+  ["E3A4",0x8189],
+  ["E3A5",0x8186],
+  ["E3A6",0x8183],
+  ["E3A7",0x8187],
+  ["E3A8",0x818D],
+  ["E3A9",0x818C],
+  ["E3AA",0x818B],
+  ["E3AB",0x8215],
+  ["E3AC",0x8497],
+  ["E3AD",0x84A4],
+  ["E3AE",0x84A1],
+  ["E3AF",0x849F],
+  ["E3B0",0x84BA],
+  ["E3B1",0x84CE],
+  ["E3B2",0x84C2],
+  ["E3B3",0x84AC],
+  ["E3B4",0x84AE],
+  ["E3B5",0x84AB],
+  ["E3B6",0x84B9],
+  ["E3B7",0x84B4],
+  ["E3B8",0x84C1],
+  ["E3B9",0x84CD],
+  ["E3BA",0x84AA],
+  ["E3BB",0x849A],
+  ["E3BC",0x84B1],
+  ["E3BD",0x84D0],
+  ["E3BE",0x849D],
+  ["E3BF",0x84A7],
+  ["E3C0",0x84BB],
+  ["E3C1",0x84A2],
+  ["E3C2",0x8494],
+  ["E3C3",0x84C7],
+  ["E3C4",0x84CC],
+  ["E3C5",0x849B],
+  ["E3C6",0x84A9],
+  ["E3C7",0x84AF],
+  ["E3C8",0x84A8],
+  ["E3C9",0x84D6],
+  ["E3CA",0x8498],
+  ["E3CB",0x84B6],
+  ["E3CC",0x84CF],
+  ["E3CD",0x84A0],
+  ["E3CE",0x84D7],
+  ["E3CF",0x84D4],
+  ["E3D0",0x84D2],
+  ["E3D1",0x84DB],
+  ["E3D2",0x84B0],
+  ["E3D3",0x8491],
+  ["E3D4",0x8661],
+  ["E3D5",0x8733],
+  ["E3D6",0x8723],
+  ["E3D7",0x8728],
+  ["E3D8",0x876B],
+  ["E3D9",0x8740],
+  ["E3DA",0x872E],
+  ["E3DB",0x871E],
+  ["E3DC",0x8721],
+  ["E3DD",0x8719],
+  ["E3DE",0x871B],
+  ["E3DF",0x8743],
+  ["E3E0",0x872C],
+  ["E3E1",0x8741],
+  ["E3E2",0x873E],
+  ["E3E3",0x8746],
+  ["E3E4",0x8720],
+  ["E3E5",0x8732],
+  ["E3E6",0x872A],
+  ["E3E7",0x872D],
+  ["E3E8",0x873C],
+  ["E3E9",0x8712],
+  ["E3EA",0x873A],
+  ["E3EB",0x8731],
+  ["E3EC",0x8735],
+  ["E3ED",0x8742],
+  ["E3EE",0x8726],
+  ["E3EF",0x8727],
+  ["E3F0",0x8738],
+  ["E3F1",0x8724],
+  ["E3F2",0x871A],
+  ["E3F3",0x8730],
+  ["E3F4",0x8711],
+  ["E3F5",0x88F7],
+  ["E3F6",0x88E7],
+  ["E3F7",0x88F1],
+  ["E3F8",0x88F2],
+  ["E3F9",0x88FA],
+  ["E3FA",0x88FE],
+  ["E3FB",0x88EE],
+  ["E3FC",0x88FC],
+  ["E3FD",0x88F6],
+  ["E3FE",0x88FB],
+  ["E440",0x88F0],
+  ["E441",0x88EC],
+  ["E442",0x88EB],
+  ["E443",0x899D],
+  ["E444",0x89A1],
+  ["E445",0x899F],
+  ["E446",0x899E],
+  ["E447",0x89E9],
+  ["E448",0x89EB],
+  ["E449",0x89E8],
+  ["E44A",0x8AAB],
+  ["E44B",0x8A99],
+  ["E44C",0x8A8B],
+  ["E44D",0x8A92],
+  ["E44E",0x8A8F],
+  ["E44F",0x8A96],
+  ["E450",0x8C3D],
+  ["E451",0x8C68],
+  ["E452",0x8C69],
+  ["E453",0x8CD5],
+  ["E454",0x8CCF],
+  ["E455",0x8CD7],
+  ["E456",0x8D96],
+  ["E457",0x8E09],
+  ["E458",0x8E02],
+  ["E459",0x8DFF],
+  ["E45A",0x8E0D],
+  ["E45B",0x8DFD],
+  ["E45C",0x8E0A],
+  ["E45D",0x8E03],
+  ["E45E",0x8E07],
+  ["E45F",0x8E06],
+  ["E460",0x8E05],
+  ["E461",0x8DFE],
+  ["E462",0x8E00],
+  ["E463",0x8E04],
+  ["E464",0x8F10],
+  ["E465",0x8F11],
+  ["E466",0x8F0E],
+  ["E467",0x8F0D],
+  ["E468",0x9123],
+  ["E469",0x911C],
+  ["E46A",0x9120],
+  ["E46B",0x9122],
+  ["E46C",0x911F],
+  ["E46D",0x911D],
+  ["E46E",0x911A],
+  ["E46F",0x9124],
+  ["E470",0x9121],
+  ["E471",0x911B],
+  ["E472",0x917A],
+  ["E473",0x9172],
+  ["E474",0x9179],
+  ["E475",0x9173],
+  ["E476",0x92A5],
+  ["E477",0x92A4],
+  ["E478",0x9276],
+  ["E479",0x929B],
+  ["E47A",0x927A],
+  ["E47B",0x92A0],
+  ["E47C",0x9294],
+  ["E47D",0x92AA],
+  ["E47E",0x928D],
+  ["E4A1",0x92A6],
+  ["E4A2",0x929A],
+  ["E4A3",0x92AB],
+  ["E4A4",0x9279],
+  ["E4A5",0x9297],
+  ["E4A6",0x927F],
+  ["E4A7",0x92A3],
+  ["E4A8",0x92EE],
+  ["E4A9",0x928E],
+  ["E4AA",0x9282],
+  ["E4AB",0x9295],
+  ["E4AC",0x92A2],
+  ["E4AD",0x927D],
+  ["E4AE",0x9288],
+  ["E4AF",0x92A1],
+  ["E4B0",0x928A],
+  ["E4B1",0x9286],
+  ["E4B2",0x928C],
+  ["E4B3",0x9299],
+  ["E4B4",0x92A7],
+  ["E4B5",0x927E],
+  ["E4B6",0x9287],
+  ["E4B7",0x92A9],
+  ["E4B8",0x929D],
+  ["E4B9",0x928B],
+  ["E4BA",0x922D],
+  ["E4BB",0x969E],
+  ["E4BC",0x96A1],
+  ["E4BD",0x96FF],
+  ["E4BE",0x9758],
+  ["E4BF",0x977D],
+  ["E4C0",0x977A],
+  ["E4C1",0x977E],
+  ["E4C2",0x9783],
+  ["E4C3",0x9780],
+  ["E4C4",0x9782],
+  ["E4C5",0x977B],
+  ["E4C6",0x9784],
+  ["E4C7",0x9781],
+  ["E4C8",0x977F],
+  ["E4C9",0x97CE],
+  ["E4CA",0x97CD],
+  ["E4CB",0x9816],
+  ["E4CC",0x98AD],
+  ["E4CD",0x98AE],
+  ["E4CE",0x9902],
+  ["E4CF",0x9900],
+  ["E4D0",0x9907],
+  ["E4D1",0x999D],
+  ["E4D2",0x999C],
+  ["E4D3",0x99C3],
+  ["E4D4",0x99B9],
+  ["E4D5",0x99BB],
+  ["E4D6",0x99BA],
+  ["E4D7",0x99C2],
+  ["E4D8",0x99BD],
+  ["E4D9",0x99C7],
+  ["E4DA",0x9AB1],
+  ["E4DB",0x9AE3],
+  ["E4DC",0x9AE7],
+  ["E4DD",0x9B3E],
+  ["E4DE",0x9B3F],
+  ["E4DF",0x9B60],
+  ["E4E0",0x9B61],
+  ["E4E1",0x9B5F],
+  ["E4E2",0x9CF1],
+  ["E4E3",0x9CF2],
+  ["E4E4",0x9CF5],
+  ["E4E5",0x9EA7],
+  ["E4E6",0x50FF],
+  ["E4E7",0x5103],
+  ["E4E8",0x5130],
+  ["E4E9",0x50F8],
+  ["E4EA",0x5106],
+  ["E4EB",0x5107],
+  ["E4EC",0x50F6],
+  ["E4ED",0x50FE],
+  ["E4EE",0x510B],
+  ["E4EF",0x510C],
+  ["E4F0",0x50FD],
+  ["E4F1",0x510A],
+  ["E4F2",0x528B],
+  ["E4F3",0x528C],
+  ["E4F4",0x52F1],
+  ["E4F5",0x52EF],
+  ["E4F6",0x5648],
+  ["E4F7",0x5642],
+  ["E4F8",0x564C],
+  ["E4F9",0x5635],
+  ["E4FA",0x5641],
+  ["E4FB",0x564A],
+  ["E4FC",0x5649],
+  ["E4FD",0x5646],
+  ["E4FE",0x5658],
+  ["E540",0x565A],
+  ["E541",0x5640],
+  ["E542",0x5633],
+  ["E543",0x563D],
+  ["E544",0x562C],
+  ["E545",0x563E],
+  ["E546",0x5638],
+  ["E547",0x562A],
+  ["E548",0x563A],
+  ["E549",0x571A],
+  ["E54A",0x58AB],
+  ["E54B",0x589D],
+  ["E54C",0x58B1],
+  ["E54D",0x58A0],
+  ["E54E",0x58A3],
+  ["E54F",0x58AF],
+  ["E550",0x58AC],
+  ["E551",0x58A5],
+  ["E552",0x58A1],
+  ["E553",0x58FF],
+  ["E554",0x5AFF],
+  ["E555",0x5AF4],
+  ["E556",0x5AFD],
+  ["E557",0x5AF7],
+  ["E558",0x5AF6],
+  ["E559",0x5B03],
+  ["E55A",0x5AF8],
+  ["E55B",0x5B02],
+  ["E55C",0x5AF9],
+  ["E55D",0x5B01],
+  ["E55E",0x5B07],
+  ["E55F",0x5B05],
+  ["E560",0x5B0F],
+  ["E561",0x5C67],
+  ["E562",0x5D99],
+  ["E563",0x5D97],
+  ["E564",0x5D9F],
+  ["E565",0x5D92],
+  ["E566",0x5DA2],
+  ["E567",0x5D93],
+  ["E568",0x5D95],
+  ["E569",0x5DA0],
+  ["E56A",0x5D9C],
+  ["E56B",0x5DA1],
+  ["E56C",0x5D9A],
+  ["E56D",0x5D9E],
+  ["E56E",0x5E69],
+  ["E56F",0x5E5D],
+  ["E570",0x5E60],
+  ["E571",0x5E5C],
+  ["E572",0x7DF3],
+  ["E573",0x5EDB],
+  ["E574",0x5EDE],
+  ["E575",0x5EE1],
+  ["E576",0x5F49],
+  ["E577",0x5FB2],
+  ["E578",0x618B],
+  ["E579",0x6183],
+  ["E57A",0x6179],
+  ["E57B",0x61B1],
+  ["E57C",0x61B0],
+  ["E57D",0x61A2],
+  ["E57E",0x6189],
+  ["E5A1",0x619B],
+  ["E5A2",0x6193],
+  ["E5A3",0x61AF],
+  ["E5A4",0x61AD],
+  ["E5A5",0x619F],
+  ["E5A6",0x6192],
+  ["E5A7",0x61AA],
+  ["E5A8",0x61A1],
+  ["E5A9",0x618D],
+  ["E5AA",0x6166],
+  ["E5AB",0x61B3],
+  ["E5AC",0x622D],
+  ["E5AD",0x646E],
+  ["E5AE",0x6470],
+  ["E5AF",0x6496],
+  ["E5B0",0x64A0],
+  ["E5B1",0x6485],
+  ["E5B2",0x6497],
+  ["E5B3",0x649C],
+  ["E5B4",0x648F],
+  ["E5B5",0x648B],
+  ["E5B6",0x648A],
+  ["E5B7",0x648C],
+  ["E5B8",0x64A3],
+  ["E5B9",0x649F],
+  ["E5BA",0x6468],
+  ["E5BB",0x64B1],
+  ["E5BC",0x6498],
+  ["E5BD",0x6576],
+  ["E5BE",0x657A],
+  ["E5BF",0x6579],
+  ["E5C0",0x657B],
+  ["E5C1",0x65B2],
+  ["E5C2",0x65B3],
+  ["E5C3",0x66B5],
+  ["E5C4",0x66B0],
+  ["E5C5",0x66A9],
+  ["E5C6",0x66B2],
+  ["E5C7",0x66B7],
+  ["E5C8",0x66AA],
+  ["E5C9",0x66AF],
+  ["E5CA",0x6A00],
+  ["E5CB",0x6A06],
+  ["E5CC",0x6A17],
+  ["E5CD",0x69E5],
+  ["E5CE",0x69F8],
+  ["E5CF",0x6A15],
+  ["E5D0",0x69F1],
+  ["E5D1",0x69E4],
+  ["E5D2",0x6A20],
+  ["E5D3",0x69FF],
+  ["E5D4",0x69EC],
+  ["E5D5",0x69E2],
+  ["E5D6",0x6A1B],
+  ["E5D7",0x6A1D],
+  ["E5D8",0x69FE],
+  ["E5D9",0x6A27],
+  ["E5DA",0x69F2],
+  ["E5DB",0x69EE],
+  ["E5DC",0x6A14],
+  ["E5DD",0x69F7],
+  ["E5DE",0x69E7],
+  ["E5DF",0x6A40],
+  ["E5E0",0x6A08],
+  ["E5E1",0x69E6],
+  ["E5E2",0x69FB],
+  ["E5E3",0x6A0D],
+  ["E5E4",0x69FC],
+  ["E5E5",0x69EB],
+  ["E5E6",0x6A09],
+  ["E5E7",0x6A04],
+  ["E5E8",0x6A18],
+  ["E5E9",0x6A25],
+  ["E5EA",0x6A0F],
+  ["E5EB",0x69F6],
+  ["E5EC",0x6A26],
+  ["E5ED",0x6A07],
+  ["E5EE",0x69F4],
+  ["E5EF",0x6A16],
+  ["E5F0",0x6B51],
+  ["E5F1",0x6BA5],
+  ["E5F2",0x6BA3],
+  ["E5F3",0x6BA2],
+  ["E5F4",0x6BA6],
+  ["E5F5",0x6C01],
+  ["E5F6",0x6C00],
+  ["E5F7",0x6BFF],
+  ["E5F8",0x6C02],
+  ["E5F9",0x6F41],
+  ["E5FA",0x6F26],
+  ["E5FB",0x6F7E],
+  ["E5FC",0x6F87],
+  ["E5FD",0x6FC6],
+  ["E5FE",0x6F92],
+  ["E640",0x6F8D],
+  ["E641",0x6F89],
+  ["E642",0x6F8C],
+  ["E643",0x6F62],
+  ["E644",0x6F4F],
+  ["E645",0x6F85],
+  ["E646",0x6F5A],
+  ["E647",0x6F96],
+  ["E648",0x6F76],
+  ["E649",0x6F6C],
+  ["E64A",0x6F82],
+  ["E64B",0x6F55],
+  ["E64C",0x6F72],
+  ["E64D",0x6F52],
+  ["E64E",0x6F50],
+  ["E64F",0x6F57],
+  ["E650",0x6F94],
+  ["E651",0x6F93],
+  ["E652",0x6F5D],
+  ["E653",0x6F00],
+  ["E654",0x6F61],
+  ["E655",0x6F6B],
+  ["E656",0x6F7D],
+  ["E657",0x6F67],
+  ["E658",0x6F90],
+  ["E659",0x6F53],
+  ["E65A",0x6F8B],
+  ["E65B",0x6F69],
+  ["E65C",0x6F7F],
+  ["E65D",0x6F95],
+  ["E65E",0x6F63],
+  ["E65F",0x6F77],
+  ["E660",0x6F6A],
+  ["E661",0x6F7B],
+  ["E662",0x71B2],
+  ["E663",0x71AF],
+  ["E664",0x719B],
+  ["E665",0x71B0],
+  ["E666",0x71A0],
+  ["E667",0x719A],
+  ["E668",0x71A9],
+  ["E669",0x71B5],
+  ["E66A",0x719D],
+  ["E66B",0x71A5],
+  ["E66C",0x719E],
+  ["E66D",0x71A4],
+  ["E66E",0x71A1],
+  ["E66F",0x71AA],
+  ["E670",0x719C],
+  ["E671",0x71A7],
+  ["E672",0x71B3],
+  ["E673",0x7298],
+  ["E674",0x729A],
+  ["E675",0x7358],
+  ["E676",0x7352],
+  ["E677",0x735E],
+  ["E678",0x735F],
+  ["E679",0x7360],
+  ["E67A",0x735D],
+  ["E67B",0x735B],
+  ["E67C",0x7361],
+  ["E67D",0x735A],
+  ["E67E",0x7359],
+  ["E6A1",0x7362],
+  ["E6A2",0x7487],
+  ["E6A3",0x7489],
+  ["E6A4",0x748A],
+  ["E6A5",0x7486],
+  ["E6A6",0x7481],
+  ["E6A7",0x747D],
+  ["E6A8",0x7485],
+  ["E6A9",0x7488],
+  ["E6AA",0x747C],
+  ["E6AB",0x7479],
+  ["E6AC",0x7508],
+  ["E6AD",0x7507],
+  ["E6AE",0x757E],
+  ["E6AF",0x7625],
+  ["E6B0",0x761E],
+  ["E6B1",0x7619],
+  ["E6B2",0x761D],
+  ["E6B3",0x761C],
+  ["E6B4",0x7623],
+  ["E6B5",0x761A],
+  ["E6B6",0x7628],
+  ["E6B7",0x761B],
+  ["E6B8",0x769C],
+  ["E6B9",0x769D],
+  ["E6BA",0x769E],
+  ["E6BB",0x769B],
+  ["E6BC",0x778D],
+  ["E6BD",0x778F],
+  ["E6BE",0x7789],
+  ["E6BF",0x7788],
+  ["E6C0",0x78CD],
+  ["E6C1",0x78BB],
+  ["E6C2",0x78CF],
+  ["E6C3",0x78CC],
+  ["E6C4",0x78D1],
+  ["E6C5",0x78CE],
+  ["E6C6",0x78D4],
+  ["E6C7",0x78C8],
+  ["E6C8",0x78C3],
+  ["E6C9",0x78C4],
+  ["E6CA",0x78C9],
+  ["E6CB",0x799A],
+  ["E6CC",0x79A1],
+  ["E6CD",0x79A0],
+  ["E6CE",0x799C],
+  ["E6CF",0x79A2],
+  ["E6D0",0x799B],
+  ["E6D1",0x6B76],
+  ["E6D2",0x7A39],
+  ["E6D3",0x7AB2],
+  ["E6D4",0x7AB4],
+  ["E6D5",0x7AB3],
+  ["E6D6",0x7BB7],
+  ["E6D7",0x7BCB],
+  ["E6D8",0x7BBE],
+  ["E6D9",0x7BAC],
+  ["E6DA",0x7BCE],
+  ["E6DB",0x7BAF],
+  ["E6DC",0x7BB9],
+  ["E6DD",0x7BCA],
+  ["E6DE",0x7BB5],
+  ["E6DF",0x7CC5],
+  ["E6E0",0x7CC8],
+  ["E6E1",0x7CCC],
+  ["E6E2",0x7CCB],
+  ["E6E3",0x7DF7],
+  ["E6E4",0x7DDB],
+  ["E6E5",0x7DEA],
+  ["E6E6",0x7DE7],
+  ["E6E7",0x7DD7],
+  ["E6E8",0x7DE1],
+  ["E6E9",0x7E03],
+  ["E6EA",0x7DFA],
+  ["E6EB",0x7DE6],
+  ["E6EC",0x7DF6],
+  ["E6ED",0x7DF1],
+  ["E6EE",0x7DF0],
+  ["E6EF",0x7DEE],
+  ["E6F0",0x7DDF],
+  ["E6F1",0x7F76],
+  ["E6F2",0x7FAC],
+  ["E6F3",0x7FB0],
+  ["E6F4",0x7FAD],
+  ["E6F5",0x7FED],
+  ["E6F6",0x7FEB],
+  ["E6F7",0x7FEA],
+  ["E6F8",0x7FEC],
+  ["E6F9",0x7FE6],
+  ["E6FA",0x7FE8],
+  ["E6FB",0x8064],
+  ["E6FC",0x8067],
+  ["E6FD",0x81A3],
+  ["E6FE",0x819F],
+  ["E740",0x819E],
+  ["E741",0x8195],
+  ["E742",0x81A2],
+  ["E743",0x8199],
+  ["E744",0x8197],
+  ["E745",0x8216],
+  ["E746",0x824F],
+  ["E747",0x8253],
+  ["E748",0x8252],
+  ["E749",0x8250],
+  ["E74A",0x824E],
+  ["E74B",0x8251],
+  ["E74C",0x8524],
+  ["E74D",0x853B],
+  ["E74E",0x850F],
+  ["E74F",0x8500],
+  ["E750",0x8529],
+  ["E751",0x850E],
+  ["E752",0x8509],
+  ["E753",0x850D],
+  ["E754",0x851F],
+  ["E755",0x850A],
+  ["E756",0x8527],
+  ["E757",0x851C],
+  ["E758",0x84FB],
+  ["E759",0x852B],
+  ["E75A",0x84FA],
+  ["E75B",0x8508],
+  ["E75C",0x850C],
+  ["E75D",0x84F4],
+  ["E75E",0x852A],
+  ["E75F",0x84F2],
+  ["E760",0x8515],
+  ["E761",0x84F7],
+  ["E762",0x84EB],
+  ["E763",0x84F3],
+  ["E764",0x84FC],
+  ["E765",0x8512],
+  ["E766",0x84EA],
+  ["E767",0x84E9],
+  ["E768",0x8516],
+  ["E769",0x84FE],
+  ["E76A",0x8528],
+  ["E76B",0x851D],
+  ["E76C",0x852E],
+  ["E76D",0x8502],
+  ["E76E",0x84FD],
+  ["E76F",0x851E],
+  ["E770",0x84F6],
+  ["E771",0x8531],
+  ["E772",0x8526],
+  ["E773",0x84E7],
+  ["E774",0x84E8],
+  ["E775",0x84F0],
+  ["E776",0x84EF],
+  ["E777",0x84F9],
+  ["E778",0x8518],
+  ["E779",0x8520],
+  ["E77A",0x8530],
+  ["E77B",0x850B],
+  ["E77C",0x8519],
+  ["E77D",0x852F],
+  ["E77E",0x8662],
+  ["E7A1",0x8756],
+  ["E7A2",0x8763],
+  ["E7A3",0x8764],
+  ["E7A4",0x8777],
+  ["E7A5",0x87E1],
+  ["E7A6",0x8773],
+  ["E7A7",0x8758],
+  ["E7A8",0x8754],
+  ["E7A9",0x875B],
+  ["E7AA",0x8752],
+  ["E7AB",0x8761],
+  ["E7AC",0x875A],
+  ["E7AD",0x8751],
+  ["E7AE",0x875E],
+  ["E7AF",0x876D],
+  ["E7B0",0x876A],
+  ["E7B1",0x8750],
+  ["E7B2",0x874E],
+  ["E7B3",0x875F],
+  ["E7B4",0x875D],
+  ["E7B5",0x876F],
+  ["E7B6",0x876C],
+  ["E7B7",0x877A],
+  ["E7B8",0x876E],
+  ["E7B9",0x875C],
+  ["E7BA",0x8765],
+  ["E7BB",0x874F],
+  ["E7BC",0x877B],
+  ["E7BD",0x8775],
+  ["E7BE",0x8762],
+  ["E7BF",0x8767],
+  ["E7C0",0x8769],
+  ["E7C1",0x885A],
+  ["E7C2",0x8905],
+  ["E7C3",0x890C],
+  ["E7C4",0x8914],
+  ["E7C5",0x890B],
+  ["E7C6",0x8917],
+  ["E7C7",0x8918],
+  ["E7C8",0x8919],
+  ["E7C9",0x8906],
+  ["E7CA",0x8916],
+  ["E7CB",0x8911],
+  ["E7CC",0x890E],
+  ["E7CD",0x8909],
+  ["E7CE",0x89A2],
+  ["E7CF",0x89A4],
+  ["E7D0",0x89A3],
+  ["E7D1",0x89ED],
+  ["E7D2",0x89F0],
+  ["E7D3",0x89EC],
+  ["E7D4",0x8ACF],
+  ["E7D5",0x8AC6],
+  ["E7D6",0x8AB8],
+  ["E7D7",0x8AD3],
+  ["E7D8",0x8AD1],
+  ["E7D9",0x8AD4],
+  ["E7DA",0x8AD5],
+  ["E7DB",0x8ABB],
+  ["E7DC",0x8AD7],
+  ["E7DD",0x8ABE],
+  ["E7DE",0x8AC0],
+  ["E7DF",0x8AC5],
+  ["E7E0",0x8AD8],
+  ["E7E1",0x8AC3],
+  ["E7E2",0x8ABA],
+  ["E7E3",0x8ABD],
+  ["E7E4",0x8AD9],
+  ["E7E5",0x8C3E],
+  ["E7E6",0x8C4D],
+  ["E7E7",0x8C8F],
+  ["E7E8",0x8CE5],
+  ["E7E9",0x8CDF],
+  ["E7EA",0x8CD9],
+  ["E7EB",0x8CE8],
+  ["E7EC",0x8CDA],
+  ["E7ED",0x8CDD],
+  ["E7EE",0x8CE7],
+  ["E7EF",0x8DA0],
+  ["E7F0",0x8D9C],
+  ["E7F1",0x8DA1],
+  ["E7F2",0x8D9B],
+  ["E7F3",0x8E20],
+  ["E7F4",0x8E23],
+  ["E7F5",0x8E25],
+  ["E7F6",0x8E24],
+  ["E7F7",0x8E2E],
+  ["E7F8",0x8E15],
+  ["E7F9",0x8E1B],
+  ["E7FA",0x8E16],
+  ["E7FB",0x8E11],
+  ["E7FC",0x8E19],
+  ["E7FD",0x8E26],
+  ["E7FE",0x8E27],
+  ["E840",0x8E14],
+  ["E841",0x8E12],
+  ["E842",0x8E18],
+  ["E843",0x8E13],
+  ["E844",0x8E1C],
+  ["E845",0x8E17],
+  ["E846",0x8E1A],
+  ["E847",0x8F2C],
+  ["E848",0x8F24],
+  ["E849",0x8F18],
+  ["E84A",0x8F1A],
+  ["E84B",0x8F20],
+  ["E84C",0x8F23],
+  ["E84D",0x8F16],
+  ["E84E",0x8F17],
+  ["E84F",0x9073],
+  ["E850",0x9070],
+  ["E851",0x906F],
+  ["E852",0x9067],
+  ["E853",0x906B],
+  ["E854",0x912F],
+  ["E855",0x912B],
+  ["E856",0x9129],
+  ["E857",0x912A],
+  ["E858",0x9132],
+  ["E859",0x9126],
+  ["E85A",0x912E],
+  ["E85B",0x9185],
+  ["E85C",0x9186],
+  ["E85D",0x918A],
+  ["E85E",0x9181],
+  ["E85F",0x9182],
+  ["E860",0x9184],
+  ["E861",0x9180],
+  ["E862",0x92D0],
+  ["E863",0x92C3],
+  ["E864",0x92C4],
+  ["E865",0x92C0],
+  ["E866",0x92D9],
+  ["E867",0x92B6],
+  ["E868",0x92CF],
+  ["E869",0x92F1],
+  ["E86A",0x92DF],
+  ["E86B",0x92D8],
+  ["E86C",0x92E9],
+  ["E86D",0x92D7],
+  ["E86E",0x92DD],
+  ["E86F",0x92CC],
+  ["E870",0x92EF],
+  ["E871",0x92C2],
+  ["E872",0x92E8],
+  ["E873",0x92CA],
+  ["E874",0x92C8],
+  ["E875",0x92CE],
+  ["E876",0x92E6],
+  ["E877",0x92CD],
+  ["E878",0x92D5],
+  ["E879",0x92C9],
+  ["E87A",0x92E0],
+  ["E87B",0x92DE],
+  ["E87C",0x92E7],
+  ["E87D",0x92D1],
+  ["E87E",0x92D3],
+  ["E8A1",0x92B5],
+  ["E8A2",0x92E1],
+  ["E8A3",0x92C6],
+  ["E8A4",0x92B4],
+  ["E8A5",0x957C],
+  ["E8A6",0x95AC],
+  ["E8A7",0x95AB],
+  ["E8A8",0x95AE],
+  ["E8A9",0x95B0],
+  ["E8AA",0x96A4],
+  ["E8AB",0x96A2],
+  ["E8AC",0x96D3],
+  ["E8AD",0x9705],
+  ["E8AE",0x9708],
+  ["E8AF",0x9702],
+  ["E8B0",0x975A],
+  ["E8B1",0x978A],
+  ["E8B2",0x978E],
+  ["E8B3",0x9788],
+  ["E8B4",0x97D0],
+  ["E8B5",0x97CF],
+  ["E8B6",0x981E],
+  ["E8B7",0x981D],
+  ["E8B8",0x9826],
+  ["E8B9",0x9829],
+  ["E8BA",0x9828],
+  ["E8BB",0x9820],
+  ["E8BC",0x981B],
+  ["E8BD",0x9827],
+  ["E8BE",0x98B2],
+  ["E8BF",0x9908],
+  ["E8C0",0x98FA],
+  ["E8C1",0x9911],
+  ["E8C2",0x9914],
+  ["E8C3",0x9916],
+  ["E8C4",0x9917],
+  ["E8C5",0x9915],
+  ["E8C6",0x99DC],
+  ["E8C7",0x99CD],
+  ["E8C8",0x99CF],
+  ["E8C9",0x99D3],
+  ["E8CA",0x99D4],
+  ["E8CB",0x99CE],
+  ["E8CC",0x99C9],
+  ["E8CD",0x99D6],
+  ["E8CE",0x99D8],
+  ["E8CF",0x99CB],
+  ["E8D0",0x99D7],
+  ["E8D1",0x99CC],
+  ["E8D2",0x9AB3],
+  ["E8D3",0x9AEC],
+  ["E8D4",0x9AEB],
+  ["E8D5",0x9AF3],
+  ["E8D6",0x9AF2],
+  ["E8D7",0x9AF1],
+  ["E8D8",0x9B46],
+  ["E8D9",0x9B43],
+  ["E8DA",0x9B67],
+  ["E8DB",0x9B74],
+  ["E8DC",0x9B71],
+  ["E8DD",0x9B66],
+  ["E8DE",0x9B76],
+  ["E8DF",0x9B75],
+  ["E8E0",0x9B70],
+  ["E8E1",0x9B68],
+  ["E8E2",0x9B64],
+  ["E8E3",0x9B6C],
+  ["E8E4",0x9CFC],
+  ["E8E5",0x9CFA],
+  ["E8E6",0x9CFD],
+  ["E8E7",0x9CFF],
+  ["E8E8",0x9CF7],
+  ["E8E9",0x9D07],
+  ["E8EA",0x9D00],
+  ["E8EB",0x9CF9],
+  ["E8EC",0x9CFB],
+  ["E8ED",0x9D08],
+  ["E8EE",0x9D05],
+  ["E8EF",0x9D04],
+  ["E8F0",0x9E83],
+  ["E8F1",0x9ED3],
+  ["E8F2",0x9F0F],
+  ["E8F3",0x9F10],
+  ["E8F4",0x511C],
+  ["E8F5",0x5113],
+  ["E8F6",0x5117],
+  ["E8F7",0x511A],
+  ["E8F8",0x5111],
+  ["E8F9",0x51DE],
+  ["E8FA",0x5334],
+  ["E8FB",0x53E1],
+  ["E8FC",0x5670],
+  ["E8FD",0x5660],
+  ["E8FE",0x566E],
+  ["E940",0x5673],
+  ["E941",0x5666],
+  ["E942",0x5663],
+  ["E943",0x566D],
+  ["E944",0x5672],
+  ["E945",0x565E],
+  ["E946",0x5677],
+  ["E947",0x571C],
+  ["E948",0x571B],
+  ["E949",0x58C8],
+  ["E94A",0x58BD],
+  ["E94B",0x58C9],
+  ["E94C",0x58BF],
+  ["E94D",0x58BA],
+  ["E94E",0x58C2],
+  ["E94F",0x58BC],
+  ["E950",0x58C6],
+  ["E951",0x5B17],
+  ["E952",0x5B19],
+  ["E953",0x5B1B],
+  ["E954",0x5B21],
+  ["E955",0x5B14],
+  ["E956",0x5B13],
+  ["E957",0x5B10],
+  ["E958",0x5B16],
+  ["E959",0x5B28],
+  ["E95A",0x5B1A],
+  ["E95B",0x5B20],
+  ["E95C",0x5B1E],
+  ["E95D",0x5BEF],
+  ["E95E",0x5DAC],
+  ["E95F",0x5DB1],
+  ["E960",0x5DA9],
+  ["E961",0x5DA7],
+  ["E962",0x5DB5],
+  ["E963",0x5DB0],
+  ["E964",0x5DAE],
+  ["E965",0x5DAA],
+  ["E966",0x5DA8],
+  ["E967",0x5DB2],
+  ["E968",0x5DAD],
+  ["E969",0x5DAF],
+  ["E96A",0x5DB4],
+  ["E96B",0x5E67],
+  ["E96C",0x5E68],
+  ["E96D",0x5E66],
+  ["E96E",0x5E6F],
+  ["E96F",0x5EE9],
+  ["E970",0x5EE7],
+  ["E971",0x5EE6],
+  ["E972",0x5EE8],
+  ["E973",0x5EE5],
+  ["E974",0x5F4B],
+  ["E975",0x5FBC],
+  ["E976",0x619D],
+  ["E977",0x61A8],
+  ["E978",0x6196],
+  ["E979",0x61C5],
+  ["E97A",0x61B4],
+  ["E97B",0x61C6],
+  ["E97C",0x61C1],
+  ["E97D",0x61CC],
+  ["E97E",0x61BA],
+  ["E9A1",0x61BF],
+  ["E9A2",0x61B8],
+  ["E9A3",0x618C],
+  ["E9A4",0x64D7],
+  ["E9A5",0x64D6],
+  ["E9A6",0x64D0],
+  ["E9A7",0x64CF],
+  ["E9A8",0x64C9],
+  ["E9A9",0x64BD],
+  ["E9AA",0x6489],
+  ["E9AB",0x64C3],
+  ["E9AC",0x64DB],
+  ["E9AD",0x64F3],
+  ["E9AE",0x64D9],
+  ["E9AF",0x6533],
+  ["E9B0",0x657F],
+  ["E9B1",0x657C],
+  ["E9B2",0x65A2],
+  ["E9B3",0x66C8],
+  ["E9B4",0x66BE],
+  ["E9B5",0x66C0],
+  ["E9B6",0x66CA],
+  ["E9B7",0x66CB],
+  ["E9B8",0x66CF],
+  ["E9B9",0x66BD],
+  ["E9BA",0x66BB],
+  ["E9BB",0x66BA],
+  ["E9BC",0x66CC],
+  ["E9BD",0x6723],
+  ["E9BE",0x6A34],
+  ["E9BF",0x6A66],
+  ["E9C0",0x6A49],
+  ["E9C1",0x6A67],
+  ["E9C2",0x6A32],
+  ["E9C3",0x6A68],
+  ["E9C4",0x6A3E],
+  ["E9C5",0x6A5D],
+  ["E9C6",0x6A6D],
+  ["E9C7",0x6A76],
+  ["E9C8",0x6A5B],
+  ["E9C9",0x6A51],
+  ["E9CA",0x6A28],
+  ["E9CB",0x6A5A],
+  ["E9CC",0x6A3B],
+  ["E9CD",0x6A3F],
+  ["E9CE",0x6A41],
+  ["E9CF",0x6A6A],
+  ["E9D0",0x6A64],
+  ["E9D1",0x6A50],
+  ["E9D2",0x6A4F],
+  ["E9D3",0x6A54],
+  ["E9D4",0x6A6F],
+  ["E9D5",0x6A69],
+  ["E9D6",0x6A60],
+  ["E9D7",0x6A3C],
+  ["E9D8",0x6A5E],
+  ["E9D9",0x6A56],
+  ["E9DA",0x6A55],
+  ["E9DB",0x6A4D],
+  ["E9DC",0x6A4E],
+  ["E9DD",0x6A46],
+  ["E9DE",0x6B55],
+  ["E9DF",0x6B54],
+  ["E9E0",0x6B56],
+  ["E9E1",0x6BA7],
+  ["E9E2",0x6BAA],
+  ["E9E3",0x6BAB],
+  ["E9E4",0x6BC8],
+  ["E9E5",0x6BC7],
+  ["E9E6",0x6C04],
+  ["E9E7",0x6C03],
+  ["E9E8",0x6C06],
+  ["E9E9",0x6FAD],
+  ["E9EA",0x6FCB],
+  ["E9EB",0x6FA3],
+  ["E9EC",0x6FC7],
+  ["E9ED",0x6FBC],
+  ["E9EE",0x6FCE],
+  ["E9EF",0x6FC8],
+  ["E9F0",0x6F5E],
+  ["E9F1",0x6FC4],
+  ["E9F2",0x6FBD],
+  ["E9F3",0x6F9E],
+  ["E9F4",0x6FCA],
+  ["E9F5",0x6FA8],
+  ["E9F6",0x7004],
+  ["E9F7",0x6FA5],
+  ["E9F8",0x6FAE],
+  ["E9F9",0x6FBA],
+  ["E9FA",0x6FAC],
+  ["E9FB",0x6FAA],
+  ["E9FC",0x6FCF],
+  ["E9FD",0x6FBF],
+  ["E9FE",0x6FB8],
+  ["EA40",0x6FA2],
+  ["EA41",0x6FC9],
+  ["EA42",0x6FAB],
+  ["EA43",0x6FCD],
+  ["EA44",0x6FAF],
+  ["EA45",0x6FB2],
+  ["EA46",0x6FB0],
+  ["EA47",0x71C5],
+  ["EA48",0x71C2],
+  ["EA49",0x71BF],
+  ["EA4A",0x71B8],
+  ["EA4B",0x71D6],
+  ["EA4C",0x71C0],
+  ["EA4D",0x71C1],
+  ["EA4E",0x71CB],
+  ["EA4F",0x71D4],
+  ["EA50",0x71CA],
+  ["EA51",0x71C7],
+  ["EA52",0x71CF],
+  ["EA53",0x71BD],
+  ["EA54",0x71D8],
+  ["EA55",0x71BC],
+  ["EA56",0x71C6],
+  ["EA57",0x71DA],
+  ["EA58",0x71DB],
+  ["EA59",0x729D],
+  ["EA5A",0x729E],
+  ["EA5B",0x7369],
+  ["EA5C",0x7366],
+  ["EA5D",0x7367],
+  ["EA5E",0x736C],
+  ["EA5F",0x7365],
+  ["EA60",0x736B],
+  ["EA61",0x736A],
+  ["EA62",0x747F],
+  ["EA63",0x749A],
+  ["EA64",0x74A0],
+  ["EA65",0x7494],
+  ["EA66",0x7492],
+  ["EA67",0x7495],
+  ["EA68",0x74A1],
+  ["EA69",0x750B],
+  ["EA6A",0x7580],
+  ["EA6B",0x762F],
+  ["EA6C",0x762D],
+  ["EA6D",0x7631],
+  ["EA6E",0x763D],
+  ["EA6F",0x7633],
+  ["EA70",0x763C],
+  ["EA71",0x7635],
+  ["EA72",0x7632],
+  ["EA73",0x7630],
+  ["EA74",0x76BB],
+  ["EA75",0x76E6],
+  ["EA76",0x779A],
+  ["EA77",0x779D],
+  ["EA78",0x77A1],
+  ["EA79",0x779C],
+  ["EA7A",0x779B],
+  ["EA7B",0x77A2],
+  ["EA7C",0x77A3],
+  ["EA7D",0x7795],
+  ["EA7E",0x7799],
+  ["EAA1",0x7797],
+  ["EAA2",0x78DD],
+  ["EAA3",0x78E9],
+  ["EAA4",0x78E5],
+  ["EAA5",0x78EA],
+  ["EAA6",0x78DE],
+  ["EAA7",0x78E3],
+  ["EAA8",0x78DB],
+  ["EAA9",0x78E1],
+  ["EAAA",0x78E2],
+  ["EAAB",0x78ED],
+  ["EAAC",0x78DF],
+  ["EAAD",0x78E0],
+  ["EAAE",0x79A4],
+  ["EAAF",0x7A44],
+  ["EAB0",0x7A48],
+  ["EAB1",0x7A47],
+  ["EAB2",0x7AB6],
+  ["EAB3",0x7AB8],
+  ["EAB4",0x7AB5],
+  ["EAB5",0x7AB1],
+  ["EAB6",0x7AB7],
+  ["EAB7",0x7BDE],
+  ["EAB8",0x7BE3],
+  ["EAB9",0x7BE7],
+  ["EABA",0x7BDD],
+  ["EABB",0x7BD5],
+  ["EABC",0x7BE5],
+  ["EABD",0x7BDA],
+  ["EABE",0x7BE8],
+  ["EABF",0x7BF9],
+  ["EAC0",0x7BD4],
+  ["EAC1",0x7BEA],
+  ["EAC2",0x7BE2],
+  ["EAC3",0x7BDC],
+  ["EAC4",0x7BEB],
+  ["EAC5",0x7BD8],
+  ["EAC6",0x7BDF],
+  ["EAC7",0x7CD2],
+  ["EAC8",0x7CD4],
+  ["EAC9",0x7CD7],
+  ["EACA",0x7CD0],
+  ["EACB",0x7CD1],
+  ["EACC",0x7E12],
+  ["EACD",0x7E21],
+  ["EACE",0x7E17],
+  ["EACF",0x7E0C],
+  ["EAD0",0x7E1F],
+  ["EAD1",0x7E20],
+  ["EAD2",0x7E13],
+  ["EAD3",0x7E0E],
+  ["EAD4",0x7E1C],
+  ["EAD5",0x7E15],
+  ["EAD6",0x7E1A],
+  ["EAD7",0x7E22],
+  ["EAD8",0x7E0B],
+  ["EAD9",0x7E0F],
+  ["EADA",0x7E16],
+  ["EADB",0x7E0D],
+  ["EADC",0x7E14],
+  ["EADD",0x7E25],
+  ["EADE",0x7E24],
+  ["EADF",0x7F43],
+  ["EAE0",0x7F7B],
+  ["EAE1",0x7F7C],
+  ["EAE2",0x7F7A],
+  ["EAE3",0x7FB1],
+  ["EAE4",0x7FEF],
+  ["EAE5",0x802A],
+  ["EAE6",0x8029],
+  ["EAE7",0x806C],
+  ["EAE8",0x81B1],
+  ["EAE9",0x81A6],
+  ["EAEA",0x81AE],
+  ["EAEB",0x81B9],
+  ["EAEC",0x81B5],
+  ["EAED",0x81AB],
+  ["EAEE",0x81B0],
+  ["EAEF",0x81AC],
+  ["EAF0",0x81B4],
+  ["EAF1",0x81B2],
+  ["EAF2",0x81B7],
+  ["EAF3",0x81A7],
+  ["EAF4",0x81F2],
+  ["EAF5",0x8255],
+  ["EAF6",0x8256],
+  ["EAF7",0x8257],
+  ["EAF8",0x8556],
+  ["EAF9",0x8545],
+  ["EAFA",0x856B],
+  ["EAFB",0x854D],
+  ["EAFC",0x8553],
+  ["EAFD",0x8561],
+  ["EAFE",0x8558],
+  ["EB40",0x8540],
+  ["EB41",0x8546],
+  ["EB42",0x8564],
+  ["EB43",0x8541],
+  ["EB44",0x8562],
+  ["EB45",0x8544],
+  ["EB46",0x8551],
+  ["EB47",0x8547],
+  ["EB48",0x8563],
+  ["EB49",0x853E],
+  ["EB4A",0x855B],
+  ["EB4B",0x8571],
+  ["EB4C",0x854E],
+  ["EB4D",0x856E],
+  ["EB4E",0x8575],
+  ["EB4F",0x8555],
+  ["EB50",0x8567],
+  ["EB51",0x8560],
+  ["EB52",0x858C],
+  ["EB53",0x8566],
+  ["EB54",0x855D],
+  ["EB55",0x8554],
+  ["EB56",0x8565],
+  ["EB57",0x856C],
+  ["EB58",0x8663],
+  ["EB59",0x8665],
+  ["EB5A",0x8664],
+  ["EB5B",0x879B],
+  ["EB5C",0x878F],
+  ["EB5D",0x8797],
+  ["EB5E",0x8793],
+  ["EB5F",0x8792],
+  ["EB60",0x8788],
+  ["EB61",0x8781],
+  ["EB62",0x8796],
+  ["EB63",0x8798],
+  ["EB64",0x8779],
+  ["EB65",0x8787],
+  ["EB66",0x87A3],
+  ["EB67",0x8785],
+  ["EB68",0x8790],
+  ["EB69",0x8791],
+  ["EB6A",0x879D],
+  ["EB6B",0x8784],
+  ["EB6C",0x8794],
+  ["EB6D",0x879C],
+  ["EB6E",0x879A],
+  ["EB6F",0x8789],
+  ["EB70",0x891E],
+  ["EB71",0x8926],
+  ["EB72",0x8930],
+  ["EB73",0x892D],
+  ["EB74",0x892E],
+  ["EB75",0x8927],
+  ["EB76",0x8931],
+  ["EB77",0x8922],
+  ["EB78",0x8929],
+  ["EB79",0x8923],
+  ["EB7A",0x892F],
+  ["EB7B",0x892C],
+  ["EB7C",0x891F],
+  ["EB7D",0x89F1],
+  ["EB7E",0x8AE0],
+  ["EBA1",0x8AE2],
+  ["EBA2",0x8AF2],
+  ["EBA3",0x8AF4],
+  ["EBA4",0x8AF5],
+  ["EBA5",0x8ADD],
+  ["EBA6",0x8B14],
+  ["EBA7",0x8AE4],
+  ["EBA8",0x8ADF],
+  ["EBA9",0x8AF0],
+  ["EBAA",0x8AC8],
+  ["EBAB",0x8ADE],
+  ["EBAC",0x8AE1],
+  ["EBAD",0x8AE8],
+  ["EBAE",0x8AFF],
+  ["EBAF",0x8AEF],
+  ["EBB0",0x8AFB],
+  ["EBB1",0x8C91],
+  ["EBB2",0x8C92],
+  ["EBB3",0x8C90],
+  ["EBB4",0x8CF5],
+  ["EBB5",0x8CEE],
+  ["EBB6",0x8CF1],
+  ["EBB7",0x8CF0],
+  ["EBB8",0x8CF3],
+  ["EBB9",0x8D6C],
+  ["EBBA",0x8D6E],
+  ["EBBB",0x8DA5],
+  ["EBBC",0x8DA7],
+  ["EBBD",0x8E33],
+  ["EBBE",0x8E3E],
+  ["EBBF",0x8E38],
+  ["EBC0",0x8E40],
+  ["EBC1",0x8E45],
+  ["EBC2",0x8E36],
+  ["EBC3",0x8E3C],
+  ["EBC4",0x8E3D],
+  ["EBC5",0x8E41],
+  ["EBC6",0x8E30],
+  ["EBC7",0x8E3F],
+  ["EBC8",0x8EBD],
+  ["EBC9",0x8F36],
+  ["EBCA",0x8F2E],
+  ["EBCB",0x8F35],
+  ["EBCC",0x8F32],
+  ["EBCD",0x8F39],
+  ["EBCE",0x8F37],
+  ["EBCF",0x8F34],
+  ["EBD0",0x9076],
+  ["EBD1",0x9079],
+  ["EBD2",0x907B],
+  ["EBD3",0x9086],
+  ["EBD4",0x90FA],
+  ["EBD5",0x9133],
+  ["EBD6",0x9135],
+  ["EBD7",0x9136],
+  ["EBD8",0x9193],
+  ["EBD9",0x9190],
+  ["EBDA",0x9191],
+  ["EBDB",0x918D],
+  ["EBDC",0x918F],
+  ["EBDD",0x9327],
+  ["EBDE",0x931E],
+  ["EBDF",0x9308],
+  ["EBE0",0x931F],
+  ["EBE1",0x9306],
+  ["EBE2",0x930F],
+  ["EBE3",0x937A],
+  ["EBE4",0x9338],
+  ["EBE5",0x933C],
+  ["EBE6",0x931B],
+  ["EBE7",0x9323],
+  ["EBE8",0x9312],
+  ["EBE9",0x9301],
+  ["EBEA",0x9346],
+  ["EBEB",0x932D],
+  ["EBEC",0x930E],
+  ["EBED",0x930D],
+  ["EBEE",0x92CB],
+  ["EBEF",0x931D],
+  ["EBF0",0x92FA],
+  ["EBF1",0x9325],
+  ["EBF2",0x9313],
+  ["EBF3",0x92F9],
+  ["EBF4",0x92F7],
+  ["EBF5",0x9334],
+  ["EBF6",0x9302],
+  ["EBF7",0x9324],
+  ["EBF8",0x92FF],
+  ["EBF9",0x9329],
+  ["EBFA",0x9339],
+  ["EBFB",0x9335],
+  ["EBFC",0x932A],
+  ["EBFD",0x9314],
+  ["EBFE",0x930C],
+  ["EC40",0x930B],
+  ["EC41",0x92FE],
+  ["EC42",0x9309],
+  ["EC43",0x9300],
+  ["EC44",0x92FB],
+  ["EC45",0x9316],
+  ["EC46",0x95BC],
+  ["EC47",0x95CD],
+  ["EC48",0x95BE],
+  ["EC49",0x95B9],
+  ["EC4A",0x95BA],
+  ["EC4B",0x95B6],
+  ["EC4C",0x95BF],
+  ["EC4D",0x95B5],
+  ["EC4E",0x95BD],
+  ["EC4F",0x96A9],
+  ["EC50",0x96D4],
+  ["EC51",0x970B],
+  ["EC52",0x9712],
+  ["EC53",0x9710],
+  ["EC54",0x9799],
+  ["EC55",0x9797],
+  ["EC56",0x9794],
+  ["EC57",0x97F0],
+  ["EC58",0x97F8],
+  ["EC59",0x9835],
+  ["EC5A",0x982F],
+  ["EC5B",0x9832],
+  ["EC5C",0x9924],
+  ["EC5D",0x991F],
+  ["EC5E",0x9927],
+  ["EC5F",0x9929],
+  ["EC60",0x999E],
+  ["EC61",0x99EE],
+  ["EC62",0x99EC],
+  ["EC63",0x99E5],
+  ["EC64",0x99E4],
+  ["EC65",0x99F0],
+  ["EC66",0x99E3],
+  ["EC67",0x99EA],
+  ["EC68",0x99E9],
+  ["EC69",0x99E7],
+  ["EC6A",0x9AB9],
+  ["EC6B",0x9ABF],
+  ["EC6C",0x9AB4],
+  ["EC6D",0x9ABB],
+  ["EC6E",0x9AF6],
+  ["EC6F",0x9AFA],
+  ["EC70",0x9AF9],
+  ["EC71",0x9AF7],
+  ["EC72",0x9B33],
+  ["EC73",0x9B80],
+  ["EC74",0x9B85],
+  ["EC75",0x9B87],
+  ["EC76",0x9B7C],
+  ["EC77",0x9B7E],
+  ["EC78",0x9B7B],
+  ["EC79",0x9B82],
+  ["EC7A",0x9B93],
+  ["EC7B",0x9B92],
+  ["EC7C",0x9B90],
+  ["EC7D",0x9B7A],
+  ["EC7E",0x9B95],
+  ["ECA1",0x9B7D],
+  ["ECA2",0x9B88],
+  ["ECA3",0x9D25],
+  ["ECA4",0x9D17],
+  ["ECA5",0x9D20],
+  ["ECA6",0x9D1E],
+  ["ECA7",0x9D14],
+  ["ECA8",0x9D29],
+  ["ECA9",0x9D1D],
+  ["ECAA",0x9D18],
+  ["ECAB",0x9D22],
+  ["ECAC",0x9D10],
+  ["ECAD",0x9D19],
+  ["ECAE",0x9D1F],
+  ["ECAF",0x9E88],
+  ["ECB0",0x9E86],
+  ["ECB1",0x9E87],
+  ["ECB2",0x9EAE],
+  ["ECB3",0x9EAD],
+  ["ECB4",0x9ED5],
+  ["ECB5",0x9ED6],
+  ["ECB6",0x9EFA],
+  ["ECB7",0x9F12],
+  ["ECB8",0x9F3D],
+  ["ECB9",0x5126],
+  ["ECBA",0x5125],
+  ["ECBB",0x5122],
+  ["ECBC",0x5124],
+  ["ECBD",0x5120],
+  ["ECBE",0x5129],
+  ["ECBF",0x52F4],
+  ["ECC0",0x5693],
+  ["ECC1",0x568C],
+  ["ECC2",0x568D],
+  ["ECC3",0x5686],
+  ["ECC4",0x5684],
+  ["ECC5",0x5683],
+  ["ECC6",0x567E],
+  ["ECC7",0x5682],
+  ["ECC8",0x567F],
+  ["ECC9",0x5681],
+  ["ECCA",0x58D6],
+  ["ECCB",0x58D4],
+  ["ECCC",0x58CF],
+  ["ECCD",0x58D2],
+  ["ECCE",0x5B2D],
+  ["ECCF",0x5B25],
+  ["ECD0",0x5B32],
+  ["ECD1",0x5B23],
+  ["ECD2",0x5B2C],
+  ["ECD3",0x5B27],
+  ["ECD4",0x5B26],
+  ["ECD5",0x5B2F],
+  ["ECD6",0x5B2E],
+  ["ECD7",0x5B7B],
+  ["ECD8",0x5BF1],
+  ["ECD9",0x5BF2],
+  ["ECDA",0x5DB7],
+  ["ECDB",0x5E6C],
+  ["ECDC",0x5E6A],
+  ["ECDD",0x5FBE],
+  ["ECDE",0x5FBB],
+  ["ECDF",0x61C3],
+  ["ECE0",0x61B5],
+  ["ECE1",0x61BC],
+  ["ECE2",0x61E7],
+  ["ECE3",0x61E0],
+  ["ECE4",0x61E5],
+  ["ECE5",0x61E4],
+  ["ECE6",0x61E8],
+  ["ECE7",0x61DE],
+  ["ECE8",0x64EF],
+  ["ECE9",0x64E9],
+  ["ECEA",0x64E3],
+  ["ECEB",0x64EB],
+  ["ECEC",0x64E4],
+  ["ECED",0x64E8],
+  ["ECEE",0x6581],
+  ["ECEF",0x6580],
+  ["ECF0",0x65B6],
+  ["ECF1",0x65DA],
+  ["ECF2",0x66D2],
+  ["ECF3",0x6A8D],
+  ["ECF4",0x6A96],
+  ["ECF5",0x6A81],
+  ["ECF6",0x6AA5],
+  ["ECF7",0x6A89],
+  ["ECF8",0x6A9F],
+  ["ECF9",0x6A9B],
+  ["ECFA",0x6AA1],
+  ["ECFB",0x6A9E],
+  ["ECFC",0x6A87],
+  ["ECFD",0x6A93],
+  ["ECFE",0x6A8E],
+  ["ED40",0x6A95],
+  ["ED41",0x6A83],
+  ["ED42",0x6AA8],
+  ["ED43",0x6AA4],
+  ["ED44",0x6A91],
+  ["ED45",0x6A7F],
+  ["ED46",0x6AA6],
+  ["ED47",0x6A9A],
+  ["ED48",0x6A85],
+  ["ED49",0x6A8C],
+  ["ED4A",0x6A92],
+  ["ED4B",0x6B5B],
+  ["ED4C",0x6BAD],
+  ["ED4D",0x6C09],
+  ["ED4E",0x6FCC],
+  ["ED4F",0x6FA9],
+  ["ED50",0x6FF4],
+  ["ED51",0x6FD4],
+  ["ED52",0x6FE3],
+  ["ED53",0x6FDC],
+  ["ED54",0x6FED],
+  ["ED55",0x6FE7],
+  ["ED56",0x6FE6],
+  ["ED57",0x6FDE],
+  ["ED58",0x6FF2],
+  ["ED59",0x6FDD],
+  ["ED5A",0x6FE2],
+  ["ED5B",0x6FE8],
+  ["ED5C",0x71E1],
+  ["ED5D",0x71F1],
+  ["ED5E",0x71E8],
+  ["ED5F",0x71F2],
+  ["ED60",0x71E4],
+  ["ED61",0x71F0],
+  ["ED62",0x71E2],
+  ["ED63",0x7373],
+  ["ED64",0x736E],
+  ["ED65",0x736F],
+  ["ED66",0x7497],
+  ["ED67",0x74B2],
+  ["ED68",0x74AB],
+  ["ED69",0x7490],
+  ["ED6A",0x74AA],
+  ["ED6B",0x74AD],
+  ["ED6C",0x74B1],
+  ["ED6D",0x74A5],
+  ["ED6E",0x74AF],
+  ["ED6F",0x7510],
+  ["ED70",0x7511],
+  ["ED71",0x7512],
+  ["ED72",0x750F],
+  ["ED73",0x7584],
+  ["ED74",0x7643],
+  ["ED75",0x7648],
+  ["ED76",0x7649],
+  ["ED77",0x7647],
+  ["ED78",0x76A4],
+  ["ED79",0x76E9],
+  ["ED7A",0x77B5],
+  ["ED7B",0x77AB],
+  ["ED7C",0x77B2],
+  ["ED7D",0x77B7],
+  ["ED7E",0x77B6],
+  ["EDA1",0x77B4],
+  ["EDA2",0x77B1],
+  ["EDA3",0x77A8],
+  ["EDA4",0x77F0],
+  ["EDA5",0x78F3],
+  ["EDA6",0x78FD],
+  ["EDA7",0x7902],
+  ["EDA8",0x78FB],
+  ["EDA9",0x78FC],
+  ["EDAA",0x78F2],
+  ["EDAB",0x7905],
+  ["EDAC",0x78F9],
+  ["EDAD",0x78FE],
+  ["EDAE",0x7904],
+  ["EDAF",0x79AB],
+  ["EDB0",0x79A8],
+  ["EDB1",0x7A5C],
+  ["EDB2",0x7A5B],
+  ["EDB3",0x7A56],
+  ["EDB4",0x7A58],
+  ["EDB5",0x7A54],
+  ["EDB6",0x7A5A],
+  ["EDB7",0x7ABE],
+  ["EDB8",0x7AC0],
+  ["EDB9",0x7AC1],
+  ["EDBA",0x7C05],
+  ["EDBB",0x7C0F],
+  ["EDBC",0x7BF2],
+  ["EDBD",0x7C00],
+  ["EDBE",0x7BFF],
+  ["EDBF",0x7BFB],
+  ["EDC0",0x7C0E],
+  ["EDC1",0x7BF4],
+  ["EDC2",0x7C0B],
+  ["EDC3",0x7BF3],
+  ["EDC4",0x7C02],
+  ["EDC5",0x7C09],
+  ["EDC6",0x7C03],
+  ["EDC7",0x7C01],
+  ["EDC8",0x7BF8],
+  ["EDC9",0x7BFD],
+  ["EDCA",0x7C06],
+  ["EDCB",0x7BF0],
+  ["EDCC",0x7BF1],
+  ["EDCD",0x7C10],
+  ["EDCE",0x7C0A],
+  ["EDCF",0x7CE8],
+  ["EDD0",0x7E2D],
+  ["EDD1",0x7E3C],
+  ["EDD2",0x7E42],
+  ["EDD3",0x7E33],
+  ["EDD4",0x9848],
+  ["EDD5",0x7E38],
+  ["EDD6",0x7E2A],
+  ["EDD7",0x7E49],
+  ["EDD8",0x7E40],
+  ["EDD9",0x7E47],
+  ["EDDA",0x7E29],
+  ["EDDB",0x7E4C],
+  ["EDDC",0x7E30],
+  ["EDDD",0x7E3B],
+  ["EDDE",0x7E36],
+  ["EDDF",0x7E44],
+  ["EDE0",0x7E3A],
+  ["EDE1",0x7F45],
+  ["EDE2",0x7F7F],
+  ["EDE3",0x7F7E],
+  ["EDE4",0x7F7D],
+  ["EDE5",0x7FF4],
+  ["EDE6",0x7FF2],
+  ["EDE7",0x802C],
+  ["EDE8",0x81BB],
+  ["EDE9",0x81C4],
+  ["EDEA",0x81CC],
+  ["EDEB",0x81CA],
+  ["EDEC",0x81C5],
+  ["EDED",0x81C7],
+  ["EDEE",0x81BC],
+  ["EDEF",0x81E9],
+  ["EDF0",0x825B],
+  ["EDF1",0x825A],
+  ["EDF2",0x825C],
+  ["EDF3",0x8583],
+  ["EDF4",0x8580],
+  ["EDF5",0x858F],
+  ["EDF6",0x85A7],
+  ["EDF7",0x8595],
+  ["EDF8",0x85A0],
+  ["EDF9",0x858B],
+  ["EDFA",0x85A3],
+  ["EDFB",0x857B],
+  ["EDFC",0x85A4],
+  ["EDFD",0x859A],
+  ["EDFE",0x859E],
+  ["EE40",0x8577],
+  ["EE41",0x857C],
+  ["EE42",0x8589],
+  ["EE43",0x85A1],
+  ["EE44",0x857A],
+  ["EE45",0x8578],
+  ["EE46",0x8557],
+  ["EE47",0x858E],
+  ["EE48",0x8596],
+  ["EE49",0x8586],
+  ["EE4A",0x858D],
+  ["EE4B",0x8599],
+  ["EE4C",0x859D],
+  ["EE4D",0x8581],
+  ["EE4E",0x85A2],
+  ["EE4F",0x8582],
+  ["EE50",0x8588],
+  ["EE51",0x8585],
+  ["EE52",0x8579],
+  ["EE53",0x8576],
+  ["EE54",0x8598],
+  ["EE55",0x8590],
+  ["EE56",0x859F],
+  ["EE57",0x8668],
+  ["EE58",0x87BE],
+  ["EE59",0x87AA],
+  ["EE5A",0x87AD],
+  ["EE5B",0x87C5],
+  ["EE5C",0x87B0],
+  ["EE5D",0x87AC],
+  ["EE5E",0x87B9],
+  ["EE5F",0x87B5],
+  ["EE60",0x87BC],
+  ["EE61",0x87AE],
+  ["EE62",0x87C9],
+  ["EE63",0x87C3],
+  ["EE64",0x87C2],
+  ["EE65",0x87CC],
+  ["EE66",0x87B7],
+  ["EE67",0x87AF],
+  ["EE68",0x87C4],
+  ["EE69",0x87CA],
+  ["EE6A",0x87B4],
+  ["EE6B",0x87B6],
+  ["EE6C",0x87BF],
+  ["EE6D",0x87B8],
+  ["EE6E",0x87BD],
+  ["EE6F",0x87DE],
+  ["EE70",0x87B2],
+  ["EE71",0x8935],
+  ["EE72",0x8933],
+  ["EE73",0x893C],
+  ["EE74",0x893E],
+  ["EE75",0x8941],
+  ["EE76",0x8952],
+  ["EE77",0x8937],
+  ["EE78",0x8942],
+  ["EE79",0x89AD],
+  ["EE7A",0x89AF],
+  ["EE7B",0x89AE],
+  ["EE7C",0x89F2],
+  ["EE7D",0x89F3],
+  ["EE7E",0x8B1E],
+  ["EEA1",0x8B18],
+  ["EEA2",0x8B16],
+  ["EEA3",0x8B11],
+  ["EEA4",0x8B05],
+  ["EEA5",0x8B0B],
+  ["EEA6",0x8B22],
+  ["EEA7",0x8B0F],
+  ["EEA8",0x8B12],
+  ["EEA9",0x8B15],
+  ["EEAA",0x8B07],
+  ["EEAB",0x8B0D],
+  ["EEAC",0x8B08],
+  ["EEAD",0x8B06],
+  ["EEAE",0x8B1C],
+  ["EEAF",0x8B13],
+  ["EEB0",0x8B1A],
+  ["EEB1",0x8C4F],
+  ["EEB2",0x8C70],
+  ["EEB3",0x8C72],
+  ["EEB4",0x8C71],
+  ["EEB5",0x8C6F],
+  ["EEB6",0x8C95],
+  ["EEB7",0x8C94],
+  ["EEB8",0x8CF9],
+  ["EEB9",0x8D6F],
+  ["EEBA",0x8E4E],
+  ["EEBB",0x8E4D],
+  ["EEBC",0x8E53],
+  ["EEBD",0x8E50],
+  ["EEBE",0x8E4C],
+  ["EEBF",0x8E47],
+  ["EEC0",0x8F43],
+  ["EEC1",0x8F40],
+  ["EEC2",0x9085],
+  ["EEC3",0x907E],
+  ["EEC4",0x9138],
+  ["EEC5",0x919A],
+  ["EEC6",0x91A2],
+  ["EEC7",0x919B],
+  ["EEC8",0x9199],
+  ["EEC9",0x919F],
+  ["EECA",0x91A1],
+  ["EECB",0x919D],
+  ["EECC",0x91A0],
+  ["EECD",0x93A1],
+  ["EECE",0x9383],
+  ["EECF",0x93AF],
+  ["EED0",0x9364],
+  ["EED1",0x9356],
+  ["EED2",0x9347],
+  ["EED3",0x937C],
+  ["EED4",0x9358],
+  ["EED5",0x935C],
+  ["EED6",0x9376],
+  ["EED7",0x9349],
+  ["EED8",0x9350],
+  ["EED9",0x9351],
+  ["EEDA",0x9360],
+  ["EEDB",0x936D],
+  ["EEDC",0x938F],
+  ["EEDD",0x934C],
+  ["EEDE",0x936A],
+  ["EEDF",0x9379],
+  ["EEE0",0x9357],
+  ["EEE1",0x9355],
+  ["EEE2",0x9352],
+  ["EEE3",0x934F],
+  ["EEE4",0x9371],
+  ["EEE5",0x9377],
+  ["EEE6",0x937B],
+  ["EEE7",0x9361],
+  ["EEE8",0x935E],
+  ["EEE9",0x9363],
+  ["EEEA",0x9367],
+  ["EEEB",0x9380],
+  ["EEEC",0x934E],
+  ["EEED",0x9359],
+  ["EEEE",0x95C7],
+  ["EEEF",0x95C0],
+  ["EEF0",0x95C9],
+  ["EEF1",0x95C3],
+  ["EEF2",0x95C5],
+  ["EEF3",0x95B7],
+  ["EEF4",0x96AE],
+  ["EEF5",0x96B0],
+  ["EEF6",0x96AC],
+  ["EEF7",0x9720],
+  ["EEF8",0x971F],
+  ["EEF9",0x9718],
+  ["EEFA",0x971D],
+  ["EEFB",0x9719],
+  ["EEFC",0x979A],
+  ["EEFD",0x97A1],
+  ["EEFE",0x979C],
+  ["EF40",0x979E],
+  ["EF41",0x979D],
+  ["EF42",0x97D5],
+  ["EF43",0x97D4],
+  ["EF44",0x97F1],
+  ["EF45",0x9841],
+  ["EF46",0x9844],
+  ["EF47",0x984A],
+  ["EF48",0x9849],
+  ["EF49",0x9845],
+  ["EF4A",0x9843],
+  ["EF4B",0x9925],
+  ["EF4C",0x992B],
+  ["EF4D",0x992C],
+  ["EF4E",0x992A],
+  ["EF4F",0x9933],
+  ["EF50",0x9932],
+  ["EF51",0x992F],
+  ["EF52",0x992D],
+  ["EF53",0x9931],
+  ["EF54",0x9930],
+  ["EF55",0x9998],
+  ["EF56",0x99A3],
+  ["EF57",0x99A1],
+  ["EF58",0x9A02],
+  ["EF59",0x99FA],
+  ["EF5A",0x99F4],
+  ["EF5B",0x99F7],
+  ["EF5C",0x99F9],
+  ["EF5D",0x99F8],
+  ["EF5E",0x99F6],
+  ["EF5F",0x99FB],
+  ["EF60",0x99FD],
+  ["EF61",0x99FE],
+  ["EF62",0x99FC],
+  ["EF63",0x9A03],
+  ["EF64",0x9ABE],
+  ["EF65",0x9AFE],
+  ["EF66",0x9AFD],
+  ["EF67",0x9B01],
+  ["EF68",0x9AFC],
+  ["EF69",0x9B48],
+  ["EF6A",0x9B9A],
+  ["EF6B",0x9BA8],
+  ["EF6C",0x9B9E],
+  ["EF6D",0x9B9B],
+  ["EF6E",0x9BA6],
+  ["EF6F",0x9BA1],
+  ["EF70",0x9BA5],
+  ["EF71",0x9BA4],
+  ["EF72",0x9B86],
+  ["EF73",0x9BA2],
+  ["EF74",0x9BA0],
+  ["EF75",0x9BAF],
+  ["EF76",0x9D33],
+  ["EF77",0x9D41],
+  ["EF78",0x9D67],
+  ["EF79",0x9D36],
+  ["EF7A",0x9D2E],
+  ["EF7B",0x9D2F],
+  ["EF7C",0x9D31],
+  ["EF7D",0x9D38],
+  ["EF7E",0x9D30],
+  ["EFA1",0x9D45],
+  ["EFA2",0x9D42],
+  ["EFA3",0x9D43],
+  ["EFA4",0x9D3E],
+  ["EFA5",0x9D37],
+  ["EFA6",0x9D40],
+  ["EFA7",0x9D3D],
+  ["EFA8",0x7FF5],
+  ["EFA9",0x9D2D],
+  ["EFAA",0x9E8A],
+  ["EFAB",0x9E89],
+  ["EFAC",0x9E8D],
+  ["EFAD",0x9EB0],
+  ["EFAE",0x9EC8],
+  ["EFAF",0x9EDA],
+  ["EFB0",0x9EFB],
+  ["EFB1",0x9EFF],
+  ["EFB2",0x9F24],
+  ["EFB3",0x9F23],
+  ["EFB4",0x9F22],
+  ["EFB5",0x9F54],
+  ["EFB6",0x9FA0],
+  ["EFB7",0x5131],
+  ["EFB8",0x512D],
+  ["EFB9",0x512E],
+  ["EFBA",0x5698],
+  ["EFBB",0x569C],
+  ["EFBC",0x5697],
+  ["EFBD",0x569A],
+  ["EFBE",0x569D],
+  ["EFBF",0x5699],
+  ["EFC0",0x5970],
+  ["EFC1",0x5B3C],
+  ["EFC2",0x5C69],
+  ["EFC3",0x5C6A],
+  ["EFC4",0x5DC0],
+  ["EFC5",0x5E6D],
+  ["EFC6",0x5E6E],
+  ["EFC7",0x61D8],
+  ["EFC8",0x61DF],
+  ["EFC9",0x61ED],
+  ["EFCA",0x61EE],
+  ["EFCB",0x61F1],
+  ["EFCC",0x61EA],
+  ["EFCD",0x61F0],
+  ["EFCE",0x61EB],
+  ["EFCF",0x61D6],
+  ["EFD0",0x61E9],
+  ["EFD1",0x64FF],
+  ["EFD2",0x6504],
+  ["EFD3",0x64FD],
+  ["EFD4",0x64F8],
+  ["EFD5",0x6501],
+  ["EFD6",0x6503],
+  ["EFD7",0x64FC],
+  ["EFD8",0x6594],
+  ["EFD9",0x65DB],
+  ["EFDA",0x66DA],
+  ["EFDB",0x66DB],
+  ["EFDC",0x66D8],
+  ["EFDD",0x6AC5],
+  ["EFDE",0x6AB9],
+  ["EFDF",0x6ABD],
+  ["EFE0",0x6AE1],
+  ["EFE1",0x6AC6],
+  ["EFE2",0x6ABA],
+  ["EFE3",0x6AB6],
+  ["EFE4",0x6AB7],
+  ["EFE5",0x6AC7],
+  ["EFE6",0x6AB4],
+  ["EFE7",0x6AAD],
+  ["EFE8",0x6B5E],
+  ["EFE9",0x6BC9],
+  ["EFEA",0x6C0B],
+  ["EFEB",0x7007],
+  ["EFEC",0x700C],
+  ["EFED",0x700D],
+  ["EFEE",0x7001],
+  ["EFEF",0x7005],
+  ["EFF0",0x7014],
+  ["EFF1",0x700E],
+  ["EFF2",0x6FFF],
+  ["EFF3",0x7000],
+  ["EFF4",0x6FFB],
+  ["EFF5",0x7026],
+  ["EFF6",0x6FFC],
+  ["EFF7",0x6FF7],
+  ["EFF8",0x700A],
+  ["EFF9",0x7201],
+  ["EFFA",0x71FF],
+  ["EFFB",0x71F9],
+  ["EFFC",0x7203],
+  ["EFFD",0x71FD],
+  ["EFFE",0x7376],
+  ["F040",0x74B8],
+  ["F041",0x74C0],
+  ["F042",0x74B5],
+  ["F043",0x74C1],
+  ["F044",0x74BE],
+  ["F045",0x74B6],
+  ["F046",0x74BB],
+  ["F047",0x74C2],
+  ["F048",0x7514],
+  ["F049",0x7513],
+  ["F04A",0x765C],
+  ["F04B",0x7664],
+  ["F04C",0x7659],
+  ["F04D",0x7650],
+  ["F04E",0x7653],
+  ["F04F",0x7657],
+  ["F050",0x765A],
+  ["F051",0x76A6],
+  ["F052",0x76BD],
+  ["F053",0x76EC],
+  ["F054",0x77C2],
+  ["F055",0x77BA],
+  ["F056",0x78FF],
+  ["F057",0x790C],
+  ["F058",0x7913],
+  ["F059",0x7914],
+  ["F05A",0x7909],
+  ["F05B",0x7910],
+  ["F05C",0x7912],
+  ["F05D",0x7911],
+  ["F05E",0x79AD],
+  ["F05F",0x79AC],
+  ["F060",0x7A5F],
+  ["F061",0x7C1C],
+  ["F062",0x7C29],
+  ["F063",0x7C19],
+  ["F064",0x7C20],
+  ["F065",0x7C1F],
+  ["F066",0x7C2D],
+  ["F067",0x7C1D],
+  ["F068",0x7C26],
+  ["F069",0x7C28],
+  ["F06A",0x7C22],
+  ["F06B",0x7C25],
+  ["F06C",0x7C30],
+  ["F06D",0x7E5C],
+  ["F06E",0x7E50],
+  ["F06F",0x7E56],
+  ["F070",0x7E63],
+  ["F071",0x7E58],
+  ["F072",0x7E62],
+  ["F073",0x7E5F],
+  ["F074",0x7E51],
+  ["F075",0x7E60],
+  ["F076",0x7E57],
+  ["F077",0x7E53],
+  ["F078",0x7FB5],
+  ["F079",0x7FB3],
+  ["F07A",0x7FF7],
+  ["F07B",0x7FF8],
+  ["F07C",0x8075],
+  ["F07D",0x81D1],
+  ["F07E",0x81D2],
+  ["F0A1",0x81D0],
+  ["F0A2",0x825F],
+  ["F0A3",0x825E],
+  ["F0A4",0x85B4],
+  ["F0A5",0x85C6],
+  ["F0A6",0x85C0],
+  ["F0A7",0x85C3],
+  ["F0A8",0x85C2],
+  ["F0A9",0x85B3],
+  ["F0AA",0x85B5],
+  ["F0AB",0x85BD],
+  ["F0AC",0x85C7],
+  ["F0AD",0x85C4],
+  ["F0AE",0x85BF],
+  ["F0AF",0x85CB],
+  ["F0B0",0x85CE],
+  ["F0B1",0x85C8],
+  ["F0B2",0x85C5],
+  ["F0B3",0x85B1],
+  ["F0B4",0x85B6],
+  ["F0B5",0x85D2],
+  ["F0B6",0x8624],
+  ["F0B7",0x85B8],
+  ["F0B8",0x85B7],
+  ["F0B9",0x85BE],
+  ["F0BA",0x8669],
+  ["F0BB",0x87E7],
+  ["F0BC",0x87E6],
+  ["F0BD",0x87E2],
+  ["F0BE",0x87DB],
+  ["F0BF",0x87EB],
+  ["F0C0",0x87EA],
+  ["F0C1",0x87E5],
+  ["F0C2",0x87DF],
+  ["F0C3",0x87F3],
+  ["F0C4",0x87E4],
+  ["F0C5",0x87D4],
+  ["F0C6",0x87DC],
+  ["F0C7",0x87D3],
+  ["F0C8",0x87ED],
+  ["F0C9",0x87D8],
+  ["F0CA",0x87E3],
+  ["F0CB",0x87A4],
+  ["F0CC",0x87D7],
+  ["F0CD",0x87D9],
+  ["F0CE",0x8801],
+  ["F0CF",0x87F4],
+  ["F0D0",0x87E8],
+  ["F0D1",0x87DD],
+  ["F0D2",0x8953],
+  ["F0D3",0x894B],
+  ["F0D4",0x894F],
+  ["F0D5",0x894C],
+  ["F0D6",0x8946],
+  ["F0D7",0x8950],
+  ["F0D8",0x8951],
+  ["F0D9",0x8949],
+  ["F0DA",0x8B2A],
+  ["F0DB",0x8B27],
+  ["F0DC",0x8B23],
+  ["F0DD",0x8B33],
+  ["F0DE",0x8B30],
+  ["F0DF",0x8B35],
+  ["F0E0",0x8B47],
+  ["F0E1",0x8B2F],
+  ["F0E2",0x8B3C],
+  ["F0E3",0x8B3E],
+  ["F0E4",0x8B31],
+  ["F0E5",0x8B25],
+  ["F0E6",0x8B37],
+  ["F0E7",0x8B26],
+  ["F0E8",0x8B36],
+  ["F0E9",0x8B2E],
+  ["F0EA",0x8B24],
+  ["F0EB",0x8B3B],
+  ["F0EC",0x8B3D],
+  ["F0ED",0x8B3A],
+  ["F0EE",0x8C42],
+  ["F0EF",0x8C75],
+  ["F0F0",0x8C99],
+  ["F0F1",0x8C98],
+  ["F0F2",0x8C97],
+  ["F0F3",0x8CFE],
+  ["F0F4",0x8D04],
+  ["F0F5",0x8D02],
+  ["F0F6",0x8D00],
+  ["F0F7",0x8E5C],
+  ["F0F8",0x8E62],
+  ["F0F9",0x8E60],
+  ["F0FA",0x8E57],
+  ["F0FB",0x8E56],
+  ["F0FC",0x8E5E],
+  ["F0FD",0x8E65],
+  ["F0FE",0x8E67],
+  ["F140",0x8E5B],
+  ["F141",0x8E5A],
+  ["F142",0x8E61],
+  ["F143",0x8E5D],
+  ["F144",0x8E69],
+  ["F145",0x8E54],
+  ["F146",0x8F46],
+  ["F147",0x8F47],
+  ["F148",0x8F48],
+  ["F149",0x8F4B],
+  ["F14A",0x9128],
+  ["F14B",0x913A],
+  ["F14C",0x913B],
+  ["F14D",0x913E],
+  ["F14E",0x91A8],
+  ["F14F",0x91A5],
+  ["F150",0x91A7],
+  ["F151",0x91AF],
+  ["F152",0x91AA],
+  ["F153",0x93B5],
+  ["F154",0x938C],
+  ["F155",0x9392],
+  ["F156",0x93B7],
+  ["F157",0x939B],
+  ["F158",0x939D],
+  ["F159",0x9389],
+  ["F15A",0x93A7],
+  ["F15B",0x938E],
+  ["F15C",0x93AA],
+  ["F15D",0x939E],
+  ["F15E",0x93A6],
+  ["F15F",0x9395],
+  ["F160",0x9388],
+  ["F161",0x9399],
+  ["F162",0x939F],
+  ["F163",0x938D],
+  ["F164",0x93B1],
+  ["F165",0x9391],
+  ["F166",0x93B2],
+  ["F167",0x93A4],
+  ["F168",0x93A8],
+  ["F169",0x93B4],
+  ["F16A",0x93A3],
+  ["F16B",0x93A5],
+  ["F16C",0x95D2],
+  ["F16D",0x95D3],
+  ["F16E",0x95D1],
+  ["F16F",0x96B3],
+  ["F170",0x96D7],
+  ["F171",0x96DA],
+  ["F172",0x5DC2],
+  ["F173",0x96DF],
+  ["F174",0x96D8],
+  ["F175",0x96DD],
+  ["F176",0x9723],
+  ["F177",0x9722],
+  ["F178",0x9725],
+  ["F179",0x97AC],
+  ["F17A",0x97AE],
+  ["F17B",0x97A8],
+  ["F17C",0x97AB],
+  ["F17D",0x97A4],
+  ["F17E",0x97AA],
+  ["F1A1",0x97A2],
+  ["F1A2",0x97A5],
+  ["F1A3",0x97D7],
+  ["F1A4",0x97D9],
+  ["F1A5",0x97D6],
+  ["F1A6",0x97D8],
+  ["F1A7",0x97FA],
+  ["F1A8",0x9850],
+  ["F1A9",0x9851],
+  ["F1AA",0x9852],
+  ["F1AB",0x98B8],
+  ["F1AC",0x9941],
+  ["F1AD",0x993C],
+  ["F1AE",0x993A],
+  ["F1AF",0x9A0F],
+  ["F1B0",0x9A0B],
+  ["F1B1",0x9A09],
+  ["F1B2",0x9A0D],
+  ["F1B3",0x9A04],
+  ["F1B4",0x9A11],
+  ["F1B5",0x9A0A],
+  ["F1B6",0x9A05],
+  ["F1B7",0x9A07],
+  ["F1B8",0x9A06],
+  ["F1B9",0x9AC0],
+  ["F1BA",0x9ADC],
+  ["F1BB",0x9B08],
+  ["F1BC",0x9B04],
+  ["F1BD",0x9B05],
+  ["F1BE",0x9B29],
+  ["F1BF",0x9B35],
+  ["F1C0",0x9B4A],
+  ["F1C1",0x9B4C],
+  ["F1C2",0x9B4B],
+  ["F1C3",0x9BC7],
+  ["F1C4",0x9BC6],
+  ["F1C5",0x9BC3],
+  ["F1C6",0x9BBF],
+  ["F1C7",0x9BC1],
+  ["F1C8",0x9BB5],
+  ["F1C9",0x9BB8],
+  ["F1CA",0x9BD3],
+  ["F1CB",0x9BB6],
+  ["F1CC",0x9BC4],
+  ["F1CD",0x9BB9],
+  ["F1CE",0x9BBD],
+  ["F1CF",0x9D5C],
+  ["F1D0",0x9D53],
+  ["F1D1",0x9D4F],
+  ["F1D2",0x9D4A],
+  ["F1D3",0x9D5B],
+  ["F1D4",0x9D4B],
+  ["F1D5",0x9D59],
+  ["F1D6",0x9D56],
+  ["F1D7",0x9D4C],
+  ["F1D8",0x9D57],
+  ["F1D9",0x9D52],
+  ["F1DA",0x9D54],
+  ["F1DB",0x9D5F],
+  ["F1DC",0x9D58],
+  ["F1DD",0x9D5A],
+  ["F1DE",0x9E8E],
+  ["F1DF",0x9E8C],
+  ["F1E0",0x9EDF],
+  ["F1E1",0x9F01],
+  ["F1E2",0x9F00],
+  ["F1E3",0x9F16],
+  ["F1E4",0x9F25],
+  ["F1E5",0x9F2B],
+  ["F1E6",0x9F2A],
+  ["F1E7",0x9F29],
+  ["F1E8",0x9F28],
+  ["F1E9",0x9F4C],
+  ["F1EA",0x9F55],
+  ["F1EB",0x5134],
+  ["F1EC",0x5135],
+  ["F1ED",0x5296],
+  ["F1EE",0x52F7],
+  ["F1EF",0x53B4],
+  ["F1F0",0x56AB],
+  ["F1F1",0x56AD],
+  ["F1F2",0x56A6],
+  ["F1F3",0x56A7],
+  ["F1F4",0x56AA],
+  ["F1F5",0x56AC],
+  ["F1F6",0x58DA],
+  ["F1F7",0x58DD],
+  ["F1F8",0x58DB],
+  ["F1F9",0x5912],
+  ["F1FA",0x5B3D],
+  ["F1FB",0x5B3E],
+  ["F1FC",0x5B3F],
+  ["F1FD",0x5DC3],
+  ["F1FE",0x5E70],
+  ["F240",0x5FBF],
+  ["F241",0x61FB],
+  ["F242",0x6507],
+  ["F243",0x6510],
+  ["F244",0x650D],
+  ["F245",0x6509],
+  ["F246",0x650C],
+  ["F247",0x650E],
+  ["F248",0x6584],
+  ["F249",0x65DE],
+  ["F24A",0x65DD],
+  ["F24B",0x66DE],
+  ["F24C",0x6AE7],
+  ["F24D",0x6AE0],
+  ["F24E",0x6ACC],
+  ["F24F",0x6AD1],
+  ["F250",0x6AD9],
+  ["F251",0x6ACB],
+  ["F252",0x6ADF],
+  ["F253",0x6ADC],
+  ["F254",0x6AD0],
+  ["F255",0x6AEB],
+  ["F256",0x6ACF],
+  ["F257",0x6ACD],
+  ["F258",0x6ADE],
+  ["F259",0x6B60],
+  ["F25A",0x6BB0],
+  ["F25B",0x6C0C],
+  ["F25C",0x7019],
+  ["F25D",0x7027],
+  ["F25E",0x7020],
+  ["F25F",0x7016],
+  ["F260",0x702B],
+  ["F261",0x7021],
+  ["F262",0x7022],
+  ["F263",0x7023],
+  ["F264",0x7029],
+  ["F265",0x7017],
+  ["F266",0x7024],
+  ["F267",0x701C],
+  ["F268",0x702A],
+  ["F269",0x720C],
+  ["F26A",0x720A],
+  ["F26B",0x7207],
+  ["F26C",0x7202],
+  ["F26D",0x7205],
+  ["F26E",0x72A5],
+  ["F26F",0x72A6],
+  ["F270",0x72A4],
+  ["F271",0x72A3],
+  ["F272",0x72A1],
+  ["F273",0x74CB],
+  ["F274",0x74C5],
+  ["F275",0x74B7],
+  ["F276",0x74C3],
+  ["F277",0x7516],
+  ["F278",0x7660],
+  ["F279",0x77C9],
+  ["F27A",0x77CA],
+  ["F27B",0x77C4],
+  ["F27C",0x77F1],
+  ["F27D",0x791D],
+  ["F27E",0x791B],
+  ["F2A1",0x7921],
+  ["F2A2",0x791C],
+  ["F2A3",0x7917],
+  ["F2A4",0x791E],
+  ["F2A5",0x79B0],
+  ["F2A6",0x7A67],
+  ["F2A7",0x7A68],
+  ["F2A8",0x7C33],
+  ["F2A9",0x7C3C],
+  ["F2AA",0x7C39],
+  ["F2AB",0x7C2C],
+  ["F2AC",0x7C3B],
+  ["F2AD",0x7CEC],
+  ["F2AE",0x7CEA],
+  ["F2AF",0x7E76],
+  ["F2B0",0x7E75],
+  ["F2B1",0x7E78],
+  ["F2B2",0x7E70],
+  ["F2B3",0x7E77],
+  ["F2B4",0x7E6F],
+  ["F2B5",0x7E7A],
+  ["F2B6",0x7E72],
+  ["F2B7",0x7E74],
+  ["F2B8",0x7E68],
+  ["F2B9",0x7F4B],
+  ["F2BA",0x7F4A],
+  ["F2BB",0x7F83],
+  ["F2BC",0x7F86],
+  ["F2BD",0x7FB7],
+  ["F2BE",0x7FFD],
+  ["F2BF",0x7FFE],
+  ["F2C0",0x8078],
+  ["F2C1",0x81D7],
+  ["F2C2",0x81D5],
+  ["F2C3",0x8264],
+  ["F2C4",0x8261],
+  ["F2C5",0x8263],
+  ["F2C6",0x85EB],
+  ["F2C7",0x85F1],
+  ["F2C8",0x85ED],
+  ["F2C9",0x85D9],
+  ["F2CA",0x85E1],
+  ["F2CB",0x85E8],
+  ["F2CC",0x85DA],
+  ["F2CD",0x85D7],
+  ["F2CE",0x85EC],
+  ["F2CF",0x85F2],
+  ["F2D0",0x85F8],
+  ["F2D1",0x85D8],
+  ["F2D2",0x85DF],
+  ["F2D3",0x85E3],
+  ["F2D4",0x85DC],
+  ["F2D5",0x85D1],
+  ["F2D6",0x85F0],
+  ["F2D7",0x85E6],
+  ["F2D8",0x85EF],
+  ["F2D9",0x85DE],
+  ["F2DA",0x85E2],
+  ["F2DB",0x8800],
+  ["F2DC",0x87FA],
+  ["F2DD",0x8803],
+  ["F2DE",0x87F6],
+  ["F2DF",0x87F7],
+  ["F2E0",0x8809],
+  ["F2E1",0x880C],
+  ["F2E2",0x880B],
+  ["F2E3",0x8806],
+  ["F2E4",0x87FC],
+  ["F2E5",0x8808],
+  ["F2E6",0x87FF],
+  ["F2E7",0x880A],
+  ["F2E8",0x8802],
+  ["F2E9",0x8962],
+  ["F2EA",0x895A],
+  ["F2EB",0x895B],
+  ["F2EC",0x8957],
+  ["F2ED",0x8961],
+  ["F2EE",0x895C],
+  ["F2EF",0x8958],
+  ["F2F0",0x895D],
+  ["F2F1",0x8959],
+  ["F2F2",0x8988],
+  ["F2F3",0x89B7],
+  ["F2F4",0x89B6],
+  ["F2F5",0x89F6],
+  ["F2F6",0x8B50],
+  ["F2F7",0x8B48],
+  ["F2F8",0x8B4A],
+  ["F2F9",0x8B40],
+  ["F2FA",0x8B53],
+  ["F2FB",0x8B56],
+  ["F2FC",0x8B54],
+  ["F2FD",0x8B4B],
+  ["F2FE",0x8B55],
+  ["F340",0x8B51],
+  ["F341",0x8B42],
+  ["F342",0x8B52],
+  ["F343",0x8B57],
+  ["F344",0x8C43],
+  ["F345",0x8C77],
+  ["F346",0x8C76],
+  ["F347",0x8C9A],
+  ["F348",0x8D06],
+  ["F349",0x8D07],
+  ["F34A",0x8D09],
+  ["F34B",0x8DAC],
+  ["F34C",0x8DAA],
+  ["F34D",0x8DAD],
+  ["F34E",0x8DAB],
+  ["F34F",0x8E6D],
+  ["F350",0x8E78],
+  ["F351",0x8E73],
+  ["F352",0x8E6A],
+  ["F353",0x8E6F],
+  ["F354",0x8E7B],
+  ["F355",0x8EC2],
+  ["F356",0x8F52],
+  ["F357",0x8F51],
+  ["F358",0x8F4F],
+  ["F359",0x8F50],
+  ["F35A",0x8F53],
+  ["F35B",0x8FB4],
+  ["F35C",0x9140],
+  ["F35D",0x913F],
+  ["F35E",0x91B0],
+  ["F35F",0x91AD],
+  ["F360",0x93DE],
+  ["F361",0x93C7],
+  ["F362",0x93CF],
+  ["F363",0x93C2],
+  ["F364",0x93DA],
+  ["F365",0x93D0],
+  ["F366",0x93F9],
+  ["F367",0x93EC],
+  ["F368",0x93CC],
+  ["F369",0x93D9],
+  ["F36A",0x93A9],
+  ["F36B",0x93E6],
+  ["F36C",0x93CA],
+  ["F36D",0x93D4],
+  ["F36E",0x93EE],
+  ["F36F",0x93E3],
+  ["F370",0x93D5],
+  ["F371",0x93C4],
+  ["F372",0x93CE],
+  ["F373",0x93C0],
+  ["F374",0x93D2],
+  ["F375",0x93E7],
+  ["F376",0x957D],
+  ["F377",0x95DA],
+  ["F378",0x95DB],
+  ["F379",0x96E1],
+  ["F37A",0x9729],
+  ["F37B",0x972B],
+  ["F37C",0x972C],
+  ["F37D",0x9728],
+  ["F37E",0x9726],
+  ["F3A1",0x97B3],
+  ["F3A2",0x97B7],
+  ["F3A3",0x97B6],
+  ["F3A4",0x97DD],
+  ["F3A5",0x97DE],
+  ["F3A6",0x97DF],
+  ["F3A7",0x985C],
+  ["F3A8",0x9859],
+  ["F3A9",0x985D],
+  ["F3AA",0x9857],
+  ["F3AB",0x98BF],
+  ["F3AC",0x98BD],
+  ["F3AD",0x98BB],
+  ["F3AE",0x98BE],
+  ["F3AF",0x9948],
+  ["F3B0",0x9947],
+  ["F3B1",0x9943],
+  ["F3B2",0x99A6],
+  ["F3B3",0x99A7],
+  ["F3B4",0x9A1A],
+  ["F3B5",0x9A15],
+  ["F3B6",0x9A25],
+  ["F3B7",0x9A1D],
+  ["F3B8",0x9A24],
+  ["F3B9",0x9A1B],
+  ["F3BA",0x9A22],
+  ["F3BB",0x9A20],
+  ["F3BC",0x9A27],
+  ["F3BD",0x9A23],
+  ["F3BE",0x9A1E],
+  ["F3BF",0x9A1C],
+  ["F3C0",0x9A14],
+  ["F3C1",0x9AC2],
+  ["F3C2",0x9B0B],
+  ["F3C3",0x9B0A],
+  ["F3C4",0x9B0E],
+  ["F3C5",0x9B0C],
+  ["F3C6",0x9B37],
+  ["F3C7",0x9BEA],
+  ["F3C8",0x9BEB],
+  ["F3C9",0x9BE0],
+  ["F3CA",0x9BDE],
+  ["F3CB",0x9BE4],
+  ["F3CC",0x9BE6],
+  ["F3CD",0x9BE2],
+  ["F3CE",0x9BF0],
+  ["F3CF",0x9BD4],
+  ["F3D0",0x9BD7],
+  ["F3D1",0x9BEC],
+  ["F3D2",0x9BDC],
+  ["F3D3",0x9BD9],
+  ["F3D4",0x9BE5],
+  ["F3D5",0x9BD5],
+  ["F3D6",0x9BE1],
+  ["F3D7",0x9BDA],
+  ["F3D8",0x9D77],
+  ["F3D9",0x9D81],
+  ["F3DA",0x9D8A],
+  ["F3DB",0x9D84],
+  ["F3DC",0x9D88],
+  ["F3DD",0x9D71],
+  ["F3DE",0x9D80],
+  ["F3DF",0x9D78],
+  ["F3E0",0x9D86],
+  ["F3E1",0x9D8B],
+  ["F3E2",0x9D8C],
+  ["F3E3",0x9D7D],
+  ["F3E4",0x9D6B],
+  ["F3E5",0x9D74],
+  ["F3E6",0x9D75],
+  ["F3E7",0x9D70],
+  ["F3E8",0x9D69],
+  ["F3E9",0x9D85],
+  ["F3EA",0x9D73],
+  ["F3EB",0x9D7B],
+  ["F3EC",0x9D82],
+  ["F3ED",0x9D6F],
+  ["F3EE",0x9D79],
+  ["F3EF",0x9D7F],
+  ["F3F0",0x9D87],
+  ["F3F1",0x9D68],
+  ["F3F2",0x9E94],
+  ["F3F3",0x9E91],
+  ["F3F4",0x9EC0],
+  ["F3F5",0x9EFC],
+  ["F3F6",0x9F2D],
+  ["F3F7",0x9F40],
+  ["F3F8",0x9F41],
+  ["F3F9",0x9F4D],
+  ["F3FA",0x9F56],
+  ["F3FB",0x9F57],
+  ["F3FC",0x9F58],
+  ["F3FD",0x5337],
+  ["F3FE",0x56B2],
+  ["F440",0x56B5],
+  ["F441",0x56B3],
+  ["F442",0x58E3],
+  ["F443",0x5B45],
+  ["F444",0x5DC6],
+  ["F445",0x5DC7],
+  ["F446",0x5EEE],
+  ["F447",0x5EEF],
+  ["F448",0x5FC0],
+  ["F449",0x5FC1],
+  ["F44A",0x61F9],
+  ["F44B",0x6517],
+  ["F44C",0x6516],
+  ["F44D",0x6515],
+  ["F44E",0x6513],
+  ["F44F",0x65DF],
+  ["F450",0x66E8],
+  ["F451",0x66E3],
+  ["F452",0x66E4],
+  ["F453",0x6AF3],
+  ["F454",0x6AF0],
+  ["F455",0x6AEA],
+  ["F456",0x6AE8],
+  ["F457",0x6AF9],
+  ["F458",0x6AF1],
+  ["F459",0x6AEE],
+  ["F45A",0x6AEF],
+  ["F45B",0x703C],
+  ["F45C",0x7035],
+  ["F45D",0x702F],
+  ["F45E",0x7037],
+  ["F45F",0x7034],
+  ["F460",0x7031],
+  ["F461",0x7042],
+  ["F462",0x7038],
+  ["F463",0x703F],
+  ["F464",0x703A],
+  ["F465",0x7039],
+  ["F466",0x7040],
+  ["F467",0x703B],
+  ["F468",0x7033],
+  ["F469",0x7041],
+  ["F46A",0x7213],
+  ["F46B",0x7214],
+  ["F46C",0x72A8],
+  ["F46D",0x737D],
+  ["F46E",0x737C],
+  ["F46F",0x74BA],
+  ["F470",0x76AB],
+  ["F471",0x76AA],
+  ["F472",0x76BE],
+  ["F473",0x76ED],
+  ["F474",0x77CC],
+  ["F475",0x77CE],
+  ["F476",0x77CF],
+  ["F477",0x77CD],
+  ["F478",0x77F2],
+  ["F479",0x7925],
+  ["F47A",0x7923],
+  ["F47B",0x7927],
+  ["F47C",0x7928],
+  ["F47D",0x7924],
+  ["F47E",0x7929],
+  ["F4A1",0x79B2],
+  ["F4A2",0x7A6E],
+  ["F4A3",0x7A6C],
+  ["F4A4",0x7A6D],
+  ["F4A5",0x7AF7],
+  ["F4A6",0x7C49],
+  ["F4A7",0x7C48],
+  ["F4A8",0x7C4A],
+  ["F4A9",0x7C47],
+  ["F4AA",0x7C45],
+  ["F4AB",0x7CEE],
+  ["F4AC",0x7E7B],
+  ["F4AD",0x7E7E],
+  ["F4AE",0x7E81],
+  ["F4AF",0x7E80],
+  ["F4B0",0x7FBA],
+  ["F4B1",0x7FFF],
+  ["F4B2",0x8079],
+  ["F4B3",0x81DB],
+  ["F4B4",0x81D9],
+  ["F4B5",0x820B],
+  ["F4B6",0x8268],
+  ["F4B7",0x8269],
+  ["F4B8",0x8622],
+  ["F4B9",0x85FF],
+  ["F4BA",0x8601],
+  ["F4BB",0x85FE],
+  ["F4BC",0x861B],
+  ["F4BD",0x8600],
+  ["F4BE",0x85F6],
+  ["F4BF",0x8604],
+  ["F4C0",0x8609],
+  ["F4C1",0x8605],
+  ["F4C2",0x860C],
+  ["F4C3",0x85FD],
+  ["F4C4",0x8819],
+  ["F4C5",0x8810],
+  ["F4C6",0x8811],
+  ["F4C7",0x8817],
+  ["F4C8",0x8813],
+  ["F4C9",0x8816],
+  ["F4CA",0x8963],
+  ["F4CB",0x8966],
+  ["F4CC",0x89B9],
+  ["F4CD",0x89F7],
+  ["F4CE",0x8B60],
+  ["F4CF",0x8B6A],
+  ["F4D0",0x8B5D],
+  ["F4D1",0x8B68],
+  ["F4D2",0x8B63],
+  ["F4D3",0x8B65],
+  ["F4D4",0x8B67],
+  ["F4D5",0x8B6D],
+  ["F4D6",0x8DAE],
+  ["F4D7",0x8E86],
+  ["F4D8",0x8E88],
+  ["F4D9",0x8E84],
+  ["F4DA",0x8F59],
+  ["F4DB",0x8F56],
+  ["F4DC",0x8F57],
+  ["F4DD",0x8F55],
+  ["F4DE",0x8F58],
+  ["F4DF",0x8F5A],
+  ["F4E0",0x908D],
+  ["F4E1",0x9143],
+  ["F4E2",0x9141],
+  ["F4E3",0x91B7],
+  ["F4E4",0x91B5],
+  ["F4E5",0x91B2],
+  ["F4E6",0x91B3],
+  ["F4E7",0x940B],
+  ["F4E8",0x9413],
+  ["F4E9",0x93FB],
+  ["F4EA",0x9420],
+  ["F4EB",0x940F],
+  ["F4EC",0x9414],
+  ["F4ED",0x93FE],
+  ["F4EE",0x9415],
+  ["F4EF",0x9410],
+  ["F4F0",0x9428],
+  ["F4F1",0x9419],
+  ["F4F2",0x940D],
+  ["F4F3",0x93F5],
+  ["F4F4",0x9400],
+  ["F4F5",0x93F7],
+  ["F4F6",0x9407],
+  ["F4F7",0x940E],
+  ["F4F8",0x9416],
+  ["F4F9",0x9412],
+  ["F4FA",0x93FA],
+  ["F4FB",0x9409],
+  ["F4FC",0x93F8],
+  ["F4FD",0x940A],
+  ["F4FE",0x93FF],
+  ["F540",0x93FC],
+  ["F541",0x940C],
+  ["F542",0x93F6],
+  ["F543",0x9411],
+  ["F544",0x9406],
+  ["F545",0x95DE],
+  ["F546",0x95E0],
+  ["F547",0x95DF],
+  ["F548",0x972E],
+  ["F549",0x972F],
+  ["F54A",0x97B9],
+  ["F54B",0x97BB],
+  ["F54C",0x97FD],
+  ["F54D",0x97FE],
+  ["F54E",0x9860],
+  ["F54F",0x9862],
+  ["F550",0x9863],
+  ["F551",0x985F],
+  ["F552",0x98C1],
+  ["F553",0x98C2],
+  ["F554",0x9950],
+  ["F555",0x994E],
+  ["F556",0x9959],
+  ["F557",0x994C],
+  ["F558",0x994B],
+  ["F559",0x9953],
+  ["F55A",0x9A32],
+  ["F55B",0x9A34],
+  ["F55C",0x9A31],
+  ["F55D",0x9A2C],
+  ["F55E",0x9A2A],
+  ["F55F",0x9A36],
+  ["F560",0x9A29],
+  ["F561",0x9A2E],
+  ["F562",0x9A38],
+  ["F563",0x9A2D],
+  ["F564",0x9AC7],
+  ["F565",0x9ACA],
+  ["F566",0x9AC6],
+  ["F567",0x9B10],
+  ["F568",0x9B12],
+  ["F569",0x9B11],
+  ["F56A",0x9C0B],
+  ["F56B",0x9C08],
+  ["F56C",0x9BF7],
+  ["F56D",0x9C05],
+  ["F56E",0x9C12],
+  ["F56F",0x9BF8],
+  ["F570",0x9C40],
+  ["F571",0x9C07],
+  ["F572",0x9C0E],
+  ["F573",0x9C06],
+  ["F574",0x9C17],
+  ["F575",0x9C14],
+  ["F576",0x9C09],
+  ["F577",0x9D9F],
+  ["F578",0x9D99],
+  ["F579",0x9DA4],
+  ["F57A",0x9D9D],
+  ["F57B",0x9D92],
+  ["F57C",0x9D98],
+  ["F57D",0x9D90],
+  ["F57E",0x9D9B],
+  ["F5A1",0x9DA0],
+  ["F5A2",0x9D94],
+  ["F5A3",0x9D9C],
+  ["F5A4",0x9DAA],
+  ["F5A5",0x9D97],
+  ["F5A6",0x9DA1],
+  ["F5A7",0x9D9A],
+  ["F5A8",0x9DA2],
+  ["F5A9",0x9DA8],
+  ["F5AA",0x9D9E],
+  ["F5AB",0x9DA3],
+  ["F5AC",0x9DBF],
+  ["F5AD",0x9DA9],
+  ["F5AE",0x9D96],
+  ["F5AF",0x9DA6],
+  ["F5B0",0x9DA7],
+  ["F5B1",0x9E99],
+  ["F5B2",0x9E9B],
+  ["F5B3",0x9E9A],
+  ["F5B4",0x9EE5],
+  ["F5B5",0x9EE4],
+  ["F5B6",0x9EE7],
+  ["F5B7",0x9EE6],
+  ["F5B8",0x9F30],
+  ["F5B9",0x9F2E],
+  ["F5BA",0x9F5B],
+  ["F5BB",0x9F60],
+  ["F5BC",0x9F5E],
+  ["F5BD",0x9F5D],
+  ["F5BE",0x9F59],
+  ["F5BF",0x9F91],
+  ["F5C0",0x513A],
+  ["F5C1",0x5139],
+  ["F5C2",0x5298],
+  ["F5C3",0x5297],
+  ["F5C4",0x56C3],
+  ["F5C5",0x56BD],
+  ["F5C6",0x56BE],
+  ["F5C7",0x5B48],
+  ["F5C8",0x5B47],
+  ["F5C9",0x5DCB],
+  ["F5CA",0x5DCF],
+  ["F5CB",0x5EF1],
+  ["F5CC",0x61FD],
+  ["F5CD",0x651B],
+  ["F5CE",0x6B02],
+  ["F5CF",0x6AFC],
+  ["F5D0",0x6B03],
+  ["F5D1",0x6AF8],
+  ["F5D2",0x6B00],
+  ["F5D3",0x7043],
+  ["F5D4",0x7044],
+  ["F5D5",0x704A],
+  ["F5D6",0x7048],
+  ["F5D7",0x7049],
+  ["F5D8",0x7045],
+  ["F5D9",0x7046],
+  ["F5DA",0x721D],
+  ["F5DB",0x721A],
+  ["F5DC",0x7219],
+  ["F5DD",0x737E],
+  ["F5DE",0x7517],
+  ["F5DF",0x766A],
+  ["F5E0",0x77D0],
+  ["F5E1",0x792D],
+  ["F5E2",0x7931],
+  ["F5E3",0x792F],
+  ["F5E4",0x7C54],
+  ["F5E5",0x7C53],
+  ["F5E6",0x7CF2],
+  ["F5E7",0x7E8A],
+  ["F5E8",0x7E87],
+  ["F5E9",0x7E88],
+  ["F5EA",0x7E8B],
+  ["F5EB",0x7E86],
+  ["F5EC",0x7E8D],
+  ["F5ED",0x7F4D],
+  ["F5EE",0x7FBB],
+  ["F5EF",0x8030],
+  ["F5F0",0x81DD],
+  ["F5F1",0x8618],
+  ["F5F2",0x862A],
+  ["F5F3",0x8626],
+  ["F5F4",0x861F],
+  ["F5F5",0x8623],
+  ["F5F6",0x861C],
+  ["F5F7",0x8619],
+  ["F5F8",0x8627],
+  ["F5F9",0x862E],
+  ["F5FA",0x8621],
+  ["F5FB",0x8620],
+  ["F5FC",0x8629],
+  ["F5FD",0x861E],
+  ["F5FE",0x8625],
+  ["F640",0x8829],
+  ["F641",0x881D],
+  ["F642",0x881B],
+  ["F643",0x8820],
+  ["F644",0x8824],
+  ["F645",0x881C],
+  ["F646",0x882B],
+  ["F647",0x884A],
+  ["F648",0x896D],
+  ["F649",0x8969],
+  ["F64A",0x896E],
+  ["F64B",0x896B],
+  ["F64C",0x89FA],
+  ["F64D",0x8B79],
+  ["F64E",0x8B78],
+  ["F64F",0x8B45],
+  ["F650",0x8B7A],
+  ["F651",0x8B7B],
+  ["F652",0x8D10],
+  ["F653",0x8D14],
+  ["F654",0x8DAF],
+  ["F655",0x8E8E],
+  ["F656",0x8E8C],
+  ["F657",0x8F5E],
+  ["F658",0x8F5B],
+  ["F659",0x8F5D],
+  ["F65A",0x9146],
+  ["F65B",0x9144],
+  ["F65C",0x9145],
+  ["F65D",0x91B9],
+  ["F65E",0x943F],
+  ["F65F",0x943B],
+  ["F660",0x9436],
+  ["F661",0x9429],
+  ["F662",0x943D],
+  ["F663",0x943C],
+  ["F664",0x9430],
+  ["F665",0x9439],
+  ["F666",0x942A],
+  ["F667",0x9437],
+  ["F668",0x942C],
+  ["F669",0x9440],
+  ["F66A",0x9431],
+  ["F66B",0x95E5],
+  ["F66C",0x95E4],
+  ["F66D",0x95E3],
+  ["F66E",0x9735],
+  ["F66F",0x973A],
+  ["F670",0x97BF],
+  ["F671",0x97E1],
+  ["F672",0x9864],
+  ["F673",0x98C9],
+  ["F674",0x98C6],
+  ["F675",0x98C0],
+  ["F676",0x9958],
+  ["F677",0x9956],
+  ["F678",0x9A39],
+  ["F679",0x9A3D],
+  ["F67A",0x9A46],
+  ["F67B",0x9A44],
+  ["F67C",0x9A42],
+  ["F67D",0x9A41],
+  ["F67E",0x9A3A],
+  ["F6A1",0x9A3F],
+  ["F6A2",0x9ACD],
+  ["F6A3",0x9B15],
+  ["F6A4",0x9B17],
+  ["F6A5",0x9B18],
+  ["F6A6",0x9B16],
+  ["F6A7",0x9B3A],
+  ["F6A8",0x9B52],
+  ["F6A9",0x9C2B],
+  ["F6AA",0x9C1D],
+  ["F6AB",0x9C1C],
+  ["F6AC",0x9C2C],
+  ["F6AD",0x9C23],
+  ["F6AE",0x9C28],
+  ["F6AF",0x9C29],
+  ["F6B0",0x9C24],
+  ["F6B1",0x9C21],
+  ["F6B2",0x9DB7],
+  ["F6B3",0x9DB6],
+  ["F6B4",0x9DBC],
+  ["F6B5",0x9DC1],
+  ["F6B6",0x9DC7],
+  ["F6B7",0x9DCA],
+  ["F6B8",0x9DCF],
+  ["F6B9",0x9DBE],
+  ["F6BA",0x9DC5],
+  ["F6BB",0x9DC3],
+  ["F6BC",0x9DBB],
+  ["F6BD",0x9DB5],
+  ["F6BE",0x9DCE],
+  ["F6BF",0x9DB9],
+  ["F6C0",0x9DBA],
+  ["F6C1",0x9DAC],
+  ["F6C2",0x9DC8],
+  ["F6C3",0x9DB1],
+  ["F6C4",0x9DAD],
+  ["F6C5",0x9DCC],
+  ["F6C6",0x9DB3],
+  ["F6C7",0x9DCD],
+  ["F6C8",0x9DB2],
+  ["F6C9",0x9E7A],
+  ["F6CA",0x9E9C],
+  ["F6CB",0x9EEB],
+  ["F6CC",0x9EEE],
+  ["F6CD",0x9EED],
+  ["F6CE",0x9F1B],
+  ["F6CF",0x9F18],
+  ["F6D0",0x9F1A],
+  ["F6D1",0x9F31],
+  ["F6D2",0x9F4E],
+  ["F6D3",0x9F65],
+  ["F6D4",0x9F64],
+  ["F6D5",0x9F92],
+  ["F6D6",0x4EB9],
+  ["F6D7",0x56C6],
+  ["F6D8",0x56C5],
+  ["F6D9",0x56CB],
+  ["F6DA",0x5971],
+  ["F6DB",0x5B4B],
+  ["F6DC",0x5B4C],
+  ["F6DD",0x5DD5],
+  ["F6DE",0x5DD1],
+  ["F6DF",0x5EF2],
+  ["F6E0",0x6521],
+  ["F6E1",0x6520],
+  ["F6E2",0x6526],
+  ["F6E3",0x6522],
+  ["F6E4",0x6B0B],
+  ["F6E5",0x6B08],
+  ["F6E6",0x6B09],
+  ["F6E7",0x6C0D],
+  ["F6E8",0x7055],
+  ["F6E9",0x7056],
+  ["F6EA",0x7057],
+  ["F6EB",0x7052],
+  ["F6EC",0x721E],
+  ["F6ED",0x721F],
+  ["F6EE",0x72A9],
+  ["F6EF",0x737F],
+  ["F6F0",0x74D8],
+  ["F6F1",0x74D5],
+  ["F6F2",0x74D9],
+  ["F6F3",0x74D7],
+  ["F6F4",0x766D],
+  ["F6F5",0x76AD],
+  ["F6F6",0x7935],
+  ["F6F7",0x79B4],
+  ["F6F8",0x7A70],
+  ["F6F9",0x7A71],
+  ["F6FA",0x7C57],
+  ["F6FB",0x7C5C],
+  ["F6FC",0x7C59],
+  ["F6FD",0x7C5B],
+  ["F6FE",0x7C5A],
+  ["F740",0x7CF4],
+  ["F741",0x7CF1],
+  ["F742",0x7E91],
+  ["F743",0x7F4F],
+  ["F744",0x7F87],
+  ["F745",0x81DE],
+  ["F746",0x826B],
+  ["F747",0x8634],
+  ["F748",0x8635],
+  ["F749",0x8633],
+  ["F74A",0x862C],
+  ["F74B",0x8632],
+  ["F74C",0x8636],
+  ["F74D",0x882C],
+  ["F74E",0x8828],
+  ["F74F",0x8826],
+  ["F750",0x882A],
+  ["F751",0x8825],
+  ["F752",0x8971],
+  ["F753",0x89BF],
+  ["F754",0x89BE],
+  ["F755",0x89FB],
+  ["F756",0x8B7E],
+  ["F757",0x8B84],
+  ["F758",0x8B82],
+  ["F759",0x8B86],
+  ["F75A",0x8B85],
+  ["F75B",0x8B7F],
+  ["F75C",0x8D15],
+  ["F75D",0x8E95],
+  ["F75E",0x8E94],
+  ["F75F",0x8E9A],
+  ["F760",0x8E92],
+  ["F761",0x8E90],
+  ["F762",0x8E96],
+  ["F763",0x8E97],
+  ["F764",0x8F60],
+  ["F765",0x8F62],
+  ["F766",0x9147],
+  ["F767",0x944C],
+  ["F768",0x9450],
+  ["F769",0x944A],
+  ["F76A",0x944B],
+  ["F76B",0x944F],
+  ["F76C",0x9447],
+  ["F76D",0x9445],
+  ["F76E",0x9448],
+  ["F76F",0x9449],
+  ["F770",0x9446],
+  ["F771",0x973F],
+  ["F772",0x97E3],
+  ["F773",0x986A],
+  ["F774",0x9869],
+  ["F775",0x98CB],
+  ["F776",0x9954],
+  ["F777",0x995B],
+  ["F778",0x9A4E],
+  ["F779",0x9A53],
+  ["F77A",0x9A54],
+  ["F77B",0x9A4C],
+  ["F77C",0x9A4F],
+  ["F77D",0x9A48],
+  ["F77E",0x9A4A],
+  ["F7A1",0x9A49],
+  ["F7A2",0x9A52],
+  ["F7A3",0x9A50],
+  ["F7A4",0x9AD0],
+  ["F7A5",0x9B19],
+  ["F7A6",0x9B2B],
+  ["F7A7",0x9B3B],
+  ["F7A8",0x9B56],
+  ["F7A9",0x9B55],
+  ["F7AA",0x9C46],
+  ["F7AB",0x9C48],
+  ["F7AC",0x9C3F],
+  ["F7AD",0x9C44],
+  ["F7AE",0x9C39],
+  ["F7AF",0x9C33],
+  ["F7B0",0x9C41],
+  ["F7B1",0x9C3C],
+  ["F7B2",0x9C37],
+  ["F7B3",0x9C34],
+  ["F7B4",0x9C32],
+  ["F7B5",0x9C3D],
+  ["F7B6",0x9C36],
+  ["F7B7",0x9DDB],
+  ["F7B8",0x9DD2],
+  ["F7B9",0x9DDE],
+  ["F7BA",0x9DDA],
+  ["F7BB",0x9DCB],
+  ["F7BC",0x9DD0],
+  ["F7BD",0x9DDC],
+  ["F7BE",0x9DD1],
+  ["F7BF",0x9DDF],
+  ["F7C0",0x9DE9],
+  ["F7C1",0x9DD9],
+  ["F7C2",0x9DD8],
+  ["F7C3",0x9DD6],
+  ["F7C4",0x9DF5],
+  ["F7C5",0x9DD5],
+  ["F7C6",0x9DDD],
+  ["F7C7",0x9EB6],
+  ["F7C8",0x9EF0],
+  ["F7C9",0x9F35],
+  ["F7CA",0x9F33],
+  ["F7CB",0x9F32],
+  ["F7CC",0x9F42],
+  ["F7CD",0x9F6B],
+  ["F7CE",0x9F95],
+  ["F7CF",0x9FA2],
+  ["F7D0",0x513D],
+  ["F7D1",0x5299],
+  ["F7D2",0x58E8],
+  ["F7D3",0x58E7],
+  ["F7D4",0x5972],
+  ["F7D5",0x5B4D],
+  ["F7D6",0x5DD8],
+  ["F7D7",0x882F],
+  ["F7D8",0x5F4F],
+  ["F7D9",0x6201],
+  ["F7DA",0x6203],
+  ["F7DB",0x6204],
+  ["F7DC",0x6529],
+  ["F7DD",0x6525],
+  ["F7DE",0x6596],
+  ["F7DF",0x66EB],
+  ["F7E0",0x6B11],
+  ["F7E1",0x6B12],
+  ["F7E2",0x6B0F],
+  ["F7E3",0x6BCA],
+  ["F7E4",0x705B],
+  ["F7E5",0x705A],
+  ["F7E6",0x7222],
+  ["F7E7",0x7382],
+  ["F7E8",0x7381],
+  ["F7E9",0x7383],
+  ["F7EA",0x7670],
+  ["F7EB",0x77D4],
+  ["F7EC",0x7C67],
+  ["F7ED",0x7C66],
+  ["F7EE",0x7E95],
+  ["F7EF",0x826C],
+  ["F7F0",0x863A],
+  ["F7F1",0x8640],
+  ["F7F2",0x8639],
+  ["F7F3",0x863C],
+  ["F7F4",0x8631],
+  ["F7F5",0x863B],
+  ["F7F6",0x863E],
+  ["F7F7",0x8830],
+  ["F7F8",0x8832],
+  ["F7F9",0x882E],
+  ["F7FA",0x8833],
+  ["F7FB",0x8976],
+  ["F7FC",0x8974],
+  ["F7FD",0x8973],
+  ["F7FE",0x89FE],
+  ["F840",0x8B8C],
+  ["F841",0x8B8E],
+  ["F842",0x8B8B],
+  ["F843",0x8B88],
+  ["F844",0x8C45],
+  ["F845",0x8D19],
+  ["F846",0x8E98],
+  ["F847",0x8F64],
+  ["F848",0x8F63],
+  ["F849",0x91BC],
+  ["F84A",0x9462],
+  ["F84B",0x9455],
+  ["F84C",0x945D],
+  ["F84D",0x9457],
+  ["F84E",0x945E],
+  ["F84F",0x97C4],
+  ["F850",0x97C5],
+  ["F851",0x9800],
+  ["F852",0x9A56],
+  ["F853",0x9A59],
+  ["F854",0x9B1E],
+  ["F855",0x9B1F],
+  ["F856",0x9B20],
+  ["F857",0x9C52],
+  ["F858",0x9C58],
+  ["F859",0x9C50],
+  ["F85A",0x9C4A],
+  ["F85B",0x9C4D],
+  ["F85C",0x9C4B],
+  ["F85D",0x9C55],
+  ["F85E",0x9C59],
+  ["F85F",0x9C4C],
+  ["F860",0x9C4E],
+  ["F861",0x9DFB],
+  ["F862",0x9DF7],
+  ["F863",0x9DEF],
+  ["F864",0x9DE3],
+  ["F865",0x9DEB],
+  ["F866",0x9DF8],
+  ["F867",0x9DE4],
+  ["F868",0x9DF6],
+  ["F869",0x9DE1],
+  ["F86A",0x9DEE],
+  ["F86B",0x9DE6],
+  ["F86C",0x9DF2],
+  ["F86D",0x9DF0],
+  ["F86E",0x9DE2],
+  ["F86F",0x9DEC],
+  ["F870",0x9DF4],
+  ["F871",0x9DF3],
+  ["F872",0x9DE8],
+  ["F873",0x9DED],
+  ["F874",0x9EC2],
+  ["F875",0x9ED0],
+  ["F876",0x9EF2],
+  ["F877",0x9EF3],
+  ["F878",0x9F06],
+  ["F879",0x9F1C],
+  ["F87A",0x9F38],
+  ["F87B",0x9F37],
+  ["F87C",0x9F36],
+  ["F87D",0x9F43],
+  ["F87E",0x9F4F],
+  ["F8A1",0x9F71],
+  ["F8A2",0x9F70],
+  ["F8A3",0x9F6E],
+  ["F8A4",0x9F6F],
+  ["F8A5",0x56D3],
+  ["F8A6",0x56CD],
+  ["F8A7",0x5B4E],
+  ["F8A8",0x5C6D],
+  ["F8A9",0x652D],
+  ["F8AA",0x66ED],
+  ["F8AB",0x66EE],
+  ["F8AC",0x6B13],
+  ["F8AD",0x705F],
+  ["F8AE",0x7061],
+  ["F8AF",0x705D],
+  ["F8B0",0x7060],
+  ["F8B1",0x7223],
+  ["F8B2",0x74DB],
+  ["F8B3",0x74E5],
+  ["F8B4",0x77D5],
+  ["F8B5",0x7938],
+  ["F8B6",0x79B7],
+  ["F8B7",0x79B6],
+  ["F8B8",0x7C6A],
+  ["F8B9",0x7E97],
+  ["F8BA",0x7F89],
+  ["F8BB",0x826D],
+  ["F8BC",0x8643],
+  ["F8BD",0x8838],
+  ["F8BE",0x8837],
+  ["F8BF",0x8835],
+  ["F8C0",0x884B],
+  ["F8C1",0x8B94],
+  ["F8C2",0x8B95],
+  ["F8C3",0x8E9E],
+  ["F8C4",0x8E9F],
+  ["F8C5",0x8EA0],
+  ["F8C6",0x8E9D],
+  ["F8C7",0x91BE],
+  ["F8C8",0x91BD],
+  ["F8C9",0x91C2],
+  ["F8CA",0x946B],
+  ["F8CB",0x9468],
+  ["F8CC",0x9469],
+  ["F8CD",0x96E5],
+  ["F8CE",0x9746],
+  ["F8CF",0x9743],
+  ["F8D0",0x9747],
+  ["F8D1",0x97C7],
+  ["F8D2",0x97E5],
+  ["F8D3",0x9A5E],
+  ["F8D4",0x9AD5],
+  ["F8D5",0x9B59],
+  ["F8D6",0x9C63],
+  ["F8D7",0x9C67],
+  ["F8D8",0x9C66],
+  ["F8D9",0x9C62],
+  ["F8DA",0x9C5E],
+  ["F8DB",0x9C60],
+  ["F8DC",0x9E02],
+  ["F8DD",0x9DFE],
+  ["F8DE",0x9E07],
+  ["F8DF",0x9E03],
+  ["F8E0",0x9E06],
+  ["F8E1",0x9E05],
+  ["F8E2",0x9E00],
+  ["F8E3",0x9E01],
+  ["F8E4",0x9E09],
+  ["F8E5",0x9DFF],
+  ["F8E6",0x9DFD],
+  ["F8E7",0x9E04],
+  ["F8E8",0x9EA0],
+  ["F8E9",0x9F1E],
+  ["F8EA",0x9F46],
+  ["F8EB",0x9F74],
+  ["F8EC",0x9F75],
+  ["F8ED",0x9F76],
+  ["F8EE",0x56D4],
+  ["F8EF",0x652E],
+  ["F8F0",0x65B8],
+  ["F8F1",0x6B18],
+  ["F8F2",0x6B19],
+  ["F8F3",0x6B17],
+  ["F8F4",0x6B1A],
+  ["F8F5",0x7062],
+  ["F8F6",0x7226],
+  ["F8F7",0x72AA],
+  ["F8F8",0x77D8],
+  ["F8F9",0x77D9],
+  ["F8FA",0x7939],
+  ["F8FB",0x7C69],
+  ["F8FC",0x7C6B],
+  ["F8FD",0x7CF6],
+  ["F8FE",0x7E9A],
+  ["F940",0x7E98],
+  ["F941",0x7E9B],
+  ["F942",0x7E99],
+  ["F943",0x81E0],
+  ["F944",0x81E1],
+  ["F945",0x8646],
+  ["F946",0x8647],
+  ["F947",0x8648],
+  ["F948",0x8979],
+  ["F949",0x897A],
+  ["F94A",0x897C],
+  ["F94B",0x897B],
+  ["F94C",0x89FF],
+  ["F94D",0x8B98],
+  ["F94E",0x8B99],
+  ["F94F",0x8EA5],
+  ["F950",0x8EA4],
+  ["F951",0x8EA3],
+  ["F952",0x946E],
+  ["F953",0x946D],
+  ["F954",0x946F],
+  ["F955",0x9471],
+  ["F956",0x9473],
+  ["F957",0x9749],
+  ["F958",0x9872],
+  ["F959",0x995F],
+  ["F95A",0x9C68],
+  ["F95B",0x9C6E],
+  ["F95C",0x9C6D],
+  ["F95D",0x9E0B],
+  ["F95E",0x9E0D],
+  ["F95F",0x9E10],
+  ["F960",0x9E0F],
+  ["F961",0x9E12],
+  ["F962",0x9E11],
+  ["F963",0x9EA1],
+  ["F964",0x9EF5],
+  ["F965",0x9F09],
+  ["F966",0x9F47],
+  ["F967",0x9F78],
+  ["F968",0x9F7B],
+  ["F969",0x9F7A],
+  ["F96A",0x9F79],
+  ["F96B",0x571E],
+  ["F96C",0x7066],
+  ["F96D",0x7C6F],
+  ["F96E",0x883C],
+  ["F96F",0x8DB2],
+  ["F970",0x8EA6],
+  ["F971",0x91C3],
+  ["F972",0x9474],
+  ["F973",0x9478],
+  ["F974",0x9476],
+  ["F975",0x9475],
+  ["F976",0x9A60],
+  ["F977",0x9C74],
+  ["F978",0x9C73],
+  ["F979",0x9C71],
+  ["F97A",0x9C75],
+  ["F97B",0x9E14],
+  ["F97C",0x9E13],
+  ["F97D",0x9EF6],
+  ["F97E",0x9F0A],
+  ["F9A1",0x9FA4],
+  ["F9A2",0x7068],
+  ["F9A3",0x7065],
+  ["F9A4",0x7CF7],
+  ["F9A5",0x866A],
+  ["F9A6",0x883E],
+  ["F9A7",0x883D],
+  ["F9A8",0x883F],
+  ["F9A9",0x8B9E],
+  ["F9AA",0x8C9C],
+  ["F9AB",0x8EA9],
+  ["F9AC",0x8EC9],
+  ["F9AD",0x974B],
+  ["F9AE",0x9873],
+  ["F9AF",0x9874],
+  ["F9B0",0x98CC],
+  ["F9B1",0x9961],
+  ["F9B2",0x99AB],
+  ["F9B3",0x9A64],
+  ["F9B4",0x9A66],
+  ["F9B5",0x9A67],
+  ["F9B6",0x9B24],
+  ["F9B7",0x9E15],
+  ["F9B8",0x9E17],
+  ["F9B9",0x9F48],
+  ["F9BA",0x6207],
+  ["F9BB",0x6B1E],
+  ["F9BC",0x7227],
+  ["F9BD",0x864C],
+  ["F9BE",0x8EA8],
+  ["F9BF",0x9482],
+  ["F9C0",0x9480],
+  ["F9C1",0x9481],
+  ["F9C2",0x9A69],
+  ["F9C3",0x9A68],
+  ["F9C4",0x9B2E],
+  ["F9C5",0x9E19],
+  ["F9C6",0x7229],
+  ["F9C7",0x864B],
+  ["F9C8",0x8B9F],
+  ["F9C9",0x9483],
+  ["F9CA",0x9C79],
+  ["F9CB",0x9EB7],
+  ["F9CC",0x7675],
+  ["F9CD",0x9A6B],
+  ["F9CE",0x9C7A],
+  ["F9CF",0x9E1D],
+  ["F9D0",0x7069],
+  ["F9D1",0x706A],
+  ["F9D2",0x9EA4],
+  ["F9D3",0x9F7E],
+  ["F9D4",0x9F49],
+  ["F9D5",0x9F98],
+  ["F9D6",0x7881],
+  ["F9D7",0x92B9],
+  ["F9D8",0x88CF],
+  ["F9D9",0x58BB],
+  ["F9DA",0x6052],
+  ["F9DB",0x7CA7],
+  ["F9DC",0x5AFA],
+  ["F9DD",0x2554],
+  ["F9DE",0x2566],
+  ["F9DF",0x2557],
+  ["F9E0",0x2560],
+  ["F9E1",0x256C],
+  ["F9E2",0x2563],
+  ["F9E3",0x255A],
+  ["F9E4",0x2569],
+  ["F9E5",0x255D],
+  ["F9E6",0x2552],
+  ["F9E7",0x2564],
+  ["F9E8",0x2555],
+  ["F9E9",0x255E],
+  ["F9EA",0x256A],
+  ["F9EB",0x2561],
+  ["F9EC",0x2558],
+  ["F9ED",0x2567],
+  ["F9EE",0x255B],
+  ["F9EF",0x2553],
+  ["F9F0",0x2565],
+  ["F9F1",0x2556],
+  ["F9F2",0x255F],
+  ["F9F3",0x256B],
+  ["F9F4",0x2562],
+  ["F9F5",0x2559],
+  ["F9F6",0x2568],
+  ["F9F7",0x255C],
+  ["F9F8",0x2551],
+  ["F9F9",0x2550],
+  ["F9FA",0x256D],
+  ["F9FB",0x256E],
+  ["F9FC",0x2570],
+  ["F9FD",0x256F],
+  ["F9FE",0x2593],
+  ["FA40",0xE000],
+  ["FA41",0xE001],
+  ["FA42",0xE002],
+  ["FA43",0xE003],
+  ["FA44",0xE004],
+  ["FA45",0xE005],
+  ["FA46",0xE006],
+  ["FA47",0xE007],
+  ["FA48",0xE008],
+  ["FA49",0xE009],
+  ["FA4A",0xE00A],
+  ["FA4B",0xE00B],
+  ["FA4C",0xE00C],
+  ["FA4D",0xE00D],
+  ["FA4E",0xE00E],
+  ["FA4F",0xE00F],
+  ["FA50",0xE010],
+  ["FA51",0xE011],
+  ["FA52",0xE012],
+  ["FA53",0xE013],
+  ["FA54",0xE014],
+  ["FA55",0xE015],
+  ["FA56",0xE016],
+  ["FA57",0xE017],
+  ["FA58",0xE018],
+  ["FA59",0xE019],
+  ["FA5A",0xE01A],
+  ["FA5B",0xE01B],
+  ["FA5C",0xE01C],
+  ["FA5D",0xE01D],
+  ["FA5E",0xE01E],
+  ["FA5F",0xE01F],
+  ["FA60",0xE020],
+  ["FA61",0xE021],
+  ["FA62",0xE022],
+  ["FA63",0xE023],
+  ["FA64",0x7232],
+  ["FA65",0x723C],
+  ["FA66",0x7266],
+  ["FA67",0x7282],
+  ["FA68",0x728F],
+  ["FA69",0x729F],
+  ["FA6A",0x72AD],
+  ["FA6B",0x72B1],
+  ["FA6C",0x72B8],
+  ["FA6D",0x72BE],
+  ["FA6E",0x72CD],
+  ["FA6F",0x72DB],
+  ["FA70",0x7324],
+  ["FA71",0x732F],
+  ["FA72",0x7338],
+  ["FA73",0x7339],
+  ["FA74",0x73BD],
+  ["FA75",0x73CE],
+  ["FA76",0x73F1],
+  ["FA77",0x7476],
+  ["FA78",0x74A2],
+  ["FA79",0x7501],
+  ["FA7A",0x7519],
+  ["FA7B",0x7523],
+  ["FA7C",0x753C],
+  ["FA7D",0x7544],
+  ["FA7E",0x7549],
+  ["FAA1",0x754D],
+  ["FAA2",0x756D],
+  ["FAA3",0x7582],
+  ["FAA4",0x7583],
+  ["FAA5",0x7589],
+  ["FAA6",0x75AC],
+  ["FAA7",0x75D6],
+  ["FAA8",0x75E9],
+  ["FAA9",0x7640],
+  ["FAAA",0x764D],
+  ["FAAB",0x7654],
+  ["FAAC",0x7668],
+  ["FAAD",0x7680],
+  ["FAAE",0x7683],
+  ["FAAF",0x7690],
+  ["FAB0",0x76B7],
+  ["FAB1",0x76B9],
+  ["FAB2",0x770D],
+  ["FAB3",0x771E],
+  ["FAB4",0x7743],
+  ["FAB5",0x7818],
+  ["FAB6",0x781C],
+  ["FAB7",0x7839],
+  ["FAB8",0x783C],
+  ["FAB9",0x7847],
+  ["FABA",0x7856],
+  ["FABB",0x787A],
+  ["FABC",0x78B5],
+  ["FABD",0x78B9],
+  ["FABE",0x78C6],
+  ["FABF",0x78D9],
+  ["FAC0",0x7907],
+  ["FAC1",0x7930],
+  ["FAC2",0x7934],
+  ["FAC3",0x793B],
+  ["FAC4",0x7980],
+  ["FAC5",0x799D],
+  ["FAC6",0x79C3],
+  ["FAC7",0x79E1],
+  ["FAC8",0x7A06],
+  ["FAC9",0x7A0E],
+  ["FACA",0x7A43],
+  ["FACB",0x7A50],
+  ["FACC",0x7AC3],
+  ["FACD",0x7AD2],
+  ["FACE",0x7AE2],
+  ["FACF",0x7AE7],
+  ["FAD0",0x7AF8],
+  ["FAD1",0x7B36],
+  ["FAD2",0x7B62],
+  ["FAD3",0x7B6C],
+  ["FAD4",0x7B7A],
+  ["FAD5",0x7B7B],
+  ["FAD6",0x7B9A],
+  ["FAD7",0x7B9E],
+  ["FAD8",0x7B9F],
+  ["FAD9",0x7BA2],
+  ["FADA",0x7BA7],
+  ["FADB",0x7BF6],
+  ["FADC",0x7C12],
+  ["FADD",0x7C14],
+  ["FADE",0x7C4F],
+  ["FADF",0x7C56],
+  ["FAE0",0x7C58],
+  ["FAE1",0x7CAB],
+  ["FAE2",0x7CFA],
+  ["FAE3",0x7D48],
+  ["FAE4",0x7D4B],
+  ["FAE5",0x7D77],
+  ["FAE6",0x7DD4],
+  ["FAE7",0x7DD5],
+  ["FAE8",0x7DD6],
+  ["FAE9",0x7DE4],
+  ["FAEA",0x7E4D],
+  ["FAEB",0x7E5D],
+  ["FAEC",0x7E7F],
+  ["FAED",0x7E89],
+  ["FAEE",0x7E8E],
+  ["FAEF",0x7E92],
+  ["FAF0",0x7ED4],
+  ["FAF1",0x7EF1],
+  ["FAF2",0x7F12],
+  ["FAF3",0x7F30],
+  ["FAF4",0x7F71],
+  ["FAF5",0x7F82],
+  ["FAF6",0x7FAE],
+  ["FAF7",0x7FC6],
+  ["FAF8",0x8020],
+  ["FAF9",0x8022],
+  ["FAFA",0x8025],
+  ["FAFB",0x8031],
+  ["FAFC",0x805F],
+  ["FAFD",0x8068],
+  ["FAFE",0x80AC],
+  ["FB40",0x80B7],
+  ["FB41",0x519A],
+  ["FB42",0x5416],
+  ["FB43",0x5414],
+  ["FB44",0x34DF],
+  ["FB45",0x4C7D],
+  ["FB46",0x62C3],
+  ["FB47",0xE0A4],
+  ["FB48",0xE0A5],
+  ["FB49",0xE0A6],
+  ["FB4A",0x54CB],
+  ["FB4B",0xE0A8],
+  ["FB4C",0x55BC],
+  ["FB4D",0x80B6],
+  ["FB4E",0x51A7],
+  ["FB4F",0xE0AC],
+  ["FB50",0xE0AD],
+  ["FB51",0xE0AE],
+  ["FB52",0x5513],
+  ["FB53",0x8226],
+  ["FB54",0xE0B1],
+  ["FB55",0x551E],
+  ["FB56",0x55DE],
+  ["FB57",0x63B9],
+  ["FB58",0x6898],
+  ["FB59",0xE0B6],
+  ["FB5A",0x5502],
+  ["FB5B",0x5569],
+  ["FB5C",0x75B4],
+  ["FB5D",0x63FC],
+  ["FB5E",0x9E84],
+  ["FB5F",0x922A],
+  ["FB60",0xE0BD],
+  ["FB61",0xE0BE],
+  ["FB62",0xE0BF],
+  ["FB63",0x88C7],
+  ["FB64",0x609E],
+  ["FB65",0x5625],
+  ["FB66",0x7145],
+  ["FB67",0x5AF2],
+  ["FB68",0xE0C5],
+  ["FB69",0x528F],
+  ["FB6A",0x564F],
+  ["FB6B",0x7793],
+  ["FB6C",0x8786],
+  ["FB6D",0x8E2D],
+  ["FB6E",0x81B6],
+  ["FB6F",0x35FE],
+  ["FB70",0x71F6],
+  ["FB71",0xE0CE],
+  ["FB72",0x8804],
+  ["FB73",0x9385],
+  ["FB74",0xE0D1],
+  ["FB75",0xE0D2],
+  ["FB76",0x7666],
+  ["FB77",0xE0D4],
+  ["FB78",0x9C72],
+  ["FB79",0xE0D6],
+  ["FB7A",0x62CE],
+  ["FB7B",0xE0D8],
+  ["FB7C",0x9E96],
+  ["FB7D",0x4989],
+  ["FB7E",0x7CD3],
+  ["FBA1",0x8EDA],
+  ["FBA2",0x9EAB],
+  ["FBA3",0x64E7],
+  ["FBA4",0xE0DF],
+  ["FBA5",0x82AA],
+  ["FBA6",0x6767],
+  ["FBA7",0x6D72],
+  ["FBA8",0x7906],
+  ["FBA9",0x79C4],
+  ["FBAA",0x7F4E],
+  ["FBAB",0x87EE],
+  ["FBAC",0xE0E7],
+  ["FBAD",0x83BE],
+  ["FBAE",0x862F],
+  ["FBAF",0x89A5],
+  ["FBB0",0x460F],
+  ["FBB1",0xE0EC],
+  ["FBB2",0x98C8],
+  ["FBB3",0x9940],
+  ["FBB4",0x994D],
+  ["FBB5",0x9A0C],
+  ["FBB6",0x9AD7],
+  ["FBB7",0x9E98],
+  ["FBB8",0x9F26],
+  ["FBB9",0xE0F4],
+  ["FBBA",0x4F03],
+  ["FBBB",0xE0F6],
+  ["FBBC",0x4F39],
+  ["FBBD",0x4F32],
+  ["FBBE",0x4FAB],
+  ["FBBF",0x5056],
+  ["FBC0",0xE0FB],
+  ["FBC1",0x502E],
+  ["FBC2",0x50A6],
+  ["FBC3",0x50D9],
+  ["FBC4",0x510E],
+  ["FBC5",0x50ED],
+  ["FBC6",0x5101],
+  ["FBC7",0x51F4],
+  ["FBC8",0x521F],
+  ["FBC9",0x5260],
+  ["FBCA",0x5257],
+  ["FBCB",0x529A],
+  ["FBCC",0x52D1],
+  ["FBCD",0x52E0],
+  ["FBCE",0x52E1],
+  ["FBCF",0x51D3],
+  ["FBD0",0x51DF],
+  ["FBD1",0x7546],
+  ["FBD2",0x51FE],
+  ["FBD3",0x5332],
+  ["FBD4",0x532C],
+  ["FBD5",0x5333],
+  ["FBD6",0x53AB],
+  ["FBD7",0x53AA],
+  ["FBD8",0x9F8E],
+  ["FBD9",0x5469],
+  ["FBDA",0x549C],
+  ["FBDB",0x53DA],
+  ["FBDC",0x6ACA],
+  ["FBDD",0x5573],
+  ["FBDE",0xE119],
+  ["FBDF",0x35D6],
+  ["FBE0",0xE11B],
+  ["FBE1",0x5611],
+  ["FBE2",0x564D],
+  ["FBE3",0xE11E],
+  ["FBE4",0x5654],
+  ["FBE5",0x35F3],
+  ["FBE6",0xE121],
+  ["FBE7",0x5746],
+  ["FBE8",0x577A],
+  ["FBE9",0x5767],
+  ["FBEA",0x583A],
+  ["FBEB",0x57E6],
+  ["FBEC",0x57DD],
+  ["FBED",0x5840],
+  ["FBEE",0xE129],
+  ["FBEF",0x5826],
+  ["FBF0",0x58DC],
+  ["FBF1",0x59B7],
+  ["FBF2",0x59D9],
+  ["FBF3",0x5C20],
+  ["FBF4",0xE12F],
+  ["FBF5",0x5CD1],
+  ["FBF6",0x5CE9],
+  ["FBF7",0x5D46],
+  ["FBF8",0x5D8E],
+  ["FBF9",0xE134],
+  ["FBFA",0x5DF5],
+  ["FBFB",0x5E0B],
+  ["FBFC",0x5E12],
+  ["FBFD",0x5E2E],
+  ["FBFE",0x5E5E],
+  ["FC40",0xE13A],
+  ["FC41",0x5F4D],
+  ["FC42",0x7A7D],
+  ["FC43",0x5BC3],
+  ["FC44",0x7ABB],
+  ["FC45",0xE13F],
+  ["FC46",0xE140],
+  ["FC47",0x5FA4],
+  ["FC48",0x5FBA],
+  ["FC49",0x5FBC],
+  ["FC4A",0xE144],
+  ["FC4B",0x6077],
+  ["FC4C",0x60A4],
+  ["FC4D",0x60B3],
+  ["FC4E",0x60FD],
+  ["FC4F",0x6130],
+  ["FC50",0xE14A],
+  ["FC51",0x619C],
+  ["FC52",0x6159],
+  ["FC53",0x617D],
+  ["FC54",0x615C],
+  ["FC55",0x637F],
+  ["FC56",0x61E2],
+  ["FC57",0x70D5],
+  ["FC58",0x6239],
+  ["FC59",0x6268],
+  ["FC5A",0x6285],
+  ["FC5B",0x6282],
+  ["FC5C",0x62A6],
+  ["FC5D",0x62D5],
+  ["FC5E",0x6364],
+  ["FC5F",0x6335],
+  ["FC60",0x6490],
+  ["FC61",0x3A5C],
+  ["FC62",0x6648],
+  ["FC63",0x6667],
+  ["FC64",0x671E],
+  ["FC65",0x6803],
+  ["FC66",0x67AC],
+  ["FC67",0x67F9],
+  ["FC68",0x68B6],
+  ["FC69",0x692C],
+  ["FC6A",0x6901],
+  ["FC6B",0x6900],
+  ["FC6C",0x68CA],
+  ["FC6D",0x6973],
+  ["FC6E",0x6980],
+  ["FC6F",0x693E],
+  ["FC70",0xE16A],
+  ["FC71",0x69B2],
+  ["FC72",0x69C0],
+  ["FC73",0x698A],
+  ["FC74",0x69FA],
+  ["FC75",0x69E9],
+  ["FC76",0x6AB2],
+  ["FC77",0x6A52],
+  ["FC78",0x6A9D],
+  ["FC79",0x6B1D],
+  ["FC7A",0x6B52],
+  ["FC7B",0x6BFA],
+  ["FC7C",0x3CD1],
+  ["FC7D",0x6CCE],
+  ["FC7E",0x6E4F],
+  ["FCA1",0x6DB9],
+  ["FCA2",0x6F44],
+  ["FCA3",0xE17B],
+  ["FCA4",0x6FDA],
+  ["FCA5",0x7081],
+  ["FCA6",0x79CC],
+  ["FCA7",0x7134],
+  ["FCA8",0x3DCC],
+  ["FCA9",0x7176],
+  ["FCAA",0xE182],
+  ["FCAB",0xE183],
+  ["FCAC",0x7215],
+  ["FCAD",0x7250],
+  ["FCAE",0x7287],
+  ["FCAF",0x732C],
+  ["FCB0",0x72B2],
+  ["FCB1",0x72E2],
+  ["FCB2",0x7302],
+  ["FCB3",0x7348],
+  ["FCB4",0x7328],
+  ["FCB5",0x734F],
+  ["FCB6",0x7371],
+  ["FCB7",0x6585],
+  ["FCB8",0xE190],
+  ["FCB9",0x745D],
+  ["FCBA",0x7468],
+  ["FCBB",0x751E],
+  ["FCBC",0x7553],
+  ["FCBD",0x757A],
+  ["FCBE",0x76A1],
+  ["FCBF",0x76CC],
+  ["FCC0",0x7724],
+  ["FCC1",0x772B],
+  ["FCC2",0x4065],
+  ["FCC3",0x7853],
+  ["FCC4",0x78D3],
+  ["FCC5",0x78D8],
+  ["FCC6",0x9D7E],
+  ["FCC7",0x78AF],
+  ["FCC8",0xE1A0],
+  ["FCC9",0x6142],
+  ["FCCA",0x79A9],
+  ["FCCB",0x9C3A],
+  ["FCCC",0x79D4],
+  ["FCCD",0xE1A5],
+  ["FCCE",0x7A2D],
+  ["FCCF",0x7A3E],
+  ["FCD0",0x7A49],
+  ["FCD1",0x7ADD],
+  ["FCD2",0x7ADA],
+  ["FCD3",0x75C3],
+  ["FCD4",0x7607],
+  ["FCD5",0x7602],
+  ["FCD6",0xE1AE],
+  ["FCD7",0x7667],
+  ["FCD8",0x766F],
+  ["FCD9",0x5620],
+  ["FCDA",0x8A67],
+  ["FCDB",0x9F17],
+  ["FCDC",0x7B1F],
+  ["FCDD",0x7B92],
+  ["FCDE",0x7BA3],
+  ["FCDF",0x7BCF],
+  ["FCE0",0xE1B8],
+  ["FCE1",0x7BFC],
+  ["FCE2",0x7C42],
+  ["FCE3",0x7C51],
+  ["FCE4",0x7C5D],
+  ["FCE5",0x7C70],
+  ["FCE6",0x7C7E],
+  ["FCE7",0x7C86],
+  ["FCE8",0x7C83],
+  ["FCE9",0x7CAC],
+  ["FCEA",0x7CC7],
+  ["FCEB",0x7CC2],
+  ["FCEC",0xE1C4],
+  ["FCED",0x7CDA],
+  ["FCEE",0xE1C6],
+  ["FCEF",0x7D4D],
+  ["FCF0",0x7D5A],
+  ["FCF1",0x7DF5],
+  ["FCF2",0x7E27],
+  ["FCF3",0x7E6E],
+  ["FCF4",0x9E95],
+  ["FCF5",0x5273],
+  ["FCF6",0x801D],
+  ["FCF7",0x8062],
+  ["FCF8",0x8063],
+  ["FCF9",0x8066],
+  ["FCFA",0x805B],
+  ["FCFB",0x80A6],
+  ["FCFC",0x8103],
+  ["FCFD",0x9E81],
+  ["FCFE",0x81C8],
+  ["FD40",0xE1D7],
+  ["FD41",0x8FA0],
+  ["FD42",0x81F6],
+  ["FD43",0x821A],
+  ["FD44",0xE1DB],
+  ["FD45",0x8771],
+  ["FD46",0x87A9],
+  ["FD47",0x878C],
+  ["FD48",0x9E9E],
+  ["FD49",0x87C1],
+  ["FD4A",0x9E1C],
+  ["FD4B",0xE1E2],
+  ["FD4C",0x87D6],
+  ["FD4D",0x87F5],
+  ["FD4E",0x880F],
+  ["FD4F",0x8818],
+  ["FD50",0x882D],
+  ["FD51",0x8842],
+  ["FD52",0x8845],
+  ["FD53",0x9C35],
+  ["FD54",0x886E],
+  ["FD55",0x88AA],
+  ["FD56",0x88A0],
+  ["FD57",0x629D],
+  ["FD58",0x8943],
+  ["FD59",0x894D],
+  ["FD5A",0x7172],
+  ["FD5B",0x885E],
+  ["FD5C",0xE1F3],
+  ["FD5D",0x82FD],
+  ["FD5E",0x44B7],
+  ["FD5F",0x82D0],
+  ["FD60",0x8385],
+  ["FD61",0x9D02],
+  ["FD62",0x9F69],
+  ["FD63",0x8420],
+  ["FD64",0xE1FB],
+  ["FD65",0x84DA],
+  ["FD66",0x84AD],
+  ["FD67",0x44FB],
+  ["FD68",0x854B],
+  ["FD69",0xE200],
+  ["FD6A",0x8602],
+  ["FD6B",0x8610],
+  ["FD6C",0x63D1],
+  ["FD6D",0x8989],
+  ["FD6E",0x898A],
+  ["FD6F",0x8994],
+  ["FD70",0x9C45],
+  ["FD71",0x89BC],
+  ["FD72",0x8A7E],
+  ["FD73",0x8A49],
+  ["FD74",0x8B0C],
+  ["FD75",0x8B43],
+  ["FD76",0x8B81],
+  ["FD77",0x8B4C],
+  ["FD78",0xE20F],
+  ["FD79",0x8CAD],
+  ["FD7A",0x8CEB],
+  ["FD7B",0x8CF7],
+  ["FD7C",0x8D0C],
+  ["FD7D",0x8D82],
+  ["FD7E",0x8DA6],
+  ["FDA1",0x8DD4],
+  ["FDA2",0x8E28],
+  ["FDA3",0x8E4F],
+  ["FDA4",0x8E77],
+  ["FDA5",0x8E75],
+  ["FDA6",0x8EA7],
+  ["FDA7",0x8F19],
+  ["FDA8",0xE21D],
+  ["FDA9",0x8F5C],
+  ["FDAA",0x9D44],
+  ["FDAB",0x90C4],
+  ["FDAC",0x9151],
+  ["FDAD",0xE222],
+  ["FDAE",0x915C],
+  ["FDAF",0x9159],
+  ["FDB0",0x9167],
+  ["FDB1",0x917C],
+  ["FDB2",0x918E],
+  ["FDB3",0x91BB],
+  ["FDB4",0x9EA8],
+  ["FDB5",0x9056],
+  ["FDB6",0x904C],
+  ["FDB7",0x91FE],
+  ["FDB8",0x9262],
+  ["FDB9",0x92BE],
+  ["FDBA",0x936B],
+  ["FDBB",0x936E],
+  ["FDBC",0x93BA],
+  ["FDBD",0x9427],
+  ["FDBE",0x9597],
+  ["FDBF",0x95A7],
+  ["FDC0",0xE235],
+  ["FDC1",0x9638],
+  ["FDC2",0xE237],
+  ["FDC3",0x9683],
+  ["FDC4",0x9696],
+  ["FDC5",0x9681],
+  ["FDC6",0x96BD],
+  ["FDC7",0x9703],
+  ["FDC8",0x9721],
+  ["FDC9",0x9731],
+  ["FDCA",0x975F],
+  ["FDCB",0x979F],
+  ["FDCC",0x97B4],
+  ["FDCD",0x97B8],
+  ["FDCE",0x97BA],
+  ["FDCF",0x97BE],
+  ["FDD0",0x97C8],
+  ["FDD1",0x9EBF],
+  ["FDD2",0x981F],
+  ["FDD3",0x982E],
+  ["FDD4",0x9FA5],
+  ["FDD5",0x9847],
+  ["FDD6",0x984B],
+  ["FDD7",0x9866],
+  ["FDD8",0x986C],
+  ["FDD9",0x98B4],
+  ["FDDA",0x9F5A],
+  ["FDDB",0x98DC],
+  ["FDDC",0x98E6],
+  ["FDDD",0x9942],
+  ["FDDE",0x9939],
+  ["FDDF",0x993B],
+  ["FDE0",0x9F53],
+  ["FDE1",0x994A],
+  ["FDE2",0x9F45],
+  ["FDE3",0x4B7E],
+  ["FDE4",0x99DA],
+  ["FDE5",0x7AC8],
+  ["FDE6",0x9ABA],
+  ["FDE7",0x9ABD],
+  ["FDE8",0x9F02],
+  ["FDE9",0x9B2A],
+  ["FDEA",0xE25F],
+  ["FDEB",0x9B2D],
+  ["FDEC",0x9AE2],
+  ["FDED",0x9B02],
+  ["FDEE",0x9AFF],
+  ["FDEF",0x4C07],
+  ["FDF0",0x9B09],
+  ["FDF1",0x4C04],
+  ["FDF2",0x4C3B],
+  ["FDF3",0x9B8F],
+  ["FDF4",0x9B9D],
+  ["FDF5",0x9BB0],
+  ["FDF6",0x9C0C],
+  ["FDF7",0x9C15],
+  ["FDF8",0x9C0A],
+  ["FDF9",0x9BFF],
+  ["FDFA",0x9C2E],
+  ["FDFB",0x80E8],
+  ["FDFC",0x80E9],
+  ["FDFD",0x80EC],
+  ["FDFE",0x810E],
+  ["FE40",0x6C39],
+  ["FE41",0x4E6A],
+  ["FE42",0x9641],
+  ["FE43",0x58F2],
+  ["FE44",0x7962],
+  ["FE45",0x6822],
+  ["FE46",0xE27A],
+  ["FE47",0xE27B],
+  ["FE48",0x8107],
+  ["FE49",0x57D7],
+  ["FE4A",0x44EA],
+  ["FE4B",0x6435],
+  ["FE4C",0x8534],
+  ["FE4D",0x40DF],
+  ["FE4E",0xE282],
+  ["FE4F",0x691A],
+  ["FE50",0x9C02],
+  ["FE51",0x75B1],
+  ["FE52",0x83D3],
+  ["FE53",0x7171],
+  ["FE54",0x6A0B],
+  ["FE55",0xE289],
+  ["FE56",0x6A7A],
+  ["FE57",0x9AF4],
+  ["FE58",0xE28C],
+  ["FE59",0xE28D],
+  ["FE5A",0x77B9],
+  ["FE5B",0x6530],
+  ["FE5C",0x6D96],
+  ["FE5D",0x5637],
+  ["FE5E",0x6725],
+  ["FE5F",0x6A2B],
+  ["FE60",0x7D5D],
+  ["FE61",0x9061],
+  ["FE62",0x4E98],
+  ["FE63",0x7CA6],
+  ["FE64",0x7B39],
+  ["FE65",0xE299],
+  ["FE66",0x5975],
+  ["FE67",0x36C7],
+  ["FE68",0x707F],
+  ["FE69",0xE29D],
+  ["FE6A",0x6E8B],
+  ["FE6B",0xE29F],
+  ["FE6C",0xE2A0],
+  ["FE6D",0x975D],
+  ["FE6E",0x92D0],
+  ["FE6F",0x5754],
+  ["FE70",0xE2A4],
+  ["FE71",0x3ED9],
+  ["FE72",0xE2A6],
+  ["FE73",0xE2A7],
+  ["FE74",0x6199],
+  ["FE75",0x7460],
+  ["FE76",0x713F],
+  ["FE77",0x792E],
+  ["FE78",0x5A96],
+  ["FE79",0x9348],
+  ["FE7A",0x668E],
+  ["FE7B",0x4FFD],
+  ["FE7C",0x9341],
+  ["FE7D",0x3654],
+  ["FE7E",0x5D75],
+  ["FEA1",0x701E],
+  ["FEA2",0x657B],
+  ["FEA3",0x708D],
+  ["FEA4",0x5ECD],
+  ["FEA5",0xE2B7],
+  ["FEA6",0x60A7],
+  ["FEA7",0x7AB0],
+  ["FEA8",0x5F63],
+  ["FEA9",0xE2BB],
+  ["FEAA",0x73F7],
+  ["FEAB",0xE2BD],
+  ["FEAC",0x7468],
+  ["FEAD",0x75B4],
+  ["FEAE",0xE2C0],
+  ["FEAF",0x9B69],
+  ["FEB0",0x00BD],
+  ["FEB1",0x2153],
+  ["FEB2",0x2154],
+  ["FEB3",0x00BC],
+  ["FEB4",0x00BE],
+  ["FEB5",0x2155],
+  ["FEB6",0x2156],
+  ["FEB7",0x2157],
+  ["FEB8",0x2158],
+  ["FEB9",0x2159],
+  ["FEBA",0x215A],
+  ["FEBB",0x8692],
+  ["FEBC",0x86A0],
+  ["FEBD",0x86AD],
+  ["FEBE",0x86B2],
+  ["FEBF",0x87A5],
+  ["FEC0",0x87B1],
+  ["FEC1",0x215B],
+  ["FEC2",0x215C],
+  ["FEC3",0x215D],
+  ["FEC4",0x215E],
+  ["FEC5",0x87DA],
+  ["FEC6",0x884F],
+  ["FEC7",0x8860],
+  ["FEC8",0x8887],
+  ["FEC9",0x888F],
+  ["FECA",0x8890],
+  ["FECB",0x88E6],
+  ["FECC",0x88FF],
+  ["FECD",0x8900],
+  ["FECE",0x8924],
+  ["FECF",0x8947],
+  ["FED0",0x8954],
+  ["FED1",0x8965],
+  ["FED2",0x8980],
+  ["FED3",0x8991],
+  ["FED4",0x8A1C],
+  ["FED5",0x8A29],
+  ["FED6",0x8A2B],
+  ["FED7",0x8A38],
+  ["FED8",0x8A3D],
+  ["FED9",0x2312],
+  ["FEDA",0x8A90],
+  ["FEDB",0x8A94],
+  ["FEDC",0x8A9C],
+  ["FEDD",0x8AA9],
+  ["FEDE",0x8AAF],
+  ["FEDF",0x8AB4],
+  ["FEE0",0x8AEA],
+  ["FEE1",0x8B1F],
+  ["FEE2",0x2030],
+  ["FEE3",0x8B3F],
+  ["FEE4",0x8B4D],
+  ["FEE5",0x8B5E],
+  ["FEE6",0x8B62],
+  ["FEE7",0x8B69],
+  ["FEE8",0x8B9B],
+  ["FEE9",0x8C51],
+  ["FEEA",0x8C9B],
+  ["FEEB",0x8C9F],
+  ["FEEC",0x8CD4],
+  ["FEED",0x8CD6],
+  ["FEEE",0x8112],
+  ["FEEF",0x8131],
+  ["FEF0",0x8136],
+  ["FEF1",0x815F],
+  ["FEF2",0x816D],
+  ["FEF3",0x817D],
+  ["FEF4",0x8193],
+  ["FEF5",0x81AA],
+  ["FEF6",0x81B8],
+  ["FEF7",0x81C1],
+  ["FEF8",0x8229],
+  ["FEF9",0x822D],
+  ["FEFA",0x822E],
+  ["FEFB",0x823E],
+  ["FEFC",0x8262],
+  ["FEFD",0x826A],
+  ["FEFE",0x8288],
+]
+\ No newline at end of file
diff --git a/enc/trans/big5.trans b/enc/trans/big5.trans
new file mode 100644
index 0000000000..fa96746068
--- /dev/null
+++ b/enc/trans/big5.trans
@@ -0,0 +1,25 @@
+#include "transcode_data.h"
+
+<%
+  require "big5-tbl"
+  require "big5-hkscs-tbl"
+  require "big5-uao-tbl"
+
+  transcode_tblgen "Big5", "UTF-8", [["{00-7f}", :nomap], *BIG5_TO_UCS_TBL]
+  transcode_tblgen "UTF-8", "Big5", [["{00-7f}", :nomap], *BIG5_TO_UCS_TBL.map {|a,b| [b,a] }]
+
+  transcode_tblgen "Big5-HKSCS", "UTF-8", [["{00-7f}", :nomap], *BIG5_HKSCS_TO_UCS_TBL], ValidEncoding('Big5')
+  transcode_tblgen "UTF-8", "Big5-HKSCS", [["{00-7f}", :nomap], *BIG5_HKSCS_TO_UCS_TBL.map {|a,b| [b,a] }]
+
+  transcode_tblgen "Big5-UAO", "UTF-8", [["{00-7f}", :nomap], *BIG5_UAO_TO_UCS_TBL], ValidEncoding('Big5')
+  transcode_tblgen "UTF-8", "Big5-UAO", [["{00-7f}", :nomap], *BIG5_UAO_TO_UCS_TBL.map {|a,b| [b,a] }]
+
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_big5(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/chinese.trans b/enc/trans/chinese.trans
new file mode 100644
index 0000000000..0662a3bebc
--- /dev/null
+++ b/enc/trans/chinese.trans
@@ -0,0 +1,32 @@
+#include "transcode_data.h"
+
+<%
+  gb2312_valid_byte_pattern = ValidEncoding('EUC-KR')
+  gb12345_valid_byte_pattern = ValidEncoding('EUC-KR')
+
+  transcode_tblgen "GB2312", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "GB2312/UCS"),
+  gb2312_valid_byte_pattern
+
+  transcode_tblgen "GB12345", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "GB12345/UCS"),
+  gb12345_valid_byte_pattern
+
+  transcode_tblgen "UTF-8", "GB2312",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "UCS/GB2312")
+
+  transcode_tblgen "UTF-8", "GB12345",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "UCS/GB12345")
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_chinese(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/cp850-tbl.rb b/enc/trans/cp850-tbl.rb
new file mode 100644
index 0000000000..615d3b2599
--- /dev/null
+++ b/enc/trans/cp850-tbl.rb
@@ -0,0 +1,130 @@
+CP850_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["AD",0xA1],
+  ["BD",0xA2],
+  ["9C",0xA3],
+  ["CF",0xA4],
+  ["BE",0xA5],
+  ["DD",0xA6],
+  ["F5",0xA7],
+  ["F9",0xA8],
+  ["B8",0xA9],
+  ["A6",0xAA],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F0",0xAD],
+  ["A9",0xAE],
+  ["EE",0xAF],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["FC",0xB3],
+  ["EF",0xB4],
+  ["E6",0xB5],
+  ["F4",0xB6],
+  ["FA",0xB7],
+  ["F7",0xB8],
+  ["FB",0xB9],
+  ["A7",0xBA],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["F3",0xBE],
+  ["A8",0xBF],
+  ["B7",0xC0],
+  ["B5",0xC1],
+  ["B6",0xC2],
+  ["C7",0xC3],
+  ["8E",0xC4],
+  ["8F",0xC5],
+  ["92",0xC6],
+  ["80",0xC7],
+  ["D4",0xC8],
+  ["90",0xC9],
+  ["D2",0xCA],
+  ["D3",0xCB],
+  ["DE",0xCC],
+  ["D6",0xCD],
+  ["D7",0xCE],
+  ["D8",0xCF],
+  ["D1",0xD0],
+  ["A5",0xD1],
+  ["E3",0xD2],
+  ["E0",0xD3],
+  ["E2",0xD4],
+  ["E5",0xD5],
+  ["99",0xD6],
+  ["9E",0xD7],
+  ["9D",0xD8],
+  ["EB",0xD9],
+  ["E9",0xDA],
+  ["EA",0xDB],
+  ["9A",0xDC],
+  ["ED",0xDD],
+  ["E8",0xDE],
+  ["E1",0xDF],
+  ["85",0xE0],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["C6",0xE3],
+  ["84",0xE4],
+  ["86",0xE5],
+  ["91",0xE6],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["89",0xEB],
+  ["8D",0xEC],
+  ["A1",0xED],
+  ["8C",0xEE],
+  ["8B",0xEF],
+  ["D0",0xF0],
+  ["A4",0xF1],
+  ["95",0xF2],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["E4",0xF5],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["9B",0xF8],
+  ["97",0xF9],
+  ["A3",0xFA],
+  ["96",0xFB],
+  ["81",0xFC],
+  ["EC",0xFD],
+  ["E7",0xFE],
+  ["98",0xFF],
+  ["D5",0x131],
+  ["9F",0x192],
+  ["F2",0x2017],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/cp852-tbl.rb b/enc/trans/cp852-tbl.rb
new file mode 100644
index 0000000000..6763bfa6e9
--- /dev/null
+++ b/enc/trans/cp852-tbl.rb
@@ -0,0 +1,130 @@
+CP852_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["CF",0xA4],
+  ["F5",0xA7],
+  ["F9",0xA8],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F0",0xAD],
+  ["F8",0xB0],
+  ["EF",0xB4],
+  ["F7",0xB8],
+  ["AF",0xBB],
+  ["B5",0xC1],
+  ["B6",0xC2],
+  ["8E",0xC4],
+  ["80",0xC7],
+  ["90",0xC9],
+  ["D3",0xCB],
+  ["D6",0xCD],
+  ["D7",0xCE],
+  ["E0",0xD3],
+  ["E2",0xD4],
+  ["99",0xD6],
+  ["9E",0xD7],
+  ["E9",0xDA],
+  ["9A",0xDC],
+  ["ED",0xDD],
+  ["E1",0xDF],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["84",0xE4],
+  ["87",0xE7],
+  ["82",0xE9],
+  ["89",0xEB],
+  ["A1",0xED],
+  ["8C",0xEE],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["A3",0xFA],
+  ["81",0xFC],
+  ["EC",0xFD],
+  ["C6",0x102],
+  ["C7",0x103],
+  ["A4",0x104],
+  ["A5",0x105],
+  ["8F",0x106],
+  ["86",0x107],
+  ["AC",0x10C],
+  ["9F",0x10D],
+  ["D2",0x10E],
+  ["D4",0x10F],
+  ["D1",0x110],
+  ["D0",0x111],
+  ["A8",0x118],
+  ["A9",0x119],
+  ["B7",0x11A],
+  ["D8",0x11B],
+  ["91",0x139],
+  ["92",0x13A],
+  ["95",0x13D],
+  ["96",0x13E],
+  ["9D",0x141],
+  ["88",0x142],
+  ["E3",0x143],
+  ["E4",0x144],
+  ["D5",0x147],
+  ["E5",0x148],
+  ["8A",0x150],
+  ["8B",0x151],
+  ["E8",0x154],
+  ["EA",0x155],
+  ["FC",0x158],
+  ["FD",0x159],
+  ["97",0x15A],
+  ["98",0x15B],
+  ["B8",0x15E],
+  ["AD",0x15F],
+  ["E6",0x160],
+  ["E7",0x161],
+  ["DD",0x162],
+  ["EE",0x163],
+  ["9B",0x164],
+  ["9C",0x165],
+  ["DE",0x16E],
+  ["85",0x16F],
+  ["EB",0x170],
+  ["FB",0x171],
+  ["8D",0x179],
+  ["AB",0x17A],
+  ["BD",0x17B],
+  ["BE",0x17C],
+  ["A6",0x17D],
+  ["A7",0x17E],
+  ["F3",0x2C7],
+  ["F4",0x2D8],
+  ["FA",0x2D9],
+  ["F2",0x2DB],
+  ["F1",0x2DD],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/cp855-tbl.rb b/enc/trans/cp855-tbl.rb
new file mode 100644
index 0000000000..72e548b9cb
--- /dev/null
+++ b/enc/trans/cp855-tbl.rb
@@ -0,0 +1,130 @@
+CP855_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["CF",0xA4],
+  ["FD",0xA7],
+  ["AE",0xAB],
+  ["F0",0xAD],
+  ["AF",0xBB],
+  ["85",0x401],
+  ["81",0x402],
+  ["83",0x403],
+  ["87",0x404],
+  ["89",0x405],
+  ["8B",0x406],
+  ["8D",0x407],
+  ["8F",0x408],
+  ["91",0x409],
+  ["93",0x40A],
+  ["95",0x40B],
+  ["97",0x40C],
+  ["99",0x40E],
+  ["9B",0x40F],
+  ["A1",0x410],
+  ["A3",0x411],
+  ["EC",0x412],
+  ["AD",0x413],
+  ["A7",0x414],
+  ["A9",0x415],
+  ["EA",0x416],
+  ["F4",0x417],
+  ["B8",0x418],
+  ["BE",0x419],
+  ["C7",0x41A],
+  ["D1",0x41B],
+  ["D3",0x41C],
+  ["D5",0x41D],
+  ["D7",0x41E],
+  ["DD",0x41F],
+  ["E2",0x420],
+  ["E4",0x421],
+  ["E6",0x422],
+  ["E8",0x423],
+  ["AB",0x424],
+  ["B6",0x425],
+  ["A5",0x426],
+  ["FC",0x427],
+  ["F6",0x428],
+  ["FA",0x429],
+  ["9F",0x42A],
+  ["F2",0x42B],
+  ["EE",0x42C],
+  ["F8",0x42D],
+  ["9D",0x42E],
+  ["E0",0x42F],
+  ["A0",0x430],
+  ["A2",0x431],
+  ["EB",0x432],
+  ["AC",0x433],
+  ["A6",0x434],
+  ["A8",0x435],
+  ["E9",0x436],
+  ["F3",0x437],
+  ["B7",0x438],
+  ["BD",0x439],
+  ["C6",0x43A],
+  ["D0",0x43B],
+  ["D2",0x43C],
+  ["D4",0x43D],
+  ["D6",0x43E],
+  ["D8",0x43F],
+  ["E1",0x440],
+  ["E3",0x441],
+  ["E5",0x442],
+  ["E7",0x443],
+  ["AA",0x444],
+  ["B5",0x445],
+  ["A4",0x446],
+  ["FB",0x447],
+  ["F5",0x448],
+  ["F9",0x449],
+  ["9E",0x44A],
+  ["F1",0x44B],
+  ["ED",0x44C],
+  ["F7",0x44D],
+  ["9C",0x44E],
+  ["DE",0x44F],
+  ["84",0x451],
+  ["80",0x452],
+  ["82",0x453],
+  ["86",0x454],
+  ["88",0x455],
+  ["8A",0x456],
+  ["8C",0x457],
+  ["8E",0x458],
+  ["90",0x459],
+  ["92",0x45A],
+  ["94",0x45B],
+  ["96",0x45C],
+  ["98",0x45E],
+  ["9A",0x45F],
+  ["EF",0x2116],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/cp949-tbl.rb b/enc/trans/cp949-tbl.rb
new file mode 100644
index 0000000000..0e47353850
--- /dev/null
+++ b/enc/trans/cp949-tbl.rb
@@ -0,0 +1,8831 @@
+require 'euckr-tbl'
+
+CP949_TO_UCS_ADDITIONAL_TBL = [
+  ["8141",0xAC02],
+  ["8142",0xAC03],
+  ["8143",0xAC05],
+  ["8144",0xAC06],
+  ["8145",0xAC0B],
+  ["8146",0xAC0C],
+  ["8147",0xAC0D],
+  ["8148",0xAC0E],
+  ["8149",0xAC0F],
+  ["814A",0xAC18],
+  ["814B",0xAC1E],
+  ["814C",0xAC1F],
+  ["814D",0xAC21],
+  ["814E",0xAC22],
+  ["814F",0xAC23],
+  ["8150",0xAC25],
+  ["8151",0xAC26],
+  ["8152",0xAC27],
+  ["8153",0xAC28],
+  ["8154",0xAC29],
+  ["8155",0xAC2A],
+  ["8156",0xAC2B],
+  ["8157",0xAC2E],
+  ["8158",0xAC32],
+  ["8159",0xAC33],
+  ["815A",0xAC34],
+  ["8161",0xAC35],
+  ["8162",0xAC36],
+  ["8163",0xAC37],
+  ["8164",0xAC3A],
+  ["8165",0xAC3B],
+  ["8166",0xAC3D],
+  ["8167",0xAC3E],
+  ["8168",0xAC3F],
+  ["8169",0xAC41],
+  ["816A",0xAC42],
+  ["816B",0xAC43],
+  ["816C",0xAC44],
+  ["816D",0xAC45],
+  ["816E",0xAC46],
+  ["816F",0xAC47],
+  ["8170",0xAC48],
+  ["8171",0xAC49],
+  ["8172",0xAC4A],
+  ["8173",0xAC4C],
+  ["8174",0xAC4E],
+  ["8175",0xAC4F],
+  ["8176",0xAC50],
+  ["8177",0xAC51],
+  ["8178",0xAC52],
+  ["8179",0xAC53],
+  ["817A",0xAC55],
+  ["8181",0xAC56],
+  ["8182",0xAC57],
+  ["8183",0xAC59],
+  ["8184",0xAC5A],
+  ["8185",0xAC5B],
+  ["8186",0xAC5D],
+  ["8187",0xAC5E],
+  ["8188",0xAC5F],
+  ["8189",0xAC60],
+  ["818A",0xAC61],
+  ["818B",0xAC62],
+  ["818C",0xAC63],
+  ["818D",0xAC64],
+  ["818E",0xAC65],
+  ["818F",0xAC66],
+  ["8190",0xAC67],
+  ["8191",0xAC68],
+  ["8192",0xAC69],
+  ["8193",0xAC6A],
+  ["8194",0xAC6B],
+  ["8195",0xAC6C],
+  ["8196",0xAC6D],
+  ["8197",0xAC6E],
+  ["8198",0xAC6F],
+  ["8199",0xAC72],
+  ["819A",0xAC73],
+  ["819B",0xAC75],
+  ["819C",0xAC76],
+  ["819D",0xAC79],
+  ["819E",0xAC7B],
+  ["819F",0xAC7C],
+  ["81A0",0xAC7D],
+  ["81A1",0xAC7E],
+  ["81A2",0xAC7F],
+  ["81A3",0xAC82],
+  ["81A4",0xAC87],
+  ["81A5",0xAC88],
+  ["81A6",0xAC8D],
+  ["81A7",0xAC8E],
+  ["81A8",0xAC8F],
+  ["81A9",0xAC91],
+  ["81AA",0xAC92],
+  ["81AB",0xAC93],
+  ["81AC",0xAC95],
+  ["81AD",0xAC96],
+  ["81AE",0xAC97],
+  ["81AF",0xAC98],
+  ["81B0",0xAC99],
+  ["81B1",0xAC9A],
+  ["81B2",0xAC9B],
+  ["81B3",0xAC9E],
+  ["81B4",0xACA2],
+  ["81B5",0xACA3],
+  ["81B6",0xACA4],
+  ["81B7",0xACA5],
+  ["81B8",0xACA6],
+  ["81B9",0xACA7],
+  ["81BA",0xACAB],
+  ["81BB",0xACAD],
+  ["81BC",0xACAE],
+  ["81BD",0xACB1],
+  ["81BE",0xACB2],
+  ["81BF",0xACB3],
+  ["81C0",0xACB4],
+  ["81C1",0xACB5],
+  ["81C2",0xACB6],
+  ["81C3",0xACB7],
+  ["81C4",0xACBA],
+  ["81C5",0xACBE],
+  ["81C6",0xACBF],
+  ["81C7",0xACC0],
+  ["81C8",0xACC2],
+  ["81C9",0xACC3],
+  ["81CA",0xACC5],
+  ["81CB",0xACC6],
+  ["81CC",0xACC7],
+  ["81CD",0xACC9],
+  ["81CE",0xACCA],
+  ["81CF",0xACCB],
+  ["81D0",0xACCD],
+  ["81D1",0xACCE],
+  ["81D2",0xACCF],
+  ["81D3",0xACD0],
+  ["81D4",0xACD1],
+  ["81D5",0xACD2],
+  ["81D6",0xACD3],
+  ["81D7",0xACD4],
+  ["81D8",0xACD6],
+  ["81D9",0xACD8],
+  ["81DA",0xACD9],
+  ["81DB",0xACDA],
+  ["81DC",0xACDB],
+  ["81DD",0xACDC],
+  ["81DE",0xACDD],
+  ["81DF",0xACDE],
+  ["81E0",0xACDF],
+  ["81E1",0xACE2],
+  ["81E2",0xACE3],
+  ["81E3",0xACE5],
+  ["81E4",0xACE6],
+  ["81E5",0xACE9],
+  ["81E6",0xACEB],
+  ["81E7",0xACED],
+  ["81E8",0xACEE],
+  ["81E9",0xACF2],
+  ["81EA",0xACF4],
+  ["81EB",0xACF7],
+  ["81EC",0xACF8],
+  ["81ED",0xACF9],
+  ["81EE",0xACFA],
+  ["81EF",0xACFB],
+  ["81F0",0xACFE],
+  ["81F1",0xACFF],
+  ["81F2",0xAD01],
+  ["81F3",0xAD02],
+  ["81F4",0xAD03],
+  ["81F5",0xAD05],
+  ["81F6",0xAD07],
+  ["81F7",0xAD08],
+  ["81F8",0xAD09],
+  ["81F9",0xAD0A],
+  ["81FA",0xAD0B],
+  ["81FB",0xAD0E],
+  ["81FC",0xAD10],
+  ["81FD",0xAD12],
+  ["81FE",0xAD13],
+  ["8241",0xAD14],
+  ["8242",0xAD15],
+  ["8243",0xAD16],
+  ["8244",0xAD17],
+  ["8245",0xAD19],
+  ["8246",0xAD1A],
+  ["8247",0xAD1B],
+  ["8248",0xAD1D],
+  ["8249",0xAD1E],
+  ["824A",0xAD1F],
+  ["824B",0xAD21],
+  ["824C",0xAD22],
+  ["824D",0xAD23],
+  ["824E",0xAD24],
+  ["824F",0xAD25],
+  ["8250",0xAD26],
+  ["8251",0xAD27],
+  ["8252",0xAD28],
+  ["8253",0xAD2A],
+  ["8254",0xAD2B],
+  ["8255",0xAD2E],
+  ["8256",0xAD2F],
+  ["8257",0xAD30],
+  ["8258",0xAD31],
+  ["8259",0xAD32],
+  ["825A",0xAD33],
+  ["8261",0xAD36],
+  ["8262",0xAD37],
+  ["8263",0xAD39],
+  ["8264",0xAD3A],
+  ["8265",0xAD3B],
+  ["8266",0xAD3D],
+  ["8267",0xAD3E],
+  ["8268",0xAD3F],
+  ["8269",0xAD40],
+  ["826A",0xAD41],
+  ["826B",0xAD42],
+  ["826C",0xAD43],
+  ["826D",0xAD46],
+  ["826E",0xAD48],
+  ["826F",0xAD4A],
+  ["8270",0xAD4B],
+  ["8271",0xAD4C],
+  ["8272",0xAD4D],
+  ["8273",0xAD4E],
+  ["8274",0xAD4F],
+  ["8275",0xAD51],
+  ["8276",0xAD52],
+  ["8277",0xAD53],
+  ["8278",0xAD55],
+  ["8279",0xAD56],
+  ["827A",0xAD57],
+  ["8281",0xAD59],
+  ["8282",0xAD5A],
+  ["8283",0xAD5B],
+  ["8284",0xAD5C],
+  ["8285",0xAD5D],
+  ["8286",0xAD5E],
+  ["8287",0xAD5F],
+  ["8288",0xAD60],
+  ["8289",0xAD62],
+  ["828A",0xAD64],
+  ["828B",0xAD65],
+  ["828C",0xAD66],
+  ["828D",0xAD67],
+  ["828E",0xAD68],
+  ["828F",0xAD69],
+  ["8290",0xAD6A],
+  ["8291",0xAD6B],
+  ["8292",0xAD6E],
+  ["8293",0xAD6F],
+  ["8294",0xAD71],
+  ["8295",0xAD72],
+  ["8296",0xAD77],
+  ["8297",0xAD78],
+  ["8298",0xAD79],
+  ["8299",0xAD7A],
+  ["829A",0xAD7E],
+  ["829B",0xAD80],
+  ["829C",0xAD83],
+  ["829D",0xAD84],
+  ["829E",0xAD85],
+  ["829F",0xAD86],
+  ["82A0",0xAD87],
+  ["82A1",0xAD8A],
+  ["82A2",0xAD8B],
+  ["82A3",0xAD8D],
+  ["82A4",0xAD8E],
+  ["82A5",0xAD8F],
+  ["82A6",0xAD91],
+  ["82A7",0xAD92],
+  ["82A8",0xAD93],
+  ["82A9",0xAD94],
+  ["82AA",0xAD95],
+  ["82AB",0xAD96],
+  ["82AC",0xAD97],
+  ["82AD",0xAD98],
+  ["82AE",0xAD99],
+  ["82AF",0xAD9A],
+  ["82B0",0xAD9B],
+  ["82B1",0xAD9E],
+  ["82B2",0xAD9F],
+  ["82B3",0xADA0],
+  ["82B4",0xADA1],
+  ["82B5",0xADA2],
+  ["82B6",0xADA3],
+  ["82B7",0xADA5],
+  ["82B8",0xADA6],
+  ["82B9",0xADA7],
+  ["82BA",0xADA8],
+  ["82BB",0xADA9],
+  ["82BC",0xADAA],
+  ["82BD",0xADAB],
+  ["82BE",0xADAC],
+  ["82BF",0xADAD],
+  ["82C0",0xADAE],
+  ["82C1",0xADAF],
+  ["82C2",0xADB0],
+  ["82C3",0xADB1],
+  ["82C4",0xADB2],
+  ["82C5",0xADB3],
+  ["82C6",0xADB4],
+  ["82C7",0xADB5],
+  ["82C8",0xADB6],
+  ["82C9",0xADB8],
+  ["82CA",0xADB9],
+  ["82CB",0xADBA],
+  ["82CC",0xADBB],
+  ["82CD",0xADBC],
+  ["82CE",0xADBD],
+  ["82CF",0xADBE],
+  ["82D0",0xADBF],
+  ["82D1",0xADC2],
+  ["82D2",0xADC3],
+  ["82D3",0xADC5],
+  ["82D4",0xADC6],
+  ["82D5",0xADC7],
+  ["82D6",0xADC9],
+  ["82D7",0xADCA],
+  ["82D8",0xADCB],
+  ["82D9",0xADCC],
+  ["82DA",0xADCD],
+  ["82DB",0xADCE],
+  ["82DC",0xADCF],
+  ["82DD",0xADD2],
+  ["82DE",0xADD4],
+  ["82DF",0xADD5],
+  ["82E0",0xADD6],
+  ["82E1",0xADD7],
+  ["82E2",0xADD8],
+  ["82E3",0xADD9],
+  ["82E4",0xADDA],
+  ["82E5",0xADDB],
+  ["82E6",0xADDD],
+  ["82E7",0xADDE],
+  ["82E8",0xADDF],
+  ["82E9",0xADE1],
+  ["82EA",0xADE2],
+  ["82EB",0xADE3],
+  ["82EC",0xADE5],
+  ["82ED",0xADE6],
+  ["82EE",0xADE7],
+  ["82EF",0xADE8],
+  ["82F0",0xADE9],
+  ["82F1",0xADEA],
+  ["82F2",0xADEB],
+  ["82F3",0xADEC],
+  ["82F4",0xADED],
+  ["82F5",0xADEE],
+  ["82F6",0xADEF],
+  ["82F7",0xADF0],
+  ["82F8",0xADF1],
+  ["82F9",0xADF2],
+  ["82FA",0xADF3],
+  ["82FB",0xADF4],
+  ["82FC",0xADF5],
+  ["82FD",0xADF6],
+  ["82FE",0xADF7],
+  ["8341",0xADFA],
+  ["8342",0xADFB],
+  ["8343",0xADFD],
+  ["8344",0xADFE],
+  ["8345",0xAE02],
+  ["8346",0xAE03],
+  ["8347",0xAE04],
+  ["8348",0xAE05],
+  ["8349",0xAE06],
+  ["834A",0xAE07],
+  ["834B",0xAE0A],
+  ["834C",0xAE0C],
+  ["834D",0xAE0E],
+  ["834E",0xAE0F],
+  ["834F",0xAE10],
+  ["8350",0xAE11],
+  ["8351",0xAE12],
+  ["8352",0xAE13],
+  ["8353",0xAE15],
+  ["8354",0xAE16],
+  ["8355",0xAE17],
+  ["8356",0xAE18],
+  ["8357",0xAE19],
+  ["8358",0xAE1A],
+  ["8359",0xAE1B],
+  ["835A",0xAE1C],
+  ["8361",0xAE1D],
+  ["8362",0xAE1E],
+  ["8363",0xAE1F],
+  ["8364",0xAE20],
+  ["8365",0xAE21],
+  ["8366",0xAE22],
+  ["8367",0xAE23],
+  ["8368",0xAE24],
+  ["8369",0xAE25],
+  ["836A",0xAE26],
+  ["836B",0xAE27],
+  ["836C",0xAE28],
+  ["836D",0xAE29],
+  ["836E",0xAE2A],
+  ["836F",0xAE2B],
+  ["8370",0xAE2C],
+  ["8371",0xAE2D],
+  ["8372",0xAE2E],
+  ["8373",0xAE2F],
+  ["8374",0xAE32],
+  ["8375",0xAE33],
+  ["8376",0xAE35],
+  ["8377",0xAE36],
+  ["8378",0xAE39],
+  ["8379",0xAE3B],
+  ["837A",0xAE3C],
+  ["8381",0xAE3D],
+  ["8382",0xAE3E],
+  ["8383",0xAE3F],
+  ["8384",0xAE42],
+  ["8385",0xAE44],
+  ["8386",0xAE47],
+  ["8387",0xAE48],
+  ["8388",0xAE49],
+  ["8389",0xAE4B],
+  ["838A",0xAE4F],
+  ["838B",0xAE51],
+  ["838C",0xAE52],
+  ["838D",0xAE53],
+  ["838E",0xAE55],
+  ["838F",0xAE57],
+  ["8390",0xAE58],
+  ["8391",0xAE59],
+  ["8392",0xAE5A],
+  ["8393",0xAE5B],
+  ["8394",0xAE5E],
+  ["8395",0xAE62],
+  ["8396",0xAE63],
+  ["8397",0xAE64],
+  ["8398",0xAE66],
+  ["8399",0xAE67],
+  ["839A",0xAE6A],
+  ["839B",0xAE6B],
+  ["839C",0xAE6D],
+  ["839D",0xAE6E],
+  ["839E",0xAE6F],
+  ["839F",0xAE71],
+  ["83A0",0xAE72],
+  ["83A1",0xAE73],
+  ["83A2",0xAE74],
+  ["83A3",0xAE75],
+  ["83A4",0xAE76],
+  ["83A5",0xAE77],
+  ["83A6",0xAE7A],
+  ["83A7",0xAE7E],
+  ["83A8",0xAE7F],
+  ["83A9",0xAE80],
+  ["83AA",0xAE81],
+  ["83AB",0xAE82],
+  ["83AC",0xAE83],
+  ["83AD",0xAE86],
+  ["83AE",0xAE87],
+  ["83AF",0xAE88],
+  ["83B0",0xAE89],
+  ["83B1",0xAE8A],
+  ["83B2",0xAE8B],
+  ["83B3",0xAE8D],
+  ["83B4",0xAE8E],
+  ["83B5",0xAE8F],
+  ["83B6",0xAE90],
+  ["83B7",0xAE91],
+  ["83B8",0xAE92],
+  ["83B9",0xAE93],
+  ["83BA",0xAE94],
+  ["83BB",0xAE95],
+  ["83BC",0xAE96],
+  ["83BD",0xAE97],
+  ["83BE",0xAE98],
+  ["83BF",0xAE99],
+  ["83C0",0xAE9A],
+  ["83C1",0xAE9B],
+  ["83C2",0xAE9C],
+  ["83C3",0xAE9D],
+  ["83C4",0xAE9E],
+  ["83C5",0xAE9F],
+  ["83C6",0xAEA0],
+  ["83C7",0xAEA1],
+  ["83C8",0xAEA2],
+  ["83C9",0xAEA3],
+  ["83CA",0xAEA4],
+  ["83CB",0xAEA5],
+  ["83CC",0xAEA6],
+  ["83CD",0xAEA7],
+  ["83CE",0xAEA8],
+  ["83CF",0xAEA9],
+  ["83D0",0xAEAA],
+  ["83D1",0xAEAB],
+  ["83D2",0xAEAC],
+  ["83D3",0xAEAD],
+  ["83D4",0xAEAE],
+  ["83D5",0xAEAF],
+  ["83D6",0xAEB0],
+  ["83D7",0xAEB1],
+  ["83D8",0xAEB2],
+  ["83D9",0xAEB3],
+  ["83DA",0xAEB4],
+  ["83DB",0xAEB5],
+  ["83DC",0xAEB6],
+  ["83DD",0xAEB7],
+  ["83DE",0xAEB8],
+  ["83DF",0xAEB9],
+  ["83E0",0xAEBA],
+  ["83E1",0xAEBB],
+  ["83E2",0xAEBF],
+  ["83E3",0xAEC1],
+  ["83E4",0xAEC2],
+  ["83E5",0xAEC3],
+  ["83E6",0xAEC5],
+  ["83E7",0xAEC6],
+  ["83E8",0xAEC7],
+  ["83E9",0xAEC8],
+  ["83EA",0xAEC9],
+  ["83EB",0xAECA],
+  ["83EC",0xAECB],
+  ["83ED",0xAECE],
+  ["83EE",0xAED2],
+  ["83EF",0xAED3],
+  ["83F0",0xAED4],
+  ["83F1",0xAED5],
+  ["83F2",0xAED6],
+  ["83F3",0xAED7],
+  ["83F4",0xAEDA],
+  ["83F5",0xAEDB],
+  ["83F6",0xAEDD],
+  ["83F7",0xAEDE],
+  ["83F8",0xAEDF],
+  ["83F9",0xAEE0],
+  ["83FA",0xAEE1],
+  ["83FB",0xAEE2],
+  ["83FC",0xAEE3],
+  ["83FD",0xAEE4],
+  ["83FE",0xAEE5],
+  ["8441",0xAEE6],
+  ["8442",0xAEE7],
+  ["8443",0xAEE9],
+  ["8444",0xAEEA],
+  ["8445",0xAEEC],
+  ["8446",0xAEEE],
+  ["8447",0xAEEF],
+  ["8448",0xAEF0],
+  ["8449",0xAEF1],
+  ["844A",0xAEF2],
+  ["844B",0xAEF3],
+  ["844C",0xAEF5],
+  ["844D",0xAEF6],
+  ["844E",0xAEF7],
+  ["844F",0xAEF9],
+  ["8450",0xAEFA],
+  ["8451",0xAEFB],
+  ["8452",0xAEFD],
+  ["8453",0xAEFE],
+  ["8454",0xAEFF],
+  ["8455",0xAF00],
+  ["8456",0xAF01],
+  ["8457",0xAF02],
+  ["8458",0xAF03],
+  ["8459",0xAF04],
+  ["845A",0xAF05],
+  ["8461",0xAF06],
+  ["8462",0xAF09],
+  ["8463",0xAF0A],
+  ["8464",0xAF0B],
+  ["8465",0xAF0C],
+  ["8466",0xAF0E],
+  ["8467",0xAF0F],
+  ["8468",0xAF11],
+  ["8469",0xAF12],
+  ["846A",0xAF13],
+  ["846B",0xAF14],
+  ["846C",0xAF15],
+  ["846D",0xAF16],
+  ["846E",0xAF17],
+  ["846F",0xAF18],
+  ["8470",0xAF19],
+  ["8471",0xAF1A],
+  ["8472",0xAF1B],
+  ["8473",0xAF1C],
+  ["8474",0xAF1D],
+  ["8475",0xAF1E],
+  ["8476",0xAF1F],
+  ["8477",0xAF20],
+  ["8478",0xAF21],
+  ["8479",0xAF22],
+  ["847A",0xAF23],
+  ["8481",0xAF24],
+  ["8482",0xAF25],
+  ["8483",0xAF26],
+  ["8484",0xAF27],
+  ["8485",0xAF28],
+  ["8486",0xAF29],
+  ["8487",0xAF2A],
+  ["8488",0xAF2B],
+  ["8489",0xAF2E],
+  ["848A",0xAF2F],
+  ["848B",0xAF31],
+  ["848C",0xAF33],
+  ["848D",0xAF35],
+  ["848E",0xAF36],
+  ["848F",0xAF37],
+  ["8490",0xAF38],
+  ["8491",0xAF39],
+  ["8492",0xAF3A],
+  ["8493",0xAF3B],
+  ["8494",0xAF3E],
+  ["8495",0xAF40],
+  ["8496",0xAF44],
+  ["8497",0xAF45],
+  ["8498",0xAF46],
+  ["8499",0xAF47],
+  ["849A",0xAF4A],
+  ["849B",0xAF4B],
+  ["849C",0xAF4C],
+  ["849D",0xAF4D],
+  ["849E",0xAF4E],
+  ["849F",0xAF4F],
+  ["84A0",0xAF51],
+  ["84A1",0xAF52],
+  ["84A2",0xAF53],
+  ["84A3",0xAF54],
+  ["84A4",0xAF55],
+  ["84A5",0xAF56],
+  ["84A6",0xAF57],
+  ["84A7",0xAF58],
+  ["84A8",0xAF59],
+  ["84A9",0xAF5A],
+  ["84AA",0xAF5B],
+  ["84AB",0xAF5E],
+  ["84AC",0xAF5F],
+  ["84AD",0xAF60],
+  ["84AE",0xAF61],
+  ["84AF",0xAF62],
+  ["84B0",0xAF63],
+  ["84B1",0xAF66],
+  ["84B2",0xAF67],
+  ["84B3",0xAF68],
+  ["84B4",0xAF69],
+  ["84B5",0xAF6A],
+  ["84B6",0xAF6B],
+  ["84B7",0xAF6C],
+  ["84B8",0xAF6D],
+  ["84B9",0xAF6E],
+  ["84BA",0xAF6F],
+  ["84BB",0xAF70],
+  ["84BC",0xAF71],
+  ["84BD",0xAF72],
+  ["84BE",0xAF73],
+  ["84BF",0xAF74],
+  ["84C0",0xAF75],
+  ["84C1",0xAF76],
+  ["84C2",0xAF77],
+  ["84C3",0xAF78],
+  ["84C4",0xAF7A],
+  ["84C5",0xAF7B],
+  ["84C6",0xAF7C],
+  ["84C7",0xAF7D],
+  ["84C8",0xAF7E],
+  ["84C9",0xAF7F],
+  ["84CA",0xAF81],
+  ["84CB",0xAF82],
+  ["84CC",0xAF83],
+  ["84CD",0xAF85],
+  ["84CE",0xAF86],
+  ["84CF",0xAF87],
+  ["84D0",0xAF89],
+  ["84D1",0xAF8A],
+  ["84D2",0xAF8B],
+  ["84D3",0xAF8C],
+  ["84D4",0xAF8D],
+  ["84D5",0xAF8E],
+  ["84D6",0xAF8F],
+  ["84D7",0xAF92],
+  ["84D8",0xAF93],
+  ["84D9",0xAF94],
+  ["84DA",0xAF96],
+  ["84DB",0xAF97],
+  ["84DC",0xAF98],
+  ["84DD",0xAF99],
+  ["84DE",0xAF9A],
+  ["84DF",0xAF9B],
+  ["84E0",0xAF9D],
+  ["84E1",0xAF9E],
+  ["84E2",0xAF9F],
+  ["84E3",0xAFA0],
+  ["84E4",0xAFA1],
+  ["84E5",0xAFA2],
+  ["84E6",0xAFA3],
+  ["84E7",0xAFA4],
+  ["84E8",0xAFA5],
+  ["84E9",0xAFA6],
+  ["84EA",0xAFA7],
+  ["84EB",0xAFA8],
+  ["84EC",0xAFA9],
+  ["84ED",0xAFAA],
+  ["84EE",0xAFAB],
+  ["84EF",0xAFAC],
+  ["84F0",0xAFAD],
+  ["84F1",0xAFAE],
+  ["84F2",0xAFAF],
+  ["84F3",0xAFB0],
+  ["84F4",0xAFB1],
+  ["84F5",0xAFB2],
+  ["84F6",0xAFB3],
+  ["84F7",0xAFB4],
+  ["84F8",0xAFB5],
+  ["84F9",0xAFB6],
+  ["84FA",0xAFB7],
+  ["84FB",0xAFBA],
+  ["84FC",0xAFBB],
+  ["84FD",0xAFBD],
+  ["84FE",0xAFBE],
+  ["8541",0xAFBF],
+  ["8542",0xAFC1],
+  ["8543",0xAFC2],
+  ["8544",0xAFC3],
+  ["8545",0xAFC4],
+  ["8546",0xAFC5],
+  ["8547",0xAFC6],
+  ["8548",0xAFCA],
+  ["8549",0xAFCC],
+  ["854A",0xAFCF],
+  ["854B",0xAFD0],
+  ["854C",0xAFD1],
+  ["854D",0xAFD2],
+  ["854E",0xAFD3],
+  ["854F",0xAFD5],
+  ["8550",0xAFD6],
+  ["8551",0xAFD7],
+  ["8552",0xAFD8],
+  ["8553",0xAFD9],
+  ["8554",0xAFDA],
+  ["8555",0xAFDB],
+  ["8556",0xAFDD],
+  ["8557",0xAFDE],
+  ["8558",0xAFDF],
+  ["8559",0xAFE0],
+  ["855A",0xAFE1],
+  ["8561",0xAFE2],
+  ["8562",0xAFE3],
+  ["8563",0xAFE4],
+  ["8564",0xAFE5],
+  ["8565",0xAFE6],
+  ["8566",0xAFE7],
+  ["8567",0xAFEA],
+  ["8568",0xAFEB],
+  ["8569",0xAFEC],
+  ["856A",0xAFED],
+  ["856B",0xAFEE],
+  ["856C",0xAFEF],
+  ["856D",0xAFF2],
+  ["856E",0xAFF3],
+  ["856F",0xAFF5],
+  ["8570",0xAFF6],
+  ["8571",0xAFF7],
+  ["8572",0xAFF9],
+  ["8573",0xAFFA],
+  ["8574",0xAFFB],
+  ["8575",0xAFFC],
+  ["8576",0xAFFD],
+  ["8577",0xAFFE],
+  ["8578",0xAFFF],
+  ["8579",0xB002],
+  ["857A",0xB003],
+  ["8581",0xB005],
+  ["8582",0xB006],
+  ["8583",0xB007],
+  ["8584",0xB008],
+  ["8585",0xB009],
+  ["8586",0xB00A],
+  ["8587",0xB00B],
+  ["8588",0xB00D],
+  ["8589",0xB00E],
+  ["858A",0xB00F],
+  ["858B",0xB011],
+  ["858C",0xB012],
+  ["858D",0xB013],
+  ["858E",0xB015],
+  ["858F",0xB016],
+  ["8590",0xB017],
+  ["8591",0xB018],
+  ["8592",0xB019],
+  ["8593",0xB01A],
+  ["8594",0xB01B],
+  ["8595",0xB01E],
+  ["8596",0xB01F],
+  ["8597",0xB020],
+  ["8598",0xB021],
+  ["8599",0xB022],
+  ["859A",0xB023],
+  ["859B",0xB024],
+  ["859C",0xB025],
+  ["859D",0xB026],
+  ["859E",0xB027],
+  ["859F",0xB029],
+  ["85A0",0xB02A],
+  ["85A1",0xB02B],
+  ["85A2",0xB02C],
+  ["85A3",0xB02D],
+  ["85A4",0xB02E],
+  ["85A5",0xB02F],
+  ["85A6",0xB030],
+  ["85A7",0xB031],
+  ["85A8",0xB032],
+  ["85A9",0xB033],
+  ["85AA",0xB034],
+  ["85AB",0xB035],
+  ["85AC",0xB036],
+  ["85AD",0xB037],
+  ["85AE",0xB038],
+  ["85AF",0xB039],
+  ["85B0",0xB03A],
+  ["85B1",0xB03B],
+  ["85B2",0xB03C],
+  ["85B3",0xB03D],
+  ["85B4",0xB03E],
+  ["85B5",0xB03F],
+  ["85B6",0xB040],
+  ["85B7",0xB041],
+  ["85B8",0xB042],
+  ["85B9",0xB043],
+  ["85BA",0xB046],
+  ["85BB",0xB047],
+  ["85BC",0xB049],
+  ["85BD",0xB04B],
+  ["85BE",0xB04D],
+  ["85BF",0xB04F],
+  ["85C0",0xB050],
+  ["85C1",0xB051],
+  ["85C2",0xB052],
+  ["85C3",0xB056],
+  ["85C4",0xB058],
+  ["85C5",0xB05A],
+  ["85C6",0xB05B],
+  ["85C7",0xB05C],
+  ["85C8",0xB05E],
+  ["85C9",0xB05F],
+  ["85CA",0xB060],
+  ["85CB",0xB061],
+  ["85CC",0xB062],
+  ["85CD",0xB063],
+  ["85CE",0xB064],
+  ["85CF",0xB065],
+  ["85D0",0xB066],
+  ["85D1",0xB067],
+  ["85D2",0xB068],
+  ["85D3",0xB069],
+  ["85D4",0xB06A],
+  ["85D5",0xB06B],
+  ["85D6",0xB06C],
+  ["85D7",0xB06D],
+  ["85D8",0xB06E],
+  ["85D9",0xB06F],
+  ["85DA",0xB070],
+  ["85DB",0xB071],
+  ["85DC",0xB072],
+  ["85DD",0xB073],
+  ["85DE",0xB074],
+  ["85DF",0xB075],
+  ["85E0",0xB076],
+  ["85E1",0xB077],
+  ["85E2",0xB078],
+  ["85E3",0xB079],
+  ["85E4",0xB07A],
+  ["85E5",0xB07B],
+  ["85E6",0xB07E],
+  ["85E7",0xB07F],
+  ["85E8",0xB081],
+  ["85E9",0xB082],
+  ["85EA",0xB083],
+  ["85EB",0xB085],
+  ["85EC",0xB086],
+  ["85ED",0xB087],
+  ["85EE",0xB088],
+  ["85EF",0xB089],
+  ["85F0",0xB08A],
+  ["85F1",0xB08B],
+  ["85F2",0xB08E],
+  ["85F3",0xB090],
+  ["85F4",0xB092],
+  ["85F5",0xB093],
+  ["85F6",0xB094],
+  ["85F7",0xB095],
+  ["85F8",0xB096],
+  ["85F9",0xB097],
+  ["85FA",0xB09B],
+  ["85FB",0xB09D],
+  ["85FC",0xB09E],
+  ["85FD",0xB0A3],
+  ["85FE",0xB0A4],
+  ["8641",0xB0A5],
+  ["8642",0xB0A6],
+  ["8643",0xB0A7],
+  ["8644",0xB0AA],
+  ["8645",0xB0B0],
+  ["8646",0xB0B2],
+  ["8647",0xB0B6],
+  ["8648",0xB0B7],
+  ["8649",0xB0B9],
+  ["864A",0xB0BA],
+  ["864B",0xB0BB],
+  ["864C",0xB0BD],
+  ["864D",0xB0BE],
+  ["864E",0xB0BF],
+  ["864F",0xB0C0],
+  ["8650",0xB0C1],
+  ["8651",0xB0C2],
+  ["8652",0xB0C3],
+  ["8653",0xB0C6],
+  ["8654",0xB0CA],
+  ["8655",0xB0CB],
+  ["8656",0xB0CC],
+  ["8657",0xB0CD],
+  ["8658",0xB0CE],
+  ["8659",0xB0CF],
+  ["865A",0xB0D2],
+  ["8661",0xB0D3],
+  ["8662",0xB0D5],
+  ["8663",0xB0D6],
+  ["8664",0xB0D7],
+  ["8665",0xB0D9],
+  ["8666",0xB0DA],
+  ["8667",0xB0DB],
+  ["8668",0xB0DC],
+  ["8669",0xB0DD],
+  ["866A",0xB0DE],
+  ["866B",0xB0DF],
+  ["866C",0xB0E1],
+  ["866D",0xB0E2],
+  ["866E",0xB0E3],
+  ["866F",0xB0E4],
+  ["8670",0xB0E6],
+  ["8671",0xB0E7],
+  ["8672",0xB0E8],
+  ["8673",0xB0E9],
+  ["8674",0xB0EA],
+  ["8675",0xB0EB],
+  ["8676",0xB0EC],
+  ["8677",0xB0ED],
+  ["8678",0xB0EE],
+  ["8679",0xB0EF],
+  ["867A",0xB0F0],
+  ["8681",0xB0F1],
+  ["8682",0xB0F2],
+  ["8683",0xB0F3],
+  ["8684",0xB0F4],
+  ["8685",0xB0F5],
+  ["8686",0xB0F6],
+  ["8687",0xB0F7],
+  ["8688",0xB0F8],
+  ["8689",0xB0F9],
+  ["868A",0xB0FA],
+  ["868B",0xB0FB],
+  ["868C",0xB0FC],
+  ["868D",0xB0FD],
+  ["868E",0xB0FE],
+  ["868F",0xB0FF],
+  ["8690",0xB100],
+  ["8691",0xB101],
+  ["8692",0xB102],
+  ["8693",0xB103],
+  ["8694",0xB104],
+  ["8695",0xB105],
+  ["8696",0xB106],
+  ["8697",0xB107],
+  ["8698",0xB10A],
+  ["8699",0xB10D],
+  ["869A",0xB10E],
+  ["869B",0xB10F],
+  ["869C",0xB111],
+  ["869D",0xB114],
+  ["869E",0xB115],
+  ["869F",0xB116],
+  ["86A0",0xB117],
+  ["86A1",0xB11A],
+  ["86A2",0xB11E],
+  ["86A3",0xB11F],
+  ["86A4",0xB120],
+  ["86A5",0xB121],
+  ["86A6",0xB122],
+  ["86A7",0xB126],
+  ["86A8",0xB127],
+  ["86A9",0xB129],
+  ["86AA",0xB12A],
+  ["86AB",0xB12B],
+  ["86AC",0xB12D],
+  ["86AD",0xB12E],
+  ["86AE",0xB12F],
+  ["86AF",0xB130],
+  ["86B0",0xB131],
+  ["86B1",0xB132],
+  ["86B2",0xB133],
+  ["86B3",0xB136],
+  ["86B4",0xB13A],
+  ["86B5",0xB13B],
+  ["86B6",0xB13C],
+  ["86B7",0xB13D],
+  ["86B8",0xB13E],
+  ["86B9",0xB13F],
+  ["86BA",0xB142],
+  ["86BB",0xB143],
+  ["86BC",0xB145],
+  ["86BD",0xB146],
+  ["86BE",0xB147],
+  ["86BF",0xB149],
+  ["86C0",0xB14A],
+  ["86C1",0xB14B],
+  ["86C2",0xB14C],
+  ["86C3",0xB14D],
+  ["86C4",0xB14E],
+  ["86C5",0xB14F],
+  ["86C6",0xB152],
+  ["86C7",0xB153],
+  ["86C8",0xB156],
+  ["86C9",0xB157],
+  ["86CA",0xB159],
+  ["86CB",0xB15A],
+  ["86CC",0xB15B],
+  ["86CD",0xB15D],
+  ["86CE",0xB15E],
+  ["86CF",0xB15F],
+  ["86D0",0xB161],
+  ["86D1",0xB162],
+  ["86D2",0xB163],
+  ["86D3",0xB164],
+  ["86D4",0xB165],
+  ["86D5",0xB166],
+  ["86D6",0xB167],
+  ["86D7",0xB168],
+  ["86D8",0xB169],
+  ["86D9",0xB16A],
+  ["86DA",0xB16B],
+  ["86DB",0xB16C],
+  ["86DC",0xB16D],
+  ["86DD",0xB16E],
+  ["86DE",0xB16F],
+  ["86DF",0xB170],
+  ["86E0",0xB171],
+  ["86E1",0xB172],
+  ["86E2",0xB173],
+  ["86E3",0xB174],
+  ["86E4",0xB175],
+  ["86E5",0xB176],
+  ["86E6",0xB177],
+  ["86E7",0xB17A],
+  ["86E8",0xB17B],
+  ["86E9",0xB17D],
+  ["86EA",0xB17E],
+  ["86EB",0xB17F],
+  ["86EC",0xB181],
+  ["86ED",0xB183],
+  ["86EE",0xB184],
+  ["86EF",0xB185],
+  ["86F0",0xB186],
+  ["86F1",0xB187],
+  ["86F2",0xB18A],
+  ["86F3",0xB18C],
+  ["86F4",0xB18E],
+  ["86F5",0xB18F],
+  ["86F6",0xB190],
+  ["86F7",0xB191],
+  ["86F8",0xB195],
+  ["86F9",0xB196],
+  ["86FA",0xB197],
+  ["86FB",0xB199],
+  ["86FC",0xB19A],
+  ["86FD",0xB19B],
+  ["86FE",0xB19D],
+  ["8741",0xB19E],
+  ["8742",0xB19F],
+  ["8743",0xB1A0],
+  ["8744",0xB1A1],
+  ["8745",0xB1A2],
+  ["8746",0xB1A3],
+  ["8747",0xB1A4],
+  ["8748",0xB1A5],
+  ["8749",0xB1A6],
+  ["874A",0xB1A7],
+  ["874B",0xB1A9],
+  ["874C",0xB1AA],
+  ["874D",0xB1AB],
+  ["874E",0xB1AC],
+  ["874F",0xB1AD],
+  ["8750",0xB1AE],
+  ["8751",0xB1AF],
+  ["8752",0xB1B0],
+  ["8753",0xB1B1],
+  ["8754",0xB1B2],
+  ["8755",0xB1B3],
+  ["8756",0xB1B4],
+  ["8757",0xB1B5],
+  ["8758",0xB1B6],
+  ["8759",0xB1B7],
+  ["875A",0xB1B8],
+  ["8761",0xB1B9],
+  ["8762",0xB1BA],
+  ["8763",0xB1BB],
+  ["8764",0xB1BC],
+  ["8765",0xB1BD],
+  ["8766",0xB1BE],
+  ["8767",0xB1BF],
+  ["8768",0xB1C0],
+  ["8769",0xB1C1],
+  ["876A",0xB1C2],
+  ["876B",0xB1C3],
+  ["876C",0xB1C4],
+  ["876D",0xB1C5],
+  ["876E",0xB1C6],
+  ["876F",0xB1C7],
+  ["8770",0xB1C8],
+  ["8771",0xB1C9],
+  ["8772",0xB1CA],
+  ["8773",0xB1CB],
+  ["8774",0xB1CD],
+  ["8775",0xB1CE],
+  ["8776",0xB1CF],
+  ["8777",0xB1D1],
+  ["8778",0xB1D2],
+  ["8779",0xB1D3],
+  ["877A",0xB1D5],
+  ["8781",0xB1D6],
+  ["8782",0xB1D7],
+  ["8783",0xB1D8],
+  ["8784",0xB1D9],
+  ["8785",0xB1DA],
+  ["8786",0xB1DB],
+  ["8787",0xB1DE],
+  ["8788",0xB1E0],
+  ["8789",0xB1E1],
+  ["878A",0xB1E2],
+  ["878B",0xB1E3],
+  ["878C",0xB1E4],
+  ["878D",0xB1E5],
+  ["878E",0xB1E6],
+  ["878F",0xB1E7],
+  ["8790",0xB1EA],
+  ["8791",0xB1EB],
+  ["8792",0xB1ED],
+  ["8793",0xB1EE],
+  ["8794",0xB1EF],
+  ["8795",0xB1F1],
+  ["8796",0xB1F2],
+  ["8797",0xB1F3],
+  ["8798",0xB1F4],
+  ["8799",0xB1F5],
+  ["879A",0xB1F6],
+  ["879B",0xB1F7],
+  ["879C",0xB1F8],
+  ["879D",0xB1FA],
+  ["879E",0xB1FC],
+  ["879F",0xB1FE],
+  ["87A0",0xB1FF],
+  ["87A1",0xB200],
+  ["87A2",0xB201],
+  ["87A3",0xB202],
+  ["87A4",0xB203],
+  ["87A5",0xB206],
+  ["87A6",0xB207],
+  ["87A7",0xB209],
+  ["87A8",0xB20A],
+  ["87A9",0xB20D],
+  ["87AA",0xB20E],
+  ["87AB",0xB20F],
+  ["87AC",0xB210],
+  ["87AD",0xB211],
+  ["87AE",0xB212],
+  ["87AF",0xB213],
+  ["87B0",0xB216],
+  ["87B1",0xB218],
+  ["87B2",0xB21A],
+  ["87B3",0xB21B],
+  ["87B4",0xB21C],
+  ["87B5",0xB21D],
+  ["87B6",0xB21E],
+  ["87B7",0xB21F],
+  ["87B8",0xB221],
+  ["87B9",0xB222],
+  ["87BA",0xB223],
+  ["87BB",0xB224],
+  ["87BC",0xB225],
+  ["87BD",0xB226],
+  ["87BE",0xB227],
+  ["87BF",0xB228],
+  ["87C0",0xB229],
+  ["87C1",0xB22A],
+  ["87C2",0xB22B],
+  ["87C3",0xB22C],
+  ["87C4",0xB22D],
+  ["87C5",0xB22E],
+  ["87C6",0xB22F],
+  ["87C7",0xB230],
+  ["87C8",0xB231],
+  ["87C9",0xB232],
+  ["87CA",0xB233],
+  ["87CB",0xB235],
+  ["87CC",0xB236],
+  ["87CD",0xB237],
+  ["87CE",0xB238],
+  ["87CF",0xB239],
+  ["87D0",0xB23A],
+  ["87D1",0xB23B],
+  ["87D2",0xB23D],
+  ["87D3",0xB23E],
+  ["87D4",0xB23F],
+  ["87D5",0xB240],
+  ["87D6",0xB241],
+  ["87D7",0xB242],
+  ["87D8",0xB243],
+  ["87D9",0xB244],
+  ["87DA",0xB245],
+  ["87DB",0xB246],
+  ["87DC",0xB247],
+  ["87DD",0xB248],
+  ["87DE",0xB249],
+  ["87DF",0xB24A],
+  ["87E0",0xB24B],
+  ["87E1",0xB24C],
+  ["87E2",0xB24D],
+  ["87E3",0xB24E],
+  ["87E4",0xB24F],
+  ["87E5",0xB250],
+  ["87E6",0xB251],
+  ["87E7",0xB252],
+  ["87E8",0xB253],
+  ["87E9",0xB254],
+  ["87EA",0xB255],
+  ["87EB",0xB256],
+  ["87EC",0xB257],
+  ["87ED",0xB259],
+  ["87EE",0xB25A],
+  ["87EF",0xB25B],
+  ["87F0",0xB25D],
+  ["87F1",0xB25E],
+  ["87F2",0xB25F],
+  ["87F3",0xB261],
+  ["87F4",0xB262],
+  ["87F5",0xB263],
+  ["87F6",0xB264],
+  ["87F7",0xB265],
+  ["87F8",0xB266],
+  ["87F9",0xB267],
+  ["87FA",0xB26A],
+  ["87FB",0xB26B],
+  ["87FC",0xB26C],
+  ["87FD",0xB26D],
+  ["87FE",0xB26E],
+  ["8841",0xB26F],
+  ["8842",0xB270],
+  ["8843",0xB271],
+  ["8844",0xB272],
+  ["8845",0xB273],
+  ["8846",0xB276],
+  ["8847",0xB277],
+  ["8848",0xB278],
+  ["8849",0xB279],
+  ["884A",0xB27A],
+  ["884B",0xB27B],
+  ["884C",0xB27D],
+  ["884D",0xB27E],
+  ["884E",0xB27F],
+  ["884F",0xB280],
+  ["8850",0xB281],
+  ["8851",0xB282],
+  ["8852",0xB283],
+  ["8853",0xB286],
+  ["8854",0xB287],
+  ["8855",0xB288],
+  ["8856",0xB28A],
+  ["8857",0xB28B],
+  ["8858",0xB28C],
+  ["8859",0xB28D],
+  ["885A",0xB28E],
+  ["8861",0xB28F],
+  ["8862",0xB292],
+  ["8863",0xB293],
+  ["8864",0xB295],
+  ["8865",0xB296],
+  ["8866",0xB297],
+  ["8867",0xB29B],
+  ["8868",0xB29C],
+  ["8869",0xB29D],
+  ["886A",0xB29E],
+  ["886B",0xB29F],
+  ["886C",0xB2A2],
+  ["886D",0xB2A4],
+  ["886E",0xB2A7],
+  ["886F",0xB2A8],
+  ["8870",0xB2A9],
+  ["8871",0xB2AB],
+  ["8872",0xB2AD],
+  ["8873",0xB2AE],
+  ["8874",0xB2AF],
+  ["8875",0xB2B1],
+  ["8876",0xB2B2],
+  ["8877",0xB2B3],
+  ["8878",0xB2B5],
+  ["8879",0xB2B6],
+  ["887A",0xB2B7],
+  ["8881",0xB2B8],
+  ["8882",0xB2B9],
+  ["8883",0xB2BA],
+  ["8884",0xB2BB],
+  ["8885",0xB2BC],
+  ["8886",0xB2BD],
+  ["8887",0xB2BE],
+  ["8888",0xB2BF],
+  ["8889",0xB2C0],
+  ["888A",0xB2C1],
+  ["888B",0xB2C2],
+  ["888C",0xB2C3],
+  ["888D",0xB2C4],
+  ["888E",0xB2C5],
+  ["888F",0xB2C6],
+  ["8890",0xB2C7],
+  ["8891",0xB2CA],
+  ["8892",0xB2CB],
+  ["8893",0xB2CD],
+  ["8894",0xB2CE],
+  ["8895",0xB2CF],
+  ["8896",0xB2D1],
+  ["8897",0xB2D3],
+  ["8898",0xB2D4],
+  ["8899",0xB2D5],
+  ["889A",0xB2D6],
+  ["889B",0xB2D7],
+  ["889C",0xB2DA],
+  ["889D",0xB2DC],
+  ["889E",0xB2DE],
+  ["889F",0xB2DF],
+  ["88A0",0xB2E0],
+  ["88A1",0xB2E1],
+  ["88A2",0xB2E3],
+  ["88A3",0xB2E7],
+  ["88A4",0xB2E9],
+  ["88A5",0xB2EA],
+  ["88A6",0xB2F0],
+  ["88A7",0xB2F1],
+  ["88A8",0xB2F2],
+  ["88A9",0xB2F6],
+  ["88AA",0xB2FC],
+  ["88AB",0xB2FD],
+  ["88AC",0xB2FE],
+  ["88AD",0xB302],
+  ["88AE",0xB303],
+  ["88AF",0xB305],
+  ["88B0",0xB306],
+  ["88B1",0xB307],
+  ["88B2",0xB309],
+  ["88B3",0xB30A],
+  ["88B4",0xB30B],
+  ["88B5",0xB30C],
+  ["88B6",0xB30D],
+  ["88B7",0xB30E],
+  ["88B8",0xB30F],
+  ["88B9",0xB312],
+  ["88BA",0xB316],
+  ["88BB",0xB317],
+  ["88BC",0xB318],
+  ["88BD",0xB319],
+  ["88BE",0xB31A],
+  ["88BF",0xB31B],
+  ["88C0",0xB31D],
+  ["88C1",0xB31E],
+  ["88C2",0xB31F],
+  ["88C3",0xB320],
+  ["88C4",0xB321],
+  ["88C5",0xB322],
+  ["88C6",0xB323],
+  ["88C7",0xB324],
+  ["88C8",0xB325],
+  ["88C9",0xB326],
+  ["88CA",0xB327],
+  ["88CB",0xB328],
+  ["88CC",0xB329],
+  ["88CD",0xB32A],
+  ["88CE",0xB32B],
+  ["88CF",0xB32C],
+  ["88D0",0xB32D],
+  ["88D1",0xB32E],
+  ["88D2",0xB32F],
+  ["88D3",0xB330],
+  ["88D4",0xB331],
+  ["88D5",0xB332],
+  ["88D6",0xB333],
+  ["88D7",0xB334],
+  ["88D8",0xB335],
+  ["88D9",0xB336],
+  ["88DA",0xB337],
+  ["88DB",0xB338],
+  ["88DC",0xB339],
+  ["88DD",0xB33A],
+  ["88DE",0xB33B],
+  ["88DF",0xB33C],
+  ["88E0",0xB33D],
+  ["88E1",0xB33E],
+  ["88E2",0xB33F],
+  ["88E3",0xB340],
+  ["88E4",0xB341],
+  ["88E5",0xB342],
+  ["88E6",0xB343],
+  ["88E7",0xB344],
+  ["88E8",0xB345],
+  ["88E9",0xB346],
+  ["88EA",0xB347],
+  ["88EB",0xB348],
+  ["88EC",0xB349],
+  ["88ED",0xB34A],
+  ["88EE",0xB34B],
+  ["88EF",0xB34C],
+  ["88F0",0xB34D],
+  ["88F1",0xB34E],
+  ["88F2",0xB34F],
+  ["88F3",0xB350],
+  ["88F4",0xB351],
+  ["88F5",0xB352],
+  ["88F6",0xB353],
+  ["88F7",0xB357],
+  ["88F8",0xB359],
+  ["88F9",0xB35A],
+  ["88FA",0xB35D],
+  ["88FB",0xB360],
+  ["88FC",0xB361],
+  ["88FD",0xB362],
+  ["88FE",0xB363],
+  ["8941",0xB366],
+  ["8942",0xB368],
+  ["8943",0xB36A],
+  ["8944",0xB36C],
+  ["8945",0xB36D],
+  ["8946",0xB36F],
+  ["8947",0xB372],
+  ["8948",0xB373],
+  ["8949",0xB375],
+  ["894A",0xB376],
+  ["894B",0xB377],
+  ["894C",0xB379],
+  ["894D",0xB37A],
+  ["894E",0xB37B],
+  ["894F",0xB37C],
+  ["8950",0xB37D],
+  ["8951",0xB37E],
+  ["8952",0xB37F],
+  ["8953",0xB382],
+  ["8954",0xB386],
+  ["8955",0xB387],
+  ["8956",0xB388],
+  ["8957",0xB389],
+  ["8958",0xB38A],
+  ["8959",0xB38B],
+  ["895A",0xB38D],
+  ["8961",0xB38E],
+  ["8962",0xB38F],
+  ["8963",0xB391],
+  ["8964",0xB392],
+  ["8965",0xB393],
+  ["8966",0xB395],
+  ["8967",0xB396],
+  ["8968",0xB397],
+  ["8969",0xB398],
+  ["896A",0xB399],
+  ["896B",0xB39A],
+  ["896C",0xB39B],
+  ["896D",0xB39C],
+  ["896E",0xB39D],
+  ["896F",0xB39E],
+  ["8970",0xB39F],
+  ["8971",0xB3A2],
+  ["8972",0xB3A3],
+  ["8973",0xB3A4],
+  ["8974",0xB3A5],
+  ["8975",0xB3A6],
+  ["8976",0xB3A7],
+  ["8977",0xB3A9],
+  ["8978",0xB3AA],
+  ["8979",0xB3AB],
+  ["897A",0xB3AD],
+  ["8981",0xB3AE],
+  ["8982",0xB3AF],
+  ["8983",0xB3B0],
+  ["8984",0xB3B1],
+  ["8985",0xB3B2],
+  ["8986",0xB3B3],
+  ["8987",0xB3B4],
+  ["8988",0xB3B5],
+  ["8989",0xB3B6],
+  ["898A",0xB3B7],
+  ["898B",0xB3B8],
+  ["898C",0xB3B9],
+  ["898D",0xB3BA],
+  ["898E",0xB3BB],
+  ["898F",0xB3BC],
+  ["8990",0xB3BD],
+  ["8991",0xB3BE],
+  ["8992",0xB3BF],
+  ["8993",0xB3C0],
+  ["8994",0xB3C1],
+  ["8995",0xB3C2],
+  ["8996",0xB3C3],
+  ["8997",0xB3C6],
+  ["8998",0xB3C7],
+  ["8999",0xB3C9],
+  ["899A",0xB3CA],
+  ["899B",0xB3CD],
+  ["899C",0xB3CF],
+  ["899D",0xB3D1],
+  ["899E",0xB3D2],
+  ["899F",0xB3D3],
+  ["89A0",0xB3D6],
+  ["89A1",0xB3D8],
+  ["89A2",0xB3DA],
+  ["89A3",0xB3DC],
+  ["89A4",0xB3DE],
+  ["89A5",0xB3DF],
+  ["89A6",0xB3E1],
+  ["89A7",0xB3E2],
+  ["89A8",0xB3E3],
+  ["89A9",0xB3E5],
+  ["89AA",0xB3E6],
+  ["89AB",0xB3E7],
+  ["89AC",0xB3E9],
+  ["89AD",0xB3EA],
+  ["89AE",0xB3EB],
+  ["89AF",0xB3EC],
+  ["89B0",0xB3ED],
+  ["89B1",0xB3EE],
+  ["89B2",0xB3EF],
+  ["89B3",0xB3F0],
+  ["89B4",0xB3F1],
+  ["89B5",0xB3F2],
+  ["89B6",0xB3F3],
+  ["89B7",0xB3F4],
+  ["89B8",0xB3F5],
+  ["89B9",0xB3F6],
+  ["89BA",0xB3F7],
+  ["89BB",0xB3F8],
+  ["89BC",0xB3F9],
+  ["89BD",0xB3FA],
+  ["89BE",0xB3FB],
+  ["89BF",0xB3FD],
+  ["89C0",0xB3FE],
+  ["89C1",0xB3FF],
+  ["89C2",0xB400],
+  ["89C3",0xB401],
+  ["89C4",0xB402],
+  ["89C5",0xB403],
+  ["89C6",0xB404],
+  ["89C7",0xB405],
+  ["89C8",0xB406],
+  ["89C9",0xB407],
+  ["89CA",0xB408],
+  ["89CB",0xB409],
+  ["89CC",0xB40A],
+  ["89CD",0xB40B],
+  ["89CE",0xB40C],
+  ["89CF",0xB40D],
+  ["89D0",0xB40E],
+  ["89D1",0xB40F],
+  ["89D2",0xB411],
+  ["89D3",0xB412],
+  ["89D4",0xB413],
+  ["89D5",0xB414],
+  ["89D6",0xB415],
+  ["89D7",0xB416],
+  ["89D8",0xB417],
+  ["89D9",0xB419],
+  ["89DA",0xB41A],
+  ["89DB",0xB41B],
+  ["89DC",0xB41D],
+  ["89DD",0xB41E],
+  ["89DE",0xB41F],
+  ["89DF",0xB421],
+  ["89E0",0xB422],
+  ["89E1",0xB423],
+  ["89E2",0xB424],
+  ["89E3",0xB425],
+  ["89E4",0xB426],
+  ["89E5",0xB427],
+  ["89E6",0xB42A],
+  ["89E7",0xB42C],
+  ["89E8",0xB42D],
+  ["89E9",0xB42E],
+  ["89EA",0xB42F],
+  ["89EB",0xB430],
+  ["89EC",0xB431],
+  ["89ED",0xB432],
+  ["89EE",0xB433],
+  ["89EF",0xB435],
+  ["89F0",0xB436],
+  ["89F1",0xB437],
+  ["89F2",0xB438],
+  ["89F3",0xB439],
+  ["89F4",0xB43A],
+  ["89F5",0xB43B],
+  ["89F6",0xB43C],
+  ["89F7",0xB43D],
+  ["89F8",0xB43E],
+  ["89F9",0xB43F],
+  ["89FA",0xB440],
+  ["89FB",0xB441],
+  ["89FC",0xB442],
+  ["89FD",0xB443],
+  ["89FE",0xB444],
+  ["8A41",0xB445],
+  ["8A42",0xB446],
+  ["8A43",0xB447],
+  ["8A44",0xB448],
+  ["8A45",0xB449],
+  ["8A46",0xB44A],
+  ["8A47",0xB44B],
+  ["8A48",0xB44C],
+  ["8A49",0xB44D],
+  ["8A4A",0xB44E],
+  ["8A4B",0xB44F],
+  ["8A4C",0xB452],
+  ["8A4D",0xB453],
+  ["8A4E",0xB455],
+  ["8A4F",0xB456],
+  ["8A50",0xB457],
+  ["8A51",0xB459],
+  ["8A52",0xB45A],
+  ["8A53",0xB45B],
+  ["8A54",0xB45C],
+  ["8A55",0xB45D],
+  ["8A56",0xB45E],
+  ["8A57",0xB45F],
+  ["8A58",0xB462],
+  ["8A59",0xB464],
+  ["8A5A",0xB466],
+  ["8A61",0xB467],
+  ["8A62",0xB468],
+  ["8A63",0xB469],
+  ["8A64",0xB46A],
+  ["8A65",0xB46B],
+  ["8A66",0xB46D],
+  ["8A67",0xB46E],
+  ["8A68",0xB46F],
+  ["8A69",0xB470],
+  ["8A6A",0xB471],
+  ["8A6B",0xB472],
+  ["8A6C",0xB473],
+  ["8A6D",0xB474],
+  ["8A6E",0xB475],
+  ["8A6F",0xB476],
+  ["8A70",0xB477],
+  ["8A71",0xB478],
+  ["8A72",0xB479],
+  ["8A73",0xB47A],
+  ["8A74",0xB47B],
+  ["8A75",0xB47C],
+  ["8A76",0xB47D],
+  ["8A77",0xB47E],
+  ["8A78",0xB47F],
+  ["8A79",0xB481],
+  ["8A7A",0xB482],
+  ["8A81",0xB483],
+  ["8A82",0xB484],
+  ["8A83",0xB485],
+  ["8A84",0xB486],
+  ["8A85",0xB487],
+  ["8A86",0xB489],
+  ["8A87",0xB48A],
+  ["8A88",0xB48B],
+  ["8A89",0xB48C],
+  ["8A8A",0xB48D],
+  ["8A8B",0xB48E],
+  ["8A8C",0xB48F],
+  ["8A8D",0xB490],
+  ["8A8E",0xB491],
+  ["8A8F",0xB492],
+  ["8A90",0xB493],
+  ["8A91",0xB494],
+  ["8A92",0xB495],
+  ["8A93",0xB496],
+  ["8A94",0xB497],
+  ["8A95",0xB498],
+  ["8A96",0xB499],
+  ["8A97",0xB49A],
+  ["8A98",0xB49B],
+  ["8A99",0xB49C],
+  ["8A9A",0xB49E],
+  ["8A9B",0xB49F],
+  ["8A9C",0xB4A0],
+  ["8A9D",0xB4A1],
+  ["8A9E",0xB4A2],
+  ["8A9F",0xB4A3],
+  ["8AA0",0xB4A5],
+  ["8AA1",0xB4A6],
+  ["8AA2",0xB4A7],
+  ["8AA3",0xB4A9],
+  ["8AA4",0xB4AA],
+  ["8AA5",0xB4AB],
+  ["8AA6",0xB4AD],
+  ["8AA7",0xB4AE],
+  ["8AA8",0xB4AF],
+  ["8AA9",0xB4B0],
+  ["8AAA",0xB4B1],
+  ["8AAB",0xB4B2],
+  ["8AAC",0xB4B3],
+  ["8AAD",0xB4B4],
+  ["8AAE",0xB4B6],
+  ["8AAF",0xB4B8],
+  ["8AB0",0xB4BA],
+  ["8AB1",0xB4BB],
+  ["8AB2",0xB4BC],
+  ["8AB3",0xB4BD],
+  ["8AB4",0xB4BE],
+  ["8AB5",0xB4BF],
+  ["8AB6",0xB4C1],
+  ["8AB7",0xB4C2],
+  ["8AB8",0xB4C3],
+  ["8AB9",0xB4C5],
+  ["8ABA",0xB4C6],
+  ["8ABB",0xB4C7],
+  ["8ABC",0xB4C9],
+  ["8ABD",0xB4CA],
+  ["8ABE",0xB4CB],
+  ["8ABF",0xB4CC],
+  ["8AC0",0xB4CD],
+  ["8AC1",0xB4CE],
+  ["8AC2",0xB4CF],
+  ["8AC3",0xB4D1],
+  ["8AC4",0xB4D2],
+  ["8AC5",0xB4D3],
+  ["8AC6",0xB4D4],
+  ["8AC7",0xB4D6],
+  ["8AC8",0xB4D7],
+  ["8AC9",0xB4D8],
+  ["8ACA",0xB4D9],
+  ["8ACB",0xB4DA],
+  ["8ACC",0xB4DB],
+  ["8ACD",0xB4DE],
+  ["8ACE",0xB4DF],
+  ["8ACF",0xB4E1],
+  ["8AD0",0xB4E2],
+  ["8AD1",0xB4E5],
+  ["8AD2",0xB4E7],
+  ["8AD3",0xB4E8],
+  ["8AD4",0xB4E9],
+  ["8AD5",0xB4EA],
+  ["8AD6",0xB4EB],
+  ["8AD7",0xB4EE],
+  ["8AD8",0xB4F0],
+  ["8AD9",0xB4F2],
+  ["8ADA",0xB4F3],
+  ["8ADB",0xB4F4],
+  ["8ADC",0xB4F5],
+  ["8ADD",0xB4F6],
+  ["8ADE",0xB4F7],
+  ["8ADF",0xB4F9],
+  ["8AE0",0xB4FA],
+  ["8AE1",0xB4FB],
+  ["8AE2",0xB4FC],
+  ["8AE3",0xB4FD],
+  ["8AE4",0xB4FE],
+  ["8AE5",0xB4FF],
+  ["8AE6",0xB500],
+  ["8AE7",0xB501],
+  ["8AE8",0xB502],
+  ["8AE9",0xB503],
+  ["8AEA",0xB504],
+  ["8AEB",0xB505],
+  ["8AEC",0xB506],
+  ["8AED",0xB507],
+  ["8AEE",0xB508],
+  ["8AEF",0xB509],
+  ["8AF0",0xB50A],
+  ["8AF1",0xB50B],
+  ["8AF2",0xB50C],
+  ["8AF3",0xB50D],
+  ["8AF4",0xB50E],
+  ["8AF5",0xB50F],
+  ["8AF6",0xB510],
+  ["8AF7",0xB511],
+  ["8AF8",0xB512],
+  ["8AF9",0xB513],
+  ["8AFA",0xB516],
+  ["8AFB",0xB517],
+  ["8AFC",0xB519],
+  ["8AFD",0xB51A],
+  ["8AFE",0xB51D],
+  ["8B41",0xB51E],
+  ["8B42",0xB51F],
+  ["8B43",0xB520],
+  ["8B44",0xB521],
+  ["8B45",0xB522],
+  ["8B46",0xB523],
+  ["8B47",0xB526],
+  ["8B48",0xB52B],
+  ["8B49",0xB52C],
+  ["8B4A",0xB52D],
+  ["8B4B",0xB52E],
+  ["8B4C",0xB52F],
+  ["8B4D",0xB532],
+  ["8B4E",0xB533],
+  ["8B4F",0xB535],
+  ["8B50",0xB536],
+  ["8B51",0xB537],
+  ["8B52",0xB539],
+  ["8B53",0xB53A],
+  ["8B54",0xB53B],
+  ["8B55",0xB53C],
+  ["8B56",0xB53D],
+  ["8B57",0xB53E],
+  ["8B58",0xB53F],
+  ["8B59",0xB542],
+  ["8B5A",0xB546],
+  ["8B61",0xB547],
+  ["8B62",0xB548],
+  ["8B63",0xB549],
+  ["8B64",0xB54A],
+  ["8B65",0xB54E],
+  ["8B66",0xB54F],
+  ["8B67",0xB551],
+  ["8B68",0xB552],
+  ["8B69",0xB553],
+  ["8B6A",0xB555],
+  ["8B6B",0xB556],
+  ["8B6C",0xB557],
+  ["8B6D",0xB558],
+  ["8B6E",0xB559],
+  ["8B6F",0xB55A],
+  ["8B70",0xB55B],
+  ["8B71",0xB55E],
+  ["8B72",0xB562],
+  ["8B73",0xB563],
+  ["8B74",0xB564],
+  ["8B75",0xB565],
+  ["8B76",0xB566],
+  ["8B77",0xB567],
+  ["8B78",0xB568],
+  ["8B79",0xB569],
+  ["8B7A",0xB56A],
+  ["8B81",0xB56B],
+  ["8B82",0xB56C],
+  ["8B83",0xB56D],
+  ["8B84",0xB56E],
+  ["8B85",0xB56F],
+  ["8B86",0xB570],
+  ["8B87",0xB571],
+  ["8B88",0xB572],
+  ["8B89",0xB573],
+  ["8B8A",0xB574],
+  ["8B8B",0xB575],
+  ["8B8C",0xB576],
+  ["8B8D",0xB577],
+  ["8B8E",0xB578],
+  ["8B8F",0xB579],
+  ["8B90",0xB57A],
+  ["8B91",0xB57B],
+  ["8B92",0xB57C],
+  ["8B93",0xB57D],
+  ["8B94",0xB57E],
+  ["8B95",0xB57F],
+  ["8B96",0xB580],
+  ["8B97",0xB581],
+  ["8B98",0xB582],
+  ["8B99",0xB583],
+  ["8B9A",0xB584],
+  ["8B9B",0xB585],
+  ["8B9C",0xB586],
+  ["8B9D",0xB587],
+  ["8B9E",0xB588],
+  ["8B9F",0xB589],
+  ["8BA0",0xB58A],
+  ["8BA1",0xB58B],
+  ["8BA2",0xB58C],
+  ["8BA3",0xB58D],
+  ["8BA4",0xB58E],
+  ["8BA5",0xB58F],
+  ["8BA6",0xB590],
+  ["8BA7",0xB591],
+  ["8BA8",0xB592],
+  ["8BA9",0xB593],
+  ["8BAA",0xB594],
+  ["8BAB",0xB595],
+  ["8BAC",0xB596],
+  ["8BAD",0xB597],
+  ["8BAE",0xB598],
+  ["8BAF",0xB599],
+  ["8BB0",0xB59A],
+  ["8BB1",0xB59B],
+  ["8BB2",0xB59C],
+  ["8BB3",0xB59D],
+  ["8BB4",0xB59E],
+  ["8BB5",0xB59F],
+  ["8BB6",0xB5A2],
+  ["8BB7",0xB5A3],
+  ["8BB8",0xB5A5],
+  ["8BB9",0xB5A6],
+  ["8BBA",0xB5A7],
+  ["8BBB",0xB5A9],
+  ["8BBC",0xB5AC],
+  ["8BBD",0xB5AD],
+  ["8BBE",0xB5AE],
+  ["8BBF",0xB5AF],
+  ["8BC0",0xB5B2],
+  ["8BC1",0xB5B6],
+  ["8BC2",0xB5B7],
+  ["8BC3",0xB5B8],
+  ["8BC4",0xB5B9],
+  ["8BC5",0xB5BA],
+  ["8BC6",0xB5BE],
+  ["8BC7",0xB5BF],
+  ["8BC8",0xB5C1],
+  ["8BC9",0xB5C2],
+  ["8BCA",0xB5C3],
+  ["8BCB",0xB5C5],
+  ["8BCC",0xB5C6],
+  ["8BCD",0xB5C7],
+  ["8BCE",0xB5C8],
+  ["8BCF",0xB5C9],
+  ["8BD0",0xB5CA],
+  ["8BD1",0xB5CB],
+  ["8BD2",0xB5CE],
+  ["8BD3",0xB5D2],
+  ["8BD4",0xB5D3],
+  ["8BD5",0xB5D4],
+  ["8BD6",0xB5D5],
+  ["8BD7",0xB5D6],
+  ["8BD8",0xB5D7],
+  ["8BD9",0xB5D9],
+  ["8BDA",0xB5DA],
+  ["8BDB",0xB5DB],
+  ["8BDC",0xB5DC],
+  ["8BDD",0xB5DD],
+  ["8BDE",0xB5DE],
+  ["8BDF",0xB5DF],
+  ["8BE0",0xB5E0],
+  ["8BE1",0xB5E1],
+  ["8BE2",0xB5E2],
+  ["8BE3",0xB5E3],
+  ["8BE4",0xB5E4],
+  ["8BE5",0xB5E5],
+  ["8BE6",0xB5E6],
+  ["8BE7",0xB5E7],
+  ["8BE8",0xB5E8],
+  ["8BE9",0xB5E9],
+  ["8BEA",0xB5EA],
+  ["8BEB",0xB5EB],
+  ["8BEC",0xB5ED],
+  ["8BED",0xB5EE],
+  ["8BEE",0xB5EF],
+  ["8BEF",0xB5F0],
+  ["8BF0",0xB5F1],
+  ["8BF1",0xB5F2],
+  ["8BF2",0xB5F3],
+  ["8BF3",0xB5F4],
+  ["8BF4",0xB5F5],
+  ["8BF5",0xB5F6],
+  ["8BF6",0xB5F7],
+  ["8BF7",0xB5F8],
+  ["8BF8",0xB5F9],
+  ["8BF9",0xB5FA],
+  ["8BFA",0xB5FB],
+  ["8BFB",0xB5FC],
+  ["8BFC",0xB5FD],
+  ["8BFD",0xB5FE],
+  ["8BFE",0xB5FF],
+  ["8C41",0xB600],
+  ["8C42",0xB601],
+  ["8C43",0xB602],
+  ["8C44",0xB603],
+  ["8C45",0xB604],
+  ["8C46",0xB605],
+  ["8C47",0xB606],
+  ["8C48",0xB607],
+  ["8C49",0xB608],
+  ["8C4A",0xB609],
+  ["8C4B",0xB60A],
+  ["8C4C",0xB60B],
+  ["8C4D",0xB60C],
+  ["8C4E",0xB60D],
+  ["8C4F",0xB60E],
+  ["8C50",0xB60F],
+  ["8C51",0xB612],
+  ["8C52",0xB613],
+  ["8C53",0xB615],
+  ["8C54",0xB616],
+  ["8C55",0xB617],
+  ["8C56",0xB619],
+  ["8C57",0xB61A],
+  ["8C58",0xB61B],
+  ["8C59",0xB61C],
+  ["8C5A",0xB61D],
+  ["8C61",0xB61E],
+  ["8C62",0xB61F],
+  ["8C63",0xB620],
+  ["8C64",0xB621],
+  ["8C65",0xB622],
+  ["8C66",0xB623],
+  ["8C67",0xB624],
+  ["8C68",0xB626],
+  ["8C69",0xB627],
+  ["8C6A",0xB628],
+  ["8C6B",0xB629],
+  ["8C6C",0xB62A],
+  ["8C6D",0xB62B],
+  ["8C6E",0xB62D],
+  ["8C6F",0xB62E],
+  ["8C70",0xB62F],
+  ["8C71",0xB630],
+  ["8C72",0xB631],
+  ["8C73",0xB632],
+  ["8C74",0xB633],
+  ["8C75",0xB635],
+  ["8C76",0xB636],
+  ["8C77",0xB637],
+  ["8C78",0xB638],
+  ["8C79",0xB639],
+  ["8C7A",0xB63A],
+  ["8C81",0xB63B],
+  ["8C82",0xB63C],
+  ["8C83",0xB63D],
+  ["8C84",0xB63E],
+  ["8C85",0xB63F],
+  ["8C86",0xB640],
+  ["8C87",0xB641],
+  ["8C88",0xB642],
+  ["8C89",0xB643],
+  ["8C8A",0xB644],
+  ["8C8B",0xB645],
+  ["8C8C",0xB646],
+  ["8C8D",0xB647],
+  ["8C8E",0xB649],
+  ["8C8F",0xB64A],
+  ["8C90",0xB64B],
+  ["8C91",0xB64C],
+  ["8C92",0xB64D],
+  ["8C93",0xB64E],
+  ["8C94",0xB64F],
+  ["8C95",0xB650],
+  ["8C96",0xB651],
+  ["8C97",0xB652],
+  ["8C98",0xB653],
+  ["8C99",0xB654],
+  ["8C9A",0xB655],
+  ["8C9B",0xB656],
+  ["8C9C",0xB657],
+  ["8C9D",0xB658],
+  ["8C9E",0xB659],
+  ["8C9F",0xB65A],
+  ["8CA0",0xB65B],
+  ["8CA1",0xB65C],
+  ["8CA2",0xB65D],
+  ["8CA3",0xB65E],
+  ["8CA4",0xB65F],
+  ["8CA5",0xB660],
+  ["8CA6",0xB661],
+  ["8CA7",0xB662],
+  ["8CA8",0xB663],
+  ["8CA9",0xB665],
+  ["8CAA",0xB666],
+  ["8CAB",0xB667],
+  ["8CAC",0xB669],
+  ["8CAD",0xB66A],
+  ["8CAE",0xB66B],
+  ["8CAF",0xB66C],
+  ["8CB0",0xB66D],
+  ["8CB1",0xB66E],
+  ["8CB2",0xB66F],
+  ["8CB3",0xB670],
+  ["8CB4",0xB671],
+  ["8CB5",0xB672],
+  ["8CB6",0xB673],
+  ["8CB7",0xB674],
+  ["8CB8",0xB675],
+  ["8CB9",0xB676],
+  ["8CBA",0xB677],
+  ["8CBB",0xB678],
+  ["8CBC",0xB679],
+  ["8CBD",0xB67A],
+  ["8CBE",0xB67B],
+  ["8CBF",0xB67C],
+  ["8CC0",0xB67D],
+  ["8CC1",0xB67E],
+  ["8CC2",0xB67F],
+  ["8CC3",0xB680],
+  ["8CC4",0xB681],
+  ["8CC5",0xB682],
+  ["8CC6",0xB683],
+  ["8CC7",0xB684],
+  ["8CC8",0xB685],
+  ["8CC9",0xB686],
+  ["8CCA",0xB687],
+  ["8CCB",0xB688],
+  ["8CCC",0xB689],
+  ["8CCD",0xB68A],
+  ["8CCE",0xB68B],
+  ["8CCF",0xB68C],
+  ["8CD0",0xB68D],
+  ["8CD1",0xB68E],
+  ["8CD2",0xB68F],
+  ["8CD3",0xB690],
+  ["8CD4",0xB691],
+  ["8CD5",0xB692],
+  ["8CD6",0xB693],
+  ["8CD7",0xB694],
+  ["8CD8",0xB695],
+  ["8CD9",0xB696],
+  ["8CDA",0xB697],
+  ["8CDB",0xB698],
+  ["8CDC",0xB699],
+  ["8CDD",0xB69A],
+  ["8CDE",0xB69B],
+  ["8CDF",0xB69E],
+  ["8CE0",0xB69F],
+  ["8CE1",0xB6A1],
+  ["8CE2",0xB6A2],
+  ["8CE3",0xB6A3],
+  ["8CE4",0xB6A5],
+  ["8CE5",0xB6A6],
+  ["8CE6",0xB6A7],
+  ["8CE7",0xB6A8],
+  ["8CE8",0xB6A9],
+  ["8CE9",0xB6AA],
+  ["8CEA",0xB6AD],
+  ["8CEB",0xB6AE],
+  ["8CEC",0xB6AF],
+  ["8CED",0xB6B0],
+  ["8CEE",0xB6B2],
+  ["8CEF",0xB6B3],
+  ["8CF0",0xB6B4],
+  ["8CF1",0xB6B5],
+  ["8CF2",0xB6B6],
+  ["8CF3",0xB6B7],
+  ["8CF4",0xB6B8],
+  ["8CF5",0xB6B9],
+  ["8CF6",0xB6BA],
+  ["8CF7",0xB6BB],
+  ["8CF8",0xB6BC],
+  ["8CF9",0xB6BD],
+  ["8CFA",0xB6BE],
+  ["8CFB",0xB6BF],
+  ["8CFC",0xB6C0],
+  ["8CFD",0xB6C1],
+  ["8CFE",0xB6C2],
+  ["8D41",0xB6C3],
+  ["8D42",0xB6C4],
+  ["8D43",0xB6C5],
+  ["8D44",0xB6C6],
+  ["8D45",0xB6C7],
+  ["8D46",0xB6C8],
+  ["8D47",0xB6C9],
+  ["8D48",0xB6CA],
+  ["8D49",0xB6CB],
+  ["8D4A",0xB6CC],
+  ["8D4B",0xB6CD],
+  ["8D4C",0xB6CE],
+  ["8D4D",0xB6CF],
+  ["8D4E",0xB6D0],
+  ["8D4F",0xB6D1],
+  ["8D50",0xB6D2],
+  ["8D51",0xB6D3],
+  ["8D52",0xB6D5],
+  ["8D53",0xB6D6],
+  ["8D54",0xB6D7],
+  ["8D55",0xB6D8],
+  ["8D56",0xB6D9],
+  ["8D57",0xB6DA],
+  ["8D58",0xB6DB],
+  ["8D59",0xB6DC],
+  ["8D5A",0xB6DD],
+  ["8D61",0xB6DE],
+  ["8D62",0xB6DF],
+  ["8D63",0xB6E0],
+  ["8D64",0xB6E1],
+  ["8D65",0xB6E2],
+  ["8D66",0xB6E3],
+  ["8D67",0xB6E4],
+  ["8D68",0xB6E5],
+  ["8D69",0xB6E6],
+  ["8D6A",0xB6E7],
+  ["8D6B",0xB6E8],
+  ["8D6C",0xB6E9],
+  ["8D6D",0xB6EA],
+  ["8D6E",0xB6EB],
+  ["8D6F",0xB6EC],
+  ["8D70",0xB6ED],
+  ["8D71",0xB6EE],
+  ["8D72",0xB6EF],
+  ["8D73",0xB6F1],
+  ["8D74",0xB6F2],
+  ["8D75",0xB6F3],
+  ["8D76",0xB6F5],
+  ["8D77",0xB6F6],
+  ["8D78",0xB6F7],
+  ["8D79",0xB6F9],
+  ["8D7A",0xB6FA],
+  ["8D81",0xB6FB],
+  ["8D82",0xB6FC],
+  ["8D83",0xB6FD],
+  ["8D84",0xB6FE],
+  ["8D85",0xB6FF],
+  ["8D86",0xB702],
+  ["8D87",0xB703],
+  ["8D88",0xB704],
+  ["8D89",0xB706],
+  ["8D8A",0xB707],
+  ["8D8B",0xB708],
+  ["8D8C",0xB709],
+  ["8D8D",0xB70A],
+  ["8D8E",0xB70B],
+  ["8D8F",0xB70C],
+  ["8D90",0xB70D],
+  ["8D91",0xB70E],
+  ["8D92",0xB70F],
+  ["8D93",0xB710],
+  ["8D94",0xB711],
+  ["8D95",0xB712],
+  ["8D96",0xB713],
+  ["8D97",0xB714],
+  ["8D98",0xB715],
+  ["8D99",0xB716],
+  ["8D9A",0xB717],
+  ["8D9B",0xB718],
+  ["8D9C",0xB719],
+  ["8D9D",0xB71A],
+  ["8D9E",0xB71B],
+  ["8D9F",0xB71C],
+  ["8DA0",0xB71D],
+  ["8DA1",0xB71E],
+  ["8DA2",0xB71F],
+  ["8DA3",0xB720],
+  ["8DA4",0xB721],
+  ["8DA5",0xB722],
+  ["8DA6",0xB723],
+  ["8DA7",0xB724],
+  ["8DA8",0xB725],
+  ["8DA9",0xB726],
+  ["8DAA",0xB727],
+  ["8DAB",0xB72A],
+  ["8DAC",0xB72B],
+  ["8DAD",0xB72D],
+  ["8DAE",0xB72E],
+  ["8DAF",0xB731],
+  ["8DB0",0xB732],
+  ["8DB1",0xB733],
+  ["8DB2",0xB734],
+  ["8DB3",0xB735],
+  ["8DB4",0xB736],
+  ["8DB5",0xB737],
+  ["8DB6",0xB73A],
+  ["8DB7",0xB73C],
+  ["8DB8",0xB73D],
+  ["8DB9",0xB73E],
+  ["8DBA",0xB73F],
+  ["8DBB",0xB740],
+  ["8DBC",0xB741],
+  ["8DBD",0xB742],
+  ["8DBE",0xB743],
+  ["8DBF",0xB745],
+  ["8DC0",0xB746],
+  ["8DC1",0xB747],
+  ["8DC2",0xB749],
+  ["8DC3",0xB74A],
+  ["8DC4",0xB74B],
+  ["8DC5",0xB74D],
+  ["8DC6",0xB74E],
+  ["8DC7",0xB74F],
+  ["8DC8",0xB750],
+  ["8DC9",0xB751],
+  ["8DCA",0xB752],
+  ["8DCB",0xB753],
+  ["8DCC",0xB756],
+  ["8DCD",0xB757],
+  ["8DCE",0xB758],
+  ["8DCF",0xB759],
+  ["8DD0",0xB75A],
+  ["8DD1",0xB75B],
+  ["8DD2",0xB75C],
+  ["8DD3",0xB75D],
+  ["8DD4",0xB75E],
+  ["8DD5",0xB75F],
+  ["8DD6",0xB761],
+  ["8DD7",0xB762],
+  ["8DD8",0xB763],
+  ["8DD9",0xB765],
+  ["8DDA",0xB766],
+  ["8DDB",0xB767],
+  ["8DDC",0xB769],
+  ["8DDD",0xB76A],
+  ["8DDE",0xB76B],
+  ["8DDF",0xB76C],
+  ["8DE0",0xB76D],
+  ["8DE1",0xB76E],
+  ["8DE2",0xB76F],
+  ["8DE3",0xB772],
+  ["8DE4",0xB774],
+  ["8DE5",0xB776],
+  ["8DE6",0xB777],
+  ["8DE7",0xB778],
+  ["8DE8",0xB779],
+  ["8DE9",0xB77A],
+  ["8DEA",0xB77B],
+  ["8DEB",0xB77E],
+  ["8DEC",0xB77F],
+  ["8DED",0xB781],
+  ["8DEE",0xB782],
+  ["8DEF",0xB783],
+  ["8DF0",0xB785],
+  ["8DF1",0xB786],
+  ["8DF2",0xB787],
+  ["8DF3",0xB788],
+  ["8DF4",0xB789],
+  ["8DF5",0xB78A],
+  ["8DF6",0xB78B],
+  ["8DF7",0xB78E],
+  ["8DF8",0xB793],
+  ["8DF9",0xB794],
+  ["8DFA",0xB795],
+  ["8DFB",0xB79A],
+  ["8DFC",0xB79B],
+  ["8DFD",0xB79D],
+  ["8DFE",0xB79E],
+  ["8E41",0xB79F],
+  ["8E42",0xB7A1],
+  ["8E43",0xB7A2],
+  ["8E44",0xB7A3],
+  ["8E45",0xB7A4],
+  ["8E46",0xB7A5],
+  ["8E47",0xB7A6],
+  ["8E48",0xB7A7],
+  ["8E49",0xB7AA],
+  ["8E4A",0xB7AE],
+  ["8E4B",0xB7AF],
+  ["8E4C",0xB7B0],
+  ["8E4D",0xB7B1],
+  ["8E4E",0xB7B2],
+  ["8E4F",0xB7B3],
+  ["8E50",0xB7B6],
+  ["8E51",0xB7B7],
+  ["8E52",0xB7B9],
+  ["8E53",0xB7BA],
+  ["8E54",0xB7BB],
+  ["8E55",0xB7BC],
+  ["8E56",0xB7BD],
+  ["8E57",0xB7BE],
+  ["8E58",0xB7BF],
+  ["8E59",0xB7C0],
+  ["8E5A",0xB7C1],
+  ["8E61",0xB7C2],
+  ["8E62",0xB7C3],
+  ["8E63",0xB7C4],
+  ["8E64",0xB7C5],
+  ["8E65",0xB7C6],
+  ["8E66",0xB7C8],
+  ["8E67",0xB7CA],
+  ["8E68",0xB7CB],
+  ["8E69",0xB7CC],
+  ["8E6A",0xB7CD],
+  ["8E6B",0xB7CE],
+  ["8E6C",0xB7CF],
+  ["8E6D",0xB7D0],
+  ["8E6E",0xB7D1],
+  ["8E6F",0xB7D2],
+  ["8E70",0xB7D3],
+  ["8E71",0xB7D4],
+  ["8E72",0xB7D5],
+  ["8E73",0xB7D6],
+  ["8E74",0xB7D7],
+  ["8E75",0xB7D8],
+  ["8E76",0xB7D9],
+  ["8E77",0xB7DA],
+  ["8E78",0xB7DB],
+  ["8E79",0xB7DC],
+  ["8E7A",0xB7DD],
+  ["8E81",0xB7DE],
+  ["8E82",0xB7DF],
+  ["8E83",0xB7E0],
+  ["8E84",0xB7E1],
+  ["8E85",0xB7E2],
+  ["8E86",0xB7E3],
+  ["8E87",0xB7E4],
+  ["8E88",0xB7E5],
+  ["8E89",0xB7E6],
+  ["8E8A",0xB7E7],
+  ["8E8B",0xB7E8],
+  ["8E8C",0xB7E9],
+  ["8E8D",0xB7EA],
+  ["8E8E",0xB7EB],
+  ["8E8F",0xB7EE],
+  ["8E90",0xB7EF],
+  ["8E91",0xB7F1],
+  ["8E92",0xB7F2],
+  ["8E93",0xB7F3],
+  ["8E94",0xB7F5],
+  ["8E95",0xB7F6],
+  ["8E96",0xB7F7],
+  ["8E97",0xB7F8],
+  ["8E98",0xB7F9],
+  ["8E99",0xB7FA],
+  ["8E9A",0xB7FB],
+  ["8E9B",0xB7FE],
+  ["8E9C",0xB802],
+  ["8E9D",0xB803],
+  ["8E9E",0xB804],
+  ["8E9F",0xB805],
+  ["8EA0",0xB806],
+  ["8EA1",0xB80A],
+  ["8EA2",0xB80B],
+  ["8EA3",0xB80D],
+  ["8EA4",0xB80E],
+  ["8EA5",0xB80F],
+  ["8EA6",0xB811],
+  ["8EA7",0xB812],
+  ["8EA8",0xB813],
+  ["8EA9",0xB814],
+  ["8EAA",0xB815],
+  ["8EAB",0xB816],
+  ["8EAC",0xB817],
+  ["8EAD",0xB81A],
+  ["8EAE",0xB81C],
+  ["8EAF",0xB81E],
+  ["8EB0",0xB81F],
+  ["8EB1",0xB820],
+  ["8EB2",0xB821],
+  ["8EB3",0xB822],
+  ["8EB4",0xB823],
+  ["8EB5",0xB826],
+  ["8EB6",0xB827],
+  ["8EB7",0xB829],
+  ["8EB8",0xB82A],
+  ["8EB9",0xB82B],
+  ["8EBA",0xB82D],
+  ["8EBB",0xB82E],
+  ["8EBC",0xB82F],
+  ["8EBD",0xB830],
+  ["8EBE",0xB831],
+  ["8EBF",0xB832],
+  ["8EC0",0xB833],
+  ["8EC1",0xB836],
+  ["8EC2",0xB83A],
+  ["8EC3",0xB83B],
+  ["8EC4",0xB83C],
+  ["8EC5",0xB83D],
+  ["8EC6",0xB83E],
+  ["8EC7",0xB83F],
+  ["8EC8",0xB841],
+  ["8EC9",0xB842],
+  ["8ECA",0xB843],
+  ["8ECB",0xB845],
+  ["8ECC",0xB846],
+  ["8ECD",0xB847],
+  ["8ECE",0xB848],
+  ["8ECF",0xB849],
+  ["8ED0",0xB84A],
+  ["8ED1",0xB84B],
+  ["8ED2",0xB84C],
+  ["8ED3",0xB84D],
+  ["8ED4",0xB84E],
+  ["8ED5",0xB84F],
+  ["8ED6",0xB850],
+  ["8ED7",0xB852],
+  ["8ED8",0xB854],
+  ["8ED9",0xB855],
+  ["8EDA",0xB856],
+  ["8EDB",0xB857],
+  ["8EDC",0xB858],
+  ["8EDD",0xB859],
+  ["8EDE",0xB85A],
+  ["8EDF",0xB85B],
+  ["8EE0",0xB85E],
+  ["8EE1",0xB85F],
+  ["8EE2",0xB861],
+  ["8EE3",0xB862],
+  ["8EE4",0xB863],
+  ["8EE5",0xB865],
+  ["8EE6",0xB866],
+  ["8EE7",0xB867],
+  ["8EE8",0xB868],
+  ["8EE9",0xB869],
+  ["8EEA",0xB86A],
+  ["8EEB",0xB86B],
+  ["8EEC",0xB86E],
+  ["8EED",0xB870],
+  ["8EEE",0xB872],
+  ["8EEF",0xB873],
+  ["8EF0",0xB874],
+  ["8EF1",0xB875],
+  ["8EF2",0xB876],
+  ["8EF3",0xB877],
+  ["8EF4",0xB879],
+  ["8EF5",0xB87A],
+  ["8EF6",0xB87B],
+  ["8EF7",0xB87D],
+  ["8EF8",0xB87E],
+  ["8EF9",0xB87F],
+  ["8EFA",0xB880],
+  ["8EFB",0xB881],
+  ["8EFC",0xB882],
+  ["8EFD",0xB883],
+  ["8EFE",0xB884],
+  ["8F41",0xB885],
+  ["8F42",0xB886],
+  ["8F43",0xB887],
+  ["8F44",0xB888],
+  ["8F45",0xB889],
+  ["8F46",0xB88A],
+  ["8F47",0xB88B],
+  ["8F48",0xB88C],
+  ["8F49",0xB88E],
+  ["8F4A",0xB88F],
+  ["8F4B",0xB890],
+  ["8F4C",0xB891],
+  ["8F4D",0xB892],
+  ["8F4E",0xB893],
+  ["8F4F",0xB894],
+  ["8F50",0xB895],
+  ["8F51",0xB896],
+  ["8F52",0xB897],
+  ["8F53",0xB898],
+  ["8F54",0xB899],
+  ["8F55",0xB89A],
+  ["8F56",0xB89B],
+  ["8F57",0xB89C],
+  ["8F58",0xB89D],
+  ["8F59",0xB89E],
+  ["8F5A",0xB89F],
+  ["8F61",0xB8A0],
+  ["8F62",0xB8A1],
+  ["8F63",0xB8A2],
+  ["8F64",0xB8A3],
+  ["8F65",0xB8A4],
+  ["8F66",0xB8A5],
+  ["8F67",0xB8A6],
+  ["8F68",0xB8A7],
+  ["8F69",0xB8A9],
+  ["8F6A",0xB8AA],
+  ["8F6B",0xB8AB],
+  ["8F6C",0xB8AC],
+  ["8F6D",0xB8AD],
+  ["8F6E",0xB8AE],
+  ["8F6F",0xB8AF],
+  ["8F70",0xB8B1],
+  ["8F71",0xB8B2],
+  ["8F72",0xB8B3],
+  ["8F73",0xB8B5],
+  ["8F74",0xB8B6],
+  ["8F75",0xB8B7],
+  ["8F76",0xB8B9],
+  ["8F77",0xB8BA],
+  ["8F78",0xB8BB],
+  ["8F79",0xB8BC],
+  ["8F7A",0xB8BD],
+  ["8F81",0xB8BE],
+  ["8F82",0xB8BF],
+  ["8F83",0xB8C2],
+  ["8F84",0xB8C4],
+  ["8F85",0xB8C6],
+  ["8F86",0xB8C7],
+  ["8F87",0xB8C8],
+  ["8F88",0xB8C9],
+  ["8F89",0xB8CA],
+  ["8F8A",0xB8CB],
+  ["8F8B",0xB8CD],
+  ["8F8C",0xB8CE],
+  ["8F8D",0xB8CF],
+  ["8F8E",0xB8D1],
+  ["8F8F",0xB8D2],
+  ["8F90",0xB8D3],
+  ["8F91",0xB8D5],
+  ["8F92",0xB8D6],
+  ["8F93",0xB8D7],
+  ["8F94",0xB8D8],
+  ["8F95",0xB8D9],
+  ["8F96",0xB8DA],
+  ["8F97",0xB8DB],
+  ["8F98",0xB8DC],
+  ["8F99",0xB8DE],
+  ["8F9A",0xB8E0],
+  ["8F9B",0xB8E2],
+  ["8F9C",0xB8E3],
+  ["8F9D",0xB8E4],
+  ["8F9E",0xB8E5],
+  ["8F9F",0xB8E6],
+  ["8FA0",0xB8E7],
+  ["8FA1",0xB8EA],
+  ["8FA2",0xB8EB],
+  ["8FA3",0xB8ED],
+  ["8FA4",0xB8EE],
+  ["8FA5",0xB8EF],
+  ["8FA6",0xB8F1],
+  ["8FA7",0xB8F2],
+  ["8FA8",0xB8F3],
+  ["8FA9",0xB8F4],
+  ["8FAA",0xB8F5],
+  ["8FAB",0xB8F6],
+  ["8FAC",0xB8F7],
+  ["8FAD",0xB8FA],
+  ["8FAE",0xB8FC],
+  ["8FAF",0xB8FE],
+  ["8FB0",0xB8FF],
+  ["8FB1",0xB900],
+  ["8FB2",0xB901],
+  ["8FB3",0xB902],
+  ["8FB4",0xB903],
+  ["8FB5",0xB905],
+  ["8FB6",0xB906],
+  ["8FB7",0xB907],
+  ["8FB8",0xB908],
+  ["8FB9",0xB909],
+  ["8FBA",0xB90A],
+  ["8FBB",0xB90B],
+  ["8FBC",0xB90C],
+  ["8FBD",0xB90D],
+  ["8FBE",0xB90E],
+  ["8FBF",0xB90F],
+  ["8FC0",0xB910],
+  ["8FC1",0xB911],
+  ["8FC2",0xB912],
+  ["8FC3",0xB913],
+  ["8FC4",0xB914],
+  ["8FC5",0xB915],
+  ["8FC6",0xB916],
+  ["8FC7",0xB917],
+  ["8FC8",0xB919],
+  ["8FC9",0xB91A],
+  ["8FCA",0xB91B],
+  ["8FCB",0xB91C],
+  ["8FCC",0xB91D],
+  ["8FCD",0xB91E],
+  ["8FCE",0xB91F],
+  ["8FCF",0xB921],
+  ["8FD0",0xB922],
+  ["8FD1",0xB923],
+  ["8FD2",0xB924],
+  ["8FD3",0xB925],
+  ["8FD4",0xB926],
+  ["8FD5",0xB927],
+  ["8FD6",0xB928],
+  ["8FD7",0xB929],
+  ["8FD8",0xB92A],
+  ["8FD9",0xB92B],
+  ["8FDA",0xB92C],
+  ["8FDB",0xB92D],
+  ["8FDC",0xB92E],
+  ["8FDD",0xB92F],
+  ["8FDE",0xB930],
+  ["8FDF",0xB931],
+  ["8FE0",0xB932],
+  ["8FE1",0xB933],
+  ["8FE2",0xB934],
+  ["8FE3",0xB935],
+  ["8FE4",0xB936],
+  ["8FE5",0xB937],
+  ["8FE6",0xB938],
+  ["8FE7",0xB939],
+  ["8FE8",0xB93A],
+  ["8FE9",0xB93B],
+  ["8FEA",0xB93E],
+  ["8FEB",0xB93F],
+  ["8FEC",0xB941],
+  ["8FED",0xB942],
+  ["8FEE",0xB943],
+  ["8FEF",0xB945],
+  ["8FF0",0xB946],
+  ["8FF1",0xB947],
+  ["8FF2",0xB948],
+  ["8FF3",0xB949],
+  ["8FF4",0xB94A],
+  ["8FF5",0xB94B],
+  ["8FF6",0xB94D],
+  ["8FF7",0xB94E],
+  ["8FF8",0xB950],
+  ["8FF9",0xB952],
+  ["8FFA",0xB953],
+  ["8FFB",0xB954],
+  ["8FFC",0xB955],
+  ["8FFD",0xB956],
+  ["8FFE",0xB957],
+  ["9041",0xB95A],
+  ["9042",0xB95B],
+  ["9043",0xB95D],
+  ["9044",0xB95E],
+  ["9045",0xB95F],
+  ["9046",0xB961],
+  ["9047",0xB962],
+  ["9048",0xB963],
+  ["9049",0xB964],
+  ["904A",0xB965],
+  ["904B",0xB966],
+  ["904C",0xB967],
+  ["904D",0xB96A],
+  ["904E",0xB96C],
+  ["904F",0xB96E],
+  ["9050",0xB96F],
+  ["9051",0xB970],
+  ["9052",0xB971],
+  ["9053",0xB972],
+  ["9054",0xB973],
+  ["9055",0xB976],
+  ["9056",0xB977],
+  ["9057",0xB979],
+  ["9058",0xB97A],
+  ["9059",0xB97B],
+  ["905A",0xB97D],
+  ["9061",0xB97E],
+  ["9062",0xB97F],
+  ["9063",0xB980],
+  ["9064",0xB981],
+  ["9065",0xB982],
+  ["9066",0xB983],
+  ["9067",0xB986],
+  ["9068",0xB988],
+  ["9069",0xB98B],
+  ["906A",0xB98C],
+  ["906B",0xB98F],
+  ["906C",0xB990],
+  ["906D",0xB991],
+  ["906E",0xB992],
+  ["906F",0xB993],
+  ["9070",0xB994],
+  ["9071",0xB995],
+  ["9072",0xB996],
+  ["9073",0xB997],
+  ["9074",0xB998],
+  ["9075",0xB999],
+  ["9076",0xB99A],
+  ["9077",0xB99B],
+  ["9078",0xB99C],
+  ["9079",0xB99D],
+  ["907A",0xB99E],
+  ["9081",0xB99F],
+  ["9082",0xB9A0],
+  ["9083",0xB9A1],
+  ["9084",0xB9A2],
+  ["9085",0xB9A3],
+  ["9086",0xB9A4],
+  ["9087",0xB9A5],
+  ["9088",0xB9A6],
+  ["9089",0xB9A7],
+  ["908A",0xB9A8],
+  ["908B",0xB9A9],
+  ["908C",0xB9AA],
+  ["908D",0xB9AB],
+  ["908E",0xB9AE],
+  ["908F",0xB9AF],
+  ["9090",0xB9B1],
+  ["9091",0xB9B2],
+  ["9092",0xB9B3],
+  ["9093",0xB9B5],
+  ["9094",0xB9B6],
+  ["9095",0xB9B7],
+  ["9096",0xB9B8],
+  ["9097",0xB9B9],
+  ["9098",0xB9BA],
+  ["9099",0xB9BB],
+  ["909A",0xB9BE],
+  ["909B",0xB9C0],
+  ["909C",0xB9C2],
+  ["909D",0xB9C3],
+  ["909E",0xB9C4],
+  ["909F",0xB9C5],
+  ["90A0",0xB9C6],
+  ["90A1",0xB9C7],
+  ["90A2",0xB9CA],
+  ["90A3",0xB9CB],
+  ["90A4",0xB9CD],
+  ["90A5",0xB9D3],
+  ["90A6",0xB9D4],
+  ["90A7",0xB9D5],
+  ["90A8",0xB9D6],
+  ["90A9",0xB9D7],
+  ["90AA",0xB9DA],
+  ["90AB",0xB9DC],
+  ["90AC",0xB9DF],
+  ["90AD",0xB9E0],
+  ["90AE",0xB9E2],
+  ["90AF",0xB9E6],
+  ["90B0",0xB9E7],
+  ["90B1",0xB9E9],
+  ["90B2",0xB9EA],
+  ["90B3",0xB9EB],
+  ["90B4",0xB9ED],
+  ["90B5",0xB9EE],
+  ["90B6",0xB9EF],
+  ["90B7",0xB9F0],
+  ["90B8",0xB9F1],
+  ["90B9",0xB9F2],
+  ["90BA",0xB9F3],
+  ["90BB",0xB9F6],
+  ["90BC",0xB9FB],
+  ["90BD",0xB9FC],
+  ["90BE",0xB9FD],
+  ["90BF",0xB9FE],
+  ["90C0",0xB9FF],
+  ["90C1",0xBA02],
+  ["90C2",0xBA03],
+  ["90C3",0xBA04],
+  ["90C4",0xBA05],
+  ["90C5",0xBA06],
+  ["90C6",0xBA07],
+  ["90C7",0xBA09],
+  ["90C8",0xBA0A],
+  ["90C9",0xBA0B],
+  ["90CA",0xBA0C],
+  ["90CB",0xBA0D],
+  ["90CC",0xBA0E],
+  ["90CD",0xBA0F],
+  ["90CE",0xBA10],
+  ["90CF",0xBA11],
+  ["90D0",0xBA12],
+  ["90D1",0xBA13],
+  ["90D2",0xBA14],
+  ["90D3",0xBA16],
+  ["90D4",0xBA17],
+  ["90D5",0xBA18],
+  ["90D6",0xBA19],
+  ["90D7",0xBA1A],
+  ["90D8",0xBA1B],
+  ["90D9",0xBA1C],
+  ["90DA",0xBA1D],
+  ["90DB",0xBA1E],
+  ["90DC",0xBA1F],
+  ["90DD",0xBA20],
+  ["90DE",0xBA21],
+  ["90DF",0xBA22],
+  ["90E0",0xBA23],
+  ["90E1",0xBA24],
+  ["90E2",0xBA25],
+  ["90E3",0xBA26],
+  ["90E4",0xBA27],
+  ["90E5",0xBA28],
+  ["90E6",0xBA29],
+  ["90E7",0xBA2A],
+  ["90E8",0xBA2B],
+  ["90E9",0xBA2C],
+  ["90EA",0xBA2D],
+  ["90EB",0xBA2E],
+  ["90EC",0xBA2F],
+  ["90ED",0xBA30],
+  ["90EE",0xBA31],
+  ["90EF",0xBA32],
+  ["90F0",0xBA33],
+  ["90F1",0xBA34],
+  ["90F2",0xBA35],
+  ["90F3",0xBA36],
+  ["90F4",0xBA37],
+  ["90F5",0xBA3A],
+  ["90F6",0xBA3B],
+  ["90F7",0xBA3D],
+  ["90F8",0xBA3E],
+  ["90F9",0xBA3F],
+  ["90FA",0xBA41],
+  ["90FB",0xBA43],
+  ["90FC",0xBA44],
+  ["90FD",0xBA45],
+  ["90FE",0xBA46],
+  ["9141",0xBA47],
+  ["9142",0xBA4A],
+  ["9143",0xBA4C],
+  ["9144",0xBA4F],
+  ["9145",0xBA50],
+  ["9146",0xBA51],
+  ["9147",0xBA52],
+  ["9148",0xBA56],
+  ["9149",0xBA57],
+  ["914A",0xBA59],
+  ["914B",0xBA5A],
+  ["914C",0xBA5B],
+  ["914D",0xBA5D],
+  ["914E",0xBA5E],
+  ["914F",0xBA5F],
+  ["9150",0xBA60],
+  ["9151",0xBA61],
+  ["9152",0xBA62],
+  ["9153",0xBA63],
+  ["9154",0xBA66],
+  ["9155",0xBA6A],
+  ["9156",0xBA6B],
+  ["9157",0xBA6C],
+  ["9158",0xBA6D],
+  ["9159",0xBA6E],
+  ["915A",0xBA6F],
+  ["9161",0xBA72],
+  ["9162",0xBA73],
+  ["9163",0xBA75],
+  ["9164",0xBA76],
+  ["9165",0xBA77],
+  ["9166",0xBA79],
+  ["9167",0xBA7A],
+  ["9168",0xBA7B],
+  ["9169",0xBA7C],
+  ["916A",0xBA7D],
+  ["916B",0xBA7E],
+  ["916C",0xBA7F],
+  ["916D",0xBA80],
+  ["916E",0xBA81],
+  ["916F",0xBA82],
+  ["9170",0xBA86],
+  ["9171",0xBA88],
+  ["9172",0xBA89],
+  ["9173",0xBA8A],
+  ["9174",0xBA8B],
+  ["9175",0xBA8D],
+  ["9176",0xBA8E],
+  ["9177",0xBA8F],
+  ["9178",0xBA90],
+  ["9179",0xBA91],
+  ["917A",0xBA92],
+  ["9181",0xBA93],
+  ["9182",0xBA94],
+  ["9183",0xBA95],
+  ["9184",0xBA96],
+  ["9185",0xBA97],
+  ["9186",0xBA98],
+  ["9187",0xBA99],
+  ["9188",0xBA9A],
+  ["9189",0xBA9B],
+  ["918A",0xBA9C],
+  ["918B",0xBA9D],
+  ["918C",0xBA9E],
+  ["918D",0xBA9F],
+  ["918E",0xBAA0],
+  ["918F",0xBAA1],
+  ["9190",0xBAA2],
+  ["9191",0xBAA3],
+  ["9192",0xBAA4],
+  ["9193",0xBAA5],
+  ["9194",0xBAA6],
+  ["9195",0xBAA7],
+  ["9196",0xBAAA],
+  ["9197",0xBAAD],
+  ["9198",0xBAAE],
+  ["9199",0xBAAF],
+  ["919A",0xBAB1],
+  ["919B",0xBAB3],
+  ["919C",0xBAB4],
+  ["919D",0xBAB5],
+  ["919E",0xBAB6],
+  ["919F",0xBAB7],
+  ["91A0",0xBABA],
+  ["91A1",0xBABC],
+  ["91A2",0xBABE],
+  ["91A3",0xBABF],
+  ["91A4",0xBAC0],
+  ["91A5",0xBAC1],
+  ["91A6",0xBAC2],
+  ["91A7",0xBAC3],
+  ["91A8",0xBAC5],
+  ["91A9",0xBAC6],
+  ["91AA",0xBAC7],
+  ["91AB",0xBAC9],
+  ["91AC",0xBACA],
+  ["91AD",0xBACB],
+  ["91AE",0xBACC],
+  ["91AF",0xBACD],
+  ["91B0",0xBACE],
+  ["91B1",0xBACF],
+  ["91B2",0xBAD0],
+  ["91B3",0xBAD1],
+  ["91B4",0xBAD2],
+  ["91B5",0xBAD3],
+  ["91B6",0xBAD4],
+  ["91B7",0xBAD5],
+  ["91B8",0xBAD6],
+  ["91B9",0xBAD7],
+  ["91BA",0xBADA],
+  ["91BB",0xBADB],
+  ["91BC",0xBADC],
+  ["91BD",0xBADD],
+  ["91BE",0xBADE],
+  ["91BF",0xBADF],
+  ["91C0",0xBAE0],
+  ["91C1",0xBAE1],
+  ["91C2",0xBAE2],
+  ["91C3",0xBAE3],
+  ["91C4",0xBAE4],
+  ["91C5",0xBAE5],
+  ["91C6",0xBAE6],
+  ["91C7",0xBAE7],
+  ["91C8",0xBAE8],
+  ["91C9",0xBAE9],
+  ["91CA",0xBAEA],
+  ["91CB",0xBAEB],
+  ["91CC",0xBAEC],
+  ["91CD",0xBAED],
+  ["91CE",0xBAEE],
+  ["91CF",0xBAEF],
+  ["91D0",0xBAF0],
+  ["91D1",0xBAF1],
+  ["91D2",0xBAF2],
+  ["91D3",0xBAF3],
+  ["91D4",0xBAF4],
+  ["91D5",0xBAF5],
+  ["91D6",0xBAF6],
+  ["91D7",0xBAF7],
+  ["91D8",0xBAF8],
+  ["91D9",0xBAF9],
+  ["91DA",0xBAFA],
+  ["91DB",0xBAFB],
+  ["91DC",0xBAFD],
+  ["91DD",0xBAFE],
+  ["91DE",0xBAFF],
+  ["91DF",0xBB01],
+  ["91E0",0xBB02],
+  ["91E1",0xBB03],
+  ["91E2",0xBB05],
+  ["91E3",0xBB06],
+  ["91E4",0xBB07],
+  ["91E5",0xBB08],
+  ["91E6",0xBB09],
+  ["91E7",0xBB0A],
+  ["91E8",0xBB0B],
+  ["91E9",0xBB0C],
+  ["91EA",0xBB0E],
+  ["91EB",0xBB10],
+  ["91EC",0xBB12],
+  ["91ED",0xBB13],
+  ["91EE",0xBB14],
+  ["91EF",0xBB15],
+  ["91F0",0xBB16],
+  ["91F1",0xBB17],
+  ["91F2",0xBB19],
+  ["91F3",0xBB1A],
+  ["91F4",0xBB1B],
+  ["91F5",0xBB1D],
+  ["91F6",0xBB1E],
+  ["91F7",0xBB1F],
+  ["91F8",0xBB21],
+  ["91F9",0xBB22],
+  ["91FA",0xBB23],
+  ["91FB",0xBB24],
+  ["91FC",0xBB25],
+  ["91FD",0xBB26],
+  ["91FE",0xBB27],
+  ["9241",0xBB28],
+  ["9242",0xBB2A],
+  ["9243",0xBB2C],
+  ["9244",0xBB2D],
+  ["9245",0xBB2E],
+  ["9246",0xBB2F],
+  ["9247",0xBB30],
+  ["9248",0xBB31],
+  ["9249",0xBB32],
+  ["924A",0xBB33],
+  ["924B",0xBB37],
+  ["924C",0xBB39],
+  ["924D",0xBB3A],
+  ["924E",0xBB3F],
+  ["924F",0xBB40],
+  ["9250",0xBB41],
+  ["9251",0xBB42],
+  ["9252",0xBB43],
+  ["9253",0xBB46],
+  ["9254",0xBB48],
+  ["9255",0xBB4A],
+  ["9256",0xBB4B],
+  ["9257",0xBB4C],
+  ["9258",0xBB4E],
+  ["9259",0xBB51],
+  ["925A",0xBB52],
+  ["9261",0xBB53],
+  ["9262",0xBB55],
+  ["9263",0xBB56],
+  ["9264",0xBB57],
+  ["9265",0xBB59],
+  ["9266",0xBB5A],
+  ["9267",0xBB5B],
+  ["9268",0xBB5C],
+  ["9269",0xBB5D],
+  ["926A",0xBB5E],
+  ["926B",0xBB5F],
+  ["926C",0xBB60],
+  ["926D",0xBB62],
+  ["926E",0xBB64],
+  ["926F",0xBB65],
+  ["9270",0xBB66],
+  ["9271",0xBB67],
+  ["9272",0xBB68],
+  ["9273",0xBB69],
+  ["9274",0xBB6A],
+  ["9275",0xBB6B],
+  ["9276",0xBB6D],
+  ["9277",0xBB6E],
+  ["9278",0xBB6F],
+  ["9279",0xBB70],
+  ["927A",0xBB71],
+  ["9281",0xBB72],
+  ["9282",0xBB73],
+  ["9283",0xBB74],
+  ["9284",0xBB75],
+  ["9285",0xBB76],
+  ["9286",0xBB77],
+  ["9287",0xBB78],
+  ["9288",0xBB79],
+  ["9289",0xBB7A],
+  ["928A",0xBB7B],
+  ["928B",0xBB7C],
+  ["928C",0xBB7D],
+  ["928D",0xBB7E],
+  ["928E",0xBB7F],
+  ["928F",0xBB80],
+  ["9290",0xBB81],
+  ["9291",0xBB82],
+  ["9292",0xBB83],
+  ["9293",0xBB84],
+  ["9294",0xBB85],
+  ["9295",0xBB86],
+  ["9296",0xBB87],
+  ["9297",0xBB89],
+  ["9298",0xBB8A],
+  ["9299",0xBB8B],
+  ["929A",0xBB8D],
+  ["929B",0xBB8E],
+  ["929C",0xBB8F],
+  ["929D",0xBB91],
+  ["929E",0xBB92],
+  ["929F",0xBB93],
+  ["92A0",0xBB94],
+  ["92A1",0xBB95],
+  ["92A2",0xBB96],
+  ["92A3",0xBB97],
+  ["92A4",0xBB98],
+  ["92A5",0xBB99],
+  ["92A6",0xBB9A],
+  ["92A7",0xBB9B],
+  ["92A8",0xBB9C],
+  ["92A9",0xBB9D],
+  ["92AA",0xBB9E],
+  ["92AB",0xBB9F],
+  ["92AC",0xBBA0],
+  ["92AD",0xBBA1],
+  ["92AE",0xBBA2],
+  ["92AF",0xBBA3],
+  ["92B0",0xBBA5],
+  ["92B1",0xBBA6],
+  ["92B2",0xBBA7],
+  ["92B3",0xBBA9],
+  ["92B4",0xBBAA],
+  ["92B5",0xBBAB],
+  ["92B6",0xBBAD],
+  ["92B7",0xBBAE],
+  ["92B8",0xBBAF],
+  ["92B9",0xBBB0],
+  ["92BA",0xBBB1],
+  ["92BB",0xBBB2],
+  ["92BC",0xBBB3],
+  ["92BD",0xBBB5],
+  ["92BE",0xBBB6],
+  ["92BF",0xBBB8],
+  ["92C0",0xBBB9],
+  ["92C1",0xBBBA],
+  ["92C2",0xBBBB],
+  ["92C3",0xBBBC],
+  ["92C4",0xBBBD],
+  ["92C5",0xBBBE],
+  ["92C6",0xBBBF],
+  ["92C7",0xBBC1],
+  ["92C8",0xBBC2],
+  ["92C9",0xBBC3],
+  ["92CA",0xBBC5],
+  ["92CB",0xBBC6],
+  ["92CC",0xBBC7],
+  ["92CD",0xBBC9],
+  ["92CE",0xBBCA],
+  ["92CF",0xBBCB],
+  ["92D0",0xBBCC],
+  ["92D1",0xBBCD],
+  ["92D2",0xBBCE],
+  ["92D3",0xBBCF],
+  ["92D4",0xBBD1],
+  ["92D5",0xBBD2],
+  ["92D6",0xBBD4],
+  ["92D7",0xBBD5],
+  ["92D8",0xBBD6],
+  ["92D9",0xBBD7],
+  ["92DA",0xBBD8],
+  ["92DB",0xBBD9],
+  ["92DC",0xBBDA],
+  ["92DD",0xBBDB],
+  ["92DE",0xBBDC],
+  ["92DF",0xBBDD],
+  ["92E0",0xBBDE],
+  ["92E1",0xBBDF],
+  ["92E2",0xBBE0],
+  ["92E3",0xBBE1],
+  ["92E4",0xBBE2],
+  ["92E5",0xBBE3],
+  ["92E6",0xBBE4],
+  ["92E7",0xBBE5],
+  ["92E8",0xBBE6],
+  ["92E9",0xBBE7],
+  ["92EA",0xBBE8],
+  ["92EB",0xBBE9],
+  ["92EC",0xBBEA],
+  ["92ED",0xBBEB],
+  ["92EE",0xBBEC],
+  ["92EF",0xBBED],
+  ["92F0",0xBBEE],
+  ["92F1",0xBBEF],
+  ["92F2",0xBBF0],
+  ["92F3",0xBBF1],
+  ["92F4",0xBBF2],
+  ["92F5",0xBBF3],
+  ["92F6",0xBBF4],
+  ["92F7",0xBBF5],
+  ["92F8",0xBBF6],
+  ["92F9",0xBBF7],
+  ["92FA",0xBBFA],
+  ["92FB",0xBBFB],
+  ["92FC",0xBBFD],
+  ["92FD",0xBBFE],
+  ["92FE",0xBC01],
+  ["9341",0xBC03],
+  ["9342",0xBC04],
+  ["9343",0xBC05],
+  ["9344",0xBC06],
+  ["9345",0xBC07],
+  ["9346",0xBC0A],
+  ["9347",0xBC0E],
+  ["9348",0xBC10],
+  ["9349",0xBC12],
+  ["934A",0xBC13],
+  ["934B",0xBC19],
+  ["934C",0xBC1A],
+  ["934D",0xBC20],
+  ["934E",0xBC21],
+  ["934F",0xBC22],
+  ["9350",0xBC23],
+  ["9351",0xBC26],
+  ["9352",0xBC28],
+  ["9353",0xBC2A],
+  ["9354",0xBC2B],
+  ["9355",0xBC2C],
+  ["9356",0xBC2E],
+  ["9357",0xBC2F],
+  ["9358",0xBC32],
+  ["9359",0xBC33],
+  ["935A",0xBC35],
+  ["9361",0xBC36],
+  ["9362",0xBC37],
+  ["9363",0xBC39],
+  ["9364",0xBC3A],
+  ["9365",0xBC3B],
+  ["9366",0xBC3C],
+  ["9367",0xBC3D],
+  ["9368",0xBC3E],
+  ["9369",0xBC3F],
+  ["936A",0xBC42],
+  ["936B",0xBC46],
+  ["936C",0xBC47],
+  ["936D",0xBC48],
+  ["936E",0xBC4A],
+  ["936F",0xBC4B],
+  ["9370",0xBC4E],
+  ["9371",0xBC4F],
+  ["9372",0xBC51],
+  ["9373",0xBC52],
+  ["9374",0xBC53],
+  ["9375",0xBC54],
+  ["9376",0xBC55],
+  ["9377",0xBC56],
+  ["9378",0xBC57],
+  ["9379",0xBC58],
+  ["937A",0xBC59],
+  ["9381",0xBC5A],
+  ["9382",0xBC5B],
+  ["9383",0xBC5C],
+  ["9384",0xBC5E],
+  ["9385",0xBC5F],
+  ["9386",0xBC60],
+  ["9387",0xBC61],
+  ["9388",0xBC62],
+  ["9389",0xBC63],
+  ["938A",0xBC64],
+  ["938B",0xBC65],
+  ["938C",0xBC66],
+  ["938D",0xBC67],
+  ["938E",0xBC68],
+  ["938F",0xBC69],
+  ["9390",0xBC6A],
+  ["9391",0xBC6B],
+  ["9392",0xBC6C],
+  ["9393",0xBC6D],
+  ["9394",0xBC6E],
+  ["9395",0xBC6F],
+  ["9396",0xBC70],
+  ["9397",0xBC71],
+  ["9398",0xBC72],
+  ["9399",0xBC73],
+  ["939A",0xBC74],
+  ["939B",0xBC75],
+  ["939C",0xBC76],
+  ["939D",0xBC77],
+  ["939E",0xBC78],
+  ["939F",0xBC79],
+  ["93A0",0xBC7A],
+  ["93A1",0xBC7B],
+  ["93A2",0xBC7C],
+  ["93A3",0xBC7D],
+  ["93A4",0xBC7E],
+  ["93A5",0xBC7F],
+  ["93A6",0xBC80],
+  ["93A7",0xBC81],
+  ["93A8",0xBC82],
+  ["93A9",0xBC83],
+  ["93AA",0xBC86],
+  ["93AB",0xBC87],
+  ["93AC",0xBC89],
+  ["93AD",0xBC8A],
+  ["93AE",0xBC8D],
+  ["93AF",0xBC8F],
+  ["93B0",0xBC90],
+  ["93B1",0xBC91],
+  ["93B2",0xBC92],
+  ["93B3",0xBC93],
+  ["93B4",0xBC96],
+  ["93B5",0xBC98],
+  ["93B6",0xBC9B],
+  ["93B7",0xBC9C],
+  ["93B8",0xBC9D],
+  ["93B9",0xBC9E],
+  ["93BA",0xBC9F],
+  ["93BB",0xBCA2],
+  ["93BC",0xBCA3],
+  ["93BD",0xBCA5],
+  ["93BE",0xBCA6],
+  ["93BF",0xBCA9],
+  ["93C0",0xBCAA],
+  ["93C1",0xBCAB],
+  ["93C2",0xBCAC],
+  ["93C3",0xBCAD],
+  ["93C4",0xBCAE],
+  ["93C5",0xBCAF],
+  ["93C6",0xBCB2],
+  ["93C7",0xBCB6],
+  ["93C8",0xBCB7],
+  ["93C9",0xBCB8],
+  ["93CA",0xBCB9],
+  ["93CB",0xBCBA],
+  ["93CC",0xBCBB],
+  ["93CD",0xBCBE],
+  ["93CE",0xBCBF],
+  ["93CF",0xBCC1],
+  ["93D0",0xBCC2],
+  ["93D1",0xBCC3],
+  ["93D2",0xBCC5],
+  ["93D3",0xBCC6],
+  ["93D4",0xBCC7],
+  ["93D5",0xBCC8],
+  ["93D6",0xBCC9],
+  ["93D7",0xBCCA],
+  ["93D8",0xBCCB],
+  ["93D9",0xBCCC],
+  ["93DA",0xBCCE],
+  ["93DB",0xBCD2],
+  ["93DC",0xBCD3],
+  ["93DD",0xBCD4],
+  ["93DE",0xBCD6],
+  ["93DF",0xBCD7],
+  ["93E0",0xBCD9],
+  ["93E1",0xBCDA],
+  ["93E2",0xBCDB],
+  ["93E3",0xBCDD],
+  ["93E4",0xBCDE],
+  ["93E5",0xBCDF],
+  ["93E6",0xBCE0],
+  ["93E7",0xBCE1],
+  ["93E8",0xBCE2],
+  ["93E9",0xBCE3],
+  ["93EA",0xBCE4],
+  ["93EB",0xBCE5],
+  ["93EC",0xBCE6],
+  ["93ED",0xBCE7],
+  ["93EE",0xBCE8],
+  ["93EF",0xBCE9],
+  ["93F0",0xBCEA],
+  ["93F1",0xBCEB],
+  ["93F2",0xBCEC],
+  ["93F3",0xBCED],
+  ["93F4",0xBCEE],
+  ["93F5",0xBCEF],
+  ["93F6",0xBCF0],
+  ["93F7",0xBCF1],
+  ["93F8",0xBCF2],
+  ["93F9",0xBCF3],
+  ["93FA",0xBCF7],
+  ["93FB",0xBCF9],
+  ["93FC",0xBCFA],
+  ["93FD",0xBCFB],
+  ["93FE",0xBCFD],
+  ["9441",0xBCFE],
+  ["9442",0xBCFF],
+  ["9443",0xBD00],
+  ["9444",0xBD01],
+  ["9445",0xBD02],
+  ["9446",0xBD03],
+  ["9447",0xBD06],
+  ["9448",0xBD08],
+  ["9449",0xBD0A],
+  ["944A",0xBD0B],
+  ["944B",0xBD0C],
+  ["944C",0xBD0D],
+  ["944D",0xBD0E],
+  ["944E",0xBD0F],
+  ["944F",0xBD11],
+  ["9450",0xBD12],
+  ["9451",0xBD13],
+  ["9452",0xBD15],
+  ["9453",0xBD16],
+  ["9454",0xBD17],
+  ["9455",0xBD18],
+  ["9456",0xBD19],
+  ["9457",0xBD1A],
+  ["9458",0xBD1B],
+  ["9459",0xBD1C],
+  ["945A",0xBD1D],
+  ["9461",0xBD1E],
+  ["9462",0xBD1F],
+  ["9463",0xBD20],
+  ["9464",0xBD21],
+  ["9465",0xBD22],
+  ["9466",0xBD23],
+  ["9467",0xBD25],
+  ["9468",0xBD26],
+  ["9469",0xBD27],
+  ["946A",0xBD28],
+  ["946B",0xBD29],
+  ["946C",0xBD2A],
+  ["946D",0xBD2B],
+  ["946E",0xBD2D],
+  ["946F",0xBD2E],
+  ["9470",0xBD2F],
+  ["9471",0xBD30],
+  ["9472",0xBD31],
+  ["9473",0xBD32],
+  ["9474",0xBD33],
+  ["9475",0xBD34],
+  ["9476",0xBD35],
+  ["9477",0xBD36],
+  ["9478",0xBD37],
+  ["9479",0xBD38],
+  ["947A",0xBD39],
+  ["9481",0xBD3A],
+  ["9482",0xBD3B],
+  ["9483",0xBD3C],
+  ["9484",0xBD3D],
+  ["9485",0xBD3E],
+  ["9486",0xBD3F],
+  ["9487",0xBD41],
+  ["9488",0xBD42],
+  ["9489",0xBD43],
+  ["948A",0xBD44],
+  ["948B",0xBD45],
+  ["948C",0xBD46],
+  ["948D",0xBD47],
+  ["948E",0xBD4A],
+  ["948F",0xBD4B],
+  ["9490",0xBD4D],
+  ["9491",0xBD4E],
+  ["9492",0xBD4F],
+  ["9493",0xBD51],
+  ["9494",0xBD52],
+  ["9495",0xBD53],
+  ["9496",0xBD54],
+  ["9497",0xBD55],
+  ["9498",0xBD56],
+  ["9499",0xBD57],
+  ["949A",0xBD5A],
+  ["949B",0xBD5B],
+  ["949C",0xBD5C],
+  ["949D",0xBD5D],
+  ["949E",0xBD5E],
+  ["949F",0xBD5F],
+  ["94A0",0xBD60],
+  ["94A1",0xBD61],
+  ["94A2",0xBD62],
+  ["94A3",0xBD63],
+  ["94A4",0xBD65],
+  ["94A5",0xBD66],
+  ["94A6",0xBD67],
+  ["94A7",0xBD69],
+  ["94A8",0xBD6A],
+  ["94A9",0xBD6B],
+  ["94AA",0xBD6C],
+  ["94AB",0xBD6D],
+  ["94AC",0xBD6E],
+  ["94AD",0xBD6F],
+  ["94AE",0xBD70],
+  ["94AF",0xBD71],
+  ["94B0",0xBD72],
+  ["94B1",0xBD73],
+  ["94B2",0xBD74],
+  ["94B3",0xBD75],
+  ["94B4",0xBD76],
+  ["94B5",0xBD77],
+  ["94B6",0xBD78],
+  ["94B7",0xBD79],
+  ["94B8",0xBD7A],
+  ["94B9",0xBD7B],
+  ["94BA",0xBD7C],
+  ["94BB",0xBD7D],
+  ["94BC",0xBD7E],
+  ["94BD",0xBD7F],
+  ["94BE",0xBD82],
+  ["94BF",0xBD83],
+  ["94C0",0xBD85],
+  ["94C1",0xBD86],
+  ["94C2",0xBD8B],
+  ["94C3",0xBD8C],
+  ["94C4",0xBD8D],
+  ["94C5",0xBD8E],
+  ["94C6",0xBD8F],
+  ["94C7",0xBD92],
+  ["94C8",0xBD94],
+  ["94C9",0xBD96],
+  ["94CA",0xBD97],
+  ["94CB",0xBD98],
+  ["94CC",0xBD9B],
+  ["94CD",0xBD9D],
+  ["94CE",0xBD9E],
+  ["94CF",0xBD9F],
+  ["94D0",0xBDA0],
+  ["94D1",0xBDA1],
+  ["94D2",0xBDA2],
+  ["94D3",0xBDA3],
+  ["94D4",0xBDA5],
+  ["94D5",0xBDA6],
+  ["94D6",0xBDA7],
+  ["94D7",0xBDA8],
+  ["94D8",0xBDA9],
+  ["94D9",0xBDAA],
+  ["94DA",0xBDAB],
+  ["94DB",0xBDAC],
+  ["94DC",0xBDAD],
+  ["94DD",0xBDAE],
+  ["94DE",0xBDAF],
+  ["94DF",0xBDB1],
+  ["94E0",0xBDB2],
+  ["94E1",0xBDB3],
+  ["94E2",0xBDB4],
+  ["94E3",0xBDB5],
+  ["94E4",0xBDB6],
+  ["94E5",0xBDB7],
+  ["94E6",0xBDB9],
+  ["94E7",0xBDBA],
+  ["94E8",0xBDBB],
+  ["94E9",0xBDBC],
+  ["94EA",0xBDBD],
+  ["94EB",0xBDBE],
+  ["94EC",0xBDBF],
+  ["94ED",0xBDC0],
+  ["94EE",0xBDC1],
+  ["94EF",0xBDC2],
+  ["94F0",0xBDC3],
+  ["94F1",0xBDC4],
+  ["94F2",0xBDC5],
+  ["94F3",0xBDC6],
+  ["94F4",0xBDC7],
+  ["94F5",0xBDC8],
+  ["94F6",0xBDC9],
+  ["94F7",0xBDCA],
+  ["94F8",0xBDCB],
+  ["94F9",0xBDCC],
+  ["94FA",0xBDCD],
+  ["94FB",0xBDCE],
+  ["94FC",0xBDCF],
+  ["94FD",0xBDD0],
+  ["94FE",0xBDD1],
+  ["9541",0xBDD2],
+  ["9542",0xBDD3],
+  ["9543",0xBDD6],
+  ["9544",0xBDD7],
+  ["9545",0xBDD9],
+  ["9546",0xBDDA],
+  ["9547",0xBDDB],
+  ["9548",0xBDDD],
+  ["9549",0xBDDE],
+  ["954A",0xBDDF],
+  ["954B",0xBDE0],
+  ["954C",0xBDE1],
+  ["954D",0xBDE2],
+  ["954E",0xBDE3],
+  ["954F",0xBDE4],
+  ["9550",0xBDE5],
+  ["9551",0xBDE6],
+  ["9552",0xBDE7],
+  ["9553",0xBDE8],
+  ["9554",0xBDEA],
+  ["9555",0xBDEB],
+  ["9556",0xBDEC],
+  ["9557",0xBDED],
+  ["9558",0xBDEE],
+  ["9559",0xBDEF],
+  ["955A",0xBDF1],
+  ["9561",0xBDF2],
+  ["9562",0xBDF3],
+  ["9563",0xBDF5],
+  ["9564",0xBDF6],
+  ["9565",0xBDF7],
+  ["9566",0xBDF9],
+  ["9567",0xBDFA],
+  ["9568",0xBDFB],
+  ["9569",0xBDFC],
+  ["956A",0xBDFD],
+  ["956B",0xBDFE],
+  ["956C",0xBDFF],
+  ["956D",0xBE01],
+  ["956E",0xBE02],
+  ["956F",0xBE04],
+  ["9570",0xBE06],
+  ["9571",0xBE07],
+  ["9572",0xBE08],
+  ["9573",0xBE09],
+  ["9574",0xBE0A],
+  ["9575",0xBE0B],
+  ["9576",0xBE0E],
+  ["9577",0xBE0F],
+  ["9578",0xBE11],
+  ["9579",0xBE12],
+  ["957A",0xBE13],
+  ["9581",0xBE15],
+  ["9582",0xBE16],
+  ["9583",0xBE17],
+  ["9584",0xBE18],
+  ["9585",0xBE19],
+  ["9586",0xBE1A],
+  ["9587",0xBE1B],
+  ["9588",0xBE1E],
+  ["9589",0xBE20],
+  ["958A",0xBE21],
+  ["958B",0xBE22],
+  ["958C",0xBE23],
+  ["958D",0xBE24],
+  ["958E",0xBE25],
+  ["958F",0xBE26],
+  ["9590",0xBE27],
+  ["9591",0xBE28],
+  ["9592",0xBE29],
+  ["9593",0xBE2A],
+  ["9594",0xBE2B],
+  ["9595",0xBE2C],
+  ["9596",0xBE2D],
+  ["9597",0xBE2E],
+  ["9598",0xBE2F],
+  ["9599",0xBE30],
+  ["959A",0xBE31],
+  ["959B",0xBE32],
+  ["959C",0xBE33],
+  ["959D",0xBE34],
+  ["959E",0xBE35],
+  ["959F",0xBE36],
+  ["95A0",0xBE37],
+  ["95A1",0xBE38],
+  ["95A2",0xBE39],
+  ["95A3",0xBE3A],
+  ["95A4",0xBE3B],
+  ["95A5",0xBE3C],
+  ["95A6",0xBE3D],
+  ["95A7",0xBE3E],
+  ["95A8",0xBE3F],
+  ["95A9",0xBE40],
+  ["95AA",0xBE41],
+  ["95AB",0xBE42],
+  ["95AC",0xBE43],
+  ["95AD",0xBE46],
+  ["95AE",0xBE47],
+  ["95AF",0xBE49],
+  ["95B0",0xBE4A],
+  ["95B1",0xBE4B],
+  ["95B2",0xBE4D],
+  ["95B3",0xBE4F],
+  ["95B4",0xBE50],
+  ["95B5",0xBE51],
+  ["95B6",0xBE52],
+  ["95B7",0xBE53],
+  ["95B8",0xBE56],
+  ["95B9",0xBE58],
+  ["95BA",0xBE5C],
+  ["95BB",0xBE5D],
+  ["95BC",0xBE5E],
+  ["95BD",0xBE5F],
+  ["95BE",0xBE62],
+  ["95BF",0xBE63],
+  ["95C0",0xBE65],
+  ["95C1",0xBE66],
+  ["95C2",0xBE67],
+  ["95C3",0xBE69],
+  ["95C4",0xBE6B],
+  ["95C5",0xBE6C],
+  ["95C6",0xBE6D],
+  ["95C7",0xBE6E],
+  ["95C8",0xBE6F],
+  ["95C9",0xBE72],
+  ["95CA",0xBE76],
+  ["95CB",0xBE77],
+  ["95CC",0xBE78],
+  ["95CD",0xBE79],
+  ["95CE",0xBE7A],
+  ["95CF",0xBE7E],
+  ["95D0",0xBE7F],
+  ["95D1",0xBE81],
+  ["95D2",0xBE82],
+  ["95D3",0xBE83],
+  ["95D4",0xBE85],
+  ["95D5",0xBE86],
+  ["95D6",0xBE87],
+  ["95D7",0xBE88],
+  ["95D8",0xBE89],
+  ["95D9",0xBE8A],
+  ["95DA",0xBE8B],
+  ["95DB",0xBE8E],
+  ["95DC",0xBE92],
+  ["95DD",0xBE93],
+  ["95DE",0xBE94],
+  ["95DF",0xBE95],
+  ["95E0",0xBE96],
+  ["95E1",0xBE97],
+  ["95E2",0xBE9A],
+  ["95E3",0xBE9B],
+  ["95E4",0xBE9C],
+  ["95E5",0xBE9D],
+  ["95E6",0xBE9E],
+  ["95E7",0xBE9F],
+  ["95E8",0xBEA0],
+  ["95E9",0xBEA1],
+  ["95EA",0xBEA2],
+  ["95EB",0xBEA3],
+  ["95EC",0xBEA4],
+  ["95ED",0xBEA5],
+  ["95EE",0xBEA6],
+  ["95EF",0xBEA7],
+  ["95F0",0xBEA9],
+  ["95F1",0xBEAA],
+  ["95F2",0xBEAB],
+  ["95F3",0xBEAC],
+  ["95F4",0xBEAD],
+  ["95F5",0xBEAE],
+  ["95F6",0xBEAF],
+  ["95F7",0xBEB0],
+  ["95F8",0xBEB1],
+  ["95F9",0xBEB2],
+  ["95FA",0xBEB3],
+  ["95FB",0xBEB4],
+  ["95FC",0xBEB5],
+  ["95FD",0xBEB6],
+  ["95FE",0xBEB7],
+  ["9641",0xBEB8],
+  ["9642",0xBEB9],
+  ["9643",0xBEBA],
+  ["9644",0xBEBB],
+  ["9645",0xBEBC],
+  ["9646",0xBEBD],
+  ["9647",0xBEBE],
+  ["9648",0xBEBF],
+  ["9649",0xBEC0],
+  ["964A",0xBEC1],
+  ["964B",0xBEC2],
+  ["964C",0xBEC3],
+  ["964D",0xBEC4],
+  ["964E",0xBEC5],
+  ["964F",0xBEC6],
+  ["9650",0xBEC7],
+  ["9651",0xBEC8],
+  ["9652",0xBEC9],
+  ["9653",0xBECA],
+  ["9654",0xBECB],
+  ["9655",0xBECC],
+  ["9656",0xBECD],
+  ["9657",0xBECE],
+  ["9658",0xBECF],
+  ["9659",0xBED2],
+  ["965A",0xBED3],
+  ["9661",0xBED5],
+  ["9662",0xBED6],
+  ["9663",0xBED9],
+  ["9664",0xBEDA],
+  ["9665",0xBEDB],
+  ["9666",0xBEDC],
+  ["9667",0xBEDD],
+  ["9668",0xBEDE],
+  ["9669",0xBEDF],
+  ["966A",0xBEE1],
+  ["966B",0xBEE2],
+  ["966C",0xBEE6],
+  ["966D",0xBEE7],
+  ["966E",0xBEE8],
+  ["966F",0xBEE9],
+  ["9670",0xBEEA],
+  ["9671",0xBEEB],
+  ["9672",0xBEED],
+  ["9673",0xBEEE],
+  ["9674",0xBEEF],
+  ["9675",0xBEF0],
+  ["9676",0xBEF1],
+  ["9677",0xBEF2],
+  ["9678",0xBEF3],
+  ["9679",0xBEF4],
+  ["967A",0xBEF5],
+  ["9681",0xBEF6],
+  ["9682",0xBEF7],
+  ["9683",0xBEF8],
+  ["9684",0xBEF9],
+  ["9685",0xBEFA],
+  ["9686",0xBEFB],
+  ["9687",0xBEFC],
+  ["9688",0xBEFD],
+  ["9689",0xBEFE],
+  ["968A",0xBEFF],
+  ["968B",0xBF00],
+  ["968C",0xBF02],
+  ["968D",0xBF03],
+  ["968E",0xBF04],
+  ["968F",0xBF05],
+  ["9690",0xBF06],
+  ["9691",0xBF07],
+  ["9692",0xBF0A],
+  ["9693",0xBF0B],
+  ["9694",0xBF0C],
+  ["9695",0xBF0D],
+  ["9696",0xBF0E],
+  ["9697",0xBF0F],
+  ["9698",0xBF10],
+  ["9699",0xBF11],
+  ["969A",0xBF12],
+  ["969B",0xBF13],
+  ["969C",0xBF14],
+  ["969D",0xBF15],
+  ["969E",0xBF16],
+  ["969F",0xBF17],
+  ["96A0",0xBF1A],
+  ["96A1",0xBF1E],
+  ["96A2",0xBF1F],
+  ["96A3",0xBF20],
+  ["96A4",0xBF21],
+  ["96A5",0xBF22],
+  ["96A6",0xBF23],
+  ["96A7",0xBF24],
+  ["96A8",0xBF25],
+  ["96A9",0xBF26],
+  ["96AA",0xBF27],
+  ["96AB",0xBF28],
+  ["96AC",0xBF29],
+  ["96AD",0xBF2A],
+  ["96AE",0xBF2B],
+  ["96AF",0xBF2C],
+  ["96B0",0xBF2D],
+  ["96B1",0xBF2E],
+  ["96B2",0xBF2F],
+  ["96B3",0xBF30],
+  ["96B4",0xBF31],
+  ["96B5",0xBF32],
+  ["96B6",0xBF33],
+  ["96B7",0xBF34],
+  ["96B8",0xBF35],
+  ["96B9",0xBF36],
+  ["96BA",0xBF37],
+  ["96BB",0xBF38],
+  ["96BC",0xBF39],
+  ["96BD",0xBF3A],
+  ["96BE",0xBF3B],
+  ["96BF",0xBF3C],
+  ["96C0",0xBF3D],
+  ["96C1",0xBF3E],
+  ["96C2",0xBF3F],
+  ["96C3",0xBF42],
+  ["96C4",0xBF43],
+  ["96C5",0xBF45],
+  ["96C6",0xBF46],
+  ["96C7",0xBF47],
+  ["96C8",0xBF49],
+  ["96C9",0xBF4A],
+  ["96CA",0xBF4B],
+  ["96CB",0xBF4C],
+  ["96CC",0xBF4D],
+  ["96CD",0xBF4E],
+  ["96CE",0xBF4F],
+  ["96CF",0xBF52],
+  ["96D0",0xBF53],
+  ["96D1",0xBF54],
+  ["96D2",0xBF56],
+  ["96D3",0xBF57],
+  ["96D4",0xBF58],
+  ["96D5",0xBF59],
+  ["96D6",0xBF5A],
+  ["96D7",0xBF5B],
+  ["96D8",0xBF5C],
+  ["96D9",0xBF5D],
+  ["96DA",0xBF5E],
+  ["96DB",0xBF5F],
+  ["96DC",0xBF60],
+  ["96DD",0xBF61],
+  ["96DE",0xBF62],
+  ["96DF",0xBF63],
+  ["96E0",0xBF64],
+  ["96E1",0xBF65],
+  ["96E2",0xBF66],
+  ["96E3",0xBF67],
+  ["96E4",0xBF68],
+  ["96E5",0xBF69],
+  ["96E6",0xBF6A],
+  ["96E7",0xBF6B],
+  ["96E8",0xBF6C],
+  ["96E9",0xBF6D],
+  ["96EA",0xBF6E],
+  ["96EB",0xBF6F],
+  ["96EC",0xBF70],
+  ["96ED",0xBF71],
+  ["96EE",0xBF72],
+  ["96EF",0xBF73],
+  ["96F0",0xBF74],
+  ["96F1",0xBF75],
+  ["96F2",0xBF76],
+  ["96F3",0xBF77],
+  ["96F4",0xBF78],
+  ["96F5",0xBF79],
+  ["96F6",0xBF7A],
+  ["96F7",0xBF7B],
+  ["96F8",0xBF7C],
+  ["96F9",0xBF7D],
+  ["96FA",0xBF7E],
+  ["96FB",0xBF7F],
+  ["96FC",0xBF80],
+  ["96FD",0xBF81],
+  ["96FE",0xBF82],
+  ["9741",0xBF83],
+  ["9742",0xBF84],
+  ["9743",0xBF85],
+  ["9744",0xBF86],
+  ["9745",0xBF87],
+  ["9746",0xBF88],
+  ["9747",0xBF89],
+  ["9748",0xBF8A],
+  ["9749",0xBF8B],
+  ["974A",0xBF8C],
+  ["974B",0xBF8D],
+  ["974C",0xBF8E],
+  ["974D",0xBF8F],
+  ["974E",0xBF90],
+  ["974F",0xBF91],
+  ["9750",0xBF92],
+  ["9751",0xBF93],
+  ["9752",0xBF95],
+  ["9753",0xBF96],
+  ["9754",0xBF97],
+  ["9755",0xBF98],
+  ["9756",0xBF99],
+  ["9757",0xBF9A],
+  ["9758",0xBF9B],
+  ["9759",0xBF9C],
+  ["975A",0xBF9D],
+  ["9761",0xBF9E],
+  ["9762",0xBF9F],
+  ["9763",0xBFA0],
+  ["9764",0xBFA1],
+  ["9765",0xBFA2],
+  ["9766",0xBFA3],
+  ["9767",0xBFA4],
+  ["9768",0xBFA5],
+  ["9769",0xBFA6],
+  ["976A",0xBFA7],
+  ["976B",0xBFA8],
+  ["976C",0xBFA9],
+  ["976D",0xBFAA],
+  ["976E",0xBFAB],
+  ["976F",0xBFAC],
+  ["9770",0xBFAD],
+  ["9771",0xBFAE],
+  ["9772",0xBFAF],
+  ["9773",0xBFB1],
+  ["9774",0xBFB2],
+  ["9775",0xBFB3],
+  ["9776",0xBFB4],
+  ["9777",0xBFB5],
+  ["9778",0xBFB6],
+  ["9779",0xBFB7],
+  ["977A",0xBFB8],
+  ["9781",0xBFB9],
+  ["9782",0xBFBA],
+  ["9783",0xBFBB],
+  ["9784",0xBFBC],
+  ["9785",0xBFBD],
+  ["9786",0xBFBE],
+  ["9787",0xBFBF],
+  ["9788",0xBFC0],
+  ["9789",0xBFC1],
+  ["978A",0xBFC2],
+  ["978B",0xBFC3],
+  ["978C",0xBFC4],
+  ["978D",0xBFC6],
+  ["978E",0xBFC7],
+  ["978F",0xBFC8],
+  ["9790",0xBFC9],
+  ["9791",0xBFCA],
+  ["9792",0xBFCB],
+  ["9793",0xBFCE],
+  ["9794",0xBFCF],
+  ["9795",0xBFD1],
+  ["9796",0xBFD2],
+  ["9797",0xBFD3],
+  ["9798",0xBFD5],
+  ["9799",0xBFD6],
+  ["979A",0xBFD7],
+  ["979B",0xBFD8],
+  ["979C",0xBFD9],
+  ["979D",0xBFDA],
+  ["979E",0xBFDB],
+  ["979F",0xBFDD],
+  ["97A0",0xBFDE],
+  ["97A1",0xBFE0],
+  ["97A2",0xBFE2],
+  ["97A3",0xBFE3],
+  ["97A4",0xBFE4],
+  ["97A5",0xBFE5],
+  ["97A6",0xBFE6],
+  ["97A7",0xBFE7],
+  ["97A8",0xBFE8],
+  ["97A9",0xBFE9],
+  ["97AA",0xBFEA],
+  ["97AB",0xBFEB],
+  ["97AC",0xBFEC],
+  ["97AD",0xBFED],
+  ["97AE",0xBFEE],
+  ["97AF",0xBFEF],
+  ["97B0",0xBFF0],
+  ["97B1",0xBFF1],
+  ["97B2",0xBFF2],
+  ["97B3",0xBFF3],
+  ["97B4",0xBFF4],
+  ["97B5",0xBFF5],
+  ["97B6",0xBFF6],
+  ["97B7",0xBFF7],
+  ["97B8",0xBFF8],
+  ["97B9",0xBFF9],
+  ["97BA",0xBFFA],
+  ["97BB",0xBFFB],
+  ["97BC",0xBFFC],
+  ["97BD",0xBFFD],
+  ["97BE",0xBFFE],
+  ["97BF",0xBFFF],
+  ["97C0",0xC000],
+  ["97C1",0xC001],
+  ["97C2",0xC002],
+  ["97C3",0xC003],
+  ["97C4",0xC004],
+  ["97C5",0xC005],
+  ["97C6",0xC006],
+  ["97C7",0xC007],
+  ["97C8",0xC008],
+  ["97C9",0xC009],
+  ["97CA",0xC00A],
+  ["97CB",0xC00B],
+  ["97CC",0xC00C],
+  ["97CD",0xC00D],
+  ["97CE",0xC00E],
+  ["97CF",0xC00F],
+  ["97D0",0xC010],
+  ["97D1",0xC011],
+  ["97D2",0xC012],
+  ["97D3",0xC013],
+  ["97D4",0xC014],
+  ["97D5",0xC015],
+  ["97D6",0xC016],
+  ["97D7",0xC017],
+  ["97D8",0xC018],
+  ["97D9",0xC019],
+  ["97DA",0xC01A],
+  ["97DB",0xC01B],
+  ["97DC",0xC01C],
+  ["97DD",0xC01D],
+  ["97DE",0xC01E],
+  ["97DF",0xC01F],
+  ["97E0",0xC020],
+  ["97E1",0xC021],
+  ["97E2",0xC022],
+  ["97E3",0xC023],
+  ["97E4",0xC024],
+  ["97E5",0xC025],
+  ["97E6",0xC026],
+  ["97E7",0xC027],
+  ["97E8",0xC028],
+  ["97E9",0xC029],
+  ["97EA",0xC02A],
+  ["97EB",0xC02B],
+  ["97EC",0xC02C],
+  ["97ED",0xC02D],
+  ["97EE",0xC02E],
+  ["97EF",0xC02F],
+  ["97F0",0xC030],
+  ["97F1",0xC031],
+  ["97F2",0xC032],
+  ["97F3",0xC033],
+  ["97F4",0xC034],
+  ["97F5",0xC035],
+  ["97F6",0xC036],
+  ["97F7",0xC037],
+  ["97F8",0xC038],
+  ["97F9",0xC039],
+  ["97FA",0xC03A],
+  ["97FB",0xC03B],
+  ["97FC",0xC03D],
+  ["97FD",0xC03E],
+  ["97FE",0xC03F],
+  ["9841",0xC040],
+  ["9842",0xC041],
+  ["9843",0xC042],
+  ["9844",0xC043],
+  ["9845",0xC044],
+  ["9846",0xC045],
+  ["9847",0xC046],
+  ["9848",0xC047],
+  ["9849",0xC048],
+  ["984A",0xC049],
+  ["984B",0xC04A],
+  ["984C",0xC04B],
+  ["984D",0xC04C],
+  ["984E",0xC04D],
+  ["984F",0xC04E],
+  ["9850",0xC04F],
+  ["9851",0xC050],
+  ["9852",0xC052],
+  ["9853",0xC053],
+  ["9854",0xC054],
+  ["9855",0xC055],
+  ["9856",0xC056],
+  ["9857",0xC057],
+  ["9858",0xC059],
+  ["9859",0xC05A],
+  ["985A",0xC05B],
+  ["9861",0xC05D],
+  ["9862",0xC05E],
+  ["9863",0xC05F],
+  ["9864",0xC061],
+  ["9865",0xC062],
+  ["9866",0xC063],
+  ["9867",0xC064],
+  ["9868",0xC065],
+  ["9869",0xC066],
+  ["986A",0xC067],
+  ["986B",0xC06A],
+  ["986C",0xC06B],
+  ["986D",0xC06C],
+  ["986E",0xC06D],
+  ["986F",0xC06E],
+  ["9870",0xC06F],
+  ["9871",0xC070],
+  ["9872",0xC071],
+  ["9873",0xC072],
+  ["9874",0xC073],
+  ["9875",0xC074],
+  ["9876",0xC075],
+  ["9877",0xC076],
+  ["9878",0xC077],
+  ["9879",0xC078],
+  ["987A",0xC079],
+  ["9881",0xC07A],
+  ["9882",0xC07B],
+  ["9883",0xC07C],
+  ["9884",0xC07D],
+  ["9885",0xC07E],
+  ["9886",0xC07F],
+  ["9887",0xC080],
+  ["9888",0xC081],
+  ["9889",0xC082],
+  ["988A",0xC083],
+  ["988B",0xC084],
+  ["988C",0xC085],
+  ["988D",0xC086],
+  ["988E",0xC087],
+  ["988F",0xC088],
+  ["9890",0xC089],
+  ["9891",0xC08A],
+  ["9892",0xC08B],
+  ["9893",0xC08C],
+  ["9894",0xC08D],
+  ["9895",0xC08E],
+  ["9896",0xC08F],
+  ["9897",0xC092],
+  ["9898",0xC093],
+  ["9899",0xC095],
+  ["989A",0xC096],
+  ["989B",0xC097],
+  ["989C",0xC099],
+  ["989D",0xC09A],
+  ["989E",0xC09B],
+  ["989F",0xC09C],
+  ["98A0",0xC09D],
+  ["98A1",0xC09E],
+  ["98A2",0xC09F],
+  ["98A3",0xC0A2],
+  ["98A4",0xC0A4],
+  ["98A5",0xC0A6],
+  ["98A6",0xC0A7],
+  ["98A7",0xC0A8],
+  ["98A8",0xC0A9],
+  ["98A9",0xC0AA],
+  ["98AA",0xC0AB],
+  ["98AB",0xC0AE],
+  ["98AC",0xC0B1],
+  ["98AD",0xC0B2],
+  ["98AE",0xC0B7],
+  ["98AF",0xC0B8],
+  ["98B0",0xC0B9],
+  ["98B1",0xC0BA],
+  ["98B2",0xC0BB],
+  ["98B3",0xC0BE],
+  ["98B4",0xC0C2],
+  ["98B5",0xC0C3],
+  ["98B6",0xC0C4],
+  ["98B7",0xC0C6],
+  ["98B8",0xC0C7],
+  ["98B9",0xC0CA],
+  ["98BA",0xC0CB],
+  ["98BB",0xC0CD],
+  ["98BC",0xC0CE],
+  ["98BD",0xC0CF],
+  ["98BE",0xC0D1],
+  ["98BF",0xC0D2],
+  ["98C0",0xC0D3],
+  ["98C1",0xC0D4],
+  ["98C2",0xC0D5],
+  ["98C3",0xC0D6],
+  ["98C4",0xC0D7],
+  ["98C5",0xC0DA],
+  ["98C6",0xC0DE],
+  ["98C7",0xC0DF],
+  ["98C8",0xC0E0],
+  ["98C9",0xC0E1],
+  ["98CA",0xC0E2],
+  ["98CB",0xC0E3],
+  ["98CC",0xC0E6],
+  ["98CD",0xC0E7],
+  ["98CE",0xC0E9],
+  ["98CF",0xC0EA],
+  ["98D0",0xC0EB],
+  ["98D1",0xC0ED],
+  ["98D2",0xC0EE],
+  ["98D3",0xC0EF],
+  ["98D4",0xC0F0],
+  ["98D5",0xC0F1],
+  ["98D6",0xC0F2],
+  ["98D7",0xC0F3],
+  ["98D8",0xC0F6],
+  ["98D9",0xC0F8],
+  ["98DA",0xC0FA],
+  ["98DB",0xC0FB],
+  ["98DC",0xC0FC],
+  ["98DD",0xC0FD],
+  ["98DE",0xC0FE],
+  ["98DF",0xC0FF],
+  ["98E0",0xC101],
+  ["98E1",0xC102],
+  ["98E2",0xC103],
+  ["98E3",0xC105],
+  ["98E4",0xC106],
+  ["98E5",0xC107],
+  ["98E6",0xC109],
+  ["98E7",0xC10A],
+  ["98E8",0xC10B],
+  ["98E9",0xC10C],
+  ["98EA",0xC10D],
+  ["98EB",0xC10E],
+  ["98EC",0xC10F],
+  ["98ED",0xC111],
+  ["98EE",0xC112],
+  ["98EF",0xC113],
+  ["98F0",0xC114],
+  ["98F1",0xC116],
+  ["98F2",0xC117],
+  ["98F3",0xC118],
+  ["98F4",0xC119],
+  ["98F5",0xC11A],
+  ["98F6",0xC11B],
+  ["98F7",0xC121],
+  ["98F8",0xC122],
+  ["98F9",0xC125],
+  ["98FA",0xC128],
+  ["98FB",0xC129],
+  ["98FC",0xC12A],
+  ["98FD",0xC12B],
+  ["98FE",0xC12E],
+  ["9941",0xC132],
+  ["9942",0xC133],
+  ["9943",0xC134],
+  ["9944",0xC135],
+  ["9945",0xC137],
+  ["9946",0xC13A],
+  ["9947",0xC13B],
+  ["9948",0xC13D],
+  ["9949",0xC13E],
+  ["994A",0xC13F],
+  ["994B",0xC141],
+  ["994C",0xC142],
+  ["994D",0xC143],
+  ["994E",0xC144],
+  ["994F",0xC145],
+  ["9950",0xC146],
+  ["9951",0xC147],
+  ["9952",0xC14A],
+  ["9953",0xC14E],
+  ["9954",0xC14F],
+  ["9955",0xC150],
+  ["9956",0xC151],
+  ["9957",0xC152],
+  ["9958",0xC153],
+  ["9959",0xC156],
+  ["995A",0xC157],
+  ["9961",0xC159],
+  ["9962",0xC15A],
+  ["9963",0xC15B],
+  ["9964",0xC15D],
+  ["9965",0xC15E],
+  ["9966",0xC15F],
+  ["9967",0xC160],
+  ["9968",0xC161],
+  ["9969",0xC162],
+  ["996A",0xC163],
+  ["996B",0xC166],
+  ["996C",0xC16A],
+  ["996D",0xC16B],
+  ["996E",0xC16C],
+  ["996F",0xC16D],
+  ["9970",0xC16E],
+  ["9971",0xC16F],
+  ["9972",0xC171],
+  ["9973",0xC172],
+  ["9974",0xC173],
+  ["9975",0xC175],
+  ["9976",0xC176],
+  ["9977",0xC177],
+  ["9978",0xC179],
+  ["9979",0xC17A],
+  ["997A",0xC17B],
+  ["9981",0xC17C],
+  ["9982",0xC17D],
+  ["9983",0xC17E],
+  ["9984",0xC17F],
+  ["9985",0xC180],
+  ["9986",0xC181],
+  ["9987",0xC182],
+  ["9988",0xC183],
+  ["9989",0xC184],
+  ["998A",0xC186],
+  ["998B",0xC187],
+  ["998C",0xC188],
+  ["998D",0xC189],
+  ["998E",0xC18A],
+  ["998F",0xC18B],
+  ["9990",0xC18F],
+  ["9991",0xC191],
+  ["9992",0xC192],
+  ["9993",0xC193],
+  ["9994",0xC195],
+  ["9995",0xC197],
+  ["9996",0xC198],
+  ["9997",0xC199],
+  ["9998",0xC19A],
+  ["9999",0xC19B],
+  ["999A",0xC19E],
+  ["999B",0xC1A0],
+  ["999C",0xC1A2],
+  ["999D",0xC1A3],
+  ["999E",0xC1A4],
+  ["999F",0xC1A6],
+  ["99A0",0xC1A7],
+  ["99A1",0xC1AA],
+  ["99A2",0xC1AB],
+  ["99A3",0xC1AD],
+  ["99A4",0xC1AE],
+  ["99A5",0xC1AF],
+  ["99A6",0xC1B1],
+  ["99A7",0xC1B2],
+  ["99A8",0xC1B3],
+  ["99A9",0xC1B4],
+  ["99AA",0xC1B5],
+  ["99AB",0xC1B6],
+  ["99AC",0xC1B7],
+  ["99AD",0xC1B8],
+  ["99AE",0xC1B9],
+  ["99AF",0xC1BA],
+  ["99B0",0xC1BB],
+  ["99B1",0xC1BC],
+  ["99B2",0xC1BE],
+  ["99B3",0xC1BF],
+  ["99B4",0xC1C0],
+  ["99B5",0xC1C1],
+  ["99B6",0xC1C2],
+  ["99B7",0xC1C3],
+  ["99B8",0xC1C5],
+  ["99B9",0xC1C6],
+  ["99BA",0xC1C7],
+  ["99BB",0xC1C9],
+  ["99BC",0xC1CA],
+  ["99BD",0xC1CB],
+  ["99BE",0xC1CD],
+  ["99BF",0xC1CE],
+  ["99C0",0xC1CF],
+  ["99C1",0xC1D0],
+  ["99C2",0xC1D1],
+  ["99C3",0xC1D2],
+  ["99C4",0xC1D3],
+  ["99C5",0xC1D5],
+  ["99C6",0xC1D6],
+  ["99C7",0xC1D9],
+  ["99C8",0xC1DA],
+  ["99C9",0xC1DB],
+  ["99CA",0xC1DC],
+  ["99CB",0xC1DD],
+  ["99CC",0xC1DE],
+  ["99CD",0xC1DF],
+  ["99CE",0xC1E1],
+  ["99CF",0xC1E2],
+  ["99D0",0xC1E3],
+  ["99D1",0xC1E5],
+  ["99D2",0xC1E6],
+  ["99D3",0xC1E7],
+  ["99D4",0xC1E9],
+  ["99D5",0xC1EA],
+  ["99D6",0xC1EB],
+  ["99D7",0xC1EC],
+  ["99D8",0xC1ED],
+  ["99D9",0xC1EE],
+  ["99DA",0xC1EF],
+  ["99DB",0xC1F2],
+  ["99DC",0xC1F4],
+  ["99DD",0xC1F5],
+  ["99DE",0xC1F6],
+  ["99DF",0xC1F7],
+  ["99E0",0xC1F8],
+  ["99E1",0xC1F9],
+  ["99E2",0xC1FA],
+  ["99E3",0xC1FB],
+  ["99E4",0xC1FE],
+  ["99E5",0xC1FF],
+  ["99E6",0xC201],
+  ["99E7",0xC202],
+  ["99E8",0xC203],
+  ["99E9",0xC205],
+  ["99EA",0xC206],
+  ["99EB",0xC207],
+  ["99EC",0xC208],
+  ["99ED",0xC209],
+  ["99EE",0xC20A],
+  ["99EF",0xC20B],
+  ["99F0",0xC20E],
+  ["99F1",0xC210],
+  ["99F2",0xC212],
+  ["99F3",0xC213],
+  ["99F4",0xC214],
+  ["99F5",0xC215],
+  ["99F6",0xC216],
+  ["99F7",0xC217],
+  ["99F8",0xC21A],
+  ["99F9",0xC21B],
+  ["99FA",0xC21D],
+  ["99FB",0xC21E],
+  ["99FC",0xC221],
+  ["99FD",0xC222],
+  ["99FE",0xC223],
+  ["9A41",0xC224],
+  ["9A42",0xC225],
+  ["9A43",0xC226],
+  ["9A44",0xC227],
+  ["9A45",0xC22A],
+  ["9A46",0xC22C],
+  ["9A47",0xC22E],
+  ["9A48",0xC230],
+  ["9A49",0xC233],
+  ["9A4A",0xC235],
+  ["9A4B",0xC236],
+  ["9A4C",0xC237],
+  ["9A4D",0xC238],
+  ["9A4E",0xC239],
+  ["9A4F",0xC23A],
+  ["9A50",0xC23B],
+  ["9A51",0xC23C],
+  ["9A52",0xC23D],
+  ["9A53",0xC23E],
+  ["9A54",0xC23F],
+  ["9A55",0xC240],
+  ["9A56",0xC241],
+  ["9A57",0xC242],
+  ["9A58",0xC243],
+  ["9A59",0xC244],
+  ["9A5A",0xC245],
+  ["9A61",0xC246],
+  ["9A62",0xC247],
+  ["9A63",0xC249],
+  ["9A64",0xC24A],
+  ["9A65",0xC24B],
+  ["9A66",0xC24C],
+  ["9A67",0xC24D],
+  ["9A68",0xC24E],
+  ["9A69",0xC24F],
+  ["9A6A",0xC252],
+  ["9A6B",0xC253],
+  ["9A6C",0xC255],
+  ["9A6D",0xC256],
+  ["9A6E",0xC257],
+  ["9A6F",0xC259],
+  ["9A70",0xC25A],
+  ["9A71",0xC25B],
+  ["9A72",0xC25C],
+  ["9A73",0xC25D],
+  ["9A74",0xC25E],
+  ["9A75",0xC25F],
+  ["9A76",0xC261],
+  ["9A77",0xC262],
+  ["9A78",0xC263],
+  ["9A79",0xC264],
+  ["9A7A",0xC266],
+  ["9A81",0xC267],
+  ["9A82",0xC268],
+  ["9A83",0xC269],
+  ["9A84",0xC26A],
+  ["9A85",0xC26B],
+  ["9A86",0xC26E],
+  ["9A87",0xC26F],
+  ["9A88",0xC271],
+  ["9A89",0xC272],
+  ["9A8A",0xC273],
+  ["9A8B",0xC275],
+  ["9A8C",0xC276],
+  ["9A8D",0xC277],
+  ["9A8E",0xC278],
+  ["9A8F",0xC279],
+  ["9A90",0xC27A],
+  ["9A91",0xC27B],
+  ["9A92",0xC27E],
+  ["9A93",0xC280],
+  ["9A94",0xC282],
+  ["9A95",0xC283],
+  ["9A96",0xC284],
+  ["9A97",0xC285],
+  ["9A98",0xC286],
+  ["9A99",0xC287],
+  ["9A9A",0xC28A],
+  ["9A9B",0xC28B],
+  ["9A9C",0xC28C],
+  ["9A9D",0xC28D],
+  ["9A9E",0xC28E],
+  ["9A9F",0xC28F],
+  ["9AA0",0xC291],
+  ["9AA1",0xC292],
+  ["9AA2",0xC293],
+  ["9AA3",0xC294],
+  ["9AA4",0xC295],
+  ["9AA5",0xC296],
+  ["9AA6",0xC297],
+  ["9AA7",0xC299],
+  ["9AA8",0xC29A],
+  ["9AA9",0xC29C],
+  ["9AAA",0xC29E],
+  ["9AAB",0xC29F],
+  ["9AAC",0xC2A0],
+  ["9AAD",0xC2A1],
+  ["9AAE",0xC2A2],
+  ["9AAF",0xC2A3],
+  ["9AB0",0xC2A6],
+  ["9AB1",0xC2A7],
+  ["9AB2",0xC2A9],
+  ["9AB3",0xC2AA],
+  ["9AB4",0xC2AB],
+  ["9AB5",0xC2AE],
+  ["9AB6",0xC2AF],
+  ["9AB7",0xC2B0],
+  ["9AB8",0xC2B1],
+  ["9AB9",0xC2B2],
+  ["9ABA",0xC2B3],
+  ["9ABB",0xC2B6],
+  ["9ABC",0xC2B8],
+  ["9ABD",0xC2BA],
+  ["9ABE",0xC2BB],
+  ["9ABF",0xC2BC],
+  ["9AC0",0xC2BD],
+  ["9AC1",0xC2BE],
+  ["9AC2",0xC2BF],
+  ["9AC3",0xC2C0],
+  ["9AC4",0xC2C1],
+  ["9AC5",0xC2C2],
+  ["9AC6",0xC2C3],
+  ["9AC7",0xC2C4],
+  ["9AC8",0xC2C5],
+  ["9AC9",0xC2C6],
+  ["9ACA",0xC2C7],
+  ["9ACB",0xC2C8],
+  ["9ACC",0xC2C9],
+  ["9ACD",0xC2CA],
+  ["9ACE",0xC2CB],
+  ["9ACF",0xC2CC],
+  ["9AD0",0xC2CD],
+  ["9AD1",0xC2CE],
+  ["9AD2",0xC2CF],
+  ["9AD3",0xC2D0],
+  ["9AD4",0xC2D1],
+  ["9AD5",0xC2D2],
+  ["9AD6",0xC2D3],
+  ["9AD7",0xC2D4],
+  ["9AD8",0xC2D5],
+  ["9AD9",0xC2D6],
+  ["9ADA",0xC2D7],
+  ["9ADB",0xC2D8],
+  ["9ADC",0xC2D9],
+  ["9ADD",0xC2DA],
+  ["9ADE",0xC2DB],
+  ["9ADF",0xC2DE],
+  ["9AE0",0xC2DF],
+  ["9AE1",0xC2E1],
+  ["9AE2",0xC2E2],
+  ["9AE3",0xC2E5],
+  ["9AE4",0xC2E6],
+  ["9AE5",0xC2E7],
+  ["9AE6",0xC2E8],
+  ["9AE7",0xC2E9],
+  ["9AE8",0xC2EA],
+  ["9AE9",0xC2EE],
+  ["9AEA",0xC2F0],
+  ["9AEB",0xC2F2],
+  ["9AEC",0xC2F3],
+  ["9AED",0xC2F4],
+  ["9AEE",0xC2F5],
+  ["9AEF",0xC2F7],
+  ["9AF0",0xC2FA],
+  ["9AF1",0xC2FD],
+  ["9AF2",0xC2FE],
+  ["9AF3",0xC2FF],
+  ["9AF4",0xC301],
+  ["9AF5",0xC302],
+  ["9AF6",0xC303],
+  ["9AF7",0xC304],
+  ["9AF8",0xC305],
+  ["9AF9",0xC306],
+  ["9AFA",0xC307],
+  ["9AFB",0xC30A],
+  ["9AFC",0xC30B],
+  ["9AFD",0xC30E],
+  ["9AFE",0xC30F],
+  ["9B41",0xC310],
+  ["9B42",0xC311],
+  ["9B43",0xC312],
+  ["9B44",0xC316],
+  ["9B45",0xC317],
+  ["9B46",0xC319],
+  ["9B47",0xC31A],
+  ["9B48",0xC31B],
+  ["9B49",0xC31D],
+  ["9B4A",0xC31E],
+  ["9B4B",0xC31F],
+  ["9B4C",0xC320],
+  ["9B4D",0xC321],
+  ["9B4E",0xC322],
+  ["9B4F",0xC323],
+  ["9B50",0xC326],
+  ["9B51",0xC327],
+  ["9B52",0xC32A],
+  ["9B53",0xC32B],
+  ["9B54",0xC32C],
+  ["9B55",0xC32D],
+  ["9B56",0xC32E],
+  ["9B57",0xC32F],
+  ["9B58",0xC330],
+  ["9B59",0xC331],
+  ["9B5A",0xC332],
+  ["9B61",0xC333],
+  ["9B62",0xC334],
+  ["9B63",0xC335],
+  ["9B64",0xC336],
+  ["9B65",0xC337],
+  ["9B66",0xC338],
+  ["9B67",0xC339],
+  ["9B68",0xC33A],
+  ["9B69",0xC33B],
+  ["9B6A",0xC33C],
+  ["9B6B",0xC33D],
+  ["9B6C",0xC33E],
+  ["9B6D",0xC33F],
+  ["9B6E",0xC340],
+  ["9B6F",0xC341],
+  ["9B70",0xC342],
+  ["9B71",0xC343],
+  ["9B72",0xC344],
+  ["9B73",0xC346],
+  ["9B74",0xC347],
+  ["9B75",0xC348],
+  ["9B76",0xC349],
+  ["9B77",0xC34A],
+  ["9B78",0xC34B],
+  ["9B79",0xC34C],
+  ["9B7A",0xC34D],
+  ["9B81",0xC34E],
+  ["9B82",0xC34F],
+  ["9B83",0xC350],
+  ["9B84",0xC351],
+  ["9B85",0xC352],
+  ["9B86",0xC353],
+  ["9B87",0xC354],
+  ["9B88",0xC355],
+  ["9B89",0xC356],
+  ["9B8A",0xC357],
+  ["9B8B",0xC358],
+  ["9B8C",0xC359],
+  ["9B8D",0xC35A],
+  ["9B8E",0xC35B],
+  ["9B8F",0xC35C],
+  ["9B90",0xC35D],
+  ["9B91",0xC35E],
+  ["9B92",0xC35F],
+  ["9B93",0xC360],
+  ["9B94",0xC361],
+  ["9B95",0xC362],
+  ["9B96",0xC363],
+  ["9B97",0xC364],
+  ["9B98",0xC365],
+  ["9B99",0xC366],
+  ["9B9A",0xC367],
+  ["9B9B",0xC36A],
+  ["9B9C",0xC36B],
+  ["9B9D",0xC36D],
+  ["9B9E",0xC36E],
+  ["9B9F",0xC36F],
+  ["9BA0",0xC371],
+  ["9BA1",0xC373],
+  ["9BA2",0xC374],
+  ["9BA3",0xC375],
+  ["9BA4",0xC376],
+  ["9BA5",0xC377],
+  ["9BA6",0xC37A],
+  ["9BA7",0xC37B],
+  ["9BA8",0xC37E],
+  ["9BA9",0xC37F],
+  ["9BAA",0xC380],
+  ["9BAB",0xC381],
+  ["9BAC",0xC382],
+  ["9BAD",0xC383],
+  ["9BAE",0xC385],
+  ["9BAF",0xC386],
+  ["9BB0",0xC387],
+  ["9BB1",0xC389],
+  ["9BB2",0xC38A],
+  ["9BB3",0xC38B],
+  ["9BB4",0xC38D],
+  ["9BB5",0xC38E],
+  ["9BB6",0xC38F],
+  ["9BB7",0xC390],
+  ["9BB8",0xC391],
+  ["9BB9",0xC392],
+  ["9BBA",0xC393],
+  ["9BBB",0xC394],
+  ["9BBC",0xC395],
+  ["9BBD",0xC396],
+  ["9BBE",0xC397],
+  ["9BBF",0xC398],
+  ["9BC0",0xC399],
+  ["9BC1",0xC39A],
+  ["9BC2",0xC39B],
+  ["9BC3",0xC39C],
+  ["9BC4",0xC39D],
+  ["9BC5",0xC39E],
+  ["9BC6",0xC39F],
+  ["9BC7",0xC3A0],
+  ["9BC8",0xC3A1],
+  ["9BC9",0xC3A2],
+  ["9BCA",0xC3A3],
+  ["9BCB",0xC3A4],
+  ["9BCC",0xC3A5],
+  ["9BCD",0xC3A6],
+  ["9BCE",0xC3A7],
+  ["9BCF",0xC3A8],
+  ["9BD0",0xC3A9],
+  ["9BD1",0xC3AA],
+  ["9BD2",0xC3AB],
+  ["9BD3",0xC3AC],
+  ["9BD4",0xC3AD],
+  ["9BD5",0xC3AE],
+  ["9BD6",0xC3AF],
+  ["9BD7",0xC3B0],
+  ["9BD8",0xC3B1],
+  ["9BD9",0xC3B2],
+  ["9BDA",0xC3B3],
+  ["9BDB",0xC3B4],
+  ["9BDC",0xC3B5],
+  ["9BDD",0xC3B6],
+  ["9BDE",0xC3B7],
+  ["9BDF",0xC3B8],
+  ["9BE0",0xC3B9],
+  ["9BE1",0xC3BA],
+  ["9BE2",0xC3BB],
+  ["9BE3",0xC3BC],
+  ["9BE4",0xC3BD],
+  ["9BE5",0xC3BE],
+  ["9BE6",0xC3BF],
+  ["9BE7",0xC3C1],
+  ["9BE8",0xC3C2],
+  ["9BE9",0xC3C3],
+  ["9BEA",0xC3C4],
+  ["9BEB",0xC3C5],
+  ["9BEC",0xC3C6],
+  ["9BED",0xC3C7],
+  ["9BEE",0xC3C8],
+  ["9BEF",0xC3C9],
+  ["9BF0",0xC3CA],
+  ["9BF1",0xC3CB],
+  ["9BF2",0xC3CC],
+  ["9BF3",0xC3CD],
+  ["9BF4",0xC3CE],
+  ["9BF5",0xC3CF],
+  ["9BF6",0xC3D0],
+  ["9BF7",0xC3D1],
+  ["9BF8",0xC3D2],
+  ["9BF9",0xC3D3],
+  ["9BFA",0xC3D4],
+  ["9BFB",0xC3D5],
+  ["9BFC",0xC3D6],
+  ["9BFD",0xC3D7],
+  ["9BFE",0xC3DA],
+  ["9C41",0xC3DB],
+  ["9C42",0xC3DD],
+  ["9C43",0xC3DE],
+  ["9C44",0xC3E1],
+  ["9C45",0xC3E3],
+  ["9C46",0xC3E4],
+  ["9C47",0xC3E5],
+  ["9C48",0xC3E6],
+  ["9C49",0xC3E7],
+  ["9C4A",0xC3EA],
+  ["9C4B",0xC3EB],
+  ["9C4C",0xC3EC],
+  ["9C4D",0xC3EE],
+  ["9C4E",0xC3EF],
+  ["9C4F",0xC3F0],
+  ["9C50",0xC3F1],
+  ["9C51",0xC3F2],
+  ["9C52",0xC3F3],
+  ["9C53",0xC3F6],
+  ["9C54",0xC3F7],
+  ["9C55",0xC3F9],
+  ["9C56",0xC3FA],
+  ["9C57",0xC3FB],
+  ["9C58",0xC3FC],
+  ["9C59",0xC3FD],
+  ["9C5A",0xC3FE],
+  ["9C61",0xC3FF],
+  ["9C62",0xC400],
+  ["9C63",0xC401],
+  ["9C64",0xC402],
+  ["9C65",0xC403],
+  ["9C66",0xC404],
+  ["9C67",0xC405],
+  ["9C68",0xC406],
+  ["9C69",0xC407],
+  ["9C6A",0xC409],
+  ["9C6B",0xC40A],
+  ["9C6C",0xC40B],
+  ["9C6D",0xC40C],
+  ["9C6E",0xC40D],
+  ["9C6F",0xC40E],
+  ["9C70",0xC40F],
+  ["9C71",0xC411],
+  ["9C72",0xC412],
+  ["9C73",0xC413],
+  ["9C74",0xC414],
+  ["9C75",0xC415],
+  ["9C76",0xC416],
+  ["9C77",0xC417],
+  ["9C78",0xC418],
+  ["9C79",0xC419],
+  ["9C7A",0xC41A],
+  ["9C81",0xC41B],
+  ["9C82",0xC41C],
+  ["9C83",0xC41D],
+  ["9C84",0xC41E],
+  ["9C85",0xC41F],
+  ["9C86",0xC420],
+  ["9C87",0xC421],
+  ["9C88",0xC422],
+  ["9C89",0xC423],
+  ["9C8A",0xC425],
+  ["9C8B",0xC426],
+  ["9C8C",0xC427],
+  ["9C8D",0xC428],
+  ["9C8E",0xC429],
+  ["9C8F",0xC42A],
+  ["9C90",0xC42B],
+  ["9C91",0xC42D],
+  ["9C92",0xC42E],
+  ["9C93",0xC42F],
+  ["9C94",0xC431],
+  ["9C95",0xC432],
+  ["9C96",0xC433],
+  ["9C97",0xC435],
+  ["9C98",0xC436],
+  ["9C99",0xC437],
+  ["9C9A",0xC438],
+  ["9C9B",0xC439],
+  ["9C9C",0xC43A],
+  ["9C9D",0xC43B],
+  ["9C9E",0xC43E],
+  ["9C9F",0xC43F],
+  ["9CA0",0xC440],
+  ["9CA1",0xC441],
+  ["9CA2",0xC442],
+  ["9CA3",0xC443],
+  ["9CA4",0xC444],
+  ["9CA5",0xC445],
+  ["9CA6",0xC446],
+  ["9CA7",0xC447],
+  ["9CA8",0xC449],
+  ["9CA9",0xC44A],
+  ["9CAA",0xC44B],
+  ["9CAB",0xC44C],
+  ["9CAC",0xC44D],
+  ["9CAD",0xC44E],
+  ["9CAE",0xC44F],
+  ["9CAF",0xC450],
+  ["9CB0",0xC451],
+  ["9CB1",0xC452],
+  ["9CB2",0xC453],
+  ["9CB3",0xC454],
+  ["9CB4",0xC455],
+  ["9CB5",0xC456],
+  ["9CB6",0xC457],
+  ["9CB7",0xC458],
+  ["9CB8",0xC459],
+  ["9CB9",0xC45A],
+  ["9CBA",0xC45B],
+  ["9CBB",0xC45C],
+  ["9CBC",0xC45D],
+  ["9CBD",0xC45E],
+  ["9CBE",0xC45F],
+  ["9CBF",0xC460],
+  ["9CC0",0xC461],
+  ["9CC1",0xC462],
+  ["9CC2",0xC463],
+  ["9CC3",0xC466],
+  ["9CC4",0xC467],
+  ["9CC5",0xC469],
+  ["9CC6",0xC46A],
+  ["9CC7",0xC46B],
+  ["9CC8",0xC46D],
+  ["9CC9",0xC46E],
+  ["9CCA",0xC46F],
+  ["9CCB",0xC470],
+  ["9CCC",0xC471],
+  ["9CCD",0xC472],
+  ["9CCE",0xC473],
+  ["9CCF",0xC476],
+  ["9CD0",0xC477],
+  ["9CD1",0xC478],
+  ["9CD2",0xC47A],
+  ["9CD3",0xC47B],
+  ["9CD4",0xC47C],
+  ["9CD5",0xC47D],
+  ["9CD6",0xC47E],
+  ["9CD7",0xC47F],
+  ["9CD8",0xC481],
+  ["9CD9",0xC482],
+  ["9CDA",0xC483],
+  ["9CDB",0xC484],
+  ["9CDC",0xC485],
+  ["9CDD",0xC486],
+  ["9CDE",0xC487],
+  ["9CDF",0xC488],
+  ["9CE0",0xC489],
+  ["9CE1",0xC48A],
+  ["9CE2",0xC48B],
+  ["9CE3",0xC48C],
+  ["9CE4",0xC48D],
+  ["9CE5",0xC48E],
+  ["9CE6",0xC48F],
+  ["9CE7",0xC490],
+  ["9CE8",0xC491],
+  ["9CE9",0xC492],
+  ["9CEA",0xC493],
+  ["9CEB",0xC495],
+  ["9CEC",0xC496],
+  ["9CED",0xC497],
+  ["9CEE",0xC498],
+  ["9CEF",0xC499],
+  ["9CF0",0xC49A],
+  ["9CF1",0xC49B],
+  ["9CF2",0xC49D],
+  ["9CF3",0xC49E],
+  ["9CF4",0xC49F],
+  ["9CF5",0xC4A0],
+  ["9CF6",0xC4A1],
+  ["9CF7",0xC4A2],
+  ["9CF8",0xC4A3],
+  ["9CF9",0xC4A4],
+  ["9CFA",0xC4A5],
+  ["9CFB",0xC4A6],
+  ["9CFC",0xC4A7],
+  ["9CFD",0xC4A8],
+  ["9CFE",0xC4A9],
+  ["9D41",0xC4AA],
+  ["9D42",0xC4AB],
+  ["9D43",0xC4AC],
+  ["9D44",0xC4AD],
+  ["9D45",0xC4AE],
+  ["9D46",0xC4AF],
+  ["9D47",0xC4B0],
+  ["9D48",0xC4B1],
+  ["9D49",0xC4B2],
+  ["9D4A",0xC4B3],
+  ["9D4B",0xC4B4],
+  ["9D4C",0xC4B5],
+  ["9D4D",0xC4B6],
+  ["9D4E",0xC4B7],
+  ["9D4F",0xC4B9],
+  ["9D50",0xC4BA],
+  ["9D51",0xC4BB],
+  ["9D52",0xC4BD],
+  ["9D53",0xC4BE],
+  ["9D54",0xC4BF],
+  ["9D55",0xC4C0],
+  ["9D56",0xC4C1],
+  ["9D57",0xC4C2],
+  ["9D58",0xC4C3],
+  ["9D59",0xC4C4],
+  ["9D5A",0xC4C5],
+  ["9D61",0xC4C6],
+  ["9D62",0xC4C7],
+  ["9D63",0xC4C8],
+  ["9D64",0xC4C9],
+  ["9D65",0xC4CA],
+  ["9D66",0xC4CB],
+  ["9D67",0xC4CC],
+  ["9D68",0xC4CD],
+  ["9D69",0xC4CE],
+  ["9D6A",0xC4CF],
+  ["9D6B",0xC4D0],
+  ["9D6C",0xC4D1],
+  ["9D6D",0xC4D2],
+  ["9D6E",0xC4D3],
+  ["9D6F",0xC4D4],
+  ["9D70",0xC4D5],
+  ["9D71",0xC4D6],
+  ["9D72",0xC4D7],
+  ["9D73",0xC4D8],
+  ["9D74",0xC4D9],
+  ["9D75",0xC4DA],
+  ["9D76",0xC4DB],
+  ["9D77",0xC4DC],
+  ["9D78",0xC4DD],
+  ["9D79",0xC4DE],
+  ["9D7A",0xC4DF],
+  ["9D81",0xC4E0],
+  ["9D82",0xC4E1],
+  ["9D83",0xC4E2],
+  ["9D84",0xC4E3],
+  ["9D85",0xC4E4],
+  ["9D86",0xC4E5],
+  ["9D87",0xC4E6],
+  ["9D88",0xC4E7],
+  ["9D89",0xC4E8],
+  ["9D8A",0xC4EA],
+  ["9D8B",0xC4EB],
+  ["9D8C",0xC4EC],
+  ["9D8D",0xC4ED],
+  ["9D8E",0xC4EE],
+  ["9D8F",0xC4EF],
+  ["9D90",0xC4F2],
+  ["9D91",0xC4F3],
+  ["9D92",0xC4F5],
+  ["9D93",0xC4F6],
+  ["9D94",0xC4F7],
+  ["9D95",0xC4F9],
+  ["9D96",0xC4FB],
+  ["9D97",0xC4FC],
+  ["9D98",0xC4FD],
+  ["9D99",0xC4FE],
+  ["9D9A",0xC502],
+  ["9D9B",0xC503],
+  ["9D9C",0xC504],
+  ["9D9D",0xC505],
+  ["9D9E",0xC506],
+  ["9D9F",0xC507],
+  ["9DA0",0xC508],
+  ["9DA1",0xC509],
+  ["9DA2",0xC50A],
+  ["9DA3",0xC50B],
+  ["9DA4",0xC50D],
+  ["9DA5",0xC50E],
+  ["9DA6",0xC50F],
+  ["9DA7",0xC511],
+  ["9DA8",0xC512],
+  ["9DA9",0xC513],
+  ["9DAA",0xC515],
+  ["9DAB",0xC516],
+  ["9DAC",0xC517],
+  ["9DAD",0xC518],
+  ["9DAE",0xC519],
+  ["9DAF",0xC51A],
+  ["9DB0",0xC51B],
+  ["9DB1",0xC51D],
+  ["9DB2",0xC51E],
+  ["9DB3",0xC51F],
+  ["9DB4",0xC520],
+  ["9DB5",0xC521],
+  ["9DB6",0xC522],
+  ["9DB7",0xC523],
+  ["9DB8",0xC524],
+  ["9DB9",0xC525],
+  ["9DBA",0xC526],
+  ["9DBB",0xC527],
+  ["9DBC",0xC52A],
+  ["9DBD",0xC52B],
+  ["9DBE",0xC52D],
+  ["9DBF",0xC52E],
+  ["9DC0",0xC52F],
+  ["9DC1",0xC531],
+  ["9DC2",0xC532],
+  ["9DC3",0xC533],
+  ["9DC4",0xC534],
+  ["9DC5",0xC535],
+  ["9DC6",0xC536],
+  ["9DC7",0xC537],
+  ["9DC8",0xC53A],
+  ["9DC9",0xC53C],
+  ["9DCA",0xC53E],
+  ["9DCB",0xC53F],
+  ["9DCC",0xC540],
+  ["9DCD",0xC541],
+  ["9DCE",0xC542],
+  ["9DCF",0xC543],
+  ["9DD0",0xC546],
+  ["9DD1",0xC547],
+  ["9DD2",0xC54B],
+  ["9DD3",0xC54F],
+  ["9DD4",0xC550],
+  ["9DD5",0xC551],
+  ["9DD6",0xC552],
+  ["9DD7",0xC556],
+  ["9DD8",0xC55A],
+  ["9DD9",0xC55B],
+  ["9DDA",0xC55C],
+  ["9DDB",0xC55F],
+  ["9DDC",0xC562],
+  ["9DDD",0xC563],
+  ["9DDE",0xC565],
+  ["9DDF",0xC566],
+  ["9DE0",0xC567],
+  ["9DE1",0xC569],
+  ["9DE2",0xC56A],
+  ["9DE3",0xC56B],
+  ["9DE4",0xC56C],
+  ["9DE5",0xC56D],
+  ["9DE6",0xC56E],
+  ["9DE7",0xC56F],
+  ["9DE8",0xC572],
+  ["9DE9",0xC576],
+  ["9DEA",0xC577],
+  ["9DEB",0xC578],
+  ["9DEC",0xC579],
+  ["9DED",0xC57A],
+  ["9DEE",0xC57B],
+  ["9DEF",0xC57E],
+  ["9DF0",0xC57F],
+  ["9DF1",0xC581],
+  ["9DF2",0xC582],
+  ["9DF3",0xC583],
+  ["9DF4",0xC585],
+  ["9DF5",0xC586],
+  ["9DF6",0xC588],
+  ["9DF7",0xC589],
+  ["9DF8",0xC58A],
+  ["9DF9",0xC58B],
+  ["9DFA",0xC58E],
+  ["9DFB",0xC590],
+  ["9DFC",0xC592],
+  ["9DFD",0xC593],
+  ["9DFE",0xC594],
+  ["9E41",0xC596],
+  ["9E42",0xC599],
+  ["9E43",0xC59A],
+  ["9E44",0xC59B],
+  ["9E45",0xC59D],
+  ["9E46",0xC59E],
+  ["9E47",0xC59F],
+  ["9E48",0xC5A1],
+  ["9E49",0xC5A2],
+  ["9E4A",0xC5A3],
+  ["9E4B",0xC5A4],
+  ["9E4C",0xC5A5],
+  ["9E4D",0xC5A6],
+  ["9E4E",0xC5A7],
+  ["9E4F",0xC5A8],
+  ["9E50",0xC5AA],
+  ["9E51",0xC5AB],
+  ["9E52",0xC5AC],
+  ["9E53",0xC5AD],
+  ["9E54",0xC5AE],
+  ["9E55",0xC5AF],
+  ["9E56",0xC5B0],
+  ["9E57",0xC5B1],
+  ["9E58",0xC5B2],
+  ["9E59",0xC5B3],
+  ["9E5A",0xC5B6],
+  ["9E61",0xC5B7],
+  ["9E62",0xC5BA],
+  ["9E63",0xC5BF],
+  ["9E64",0xC5C0],
+  ["9E65",0xC5C1],
+  ["9E66",0xC5C2],
+  ["9E67",0xC5C3],
+  ["9E68",0xC5CB],
+  ["9E69",0xC5CD],
+  ["9E6A",0xC5CF],
+  ["9E6B",0xC5D2],
+  ["9E6C",0xC5D3],
+  ["9E6D",0xC5D5],
+  ["9E6E",0xC5D6],
+  ["9E6F",0xC5D7],
+  ["9E70",0xC5D9],
+  ["9E71",0xC5DA],
+  ["9E72",0xC5DB],
+  ["9E73",0xC5DC],
+  ["9E74",0xC5DD],
+  ["9E75",0xC5DE],
+  ["9E76",0xC5DF],
+  ["9E77",0xC5E2],
+  ["9E78",0xC5E4],
+  ["9E79",0xC5E6],
+  ["9E7A",0xC5E7],
+  ["9E81",0xC5E8],
+  ["9E82",0xC5E9],
+  ["9E83",0xC5EA],
+  ["9E84",0xC5EB],
+  ["9E85",0xC5EF],
+  ["9E86",0xC5F1],
+  ["9E87",0xC5F2],
+  ["9E88",0xC5F3],
+  ["9E89",0xC5F5],
+  ["9E8A",0xC5F8],
+  ["9E8B",0xC5F9],
+  ["9E8C",0xC5FA],
+  ["9E8D",0xC5FB],
+  ["9E8E",0xC602],
+  ["9E8F",0xC603],
+  ["9E90",0xC604],
+  ["9E91",0xC609],
+  ["9E92",0xC60A],
+  ["9E93",0xC60B],
+  ["9E94",0xC60D],
+  ["9E95",0xC60E],
+  ["9E96",0xC60F],
+  ["9E97",0xC611],
+  ["9E98",0xC612],
+  ["9E99",0xC613],
+  ["9E9A",0xC614],
+  ["9E9B",0xC615],
+  ["9E9C",0xC616],
+  ["9E9D",0xC617],
+  ["9E9E",0xC61A],
+  ["9E9F",0xC61D],
+  ["9EA0",0xC61E],
+  ["9EA1",0xC61F],
+  ["9EA2",0xC620],
+  ["9EA3",0xC621],
+  ["9EA4",0xC622],
+  ["9EA5",0xC623],
+  ["9EA6",0xC626],
+  ["9EA7",0xC627],
+  ["9EA8",0xC629],
+  ["9EA9",0xC62A],
+  ["9EAA",0xC62B],
+  ["9EAB",0xC62F],
+  ["9EAC",0xC631],
+  ["9EAD",0xC632],
+  ["9EAE",0xC636],
+  ["9EAF",0xC638],
+  ["9EB0",0xC63A],
+  ["9EB1",0xC63C],
+  ["9EB2",0xC63D],
+  ["9EB3",0xC63E],
+  ["9EB4",0xC63F],
+  ["9EB5",0xC642],
+  ["9EB6",0xC643],
+  ["9EB7",0xC645],
+  ["9EB8",0xC646],
+  ["9EB9",0xC647],
+  ["9EBA",0xC649],
+  ["9EBB",0xC64A],
+  ["9EBC",0xC64B],
+  ["9EBD",0xC64C],
+  ["9EBE",0xC64D],
+  ["9EBF",0xC64E],
+  ["9EC0",0xC64F],
+  ["9EC1",0xC652],
+  ["9EC2",0xC656],
+  ["9EC3",0xC657],
+  ["9EC4",0xC658],
+  ["9EC5",0xC659],
+  ["9EC6",0xC65A],
+  ["9EC7",0xC65B],
+  ["9EC8",0xC65E],
+  ["9EC9",0xC65F],
+  ["9ECA",0xC661],
+  ["9ECB",0xC662],
+  ["9ECC",0xC663],
+  ["9ECD",0xC664],
+  ["9ECE",0xC665],
+  ["9ECF",0xC666],
+  ["9ED0",0xC667],
+  ["9ED1",0xC668],
+  ["9ED2",0xC669],
+  ["9ED3",0xC66A],
+  ["9ED4",0xC66B],
+  ["9ED5",0xC66D],
+  ["9ED6",0xC66E],
+  ["9ED7",0xC670],
+  ["9ED8",0xC672],
+  ["9ED9",0xC673],
+  ["9EDA",0xC674],
+  ["9EDB",0xC675],
+  ["9EDC",0xC676],
+  ["9EDD",0xC677],
+  ["9EDE",0xC67A],
+  ["9EDF",0xC67B],
+  ["9EE0",0xC67D],
+  ["9EE1",0xC67E],
+  ["9EE2",0xC67F],
+  ["9EE3",0xC681],
+  ["9EE4",0xC682],
+  ["9EE5",0xC683],
+  ["9EE6",0xC684],
+  ["9EE7",0xC685],
+  ["9EE8",0xC686],
+  ["9EE9",0xC687],
+  ["9EEA",0xC68A],
+  ["9EEB",0xC68C],
+  ["9EEC",0xC68E],
+  ["9EED",0xC68F],
+  ["9EEE",0xC690],
+  ["9EEF",0xC691],
+  ["9EF0",0xC692],
+  ["9EF1",0xC693],
+  ["9EF2",0xC696],
+  ["9EF3",0xC697],
+  ["9EF4",0xC699],
+  ["9EF5",0xC69A],
+  ["9EF6",0xC69B],
+  ["9EF7",0xC69D],
+  ["9EF8",0xC69E],
+  ["9EF9",0xC69F],
+  ["9EFA",0xC6A0],
+  ["9EFB",0xC6A1],
+  ["9EFC",0xC6A2],
+  ["9EFD",0xC6A3],
+  ["9EFE",0xC6A6],
+  ["9F41",0xC6A8],
+  ["9F42",0xC6AA],
+  ["9F43",0xC6AB],
+  ["9F44",0xC6AC],
+  ["9F45",0xC6AD],
+  ["9F46",0xC6AE],
+  ["9F47",0xC6AF],
+  ["9F48",0xC6B2],
+  ["9F49",0xC6B3],
+  ["9F4A",0xC6B5],
+  ["9F4B",0xC6B6],
+  ["9F4C",0xC6B7],
+  ["9F4D",0xC6BB],
+  ["9F4E",0xC6BC],
+  ["9F4F",0xC6BD],
+  ["9F50",0xC6BE],
+  ["9F51",0xC6BF],
+  ["9F52",0xC6C2],
+  ["9F53",0xC6C4],
+  ["9F54",0xC6C6],
+  ["9F55",0xC6C7],
+  ["9F56",0xC6C8],
+  ["9F57",0xC6C9],
+  ["9F58",0xC6CA],
+  ["9F59",0xC6CB],
+  ["9F5A",0xC6CE],
+  ["9F61",0xC6CF],
+  ["9F62",0xC6D1],
+  ["9F63",0xC6D2],
+  ["9F64",0xC6D3],
+  ["9F65",0xC6D5],
+  ["9F66",0xC6D6],
+  ["9F67",0xC6D7],
+  ["9F68",0xC6D8],
+  ["9F69",0xC6D9],
+  ["9F6A",0xC6DA],
+  ["9F6B",0xC6DB],
+  ["9F6C",0xC6DE],
+  ["9F6D",0xC6DF],
+  ["9F6E",0xC6E2],
+  ["9F6F",0xC6E3],
+  ["9F70",0xC6E4],
+  ["9F71",0xC6E5],
+  ["9F72",0xC6E6],
+  ["9F73",0xC6E7],
+  ["9F74",0xC6EA],
+  ["9F75",0xC6EB],
+  ["9F76",0xC6ED],
+  ["9F77",0xC6EE],
+  ["9F78",0xC6EF],
+  ["9F79",0xC6F1],
+  ["9F7A",0xC6F2],
+  ["9F81",0xC6F3],
+  ["9F82",0xC6F4],
+  ["9F83",0xC6F5],
+  ["9F84",0xC6F6],
+  ["9F85",0xC6F7],
+  ["9F86",0xC6FA],
+  ["9F87",0xC6FB],
+  ["9F88",0xC6FC],
+  ["9F89",0xC6FE],
+  ["9F8A",0xC6FF],
+  ["9F8B",0xC700],
+  ["9F8C",0xC701],
+  ["9F8D",0xC702],
+  ["9F8E",0xC703],
+  ["9F8F",0xC706],
+  ["9F90",0xC707],
+  ["9F91",0xC709],
+  ["9F92",0xC70A],
+  ["9F93",0xC70B],
+  ["9F94",0xC70D],
+  ["9F95",0xC70E],
+  ["9F96",0xC70F],
+  ["9F97",0xC710],
+  ["9F98",0xC711],
+  ["9F99",0xC712],
+  ["9F9A",0xC713],
+  ["9F9B",0xC716],
+  ["9F9C",0xC718],
+  ["9F9D",0xC71A],
+  ["9F9E",0xC71B],
+  ["9F9F",0xC71C],
+  ["9FA0",0xC71D],
+  ["9FA1",0xC71E],
+  ["9FA2",0xC71F],
+  ["9FA3",0xC722],
+  ["9FA4",0xC723],
+  ["9FA5",0xC725],
+  ["9FA6",0xC726],
+  ["9FA7",0xC727],
+  ["9FA8",0xC729],
+  ["9FA9",0xC72A],
+  ["9FAA",0xC72B],
+  ["9FAB",0xC72C],
+  ["9FAC",0xC72D],
+  ["9FAD",0xC72E],
+  ["9FAE",0xC72F],
+  ["9FAF",0xC732],
+  ["9FB0",0xC734],
+  ["9FB1",0xC736],
+  ["9FB2",0xC738],
+  ["9FB3",0xC739],
+  ["9FB4",0xC73A],
+  ["9FB5",0xC73B],
+  ["9FB6",0xC73E],
+  ["9FB7",0xC73F],
+  ["9FB8",0xC741],
+  ["9FB9",0xC742],
+  ["9FBA",0xC743],
+  ["9FBB",0xC745],
+  ["9FBC",0xC746],
+  ["9FBD",0xC747],
+  ["9FBE",0xC748],
+  ["9FBF",0xC749],
+  ["9FC0",0xC74B],
+  ["9FC1",0xC74E],
+  ["9FC2",0xC750],
+  ["9FC3",0xC759],
+  ["9FC4",0xC75A],
+  ["9FC5",0xC75B],
+  ["9FC6",0xC75D],
+  ["9FC7",0xC75E],
+  ["9FC8",0xC75F],
+  ["9FC9",0xC761],
+  ["9FCA",0xC762],
+  ["9FCB",0xC763],
+  ["9FCC",0xC764],
+  ["9FCD",0xC765],
+  ["9FCE",0xC766],
+  ["9FCF",0xC767],
+  ["9FD0",0xC769],
+  ["9FD1",0xC76A],
+  ["9FD2",0xC76C],
+  ["9FD3",0xC76D],
+  ["9FD4",0xC76E],
+  ["9FD5",0xC76F],
+  ["9FD6",0xC770],
+  ["9FD7",0xC771],
+  ["9FD8",0xC772],
+  ["9FD9",0xC773],
+  ["9FDA",0xC776],
+  ["9FDB",0xC777],
+  ["9FDC",0xC779],
+  ["9FDD",0xC77A],
+  ["9FDE",0xC77B],
+  ["9FDF",0xC77F],
+  ["9FE0",0xC780],
+  ["9FE1",0xC781],
+  ["9FE2",0xC782],
+  ["9FE3",0xC786],
+  ["9FE4",0xC78B],
+  ["9FE5",0xC78C],
+  ["9FE6",0xC78D],
+  ["9FE7",0xC78F],
+  ["9FE8",0xC792],
+  ["9FE9",0xC793],
+  ["9FEA",0xC795],
+  ["9FEB",0xC799],
+  ["9FEC",0xC79B],
+  ["9FED",0xC79C],
+  ["9FEE",0xC79D],
+  ["9FEF",0xC79E],
+  ["9FF0",0xC79F],
+  ["9FF1",0xC7A2],
+  ["9FF2",0xC7A7],
+  ["9FF3",0xC7A8],
+  ["9FF4",0xC7A9],
+  ["9FF5",0xC7AA],
+  ["9FF6",0xC7AB],
+  ["9FF7",0xC7AE],
+  ["9FF8",0xC7AF],
+  ["9FF9",0xC7B1],
+  ["9FFA",0xC7B2],
+  ["9FFB",0xC7B3],
+  ["9FFC",0xC7B5],
+  ["9FFD",0xC7B6],
+  ["9FFE",0xC7B7],
+  ["A041",0xC7B8],
+  ["A042",0xC7B9],
+  ["A043",0xC7BA],
+  ["A044",0xC7BB],
+  ["A045",0xC7BE],
+  ["A046",0xC7C2],
+  ["A047",0xC7C3],
+  ["A048",0xC7C4],
+  ["A049",0xC7C5],
+  ["A04A",0xC7C6],
+  ["A04B",0xC7C7],
+  ["A04C",0xC7CA],
+  ["A04D",0xC7CB],
+  ["A04E",0xC7CD],
+  ["A04F",0xC7CF],
+  ["A050",0xC7D1],
+  ["A051",0xC7D2],
+  ["A052",0xC7D3],
+  ["A053",0xC7D4],
+  ["A054",0xC7D5],
+  ["A055",0xC7D6],
+  ["A056",0xC7D7],
+  ["A057",0xC7D9],
+  ["A058",0xC7DA],
+  ["A059",0xC7DB],
+  ["A05A",0xC7DC],
+  ["A061",0xC7DE],
+  ["A062",0xC7DF],
+  ["A063",0xC7E0],
+  ["A064",0xC7E1],
+  ["A065",0xC7E2],
+  ["A066",0xC7E3],
+  ["A067",0xC7E5],
+  ["A068",0xC7E6],
+  ["A069",0xC7E7],
+  ["A06A",0xC7E9],
+  ["A06B",0xC7EA],
+  ["A06C",0xC7EB],
+  ["A06D",0xC7ED],
+  ["A06E",0xC7EE],
+  ["A06F",0xC7EF],
+  ["A070",0xC7F0],
+  ["A071",0xC7F1],
+  ["A072",0xC7F2],
+  ["A073",0xC7F3],
+  ["A074",0xC7F4],
+  ["A075",0xC7F5],
+  ["A076",0xC7F6],
+  ["A077",0xC7F7],
+  ["A078",0xC7F8],
+  ["A079",0xC7F9],
+  ["A07A",0xC7FA],
+  ["A081",0xC7FB],
+  ["A082",0xC7FC],
+  ["A083",0xC7FD],
+  ["A084",0xC7FE],
+  ["A085",0xC7FF],
+  ["A086",0xC802],
+  ["A087",0xC803],
+  ["A088",0xC805],
+  ["A089",0xC806],
+  ["A08A",0xC807],
+  ["A08B",0xC809],
+  ["A08C",0xC80B],
+  ["A08D",0xC80C],
+  ["A08E",0xC80D],
+  ["A08F",0xC80E],
+  ["A090",0xC80F],
+  ["A091",0xC812],
+  ["A092",0xC814],
+  ["A093",0xC817],
+  ["A094",0xC818],
+  ["A095",0xC819],
+  ["A096",0xC81A],
+  ["A097",0xC81B],
+  ["A098",0xC81E],
+  ["A099",0xC81F],
+  ["A09A",0xC821],
+  ["A09B",0xC822],
+  ["A09C",0xC823],
+  ["A09D",0xC825],
+  ["A09E",0xC826],
+  ["A09F",0xC827],
+  ["A0A0",0xC828],
+  ["A0A1",0xC829],
+  ["A0A2",0xC82A],
+  ["A0A3",0xC82B],
+  ["A0A4",0xC82E],
+  ["A0A5",0xC830],
+  ["A0A6",0xC832],
+  ["A0A7",0xC833],
+  ["A0A8",0xC834],
+  ["A0A9",0xC835],
+  ["A0AA",0xC836],
+  ["A0AB",0xC837],
+  ["A0AC",0xC839],
+  ["A0AD",0xC83A],
+  ["A0AE",0xC83B],
+  ["A0AF",0xC83D],
+  ["A0B0",0xC83E],
+  ["A0B1",0xC83F],
+  ["A0B2",0xC841],
+  ["A0B3",0xC842],
+  ["A0B4",0xC843],
+  ["A0B5",0xC844],
+  ["A0B6",0xC845],
+  ["A0B7",0xC846],
+  ["A0B8",0xC847],
+  ["A0B9",0xC84A],
+  ["A0BA",0xC84B],
+  ["A0BB",0xC84E],
+  ["A0BC",0xC84F],
+  ["A0BD",0xC850],
+  ["A0BE",0xC851],
+  ["A0BF",0xC852],
+  ["A0C0",0xC853],
+  ["A0C1",0xC855],
+  ["A0C2",0xC856],
+  ["A0C3",0xC857],
+  ["A0C4",0xC858],
+  ["A0C5",0xC859],
+  ["A0C6",0xC85A],
+  ["A0C7",0xC85B],
+  ["A0C8",0xC85C],
+  ["A0C9",0xC85D],
+  ["A0CA",0xC85E],
+  ["A0CB",0xC85F],
+  ["A0CC",0xC860],
+  ["A0CD",0xC861],
+  ["A0CE",0xC862],
+  ["A0CF",0xC863],
+  ["A0D0",0xC864],
+  ["A0D1",0xC865],
+  ["A0D2",0xC866],
+  ["A0D3",0xC867],
+  ["A0D4",0xC868],
+  ["A0D5",0xC869],
+  ["A0D6",0xC86A],
+  ["A0D7",0xC86B],
+  ["A0D8",0xC86C],
+  ["A0D9",0xC86D],
+  ["A0DA",0xC86E],
+  ["A0DB",0xC86F],
+  ["A0DC",0xC872],
+  ["A0DD",0xC873],
+  ["A0DE",0xC875],
+  ["A0DF",0xC876],
+  ["A0E0",0xC877],
+  ["A0E1",0xC879],
+  ["A0E2",0xC87B],
+  ["A0E3",0xC87C],
+  ["A0E4",0xC87D],
+  ["A0E5",0xC87E],
+  ["A0E6",0xC87F],
+  ["A0E7",0xC882],
+  ["A0E8",0xC884],
+  ["A0E9",0xC888],
+  ["A0EA",0xC889],
+  ["A0EB",0xC88A],
+  ["A0EC",0xC88E],
+  ["A0ED",0xC88F],
+  ["A0EE",0xC890],
+  ["A0EF",0xC891],
+  ["A0F0",0xC892],
+  ["A0F1",0xC893],
+  ["A0F2",0xC895],
+  ["A0F3",0xC896],
+  ["A0F4",0xC897],
+  ["A0F5",0xC898],
+  ["A0F6",0xC899],
+  ["A0F7",0xC89A],
+  ["A0F8",0xC89B],
+  ["A0F9",0xC89C],
+  ["A0FA",0xC89E],
+  ["A0FB",0xC8A0],
+  ["A0FC",0xC8A2],
+  ["A0FD",0xC8A3],
+  ["A0FE",0xC8A4],
+  ["A141",0xC8A5],
+  ["A142",0xC8A6],
+  ["A143",0xC8A7],
+  ["A144",0xC8A9],
+  ["A145",0xC8AA],
+  ["A146",0xC8AB],
+  ["A147",0xC8AC],
+  ["A148",0xC8AD],
+  ["A149",0xC8AE],
+  ["A14A",0xC8AF],
+  ["A14B",0xC8B0],
+  ["A14C",0xC8B1],
+  ["A14D",0xC8B2],
+  ["A14E",0xC8B3],
+  ["A14F",0xC8B4],
+  ["A150",0xC8B5],
+  ["A151",0xC8B6],
+  ["A152",0xC8B7],
+  ["A153",0xC8B8],
+  ["A154",0xC8B9],
+  ["A155",0xC8BA],
+  ["A156",0xC8BB],
+  ["A157",0xC8BE],
+  ["A158",0xC8BF],
+  ["A159",0xC8C0],
+  ["A15A",0xC8C1],
+  ["A161",0xC8C2],
+  ["A162",0xC8C3],
+  ["A163",0xC8C5],
+  ["A164",0xC8C6],
+  ["A165",0xC8C7],
+  ["A166",0xC8C9],
+  ["A167",0xC8CA],
+  ["A168",0xC8CB],
+  ["A169",0xC8CD],
+  ["A16A",0xC8CE],
+  ["A16B",0xC8CF],
+  ["A16C",0xC8D0],
+  ["A16D",0xC8D1],
+  ["A16E",0xC8D2],
+  ["A16F",0xC8D3],
+  ["A170",0xC8D6],
+  ["A171",0xC8D8],
+  ["A172",0xC8DA],
+  ["A173",0xC8DB],
+  ["A174",0xC8DC],
+  ["A175",0xC8DD],
+  ["A176",0xC8DE],
+  ["A177",0xC8DF],
+  ["A178",0xC8E2],
+  ["A179",0xC8E3],
+  ["A17A",0xC8E5],
+  ["A181",0xC8E6],
+  ["A182",0xC8E7],
+  ["A183",0xC8E8],
+  ["A184",0xC8E9],
+  ["A185",0xC8EA],
+  ["A186",0xC8EB],
+  ["A187",0xC8EC],
+  ["A188",0xC8ED],
+  ["A189",0xC8EE],
+  ["A18A",0xC8EF],
+  ["A18B",0xC8F0],
+  ["A18C",0xC8F1],
+  ["A18D",0xC8F2],
+  ["A18E",0xC8F3],
+  ["A18F",0xC8F4],
+  ["A190",0xC8F6],
+  ["A191",0xC8F7],
+  ["A192",0xC8F8],
+  ["A193",0xC8F9],
+  ["A194",0xC8FA],
+  ["A195",0xC8FB],
+  ["A196",0xC8FE],
+  ["A197",0xC8FF],
+  ["A198",0xC901],
+  ["A199",0xC902],
+  ["A19A",0xC903],
+  ["A19B",0xC907],
+  ["A19C",0xC908],
+  ["A19D",0xC909],
+  ["A19E",0xC90A],
+  ["A19F",0xC90B],
+  ["A1A0",0xC90E],
+  ["A241",0xC910],
+  ["A242",0xC912],
+  ["A243",0xC913],
+  ["A244",0xC914],
+  ["A245",0xC915],
+  ["A246",0xC916],
+  ["A247",0xC917],
+  ["A248",0xC919],
+  ["A249",0xC91A],
+  ["A24A",0xC91B],
+  ["A24B",0xC91C],
+  ["A24C",0xC91D],
+  ["A24D",0xC91E],
+  ["A24E",0xC91F],
+  ["A24F",0xC920],
+  ["A250",0xC921],
+  ["A251",0xC922],
+  ["A252",0xC923],
+  ["A253",0xC924],
+  ["A254",0xC925],
+  ["A255",0xC926],
+  ["A256",0xC927],
+  ["A257",0xC928],
+  ["A258",0xC929],
+  ["A259",0xC92A],
+  ["A25A",0xC92B],
+  ["A261",0xC92D],
+  ["A262",0xC92E],
+  ["A263",0xC92F],
+  ["A264",0xC930],
+  ["A265",0xC931],
+  ["A266",0xC932],
+  ["A267",0xC933],
+  ["A268",0xC935],
+  ["A269",0xC936],
+  ["A26A",0xC937],
+  ["A26B",0xC938],
+  ["A26C",0xC939],
+  ["A26D",0xC93A],
+  ["A26E",0xC93B],
+  ["A26F",0xC93C],
+  ["A270",0xC93D],
+  ["A271",0xC93E],
+  ["A272",0xC93F],
+  ["A273",0xC940],
+  ["A274",0xC941],
+  ["A275",0xC942],
+  ["A276",0xC943],
+  ["A277",0xC944],
+  ["A278",0xC945],
+  ["A279",0xC946],
+  ["A27A",0xC947],
+  ["A281",0xC948],
+  ["A282",0xC949],
+  ["A283",0xC94A],
+  ["A284",0xC94B],
+  ["A285",0xC94C],
+  ["A286",0xC94D],
+  ["A287",0xC94E],
+  ["A288",0xC94F],
+  ["A289",0xC952],
+  ["A28A",0xC953],
+  ["A28B",0xC955],
+  ["A28C",0xC956],
+  ["A28D",0xC957],
+  ["A28E",0xC959],
+  ["A28F",0xC95A],
+  ["A290",0xC95B],
+  ["A291",0xC95C],
+  ["A292",0xC95D],
+  ["A293",0xC95E],
+  ["A294",0xC95F],
+  ["A295",0xC962],
+  ["A296",0xC964],
+  ["A297",0xC965],
+  ["A298",0xC966],
+  ["A299",0xC967],
+  ["A29A",0xC968],
+  ["A29B",0xC969],
+  ["A29C",0xC96A],
+  ["A29D",0xC96B],
+  ["A29E",0xC96D],
+  ["A29F",0xC96E],
+  ["A2A0",0xC96F],
+  ["A2E6",0x20AC],
+  ["A2E7",0xAE],
+  ["A341",0xC971],
+  ["A342",0xC972],
+  ["A343",0xC973],
+  ["A344",0xC975],
+  ["A345",0xC976],
+  ["A346",0xC977],
+  ["A347",0xC978],
+  ["A348",0xC979],
+  ["A349",0xC97A],
+  ["A34A",0xC97B],
+  ["A34B",0xC97D],
+  ["A34C",0xC97E],
+  ["A34D",0xC97F],
+  ["A34E",0xC980],
+  ["A34F",0xC981],
+  ["A350",0xC982],
+  ["A351",0xC983],
+  ["A352",0xC984],
+  ["A353",0xC985],
+  ["A354",0xC986],
+  ["A355",0xC987],
+  ["A356",0xC98A],
+  ["A357",0xC98B],
+  ["A358",0xC98D],
+  ["A359",0xC98E],
+  ["A35A",0xC98F],
+  ["A361",0xC991],
+  ["A362",0xC992],
+  ["A363",0xC993],
+  ["A364",0xC994],
+  ["A365",0xC995],
+  ["A366",0xC996],
+  ["A367",0xC997],
+  ["A368",0xC99A],
+  ["A369",0xC99C],
+  ["A36A",0xC99E],
+  ["A36B",0xC99F],
+  ["A36C",0xC9A0],
+  ["A36D",0xC9A1],
+  ["A36E",0xC9A2],
+  ["A36F",0xC9A3],
+  ["A370",0xC9A4],
+  ["A371",0xC9A5],
+  ["A372",0xC9A6],
+  ["A373",0xC9A7],
+  ["A374",0xC9A8],
+  ["A375",0xC9A9],
+  ["A376",0xC9AA],
+  ["A377",0xC9AB],
+  ["A378",0xC9AC],
+  ["A379",0xC9AD],
+  ["A37A",0xC9AE],
+  ["A381",0xC9AF],
+  ["A382",0xC9B0],
+  ["A383",0xC9B1],
+  ["A384",0xC9B2],
+  ["A385",0xC9B3],
+  ["A386",0xC9B4],
+  ["A387",0xC9B5],
+  ["A388",0xC9B6],
+  ["A389",0xC9B7],
+  ["A38A",0xC9B8],
+  ["A38B",0xC9B9],
+  ["A38C",0xC9BA],
+  ["A38D",0xC9BB],
+  ["A38E",0xC9BC],
+  ["A38F",0xC9BD],
+  ["A390",0xC9BE],
+  ["A391",0xC9BF],
+  ["A392",0xC9C2],
+  ["A393",0xC9C3],
+  ["A394",0xC9C5],
+  ["A395",0xC9C6],
+  ["A396",0xC9C9],
+  ["A397",0xC9CB],
+  ["A398",0xC9CC],
+  ["A399",0xC9CD],
+  ["A39A",0xC9CE],
+  ["A39B",0xC9CF],
+  ["A39C",0xC9D2],
+  ["A39D",0xC9D4],
+  ["A39E",0xC9D7],
+  ["A39F",0xC9D8],
+  ["A3A0",0xC9DB],
+  ["A441",0xC9DE],
+  ["A442",0xC9DF],
+  ["A443",0xC9E1],
+  ["A444",0xC9E3],
+  ["A445",0xC9E5],
+  ["A446",0xC9E6],
+  ["A447",0xC9E8],
+  ["A448",0xC9E9],
+  ["A449",0xC9EA],
+  ["A44A",0xC9EB],
+  ["A44B",0xC9EE],
+  ["A44C",0xC9F2],
+  ["A44D",0xC9F3],
+  ["A44E",0xC9F4],
+  ["A44F",0xC9F5],
+  ["A450",0xC9F6],
+  ["A451",0xC9F7],
+  ["A452",0xC9FA],
+  ["A453",0xC9FB],
+  ["A454",0xC9FD],
+  ["A455",0xC9FE],
+  ["A456",0xC9FF],
+  ["A457",0xCA01],
+  ["A458",0xCA02],
+  ["A459",0xCA03],
+  ["A45A",0xCA04],
+  ["A461",0xCA05],
+  ["A462",0xCA06],
+  ["A463",0xCA07],
+  ["A464",0xCA0A],
+  ["A465",0xCA0E],
+  ["A466",0xCA0F],
+  ["A467",0xCA10],
+  ["A468",0xCA11],
+  ["A469",0xCA12],
+  ["A46A",0xCA13],
+  ["A46B",0xCA15],
+  ["A46C",0xCA16],
+  ["A46D",0xCA17],
+  ["A46E",0xCA19],
+  ["A46F",0xCA1A],
+  ["A470",0xCA1B],
+  ["A471",0xCA1C],
+  ["A472",0xCA1D],
+  ["A473",0xCA1E],
+  ["A474",0xCA1F],
+  ["A475",0xCA20],
+  ["A476",0xCA21],
+  ["A477",0xCA22],
+  ["A478",0xCA23],
+  ["A479",0xCA24],
+  ["A47A",0xCA25],
+  ["A481",0xCA26],
+  ["A482",0xCA27],
+  ["A483",0xCA28],
+  ["A484",0xCA2A],
+  ["A485",0xCA2B],
+  ["A486",0xCA2C],
+  ["A487",0xCA2D],
+  ["A488",0xCA2E],
+  ["A489",0xCA2F],
+  ["A48A",0xCA30],
+  ["A48B",0xCA31],
+  ["A48C",0xCA32],
+  ["A48D",0xCA33],
+  ["A48E",0xCA34],
+  ["A48F",0xCA35],
+  ["A490",0xCA36],
+  ["A491",0xCA37],
+  ["A492",0xCA38],
+  ["A493",0xCA39],
+  ["A494",0xCA3A],
+  ["A495",0xCA3B],
+  ["A496",0xCA3C],
+  ["A497",0xCA3D],
+  ["A498",0xCA3E],
+  ["A499",0xCA3F],
+  ["A49A",0xCA40],
+  ["A49B",0xCA41],
+  ["A49C",0xCA42],
+  ["A49D",0xCA43],
+  ["A49E",0xCA44],
+  ["A49F",0xCA45],
+  ["A4A0",0xCA46],
+  ["A541",0xCA47],
+  ["A542",0xCA48],
+  ["A543",0xCA49],
+  ["A544",0xCA4A],
+  ["A545",0xCA4B],
+  ["A546",0xCA4E],
+  ["A547",0xCA4F],
+  ["A548",0xCA51],
+  ["A549",0xCA52],
+  ["A54A",0xCA53],
+  ["A54B",0xCA55],
+  ["A54C",0xCA56],
+  ["A54D",0xCA57],
+  ["A54E",0xCA58],
+  ["A54F",0xCA59],
+  ["A550",0xCA5A],
+  ["A551",0xCA5B],
+  ["A552",0xCA5E],
+  ["A553",0xCA62],
+  ["A554",0xCA63],
+  ["A555",0xCA64],
+  ["A556",0xCA65],
+  ["A557",0xCA66],
+  ["A558",0xCA67],
+  ["A559",0xCA69],
+  ["A55A",0xCA6A],
+  ["A561",0xCA6B],
+  ["A562",0xCA6C],
+  ["A563",0xCA6D],
+  ["A564",0xCA6E],
+  ["A565",0xCA6F],
+  ["A566",0xCA70],
+  ["A567",0xCA71],
+  ["A568",0xCA72],
+  ["A569",0xCA73],
+  ["A56A",0xCA74],
+  ["A56B",0xCA75],
+  ["A56C",0xCA76],
+  ["A56D",0xCA77],
+  ["A56E",0xCA78],
+  ["A56F",0xCA79],
+  ["A570",0xCA7A],
+  ["A571",0xCA7B],
+  ["A572",0xCA7C],
+  ["A573",0xCA7E],
+  ["A574",0xCA7F],
+  ["A575",0xCA80],
+  ["A576",0xCA81],
+  ["A577",0xCA82],
+  ["A578",0xCA83],
+  ["A579",0xCA85],
+  ["A57A",0xCA86],
+  ["A581",0xCA87],
+  ["A582",0xCA88],
+  ["A583",0xCA89],
+  ["A584",0xCA8A],
+  ["A585",0xCA8B],
+  ["A586",0xCA8C],
+  ["A587",0xCA8D],
+  ["A588",0xCA8E],
+  ["A589",0xCA8F],
+  ["A58A",0xCA90],
+  ["A58B",0xCA91],
+  ["A58C",0xCA92],
+  ["A58D",0xCA93],
+  ["A58E",0xCA94],
+  ["A58F",0xCA95],
+  ["A590",0xCA96],
+  ["A591",0xCA97],
+  ["A592",0xCA99],
+  ["A593",0xCA9A],
+  ["A594",0xCA9B],
+  ["A595",0xCA9C],
+  ["A596",0xCA9D],
+  ["A597",0xCA9E],
+  ["A598",0xCA9F],
+  ["A599",0xCAA0],
+  ["A59A",0xCAA1],
+  ["A59B",0xCAA2],
+  ["A59C",0xCAA3],
+  ["A59D",0xCAA4],
+  ["A59E",0xCAA5],
+  ["A59F",0xCAA6],
+  ["A5A0",0xCAA7],
+  ["A641",0xCAA8],
+  ["A642",0xCAA9],
+  ["A643",0xCAAA],
+  ["A644",0xCAAB],
+  ["A645",0xCAAC],
+  ["A646",0xCAAD],
+  ["A647",0xCAAE],
+  ["A648",0xCAAF],
+  ["A649",0xCAB0],
+  ["A64A",0xCAB1],
+  ["A64B",0xCAB2],
+  ["A64C",0xCAB3],
+  ["A64D",0xCAB4],
+  ["A64E",0xCAB5],
+  ["A64F",0xCAB6],
+  ["A650",0xCAB7],
+  ["A651",0xCAB8],
+  ["A652",0xCAB9],
+  ["A653",0xCABA],
+  ["A654",0xCABB],
+  ["A655",0xCABE],
+  ["A656",0xCABF],
+  ["A657",0xCAC1],
+  ["A658",0xCAC2],
+  ["A659",0xCAC3],
+  ["A65A",0xCAC5],
+  ["A661",0xCAC6],
+  ["A662",0xCAC7],
+  ["A663",0xCAC8],
+  ["A664",0xCAC9],
+  ["A665",0xCACA],
+  ["A666",0xCACB],
+  ["A667",0xCACE],
+  ["A668",0xCAD0],
+  ["A669",0xCAD2],
+  ["A66A",0xCAD4],
+  ["A66B",0xCAD5],
+  ["A66C",0xCAD6],
+  ["A66D",0xCAD7],
+  ["A66E",0xCADA],
+  ["A66F",0xCADB],
+  ["A670",0xCADC],
+  ["A671",0xCADD],
+  ["A672",0xCADE],
+  ["A673",0xCADF],
+  ["A674",0xCAE1],
+  ["A675",0xCAE2],
+  ["A676",0xCAE3],
+  ["A677",0xCAE4],
+  ["A678",0xCAE5],
+  ["A679",0xCAE6],
+  ["A67A",0xCAE7],
+  ["A681",0xCAE8],
+  ["A682",0xCAE9],
+  ["A683",0xCAEA],
+  ["A684",0xCAEB],
+  ["A685",0xCAED],
+  ["A686",0xCAEE],
+  ["A687",0xCAEF],
+  ["A688",0xCAF0],
+  ["A689",0xCAF1],
+  ["A68A",0xCAF2],
+  ["A68B",0xCAF3],
+  ["A68C",0xCAF5],
+  ["A68D",0xCAF6],
+  ["A68E",0xCAF7],
+  ["A68F",0xCAF8],
+  ["A690",0xCAF9],
+  ["A691",0xCAFA],
+  ["A692",0xCAFB],
+  ["A693",0xCAFC],
+  ["A694",0xCAFD],
+  ["A695",0xCAFE],
+  ["A696",0xCAFF],
+  ["A697",0xCB00],
+  ["A698",0xCB01],
+  ["A699",0xCB02],
+  ["A69A",0xCB03],
+  ["A69B",0xCB04],
+  ["A69C",0xCB05],
+  ["A69D",0xCB06],
+  ["A69E",0xCB07],
+  ["A69F",0xCB09],
+  ["A6A0",0xCB0A],
+  ["A741",0xCB0B],
+  ["A742",0xCB0C],
+  ["A743",0xCB0D],
+  ["A744",0xCB0E],
+  ["A745",0xCB0F],
+  ["A746",0xCB11],
+  ["A747",0xCB12],
+  ["A748",0xCB13],
+  ["A749",0xCB15],
+  ["A74A",0xCB16],
+  ["A74B",0xCB17],
+  ["A74C",0xCB19],
+  ["A74D",0xCB1A],
+  ["A74E",0xCB1B],
+  ["A74F",0xCB1C],
+  ["A750",0xCB1D],
+  ["A751",0xCB1E],
+  ["A752",0xCB1F],
+  ["A753",0xCB22],
+  ["A754",0xCB23],
+  ["A755",0xCB24],
+  ["A756",0xCB25],
+  ["A757",0xCB26],
+  ["A758",0xCB27],
+  ["A759",0xCB28],
+  ["A75A",0xCB29],
+  ["A761",0xCB2A],
+  ["A762",0xCB2B],
+  ["A763",0xCB2C],
+  ["A764",0xCB2D],
+  ["A765",0xCB2E],
+  ["A766",0xCB2F],
+  ["A767",0xCB30],
+  ["A768",0xCB31],
+  ["A769",0xCB32],
+  ["A76A",0xCB33],
+  ["A76B",0xCB34],
+  ["A76C",0xCB35],
+  ["A76D",0xCB36],
+  ["A76E",0xCB37],
+  ["A76F",0xCB38],
+  ["A770",0xCB39],
+  ["A771",0xCB3A],
+  ["A772",0xCB3B],
+  ["A773",0xCB3C],
+  ["A774",0xCB3D],
+  ["A775",0xCB3E],
+  ["A776",0xCB3F],
+  ["A777",0xCB40],
+  ["A778",0xCB42],
+  ["A779",0xCB43],
+  ["A77A",0xCB44],
+  ["A781",0xCB45],
+  ["A782",0xCB46],
+  ["A783",0xCB47],
+  ["A784",0xCB4A],
+  ["A785",0xCB4B],
+  ["A786",0xCB4D],
+  ["A787",0xCB4E],
+  ["A788",0xCB4F],
+  ["A789",0xCB51],
+  ["A78A",0xCB52],
+  ["A78B",0xCB53],
+  ["A78C",0xCB54],
+  ["A78D",0xCB55],
+  ["A78E",0xCB56],
+  ["A78F",0xCB57],
+  ["A790",0xCB5A],
+  ["A791",0xCB5B],
+  ["A792",0xCB5C],
+  ["A793",0xCB5E],
+  ["A794",0xCB5F],
+  ["A795",0xCB60],
+  ["A796",0xCB61],
+  ["A797",0xCB62],
+  ["A798",0xCB63],
+  ["A799",0xCB65],
+  ["A79A",0xCB66],
+  ["A79B",0xCB67],
+  ["A79C",0xCB68],
+  ["A79D",0xCB69],
+  ["A79E",0xCB6A],
+  ["A79F",0xCB6B],
+  ["A7A0",0xCB6C],
+  ["A841",0xCB6D],
+  ["A842",0xCB6E],
+  ["A843",0xCB6F],
+  ["A844",0xCB70],
+  ["A845",0xCB71],
+  ["A846",0xCB72],
+  ["A847",0xCB73],
+  ["A848",0xCB74],
+  ["A849",0xCB75],
+  ["A84A",0xCB76],
+  ["A84B",0xCB77],
+  ["A84C",0xCB7A],
+  ["A84D",0xCB7B],
+  ["A84E",0xCB7C],
+  ["A84F",0xCB7D],
+  ["A850",0xCB7E],
+  ["A851",0xCB7F],
+  ["A852",0xCB80],
+  ["A853",0xCB81],
+  ["A854",0xCB82],
+  ["A855",0xCB83],
+  ["A856",0xCB84],
+  ["A857",0xCB85],
+  ["A858",0xCB86],
+  ["A859",0xCB87],
+  ["A85A",0xCB88],
+  ["A861",0xCB89],
+  ["A862",0xCB8A],
+  ["A863",0xCB8B],
+  ["A864",0xCB8C],
+  ["A865",0xCB8D],
+  ["A866",0xCB8E],
+  ["A867",0xCB8F],
+  ["A868",0xCB90],
+  ["A869",0xCB91],
+  ["A86A",0xCB92],
+  ["A86B",0xCB93],
+  ["A86C",0xCB94],
+  ["A86D",0xCB95],
+  ["A86E",0xCB96],
+  ["A86F",0xCB97],
+  ["A870",0xCB98],
+  ["A871",0xCB99],
+  ["A872",0xCB9A],
+  ["A873",0xCB9B],
+  ["A874",0xCB9D],
+  ["A875",0xCB9E],
+  ["A876",0xCB9F],
+  ["A877",0xCBA0],
+  ["A878",0xCBA1],
+  ["A879",0xCBA2],
+  ["A87A",0xCBA3],
+  ["A881",0xCBA4],
+  ["A882",0xCBA5],
+  ["A883",0xCBA6],
+  ["A884",0xCBA7],
+  ["A885",0xCBA8],
+  ["A886",0xCBA9],
+  ["A887",0xCBAA],
+  ["A888",0xCBAB],
+  ["A889",0xCBAC],
+  ["A88A",0xCBAD],
+  ["A88B",0xCBAE],
+  ["A88C",0xCBAF],
+  ["A88D",0xCBB0],
+  ["A88E",0xCBB1],
+  ["A88F",0xCBB2],
+  ["A890",0xCBB3],
+  ["A891",0xCBB4],
+  ["A892",0xCBB5],
+  ["A893",0xCBB6],
+  ["A894",0xCBB7],
+  ["A895",0xCBB9],
+  ["A896",0xCBBA],
+  ["A897",0xCBBB],
+  ["A898",0xCBBC],
+  ["A899",0xCBBD],
+  ["A89A",0xCBBE],
+  ["A89B",0xCBBF],
+  ["A89C",0xCBC0],
+  ["A89D",0xCBC1],
+  ["A89E",0xCBC2],
+  ["A89F",0xCBC3],
+  ["A8A0",0xCBC4],
+  ["A941",0xCBC5],
+  ["A942",0xCBC6],
+  ["A943",0xCBC7],
+  ["A944",0xCBC8],
+  ["A945",0xCBC9],
+  ["A946",0xCBCA],
+  ["A947",0xCBCB],
+  ["A948",0xCBCC],
+  ["A949",0xCBCD],
+  ["A94A",0xCBCE],
+  ["A94B",0xCBCF],
+  ["A94C",0xCBD0],
+  ["A94D",0xCBD1],
+  ["A94E",0xCBD2],
+  ["A94F",0xCBD3],
+  ["A950",0xCBD5],
+  ["A951",0xCBD6],
+  ["A952",0xCBD7],
+  ["A953",0xCBD8],
+  ["A954",0xCBD9],
+  ["A955",0xCBDA],
+  ["A956",0xCBDB],
+  ["A957",0xCBDC],
+  ["A958",0xCBDD],
+  ["A959",0xCBDE],
+  ["A95A",0xCBDF],
+  ["A961",0xCBE0],
+  ["A962",0xCBE1],
+  ["A963",0xCBE2],
+  ["A964",0xCBE3],
+  ["A965",0xCBE5],
+  ["A966",0xCBE6],
+  ["A967",0xCBE8],
+  ["A968",0xCBEA],
+  ["A969",0xCBEB],
+  ["A96A",0xCBEC],
+  ["A96B",0xCBED],
+  ["A96C",0xCBEE],
+  ["A96D",0xCBEF],
+  ["A96E",0xCBF0],
+  ["A96F",0xCBF1],
+  ["A970",0xCBF2],
+  ["A971",0xCBF3],
+  ["A972",0xCBF4],
+  ["A973",0xCBF5],
+  ["A974",0xCBF6],
+  ["A975",0xCBF7],
+  ["A976",0xCBF8],
+  ["A977",0xCBF9],
+  ["A978",0xCBFA],
+  ["A979",0xCBFB],
+  ["A97A",0xCBFC],
+  ["A981",0xCBFD],
+  ["A982",0xCBFE],
+  ["A983",0xCBFF],
+  ["A984",0xCC00],
+  ["A985",0xCC01],
+  ["A986",0xCC02],
+  ["A987",0xCC03],
+  ["A988",0xCC04],
+  ["A989",0xCC05],
+  ["A98A",0xCC06],
+  ["A98B",0xCC07],
+  ["A98C",0xCC08],
+  ["A98D",0xCC09],
+  ["A98E",0xCC0A],
+  ["A98F",0xCC0B],
+  ["A990",0xCC0E],
+  ["A991",0xCC0F],
+  ["A992",0xCC11],
+  ["A993",0xCC12],
+  ["A994",0xCC13],
+  ["A995",0xCC15],
+  ["A996",0xCC16],
+  ["A997",0xCC17],
+  ["A998",0xCC18],
+  ["A999",0xCC19],
+  ["A99A",0xCC1A],
+  ["A99B",0xCC1B],
+  ["A99C",0xCC1E],
+  ["A99D",0xCC1F],
+  ["A99E",0xCC20],
+  ["A99F",0xCC23],
+  ["A9A0",0xCC24],
+  ["AA41",0xCC25],
+  ["AA42",0xCC26],
+  ["AA43",0xCC2A],
+  ["AA44",0xCC2B],
+  ["AA45",0xCC2D],
+  ["AA46",0xCC2F],
+  ["AA47",0xCC31],
+  ["AA48",0xCC32],
+  ["AA49",0xCC33],
+  ["AA4A",0xCC34],
+  ["AA4B",0xCC35],
+  ["AA4C",0xCC36],
+  ["AA4D",0xCC37],
+  ["AA4E",0xCC3A],
+  ["AA4F",0xCC3F],
+  ["AA50",0xCC40],
+  ["AA51",0xCC41],
+  ["AA52",0xCC42],
+  ["AA53",0xCC43],
+  ["AA54",0xCC46],
+  ["AA55",0xCC47],
+  ["AA56",0xCC49],
+  ["AA57",0xCC4A],
+  ["AA58",0xCC4B],
+  ["AA59",0xCC4D],
+  ["AA5A",0xCC4E],
+  ["AA61",0xCC4F],
+  ["AA62",0xCC50],
+  ["AA63",0xCC51],
+  ["AA64",0xCC52],
+  ["AA65",0xCC53],
+  ["AA66",0xCC56],
+  ["AA67",0xCC5A],
+  ["AA68",0xCC5B],
+  ["AA69",0xCC5C],
+  ["AA6A",0xCC5D],
+  ["AA6B",0xCC5E],
+  ["AA6C",0xCC5F],
+  ["AA6D",0xCC61],
+  ["AA6E",0xCC62],
+  ["AA6F",0xCC63],
+  ["AA70",0xCC65],
+  ["AA71",0xCC67],
+  ["AA72",0xCC69],
+  ["AA73",0xCC6A],
+  ["AA74",0xCC6B],
+  ["AA75",0xCC6C],
+  ["AA76",0xCC6D],
+  ["AA77",0xCC6E],
+  ["AA78",0xCC6F],
+  ["AA79",0xCC71],
+  ["AA7A",0xCC72],
+  ["AA81",0xCC73],
+  ["AA82",0xCC74],
+  ["AA83",0xCC76],
+  ["AA84",0xCC77],
+  ["AA85",0xCC78],
+  ["AA86",0xCC79],
+  ["AA87",0xCC7A],
+  ["AA88",0xCC7B],
+  ["AA89",0xCC7C],
+  ["AA8A",0xCC7D],
+  ["AA8B",0xCC7E],
+  ["AA8C",0xCC7F],
+  ["AA8D",0xCC80],
+  ["AA8E",0xCC81],
+  ["AA8F",0xCC82],
+  ["AA90",0xCC83],
+  ["AA91",0xCC84],
+  ["AA92",0xCC85],
+  ["AA93",0xCC86],
+  ["AA94",0xCC87],
+  ["AA95",0xCC88],
+  ["AA96",0xCC89],
+  ["AA97",0xCC8A],
+  ["AA98",0xCC8B],
+  ["AA99",0xCC8C],
+  ["AA9A",0xCC8D],
+  ["AA9B",0xCC8E],
+  ["AA9C",0xCC8F],
+  ["AA9D",0xCC90],
+  ["AA9E",0xCC91],
+  ["AA9F",0xCC92],
+  ["AAA0",0xCC93],
+  ["AB41",0xCC94],
+  ["AB42",0xCC95],
+  ["AB43",0xCC96],
+  ["AB44",0xCC97],
+  ["AB45",0xCC9A],
+  ["AB46",0xCC9B],
+  ["AB47",0xCC9D],
+  ["AB48",0xCC9E],
+  ["AB49",0xCC9F],
+  ["AB4A",0xCCA1],
+  ["AB4B",0xCCA2],
+  ["AB4C",0xCCA3],
+  ["AB4D",0xCCA4],
+  ["AB4E",0xCCA5],
+  ["AB4F",0xCCA6],
+  ["AB50",0xCCA7],
+  ["AB51",0xCCAA],
+  ["AB52",0xCCAE],
+  ["AB53",0xCCAF],
+  ["AB54",0xCCB0],
+  ["AB55",0xCCB1],
+  ["AB56",0xCCB2],
+  ["AB57",0xCCB3],
+  ["AB58",0xCCB6],
+  ["AB59",0xCCB7],
+  ["AB5A",0xCCB9],
+  ["AB61",0xCCBA],
+  ["AB62",0xCCBB],
+  ["AB63",0xCCBD],
+  ["AB64",0xCCBE],
+  ["AB65",0xCCBF],
+  ["AB66",0xCCC0],
+  ["AB67",0xCCC1],
+  ["AB68",0xCCC2],
+  ["AB69",0xCCC3],
+  ["AB6A",0xCCC6],
+  ["AB6B",0xCCC8],
+  ["AB6C",0xCCCA],
+  ["AB6D",0xCCCB],
+  ["AB6E",0xCCCC],
+  ["AB6F",0xCCCD],
+  ["AB70",0xCCCE],
+  ["AB71",0xCCCF],
+  ["AB72",0xCCD1],
+  ["AB73",0xCCD2],
+  ["AB74",0xCCD3],
+  ["AB75",0xCCD5],
+  ["AB76",0xCCD6],
+  ["AB77",0xCCD7],
+  ["AB78",0xCCD8],
+  ["AB79",0xCCD9],
+  ["AB7A",0xCCDA],
+  ["AB81",0xCCDB],
+  ["AB82",0xCCDC],
+  ["AB83",0xCCDD],
+  ["AB84",0xCCDE],
+  ["AB85",0xCCDF],
+  ["AB86",0xCCE0],
+  ["AB87",0xCCE1],
+  ["AB88",0xCCE2],
+  ["AB89",0xCCE3],
+  ["AB8A",0xCCE5],
+  ["AB8B",0xCCE6],
+  ["AB8C",0xCCE7],
+  ["AB8D",0xCCE8],
+  ["AB8E",0xCCE9],
+  ["AB8F",0xCCEA],
+  ["AB90",0xCCEB],
+  ["AB91",0xCCED],
+  ["AB92",0xCCEE],
+  ["AB93",0xCCEF],
+  ["AB94",0xCCF1],
+  ["AB95",0xCCF2],
+  ["AB96",0xCCF3],
+  ["AB97",0xCCF4],
+  ["AB98",0xCCF5],
+  ["AB99",0xCCF6],
+  ["AB9A",0xCCF7],
+  ["AB9B",0xCCF8],
+  ["AB9C",0xCCF9],
+  ["AB9D",0xCCFA],
+  ["AB9E",0xCCFB],
+  ["AB9F",0xCCFC],
+  ["ABA0",0xCCFD],
+  ["AC41",0xCCFE],
+  ["AC42",0xCCFF],
+  ["AC43",0xCD00],
+  ["AC44",0xCD02],
+  ["AC45",0xCD03],
+  ["AC46",0xCD04],
+  ["AC47",0xCD05],
+  ["AC48",0xCD06],
+  ["AC49",0xCD07],
+  ["AC4A",0xCD0A],
+  ["AC4B",0xCD0B],
+  ["AC4C",0xCD0D],
+  ["AC4D",0xCD0E],
+  ["AC4E",0xCD0F],
+  ["AC4F",0xCD11],
+  ["AC50",0xCD12],
+  ["AC51",0xCD13],
+  ["AC52",0xCD14],
+  ["AC53",0xCD15],
+  ["AC54",0xCD16],
+  ["AC55",0xCD17],
+  ["AC56",0xCD1A],
+  ["AC57",0xCD1C],
+  ["AC58",0xCD1E],
+  ["AC59",0xCD1F],
+  ["AC5A",0xCD20],
+  ["AC61",0xCD21],
+  ["AC62",0xCD22],
+  ["AC63",0xCD23],
+  ["AC64",0xCD25],
+  ["AC65",0xCD26],
+  ["AC66",0xCD27],
+  ["AC67",0xCD29],
+  ["AC68",0xCD2A],
+  ["AC69",0xCD2B],
+  ["AC6A",0xCD2D],
+  ["AC6B",0xCD2E],
+  ["AC6C",0xCD2F],
+  ["AC6D",0xCD30],
+  ["AC6E",0xCD31],
+  ["AC6F",0xCD32],
+  ["AC70",0xCD33],
+  ["AC71",0xCD34],
+  ["AC72",0xCD35],
+  ["AC73",0xCD36],
+  ["AC74",0xCD37],
+  ["AC75",0xCD38],
+  ["AC76",0xCD3A],
+  ["AC77",0xCD3B],
+  ["AC78",0xCD3C],
+  ["AC79",0xCD3D],
+  ["AC7A",0xCD3E],
+  ["AC81",0xCD3F],
+  ["AC82",0xCD40],
+  ["AC83",0xCD41],
+  ["AC84",0xCD42],
+  ["AC85",0xCD43],
+  ["AC86",0xCD44],
+  ["AC87",0xCD45],
+  ["AC88",0xCD46],
+  ["AC89",0xCD47],
+  ["AC8A",0xCD48],
+  ["AC8B",0xCD49],
+  ["AC8C",0xCD4A],
+  ["AC8D",0xCD4B],
+  ["AC8E",0xCD4C],
+  ["AC8F",0xCD4D],
+  ["AC90",0xCD4E],
+  ["AC91",0xCD4F],
+  ["AC92",0xCD50],
+  ["AC93",0xCD51],
+  ["AC94",0xCD52],
+  ["AC95",0xCD53],
+  ["AC96",0xCD54],
+  ["AC97",0xCD55],
+  ["AC98",0xCD56],
+  ["AC99",0xCD57],
+  ["AC9A",0xCD58],
+  ["AC9B",0xCD59],
+  ["AC9C",0xCD5A],
+  ["AC9D",0xCD5B],
+  ["AC9E",0xCD5D],
+  ["AC9F",0xCD5E],
+  ["ACA0",0xCD5F],
+  ["AD41",0xCD61],
+  ["AD42",0xCD62],
+  ["AD43",0xCD63],
+  ["AD44",0xCD65],
+  ["AD45",0xCD66],
+  ["AD46",0xCD67],
+  ["AD47",0xCD68],
+  ["AD48",0xCD69],
+  ["AD49",0xCD6A],
+  ["AD4A",0xCD6B],
+  ["AD4B",0xCD6E],
+  ["AD4C",0xCD70],
+  ["AD4D",0xCD72],
+  ["AD4E",0xCD73],
+  ["AD4F",0xCD74],
+  ["AD50",0xCD75],
+  ["AD51",0xCD76],
+  ["AD52",0xCD77],
+  ["AD53",0xCD79],
+  ["AD54",0xCD7A],
+  ["AD55",0xCD7B],
+  ["AD56",0xCD7C],
+  ["AD57",0xCD7D],
+  ["AD58",0xCD7E],
+  ["AD59",0xCD7F],
+  ["AD5A",0xCD80],
+  ["AD61",0xCD81],
+  ["AD62",0xCD82],
+  ["AD63",0xCD83],
+  ["AD64",0xCD84],
+  ["AD65",0xCD85],
+  ["AD66",0xCD86],
+  ["AD67",0xCD87],
+  ["AD68",0xCD89],
+  ["AD69",0xCD8A],
+  ["AD6A",0xCD8B],
+  ["AD6B",0xCD8C],
+  ["AD6C",0xCD8D],
+  ["AD6D",0xCD8E],
+  ["AD6E",0xCD8F],
+  ["AD6F",0xCD90],
+  ["AD70",0xCD91],
+  ["AD71",0xCD92],
+  ["AD72",0xCD93],
+  ["AD73",0xCD96],
+  ["AD74",0xCD97],
+  ["AD75",0xCD99],
+  ["AD76",0xCD9A],
+  ["AD77",0xCD9B],
+  ["AD78",0xCD9D],
+  ["AD79",0xCD9E],
+  ["AD7A",0xCD9F],
+  ["AD81",0xCDA0],
+  ["AD82",0xCDA1],
+  ["AD83",0xCDA2],
+  ["AD84",0xCDA3],
+  ["AD85",0xCDA6],
+  ["AD86",0xCDA8],
+  ["AD87",0xCDAA],
+  ["AD88",0xCDAB],
+  ["AD89",0xCDAC],
+  ["AD8A",0xCDAD],
+  ["AD8B",0xCDAE],
+  ["AD8C",0xCDAF],
+  ["AD8D",0xCDB1],
+  ["AD8E",0xCDB2],
+  ["AD8F",0xCDB3],
+  ["AD90",0xCDB4],
+  ["AD91",0xCDB5],
+  ["AD92",0xCDB6],
+  ["AD93",0xCDB7],
+  ["AD94",0xCDB8],
+  ["AD95",0xCDB9],
+  ["AD96",0xCDBA],
+  ["AD97",0xCDBB],
+  ["AD98",0xCDBC],
+  ["AD99",0xCDBD],
+  ["AD9A",0xCDBE],
+  ["AD9B",0xCDBF],
+  ["AD9C",0xCDC0],
+  ["AD9D",0xCDC1],
+  ["AD9E",0xCDC2],
+  ["AD9F",0xCDC3],
+  ["ADA0",0xCDC5],
+  ["AE41",0xCDC6],
+  ["AE42",0xCDC7],
+  ["AE43",0xCDC8],
+  ["AE44",0xCDC9],
+  ["AE45",0xCDCA],
+  ["AE46",0xCDCB],
+  ["AE47",0xCDCD],
+  ["AE48",0xCDCE],
+  ["AE49",0xCDCF],
+  ["AE4A",0xCDD1],
+  ["AE4B",0xCDD2],
+  ["AE4C",0xCDD3],
+  ["AE4D",0xCDD4],
+  ["AE4E",0xCDD5],
+  ["AE4F",0xCDD6],
+  ["AE50",0xCDD7],
+  ["AE51",0xCDD8],
+  ["AE52",0xCDD9],
+  ["AE53",0xCDDA],
+  ["AE54",0xCDDB],
+  ["AE55",0xCDDC],
+  ["AE56",0xCDDD],
+  ["AE57",0xCDDE],
+  ["AE58",0xCDDF],
+  ["AE59",0xCDE0],
+  ["AE5A",0xCDE1],
+  ["AE61",0xCDE2],
+  ["AE62",0xCDE3],
+  ["AE63",0xCDE4],
+  ["AE64",0xCDE5],
+  ["AE65",0xCDE6],
+  ["AE66",0xCDE7],
+  ["AE67",0xCDE9],
+  ["AE68",0xCDEA],
+  ["AE69",0xCDEB],
+  ["AE6A",0xCDED],
+  ["AE6B",0xCDEE],
+  ["AE6C",0xCDEF],
+  ["AE6D",0xCDF1],
+  ["AE6E",0xCDF2],
+  ["AE6F",0xCDF3],
+  ["AE70",0xCDF4],
+  ["AE71",0xCDF5],
+  ["AE72",0xCDF6],
+  ["AE73",0xCDF7],
+  ["AE74",0xCDFA],
+  ["AE75",0xCDFC],
+  ["AE76",0xCDFE],
+  ["AE77",0xCDFF],
+  ["AE78",0xCE00],
+  ["AE79",0xCE01],
+  ["AE7A",0xCE02],
+  ["AE81",0xCE03],
+  ["AE82",0xCE05],
+  ["AE83",0xCE06],
+  ["AE84",0xCE07],
+  ["AE85",0xCE09],
+  ["AE86",0xCE0A],
+  ["AE87",0xCE0B],
+  ["AE88",0xCE0D],
+  ["AE89",0xCE0E],
+  ["AE8A",0xCE0F],
+  ["AE8B",0xCE10],
+  ["AE8C",0xCE11],
+  ["AE8D",0xCE12],
+  ["AE8E",0xCE13],
+  ["AE8F",0xCE15],
+  ["AE90",0xCE16],
+  ["AE91",0xCE17],
+  ["AE92",0xCE18],
+  ["AE93",0xCE1A],
+  ["AE94",0xCE1B],
+  ["AE95",0xCE1C],
+  ["AE96",0xCE1D],
+  ["AE97",0xCE1E],
+  ["AE98",0xCE1F],
+  ["AE99",0xCE22],
+  ["AE9A",0xCE23],
+  ["AE9B",0xCE25],
+  ["AE9C",0xCE26],
+  ["AE9D",0xCE27],
+  ["AE9E",0xCE29],
+  ["AE9F",0xCE2A],
+  ["AEA0",0xCE2B],
+  ["AF41",0xCE2C],
+  ["AF42",0xCE2D],
+  ["AF43",0xCE2E],
+  ["AF44",0xCE2F],
+  ["AF45",0xCE32],
+  ["AF46",0xCE34],
+  ["AF47",0xCE36],
+  ["AF48",0xCE37],
+  ["AF49",0xCE38],
+  ["AF4A",0xCE39],
+  ["AF4B",0xCE3A],
+  ["AF4C",0xCE3B],
+  ["AF4D",0xCE3C],
+  ["AF4E",0xCE3D],
+  ["AF4F",0xCE3E],
+  ["AF50",0xCE3F],
+  ["AF51",0xCE40],
+  ["AF52",0xCE41],
+  ["AF53",0xCE42],
+  ["AF54",0xCE43],
+  ["AF55",0xCE44],
+  ["AF56",0xCE45],
+  ["AF57",0xCE46],
+  ["AF58",0xCE47],
+  ["AF59",0xCE48],
+  ["AF5A",0xCE49],
+  ["AF61",0xCE4A],
+  ["AF62",0xCE4B],
+  ["AF63",0xCE4C],
+  ["AF64",0xCE4D],
+  ["AF65",0xCE4E],
+  ["AF66",0xCE4F],
+  ["AF67",0xCE50],
+  ["AF68",0xCE51],
+  ["AF69",0xCE52],
+  ["AF6A",0xCE53],
+  ["AF6B",0xCE54],
+  ["AF6C",0xCE55],
+  ["AF6D",0xCE56],
+  ["AF6E",0xCE57],
+  ["AF6F",0xCE5A],
+  ["AF70",0xCE5B],
+  ["AF71",0xCE5D],
+  ["AF72",0xCE5E],
+  ["AF73",0xCE62],
+  ["AF74",0xCE63],
+  ["AF75",0xCE64],
+  ["AF76",0xCE65],
+  ["AF77",0xCE66],
+  ["AF78",0xCE67],
+  ["AF79",0xCE6A],
+  ["AF7A",0xCE6C],
+  ["AF81",0xCE6E],
+  ["AF82",0xCE6F],
+  ["AF83",0xCE70],
+  ["AF84",0xCE71],
+  ["AF85",0xCE72],
+  ["AF86",0xCE73],
+  ["AF87",0xCE76],
+  ["AF88",0xCE77],
+  ["AF89",0xCE79],
+  ["AF8A",0xCE7A],
+  ["AF8B",0xCE7B],
+  ["AF8C",0xCE7D],
+  ["AF8D",0xCE7E],
+  ["AF8E",0xCE7F],
+  ["AF8F",0xCE80],
+  ["AF90",0xCE81],
+  ["AF91",0xCE82],
+  ["AF92",0xCE83],
+  ["AF93",0xCE86],
+  ["AF94",0xCE88],
+  ["AF95",0xCE8A],
+  ["AF96",0xCE8B],
+  ["AF97",0xCE8C],
+  ["AF98",0xCE8D],
+  ["AF99",0xCE8E],
+  ["AF9A",0xCE8F],
+  ["AF9B",0xCE92],
+  ["AF9C",0xCE93],
+  ["AF9D",0xCE95],
+  ["AF9E",0xCE96],
+  ["AF9F",0xCE97],
+  ["AFA0",0xCE99],
+  ["B041",0xCE9A],
+  ["B042",0xCE9B],
+  ["B043",0xCE9C],
+  ["B044",0xCE9D],
+  ["B045",0xCE9E],
+  ["B046",0xCE9F],
+  ["B047",0xCEA2],
+  ["B048",0xCEA6],
+  ["B049",0xCEA7],
+  ["B04A",0xCEA8],
+  ["B04B",0xCEA9],
+  ["B04C",0xCEAA],
+  ["B04D",0xCEAB],
+  ["B04E",0xCEAE],
+  ["B04F",0xCEAF],
+  ["B050",0xCEB0],
+  ["B051",0xCEB1],
+  ["B052",0xCEB2],
+  ["B053",0xCEB3],
+  ["B054",0xCEB4],
+  ["B055",0xCEB5],
+  ["B056",0xCEB6],
+  ["B057",0xCEB7],
+  ["B058",0xCEB8],
+  ["B059",0xCEB9],
+  ["B05A",0xCEBA],
+  ["B061",0xCEBB],
+  ["B062",0xCEBC],
+  ["B063",0xCEBD],
+  ["B064",0xCEBE],
+  ["B065",0xCEBF],
+  ["B066",0xCEC0],
+  ["B067",0xCEC2],
+  ["B068",0xCEC3],
+  ["B069",0xCEC4],
+  ["B06A",0xCEC5],
+  ["B06B",0xCEC6],
+  ["B06C",0xCEC7],
+  ["B06D",0xCEC8],
+  ["B06E",0xCEC9],
+  ["B06F",0xCECA],
+  ["B070",0xCECB],
+  ["B071",0xCECC],
+  ["B072",0xCECD],
+  ["B073",0xCECE],
+  ["B074",0xCECF],
+  ["B075",0xCED0],
+  ["B076",0xCED1],
+  ["B077",0xCED2],
+  ["B078",0xCED3],
+  ["B079",0xCED4],
+  ["B07A",0xCED5],
+  ["B081",0xCED6],
+  ["B082",0xCED7],
+  ["B083",0xCED8],
+  ["B084",0xCED9],
+  ["B085",0xCEDA],
+  ["B086",0xCEDB],
+  ["B087",0xCEDC],
+  ["B088",0xCEDD],
+  ["B089",0xCEDE],
+  ["B08A",0xCEDF],
+  ["B08B",0xCEE0],
+  ["B08C",0xCEE1],
+  ["B08D",0xCEE2],
+  ["B08E",0xCEE3],
+  ["B08F",0xCEE6],
+  ["B090",0xCEE7],
+  ["B091",0xCEE9],
+  ["B092",0xCEEA],
+  ["B093",0xCEED],
+  ["B094",0xCEEE],
+  ["B095",0xCEEF],
+  ["B096",0xCEF0],
+  ["B097",0xCEF1],
+  ["B098",0xCEF2],
+  ["B099",0xCEF3],
+  ["B09A",0xCEF6],
+  ["B09B",0xCEFA],
+  ["B09C",0xCEFB],
+  ["B09D",0xCEFC],
+  ["B09E",0xCEFD],
+  ["B09F",0xCEFE],
+  ["B0A0",0xCEFF],
+  ["B141",0xCF02],
+  ["B142",0xCF03],
+  ["B143",0xCF05],
+  ["B144",0xCF06],
+  ["B145",0xCF07],
+  ["B146",0xCF09],
+  ["B147",0xCF0A],
+  ["B148",0xCF0B],
+  ["B149",0xCF0C],
+  ["B14A",0xCF0D],
+  ["B14B",0xCF0E],
+  ["B14C",0xCF0F],
+  ["B14D",0xCF12],
+  ["B14E",0xCF14],
+  ["B14F",0xCF16],
+  ["B150",0xCF17],
+  ["B151",0xCF18],
+  ["B152",0xCF19],
+  ["B153",0xCF1A],
+  ["B154",0xCF1B],
+  ["B155",0xCF1D],
+  ["B156",0xCF1E],
+  ["B157",0xCF1F],
+  ["B158",0xCF21],
+  ["B159",0xCF22],
+  ["B15A",0xCF23],
+  ["B161",0xCF25],
+  ["B162",0xCF26],
+  ["B163",0xCF27],
+  ["B164",0xCF28],
+  ["B165",0xCF29],
+  ["B166",0xCF2A],
+  ["B167",0xCF2B],
+  ["B168",0xCF2E],
+  ["B169",0xCF32],
+  ["B16A",0xCF33],
+  ["B16B",0xCF34],
+  ["B16C",0xCF35],
+  ["B16D",0xCF36],
+  ["B16E",0xCF37],
+  ["B16F",0xCF39],
+  ["B170",0xCF3A],
+  ["B171",0xCF3B],
+  ["B172",0xCF3C],
+  ["B173",0xCF3D],
+  ["B174",0xCF3E],
+  ["B175",0xCF3F],
+  ["B176",0xCF40],
+  ["B177",0xCF41],
+  ["B178",0xCF42],
+  ["B179",0xCF43],
+  ["B17A",0xCF44],
+  ["B181",0xCF45],
+  ["B182",0xCF46],
+  ["B183",0xCF47],
+  ["B184",0xCF48],
+  ["B185",0xCF49],
+  ["B186",0xCF4A],
+  ["B187",0xCF4B],
+  ["B188",0xCF4C],
+  ["B189",0xCF4D],
+  ["B18A",0xCF4E],
+  ["B18B",0xCF4F],
+  ["B18C",0xCF50],
+  ["B18D",0xCF51],
+  ["B18E",0xCF52],
+  ["B18F",0xCF53],
+  ["B190",0xCF56],
+  ["B191",0xCF57],
+  ["B192",0xCF59],
+  ["B193",0xCF5A],
+  ["B194",0xCF5B],
+  ["B195",0xCF5D],
+  ["B196",0xCF5E],
+  ["B197",0xCF5F],
+  ["B198",0xCF60],
+  ["B199",0xCF61],
+  ["B19A",0xCF62],
+  ["B19B",0xCF63],
+  ["B19C",0xCF66],
+  ["B19D",0xCF68],
+  ["B19E",0xCF6A],
+  ["B19F",0xCF6B],
+  ["B1A0",0xCF6C],
+  ["B241",0xCF6D],
+  ["B242",0xCF6E],
+  ["B243",0xCF6F],
+  ["B244",0xCF72],
+  ["B245",0xCF73],
+  ["B246",0xCF75],
+  ["B247",0xCF76],
+  ["B248",0xCF77],
+  ["B249",0xCF79],
+  ["B24A",0xCF7A],
+  ["B24B",0xCF7B],
+  ["B24C",0xCF7C],
+  ["B24D",0xCF7D],
+  ["B24E",0xCF7E],
+  ["B24F",0xCF7F],
+  ["B250",0xCF81],
+  ["B251",0xCF82],
+  ["B252",0xCF83],
+  ["B253",0xCF84],
+  ["B254",0xCF86],
+  ["B255",0xCF87],
+  ["B256",0xCF88],
+  ["B257",0xCF89],
+  ["B258",0xCF8A],
+  ["B259",0xCF8B],
+  ["B25A",0xCF8D],
+  ["B261",0xCF8E],
+  ["B262",0xCF8F],
+  ["B263",0xCF90],
+  ["B264",0xCF91],
+  ["B265",0xCF92],
+  ["B266",0xCF93],
+  ["B267",0xCF94],
+  ["B268",0xCF95],
+  ["B269",0xCF96],
+  ["B26A",0xCF97],
+  ["B26B",0xCF98],
+  ["B26C",0xCF99],
+  ["B26D",0xCF9A],
+  ["B26E",0xCF9B],
+  ["B26F",0xCF9C],
+  ["B270",0xCF9D],
+  ["B271",0xCF9E],
+  ["B272",0xCF9F],
+  ["B273",0xCFA0],
+  ["B274",0xCFA2],
+  ["B275",0xCFA3],
+  ["B276",0xCFA4],
+  ["B277",0xCFA5],
+  ["B278",0xCFA6],
+  ["B279",0xCFA7],
+  ["B27A",0xCFA9],
+  ["B281",0xCFAA],
+  ["B282",0xCFAB],
+  ["B283",0xCFAC],
+  ["B284",0xCFAD],
+  ["B285",0xCFAE],
+  ["B286",0xCFAF],
+  ["B287",0xCFB1],
+  ["B288",0xCFB2],
+  ["B289",0xCFB3],
+  ["B28A",0xCFB4],
+  ["B28B",0xCFB5],
+  ["B28C",0xCFB6],
+  ["B28D",0xCFB7],
+  ["B28E",0xCFB8],
+  ["B28F",0xCFB9],
+  ["B290",0xCFBA],
+  ["B291",0xCFBB],
+  ["B292",0xCFBC],
+  ["B293",0xCFBD],
+  ["B294",0xCFBE],
+  ["B295",0xCFBF],
+  ["B296",0xCFC0],
+  ["B297",0xCFC1],
+  ["B298",0xCFC2],
+  ["B299",0xCFC3],
+  ["B29A",0xCFC5],
+  ["B29B",0xCFC6],
+  ["B29C",0xCFC7],
+  ["B29D",0xCFC8],
+  ["B29E",0xCFC9],
+  ["B29F",0xCFCA],
+  ["B2A0",0xCFCB],
+  ["B341",0xCFCC],
+  ["B342",0xCFCD],
+  ["B343",0xCFCE],
+  ["B344",0xCFCF],
+  ["B345",0xCFD0],
+  ["B346",0xCFD1],
+  ["B347",0xCFD2],
+  ["B348",0xCFD3],
+  ["B349",0xCFD4],
+  ["B34A",0xCFD5],
+  ["B34B",0xCFD6],
+  ["B34C",0xCFD7],
+  ["B34D",0xCFD8],
+  ["B34E",0xCFD9],
+  ["B34F",0xCFDA],
+  ["B350",0xCFDB],
+  ["B351",0xCFDC],
+  ["B352",0xCFDD],
+  ["B353",0xCFDE],
+  ["B354",0xCFDF],
+  ["B355",0xCFE2],
+  ["B356",0xCFE3],
+  ["B357",0xCFE5],
+  ["B358",0xCFE6],
+  ["B359",0xCFE7],
+  ["B35A",0xCFE9],
+  ["B361",0xCFEA],
+  ["B362",0xCFEB],
+  ["B363",0xCFEC],
+  ["B364",0xCFED],
+  ["B365",0xCFEE],
+  ["B366",0xCFEF],
+  ["B367",0xCFF2],
+  ["B368",0xCFF4],
+  ["B369",0xCFF6],
+  ["B36A",0xCFF7],
+  ["B36B",0xCFF8],
+  ["B36C",0xCFF9],
+  ["B36D",0xCFFA],
+  ["B36E",0xCFFB],
+  ["B36F",0xCFFD],
+  ["B370",0xCFFE],
+  ["B371",0xCFFF],
+  ["B372",0xD001],
+  ["B373",0xD002],
+  ["B374",0xD003],
+  ["B375",0xD005],
+  ["B376",0xD006],
+  ["B377",0xD007],
+  ["B378",0xD008],
+  ["B379",0xD009],
+  ["B37A",0xD00A],
+  ["B381",0xD00B],
+  ["B382",0xD00C],
+  ["B383",0xD00D],
+  ["B384",0xD00E],
+  ["B385",0xD00F],
+  ["B386",0xD010],
+  ["B387",0xD012],
+  ["B388",0xD013],
+  ["B389",0xD014],
+  ["B38A",0xD015],
+  ["B38B",0xD016],
+  ["B38C",0xD017],
+  ["B38D",0xD019],
+  ["B38E",0xD01A],
+  ["B38F",0xD01B],
+  ["B390",0xD01C],
+  ["B391",0xD01D],
+  ["B392",0xD01E],
+  ["B393",0xD01F],
+  ["B394",0xD020],
+  ["B395",0xD021],
+  ["B396",0xD022],
+  ["B397",0xD023],
+  ["B398",0xD024],
+  ["B399",0xD025],
+  ["B39A",0xD026],
+  ["B39B",0xD027],
+  ["B39C",0xD028],
+  ["B39D",0xD029],
+  ["B39E",0xD02A],
+  ["B39F",0xD02B],
+  ["B3A0",0xD02C],
+  ["B441",0xD02E],
+  ["B442",0xD02F],
+  ["B443",0xD030],
+  ["B444",0xD031],
+  ["B445",0xD032],
+  ["B446",0xD033],
+  ["B447",0xD036],
+  ["B448",0xD037],
+  ["B449",0xD039],
+  ["B44A",0xD03A],
+  ["B44B",0xD03B],
+  ["B44C",0xD03D],
+  ["B44D",0xD03E],
+  ["B44E",0xD03F],
+  ["B44F",0xD040],
+  ["B450",0xD041],
+  ["B451",0xD042],
+  ["B452",0xD043],
+  ["B453",0xD046],
+  ["B454",0xD048],
+  ["B455",0xD04A],
+  ["B456",0xD04B],
+  ["B457",0xD04C],
+  ["B458",0xD04D],
+  ["B459",0xD04E],
+  ["B45A",0xD04F],
+  ["B461",0xD051],
+  ["B462",0xD052],
+  ["B463",0xD053],
+  ["B464",0xD055],
+  ["B465",0xD056],
+  ["B466",0xD057],
+  ["B467",0xD059],
+  ["B468",0xD05A],
+  ["B469",0xD05B],
+  ["B46A",0xD05C],
+  ["B46B",0xD05D],
+  ["B46C",0xD05E],
+  ["B46D",0xD05F],
+  ["B46E",0xD061],
+  ["B46F",0xD062],
+  ["B470",0xD063],
+  ["B471",0xD064],
+  ["B472",0xD065],
+  ["B473",0xD066],
+  ["B474",0xD067],
+  ["B475",0xD068],
+  ["B476",0xD069],
+  ["B477",0xD06A],
+  ["B478",0xD06B],
+  ["B479",0xD06E],
+  ["B47A",0xD06F],
+  ["B481",0xD071],
+  ["B482",0xD072],
+  ["B483",0xD073],
+  ["B484",0xD075],
+  ["B485",0xD076],
+  ["B486",0xD077],
+  ["B487",0xD078],
+  ["B488",0xD079],
+  ["B489",0xD07A],
+  ["B48A",0xD07B],
+  ["B48B",0xD07E],
+  ["B48C",0xD07F],
+  ["B48D",0xD080],
+  ["B48E",0xD082],
+  ["B48F",0xD083],
+  ["B490",0xD084],
+  ["B491",0xD085],
+  ["B492",0xD086],
+  ["B493",0xD087],
+  ["B494",0xD088],
+  ["B495",0xD089],
+  ["B496",0xD08A],
+  ["B497",0xD08B],
+  ["B498",0xD08C],
+  ["B499",0xD08D],
+  ["B49A",0xD08E],
+  ["B49B",0xD08F],
+  ["B49C",0xD090],
+  ["B49D",0xD091],
+  ["B49E",0xD092],
+  ["B49F",0xD093],
+  ["B4A0",0xD094],
+  ["B541",0xD095],
+  ["B542",0xD096],
+  ["B543",0xD097],
+  ["B544",0xD098],
+  ["B545",0xD099],
+  ["B546",0xD09A],
+  ["B547",0xD09B],
+  ["B548",0xD09C],
+  ["B549",0xD09D],
+  ["B54A",0xD09E],
+  ["B54B",0xD09F],
+  ["B54C",0xD0A0],
+  ["B54D",0xD0A1],
+  ["B54E",0xD0A2],
+  ["B54F",0xD0A3],
+  ["B550",0xD0A6],
+  ["B551",0xD0A7],
+  ["B552",0xD0A9],
+  ["B553",0xD0AA],
+  ["B554",0xD0AB],
+  ["B555",0xD0AD],
+  ["B556",0xD0AE],
+  ["B557",0xD0AF],
+  ["B558",0xD0B0],
+  ["B559",0xD0B1],
+  ["B55A",0xD0B2],
+  ["B561",0xD0B3],
+  ["B562",0xD0B6],
+  ["B563",0xD0B8],
+  ["B564",0xD0BA],
+  ["B565",0xD0BB],
+  ["B566",0xD0BC],
+  ["B567",0xD0BD],
+  ["B568",0xD0BE],
+  ["B569",0xD0BF],
+  ["B56A",0xD0C2],
+  ["B56B",0xD0C3],
+  ["B56C",0xD0C5],
+  ["B56D",0xD0C6],
+  ["B56E",0xD0C7],
+  ["B56F",0xD0CA],
+  ["B570",0xD0CB],
+  ["B571",0xD0CC],
+  ["B572",0xD0CD],
+  ["B573",0xD0CE],
+  ["B574",0xD0CF],
+  ["B575",0xD0D2],
+  ["B576",0xD0D6],
+  ["B577",0xD0D7],
+  ["B578",0xD0D8],
+  ["B579",0xD0D9],
+  ["B57A",0xD0DA],
+  ["B581",0xD0DB],
+  ["B582",0xD0DE],
+  ["B583",0xD0DF],
+  ["B584",0xD0E1],
+  ["B585",0xD0E2],
+  ["B586",0xD0E3],
+  ["B587",0xD0E5],
+  ["B588",0xD0E6],
+  ["B589",0xD0E7],
+  ["B58A",0xD0E8],
+  ["B58B",0xD0E9],
+  ["B58C",0xD0EA],
+  ["B58D",0xD0EB],
+  ["B58E",0xD0EE],
+  ["B58F",0xD0F2],
+  ["B590",0xD0F3],
+  ["B591",0xD0F4],
+  ["B592",0xD0F5],
+  ["B593",0xD0F6],
+  ["B594",0xD0F7],
+  ["B595",0xD0F9],
+  ["B596",0xD0FA],
+  ["B597",0xD0FB],
+  ["B598",0xD0FC],
+  ["B599",0xD0FD],
+  ["B59A",0xD0FE],
+  ["B59B",0xD0FF],
+  ["B59C",0xD100],
+  ["B59D",0xD101],
+  ["B59E",0xD102],
+  ["B59F",0xD103],
+  ["B5A0",0xD104],
+  ["B641",0xD105],
+  ["B642",0xD106],
+  ["B643",0xD107],
+  ["B644",0xD108],
+  ["B645",0xD109],
+  ["B646",0xD10A],
+  ["B647",0xD10B],
+  ["B648",0xD10C],
+  ["B649",0xD10E],
+  ["B64A",0xD10F],
+  ["B64B",0xD110],
+  ["B64C",0xD111],
+  ["B64D",0xD112],
+  ["B64E",0xD113],
+  ["B64F",0xD114],
+  ["B650",0xD115],
+  ["B651",0xD116],
+  ["B652",0xD117],
+  ["B653",0xD118],
+  ["B654",0xD119],
+  ["B655",0xD11A],
+  ["B656",0xD11B],
+  ["B657",0xD11C],
+  ["B658",0xD11D],
+  ["B659",0xD11E],
+  ["B65A",0xD11F],
+  ["B661",0xD120],
+  ["B662",0xD121],
+  ["B663",0xD122],
+  ["B664",0xD123],
+  ["B665",0xD124],
+  ["B666",0xD125],
+  ["B667",0xD126],
+  ["B668",0xD127],
+  ["B669",0xD128],
+  ["B66A",0xD129],
+  ["B66B",0xD12A],
+  ["B66C",0xD12B],
+  ["B66D",0xD12C],
+  ["B66E",0xD12D],
+  ["B66F",0xD12E],
+  ["B670",0xD12F],
+  ["B671",0xD132],
+  ["B672",0xD133],
+  ["B673",0xD135],
+  ["B674",0xD136],
+  ["B675",0xD137],
+  ["B676",0xD139],
+  ["B677",0xD13B],
+  ["B678",0xD13C],
+  ["B679",0xD13D],
+  ["B67A",0xD13E],
+  ["B681",0xD13F],
+  ["B682",0xD142],
+  ["B683",0xD146],
+  ["B684",0xD147],
+  ["B685",0xD148],
+  ["B686",0xD149],
+  ["B687",0xD14A],
+  ["B688",0xD14B],
+  ["B689",0xD14E],
+  ["B68A",0xD14F],
+  ["B68B",0xD151],
+  ["B68C",0xD152],
+  ["B68D",0xD153],
+  ["B68E",0xD155],
+  ["B68F",0xD156],
+  ["B690",0xD157],
+  ["B691",0xD158],
+  ["B692",0xD159],
+  ["B693",0xD15A],
+  ["B694",0xD15B],
+  ["B695",0xD15E],
+  ["B696",0xD160],
+  ["B697",0xD162],
+  ["B698",0xD163],
+  ["B699",0xD164],
+  ["B69A",0xD165],
+  ["B69B",0xD166],
+  ["B69C",0xD167],
+  ["B69D",0xD169],
+  ["B69E",0xD16A],
+  ["B69F",0xD16B],
+  ["B6A0",0xD16D],
+  ["B741",0xD16E],
+  ["B742",0xD16F],
+  ["B743",0xD170],
+  ["B744",0xD171],
+  ["B745",0xD172],
+  ["B746",0xD173],
+  ["B747",0xD174],
+  ["B748",0xD175],
+  ["B749",0xD176],
+  ["B74A",0xD177],
+  ["B74B",0xD178],
+  ["B74C",0xD179],
+  ["B74D",0xD17A],
+  ["B74E",0xD17B],
+  ["B74F",0xD17D],
+  ["B750",0xD17E],
+  ["B751",0xD17F],
+  ["B752",0xD180],
+  ["B753",0xD181],
+  ["B754",0xD182],
+  ["B755",0xD183],
+  ["B756",0xD185],
+  ["B757",0xD186],
+  ["B758",0xD187],
+  ["B759",0xD189],
+  ["B75A",0xD18A],
+  ["B761",0xD18B],
+  ["B762",0xD18C],
+  ["B763",0xD18D],
+  ["B764",0xD18E],
+  ["B765",0xD18F],
+  ["B766",0xD190],
+  ["B767",0xD191],
+  ["B768",0xD192],
+  ["B769",0xD193],
+  ["B76A",0xD194],
+  ["B76B",0xD195],
+  ["B76C",0xD196],
+  ["B76D",0xD197],
+  ["B76E",0xD198],
+  ["B76F",0xD199],
+  ["B770",0xD19A],
+  ["B771",0xD19B],
+  ["B772",0xD19C],
+  ["B773",0xD19D],
+  ["B774",0xD19E],
+  ["B775",0xD19F],
+  ["B776",0xD1A2],
+  ["B777",0xD1A3],
+  ["B778",0xD1A5],
+  ["B779",0xD1A6],
+  ["B77A",0xD1A7],
+  ["B781",0xD1A9],
+  ["B782",0xD1AA],
+  ["B783",0xD1AB],
+  ["B784",0xD1AC],
+  ["B785",0xD1AD],
+  ["B786",0xD1AE],
+  ["B787",0xD1AF],
+  ["B788",0xD1B2],
+  ["B789",0xD1B4],
+  ["B78A",0xD1B6],
+  ["B78B",0xD1B7],
+  ["B78C",0xD1B8],
+  ["B78D",0xD1B9],
+  ["B78E",0xD1BB],
+  ["B78F",0xD1BD],
+  ["B790",0xD1BE],
+  ["B791",0xD1BF],
+  ["B792",0xD1C1],
+  ["B793",0xD1C2],
+  ["B794",0xD1C3],
+  ["B795",0xD1C4],
+  ["B796",0xD1C5],
+  ["B797",0xD1C6],
+  ["B798",0xD1C7],
+  ["B799",0xD1C8],
+  ["B79A",0xD1C9],
+  ["B79B",0xD1CA],
+  ["B79C",0xD1CB],
+  ["B79D",0xD1CC],
+  ["B79E",0xD1CD],
+  ["B79F",0xD1CE],
+  ["B7A0",0xD1CF],
+  ["B841",0xD1D0],
+  ["B842",0xD1D1],
+  ["B843",0xD1D2],
+  ["B844",0xD1D3],
+  ["B845",0xD1D4],
+  ["B846",0xD1D5],
+  ["B847",0xD1D6],
+  ["B848",0xD1D7],
+  ["B849",0xD1D9],
+  ["B84A",0xD1DA],
+  ["B84B",0xD1DB],
+  ["B84C",0xD1DC],
+  ["B84D",0xD1DD],
+  ["B84E",0xD1DE],
+  ["B84F",0xD1DF],
+  ["B850",0xD1E0],
+  ["B851",0xD1E1],
+  ["B852",0xD1E2],
+  ["B853",0xD1E3],
+  ["B854",0xD1E4],
+  ["B855",0xD1E5],
+  ["B856",0xD1E6],
+  ["B857",0xD1E7],
+  ["B858",0xD1E8],
+  ["B859",0xD1E9],
+  ["B85A",0xD1EA],
+  ["B861",0xD1EB],
+  ["B862",0xD1EC],
+  ["B863",0xD1ED],
+  ["B864",0xD1EE],
+  ["B865",0xD1EF],
+  ["B866",0xD1F0],
+  ["B867",0xD1F1],
+  ["B868",0xD1F2],
+  ["B869",0xD1F3],
+  ["B86A",0xD1F5],
+  ["B86B",0xD1F6],
+  ["B86C",0xD1F7],
+  ["B86D",0xD1F9],
+  ["B86E",0xD1FA],
+  ["B86F",0xD1FB],
+  ["B870",0xD1FC],
+  ["B871",0xD1FD],
+  ["B872",0xD1FE],
+  ["B873",0xD1FF],
+  ["B874",0xD200],
+  ["B875",0xD201],
+  ["B876",0xD202],
+  ["B877",0xD203],
+  ["B878",0xD204],
+  ["B879",0xD205],
+  ["B87A",0xD206],
+  ["B881",0xD208],
+  ["B882",0xD20A],
+  ["B883",0xD20B],
+  ["B884",0xD20C],
+  ["B885",0xD20D],
+  ["B886",0xD20E],
+  ["B887",0xD20F],
+  ["B888",0xD211],
+  ["B889",0xD212],
+  ["B88A",0xD213],
+  ["B88B",0xD214],
+  ["B88C",0xD215],
+  ["B88D",0xD216],
+  ["B88E",0xD217],
+  ["B88F",0xD218],
+  ["B890",0xD219],
+  ["B891",0xD21A],
+  ["B892",0xD21B],
+  ["B893",0xD21C],
+  ["B894",0xD21D],
+  ["B895",0xD21E],
+  ["B896",0xD21F],
+  ["B897",0xD220],
+  ["B898",0xD221],
+  ["B899",0xD222],
+  ["B89A",0xD223],
+  ["B89B",0xD224],
+  ["B89C",0xD225],
+  ["B89D",0xD226],
+  ["B89E",0xD227],
+  ["B89F",0xD228],
+  ["B8A0",0xD229],
+  ["B941",0xD22A],
+  ["B942",0xD22B],
+  ["B943",0xD22E],
+  ["B944",0xD22F],
+  ["B945",0xD231],
+  ["B946",0xD232],
+  ["B947",0xD233],
+  ["B948",0xD235],
+  ["B949",0xD236],
+  ["B94A",0xD237],
+  ["B94B",0xD238],
+  ["B94C",0xD239],
+  ["B94D",0xD23A],
+  ["B94E",0xD23B],
+  ["B94F",0xD23E],
+  ["B950",0xD240],
+  ["B951",0xD242],
+  ["B952",0xD243],
+  ["B953",0xD244],
+  ["B954",0xD245],
+  ["B955",0xD246],
+  ["B956",0xD247],
+  ["B957",0xD249],
+  ["B958",0xD24A],
+  ["B959",0xD24B],
+  ["B95A",0xD24C],
+  ["B961",0xD24D],
+  ["B962",0xD24E],
+  ["B963",0xD24F],
+  ["B964",0xD250],
+  ["B965",0xD251],
+  ["B966",0xD252],
+  ["B967",0xD253],
+  ["B968",0xD254],
+  ["B969",0xD255],
+  ["B96A",0xD256],
+  ["B96B",0xD257],
+  ["B96C",0xD258],
+  ["B96D",0xD259],
+  ["B96E",0xD25A],
+  ["B96F",0xD25B],
+  ["B970",0xD25D],
+  ["B971",0xD25E],
+  ["B972",0xD25F],
+  ["B973",0xD260],
+  ["B974",0xD261],
+  ["B975",0xD262],
+  ["B976",0xD263],
+  ["B977",0xD265],
+  ["B978",0xD266],
+  ["B979",0xD267],
+  ["B97A",0xD268],
+  ["B981",0xD269],
+  ["B982",0xD26A],
+  ["B983",0xD26B],
+  ["B984",0xD26C],
+  ["B985",0xD26D],
+  ["B986",0xD26E],
+  ["B987",0xD26F],
+  ["B988",0xD270],
+  ["B989",0xD271],
+  ["B98A",0xD272],
+  ["B98B",0xD273],
+  ["B98C",0xD274],
+  ["B98D",0xD275],
+  ["B98E",0xD276],
+  ["B98F",0xD277],
+  ["B990",0xD278],
+  ["B991",0xD279],
+  ["B992",0xD27A],
+  ["B993",0xD27B],
+  ["B994",0xD27C],
+  ["B995",0xD27D],
+  ["B996",0xD27E],
+  ["B997",0xD27F],
+  ["B998",0xD282],
+  ["B999",0xD283],
+  ["B99A",0xD285],
+  ["B99B",0xD286],
+  ["B99C",0xD287],
+  ["B99D",0xD289],
+  ["B99E",0xD28A],
+  ["B99F",0xD28B],
+  ["B9A0",0xD28C],
+  ["BA41",0xD28D],
+  ["BA42",0xD28E],
+  ["BA43",0xD28F],
+  ["BA44",0xD292],
+  ["BA45",0xD293],
+  ["BA46",0xD294],
+  ["BA47",0xD296],
+  ["BA48",0xD297],
+  ["BA49",0xD298],
+  ["BA4A",0xD299],
+  ["BA4B",0xD29A],
+  ["BA4C",0xD29B],
+  ["BA4D",0xD29D],
+  ["BA4E",0xD29E],
+  ["BA4F",0xD29F],
+  ["BA50",0xD2A1],
+  ["BA51",0xD2A2],
+  ["BA52",0xD2A3],
+  ["BA53",0xD2A5],
+  ["BA54",0xD2A6],
+  ["BA55",0xD2A7],
+  ["BA56",0xD2A8],
+  ["BA57",0xD2A9],
+  ["BA58",0xD2AA],
+  ["BA59",0xD2AB],
+  ["BA5A",0xD2AD],
+  ["BA61",0xD2AE],
+  ["BA62",0xD2AF],
+  ["BA63",0xD2B0],
+  ["BA64",0xD2B2],
+  ["BA65",0xD2B3],
+  ["BA66",0xD2B4],
+  ["BA67",0xD2B5],
+  ["BA68",0xD2B6],
+  ["BA69",0xD2B7],
+  ["BA6A",0xD2BA],
+  ["BA6B",0xD2BB],
+  ["BA6C",0xD2BD],
+  ["BA6D",0xD2BE],
+  ["BA6E",0xD2C1],
+  ["BA6F",0xD2C3],
+  ["BA70",0xD2C4],
+  ["BA71",0xD2C5],
+  ["BA72",0xD2C6],
+  ["BA73",0xD2C7],
+  ["BA74",0xD2CA],
+  ["BA75",0xD2CC],
+  ["BA76",0xD2CD],
+  ["BA77",0xD2CE],
+  ["BA78",0xD2CF],
+  ["BA79",0xD2D0],
+  ["BA7A",0xD2D1],
+  ["BA81",0xD2D2],
+  ["BA82",0xD2D3],
+  ["BA83",0xD2D5],
+  ["BA84",0xD2D6],
+  ["BA85",0xD2D7],
+  ["BA86",0xD2D9],
+  ["BA87",0xD2DA],
+  ["BA88",0xD2DB],
+  ["BA89",0xD2DD],
+  ["BA8A",0xD2DE],
+  ["BA8B",0xD2DF],
+  ["BA8C",0xD2E0],
+  ["BA8D",0xD2E1],
+  ["BA8E",0xD2E2],
+  ["BA8F",0xD2E3],
+  ["BA90",0xD2E6],
+  ["BA91",0xD2E7],
+  ["BA92",0xD2E8],
+  ["BA93",0xD2E9],
+  ["BA94",0xD2EA],
+  ["BA95",0xD2EB],
+  ["BA96",0xD2EC],
+  ["BA97",0xD2ED],
+  ["BA98",0xD2EE],
+  ["BA99",0xD2EF],
+  ["BA9A",0xD2F2],
+  ["BA9B",0xD2F3],
+  ["BA9C",0xD2F5],
+  ["BA9D",0xD2F6],
+  ["BA9E",0xD2F7],
+  ["BA9F",0xD2F9],
+  ["BAA0",0xD2FA],
+  ["BB41",0xD2FB],
+  ["BB42",0xD2FC],
+  ["BB43",0xD2FD],
+  ["BB44",0xD2FE],
+  ["BB45",0xD2FF],
+  ["BB46",0xD302],
+  ["BB47",0xD304],
+  ["BB48",0xD306],
+  ["BB49",0xD307],
+  ["BB4A",0xD308],
+  ["BB4B",0xD309],
+  ["BB4C",0xD30A],
+  ["BB4D",0xD30B],
+  ["BB4E",0xD30F],
+  ["BB4F",0xD311],
+  ["BB50",0xD312],
+  ["BB51",0xD313],
+  ["BB52",0xD315],
+  ["BB53",0xD317],
+  ["BB54",0xD318],
+  ["BB55",0xD319],
+  ["BB56",0xD31A],
+  ["BB57",0xD31B],
+  ["BB58",0xD31E],
+  ["BB59",0xD322],
+  ["BB5A",0xD323],
+  ["BB61",0xD324],
+  ["BB62",0xD326],
+  ["BB63",0xD327],
+  ["BB64",0xD32A],
+  ["BB65",0xD32B],
+  ["BB66",0xD32D],
+  ["BB67",0xD32E],
+  ["BB68",0xD32F],
+  ["BB69",0xD331],
+  ["BB6A",0xD332],
+  ["BB6B",0xD333],
+  ["BB6C",0xD334],
+  ["BB6D",0xD335],
+  ["BB6E",0xD336],
+  ["BB6F",0xD337],
+  ["BB70",0xD33A],
+  ["BB71",0xD33E],
+  ["BB72",0xD33F],
+  ["BB73",0xD340],
+  ["BB74",0xD341],
+  ["BB75",0xD342],
+  ["BB76",0xD343],
+  ["BB77",0xD346],
+  ["BB78",0xD347],
+  ["BB79",0xD348],
+  ["BB7A",0xD349],
+  ["BB81",0xD34A],
+  ["BB82",0xD34B],
+  ["BB83",0xD34C],
+  ["BB84",0xD34D],
+  ["BB85",0xD34E],
+  ["BB86",0xD34F],
+  ["BB87",0xD350],
+  ["BB88",0xD351],
+  ["BB89",0xD352],
+  ["BB8A",0xD353],
+  ["BB8B",0xD354],
+  ["BB8C",0xD355],
+  ["BB8D",0xD356],
+  ["BB8E",0xD357],
+  ["BB8F",0xD358],
+  ["BB90",0xD359],
+  ["BB91",0xD35A],
+  ["BB92",0xD35B],
+  ["BB93",0xD35C],
+  ["BB94",0xD35D],
+  ["BB95",0xD35E],
+  ["BB96",0xD35F],
+  ["BB97",0xD360],
+  ["BB98",0xD361],
+  ["BB99",0xD362],
+  ["BB9A",0xD363],
+  ["BB9B",0xD364],
+  ["BB9C",0xD365],
+  ["BB9D",0xD366],
+  ["BB9E",0xD367],
+  ["BB9F",0xD368],
+  ["BBA0",0xD369],
+  ["BC41",0xD36A],
+  ["BC42",0xD36B],
+  ["BC43",0xD36C],
+  ["BC44",0xD36D],
+  ["BC45",0xD36E],
+  ["BC46",0xD36F],
+  ["BC47",0xD370],
+  ["BC48",0xD371],
+  ["BC49",0xD372],
+  ["BC4A",0xD373],
+  ["BC4B",0xD374],
+  ["BC4C",0xD375],
+  ["BC4D",0xD376],
+  ["BC4E",0xD377],
+  ["BC4F",0xD378],
+  ["BC50",0xD379],
+  ["BC51",0xD37A],
+  ["BC52",0xD37B],
+  ["BC53",0xD37E],
+  ["BC54",0xD37F],
+  ["BC55",0xD381],
+  ["BC56",0xD382],
+  ["BC57",0xD383],
+  ["BC58",0xD385],
+  ["BC59",0xD386],
+  ["BC5A",0xD387],
+  ["BC61",0xD388],
+  ["BC62",0xD389],
+  ["BC63",0xD38A],
+  ["BC64",0xD38B],
+  ["BC65",0xD38E],
+  ["BC66",0xD392],
+  ["BC67",0xD393],
+  ["BC68",0xD394],
+  ["BC69",0xD395],
+  ["BC6A",0xD396],
+  ["BC6B",0xD397],
+  ["BC6C",0xD39A],
+  ["BC6D",0xD39B],
+  ["BC6E",0xD39D],
+  ["BC6F",0xD39E],
+  ["BC70",0xD39F],
+  ["BC71",0xD3A1],
+  ["BC72",0xD3A2],
+  ["BC73",0xD3A3],
+  ["BC74",0xD3A4],
+  ["BC75",0xD3A5],
+  ["BC76",0xD3A6],
+  ["BC77",0xD3A7],
+  ["BC78",0xD3AA],
+  ["BC79",0xD3AC],
+  ["BC7A",0xD3AE],
+  ["BC81",0xD3AF],
+  ["BC82",0xD3B0],
+  ["BC83",0xD3B1],
+  ["BC84",0xD3B2],
+  ["BC85",0xD3B3],
+  ["BC86",0xD3B5],
+  ["BC87",0xD3B6],
+  ["BC88",0xD3B7],
+  ["BC89",0xD3B9],
+  ["BC8A",0xD3BA],
+  ["BC8B",0xD3BB],
+  ["BC8C",0xD3BD],
+  ["BC8D",0xD3BE],
+  ["BC8E",0xD3BF],
+  ["BC8F",0xD3C0],
+  ["BC90",0xD3C1],
+  ["BC91",0xD3C2],
+  ["BC92",0xD3C3],
+  ["BC93",0xD3C6],
+  ["BC94",0xD3C7],
+  ["BC95",0xD3CA],
+  ["BC96",0xD3CB],
+  ["BC97",0xD3CC],
+  ["BC98",0xD3CD],
+  ["BC99",0xD3CE],
+  ["BC9A",0xD3CF],
+  ["BC9B",0xD3D1],
+  ["BC9C",0xD3D2],
+  ["BC9D",0xD3D3],
+  ["BC9E",0xD3D4],
+  ["BC9F",0xD3D5],
+  ["BCA0",0xD3D6],
+  ["BD41",0xD3D7],
+  ["BD42",0xD3D9],
+  ["BD43",0xD3DA],
+  ["BD44",0xD3DB],
+  ["BD45",0xD3DC],
+  ["BD46",0xD3DD],
+  ["BD47",0xD3DE],
+  ["BD48",0xD3DF],
+  ["BD49",0xD3E0],
+  ["BD4A",0xD3E2],
+  ["BD4B",0xD3E4],
+  ["BD4C",0xD3E5],
+  ["BD4D",0xD3E6],
+  ["BD4E",0xD3E7],
+  ["BD4F",0xD3E8],
+  ["BD50",0xD3E9],
+  ["BD51",0xD3EA],
+  ["BD52",0xD3EB],
+  ["BD53",0xD3EE],
+  ["BD54",0xD3EF],
+  ["BD55",0xD3F1],
+  ["BD56",0xD3F2],
+  ["BD57",0xD3F3],
+  ["BD58",0xD3F5],
+  ["BD59",0xD3F6],
+  ["BD5A",0xD3F7],
+  ["BD61",0xD3F8],
+  ["BD62",0xD3F9],
+  ["BD63",0xD3FA],
+  ["BD64",0xD3FB],
+  ["BD65",0xD3FE],
+  ["BD66",0xD400],
+  ["BD67",0xD402],
+  ["BD68",0xD403],
+  ["BD69",0xD404],
+  ["BD6A",0xD405],
+  ["BD6B",0xD406],
+  ["BD6C",0xD407],
+  ["BD6D",0xD409],
+  ["BD6E",0xD40A],
+  ["BD6F",0xD40B],
+  ["BD70",0xD40C],
+  ["BD71",0xD40D],
+  ["BD72",0xD40E],
+  ["BD73",0xD40F],
+  ["BD74",0xD410],
+  ["BD75",0xD411],
+  ["BD76",0xD412],
+  ["BD77",0xD413],
+  ["BD78",0xD414],
+  ["BD79",0xD415],
+  ["BD7A",0xD416],
+  ["BD81",0xD417],
+  ["BD82",0xD418],
+  ["BD83",0xD419],
+  ["BD84",0xD41A],
+  ["BD85",0xD41B],
+  ["BD86",0xD41C],
+  ["BD87",0xD41E],
+  ["BD88",0xD41F],
+  ["BD89",0xD420],
+  ["BD8A",0xD421],
+  ["BD8B",0xD422],
+  ["BD8C",0xD423],
+  ["BD8D",0xD424],
+  ["BD8E",0xD425],
+  ["BD8F",0xD426],
+  ["BD90",0xD427],
+  ["BD91",0xD428],
+  ["BD92",0xD429],
+  ["BD93",0xD42A],
+  ["BD94",0xD42B],
+  ["BD95",0xD42C],
+  ["BD96",0xD42D],
+  ["BD97",0xD42E],
+  ["BD98",0xD42F],
+  ["BD99",0xD430],
+  ["BD9A",0xD431],
+  ["BD9B",0xD432],
+  ["BD9C",0xD433],
+  ["BD9D",0xD434],
+  ["BD9E",0xD435],
+  ["BD9F",0xD436],
+  ["BDA0",0xD437],
+  ["BE41",0xD438],
+  ["BE42",0xD439],
+  ["BE43",0xD43A],
+  ["BE44",0xD43B],
+  ["BE45",0xD43C],
+  ["BE46",0xD43D],
+  ["BE47",0xD43E],
+  ["BE48",0xD43F],
+  ["BE49",0xD441],
+  ["BE4A",0xD442],
+  ["BE4B",0xD443],
+  ["BE4C",0xD445],
+  ["BE4D",0xD446],
+  ["BE4E",0xD447],
+  ["BE4F",0xD448],
+  ["BE50",0xD449],
+  ["BE51",0xD44A],
+  ["BE52",0xD44B],
+  ["BE53",0xD44C],
+  ["BE54",0xD44D],
+  ["BE55",0xD44E],
+  ["BE56",0xD44F],
+  ["BE57",0xD450],
+  ["BE58",0xD451],
+  ["BE59",0xD452],
+  ["BE5A",0xD453],
+  ["BE61",0xD454],
+  ["BE62",0xD455],
+  ["BE63",0xD456],
+  ["BE64",0xD457],
+  ["BE65",0xD458],
+  ["BE66",0xD459],
+  ["BE67",0xD45A],
+  ["BE68",0xD45B],
+  ["BE69",0xD45D],
+  ["BE6A",0xD45E],
+  ["BE6B",0xD45F],
+  ["BE6C",0xD461],
+  ["BE6D",0xD462],
+  ["BE6E",0xD463],
+  ["BE6F",0xD465],
+  ["BE70",0xD466],
+  ["BE71",0xD467],
+  ["BE72",0xD468],
+  ["BE73",0xD469],
+  ["BE74",0xD46A],
+  ["BE75",0xD46B],
+  ["BE76",0xD46C],
+  ["BE77",0xD46E],
+  ["BE78",0xD470],
+  ["BE79",0xD471],
+  ["BE7A",0xD472],
+  ["BE81",0xD473],
+  ["BE82",0xD474],
+  ["BE83",0xD475],
+  ["BE84",0xD476],
+  ["BE85",0xD477],
+  ["BE86",0xD47A],
+  ["BE87",0xD47B],
+  ["BE88",0xD47D],
+  ["BE89",0xD47E],
+  ["BE8A",0xD481],
+  ["BE8B",0xD483],
+  ["BE8C",0xD484],
+  ["BE8D",0xD485],
+  ["BE8E",0xD486],
+  ["BE8F",0xD487],
+  ["BE90",0xD48A],
+  ["BE91",0xD48C],
+  ["BE92",0xD48E],
+  ["BE93",0xD48F],
+  ["BE94",0xD490],
+  ["BE95",0xD491],
+  ["BE96",0xD492],
+  ["BE97",0xD493],
+  ["BE98",0xD495],
+  ["BE99",0xD496],
+  ["BE9A",0xD497],
+  ["BE9B",0xD498],
+  ["BE9C",0xD499],
+  ["BE9D",0xD49A],
+  ["BE9E",0xD49B],
+  ["BE9F",0xD49C],
+  ["BEA0",0xD49D],
+  ["BF41",0xD49E],
+  ["BF42",0xD49F],
+  ["BF43",0xD4A0],
+  ["BF44",0xD4A1],
+  ["BF45",0xD4A2],
+  ["BF46",0xD4A3],
+  ["BF47",0xD4A4],
+  ["BF48",0xD4A5],
+  ["BF49",0xD4A6],
+  ["BF4A",0xD4A7],
+  ["BF4B",0xD4A8],
+  ["BF4C",0xD4AA],
+  ["BF4D",0xD4AB],
+  ["BF4E",0xD4AC],
+  ["BF4F",0xD4AD],
+  ["BF50",0xD4AE],
+  ["BF51",0xD4AF],
+  ["BF52",0xD4B0],
+  ["BF53",0xD4B1],
+  ["BF54",0xD4B2],
+  ["BF55",0xD4B3],
+  ["BF56",0xD4B4],
+  ["BF57",0xD4B5],
+  ["BF58",0xD4B6],
+  ["BF59",0xD4B7],
+  ["BF5A",0xD4B8],
+  ["BF61",0xD4B9],
+  ["BF62",0xD4BA],
+  ["BF63",0xD4BB],
+  ["BF64",0xD4BC],
+  ["BF65",0xD4BD],
+  ["BF66",0xD4BE],
+  ["BF67",0xD4BF],
+  ["BF68",0xD4C0],
+  ["BF69",0xD4C1],
+  ["BF6A",0xD4C2],
+  ["BF6B",0xD4C3],
+  ["BF6C",0xD4C4],
+  ["BF6D",0xD4C5],
+  ["BF6E",0xD4C6],
+  ["BF6F",0xD4C7],
+  ["BF70",0xD4C8],
+  ["BF71",0xD4C9],
+  ["BF72",0xD4CA],
+  ["BF73",0xD4CB],
+  ["BF74",0xD4CD],
+  ["BF75",0xD4CE],
+  ["BF76",0xD4CF],
+  ["BF77",0xD4D1],
+  ["BF78",0xD4D2],
+  ["BF79",0xD4D3],
+  ["BF7A",0xD4D5],
+  ["BF81",0xD4D6],
+  ["BF82",0xD4D7],
+  ["BF83",0xD4D8],
+  ["BF84",0xD4D9],
+  ["BF85",0xD4DA],
+  ["BF86",0xD4DB],
+  ["BF87",0xD4DD],
+  ["BF88",0xD4DE],
+  ["BF89",0xD4E0],
+  ["BF8A",0xD4E1],
+  ["BF8B",0xD4E2],
+  ["BF8C",0xD4E3],
+  ["BF8D",0xD4E4],
+  ["BF8E",0xD4E5],
+  ["BF8F",0xD4E6],
+  ["BF90",0xD4E7],
+  ["BF91",0xD4E9],
+  ["BF92",0xD4EA],
+  ["BF93",0xD4EB],
+  ["BF94",0xD4ED],
+  ["BF95",0xD4EE],
+  ["BF96",0xD4EF],
+  ["BF97",0xD4F1],
+  ["BF98",0xD4F2],
+  ["BF99",0xD4F3],
+  ["BF9A",0xD4F4],
+  ["BF9B",0xD4F5],
+  ["BF9C",0xD4F6],
+  ["BF9D",0xD4F7],
+  ["BF9E",0xD4F9],
+  ["BF9F",0xD4FA],
+  ["BFA0",0xD4FC],
+  ["C041",0xD4FE],
+  ["C042",0xD4FF],
+  ["C043",0xD500],
+  ["C044",0xD501],
+  ["C045",0xD502],
+  ["C046",0xD503],
+  ["C047",0xD505],
+  ["C048",0xD506],
+  ["C049",0xD507],
+  ["C04A",0xD509],
+  ["C04B",0xD50A],
+  ["C04C",0xD50B],
+  ["C04D",0xD50D],
+  ["C04E",0xD50E],
+  ["C04F",0xD50F],
+  ["C050",0xD510],
+  ["C051",0xD511],
+  ["C052",0xD512],
+  ["C053",0xD513],
+  ["C054",0xD516],
+  ["C055",0xD518],
+  ["C056",0xD519],
+  ["C057",0xD51A],
+  ["C058",0xD51B],
+  ["C059",0xD51C],
+  ["C05A",0xD51D],
+  ["C061",0xD51E],
+  ["C062",0xD51F],
+  ["C063",0xD520],
+  ["C064",0xD521],
+  ["C065",0xD522],
+  ["C066",0xD523],
+  ["C067",0xD524],
+  ["C068",0xD525],
+  ["C069",0xD526],
+  ["C06A",0xD527],
+  ["C06B",0xD528],
+  ["C06C",0xD529],
+  ["C06D",0xD52A],
+  ["C06E",0xD52B],
+  ["C06F",0xD52C],
+  ["C070",0xD52D],
+  ["C071",0xD52E],
+  ["C072",0xD52F],
+  ["C073",0xD530],
+  ["C074",0xD531],
+  ["C075",0xD532],
+  ["C076",0xD533],
+  ["C077",0xD534],
+  ["C078",0xD535],
+  ["C079",0xD536],
+  ["C07A",0xD537],
+  ["C081",0xD538],
+  ["C082",0xD539],
+  ["C083",0xD53A],
+  ["C084",0xD53B],
+  ["C085",0xD53E],
+  ["C086",0xD53F],
+  ["C087",0xD541],
+  ["C088",0xD542],
+  ["C089",0xD543],
+  ["C08A",0xD545],
+  ["C08B",0xD546],
+  ["C08C",0xD547],
+  ["C08D",0xD548],
+  ["C08E",0xD549],
+  ["C08F",0xD54A],
+  ["C090",0xD54B],
+  ["C091",0xD54E],
+  ["C092",0xD550],
+  ["C093",0xD552],
+  ["C094",0xD553],
+  ["C095",0xD554],
+  ["C096",0xD555],
+  ["C097",0xD556],
+  ["C098",0xD557],
+  ["C099",0xD55A],
+  ["C09A",0xD55B],
+  ["C09B",0xD55D],
+  ["C09C",0xD55E],
+  ["C09D",0xD55F],
+  ["C09E",0xD561],
+  ["C09F",0xD562],
+  ["C0A0",0xD563],
+  ["C141",0xD564],
+  ["C142",0xD566],
+  ["C143",0xD567],
+  ["C144",0xD56A],
+  ["C145",0xD56C],
+  ["C146",0xD56E],
+  ["C147",0xD56F],
+  ["C148",0xD570],
+  ["C149",0xD571],
+  ["C14A",0xD572],
+  ["C14B",0xD573],
+  ["C14C",0xD576],
+  ["C14D",0xD577],
+  ["C14E",0xD579],
+  ["C14F",0xD57A],
+  ["C150",0xD57B],
+  ["C151",0xD57D],
+  ["C152",0xD57E],
+  ["C153",0xD57F],
+  ["C154",0xD580],
+  ["C155",0xD581],
+  ["C156",0xD582],
+  ["C157",0xD583],
+  ["C158",0xD586],
+  ["C159",0xD58A],
+  ["C15A",0xD58B],
+  ["C161",0xD58C],
+  ["C162",0xD58D],
+  ["C163",0xD58E],
+  ["C164",0xD58F],
+  ["C165",0xD591],
+  ["C166",0xD592],
+  ["C167",0xD593],
+  ["C168",0xD594],
+  ["C169",0xD595],
+  ["C16A",0xD596],
+  ["C16B",0xD597],
+  ["C16C",0xD598],
+  ["C16D",0xD599],
+  ["C16E",0xD59A],
+  ["C16F",0xD59B],
+  ["C170",0xD59C],
+  ["C171",0xD59D],
+  ["C172",0xD59E],
+  ["C173",0xD59F],
+  ["C174",0xD5A0],
+  ["C175",0xD5A1],
+  ["C176",0xD5A2],
+  ["C177",0xD5A3],
+  ["C178",0xD5A4],
+  ["C179",0xD5A6],
+  ["C17A",0xD5A7],
+  ["C181",0xD5A8],
+  ["C182",0xD5A9],
+  ["C183",0xD5AA],
+  ["C184",0xD5AB],
+  ["C185",0xD5AC],
+  ["C186",0xD5AD],
+  ["C187",0xD5AE],
+  ["C188",0xD5AF],
+  ["C189",0xD5B0],
+  ["C18A",0xD5B1],
+  ["C18B",0xD5B2],
+  ["C18C",0xD5B3],
+  ["C18D",0xD5B4],
+  ["C18E",0xD5B5],
+  ["C18F",0xD5B6],
+  ["C190",0xD5B7],
+  ["C191",0xD5B8],
+  ["C192",0xD5B9],
+  ["C193",0xD5BA],
+  ["C194",0xD5BB],
+  ["C195",0xD5BC],
+  ["C196",0xD5BD],
+  ["C197",0xD5BE],
+  ["C198",0xD5BF],
+  ["C199",0xD5C0],
+  ["C19A",0xD5C1],
+  ["C19B",0xD5C2],
+  ["C19C",0xD5C3],
+  ["C19D",0xD5C4],
+  ["C19E",0xD5C5],
+  ["C19F",0xD5C6],
+  ["C1A0",0xD5C7],
+  ["C241",0xD5CA],
+  ["C242",0xD5CB],
+  ["C243",0xD5CD],
+  ["C244",0xD5CE],
+  ["C245",0xD5CF],
+  ["C246",0xD5D1],
+  ["C247",0xD5D3],
+  ["C248",0xD5D4],
+  ["C249",0xD5D5],
+  ["C24A",0xD5D6],
+  ["C24B",0xD5D7],
+  ["C24C",0xD5DA],
+  ["C24D",0xD5DC],
+  ["C24E",0xD5DE],
+  ["C24F",0xD5DF],
+  ["C250",0xD5E0],
+  ["C251",0xD5E1],
+  ["C252",0xD5E2],
+  ["C253",0xD5E3],
+  ["C254",0xD5E6],
+  ["C255",0xD5E7],
+  ["C256",0xD5E9],
+  ["C257",0xD5EA],
+  ["C258",0xD5EB],
+  ["C259",0xD5ED],
+  ["C25A",0xD5EE],
+  ["C261",0xD5EF],
+  ["C262",0xD5F0],
+  ["C263",0xD5F1],
+  ["C264",0xD5F2],
+  ["C265",0xD5F3],
+  ["C266",0xD5F6],
+  ["C267",0xD5F8],
+  ["C268",0xD5FA],
+  ["C269",0xD5FB],
+  ["C26A",0xD5FC],
+  ["C26B",0xD5FD],
+  ["C26C",0xD5FE],
+  ["C26D",0xD5FF],
+  ["C26E",0xD602],
+  ["C26F",0xD603],
+  ["C270",0xD605],
+  ["C271",0xD606],
+  ["C272",0xD607],
+  ["C273",0xD609],
+  ["C274",0xD60A],
+  ["C275",0xD60B],
+  ["C276",0xD60C],
+  ["C277",0xD60D],
+  ["C278",0xD60E],
+  ["C279",0xD60F],
+  ["C27A",0xD612],
+  ["C281",0xD616],
+  ["C282",0xD617],
+  ["C283",0xD618],
+  ["C284",0xD619],
+  ["C285",0xD61A],
+  ["C286",0xD61B],
+  ["C287",0xD61D],
+  ["C288",0xD61E],
+  ["C289",0xD61F],
+  ["C28A",0xD621],
+  ["C28B",0xD622],
+  ["C28C",0xD623],
+  ["C28D",0xD625],
+  ["C28E",0xD626],
+  ["C28F",0xD627],
+  ["C290",0xD628],
+  ["C291",0xD629],
+  ["C292",0xD62A],
+  ["C293",0xD62B],
+  ["C294",0xD62C],
+  ["C295",0xD62E],
+  ["C296",0xD62F],
+  ["C297",0xD630],
+  ["C298",0xD631],
+  ["C299",0xD632],
+  ["C29A",0xD633],
+  ["C29B",0xD634],
+  ["C29C",0xD635],
+  ["C29D",0xD636],
+  ["C29E",0xD637],
+  ["C29F",0xD63A],
+  ["C2A0",0xD63B],
+  ["C341",0xD63D],
+  ["C342",0xD63E],
+  ["C343",0xD63F],
+  ["C344",0xD641],
+  ["C345",0xD642],
+  ["C346",0xD643],
+  ["C347",0xD644],
+  ["C348",0xD646],
+  ["C349",0xD647],
+  ["C34A",0xD64A],
+  ["C34B",0xD64C],
+  ["C34C",0xD64E],
+  ["C34D",0xD64F],
+  ["C34E",0xD650],
+  ["C34F",0xD652],
+  ["C350",0xD653],
+  ["C351",0xD656],
+  ["C352",0xD657],
+  ["C353",0xD659],
+  ["C354",0xD65A],
+  ["C355",0xD65B],
+  ["C356",0xD65D],
+  ["C357",0xD65E],
+  ["C358",0xD65F],
+  ["C359",0xD660],
+  ["C35A",0xD661],
+  ["C361",0xD662],
+  ["C362",0xD663],
+  ["C363",0xD664],
+  ["C364",0xD665],
+  ["C365",0xD666],
+  ["C366",0xD668],
+  ["C367",0xD66A],
+  ["C368",0xD66B],
+  ["C369",0xD66C],
+  ["C36A",0xD66D],
+  ["C36B",0xD66E],
+  ["C36C",0xD66F],
+  ["C36D",0xD672],
+  ["C36E",0xD673],
+  ["C36F",0xD675],
+  ["C370",0xD676],
+  ["C371",0xD677],
+  ["C372",0xD678],
+  ["C373",0xD679],
+  ["C374",0xD67A],
+  ["C375",0xD67B],
+  ["C376",0xD67C],
+  ["C377",0xD67D],
+  ["C378",0xD67E],
+  ["C379",0xD67F],
+  ["C37A",0xD680],
+  ["C381",0xD681],
+  ["C382",0xD682],
+  ["C383",0xD684],
+  ["C384",0xD686],
+  ["C385",0xD687],
+  ["C386",0xD688],
+  ["C387",0xD689],
+  ["C388",0xD68A],
+  ["C389",0xD68B],
+  ["C38A",0xD68E],
+  ["C38B",0xD68F],
+  ["C38C",0xD691],
+  ["C38D",0xD692],
+  ["C38E",0xD693],
+  ["C38F",0xD695],
+  ["C390",0xD696],
+  ["C391",0xD697],
+  ["C392",0xD698],
+  ["C393",0xD699],
+  ["C394",0xD69A],
+  ["C395",0xD69B],
+  ["C396",0xD69C],
+  ["C397",0xD69E],
+  ["C398",0xD6A0],
+  ["C399",0xD6A2],
+  ["C39A",0xD6A3],
+  ["C39B",0xD6A4],
+  ["C39C",0xD6A5],
+  ["C39D",0xD6A6],
+  ["C39E",0xD6A7],
+  ["C39F",0xD6A9],
+  ["C3A0",0xD6AA],
+  ["C441",0xD6AB],
+  ["C442",0xD6AD],
+  ["C443",0xD6AE],
+  ["C444",0xD6AF],
+  ["C445",0xD6B1],
+  ["C446",0xD6B2],
+  ["C447",0xD6B3],
+  ["C448",0xD6B4],
+  ["C449",0xD6B5],
+  ["C44A",0xD6B6],
+  ["C44B",0xD6B7],
+  ["C44C",0xD6B8],
+  ["C44D",0xD6BA],
+  ["C44E",0xD6BC],
+  ["C44F",0xD6BD],
+  ["C450",0xD6BE],
+  ["C451",0xD6BF],
+  ["C452",0xD6C0],
+  ["C453",0xD6C1],
+  ["C454",0xD6C2],
+  ["C455",0xD6C3],
+  ["C456",0xD6C6],
+  ["C457",0xD6C7],
+  ["C458",0xD6C9],
+  ["C459",0xD6CA],
+  ["C45A",0xD6CB],
+  ["C461",0xD6CD],
+  ["C462",0xD6CE],
+  ["C463",0xD6CF],
+  ["C464",0xD6D0],
+  ["C465",0xD6D2],
+  ["C466",0xD6D3],
+  ["C467",0xD6D5],
+  ["C468",0xD6D6],
+  ["C469",0xD6D8],
+  ["C46A",0xD6DA],
+  ["C46B",0xD6DB],
+  ["C46C",0xD6DC],
+  ["C46D",0xD6DD],
+  ["C46E",0xD6DE],
+  ["C46F",0xD6DF],
+  ["C470",0xD6E1],
+  ["C471",0xD6E2],
+  ["C472",0xD6E3],
+  ["C473",0xD6E5],
+  ["C474",0xD6E6],
+  ["C475",0xD6E7],
+  ["C476",0xD6E9],
+  ["C477",0xD6EA],
+  ["C478",0xD6EB],
+  ["C479",0xD6EC],
+  ["C47A",0xD6ED],
+  ["C481",0xD6EE],
+  ["C482",0xD6EF],
+  ["C483",0xD6F1],
+  ["C484",0xD6F2],
+  ["C485",0xD6F3],
+  ["C486",0xD6F4],
+  ["C487",0xD6F6],
+  ["C488",0xD6F7],
+  ["C489",0xD6F8],
+  ["C48A",0xD6F9],
+  ["C48B",0xD6FA],
+  ["C48C",0xD6FB],
+  ["C48D",0xD6FE],
+  ["C48E",0xD6FF],
+  ["C48F",0xD701],
+  ["C490",0xD702],
+  ["C491",0xD703],
+  ["C492",0xD705],
+  ["C493",0xD706],
+  ["C494",0xD707],
+  ["C495",0xD708],
+  ["C496",0xD709],
+  ["C497",0xD70A],
+  ["C498",0xD70B],
+  ["C499",0xD70C],
+  ["C49A",0xD70D],
+  ["C49B",0xD70E],
+  ["C49C",0xD70F],
+  ["C49D",0xD710],
+  ["C49E",0xD712],
+  ["C49F",0xD713],
+  ["C4A0",0xD714],
+  ["C541",0xD715],
+  ["C542",0xD716],
+  ["C543",0xD717],
+  ["C544",0xD71A],
+  ["C545",0xD71B],
+  ["C546",0xD71D],
+  ["C547",0xD71E],
+  ["C548",0xD71F],
+  ["C549",0xD721],
+  ["C54A",0xD722],
+  ["C54B",0xD723],
+  ["C54C",0xD724],
+  ["C54D",0xD725],
+  ["C54E",0xD726],
+  ["C54F",0xD727],
+  ["C550",0xD72A],
+  ["C551",0xD72C],
+  ["C552",0xD72E],
+  ["C553",0xD72F],
+  ["C554",0xD730],
+  ["C555",0xD731],
+  ["C556",0xD732],
+  ["C557",0xD733],
+  ["C558",0xD736],
+  ["C559",0xD737],
+  ["C55A",0xD739],
+  ["C561",0xD73A],
+  ["C562",0xD73B],
+  ["C563",0xD73D],
+  ["C564",0xD73E],
+  ["C565",0xD73F],
+  ["C566",0xD740],
+  ["C567",0xD741],
+  ["C568",0xD742],
+  ["C569",0xD743],
+  ["C56A",0xD745],
+  ["C56B",0xD746],
+  ["C56C",0xD748],
+  ["C56D",0xD74A],
+  ["C56E",0xD74B],
+  ["C56F",0xD74C],
+  ["C570",0xD74D],
+  ["C571",0xD74E],
+  ["C572",0xD74F],
+  ["C573",0xD752],
+  ["C574",0xD753],
+  ["C575",0xD755],
+  ["C576",0xD75A],
+  ["C577",0xD75B],
+  ["C578",0xD75C],
+  ["C579",0xD75D],
+  ["C57A",0xD75E],
+  ["C581",0xD75F],
+  ["C582",0xD762],
+  ["C583",0xD764],
+  ["C584",0xD766],
+  ["C585",0xD767],
+  ["C586",0xD768],
+  ["C587",0xD76A],
+  ["C588",0xD76B],
+  ["C589",0xD76D],
+  ["C58A",0xD76E],
+  ["C58B",0xD76F],
+  ["C58C",0xD771],
+  ["C58D",0xD772],
+  ["C58E",0xD773],
+  ["C58F",0xD775],
+  ["C590",0xD776],
+  ["C591",0xD777],
+  ["C592",0xD778],
+  ["C593",0xD779],
+  ["C594",0xD77A],
+  ["C595",0xD77B],
+  ["C596",0xD77E],
+  ["C597",0xD77F],
+  ["C598",0xD780],
+  ["C599",0xD782],
+  ["C59A",0xD783],
+  ["C59B",0xD784],
+  ["C59C",0xD785],
+  ["C59D",0xD786],
+  ["C59E",0xD787],
+  ["C59F",0xD78A],
+  ["C5A0",0xD78B],
+  ["C641",0xD78D],
+  ["C642",0xD78E],
+  ["C643",0xD78F],
+  ["C644",0xD791],
+  ["C645",0xD792],
+  ["C646",0xD793],
+  ["C647",0xD794],
+  ["C648",0xD795],
+  ["C649",0xD796],
+  ["C64A",0xD797],
+  ["C64B",0xD79A],
+  ["C64C",0xD79C],
+  ["C64D",0xD79E],
+  ["C64E",0xD79F],
+  ["C64F",0xD7A0],
+  ["C650",0xD7A1],
+  ["C651",0xD7A2],
+  ["C652",0xD7A3],
+]
+
+CP949_TO_UCS_TBL = EUCKR_TO_UCS_TBL + CP949_TO_UCS_ADDITIONAL_TBL
+UCS_TO_CP949_TBL = CP949_TO_UCS_TBL.map {|a,b| [b,a]}
diff --git a/enc/trans/emoji-exchange-tbl.rb b/enc/trans/emoji-exchange-tbl.rb
new file mode 100644
index 0000000000..235c98ece5
--- /dev/null
+++ b/enc/trans/emoji-exchange-tbl.rb
@@ -0,0 +1,8407 @@
+EMOJI_EXCHANGE_TBL = Hash.new{|h,k| h[k] = {}}
+EMOJI_EXCHANGE_TBL['UTF8-DoCoMo']['UTF8-KDDI'] = [
+  ["ee98be", "ee9288"], # [BLACK SUN WITH RAYS] U+E63E -> U+E488
+  ["ee98bf", "ee928d"], # [CLOUD] U+E63F -> U+E48D
+  ["ee9980", "ee928c"], # [UMBRELLA WITH RAIN DROPS] U+E640 -> U+E48C
+  ["ee9981", "ee9285"], # [SNOWMAN WITHOUT SNOW] U+E641 -> U+E485
+  ["ee9982", "ee9287"], # [HIGH VOLTAGE SIGN] U+E642 -> U+E487
+  ["ee9983", "ee91a9"], # [CYCLONE] U+E643 -> U+E469
+  ["ee9984", "ee9698"], # [FOGGY] U+E644 -> U+E598
+  ["ee9985", "eeaba8"], # [CLOSED UMBRELLA] U+E645 -> U+EAE8
+  ["ee9ab3", "eeabb1"], # [NIGHT WITH STARS] U+E6B3 -> U+EAF1
+  ["ee9cbf", "eeadbc"], # [WATER WAVE] U+E73F -> U+EB7C
+  ["ee9a9c", "ee96a8"], # [NEW MOON SYMBOL] U+E69C -> U+E5A8
+  ["ee9a9d", "ee96a9"], # [WAXING GIBBOUS MOON SYMBOL] U+E69D -> U+E5A9
+  ["ee9a9e", "ee96aa"], # [FIRST QUARTER MOON SYMBOL] U+E69E -> U+E5AA
+  ["ee9a9f", "ee9286"], # [CRESCENT MOON] U+E69F -> U+E486
+  ["ee9aa0", :undef], # [FULL MOON SYMBOL] U+E6A0 -> "○"
+  ["ee9c9f", "ee95ba"], # [WATCH] U+E71F -> U+E57A
+  ["ee9aba", "ee9694"], # [ALARM CLOCK] U+E6BA -> U+E594
+  ["ee9c9c", "ee91bc"], # [HOURGLASS WITH FLOWING SAND] U+E71C -> U+E47C
+  ["ee9986", "ee928f"], # [ARIES] U+E646 -> U+E48F
+  ["ee9987", "ee9290"], # [TAURUS] U+E647 -> U+E490
+  ["ee9988", "ee9291"], # [GEMINI] U+E648 -> U+E491
+  ["ee9989", "ee9292"], # [CANCER] U+E649 -> U+E492
+  ["ee998a", "ee9293"], # [LEO] U+E64A -> U+E493
+  ["ee998b", "ee9294"], # [VIRGO] U+E64B -> U+E494
+  ["ee998c", "ee9295"], # [LIBRA] U+E64C -> U+E495
+  ["ee998d", "ee9296"], # [SCORPIUS] U+E64D -> U+E496
+  ["ee998e", "ee9297"], # [SAGITTARIUS] U+E64E -> U+E497
+  ["ee998f", "ee9298"], # [CAPRICORN] U+E64F -> U+E498
+  ["ee9990", "ee9299"], # [AQUARIUS] U+E650 -> U+E499
+  ["ee9991", "ee929a"], # [PISCES] U+E651 -> U+E49A
+  ["ee9d81", "ee9493"], # [FOUR LEAF CLOVER] U+E741 -> U+E513
+  ["ee9d83", "ee93a4"], # [TULIP] U+E743 -> U+E4E4
+  ["ee9d86", "eeadbd"], # [SEEDLING] U+E746 -> U+EB7D
+  ["ee9d87", "ee938e"], # [MAPLE LEAF] U+E747 -> U+E4CE
+  ["ee9d88", "ee938a"], # [CHERRY BLOSSOM] U+E748 -> U+E4CA
+  ["ee9d82", "ee9392"], # [CHERRIES] U+E742 -> U+E4D2
+  ["ee9d84", "eeacb5"], # [BANANA] U+E744 -> U+EB35
+  ["ee9d85", "eeaab9"], # [RED APPLE] U+E745 -> U+EAB9
+  ["ee9a91", "ee96a4"], # [EYES] U+E691 -> U+E5A4
+  ["ee9a92", "ee96a5"], # [EAR] U+E692 -> U+E5A5
+  ["ee9c90", "ee9489"], # [LIPSTICK] U+E710 -> U+E509
+  ["ee9ab1", :undef], # [BUST IN SILHOUETTE] U+E6B1 -> U+3013 (GETA)
+  ["ee9d8e", "eeadbe"], # [SNAIL] U+E74E -> U+EB7E
+  ["ee9d8f", "ee93a0"], # [BABY CHICK] U+E74F -> U+E4E0
+  ["ee9d90", "ee939c"], # [PENGUIN] U+E750 -> U+E4DC
+  ["ee9d91", "ee929a"], # [FISH] U+E751 -> U+E49A
+  ["ee9aa2", "ee939b"], # [CAT FACE] U+E6A2 -> U+E4DB
+  ["ee9d94", "ee9398"], # [HORSE FACE] U+E754 -> U+E4D8
+  ["ee9aa1", "ee93a1"], # [DOG FACE] U+E6A1 -> U+E4E1
+  ["ee9d95", "ee939e"], # [PIG FACE] U+E755 -> U+E4DE
+  ["ee9bb1", "ee91b2"], # [ANGRY FACE] U+E6F1 -> U+E472
+  ["ee9bb2", "eeab80"], # [DISAPPOINTED FACE] U+E6F2 -> U+EAC0
+  ["ee9bb4", "ee96ae"], # [DIZZY FACE] U+E6F4 -> U+E5AE
+  ["ee9ca5", "eeab89"], # [EXPRESSIONLESS FACE] U+E725 -> U+EAC9
+  ["ee9ca6", "ee9784"], # [FACE WITH HEART-SHAPED EYES] U+E726 -> U+E5C4
+  ["ee9ca8", "ee93a7"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E728 -> U+E4E7
+  ["ee9d92", "eeab8d"], # [FACE SAVOURING DELICIOUS FOOD] U+E752 -> U+EACD
+  ["ee9bb0", "ee91b1"], # [HAPPY FACE WITH OPEN MOUTH] U+E6F0 -> U+E471
+  ["ee9ca2", "ee91b1ee96b1"], # [HAPPY FACE WITH OPEN MOUTH AND COLD SWEAT] U+E722 -> U+E471 U+E5B1
+  ["ee9caa", "eeab85"], # [HAPPY FACE WITH OPEN MOUTH AND CLOSED EYES] U+E72A -> U+EAC5
+  ["ee9d93", "eeae80"], # [HAPPY FACE WITH GRIN] U+E753 -> U+EB80
+  ["ee9cae", "eeada9"], # [CRYING FACE] U+E72E -> U+EB69
+  ["ee9cad", "ee91b3"], # [LOUDLY CRYING FACE] U+E72D -> U+E473
+  ["ee9cab", "eeab82"], # [PERSEVERING FACE] U+E72B -> U+EAC2
+  ["ee9ca4", "eead9d"], # [POUTING FACE] U+E724 -> U+EB5D
+  ["ee9ca1", "eeab85"], # [RELIEVED FACE] U+E721 -> U+EAC5
+  ["ee9bb3", "eeab83"], # [CONFOUNDED FACE] U+E6F3 -> U+EAC3
+  ["ee9ca0", "eeab80"], # [PENSIVE FACE] U+E720 -> U+EAC0
+  ["ee9d97", "ee9785"], # [FACE SCREAMING IN FEAR] U+E757 -> U+E5C5
+  ["ee9cac", "eeaabf"], # [SMIRKING FACE] U+E72C -> U+EABF
+  ["ee9ca3", "ee9786"], # [FACE WITH COLD SWEAT] U+E723 -> U+E5C6
+  ["ee9ca9", "ee9783"], # [WINKING FACE] U+E729 -> U+E5C3
+  ["ee99a3", "ee92ab"], # [HOUSE BUILDING] U+E663 -> U+E4AB
+  ["ee99a4", "ee92ad"], # [OFFICE BUILDING] U+E664 -> U+E4AD
+  ["ee99a5", "ee979e"], # [JAPANESE POST OFFICE] U+E665 -> U+E5DE
+  ["ee99a6", "ee979f"], # [HOSPITAL] U+E666 -> U+E5DF
+  ["ee99a7", "ee92aa"], # [BANK] U+E667 -> U+E4AA
+  ["ee99a8", "ee92a3"], # [AUTOMATED TELLER MACHINE] U+E668 -> U+E4A3
+  ["ee99a9", "eeaa81"], # [HOTEL] U+E669 -> U+EA81
+  ["ee99aa", "ee92a4"], # [CONVENIENCE STORE] U+E66A -> U+E4A4
+  ["ee9cbe", "eeaa80"], # [SCHOOL] U+E73E -> U+EA80
+  ["ee9d80", "ee96bd"], # [MOUNT FUJI] U+E740 -> U+E5BD
+  ["ee9a99", "eeacab"], # [ATHLETIC SHOE] U+E699 -> U+EB2B
+  ["ee99b4", "ee949a"], # [HIGH-HEELED SHOE] U+E674 -> U+E51A
+  ["ee9a98", "eeacaa"], # [FOOTPRINTS] U+E698 -> U+EB2A
+  ["ee9a9a", "ee93be"], # [EYEGLASSES] U+E69A -> U+E4FE
+  ["ee9c8e", "ee96b6"], # [T-SHIRT] U+E70E -> U+E5B6
+  ["ee9c91", "eeadb7"], # [JEANS] U+E711 -> U+EB77
+  ["ee9c9a", "ee9789"], # [CROWN] U+E71A -> U+E5C9
+  ["ee9c8f", "ee9484"], # [PURSE] U+E70F -> U+E504
+  ["ee9a82", "ee929c"], # [HANDBAG] U+E682 -> U+E49C
+  ["ee9aad", :undef], # [POUCH] U+E6AD -> "[ふくろ]"
+  ["ee9c95", "ee9387"], # [MONEY BAG] U+E715 -> U+E4C7
+  ["ee9b96", "ee95bd"], # [BANKNOTE WITH YEN SIGN] U+E6D6 -> U+E57D
+  ["ee9c98", "ee9687"], # [WRENCH] U+E718 -> U+E587
+  ["ee9a84", "ee969f"], # [RIBBON] U+E684 -> U+E59F
+  ["ee9a85", "ee938f"], # [WRAPPED PRESENT] U+E685 -> U+E4CF
+  ["ee9a86", "ee96a0"], # [BIRTHDAY CAKE] U+E686 -> U+E5A0
+  ["ee9aa4", "ee9389"], # [CHRISTMAS TREE] U+E6A4 -> U+E4C9
+  ["ee999a", "ee969b"], # [PAGER] U+E65A -> U+E59B
+  ["ee9a87", "ee9696"], # [BLACK TELEPHONE] U+E687 -> U+E596
+  ["ee9a88", "ee9688"], # [MOBILE PHONE] U+E688 -> U+E588
+  ["ee9b8e", "eeac88"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+E6CE -> U+EB08
+  ["ee9a89", "eeaa92"], # [MEMO] U+E689 -> U+EA92
+  ["ee9b90", "ee94a0"], # [FAX MACHINE] U+E6D0 -> U+E520
+  ["ee9b93", "ee94a1"], # [ENVELOPE] U+E6D3 -> U+E521
+  ["ee9b8f", "eeada2"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+E6CF -> U+EB62
+  ["ee9aae", "eeac83"], # [BLACK NIB] U+E6AE -> U+EB03
+  ["ee9ab2", :undef], # [SEAT] U+E6B2 -> "[いす]"
+  ["ee9c96", "ee96b8"], # [PERSONAL COMPUTER] U+E716 -> U+E5B8
+  ["ee9c99", "ee92a1"], # [PENCIL] U+E719 -> U+E4A1
+  ["ee9cb0", "ee92a0"], # [PAPERCLIP] U+E730 -> U+E4A0
+  ["ee9a8c", "ee948c"], # [OPTICAL DISC] U+E68C -> U+E50C
+  ["ee99b5", "ee9496"], # [BLACK SCISSORS] U+E675 -> U+E516
+  ["ee9a83", "ee929f"], # [OPEN BOOK] U+E683 -> U+E49F
+  ["ee9992", :undef], # [RUNNING SHIRT WITH SASH] U+E652 -> U+3013 (GETA)
+  ["ee9993", "ee92ba"], # [BASEBALL] U+E653 -> U+E4BA
+  ["ee9994", "ee9699"], # [FLAG IN HOLE] U+E654 -> U+E599
+  ["ee9995", "ee92b7"], # [TENNIS RACQUET AND BALL] U+E655 -> U+E4B7
+  ["ee9996", "ee92b6"], # [SOCCER BALL] U+E656 -> U+E4B6
+  ["ee9997", "eeaaac"], # [SKI AND SKI BOOT] U+E657 -> U+EAAC
+  ["ee9998", "ee969a"], # [BASKETBALL AND HOOP] U+E658 -> U+E59A
+  ["ee9999", "ee92b9"], # [CHEQUERED FLAG] U+E659 -> U+E4B9
+  ["ee9c92", "ee92b8"], # [SNOWBOARDER] U+E712 -> U+E4B8
+  ["ee9cb3", "ee91ab"], # [RUNNER] U+E733 -> U+E46B
+  ["ee999b", "ee92b5"], # [TRAIN] U+E65B -> U+E4B5
+  ["ee999c", "ee96bc"], # [CIRCLED LATIN CAPITAL LETTER M] U+E65C -> U+E5BC
+  ["ee999d", "ee92b0"], # [HIGH-SPEED TRAIN] U+E65D -> U+E4B0
+  ["ee999e", "ee92b1"], # [AUTOMOBILE] U+E65E -> U+E4B1
+  ["ee999f", "ee92b1"], # [RECREATIONAL VEHICLE] U+E65F -> U+E4B1
+  ["ee99a0", "ee92af"], # [ONCOMING BUS] U+E660 -> U+E4AF
+  ["ee99a1", "eeaa82"], # [SHIP] U+E661 -> U+EA82
+  ["ee99a2", "ee92b3"], # [AIRPLANE] U+E662 -> U+E4B3
+  ["ee9aa3", "ee92b4"], # [SAILBOAT] U+E6A3 -> U+E4B4
+  ["ee99ab", "ee95b1"], # [FUEL PUMP] U+E66B -> U+E571
+  ["ee99ac", "ee92a6"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E66C -> U+E4A6
+  ["ee99ad", "ee91aa"], # [HORIZONTAL TRAFFIC LIGHT] U+E66D -> U+E46A
+  ["ee9bb7", "ee92bc"], # [HOT SPRINGS] U+E6F7 -> U+E4BC
+  ["ee99b9", :undef], # [CAROUSEL HORSE] U+E679 -> U+3013 (GETA)
+  ["ee99b6", "ee9483"], # [MICROPHONE] U+E676 -> U+E503
+  ["ee99b7", "ee9497"], # [MOVIE CAMERA] U+E677 -> U+E517
+  ["ee99ba", "ee9488"], # [HEADPHONE] U+E67A -> U+E508
+  ["ee99bb", "ee969c"], # [ARTIST PALETTE] U+E67B -> U+E59C
+  ["ee99bc", "eeabb5"], # [TOP HAT] U+E67C -> U+EAF5
+  ["ee99bd", "ee969e"], # [CIRCUS TENT] U+E67D -> U+E59E
+  ["ee99be", "ee929e"], # [TICKET] U+E67E -> U+E49E
+  ["ee9aac", "ee92be"], # [CLAPPER BOARD] U+E6AC -> U+E4BE
+  ["ee9a8b", "ee9386"], # [VIDEO GAME] U+E68B -> U+E4C6
+  ["ee9bb6", "ee96be"], # [MUSICAL NOTE] U+E6F6 -> U+E5BE
+  ["ee9bbf", "ee9485"], # [MULTIPLE MUSICAL NOTES] U+E6FF -> U+E505
+  ["ee9a81", "ee9495"], # [CAMERA] U+E681 -> U+E515
+  ["ee9a8a", "ee9482"], # [TELEVISION] U+E68A -> U+E502
+  ["ee9bb9", "ee93ab"], # [KISS MARK] U+E6F9 -> U+E4EB
+  ["ee9c97", "eeadb8"], # [LOVE LETTER] U+E717 -> U+EB78
+  ["ee9c9b", "ee9494"], # [RING] U+E71B -> U+E514
+  ["ee9cb1", "ee9598"], # [COPYRIGHT SIGN] U+E731 -> U+E558
+  ["ee9cb6", "ee9599"], # [REGISTERED SIGN] U+E736 -> U+E559
+  ["ee9cb2", "ee958e"], # [TRADE MARK SIGN] U+E732 -> U+E54E
+  ["ee9ba0", "eeae84"], # [HASH KEY] U+E6E0 -> U+EB84
+  ["ee9ba2", "ee94a2"], # [KEYCAP 1] U+E6E2 -> U+E522
+  ["ee9ba3", "ee94a3"], # [KEYCAP 2] U+E6E3 -> U+E523
+  ["ee9ba4", "ee94a4"], # [KEYCAP 3] U+E6E4 -> U+E524
+  ["ee9ba5", "ee94a5"], # [KEYCAP 4] U+E6E5 -> U+E525
+  ["ee9ba6", "ee94a6"], # [KEYCAP 5] U+E6E6 -> U+E526
+  ["ee9ba7", "ee94a7"], # [KEYCAP 6] U+E6E7 -> U+E527
+  ["ee9ba8", "ee94a8"], # [KEYCAP 7] U+E6E8 -> U+E528
+  ["ee9ba9", "ee94a9"], # [KEYCAP 8] U+E6E9 -> U+E529
+  ["ee9baa", "ee94aa"], # [KEYCAP 9] U+E6EA -> U+E52A
+  ["ee9bab", "ee96ac"], # [KEYCAP 0] U+E6EB -> U+E5AC
+  ["ee99b3", "ee9396"], # [HAMBURGER] U+E673 -> U+E4D6
+  ["ee9d89", "ee9395"], # [RICE BALL] U+E749 -> U+E4D5
+  ["ee9d8a", "ee9390"], # [SHORTCAKE] U+E74A -> U+E4D0
+  ["ee9d8c", "ee96b4"], # [STEAMING BOWL] U+E74C -> U+E5B4
+  ["ee9d8d", "eeaaaf"], # [BREAD] U+E74D -> U+EAAF
+  ["ee99af", "ee92ac"], # [FORK AND KNIFE] U+E66F -> U+E4AC
+  ["ee99b0", "ee9697"], # [HOT BEVERAGE] U+E670 -> U+E597
+  ["ee99b1", "ee9382"], # [COCKTAIL GLASS] U+E671 -> U+E4C2
+  ["ee99b2", "ee9383"], # [BEER MUG] U+E672 -> U+E4C3
+  ["ee9c9e", "eeaaae"], # [TEACUP WITHOUT HANDLE] U+E71E -> U+EAAE
+  ["ee9d8b", "eeaa97"], # [SAKE BOTTLE AND CUP] U+E74B -> U+EA97
+  ["ee9d96", "ee9381"], # [WINE GLASS] U+E756 -> U+E4C1
+  ["ee99b8", "ee9595"], # [NORTH EAST ARROW] U+E678 -> U+E555
+  ["ee9a96", "ee958d"], # [SOUTH EAST ARROW] U+E696 -> U+E54D
+  ["ee9a97", "ee958c"], # [NORTH WEST ARROW] U+E697 -> U+E54C
+  ["ee9aa5", "ee9596"], # [SOUTH WEST ARROW] U+E6A5 -> U+E556
+  ["ee9bb5", "eeacad"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+E6F5 -> U+EB2D
+  ["ee9c80", "eeacae"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+E700 -> U+EB2E
+  ["ee9cbc", "eeadba"], # [LEFT RIGHT ARROW] U+E73C -> U+EB7A
+  ["ee9cbd", "eeadbb"], # [UP DOWN ARROW] U+E73D -> U+EB7B
+  ["ee9c82", "ee9282"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E702 -> U+E482
+  ["ee9c83", "eeacaf"], # [EXCLAMATION QUESTION MARK] U+E703 -> U+EB2F
+  ["ee9c84", "eeacb0"], # [DOUBLE EXCLAMATION MARK] U+E704 -> U+EB30
+  ["ee9c89", :undef], # [WAVY DASH] U+E709 -> U+3013 (GETA)
+  ["ee9c8a", "eeacb1"], # [CURLY LOOP] U+E70A -> U+EB31
+  ["ee9b9f", :undef], # [DOUBLE CURLY LOOP] U+E6DF -> "[フリーダイヤル]"
+  ["ee9bac", "ee9695"], # [HEAVY BLACK HEART] U+E6EC -> U+E595
+  ["ee9bad", "eeadb5"], # [BEATING HEART] U+E6ED -> U+EB75
+  ["ee9bae", "ee91b7"], # [BROKEN HEART] U+E6EE -> U+E477
+  ["ee9baf", "ee91b8"], # [TWO HEARTS] U+E6EF -> U+E478
+  ["ee9a8d", "eeaaa5"], # [BLACK HEART SUIT] U+E68D -> U+EAA5
+  ["ee9a8e", "ee96a1"], # [BLACK SPADE SUIT] U+E68E -> U+E5A1
+  ["ee9a8f", "ee96a2"], # [BLACK DIAMOND SUIT] U+E68F -> U+E5A2
+  ["ee9a90", "ee96a3"], # [BLACK CLUB SUIT] U+E690 -> U+E5A3
+  ["ee99bf", "ee91bd"], # [SMOKING SYMBOL] U+E67F -> U+E47D
+  ["ee9a80", "ee91be"], # [NO SMOKING SYMBOL] U+E680 -> U+E47E
+  ["ee9a9b", "ee91bf"], # [WHEELCHAIR SYMBOL] U+E69B -> U+E47F
+  ["ee9b9e", "eeacac"], # [TRIANGULAR FLAG ON POST] U+E6DE -> U+EB2C
+  ["ee9cb7", "ee9281"], # [WARNING SIGN] U+E737 -> U+E481
+  ["ee9cb5", "eeadb9"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+E735 -> U+EB79
+  ["ee9c9d", "ee92ae"], # [BICYCLE] U+E71D -> U+E4AE
+  ["ee99ae", "ee92a5"], # [RESTROOM] U+E66E -> U+E4A5
+  ["ee9c94", :undef], # [DOOR] U+E714 -> "[ドア]"
+  ["ee9b9b", "ee96ab"], # [SQUARED CL] U+E6DB -> U+E5AB
+  ["ee9b97", "ee95b8"], # [SQUARED FREE] U+E6D7 -> U+E578
+  ["ee9b98", "eeaa88"], # [SQUARED ID] U+E6D8 -> U+EA88
+  ["ee9b9d", "ee96b5"], # [SQUARED NEW] U+E6DD -> U+E5B5
+  ["ee9caf", :undef], # [SQUARED NG] U+E72F -> "[NG]"
+  ["ee9c8b", "ee96ad"], # [SQUARED OK] U+E70B -> U+E5AD
+  ["ee9cb8", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7981] U+E738 -> "[禁]"
+  ["ee9cb9", "eeaa8a"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+E739 -> U+EA8A
+  ["ee9cba", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5408] U+E73A -> "[合]"
+  ["ee9cbb", "eeaa89"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+E73B -> U+EA89
+  ["ee9cb4", "ee93b1"], # [CIRCLED IDEOGRAPH SECRET] U+E734 -> U+E4F1
+  ["ee9bb8", :undef], # [DIAMOND SHAPE WITH A DOT INSIDE] U+E6F8 -> U+3013 (GETA)
+  ["ee9bbb", "ee91b6"], # [ELECTRIC LIGHT BULB] U+E6FB -> U+E476
+  ["ee9bbc", "ee93a5"], # [ANGER SYMBOL] U+E6FC -> U+E4E5
+  ["ee9bbe", "ee91ba"], # [BOMB] U+E6FE -> U+E47A
+  ["ee9c81", "ee91b5"], # [SLEEPING SYMBOL] U+E701 -> U+E475
+  ["ee9c85", "ee96b0"], # [COLLISION SYMBOL] U+E705 -> U+E5B0
+  ["ee9c86", "ee96b1"], # [SPLASHING SWEAT SYMBOL] U+E706 -> U+E5B1
+  ["ee9c87", "ee93a6"], # [DROP OF WATER] U+E707 -> U+E4E6
+  ["ee9c88", "ee93b4"], # [DASH SYMBOL] U+E708 -> U+E4F4
+  ["ee9bba", "eeaaab"], # [SPARKLES] U+E6FA -> U+EAAB
+  ["ee9b9a", "ee959d"], # [LEFTWARDS ARROW WITH HOOK] U+E6DA -> U+E55D
+  ["ee9b9c", "ee9498"], # [LEFT-POINTING MAGNIFYING GLASS] U+E6DC -> U+E518
+  ["ee9b99", "ee9499"], # [KEY] U+E6D9 -> U+E519
+  ["ee9c93", "ee9492"], # [BELL] U+E713 -> U+E512
+  ["ee9ab9", :undef], # [END WITH LEFTWARDS ARROW ABOVE] U+E6B9 -> "[end]"
+  ["ee9ab8", :undef], # [ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE] U+E6B8 -> "[ON]"
+  ["ee9ab7", :undef], # [SOON WITH RIGHTWARDS ARROW ABOVE] U+E6B7 -> "[SOON]"
+  ["ee9a93", "eeae83"], # [RAISED FIST] U+E693 -> U+EB83
+  ["ee9a95", "ee96a7"], # [RAISED HAND] U+E695 -> U+E5A7
+  ["ee9a94", "ee96a6"], # [VICTORY HAND] U+E694 -> U+E5A6
+  ["ee9bbd", "ee93b3"], # [FISTED HAND SIGN] U+E6FD -> U+E4F3
+  ["ee9ca7", "ee93b9"], # [THUMBS UP SIGN] U+E727 -> U+E4F9
+  ["ee9b91", :undef], # [EMOJI COMPATIBILITY SYMBOL-1] U+E6D1 -> "[iモード]"
+  ["ee9b92", :undef], # [EMOJI COMPATIBILITY SYMBOL-2] U+E6D2 -> "[iモード]"
+  ["ee9b94", :undef], # [EMOJI COMPATIBILITY SYMBOL-3] U+E6D4 -> "[ドコモ]"
+  ["ee9b95", :undef], # [EMOJI COMPATIBILITY SYMBOL-4] U+E6D5 -> "[ドコモポイント]"
+  ["ee9c8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-5] U+E70C -> "[iアプリ]"
+  ["ee9c8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-6] U+E70D -> "[iアプリ]"
+  ["ee9aa6", :undef], # [EMOJI COMPATIBILITY SYMBOL-7] U+E6A6 -> "[ぴ]"
+  ["ee9aa7", :undef], # [EMOJI COMPATIBILITY SYMBOL-8] U+E6A7 -> "[あ]"
+  ["ee9aa8", :undef], # [EMOJI COMPATIBILITY SYMBOL-9] U+E6A8 -> "[チケット]"
+  ["ee9aa9", :undef], # [EMOJI COMPATIBILITY SYMBOL-10] U+E6A9 -> "[チケット]"
+  ["ee9aaa", :undef], # [EMOJI COMPATIBILITY SYMBOL-11] U+E6AA -> "[電話先行]"
+  ["ee9aab", :undef], # [EMOJI COMPATIBILITY SYMBOL-12] U+E6AB -> "[Pコード]"
+  ["ee9aaf", "ee9497"], # [EMOJI COMPATIBILITY SYMBOL-13] U+E6AF -> U+E517
+  ["ee9ab0", :undef], # [EMOJI COMPATIBILITY SYMBOL-14] U+E6B0 -> "[ぴ]"
+  ["ee9ab4", :undef], # [EMOJI COMPATIBILITY SYMBOL-15] U+E6B4 -> "(ぴ)"
+  ["ee9ab5", :undef], # [EMOJI COMPATIBILITY SYMBOL-16] U+E6B5 -> "[ぴ]"
+  ["ee9ab6", :undef], # [EMOJI COMPATIBILITY SYMBOL-17] U+E6B6 -> "[チェック]"
+  ["ee9abb", :undef], # [EMOJI COMPATIBILITY SYMBOL-18] U+E6BB -> "[F]"
+  ["ee9abc", :undef], # [EMOJI COMPATIBILITY SYMBOL-19] U+E6BC -> "[D]"
+  ["ee9abd", :undef], # [EMOJI COMPATIBILITY SYMBOL-20] U+E6BD -> "[S]"
+  ["ee9abe", :undef], # [EMOJI COMPATIBILITY SYMBOL-21] U+E6BE -> "[C]"
+  ["ee9abf", :undef], # [EMOJI COMPATIBILITY SYMBOL-22] U+E6BF -> "[R]"
+  ["ee9b80", :undef], # [EMOJI COMPATIBILITY SYMBOL-23] U+E6C0 -> "■"
+  ["ee9b81", :undef], # [EMOJI COMPATIBILITY SYMBOL-24] U+E6C1 -> "■"
+  ["ee9b82", :undef], # [EMOJI COMPATIBILITY SYMBOL-25] U+E6C2 -> "▼"
+  ["ee9b83", :undef], # [EMOJI COMPATIBILITY SYMBOL-26] U+E6C3 -> "††††"
+  ["ee9b84", :undef], # [EMOJI COMPATIBILITY SYMBOL-27] U+E6C4 -> "†††"
+  ["ee9b85", :undef], # [EMOJI COMPATIBILITY SYMBOL-28] U+E6C5 -> "††"
+  ["ee9b86", :undef], # [EMOJI COMPATIBILITY SYMBOL-29] U+E6C6 -> "†"
+  ["ee9b87", :undef], # [EMOJI COMPATIBILITY SYMBOL-30] U+E6C7 -> "[I]"
+  ["ee9b88", :undef], # [EMOJI COMPATIBILITY SYMBOL-31] U+E6C8 -> "[M]"
+  ["ee9b89", :undef], # [EMOJI COMPATIBILITY SYMBOL-32] U+E6C9 -> "[E]"
+  ["ee9b8a", :undef], # [EMOJI COMPATIBILITY SYMBOL-33] U+E6CA -> "[VE]"
+  ["ee9b8b", :undef], # [EMOJI COMPATIBILITY SYMBOL-34] U+E6CB -> "●"
+  ["ee9b8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-35] U+E6CC -> "[カード使用不可]"
+  ["ee9b8d", "eeac82"], # [EMOJI COMPATIBILITY SYMBOL-36] U+E6CD -> U+EB02
+  ["ee9ba1", "ee94ac"], # [EMOJI COMPATIBILITY SYMBOL-66] U+E6E1 -> U+E52C
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-DoCoMo']['UTF8-SoftBank'] = [
+  ["ee98be", "ee818a"], # [BLACK SUN WITH RAYS] U+E63E -> U+E04A
+  ["ee98bf", "ee8189"], # [CLOUD] U+E63F -> U+E049
+  ["ee9980", "ee818b"], # [UMBRELLA WITH RAIN DROPS] U+E640 -> U+E04B
+  ["ee9981", "ee8188"], # [SNOWMAN WITHOUT SNOW] U+E641 -> U+E048
+  ["ee9982", "ee84bd"], # [HIGH VOLTAGE SIGN] U+E642 -> U+E13D
+  ["ee9983", "ee9183"], # [CYCLONE] U+E643 -> U+E443
+  ["ee9984", :undef], # [FOGGY] U+E644 -> "[霧]"
+  ["ee9985", "ee90bc"], # [CLOSED UMBRELLA] U+E645 -> U+E43C
+  ["ee9ab3", "ee918b"], # [NIGHT WITH STARS] U+E6B3 -> U+E44B
+  ["ee9cbf", "ee90be"], # [WATER WAVE] U+E73F -> U+E43E
+  ["ee9a9c", :undef], # [NEW MOON SYMBOL] U+E69C -> "●"
+  ["ee9a9d", "ee818c"], # [WAXING GIBBOUS MOON SYMBOL] U+E69D -> U+E04C
+  ["ee9a9e", "ee818c"], # [FIRST QUARTER MOON SYMBOL] U+E69E -> U+E04C
+  ["ee9a9f", "ee818c"], # [CRESCENT MOON] U+E69F -> U+E04C
+  ["ee9aa0", :undef], # [FULL MOON SYMBOL] U+E6A0 -> "○"
+  ["ee9c9f", :undef], # [WATCH] U+E71F -> "[腕時計]"
+  ["ee9aba", "ee80ad"], # [ALARM CLOCK] U+E6BA -> U+E02D
+  ["ee9c9c", :undef], # [HOURGLASS WITH FLOWING SAND] U+E71C -> "[砂時計]"
+  ["ee9986", "ee88bf"], # [ARIES] U+E646 -> U+E23F
+  ["ee9987", "ee8980"], # [TAURUS] U+E647 -> U+E240
+  ["ee9988", "ee8981"], # [GEMINI] U+E648 -> U+E241
+  ["ee9989", "ee8982"], # [CANCER] U+E649 -> U+E242
+  ["ee998a", "ee8983"], # [LEO] U+E64A -> U+E243
+  ["ee998b", "ee8984"], # [VIRGO] U+E64B -> U+E244
+  ["ee998c", "ee8985"], # [LIBRA] U+E64C -> U+E245
+  ["ee998d", "ee8986"], # [SCORPIUS] U+E64D -> U+E246
+  ["ee998e", "ee8987"], # [SAGITTARIUS] U+E64E -> U+E247
+  ["ee998f", "ee8988"], # [CAPRICORN] U+E64F -> U+E248
+  ["ee9990", "ee8989"], # [AQUARIUS] U+E650 -> U+E249
+  ["ee9991", "ee898a"], # [PISCES] U+E651 -> U+E24A
+  ["ee9d81", "ee8490"], # [FOUR LEAF CLOVER] U+E741 -> U+E110
+  ["ee9d83", "ee8c84"], # [TULIP] U+E743 -> U+E304
+  ["ee9d86", "ee8490"], # [SEEDLING] U+E746 -> U+E110
+  ["ee9d87", "ee8498"], # [MAPLE LEAF] U+E747 -> U+E118
+  ["ee9d88", "ee80b0"], # [CHERRY BLOSSOM] U+E748 -> U+E030
+  ["ee9d82", :undef], # [CHERRIES] U+E742 -> "[さくらんぼ]"
+  ["ee9d84", :undef], # [BANANA] U+E744 -> "[バナナ]"
+  ["ee9d85", "ee8d85"], # [RED APPLE] U+E745 -> U+E345
+  ["ee9a91", "ee9099"], # [EYES] U+E691 -> U+E419
+  ["ee9a92", "ee909b"], # [EAR] U+E692 -> U+E41B
+  ["ee9c90", "ee8c9c"], # [LIPSTICK] U+E710 -> U+E31C
+  ["ee9ab1", :undef], # [BUST IN SILHOUETTE] U+E6B1 -> U+3013 (GETA)
+  ["ee9d8e", :undef], # [SNAIL] U+E74E -> "[カタツムリ]"
+  ["ee9d8f", "ee94a3"], # [BABY CHICK] U+E74F -> U+E523
+  ["ee9d90", "ee8195"], # [PENGUIN] U+E750 -> U+E055
+  ["ee9d91", "ee8099"], # [FISH] U+E751 -> U+E019
+  ["ee9aa2", "ee818f"], # [CAT FACE] U+E6A2 -> U+E04F
+  ["ee9d94", "ee809a"], # [HORSE FACE] U+E754 -> U+E01A
+  ["ee9aa1", "ee8192"], # [DOG FACE] U+E6A1 -> U+E052
+  ["ee9d95", "ee848b"], # [PIG FACE] U+E755 -> U+E10B
+  ["ee9bb1", "ee8199"], # [ANGRY FACE] U+E6F1 -> U+E059
+  ["ee9bb2", "ee8198"], # [DISAPPOINTED FACE] U+E6F2 -> U+E058
+  ["ee9bb4", "ee9086"], # [DIZZY FACE] U+E6F4 -> U+E406
+  ["ee9ca5", "ee908e"], # [EXPRESSIONLESS FACE] U+E725 -> U+E40E
+  ["ee9ca6", "ee8486"], # [FACE WITH HEART-SHAPED EYES] U+E726 -> U+E106
+  ["ee9ca8", "ee8485"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E728 -> U+E105
+  ["ee9d92", "ee8196"], # [FACE SAVOURING DELICIOUS FOOD] U+E752 -> U+E056
+  ["ee9bb0", "ee8197"], # [HAPPY FACE WITH OPEN MOUTH] U+E6F0 -> U+E057
+  ["ee9ca2", "ee9095ee8cb1"], # [HAPPY FACE WITH OPEN MOUTH AND COLD SWEAT] U+E722 -> U+E415 U+E331
+  ["ee9caa", "ee908a"], # [HAPPY FACE WITH OPEN MOUTH AND CLOSED EYES] U+E72A -> U+E40A
+  ["ee9d93", "ee9084"], # [HAPPY FACE WITH GRIN] U+E753 -> U+E404
+  ["ee9cae", "ee9093"], # [CRYING FACE] U+E72E -> U+E413
+  ["ee9cad", "ee9091"], # [LOUDLY CRYING FACE] U+E72D -> U+E411
+  ["ee9cab", "ee9086"], # [PERSEVERING FACE] U+E72B -> U+E406
+  ["ee9ca4", "ee9096"], # [POUTING FACE] U+E724 -> U+E416
+  ["ee9ca1", "ee908a"], # [RELIEVED FACE] U+E721 -> U+E40A
+  ["ee9bb3", "ee9087"], # [CONFOUNDED FACE] U+E6F3 -> U+E407
+  ["ee9ca0", "ee9083"], # [PENSIVE FACE] U+E720 -> U+E403
+  ["ee9d97", "ee8487"], # [FACE SCREAMING IN FEAR] U+E757 -> U+E107
+  ["ee9cac", "ee9082"], # [SMIRKING FACE] U+E72C -> U+E402
+  ["ee9ca3", "ee8488"], # [FACE WITH COLD SWEAT] U+E723 -> U+E108
+  ["ee9ca9", "ee9085"], # [WINKING FACE] U+E729 -> U+E405
+  ["ee99a3", "ee80b6"], # [HOUSE BUILDING] U+E663 -> U+E036
+  ["ee99a4", "ee80b8"], # [OFFICE BUILDING] U+E664 -> U+E038
+  ["ee99a5", "ee8593"], # [JAPANESE POST OFFICE] U+E665 -> U+E153
+  ["ee99a6", "ee8595"], # [HOSPITAL] U+E666 -> U+E155
+  ["ee99a7", "ee858d"], # [BANK] U+E667 -> U+E14D
+  ["ee99a8", "ee8594"], # [AUTOMATED TELLER MACHINE] U+E668 -> U+E154
+  ["ee99a9", "ee8598"], # [HOTEL] U+E669 -> U+E158
+  ["ee99aa", "ee8596"], # [CONVENIENCE STORE] U+E66A -> U+E156
+  ["ee9cbe", "ee8597"], # [SCHOOL] U+E73E -> U+E157
+  ["ee9d80", "ee80bb"], # [MOUNT FUJI] U+E740 -> U+E03B
+  ["ee9a99", "ee8087"], # [ATHLETIC SHOE] U+E699 -> U+E007
+  ["ee99b4", "ee84be"], # [HIGH-HEELED SHOE] U+E674 -> U+E13E
+  ["ee9a98", "ee94b6"], # [FOOTPRINTS] U+E698 -> U+E536
+  ["ee9a9a", :undef], # [EYEGLASSES] U+E69A -> "[メガネ]"
+  ["ee9c8e", "ee8086"], # [T-SHIRT] U+E70E -> U+E006
+  ["ee9c91", :undef], # [JEANS] U+E711 -> "[ジーンズ]"
+  ["ee9c9a", "ee848e"], # [CROWN] U+E71A -> U+E10E
+  ["ee9c8f", :undef], # [PURSE] U+E70F -> "[財布]"
+  ["ee9a82", "ee8ca3"], # [HANDBAG] U+E682 -> U+E323
+  ["ee9aad", :undef], # [POUCH] U+E6AD -> "[ふくろ]"
+  ["ee9c95", "ee84af"], # [MONEY BAG] U+E715 -> U+E12F
+  ["ee9b96", :undef], # [BANKNOTE WITH YEN SIGN] U+E6D6 -> "￥"
+  ["ee9c98", :undef], # [WRENCH] U+E718 -> "[レンチ]"
+  ["ee9a84", "ee8c94"], # [RIBBON] U+E684 -> U+E314
+  ["ee9a85", "ee8492"], # [WRAPPED PRESENT] U+E685 -> U+E112
+  ["ee9a86", "ee8d8b"], # [BIRTHDAY CAKE] U+E686 -> U+E34B
+  ["ee9aa4", "ee80b3"], # [CHRISTMAS TREE] U+E6A4 -> U+E033
+  ["ee999a", :undef], # [PAGER] U+E65A -> "[ポケベル]"
+  ["ee9a87", "ee8089"], # [BLACK TELEPHONE] U+E687 -> U+E009
+  ["ee9a88", "ee808a"], # [MOBILE PHONE] U+E688 -> U+E00A
+  ["ee9b8e", "ee8484"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+E6CE -> U+E104
+  ["ee9a89", "ee8c81"], # [MEMO] U+E689 -> U+E301
+  ["ee9b90", "ee808b"], # [FAX MACHINE] U+E6D0 -> U+E00B
+  ["ee9b93", "ee8483"], # [ENVELOPE] U+E6D3 -> U+E103
+  ["ee9b8f", "ee8483"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+E6CF -> U+E103
+  ["ee9aae", :undef], # [BLACK NIB] U+E6AE -> "[ペン]"
+  ["ee9ab2", "ee849f"], # [SEAT] U+E6B2 -> U+E11F
+  ["ee9c96", "ee808c"], # [PERSONAL COMPUTER] U+E716 -> U+E00C
+  ["ee9c99", "ee8c81"], # [PENCIL] U+E719 -> U+E301
+  ["ee9cb0", :undef], # [PAPERCLIP] U+E730 -> "[クリップ]"
+  ["ee9a8c", "ee84a6"], # [OPTICAL DISC] U+E68C -> U+E126
+  ["ee99b5", "ee8c93"], # [BLACK SCISSORS] U+E675 -> U+E313
+  ["ee9a83", "ee8588"], # [OPEN BOOK] U+E683 -> U+E148
+  ["ee9992", :undef], # [RUNNING SHIRT WITH SASH] U+E652 -> U+3013 (GETA)
+  ["ee9993", "ee8096"], # [BASEBALL] U+E653 -> U+E016
+  ["ee9994", "ee8094"], # [FLAG IN HOLE] U+E654 -> U+E014
+  ["ee9995", "ee8095"], # [TENNIS RACQUET AND BALL] U+E655 -> U+E015
+  ["ee9996", "ee8098"], # [SOCCER BALL] U+E656 -> U+E018
+  ["ee9997", "ee8093"], # [SKI AND SKI BOOT] U+E657 -> U+E013
+  ["ee9998", "ee90aa"], # [BASKETBALL AND HOOP] U+E658 -> U+E42A
+  ["ee9999", "ee84b2"], # [CHEQUERED FLAG] U+E659 -> U+E132
+  ["ee9c92", :undef], # [SNOWBOARDER] U+E712 -> "[スノボ]"
+  ["ee9cb3", "ee8495"], # [RUNNER] U+E733 -> U+E115
+  ["ee999b", "ee809e"], # [TRAIN] U+E65B -> U+E01E
+  ["ee999c", "ee90b4"], # [CIRCLED LATIN CAPITAL LETTER M] U+E65C -> U+E434
+  ["ee999d", "ee90b5"], # [HIGH-SPEED TRAIN] U+E65D -> U+E435
+  ["ee999e", "ee809b"], # [AUTOMOBILE] U+E65E -> U+E01B
+  ["ee999f", "ee90ae"], # [RECREATIONAL VEHICLE] U+E65F -> U+E42E
+  ["ee99a0", "ee8599"], # [ONCOMING BUS] U+E660 -> U+E159
+  ["ee99a1", "ee8882"], # [SHIP] U+E661 -> U+E202
+  ["ee99a2", "ee809d"], # [AIRPLANE] U+E662 -> U+E01D
+  ["ee9aa3", "ee809c"], # [SAILBOAT] U+E6A3 -> U+E01C
+  ["ee99ab", "ee80ba"], # [FUEL PUMP] U+E66B -> U+E03A
+  ["ee99ac", "ee858f"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E66C -> U+E14F
+  ["ee99ad", "ee858e"], # [HORIZONTAL TRAFFIC LIGHT] U+E66D -> U+E14E
+  ["ee9bb7", "ee84a3"], # [HOT SPRINGS] U+E6F7 -> U+E123
+  ["ee99b9", :undef], # [CAROUSEL HORSE] U+E679 -> U+3013 (GETA)
+  ["ee99b6", "ee80bc"], # [MICROPHONE] U+E676 -> U+E03C
+  ["ee99b7", "ee80bd"], # [MOVIE CAMERA] U+E677 -> U+E03D
+  ["ee99ba", "ee8c8a"], # [HEADPHONE] U+E67A -> U+E30A
+  ["ee99bb", "ee9482"], # [ARTIST PALETTE] U+E67B -> U+E502
+  ["ee99bc", "ee9483"], # [TOP HAT] U+E67C -> U+E503
+  ["ee99bd", :undef], # [CIRCUS TENT] U+E67D -> "[イベント]"
+  ["ee99be", "ee84a5"], # [TICKET] U+E67E -> U+E125
+  ["ee9aac", "ee8ca4"], # [CLAPPER BOARD] U+E6AC -> U+E324
+  ["ee9a8b", :undef], # [VIDEO GAME] U+E68B -> "[ゲーム]"
+  ["ee9bb6", "ee80be"], # [MUSICAL NOTE] U+E6F6 -> U+E03E
+  ["ee9bbf", "ee8ca6"], # [MULTIPLE MUSICAL NOTES] U+E6FF -> U+E326
+  ["ee9a81", "ee8088"], # [CAMERA] U+E681 -> U+E008
+  ["ee9a8a", "ee84aa"], # [TELEVISION] U+E68A -> U+E12A
+  ["ee9bb9", "ee8083"], # [KISS MARK] U+E6F9 -> U+E003
+  ["ee9c97", "ee8483ee8ca8"], # [LOVE LETTER] U+E717 -> U+E103 U+E328
+  ["ee9c9b", "ee80b4"], # [RING] U+E71B -> U+E034
+  ["ee9cb1", "ee898e"], # [COPYRIGHT SIGN] U+E731 -> U+E24E
+  ["ee9cb6", "ee898f"], # [REGISTERED SIGN] U+E736 -> U+E24F
+  ["ee9cb2", "ee94b7"], # [TRADE MARK SIGN] U+E732 -> U+E537
+  ["ee9ba0", "ee8890"], # [HASH KEY] U+E6E0 -> U+E210
+  ["ee9ba2", "ee889c"], # [KEYCAP 1] U+E6E2 -> U+E21C
+  ["ee9ba3", "ee889d"], # [KEYCAP 2] U+E6E3 -> U+E21D
+  ["ee9ba4", "ee889e"], # [KEYCAP 3] U+E6E4 -> U+E21E
+  ["ee9ba5", "ee889f"], # [KEYCAP 4] U+E6E5 -> U+E21F
+  ["ee9ba6", "ee88a0"], # [KEYCAP 5] U+E6E6 -> U+E220
+  ["ee9ba7", "ee88a1"], # [KEYCAP 6] U+E6E7 -> U+E221
+  ["ee9ba8", "ee88a2"], # [KEYCAP 7] U+E6E8 -> U+E222
+  ["ee9ba9", "ee88a3"], # [KEYCAP 8] U+E6E9 -> U+E223
+  ["ee9baa", "ee88a4"], # [KEYCAP 9] U+E6EA -> U+E224
+  ["ee9bab", "ee88a5"], # [KEYCAP 0] U+E6EB -> U+E225
+  ["ee99b3", "ee84a0"], # [HAMBURGER] U+E673 -> U+E120
+  ["ee9d89", "ee8d82"], # [RICE BALL] U+E749 -> U+E342
+  ["ee9d8a", "ee8186"], # [SHORTCAKE] U+E74A -> U+E046
+  ["ee9d8c", "ee8d80"], # [STEAMING BOWL] U+E74C -> U+E340
+  ["ee9d8d", "ee8cb9"], # [BREAD] U+E74D -> U+E339
+  ["ee99af", "ee8183"], # [FORK AND KNIFE] U+E66F -> U+E043
+  ["ee99b0", "ee8185"], # [HOT BEVERAGE] U+E670 -> U+E045
+  ["ee99b1", "ee8184"], # [COCKTAIL GLASS] U+E671 -> U+E044
+  ["ee99b2", "ee8187"], # [BEER MUG] U+E672 -> U+E047
+  ["ee9c9e", "ee8cb8"], # [TEACUP WITHOUT HANDLE] U+E71E -> U+E338
+  ["ee9d8b", "ee8c8b"], # [SAKE BOTTLE AND CUP] U+E74B -> U+E30B
+  ["ee9d96", "ee8184"], # [WINE GLASS] U+E756 -> U+E044
+  ["ee99b8", "ee88b6"], # [NORTH EAST ARROW] U+E678 -> U+E236
+  ["ee9a96", "ee88b8"], # [SOUTH EAST ARROW] U+E696 -> U+E238
+  ["ee9a97", "ee88b7"], # [NORTH WEST ARROW] U+E697 -> U+E237
+  ["ee9aa5", "ee88b9"], # [SOUTH WEST ARROW] U+E6A5 -> U+E239
+  ["ee9bb5", "ee88b6"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+E6F5 -> U+E236
+  ["ee9c80", "ee88b8"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+E700 -> U+E238
+  ["ee9cbc", :undef], # [LEFT RIGHT ARROW] U+E73C -> "⇔"
+  ["ee9cbd", :undef], # [UP DOWN ARROW] U+E73D -> "↑↓"
+  ["ee9c82", "ee80a1"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E702 -> U+E021
+  ["ee9c83", :undef], # [EXCLAMATION QUESTION MARK] U+E703 -> "！？"
+  ["ee9c84", :undef], # [DOUBLE EXCLAMATION MARK] U+E704 -> "！！"
+  ["ee9c89", :undef], # [WAVY DASH] U+E709 -> U+3013 (GETA)
+  ["ee9c8a", :undef], # [CURLY LOOP] U+E70A -> "～"
+  ["ee9b9f", "ee8891"], # [DOUBLE CURLY LOOP] U+E6DF -> U+E211
+  ["ee9bac", "ee80a2"], # [HEAVY BLACK HEART] U+E6EC -> U+E022
+  ["ee9bad", "ee8ca7"], # [BEATING HEART] U+E6ED -> U+E327
+  ["ee9bae", "ee80a3"], # [BROKEN HEART] U+E6EE -> U+E023
+  ["ee9baf", "ee8ca7"], # [TWO HEARTS] U+E6EF -> U+E327
+  ["ee9a8d", "ee888c"], # [BLACK HEART SUIT] U+E68D -> U+E20C
+  ["ee9a8e", "ee888e"], # [BLACK SPADE SUIT] U+E68E -> U+E20E
+  ["ee9a8f", "ee888d"], # [BLACK DIAMOND SUIT] U+E68F -> U+E20D
+  ["ee9a90", "ee888f"], # [BLACK CLUB SUIT] U+E690 -> U+E20F
+  ["ee99bf", "ee8c8e"], # [SMOKING SYMBOL] U+E67F -> U+E30E
+  ["ee9a80", "ee8888"], # [NO SMOKING SYMBOL] U+E680 -> U+E208
+  ["ee9a9b", "ee888a"], # [WHEELCHAIR SYMBOL] U+E69B -> U+E20A
+  ["ee9b9e", :undef], # [TRIANGULAR FLAG ON POST] U+E6DE -> "[旗]"
+  ["ee9cb7", "ee8992"], # [WARNING SIGN] U+E737 -> U+E252
+  ["ee9cb5", :undef], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+E735 -> "↑↓"
+  ["ee9c9d", "ee84b6"], # [BICYCLE] U+E71D -> U+E136
+  ["ee99ae", "ee8591"], # [RESTROOM] U+E66E -> U+E151
+  ["ee9c94", :undef], # [DOOR] U+E714 -> "[ドア]"
+  ["ee9b9b", :undef], # [SQUARED CL] U+E6DB -> "[CL]"
+  ["ee9b97", :undef], # [SQUARED FREE] U+E6D7 -> "[FREE]"
+  ["ee9b98", "ee88a9"], # [SQUARED ID] U+E6D8 -> U+E229
+  ["ee9b9d", "ee8892"], # [SQUARED NEW] U+E6DD -> U+E212
+  ["ee9caf", :undef], # [SQUARED NG] U+E72F -> "[NG]"
+  ["ee9c8b", "ee898d"], # [SQUARED OK] U+E70B -> U+E24D
+  ["ee9cb8", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7981] U+E738 -> "[禁]"
+  ["ee9cb9", "ee88ab"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+E739 -> U+E22B
+  ["ee9cba", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5408] U+E73A -> "[合]"
+  ["ee9cbb", "ee88aa"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+E73B -> U+E22A
+  ["ee9cb4", "ee8c95"], # [CIRCLED IDEOGRAPH SECRET] U+E734 -> U+E315
+  ["ee9bb8", :undef], # [DIAMOND SHAPE WITH A DOT INSIDE] U+E6F8 -> U+3013 (GETA)
+  ["ee9bbb", "ee848f"], # [ELECTRIC LIGHT BULB] U+E6FB -> U+E10F
+  ["ee9bbc", "ee8cb4"], # [ANGER SYMBOL] U+E6FC -> U+E334
+  ["ee9bbe", "ee8c91"], # [BOMB] U+E6FE -> U+E311
+  ["ee9c81", "ee84bc"], # [SLEEPING SYMBOL] U+E701 -> U+E13C
+  ["ee9c85", :undef], # [COLLISION SYMBOL] U+E705 -> "[ドンッ]"
+  ["ee9c86", "ee8cb1"], # [SPLASHING SWEAT SYMBOL] U+E706 -> U+E331
+  ["ee9c87", "ee8cb1"], # [DROP OF WATER] U+E707 -> U+E331
+  ["ee9c88", "ee8cb0"], # [DASH SYMBOL] U+E708 -> U+E330
+  ["ee9bba", "ee8cae"], # [SPARKLES] U+E6FA -> U+E32E
+  ["ee9b9a", :undef], # [LEFTWARDS ARROW WITH HOOK] U+E6DA -> "←┘"
+  ["ee9b9c", "ee8494"], # [LEFT-POINTING MAGNIFYING GLASS] U+E6DC -> U+E114
+  ["ee9b99", "ee80bf"], # [KEY] U+E6D9 -> U+E03F
+  ["ee9c93", "ee8ca5"], # [BELL] U+E713 -> U+E325
+  ["ee9ab9", :undef], # [END WITH LEFTWARDS ARROW ABOVE] U+E6B9 -> "[end]"
+  ["ee9ab8", :undef], # [ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE] U+E6B8 -> "[ON]"
+  ["ee9ab7", :undef], # [SOON WITH RIGHTWARDS ARROW ABOVE] U+E6B7 -> "[SOON]"
+  ["ee9a93", "ee8090"], # [RAISED FIST] U+E693 -> U+E010
+  ["ee9a95", "ee8092"], # [RAISED HAND] U+E695 -> U+E012
+  ["ee9a94", "ee8091"], # [VICTORY HAND] U+E694 -> U+E011
+  ["ee9bbd", "ee808d"], # [FISTED HAND SIGN] U+E6FD -> U+E00D
+  ["ee9ca7", "ee808e"], # [THUMBS UP SIGN] U+E727 -> U+E00E
+  ["ee9b91", :undef], # [EMOJI COMPATIBILITY SYMBOL-1] U+E6D1 -> "[iモード]"
+  ["ee9b92", :undef], # [EMOJI COMPATIBILITY SYMBOL-2] U+E6D2 -> "[iモード]"
+  ["ee9b94", :undef], # [EMOJI COMPATIBILITY SYMBOL-3] U+E6D4 -> "[ドコモ]"
+  ["ee9b95", :undef], # [EMOJI COMPATIBILITY SYMBOL-4] U+E6D5 -> "[ドコモポイント]"
+  ["ee9c8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-5] U+E70C -> "[iアプリ]"
+  ["ee9c8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-6] U+E70D -> "[iアプリ]"
+  ["ee9aa6", :undef], # [EMOJI COMPATIBILITY SYMBOL-7] U+E6A6 -> "[ぴ]"
+  ["ee9aa7", :undef], # [EMOJI COMPATIBILITY SYMBOL-8] U+E6A7 -> "[あ]"
+  ["ee9aa8", :undef], # [EMOJI COMPATIBILITY SYMBOL-9] U+E6A8 -> "[チケット]"
+  ["ee9aa9", :undef], # [EMOJI COMPATIBILITY SYMBOL-10] U+E6A9 -> "[チケット]"
+  ["ee9aaa", :undef], # [EMOJI COMPATIBILITY SYMBOL-11] U+E6AA -> "[電話先行]"
+  ["ee9aab", :undef], # [EMOJI COMPATIBILITY SYMBOL-12] U+E6AB -> "[Pコード]"
+  ["ee9aaf", "ee80bd"], # [EMOJI COMPATIBILITY SYMBOL-13] U+E6AF -> U+E03D
+  ["ee9ab0", :undef], # [EMOJI COMPATIBILITY SYMBOL-14] U+E6B0 -> "[ぴ]"
+  ["ee9ab4", :undef], # [EMOJI COMPATIBILITY SYMBOL-15] U+E6B4 -> "(ぴ)"
+  ["ee9ab5", :undef], # [EMOJI COMPATIBILITY SYMBOL-16] U+E6B5 -> "[ぴ]"
+  ["ee9ab6", :undef], # [EMOJI COMPATIBILITY SYMBOL-17] U+E6B6 -> "[チェック]"
+  ["ee9abb", :undef], # [EMOJI COMPATIBILITY SYMBOL-18] U+E6BB -> "[F]"
+  ["ee9abc", :undef], # [EMOJI COMPATIBILITY SYMBOL-19] U+E6BC -> "[D]"
+  ["ee9abd", :undef], # [EMOJI COMPATIBILITY SYMBOL-20] U+E6BD -> "[S]"
+  ["ee9abe", :undef], # [EMOJI COMPATIBILITY SYMBOL-21] U+E6BE -> "[C]"
+  ["ee9abf", :undef], # [EMOJI COMPATIBILITY SYMBOL-22] U+E6BF -> "[R]"
+  ["ee9b80", :undef], # [EMOJI COMPATIBILITY SYMBOL-23] U+E6C0 -> "■"
+  ["ee9b81", :undef], # [EMOJI COMPATIBILITY SYMBOL-24] U+E6C1 -> "■"
+  ["ee9b82", :undef], # [EMOJI COMPATIBILITY SYMBOL-25] U+E6C2 -> "▼"
+  ["ee9b83", :undef], # [EMOJI COMPATIBILITY SYMBOL-26] U+E6C3 -> "††††"
+  ["ee9b84", :undef], # [EMOJI COMPATIBILITY SYMBOL-27] U+E6C4 -> "†††"
+  ["ee9b85", :undef], # [EMOJI COMPATIBILITY SYMBOL-28] U+E6C5 -> "††"
+  ["ee9b86", :undef], # [EMOJI COMPATIBILITY SYMBOL-29] U+E6C6 -> "†"
+  ["ee9b87", :undef], # [EMOJI COMPATIBILITY SYMBOL-30] U+E6C7 -> "[I]"
+  ["ee9b88", :undef], # [EMOJI COMPATIBILITY SYMBOL-31] U+E6C8 -> "[M]"
+  ["ee9b89", :undef], # [EMOJI COMPATIBILITY SYMBOL-32] U+E6C9 -> "[E]"
+  ["ee9b8a", :undef], # [EMOJI COMPATIBILITY SYMBOL-33] U+E6CA -> "[VE]"
+  ["ee9b8b", :undef], # [EMOJI COMPATIBILITY SYMBOL-34] U+E6CB -> "●"
+  ["ee9b8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-35] U+E6CC -> "[カード使用不可]"
+  ["ee9b8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-36] U+E6CD -> "[チェックボックス]"
+  ["ee9ba1", :undef], # [EMOJI COMPATIBILITY SYMBOL-66] U+E6E1 -> "[Q]"
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-DoCoMo']['UTF-8'] = [
+  ["ee98be", "e29880"], # [BLACK SUN WITH RAYS] U+E63E -> U+2600
+  ["ee98bf", "e29881"], # [CLOUD] U+E63F -> U+2601
+  ["ee9980", "e29894"], # [UMBRELLA WITH RAIN DROPS] U+E640 -> U+2614
+  ["ee9981", "e29b84"], # [SNOWMAN WITHOUT SNOW] U+E641 -> U+26C4
+  ["ee9982", "e29aa1"], # [HIGH VOLTAGE SIGN] U+E642 -> U+26A1
+  ["ee9983", :undef], # [CYCLONE] U+E643 -> U+1F300
+  ["ee9984", :undef], # [FOGGY] U+E644 -> U+1F301
+  ["ee9985", :undef], # [CLOSED UMBRELLA] U+E645 -> U+1F302
+  ["ee9ab3", :undef], # [NIGHT WITH STARS] U+E6B3 -> U+1F303
+  ["ee9cbf", :undef], # [WATER WAVE] U+E73F -> U+1F30A
+  ["ee9a9c", :undef], # [NEW MOON SYMBOL] U+E69C -> U+1F311
+  ["ee9a9d", :undef], # [WAXING GIBBOUS MOON SYMBOL] U+E69D -> U+1F314
+  ["ee9a9e", :undef], # [FIRST QUARTER MOON SYMBOL] U+E69E -> U+1F313
+  ["ee9a9f", :undef], # [CRESCENT MOON] U+E69F -> U+1F319
+  ["ee9aa0", :undef], # [FULL MOON SYMBOL] U+E6A0 -> U+1F315
+  ["ee9c9f", "e28c9a"], # [WATCH] U+E71F -> U+231A
+  ["ee9aba", :undef], # [ALARM CLOCK] U+E6BA -> U+23F0
+  ["ee9c9c", :undef], # [HOURGLASS WITH FLOWING SAND] U+E71C -> U+23F3
+  ["ee9986", "e29988"], # [ARIES] U+E646 -> U+2648
+  ["ee9987", "e29989"], # [TAURUS] U+E647 -> U+2649
+  ["ee9988", "e2998a"], # [GEMINI] U+E648 -> U+264A
+  ["ee9989", "e2998b"], # [CANCER] U+E649 -> U+264B
+  ["ee998a", "e2998c"], # [LEO] U+E64A -> U+264C
+  ["ee998b", "e2998d"], # [VIRGO] U+E64B -> U+264D
+  ["ee998c", "e2998e"], # [LIBRA] U+E64C -> U+264E
+  ["ee998d", "e2998f"], # [SCORPIUS] U+E64D -> U+264F
+  ["ee998e", "e29990"], # [SAGITTARIUS] U+E64E -> U+2650
+  ["ee998f", "e29991"], # [CAPRICORN] U+E64F -> U+2651
+  ["ee9990", "e29992"], # [AQUARIUS] U+E650 -> U+2652
+  ["ee9991", "e29993"], # [PISCES] U+E651 -> U+2653
+  ["ee9d81", :undef], # [FOUR LEAF CLOVER] U+E741 -> U+1F340
+  ["ee9d83", :undef], # [TULIP] U+E743 -> U+1F337
+  ["ee9d86", :undef], # [SEEDLING] U+E746 -> U+1F331
+  ["ee9d87", :undef], # [MAPLE LEAF] U+E747 -> U+1F341
+  ["ee9d88", :undef], # [CHERRY BLOSSOM] U+E748 -> U+1F338
+  ["ee9d82", :undef], # [CHERRIES] U+E742 -> U+1F352
+  ["ee9d84", :undef], # [BANANA] U+E744 -> U+1F34C
+  ["ee9d85", :undef], # [RED APPLE] U+E745 -> U+1F34E
+  ["ee9a91", :undef], # [EYES] U+E691 -> U+1F440
+  ["ee9a92", :undef], # [EAR] U+E692 -> U+1F442
+  ["ee9c90", :undef], # [LIPSTICK] U+E710 -> U+1F484
+  ["ee9ab1", :undef], # [BUST IN SILHOUETTE] U+E6B1 -> U+1F464
+  ["ee9d8e", :undef], # [SNAIL] U+E74E -> U+1F40C
+  ["ee9d8f", :undef], # [BABY CHICK] U+E74F -> U+1F424
+  ["ee9d90", :undef], # [PENGUIN] U+E750 -> U+1F427
+  ["ee9d91", :undef], # [FISH] U+E751 -> U+1F41F
+  ["ee9aa2", :undef], # [CAT FACE] U+E6A2 -> U+1F431
+  ["ee9d94", :undef], # [HORSE FACE] U+E754 -> U+1F434
+  ["ee9aa1", :undef], # [DOG FACE] U+E6A1 -> U+1F436
+  ["ee9d95", :undef], # [PIG FACE] U+E755 -> U+1F437
+  ["ee9bb1", :undef], # [ANGRY FACE] U+E6F1 -> U+1F600
+  ["ee9bb2", :undef], # [DISAPPOINTED FACE] U+E6F2 -> U+1F603
+  ["ee9bb4", :undef], # [DIZZY FACE] U+E6F4 -> U+1F604
+  ["ee9ca5", :undef], # [EXPRESSIONLESS FACE] U+E725 -> U+1F606
+  ["ee9ca6", :undef], # [FACE WITH HEART-SHAPED EYES] U+E726 -> U+1F607
+  ["ee9ca8", :undef], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E728 -> U+1F609
+  ["ee9d92", :undef], # [FACE SAVOURING DELICIOUS FOOD] U+E752 -> U+1F60B
+  ["ee9bb0", :undef], # [HAPPY FACE WITH OPEN MOUTH] U+E6F0 -> U+1F610
+  ["ee9ca2", :undef], # [HAPPY FACE WITH OPEN MOUTH AND COLD SWEAT] U+E722 -> U+1F611
+  ["ee9caa", :undef], # [HAPPY FACE WITH OPEN MOUTH AND CLOSED EYES] U+E72A -> U+1F612
+  ["ee9d93", :undef], # [HAPPY FACE WITH GRIN] U+E753 -> U+1F613
+  ["ee9cae", :undef], # [CRYING FACE] U+E72E -> U+1F617
+  ["ee9cad", :undef], # [LOUDLY CRYING FACE] U+E72D -> U+1F618
+  ["ee9cab", :undef], # [PERSEVERING FACE] U+E72B -> U+1F61A
+  ["ee9ca4", :undef], # [POUTING FACE] U+E724 -> U+1F61B
+  ["ee9ca1", :undef], # [RELIEVED FACE] U+E721 -> U+1F61C
+  ["ee9bb3", :undef], # [CONFOUNDED FACE] U+E6F3 -> U+1F61D
+  ["ee9ca0", :undef], # [PENSIVE FACE] U+E720 -> U+1F61E
+  ["ee9d97", :undef], # [FACE SCREAMING IN FEAR] U+E757 -> U+1F61F
+  ["ee9cac", :undef], # [SMIRKING FACE] U+E72C -> U+1F621
+  ["ee9ca3", :undef], # [FACE WITH COLD SWEAT] U+E723 -> U+1F622
+  ["ee9ca9", :undef], # [WINKING FACE] U+E729 -> U+1F625
+  ["ee99a3", :undef], # [HOUSE BUILDING] U+E663 -> U+1F3E0
+  ["ee99a4", :undef], # [OFFICE BUILDING] U+E664 -> U+1F3E2
+  ["ee99a5", :undef], # [JAPANESE POST OFFICE] U+E665 -> U+1F3E3
+  ["ee99a6", :undef], # [HOSPITAL] U+E666 -> U+1F3E5
+  ["ee99a7", :undef], # [BANK] U+E667 -> U+1F3E6
+  ["ee99a8", :undef], # [AUTOMATED TELLER MACHINE] U+E668 -> U+1F3E7
+  ["ee99a9", :undef], # [HOTEL] U+E669 -> U+1F3E8
+  ["ee99aa", :undef], # [CONVENIENCE STORE] U+E66A -> U+1F3EA
+  ["ee9cbe", :undef], # [SCHOOL] U+E73E -> U+1F3EB
+  ["ee9d80", :undef], # [MOUNT FUJI] U+E740 -> U+1F5FB
+  ["ee9a99", :undef], # [ATHLETIC SHOE] U+E699 -> U+1F45F
+  ["ee99b4", :undef], # [HIGH-HEELED SHOE] U+E674 -> U+1F460
+  ["ee9a98", :undef], # [FOOTPRINTS] U+E698 -> U+1F463
+  ["ee9a9a", :undef], # [EYEGLASSES] U+E69A -> U+1F453
+  ["ee9c8e", :undef], # [T-SHIRT] U+E70E -> U+1F455
+  ["ee9c91", :undef], # [JEANS] U+E711 -> U+1F456
+  ["ee9c9a", :undef], # [CROWN] U+E71A -> U+1F451
+  ["ee9c8f", :undef], # [PURSE] U+E70F -> U+1F45B
+  ["ee9a82", :undef], # [HANDBAG] U+E682 -> U+1F45C
+  ["ee9aad", :undef], # [POUCH] U+E6AD -> U+1F45D
+  ["ee9c95", :undef], # [MONEY BAG] U+E715 -> U+1F4B0
+  ["ee9b96", :undef], # [BANKNOTE WITH YEN SIGN] U+E6D6 -> U+1F4B4
+  ["ee9c98", :undef], # [WRENCH] U+E718 -> U+1F527
+  ["ee9a84", :undef], # [RIBBON] U+E684 -> U+1F380
+  ["ee9a85", :undef], # [WRAPPED PRESENT] U+E685 -> U+1F381
+  ["ee9a86", :undef], # [BIRTHDAY CAKE] U+E686 -> U+1F382
+  ["ee9aa4", :undef], # [CHRISTMAS TREE] U+E6A4 -> U+1F384
+  ["ee999a", :undef], # [PAGER] U+E65A -> U+1F4DF
+  ["ee9a87", "e2988e"], # [BLACK TELEPHONE] U+E687 -> U+260E
+  ["ee9a88", :undef], # [MOBILE PHONE] U+E688 -> U+1F4F1
+  ["ee9b8e", :undef], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+E6CE -> U+1F4F2
+  ["ee9a89", :undef], # [MEMO] U+E689 -> U+1F4DD
+  ["ee9b90", :undef], # [FAX MACHINE] U+E6D0 -> U+1F4E0
+  ["ee9b93", "e29c89"], # [ENVELOPE] U+E6D3 -> U+2709
+  ["ee9b8f", :undef], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+E6CF -> U+1F4E9
+  ["ee9aae", "e29c92"], # [BLACK NIB] U+E6AE -> U+2712
+  ["ee9ab2", :undef], # [SEAT] U+E6B2 -> U+1F4BA
+  ["ee9c96", :undef], # [PERSONAL COMPUTER] U+E716 -> U+1F4BB
+  ["ee9c99", "e29c8f"], # [PENCIL] U+E719 -> U+270F
+  ["ee9cb0", :undef], # [PAPERCLIP] U+E730 -> U+1F4CE
+  ["ee9a8c", :undef], # [OPTICAL DISC] U+E68C -> U+1F4BF
+  ["ee99b5", "e29c82"], # [BLACK SCISSORS] U+E675 -> U+2702
+  ["ee9a83", :undef], # [OPEN BOOK] U+E683 -> U+1F4D6
+  ["ee9992", :undef], # [RUNNING SHIRT WITH SASH] U+E652 -> U+1F3BD
+  ["ee9993", "e29abe"], # [BASEBALL] U+E653 -> U+26BE
+  ["ee9994", "e29bb3"], # [FLAG IN HOLE] U+E654 -> U+26F3
+  ["ee9995", :undef], # [TENNIS RACQUET AND BALL] U+E655 -> U+1F3BE
+  ["ee9996", "e29abd"], # [SOCCER BALL] U+E656 -> U+26BD
+  ["ee9997", :undef], # [SKI AND SKI BOOT] U+E657 -> U+1F3BF
+  ["ee9998", :undef], # [BASKETBALL AND HOOP] U+E658 -> U+1F3C0
+  ["ee9999", :undef], # [CHEQUERED FLAG] U+E659 -> U+1F3C1
+  ["ee9c92", :undef], # [SNOWBOARDER] U+E712 -> U+1F3C2
+  ["ee9cb3", :undef], # [RUNNER] U+E733 -> U+1F3C3
+  ["ee999b", :undef], # [TRAIN] U+E65B -> U+1F686
+  ["ee999c", "e29382"], # [CIRCLED LATIN CAPITAL LETTER M] U+E65C -> U+24C2
+  ["ee999d", :undef], # [HIGH-SPEED TRAIN] U+E65D -> U+1F684
+  ["ee999e", :undef], # [AUTOMOBILE] U+E65E -> U+1F697
+  ["ee999f", :undef], # [RECREATIONAL VEHICLE] U+E65F -> U+1F699
+  ["ee99a0", :undef], # [ONCOMING BUS] U+E660 -> U+1F68D
+  ["ee99a1", :undef], # [SHIP] U+E661 -> U+1F6A2
+  ["ee99a2", "e29c88"], # [AIRPLANE] U+E662 -> U+2708
+  ["ee9aa3", "e29bb5"], # [SAILBOAT] U+E6A3 -> U+26F5
+  ["ee99ab", "e29bbd"], # [FUEL PUMP] U+E66B -> U+26FD
+  ["ee99ac", "f09f85bf"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E66C -> U+1F17F
+  ["ee99ad", :undef], # [HORIZONTAL TRAFFIC LIGHT] U+E66D -> U+1F6A5
+  ["ee9bb7", "e299a8"], # [HOT SPRINGS] U+E6F7 -> U+2668
+  ["ee99b9", :undef], # [CAROUSEL HORSE] U+E679 -> U+1F3A0
+  ["ee99b6", :undef], # [MICROPHONE] U+E676 -> U+1F3A4
+  ["ee99b7", :undef], # [MOVIE CAMERA] U+E677 -> U+1F3A5
+  ["ee99ba", :undef], # [HEADPHONE] U+E67A -> U+1F3A7
+  ["ee99bb", :undef], # [ARTIST PALETTE] U+E67B -> U+1F3A8
+  ["ee99bc", :undef], # [TOP HAT] U+E67C -> U+1F3A9
+  ["ee99bd", :undef], # [CIRCUS TENT] U+E67D -> U+1F3AA
+  ["ee99be", :undef], # [TICKET] U+E67E -> U+1F3AB
+  ["ee9aac", :undef], # [CLAPPER BOARD] U+E6AC -> U+1F3AC
+  ["ee9a8b", :undef], # [VIDEO GAME] U+E68B -> U+1F3AE
+  ["ee9bb6", :undef], # [MUSICAL NOTE] U+E6F6 -> U+1F3B5
+  ["ee9bbf", :undef], # [MULTIPLE MUSICAL NOTES] U+E6FF -> U+1F3B6
+  ["ee9a81", :undef], # [CAMERA] U+E681 -> U+1F4F7
+  ["ee9a8a", :undef], # [TELEVISION] U+E68A -> U+1F4FA
+  ["ee9bb9", :undef], # [KISS MARK] U+E6F9 -> U+1F48B
+  ["ee9c97", :undef], # [LOVE LETTER] U+E717 -> U+1F48C
+  ["ee9c9b", :undef], # [RING] U+E71B -> U+1F48D
+  ["ee9cb1", "c2a9"], # [COPYRIGHT SIGN] U+E731 -> U+A9
+  ["ee9cb6", "c2ae"], # [REGISTERED SIGN] U+E736 -> U+AE
+  ["ee9cb2", "e284a2"], # [TRADE MARK SIGN] U+E732 -> U+2122
+  ["ee9ba0", "23e283a3"], # [HASH KEY] U+E6E0 -> U+23 U+20E3
+  ["ee9ba2", "31e283a3"], # [KEYCAP 1] U+E6E2 -> U+31 U+20E3
+  ["ee9ba3", "32e283a3"], # [KEYCAP 2] U+E6E3 -> U+32 U+20E3
+  ["ee9ba4", "33e283a3"], # [KEYCAP 3] U+E6E4 -> U+33 U+20E3
+  ["ee9ba5", "34e283a3"], # [KEYCAP 4] U+E6E5 -> U+34 U+20E3
+  ["ee9ba6", "35e283a3"], # [KEYCAP 5] U+E6E6 -> U+35 U+20E3
+  ["ee9ba7", "36e283a3"], # [KEYCAP 6] U+E6E7 -> U+36 U+20E3
+  ["ee9ba8", "37e283a3"], # [KEYCAP 7] U+E6E8 -> U+37 U+20E3
+  ["ee9ba9", "38e283a3"], # [KEYCAP 8] U+E6E9 -> U+38 U+20E3
+  ["ee9baa", "39e283a3"], # [KEYCAP 9] U+E6EA -> U+39 U+20E3
+  ["ee9bab", "30e283a3"], # [KEYCAP 0] U+E6EB -> U+30 U+20E3
+  ["ee99b3", :undef], # [HAMBURGER] U+E673 -> U+1F354
+  ["ee9d89", :undef], # [RICE BALL] U+E749 -> U+1F359
+  ["ee9d8a", :undef], # [SHORTCAKE] U+E74A -> U+1F370
+  ["ee9d8c", :undef], # [STEAMING BOWL] U+E74C -> U+1F35C
+  ["ee9d8d", :undef], # [BREAD] U+E74D -> U+1F35E
+  ["ee99af", :undef], # [FORK AND KNIFE] U+E66F -> U+1F374
+  ["ee99b0", "e29895"], # [HOT BEVERAGE] U+E670 -> U+2615
+  ["ee99b1", :undef], # [COCKTAIL GLASS] U+E671 -> U+1F378
+  ["ee99b2", :undef], # [BEER MUG] U+E672 -> U+1F37A
+  ["ee9c9e", :undef], # [TEACUP WITHOUT HANDLE] U+E71E -> U+1F375
+  ["ee9d8b", :undef], # [SAKE BOTTLE AND CUP] U+E74B -> U+1F376
+  ["ee9d96", :undef], # [WINE GLASS] U+E756 -> U+1F377
+  ["ee99b8", "e28697"], # [NORTH EAST ARROW] U+E678 -> U+2197
+  ["ee9a96", "e28698"], # [SOUTH EAST ARROW] U+E696 -> U+2198
+  ["ee9a97", "e28696"], # [NORTH WEST ARROW] U+E697 -> U+2196
+  ["ee9aa5", "e28699"], # [SOUTH WEST ARROW] U+E6A5 -> U+2199
+  ["ee9bb5", "e2a4b4"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+E6F5 -> U+2934
+  ["ee9c80", "e2a4b5"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+E700 -> U+2935
+  ["ee9cbc", "e28694"], # [LEFT RIGHT ARROW] U+E73C -> U+2194
+  ["ee9cbd", "e28695"], # [UP DOWN ARROW] U+E73D -> U+2195
+  ["ee9c82", "e29da2"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E702 -> U+2762
+  ["ee9c83", "e28189"], # [EXCLAMATION QUESTION MARK] U+E703 -> U+2049
+  ["ee9c84", "e280bc"], # [DOUBLE EXCLAMATION MARK] U+E704 -> U+203C
+  ["ee9c89", "e380b0"], # [WAVY DASH] U+E709 -> U+3030
+  ["ee9c8a", :undef], # [CURLY LOOP] U+E70A -> U+27B0
+  ["ee9b9f", :undef], # [DOUBLE CURLY LOOP] U+E6DF -> U+27BF
+  ["ee9bac", "e29da4"], # [HEAVY BLACK HEART] U+E6EC -> U+2764
+  ["ee9bad", :undef], # [BEATING HEART] U+E6ED -> U+1F493
+  ["ee9bae", :undef], # [BROKEN HEART] U+E6EE -> U+1F494
+  ["ee9baf", :undef], # [TWO HEARTS] U+E6EF -> U+1F495
+  ["ee9a8d", "e299a5"], # [BLACK HEART SUIT] U+E68D -> U+2665
+  ["ee9a8e", "e299a0"], # [BLACK SPADE SUIT] U+E68E -> U+2660
+  ["ee9a8f", "e299a6"], # [BLACK DIAMOND SUIT] U+E68F -> U+2666
+  ["ee9a90", "e299a3"], # [BLACK CLUB SUIT] U+E690 -> U+2663
+  ["ee99bf", :undef], # [SMOKING SYMBOL] U+E67F -> U+1F6AC
+  ["ee9a80", :undef], # [NO SMOKING SYMBOL] U+E680 -> U+1F6AD
+  ["ee9a9b", "e299bf"], # [WHEELCHAIR SYMBOL] U+E69B -> U+267F
+  ["ee9b9e", :undef], # [TRIANGULAR FLAG ON POST] U+E6DE -> U+1F6A9
+  ["ee9cb7", "e29aa0"], # [WARNING SIGN] U+E737 -> U+26A0
+  ["ee9cb5", "e299bb"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+E735 -> U+267B
+  ["ee9c9d", :undef], # [BICYCLE] U+E71D -> U+1F6B2
+  ["ee99ae", :undef], # [RESTROOM] U+E66E -> U+1F6BB
+  ["ee9c94", :undef], # [DOOR] U+E714 -> U+1F6AA
+  ["ee9b9b", :undef], # [SQUARED CL] U+E6DB -> U+1F191
+  ["ee9b97", :undef], # [SQUARED FREE] U+E6D7 -> U+1F193
+  ["ee9b98", :undef], # [SQUARED ID] U+E6D8 -> U+1F194
+  ["ee9b9d", :undef], # [SQUARED NEW] U+E6DD -> U+1F195
+  ["ee9caf", :undef], # [SQUARED NG] U+E72F -> U+1F196
+  ["ee9c8b", :undef], # [SQUARED OK] U+E70B -> U+1F197
+  ["ee9cb8", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7981] U+E738 -> U+1F232
+  ["ee9cb9", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+E739 -> U+1F233
+  ["ee9cba", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5408] U+E73A -> U+1F234
+  ["ee9cbb", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+E73B -> U+1F235
+  ["ee9cb4", "e38a99"], # [CIRCLED IDEOGRAPH SECRET] U+E734 -> U+3299
+  ["ee9bb8", :undef], # [DIAMOND SHAPE WITH A DOT INSIDE] U+E6F8 -> U+1F4A0
+  ["ee9bbb", :undef], # [ELECTRIC LIGHT BULB] U+E6FB -> U+1F4A1
+  ["ee9bbc", :undef], # [ANGER SYMBOL] U+E6FC -> U+1F4A2
+  ["ee9bbe", :undef], # [BOMB] U+E6FE -> U+1F4A3
+  ["ee9c81", :undef], # [SLEEPING SYMBOL] U+E701 -> U+1F4A4
+  ["ee9c85", :undef], # [COLLISION SYMBOL] U+E705 -> U+1F4A5
+  ["ee9c86", :undef], # [SPLASHING SWEAT SYMBOL] U+E706 -> U+1F4A6
+  ["ee9c87", :undef], # [DROP OF WATER] U+E707 -> U+1F4A7
+  ["ee9c88", :undef], # [DASH SYMBOL] U+E708 -> U+1F4A8
+  ["ee9bba", :undef], # [SPARKLES] U+E6FA -> U+2728
+  ["ee9b9a", "e286a9"], # [LEFTWARDS ARROW WITH HOOK] U+E6DA -> U+21A9
+  ["ee9b9c", :undef], # [LEFT-POINTING MAGNIFYING GLASS] U+E6DC -> U+1F50D
+  ["ee9b99", :undef], # [KEY] U+E6D9 -> U+1F511
+  ["ee9c93", :undef], # [BELL] U+E713 -> U+1F514
+  ["ee9ab9", :undef], # [END WITH LEFTWARDS ARROW ABOVE] U+E6B9 -> U+1F51A
+  ["ee9ab8", :undef], # [ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE] U+E6B8 -> U+1F51B
+  ["ee9ab7", :undef], # [SOON WITH RIGHTWARDS ARROW ABOVE] U+E6B7 -> U+1F51C
+  ["ee9a93", :undef], # [RAISED FIST] U+E693 -> U+270A
+  ["ee9a95", :undef], # [RAISED HAND] U+E695 -> U+270B
+  ["ee9a94", "e29c8c"], # [VICTORY HAND] U+E694 -> U+270C
+  ["ee9bbd", :undef], # [FISTED HAND SIGN] U+E6FD -> U+1F44A
+  ["ee9ca7", :undef], # [THUMBS UP SIGN] U+E727 -> U+1F44D
+  ["ee9b91", :undef], # [EMOJI COMPATIBILITY SYMBOL-1] U+E6D1 -> "[iモード]"
+  ["ee9b92", :undef], # [EMOJI COMPATIBILITY SYMBOL-2] U+E6D2 -> "[iモード]"
+  ["ee9b94", :undef], # [EMOJI COMPATIBILITY SYMBOL-3] U+E6D4 -> "[ドコモ]"
+  ["ee9b95", :undef], # [EMOJI COMPATIBILITY SYMBOL-4] U+E6D5 -> "[ドコモポイント]"
+  ["ee9c8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-5] U+E70C -> "[iアプリ]"
+  ["ee9c8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-6] U+E70D -> "[iアプリ]"
+  ["ee9aa6", :undef], # [EMOJI COMPATIBILITY SYMBOL-7] U+E6A6 -> "[ぴ]"
+  ["ee9aa7", :undef], # [EMOJI COMPATIBILITY SYMBOL-8] U+E6A7 -> "[あ]"
+  ["ee9aa8", :undef], # [EMOJI COMPATIBILITY SYMBOL-9] U+E6A8 -> "[チケット]"
+  ["ee9aa9", :undef], # [EMOJI COMPATIBILITY SYMBOL-10] U+E6A9 -> "[チケット]"
+  ["ee9aaa", :undef], # [EMOJI COMPATIBILITY SYMBOL-11] U+E6AA -> "[電話先行]"
+  ["ee9aab", :undef], # [EMOJI COMPATIBILITY SYMBOL-12] U+E6AB -> "[Pコード]"
+  ["ee9aaf", :undef], # [EMOJI COMPATIBILITY SYMBOL-13] U+E6AF -> U+3013 (GETA)
+  ["ee9ab0", :undef], # [EMOJI COMPATIBILITY SYMBOL-14] U+E6B0 -> "[ぴ]"
+  ["ee9ab4", :undef], # [EMOJI COMPATIBILITY SYMBOL-15] U+E6B4 -> "(ぴ)"
+  ["ee9ab5", :undef], # [EMOJI COMPATIBILITY SYMBOL-16] U+E6B5 -> "[ぴ]"
+  ["ee9ab6", :undef], # [EMOJI COMPATIBILITY SYMBOL-17] U+E6B6 -> "[チェック]"
+  ["ee9abb", :undef], # [EMOJI COMPATIBILITY SYMBOL-18] U+E6BB -> "[F]"
+  ["ee9abc", :undef], # [EMOJI COMPATIBILITY SYMBOL-19] U+E6BC -> "[D]"
+  ["ee9abd", :undef], # [EMOJI COMPATIBILITY SYMBOL-20] U+E6BD -> "[S]"
+  ["ee9abe", :undef], # [EMOJI COMPATIBILITY SYMBOL-21] U+E6BE -> "[C]"
+  ["ee9abf", :undef], # [EMOJI COMPATIBILITY SYMBOL-22] U+E6BF -> "[R]"
+  ["ee9b80", :undef], # [EMOJI COMPATIBILITY SYMBOL-23] U+E6C0 -> "■"
+  ["ee9b81", :undef], # [EMOJI COMPATIBILITY SYMBOL-24] U+E6C1 -> "■"
+  ["ee9b82", :undef], # [EMOJI COMPATIBILITY SYMBOL-25] U+E6C2 -> "▼"
+  ["ee9b83", :undef], # [EMOJI COMPATIBILITY SYMBOL-26] U+E6C3 -> "††††"
+  ["ee9b84", :undef], # [EMOJI COMPATIBILITY SYMBOL-27] U+E6C4 -> "†††"
+  ["ee9b85", :undef], # [EMOJI COMPATIBILITY SYMBOL-28] U+E6C5 -> "††"
+  ["ee9b86", :undef], # [EMOJI COMPATIBILITY SYMBOL-29] U+E6C6 -> "†"
+  ["ee9b87", :undef], # [EMOJI COMPATIBILITY SYMBOL-30] U+E6C7 -> "[I]"
+  ["ee9b88", :undef], # [EMOJI COMPATIBILITY SYMBOL-31] U+E6C8 -> "[M]"
+  ["ee9b89", :undef], # [EMOJI COMPATIBILITY SYMBOL-32] U+E6C9 -> "[E]"
+  ["ee9b8a", :undef], # [EMOJI COMPATIBILITY SYMBOL-33] U+E6CA -> "[VE]"
+  ["ee9b8b", :undef], # [EMOJI COMPATIBILITY SYMBOL-34] U+E6CB -> "●"
+  ["ee9b8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-35] U+E6CC -> "[カード使用不可]"
+  ["ee9b8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-36] U+E6CD -> "[チェックボックス]"
+  ["ee9ba1", :undef], # [EMOJI COMPATIBILITY SYMBOL-66] U+E6E1 -> "[Q]"
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-KDDI']['UTF8-DoCoMo'] = [
+  # for documented codepoints
+  ["ee9288", "ee98be"], # [BLACK SUN WITH RAYS] U+E488 -> U+E63E
+  ["ee928d", "ee98bf"], # [CLOUD] U+E48D -> U+E63F
+  ["ee928c", "ee9980"], # [UMBRELLA WITH RAIN DROPS] U+E48C -> U+E640
+  ["ee9285", "ee9981"], # [SNOWMAN WITHOUT SNOW] U+E485 -> U+E641
+  ["ee9287", "ee9982"], # [HIGH VOLTAGE SIGN] U+E487 -> U+E642
+  ["ee91a9", "ee9983"], # [CYCLONE] U+E469 -> U+E643
+  ["ee9698", "ee9984"], # [FOGGY] U+E598 -> U+E644
+  ["eeaba8", "ee9985"], # [CLOSED UMBRELLA] U+EAE8 -> U+E645
+  ["eeabb1", "ee9ab3"], # [NIGHT WITH STARS] U+EAF1 -> U+E6B3
+  ["eeabb4", "ee98be"], # [SUNRISE] U+EAF4 -> U+E63E
+  ["ee979a", :undef], # [CITYSCAPE AT DUSK] U+E5DA -> "[夕焼け]"
+  ["eeabb2", :undef], # [RAINBOW] U+EAF2 -> "[虹]"
+  ["ee928a", :undef], # [SNOWFLAKE] U+E48A -> "[雪結晶]"
+  ["ee928e", "ee98beee98bf"], # [SUN BEHIND CLOUD] U+E48E -> U+E63E U+E63F
+  ["ee92bf", "ee9ab3"], # [BRIDGE AT NIGHT] U+E4BF -> U+E6B3
+  ["eeadbc", "ee9cbf"], # [WATER WAVE] U+EB7C -> U+E73F
+  ["eead93", :undef], # [VOLCANO] U+EB53 -> "[火山]"
+  ["eead9f", "ee9ab3"], # [MILKY WAY] U+EB5F -> U+E6B3
+  ["ee96b3", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+E5B3 -> "[地球]"
+  ["ee96a8", "ee9a9c"], # [NEW MOON SYMBOL] U+E5A8 -> U+E69C
+  ["ee96a9", "ee9a9d"], # [WAXING GIBBOUS MOON SYMBOL] U+E5A9 -> U+E69D
+  ["ee96aa", "ee9a9e"], # [FIRST QUARTER MOON SYMBOL] U+E5AA -> U+E69E
+  ["ee9286", "ee9a9f"], # [CRESCENT MOON] U+E486 -> U+E69F
+  ["ee9289", "ee9a9e"], # [FIRST QUARTER MOON WITH FACE] U+E489 -> U+E69E
+  ["ee91a8", :undef], # [SHOOTING STAR] U+E468 -> "☆彡"
+  ["ee95ba", "ee9c9f"], # [WATCH] U+E57A -> U+E71F
+  ["ee95bb", "ee9c9c"], # [HOURGLASS] U+E57B -> U+E71C
+  ["ee9694", "ee9aba"], # [ALARM CLOCK] U+E594 -> U+E6BA
+  ["ee91bc", "ee9c9c"], # [HOURGLASS WITH FLOWING SAND] U+E47C -> U+E71C
+  ["ee928f", "ee9986"], # [ARIES] U+E48F -> U+E646
+  ["ee9290", "ee9987"], # [TAURUS] U+E490 -> U+E647
+  ["ee9291", "ee9988"], # [GEMINI] U+E491 -> U+E648
+  ["ee9292", "ee9989"], # [CANCER] U+E492 -> U+E649
+  ["ee9293", "ee998a"], # [LEO] U+E493 -> U+E64A
+  ["ee9294", "ee998b"], # [VIRGO] U+E494 -> U+E64B
+  ["ee9295", "ee998c"], # [LIBRA] U+E495 -> U+E64C
+  ["ee9296", "ee998d"], # [SCORPIUS] U+E496 -> U+E64D
+  ["ee9297", "ee998e"], # [SAGITTARIUS] U+E497 -> U+E64E
+  ["ee9298", "ee998f"], # [CAPRICORN] U+E498 -> U+E64F
+  ["ee9299", "ee9990"], # [AQUARIUS] U+E499 -> U+E650
+  ["ee929a", "ee9991"], # [PISCES] U+E49A -> U+E651
+  ["ee929b", :undef], # [OPHIUCHUS] U+E49B -> "[蛇使座]"
+  ["ee9493", "ee9d81"], # [FOUR LEAF CLOVER] U+E513 -> U+E741
+  ["ee93a4", "ee9d83"], # [TULIP] U+E4E4 -> U+E743
+  ["eeadbd", "ee9d86"], # [SEEDLING] U+EB7D -> U+E746
+  ["ee938e", "ee9d87"], # [MAPLE LEAF] U+E4CE -> U+E747
+  ["ee938a", "ee9d88"], # [CHERRY BLOSSOM] U+E4CA -> U+E748
+  ["ee96ba", :undef], # [ROSE] U+E5BA -> "[バラ]"
+  ["ee978d", "ee9d87"], # [FALLEN LEAF] U+E5CD -> U+E747
+  ["eeaa94", :undef], # [HIBISCUS] U+EA94 -> "[ハイビスカス]"
+  ["ee93a3", :undef], # [SUNFLOWER] U+E4E3 -> "[ひまわり]"
+  ["ee93a2", :undef], # [PALM TREE] U+E4E2 -> "[ヤシ]"
+  ["eeaa96", :undef], # [CACTUS] U+EA96 -> "[サボテン]"
+  ["eeacb6", :undef], # [EAR OF MAIZE] U+EB36 -> "[とうもろこし]"
+  ["eeacb7", :undef], # [MUSHROOM] U+EB37 -> "[キノコ]"
+  ["eeacb8", :undef], # [CHESTNUT] U+EB38 -> "[栗]"
+  ["eead89", :undef], # [BLOSSOM] U+EB49 -> "[花]"
+  ["eeae82", "ee9d81"], # [HERB] U+EB82 -> U+E741
+  ["ee9392", "ee9d82"], # [CHERRIES] U+E4D2 -> U+E742
+  ["eeacb5", "ee9d84"], # [BANANA] U+EB35 -> U+E744
+  ["eeaab9", "ee9d85"], # [RED APPLE] U+EAB9 -> U+E745
+  ["eeaaba", :undef], # [TANGERINE] U+EABA -> "[みかん]"
+  ["ee9394", :undef], # [STRAWBERRY] U+E4D4 -> "[イチゴ]"
+  ["ee938d", :undef], # [WATERMELON] U+E4CD -> "[スイカ]"
+  ["eeaabb", :undef], # [TOMATO] U+EABB -> "[トマト]"
+  ["eeaabc", :undef], # [AUBERGINE] U+EABC -> "[ナス]"
+  ["eeacb2", :undef], # [MELON] U+EB32 -> "[メロン]"
+  ["eeacb3", :undef], # [PINEAPPLE] U+EB33 -> "[パイナップル]"
+  ["eeacb4", :undef], # [GRAPES] U+EB34 -> "[ブドウ]"
+  ["eeacb9", :undef], # [PEACH] U+EB39 -> "[モモ]"
+  ["eead9a", "ee9d85"], # [GREEN APPLE] U+EB5A -> U+E745
+  ["ee96a4", "ee9a91"], # [EYES] U+E5A4 -> U+E691
+  ["ee96a5", "ee9a92"], # [EAR] U+E5A5 -> U+E692
+  ["eeab90", :undef], # [NOSE] U+EAD0 -> "[鼻]"
+  ["eeab91", "ee9bb9"], # [MOUTH] U+EAD1 -> U+E6F9
+  ["eead87", "ee9ca8"], # [TONGUE] U+EB47 -> U+E728
+  ["ee9489", "ee9c90"], # [LIPSTICK] U+E509 -> U+E710
+  ["eeaaa0", :undef], # [NAIL POLISH] U+EAA0 -> "[マニキュア]"
+  ["ee948b", :undef], # [FACE MASSAGE] U+E50B -> "[エステ]"
+  ["eeaaa1", "ee99b5"], # [HAIRCUT] U+EAA1 -> U+E675
+  ["eeaaa2", :undef], # [BARBER POLE] U+EAA2 -> "[床屋]"
+  ["ee93bc", "ee9bb0"], # [BOY] U+E4FC -> U+E6F0
+  ["ee93ba", "ee9bb0"], # [GIRL] U+E4FA -> U+E6F0
+  ["ee9481", :undef], # [FAMILY] U+E501 -> "[家族]"
+  ["ee979d", :undef], # [POLICE OFFICER] U+E5DD -> "[警官]"
+  ["eeab9b", :undef], # [WOMAN WITH BUNNY EARS] U+EADB -> "[バニー]"
+  ["eeaba9", :undef], # [BRIDE WITH VEIL] U+EAE9 -> "[花嫁]"
+  ["eeac93", :undef], # [WESTERN PERSON] U+EB13 -> "[白人]"
+  ["eeac94", :undef], # [MAN WITH GUA PI MAO] U+EB14 -> "[中国人]"
+  ["eeac95", :undef], # [MAN WITH TURBAN] U+EB15 -> "[インド人]"
+  ["eeac96", :undef], # [OLDER MAN] U+EB16 -> "[おじいさん]"
+  ["eeac97", :undef], # [OLDER WOMAN] U+EB17 -> "[おばあさん]"
+  ["eeac98", :undef], # [BABY] U+EB18 -> "[赤ちゃん]"
+  ["eeac99", :undef], # [CONSTRUCTION WORKER] U+EB19 -> "[工事現場の人]"
+  ["eeac9a", :undef], # [PRINCESS] U+EB1A -> "[お姫様]"
+  ["eead84", :undef], # [JAPANESE OGRE] U+EB44 -> "[なまはげ]"
+  ["eead85", :undef], # [JAPANESE GOBLIN] U+EB45 -> "[天狗]"
+  ["ee938b", :undef], # [GHOST] U+E4CB -> "[お化け]"
+  ["ee96bf", :undef], # [BABY ANGEL] U+E5BF -> "[天使]"
+  ["ee948e", :undef], # [EXTRATERRESTRIAL ALIEN] U+E50E -> "[UFO]"
+  ["ee93ac", :undef], # [ALIEN MONSTER] U+E4EC -> "[宇宙人]"
+  ["ee93af", :undef], # [IMP] U+E4EF -> "[アクマ]"
+  ["ee93b8", :undef], # [SKULL] U+E4F8 -> "[ドクロ]"
+  ["eeac9c", :undef], # [DANCER] U+EB1C -> "[ダンス]"
+  ["eeadbe", "ee9d8e"], # [SNAIL] U+EB7E -> U+E74E
+  ["eeaca2", :undef], # [SNAKE] U+EB22 -> "[ヘビ]"
+  ["eeaca3", :undef], # [CHICKEN] U+EB23 -> "[ニワトリ]"
+  ["eeaca4", :undef], # [BOAR] U+EB24 -> "[イノシシ]"
+  ["eeaca5", :undef], # [BACTRIAN CAMEL] U+EB25 -> "[ラクダ]"
+  ["eeac9f", :undef], # [ELEPHANT] U+EB1F -> "[ゾウ]"
+  ["eeaca0", :undef], # [KOALA] U+EB20 -> "[コアラ]"
+  ["ee9787", :undef], # [OCTOPUS] U+E5C7 -> "[タコ]"
+  ["eeabac", :undef], # [SPIRAL SHELL] U+EAEC -> "[巻貝]"
+  ["eeac9e", :undef], # [BUG] U+EB1E -> "[ゲジゲジ]"
+  ["ee939d", :undef], # [ANT] U+E4DD -> "[アリ]"
+  ["eead97", :undef], # [HONEYBEE] U+EB57 -> "[ミツバチ]"
+  ["eead98", :undef], # [LADY BEETLE] U+EB58 -> "[てんとう虫]"
+  ["eeac9d", "ee9d91"], # [TROPICAL FISH] U+EB1D -> U+E751
+  ["ee9393", "ee9d91"], # [BLOWFISH] U+E4D3 -> U+E751
+  ["ee9794", :undef], # [TURTLE] U+E5D4 -> "[カメ]"
+  ["ee93a0", "ee9d8f"], # [BABY CHICK] U+E4E0 -> U+E74F
+  ["eeadb6", "ee9d8f"], # [FRONT-FACING BABY CHICK] U+EB76 -> U+E74F
+  ["ee979b", "ee9d8f"], # [HATCHING CHICK] U+E5DB -> U+E74F
+  ["ee939c", "ee9d90"], # [PENGUIN] U+E4DC -> U+E750
+  ["ee939f", "ee9aa1"], # [POODLE] U+E4DF -> U+E6A1
+  ["eeac9b", :undef], # [DOLPHIN] U+EB1B -> "[イルカ]"
+  ["ee9782", :undef], # [MOUSE FACE] U+E5C2 -> "[ネズミ]"
+  ["ee9780", :undef], # [TIGER FACE] U+E5C0 -> "[トラ]"
+  ["ee939b", "ee9aa2"], # [CAT FACE] U+E4DB -> U+E6A2
+  ["ee91b0", :undef], # [SPOUTING WHALE] U+E470 -> "[クジラ]"
+  ["ee9398", "ee9d94"], # [HORSE FACE] U+E4D8 -> U+E754
+  ["ee9399", :undef], # [MONKEY FACE] U+E4D9 -> "[サル]"
+  ["ee93a1", "ee9aa1"], # [DOG FACE] U+E4E1 -> U+E6A1
+  ["ee939e", "ee9d95"], # [PIG FACE] U+E4DE -> U+E755
+  ["ee9781", :undef], # [BEAR FACE] U+E5C1 -> "[クマ]"
+  ["eeaca1", :undef], # [COW FACE] U+EB21 -> "[牛]"
+  ["ee9397", :undef], # [RABBIT FACE] U+E4D7 -> "[ウサギ]"
+  ["ee939a", :undef], # [FROG FACE] U+E4DA -> "[カエル]"
+  ["ee93ae", "ee9a98"], # [PAW PRINTS] U+E4EE -> U+E698
+  ["eeacbf", :undef], # [DRAGON FACE] U+EB3F -> "[辰]"
+  ["eead86", :undef], # [PANDA FACE] U+EB46 -> "[パンダ]"
+  ["eead88", "ee9d95"], # [PIG NOSE] U+EB48 -> U+E755
+  ["ee91b2", "ee9bb1"], # [ANGRY FACE] U+E472 -> U+E6F1
+  ["eeada7", "ee9bb3"], # [ANGUISHED FACE] U+EB67 -> U+E6F3
+  ["eeab8a", "ee9bb4"], # [ASTONISHED FACE] U+EACA -> U+E6F4
+  ["ee96ae", "ee9bb4"], # [DIZZY FACE] U+E5AE -> U+E6F4
+  ["eeab8b", "ee9ca3"], # [EXASPERATED FACE] U+EACB -> U+E723
+  ["eeab89", "ee9ca5"], # [EXPRESSIONLESS FACE] U+EAC9 -> U+E725
+  ["ee9784", "ee9ca6"], # [FACE WITH HEART-SHAPED EYES] U+E5C4 -> U+E726
+  ["eeab81", "ee9d93"], # [FACE WITH LOOK OF TRIUMPH] U+EAC1 -> U+E753
+  ["ee93a7", "ee9ca8"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E4E7 -> U+E728
+  ["eeab8f", "ee9ca6"], # [FACE THROWING A KISS] U+EACF -> U+E726
+  ["eeab8e", "ee9ca6"], # [FACE KISSING] U+EACE -> U+E726
+  ["eeab87", :undef], # [FACE WITH MASK] U+EAC7 -> "[風邪ひき]"
+  ["eeab88", "ee9caa"], # [FLUSHED FACE] U+EAC8 -> U+E72A
+  ["ee91b1", "ee9bb0"], # [HAPPY FACE WITH OPEN MOUTH] U+E471 -> U+E6F0
+  ["eeae80", "ee9d93"], # [HAPPY FACE WITH GRIN] U+EB80 -> U+E753
+  ["eeada4", "ee9caa"], # [HAPPY AND CRYING FACE] U+EB64 -> U+E72A
+  ["eeab8d", "ee9bb0"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+EACD -> U+E6F0
+  ["ee93bb", "ee9bb0"], # [WHITE SMILING FACE] U+E4FB -> U+E6F0
+  ["eeada9", "ee9cae"], # [CRYING FACE] U+EB69 -> U+E72E
+  ["ee91b3", "ee9cad"], # [LOUDLY CRYING FACE] U+E473 -> U+E72D
+  ["eeab86", "ee9d97"], # [FEARFUL FACE] U+EAC6 -> U+E757
+  ["eeab82", "ee9cab"], # [PERSEVERING FACE] U+EAC2 -> U+E72B
+  ["eead9d", "ee9ca4"], # [POUTING FACE] U+EB5D -> U+E724
+  ["eeab85", "ee9ca1"], # [RELIEVED FACE] U+EAC5 -> U+E721
+  ["eeab83", "ee9bb3"], # [CONFOUNDED FACE] U+EAC3 -> U+E6F3
+  ["eeab80", "ee9ca0"], # [PENSIVE FACE] U+EAC0 -> U+E720
+  ["ee9785", "ee9d97"], # [FACE SCREAMING IN FEAR] U+E5C5 -> U+E757
+  ["eeab84", "ee9c81"], # [SLEEPY FACE] U+EAC4 -> U+E701
+  ["eeaabf", "ee9cac"], # [SMIRKING FACE] U+EABF -> U+E72C
+  ["ee9786", "ee9ca3"], # [FACE WITH COLD SWEAT] U+E5C6 -> U+E723
+  ["ee91b4", "ee9cab"], # [TIRED FACE] U+E474 -> U+E72B
+  ["ee9783", "ee9ca9"], # [WINKING FACE] U+E5C3 -> U+E729
+  ["eeada1", "ee9bb0"], # [CAT FACE WITH OPEN MOUTH] U+EB61 -> U+E6F0
+  ["eeadbf", "ee9d93"], # [HAPPY CAT FACE WITH GRIN] U+EB7F -> U+E753
+  ["eeada3", "ee9caa"], # [HAPPY AND CRYING CAT FACE] U+EB63 -> U+E72A
+  ["eeada0", "ee9ca6"], # [CAT FACE KISSING] U+EB60 -> U+E726
+  ["eeada5", "ee9ca6"], # [CAT FACE WITH HEART-SHAPED EYES] U+EB65 -> U+E726
+  ["eeada8", "ee9cae"], # [CRYING CAT FACE] U+EB68 -> U+E72E
+  ["eead9e", "ee9ca4"], # [POUTING CAT FACE] U+EB5E -> U+E724
+  ["eeadaa", "ee9d93"], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+EB6A -> U+E753
+  ["eeada6", "ee9bb3"], # [ANGUISHED CAT FACE] U+EB66 -> U+E6F3
+  ["eeab97", "ee9caf"], # [FACE WITH NO GOOD GESTURE] U+EAD7 -> U+E72F
+  ["eeab98", "ee9c8b"], # [FACE WITH OK GESTURE] U+EAD8 -> U+E70B
+  ["eeab99", :undef], # [PERSON BOWING DEEPLY] U+EAD9 -> "m(_ _)m"
+  ["eead90", :undef], # [SEE-NO-EVIL MONKEY] U+EB50 -> "(/_＼)"
+  ["eead91", :undef], # [SPEAK-NO-EVIL MONKEY] U+EB51 -> "(・×・)"
+  ["eead92", :undef], # [HEAR-NO-EVIL MONKEY] U+EB52 -> "|(・×・)|"
+  ["eeae85", :undef], # [PERSON RAISING ONE HAND] U+EB85 -> "(^-^)/"
+  ["eeae86", :undef], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+EB86 -> "＼(^o^)／"
+  ["eeae87", "ee9bb3"], # [PERSON FROWNING] U+EB87 -> U+E6F3
+  ["eeae88", "ee9bb1"], # [PERSON WITH POUTING FACE] U+EB88 -> U+E6F1
+  ["eeab92", :undef], # [PERSON WITH FOLDED HANDS] U+EAD2 -> "(&gt;人&lt;)"
+  ["ee92ab", "ee99a3"], # [HOUSE BUILDING] U+E4AB -> U+E663
+  ["eeac89", "ee99a3"], # [HOUSE WITH GARDEN] U+EB09 -> U+E663
+  ["ee92ad", "ee99a4"], # [OFFICE BUILDING] U+E4AD -> U+E664
+  ["ee979e", "ee99a5"], # [JAPANESE POST OFFICE] U+E5DE -> U+E665
+  ["ee979f", "ee99a6"], # [HOSPITAL] U+E5DF -> U+E666
+  ["ee92aa", "ee99a7"], # [BANK] U+E4AA -> U+E667
+  ["ee92a3", "ee99a8"], # [AUTOMATED TELLER MACHINE] U+E4A3 -> U+E668
+  ["eeaa81", "ee99a9"], # [HOTEL] U+EA81 -> U+E669
+  ["eeabb3", "ee99a9ee9baf"], # [LOVE HOTEL] U+EAF3 -> U+E669 U+E6EF
+  ["ee92a4", "ee99aa"], # [CONVENIENCE STORE] U+E4A4 -> U+E66A
+  ["eeaa80", "ee9cbe"], # [SCHOOL] U+EA80 -> U+E73E
+  ["ee96bb", :undef], # [CHURCH] U+E5BB -> "[教会]"
+  ["ee978f", :undef], # [FOUNTAIN] U+E5CF -> "[噴水]"
+  ["eeabb6", :undef], # [DEPARTMENT STORE] U+EAF6 -> "[デパート]"
+  ["eeabb7", :undef], # [JAPANESE CASTLE] U+EAF7 -> "[城]"
+  ["eeabb8", :undef], # [EUROPEAN CASTLE] U+EAF8 -> "[城]"
+  ["eeabb9", :undef], # [FACTORY] U+EAF9 -> "[工場]"
+  ["ee92a9", "ee99a1"], # [ANCHOR] U+E4A9 -> U+E661
+  ["ee92bd", "ee9d8b"], # [IZAKAYA LANTERN] U+E4BD -> U+E74B
+  ["ee96bd", "ee9d80"], # [MOUNT FUJI] U+E5BD -> U+E740
+  ["ee9380", :undef], # [TOKYO TOWER] U+E4C0 -> "[東京タワー]"
+  ["ee95b2", :undef], # [SILHOUETTE OF JAPAN] U+E572 -> "[日本地図]"
+  ["eeadac", :undef], # [MOYAI] U+EB6C -> "[モアイ]"
+  ["ee96b7", "ee9a99"], # [MANS SHOE] U+E5B7 -> U+E699
+  ["eeacab", "ee9a99"], # [ATHLETIC SHOE] U+EB2B -> U+E699
+  ["ee949a", "ee99b4"], # [HIGH-HEELED SHOE] U+E51A -> U+E674
+  ["eeaa9f", :undef], # [WOMANS BOOTS] U+EA9F -> "[ブーツ]"
+  ["eeacaa", "ee9a98"], # [FOOTPRINTS] U+EB2A -> U+E698
+  ["ee93be", "ee9a9a"], # [EYEGLASSES] U+E4FE -> U+E69A
+  ["ee96b6", "ee9c8e"], # [T-SHIRT] U+E5B6 -> U+E70E
+  ["eeadb7", "ee9c91"], # [JEANS] U+EB77 -> U+E711
+  ["ee9789", "ee9c9a"], # [CROWN] U+E5C9 -> U+E71A
+  ["eeaa93", :undef], # [NECKTIE] U+EA93 -> "[ネクタイ]"
+  ["eeaa9e", :undef], # [WOMANS HAT] U+EA9E -> "[帽子]"
+  ["eeadab", :undef], # [DRESS] U+EB6B -> "[ドレス]"
+  ["eeaaa3", :undef], # [KIMONO] U+EAA3 -> "[着物]"
+  ["eeaaa4", :undef], # [BIKINI] U+EAA4 -> "[ビキニ]"
+  ["ee948d", "ee9c8e"], # [WOMANS CLOTHES] U+E50D -> U+E70E
+  ["ee9484", "ee9c8f"], # [PURSE] U+E504 -> U+E70F
+  ["ee929c", "ee9a82"], # [HANDBAG] U+E49C -> U+E682
+  ["ee9387", "ee9c95"], # [MONEY BAG] U+E4C7 -> U+E715
+  ["ee979c", :undef], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E5DC -> "[株価]"
+  ["ee95b9", "ee9c95"], # [HEAVY DOLLAR SIGN] U+E579 -> U+E715
+  ["ee95bc", :undef], # [CREDIT CARD] U+E57C -> "[カード]"
+  ["ee95bd", "ee9b96"], # [BANKNOTE WITH YEN SIGN] U+E57D -> U+E6D6
+  ["ee9685", "ee9c95"], # [BANKNOTE WITH DOLLAR SIGN] U+E585 -> U+E715
+  ["eead9b", :undef], # [MONEY WITH WINGS] U+EB5B -> "[飛んでいくお金]"
+  ["eeac91", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+EB11 -> "[中国]"
+  ["eeac8e", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+EB0E -> "[ドイツ]"
+  ["ee9795", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E5D5 -> "[スペイン]"
+  ["eeabba", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+EAFA -> "[フランス]"
+  ["eeac90", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+EB10 -> "[イギリス]"
+  ["eeac8f", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+EB0F -> "[イタリア]"
+  ["ee938c", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E4CC -> "[日の丸]"
+  ["eeac92", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+EB12 -> "[韓国]"
+  ["ee9796", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E5D6 -> "[ロシア]"
+  ["ee95b3", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E573 -> "[USA]"
+  ["ee91bb", :undef], # [FIRE] U+E47B -> "[炎]"
+  ["ee9683", "ee9bbb"], # [ELECTRIC TORCH] U+E583 -> U+E6FB
+  ["ee9687", "ee9c98"], # [WRENCH] U+E587 -> U+E718
+  ["ee978b", :undef], # [HAMMER] U+E5CB -> "[ハンマー]"
+  ["ee9681", :undef], # [NUT AND BOLT] U+E581 -> "[ネジ]"
+  ["ee95bf", :undef], # [HOCHO] U+E57F -> "[包丁]"
+  ["ee948a", :undef], # [PISTOL] U+E50A -> "[ピストル]"
+  ["eeaa8f", :undef], # [CRYSTAL BALL] U+EA8F -> "[占い]"
+  ["ee9280", :undef], # [JAPANESE SYMBOL FOR BEGINNER] U+E480 -> "[若葉マーク]"
+  ["ee9490", :undef], # [SYRINGE] U+E510 -> "[注射]"
+  ["eeaa9a", :undef], # [PILL] U+EA9A -> "[薬]"
+  ["eeaca6", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+EB26 -> "[A]"
+  ["eeaca7", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+EB27 -> "[B]"
+  ["eeaca9", :undef], # [NEGATIVE SQUARED AB] U+EB29 -> "[AB]"
+  ["eeaca8", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+EB28 -> "[O]"
+  ["ee969f", "ee9a84"], # [RIBBON] U+E59F -> U+E684
+  ["ee938f", "ee9a85"], # [WRAPPED PRESENT] U+E4CF -> U+E685
+  ["ee96a0", "ee9a86"], # [BIRTHDAY CAKE] U+E5A0 -> U+E686
+  ["ee9389", "ee9aa4"], # [CHRISTMAS TREE] U+E4C9 -> U+E6A4
+  ["eeabb0", :undef], # [FATHER CHRISTMAS] U+EAF0 -> "[サンタ]"
+  ["ee9799", :undef], # [CROSSED FLAGS] U+E5D9 -> "[祝日]"
+  ["ee978c", :undef], # [FIREWORKS] U+E5CC -> "[花火]"
+  ["eeaa9b", :undef], # [BALLOON] U+EA9B -> "[風船]"
+  ["eeaa9c", :undef], # [PARTY POPPER] U+EA9C -> "[クラッカー]"
+  ["eeaba3", :undef], # [PINE DECORATION] U+EAE3 -> "[門松]"
+  ["eeaba4", :undef], # [JAPANESE DOLLS] U+EAE4 -> "[ひな祭り]"
+  ["eeaba5", :undef], # [GRADUATION CAP] U+EAE5 -> "[卒業式]"
+  ["eeaba6", :undef], # [SCHOOL SATCHEL] U+EAE6 -> "[ランドセル]"
+  ["eeaba7", :undef], # [CARP STREAMER] U+EAE7 -> "[こいのぼり]"
+  ["eeabab", :undef], # [FIREWORK SPARKLER] U+EAEB -> "[線香花火]"
+  ["eeabad", :undef], # [WIND CHIME] U+EAED -> "[風鈴]"
+  ["eeabae", :undef], # [JACK-O-LANTERN] U+EAEE -> "[ハロウィン]"
+  ["ee91af", :undef], # [CONFETTI BALL] U+E46F -> "[オメデトウ]"
+  ["eeacbd", :undef], # [TANABATA TREE] U+EB3D -> "[七夕]"
+  ["eeabaf", :undef], # [MOON VIEWING CEREMONY] U+EAEF -> "[お月見]"
+  ["ee969b", "ee999a"], # [PAGER] U+E59B -> U+E65A
+  ["ee9696", "ee9a87"], # [BLACK TELEPHONE] U+E596 -> U+E687
+  ["ee949e", "ee9a87"], # [TELEPHONE RECEIVER] U+E51E -> U+E687
+  ["ee9688", "ee9a88"], # [MOBILE PHONE] U+E588 -> U+E688
+  ["eeac88", "ee9b8e"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+EB08 -> U+E6CE
+  ["eeaa92", "ee9a89"], # [MEMO] U+EA92 -> U+E689
+  ["ee94a0", "ee9b90"], # [FAX MACHINE] U+E520 -> U+E6D0
+  ["ee94a1", "ee9b93"], # [ENVELOPE] U+E521 -> U+E6D3
+  ["ee9691", "ee9b8f"], # [INCOMING ENVELOPE] U+E591 -> U+E6CF
+  ["eeada2", "ee9b8f"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+EB62 -> U+E6CF
+  ["ee949b", "ee99a5"], # [CLOSED MAILBOX WITH LOWERED FLAG] U+E51B -> U+E665
+  ["eeac8a", "ee99a5"], # [CLOSED MAILBOX WITH RAISED FLAG] U+EB0A -> U+E665
+  ["ee968b", :undef], # [NEWSPAPER] U+E58B -> "[新聞]"
+  ["ee92a8", :undef], # [SATELLITE ANTENNA] U+E4A8 -> "[アンテナ]"
+  ["ee9692", :undef], # [OUTBOX TRAY] U+E592 -> "[送信BOX]"
+  ["ee9693", :undef], # [INBOX TRAY] U+E593 -> "[受信BOX]"
+  ["ee949f", "ee9a85"], # [PACKAGE] U+E51F -> U+E685
+  ["eeadb1", "ee9b93"], # [E-MAIL SYMBOL] U+EB71 -> U+E6D3
+  ["eeabbd", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+EAFD -> "[ABCD]"
+  ["eeabbe", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+EAFE -> "[abcd]"
+  ["eeabbf", :undef], # [INPUT SYMBOL FOR NUMBERS] U+EAFF -> "[1234]"
+  ["eeac80", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+EB00 -> "[記号]"
+  ["eead95", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+EB55 -> "[ABC]"
+  ["eeac83", "ee9aae"], # [BLACK NIB] U+EB03 -> U+E6AE
+  ["ee96b8", "ee9c96"], # [PERSONAL COMPUTER] U+E5B8 -> U+E716
+  ["ee92a1", "ee9c99"], # [PENCIL] U+E4A1 -> U+E719
+  ["ee92a0", "ee9cb0"], # [PAPERCLIP] U+E4A0 -> U+E730
+  ["ee978e", "ee9a82"], # [BRIEFCASE] U+E5CE -> U+E682
+  ["ee9682", :undef], # [MINIDISC] U+E582 -> "[MD]"
+  ["ee95a2", :undef], # [FLOPPY DISK] U+E562 -> "[フロッピー]"
+  ["ee948c", "ee9a8c"], # [OPTICAL DISC] U+E50C -> U+E68C
+  ["ee9496", "ee99b5"], # [BLACK SCISSORS] U+E516 -> U+E675
+  ["ee95a0", :undef], # [ROUND PUSHPIN] U+E560 -> "[画びょう]"
+  ["ee95a1", "ee9a89"], # [PAGE WITH CURL] U+E561 -> U+E689
+  ["ee95a9", "ee9a89"], # [PAGE FACING UP] U+E569 -> U+E689
+  ["ee95a3", :undef], # [CALENDAR] U+E563 -> "[カレンダー]"
+  ["ee968f", :undef], # [FILE FOLDER] U+E58F -> "[フォルダ]"
+  ["ee9690", :undef], # [OPEN FILE FOLDER] U+E590 -> "[フォルダ]"
+  ["ee95ab", "ee9a83"], # [NOTEBOOK] U+E56B -> U+E683
+  ["ee929f", "ee9a83"], # [OPEN BOOK] U+E49F -> U+E683
+  ["ee929d", "ee9a83"], # [NOTEBOOK WITH DECORATIVE COVER] U+E49D -> U+E683
+  ["ee95a8", "ee9a83"], # [CLOSED BOOK] U+E568 -> U+E683
+  ["ee95a5", "ee9a83"], # [GREEN BOOK] U+E565 -> U+E683
+  ["ee95a6", "ee9a83"], # [BLUE BOOK] U+E566 -> U+E683
+  ["ee95a7", "ee9a83"], # [ORANGE BOOK] U+E567 -> U+E683
+  ["ee95af", "ee9a83"], # [BOOKS] U+E56F -> U+E683
+  ["ee949d", :undef], # [NAME BADGE] U+E51D -> "[名札]"
+  ["ee959f", "ee9c8a"], # [SCROLL] U+E55F -> U+E70A
+  ["ee95a4", "ee9a89"], # [CLIPBOARD] U+E564 -> U+E689
+  ["ee95aa", :undef], # [TEAR-OFF CALENDAR] U+E56A -> "[カレンダー]"
+  ["ee95b4", :undef], # [BAR CHART] U+E574 -> "[グラフ]"
+  ["ee95b5", :undef], # [CHART WITH UPWARDS TREND] U+E575 -> "[グラフ]"
+  ["ee95b6", :undef], # [CHART WITH DOWNWARDS TREND] U+E576 -> "[グラフ]"
+  ["ee95ac", "ee9a83"], # [CARD INDEX] U+E56C -> U+E683
+  ["ee95ad", :undef], # [PUSHPIN] U+E56D -> "[画びょう]"
+  ["ee95ae", "ee9a83"], # [LEDGER] U+E56E -> U+E683
+  ["ee95b0", :undef], # [STRAIGHT RULER] U+E570 -> "[定規]"
+  ["ee92a2", :undef], # [TRIANGULAR RULER] U+E4A2 -> "[三角定規]"
+  ["eeac8b", "ee9a89"], # [BOOKMARK TABS] U+EB0B -> U+E689
+  ["ee92ba", "ee9993"], # [BASEBALL] U+E4BA -> U+E653
+  ["ee9699", "ee9994"], # [FLAG IN HOLE] U+E599 -> U+E654
+  ["ee92b7", "ee9995"], # [TENNIS RACQUET AND BALL] U+E4B7 -> U+E655
+  ["ee92b6", "ee9996"], # [SOCCER BALL] U+E4B6 -> U+E656
+  ["eeaaac", "ee9997"], # [SKI AND SKI BOOT] U+EAAC -> U+E657
+  ["ee969a", "ee9998"], # [BASKETBALL AND HOOP] U+E59A -> U+E658
+  ["ee92b9", "ee9999"], # [CHEQUERED FLAG] U+E4B9 -> U+E659
+  ["ee92b8", "ee9c92"], # [SNOWBOARDER] U+E4B8 -> U+E712
+  ["ee91ab", "ee9cb3"], # [RUNNER] U+E46B -> U+E733
+  ["eead81", "ee9c92"], # [SURFER] U+EB41 -> U+E712
+  ["ee9793", :undef], # [TROPHY] U+E5D3 -> "[トロフィー]"
+  ["ee92bb", :undef], # [AMERICAN FOOTBALL] U+E4BB -> "[フットボール]"
+  ["eeab9e", :undef], # [SWIMMER] U+EADE -> "[水泳]"
+  ["ee92b5", "ee999b"], # [TRAIN] U+E4B5 -> U+E65B
+  ["ee96bc", "ee999c"], # [METRO] U+E5BC -> U+E65C
+  ["ee92b0", "ee999d"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E4B0 -> U+E65D
+  ["ee92b1", "ee999e"], # [AUTOMOBILE] U+E4B1 -> U+E65E
+  ["ee92af", "ee99a0"], # [ONCOMING BUS] U+E4AF -> U+E660
+  ["ee92a7", :undef], # [BUS STOP] U+E4A7 -> "[バス停]"
+  ["eeaa82", "ee99a1"], # [SHIP] U+EA82 -> U+E661
+  ["ee92b3", "ee99a2"], # [AIRPLANE] U+E4B3 -> U+E662
+  ["ee92b4", "ee9aa3"], # [SAILBOAT] U+E4B4 -> U+E6A3
+  ["eeadad", :undef], # [STATION] U+EB6D -> "[駅]"
+  ["ee9788", :undef], # [ROCKET] U+E5C8 -> "[ロケット]"
+  ["ee92b2", :undef], # [DELIVERY TRUCK] U+E4B2 -> "[トラック]"
+  ["eeab9f", :undef], # [FIRE ENGINE] U+EADF -> "[消防車]"
+  ["eeaba0", :undef], # [AMBULANCE] U+EAE0 -> "[救急車]"
+  ["eeaba1", :undef], # [POLICE CAR] U+EAE1 -> "[パトカー]"
+  ["ee95b1", "ee99ab"], # [FUEL PUMP] U+E571 -> U+E66B
+  ["ee92a6", "ee99ac"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E4A6 -> U+E66C
+  ["ee91aa", "ee99ad"], # [HORIZONTAL TRAFFIC LIGHT] U+E46A -> U+E66D
+  ["ee9797", :undef], # [CONSTRUCTION SIGN] U+E5D7 -> "[工事中]"
+  ["eeadb3", :undef], # [POLICE CARS REVOLVING LIGHT] U+EB73 -> "[パトカー]"
+  ["ee92bc", "ee9bb7"], # [HOT SPRINGS] U+E4BC -> U+E6F7
+  ["ee9790", :undef], # [TENT] U+E5D0 -> "[キャンプ]"
+  ["ee91ad", :undef], # [FERRIS WHEEL] U+E46D -> "[観覧車]"
+  ["eeaba2", :undef], # [ROLLER COASTER] U+EAE2 -> "[ジェットコースター]"
+  ["eead82", "ee9d91"], # [FISHING POLE AND FISH] U+EB42 -> U+E751
+  ["ee9483", "ee99b6"], # [MICROPHONE] U+E503 -> U+E676
+  ["ee9497", "ee99b7"], # [MOVIE CAMERA] U+E517 -> U+E677
+  ["ee9488", "ee99ba"], # [HEADPHONE] U+E508 -> U+E67A
+  ["ee969c", "ee99bb"], # [ARTIST PALETTE] U+E59C -> U+E67B
+  ["eeabb5", "ee99bc"], # [TOP HAT] U+EAF5 -> U+E67C
+  ["ee969e", "ee99bd"], # [CIRCUS TENT] U+E59E -> U+E67D
+  ["ee929e", "ee99be"], # [TICKET] U+E49E -> U+E67E
+  ["ee92be", "ee9aac"], # [CLAPPER BOARD] U+E4BE -> U+E6AC
+  ["ee969d", :undef], # [PERFORMING ARTS] U+E59D -> "[演劇]"
+  ["ee9386", "ee9a8b"], # [VIDEO GAME] U+E4C6 -> U+E68B
+  ["ee9791", :undef], # [MAHJONG TILE RED DRAGON] U+E5D1 -> "[麻雀]"
+  ["ee9385", :undef], # [DIRECT HIT] U+E4C5 -> "[的中]"
+  ["ee91ae", :undef], # [SLOT MACHINE] U+E46E -> "[777]"
+  ["eeab9d", :undef], # [BILLIARDS] U+EADD -> "[ビリヤード]"
+  ["ee9388", :undef], # [GAME DIE] U+E4C8 -> "[サイコロ]"
+  ["eead83", :undef], # [BOWLING] U+EB43 -> "[ボーリング]"
+  ["eeadae", :undef], # [FLOWER PLAYING CARDS] U+EB6E -> "[花札]"
+  ["eeadaf", :undef], # [PLAYING CARD BLACK JOKER] U+EB6F -> "[ジョーカー]"
+  ["ee96be", "ee9bb6"], # [MUSICAL NOTE] U+E5BE -> U+E6F6
+  ["ee9485", "ee9bbf"], # [MULTIPLE MUSICAL NOTES] U+E505 -> U+E6FF
+  ["ee9486", :undef], # [GUITAR] U+E506 -> "[ギター]"
+  ["eead80", :undef], # [MUSICAL KEYBOARD] U+EB40 -> "[ピアノ]"
+  ["eeab9c", :undef], # [TRUMPET] U+EADC -> "[トランペット]"
+  ["ee9487", :undef], # [VIOLIN] U+E507 -> "[バイオリン]"
+  ["eeab8c", "ee9bbf"], # [MUSICAL SCORE] U+EACC -> U+E6FF
+  ["ee9495", "ee9a81"], # [CAMERA] U+E515 -> U+E681
+  ["ee95be", "ee99b7"], # [VIDEO CAMERA] U+E57E -> U+E677
+  ["ee9482", "ee9a8a"], # [TELEVISION] U+E502 -> U+E68A
+  ["ee96b9", :undef], # [RADIO] U+E5B9 -> "[ラジオ]"
+  ["ee9680", :undef], # [VIDEOCASSETTE] U+E580 -> "[ビデオ]"
+  ["ee93ab", "ee9bb9"], # [KISS MARK] U+E4EB -> U+E6F9
+  ["eeadb8", "ee9c97"], # [LOVE LETTER] U+EB78 -> U+E717
+  ["ee9494", "ee9c9b"], # [RING] U+E514 -> U+E71B
+  ["ee978a", "ee9bb9"], # [KISS] U+E5CA -> U+E6F9
+  ["eeaa95", :undef], # [BOUQUET] U+EA95 -> "[花束]"
+  ["eeab9a", "ee9bad"], # [COUPLE WITH HEART] U+EADA -> U+E6ED
+  ["eeaa83", :undef], # [NO ONE UNDER EIGHTEEN SYMBOL] U+EA83 -> "[18禁]"
+  ["ee9598", "ee9cb1"], # [COPYRIGHT SIGN] U+E558 -> U+E731
+  ["ee9599", "ee9cb6"], # [REGISTERED SIGN] U+E559 -> U+E736
+  ["ee958e", "ee9cb2"], # [TRADE MARK SIGN] U+E54E -> U+E732
+  ["ee94b3", :undef], # [INFORMATION SOURCE] U+E533 -> "[ｉ]"
+  ["eeae84", "ee9ba0"], # [HASH KEY] U+EB84 -> U+E6E0
+  ["ee94a2", "ee9ba2"], # [KEYCAP 1] U+E522 -> U+E6E2
+  ["ee94a3", "ee9ba3"], # [KEYCAP 2] U+E523 -> U+E6E3
+  ["ee94a4", "ee9ba4"], # [KEYCAP 3] U+E524 -> U+E6E4
+  ["ee94a5", "ee9ba5"], # [KEYCAP 4] U+E525 -> U+E6E5
+  ["ee94a6", "ee9ba6"], # [KEYCAP 5] U+E526 -> U+E6E6
+  ["ee94a7", "ee9ba7"], # [KEYCAP 6] U+E527 -> U+E6E7
+  ["ee94a8", "ee9ba8"], # [KEYCAP 7] U+E528 -> U+E6E8
+  ["ee94a9", "ee9ba9"], # [KEYCAP 8] U+E529 -> U+E6E9
+  ["ee94aa", "ee9baa"], # [KEYCAP 9] U+E52A -> U+E6EA
+  ["ee96ac", "ee9bab"], # [KEYCAP 0] U+E5AC -> U+E6EB
+  ["ee94ab", :undef], # [KEYCAP TEN] U+E52B -> "[10]"
+  ["eeaa84", :undef], # [ANTENNA WITH BARS] U+EA84 -> "[バリ3]"
+  ["eeaa90", :undef], # [VIBRATION MODE] U+EA90 -> "[マナーモード]"
+  ["eeaa91", :undef], # [MOBILE PHONE OFF] U+EA91 -> "[ケータイOFF]"
+  ["ee9396", "ee99b3"], # [HAMBURGER] U+E4D6 -> U+E673
+  ["ee9395", "ee9d89"], # [RICE BALL] U+E4D5 -> U+E749
+  ["ee9390", "ee9d8a"], # [SHORTCAKE] U+E4D0 -> U+E74A
+  ["ee96b4", "ee9d8c"], # [STEAMING BOWL] U+E5B4 -> U+E74C
+  ["eeaaaf", "ee9d8d"], # [BREAD] U+EAAF -> U+E74D
+  ["ee9391", :undef], # [COOKING] U+E4D1 -> "[フライパン]"
+  ["eeaab0", :undef], # [SOFT ICE CREAM] U+EAB0 -> "[ソフトクリーム]"
+  ["eeaab1", :undef], # [FRENCH FRIES] U+EAB1 -> "[ポテト]"
+  ["eeaab2", :undef], # [DANGO] U+EAB2 -> "[だんご]"
+  ["eeaab3", :undef], # [RICE CRACKER] U+EAB3 -> "[せんべい]"
+  ["eeaab4", "ee9d8c"], # [COOKED RICE] U+EAB4 -> U+E74C
+  ["eeaab5", :undef], # [SPAGHETTI] U+EAB5 -> "[パスタ]"
+  ["eeaab6", :undef], # [CURRY AND RICE] U+EAB6 -> "[カレー]"
+  ["eeaab7", :undef], # [ODEN] U+EAB7 -> "[おでん]"
+  ["eeaab8", :undef], # [SUSHI] U+EAB8 -> "[すし]"
+  ["eeaabd", :undef], # [BENTO BOX] U+EABD -> "[弁当]"
+  ["eeaabe", :undef], # [POT OF FOOD] U+EABE -> "[鍋]"
+  ["eeabaa", :undef], # [SHAVED ICE] U+EAEA -> "[カキ氷]"
+  ["ee9384", :undef], # [MEAT ON BONE] U+E4C4 -> "[肉]"
+  ["ee93ad", "ee9983"], # [FISH CAKE WITH SWIRL DESIGN] U+E4ED -> U+E643
+  ["eeacba", :undef], # [ROASTED SWEET POTATO] U+EB3A -> "[やきいも]"
+  ["eeacbb", :undef], # [SLICE OF PIZZA] U+EB3B -> "[ピザ]"
+  ["eeacbc", :undef], # [POULTRY LEG] U+EB3C -> "[チキン]"
+  ["eead8a", :undef], # [ICE CREAM] U+EB4A -> "[アイスクリーム]"
+  ["eead8b", :undef], # [DOUGHNUT] U+EB4B -> "[ドーナツ]"
+  ["eead8c", :undef], # [COOKIE] U+EB4C -> "[クッキー]"
+  ["eead8d", :undef], # [CHOCOLATE BAR] U+EB4D -> "[チョコ]"
+  ["eead8e", :undef], # [CANDY] U+EB4E -> "[キャンディ]"
+  ["eead8f", :undef], # [LOLLIPOP] U+EB4F -> "[キャンディ]"
+  ["eead96", :undef], # [CUSTARD] U+EB56 -> "[プリン]"
+  ["eead99", :undef], # [HONEY POT] U+EB59 -> "[ハチミツ]"
+  ["eeadb0", :undef], # [FRIED SHRIMP] U+EB70 -> "[エビフライ]"
+  ["ee92ac", "ee99af"], # [FORK AND KNIFE] U+E4AC -> U+E66F
+  ["ee9697", "ee99b0"], # [HOT BEVERAGE] U+E597 -> U+E670
+  ["ee9382", "ee99b1"], # [COCKTAIL GLASS] U+E4C2 -> U+E671
+  ["ee9383", "ee99b2"], # [BEER MUG] U+E4C3 -> U+E672
+  ["eeaaae", "ee9c9e"], # [TEACUP WITHOUT HANDLE] U+EAAE -> U+E71E
+  ["eeaa97", "ee9d8b"], # [SAKE BOTTLE AND CUP] U+EA97 -> U+E74B
+  ["ee9381", "ee9d96"], # [WINE GLASS] U+E4C1 -> U+E756
+  ["eeaa98", "ee99b2"], # [CLINKING BEER MUGS] U+EA98 -> U+E672
+  ["eeacbe", "ee99b1"], # [TROPICAL DRINK] U+EB3E -> U+E671
+  ["ee9595", "ee99b8"], # [NORTH EAST ARROW] U+E555 -> U+E678
+  ["ee958d", "ee9a96"], # [SOUTH EAST ARROW] U+E54D -> U+E696
+  ["ee958c", "ee9a97"], # [NORTH WEST ARROW] U+E54C -> U+E697
+  ["ee9596", "ee9aa5"], # [SOUTH WEST ARROW] U+E556 -> U+E6A5
+  ["eeacad", "ee9bb5"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+EB2D -> U+E6F5
+  ["eeacae", "ee9c80"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+EB2E -> U+E700
+  ["eeadba", "ee9cbc"], # [LEFT RIGHT ARROW] U+EB7A -> U+E73C
+  ["eeadbb", "ee9cbd"], # [UP DOWN ARROW] U+EB7B -> U+E73D
+  ["ee94bf", :undef], # [UPWARDS BLACK ARROW] U+E53F -> "[↑]"
+  ["ee9580", :undef], # [DOWNWARDS BLACK ARROW] U+E540 -> "[↓]"
+  ["ee9592", :undef], # [BLACK RIGHTWARDS ARROW] U+E552 -> "[→]"
+  ["ee9593", :undef], # [LEFTWARDS BLACK ARROW] U+E553 -> "[←]"
+  ["ee94ae", :undef], # [BLACK RIGHT-POINTING TRIANGLE] U+E52E -> "[&gt;]"
+  ["ee94ad", :undef], # [BLACK LEFT-POINTING TRIANGLE] U+E52D -> "[&lt;]"
+  ["ee94b0", :undef], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E530 -> "[&gt;&gt;]"
+  ["ee94af", :undef], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E52F -> "[&lt;&lt;]"
+  ["ee9585", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+E545 -> "▲"
+  ["ee9584", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+E544 -> "▼"
+  ["ee959a", :undef], # [UP-POINTING RED TRIANGLE] U+E55A -> "▲"
+  ["ee959b", :undef], # [DOWN-POINTING RED TRIANGLE] U+E55B -> "▼"
+  ["ee9583", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+E543 -> "▲"
+  ["ee9582", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+E542 -> "▼"
+  ["eeaaad", "ee9aa0"], # [HEAVY LARGE CIRCLE] U+EAAD -> U+E6A0
+  ["ee9590", :undef], # [CROSS MARK] U+E550 -> "[×]"
+  ["ee9591", :undef], # [NEGATIVE SQUARED CROSS MARK] U+E551 -> "[×]"
+  ["ee9282", "ee9c82"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E482 -> U+E702
+  ["eeacaf", "ee9c83"], # [EXCLAMATION QUESTION MARK] U+EB2F -> U+E703
+  ["eeacb0", "ee9c84"], # [DOUBLE EXCLAMATION MARK] U+EB30 -> U+E704
+  ["ee9283", :undef], # [BLACK QUESTION MARK ORNAMENT] U+E483 -> "[？]"
+  ["eeacb1", "ee9c8a"], # [CURLY LOOP] U+EB31 -> U+E70A
+  ["ee9695", "ee9bac"], # [HEAVY BLACK HEART] U+E595 -> U+E6EC
+  ["eeadb5", "ee9bad"], # [BEATING HEART] U+EB75 -> U+E6ED
+  ["ee91b7", "ee9bae"], # [BROKEN HEART] U+E477 -> U+E6EE
+  ["ee91b8", "ee9baf"], # [TWO HEARTS] U+E478 -> U+E6EF
+  ["eeaaa6", "ee9bac"], # [SPARKLING HEART] U+EAA6 -> U+E6EC
+  ["ee93aa", "ee9bac"], # [HEART WITH ARROW] U+E4EA -> U+E6EC
+  ["eeaaa7", "ee9bac"], # [BLUE HEART] U+EAA7 -> U+E6EC
+  ["eeaaa8", "ee9bac"], # [GREEN HEART] U+EAA8 -> U+E6EC
+  ["eeaaa9", "ee9bac"], # [YELLOW HEART] U+EAA9 -> U+E6EC
+  ["eeaaaa", "ee9bac"], # [PURPLE HEART] U+EAAA -> U+E6EC
+  ["eead94", "ee9bac"], # [HEART WITH RIBBON] U+EB54 -> U+E6EC
+  ["ee96af", "ee9bad"], # [REVOLVING HEARTS] U+E5AF -> U+E6ED
+  ["eeaaa5", "ee9a8d"], # [BLACK HEART SUIT] U+EAA5 -> U+E68D
+  ["ee96a1", "ee9a8e"], # [BLACK SPADE SUIT] U+E5A1 -> U+E68E
+  ["ee96a2", "ee9a8f"], # [BLACK DIAMOND SUIT] U+E5A2 -> U+E68F
+  ["ee96a3", "ee9a90"], # [BLACK CLUB SUIT] U+E5A3 -> U+E690
+  ["ee91bd", "ee99bf"], # [SMOKING SYMBOL] U+E47D -> U+E67F
+  ["ee91be", "ee9a80"], # [NO SMOKING SYMBOL] U+E47E -> U+E680
+  ["ee91bf", "ee9a9b"], # [WHEELCHAIR SYMBOL] U+E47F -> U+E69B
+  ["eeacac", "ee9b9e"], # [TRIANGULAR FLAG ON POST] U+EB2C -> U+E6DE
+  ["ee9281", "ee9cb7"], # [WARNING SIGN] U+E481 -> U+E737
+  ["ee9284", "ee9caf"], # [NO ENTRY] U+E484 -> U+E72F
+  ["eeadb9", "ee9cb5"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+EB79 -> U+E735
+  ["ee92ae", "ee9c9d"], # [BICYCLE] U+E4AE -> U+E71D
+  ["eeadb2", "ee9cb3"], # [PEDESTRIAN] U+EB72 -> U+E733
+  ["ee9798", "ee9bb7"], # [BATH] U+E5D8 -> U+E6F7
+  ["ee92a5", "ee99ae"], # [RESTROOM] U+E4A5 -> U+E66E
+  ["ee9581", "ee9cb8"], # [NO ENTRY SIGN] U+E541 -> U+E738
+  ["ee9597", :undef], # [HEAVY CHECK MARK] U+E557 -> "[チェックマーク]"
+  ["ee96ab", "ee9b9b"], # [SQUARED CL] U+E5AB -> U+E6DB
+  ["eeaa85", :undef], # [SQUARED COOL] U+EA85 -> "[COOL]"
+  ["ee95b8", "ee9b97"], # [SQUARED FREE] U+E578 -> U+E6D7
+  ["eeaa88", "ee9b98"], # [SQUARED ID] U+EA88 -> U+E6D8
+  ["ee96b5", "ee9b9d"], # [SQUARED NEW] U+E5B5 -> U+E6DD
+  ["ee96ad", "ee9c8b"], # [SQUARED OK] U+E5AD -> U+E70B
+  ["ee93a8", :undef], # [SQUARED SOS] U+E4E8 -> "[SOS]"
+  ["ee948f", :undef], # [SQUARED UP WITH EXCLAMATION MARK] U+E50F -> "[UP!]"
+  ["ee9792", :undef], # [SQUARED VS] U+E5D2 -> "[VS]"
+  ["eeaa87", :undef], # [SQUARED KATAKANA SA] U+EA87 -> "[サービス]"
+  ["eeaa8a", "ee9cb9"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+EA8A -> U+E739
+  ["eeaa89", "ee9cbb"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+EA89 -> U+E73B
+  ["eeaa86", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+EA86 -> "[割]"
+  ["eeaa8b", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+EA8B -> "[指]"
+  ["eeaa8c", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+EA8C -> "[営]"
+  ["ee93b1", "ee9cb4"], # [CIRCLED IDEOGRAPH SECRET] U+E4F1 -> U+E734
+  ["eeaa99", :undef], # [CIRCLED IDEOGRAPH CONGRATULATION] U+EA99 -> "[祝]"
+  ["ee93b7", :undef], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E4F7 -> "[得]"
+  ["eeac81", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+EB01 -> "[可]"
+  ["ee94bc", :undef], # [HEAVY PLUS SIGN] U+E53C -> "[＋]"
+  ["ee94bd", :undef], # [HEAVY MINUS SIGN] U+E53D -> "[－]"
+  ["ee958f", :undef], # [HEAVY MULTIPLICATION X] U+E54F -> "[×]"
+  ["ee9594", :undef], # [HEAVY DIVISION SIGN] U+E554 -> "[÷]"
+  ["ee91b6", "ee9bbb"], # [ELECTRIC LIGHT BULB] U+E476 -> U+E6FB
+  ["ee93a5", "ee9bbc"], # [ANGER SYMBOL] U+E4E5 -> U+E6FC
+  ["ee91ba", "ee9bbe"], # [BOMB] U+E47A -> U+E6FE
+  ["ee91b5", "ee9c81"], # [SLEEPING SYMBOL] U+E475 -> U+E701
+  ["ee96b0", "ee9c85"], # [COLLISION SYMBOL] U+E5B0 -> U+E705
+  ["ee96b1", "ee9c86"], # [SPLASHING SWEAT SYMBOL] U+E5B1 -> U+E706
+  ["ee93a6", "ee9c87"], # [DROP OF WATER] U+E4E6 -> U+E707
+  ["ee93b4", "ee9c88"], # [DASH SYMBOL] U+E4F4 -> U+E708
+  ["ee93b5", :undef], # [PILE OF POO] U+E4F5 -> "[ウンチ]"
+  ["ee93a9", :undef], # [FLEXED BICEPS] U+E4E9 -> "[力こぶ]"
+  ["eead9c", :undef], # [DIZZY SYMBOL] U+EB5C -> "[クラクラ]"
+  ["ee93bd", :undef], # [SPEECH BALLOON] U+E4FD -> "[フキダシ]"
+  ["eeaaab", "ee9bba"], # [SPARKLES] U+EAAB -> U+E6FA
+  ["ee91b9", "ee9bb8"], # [EIGHT POINTED BLACK STAR] U+E479 -> U+E6F8
+  ["ee94be", "ee9bb8"], # [EIGHT SPOKED ASTERISK] U+E53E -> U+E6F8
+  ["ee94ba", "ee9a9c"], # [MEDIUM WHITE CIRCLE] U+E53A -> U+E69C
+  ["ee94bb", "ee9a9c"], # [MEDIUM BLACK CIRCLE] U+E53B -> U+E69C
+  ["ee958a", "ee9a9c"], # [LARGE RED CIRCLE] U+E54A -> U+E69C
+  ["ee958b", "ee9a9c"], # [LARGE BLUE CIRCLE] U+E54B -> U+E69C
+  ["ee928b", :undef], # [WHITE MEDIUM STAR] U+E48B -> "[☆]"
+  ["ee9588", :undef], # [WHITE LARGE SQUARE] U+E548 -> "■"
+  ["ee9589", :undef], # [BLACK LARGE SQUARE] U+E549 -> "■"
+  ["ee94b1", :undef], # [WHITE SMALL SQUARE] U+E531 -> "■"
+  ["ee94b2", :undef], # [BLACK SMALL SQUARE] U+E532 -> "■"
+  ["ee94b4", :undef], # [WHITE MEDIUM SMALL SQUARE] U+E534 -> "■"
+  ["ee94b5", :undef], # [BLACK MEDIUM SMALL SQUARE] U+E535 -> "■"
+  ["ee94b8", :undef], # [WHITE MEDIUM SQUARE] U+E538 -> "■"
+  ["ee94b9", :undef], # [BLACK MEDIUM SQUARE] U+E539 -> "■"
+  ["ee9586", :undef], # [LARGE ORANGE DIAMOND] U+E546 -> "◆"
+  ["ee9587", :undef], # [LARGE BLUE DIAMOND] U+E547 -> "◆"
+  ["ee94b6", :undef], # [SMALL ORANGE DIAMOND] U+E536 -> "◆"
+  ["ee94b7", :undef], # [SMALL BLUE DIAMOND] U+E537 -> "◆"
+  ["ee91ac", "ee9bba"], # [SPARKLE] U+E46C -> U+E6FA
+  ["ee93b0", :undef], # [WHITE FLOWER] U+E4F0 -> "[花丸]"
+  ["ee93b2", :undef], # [HUNDRED POINTS SYMBOL] U+E4F2 -> "[100点]"
+  ["ee959d", "ee9b9a"], # [LEFTWARDS ARROW WITH HOOK] U+E55D -> U+E6DA
+  ["ee959c", :undef], # [RIGHTWARDS ARROW WITH HOOK] U+E55C -> "└→"
+  ["eeac8d", "ee9cb5"], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+EB0D -> U+E735
+  ["ee9491", :undef], # [SPEAKER WITH THREE SOUND WAVES] U+E511 -> "[スピーカ]"
+  ["ee9684", :undef], # [BATTERY] U+E584 -> "[電池]"
+  ["ee9689", :undef], # [ELECTRIC PLUG] U+E589 -> "[コンセント]"
+  ["ee9498", "ee9b9c"], # [LEFT-POINTING MAGNIFYING GLASS] U+E518 -> U+E6DC
+  ["eeac85", "ee9b9c"], # [RIGHT-POINTING MAGNIFYING GLASS] U+EB05 -> U+E6DC
+  ["ee949c", "ee9b99"], # [LOCK] U+E51C -> U+E6D9
+  ["eeac8c", "ee9b99"], # [LOCK WITH INK PEN] U+EB0C -> U+E6D9
+  ["eeabbc", "ee9b99"], # [CLOSED LOCK WITH KEY] U+EAFC -> U+E6D9
+  ["ee9499", "ee9b99"], # [KEY] U+E519 -> U+E6D9
+  ["ee9492", "ee9c93"], # [BELL] U+E512 -> U+E713
+  ["eeac82", :undef], # [BALLOT BOX WITH CHECK] U+EB02 -> "[チェックマーク]"
+  ["eeac84", :undef], # [RADIO BUTTON] U+EB04 -> "[ラジオボタン]"
+  ["eeac87", :undef], # [BOOKMARK] U+EB07 -> "[ブックマーク]"
+  ["ee968a", :undef], # [LINK SYMBOL] U+E58A -> "[リンク]"
+  ["eeac86", :undef], # [BACK WITH LEFTWARDS ARROW ABOVE] U+EB06 -> "[←BACK]"
+  ["ee968c", :undef], # [EM SPACE] U+E58C -> U+3013 (GETA)
+  ["ee968d", :undef], # [EN SPACE] U+E58D -> U+3013 (GETA)
+  ["ee968e", :undef], # [FOUR-PER-EM SPACE] U+E58E -> U+3013 (GETA)
+  ["ee959e", :undef], # [WHITE HEAVY CHECK MARK] U+E55E -> "[チェックマーク]"
+  ["eeae83", "ee9a93"], # [RAISED FIST] U+EB83 -> U+E693
+  ["ee96a7", "ee9a95"], # [RAISED HAND] U+E5A7 -> U+E695
+  ["ee96a6", "ee9a94"], # [VICTORY HAND] U+E5A6 -> U+E694
+  ["ee93b3", "ee9bbd"], # [FISTED HAND SIGN] U+E4F3 -> U+E6FD
+  ["ee93b9", "ee9ca7"], # [THUMBS UP SIGN] U+E4F9 -> U+E727
+  ["ee93b6", :undef], # [WHITE UP POINTING INDEX] U+E4F6 -> "[人差し指]"
+  ["eeaa8d", :undef], # [WHITE UP POINTING BACKHAND INDEX] U+EA8D -> "[↑]"
+  ["eeaa8e", :undef], # [WHITE DOWN POINTING BACKHAND INDEX] U+EA8E -> "[↓]"
+  ["ee93bf", :undef], # [WHITE LEFT POINTING BACKHAND INDEX] U+E4FF -> "[←]"
+  ["ee9480", :undef], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E500 -> "[→]"
+  ["eeab96", "ee9a95"], # [WAVING HAND SIGN] U+EAD6 -> U+E695
+  ["eeab93", :undef], # [CLAPPING HANDS SIGN] U+EAD3 -> "[拍手]"
+  ["eeab94", "ee9c8b"], # [OK HAND SIGN] U+EAD4 -> U+E70B
+  ["eeab95", "ee9c80"], # [THUMBS DOWN SIGN] U+EAD5 -> U+E700
+  ["ee95b7", :undef], # [EMOJI COMPATIBILITY SYMBOL-37] U+E577 -> "[EZ]"
+  ["ee96b2", :undef], # [EMOJI COMPATIBILITY SYMBOL-38] U+E5B2 -> "[ezplus]"
+  ["eeaa9d", :undef], # [EMOJI COMPATIBILITY SYMBOL-39] U+EA9D -> "[EZナビ]"
+  ["eeadb4", :undef], # [EMOJI COMPATIBILITY SYMBOL-40] U+EB74 -> "[EZムービー]"
+  ["eeae81", :undef], # [EMOJI COMPATIBILITY SYMBOL-41] U+EB81 -> "[Cメール]"
+  ["eeae89", :undef], # [EMOJI COMPATIBILITY SYMBOL-42] U+EB89 -> "[Java]"
+  ["eeae8a", :undef], # [EMOJI COMPATIBILITY SYMBOL-43] U+EB8A -> "[BREW]"
+  ["eeae8b", :undef], # [EMOJI COMPATIBILITY SYMBOL-44] U+EB8B -> "[EZ着うた]"
+  ["eeae8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-45] U+EB8C -> "[EZナビ]"
+  ["eeae8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-46] U+EB8D -> "[WIN]"
+  ["eeae8e", :undef], # [EMOJI COMPATIBILITY SYMBOL-47] U+EB8E -> "[プレミアム]"
+  ["eeabbb", :undef], # [EMOJI COMPATIBILITY SYMBOL-48] U+EAFB -> "[オープンウェブ]"
+  ["ee9686", :undef], # [EMOJI COMPATIBILITY SYMBOL-49] U+E586 -> "[PDC]"
+  ["ee94ac", "ee9ba1"], # [EMOJI COMPATIBILITY SYMBOL-66] U+E52C -> U+E6E1
+  # for undocumented codepoints
+  ["eebda0", "ee98be"], # [BLACK SUN WITH RAYS] U+E488 -> U+E63E
+  ["eebda5", "ee98bf"], # [CLOUD] U+E48D -> U+E63F
+  ["eebda4", "ee9980"], # [UMBRELLA WITH RAIN DROPS] U+E48C -> U+E640
+  ["eebd9d", "ee9981"], # [SNOWMAN WITHOUT SNOW] U+E485 -> U+E641
+  ["eebd9f", "ee9982"], # [HIGH VOLTAGE SIGN] U+E487 -> U+E642
+  ["eebd81", "ee9983"], # [CYCLONE] U+E469 -> U+E643
+  ["ef82b5", "ee9984"], # [FOGGY] U+E598 -> U+E644
+  ["eeb2bc", "ee9985"], # [CLOSED UMBRELLA] U+EAE8 -> U+E645
+  ["eeb385", "ee9ab3"], # [NIGHT WITH STARS] U+EAF1 -> U+E6B3
+  ["eeb388", "ee98be"], # [SUNRISE] U+EAF4 -> U+E63E
+  ["eeb18d", :undef], # [CITYSCAPE AT DUSK] U+E5DA -> "[夕焼け]"
+  ["eeb386", :undef], # [RAINBOW] U+EAF2 -> "[虹]"
+  ["eebda2", :undef], # [SNOWFLAKE] U+E48A -> "[雪結晶]"
+  ["eebda6", "ee98beee98bf"], # [SUN BEHIND CLOUD] U+E48E -> U+E63E U+E63F
+  ["eebe98", "ee9ab3"], # [BRIDGE AT NIGHT] U+E4BF -> U+E6B3
+  ["eeb681", "ee9cbf"], # [WATER WAVE] U+EB7C -> U+E73F
+  ["eeb597", :undef], # [VOLCANO] U+EB53 -> "[火山]"
+  ["eeb5a3", "ee9ab3"], # [MILKY WAY] U+EB5F -> U+E6B3
+  ["ef8390", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+E5B3 -> "[地球]"
+  ["ef8385", "ee9a9c"], # [NEW MOON SYMBOL] U+E5A8 -> U+E69C
+  ["ef8386", "ee9a9d"], # [WAXING GIBBOUS MOON SYMBOL] U+E5A9 -> U+E69D
+  ["ef8387", "ee9a9e"], # [FIRST QUARTER MOON SYMBOL] U+E5AA -> U+E69E
+  ["eebd9e", "ee9a9f"], # [CRESCENT MOON] U+E486 -> U+E69F
+  ["eebda1", "ee9a9e"], # [FIRST QUARTER MOON WITH FACE] U+E489 -> U+E69E
+  ["eebd80", :undef], # [SHOOTING STAR] U+E468 -> "☆彡"
+  ["ef8297", "ee9c9f"], # [WATCH] U+E57A -> U+E71F
+  ["ef8298", "ee9c9c"], # [HOURGLASS] U+E57B -> U+E71C
+  ["ef82b1", "ee9aba"], # [ALARM CLOCK] U+E594 -> U+E6BA
+  ["eebd94", "ee9c9c"], # [HOURGLASS WITH FLOWING SAND] U+E47C -> U+E71C
+  ["eebda7", "ee9986"], # [ARIES] U+E48F -> U+E646
+  ["eebda8", "ee9987"], # [TAURUS] U+E490 -> U+E647
+  ["eebda9", "ee9988"], # [GEMINI] U+E491 -> U+E648
+  ["eebdaa", "ee9989"], # [CANCER] U+E492 -> U+E649
+  ["eebdab", "ee998a"], # [LEO] U+E493 -> U+E64A
+  ["eebdac", "ee998b"], # [VIRGO] U+E494 -> U+E64B
+  ["eebdad", "ee998c"], # [LIBRA] U+E495 -> U+E64C
+  ["eebdae", "ee998d"], # [SCORPIUS] U+E496 -> U+E64D
+  ["eebdaf", "ee998e"], # [SAGITTARIUS] U+E497 -> U+E64E
+  ["eebdb0", "ee998f"], # [CAPRICORN] U+E498 -> U+E64F
+  ["eebdb1", "ee9990"], # [AQUARIUS] U+E499 -> U+E650
+  ["eebdb2", "ee9991"], # [PISCES] U+E49A -> U+E651
+  ["eebdb3", :undef], # [OPHIUCHUS] U+E49B -> "[蛇使座]"
+  ["eebfac", "ee9d81"], # [FOUR LEAF CLOVER] U+E513 -> U+E741
+  ["eebebd", "ee9d83"], # [TULIP] U+E4E4 -> U+E743
+  ["eeb682", "ee9d86"], # [SEEDLING] U+EB7D -> U+E746
+  ["eebea7", "ee9d87"], # [MAPLE LEAF] U+E4CE -> U+E747
+  ["eebea3", "ee9d88"], # [CHERRY BLOSSOM] U+E4CA -> U+E748
+  ["ef83aa", :undef], # [ROSE] U+E5BA -> "[バラ]"
+  ["eeb180", "ee9d87"], # [FALLEN LEAF] U+E5CD -> U+E747
+  ["eeb1a7", :undef], # [HIBISCUS] U+EA94 -> "[ハイビスカス]"
+  ["eebebc", :undef], # [SUNFLOWER] U+E4E3 -> "[ひまわり]"
+  ["eebebb", :undef], # [PALM TREE] U+E4E2 -> "[ヤシ]"
+  ["eeb1a9", :undef], # [CACTUS] U+EA96 -> "[サボテン]"
+  ["eeb3b7", :undef], # [EAR OF MAIZE] U+EB36 -> "[とうもろこし]"
+  ["eeb3b8", :undef], # [MUSHROOM] U+EB37 -> "[キノコ]"
+  ["eeb3b9", :undef], # [CHESTNUT] U+EB38 -> "[栗]"
+  ["eeb58d", :undef], # [BLOSSOM] U+EB49 -> "[花]"
+  ["eeb687", "ee9d81"], # [HERB] U+EB82 -> U+E741
+  ["eebeab", "ee9d82"], # [CHERRIES] U+E4D2 -> U+E742
+  ["eeb3b6", "ee9d84"], # [BANANA] U+EB35 -> U+E744
+  ["eeb28d", "ee9d85"], # [RED APPLE] U+EAB9 -> U+E745
+  ["eeb28e", :undef], # [TANGERINE] U+EABA -> "[みかん]"
+  ["eebead", :undef], # [STRAWBERRY] U+E4D4 -> "[イチゴ]"
+  ["eebea6", :undef], # [WATERMELON] U+E4CD -> "[スイカ]"
+  ["eeb28f", :undef], # [TOMATO] U+EABB -> "[トマト]"
+  ["eeb290", :undef], # [AUBERGINE] U+EABC -> "[ナス]"
+  ["eeb3b3", :undef], # [MELON] U+EB32 -> "[メロン]"
+  ["eeb3b4", :undef], # [PINEAPPLE] U+EB33 -> "[パイナップル]"
+  ["eeb3b5", :undef], # [GRAPES] U+EB34 -> "[ブドウ]"
+  ["eeb3ba", :undef], # [PEACH] U+EB39 -> "[モモ]"
+  ["eeb59e", "ee9d85"], # [GREEN APPLE] U+EB5A -> U+E745
+  ["ef8381", "ee9a91"], # [EYES] U+E5A4 -> U+E691
+  ["ef8382", "ee9a92"], # [EAR] U+E5A5 -> U+E692
+  ["eeb2a4", :undef], # [NOSE] U+EAD0 -> "[鼻]"
+  ["eeb2a5", "ee9bb9"], # [MOUTH] U+EAD1 -> U+E6F9
+  ["eeb58b", "ee9ca8"], # [TONGUE] U+EB47 -> U+E728
+  ["eebfa2", "ee9c90"], # [LIPSTICK] U+E509 -> U+E710
+  ["eeb1b3", :undef], # [NAIL POLISH] U+EAA0 -> "[マニキュア]"
+  ["eebfa4", :undef], # [FACE MASSAGE] U+E50B -> "[エステ]"
+  ["eeb1b4", "ee99b5"], # [HAIRCUT] U+EAA1 -> U+E675
+  ["eeb1b5", :undef], # [BARBER POLE] U+EAA2 -> "[床屋]"
+  ["eebf95", "ee9bb0"], # [BOY] U+E4FC -> U+E6F0
+  ["eebf93", "ee9bb0"], # [GIRL] U+E4FA -> U+E6F0
+  ["eebf9a", :undef], # [FAMILY] U+E501 -> "[家族]"
+  ["eeb190", :undef], # [POLICE OFFICER] U+E5DD -> "[警官]"
+  ["eeb2af", :undef], # [WOMAN WITH BUNNY EARS] U+EADB -> "[バニー]"
+  ["eeb2bd", :undef], # [BRIDE WITH VEIL] U+EAE9 -> "[花嫁]"
+  ["eeb394", :undef], # [WESTERN PERSON] U+EB13 -> "[白人]"
+  ["eeb395", :undef], # [MAN WITH GUA PI MAO] U+EB14 -> "[中国人]"
+  ["eeb396", :undef], # [MAN WITH TURBAN] U+EB15 -> "[インド人]"
+  ["eeb397", :undef], # [OLDER MAN] U+EB16 -> "[おじいさん]"
+  ["eeb398", :undef], # [OLDER WOMAN] U+EB17 -> "[おばあさん]"
+  ["eeb399", :undef], # [BABY] U+EB18 -> "[赤ちゃん]"
+  ["eeb39a", :undef], # [CONSTRUCTION WORKER] U+EB19 -> "[工事現場の人]"
+  ["eeb39b", :undef], # [PRINCESS] U+EB1A -> "[お姫様]"
+  ["eeb588", :undef], # [JAPANESE OGRE] U+EB44 -> "[なまはげ]"
+  ["eeb589", :undef], # [JAPANESE GOBLIN] U+EB45 -> "[天狗]"
+  ["eebea4", :undef], # [GHOST] U+E4CB -> "[お化け]"
+  ["ef83af", :undef], # [BABY ANGEL] U+E5BF -> "[天使]"
+  ["eebfa7", :undef], # [EXTRATERRESTRIAL ALIEN] U+E50E -> "[UFO]"
+  ["eebf85", :undef], # [ALIEN MONSTER] U+E4EC -> "[宇宙人]"
+  ["eebf88", :undef], # [IMP] U+E4EF -> "[アクマ]"
+  ["eebf91", :undef], # [SKULL] U+E4F8 -> "[ドクロ]"
+  ["eeb39d", :undef], # [DANCER] U+EB1C -> "[ダンス]"
+  ["eeb683", "ee9d8e"], # [SNAIL] U+EB7E -> U+E74E
+  ["eeb3a3", :undef], # [SNAKE] U+EB22 -> "[ヘビ]"
+  ["eeb3a4", :undef], # [CHICKEN] U+EB23 -> "[ニワトリ]"
+  ["eeb3a5", :undef], # [BOAR] U+EB24 -> "[イノシシ]"
+  ["eeb3a6", :undef], # [BACTRIAN CAMEL] U+EB25 -> "[ラクダ]"
+  ["eeb3a0", :undef], # [ELEPHANT] U+EB1F -> "[ゾウ]"
+  ["eeb3a1", :undef], # [KOALA] U+EB20 -> "[コアラ]"
+  ["ef83b7", :undef], # [OCTOPUS] U+E5C7 -> "[タコ]"
+  ["eeb380", :undef], # [SPIRAL SHELL] U+EAEC -> "[巻貝]"
+  ["eeb39f", :undef], # [BUG] U+EB1E -> "[ゲジゲジ]"
+  ["eebeb6", :undef], # [ANT] U+E4DD -> "[アリ]"
+  ["eeb59b", :undef], # [HONEYBEE] U+EB57 -> "[ミツバチ]"
+  ["eeb59c", :undef], # [LADY BEETLE] U+EB58 -> "[てんとう虫]"
+  ["eeb39e", "ee9d91"], # [TROPICAL FISH] U+EB1D -> U+E751
+  ["eebeac", "ee9d91"], # [BLOWFISH] U+E4D3 -> U+E751
+  ["eeb187", :undef], # [TURTLE] U+E5D4 -> "[カメ]"
+  ["eebeb9", "ee9d8f"], # [BABY CHICK] U+E4E0 -> U+E74F
+  ["eeb5ba", "ee9d8f"], # [FRONT-FACING BABY CHICK] U+EB76 -> U+E74F
+  ["eeb18e", "ee9d8f"], # [HATCHING CHICK] U+E5DB -> U+E74F
+  ["eebeb5", "ee9d90"], # [PENGUIN] U+E4DC -> U+E750
+  ["eebeb8", "ee9aa1"], # [POODLE] U+E4DF -> U+E6A1
+  ["eeb39c", :undef], # [DOLPHIN] U+EB1B -> "[イルカ]"
+  ["ef83b2", :undef], # [MOUSE FACE] U+E5C2 -> "[ネズミ]"
+  ["ef83b0", :undef], # [TIGER FACE] U+E5C0 -> "[トラ]"
+  ["eebeb4", "ee9aa2"], # [CAT FACE] U+E4DB -> U+E6A2
+  ["eebd88", :undef], # [SPOUTING WHALE] U+E470 -> "[クジラ]"
+  ["eebeb1", "ee9d94"], # [HORSE FACE] U+E4D8 -> U+E754
+  ["eebeb2", :undef], # [MONKEY FACE] U+E4D9 -> "[サル]"
+  ["eebeba", "ee9aa1"], # [DOG FACE] U+E4E1 -> U+E6A1
+  ["eebeb7", "ee9d95"], # [PIG FACE] U+E4DE -> U+E755
+  ["ef83b1", :undef], # [BEAR FACE] U+E5C1 -> "[クマ]"
+  ["eeb3a2", :undef], # [COW FACE] U+EB21 -> "[牛]"
+  ["eebeb0", :undef], # [RABBIT FACE] U+E4D7 -> "[ウサギ]"
+  ["eebeb3", :undef], # [FROG FACE] U+E4DA -> "[カエル]"
+  ["eebf87", "ee9a98"], # [PAW PRINTS] U+E4EE -> U+E698
+  ["eeb583", :undef], # [DRAGON FACE] U+EB3F -> "[辰]"
+  ["eeb58a", :undef], # [PANDA FACE] U+EB46 -> "[パンダ]"
+  ["eeb58c", "ee9d95"], # [PIG NOSE] U+EB48 -> U+E755
+  ["eebd8a", "ee9bb1"], # [ANGRY FACE] U+E472 -> U+E6F1
+  ["eeb5ab", "ee9bb3"], # [ANGUISHED FACE] U+EB67 -> U+E6F3
+  ["eeb29e", "ee9bb4"], # [ASTONISHED FACE] U+EACA -> U+E6F4
+  ["ef838b", "ee9bb4"], # [DIZZY FACE] U+E5AE -> U+E6F4
+  ["eeb29f", "ee9ca3"], # [EXASPERATED FACE] U+EACB -> U+E723
+  ["eeb29d", "ee9ca5"], # [EXPRESSIONLESS FACE] U+EAC9 -> U+E725
+  ["ef83b4", "ee9ca6"], # [FACE WITH HEART-SHAPED EYES] U+E5C4 -> U+E726
+  ["eeb295", "ee9d93"], # [FACE WITH LOOK OF TRIUMPH] U+EAC1 -> U+E753
+  ["eebf80", "ee9ca8"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E4E7 -> U+E728
+  ["eeb2a3", "ee9ca6"], # [FACE THROWING A KISS] U+EACF -> U+E726
+  ["eeb2a2", "ee9ca6"], # [FACE KISSING] U+EACE -> U+E726
+  ["eeb29b", :undef], # [FACE WITH MASK] U+EAC7 -> "[風邪ひき]"
+  ["eeb29c", "ee9caa"], # [FLUSHED FACE] U+EAC8 -> U+E72A
+  ["eebd89", "ee9bb0"], # [HAPPY FACE WITH OPEN MOUTH] U+E471 -> U+E6F0
+  ["eeb685", "ee9d93"], # [HAPPY FACE WITH GRIN] U+EB80 -> U+E753
+  ["eeb5a8", "ee9caa"], # [HAPPY AND CRYING FACE] U+EB64 -> U+E72A
+  ["eeb2a1", "ee9bb0"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+EACD -> U+E6F0
+  ["eebf94", "ee9bb0"], # [WHITE SMILING FACE] U+E4FB -> U+E6F0
+  ["eeb5ad", "ee9cae"], # [CRYING FACE] U+EB69 -> U+E72E
+  ["eebd8b", "ee9cad"], # [LOUDLY CRYING FACE] U+E473 -> U+E72D
+  ["eeb29a", "ee9d97"], # [FEARFUL FACE] U+EAC6 -> U+E757
+  ["eeb296", "ee9cab"], # [PERSEVERING FACE] U+EAC2 -> U+E72B
+  ["eeb5a1", "ee9ca4"], # [POUTING FACE] U+EB5D -> U+E724
+  ["eeb299", "ee9ca1"], # [RELIEVED FACE] U+EAC5 -> U+E721
+  ["eeb297", "ee9bb3"], # [CONFOUNDED FACE] U+EAC3 -> U+E6F3
+  ["eeb294", "ee9ca0"], # [PENSIVE FACE] U+EAC0 -> U+E720
+  ["ef83b5", "ee9d97"], # [FACE SCREAMING IN FEAR] U+E5C5 -> U+E757
+  ["eeb298", "ee9c81"], # [SLEEPY FACE] U+EAC4 -> U+E701
+  ["eeb293", "ee9cac"], # [SMIRKING FACE] U+EABF -> U+E72C
+  ["ef83b6", "ee9ca3"], # [FACE WITH COLD SWEAT] U+E5C6 -> U+E723
+  ["eebd8c", "ee9cab"], # [TIRED FACE] U+E474 -> U+E72B
+  ["ef83b3", "ee9ca9"], # [WINKING FACE] U+E5C3 -> U+E729
+  ["eeb5a5", "ee9bb0"], # [CAT FACE WITH OPEN MOUTH] U+EB61 -> U+E6F0
+  ["eeb684", "ee9d93"], # [HAPPY CAT FACE WITH GRIN] U+EB7F -> U+E753
+  ["eeb5a7", "ee9caa"], # [HAPPY AND CRYING CAT FACE] U+EB63 -> U+E72A
+  ["eeb5a4", "ee9ca6"], # [CAT FACE KISSING] U+EB60 -> U+E726
+  ["eeb5a9", "ee9ca6"], # [CAT FACE WITH HEART-SHAPED EYES] U+EB65 -> U+E726
+  ["eeb5ac", "ee9cae"], # [CRYING CAT FACE] U+EB68 -> U+E72E
+  ["eeb5a2", "ee9ca4"], # [POUTING CAT FACE] U+EB5E -> U+E724
+  ["eeb5ae", "ee9d93"], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+EB6A -> U+E753
+  ["eeb5aa", "ee9bb3"], # [ANGUISHED CAT FACE] U+EB66 -> U+E6F3
+  ["eeb2ab", "ee9caf"], # [FACE WITH NO GOOD GESTURE] U+EAD7 -> U+E72F
+  ["eeb2ac", "ee9c8b"], # [FACE WITH OK GESTURE] U+EAD8 -> U+E70B
+  ["eeb2ad", :undef], # [PERSON BOWING DEEPLY] U+EAD9 -> "m(_ _)m"
+  ["eeb594", :undef], # [SEE-NO-EVIL MONKEY] U+EB50 -> "(/_＼)"
+  ["eeb595", :undef], # [SPEAK-NO-EVIL MONKEY] U+EB51 -> "(・×・)"
+  ["eeb596", :undef], # [HEAR-NO-EVIL MONKEY] U+EB52 -> "|(・×・)|"
+  ["eeb68a", :undef], # [PERSON RAISING ONE HAND] U+EB85 -> "(^-^)/"
+  ["eeb68b", :undef], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+EB86 -> "＼(^o^)／"
+  ["eeb68c", "ee9bb3"], # [PERSON FROWNING] U+EB87 -> U+E6F3
+  ["eeb68d", "ee9bb1"], # [PERSON WITH POUTING FACE] U+EB88 -> U+E6F1
+  ["eeb2a6", :undef], # [PERSON WITH FOLDED HANDS] U+EAD2 -> "(&gt;人&lt;)"
+  ["eebe84", "ee99a3"], # [HOUSE BUILDING] U+E4AB -> U+E663
+  ["ef83a0", "ee99a3"], # [HOUSE WITH GARDEN] U+EB09 -> U+E663
+  ["eebe86", "ee99a4"], # [OFFICE BUILDING] U+E4AD -> U+E664
+  ["eeb191", "ee99a5"], # [JAPANESE POST OFFICE] U+E5DE -> U+E665
+  ["eeb192", "ee99a6"], # [HOSPITAL] U+E5DF -> U+E666
+  ["eebe83", "ee99a7"], # [BANK] U+E4AA -> U+E667
+  ["eebdbb", "ee99a8"], # [AUTOMATED TELLER MACHINE] U+E4A3 -> U+E668
+  ["eeb194", "ee99a9"], # [HOTEL] U+EA81 -> U+E669
+  ["eeb387", "ee99a9ee9baf"], # [LOVE HOTEL] U+EAF3 -> U+E669 U+E6EF
+  ["eebdbc", "ee99aa"], # [CONVENIENCE STORE] U+E4A4 -> U+E66A
+  ["eeb193", "ee9cbe"], # [SCHOOL] U+EA80 -> U+E73E
+  ["ef83ab", :undef], # [CHURCH] U+E5BB -> "[教会]"
+  ["eeb182", :undef], # [FOUNTAIN] U+E5CF -> "[噴水]"
+  ["eeb38a", :undef], # [DEPARTMENT STORE] U+EAF6 -> "[デパート]"
+  ["eeb38b", :undef], # [JAPANESE CASTLE] U+EAF7 -> "[城]"
+  ["eeb38c", :undef], # [EUROPEAN CASTLE] U+EAF8 -> "[城]"
+  ["eeb38d", :undef], # [FACTORY] U+EAF9 -> "[工場]"
+  ["eebe82", "ee99a1"], # [ANCHOR] U+E4A9 -> U+E661
+  ["eebe96", "ee9d8b"], # [IZAKAYA LANTERN] U+E4BD -> U+E74B
+  ["ef83ad", "ee9d80"], # [MOUNT FUJI] U+E5BD -> U+E740
+  ["eebe99", :undef], # [TOKYO TOWER] U+E4C0 -> "[東京タワー]"
+  ["ef828f", :undef], # [SILHOUETTE OF JAPAN] U+E572 -> "[日本地図]"
+  ["eeb5b0", :undef], # [MOYAI] U+EB6C -> "[モアイ]"
+  ["ef83a7", "ee9a99"], # [MANS SHOE] U+E5B7 -> U+E699
+  ["eeb3ac", "ee9a99"], # [ATHLETIC SHOE] U+EB2B -> U+E699
+  ["eebfb3", "ee99b4"], # [HIGH-HEELED SHOE] U+E51A -> U+E674
+  ["eeb1b2", :undef], # [WOMANS BOOTS] U+EA9F -> "[ブーツ]"
+  ["eeb3ab", "ee9a98"], # [FOOTPRINTS] U+EB2A -> U+E698
+  ["eebf97", "ee9a9a"], # [EYEGLASSES] U+E4FE -> U+E69A
+  ["ef83a6", "ee9c8e"], # [T-SHIRT] U+E5B6 -> U+E70E
+  ["eeb5bb", "ee9c91"], # [JEANS] U+EB77 -> U+E711
+  ["ef83b9", "ee9c9a"], # [CROWN] U+E5C9 -> U+E71A
+  ["eeb1a6", :undef], # [NECKTIE] U+EA93 -> "[ネクタイ]"
+  ["eeb1b1", :undef], # [WOMANS HAT] U+EA9E -> "[帽子]"
+  ["eeb5af", :undef], # [DRESS] U+EB6B -> "[ドレス]"
+  ["eeb1b6", :undef], # [KIMONO] U+EAA3 -> "[着物]"
+  ["eeb1b7", :undef], # [BIKINI] U+EAA4 -> "[ビキニ]"
+  ["eebfa6", "ee9c8e"], # [WOMANS CLOTHES] U+E50D -> U+E70E
+  ["eebf9d", "ee9c8f"], # [PURSE] U+E504 -> U+E70F
+  ["eebdb4", "ee9a82"], # [HANDBAG] U+E49C -> U+E682
+  ["eebea0", "ee9c95"], # [MONEY BAG] U+E4C7 -> U+E715
+  ["eeb18f", :undef], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E5DC -> "[株価]"
+  ["ef8296", "ee9c95"], # [HEAVY DOLLAR SIGN] U+E579 -> U+E715
+  ["ef8299", :undef], # [CREDIT CARD] U+E57C -> "[カード]"
+  ["ef829a", "ee9b96"], # [BANKNOTE WITH YEN SIGN] U+E57D -> U+E6D6
+  ["ef82a2", "ee9c95"], # [BANKNOTE WITH DOLLAR SIGN] U+E585 -> U+E715
+  ["eeb59f", :undef], # [MONEY WITH WINGS] U+EB5B -> "[飛んでいくお金]"
+  ["eeb392", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+EB11 -> "[中国]"
+  ["eeb38f", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+EB0E -> "[ドイツ]"
+  ["eeb188", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E5D5 -> "[スペイン]"
+  ["eeb38e", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+EAFA -> "[フランス]"
+  ["eeb391", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+EB10 -> "[イギリス]"
+  ["eeb390", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+EB0F -> "[イタリア]"
+  ["eebea5", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E4CC -> "[日の丸]"
+  ["eeb393", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+EB12 -> "[韓国]"
+  ["eeb189", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E5D6 -> "[ロシア]"
+  ["ef8290", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E573 -> "[USA]"
+  ["eebd93", :undef], # [FIRE] U+E47B -> "[炎]"
+  ["ef82a0", "ee9bbb"], # [ELECTRIC TORCH] U+E583 -> U+E6FB
+  ["ef82a4", "ee9c98"], # [WRENCH] U+E587 -> U+E718
+  ["ef83bb", :undef], # [HAMMER] U+E5CB -> "[ハンマー]"
+  ["ef829e", :undef], # [NUT AND BOLT] U+E581 -> "[ネジ]"
+  ["ef829c", :undef], # [HOCHO] U+E57F -> "[包丁]"
+  ["eebfa3", :undef], # [PISTOL] U+E50A -> "[ピストル]"
+  ["eeb1a2", :undef], # [CRYSTAL BALL] U+EA8F -> "[占い]"
+  ["eebd98", :undef], # [JAPANESE SYMBOL FOR BEGINNER] U+E480 -> "[若葉マーク]"
+  ["eebfa9", :undef], # [SYRINGE] U+E510 -> "[注射]"
+  ["eeb1ad", :undef], # [PILL] U+EA9A -> "[薬]"
+  ["eeb3a7", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+EB26 -> "[A]"
+  ["eeb3a8", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+EB27 -> "[B]"
+  ["eeb3aa", :undef], # [NEGATIVE SQUARED AB] U+EB29 -> "[AB]"
+  ["eeb3a9", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+EB28 -> "[O]"
+  ["ef82bc", "ee9a84"], # [RIBBON] U+E59F -> U+E684
+  ["eebea8", "ee9a85"], # [WRAPPED PRESENT] U+E4CF -> U+E685
+  ["ef82bd", "ee9a86"], # [BIRTHDAY CAKE] U+E5A0 -> U+E686
+  ["eebea2", "ee9aa4"], # [CHRISTMAS TREE] U+E4C9 -> U+E6A4
+  ["eeb384", :undef], # [FATHER CHRISTMAS] U+EAF0 -> "[サンタ]"
+  ["eeb18c", :undef], # [CROSSED FLAGS] U+E5D9 -> "[祝日]"
+  ["ef83bc", :undef], # [FIREWORKS] U+E5CC -> "[花火]"
+  ["eeb1ae", :undef], # [BALLOON] U+EA9B -> "[風船]"
+  ["eeb1af", :undef], # [PARTY POPPER] U+EA9C -> "[クラッカー]"
+  ["eeb2b7", :undef], # [PINE DECORATION] U+EAE3 -> "[門松]"
+  ["eeb2b8", :undef], # [JAPANESE DOLLS] U+EAE4 -> "[ひな祭り]"
+  ["eeb2b9", :undef], # [GRADUATION CAP] U+EAE5 -> "[卒業式]"
+  ["eeb2ba", :undef], # [SCHOOL SATCHEL] U+EAE6 -> "[ランドセル]"
+  ["eeb2bb", :undef], # [CARP STREAMER] U+EAE7 -> "[こいのぼり]"
+  ["eeb2bf", :undef], # [FIREWORK SPARKLER] U+EAEB -> "[線香花火]"
+  ["eeb381", :undef], # [WIND CHIME] U+EAED -> "[風鈴]"
+  ["eeb382", :undef], # [JACK-O-LANTERN] U+EAEE -> "[ハロウィン]"
+  ["eebd87", :undef], # [CONFETTI BALL] U+E46F -> "[オメデトウ]"
+  ["eeb581", :undef], # [TANABATA TREE] U+EB3D -> "[七夕]"
+  ["eeb383", :undef], # [MOON VIEWING CEREMONY] U+EAEF -> "[お月見]"
+  ["ef82b8", "ee999a"], # [PAGER] U+E59B -> U+E65A
+  ["ef82b3", "ee9a87"], # [BLACK TELEPHONE] U+E596 -> U+E687
+  ["eebfb7", "ee9a87"], # [TELEPHONE RECEIVER] U+E51E -> U+E687
+  ["ef82a5", "ee9a88"], # [MOBILE PHONE] U+E588 -> U+E688
+  ["ef839f", "ee9b8e"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+EB08 -> U+E6CE
+  ["eeb1a5", "ee9a89"], # [MEMO] U+EA92 -> U+E689
+  ["eebfb9", "ee9b90"], # [FAX MACHINE] U+E520 -> U+E6D0
+  ["eebfba", "ee9b93"], # [ENVELOPE] U+E521 -> U+E6D3
+  ["ef82ae", "ee9b8f"], # [INCOMING ENVELOPE] U+E591 -> U+E6CF
+  ["eeb5a6", "ee9b8f"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+EB62 -> U+E6CF
+  ["eebfb4", "ee99a5"], # [CLOSED MAILBOX WITH LOWERED FLAG] U+E51B -> U+E665
+  ["ef83a1", "ee99a5"], # [CLOSED MAILBOX WITH RAISED FLAG] U+EB0A -> U+E665
+  ["ef82a8", :undef], # [NEWSPAPER] U+E58B -> "[新聞]"
+  ["eebe81", :undef], # [SATELLITE ANTENNA] U+E4A8 -> "[アンテナ]"
+  ["ef82af", :undef], # [OUTBOX TRAY] U+E592 -> "[送信BOX]"
+  ["ef82b0", :undef], # [INBOX TRAY] U+E593 -> "[受信BOX]"
+  ["eebfb8", "ee9a85"], # [PACKAGE] U+E51F -> U+E685
+  ["eeb5b5", "ee9b93"], # [E-MAIL SYMBOL] U+EB71 -> U+E6D3
+  ["ef8394", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+EAFD -> "[ABCD]"
+  ["ef8395", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+EAFE -> "[abcd]"
+  ["ef8396", :undef], # [INPUT SYMBOL FOR NUMBERS] U+EAFF -> "[1234]"
+  ["ef8397", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+EB00 -> "[記号]"
+  ["eeb599", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+EB55 -> "[ABC]"
+  ["ef839a", "ee9aae"], # [BLACK NIB] U+EB03 -> U+E6AE
+  ["ef83a8", "ee9c96"], # [PERSONAL COMPUTER] U+E5B8 -> U+E716
+  ["eebdb9", "ee9c99"], # [PENCIL] U+E4A1 -> U+E719
+  ["eebdb8", "ee9cb0"], # [PAPERCLIP] U+E4A0 -> U+E730
+  ["eeb181", "ee9a82"], # [BRIEFCASE] U+E5CE -> U+E682
+  ["ef829f", :undef], # [MINIDISC] U+E582 -> "[MD]"
+  ["ef81be", :undef], # [FLOPPY DISK] U+E562 -> "[フロッピー]"
+  ["eebfa5", "ee9a8c"], # [OPTICAL DISC] U+E50C -> U+E68C
+  ["eebfaf", "ee99b5"], # [BLACK SCISSORS] U+E516 -> U+E675
+  ["ef81bc", :undef], # [ROUND PUSHPIN] U+E560 -> "[画びょう]"
+  ["ef81bd", "ee9a89"], # [PAGE WITH CURL] U+E561 -> U+E689
+  ["ef8286", "ee9a89"], # [PAGE FACING UP] U+E569 -> U+E689
+  ["ef8280", :undef], # [CALENDAR] U+E563 -> "[カレンダー]"
+  ["ef82ac", :undef], # [FILE FOLDER] U+E58F -> "[フォルダ]"
+  ["ef82ad", :undef], # [OPEN FILE FOLDER] U+E590 -> "[フォルダ]"
+  ["ef8288", "ee9a83"], # [NOTEBOOK] U+E56B -> U+E683
+  ["eebdb7", "ee9a83"], # [OPEN BOOK] U+E49F -> U+E683
+  ["eebdb5", "ee9a83"], # [NOTEBOOK WITH DECORATIVE COVER] U+E49D -> U+E683
+  ["ef8285", "ee9a83"], # [CLOSED BOOK] U+E568 -> U+E683
+  ["ef8282", "ee9a83"], # [GREEN BOOK] U+E565 -> U+E683
+  ["ef8283", "ee9a83"], # [BLUE BOOK] U+E566 -> U+E683
+  ["ef8284", "ee9a83"], # [ORANGE BOOK] U+E567 -> U+E683
+  ["ef828c", "ee9a83"], # [BOOKS] U+E56F -> U+E683
+  ["eebfb6", :undef], # [NAME BADGE] U+E51D -> "[名札]"
+  ["ef81bb", "ee9c8a"], # [SCROLL] U+E55F -> U+E70A
+  ["ef8281", "ee9a89"], # [CLIPBOARD] U+E564 -> U+E689
+  ["ef8287", :undef], # [TEAR-OFF CALENDAR] U+E56A -> "[カレンダー]"
+  ["ef8291", :undef], # [BAR CHART] U+E574 -> "[グラフ]"
+  ["ef8292", :undef], # [CHART WITH UPWARDS TREND] U+E575 -> "[グラフ]"
+  ["ef8293", :undef], # [CHART WITH DOWNWARDS TREND] U+E576 -> "[グラフ]"
+  ["ef8289", "ee9a83"], # [CARD INDEX] U+E56C -> U+E683
+  ["ef828a", :undef], # [PUSHPIN] U+E56D -> "[画びょう]"
+  ["ef828b", "ee9a83"], # [LEDGER] U+E56E -> U+E683
+  ["ef828d", :undef], # [STRAIGHT RULER] U+E570 -> "[定規]"
+  ["eebdba", :undef], # [TRIANGULAR RULER] U+E4A2 -> "[三角定規]"
+  ["ef83a2", "ee9a89"], # [BOOKMARK TABS] U+EB0B -> U+E689
+  ["eebe93", "ee9993"], # [BASEBALL] U+E4BA -> U+E653
+  ["ef82b6", "ee9994"], # [FLAG IN HOLE] U+E599 -> U+E654
+  ["eebe90", "ee9995"], # [TENNIS RACQUET AND BALL] U+E4B7 -> U+E655
+  ["eebe8f", "ee9996"], # [SOCCER BALL] U+E4B6 -> U+E656
+  ["eeb280", "ee9997"], # [SKI AND SKI BOOT] U+EAAC -> U+E657
+  ["ef82b7", "ee9998"], # [BASKETBALL AND HOOP] U+E59A -> U+E658
+  ["eebe92", "ee9999"], # [CHEQUERED FLAG] U+E4B9 -> U+E659
+  ["eebe91", "ee9c92"], # [SNOWBOARDER] U+E4B8 -> U+E712
+  ["eebd83", "ee9cb3"], # [RUNNER] U+E46B -> U+E733
+  ["eeb585", "ee9c92"], # [SURFER] U+EB41 -> U+E712
+  ["eeb186", :undef], # [TROPHY] U+E5D3 -> "[トロフィー]"
+  ["eebe94", :undef], # [AMERICAN FOOTBALL] U+E4BB -> "[フットボール]"
+  ["eeb2b2", :undef], # [SWIMMER] U+EADE -> "[水泳]"
+  ["eebe8e", "ee999b"], # [TRAIN] U+E4B5 -> U+E65B
+  ["ef83ac", "ee999c"], # [METRO] U+E5BC -> U+E65C
+  ["eebe89", "ee999d"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E4B0 -> U+E65D
+  ["eebe8a", "ee999e"], # [AUTOMOBILE] U+E4B1 -> U+E65E
+  ["eebe88", "ee99a0"], # [ONCOMING BUS] U+E4AF -> U+E660
+  ["eebe80", :undef], # [BUS STOP] U+E4A7 -> "[バス停]"
+  ["eeb195", "ee99a1"], # [SHIP] U+EA82 -> U+E661
+  ["eebe8c", "ee99a2"], # [AIRPLANE] U+E4B3 -> U+E662
+  ["eebe8d", "ee9aa3"], # [SAILBOAT] U+E4B4 -> U+E6A3
+  ["eeb5b1", :undef], # [STATION] U+EB6D -> "[駅]"
+  ["ef83b8", :undef], # [ROCKET] U+E5C8 -> "[ロケット]"
+  ["eebe8b", :undef], # [DELIVERY TRUCK] U+E4B2 -> "[トラック]"
+  ["eeb2b3", :undef], # [FIRE ENGINE] U+EADF -> "[消防車]"
+  ["eeb2b4", :undef], # [AMBULANCE] U+EAE0 -> "[救急車]"
+  ["eeb2b5", :undef], # [POLICE CAR] U+EAE1 -> "[パトカー]"
+  ["ef828e", "ee99ab"], # [FUEL PUMP] U+E571 -> U+E66B
+  ["eebdbe", "ee99ac"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E4A6 -> U+E66C
+  ["eebd82", "ee99ad"], # [HORIZONTAL TRAFFIC LIGHT] U+E46A -> U+E66D
+  ["eeb18a", :undef], # [CONSTRUCTION SIGN] U+E5D7 -> "[工事中]"
+  ["eeb5b7", :undef], # [POLICE CARS REVOLVING LIGHT] U+EB73 -> "[パトカー]"
+  ["eebe95", "ee9bb7"], # [HOT SPRINGS] U+E4BC -> U+E6F7
+  ["eeb183", :undef], # [TENT] U+E5D0 -> "[キャンプ]"
+  ["eebd85", :undef], # [FERRIS WHEEL] U+E46D -> "[観覧車]"
+  ["eeb2b6", :undef], # [ROLLER COASTER] U+EAE2 -> "[ジェットコースター]"
+  ["eeb586", "ee9d91"], # [FISHING POLE AND FISH] U+EB42 -> U+E751
+  ["eebf9c", "ee99b6"], # [MICROPHONE] U+E503 -> U+E676
+  ["eebfb0", "ee99b7"], # [MOVIE CAMERA] U+E517 -> U+E677
+  ["eebfa1", "ee99ba"], # [HEADPHONE] U+E508 -> U+E67A
+  ["ef82b9", "ee99bb"], # [ARTIST PALETTE] U+E59C -> U+E67B
+  ["eeb389", "ee99bc"], # [TOP HAT] U+EAF5 -> U+E67C
+  ["ef82bb", "ee99bd"], # [CIRCUS TENT] U+E59E -> U+E67D
+  ["eebdb6", "ee99be"], # [TICKET] U+E49E -> U+E67E
+  ["eebe97", "ee9aac"], # [CLAPPER BOARD] U+E4BE -> U+E6AC
+  ["ef82ba", :undef], # [PERFORMING ARTS] U+E59D -> "[演劇]"
+  ["eebe9f", "ee9a8b"], # [VIDEO GAME] U+E4C6 -> U+E68B
+  ["eeb184", :undef], # [MAHJONG TILE RED DRAGON] U+E5D1 -> "[麻雀]"
+  ["eebe9e", :undef], # [DIRECT HIT] U+E4C5 -> "[的中]"
+  ["eebd86", :undef], # [SLOT MACHINE] U+E46E -> "[777]"
+  ["eeb2b1", :undef], # [BILLIARDS] U+EADD -> "[ビリヤード]"
+  ["eebea1", :undef], # [GAME DIE] U+E4C8 -> "[サイコロ]"
+  ["eeb587", :undef], # [BOWLING] U+EB43 -> "[ボーリング]"
+  ["eeb5b2", :undef], # [FLOWER PLAYING CARDS] U+EB6E -> "[花札]"
+  ["eeb5b3", :undef], # [PLAYING CARD BLACK JOKER] U+EB6F -> "[ジョーカー]"
+  ["ef83ae", "ee9bb6"], # [MUSICAL NOTE] U+E5BE -> U+E6F6
+  ["eebf9e", "ee9bbf"], # [MULTIPLE MUSICAL NOTES] U+E505 -> U+E6FF
+  ["eebf9f", :undef], # [GUITAR] U+E506 -> "[ギター]"
+  ["eeb584", :undef], # [MUSICAL KEYBOARD] U+EB40 -> "[ピアノ]"
+  ["eeb2b0", :undef], # [TRUMPET] U+EADC -> "[トランペット]"
+  ["eebfa0", :undef], # [VIOLIN] U+E507 -> "[バイオリン]"
+  ["eeb2a0", "ee9bbf"], # [MUSICAL SCORE] U+EACC -> U+E6FF
+  ["eebfae", "ee9a81"], # [CAMERA] U+E515 -> U+E681
+  ["ef829b", "ee99b7"], # [VIDEO CAMERA] U+E57E -> U+E677
+  ["eebf9b", "ee9a8a"], # [TELEVISION] U+E502 -> U+E68A
+  ["ef83a9", :undef], # [RADIO] U+E5B9 -> "[ラジオ]"
+  ["ef829d", :undef], # [VIDEOCASSETTE] U+E580 -> "[ビデオ]"
+  ["eebf84", "ee9bb9"], # [KISS MARK] U+E4EB -> U+E6F9
+  ["eeb5bc", "ee9c97"], # [LOVE LETTER] U+EB78 -> U+E717
+  ["eebfad", "ee9c9b"], # [RING] U+E514 -> U+E71B
+  ["ef83ba", "ee9bb9"], # [KISS] U+E5CA -> U+E6F9
+  ["eeb1a8", :undef], # [BOUQUET] U+EA95 -> "[花束]"
+  ["eeb2ae", "ee9bad"], # [COUPLE WITH HEART] U+EADA -> U+E6ED
+  ["eeb196", :undef], # [NO ONE UNDER EIGHTEEN SYMBOL] U+EA83 -> "[18禁]"
+  ["ef81b4", "ee9cb1"], # [COPYRIGHT SIGN] U+E558 -> U+E731
+  ["ef81b5", "ee9cb6"], # [REGISTERED SIGN] U+E559 -> U+E736
+  ["ef81aa", "ee9cb2"], # [TRADE MARK SIGN] U+E54E -> U+E732
+  ["ef818f", :undef], # [INFORMATION SOURCE] U+E533 -> "[ｉ]"
+  ["eeb689", "ee9ba0"], # [HASH KEY] U+EB84 -> U+E6E0
+  ["eebfbb", "ee9ba2"], # [KEYCAP 1] U+E522 -> U+E6E2
+  ["eebfbc", "ee9ba3"], # [KEYCAP 2] U+E523 -> U+E6E3
+  ["ef8180", "ee9ba4"], # [KEYCAP 3] U+E524 -> U+E6E4
+  ["ef8181", "ee9ba5"], # [KEYCAP 4] U+E525 -> U+E6E5
+  ["ef8182", "ee9ba6"], # [KEYCAP 5] U+E526 -> U+E6E6
+  ["ef8183", "ee9ba7"], # [KEYCAP 6] U+E527 -> U+E6E7
+  ["ef8184", "ee9ba8"], # [KEYCAP 7] U+E528 -> U+E6E8
+  ["ef8185", "ee9ba9"], # [KEYCAP 8] U+E529 -> U+E6E9
+  ["ef8186", "ee9baa"], # [KEYCAP 9] U+E52A -> U+E6EA
+  ["ef8389", "ee9bab"], # [KEYCAP 0] U+E5AC -> U+E6EB
+  ["ef8187", :undef], # [KEYCAP TEN] U+E52B -> "[10]"
+  ["eeb197", :undef], # [ANTENNA WITH BARS] U+EA84 -> "[バリ3]"
+  ["eeb1a3", :undef], # [VIBRATION MODE] U+EA90 -> "[マナーモード]"
+  ["eeb1a4", :undef], # [MOBILE PHONE OFF] U+EA91 -> "[ケータイOFF]"
+  ["eebeaf", "ee99b3"], # [HAMBURGER] U+E4D6 -> U+E673
+  ["eebeae", "ee9d89"], # [RICE BALL] U+E4D5 -> U+E749
+  ["eebea9", "ee9d8a"], # [SHORTCAKE] U+E4D0 -> U+E74A
+  ["ef8391", "ee9d8c"], # [STEAMING BOWL] U+E5B4 -> U+E74C
+  ["eeb283", "ee9d8d"], # [BREAD] U+EAAF -> U+E74D
+  ["eebeaa", :undef], # [COOKING] U+E4D1 -> "[フライパン]"
+  ["eeb284", :undef], # [SOFT ICE CREAM] U+EAB0 -> "[ソフトクリーム]"
+  ["eeb285", :undef], # [FRENCH FRIES] U+EAB1 -> "[ポテト]"
+  ["eeb286", :undef], # [DANGO] U+EAB2 -> "[だんご]"
+  ["eeb287", :undef], # [RICE CRACKER] U+EAB3 -> "[せんべい]"
+  ["eeb288", "ee9d8c"], # [COOKED RICE] U+EAB4 -> U+E74C
+  ["eeb289", :undef], # [SPAGHETTI] U+EAB5 -> "[パスタ]"
+  ["eeb28a", :undef], # [CURRY AND RICE] U+EAB6 -> "[カレー]"
+  ["eeb28b", :undef], # [ODEN] U+EAB7 -> "[おでん]"
+  ["eeb28c", :undef], # [SUSHI] U+EAB8 -> "[すし]"
+  ["eeb291", :undef], # [BENTO BOX] U+EABD -> "[弁当]"
+  ["eeb292", :undef], # [POT OF FOOD] U+EABE -> "[鍋]"
+  ["eeb2be", :undef], # [SHAVED ICE] U+EAEA -> "[カキ氷]"
+  ["eebe9d", :undef], # [MEAT ON BONE] U+E4C4 -> "[肉]"
+  ["eebf86", "ee9983"], # [FISH CAKE WITH SWIRL DESIGN] U+E4ED -> U+E643
+  ["eeb3bb", :undef], # [ROASTED SWEET POTATO] U+EB3A -> "[やきいも]"
+  ["eeb3bc", :undef], # [SLICE OF PIZZA] U+EB3B -> "[ピザ]"
+  ["eeb580", :undef], # [POULTRY LEG] U+EB3C -> "[チキン]"
+  ["eeb58e", :undef], # [ICE CREAM] U+EB4A -> "[アイスクリーム]"
+  ["eeb58f", :undef], # [DOUGHNUT] U+EB4B -> "[ドーナツ]"
+  ["eeb590", :undef], # [COOKIE] U+EB4C -> "[クッキー]"
+  ["eeb591", :undef], # [CHOCOLATE BAR] U+EB4D -> "[チョコ]"
+  ["eeb592", :undef], # [CANDY] U+EB4E -> "[キャンディ]"
+  ["eeb593", :undef], # [LOLLIPOP] U+EB4F -> "[キャンディ]"
+  ["eeb59a", :undef], # [CUSTARD] U+EB56 -> "[プリン]"
+  ["eeb59d", :undef], # [HONEY POT] U+EB59 -> "[ハチミツ]"
+  ["eeb5b4", :undef], # [FRIED SHRIMP] U+EB70 -> "[エビフライ]"
+  ["eebe85", "ee99af"], # [FORK AND KNIFE] U+E4AC -> U+E66F
+  ["ef82b4", "ee99b0"], # [HOT BEVERAGE] U+E597 -> U+E670
+  ["eebe9b", "ee99b1"], # [COCKTAIL GLASS] U+E4C2 -> U+E671
+  ["eebe9c", "ee99b2"], # [BEER MUG] U+E4C3 -> U+E672
+  ["eeb282", "ee9c9e"], # [TEACUP WITHOUT HANDLE] U+EAAE -> U+E71E
+  ["eeb1aa", "ee9d8b"], # [SAKE BOTTLE AND CUP] U+EA97 -> U+E74B
+  ["eebe9a", "ee9d96"], # [WINE GLASS] U+E4C1 -> U+E756
+  ["eeb1ab", "ee99b2"], # [CLINKING BEER MUGS] U+EA98 -> U+E672
+  ["eeb582", "ee99b1"], # [TROPICAL DRINK] U+EB3E -> U+E671
+  ["ef81b1", "ee99b8"], # [NORTH EAST ARROW] U+E555 -> U+E678
+  ["ef81a9", "ee9a96"], # [SOUTH EAST ARROW] U+E54D -> U+E696
+  ["ef81a8", "ee9a97"], # [NORTH WEST ARROW] U+E54C -> U+E697
+  ["ef81b2", "ee9aa5"], # [SOUTH WEST ARROW] U+E556 -> U+E6A5
+  ["eeb3ae", "ee9bb5"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+EB2D -> U+E6F5
+  ["eeb3af", "ee9c80"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+EB2E -> U+E700
+  ["eeb5be", "ee9cbc"], # [LEFT RIGHT ARROW] U+EB7A -> U+E73C
+  ["eeb680", "ee9cbd"], # [UP DOWN ARROW] U+EB7B -> U+E73D
+  ["ef819b", :undef], # [UPWARDS BLACK ARROW] U+E53F -> "[↑]"
+  ["ef819c", :undef], # [DOWNWARDS BLACK ARROW] U+E540 -> "[↓]"
+  ["ef81ae", :undef], # [BLACK RIGHTWARDS ARROW] U+E552 -> "[→]"
+  ["ef81af", :undef], # [LEFTWARDS BLACK ARROW] U+E553 -> "[←]"
+  ["ef818a", :undef], # [BLACK RIGHT-POINTING TRIANGLE] U+E52E -> "[&gt;]"
+  ["ef8189", :undef], # [BLACK LEFT-POINTING TRIANGLE] U+E52D -> "[&lt;]"
+  ["ef818c", :undef], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E530 -> "[&gt;&gt;]"
+  ["ef818b", :undef], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E52F -> "[&lt;&lt;]"
+  ["ef81a1", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+E545 -> "▲"
+  ["ef81a0", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+E544 -> "▼"
+  ["ef81b6", :undef], # [UP-POINTING RED TRIANGLE] U+E55A -> "▲"
+  ["ef81b7", :undef], # [DOWN-POINTING RED TRIANGLE] U+E55B -> "▼"
+  ["ef819f", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+E543 -> "▲"
+  ["ef819e", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+E542 -> "▼"
+  ["eeb281", "ee9aa0"], # [HEAVY LARGE CIRCLE] U+EAAD -> U+E6A0
+  ["ef81ac", :undef], # [CROSS MARK] U+E550 -> "[×]"
+  ["ef81ad", :undef], # [NEGATIVE SQUARED CROSS MARK] U+E551 -> "[×]"
+  ["eebd9a", "ee9c82"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E482 -> U+E702
+  ["eeb3b0", "ee9c83"], # [EXCLAMATION QUESTION MARK] U+EB2F -> U+E703
+  ["eeb3b1", "ee9c84"], # [DOUBLE EXCLAMATION MARK] U+EB30 -> U+E704
+  ["eebd9b", :undef], # [BLACK QUESTION MARK ORNAMENT] U+E483 -> "[？]"
+  ["eeb3b2", "ee9c8a"], # [CURLY LOOP] U+EB31 -> U+E70A
+  ["ef82b2", "ee9bac"], # [HEAVY BLACK HEART] U+E595 -> U+E6EC
+  ["eeb5b9", "ee9bad"], # [BEATING HEART] U+EB75 -> U+E6ED
+  ["eebd8f", "ee9bae"], # [BROKEN HEART] U+E477 -> U+E6EE
+  ["eebd90", "ee9baf"], # [TWO HEARTS] U+E478 -> U+E6EF
+  ["eeb1b9", "ee9bac"], # [SPARKLING HEART] U+EAA6 -> U+E6EC
+  ["eebf83", "ee9bac"], # [HEART WITH ARROW] U+E4EA -> U+E6EC
+  ["eeb1ba", "ee9bac"], # [BLUE HEART] U+EAA7 -> U+E6EC
+  ["eeb1bb", "ee9bac"], # [GREEN HEART] U+EAA8 -> U+E6EC
+  ["eeb1bc", "ee9bac"], # [YELLOW HEART] U+EAA9 -> U+E6EC
+  ["eeb1bd", "ee9bac"], # [PURPLE HEART] U+EAAA -> U+E6EC
+  ["eeb598", "ee9bac"], # [HEART WITH RIBBON] U+EB54 -> U+E6EC
+  ["ef838c", "ee9bad"], # [REVOLVING HEARTS] U+E5AF -> U+E6ED
+  ["eeb1b8", "ee9a8d"], # [BLACK HEART SUIT] U+EAA5 -> U+E68D
+  ["ef82be", "ee9a8e"], # [BLACK SPADE SUIT] U+E5A1 -> U+E68E
+  ["ef82bf", "ee9a8f"], # [BLACK DIAMOND SUIT] U+E5A2 -> U+E68F
+  ["ef8380", "ee9a90"], # [BLACK CLUB SUIT] U+E5A3 -> U+E690
+  ["eebd95", "ee99bf"], # [SMOKING SYMBOL] U+E47D -> U+E67F
+  ["eebd96", "ee9a80"], # [NO SMOKING SYMBOL] U+E47E -> U+E680
+  ["eebd97", "ee9a9b"], # [WHEELCHAIR SYMBOL] U+E47F -> U+E69B
+  ["eeb3ad", "ee9b9e"], # [TRIANGULAR FLAG ON POST] U+EB2C -> U+E6DE
+  ["eebd99", "ee9cb7"], # [WARNING SIGN] U+E481 -> U+E737
+  ["eebd9c", "ee9caf"], # [NO ENTRY] U+E484 -> U+E72F
+  ["eeb5bd", "ee9cb5"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+EB79 -> U+E735
+  ["eebe87", "ee9c9d"], # [BICYCLE] U+E4AE -> U+E71D
+  ["eeb5b6", "ee9cb3"], # [PEDESTRIAN] U+EB72 -> U+E733
+  ["eeb18b", "ee9bb7"], # [BATH] U+E5D8 -> U+E6F7
+  ["eebdbd", "ee99ae"], # [RESTROOM] U+E4A5 -> U+E66E
+  ["ef819d", "ee9cb8"], # [NO ENTRY SIGN] U+E541 -> U+E738
+  ["ef81b3", :undef], # [HEAVY CHECK MARK] U+E557 -> "[チェックマーク]"
+  ["ef8388", "ee9b9b"], # [SQUARED CL] U+E5AB -> U+E6DB
+  ["eeb198", :undef], # [SQUARED COOL] U+EA85 -> "[COOL]"
+  ["ef8295", "ee9b97"], # [SQUARED FREE] U+E578 -> U+E6D7
+  ["eeb19b", "ee9b98"], # [SQUARED ID] U+EA88 -> U+E6D8
+  ["ef83a5", "ee9b9d"], # [SQUARED NEW] U+E5B5 -> U+E6DD
+  ["ef838a", "ee9c8b"], # [SQUARED OK] U+E5AD -> U+E70B
+  ["eebf81", :undef], # [SQUARED SOS] U+E4E8 -> "[SOS]"
+  ["eebfa8", :undef], # [SQUARED UP WITH EXCLAMATION MARK] U+E50F -> "[UP!]"
+  ["eeb185", :undef], # [SQUARED VS] U+E5D2 -> "[VS]"
+  ["eeb19a", :undef], # [SQUARED KATAKANA SA] U+EA87 -> "[サービス]"
+  ["eeb19d", "ee9cb9"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+EA8A -> U+E739
+  ["eeb19c", "ee9cbb"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+EA89 -> U+E73B
+  ["eeb199", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+EA86 -> "[割]"
+  ["eeb19e", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+EA8B -> "[指]"
+  ["eeb19f", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+EA8C -> "[営]"
+  ["eebf8a", "ee9cb4"], # [CIRCLED IDEOGRAPH SECRET] U+E4F1 -> U+E734
+  ["eeb1ac", :undef], # [CIRCLED IDEOGRAPH CONGRATULATION] U+EA99 -> "[祝]"
+  ["eebf90", :undef], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E4F7 -> "[得]"
+  ["ef8398", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+EB01 -> "[可]"
+  ["ef8198", :undef], # [HEAVY PLUS SIGN] U+E53C -> "[＋]"
+  ["ef8199", :undef], # [HEAVY MINUS SIGN] U+E53D -> "[－]"
+  ["ef81ab", :undef], # [HEAVY MULTIPLICATION X] U+E54F -> "[×]"
+  ["ef81b0", :undef], # [HEAVY DIVISION SIGN] U+E554 -> "[÷]"
+  ["eebd8e", "ee9bbb"], # [ELECTRIC LIGHT BULB] U+E476 -> U+E6FB
+  ["eebebe", "ee9bbc"], # [ANGER SYMBOL] U+E4E5 -> U+E6FC
+  ["eebd92", "ee9bbe"], # [BOMB] U+E47A -> U+E6FE
+  ["eebd8d", "ee9c81"], # [SLEEPING SYMBOL] U+E475 -> U+E701
+  ["ef838d", "ee9c85"], # [COLLISION SYMBOL] U+E5B0 -> U+E705
+  ["ef838e", "ee9c86"], # [SPLASHING SWEAT SYMBOL] U+E5B1 -> U+E706
+  ["eebebf", "ee9c87"], # [DROP OF WATER] U+E4E6 -> U+E707
+  ["eebf8d", "ee9c88"], # [DASH SYMBOL] U+E4F4 -> U+E708
+  ["eebf8e", :undef], # [PILE OF POO] U+E4F5 -> "[ウンチ]"
+  ["eebf82", :undef], # [FLEXED BICEPS] U+E4E9 -> "[力こぶ]"
+  ["eeb5a0", :undef], # [DIZZY SYMBOL] U+EB5C -> "[クラクラ]"
+  ["eebf96", :undef], # [SPEECH BALLOON] U+E4FD -> "[フキダシ]"
+  ["eeb1be", "ee9bba"], # [SPARKLES] U+EAAB -> U+E6FA
+  ["eebd91", "ee9bb8"], # [EIGHT POINTED BLACK STAR] U+E479 -> U+E6F8
+  ["ef819a", "ee9bb8"], # [EIGHT SPOKED ASTERISK] U+E53E -> U+E6F8
+  ["ef8196", "ee9a9c"], # [MEDIUM WHITE CIRCLE] U+E53A -> U+E69C
+  ["ef8197", "ee9a9c"], # [MEDIUM BLACK CIRCLE] U+E53B -> U+E69C
+  ["ef81a6", "ee9a9c"], # [LARGE RED CIRCLE] U+E54A -> U+E69C
+  ["ef81a7", "ee9a9c"], # [LARGE BLUE CIRCLE] U+E54B -> U+E69C
+  ["eebda3", :undef], # [WHITE MEDIUM STAR] U+E48B -> "[☆]"
+  ["ef81a4", :undef], # [WHITE LARGE SQUARE] U+E548 -> "■"
+  ["ef81a5", :undef], # [BLACK LARGE SQUARE] U+E549 -> "■"
+  ["ef818d", :undef], # [WHITE SMALL SQUARE] U+E531 -> "■"
+  ["ef818e", :undef], # [BLACK SMALL SQUARE] U+E532 -> "■"
+  ["ef8190", :undef], # [WHITE MEDIUM SMALL SQUARE] U+E534 -> "■"
+  ["ef8191", :undef], # [BLACK MEDIUM SMALL SQUARE] U+E535 -> "■"
+  ["ef8194", :undef], # [WHITE MEDIUM SQUARE] U+E538 -> "■"
+  ["ef8195", :undef], # [BLACK MEDIUM SQUARE] U+E539 -> "■"
+  ["ef81a2", :undef], # [LARGE ORANGE DIAMOND] U+E546 -> "◆"
+  ["ef81a3", :undef], # [LARGE BLUE DIAMOND] U+E547 -> "◆"
+  ["ef8192", :undef], # [SMALL ORANGE DIAMOND] U+E536 -> "◆"
+  ["ef8193", :undef], # [SMALL BLUE DIAMOND] U+E537 -> "◆"
+  ["eebd84", "ee9bba"], # [SPARKLE] U+E46C -> U+E6FA
+  ["eebf89", :undef], # [WHITE FLOWER] U+E4F0 -> "[花丸]"
+  ["eebf8b", :undef], # [HUNDRED POINTS SYMBOL] U+E4F2 -> "[100点]"
+  ["ef81b9", "ee9b9a"], # [LEFTWARDS ARROW WITH HOOK] U+E55D -> U+E6DA
+  ["ef81b8", :undef], # [RIGHTWARDS ARROW WITH HOOK] U+E55C -> "└→"
+  ["ef83a4", "ee9cb5"], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+EB0D -> U+E735
+  ["eebfaa", :undef], # [SPEAKER WITH THREE SOUND WAVES] U+E511 -> "[スピーカ]"
+  ["ef82a1", :undef], # [BATTERY] U+E584 -> "[電池]"
+  ["ef82a6", :undef], # [ELECTRIC PLUG] U+E589 -> "[コンセント]"
+  ["eebfb1", "ee9b9c"], # [LEFT-POINTING MAGNIFYING GLASS] U+E518 -> U+E6DC
+  ["ef839c", "ee9b9c"], # [RIGHT-POINTING MAGNIFYING GLASS] U+EB05 -> U+E6DC
+  ["eebfb5", "ee9b99"], # [LOCK] U+E51C -> U+E6D9
+  ["ef83a3", "ee9b99"], # [LOCK WITH INK PEN] U+EB0C -> U+E6D9
+  ["ef8393", "ee9b99"], # [CLOSED LOCK WITH KEY] U+EAFC -> U+E6D9
+  ["eebfb2", "ee9b99"], # [KEY] U+E519 -> U+E6D9
+  ["eebfab", "ee9c93"], # [BELL] U+E512 -> U+E713
+  ["ef8399", :undef], # [BALLOT BOX WITH CHECK] U+EB02 -> "[チェックマーク]"
+  ["ef839b", :undef], # [RADIO BUTTON] U+EB04 -> "[ラジオボタン]"
+  ["ef839e", :undef], # [BOOKMARK] U+EB07 -> "[ブックマーク]"
+  ["ef82a7", :undef], # [LINK SYMBOL] U+E58A -> "[リンク]"
+  ["ef839d", :undef], # [BACK WITH LEFTWARDS ARROW ABOVE] U+EB06 -> "[←BACK]"
+  ["ef82a9", :undef], # [EM SPACE] U+E58C -> U+3013 (GETA)
+  ["ef82aa", :undef], # [EN SPACE] U+E58D -> U+3013 (GETA)
+  ["ef82ab", :undef], # [FOUR-PER-EM SPACE] U+E58E -> U+3013 (GETA)
+  ["ef81ba", :undef], # [WHITE HEAVY CHECK MARK] U+E55E -> "[チェックマーク]"
+  ["eeb688", "ee9a93"], # [RAISED FIST] U+EB83 -> U+E693
+  ["ef8384", "ee9a95"], # [RAISED HAND] U+E5A7 -> U+E695
+  ["ef8383", "ee9a94"], # [VICTORY HAND] U+E5A6 -> U+E694
+  ["eebf8c", "ee9bbd"], # [FISTED HAND SIGN] U+E4F3 -> U+E6FD
+  ["eebf92", "ee9ca7"], # [THUMBS UP SIGN] U+E4F9 -> U+E727
+  ["eebf8f", :undef], # [WHITE UP POINTING INDEX] U+E4F6 -> "[人差し指]"
+  ["eeb1a0", :undef], # [WHITE UP POINTING BACKHAND INDEX] U+EA8D -> "[↑]"
+  ["eeb1a1", :undef], # [WHITE DOWN POINTING BACKHAND INDEX] U+EA8E -> "[↓]"
+  ["eebf98", :undef], # [WHITE LEFT POINTING BACKHAND INDEX] U+E4FF -> "[←]"
+  ["eebf99", :undef], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E500 -> "[→]"
+  ["eeb2aa", "ee9a95"], # [WAVING HAND SIGN] U+EAD6 -> U+E695
+  ["eeb2a7", :undef], # [CLAPPING HANDS SIGN] U+EAD3 -> "[拍手]"
+  ["eeb2a8", "ee9c8b"], # [OK HAND SIGN] U+EAD4 -> U+E70B
+  ["eeb2a9", "ee9c80"], # [THUMBS DOWN SIGN] U+EAD5 -> U+E700
+  ["ef8294", :undef], # [EMOJI COMPATIBILITY SYMBOL-37] U+E577 -> "[EZ]"
+  ["ef838f", :undef], # [EMOJI COMPATIBILITY SYMBOL-38] U+E5B2 -> "[ezplus]"
+  ["eeb1b0", :undef], # [EMOJI COMPATIBILITY SYMBOL-39] U+EA9D -> "[EZナビ]"
+  ["eeb5b8", :undef], # [EMOJI COMPATIBILITY SYMBOL-40] U+EB74 -> "[EZムービー]"
+  ["eeb686", :undef], # [EMOJI COMPATIBILITY SYMBOL-41] U+EB81 -> "[Cメール]"
+  ["eeb68e", :undef], # [EMOJI COMPATIBILITY SYMBOL-42] U+EB89 -> "[Java]"
+  ["eeb68f", :undef], # [EMOJI COMPATIBILITY SYMBOL-43] U+EB8A -> "[BREW]"
+  ["eeb690", :undef], # [EMOJI COMPATIBILITY SYMBOL-44] U+EB8B -> "[EZ着うた]"
+  ["eeb691", :undef], # [EMOJI COMPATIBILITY SYMBOL-45] U+EB8C -> "[EZナビ]"
+  ["eeb692", :undef], # [EMOJI COMPATIBILITY SYMBOL-46] U+EB8D -> "[WIN]"
+  ["eeb693", :undef], # [EMOJI COMPATIBILITY SYMBOL-47] U+EB8E -> "[プレミアム]"
+  ["ef8392", :undef], # [EMOJI COMPATIBILITY SYMBOL-48] U+EAFB -> "[オープンウェブ]"
+  ["ef82a3", :undef], # [EMOJI COMPATIBILITY SYMBOL-49] U+E586 -> "[PDC]"
+  ["ef8188", "ee9ba1"], # [EMOJI COMPATIBILITY SYMBOL-66] U+E52C -> U+E6E1
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-KDDI']['UTF8-SoftBank'] = [
+  # for documented codepoints
+  ["ee9288", "ee818a"], # [BLACK SUN WITH RAYS] U+E488 -> U+E04A
+  ["ee928d", "ee8189"], # [CLOUD] U+E48D -> U+E049
+  ["ee928c", "ee818b"], # [UMBRELLA WITH RAIN DROPS] U+E48C -> U+E04B
+  ["ee9285", "ee8188"], # [SNOWMAN WITHOUT SNOW] U+E485 -> U+E048
+  ["ee9287", "ee84bd"], # [HIGH VOLTAGE SIGN] U+E487 -> U+E13D
+  ["ee91a9", "ee9183"], # [CYCLONE] U+E469 -> U+E443
+  ["ee9698", :undef], # [FOGGY] U+E598 -> "[霧]"
+  ["eeaba8", "ee90bc"], # [CLOSED UMBRELLA] U+EAE8 -> U+E43C
+  ["eeabb1", "ee918b"], # [NIGHT WITH STARS] U+EAF1 -> U+E44B
+  ["eeabb4", "ee9189"], # [SUNRISE] U+EAF4 -> U+E449
+  ["ee979a", "ee8586"], # [CITYSCAPE AT DUSK] U+E5DA -> U+E146
+  ["eeabb2", "ee918c"], # [RAINBOW] U+EAF2 -> U+E44C
+  ["ee928a", :undef], # [SNOWFLAKE] U+E48A -> "[雪結晶]"
+  ["ee928e", "ee818aee8189"], # [SUN BEHIND CLOUD] U+E48E -> U+E04A U+E049
+  ["ee92bf", "ee918b"], # [BRIDGE AT NIGHT] U+E4BF -> U+E44B
+  ["eeadbc", "ee90be"], # [WATER WAVE] U+EB7C -> U+E43E
+  ["eead93", :undef], # [VOLCANO] U+EB53 -> "[火山]"
+  ["eead9f", "ee918b"], # [MILKY WAY] U+EB5F -> U+E44B
+  ["ee96b3", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+E5B3 -> "[地球]"
+  ["ee96a8", :undef], # [NEW MOON SYMBOL] U+E5A8 -> "●"
+  ["ee96a9", "ee818c"], # [WAXING GIBBOUS MOON SYMBOL] U+E5A9 -> U+E04C
+  ["ee96aa", "ee818c"], # [FIRST QUARTER MOON SYMBOL] U+E5AA -> U+E04C
+  ["ee9286", "ee818c"], # [CRESCENT MOON] U+E486 -> U+E04C
+  ["ee9289", "ee818c"], # [FIRST QUARTER MOON WITH FACE] U+E489 -> U+E04C
+  ["ee91a8", :undef], # [SHOOTING STAR] U+E468 -> "☆彡"
+  ["ee95ba", :undef], # [WATCH] U+E57A -> "[腕時計]"
+  ["ee95bb", :undef], # [HOURGLASS] U+E57B -> "[砂時計]"
+  ["ee9694", "ee80ad"], # [ALARM CLOCK] U+E594 -> U+E02D
+  ["ee91bc", :undef], # [HOURGLASS WITH FLOWING SAND] U+E47C -> "[砂時計]"
+  ["ee928f", "ee88bf"], # [ARIES] U+E48F -> U+E23F
+  ["ee9290", "ee8980"], # [TAURUS] U+E490 -> U+E240
+  ["ee9291", "ee8981"], # [GEMINI] U+E491 -> U+E241
+  ["ee9292", "ee8982"], # [CANCER] U+E492 -> U+E242
+  ["ee9293", "ee8983"], # [LEO] U+E493 -> U+E243
+  ["ee9294", "ee8984"], # [VIRGO] U+E494 -> U+E244
+  ["ee9295", "ee8985"], # [LIBRA] U+E495 -> U+E245
+  ["ee9296", "ee8986"], # [SCORPIUS] U+E496 -> U+E246
+  ["ee9297", "ee8987"], # [SAGITTARIUS] U+E497 -> U+E247
+  ["ee9298", "ee8988"], # [CAPRICORN] U+E498 -> U+E248
+  ["ee9299", "ee8989"], # [AQUARIUS] U+E499 -> U+E249
+  ["ee929a", "ee898a"], # [PISCES] U+E49A -> U+E24A
+  ["ee929b", "ee898b"], # [OPHIUCHUS] U+E49B -> U+E24B
+  ["ee9493", "ee8490"], # [FOUR LEAF CLOVER] U+E513 -> U+E110
+  ["ee93a4", "ee8c84"], # [TULIP] U+E4E4 -> U+E304
+  ["eeadbd", "ee8490"], # [SEEDLING] U+EB7D -> U+E110
+  ["ee938e", "ee8498"], # [MAPLE LEAF] U+E4CE -> U+E118
+  ["ee938a", "ee80b0"], # [CHERRY BLOSSOM] U+E4CA -> U+E030
+  ["ee96ba", "ee80b2"], # [ROSE] U+E5BA -> U+E032
+  ["ee978d", "ee8499"], # [FALLEN LEAF] U+E5CD -> U+E119
+  ["eeaa94", "ee8c83"], # [HIBISCUS] U+EA94 -> U+E303
+  ["ee93a3", "ee8c85"], # [SUNFLOWER] U+E4E3 -> U+E305
+  ["ee93a2", "ee8c87"], # [PALM TREE] U+E4E2 -> U+E307
+  ["eeaa96", "ee8c88"], # [CACTUS] U+EA96 -> U+E308
+  ["eeacb6", :undef], # [EAR OF MAIZE] U+EB36 -> "[とうもろこし]"
+  ["eeacb7", :undef], # [MUSHROOM] U+EB37 -> "[キノコ]"
+  ["eeacb8", :undef], # [CHESTNUT] U+EB38 -> "[栗]"
+  ["eead89", "ee8c85"], # [BLOSSOM] U+EB49 -> U+E305
+  ["eeae82", "ee8490"], # [HERB] U+EB82 -> U+E110
+  ["ee9392", :undef], # [CHERRIES] U+E4D2 -> "[さくらんぼ]"
+  ["eeacb5", :undef], # [BANANA] U+EB35 -> "[バナナ]"
+  ["eeaab9", "ee8d85"], # [RED APPLE] U+EAB9 -> U+E345
+  ["eeaaba", "ee8d86"], # [TANGERINE] U+EABA -> U+E346
+  ["ee9394", "ee8d87"], # [STRAWBERRY] U+E4D4 -> U+E347
+  ["ee938d", "ee8d88"], # [WATERMELON] U+E4CD -> U+E348
+  ["eeaabb", "ee8d89"], # [TOMATO] U+EABB -> U+E349
+  ["eeaabc", "ee8d8a"], # [AUBERGINE] U+EABC -> U+E34A
+  ["eeacb2", :undef], # [MELON] U+EB32 -> "[メロン]"
+  ["eeacb3", :undef], # [PINEAPPLE] U+EB33 -> "[パイナップル]"
+  ["eeacb4", :undef], # [GRAPES] U+EB34 -> "[ブドウ]"
+  ["eeacb9", :undef], # [PEACH] U+EB39 -> "[モモ]"
+  ["eead9a", "ee8d85"], # [GREEN APPLE] U+EB5A -> U+E345
+  ["ee96a4", "ee9099"], # [EYES] U+E5A4 -> U+E419
+  ["ee96a5", "ee909b"], # [EAR] U+E5A5 -> U+E41B
+  ["eeab90", "ee909a"], # [NOSE] U+EAD0 -> U+E41A
+  ["eeab91", "ee909c"], # [MOUTH] U+EAD1 -> U+E41C
+  ["eead87", "ee9089"], # [TONGUE] U+EB47 -> U+E409
+  ["ee9489", "ee8c9c"], # [LIPSTICK] U+E509 -> U+E31C
+  ["eeaaa0", "ee8c9d"], # [NAIL POLISH] U+EAA0 -> U+E31D
+  ["ee948b", "ee8c9e"], # [FACE MASSAGE] U+E50B -> U+E31E
+  ["eeaaa1", "ee8c9f"], # [HAIRCUT] U+EAA1 -> U+E31F
+  ["eeaaa2", "ee8ca0"], # [BARBER POLE] U+EAA2 -> U+E320
+  ["ee93bc", "ee8081"], # [BOY] U+E4FC -> U+E001
+  ["ee93ba", "ee8082"], # [GIRL] U+E4FA -> U+E002
+  ["ee9481", :undef], # [FAMILY] U+E501 -> "[家族]"
+  ["ee979d", "ee8592"], # [POLICE OFFICER] U+E5DD -> U+E152
+  ["eeab9b", "ee90a9"], # [WOMAN WITH BUNNY EARS] U+EADB -> U+E429
+  ["eeaba9", :undef], # [BRIDE WITH VEIL] U+EAE9 -> "[花嫁]"
+  ["eeac93", "ee9495"], # [WESTERN PERSON] U+EB13 -> U+E515
+  ["eeac94", "ee9496"], # [MAN WITH GUA PI MAO] U+EB14 -> U+E516
+  ["eeac95", "ee9497"], # [MAN WITH TURBAN] U+EB15 -> U+E517
+  ["eeac96", "ee9498"], # [OLDER MAN] U+EB16 -> U+E518
+  ["eeac97", "ee9499"], # [OLDER WOMAN] U+EB17 -> U+E519
+  ["eeac98", "ee949a"], # [BABY] U+EB18 -> U+E51A
+  ["eeac99", "ee949b"], # [CONSTRUCTION WORKER] U+EB19 -> U+E51B
+  ["eeac9a", "ee949c"], # [PRINCESS] U+EB1A -> U+E51C
+  ["eead84", :undef], # [JAPANESE OGRE] U+EB44 -> "[なまはげ]"
+  ["eead85", :undef], # [JAPANESE GOBLIN] U+EB45 -> "[天狗]"
+  ["ee938b", "ee849b"], # [GHOST] U+E4CB -> U+E11B
+  ["ee96bf", "ee818e"], # [BABY ANGEL] U+E5BF -> U+E04E
+  ["ee948e", "ee848c"], # [EXTRATERRESTRIAL ALIEN] U+E50E -> U+E10C
+  ["ee93ac", "ee84ab"], # [ALIEN MONSTER] U+E4EC -> U+E12B
+  ["ee93af", "ee849a"], # [IMP] U+E4EF -> U+E11A
+  ["ee93b8", "ee849c"], # [SKULL] U+E4F8 -> U+E11C
+  ["eeac9c", "ee949f"], # [DANCER] U+EB1C -> U+E51F
+  ["eeadbe", :undef], # [SNAIL] U+EB7E -> "[カタツムリ]"
+  ["eeaca2", "ee94ad"], # [SNAKE] U+EB22 -> U+E52D
+  ["eeaca3", "ee94ae"], # [CHICKEN] U+EB23 -> U+E52E
+  ["eeaca4", "ee94af"], # [BOAR] U+EB24 -> U+E52F
+  ["eeaca5", "ee94b0"], # [BACTRIAN CAMEL] U+EB25 -> U+E530
+  ["eeac9f", "ee94a6"], # [ELEPHANT] U+EB1F -> U+E526
+  ["eeaca0", "ee94a7"], # [KOALA] U+EB20 -> U+E527
+  ["ee9787", "ee848a"], # [OCTOPUS] U+E5C7 -> U+E10A
+  ["eeabac", "ee9181"], # [SPIRAL SHELL] U+EAEC -> U+E441
+  ["eeac9e", "ee94a5"], # [BUG] U+EB1E -> U+E525
+  ["ee939d", :undef], # [ANT] U+E4DD -> "[アリ]"
+  ["eead97", :undef], # [HONEYBEE] U+EB57 -> "[ミツバチ]"
+  ["eead98", :undef], # [LADY BEETLE] U+EB58 -> "[てんとう虫]"
+  ["eeac9d", "ee94a2"], # [TROPICAL FISH] U+EB1D -> U+E522
+  ["ee9393", "ee8099"], # [BLOWFISH] U+E4D3 -> U+E019
+  ["ee9794", :undef], # [TURTLE] U+E5D4 -> "[カメ]"
+  ["ee93a0", "ee94a3"], # [BABY CHICK] U+E4E0 -> U+E523
+  ["eeadb6", "ee94a3"], # [FRONT-FACING BABY CHICK] U+EB76 -> U+E523
+  ["ee979b", "ee94a3"], # [HATCHING CHICK] U+E5DB -> U+E523
+  ["ee939c", "ee8195"], # [PENGUIN] U+E4DC -> U+E055
+  ["ee939f", "ee8192"], # [POODLE] U+E4DF -> U+E052
+  ["eeac9b", "ee94a0"], # [DOLPHIN] U+EB1B -> U+E520
+  ["ee9782", "ee8193"], # [MOUSE FACE] U+E5C2 -> U+E053
+  ["ee9780", "ee8190"], # [TIGER FACE] U+E5C0 -> U+E050
+  ["ee939b", "ee818f"], # [CAT FACE] U+E4DB -> U+E04F
+  ["ee91b0", "ee8194"], # [SPOUTING WHALE] U+E470 -> U+E054
+  ["ee9398", "ee809a"], # [HORSE FACE] U+E4D8 -> U+E01A
+  ["ee9399", "ee8489"], # [MONKEY FACE] U+E4D9 -> U+E109
+  ["ee93a1", "ee8192"], # [DOG FACE] U+E4E1 -> U+E052
+  ["ee939e", "ee848b"], # [PIG FACE] U+E4DE -> U+E10B
+  ["ee9781", "ee8191"], # [BEAR FACE] U+E5C1 -> U+E051
+  ["eeaca1", "ee94ab"], # [COW FACE] U+EB21 -> U+E52B
+  ["ee9397", "ee94ac"], # [RABBIT FACE] U+E4D7 -> U+E52C
+  ["ee939a", "ee94b1"], # [FROG FACE] U+E4DA -> U+E531
+  ["ee93ae", "ee94b6"], # [PAW PRINTS] U+E4EE -> U+E536
+  ["eeacbf", :undef], # [DRAGON FACE] U+EB3F -> "[辰]"
+  ["eead86", :undef], # [PANDA FACE] U+EB46 -> "[パンダ]"
+  ["eead88", "ee848b"], # [PIG NOSE] U+EB48 -> U+E10B
+  ["ee91b2", "ee8199"], # [ANGRY FACE] U+E472 -> U+E059
+  ["eeada7", "ee9083"], # [ANGUISHED FACE] U+EB67 -> U+E403
+  ["eeab8a", "ee9090"], # [ASTONISHED FACE] U+EACA -> U+E410
+  ["ee96ae", "ee9086"], # [DIZZY FACE] U+E5AE -> U+E406
+  ["eeab8b", "ee908f"], # [EXASPERATED FACE] U+EACB -> U+E40F
+  ["eeab89", "ee908e"], # [EXPRESSIONLESS FACE] U+EAC9 -> U+E40E
+  ["ee9784", "ee8486"], # [FACE WITH HEART-SHAPED EYES] U+E5C4 -> U+E106
+  ["eeab81", "ee9084"], # [FACE WITH LOOK OF TRIUMPH] U+EAC1 -> U+E404
+  ["ee93a7", "ee8485"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E4E7 -> U+E105
+  ["eeab8f", "ee9098"], # [FACE THROWING A KISS] U+EACF -> U+E418
+  ["eeab8e", "ee9097"], # [FACE KISSING] U+EACE -> U+E417
+  ["eeab87", "ee908c"], # [FACE WITH MASK] U+EAC7 -> U+E40C
+  ["eeab88", "ee908d"], # [FLUSHED FACE] U+EAC8 -> U+E40D
+  ["ee91b1", "ee8197"], # [HAPPY FACE WITH OPEN MOUTH] U+E471 -> U+E057
+  ["eeae80", "ee9084"], # [HAPPY FACE WITH GRIN] U+EB80 -> U+E404
+  ["eeada4", "ee9092"], # [HAPPY AND CRYING FACE] U+EB64 -> U+E412
+  ["eeab8d", "ee8196"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+EACD -> U+E056
+  ["ee93bb", "ee9094"], # [WHITE SMILING FACE] U+E4FB -> U+E414
+  ["eeada9", "ee9093"], # [CRYING FACE] U+EB69 -> U+E413
+  ["ee91b3", "ee9091"], # [LOUDLY CRYING FACE] U+E473 -> U+E411
+  ["eeab86", "ee908b"], # [FEARFUL FACE] U+EAC6 -> U+E40B
+  ["eeab82", "ee9086"], # [PERSEVERING FACE] U+EAC2 -> U+E406
+  ["eead9d", "ee9096"], # [POUTING FACE] U+EB5D -> U+E416
+  ["eeab85", "ee908a"], # [RELIEVED FACE] U+EAC5 -> U+E40A
+  ["eeab83", "ee9087"], # [CONFOUNDED FACE] U+EAC3 -> U+E407
+  ["eeab80", "ee9083"], # [PENSIVE FACE] U+EAC0 -> U+E403
+  ["ee9785", "ee8487"], # [FACE SCREAMING IN FEAR] U+E5C5 -> U+E107
+  ["eeab84", "ee9088"], # [SLEEPY FACE] U+EAC4 -> U+E408
+  ["eeaabf", "ee9082"], # [SMIRKING FACE] U+EABF -> U+E402
+  ["ee9786", "ee8488"], # [FACE WITH COLD SWEAT] U+E5C6 -> U+E108
+  ["ee91b4", "ee9086"], # [TIRED FACE] U+E474 -> U+E406
+  ["ee9783", "ee9085"], # [WINKING FACE] U+E5C3 -> U+E405
+  ["eeada1", "ee8197"], # [CAT FACE WITH OPEN MOUTH] U+EB61 -> U+E057
+  ["eeadbf", "ee9084"], # [HAPPY CAT FACE WITH GRIN] U+EB7F -> U+E404
+  ["eeada3", "ee9092"], # [HAPPY AND CRYING CAT FACE] U+EB63 -> U+E412
+  ["eeada0", "ee9098"], # [CAT FACE KISSING] U+EB60 -> U+E418
+  ["eeada5", "ee8486"], # [CAT FACE WITH HEART-SHAPED EYES] U+EB65 -> U+E106
+  ["eeada8", "ee9093"], # [CRYING CAT FACE] U+EB68 -> U+E413
+  ["eead9e", "ee9096"], # [POUTING CAT FACE] U+EB5E -> U+E416
+  ["eeadaa", "ee9084"], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+EB6A -> U+E404
+  ["eeada6", "ee9083"], # [ANGUISHED CAT FACE] U+EB66 -> U+E403
+  ["eeab97", "ee90a3"], # [FACE WITH NO GOOD GESTURE] U+EAD7 -> U+E423
+  ["eeab98", "ee90a4"], # [FACE WITH OK GESTURE] U+EAD8 -> U+E424
+  ["eeab99", "ee90a6"], # [PERSON BOWING DEEPLY] U+EAD9 -> U+E426
+  ["eead90", :undef], # [SEE-NO-EVIL MONKEY] U+EB50 -> "(/_＼)"
+  ["eead91", :undef], # [SPEAK-NO-EVIL MONKEY] U+EB51 -> "(・×・)"
+  ["eead92", :undef], # [HEAR-NO-EVIL MONKEY] U+EB52 -> "|(・×・)|"
+  ["eeae85", "ee8092"], # [PERSON RAISING ONE HAND] U+EB85 -> U+E012
+  ["eeae86", "ee90a7"], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+EB86 -> U+E427
+  ["eeae87", "ee9083"], # [PERSON FROWNING] U+EB87 -> U+E403
+  ["eeae88", "ee9096"], # [PERSON WITH POUTING FACE] U+EB88 -> U+E416
+  ["eeab92", "ee909d"], # [PERSON WITH FOLDED HANDS] U+EAD2 -> U+E41D
+  ["ee92ab", "ee80b6"], # [HOUSE BUILDING] U+E4AB -> U+E036
+  ["eeac89", "ee80b6"], # [HOUSE WITH GARDEN] U+EB09 -> U+E036
+  ["ee92ad", "ee80b8"], # [OFFICE BUILDING] U+E4AD -> U+E038
+  ["ee979e", "ee8593"], # [JAPANESE POST OFFICE] U+E5DE -> U+E153
+  ["ee979f", "ee8595"], # [HOSPITAL] U+E5DF -> U+E155
+  ["ee92aa", "ee858d"], # [BANK] U+E4AA -> U+E14D
+  ["ee92a3", "ee8594"], # [AUTOMATED TELLER MACHINE] U+E4A3 -> U+E154
+  ["eeaa81", "ee8598"], # [HOTEL] U+EA81 -> U+E158
+  ["eeabb3", "ee9481"], # [LOVE HOTEL] U+EAF3 -> U+E501
+  ["ee92a4", "ee8596"], # [CONVENIENCE STORE] U+E4A4 -> U+E156
+  ["eeaa80", "ee8597"], # [SCHOOL] U+EA80 -> U+E157
+  ["ee96bb", "ee80b7"], # [CHURCH] U+E5BB -> U+E037
+  ["ee978f", "ee84a1"], # [FOUNTAIN] U+E5CF -> U+E121
+  ["eeabb6", "ee9484"], # [DEPARTMENT STORE] U+EAF6 -> U+E504
+  ["eeabb7", "ee9485"], # [JAPANESE CASTLE] U+EAF7 -> U+E505
+  ["eeabb8", "ee9486"], # [EUROPEAN CASTLE] U+EAF8 -> U+E506
+  ["eeabb9", "ee9488"], # [FACTORY] U+EAF9 -> U+E508
+  ["ee92a9", "ee8882"], # [ANCHOR] U+E4A9 -> U+E202
+  ["ee92bd", "ee8c8b"], # [IZAKAYA LANTERN] U+E4BD -> U+E30B
+  ["ee96bd", "ee80bb"], # [MOUNT FUJI] U+E5BD -> U+E03B
+  ["ee9380", "ee9489"], # [TOKYO TOWER] U+E4C0 -> U+E509
+  ["ee95b2", :undef], # [SILHOUETTE OF JAPAN] U+E572 -> "[日本地図]"
+  ["eeadac", :undef], # [MOYAI] U+EB6C -> "[モアイ]"
+  ["ee96b7", "ee8087"], # [MANS SHOE] U+E5B7 -> U+E007
+  ["eeacab", "ee8087"], # [ATHLETIC SHOE] U+EB2B -> U+E007
+  ["ee949a", "ee84be"], # [HIGH-HEELED SHOE] U+E51A -> U+E13E
+  ["eeaa9f", "ee8c9b"], # [WOMANS BOOTS] U+EA9F -> U+E31B
+  ["eeacaa", "ee94b6"], # [FOOTPRINTS] U+EB2A -> U+E536
+  ["ee93be", :undef], # [EYEGLASSES] U+E4FE -> "[メガネ]"
+  ["ee96b6", "ee8086"], # [T-SHIRT] U+E5B6 -> U+E006
+  ["eeadb7", :undef], # [JEANS] U+EB77 -> "[ジーンズ]"
+  ["ee9789", "ee848e"], # [CROWN] U+E5C9 -> U+E10E
+  ["eeaa93", "ee8c82"], # [NECKTIE] U+EA93 -> U+E302
+  ["eeaa9e", "ee8c98"], # [WOMANS HAT] U+EA9E -> U+E318
+  ["eeadab", "ee8c99"], # [DRESS] U+EB6B -> U+E319
+  ["eeaaa3", "ee8ca1"], # [KIMONO] U+EAA3 -> U+E321
+  ["eeaaa4", "ee8ca2"], # [BIKINI] U+EAA4 -> U+E322
+  ["ee948d", "ee8086"], # [WOMANS CLOTHES] U+E50D -> U+E006
+  ["ee9484", :undef], # [PURSE] U+E504 -> "[財布]"
+  ["ee929c", "ee8ca3"], # [HANDBAG] U+E49C -> U+E323
+  ["ee9387", "ee84af"], # [MONEY BAG] U+E4C7 -> U+E12F
+  ["ee979c", "ee858a"], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E5DC -> U+E14A
+  ["ee95b9", "ee84af"], # [HEAVY DOLLAR SIGN] U+E579 -> U+E12F
+  ["ee95bc", :undef], # [CREDIT CARD] U+E57C -> "[カード]"
+  ["ee95bd", :undef], # [BANKNOTE WITH YEN SIGN] U+E57D -> "￥"
+  ["ee9685", "ee84af"], # [BANKNOTE WITH DOLLAR SIGN] U+E585 -> U+E12F
+  ["eead9b", :undef], # [MONEY WITH WINGS] U+EB5B -> "[飛んでいくお金]"
+  ["eeac91", "ee9493"], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+EB11 -> U+E513
+  ["eeac8e", "ee948e"], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+EB0E -> U+E50E
+  ["ee9795", "ee9491"], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E5D5 -> U+E511
+  ["eeabba", "ee948d"], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+EAFA -> U+E50D
+  ["eeac90", "ee9490"], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+EB10 -> U+E510
+  ["eeac8f", "ee948f"], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+EB0F -> U+E50F
+  ["ee938c", "ee948b"], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E4CC -> U+E50B
+  ["eeac92", "ee9494"], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+EB12 -> U+E514
+  ["ee9796", "ee9492"], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E5D6 -> U+E512
+  ["ee95b3", "ee948c"], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E573 -> U+E50C
+  ["ee91bb", "ee849d"], # [FIRE] U+E47B -> U+E11D
+  ["ee9683", :undef], # [ELECTRIC TORCH] U+E583 -> "[懐中電灯]"
+  ["ee9687", :undef], # [WRENCH] U+E587 -> "[レンチ]"
+  ["ee978b", "ee8496"], # [HAMMER] U+E5CB -> U+E116
+  ["ee9681", :undef], # [NUT AND BOLT] U+E581 -> "[ネジ]"
+  ["ee95bf", :undef], # [HOCHO] U+E57F -> "[包丁]"
+  ["ee948a", "ee8493"], # [PISTOL] U+E50A -> U+E113
+  ["eeaa8f", "ee88be"], # [CRYSTAL BALL] U+EA8F -> U+E23E
+  ["ee9280", "ee8889"], # [JAPANESE SYMBOL FOR BEGINNER] U+E480 -> U+E209
+  ["ee9490", "ee84bb"], # [SYRINGE] U+E510 -> U+E13B
+  ["eeaa9a", "ee8c8f"], # [PILL] U+EA9A -> U+E30F
+  ["eeaca6", "ee94b2"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+EB26 -> U+E532
+  ["eeaca7", "ee94b3"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+EB27 -> U+E533
+  ["eeaca9", "ee94b4"], # [NEGATIVE SQUARED AB] U+EB29 -> U+E534
+  ["eeaca8", "ee94b5"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+EB28 -> U+E535
+  ["ee969f", "ee8c94"], # [RIBBON] U+E59F -> U+E314
+  ["ee938f", "ee8492"], # [WRAPPED PRESENT] U+E4CF -> U+E112
+  ["ee96a0", "ee8d8b"], # [BIRTHDAY CAKE] U+E5A0 -> U+E34B
+  ["ee9389", "ee80b3"], # [CHRISTMAS TREE] U+E4C9 -> U+E033
+  ["eeabb0", "ee9188"], # [FATHER CHRISTMAS] U+EAF0 -> U+E448
+  ["ee9799", "ee8583"], # [CROSSED FLAGS] U+E5D9 -> U+E143
+  ["ee978c", "ee8497"], # [FIREWORKS] U+E5CC -> U+E117
+  ["eeaa9b", "ee8c90"], # [BALLOON] U+EA9B -> U+E310
+  ["eeaa9c", "ee8c92"], # [PARTY POPPER] U+EA9C -> U+E312
+  ["eeaba3", "ee90b6"], # [PINE DECORATION] U+EAE3 -> U+E436
+  ["eeaba4", "ee90b8"], # [JAPANESE DOLLS] U+EAE4 -> U+E438
+  ["eeaba5", "ee90b9"], # [GRADUATION CAP] U+EAE5 -> U+E439
+  ["eeaba6", "ee90ba"], # [SCHOOL SATCHEL] U+EAE6 -> U+E43A
+  ["eeaba7", "ee90bb"], # [CARP STREAMER] U+EAE7 -> U+E43B
+  ["eeabab", "ee9180"], # [FIREWORK SPARKLER] U+EAEB -> U+E440
+  ["eeabad", "ee9182"], # [WIND CHIME] U+EAED -> U+E442
+  ["eeabae", "ee9185"], # [JACK-O-LANTERN] U+EAEE -> U+E445
+  ["ee91af", :undef], # [CONFETTI BALL] U+E46F -> "[オメデトウ]"
+  ["eeacbd", :undef], # [TANABATA TREE] U+EB3D -> "[七夕]"
+  ["eeabaf", "ee9186"], # [MOON VIEWING CEREMONY] U+EAEF -> U+E446
+  ["ee969b", :undef], # [PAGER] U+E59B -> "[ポケベル]"
+  ["ee9696", "ee8089"], # [BLACK TELEPHONE] U+E596 -> U+E009
+  ["ee949e", "ee8089"], # [TELEPHONE RECEIVER] U+E51E -> U+E009
+  ["ee9688", "ee808a"], # [MOBILE PHONE] U+E588 -> U+E00A
+  ["eeac88", "ee8484"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+EB08 -> U+E104
+  ["eeaa92", "ee8c81"], # [MEMO] U+EA92 -> U+E301
+  ["ee94a0", "ee808b"], # [FAX MACHINE] U+E520 -> U+E00B
+  ["ee94a1", "ee8483"], # [ENVELOPE] U+E521 -> U+E103
+  ["ee9691", "ee8483"], # [INCOMING ENVELOPE] U+E591 -> U+E103
+  ["eeada2", "ee8483"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+EB62 -> U+E103
+  ["ee949b", "ee8481"], # [CLOSED MAILBOX WITH LOWERED FLAG] U+E51B -> U+E101
+  ["eeac8a", "ee8481"], # [CLOSED MAILBOX WITH RAISED FLAG] U+EB0A -> U+E101
+  ["ee968b", :undef], # [NEWSPAPER] U+E58B -> "[新聞]"
+  ["ee92a8", "ee858b"], # [SATELLITE ANTENNA] U+E4A8 -> U+E14B
+  ["ee9692", :undef], # [OUTBOX TRAY] U+E592 -> "[送信BOX]"
+  ["ee9693", :undef], # [INBOX TRAY] U+E593 -> "[受信BOX]"
+  ["ee949f", "ee8492"], # [PACKAGE] U+E51F -> U+E112
+  ["eeadb1", "ee8483"], # [E-MAIL SYMBOL] U+EB71 -> U+E103
+  ["eeabbd", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+EAFD -> "[ABCD]"
+  ["eeabbe", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+EAFE -> "[abcd]"
+  ["eeabbf", :undef], # [INPUT SYMBOL FOR NUMBERS] U+EAFF -> "[1234]"
+  ["eeac80", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+EB00 -> "[記号]"
+  ["eead95", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+EB55 -> "[ABC]"
+  ["eeac83", :undef], # [BLACK NIB] U+EB03 -> "[ペン]"
+  ["ee96b8", "ee808c"], # [PERSONAL COMPUTER] U+E5B8 -> U+E00C
+  ["ee92a1", "ee8c81"], # [PENCIL] U+E4A1 -> U+E301
+  ["ee92a0", :undef], # [PAPERCLIP] U+E4A0 -> "[クリップ]"
+  ["ee978e", "ee849e"], # [BRIEFCASE] U+E5CE -> U+E11E
+  ["ee9682", "ee8c96"], # [MINIDISC] U+E582 -> U+E316
+  ["ee95a2", "ee8c96"], # [FLOPPY DISK] U+E562 -> U+E316
+  ["ee948c", "ee84a6"], # [OPTICAL DISC] U+E50C -> U+E126
+  ["ee9496", "ee8c93"], # [BLACK SCISSORS] U+E516 -> U+E313
+  ["ee95a0", :undef], # [ROUND PUSHPIN] U+E560 -> "[画びょう]"
+  ["ee95a1", "ee8c81"], # [PAGE WITH CURL] U+E561 -> U+E301
+  ["ee95a9", "ee8c81"], # [PAGE FACING UP] U+E569 -> U+E301
+  ["ee95a3", :undef], # [CALENDAR] U+E563 -> "[カレンダー]"
+  ["ee968f", :undef], # [FILE FOLDER] U+E58F -> "[フォルダ]"
+  ["ee9690", :undef], # [OPEN FILE FOLDER] U+E590 -> "[フォルダ]"
+  ["ee95ab", "ee8588"], # [NOTEBOOK] U+E56B -> U+E148
+  ["ee929f", "ee8588"], # [OPEN BOOK] U+E49F -> U+E148
+  ["ee929d", "ee8588"], # [NOTEBOOK WITH DECORATIVE COVER] U+E49D -> U+E148
+  ["ee95a8", "ee8588"], # [CLOSED BOOK] U+E568 -> U+E148
+  ["ee95a5", "ee8588"], # [GREEN BOOK] U+E565 -> U+E148
+  ["ee95a6", "ee8588"], # [BLUE BOOK] U+E566 -> U+E148
+  ["ee95a7", "ee8588"], # [ORANGE BOOK] U+E567 -> U+E148
+  ["ee95af", "ee8588"], # [BOOKS] U+E56F -> U+E148
+  ["ee949d", :undef], # [NAME BADGE] U+E51D -> "[名札]"
+  ["ee959f", :undef], # [SCROLL] U+E55F -> "[スクロール]"
+  ["ee95a4", "ee8c81"], # [CLIPBOARD] U+E564 -> U+E301
+  ["ee95aa", :undef], # [TEAR-OFF CALENDAR] U+E56A -> "[カレンダー]"
+  ["ee95b4", "ee858a"], # [BAR CHART] U+E574 -> U+E14A
+  ["ee95b5", "ee858a"], # [CHART WITH UPWARDS TREND] U+E575 -> U+E14A
+  ["ee95b6", :undef], # [CHART WITH DOWNWARDS TREND] U+E576 -> "[グラフ]"
+  ["ee95ac", "ee8588"], # [CARD INDEX] U+E56C -> U+E148
+  ["ee95ad", :undef], # [PUSHPIN] U+E56D -> "[画びょう]"
+  ["ee95ae", "ee8588"], # [LEDGER] U+E56E -> U+E148
+  ["ee95b0", :undef], # [STRAIGHT RULER] U+E570 -> "[定規]"
+  ["ee92a2", :undef], # [TRIANGULAR RULER] U+E4A2 -> "[三角定規]"
+  ["eeac8b", "ee8c81"], # [BOOKMARK TABS] U+EB0B -> U+E301
+  ["ee92ba", "ee8096"], # [BASEBALL] U+E4BA -> U+E016
+  ["ee9699", "ee8094"], # [FLAG IN HOLE] U+E599 -> U+E014
+  ["ee92b7", "ee8095"], # [TENNIS RACQUET AND BALL] U+E4B7 -> U+E015
+  ["ee92b6", "ee8098"], # [SOCCER BALL] U+E4B6 -> U+E018
+  ["eeaaac", "ee8093"], # [SKI AND SKI BOOT] U+EAAC -> U+E013
+  ["ee969a", "ee90aa"], # [BASKETBALL AND HOOP] U+E59A -> U+E42A
+  ["ee92b9", "ee84b2"], # [CHEQUERED FLAG] U+E4B9 -> U+E132
+  ["ee92b8", :undef], # [SNOWBOARDER] U+E4B8 -> "[スノボ]"
+  ["ee91ab", "ee8495"], # [RUNNER] U+E46B -> U+E115
+  ["eead81", "ee8097"], # [SURFER] U+EB41 -> U+E017
+  ["ee9793", "ee84b1"], # [TROPHY] U+E5D3 -> U+E131
+  ["ee92bb", "ee90ab"], # [AMERICAN FOOTBALL] U+E4BB -> U+E42B
+  ["eeab9e", "ee90ad"], # [SWIMMER] U+EADE -> U+E42D
+  ["ee92b5", "ee809e"], # [TRAIN] U+E4B5 -> U+E01E
+  ["ee96bc", "ee90b4"], # [METRO] U+E5BC -> U+E434
+  ["ee92b0", "ee809f"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E4B0 -> U+E01F
+  ["ee92b1", "ee809b"], # [AUTOMOBILE] U+E4B1 -> U+E01B
+  ["ee92af", "ee8599"], # [ONCOMING BUS] U+E4AF -> U+E159
+  ["ee92a7", "ee8590"], # [BUS STOP] U+E4A7 -> U+E150
+  ["eeaa82", "ee8882"], # [SHIP] U+EA82 -> U+E202
+  ["ee92b3", "ee809d"], # [AIRPLANE] U+E4B3 -> U+E01D
+  ["ee92b4", "ee809c"], # [SAILBOAT] U+E4B4 -> U+E01C
+  ["eeadad", "ee80b9"], # [STATION] U+EB6D -> U+E039
+  ["ee9788", "ee848d"], # [ROCKET] U+E5C8 -> U+E10D
+  ["ee92b2", "ee90af"], # [DELIVERY TRUCK] U+E4B2 -> U+E42F
+  ["eeab9f", "ee90b0"], # [FIRE ENGINE] U+EADF -> U+E430
+  ["eeaba0", "ee90b1"], # [AMBULANCE] U+EAE0 -> U+E431
+  ["eeaba1", "ee90b2"], # [POLICE CAR] U+EAE1 -> U+E432
+  ["ee95b1", "ee80ba"], # [FUEL PUMP] U+E571 -> U+E03A
+  ["ee92a6", "ee858f"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E4A6 -> U+E14F
+  ["ee91aa", "ee858e"], # [HORIZONTAL TRAFFIC LIGHT] U+E46A -> U+E14E
+  ["ee9797", "ee84b7"], # [CONSTRUCTION SIGN] U+E5D7 -> U+E137
+  ["eeadb3", "ee90b2"], # [POLICE CARS REVOLVING LIGHT] U+EB73 -> U+E432
+  ["ee92bc", "ee84a3"], # [HOT SPRINGS] U+E4BC -> U+E123
+  ["ee9790", "ee84a2"], # [TENT] U+E5D0 -> U+E122
+  ["ee91ad", "ee84a4"], # [FERRIS WHEEL] U+E46D -> U+E124
+  ["eeaba2", "ee90b3"], # [ROLLER COASTER] U+EAE2 -> U+E433
+  ["eead82", "ee8099"], # [FISHING POLE AND FISH] U+EB42 -> U+E019
+  ["ee9483", "ee80bc"], # [MICROPHONE] U+E503 -> U+E03C
+  ["ee9497", "ee80bd"], # [MOVIE CAMERA] U+E517 -> U+E03D
+  ["ee9488", "ee8c8a"], # [HEADPHONE] U+E508 -> U+E30A
+  ["ee969c", "ee9482"], # [ARTIST PALETTE] U+E59C -> U+E502
+  ["eeabb5", "ee9483"], # [TOP HAT] U+EAF5 -> U+E503
+  ["ee969e", :undef], # [CIRCUS TENT] U+E59E -> "[イベント]"
+  ["ee929e", "ee84a5"], # [TICKET] U+E49E -> U+E125
+  ["ee92be", "ee8ca4"], # [CLAPPER BOARD] U+E4BE -> U+E324
+  ["ee969d", "ee9483"], # [PERFORMING ARTS] U+E59D -> U+E503
+  ["ee9386", :undef], # [VIDEO GAME] U+E4C6 -> "[ゲーム]"
+  ["ee9791", "ee84ad"], # [MAHJONG TILE RED DRAGON] U+E5D1 -> U+E12D
+  ["ee9385", "ee84b0"], # [DIRECT HIT] U+E4C5 -> U+E130
+  ["ee91ae", "ee84b3"], # [SLOT MACHINE] U+E46E -> U+E133
+  ["eeab9d", "ee90ac"], # [BILLIARDS] U+EADD -> U+E42C
+  ["ee9388", :undef], # [GAME DIE] U+E4C8 -> "[サイコロ]"
+  ["eead83", :undef], # [BOWLING] U+EB43 -> "[ボーリング]"
+  ["eeadae", :undef], # [FLOWER PLAYING CARDS] U+EB6E -> "[花札]"
+  ["eeadaf", :undef], # [PLAYING CARD BLACK JOKER] U+EB6F -> "[ジョーカー]"
+  ["ee96be", "ee80be"], # [MUSICAL NOTE] U+E5BE -> U+E03E
+  ["ee9485", "ee8ca6"], # [MULTIPLE MUSICAL NOTES] U+E505 -> U+E326
+  ["ee9486", "ee8181"], # [GUITAR] U+E506 -> U+E041
+  ["eead80", :undef], # [MUSICAL KEYBOARD] U+EB40 -> "[ピアノ]"
+  ["eeab9c", "ee8182"], # [TRUMPET] U+EADC -> U+E042
+  ["ee9487", :undef], # [VIOLIN] U+E507 -> "[バイオリン]"
+  ["eeab8c", "ee8ca6"], # [MUSICAL SCORE] U+EACC -> U+E326
+  ["ee9495", "ee8088"], # [CAMERA] U+E515 -> U+E008
+  ["ee95be", "ee80bd"], # [VIDEO CAMERA] U+E57E -> U+E03D
+  ["ee9482", "ee84aa"], # [TELEVISION] U+E502 -> U+E12A
+  ["ee96b9", "ee84a8"], # [RADIO] U+E5B9 -> U+E128
+  ["ee9680", "ee84a9"], # [VIDEOCASSETTE] U+E580 -> U+E129
+  ["ee93ab", "ee8083"], # [KISS MARK] U+E4EB -> U+E003
+  ["eeadb8", "ee8483ee8ca8"], # [LOVE LETTER] U+EB78 -> U+E103 U+E328
+  ["ee9494", "ee80b4"], # [RING] U+E514 -> U+E034
+  ["ee978a", "ee8491"], # [KISS] U+E5CA -> U+E111
+  ["eeaa95", "ee8c86"], # [BOUQUET] U+EA95 -> U+E306
+  ["eeab9a", "ee90a5"], # [COUPLE WITH HEART] U+EADA -> U+E425
+  ["eeaa83", "ee8887"], # [NO ONE UNDER EIGHTEEN SYMBOL] U+EA83 -> U+E207
+  ["ee9598", "ee898e"], # [COPYRIGHT SIGN] U+E558 -> U+E24E
+  ["ee9599", "ee898f"], # [REGISTERED SIGN] U+E559 -> U+E24F
+  ["ee958e", "ee94b7"], # [TRADE MARK SIGN] U+E54E -> U+E537
+  ["ee94b3", :undef], # [INFORMATION SOURCE] U+E533 -> "[ｉ]"
+  ["eeae84", "ee8890"], # [HASH KEY] U+EB84 -> U+E210
+  ["ee94a2", "ee889c"], # [KEYCAP 1] U+E522 -> U+E21C
+  ["ee94a3", "ee889d"], # [KEYCAP 2] U+E523 -> U+E21D
+  ["ee94a4", "ee889e"], # [KEYCAP 3] U+E524 -> U+E21E
+  ["ee94a5", "ee889f"], # [KEYCAP 4] U+E525 -> U+E21F
+  ["ee94a6", "ee88a0"], # [KEYCAP 5] U+E526 -> U+E220
+  ["ee94a7", "ee88a1"], # [KEYCAP 6] U+E527 -> U+E221
+  ["ee94a8", "ee88a2"], # [KEYCAP 7] U+E528 -> U+E222
+  ["ee94a9", "ee88a3"], # [KEYCAP 8] U+E529 -> U+E223
+  ["ee94aa", "ee88a4"], # [KEYCAP 9] U+E52A -> U+E224
+  ["ee96ac", "ee88a5"], # [KEYCAP 0] U+E5AC -> U+E225
+  ["ee94ab", :undef], # [KEYCAP TEN] U+E52B -> "[10]"
+  ["eeaa84", "ee888b"], # [ANTENNA WITH BARS] U+EA84 -> U+E20B
+  ["eeaa90", "ee8990"], # [VIBRATION MODE] U+EA90 -> U+E250
+  ["eeaa91", "ee8991"], # [MOBILE PHONE OFF] U+EA91 -> U+E251
+  ["ee9396", "ee84a0"], # [HAMBURGER] U+E4D6 -> U+E120
+  ["ee9395", "ee8d82"], # [RICE BALL] U+E4D5 -> U+E342
+  ["ee9390", "ee8186"], # [SHORTCAKE] U+E4D0 -> U+E046
+  ["ee96b4", "ee8d80"], # [STEAMING BOWL] U+E5B4 -> U+E340
+  ["eeaaaf", "ee8cb9"], # [BREAD] U+EAAF -> U+E339
+  ["ee9391", "ee8587"], # [COOKING] U+E4D1 -> U+E147
+  ["eeaab0", "ee8cba"], # [SOFT ICE CREAM] U+EAB0 -> U+E33A
+  ["eeaab1", "ee8cbb"], # [FRENCH FRIES] U+EAB1 -> U+E33B
+  ["eeaab2", "ee8cbc"], # [DANGO] U+EAB2 -> U+E33C
+  ["eeaab3", "ee8cbd"], # [RICE CRACKER] U+EAB3 -> U+E33D
+  ["eeaab4", "ee8cbe"], # [COOKED RICE] U+EAB4 -> U+E33E
+  ["eeaab5", "ee8cbf"], # [SPAGHETTI] U+EAB5 -> U+E33F
+  ["eeaab6", "ee8d81"], # [CURRY AND RICE] U+EAB6 -> U+E341
+  ["eeaab7", "ee8d83"], # [ODEN] U+EAB7 -> U+E343
+  ["eeaab8", "ee8d84"], # [SUSHI] U+EAB8 -> U+E344
+  ["eeaabd", "ee8d8c"], # [BENTO BOX] U+EABD -> U+E34C
+  ["eeaabe", "ee8d8d"], # [POT OF FOOD] U+EABE -> U+E34D
+  ["eeabaa", "ee90bf"], # [SHAVED ICE] U+EAEA -> U+E43F
+  ["ee9384", :undef], # [MEAT ON BONE] U+E4C4 -> "[肉]"
+  ["ee93ad", :undef], # [FISH CAKE WITH SWIRL DESIGN] U+E4ED -> "[なると]"
+  ["eeacba", :undef], # [ROASTED SWEET POTATO] U+EB3A -> "[やきいも]"
+  ["eeacbb", :undef], # [SLICE OF PIZZA] U+EB3B -> "[ピザ]"
+  ["eeacbc", :undef], # [POULTRY LEG] U+EB3C -> "[チキン]"
+  ["eead8a", :undef], # [ICE CREAM] U+EB4A -> "[アイスクリーム]"
+  ["eead8b", :undef], # [DOUGHNUT] U+EB4B -> "[ドーナツ]"
+  ["eead8c", :undef], # [COOKIE] U+EB4C -> "[クッキー]"
+  ["eead8d", :undef], # [CHOCOLATE BAR] U+EB4D -> "[チョコ]"
+  ["eead8e", :undef], # [CANDY] U+EB4E -> "[キャンディ]"
+  ["eead8f", :undef], # [LOLLIPOP] U+EB4F -> "[キャンディ]"
+  ["eead96", :undef], # [CUSTARD] U+EB56 -> "[プリン]"
+  ["eead99", :undef], # [HONEY POT] U+EB59 -> "[ハチミツ]"
+  ["eeadb0", :undef], # [FRIED SHRIMP] U+EB70 -> "[エビフライ]"
+  ["ee92ac", "ee8183"], # [FORK AND KNIFE] U+E4AC -> U+E043
+  ["ee9697", "ee8185"], # [HOT BEVERAGE] U+E597 -> U+E045
+  ["ee9382", "ee8184"], # [COCKTAIL GLASS] U+E4C2 -> U+E044
+  ["ee9383", "ee8187"], # [BEER MUG] U+E4C3 -> U+E047
+  ["eeaaae", "ee8cb8"], # [TEACUP WITHOUT HANDLE] U+EAAE -> U+E338
+  ["eeaa97", "ee8c8b"], # [SAKE BOTTLE AND CUP] U+EA97 -> U+E30B
+  ["ee9381", "ee8184"], # [WINE GLASS] U+E4C1 -> U+E044
+  ["eeaa98", "ee8c8c"], # [CLINKING BEER MUGS] U+EA98 -> U+E30C
+  ["eeacbe", "ee8184"], # [TROPICAL DRINK] U+EB3E -> U+E044
+  ["ee9595", "ee88b6"], # [NORTH EAST ARROW] U+E555 -> U+E236
+  ["ee958d", "ee88b8"], # [SOUTH EAST ARROW] U+E54D -> U+E238
+  ["ee958c", "ee88b7"], # [NORTH WEST ARROW] U+E54C -> U+E237
+  ["ee9596", "ee88b9"], # [SOUTH WEST ARROW] U+E556 -> U+E239
+  ["eeacad", "ee88b6"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+EB2D -> U+E236
+  ["eeacae", "ee88b8"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+EB2E -> U+E238
+  ["eeadba", :undef], # [LEFT RIGHT ARROW] U+EB7A -> "⇔"
+  ["eeadbb", :undef], # [UP DOWN ARROW] U+EB7B -> "↑↓"
+  ["ee94bf", "ee88b2"], # [UPWARDS BLACK ARROW] U+E53F -> U+E232
+  ["ee9580", "ee88b3"], # [DOWNWARDS BLACK ARROW] U+E540 -> U+E233
+  ["ee9592", "ee88b4"], # [BLACK RIGHTWARDS ARROW] U+E552 -> U+E234
+  ["ee9593", "ee88b5"], # [LEFTWARDS BLACK ARROW] U+E553 -> U+E235
+  ["ee94ae", "ee88ba"], # [BLACK RIGHT-POINTING TRIANGLE] U+E52E -> U+E23A
+  ["ee94ad", "ee88bb"], # [BLACK LEFT-POINTING TRIANGLE] U+E52D -> U+E23B
+  ["ee94b0", "ee88bc"], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E530 -> U+E23C
+  ["ee94af", "ee88bd"], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E52F -> U+E23D
+  ["ee9585", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+E545 -> "▲"
+  ["ee9584", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+E544 -> "▼"
+  ["ee959a", :undef], # [UP-POINTING RED TRIANGLE] U+E55A -> "▲"
+  ["ee959b", :undef], # [DOWN-POINTING RED TRIANGLE] U+E55B -> "▼"
+  ["ee9583", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+E543 -> "▲"
+  ["ee9582", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+E542 -> "▼"
+  ["eeaaad", "ee8cb2"], # [HEAVY LARGE CIRCLE] U+EAAD -> U+E332
+  ["ee9590", "ee8cb3"], # [CROSS MARK] U+E550 -> U+E333
+  ["ee9591", "ee8cb3"], # [NEGATIVE SQUARED CROSS MARK] U+E551 -> U+E333
+  ["ee9282", "ee80a1"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E482 -> U+E021
+  ["eeacaf", :undef], # [EXCLAMATION QUESTION MARK] U+EB2F -> "！？"
+  ["eeacb0", :undef], # [DOUBLE EXCLAMATION MARK] U+EB30 -> "！！"
+  ["ee9283", "ee80a0"], # [BLACK QUESTION MARK ORNAMENT] U+E483 -> U+E020
+  ["eeacb1", :undef], # [CURLY LOOP] U+EB31 -> "～"
+  ["ee9695", "ee80a2"], # [HEAVY BLACK HEART] U+E595 -> U+E022
+  ["eeadb5", "ee8ca7"], # [BEATING HEART] U+EB75 -> U+E327
+  ["ee91b7", "ee80a3"], # [BROKEN HEART] U+E477 -> U+E023
+  ["ee91b8", "ee8ca7"], # [TWO HEARTS] U+E478 -> U+E327
+  ["eeaaa6", "ee8ca7"], # [SPARKLING HEART] U+EAA6 -> U+E327
+  ["ee93aa", "ee8ca9"], # [HEART WITH ARROW] U+E4EA -> U+E329
+  ["eeaaa7", "ee8caa"], # [BLUE HEART] U+EAA7 -> U+E32A
+  ["eeaaa8", "ee8cab"], # [GREEN HEART] U+EAA8 -> U+E32B
+  ["eeaaa9", "ee8cac"], # [YELLOW HEART] U+EAA9 -> U+E32C
+  ["eeaaaa", "ee8cad"], # [PURPLE HEART] U+EAAA -> U+E32D
+  ["eead94", "ee90b7"], # [HEART WITH RIBBON] U+EB54 -> U+E437
+  ["ee96af", "ee8ca7"], # [REVOLVING HEARTS] U+E5AF -> U+E327
+  ["eeaaa5", "ee888c"], # [BLACK HEART SUIT] U+EAA5 -> U+E20C
+  ["ee96a1", "ee888e"], # [BLACK SPADE SUIT] U+E5A1 -> U+E20E
+  ["ee96a2", "ee888d"], # [BLACK DIAMOND SUIT] U+E5A2 -> U+E20D
+  ["ee96a3", "ee888f"], # [BLACK CLUB SUIT] U+E5A3 -> U+E20F
+  ["ee91bd", "ee8c8e"], # [SMOKING SYMBOL] U+E47D -> U+E30E
+  ["ee91be", "ee8888"], # [NO SMOKING SYMBOL] U+E47E -> U+E208
+  ["ee91bf", "ee888a"], # [WHEELCHAIR SYMBOL] U+E47F -> U+E20A
+  ["eeacac", :undef], # [TRIANGULAR FLAG ON POST] U+EB2C -> "[旗]"
+  ["ee9281", "ee8992"], # [WARNING SIGN] U+E481 -> U+E252
+  ["ee9284", "ee84b7"], # [NO ENTRY] U+E484 -> U+E137
+  ["eeadb9", :undef], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+EB79 -> "↑↓"
+  ["ee92ae", "ee84b6"], # [BICYCLE] U+E4AE -> U+E136
+  ["eeadb2", "ee8881"], # [PEDESTRIAN] U+EB72 -> U+E201
+  ["ee9798", "ee84bf"], # [BATH] U+E5D8 -> U+E13F
+  ["ee92a5", "ee8591"], # [RESTROOM] U+E4A5 -> U+E151
+  ["ee9581", :undef], # [NO ENTRY SIGN] U+E541 -> "[禁止]"
+  ["ee9597", :undef], # [HEAVY CHECK MARK] U+E557 -> "[チェックマーク]"
+  ["ee96ab", :undef], # [SQUARED CL] U+E5AB -> "[CL]"
+  ["eeaa85", "ee8894"], # [SQUARED COOL] U+EA85 -> U+E214
+  ["ee95b8", :undef], # [SQUARED FREE] U+E578 -> "[FREE]"
+  ["eeaa88", "ee88a9"], # [SQUARED ID] U+EA88 -> U+E229
+  ["ee96b5", "ee8892"], # [SQUARED NEW] U+E5B5 -> U+E212
+  ["ee96ad", "ee898d"], # [SQUARED OK] U+E5AD -> U+E24D
+  ["ee93a8", :undef], # [SQUARED SOS] U+E4E8 -> "[SOS]"
+  ["ee948f", "ee8893"], # [SQUARED UP WITH EXCLAMATION MARK] U+E50F -> U+E213
+  ["ee9792", "ee84ae"], # [SQUARED VS] U+E5D2 -> U+E12E
+  ["eeaa87", "ee88a8"], # [SQUARED KATAKANA SA] U+EA87 -> U+E228
+  ["eeaa8a", "ee88ab"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+EA8A -> U+E22B
+  ["eeaa89", "ee88aa"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+EA89 -> U+E22A
+  ["eeaa86", "ee88a7"], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+EA86 -> U+E227
+  ["eeaa8b", "ee88ac"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+EA8B -> U+E22C
+  ["eeaa8c", "ee88ad"], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+EA8C -> U+E22D
+  ["ee93b1", "ee8c95"], # [CIRCLED IDEOGRAPH SECRET] U+E4F1 -> U+E315
+  ["eeaa99", "ee8c8d"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+EA99 -> U+E30D
+  ["ee93b7", "ee88a6"], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E4F7 -> U+E226
+  ["eeac81", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+EB01 -> "[可]"
+  ["ee94bc", :undef], # [HEAVY PLUS SIGN] U+E53C -> "[＋]"
+  ["ee94bd", :undef], # [HEAVY MINUS SIGN] U+E53D -> "[－]"
+  ["ee958f", "ee8cb3"], # [HEAVY MULTIPLICATION X] U+E54F -> U+E333
+  ["ee9594", :undef], # [HEAVY DIVISION SIGN] U+E554 -> "[÷]"
+  ["ee91b6", "ee848f"], # [ELECTRIC LIGHT BULB] U+E476 -> U+E10F
+  ["ee93a5", "ee8cb4"], # [ANGER SYMBOL] U+E4E5 -> U+E334
+  ["ee91ba", "ee8c91"], # [BOMB] U+E47A -> U+E311
+  ["ee91b5", "ee84bc"], # [SLEEPING SYMBOL] U+E475 -> U+E13C
+  ["ee96b0", :undef], # [COLLISION SYMBOL] U+E5B0 -> "[ドンッ]"
+  ["ee96b1", "ee8cb1"], # [SPLASHING SWEAT SYMBOL] U+E5B1 -> U+E331
+  ["ee93a6", "ee8cb1"], # [DROP OF WATER] U+E4E6 -> U+E331
+  ["ee93b4", "ee8cb0"], # [DASH SYMBOL] U+E4F4 -> U+E330
+  ["ee93b5", "ee819a"], # [PILE OF POO] U+E4F5 -> U+E05A
+  ["ee93a9", "ee858c"], # [FLEXED BICEPS] U+E4E9 -> U+E14C
+  ["eead9c", "ee9087"], # [DIZZY SYMBOL] U+EB5C -> U+E407
+  ["ee93bd", :undef], # [SPEECH BALLOON] U+E4FD -> "[フキダシ]"
+  ["eeaaab", "ee8cae"], # [SPARKLES] U+EAAB -> U+E32E
+  ["ee91b9", "ee8885"], # [EIGHT POINTED BLACK STAR] U+E479 -> U+E205
+  ["ee94be", "ee8886"], # [EIGHT SPOKED ASTERISK] U+E53E -> U+E206
+  ["ee94ba", "ee8899"], # [MEDIUM WHITE CIRCLE] U+E53A -> U+E219
+  ["ee94bb", "ee8899"], # [MEDIUM BLACK CIRCLE] U+E53B -> U+E219
+  ["ee958a", "ee8899"], # [LARGE RED CIRCLE] U+E54A -> U+E219
+  ["ee958b", "ee889a"], # [LARGE BLUE CIRCLE] U+E54B -> U+E21A
+  ["ee928b", "ee8caf"], # [WHITE MEDIUM STAR] U+E48B -> U+E32F
+  ["ee9588", "ee889b"], # [WHITE LARGE SQUARE] U+E548 -> U+E21B
+  ["ee9589", "ee889a"], # [BLACK LARGE SQUARE] U+E549 -> U+E21A
+  ["ee94b1", "ee889b"], # [WHITE SMALL SQUARE] U+E531 -> U+E21B
+  ["ee94b2", "ee889a"], # [BLACK SMALL SQUARE] U+E532 -> U+E21A
+  ["ee94b4", "ee889b"], # [WHITE MEDIUM SMALL SQUARE] U+E534 -> U+E21B
+  ["ee94b5", "ee889a"], # [BLACK MEDIUM SMALL SQUARE] U+E535 -> U+E21A
+  ["ee94b8", "ee889b"], # [WHITE MEDIUM SQUARE] U+E538 -> U+E21B
+  ["ee94b9", "ee889a"], # [BLACK MEDIUM SQUARE] U+E539 -> U+E21A
+  ["ee9586", "ee889b"], # [LARGE ORANGE DIAMOND] U+E546 -> U+E21B
+  ["ee9587", "ee889b"], # [LARGE BLUE DIAMOND] U+E547 -> U+E21B
+  ["ee94b6", "ee889b"], # [SMALL ORANGE DIAMOND] U+E536 -> U+E21B
+  ["ee94b7", "ee889b"], # [SMALL BLUE DIAMOND] U+E537 -> U+E21B
+  ["ee91ac", "ee8cae"], # [SPARKLE] U+E46C -> U+E32E
+  ["ee93b0", :undef], # [WHITE FLOWER] U+E4F0 -> "[花丸]"
+  ["ee93b2", :undef], # [HUNDRED POINTS SYMBOL] U+E4F2 -> "[100点]"
+  ["ee959d", :undef], # [LEFTWARDS ARROW WITH HOOK] U+E55D -> "←┘"
+  ["ee959c", :undef], # [RIGHTWARDS ARROW WITH HOOK] U+E55C -> "└→"
+  ["eeac8d", :undef], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+EB0D -> "↑↓"
+  ["ee9491", "ee8581"], # [SPEAKER WITH THREE SOUND WAVES] U+E511 -> U+E141
+  ["ee9684", :undef], # [BATTERY] U+E584 -> "[電池]"
+  ["ee9689", :undef], # [ELECTRIC PLUG] U+E589 -> "[コンセント]"
+  ["ee9498", "ee8494"], # [LEFT-POINTING MAGNIFYING GLASS] U+E518 -> U+E114
+  ["eeac85", "ee8494"], # [RIGHT-POINTING MAGNIFYING GLASS] U+EB05 -> U+E114
+  ["ee949c", "ee8584"], # [LOCK] U+E51C -> U+E144
+  ["eeac8c", "ee8584"], # [LOCK WITH INK PEN] U+EB0C -> U+E144
+  ["eeabbc", "ee8584"], # [CLOSED LOCK WITH KEY] U+EAFC -> U+E144
+  ["ee9499", "ee80bf"], # [KEY] U+E519 -> U+E03F
+  ["ee9492", "ee8ca5"], # [BELL] U+E512 -> U+E325
+  ["eeac82", :undef], # [BALLOT BOX WITH CHECK] U+EB02 -> "[チェックマーク]"
+  ["eeac84", :undef], # [RADIO BUTTON] U+EB04 -> "[ラジオボタン]"
+  ["eeac87", :undef], # [BOOKMARK] U+EB07 -> "[ブックマーク]"
+  ["ee968a", :undef], # [LINK SYMBOL] U+E58A -> "[リンク]"
+  ["eeac86", "ee88b5"], # [BACK WITH LEFTWARDS ARROW ABOVE] U+EB06 -> U+E235
+  ["ee968c", :undef], # [EM SPACE] U+E58C -> U+3013 (GETA)
+  ["ee968d", :undef], # [EN SPACE] U+E58D -> U+3013 (GETA)
+  ["ee968e", :undef], # [FOUR-PER-EM SPACE] U+E58E -> U+3013 (GETA)
+  ["ee959e", :undef], # [WHITE HEAVY CHECK MARK] U+E55E -> "[チェックマーク]"
+  ["eeae83", "ee8090"], # [RAISED FIST] U+EB83 -> U+E010
+  ["ee96a7", "ee8092"], # [RAISED HAND] U+E5A7 -> U+E012
+  ["ee96a6", "ee8091"], # [VICTORY HAND] U+E5A6 -> U+E011
+  ["ee93b3", "ee808d"], # [FISTED HAND SIGN] U+E4F3 -> U+E00D
+  ["ee93b9", "ee808e"], # [THUMBS UP SIGN] U+E4F9 -> U+E00E
+  ["ee93b6", "ee808f"], # [WHITE UP POINTING INDEX] U+E4F6 -> U+E00F
+  ["eeaa8d", "ee88ae"], # [WHITE UP POINTING BACKHAND INDEX] U+EA8D -> U+E22E
+  ["eeaa8e", "ee88af"], # [WHITE DOWN POINTING BACKHAND INDEX] U+EA8E -> U+E22F
+  ["ee93bf", "ee88b0"], # [WHITE LEFT POINTING BACKHAND INDEX] U+E4FF -> U+E230
+  ["ee9480", "ee88b1"], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E500 -> U+E231
+  ["eeab96", "ee909e"], # [WAVING HAND SIGN] U+EAD6 -> U+E41E
+  ["eeab93", "ee909f"], # [CLAPPING HANDS SIGN] U+EAD3 -> U+E41F
+  ["eeab94", "ee90a0"], # [OK HAND SIGN] U+EAD4 -> U+E420
+  ["eeab95", "ee90a1"], # [THUMBS DOWN SIGN] U+EAD5 -> U+E421
+  ["ee95b7", :undef], # [EMOJI COMPATIBILITY SYMBOL-37] U+E577 -> "[EZ]"
+  ["ee96b2", :undef], # [EMOJI COMPATIBILITY SYMBOL-38] U+E5B2 -> "[ezplus]"
+  ["eeaa9d", :undef], # [EMOJI COMPATIBILITY SYMBOL-39] U+EA9D -> "[EZナビ]"
+  ["eeadb4", :undef], # [EMOJI COMPATIBILITY SYMBOL-40] U+EB74 -> "[EZムービー]"
+  ["eeae81", :undef], # [EMOJI COMPATIBILITY SYMBOL-41] U+EB81 -> "[Cメール]"
+  ["eeae89", :undef], # [EMOJI COMPATIBILITY SYMBOL-42] U+EB89 -> "[Java]"
+  ["eeae8a", :undef], # [EMOJI COMPATIBILITY SYMBOL-43] U+EB8A -> "[BREW]"
+  ["eeae8b", :undef], # [EMOJI COMPATIBILITY SYMBOL-44] U+EB8B -> "[EZ着うた]"
+  ["eeae8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-45] U+EB8C -> "[EZナビ]"
+  ["eeae8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-46] U+EB8D -> "[WIN]"
+  ["eeae8e", :undef], # [EMOJI COMPATIBILITY SYMBOL-47] U+EB8E -> "[プレミアム]"
+  ["eeabbb", :undef], # [EMOJI COMPATIBILITY SYMBOL-48] U+EAFB -> "[オープンウェブ]"
+  ["ee9686", :undef], # [EMOJI COMPATIBILITY SYMBOL-49] U+E586 -> "[PDC]"
+  ["ee94ac", :undef], # [EMOJI COMPATIBILITY SYMBOL-66] U+E52C -> "[Q]"
+  # for undocumented codepoints
+  ["eebda0", "ee818a"], # [BLACK SUN WITH RAYS] U+E488 -> U+E04A
+  ["eebda5", "ee8189"], # [CLOUD] U+E48D -> U+E049
+  ["eebda4", "ee818b"], # [UMBRELLA WITH RAIN DROPS] U+E48C -> U+E04B
+  ["eebd9d", "ee8188"], # [SNOWMAN WITHOUT SNOW] U+E485 -> U+E048
+  ["eebd9f", "ee84bd"], # [HIGH VOLTAGE SIGN] U+E487 -> U+E13D
+  ["eebd81", "ee9183"], # [CYCLONE] U+E469 -> U+E443
+  ["ef82b5", :undef], # [FOGGY] U+E598 -> "[霧]"
+  ["eeb2bc", "ee90bc"], # [CLOSED UMBRELLA] U+EAE8 -> U+E43C
+  ["eeb385", "ee918b"], # [NIGHT WITH STARS] U+EAF1 -> U+E44B
+  ["eeb388", "ee9189"], # [SUNRISE] U+EAF4 -> U+E449
+  ["eeb18d", "ee8586"], # [CITYSCAPE AT DUSK] U+E5DA -> U+E146
+  ["eeb386", "ee918c"], # [RAINBOW] U+EAF2 -> U+E44C
+  ["eebda2", :undef], # [SNOWFLAKE] U+E48A -> "[雪結晶]"
+  ["eebda6", "ee818aee8189"], # [SUN BEHIND CLOUD] U+E48E -> U+E04A U+E049
+  ["eebe98", "ee918b"], # [BRIDGE AT NIGHT] U+E4BF -> U+E44B
+  ["eeb681", "ee90be"], # [WATER WAVE] U+EB7C -> U+E43E
+  ["eeb597", :undef], # [VOLCANO] U+EB53 -> "[火山]"
+  ["eeb5a3", "ee918b"], # [MILKY WAY] U+EB5F -> U+E44B
+  ["ef8390", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+E5B3 -> "[地球]"
+  ["ef8385", :undef], # [NEW MOON SYMBOL] U+E5A8 -> "●"
+  ["ef8386", "ee818c"], # [WAXING GIBBOUS MOON SYMBOL] U+E5A9 -> U+E04C
+  ["ef8387", "ee818c"], # [FIRST QUARTER MOON SYMBOL] U+E5AA -> U+E04C
+  ["eebd9e", "ee818c"], # [CRESCENT MOON] U+E486 -> U+E04C
+  ["eebda1", "ee818c"], # [FIRST QUARTER MOON WITH FACE] U+E489 -> U+E04C
+  ["eebd80", :undef], # [SHOOTING STAR] U+E468 -> "☆彡"
+  ["ef8297", :undef], # [WATCH] U+E57A -> "[腕時計]"
+  ["ef8298", :undef], # [HOURGLASS] U+E57B -> "[砂時計]"
+  ["ef82b1", "ee80ad"], # [ALARM CLOCK] U+E594 -> U+E02D
+  ["eebd94", :undef], # [HOURGLASS WITH FLOWING SAND] U+E47C -> "[砂時計]"
+  ["eebda7", "ee88bf"], # [ARIES] U+E48F -> U+E23F
+  ["eebda8", "ee8980"], # [TAURUS] U+E490 -> U+E240
+  ["eebda9", "ee8981"], # [GEMINI] U+E491 -> U+E241
+  ["eebdaa", "ee8982"], # [CANCER] U+E492 -> U+E242
+  ["eebdab", "ee8983"], # [LEO] U+E493 -> U+E243
+  ["eebdac", "ee8984"], # [VIRGO] U+E494 -> U+E244
+  ["eebdad", "ee8985"], # [LIBRA] U+E495 -> U+E245
+  ["eebdae", "ee8986"], # [SCORPIUS] U+E496 -> U+E246
+  ["eebdaf", "ee8987"], # [SAGITTARIUS] U+E497 -> U+E247
+  ["eebdb0", "ee8988"], # [CAPRICORN] U+E498 -> U+E248
+  ["eebdb1", "ee8989"], # [AQUARIUS] U+E499 -> U+E249
+  ["eebdb2", "ee898a"], # [PISCES] U+E49A -> U+E24A
+  ["eebdb3", "ee898b"], # [OPHIUCHUS] U+E49B -> U+E24B
+  ["eebfac", "ee8490"], # [FOUR LEAF CLOVER] U+E513 -> U+E110
+  ["eebebd", "ee8c84"], # [TULIP] U+E4E4 -> U+E304
+  ["eeb682", "ee8490"], # [SEEDLING] U+EB7D -> U+E110
+  ["eebea7", "ee8498"], # [MAPLE LEAF] U+E4CE -> U+E118
+  ["eebea3", "ee80b0"], # [CHERRY BLOSSOM] U+E4CA -> U+E030
+  ["ef83aa", "ee80b2"], # [ROSE] U+E5BA -> U+E032
+  ["eeb180", "ee8499"], # [FALLEN LEAF] U+E5CD -> U+E119
+  ["eeb1a7", "ee8c83"], # [HIBISCUS] U+EA94 -> U+E303
+  ["eebebc", "ee8c85"], # [SUNFLOWER] U+E4E3 -> U+E305
+  ["eebebb", "ee8c87"], # [PALM TREE] U+E4E2 -> U+E307
+  ["eeb1a9", "ee8c88"], # [CACTUS] U+EA96 -> U+E308
+  ["eeb3b7", :undef], # [EAR OF MAIZE] U+EB36 -> "[とうもろこし]"
+  ["eeb3b8", :undef], # [MUSHROOM] U+EB37 -> "[キノコ]"
+  ["eeb3b9", :undef], # [CHESTNUT] U+EB38 -> "[栗]"
+  ["eeb58d", "ee8c85"], # [BLOSSOM] U+EB49 -> U+E305
+  ["eeb687", "ee8490"], # [HERB] U+EB82 -> U+E110
+  ["eebeab", :undef], # [CHERRIES] U+E4D2 -> "[さくらんぼ]"
+  ["eeb3b6", :undef], # [BANANA] U+EB35 -> "[バナナ]"
+  ["eeb28d", "ee8d85"], # [RED APPLE] U+EAB9 -> U+E345
+  ["eeb28e", "ee8d86"], # [TANGERINE] U+EABA -> U+E346
+  ["eebead", "ee8d87"], # [STRAWBERRY] U+E4D4 -> U+E347
+  ["eebea6", "ee8d88"], # [WATERMELON] U+E4CD -> U+E348
+  ["eeb28f", "ee8d89"], # [TOMATO] U+EABB -> U+E349
+  ["eeb290", "ee8d8a"], # [AUBERGINE] U+EABC -> U+E34A
+  ["eeb3b3", :undef], # [MELON] U+EB32 -> "[メロン]"
+  ["eeb3b4", :undef], # [PINEAPPLE] U+EB33 -> "[パイナップル]"
+  ["eeb3b5", :undef], # [GRAPES] U+EB34 -> "[ブドウ]"
+  ["eeb3ba", :undef], # [PEACH] U+EB39 -> "[モモ]"
+  ["eeb59e", "ee8d85"], # [GREEN APPLE] U+EB5A -> U+E345
+  ["ef8381", "ee9099"], # [EYES] U+E5A4 -> U+E419
+  ["ef8382", "ee909b"], # [EAR] U+E5A5 -> U+E41B
+  ["eeb2a4", "ee909a"], # [NOSE] U+EAD0 -> U+E41A
+  ["eeb2a5", "ee909c"], # [MOUTH] U+EAD1 -> U+E41C
+  ["eeb58b", "ee9089"], # [TONGUE] U+EB47 -> U+E409
+  ["eebfa2", "ee8c9c"], # [LIPSTICK] U+E509 -> U+E31C
+  ["eeb1b3", "ee8c9d"], # [NAIL POLISH] U+EAA0 -> U+E31D
+  ["eebfa4", "ee8c9e"], # [FACE MASSAGE] U+E50B -> U+E31E
+  ["eeb1b4", "ee8c9f"], # [HAIRCUT] U+EAA1 -> U+E31F
+  ["eeb1b5", "ee8ca0"], # [BARBER POLE] U+EAA2 -> U+E320
+  ["eebf95", "ee8081"], # [BOY] U+E4FC -> U+E001
+  ["eebf93", "ee8082"], # [GIRL] U+E4FA -> U+E002
+  ["eebf9a", :undef], # [FAMILY] U+E501 -> "[家族]"
+  ["eeb190", "ee8592"], # [POLICE OFFICER] U+E5DD -> U+E152
+  ["eeb2af", "ee90a9"], # [WOMAN WITH BUNNY EARS] U+EADB -> U+E429
+  ["eeb2bd", :undef], # [BRIDE WITH VEIL] U+EAE9 -> "[花嫁]"
+  ["eeb394", "ee9495"], # [WESTERN PERSON] U+EB13 -> U+E515
+  ["eeb395", "ee9496"], # [MAN WITH GUA PI MAO] U+EB14 -> U+E516
+  ["eeb396", "ee9497"], # [MAN WITH TURBAN] U+EB15 -> U+E517
+  ["eeb397", "ee9498"], # [OLDER MAN] U+EB16 -> U+E518
+  ["eeb398", "ee9499"], # [OLDER WOMAN] U+EB17 -> U+E519
+  ["eeb399", "ee949a"], # [BABY] U+EB18 -> U+E51A
+  ["eeb39a", "ee949b"], # [CONSTRUCTION WORKER] U+EB19 -> U+E51B
+  ["eeb39b", "ee949c"], # [PRINCESS] U+EB1A -> U+E51C
+  ["eeb588", :undef], # [JAPANESE OGRE] U+EB44 -> "[なまはげ]"
+  ["eeb589", :undef], # [JAPANESE GOBLIN] U+EB45 -> "[天狗]"
+  ["eebea4", "ee849b"], # [GHOST] U+E4CB -> U+E11B
+  ["ef83af", "ee818e"], # [BABY ANGEL] U+E5BF -> U+E04E
+  ["eebfa7", "ee848c"], # [EXTRATERRESTRIAL ALIEN] U+E50E -> U+E10C
+  ["eebf85", "ee84ab"], # [ALIEN MONSTER] U+E4EC -> U+E12B
+  ["eebf88", "ee849a"], # [IMP] U+E4EF -> U+E11A
+  ["eebf91", "ee849c"], # [SKULL] U+E4F8 -> U+E11C
+  ["eeb39d", "ee949f"], # [DANCER] U+EB1C -> U+E51F
+  ["eeb683", :undef], # [SNAIL] U+EB7E -> "[カタツムリ]"
+  ["eeb3a3", "ee94ad"], # [SNAKE] U+EB22 -> U+E52D
+  ["eeb3a4", "ee94ae"], # [CHICKEN] U+EB23 -> U+E52E
+  ["eeb3a5", "ee94af"], # [BOAR] U+EB24 -> U+E52F
+  ["eeb3a6", "ee94b0"], # [BACTRIAN CAMEL] U+EB25 -> U+E530
+  ["eeb3a0", "ee94a6"], # [ELEPHANT] U+EB1F -> U+E526
+  ["eeb3a1", "ee94a7"], # [KOALA] U+EB20 -> U+E527
+  ["ef83b7", "ee848a"], # [OCTOPUS] U+E5C7 -> U+E10A
+  ["eeb380", "ee9181"], # [SPIRAL SHELL] U+EAEC -> U+E441
+  ["eeb39f", "ee94a5"], # [BUG] U+EB1E -> U+E525
+  ["eebeb6", :undef], # [ANT] U+E4DD -> "[アリ]"
+  ["eeb59b", :undef], # [HONEYBEE] U+EB57 -> "[ミツバチ]"
+  ["eeb59c", :undef], # [LADY BEETLE] U+EB58 -> "[てんとう虫]"
+  ["eeb39e", "ee94a2"], # [TROPICAL FISH] U+EB1D -> U+E522
+  ["eebeac", "ee8099"], # [BLOWFISH] U+E4D3 -> U+E019
+  ["eeb187", :undef], # [TURTLE] U+E5D4 -> "[カメ]"
+  ["eebeb9", "ee94a3"], # [BABY CHICK] U+E4E0 -> U+E523
+  ["eeb5ba", "ee94a3"], # [FRONT-FACING BABY CHICK] U+EB76 -> U+E523
+  ["eeb18e", "ee94a3"], # [HATCHING CHICK] U+E5DB -> U+E523
+  ["eebeb5", "ee8195"], # [PENGUIN] U+E4DC -> U+E055
+  ["eebeb8", "ee8192"], # [POODLE] U+E4DF -> U+E052
+  ["eeb39c", "ee94a0"], # [DOLPHIN] U+EB1B -> U+E520
+  ["ef83b2", "ee8193"], # [MOUSE FACE] U+E5C2 -> U+E053
+  ["ef83b0", "ee8190"], # [TIGER FACE] U+E5C0 -> U+E050
+  ["eebeb4", "ee818f"], # [CAT FACE] U+E4DB -> U+E04F
+  ["eebd88", "ee8194"], # [SPOUTING WHALE] U+E470 -> U+E054
+  ["eebeb1", "ee809a"], # [HORSE FACE] U+E4D8 -> U+E01A
+  ["eebeb2", "ee8489"], # [MONKEY FACE] U+E4D9 -> U+E109
+  ["eebeba", "ee8192"], # [DOG FACE] U+E4E1 -> U+E052
+  ["eebeb7", "ee848b"], # [PIG FACE] U+E4DE -> U+E10B
+  ["ef83b1", "ee8191"], # [BEAR FACE] U+E5C1 -> U+E051
+  ["eeb3a2", "ee94ab"], # [COW FACE] U+EB21 -> U+E52B
+  ["eebeb0", "ee94ac"], # [RABBIT FACE] U+E4D7 -> U+E52C
+  ["eebeb3", "ee94b1"], # [FROG FACE] U+E4DA -> U+E531
+  ["eebf87", "ee94b6"], # [PAW PRINTS] U+E4EE -> U+E536
+  ["eeb583", :undef], # [DRAGON FACE] U+EB3F -> "[辰]"
+  ["eeb58a", :undef], # [PANDA FACE] U+EB46 -> "[パンダ]"
+  ["eeb58c", "ee848b"], # [PIG NOSE] U+EB48 -> U+E10B
+  ["eebd8a", "ee8199"], # [ANGRY FACE] U+E472 -> U+E059
+  ["eeb5ab", "ee9083"], # [ANGUISHED FACE] U+EB67 -> U+E403
+  ["eeb29e", "ee9090"], # [ASTONISHED FACE] U+EACA -> U+E410
+  ["ef838b", "ee9086"], # [DIZZY FACE] U+E5AE -> U+E406
+  ["eeb29f", "ee908f"], # [EXASPERATED FACE] U+EACB -> U+E40F
+  ["eeb29d", "ee908e"], # [EXPRESSIONLESS FACE] U+EAC9 -> U+E40E
+  ["ef83b4", "ee8486"], # [FACE WITH HEART-SHAPED EYES] U+E5C4 -> U+E106
+  ["eeb295", "ee9084"], # [FACE WITH LOOK OF TRIUMPH] U+EAC1 -> U+E404
+  ["eebf80", "ee8485"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E4E7 -> U+E105
+  ["eeb2a3", "ee9098"], # [FACE THROWING A KISS] U+EACF -> U+E418
+  ["eeb2a2", "ee9097"], # [FACE KISSING] U+EACE -> U+E417
+  ["eeb29b", "ee908c"], # [FACE WITH MASK] U+EAC7 -> U+E40C
+  ["eeb29c", "ee908d"], # [FLUSHED FACE] U+EAC8 -> U+E40D
+  ["eebd89", "ee8197"], # [HAPPY FACE WITH OPEN MOUTH] U+E471 -> U+E057
+  ["eeb685", "ee9084"], # [HAPPY FACE WITH GRIN] U+EB80 -> U+E404
+  ["eeb5a8", "ee9092"], # [HAPPY AND CRYING FACE] U+EB64 -> U+E412
+  ["eeb2a1", "ee8196"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+EACD -> U+E056
+  ["eebf94", "ee9094"], # [WHITE SMILING FACE] U+E4FB -> U+E414
+  ["eeb5ad", "ee9093"], # [CRYING FACE] U+EB69 -> U+E413
+  ["eebd8b", "ee9091"], # [LOUDLY CRYING FACE] U+E473 -> U+E411
+  ["eeb29a", "ee908b"], # [FEARFUL FACE] U+EAC6 -> U+E40B
+  ["eeb296", "ee9086"], # [PERSEVERING FACE] U+EAC2 -> U+E406
+  ["eeb5a1", "ee9096"], # [POUTING FACE] U+EB5D -> U+E416
+  ["eeb299", "ee908a"], # [RELIEVED FACE] U+EAC5 -> U+E40A
+  ["eeb297", "ee9087"], # [CONFOUNDED FACE] U+EAC3 -> U+E407
+  ["eeb294", "ee9083"], # [PENSIVE FACE] U+EAC0 -> U+E403
+  ["ef83b5", "ee8487"], # [FACE SCREAMING IN FEAR] U+E5C5 -> U+E107
+  ["eeb298", "ee9088"], # [SLEEPY FACE] U+EAC4 -> U+E408
+  ["eeb293", "ee9082"], # [SMIRKING FACE] U+EABF -> U+E402
+  ["ef83b6", "ee8488"], # [FACE WITH COLD SWEAT] U+E5C6 -> U+E108
+  ["eebd8c", "ee9086"], # [TIRED FACE] U+E474 -> U+E406
+  ["ef83b3", "ee9085"], # [WINKING FACE] U+E5C3 -> U+E405
+  ["eeb5a5", "ee8197"], # [CAT FACE WITH OPEN MOUTH] U+EB61 -> U+E057
+  ["eeb684", "ee9084"], # [HAPPY CAT FACE WITH GRIN] U+EB7F -> U+E404
+  ["eeb5a7", "ee9092"], # [HAPPY AND CRYING CAT FACE] U+EB63 -> U+E412
+  ["eeb5a4", "ee9098"], # [CAT FACE KISSING] U+EB60 -> U+E418
+  ["eeb5a9", "ee8486"], # [CAT FACE WITH HEART-SHAPED EYES] U+EB65 -> U+E106
+  ["eeb5ac", "ee9093"], # [CRYING CAT FACE] U+EB68 -> U+E413
+  ["eeb5a2", "ee9096"], # [POUTING CAT FACE] U+EB5E -> U+E416
+  ["eeb5ae", "ee9084"], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+EB6A -> U+E404
+  ["eeb5aa", "ee9083"], # [ANGUISHED CAT FACE] U+EB66 -> U+E403
+  ["eeb2ab", "ee90a3"], # [FACE WITH NO GOOD GESTURE] U+EAD7 -> U+E423
+  ["eeb2ac", "ee90a4"], # [FACE WITH OK GESTURE] U+EAD8 -> U+E424
+  ["eeb2ad", "ee90a6"], # [PERSON BOWING DEEPLY] U+EAD9 -> U+E426
+  ["eeb594", :undef], # [SEE-NO-EVIL MONKEY] U+EB50 -> "(/_＼)"
+  ["eeb595", :undef], # [SPEAK-NO-EVIL MONKEY] U+EB51 -> "(・×・)"
+  ["eeb596", :undef], # [HEAR-NO-EVIL MONKEY] U+EB52 -> "|(・×・)|"
+  ["eeb68a", "ee8092"], # [PERSON RAISING ONE HAND] U+EB85 -> U+E012
+  ["eeb68b", "ee90a7"], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+EB86 -> U+E427
+  ["eeb68c", "ee9083"], # [PERSON FROWNING] U+EB87 -> U+E403
+  ["eeb68d", "ee9096"], # [PERSON WITH POUTING FACE] U+EB88 -> U+E416
+  ["eeb2a6", "ee909d"], # [PERSON WITH FOLDED HANDS] U+EAD2 -> U+E41D
+  ["eebe84", "ee80b6"], # [HOUSE BUILDING] U+E4AB -> U+E036
+  ["ef83a0", "ee80b6"], # [HOUSE WITH GARDEN] U+EB09 -> U+E036
+  ["eebe86", "ee80b8"], # [OFFICE BUILDING] U+E4AD -> U+E038
+  ["eeb191", "ee8593"], # [JAPANESE POST OFFICE] U+E5DE -> U+E153
+  ["eeb192", "ee8595"], # [HOSPITAL] U+E5DF -> U+E155
+  ["eebe83", "ee858d"], # [BANK] U+E4AA -> U+E14D
+  ["eebdbb", "ee8594"], # [AUTOMATED TELLER MACHINE] U+E4A3 -> U+E154
+  ["eeb194", "ee8598"], # [HOTEL] U+EA81 -> U+E158
+  ["eeb387", "ee9481"], # [LOVE HOTEL] U+EAF3 -> U+E501
+  ["eebdbc", "ee8596"], # [CONVENIENCE STORE] U+E4A4 -> U+E156
+  ["eeb193", "ee8597"], # [SCHOOL] U+EA80 -> U+E157
+  ["ef83ab", "ee80b7"], # [CHURCH] U+E5BB -> U+E037
+  ["eeb182", "ee84a1"], # [FOUNTAIN] U+E5CF -> U+E121
+  ["eeb38a", "ee9484"], # [DEPARTMENT STORE] U+EAF6 -> U+E504
+  ["eeb38b", "ee9485"], # [JAPANESE CASTLE] U+EAF7 -> U+E505
+  ["eeb38c", "ee9486"], # [EUROPEAN CASTLE] U+EAF8 -> U+E506
+  ["eeb38d", "ee9488"], # [FACTORY] U+EAF9 -> U+E508
+  ["eebe82", "ee8882"], # [ANCHOR] U+E4A9 -> U+E202
+  ["eebe96", "ee8c8b"], # [IZAKAYA LANTERN] U+E4BD -> U+E30B
+  ["ef83ad", "ee80bb"], # [MOUNT FUJI] U+E5BD -> U+E03B
+  ["eebe99", "ee9489"], # [TOKYO TOWER] U+E4C0 -> U+E509
+  ["ef828f", :undef], # [SILHOUETTE OF JAPAN] U+E572 -> "[日本地図]"
+  ["eeb5b0", :undef], # [MOYAI] U+EB6C -> "[モアイ]"
+  ["ef83a7", "ee8087"], # [MANS SHOE] U+E5B7 -> U+E007
+  ["eeb3ac", "ee8087"], # [ATHLETIC SHOE] U+EB2B -> U+E007
+  ["eebfb3", "ee84be"], # [HIGH-HEELED SHOE] U+E51A -> U+E13E
+  ["eeb1b2", "ee8c9b"], # [WOMANS BOOTS] U+EA9F -> U+E31B
+  ["eeb3ab", "ee94b6"], # [FOOTPRINTS] U+EB2A -> U+E536
+  ["eebf97", :undef], # [EYEGLASSES] U+E4FE -> "[メガネ]"
+  ["ef83a6", "ee8086"], # [T-SHIRT] U+E5B6 -> U+E006
+  ["eeb5bb", :undef], # [JEANS] U+EB77 -> "[ジーンズ]"
+  ["ef83b9", "ee848e"], # [CROWN] U+E5C9 -> U+E10E
+  ["eeb1a6", "ee8c82"], # [NECKTIE] U+EA93 -> U+E302
+  ["eeb1b1", "ee8c98"], # [WOMANS HAT] U+EA9E -> U+E318
+  ["eeb5af", "ee8c99"], # [DRESS] U+EB6B -> U+E319
+  ["eeb1b6", "ee8ca1"], # [KIMONO] U+EAA3 -> U+E321
+  ["eeb1b7", "ee8ca2"], # [BIKINI] U+EAA4 -> U+E322
+  ["eebfa6", "ee8086"], # [WOMANS CLOTHES] U+E50D -> U+E006
+  ["eebf9d", :undef], # [PURSE] U+E504 -> "[財布]"
+  ["eebdb4", "ee8ca3"], # [HANDBAG] U+E49C -> U+E323
+  ["eebea0", "ee84af"], # [MONEY BAG] U+E4C7 -> U+E12F
+  ["eeb18f", "ee858a"], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E5DC -> U+E14A
+  ["ef8296", "ee84af"], # [HEAVY DOLLAR SIGN] U+E579 -> U+E12F
+  ["ef8299", :undef], # [CREDIT CARD] U+E57C -> "[カード]"
+  ["ef829a", :undef], # [BANKNOTE WITH YEN SIGN] U+E57D -> "￥"
+  ["ef82a2", "ee84af"], # [BANKNOTE WITH DOLLAR SIGN] U+E585 -> U+E12F
+  ["eeb59f", :undef], # [MONEY WITH WINGS] U+EB5B -> "[飛んでいくお金]"
+  ["eeb392", "ee9493"], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+EB11 -> U+E513
+  ["eeb38f", "ee948e"], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+EB0E -> U+E50E
+  ["eeb188", "ee9491"], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E5D5 -> U+E511
+  ["eeb38e", "ee948d"], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+EAFA -> U+E50D
+  ["eeb391", "ee9490"], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+EB10 -> U+E510
+  ["eeb390", "ee948f"], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+EB0F -> U+E50F
+  ["eebea5", "ee948b"], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E4CC -> U+E50B
+  ["eeb393", "ee9494"], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+EB12 -> U+E514
+  ["eeb189", "ee9492"], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E5D6 -> U+E512
+  ["ef8290", "ee948c"], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E573 -> U+E50C
+  ["eebd93", "ee849d"], # [FIRE] U+E47B -> U+E11D
+  ["ef82a0", :undef], # [ELECTRIC TORCH] U+E583 -> "[懐中電灯]"
+  ["ef82a4", :undef], # [WRENCH] U+E587 -> "[レンチ]"
+  ["ef83bb", "ee8496"], # [HAMMER] U+E5CB -> U+E116
+  ["ef829e", :undef], # [NUT AND BOLT] U+E581 -> "[ネジ]"
+  ["ef829c", :undef], # [HOCHO] U+E57F -> "[包丁]"
+  ["eebfa3", "ee8493"], # [PISTOL] U+E50A -> U+E113
+  ["eeb1a2", "ee88be"], # [CRYSTAL BALL] U+EA8F -> U+E23E
+  ["eebd98", "ee8889"], # [JAPANESE SYMBOL FOR BEGINNER] U+E480 -> U+E209
+  ["eebfa9", "ee84bb"], # [SYRINGE] U+E510 -> U+E13B
+  ["eeb1ad", "ee8c8f"], # [PILL] U+EA9A -> U+E30F
+  ["eeb3a7", "ee94b2"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+EB26 -> U+E532
+  ["eeb3a8", "ee94b3"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+EB27 -> U+E533
+  ["eeb3aa", "ee94b4"], # [NEGATIVE SQUARED AB] U+EB29 -> U+E534
+  ["eeb3a9", "ee94b5"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+EB28 -> U+E535
+  ["ef82bc", "ee8c94"], # [RIBBON] U+E59F -> U+E314
+  ["eebea8", "ee8492"], # [WRAPPED PRESENT] U+E4CF -> U+E112
+  ["ef82bd", "ee8d8b"], # [BIRTHDAY CAKE] U+E5A0 -> U+E34B
+  ["eebea2", "ee80b3"], # [CHRISTMAS TREE] U+E4C9 -> U+E033
+  ["eeb384", "ee9188"], # [FATHER CHRISTMAS] U+EAF0 -> U+E448
+  ["eeb18c", "ee8583"], # [CROSSED FLAGS] U+E5D9 -> U+E143
+  ["ef83bc", "ee8497"], # [FIREWORKS] U+E5CC -> U+E117
+  ["eeb1ae", "ee8c90"], # [BALLOON] U+EA9B -> U+E310
+  ["eeb1af", "ee8c92"], # [PARTY POPPER] U+EA9C -> U+E312
+  ["eeb2b7", "ee90b6"], # [PINE DECORATION] U+EAE3 -> U+E436
+  ["eeb2b8", "ee90b8"], # [JAPANESE DOLLS] U+EAE4 -> U+E438
+  ["eeb2b9", "ee90b9"], # [GRADUATION CAP] U+EAE5 -> U+E439
+  ["eeb2ba", "ee90ba"], # [SCHOOL SATCHEL] U+EAE6 -> U+E43A
+  ["eeb2bb", "ee90bb"], # [CARP STREAMER] U+EAE7 -> U+E43B
+  ["eeb2bf", "ee9180"], # [FIREWORK SPARKLER] U+EAEB -> U+E440
+  ["eeb381", "ee9182"], # [WIND CHIME] U+EAED -> U+E442
+  ["eeb382", "ee9185"], # [JACK-O-LANTERN] U+EAEE -> U+E445
+  ["eebd87", :undef], # [CONFETTI BALL] U+E46F -> "[オメデトウ]"
+  ["eeb581", :undef], # [TANABATA TREE] U+EB3D -> "[七夕]"
+  ["eeb383", "ee9186"], # [MOON VIEWING CEREMONY] U+EAEF -> U+E446
+  ["ef82b8", :undef], # [PAGER] U+E59B -> "[ポケベル]"
+  ["ef82b3", "ee8089"], # [BLACK TELEPHONE] U+E596 -> U+E009
+  ["eebfb7", "ee8089"], # [TELEPHONE RECEIVER] U+E51E -> U+E009
+  ["ef82a5", "ee808a"], # [MOBILE PHONE] U+E588 -> U+E00A
+  ["ef839f", "ee8484"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+EB08 -> U+E104
+  ["eeb1a5", "ee8c81"], # [MEMO] U+EA92 -> U+E301
+  ["eebfb9", "ee808b"], # [FAX MACHINE] U+E520 -> U+E00B
+  ["eebfba", "ee8483"], # [ENVELOPE] U+E521 -> U+E103
+  ["ef82ae", "ee8483"], # [INCOMING ENVELOPE] U+E591 -> U+E103
+  ["eeb5a6", "ee8483"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+EB62 -> U+E103
+  ["eebfb4", "ee8481"], # [CLOSED MAILBOX WITH LOWERED FLAG] U+E51B -> U+E101
+  ["ef83a1", "ee8481"], # [CLOSED MAILBOX WITH RAISED FLAG] U+EB0A -> U+E101
+  ["ef82a8", :undef], # [NEWSPAPER] U+E58B -> "[新聞]"
+  ["eebe81", "ee858b"], # [SATELLITE ANTENNA] U+E4A8 -> U+E14B
+  ["ef82af", :undef], # [OUTBOX TRAY] U+E592 -> "[送信BOX]"
+  ["ef82b0", :undef], # [INBOX TRAY] U+E593 -> "[受信BOX]"
+  ["eebfb8", "ee8492"], # [PACKAGE] U+E51F -> U+E112
+  ["eeb5b5", "ee8483"], # [E-MAIL SYMBOL] U+EB71 -> U+E103
+  ["ef8394", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+EAFD -> "[ABCD]"
+  ["ef8395", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+EAFE -> "[abcd]"
+  ["ef8396", :undef], # [INPUT SYMBOL FOR NUMBERS] U+EAFF -> "[1234]"
+  ["ef8397", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+EB00 -> "[記号]"
+  ["eeb599", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+EB55 -> "[ABC]"
+  ["ef839a", :undef], # [BLACK NIB] U+EB03 -> "[ペン]"
+  ["ef83a8", "ee808c"], # [PERSONAL COMPUTER] U+E5B8 -> U+E00C
+  ["eebdb9", "ee8c81"], # [PENCIL] U+E4A1 -> U+E301
+  ["eebdb8", :undef], # [PAPERCLIP] U+E4A0 -> "[クリップ]"
+  ["eeb181", "ee849e"], # [BRIEFCASE] U+E5CE -> U+E11E
+  ["ef829f", "ee8c96"], # [MINIDISC] U+E582 -> U+E316
+  ["ef81be", "ee8c96"], # [FLOPPY DISK] U+E562 -> U+E316
+  ["eebfa5", "ee84a6"], # [OPTICAL DISC] U+E50C -> U+E126
+  ["eebfaf", "ee8c93"], # [BLACK SCISSORS] U+E516 -> U+E313
+  ["ef81bc", :undef], # [ROUND PUSHPIN] U+E560 -> "[画びょう]"
+  ["ef81bd", "ee8c81"], # [PAGE WITH CURL] U+E561 -> U+E301
+  ["ef8286", "ee8c81"], # [PAGE FACING UP] U+E569 -> U+E301
+  ["ef8280", :undef], # [CALENDAR] U+E563 -> "[カレンダー]"
+  ["ef82ac", :undef], # [FILE FOLDER] U+E58F -> "[フォルダ]"
+  ["ef82ad", :undef], # [OPEN FILE FOLDER] U+E590 -> "[フォルダ]"
+  ["ef8288", "ee8588"], # [NOTEBOOK] U+E56B -> U+E148
+  ["eebdb7", "ee8588"], # [OPEN BOOK] U+E49F -> U+E148
+  ["eebdb5", "ee8588"], # [NOTEBOOK WITH DECORATIVE COVER] U+E49D -> U+E148
+  ["ef8285", "ee8588"], # [CLOSED BOOK] U+E568 -> U+E148
+  ["ef8282", "ee8588"], # [GREEN BOOK] U+E565 -> U+E148
+  ["ef8283", "ee8588"], # [BLUE BOOK] U+E566 -> U+E148
+  ["ef8284", "ee8588"], # [ORANGE BOOK] U+E567 -> U+E148
+  ["ef828c", "ee8588"], # [BOOKS] U+E56F -> U+E148
+  ["eebfb6", :undef], # [NAME BADGE] U+E51D -> "[名札]"
+  ["ef81bb", :undef], # [SCROLL] U+E55F -> "[スクロール]"
+  ["ef8281", "ee8c81"], # [CLIPBOARD] U+E564 -> U+E301
+  ["ef8287", :undef], # [TEAR-OFF CALENDAR] U+E56A -> "[カレンダー]"
+  ["ef8291", "ee858a"], # [BAR CHART] U+E574 -> U+E14A
+  ["ef8292", "ee858a"], # [CHART WITH UPWARDS TREND] U+E575 -> U+E14A
+  ["ef8293", :undef], # [CHART WITH DOWNWARDS TREND] U+E576 -> "[グラフ]"
+  ["ef8289", "ee8588"], # [CARD INDEX] U+E56C -> U+E148
+  ["ef828a", :undef], # [PUSHPIN] U+E56D -> "[画びょう]"
+  ["ef828b", "ee8588"], # [LEDGER] U+E56E -> U+E148
+  ["ef828d", :undef], # [STRAIGHT RULER] U+E570 -> "[定規]"
+  ["eebdba", :undef], # [TRIANGULAR RULER] U+E4A2 -> "[三角定規]"
+  ["ef83a2", "ee8c81"], # [BOOKMARK TABS] U+EB0B -> U+E301
+  ["eebe93", "ee8096"], # [BASEBALL] U+E4BA -> U+E016
+  ["ef82b6", "ee8094"], # [FLAG IN HOLE] U+E599 -> U+E014
+  ["eebe90", "ee8095"], # [TENNIS RACQUET AND BALL] U+E4B7 -> U+E015
+  ["eebe8f", "ee8098"], # [SOCCER BALL] U+E4B6 -> U+E018
+  ["eeb280", "ee8093"], # [SKI AND SKI BOOT] U+EAAC -> U+E013
+  ["ef82b7", "ee90aa"], # [BASKETBALL AND HOOP] U+E59A -> U+E42A
+  ["eebe92", "ee84b2"], # [CHEQUERED FLAG] U+E4B9 -> U+E132
+  ["eebe91", :undef], # [SNOWBOARDER] U+E4B8 -> "[スノボ]"
+  ["eebd83", "ee8495"], # [RUNNER] U+E46B -> U+E115
+  ["eeb585", "ee8097"], # [SURFER] U+EB41 -> U+E017
+  ["eeb186", "ee84b1"], # [TROPHY] U+E5D3 -> U+E131
+  ["eebe94", "ee90ab"], # [AMERICAN FOOTBALL] U+E4BB -> U+E42B
+  ["eeb2b2", "ee90ad"], # [SWIMMER] U+EADE -> U+E42D
+  ["eebe8e", "ee809e"], # [TRAIN] U+E4B5 -> U+E01E
+  ["ef83ac", "ee90b4"], # [METRO] U+E5BC -> U+E434
+  ["eebe89", "ee809f"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E4B0 -> U+E01F
+  ["eebe8a", "ee809b"], # [AUTOMOBILE] U+E4B1 -> U+E01B
+  ["eebe88", "ee8599"], # [ONCOMING BUS] U+E4AF -> U+E159
+  ["eebe80", "ee8590"], # [BUS STOP] U+E4A7 -> U+E150
+  ["eeb195", "ee8882"], # [SHIP] U+EA82 -> U+E202
+  ["eebe8c", "ee809d"], # [AIRPLANE] U+E4B3 -> U+E01D
+  ["eebe8d", "ee809c"], # [SAILBOAT] U+E4B4 -> U+E01C
+  ["eeb5b1", "ee80b9"], # [STATION] U+EB6D -> U+E039
+  ["ef83b8", "ee848d"], # [ROCKET] U+E5C8 -> U+E10D
+  ["eebe8b", "ee90af"], # [DELIVERY TRUCK] U+E4B2 -> U+E42F
+  ["eeb2b3", "ee90b0"], # [FIRE ENGINE] U+EADF -> U+E430
+  ["eeb2b4", "ee90b1"], # [AMBULANCE] U+EAE0 -> U+E431
+  ["eeb2b5", "ee90b2"], # [POLICE CAR] U+EAE1 -> U+E432
+  ["ef828e", "ee80ba"], # [FUEL PUMP] U+E571 -> U+E03A
+  ["eebdbe", "ee858f"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E4A6 -> U+E14F
+  ["eebd82", "ee858e"], # [HORIZONTAL TRAFFIC LIGHT] U+E46A -> U+E14E
+  ["eeb18a", "ee84b7"], # [CONSTRUCTION SIGN] U+E5D7 -> U+E137
+  ["eeb5b7", "ee90b2"], # [POLICE CARS REVOLVING LIGHT] U+EB73 -> U+E432
+  ["eebe95", "ee84a3"], # [HOT SPRINGS] U+E4BC -> U+E123
+  ["eeb183", "ee84a2"], # [TENT] U+E5D0 -> U+E122
+  ["eebd85", "ee84a4"], # [FERRIS WHEEL] U+E46D -> U+E124
+  ["eeb2b6", "ee90b3"], # [ROLLER COASTER] U+EAE2 -> U+E433
+  ["eeb586", "ee8099"], # [FISHING POLE AND FISH] U+EB42 -> U+E019
+  ["eebf9c", "ee80bc"], # [MICROPHONE] U+E503 -> U+E03C
+  ["eebfb0", "ee80bd"], # [MOVIE CAMERA] U+E517 -> U+E03D
+  ["eebfa1", "ee8c8a"], # [HEADPHONE] U+E508 -> U+E30A
+  ["ef82b9", "ee9482"], # [ARTIST PALETTE] U+E59C -> U+E502
+  ["eeb389", "ee9483"], # [TOP HAT] U+EAF5 -> U+E503
+  ["ef82bb", :undef], # [CIRCUS TENT] U+E59E -> "[イベント]"
+  ["eebdb6", "ee84a5"], # [TICKET] U+E49E -> U+E125
+  ["eebe97", "ee8ca4"], # [CLAPPER BOARD] U+E4BE -> U+E324
+  ["ef82ba", "ee9483"], # [PERFORMING ARTS] U+E59D -> U+E503
+  ["eebe9f", :undef], # [VIDEO GAME] U+E4C6 -> "[ゲーム]"
+  ["eeb184", "ee84ad"], # [MAHJONG TILE RED DRAGON] U+E5D1 -> U+E12D
+  ["eebe9e", "ee84b0"], # [DIRECT HIT] U+E4C5 -> U+E130
+  ["eebd86", "ee84b3"], # [SLOT MACHINE] U+E46E -> U+E133
+  ["eeb2b1", "ee90ac"], # [BILLIARDS] U+EADD -> U+E42C
+  ["eebea1", :undef], # [GAME DIE] U+E4C8 -> "[サイコロ]"
+  ["eeb587", :undef], # [BOWLING] U+EB43 -> "[ボーリング]"
+  ["eeb5b2", :undef], # [FLOWER PLAYING CARDS] U+EB6E -> "[花札]"
+  ["eeb5b3", :undef], # [PLAYING CARD BLACK JOKER] U+EB6F -> "[ジョーカー]"
+  ["ef83ae", "ee80be"], # [MUSICAL NOTE] U+E5BE -> U+E03E
+  ["eebf9e", "ee8ca6"], # [MULTIPLE MUSICAL NOTES] U+E505 -> U+E326
+  ["eebf9f", "ee8181"], # [GUITAR] U+E506 -> U+E041
+  ["eeb584", :undef], # [MUSICAL KEYBOARD] U+EB40 -> "[ピアノ]"
+  ["eeb2b0", "ee8182"], # [TRUMPET] U+EADC -> U+E042
+  ["eebfa0", :undef], # [VIOLIN] U+E507 -> "[バイオリン]"
+  ["eeb2a0", "ee8ca6"], # [MUSICAL SCORE] U+EACC -> U+E326
+  ["eebfae", "ee8088"], # [CAMERA] U+E515 -> U+E008
+  ["ef829b", "ee80bd"], # [VIDEO CAMERA] U+E57E -> U+E03D
+  ["eebf9b", "ee84aa"], # [TELEVISION] U+E502 -> U+E12A
+  ["ef83a9", "ee84a8"], # [RADIO] U+E5B9 -> U+E128
+  ["ef829d", "ee84a9"], # [VIDEOCASSETTE] U+E580 -> U+E129
+  ["eebf84", "ee8083"], # [KISS MARK] U+E4EB -> U+E003
+  ["eeb5bc", "ee8483ee8ca8"], # [LOVE LETTER] U+EB78 -> U+E103 U+E328
+  ["eebfad", "ee80b4"], # [RING] U+E514 -> U+E034
+  ["ef83ba", "ee8491"], # [KISS] U+E5CA -> U+E111
+  ["eeb1a8", "ee8c86"], # [BOUQUET] U+EA95 -> U+E306
+  ["eeb2ae", "ee90a5"], # [COUPLE WITH HEART] U+EADA -> U+E425
+  ["eeb196", "ee8887"], # [NO ONE UNDER EIGHTEEN SYMBOL] U+EA83 -> U+E207
+  ["ef81b4", "ee898e"], # [COPYRIGHT SIGN] U+E558 -> U+E24E
+  ["ef81b5", "ee898f"], # [REGISTERED SIGN] U+E559 -> U+E24F
+  ["ef81aa", "ee94b7"], # [TRADE MARK SIGN] U+E54E -> U+E537
+  ["ef818f", :undef], # [INFORMATION SOURCE] U+E533 -> "[ｉ]"
+  ["eeb689", "ee8890"], # [HASH KEY] U+EB84 -> U+E210
+  ["eebfbb", "ee889c"], # [KEYCAP 1] U+E522 -> U+E21C
+  ["eebfbc", "ee889d"], # [KEYCAP 2] U+E523 -> U+E21D
+  ["ef8180", "ee889e"], # [KEYCAP 3] U+E524 -> U+E21E
+  ["ef8181", "ee889f"], # [KEYCAP 4] U+E525 -> U+E21F
+  ["ef8182", "ee88a0"], # [KEYCAP 5] U+E526 -> U+E220
+  ["ef8183", "ee88a1"], # [KEYCAP 6] U+E527 -> U+E221
+  ["ef8184", "ee88a2"], # [KEYCAP 7] U+E528 -> U+E222
+  ["ef8185", "ee88a3"], # [KEYCAP 8] U+E529 -> U+E223
+  ["ef8186", "ee88a4"], # [KEYCAP 9] U+E52A -> U+E224
+  ["ef8389", "ee88a5"], # [KEYCAP 0] U+E5AC -> U+E225
+  ["ef8187", :undef], # [KEYCAP TEN] U+E52B -> "[10]"
+  ["eeb197", "ee888b"], # [ANTENNA WITH BARS] U+EA84 -> U+E20B
+  ["eeb1a3", "ee8990"], # [VIBRATION MODE] U+EA90 -> U+E250
+  ["eeb1a4", "ee8991"], # [MOBILE PHONE OFF] U+EA91 -> U+E251
+  ["eebeaf", "ee84a0"], # [HAMBURGER] U+E4D6 -> U+E120
+  ["eebeae", "ee8d82"], # [RICE BALL] U+E4D5 -> U+E342
+  ["eebea9", "ee8186"], # [SHORTCAKE] U+E4D0 -> U+E046
+  ["ef8391", "ee8d80"], # [STEAMING BOWL] U+E5B4 -> U+E340
+  ["eeb283", "ee8cb9"], # [BREAD] U+EAAF -> U+E339
+  ["eebeaa", "ee8587"], # [COOKING] U+E4D1 -> U+E147
+  ["eeb284", "ee8cba"], # [SOFT ICE CREAM] U+EAB0 -> U+E33A
+  ["eeb285", "ee8cbb"], # [FRENCH FRIES] U+EAB1 -> U+E33B
+  ["eeb286", "ee8cbc"], # [DANGO] U+EAB2 -> U+E33C
+  ["eeb287", "ee8cbd"], # [RICE CRACKER] U+EAB3 -> U+E33D
+  ["eeb288", "ee8cbe"], # [COOKED RICE] U+EAB4 -> U+E33E
+  ["eeb289", "ee8cbf"], # [SPAGHETTI] U+EAB5 -> U+E33F
+  ["eeb28a", "ee8d81"], # [CURRY AND RICE] U+EAB6 -> U+E341
+  ["eeb28b", "ee8d83"], # [ODEN] U+EAB7 -> U+E343
+  ["eeb28c", "ee8d84"], # [SUSHI] U+EAB8 -> U+E344
+  ["eeb291", "ee8d8c"], # [BENTO BOX] U+EABD -> U+E34C
+  ["eeb292", "ee8d8d"], # [POT OF FOOD] U+EABE -> U+E34D
+  ["eeb2be", "ee90bf"], # [SHAVED ICE] U+EAEA -> U+E43F
+  ["eebe9d", :undef], # [MEAT ON BONE] U+E4C4 -> "[肉]"
+  ["eebf86", :undef], # [FISH CAKE WITH SWIRL DESIGN] U+E4ED -> "[なると]"
+  ["eeb3bb", :undef], # [ROASTED SWEET POTATO] U+EB3A -> "[やきいも]"
+  ["eeb3bc", :undef], # [SLICE OF PIZZA] U+EB3B -> "[ピザ]"
+  ["eeb580", :undef], # [POULTRY LEG] U+EB3C -> "[チキン]"
+  ["eeb58e", :undef], # [ICE CREAM] U+EB4A -> "[アイスクリーム]"
+  ["eeb58f", :undef], # [DOUGHNUT] U+EB4B -> "[ドーナツ]"
+  ["eeb590", :undef], # [COOKIE] U+EB4C -> "[クッキー]"
+  ["eeb591", :undef], # [CHOCOLATE BAR] U+EB4D -> "[チョコ]"
+  ["eeb592", :undef], # [CANDY] U+EB4E -> "[キャンディ]"
+  ["eeb593", :undef], # [LOLLIPOP] U+EB4F -> "[キャンディ]"
+  ["eeb59a", :undef], # [CUSTARD] U+EB56 -> "[プリン]"
+  ["eeb59d", :undef], # [HONEY POT] U+EB59 -> "[ハチミツ]"
+  ["eeb5b4", :undef], # [FRIED SHRIMP] U+EB70 -> "[エビフライ]"
+  ["eebe85", "ee8183"], # [FORK AND KNIFE] U+E4AC -> U+E043
+  ["ef82b4", "ee8185"], # [HOT BEVERAGE] U+E597 -> U+E045
+  ["eebe9b", "ee8184"], # [COCKTAIL GLASS] U+E4C2 -> U+E044
+  ["eebe9c", "ee8187"], # [BEER MUG] U+E4C3 -> U+E047
+  ["eeb282", "ee8cb8"], # [TEACUP WITHOUT HANDLE] U+EAAE -> U+E338
+  ["eeb1aa", "ee8c8b"], # [SAKE BOTTLE AND CUP] U+EA97 -> U+E30B
+  ["eebe9a", "ee8184"], # [WINE GLASS] U+E4C1 -> U+E044
+  ["eeb1ab", "ee8c8c"], # [CLINKING BEER MUGS] U+EA98 -> U+E30C
+  ["eeb582", "ee8184"], # [TROPICAL DRINK] U+EB3E -> U+E044
+  ["ef81b1", "ee88b6"], # [NORTH EAST ARROW] U+E555 -> U+E236
+  ["ef81a9", "ee88b8"], # [SOUTH EAST ARROW] U+E54D -> U+E238
+  ["ef81a8", "ee88b7"], # [NORTH WEST ARROW] U+E54C -> U+E237
+  ["ef81b2", "ee88b9"], # [SOUTH WEST ARROW] U+E556 -> U+E239
+  ["eeb3ae", "ee88b6"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+EB2D -> U+E236
+  ["eeb3af", "ee88b8"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+EB2E -> U+E238
+  ["eeb5be", :undef], # [LEFT RIGHT ARROW] U+EB7A -> "⇔"
+  ["eeb680", :undef], # [UP DOWN ARROW] U+EB7B -> "↑↓"
+  ["ef819b", "ee88b2"], # [UPWARDS BLACK ARROW] U+E53F -> U+E232
+  ["ef819c", "ee88b3"], # [DOWNWARDS BLACK ARROW] U+E540 -> U+E233
+  ["ef81ae", "ee88b4"], # [BLACK RIGHTWARDS ARROW] U+E552 -> U+E234
+  ["ef81af", "ee88b5"], # [LEFTWARDS BLACK ARROW] U+E553 -> U+E235
+  ["ef818a", "ee88ba"], # [BLACK RIGHT-POINTING TRIANGLE] U+E52E -> U+E23A
+  ["ef8189", "ee88bb"], # [BLACK LEFT-POINTING TRIANGLE] U+E52D -> U+E23B
+  ["ef818c", "ee88bc"], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E530 -> U+E23C
+  ["ef818b", "ee88bd"], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E52F -> U+E23D
+  ["ef81a1", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+E545 -> "▲"
+  ["ef81a0", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+E544 -> "▼"
+  ["ef81b6", :undef], # [UP-POINTING RED TRIANGLE] U+E55A -> "▲"
+  ["ef81b7", :undef], # [DOWN-POINTING RED TRIANGLE] U+E55B -> "▼"
+  ["ef819f", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+E543 -> "▲"
+  ["ef819e", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+E542 -> "▼"
+  ["eeb281", "ee8cb2"], # [HEAVY LARGE CIRCLE] U+EAAD -> U+E332
+  ["ef81ac", "ee8cb3"], # [CROSS MARK] U+E550 -> U+E333
+  ["ef81ad", "ee8cb3"], # [NEGATIVE SQUARED CROSS MARK] U+E551 -> U+E333
+  ["eebd9a", "ee80a1"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E482 -> U+E021
+  ["eeb3b0", :undef], # [EXCLAMATION QUESTION MARK] U+EB2F -> "！？"
+  ["eeb3b1", :undef], # [DOUBLE EXCLAMATION MARK] U+EB30 -> "！！"
+  ["eebd9b", "ee80a0"], # [BLACK QUESTION MARK ORNAMENT] U+E483 -> U+E020
+  ["eeb3b2", :undef], # [CURLY LOOP] U+EB31 -> "～"
+  ["ef82b2", "ee80a2"], # [HEAVY BLACK HEART] U+E595 -> U+E022
+  ["eeb5b9", "ee8ca7"], # [BEATING HEART] U+EB75 -> U+E327
+  ["eebd8f", "ee80a3"], # [BROKEN HEART] U+E477 -> U+E023
+  ["eebd90", "ee8ca7"], # [TWO HEARTS] U+E478 -> U+E327
+  ["eeb1b9", "ee8ca7"], # [SPARKLING HEART] U+EAA6 -> U+E327
+  ["eebf83", "ee8ca9"], # [HEART WITH ARROW] U+E4EA -> U+E329
+  ["eeb1ba", "ee8caa"], # [BLUE HEART] U+EAA7 -> U+E32A
+  ["eeb1bb", "ee8cab"], # [GREEN HEART] U+EAA8 -> U+E32B
+  ["eeb1bc", "ee8cac"], # [YELLOW HEART] U+EAA9 -> U+E32C
+  ["eeb1bd", "ee8cad"], # [PURPLE HEART] U+EAAA -> U+E32D
+  ["eeb598", "ee90b7"], # [HEART WITH RIBBON] U+EB54 -> U+E437
+  ["ef838c", "ee8ca7"], # [REVOLVING HEARTS] U+E5AF -> U+E327
+  ["eeb1b8", "ee888c"], # [BLACK HEART SUIT] U+EAA5 -> U+E20C
+  ["ef82be", "ee888e"], # [BLACK SPADE SUIT] U+E5A1 -> U+E20E
+  ["ef82bf", "ee888d"], # [BLACK DIAMOND SUIT] U+E5A2 -> U+E20D
+  ["ef8380", "ee888f"], # [BLACK CLUB SUIT] U+E5A3 -> U+E20F
+  ["eebd95", "ee8c8e"], # [SMOKING SYMBOL] U+E47D -> U+E30E
+  ["eebd96", "ee8888"], # [NO SMOKING SYMBOL] U+E47E -> U+E208
+  ["eebd97", "ee888a"], # [WHEELCHAIR SYMBOL] U+E47F -> U+E20A
+  ["eeb3ad", :undef], # [TRIANGULAR FLAG ON POST] U+EB2C -> "[旗]"
+  ["eebd99", "ee8992"], # [WARNING SIGN] U+E481 -> U+E252
+  ["eebd9c", "ee84b7"], # [NO ENTRY] U+E484 -> U+E137
+  ["eeb5bd", :undef], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+EB79 -> "↑↓"
+  ["eebe87", "ee84b6"], # [BICYCLE] U+E4AE -> U+E136
+  ["eeb5b6", "ee8881"], # [PEDESTRIAN] U+EB72 -> U+E201
+  ["eeb18b", "ee84bf"], # [BATH] U+E5D8 -> U+E13F
+  ["eebdbd", "ee8591"], # [RESTROOM] U+E4A5 -> U+E151
+  ["ef819d", :undef], # [NO ENTRY SIGN] U+E541 -> "[禁止]"
+  ["ef81b3", :undef], # [HEAVY CHECK MARK] U+E557 -> "[チェックマーク]"
+  ["ef8388", :undef], # [SQUARED CL] U+E5AB -> "[CL]"
+  ["eeb198", "ee8894"], # [SQUARED COOL] U+EA85 -> U+E214
+  ["ef8295", :undef], # [SQUARED FREE] U+E578 -> "[FREE]"
+  ["eeb19b", "ee88a9"], # [SQUARED ID] U+EA88 -> U+E229
+  ["ef83a5", "ee8892"], # [SQUARED NEW] U+E5B5 -> U+E212
+  ["ef838a", "ee898d"], # [SQUARED OK] U+E5AD -> U+E24D
+  ["eebf81", :undef], # [SQUARED SOS] U+E4E8 -> "[SOS]"
+  ["eebfa8", "ee8893"], # [SQUARED UP WITH EXCLAMATION MARK] U+E50F -> U+E213
+  ["eeb185", "ee84ae"], # [SQUARED VS] U+E5D2 -> U+E12E
+  ["eeb19a", "ee88a8"], # [SQUARED KATAKANA SA] U+EA87 -> U+E228
+  ["eeb19d", "ee88ab"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+EA8A -> U+E22B
+  ["eeb19c", "ee88aa"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+EA89 -> U+E22A
+  ["eeb199", "ee88a7"], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+EA86 -> U+E227
+  ["eeb19e", "ee88ac"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+EA8B -> U+E22C
+  ["eeb19f", "ee88ad"], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+EA8C -> U+E22D
+  ["eebf8a", "ee8c95"], # [CIRCLED IDEOGRAPH SECRET] U+E4F1 -> U+E315
+  ["eeb1ac", "ee8c8d"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+EA99 -> U+E30D
+  ["eebf90", "ee88a6"], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E4F7 -> U+E226
+  ["ef8398", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+EB01 -> "[可]"
+  ["ef8198", :undef], # [HEAVY PLUS SIGN] U+E53C -> "[＋]"
+  ["ef8199", :undef], # [HEAVY MINUS SIGN] U+E53D -> "[－]"
+  ["ef81ab", "ee8cb3"], # [HEAVY MULTIPLICATION X] U+E54F -> U+E333
+  ["ef81b0", :undef], # [HEAVY DIVISION SIGN] U+E554 -> "[÷]"
+  ["eebd8e", "ee848f"], # [ELECTRIC LIGHT BULB] U+E476 -> U+E10F
+  ["eebebe", "ee8cb4"], # [ANGER SYMBOL] U+E4E5 -> U+E334
+  ["eebd92", "ee8c91"], # [BOMB] U+E47A -> U+E311
+  ["eebd8d", "ee84bc"], # [SLEEPING SYMBOL] U+E475 -> U+E13C
+  ["ef838d", :undef], # [COLLISION SYMBOL] U+E5B0 -> "[ドンッ]"
+  ["ef838e", "ee8cb1"], # [SPLASHING SWEAT SYMBOL] U+E5B1 -> U+E331
+  ["eebebf", "ee8cb1"], # [DROP OF WATER] U+E4E6 -> U+E331
+  ["eebf8d", "ee8cb0"], # [DASH SYMBOL] U+E4F4 -> U+E330
+  ["eebf8e", "ee819a"], # [PILE OF POO] U+E4F5 -> U+E05A
+  ["eebf82", "ee858c"], # [FLEXED BICEPS] U+E4E9 -> U+E14C
+  ["eeb5a0", "ee9087"], # [DIZZY SYMBOL] U+EB5C -> U+E407
+  ["eebf96", :undef], # [SPEECH BALLOON] U+E4FD -> "[フキダシ]"
+  ["eeb1be", "ee8cae"], # [SPARKLES] U+EAAB -> U+E32E
+  ["eebd91", "ee8885"], # [EIGHT POINTED BLACK STAR] U+E479 -> U+E205
+  ["ef819a", "ee8886"], # [EIGHT SPOKED ASTERISK] U+E53E -> U+E206
+  ["ef8196", "ee8899"], # [MEDIUM WHITE CIRCLE] U+E53A -> U+E219
+  ["ef8197", "ee8899"], # [MEDIUM BLACK CIRCLE] U+E53B -> U+E219
+  ["ef81a6", "ee8899"], # [LARGE RED CIRCLE] U+E54A -> U+E219
+  ["ef81a7", "ee889a"], # [LARGE BLUE CIRCLE] U+E54B -> U+E21A
+  ["eebda3", "ee8caf"], # [WHITE MEDIUM STAR] U+E48B -> U+E32F
+  ["ef81a4", "ee889b"], # [WHITE LARGE SQUARE] U+E548 -> U+E21B
+  ["ef81a5", "ee889a"], # [BLACK LARGE SQUARE] U+E549 -> U+E21A
+  ["ef818d", "ee889b"], # [WHITE SMALL SQUARE] U+E531 -> U+E21B
+  ["ef818e", "ee889a"], # [BLACK SMALL SQUARE] U+E532 -> U+E21A
+  ["ef8190", "ee889b"], # [WHITE MEDIUM SMALL SQUARE] U+E534 -> U+E21B
+  ["ef8191", "ee889a"], # [BLACK MEDIUM SMALL SQUARE] U+E535 -> U+E21A
+  ["ef8194", "ee889b"], # [WHITE MEDIUM SQUARE] U+E538 -> U+E21B
+  ["ef8195", "ee889a"], # [BLACK MEDIUM SQUARE] U+E539 -> U+E21A
+  ["ef81a2", "ee889b"], # [LARGE ORANGE DIAMOND] U+E546 -> U+E21B
+  ["ef81a3", "ee889b"], # [LARGE BLUE DIAMOND] U+E547 -> U+E21B
+  ["ef8192", "ee889b"], # [SMALL ORANGE DIAMOND] U+E536 -> U+E21B
+  ["ef8193", "ee889b"], # [SMALL BLUE DIAMOND] U+E537 -> U+E21B
+  ["eebd84", "ee8cae"], # [SPARKLE] U+E46C -> U+E32E
+  ["eebf89", :undef], # [WHITE FLOWER] U+E4F0 -> "[花丸]"
+  ["eebf8b", :undef], # [HUNDRED POINTS SYMBOL] U+E4F2 -> "[100点]"
+  ["ef81b9", :undef], # [LEFTWARDS ARROW WITH HOOK] U+E55D -> "←┘"
+  ["ef81b8", :undef], # [RIGHTWARDS ARROW WITH HOOK] U+E55C -> "└→"
+  ["ef83a4", :undef], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+EB0D -> "↑↓"
+  ["eebfaa", "ee8581"], # [SPEAKER WITH THREE SOUND WAVES] U+E511 -> U+E141
+  ["ef82a1", :undef], # [BATTERY] U+E584 -> "[電池]"
+  ["ef82a6", :undef], # [ELECTRIC PLUG] U+E589 -> "[コンセント]"
+  ["eebfb1", "ee8494"], # [LEFT-POINTING MAGNIFYING GLASS] U+E518 -> U+E114
+  ["ef839c", "ee8494"], # [RIGHT-POINTING MAGNIFYING GLASS] U+EB05 -> U+E114
+  ["eebfb5", "ee8584"], # [LOCK] U+E51C -> U+E144
+  ["ef83a3", "ee8584"], # [LOCK WITH INK PEN] U+EB0C -> U+E144
+  ["ef8393", "ee8584"], # [CLOSED LOCK WITH KEY] U+EAFC -> U+E144
+  ["eebfb2", "ee80bf"], # [KEY] U+E519 -> U+E03F
+  ["eebfab", "ee8ca5"], # [BELL] U+E512 -> U+E325
+  ["ef8399", :undef], # [BALLOT BOX WITH CHECK] U+EB02 -> "[チェックマーク]"
+  ["ef839b", :undef], # [RADIO BUTTON] U+EB04 -> "[ラジオボタン]"
+  ["ef839e", :undef], # [BOOKMARK] U+EB07 -> "[ブックマーク]"
+  ["ef82a7", :undef], # [LINK SYMBOL] U+E58A -> "[リンク]"
+  ["ef839d", "ee88b5"], # [BACK WITH LEFTWARDS ARROW ABOVE] U+EB06 -> U+E235
+  ["ef82a9", :undef], # [EM SPACE] U+E58C -> U+3013 (GETA)
+  ["ef82aa", :undef], # [EN SPACE] U+E58D -> U+3013 (GETA)
+  ["ef82ab", :undef], # [FOUR-PER-EM SPACE] U+E58E -> U+3013 (GETA)
+  ["ef81ba", :undef], # [WHITE HEAVY CHECK MARK] U+E55E -> "[チェックマーク]"
+  ["eeb688", "ee8090"], # [RAISED FIST] U+EB83 -> U+E010
+  ["ef8384", "ee8092"], # [RAISED HAND] U+E5A7 -> U+E012
+  ["ef8383", "ee8091"], # [VICTORY HAND] U+E5A6 -> U+E011
+  ["eebf8c", "ee808d"], # [FISTED HAND SIGN] U+E4F3 -> U+E00D
+  ["eebf92", "ee808e"], # [THUMBS UP SIGN] U+E4F9 -> U+E00E
+  ["eebf8f", "ee808f"], # [WHITE UP POINTING INDEX] U+E4F6 -> U+E00F
+  ["eeb1a0", "ee88ae"], # [WHITE UP POINTING BACKHAND INDEX] U+EA8D -> U+E22E
+  ["eeb1a1", "ee88af"], # [WHITE DOWN POINTING BACKHAND INDEX] U+EA8E -> U+E22F
+  ["eebf98", "ee88b0"], # [WHITE LEFT POINTING BACKHAND INDEX] U+E4FF -> U+E230
+  ["eebf99", "ee88b1"], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E500 -> U+E231
+  ["eeb2aa", "ee909e"], # [WAVING HAND SIGN] U+EAD6 -> U+E41E
+  ["eeb2a7", "ee909f"], # [CLAPPING HANDS SIGN] U+EAD3 -> U+E41F
+  ["eeb2a8", "ee90a0"], # [OK HAND SIGN] U+EAD4 -> U+E420
+  ["eeb2a9", "ee90a1"], # [THUMBS DOWN SIGN] U+EAD5 -> U+E421
+  ["ef8294", :undef], # [EMOJI COMPATIBILITY SYMBOL-37] U+E577 -> "[EZ]"
+  ["ef838f", :undef], # [EMOJI COMPATIBILITY SYMBOL-38] U+E5B2 -> "[ezplus]"
+  ["eeb1b0", :undef], # [EMOJI COMPATIBILITY SYMBOL-39] U+EA9D -> "[EZナビ]"
+  ["eeb5b8", :undef], # [EMOJI COMPATIBILITY SYMBOL-40] U+EB74 -> "[EZムービー]"
+  ["eeb686", :undef], # [EMOJI COMPATIBILITY SYMBOL-41] U+EB81 -> "[Cメール]"
+  ["eeb68e", :undef], # [EMOJI COMPATIBILITY SYMBOL-42] U+EB89 -> "[Java]"
+  ["eeb68f", :undef], # [EMOJI COMPATIBILITY SYMBOL-43] U+EB8A -> "[BREW]"
+  ["eeb690", :undef], # [EMOJI COMPATIBILITY SYMBOL-44] U+EB8B -> "[EZ着うた]"
+  ["eeb691", :undef], # [EMOJI COMPATIBILITY SYMBOL-45] U+EB8C -> "[EZナビ]"
+  ["eeb692", :undef], # [EMOJI COMPATIBILITY SYMBOL-46] U+EB8D -> "[WIN]"
+  ["eeb693", :undef], # [EMOJI COMPATIBILITY SYMBOL-47] U+EB8E -> "[プレミアム]"
+  ["ef8392", :undef], # [EMOJI COMPATIBILITY SYMBOL-48] U+EAFB -> "[オープンウェブ]"
+  ["ef82a3", :undef], # [EMOJI COMPATIBILITY SYMBOL-49] U+E586 -> "[PDC]"
+  ["ef8188", :undef], # [EMOJI COMPATIBILITY SYMBOL-66] U+E52C -> "[Q]"
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-KDDI']['UTF-8'] = [
+  # for documented codepoints
+  ["ee9288", "e29880"], # [BLACK SUN WITH RAYS] U+E488 -> U+2600
+  ["ee928d", "e29881"], # [CLOUD] U+E48D -> U+2601
+  ["ee928c", "e29894"], # [UMBRELLA WITH RAIN DROPS] U+E48C -> U+2614
+  ["ee9285", "e29b84"], # [SNOWMAN WITHOUT SNOW] U+E485 -> U+26C4
+  ["ee9287", "e29aa1"], # [HIGH VOLTAGE SIGN] U+E487 -> U+26A1
+  ["ee91a9", :undef], # [CYCLONE] U+E469 -> U+1F300
+  ["ee9698", :undef], # [FOGGY] U+E598 -> U+1F301
+  ["eeaba8", :undef], # [CLOSED UMBRELLA] U+EAE8 -> U+1F302
+  ["eeabb1", :undef], # [NIGHT WITH STARS] U+EAF1 -> U+1F303
+  ["eeabb4", :undef], # [SUNRISE] U+EAF4 -> U+1F305
+  ["ee979a", :undef], # [CITYSCAPE AT DUSK] U+E5DA -> "[夕焼け]"
+  ["eeabb2", :undef], # [RAINBOW] U+EAF2 -> U+1F308
+  ["ee928a", "e29d84"], # [SNOWFLAKE] U+E48A -> U+2744
+  ["ee928e", "e29b85"], # [SUN BEHIND CLOUD] U+E48E -> U+26C5
+  ["ee92bf", :undef], # [BRIDGE AT NIGHT] U+E4BF -> U+1F309
+  ["eeadbc", :undef], # [WATER WAVE] U+EB7C -> U+1F30A
+  ["eead93", :undef], # [VOLCANO] U+EB53 -> U+1F30B
+  ["eead9f", :undef], # [MILKY WAY] U+EB5F -> U+1F30C
+  ["ee96b3", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+E5B3 -> U+1F30F
+  ["ee96a8", :undef], # [NEW MOON SYMBOL] U+E5A8 -> U+1F311
+  ["ee96a9", :undef], # [WAXING GIBBOUS MOON SYMBOL] U+E5A9 -> U+1F314
+  ["ee96aa", :undef], # [FIRST QUARTER MOON SYMBOL] U+E5AA -> U+1F313
+  ["ee9286", :undef], # [CRESCENT MOON] U+E486 -> U+1F319
+  ["ee9289", :undef], # [FIRST QUARTER MOON WITH FACE] U+E489 -> U+1F31B
+  ["ee91a8", :undef], # [SHOOTING STAR] U+E468 -> U+1F320
+  ["ee95ba", "e28c9a"], # [WATCH] U+E57A -> U+231A
+  ["ee95bb", "e28c9b"], # [HOURGLASS] U+E57B -> U+231B
+  ["ee9694", :undef], # [ALARM CLOCK] U+E594 -> U+23F0
+  ["ee91bc", :undef], # [HOURGLASS WITH FLOWING SAND] U+E47C -> U+23F3
+  ["ee928f", "e29988"], # [ARIES] U+E48F -> U+2648
+  ["ee9290", "e29989"], # [TAURUS] U+E490 -> U+2649
+  ["ee9291", "e2998a"], # [GEMINI] U+E491 -> U+264A
+  ["ee9292", "e2998b"], # [CANCER] U+E492 -> U+264B
+  ["ee9293", "e2998c"], # [LEO] U+E493 -> U+264C
+  ["ee9294", "e2998d"], # [VIRGO] U+E494 -> U+264D
+  ["ee9295", "e2998e"], # [LIBRA] U+E495 -> U+264E
+  ["ee9296", "e2998f"], # [SCORPIUS] U+E496 -> U+264F
+  ["ee9297", "e29990"], # [SAGITTARIUS] U+E497 -> U+2650
+  ["ee9298", "e29991"], # [CAPRICORN] U+E498 -> U+2651
+  ["ee9299", "e29992"], # [AQUARIUS] U+E499 -> U+2652
+  ["ee929a", "e29993"], # [PISCES] U+E49A -> U+2653
+  ["ee929b", :undef], # [OPHIUCHUS] U+E49B -> U+26CE
+  ["ee9493", :undef], # [FOUR LEAF CLOVER] U+E513 -> U+1F340
+  ["ee93a4", :undef], # [TULIP] U+E4E4 -> U+1F337
+  ["eeadbd", :undef], # [SEEDLING] U+EB7D -> U+1F331
+  ["ee938e", :undef], # [MAPLE LEAF] U+E4CE -> U+1F341
+  ["ee938a", :undef], # [CHERRY BLOSSOM] U+E4CA -> U+1F338
+  ["ee96ba", :undef], # [ROSE] U+E5BA -> U+1F339
+  ["ee978d", :undef], # [FALLEN LEAF] U+E5CD -> U+1F342
+  ["eeaa94", :undef], # [HIBISCUS] U+EA94 -> U+1F33A
+  ["ee93a3", :undef], # [SUNFLOWER] U+E4E3 -> U+1F33B
+  ["ee93a2", :undef], # [PALM TREE] U+E4E2 -> U+1F334
+  ["eeaa96", :undef], # [CACTUS] U+EA96 -> U+1F335
+  ["eeacb6", :undef], # [EAR OF MAIZE] U+EB36 -> U+1F33D
+  ["eeacb7", :undef], # [MUSHROOM] U+EB37 -> U+1F344
+  ["eeacb8", :undef], # [CHESTNUT] U+EB38 -> U+1F330
+  ["eead89", :undef], # [BLOSSOM] U+EB49 -> U+1F33C
+  ["eeae82", :undef], # [HERB] U+EB82 -> U+1F33F
+  ["ee9392", :undef], # [CHERRIES] U+E4D2 -> U+1F352
+  ["eeacb5", :undef], # [BANANA] U+EB35 -> U+1F34C
+  ["eeaab9", :undef], # [RED APPLE] U+EAB9 -> U+1F34E
+  ["eeaaba", :undef], # [TANGERINE] U+EABA -> U+1F34A
+  ["ee9394", :undef], # [STRAWBERRY] U+E4D4 -> U+1F353
+  ["ee938d", :undef], # [WATERMELON] U+E4CD -> U+1F349
+  ["eeaabb", :undef], # [TOMATO] U+EABB -> U+1F345
+  ["eeaabc", :undef], # [AUBERGINE] U+EABC -> U+1F346
+  ["eeacb2", :undef], # [MELON] U+EB32 -> U+1F348
+  ["eeacb3", :undef], # [PINEAPPLE] U+EB33 -> U+1F34D
+  ["eeacb4", :undef], # [GRAPES] U+EB34 -> U+1F347
+  ["eeacb9", :undef], # [PEACH] U+EB39 -> U+1F351
+  ["eead9a", :undef], # [GREEN APPLE] U+EB5A -> U+1F34F
+  ["ee96a4", :undef], # [EYES] U+E5A4 -> U+1F440
+  ["ee96a5", :undef], # [EAR] U+E5A5 -> U+1F442
+  ["eeab90", :undef], # [NOSE] U+EAD0 -> U+1F443
+  ["eeab91", :undef], # [MOUTH] U+EAD1 -> U+1F444
+  ["eead87", :undef], # [TONGUE] U+EB47 -> U+1F445
+  ["ee9489", :undef], # [LIPSTICK] U+E509 -> U+1F484
+  ["eeaaa0", :undef], # [NAIL POLISH] U+EAA0 -> U+1F485
+  ["ee948b", :undef], # [FACE MASSAGE] U+E50B -> U+1F486
+  ["eeaaa1", :undef], # [HAIRCUT] U+EAA1 -> U+1F487
+  ["eeaaa2", :undef], # [BARBER POLE] U+EAA2 -> U+1F488
+  ["ee93bc", :undef], # [BOY] U+E4FC -> U+1F466
+  ["ee93ba", :undef], # [GIRL] U+E4FA -> U+1F467
+  ["ee9481", :undef], # [FAMILY] U+E501 -> U+1F46A
+  ["ee979d", :undef], # [POLICE OFFICER] U+E5DD -> U+1F46E
+  ["eeab9b", :undef], # [WOMAN WITH BUNNY EARS] U+EADB -> U+1F46F
+  ["eeaba9", :undef], # [BRIDE WITH VEIL] U+EAE9 -> U+1F470
+  ["eeac93", :undef], # [WESTERN PERSON] U+EB13 -> U+1F471
+  ["eeac94", :undef], # [MAN WITH GUA PI MAO] U+EB14 -> U+1F472
+  ["eeac95", :undef], # [MAN WITH TURBAN] U+EB15 -> U+1F473
+  ["eeac96", :undef], # [OLDER MAN] U+EB16 -> U+1F474
+  ["eeac97", :undef], # [OLDER WOMAN] U+EB17 -> U+1F475
+  ["eeac98", :undef], # [BABY] U+EB18 -> U+1F476
+  ["eeac99", :undef], # [CONSTRUCTION WORKER] U+EB19 -> U+1F477
+  ["eeac9a", :undef], # [PRINCESS] U+EB1A -> U+1F478
+  ["eead84", :undef], # [JAPANESE OGRE] U+EB44 -> U+1F479
+  ["eead85", :undef], # [JAPANESE GOBLIN] U+EB45 -> U+1F47A
+  ["ee938b", :undef], # [GHOST] U+E4CB -> U+1F47B
+  ["ee96bf", :undef], # [BABY ANGEL] U+E5BF -> U+1F47C
+  ["ee948e", :undef], # [EXTRATERRESTRIAL ALIEN] U+E50E -> U+1F47D
+  ["ee93ac", :undef], # [ALIEN MONSTER] U+E4EC -> U+1F47E
+  ["ee93af", :undef], # [IMP] U+E4EF -> U+1F47F
+  ["ee93b8", :undef], # [SKULL] U+E4F8 -> U+1F480
+  ["eeac9c", :undef], # [DANCER] U+EB1C -> U+1F483
+  ["eeadbe", :undef], # [SNAIL] U+EB7E -> U+1F40C
+  ["eeaca2", :undef], # [SNAKE] U+EB22 -> U+1F40D
+  ["eeaca3", :undef], # [CHICKEN] U+EB23 -> U+1F414
+  ["eeaca4", :undef], # [BOAR] U+EB24 -> U+1F417
+  ["eeaca5", :undef], # [BACTRIAN CAMEL] U+EB25 -> U+1F42B
+  ["eeac9f", :undef], # [ELEPHANT] U+EB1F -> U+1F418
+  ["eeaca0", :undef], # [KOALA] U+EB20 -> U+1F428
+  ["ee9787", :undef], # [OCTOPUS] U+E5C7 -> U+1F419
+  ["eeabac", :undef], # [SPIRAL SHELL] U+EAEC -> U+1F41A
+  ["eeac9e", :undef], # [BUG] U+EB1E -> U+1F41B
+  ["ee939d", :undef], # [ANT] U+E4DD -> U+1F41C
+  ["eead97", :undef], # [HONEYBEE] U+EB57 -> U+1F41D
+  ["eead98", :undef], # [LADY BEETLE] U+EB58 -> U+1F41E
+  ["eeac9d", :undef], # [TROPICAL FISH] U+EB1D -> U+1F420
+  ["ee9393", :undef], # [BLOWFISH] U+E4D3 -> U+1F421
+  ["ee9794", :undef], # [TURTLE] U+E5D4 -> U+1F422
+  ["ee93a0", :undef], # [BABY CHICK] U+E4E0 -> U+1F424
+  ["eeadb6", :undef], # [FRONT-FACING BABY CHICK] U+EB76 -> U+1F425
+  ["ee979b", :undef], # [HATCHING CHICK] U+E5DB -> U+1F423
+  ["ee939c", :undef], # [PENGUIN] U+E4DC -> U+1F427
+  ["ee939f", :undef], # [POODLE] U+E4DF -> U+1F429
+  ["eeac9b", :undef], # [DOLPHIN] U+EB1B -> U+1F42C
+  ["ee9782", :undef], # [MOUSE FACE] U+E5C2 -> U+1F42D
+  ["ee9780", :undef], # [TIGER FACE] U+E5C0 -> U+1F42F
+  ["ee939b", :undef], # [CAT FACE] U+E4DB -> U+1F431
+  ["ee91b0", :undef], # [SPOUTING WHALE] U+E470 -> U+1F433
+  ["ee9398", :undef], # [HORSE FACE] U+E4D8 -> U+1F434
+  ["ee9399", :undef], # [MONKEY FACE] U+E4D9 -> U+1F435
+  ["ee93a1", :undef], # [DOG FACE] U+E4E1 -> U+1F436
+  ["ee939e", :undef], # [PIG FACE] U+E4DE -> U+1F437
+  ["ee9781", :undef], # [BEAR FACE] U+E5C1 -> U+1F43B
+  ["eeaca1", :undef], # [COW FACE] U+EB21 -> U+1F42E
+  ["ee9397", :undef], # [RABBIT FACE] U+E4D7 -> U+1F430
+  ["ee939a", :undef], # [FROG FACE] U+E4DA -> U+1F438
+  ["ee93ae", :undef], # [PAW PRINTS] U+E4EE -> U+1F43E
+  ["eeacbf", :undef], # [DRAGON FACE] U+EB3F -> U+1F432
+  ["eead86", :undef], # [PANDA FACE] U+EB46 -> U+1F43C
+  ["eead88", :undef], # [PIG NOSE] U+EB48 -> U+1F43D
+  ["ee91b2", :undef], # [ANGRY FACE] U+E472 -> U+1F600
+  ["eeada7", :undef], # [ANGUISHED FACE] U+EB67 -> U+1F601
+  ["eeab8a", :undef], # [ASTONISHED FACE] U+EACA -> U+1F602
+  ["ee96ae", :undef], # [DIZZY FACE] U+E5AE -> U+1F604
+  ["eeab8b", :undef], # [EXASPERATED FACE] U+EACB -> U+1F605
+  ["eeab89", :undef], # [EXPRESSIONLESS FACE] U+EAC9 -> U+1F606
+  ["ee9784", :undef], # [FACE WITH HEART-SHAPED EYES] U+E5C4 -> U+1F607
+  ["eeab81", :undef], # [FACE WITH LOOK OF TRIUMPH] U+EAC1 -> U+1F608
+  ["ee93a7", :undef], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E4E7 -> U+1F609
+  ["eeab8f", :undef], # [FACE THROWING A KISS] U+EACF -> U+1F60C
+  ["eeab8e", :undef], # [FACE KISSING] U+EACE -> U+1F60D
+  ["eeab87", :undef], # [FACE WITH MASK] U+EAC7 -> U+1F60E
+  ["eeab88", :undef], # [FLUSHED FACE] U+EAC8 -> U+1F60F
+  ["ee91b1", :undef], # [HAPPY FACE WITH OPEN MOUTH] U+E471 -> U+1F610
+  ["eeae80", :undef], # [HAPPY FACE WITH GRIN] U+EB80 -> U+1F613
+  ["eeada4", :undef], # [HAPPY AND CRYING FACE] U+EB64 -> U+1F614
+  ["eeab8d", :undef], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+EACD -> U+1F615
+  ["ee93bb", "e298ba"], # [WHITE SMILING FACE] U+E4FB -> U+263A
+  ["eeada9", :undef], # [CRYING FACE] U+EB69 -> U+1F617
+  ["ee91b3", :undef], # [LOUDLY CRYING FACE] U+E473 -> U+1F618
+  ["eeab86", :undef], # [FEARFUL FACE] U+EAC6 -> U+1F619
+  ["eeab82", :undef], # [PERSEVERING FACE] U+EAC2 -> U+1F61A
+  ["eead9d", :undef], # [POUTING FACE] U+EB5D -> U+1F61B
+  ["eeab85", :undef], # [RELIEVED FACE] U+EAC5 -> U+1F61C
+  ["eeab83", :undef], # [CONFOUNDED FACE] U+EAC3 -> U+1F61D
+  ["eeab80", :undef], # [PENSIVE FACE] U+EAC0 -> U+1F61E
+  ["ee9785", :undef], # [FACE SCREAMING IN FEAR] U+E5C5 -> U+1F61F
+  ["eeab84", :undef], # [SLEEPY FACE] U+EAC4 -> U+1F620
+  ["eeaabf", :undef], # [SMIRKING FACE] U+EABF -> U+1F621
+  ["ee9786", :undef], # [FACE WITH COLD SWEAT] U+E5C6 -> U+1F622
+  ["ee91b4", :undef], # [TIRED FACE] U+E474 -> U+1F624
+  ["ee9783", :undef], # [WINKING FACE] U+E5C3 -> U+1F625
+  ["eeada1", :undef], # [CAT FACE WITH OPEN MOUTH] U+EB61 -> U+1F62B
+  ["eeadbf", :undef], # [HAPPY CAT FACE WITH GRIN] U+EB7F -> U+1F62C
+  ["eeada3", :undef], # [HAPPY AND CRYING CAT FACE] U+EB63 -> U+1F62D
+  ["eeada0", :undef], # [CAT FACE KISSING] U+EB60 -> U+1F62E
+  ["eeada5", :undef], # [CAT FACE WITH HEART-SHAPED EYES] U+EB65 -> U+1F62F
+  ["eeada8", :undef], # [CRYING CAT FACE] U+EB68 -> U+1F630
+  ["eead9e", :undef], # [POUTING CAT FACE] U+EB5E -> U+1F631
+  ["eeadaa", :undef], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+EB6A -> U+1F632
+  ["eeada6", :undef], # [ANGUISHED CAT FACE] U+EB66 -> U+1F633
+  ["eeab97", :undef], # [FACE WITH NO GOOD GESTURE] U+EAD7 -> U+1F634
+  ["eeab98", :undef], # [FACE WITH OK GESTURE] U+EAD8 -> U+1F635
+  ["eeab99", :undef], # [PERSON BOWING DEEPLY] U+EAD9 -> U+1F636
+  ["eead90", :undef], # [SEE-NO-EVIL MONKEY] U+EB50 -> U+1F637
+  ["eead91", :undef], # [SPEAK-NO-EVIL MONKEY] U+EB51 -> U+1F639
+  ["eead92", :undef], # [HEAR-NO-EVIL MONKEY] U+EB52 -> U+1F638
+  ["eeae85", :undef], # [PERSON RAISING ONE HAND] U+EB85 -> U+1F63A
+  ["eeae86", :undef], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+EB86 -> U+1F63B
+  ["eeae87", :undef], # [PERSON FROWNING] U+EB87 -> U+1F63C
+  ["eeae88", :undef], # [PERSON WITH POUTING FACE] U+EB88 -> U+1F63D
+  ["eeab92", :undef], # [PERSON WITH FOLDED HANDS] U+EAD2 -> U+1F63E
+  ["ee92ab", :undef], # [HOUSE BUILDING] U+E4AB -> U+1F3E0
+  ["eeac89", :undef], # [HOUSE WITH GARDEN] U+EB09 -> U+1F3E1
+  ["ee92ad", :undef], # [OFFICE BUILDING] U+E4AD -> U+1F3E2
+  ["ee979e", :undef], # [JAPANESE POST OFFICE] U+E5DE -> U+1F3E3
+  ["ee979f", :undef], # [HOSPITAL] U+E5DF -> U+1F3E5
+  ["ee92aa", :undef], # [BANK] U+E4AA -> U+1F3E6
+  ["ee92a3", :undef], # [AUTOMATED TELLER MACHINE] U+E4A3 -> U+1F3E7
+  ["eeaa81", :undef], # [HOTEL] U+EA81 -> U+1F3E8
+  ["eeabb3", :undef], # [LOVE HOTEL] U+EAF3 -> U+1F3E9
+  ["ee92a4", :undef], # [CONVENIENCE STORE] U+E4A4 -> U+1F3EA
+  ["eeaa80", :undef], # [SCHOOL] U+EA80 -> U+1F3EB
+  ["ee96bb", "e29baa"], # [CHURCH] U+E5BB -> U+26EA
+  ["ee978f", "e29bb2"], # [FOUNTAIN] U+E5CF -> U+26F2
+  ["eeabb6", :undef], # [DEPARTMENT STORE] U+EAF6 -> U+1F3EC
+  ["eeabb7", :undef], # [JAPANESE CASTLE] U+EAF7 -> U+1F3EF
+  ["eeabb8", :undef], # [EUROPEAN CASTLE] U+EAF8 -> U+1F3F0
+  ["eeabb9", :undef], # [FACTORY] U+EAF9 -> U+1F3ED
+  ["ee92a9", "e29a93"], # [ANCHOR] U+E4A9 -> U+2693
+  ["ee92bd", :undef], # [IZAKAYA LANTERN] U+E4BD -> U+1F3EE
+  ["ee96bd", :undef], # [MOUNT FUJI] U+E5BD -> U+1F5FB
+  ["ee9380", :undef], # [TOKYO TOWER] U+E4C0 -> U+1F5FC
+  ["ee95b2", :undef], # [SILHOUETTE OF JAPAN] U+E572 -> U+1F5FE
+  ["eeadac", :undef], # [MOYAI] U+EB6C -> U+1F5FF
+  ["ee96b7", :undef], # [MANS SHOE] U+E5B7 -> U+1F45E
+  ["eeacab", :undef], # [ATHLETIC SHOE] U+EB2B -> U+1F45F
+  ["ee949a", :undef], # [HIGH-HEELED SHOE] U+E51A -> U+1F460
+  ["eeaa9f", :undef], # [WOMANS BOOTS] U+EA9F -> U+1F462
+  ["eeacaa", :undef], # [FOOTPRINTS] U+EB2A -> U+1F463
+  ["ee93be", :undef], # [EYEGLASSES] U+E4FE -> U+1F453
+  ["ee96b6", :undef], # [T-SHIRT] U+E5B6 -> U+1F455
+  ["eeadb7", :undef], # [JEANS] U+EB77 -> U+1F456
+  ["ee9789", :undef], # [CROWN] U+E5C9 -> U+1F451
+  ["eeaa93", :undef], # [NECKTIE] U+EA93 -> U+1F454
+  ["eeaa9e", :undef], # [WOMANS HAT] U+EA9E -> U+1F452
+  ["eeadab", :undef], # [DRESS] U+EB6B -> U+1F457
+  ["eeaaa3", :undef], # [KIMONO] U+EAA3 -> U+1F458
+  ["eeaaa4", :undef], # [BIKINI] U+EAA4 -> U+1F459
+  ["ee948d", :undef], # [WOMANS CLOTHES] U+E50D -> U+1F45A
+  ["ee9484", :undef], # [PURSE] U+E504 -> U+1F45B
+  ["ee929c", :undef], # [HANDBAG] U+E49C -> U+1F45C
+  ["ee9387", :undef], # [MONEY BAG] U+E4C7 -> U+1F4B0
+  ["ee979c", :undef], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E5DC -> U+1F4B9
+  ["ee95b9", :undef], # [HEAVY DOLLAR SIGN] U+E579 -> U+1F4B2
+  ["ee95bc", :undef], # [CREDIT CARD] U+E57C -> U+1F4B3
+  ["ee95bd", :undef], # [BANKNOTE WITH YEN SIGN] U+E57D -> U+1F4B4
+  ["ee9685", :undef], # [BANKNOTE WITH DOLLAR SIGN] U+E585 -> U+1F4B5
+  ["eead9b", :undef], # [MONEY WITH WINGS] U+EB5B -> U+1F4B8
+  ["eeac91", "f09f87a8f09f87b3"], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+EB11 -> U+1F1E8 U+1F1F3
+  ["eeac8e", "f09f87a9f09f87aa"], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+EB0E -> U+1F1E9 U+1F1EA
+  ["ee9795", "f09f87aaf09f87b8"], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E5D5 -> U+1F1EA U+1F1F8
+  ["eeabba", "f09f87abf09f87b7"], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+EAFA -> U+1F1EB U+1F1F7
+  ["eeac90", "f09f87baf09f87b0"], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+EB10 -> U+1F1FA U+1F1F0
+  ["eeac8f", "f09f87aef09f87b9"], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+EB0F -> U+1F1EE U+1F1F9
+  ["ee938c", "f09f87aff09f87b5"], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E4CC -> U+1F1EF U+1F1F5
+  ["eeac92", "f09f87b0f09f87b7"], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+EB12 -> U+1F1F0 U+1F1F7
+  ["ee9796", "f09f87b7f09f87ba"], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E5D6 -> U+1F1F7 U+1F1FA
+  ["ee95b3", "f09f87baf09f87b8"], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E573 -> U+1F1FA U+1F1F8
+  ["ee91bb", :undef], # [FIRE] U+E47B -> U+1F525
+  ["ee9683", :undef], # [ELECTRIC TORCH] U+E583 -> U+1F526
+  ["ee9687", :undef], # [WRENCH] U+E587 -> U+1F527
+  ["ee978b", :undef], # [HAMMER] U+E5CB -> U+1F528
+  ["ee9681", :undef], # [NUT AND BOLT] U+E581 -> U+1F529
+  ["ee95bf", :undef], # [HOCHO] U+E57F -> U+1F52A
+  ["ee948a", :undef], # [PISTOL] U+E50A -> U+1F52B
+  ["eeaa8f", :undef], # [CRYSTAL BALL] U+EA8F -> U+1F52E
+  ["ee9280", :undef], # [JAPANESE SYMBOL FOR BEGINNER] U+E480 -> U+1F530
+  ["ee9490", :undef], # [SYRINGE] U+E510 -> U+1F489
+  ["eeaa9a", :undef], # [PILL] U+EA9A -> U+1F48A
+  ["eeaca6", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+EB26 -> U+1F170
+  ["eeaca7", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+EB27 -> U+1F171
+  ["eeaca9", :undef], # [NEGATIVE SQUARED AB] U+EB29 -> U+1F18E
+  ["eeaca8", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+EB28 -> U+1F17E
+  ["ee969f", :undef], # [RIBBON] U+E59F -> U+1F380
+  ["ee938f", :undef], # [WRAPPED PRESENT] U+E4CF -> U+1F381
+  ["ee96a0", :undef], # [BIRTHDAY CAKE] U+E5A0 -> U+1F382
+  ["ee9389", :undef], # [CHRISTMAS TREE] U+E4C9 -> U+1F384
+  ["eeabb0", :undef], # [FATHER CHRISTMAS] U+EAF0 -> U+1F385
+  ["ee9799", :undef], # [CROSSED FLAGS] U+E5D9 -> U+1F38C
+  ["ee978c", :undef], # [FIREWORKS] U+E5CC -> U+1F386
+  ["eeaa9b", :undef], # [BALLOON] U+EA9B -> U+1F388
+  ["eeaa9c", :undef], # [PARTY POPPER] U+EA9C -> U+1F389
+  ["eeaba3", :undef], # [PINE DECORATION] U+EAE3 -> U+1F38D
+  ["eeaba4", :undef], # [JAPANESE DOLLS] U+EAE4 -> U+1F38E
+  ["eeaba5", :undef], # [GRADUATION CAP] U+EAE5 -> U+1F393
+  ["eeaba6", :undef], # [SCHOOL SATCHEL] U+EAE6 -> U+1F392
+  ["eeaba7", :undef], # [CARP STREAMER] U+EAE7 -> U+1F38F
+  ["eeabab", :undef], # [FIREWORK SPARKLER] U+EAEB -> U+1F387
+  ["eeabad", :undef], # [WIND CHIME] U+EAED -> U+1F390
+  ["eeabae", :undef], # [JACK-O-LANTERN] U+EAEE -> U+1F383
+  ["ee91af", :undef], # [CONFETTI BALL] U+E46F -> U+1F38A
+  ["eeacbd", :undef], # [TANABATA TREE] U+EB3D -> U+1F38B
+  ["eeabaf", :undef], # [MOON VIEWING CEREMONY] U+EAEF -> U+1F391
+  ["ee969b", :undef], # [PAGER] U+E59B -> U+1F4DF
+  ["ee9696", "e2988e"], # [BLACK TELEPHONE] U+E596 -> U+260E
+  ["ee949e", :undef], # [TELEPHONE RECEIVER] U+E51E -> U+1F4DE
+  ["ee9688", :undef], # [MOBILE PHONE] U+E588 -> U+1F4F1
+  ["eeac88", :undef], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+EB08 -> U+1F4F2
+  ["eeaa92", :undef], # [MEMO] U+EA92 -> U+1F4DD
+  ["ee94a0", :undef], # [FAX MACHINE] U+E520 -> U+1F4E0
+  ["ee94a1", "e29c89"], # [ENVELOPE] U+E521 -> U+2709
+  ["ee9691", :undef], # [INCOMING ENVELOPE] U+E591 -> U+1F4E8
+  ["eeada2", :undef], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+EB62 -> U+1F4E9
+  ["ee949b", :undef], # [CLOSED MAILBOX WITH LOWERED FLAG] U+E51B -> U+1F4EA
+  ["eeac8a", :undef], # [CLOSED MAILBOX WITH RAISED FLAG] U+EB0A -> U+1F4EB
+  ["ee968b", :undef], # [NEWSPAPER] U+E58B -> U+1F4F0
+  ["ee92a8", :undef], # [SATELLITE ANTENNA] U+E4A8 -> U+1F4E1
+  ["ee9692", :undef], # [OUTBOX TRAY] U+E592 -> U+1F4E4
+  ["ee9693", :undef], # [INBOX TRAY] U+E593 -> U+1F4E5
+  ["ee949f", :undef], # [PACKAGE] U+E51F -> U+1F4E6
+  ["eeadb1", :undef], # [E-MAIL SYMBOL] U+EB71 -> U+1F4E7
+  ["eeabbd", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+EAFD -> U+1F520
+  ["eeabbe", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+EAFE -> U+1F521
+  ["eeabbf", :undef], # [INPUT SYMBOL FOR NUMBERS] U+EAFF -> U+1F522
+  ["eeac80", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+EB00 -> U+1F523
+  ["eead95", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+EB55 -> U+1F524
+  ["eeac83", "e29c92"], # [BLACK NIB] U+EB03 -> U+2712
+  ["ee96b8", :undef], # [PERSONAL COMPUTER] U+E5B8 -> U+1F4BB
+  ["ee92a1", "e29c8f"], # [PENCIL] U+E4A1 -> U+270F
+  ["ee92a0", :undef], # [PAPERCLIP] U+E4A0 -> U+1F4CE
+  ["ee978e", :undef], # [BRIEFCASE] U+E5CE -> U+1F4BC
+  ["ee9682", :undef], # [MINIDISC] U+E582 -> U+1F4BD
+  ["ee95a2", :undef], # [FLOPPY DISK] U+E562 -> U+1F4BE
+  ["ee948c", :undef], # [OPTICAL DISC] U+E50C -> U+1F4BF
+  ["ee9496", "e29c82"], # [BLACK SCISSORS] U+E516 -> U+2702
+  ["ee95a0", :undef], # [ROUND PUSHPIN] U+E560 -> U+1F4CD
+  ["ee95a1", :undef], # [PAGE WITH CURL] U+E561 -> U+1F4C3
+  ["ee95a9", :undef], # [PAGE FACING UP] U+E569 -> U+1F4C4
+  ["ee95a3", :undef], # [CALENDAR] U+E563 -> U+1F4C5
+  ["ee968f", :undef], # [FILE FOLDER] U+E58F -> U+1F4C1
+  ["ee9690", :undef], # [OPEN FILE FOLDER] U+E590 -> U+1F4C2
+  ["ee95ab", :undef], # [NOTEBOOK] U+E56B -> U+1F4D3
+  ["ee929f", :undef], # [OPEN BOOK] U+E49F -> U+1F4D6
+  ["ee929d", :undef], # [NOTEBOOK WITH DECORATIVE COVER] U+E49D -> U+1F4D4
+  ["ee95a8", :undef], # [CLOSED BOOK] U+E568 -> U+1F4D5
+  ["ee95a5", :undef], # [GREEN BOOK] U+E565 -> U+1F4D7
+  ["ee95a6", :undef], # [BLUE BOOK] U+E566 -> U+1F4D8
+  ["ee95a7", :undef], # [ORANGE BOOK] U+E567 -> U+1F4D9
+  ["ee95af", :undef], # [BOOKS] U+E56F -> U+1F4DA
+  ["ee949d", :undef], # [NAME BADGE] U+E51D -> U+1F4DB
+  ["ee959f", :undef], # [SCROLL] U+E55F -> U+1F4DC
+  ["ee95a4", :undef], # [CLIPBOARD] U+E564 -> U+1F4CB
+  ["ee95aa", :undef], # [TEAR-OFF CALENDAR] U+E56A -> U+1F4C6
+  ["ee95b4", :undef], # [BAR CHART] U+E574 -> U+1F4CA
+  ["ee95b5", :undef], # [CHART WITH UPWARDS TREND] U+E575 -> U+1F4C8
+  ["ee95b6", :undef], # [CHART WITH DOWNWARDS TREND] U+E576 -> U+1F4C9
+  ["ee95ac", :undef], # [CARD INDEX] U+E56C -> U+1F4C7
+  ["ee95ad", :undef], # [PUSHPIN] U+E56D -> U+1F4CC
+  ["ee95ae", :undef], # [LEDGER] U+E56E -> U+1F4D2
+  ["ee95b0", :undef], # [STRAIGHT RULER] U+E570 -> U+1F4CF
+  ["ee92a2", :undef], # [TRIANGULAR RULER] U+E4A2 -> U+1F4D0
+  ["eeac8b", :undef], # [BOOKMARK TABS] U+EB0B -> U+1F4D1
+  ["ee92ba", "e29abe"], # [BASEBALL] U+E4BA -> U+26BE
+  ["ee9699", "e29bb3"], # [FLAG IN HOLE] U+E599 -> U+26F3
+  ["ee92b7", :undef], # [TENNIS RACQUET AND BALL] U+E4B7 -> U+1F3BE
+  ["ee92b6", "e29abd"], # [SOCCER BALL] U+E4B6 -> U+26BD
+  ["eeaaac", :undef], # [SKI AND SKI BOOT] U+EAAC -> U+1F3BF
+  ["ee969a", :undef], # [BASKETBALL AND HOOP] U+E59A -> U+1F3C0
+  ["ee92b9", :undef], # [CHEQUERED FLAG] U+E4B9 -> U+1F3C1
+  ["ee92b8", :undef], # [SNOWBOARDER] U+E4B8 -> U+1F3C2
+  ["ee91ab", :undef], # [RUNNER] U+E46B -> U+1F3C3
+  ["eead81", :undef], # [SURFER] U+EB41 -> U+1F3C4
+  ["ee9793", :undef], # [TROPHY] U+E5D3 -> U+1F3C6
+  ["ee92bb", :undef], # [AMERICAN FOOTBALL] U+E4BB -> U+1F3C8
+  ["eeab9e", :undef], # [SWIMMER] U+EADE -> U+1F3CA
+  ["ee92b5", :undef], # [TRAIN] U+E4B5 -> U+1F686
+  ["ee96bc", :undef], # [METRO] U+E5BC -> U+1F687
+  ["ee92b0", :undef], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E4B0 -> U+1F685
+  ["ee92b1", :undef], # [AUTOMOBILE] U+E4B1 -> U+1F697
+  ["ee92af", :undef], # [ONCOMING BUS] U+E4AF -> U+1F68D
+  ["ee92a7", :undef], # [BUS STOP] U+E4A7 -> U+1F68F
+  ["eeaa82", :undef], # [SHIP] U+EA82 -> U+1F6A2
+  ["ee92b3", "e29c88"], # [AIRPLANE] U+E4B3 -> U+2708
+  ["ee92b4", "e29bb5"], # [SAILBOAT] U+E4B4 -> U+26F5
+  ["eeadad", :undef], # [STATION] U+EB6D -> U+1F689
+  ["ee9788", :undef], # [ROCKET] U+E5C8 -> U+1F680
+  ["ee92b2", :undef], # [DELIVERY TRUCK] U+E4B2 -> U+1F69A
+  ["eeab9f", :undef], # [FIRE ENGINE] U+EADF -> U+1F692
+  ["eeaba0", :undef], # [AMBULANCE] U+EAE0 -> U+1F691
+  ["eeaba1", :undef], # [POLICE CAR] U+EAE1 -> U+1F693
+  ["ee95b1", "e29bbd"], # [FUEL PUMP] U+E571 -> U+26FD
+  ["ee92a6", "f09f85bf"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E4A6 -> U+1F17F
+  ["ee91aa", :undef], # [HORIZONTAL TRAFFIC LIGHT] U+E46A -> U+1F6A5
+  ["ee9797", :undef], # [CONSTRUCTION SIGN] U+E5D7 -> U+1F6A7
+  ["eeadb3", :undef], # [POLICE CARS REVOLVING LIGHT] U+EB73 -> U+1F6A8
+  ["ee92bc", "e299a8"], # [HOT SPRINGS] U+E4BC -> U+2668
+  ["ee9790", "e29bba"], # [TENT] U+E5D0 -> U+26FA
+  ["ee91ad", :undef], # [FERRIS WHEEL] U+E46D -> U+1F3A1
+  ["eeaba2", :undef], # [ROLLER COASTER] U+EAE2 -> U+1F3A2
+  ["eead82", :undef], # [FISHING POLE AND FISH] U+EB42 -> U+1F3A3
+  ["ee9483", :undef], # [MICROPHONE] U+E503 -> U+1F3A4
+  ["ee9497", :undef], # [MOVIE CAMERA] U+E517 -> U+1F3A5
+  ["ee9488", :undef], # [HEADPHONE] U+E508 -> U+1F3A7
+  ["ee969c", :undef], # [ARTIST PALETTE] U+E59C -> U+1F3A8
+  ["eeabb5", :undef], # [TOP HAT] U+EAF5 -> U+1F3A9
+  ["ee969e", :undef], # [CIRCUS TENT] U+E59E -> U+1F3AA
+  ["ee929e", :undef], # [TICKET] U+E49E -> U+1F3AB
+  ["ee92be", :undef], # [CLAPPER BOARD] U+E4BE -> U+1F3AC
+  ["ee969d", :undef], # [PERFORMING ARTS] U+E59D -> U+1F3AD
+  ["ee9386", :undef], # [VIDEO GAME] U+E4C6 -> U+1F3AE
+  ["ee9791", "f09f8084"], # [MAHJONG TILE RED DRAGON] U+E5D1 -> U+1F004
+  ["ee9385", :undef], # [DIRECT HIT] U+E4C5 -> U+1F3AF
+  ["ee91ae", :undef], # [SLOT MACHINE] U+E46E -> U+1F3B0
+  ["eeab9d", :undef], # [BILLIARDS] U+EADD -> U+1F3B1
+  ["ee9388", :undef], # [GAME DIE] U+E4C8 -> U+1F3B2
+  ["eead83", :undef], # [BOWLING] U+EB43 -> U+1F3B3
+  ["eeadae", :undef], # [FLOWER PLAYING CARDS] U+EB6E -> U+1F3B4
+  ["eeadaf", :undef], # [PLAYING CARD BLACK JOKER] U+EB6F -> U+1F0CF
+  ["ee96be", :undef], # [MUSICAL NOTE] U+E5BE -> U+1F3B5
+  ["ee9485", :undef], # [MULTIPLE MUSICAL NOTES] U+E505 -> U+1F3B6
+  ["ee9486", :undef], # [GUITAR] U+E506 -> U+1F3B8
+  ["eead80", :undef], # [MUSICAL KEYBOARD] U+EB40 -> U+1F3B9
+  ["eeab9c", :undef], # [TRUMPET] U+EADC -> U+1F3BA
+  ["ee9487", :undef], # [VIOLIN] U+E507 -> U+1F3BB
+  ["eeab8c", :undef], # [MUSICAL SCORE] U+EACC -> U+1F3BC
+  ["ee9495", :undef], # [CAMERA] U+E515 -> U+1F4F7
+  ["ee95be", :undef], # [VIDEO CAMERA] U+E57E -> U+1F4F9
+  ["ee9482", :undef], # [TELEVISION] U+E502 -> U+1F4FA
+  ["ee96b9", :undef], # [RADIO] U+E5B9 -> U+1F4FB
+  ["ee9680", :undef], # [VIDEOCASSETTE] U+E580 -> U+1F4FC
+  ["ee93ab", :undef], # [KISS MARK] U+E4EB -> U+1F48B
+  ["eeadb8", :undef], # [LOVE LETTER] U+EB78 -> U+1F48C
+  ["ee9494", :undef], # [RING] U+E514 -> U+1F48D
+  ["ee978a", :undef], # [KISS] U+E5CA -> U+1F48F
+  ["eeaa95", :undef], # [BOUQUET] U+EA95 -> U+1F490
+  ["eeab9a", :undef], # [COUPLE WITH HEART] U+EADA -> U+1F491
+  ["eeaa83", :undef], # [NO ONE UNDER EIGHTEEN SYMBOL] U+EA83 -> U+1F51E
+  ["ee9598", "c2a9"], # [COPYRIGHT SIGN] U+E558 -> U+A9
+  ["ee9599", "c2ae"], # [REGISTERED SIGN] U+E559 -> U+AE
+  ["ee958e", "e284a2"], # [TRADE MARK SIGN] U+E54E -> U+2122
+  ["ee94b3", "e284b9"], # [INFORMATION SOURCE] U+E533 -> U+2139
+  ["eeae84", "23e283a3"], # [HASH KEY] U+EB84 -> U+23 U+20E3
+  ["ee94a2", "31e283a3"], # [KEYCAP 1] U+E522 -> U+31 U+20E3
+  ["ee94a3", "32e283a3"], # [KEYCAP 2] U+E523 -> U+32 U+20E3
+  ["ee94a4", "33e283a3"], # [KEYCAP 3] U+E524 -> U+33 U+20E3
+  ["ee94a5", "34e283a3"], # [KEYCAP 4] U+E525 -> U+34 U+20E3
+  ["ee94a6", "35e283a3"], # [KEYCAP 5] U+E526 -> U+35 U+20E3
+  ["ee94a7", "36e283a3"], # [KEYCAP 6] U+E527 -> U+36 U+20E3
+  ["ee94a8", "37e283a3"], # [KEYCAP 7] U+E528 -> U+37 U+20E3
+  ["ee94a9", "38e283a3"], # [KEYCAP 8] U+E529 -> U+38 U+20E3
+  ["ee94aa", "39e283a3"], # [KEYCAP 9] U+E52A -> U+39 U+20E3
+  ["ee96ac", "30e283a3"], # [KEYCAP 0] U+E5AC -> U+30 U+20E3
+  ["ee94ab", :undef], # [KEYCAP TEN] U+E52B -> U+1F51F
+  ["eeaa84", :undef], # [ANTENNA WITH BARS] U+EA84 -> U+1F4F6
+  ["eeaa90", :undef], # [VIBRATION MODE] U+EA90 -> U+1F4F3
+  ["eeaa91", :undef], # [MOBILE PHONE OFF] U+EA91 -> U+1F4F4
+  ["ee9396", :undef], # [HAMBURGER] U+E4D6 -> U+1F354
+  ["ee9395", :undef], # [RICE BALL] U+E4D5 -> U+1F359
+  ["ee9390", :undef], # [SHORTCAKE] U+E4D0 -> U+1F370
+  ["ee96b4", :undef], # [STEAMING BOWL] U+E5B4 -> U+1F35C
+  ["eeaaaf", :undef], # [BREAD] U+EAAF -> U+1F35E
+  ["ee9391", :undef], # [COOKING] U+E4D1 -> U+1F373
+  ["eeaab0", :undef], # [SOFT ICE CREAM] U+EAB0 -> U+1F366
+  ["eeaab1", :undef], # [FRENCH FRIES] U+EAB1 -> U+1F35F
+  ["eeaab2", :undef], # [DANGO] U+EAB2 -> U+1F361
+  ["eeaab3", :undef], # [RICE CRACKER] U+EAB3 -> U+1F358
+  ["eeaab4", :undef], # [COOKED RICE] U+EAB4 -> U+1F35A
+  ["eeaab5", :undef], # [SPAGHETTI] U+EAB5 -> U+1F35D
+  ["eeaab6", :undef], # [CURRY AND RICE] U+EAB6 -> U+1F35B
+  ["eeaab7", :undef], # [ODEN] U+EAB7 -> U+1F362
+  ["eeaab8", :undef], # [SUSHI] U+EAB8 -> U+1F363
+  ["eeaabd", :undef], # [BENTO BOX] U+EABD -> U+1F371
+  ["eeaabe", :undef], # [POT OF FOOD] U+EABE -> U+1F372
+  ["eeabaa", :undef], # [SHAVED ICE] U+EAEA -> U+1F367
+  ["ee9384", :undef], # [MEAT ON BONE] U+E4C4 -> U+1F356
+  ["ee93ad", :undef], # [FISH CAKE WITH SWIRL DESIGN] U+E4ED -> U+1F365
+  ["eeacba", :undef], # [ROASTED SWEET POTATO] U+EB3A -> U+1F360
+  ["eeacbb", :undef], # [SLICE OF PIZZA] U+EB3B -> U+1F355
+  ["eeacbc", :undef], # [POULTRY LEG] U+EB3C -> U+1F357
+  ["eead8a", :undef], # [ICE CREAM] U+EB4A -> U+1F368
+  ["eead8b", :undef], # [DOUGHNUT] U+EB4B -> U+1F369
+  ["eead8c", :undef], # [COOKIE] U+EB4C -> U+1F36A
+  ["eead8d", :undef], # [CHOCOLATE BAR] U+EB4D -> U+1F36B
+  ["eead8e", :undef], # [CANDY] U+EB4E -> U+1F36C
+  ["eead8f", :undef], # [LOLLIPOP] U+EB4F -> U+1F36D
+  ["eead96", :undef], # [CUSTARD] U+EB56 -> U+1F36E
+  ["eead99", :undef], # [HONEY POT] U+EB59 -> U+1F36F
+  ["eeadb0", :undef], # [FRIED SHRIMP] U+EB70 -> U+1F364
+  ["ee92ac", :undef], # [FORK AND KNIFE] U+E4AC -> U+1F374
+  ["ee9697", "e29895"], # [HOT BEVERAGE] U+E597 -> U+2615
+  ["ee9382", :undef], # [COCKTAIL GLASS] U+E4C2 -> U+1F378
+  ["ee9383", :undef], # [BEER MUG] U+E4C3 -> U+1F37A
+  ["eeaaae", :undef], # [TEACUP WITHOUT HANDLE] U+EAAE -> U+1F375
+  ["eeaa97", :undef], # [SAKE BOTTLE AND CUP] U+EA97 -> U+1F376
+  ["ee9381", :undef], # [WINE GLASS] U+E4C1 -> U+1F377
+  ["eeaa98", :undef], # [CLINKING BEER MUGS] U+EA98 -> U+1F37B
+  ["eeacbe", :undef], # [TROPICAL DRINK] U+EB3E -> U+1F379
+  ["ee9595", "e28697"], # [NORTH EAST ARROW] U+E555 -> U+2197
+  ["ee958d", "e28698"], # [SOUTH EAST ARROW] U+E54D -> U+2198
+  ["ee958c", "e28696"], # [NORTH WEST ARROW] U+E54C -> U+2196
+  ["ee9596", "e28699"], # [SOUTH WEST ARROW] U+E556 -> U+2199
+  ["eeacad", "e2a4b4"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+EB2D -> U+2934
+  ["eeacae", "e2a4b5"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+EB2E -> U+2935
+  ["eeadba", "e28694"], # [LEFT RIGHT ARROW] U+EB7A -> U+2194
+  ["eeadbb", "e28695"], # [UP DOWN ARROW] U+EB7B -> U+2195
+  ["ee94bf", "e2ac86"], # [UPWARDS BLACK ARROW] U+E53F -> U+2B06
+  ["ee9580", "e2ac87"], # [DOWNWARDS BLACK ARROW] U+E540 -> U+2B07
+  ["ee9592", "e29ea1"], # [BLACK RIGHTWARDS ARROW] U+E552 -> U+27A1
+  ["ee9593", "e2ac85"], # [LEFTWARDS BLACK ARROW] U+E553 -> U+2B05
+  ["ee94ae", "e296b6"], # [BLACK RIGHT-POINTING TRIANGLE] U+E52E -> U+25B6
+  ["ee94ad", "e29780"], # [BLACK LEFT-POINTING TRIANGLE] U+E52D -> U+25C0
+  ["ee94b0", :undef], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E530 -> U+23E9
+  ["ee94af", :undef], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E52F -> U+23EA
+  ["ee9585", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+E545 -> U+23EB
+  ["ee9584", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+E544 -> U+23EC
+  ["ee959a", :undef], # [UP-POINTING RED TRIANGLE] U+E55A -> U+1F53A
+  ["ee959b", :undef], # [DOWN-POINTING RED TRIANGLE] U+E55B -> U+1F53B
+  ["ee9583", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+E543 -> U+1F53C
+  ["ee9582", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+E542 -> U+1F53D
+  ["eeaaad", "e2ad95"], # [HEAVY LARGE CIRCLE] U+EAAD -> U+2B55
+  ["ee9590", :undef], # [CROSS MARK] U+E550 -> U+274C
+  ["ee9591", :undef], # [NEGATIVE SQUARED CROSS MARK] U+E551 -> U+274E
+  ["ee9282", "e29da2"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E482 -> U+2762
+  ["eeacaf", "e28189"], # [EXCLAMATION QUESTION MARK] U+EB2F -> U+2049
+  ["eeacb0", "e280bc"], # [DOUBLE EXCLAMATION MARK] U+EB30 -> U+203C
+  ["ee9283", :undef], # [BLACK QUESTION MARK ORNAMENT] U+E483 -> U+2753
+  ["eeacb1", :undef], # [CURLY LOOP] U+EB31 -> U+27B0
+  ["ee9695", "e29da4"], # [HEAVY BLACK HEART] U+E595 -> U+2764
+  ["eeadb5", :undef], # [BEATING HEART] U+EB75 -> U+1F493
+  ["ee91b7", :undef], # [BROKEN HEART] U+E477 -> U+1F494
+  ["ee91b8", :undef], # [TWO HEARTS] U+E478 -> U+1F495
+  ["eeaaa6", :undef], # [SPARKLING HEART] U+EAA6 -> U+1F496
+  ["ee93aa", :undef], # [HEART WITH ARROW] U+E4EA -> U+1F498
+  ["eeaaa7", :undef], # [BLUE HEART] U+EAA7 -> U+1F499
+  ["eeaaa8", :undef], # [GREEN HEART] U+EAA8 -> U+1F49A
+  ["eeaaa9", :undef], # [YELLOW HEART] U+EAA9 -> U+1F49B
+  ["eeaaaa", :undef], # [PURPLE HEART] U+EAAA -> U+1F49C
+  ["eead94", :undef], # [HEART WITH RIBBON] U+EB54 -> U+1F49D
+  ["ee96af", :undef], # [REVOLVING HEARTS] U+E5AF -> U+1F49E
+  ["eeaaa5", "e299a5"], # [BLACK HEART SUIT] U+EAA5 -> U+2665
+  ["ee96a1", "e299a0"], # [BLACK SPADE SUIT] U+E5A1 -> U+2660
+  ["ee96a2", "e299a6"], # [BLACK DIAMOND SUIT] U+E5A2 -> U+2666
+  ["ee96a3", "e299a3"], # [BLACK CLUB SUIT] U+E5A3 -> U+2663
+  ["ee91bd", :undef], # [SMOKING SYMBOL] U+E47D -> U+1F6AC
+  ["ee91be", :undef], # [NO SMOKING SYMBOL] U+E47E -> U+1F6AD
+  ["ee91bf", "e299bf"], # [WHEELCHAIR SYMBOL] U+E47F -> U+267F
+  ["eeacac", :undef], # [TRIANGULAR FLAG ON POST] U+EB2C -> U+1F6A9
+  ["ee9281", "e29aa0"], # [WARNING SIGN] U+E481 -> U+26A0
+  ["ee9284", "e29b94"], # [NO ENTRY] U+E484 -> U+26D4
+  ["eeadb9", "e299bb"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+EB79 -> U+267B
+  ["ee92ae", :undef], # [BICYCLE] U+E4AE -> U+1F6B2
+  ["eeadb2", :undef], # [PEDESTRIAN] U+EB72 -> U+1F6B6
+  ["ee9798", :undef], # [BATH] U+E5D8 -> U+1F6C0
+  ["ee92a5", :undef], # [RESTROOM] U+E4A5 -> U+1F6BB
+  ["ee9581", :undef], # [NO ENTRY SIGN] U+E541 -> U+1F6AB
+  ["ee9597", "e29c94"], # [HEAVY CHECK MARK] U+E557 -> U+2714
+  ["ee96ab", :undef], # [SQUARED CL] U+E5AB -> U+1F191
+  ["eeaa85", :undef], # [SQUARED COOL] U+EA85 -> U+1F192
+  ["ee95b8", :undef], # [SQUARED FREE] U+E578 -> U+1F193
+  ["eeaa88", :undef], # [SQUARED ID] U+EA88 -> U+1F194
+  ["ee96b5", :undef], # [SQUARED NEW] U+E5B5 -> U+1F195
+  ["ee96ad", :undef], # [SQUARED OK] U+E5AD -> U+1F197
+  ["ee93a8", :undef], # [SQUARED SOS] U+E4E8 -> U+1F198
+  ["ee948f", :undef], # [SQUARED UP WITH EXCLAMATION MARK] U+E50F -> U+1F199
+  ["ee9792", :undef], # [SQUARED VS] U+E5D2 -> U+1F19A
+  ["eeaa87", :undef], # [SQUARED KATAKANA SA] U+EA87 -> U+1F202
+  ["eeaa8a", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+EA8A -> U+1F233
+  ["eeaa89", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+EA89 -> U+1F235
+  ["eeaa86", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+EA86 -> U+1F239
+  ["eeaa8b", "f09f88af"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+EA8B -> U+1F22F
+  ["eeaa8c", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+EA8C -> U+1F23A
+  ["ee93b1", "e38a99"], # [CIRCLED IDEOGRAPH SECRET] U+E4F1 -> U+3299
+  ["eeaa99", "e38a97"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+EA99 -> U+3297
+  ["ee93b7", :undef], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E4F7 -> U+1F250
+  ["eeac81", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+EB01 -> U+1F251
+  ["ee94bc", :undef], # [HEAVY PLUS SIGN] U+E53C -> U+2795
+  ["ee94bd", :undef], # [HEAVY MINUS SIGN] U+E53D -> U+2796
+  ["ee958f", "e29c96"], # [HEAVY MULTIPLICATION X] U+E54F -> U+2716
+  ["ee9594", :undef], # [HEAVY DIVISION SIGN] U+E554 -> U+2797
+  ["ee91b6", :undef], # [ELECTRIC LIGHT BULB] U+E476 -> U+1F4A1
+  ["ee93a5", :undef], # [ANGER SYMBOL] U+E4E5 -> U+1F4A2
+  ["ee91ba", :undef], # [BOMB] U+E47A -> U+1F4A3
+  ["ee91b5", :undef], # [SLEEPING SYMBOL] U+E475 -> U+1F4A4
+  ["ee96b0", :undef], # [COLLISION SYMBOL] U+E5B0 -> U+1F4A5
+  ["ee96b1", :undef], # [SPLASHING SWEAT SYMBOL] U+E5B1 -> U+1F4A6
+  ["ee93a6", :undef], # [DROP OF WATER] U+E4E6 -> U+1F4A7
+  ["ee93b4", :undef], # [DASH SYMBOL] U+E4F4 -> U+1F4A8
+  ["ee93b5", :undef], # [PILE OF POO] U+E4F5 -> U+1F4A9
+  ["ee93a9", :undef], # [FLEXED BICEPS] U+E4E9 -> U+1F4AA
+  ["eead9c", :undef], # [DIZZY SYMBOL] U+EB5C -> U+1F4AB
+  ["ee93bd", :undef], # [SPEECH BALLOON] U+E4FD -> U+1F4AC
+  ["eeaaab", :undef], # [SPARKLES] U+EAAB -> U+2728
+  ["ee91b9", "e29cb4"], # [EIGHT POINTED BLACK STAR] U+E479 -> U+2734
+  ["ee94be", "e29cb3"], # [EIGHT SPOKED ASTERISK] U+E53E -> U+2733
+  ["ee94ba", "e29aaa"], # [MEDIUM WHITE CIRCLE] U+E53A -> U+26AA
+  ["ee94bb", "e29aab"], # [MEDIUM BLACK CIRCLE] U+E53B -> U+26AB
+  ["ee958a", :undef], # [LARGE RED CIRCLE] U+E54A -> U+1F534
+  ["ee958b", :undef], # [LARGE BLUE CIRCLE] U+E54B -> U+1F535
+  ["ee928b", "e2ad90"], # [WHITE MEDIUM STAR] U+E48B -> U+2B50
+  ["ee9588", "e2ac9c"], # [WHITE LARGE SQUARE] U+E548 -> U+2B1C
+  ["ee9589", "e2ac9b"], # [BLACK LARGE SQUARE] U+E549 -> U+2B1B
+  ["ee94b1", "e296ab"], # [WHITE SMALL SQUARE] U+E531 -> U+25AB
+  ["ee94b2", "e296aa"], # [BLACK SMALL SQUARE] U+E532 -> U+25AA
+  ["ee94b4", "e297bd"], # [WHITE MEDIUM SMALL SQUARE] U+E534 -> U+25FD
+  ["ee94b5", "e297be"], # [BLACK MEDIUM SMALL SQUARE] U+E535 -> U+25FE
+  ["ee94b8", "e297bb"], # [WHITE MEDIUM SQUARE] U+E538 -> U+25FB
+  ["ee94b9", "e297bc"], # [BLACK MEDIUM SQUARE] U+E539 -> U+25FC
+  ["ee9586", :undef], # [LARGE ORANGE DIAMOND] U+E546 -> U+1F536
+  ["ee9587", :undef], # [LARGE BLUE DIAMOND] U+E547 -> U+1F537
+  ["ee94b6", :undef], # [SMALL ORANGE DIAMOND] U+E536 -> U+1F538
+  ["ee94b7", :undef], # [SMALL BLUE DIAMOND] U+E537 -> U+1F539
+  ["ee91ac", "e29d87"], # [SPARKLE] U+E46C -> U+2747
+  ["ee93b0", :undef], # [WHITE FLOWER] U+E4F0 -> U+1F4AE
+  ["ee93b2", :undef], # [HUNDRED POINTS SYMBOL] U+E4F2 -> U+1F4AF
+  ["ee959d", "e286a9"], # [LEFTWARDS ARROW WITH HOOK] U+E55D -> U+21A9
+  ["ee959c", "e286aa"], # [RIGHTWARDS ARROW WITH HOOK] U+E55C -> U+21AA
+  ["eeac8d", :undef], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+EB0D -> U+1F503
+  ["ee9491", :undef], # [SPEAKER WITH THREE SOUND WAVES] U+E511 -> U+1F50A
+  ["ee9684", :undef], # [BATTERY] U+E584 -> U+1F50B
+  ["ee9689", :undef], # [ELECTRIC PLUG] U+E589 -> U+1F50C
+  ["ee9498", :undef], # [LEFT-POINTING MAGNIFYING GLASS] U+E518 -> U+1F50D
+  ["eeac85", :undef], # [RIGHT-POINTING MAGNIFYING GLASS] U+EB05 -> U+1F50E
+  ["ee949c", :undef], # [LOCK] U+E51C -> U+1F512
+  ["eeac8c", :undef], # [LOCK WITH INK PEN] U+EB0C -> U+1F50F
+  ["eeabbc", :undef], # [CLOSED LOCK WITH KEY] U+EAFC -> U+1F510
+  ["ee9499", :undef], # [KEY] U+E519 -> U+1F511
+  ["ee9492", :undef], # [BELL] U+E512 -> U+1F514
+  ["eeac82", "e29891"], # [BALLOT BOX WITH CHECK] U+EB02 -> U+2611
+  ["eeac84", :undef], # [RADIO BUTTON] U+EB04 -> U+1F518
+  ["eeac87", :undef], # [BOOKMARK] U+EB07 -> U+1F516
+  ["ee968a", :undef], # [LINK SYMBOL] U+E58A -> U+1F517
+  ["eeac86", :undef], # [BACK WITH LEFTWARDS ARROW ABOVE] U+EB06 -> U+1F519
+  ["ee968c", "e28083"], # [EM SPACE] U+E58C -> U+2003
+  ["ee968d", "e28082"], # [EN SPACE] U+E58D -> U+2002
+  ["ee968e", "e28085"], # [FOUR-PER-EM SPACE] U+E58E -> U+2005
+  ["ee959e", :undef], # [WHITE HEAVY CHECK MARK] U+E55E -> U+2705
+  ["eeae83", :undef], # [RAISED FIST] U+EB83 -> U+270A
+  ["ee96a7", :undef], # [RAISED HAND] U+E5A7 -> U+270B
+  ["ee96a6", "e29c8c"], # [VICTORY HAND] U+E5A6 -> U+270C
+  ["ee93b3", :undef], # [FISTED HAND SIGN] U+E4F3 -> U+1F44A
+  ["ee93b9", :undef], # [THUMBS UP SIGN] U+E4F9 -> U+1F44D
+  ["ee93b6", "e2989d"], # [WHITE UP POINTING INDEX] U+E4F6 -> U+261D
+  ["eeaa8d", :undef], # [WHITE UP POINTING BACKHAND INDEX] U+EA8D -> U+1F446
+  ["eeaa8e", :undef], # [WHITE DOWN POINTING BACKHAND INDEX] U+EA8E -> U+1F447
+  ["ee93bf", :undef], # [WHITE LEFT POINTING BACKHAND INDEX] U+E4FF -> U+1F448
+  ["ee9480", :undef], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E500 -> U+1F449
+  ["eeab96", :undef], # [WAVING HAND SIGN] U+EAD6 -> U+1F44B
+  ["eeab93", :undef], # [CLAPPING HANDS SIGN] U+EAD3 -> U+1F44F
+  ["eeab94", :undef], # [OK HAND SIGN] U+EAD4 -> U+1F44C
+  ["eeab95", :undef], # [THUMBS DOWN SIGN] U+EAD5 -> U+1F44E
+  ["ee95b7", :undef], # [EMOJI COMPATIBILITY SYMBOL-37] U+E577 -> "[EZ]"
+  ["ee96b2", :undef], # [EMOJI COMPATIBILITY SYMBOL-38] U+E5B2 -> "[ezplus]"
+  ["eeaa9d", :undef], # [EMOJI COMPATIBILITY SYMBOL-39] U+EA9D -> "[EZナビ]"
+  ["eeadb4", :undef], # [EMOJI COMPATIBILITY SYMBOL-40] U+EB74 -> "[EZムービー]"
+  ["eeae81", :undef], # [EMOJI COMPATIBILITY SYMBOL-41] U+EB81 -> "[Cメール]"
+  ["eeae89", :undef], # [EMOJI COMPATIBILITY SYMBOL-42] U+EB89 -> "[Java]"
+  ["eeae8a", :undef], # [EMOJI COMPATIBILITY SYMBOL-43] U+EB8A -> "[BREW]"
+  ["eeae8b", :undef], # [EMOJI COMPATIBILITY SYMBOL-44] U+EB8B -> "[EZ着うた]"
+  ["eeae8c", :undef], # [EMOJI COMPATIBILITY SYMBOL-45] U+EB8C -> "[EZナビ]"
+  ["eeae8d", :undef], # [EMOJI COMPATIBILITY SYMBOL-46] U+EB8D -> "[WIN]"
+  ["eeae8e", :undef], # [EMOJI COMPATIBILITY SYMBOL-47] U+EB8E -> "[プレミアム]"
+  ["eeabbb", :undef], # [EMOJI COMPATIBILITY SYMBOL-48] U+EAFB -> "[オープンウェブ]"
+  ["ee9686", :undef], # [EMOJI COMPATIBILITY SYMBOL-49] U+E586 -> "[PDC]"
+  ["ee94ac", :undef], # [EMOJI COMPATIBILITY SYMBOL-66] U+E52C -> "[Q]"
+  # for undocumented codepoints
+  ["eebda0", "e29880"], # [BLACK SUN WITH RAYS] U+E488 -> U+2600
+  ["eebda5", "e29881"], # [CLOUD] U+E48D -> U+2601
+  ["eebda4", "e29894"], # [UMBRELLA WITH RAIN DROPS] U+E48C -> U+2614
+  ["eebd9d", "e29b84"], # [SNOWMAN WITHOUT SNOW] U+E485 -> U+26C4
+  ["eebd9f", "e29aa1"], # [HIGH VOLTAGE SIGN] U+E487 -> U+26A1
+  ["eebd81", :undef], # [CYCLONE] U+E469 -> U+1F300
+  ["ef82b5", :undef], # [FOGGY] U+E598 -> U+1F301
+  ["eeb2bc", :undef], # [CLOSED UMBRELLA] U+EAE8 -> U+1F302
+  ["eeb385", :undef], # [NIGHT WITH STARS] U+EAF1 -> U+1F303
+  ["eeb388", :undef], # [SUNRISE] U+EAF4 -> U+1F305
+  ["eeb18d", :undef], # [CITYSCAPE AT DUSK] U+E5DA -> "[夕焼け]"
+  ["eeb386", :undef], # [RAINBOW] U+EAF2 -> U+1F308
+  ["eebda2", "e29d84"], # [SNOWFLAKE] U+E48A -> U+2744
+  ["eebda6", "e29b85"], # [SUN BEHIND CLOUD] U+E48E -> U+26C5
+  ["eebe98", :undef], # [BRIDGE AT NIGHT] U+E4BF -> U+1F309
+  ["eeb681", :undef], # [WATER WAVE] U+EB7C -> U+1F30A
+  ["eeb597", :undef], # [VOLCANO] U+EB53 -> U+1F30B
+  ["eeb5a3", :undef], # [MILKY WAY] U+EB5F -> U+1F30C
+  ["ef8390", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+E5B3 -> U+1F30F
+  ["ef8385", :undef], # [NEW MOON SYMBOL] U+E5A8 -> U+1F311
+  ["ef8386", :undef], # [WAXING GIBBOUS MOON SYMBOL] U+E5A9 -> U+1F314
+  ["ef8387", :undef], # [FIRST QUARTER MOON SYMBOL] U+E5AA -> U+1F313
+  ["eebd9e", :undef], # [CRESCENT MOON] U+E486 -> U+1F319
+  ["eebda1", :undef], # [FIRST QUARTER MOON WITH FACE] U+E489 -> U+1F31B
+  ["eebd80", :undef], # [SHOOTING STAR] U+E468 -> U+1F320
+  ["ef8297", "e28c9a"], # [WATCH] U+E57A -> U+231A
+  ["ef8298", "e28c9b"], # [HOURGLASS] U+E57B -> U+231B
+  ["ef82b1", :undef], # [ALARM CLOCK] U+E594 -> U+23F0
+  ["eebd94", :undef], # [HOURGLASS WITH FLOWING SAND] U+E47C -> U+23F3
+  ["eebda7", "e29988"], # [ARIES] U+E48F -> U+2648
+  ["eebda8", "e29989"], # [TAURUS] U+E490 -> U+2649
+  ["eebda9", "e2998a"], # [GEMINI] U+E491 -> U+264A
+  ["eebdaa", "e2998b"], # [CANCER] U+E492 -> U+264B
+  ["eebdab", "e2998c"], # [LEO] U+E493 -> U+264C
+  ["eebdac", "e2998d"], # [VIRGO] U+E494 -> U+264D
+  ["eebdad", "e2998e"], # [LIBRA] U+E495 -> U+264E
+  ["eebdae", "e2998f"], # [SCORPIUS] U+E496 -> U+264F
+  ["eebdaf", "e29990"], # [SAGITTARIUS] U+E497 -> U+2650
+  ["eebdb0", "e29991"], # [CAPRICORN] U+E498 -> U+2651
+  ["eebdb1", "e29992"], # [AQUARIUS] U+E499 -> U+2652
+  ["eebdb2", "e29993"], # [PISCES] U+E49A -> U+2653
+  ["eebdb3", :undef], # [OPHIUCHUS] U+E49B -> U+26CE
+  ["eebfac", :undef], # [FOUR LEAF CLOVER] U+E513 -> U+1F340
+  ["eebebd", :undef], # [TULIP] U+E4E4 -> U+1F337
+  ["eeb682", :undef], # [SEEDLING] U+EB7D -> U+1F331
+  ["eebea7", :undef], # [MAPLE LEAF] U+E4CE -> U+1F341
+  ["eebea3", :undef], # [CHERRY BLOSSOM] U+E4CA -> U+1F338
+  ["ef83aa", :undef], # [ROSE] U+E5BA -> U+1F339
+  ["eeb180", :undef], # [FALLEN LEAF] U+E5CD -> U+1F342
+  ["eeb1a7", :undef], # [HIBISCUS] U+EA94 -> U+1F33A
+  ["eebebc", :undef], # [SUNFLOWER] U+E4E3 -> U+1F33B
+  ["eebebb", :undef], # [PALM TREE] U+E4E2 -> U+1F334
+  ["eeb1a9", :undef], # [CACTUS] U+EA96 -> U+1F335
+  ["eeb3b7", :undef], # [EAR OF MAIZE] U+EB36 -> U+1F33D
+  ["eeb3b8", :undef], # [MUSHROOM] U+EB37 -> U+1F344
+  ["eeb3b9", :undef], # [CHESTNUT] U+EB38 -> U+1F330
+  ["eeb58d", :undef], # [BLOSSOM] U+EB49 -> U+1F33C
+  ["eeb687", :undef], # [HERB] U+EB82 -> U+1F33F
+  ["eebeab", :undef], # [CHERRIES] U+E4D2 -> U+1F352
+  ["eeb3b6", :undef], # [BANANA] U+EB35 -> U+1F34C
+  ["eeb28d", :undef], # [RED APPLE] U+EAB9 -> U+1F34E
+  ["eeb28e", :undef], # [TANGERINE] U+EABA -> U+1F34A
+  ["eebead", :undef], # [STRAWBERRY] U+E4D4 -> U+1F353
+  ["eebea6", :undef], # [WATERMELON] U+E4CD -> U+1F349
+  ["eeb28f", :undef], # [TOMATO] U+EABB -> U+1F345
+  ["eeb290", :undef], # [AUBERGINE] U+EABC -> U+1F346
+  ["eeb3b3", :undef], # [MELON] U+EB32 -> U+1F348
+  ["eeb3b4", :undef], # [PINEAPPLE] U+EB33 -> U+1F34D
+  ["eeb3b5", :undef], # [GRAPES] U+EB34 -> U+1F347
+  ["eeb3ba", :undef], # [PEACH] U+EB39 -> U+1F351
+  ["eeb59e", :undef], # [GREEN APPLE] U+EB5A -> U+1F34F
+  ["ef8381", :undef], # [EYES] U+E5A4 -> U+1F440
+  ["ef8382", :undef], # [EAR] U+E5A5 -> U+1F442
+  ["eeb2a4", :undef], # [NOSE] U+EAD0 -> U+1F443
+  ["eeb2a5", :undef], # [MOUTH] U+EAD1 -> U+1F444
+  ["eeb58b", :undef], # [TONGUE] U+EB47 -> U+1F445
+  ["eebfa2", :undef], # [LIPSTICK] U+E509 -> U+1F484
+  ["eeb1b3", :undef], # [NAIL POLISH] U+EAA0 -> U+1F485
+  ["eebfa4", :undef], # [FACE MASSAGE] U+E50B -> U+1F486
+  ["eeb1b4", :undef], # [HAIRCUT] U+EAA1 -> U+1F487
+  ["eeb1b5", :undef], # [BARBER POLE] U+EAA2 -> U+1F488
+  ["eebf95", :undef], # [BOY] U+E4FC -> U+1F466
+  ["eebf93", :undef], # [GIRL] U+E4FA -> U+1F467
+  ["eebf9a", :undef], # [FAMILY] U+E501 -> U+1F46A
+  ["eeb190", :undef], # [POLICE OFFICER] U+E5DD -> U+1F46E
+  ["eeb2af", :undef], # [WOMAN WITH BUNNY EARS] U+EADB -> U+1F46F
+  ["eeb2bd", :undef], # [BRIDE WITH VEIL] U+EAE9 -> U+1F470
+  ["eeb394", :undef], # [WESTERN PERSON] U+EB13 -> U+1F471
+  ["eeb395", :undef], # [MAN WITH GUA PI MAO] U+EB14 -> U+1F472
+  ["eeb396", :undef], # [MAN WITH TURBAN] U+EB15 -> U+1F473
+  ["eeb397", :undef], # [OLDER MAN] U+EB16 -> U+1F474
+  ["eeb398", :undef], # [OLDER WOMAN] U+EB17 -> U+1F475
+  ["eeb399", :undef], # [BABY] U+EB18 -> U+1F476
+  ["eeb39a", :undef], # [CONSTRUCTION WORKER] U+EB19 -> U+1F477
+  ["eeb39b", :undef], # [PRINCESS] U+EB1A -> U+1F478
+  ["eeb588", :undef], # [JAPANESE OGRE] U+EB44 -> U+1F479
+  ["eeb589", :undef], # [JAPANESE GOBLIN] U+EB45 -> U+1F47A
+  ["eebea4", :undef], # [GHOST] U+E4CB -> U+1F47B
+  ["ef83af", :undef], # [BABY ANGEL] U+E5BF -> U+1F47C
+  ["eebfa7", :undef], # [EXTRATERRESTRIAL ALIEN] U+E50E -> U+1F47D
+  ["eebf85", :undef], # [ALIEN MONSTER] U+E4EC -> U+1F47E
+  ["eebf88", :undef], # [IMP] U+E4EF -> U+1F47F
+  ["eebf91", :undef], # [SKULL] U+E4F8 -> U+1F480
+  ["eeb39d", :undef], # [DANCER] U+EB1C -> U+1F483
+  ["eeb683", :undef], # [SNAIL] U+EB7E -> U+1F40C
+  ["eeb3a3", :undef], # [SNAKE] U+EB22 -> U+1F40D
+  ["eeb3a4", :undef], # [CHICKEN] U+EB23 -> U+1F414
+  ["eeb3a5", :undef], # [BOAR] U+EB24 -> U+1F417
+  ["eeb3a6", :undef], # [BACTRIAN CAMEL] U+EB25 -> U+1F42B
+  ["eeb3a0", :undef], # [ELEPHANT] U+EB1F -> U+1F418
+  ["eeb3a1", :undef], # [KOALA] U+EB20 -> U+1F428
+  ["ef83b7", :undef], # [OCTOPUS] U+E5C7 -> U+1F419
+  ["eeb380", :undef], # [SPIRAL SHELL] U+EAEC -> U+1F41A
+  ["eeb39f", :undef], # [BUG] U+EB1E -> U+1F41B
+  ["eebeb6", :undef], # [ANT] U+E4DD -> U+1F41C
+  ["eeb59b", :undef], # [HONEYBEE] U+EB57 -> U+1F41D
+  ["eeb59c", :undef], # [LADY BEETLE] U+EB58 -> U+1F41E
+  ["eeb39e", :undef], # [TROPICAL FISH] U+EB1D -> U+1F420
+  ["eebeac", :undef], # [BLOWFISH] U+E4D3 -> U+1F421
+  ["eeb187", :undef], # [TURTLE] U+E5D4 -> U+1F422
+  ["eebeb9", :undef], # [BABY CHICK] U+E4E0 -> U+1F424
+  ["eeb5ba", :undef], # [FRONT-FACING BABY CHICK] U+EB76 -> U+1F425
+  ["eeb18e", :undef], # [HATCHING CHICK] U+E5DB -> U+1F423
+  ["eebeb5", :undef], # [PENGUIN] U+E4DC -> U+1F427
+  ["eebeb8", :undef], # [POODLE] U+E4DF -> U+1F429
+  ["eeb39c", :undef], # [DOLPHIN] U+EB1B -> U+1F42C
+  ["ef83b2", :undef], # [MOUSE FACE] U+E5C2 -> U+1F42D
+  ["ef83b0", :undef], # [TIGER FACE] U+E5C0 -> U+1F42F
+  ["eebeb4", :undef], # [CAT FACE] U+E4DB -> U+1F431
+  ["eebd88", :undef], # [SPOUTING WHALE] U+E470 -> U+1F433
+  ["eebeb1", :undef], # [HORSE FACE] U+E4D8 -> U+1F434
+  ["eebeb2", :undef], # [MONKEY FACE] U+E4D9 -> U+1F435
+  ["eebeba", :undef], # [DOG FACE] U+E4E1 -> U+1F436
+  ["eebeb7", :undef], # [PIG FACE] U+E4DE -> U+1F437
+  ["ef83b1", :undef], # [BEAR FACE] U+E5C1 -> U+1F43B
+  ["eeb3a2", :undef], # [COW FACE] U+EB21 -> U+1F42E
+  ["eebeb0", :undef], # [RABBIT FACE] U+E4D7 -> U+1F430
+  ["eebeb3", :undef], # [FROG FACE] U+E4DA -> U+1F438
+  ["eebf87", :undef], # [PAW PRINTS] U+E4EE -> U+1F43E
+  ["eeb583", :undef], # [DRAGON FACE] U+EB3F -> U+1F432
+  ["eeb58a", :undef], # [PANDA FACE] U+EB46 -> U+1F43C
+  ["eeb58c", :undef], # [PIG NOSE] U+EB48 -> U+1F43D
+  ["eebd8a", :undef], # [ANGRY FACE] U+E472 -> U+1F600
+  ["eeb5ab", :undef], # [ANGUISHED FACE] U+EB67 -> U+1F601
+  ["eeb29e", :undef], # [ASTONISHED FACE] U+EACA -> U+1F602
+  ["ef838b", :undef], # [DIZZY FACE] U+E5AE -> U+1F604
+  ["eeb29f", :undef], # [EXASPERATED FACE] U+EACB -> U+1F605
+  ["eeb29d", :undef], # [EXPRESSIONLESS FACE] U+EAC9 -> U+1F606
+  ["ef83b4", :undef], # [FACE WITH HEART-SHAPED EYES] U+E5C4 -> U+1F607
+  ["eeb295", :undef], # [FACE WITH LOOK OF TRIUMPH] U+EAC1 -> U+1F608
+  ["eebf80", :undef], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E4E7 -> U+1F609
+  ["eeb2a3", :undef], # [FACE THROWING A KISS] U+EACF -> U+1F60C
+  ["eeb2a2", :undef], # [FACE KISSING] U+EACE -> U+1F60D
+  ["eeb29b", :undef], # [FACE WITH MASK] U+EAC7 -> U+1F60E
+  ["eeb29c", :undef], # [FLUSHED FACE] U+EAC8 -> U+1F60F
+  ["eebd89", :undef], # [HAPPY FACE WITH OPEN MOUTH] U+E471 -> U+1F610
+  ["eeb685", :undef], # [HAPPY FACE WITH GRIN] U+EB80 -> U+1F613
+  ["eeb5a8", :undef], # [HAPPY AND CRYING FACE] U+EB64 -> U+1F614
+  ["eeb2a1", :undef], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+EACD -> U+1F615
+  ["eebf94", "e298ba"], # [WHITE SMILING FACE] U+E4FB -> U+263A
+  ["eeb5ad", :undef], # [CRYING FACE] U+EB69 -> U+1F617
+  ["eebd8b", :undef], # [LOUDLY CRYING FACE] U+E473 -> U+1F618
+  ["eeb29a", :undef], # [FEARFUL FACE] U+EAC6 -> U+1F619
+  ["eeb296", :undef], # [PERSEVERING FACE] U+EAC2 -> U+1F61A
+  ["eeb5a1", :undef], # [POUTING FACE] U+EB5D -> U+1F61B
+  ["eeb299", :undef], # [RELIEVED FACE] U+EAC5 -> U+1F61C
+  ["eeb297", :undef], # [CONFOUNDED FACE] U+EAC3 -> U+1F61D
+  ["eeb294", :undef], # [PENSIVE FACE] U+EAC0 -> U+1F61E
+  ["ef83b5", :undef], # [FACE SCREAMING IN FEAR] U+E5C5 -> U+1F61F
+  ["eeb298", :undef], # [SLEEPY FACE] U+EAC4 -> U+1F620
+  ["eeb293", :undef], # [SMIRKING FACE] U+EABF -> U+1F621
+  ["ef83b6", :undef], # [FACE WITH COLD SWEAT] U+E5C6 -> U+1F622
+  ["eebd8c", :undef], # [TIRED FACE] U+E474 -> U+1F624
+  ["ef83b3", :undef], # [WINKING FACE] U+E5C3 -> U+1F625
+  ["eeb5a5", :undef], # [CAT FACE WITH OPEN MOUTH] U+EB61 -> U+1F62B
+  ["eeb684", :undef], # [HAPPY CAT FACE WITH GRIN] U+EB7F -> U+1F62C
+  ["eeb5a7", :undef], # [HAPPY AND CRYING CAT FACE] U+EB63 -> U+1F62D
+  ["eeb5a4", :undef], # [CAT FACE KISSING] U+EB60 -> U+1F62E
+  ["eeb5a9", :undef], # [CAT FACE WITH HEART-SHAPED EYES] U+EB65 -> U+1F62F
+  ["eeb5ac", :undef], # [CRYING CAT FACE] U+EB68 -> U+1F630
+  ["eeb5a2", :undef], # [POUTING CAT FACE] U+EB5E -> U+1F631
+  ["eeb5ae", :undef], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+EB6A -> U+1F632
+  ["eeb5aa", :undef], # [ANGUISHED CAT FACE] U+EB66 -> U+1F633
+  ["eeb2ab", :undef], # [FACE WITH NO GOOD GESTURE] U+EAD7 -> U+1F634
+  ["eeb2ac", :undef], # [FACE WITH OK GESTURE] U+EAD8 -> U+1F635
+  ["eeb2ad", :undef], # [PERSON BOWING DEEPLY] U+EAD9 -> U+1F636
+  ["eeb594", :undef], # [SEE-NO-EVIL MONKEY] U+EB50 -> U+1F637
+  ["eeb595", :undef], # [SPEAK-NO-EVIL MONKEY] U+EB51 -> U+1F639
+  ["eeb596", :undef], # [HEAR-NO-EVIL MONKEY] U+EB52 -> U+1F638
+  ["eeb68a", :undef], # [PERSON RAISING ONE HAND] U+EB85 -> U+1F63A
+  ["eeb68b", :undef], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+EB86 -> U+1F63B
+  ["eeb68c", :undef], # [PERSON FROWNING] U+EB87 -> U+1F63C
+  ["eeb68d", :undef], # [PERSON WITH POUTING FACE] U+EB88 -> U+1F63D
+  ["eeb2a6", :undef], # [PERSON WITH FOLDED HANDS] U+EAD2 -> U+1F63E
+  ["eebe84", :undef], # [HOUSE BUILDING] U+E4AB -> U+1F3E0
+  ["ef83a0", :undef], # [HOUSE WITH GARDEN] U+EB09 -> U+1F3E1
+  ["eebe86", :undef], # [OFFICE BUILDING] U+E4AD -> U+1F3E2
+  ["eeb191", :undef], # [JAPANESE POST OFFICE] U+E5DE -> U+1F3E3
+  ["eeb192", :undef], # [HOSPITAL] U+E5DF -> U+1F3E5
+  ["eebe83", :undef], # [BANK] U+E4AA -> U+1F3E6
+  ["eebdbb", :undef], # [AUTOMATED TELLER MACHINE] U+E4A3 -> U+1F3E7
+  ["eeb194", :undef], # [HOTEL] U+EA81 -> U+1F3E8
+  ["eeb387", :undef], # [LOVE HOTEL] U+EAF3 -> U+1F3E9
+  ["eebdbc", :undef], # [CONVENIENCE STORE] U+E4A4 -> U+1F3EA
+  ["eeb193", :undef], # [SCHOOL] U+EA80 -> U+1F3EB
+  ["ef83ab", "e29baa"], # [CHURCH] U+E5BB -> U+26EA
+  ["eeb182", "e29bb2"], # [FOUNTAIN] U+E5CF -> U+26F2
+  ["eeb38a", :undef], # [DEPARTMENT STORE] U+EAF6 -> U+1F3EC
+  ["eeb38b", :undef], # [JAPANESE CASTLE] U+EAF7 -> U+1F3EF
+  ["eeb38c", :undef], # [EUROPEAN CASTLE] U+EAF8 -> U+1F3F0
+  ["eeb38d", :undef], # [FACTORY] U+EAF9 -> U+1F3ED
+  ["eebe82", "e29a93"], # [ANCHOR] U+E4A9 -> U+2693
+  ["eebe96", :undef], # [IZAKAYA LANTERN] U+E4BD -> U+1F3EE
+  ["ef83ad", :undef], # [MOUNT FUJI] U+E5BD -> U+1F5FB
+  ["eebe99", :undef], # [TOKYO TOWER] U+E4C0 -> U+1F5FC
+  ["ef828f", :undef], # [SILHOUETTE OF JAPAN] U+E572 -> U+1F5FE
+  ["eeb5b0", :undef], # [MOYAI] U+EB6C -> U+1F5FF
+  ["ef83a7", :undef], # [MANS SHOE] U+E5B7 -> U+1F45E
+  ["eeb3ac", :undef], # [ATHLETIC SHOE] U+EB2B -> U+1F45F
+  ["eebfb3", :undef], # [HIGH-HEELED SHOE] U+E51A -> U+1F460
+  ["eeb1b2", :undef], # [WOMANS BOOTS] U+EA9F -> U+1F462
+  ["eeb3ab", :undef], # [FOOTPRINTS] U+EB2A -> U+1F463
+  ["eebf97", :undef], # [EYEGLASSES] U+E4FE -> U+1F453
+  ["ef83a6", :undef], # [T-SHIRT] U+E5B6 -> U+1F455
+  ["eeb5bb", :undef], # [JEANS] U+EB77 -> U+1F456
+  ["ef83b9", :undef], # [CROWN] U+E5C9 -> U+1F451
+  ["eeb1a6", :undef], # [NECKTIE] U+EA93 -> U+1F454
+  ["eeb1b1", :undef], # [WOMANS HAT] U+EA9E -> U+1F452
+  ["eeb5af", :undef], # [DRESS] U+EB6B -> U+1F457
+  ["eeb1b6", :undef], # [KIMONO] U+EAA3 -> U+1F458
+  ["eeb1b7", :undef], # [BIKINI] U+EAA4 -> U+1F459
+  ["eebfa6", :undef], # [WOMANS CLOTHES] U+E50D -> U+1F45A
+  ["eebf9d", :undef], # [PURSE] U+E504 -> U+1F45B
+  ["eebdb4", :undef], # [HANDBAG] U+E49C -> U+1F45C
+  ["eebea0", :undef], # [MONEY BAG] U+E4C7 -> U+1F4B0
+  ["eeb18f", :undef], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E5DC -> U+1F4B9
+  ["ef8296", :undef], # [HEAVY DOLLAR SIGN] U+E579 -> U+1F4B2
+  ["ef8299", :undef], # [CREDIT CARD] U+E57C -> U+1F4B3
+  ["ef829a", :undef], # [BANKNOTE WITH YEN SIGN] U+E57D -> U+1F4B4
+  ["ef82a2", :undef], # [BANKNOTE WITH DOLLAR SIGN] U+E585 -> U+1F4B5
+  ["eeb59f", :undef], # [MONEY WITH WINGS] U+EB5B -> U+1F4B8
+  ["eeb392", "f09f87a8f09f87b3"], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+EB11 -> U+1F1E8 U+1F1F3
+  ["eeb38f", "f09f87a9f09f87aa"], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+EB0E -> U+1F1E9 U+1F1EA
+  ["eeb188", "f09f87aaf09f87b8"], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E5D5 -> U+1F1EA U+1F1F8
+  ["eeb38e", "f09f87abf09f87b7"], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+EAFA -> U+1F1EB U+1F1F7
+  ["eeb391", "f09f87baf09f87b0"], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+EB10 -> U+1F1FA U+1F1F0
+  ["eeb390", "f09f87aef09f87b9"], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+EB0F -> U+1F1EE U+1F1F9
+  ["eebea5", "f09f87aff09f87b5"], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E4CC -> U+1F1EF U+1F1F5
+  ["eeb393", "f09f87b0f09f87b7"], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+EB12 -> U+1F1F0 U+1F1F7
+  ["eeb189", "f09f87b7f09f87ba"], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E5D6 -> U+1F1F7 U+1F1FA
+  ["ef8290", "f09f87baf09f87b8"], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E573 -> U+1F1FA U+1F1F8
+  ["eebd93", :undef], # [FIRE] U+E47B -> U+1F525
+  ["ef82a0", :undef], # [ELECTRIC TORCH] U+E583 -> U+1F526
+  ["ef82a4", :undef], # [WRENCH] U+E587 -> U+1F527
+  ["ef83bb", :undef], # [HAMMER] U+E5CB -> U+1F528
+  ["ef829e", :undef], # [NUT AND BOLT] U+E581 -> U+1F529
+  ["ef829c", :undef], # [HOCHO] U+E57F -> U+1F52A
+  ["eebfa3", :undef], # [PISTOL] U+E50A -> U+1F52B
+  ["eeb1a2", :undef], # [CRYSTAL BALL] U+EA8F -> U+1F52E
+  ["eebd98", :undef], # [JAPANESE SYMBOL FOR BEGINNER] U+E480 -> U+1F530
+  ["eebfa9", :undef], # [SYRINGE] U+E510 -> U+1F489
+  ["eeb1ad", :undef], # [PILL] U+EA9A -> U+1F48A
+  ["eeb3a7", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+EB26 -> U+1F170
+  ["eeb3a8", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+EB27 -> U+1F171
+  ["eeb3aa", :undef], # [NEGATIVE SQUARED AB] U+EB29 -> U+1F18E
+  ["eeb3a9", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+EB28 -> U+1F17E
+  ["ef82bc", :undef], # [RIBBON] U+E59F -> U+1F380
+  ["eebea8", :undef], # [WRAPPED PRESENT] U+E4CF -> U+1F381
+  ["ef82bd", :undef], # [BIRTHDAY CAKE] U+E5A0 -> U+1F382
+  ["eebea2", :undef], # [CHRISTMAS TREE] U+E4C9 -> U+1F384
+  ["eeb384", :undef], # [FATHER CHRISTMAS] U+EAF0 -> U+1F385
+  ["eeb18c", :undef], # [CROSSED FLAGS] U+E5D9 -> U+1F38C
+  ["ef83bc", :undef], # [FIREWORKS] U+E5CC -> U+1F386
+  ["eeb1ae", :undef], # [BALLOON] U+EA9B -> U+1F388
+  ["eeb1af", :undef], # [PARTY POPPER] U+EA9C -> U+1F389
+  ["eeb2b7", :undef], # [PINE DECORATION] U+EAE3 -> U+1F38D
+  ["eeb2b8", :undef], # [JAPANESE DOLLS] U+EAE4 -> U+1F38E
+  ["eeb2b9", :undef], # [GRADUATION CAP] U+EAE5 -> U+1F393
+  ["eeb2ba", :undef], # [SCHOOL SATCHEL] U+EAE6 -> U+1F392
+  ["eeb2bb", :undef], # [CARP STREAMER] U+EAE7 -> U+1F38F
+  ["eeb2bf", :undef], # [FIREWORK SPARKLER] U+EAEB -> U+1F387
+  ["eeb381", :undef], # [WIND CHIME] U+EAED -> U+1F390
+  ["eeb382", :undef], # [JACK-O-LANTERN] U+EAEE -> U+1F383
+  ["eebd87", :undef], # [CONFETTI BALL] U+E46F -> U+1F38A
+  ["eeb581", :undef], # [TANABATA TREE] U+EB3D -> U+1F38B
+  ["eeb383", :undef], # [MOON VIEWING CEREMONY] U+EAEF -> U+1F391
+  ["ef82b8", :undef], # [PAGER] U+E59B -> U+1F4DF
+  ["ef82b3", "e2988e"], # [BLACK TELEPHONE] U+E596 -> U+260E
+  ["eebfb7", :undef], # [TELEPHONE RECEIVER] U+E51E -> U+1F4DE
+  ["ef82a5", :undef], # [MOBILE PHONE] U+E588 -> U+1F4F1
+  ["ef839f", :undef], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+EB08 -> U+1F4F2
+  ["eeb1a5", :undef], # [MEMO] U+EA92 -> U+1F4DD
+  ["eebfb9", :undef], # [FAX MACHINE] U+E520 -> U+1F4E0
+  ["eebfba", "e29c89"], # [ENVELOPE] U+E521 -> U+2709
+  ["ef82ae", :undef], # [INCOMING ENVELOPE] U+E591 -> U+1F4E8
+  ["eeb5a6", :undef], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+EB62 -> U+1F4E9
+  ["eebfb4", :undef], # [CLOSED MAILBOX WITH LOWERED FLAG] U+E51B -> U+1F4EA
+  ["ef83a1", :undef], # [CLOSED MAILBOX WITH RAISED FLAG] U+EB0A -> U+1F4EB
+  ["ef82a8", :undef], # [NEWSPAPER] U+E58B -> U+1F4F0
+  ["eebe81", :undef], # [SATELLITE ANTENNA] U+E4A8 -> U+1F4E1
+  ["ef82af", :undef], # [OUTBOX TRAY] U+E592 -> U+1F4E4
+  ["ef82b0", :undef], # [INBOX TRAY] U+E593 -> U+1F4E5
+  ["eebfb8", :undef], # [PACKAGE] U+E51F -> U+1F4E6
+  ["eeb5b5", :undef], # [E-MAIL SYMBOL] U+EB71 -> U+1F4E7
+  ["ef8394", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+EAFD -> U+1F520
+  ["ef8395", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+EAFE -> U+1F521
+  ["ef8396", :undef], # [INPUT SYMBOL FOR NUMBERS] U+EAFF -> U+1F522
+  ["ef8397", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+EB00 -> U+1F523
+  ["eeb599", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+EB55 -> U+1F524
+  ["ef839a", "e29c92"], # [BLACK NIB] U+EB03 -> U+2712
+  ["ef83a8", :undef], # [PERSONAL COMPUTER] U+E5B8 -> U+1F4BB
+  ["eebdb9", "e29c8f"], # [PENCIL] U+E4A1 -> U+270F
+  ["eebdb8", :undef], # [PAPERCLIP] U+E4A0 -> U+1F4CE
+  ["eeb181", :undef], # [BRIEFCASE] U+E5CE -> U+1F4BC
+  ["ef829f", :undef], # [MINIDISC] U+E582 -> U+1F4BD
+  ["ef81be", :undef], # [FLOPPY DISK] U+E562 -> U+1F4BE
+  ["eebfa5", :undef], # [OPTICAL DISC] U+E50C -> U+1F4BF
+  ["eebfaf", "e29c82"], # [BLACK SCISSORS] U+E516 -> U+2702
+  ["ef81bc", :undef], # [ROUND PUSHPIN] U+E560 -> U+1F4CD
+  ["ef81bd", :undef], # [PAGE WITH CURL] U+E561 -> U+1F4C3
+  ["ef8286", :undef], # [PAGE FACING UP] U+E569 -> U+1F4C4
+  ["ef8280", :undef], # [CALENDAR] U+E563 -> U+1F4C5
+  ["ef82ac", :undef], # [FILE FOLDER] U+E58F -> U+1F4C1
+  ["ef82ad", :undef], # [OPEN FILE FOLDER] U+E590 -> U+1F4C2
+  ["ef8288", :undef], # [NOTEBOOK] U+E56B -> U+1F4D3
+  ["eebdb7", :undef], # [OPEN BOOK] U+E49F -> U+1F4D6
+  ["eebdb5", :undef], # [NOTEBOOK WITH DECORATIVE COVER] U+E49D -> U+1F4D4
+  ["ef8285", :undef], # [CLOSED BOOK] U+E568 -> U+1F4D5
+  ["ef8282", :undef], # [GREEN BOOK] U+E565 -> U+1F4D7
+  ["ef8283", :undef], # [BLUE BOOK] U+E566 -> U+1F4D8
+  ["ef8284", :undef], # [ORANGE BOOK] U+E567 -> U+1F4D9
+  ["ef828c", :undef], # [BOOKS] U+E56F -> U+1F4DA
+  ["eebfb6", :undef], # [NAME BADGE] U+E51D -> U+1F4DB
+  ["ef81bb", :undef], # [SCROLL] U+E55F -> U+1F4DC
+  ["ef8281", :undef], # [CLIPBOARD] U+E564 -> U+1F4CB
+  ["ef8287", :undef], # [TEAR-OFF CALENDAR] U+E56A -> U+1F4C6
+  ["ef8291", :undef], # [BAR CHART] U+E574 -> U+1F4CA
+  ["ef8292", :undef], # [CHART WITH UPWARDS TREND] U+E575 -> U+1F4C8
+  ["ef8293", :undef], # [CHART WITH DOWNWARDS TREND] U+E576 -> U+1F4C9
+  ["ef8289", :undef], # [CARD INDEX] U+E56C -> U+1F4C7
+  ["ef828a", :undef], # [PUSHPIN] U+E56D -> U+1F4CC
+  ["ef828b", :undef], # [LEDGER] U+E56E -> U+1F4D2
+  ["ef828d", :undef], # [STRAIGHT RULER] U+E570 -> U+1F4CF
+  ["eebdba", :undef], # [TRIANGULAR RULER] U+E4A2 -> U+1F4D0
+  ["ef83a2", :undef], # [BOOKMARK TABS] U+EB0B -> U+1F4D1
+  ["eebe93", "e29abe"], # [BASEBALL] U+E4BA -> U+26BE
+  ["ef82b6", "e29bb3"], # [FLAG IN HOLE] U+E599 -> U+26F3
+  ["eebe90", :undef], # [TENNIS RACQUET AND BALL] U+E4B7 -> U+1F3BE
+  ["eebe8f", "e29abd"], # [SOCCER BALL] U+E4B6 -> U+26BD
+  ["eeb280", :undef], # [SKI AND SKI BOOT] U+EAAC -> U+1F3BF
+  ["ef82b7", :undef], # [BASKETBALL AND HOOP] U+E59A -> U+1F3C0
+  ["eebe92", :undef], # [CHEQUERED FLAG] U+E4B9 -> U+1F3C1
+  ["eebe91", :undef], # [SNOWBOARDER] U+E4B8 -> U+1F3C2
+  ["eebd83", :undef], # [RUNNER] U+E46B -> U+1F3C3
+  ["eeb585", :undef], # [SURFER] U+EB41 -> U+1F3C4
+  ["eeb186", :undef], # [TROPHY] U+E5D3 -> U+1F3C6
+  ["eebe94", :undef], # [AMERICAN FOOTBALL] U+E4BB -> U+1F3C8
+  ["eeb2b2", :undef], # [SWIMMER] U+EADE -> U+1F3CA
+  ["eebe8e", :undef], # [TRAIN] U+E4B5 -> U+1F686
+  ["ef83ac", :undef], # [METRO] U+E5BC -> U+1F687
+  ["eebe89", :undef], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E4B0 -> U+1F685
+  ["eebe8a", :undef], # [AUTOMOBILE] U+E4B1 -> U+1F697
+  ["eebe88", :undef], # [ONCOMING BUS] U+E4AF -> U+1F68D
+  ["eebe80", :undef], # [BUS STOP] U+E4A7 -> U+1F68F
+  ["eeb195", :undef], # [SHIP] U+EA82 -> U+1F6A2
+  ["eebe8c", "e29c88"], # [AIRPLANE] U+E4B3 -> U+2708
+  ["eebe8d", "e29bb5"], # [SAILBOAT] U+E4B4 -> U+26F5
+  ["eeb5b1", :undef], # [STATION] U+EB6D -> U+1F689
+  ["ef83b8", :undef], # [ROCKET] U+E5C8 -> U+1F680
+  ["eebe8b", :undef], # [DELIVERY TRUCK] U+E4B2 -> U+1F69A
+  ["eeb2b3", :undef], # [FIRE ENGINE] U+EADF -> U+1F692
+  ["eeb2b4", :undef], # [AMBULANCE] U+EAE0 -> U+1F691
+  ["eeb2b5", :undef], # [POLICE CAR] U+EAE1 -> U+1F693
+  ["ef828e", "e29bbd"], # [FUEL PUMP] U+E571 -> U+26FD
+  ["eebdbe", "f09f85bf"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E4A6 -> U+1F17F
+  ["eebd82", :undef], # [HORIZONTAL TRAFFIC LIGHT] U+E46A -> U+1F6A5
+  ["eeb18a", :undef], # [CONSTRUCTION SIGN] U+E5D7 -> U+1F6A7
+  ["eeb5b7", :undef], # [POLICE CARS REVOLVING LIGHT] U+EB73 -> U+1F6A8
+  ["eebe95", "e299a8"], # [HOT SPRINGS] U+E4BC -> U+2668
+  ["eeb183", "e29bba"], # [TENT] U+E5D0 -> U+26FA
+  ["eebd85", :undef], # [FERRIS WHEEL] U+E46D -> U+1F3A1
+  ["eeb2b6", :undef], # [ROLLER COASTER] U+EAE2 -> U+1F3A2
+  ["eeb586", :undef], # [FISHING POLE AND FISH] U+EB42 -> U+1F3A3
+  ["eebf9c", :undef], # [MICROPHONE] U+E503 -> U+1F3A4
+  ["eebfb0", :undef], # [MOVIE CAMERA] U+E517 -> U+1F3A5
+  ["eebfa1", :undef], # [HEADPHONE] U+E508 -> U+1F3A7
+  ["ef82b9", :undef], # [ARTIST PALETTE] U+E59C -> U+1F3A8
+  ["eeb389", :undef], # [TOP HAT] U+EAF5 -> U+1F3A9
+  ["ef82bb", :undef], # [CIRCUS TENT] U+E59E -> U+1F3AA
+  ["eebdb6", :undef], # [TICKET] U+E49E -> U+1F3AB
+  ["eebe97", :undef], # [CLAPPER BOARD] U+E4BE -> U+1F3AC
+  ["ef82ba", :undef], # [PERFORMING ARTS] U+E59D -> U+1F3AD
+  ["eebe9f", :undef], # [VIDEO GAME] U+E4C6 -> U+1F3AE
+  ["eeb184", "f09f8084"], # [MAHJONG TILE RED DRAGON] U+E5D1 -> U+1F004
+  ["eebe9e", :undef], # [DIRECT HIT] U+E4C5 -> U+1F3AF
+  ["eebd86", :undef], # [SLOT MACHINE] U+E46E -> U+1F3B0
+  ["eeb2b1", :undef], # [BILLIARDS] U+EADD -> U+1F3B1
+  ["eebea1", :undef], # [GAME DIE] U+E4C8 -> U+1F3B2
+  ["eeb587", :undef], # [BOWLING] U+EB43 -> U+1F3B3
+  ["eeb5b2", :undef], # [FLOWER PLAYING CARDS] U+EB6E -> U+1F3B4
+  ["eeb5b3", :undef], # [PLAYING CARD BLACK JOKER] U+EB6F -> U+1F0CF
+  ["ef83ae", :undef], # [MUSICAL NOTE] U+E5BE -> U+1F3B5
+  ["eebf9e", :undef], # [MULTIPLE MUSICAL NOTES] U+E505 -> U+1F3B6
+  ["eebf9f", :undef], # [GUITAR] U+E506 -> U+1F3B8
+  ["eeb584", :undef], # [MUSICAL KEYBOARD] U+EB40 -> U+1F3B9
+  ["eeb2b0", :undef], # [TRUMPET] U+EADC -> U+1F3BA
+  ["eebfa0", :undef], # [VIOLIN] U+E507 -> U+1F3BB
+  ["eeb2a0", :undef], # [MUSICAL SCORE] U+EACC -> U+1F3BC
+  ["eebfae", :undef], # [CAMERA] U+E515 -> U+1F4F7
+  ["ef829b", :undef], # [VIDEO CAMERA] U+E57E -> U+1F4F9
+  ["eebf9b", :undef], # [TELEVISION] U+E502 -> U+1F4FA
+  ["ef83a9", :undef], # [RADIO] U+E5B9 -> U+1F4FB
+  ["ef829d", :undef], # [VIDEOCASSETTE] U+E580 -> U+1F4FC
+  ["eebf84", :undef], # [KISS MARK] U+E4EB -> U+1F48B
+  ["eeb5bc", :undef], # [LOVE LETTER] U+EB78 -> U+1F48C
+  ["eebfad", :undef], # [RING] U+E514 -> U+1F48D
+  ["ef83ba", :undef], # [KISS] U+E5CA -> U+1F48F
+  ["eeb1a8", :undef], # [BOUQUET] U+EA95 -> U+1F490
+  ["eeb2ae", :undef], # [COUPLE WITH HEART] U+EADA -> U+1F491
+  ["eeb196", :undef], # [NO ONE UNDER EIGHTEEN SYMBOL] U+EA83 -> U+1F51E
+  ["ef81b4", "c2a9"], # [COPYRIGHT SIGN] U+E558 -> U+A9
+  ["ef81b5", "c2ae"], # [REGISTERED SIGN] U+E559 -> U+AE
+  ["ef81aa", "e284a2"], # [TRADE MARK SIGN] U+E54E -> U+2122
+  ["ef818f", "e284b9"], # [INFORMATION SOURCE] U+E533 -> U+2139
+  ["eeb689", "23e283a3"], # [HASH KEY] U+EB84 -> U+23 U+20E3
+  ["eebfbb", "31e283a3"], # [KEYCAP 1] U+E522 -> U+31 U+20E3
+  ["eebfbc", "32e283a3"], # [KEYCAP 2] U+E523 -> U+32 U+20E3
+  ["ef8180", "33e283a3"], # [KEYCAP 3] U+E524 -> U+33 U+20E3
+  ["ef8181", "34e283a3"], # [KEYCAP 4] U+E525 -> U+34 U+20E3
+  ["ef8182", "35e283a3"], # [KEYCAP 5] U+E526 -> U+35 U+20E3
+  ["ef8183", "36e283a3"], # [KEYCAP 6] U+E527 -> U+36 U+20E3
+  ["ef8184", "37e283a3"], # [KEYCAP 7] U+E528 -> U+37 U+20E3
+  ["ef8185", "38e283a3"], # [KEYCAP 8] U+E529 -> U+38 U+20E3
+  ["ef8186", "39e283a3"], # [KEYCAP 9] U+E52A -> U+39 U+20E3
+  ["ef8389", "30e283a3"], # [KEYCAP 0] U+E5AC -> U+30 U+20E3
+  ["ef8187", :undef], # [KEYCAP TEN] U+E52B -> U+1F51F
+  ["eeb197", :undef], # [ANTENNA WITH BARS] U+EA84 -> U+1F4F6
+  ["eeb1a3", :undef], # [VIBRATION MODE] U+EA90 -> U+1F4F3
+  ["eeb1a4", :undef], # [MOBILE PHONE OFF] U+EA91 -> U+1F4F4
+  ["eebeaf", :undef], # [HAMBURGER] U+E4D6 -> U+1F354
+  ["eebeae", :undef], # [RICE BALL] U+E4D5 -> U+1F359
+  ["eebea9", :undef], # [SHORTCAKE] U+E4D0 -> U+1F370
+  ["ef8391", :undef], # [STEAMING BOWL] U+E5B4 -> U+1F35C
+  ["eeb283", :undef], # [BREAD] U+EAAF -> U+1F35E
+  ["eebeaa", :undef], # [COOKING] U+E4D1 -> U+1F373
+  ["eeb284", :undef], # [SOFT ICE CREAM] U+EAB0 -> U+1F366
+  ["eeb285", :undef], # [FRENCH FRIES] U+EAB1 -> U+1F35F
+  ["eeb286", :undef], # [DANGO] U+EAB2 -> U+1F361
+  ["eeb287", :undef], # [RICE CRACKER] U+EAB3 -> U+1F358
+  ["eeb288", :undef], # [COOKED RICE] U+EAB4 -> U+1F35A
+  ["eeb289", :undef], # [SPAGHETTI] U+EAB5 -> U+1F35D
+  ["eeb28a", :undef], # [CURRY AND RICE] U+EAB6 -> U+1F35B
+  ["eeb28b", :undef], # [ODEN] U+EAB7 -> U+1F362
+  ["eeb28c", :undef], # [SUSHI] U+EAB8 -> U+1F363
+  ["eeb291", :undef], # [BENTO BOX] U+EABD -> U+1F371
+  ["eeb292", :undef], # [POT OF FOOD] U+EABE -> U+1F372
+  ["eeb2be", :undef], # [SHAVED ICE] U+EAEA -> U+1F367
+  ["eebe9d", :undef], # [MEAT ON BONE] U+E4C4 -> U+1F356
+  ["eebf86", :undef], # [FISH CAKE WITH SWIRL DESIGN] U+E4ED -> U+1F365
+  ["eeb3bb", :undef], # [ROASTED SWEET POTATO] U+EB3A -> U+1F360
+  ["eeb3bc", :undef], # [SLICE OF PIZZA] U+EB3B -> U+1F355
+  ["eeb580", :undef], # [POULTRY LEG] U+EB3C -> U+1F357
+  ["eeb58e", :undef], # [ICE CREAM] U+EB4A -> U+1F368
+  ["eeb58f", :undef], # [DOUGHNUT] U+EB4B -> U+1F369
+  ["eeb590", :undef], # [COOKIE] U+EB4C -> U+1F36A
+  ["eeb591", :undef], # [CHOCOLATE BAR] U+EB4D -> U+1F36B
+  ["eeb592", :undef], # [CANDY] U+EB4E -> U+1F36C
+  ["eeb593", :undef], # [LOLLIPOP] U+EB4F -> U+1F36D
+  ["eeb59a", :undef], # [CUSTARD] U+EB56 -> U+1F36E
+  ["eeb59d", :undef], # [HONEY POT] U+EB59 -> U+1F36F
+  ["eeb5b4", :undef], # [FRIED SHRIMP] U+EB70 -> U+1F364
+  ["eebe85", :undef], # [FORK AND KNIFE] U+E4AC -> U+1F374
+  ["ef82b4", "e29895"], # [HOT BEVERAGE] U+E597 -> U+2615
+  ["eebe9b", :undef], # [COCKTAIL GLASS] U+E4C2 -> U+1F378
+  ["eebe9c", :undef], # [BEER MUG] U+E4C3 -> U+1F37A
+  ["eeb282", :undef], # [TEACUP WITHOUT HANDLE] U+EAAE -> U+1F375
+  ["eeb1aa", :undef], # [SAKE BOTTLE AND CUP] U+EA97 -> U+1F376
+  ["eebe9a", :undef], # [WINE GLASS] U+E4C1 -> U+1F377
+  ["eeb1ab", :undef], # [CLINKING BEER MUGS] U+EA98 -> U+1F37B
+  ["eeb582", :undef], # [TROPICAL DRINK] U+EB3E -> U+1F379
+  ["ef81b1", "e28697"], # [NORTH EAST ARROW] U+E555 -> U+2197
+  ["ef81a9", "e28698"], # [SOUTH EAST ARROW] U+E54D -> U+2198
+  ["ef81a8", "e28696"], # [NORTH WEST ARROW] U+E54C -> U+2196
+  ["ef81b2", "e28699"], # [SOUTH WEST ARROW] U+E556 -> U+2199
+  ["eeb3ae", "e2a4b4"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+EB2D -> U+2934
+  ["eeb3af", "e2a4b5"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+EB2E -> U+2935
+  ["eeb5be", "e28694"], # [LEFT RIGHT ARROW] U+EB7A -> U+2194
+  ["eeb680", "e28695"], # [UP DOWN ARROW] U+EB7B -> U+2195
+  ["ef819b", "e2ac86"], # [UPWARDS BLACK ARROW] U+E53F -> U+2B06
+  ["ef819c", "e2ac87"], # [DOWNWARDS BLACK ARROW] U+E540 -> U+2B07
+  ["ef81ae", "e29ea1"], # [BLACK RIGHTWARDS ARROW] U+E552 -> U+27A1
+  ["ef81af", "e2ac85"], # [LEFTWARDS BLACK ARROW] U+E553 -> U+2B05
+  ["ef818a", "e296b6"], # [BLACK RIGHT-POINTING TRIANGLE] U+E52E -> U+25B6
+  ["ef8189", "e29780"], # [BLACK LEFT-POINTING TRIANGLE] U+E52D -> U+25C0
+  ["ef818c", :undef], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E530 -> U+23E9
+  ["ef818b", :undef], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E52F -> U+23EA
+  ["ef81a1", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+E545 -> U+23EB
+  ["ef81a0", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+E544 -> U+23EC
+  ["ef81b6", :undef], # [UP-POINTING RED TRIANGLE] U+E55A -> U+1F53A
+  ["ef81b7", :undef], # [DOWN-POINTING RED TRIANGLE] U+E55B -> U+1F53B
+  ["ef819f", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+E543 -> U+1F53C
+  ["ef819e", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+E542 -> U+1F53D
+  ["eeb281", "e2ad95"], # [HEAVY LARGE CIRCLE] U+EAAD -> U+2B55
+  ["ef81ac", :undef], # [CROSS MARK] U+E550 -> U+274C
+  ["ef81ad", :undef], # [NEGATIVE SQUARED CROSS MARK] U+E551 -> U+274E
+  ["eebd9a", "e29da2"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E482 -> U+2762
+  ["eeb3b0", "e28189"], # [EXCLAMATION QUESTION MARK] U+EB2F -> U+2049
+  ["eeb3b1", "e280bc"], # [DOUBLE EXCLAMATION MARK] U+EB30 -> U+203C
+  ["eebd9b", :undef], # [BLACK QUESTION MARK ORNAMENT] U+E483 -> U+2753
+  ["eeb3b2", :undef], # [CURLY LOOP] U+EB31 -> U+27B0
+  ["ef82b2", "e29da4"], # [HEAVY BLACK HEART] U+E595 -> U+2764
+  ["eeb5b9", :undef], # [BEATING HEART] U+EB75 -> U+1F493
+  ["eebd8f", :undef], # [BROKEN HEART] U+E477 -> U+1F494
+  ["eebd90", :undef], # [TWO HEARTS] U+E478 -> U+1F495
+  ["eeb1b9", :undef], # [SPARKLING HEART] U+EAA6 -> U+1F496
+  ["eebf83", :undef], # [HEART WITH ARROW] U+E4EA -> U+1F498
+  ["eeb1ba", :undef], # [BLUE HEART] U+EAA7 -> U+1F499
+  ["eeb1bb", :undef], # [GREEN HEART] U+EAA8 -> U+1F49A
+  ["eeb1bc", :undef], # [YELLOW HEART] U+EAA9 -> U+1F49B
+  ["eeb1bd", :undef], # [PURPLE HEART] U+EAAA -> U+1F49C
+  ["eeb598", :undef], # [HEART WITH RIBBON] U+EB54 -> U+1F49D
+  ["ef838c", :undef], # [REVOLVING HEARTS] U+E5AF -> U+1F49E
+  ["eeb1b8", "e299a5"], # [BLACK HEART SUIT] U+EAA5 -> U+2665
+  ["ef82be", "e299a0"], # [BLACK SPADE SUIT] U+E5A1 -> U+2660
+  ["ef82bf", "e299a6"], # [BLACK DIAMOND SUIT] U+E5A2 -> U+2666
+  ["ef8380", "e299a3"], # [BLACK CLUB SUIT] U+E5A3 -> U+2663
+  ["eebd95", :undef], # [SMOKING SYMBOL] U+E47D -> U+1F6AC
+  ["eebd96", :undef], # [NO SMOKING SYMBOL] U+E47E -> U+1F6AD
+  ["eebd97", "e299bf"], # [WHEELCHAIR SYMBOL] U+E47F -> U+267F
+  ["eeb3ad", :undef], # [TRIANGULAR FLAG ON POST] U+EB2C -> U+1F6A9
+  ["eebd99", "e29aa0"], # [WARNING SIGN] U+E481 -> U+26A0
+  ["eebd9c", "e29b94"], # [NO ENTRY] U+E484 -> U+26D4
+  ["eeb5bd", "e299bb"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+EB79 -> U+267B
+  ["eebe87", :undef], # [BICYCLE] U+E4AE -> U+1F6B2
+  ["eeb5b6", :undef], # [PEDESTRIAN] U+EB72 -> U+1F6B6
+  ["eeb18b", :undef], # [BATH] U+E5D8 -> U+1F6C0
+  ["eebdbd", :undef], # [RESTROOM] U+E4A5 -> U+1F6BB
+  ["ef819d", :undef], # [NO ENTRY SIGN] U+E541 -> U+1F6AB
+  ["ef81b3", "e29c94"], # [HEAVY CHECK MARK] U+E557 -> U+2714
+  ["ef8388", :undef], # [SQUARED CL] U+E5AB -> U+1F191
+  ["eeb198", :undef], # [SQUARED COOL] U+EA85 -> U+1F192
+  ["ef8295", :undef], # [SQUARED FREE] U+E578 -> U+1F193
+  ["eeb19b", :undef], # [SQUARED ID] U+EA88 -> U+1F194
+  ["ef83a5", :undef], # [SQUARED NEW] U+E5B5 -> U+1F195
+  ["ef838a", :undef], # [SQUARED OK] U+E5AD -> U+1F197
+  ["eebf81", :undef], # [SQUARED SOS] U+E4E8 -> U+1F198
+  ["eebfa8", :undef], # [SQUARED UP WITH EXCLAMATION MARK] U+E50F -> U+1F199
+  ["eeb185", :undef], # [SQUARED VS] U+E5D2 -> U+1F19A
+  ["eeb19a", :undef], # [SQUARED KATAKANA SA] U+EA87 -> U+1F202
+  ["eeb19d", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+EA8A -> U+1F233
+  ["eeb19c", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+EA89 -> U+1F235
+  ["eeb199", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+EA86 -> U+1F239
+  ["eeb19e", "f09f88af"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+EA8B -> U+1F22F
+  ["eeb19f", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+EA8C -> U+1F23A
+  ["eebf8a", "e38a99"], # [CIRCLED IDEOGRAPH SECRET] U+E4F1 -> U+3299
+  ["eeb1ac", "e38a97"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+EA99 -> U+3297
+  ["eebf90", :undef], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E4F7 -> U+1F250
+  ["ef8398", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+EB01 -> U+1F251
+  ["ef8198", :undef], # [HEAVY PLUS SIGN] U+E53C -> U+2795
+  ["ef8199", :undef], # [HEAVY MINUS SIGN] U+E53D -> U+2796
+  ["ef81ab", "e29c96"], # [HEAVY MULTIPLICATION X] U+E54F -> U+2716
+  ["ef81b0", :undef], # [HEAVY DIVISION SIGN] U+E554 -> U+2797
+  ["eebd8e", :undef], # [ELECTRIC LIGHT BULB] U+E476 -> U+1F4A1
+  ["eebebe", :undef], # [ANGER SYMBOL] U+E4E5 -> U+1F4A2
+  ["eebd92", :undef], # [BOMB] U+E47A -> U+1F4A3
+  ["eebd8d", :undef], # [SLEEPING SYMBOL] U+E475 -> U+1F4A4
+  ["ef838d", :undef], # [COLLISION SYMBOL] U+E5B0 -> U+1F4A5
+  ["ef838e", :undef], # [SPLASHING SWEAT SYMBOL] U+E5B1 -> U+1F4A6
+  ["eebebf", :undef], # [DROP OF WATER] U+E4E6 -> U+1F4A7
+  ["eebf8d", :undef], # [DASH SYMBOL] U+E4F4 -> U+1F4A8
+  ["eebf8e", :undef], # [PILE OF POO] U+E4F5 -> U+1F4A9
+  ["eebf82", :undef], # [FLEXED BICEPS] U+E4E9 -> U+1F4AA
+  ["eeb5a0", :undef], # [DIZZY SYMBOL] U+EB5C -> U+1F4AB
+  ["eebf96", :undef], # [SPEECH BALLOON] U+E4FD -> U+1F4AC
+  ["eeb1be", :undef], # [SPARKLES] U+EAAB -> U+2728
+  ["eebd91", "e29cb4"], # [EIGHT POINTED BLACK STAR] U+E479 -> U+2734
+  ["ef819a", "e29cb3"], # [EIGHT SPOKED ASTERISK] U+E53E -> U+2733
+  ["ef8196", "e29aaa"], # [MEDIUM WHITE CIRCLE] U+E53A -> U+26AA
+  ["ef8197", "e29aab"], # [MEDIUM BLACK CIRCLE] U+E53B -> U+26AB
+  ["ef81a6", :undef], # [LARGE RED CIRCLE] U+E54A -> U+1F534
+  ["ef81a7", :undef], # [LARGE BLUE CIRCLE] U+E54B -> U+1F535
+  ["eebda3", "e2ad90"], # [WHITE MEDIUM STAR] U+E48B -> U+2B50
+  ["ef81a4", "e2ac9c"], # [WHITE LARGE SQUARE] U+E548 -> U+2B1C
+  ["ef81a5", "e2ac9b"], # [BLACK LARGE SQUARE] U+E549 -> U+2B1B
+  ["ef818d", "e296ab"], # [WHITE SMALL SQUARE] U+E531 -> U+25AB
+  ["ef818e", "e296aa"], # [BLACK SMALL SQUARE] U+E532 -> U+25AA
+  ["ef8190", "e297bd"], # [WHITE MEDIUM SMALL SQUARE] U+E534 -> U+25FD
+  ["ef8191", "e297be"], # [BLACK MEDIUM SMALL SQUARE] U+E535 -> U+25FE
+  ["ef8194", "e297bb"], # [WHITE MEDIUM SQUARE] U+E538 -> U+25FB
+  ["ef8195", "e297bc"], # [BLACK MEDIUM SQUARE] U+E539 -> U+25FC
+  ["ef81a2", :undef], # [LARGE ORANGE DIAMOND] U+E546 -> U+1F536
+  ["ef81a3", :undef], # [LARGE BLUE DIAMOND] U+E547 -> U+1F537
+  ["ef8192", :undef], # [SMALL ORANGE DIAMOND] U+E536 -> U+1F538
+  ["ef8193", :undef], # [SMALL BLUE DIAMOND] U+E537 -> U+1F539
+  ["eebd84", "e29d87"], # [SPARKLE] U+E46C -> U+2747
+  ["eebf89", :undef], # [WHITE FLOWER] U+E4F0 -> U+1F4AE
+  ["eebf8b", :undef], # [HUNDRED POINTS SYMBOL] U+E4F2 -> U+1F4AF
+  ["ef81b9", "e286a9"], # [LEFTWARDS ARROW WITH HOOK] U+E55D -> U+21A9
+  ["ef81b8", "e286aa"], # [RIGHTWARDS ARROW WITH HOOK] U+E55C -> U+21AA
+  ["ef83a4", :undef], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+EB0D -> U+1F503
+  ["eebfaa", :undef], # [SPEAKER WITH THREE SOUND WAVES] U+E511 -> U+1F50A
+  ["ef82a1", :undef], # [BATTERY] U+E584 -> U+1F50B
+  ["ef82a6", :undef], # [ELECTRIC PLUG] U+E589 -> U+1F50C
+  ["eebfb1", :undef], # [LEFT-POINTING MAGNIFYING GLASS] U+E518 -> U+1F50D
+  ["ef839c", :undef], # [RIGHT-POINTING MAGNIFYING GLASS] U+EB05 -> U+1F50E
+  ["eebfb5", :undef], # [LOCK] U+E51C -> U+1F512
+  ["ef83a3", :undef], # [LOCK WITH INK PEN] U+EB0C -> U+1F50F
+  ["ef8393", :undef], # [CLOSED LOCK WITH KEY] U+EAFC -> U+1F510
+  ["eebfb2", :undef], # [KEY] U+E519 -> U+1F511
+  ["eebfab", :undef], # [BELL] U+E512 -> U+1F514
+  ["ef8399", "e29891"], # [BALLOT BOX WITH CHECK] U+EB02 -> U+2611
+  ["ef839b", :undef], # [RADIO BUTTON] U+EB04 -> U+1F518
+  ["ef839e", :undef], # [BOOKMARK] U+EB07 -> U+1F516
+  ["ef82a7", :undef], # [LINK SYMBOL] U+E58A -> U+1F517
+  ["ef839d", :undef], # [BACK WITH LEFTWARDS ARROW ABOVE] U+EB06 -> U+1F519
+  ["ef82a9", "e28083"], # [EM SPACE] U+E58C -> U+2003
+  ["ef82aa", "e28082"], # [EN SPACE] U+E58D -> U+2002
+  ["ef82ab", "e28085"], # [FOUR-PER-EM SPACE] U+E58E -> U+2005
+  ["ef81ba", :undef], # [WHITE HEAVY CHECK MARK] U+E55E -> U+2705
+  ["eeb688", :undef], # [RAISED FIST] U+EB83 -> U+270A
+  ["ef8384", :undef], # [RAISED HAND] U+E5A7 -> U+270B
+  ["ef8383", "e29c8c"], # [VICTORY HAND] U+E5A6 -> U+270C
+  ["eebf8c", :undef], # [FISTED HAND SIGN] U+E4F3 -> U+1F44A
+  ["eebf92", :undef], # [THUMBS UP SIGN] U+E4F9 -> U+1F44D
+  ["eebf8f", "e2989d"], # [WHITE UP POINTING INDEX] U+E4F6 -> U+261D
+  ["eeb1a0", :undef], # [WHITE UP POINTING BACKHAND INDEX] U+EA8D -> U+1F446
+  ["eeb1a1", :undef], # [WHITE DOWN POINTING BACKHAND INDEX] U+EA8E -> U+1F447
+  ["eebf98", :undef], # [WHITE LEFT POINTING BACKHAND INDEX] U+E4FF -> U+1F448
+  ["eebf99", :undef], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E500 -> U+1F449
+  ["eeb2aa", :undef], # [WAVING HAND SIGN] U+EAD6 -> U+1F44B
+  ["eeb2a7", :undef], # [CLAPPING HANDS SIGN] U+EAD3 -> U+1F44F
+  ["eeb2a8", :undef], # [OK HAND SIGN] U+EAD4 -> U+1F44C
+  ["eeb2a9", :undef], # [THUMBS DOWN SIGN] U+EAD5 -> U+1F44E
+  ["ef8294", :undef], # [EMOJI COMPATIBILITY SYMBOL-37] U+E577 -> "[EZ]"
+  ["ef838f", :undef], # [EMOJI COMPATIBILITY SYMBOL-38] U+E5B2 -> "[ezplus]"
+  ["eeb1b0", :undef], # [EMOJI COMPATIBILITY SYMBOL-39] U+EA9D -> "[EZナビ]"
+  ["eeb5b8", :undef], # [EMOJI COMPATIBILITY SYMBOL-40] U+EB74 -> "[EZムービー]"
+  ["eeb686", :undef], # [EMOJI COMPATIBILITY SYMBOL-41] U+EB81 -> "[Cメール]"
+  ["eeb68e", :undef], # [EMOJI COMPATIBILITY SYMBOL-42] U+EB89 -> "[Java]"
+  ["eeb68f", :undef], # [EMOJI COMPATIBILITY SYMBOL-43] U+EB8A -> "[BREW]"
+  ["eeb690", :undef], # [EMOJI COMPATIBILITY SYMBOL-44] U+EB8B -> "[EZ着うた]"
+  ["eeb691", :undef], # [EMOJI COMPATIBILITY SYMBOL-45] U+EB8C -> "[EZナビ]"
+  ["eeb692", :undef], # [EMOJI COMPATIBILITY SYMBOL-46] U+EB8D -> "[WIN]"
+  ["eeb693", :undef], # [EMOJI COMPATIBILITY SYMBOL-47] U+EB8E -> "[プレミアム]"
+  ["ef8392", :undef], # [EMOJI COMPATIBILITY SYMBOL-48] U+EAFB -> "[オープンウェブ]"
+  ["ef82a3", :undef], # [EMOJI COMPATIBILITY SYMBOL-49] U+E586 -> "[PDC]"
+  ["ef8188", :undef], # [EMOJI COMPATIBILITY SYMBOL-66] U+E52C -> "[Q]"
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-SoftBank']['UTF8-DoCoMo'] = [
+  ["ee818a", "ee98be"], # [BLACK SUN WITH RAYS] U+E04A -> U+E63E
+  ["ee8189", "ee98bf"], # [CLOUD] U+E049 -> U+E63F
+  ["ee818b", "ee9980"], # [UMBRELLA WITH RAIN DROPS] U+E04B -> U+E640
+  ["ee8188", "ee9981"], # [SNOWMAN WITHOUT SNOW] U+E048 -> U+E641
+  ["ee84bd", "ee9982"], # [HIGH VOLTAGE SIGN] U+E13D -> U+E642
+  ["ee9183", "ee9983"], # [CYCLONE] U+E443 -> U+E643
+  ["ee90bc", "ee9985"], # [CLOSED UMBRELLA] U+E43C -> U+E645
+  ["ee918b", "ee9ab3"], # [NIGHT WITH STARS] U+E44B -> U+E6B3
+  ["ee818d", "ee98be"], # [SUNRISE OVER MOUNTAINS] U+E04D -> U+E63E
+  ["ee9189", "ee98be"], # [SUNRISE] U+E449 -> U+E63E
+  ["ee8586", :undef], # [CITYSCAPE AT DUSK] U+E146 -> "[夕焼け]"
+  ["ee918a", "ee98be"], # [SUNSET OVER BUILDINGS] U+E44A -> U+E63E
+  ["ee918c", :undef], # [RAINBOW] U+E44C -> "[虹]"
+  ["ee90be", "ee9cbf"], # [WATER WAVE] U+E43E -> U+E73F
+  ["ee818c", "ee9a9f"], # [CRESCENT MOON] U+E04C -> U+E69F
+  ["ee8cb5", :undef], # [GLOWING STAR] U+E335 -> "[☆]"
+  ["ee80a4", "ee9aba"], # [CLOCK FACE ONE OCLOCK] U+E024 -> U+E6BA
+  ["ee80a5", "ee9aba"], # [CLOCK FACE TWO OCLOCK] U+E025 -> U+E6BA
+  ["ee80a6", "ee9aba"], # [CLOCK FACE THREE OCLOCK] U+E026 -> U+E6BA
+  ["ee80a7", "ee9aba"], # [CLOCK FACE FOUR OCLOCK] U+E027 -> U+E6BA
+  ["ee80a8", "ee9aba"], # [CLOCK FACE FIVE OCLOCK] U+E028 -> U+E6BA
+  ["ee80a9", "ee9aba"], # [CLOCK FACE SIX OCLOCK] U+E029 -> U+E6BA
+  ["ee80aa", "ee9aba"], # [CLOCK FACE SEVEN OCLOCK] U+E02A -> U+E6BA
+  ["ee80ab", "ee9aba"], # [CLOCK FACE EIGHT OCLOCK] U+E02B -> U+E6BA
+  ["ee80ac", "ee9aba"], # [CLOCK FACE NINE OCLOCK] U+E02C -> U+E6BA
+  ["ee80ad", "ee9aba"], # [CLOCK FACE TEN OCLOCK] U+E02D -> U+E6BA
+  ["ee80ae", "ee9aba"], # [CLOCK FACE ELEVEN OCLOCK] U+E02E -> U+E6BA
+  ["ee80af", "ee9aba"], # [CLOCK FACE TWELVE OCLOCK] U+E02F -> U+E6BA
+  ["ee88bf", "ee9986"], # [ARIES] U+E23F -> U+E646
+  ["ee8980", "ee9987"], # [TAURUS] U+E240 -> U+E647
+  ["ee8981", "ee9988"], # [GEMINI] U+E241 -> U+E648
+  ["ee8982", "ee9989"], # [CANCER] U+E242 -> U+E649
+  ["ee8983", "ee998a"], # [LEO] U+E243 -> U+E64A
+  ["ee8984", "ee998b"], # [VIRGO] U+E244 -> U+E64B
+  ["ee8985", "ee998c"], # [LIBRA] U+E245 -> U+E64C
+  ["ee8986", "ee998d"], # [SCORPIUS] U+E246 -> U+E64D
+  ["ee8987", "ee998e"], # [SAGITTARIUS] U+E247 -> U+E64E
+  ["ee8988", "ee998f"], # [CAPRICORN] U+E248 -> U+E64F
+  ["ee8989", "ee9990"], # [AQUARIUS] U+E249 -> U+E650
+  ["ee898a", "ee9991"], # [PISCES] U+E24A -> U+E651
+  ["ee898b", :undef], # [OPHIUCHUS] U+E24B -> "[蛇使座]"
+  ["ee8490", "ee9d81"], # [FOUR LEAF CLOVER] U+E110 -> U+E741
+  ["ee8c84", "ee9d83"], # [TULIP] U+E304 -> U+E743
+  ["ee8498", "ee9d87"], # [MAPLE LEAF] U+E118 -> U+E747
+  ["ee80b0", "ee9d88"], # [CHERRY BLOSSOM] U+E030 -> U+E748
+  ["ee80b2", :undef], # [ROSE] U+E032 -> "[バラ]"
+  ["ee8499", "ee9d87"], # [FALLEN LEAF] U+E119 -> U+E747
+  ["ee9187", :undef], # [LEAF FLUTTERING IN WIND] U+E447 -> "[風に舞う葉]"
+  ["ee8c83", :undef], # [HIBISCUS] U+E303 -> "[ハイビスカス]"
+  ["ee8c85", :undef], # [SUNFLOWER] U+E305 -> "[ひまわり]"
+  ["ee8c87", :undef], # [PALM TREE] U+E307 -> "[ヤシ]"
+  ["ee8c88", :undef], # [CACTUS] U+E308 -> "[サボテン]"
+  ["ee9184", :undef], # [EAR OF RICE] U+E444 -> "[稲穂]"
+  ["ee8d85", "ee9d85"], # [RED APPLE] U+E345 -> U+E745
+  ["ee8d86", :undef], # [TANGERINE] U+E346 -> "[みかん]"
+  ["ee8d87", :undef], # [STRAWBERRY] U+E347 -> "[イチゴ]"
+  ["ee8d88", :undef], # [WATERMELON] U+E348 -> "[スイカ]"
+  ["ee8d89", :undef], # [TOMATO] U+E349 -> "[トマト]"
+  ["ee8d8a", :undef], # [AUBERGINE] U+E34A -> "[ナス]"
+  ["ee9099", "ee9a91"], # [EYES] U+E419 -> U+E691
+  ["ee909b", "ee9a92"], # [EAR] U+E41B -> U+E692
+  ["ee909a", :undef], # [NOSE] U+E41A -> "[鼻]"
+  ["ee909c", "ee9bb9"], # [MOUTH] U+E41C -> U+E6F9
+  ["ee8c9c", "ee9c90"], # [LIPSTICK] U+E31C -> U+E710
+  ["ee8c9d", :undef], # [NAIL POLISH] U+E31D -> "[マニキュア]"
+  ["ee8c9e", :undef], # [FACE MASSAGE] U+E31E -> "[エステ]"
+  ["ee8c9f", "ee99b5"], # [HAIRCUT] U+E31F -> U+E675
+  ["ee8ca0", :undef], # [BARBER POLE] U+E320 -> "[床屋]"
+  ["ee8081", "ee9bb0"], # [BOY] U+E001 -> U+E6F0
+  ["ee8082", "ee9bb0"], # [GIRL] U+E002 -> U+E6F0
+  ["ee8084", "ee9bb0"], # [MAN] U+E004 -> U+E6F0
+  ["ee8085", "ee9bb0"], # [WOMAN] U+E005 -> U+E6F0
+  ["ee90a8", :undef], # [MAN AND WOMAN HOLDING HANDS] U+E428 -> "[カップル]"
+  ["ee8592", :undef], # [POLICE OFFICER] U+E152 -> "[警官]"
+  ["ee90a9", :undef], # [WOMAN WITH BUNNY EARS] U+E429 -> "[バニー]"
+  ["ee9495", :undef], # [WESTERN PERSON] U+E515 -> "[白人]"
+  ["ee9496", :undef], # [MAN WITH GUA PI MAO] U+E516 -> "[中国人]"
+  ["ee9497", :undef], # [MAN WITH TURBAN] U+E517 -> "[インド人]"
+  ["ee9498", :undef], # [OLDER MAN] U+E518 -> "[おじいさん]"
+  ["ee9499", :undef], # [OLDER WOMAN] U+E519 -> "[おばあさん]"
+  ["ee949a", :undef], # [BABY] U+E51A -> "[赤ちゃん]"
+  ["ee949b", :undef], # [CONSTRUCTION WORKER] U+E51B -> "[工事現場の人]"
+  ["ee949c", :undef], # [PRINCESS] U+E51C -> "[お姫様]"
+  ["ee849b", :undef], # [GHOST] U+E11B -> "[お化け]"
+  ["ee818e", :undef], # [BABY ANGEL] U+E04E -> "[天使]"
+  ["ee848c", :undef], # [EXTRATERRESTRIAL ALIEN] U+E10C -> "[UFO]"
+  ["ee84ab", :undef], # [ALIEN MONSTER] U+E12B -> "[宇宙人]"
+  ["ee849a", :undef], # [IMP] U+E11A -> "[アクマ]"
+  ["ee849c", :undef], # [SKULL] U+E11C -> "[ドクロ]"
+  ["ee8993", :undef], # [INFORMATION DESK PERSON] U+E253 -> "[案内]"
+  ["ee949e", :undef], # [GUARDSMAN] U+E51E -> "[衛兵]"
+  ["ee949f", :undef], # [DANCER] U+E51F -> "[ダンス]"
+  ["ee94ad", :undef], # [SNAKE] U+E52D -> "[ヘビ]"
+  ["ee84b4", "ee9d94"], # [HORSE] U+E134 -> U+E754
+  ["ee94ae", :undef], # [CHICKEN] U+E52E -> "[ニワトリ]"
+  ["ee94af", :undef], # [BOAR] U+E52F -> "[イノシシ]"
+  ["ee94b0", :undef], # [BACTRIAN CAMEL] U+E530 -> "[ラクダ]"
+  ["ee94a6", :undef], # [ELEPHANT] U+E526 -> "[ゾウ]"
+  ["ee94a7", :undef], # [KOALA] U+E527 -> "[コアラ]"
+  ["ee94a8", :undef], # [MONKEY] U+E528 -> "[サル]"
+  ["ee94a9", :undef], # [SHEEP] U+E529 -> "[ヒツジ]"
+  ["ee848a", :undef], # [OCTOPUS] U+E10A -> "[タコ]"
+  ["ee9181", :undef], # [SPIRAL SHELL] U+E441 -> "[巻貝]"
+  ["ee94a5", :undef], # [BUG] U+E525 -> "[ゲジゲジ]"
+  ["ee94a2", "ee9d91"], # [TROPICAL FISH] U+E522 -> U+E751
+  ["ee94a3", "ee9d8f"], # [BABY CHICK] U+E523 -> U+E74F
+  ["ee94a1", "ee9d8f"], # [BIRD] U+E521 -> U+E74F
+  ["ee8195", "ee9d90"], # [PENGUIN] U+E055 -> U+E750
+  ["ee8099", "ee9d91"], # [FISH] U+E019 -> U+E751
+  ["ee94a0", :undef], # [DOLPHIN] U+E520 -> "[イルカ]"
+  ["ee8193", :undef], # [MOUSE FACE] U+E053 -> "[ネズミ]"
+  ["ee8190", :undef], # [TIGER FACE] U+E050 -> "[トラ]"
+  ["ee818f", "ee9aa2"], # [CAT FACE] U+E04F -> U+E6A2
+  ["ee8194", :undef], # [SPOUTING WHALE] U+E054 -> "[クジラ]"
+  ["ee809a", "ee9d94"], # [HORSE FACE] U+E01A -> U+E754
+  ["ee8489", :undef], # [MONKEY FACE] U+E109 -> "[サル]"
+  ["ee8192", "ee9aa1"], # [DOG FACE] U+E052 -> U+E6A1
+  ["ee848b", "ee9d95"], # [PIG FACE] U+E10B -> U+E755
+  ["ee8191", :undef], # [BEAR FACE] U+E051 -> "[クマ]"
+  ["ee94a4", :undef], # [HAMSTER FACE] U+E524 -> "[ハムスター]"
+  ["ee94aa", "ee9aa1"], # [WOLF FACE] U+E52A -> U+E6A1
+  ["ee94ab", :undef], # [COW FACE] U+E52B -> "[牛]"
+  ["ee94ac", :undef], # [RABBIT FACE] U+E52C -> "[ウサギ]"
+  ["ee94b1", :undef], # [FROG FACE] U+E531 -> "[カエル]"
+  ["ee8199", "ee9bb1"], # [ANGRY FACE] U+E059 -> U+E6F1
+  ["ee9090", "ee9bb4"], # [ASTONISHED FACE] U+E410 -> U+E6F4
+  ["ee8198", "ee9bb2"], # [DISAPPOINTED FACE] U+E058 -> U+E6F2
+  ["ee908f", "ee9ca3"], # [EXASPERATED FACE] U+E40F -> U+E723
+  ["ee908e", "ee9ca5"], # [EXPRESSIONLESS FACE] U+E40E -> U+E725
+  ["ee8486", "ee9ca6"], # [FACE WITH HEART-SHAPED EYES] U+E106 -> U+E726
+  ["ee8485", "ee9ca8"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E105 -> U+E728
+  ["ee9089", "ee9ca8"], # [FACE WITH STUCK-OUT TONGUE] U+E409 -> U+E728
+  ["ee9098", "ee9ca6"], # [FACE THROWING A KISS] U+E418 -> U+E726
+  ["ee9097", "ee9ca6"], # [FACE KISSING] U+E417 -> U+E726
+  ["ee908c", :undef], # [FACE WITH MASK] U+E40C -> "[風邪ひき]"
+  ["ee908d", "ee9caa"], # [FLUSHED FACE] U+E40D -> U+E72A
+  ["ee8197", "ee9bb0"], # [HAPPY FACE WITH OPEN MOUTH] U+E057 -> U+E6F0
+  ["ee9084", "ee9d93"], # [HAPPY FACE WITH GRIN] U+E404 -> U+E753
+  ["ee9092", "ee9caa"], # [HAPPY AND CRYING FACE] U+E412 -> U+E72A
+  ["ee8196", "ee9bb0"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+E056 -> U+E6F0
+  ["ee9094", "ee9bb0"], # [WHITE SMILING FACE] U+E414 -> U+E6F0
+  ["ee9095", "ee9bb0"], # [HAPPY FACE WITH OPEN MOUTH AND RAISED EYEBROWS] U+E415 -> U+E6F0
+  ["ee9093", "ee9cae"], # [CRYING FACE] U+E413 -> U+E72E
+  ["ee9091", "ee9cad"], # [LOUDLY CRYING FACE] U+E411 -> U+E72D
+  ["ee908b", "ee9d97"], # [FEARFUL FACE] U+E40B -> U+E757
+  ["ee9086", "ee9cab"], # [PERSEVERING FACE] U+E406 -> U+E72B
+  ["ee9096", "ee9ca4"], # [POUTING FACE] U+E416 -> U+E724
+  ["ee908a", "ee9ca1"], # [RELIEVED FACE] U+E40A -> U+E721
+  ["ee9087", "ee9bb3"], # [CONFOUNDED FACE] U+E407 -> U+E6F3
+  ["ee9083", "ee9ca0"], # [PENSIVE FACE] U+E403 -> U+E720
+  ["ee8487", "ee9d97"], # [FACE SCREAMING IN FEAR] U+E107 -> U+E757
+  ["ee9088", "ee9c81"], # [SLEEPY FACE] U+E408 -> U+E701
+  ["ee9082", "ee9cac"], # [SMIRKING FACE] U+E402 -> U+E72C
+  ["ee8488", "ee9ca3"], # [FACE WITH COLD SWEAT] U+E108 -> U+E723
+  ["ee9081", "ee9ca3"], # [DISAPPOINTED BUT RELIEVED FACE] U+E401 -> U+E723
+  ["ee9085", "ee9ca9"], # [WINKING FACE] U+E405 -> U+E729
+  ["ee90a3", "ee9caf"], # [FACE WITH NO GOOD GESTURE] U+E423 -> U+E72F
+  ["ee90a4", "ee9c8b"], # [FACE WITH OK GESTURE] U+E424 -> U+E70B
+  ["ee90a6", :undef], # [PERSON BOWING DEEPLY] U+E426 -> "m(_ _)m"
+  ["ee90a7", :undef], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+E427 -> "＼(^o^)／"
+  ["ee909d", :undef], # [PERSON WITH FOLDED HANDS] U+E41D -> "(&gt;人&lt;)"
+  ["ee80b6", "ee99a3"], # [HOUSE BUILDING] U+E036 -> U+E663
+  ["ee80b8", "ee99a4"], # [OFFICE BUILDING] U+E038 -> U+E664
+  ["ee8593", "ee99a5"], # [JAPANESE POST OFFICE] U+E153 -> U+E665
+  ["ee8595", "ee99a6"], # [HOSPITAL] U+E155 -> U+E666
+  ["ee858d", "ee99a7"], # [BANK] U+E14D -> U+E667
+  ["ee8594", "ee99a8"], # [AUTOMATED TELLER MACHINE] U+E154 -> U+E668
+  ["ee8598", "ee99a9"], # [HOTEL] U+E158 -> U+E669
+  ["ee9481", "ee99a9ee9baf"], # [LOVE HOTEL] U+E501 -> U+E669 U+E6EF
+  ["ee8596", "ee99aa"], # [CONVENIENCE STORE] U+E156 -> U+E66A
+  ["ee8597", "ee9cbe"], # [SCHOOL] U+E157 -> U+E73E
+  ["ee80b7", :undef], # [CHURCH] U+E037 -> "[教会]"
+  ["ee84a1", :undef], # [FOUNTAIN] U+E121 -> "[噴水]"
+  ["ee9484", :undef], # [DEPARTMENT STORE] U+E504 -> "[デパート]"
+  ["ee9485", :undef], # [JAPANESE CASTLE] U+E505 -> "[城]"
+  ["ee9486", :undef], # [EUROPEAN CASTLE] U+E506 -> "[城]"
+  ["ee9488", :undef], # [FACTORY] U+E508 -> "[工場]"
+  ["ee80bb", "ee9d80"], # [MOUNT FUJI] U+E03B -> U+E740
+  ["ee9489", :undef], # [TOKYO TOWER] U+E509 -> "[東京タワー]"
+  ["ee949d", :undef], # [STATUE OF LIBERTY] U+E51D -> "[自由の女神]"
+  ["ee8087", "ee9a99"], # [ATHLETIC SHOE] U+E007 -> U+E699
+  ["ee84be", "ee99b4"], # [HIGH-HEELED SHOE] U+E13E -> U+E674
+  ["ee8c9a", "ee99b4"], # [WOMANS SANDAL] U+E31A -> U+E674
+  ["ee8c9b", :undef], # [WOMANS BOOTS] U+E31B -> "[ブーツ]"
+  ["ee94b6", "ee9a98"], # [FOOTPRINTS] U+E536 -> U+E698
+  ["ee8086", "ee9c8e"], # [T-SHIRT] U+E006 -> U+E70E
+  ["ee848e", "ee9c9a"], # [CROWN] U+E10E -> U+E71A
+  ["ee8c82", :undef], # [NECKTIE] U+E302 -> "[ネクタイ]"
+  ["ee8c98", :undef], # [WOMANS HAT] U+E318 -> "[帽子]"
+  ["ee8c99", :undef], # [DRESS] U+E319 -> "[ドレス]"
+  ["ee8ca1", :undef], # [KIMONO] U+E321 -> "[着物]"
+  ["ee8ca2", :undef], # [BIKINI] U+E322 -> "[ビキニ]"
+  ["ee8ca3", "ee9a82"], # [HANDBAG] U+E323 -> U+E682
+  ["ee84af", "ee9c95"], # [MONEY BAG] U+E12F -> U+E715
+  ["ee8589", :undef], # [CURRENCY EXCHANGE] U+E149 -> "[$￥]"
+  ["ee858a", :undef], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E14A -> "[株価]"
+  ["ee9493", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+E513 -> "[中国]"
+  ["ee948e", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+E50E -> "[ドイツ]"
+  ["ee9491", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E511 -> "[スペイン]"
+  ["ee948d", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+E50D -> "[フランス]"
+  ["ee9490", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+E510 -> "[イギリス]"
+  ["ee948f", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+E50F -> "[イタリア]"
+  ["ee948b", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E50B -> "[日の丸]"
+  ["ee9494", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+E514 -> "[韓国]"
+  ["ee9492", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E512 -> "[ロシア]"
+  ["ee948c", :undef], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E50C -> "[USA]"
+  ["ee849d", :undef], # [FIRE] U+E11D -> "[炎]"
+  ["ee8496", :undef], # [HAMMER] U+E116 -> "[ハンマー]"
+  ["ee8493", :undef], # [PISTOL] U+E113 -> "[ピストル]"
+  ["ee88be", :undef], # [SIX POINTED STAR WITH MIDDLE DOT] U+E23E -> "[占い]"
+  ["ee8889", :undef], # [JAPANESE SYMBOL FOR BEGINNER] U+E209 -> "[若葉マーク]"
+  ["ee80b1", "ee9c9a"], # [TRIDENT EMBLEM] U+E031 -> U+E71A
+  ["ee84bb", :undef], # [SYRINGE] U+E13B -> "[注射]"
+  ["ee8c8f", :undef], # [PILL] U+E30F -> "[薬]"
+  ["ee94b2", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+E532 -> "[A]"
+  ["ee94b3", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+E533 -> "[B]"
+  ["ee94b4", :undef], # [NEGATIVE SQUARED AB] U+E534 -> "[AB]"
+  ["ee94b5", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+E535 -> "[O]"
+  ["ee8c94", "ee9a84"], # [RIBBON] U+E314 -> U+E684
+  ["ee8492", "ee9a85"], # [WRAPPED PRESENT] U+E112 -> U+E685
+  ["ee8d8b", "ee9a86"], # [BIRTHDAY CAKE] U+E34B -> U+E686
+  ["ee80b3", "ee9aa4"], # [CHRISTMAS TREE] U+E033 -> U+E6A4
+  ["ee9188", :undef], # [FATHER CHRISTMAS] U+E448 -> "[サンタ]"
+  ["ee8583", :undef], # [CROSSED FLAGS] U+E143 -> "[祝日]"
+  ["ee8497", :undef], # [FIREWORKS] U+E117 -> "[花火]"
+  ["ee8c90", :undef], # [BALLOON] U+E310 -> "[風船]"
+  ["ee8c92", :undef], # [PARTY POPPER] U+E312 -> "[クラッカー]"
+  ["ee90b6", :undef], # [PINE DECORATION] U+E436 -> "[門松]"
+  ["ee90b8", :undef], # [JAPANESE DOLLS] U+E438 -> "[ひな祭り]"
+  ["ee90b9", :undef], # [GRADUATION CAP] U+E439 -> "[卒業式]"
+  ["ee90ba", :undef], # [SCHOOL SATCHEL] U+E43A -> "[ランドセル]"
+  ["ee90bb", :undef], # [CARP STREAMER] U+E43B -> "[こいのぼり]"
+  ["ee9180", :undef], # [FIREWORK SPARKLER] U+E440 -> "[線香花火]"
+  ["ee9182", :undef], # [WIND CHIME] U+E442 -> "[風鈴]"
+  ["ee9185", :undef], # [JACK-O-LANTERN] U+E445 -> "[ハロウィン]"
+  ["ee9186", :undef], # [MOON VIEWING CEREMONY] U+E446 -> "[お月見]"
+  ["ee8089", "ee9a87"], # [BLACK TELEPHONE] U+E009 -> U+E687
+  ["ee808a", "ee9a88"], # [MOBILE PHONE] U+E00A -> U+E688
+  ["ee8484", "ee9b8e"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+E104 -> U+E6CE
+  ["ee8c81", "ee9a89"], # [MEMO] U+E301 -> U+E689
+  ["ee808b", "ee9b90"], # [FAX MACHINE] U+E00B -> U+E6D0
+  ["ee8483", "ee9b8f"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+E103 -> U+E6CF
+  ["ee8481", "ee99a5"], # [CLOSED MAILBOX WITH RAISED FLAG] U+E101 -> U+E665
+  ["ee8482", "ee99a5"], # [POSTBOX] U+E102 -> U+E665
+  ["ee8582", :undef], # [PUBLIC ADDRESS LOUDSPEAKER] U+E142 -> "[スピーカ]"
+  ["ee8c97", :undef], # [CHEERING MEGAPHONE] U+E317 -> "[メガホン]"
+  ["ee858b", :undef], # [SATELLITE ANTENNA] U+E14B -> "[アンテナ]"
+  ["ee849f", "ee9ab2"], # [SEAT] U+E11F -> U+E6B2
+  ["ee808c", "ee9c96"], # [PERSONAL COMPUTER] U+E00C -> U+E716
+  ["ee849e", "ee9a82"], # [BRIEFCASE] U+E11E -> U+E682
+  ["ee8c96", :undef], # [MINIDISC] U+E316 -> "[MD]"
+  ["ee84a6", "ee9a8c"], # [OPTICAL DISC] U+E126 -> U+E68C
+  ["ee84a7", "ee9a8c"], # [DVD] U+E127 -> U+E68C
+  ["ee8c93", "ee99b5"], # [BLACK SCISSORS] U+E313 -> U+E675
+  ["ee8588", "ee9a83"], # [OPEN BOOK] U+E148 -> U+E683
+  ["ee8096", "ee9993"], # [BASEBALL] U+E016 -> U+E653
+  ["ee8094", "ee9994"], # [FLAG IN HOLE] U+E014 -> U+E654
+  ["ee8095", "ee9995"], # [TENNIS RACQUET AND BALL] U+E015 -> U+E655
+  ["ee8098", "ee9996"], # [SOCCER BALL] U+E018 -> U+E656
+  ["ee8093", "ee9997"], # [SKI AND SKI BOOT] U+E013 -> U+E657
+  ["ee90aa", "ee9998"], # [BASKETBALL AND HOOP] U+E42A -> U+E658
+  ["ee84b2", "ee9999"], # [CHEQUERED FLAG] U+E132 -> U+E659
+  ["ee8495", "ee9cb3"], # [RUNNER] U+E115 -> U+E733
+  ["ee8097", "ee9c92"], # [SURFER] U+E017 -> U+E712
+  ["ee84b1", :undef], # [TROPHY] U+E131 -> "[トロフィー]"
+  ["ee90ab", :undef], # [AMERICAN FOOTBALL] U+E42B -> "[フットボール]"
+  ["ee90ad", :undef], # [SWIMMER] U+E42D -> "[水泳]"
+  ["ee809e", "ee999b"], # [TRAIN] U+E01E -> U+E65B
+  ["ee90b4", "ee999c"], # [METRO] U+E434 -> U+E65C
+  ["ee90b5", "ee999d"], # [HIGH-SPEED TRAIN] U+E435 -> U+E65D
+  ["ee809f", "ee999d"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E01F -> U+E65D
+  ["ee809b", "ee999e"], # [AUTOMOBILE] U+E01B -> U+E65E
+  ["ee90ae", "ee999f"], # [RECREATIONAL VEHICLE] U+E42E -> U+E65F
+  ["ee8599", "ee99a0"], # [ONCOMING BUS] U+E159 -> U+E660
+  ["ee8590", :undef], # [BUS STOP] U+E150 -> "[バス停]"
+  ["ee8882", "ee99a1"], # [SHIP] U+E202 -> U+E661
+  ["ee809d", "ee99a2"], # [AIRPLANE] U+E01D -> U+E662
+  ["ee809c", "ee9aa3"], # [SAILBOAT] U+E01C -> U+E6A3
+  ["ee80b9", :undef], # [STATION] U+E039 -> "[駅]"
+  ["ee848d", :undef], # [ROCKET] U+E10D -> "[ロケット]"
+  ["ee84b5", "ee9aa3"], # [SPEEDBOAT] U+E135 -> U+E6A3
+  ["ee859a", "ee999e"], # [TAXI] U+E15A -> U+E65E
+  ["ee90af", :undef], # [DELIVERY TRUCK] U+E42F -> "[トラック]"
+  ["ee90b0", :undef], # [FIRE ENGINE] U+E430 -> "[消防車]"
+  ["ee90b1", :undef], # [AMBULANCE] U+E431 -> "[救急車]"
+  ["ee90b2", :undef], # [POLICE CAR] U+E432 -> "[パトカー]"
+  ["ee80ba", "ee99ab"], # [FUEL PUMP] U+E03A -> U+E66B
+  ["ee858f", "ee99ac"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E14F -> U+E66C
+  ["ee858e", "ee99ad"], # [HORIZONTAL TRAFFIC LIGHT] U+E14E -> U+E66D
+  ["ee84b7", :undef], # [CONSTRUCTION SIGN] U+E137 -> "[工事中]"
+  ["ee84a3", "ee9bb7"], # [HOT SPRINGS] U+E123 -> U+E6F7
+  ["ee84a2", :undef], # [TENT] U+E122 -> "[キャンプ]"
+  ["ee84a4", :undef], # [FERRIS WHEEL] U+E124 -> "[観覧車]"
+  ["ee90b3", :undef], # [ROLLER COASTER] U+E433 -> "[ジェットコースター]"
+  ["ee80bc", "ee99b6"], # [MICROPHONE] U+E03C -> U+E676
+  ["ee80bd", "ee99b7"], # [MOVIE CAMERA] U+E03D -> U+E677
+  ["ee9487", "ee99b7"], # [CINEMA] U+E507 -> U+E677
+  ["ee8c8a", "ee99ba"], # [HEADPHONE] U+E30A -> U+E67A
+  ["ee9482", "ee99bb"], # [ARTIST PALETTE] U+E502 -> U+E67B
+  ["ee9483", "ee99bc"], # [TOP HAT] U+E503 -> U+E67C
+  ["ee84a5", "ee99be"], # [TICKET] U+E125 -> U+E67E
+  ["ee8ca4", "ee9aac"], # [CLAPPER BOARD] U+E324 -> U+E6AC
+  ["ee84ad", :undef], # [MAHJONG TILE RED DRAGON] U+E12D -> "[麻雀]"
+  ["ee84b0", :undef], # [DIRECT HIT] U+E130 -> "[的中]"
+  ["ee84b3", :undef], # [SLOT MACHINE] U+E133 -> "[777]"
+  ["ee90ac", :undef], # [BILLIARDS] U+E42C -> "[ビリヤード]"
+  ["ee80be", "ee9bb6"], # [MUSICAL NOTE] U+E03E -> U+E6F6
+  ["ee8ca6", "ee9bbf"], # [MULTIPLE MUSICAL NOTES] U+E326 -> U+E6FF
+  ["ee8180", :undef], # [SAXOPHONE] U+E040 -> "[サックス]"
+  ["ee8181", :undef], # [GUITAR] U+E041 -> "[ギター]"
+  ["ee8182", :undef], # [TRUMPET] U+E042 -> "[トランペット]"
+  ["ee84ac", :undef], # [PART ALTERNATION MARK] U+E12C -> "[歌記号]"
+  ["ee8088", "ee9a81"], # [CAMERA] U+E008 -> U+E681
+  ["ee84aa", "ee9a8a"], # [TELEVISION] U+E12A -> U+E68A
+  ["ee84a8", :undef], # [RADIO] U+E128 -> "[ラジオ]"
+  ["ee84a9", :undef], # [VIDEOCASSETTE] U+E129 -> "[ビデオ]"
+  ["ee8083", "ee9bb9"], # [KISS MARK] U+E003 -> U+E6F9
+  ["ee80b4", "ee9c9b"], # [RING] U+E034 -> U+E71B
+  ["ee80b5", "ee9c9b"], # [GEM STONE] U+E035 -> U+E71B
+  ["ee8491", "ee9bb9"], # [KISS] U+E111 -> U+E6F9
+  ["ee8c86", :undef], # [BOUQUET] U+E306 -> "[花束]"
+  ["ee90a5", "ee9bad"], # [COUPLE WITH HEART] U+E425 -> U+E6ED
+  ["ee90bd", :undef], # [WEDDING] U+E43D -> "[結婚式]"
+  ["ee8887", :undef], # [NO ONE UNDER EIGHTEEN SYMBOL] U+E207 -> "[18禁]"
+  ["ee898e", "ee9cb1"], # [COPYRIGHT SIGN] U+E24E -> U+E731
+  ["ee898f", "ee9cb6"], # [REGISTERED SIGN] U+E24F -> U+E736
+  ["ee94b7", "ee9cb2"], # [TRADE MARK SIGN] U+E537 -> U+E732
+  ["ee8890", "ee9ba0"], # [HASH KEY] U+E210 -> U+E6E0
+  ["ee889c", "ee9ba2"], # [KEYCAP 1] U+E21C -> U+E6E2
+  ["ee889d", "ee9ba3"], # [KEYCAP 2] U+E21D -> U+E6E3
+  ["ee889e", "ee9ba4"], # [KEYCAP 3] U+E21E -> U+E6E4
+  ["ee889f", "ee9ba5"], # [KEYCAP 4] U+E21F -> U+E6E5
+  ["ee88a0", "ee9ba6"], # [KEYCAP 5] U+E220 -> U+E6E6
+  ["ee88a1", "ee9ba7"], # [KEYCAP 6] U+E221 -> U+E6E7
+  ["ee88a2", "ee9ba8"], # [KEYCAP 7] U+E222 -> U+E6E8
+  ["ee88a3", "ee9ba9"], # [KEYCAP 8] U+E223 -> U+E6E9
+  ["ee88a4", "ee9baa"], # [KEYCAP 9] U+E224 -> U+E6EA
+  ["ee88a5", "ee9bab"], # [KEYCAP 0] U+E225 -> U+E6EB
+  ["ee888b", :undef], # [ANTENNA WITH BARS] U+E20B -> "[バリ3]"
+  ["ee8990", :undef], # [VIBRATION MODE] U+E250 -> "[マナーモード]"
+  ["ee8991", :undef], # [MOBILE PHONE OFF] U+E251 -> "[ケータイOFF]"
+  ["ee84a0", "ee99b3"], # [HAMBURGER] U+E120 -> U+E673
+  ["ee8d82", "ee9d89"], # [RICE BALL] U+E342 -> U+E749
+  ["ee8186", "ee9d8a"], # [SHORTCAKE] U+E046 -> U+E74A
+  ["ee8d80", "ee9d8c"], # [STEAMING BOWL] U+E340 -> U+E74C
+  ["ee8cb9", "ee9d8d"], # [BREAD] U+E339 -> U+E74D
+  ["ee8587", :undef], # [COOKING] U+E147 -> "[フライパン]"
+  ["ee8cba", :undef], # [SOFT ICE CREAM] U+E33A -> "[ソフトクリーム]"
+  ["ee8cbb", :undef], # [FRENCH FRIES] U+E33B -> "[ポテト]"
+  ["ee8cbc", :undef], # [DANGO] U+E33C -> "[だんご]"
+  ["ee8cbd", :undef], # [RICE CRACKER] U+E33D -> "[せんべい]"
+  ["ee8cbe", "ee9d8c"], # [COOKED RICE] U+E33E -> U+E74C
+  ["ee8cbf", :undef], # [SPAGHETTI] U+E33F -> "[パスタ]"
+  ["ee8d81", :undef], # [CURRY AND RICE] U+E341 -> "[カレー]"
+  ["ee8d83", :undef], # [ODEN] U+E343 -> "[おでん]"
+  ["ee8d84", :undef], # [SUSHI] U+E344 -> "[すし]"
+  ["ee8d8c", :undef], # [BENTO BOX] U+E34C -> "[弁当]"
+  ["ee8d8d", :undef], # [POT OF FOOD] U+E34D -> "[鍋]"
+  ["ee90bf", :undef], # [SHAVED ICE] U+E43F -> "[カキ氷]"
+  ["ee8183", "ee99af"], # [FORK AND KNIFE] U+E043 -> U+E66F
+  ["ee8185", "ee99b0"], # [HOT BEVERAGE] U+E045 -> U+E670
+  ["ee8184", "ee99b1"], # [COCKTAIL GLASS] U+E044 -> U+E671
+  ["ee8187", "ee99b2"], # [BEER MUG] U+E047 -> U+E672
+  ["ee8cb8", "ee9c9e"], # [TEACUP WITHOUT HANDLE] U+E338 -> U+E71E
+  ["ee8c8b", "ee9d8b"], # [SAKE BOTTLE AND CUP] U+E30B -> U+E74B
+  ["ee8c8c", "ee99b2"], # [CLINKING BEER MUGS] U+E30C -> U+E672
+  ["ee88b6", "ee99b8"], # [NORTH EAST ARROW] U+E236 -> U+E678
+  ["ee88b8", "ee9a96"], # [SOUTH EAST ARROW] U+E238 -> U+E696
+  ["ee88b7", "ee9a97"], # [NORTH WEST ARROW] U+E237 -> U+E697
+  ["ee88b9", "ee9aa5"], # [SOUTH WEST ARROW] U+E239 -> U+E6A5
+  ["ee88b2", :undef], # [UPWARDS BLACK ARROW] U+E232 -> "[↑]"
+  ["ee88b3", :undef], # [DOWNWARDS BLACK ARROW] U+E233 -> "[↓]"
+  ["ee88b4", :undef], # [BLACK RIGHTWARDS ARROW] U+E234 -> "[→]"
+  ["ee88b5", :undef], # [LEFTWARDS BLACK ARROW] U+E235 -> "[←]"
+  ["ee88ba", :undef], # [BLACK RIGHT-POINTING TRIANGLE] U+E23A -> "[&gt;]"
+  ["ee88bb", :undef], # [BLACK LEFT-POINTING TRIANGLE] U+E23B -> "[&lt;]"
+  ["ee88bc", :undef], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E23C -> "[&gt;&gt;]"
+  ["ee88bd", :undef], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E23D -> "[&lt;&lt;]"
+  ["ee8cb2", "ee9aa0"], # [HEAVY LARGE CIRCLE] U+E332 -> U+E6A0
+  ["ee8cb3", :undef], # [CROSS MARK] U+E333 -> "[×]"
+  ["ee80a1", "ee9c82"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E021 -> U+E702
+  ["ee80a0", :undef], # [BLACK QUESTION MARK ORNAMENT] U+E020 -> "[？]"
+  ["ee8cb6", :undef], # [WHITE QUESTION MARK ORNAMENT] U+E336 -> "[？]"
+  ["ee8cb7", "ee9c82"], # [WHITE EXCLAMATION MARK ORNAMENT] U+E337 -> U+E702
+  ["ee8891", "ee9b9f"], # [DOUBLE CURLY LOOP] U+E211 -> U+E6DF
+  ["ee80a2", "ee9bac"], # [HEAVY BLACK HEART] U+E022 -> U+E6EC
+  ["ee8ca7", "ee9bad"], # [BEATING HEART] U+E327 -> U+E6ED
+  ["ee80a3", "ee9bae"], # [BROKEN HEART] U+E023 -> U+E6EE
+  ["ee8ca8", "ee9bad"], # [GROWING HEART] U+E328 -> U+E6ED
+  ["ee8ca9", "ee9bac"], # [HEART WITH ARROW] U+E329 -> U+E6EC
+  ["ee8caa", "ee9bac"], # [BLUE HEART] U+E32A -> U+E6EC
+  ["ee8cab", "ee9bac"], # [GREEN HEART] U+E32B -> U+E6EC
+  ["ee8cac", "ee9bac"], # [YELLOW HEART] U+E32C -> U+E6EC
+  ["ee8cad", "ee9bac"], # [PURPLE HEART] U+E32D -> U+E6EC
+  ["ee90b7", "ee9bac"], # [HEART WITH RIBBON] U+E437 -> U+E6EC
+  ["ee8884", "ee9bb8"], # [HEART DECORATION] U+E204 -> U+E6F8
+  ["ee888c", "ee9a8d"], # [BLACK HEART SUIT] U+E20C -> U+E68D
+  ["ee888e", "ee9a8e"], # [BLACK SPADE SUIT] U+E20E -> U+E68E
+  ["ee888d", "ee9a8f"], # [BLACK DIAMOND SUIT] U+E20D -> U+E68F
+  ["ee888f", "ee9a90"], # [BLACK CLUB SUIT] U+E20F -> U+E690
+  ["ee8c8e", "ee99bf"], # [SMOKING SYMBOL] U+E30E -> U+E67F
+  ["ee8888", "ee9a80"], # [NO SMOKING SYMBOL] U+E208 -> U+E680
+  ["ee888a", "ee9a9b"], # [WHEELCHAIR SYMBOL] U+E20A -> U+E69B
+  ["ee8992", "ee9cb7"], # [WARNING SIGN] U+E252 -> U+E737
+  ["ee84b6", "ee9c9d"], # [BICYCLE] U+E136 -> U+E71D
+  ["ee8881", "ee9cb3"], # [PEDESTRIAN] U+E201 -> U+E733
+  ["ee84b8", :undef], # [MENS SYMBOL] U+E138 -> "[♂]"
+  ["ee84b9", :undef], # [WOMENS SYMBOL] U+E139 -> "[♀]"
+  ["ee84bf", "ee9bb7"], # [BATH] U+E13F -> U+E6F7
+  ["ee8591", "ee99ae"], # [RESTROOM] U+E151 -> U+E66E
+  ["ee8580", "ee99ae"], # [TOILET] U+E140 -> U+E66E
+  ["ee8c89", "ee99ae"], # [WATER CLOSET] U+E309 -> U+E66E
+  ["ee84ba", :undef], # [BABY SYMBOL] U+E13A -> "[赤ちゃん]"
+  ["ee8894", :undef], # [SQUARED COOL] U+E214 -> "[COOL]"
+  ["ee88a9", "ee9b98"], # [SQUARED ID] U+E229 -> U+E6D8
+  ["ee8892", "ee9b9d"], # [SQUARED NEW] U+E212 -> U+E6DD
+  ["ee898d", "ee9c8b"], # [SQUARED OK] U+E24D -> U+E70B
+  ["ee8893", :undef], # [SQUARED UP WITH EXCLAMATION MARK] U+E213 -> "[UP!]"
+  ["ee84ae", :undef], # [SQUARED VS] U+E12E -> "[VS]"
+  ["ee8883", :undef], # [SQUARED KATAKANA KOKO] U+E203 -> "[ココ]"
+  ["ee88a8", :undef], # [SQUARED KATAKANA SA] U+E228 -> "[サービス]"
+  ["ee88ab", "ee9cb9"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+E22B -> U+E739
+  ["ee88aa", "ee9cbb"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+E22A -> U+E73B
+  ["ee8895", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6709] U+E215 -> "[有]"
+  ["ee8896", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7121] U+E216 -> "[無]"
+  ["ee8897", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6708] U+E217 -> "[月]"
+  ["ee8898", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7533] U+E218 -> "[申]"
+  ["ee88a7", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+E227 -> "[割]"
+  ["ee88ac", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+E22C -> "[指]"
+  ["ee88ad", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+E22D -> "[営]"
+  ["ee8c95", "ee9cb4"], # [CIRCLED IDEOGRAPH SECRET] U+E315 -> U+E734
+  ["ee8c8d", :undef], # [CIRCLED IDEOGRAPH CONGRATULATION] U+E30D -> "[祝]"
+  ["ee88a6", :undef], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E226 -> "[得]"
+  ["ee848f", "ee9bbb"], # [ELECTRIC LIGHT BULB] U+E10F -> U+E6FB
+  ["ee8cb4", "ee9bbc"], # [ANGER SYMBOL] U+E334 -> U+E6FC
+  ["ee8c91", "ee9bbe"], # [BOMB] U+E311 -> U+E6FE
+  ["ee84bc", "ee9c81"], # [SLEEPING SYMBOL] U+E13C -> U+E701
+  ["ee8cb1", "ee9c86"], # [SPLASHING SWEAT SYMBOL] U+E331 -> U+E706
+  ["ee8cb0", "ee9c88"], # [DASH SYMBOL] U+E330 -> U+E708
+  ["ee819a", :undef], # [PILE OF POO] U+E05A -> "[ウンチ]"
+  ["ee858c", :undef], # [FLEXED BICEPS] U+E14C -> "[力こぶ]"
+  ["ee8cae", "ee9bba"], # [SPARKLES] U+E32E -> U+E6FA
+  ["ee8885", "ee9bb8"], # [EIGHT POINTED BLACK STAR] U+E205 -> U+E6F8
+  ["ee8886", "ee9bb8"], # [EIGHT SPOKED ASTERISK] U+E206 -> U+E6F8
+  ["ee8899", "ee9a9c"], # [LARGE RED CIRCLE] U+E219 -> U+E69C
+  ["ee889a", "ee9a9c"], # [BLACK SQUARE BUTTON] U+E21A -> U+E69C
+  ["ee889b", "ee9a9c"], # [WHITE SQUARE BUTTON] U+E21B -> U+E69C
+  ["ee8caf", :undef], # [WHITE MEDIUM STAR] U+E32F -> "[☆]"
+  ["ee8581", :undef], # [SPEAKER WITH THREE SOUND WAVES] U+E141 -> "[スピーカ]"
+  ["ee8494", "ee9b9c"], # [LEFT-POINTING MAGNIFYING GLASS] U+E114 -> U+E6DC
+  ["ee8584", "ee9b99"], # [LOCK] U+E144 -> U+E6D9
+  ["ee8585", "ee9b99"], # [OPEN LOCK] U+E145 -> U+E6D9
+  ["ee80bf", "ee9b99"], # [KEY] U+E03F -> U+E6D9
+  ["ee8ca5", "ee9c93"], # [BELL] U+E325 -> U+E713
+  ["ee898c", :undef], # [TOP WITH UPWARDS ARROW ABOVE] U+E24C -> "[TOP]"
+  ["ee8090", "ee9a93"], # [RAISED FIST] U+E010 -> U+E693
+  ["ee8092", "ee9a95"], # [RAISED HAND] U+E012 -> U+E695
+  ["ee8091", "ee9a94"], # [VICTORY HAND] U+E011 -> U+E694
+  ["ee808d", "ee9bbd"], # [FISTED HAND SIGN] U+E00D -> U+E6FD
+  ["ee808e", "ee9ca7"], # [THUMBS UP SIGN] U+E00E -> U+E727
+  ["ee808f", :undef], # [WHITE UP POINTING INDEX] U+E00F -> "[人差し指]"
+  ["ee88ae", :undef], # [WHITE UP POINTING BACKHAND INDEX] U+E22E -> "[↑]"
+  ["ee88af", :undef], # [WHITE DOWN POINTING BACKHAND INDEX] U+E22F -> "[↓]"
+  ["ee88b0", :undef], # [WHITE LEFT POINTING BACKHAND INDEX] U+E230 -> "[←]"
+  ["ee88b1", :undef], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E231 -> "[→]"
+  ["ee909e", "ee9a95"], # [WAVING HAND SIGN] U+E41E -> U+E695
+  ["ee909f", :undef], # [CLAPPING HANDS SIGN] U+E41F -> "[拍手]"
+  ["ee90a0", "ee9c8b"], # [OK HAND SIGN] U+E420 -> U+E70B
+  ["ee90a1", "ee9c80"], # [THUMBS DOWN SIGN] U+E421 -> U+E700
+  ["ee90a2", "ee9a95"], # [OPEN HANDS SIGN] U+E422 -> U+E695
+  ["ee94b8", :undef], # [EMOJI COMPATIBILITY SYMBOL-50] U+E538 -> U+3013 (GETA)
+  ["ee94b9", :undef], # [EMOJI COMPATIBILITY SYMBOL-51] U+E539 -> U+3013 (GETA)
+  ["ee94ba", :undef], # [EMOJI COMPATIBILITY SYMBOL-52] U+E53A -> U+3013 (GETA)
+  ["ee94bb", :undef], # [EMOJI COMPATIBILITY SYMBOL-53] U+E53B -> U+3013 (GETA)
+  ["ee94bc", :undef], # [EMOJI COMPATIBILITY SYMBOL-54] U+E53C -> "[v"
+  ["ee94bd", :undef], # [EMOJI COMPATIBILITY SYMBOL-55] U+E53D -> "oda"
+  ["ee94be", :undef], # [EMOJI COMPATIBILITY SYMBOL-56] U+E53E -> "fone]"
+  ["ee8994", :undef], # [EMOJI COMPATIBILITY SYMBOL-57] U+E254 -> U+3013 (GETA)
+  ["ee8995", :undef], # [EMOJI COMPATIBILITY SYMBOL-58] U+E255 -> U+3013 (GETA)
+  ["ee8996", :undef], # [EMOJI COMPATIBILITY SYMBOL-59] U+E256 -> U+3013 (GETA)
+  ["ee8997", :undef], # [EMOJI COMPATIBILITY SYMBOL-60] U+E257 -> U+3013 (GETA)
+  ["ee8998", :undef], # [EMOJI COMPATIBILITY SYMBOL-61] U+E258 -> U+3013 (GETA)
+  ["ee8999", :undef], # [EMOJI COMPATIBILITY SYMBOL-62] U+E259 -> U+3013 (GETA)
+  ["ee899a", :undef], # [EMOJI COMPATIBILITY SYMBOL-63] U+E25A -> U+3013 (GETA)
+  ["ee948a", :undef], # [EMOJI COMPATIBILITY SYMBOL-64] U+E50A -> U+3013 (GETA)
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-SoftBank']['UTF8-KDDI'] = [
+  ["ee818a", "ee9288"], # [BLACK SUN WITH RAYS] U+E04A -> U+E488
+  ["ee8189", "ee928d"], # [CLOUD] U+E049 -> U+E48D
+  ["ee818b", "ee928c"], # [UMBRELLA WITH RAIN DROPS] U+E04B -> U+E48C
+  ["ee8188", "ee9285"], # [SNOWMAN WITHOUT SNOW] U+E048 -> U+E485
+  ["ee84bd", "ee9287"], # [HIGH VOLTAGE SIGN] U+E13D -> U+E487
+  ["ee9183", "ee91a9"], # [CYCLONE] U+E443 -> U+E469
+  ["ee90bc", "eeaba8"], # [CLOSED UMBRELLA] U+E43C -> U+EAE8
+  ["ee918b", "eeabb1"], # [NIGHT WITH STARS] U+E44B -> U+EAF1
+  ["ee818d", "eeabb4"], # [SUNRISE OVER MOUNTAINS] U+E04D -> U+EAF4
+  ["ee9189", "eeabb4"], # [SUNRISE] U+E449 -> U+EAF4
+  ["ee8586", "ee979a"], # [CITYSCAPE AT DUSK] U+E146 -> U+E5DA
+  ["ee918a", "ee979a"], # [SUNSET OVER BUILDINGS] U+E44A -> U+E5DA
+  ["ee918c", "eeabb2"], # [RAINBOW] U+E44C -> U+EAF2
+  ["ee90be", "eeadbc"], # [WATER WAVE] U+E43E -> U+EB7C
+  ["ee818c", "ee9286"], # [CRESCENT MOON] U+E04C -> U+E486
+  ["ee8cb5", "ee928b"], # [GLOWING STAR] U+E335 -> U+E48B
+  ["ee80a4", "ee9694"], # [CLOCK FACE ONE OCLOCK] U+E024 -> U+E594
+  ["ee80a5", "ee9694"], # [CLOCK FACE TWO OCLOCK] U+E025 -> U+E594
+  ["ee80a6", "ee9694"], # [CLOCK FACE THREE OCLOCK] U+E026 -> U+E594
+  ["ee80a7", "ee9694"], # [CLOCK FACE FOUR OCLOCK] U+E027 -> U+E594
+  ["ee80a8", "ee9694"], # [CLOCK FACE FIVE OCLOCK] U+E028 -> U+E594
+  ["ee80a9", "ee9694"], # [CLOCK FACE SIX OCLOCK] U+E029 -> U+E594
+  ["ee80aa", "ee9694"], # [CLOCK FACE SEVEN OCLOCK] U+E02A -> U+E594
+  ["ee80ab", "ee9694"], # [CLOCK FACE EIGHT OCLOCK] U+E02B -> U+E594
+  ["ee80ac", "ee9694"], # [CLOCK FACE NINE OCLOCK] U+E02C -> U+E594
+  ["ee80ad", "ee9694"], # [CLOCK FACE TEN OCLOCK] U+E02D -> U+E594
+  ["ee80ae", "ee9694"], # [CLOCK FACE ELEVEN OCLOCK] U+E02E -> U+E594
+  ["ee80af", "ee9694"], # [CLOCK FACE TWELVE OCLOCK] U+E02F -> U+E594
+  ["ee88bf", "ee928f"], # [ARIES] U+E23F -> U+E48F
+  ["ee8980", "ee9290"], # [TAURUS] U+E240 -> U+E490
+  ["ee8981", "ee9291"], # [GEMINI] U+E241 -> U+E491
+  ["ee8982", "ee9292"], # [CANCER] U+E242 -> U+E492
+  ["ee8983", "ee9293"], # [LEO] U+E243 -> U+E493
+  ["ee8984", "ee9294"], # [VIRGO] U+E244 -> U+E494
+  ["ee8985", "ee9295"], # [LIBRA] U+E245 -> U+E495
+  ["ee8986", "ee9296"], # [SCORPIUS] U+E246 -> U+E496
+  ["ee8987", "ee9297"], # [SAGITTARIUS] U+E247 -> U+E497
+  ["ee8988", "ee9298"], # [CAPRICORN] U+E248 -> U+E498
+  ["ee8989", "ee9299"], # [AQUARIUS] U+E249 -> U+E499
+  ["ee898a", "ee929a"], # [PISCES] U+E24A -> U+E49A
+  ["ee898b", "ee929b"], # [OPHIUCHUS] U+E24B -> U+E49B
+  ["ee8490", "ee9493"], # [FOUR LEAF CLOVER] U+E110 -> U+E513
+  ["ee8c84", "ee93a4"], # [TULIP] U+E304 -> U+E4E4
+  ["ee8498", "ee938e"], # [MAPLE LEAF] U+E118 -> U+E4CE
+  ["ee80b0", "ee938a"], # [CHERRY BLOSSOM] U+E030 -> U+E4CA
+  ["ee80b2", "ee96ba"], # [ROSE] U+E032 -> U+E5BA
+  ["ee8499", "ee978d"], # [FALLEN LEAF] U+E119 -> U+E5CD
+  ["ee9187", "ee978d"], # [LEAF FLUTTERING IN WIND] U+E447 -> U+E5CD
+  ["ee8c83", "eeaa94"], # [HIBISCUS] U+E303 -> U+EA94
+  ["ee8c85", "ee93a3"], # [SUNFLOWER] U+E305 -> U+E4E3
+  ["ee8c87", "ee93a2"], # [PALM TREE] U+E307 -> U+E4E2
+  ["ee8c88", "eeaa96"], # [CACTUS] U+E308 -> U+EA96
+  ["ee9184", :undef], # [EAR OF RICE] U+E444 -> "[稲穂]"
+  ["ee8d85", "eeaab9"], # [RED APPLE] U+E345 -> U+EAB9
+  ["ee8d86", "eeaaba"], # [TANGERINE] U+E346 -> U+EABA
+  ["ee8d87", "ee9394"], # [STRAWBERRY] U+E347 -> U+E4D4
+  ["ee8d88", "ee938d"], # [WATERMELON] U+E348 -> U+E4CD
+  ["ee8d89", "eeaabb"], # [TOMATO] U+E349 -> U+EABB
+  ["ee8d8a", "eeaabc"], # [AUBERGINE] U+E34A -> U+EABC
+  ["ee9099", "ee96a4"], # [EYES] U+E419 -> U+E5A4
+  ["ee909b", "ee96a5"], # [EAR] U+E41B -> U+E5A5
+  ["ee909a", "eeab90"], # [NOSE] U+E41A -> U+EAD0
+  ["ee909c", "eeab91"], # [MOUTH] U+E41C -> U+EAD1
+  ["ee8c9c", "ee9489"], # [LIPSTICK] U+E31C -> U+E509
+  ["ee8c9d", "eeaaa0"], # [NAIL POLISH] U+E31D -> U+EAA0
+  ["ee8c9e", "ee948b"], # [FACE MASSAGE] U+E31E -> U+E50B
+  ["ee8c9f", "eeaaa1"], # [HAIRCUT] U+E31F -> U+EAA1
+  ["ee8ca0", "eeaaa2"], # [BARBER POLE] U+E320 -> U+EAA2
+  ["ee8081", "ee93bc"], # [BOY] U+E001 -> U+E4FC
+  ["ee8082", "ee93ba"], # [GIRL] U+E002 -> U+E4FA
+  ["ee8084", "ee93bc"], # [MAN] U+E004 -> U+E4FC
+  ["ee8085", "ee93ba"], # [WOMAN] U+E005 -> U+E4FA
+  ["ee90a8", :undef], # [MAN AND WOMAN HOLDING HANDS] U+E428 -> "[カップル]"
+  ["ee8592", "ee979d"], # [POLICE OFFICER] U+E152 -> U+E5DD
+  ["ee90a9", "eeab9b"], # [WOMAN WITH BUNNY EARS] U+E429 -> U+EADB
+  ["ee9495", "eeac93"], # [WESTERN PERSON] U+E515 -> U+EB13
+  ["ee9496", "eeac94"], # [MAN WITH GUA PI MAO] U+E516 -> U+EB14
+  ["ee9497", "eeac95"], # [MAN WITH TURBAN] U+E517 -> U+EB15
+  ["ee9498", "eeac96"], # [OLDER MAN] U+E518 -> U+EB16
+  ["ee9499", "eeac97"], # [OLDER WOMAN] U+E519 -> U+EB17
+  ["ee949a", "eeac98"], # [BABY] U+E51A -> U+EB18
+  ["ee949b", "eeac99"], # [CONSTRUCTION WORKER] U+E51B -> U+EB19
+  ["ee949c", "eeac9a"], # [PRINCESS] U+E51C -> U+EB1A
+  ["ee849b", "ee938b"], # [GHOST] U+E11B -> U+E4CB
+  ["ee818e", "ee96bf"], # [BABY ANGEL] U+E04E -> U+E5BF
+  ["ee848c", "ee948e"], # [EXTRATERRESTRIAL ALIEN] U+E10C -> U+E50E
+  ["ee84ab", "ee93ac"], # [ALIEN MONSTER] U+E12B -> U+E4EC
+  ["ee849a", "ee93af"], # [IMP] U+E11A -> U+E4EF
+  ["ee849c", "ee93b8"], # [SKULL] U+E11C -> U+E4F8
+  ["ee8993", :undef], # [INFORMATION DESK PERSON] U+E253 -> "[案内]"
+  ["ee949e", :undef], # [GUARDSMAN] U+E51E -> "[衛兵]"
+  ["ee949f", "eeac9c"], # [DANCER] U+E51F -> U+EB1C
+  ["ee94ad", "eeaca2"], # [SNAKE] U+E52D -> U+EB22
+  ["ee84b4", "ee9398"], # [HORSE] U+E134 -> U+E4D8
+  ["ee94ae", "eeaca3"], # [CHICKEN] U+E52E -> U+EB23
+  ["ee94af", "eeaca4"], # [BOAR] U+E52F -> U+EB24
+  ["ee94b0", "eeaca5"], # [BACTRIAN CAMEL] U+E530 -> U+EB25
+  ["ee94a6", "eeac9f"], # [ELEPHANT] U+E526 -> U+EB1F
+  ["ee94a7", "eeaca0"], # [KOALA] U+E527 -> U+EB20
+  ["ee94a8", "ee9399"], # [MONKEY] U+E528 -> U+E4D9
+  ["ee94a9", "ee928f"], # [SHEEP] U+E529 -> U+E48F
+  ["ee848a", "ee9787"], # [OCTOPUS] U+E10A -> U+E5C7
+  ["ee9181", "eeabac"], # [SPIRAL SHELL] U+E441 -> U+EAEC
+  ["ee94a5", "eeac9e"], # [BUG] U+E525 -> U+EB1E
+  ["ee94a2", "eeac9d"], # [TROPICAL FISH] U+E522 -> U+EB1D
+  ["ee94a3", "ee93a0"], # [BABY CHICK] U+E523 -> U+E4E0
+  ["ee94a1", "ee93a0"], # [BIRD] U+E521 -> U+E4E0
+  ["ee8195", "ee939c"], # [PENGUIN] U+E055 -> U+E4DC
+  ["ee8099", "ee929a"], # [FISH] U+E019 -> U+E49A
+  ["ee94a0", "eeac9b"], # [DOLPHIN] U+E520 -> U+EB1B
+  ["ee8193", "ee9782"], # [MOUSE FACE] U+E053 -> U+E5C2
+  ["ee8190", "ee9780"], # [TIGER FACE] U+E050 -> U+E5C0
+  ["ee818f", "ee939b"], # [CAT FACE] U+E04F -> U+E4DB
+  ["ee8194", "ee91b0"], # [SPOUTING WHALE] U+E054 -> U+E470
+  ["ee809a", "ee9398"], # [HORSE FACE] U+E01A -> U+E4D8
+  ["ee8489", "ee9399"], # [MONKEY FACE] U+E109 -> U+E4D9
+  ["ee8192", "ee93a1"], # [DOG FACE] U+E052 -> U+E4E1
+  ["ee848b", "ee939e"], # [PIG FACE] U+E10B -> U+E4DE
+  ["ee8191", "ee9781"], # [BEAR FACE] U+E051 -> U+E5C1
+  ["ee94a4", :undef], # [HAMSTER FACE] U+E524 -> "[ハムスター]"
+  ["ee94aa", "ee93a1"], # [WOLF FACE] U+E52A -> U+E4E1
+  ["ee94ab", "eeaca1"], # [COW FACE] U+E52B -> U+EB21
+  ["ee94ac", "ee9397"], # [RABBIT FACE] U+E52C -> U+E4D7
+  ["ee94b1", "ee939a"], # [FROG FACE] U+E531 -> U+E4DA
+  ["ee8199", "ee91b2"], # [ANGRY FACE] U+E059 -> U+E472
+  ["ee9090", "eeab8a"], # [ASTONISHED FACE] U+E410 -> U+EACA
+  ["ee8198", "eeab80"], # [DISAPPOINTED FACE] U+E058 -> U+EAC0
+  ["ee908f", "eeab8b"], # [EXASPERATED FACE] U+E40F -> U+EACB
+  ["ee908e", "eeab89"], # [EXPRESSIONLESS FACE] U+E40E -> U+EAC9
+  ["ee8486", "ee9784"], # [FACE WITH HEART-SHAPED EYES] U+E106 -> U+E5C4
+  ["ee8485", "ee93a7"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E105 -> U+E4E7
+  ["ee9089", "ee93a7"], # [FACE WITH STUCK-OUT TONGUE] U+E409 -> U+E4E7
+  ["ee9098", "eeab8f"], # [FACE THROWING A KISS] U+E418 -> U+EACF
+  ["ee9097", "eeab8e"], # [FACE KISSING] U+E417 -> U+EACE
+  ["ee908c", "eeab87"], # [FACE WITH MASK] U+E40C -> U+EAC7
+  ["ee908d", "eeab88"], # [FLUSHED FACE] U+E40D -> U+EAC8
+  ["ee8197", "ee91b1"], # [HAPPY FACE WITH OPEN MOUTH] U+E057 -> U+E471
+  ["ee9084", "eeae80"], # [HAPPY FACE WITH GRIN] U+E404 -> U+EB80
+  ["ee9092", "eeada4"], # [HAPPY AND CRYING FACE] U+E412 -> U+EB64
+  ["ee8196", "eeab8d"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+E056 -> U+EACD
+  ["ee9094", "ee93bb"], # [WHITE SMILING FACE] U+E414 -> U+E4FB
+  ["ee9095", "ee91b1"], # [HAPPY FACE WITH OPEN MOUTH AND RAISED EYEBROWS] U+E415 -> U+E471
+  ["ee9093", "eeada9"], # [CRYING FACE] U+E413 -> U+EB69
+  ["ee9091", "ee91b3"], # [LOUDLY CRYING FACE] U+E411 -> U+E473
+  ["ee908b", "eeab86"], # [FEARFUL FACE] U+E40B -> U+EAC6
+  ["ee9086", "eeab82"], # [PERSEVERING FACE] U+E406 -> U+EAC2
+  ["ee9096", "eead9d"], # [POUTING FACE] U+E416 -> U+EB5D
+  ["ee908a", "eeab85"], # [RELIEVED FACE] U+E40A -> U+EAC5
+  ["ee9087", "eeab83"], # [CONFOUNDED FACE] U+E407 -> U+EAC3
+  ["ee9083", "eeab80"], # [PENSIVE FACE] U+E403 -> U+EAC0
+  ["ee8487", "ee9785"], # [FACE SCREAMING IN FEAR] U+E107 -> U+E5C5
+  ["ee9088", "eeab84"], # [SLEEPY FACE] U+E408 -> U+EAC4
+  ["ee9082", "eeaabf"], # [SMIRKING FACE] U+E402 -> U+EABF
+  ["ee8488", "ee9786"], # [FACE WITH COLD SWEAT] U+E108 -> U+E5C6
+  ["ee9081", "ee9786"], # [DISAPPOINTED BUT RELIEVED FACE] U+E401 -> U+E5C6
+  ["ee9085", "ee9783"], # [WINKING FACE] U+E405 -> U+E5C3
+  ["ee90a3", "eeab97"], # [FACE WITH NO GOOD GESTURE] U+E423 -> U+EAD7
+  ["ee90a4", "eeab98"], # [FACE WITH OK GESTURE] U+E424 -> U+EAD8
+  ["ee90a6", "eeab99"], # [PERSON BOWING DEEPLY] U+E426 -> U+EAD9
+  ["ee90a7", "eeae86"], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+E427 -> U+EB86
+  ["ee909d", "eeab92"], # [PERSON WITH FOLDED HANDS] U+E41D -> U+EAD2
+  ["ee80b6", "ee92ab"], # [HOUSE BUILDING] U+E036 -> U+E4AB
+  ["ee80b8", "ee92ad"], # [OFFICE BUILDING] U+E038 -> U+E4AD
+  ["ee8593", "ee979e"], # [JAPANESE POST OFFICE] U+E153 -> U+E5DE
+  ["ee8595", "ee979f"], # [HOSPITAL] U+E155 -> U+E5DF
+  ["ee858d", "ee92aa"], # [BANK] U+E14D -> U+E4AA
+  ["ee8594", "ee92a3"], # [AUTOMATED TELLER MACHINE] U+E154 -> U+E4A3
+  ["ee8598", "eeaa81"], # [HOTEL] U+E158 -> U+EA81
+  ["ee9481", "eeabb3"], # [LOVE HOTEL] U+E501 -> U+EAF3
+  ["ee8596", "ee92a4"], # [CONVENIENCE STORE] U+E156 -> U+E4A4
+  ["ee8597", "eeaa80"], # [SCHOOL] U+E157 -> U+EA80
+  ["ee80b7", "ee96bb"], # [CHURCH] U+E037 -> U+E5BB
+  ["ee84a1", "ee978f"], # [FOUNTAIN] U+E121 -> U+E5CF
+  ["ee9484", "eeabb6"], # [DEPARTMENT STORE] U+E504 -> U+EAF6
+  ["ee9485", "eeabb7"], # [JAPANESE CASTLE] U+E505 -> U+EAF7
+  ["ee9486", "eeabb8"], # [EUROPEAN CASTLE] U+E506 -> U+EAF8
+  ["ee9488", "eeabb9"], # [FACTORY] U+E508 -> U+EAF9
+  ["ee80bb", "ee96bd"], # [MOUNT FUJI] U+E03B -> U+E5BD
+  ["ee9489", "ee9380"], # [TOKYO TOWER] U+E509 -> U+E4C0
+  ["ee949d", :undef], # [STATUE OF LIBERTY] U+E51D -> "[自由の女神]"
+  ["ee8087", "eeacab"], # [ATHLETIC SHOE] U+E007 -> U+EB2B
+  ["ee84be", "ee949a"], # [HIGH-HEELED SHOE] U+E13E -> U+E51A
+  ["ee8c9a", "ee949a"], # [WOMANS SANDAL] U+E31A -> U+E51A
+  ["ee8c9b", "eeaa9f"], # [WOMANS BOOTS] U+E31B -> U+EA9F
+  ["ee94b6", "eeacaa"], # [FOOTPRINTS] U+E536 -> U+EB2A
+  ["ee8086", "ee96b6"], # [T-SHIRT] U+E006 -> U+E5B6
+  ["ee848e", "ee9789"], # [CROWN] U+E10E -> U+E5C9
+  ["ee8c82", "eeaa93"], # [NECKTIE] U+E302 -> U+EA93
+  ["ee8c98", "eeaa9e"], # [WOMANS HAT] U+E318 -> U+EA9E
+  ["ee8c99", "eeadab"], # [DRESS] U+E319 -> U+EB6B
+  ["ee8ca1", "eeaaa3"], # [KIMONO] U+E321 -> U+EAA3
+  ["ee8ca2", "eeaaa4"], # [BIKINI] U+E322 -> U+EAA4
+  ["ee8ca3", "ee929c"], # [HANDBAG] U+E323 -> U+E49C
+  ["ee84af", "ee9387"], # [MONEY BAG] U+E12F -> U+E4C7
+  ["ee8589", :undef], # [CURRENCY EXCHANGE] U+E149 -> "[$￥]"
+  ["ee858a", "ee979c"], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E14A -> U+E5DC
+  ["ee9493", "eeac91"], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+E513 -> U+EB11
+  ["ee948e", "eeac8e"], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+E50E -> U+EB0E
+  ["ee9491", "ee9795"], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E511 -> U+E5D5
+  ["ee948d", "eeabba"], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+E50D -> U+EAFA
+  ["ee9490", "eeac90"], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+E510 -> U+EB10
+  ["ee948f", "eeac8f"], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+E50F -> U+EB0F
+  ["ee948b", "ee938c"], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E50B -> U+E4CC
+  ["ee9494", "eeac92"], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+E514 -> U+EB12
+  ["ee9492", "ee9796"], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E512 -> U+E5D6
+  ["ee948c", "ee95b3"], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E50C -> U+E573
+  ["ee849d", "ee91bb"], # [FIRE] U+E11D -> U+E47B
+  ["ee8496", "ee978b"], # [HAMMER] U+E116 -> U+E5CB
+  ["ee8493", "ee948a"], # [PISTOL] U+E113 -> U+E50A
+  ["ee88be", "eeaa8f"], # [SIX POINTED STAR WITH MIDDLE DOT] U+E23E -> U+EA8F
+  ["ee8889", "ee9280"], # [JAPANESE SYMBOL FOR BEGINNER] U+E209 -> U+E480
+  ["ee80b1", "ee9789"], # [TRIDENT EMBLEM] U+E031 -> U+E5C9
+  ["ee84bb", "ee9490"], # [SYRINGE] U+E13B -> U+E510
+  ["ee8c8f", "eeaa9a"], # [PILL] U+E30F -> U+EA9A
+  ["ee94b2", "eeaca6"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+E532 -> U+EB26
+  ["ee94b3", "eeaca7"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+E533 -> U+EB27
+  ["ee94b4", "eeaca9"], # [NEGATIVE SQUARED AB] U+E534 -> U+EB29
+  ["ee94b5", "eeaca8"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+E535 -> U+EB28
+  ["ee8c94", "ee969f"], # [RIBBON] U+E314 -> U+E59F
+  ["ee8492", "ee938f"], # [WRAPPED PRESENT] U+E112 -> U+E4CF
+  ["ee8d8b", "ee96a0"], # [BIRTHDAY CAKE] U+E34B -> U+E5A0
+  ["ee80b3", "ee9389"], # [CHRISTMAS TREE] U+E033 -> U+E4C9
+  ["ee9188", "eeabb0"], # [FATHER CHRISTMAS] U+E448 -> U+EAF0
+  ["ee8583", "ee9799"], # [CROSSED FLAGS] U+E143 -> U+E5D9
+  ["ee8497", "ee978c"], # [FIREWORKS] U+E117 -> U+E5CC
+  ["ee8c90", "eeaa9b"], # [BALLOON] U+E310 -> U+EA9B
+  ["ee8c92", "eeaa9c"], # [PARTY POPPER] U+E312 -> U+EA9C
+  ["ee90b6", "eeaba3"], # [PINE DECORATION] U+E436 -> U+EAE3
+  ["ee90b8", "eeaba4"], # [JAPANESE DOLLS] U+E438 -> U+EAE4
+  ["ee90b9", "eeaba5"], # [GRADUATION CAP] U+E439 -> U+EAE5
+  ["ee90ba", "eeaba6"], # [SCHOOL SATCHEL] U+E43A -> U+EAE6
+  ["ee90bb", "eeaba7"], # [CARP STREAMER] U+E43B -> U+EAE7
+  ["ee9180", "eeabab"], # [FIREWORK SPARKLER] U+E440 -> U+EAEB
+  ["ee9182", "eeabad"], # [WIND CHIME] U+E442 -> U+EAED
+  ["ee9185", "eeabae"], # [JACK-O-LANTERN] U+E445 -> U+EAEE
+  ["ee9186", "eeabaf"], # [MOON VIEWING CEREMONY] U+E446 -> U+EAEF
+  ["ee8089", "ee9696"], # [BLACK TELEPHONE] U+E009 -> U+E596
+  ["ee808a", "ee9688"], # [MOBILE PHONE] U+E00A -> U+E588
+  ["ee8484", "eeac88"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+E104 -> U+EB08
+  ["ee8c81", "eeaa92"], # [MEMO] U+E301 -> U+EA92
+  ["ee808b", "ee94a0"], # [FAX MACHINE] U+E00B -> U+E520
+  ["ee8483", "eeada2"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+E103 -> U+EB62
+  ["ee8481", "eeac8a"], # [CLOSED MAILBOX WITH RAISED FLAG] U+E101 -> U+EB0A
+  ["ee8482", "ee949b"], # [POSTBOX] U+E102 -> U+E51B
+  ["ee8582", "ee9491"], # [PUBLIC ADDRESS LOUDSPEAKER] U+E142 -> U+E511
+  ["ee8c97", "ee9491"], # [CHEERING MEGAPHONE] U+E317 -> U+E511
+  ["ee858b", "ee92a8"], # [SATELLITE ANTENNA] U+E14B -> U+E4A8
+  ["ee849f", :undef], # [SEAT] U+E11F -> "[いす]"
+  ["ee808c", "ee96b8"], # [PERSONAL COMPUTER] U+E00C -> U+E5B8
+  ["ee849e", "ee978e"], # [BRIEFCASE] U+E11E -> U+E5CE
+  ["ee8c96", "ee9682"], # [MINIDISC] U+E316 -> U+E582
+  ["ee84a6", "ee948c"], # [OPTICAL DISC] U+E126 -> U+E50C
+  ["ee84a7", "ee948c"], # [DVD] U+E127 -> U+E50C
+  ["ee8c93", "ee9496"], # [BLACK SCISSORS] U+E313 -> U+E516
+  ["ee8588", "ee929f"], # [OPEN BOOK] U+E148 -> U+E49F
+  ["ee8096", "ee92ba"], # [BASEBALL] U+E016 -> U+E4BA
+  ["ee8094", "ee9699"], # [FLAG IN HOLE] U+E014 -> U+E599
+  ["ee8095", "ee92b7"], # [TENNIS RACQUET AND BALL] U+E015 -> U+E4B7
+  ["ee8098", "ee92b6"], # [SOCCER BALL] U+E018 -> U+E4B6
+  ["ee8093", "eeaaac"], # [SKI AND SKI BOOT] U+E013 -> U+EAAC
+  ["ee90aa", "ee969a"], # [BASKETBALL AND HOOP] U+E42A -> U+E59A
+  ["ee84b2", "ee92b9"], # [CHEQUERED FLAG] U+E132 -> U+E4B9
+  ["ee8495", "ee91ab"], # [RUNNER] U+E115 -> U+E46B
+  ["ee8097", "eead81"], # [SURFER] U+E017 -> U+EB41
+  ["ee84b1", "ee9793"], # [TROPHY] U+E131 -> U+E5D3
+  ["ee90ab", "ee92bb"], # [AMERICAN FOOTBALL] U+E42B -> U+E4BB
+  ["ee90ad", "eeab9e"], # [SWIMMER] U+E42D -> U+EADE
+  ["ee809e", "ee92b5"], # [TRAIN] U+E01E -> U+E4B5
+  ["ee90b4", "ee96bc"], # [METRO] U+E434 -> U+E5BC
+  ["ee90b5", "ee92b0"], # [HIGH-SPEED TRAIN] U+E435 -> U+E4B0
+  ["ee809f", "ee92b0"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E01F -> U+E4B0
+  ["ee809b", "ee92b1"], # [AUTOMOBILE] U+E01B -> U+E4B1
+  ["ee90ae", "ee92b1"], # [RECREATIONAL VEHICLE] U+E42E -> U+E4B1
+  ["ee8599", "ee92af"], # [ONCOMING BUS] U+E159 -> U+E4AF
+  ["ee8590", "ee92a7"], # [BUS STOP] U+E150 -> U+E4A7
+  ["ee8882", "eeaa82"], # [SHIP] U+E202 -> U+EA82
+  ["ee809d", "ee92b3"], # [AIRPLANE] U+E01D -> U+E4B3
+  ["ee809c", "ee92b4"], # [SAILBOAT] U+E01C -> U+E4B4
+  ["ee80b9", "eeadad"], # [STATION] U+E039 -> U+EB6D
+  ["ee848d", "ee9788"], # [ROCKET] U+E10D -> U+E5C8
+  ["ee84b5", "ee92b4"], # [SPEEDBOAT] U+E135 -> U+E4B4
+  ["ee859a", "ee92b1"], # [TAXI] U+E15A -> U+E4B1
+  ["ee90af", "ee92b2"], # [DELIVERY TRUCK] U+E42F -> U+E4B2
+  ["ee90b0", "eeab9f"], # [FIRE ENGINE] U+E430 -> U+EADF
+  ["ee90b1", "eeaba0"], # [AMBULANCE] U+E431 -> U+EAE0
+  ["ee90b2", "eeaba1"], # [POLICE CAR] U+E432 -> U+EAE1
+  ["ee80ba", "ee95b1"], # [FUEL PUMP] U+E03A -> U+E571
+  ["ee858f", "ee92a6"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E14F -> U+E4A6
+  ["ee858e", "ee91aa"], # [HORIZONTAL TRAFFIC LIGHT] U+E14E -> U+E46A
+  ["ee84b7", "ee9797"], # [CONSTRUCTION SIGN] U+E137 -> U+E5D7
+  ["ee84a3", "ee92bc"], # [HOT SPRINGS] U+E123 -> U+E4BC
+  ["ee84a2", "ee9790"], # [TENT] U+E122 -> U+E5D0
+  ["ee84a4", "ee91ad"], # [FERRIS WHEEL] U+E124 -> U+E46D
+  ["ee90b3", "eeaba2"], # [ROLLER COASTER] U+E433 -> U+EAE2
+  ["ee80bc", "ee9483"], # [MICROPHONE] U+E03C -> U+E503
+  ["ee80bd", "ee9497"], # [MOVIE CAMERA] U+E03D -> U+E517
+  ["ee9487", "ee9497"], # [CINEMA] U+E507 -> U+E517
+  ["ee8c8a", "ee9488"], # [HEADPHONE] U+E30A -> U+E508
+  ["ee9482", "ee969c"], # [ARTIST PALETTE] U+E502 -> U+E59C
+  ["ee9483", "eeabb5"], # [TOP HAT] U+E503 -> U+EAF5
+  ["ee84a5", "ee929e"], # [TICKET] U+E125 -> U+E49E
+  ["ee8ca4", "ee92be"], # [CLAPPER BOARD] U+E324 -> U+E4BE
+  ["ee84ad", "ee9791"], # [MAHJONG TILE RED DRAGON] U+E12D -> U+E5D1
+  ["ee84b0", "ee9385"], # [DIRECT HIT] U+E130 -> U+E4C5
+  ["ee84b3", "ee91ae"], # [SLOT MACHINE] U+E133 -> U+E46E
+  ["ee90ac", "eeab9d"], # [BILLIARDS] U+E42C -> U+EADD
+  ["ee80be", "ee96be"], # [MUSICAL NOTE] U+E03E -> U+E5BE
+  ["ee8ca6", "ee9485"], # [MULTIPLE MUSICAL NOTES] U+E326 -> U+E505
+  ["ee8180", :undef], # [SAXOPHONE] U+E040 -> "[サックス]"
+  ["ee8181", "ee9486"], # [GUITAR] U+E041 -> U+E506
+  ["ee8182", "eeab9c"], # [TRUMPET] U+E042 -> U+EADC
+  ["ee84ac", :undef], # [PART ALTERNATION MARK] U+E12C -> "[歌記号]"
+  ["ee8088", "ee9495"], # [CAMERA] U+E008 -> U+E515
+  ["ee84aa", "ee9482"], # [TELEVISION] U+E12A -> U+E502
+  ["ee84a8", "ee96b9"], # [RADIO] U+E128 -> U+E5B9
+  ["ee84a9", "ee9680"], # [VIDEOCASSETTE] U+E129 -> U+E580
+  ["ee8083", "ee93ab"], # [KISS MARK] U+E003 -> U+E4EB
+  ["ee80b4", "ee9494"], # [RING] U+E034 -> U+E514
+  ["ee80b5", "ee9494"], # [GEM STONE] U+E035 -> U+E514
+  ["ee8491", "ee978a"], # [KISS] U+E111 -> U+E5CA
+  ["ee8c86", "eeaa95"], # [BOUQUET] U+E306 -> U+EA95
+  ["ee90a5", "eeab9a"], # [COUPLE WITH HEART] U+E425 -> U+EADA
+  ["ee90bd", "ee96bb"], # [WEDDING] U+E43D -> U+E5BB
+  ["ee8887", "eeaa83"], # [NO ONE UNDER EIGHTEEN SYMBOL] U+E207 -> U+EA83
+  ["ee898e", "ee9598"], # [COPYRIGHT SIGN] U+E24E -> U+E558
+  ["ee898f", "ee9599"], # [REGISTERED SIGN] U+E24F -> U+E559
+  ["ee94b7", "ee958e"], # [TRADE MARK SIGN] U+E537 -> U+E54E
+  ["ee8890", "eeae84"], # [HASH KEY] U+E210 -> U+EB84
+  ["ee889c", "ee94a2"], # [KEYCAP 1] U+E21C -> U+E522
+  ["ee889d", "ee94a3"], # [KEYCAP 2] U+E21D -> U+E523
+  ["ee889e", "ee94a4"], # [KEYCAP 3] U+E21E -> U+E524
+  ["ee889f", "ee94a5"], # [KEYCAP 4] U+E21F -> U+E525
+  ["ee88a0", "ee94a6"], # [KEYCAP 5] U+E220 -> U+E526
+  ["ee88a1", "ee94a7"], # [KEYCAP 6] U+E221 -> U+E527
+  ["ee88a2", "ee94a8"], # [KEYCAP 7] U+E222 -> U+E528
+  ["ee88a3", "ee94a9"], # [KEYCAP 8] U+E223 -> U+E529
+  ["ee88a4", "ee94aa"], # [KEYCAP 9] U+E224 -> U+E52A
+  ["ee88a5", "ee96ac"], # [KEYCAP 0] U+E225 -> U+E5AC
+  ["ee888b", "eeaa84"], # [ANTENNA WITH BARS] U+E20B -> U+EA84
+  ["ee8990", "eeaa90"], # [VIBRATION MODE] U+E250 -> U+EA90
+  ["ee8991", "eeaa91"], # [MOBILE PHONE OFF] U+E251 -> U+EA91
+  ["ee84a0", "ee9396"], # [HAMBURGER] U+E120 -> U+E4D6
+  ["ee8d82", "ee9395"], # [RICE BALL] U+E342 -> U+E4D5
+  ["ee8186", "ee9390"], # [SHORTCAKE] U+E046 -> U+E4D0
+  ["ee8d80", "ee96b4"], # [STEAMING BOWL] U+E340 -> U+E5B4
+  ["ee8cb9", "eeaaaf"], # [BREAD] U+E339 -> U+EAAF
+  ["ee8587", "ee9391"], # [COOKING] U+E147 -> U+E4D1
+  ["ee8cba", "eeaab0"], # [SOFT ICE CREAM] U+E33A -> U+EAB0
+  ["ee8cbb", "eeaab1"], # [FRENCH FRIES] U+E33B -> U+EAB1
+  ["ee8cbc", "eeaab2"], # [DANGO] U+E33C -> U+EAB2
+  ["ee8cbd", "eeaab3"], # [RICE CRACKER] U+E33D -> U+EAB3
+  ["ee8cbe", "eeaab4"], # [COOKED RICE] U+E33E -> U+EAB4
+  ["ee8cbf", "eeaab5"], # [SPAGHETTI] U+E33F -> U+EAB5
+  ["ee8d81", "eeaab6"], # [CURRY AND RICE] U+E341 -> U+EAB6
+  ["ee8d83", "eeaab7"], # [ODEN] U+E343 -> U+EAB7
+  ["ee8d84", "eeaab8"], # [SUSHI] U+E344 -> U+EAB8
+  ["ee8d8c", "eeaabd"], # [BENTO BOX] U+E34C -> U+EABD
+  ["ee8d8d", "eeaabe"], # [POT OF FOOD] U+E34D -> U+EABE
+  ["ee90bf", "eeabaa"], # [SHAVED ICE] U+E43F -> U+EAEA
+  ["ee8183", "ee92ac"], # [FORK AND KNIFE] U+E043 -> U+E4AC
+  ["ee8185", "ee9697"], # [HOT BEVERAGE] U+E045 -> U+E597
+  ["ee8184", "ee9382"], # [COCKTAIL GLASS] U+E044 -> U+E4C2
+  ["ee8187", "ee9383"], # [BEER MUG] U+E047 -> U+E4C3
+  ["ee8cb8", "eeaaae"], # [TEACUP WITHOUT HANDLE] U+E338 -> U+EAAE
+  ["ee8c8b", "eeaa97"], # [SAKE BOTTLE AND CUP] U+E30B -> U+EA97
+  ["ee8c8c", "eeaa98"], # [CLINKING BEER MUGS] U+E30C -> U+EA98
+  ["ee88b6", "ee9595"], # [NORTH EAST ARROW] U+E236 -> U+E555
+  ["ee88b8", "ee958d"], # [SOUTH EAST ARROW] U+E238 -> U+E54D
+  ["ee88b7", "ee958c"], # [NORTH WEST ARROW] U+E237 -> U+E54C
+  ["ee88b9", "ee9596"], # [SOUTH WEST ARROW] U+E239 -> U+E556
+  ["ee88b2", "ee94bf"], # [UPWARDS BLACK ARROW] U+E232 -> U+E53F
+  ["ee88b3", "ee9580"], # [DOWNWARDS BLACK ARROW] U+E233 -> U+E540
+  ["ee88b4", "ee9592"], # [BLACK RIGHTWARDS ARROW] U+E234 -> U+E552
+  ["ee88b5", "ee9593"], # [LEFTWARDS BLACK ARROW] U+E235 -> U+E553
+  ["ee88ba", "ee94ae"], # [BLACK RIGHT-POINTING TRIANGLE] U+E23A -> U+E52E
+  ["ee88bb", "ee94ad"], # [BLACK LEFT-POINTING TRIANGLE] U+E23B -> U+E52D
+  ["ee88bc", "ee94b0"], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E23C -> U+E530
+  ["ee88bd", "ee94af"], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E23D -> U+E52F
+  ["ee8cb2", "eeaaad"], # [HEAVY LARGE CIRCLE] U+E332 -> U+EAAD
+  ["ee8cb3", "ee9590"], # [CROSS MARK] U+E333 -> U+E550
+  ["ee80a1", "ee9282"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E021 -> U+E482
+  ["ee80a0", "ee9283"], # [BLACK QUESTION MARK ORNAMENT] U+E020 -> U+E483
+  ["ee8cb6", "ee9283"], # [WHITE QUESTION MARK ORNAMENT] U+E336 -> U+E483
+  ["ee8cb7", "ee9282"], # [WHITE EXCLAMATION MARK ORNAMENT] U+E337 -> U+E482
+  ["ee8891", :undef], # [DOUBLE CURLY LOOP] U+E211 -> "[フリーダイヤル]"
+  ["ee80a2", "ee9695"], # [HEAVY BLACK HEART] U+E022 -> U+E595
+  ["ee8ca7", "eeadb5"], # [BEATING HEART] U+E327 -> U+EB75
+  ["ee80a3", "ee91b7"], # [BROKEN HEART] U+E023 -> U+E477
+  ["ee8ca8", "eeadb5"], # [GROWING HEART] U+E328 -> U+EB75
+  ["ee8ca9", "ee93aa"], # [HEART WITH ARROW] U+E329 -> U+E4EA
+  ["ee8caa", "eeaaa7"], # [BLUE HEART] U+E32A -> U+EAA7
+  ["ee8cab", "eeaaa8"], # [GREEN HEART] U+E32B -> U+EAA8
+  ["ee8cac", "eeaaa9"], # [YELLOW HEART] U+E32C -> U+EAA9
+  ["ee8cad", "eeaaaa"], # [PURPLE HEART] U+E32D -> U+EAAA
+  ["ee90b7", "eead94"], # [HEART WITH RIBBON] U+E437 -> U+EB54
+  ["ee8884", "ee9695"], # [HEART DECORATION] U+E204 -> U+E595
+  ["ee888c", "eeaaa5"], # [BLACK HEART SUIT] U+E20C -> U+EAA5
+  ["ee888e", "ee96a1"], # [BLACK SPADE SUIT] U+E20E -> U+E5A1
+  ["ee888d", "ee96a2"], # [BLACK DIAMOND SUIT] U+E20D -> U+E5A2
+  ["ee888f", "ee96a3"], # [BLACK CLUB SUIT] U+E20F -> U+E5A3
+  ["ee8c8e", "ee91bd"], # [SMOKING SYMBOL] U+E30E -> U+E47D
+  ["ee8888", "ee91be"], # [NO SMOKING SYMBOL] U+E208 -> U+E47E
+  ["ee888a", "ee91bf"], # [WHEELCHAIR SYMBOL] U+E20A -> U+E47F
+  ["ee8992", "ee9281"], # [WARNING SIGN] U+E252 -> U+E481
+  ["ee84b6", "ee92ae"], # [BICYCLE] U+E136 -> U+E4AE
+  ["ee8881", "eeadb2"], # [PEDESTRIAN] U+E201 -> U+EB72
+  ["ee84b8", :undef], # [MENS SYMBOL] U+E138 -> "[♂]"
+  ["ee84b9", :undef], # [WOMENS SYMBOL] U+E139 -> "[♀]"
+  ["ee84bf", "ee9798"], # [BATH] U+E13F -> U+E5D8
+  ["ee8591", "ee92a5"], # [RESTROOM] U+E151 -> U+E4A5
+  ["ee8580", "ee92a5"], # [TOILET] U+E140 -> U+E4A5
+  ["ee8c89", "ee92a5"], # [WATER CLOSET] U+E309 -> U+E4A5
+  ["ee84ba", "eeac98"], # [BABY SYMBOL] U+E13A -> U+EB18
+  ["ee8894", "eeaa85"], # [SQUARED COOL] U+E214 -> U+EA85
+  ["ee88a9", "eeaa88"], # [SQUARED ID] U+E229 -> U+EA88
+  ["ee8892", "ee96b5"], # [SQUARED NEW] U+E212 -> U+E5B5
+  ["ee898d", "ee96ad"], # [SQUARED OK] U+E24D -> U+E5AD
+  ["ee8893", "ee948f"], # [SQUARED UP WITH EXCLAMATION MARK] U+E213 -> U+E50F
+  ["ee84ae", "ee9792"], # [SQUARED VS] U+E12E -> U+E5D2
+  ["ee8883", :undef], # [SQUARED KATAKANA KOKO] U+E203 -> "[ココ]"
+  ["ee88a8", "eeaa87"], # [SQUARED KATAKANA SA] U+E228 -> U+EA87
+  ["ee88ab", "eeaa8a"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+E22B -> U+EA8A
+  ["ee88aa", "eeaa89"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+E22A -> U+EA89
+  ["ee8895", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6709] U+E215 -> "[有]"
+  ["ee8896", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7121] U+E216 -> "[無]"
+  ["ee8897", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6708] U+E217 -> "[月]"
+  ["ee8898", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7533] U+E218 -> "[申]"
+  ["ee88a7", "eeaa86"], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+E227 -> U+EA86
+  ["ee88ac", "eeaa8b"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+E22C -> U+EA8B
+  ["ee88ad", "eeaa8c"], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+E22D -> U+EA8C
+  ["ee8c95", "ee93b1"], # [CIRCLED IDEOGRAPH SECRET] U+E315 -> U+E4F1
+  ["ee8c8d", "eeaa99"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+E30D -> U+EA99
+  ["ee88a6", "ee93b7"], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E226 -> U+E4F7
+  ["ee848f", "ee91b6"], # [ELECTRIC LIGHT BULB] U+E10F -> U+E476
+  ["ee8cb4", "ee93a5"], # [ANGER SYMBOL] U+E334 -> U+E4E5
+  ["ee8c91", "ee91ba"], # [BOMB] U+E311 -> U+E47A
+  ["ee84bc", "ee91b5"], # [SLEEPING SYMBOL] U+E13C -> U+E475
+  ["ee8cb1", "ee96b1"], # [SPLASHING SWEAT SYMBOL] U+E331 -> U+E5B1
+  ["ee8cb0", "ee93b4"], # [DASH SYMBOL] U+E330 -> U+E4F4
+  ["ee819a", "ee93b5"], # [PILE OF POO] U+E05A -> U+E4F5
+  ["ee858c", "ee93a9"], # [FLEXED BICEPS] U+E14C -> U+E4E9
+  ["ee8cae", "eeaaab"], # [SPARKLES] U+E32E -> U+EAAB
+  ["ee8885", "ee91b9"], # [EIGHT POINTED BLACK STAR] U+E205 -> U+E479
+  ["ee8886", "ee94be"], # [EIGHT SPOKED ASTERISK] U+E206 -> U+E53E
+  ["ee8899", "ee958a"], # [LARGE RED CIRCLE] U+E219 -> U+E54A
+  ["ee889a", "ee958b"], # [BLACK SQUARE BUTTON] U+E21A -> U+E54B
+  ["ee889b", "ee958b"], # [WHITE SQUARE BUTTON] U+E21B -> U+E54B
+  ["ee8caf", "ee928b"], # [WHITE MEDIUM STAR] U+E32F -> U+E48B
+  ["ee8581", "ee9491"], # [SPEAKER WITH THREE SOUND WAVES] U+E141 -> U+E511
+  ["ee8494", "ee9498"], # [LEFT-POINTING MAGNIFYING GLASS] U+E114 -> U+E518
+  ["ee8584", "ee949c"], # [LOCK] U+E144 -> U+E51C
+  ["ee8585", "ee949c"], # [OPEN LOCK] U+E145 -> U+E51C
+  ["ee80bf", "ee9499"], # [KEY] U+E03F -> U+E519
+  ["ee8ca5", "ee9492"], # [BELL] U+E325 -> U+E512
+  ["ee898c", :undef], # [TOP WITH UPWARDS ARROW ABOVE] U+E24C -> "[TOP]"
+  ["ee8090", "eeae83"], # [RAISED FIST] U+E010 -> U+EB83
+  ["ee8092", "ee96a7"], # [RAISED HAND] U+E012 -> U+E5A7
+  ["ee8091", "ee96a6"], # [VICTORY HAND] U+E011 -> U+E5A6
+  ["ee808d", "ee93b3"], # [FISTED HAND SIGN] U+E00D -> U+E4F3
+  ["ee808e", "ee93b9"], # [THUMBS UP SIGN] U+E00E -> U+E4F9
+  ["ee808f", "ee93b6"], # [WHITE UP POINTING INDEX] U+E00F -> U+E4F6
+  ["ee88ae", "eeaa8d"], # [WHITE UP POINTING BACKHAND INDEX] U+E22E -> U+EA8D
+  ["ee88af", "eeaa8e"], # [WHITE DOWN POINTING BACKHAND INDEX] U+E22F -> U+EA8E
+  ["ee88b0", "ee93bf"], # [WHITE LEFT POINTING BACKHAND INDEX] U+E230 -> U+E4FF
+  ["ee88b1", "ee9480"], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E231 -> U+E500
+  ["ee909e", "eeab96"], # [WAVING HAND SIGN] U+E41E -> U+EAD6
+  ["ee909f", "eeab93"], # [CLAPPING HANDS SIGN] U+E41F -> U+EAD3
+  ["ee90a0", "eeab94"], # [OK HAND SIGN] U+E420 -> U+EAD4
+  ["ee90a1", "eeab95"], # [THUMBS DOWN SIGN] U+E421 -> U+EAD5
+  ["ee90a2", "eeab96"], # [OPEN HANDS SIGN] U+E422 -> U+EAD6
+  ["ee94b8", :undef], # [EMOJI COMPATIBILITY SYMBOL-50] U+E538 -> U+3013 (GETA)
+  ["ee94b9", :undef], # [EMOJI COMPATIBILITY SYMBOL-51] U+E539 -> U+3013 (GETA)
+  ["ee94ba", :undef], # [EMOJI COMPATIBILITY SYMBOL-52] U+E53A -> U+3013 (GETA)
+  ["ee94bb", :undef], # [EMOJI COMPATIBILITY SYMBOL-53] U+E53B -> U+3013 (GETA)
+  ["ee94bc", :undef], # [EMOJI COMPATIBILITY SYMBOL-54] U+E53C -> "[v"
+  ["ee94bd", :undef], # [EMOJI COMPATIBILITY SYMBOL-55] U+E53D -> "oda"
+  ["ee94be", :undef], # [EMOJI COMPATIBILITY SYMBOL-56] U+E53E -> "fone]"
+  ["ee8994", :undef], # [EMOJI COMPATIBILITY SYMBOL-57] U+E254 -> U+3013 (GETA)
+  ["ee8995", :undef], # [EMOJI COMPATIBILITY SYMBOL-58] U+E255 -> U+3013 (GETA)
+  ["ee8996", :undef], # [EMOJI COMPATIBILITY SYMBOL-59] U+E256 -> U+3013 (GETA)
+  ["ee8997", :undef], # [EMOJI COMPATIBILITY SYMBOL-60] U+E257 -> U+3013 (GETA)
+  ["ee8998", :undef], # [EMOJI COMPATIBILITY SYMBOL-61] U+E258 -> U+3013 (GETA)
+  ["ee8999", :undef], # [EMOJI COMPATIBILITY SYMBOL-62] U+E259 -> U+3013 (GETA)
+  ["ee899a", :undef], # [EMOJI COMPATIBILITY SYMBOL-63] U+E25A -> U+3013 (GETA)
+  ["ee948a", :undef], # [EMOJI COMPATIBILITY SYMBOL-64] U+E50A -> U+3013 (GETA)
+]
+
+EMOJI_EXCHANGE_TBL['UTF8-SoftBank']['UTF-8'] = [
+  ["ee818a", "e29880"], # [BLACK SUN WITH RAYS] U+E04A -> U+2600
+  ["ee8189", "e29881"], # [CLOUD] U+E049 -> U+2601
+  ["ee818b", "e29894"], # [UMBRELLA WITH RAIN DROPS] U+E04B -> U+2614
+  ["ee8188", "e29b84"], # [SNOWMAN WITHOUT SNOW] U+E048 -> U+26C4
+  ["ee84bd", "e29aa1"], # [HIGH VOLTAGE SIGN] U+E13D -> U+26A1
+  ["ee9183", :undef], # [CYCLONE] U+E443 -> U+1F300
+  ["ee90bc", :undef], # [CLOSED UMBRELLA] U+E43C -> U+1F302
+  ["ee918b", :undef], # [NIGHT WITH STARS] U+E44B -> U+1F303
+  ["ee818d", :undef], # [SUNRISE OVER MOUNTAINS] U+E04D -> U+1F304
+  ["ee9189", :undef], # [SUNRISE] U+E449 -> U+1F305
+  ["ee8586", :undef], # [CITYSCAPE AT DUSK] U+E146 -> "[夕焼け]"
+  ["ee918a", :undef], # [SUNSET OVER BUILDINGS] U+E44A -> U+1F307
+  ["ee918c", :undef], # [RAINBOW] U+E44C -> U+1F308
+  ["ee90be", :undef], # [WATER WAVE] U+E43E -> U+1F30A
+  ["ee818c", :undef], # [CRESCENT MOON] U+E04C -> U+1F319
+  ["ee8cb5", :undef], # [GLOWING STAR] U+E335 -> U+1F31F
+  ["ee80a4", :undef], # [CLOCK FACE ONE OCLOCK] U+E024 -> U+1F550
+  ["ee80a5", :undef], # [CLOCK FACE TWO OCLOCK] U+E025 -> U+1F551
+  ["ee80a6", :undef], # [CLOCK FACE THREE OCLOCK] U+E026 -> U+1F552
+  ["ee80a7", :undef], # [CLOCK FACE FOUR OCLOCK] U+E027 -> U+1F553
+  ["ee80a8", :undef], # [CLOCK FACE FIVE OCLOCK] U+E028 -> U+1F554
+  ["ee80a9", :undef], # [CLOCK FACE SIX OCLOCK] U+E029 -> U+1F555
+  ["ee80aa", :undef], # [CLOCK FACE SEVEN OCLOCK] U+E02A -> U+1F556
+  ["ee80ab", :undef], # [CLOCK FACE EIGHT OCLOCK] U+E02B -> U+1F557
+  ["ee80ac", :undef], # [CLOCK FACE NINE OCLOCK] U+E02C -> U+1F558
+  ["ee80ad", :undef], # [CLOCK FACE TEN OCLOCK] U+E02D -> U+1F559
+  ["ee80ae", :undef], # [CLOCK FACE ELEVEN OCLOCK] U+E02E -> U+1F55A
+  ["ee80af", :undef], # [CLOCK FACE TWELVE OCLOCK] U+E02F -> U+1F55B
+  ["ee88bf", "e29988"], # [ARIES] U+E23F -> U+2648
+  ["ee8980", "e29989"], # [TAURUS] U+E240 -> U+2649
+  ["ee8981", "e2998a"], # [GEMINI] U+E241 -> U+264A
+  ["ee8982", "e2998b"], # [CANCER] U+E242 -> U+264B
+  ["ee8983", "e2998c"], # [LEO] U+E243 -> U+264C
+  ["ee8984", "e2998d"], # [VIRGO] U+E244 -> U+264D
+  ["ee8985", "e2998e"], # [LIBRA] U+E245 -> U+264E
+  ["ee8986", "e2998f"], # [SCORPIUS] U+E246 -> U+264F
+  ["ee8987", "e29990"], # [SAGITTARIUS] U+E247 -> U+2650
+  ["ee8988", "e29991"], # [CAPRICORN] U+E248 -> U+2651
+  ["ee8989", "e29992"], # [AQUARIUS] U+E249 -> U+2652
+  ["ee898a", "e29993"], # [PISCES] U+E24A -> U+2653
+  ["ee898b", :undef], # [OPHIUCHUS] U+E24B -> U+26CE
+  ["ee8490", :undef], # [FOUR LEAF CLOVER] U+E110 -> U+1F340
+  ["ee8c84", :undef], # [TULIP] U+E304 -> U+1F337
+  ["ee8498", :undef], # [MAPLE LEAF] U+E118 -> U+1F341
+  ["ee80b0", :undef], # [CHERRY BLOSSOM] U+E030 -> U+1F338
+  ["ee80b2", :undef], # [ROSE] U+E032 -> U+1F339
+  ["ee8499", :undef], # [FALLEN LEAF] U+E119 -> U+1F342
+  ["ee9187", :undef], # [LEAF FLUTTERING IN WIND] U+E447 -> U+1F343
+  ["ee8c83", :undef], # [HIBISCUS] U+E303 -> U+1F33A
+  ["ee8c85", :undef], # [SUNFLOWER] U+E305 -> U+1F33B
+  ["ee8c87", :undef], # [PALM TREE] U+E307 -> U+1F334
+  ["ee8c88", :undef], # [CACTUS] U+E308 -> U+1F335
+  ["ee9184", :undef], # [EAR OF RICE] U+E444 -> U+1F33E
+  ["ee8d85", :undef], # [RED APPLE] U+E345 -> U+1F34E
+  ["ee8d86", :undef], # [TANGERINE] U+E346 -> U+1F34A
+  ["ee8d87", :undef], # [STRAWBERRY] U+E347 -> U+1F353
+  ["ee8d88", :undef], # [WATERMELON] U+E348 -> U+1F349
+  ["ee8d89", :undef], # [TOMATO] U+E349 -> U+1F345
+  ["ee8d8a", :undef], # [AUBERGINE] U+E34A -> U+1F346
+  ["ee9099", :undef], # [EYES] U+E419 -> U+1F440
+  ["ee909b", :undef], # [EAR] U+E41B -> U+1F442
+  ["ee909a", :undef], # [NOSE] U+E41A -> U+1F443
+  ["ee909c", :undef], # [MOUTH] U+E41C -> U+1F444
+  ["ee8c9c", :undef], # [LIPSTICK] U+E31C -> U+1F484
+  ["ee8c9d", :undef], # [NAIL POLISH] U+E31D -> U+1F485
+  ["ee8c9e", :undef], # [FACE MASSAGE] U+E31E -> U+1F486
+  ["ee8c9f", :undef], # [HAIRCUT] U+E31F -> U+1F487
+  ["ee8ca0", :undef], # [BARBER POLE] U+E320 -> U+1F488
+  ["ee8081", :undef], # [BOY] U+E001 -> U+1F466
+  ["ee8082", :undef], # [GIRL] U+E002 -> U+1F467
+  ["ee8084", :undef], # [MAN] U+E004 -> U+1F468
+  ["ee8085", :undef], # [WOMAN] U+E005 -> U+1F469
+  ["ee90a8", :undef], # [MAN AND WOMAN HOLDING HANDS] U+E428 -> U+1F46B
+  ["ee8592", :undef], # [POLICE OFFICER] U+E152 -> U+1F46E
+  ["ee90a9", :undef], # [WOMAN WITH BUNNY EARS] U+E429 -> U+1F46F
+  ["ee9495", :undef], # [WESTERN PERSON] U+E515 -> U+1F471
+  ["ee9496", :undef], # [MAN WITH GUA PI MAO] U+E516 -> U+1F472
+  ["ee9497", :undef], # [MAN WITH TURBAN] U+E517 -> U+1F473
+  ["ee9498", :undef], # [OLDER MAN] U+E518 -> U+1F474
+  ["ee9499", :undef], # [OLDER WOMAN] U+E519 -> U+1F475
+  ["ee949a", :undef], # [BABY] U+E51A -> U+1F476
+  ["ee949b", :undef], # [CONSTRUCTION WORKER] U+E51B -> U+1F477
+  ["ee949c", :undef], # [PRINCESS] U+E51C -> U+1F478
+  ["ee849b", :undef], # [GHOST] U+E11B -> U+1F47B
+  ["ee818e", :undef], # [BABY ANGEL] U+E04E -> U+1F47C
+  ["ee848c", :undef], # [EXTRATERRESTRIAL ALIEN] U+E10C -> U+1F47D
+  ["ee84ab", :undef], # [ALIEN MONSTER] U+E12B -> U+1F47E
+  ["ee849a", :undef], # [IMP] U+E11A -> U+1F47F
+  ["ee849c", :undef], # [SKULL] U+E11C -> U+1F480
+  ["ee8993", :undef], # [INFORMATION DESK PERSON] U+E253 -> U+1F481
+  ["ee949e", :undef], # [GUARDSMAN] U+E51E -> U+1F482
+  ["ee949f", :undef], # [DANCER] U+E51F -> U+1F483
+  ["ee94ad", :undef], # [SNAKE] U+E52D -> U+1F40D
+  ["ee84b4", :undef], # [HORSE] U+E134 -> U+1F40E
+  ["ee94ae", :undef], # [CHICKEN] U+E52E -> U+1F414
+  ["ee94af", :undef], # [BOAR] U+E52F -> U+1F417
+  ["ee94b0", :undef], # [BACTRIAN CAMEL] U+E530 -> U+1F42B
+  ["ee94a6", :undef], # [ELEPHANT] U+E526 -> U+1F418
+  ["ee94a7", :undef], # [KOALA] U+E527 -> U+1F428
+  ["ee94a8", :undef], # [MONKEY] U+E528 -> U+1F412
+  ["ee94a9", :undef], # [SHEEP] U+E529 -> U+1F411
+  ["ee848a", :undef], # [OCTOPUS] U+E10A -> U+1F419
+  ["ee9181", :undef], # [SPIRAL SHELL] U+E441 -> U+1F41A
+  ["ee94a5", :undef], # [BUG] U+E525 -> U+1F41B
+  ["ee94a2", :undef], # [TROPICAL FISH] U+E522 -> U+1F420
+  ["ee94a3", :undef], # [BABY CHICK] U+E523 -> U+1F424
+  ["ee94a1", :undef], # [BIRD] U+E521 -> U+1F426
+  ["ee8195", :undef], # [PENGUIN] U+E055 -> U+1F427
+  ["ee8099", :undef], # [FISH] U+E019 -> U+1F41F
+  ["ee94a0", :undef], # [DOLPHIN] U+E520 -> U+1F42C
+  ["ee8193", :undef], # [MOUSE FACE] U+E053 -> U+1F42D
+  ["ee8190", :undef], # [TIGER FACE] U+E050 -> U+1F42F
+  ["ee818f", :undef], # [CAT FACE] U+E04F -> U+1F431
+  ["ee8194", :undef], # [SPOUTING WHALE] U+E054 -> U+1F433
+  ["ee809a", :undef], # [HORSE FACE] U+E01A -> U+1F434
+  ["ee8489", :undef], # [MONKEY FACE] U+E109 -> U+1F435
+  ["ee8192", :undef], # [DOG FACE] U+E052 -> U+1F436
+  ["ee848b", :undef], # [PIG FACE] U+E10B -> U+1F437
+  ["ee8191", :undef], # [BEAR FACE] U+E051 -> U+1F43B
+  ["ee94a4", :undef], # [HAMSTER FACE] U+E524 -> U+1F439
+  ["ee94aa", :undef], # [WOLF FACE] U+E52A -> U+1F43A
+  ["ee94ab", :undef], # [COW FACE] U+E52B -> U+1F42E
+  ["ee94ac", :undef], # [RABBIT FACE] U+E52C -> U+1F430
+  ["ee94b1", :undef], # [FROG FACE] U+E531 -> U+1F438
+  ["ee8199", :undef], # [ANGRY FACE] U+E059 -> U+1F600
+  ["ee9090", :undef], # [ASTONISHED FACE] U+E410 -> U+1F602
+  ["ee8198", :undef], # [DISAPPOINTED FACE] U+E058 -> U+1F603
+  ["ee908f", :undef], # [EXASPERATED FACE] U+E40F -> U+1F605
+  ["ee908e", :undef], # [EXPRESSIONLESS FACE] U+E40E -> U+1F606
+  ["ee8486", :undef], # [FACE WITH HEART-SHAPED EYES] U+E106 -> U+1F607
+  ["ee8485", :undef], # [WINKING FACE WITH STUCK-OUT TONGUE] U+E105 -> U+1F609
+  ["ee9089", :undef], # [FACE WITH STUCK-OUT TONGUE] U+E409 -> U+1F60A
+  ["ee9098", :undef], # [FACE THROWING A KISS] U+E418 -> U+1F60C
+  ["ee9097", :undef], # [FACE KISSING] U+E417 -> U+1F60D
+  ["ee908c", :undef], # [FACE WITH MASK] U+E40C -> U+1F60E
+  ["ee908d", :undef], # [FLUSHED FACE] U+E40D -> U+1F60F
+  ["ee8197", :undef], # [HAPPY FACE WITH OPEN MOUTH] U+E057 -> U+1F610
+  ["ee9084", :undef], # [HAPPY FACE WITH GRIN] U+E404 -> U+1F613
+  ["ee9092", :undef], # [HAPPY AND CRYING FACE] U+E412 -> U+1F614
+  ["ee8196", :undef], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+E056 -> U+1F615
+  ["ee9094", "e298ba"], # [WHITE SMILING FACE] U+E414 -> U+263A
+  ["ee9095", :undef], # [HAPPY FACE WITH OPEN MOUTH AND RAISED EYEBROWS] U+E415 -> U+1F616
+  ["ee9093", :undef], # [CRYING FACE] U+E413 -> U+1F617
+  ["ee9091", :undef], # [LOUDLY CRYING FACE] U+E411 -> U+1F618
+  ["ee908b", :undef], # [FEARFUL FACE] U+E40B -> U+1F619
+  ["ee9086", :undef], # [PERSEVERING FACE] U+E406 -> U+1F61A
+  ["ee9096", :undef], # [POUTING FACE] U+E416 -> U+1F61B
+  ["ee908a", :undef], # [RELIEVED FACE] U+E40A -> U+1F61C
+  ["ee9087", :undef], # [CONFOUNDED FACE] U+E407 -> U+1F61D
+  ["ee9083", :undef], # [PENSIVE FACE] U+E403 -> U+1F61E
+  ["ee8487", :undef], # [FACE SCREAMING IN FEAR] U+E107 -> U+1F61F
+  ["ee9088", :undef], # [SLEEPY FACE] U+E408 -> U+1F620
+  ["ee9082", :undef], # [SMIRKING FACE] U+E402 -> U+1F621
+  ["ee8488", :undef], # [FACE WITH COLD SWEAT] U+E108 -> U+1F622
+  ["ee9081", :undef], # [DISAPPOINTED BUT RELIEVED FACE] U+E401 -> U+1F623
+  ["ee9085", :undef], # [WINKING FACE] U+E405 -> U+1F625
+  ["ee90a3", :undef], # [FACE WITH NO GOOD GESTURE] U+E423 -> U+1F634
+  ["ee90a4", :undef], # [FACE WITH OK GESTURE] U+E424 -> U+1F635
+  ["ee90a6", :undef], # [PERSON BOWING DEEPLY] U+E426 -> U+1F636
+  ["ee90a7", :undef], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+E427 -> U+1F63B
+  ["ee909d", :undef], # [PERSON WITH FOLDED HANDS] U+E41D -> U+1F63E
+  ["ee80b6", :undef], # [HOUSE BUILDING] U+E036 -> U+1F3E0
+  ["ee80b8", :undef], # [OFFICE BUILDING] U+E038 -> U+1F3E2
+  ["ee8593", :undef], # [JAPANESE POST OFFICE] U+E153 -> U+1F3E3
+  ["ee8595", :undef], # [HOSPITAL] U+E155 -> U+1F3E5
+  ["ee858d", :undef], # [BANK] U+E14D -> U+1F3E6
+  ["ee8594", :undef], # [AUTOMATED TELLER MACHINE] U+E154 -> U+1F3E7
+  ["ee8598", :undef], # [HOTEL] U+E158 -> U+1F3E8
+  ["ee9481", :undef], # [LOVE HOTEL] U+E501 -> U+1F3E9
+  ["ee8596", :undef], # [CONVENIENCE STORE] U+E156 -> U+1F3EA
+  ["ee8597", :undef], # [SCHOOL] U+E157 -> U+1F3EB
+  ["ee80b7", "e29baa"], # [CHURCH] U+E037 -> U+26EA
+  ["ee84a1", "e29bb2"], # [FOUNTAIN] U+E121 -> U+26F2
+  ["ee9484", :undef], # [DEPARTMENT STORE] U+E504 -> U+1F3EC
+  ["ee9485", :undef], # [JAPANESE CASTLE] U+E505 -> U+1F3EF
+  ["ee9486", :undef], # [EUROPEAN CASTLE] U+E506 -> U+1F3F0
+  ["ee9488", :undef], # [FACTORY] U+E508 -> U+1F3ED
+  ["ee80bb", :undef], # [MOUNT FUJI] U+E03B -> U+1F5FB
+  ["ee9489", :undef], # [TOKYO TOWER] U+E509 -> U+1F5FC
+  ["ee949d", :undef], # [STATUE OF LIBERTY] U+E51D -> U+1F5FD
+  ["ee8087", :undef], # [ATHLETIC SHOE] U+E007 -> U+1F45F
+  ["ee84be", :undef], # [HIGH-HEELED SHOE] U+E13E -> U+1F460
+  ["ee8c9a", :undef], # [WOMANS SANDAL] U+E31A -> U+1F461
+  ["ee8c9b", :undef], # [WOMANS BOOTS] U+E31B -> U+1F462
+  ["ee94b6", :undef], # [FOOTPRINTS] U+E536 -> U+1F463
+  ["ee8086", :undef], # [T-SHIRT] U+E006 -> U+1F455
+  ["ee848e", :undef], # [CROWN] U+E10E -> U+1F451
+  ["ee8c82", :undef], # [NECKTIE] U+E302 -> U+1F454
+  ["ee8c98", :undef], # [WOMANS HAT] U+E318 -> U+1F452
+  ["ee8c99", :undef], # [DRESS] U+E319 -> U+1F457
+  ["ee8ca1", :undef], # [KIMONO] U+E321 -> U+1F458
+  ["ee8ca2", :undef], # [BIKINI] U+E322 -> U+1F459
+  ["ee8ca3", :undef], # [HANDBAG] U+E323 -> U+1F45C
+  ["ee84af", :undef], # [MONEY BAG] U+E12F -> U+1F4B0
+  ["ee8589", :undef], # [CURRENCY EXCHANGE] U+E149 -> U+1F4B1
+  ["ee858a", :undef], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+E14A -> U+1F4B9
+  ["ee9493", "f09f87a8f09f87b3"], # [REGIONAL INDICATOR SYMBOL LETTERS CN] U+E513 -> U+1F1E8 U+1F1F3
+  ["ee948e", "f09f87a9f09f87aa"], # [REGIONAL INDICATOR SYMBOL LETTERS DE] U+E50E -> U+1F1E9 U+1F1EA
+  ["ee9491", "f09f87aaf09f87b8"], # [REGIONAL INDICATOR SYMBOL LETTERS ES] U+E511 -> U+1F1EA U+1F1F8
+  ["ee948d", "f09f87abf09f87b7"], # [REGIONAL INDICATOR SYMBOL LETTERS FR] U+E50D -> U+1F1EB U+1F1F7
+  ["ee9490", "f09f87baf09f87b0"], # [REGIONAL INDICATOR SYMBOL LETTERS GB] U+E510 -> U+1F1FA U+1F1F0
+  ["ee948f", "f09f87aef09f87b9"], # [REGIONAL INDICATOR SYMBOL LETTERS IT] U+E50F -> U+1F1EE U+1F1F9
+  ["ee948b", "f09f87aff09f87b5"], # [REGIONAL INDICATOR SYMBOL LETTERS JP] U+E50B -> U+1F1EF U+1F1F5
+  ["ee9494", "f09f87b0f09f87b7"], # [REGIONAL INDICATOR SYMBOL LETTERS KR] U+E514 -> U+1F1F0 U+1F1F7
+  ["ee9492", "f09f87b7f09f87ba"], # [REGIONAL INDICATOR SYMBOL LETTERS RU] U+E512 -> U+1F1F7 U+1F1FA
+  ["ee948c", "f09f87baf09f87b8"], # [REGIONAL INDICATOR SYMBOL LETTERS US] U+E50C -> U+1F1FA U+1F1F8
+  ["ee849d", :undef], # [FIRE] U+E11D -> U+1F525
+  ["ee8496", :undef], # [HAMMER] U+E116 -> U+1F528
+  ["ee8493", :undef], # [PISTOL] U+E113 -> U+1F52B
+  ["ee88be", :undef], # [SIX POINTED STAR WITH MIDDLE DOT] U+E23E -> U+1F52F
+  ["ee8889", :undef], # [JAPANESE SYMBOL FOR BEGINNER] U+E209 -> U+1F530
+  ["ee80b1", :undef], # [TRIDENT EMBLEM] U+E031 -> U+1F531
+  ["ee84bb", :undef], # [SYRINGE] U+E13B -> U+1F489
+  ["ee8c8f", :undef], # [PILL] U+E30F -> U+1F48A
+  ["ee94b2", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+E532 -> U+1F170
+  ["ee94b3", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+E533 -> U+1F171
+  ["ee94b4", :undef], # [NEGATIVE SQUARED AB] U+E534 -> U+1F18E
+  ["ee94b5", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+E535 -> U+1F17E
+  ["ee8c94", :undef], # [RIBBON] U+E314 -> U+1F380
+  ["ee8492", :undef], # [WRAPPED PRESENT] U+E112 -> U+1F381
+  ["ee8d8b", :undef], # [BIRTHDAY CAKE] U+E34B -> U+1F382
+  ["ee80b3", :undef], # [CHRISTMAS TREE] U+E033 -> U+1F384
+  ["ee9188", :undef], # [FATHER CHRISTMAS] U+E448 -> U+1F385
+  ["ee8583", :undef], # [CROSSED FLAGS] U+E143 -> U+1F38C
+  ["ee8497", :undef], # [FIREWORKS] U+E117 -> U+1F386
+  ["ee8c90", :undef], # [BALLOON] U+E310 -> U+1F388
+  ["ee8c92", :undef], # [PARTY POPPER] U+E312 -> U+1F389
+  ["ee90b6", :undef], # [PINE DECORATION] U+E436 -> U+1F38D
+  ["ee90b8", :undef], # [JAPANESE DOLLS] U+E438 -> U+1F38E
+  ["ee90b9", :undef], # [GRADUATION CAP] U+E439 -> U+1F393
+  ["ee90ba", :undef], # [SCHOOL SATCHEL] U+E43A -> U+1F392
+  ["ee90bb", :undef], # [CARP STREAMER] U+E43B -> U+1F38F
+  ["ee9180", :undef], # [FIREWORK SPARKLER] U+E440 -> U+1F387
+  ["ee9182", :undef], # [WIND CHIME] U+E442 -> U+1F390
+  ["ee9185", :undef], # [JACK-O-LANTERN] U+E445 -> U+1F383
+  ["ee9186", :undef], # [MOON VIEWING CEREMONY] U+E446 -> U+1F391
+  ["ee8089", "e2988e"], # [BLACK TELEPHONE] U+E009 -> U+260E
+  ["ee808a", :undef], # [MOBILE PHONE] U+E00A -> U+1F4F1
+  ["ee8484", :undef], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+E104 -> U+1F4F2
+  ["ee8c81", :undef], # [MEMO] U+E301 -> U+1F4DD
+  ["ee808b", :undef], # [FAX MACHINE] U+E00B -> U+1F4E0
+  ["ee8483", :undef], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+E103 -> U+1F4E9
+  ["ee8481", :undef], # [CLOSED MAILBOX WITH RAISED FLAG] U+E101 -> U+1F4EB
+  ["ee8482", :undef], # [POSTBOX] U+E102 -> U+1F4EE
+  ["ee8582", :undef], # [PUBLIC ADDRESS LOUDSPEAKER] U+E142 -> U+1F4E2
+  ["ee8c97", :undef], # [CHEERING MEGAPHONE] U+E317 -> U+1F4E3
+  ["ee858b", :undef], # [SATELLITE ANTENNA] U+E14B -> U+1F4E1
+  ["ee849f", :undef], # [SEAT] U+E11F -> U+1F4BA
+  ["ee808c", :undef], # [PERSONAL COMPUTER] U+E00C -> U+1F4BB
+  ["ee849e", :undef], # [BRIEFCASE] U+E11E -> U+1F4BC
+  ["ee8c96", :undef], # [MINIDISC] U+E316 -> U+1F4BD
+  ["ee84a6", :undef], # [OPTICAL DISC] U+E126 -> U+1F4BF
+  ["ee84a7", :undef], # [DVD] U+E127 -> U+1F4C0
+  ["ee8c93", "e29c82"], # [BLACK SCISSORS] U+E313 -> U+2702
+  ["ee8588", :undef], # [OPEN BOOK] U+E148 -> U+1F4D6
+  ["ee8096", "e29abe"], # [BASEBALL] U+E016 -> U+26BE
+  ["ee8094", "e29bb3"], # [FLAG IN HOLE] U+E014 -> U+26F3
+  ["ee8095", :undef], # [TENNIS RACQUET AND BALL] U+E015 -> U+1F3BE
+  ["ee8098", "e29abd"], # [SOCCER BALL] U+E018 -> U+26BD
+  ["ee8093", :undef], # [SKI AND SKI BOOT] U+E013 -> U+1F3BF
+  ["ee90aa", :undef], # [BASKETBALL AND HOOP] U+E42A -> U+1F3C0
+  ["ee84b2", :undef], # [CHEQUERED FLAG] U+E132 -> U+1F3C1
+  ["ee8495", :undef], # [RUNNER] U+E115 -> U+1F3C3
+  ["ee8097", :undef], # [SURFER] U+E017 -> U+1F3C4
+  ["ee84b1", :undef], # [TROPHY] U+E131 -> U+1F3C6
+  ["ee90ab", :undef], # [AMERICAN FOOTBALL] U+E42B -> U+1F3C8
+  ["ee90ad", :undef], # [SWIMMER] U+E42D -> U+1F3CA
+  ["ee809e", :undef], # [TRAIN] U+E01E -> U+1F686
+  ["ee90b4", :undef], # [METRO] U+E434 -> U+1F687
+  ["ee90b5", :undef], # [HIGH-SPEED TRAIN] U+E435 -> U+1F684
+  ["ee809f", :undef], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+E01F -> U+1F685
+  ["ee809b", :undef], # [AUTOMOBILE] U+E01B -> U+1F697
+  ["ee90ae", :undef], # [RECREATIONAL VEHICLE] U+E42E -> U+1F699
+  ["ee8599", :undef], # [ONCOMING BUS] U+E159 -> U+1F68D
+  ["ee8590", :undef], # [BUS STOP] U+E150 -> U+1F68F
+  ["ee8882", :undef], # [SHIP] U+E202 -> U+1F6A2
+  ["ee809d", "e29c88"], # [AIRPLANE] U+E01D -> U+2708
+  ["ee809c", "e29bb5"], # [SAILBOAT] U+E01C -> U+26F5
+  ["ee80b9", :undef], # [STATION] U+E039 -> U+1F689
+  ["ee848d", :undef], # [ROCKET] U+E10D -> U+1F680
+  ["ee84b5", :undef], # [SPEEDBOAT] U+E135 -> U+1F6A4
+  ["ee859a", :undef], # [TAXI] U+E15A -> U+1F695
+  ["ee90af", :undef], # [DELIVERY TRUCK] U+E42F -> U+1F69A
+  ["ee90b0", :undef], # [FIRE ENGINE] U+E430 -> U+1F692
+  ["ee90b1", :undef], # [AMBULANCE] U+E431 -> U+1F691
+  ["ee90b2", :undef], # [POLICE CAR] U+E432 -> U+1F693
+  ["ee80ba", "e29bbd"], # [FUEL PUMP] U+E03A -> U+26FD
+  ["ee858f", "f09f85bf"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+E14F -> U+1F17F
+  ["ee858e", :undef], # [HORIZONTAL TRAFFIC LIGHT] U+E14E -> U+1F6A5
+  ["ee84b7", :undef], # [CONSTRUCTION SIGN] U+E137 -> U+1F6A7
+  ["ee84a3", "e299a8"], # [HOT SPRINGS] U+E123 -> U+2668
+  ["ee84a2", "e29bba"], # [TENT] U+E122 -> U+26FA
+  ["ee84a4", :undef], # [FERRIS WHEEL] U+E124 -> U+1F3A1
+  ["ee90b3", :undef], # [ROLLER COASTER] U+E433 -> U+1F3A2
+  ["ee80bc", :undef], # [MICROPHONE] U+E03C -> U+1F3A4
+  ["ee80bd", :undef], # [MOVIE CAMERA] U+E03D -> U+1F3A5
+  ["ee9487", :undef], # [CINEMA] U+E507 -> U+1F3A6
+  ["ee8c8a", :undef], # [HEADPHONE] U+E30A -> U+1F3A7
+  ["ee9482", :undef], # [ARTIST PALETTE] U+E502 -> U+1F3A8
+  ["ee9483", :undef], # [TOP HAT] U+E503 -> U+1F3A9
+  ["ee84a5", :undef], # [TICKET] U+E125 -> U+1F3AB
+  ["ee8ca4", :undef], # [CLAPPER BOARD] U+E324 -> U+1F3AC
+  ["ee84ad", "f09f8084"], # [MAHJONG TILE RED DRAGON] U+E12D -> U+1F004
+  ["ee84b0", :undef], # [DIRECT HIT] U+E130 -> U+1F3AF
+  ["ee84b3", :undef], # [SLOT MACHINE] U+E133 -> U+1F3B0
+  ["ee90ac", :undef], # [BILLIARDS] U+E42C -> U+1F3B1
+  ["ee80be", :undef], # [MUSICAL NOTE] U+E03E -> U+1F3B5
+  ["ee8ca6", :undef], # [MULTIPLE MUSICAL NOTES] U+E326 -> U+1F3B6
+  ["ee8180", :undef], # [SAXOPHONE] U+E040 -> U+1F3B7
+  ["ee8181", :undef], # [GUITAR] U+E041 -> U+1F3B8
+  ["ee8182", :undef], # [TRUMPET] U+E042 -> U+1F3BA
+  ["ee84ac", "e380bd"], # [PART ALTERNATION MARK] U+E12C -> U+303D
+  ["ee8088", :undef], # [CAMERA] U+E008 -> U+1F4F7
+  ["ee84aa", :undef], # [TELEVISION] U+E12A -> U+1F4FA
+  ["ee84a8", :undef], # [RADIO] U+E128 -> U+1F4FB
+  ["ee84a9", :undef], # [VIDEOCASSETTE] U+E129 -> U+1F4FC
+  ["ee8083", :undef], # [KISS MARK] U+E003 -> U+1F48B
+  ["ee80b4", :undef], # [RING] U+E034 -> U+1F48D
+  ["ee80b5", :undef], # [GEM STONE] U+E035 -> U+1F48E
+  ["ee8491", :undef], # [KISS] U+E111 -> U+1F48F
+  ["ee8c86", :undef], # [BOUQUET] U+E306 -> U+1F490
+  ["ee90a5", :undef], # [COUPLE WITH HEART] U+E425 -> U+1F491
+  ["ee90bd", :undef], # [WEDDING] U+E43D -> U+1F492
+  ["ee8887", :undef], # [NO ONE UNDER EIGHTEEN SYMBOL] U+E207 -> U+1F51E
+  ["ee898e", "c2a9"], # [COPYRIGHT SIGN] U+E24E -> U+A9
+  ["ee898f", "c2ae"], # [REGISTERED SIGN] U+E24F -> U+AE
+  ["ee94b7", "e284a2"], # [TRADE MARK SIGN] U+E537 -> U+2122
+  ["ee8890", "23e283a3"], # [HASH KEY] U+E210 -> U+23 U+20E3
+  ["ee889c", "31e283a3"], # [KEYCAP 1] U+E21C -> U+31 U+20E3
+  ["ee889d", "32e283a3"], # [KEYCAP 2] U+E21D -> U+32 U+20E3
+  ["ee889e", "33e283a3"], # [KEYCAP 3] U+E21E -> U+33 U+20E3
+  ["ee889f", "34e283a3"], # [KEYCAP 4] U+E21F -> U+34 U+20E3
+  ["ee88a0", "35e283a3"], # [KEYCAP 5] U+E220 -> U+35 U+20E3
+  ["ee88a1", "36e283a3"], # [KEYCAP 6] U+E221 -> U+36 U+20E3
+  ["ee88a2", "37e283a3"], # [KEYCAP 7] U+E222 -> U+37 U+20E3
+  ["ee88a3", "38e283a3"], # [KEYCAP 8] U+E223 -> U+38 U+20E3
+  ["ee88a4", "39e283a3"], # [KEYCAP 9] U+E224 -> U+39 U+20E3
+  ["ee88a5", "30e283a3"], # [KEYCAP 0] U+E225 -> U+30 U+20E3
+  ["ee888b", :undef], # [ANTENNA WITH BARS] U+E20B -> U+1F4F6
+  ["ee8990", :undef], # [VIBRATION MODE] U+E250 -> U+1F4F3
+  ["ee8991", :undef], # [MOBILE PHONE OFF] U+E251 -> U+1F4F4
+  ["ee84a0", :undef], # [HAMBURGER] U+E120 -> U+1F354
+  ["ee8d82", :undef], # [RICE BALL] U+E342 -> U+1F359
+  ["ee8186", :undef], # [SHORTCAKE] U+E046 -> U+1F370
+  ["ee8d80", :undef], # [STEAMING BOWL] U+E340 -> U+1F35C
+  ["ee8cb9", :undef], # [BREAD] U+E339 -> U+1F35E
+  ["ee8587", :undef], # [COOKING] U+E147 -> U+1F373
+  ["ee8cba", :undef], # [SOFT ICE CREAM] U+E33A -> U+1F366
+  ["ee8cbb", :undef], # [FRENCH FRIES] U+E33B -> U+1F35F
+  ["ee8cbc", :undef], # [DANGO] U+E33C -> U+1F361
+  ["ee8cbd", :undef], # [RICE CRACKER] U+E33D -> U+1F358
+  ["ee8cbe", :undef], # [COOKED RICE] U+E33E -> U+1F35A
+  ["ee8cbf", :undef], # [SPAGHETTI] U+E33F -> U+1F35D
+  ["ee8d81", :undef], # [CURRY AND RICE] U+E341 -> U+1F35B
+  ["ee8d83", :undef], # [ODEN] U+E343 -> U+1F362
+  ["ee8d84", :undef], # [SUSHI] U+E344 -> U+1F363
+  ["ee8d8c", :undef], # [BENTO BOX] U+E34C -> U+1F371
+  ["ee8d8d", :undef], # [POT OF FOOD] U+E34D -> U+1F372
+  ["ee90bf", :undef], # [SHAVED ICE] U+E43F -> U+1F367
+  ["ee8183", :undef], # [FORK AND KNIFE] U+E043 -> U+1F374
+  ["ee8185", "e29895"], # [HOT BEVERAGE] U+E045 -> U+2615
+  ["ee8184", :undef], # [COCKTAIL GLASS] U+E044 -> U+1F378
+  ["ee8187", :undef], # [BEER MUG] U+E047 -> U+1F37A
+  ["ee8cb8", :undef], # [TEACUP WITHOUT HANDLE] U+E338 -> U+1F375
+  ["ee8c8b", :undef], # [SAKE BOTTLE AND CUP] U+E30B -> U+1F376
+  ["ee8c8c", :undef], # [CLINKING BEER MUGS] U+E30C -> U+1F37B
+  ["ee88b6", "e28697"], # [NORTH EAST ARROW] U+E236 -> U+2197
+  ["ee88b8", "e28698"], # [SOUTH EAST ARROW] U+E238 -> U+2198
+  ["ee88b7", "e28696"], # [NORTH WEST ARROW] U+E237 -> U+2196
+  ["ee88b9", "e28699"], # [SOUTH WEST ARROW] U+E239 -> U+2199
+  ["ee88b2", "e2ac86"], # [UPWARDS BLACK ARROW] U+E232 -> U+2B06
+  ["ee88b3", "e2ac87"], # [DOWNWARDS BLACK ARROW] U+E233 -> U+2B07
+  ["ee88b4", "e29ea1"], # [BLACK RIGHTWARDS ARROW] U+E234 -> U+27A1
+  ["ee88b5", "e2ac85"], # [LEFTWARDS BLACK ARROW] U+E235 -> U+2B05
+  ["ee88ba", "e296b6"], # [BLACK RIGHT-POINTING TRIANGLE] U+E23A -> U+25B6
+  ["ee88bb", "e29780"], # [BLACK LEFT-POINTING TRIANGLE] U+E23B -> U+25C0
+  ["ee88bc", :undef], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+E23C -> U+23E9
+  ["ee88bd", :undef], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+E23D -> U+23EA
+  ["ee8cb2", "e2ad95"], # [HEAVY LARGE CIRCLE] U+E332 -> U+2B55
+  ["ee8cb3", :undef], # [CROSS MARK] U+E333 -> U+274C
+  ["ee80a1", "e29da2"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+E021 -> U+2762
+  ["ee80a0", :undef], # [BLACK QUESTION MARK ORNAMENT] U+E020 -> U+2753
+  ["ee8cb6", :undef], # [WHITE QUESTION MARK ORNAMENT] U+E336 -> U+2754
+  ["ee8cb7", :undef], # [WHITE EXCLAMATION MARK ORNAMENT] U+E337 -> U+2755
+  ["ee8891", :undef], # [DOUBLE CURLY LOOP] U+E211 -> U+27BF
+  ["ee80a2", "e29da4"], # [HEAVY BLACK HEART] U+E022 -> U+2764
+  ["ee8ca7", :undef], # [BEATING HEART] U+E327 -> U+1F493
+  ["ee80a3", :undef], # [BROKEN HEART] U+E023 -> U+1F494
+  ["ee8ca8", :undef], # [GROWING HEART] U+E328 -> U+1F497
+  ["ee8ca9", :undef], # [HEART WITH ARROW] U+E329 -> U+1F498
+  ["ee8caa", :undef], # [BLUE HEART] U+E32A -> U+1F499
+  ["ee8cab", :undef], # [GREEN HEART] U+E32B -> U+1F49A
+  ["ee8cac", :undef], # [YELLOW HEART] U+E32C -> U+1F49B
+  ["ee8cad", :undef], # [PURPLE HEART] U+E32D -> U+1F49C
+  ["ee90b7", :undef], # [HEART WITH RIBBON] U+E437 -> U+1F49D
+  ["ee8884", :undef], # [HEART DECORATION] U+E204 -> U+1F49F
+  ["ee888c", "e299a5"], # [BLACK HEART SUIT] U+E20C -> U+2665
+  ["ee888e", "e299a0"], # [BLACK SPADE SUIT] U+E20E -> U+2660
+  ["ee888d", "e299a6"], # [BLACK DIAMOND SUIT] U+E20D -> U+2666
+  ["ee888f", "e299a3"], # [BLACK CLUB SUIT] U+E20F -> U+2663
+  ["ee8c8e", :undef], # [SMOKING SYMBOL] U+E30E -> U+1F6AC
+  ["ee8888", :undef], # [NO SMOKING SYMBOL] U+E208 -> U+1F6AD
+  ["ee888a", "e299bf"], # [WHEELCHAIR SYMBOL] U+E20A -> U+267F
+  ["ee8992", "e29aa0"], # [WARNING SIGN] U+E252 -> U+26A0
+  ["ee84b6", :undef], # [BICYCLE] U+E136 -> U+1F6B2
+  ["ee8881", :undef], # [PEDESTRIAN] U+E201 -> U+1F6B6
+  ["ee84b8", :undef], # [MENS SYMBOL] U+E138 -> U+1F6B9
+  ["ee84b9", :undef], # [WOMENS SYMBOL] U+E139 -> U+1F6BA
+  ["ee84bf", :undef], # [BATH] U+E13F -> U+1F6C0
+  ["ee8591", :undef], # [RESTROOM] U+E151 -> U+1F6BB
+  ["ee8580", :undef], # [TOILET] U+E140 -> U+1F6BD
+  ["ee8c89", :undef], # [WATER CLOSET] U+E309 -> U+1F6BE
+  ["ee84ba", :undef], # [BABY SYMBOL] U+E13A -> U+1F6BC
+  ["ee8894", :undef], # [SQUARED COOL] U+E214 -> U+1F192
+  ["ee88a9", :undef], # [SQUARED ID] U+E229 -> U+1F194
+  ["ee8892", :undef], # [SQUARED NEW] U+E212 -> U+1F195
+  ["ee898d", :undef], # [SQUARED OK] U+E24D -> U+1F197
+  ["ee8893", :undef], # [SQUARED UP WITH EXCLAMATION MARK] U+E213 -> U+1F199
+  ["ee84ae", :undef], # [SQUARED VS] U+E12E -> U+1F19A
+  ["ee8883", :undef], # [SQUARED KATAKANA KOKO] U+E203 -> U+1F201
+  ["ee88a8", :undef], # [SQUARED KATAKANA SA] U+E228 -> U+1F202
+  ["ee88ab", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+E22B -> U+1F233
+  ["ee88aa", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+E22A -> U+1F235
+  ["ee8895", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6709] U+E215 -> U+1F236
+  ["ee8896", "f09f889a"], # [SQUARED CJK UNIFIED IDEOGRAPH-7121] U+E216 -> U+1F21A
+  ["ee8897", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6708] U+E217 -> U+1F237
+  ["ee8898", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7533] U+E218 -> U+1F238
+  ["ee88a7", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+E227 -> U+1F239
+  ["ee88ac", "f09f88af"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+E22C -> U+1F22F
+  ["ee88ad", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+E22D -> U+1F23A
+  ["ee8c95", "e38a99"], # [CIRCLED IDEOGRAPH SECRET] U+E315 -> U+3299
+  ["ee8c8d", "e38a97"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+E30D -> U+3297
+  ["ee88a6", :undef], # [CIRCLED IDEOGRAPH ADVANTAGE] U+E226 -> U+1F250
+  ["ee848f", :undef], # [ELECTRIC LIGHT BULB] U+E10F -> U+1F4A1
+  ["ee8cb4", :undef], # [ANGER SYMBOL] U+E334 -> U+1F4A2
+  ["ee8c91", :undef], # [BOMB] U+E311 -> U+1F4A3
+  ["ee84bc", :undef], # [SLEEPING SYMBOL] U+E13C -> U+1F4A4
+  ["ee8cb1", :undef], # [SPLASHING SWEAT SYMBOL] U+E331 -> U+1F4A6
+  ["ee8cb0", :undef], # [DASH SYMBOL] U+E330 -> U+1F4A8
+  ["ee819a", :undef], # [PILE OF POO] U+E05A -> U+1F4A9
+  ["ee858c", :undef], # [FLEXED BICEPS] U+E14C -> U+1F4AA
+  ["ee8cae", :undef], # [SPARKLES] U+E32E -> U+2728
+  ["ee8885", "e29cb4"], # [EIGHT POINTED BLACK STAR] U+E205 -> U+2734
+  ["ee8886", "e29cb3"], # [EIGHT SPOKED ASTERISK] U+E206 -> U+2733
+  ["ee8899", :undef], # [LARGE RED CIRCLE] U+E219 -> U+1F534
+  ["ee889a", :undef], # [BLACK SQUARE BUTTON] U+E21A -> U+1F532
+  ["ee889b", :undef], # [WHITE SQUARE BUTTON] U+E21B -> U+1F533
+  ["ee8caf", "e2ad90"], # [WHITE MEDIUM STAR] U+E32F -> U+2B50
+  ["ee8581", :undef], # [SPEAKER WITH THREE SOUND WAVES] U+E141 -> U+1F50A
+  ["ee8494", :undef], # [LEFT-POINTING MAGNIFYING GLASS] U+E114 -> U+1F50D
+  ["ee8584", :undef], # [LOCK] U+E144 -> U+1F512
+  ["ee8585", :undef], # [OPEN LOCK] U+E145 -> U+1F513
+  ["ee80bf", :undef], # [KEY] U+E03F -> U+1F511
+  ["ee8ca5", :undef], # [BELL] U+E325 -> U+1F514
+  ["ee898c", :undef], # [TOP WITH UPWARDS ARROW ABOVE] U+E24C -> U+1F51D
+  ["ee8090", :undef], # [RAISED FIST] U+E010 -> U+270A
+  ["ee8092", :undef], # [RAISED HAND] U+E012 -> U+270B
+  ["ee8091", "e29c8c"], # [VICTORY HAND] U+E011 -> U+270C
+  ["ee808d", :undef], # [FISTED HAND SIGN] U+E00D -> U+1F44A
+  ["ee808e", :undef], # [THUMBS UP SIGN] U+E00E -> U+1F44D
+  ["ee808f", "e2989d"], # [WHITE UP POINTING INDEX] U+E00F -> U+261D
+  ["ee88ae", :undef], # [WHITE UP POINTING BACKHAND INDEX] U+E22E -> U+1F446
+  ["ee88af", :undef], # [WHITE DOWN POINTING BACKHAND INDEX] U+E22F -> U+1F447
+  ["ee88b0", :undef], # [WHITE LEFT POINTING BACKHAND INDEX] U+E230 -> U+1F448
+  ["ee88b1", :undef], # [WHITE RIGHT POINTING BACKHAND INDEX] U+E231 -> U+1F449
+  ["ee909e", :undef], # [WAVING HAND SIGN] U+E41E -> U+1F44B
+  ["ee909f", :undef], # [CLAPPING HANDS SIGN] U+E41F -> U+1F44F
+  ["ee90a0", :undef], # [OK HAND SIGN] U+E420 -> U+1F44C
+  ["ee90a1", :undef], # [THUMBS DOWN SIGN] U+E421 -> U+1F44E
+  ["ee90a2", :undef], # [OPEN HANDS SIGN] U+E422 -> U+1F450
+  ["ee94b8", :undef], # [EMOJI COMPATIBILITY SYMBOL-50] U+E538 -> U+3013 (GETA)
+  ["ee94b9", :undef], # [EMOJI COMPATIBILITY SYMBOL-51] U+E539 -> U+3013 (GETA)
+  ["ee94ba", :undef], # [EMOJI COMPATIBILITY SYMBOL-52] U+E53A -> U+3013 (GETA)
+  ["ee94bb", :undef], # [EMOJI COMPATIBILITY SYMBOL-53] U+E53B -> U+3013 (GETA)
+  ["ee94bc", :undef], # [EMOJI COMPATIBILITY SYMBOL-54] U+E53C -> "[v"
+  ["ee94bd", :undef], # [EMOJI COMPATIBILITY SYMBOL-55] U+E53D -> "oda"
+  ["ee94be", :undef], # [EMOJI COMPATIBILITY SYMBOL-56] U+E53E -> "fone]"
+  ["ee8994", :undef], # [EMOJI COMPATIBILITY SYMBOL-57] U+E254 -> U+3013 (GETA)
+  ["ee8995", :undef], # [EMOJI COMPATIBILITY SYMBOL-58] U+E255 -> U+3013 (GETA)
+  ["ee8996", :undef], # [EMOJI COMPATIBILITY SYMBOL-59] U+E256 -> U+3013 (GETA)
+  ["ee8997", :undef], # [EMOJI COMPATIBILITY SYMBOL-60] U+E257 -> U+3013 (GETA)
+  ["ee8998", :undef], # [EMOJI COMPATIBILITY SYMBOL-61] U+E258 -> U+3013 (GETA)
+  ["ee8999", :undef], # [EMOJI COMPATIBILITY SYMBOL-62] U+E259 -> U+3013 (GETA)
+  ["ee899a", :undef], # [EMOJI COMPATIBILITY SYMBOL-63] U+E25A -> U+3013 (GETA)
+  ["ee948a", :undef], # [EMOJI COMPATIBILITY SYMBOL-64] U+E50A -> U+3013 (GETA)
+]
+
+EMOJI_EXCHANGE_TBL['UTF-8']['UTF8-DoCoMo'] = [
+  ["e29880", "ee98be"], # [BLACK SUN WITH RAYS] U+2600 -> U+E63E
+  ["e29881", "ee98bf"], # [CLOUD] U+2601 -> U+E63F
+  ["e29894", "ee9980"], # [UMBRELLA WITH RAIN DROPS] U+2614 -> U+E640
+  ["e29b84", "ee9981"], # [SNOWMAN WITHOUT SNOW] U+26C4 -> U+E641
+  ["e29aa1", "ee9982"], # [HIGH VOLTAGE SIGN] U+26A1 -> U+E642
+  ["f09f8c80", "ee9983"], # [CYCLONE] U+1F300 -> U+E643
+  ["f09f8c81", "ee9984"], # [FOGGY] U+1F301 -> U+E644
+  ["f09f8c82", "ee9985"], # [CLOSED UMBRELLA] U+1F302 -> U+E645
+  ["f09f8c83", "ee9ab3"], # [NIGHT WITH STARS] U+1F303 -> U+E6B3
+  ["f09f8c84", "ee98be"], # [SUNRISE OVER MOUNTAINS] U+1F304 -> U+E63E
+  ["f09f8c85", "ee98be"], # [SUNRISE] U+1F305 -> U+E63E
+  ["f09f8c87", "ee98be"], # [SUNSET OVER BUILDINGS] U+1F307 -> U+E63E
+  ["f09f8c88", :undef], # [RAINBOW] U+1F308 -> "[虹]"
+  ["e29d84", :undef], # [SNOWFLAKE] U+2744 -> "[雪結晶]"
+  ["e29b85", "ee98beee98bf"], # [SUN BEHIND CLOUD] U+26C5 -> U+E63E U+E63F
+  ["f09f8c89", "ee9ab3"], # [BRIDGE AT NIGHT] U+1F309 -> U+E6B3
+  ["f09f8c8a", "ee9cbf"], # [WATER WAVE] U+1F30A -> U+E73F
+  ["f09f8c8b", :undef], # [VOLCANO] U+1F30B -> "[火山]"
+  ["f09f8c8c", "ee9ab3"], # [MILKY WAY] U+1F30C -> U+E6B3
+  ["f09f8c8f", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+1F30F -> "[地球]"
+  ["f09f8c91", "ee9a9c"], # [NEW MOON SYMBOL] U+1F311 -> U+E69C
+  ["f09f8c94", "ee9a9d"], # [WAXING GIBBOUS MOON SYMBOL] U+1F314 -> U+E69D
+  ["f09f8c93", "ee9a9e"], # [FIRST QUARTER MOON SYMBOL] U+1F313 -> U+E69E
+  ["f09f8c99", "ee9a9f"], # [CRESCENT MOON] U+1F319 -> U+E69F
+  ["f09f8c95", "ee9aa0"], # [FULL MOON SYMBOL] U+1F315 -> U+E6A0
+  ["f09f8c9b", "ee9a9e"], # [FIRST QUARTER MOON WITH FACE] U+1F31B -> U+E69E
+  ["f09f8c9f", :undef], # [GLOWING STAR] U+1F31F -> "[☆]"
+  ["f09f8ca0", :undef], # [SHOOTING STAR] U+1F320 -> "☆彡"
+  ["f09f9590", "ee9aba"], # [CLOCK FACE ONE OCLOCK] U+1F550 -> U+E6BA
+  ["f09f9591", "ee9aba"], # [CLOCK FACE TWO OCLOCK] U+1F551 -> U+E6BA
+  ["f09f9592", "ee9aba"], # [CLOCK FACE THREE OCLOCK] U+1F552 -> U+E6BA
+  ["f09f9593", "ee9aba"], # [CLOCK FACE FOUR OCLOCK] U+1F553 -> U+E6BA
+  ["f09f9594", "ee9aba"], # [CLOCK FACE FIVE OCLOCK] U+1F554 -> U+E6BA
+  ["f09f9595", "ee9aba"], # [CLOCK FACE SIX OCLOCK] U+1F555 -> U+E6BA
+  ["f09f9596", "ee9aba"], # [CLOCK FACE SEVEN OCLOCK] U+1F556 -> U+E6BA
+  ["f09f9597", "ee9aba"], # [CLOCK FACE EIGHT OCLOCK] U+1F557 -> U+E6BA
+  ["f09f9598", "ee9aba"], # [CLOCK FACE NINE OCLOCK] U+1F558 -> U+E6BA
+  ["f09f9599", "ee9aba"], # [CLOCK FACE TEN OCLOCK] U+1F559 -> U+E6BA
+  ["f09f959a", "ee9aba"], # [CLOCK FACE ELEVEN OCLOCK] U+1F55A -> U+E6BA
+  ["f09f959b", "ee9aba"], # [CLOCK FACE TWELVE OCLOCK] U+1F55B -> U+E6BA
+  ["e28c9a", "ee9c9f"], # [WATCH] U+231A -> U+E71F
+  ["e28c9b", "ee9c9c"], # [HOURGLASS] U+231B -> U+E71C
+  ["e28fb0", "ee9aba"], # [ALARM CLOCK] U+23F0 -> U+E6BA
+  ["e28fb3", "ee9c9c"], # [HOURGLASS WITH FLOWING SAND] U+23F3 -> U+E71C
+  ["e29988", "ee9986"], # [ARIES] U+2648 -> U+E646
+  ["e29989", "ee9987"], # [TAURUS] U+2649 -> U+E647
+  ["e2998a", "ee9988"], # [GEMINI] U+264A -> U+E648
+  ["e2998b", "ee9989"], # [CANCER] U+264B -> U+E649
+  ["e2998c", "ee998a"], # [LEO] U+264C -> U+E64A
+  ["e2998d", "ee998b"], # [VIRGO] U+264D -> U+E64B
+  ["e2998e", "ee998c"], # [LIBRA] U+264E -> U+E64C
+  ["e2998f", "ee998d"], # [SCORPIUS] U+264F -> U+E64D
+  ["e29990", "ee998e"], # [SAGITTARIUS] U+2650 -> U+E64E
+  ["e29991", "ee998f"], # [CAPRICORN] U+2651 -> U+E64F
+  ["e29992", "ee9990"], # [AQUARIUS] U+2652 -> U+E650
+  ["e29993", "ee9991"], # [PISCES] U+2653 -> U+E651
+  ["e29b8e", :undef], # [OPHIUCHUS] U+26CE -> "[蛇使座]"
+  ["f09f8d80", "ee9d81"], # [FOUR LEAF CLOVER] U+1F340 -> U+E741
+  ["f09f8cb7", "ee9d83"], # [TULIP] U+1F337 -> U+E743
+  ["f09f8cb1", "ee9d86"], # [SEEDLING] U+1F331 -> U+E746
+  ["f09f8d81", "ee9d87"], # [MAPLE LEAF] U+1F341 -> U+E747
+  ["f09f8cb8", "ee9d88"], # [CHERRY BLOSSOM] U+1F338 -> U+E748
+  ["f09f8cb9", :undef], # [ROSE] U+1F339 -> "[バラ]"
+  ["f09f8d82", "ee9d87"], # [FALLEN LEAF] U+1F342 -> U+E747
+  ["f09f8d83", :undef], # [LEAF FLUTTERING IN WIND] U+1F343 -> "[風に舞う葉]"
+  ["f09f8cba", :undef], # [HIBISCUS] U+1F33A -> "[ハイビスカス]"
+  ["f09f8cbb", :undef], # [SUNFLOWER] U+1F33B -> "[ひまわり]"
+  ["f09f8cb4", :undef], # [PALM TREE] U+1F334 -> "[ヤシ]"
+  ["f09f8cb5", :undef], # [CACTUS] U+1F335 -> "[サボテン]"
+  ["f09f8cbe", :undef], # [EAR OF RICE] U+1F33E -> "[稲穂]"
+  ["f09f8cbd", :undef], # [EAR OF MAIZE] U+1F33D -> "[とうもろこし]"
+  ["f09f8d84", :undef], # [MUSHROOM] U+1F344 -> "[キノコ]"
+  ["f09f8cb0", :undef], # [CHESTNUT] U+1F330 -> "[栗]"
+  ["f09f8cbc", :undef], # [BLOSSOM] U+1F33C -> "[花]"
+  ["f09f8cbf", "ee9d81"], # [HERB] U+1F33F -> U+E741
+  ["f09f8d92", "ee9d82"], # [CHERRIES] U+1F352 -> U+E742
+  ["f09f8d8c", "ee9d84"], # [BANANA] U+1F34C -> U+E744
+  ["f09f8d8e", "ee9d85"], # [RED APPLE] U+1F34E -> U+E745
+  ["f09f8d8a", :undef], # [TANGERINE] U+1F34A -> "[みかん]"
+  ["f09f8d93", :undef], # [STRAWBERRY] U+1F353 -> "[イチゴ]"
+  ["f09f8d89", :undef], # [WATERMELON] U+1F349 -> "[スイカ]"
+  ["f09f8d85", :undef], # [TOMATO] U+1F345 -> "[トマト]"
+  ["f09f8d86", :undef], # [AUBERGINE] U+1F346 -> "[ナス]"
+  ["f09f8d88", :undef], # [MELON] U+1F348 -> "[メロン]"
+  ["f09f8d8d", :undef], # [PINEAPPLE] U+1F34D -> "[パイナップル]"
+  ["f09f8d87", :undef], # [GRAPES] U+1F347 -> "[ブドウ]"
+  ["f09f8d91", :undef], # [PEACH] U+1F351 -> "[モモ]"
+  ["f09f8d8f", "ee9d85"], # [GREEN APPLE] U+1F34F -> U+E745
+  ["f09f9180", "ee9a91"], # [EYES] U+1F440 -> U+E691
+  ["f09f9182", "ee9a92"], # [EAR] U+1F442 -> U+E692
+  ["f09f9183", :undef], # [NOSE] U+1F443 -> "[鼻]"
+  ["f09f9184", "ee9bb9"], # [MOUTH] U+1F444 -> U+E6F9
+  ["f09f9185", "ee9ca8"], # [TONGUE] U+1F445 -> U+E728
+  ["f09f9284", "ee9c90"], # [LIPSTICK] U+1F484 -> U+E710
+  ["f09f9285", :undef], # [NAIL POLISH] U+1F485 -> "[マニキュア]"
+  ["f09f9286", :undef], # [FACE MASSAGE] U+1F486 -> "[エステ]"
+  ["f09f9287", "ee99b5"], # [HAIRCUT] U+1F487 -> U+E675
+  ["f09f9288", :undef], # [BARBER POLE] U+1F488 -> "[床屋]"
+  ["f09f91a4", "ee9ab1"], # [BUST IN SILHOUETTE] U+1F464 -> U+E6B1
+  ["f09f91a6", "ee9bb0"], # [BOY] U+1F466 -> U+E6F0
+  ["f09f91a7", "ee9bb0"], # [GIRL] U+1F467 -> U+E6F0
+  ["f09f91a8", "ee9bb0"], # [MAN] U+1F468 -> U+E6F0
+  ["f09f91a9", "ee9bb0"], # [WOMAN] U+1F469 -> U+E6F0
+  ["f09f91aa", :undef], # [FAMILY] U+1F46A -> "[家族]"
+  ["f09f91ab", :undef], # [MAN AND WOMAN HOLDING HANDS] U+1F46B -> "[カップル]"
+  ["f09f91ae", :undef], # [POLICE OFFICER] U+1F46E -> "[警官]"
+  ["f09f91af", :undef], # [WOMAN WITH BUNNY EARS] U+1F46F -> "[バニー]"
+  ["f09f91b0", :undef], # [BRIDE WITH VEIL] U+1F470 -> "[花嫁]"
+  ["f09f91b1", :undef], # [WESTERN PERSON] U+1F471 -> "[白人]"
+  ["f09f91b2", :undef], # [MAN WITH GUA PI MAO] U+1F472 -> "[中国人]"
+  ["f09f91b3", :undef], # [MAN WITH TURBAN] U+1F473 -> "[インド人]"
+  ["f09f91b4", :undef], # [OLDER MAN] U+1F474 -> "[おじいさん]"
+  ["f09f91b5", :undef], # [OLDER WOMAN] U+1F475 -> "[おばあさん]"
+  ["f09f91b6", :undef], # [BABY] U+1F476 -> "[赤ちゃん]"
+  ["f09f91b7", :undef], # [CONSTRUCTION WORKER] U+1F477 -> "[工事現場の人]"
+  ["f09f91b8", :undef], # [PRINCESS] U+1F478 -> "[お姫様]"
+  ["f09f91b9", :undef], # [JAPANESE OGRE] U+1F479 -> "[なまはげ]"
+  ["f09f91ba", :undef], # [JAPANESE GOBLIN] U+1F47A -> "[天狗]"
+  ["f09f91bb", :undef], # [GHOST] U+1F47B -> "[お化け]"
+  ["f09f91bc", :undef], # [BABY ANGEL] U+1F47C -> "[天使]"
+  ["f09f91bd", :undef], # [EXTRATERRESTRIAL ALIEN] U+1F47D -> "[UFO]"
+  ["f09f91be", :undef], # [ALIEN MONSTER] U+1F47E -> "[宇宙人]"
+  ["f09f91bf", :undef], # [IMP] U+1F47F -> "[アクマ]"
+  ["f09f9280", :undef], # [SKULL] U+1F480 -> "[ドクロ]"
+  ["f09f9281", :undef], # [INFORMATION DESK PERSON] U+1F481 -> "[案内]"
+  ["f09f9282", :undef], # [GUARDSMAN] U+1F482 -> "[衛兵]"
+  ["f09f9283", :undef], # [DANCER] U+1F483 -> "[ダンス]"
+  ["f09f908c", "ee9d8e"], # [SNAIL] U+1F40C -> U+E74E
+  ["f09f908d", :undef], # [SNAKE] U+1F40D -> "[ヘビ]"
+  ["f09f908e", "ee9d94"], # [HORSE] U+1F40E -> U+E754
+  ["f09f9094", :undef], # [CHICKEN] U+1F414 -> "[ニワトリ]"
+  ["f09f9097", :undef], # [BOAR] U+1F417 -> "[イノシシ]"
+  ["f09f90ab", :undef], # [BACTRIAN CAMEL] U+1F42B -> "[ラクダ]"
+  ["f09f9098", :undef], # [ELEPHANT] U+1F418 -> "[ゾウ]"
+  ["f09f90a8", :undef], # [KOALA] U+1F428 -> "[コアラ]"
+  ["f09f9092", :undef], # [MONKEY] U+1F412 -> "[サル]"
+  ["f09f9091", :undef], # [SHEEP] U+1F411 -> "[ヒツジ]"
+  ["f09f9099", :undef], # [OCTOPUS] U+1F419 -> "[タコ]"
+  ["f09f909a", :undef], # [SPIRAL SHELL] U+1F41A -> "[巻貝]"
+  ["f09f909b", :undef], # [BUG] U+1F41B -> "[ゲジゲジ]"
+  ["f09f909c", :undef], # [ANT] U+1F41C -> "[アリ]"
+  ["f09f909d", :undef], # [HONEYBEE] U+1F41D -> "[ミツバチ]"
+  ["f09f909e", :undef], # [LADY BEETLE] U+1F41E -> "[てんとう虫]"
+  ["f09f90a0", "ee9d91"], # [TROPICAL FISH] U+1F420 -> U+E751
+  ["f09f90a1", "ee9d91"], # [BLOWFISH] U+1F421 -> U+E751
+  ["f09f90a2", :undef], # [TURTLE] U+1F422 -> "[カメ]"
+  ["f09f90a4", "ee9d8f"], # [BABY CHICK] U+1F424 -> U+E74F
+  ["f09f90a5", "ee9d8f"], # [FRONT-FACING BABY CHICK] U+1F425 -> U+E74F
+  ["f09f90a6", "ee9d8f"], # [BIRD] U+1F426 -> U+E74F
+  ["f09f90a3", "ee9d8f"], # [HATCHING CHICK] U+1F423 -> U+E74F
+  ["f09f90a7", "ee9d90"], # [PENGUIN] U+1F427 -> U+E750
+  ["f09f90a9", "ee9aa1"], # [POODLE] U+1F429 -> U+E6A1
+  ["f09f909f", "ee9d91"], # [FISH] U+1F41F -> U+E751
+  ["f09f90ac", :undef], # [DOLPHIN] U+1F42C -> "[イルカ]"
+  ["f09f90ad", :undef], # [MOUSE FACE] U+1F42D -> "[ネズミ]"
+  ["f09f90af", :undef], # [TIGER FACE] U+1F42F -> "[トラ]"
+  ["f09f90b1", "ee9aa2"], # [CAT FACE] U+1F431 -> U+E6A2
+  ["f09f90b3", :undef], # [SPOUTING WHALE] U+1F433 -> "[クジラ]"
+  ["f09f90b4", "ee9d94"], # [HORSE FACE] U+1F434 -> U+E754
+  ["f09f90b5", :undef], # [MONKEY FACE] U+1F435 -> "[サル]"
+  ["f09f90b6", "ee9aa1"], # [DOG FACE] U+1F436 -> U+E6A1
+  ["f09f90b7", "ee9d95"], # [PIG FACE] U+1F437 -> U+E755
+  ["f09f90bb", :undef], # [BEAR FACE] U+1F43B -> "[クマ]"
+  ["f09f90b9", :undef], # [HAMSTER FACE] U+1F439 -> "[ハムスター]"
+  ["f09f90ba", "ee9aa1"], # [WOLF FACE] U+1F43A -> U+E6A1
+  ["f09f90ae", :undef], # [COW FACE] U+1F42E -> "[牛]"
+  ["f09f90b0", :undef], # [RABBIT FACE] U+1F430 -> "[ウサギ]"
+  ["f09f90b8", :undef], # [FROG FACE] U+1F438 -> "[カエル]"
+  ["f09f90be", "ee9a98"], # [PAW PRINTS] U+1F43E -> U+E698
+  ["f09f90b2", :undef], # [DRAGON FACE] U+1F432 -> "[辰]"
+  ["f09f90bc", :undef], # [PANDA FACE] U+1F43C -> "[パンダ]"
+  ["f09f90bd", "ee9d95"], # [PIG NOSE] U+1F43D -> U+E755
+  ["f09f9880", "ee9bb1"], # [ANGRY FACE] U+1F600 -> U+E6F1
+  ["f09f9881", "ee9bb3"], # [ANGUISHED FACE] U+1F601 -> U+E6F3
+  ["f09f9882", "ee9bb4"], # [ASTONISHED FACE] U+1F602 -> U+E6F4
+  ["f09f9883", "ee9bb2"], # [DISAPPOINTED FACE] U+1F603 -> U+E6F2
+  ["f09f9884", "ee9bb4"], # [DIZZY FACE] U+1F604 -> U+E6F4
+  ["f09f9885", "ee9ca3"], # [EXASPERATED FACE] U+1F605 -> U+E723
+  ["f09f9886", "ee9ca5"], # [EXPRESSIONLESS FACE] U+1F606 -> U+E725
+  ["f09f9887", "ee9ca6"], # [FACE WITH HEART-SHAPED EYES] U+1F607 -> U+E726
+  ["f09f9888", "ee9d93"], # [FACE WITH LOOK OF TRIUMPH] U+1F608 -> U+E753
+  ["f09f9889", "ee9ca8"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+1F609 -> U+E728
+  ["f09f988a", "ee9ca8"], # [FACE WITH STUCK-OUT TONGUE] U+1F60A -> U+E728
+  ["f09f988b", "ee9d92"], # [FACE SAVOURING DELICIOUS FOOD] U+1F60B -> U+E752
+  ["f09f988c", "ee9ca6"], # [FACE THROWING A KISS] U+1F60C -> U+E726
+  ["f09f988d", "ee9ca6"], # [FACE KISSING] U+1F60D -> U+E726
+  ["f09f988e", :undef], # [FACE WITH MASK] U+1F60E -> "[風邪ひき]"
+  ["f09f988f", "ee9caa"], # [FLUSHED FACE] U+1F60F -> U+E72A
+  ["f09f9890", "ee9bb0"], # [HAPPY FACE WITH OPEN MOUTH] U+1F610 -> U+E6F0
+  ["f09f9891", "ee9ca2"], # [HAPPY FACE WITH OPEN MOUTH AND COLD SWEAT] U+1F611 -> U+E722
+  ["f09f9892", "ee9caa"], # [HAPPY FACE WITH OPEN MOUTH AND CLOSED EYES] U+1F612 -> U+E72A
+  ["f09f9893", "ee9d93"], # [HAPPY FACE WITH GRIN] U+1F613 -> U+E753
+  ["f09f9894", "ee9caa"], # [HAPPY AND CRYING FACE] U+1F614 -> U+E72A
+  ["f09f9895", "ee9bb0"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+1F615 -> U+E6F0
+  ["e298ba", "ee9bb0"], # [WHITE SMILING FACE] U+263A -> U+E6F0
+  ["f09f9896", "ee9bb0"], # [HAPPY FACE WITH OPEN MOUTH AND RAISED EYEBROWS] U+1F616 -> U+E6F0
+  ["f09f9897", "ee9cae"], # [CRYING FACE] U+1F617 -> U+E72E
+  ["f09f9898", "ee9cad"], # [LOUDLY CRYING FACE] U+1F618 -> U+E72D
+  ["f09f9899", "ee9d97"], # [FEARFUL FACE] U+1F619 -> U+E757
+  ["f09f989a", "ee9cab"], # [PERSEVERING FACE] U+1F61A -> U+E72B
+  ["f09f989b", "ee9ca4"], # [POUTING FACE] U+1F61B -> U+E724
+  ["f09f989c", "ee9ca1"], # [RELIEVED FACE] U+1F61C -> U+E721
+  ["f09f989d", "ee9bb3"], # [CONFOUNDED FACE] U+1F61D -> U+E6F3
+  ["f09f989e", "ee9ca0"], # [PENSIVE FACE] U+1F61E -> U+E720
+  ["f09f989f", "ee9d97"], # [FACE SCREAMING IN FEAR] U+1F61F -> U+E757
+  ["f09f98a0", "ee9c81"], # [SLEEPY FACE] U+1F620 -> U+E701
+  ["f09f98a1", "ee9cac"], # [SMIRKING FACE] U+1F621 -> U+E72C
+  ["f09f98a2", "ee9ca3"], # [FACE WITH COLD SWEAT] U+1F622 -> U+E723
+  ["f09f98a3", "ee9ca3"], # [DISAPPOINTED BUT RELIEVED FACE] U+1F623 -> U+E723
+  ["f09f98a4", "ee9cab"], # [TIRED FACE] U+1F624 -> U+E72B
+  ["f09f98a5", "ee9ca9"], # [WINKING FACE] U+1F625 -> U+E729
+  ["f09f98ab", "ee9bb0"], # [CAT FACE WITH OPEN MOUTH] U+1F62B -> U+E6F0
+  ["f09f98ac", "ee9d93"], # [HAPPY CAT FACE WITH GRIN] U+1F62C -> U+E753
+  ["f09f98ad", "ee9caa"], # [HAPPY AND CRYING CAT FACE] U+1F62D -> U+E72A
+  ["f09f98ae", "ee9ca6"], # [CAT FACE KISSING] U+1F62E -> U+E726
+  ["f09f98af", "ee9ca6"], # [CAT FACE WITH HEART-SHAPED EYES] U+1F62F -> U+E726
+  ["f09f98b0", "ee9cae"], # [CRYING CAT FACE] U+1F630 -> U+E72E
+  ["f09f98b1", "ee9ca4"], # [POUTING CAT FACE] U+1F631 -> U+E724
+  ["f09f98b2", "ee9d93"], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+1F632 -> U+E753
+  ["f09f98b3", "ee9bb3"], # [ANGUISHED CAT FACE] U+1F633 -> U+E6F3
+  ["f09f98b4", "ee9caf"], # [FACE WITH NO GOOD GESTURE] U+1F634 -> U+E72F
+  ["f09f98b5", "ee9c8b"], # [FACE WITH OK GESTURE] U+1F635 -> U+E70B
+  ["f09f98b6", :undef], # [PERSON BOWING DEEPLY] U+1F636 -> "m(_ _)m"
+  ["f09f98b7", :undef], # [SEE-NO-EVIL MONKEY] U+1F637 -> "(/_＼)"
+  ["f09f98b9", :undef], # [SPEAK-NO-EVIL MONKEY] U+1F639 -> "(・×・)"
+  ["f09f98b8", :undef], # [HEAR-NO-EVIL MONKEY] U+1F638 -> "|(・×・)|"
+  ["f09f98ba", :undef], # [PERSON RAISING ONE HAND] U+1F63A -> "(^-^)/"
+  ["f09f98bb", :undef], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+1F63B -> "＼(^o^)／"
+  ["f09f98bc", "ee9bb3"], # [PERSON FROWNING] U+1F63C -> U+E6F3
+  ["f09f98bd", "ee9bb1"], # [PERSON WITH POUTING FACE] U+1F63D -> U+E6F1
+  ["f09f98be", :undef], # [PERSON WITH FOLDED HANDS] U+1F63E -> "(&gt;人&lt;)"
+  ["f09f8fa0", "ee99a3"], # [HOUSE BUILDING] U+1F3E0 -> U+E663
+  ["f09f8fa1", "ee99a3"], # [HOUSE WITH GARDEN] U+1F3E1 -> U+E663
+  ["f09f8fa2", "ee99a4"], # [OFFICE BUILDING] U+1F3E2 -> U+E664
+  ["f09f8fa3", "ee99a5"], # [JAPANESE POST OFFICE] U+1F3E3 -> U+E665
+  ["f09f8fa5", "ee99a6"], # [HOSPITAL] U+1F3E5 -> U+E666
+  ["f09f8fa6", "ee99a7"], # [BANK] U+1F3E6 -> U+E667
+  ["f09f8fa7", "ee99a8"], # [AUTOMATED TELLER MACHINE] U+1F3E7 -> U+E668
+  ["f09f8fa8", "ee99a9"], # [HOTEL] U+1F3E8 -> U+E669
+  ["f09f8fa9", "ee99a9ee9baf"], # [LOVE HOTEL] U+1F3E9 -> U+E669 U+E6EF
+  ["f09f8faa", "ee99aa"], # [CONVENIENCE STORE] U+1F3EA -> U+E66A
+  ["f09f8fab", "ee9cbe"], # [SCHOOL] U+1F3EB -> U+E73E
+  ["e29baa", :undef], # [CHURCH] U+26EA -> "[教会]"
+  ["e29bb2", :undef], # [FOUNTAIN] U+26F2 -> "[噴水]"
+  ["f09f8fac", :undef], # [DEPARTMENT STORE] U+1F3EC -> "[デパート]"
+  ["f09f8faf", :undef], # [JAPANESE CASTLE] U+1F3EF -> "[城]"
+  ["f09f8fb0", :undef], # [EUROPEAN CASTLE] U+1F3F0 -> "[城]"
+  ["f09f8fad", :undef], # [FACTORY] U+1F3ED -> "[工場]"
+  ["e29a93", "ee99a1"], # [ANCHOR] U+2693 -> U+E661
+  ["f09f8fae", "ee9d8b"], # [IZAKAYA LANTERN] U+1F3EE -> U+E74B
+  ["f09f97bb", "ee9d80"], # [MOUNT FUJI] U+1F5FB -> U+E740
+  ["f09f97bc", :undef], # [TOKYO TOWER] U+1F5FC -> "[東京タワー]"
+  ["f09f97bd", :undef], # [STATUE OF LIBERTY] U+1F5FD -> "[自由の女神]"
+  ["f09f97be", :undef], # [SILHOUETTE OF JAPAN] U+1F5FE -> "[日本地図]"
+  ["f09f97bf", :undef], # [MOYAI] U+1F5FF -> "[モアイ]"
+  ["f09f919e", "ee9a99"], # [MANS SHOE] U+1F45E -> U+E699
+  ["f09f919f", "ee9a99"], # [ATHLETIC SHOE] U+1F45F -> U+E699
+  ["f09f91a0", "ee99b4"], # [HIGH-HEELED SHOE] U+1F460 -> U+E674
+  ["f09f91a1", "ee99b4"], # [WOMANS SANDAL] U+1F461 -> U+E674
+  ["f09f91a2", :undef], # [WOMANS BOOTS] U+1F462 -> "[ブーツ]"
+  ["f09f91a3", "ee9a98"], # [FOOTPRINTS] U+1F463 -> U+E698
+  ["f09f9193", "ee9a9a"], # [EYEGLASSES] U+1F453 -> U+E69A
+  ["f09f9195", "ee9c8e"], # [T-SHIRT] U+1F455 -> U+E70E
+  ["f09f9196", "ee9c91"], # [JEANS] U+1F456 -> U+E711
+  ["f09f9191", "ee9c9a"], # [CROWN] U+1F451 -> U+E71A
+  ["f09f9194", :undef], # [NECKTIE] U+1F454 -> "[ネクタイ]"
+  ["f09f9192", :undef], # [WOMANS HAT] U+1F452 -> "[帽子]"
+  ["f09f9197", :undef], # [DRESS] U+1F457 -> "[ドレス]"
+  ["f09f9198", :undef], # [KIMONO] U+1F458 -> "[着物]"
+  ["f09f9199", :undef], # [BIKINI] U+1F459 -> "[ビキニ]"
+  ["f09f919a", "ee9c8e"], # [WOMANS CLOTHES] U+1F45A -> U+E70E
+  ["f09f919b", "ee9c8f"], # [PURSE] U+1F45B -> U+E70F
+  ["f09f919c", "ee9a82"], # [HANDBAG] U+1F45C -> U+E682
+  ["f09f919d", "ee9aad"], # [POUCH] U+1F45D -> U+E6AD
+  ["f09f92b0", "ee9c95"], # [MONEY BAG] U+1F4B0 -> U+E715
+  ["f09f92b1", :undef], # [CURRENCY EXCHANGE] U+1F4B1 -> "[$￥]"
+  ["f09f92b9", :undef], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+1F4B9 -> "[株価]"
+  ["f09f92b2", "ee9c95"], # [HEAVY DOLLAR SIGN] U+1F4B2 -> U+E715
+  ["f09f92b3", :undef], # [CREDIT CARD] U+1F4B3 -> "[カード]"
+  ["f09f92b4", "ee9b96"], # [BANKNOTE WITH YEN SIGN] U+1F4B4 -> U+E6D6
+  ["f09f92b5", "ee9c95"], # [BANKNOTE WITH DOLLAR SIGN] U+1F4B5 -> U+E715
+  ["f09f92b8", :undef], # [MONEY WITH WINGS] U+1F4B8 -> "[飛んでいくお金]"
+  ["f09f87a6", :undef], # [REGIONAL INDICATOR SYMBOL LETTER A] U+1F1E6 -> "[A]"
+  ["f09f87a7", :undef], # [REGIONAL INDICATOR SYMBOL LETTER B] U+1F1E7 -> "[B]"
+  ["f09f87a8", :undef], # [REGIONAL INDICATOR SYMBOL LETTER C] U+1F1E8 -> "[C]"
+  ["f09f87a9", :undef], # [REGIONAL INDICATOR SYMBOL LETTER D] U+1F1E9 -> "[D]"
+  ["f09f87aa", :undef], # [REGIONAL INDICATOR SYMBOL LETTER E] U+1F1EA -> "[E]"
+  ["f09f87ab", :undef], # [REGIONAL INDICATOR SYMBOL LETTER F] U+1F1EB -> "[F]"
+  ["f09f87ac", :undef], # [REGIONAL INDICATOR SYMBOL LETTER G] U+1F1EC -> "[G]"
+  ["f09f87ad", :undef], # [REGIONAL INDICATOR SYMBOL LETTER H] U+1F1ED -> "[H]"
+  ["f09f87ae", :undef], # [REGIONAL INDICATOR SYMBOL LETTER I] U+1F1EE -> "[I]"
+  ["f09f87af", :undef], # [REGIONAL INDICATOR SYMBOL LETTER J] U+1F1EF -> "[J]"
+  ["f09f87b0", :undef], # [REGIONAL INDICATOR SYMBOL LETTER K] U+1F1F0 -> "[K]"
+  ["f09f87b1", :undef], # [REGIONAL INDICATOR SYMBOL LETTER L] U+1F1F1 -> "[L]"
+  ["f09f87b2", :undef], # [REGIONAL INDICATOR SYMBOL LETTER M] U+1F1F2 -> "[M]"
+  ["f09f87b3", :undef], # [REGIONAL INDICATOR SYMBOL LETTER N] U+1F1F3 -> "[N]"
+  ["f09f87b4", :undef], # [REGIONAL INDICATOR SYMBOL LETTER O] U+1F1F4 -> "[O]"
+  ["f09f87b5", :undef], # [REGIONAL INDICATOR SYMBOL LETTER P] U+1F1F5 -> "[P]"
+  ["f09f87b6", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Q] U+1F1F6 -> "[Q]"
+  ["f09f87b7", :undef], # [REGIONAL INDICATOR SYMBOL LETTER R] U+1F1F7 -> "[R]"
+  ["f09f87b8", :undef], # [REGIONAL INDICATOR SYMBOL LETTER S] U+1F1F8 -> "[S]"
+  ["f09f87b9", :undef], # [REGIONAL INDICATOR SYMBOL LETTER T] U+1F1F9 -> "[T]"
+  ["f09f87ba", :undef], # [REGIONAL INDICATOR SYMBOL LETTER U] U+1F1FA -> "[U]"
+  ["f09f87bb", :undef], # [REGIONAL INDICATOR SYMBOL LETTER V] U+1F1FB -> "[V]"
+  ["f09f87bc", :undef], # [REGIONAL INDICATOR SYMBOL LETTER W] U+1F1FC -> "[W]"
+  ["f09f87bd", :undef], # [REGIONAL INDICATOR SYMBOL LETTER X] U+1F1FD -> "[X]"
+  ["f09f87be", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Y] U+1F1FE -> "[Y]"
+  ["f09f87bf", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Z] U+1F1FF -> "[Z]"
+  ["f09f94a5", :undef], # [FIRE] U+1F525 -> "[炎]"
+  ["f09f94a6", "ee9bbb"], # [ELECTRIC TORCH] U+1F526 -> U+E6FB
+  ["f09f94a7", "ee9c98"], # [WRENCH] U+1F527 -> U+E718
+  ["f09f94a8", :undef], # [HAMMER] U+1F528 -> "[ハンマー]"
+  ["f09f94a9", :undef], # [NUT AND BOLT] U+1F529 -> "[ネジ]"
+  ["f09f94aa", :undef], # [HOCHO] U+1F52A -> "[包丁]"
+  ["f09f94ab", :undef], # [PISTOL] U+1F52B -> "[ピストル]"
+  ["f09f94ae", :undef], # [CRYSTAL BALL] U+1F52E -> "[占い]"
+  ["f09f94af", :undef], # [SIX POINTED STAR WITH MIDDLE DOT] U+1F52F -> "[占い]"
+  ["f09f94b0", :undef], # [JAPANESE SYMBOL FOR BEGINNER] U+1F530 -> "[若葉マーク]"
+  ["f09f94b1", "ee9c9a"], # [TRIDENT EMBLEM] U+1F531 -> U+E71A
+  ["f09f9289", :undef], # [SYRINGE] U+1F489 -> "[注射]"
+  ["f09f928a", :undef], # [PILL] U+1F48A -> "[薬]"
+  ["f09f85b0", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+1F170 -> "[A]"
+  ["f09f85b1", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+1F171 -> "[B]"
+  ["f09f868e", :undef], # [NEGATIVE SQUARED AB] U+1F18E -> "[AB]"
+  ["f09f85be", :undef], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+1F17E -> "[O]"
+  ["f09f8e80", "ee9a84"], # [RIBBON] U+1F380 -> U+E684
+  ["f09f8e81", "ee9a85"], # [WRAPPED PRESENT] U+1F381 -> U+E685
+  ["f09f8e82", "ee9a86"], # [BIRTHDAY CAKE] U+1F382 -> U+E686
+  ["f09f8e84", "ee9aa4"], # [CHRISTMAS TREE] U+1F384 -> U+E6A4
+  ["f09f8e85", :undef], # [FATHER CHRISTMAS] U+1F385 -> "[サンタ]"
+  ["f09f8e8c", :undef], # [CROSSED FLAGS] U+1F38C -> "[祝日]"
+  ["f09f8e86", :undef], # [FIREWORKS] U+1F386 -> "[花火]"
+  ["f09f8e88", :undef], # [BALLOON] U+1F388 -> "[風船]"
+  ["f09f8e89", :undef], # [PARTY POPPER] U+1F389 -> "[クラッカー]"
+  ["f09f8e8d", :undef], # [PINE DECORATION] U+1F38D -> "[門松]"
+  ["f09f8e8e", :undef], # [JAPANESE DOLLS] U+1F38E -> "[ひな祭り]"
+  ["f09f8e93", :undef], # [GRADUATION CAP] U+1F393 -> "[卒業式]"
+  ["f09f8e92", :undef], # [SCHOOL SATCHEL] U+1F392 -> "[ランドセル]"
+  ["f09f8e8f", :undef], # [CARP STREAMER] U+1F38F -> "[こいのぼり]"
+  ["f09f8e87", :undef], # [FIREWORK SPARKLER] U+1F387 -> "[線香花火]"
+  ["f09f8e90", :undef], # [WIND CHIME] U+1F390 -> "[風鈴]"
+  ["f09f8e83", :undef], # [JACK-O-LANTERN] U+1F383 -> "[ハロウィン]"
+  ["f09f8e8a", :undef], # [CONFETTI BALL] U+1F38A -> "[オメデトウ]"
+  ["f09f8e8b", :undef], # [TANABATA TREE] U+1F38B -> "[七夕]"
+  ["f09f8e91", :undef], # [MOON VIEWING CEREMONY] U+1F391 -> "[お月見]"
+  ["f09f939f", "ee999a"], # [PAGER] U+1F4DF -> U+E65A
+  ["e2988e", "ee9a87"], # [BLACK TELEPHONE] U+260E -> U+E687
+  ["f09f939e", "ee9a87"], # [TELEPHONE RECEIVER] U+1F4DE -> U+E687
+  ["f09f93b1", "ee9a88"], # [MOBILE PHONE] U+1F4F1 -> U+E688
+  ["f09f93b2", "ee9b8e"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+1F4F2 -> U+E6CE
+  ["f09f939d", "ee9a89"], # [MEMO] U+1F4DD -> U+E689
+  ["f09f93a0", "ee9b90"], # [FAX MACHINE] U+1F4E0 -> U+E6D0
+  ["e29c89", "ee9b93"], # [ENVELOPE] U+2709 -> U+E6D3
+  ["f09f93a8", "ee9b8f"], # [INCOMING ENVELOPE] U+1F4E8 -> U+E6CF
+  ["f09f93a9", "ee9b8f"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+1F4E9 -> U+E6CF
+  ["f09f93aa", "ee99a5"], # [CLOSED MAILBOX WITH LOWERED FLAG] U+1F4EA -> U+E665
+  ["f09f93ab", "ee99a5"], # [CLOSED MAILBOX WITH RAISED FLAG] U+1F4EB -> U+E665
+  ["f09f93ae", "ee99a5"], # [POSTBOX] U+1F4EE -> U+E665
+  ["f09f93b0", :undef], # [NEWSPAPER] U+1F4F0 -> "[新聞]"
+  ["f09f93a2", :undef], # [PUBLIC ADDRESS LOUDSPEAKER] U+1F4E2 -> "[スピーカ]"
+  ["f09f93a3", :undef], # [CHEERING MEGAPHONE] U+1F4E3 -> "[メガホン]"
+  ["f09f93a1", :undef], # [SATELLITE ANTENNA] U+1F4E1 -> "[アンテナ]"
+  ["f09f93a4", :undef], # [OUTBOX TRAY] U+1F4E4 -> "[送信BOX]"
+  ["f09f93a5", :undef], # [INBOX TRAY] U+1F4E5 -> "[受信BOX]"
+  ["f09f93a6", "ee9a85"], # [PACKAGE] U+1F4E6 -> U+E685
+  ["f09f93a7", "ee9b93"], # [E-MAIL SYMBOL] U+1F4E7 -> U+E6D3
+  ["f09f94a0", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+1F520 -> "[ABCD]"
+  ["f09f94a1", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+1F521 -> "[abcd]"
+  ["f09f94a2", :undef], # [INPUT SYMBOL FOR NUMBERS] U+1F522 -> "[1234]"
+  ["f09f94a3", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+1F523 -> "[記号]"
+  ["f09f94a4", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+1F524 -> "[ABC]"
+  ["e29c92", "ee9aae"], # [BLACK NIB] U+2712 -> U+E6AE
+  ["f09f92ba", "ee9ab2"], # [SEAT] U+1F4BA -> U+E6B2
+  ["f09f92bb", "ee9c96"], # [PERSONAL COMPUTER] U+1F4BB -> U+E716
+  ["e29c8f", "ee9c99"], # [PENCIL] U+270F -> U+E719
+  ["f09f938e", "ee9cb0"], # [PAPERCLIP] U+1F4CE -> U+E730
+  ["f09f92bc", "ee9a82"], # [BRIEFCASE] U+1F4BC -> U+E682
+  ["f09f92bd", :undef], # [MINIDISC] U+1F4BD -> "[MD]"
+  ["f09f92be", :undef], # [FLOPPY DISK] U+1F4BE -> "[フロッピー]"
+  ["f09f92bf", "ee9a8c"], # [OPTICAL DISC] U+1F4BF -> U+E68C
+  ["f09f9380", "ee9a8c"], # [DVD] U+1F4C0 -> U+E68C
+  ["e29c82", "ee99b5"], # [BLACK SCISSORS] U+2702 -> U+E675
+  ["f09f938d", :undef], # [ROUND PUSHPIN] U+1F4CD -> "[画びょう]"
+  ["f09f9383", "ee9a89"], # [PAGE WITH CURL] U+1F4C3 -> U+E689
+  ["f09f9384", "ee9a89"], # [PAGE FACING UP] U+1F4C4 -> U+E689
+  ["f09f9385", :undef], # [CALENDAR] U+1F4C5 -> "[カレンダー]"
+  ["f09f9381", :undef], # [FILE FOLDER] U+1F4C1 -> "[フォルダ]"
+  ["f09f9382", :undef], # [OPEN FILE FOLDER] U+1F4C2 -> "[フォルダ]"
+  ["f09f9393", "ee9a83"], # [NOTEBOOK] U+1F4D3 -> U+E683
+  ["f09f9396", "ee9a83"], # [OPEN BOOK] U+1F4D6 -> U+E683
+  ["f09f9394", "ee9a83"], # [NOTEBOOK WITH DECORATIVE COVER] U+1F4D4 -> U+E683
+  ["f09f9395", "ee9a83"], # [CLOSED BOOK] U+1F4D5 -> U+E683
+  ["f09f9397", "ee9a83"], # [GREEN BOOK] U+1F4D7 -> U+E683
+  ["f09f9398", "ee9a83"], # [BLUE BOOK] U+1F4D8 -> U+E683
+  ["f09f9399", "ee9a83"], # [ORANGE BOOK] U+1F4D9 -> U+E683
+  ["f09f939a", "ee9a83"], # [BOOKS] U+1F4DA -> U+E683
+  ["f09f939b", :undef], # [NAME BADGE] U+1F4DB -> "[名札]"
+  ["f09f939c", "ee9c8a"], # [SCROLL] U+1F4DC -> U+E70A
+  ["f09f938b", "ee9a89"], # [CLIPBOARD] U+1F4CB -> U+E689
+  ["f09f9386", :undef], # [TEAR-OFF CALENDAR] U+1F4C6 -> "[カレンダー]"
+  ["f09f938a", :undef], # [BAR CHART] U+1F4CA -> "[グラフ]"
+  ["f09f9388", :undef], # [CHART WITH UPWARDS TREND] U+1F4C8 -> "[グラフ]"
+  ["f09f9389", :undef], # [CHART WITH DOWNWARDS TREND] U+1F4C9 -> "[グラフ]"
+  ["f09f9387", "ee9a83"], # [CARD INDEX] U+1F4C7 -> U+E683
+  ["f09f938c", :undef], # [PUSHPIN] U+1F4CC -> "[画びょう]"
+  ["f09f9392", "ee9a83"], # [LEDGER] U+1F4D2 -> U+E683
+  ["f09f938f", :undef], # [STRAIGHT RULER] U+1F4CF -> "[定規]"
+  ["f09f9390", :undef], # [TRIANGULAR RULER] U+1F4D0 -> "[三角定規]"
+  ["f09f9391", "ee9a89"], # [BOOKMARK TABS] U+1F4D1 -> U+E689
+  ["f09f8ebd", "ee9992"], # [RUNNING SHIRT WITH SASH] U+1F3BD -> U+E652
+  ["e29abe", "ee9993"], # [BASEBALL] U+26BE -> U+E653
+  ["e29bb3", "ee9994"], # [FLAG IN HOLE] U+26F3 -> U+E654
+  ["f09f8ebe", "ee9995"], # [TENNIS RACQUET AND BALL] U+1F3BE -> U+E655
+  ["e29abd", "ee9996"], # [SOCCER BALL] U+26BD -> U+E656
+  ["f09f8ebf", "ee9997"], # [SKI AND SKI BOOT] U+1F3BF -> U+E657
+  ["f09f8f80", "ee9998"], # [BASKETBALL AND HOOP] U+1F3C0 -> U+E658
+  ["f09f8f81", "ee9999"], # [CHEQUERED FLAG] U+1F3C1 -> U+E659
+  ["f09f8f82", "ee9c92"], # [SNOWBOARDER] U+1F3C2 -> U+E712
+  ["f09f8f83", "ee9cb3"], # [RUNNER] U+1F3C3 -> U+E733
+  ["f09f8f84", "ee9c92"], # [SURFER] U+1F3C4 -> U+E712
+  ["f09f8f86", :undef], # [TROPHY] U+1F3C6 -> "[トロフィー]"
+  ["f09f8f88", :undef], # [AMERICAN FOOTBALL] U+1F3C8 -> "[フットボール]"
+  ["f09f8f8a", :undef], # [SWIMMER] U+1F3CA -> "[水泳]"
+  ["f09f9a86", "ee999b"], # [TRAIN] U+1F686 -> U+E65B
+  ["f09f9a87", "ee999c"], # [METRO] U+1F687 -> U+E65C
+  ["e29382", "ee999c"], # [CIRCLED LATIN CAPITAL LETTER M] U+24C2 -> U+E65C
+  ["f09f9a84", "ee999d"], # [HIGH-SPEED TRAIN] U+1F684 -> U+E65D
+  ["f09f9a85", "ee999d"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+1F685 -> U+E65D
+  ["f09f9a97", "ee999e"], # [AUTOMOBILE] U+1F697 -> U+E65E
+  ["f09f9a99", "ee999f"], # [RECREATIONAL VEHICLE] U+1F699 -> U+E65F
+  ["f09f9a8d", "ee99a0"], # [ONCOMING BUS] U+1F68D -> U+E660
+  ["f09f9a8f", :undef], # [BUS STOP] U+1F68F -> "[バス停]"
+  ["f09f9aa2", "ee99a1"], # [SHIP] U+1F6A2 -> U+E661
+  ["e29c88", "ee99a2"], # [AIRPLANE] U+2708 -> U+E662
+  ["e29bb5", "ee9aa3"], # [SAILBOAT] U+26F5 -> U+E6A3
+  ["f09f9a89", :undef], # [STATION] U+1F689 -> "[駅]"
+  ["f09f9a80", :undef], # [ROCKET] U+1F680 -> "[ロケット]"
+  ["f09f9aa4", "ee9aa3"], # [SPEEDBOAT] U+1F6A4 -> U+E6A3
+  ["f09f9a95", "ee999e"], # [TAXI] U+1F695 -> U+E65E
+  ["f09f9a9a", :undef], # [DELIVERY TRUCK] U+1F69A -> "[トラック]"
+  ["f09f9a92", :undef], # [FIRE ENGINE] U+1F692 -> "[消防車]"
+  ["f09f9a91", :undef], # [AMBULANCE] U+1F691 -> "[救急車]"
+  ["f09f9a93", :undef], # [POLICE CAR] U+1F693 -> "[パトカー]"
+  ["e29bbd", "ee99ab"], # [FUEL PUMP] U+26FD -> U+E66B
+  ["f09f85bf", "ee99ac"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+1F17F -> U+E66C
+  ["f09f9aa5", "ee99ad"], # [HORIZONTAL TRAFFIC LIGHT] U+1F6A5 -> U+E66D
+  ["f09f9aa7", :undef], # [CONSTRUCTION SIGN] U+1F6A7 -> "[工事中]"
+  ["f09f9aa8", :undef], # [POLICE CARS REVOLVING LIGHT] U+1F6A8 -> "[パトカー]"
+  ["e299a8", "ee9bb7"], # [HOT SPRINGS] U+2668 -> U+E6F7
+  ["e29bba", :undef], # [TENT] U+26FA -> "[キャンプ]"
+  ["f09f8ea0", "ee99b9"], # [CAROUSEL HORSE] U+1F3A0 -> U+E679
+  ["f09f8ea1", :undef], # [FERRIS WHEEL] U+1F3A1 -> "[観覧車]"
+  ["f09f8ea2", :undef], # [ROLLER COASTER] U+1F3A2 -> "[ジェットコースター]"
+  ["f09f8ea3", "ee9d91"], # [FISHING POLE AND FISH] U+1F3A3 -> U+E751
+  ["f09f8ea4", "ee99b6"], # [MICROPHONE] U+1F3A4 -> U+E676
+  ["f09f8ea5", "ee99b7"], # [MOVIE CAMERA] U+1F3A5 -> U+E677
+  ["f09f8ea6", "ee99b7"], # [CINEMA] U+1F3A6 -> U+E677
+  ["f09f8ea7", "ee99ba"], # [HEADPHONE] U+1F3A7 -> U+E67A
+  ["f09f8ea8", "ee99bb"], # [ARTIST PALETTE] U+1F3A8 -> U+E67B
+  ["f09f8ea9", "ee99bc"], # [TOP HAT] U+1F3A9 -> U+E67C
+  ["f09f8eaa", "ee99bd"], # [CIRCUS TENT] U+1F3AA -> U+E67D
+  ["f09f8eab", "ee99be"], # [TICKET] U+1F3AB -> U+E67E
+  ["f09f8eac", "ee9aac"], # [CLAPPER BOARD] U+1F3AC -> U+E6AC
+  ["f09f8ead", :undef], # [PERFORMING ARTS] U+1F3AD -> "[演劇]"
+  ["f09f8eae", "ee9a8b"], # [VIDEO GAME] U+1F3AE -> U+E68B
+  ["f09f8084", :undef], # [MAHJONG TILE RED DRAGON] U+1F004 -> "[麻雀]"
+  ["f09f8eaf", :undef], # [DIRECT HIT] U+1F3AF -> "[的中]"
+  ["f09f8eb0", :undef], # [SLOT MACHINE] U+1F3B0 -> "[777]"
+  ["f09f8eb1", :undef], # [BILLIARDS] U+1F3B1 -> "[ビリヤード]"
+  ["f09f8eb2", :undef], # [GAME DIE] U+1F3B2 -> "[サイコロ]"
+  ["f09f8eb3", :undef], # [BOWLING] U+1F3B3 -> "[ボーリング]"
+  ["f09f8eb4", :undef], # [FLOWER PLAYING CARDS] U+1F3B4 -> "[花札]"
+  ["f09f838f", :undef], # [PLAYING CARD BLACK JOKER] U+1F0CF -> "[ジョーカー]"
+  ["f09f8eb5", "ee9bb6"], # [MUSICAL NOTE] U+1F3B5 -> U+E6F6
+  ["f09f8eb6", "ee9bbf"], # [MULTIPLE MUSICAL NOTES] U+1F3B6 -> U+E6FF
+  ["f09f8eb7", :undef], # [SAXOPHONE] U+1F3B7 -> "[サックス]"
+  ["f09f8eb8", :undef], # [GUITAR] U+1F3B8 -> "[ギター]"
+  ["f09f8eb9", :undef], # [MUSICAL KEYBOARD] U+1F3B9 -> "[ピアノ]"
+  ["f09f8eba", :undef], # [TRUMPET] U+1F3BA -> "[トランペット]"
+  ["f09f8ebb", :undef], # [VIOLIN] U+1F3BB -> "[バイオリン]"
+  ["f09f8ebc", "ee9bbf"], # [MUSICAL SCORE] U+1F3BC -> U+E6FF
+  ["e380bd", :undef], # [PART ALTERNATION MARK] U+303D -> "[歌記号]"
+  ["f09f93b7", "ee9a81"], # [CAMERA] U+1F4F7 -> U+E681
+  ["f09f93b9", "ee99b7"], # [VIDEO CAMERA] U+1F4F9 -> U+E677
+  ["f09f93ba", "ee9a8a"], # [TELEVISION] U+1F4FA -> U+E68A
+  ["f09f93bb", :undef], # [RADIO] U+1F4FB -> "[ラジオ]"
+  ["f09f93bc", :undef], # [VIDEOCASSETTE] U+1F4FC -> "[ビデオ]"
+  ["f09f928b", "ee9bb9"], # [KISS MARK] U+1F48B -> U+E6F9
+  ["f09f928c", "ee9c97"], # [LOVE LETTER] U+1F48C -> U+E717
+  ["f09f928d", "ee9c9b"], # [RING] U+1F48D -> U+E71B
+  ["f09f928e", "ee9c9b"], # [GEM STONE] U+1F48E -> U+E71B
+  ["f09f928f", "ee9bb9"], # [KISS] U+1F48F -> U+E6F9
+  ["f09f9290", :undef], # [BOUQUET] U+1F490 -> "[花束]"
+  ["f09f9291", "ee9bad"], # [COUPLE WITH HEART] U+1F491 -> U+E6ED
+  ["f09f9292", :undef], # [WEDDING] U+1F492 -> "[結婚式]"
+  ["f09f949e", :undef], # [NO ONE UNDER EIGHTEEN SYMBOL] U+1F51E -> "[18禁]"
+  ["c2a9", "ee9cb1"], # [COPYRIGHT SIGN] U+A9 -> U+E731
+  ["c2ae", "ee9cb6"], # [REGISTERED SIGN] U+AE -> U+E736
+  ["e284a2", "ee9cb2"], # [TRADE MARK SIGN] U+2122 -> U+E732
+  ["e284b9", :undef], # [INFORMATION SOURCE] U+2139 -> "[ｉ]"
+  ["f09f949f", :undef], # [KEYCAP TEN] U+1F51F -> "[10]"
+  ["f09f93b6", :undef], # [ANTENNA WITH BARS] U+1F4F6 -> "[バリ3]"
+  ["f09f93b3", :undef], # [VIBRATION MODE] U+1F4F3 -> "[マナーモード]"
+  ["f09f93b4", :undef], # [MOBILE PHONE OFF] U+1F4F4 -> "[ケータイOFF]"
+  ["f09f8d94", "ee99b3"], # [HAMBURGER] U+1F354 -> U+E673
+  ["f09f8d99", "ee9d89"], # [RICE BALL] U+1F359 -> U+E749
+  ["f09f8db0", "ee9d8a"], # [SHORTCAKE] U+1F370 -> U+E74A
+  ["f09f8d9c", "ee9d8c"], # [STEAMING BOWL] U+1F35C -> U+E74C
+  ["f09f8d9e", "ee9d8d"], # [BREAD] U+1F35E -> U+E74D
+  ["f09f8db3", :undef], # [COOKING] U+1F373 -> "[フライパン]"
+  ["f09f8da6", :undef], # [SOFT ICE CREAM] U+1F366 -> "[ソフトクリーム]"
+  ["f09f8d9f", :undef], # [FRENCH FRIES] U+1F35F -> "[ポテト]"
+  ["f09f8da1", :undef], # [DANGO] U+1F361 -> "[だんご]"
+  ["f09f8d98", :undef], # [RICE CRACKER] U+1F358 -> "[せんべい]"
+  ["f09f8d9a", "ee9d8c"], # [COOKED RICE] U+1F35A -> U+E74C
+  ["f09f8d9d", :undef], # [SPAGHETTI] U+1F35D -> "[パスタ]"
+  ["f09f8d9b", :undef], # [CURRY AND RICE] U+1F35B -> "[カレー]"
+  ["f09f8da2", :undef], # [ODEN] U+1F362 -> "[おでん]"
+  ["f09f8da3", :undef], # [SUSHI] U+1F363 -> "[すし]"
+  ["f09f8db1", :undef], # [BENTO BOX] U+1F371 -> "[弁当]"
+  ["f09f8db2", :undef], # [POT OF FOOD] U+1F372 -> "[鍋]"
+  ["f09f8da7", :undef], # [SHAVED ICE] U+1F367 -> "[カキ氷]"
+  ["f09f8d96", :undef], # [MEAT ON BONE] U+1F356 -> "[肉]"
+  ["f09f8da5", "ee9983"], # [FISH CAKE WITH SWIRL DESIGN] U+1F365 -> U+E643
+  ["f09f8da0", :undef], # [ROASTED SWEET POTATO] U+1F360 -> "[やきいも]"
+  ["f09f8d95", :undef], # [SLICE OF PIZZA] U+1F355 -> "[ピザ]"
+  ["f09f8d97", :undef], # [POULTRY LEG] U+1F357 -> "[チキン]"
+  ["f09f8da8", :undef], # [ICE CREAM] U+1F368 -> "[アイスクリーム]"
+  ["f09f8da9", :undef], # [DOUGHNUT] U+1F369 -> "[ドーナツ]"
+  ["f09f8daa", :undef], # [COOKIE] U+1F36A -> "[クッキー]"
+  ["f09f8dab", :undef], # [CHOCOLATE BAR] U+1F36B -> "[チョコ]"
+  ["f09f8dac", :undef], # [CANDY] U+1F36C -> "[キャンディ]"
+  ["f09f8dad", :undef], # [LOLLIPOP] U+1F36D -> "[キャンディ]"
+  ["f09f8dae", :undef], # [CUSTARD] U+1F36E -> "[プリン]"
+  ["f09f8daf", :undef], # [HONEY POT] U+1F36F -> "[ハチミツ]"
+  ["f09f8da4", :undef], # [FRIED SHRIMP] U+1F364 -> "[エビフライ]"
+  ["f09f8db4", "ee99af"], # [FORK AND KNIFE] U+1F374 -> U+E66F
+  ["e29895", "ee99b0"], # [HOT BEVERAGE] U+2615 -> U+E670
+  ["f09f8db8", "ee99b1"], # [COCKTAIL GLASS] U+1F378 -> U+E671
+  ["f09f8dba", "ee99b2"], # [BEER MUG] U+1F37A -> U+E672
+  ["f09f8db5", "ee9c9e"], # [TEACUP WITHOUT HANDLE] U+1F375 -> U+E71E
+  ["f09f8db6", "ee9d8b"], # [SAKE BOTTLE AND CUP] U+1F376 -> U+E74B
+  ["f09f8db7", "ee9d96"], # [WINE GLASS] U+1F377 -> U+E756
+  ["f09f8dbb", "ee99b2"], # [CLINKING BEER MUGS] U+1F37B -> U+E672
+  ["f09f8db9", "ee99b1"], # [TROPICAL DRINK] U+1F379 -> U+E671
+  ["e28697", "ee99b8"], # [NORTH EAST ARROW] U+2197 -> U+E678
+  ["e28698", "ee9a96"], # [SOUTH EAST ARROW] U+2198 -> U+E696
+  ["e28696", "ee9a97"], # [NORTH WEST ARROW] U+2196 -> U+E697
+  ["e28699", "ee9aa5"], # [SOUTH WEST ARROW] U+2199 -> U+E6A5
+  ["e2a4b4", "ee9bb5"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+2934 -> U+E6F5
+  ["e2a4b5", "ee9c80"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+2935 -> U+E700
+  ["e28694", "ee9cbc"], # [LEFT RIGHT ARROW] U+2194 -> U+E73C
+  ["e28695", "ee9cbd"], # [UP DOWN ARROW] U+2195 -> U+E73D
+  ["e2ac86", :undef], # [UPWARDS BLACK ARROW] U+2B06 -> "[↑]"
+  ["e2ac87", :undef], # [DOWNWARDS BLACK ARROW] U+2B07 -> "[↓]"
+  ["e29ea1", :undef], # [BLACK RIGHTWARDS ARROW] U+27A1 -> "[→]"
+  ["e2ac85", :undef], # [LEFTWARDS BLACK ARROW] U+2B05 -> "[←]"
+  ["e296b6", :undef], # [BLACK RIGHT-POINTING TRIANGLE] U+25B6 -> "[&gt;]"
+  ["e29780", :undef], # [BLACK LEFT-POINTING TRIANGLE] U+25C0 -> "[&lt;]"
+  ["e28fa9", :undef], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+23E9 -> "[&gt;&gt;]"
+  ["e28faa", :undef], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+23EA -> "[&lt;&lt;]"
+  ["e28fab", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+23EB -> "▲"
+  ["e28fac", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+23EC -> "▼"
+  ["f09f94ba", :undef], # [UP-POINTING RED TRIANGLE] U+1F53A -> "▲"
+  ["f09f94bb", :undef], # [DOWN-POINTING RED TRIANGLE] U+1F53B -> "▼"
+  ["f09f94bc", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+1F53C -> "▲"
+  ["f09f94bd", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+1F53D -> "▼"
+  ["e2ad95", "ee9aa0"], # [HEAVY LARGE CIRCLE] U+2B55 -> U+E6A0
+  ["e29d8c", :undef], # [CROSS MARK] U+274C -> "[×]"
+  ["e29d8e", :undef], # [NEGATIVE SQUARED CROSS MARK] U+274E -> "[×]"
+  ["e29da2", "ee9c82"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+2762 -> U+E702
+  ["e28189", "ee9c83"], # [EXCLAMATION QUESTION MARK] U+2049 -> U+E703
+  ["e280bc", "ee9c84"], # [DOUBLE EXCLAMATION MARK] U+203C -> U+E704
+  ["e29d93", :undef], # [BLACK QUESTION MARK ORNAMENT] U+2753 -> "[？]"
+  ["e29d94", :undef], # [WHITE QUESTION MARK ORNAMENT] U+2754 -> "[？]"
+  ["e29d95", "ee9c82"], # [WHITE EXCLAMATION MARK ORNAMENT] U+2755 -> U+E702
+  ["e380b0", "ee9c89"], # [WAVY DASH] U+3030 -> U+E709
+  ["e29eb0", "ee9c8a"], # [CURLY LOOP] U+27B0 -> U+E70A
+  ["e29ebf", "ee9b9f"], # [DOUBLE CURLY LOOP] U+27BF -> U+E6DF
+  ["e29da4", "ee9bac"], # [HEAVY BLACK HEART] U+2764 -> U+E6EC
+  ["f09f9293", "ee9bad"], # [BEATING HEART] U+1F493 -> U+E6ED
+  ["f09f9294", "ee9bae"], # [BROKEN HEART] U+1F494 -> U+E6EE
+  ["f09f9295", "ee9baf"], # [TWO HEARTS] U+1F495 -> U+E6EF
+  ["f09f9296", "ee9bac"], # [SPARKLING HEART] U+1F496 -> U+E6EC
+  ["f09f9297", "ee9bad"], # [GROWING HEART] U+1F497 -> U+E6ED
+  ["f09f9298", "ee9bac"], # [HEART WITH ARROW] U+1F498 -> U+E6EC
+  ["f09f9299", "ee9bac"], # [BLUE HEART] U+1F499 -> U+E6EC
+  ["f09f929a", "ee9bac"], # [GREEN HEART] U+1F49A -> U+E6EC
+  ["f09f929b", "ee9bac"], # [YELLOW HEART] U+1F49B -> U+E6EC
+  ["f09f929c", "ee9bac"], # [PURPLE HEART] U+1F49C -> U+E6EC
+  ["f09f929d", "ee9bac"], # [HEART WITH RIBBON] U+1F49D -> U+E6EC
+  ["f09f929e", "ee9bad"], # [REVOLVING HEARTS] U+1F49E -> U+E6ED
+  ["f09f929f", "ee9bb8"], # [HEART DECORATION] U+1F49F -> U+E6F8
+  ["e299a5", "ee9a8d"], # [BLACK HEART SUIT] U+2665 -> U+E68D
+  ["e299a0", "ee9a8e"], # [BLACK SPADE SUIT] U+2660 -> U+E68E
+  ["e299a6", "ee9a8f"], # [BLACK DIAMOND SUIT] U+2666 -> U+E68F
+  ["e299a3", "ee9a90"], # [BLACK CLUB SUIT] U+2663 -> U+E690
+  ["f09f9aac", "ee99bf"], # [SMOKING SYMBOL] U+1F6AC -> U+E67F
+  ["f09f9aad", "ee9a80"], # [NO SMOKING SYMBOL] U+1F6AD -> U+E680
+  ["e299bf", "ee9a9b"], # [WHEELCHAIR SYMBOL] U+267F -> U+E69B
+  ["f09f9aa9", "ee9b9e"], # [TRIANGULAR FLAG ON POST] U+1F6A9 -> U+E6DE
+  ["e29aa0", "ee9cb7"], # [WARNING SIGN] U+26A0 -> U+E737
+  ["e29b94", "ee9caf"], # [NO ENTRY] U+26D4 -> U+E72F
+  ["e299bb", "ee9cb5"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+267B -> U+E735
+  ["f09f9ab2", "ee9c9d"], # [BICYCLE] U+1F6B2 -> U+E71D
+  ["f09f9ab6", "ee9cb3"], # [PEDESTRIAN] U+1F6B6 -> U+E733
+  ["f09f9ab9", :undef], # [MENS SYMBOL] U+1F6B9 -> "[♂]"
+  ["f09f9aba", :undef], # [WOMENS SYMBOL] U+1F6BA -> "[♀]"
+  ["f09f9b80", "ee9bb7"], # [BATH] U+1F6C0 -> U+E6F7
+  ["f09f9abb", "ee99ae"], # [RESTROOM] U+1F6BB -> U+E66E
+  ["f09f9abd", "ee99ae"], # [TOILET] U+1F6BD -> U+E66E
+  ["f09f9abe", "ee99ae"], # [WATER CLOSET] U+1F6BE -> U+E66E
+  ["f09f9abc", :undef], # [BABY SYMBOL] U+1F6BC -> "[赤ちゃん]"
+  ["f09f9aaa", "ee9c94"], # [DOOR] U+1F6AA -> U+E714
+  ["f09f9aab", "ee9cb8"], # [NO ENTRY SIGN] U+1F6AB -> U+E738
+  ["e29c94", :undef], # [HEAVY CHECK MARK] U+2714 -> "[チェックマーク]"
+  ["f09f8691", "ee9b9b"], # [SQUARED CL] U+1F191 -> U+E6DB
+  ["f09f8692", :undef], # [SQUARED COOL] U+1F192 -> "[COOL]"
+  ["f09f8693", "ee9b97"], # [SQUARED FREE] U+1F193 -> U+E6D7
+  ["f09f8694", "ee9b98"], # [SQUARED ID] U+1F194 -> U+E6D8
+  ["f09f8695", "ee9b9d"], # [SQUARED NEW] U+1F195 -> U+E6DD
+  ["f09f8696", "ee9caf"], # [SQUARED NG] U+1F196 -> U+E72F
+  ["f09f8697", "ee9c8b"], # [SQUARED OK] U+1F197 -> U+E70B
+  ["f09f8698", :undef], # [SQUARED SOS] U+1F198 -> "[SOS]"
+  ["f09f8699", :undef], # [SQUARED UP WITH EXCLAMATION MARK] U+1F199 -> "[UP!]"
+  ["f09f869a", :undef], # [SQUARED VS] U+1F19A -> "[VS]"
+  ["f09f8881", :undef], # [SQUARED KATAKANA KOKO] U+1F201 -> "[ココ]"
+  ["f09f8882", :undef], # [SQUARED KATAKANA SA] U+1F202 -> "[サービス]"
+  ["f09f88b2", "ee9cb8"], # [SQUARED CJK UNIFIED IDEOGRAPH-7981] U+1F232 -> U+E738
+  ["f09f88b3", "ee9cb9"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+1F233 -> U+E739
+  ["f09f88b4", "ee9cba"], # [SQUARED CJK UNIFIED IDEOGRAPH-5408] U+1F234 -> U+E73A
+  ["f09f88b5", "ee9cbb"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+1F235 -> U+E73B
+  ["f09f88b6", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6709] U+1F236 -> "[有]"
+  ["f09f889a", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7121] U+1F21A -> "[無]"
+  ["f09f88b7", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6708] U+1F237 -> "[月]"
+  ["f09f88b8", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7533] U+1F238 -> "[申]"
+  ["f09f88b9", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+1F239 -> "[割]"
+  ["f09f88af", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+1F22F -> "[指]"
+  ["f09f88ba", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+1F23A -> "[営]"
+  ["e38a99", "ee9cb4"], # [CIRCLED IDEOGRAPH SECRET] U+3299 -> U+E734
+  ["e38a97", :undef], # [CIRCLED IDEOGRAPH CONGRATULATION] U+3297 -> "[祝]"
+  ["f09f8990", :undef], # [CIRCLED IDEOGRAPH ADVANTAGE] U+1F250 -> "[得]"
+  ["f09f8991", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+1F251 -> "[可]"
+  ["e29e95", :undef], # [HEAVY PLUS SIGN] U+2795 -> "[＋]"
+  ["e29e96", :undef], # [HEAVY MINUS SIGN] U+2796 -> "[－]"
+  ["e29c96", :undef], # [HEAVY MULTIPLICATION X] U+2716 -> "[×]"
+  ["e29e97", :undef], # [HEAVY DIVISION SIGN] U+2797 -> "[÷]"
+  ["f09f92a0", "ee9bb8"], # [DIAMOND SHAPE WITH A DOT INSIDE] U+1F4A0 -> U+E6F8
+  ["f09f92a1", "ee9bbb"], # [ELECTRIC LIGHT BULB] U+1F4A1 -> U+E6FB
+  ["f09f92a2", "ee9bbc"], # [ANGER SYMBOL] U+1F4A2 -> U+E6FC
+  ["f09f92a3", "ee9bbe"], # [BOMB] U+1F4A3 -> U+E6FE
+  ["f09f92a4", "ee9c81"], # [SLEEPING SYMBOL] U+1F4A4 -> U+E701
+  ["f09f92a5", "ee9c85"], # [COLLISION SYMBOL] U+1F4A5 -> U+E705
+  ["f09f92a6", "ee9c86"], # [SPLASHING SWEAT SYMBOL] U+1F4A6 -> U+E706
+  ["f09f92a7", "ee9c87"], # [DROP OF WATER] U+1F4A7 -> U+E707
+  ["f09f92a8", "ee9c88"], # [DASH SYMBOL] U+1F4A8 -> U+E708
+  ["f09f92a9", :undef], # [PILE OF POO] U+1F4A9 -> "[ウンチ]"
+  ["f09f92aa", :undef], # [FLEXED BICEPS] U+1F4AA -> "[力こぶ]"
+  ["f09f92ab", :undef], # [DIZZY SYMBOL] U+1F4AB -> "[クラクラ]"
+  ["f09f92ac", :undef], # [SPEECH BALLOON] U+1F4AC -> "[フキダシ]"
+  ["e29ca8", "ee9bba"], # [SPARKLES] U+2728 -> U+E6FA
+  ["e29cb4", "ee9bb8"], # [EIGHT POINTED BLACK STAR] U+2734 -> U+E6F8
+  ["e29cb3", "ee9bb8"], # [EIGHT SPOKED ASTERISK] U+2733 -> U+E6F8
+  ["e29aaa", "ee9a9c"], # [MEDIUM WHITE CIRCLE] U+26AA -> U+E69C
+  ["e29aab", "ee9a9c"], # [MEDIUM BLACK CIRCLE] U+26AB -> U+E69C
+  ["f09f94b4", "ee9a9c"], # [LARGE RED CIRCLE] U+1F534 -> U+E69C
+  ["f09f94b5", "ee9a9c"], # [LARGE BLUE CIRCLE] U+1F535 -> U+E69C
+  ["f09f94b2", "ee9a9c"], # [BLACK SQUARE BUTTON] U+1F532 -> U+E69C
+  ["f09f94b3", "ee9a9c"], # [WHITE SQUARE BUTTON] U+1F533 -> U+E69C
+  ["e2ad90", :undef], # [WHITE MEDIUM STAR] U+2B50 -> "[☆]"
+  ["e2ac9c", :undef], # [WHITE LARGE SQUARE] U+2B1C -> "■"
+  ["e2ac9b", :undef], # [BLACK LARGE SQUARE] U+2B1B -> "■"
+  ["e296ab", :undef], # [WHITE SMALL SQUARE] U+25AB -> "■"
+  ["e296aa", :undef], # [BLACK SMALL SQUARE] U+25AA -> "■"
+  ["e297bd", :undef], # [WHITE MEDIUM SMALL SQUARE] U+25FD -> "■"
+  ["e297be", :undef], # [BLACK MEDIUM SMALL SQUARE] U+25FE -> "■"
+  ["e297bb", :undef], # [WHITE MEDIUM SQUARE] U+25FB -> "■"
+  ["e297bc", :undef], # [BLACK MEDIUM SQUARE] U+25FC -> "■"
+  ["f09f94b6", :undef], # [LARGE ORANGE DIAMOND] U+1F536 -> "◆"
+  ["f09f94b7", :undef], # [LARGE BLUE DIAMOND] U+1F537 -> "◆"
+  ["f09f94b8", :undef], # [SMALL ORANGE DIAMOND] U+1F538 -> "◆"
+  ["f09f94b9", :undef], # [SMALL BLUE DIAMOND] U+1F539 -> "◆"
+  ["e29d87", "ee9bba"], # [SPARKLE] U+2747 -> U+E6FA
+  ["f09f92ae", :undef], # [WHITE FLOWER] U+1F4AE -> "[花丸]"
+  ["f09f92af", :undef], # [HUNDRED POINTS SYMBOL] U+1F4AF -> "[100点]"
+  ["e286a9", "ee9b9a"], # [LEFTWARDS ARROW WITH HOOK] U+21A9 -> U+E6DA
+  ["e286aa", :undef], # [RIGHTWARDS ARROW WITH HOOK] U+21AA -> "└→"
+  ["f09f9483", "ee9cb5"], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+1F503 -> U+E735
+  ["f09f948a", :undef], # [SPEAKER WITH THREE SOUND WAVES] U+1F50A -> "[スピーカ]"
+  ["f09f948b", :undef], # [BATTERY] U+1F50B -> "[電池]"
+  ["f09f948c", :undef], # [ELECTRIC PLUG] U+1F50C -> "[コンセント]"
+  ["f09f948d", "ee9b9c"], # [LEFT-POINTING MAGNIFYING GLASS] U+1F50D -> U+E6DC
+  ["f09f948e", "ee9b9c"], # [RIGHT-POINTING MAGNIFYING GLASS] U+1F50E -> U+E6DC
+  ["f09f9492", "ee9b99"], # [LOCK] U+1F512 -> U+E6D9
+  ["f09f9493", "ee9b99"], # [OPEN LOCK] U+1F513 -> U+E6D9
+  ["f09f948f", "ee9b99"], # [LOCK WITH INK PEN] U+1F50F -> U+E6D9
+  ["f09f9490", "ee9b99"], # [CLOSED LOCK WITH KEY] U+1F510 -> U+E6D9
+  ["f09f9491", "ee9b99"], # [KEY] U+1F511 -> U+E6D9
+  ["f09f9494", "ee9c93"], # [BELL] U+1F514 -> U+E713
+  ["e29891", :undef], # [BALLOT BOX WITH CHECK] U+2611 -> "[チェックマーク]"
+  ["f09f9498", :undef], # [RADIO BUTTON] U+1F518 -> "[ラジオボタン]"
+  ["f09f9496", :undef], # [BOOKMARK] U+1F516 -> "[ブックマーク]"
+  ["f09f9497", :undef], # [LINK SYMBOL] U+1F517 -> "[リンク]"
+  ["f09f9499", :undef], # [BACK WITH LEFTWARDS ARROW ABOVE] U+1F519 -> "[←BACK]"
+  ["f09f949a", "ee9ab9"], # [END WITH LEFTWARDS ARROW ABOVE] U+1F51A -> U+E6B9
+  ["f09f949b", "ee9ab8"], # [ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE] U+1F51B -> U+E6B8
+  ["f09f949c", "ee9ab7"], # [SOON WITH RIGHTWARDS ARROW ABOVE] U+1F51C -> U+E6B7
+  ["f09f949d", :undef], # [TOP WITH UPWARDS ARROW ABOVE] U+1F51D -> "[TOP]"
+  ["e28083", :undef], # [EM SPACE] U+2003 -> U+3013 (GETA)
+  ["e28082", :undef], # [EN SPACE] U+2002 -> U+3013 (GETA)
+  ["e28085", :undef], # [FOUR-PER-EM SPACE] U+2005 -> U+3013 (GETA)
+  ["e29c85", :undef], # [WHITE HEAVY CHECK MARK] U+2705 -> "[チェックマーク]"
+  ["e29c8a", "ee9a93"], # [RAISED FIST] U+270A -> U+E693
+  ["e29c8b", "ee9a95"], # [RAISED HAND] U+270B -> U+E695
+  ["e29c8c", "ee9a94"], # [VICTORY HAND] U+270C -> U+E694
+  ["f09f918a", "ee9bbd"], # [FISTED HAND SIGN] U+1F44A -> U+E6FD
+  ["f09f918d", "ee9ca7"], # [THUMBS UP SIGN] U+1F44D -> U+E727
+  ["e2989d", :undef], # [WHITE UP POINTING INDEX] U+261D -> "[人差し指]"
+  ["f09f9186", :undef], # [WHITE UP POINTING BACKHAND INDEX] U+1F446 -> "[↑]"
+  ["f09f9187", :undef], # [WHITE DOWN POINTING BACKHAND INDEX] U+1F447 -> "[↓]"
+  ["f09f9188", :undef], # [WHITE LEFT POINTING BACKHAND INDEX] U+1F448 -> "[←]"
+  ["f09f9189", :undef], # [WHITE RIGHT POINTING BACKHAND INDEX] U+1F449 -> "[→]"
+  ["f09f918b", "ee9a95"], # [WAVING HAND SIGN] U+1F44B -> U+E695
+  ["f09f918f", :undef], # [CLAPPING HANDS SIGN] U+1F44F -> "[拍手]"
+  ["f09f918c", "ee9c8b"], # [OK HAND SIGN] U+1F44C -> U+E70B
+  ["f09f918e", "ee9c80"], # [THUMBS DOWN SIGN] U+1F44E -> U+E700
+  ["f09f9190", "ee9a95"], # [OPEN HANDS SIGN] U+1F450 -> U+E695
+]
+
+EMOJI_EXCHANGE_TBL['UTF-8']['UTF8-KDDI'] = [
+  ["e29880", "ee9288"], # [BLACK SUN WITH RAYS] U+2600 -> U+E488
+  ["e29881", "ee928d"], # [CLOUD] U+2601 -> U+E48D
+  ["e29894", "ee928c"], # [UMBRELLA WITH RAIN DROPS] U+2614 -> U+E48C
+  ["e29b84", "ee9285"], # [SNOWMAN WITHOUT SNOW] U+26C4 -> U+E485
+  ["e29aa1", "ee9287"], # [HIGH VOLTAGE SIGN] U+26A1 -> U+E487
+  ["f09f8c80", "ee91a9"], # [CYCLONE] U+1F300 -> U+E469
+  ["f09f8c81", "ee9698"], # [FOGGY] U+1F301 -> U+E598
+  ["f09f8c82", "eeaba8"], # [CLOSED UMBRELLA] U+1F302 -> U+EAE8
+  ["f09f8c83", "eeabb1"], # [NIGHT WITH STARS] U+1F303 -> U+EAF1
+  ["f09f8c84", "eeabb4"], # [SUNRISE OVER MOUNTAINS] U+1F304 -> U+EAF4
+  ["f09f8c85", "eeabb4"], # [SUNRISE] U+1F305 -> U+EAF4
+  ["f09f8c87", "ee979a"], # [SUNSET OVER BUILDINGS] U+1F307 -> U+E5DA
+  ["f09f8c88", "eeabb2"], # [RAINBOW] U+1F308 -> U+EAF2
+  ["e29d84", "ee928a"], # [SNOWFLAKE] U+2744 -> U+E48A
+  ["e29b85", "ee928e"], # [SUN BEHIND CLOUD] U+26C5 -> U+E48E
+  ["f09f8c89", "ee92bf"], # [BRIDGE AT NIGHT] U+1F309 -> U+E4BF
+  ["f09f8c8a", "eeadbc"], # [WATER WAVE] U+1F30A -> U+EB7C
+  ["f09f8c8b", "eead93"], # [VOLCANO] U+1F30B -> U+EB53
+  ["f09f8c8c", "eead9f"], # [MILKY WAY] U+1F30C -> U+EB5F
+  ["f09f8c8f", "ee96b3"], # [EARTH GLOBE ASIA-AUSTRALIA] U+1F30F -> U+E5B3
+  ["f09f8c91", "ee96a8"], # [NEW MOON SYMBOL] U+1F311 -> U+E5A8
+  ["f09f8c94", "ee96a9"], # [WAXING GIBBOUS MOON SYMBOL] U+1F314 -> U+E5A9
+  ["f09f8c93", "ee96aa"], # [FIRST QUARTER MOON SYMBOL] U+1F313 -> U+E5AA
+  ["f09f8c99", "ee9286"], # [CRESCENT MOON] U+1F319 -> U+E486
+  ["f09f8c95", :undef], # [FULL MOON SYMBOL] U+1F315 -> "○"
+  ["f09f8c9b", "ee9289"], # [FIRST QUARTER MOON WITH FACE] U+1F31B -> U+E489
+  ["f09f8c9f", "ee928b"], # [GLOWING STAR] U+1F31F -> U+E48B
+  ["f09f8ca0", "ee91a8"], # [SHOOTING STAR] U+1F320 -> U+E468
+  ["f09f9590", "ee9694"], # [CLOCK FACE ONE OCLOCK] U+1F550 -> U+E594
+  ["f09f9591", "ee9694"], # [CLOCK FACE TWO OCLOCK] U+1F551 -> U+E594
+  ["f09f9592", "ee9694"], # [CLOCK FACE THREE OCLOCK] U+1F552 -> U+E594
+  ["f09f9593", "ee9694"], # [CLOCK FACE FOUR OCLOCK] U+1F553 -> U+E594
+  ["f09f9594", "ee9694"], # [CLOCK FACE FIVE OCLOCK] U+1F554 -> U+E594
+  ["f09f9595", "ee9694"], # [CLOCK FACE SIX OCLOCK] U+1F555 -> U+E594
+  ["f09f9596", "ee9694"], # [CLOCK FACE SEVEN OCLOCK] U+1F556 -> U+E594
+  ["f09f9597", "ee9694"], # [CLOCK FACE EIGHT OCLOCK] U+1F557 -> U+E594
+  ["f09f9598", "ee9694"], # [CLOCK FACE NINE OCLOCK] U+1F558 -> U+E594
+  ["f09f9599", "ee9694"], # [CLOCK FACE TEN OCLOCK] U+1F559 -> U+E594
+  ["f09f959a", "ee9694"], # [CLOCK FACE ELEVEN OCLOCK] U+1F55A -> U+E594
+  ["f09f959b", "ee9694"], # [CLOCK FACE TWELVE OCLOCK] U+1F55B -> U+E594
+  ["e28c9a", "ee95ba"], # [WATCH] U+231A -> U+E57A
+  ["e28c9b", "ee95bb"], # [HOURGLASS] U+231B -> U+E57B
+  ["e28fb0", "ee9694"], # [ALARM CLOCK] U+23F0 -> U+E594
+  ["e28fb3", "ee91bc"], # [HOURGLASS WITH FLOWING SAND] U+23F3 -> U+E47C
+  ["e29988", "ee928f"], # [ARIES] U+2648 -> U+E48F
+  ["e29989", "ee9290"], # [TAURUS] U+2649 -> U+E490
+  ["e2998a", "ee9291"], # [GEMINI] U+264A -> U+E491
+  ["e2998b", "ee9292"], # [CANCER] U+264B -> U+E492
+  ["e2998c", "ee9293"], # [LEO] U+264C -> U+E493
+  ["e2998d", "ee9294"], # [VIRGO] U+264D -> U+E494
+  ["e2998e", "ee9295"], # [LIBRA] U+264E -> U+E495
+  ["e2998f", "ee9296"], # [SCORPIUS] U+264F -> U+E496
+  ["e29990", "ee9297"], # [SAGITTARIUS] U+2650 -> U+E497
+  ["e29991", "ee9298"], # [CAPRICORN] U+2651 -> U+E498
+  ["e29992", "ee9299"], # [AQUARIUS] U+2652 -> U+E499
+  ["e29993", "ee929a"], # [PISCES] U+2653 -> U+E49A
+  ["e29b8e", "ee929b"], # [OPHIUCHUS] U+26CE -> U+E49B
+  ["f09f8d80", "ee9493"], # [FOUR LEAF CLOVER] U+1F340 -> U+E513
+  ["f09f8cb7", "ee93a4"], # [TULIP] U+1F337 -> U+E4E4
+  ["f09f8cb1", "eeadbd"], # [SEEDLING] U+1F331 -> U+EB7D
+  ["f09f8d81", "ee938e"], # [MAPLE LEAF] U+1F341 -> U+E4CE
+  ["f09f8cb8", "ee938a"], # [CHERRY BLOSSOM] U+1F338 -> U+E4CA
+  ["f09f8cb9", "ee96ba"], # [ROSE] U+1F339 -> U+E5BA
+  ["f09f8d82", "ee978d"], # [FALLEN LEAF] U+1F342 -> U+E5CD
+  ["f09f8d83", "ee978d"], # [LEAF FLUTTERING IN WIND] U+1F343 -> U+E5CD
+  ["f09f8cba", "eeaa94"], # [HIBISCUS] U+1F33A -> U+EA94
+  ["f09f8cbb", "ee93a3"], # [SUNFLOWER] U+1F33B -> U+E4E3
+  ["f09f8cb4", "ee93a2"], # [PALM TREE] U+1F334 -> U+E4E2
+  ["f09f8cb5", "eeaa96"], # [CACTUS] U+1F335 -> U+EA96
+  ["f09f8cbe", :undef], # [EAR OF RICE] U+1F33E -> "[稲穂]"
+  ["f09f8cbd", "eeacb6"], # [EAR OF MAIZE] U+1F33D -> U+EB36
+  ["f09f8d84", "eeacb7"], # [MUSHROOM] U+1F344 -> U+EB37
+  ["f09f8cb0", "eeacb8"], # [CHESTNUT] U+1F330 -> U+EB38
+  ["f09f8cbc", "eead89"], # [BLOSSOM] U+1F33C -> U+EB49
+  ["f09f8cbf", "eeae82"], # [HERB] U+1F33F -> U+EB82
+  ["f09f8d92", "ee9392"], # [CHERRIES] U+1F352 -> U+E4D2
+  ["f09f8d8c", "eeacb5"], # [BANANA] U+1F34C -> U+EB35
+  ["f09f8d8e", "eeaab9"], # [RED APPLE] U+1F34E -> U+EAB9
+  ["f09f8d8a", "eeaaba"], # [TANGERINE] U+1F34A -> U+EABA
+  ["f09f8d93", "ee9394"], # [STRAWBERRY] U+1F353 -> U+E4D4
+  ["f09f8d89", "ee938d"], # [WATERMELON] U+1F349 -> U+E4CD
+  ["f09f8d85", "eeaabb"], # [TOMATO] U+1F345 -> U+EABB
+  ["f09f8d86", "eeaabc"], # [AUBERGINE] U+1F346 -> U+EABC
+  ["f09f8d88", "eeacb2"], # [MELON] U+1F348 -> U+EB32
+  ["f09f8d8d", "eeacb3"], # [PINEAPPLE] U+1F34D -> U+EB33
+  ["f09f8d87", "eeacb4"], # [GRAPES] U+1F347 -> U+EB34
+  ["f09f8d91", "eeacb9"], # [PEACH] U+1F351 -> U+EB39
+  ["f09f8d8f", "eead9a"], # [GREEN APPLE] U+1F34F -> U+EB5A
+  ["f09f9180", "ee96a4"], # [EYES] U+1F440 -> U+E5A4
+  ["f09f9182", "ee96a5"], # [EAR] U+1F442 -> U+E5A5
+  ["f09f9183", "eeab90"], # [NOSE] U+1F443 -> U+EAD0
+  ["f09f9184", "eeab91"], # [MOUTH] U+1F444 -> U+EAD1
+  ["f09f9185", "eead87"], # [TONGUE] U+1F445 -> U+EB47
+  ["f09f9284", "ee9489"], # [LIPSTICK] U+1F484 -> U+E509
+  ["f09f9285", "eeaaa0"], # [NAIL POLISH] U+1F485 -> U+EAA0
+  ["f09f9286", "ee948b"], # [FACE MASSAGE] U+1F486 -> U+E50B
+  ["f09f9287", "eeaaa1"], # [HAIRCUT] U+1F487 -> U+EAA1
+  ["f09f9288", "eeaaa2"], # [BARBER POLE] U+1F488 -> U+EAA2
+  ["f09f91a4", :undef], # [BUST IN SILHOUETTE] U+1F464 -> U+3013 (GETA)
+  ["f09f91a6", "ee93bc"], # [BOY] U+1F466 -> U+E4FC
+  ["f09f91a7", "ee93ba"], # [GIRL] U+1F467 -> U+E4FA
+  ["f09f91a8", "ee93bc"], # [MAN] U+1F468 -> U+E4FC
+  ["f09f91a9", "ee93ba"], # [WOMAN] U+1F469 -> U+E4FA
+  ["f09f91aa", "ee9481"], # [FAMILY] U+1F46A -> U+E501
+  ["f09f91ab", :undef], # [MAN AND WOMAN HOLDING HANDS] U+1F46B -> "[カップル]"
+  ["f09f91ae", "ee979d"], # [POLICE OFFICER] U+1F46E -> U+E5DD
+  ["f09f91af", "eeab9b"], # [WOMAN WITH BUNNY EARS] U+1F46F -> U+EADB
+  ["f09f91b0", "eeaba9"], # [BRIDE WITH VEIL] U+1F470 -> U+EAE9
+  ["f09f91b1", "eeac93"], # [WESTERN PERSON] U+1F471 -> U+EB13
+  ["f09f91b2", "eeac94"], # [MAN WITH GUA PI MAO] U+1F472 -> U+EB14
+  ["f09f91b3", "eeac95"], # [MAN WITH TURBAN] U+1F473 -> U+EB15
+  ["f09f91b4", "eeac96"], # [OLDER MAN] U+1F474 -> U+EB16
+  ["f09f91b5", "eeac97"], # [OLDER WOMAN] U+1F475 -> U+EB17
+  ["f09f91b6", "eeac98"], # [BABY] U+1F476 -> U+EB18
+  ["f09f91b7", "eeac99"], # [CONSTRUCTION WORKER] U+1F477 -> U+EB19
+  ["f09f91b8", "eeac9a"], # [PRINCESS] U+1F478 -> U+EB1A
+  ["f09f91b9", "eead84"], # [JAPANESE OGRE] U+1F479 -> U+EB44
+  ["f09f91ba", "eead85"], # [JAPANESE GOBLIN] U+1F47A -> U+EB45
+  ["f09f91bb", "ee938b"], # [GHOST] U+1F47B -> U+E4CB
+  ["f09f91bc", "ee96bf"], # [BABY ANGEL] U+1F47C -> U+E5BF
+  ["f09f91bd", "ee948e"], # [EXTRATERRESTRIAL ALIEN] U+1F47D -> U+E50E
+  ["f09f91be", "ee93ac"], # [ALIEN MONSTER] U+1F47E -> U+E4EC
+  ["f09f91bf", "ee93af"], # [IMP] U+1F47F -> U+E4EF
+  ["f09f9280", "ee93b8"], # [SKULL] U+1F480 -> U+E4F8
+  ["f09f9281", :undef], # [INFORMATION DESK PERSON] U+1F481 -> "[案内]"
+  ["f09f9282", :undef], # [GUARDSMAN] U+1F482 -> "[衛兵]"
+  ["f09f9283", "eeac9c"], # [DANCER] U+1F483 -> U+EB1C
+  ["f09f908c", "eeadbe"], # [SNAIL] U+1F40C -> U+EB7E
+  ["f09f908d", "eeaca2"], # [SNAKE] U+1F40D -> U+EB22
+  ["f09f908e", "ee9398"], # [HORSE] U+1F40E -> U+E4D8
+  ["f09f9094", "eeaca3"], # [CHICKEN] U+1F414 -> U+EB23
+  ["f09f9097", "eeaca4"], # [BOAR] U+1F417 -> U+EB24
+  ["f09f90ab", "eeaca5"], # [BACTRIAN CAMEL] U+1F42B -> U+EB25
+  ["f09f9098", "eeac9f"], # [ELEPHANT] U+1F418 -> U+EB1F
+  ["f09f90a8", "eeaca0"], # [KOALA] U+1F428 -> U+EB20
+  ["f09f9092", "ee9399"], # [MONKEY] U+1F412 -> U+E4D9
+  ["f09f9091", "ee928f"], # [SHEEP] U+1F411 -> U+E48F
+  ["f09f9099", "ee9787"], # [OCTOPUS] U+1F419 -> U+E5C7
+  ["f09f909a", "eeabac"], # [SPIRAL SHELL] U+1F41A -> U+EAEC
+  ["f09f909b", "eeac9e"], # [BUG] U+1F41B -> U+EB1E
+  ["f09f909c", "ee939d"], # [ANT] U+1F41C -> U+E4DD
+  ["f09f909d", "eead97"], # [HONEYBEE] U+1F41D -> U+EB57
+  ["f09f909e", "eead98"], # [LADY BEETLE] U+1F41E -> U+EB58
+  ["f09f90a0", "eeac9d"], # [TROPICAL FISH] U+1F420 -> U+EB1D
+  ["f09f90a1", "ee9393"], # [BLOWFISH] U+1F421 -> U+E4D3
+  ["f09f90a2", "ee9794"], # [TURTLE] U+1F422 -> U+E5D4
+  ["f09f90a4", "ee93a0"], # [BABY CHICK] U+1F424 -> U+E4E0
+  ["f09f90a5", "eeadb6"], # [FRONT-FACING BABY CHICK] U+1F425 -> U+EB76
+  ["f09f90a6", "ee93a0"], # [BIRD] U+1F426 -> U+E4E0
+  ["f09f90a3", "ee979b"], # [HATCHING CHICK] U+1F423 -> U+E5DB
+  ["f09f90a7", "ee939c"], # [PENGUIN] U+1F427 -> U+E4DC
+  ["f09f90a9", "ee939f"], # [POODLE] U+1F429 -> U+E4DF
+  ["f09f909f", "ee929a"], # [FISH] U+1F41F -> U+E49A
+  ["f09f90ac", "eeac9b"], # [DOLPHIN] U+1F42C -> U+EB1B
+  ["f09f90ad", "ee9782"], # [MOUSE FACE] U+1F42D -> U+E5C2
+  ["f09f90af", "ee9780"], # [TIGER FACE] U+1F42F -> U+E5C0
+  ["f09f90b1", "ee939b"], # [CAT FACE] U+1F431 -> U+E4DB
+  ["f09f90b3", "ee91b0"], # [SPOUTING WHALE] U+1F433 -> U+E470
+  ["f09f90b4", "ee9398"], # [HORSE FACE] U+1F434 -> U+E4D8
+  ["f09f90b5", "ee9399"], # [MONKEY FACE] U+1F435 -> U+E4D9
+  ["f09f90b6", "ee93a1"], # [DOG FACE] U+1F436 -> U+E4E1
+  ["f09f90b7", "ee939e"], # [PIG FACE] U+1F437 -> U+E4DE
+  ["f09f90bb", "ee9781"], # [BEAR FACE] U+1F43B -> U+E5C1
+  ["f09f90b9", :undef], # [HAMSTER FACE] U+1F439 -> "[ハムスター]"
+  ["f09f90ba", "ee93a1"], # [WOLF FACE] U+1F43A -> U+E4E1
+  ["f09f90ae", "eeaca1"], # [COW FACE] U+1F42E -> U+EB21
+  ["f09f90b0", "ee9397"], # [RABBIT FACE] U+1F430 -> U+E4D7
+  ["f09f90b8", "ee939a"], # [FROG FACE] U+1F438 -> U+E4DA
+  ["f09f90be", "ee93ae"], # [PAW PRINTS] U+1F43E -> U+E4EE
+  ["f09f90b2", "eeacbf"], # [DRAGON FACE] U+1F432 -> U+EB3F
+  ["f09f90bc", "eead86"], # [PANDA FACE] U+1F43C -> U+EB46
+  ["f09f90bd", "eead88"], # [PIG NOSE] U+1F43D -> U+EB48
+  ["f09f9880", "ee91b2"], # [ANGRY FACE] U+1F600 -> U+E472
+  ["f09f9881", "eeada7"], # [ANGUISHED FACE] U+1F601 -> U+EB67
+  ["f09f9882", "eeab8a"], # [ASTONISHED FACE] U+1F602 -> U+EACA
+  ["f09f9883", "eeab80"], # [DISAPPOINTED FACE] U+1F603 -> U+EAC0
+  ["f09f9884", "ee96ae"], # [DIZZY FACE] U+1F604 -> U+E5AE
+  ["f09f9885", "eeab8b"], # [EXASPERATED FACE] U+1F605 -> U+EACB
+  ["f09f9886", "eeab89"], # [EXPRESSIONLESS FACE] U+1F606 -> U+EAC9
+  ["f09f9887", "ee9784"], # [FACE WITH HEART-SHAPED EYES] U+1F607 -> U+E5C4
+  ["f09f9888", "eeab81"], # [FACE WITH LOOK OF TRIUMPH] U+1F608 -> U+EAC1
+  ["f09f9889", "ee93a7"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+1F609 -> U+E4E7
+  ["f09f988a", "ee93a7"], # [FACE WITH STUCK-OUT TONGUE] U+1F60A -> U+E4E7
+  ["f09f988b", "eeab8d"], # [FACE SAVOURING DELICIOUS FOOD] U+1F60B -> U+EACD
+  ["f09f988c", "eeab8f"], # [FACE THROWING A KISS] U+1F60C -> U+EACF
+  ["f09f988d", "eeab8e"], # [FACE KISSING] U+1F60D -> U+EACE
+  ["f09f988e", "eeab87"], # [FACE WITH MASK] U+1F60E -> U+EAC7
+  ["f09f988f", "eeab88"], # [FLUSHED FACE] U+1F60F -> U+EAC8
+  ["f09f9890", "ee91b1"], # [HAPPY FACE WITH OPEN MOUTH] U+1F610 -> U+E471
+  ["f09f9891", "ee91b1ee96b1"], # [HAPPY FACE WITH OPEN MOUTH AND COLD SWEAT] U+1F611 -> U+E471 U+E5B1
+  ["f09f9892", "eeab85"], # [HAPPY FACE WITH OPEN MOUTH AND CLOSED EYES] U+1F612 -> U+EAC5
+  ["f09f9893", "eeae80"], # [HAPPY FACE WITH GRIN] U+1F613 -> U+EB80
+  ["f09f9894", "eeada4"], # [HAPPY AND CRYING FACE] U+1F614 -> U+EB64
+  ["f09f9895", "eeab8d"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+1F615 -> U+EACD
+  ["e298ba", "ee93bb"], # [WHITE SMILING FACE] U+263A -> U+E4FB
+  ["f09f9896", "ee91b1"], # [HAPPY FACE WITH OPEN MOUTH AND RAISED EYEBROWS] U+1F616 -> U+E471
+  ["f09f9897", "eeada9"], # [CRYING FACE] U+1F617 -> U+EB69
+  ["f09f9898", "ee91b3"], # [LOUDLY CRYING FACE] U+1F618 -> U+E473
+  ["f09f9899", "eeab86"], # [FEARFUL FACE] U+1F619 -> U+EAC6
+  ["f09f989a", "eeab82"], # [PERSEVERING FACE] U+1F61A -> U+EAC2
+  ["f09f989b", "eead9d"], # [POUTING FACE] U+1F61B -> U+EB5D
+  ["f09f989c", "eeab85"], # [RELIEVED FACE] U+1F61C -> U+EAC5
+  ["f09f989d", "eeab83"], # [CONFOUNDED FACE] U+1F61D -> U+EAC3
+  ["f09f989e", "eeab80"], # [PENSIVE FACE] U+1F61E -> U+EAC0
+  ["f09f989f", "ee9785"], # [FACE SCREAMING IN FEAR] U+1F61F -> U+E5C5
+  ["f09f98a0", "eeab84"], # [SLEEPY FACE] U+1F620 -> U+EAC4
+  ["f09f98a1", "eeaabf"], # [SMIRKING FACE] U+1F621 -> U+EABF
+  ["f09f98a2", "ee9786"], # [FACE WITH COLD SWEAT] U+1F622 -> U+E5C6
+  ["f09f98a3", "ee9786"], # [DISAPPOINTED BUT RELIEVED FACE] U+1F623 -> U+E5C6
+  ["f09f98a4", "ee91b4"], # [TIRED FACE] U+1F624 -> U+E474
+  ["f09f98a5", "ee9783"], # [WINKING FACE] U+1F625 -> U+E5C3
+  ["f09f98ab", "eeada1"], # [CAT FACE WITH OPEN MOUTH] U+1F62B -> U+EB61
+  ["f09f98ac", "eeadbf"], # [HAPPY CAT FACE WITH GRIN] U+1F62C -> U+EB7F
+  ["f09f98ad", "eeada3"], # [HAPPY AND CRYING CAT FACE] U+1F62D -> U+EB63
+  ["f09f98ae", "eeada0"], # [CAT FACE KISSING] U+1F62E -> U+EB60
+  ["f09f98af", "eeada5"], # [CAT FACE WITH HEART-SHAPED EYES] U+1F62F -> U+EB65
+  ["f09f98b0", "eeada8"], # [CRYING CAT FACE] U+1F630 -> U+EB68
+  ["f09f98b1", "eead9e"], # [POUTING CAT FACE] U+1F631 -> U+EB5E
+  ["f09f98b2", "eeadaa"], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+1F632 -> U+EB6A
+  ["f09f98b3", "eeada6"], # [ANGUISHED CAT FACE] U+1F633 -> U+EB66
+  ["f09f98b4", "eeab97"], # [FACE WITH NO GOOD GESTURE] U+1F634 -> U+EAD7
+  ["f09f98b5", "eeab98"], # [FACE WITH OK GESTURE] U+1F635 -> U+EAD8
+  ["f09f98b6", "eeab99"], # [PERSON BOWING DEEPLY] U+1F636 -> U+EAD9
+  ["f09f98b7", "eead90"], # [SEE-NO-EVIL MONKEY] U+1F637 -> U+EB50
+  ["f09f98b9", "eead91"], # [SPEAK-NO-EVIL MONKEY] U+1F639 -> U+EB51
+  ["f09f98b8", "eead92"], # [HEAR-NO-EVIL MONKEY] U+1F638 -> U+EB52
+  ["f09f98ba", "eeae85"], # [PERSON RAISING ONE HAND] U+1F63A -> U+EB85
+  ["f09f98bb", "eeae86"], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+1F63B -> U+EB86
+  ["f09f98bc", "eeae87"], # [PERSON FROWNING] U+1F63C -> U+EB87
+  ["f09f98bd", "eeae88"], # [PERSON WITH POUTING FACE] U+1F63D -> U+EB88
+  ["f09f98be", "eeab92"], # [PERSON WITH FOLDED HANDS] U+1F63E -> U+EAD2
+  ["f09f8fa0", "ee92ab"], # [HOUSE BUILDING] U+1F3E0 -> U+E4AB
+  ["f09f8fa1", "eeac89"], # [HOUSE WITH GARDEN] U+1F3E1 -> U+EB09
+  ["f09f8fa2", "ee92ad"], # [OFFICE BUILDING] U+1F3E2 -> U+E4AD
+  ["f09f8fa3", "ee979e"], # [JAPANESE POST OFFICE] U+1F3E3 -> U+E5DE
+  ["f09f8fa5", "ee979f"], # [HOSPITAL] U+1F3E5 -> U+E5DF
+  ["f09f8fa6", "ee92aa"], # [BANK] U+1F3E6 -> U+E4AA
+  ["f09f8fa7", "ee92a3"], # [AUTOMATED TELLER MACHINE] U+1F3E7 -> U+E4A3
+  ["f09f8fa8", "eeaa81"], # [HOTEL] U+1F3E8 -> U+EA81
+  ["f09f8fa9", "eeabb3"], # [LOVE HOTEL] U+1F3E9 -> U+EAF3
+  ["f09f8faa", "ee92a4"], # [CONVENIENCE STORE] U+1F3EA -> U+E4A4
+  ["f09f8fab", "eeaa80"], # [SCHOOL] U+1F3EB -> U+EA80
+  ["e29baa", "ee96bb"], # [CHURCH] U+26EA -> U+E5BB
+  ["e29bb2", "ee978f"], # [FOUNTAIN] U+26F2 -> U+E5CF
+  ["f09f8fac", "eeabb6"], # [DEPARTMENT STORE] U+1F3EC -> U+EAF6
+  ["f09f8faf", "eeabb7"], # [JAPANESE CASTLE] U+1F3EF -> U+EAF7
+  ["f09f8fb0", "eeabb8"], # [EUROPEAN CASTLE] U+1F3F0 -> U+EAF8
+  ["f09f8fad", "eeabb9"], # [FACTORY] U+1F3ED -> U+EAF9
+  ["e29a93", "ee92a9"], # [ANCHOR] U+2693 -> U+E4A9
+  ["f09f8fae", "ee92bd"], # [IZAKAYA LANTERN] U+1F3EE -> U+E4BD
+  ["f09f97bb", "ee96bd"], # [MOUNT FUJI] U+1F5FB -> U+E5BD
+  ["f09f97bc", "ee9380"], # [TOKYO TOWER] U+1F5FC -> U+E4C0
+  ["f09f97bd", :undef], # [STATUE OF LIBERTY] U+1F5FD -> "[自由の女神]"
+  ["f09f97be", "ee95b2"], # [SILHOUETTE OF JAPAN] U+1F5FE -> U+E572
+  ["f09f97bf", "eeadac"], # [MOYAI] U+1F5FF -> U+EB6C
+  ["f09f919e", "ee96b7"], # [MANS SHOE] U+1F45E -> U+E5B7
+  ["f09f919f", "eeacab"], # [ATHLETIC SHOE] U+1F45F -> U+EB2B
+  ["f09f91a0", "ee949a"], # [HIGH-HEELED SHOE] U+1F460 -> U+E51A
+  ["f09f91a1", "ee949a"], # [WOMANS SANDAL] U+1F461 -> U+E51A
+  ["f09f91a2", "eeaa9f"], # [WOMANS BOOTS] U+1F462 -> U+EA9F
+  ["f09f91a3", "eeacaa"], # [FOOTPRINTS] U+1F463 -> U+EB2A
+  ["f09f9193", "ee93be"], # [EYEGLASSES] U+1F453 -> U+E4FE
+  ["f09f9195", "ee96b6"], # [T-SHIRT] U+1F455 -> U+E5B6
+  ["f09f9196", "eeadb7"], # [JEANS] U+1F456 -> U+EB77
+  ["f09f9191", "ee9789"], # [CROWN] U+1F451 -> U+E5C9
+  ["f09f9194", "eeaa93"], # [NECKTIE] U+1F454 -> U+EA93
+  ["f09f9192", "eeaa9e"], # [WOMANS HAT] U+1F452 -> U+EA9E
+  ["f09f9197", "eeadab"], # [DRESS] U+1F457 -> U+EB6B
+  ["f09f9198", "eeaaa3"], # [KIMONO] U+1F458 -> U+EAA3
+  ["f09f9199", "eeaaa4"], # [BIKINI] U+1F459 -> U+EAA4
+  ["f09f919a", "ee948d"], # [WOMANS CLOTHES] U+1F45A -> U+E50D
+  ["f09f919b", "ee9484"], # [PURSE] U+1F45B -> U+E504
+  ["f09f919c", "ee929c"], # [HANDBAG] U+1F45C -> U+E49C
+  ["f09f919d", :undef], # [POUCH] U+1F45D -> "[ふくろ]"
+  ["f09f92b0", "ee9387"], # [MONEY BAG] U+1F4B0 -> U+E4C7
+  ["f09f92b1", :undef], # [CURRENCY EXCHANGE] U+1F4B1 -> "[$￥]"
+  ["f09f92b9", "ee979c"], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+1F4B9 -> U+E5DC
+  ["f09f92b2", "ee95b9"], # [HEAVY DOLLAR SIGN] U+1F4B2 -> U+E579
+  ["f09f92b3", "ee95bc"], # [CREDIT CARD] U+1F4B3 -> U+E57C
+  ["f09f92b4", "ee95bd"], # [BANKNOTE WITH YEN SIGN] U+1F4B4 -> U+E57D
+  ["f09f92b5", "ee9685"], # [BANKNOTE WITH DOLLAR SIGN] U+1F4B5 -> U+E585
+  ["f09f92b8", "eead9b"], # [MONEY WITH WINGS] U+1F4B8 -> U+EB5B
+  ["f09f87a6", :undef], # [REGIONAL INDICATOR SYMBOL LETTER A] U+1F1E6 -> "[A]"
+  ["f09f87a7", :undef], # [REGIONAL INDICATOR SYMBOL LETTER B] U+1F1E7 -> "[B]"
+  ["f09f87a8", :undef], # [REGIONAL INDICATOR SYMBOL LETTER C] U+1F1E8 -> "[C]"
+  ["f09f87a9", :undef], # [REGIONAL INDICATOR SYMBOL LETTER D] U+1F1E9 -> "[D]"
+  ["f09f87aa", :undef], # [REGIONAL INDICATOR SYMBOL LETTER E] U+1F1EA -> "[E]"
+  ["f09f87ab", :undef], # [REGIONAL INDICATOR SYMBOL LETTER F] U+1F1EB -> "[F]"
+  ["f09f87ac", :undef], # [REGIONAL INDICATOR SYMBOL LETTER G] U+1F1EC -> "[G]"
+  ["f09f87ad", :undef], # [REGIONAL INDICATOR SYMBOL LETTER H] U+1F1ED -> "[H]"
+  ["f09f87ae", :undef], # [REGIONAL INDICATOR SYMBOL LETTER I] U+1F1EE -> "[I]"
+  ["f09f87af", :undef], # [REGIONAL INDICATOR SYMBOL LETTER J] U+1F1EF -> "[J]"
+  ["f09f87b0", :undef], # [REGIONAL INDICATOR SYMBOL LETTER K] U+1F1F0 -> "[K]"
+  ["f09f87b1", :undef], # [REGIONAL INDICATOR SYMBOL LETTER L] U+1F1F1 -> "[L]"
+  ["f09f87b2", :undef], # [REGIONAL INDICATOR SYMBOL LETTER M] U+1F1F2 -> "[M]"
+  ["f09f87b3", :undef], # [REGIONAL INDICATOR SYMBOL LETTER N] U+1F1F3 -> "[N]"
+  ["f09f87b4", :undef], # [REGIONAL INDICATOR SYMBOL LETTER O] U+1F1F4 -> "[O]"
+  ["f09f87b5", :undef], # [REGIONAL INDICATOR SYMBOL LETTER P] U+1F1F5 -> "[P]"
+  ["f09f87b6", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Q] U+1F1F6 -> "[Q]"
+  ["f09f87b7", :undef], # [REGIONAL INDICATOR SYMBOL LETTER R] U+1F1F7 -> "[R]"
+  ["f09f87b8", :undef], # [REGIONAL INDICATOR SYMBOL LETTER S] U+1F1F8 -> "[S]"
+  ["f09f87b9", :undef], # [REGIONAL INDICATOR SYMBOL LETTER T] U+1F1F9 -> "[T]"
+  ["f09f87ba", :undef], # [REGIONAL INDICATOR SYMBOL LETTER U] U+1F1FA -> "[U]"
+  ["f09f87bb", :undef], # [REGIONAL INDICATOR SYMBOL LETTER V] U+1F1FB -> "[V]"
+  ["f09f87bc", :undef], # [REGIONAL INDICATOR SYMBOL LETTER W] U+1F1FC -> "[W]"
+  ["f09f87bd", :undef], # [REGIONAL INDICATOR SYMBOL LETTER X] U+1F1FD -> "[X]"
+  ["f09f87be", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Y] U+1F1FE -> "[Y]"
+  ["f09f87bf", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Z] U+1F1FF -> "[Z]"
+  ["f09f94a5", "ee91bb"], # [FIRE] U+1F525 -> U+E47B
+  ["f09f94a6", "ee9683"], # [ELECTRIC TORCH] U+1F526 -> U+E583
+  ["f09f94a7", "ee9687"], # [WRENCH] U+1F527 -> U+E587
+  ["f09f94a8", "ee978b"], # [HAMMER] U+1F528 -> U+E5CB
+  ["f09f94a9", "ee9681"], # [NUT AND BOLT] U+1F529 -> U+E581
+  ["f09f94aa", "ee95bf"], # [HOCHO] U+1F52A -> U+E57F
+  ["f09f94ab", "ee948a"], # [PISTOL] U+1F52B -> U+E50A
+  ["f09f94ae", "eeaa8f"], # [CRYSTAL BALL] U+1F52E -> U+EA8F
+  ["f09f94af", "eeaa8f"], # [SIX POINTED STAR WITH MIDDLE DOT] U+1F52F -> U+EA8F
+  ["f09f94b0", "ee9280"], # [JAPANESE SYMBOL FOR BEGINNER] U+1F530 -> U+E480
+  ["f09f94b1", "ee9789"], # [TRIDENT EMBLEM] U+1F531 -> U+E5C9
+  ["f09f9289", "ee9490"], # [SYRINGE] U+1F489 -> U+E510
+  ["f09f928a", "eeaa9a"], # [PILL] U+1F48A -> U+EA9A
+  ["f09f85b0", "eeaca6"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+1F170 -> U+EB26
+  ["f09f85b1", "eeaca7"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+1F171 -> U+EB27
+  ["f09f868e", "eeaca9"], # [NEGATIVE SQUARED AB] U+1F18E -> U+EB29
+  ["f09f85be", "eeaca8"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+1F17E -> U+EB28
+  ["f09f8e80", "ee969f"], # [RIBBON] U+1F380 -> U+E59F
+  ["f09f8e81", "ee938f"], # [WRAPPED PRESENT] U+1F381 -> U+E4CF
+  ["f09f8e82", "ee96a0"], # [BIRTHDAY CAKE] U+1F382 -> U+E5A0
+  ["f09f8e84", "ee9389"], # [CHRISTMAS TREE] U+1F384 -> U+E4C9
+  ["f09f8e85", "eeabb0"], # [FATHER CHRISTMAS] U+1F385 -> U+EAF0
+  ["f09f8e8c", "ee9799"], # [CROSSED FLAGS] U+1F38C -> U+E5D9
+  ["f09f8e86", "ee978c"], # [FIREWORKS] U+1F386 -> U+E5CC
+  ["f09f8e88", "eeaa9b"], # [BALLOON] U+1F388 -> U+EA9B
+  ["f09f8e89", "eeaa9c"], # [PARTY POPPER] U+1F389 -> U+EA9C
+  ["f09f8e8d", "eeaba3"], # [PINE DECORATION] U+1F38D -> U+EAE3
+  ["f09f8e8e", "eeaba4"], # [JAPANESE DOLLS] U+1F38E -> U+EAE4
+  ["f09f8e93", "eeaba5"], # [GRADUATION CAP] U+1F393 -> U+EAE5
+  ["f09f8e92", "eeaba6"], # [SCHOOL SATCHEL] U+1F392 -> U+EAE6
+  ["f09f8e8f", "eeaba7"], # [CARP STREAMER] U+1F38F -> U+EAE7
+  ["f09f8e87", "eeabab"], # [FIREWORK SPARKLER] U+1F387 -> U+EAEB
+  ["f09f8e90", "eeabad"], # [WIND CHIME] U+1F390 -> U+EAED
+  ["f09f8e83", "eeabae"], # [JACK-O-LANTERN] U+1F383 -> U+EAEE
+  ["f09f8e8a", "ee91af"], # [CONFETTI BALL] U+1F38A -> U+E46F
+  ["f09f8e8b", "eeacbd"], # [TANABATA TREE] U+1F38B -> U+EB3D
+  ["f09f8e91", "eeabaf"], # [MOON VIEWING CEREMONY] U+1F391 -> U+EAEF
+  ["f09f939f", "ee969b"], # [PAGER] U+1F4DF -> U+E59B
+  ["e2988e", "ee9696"], # [BLACK TELEPHONE] U+260E -> U+E596
+  ["f09f939e", "ee949e"], # [TELEPHONE RECEIVER] U+1F4DE -> U+E51E
+  ["f09f93b1", "ee9688"], # [MOBILE PHONE] U+1F4F1 -> U+E588
+  ["f09f93b2", "eeac88"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+1F4F2 -> U+EB08
+  ["f09f939d", "eeaa92"], # [MEMO] U+1F4DD -> U+EA92
+  ["f09f93a0", "ee94a0"], # [FAX MACHINE] U+1F4E0 -> U+E520
+  ["e29c89", "ee94a1"], # [ENVELOPE] U+2709 -> U+E521
+  ["f09f93a8", "ee9691"], # [INCOMING ENVELOPE] U+1F4E8 -> U+E591
+  ["f09f93a9", "eeada2"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+1F4E9 -> U+EB62
+  ["f09f93aa", "ee949b"], # [CLOSED MAILBOX WITH LOWERED FLAG] U+1F4EA -> U+E51B
+  ["f09f93ab", "eeac8a"], # [CLOSED MAILBOX WITH RAISED FLAG] U+1F4EB -> U+EB0A
+  ["f09f93ae", "ee949b"], # [POSTBOX] U+1F4EE -> U+E51B
+  ["f09f93b0", "ee968b"], # [NEWSPAPER] U+1F4F0 -> U+E58B
+  ["f09f93a2", "ee9491"], # [PUBLIC ADDRESS LOUDSPEAKER] U+1F4E2 -> U+E511
+  ["f09f93a3", "ee9491"], # [CHEERING MEGAPHONE] U+1F4E3 -> U+E511
+  ["f09f93a1", "ee92a8"], # [SATELLITE ANTENNA] U+1F4E1 -> U+E4A8
+  ["f09f93a4", "ee9692"], # [OUTBOX TRAY] U+1F4E4 -> U+E592
+  ["f09f93a5", "ee9693"], # [INBOX TRAY] U+1F4E5 -> U+E593
+  ["f09f93a6", "ee949f"], # [PACKAGE] U+1F4E6 -> U+E51F
+  ["f09f93a7", "eeadb1"], # [E-MAIL SYMBOL] U+1F4E7 -> U+EB71
+  ["f09f94a0", "eeabbd"], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+1F520 -> U+EAFD
+  ["f09f94a1", "eeabbe"], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+1F521 -> U+EAFE
+  ["f09f94a2", "eeabbf"], # [INPUT SYMBOL FOR NUMBERS] U+1F522 -> U+EAFF
+  ["f09f94a3", "eeac80"], # [INPUT SYMBOL FOR SYMBOLS] U+1F523 -> U+EB00
+  ["f09f94a4", "eead95"], # [INPUT SYMBOL FOR LATIN LETTERS] U+1F524 -> U+EB55
+  ["e29c92", "eeac83"], # [BLACK NIB] U+2712 -> U+EB03
+  ["f09f92ba", :undef], # [SEAT] U+1F4BA -> "[いす]"
+  ["f09f92bb", "ee96b8"], # [PERSONAL COMPUTER] U+1F4BB -> U+E5B8
+  ["e29c8f", "ee92a1"], # [PENCIL] U+270F -> U+E4A1
+  ["f09f938e", "ee92a0"], # [PAPERCLIP] U+1F4CE -> U+E4A0
+  ["f09f92bc", "ee978e"], # [BRIEFCASE] U+1F4BC -> U+E5CE
+  ["f09f92bd", "ee9682"], # [MINIDISC] U+1F4BD -> U+E582
+  ["f09f92be", "ee95a2"], # [FLOPPY DISK] U+1F4BE -> U+E562
+  ["f09f92bf", "ee948c"], # [OPTICAL DISC] U+1F4BF -> U+E50C
+  ["f09f9380", "ee948c"], # [DVD] U+1F4C0 -> U+E50C
+  ["e29c82", "ee9496"], # [BLACK SCISSORS] U+2702 -> U+E516
+  ["f09f938d", "ee95a0"], # [ROUND PUSHPIN] U+1F4CD -> U+E560
+  ["f09f9383", "ee95a1"], # [PAGE WITH CURL] U+1F4C3 -> U+E561
+  ["f09f9384", "ee95a9"], # [PAGE FACING UP] U+1F4C4 -> U+E569
+  ["f09f9385", "ee95a3"], # [CALENDAR] U+1F4C5 -> U+E563
+  ["f09f9381", "ee968f"], # [FILE FOLDER] U+1F4C1 -> U+E58F
+  ["f09f9382", "ee9690"], # [OPEN FILE FOLDER] U+1F4C2 -> U+E590
+  ["f09f9393", "ee95ab"], # [NOTEBOOK] U+1F4D3 -> U+E56B
+  ["f09f9396", "ee929f"], # [OPEN BOOK] U+1F4D6 -> U+E49F
+  ["f09f9394", "ee929d"], # [NOTEBOOK WITH DECORATIVE COVER] U+1F4D4 -> U+E49D
+  ["f09f9395", "ee95a8"], # [CLOSED BOOK] U+1F4D5 -> U+E568
+  ["f09f9397", "ee95a5"], # [GREEN BOOK] U+1F4D7 -> U+E565
+  ["f09f9398", "ee95a6"], # [BLUE BOOK] U+1F4D8 -> U+E566
+  ["f09f9399", "ee95a7"], # [ORANGE BOOK] U+1F4D9 -> U+E567
+  ["f09f939a", "ee95af"], # [BOOKS] U+1F4DA -> U+E56F
+  ["f09f939b", "ee949d"], # [NAME BADGE] U+1F4DB -> U+E51D
+  ["f09f939c", "ee959f"], # [SCROLL] U+1F4DC -> U+E55F
+  ["f09f938b", "ee95a4"], # [CLIPBOARD] U+1F4CB -> U+E564
+  ["f09f9386", "ee95aa"], # [TEAR-OFF CALENDAR] U+1F4C6 -> U+E56A
+  ["f09f938a", "ee95b4"], # [BAR CHART] U+1F4CA -> U+E574
+  ["f09f9388", "ee95b5"], # [CHART WITH UPWARDS TREND] U+1F4C8 -> U+E575
+  ["f09f9389", "ee95b6"], # [CHART WITH DOWNWARDS TREND] U+1F4C9 -> U+E576
+  ["f09f9387", "ee95ac"], # [CARD INDEX] U+1F4C7 -> U+E56C
+  ["f09f938c", "ee95ad"], # [PUSHPIN] U+1F4CC -> U+E56D
+  ["f09f9392", "ee95ae"], # [LEDGER] U+1F4D2 -> U+E56E
+  ["f09f938f", "ee95b0"], # [STRAIGHT RULER] U+1F4CF -> U+E570
+  ["f09f9390", "ee92a2"], # [TRIANGULAR RULER] U+1F4D0 -> U+E4A2
+  ["f09f9391", "eeac8b"], # [BOOKMARK TABS] U+1F4D1 -> U+EB0B
+  ["f09f8ebd", :undef], # [RUNNING SHIRT WITH SASH] U+1F3BD -> U+3013 (GETA)
+  ["e29abe", "ee92ba"], # [BASEBALL] U+26BE -> U+E4BA
+  ["e29bb3", "ee9699"], # [FLAG IN HOLE] U+26F3 -> U+E599
+  ["f09f8ebe", "ee92b7"], # [TENNIS RACQUET AND BALL] U+1F3BE -> U+E4B7
+  ["e29abd", "ee92b6"], # [SOCCER BALL] U+26BD -> U+E4B6
+  ["f09f8ebf", "eeaaac"], # [SKI AND SKI BOOT] U+1F3BF -> U+EAAC
+  ["f09f8f80", "ee969a"], # [BASKETBALL AND HOOP] U+1F3C0 -> U+E59A
+  ["f09f8f81", "ee92b9"], # [CHEQUERED FLAG] U+1F3C1 -> U+E4B9
+  ["f09f8f82", "ee92b8"], # [SNOWBOARDER] U+1F3C2 -> U+E4B8
+  ["f09f8f83", "ee91ab"], # [RUNNER] U+1F3C3 -> U+E46B
+  ["f09f8f84", "eead81"], # [SURFER] U+1F3C4 -> U+EB41
+  ["f09f8f86", "ee9793"], # [TROPHY] U+1F3C6 -> U+E5D3
+  ["f09f8f88", "ee92bb"], # [AMERICAN FOOTBALL] U+1F3C8 -> U+E4BB
+  ["f09f8f8a", "eeab9e"], # [SWIMMER] U+1F3CA -> U+EADE
+  ["f09f9a86", "ee92b5"], # [TRAIN] U+1F686 -> U+E4B5
+  ["f09f9a87", "ee96bc"], # [METRO] U+1F687 -> U+E5BC
+  ["e29382", "ee96bc"], # [CIRCLED LATIN CAPITAL LETTER M] U+24C2 -> U+E5BC
+  ["f09f9a84", "ee92b0"], # [HIGH-SPEED TRAIN] U+1F684 -> U+E4B0
+  ["f09f9a85", "ee92b0"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+1F685 -> U+E4B0
+  ["f09f9a97", "ee92b1"], # [AUTOMOBILE] U+1F697 -> U+E4B1
+  ["f09f9a99", "ee92b1"], # [RECREATIONAL VEHICLE] U+1F699 -> U+E4B1
+  ["f09f9a8d", "ee92af"], # [ONCOMING BUS] U+1F68D -> U+E4AF
+  ["f09f9a8f", "ee92a7"], # [BUS STOP] U+1F68F -> U+E4A7
+  ["f09f9aa2", "eeaa82"], # [SHIP] U+1F6A2 -> U+EA82
+  ["e29c88", "ee92b3"], # [AIRPLANE] U+2708 -> U+E4B3
+  ["e29bb5", "ee92b4"], # [SAILBOAT] U+26F5 -> U+E4B4
+  ["f09f9a89", "eeadad"], # [STATION] U+1F689 -> U+EB6D
+  ["f09f9a80", "ee9788"], # [ROCKET] U+1F680 -> U+E5C8
+  ["f09f9aa4", "ee92b4"], # [SPEEDBOAT] U+1F6A4 -> U+E4B4
+  ["f09f9a95", "ee92b1"], # [TAXI] U+1F695 -> U+E4B1
+  ["f09f9a9a", "ee92b2"], # [DELIVERY TRUCK] U+1F69A -> U+E4B2
+  ["f09f9a92", "eeab9f"], # [FIRE ENGINE] U+1F692 -> U+EADF
+  ["f09f9a91", "eeaba0"], # [AMBULANCE] U+1F691 -> U+EAE0
+  ["f09f9a93", "eeaba1"], # [POLICE CAR] U+1F693 -> U+EAE1
+  ["e29bbd", "ee95b1"], # [FUEL PUMP] U+26FD -> U+E571
+  ["f09f85bf", "ee92a6"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+1F17F -> U+E4A6
+  ["f09f9aa5", "ee91aa"], # [HORIZONTAL TRAFFIC LIGHT] U+1F6A5 -> U+E46A
+  ["f09f9aa7", "ee9797"], # [CONSTRUCTION SIGN] U+1F6A7 -> U+E5D7
+  ["f09f9aa8", "eeadb3"], # [POLICE CARS REVOLVING LIGHT] U+1F6A8 -> U+EB73
+  ["e299a8", "ee92bc"], # [HOT SPRINGS] U+2668 -> U+E4BC
+  ["e29bba", "ee9790"], # [TENT] U+26FA -> U+E5D0
+  ["f09f8ea0", :undef], # [CAROUSEL HORSE] U+1F3A0 -> U+3013 (GETA)
+  ["f09f8ea1", "ee91ad"], # [FERRIS WHEEL] U+1F3A1 -> U+E46D
+  ["f09f8ea2", "eeaba2"], # [ROLLER COASTER] U+1F3A2 -> U+EAE2
+  ["f09f8ea3", "eead82"], # [FISHING POLE AND FISH] U+1F3A3 -> U+EB42
+  ["f09f8ea4", "ee9483"], # [MICROPHONE] U+1F3A4 -> U+E503
+  ["f09f8ea5", "ee9497"], # [MOVIE CAMERA] U+1F3A5 -> U+E517
+  ["f09f8ea6", "ee9497"], # [CINEMA] U+1F3A6 -> U+E517
+  ["f09f8ea7", "ee9488"], # [HEADPHONE] U+1F3A7 -> U+E508
+  ["f09f8ea8", "ee969c"], # [ARTIST PALETTE] U+1F3A8 -> U+E59C
+  ["f09f8ea9", "eeabb5"], # [TOP HAT] U+1F3A9 -> U+EAF5
+  ["f09f8eaa", "ee969e"], # [CIRCUS TENT] U+1F3AA -> U+E59E
+  ["f09f8eab", "ee929e"], # [TICKET] U+1F3AB -> U+E49E
+  ["f09f8eac", "ee92be"], # [CLAPPER BOARD] U+1F3AC -> U+E4BE
+  ["f09f8ead", "ee969d"], # [PERFORMING ARTS] U+1F3AD -> U+E59D
+  ["f09f8eae", "ee9386"], # [VIDEO GAME] U+1F3AE -> U+E4C6
+  ["f09f8084", "ee9791"], # [MAHJONG TILE RED DRAGON] U+1F004 -> U+E5D1
+  ["f09f8eaf", "ee9385"], # [DIRECT HIT] U+1F3AF -> U+E4C5
+  ["f09f8eb0", "ee91ae"], # [SLOT MACHINE] U+1F3B0 -> U+E46E
+  ["f09f8eb1", "eeab9d"], # [BILLIARDS] U+1F3B1 -> U+EADD
+  ["f09f8eb2", "ee9388"], # [GAME DIE] U+1F3B2 -> U+E4C8
+  ["f09f8eb3", "eead83"], # [BOWLING] U+1F3B3 -> U+EB43
+  ["f09f8eb4", "eeadae"], # [FLOWER PLAYING CARDS] U+1F3B4 -> U+EB6E
+  ["f09f838f", "eeadaf"], # [PLAYING CARD BLACK JOKER] U+1F0CF -> U+EB6F
+  ["f09f8eb5", "ee96be"], # [MUSICAL NOTE] U+1F3B5 -> U+E5BE
+  ["f09f8eb6", "ee9485"], # [MULTIPLE MUSICAL NOTES] U+1F3B6 -> U+E505
+  ["f09f8eb7", :undef], # [SAXOPHONE] U+1F3B7 -> "[サックス]"
+  ["f09f8eb8", "ee9486"], # [GUITAR] U+1F3B8 -> U+E506
+  ["f09f8eb9", "eead80"], # [MUSICAL KEYBOARD] U+1F3B9 -> U+EB40
+  ["f09f8eba", "eeab9c"], # [TRUMPET] U+1F3BA -> U+EADC
+  ["f09f8ebb", "ee9487"], # [VIOLIN] U+1F3BB -> U+E507
+  ["f09f8ebc", "eeab8c"], # [MUSICAL SCORE] U+1F3BC -> U+EACC
+  ["e380bd", :undef], # [PART ALTERNATION MARK] U+303D -> "[歌記号]"
+  ["f09f93b7", "ee9495"], # [CAMERA] U+1F4F7 -> U+E515
+  ["f09f93b9", "ee95be"], # [VIDEO CAMERA] U+1F4F9 -> U+E57E
+  ["f09f93ba", "ee9482"], # [TELEVISION] U+1F4FA -> U+E502
+  ["f09f93bb", "ee96b9"], # [RADIO] U+1F4FB -> U+E5B9
+  ["f09f93bc", "ee9680"], # [VIDEOCASSETTE] U+1F4FC -> U+E580
+  ["f09f928b", "ee93ab"], # [KISS MARK] U+1F48B -> U+E4EB
+  ["f09f928c", "eeadb8"], # [LOVE LETTER] U+1F48C -> U+EB78
+  ["f09f928d", "ee9494"], # [RING] U+1F48D -> U+E514
+  ["f09f928e", "ee9494"], # [GEM STONE] U+1F48E -> U+E514
+  ["f09f928f", "ee978a"], # [KISS] U+1F48F -> U+E5CA
+  ["f09f9290", "eeaa95"], # [BOUQUET] U+1F490 -> U+EA95
+  ["f09f9291", "eeab9a"], # [COUPLE WITH HEART] U+1F491 -> U+EADA
+  ["f09f9292", "ee96bb"], # [WEDDING] U+1F492 -> U+E5BB
+  ["f09f949e", "eeaa83"], # [NO ONE UNDER EIGHTEEN SYMBOL] U+1F51E -> U+EA83
+  ["c2a9", "ee9598"], # [COPYRIGHT SIGN] U+A9 -> U+E558
+  ["c2ae", "ee9599"], # [REGISTERED SIGN] U+AE -> U+E559
+  ["e284a2", "ee958e"], # [TRADE MARK SIGN] U+2122 -> U+E54E
+  ["e284b9", "ee94b3"], # [INFORMATION SOURCE] U+2139 -> U+E533
+  ["f09f949f", "ee94ab"], # [KEYCAP TEN] U+1F51F -> U+E52B
+  ["f09f93b6", "eeaa84"], # [ANTENNA WITH BARS] U+1F4F6 -> U+EA84
+  ["f09f93b3", "eeaa90"], # [VIBRATION MODE] U+1F4F3 -> U+EA90
+  ["f09f93b4", "eeaa91"], # [MOBILE PHONE OFF] U+1F4F4 -> U+EA91
+  ["f09f8d94", "ee9396"], # [HAMBURGER] U+1F354 -> U+E4D6
+  ["f09f8d99", "ee9395"], # [RICE BALL] U+1F359 -> U+E4D5
+  ["f09f8db0", "ee9390"], # [SHORTCAKE] U+1F370 -> U+E4D0
+  ["f09f8d9c", "ee96b4"], # [STEAMING BOWL] U+1F35C -> U+E5B4
+  ["f09f8d9e", "eeaaaf"], # [BREAD] U+1F35E -> U+EAAF
+  ["f09f8db3", "ee9391"], # [COOKING] U+1F373 -> U+E4D1
+  ["f09f8da6", "eeaab0"], # [SOFT ICE CREAM] U+1F366 -> U+EAB0
+  ["f09f8d9f", "eeaab1"], # [FRENCH FRIES] U+1F35F -> U+EAB1
+  ["f09f8da1", "eeaab2"], # [DANGO] U+1F361 -> U+EAB2
+  ["f09f8d98", "eeaab3"], # [RICE CRACKER] U+1F358 -> U+EAB3
+  ["f09f8d9a", "eeaab4"], # [COOKED RICE] U+1F35A -> U+EAB4
+  ["f09f8d9d", "eeaab5"], # [SPAGHETTI] U+1F35D -> U+EAB5
+  ["f09f8d9b", "eeaab6"], # [CURRY AND RICE] U+1F35B -> U+EAB6
+  ["f09f8da2", "eeaab7"], # [ODEN] U+1F362 -> U+EAB7
+  ["f09f8da3", "eeaab8"], # [SUSHI] U+1F363 -> U+EAB8
+  ["f09f8db1", "eeaabd"], # [BENTO BOX] U+1F371 -> U+EABD
+  ["f09f8db2", "eeaabe"], # [POT OF FOOD] U+1F372 -> U+EABE
+  ["f09f8da7", "eeabaa"], # [SHAVED ICE] U+1F367 -> U+EAEA
+  ["f09f8d96", "ee9384"], # [MEAT ON BONE] U+1F356 -> U+E4C4
+  ["f09f8da5", "ee93ad"], # [FISH CAKE WITH SWIRL DESIGN] U+1F365 -> U+E4ED
+  ["f09f8da0", "eeacba"], # [ROASTED SWEET POTATO] U+1F360 -> U+EB3A
+  ["f09f8d95", "eeacbb"], # [SLICE OF PIZZA] U+1F355 -> U+EB3B
+  ["f09f8d97", "eeacbc"], # [POULTRY LEG] U+1F357 -> U+EB3C
+  ["f09f8da8", "eead8a"], # [ICE CREAM] U+1F368 -> U+EB4A
+  ["f09f8da9", "eead8b"], # [DOUGHNUT] U+1F369 -> U+EB4B
+  ["f09f8daa", "eead8c"], # [COOKIE] U+1F36A -> U+EB4C
+  ["f09f8dab", "eead8d"], # [CHOCOLATE BAR] U+1F36B -> U+EB4D
+  ["f09f8dac", "eead8e"], # [CANDY] U+1F36C -> U+EB4E
+  ["f09f8dad", "eead8f"], # [LOLLIPOP] U+1F36D -> U+EB4F
+  ["f09f8dae", "eead96"], # [CUSTARD] U+1F36E -> U+EB56
+  ["f09f8daf", "eead99"], # [HONEY POT] U+1F36F -> U+EB59
+  ["f09f8da4", "eeadb0"], # [FRIED SHRIMP] U+1F364 -> U+EB70
+  ["f09f8db4", "ee92ac"], # [FORK AND KNIFE] U+1F374 -> U+E4AC
+  ["e29895", "ee9697"], # [HOT BEVERAGE] U+2615 -> U+E597
+  ["f09f8db8", "ee9382"], # [COCKTAIL GLASS] U+1F378 -> U+E4C2
+  ["f09f8dba", "ee9383"], # [BEER MUG] U+1F37A -> U+E4C3
+  ["f09f8db5", "eeaaae"], # [TEACUP WITHOUT HANDLE] U+1F375 -> U+EAAE
+  ["f09f8db6", "eeaa97"], # [SAKE BOTTLE AND CUP] U+1F376 -> U+EA97
+  ["f09f8db7", "ee9381"], # [WINE GLASS] U+1F377 -> U+E4C1
+  ["f09f8dbb", "eeaa98"], # [CLINKING BEER MUGS] U+1F37B -> U+EA98
+  ["f09f8db9", "eeacbe"], # [TROPICAL DRINK] U+1F379 -> U+EB3E
+  ["e28697", "ee9595"], # [NORTH EAST ARROW] U+2197 -> U+E555
+  ["e28698", "ee958d"], # [SOUTH EAST ARROW] U+2198 -> U+E54D
+  ["e28696", "ee958c"], # [NORTH WEST ARROW] U+2196 -> U+E54C
+  ["e28699", "ee9596"], # [SOUTH WEST ARROW] U+2199 -> U+E556
+  ["e2a4b4", "eeacad"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+2934 -> U+EB2D
+  ["e2a4b5", "eeacae"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+2935 -> U+EB2E
+  ["e28694", "eeadba"], # [LEFT RIGHT ARROW] U+2194 -> U+EB7A
+  ["e28695", "eeadbb"], # [UP DOWN ARROW] U+2195 -> U+EB7B
+  ["e2ac86", "ee94bf"], # [UPWARDS BLACK ARROW] U+2B06 -> U+E53F
+  ["e2ac87", "ee9580"], # [DOWNWARDS BLACK ARROW] U+2B07 -> U+E540
+  ["e29ea1", "ee9592"], # [BLACK RIGHTWARDS ARROW] U+27A1 -> U+E552
+  ["e2ac85", "ee9593"], # [LEFTWARDS BLACK ARROW] U+2B05 -> U+E553
+  ["e296b6", "ee94ae"], # [BLACK RIGHT-POINTING TRIANGLE] U+25B6 -> U+E52E
+  ["e29780", "ee94ad"], # [BLACK LEFT-POINTING TRIANGLE] U+25C0 -> U+E52D
+  ["e28fa9", "ee94b0"], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+23E9 -> U+E530
+  ["e28faa", "ee94af"], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+23EA -> U+E52F
+  ["e28fab", "ee9585"], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+23EB -> U+E545
+  ["e28fac", "ee9584"], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+23EC -> U+E544
+  ["f09f94ba", "ee959a"], # [UP-POINTING RED TRIANGLE] U+1F53A -> U+E55A
+  ["f09f94bb", "ee959b"], # [DOWN-POINTING RED TRIANGLE] U+1F53B -> U+E55B
+  ["f09f94bc", "ee9583"], # [UP-POINTING SMALL RED TRIANGLE] U+1F53C -> U+E543
+  ["f09f94bd", "ee9582"], # [DOWN-POINTING SMALL RED TRIANGLE] U+1F53D -> U+E542
+  ["e2ad95", "eeaaad"], # [HEAVY LARGE CIRCLE] U+2B55 -> U+EAAD
+  ["e29d8c", "ee9590"], # [CROSS MARK] U+274C -> U+E550
+  ["e29d8e", "ee9591"], # [NEGATIVE SQUARED CROSS MARK] U+274E -> U+E551
+  ["e29da2", "ee9282"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+2762 -> U+E482
+  ["e28189", "eeacaf"], # [EXCLAMATION QUESTION MARK] U+2049 -> U+EB2F
+  ["e280bc", "eeacb0"], # [DOUBLE EXCLAMATION MARK] U+203C -> U+EB30
+  ["e29d93", "ee9283"], # [BLACK QUESTION MARK ORNAMENT] U+2753 -> U+E483
+  ["e29d94", "ee9283"], # [WHITE QUESTION MARK ORNAMENT] U+2754 -> U+E483
+  ["e29d95", "ee9282"], # [WHITE EXCLAMATION MARK ORNAMENT] U+2755 -> U+E482
+  ["e380b0", :undef], # [WAVY DASH] U+3030 -> U+3013 (GETA)
+  ["e29eb0", "eeacb1"], # [CURLY LOOP] U+27B0 -> U+EB31
+  ["e29ebf", :undef], # [DOUBLE CURLY LOOP] U+27BF -> "[フリーダイヤル]"
+  ["e29da4", "ee9695"], # [HEAVY BLACK HEART] U+2764 -> U+E595
+  ["f09f9293", "eeadb5"], # [BEATING HEART] U+1F493 -> U+EB75
+  ["f09f9294", "ee91b7"], # [BROKEN HEART] U+1F494 -> U+E477
+  ["f09f9295", "ee91b8"], # [TWO HEARTS] U+1F495 -> U+E478
+  ["f09f9296", "eeaaa6"], # [SPARKLING HEART] U+1F496 -> U+EAA6
+  ["f09f9297", "eeadb5"], # [GROWING HEART] U+1F497 -> U+EB75
+  ["f09f9298", "ee93aa"], # [HEART WITH ARROW] U+1F498 -> U+E4EA
+  ["f09f9299", "eeaaa7"], # [BLUE HEART] U+1F499 -> U+EAA7
+  ["f09f929a", "eeaaa8"], # [GREEN HEART] U+1F49A -> U+EAA8
+  ["f09f929b", "eeaaa9"], # [YELLOW HEART] U+1F49B -> U+EAA9
+  ["f09f929c", "eeaaaa"], # [PURPLE HEART] U+1F49C -> U+EAAA
+  ["f09f929d", "eead94"], # [HEART WITH RIBBON] U+1F49D -> U+EB54
+  ["f09f929e", "ee96af"], # [REVOLVING HEARTS] U+1F49E -> U+E5AF
+  ["f09f929f", "ee9695"], # [HEART DECORATION] U+1F49F -> U+E595
+  ["e299a5", "eeaaa5"], # [BLACK HEART SUIT] U+2665 -> U+EAA5
+  ["e299a0", "ee96a1"], # [BLACK SPADE SUIT] U+2660 -> U+E5A1
+  ["e299a6", "ee96a2"], # [BLACK DIAMOND SUIT] U+2666 -> U+E5A2
+  ["e299a3", "ee96a3"], # [BLACK CLUB SUIT] U+2663 -> U+E5A3
+  ["f09f9aac", "ee91bd"], # [SMOKING SYMBOL] U+1F6AC -> U+E47D
+  ["f09f9aad", "ee91be"], # [NO SMOKING SYMBOL] U+1F6AD -> U+E47E
+  ["e299bf", "ee91bf"], # [WHEELCHAIR SYMBOL] U+267F -> U+E47F
+  ["f09f9aa9", "eeacac"], # [TRIANGULAR FLAG ON POST] U+1F6A9 -> U+EB2C
+  ["e29aa0", "ee9281"], # [WARNING SIGN] U+26A0 -> U+E481
+  ["e29b94", "ee9284"], # [NO ENTRY] U+26D4 -> U+E484
+  ["e299bb", "eeadb9"], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+267B -> U+EB79
+  ["f09f9ab2", "ee92ae"], # [BICYCLE] U+1F6B2 -> U+E4AE
+  ["f09f9ab6", "eeadb2"], # [PEDESTRIAN] U+1F6B6 -> U+EB72
+  ["f09f9ab9", :undef], # [MENS SYMBOL] U+1F6B9 -> "[♂]"
+  ["f09f9aba", :undef], # [WOMENS SYMBOL] U+1F6BA -> "[♀]"
+  ["f09f9b80", "ee9798"], # [BATH] U+1F6C0 -> U+E5D8
+  ["f09f9abb", "ee92a5"], # [RESTROOM] U+1F6BB -> U+E4A5
+  ["f09f9abd", "ee92a5"], # [TOILET] U+1F6BD -> U+E4A5
+  ["f09f9abe", "ee92a5"], # [WATER CLOSET] U+1F6BE -> U+E4A5
+  ["f09f9abc", "eeac98"], # [BABY SYMBOL] U+1F6BC -> U+EB18
+  ["f09f9aaa", :undef], # [DOOR] U+1F6AA -> "[ドア]"
+  ["f09f9aab", "ee9581"], # [NO ENTRY SIGN] U+1F6AB -> U+E541
+  ["e29c94", "ee9597"], # [HEAVY CHECK MARK] U+2714 -> U+E557
+  ["f09f8691", "ee96ab"], # [SQUARED CL] U+1F191 -> U+E5AB
+  ["f09f8692", "eeaa85"], # [SQUARED COOL] U+1F192 -> U+EA85
+  ["f09f8693", "ee95b8"], # [SQUARED FREE] U+1F193 -> U+E578
+  ["f09f8694", "eeaa88"], # [SQUARED ID] U+1F194 -> U+EA88
+  ["f09f8695", "ee96b5"], # [SQUARED NEW] U+1F195 -> U+E5B5
+  ["f09f8696", :undef], # [SQUARED NG] U+1F196 -> "[NG]"
+  ["f09f8697", "ee96ad"], # [SQUARED OK] U+1F197 -> U+E5AD
+  ["f09f8698", "ee93a8"], # [SQUARED SOS] U+1F198 -> U+E4E8
+  ["f09f8699", "ee948f"], # [SQUARED UP WITH EXCLAMATION MARK] U+1F199 -> U+E50F
+  ["f09f869a", "ee9792"], # [SQUARED VS] U+1F19A -> U+E5D2
+  ["f09f8881", :undef], # [SQUARED KATAKANA KOKO] U+1F201 -> "[ココ]"
+  ["f09f8882", "eeaa87"], # [SQUARED KATAKANA SA] U+1F202 -> U+EA87
+  ["f09f88b2", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7981] U+1F232 -> "[禁]"
+  ["f09f88b3", "eeaa8a"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+1F233 -> U+EA8A
+  ["f09f88b4", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5408] U+1F234 -> "[合]"
+  ["f09f88b5", "eeaa89"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+1F235 -> U+EA89
+  ["f09f88b6", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6709] U+1F236 -> "[有]"
+  ["f09f889a", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7121] U+1F21A -> "[無]"
+  ["f09f88b7", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-6708] U+1F237 -> "[月]"
+  ["f09f88b8", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7533] U+1F238 -> "[申]"
+  ["f09f88b9", "eeaa86"], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+1F239 -> U+EA86
+  ["f09f88af", "eeaa8b"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+1F22F -> U+EA8B
+  ["f09f88ba", "eeaa8c"], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+1F23A -> U+EA8C
+  ["e38a99", "ee93b1"], # [CIRCLED IDEOGRAPH SECRET] U+3299 -> U+E4F1
+  ["e38a97", "eeaa99"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+3297 -> U+EA99
+  ["f09f8990", "ee93b7"], # [CIRCLED IDEOGRAPH ADVANTAGE] U+1F250 -> U+E4F7
+  ["f09f8991", "eeac81"], # [CIRCLED IDEOGRAPH ACCEPT] U+1F251 -> U+EB01
+  ["e29e95", "ee94bc"], # [HEAVY PLUS SIGN] U+2795 -> U+E53C
+  ["e29e96", "ee94bd"], # [HEAVY MINUS SIGN] U+2796 -> U+E53D
+  ["e29c96", "ee958f"], # [HEAVY MULTIPLICATION X] U+2716 -> U+E54F
+  ["e29e97", "ee9594"], # [HEAVY DIVISION SIGN] U+2797 -> U+E554
+  ["f09f92a0", :undef], # [DIAMOND SHAPE WITH A DOT INSIDE] U+1F4A0 -> U+3013 (GETA)
+  ["f09f92a1", "ee91b6"], # [ELECTRIC LIGHT BULB] U+1F4A1 -> U+E476
+  ["f09f92a2", "ee93a5"], # [ANGER SYMBOL] U+1F4A2 -> U+E4E5
+  ["f09f92a3", "ee91ba"], # [BOMB] U+1F4A3 -> U+E47A
+  ["f09f92a4", "ee91b5"], # [SLEEPING SYMBOL] U+1F4A4 -> U+E475
+  ["f09f92a5", "ee96b0"], # [COLLISION SYMBOL] U+1F4A5 -> U+E5B0
+  ["f09f92a6", "ee96b1"], # [SPLASHING SWEAT SYMBOL] U+1F4A6 -> U+E5B1
+  ["f09f92a7", "ee93a6"], # [DROP OF WATER] U+1F4A7 -> U+E4E6
+  ["f09f92a8", "ee93b4"], # [DASH SYMBOL] U+1F4A8 -> U+E4F4
+  ["f09f92a9", "ee93b5"], # [PILE OF POO] U+1F4A9 -> U+E4F5
+  ["f09f92aa", "ee93a9"], # [FLEXED BICEPS] U+1F4AA -> U+E4E9
+  ["f09f92ab", "eead9c"], # [DIZZY SYMBOL] U+1F4AB -> U+EB5C
+  ["f09f92ac", "ee93bd"], # [SPEECH BALLOON] U+1F4AC -> U+E4FD
+  ["e29ca8", "eeaaab"], # [SPARKLES] U+2728 -> U+EAAB
+  ["e29cb4", "ee91b9"], # [EIGHT POINTED BLACK STAR] U+2734 -> U+E479
+  ["e29cb3", "ee94be"], # [EIGHT SPOKED ASTERISK] U+2733 -> U+E53E
+  ["e29aaa", "ee94ba"], # [MEDIUM WHITE CIRCLE] U+26AA -> U+E53A
+  ["e29aab", "ee94bb"], # [MEDIUM BLACK CIRCLE] U+26AB -> U+E53B
+  ["f09f94b4", "ee958a"], # [LARGE RED CIRCLE] U+1F534 -> U+E54A
+  ["f09f94b5", "ee958b"], # [LARGE BLUE CIRCLE] U+1F535 -> U+E54B
+  ["f09f94b2", "ee958b"], # [BLACK SQUARE BUTTON] U+1F532 -> U+E54B
+  ["f09f94b3", "ee958b"], # [WHITE SQUARE BUTTON] U+1F533 -> U+E54B
+  ["e2ad90", "ee928b"], # [WHITE MEDIUM STAR] U+2B50 -> U+E48B
+  ["e2ac9c", "ee9588"], # [WHITE LARGE SQUARE] U+2B1C -> U+E548
+  ["e2ac9b", "ee9589"], # [BLACK LARGE SQUARE] U+2B1B -> U+E549
+  ["e296ab", "ee94b1"], # [WHITE SMALL SQUARE] U+25AB -> U+E531
+  ["e296aa", "ee94b2"], # [BLACK SMALL SQUARE] U+25AA -> U+E532
+  ["e297bd", "ee94b4"], # [WHITE MEDIUM SMALL SQUARE] U+25FD -> U+E534
+  ["e297be", "ee94b5"], # [BLACK MEDIUM SMALL SQUARE] U+25FE -> U+E535
+  ["e297bb", "ee94b8"], # [WHITE MEDIUM SQUARE] U+25FB -> U+E538
+  ["e297bc", "ee94b9"], # [BLACK MEDIUM SQUARE] U+25FC -> U+E539
+  ["f09f94b6", "ee9586"], # [LARGE ORANGE DIAMOND] U+1F536 -> U+E546
+  ["f09f94b7", "ee9587"], # [LARGE BLUE DIAMOND] U+1F537 -> U+E547
+  ["f09f94b8", "ee94b6"], # [SMALL ORANGE DIAMOND] U+1F538 -> U+E536
+  ["f09f94b9", "ee94b7"], # [SMALL BLUE DIAMOND] U+1F539 -> U+E537
+  ["e29d87", "ee91ac"], # [SPARKLE] U+2747 -> U+E46C
+  ["f09f92ae", "ee93b0"], # [WHITE FLOWER] U+1F4AE -> U+E4F0
+  ["f09f92af", "ee93b2"], # [HUNDRED POINTS SYMBOL] U+1F4AF -> U+E4F2
+  ["e286a9", "ee959d"], # [LEFTWARDS ARROW WITH HOOK] U+21A9 -> U+E55D
+  ["e286aa", "ee959c"], # [RIGHTWARDS ARROW WITH HOOK] U+21AA -> U+E55C
+  ["f09f9483", "eeac8d"], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+1F503 -> U+EB0D
+  ["f09f948a", "ee9491"], # [SPEAKER WITH THREE SOUND WAVES] U+1F50A -> U+E511
+  ["f09f948b", "ee9684"], # [BATTERY] U+1F50B -> U+E584
+  ["f09f948c", "ee9689"], # [ELECTRIC PLUG] U+1F50C -> U+E589
+  ["f09f948d", "ee9498"], # [LEFT-POINTING MAGNIFYING GLASS] U+1F50D -> U+E518
+  ["f09f948e", "eeac85"], # [RIGHT-POINTING MAGNIFYING GLASS] U+1F50E -> U+EB05
+  ["f09f9492", "ee949c"], # [LOCK] U+1F512 -> U+E51C
+  ["f09f9493", "ee949c"], # [OPEN LOCK] U+1F513 -> U+E51C
+  ["f09f948f", "eeac8c"], # [LOCK WITH INK PEN] U+1F50F -> U+EB0C
+  ["f09f9490", "eeabbc"], # [CLOSED LOCK WITH KEY] U+1F510 -> U+EAFC
+  ["f09f9491", "ee9499"], # [KEY] U+1F511 -> U+E519
+  ["f09f9494", "ee9492"], # [BELL] U+1F514 -> U+E512
+  ["e29891", "eeac82"], # [BALLOT BOX WITH CHECK] U+2611 -> U+EB02
+  ["f09f9498", "eeac84"], # [RADIO BUTTON] U+1F518 -> U+EB04
+  ["f09f9496", "eeac87"], # [BOOKMARK] U+1F516 -> U+EB07
+  ["f09f9497", "ee968a"], # [LINK SYMBOL] U+1F517 -> U+E58A
+  ["f09f9499", "eeac86"], # [BACK WITH LEFTWARDS ARROW ABOVE] U+1F519 -> U+EB06
+  ["f09f949a", :undef], # [END WITH LEFTWARDS ARROW ABOVE] U+1F51A -> "[end]"
+  ["f09f949b", :undef], # [ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE] U+1F51B -> "[ON]"
+  ["f09f949c", :undef], # [SOON WITH RIGHTWARDS ARROW ABOVE] U+1F51C -> "[SOON]"
+  ["f09f949d", :undef], # [TOP WITH UPWARDS ARROW ABOVE] U+1F51D -> "[TOP]"
+  ["e28083", "ee968c"], # [EM SPACE] U+2003 -> U+E58C
+  ["e28082", "ee968d"], # [EN SPACE] U+2002 -> U+E58D
+  ["e28085", "ee968e"], # [FOUR-PER-EM SPACE] U+2005 -> U+E58E
+  ["e29c85", "ee959e"], # [WHITE HEAVY CHECK MARK] U+2705 -> U+E55E
+  ["e29c8a", "eeae83"], # [RAISED FIST] U+270A -> U+EB83
+  ["e29c8b", "ee96a7"], # [RAISED HAND] U+270B -> U+E5A7
+  ["e29c8c", "ee96a6"], # [VICTORY HAND] U+270C -> U+E5A6
+  ["f09f918a", "ee93b3"], # [FISTED HAND SIGN] U+1F44A -> U+E4F3
+  ["f09f918d", "ee93b9"], # [THUMBS UP SIGN] U+1F44D -> U+E4F9
+  ["e2989d", "ee93b6"], # [WHITE UP POINTING INDEX] U+261D -> U+E4F6
+  ["f09f9186", "eeaa8d"], # [WHITE UP POINTING BACKHAND INDEX] U+1F446 -> U+EA8D
+  ["f09f9187", "eeaa8e"], # [WHITE DOWN POINTING BACKHAND INDEX] U+1F447 -> U+EA8E
+  ["f09f9188", "ee93bf"], # [WHITE LEFT POINTING BACKHAND INDEX] U+1F448 -> U+E4FF
+  ["f09f9189", "ee9480"], # [WHITE RIGHT POINTING BACKHAND INDEX] U+1F449 -> U+E500
+  ["f09f918b", "eeab96"], # [WAVING HAND SIGN] U+1F44B -> U+EAD6
+  ["f09f918f", "eeab93"], # [CLAPPING HANDS SIGN] U+1F44F -> U+EAD3
+  ["f09f918c", "eeab94"], # [OK HAND SIGN] U+1F44C -> U+EAD4
+  ["f09f918e", "eeab95"], # [THUMBS DOWN SIGN] U+1F44E -> U+EAD5
+  ["f09f9190", "eeab96"], # [OPEN HANDS SIGN] U+1F450 -> U+EAD6
+]
+
+EMOJI_EXCHANGE_TBL['UTF-8']['UTF8-SoftBank'] = [
+  ["e29880", "ee818a"], # [BLACK SUN WITH RAYS] U+2600 -> U+E04A
+  ["e29881", "ee8189"], # [CLOUD] U+2601 -> U+E049
+  ["e29894", "ee818b"], # [UMBRELLA WITH RAIN DROPS] U+2614 -> U+E04B
+  ["e29b84", "ee8188"], # [SNOWMAN WITHOUT SNOW] U+26C4 -> U+E048
+  ["e29aa1", "ee84bd"], # [HIGH VOLTAGE SIGN] U+26A1 -> U+E13D
+  ["f09f8c80", "ee9183"], # [CYCLONE] U+1F300 -> U+E443
+  ["f09f8c81", :undef], # [FOGGY] U+1F301 -> "[霧]"
+  ["f09f8c82", "ee90bc"], # [CLOSED UMBRELLA] U+1F302 -> U+E43C
+  ["f09f8c83", "ee918b"], # [NIGHT WITH STARS] U+1F303 -> U+E44B
+  ["f09f8c84", "ee818d"], # [SUNRISE OVER MOUNTAINS] U+1F304 -> U+E04D
+  ["f09f8c85", "ee9189"], # [SUNRISE] U+1F305 -> U+E449
+  ["f09f8c87", "ee918a"], # [SUNSET OVER BUILDINGS] U+1F307 -> U+E44A
+  ["f09f8c88", "ee918c"], # [RAINBOW] U+1F308 -> U+E44C
+  ["e29d84", :undef], # [SNOWFLAKE] U+2744 -> "[雪結晶]"
+  ["e29b85", "ee818aee8189"], # [SUN BEHIND CLOUD] U+26C5 -> U+E04A U+E049
+  ["f09f8c89", "ee918b"], # [BRIDGE AT NIGHT] U+1F309 -> U+E44B
+  ["f09f8c8a", "ee90be"], # [WATER WAVE] U+1F30A -> U+E43E
+  ["f09f8c8b", :undef], # [VOLCANO] U+1F30B -> "[火山]"
+  ["f09f8c8c", "ee918b"], # [MILKY WAY] U+1F30C -> U+E44B
+  ["f09f8c8f", :undef], # [EARTH GLOBE ASIA-AUSTRALIA] U+1F30F -> "[地球]"
+  ["f09f8c91", :undef], # [NEW MOON SYMBOL] U+1F311 -> "●"
+  ["f09f8c94", "ee818c"], # [WAXING GIBBOUS MOON SYMBOL] U+1F314 -> U+E04C
+  ["f09f8c93", "ee818c"], # [FIRST QUARTER MOON SYMBOL] U+1F313 -> U+E04C
+  ["f09f8c99", "ee818c"], # [CRESCENT MOON] U+1F319 -> U+E04C
+  ["f09f8c95", :undef], # [FULL MOON SYMBOL] U+1F315 -> "○"
+  ["f09f8c9b", "ee818c"], # [FIRST QUARTER MOON WITH FACE] U+1F31B -> U+E04C
+  ["f09f8c9f", "ee8cb5"], # [GLOWING STAR] U+1F31F -> U+E335
+  ["f09f8ca0", :undef], # [SHOOTING STAR] U+1F320 -> "☆彡"
+  ["f09f9590", "ee80a4"], # [CLOCK FACE ONE OCLOCK] U+1F550 -> U+E024
+  ["f09f9591", "ee80a5"], # [CLOCK FACE TWO OCLOCK] U+1F551 -> U+E025
+  ["f09f9592", "ee80a6"], # [CLOCK FACE THREE OCLOCK] U+1F552 -> U+E026
+  ["f09f9593", "ee80a7"], # [CLOCK FACE FOUR OCLOCK] U+1F553 -> U+E027
+  ["f09f9594", "ee80a8"], # [CLOCK FACE FIVE OCLOCK] U+1F554 -> U+E028
+  ["f09f9595", "ee80a9"], # [CLOCK FACE SIX OCLOCK] U+1F555 -> U+E029
+  ["f09f9596", "ee80aa"], # [CLOCK FACE SEVEN OCLOCK] U+1F556 -> U+E02A
+  ["f09f9597", "ee80ab"], # [CLOCK FACE EIGHT OCLOCK] U+1F557 -> U+E02B
+  ["f09f9598", "ee80ac"], # [CLOCK FACE NINE OCLOCK] U+1F558 -> U+E02C
+  ["f09f9599", "ee80ad"], # [CLOCK FACE TEN OCLOCK] U+1F559 -> U+E02D
+  ["f09f959a", "ee80ae"], # [CLOCK FACE ELEVEN OCLOCK] U+1F55A -> U+E02E
+  ["f09f959b", "ee80af"], # [CLOCK FACE TWELVE OCLOCK] U+1F55B -> U+E02F
+  ["e28c9a", :undef], # [WATCH] U+231A -> "[腕時計]"
+  ["e28c9b", :undef], # [HOURGLASS] U+231B -> "[砂時計]"
+  ["e28fb0", "ee80ad"], # [ALARM CLOCK] U+23F0 -> U+E02D
+  ["e28fb3", :undef], # [HOURGLASS WITH FLOWING SAND] U+23F3 -> "[砂時計]"
+  ["e29988", "ee88bf"], # [ARIES] U+2648 -> U+E23F
+  ["e29989", "ee8980"], # [TAURUS] U+2649 -> U+E240
+  ["e2998a", "ee8981"], # [GEMINI] U+264A -> U+E241
+  ["e2998b", "ee8982"], # [CANCER] U+264B -> U+E242
+  ["e2998c", "ee8983"], # [LEO] U+264C -> U+E243
+  ["e2998d", "ee8984"], # [VIRGO] U+264D -> U+E244
+  ["e2998e", "ee8985"], # [LIBRA] U+264E -> U+E245
+  ["e2998f", "ee8986"], # [SCORPIUS] U+264F -> U+E246
+  ["e29990", "ee8987"], # [SAGITTARIUS] U+2650 -> U+E247
+  ["e29991", "ee8988"], # [CAPRICORN] U+2651 -> U+E248
+  ["e29992", "ee8989"], # [AQUARIUS] U+2652 -> U+E249
+  ["e29993", "ee898a"], # [PISCES] U+2653 -> U+E24A
+  ["e29b8e", "ee898b"], # [OPHIUCHUS] U+26CE -> U+E24B
+  ["f09f8d80", "ee8490"], # [FOUR LEAF CLOVER] U+1F340 -> U+E110
+  ["f09f8cb7", "ee8c84"], # [TULIP] U+1F337 -> U+E304
+  ["f09f8cb1", "ee8490"], # [SEEDLING] U+1F331 -> U+E110
+  ["f09f8d81", "ee8498"], # [MAPLE LEAF] U+1F341 -> U+E118
+  ["f09f8cb8", "ee80b0"], # [CHERRY BLOSSOM] U+1F338 -> U+E030
+  ["f09f8cb9", "ee80b2"], # [ROSE] U+1F339 -> U+E032
+  ["f09f8d82", "ee8499"], # [FALLEN LEAF] U+1F342 -> U+E119
+  ["f09f8d83", "ee9187"], # [LEAF FLUTTERING IN WIND] U+1F343 -> U+E447
+  ["f09f8cba", "ee8c83"], # [HIBISCUS] U+1F33A -> U+E303
+  ["f09f8cbb", "ee8c85"], # [SUNFLOWER] U+1F33B -> U+E305
+  ["f09f8cb4", "ee8c87"], # [PALM TREE] U+1F334 -> U+E307
+  ["f09f8cb5", "ee8c88"], # [CACTUS] U+1F335 -> U+E308
+  ["f09f8cbe", "ee9184"], # [EAR OF RICE] U+1F33E -> U+E444
+  ["f09f8cbd", :undef], # [EAR OF MAIZE] U+1F33D -> "[とうもろこし]"
+  ["f09f8d84", :undef], # [MUSHROOM] U+1F344 -> "[キノコ]"
+  ["f09f8cb0", :undef], # [CHESTNUT] U+1F330 -> "[栗]"
+  ["f09f8cbc", "ee8c85"], # [BLOSSOM] U+1F33C -> U+E305
+  ["f09f8cbf", "ee8490"], # [HERB] U+1F33F -> U+E110
+  ["f09f8d92", :undef], # [CHERRIES] U+1F352 -> "[さくらんぼ]"
+  ["f09f8d8c", :undef], # [BANANA] U+1F34C -> "[バナナ]"
+  ["f09f8d8e", "ee8d85"], # [RED APPLE] U+1F34E -> U+E345
+  ["f09f8d8a", "ee8d86"], # [TANGERINE] U+1F34A -> U+E346
+  ["f09f8d93", "ee8d87"], # [STRAWBERRY] U+1F353 -> U+E347
+  ["f09f8d89", "ee8d88"], # [WATERMELON] U+1F349 -> U+E348
+  ["f09f8d85", "ee8d89"], # [TOMATO] U+1F345 -> U+E349
+  ["f09f8d86", "ee8d8a"], # [AUBERGINE] U+1F346 -> U+E34A
+  ["f09f8d88", :undef], # [MELON] U+1F348 -> "[メロン]"
+  ["f09f8d8d", :undef], # [PINEAPPLE] U+1F34D -> "[パイナップル]"
+  ["f09f8d87", :undef], # [GRAPES] U+1F347 -> "[ブドウ]"
+  ["f09f8d91", :undef], # [PEACH] U+1F351 -> "[モモ]"
+  ["f09f8d8f", "ee8d85"], # [GREEN APPLE] U+1F34F -> U+E345
+  ["f09f9180", "ee9099"], # [EYES] U+1F440 -> U+E419
+  ["f09f9182", "ee909b"], # [EAR] U+1F442 -> U+E41B
+  ["f09f9183", "ee909a"], # [NOSE] U+1F443 -> U+E41A
+  ["f09f9184", "ee909c"], # [MOUTH] U+1F444 -> U+E41C
+  ["f09f9185", "ee9089"], # [TONGUE] U+1F445 -> U+E409
+  ["f09f9284", "ee8c9c"], # [LIPSTICK] U+1F484 -> U+E31C
+  ["f09f9285", "ee8c9d"], # [NAIL POLISH] U+1F485 -> U+E31D
+  ["f09f9286", "ee8c9e"], # [FACE MASSAGE] U+1F486 -> U+E31E
+  ["f09f9287", "ee8c9f"], # [HAIRCUT] U+1F487 -> U+E31F
+  ["f09f9288", "ee8ca0"], # [BARBER POLE] U+1F488 -> U+E320
+  ["f09f91a4", :undef], # [BUST IN SILHOUETTE] U+1F464 -> U+3013 (GETA)
+  ["f09f91a6", "ee8081"], # [BOY] U+1F466 -> U+E001
+  ["f09f91a7", "ee8082"], # [GIRL] U+1F467 -> U+E002
+  ["f09f91a8", "ee8084"], # [MAN] U+1F468 -> U+E004
+  ["f09f91a9", "ee8085"], # [WOMAN] U+1F469 -> U+E005
+  ["f09f91aa", :undef], # [FAMILY] U+1F46A -> "[家族]"
+  ["f09f91ab", "ee90a8"], # [MAN AND WOMAN HOLDING HANDS] U+1F46B -> U+E428
+  ["f09f91ae", "ee8592"], # [POLICE OFFICER] U+1F46E -> U+E152
+  ["f09f91af", "ee90a9"], # [WOMAN WITH BUNNY EARS] U+1F46F -> U+E429
+  ["f09f91b0", :undef], # [BRIDE WITH VEIL] U+1F470 -> "[花嫁]"
+  ["f09f91b1", "ee9495"], # [WESTERN PERSON] U+1F471 -> U+E515
+  ["f09f91b2", "ee9496"], # [MAN WITH GUA PI MAO] U+1F472 -> U+E516
+  ["f09f91b3", "ee9497"], # [MAN WITH TURBAN] U+1F473 -> U+E517
+  ["f09f91b4", "ee9498"], # [OLDER MAN] U+1F474 -> U+E518
+  ["f09f91b5", "ee9499"], # [OLDER WOMAN] U+1F475 -> U+E519
+  ["f09f91b6", "ee949a"], # [BABY] U+1F476 -> U+E51A
+  ["f09f91b7", "ee949b"], # [CONSTRUCTION WORKER] U+1F477 -> U+E51B
+  ["f09f91b8", "ee949c"], # [PRINCESS] U+1F478 -> U+E51C
+  ["f09f91b9", :undef], # [JAPANESE OGRE] U+1F479 -> "[なまはげ]"
+  ["f09f91ba", :undef], # [JAPANESE GOBLIN] U+1F47A -> "[天狗]"
+  ["f09f91bb", "ee849b"], # [GHOST] U+1F47B -> U+E11B
+  ["f09f91bc", "ee818e"], # [BABY ANGEL] U+1F47C -> U+E04E
+  ["f09f91bd", "ee848c"], # [EXTRATERRESTRIAL ALIEN] U+1F47D -> U+E10C
+  ["f09f91be", "ee84ab"], # [ALIEN MONSTER] U+1F47E -> U+E12B
+  ["f09f91bf", "ee849a"], # [IMP] U+1F47F -> U+E11A
+  ["f09f9280", "ee849c"], # [SKULL] U+1F480 -> U+E11C
+  ["f09f9281", "ee8993"], # [INFORMATION DESK PERSON] U+1F481 -> U+E253
+  ["f09f9282", "ee949e"], # [GUARDSMAN] U+1F482 -> U+E51E
+  ["f09f9283", "ee949f"], # [DANCER] U+1F483 -> U+E51F
+  ["f09f908c", :undef], # [SNAIL] U+1F40C -> "[カタツムリ]"
+  ["f09f908d", "ee94ad"], # [SNAKE] U+1F40D -> U+E52D
+  ["f09f908e", "ee84b4"], # [HORSE] U+1F40E -> U+E134
+  ["f09f9094", "ee94ae"], # [CHICKEN] U+1F414 -> U+E52E
+  ["f09f9097", "ee94af"], # [BOAR] U+1F417 -> U+E52F
+  ["f09f90ab", "ee94b0"], # [BACTRIAN CAMEL] U+1F42B -> U+E530
+  ["f09f9098", "ee94a6"], # [ELEPHANT] U+1F418 -> U+E526
+  ["f09f90a8", "ee94a7"], # [KOALA] U+1F428 -> U+E527
+  ["f09f9092", "ee94a8"], # [MONKEY] U+1F412 -> U+E528
+  ["f09f9091", "ee94a9"], # [SHEEP] U+1F411 -> U+E529
+  ["f09f9099", "ee848a"], # [OCTOPUS] U+1F419 -> U+E10A
+  ["f09f909a", "ee9181"], # [SPIRAL SHELL] U+1F41A -> U+E441
+  ["f09f909b", "ee94a5"], # [BUG] U+1F41B -> U+E525
+  ["f09f909c", :undef], # [ANT] U+1F41C -> "[アリ]"
+  ["f09f909d", :undef], # [HONEYBEE] U+1F41D -> "[ミツバチ]"
+  ["f09f909e", :undef], # [LADY BEETLE] U+1F41E -> "[てんとう虫]"
+  ["f09f90a0", "ee94a2"], # [TROPICAL FISH] U+1F420 -> U+E522
+  ["f09f90a1", "ee8099"], # [BLOWFISH] U+1F421 -> U+E019
+  ["f09f90a2", :undef], # [TURTLE] U+1F422 -> "[カメ]"
+  ["f09f90a4", "ee94a3"], # [BABY CHICK] U+1F424 -> U+E523
+  ["f09f90a5", "ee94a3"], # [FRONT-FACING BABY CHICK] U+1F425 -> U+E523
+  ["f09f90a6", "ee94a1"], # [BIRD] U+1F426 -> U+E521
+  ["f09f90a3", "ee94a3"], # [HATCHING CHICK] U+1F423 -> U+E523
+  ["f09f90a7", "ee8195"], # [PENGUIN] U+1F427 -> U+E055
+  ["f09f90a9", "ee8192"], # [POODLE] U+1F429 -> U+E052
+  ["f09f909f", "ee8099"], # [FISH] U+1F41F -> U+E019
+  ["f09f90ac", "ee94a0"], # [DOLPHIN] U+1F42C -> U+E520
+  ["f09f90ad", "ee8193"], # [MOUSE FACE] U+1F42D -> U+E053
+  ["f09f90af", "ee8190"], # [TIGER FACE] U+1F42F -> U+E050
+  ["f09f90b1", "ee818f"], # [CAT FACE] U+1F431 -> U+E04F
+  ["f09f90b3", "ee8194"], # [SPOUTING WHALE] U+1F433 -> U+E054
+  ["f09f90b4", "ee809a"], # [HORSE FACE] U+1F434 -> U+E01A
+  ["f09f90b5", "ee8489"], # [MONKEY FACE] U+1F435 -> U+E109
+  ["f09f90b6", "ee8192"], # [DOG FACE] U+1F436 -> U+E052
+  ["f09f90b7", "ee848b"], # [PIG FACE] U+1F437 -> U+E10B
+  ["f09f90bb", "ee8191"], # [BEAR FACE] U+1F43B -> U+E051
+  ["f09f90b9", "ee94a4"], # [HAMSTER FACE] U+1F439 -> U+E524
+  ["f09f90ba", "ee94aa"], # [WOLF FACE] U+1F43A -> U+E52A
+  ["f09f90ae", "ee94ab"], # [COW FACE] U+1F42E -> U+E52B
+  ["f09f90b0", "ee94ac"], # [RABBIT FACE] U+1F430 -> U+E52C
+  ["f09f90b8", "ee94b1"], # [FROG FACE] U+1F438 -> U+E531
+  ["f09f90be", "ee94b6"], # [PAW PRINTS] U+1F43E -> U+E536
+  ["f09f90b2", :undef], # [DRAGON FACE] U+1F432 -> "[辰]"
+  ["f09f90bc", :undef], # [PANDA FACE] U+1F43C -> "[パンダ]"
+  ["f09f90bd", "ee848b"], # [PIG NOSE] U+1F43D -> U+E10B
+  ["f09f9880", "ee8199"], # [ANGRY FACE] U+1F600 -> U+E059
+  ["f09f9881", "ee9083"], # [ANGUISHED FACE] U+1F601 -> U+E403
+  ["f09f9882", "ee9090"], # [ASTONISHED FACE] U+1F602 -> U+E410
+  ["f09f9883", "ee8198"], # [DISAPPOINTED FACE] U+1F603 -> U+E058
+  ["f09f9884", "ee9086"], # [DIZZY FACE] U+1F604 -> U+E406
+  ["f09f9885", "ee908f"], # [EXASPERATED FACE] U+1F605 -> U+E40F
+  ["f09f9886", "ee908e"], # [EXPRESSIONLESS FACE] U+1F606 -> U+E40E
+  ["f09f9887", "ee8486"], # [FACE WITH HEART-SHAPED EYES] U+1F607 -> U+E106
+  ["f09f9888", "ee9084"], # [FACE WITH LOOK OF TRIUMPH] U+1F608 -> U+E404
+  ["f09f9889", "ee8485"], # [WINKING FACE WITH STUCK-OUT TONGUE] U+1F609 -> U+E105
+  ["f09f988a", "ee9089"], # [FACE WITH STUCK-OUT TONGUE] U+1F60A -> U+E409
+  ["f09f988b", "ee8196"], # [FACE SAVOURING DELICIOUS FOOD] U+1F60B -> U+E056
+  ["f09f988c", "ee9098"], # [FACE THROWING A KISS] U+1F60C -> U+E418
+  ["f09f988d", "ee9097"], # [FACE KISSING] U+1F60D -> U+E417
+  ["f09f988e", "ee908c"], # [FACE WITH MASK] U+1F60E -> U+E40C
+  ["f09f988f", "ee908d"], # [FLUSHED FACE] U+1F60F -> U+E40D
+  ["f09f9890", "ee8197"], # [HAPPY FACE WITH OPEN MOUTH] U+1F610 -> U+E057
+  ["f09f9891", "ee9095ee8cb1"], # [HAPPY FACE WITH OPEN MOUTH AND COLD SWEAT] U+1F611 -> U+E415 U+E331
+  ["f09f9892", "ee908a"], # [HAPPY FACE WITH OPEN MOUTH AND CLOSED EYES] U+1F612 -> U+E40A
+  ["f09f9893", "ee9084"], # [HAPPY FACE WITH GRIN] U+1F613 -> U+E404
+  ["f09f9894", "ee9092"], # [HAPPY AND CRYING FACE] U+1F614 -> U+E412
+  ["f09f9895", "ee8196"], # [HAPPY FACE WITH WIDE MOUTH AND RAISED EYEBROWS] U+1F615 -> U+E056
+  ["e298ba", "ee9094"], # [WHITE SMILING FACE] U+263A -> U+E414
+  ["f09f9896", "ee9095"], # [HAPPY FACE WITH OPEN MOUTH AND RAISED EYEBROWS] U+1F616 -> U+E415
+  ["f09f9897", "ee9093"], # [CRYING FACE] U+1F617 -> U+E413
+  ["f09f9898", "ee9091"], # [LOUDLY CRYING FACE] U+1F618 -> U+E411
+  ["f09f9899", "ee908b"], # [FEARFUL FACE] U+1F619 -> U+E40B
+  ["f09f989a", "ee9086"], # [PERSEVERING FACE] U+1F61A -> U+E406
+  ["f09f989b", "ee9096"], # [POUTING FACE] U+1F61B -> U+E416
+  ["f09f989c", "ee908a"], # [RELIEVED FACE] U+1F61C -> U+E40A
+  ["f09f989d", "ee9087"], # [CONFOUNDED FACE] U+1F61D -> U+E407
+  ["f09f989e", "ee9083"], # [PENSIVE FACE] U+1F61E -> U+E403
+  ["f09f989f", "ee8487"], # [FACE SCREAMING IN FEAR] U+1F61F -> U+E107
+  ["f09f98a0", "ee9088"], # [SLEEPY FACE] U+1F620 -> U+E408
+  ["f09f98a1", "ee9082"], # [SMIRKING FACE] U+1F621 -> U+E402
+  ["f09f98a2", "ee8488"], # [FACE WITH COLD SWEAT] U+1F622 -> U+E108
+  ["f09f98a3", "ee9081"], # [DISAPPOINTED BUT RELIEVED FACE] U+1F623 -> U+E401
+  ["f09f98a4", "ee9086"], # [TIRED FACE] U+1F624 -> U+E406
+  ["f09f98a5", "ee9085"], # [WINKING FACE] U+1F625 -> U+E405
+  ["f09f98ab", "ee8197"], # [CAT FACE WITH OPEN MOUTH] U+1F62B -> U+E057
+  ["f09f98ac", "ee9084"], # [HAPPY CAT FACE WITH GRIN] U+1F62C -> U+E404
+  ["f09f98ad", "ee9092"], # [HAPPY AND CRYING CAT FACE] U+1F62D -> U+E412
+  ["f09f98ae", "ee9098"], # [CAT FACE KISSING] U+1F62E -> U+E418
+  ["f09f98af", "ee8486"], # [CAT FACE WITH HEART-SHAPED EYES] U+1F62F -> U+E106
+  ["f09f98b0", "ee9093"], # [CRYING CAT FACE] U+1F630 -> U+E413
+  ["f09f98b1", "ee9096"], # [POUTING CAT FACE] U+1F631 -> U+E416
+  ["f09f98b2", "ee9084"], # [CAT FACE WITH TIGHTLY-CLOSED LIPS] U+1F632 -> U+E404
+  ["f09f98b3", "ee9083"], # [ANGUISHED CAT FACE] U+1F633 -> U+E403
+  ["f09f98b4", "ee90a3"], # [FACE WITH NO GOOD GESTURE] U+1F634 -> U+E423
+  ["f09f98b5", "ee90a4"], # [FACE WITH OK GESTURE] U+1F635 -> U+E424
+  ["f09f98b6", "ee90a6"], # [PERSON BOWING DEEPLY] U+1F636 -> U+E426
+  ["f09f98b7", :undef], # [SEE-NO-EVIL MONKEY] U+1F637 -> "(/_＼)"
+  ["f09f98b9", :undef], # [SPEAK-NO-EVIL MONKEY] U+1F639 -> "(・×・)"
+  ["f09f98b8", :undef], # [HEAR-NO-EVIL MONKEY] U+1F638 -> "|(・×・)|"
+  ["f09f98ba", "ee8092"], # [PERSON RAISING ONE HAND] U+1F63A -> U+E012
+  ["f09f98bb", "ee90a7"], # [PERSON RAISING BOTH HANDS IN CELEBRATION] U+1F63B -> U+E427
+  ["f09f98bc", "ee9083"], # [PERSON FROWNING] U+1F63C -> U+E403
+  ["f09f98bd", "ee9096"], # [PERSON WITH POUTING FACE] U+1F63D -> U+E416
+  ["f09f98be", "ee909d"], # [PERSON WITH FOLDED HANDS] U+1F63E -> U+E41D
+  ["f09f8fa0", "ee80b6"], # [HOUSE BUILDING] U+1F3E0 -> U+E036
+  ["f09f8fa1", "ee80b6"], # [HOUSE WITH GARDEN] U+1F3E1 -> U+E036
+  ["f09f8fa2", "ee80b8"], # [OFFICE BUILDING] U+1F3E2 -> U+E038
+  ["f09f8fa3", "ee8593"], # [JAPANESE POST OFFICE] U+1F3E3 -> U+E153
+  ["f09f8fa5", "ee8595"], # [HOSPITAL] U+1F3E5 -> U+E155
+  ["f09f8fa6", "ee858d"], # [BANK] U+1F3E6 -> U+E14D
+  ["f09f8fa7", "ee8594"], # [AUTOMATED TELLER MACHINE] U+1F3E7 -> U+E154
+  ["f09f8fa8", "ee8598"], # [HOTEL] U+1F3E8 -> U+E158
+  ["f09f8fa9", "ee9481"], # [LOVE HOTEL] U+1F3E9 -> U+E501
+  ["f09f8faa", "ee8596"], # [CONVENIENCE STORE] U+1F3EA -> U+E156
+  ["f09f8fab", "ee8597"], # [SCHOOL] U+1F3EB -> U+E157
+  ["e29baa", "ee80b7"], # [CHURCH] U+26EA -> U+E037
+  ["e29bb2", "ee84a1"], # [FOUNTAIN] U+26F2 -> U+E121
+  ["f09f8fac", "ee9484"], # [DEPARTMENT STORE] U+1F3EC -> U+E504
+  ["f09f8faf", "ee9485"], # [JAPANESE CASTLE] U+1F3EF -> U+E505
+  ["f09f8fb0", "ee9486"], # [EUROPEAN CASTLE] U+1F3F0 -> U+E506
+  ["f09f8fad", "ee9488"], # [FACTORY] U+1F3ED -> U+E508
+  ["e29a93", "ee8882"], # [ANCHOR] U+2693 -> U+E202
+  ["f09f8fae", "ee8c8b"], # [IZAKAYA LANTERN] U+1F3EE -> U+E30B
+  ["f09f97bb", "ee80bb"], # [MOUNT FUJI] U+1F5FB -> U+E03B
+  ["f09f97bc", "ee9489"], # [TOKYO TOWER] U+1F5FC -> U+E509
+  ["f09f97bd", "ee949d"], # [STATUE OF LIBERTY] U+1F5FD -> U+E51D
+  ["f09f97be", :undef], # [SILHOUETTE OF JAPAN] U+1F5FE -> "[日本地図]"
+  ["f09f97bf", :undef], # [MOYAI] U+1F5FF -> "[モアイ]"
+  ["f09f919e", "ee8087"], # [MANS SHOE] U+1F45E -> U+E007
+  ["f09f919f", "ee8087"], # [ATHLETIC SHOE] U+1F45F -> U+E007
+  ["f09f91a0", "ee84be"], # [HIGH-HEELED SHOE] U+1F460 -> U+E13E
+  ["f09f91a1", "ee8c9a"], # [WOMANS SANDAL] U+1F461 -> U+E31A
+  ["f09f91a2", "ee8c9b"], # [WOMANS BOOTS] U+1F462 -> U+E31B
+  ["f09f91a3", "ee94b6"], # [FOOTPRINTS] U+1F463 -> U+E536
+  ["f09f9193", :undef], # [EYEGLASSES] U+1F453 -> "[メガネ]"
+  ["f09f9195", "ee8086"], # [T-SHIRT] U+1F455 -> U+E006
+  ["f09f9196", :undef], # [JEANS] U+1F456 -> "[ジーンズ]"
+  ["f09f9191", "ee848e"], # [CROWN] U+1F451 -> U+E10E
+  ["f09f9194", "ee8c82"], # [NECKTIE] U+1F454 -> U+E302
+  ["f09f9192", "ee8c98"], # [WOMANS HAT] U+1F452 -> U+E318
+  ["f09f9197", "ee8c99"], # [DRESS] U+1F457 -> U+E319
+  ["f09f9198", "ee8ca1"], # [KIMONO] U+1F458 -> U+E321
+  ["f09f9199", "ee8ca2"], # [BIKINI] U+1F459 -> U+E322
+  ["f09f919a", "ee8086"], # [WOMANS CLOTHES] U+1F45A -> U+E006
+  ["f09f919b", :undef], # [PURSE] U+1F45B -> "[財布]"
+  ["f09f919c", "ee8ca3"], # [HANDBAG] U+1F45C -> U+E323
+  ["f09f919d", :undef], # [POUCH] U+1F45D -> "[ふくろ]"
+  ["f09f92b0", "ee84af"], # [MONEY BAG] U+1F4B0 -> U+E12F
+  ["f09f92b1", "ee8589"], # [CURRENCY EXCHANGE] U+1F4B1 -> U+E149
+  ["f09f92b9", "ee858a"], # [CHART WITH UPWARDS TREND AND YEN SIGN] U+1F4B9 -> U+E14A
+  ["f09f92b2", "ee84af"], # [HEAVY DOLLAR SIGN] U+1F4B2 -> U+E12F
+  ["f09f92b3", :undef], # [CREDIT CARD] U+1F4B3 -> "[カード]"
+  ["f09f92b4", :undef], # [BANKNOTE WITH YEN SIGN] U+1F4B4 -> "￥"
+  ["f09f92b5", "ee84af"], # [BANKNOTE WITH DOLLAR SIGN] U+1F4B5 -> U+E12F
+  ["f09f92b8", :undef], # [MONEY WITH WINGS] U+1F4B8 -> "[飛んでいくお金]"
+  ["f09f87a6", :undef], # [REGIONAL INDICATOR SYMBOL LETTER A] U+1F1E6 -> "[A]"
+  ["f09f87a7", :undef], # [REGIONAL INDICATOR SYMBOL LETTER B] U+1F1E7 -> "[B]"
+  ["f09f87a8", :undef], # [REGIONAL INDICATOR SYMBOL LETTER C] U+1F1E8 -> "[C]"
+  ["f09f87a9", :undef], # [REGIONAL INDICATOR SYMBOL LETTER D] U+1F1E9 -> "[D]"
+  ["f09f87aa", :undef], # [REGIONAL INDICATOR SYMBOL LETTER E] U+1F1EA -> "[E]"
+  ["f09f87ab", :undef], # [REGIONAL INDICATOR SYMBOL LETTER F] U+1F1EB -> "[F]"
+  ["f09f87ac", :undef], # [REGIONAL INDICATOR SYMBOL LETTER G] U+1F1EC -> "[G]"
+  ["f09f87ad", :undef], # [REGIONAL INDICATOR SYMBOL LETTER H] U+1F1ED -> "[H]"
+  ["f09f87ae", :undef], # [REGIONAL INDICATOR SYMBOL LETTER I] U+1F1EE -> "[I]"
+  ["f09f87af", :undef], # [REGIONAL INDICATOR SYMBOL LETTER J] U+1F1EF -> "[J]"
+  ["f09f87b0", :undef], # [REGIONAL INDICATOR SYMBOL LETTER K] U+1F1F0 -> "[K]"
+  ["f09f87b1", :undef], # [REGIONAL INDICATOR SYMBOL LETTER L] U+1F1F1 -> "[L]"
+  ["f09f87b2", :undef], # [REGIONAL INDICATOR SYMBOL LETTER M] U+1F1F2 -> "[M]"
+  ["f09f87b3", :undef], # [REGIONAL INDICATOR SYMBOL LETTER N] U+1F1F3 -> "[N]"
+  ["f09f87b4", :undef], # [REGIONAL INDICATOR SYMBOL LETTER O] U+1F1F4 -> "[O]"
+  ["f09f87b5", :undef], # [REGIONAL INDICATOR SYMBOL LETTER P] U+1F1F5 -> "[P]"
+  ["f09f87b6", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Q] U+1F1F6 -> "[Q]"
+  ["f09f87b7", :undef], # [REGIONAL INDICATOR SYMBOL LETTER R] U+1F1F7 -> "[R]"
+  ["f09f87b8", :undef], # [REGIONAL INDICATOR SYMBOL LETTER S] U+1F1F8 -> "[S]"
+  ["f09f87b9", :undef], # [REGIONAL INDICATOR SYMBOL LETTER T] U+1F1F9 -> "[T]"
+  ["f09f87ba", :undef], # [REGIONAL INDICATOR SYMBOL LETTER U] U+1F1FA -> "[U]"
+  ["f09f87bb", :undef], # [REGIONAL INDICATOR SYMBOL LETTER V] U+1F1FB -> "[V]"
+  ["f09f87bc", :undef], # [REGIONAL INDICATOR SYMBOL LETTER W] U+1F1FC -> "[W]"
+  ["f09f87bd", :undef], # [REGIONAL INDICATOR SYMBOL LETTER X] U+1F1FD -> "[X]"
+  ["f09f87be", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Y] U+1F1FE -> "[Y]"
+  ["f09f87bf", :undef], # [REGIONAL INDICATOR SYMBOL LETTER Z] U+1F1FF -> "[Z]"
+  ["f09f94a5", "ee849d"], # [FIRE] U+1F525 -> U+E11D
+  ["f09f94a6", :undef], # [ELECTRIC TORCH] U+1F526 -> "[懐中電灯]"
+  ["f09f94a7", :undef], # [WRENCH] U+1F527 -> "[レンチ]"
+  ["f09f94a8", "ee8496"], # [HAMMER] U+1F528 -> U+E116
+  ["f09f94a9", :undef], # [NUT AND BOLT] U+1F529 -> "[ネジ]"
+  ["f09f94aa", :undef], # [HOCHO] U+1F52A -> "[包丁]"
+  ["f09f94ab", "ee8493"], # [PISTOL] U+1F52B -> U+E113
+  ["f09f94ae", "ee88be"], # [CRYSTAL BALL] U+1F52E -> U+E23E
+  ["f09f94af", "ee88be"], # [SIX POINTED STAR WITH MIDDLE DOT] U+1F52F -> U+E23E
+  ["f09f94b0", "ee8889"], # [JAPANESE SYMBOL FOR BEGINNER] U+1F530 -> U+E209
+  ["f09f94b1", "ee80b1"], # [TRIDENT EMBLEM] U+1F531 -> U+E031
+  ["f09f9289", "ee84bb"], # [SYRINGE] U+1F489 -> U+E13B
+  ["f09f928a", "ee8c8f"], # [PILL] U+1F48A -> U+E30F
+  ["f09f85b0", "ee94b2"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER A] U+1F170 -> U+E532
+  ["f09f85b1", "ee94b3"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER B] U+1F171 -> U+E533
+  ["f09f868e", "ee94b4"], # [NEGATIVE SQUARED AB] U+1F18E -> U+E534
+  ["f09f85be", "ee94b5"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER O] U+1F17E -> U+E535
+  ["f09f8e80", "ee8c94"], # [RIBBON] U+1F380 -> U+E314
+  ["f09f8e81", "ee8492"], # [WRAPPED PRESENT] U+1F381 -> U+E112
+  ["f09f8e82", "ee8d8b"], # [BIRTHDAY CAKE] U+1F382 -> U+E34B
+  ["f09f8e84", "ee80b3"], # [CHRISTMAS TREE] U+1F384 -> U+E033
+  ["f09f8e85", "ee9188"], # [FATHER CHRISTMAS] U+1F385 -> U+E448
+  ["f09f8e8c", "ee8583"], # [CROSSED FLAGS] U+1F38C -> U+E143
+  ["f09f8e86", "ee8497"], # [FIREWORKS] U+1F386 -> U+E117
+  ["f09f8e88", "ee8c90"], # [BALLOON] U+1F388 -> U+E310
+  ["f09f8e89", "ee8c92"], # [PARTY POPPER] U+1F389 -> U+E312
+  ["f09f8e8d", "ee90b6"], # [PINE DECORATION] U+1F38D -> U+E436
+  ["f09f8e8e", "ee90b8"], # [JAPANESE DOLLS] U+1F38E -> U+E438
+  ["f09f8e93", "ee90b9"], # [GRADUATION CAP] U+1F393 -> U+E439
+  ["f09f8e92", "ee90ba"], # [SCHOOL SATCHEL] U+1F392 -> U+E43A
+  ["f09f8e8f", "ee90bb"], # [CARP STREAMER] U+1F38F -> U+E43B
+  ["f09f8e87", "ee9180"], # [FIREWORK SPARKLER] U+1F387 -> U+E440
+  ["f09f8e90", "ee9182"], # [WIND CHIME] U+1F390 -> U+E442
+  ["f09f8e83", "ee9185"], # [JACK-O-LANTERN] U+1F383 -> U+E445
+  ["f09f8e8a", :undef], # [CONFETTI BALL] U+1F38A -> "[オメデトウ]"
+  ["f09f8e8b", :undef], # [TANABATA TREE] U+1F38B -> "[七夕]"
+  ["f09f8e91", "ee9186"], # [MOON VIEWING CEREMONY] U+1F391 -> U+E446
+  ["f09f939f", :undef], # [PAGER] U+1F4DF -> "[ポケベル]"
+  ["e2988e", "ee8089"], # [BLACK TELEPHONE] U+260E -> U+E009
+  ["f09f939e", "ee8089"], # [TELEPHONE RECEIVER] U+1F4DE -> U+E009
+  ["f09f93b1", "ee808a"], # [MOBILE PHONE] U+1F4F1 -> U+E00A
+  ["f09f93b2", "ee8484"], # [MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT] U+1F4F2 -> U+E104
+  ["f09f939d", "ee8c81"], # [MEMO] U+1F4DD -> U+E301
+  ["f09f93a0", "ee808b"], # [FAX MACHINE] U+1F4E0 -> U+E00B
+  ["e29c89", "ee8483"], # [ENVELOPE] U+2709 -> U+E103
+  ["f09f93a8", "ee8483"], # [INCOMING ENVELOPE] U+1F4E8 -> U+E103
+  ["f09f93a9", "ee8483"], # [ENVELOPE WITH DOWNWARDS ARROW ABOVE] U+1F4E9 -> U+E103
+  ["f09f93aa", "ee8481"], # [CLOSED MAILBOX WITH LOWERED FLAG] U+1F4EA -> U+E101
+  ["f09f93ab", "ee8481"], # [CLOSED MAILBOX WITH RAISED FLAG] U+1F4EB -> U+E101
+  ["f09f93ae", "ee8482"], # [POSTBOX] U+1F4EE -> U+E102
+  ["f09f93b0", :undef], # [NEWSPAPER] U+1F4F0 -> "[新聞]"
+  ["f09f93a2", "ee8582"], # [PUBLIC ADDRESS LOUDSPEAKER] U+1F4E2 -> U+E142
+  ["f09f93a3", "ee8c97"], # [CHEERING MEGAPHONE] U+1F4E3 -> U+E317
+  ["f09f93a1", "ee858b"], # [SATELLITE ANTENNA] U+1F4E1 -> U+E14B
+  ["f09f93a4", :undef], # [OUTBOX TRAY] U+1F4E4 -> "[送信BOX]"
+  ["f09f93a5", :undef], # [INBOX TRAY] U+1F4E5 -> "[受信BOX]"
+  ["f09f93a6", "ee8492"], # [PACKAGE] U+1F4E6 -> U+E112
+  ["f09f93a7", "ee8483"], # [E-MAIL SYMBOL] U+1F4E7 -> U+E103
+  ["f09f94a0", :undef], # [INPUT SYMBOL FOR LATIN CAPITAL LETTERS] U+1F520 -> "[ABCD]"
+  ["f09f94a1", :undef], # [INPUT SYMBOL FOR LATIN SMALL LETTERS] U+1F521 -> "[abcd]"
+  ["f09f94a2", :undef], # [INPUT SYMBOL FOR NUMBERS] U+1F522 -> "[1234]"
+  ["f09f94a3", :undef], # [INPUT SYMBOL FOR SYMBOLS] U+1F523 -> "[記号]"
+  ["f09f94a4", :undef], # [INPUT SYMBOL FOR LATIN LETTERS] U+1F524 -> "[ABC]"
+  ["e29c92", :undef], # [BLACK NIB] U+2712 -> "[ペン]"
+  ["f09f92ba", "ee849f"], # [SEAT] U+1F4BA -> U+E11F
+  ["f09f92bb", "ee808c"], # [PERSONAL COMPUTER] U+1F4BB -> U+E00C
+  ["e29c8f", "ee8c81"], # [PENCIL] U+270F -> U+E301
+  ["f09f938e", :undef], # [PAPERCLIP] U+1F4CE -> "[クリップ]"
+  ["f09f92bc", "ee849e"], # [BRIEFCASE] U+1F4BC -> U+E11E
+  ["f09f92bd", "ee8c96"], # [MINIDISC] U+1F4BD -> U+E316
+  ["f09f92be", "ee8c96"], # [FLOPPY DISK] U+1F4BE -> U+E316
+  ["f09f92bf", "ee84a6"], # [OPTICAL DISC] U+1F4BF -> U+E126
+  ["f09f9380", "ee84a7"], # [DVD] U+1F4C0 -> U+E127
+  ["e29c82", "ee8c93"], # [BLACK SCISSORS] U+2702 -> U+E313
+  ["f09f938d", :undef], # [ROUND PUSHPIN] U+1F4CD -> "[画びょう]"
+  ["f09f9383", "ee8c81"], # [PAGE WITH CURL] U+1F4C3 -> U+E301
+  ["f09f9384", "ee8c81"], # [PAGE FACING UP] U+1F4C4 -> U+E301
+  ["f09f9385", :undef], # [CALENDAR] U+1F4C5 -> "[カレンダー]"
+  ["f09f9381", :undef], # [FILE FOLDER] U+1F4C1 -> "[フォルダ]"
+  ["f09f9382", :undef], # [OPEN FILE FOLDER] U+1F4C2 -> "[フォルダ]"
+  ["f09f9393", "ee8588"], # [NOTEBOOK] U+1F4D3 -> U+E148
+  ["f09f9396", "ee8588"], # [OPEN BOOK] U+1F4D6 -> U+E148
+  ["f09f9394", "ee8588"], # [NOTEBOOK WITH DECORATIVE COVER] U+1F4D4 -> U+E148
+  ["f09f9395", "ee8588"], # [CLOSED BOOK] U+1F4D5 -> U+E148
+  ["f09f9397", "ee8588"], # [GREEN BOOK] U+1F4D7 -> U+E148
+  ["f09f9398", "ee8588"], # [BLUE BOOK] U+1F4D8 -> U+E148
+  ["f09f9399", "ee8588"], # [ORANGE BOOK] U+1F4D9 -> U+E148
+  ["f09f939a", "ee8588"], # [BOOKS] U+1F4DA -> U+E148
+  ["f09f939b", :undef], # [NAME BADGE] U+1F4DB -> "[名札]"
+  ["f09f939c", :undef], # [SCROLL] U+1F4DC -> "[スクロール]"
+  ["f09f938b", "ee8c81"], # [CLIPBOARD] U+1F4CB -> U+E301
+  ["f09f9386", :undef], # [TEAR-OFF CALENDAR] U+1F4C6 -> "[カレンダー]"
+  ["f09f938a", "ee858a"], # [BAR CHART] U+1F4CA -> U+E14A
+  ["f09f9388", "ee858a"], # [CHART WITH UPWARDS TREND] U+1F4C8 -> U+E14A
+  ["f09f9389", :undef], # [CHART WITH DOWNWARDS TREND] U+1F4C9 -> "[グラフ]"
+  ["f09f9387", "ee8588"], # [CARD INDEX] U+1F4C7 -> U+E148
+  ["f09f938c", :undef], # [PUSHPIN] U+1F4CC -> "[画びょう]"
+  ["f09f9392", "ee8588"], # [LEDGER] U+1F4D2 -> U+E148
+  ["f09f938f", :undef], # [STRAIGHT RULER] U+1F4CF -> "[定規]"
+  ["f09f9390", :undef], # [TRIANGULAR RULER] U+1F4D0 -> "[三角定規]"
+  ["f09f9391", "ee8c81"], # [BOOKMARK TABS] U+1F4D1 -> U+E301
+  ["f09f8ebd", :undef], # [RUNNING SHIRT WITH SASH] U+1F3BD -> U+3013 (GETA)
+  ["e29abe", "ee8096"], # [BASEBALL] U+26BE -> U+E016
+  ["e29bb3", "ee8094"], # [FLAG IN HOLE] U+26F3 -> U+E014
+  ["f09f8ebe", "ee8095"], # [TENNIS RACQUET AND BALL] U+1F3BE -> U+E015
+  ["e29abd", "ee8098"], # [SOCCER BALL] U+26BD -> U+E018
+  ["f09f8ebf", "ee8093"], # [SKI AND SKI BOOT] U+1F3BF -> U+E013
+  ["f09f8f80", "ee90aa"], # [BASKETBALL AND HOOP] U+1F3C0 -> U+E42A
+  ["f09f8f81", "ee84b2"], # [CHEQUERED FLAG] U+1F3C1 -> U+E132
+  ["f09f8f82", :undef], # [SNOWBOARDER] U+1F3C2 -> "[スノボ]"
+  ["f09f8f83", "ee8495"], # [RUNNER] U+1F3C3 -> U+E115
+  ["f09f8f84", "ee8097"], # [SURFER] U+1F3C4 -> U+E017
+  ["f09f8f86", "ee84b1"], # [TROPHY] U+1F3C6 -> U+E131
+  ["f09f8f88", "ee90ab"], # [AMERICAN FOOTBALL] U+1F3C8 -> U+E42B
+  ["f09f8f8a", "ee90ad"], # [SWIMMER] U+1F3CA -> U+E42D
+  ["f09f9a86", "ee809e"], # [TRAIN] U+1F686 -> U+E01E
+  ["f09f9a87", "ee90b4"], # [METRO] U+1F687 -> U+E434
+  ["e29382", "ee90b4"], # [CIRCLED LATIN CAPITAL LETTER M] U+24C2 -> U+E434
+  ["f09f9a84", "ee90b5"], # [HIGH-SPEED TRAIN] U+1F684 -> U+E435
+  ["f09f9a85", "ee809f"], # [HIGH-SPEED TRAIN WITH BULLET NOSE] U+1F685 -> U+E01F
+  ["f09f9a97", "ee809b"], # [AUTOMOBILE] U+1F697 -> U+E01B
+  ["f09f9a99", "ee90ae"], # [RECREATIONAL VEHICLE] U+1F699 -> U+E42E
+  ["f09f9a8d", "ee8599"], # [ONCOMING BUS] U+1F68D -> U+E159
+  ["f09f9a8f", "ee8590"], # [BUS STOP] U+1F68F -> U+E150
+  ["f09f9aa2", "ee8882"], # [SHIP] U+1F6A2 -> U+E202
+  ["e29c88", "ee809d"], # [AIRPLANE] U+2708 -> U+E01D
+  ["e29bb5", "ee809c"], # [SAILBOAT] U+26F5 -> U+E01C
+  ["f09f9a89", "ee80b9"], # [STATION] U+1F689 -> U+E039
+  ["f09f9a80", "ee848d"], # [ROCKET] U+1F680 -> U+E10D
+  ["f09f9aa4", "ee84b5"], # [SPEEDBOAT] U+1F6A4 -> U+E135
+  ["f09f9a95", "ee859a"], # [TAXI] U+1F695 -> U+E15A
+  ["f09f9a9a", "ee90af"], # [DELIVERY TRUCK] U+1F69A -> U+E42F
+  ["f09f9a92", "ee90b0"], # [FIRE ENGINE] U+1F692 -> U+E430
+  ["f09f9a91", "ee90b1"], # [AMBULANCE] U+1F691 -> U+E431
+  ["f09f9a93", "ee90b2"], # [POLICE CAR] U+1F693 -> U+E432
+  ["e29bbd", "ee80ba"], # [FUEL PUMP] U+26FD -> U+E03A
+  ["f09f85bf", "ee858f"], # [NEGATIVE SQUARED LATIN CAPITAL LETTER P] U+1F17F -> U+E14F
+  ["f09f9aa5", "ee858e"], # [HORIZONTAL TRAFFIC LIGHT] U+1F6A5 -> U+E14E
+  ["f09f9aa7", "ee84b7"], # [CONSTRUCTION SIGN] U+1F6A7 -> U+E137
+  ["f09f9aa8", "ee90b2"], # [POLICE CARS REVOLVING LIGHT] U+1F6A8 -> U+E432
+  ["e299a8", "ee84a3"], # [HOT SPRINGS] U+2668 -> U+E123
+  ["e29bba", "ee84a2"], # [TENT] U+26FA -> U+E122
+  ["f09f8ea0", :undef], # [CAROUSEL HORSE] U+1F3A0 -> U+3013 (GETA)
+  ["f09f8ea1", "ee84a4"], # [FERRIS WHEEL] U+1F3A1 -> U+E124
+  ["f09f8ea2", "ee90b3"], # [ROLLER COASTER] U+1F3A2 -> U+E433
+  ["f09f8ea3", "ee8099"], # [FISHING POLE AND FISH] U+1F3A3 -> U+E019
+  ["f09f8ea4", "ee80bc"], # [MICROPHONE] U+1F3A4 -> U+E03C
+  ["f09f8ea5", "ee80bd"], # [MOVIE CAMERA] U+1F3A5 -> U+E03D
+  ["f09f8ea6", "ee9487"], # [CINEMA] U+1F3A6 -> U+E507
+  ["f09f8ea7", "ee8c8a"], # [HEADPHONE] U+1F3A7 -> U+E30A
+  ["f09f8ea8", "ee9482"], # [ARTIST PALETTE] U+1F3A8 -> U+E502
+  ["f09f8ea9", "ee9483"], # [TOP HAT] U+1F3A9 -> U+E503
+  ["f09f8eaa", :undef], # [CIRCUS TENT] U+1F3AA -> "[イベント]"
+  ["f09f8eab", "ee84a5"], # [TICKET] U+1F3AB -> U+E125
+  ["f09f8eac", "ee8ca4"], # [CLAPPER BOARD] U+1F3AC -> U+E324
+  ["f09f8ead", "ee9483"], # [PERFORMING ARTS] U+1F3AD -> U+E503
+  ["f09f8eae", :undef], # [VIDEO GAME] U+1F3AE -> "[ゲーム]"
+  ["f09f8084", "ee84ad"], # [MAHJONG TILE RED DRAGON] U+1F004 -> U+E12D
+  ["f09f8eaf", "ee84b0"], # [DIRECT HIT] U+1F3AF -> U+E130
+  ["f09f8eb0", "ee84b3"], # [SLOT MACHINE] U+1F3B0 -> U+E133
+  ["f09f8eb1", "ee90ac"], # [BILLIARDS] U+1F3B1 -> U+E42C
+  ["f09f8eb2", :undef], # [GAME DIE] U+1F3B2 -> "[サイコロ]"
+  ["f09f8eb3", :undef], # [BOWLING] U+1F3B3 -> "[ボーリング]"
+  ["f09f8eb4", :undef], # [FLOWER PLAYING CARDS] U+1F3B4 -> "[花札]"
+  ["f09f838f", :undef], # [PLAYING CARD BLACK JOKER] U+1F0CF -> "[ジョーカー]"
+  ["f09f8eb5", "ee80be"], # [MUSICAL NOTE] U+1F3B5 -> U+E03E
+  ["f09f8eb6", "ee8ca6"], # [MULTIPLE MUSICAL NOTES] U+1F3B6 -> U+E326
+  ["f09f8eb7", "ee8180"], # [SAXOPHONE] U+1F3B7 -> U+E040
+  ["f09f8eb8", "ee8181"], # [GUITAR] U+1F3B8 -> U+E041
+  ["f09f8eb9", :undef], # [MUSICAL KEYBOARD] U+1F3B9 -> "[ピアノ]"
+  ["f09f8eba", "ee8182"], # [TRUMPET] U+1F3BA -> U+E042
+  ["f09f8ebb", :undef], # [VIOLIN] U+1F3BB -> "[バイオリン]"
+  ["f09f8ebc", "ee8ca6"], # [MUSICAL SCORE] U+1F3BC -> U+E326
+  ["e380bd", "ee84ac"], # [PART ALTERNATION MARK] U+303D -> U+E12C
+  ["f09f93b7", "ee8088"], # [CAMERA] U+1F4F7 -> U+E008
+  ["f09f93b9", "ee80bd"], # [VIDEO CAMERA] U+1F4F9 -> U+E03D
+  ["f09f93ba", "ee84aa"], # [TELEVISION] U+1F4FA -> U+E12A
+  ["f09f93bb", "ee84a8"], # [RADIO] U+1F4FB -> U+E128
+  ["f09f93bc", "ee84a9"], # [VIDEOCASSETTE] U+1F4FC -> U+E129
+  ["f09f928b", "ee8083"], # [KISS MARK] U+1F48B -> U+E003
+  ["f09f928c", "ee8483ee8ca8"], # [LOVE LETTER] U+1F48C -> U+E103 U+E328
+  ["f09f928d", "ee80b4"], # [RING] U+1F48D -> U+E034
+  ["f09f928e", "ee80b5"], # [GEM STONE] U+1F48E -> U+E035
+  ["f09f928f", "ee8491"], # [KISS] U+1F48F -> U+E111
+  ["f09f9290", "ee8c86"], # [BOUQUET] U+1F490 -> U+E306
+  ["f09f9291", "ee90a5"], # [COUPLE WITH HEART] U+1F491 -> U+E425
+  ["f09f9292", "ee90bd"], # [WEDDING] U+1F492 -> U+E43D
+  ["f09f949e", "ee8887"], # [NO ONE UNDER EIGHTEEN SYMBOL] U+1F51E -> U+E207
+  ["c2a9", "ee898e"], # [COPYRIGHT SIGN] U+A9 -> U+E24E
+  ["c2ae", "ee898f"], # [REGISTERED SIGN] U+AE -> U+E24F
+  ["e284a2", "ee94b7"], # [TRADE MARK SIGN] U+2122 -> U+E537
+  ["e284b9", :undef], # [INFORMATION SOURCE] U+2139 -> "[ｉ]"
+  ["f09f949f", :undef], # [KEYCAP TEN] U+1F51F -> "[10]"
+  ["f09f93b6", "ee888b"], # [ANTENNA WITH BARS] U+1F4F6 -> U+E20B
+  ["f09f93b3", "ee8990"], # [VIBRATION MODE] U+1F4F3 -> U+E250
+  ["f09f93b4", "ee8991"], # [MOBILE PHONE OFF] U+1F4F4 -> U+E251
+  ["f09f8d94", "ee84a0"], # [HAMBURGER] U+1F354 -> U+E120
+  ["f09f8d99", "ee8d82"], # [RICE BALL] U+1F359 -> U+E342
+  ["f09f8db0", "ee8186"], # [SHORTCAKE] U+1F370 -> U+E046
+  ["f09f8d9c", "ee8d80"], # [STEAMING BOWL] U+1F35C -> U+E340
+  ["f09f8d9e", "ee8cb9"], # [BREAD] U+1F35E -> U+E339
+  ["f09f8db3", "ee8587"], # [COOKING] U+1F373 -> U+E147
+  ["f09f8da6", "ee8cba"], # [SOFT ICE CREAM] U+1F366 -> U+E33A
+  ["f09f8d9f", "ee8cbb"], # [FRENCH FRIES] U+1F35F -> U+E33B
+  ["f09f8da1", "ee8cbc"], # [DANGO] U+1F361 -> U+E33C
+  ["f09f8d98", "ee8cbd"], # [RICE CRACKER] U+1F358 -> U+E33D
+  ["f09f8d9a", "ee8cbe"], # [COOKED RICE] U+1F35A -> U+E33E
+  ["f09f8d9d", "ee8cbf"], # [SPAGHETTI] U+1F35D -> U+E33F
+  ["f09f8d9b", "ee8d81"], # [CURRY AND RICE] U+1F35B -> U+E341
+  ["f09f8da2", "ee8d83"], # [ODEN] U+1F362 -> U+E343
+  ["f09f8da3", "ee8d84"], # [SUSHI] U+1F363 -> U+E344
+  ["f09f8db1", "ee8d8c"], # [BENTO BOX] U+1F371 -> U+E34C
+  ["f09f8db2", "ee8d8d"], # [POT OF FOOD] U+1F372 -> U+E34D
+  ["f09f8da7", "ee90bf"], # [SHAVED ICE] U+1F367 -> U+E43F
+  ["f09f8d96", :undef], # [MEAT ON BONE] U+1F356 -> "[肉]"
+  ["f09f8da5", :undef], # [FISH CAKE WITH SWIRL DESIGN] U+1F365 -> "[なると]"
+  ["f09f8da0", :undef], # [ROASTED SWEET POTATO] U+1F360 -> "[やきいも]"
+  ["f09f8d95", :undef], # [SLICE OF PIZZA] U+1F355 -> "[ピザ]"
+  ["f09f8d97", :undef], # [POULTRY LEG] U+1F357 -> "[チキン]"
+  ["f09f8da8", :undef], # [ICE CREAM] U+1F368 -> "[アイスクリーム]"
+  ["f09f8da9", :undef], # [DOUGHNUT] U+1F369 -> "[ドーナツ]"
+  ["f09f8daa", :undef], # [COOKIE] U+1F36A -> "[クッキー]"
+  ["f09f8dab", :undef], # [CHOCOLATE BAR] U+1F36B -> "[チョコ]"
+  ["f09f8dac", :undef], # [CANDY] U+1F36C -> "[キャンディ]"
+  ["f09f8dad", :undef], # [LOLLIPOP] U+1F36D -> "[キャンディ]"
+  ["f09f8dae", :undef], # [CUSTARD] U+1F36E -> "[プリン]"
+  ["f09f8daf", :undef], # [HONEY POT] U+1F36F -> "[ハチミツ]"
+  ["f09f8da4", :undef], # [FRIED SHRIMP] U+1F364 -> "[エビフライ]"
+  ["f09f8db4", "ee8183"], # [FORK AND KNIFE] U+1F374 -> U+E043
+  ["e29895", "ee8185"], # [HOT BEVERAGE] U+2615 -> U+E045
+  ["f09f8db8", "ee8184"], # [COCKTAIL GLASS] U+1F378 -> U+E044
+  ["f09f8dba", "ee8187"], # [BEER MUG] U+1F37A -> U+E047
+  ["f09f8db5", "ee8cb8"], # [TEACUP WITHOUT HANDLE] U+1F375 -> U+E338
+  ["f09f8db6", "ee8c8b"], # [SAKE BOTTLE AND CUP] U+1F376 -> U+E30B
+  ["f09f8db7", "ee8184"], # [WINE GLASS] U+1F377 -> U+E044
+  ["f09f8dbb", "ee8c8c"], # [CLINKING BEER MUGS] U+1F37B -> U+E30C
+  ["f09f8db9", "ee8184"], # [TROPICAL DRINK] U+1F379 -> U+E044
+  ["e28697", "ee88b6"], # [NORTH EAST ARROW] U+2197 -> U+E236
+  ["e28698", "ee88b8"], # [SOUTH EAST ARROW] U+2198 -> U+E238
+  ["e28696", "ee88b7"], # [NORTH WEST ARROW] U+2196 -> U+E237
+  ["e28699", "ee88b9"], # [SOUTH WEST ARROW] U+2199 -> U+E239
+  ["e2a4b4", "ee88b6"], # [ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS] U+2934 -> U+E236
+  ["e2a4b5", "ee88b8"], # [ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS] U+2935 -> U+E238
+  ["e28694", :undef], # [LEFT RIGHT ARROW] U+2194 -> "⇔"
+  ["e28695", :undef], # [UP DOWN ARROW] U+2195 -> "↑↓"
+  ["e2ac86", "ee88b2"], # [UPWARDS BLACK ARROW] U+2B06 -> U+E232
+  ["e2ac87", "ee88b3"], # [DOWNWARDS BLACK ARROW] U+2B07 -> U+E233
+  ["e29ea1", "ee88b4"], # [BLACK RIGHTWARDS ARROW] U+27A1 -> U+E234
+  ["e2ac85", "ee88b5"], # [LEFTWARDS BLACK ARROW] U+2B05 -> U+E235
+  ["e296b6", "ee88ba"], # [BLACK RIGHT-POINTING TRIANGLE] U+25B6 -> U+E23A
+  ["e29780", "ee88bb"], # [BLACK LEFT-POINTING TRIANGLE] U+25C0 -> U+E23B
+  ["e28fa9", "ee88bc"], # [BLACK RIGHT-POINTING DOUBLE TRIANGLE] U+23E9 -> U+E23C
+  ["e28faa", "ee88bd"], # [BLACK LEFT-POINTING DOUBLE TRIANGLE] U+23EA -> U+E23D
+  ["e28fab", :undef], # [BLACK UP-POINTING DOUBLE TRIANGLE] U+23EB -> "▲"
+  ["e28fac", :undef], # [BLACK DOWN-POINTING DOUBLE TRIANGLE] U+23EC -> "▼"
+  ["f09f94ba", :undef], # [UP-POINTING RED TRIANGLE] U+1F53A -> "▲"
+  ["f09f94bb", :undef], # [DOWN-POINTING RED TRIANGLE] U+1F53B -> "▼"
+  ["f09f94bc", :undef], # [UP-POINTING SMALL RED TRIANGLE] U+1F53C -> "▲"
+  ["f09f94bd", :undef], # [DOWN-POINTING SMALL RED TRIANGLE] U+1F53D -> "▼"
+  ["e2ad95", "ee8cb2"], # [HEAVY LARGE CIRCLE] U+2B55 -> U+E332
+  ["e29d8c", "ee8cb3"], # [CROSS MARK] U+274C -> U+E333
+  ["e29d8e", "ee8cb3"], # [NEGATIVE SQUARED CROSS MARK] U+274E -> U+E333
+  ["e29da2", "ee80a1"], # [HEAVY EXCLAMATION MARK ORNAMENT] U+2762 -> U+E021
+  ["e28189", :undef], # [EXCLAMATION QUESTION MARK] U+2049 -> "！？"
+  ["e280bc", :undef], # [DOUBLE EXCLAMATION MARK] U+203C -> "！！"
+  ["e29d93", "ee80a0"], # [BLACK QUESTION MARK ORNAMENT] U+2753 -> U+E020
+  ["e29d94", "ee8cb6"], # [WHITE QUESTION MARK ORNAMENT] U+2754 -> U+E336
+  ["e29d95", "ee8cb7"], # [WHITE EXCLAMATION MARK ORNAMENT] U+2755 -> U+E337
+  ["e380b0", :undef], # [WAVY DASH] U+3030 -> U+3013 (GETA)
+  ["e29eb0", :undef], # [CURLY LOOP] U+27B0 -> "～"
+  ["e29ebf", "ee8891"], # [DOUBLE CURLY LOOP] U+27BF -> U+E211
+  ["e29da4", "ee80a2"], # [HEAVY BLACK HEART] U+2764 -> U+E022
+  ["f09f9293", "ee8ca7"], # [BEATING HEART] U+1F493 -> U+E327
+  ["f09f9294", "ee80a3"], # [BROKEN HEART] U+1F494 -> U+E023
+  ["f09f9295", "ee8ca7"], # [TWO HEARTS] U+1F495 -> U+E327
+  ["f09f9296", "ee8ca7"], # [SPARKLING HEART] U+1F496 -> U+E327
+  ["f09f9297", "ee8ca8"], # [GROWING HEART] U+1F497 -> U+E328
+  ["f09f9298", "ee8ca9"], # [HEART WITH ARROW] U+1F498 -> U+E329
+  ["f09f9299", "ee8caa"], # [BLUE HEART] U+1F499 -> U+E32A
+  ["f09f929a", "ee8cab"], # [GREEN HEART] U+1F49A -> U+E32B
+  ["f09f929b", "ee8cac"], # [YELLOW HEART] U+1F49B -> U+E32C
+  ["f09f929c", "ee8cad"], # [PURPLE HEART] U+1F49C -> U+E32D
+  ["f09f929d", "ee90b7"], # [HEART WITH RIBBON] U+1F49D -> U+E437
+  ["f09f929e", "ee8ca7"], # [REVOLVING HEARTS] U+1F49E -> U+E327
+  ["f09f929f", "ee8884"], # [HEART DECORATION] U+1F49F -> U+E204
+  ["e299a5", "ee888c"], # [BLACK HEART SUIT] U+2665 -> U+E20C
+  ["e299a0", "ee888e"], # [BLACK SPADE SUIT] U+2660 -> U+E20E
+  ["e299a6", "ee888d"], # [BLACK DIAMOND SUIT] U+2666 -> U+E20D
+  ["e299a3", "ee888f"], # [BLACK CLUB SUIT] U+2663 -> U+E20F
+  ["f09f9aac", "ee8c8e"], # [SMOKING SYMBOL] U+1F6AC -> U+E30E
+  ["f09f9aad", "ee8888"], # [NO SMOKING SYMBOL] U+1F6AD -> U+E208
+  ["e299bf", "ee888a"], # [WHEELCHAIR SYMBOL] U+267F -> U+E20A
+  ["f09f9aa9", :undef], # [TRIANGULAR FLAG ON POST] U+1F6A9 -> "[旗]"
+  ["e29aa0", "ee8992"], # [WARNING SIGN] U+26A0 -> U+E252
+  ["e29b94", "ee84b7"], # [NO ENTRY] U+26D4 -> U+E137
+  ["e299bb", :undef], # [BLACK UNIVERSAL RECYCLING SYMBOL] U+267B -> "↑↓"
+  ["f09f9ab2", "ee84b6"], # [BICYCLE] U+1F6B2 -> U+E136
+  ["f09f9ab6", "ee8881"], # [PEDESTRIAN] U+1F6B6 -> U+E201
+  ["f09f9ab9", "ee84b8"], # [MENS SYMBOL] U+1F6B9 -> U+E138
+  ["f09f9aba", "ee84b9"], # [WOMENS SYMBOL] U+1F6BA -> U+E139
+  ["f09f9b80", "ee84bf"], # [BATH] U+1F6C0 -> U+E13F
+  ["f09f9abb", "ee8591"], # [RESTROOM] U+1F6BB -> U+E151
+  ["f09f9abd", "ee8580"], # [TOILET] U+1F6BD -> U+E140
+  ["f09f9abe", "ee8c89"], # [WATER CLOSET] U+1F6BE -> U+E309
+  ["f09f9abc", "ee84ba"], # [BABY SYMBOL] U+1F6BC -> U+E13A
+  ["f09f9aaa", :undef], # [DOOR] U+1F6AA -> "[ドア]"
+  ["f09f9aab", :undef], # [NO ENTRY SIGN] U+1F6AB -> "[禁止]"
+  ["e29c94", :undef], # [HEAVY CHECK MARK] U+2714 -> "[チェックマーク]"
+  ["f09f8691", :undef], # [SQUARED CL] U+1F191 -> "[CL]"
+  ["f09f8692", "ee8894"], # [SQUARED COOL] U+1F192 -> U+E214
+  ["f09f8693", :undef], # [SQUARED FREE] U+1F193 -> "[FREE]"
+  ["f09f8694", "ee88a9"], # [SQUARED ID] U+1F194 -> U+E229
+  ["f09f8695", "ee8892"], # [SQUARED NEW] U+1F195 -> U+E212
+  ["f09f8696", :undef], # [SQUARED NG] U+1F196 -> "[NG]"
+  ["f09f8697", "ee898d"], # [SQUARED OK] U+1F197 -> U+E24D
+  ["f09f8698", :undef], # [SQUARED SOS] U+1F198 -> "[SOS]"
+  ["f09f8699", "ee8893"], # [SQUARED UP WITH EXCLAMATION MARK] U+1F199 -> U+E213
+  ["f09f869a", "ee84ae"], # [SQUARED VS] U+1F19A -> U+E12E
+  ["f09f8881", "ee8883"], # [SQUARED KATAKANA KOKO] U+1F201 -> U+E203
+  ["f09f8882", "ee88a8"], # [SQUARED KATAKANA SA] U+1F202 -> U+E228
+  ["f09f88b2", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-7981] U+1F232 -> "[禁]"
+  ["f09f88b3", "ee88ab"], # [SQUARED CJK UNIFIED IDEOGRAPH-7A7A] U+1F233 -> U+E22B
+  ["f09f88b4", :undef], # [SQUARED CJK UNIFIED IDEOGRAPH-5408] U+1F234 -> "[合]"
+  ["f09f88b5", "ee88aa"], # [SQUARED CJK UNIFIED IDEOGRAPH-6E80] U+1F235 -> U+E22A
+  ["f09f88b6", "ee8895"], # [SQUARED CJK UNIFIED IDEOGRAPH-6709] U+1F236 -> U+E215
+  ["f09f889a", "ee8896"], # [SQUARED CJK UNIFIED IDEOGRAPH-7121] U+1F21A -> U+E216
+  ["f09f88b7", "ee8897"], # [SQUARED CJK UNIFIED IDEOGRAPH-6708] U+1F237 -> U+E217
+  ["f09f88b8", "ee8898"], # [SQUARED CJK UNIFIED IDEOGRAPH-7533] U+1F238 -> U+E218
+  ["f09f88b9", "ee88a7"], # [SQUARED CJK UNIFIED IDEOGRAPH-5272] U+1F239 -> U+E227
+  ["f09f88af", "ee88ac"], # [SQUARED CJK UNIFIED IDEOGRAPH-6307] U+1F22F -> U+E22C
+  ["f09f88ba", "ee88ad"], # [SQUARED CJK UNIFIED IDEOGRAPH-55B6] U+1F23A -> U+E22D
+  ["e38a99", "ee8c95"], # [CIRCLED IDEOGRAPH SECRET] U+3299 -> U+E315
+  ["e38a97", "ee8c8d"], # [CIRCLED IDEOGRAPH CONGRATULATION] U+3297 -> U+E30D
+  ["f09f8990", "ee88a6"], # [CIRCLED IDEOGRAPH ADVANTAGE] U+1F250 -> U+E226
+  ["f09f8991", :undef], # [CIRCLED IDEOGRAPH ACCEPT] U+1F251 -> "[可]"
+  ["e29e95", :undef], # [HEAVY PLUS SIGN] U+2795 -> "[＋]"
+  ["e29e96", :undef], # [HEAVY MINUS SIGN] U+2796 -> "[－]"
+  ["e29c96", "ee8cb3"], # [HEAVY MULTIPLICATION X] U+2716 -> U+E333
+  ["e29e97", :undef], # [HEAVY DIVISION SIGN] U+2797 -> "[÷]"
+  ["f09f92a0", :undef], # [DIAMOND SHAPE WITH A DOT INSIDE] U+1F4A0 -> U+3013 (GETA)
+  ["f09f92a1", "ee848f"], # [ELECTRIC LIGHT BULB] U+1F4A1 -> U+E10F
+  ["f09f92a2", "ee8cb4"], # [ANGER SYMBOL] U+1F4A2 -> U+E334
+  ["f09f92a3", "ee8c91"], # [BOMB] U+1F4A3 -> U+E311
+  ["f09f92a4", "ee84bc"], # [SLEEPING SYMBOL] U+1F4A4 -> U+E13C
+  ["f09f92a5", :undef], # [COLLISION SYMBOL] U+1F4A5 -> "[ドンッ]"
+  ["f09f92a6", "ee8cb1"], # [SPLASHING SWEAT SYMBOL] U+1F4A6 -> U+E331
+  ["f09f92a7", "ee8cb1"], # [DROP OF WATER] U+1F4A7 -> U+E331
+  ["f09f92a8", "ee8cb0"], # [DASH SYMBOL] U+1F4A8 -> U+E330
+  ["f09f92a9", "ee819a"], # [PILE OF POO] U+1F4A9 -> U+E05A
+  ["f09f92aa", "ee858c"], # [FLEXED BICEPS] U+1F4AA -> U+E14C
+  ["f09f92ab", "ee9087"], # [DIZZY SYMBOL] U+1F4AB -> U+E407
+  ["f09f92ac", :undef], # [SPEECH BALLOON] U+1F4AC -> "[フキダシ]"
+  ["e29ca8", "ee8cae"], # [SPARKLES] U+2728 -> U+E32E
+  ["e29cb4", "ee8885"], # [EIGHT POINTED BLACK STAR] U+2734 -> U+E205
+  ["e29cb3", "ee8886"], # [EIGHT SPOKED ASTERISK] U+2733 -> U+E206
+  ["e29aaa", "ee8899"], # [MEDIUM WHITE CIRCLE] U+26AA -> U+E219
+  ["e29aab", "ee8899"], # [MEDIUM BLACK CIRCLE] U+26AB -> U+E219
+  ["f09f94b4", "ee8899"], # [LARGE RED CIRCLE] U+1F534 -> U+E219
+  ["f09f94b5", "ee889a"], # [LARGE BLUE CIRCLE] U+1F535 -> U+E21A
+  ["f09f94b2", "ee889a"], # [BLACK SQUARE BUTTON] U+1F532 -> U+E21A
+  ["f09f94b3", "ee889b"], # [WHITE SQUARE BUTTON] U+1F533 -> U+E21B
+  ["e2ad90", "ee8caf"], # [WHITE MEDIUM STAR] U+2B50 -> U+E32F
+  ["e2ac9c", "ee889b"], # [WHITE LARGE SQUARE] U+2B1C -> U+E21B
+  ["e2ac9b", "ee889a"], # [BLACK LARGE SQUARE] U+2B1B -> U+E21A
+  ["e296ab", "ee889b"], # [WHITE SMALL SQUARE] U+25AB -> U+E21B
+  ["e296aa", "ee889a"], # [BLACK SMALL SQUARE] U+25AA -> U+E21A
+  ["e297bd", "ee889b"], # [WHITE MEDIUM SMALL SQUARE] U+25FD -> U+E21B
+  ["e297be", "ee889a"], # [BLACK MEDIUM SMALL SQUARE] U+25FE -> U+E21A
+  ["e297bb", "ee889b"], # [WHITE MEDIUM SQUARE] U+25FB -> U+E21B
+  ["e297bc", "ee889a"], # [BLACK MEDIUM SQUARE] U+25FC -> U+E21A
+  ["f09f94b6", "ee889b"], # [LARGE ORANGE DIAMOND] U+1F536 -> U+E21B
+  ["f09f94b7", "ee889b"], # [LARGE BLUE DIAMOND] U+1F537 -> U+E21B
+  ["f09f94b8", "ee889b"], # [SMALL ORANGE DIAMOND] U+1F538 -> U+E21B
+  ["f09f94b9", "ee889b"], # [SMALL BLUE DIAMOND] U+1F539 -> U+E21B
+  ["e29d87", "ee8cae"], # [SPARKLE] U+2747 -> U+E32E
+  ["f09f92ae", :undef], # [WHITE FLOWER] U+1F4AE -> "[花丸]"
+  ["f09f92af", :undef], # [HUNDRED POINTS SYMBOL] U+1F4AF -> "[100点]"
+  ["e286a9", :undef], # [LEFTWARDS ARROW WITH HOOK] U+21A9 -> "←┘"
+  ["e286aa", :undef], # [RIGHTWARDS ARROW WITH HOOK] U+21AA -> "└→"
+  ["f09f9483", :undef], # [CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS] U+1F503 -> "↑↓"
+  ["f09f948a", "ee8581"], # [SPEAKER WITH THREE SOUND WAVES] U+1F50A -> U+E141
+  ["f09f948b", :undef], # [BATTERY] U+1F50B -> "[電池]"
+  ["f09f948c", :undef], # [ELECTRIC PLUG] U+1F50C -> "[コンセント]"
+  ["f09f948d", "ee8494"], # [LEFT-POINTING MAGNIFYING GLASS] U+1F50D -> U+E114
+  ["f09f948e", "ee8494"], # [RIGHT-POINTING MAGNIFYING GLASS] U+1F50E -> U+E114
+  ["f09f9492", "ee8584"], # [LOCK] U+1F512 -> U+E144
+  ["f09f9493", "ee8585"], # [OPEN LOCK] U+1F513 -> U+E145
+  ["f09f948f", "ee8584"], # [LOCK WITH INK PEN] U+1F50F -> U+E144
+  ["f09f9490", "ee8584"], # [CLOSED LOCK WITH KEY] U+1F510 -> U+E144
+  ["f09f9491", "ee80bf"], # [KEY] U+1F511 -> U+E03F
+  ["f09f9494", "ee8ca5"], # [BELL] U+1F514 -> U+E325
+  ["e29891", :undef], # [BALLOT BOX WITH CHECK] U+2611 -> "[チェックマーク]"
+  ["f09f9498", :undef], # [RADIO BUTTON] U+1F518 -> "[ラジオボタン]"
+  ["f09f9496", :undef], # [BOOKMARK] U+1F516 -> "[ブックマーク]"
+  ["f09f9497", :undef], # [LINK SYMBOL] U+1F517 -> "[リンク]"
+  ["f09f9499", "ee88b5"], # [BACK WITH LEFTWARDS ARROW ABOVE] U+1F519 -> U+E235
+  ["f09f949a", :undef], # [END WITH LEFTWARDS ARROW ABOVE] U+1F51A -> "[end]"
+  ["f09f949b", :undef], # [ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE] U+1F51B -> "[ON]"
+  ["f09f949c", :undef], # [SOON WITH RIGHTWARDS ARROW ABOVE] U+1F51C -> "[SOON]"
+  ["f09f949d", "ee898c"], # [TOP WITH UPWARDS ARROW ABOVE] U+1F51D -> U+E24C
+  ["e28083", :undef], # [EM SPACE] U+2003 -> U+3013 (GETA)
+  ["e28082", :undef], # [EN SPACE] U+2002 -> U+3013 (GETA)
+  ["e28085", :undef], # [FOUR-PER-EM SPACE] U+2005 -> U+3013 (GETA)
+  ["e29c85", :undef], # [WHITE HEAVY CHECK MARK] U+2705 -> "[チェックマーク]"
+  ["e29c8a", "ee8090"], # [RAISED FIST] U+270A -> U+E010
+  ["e29c8b", "ee8092"], # [RAISED HAND] U+270B -> U+E012
+  ["e29c8c", "ee8091"], # [VICTORY HAND] U+270C -> U+E011
+  ["f09f918a", "ee808d"], # [FISTED HAND SIGN] U+1F44A -> U+E00D
+  ["f09f918d", "ee808e"], # [THUMBS UP SIGN] U+1F44D -> U+E00E
+  ["e2989d", "ee808f"], # [WHITE UP POINTING INDEX] U+261D -> U+E00F
+  ["f09f9186", "ee88ae"], # [WHITE UP POINTING BACKHAND INDEX] U+1F446 -> U+E22E
+  ["f09f9187", "ee88af"], # [WHITE DOWN POINTING BACKHAND INDEX] U+1F447 -> U+E22F
+  ["f09f9188", "ee88b0"], # [WHITE LEFT POINTING BACKHAND INDEX] U+1F448 -> U+E230
+  ["f09f9189", "ee88b1"], # [WHITE RIGHT POINTING BACKHAND INDEX] U+1F449 -> U+E231
+  ["f09f918b", "ee909e"], # [WAVING HAND SIGN] U+1F44B -> U+E41E
+  ["f09f918f", "ee909f"], # [CLAPPING HANDS SIGN] U+1F44F -> U+E41F
+  ["f09f918c", "ee90a0"], # [OK HAND SIGN] U+1F44C -> U+E420
+  ["f09f918e", "ee90a1"], # [THUMBS DOWN SIGN] U+1F44E -> U+E421
+  ["f09f9190", "ee90a2"], # [OPEN HANDS SIGN] U+1F450 -> U+E422
+]
+
diff --git a/enc/trans/emoji.trans b/enc/trans/emoji.trans
new file mode 100644
index 0000000000..1cf13743a2
--- /dev/null
+++ b/enc/trans/emoji.trans
@@ -0,0 +1,37 @@
+#include "transcode_data.h"
+
+<%
+  require 'emoji-exchange-tbl'
+
+  nomap_table = [
+    ["{00-7f}", :nomap],
+    ["{c2-df}{80-bf}", :nomap0],
+    ["e0{a0-bf}{80-bf}", :nomap0],
+    ["{e1-ec}{80-bf}{80-bf}", :nomap0],
+    ["ed{80-9f}{80-bf}", :nomap0],
+    ["{ee-ef}{80-bf}{80-bf}", :nomap0],
+    ["f0{90-bf}{80-bf}{80-bf}", :nomap0],
+    ["{f1-f3}{80-bf}{80-bf}{80-bf}", :nomap0],
+    ["f4{80-8f}{80-bf}{80-bf}", :nomap0],
+  ]
+
+  companies = %w(DoCoMo KDDI SoftBank Unicode)
+  companies.each do |from_company|
+    companies.each do |to_company|
+      next if from_company == to_company
+      from_encoding = (from_company == "Unicode") ? "UTF-8" : "UTF8-"+from_company
+      to_encoding   = (to_company   == "Unicode") ? "UTF-8" : "UTF8-"+to_company
+
+      strict_mapping = EMOJI_EXCHANGE_TBL[from_encoding][to_encoding]
+      transcode_tblgen(from_encoding, to_encoding, strict_mapping + nomap_table, nil)
+    end
+  end
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_emoji(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/emoji_iso2022_kddi.trans b/enc/trans/emoji_iso2022_kddi.trans
new file mode 100644
index 0000000000..97629db278
--- /dev/null
+++ b/enc/trans/emoji_iso2022_kddi.trans
@@ -0,0 +1,219 @@
+#include "transcode_data.h"
+
+<%
+  # mapping from ISO-2022-JP-KDDI to stateless-ISO-2022-JP-KDDI
+  map = {
+    "1b2842" => :func_so,       # designate US-ASCII to G0.             "ESC ( B"
+    "1b284a" => :func_so,       # designate JIS X 0201 latin to G0.     "ESC ( J"
+    "1b2440" => :func_so,       # designate JIS X 0208 1978 to G0.      "ESC $ @"
+    "1b2442" => :func_so,       # designate JIS X 0208 1983 to G0.      "ESC $ B"
+    "{00-0d,10-1a,1c-7f}" => :func_si,
+  }
+  transcode_generate_node(ActionMap.parse(map), "iso2022jp_kddi_decoder")
+
+  map_jisx0208_rest = {
+    "{21-7e}" => :func_so
+  }
+  transcode_generate_node(ActionMap.parse(map_jisx0208_rest), "iso2022jp_kddi_decoder_jisx0208_rest")
+
+  # mapping from stateless-ISO-2022-JP-KDDI to ISO-2022-JP-KDDI
+  map = {
+    "{00-0d,10-1a,1c-7f}" => :func_so,
+    "90{a1-fe}{a1-fe}" => :func_so,
+    "92{a1-fe}{a1-fe}" => :func_so,
+  }
+  transcode_generate_node(ActionMap.parse(map), "iso2022jp_kddi_encoder")
+
+  # mapping from stateless-ISO-2022-JP-KDDI to UTF8-KDDI
+  transcode_tblgen "stateless-ISO-2022-JP-KDDI", "UTF8-KDDI",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("stateless_iso", 0222, %w(EMOJI_ISO-2022-JP-KDDI/UCS
+                                                   JISX0208VDC:NEC/UCS
+                                                   CP932VDC:NEC_IBM/UCS
+                                                   CP932VDC:IBM/UCS
+                                                   CP932UDA/UCS
+                                                   JISX0208:MS/UCS).join(",")),
+    nil
+
+  # mapping from UTF8-KDDI to stateless-ISO-2022-JP-KDDI
+  transcode_tblgen "UTF8-KDDI", "stateless-ISO-2022-JP-KDDI",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("stateless_iso", 0222, %w(UCS/EMOJI_ISO-2022-JP-KDDI
+                                                   UCS/EMOJI_ISO-2022-JP-KDDI-UNDOC
+                                                   UCS/JISX0208VDC:NEC
+                                                   UCS/CP932VDC:NEC_IBM
+                                                   UCS/CP932VDC:IBM
+                                                   UCS/CP932UDA
+                                                   UCS/JISX0208:MS).join(",")),
+    ValidEncoding('UTF-8')
+%>
+
+<%= transcode_generated_code %>
+
+#define G0_ASCII 0
+/* ignore JIS X 0201 latin */
+#define G0_JISX0208_1978 1
+#define G0_JISX0208_1983 2
+
+#define EMACS_MULE_LEADING_CODE_JISX0208_1978   0220
+#define EMACS_MULE_LEADING_CODE_JISX0208_1983   0222
+
+static int
+iso2022jp_kddi_init(void *statep)
+{
+    unsigned char *sp = statep;
+    *sp = G0_ASCII;
+    return 0;
+}
+
+static VALUE
+fun_si_iso2022jp_kddi_decoder(void *statep, const unsigned char *s, size_t l)
+{
+    unsigned char *sp = statep;
+    if (*sp == G0_ASCII)
+        return (VALUE)NOMAP;
+    else if (0x21 <= s[0] && s[0] <= 0x7e)
+        return (VALUE)iso2022jp_kddi_decoder_jisx0208_rest;
+    else
+        return (VALUE)INVALID;
+}
+
+static ssize_t
+fun_so_iso2022jp_kddi_decoder(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    if (s[0] == 0x1b) {
+        if (s[1] == '(') {
+            switch (s[l-1]) {
+              case 'B': /* US-ASCII */
+              case 'J': /* JIS X 0201 Roman */
+                *sp = G0_ASCII;
+                break;
+            }
+        }
+        else {
+            switch (s[l-1]) {
+              case '@':
+                *sp = G0_JISX0208_1978;
+                break;
+
+              case 'B':
+                *sp = G0_JISX0208_1983;
+                break;
+            }
+        }
+        return 0;
+    }
+    else {
+        if (*sp == G0_JISX0208_1978)
+            o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1978;
+        else
+            o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1983;
+        o[1] = s[0] | 0x80;
+        o[2] = s[1] | 0x80;
+        return 3;
+    }
+}
+
+static const rb_transcoder
+rb_iso2022jp_kddi_decoder = {
+    "ISO-2022-JP-KDDI", "stateless-ISO-2022-JP-KDDI", iso2022jp_kddi_decoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    3, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    1, iso2022jp_kddi_init, iso2022jp_kddi_init, /* state_size, state_init, state_fini */
+    NULL, fun_si_iso2022jp_kddi_decoder, NULL, fun_so_iso2022jp_kddi_decoder
+};
+
+static ssize_t
+fun_so_iso2022jp_kddi_encoder(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    unsigned char *output0 = o;
+    int newstate;
+
+    if (l == 1)
+        newstate = G0_ASCII;
+    else if (s[0] == EMACS_MULE_LEADING_CODE_JISX0208_1978)
+        newstate = G0_JISX0208_1978;
+    else
+        newstate = G0_JISX0208_1983;
+
+    if (*sp != newstate) {
+        *o++ = 0x1b;
+        switch (newstate) {
+          case G0_ASCII:
+            *o++ = '(';
+            *o++ = 'B';
+            break;
+          case G0_JISX0208_1978:
+            *o++ = '$';
+            *o++ = '@';
+            break;
+          default:
+            *o++ = '$';
+            *o++ = 'B';
+            break;
+        }
+        *sp = newstate;
+    }
+
+    if (l == 1) {
+        *o++ = s[0] & 0x7f;
+    }
+    else {
+        *o++ = s[1] & 0x7f;
+        *o++ = s[2] & 0x7f;
+    }
+
+    return o - output0;
+}
+
+static ssize_t
+iso2022jp_kddi_encoder_reset_sequence_size(void *statep)
+{
+  unsigned char *sp = statep;
+  if (*sp != G0_ASCII) return 3;
+  return 0;
+}
+
+static ssize_t
+finish_iso2022jp_kddi_encoder(void *statep, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    unsigned char *output0 = o;
+
+    if (*sp == G0_ASCII)
+        return 0;
+
+    *o++ = 0x1b;
+    *o++ = '(';
+    *o++ = 'B';
+    *sp = G0_ASCII;
+
+    return o - output0;
+}
+
+static const rb_transcoder
+rb_iso2022jp_kddi_encoder = {
+    "stateless-ISO-2022-JP-KDDI", "ISO-2022-JP-KDDI", iso2022jp_kddi_encoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    5, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    1, iso2022jp_kddi_init, iso2022jp_kddi_init, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_iso2022jp_kddi_encoder,
+    finish_iso2022jp_kddi_encoder,
+    iso2022jp_kddi_encoder_reset_sequence_size, finish_iso2022jp_kddi_encoder
+};
+
+void
+Init_emoji_iso2022_kddi(void)
+{
+    rb_register_transcoder(&rb_iso2022jp_kddi_decoder);
+    rb_register_transcoder(&rb_iso2022jp_kddi_encoder);
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/emoji_sjis_docomo.trans b/enc/trans/emoji_sjis_docomo.trans
new file mode 100644
index 0000000000..36e6e20339
--- /dev/null
+++ b/enc/trans/emoji_sjis_docomo.trans
@@ -0,0 +1,33 @@
+#include "transcode_data.h"
+
+<%
+  transcode_tblgen "SJIS-DOCOMO", "UTF8-DOCOMO",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") +
+    citrus_decode_mapsrc("mskanji", 2, %w(EMOJI_SHIFT_JIS-DOCOMO/UCS
+                                          JISX0208VDC:NEC/UCS
+                                          CP932VDC:NEC_IBM/UCS
+                                          CP932VDC:IBM/UCS
+                                          CP932UDA/UCS
+                                          JISX0208:MS/UCS).join(",")),
+    ValidEncoding('Shift_JIS')
+
+  transcode_tblgen "UTF8-DOCOMO", "SJIS-DOCOMO",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") +
+    citrus_decode_mapsrc("mskanji", 2, %w(UCS/EMOJI_SHIFT_JIS-DOCOMO
+                                          UCS/JISX0208VDC:NEC
+                                          UCS/CP932VDC:NEC_IBM
+                                          UCS/CP932VDC:IBM
+                                          UCS/CP932UDA
+                                          UCS/JISX0208:MS).join(",")),
+    ValidEncoding('UTF-8')
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_emoji_sjis_docomo(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/emoji_sjis_kddi.trans b/enc/trans/emoji_sjis_kddi.trans
new file mode 100644
index 0000000000..654bed134e
--- /dev/null
+++ b/enc/trans/emoji_sjis_kddi.trans
@@ -0,0 +1,34 @@
+#include "transcode_data.h"
+
+<%
+  transcode_tblgen "SJIS-KDDI", "UTF8-KDDI",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") +
+    citrus_decode_mapsrc("mskanji", 2, %w(EMOJI_SHIFT_JIS-KDDI/UCS
+                                          JISX0208VDC:NEC/UCS
+                                          CP932VDC:NEC_IBM/UCS
+                                          CP932VDC:IBM/UCS
+                                          CP932UDA/UCS
+                                          JISX0208:MS/UCS).join(",")),
+    ValidEncoding('Shift_JIS')
+
+  transcode_tblgen "UTF8-KDDI", "SJIS-KDDI",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") +
+    citrus_decode_mapsrc("mskanji", 2, %w(UCS/EMOJI_SHIFT_JIS-KDDI
+                                          UCS/EMOJI_SHIFT_JIS-KDDI-UNDOC
+                                          UCS/JISX0208VDC:NEC
+                                          UCS/CP932VDC:NEC_IBM
+                                          UCS/CP932VDC:IBM
+                                          UCS/CP932UDA
+                                          UCS/JISX0208:MS).join(",")),
+    ValidEncoding('UTF-8')
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_emoji_sjis_kddi(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/emoji_sjis_softbank.trans b/enc/trans/emoji_sjis_softbank.trans
new file mode 100644
index 0000000000..c152d99c76
--- /dev/null
+++ b/enc/trans/emoji_sjis_softbank.trans
@@ -0,0 +1,33 @@
+#include "transcode_data.h"
+
+<%
+  transcode_tblgen "SJIS-SoftBank", "UTF8-SoftBank",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") +
+    citrus_decode_mapsrc("mskanji", 2, %w(EMOJI_SHIFT_JIS-SOFTBANK/UCS
+                                          JISX0208VDC:NEC/UCS
+                                          CP932VDC:NEC_IBM/UCS
+                                          CP932VDC:IBM/UCS
+                                          CP932UDA/UCS
+                                          JISX0208:MS/UCS).join(",")),
+    ValidEncoding('Shift_JIS')
+
+  transcode_tblgen "UTF8-SoftBank", "SJIS-SoftBank",
+    [["{00-7f}", :nomap]] +
+    citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") +
+    citrus_decode_mapsrc("mskanji", 2, %w(UCS/EMOJI_SHIFT_JIS-SOFTBANK
+                                          UCS/JISX0208VDC:NEC
+                                          UCS/CP932VDC:NEC_IBM
+                                          UCS/CP932VDC:IBM
+                                          UCS/CP932UDA
+                                          UCS/JISX0208:MS).join(",")),
+    ValidEncoding('UTF-8')
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_emoji_sjis_softbank(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
new file mode 100644
index 0000000000..a2fbebac33
--- /dev/null
+++ b/enc/trans/escape.trans
@@ -0,0 +1,94 @@
+#include "transcode_data.h"
+
+<%
+  def hexstr(str)
+    str.unpack("H*")[0]
+  end
+
+  transcode_tblgen("", "amp_escape", [
+    ["{00-25,27-FF}", :nomap], 
+    ["26", hexstr("&amp;")]
+  ], nil)
+
+  transcode_tblgen("", "xml_text_escape", [
+    ["{00-25,27-3B,3D,3F-FF}", :nomap], 
+    ["26", hexstr("&amp;")],
+    ["3C", hexstr("&lt;")],
+    ["3E", hexstr("&gt;")]
+  ], nil)
+
+  transcode_tblgen("", "xml_attr_content_escape", [
+    ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap], 
+    ["22", hexstr("&quot;")],
+    ["26", hexstr("&amp;")],
+    ["3C", hexstr("&lt;")],
+    ["3E", hexstr("&gt;")]
+  ], nil)
+
+  map_xml_attr_quote = {}
+  map_xml_attr_quote["{00-FF}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map_xml_attr_quote), "escape_xml_attr_quote")
+%>
+
+<%= transcode_generated_code %>
+
+#define END 0
+#define NORMAL  1
+
+static int
+escape_xml_attr_quote_init(void *statep)
+{
+    unsigned char *sp = statep;
+    *sp = END;
+    return 0;
+}
+
+static ssize_t
+fun_so_escape_xml_attr_quote(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    int n = 0;
+    if (*sp == END) {
+        *sp = NORMAL;
+        o[n++] = '"';
+    }
+    o[n++] = s[0];
+    return n;
+}
+
+static ssize_t
+escape_xml_attr_quote_finish(void *statep, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    int n = 0;
+
+    if (*sp == END) {
+        o[n++] = '"';
+    }
+
+    o[n++] = '"';
+    *sp = END;
+
+    return n;
+}
+
+static const rb_transcoder
+rb_escape_xml_attr_quote = {
+    "", "xml_attr_quote", escape_xml_attr_quote,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    1, /* max_input */
+    7, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    1, escape_xml_attr_quote_init, escape_xml_attr_quote_init,
+    NULL, NULL, NULL, fun_so_escape_xml_attr_quote,
+    escape_xml_attr_quote_finish
+};
+
+void
+Init_escape(void)
+{
+<%= transcode_register_code %>
+    rb_register_transcoder(&rb_escape_xml_attr_quote);
+}
+
diff --git a/enc/trans/euckr-tbl.rb b/enc/trans/euckr-tbl.rb
new file mode 100644
index 0000000000..773cd90122
--- /dev/null
+++ b/enc/trans/euckr-tbl.rb
@@ -0,0 +1,8228 @@
+EUCKR_TO_UCS_TBL = [
+  ["A1A1",0x3000],
+  ["A1A2",0x3001],
+  ["A1A3",0x3002],
+  ["A1A4",0xB7],
+  ["A1A5",0x2025],
+  ["A1A6",0x2026],
+  ["A1A7",0xA8],
+  ["A1A8",0x3003],
+  ["A1A9",0xAD],
+  ["A1AA",0x2015],
+  ["A1AB",0x2225],
+  ["A1AC",0xFF3C],
+  ["A1AD",0x223C],
+  ["A1AE",0x2018],
+  ["A1AF",0x2019],
+  ["A1B0",0x201C],
+  ["A1B1",0x201D],
+  ["A1B2",0x3014],
+  ["A1B3",0x3015],
+  ["A1B4",0x3008],
+  ["A1B5",0x3009],
+  ["A1B6",0x300A],
+  ["A1B7",0x300B],
+  ["A1B8",0x300C],
+  ["A1B9",0x300D],
+  ["A1BA",0x300E],
+  ["A1BB",0x300F],
+  ["A1BC",0x3010],
+  ["A1BD",0x3011],
+  ["A1BE",0xB1],
+  ["A1BF",0xD7],
+  ["A1C0",0xF7],
+  ["A1C1",0x2260],
+  ["A1C2",0x2264],
+  ["A1C3",0x2265],
+  ["A1C4",0x221E],
+  ["A1C5",0x2234],
+  ["A1C6",0xB0],
+  ["A1C7",0x2032],
+  ["A1C8",0x2033],
+  ["A1C9",0x2103],
+  ["A1CA",0x212B],
+  ["A1CB",0xFFE0],
+  ["A1CC",0xFFE1],
+  ["A1CD",0xFFE5],
+  ["A1CE",0x2642],
+  ["A1CF",0x2640],
+  ["A1D0",0x2220],
+  ["A1D1",0x22A5],
+  ["A1D2",0x2312],
+  ["A1D3",0x2202],
+  ["A1D4",0x2207],
+  ["A1D5",0x2261],
+  ["A1D6",0x2252],
+  ["A1D7",0xA7],
+  ["A1D8",0x203B],
+  ["A1D9",0x2606],
+  ["A1DA",0x2605],
+  ["A1DB",0x25CB],
+  ["A1DC",0x25CF],
+  ["A1DD",0x25CE],
+  ["A1DE",0x25C7],
+  ["A1DF",0x25C6],
+  ["A1E0",0x25A1],
+  ["A1E1",0x25A0],
+  ["A1E2",0x25B3],
+  ["A1E3",0x25B2],
+  ["A1E4",0x25BD],
+  ["A1E5",0x25BC],
+  ["A1E6",0x2192],
+  ["A1E7",0x2190],
+  ["A1E8",0x2191],
+  ["A1E9",0x2193],
+  ["A1EA",0x2194],
+  ["A1EB",0x3013],
+  ["A1EC",0x226A],
+  ["A1ED",0x226B],
+  ["A1EE",0x221A],
+  ["A1EF",0x223D],
+  ["A1F0",0x221D],
+  ["A1F1",0x2235],
+  ["A1F2",0x222B],
+  ["A1F3",0x222C],
+  ["A1F4",0x2208],
+  ["A1F5",0x220B],
+  ["A1F6",0x2286],
+  ["A1F7",0x2287],
+  ["A1F8",0x2282],
+  ["A1F9",0x2283],
+  ["A1FA",0x222A],
+  ["A1FB",0x2229],
+  ["A1FC",0x2227],
+  ["A1FD",0x2228],
+  ["A1FE",0xFFE2],
+  ["A2A1",0x21D2],
+  ["A2A2",0x21D4],
+  ["A2A3",0x2200],
+  ["A2A4",0x2203],
+  ["A2A5",0xB4],
+  ["A2A6",0xFF5E],
+  ["A2A7",0x2C7],
+  ["A2A8",0x2D8],
+  ["A2A9",0x2DD],
+  ["A2AA",0x2DA],
+  ["A2AB",0x2D9],
+  ["A2AC",0xB8],
+  ["A2AD",0x2DB],
+  ["A2AE",0xA1],
+  ["A2AF",0xBF],
+  ["A2B0",0x2D0],
+  ["A2B1",0x222E],
+  ["A2B2",0x2211],
+  ["A2B3",0x220F],
+  ["A2B4",0xA4],
+  ["A2B5",0x2109],
+  ["A2B6",0x2030],
+  ["A2B7",0x25C1],
+  ["A2B8",0x25C0],
+  ["A2B9",0x25B7],
+  ["A2BA",0x25B6],
+  ["A2BB",0x2664],
+  ["A2BC",0x2660],
+  ["A2BD",0x2661],
+  ["A2BE",0x2665],
+  ["A2BF",0x2667],
+  ["A2C0",0x2663],
+  ["A2C1",0x2299],
+  ["A2C2",0x25C8],
+  ["A2C3",0x25A3],
+  ["A2C4",0x25D0],
+  ["A2C5",0x25D1],
+  ["A2C6",0x2592],
+  ["A2C7",0x25A4],
+  ["A2C8",0x25A5],
+  ["A2C9",0x25A8],
+  ["A2CA",0x25A7],
+  ["A2CB",0x25A6],
+  ["A2CC",0x25A9],
+  ["A2CD",0x2668],
+  ["A2CE",0x260F],
+  ["A2CF",0x260E],
+  ["A2D0",0x261C],
+  ["A2D1",0x261E],
+  ["A2D2",0xB6],
+  ["A2D3",0x2020],
+  ["A2D4",0x2021],
+  ["A2D5",0x2195],
+  ["A2D6",0x2197],
+  ["A2D7",0x2199],
+  ["A2D8",0x2196],
+  ["A2D9",0x2198],
+  ["A2DA",0x266D],
+  ["A2DB",0x2669],
+  ["A2DC",0x266A],
+  ["A2DD",0x266C],
+  ["A2DE",0x327F],
+  ["A2DF",0x321C],
+  ["A2E0",0x2116],
+  ["A2E1",0x33C7],
+  ["A2E2",0x2122],
+  ["A2E3",0x33C2],
+  ["A2E4",0x33D8],
+  ["A2E5",0x2121],
+  ["A3A1",0xFF01],
+  ["A3A2",0xFF02],
+  ["A3A3",0xFF03],
+  ["A3A4",0xFF04],
+  ["A3A5",0xFF05],
+  ["A3A6",0xFF06],
+  ["A3A7",0xFF07],
+  ["A3A8",0xFF08],
+  ["A3A9",0xFF09],
+  ["A3AA",0xFF0A],
+  ["A3AB",0xFF0B],
+  ["A3AC",0xFF0C],
+  ["A3AD",0xFF0D],
+  ["A3AE",0xFF0E],
+  ["A3AF",0xFF0F],
+  ["A3B0",0xFF10],
+  ["A3B1",0xFF11],
+  ["A3B2",0xFF12],
+  ["A3B3",0xFF13],
+  ["A3B4",0xFF14],
+  ["A3B5",0xFF15],
+  ["A3B6",0xFF16],
+  ["A3B7",0xFF17],
+  ["A3B8",0xFF18],
+  ["A3B9",0xFF19],
+  ["A3BA",0xFF1A],
+  ["A3BB",0xFF1B],
+  ["A3BC",0xFF1C],
+  ["A3BD",0xFF1D],
+  ["A3BE",0xFF1E],
+  ["A3BF",0xFF1F],
+  ["A3C0",0xFF20],
+  ["A3C1",0xFF21],
+  ["A3C2",0xFF22],
+  ["A3C3",0xFF23],
+  ["A3C4",0xFF24],
+  ["A3C5",0xFF25],
+  ["A3C6",0xFF26],
+  ["A3C7",0xFF27],
+  ["A3C8",0xFF28],
+  ["A3C9",0xFF29],
+  ["A3CA",0xFF2A],
+  ["A3CB",0xFF2B],
+  ["A3CC",0xFF2C],
+  ["A3CD",0xFF2D],
+  ["A3CE",0xFF2E],
+  ["A3CF",0xFF2F],
+  ["A3D0",0xFF30],
+  ["A3D1",0xFF31],
+  ["A3D2",0xFF32],
+  ["A3D3",0xFF33],
+  ["A3D4",0xFF34],
+  ["A3D5",0xFF35],
+  ["A3D6",0xFF36],
+  ["A3D7",0xFF37],
+  ["A3D8",0xFF38],
+  ["A3D9",0xFF39],
+  ["A3DA",0xFF3A],
+  ["A3DB",0xFF3B],
+  ["A3DC",0xFFE6],
+  ["A3DD",0xFF3D],
+  ["A3DE",0xFF3E],
+  ["A3DF",0xFF3F],
+  ["A3E0",0xFF40],
+  ["A3E1",0xFF41],
+  ["A3E2",0xFF42],
+  ["A3E3",0xFF43],
+  ["A3E4",0xFF44],
+  ["A3E5",0xFF45],
+  ["A3E6",0xFF46],
+  ["A3E7",0xFF47],
+  ["A3E8",0xFF48],
+  ["A3E9",0xFF49],
+  ["A3EA",0xFF4A],
+  ["A3EB",0xFF4B],
+  ["A3EC",0xFF4C],
+  ["A3ED",0xFF4D],
+  ["A3EE",0xFF4E],
+  ["A3EF",0xFF4F],
+  ["A3F0",0xFF50],
+  ["A3F1",0xFF51],
+  ["A3F2",0xFF52],
+  ["A3F3",0xFF53],
+  ["A3F4",0xFF54],
+  ["A3F5",0xFF55],
+  ["A3F6",0xFF56],
+  ["A3F7",0xFF57],
+  ["A3F8",0xFF58],
+  ["A3F9",0xFF59],
+  ["A3FA",0xFF5A],
+  ["A3FB",0xFF5B],
+  ["A3FC",0xFF5C],
+  ["A3FD",0xFF5D],
+  ["A3FE",0xFFE3],
+  ["A4A1",0x3131],
+  ["A4A2",0x3132],
+  ["A4A3",0x3133],
+  ["A4A4",0x3134],
+  ["A4A5",0x3135],
+  ["A4A6",0x3136],
+  ["A4A7",0x3137],
+  ["A4A8",0x3138],
+  ["A4A9",0x3139],
+  ["A4AA",0x313A],
+  ["A4AB",0x313B],
+  ["A4AC",0x313C],
+  ["A4AD",0x313D],
+  ["A4AE",0x313E],
+  ["A4AF",0x313F],
+  ["A4B0",0x3140],
+  ["A4B1",0x3141],
+  ["A4B2",0x3142],
+  ["A4B3",0x3143],
+  ["A4B4",0x3144],
+  ["A4B5",0x3145],
+  ["A4B6",0x3146],
+  ["A4B7",0x3147],
+  ["A4B8",0x3148],
+  ["A4B9",0x3149],
+  ["A4BA",0x314A],
+  ["A4BB",0x314B],
+  ["A4BC",0x314C],
+  ["A4BD",0x314D],
+  ["A4BE",0x314E],
+  ["A4BF",0x314F],
+  ["A4C0",0x3150],
+  ["A4C1",0x3151],
+  ["A4C2",0x3152],
+  ["A4C3",0x3153],
+  ["A4C4",0x3154],
+  ["A4C5",0x3155],
+  ["A4C6",0x3156],
+  ["A4C7",0x3157],
+  ["A4C8",0x3158],
+  ["A4C9",0x3159],
+  ["A4CA",0x315A],
+  ["A4CB",0x315B],
+  ["A4CC",0x315C],
+  ["A4CD",0x315D],
+  ["A4CE",0x315E],
+  ["A4CF",0x315F],
+  ["A4D0",0x3160],
+  ["A4D1",0x3161],
+  ["A4D2",0x3162],
+  ["A4D3",0x3163],
+  ["A4D4",0x3164],
+  ["A4D5",0x3165],
+  ["A4D6",0x3166],
+  ["A4D7",0x3167],
+  ["A4D8",0x3168],
+  ["A4D9",0x3169],
+  ["A4DA",0x316A],
+  ["A4DB",0x316B],
+  ["A4DC",0x316C],
+  ["A4DD",0x316D],
+  ["A4DE",0x316E],
+  ["A4DF",0x316F],
+  ["A4E0",0x3170],
+  ["A4E1",0x3171],
+  ["A4E2",0x3172],
+  ["A4E3",0x3173],
+  ["A4E4",0x3174],
+  ["A4E5",0x3175],
+  ["A4E6",0x3176],
+  ["A4E7",0x3177],
+  ["A4E8",0x3178],
+  ["A4E9",0x3179],
+  ["A4EA",0x317A],
+  ["A4EB",0x317B],
+  ["A4EC",0x317C],
+  ["A4ED",0x317D],
+  ["A4EE",0x317E],
+  ["A4EF",0x317F],
+  ["A4F0",0x3180],
+  ["A4F1",0x3181],
+  ["A4F2",0x3182],
+  ["A4F3",0x3183],
+  ["A4F4",0x3184],
+  ["A4F5",0x3185],
+  ["A4F6",0x3186],
+  ["A4F7",0x3187],
+  ["A4F8",0x3188],
+  ["A4F9",0x3189],
+  ["A4FA",0x318A],
+  ["A4FB",0x318B],
+  ["A4FC",0x318C],
+  ["A4FD",0x318D],
+  ["A4FE",0x318E],
+  ["A5A1",0x2170],
+  ["A5A2",0x2171],
+  ["A5A3",0x2172],
+  ["A5A4",0x2173],
+  ["A5A5",0x2174],
+  ["A5A6",0x2175],
+  ["A5A7",0x2176],
+  ["A5A8",0x2177],
+  ["A5A9",0x2178],
+  ["A5AA",0x2179],
+  ["A5B0",0x2160],
+  ["A5B1",0x2161],
+  ["A5B2",0x2162],
+  ["A5B3",0x2163],
+  ["A5B4",0x2164],
+  ["A5B5",0x2165],
+  ["A5B6",0x2166],
+  ["A5B7",0x2167],
+  ["A5B8",0x2168],
+  ["A5B9",0x2169],
+  ["A5C1",0x391],
+  ["A5C2",0x392],
+  ["A5C3",0x393],
+  ["A5C4",0x394],
+  ["A5C5",0x395],
+  ["A5C6",0x396],
+  ["A5C7",0x397],
+  ["A5C8",0x398],
+  ["A5C9",0x399],
+  ["A5CA",0x39A],
+  ["A5CB",0x39B],
+  ["A5CC",0x39C],
+  ["A5CD",0x39D],
+  ["A5CE",0x39E],
+  ["A5CF",0x39F],
+  ["A5D0",0x3A0],
+  ["A5D1",0x3A1],
+  ["A5D2",0x3A3],
+  ["A5D3",0x3A4],
+  ["A5D4",0x3A5],
+  ["A5D5",0x3A6],
+  ["A5D6",0x3A7],
+  ["A5D7",0x3A8],
+  ["A5D8",0x3A9],
+  ["A5E1",0x3B1],
+  ["A5E2",0x3B2],
+  ["A5E3",0x3B3],
+  ["A5E4",0x3B4],
+  ["A5E5",0x3B5],
+  ["A5E6",0x3B6],
+  ["A5E7",0x3B7],
+  ["A5E8",0x3B8],
+  ["A5E9",0x3B9],
+  ["A5EA",0x3BA],
+  ["A5EB",0x3BB],
+  ["A5EC",0x3BC],
+  ["A5ED",0x3BD],
+  ["A5EE",0x3BE],
+  ["A5EF",0x3BF],
+  ["A5F0",0x3C0],
+  ["A5F1",0x3C1],
+  ["A5F2",0x3C3],
+  ["A5F3",0x3C4],
+  ["A5F4",0x3C5],
+  ["A5F5",0x3C6],
+  ["A5F6",0x3C7],
+  ["A5F7",0x3C8],
+  ["A5F8",0x3C9],
+  ["A6A1",0x2500],
+  ["A6A2",0x2502],
+  ["A6A3",0x250C],
+  ["A6A4",0x2510],
+  ["A6A5",0x2518],
+  ["A6A6",0x2514],
+  ["A6A7",0x251C],
+  ["A6A8",0x252C],
+  ["A6A9",0x2524],
+  ["A6AA",0x2534],
+  ["A6AB",0x253C],
+  ["A6AC",0x2501],
+  ["A6AD",0x2503],
+  ["A6AE",0x250F],
+  ["A6AF",0x2513],
+  ["A6B0",0x251B],
+  ["A6B1",0x2517],
+  ["A6B2",0x2523],
+  ["A6B3",0x2533],
+  ["A6B4",0x252B],
+  ["A6B5",0x253B],
+  ["A6B6",0x254B],
+  ["A6B7",0x2520],
+  ["A6B8",0x252F],
+  ["A6B9",0x2528],
+  ["A6BA",0x2537],
+  ["A6BB",0x253F],
+  ["A6BC",0x251D],
+  ["A6BD",0x2530],
+  ["A6BE",0x2525],
+  ["A6BF",0x2538],
+  ["A6C0",0x2542],
+  ["A6C1",0x2512],
+  ["A6C2",0x2511],
+  ["A6C3",0x251A],
+  ["A6C4",0x2519],
+  ["A6C5",0x2516],
+  ["A6C6",0x2515],
+  ["A6C7",0x250E],
+  ["A6C8",0x250D],
+  ["A6C9",0x251E],
+  ["A6CA",0x251F],
+  ["A6CB",0x2521],
+  ["A6CC",0x2522],
+  ["A6CD",0x2526],
+  ["A6CE",0x2527],
+  ["A6CF",0x2529],
+  ["A6D0",0x252A],
+  ["A6D1",0x252D],
+  ["A6D2",0x252E],
+  ["A6D3",0x2531],
+  ["A6D4",0x2532],
+  ["A6D5",0x2535],
+  ["A6D6",0x2536],
+  ["A6D7",0x2539],
+  ["A6D8",0x253A],
+  ["A6D9",0x253D],
+  ["A6DA",0x253E],
+  ["A6DB",0x2540],
+  ["A6DC",0x2541],
+  ["A6DD",0x2543],
+  ["A6DE",0x2544],
+  ["A6DF",0x2545],
+  ["A6E0",0x2546],
+  ["A6E1",0x2547],
+  ["A6E2",0x2548],
+  ["A6E3",0x2549],
+  ["A6E4",0x254A],
+  ["A7A1",0x3395],
+  ["A7A2",0x3396],
+  ["A7A3",0x3397],
+  ["A7A4",0x2113],
+  ["A7A5",0x3398],
+  ["A7A6",0x33C4],
+  ["A7A7",0x33A3],
+  ["A7A8",0x33A4],
+  ["A7A9",0x33A5],
+  ["A7AA",0x33A6],
+  ["A7AB",0x3399],
+  ["A7AC",0x339A],
+  ["A7AD",0x339B],
+  ["A7AE",0x339C],
+  ["A7AF",0x339D],
+  ["A7B0",0x339E],
+  ["A7B1",0x339F],
+  ["A7B2",0x33A0],
+  ["A7B3",0x33A1],
+  ["A7B4",0x33A2],
+  ["A7B5",0x33CA],
+  ["A7B6",0x338D],
+  ["A7B7",0x338E],
+  ["A7B8",0x338F],
+  ["A7B9",0x33CF],
+  ["A7BA",0x3388],
+  ["A7BB",0x3389],
+  ["A7BC",0x33C8],
+  ["A7BD",0x33A7],
+  ["A7BE",0x33A8],
+  ["A7BF",0x33B0],
+  ["A7C0",0x33B1],
+  ["A7C1",0x33B2],
+  ["A7C2",0x33B3],
+  ["A7C3",0x33B4],
+  ["A7C4",0x33B5],
+  ["A7C5",0x33B6],
+  ["A7C6",0x33B7],
+  ["A7C7",0x33B8],
+  ["A7C8",0x33B9],
+  ["A7C9",0x3380],
+  ["A7CA",0x3381],
+  ["A7CB",0x3382],
+  ["A7CC",0x3383],
+  ["A7CD",0x3384],
+  ["A7CE",0x33BA],
+  ["A7CF",0x33BB],
+  ["A7D0",0x33BC],
+  ["A7D1",0x33BD],
+  ["A7D2",0x33BE],
+  ["A7D3",0x33BF],
+  ["A7D4",0x3390],
+  ["A7D5",0x3391],
+  ["A7D6",0x3392],
+  ["A7D7",0x3393],
+  ["A7D8",0x3394],
+  ["A7D9",0x2126],
+  ["A7DA",0x33C0],
+  ["A7DB",0x33C1],
+  ["A7DC",0x338A],
+  ["A7DD",0x338B],
+  ["A7DE",0x338C],
+  ["A7DF",0x33D6],
+  ["A7E0",0x33C5],
+  ["A7E1",0x33AD],
+  ["A7E2",0x33AE],
+  ["A7E3",0x33AF],
+  ["A7E4",0x33DB],
+  ["A7E5",0x33A9],
+  ["A7E6",0x33AA],
+  ["A7E7",0x33AB],
+  ["A7E8",0x33AC],
+  ["A7E9",0x33DD],
+  ["A7EA",0x33D0],
+  ["A7EB",0x33D3],
+  ["A7EC",0x33C3],
+  ["A7ED",0x33C9],
+  ["A7EE",0x33DC],
+  ["A7EF",0x33C6],
+  ["A8A1",0xC6],
+  ["A8A2",0xD0],
+  ["A8A3",0xAA],
+  ["A8A4",0x126],
+  ["A8A6",0x132],
+  ["A8A8",0x13F],
+  ["A8A9",0x141],
+  ["A8AA",0xD8],
+  ["A8AB",0x152],
+  ["A8AC",0xBA],
+  ["A8AD",0xDE],
+  ["A8AE",0x166],
+  ["A8AF",0x14A],
+  ["A8B1",0x3260],
+  ["A8B2",0x3261],
+  ["A8B3",0x3262],
+  ["A8B4",0x3263],
+  ["A8B5",0x3264],
+  ["A8B6",0x3265],
+  ["A8B7",0x3266],
+  ["A8B8",0x3267],
+  ["A8B9",0x3268],
+  ["A8BA",0x3269],
+  ["A8BB",0x326A],
+  ["A8BC",0x326B],
+  ["A8BD",0x326C],
+  ["A8BE",0x326D],
+  ["A8BF",0x326E],
+  ["A8C0",0x326F],
+  ["A8C1",0x3270],
+  ["A8C2",0x3271],
+  ["A8C3",0x3272],
+  ["A8C4",0x3273],
+  ["A8C5",0x3274],
+  ["A8C6",0x3275],
+  ["A8C7",0x3276],
+  ["A8C8",0x3277],
+  ["A8C9",0x3278],
+  ["A8CA",0x3279],
+  ["A8CB",0x327A],
+  ["A8CC",0x327B],
+  ["A8CD",0x24D0],
+  ["A8CE",0x24D1],
+  ["A8CF",0x24D2],
+  ["A8D0",0x24D3],
+  ["A8D1",0x24D4],
+  ["A8D2",0x24D5],
+  ["A8D3",0x24D6],
+  ["A8D4",0x24D7],
+  ["A8D5",0x24D8],
+  ["A8D6",0x24D9],
+  ["A8D7",0x24DA],
+  ["A8D8",0x24DB],
+  ["A8D9",0x24DC],
+  ["A8DA",0x24DD],
+  ["A8DB",0x24DE],
+  ["A8DC",0x24DF],
+  ["A8DD",0x24E0],
+  ["A8DE",0x24E1],
+  ["A8DF",0x24E2],
+  ["A8E0",0x24E3],
+  ["A8E1",0x24E4],
+  ["A8E2",0x24E5],
+  ["A8E3",0x24E6],
+  ["A8E4",0x24E7],
+  ["A8E5",0x24E8],
+  ["A8E6",0x24E9],
+  ["A8E7",0x2460],
+  ["A8E8",0x2461],
+  ["A8E9",0x2462],
+  ["A8EA",0x2463],
+  ["A8EB",0x2464],
+  ["A8EC",0x2465],
+  ["A8ED",0x2466],
+  ["A8EE",0x2467],
+  ["A8EF",0x2468],
+  ["A8F0",0x2469],
+  ["A8F1",0x246A],
+  ["A8F2",0x246B],
+  ["A8F3",0x246C],
+  ["A8F4",0x246D],
+  ["A8F5",0x246E],
+  ["A8F6",0xBD],
+  ["A8F7",0x2153],
+  ["A8F8",0x2154],
+  ["A8F9",0xBC],
+  ["A8FA",0xBE],
+  ["A8FB",0x215B],
+  ["A8FC",0x215C],
+  ["A8FD",0x215D],
+  ["A8FE",0x215E],
+  ["A9A1",0xE6],
+  ["A9A2",0x111],
+  ["A9A3",0xF0],
+  ["A9A4",0x127],
+  ["A9A5",0x131],
+  ["A9A6",0x133],
+  ["A9A7",0x138],
+  ["A9A8",0x140],
+  ["A9A9",0x142],
+  ["A9AA",0xF8],
+  ["A9AB",0x153],
+  ["A9AC",0xDF],
+  ["A9AD",0xFE],
+  ["A9AE",0x167],
+  ["A9AF",0x14B],
+  ["A9B0",0x149],
+  ["A9B1",0x3200],
+  ["A9B2",0x3201],
+  ["A9B3",0x3202],
+  ["A9B4",0x3203],
+  ["A9B5",0x3204],
+  ["A9B6",0x3205],
+  ["A9B7",0x3206],
+  ["A9B8",0x3207],
+  ["A9B9",0x3208],
+  ["A9BA",0x3209],
+  ["A9BB",0x320A],
+  ["A9BC",0x320B],
+  ["A9BD",0x320C],
+  ["A9BE",0x320D],
+  ["A9BF",0x320E],
+  ["A9C0",0x320F],
+  ["A9C1",0x3210],
+  ["A9C2",0x3211],
+  ["A9C3",0x3212],
+  ["A9C4",0x3213],
+  ["A9C5",0x3214],
+  ["A9C6",0x3215],
+  ["A9C7",0x3216],
+  ["A9C8",0x3217],
+  ["A9C9",0x3218],
+  ["A9CA",0x3219],
+  ["A9CB",0x321A],
+  ["A9CC",0x321B],
+  ["A9CD",0x249C],
+  ["A9CE",0x249D],
+  ["A9CF",0x249E],
+  ["A9D0",0x249F],
+  ["A9D1",0x24A0],
+  ["A9D2",0x24A1],
+  ["A9D3",0x24A2],
+  ["A9D4",0x24A3],
+  ["A9D5",0x24A4],
+  ["A9D6",0x24A5],
+  ["A9D7",0x24A6],
+  ["A9D8",0x24A7],
+  ["A9D9",0x24A8],
+  ["A9DA",0x24A9],
+  ["A9DB",0x24AA],
+  ["A9DC",0x24AB],
+  ["A9DD",0x24AC],
+  ["A9DE",0x24AD],
+  ["A9DF",0x24AE],
+  ["A9E0",0x24AF],
+  ["A9E1",0x24B0],
+  ["A9E2",0x24B1],
+  ["A9E3",0x24B2],
+  ["A9E4",0x24B3],
+  ["A9E5",0x24B4],
+  ["A9E6",0x24B5],
+  ["A9E7",0x2474],
+  ["A9E8",0x2475],
+  ["A9E9",0x2476],
+  ["A9EA",0x2477],
+  ["A9EB",0x2478],
+  ["A9EC",0x2479],
+  ["A9ED",0x247A],
+  ["A9EE",0x247B],
+  ["A9EF",0x247C],
+  ["A9F0",0x247D],
+  ["A9F1",0x247E],
+  ["A9F2",0x247F],
+  ["A9F3",0x2480],
+  ["A9F4",0x2481],
+  ["A9F5",0x2482],
+  ["A9F6",0xB9],
+  ["A9F7",0xB2],
+  ["A9F8",0xB3],
+  ["A9F9",0x2074],
+  ["A9FA",0x207F],
+  ["A9FB",0x2081],
+  ["A9FC",0x2082],
+  ["A9FD",0x2083],
+  ["A9FE",0x2084],
+  ["AAA1",0x3041],
+  ["AAA2",0x3042],
+  ["AAA3",0x3043],
+  ["AAA4",0x3044],
+  ["AAA5",0x3045],
+  ["AAA6",0x3046],
+  ["AAA7",0x3047],
+  ["AAA8",0x3048],
+  ["AAA9",0x3049],
+  ["AAAA",0x304A],
+  ["AAAB",0x304B],
+  ["AAAC",0x304C],
+  ["AAAD",0x304D],
+  ["AAAE",0x304E],
+  ["AAAF",0x304F],
+  ["AAB0",0x3050],
+  ["AAB1",0x3051],
+  ["AAB2",0x3052],
+  ["AAB3",0x3053],
+  ["AAB4",0x3054],
+  ["AAB5",0x3055],
+  ["AAB6",0x3056],
+  ["AAB7",0x3057],
+  ["AAB8",0x3058],
+  ["AAB9",0x3059],
+  ["AABA",0x305A],
+  ["AABB",0x305B],
+  ["AABC",0x305C],
+  ["AABD",0x305D],
+  ["AABE",0x305E],
+  ["AABF",0x305F],
+  ["AAC0",0x3060],
+  ["AAC1",0x3061],
+  ["AAC2",0x3062],
+  ["AAC3",0x3063],
+  ["AAC4",0x3064],
+  ["AAC5",0x3065],
+  ["AAC6",0x3066],
+  ["AAC7",0x3067],
+  ["AAC8",0x3068],
+  ["AAC9",0x3069],
+  ["AACA",0x306A],
+  ["AACB",0x306B],
+  ["AACC",0x306C],
+  ["AACD",0x306D],
+  ["AACE",0x306E],
+  ["AACF",0x306F],
+  ["AAD0",0x3070],
+  ["AAD1",0x3071],
+  ["AAD2",0x3072],
+  ["AAD3",0x3073],
+  ["AAD4",0x3074],
+  ["AAD5",0x3075],
+  ["AAD6",0x3076],
+  ["AAD7",0x3077],
+  ["AAD8",0x3078],
+  ["AAD9",0x3079],
+  ["AADA",0x307A],
+  ["AADB",0x307B],
+  ["AADC",0x307C],
+  ["AADD",0x307D],
+  ["AADE",0x307E],
+  ["AADF",0x307F],
+  ["AAE0",0x3080],
+  ["AAE1",0x3081],
+  ["AAE2",0x3082],
+  ["AAE3",0x3083],
+  ["AAE4",0x3084],
+  ["AAE5",0x3085],
+  ["AAE6",0x3086],
+  ["AAE7",0x3087],
+  ["AAE8",0x3088],
+  ["AAE9",0x3089],
+  ["AAEA",0x308A],
+  ["AAEB",0x308B],
+  ["AAEC",0x308C],
+  ["AAED",0x308D],
+  ["AAEE",0x308E],
+  ["AAEF",0x308F],
+  ["AAF0",0x3090],
+  ["AAF1",0x3091],
+  ["AAF2",0x3092],
+  ["AAF3",0x3093],
+  ["ABA1",0x30A1],
+  ["ABA2",0x30A2],
+  ["ABA3",0x30A3],
+  ["ABA4",0x30A4],
+  ["ABA5",0x30A5],
+  ["ABA6",0x30A6],
+  ["ABA7",0x30A7],
+  ["ABA8",0x30A8],
+  ["ABA9",0x30A9],
+  ["ABAA",0x30AA],
+  ["ABAB",0x30AB],
+  ["ABAC",0x30AC],
+  ["ABAD",0x30AD],
+  ["ABAE",0x30AE],
+  ["ABAF",0x30AF],
+  ["ABB0",0x30B0],
+  ["ABB1",0x30B1],
+  ["ABB2",0x30B2],
+  ["ABB3",0x30B3],
+  ["ABB4",0x30B4],
+  ["ABB5",0x30B5],
+  ["ABB6",0x30B6],
+  ["ABB7",0x30B7],
+  ["ABB8",0x30B8],
+  ["ABB9",0x30B9],
+  ["ABBA",0x30BA],
+  ["ABBB",0x30BB],
+  ["ABBC",0x30BC],
+  ["ABBD",0x30BD],
+  ["ABBE",0x30BE],
+  ["ABBF",0x30BF],
+  ["ABC0",0x30C0],
+  ["ABC1",0x30C1],
+  ["ABC2",0x30C2],
+  ["ABC3",0x30C3],
+  ["ABC4",0x30C4],
+  ["ABC5",0x30C5],
+  ["ABC6",0x30C6],
+  ["ABC7",0x30C7],
+  ["ABC8",0x30C8],
+  ["ABC9",0x30C9],
+  ["ABCA",0x30CA],
+  ["ABCB",0x30CB],
+  ["ABCC",0x30CC],
+  ["ABCD",0x30CD],
+  ["ABCE",0x30CE],
+  ["ABCF",0x30CF],
+  ["ABD0",0x30D0],
+  ["ABD1",0x30D1],
+  ["ABD2",0x30D2],
+  ["ABD3",0x30D3],
+  ["ABD4",0x30D4],
+  ["ABD5",0x30D5],
+  ["ABD6",0x30D6],
+  ["ABD7",0x30D7],
+  ["ABD8",0x30D8],
+  ["ABD9",0x30D9],
+  ["ABDA",0x30DA],
+  ["ABDB",0x30DB],
+  ["ABDC",0x30DC],
+  ["ABDD",0x30DD],
+  ["ABDE",0x30DE],
+  ["ABDF",0x30DF],
+  ["ABE0",0x30E0],
+  ["ABE1",0x30E1],
+  ["ABE2",0x30E2],
+  ["ABE3",0x30E3],
+  ["ABE4",0x30E4],
+  ["ABE5",0x30E5],
+  ["ABE6",0x30E6],
+  ["ABE7",0x30E7],
+  ["ABE8",0x30E8],
+  ["ABE9",0x30E9],
+  ["ABEA",0x30EA],
+  ["ABEB",0x30EB],
+  ["ABEC",0x30EC],
+  ["ABED",0x30ED],
+  ["ABEE",0x30EE],
+  ["ABEF",0x30EF],
+  ["ABF0",0x30F0],
+  ["ABF1",0x30F1],
+  ["ABF2",0x30F2],
+  ["ABF3",0x30F3],
+  ["ABF4",0x30F4],
+  ["ABF5",0x30F5],
+  ["ABF6",0x30F6],
+  ["ACA1",0x410],
+  ["ACA2",0x411],
+  ["ACA3",0x412],
+  ["ACA4",0x413],
+  ["ACA5",0x414],
+  ["ACA6",0x415],
+  ["ACA7",0x401],
+  ["ACA8",0x416],
+  ["ACA9",0x417],
+  ["ACAA",0x418],
+  ["ACAB",0x419],
+  ["ACAC",0x41A],
+  ["ACAD",0x41B],
+  ["ACAE",0x41C],
+  ["ACAF",0x41D],
+  ["ACB0",0x41E],
+  ["ACB1",0x41F],
+  ["ACB2",0x420],
+  ["ACB3",0x421],
+  ["ACB4",0x422],
+  ["ACB5",0x423],
+  ["ACB6",0x424],
+  ["ACB7",0x425],
+  ["ACB8",0x426],
+  ["ACB9",0x427],
+  ["ACBA",0x428],
+  ["ACBB",0x429],
+  ["ACBC",0x42A],
+  ["ACBD",0x42B],
+  ["ACBE",0x42C],
+  ["ACBF",0x42D],
+  ["ACC0",0x42E],
+  ["ACC1",0x42F],
+  ["ACD1",0x430],
+  ["ACD2",0x431],
+  ["ACD3",0x432],
+  ["ACD4",0x433],
+  ["ACD5",0x434],
+  ["ACD6",0x435],
+  ["ACD7",0x451],
+  ["ACD8",0x436],
+  ["ACD9",0x437],
+  ["ACDA",0x438],
+  ["ACDB",0x439],
+  ["ACDC",0x43A],
+  ["ACDD",0x43B],
+  ["ACDE",0x43C],
+  ["ACDF",0x43D],
+  ["ACE0",0x43E],
+  ["ACE1",0x43F],
+  ["ACE2",0x440],
+  ["ACE3",0x441],
+  ["ACE4",0x442],
+  ["ACE5",0x443],
+  ["ACE6",0x444],
+  ["ACE7",0x445],
+  ["ACE8",0x446],
+  ["ACE9",0x447],
+  ["ACEA",0x448],
+  ["ACEB",0x449],
+  ["ACEC",0x44A],
+  ["ACED",0x44B],
+  ["ACEE",0x44C],
+  ["ACEF",0x44D],
+  ["ACF0",0x44E],
+  ["ACF1",0x44F],
+  ["B0A1",0xAC00],
+  ["B0A2",0xAC01],
+  ["B0A3",0xAC04],
+  ["B0A4",0xAC07],
+  ["B0A5",0xAC08],
+  ["B0A6",0xAC09],
+  ["B0A7",0xAC0A],
+  ["B0A8",0xAC10],
+  ["B0A9",0xAC11],
+  ["B0AA",0xAC12],
+  ["B0AB",0xAC13],
+  ["B0AC",0xAC14],
+  ["B0AD",0xAC15],
+  ["B0AE",0xAC16],
+  ["B0AF",0xAC17],
+  ["B0B0",0xAC19],
+  ["B0B1",0xAC1A],
+  ["B0B2",0xAC1B],
+  ["B0B3",0xAC1C],
+  ["B0B4",0xAC1D],
+  ["B0B5",0xAC20],
+  ["B0B6",0xAC24],
+  ["B0B7",0xAC2C],
+  ["B0B8",0xAC2D],
+  ["B0B9",0xAC2F],
+  ["B0BA",0xAC30],
+  ["B0BB",0xAC31],
+  ["B0BC",0xAC38],
+  ["B0BD",0xAC39],
+  ["B0BE",0xAC3C],
+  ["B0BF",0xAC40],
+  ["B0C0",0xAC4B],
+  ["B0C1",0xAC4D],
+  ["B0C2",0xAC54],
+  ["B0C3",0xAC58],
+  ["B0C4",0xAC5C],
+  ["B0C5",0xAC70],
+  ["B0C6",0xAC71],
+  ["B0C7",0xAC74],
+  ["B0C8",0xAC77],
+  ["B0C9",0xAC78],
+  ["B0CA",0xAC7A],
+  ["B0CB",0xAC80],
+  ["B0CC",0xAC81],
+  ["B0CD",0xAC83],
+  ["B0CE",0xAC84],
+  ["B0CF",0xAC85],
+  ["B0D0",0xAC86],
+  ["B0D1",0xAC89],
+  ["B0D2",0xAC8A],
+  ["B0D3",0xAC8B],
+  ["B0D4",0xAC8C],
+  ["B0D5",0xAC90],
+  ["B0D6",0xAC94],
+  ["B0D7",0xAC9C],
+  ["B0D8",0xAC9D],
+  ["B0D9",0xAC9F],
+  ["B0DA",0xACA0],
+  ["B0DB",0xACA1],
+  ["B0DC",0xACA8],
+  ["B0DD",0xACA9],
+  ["B0DE",0xACAA],
+  ["B0DF",0xACAC],
+  ["B0E0",0xACAF],
+  ["B0E1",0xACB0],
+  ["B0E2",0xACB8],
+  ["B0E3",0xACB9],
+  ["B0E4",0xACBB],
+  ["B0E5",0xACBC],
+  ["B0E6",0xACBD],
+  ["B0E7",0xACC1],
+  ["B0E8",0xACC4],
+  ["B0E9",0xACC8],
+  ["B0EA",0xACCC],
+  ["B0EB",0xACD5],
+  ["B0EC",0xACD7],
+  ["B0ED",0xACE0],
+  ["B0EE",0xACE1],
+  ["B0EF",0xACE4],
+  ["B0F0",0xACE7],
+  ["B0F1",0xACE8],
+  ["B0F2",0xACEA],
+  ["B0F3",0xACEC],
+  ["B0F4",0xACEF],
+  ["B0F5",0xACF0],
+  ["B0F6",0xACF1],
+  ["B0F7",0xACF3],
+  ["B0F8",0xACF5],
+  ["B0F9",0xACF6],
+  ["B0FA",0xACFC],
+  ["B0FB",0xACFD],
+  ["B0FC",0xAD00],
+  ["B0FD",0xAD04],
+  ["B0FE",0xAD06],
+  ["B1A1",0xAD0C],
+  ["B1A2",0xAD0D],
+  ["B1A3",0xAD0F],
+  ["B1A4",0xAD11],
+  ["B1A5",0xAD18],
+  ["B1A6",0xAD1C],
+  ["B1A7",0xAD20],
+  ["B1A8",0xAD29],
+  ["B1A9",0xAD2C],
+  ["B1AA",0xAD2D],
+  ["B1AB",0xAD34],
+  ["B1AC",0xAD35],
+  ["B1AD",0xAD38],
+  ["B1AE",0xAD3C],
+  ["B1AF",0xAD44],
+  ["B1B0",0xAD45],
+  ["B1B1",0xAD47],
+  ["B1B2",0xAD49],
+  ["B1B3",0xAD50],
+  ["B1B4",0xAD54],
+  ["B1B5",0xAD58],
+  ["B1B6",0xAD61],
+  ["B1B7",0xAD63],
+  ["B1B8",0xAD6C],
+  ["B1B9",0xAD6D],
+  ["B1BA",0xAD70],
+  ["B1BB",0xAD73],
+  ["B1BC",0xAD74],
+  ["B1BD",0xAD75],
+  ["B1BE",0xAD76],
+  ["B1BF",0xAD7B],
+  ["B1C0",0xAD7C],
+  ["B1C1",0xAD7D],
+  ["B1C2",0xAD7F],
+  ["B1C3",0xAD81],
+  ["B1C4",0xAD82],
+  ["B1C5",0xAD88],
+  ["B1C6",0xAD89],
+  ["B1C7",0xAD8C],
+  ["B1C8",0xAD90],
+  ["B1C9",0xAD9C],
+  ["B1CA",0xAD9D],
+  ["B1CB",0xADA4],
+  ["B1CC",0xADB7],
+  ["B1CD",0xADC0],
+  ["B1CE",0xADC1],
+  ["B1CF",0xADC4],
+  ["B1D0",0xADC8],
+  ["B1D1",0xADD0],
+  ["B1D2",0xADD1],
+  ["B1D3",0xADD3],
+  ["B1D4",0xADDC],
+  ["B1D5",0xADE0],
+  ["B1D6",0xADE4],
+  ["B1D7",0xADF8],
+  ["B1D8",0xADF9],
+  ["B1D9",0xADFC],
+  ["B1DA",0xADFF],
+  ["B1DB",0xAE00],
+  ["B1DC",0xAE01],
+  ["B1DD",0xAE08],
+  ["B1DE",0xAE09],
+  ["B1DF",0xAE0B],
+  ["B1E0",0xAE0D],
+  ["B1E1",0xAE14],
+  ["B1E2",0xAE30],
+  ["B1E3",0xAE31],
+  ["B1E4",0xAE34],
+  ["B1E5",0xAE37],
+  ["B1E6",0xAE38],
+  ["B1E7",0xAE3A],
+  ["B1E8",0xAE40],
+  ["B1E9",0xAE41],
+  ["B1EA",0xAE43],
+  ["B1EB",0xAE45],
+  ["B1EC",0xAE46],
+  ["B1ED",0xAE4A],
+  ["B1EE",0xAE4C],
+  ["B1EF",0xAE4D],
+  ["B1F0",0xAE4E],
+  ["B1F1",0xAE50],
+  ["B1F2",0xAE54],
+  ["B1F3",0xAE56],
+  ["B1F4",0xAE5C],
+  ["B1F5",0xAE5D],
+  ["B1F6",0xAE5F],
+  ["B1F7",0xAE60],
+  ["B1F8",0xAE61],
+  ["B1F9",0xAE65],
+  ["B1FA",0xAE68],
+  ["B1FB",0xAE69],
+  ["B1FC",0xAE6C],
+  ["B1FD",0xAE70],
+  ["B1FE",0xAE78],
+  ["B2A1",0xAE79],
+  ["B2A2",0xAE7B],
+  ["B2A3",0xAE7C],
+  ["B2A4",0xAE7D],
+  ["B2A5",0xAE84],
+  ["B2A6",0xAE85],
+  ["B2A7",0xAE8C],
+  ["B2A8",0xAEBC],
+  ["B2A9",0xAEBD],
+  ["B2AA",0xAEBE],
+  ["B2AB",0xAEC0],
+  ["B2AC",0xAEC4],
+  ["B2AD",0xAECC],
+  ["B2AE",0xAECD],
+  ["B2AF",0xAECF],
+  ["B2B0",0xAED0],
+  ["B2B1",0xAED1],
+  ["B2B2",0xAED8],
+  ["B2B3",0xAED9],
+  ["B2B4",0xAEDC],
+  ["B2B5",0xAEE8],
+  ["B2B6",0xAEEB],
+  ["B2B7",0xAEED],
+  ["B2B8",0xAEF4],
+  ["B2B9",0xAEF8],
+  ["B2BA",0xAEFC],
+  ["B2BB",0xAF07],
+  ["B2BC",0xAF08],
+  ["B2BD",0xAF0D],
+  ["B2BE",0xAF10],
+  ["B2BF",0xAF2C],
+  ["B2C0",0xAF2D],
+  ["B2C1",0xAF30],
+  ["B2C2",0xAF32],
+  ["B2C3",0xAF34],
+  ["B2C4",0xAF3C],
+  ["B2C5",0xAF3D],
+  ["B2C6",0xAF3F],
+  ["B2C7",0xAF41],
+  ["B2C8",0xAF42],
+  ["B2C9",0xAF43],
+  ["B2CA",0xAF48],
+  ["B2CB",0xAF49],
+  ["B2CC",0xAF50],
+  ["B2CD",0xAF5C],
+  ["B2CE",0xAF5D],
+  ["B2CF",0xAF64],
+  ["B2D0",0xAF65],
+  ["B2D1",0xAF79],
+  ["B2D2",0xAF80],
+  ["B2D3",0xAF84],
+  ["B2D4",0xAF88],
+  ["B2D5",0xAF90],
+  ["B2D6",0xAF91],
+  ["B2D7",0xAF95],
+  ["B2D8",0xAF9C],
+  ["B2D9",0xAFB8],
+  ["B2DA",0xAFB9],
+  ["B2DB",0xAFBC],
+  ["B2DC",0xAFC0],
+  ["B2DD",0xAFC7],
+  ["B2DE",0xAFC8],
+  ["B2DF",0xAFC9],
+  ["B2E0",0xAFCB],
+  ["B2E1",0xAFCD],
+  ["B2E2",0xAFCE],
+  ["B2E3",0xAFD4],
+  ["B2E4",0xAFDC],
+  ["B2E5",0xAFE8],
+  ["B2E6",0xAFE9],
+  ["B2E7",0xAFF0],
+  ["B2E8",0xAFF1],
+  ["B2E9",0xAFF4],
+  ["B2EA",0xAFF8],
+  ["B2EB",0xB000],
+  ["B2EC",0xB001],
+  ["B2ED",0xB004],
+  ["B2EE",0xB00C],
+  ["B2EF",0xB010],
+  ["B2F0",0xB014],
+  ["B2F1",0xB01C],
+  ["B2F2",0xB01D],
+  ["B2F3",0xB028],
+  ["B2F4",0xB044],
+  ["B2F5",0xB045],
+  ["B2F6",0xB048],
+  ["B2F7",0xB04A],
+  ["B2F8",0xB04C],
+  ["B2F9",0xB04E],
+  ["B2FA",0xB053],
+  ["B2FB",0xB054],
+  ["B2FC",0xB055],
+  ["B2FD",0xB057],
+  ["B2FE",0xB059],
+  ["B3A1",0xB05D],
+  ["B3A2",0xB07C],
+  ["B3A3",0xB07D],
+  ["B3A4",0xB080],
+  ["B3A5",0xB084],
+  ["B3A6",0xB08C],
+  ["B3A7",0xB08D],
+  ["B3A8",0xB08F],
+  ["B3A9",0xB091],
+  ["B3AA",0xB098],
+  ["B3AB",0xB099],
+  ["B3AC",0xB09A],
+  ["B3AD",0xB09C],
+  ["B3AE",0xB09F],
+  ["B3AF",0xB0A0],
+  ["B3B0",0xB0A1],
+  ["B3B1",0xB0A2],
+  ["B3B2",0xB0A8],
+  ["B3B3",0xB0A9],
+  ["B3B4",0xB0AB],
+  ["B3B5",0xB0AC],
+  ["B3B6",0xB0AD],
+  ["B3B7",0xB0AE],
+  ["B3B8",0xB0AF],
+  ["B3B9",0xB0B1],
+  ["B3BA",0xB0B3],
+  ["B3BB",0xB0B4],
+  ["B3BC",0xB0B5],
+  ["B3BD",0xB0B8],
+  ["B3BE",0xB0BC],
+  ["B3BF",0xB0C4],
+  ["B3C0",0xB0C5],
+  ["B3C1",0xB0C7],
+  ["B3C2",0xB0C8],
+  ["B3C3",0xB0C9],
+  ["B3C4",0xB0D0],
+  ["B3C5",0xB0D1],
+  ["B3C6",0xB0D4],
+  ["B3C7",0xB0D8],
+  ["B3C8",0xB0E0],
+  ["B3C9",0xB0E5],
+  ["B3CA",0xB108],
+  ["B3CB",0xB109],
+  ["B3CC",0xB10B],
+  ["B3CD",0xB10C],
+  ["B3CE",0xB110],
+  ["B3CF",0xB112],
+  ["B3D0",0xB113],
+  ["B3D1",0xB118],
+  ["B3D2",0xB119],
+  ["B3D3",0xB11B],
+  ["B3D4",0xB11C],
+  ["B3D5",0xB11D],
+  ["B3D6",0xB123],
+  ["B3D7",0xB124],
+  ["B3D8",0xB125],
+  ["B3D9",0xB128],
+  ["B3DA",0xB12C],
+  ["B3DB",0xB134],
+  ["B3DC",0xB135],
+  ["B3DD",0xB137],
+  ["B3DE",0xB138],
+  ["B3DF",0xB139],
+  ["B3E0",0xB140],
+  ["B3E1",0xB141],
+  ["B3E2",0xB144],
+  ["B3E3",0xB148],
+  ["B3E4",0xB150],
+  ["B3E5",0xB151],
+  ["B3E6",0xB154],
+  ["B3E7",0xB155],
+  ["B3E8",0xB158],
+  ["B3E9",0xB15C],
+  ["B3EA",0xB160],
+  ["B3EB",0xB178],
+  ["B3EC",0xB179],
+  ["B3ED",0xB17C],
+  ["B3EE",0xB180],
+  ["B3EF",0xB182],
+  ["B3F0",0xB188],
+  ["B3F1",0xB189],
+  ["B3F2",0xB18B],
+  ["B3F3",0xB18D],
+  ["B3F4",0xB192],
+  ["B3F5",0xB193],
+  ["B3F6",0xB194],
+  ["B3F7",0xB198],
+  ["B3F8",0xB19C],
+  ["B3F9",0xB1A8],
+  ["B3FA",0xB1CC],
+  ["B3FB",0xB1D0],
+  ["B3FC",0xB1D4],
+  ["B3FD",0xB1DC],
+  ["B3FE",0xB1DD],
+  ["B4A1",0xB1DF],
+  ["B4A2",0xB1E8],
+  ["B4A3",0xB1E9],
+  ["B4A4",0xB1EC],
+  ["B4A5",0xB1F0],
+  ["B4A6",0xB1F9],
+  ["B4A7",0xB1FB],
+  ["B4A8",0xB1FD],
+  ["B4A9",0xB204],
+  ["B4AA",0xB205],
+  ["B4AB",0xB208],
+  ["B4AC",0xB20B],
+  ["B4AD",0xB20C],
+  ["B4AE",0xB214],
+  ["B4AF",0xB215],
+  ["B4B0",0xB217],
+  ["B4B1",0xB219],
+  ["B4B2",0xB220],
+  ["B4B3",0xB234],
+  ["B4B4",0xB23C],
+  ["B4B5",0xB258],
+  ["B4B6",0xB25C],
+  ["B4B7",0xB260],
+  ["B4B8",0xB268],
+  ["B4B9",0xB269],
+  ["B4BA",0xB274],
+  ["B4BB",0xB275],
+  ["B4BC",0xB27C],
+  ["B4BD",0xB284],
+  ["B4BE",0xB285],
+  ["B4BF",0xB289],
+  ["B4C0",0xB290],
+  ["B4C1",0xB291],
+  ["B4C2",0xB294],
+  ["B4C3",0xB298],
+  ["B4C4",0xB299],
+  ["B4C5",0xB29A],
+  ["B4C6",0xB2A0],
+  ["B4C7",0xB2A1],
+  ["B4C8",0xB2A3],
+  ["B4C9",0xB2A5],
+  ["B4CA",0xB2A6],
+  ["B4CB",0xB2AA],
+  ["B4CC",0xB2AC],
+  ["B4CD",0xB2B0],
+  ["B4CE",0xB2B4],
+  ["B4CF",0xB2C8],
+  ["B4D0",0xB2C9],
+  ["B4D1",0xB2CC],
+  ["B4D2",0xB2D0],
+  ["B4D3",0xB2D2],
+  ["B4D4",0xB2D8],
+  ["B4D5",0xB2D9],
+  ["B4D6",0xB2DB],
+  ["B4D7",0xB2DD],
+  ["B4D8",0xB2E2],
+  ["B4D9",0xB2E4],
+  ["B4DA",0xB2E5],
+  ["B4DB",0xB2E6],
+  ["B4DC",0xB2E8],
+  ["B4DD",0xB2EB],
+  ["B4DE",0xB2EC],
+  ["B4DF",0xB2ED],
+  ["B4E0",0xB2EE],
+  ["B4E1",0xB2EF],
+  ["B4E2",0xB2F3],
+  ["B4E3",0xB2F4],
+  ["B4E4",0xB2F5],
+  ["B4E5",0xB2F7],
+  ["B4E6",0xB2F8],
+  ["B4E7",0xB2F9],
+  ["B4E8",0xB2FA],
+  ["B4E9",0xB2FB],
+  ["B4EA",0xB2FF],
+  ["B4EB",0xB300],
+  ["B4EC",0xB301],
+  ["B4ED",0xB304],
+  ["B4EE",0xB308],
+  ["B4EF",0xB310],
+  ["B4F0",0xB311],
+  ["B4F1",0xB313],
+  ["B4F2",0xB314],
+  ["B4F3",0xB315],
+  ["B4F4",0xB31C],
+  ["B4F5",0xB354],
+  ["B4F6",0xB355],
+  ["B4F7",0xB356],
+  ["B4F8",0xB358],
+  ["B4F9",0xB35B],
+  ["B4FA",0xB35C],
+  ["B4FB",0xB35E],
+  ["B4FC",0xB35F],
+  ["B4FD",0xB364],
+  ["B4FE",0xB365],
+  ["B5A1",0xB367],
+  ["B5A2",0xB369],
+  ["B5A3",0xB36B],
+  ["B5A4",0xB36E],
+  ["B5A5",0xB370],
+  ["B5A6",0xB371],
+  ["B5A7",0xB374],
+  ["B5A8",0xB378],
+  ["B5A9",0xB380],
+  ["B5AA",0xB381],
+  ["B5AB",0xB383],
+  ["B5AC",0xB384],
+  ["B5AD",0xB385],
+  ["B5AE",0xB38C],
+  ["B5AF",0xB390],
+  ["B5B0",0xB394],
+  ["B5B1",0xB3A0],
+  ["B5B2",0xB3A1],
+  ["B5B3",0xB3A8],
+  ["B5B4",0xB3AC],
+  ["B5B5",0xB3C4],
+  ["B5B6",0xB3C5],
+  ["B5B7",0xB3C8],
+  ["B5B8",0xB3CB],
+  ["B5B9",0xB3CC],
+  ["B5BA",0xB3CE],
+  ["B5BB",0xB3D0],
+  ["B5BC",0xB3D4],
+  ["B5BD",0xB3D5],
+  ["B5BE",0xB3D7],
+  ["B5BF",0xB3D9],
+  ["B5C0",0xB3DB],
+  ["B5C1",0xB3DD],
+  ["B5C2",0xB3E0],
+  ["B5C3",0xB3E4],
+  ["B5C4",0xB3E8],
+  ["B5C5",0xB3FC],
+  ["B5C6",0xB410],
+  ["B5C7",0xB418],
+  ["B5C8",0xB41C],
+  ["B5C9",0xB420],
+  ["B5CA",0xB428],
+  ["B5CB",0xB429],
+  ["B5CC",0xB42B],
+  ["B5CD",0xB434],
+  ["B5CE",0xB450],
+  ["B5CF",0xB451],
+  ["B5D0",0xB454],
+  ["B5D1",0xB458],
+  ["B5D2",0xB460],
+  ["B5D3",0xB461],
+  ["B5D4",0xB463],
+  ["B5D5",0xB465],
+  ["B5D6",0xB46C],
+  ["B5D7",0xB480],
+  ["B5D8",0xB488],
+  ["B5D9",0xB49D],
+  ["B5DA",0xB4A4],
+  ["B5DB",0xB4A8],
+  ["B5DC",0xB4AC],
+  ["B5DD",0xB4B5],
+  ["B5DE",0xB4B7],
+  ["B5DF",0xB4B9],
+  ["B5E0",0xB4C0],
+  ["B5E1",0xB4C4],
+  ["B5E2",0xB4C8],
+  ["B5E3",0xB4D0],
+  ["B5E4",0xB4D5],
+  ["B5E5",0xB4DC],
+  ["B5E6",0xB4DD],
+  ["B5E7",0xB4E0],
+  ["B5E8",0xB4E3],
+  ["B5E9",0xB4E4],
+  ["B5EA",0xB4E6],
+  ["B5EB",0xB4EC],
+  ["B5EC",0xB4ED],
+  ["B5ED",0xB4EF],
+  ["B5EE",0xB4F1],
+  ["B5EF",0xB4F8],
+  ["B5F0",0xB514],
+  ["B5F1",0xB515],
+  ["B5F2",0xB518],
+  ["B5F3",0xB51B],
+  ["B5F4",0xB51C],
+  ["B5F5",0xB524],
+  ["B5F6",0xB525],
+  ["B5F7",0xB527],
+  ["B5F8",0xB528],
+  ["B5F9",0xB529],
+  ["B5FA",0xB52A],
+  ["B5FB",0xB530],
+  ["B5FC",0xB531],
+  ["B5FD",0xB534],
+  ["B5FE",0xB538],
+  ["B6A1",0xB540],
+  ["B6A2",0xB541],
+  ["B6A3",0xB543],
+  ["B6A4",0xB544],
+  ["B6A5",0xB545],
+  ["B6A6",0xB54B],
+  ["B6A7",0xB54C],
+  ["B6A8",0xB54D],
+  ["B6A9",0xB550],
+  ["B6AA",0xB554],
+  ["B6AB",0xB55C],
+  ["B6AC",0xB55D],
+  ["B6AD",0xB55F],
+  ["B6AE",0xB560],
+  ["B6AF",0xB561],
+  ["B6B0",0xB5A0],
+  ["B6B1",0xB5A1],
+  ["B6B2",0xB5A4],
+  ["B6B3",0xB5A8],
+  ["B6B4",0xB5AA],
+  ["B6B5",0xB5AB],
+  ["B6B6",0xB5B0],
+  ["B6B7",0xB5B1],
+  ["B6B8",0xB5B3],
+  ["B6B9",0xB5B4],
+  ["B6BA",0xB5B5],
+  ["B6BB",0xB5BB],
+  ["B6BC",0xB5BC],
+  ["B6BD",0xB5BD],
+  ["B6BE",0xB5C0],
+  ["B6BF",0xB5C4],
+  ["B6C0",0xB5CC],
+  ["B6C1",0xB5CD],
+  ["B6C2",0xB5CF],
+  ["B6C3",0xB5D0],
+  ["B6C4",0xB5D1],
+  ["B6C5",0xB5D8],
+  ["B6C6",0xB5EC],
+  ["B6C7",0xB610],
+  ["B6C8",0xB611],
+  ["B6C9",0xB614],
+  ["B6CA",0xB618],
+  ["B6CB",0xB625],
+  ["B6CC",0xB62C],
+  ["B6CD",0xB634],
+  ["B6CE",0xB648],
+  ["B6CF",0xB664],
+  ["B6D0",0xB668],
+  ["B6D1",0xB69C],
+  ["B6D2",0xB69D],
+  ["B6D3",0xB6A0],
+  ["B6D4",0xB6A4],
+  ["B6D5",0xB6AB],
+  ["B6D6",0xB6AC],
+  ["B6D7",0xB6B1],
+  ["B6D8",0xB6D4],
+  ["B6D9",0xB6F0],
+  ["B6DA",0xB6F4],
+  ["B6DB",0xB6F8],
+  ["B6DC",0xB700],
+  ["B6DD",0xB701],
+  ["B6DE",0xB705],
+  ["B6DF",0xB728],
+  ["B6E0",0xB729],
+  ["B6E1",0xB72C],
+  ["B6E2",0xB72F],
+  ["B6E3",0xB730],
+  ["B6E4",0xB738],
+  ["B6E5",0xB739],
+  ["B6E6",0xB73B],
+  ["B6E7",0xB744],
+  ["B6E8",0xB748],
+  ["B6E9",0xB74C],
+  ["B6EA",0xB754],
+  ["B6EB",0xB755],
+  ["B6EC",0xB760],
+  ["B6ED",0xB764],
+  ["B6EE",0xB768],
+  ["B6EF",0xB770],
+  ["B6F0",0xB771],
+  ["B6F1",0xB773],
+  ["B6F2",0xB775],
+  ["B6F3",0xB77C],
+  ["B6F4",0xB77D],
+  ["B6F5",0xB780],
+  ["B6F6",0xB784],
+  ["B6F7",0xB78C],
+  ["B6F8",0xB78D],
+  ["B6F9",0xB78F],
+  ["B6FA",0xB790],
+  ["B6FB",0xB791],
+  ["B6FC",0xB792],
+  ["B6FD",0xB796],
+  ["B6FE",0xB797],
+  ["B7A1",0xB798],
+  ["B7A2",0xB799],
+  ["B7A3",0xB79C],
+  ["B7A4",0xB7A0],
+  ["B7A5",0xB7A8],
+  ["B7A6",0xB7A9],
+  ["B7A7",0xB7AB],
+  ["B7A8",0xB7AC],
+  ["B7A9",0xB7AD],
+  ["B7AA",0xB7B4],
+  ["B7AB",0xB7B5],
+  ["B7AC",0xB7B8],
+  ["B7AD",0xB7C7],
+  ["B7AE",0xB7C9],
+  ["B7AF",0xB7EC],
+  ["B7B0",0xB7ED],
+  ["B7B1",0xB7F0],
+  ["B7B2",0xB7F4],
+  ["B7B3",0xB7FC],
+  ["B7B4",0xB7FD],
+  ["B7B5",0xB7FF],
+  ["B7B6",0xB800],
+  ["B7B7",0xB801],
+  ["B7B8",0xB807],
+  ["B7B9",0xB808],
+  ["B7BA",0xB809],
+  ["B7BB",0xB80C],
+  ["B7BC",0xB810],
+  ["B7BD",0xB818],
+  ["B7BE",0xB819],
+  ["B7BF",0xB81B],
+  ["B7C0",0xB81D],
+  ["B7C1",0xB824],
+  ["B7C2",0xB825],
+  ["B7C3",0xB828],
+  ["B7C4",0xB82C],
+  ["B7C5",0xB834],
+  ["B7C6",0xB835],
+  ["B7C7",0xB837],
+  ["B7C8",0xB838],
+  ["B7C9",0xB839],
+  ["B7CA",0xB840],
+  ["B7CB",0xB844],
+  ["B7CC",0xB851],
+  ["B7CD",0xB853],
+  ["B7CE",0xB85C],
+  ["B7CF",0xB85D],
+  ["B7D0",0xB860],
+  ["B7D1",0xB864],
+  ["B7D2",0xB86C],
+  ["B7D3",0xB86D],
+  ["B7D4",0xB86F],
+  ["B7D5",0xB871],
+  ["B7D6",0xB878],
+  ["B7D7",0xB87C],
+  ["B7D8",0xB88D],
+  ["B7D9",0xB8A8],
+  ["B7DA",0xB8B0],
+  ["B7DB",0xB8B4],
+  ["B7DC",0xB8B8],
+  ["B7DD",0xB8C0],
+  ["B7DE",0xB8C1],
+  ["B7DF",0xB8C3],
+  ["B7E0",0xB8C5],
+  ["B7E1",0xB8CC],
+  ["B7E2",0xB8D0],
+  ["B7E3",0xB8D4],
+  ["B7E4",0xB8DD],
+  ["B7E5",0xB8DF],
+  ["B7E6",0xB8E1],
+  ["B7E7",0xB8E8],
+  ["B7E8",0xB8E9],
+  ["B7E9",0xB8EC],
+  ["B7EA",0xB8F0],
+  ["B7EB",0xB8F8],
+  ["B7EC",0xB8F9],
+  ["B7ED",0xB8FB],
+  ["B7EE",0xB8FD],
+  ["B7EF",0xB904],
+  ["B7F0",0xB918],
+  ["B7F1",0xB920],
+  ["B7F2",0xB93C],
+  ["B7F3",0xB93D],
+  ["B7F4",0xB940],
+  ["B7F5",0xB944],
+  ["B7F6",0xB94C],
+  ["B7F7",0xB94F],
+  ["B7F8",0xB951],
+  ["B7F9",0xB958],
+  ["B7FA",0xB959],
+  ["B7FB",0xB95C],
+  ["B7FC",0xB960],
+  ["B7FD",0xB968],
+  ["B7FE",0xB969],
+  ["B8A1",0xB96B],
+  ["B8A2",0xB96D],
+  ["B8A3",0xB974],
+  ["B8A4",0xB975],
+  ["B8A5",0xB978],
+  ["B8A6",0xB97C],
+  ["B8A7",0xB984],
+  ["B8A8",0xB985],
+  ["B8A9",0xB987],
+  ["B8AA",0xB989],
+  ["B8AB",0xB98A],
+  ["B8AC",0xB98D],
+  ["B8AD",0xB98E],
+  ["B8AE",0xB9AC],
+  ["B8AF",0xB9AD],
+  ["B8B0",0xB9B0],
+  ["B8B1",0xB9B4],
+  ["B8B2",0xB9BC],
+  ["B8B3",0xB9BD],
+  ["B8B4",0xB9BF],
+  ["B8B5",0xB9C1],
+  ["B8B6",0xB9C8],
+  ["B8B7",0xB9C9],
+  ["B8B8",0xB9CC],
+  ["B8B9",0xB9CE],
+  ["B8BA",0xB9CF],
+  ["B8BB",0xB9D0],
+  ["B8BC",0xB9D1],
+  ["B8BD",0xB9D2],
+  ["B8BE",0xB9D8],
+  ["B8BF",0xB9D9],
+  ["B8C0",0xB9DB],
+  ["B8C1",0xB9DD],
+  ["B8C2",0xB9DE],
+  ["B8C3",0xB9E1],
+  ["B8C4",0xB9E3],
+  ["B8C5",0xB9E4],
+  ["B8C6",0xB9E5],
+  ["B8C7",0xB9E8],
+  ["B8C8",0xB9EC],
+  ["B8C9",0xB9F4],
+  ["B8CA",0xB9F5],
+  ["B8CB",0xB9F7],
+  ["B8CC",0xB9F8],
+  ["B8CD",0xB9F9],
+  ["B8CE",0xB9FA],
+  ["B8CF",0xBA00],
+  ["B8D0",0xBA01],
+  ["B8D1",0xBA08],
+  ["B8D2",0xBA15],
+  ["B8D3",0xBA38],
+  ["B8D4",0xBA39],
+  ["B8D5",0xBA3C],
+  ["B8D6",0xBA40],
+  ["B8D7",0xBA42],
+  ["B8D8",0xBA48],
+  ["B8D9",0xBA49],
+  ["B8DA",0xBA4B],
+  ["B8DB",0xBA4D],
+  ["B8DC",0xBA4E],
+  ["B8DD",0xBA53],
+  ["B8DE",0xBA54],
+  ["B8DF",0xBA55],
+  ["B8E0",0xBA58],
+  ["B8E1",0xBA5C],
+  ["B8E2",0xBA64],
+  ["B8E3",0xBA65],
+  ["B8E4",0xBA67],
+  ["B8E5",0xBA68],
+  ["B8E6",0xBA69],
+  ["B8E7",0xBA70],
+  ["B8E8",0xBA71],
+  ["B8E9",0xBA74],
+  ["B8EA",0xBA78],
+  ["B8EB",0xBA83],
+  ["B8EC",0xBA84],
+  ["B8ED",0xBA85],
+  ["B8EE",0xBA87],
+  ["B8EF",0xBA8C],
+  ["B8F0",0xBAA8],
+  ["B8F1",0xBAA9],
+  ["B8F2",0xBAAB],
+  ["B8F3",0xBAAC],
+  ["B8F4",0xBAB0],
+  ["B8F5",0xBAB2],
+  ["B8F6",0xBAB8],
+  ["B8F7",0xBAB9],
+  ["B8F8",0xBABB],
+  ["B8F9",0xBABD],
+  ["B8FA",0xBAC4],
+  ["B8FB",0xBAC8],
+  ["B8FC",0xBAD8],
+  ["B8FD",0xBAD9],
+  ["B8FE",0xBAFC],
+  ["B9A1",0xBB00],
+  ["B9A2",0xBB04],
+  ["B9A3",0xBB0D],
+  ["B9A4",0xBB0F],
+  ["B9A5",0xBB11],
+  ["B9A6",0xBB18],
+  ["B9A7",0xBB1C],
+  ["B9A8",0xBB20],
+  ["B9A9",0xBB29],
+  ["B9AA",0xBB2B],
+  ["B9AB",0xBB34],
+  ["B9AC",0xBB35],
+  ["B9AD",0xBB36],
+  ["B9AE",0xBB38],
+  ["B9AF",0xBB3B],
+  ["B9B0",0xBB3C],
+  ["B9B1",0xBB3D],
+  ["B9B2",0xBB3E],
+  ["B9B3",0xBB44],
+  ["B9B4",0xBB45],
+  ["B9B5",0xBB47],
+  ["B9B6",0xBB49],
+  ["B9B7",0xBB4D],
+  ["B9B8",0xBB4F],
+  ["B9B9",0xBB50],
+  ["B9BA",0xBB54],
+  ["B9BB",0xBB58],
+  ["B9BC",0xBB61],
+  ["B9BD",0xBB63],
+  ["B9BE",0xBB6C],
+  ["B9BF",0xBB88],
+  ["B9C0",0xBB8C],
+  ["B9C1",0xBB90],
+  ["B9C2",0xBBA4],
+  ["B9C3",0xBBA8],
+  ["B9C4",0xBBAC],
+  ["B9C5",0xBBB4],
+  ["B9C6",0xBBB7],
+  ["B9C7",0xBBC0],
+  ["B9C8",0xBBC4],
+  ["B9C9",0xBBC8],
+  ["B9CA",0xBBD0],
+  ["B9CB",0xBBD3],
+  ["B9CC",0xBBF8],
+  ["B9CD",0xBBF9],
+  ["B9CE",0xBBFC],
+  ["B9CF",0xBBFF],
+  ["B9D0",0xBC00],
+  ["B9D1",0xBC02],
+  ["B9D2",0xBC08],
+  ["B9D3",0xBC09],
+  ["B9D4",0xBC0B],
+  ["B9D5",0xBC0C],
+  ["B9D6",0xBC0D],
+  ["B9D7",0xBC0F],
+  ["B9D8",0xBC11],
+  ["B9D9",0xBC14],
+  ["B9DA",0xBC15],
+  ["B9DB",0xBC16],
+  ["B9DC",0xBC17],
+  ["B9DD",0xBC18],
+  ["B9DE",0xBC1B],
+  ["B9DF",0xBC1C],
+  ["B9E0",0xBC1D],
+  ["B9E1",0xBC1E],
+  ["B9E2",0xBC1F],
+  ["B9E3",0xBC24],
+  ["B9E4",0xBC25],
+  ["B9E5",0xBC27],
+  ["B9E6",0xBC29],
+  ["B9E7",0xBC2D],
+  ["B9E8",0xBC30],
+  ["B9E9",0xBC31],
+  ["B9EA",0xBC34],
+  ["B9EB",0xBC38],
+  ["B9EC",0xBC40],
+  ["B9ED",0xBC41],
+  ["B9EE",0xBC43],
+  ["B9EF",0xBC44],
+  ["B9F0",0xBC45],
+  ["B9F1",0xBC49],
+  ["B9F2",0xBC4C],
+  ["B9F3",0xBC4D],
+  ["B9F4",0xBC50],
+  ["B9F5",0xBC5D],
+  ["B9F6",0xBC84],
+  ["B9F7",0xBC85],
+  ["B9F8",0xBC88],
+  ["B9F9",0xBC8B],
+  ["B9FA",0xBC8C],
+  ["B9FB",0xBC8E],
+  ["B9FC",0xBC94],
+  ["B9FD",0xBC95],
+  ["B9FE",0xBC97],
+  ["BAA1",0xBC99],
+  ["BAA2",0xBC9A],
+  ["BAA3",0xBCA0],
+  ["BAA4",0xBCA1],
+  ["BAA5",0xBCA4],
+  ["BAA6",0xBCA7],
+  ["BAA7",0xBCA8],
+  ["BAA8",0xBCB0],
+  ["BAA9",0xBCB1],
+  ["BAAA",0xBCB3],
+  ["BAAB",0xBCB4],
+  ["BAAC",0xBCB5],
+  ["BAAD",0xBCBC],
+  ["BAAE",0xBCBD],
+  ["BAAF",0xBCC0],
+  ["BAB0",0xBCC4],
+  ["BAB1",0xBCCD],
+  ["BAB2",0xBCCF],
+  ["BAB3",0xBCD0],
+  ["BAB4",0xBCD1],
+  ["BAB5",0xBCD5],
+  ["BAB6",0xBCD8],
+  ["BAB7",0xBCDC],
+  ["BAB8",0xBCF4],
+  ["BAB9",0xBCF5],
+  ["BABA",0xBCF6],
+  ["BABB",0xBCF8],
+  ["BABC",0xBCFC],
+  ["BABD",0xBD04],
+  ["BABE",0xBD05],
+  ["BABF",0xBD07],
+  ["BAC0",0xBD09],
+  ["BAC1",0xBD10],
+  ["BAC2",0xBD14],
+  ["BAC3",0xBD24],
+  ["BAC4",0xBD2C],
+  ["BAC5",0xBD40],
+  ["BAC6",0xBD48],
+  ["BAC7",0xBD49],
+  ["BAC8",0xBD4C],
+  ["BAC9",0xBD50],
+  ["BACA",0xBD58],
+  ["BACB",0xBD59],
+  ["BACC",0xBD64],
+  ["BACD",0xBD68],
+  ["BACE",0xBD80],
+  ["BACF",0xBD81],
+  ["BAD0",0xBD84],
+  ["BAD1",0xBD87],
+  ["BAD2",0xBD88],
+  ["BAD3",0xBD89],
+  ["BAD4",0xBD8A],
+  ["BAD5",0xBD90],
+  ["BAD6",0xBD91],
+  ["BAD7",0xBD93],
+  ["BAD8",0xBD95],
+  ["BAD9",0xBD99],
+  ["BADA",0xBD9A],
+  ["BADB",0xBD9C],
+  ["BADC",0xBDA4],
+  ["BADD",0xBDB0],
+  ["BADE",0xBDB8],
+  ["BADF",0xBDD4],
+  ["BAE0",0xBDD5],
+  ["BAE1",0xBDD8],
+  ["BAE2",0xBDDC],
+  ["BAE3",0xBDE9],
+  ["BAE4",0xBDF0],
+  ["BAE5",0xBDF4],
+  ["BAE6",0xBDF8],
+  ["BAE7",0xBE00],
+  ["BAE8",0xBE03],
+  ["BAE9",0xBE05],
+  ["BAEA",0xBE0C],
+  ["BAEB",0xBE0D],
+  ["BAEC",0xBE10],
+  ["BAED",0xBE14],
+  ["BAEE",0xBE1C],
+  ["BAEF",0xBE1D],
+  ["BAF0",0xBE1F],
+  ["BAF1",0xBE44],
+  ["BAF2",0xBE45],
+  ["BAF3",0xBE48],
+  ["BAF4",0xBE4C],
+  ["BAF5",0xBE4E],
+  ["BAF6",0xBE54],
+  ["BAF7",0xBE55],
+  ["BAF8",0xBE57],
+  ["BAF9",0xBE59],
+  ["BAFA",0xBE5A],
+  ["BAFB",0xBE5B],
+  ["BAFC",0xBE60],
+  ["BAFD",0xBE61],
+  ["BAFE",0xBE64],
+  ["BBA1",0xBE68],
+  ["BBA2",0xBE6A],
+  ["BBA3",0xBE70],
+  ["BBA4",0xBE71],
+  ["BBA5",0xBE73],
+  ["BBA6",0xBE74],
+  ["BBA7",0xBE75],
+  ["BBA8",0xBE7B],
+  ["BBA9",0xBE7C],
+  ["BBAA",0xBE7D],
+  ["BBAB",0xBE80],
+  ["BBAC",0xBE84],
+  ["BBAD",0xBE8C],
+  ["BBAE",0xBE8D],
+  ["BBAF",0xBE8F],
+  ["BBB0",0xBE90],
+  ["BBB1",0xBE91],
+  ["BBB2",0xBE98],
+  ["BBB3",0xBE99],
+  ["BBB4",0xBEA8],
+  ["BBB5",0xBED0],
+  ["BBB6",0xBED1],
+  ["BBB7",0xBED4],
+  ["BBB8",0xBED7],
+  ["BBB9",0xBED8],
+  ["BBBA",0xBEE0],
+  ["BBBB",0xBEE3],
+  ["BBBC",0xBEE4],
+  ["BBBD",0xBEE5],
+  ["BBBE",0xBEEC],
+  ["BBBF",0xBF01],
+  ["BBC0",0xBF08],
+  ["BBC1",0xBF09],
+  ["BBC2",0xBF18],
+  ["BBC3",0xBF19],
+  ["BBC4",0xBF1B],
+  ["BBC5",0xBF1C],
+  ["BBC6",0xBF1D],
+  ["BBC7",0xBF40],
+  ["BBC8",0xBF41],
+  ["BBC9",0xBF44],
+  ["BBCA",0xBF48],
+  ["BBCB",0xBF50],
+  ["BBCC",0xBF51],
+  ["BBCD",0xBF55],
+  ["BBCE",0xBF94],
+  ["BBCF",0xBFB0],
+  ["BBD0",0xBFC5],
+  ["BBD1",0xBFCC],
+  ["BBD2",0xBFCD],
+  ["BBD3",0xBFD0],
+  ["BBD4",0xBFD4],
+  ["BBD5",0xBFDC],
+  ["BBD6",0xBFDF],
+  ["BBD7",0xBFE1],
+  ["BBD8",0xC03C],
+  ["BBD9",0xC051],
+  ["BBDA",0xC058],
+  ["BBDB",0xC05C],
+  ["BBDC",0xC060],
+  ["BBDD",0xC068],
+  ["BBDE",0xC069],
+  ["BBDF",0xC090],
+  ["BBE0",0xC091],
+  ["BBE1",0xC094],
+  ["BBE2",0xC098],
+  ["BBE3",0xC0A0],
+  ["BBE4",0xC0A1],
+  ["BBE5",0xC0A3],
+  ["BBE6",0xC0A5],
+  ["BBE7",0xC0AC],
+  ["BBE8",0xC0AD],
+  ["BBE9",0xC0AF],
+  ["BBEA",0xC0B0],
+  ["BBEB",0xC0B3],
+  ["BBEC",0xC0B4],
+  ["BBED",0xC0B5],
+  ["BBEE",0xC0B6],
+  ["BBEF",0xC0BC],
+  ["BBF0",0xC0BD],
+  ["BBF1",0xC0BF],
+  ["BBF2",0xC0C0],
+  ["BBF3",0xC0C1],
+  ["BBF4",0xC0C5],
+  ["BBF5",0xC0C8],
+  ["BBF6",0xC0C9],
+  ["BBF7",0xC0CC],
+  ["BBF8",0xC0D0],
+  ["BBF9",0xC0D8],
+  ["BBFA",0xC0D9],
+  ["BBFB",0xC0DB],
+  ["BBFC",0xC0DC],
+  ["BBFD",0xC0DD],
+  ["BBFE",0xC0E4],
+  ["BCA1",0xC0E5],
+  ["BCA2",0xC0E8],
+  ["BCA3",0xC0EC],
+  ["BCA4",0xC0F4],
+  ["BCA5",0xC0F5],
+  ["BCA6",0xC0F7],
+  ["BCA7",0xC0F9],
+  ["BCA8",0xC100],
+  ["BCA9",0xC104],
+  ["BCAA",0xC108],
+  ["BCAB",0xC110],
+  ["BCAC",0xC115],
+  ["BCAD",0xC11C],
+  ["BCAE",0xC11D],
+  ["BCAF",0xC11E],
+  ["BCB0",0xC11F],
+  ["BCB1",0xC120],
+  ["BCB2",0xC123],
+  ["BCB3",0xC124],
+  ["BCB4",0xC126],
+  ["BCB5",0xC127],
+  ["BCB6",0xC12C],
+  ["BCB7",0xC12D],
+  ["BCB8",0xC12F],
+  ["BCB9",0xC130],
+  ["BCBA",0xC131],
+  ["BCBB",0xC136],
+  ["BCBC",0xC138],
+  ["BCBD",0xC139],
+  ["BCBE",0xC13C],
+  ["BCBF",0xC140],
+  ["BCC0",0xC148],
+  ["BCC1",0xC149],
+  ["BCC2",0xC14B],
+  ["BCC3",0xC14C],
+  ["BCC4",0xC14D],
+  ["BCC5",0xC154],
+  ["BCC6",0xC155],
+  ["BCC7",0xC158],
+  ["BCC8",0xC15C],
+  ["BCC9",0xC164],
+  ["BCCA",0xC165],
+  ["BCCB",0xC167],
+  ["BCCC",0xC168],
+  ["BCCD",0xC169],
+  ["BCCE",0xC170],
+  ["BCCF",0xC174],
+  ["BCD0",0xC178],
+  ["BCD1",0xC185],
+  ["BCD2",0xC18C],
+  ["BCD3",0xC18D],
+  ["BCD4",0xC18E],
+  ["BCD5",0xC190],
+  ["BCD6",0xC194],
+  ["BCD7",0xC196],
+  ["BCD8",0xC19C],
+  ["BCD9",0xC19D],
+  ["BCDA",0xC19F],
+  ["BCDB",0xC1A1],
+  ["BCDC",0xC1A5],
+  ["BCDD",0xC1A8],
+  ["BCDE",0xC1A9],
+  ["BCDF",0xC1AC],
+  ["BCE0",0xC1B0],
+  ["BCE1",0xC1BD],
+  ["BCE2",0xC1C4],
+  ["BCE3",0xC1C8],
+  ["BCE4",0xC1CC],
+  ["BCE5",0xC1D4],
+  ["BCE6",0xC1D7],
+  ["BCE7",0xC1D8],
+  ["BCE8",0xC1E0],
+  ["BCE9",0xC1E4],
+  ["BCEA",0xC1E8],
+  ["BCEB",0xC1F0],
+  ["BCEC",0xC1F1],
+  ["BCED",0xC1F3],
+  ["BCEE",0xC1FC],
+  ["BCEF",0xC1FD],
+  ["BCF0",0xC200],
+  ["BCF1",0xC204],
+  ["BCF2",0xC20C],
+  ["BCF3",0xC20D],
+  ["BCF4",0xC20F],
+  ["BCF5",0xC211],
+  ["BCF6",0xC218],
+  ["BCF7",0xC219],
+  ["BCF8",0xC21C],
+  ["BCF9",0xC21F],
+  ["BCFA",0xC220],
+  ["BCFB",0xC228],
+  ["BCFC",0xC229],
+  ["BCFD",0xC22B],
+  ["BCFE",0xC22D],
+  ["BDA1",0xC22F],
+  ["BDA2",0xC231],
+  ["BDA3",0xC232],
+  ["BDA4",0xC234],
+  ["BDA5",0xC248],
+  ["BDA6",0xC250],
+  ["BDA7",0xC251],
+  ["BDA8",0xC254],
+  ["BDA9",0xC258],
+  ["BDAA",0xC260],
+  ["BDAB",0xC265],
+  ["BDAC",0xC26C],
+  ["BDAD",0xC26D],
+  ["BDAE",0xC270],
+  ["BDAF",0xC274],
+  ["BDB0",0xC27C],
+  ["BDB1",0xC27D],
+  ["BDB2",0xC27F],
+  ["BDB3",0xC281],
+  ["BDB4",0xC288],
+  ["BDB5",0xC289],
+  ["BDB6",0xC290],
+  ["BDB7",0xC298],
+  ["BDB8",0xC29B],
+  ["BDB9",0xC29D],
+  ["BDBA",0xC2A4],
+  ["BDBB",0xC2A5],
+  ["BDBC",0xC2A8],
+  ["BDBD",0xC2AC],
+  ["BDBE",0xC2AD],
+  ["BDBF",0xC2B4],
+  ["BDC0",0xC2B5],
+  ["BDC1",0xC2B7],
+  ["BDC2",0xC2B9],
+  ["BDC3",0xC2DC],
+  ["BDC4",0xC2DD],
+  ["BDC5",0xC2E0],
+  ["BDC6",0xC2E3],
+  ["BDC7",0xC2E4],
+  ["BDC8",0xC2EB],
+  ["BDC9",0xC2EC],
+  ["BDCA",0xC2ED],
+  ["BDCB",0xC2EF],
+  ["BDCC",0xC2F1],
+  ["BDCD",0xC2F6],
+  ["BDCE",0xC2F8],
+  ["BDCF",0xC2F9],
+  ["BDD0",0xC2FB],
+  ["BDD1",0xC2FC],
+  ["BDD2",0xC300],
+  ["BDD3",0xC308],
+  ["BDD4",0xC309],
+  ["BDD5",0xC30C],
+  ["BDD6",0xC30D],
+  ["BDD7",0xC313],
+  ["BDD8",0xC314],
+  ["BDD9",0xC315],
+  ["BDDA",0xC318],
+  ["BDDB",0xC31C],
+  ["BDDC",0xC324],
+  ["BDDD",0xC325],
+  ["BDDE",0xC328],
+  ["BDDF",0xC329],
+  ["BDE0",0xC345],
+  ["BDE1",0xC368],
+  ["BDE2",0xC369],
+  ["BDE3",0xC36C],
+  ["BDE4",0xC370],
+  ["BDE5",0xC372],
+  ["BDE6",0xC378],
+  ["BDE7",0xC379],
+  ["BDE8",0xC37C],
+  ["BDE9",0xC37D],
+  ["BDEA",0xC384],
+  ["BDEB",0xC388],
+  ["BDEC",0xC38C],
+  ["BDED",0xC3C0],
+  ["BDEE",0xC3D8],
+  ["BDEF",0xC3D9],
+  ["BDF0",0xC3DC],
+  ["BDF1",0xC3DF],
+  ["BDF2",0xC3E0],
+  ["BDF3",0xC3E2],
+  ["BDF4",0xC3E8],
+  ["BDF5",0xC3E9],
+  ["BDF6",0xC3ED],
+  ["BDF7",0xC3F4],
+  ["BDF8",0xC3F5],
+  ["BDF9",0xC3F8],
+  ["BDFA",0xC408],
+  ["BDFB",0xC410],
+  ["BDFC",0xC424],
+  ["BDFD",0xC42C],
+  ["BDFE",0xC430],
+  ["BEA1",0xC434],
+  ["BEA2",0xC43C],
+  ["BEA3",0xC43D],
+  ["BEA4",0xC448],
+  ["BEA5",0xC464],
+  ["BEA6",0xC465],
+  ["BEA7",0xC468],
+  ["BEA8",0xC46C],
+  ["BEA9",0xC474],
+  ["BEAA",0xC475],
+  ["BEAB",0xC479],
+  ["BEAC",0xC480],
+  ["BEAD",0xC494],
+  ["BEAE",0xC49C],
+  ["BEAF",0xC4B8],
+  ["BEB0",0xC4BC],
+  ["BEB1",0xC4E9],
+  ["BEB2",0xC4F0],
+  ["BEB3",0xC4F1],
+  ["BEB4",0xC4F4],
+  ["BEB5",0xC4F8],
+  ["BEB6",0xC4FA],
+  ["BEB7",0xC4FF],
+  ["BEB8",0xC500],
+  ["BEB9",0xC501],
+  ["BEBA",0xC50C],
+  ["BEBB",0xC510],
+  ["BEBC",0xC514],
+  ["BEBD",0xC51C],
+  ["BEBE",0xC528],
+  ["BEBF",0xC529],
+  ["BEC0",0xC52C],
+  ["BEC1",0xC530],
+  ["BEC2",0xC538],
+  ["BEC3",0xC539],
+  ["BEC4",0xC53B],
+  ["BEC5",0xC53D],
+  ["BEC6",0xC544],
+  ["BEC7",0xC545],
+  ["BEC8",0xC548],
+  ["BEC9",0xC549],
+  ["BECA",0xC54A],
+  ["BECB",0xC54C],
+  ["BECC",0xC54D],
+  ["BECD",0xC54E],
+  ["BECE",0xC553],
+  ["BECF",0xC554],
+  ["BED0",0xC555],
+  ["BED1",0xC557],
+  ["BED2",0xC558],
+  ["BED3",0xC559],
+  ["BED4",0xC55D],
+  ["BED5",0xC55E],
+  ["BED6",0xC560],
+  ["BED7",0xC561],
+  ["BED8",0xC564],
+  ["BED9",0xC568],
+  ["BEDA",0xC570],
+  ["BEDB",0xC571],
+  ["BEDC",0xC573],
+  ["BEDD",0xC574],
+  ["BEDE",0xC575],
+  ["BEDF",0xC57C],
+  ["BEE0",0xC57D],
+  ["BEE1",0xC580],
+  ["BEE2",0xC584],
+  ["BEE3",0xC587],
+  ["BEE4",0xC58C],
+  ["BEE5",0xC58D],
+  ["BEE6",0xC58F],
+  ["BEE7",0xC591],
+  ["BEE8",0xC595],
+  ["BEE9",0xC597],
+  ["BEEA",0xC598],
+  ["BEEB",0xC59C],
+  ["BEEC",0xC5A0],
+  ["BEED",0xC5A9],
+  ["BEEE",0xC5B4],
+  ["BEEF",0xC5B5],
+  ["BEF0",0xC5B8],
+  ["BEF1",0xC5B9],
+  ["BEF2",0xC5BB],
+  ["BEF3",0xC5BC],
+  ["BEF4",0xC5BD],
+  ["BEF5",0xC5BE],
+  ["BEF6",0xC5C4],
+  ["BEF7",0xC5C5],
+  ["BEF8",0xC5C6],
+  ["BEF9",0xC5C7],
+  ["BEFA",0xC5C8],
+  ["BEFB",0xC5C9],
+  ["BEFC",0xC5CA],
+  ["BEFD",0xC5CC],
+  ["BEFE",0xC5CE],
+  ["BFA1",0xC5D0],
+  ["BFA2",0xC5D1],
+  ["BFA3",0xC5D4],
+  ["BFA4",0xC5D8],
+  ["BFA5",0xC5E0],
+  ["BFA6",0xC5E1],
+  ["BFA7",0xC5E3],
+  ["BFA8",0xC5E5],
+  ["BFA9",0xC5EC],
+  ["BFAA",0xC5ED],
+  ["BFAB",0xC5EE],
+  ["BFAC",0xC5F0],
+  ["BFAD",0xC5F4],
+  ["BFAE",0xC5F6],
+  ["BFAF",0xC5F7],
+  ["BFB0",0xC5FC],
+  ["BFB1",0xC5FD],
+  ["BFB2",0xC5FE],
+  ["BFB3",0xC5FF],
+  ["BFB4",0xC600],
+  ["BFB5",0xC601],
+  ["BFB6",0xC605],
+  ["BFB7",0xC606],
+  ["BFB8",0xC607],
+  ["BFB9",0xC608],
+  ["BFBA",0xC60C],
+  ["BFBB",0xC610],
+  ["BFBC",0xC618],
+  ["BFBD",0xC619],
+  ["BFBE",0xC61B],
+  ["BFBF",0xC61C],
+  ["BFC0",0xC624],
+  ["BFC1",0xC625],
+  ["BFC2",0xC628],
+  ["BFC3",0xC62C],
+  ["BFC4",0xC62D],
+  ["BFC5",0xC62E],
+  ["BFC6",0xC630],
+  ["BFC7",0xC633],
+  ["BFC8",0xC634],
+  ["BFC9",0xC635],
+  ["BFCA",0xC637],
+  ["BFCB",0xC639],
+  ["BFCC",0xC63B],
+  ["BFCD",0xC640],
+  ["BFCE",0xC641],
+  ["BFCF",0xC644],
+  ["BFD0",0xC648],
+  ["BFD1",0xC650],
+  ["BFD2",0xC651],
+  ["BFD3",0xC653],
+  ["BFD4",0xC654],
+  ["BFD5",0xC655],
+  ["BFD6",0xC65C],
+  ["BFD7",0xC65D],
+  ["BFD8",0xC660],
+  ["BFD9",0xC66C],
+  ["BFDA",0xC66F],
+  ["BFDB",0xC671],
+  ["BFDC",0xC678],
+  ["BFDD",0xC679],
+  ["BFDE",0xC67C],
+  ["BFDF",0xC680],
+  ["BFE0",0xC688],
+  ["BFE1",0xC689],
+  ["BFE2",0xC68B],
+  ["BFE3",0xC68D],
+  ["BFE4",0xC694],
+  ["BFE5",0xC695],
+  ["BFE6",0xC698],
+  ["BFE7",0xC69C],
+  ["BFE8",0xC6A4],
+  ["BFE9",0xC6A5],
+  ["BFEA",0xC6A7],
+  ["BFEB",0xC6A9],
+  ["BFEC",0xC6B0],
+  ["BFED",0xC6B1],
+  ["BFEE",0xC6B4],
+  ["BFEF",0xC6B8],
+  ["BFF0",0xC6B9],
+  ["BFF1",0xC6BA],
+  ["BFF2",0xC6C0],
+  ["BFF3",0xC6C1],
+  ["BFF4",0xC6C3],
+  ["BFF5",0xC6C5],
+  ["BFF6",0xC6CC],
+  ["BFF7",0xC6CD],
+  ["BFF8",0xC6D0],
+  ["BFF9",0xC6D4],
+  ["BFFA",0xC6DC],
+  ["BFFB",0xC6DD],
+  ["BFFC",0xC6E0],
+  ["BFFD",0xC6E1],
+  ["BFFE",0xC6E8],
+  ["C0A1",0xC6E9],
+  ["C0A2",0xC6EC],
+  ["C0A3",0xC6F0],
+  ["C0A4",0xC6F8],
+  ["C0A5",0xC6F9],
+  ["C0A6",0xC6FD],
+  ["C0A7",0xC704],
+  ["C0A8",0xC705],
+  ["C0A9",0xC708],
+  ["C0AA",0xC70C],
+  ["C0AB",0xC714],
+  ["C0AC",0xC715],
+  ["C0AD",0xC717],
+  ["C0AE",0xC719],
+  ["C0AF",0xC720],
+  ["C0B0",0xC721],
+  ["C0B1",0xC724],
+  ["C0B2",0xC728],
+  ["C0B3",0xC730],
+  ["C0B4",0xC731],
+  ["C0B5",0xC733],
+  ["C0B6",0xC735],
+  ["C0B7",0xC737],
+  ["C0B8",0xC73C],
+  ["C0B9",0xC73D],
+  ["C0BA",0xC740],
+  ["C0BB",0xC744],
+  ["C0BC",0xC74A],
+  ["C0BD",0xC74C],
+  ["C0BE",0xC74D],
+  ["C0BF",0xC74F],
+  ["C0C0",0xC751],
+  ["C0C1",0xC752],
+  ["C0C2",0xC753],
+  ["C0C3",0xC754],
+  ["C0C4",0xC755],
+  ["C0C5",0xC756],
+  ["C0C6",0xC757],
+  ["C0C7",0xC758],
+  ["C0C8",0xC75C],
+  ["C0C9",0xC760],
+  ["C0CA",0xC768],
+  ["C0CB",0xC76B],
+  ["C0CC",0xC774],
+  ["C0CD",0xC775],
+  ["C0CE",0xC778],
+  ["C0CF",0xC77C],
+  ["C0D0",0xC77D],
+  ["C0D1",0xC77E],
+  ["C0D2",0xC783],
+  ["C0D3",0xC784],
+  ["C0D4",0xC785],
+  ["C0D5",0xC787],
+  ["C0D6",0xC788],
+  ["C0D7",0xC789],
+  ["C0D8",0xC78A],
+  ["C0D9",0xC78E],
+  ["C0DA",0xC790],
+  ["C0DB",0xC791],
+  ["C0DC",0xC794],
+  ["C0DD",0xC796],
+  ["C0DE",0xC797],
+  ["C0DF",0xC798],
+  ["C0E0",0xC79A],
+  ["C0E1",0xC7A0],
+  ["C0E2",0xC7A1],
+  ["C0E3",0xC7A3],
+  ["C0E4",0xC7A4],
+  ["C0E5",0xC7A5],
+  ["C0E6",0xC7A6],
+  ["C0E7",0xC7AC],
+  ["C0E8",0xC7AD],
+  ["C0E9",0xC7B0],
+  ["C0EA",0xC7B4],
+  ["C0EB",0xC7BC],
+  ["C0EC",0xC7BD],
+  ["C0ED",0xC7BF],
+  ["C0EE",0xC7C0],
+  ["C0EF",0xC7C1],
+  ["C0F0",0xC7C8],
+  ["C0F1",0xC7C9],
+  ["C0F2",0xC7CC],
+  ["C0F3",0xC7CE],
+  ["C0F4",0xC7D0],
+  ["C0F5",0xC7D8],
+  ["C0F6",0xC7DD],
+  ["C0F7",0xC7E4],
+  ["C0F8",0xC7E8],
+  ["C0F9",0xC7EC],
+  ["C0FA",0xC800],
+  ["C0FB",0xC801],
+  ["C0FC",0xC804],
+  ["C0FD",0xC808],
+  ["C0FE",0xC80A],
+  ["C1A1",0xC810],
+  ["C1A2",0xC811],
+  ["C1A3",0xC813],
+  ["C1A4",0xC815],
+  ["C1A5",0xC816],
+  ["C1A6",0xC81C],
+  ["C1A7",0xC81D],
+  ["C1A8",0xC820],
+  ["C1A9",0xC824],
+  ["C1AA",0xC82C],
+  ["C1AB",0xC82D],
+  ["C1AC",0xC82F],
+  ["C1AD",0xC831],
+  ["C1AE",0xC838],
+  ["C1AF",0xC83C],
+  ["C1B0",0xC840],
+  ["C1B1",0xC848],
+  ["C1B2",0xC849],
+  ["C1B3",0xC84C],
+  ["C1B4",0xC84D],
+  ["C1B5",0xC854],
+  ["C1B6",0xC870],
+  ["C1B7",0xC871],
+  ["C1B8",0xC874],
+  ["C1B9",0xC878],
+  ["C1BA",0xC87A],
+  ["C1BB",0xC880],
+  ["C1BC",0xC881],
+  ["C1BD",0xC883],
+  ["C1BE",0xC885],
+  ["C1BF",0xC886],
+  ["C1C0",0xC887],
+  ["C1C1",0xC88B],
+  ["C1C2",0xC88C],
+  ["C1C3",0xC88D],
+  ["C1C4",0xC894],
+  ["C1C5",0xC89D],
+  ["C1C6",0xC89F],
+  ["C1C7",0xC8A1],
+  ["C1C8",0xC8A8],
+  ["C1C9",0xC8BC],
+  ["C1CA",0xC8BD],
+  ["C1CB",0xC8C4],
+  ["C1CC",0xC8C8],
+  ["C1CD",0xC8CC],
+  ["C1CE",0xC8D4],
+  ["C1CF",0xC8D5],
+  ["C1D0",0xC8D7],
+  ["C1D1",0xC8D9],
+  ["C1D2",0xC8E0],
+  ["C1D3",0xC8E1],
+  ["C1D4",0xC8E4],
+  ["C1D5",0xC8F5],
+  ["C1D6",0xC8FC],
+  ["C1D7",0xC8FD],
+  ["C1D8",0xC900],
+  ["C1D9",0xC904],
+  ["C1DA",0xC905],
+  ["C1DB",0xC906],
+  ["C1DC",0xC90C],
+  ["C1DD",0xC90D],
+  ["C1DE",0xC90F],
+  ["C1DF",0xC911],
+  ["C1E0",0xC918],
+  ["C1E1",0xC92C],
+  ["C1E2",0xC934],
+  ["C1E3",0xC950],
+  ["C1E4",0xC951],
+  ["C1E5",0xC954],
+  ["C1E6",0xC958],
+  ["C1E7",0xC960],
+  ["C1E8",0xC961],
+  ["C1E9",0xC963],
+  ["C1EA",0xC96C],
+  ["C1EB",0xC970],
+  ["C1EC",0xC974],
+  ["C1ED",0xC97C],
+  ["C1EE",0xC988],
+  ["C1EF",0xC989],
+  ["C1F0",0xC98C],
+  ["C1F1",0xC990],
+  ["C1F2",0xC998],
+  ["C1F3",0xC999],
+  ["C1F4",0xC99B],
+  ["C1F5",0xC99D],
+  ["C1F6",0xC9C0],
+  ["C1F7",0xC9C1],
+  ["C1F8",0xC9C4],
+  ["C1F9",0xC9C7],
+  ["C1FA",0xC9C8],
+  ["C1FB",0xC9CA],
+  ["C1FC",0xC9D0],
+  ["C1FD",0xC9D1],
+  ["C1FE",0xC9D3],
+  ["C2A1",0xC9D5],
+  ["C2A2",0xC9D6],
+  ["C2A3",0xC9D9],
+  ["C2A4",0xC9DA],
+  ["C2A5",0xC9DC],
+  ["C2A6",0xC9DD],
+  ["C2A7",0xC9E0],
+  ["C2A8",0xC9E2],
+  ["C2A9",0xC9E4],
+  ["C2AA",0xC9E7],
+  ["C2AB",0xC9EC],
+  ["C2AC",0xC9ED],
+  ["C2AD",0xC9EF],
+  ["C2AE",0xC9F0],
+  ["C2AF",0xC9F1],
+  ["C2B0",0xC9F8],
+  ["C2B1",0xC9F9],
+  ["C2B2",0xC9FC],
+  ["C2B3",0xCA00],
+  ["C2B4",0xCA08],
+  ["C2B5",0xCA09],
+  ["C2B6",0xCA0B],
+  ["C2B7",0xCA0C],
+  ["C2B8",0xCA0D],
+  ["C2B9",0xCA14],
+  ["C2BA",0xCA18],
+  ["C2BB",0xCA29],
+  ["C2BC",0xCA4C],
+  ["C2BD",0xCA4D],
+  ["C2BE",0xCA50],
+  ["C2BF",0xCA54],
+  ["C2C0",0xCA5C],
+  ["C2C1",0xCA5D],
+  ["C2C2",0xCA5F],
+  ["C2C3",0xCA60],
+  ["C2C4",0xCA61],
+  ["C2C5",0xCA68],
+  ["C2C6",0xCA7D],
+  ["C2C7",0xCA84],
+  ["C2C8",0xCA98],
+  ["C2C9",0xCABC],
+  ["C2CA",0xCABD],
+  ["C2CB",0xCAC0],
+  ["C2CC",0xCAC4],
+  ["C2CD",0xCACC],
+  ["C2CE",0xCACD],
+  ["C2CF",0xCACF],
+  ["C2D0",0xCAD1],
+  ["C2D1",0xCAD3],
+  ["C2D2",0xCAD8],
+  ["C2D3",0xCAD9],
+  ["C2D4",0xCAE0],
+  ["C2D5",0xCAEC],
+  ["C2D6",0xCAF4],
+  ["C2D7",0xCB08],
+  ["C2D8",0xCB10],
+  ["C2D9",0xCB14],
+  ["C2DA",0xCB18],
+  ["C2DB",0xCB20],
+  ["C2DC",0xCB21],
+  ["C2DD",0xCB41],
+  ["C2DE",0xCB48],
+  ["C2DF",0xCB49],
+  ["C2E0",0xCB4C],
+  ["C2E1",0xCB50],
+  ["C2E2",0xCB58],
+  ["C2E3",0xCB59],
+  ["C2E4",0xCB5D],
+  ["C2E5",0xCB64],
+  ["C2E6",0xCB78],
+  ["C2E7",0xCB79],
+  ["C2E8",0xCB9C],
+  ["C2E9",0xCBB8],
+  ["C2EA",0xCBD4],
+  ["C2EB",0xCBE4],
+  ["C2EC",0xCBE7],
+  ["C2ED",0xCBE9],
+  ["C2EE",0xCC0C],
+  ["C2EF",0xCC0D],
+  ["C2F0",0xCC10],
+  ["C2F1",0xCC14],
+  ["C2F2",0xCC1C],
+  ["C2F3",0xCC1D],
+  ["C2F4",0xCC21],
+  ["C2F5",0xCC22],
+  ["C2F6",0xCC27],
+  ["C2F7",0xCC28],
+  ["C2F8",0xCC29],
+  ["C2F9",0xCC2C],
+  ["C2FA",0xCC2E],
+  ["C2FB",0xCC30],
+  ["C2FC",0xCC38],
+  ["C2FD",0xCC39],
+  ["C2FE",0xCC3B],
+  ["C3A1",0xCC3C],
+  ["C3A2",0xCC3D],
+  ["C3A3",0xCC3E],
+  ["C3A4",0xCC44],
+  ["C3A5",0xCC45],
+  ["C3A6",0xCC48],
+  ["C3A7",0xCC4C],
+  ["C3A8",0xCC54],
+  ["C3A9",0xCC55],
+  ["C3AA",0xCC57],
+  ["C3AB",0xCC58],
+  ["C3AC",0xCC59],
+  ["C3AD",0xCC60],
+  ["C3AE",0xCC64],
+  ["C3AF",0xCC66],
+  ["C3B0",0xCC68],
+  ["C3B1",0xCC70],
+  ["C3B2",0xCC75],
+  ["C3B3",0xCC98],
+  ["C3B4",0xCC99],
+  ["C3B5",0xCC9C],
+  ["C3B6",0xCCA0],
+  ["C3B7",0xCCA8],
+  ["C3B8",0xCCA9],
+  ["C3B9",0xCCAB],
+  ["C3BA",0xCCAC],
+  ["C3BB",0xCCAD],
+  ["C3BC",0xCCB4],
+  ["C3BD",0xCCB5],
+  ["C3BE",0xCCB8],
+  ["C3BF",0xCCBC],
+  ["C3C0",0xCCC4],
+  ["C3C1",0xCCC5],
+  ["C3C2",0xCCC7],
+  ["C3C3",0xCCC9],
+  ["C3C4",0xCCD0],
+  ["C3C5",0xCCD4],
+  ["C3C6",0xCCE4],
+  ["C3C7",0xCCEC],
+  ["C3C8",0xCCF0],
+  ["C3C9",0xCD01],
+  ["C3CA",0xCD08],
+  ["C3CB",0xCD09],
+  ["C3CC",0xCD0C],
+  ["C3CD",0xCD10],
+  ["C3CE",0xCD18],
+  ["C3CF",0xCD19],
+  ["C3D0",0xCD1B],
+  ["C3D1",0xCD1D],
+  ["C3D2",0xCD24],
+  ["C3D3",0xCD28],
+  ["C3D4",0xCD2C],
+  ["C3D5",0xCD39],
+  ["C3D6",0xCD5C],
+  ["C3D7",0xCD60],
+  ["C3D8",0xCD64],
+  ["C3D9",0xCD6C],
+  ["C3DA",0xCD6D],
+  ["C3DB",0xCD6F],
+  ["C3DC",0xCD71],
+  ["C3DD",0xCD78],
+  ["C3DE",0xCD88],
+  ["C3DF",0xCD94],
+  ["C3E0",0xCD95],
+  ["C3E1",0xCD98],
+  ["C3E2",0xCD9C],
+  ["C3E3",0xCDA4],
+  ["C3E4",0xCDA5],
+  ["C3E5",0xCDA7],
+  ["C3E6",0xCDA9],
+  ["C3E7",0xCDB0],
+  ["C3E8",0xCDC4],
+  ["C3E9",0xCDCC],
+  ["C3EA",0xCDD0],
+  ["C3EB",0xCDE8],
+  ["C3EC",0xCDEC],
+  ["C3ED",0xCDF0],
+  ["C3EE",0xCDF8],
+  ["C3EF",0xCDF9],
+  ["C3F0",0xCDFB],
+  ["C3F1",0xCDFD],
+  ["C3F2",0xCE04],
+  ["C3F3",0xCE08],
+  ["C3F4",0xCE0C],
+  ["C3F5",0xCE14],
+  ["C3F6",0xCE19],
+  ["C3F7",0xCE20],
+  ["C3F8",0xCE21],
+  ["C3F9",0xCE24],
+  ["C3FA",0xCE28],
+  ["C3FB",0xCE30],
+  ["C3FC",0xCE31],
+  ["C3FD",0xCE33],
+  ["C3FE",0xCE35],
+  ["C4A1",0xCE58],
+  ["C4A2",0xCE59],
+  ["C4A3",0xCE5C],
+  ["C4A4",0xCE5F],
+  ["C4A5",0xCE60],
+  ["C4A6",0xCE61],
+  ["C4A7",0xCE68],
+  ["C4A8",0xCE69],
+  ["C4A9",0xCE6B],
+  ["C4AA",0xCE6D],
+  ["C4AB",0xCE74],
+  ["C4AC",0xCE75],
+  ["C4AD",0xCE78],
+  ["C4AE",0xCE7C],
+  ["C4AF",0xCE84],
+  ["C4B0",0xCE85],
+  ["C4B1",0xCE87],
+  ["C4B2",0xCE89],
+  ["C4B3",0xCE90],
+  ["C4B4",0xCE91],
+  ["C4B5",0xCE94],
+  ["C4B6",0xCE98],
+  ["C4B7",0xCEA0],
+  ["C4B8",0xCEA1],
+  ["C4B9",0xCEA3],
+  ["C4BA",0xCEA4],
+  ["C4BB",0xCEA5],
+  ["C4BC",0xCEAC],
+  ["C4BD",0xCEAD],
+  ["C4BE",0xCEC1],
+  ["C4BF",0xCEE4],
+  ["C4C0",0xCEE5],
+  ["C4C1",0xCEE8],
+  ["C4C2",0xCEEB],
+  ["C4C3",0xCEEC],
+  ["C4C4",0xCEF4],
+  ["C4C5",0xCEF5],
+  ["C4C6",0xCEF7],
+  ["C4C7",0xCEF8],
+  ["C4C8",0xCEF9],
+  ["C4C9",0xCF00],
+  ["C4CA",0xCF01],
+  ["C4CB",0xCF04],
+  ["C4CC",0xCF08],
+  ["C4CD",0xCF10],
+  ["C4CE",0xCF11],
+  ["C4CF",0xCF13],
+  ["C4D0",0xCF15],
+  ["C4D1",0xCF1C],
+  ["C4D2",0xCF20],
+  ["C4D3",0xCF24],
+  ["C4D4",0xCF2C],
+  ["C4D5",0xCF2D],
+  ["C4D6",0xCF2F],
+  ["C4D7",0xCF30],
+  ["C4D8",0xCF31],
+  ["C4D9",0xCF38],
+  ["C4DA",0xCF54],
+  ["C4DB",0xCF55],
+  ["C4DC",0xCF58],
+  ["C4DD",0xCF5C],
+  ["C4DE",0xCF64],
+  ["C4DF",0xCF65],
+  ["C4E0",0xCF67],
+  ["C4E1",0xCF69],
+  ["C4E2",0xCF70],
+  ["C4E3",0xCF71],
+  ["C4E4",0xCF74],
+  ["C4E5",0xCF78],
+  ["C4E6",0xCF80],
+  ["C4E7",0xCF85],
+  ["C4E8",0xCF8C],
+  ["C4E9",0xCFA1],
+  ["C4EA",0xCFA8],
+  ["C4EB",0xCFB0],
+  ["C4EC",0xCFC4],
+  ["C4ED",0xCFE0],
+  ["C4EE",0xCFE1],
+  ["C4EF",0xCFE4],
+  ["C4F0",0xCFE8],
+  ["C4F1",0xCFF0],
+  ["C4F2",0xCFF1],
+  ["C4F3",0xCFF3],
+  ["C4F4",0xCFF5],
+  ["C4F5",0xCFFC],
+  ["C4F6",0xD000],
+  ["C4F7",0xD004],
+  ["C4F8",0xD011],
+  ["C4F9",0xD018],
+  ["C4FA",0xD02D],
+  ["C4FB",0xD034],
+  ["C4FC",0xD035],
+  ["C4FD",0xD038],
+  ["C4FE",0xD03C],
+  ["C5A1",0xD044],
+  ["C5A2",0xD045],
+  ["C5A3",0xD047],
+  ["C5A4",0xD049],
+  ["C5A5",0xD050],
+  ["C5A6",0xD054],
+  ["C5A7",0xD058],
+  ["C5A8",0xD060],
+  ["C5A9",0xD06C],
+  ["C5AA",0xD06D],
+  ["C5AB",0xD070],
+  ["C5AC",0xD074],
+  ["C5AD",0xD07C],
+  ["C5AE",0xD07D],
+  ["C5AF",0xD081],
+  ["C5B0",0xD0A4],
+  ["C5B1",0xD0A5],
+  ["C5B2",0xD0A8],
+  ["C5B3",0xD0AC],
+  ["C5B4",0xD0B4],
+  ["C5B5",0xD0B5],
+  ["C5B6",0xD0B7],
+  ["C5B7",0xD0B9],
+  ["C5B8",0xD0C0],
+  ["C5B9",0xD0C1],
+  ["C5BA",0xD0C4],
+  ["C5BB",0xD0C8],
+  ["C5BC",0xD0C9],
+  ["C5BD",0xD0D0],
+  ["C5BE",0xD0D1],
+  ["C5BF",0xD0D3],
+  ["C5C0",0xD0D4],
+  ["C5C1",0xD0D5],
+  ["C5C2",0xD0DC],
+  ["C5C3",0xD0DD],
+  ["C5C4",0xD0E0],
+  ["C5C5",0xD0E4],
+  ["C5C6",0xD0EC],
+  ["C5C7",0xD0ED],
+  ["C5C8",0xD0EF],
+  ["C5C9",0xD0F0],
+  ["C5CA",0xD0F1],
+  ["C5CB",0xD0F8],
+  ["C5CC",0xD10D],
+  ["C5CD",0xD130],
+  ["C5CE",0xD131],
+  ["C5CF",0xD134],
+  ["C5D0",0xD138],
+  ["C5D1",0xD13A],
+  ["C5D2",0xD140],
+  ["C5D3",0xD141],
+  ["C5D4",0xD143],
+  ["C5D5",0xD144],
+  ["C5D6",0xD145],
+  ["C5D7",0xD14C],
+  ["C5D8",0xD14D],
+  ["C5D9",0xD150],
+  ["C5DA",0xD154],
+  ["C5DB",0xD15C],
+  ["C5DC",0xD15D],
+  ["C5DD",0xD15F],
+  ["C5DE",0xD161],
+  ["C5DF",0xD168],
+  ["C5E0",0xD16C],
+  ["C5E1",0xD17C],
+  ["C5E2",0xD184],
+  ["C5E3",0xD188],
+  ["C5E4",0xD1A0],
+  ["C5E5",0xD1A1],
+  ["C5E6",0xD1A4],
+  ["C5E7",0xD1A8],
+  ["C5E8",0xD1B0],
+  ["C5E9",0xD1B1],
+  ["C5EA",0xD1B3],
+  ["C5EB",0xD1B5],
+  ["C5EC",0xD1BA],
+  ["C5ED",0xD1BC],
+  ["C5EE",0xD1C0],
+  ["C5EF",0xD1D8],
+  ["C5F0",0xD1F4],
+  ["C5F1",0xD1F8],
+  ["C5F2",0xD207],
+  ["C5F3",0xD209],
+  ["C5F4",0xD210],
+  ["C5F5",0xD22C],
+  ["C5F6",0xD22D],
+  ["C5F7",0xD230],
+  ["C5F8",0xD234],
+  ["C5F9",0xD23C],
+  ["C5FA",0xD23D],
+  ["C5FB",0xD23F],
+  ["C5FC",0xD241],
+  ["C5FD",0xD248],
+  ["C5FE",0xD25C],
+  ["C6A1",0xD264],
+  ["C6A2",0xD280],
+  ["C6A3",0xD281],
+  ["C6A4",0xD284],
+  ["C6A5",0xD288],
+  ["C6A6",0xD290],
+  ["C6A7",0xD291],
+  ["C6A8",0xD295],
+  ["C6A9",0xD29C],
+  ["C6AA",0xD2A0],
+  ["C6AB",0xD2A4],
+  ["C6AC",0xD2AC],
+  ["C6AD",0xD2B1],
+  ["C6AE",0xD2B8],
+  ["C6AF",0xD2B9],
+  ["C6B0",0xD2BC],
+  ["C6B1",0xD2BF],
+  ["C6B2",0xD2C0],
+  ["C6B3",0xD2C2],
+  ["C6B4",0xD2C8],
+  ["C6B5",0xD2C9],
+  ["C6B6",0xD2CB],
+  ["C6B7",0xD2D4],
+  ["C6B8",0xD2D8],
+  ["C6B9",0xD2DC],
+  ["C6BA",0xD2E4],
+  ["C6BB",0xD2E5],
+  ["C6BC",0xD2F0],
+  ["C6BD",0xD2F1],
+  ["C6BE",0xD2F4],
+  ["C6BF",0xD2F8],
+  ["C6C0",0xD300],
+  ["C6C1",0xD301],
+  ["C6C2",0xD303],
+  ["C6C3",0xD305],
+  ["C6C4",0xD30C],
+  ["C6C5",0xD30D],
+  ["C6C6",0xD30E],
+  ["C6C7",0xD310],
+  ["C6C8",0xD314],
+  ["C6C9",0xD316],
+  ["C6CA",0xD31C],
+  ["C6CB",0xD31D],
+  ["C6CC",0xD31F],
+  ["C6CD",0xD320],
+  ["C6CE",0xD321],
+  ["C6CF",0xD325],
+  ["C6D0",0xD328],
+  ["C6D1",0xD329],
+  ["C6D2",0xD32C],
+  ["C6D3",0xD330],
+  ["C6D4",0xD338],
+  ["C6D5",0xD339],
+  ["C6D6",0xD33B],
+  ["C6D7",0xD33C],
+  ["C6D8",0xD33D],
+  ["C6D9",0xD344],
+  ["C6DA",0xD345],
+  ["C6DB",0xD37C],
+  ["C6DC",0xD37D],
+  ["C6DD",0xD380],
+  ["C6DE",0xD384],
+  ["C6DF",0xD38C],
+  ["C6E0",0xD38D],
+  ["C6E1",0xD38F],
+  ["C6E2",0xD390],
+  ["C6E3",0xD391],
+  ["C6E4",0xD398],
+  ["C6E5",0xD399],
+  ["C6E6",0xD39C],
+  ["C6E7",0xD3A0],
+  ["C6E8",0xD3A8],
+  ["C6E9",0xD3A9],
+  ["C6EA",0xD3AB],
+  ["C6EB",0xD3AD],
+  ["C6EC",0xD3B4],
+  ["C6ED",0xD3B8],
+  ["C6EE",0xD3BC],
+  ["C6EF",0xD3C4],
+  ["C6F0",0xD3C5],
+  ["C6F1",0xD3C8],
+  ["C6F2",0xD3C9],
+  ["C6F3",0xD3D0],
+  ["C6F4",0xD3D8],
+  ["C6F5",0xD3E1],
+  ["C6F6",0xD3E3],
+  ["C6F7",0xD3EC],
+  ["C6F8",0xD3ED],
+  ["C6F9",0xD3F0],
+  ["C6FA",0xD3F4],
+  ["C6FB",0xD3FC],
+  ["C6FC",0xD3FD],
+  ["C6FD",0xD3FF],
+  ["C6FE",0xD401],
+  ["C7A1",0xD408],
+  ["C7A2",0xD41D],
+  ["C7A3",0xD440],
+  ["C7A4",0xD444],
+  ["C7A5",0xD45C],
+  ["C7A6",0xD460],
+  ["C7A7",0xD464],
+  ["C7A8",0xD46D],
+  ["C7A9",0xD46F],
+  ["C7AA",0xD478],
+  ["C7AB",0xD479],
+  ["C7AC",0xD47C],
+  ["C7AD",0xD47F],
+  ["C7AE",0xD480],
+  ["C7AF",0xD482],
+  ["C7B0",0xD488],
+  ["C7B1",0xD489],
+  ["C7B2",0xD48B],
+  ["C7B3",0xD48D],
+  ["C7B4",0xD494],
+  ["C7B5",0xD4A9],
+  ["C7B6",0xD4CC],
+  ["C7B7",0xD4D0],
+  ["C7B8",0xD4D4],
+  ["C7B9",0xD4DC],
+  ["C7BA",0xD4DF],
+  ["C7BB",0xD4E8],
+  ["C7BC",0xD4EC],
+  ["C7BD",0xD4F0],
+  ["C7BE",0xD4F8],
+  ["C7BF",0xD4FB],
+  ["C7C0",0xD4FD],
+  ["C7C1",0xD504],
+  ["C7C2",0xD508],
+  ["C7C3",0xD50C],
+  ["C7C4",0xD514],
+  ["C7C5",0xD515],
+  ["C7C6",0xD517],
+  ["C7C7",0xD53C],
+  ["C7C8",0xD53D],
+  ["C7C9",0xD540],
+  ["C7CA",0xD544],
+  ["C7CB",0xD54C],
+  ["C7CC",0xD54D],
+  ["C7CD",0xD54F],
+  ["C7CE",0xD551],
+  ["C7CF",0xD558],
+  ["C7D0",0xD559],
+  ["C7D1",0xD55C],
+  ["C7D2",0xD560],
+  ["C7D3",0xD565],
+  ["C7D4",0xD568],
+  ["C7D5",0xD569],
+  ["C7D6",0xD56B],
+  ["C7D7",0xD56D],
+  ["C7D8",0xD574],
+  ["C7D9",0xD575],
+  ["C7DA",0xD578],
+  ["C7DB",0xD57C],
+  ["C7DC",0xD584],
+  ["C7DD",0xD585],
+  ["C7DE",0xD587],
+  ["C7DF",0xD588],
+  ["C7E0",0xD589],
+  ["C7E1",0xD590],
+  ["C7E2",0xD5A5],
+  ["C7E3",0xD5C8],
+  ["C7E4",0xD5C9],
+  ["C7E5",0xD5CC],
+  ["C7E6",0xD5D0],
+  ["C7E7",0xD5D2],
+  ["C7E8",0xD5D8],
+  ["C7E9",0xD5D9],
+  ["C7EA",0xD5DB],
+  ["C7EB",0xD5DD],
+  ["C7EC",0xD5E4],
+  ["C7ED",0xD5E5],
+  ["C7EE",0xD5E8],
+  ["C7EF",0xD5EC],
+  ["C7F0",0xD5F4],
+  ["C7F1",0xD5F5],
+  ["C7F2",0xD5F7],
+  ["C7F3",0xD5F9],
+  ["C7F4",0xD600],
+  ["C7F5",0xD601],
+  ["C7F6",0xD604],
+  ["C7F7",0xD608],
+  ["C7F8",0xD610],
+  ["C7F9",0xD611],
+  ["C7FA",0xD613],
+  ["C7FB",0xD614],
+  ["C7FC",0xD615],
+  ["C7FD",0xD61C],
+  ["C7FE",0xD620],
+  ["C8A1",0xD624],
+  ["C8A2",0xD62D],
+  ["C8A3",0xD638],
+  ["C8A4",0xD639],
+  ["C8A5",0xD63C],
+  ["C8A6",0xD640],
+  ["C8A7",0xD645],
+  ["C8A8",0xD648],
+  ["C8A9",0xD649],
+  ["C8AA",0xD64B],
+  ["C8AB",0xD64D],
+  ["C8AC",0xD651],
+  ["C8AD",0xD654],
+  ["C8AE",0xD655],
+  ["C8AF",0xD658],
+  ["C8B0",0xD65C],
+  ["C8B1",0xD667],
+  ["C8B2",0xD669],
+  ["C8B3",0xD670],
+  ["C8B4",0xD671],
+  ["C8B5",0xD674],
+  ["C8B6",0xD683],
+  ["C8B7",0xD685],
+  ["C8B8",0xD68C],
+  ["C8B9",0xD68D],
+  ["C8BA",0xD690],
+  ["C8BB",0xD694],
+  ["C8BC",0xD69D],
+  ["C8BD",0xD69F],
+  ["C8BE",0xD6A1],
+  ["C8BF",0xD6A8],
+  ["C8C0",0xD6AC],
+  ["C8C1",0xD6B0],
+  ["C8C2",0xD6B9],
+  ["C8C3",0xD6BB],
+  ["C8C4",0xD6C4],
+  ["C8C5",0xD6C5],
+  ["C8C6",0xD6C8],
+  ["C8C7",0xD6CC],
+  ["C8C8",0xD6D1],
+  ["C8C9",0xD6D4],
+  ["C8CA",0xD6D7],
+  ["C8CB",0xD6D9],
+  ["C8CC",0xD6E0],
+  ["C8CD",0xD6E4],
+  ["C8CE",0xD6E8],
+  ["C8CF",0xD6F0],
+  ["C8D0",0xD6F5],
+  ["C8D1",0xD6FC],
+  ["C8D2",0xD6FD],
+  ["C8D3",0xD700],
+  ["C8D4",0xD704],
+  ["C8D5",0xD711],
+  ["C8D6",0xD718],
+  ["C8D7",0xD719],
+  ["C8D8",0xD71C],
+  ["C8D9",0xD720],
+  ["C8DA",0xD728],
+  ["C8DB",0xD729],
+  ["C8DC",0xD72B],
+  ["C8DD",0xD72D],
+  ["C8DE",0xD734],
+  ["C8DF",0xD735],
+  ["C8E0",0xD738],
+  ["C8E1",0xD73C],
+  ["C8E2",0xD744],
+  ["C8E3",0xD747],
+  ["C8E4",0xD749],
+  ["C8E5",0xD750],
+  ["C8E6",0xD751],
+  ["C8E7",0xD754],
+  ["C8E8",0xD756],
+  ["C8E9",0xD757],
+  ["C8EA",0xD758],
+  ["C8EB",0xD759],
+  ["C8EC",0xD760],
+  ["C8ED",0xD761],
+  ["C8EE",0xD763],
+  ["C8EF",0xD765],
+  ["C8F0",0xD769],
+  ["C8F1",0xD76C],
+  ["C8F2",0xD770],
+  ["C8F3",0xD774],
+  ["C8F4",0xD77C],
+  ["C8F5",0xD77D],
+  ["C8F6",0xD781],
+  ["C8F7",0xD788],
+  ["C8F8",0xD789],
+  ["C8F9",0xD78C],
+  ["C8FA",0xD790],
+  ["C8FB",0xD798],
+  ["C8FC",0xD799],
+  ["C8FD",0xD79B],
+  ["C8FE",0xD79D],
+  ["CAA1",0x4F3D],
+  ["CAA2",0x4F73],
+  ["CAA3",0x5047],
+  ["CAA4",0x50F9],
+  ["CAA5",0x52A0],
+  ["CAA6",0x53EF],
+  ["CAA7",0x5475],
+  ["CAA8",0x54E5],
+  ["CAA9",0x5609],
+  ["CAAA",0x5AC1],
+  ["CAAB",0x5BB6],
+  ["CAAC",0x6687],
+  ["CAAD",0x67B6],
+  ["CAAE",0x67B7],
+  ["CAAF",0x67EF],
+  ["CAB0",0x6B4C],
+  ["CAB1",0x73C2],
+  ["CAB2",0x75C2],
+  ["CAB3",0x7A3C],
+  ["CAB4",0x82DB],
+  ["CAB5",0x8304],
+  ["CAB6",0x8857],
+  ["CAB7",0x8888],
+  ["CAB8",0x8A36],
+  ["CAB9",0x8CC8],
+  ["CABA",0x8DCF],
+  ["CABB",0x8EFB],
+  ["CABC",0x8FE6],
+  ["CABD",0x99D5],
+  ["CABE",0x523B],
+  ["CABF",0x5374],
+  ["CAC0",0x5404],
+  ["CAC1",0x606A],
+  ["CAC2",0x6164],
+  ["CAC3",0x6BBC],
+  ["CAC4",0x73CF],
+  ["CAC5",0x811A],
+  ["CAC6",0x89BA],
+  ["CAC7",0x89D2],
+  ["CAC8",0x95A3],
+  ["CAC9",0x4F83],
+  ["CACA",0x520A],
+  ["CACB",0x58BE],
+  ["CACC",0x5978],
+  ["CACD",0x59E6],
+  ["CACE",0x5E72],
+  ["CACF",0x5E79],
+  ["CAD0",0x61C7],
+  ["CAD1",0x63C0],
+  ["CAD2",0x6746],
+  ["CAD3",0x67EC],
+  ["CAD4",0x687F],
+  ["CAD5",0x6F97],
+  ["CAD6",0x764E],
+  ["CAD7",0x770B],
+  ["CAD8",0x78F5],
+  ["CAD9",0x7A08],
+  ["CADA",0x7AFF],
+  ["CADB",0x7C21],
+  ["CADC",0x809D],
+  ["CADD",0x826E],
+  ["CADE",0x8271],
+  ["CADF",0x8AEB],
+  ["CAE0",0x9593],
+  ["CAE1",0x4E6B],
+  ["CAE2",0x559D],
+  ["CAE3",0x66F7],
+  ["CAE4",0x6E34],
+  ["CAE5",0x78A3],
+  ["CAE6",0x7AED],
+  ["CAE7",0x845B],
+  ["CAE8",0x8910],
+  ["CAE9",0x874E],
+  ["CAEA",0x97A8],
+  ["CAEB",0x52D8],
+  ["CAEC",0x574E],
+  ["CAED",0x582A],
+  ["CAEE",0x5D4C],
+  ["CAEF",0x611F],
+  ["CAF0",0x61BE],
+  ["CAF1",0x6221],
+  ["CAF2",0x6562],
+  ["CAF3",0x67D1],
+  ["CAF4",0x6A44],
+  ["CAF5",0x6E1B],
+  ["CAF6",0x7518],
+  ["CAF7",0x75B3],
+  ["CAF8",0x76E3],
+  ["CAF9",0x77B0],
+  ["CAFA",0x7D3A],
+  ["CAFB",0x90AF],
+  ["CAFC",0x9451],
+  ["CAFD",0x9452],
+  ["CAFE",0x9F95],
+  ["CBA1",0x5323],
+  ["CBA2",0x5CAC],
+  ["CBA3",0x7532],
+  ["CBA4",0x80DB],
+  ["CBA5",0x9240],
+  ["CBA6",0x9598],
+  ["CBA7",0x525B],
+  ["CBA8",0x5808],
+  ["CBA9",0x59DC],
+  ["CBAA",0x5CA1],
+  ["CBAB",0x5D17],
+  ["CBAC",0x5EB7],
+  ["CBAD",0x5F3A],
+  ["CBAE",0x5F4A],
+  ["CBAF",0x6177],
+  ["CBB0",0x6C5F],
+  ["CBB1",0x757A],
+  ["CBB2",0x7586],
+  ["CBB3",0x7CE0],
+  ["CBB4",0x7D73],
+  ["CBB5",0x7DB1],
+  ["CBB6",0x7F8C],
+  ["CBB7",0x8154],
+  ["CBB8",0x8221],
+  ["CBB9",0x8591],
+  ["CBBA",0x8941],
+  ["CBBB",0x8B1B],
+  ["CBBC",0x92FC],
+  ["CBBD",0x964D],
+  ["CBBE",0x9C47],
+  ["CBBF",0x4ECB],
+  ["CBC0",0x4EF7],
+  ["CBC1",0x500B],
+  ["CBC2",0x51F1],
+  ["CBC3",0x584F],
+  ["CBC4",0x6137],
+  ["CBC5",0x613E],
+  ["CBC6",0x6168],
+  ["CBC7",0x6539],
+  ["CBC8",0x69EA],
+  ["CBC9",0x6F11],
+  ["CBCA",0x75A5],
+  ["CBCB",0x7686],
+  ["CBCC",0x76D6],
+  ["CBCD",0x7B87],
+  ["CBCE",0x82A5],
+  ["CBCF",0x84CB],
+  ["CBD0",0xF900],
+  ["CBD1",0x93A7],
+  ["CBD2",0x958B],
+  ["CBD3",0x5580],
+  ["CBD4",0x5BA2],
+  ["CBD5",0x5751],
+  ["CBD6",0xF901],
+  ["CBD7",0x7CB3],
+  ["CBD8",0x7FB9],
+  ["CBD9",0x91B5],
+  ["CBDA",0x5028],
+  ["CBDB",0x53BB],
+  ["CBDC",0x5C45],
+  ["CBDD",0x5DE8],
+  ["CBDE",0x62D2],
+  ["CBDF",0x636E],
+  ["CBE0",0x64DA],
+  ["CBE1",0x64E7],
+  ["CBE2",0x6E20],
+  ["CBE3",0x70AC],
+  ["CBE4",0x795B],
+  ["CBE5",0x8DDD],
+  ["CBE6",0x8E1E],
+  ["CBE7",0xF902],
+  ["CBE8",0x907D],
+  ["CBE9",0x9245],
+  ["CBEA",0x92F8],
+  ["CBEB",0x4E7E],
+  ["CBEC",0x4EF6],
+  ["CBED",0x5065],
+  ["CBEE",0x5DFE],
+  ["CBEF",0x5EFA],
+  ["CBF0",0x6106],
+  ["CBF1",0x6957],
+  ["CBF2",0x8171],
+  ["CBF3",0x8654],
+  ["CBF4",0x8E47],
+  ["CBF5",0x9375],
+  ["CBF6",0x9A2B],
+  ["CBF7",0x4E5E],
+  ["CBF8",0x5091],
+  ["CBF9",0x6770],
+  ["CBFA",0x6840],
+  ["CBFB",0x5109],
+  ["CBFC",0x528D],
+  ["CBFD",0x5292],
+  ["CBFE",0x6AA2],
+  ["CCA1",0x77BC],
+  ["CCA2",0x9210],
+  ["CCA3",0x9ED4],
+  ["CCA4",0x52AB],
+  ["CCA5",0x602F],
+  ["CCA6",0x8FF2],
+  ["CCA7",0x5048],
+  ["CCA8",0x61A9],
+  ["CCA9",0x63ED],
+  ["CCAA",0x64CA],
+  ["CCAB",0x683C],
+  ["CCAC",0x6A84],
+  ["CCAD",0x6FC0],
+  ["CCAE",0x8188],
+  ["CCAF",0x89A1],
+  ["CCB0",0x9694],
+  ["CCB1",0x5805],
+  ["CCB2",0x727D],
+  ["CCB3",0x72AC],
+  ["CCB4",0x7504],
+  ["CCB5",0x7D79],
+  ["CCB6",0x7E6D],
+  ["CCB7",0x80A9],
+  ["CCB8",0x898B],
+  ["CCB9",0x8B74],
+  ["CCBA",0x9063],
+  ["CCBB",0x9D51],
+  ["CCBC",0x6289],
+  ["CCBD",0x6C7A],
+  ["CCBE",0x6F54],
+  ["CCBF",0x7D50],
+  ["CCC0",0x7F3A],
+  ["CCC1",0x8A23],
+  ["CCC2",0x517C],
+  ["CCC3",0x614A],
+  ["CCC4",0x7B9D],
+  ["CCC5",0x8B19],
+  ["CCC6",0x9257],
+  ["CCC7",0x938C],
+  ["CCC8",0x4EAC],
+  ["CCC9",0x4FD3],
+  ["CCCA",0x501E],
+  ["CCCB",0x50BE],
+  ["CCCC",0x5106],
+  ["CCCD",0x52C1],
+  ["CCCE",0x52CD],
+  ["CCCF",0x537F],
+  ["CCD0",0x5770],
+  ["CCD1",0x5883],
+  ["CCD2",0x5E9A],
+  ["CCD3",0x5F91],
+  ["CCD4",0x6176],
+  ["CCD5",0x61AC],
+  ["CCD6",0x64CE],
+  ["CCD7",0x656C],
+  ["CCD8",0x666F],
+  ["CCD9",0x66BB],
+  ["CCDA",0x66F4],
+  ["CCDB",0x6897],
+  ["CCDC",0x6D87],
+  ["CCDD",0x7085],
+  ["CCDE",0x70F1],
+  ["CCDF",0x749F],
+  ["CCE0",0x74A5],
+  ["CCE1",0x74CA],
+  ["CCE2",0x75D9],
+  ["CCE3",0x786C],
+  ["CCE4",0x78EC],
+  ["CCE5",0x7ADF],
+  ["CCE6",0x7AF6],
+  ["CCE7",0x7D45],
+  ["CCE8",0x7D93],
+  ["CCE9",0x8015],
+  ["CCEA",0x803F],
+  ["CCEB",0x811B],
+  ["CCEC",0x8396],
+  ["CCED",0x8B66],
+  ["CCEE",0x8F15],
+  ["CCEF",0x9015],
+  ["CCF0",0x93E1],
+  ["CCF1",0x9803],
+  ["CCF2",0x9838],
+  ["CCF3",0x9A5A],
+  ["CCF4",0x9BE8],
+  ["CCF5",0x4FC2],
+  ["CCF6",0x5553],
+  ["CCF7",0x583A],
+  ["CCF8",0x5951],
+  ["CCF9",0x5B63],
+  ["CCFA",0x5C46],
+  ["CCFB",0x60B8],
+  ["CCFC",0x6212],
+  ["CCFD",0x6842],
+  ["CCFE",0x68B0],
+  ["CDA1",0x68E8],
+  ["CDA2",0x6EAA],
+  ["CDA3",0x754C],
+  ["CDA4",0x7678],
+  ["CDA5",0x78CE],
+  ["CDA6",0x7A3D],
+  ["CDA7",0x7CFB],
+  ["CDA8",0x7E6B],
+  ["CDA9",0x7E7C],
+  ["CDAA",0x8A08],
+  ["CDAB",0x8AA1],
+  ["CDAC",0x8C3F],
+  ["CDAD",0x968E],
+  ["CDAE",0x9DC4],
+  ["CDAF",0x53E4],
+  ["CDB0",0x53E9],
+  ["CDB1",0x544A],
+  ["CDB2",0x5471],
+  ["CDB3",0x56FA],
+  ["CDB4",0x59D1],
+  ["CDB5",0x5B64],
+  ["CDB6",0x5C3B],
+  ["CDB7",0x5EAB],
+  ["CDB8",0x62F7],
+  ["CDB9",0x6537],
+  ["CDBA",0x6545],
+  ["CDBB",0x6572],
+  ["CDBC",0x66A0],
+  ["CDBD",0x67AF],
+  ["CDBE",0x69C1],
+  ["CDBF",0x6CBD],
+  ["CDC0",0x75FC],
+  ["CDC1",0x7690],
+  ["CDC2",0x777E],
+  ["CDC3",0x7A3F],
+  ["CDC4",0x7F94],
+  ["CDC5",0x8003],
+  ["CDC6",0x80A1],
+  ["CDC7",0x818F],
+  ["CDC8",0x82E6],
+  ["CDC9",0x82FD],
+  ["CDCA",0x83F0],
+  ["CDCB",0x85C1],
+  ["CDCC",0x8831],
+  ["CDCD",0x88B4],
+  ["CDCE",0x8AA5],
+  ["CDCF",0xF903],
+  ["CDD0",0x8F9C],
+  ["CDD1",0x932E],
+  ["CDD2",0x96C7],
+  ["CDD3",0x9867],
+  ["CDD4",0x9AD8],
+  ["CDD5",0x9F13],
+  ["CDD6",0x54ED],
+  ["CDD7",0x659B],
+  ["CDD8",0x66F2],
+  ["CDD9",0x688F],
+  ["CDDA",0x7A40],
+  ["CDDB",0x8C37],
+  ["CDDC",0x9D60],
+  ["CDDD",0x56F0],
+  ["CDDE",0x5764],
+  ["CDDF",0x5D11],
+  ["CDE0",0x6606],
+  ["CDE1",0x68B1],
+  ["CDE2",0x68CD],
+  ["CDE3",0x6EFE],
+  ["CDE4",0x7428],
+  ["CDE5",0x889E],
+  ["CDE6",0x9BE4],
+  ["CDE7",0x6C68],
+  ["CDE8",0xF904],
+  ["CDE9",0x9AA8],
+  ["CDEA",0x4F9B],
+  ["CDEB",0x516C],
+  ["CDEC",0x5171],
+  ["CDED",0x529F],
+  ["CDEE",0x5B54],
+  ["CDEF",0x5DE5],
+  ["CDF0",0x6050],
+  ["CDF1",0x606D],
+  ["CDF2",0x62F1],
+  ["CDF3",0x63A7],
+  ["CDF4",0x653B],
+  ["CDF5",0x73D9],
+  ["CDF6",0x7A7A],
+  ["CDF7",0x86A3],
+  ["CDF8",0x8CA2],
+  ["CDF9",0x978F],
+  ["CDFA",0x4E32],
+  ["CDFB",0x5BE1],
+  ["CDFC",0x6208],
+  ["CDFD",0x679C],
+  ["CDFE",0x74DC],
+  ["CEA1",0x79D1],
+  ["CEA2",0x83D3],
+  ["CEA3",0x8A87],
+  ["CEA4",0x8AB2],
+  ["CEA5",0x8DE8],
+  ["CEA6",0x904E],
+  ["CEA7",0x934B],
+  ["CEA8",0x9846],
+  ["CEA9",0x5ED3],
+  ["CEAA",0x69E8],
+  ["CEAB",0x85FF],
+  ["CEAC",0x90ED],
+  ["CEAD",0xF905],
+  ["CEAE",0x51A0],
+  ["CEAF",0x5B98],
+  ["CEB0",0x5BEC],
+  ["CEB1",0x6163],
+  ["CEB2",0x68FA],
+  ["CEB3",0x6B3E],
+  ["CEB4",0x704C],
+  ["CEB5",0x742F],
+  ["CEB6",0x74D8],
+  ["CEB7",0x7BA1],
+  ["CEB8",0x7F50],
+  ["CEB9",0x83C5],
+  ["CEBA",0x89C0],
+  ["CEBB",0x8CAB],
+  ["CEBC",0x95DC],
+  ["CEBD",0x9928],
+  ["CEBE",0x522E],
+  ["CEBF",0x605D],
+  ["CEC0",0x62EC],
+  ["CEC1",0x9002],
+  ["CEC2",0x4F8A],
+  ["CEC3",0x5149],
+  ["CEC4",0x5321],
+  ["CEC5",0x58D9],
+  ["CEC6",0x5EE3],
+  ["CEC7",0x66E0],
+  ["CEC8",0x6D38],
+  ["CEC9",0x709A],
+  ["CECA",0x72C2],
+  ["CECB",0x73D6],
+  ["CECC",0x7B50],
+  ["CECD",0x80F1],
+  ["CECE",0x945B],
+  ["CECF",0x5366],
+  ["CED0",0x639B],
+  ["CED1",0x7F6B],
+  ["CED2",0x4E56],
+  ["CED3",0x5080],
+  ["CED4",0x584A],
+  ["CED5",0x58DE],
+  ["CED6",0x602A],
+  ["CED7",0x6127],
+  ["CED8",0x62D0],
+  ["CED9",0x69D0],
+  ["CEDA",0x9B41],
+  ["CEDB",0x5B8F],
+  ["CEDC",0x7D18],
+  ["CEDD",0x80B1],
+  ["CEDE",0x8F5F],
+  ["CEDF",0x4EA4],
+  ["CEE0",0x50D1],
+  ["CEE1",0x54AC],
+  ["CEE2",0x55AC],
+  ["CEE3",0x5B0C],
+  ["CEE4",0x5DA0],
+  ["CEE5",0x5DE7],
+  ["CEE6",0x652A],
+  ["CEE7",0x654E],
+  ["CEE8",0x6821],
+  ["CEE9",0x6A4B],
+  ["CEEA",0x72E1],
+  ["CEEB",0x768E],
+  ["CEEC",0x77EF],
+  ["CEED",0x7D5E],
+  ["CEEE",0x7FF9],
+  ["CEEF",0x81A0],
+  ["CEF0",0x854E],
+  ["CEF1",0x86DF],
+  ["CEF2",0x8F03],
+  ["CEF3",0x8F4E],
+  ["CEF4",0x90CA],
+  ["CEF5",0x9903],
+  ["CEF6",0x9A55],
+  ["CEF7",0x9BAB],
+  ["CEF8",0x4E18],
+  ["CEF9",0x4E45],
+  ["CEFA",0x4E5D],
+  ["CEFB",0x4EC7],
+  ["CEFC",0x4FF1],
+  ["CEFD",0x5177],
+  ["CEFE",0x52FE],
+  ["CFA1",0x5340],
+  ["CFA2",0x53E3],
+  ["CFA3",0x53E5],
+  ["CFA4",0x548E],
+  ["CFA5",0x5614],
+  ["CFA6",0x5775],
+  ["CFA7",0x57A2],
+  ["CFA8",0x5BC7],
+  ["CFA9",0x5D87],
+  ["CFAA",0x5ED0],
+  ["CFAB",0x61FC],
+  ["CFAC",0x62D8],
+  ["CFAD",0x6551],
+  ["CFAE",0x67B8],
+  ["CFAF",0x67E9],
+  ["CFB0",0x69CB],
+  ["CFB1",0x6B50],
+  ["CFB2",0x6BC6],
+  ["CFB3",0x6BEC],
+  ["CFB4",0x6C42],
+  ["CFB5",0x6E9D],
+  ["CFB6",0x7078],
+  ["CFB7",0x72D7],
+  ["CFB8",0x7396],
+  ["CFB9",0x7403],
+  ["CFBA",0x77BF],
+  ["CFBB",0x77E9],
+  ["CFBC",0x7A76],
+  ["CFBD",0x7D7F],
+  ["CFBE",0x8009],
+  ["CFBF",0x81FC],
+  ["CFC0",0x8205],
+  ["CFC1",0x820A],
+  ["CFC2",0x82DF],
+  ["CFC3",0x8862],
+  ["CFC4",0x8B33],
+  ["CFC5",0x8CFC],
+  ["CFC6",0x8EC0],
+  ["CFC7",0x9011],
+  ["CFC8",0x90B1],
+  ["CFC9",0x9264],
+  ["CFCA",0x92B6],
+  ["CFCB",0x99D2],
+  ["CFCC",0x9A45],
+  ["CFCD",0x9CE9],
+  ["CFCE",0x9DD7],
+  ["CFCF",0x9F9C],
+  ["CFD0",0x570B],
+  ["CFD1",0x5C40],
+  ["CFD2",0x83CA],
+  ["CFD3",0x97A0],
+  ["CFD4",0x97AB],
+  ["CFD5",0x9EB4],
+  ["CFD6",0x541B],
+  ["CFD7",0x7A98],
+  ["CFD8",0x7FA4],
+  ["CFD9",0x88D9],
+  ["CFDA",0x8ECD],
+  ["CFDB",0x90E1],
+  ["CFDC",0x5800],
+  ["CFDD",0x5C48],
+  ["CFDE",0x6398],
+  ["CFDF",0x7A9F],
+  ["CFE0",0x5BAE],
+  ["CFE1",0x5F13],
+  ["CFE2",0x7A79],
+  ["CFE3",0x7AAE],
+  ["CFE4",0x828E],
+  ["CFE5",0x8EAC],
+  ["CFE6",0x5026],
+  ["CFE7",0x5238],
+  ["CFE8",0x52F8],
+  ["CFE9",0x5377],
+  ["CFEA",0x5708],
+  ["CFEB",0x62F3],
+  ["CFEC",0x6372],
+  ["CFED",0x6B0A],
+  ["CFEE",0x6DC3],
+  ["CFEF",0x7737],
+  ["CFF0",0x53A5],
+  ["CFF1",0x7357],
+  ["CFF2",0x8568],
+  ["CFF3",0x8E76],
+  ["CFF4",0x95D5],
+  ["CFF5",0x673A],
+  ["CFF6",0x6AC3],
+  ["CFF7",0x6F70],
+  ["CFF8",0x8A6D],
+  ["CFF9",0x8ECC],
+  ["CFFA",0x994B],
+  ["CFFB",0xF906],
+  ["CFFC",0x6677],
+  ["CFFD",0x6B78],
+  ["CFFE",0x8CB4],
+  ["D0A1",0x9B3C],
+  ["D0A2",0xF907],
+  ["D0A3",0x53EB],
+  ["D0A4",0x572D],
+  ["D0A5",0x594E],
+  ["D0A6",0x63C6],
+  ["D0A7",0x69FB],
+  ["D0A8",0x73EA],
+  ["D0A9",0x7845],
+  ["D0AA",0x7ABA],
+  ["D0AB",0x7AC5],
+  ["D0AC",0x7CFE],
+  ["D0AD",0x8475],
+  ["D0AE",0x898F],
+  ["D0AF",0x8D73],
+  ["D0B0",0x9035],
+  ["D0B1",0x95A8],
+  ["D0B2",0x52FB],
+  ["D0B3",0x5747],
+  ["D0B4",0x7547],
+  ["D0B5",0x7B60],
+  ["D0B6",0x83CC],
+  ["D0B7",0x921E],
+  ["D0B8",0xF908],
+  ["D0B9",0x6A58],
+  ["D0BA",0x514B],
+  ["D0BB",0x524B],
+  ["D0BC",0x5287],
+  ["D0BD",0x621F],
+  ["D0BE",0x68D8],
+  ["D0BF",0x6975],
+  ["D0C0",0x9699],
+  ["D0C1",0x50C5],
+  ["D0C2",0x52A4],
+  ["D0C3",0x52E4],
+  ["D0C4",0x61C3],
+  ["D0C5",0x65A4],
+  ["D0C6",0x6839],
+  ["D0C7",0x69FF],
+  ["D0C8",0x747E],
+  ["D0C9",0x7B4B],
+  ["D0CA",0x82B9],
+  ["D0CB",0x83EB],
+  ["D0CC",0x89B2],
+  ["D0CD",0x8B39],
+  ["D0CE",0x8FD1],
+  ["D0CF",0x9949],
+  ["D0D0",0xF909],
+  ["D0D1",0x4ECA],
+  ["D0D2",0x5997],
+  ["D0D3",0x64D2],
+  ["D0D4",0x6611],
+  ["D0D5",0x6A8E],
+  ["D0D6",0x7434],
+  ["D0D7",0x7981],
+  ["D0D8",0x79BD],
+  ["D0D9",0x82A9],
+  ["D0DA",0x887E],
+  ["D0DB",0x887F],
+  ["D0DC",0x895F],
+  ["D0DD",0xF90A],
+  ["D0DE",0x9326],
+  ["D0DF",0x4F0B],
+  ["D0E0",0x53CA],
+  ["D0E1",0x6025],
+  ["D0E2",0x6271],
+  ["D0E3",0x6C72],
+  ["D0E4",0x7D1A],
+  ["D0E5",0x7D66],
+  ["D0E6",0x4E98],
+  ["D0E7",0x5162],
+  ["D0E8",0x77DC],
+  ["D0E9",0x80AF],
+  ["D0EA",0x4F01],
+  ["D0EB",0x4F0E],
+  ["D0EC",0x5176],
+  ["D0ED",0x5180],
+  ["D0EE",0x55DC],
+  ["D0EF",0x5668],
+  ["D0F0",0x573B],
+  ["D0F1",0x57FA],
+  ["D0F2",0x57FC],
+  ["D0F3",0x5914],
+  ["D0F4",0x5947],
+  ["D0F5",0x5993],
+  ["D0F6",0x5BC4],
+  ["D0F7",0x5C90],
+  ["D0F8",0x5D0E],
+  ["D0F9",0x5DF1],
+  ["D0FA",0x5E7E],
+  ["D0FB",0x5FCC],
+  ["D0FC",0x6280],
+  ["D0FD",0x65D7],
+  ["D0FE",0x65E3],
+  ["D1A1",0x671E],
+  ["D1A2",0x671F],
+  ["D1A3",0x675E],
+  ["D1A4",0x68CB],
+  ["D1A5",0x68C4],
+  ["D1A6",0x6A5F],
+  ["D1A7",0x6B3A],
+  ["D1A8",0x6C23],
+  ["D1A9",0x6C7D],
+  ["D1AA",0x6C82],
+  ["D1AB",0x6DC7],
+  ["D1AC",0x7398],
+  ["D1AD",0x7426],
+  ["D1AE",0x742A],
+  ["D1AF",0x7482],
+  ["D1B0",0x74A3],
+  ["D1B1",0x7578],
+  ["D1B2",0x757F],
+  ["D1B3",0x7881],
+  ["D1B4",0x78EF],
+  ["D1B5",0x7941],
+  ["D1B6",0x7947],
+  ["D1B7",0x7948],
+  ["D1B8",0x797A],
+  ["D1B9",0x7B95],
+  ["D1BA",0x7D00],
+  ["D1BB",0x7DBA],
+  ["D1BC",0x7F88],
+  ["D1BD",0x8006],
+  ["D1BE",0x802D],
+  ["D1BF",0x808C],
+  ["D1C0",0x8A18],
+  ["D1C1",0x8B4F],
+  ["D1C2",0x8C48],
+  ["D1C3",0x8D77],
+  ["D1C4",0x9321],
+  ["D1C5",0x9324],
+  ["D1C6",0x98E2],
+  ["D1C7",0x9951],
+  ["D1C8",0x9A0E],
+  ["D1C9",0x9A0F],
+  ["D1CA",0x9A65],
+  ["D1CB",0x9E92],
+  ["D1CC",0x7DCA],
+  ["D1CD",0x4F76],
+  ["D1CE",0x5409],
+  ["D1CF",0x62EE],
+  ["D1D0",0x6854],
+  ["D1D1",0x91D1],
+  ["D1D2",0x55AB],
+  ["D1D3",0x513A],
+  ["D1D4",0xF90B],
+  ["D1D5",0xF90C],
+  ["D1D6",0x5A1C],
+  ["D1D7",0x61E6],
+  ["D1D8",0xF90D],
+  ["D1D9",0x62CF],
+  ["D1DA",0x62FF],
+  ["D1DB",0xF90E],
+  ["D1DC",0xF90F],
+  ["D1DD",0xF910],
+  ["D1DE",0xF911],
+  ["D1DF",0xF912],
+  ["D1E0",0xF913],
+  ["D1E1",0x90A3],
+  ["D1E2",0xF914],
+  ["D1E3",0xF915],
+  ["D1E4",0xF916],
+  ["D1E5",0xF917],
+  ["D1E6",0xF918],
+  ["D1E7",0x8AFE],
+  ["D1E8",0xF919],
+  ["D1E9",0xF91A],
+  ["D1EA",0xF91B],
+  ["D1EB",0xF91C],
+  ["D1EC",0x6696],
+  ["D1ED",0xF91D],
+  ["D1EE",0x7156],
+  ["D1EF",0xF91E],
+  ["D1F0",0xF91F],
+  ["D1F1",0x96E3],
+  ["D1F2",0xF920],
+  ["D1F3",0x634F],
+  ["D1F4",0x637A],
+  ["D1F5",0x5357],
+  ["D1F6",0xF921],
+  ["D1F7",0x678F],
+  ["D1F8",0x6960],
+  ["D1F9",0x6E73],
+  ["D1FA",0xF922],
+  ["D1FB",0x7537],
+  ["D1FC",0xF923],
+  ["D1FD",0xF924],
+  ["D1FE",0xF925],
+  ["D2A1",0x7D0D],
+  ["D2A2",0xF926],
+  ["D2A3",0xF927],
+  ["D2A4",0x8872],
+  ["D2A5",0x56CA],
+  ["D2A6",0x5A18],
+  ["D2A7",0xF928],
+  ["D2A8",0xF929],
+  ["D2A9",0xF92A],
+  ["D2AA",0xF92B],
+  ["D2AB",0xF92C],
+  ["D2AC",0x4E43],
+  ["D2AD",0xF92D],
+  ["D2AE",0x5167],
+  ["D2AF",0x5948],
+  ["D2B0",0x67F0],
+  ["D2B1",0x8010],
+  ["D2B2",0xF92E],
+  ["D2B3",0x5973],
+  ["D2B4",0x5E74],
+  ["D2B5",0x649A],
+  ["D2B6",0x79CA],
+  ["D2B7",0x5FF5],
+  ["D2B8",0x606C],
+  ["D2B9",0x62C8],
+  ["D2BA",0x637B],
+  ["D2BB",0x5BE7],
+  ["D2BC",0x5BD7],
+  ["D2BD",0x52AA],
+  ["D2BE",0xF92F],
+  ["D2BF",0x5974],
+  ["D2C0",0x5F29],
+  ["D2C1",0x6012],
+  ["D2C2",0xF930],
+  ["D2C3",0xF931],
+  ["D2C4",0xF932],
+  ["D2C5",0x7459],
+  ["D2C6",0xF933],
+  ["D2C7",0xF934],
+  ["D2C8",0xF935],
+  ["D2C9",0xF936],
+  ["D2CA",0xF937],
+  ["D2CB",0xF938],
+  ["D2CC",0x99D1],
+  ["D2CD",0xF939],
+  ["D2CE",0xF93A],
+  ["D2CF",0xF93B],
+  ["D2D0",0xF93C],
+  ["D2D1",0xF93D],
+  ["D2D2",0xF93E],
+  ["D2D3",0xF93F],
+  ["D2D4",0xF940],
+  ["D2D5",0xF941],
+  ["D2D6",0xF942],
+  ["D2D7",0xF943],
+  ["D2D8",0x6FC3],
+  ["D2D9",0xF944],
+  ["D2DA",0xF945],
+  ["D2DB",0x81BF],
+  ["D2DC",0x8FB2],
+  ["D2DD",0x60F1],
+  ["D2DE",0xF946],
+  ["D2DF",0xF947],
+  ["D2E0",0x8166],
+  ["D2E1",0xF948],
+  ["D2E2",0xF949],
+  ["D2E3",0x5C3F],
+  ["D2E4",0xF94A],
+  ["D2E5",0xF94B],
+  ["D2E6",0xF94C],
+  ["D2E7",0xF94D],
+  ["D2E8",0xF94E],
+  ["D2E9",0xF94F],
+  ["D2EA",0xF950],
+  ["D2EB",0xF951],
+  ["D2EC",0x5AE9],
+  ["D2ED",0x8A25],
+  ["D2EE",0x677B],
+  ["D2EF",0x7D10],
+  ["D2F0",0xF952],
+  ["D2F1",0xF953],
+  ["D2F2",0xF954],
+  ["D2F3",0xF955],
+  ["D2F4",0xF956],
+  ["D2F5",0xF957],
+  ["D2F6",0x80FD],
+  ["D2F7",0xF958],
+  ["D2F8",0xF959],
+  ["D2F9",0x5C3C],
+  ["D2FA",0x6CE5],
+  ["D2FB",0x533F],
+  ["D2FC",0x6EBA],
+  ["D2FD",0x591A],
+  ["D2FE",0x8336],
+  ["D3A1",0x4E39],
+  ["D3A2",0x4EB6],
+  ["D3A3",0x4F46],
+  ["D3A4",0x55AE],
+  ["D3A5",0x5718],
+  ["D3A6",0x58C7],
+  ["D3A7",0x5F56],
+  ["D3A8",0x65B7],
+  ["D3A9",0x65E6],
+  ["D3AA",0x6A80],
+  ["D3AB",0x6BB5],
+  ["D3AC",0x6E4D],
+  ["D3AD",0x77ED],
+  ["D3AE",0x7AEF],
+  ["D3AF",0x7C1E],
+  ["D3B0",0x7DDE],
+  ["D3B1",0x86CB],
+  ["D3B2",0x8892],
+  ["D3B3",0x9132],
+  ["D3B4",0x935B],
+  ["D3B5",0x64BB],
+  ["D3B6",0x6FBE],
+  ["D3B7",0x737A],
+  ["D3B8",0x75B8],
+  ["D3B9",0x9054],
+  ["D3BA",0x5556],
+  ["D3BB",0x574D],
+  ["D3BC",0x61BA],
+  ["D3BD",0x64D4],
+  ["D3BE",0x66C7],
+  ["D3BF",0x6DE1],
+  ["D3C0",0x6E5B],
+  ["D3C1",0x6F6D],
+  ["D3C2",0x6FB9],
+  ["D3C3",0x75F0],
+  ["D3C4",0x8043],
+  ["D3C5",0x81BD],
+  ["D3C6",0x8541],
+  ["D3C7",0x8983],
+  ["D3C8",0x8AC7],
+  ["D3C9",0x8B5A],
+  ["D3CA",0x931F],
+  ["D3CB",0x6C93],
+  ["D3CC",0x7553],
+  ["D3CD",0x7B54],
+  ["D3CE",0x8E0F],
+  ["D3CF",0x905D],
+  ["D3D0",0x5510],
+  ["D3D1",0x5802],
+  ["D3D2",0x5858],
+  ["D3D3",0x5E62],
+  ["D3D4",0x6207],
+  ["D3D5",0x649E],
+  ["D3D6",0x68E0],
+  ["D3D7",0x7576],
+  ["D3D8",0x7CD6],
+  ["D3D9",0x87B3],
+  ["D3DA",0x9EE8],
+  ["D3DB",0x4EE3],
+  ["D3DC",0x5788],
+  ["D3DD",0x576E],
+  ["D3DE",0x5927],
+  ["D3DF",0x5C0D],
+  ["D3E0",0x5CB1],
+  ["D3E1",0x5E36],
+  ["D3E2",0x5F85],
+  ["D3E3",0x6234],
+  ["D3E4",0x64E1],
+  ["D3E5",0x73B3],
+  ["D3E6",0x81FA],
+  ["D3E7",0x888B],
+  ["D3E8",0x8CB8],
+  ["D3E9",0x968A],
+  ["D3EA",0x9EDB],
+  ["D3EB",0x5B85],
+  ["D3EC",0x5FB7],
+  ["D3ED",0x60B3],
+  ["D3EE",0x5012],
+  ["D3EF",0x5200],
+  ["D3F0",0x5230],
+  ["D3F1",0x5716],
+  ["D3F2",0x5835],
+  ["D3F3",0x5857],
+  ["D3F4",0x5C0E],
+  ["D3F5",0x5C60],
+  ["D3F6",0x5CF6],
+  ["D3F7",0x5D8B],
+  ["D3F8",0x5EA6],
+  ["D3F9",0x5F92],
+  ["D3FA",0x60BC],
+  ["D3FB",0x6311],
+  ["D3FC",0x6389],
+  ["D3FD",0x6417],
+  ["D3FE",0x6843],
+  ["D4A1",0x68F9],
+  ["D4A2",0x6AC2],
+  ["D4A3",0x6DD8],
+  ["D4A4",0x6E21],
+  ["D4A5",0x6ED4],
+  ["D4A6",0x6FE4],
+  ["D4A7",0x71FE],
+  ["D4A8",0x76DC],
+  ["D4A9",0x7779],
+  ["D4AA",0x79B1],
+  ["D4AB",0x7A3B],
+  ["D4AC",0x8404],
+  ["D4AD",0x89A9],
+  ["D4AE",0x8CED],
+  ["D4AF",0x8DF3],
+  ["D4B0",0x8E48],
+  ["D4B1",0x9003],
+  ["D4B2",0x9014],
+  ["D4B3",0x9053],
+  ["D4B4",0x90FD],
+  ["D4B5",0x934D],
+  ["D4B6",0x9676],
+  ["D4B7",0x97DC],
+  ["D4B8",0x6BD2],
+  ["D4B9",0x7006],
+  ["D4BA",0x7258],
+  ["D4BB",0x72A2],
+  ["D4BC",0x7368],
+  ["D4BD",0x7763],
+  ["D4BE",0x79BF],
+  ["D4BF",0x7BE4],
+  ["D4C0",0x7E9B],
+  ["D4C1",0x8B80],
+  ["D4C2",0x58A9],
+  ["D4C3",0x60C7],
+  ["D4C4",0x6566],
+  ["D4C5",0x65FD],
+  ["D4C6",0x66BE],
+  ["D4C7",0x6C8C],
+  ["D4C8",0x711E],
+  ["D4C9",0x71C9],
+  ["D4CA",0x8C5A],
+  ["D4CB",0x9813],
+  ["D4CC",0x4E6D],
+  ["D4CD",0x7A81],
+  ["D4CE",0x4EDD],
+  ["D4CF",0x51AC],
+  ["D4D0",0x51CD],
+  ["D4D1",0x52D5],
+  ["D4D2",0x540C],
+  ["D4D3",0x61A7],
+  ["D4D4",0x6771],
+  ["D4D5",0x6850],
+  ["D4D6",0x68DF],
+  ["D4D7",0x6D1E],
+  ["D4D8",0x6F7C],
+  ["D4D9",0x75BC],
+  ["D4DA",0x77B3],
+  ["D4DB",0x7AE5],
+  ["D4DC",0x80F4],
+  ["D4DD",0x8463],
+  ["D4DE",0x9285],
+  ["D4DF",0x515C],
+  ["D4E0",0x6597],
+  ["D4E1",0x675C],
+  ["D4E2",0x6793],
+  ["D4E3",0x75D8],
+  ["D4E4",0x7AC7],
+  ["D4E5",0x8373],
+  ["D4E6",0xF95A],
+  ["D4E7",0x8C46],
+  ["D4E8",0x9017],
+  ["D4E9",0x982D],
+  ["D4EA",0x5C6F],
+  ["D4EB",0x81C0],
+  ["D4EC",0x829A],
+  ["D4ED",0x9041],
+  ["D4EE",0x906F],
+  ["D4EF",0x920D],
+  ["D4F0",0x5F97],
+  ["D4F1",0x5D9D],
+  ["D4F2",0x6A59],
+  ["D4F3",0x71C8],
+  ["D4F4",0x767B],
+  ["D4F5",0x7B49],
+  ["D4F6",0x85E4],
+  ["D4F7",0x8B04],
+  ["D4F8",0x9127],
+  ["D4F9",0x9A30],
+  ["D4FA",0x5587],
+  ["D4FB",0x61F6],
+  ["D4FC",0xF95B],
+  ["D4FD",0x7669],
+  ["D4FE",0x7F85],
+  ["D5A1",0x863F],
+  ["D5A2",0x87BA],
+  ["D5A3",0x88F8],
+  ["D5A4",0x908F],
+  ["D5A5",0xF95C],
+  ["D5A6",0x6D1B],
+  ["D5A7",0x70D9],
+  ["D5A8",0x73DE],
+  ["D5A9",0x7D61],
+  ["D5AA",0x843D],
+  ["D5AB",0xF95D],
+  ["D5AC",0x916A],
+  ["D5AD",0x99F1],
+  ["D5AE",0xF95E],
+  ["D5AF",0x4E82],
+  ["D5B0",0x5375],
+  ["D5B1",0x6B04],
+  ["D5B2",0x6B12],
+  ["D5B3",0x703E],
+  ["D5B4",0x721B],
+  ["D5B5",0x862D],
+  ["D5B6",0x9E1E],
+  ["D5B7",0x524C],
+  ["D5B8",0x8FA3],
+  ["D5B9",0x5D50],
+  ["D5BA",0x64E5],
+  ["D5BB",0x652C],
+  ["D5BC",0x6B16],
+  ["D5BD",0x6FEB],
+  ["D5BE",0x7C43],
+  ["D5BF",0x7E9C],
+  ["D5C0",0x85CD],
+  ["D5C1",0x8964],
+  ["D5C2",0x89BD],
+  ["D5C3",0x62C9],
+  ["D5C4",0x81D8],
+  ["D5C5",0x881F],
+  ["D5C6",0x5ECA],
+  ["D5C7",0x6717],
+  ["D5C8",0x6D6A],
+  ["D5C9",0x72FC],
+  ["D5CA",0x7405],
+  ["D5CB",0x746F],
+  ["D5CC",0x8782],
+  ["D5CD",0x90DE],
+  ["D5CE",0x4F86],
+  ["D5CF",0x5D0D],
+  ["D5D0",0x5FA0],
+  ["D5D1",0x840A],
+  ["D5D2",0x51B7],
+  ["D5D3",0x63A0],
+  ["D5D4",0x7565],
+  ["D5D5",0x4EAE],
+  ["D5D6",0x5006],
+  ["D5D7",0x5169],
+  ["D5D8",0x51C9],
+  ["D5D9",0x6881],
+  ["D5DA",0x6A11],
+  ["D5DB",0x7CAE],
+  ["D5DC",0x7CB1],
+  ["D5DD",0x7CE7],
+  ["D5DE",0x826F],
+  ["D5DF",0x8AD2],
+  ["D5E0",0x8F1B],
+  ["D5E1",0x91CF],
+  ["D5E2",0x4FB6],
+  ["D5E3",0x5137],
+  ["D5E4",0x52F5],
+  ["D5E5",0x5442],
+  ["D5E6",0x5EEC],
+  ["D5E7",0x616E],
+  ["D5E8",0x623E],
+  ["D5E9",0x65C5],
+  ["D5EA",0x6ADA],
+  ["D5EB",0x6FFE],
+  ["D5EC",0x792A],
+  ["D5ED",0x85DC],
+  ["D5EE",0x8823],
+  ["D5EF",0x95AD],
+  ["D5F0",0x9A62],
+  ["D5F1",0x9A6A],
+  ["D5F2",0x9E97],
+  ["D5F3",0x9ECE],
+  ["D5F4",0x529B],
+  ["D5F5",0x66C6],
+  ["D5F6",0x6B77],
+  ["D5F7",0x701D],
+  ["D5F8",0x792B],
+  ["D5F9",0x8F62],
+  ["D5FA",0x9742],
+  ["D5FB",0x6190],
+  ["D5FC",0x6200],
+  ["D5FD",0x6523],
+  ["D5FE",0x6F23],
+  ["D6A1",0x7149],
+  ["D6A2",0x7489],
+  ["D6A3",0x7DF4],
+  ["D6A4",0x806F],
+  ["D6A5",0x84EE],
+  ["D6A6",0x8F26],
+  ["D6A7",0x9023],
+  ["D6A8",0x934A],
+  ["D6A9",0x51BD],
+  ["D6AA",0x5217],
+  ["D6AB",0x52A3],
+  ["D6AC",0x6D0C],
+  ["D6AD",0x70C8],
+  ["D6AE",0x88C2],
+  ["D6AF",0x5EC9],
+  ["D6B0",0x6582],
+  ["D6B1",0x6BAE],
+  ["D6B2",0x6FC2],
+  ["D6B3",0x7C3E],
+  ["D6B4",0x7375],
+  ["D6B5",0x4EE4],
+  ["D6B6",0x4F36],
+  ["D6B7",0x56F9],
+  ["D6B8",0xF95F],
+  ["D6B9",0x5CBA],
+  ["D6BA",0x5DBA],
+  ["D6BB",0x601C],
+  ["D6BC",0x73B2],
+  ["D6BD",0x7B2D],
+  ["D6BE",0x7F9A],
+  ["D6BF",0x7FCE],
+  ["D6C0",0x8046],
+  ["D6C1",0x901E],
+  ["D6C2",0x9234],
+  ["D6C3",0x96F6],
+  ["D6C4",0x9748],
+  ["D6C5",0x9818],
+  ["D6C6",0x9F61],
+  ["D6C7",0x4F8B],
+  ["D6C8",0x6FA7],
+  ["D6C9",0x79AE],
+  ["D6CA",0x91B4],
+  ["D6CB",0x96B7],
+  ["D6CC",0x52DE],
+  ["D6CD",0xF960],
+  ["D6CE",0x6488],
+  ["D6CF",0x64C4],
+  ["D6D0",0x6AD3],
+  ["D6D1",0x6F5E],
+  ["D6D2",0x7018],
+  ["D6D3",0x7210],
+  ["D6D4",0x76E7],
+  ["D6D5",0x8001],
+  ["D6D6",0x8606],
+  ["D6D7",0x865C],
+  ["D6D8",0x8DEF],
+  ["D6D9",0x8F05],
+  ["D6DA",0x9732],
+  ["D6DB",0x9B6F],
+  ["D6DC",0x9DFA],
+  ["D6DD",0x9E75],
+  ["D6DE",0x788C],
+  ["D6DF",0x797F],
+  ["D6E0",0x7DA0],
+  ["D6E1",0x83C9],
+  ["D6E2",0x9304],
+  ["D6E3",0x9E7F],
+  ["D6E4",0x9E93],
+  ["D6E5",0x8AD6],
+  ["D6E6",0x58DF],
+  ["D6E7",0x5F04],
+  ["D6E8",0x6727],
+  ["D6E9",0x7027],
+  ["D6EA",0x74CF],
+  ["D6EB",0x7C60],
+  ["D6EC",0x807E],
+  ["D6ED",0x5121],
+  ["D6EE",0x7028],
+  ["D6EF",0x7262],
+  ["D6F0",0x78CA],
+  ["D6F1",0x8CC2],
+  ["D6F2",0x8CDA],
+  ["D6F3",0x8CF4],
+  ["D6F4",0x96F7],
+  ["D6F5",0x4E86],
+  ["D6F6",0x50DA],
+  ["D6F7",0x5BEE],
+  ["D6F8",0x5ED6],
+  ["D6F9",0x6599],
+  ["D6FA",0x71CE],
+  ["D6FB",0x7642],
+  ["D6FC",0x77AD],
+  ["D6FD",0x804A],
+  ["D6FE",0x84FC],
+  ["D7A1",0x907C],
+  ["D7A2",0x9B27],
+  ["D7A3",0x9F8D],
+  ["D7A4",0x58D8],
+  ["D7A5",0x5A41],
+  ["D7A6",0x5C62],
+  ["D7A7",0x6A13],
+  ["D7A8",0x6DDA],
+  ["D7A9",0x6F0F],
+  ["D7AA",0x763B],
+  ["D7AB",0x7D2F],
+  ["D7AC",0x7E37],
+  ["D7AD",0x851E],
+  ["D7AE",0x8938],
+  ["D7AF",0x93E4],
+  ["D7B0",0x964B],
+  ["D7B1",0x5289],
+  ["D7B2",0x65D2],
+  ["D7B3",0x67F3],
+  ["D7B4",0x69B4],
+  ["D7B5",0x6D41],
+  ["D7B6",0x6E9C],
+  ["D7B7",0x700F],
+  ["D7B8",0x7409],
+  ["D7B9",0x7460],
+  ["D7BA",0x7559],
+  ["D7BB",0x7624],
+  ["D7BC",0x786B],
+  ["D7BD",0x8B2C],
+  ["D7BE",0x985E],
+  ["D7BF",0x516D],
+  ["D7C0",0x622E],
+  ["D7C1",0x9678],
+  ["D7C2",0x4F96],
+  ["D7C3",0x502B],
+  ["D7C4",0x5D19],
+  ["D7C5",0x6DEA],
+  ["D7C6",0x7DB8],
+  ["D7C7",0x8F2A],
+  ["D7C8",0x5F8B],
+  ["D7C9",0x6144],
+  ["D7CA",0x6817],
+  ["D7CB",0xF961],
+  ["D7CC",0x9686],
+  ["D7CD",0x52D2],
+  ["D7CE",0x808B],
+  ["D7CF",0x51DC],
+  ["D7D0",0x51CC],
+  ["D7D1",0x695E],
+  ["D7D2",0x7A1C],
+  ["D7D3",0x7DBE],
+  ["D7D4",0x83F1],
+  ["D7D5",0x9675],
+  ["D7D6",0x4FDA],
+  ["D7D7",0x5229],
+  ["D7D8",0x5398],
+  ["D7D9",0x540F],
+  ["D7DA",0x550E],
+  ["D7DB",0x5C65],
+  ["D7DC",0x60A7],
+  ["D7DD",0x674E],
+  ["D7DE",0x68A8],
+  ["D7DF",0x6D6C],
+  ["D7E0",0x7281],
+  ["D7E1",0x72F8],
+  ["D7E2",0x7406],
+  ["D7E3",0x7483],
+  ["D7E4",0xF962],
+  ["D7E5",0x75E2],
+  ["D7E6",0x7C6C],
+  ["D7E7",0x7F79],
+  ["D7E8",0x7FB8],
+  ["D7E9",0x8389],
+  ["D7EA",0x88CF],
+  ["D7EB",0x88E1],
+  ["D7EC",0x91CC],
+  ["D7ED",0x91D0],
+  ["D7EE",0x96E2],
+  ["D7EF",0x9BC9],
+  ["D7F0",0x541D],
+  ["D7F1",0x6F7E],
+  ["D7F2",0x71D0],
+  ["D7F3",0x7498],
+  ["D7F4",0x85FA],
+  ["D7F5",0x8EAA],
+  ["D7F6",0x96A3],
+  ["D7F7",0x9C57],
+  ["D7F8",0x9E9F],
+  ["D7F9",0x6797],
+  ["D7FA",0x6DCB],
+  ["D7FB",0x7433],
+  ["D7FC",0x81E8],
+  ["D7FD",0x9716],
+  ["D7FE",0x782C],
+  ["D8A1",0x7ACB],
+  ["D8A2",0x7B20],
+  ["D8A3",0x7C92],
+  ["D8A4",0x6469],
+  ["D8A5",0x746A],
+  ["D8A6",0x75F2],
+  ["D8A7",0x78BC],
+  ["D8A8",0x78E8],
+  ["D8A9",0x99AC],
+  ["D8AA",0x9B54],
+  ["D8AB",0x9EBB],
+  ["D8AC",0x5BDE],
+  ["D8AD",0x5E55],
+  ["D8AE",0x6F20],
+  ["D8AF",0x819C],
+  ["D8B0",0x83AB],
+  ["D8B1",0x9088],
+  ["D8B2",0x4E07],
+  ["D8B3",0x534D],
+  ["D8B4",0x5A29],
+  ["D8B5",0x5DD2],
+  ["D8B6",0x5F4E],
+  ["D8B7",0x6162],
+  ["D8B8",0x633D],
+  ["D8B9",0x6669],
+  ["D8BA",0x66FC],
+  ["D8BB",0x6EFF],
+  ["D8BC",0x6F2B],
+  ["D8BD",0x7063],
+  ["D8BE",0x779E],
+  ["D8BF",0x842C],
+  ["D8C0",0x8513],
+  ["D8C1",0x883B],
+  ["D8C2",0x8F13],
+  ["D8C3",0x9945],
+  ["D8C4",0x9C3B],
+  ["D8C5",0x551C],
+  ["D8C6",0x62B9],
+  ["D8C7",0x672B],
+  ["D8C8",0x6CAB],
+  ["D8C9",0x8309],
+  ["D8CA",0x896A],
+  ["D8CB",0x977A],
+  ["D8CC",0x4EA1],
+  ["D8CD",0x5984],
+  ["D8CE",0x5FD8],
+  ["D8CF",0x5FD9],
+  ["D8D0",0x671B],
+  ["D8D1",0x7DB2],
+  ["D8D2",0x7F54],
+  ["D8D3",0x8292],
+  ["D8D4",0x832B],
+  ["D8D5",0x83BD],
+  ["D8D6",0x8F1E],
+  ["D8D7",0x9099],
+  ["D8D8",0x57CB],
+  ["D8D9",0x59B9],
+  ["D8DA",0x5A92],
+  ["D8DB",0x5BD0],
+  ["D8DC",0x6627],
+  ["D8DD",0x679A],
+  ["D8DE",0x6885],
+  ["D8DF",0x6BCF],
+  ["D8E0",0x7164],
+  ["D8E1",0x7F75],
+  ["D8E2",0x8CB7],
+  ["D8E3",0x8CE3],
+  ["D8E4",0x9081],
+  ["D8E5",0x9B45],
+  ["D8E6",0x8108],
+  ["D8E7",0x8C8A],
+  ["D8E8",0x964C],
+  ["D8E9",0x9A40],
+  ["D8EA",0x9EA5],
+  ["D8EB",0x5B5F],
+  ["D8EC",0x6C13],
+  ["D8ED",0x731B],
+  ["D8EE",0x76F2],
+  ["D8EF",0x76DF],
+  ["D8F0",0x840C],
+  ["D8F1",0x51AA],
+  ["D8F2",0x8993],
+  ["D8F3",0x514D],
+  ["D8F4",0x5195],
+  ["D8F5",0x52C9],
+  ["D8F6",0x68C9],
+  ["D8F7",0x6C94],
+  ["D8F8",0x7704],
+  ["D8F9",0x7720],
+  ["D8FA",0x7DBF],
+  ["D8FB",0x7DEC],
+  ["D8FC",0x9762],
+  ["D8FD",0x9EB5],
+  ["D8FE",0x6EC5],
+  ["D9A1",0x8511],
+  ["D9A2",0x51A5],
+  ["D9A3",0x540D],
+  ["D9A4",0x547D],
+  ["D9A5",0x660E],
+  ["D9A6",0x669D],
+  ["D9A7",0x6927],
+  ["D9A8",0x6E9F],
+  ["D9A9",0x76BF],
+  ["D9AA",0x7791],
+  ["D9AB",0x8317],
+  ["D9AC",0x84C2],
+  ["D9AD",0x879F],
+  ["D9AE",0x9169],
+  ["D9AF",0x9298],
+  ["D9B0",0x9CF4],
+  ["D9B1",0x8882],
+  ["D9B2",0x4FAE],
+  ["D9B3",0x5192],
+  ["D9B4",0x52DF],
+  ["D9B5",0x59C6],
+  ["D9B6",0x5E3D],
+  ["D9B7",0x6155],
+  ["D9B8",0x6478],
+  ["D9B9",0x6479],
+  ["D9BA",0x66AE],
+  ["D9BB",0x67D0],
+  ["D9BC",0x6A21],
+  ["D9BD",0x6BCD],
+  ["D9BE",0x6BDB],
+  ["D9BF",0x725F],
+  ["D9C0",0x7261],
+  ["D9C1",0x7441],
+  ["D9C2",0x7738],
+  ["D9C3",0x77DB],
+  ["D9C4",0x8017],
+  ["D9C5",0x82BC],
+  ["D9C6",0x8305],
+  ["D9C7",0x8B00],
+  ["D9C8",0x8B28],
+  ["D9C9",0x8C8C],
+  ["D9CA",0x6728],
+  ["D9CB",0x6C90],
+  ["D9CC",0x7267],
+  ["D9CD",0x76EE],
+  ["D9CE",0x7766],
+  ["D9CF",0x7A46],
+  ["D9D0",0x9DA9],
+  ["D9D1",0x6B7F],
+  ["D9D2",0x6C92],
+  ["D9D3",0x5922],
+  ["D9D4",0x6726],
+  ["D9D5",0x8499],
+  ["D9D6",0x536F],
+  ["D9D7",0x5893],
+  ["D9D8",0x5999],
+  ["D9D9",0x5EDF],
+  ["D9DA",0x63CF],
+  ["D9DB",0x6634],
+  ["D9DC",0x6773],
+  ["D9DD",0x6E3A],
+  ["D9DE",0x732B],
+  ["D9DF",0x7AD7],
+  ["D9E0",0x82D7],
+  ["D9E1",0x9328],
+  ["D9E2",0x52D9],
+  ["D9E3",0x5DEB],
+  ["D9E4",0x61AE],
+  ["D9E5",0x61CB],
+  ["D9E6",0x620A],
+  ["D9E7",0x62C7],
+  ["D9E8",0x64AB],
+  ["D9E9",0x65E0],
+  ["D9EA",0x6959],
+  ["D9EB",0x6B66],
+  ["D9EC",0x6BCB],
+  ["D9ED",0x7121],
+  ["D9EE",0x73F7],
+  ["D9EF",0x755D],
+  ["D9F0",0x7E46],
+  ["D9F1",0x821E],
+  ["D9F2",0x8302],
+  ["D9F3",0x856A],
+  ["D9F4",0x8AA3],
+  ["D9F5",0x8CBF],
+  ["D9F6",0x9727],
+  ["D9F7",0x9D61],
+  ["D9F8",0x58A8],
+  ["D9F9",0x9ED8],
+  ["D9FA",0x5011],
+  ["D9FB",0x520E],
+  ["D9FC",0x543B],
+  ["D9FD",0x554F],
+  ["D9FE",0x6587],
+  ["DAA1",0x6C76],
+  ["DAA2",0x7D0A],
+  ["DAA3",0x7D0B],
+  ["DAA4",0x805E],
+  ["DAA5",0x868A],
+  ["DAA6",0x9580],
+  ["DAA7",0x96EF],
+  ["DAA8",0x52FF],
+  ["DAA9",0x6C95],
+  ["DAAA",0x7269],
+  ["DAAB",0x5473],
+  ["DAAC",0x5A9A],
+  ["DAAD",0x5C3E],
+  ["DAAE",0x5D4B],
+  ["DAAF",0x5F4C],
+  ["DAB0",0x5FAE],
+  ["DAB1",0x672A],
+  ["DAB2",0x68B6],
+  ["DAB3",0x6963],
+  ["DAB4",0x6E3C],
+  ["DAB5",0x6E44],
+  ["DAB6",0x7709],
+  ["DAB7",0x7C73],
+  ["DAB8",0x7F8E],
+  ["DAB9",0x8587],
+  ["DABA",0x8B0E],
+  ["DABB",0x8FF7],
+  ["DABC",0x9761],
+  ["DABD",0x9EF4],
+  ["DABE",0x5CB7],
+  ["DABF",0x60B6],
+  ["DAC0",0x610D],
+  ["DAC1",0x61AB],
+  ["DAC2",0x654F],
+  ["DAC3",0x65FB],
+  ["DAC4",0x65FC],
+  ["DAC5",0x6C11],
+  ["DAC6",0x6CEF],
+  ["DAC7",0x739F],
+  ["DAC8",0x73C9],
+  ["DAC9",0x7DE1],
+  ["DACA",0x9594],
+  ["DACB",0x5BC6],
+  ["DACC",0x871C],
+  ["DACD",0x8B10],
+  ["DACE",0x525D],
+  ["DACF",0x535A],
+  ["DAD0",0x62CD],
+  ["DAD1",0x640F],
+  ["DAD2",0x64B2],
+  ["DAD3",0x6734],
+  ["DAD4",0x6A38],
+  ["DAD5",0x6CCA],
+  ["DAD6",0x73C0],
+  ["DAD7",0x749E],
+  ["DAD8",0x7B94],
+  ["DAD9",0x7C95],
+  ["DADA",0x7E1B],
+  ["DADB",0x818A],
+  ["DADC",0x8236],
+  ["DADD",0x8584],
+  ["DADE",0x8FEB],
+  ["DADF",0x96F9],
+  ["DAE0",0x99C1],
+  ["DAE1",0x4F34],
+  ["DAE2",0x534A],
+  ["DAE3",0x53CD],
+  ["DAE4",0x53DB],
+  ["DAE5",0x62CC],
+  ["DAE6",0x642C],
+  ["DAE7",0x6500],
+  ["DAE8",0x6591],
+  ["DAE9",0x69C3],
+  ["DAEA",0x6CEE],
+  ["DAEB",0x6F58],
+  ["DAEC",0x73ED],
+  ["DAED",0x7554],
+  ["DAEE",0x7622],
+  ["DAEF",0x76E4],
+  ["DAF0",0x76FC],
+  ["DAF1",0x78D0],
+  ["DAF2",0x78FB],
+  ["DAF3",0x792C],
+  ["DAF4",0x7D46],
+  ["DAF5",0x822C],
+  ["DAF6",0x87E0],
+  ["DAF7",0x8FD4],
+  ["DAF8",0x9812],
+  ["DAF9",0x98EF],
+  ["DAFA",0x52C3],
+  ["DAFB",0x62D4],
+  ["DAFC",0x64A5],
+  ["DAFD",0x6E24],
+  ["DAFE",0x6F51],
+  ["DBA1",0x767C],
+  ["DBA2",0x8DCB],
+  ["DBA3",0x91B1],
+  ["DBA4",0x9262],
+  ["DBA5",0x9AEE],
+  ["DBA6",0x9B43],
+  ["DBA7",0x5023],
+  ["DBA8",0x508D],
+  ["DBA9",0x574A],
+  ["DBAA",0x59A8],
+  ["DBAB",0x5C28],
+  ["DBAC",0x5E47],
+  ["DBAD",0x5F77],
+  ["DBAE",0x623F],
+  ["DBAF",0x653E],
+  ["DBB0",0x65B9],
+  ["DBB1",0x65C1],
+  ["DBB2",0x6609],
+  ["DBB3",0x678B],
+  ["DBB4",0x699C],
+  ["DBB5",0x6EC2],
+  ["DBB6",0x78C5],
+  ["DBB7",0x7D21],
+  ["DBB8",0x80AA],
+  ["DBB9",0x8180],
+  ["DBBA",0x822B],
+  ["DBBB",0x82B3],
+  ["DBBC",0x84A1],
+  ["DBBD",0x868C],
+  ["DBBE",0x8A2A],
+  ["DBBF",0x8B17],
+  ["DBC0",0x90A6],
+  ["DBC1",0x9632],
+  ["DBC2",0x9F90],
+  ["DBC3",0x500D],
+  ["DBC4",0x4FF3],
+  ["DBC5",0xF963],
+  ["DBC6",0x57F9],
+  ["DBC7",0x5F98],
+  ["DBC8",0x62DC],
+  ["DBC9",0x6392],
+  ["DBCA",0x676F],
+  ["DBCB",0x6E43],
+  ["DBCC",0x7119],
+  ["DBCD",0x76C3],
+  ["DBCE",0x80CC],
+  ["DBCF",0x80DA],
+  ["DBD0",0x88F4],
+  ["DBD1",0x88F5],
+  ["DBD2",0x8919],
+  ["DBD3",0x8CE0],
+  ["DBD4",0x8F29],
+  ["DBD5",0x914D],
+  ["DBD6",0x966A],
+  ["DBD7",0x4F2F],
+  ["DBD8",0x4F70],
+  ["DBD9",0x5E1B],
+  ["DBDA",0x67CF],
+  ["DBDB",0x6822],
+  ["DBDC",0x767D],
+  ["DBDD",0x767E],
+  ["DBDE",0x9B44],
+  ["DBDF",0x5E61],
+  ["DBE0",0x6A0A],
+  ["DBE1",0x7169],
+  ["DBE2",0x71D4],
+  ["DBE3",0x756A],
+  ["DBE4",0xF964],
+  ["DBE5",0x7E41],
+  ["DBE6",0x8543],
+  ["DBE7",0x85E9],
+  ["DBE8",0x98DC],
+  ["DBE9",0x4F10],
+  ["DBEA",0x7B4F],
+  ["DBEB",0x7F70],
+  ["DBEC",0x95A5],
+  ["DBED",0x51E1],
+  ["DBEE",0x5E06],
+  ["DBEF",0x68B5],
+  ["DBF0",0x6C3E],
+  ["DBF1",0x6C4E],
+  ["DBF2",0x6CDB],
+  ["DBF3",0x72AF],
+  ["DBF4",0x7BC4],
+  ["DBF5",0x8303],
+  ["DBF6",0x6CD5],
+  ["DBF7",0x743A],
+  ["DBF8",0x50FB],
+  ["DBF9",0x5288],
+  ["DBFA",0x58C1],
+  ["DBFB",0x64D8],
+  ["DBFC",0x6A97],
+  ["DBFD",0x74A7],
+  ["DBFE",0x7656],
+  ["DCA1",0x78A7],
+  ["DCA2",0x8617],
+  ["DCA3",0x95E2],
+  ["DCA4",0x9739],
+  ["DCA5",0xF965],
+  ["DCA6",0x535E],
+  ["DCA7",0x5F01],
+  ["DCA8",0x8B8A],
+  ["DCA9",0x8FA8],
+  ["DCAA",0x8FAF],
+  ["DCAB",0x908A],
+  ["DCAC",0x5225],
+  ["DCAD",0x77A5],
+  ["DCAE",0x9C49],
+  ["DCAF",0x9F08],
+  ["DCB0",0x4E19],
+  ["DCB1",0x5002],
+  ["DCB2",0x5175],
+  ["DCB3",0x5C5B],
+  ["DCB4",0x5E77],
+  ["DCB5",0x661E],
+  ["DCB6",0x663A],
+  ["DCB7",0x67C4],
+  ["DCB8",0x68C5],
+  ["DCB9",0x70B3],
+  ["DCBA",0x7501],
+  ["DCBB",0x75C5],
+  ["DCBC",0x79C9],
+  ["DCBD",0x7ADD],
+  ["DCBE",0x8F27],
+  ["DCBF",0x9920],
+  ["DCC0",0x9A08],
+  ["DCC1",0x4FDD],
+  ["DCC2",0x5821],
+  ["DCC3",0x5831],
+  ["DCC4",0x5BF6],
+  ["DCC5",0x666E],
+  ["DCC6",0x6B65],
+  ["DCC7",0x6D11],
+  ["DCC8",0x6E7A],
+  ["DCC9",0x6F7D],
+  ["DCCA",0x73E4],
+  ["DCCB",0x752B],
+  ["DCCC",0x83E9],
+  ["DCCD",0x88DC],
+  ["DCCE",0x8913],
+  ["DCCF",0x8B5C],
+  ["DCD0",0x8F14],
+  ["DCD1",0x4F0F],
+  ["DCD2",0x50D5],
+  ["DCD3",0x5310],
+  ["DCD4",0x535C],
+  ["DCD5",0x5B93],
+  ["DCD6",0x5FA9],
+  ["DCD7",0x670D],
+  ["DCD8",0x798F],
+  ["DCD9",0x8179],
+  ["DCDA",0x832F],
+  ["DCDB",0x8514],
+  ["DCDC",0x8907],
+  ["DCDD",0x8986],
+  ["DCDE",0x8F39],
+  ["DCDF",0x8F3B],
+  ["DCE0",0x99A5],
+  ["DCE1",0x9C12],
+  ["DCE2",0x672C],
+  ["DCE3",0x4E76],
+  ["DCE4",0x4FF8],
+  ["DCE5",0x5949],
+  ["DCE6",0x5C01],
+  ["DCE7",0x5CEF],
+  ["DCE8",0x5CF0],
+  ["DCE9",0x6367],
+  ["DCEA",0x68D2],
+  ["DCEB",0x70FD],
+  ["DCEC",0x71A2],
+  ["DCED",0x742B],
+  ["DCEE",0x7E2B],
+  ["DCEF",0x84EC],
+  ["DCF0",0x8702],
+  ["DCF1",0x9022],
+  ["DCF2",0x92D2],
+  ["DCF3",0x9CF3],
+  ["DCF4",0x4E0D],
+  ["DCF5",0x4ED8],
+  ["DCF6",0x4FEF],
+  ["DCF7",0x5085],
+  ["DCF8",0x5256],
+  ["DCF9",0x526F],
+  ["DCFA",0x5426],
+  ["DCFB",0x5490],
+  ["DCFC",0x57E0],
+  ["DCFD",0x592B],
+  ["DCFE",0x5A66],
+  ["DDA1",0x5B5A],
+  ["DDA2",0x5B75],
+  ["DDA3",0x5BCC],
+  ["DDA4",0x5E9C],
+  ["DDA5",0xF966],
+  ["DDA6",0x6276],
+  ["DDA7",0x6577],
+  ["DDA8",0x65A7],
+  ["DDA9",0x6D6E],
+  ["DDAA",0x6EA5],
+  ["DDAB",0x7236],
+  ["DDAC",0x7B26],
+  ["DDAD",0x7C3F],
+  ["DDAE",0x7F36],
+  ["DDAF",0x8150],
+  ["DDB0",0x8151],
+  ["DDB1",0x819A],
+  ["DDB2",0x8240],
+  ["DDB3",0x8299],
+  ["DDB4",0x83A9],
+  ["DDB5",0x8A03],
+  ["DDB6",0x8CA0],
+  ["DDB7",0x8CE6],
+  ["DDB8",0x8CFB],
+  ["DDB9",0x8D74],
+  ["DDBA",0x8DBA],
+  ["DDBB",0x90E8],
+  ["DDBC",0x91DC],
+  ["DDBD",0x961C],
+  ["DDBE",0x9644],
+  ["DDBF",0x99D9],
+  ["DDC0",0x9CE7],
+  ["DDC1",0x5317],
+  ["DDC2",0x5206],
+  ["DDC3",0x5429],
+  ["DDC4",0x5674],
+  ["DDC5",0x58B3],
+  ["DDC6",0x5954],
+  ["DDC7",0x596E],
+  ["DDC8",0x5FFF],
+  ["DDC9",0x61A4],
+  ["DDCA",0x626E],
+  ["DDCB",0x6610],
+  ["DDCC",0x6C7E],
+  ["DDCD",0x711A],
+  ["DDCE",0x76C6],
+  ["DDCF",0x7C89],
+  ["DDD0",0x7CDE],
+  ["DDD1",0x7D1B],
+  ["DDD2",0x82AC],
+  ["DDD3",0x8CC1],
+  ["DDD4",0x96F0],
+  ["DDD5",0xF967],
+  ["DDD6",0x4F5B],
+  ["DDD7",0x5F17],
+  ["DDD8",0x5F7F],
+  ["DDD9",0x62C2],
+  ["DDDA",0x5D29],
+  ["DDDB",0x670B],
+  ["DDDC",0x68DA],
+  ["DDDD",0x787C],
+  ["DDDE",0x7E43],
+  ["DDDF",0x9D6C],
+  ["DDE0",0x4E15],
+  ["DDE1",0x5099],
+  ["DDE2",0x5315],
+  ["DDE3",0x532A],
+  ["DDE4",0x5351],
+  ["DDE5",0x5983],
+  ["DDE6",0x5A62],
+  ["DDE7",0x5E87],
+  ["DDE8",0x60B2],
+  ["DDE9",0x618A],
+  ["DDEA",0x6249],
+  ["DDEB",0x6279],
+  ["DDEC",0x6590],
+  ["DDED",0x6787],
+  ["DDEE",0x69A7],
+  ["DDEF",0x6BD4],
+  ["DDF0",0x6BD6],
+  ["DDF1",0x6BD7],
+  ["DDF2",0x6BD8],
+  ["DDF3",0x6CB8],
+  ["DDF4",0xF968],
+  ["DDF5",0x7435],
+  ["DDF6",0x75FA],
+  ["DDF7",0x7812],
+  ["DDF8",0x7891],
+  ["DDF9",0x79D5],
+  ["DDFA",0x79D8],
+  ["DDFB",0x7C83],
+  ["DDFC",0x7DCB],
+  ["DDFD",0x7FE1],
+  ["DDFE",0x80A5],
+  ["DEA1",0x813E],
+  ["DEA2",0x81C2],
+  ["DEA3",0x83F2],
+  ["DEA4",0x871A],
+  ["DEA5",0x88E8],
+  ["DEA6",0x8AB9],
+  ["DEA7",0x8B6C],
+  ["DEA8",0x8CBB],
+  ["DEA9",0x9119],
+  ["DEAA",0x975E],
+  ["DEAB",0x98DB],
+  ["DEAC",0x9F3B],
+  ["DEAD",0x56AC],
+  ["DEAE",0x5B2A],
+  ["DEAF",0x5F6C],
+  ["DEB0",0x658C],
+  ["DEB1",0x6AB3],
+  ["DEB2",0x6BAF],
+  ["DEB3",0x6D5C],
+  ["DEB4",0x6FF1],
+  ["DEB5",0x7015],
+  ["DEB6",0x725D],
+  ["DEB7",0x73AD],
+  ["DEB8",0x8CA7],
+  ["DEB9",0x8CD3],
+  ["DEBA",0x983B],
+  ["DEBB",0x6191],
+  ["DEBC",0x6C37],
+  ["DEBD",0x8058],
+  ["DEBE",0x9A01],
+  ["DEBF",0x4E4D],
+  ["DEC0",0x4E8B],
+  ["DEC1",0x4E9B],
+  ["DEC2",0x4ED5],
+  ["DEC3",0x4F3A],
+  ["DEC4",0x4F3C],
+  ["DEC5",0x4F7F],
+  ["DEC6",0x4FDF],
+  ["DEC7",0x50FF],
+  ["DEC8",0x53F2],
+  ["DEC9",0x53F8],
+  ["DECA",0x5506],
+  ["DECB",0x55E3],
+  ["DECC",0x56DB],
+  ["DECD",0x58EB],
+  ["DECE",0x5962],
+  ["DECF",0x5A11],
+  ["DED0",0x5BEB],
+  ["DED1",0x5BFA],
+  ["DED2",0x5C04],
+  ["DED3",0x5DF3],
+  ["DED4",0x5E2B],
+  ["DED5",0x5F99],
+  ["DED6",0x601D],
+  ["DED7",0x6368],
+  ["DED8",0x659C],
+  ["DED9",0x65AF],
+  ["DEDA",0x67F6],
+  ["DEDB",0x67FB],
+  ["DEDC",0x68AD],
+  ["DEDD",0x6B7B],
+  ["DEDE",0x6C99],
+  ["DEDF",0x6CD7],
+  ["DEE0",0x6E23],
+  ["DEE1",0x7009],
+  ["DEE2",0x7345],
+  ["DEE3",0x7802],
+  ["DEE4",0x793E],
+  ["DEE5",0x7940],
+  ["DEE6",0x7960],
+  ["DEE7",0x79C1],
+  ["DEE8",0x7BE9],
+  ["DEE9",0x7D17],
+  ["DEEA",0x7D72],
+  ["DEEB",0x8086],
+  ["DEEC",0x820D],
+  ["DEED",0x838E],
+  ["DEEE",0x84D1],
+  ["DEEF",0x86C7],
+  ["DEF0",0x88DF],
+  ["DEF1",0x8A50],
+  ["DEF2",0x8A5E],
+  ["DEF3",0x8B1D],
+  ["DEF4",0x8CDC],
+  ["DEF5",0x8D66],
+  ["DEF6",0x8FAD],
+  ["DEF7",0x90AA],
+  ["DEF8",0x98FC],
+  ["DEF9",0x99DF],
+  ["DEFA",0x9E9D],
+  ["DEFB",0x524A],
+  ["DEFC",0xF969],
+  ["DEFD",0x6714],
+  ["DEFE",0xF96A],
+  ["DFA1",0x5098],
+  ["DFA2",0x522A],
+  ["DFA3",0x5C71],
+  ["DFA4",0x6563],
+  ["DFA5",0x6C55],
+  ["DFA6",0x73CA],
+  ["DFA7",0x7523],
+  ["DFA8",0x759D],
+  ["DFA9",0x7B97],
+  ["DFAA",0x849C],
+  ["DFAB",0x9178],
+  ["DFAC",0x9730],
+  ["DFAD",0x4E77],
+  ["DFAE",0x6492],
+  ["DFAF",0x6BBA],
+  ["DFB0",0x715E],
+  ["DFB1",0x85A9],
+  ["DFB2",0x4E09],
+  ["DFB3",0xF96B],
+  ["DFB4",0x6749],
+  ["DFB5",0x68EE],
+  ["DFB6",0x6E17],
+  ["DFB7",0x829F],
+  ["DFB8",0x8518],
+  ["DFB9",0x886B],
+  ["DFBA",0x63F7],
+  ["DFBB",0x6F81],
+  ["DFBC",0x9212],
+  ["DFBD",0x98AF],
+  ["DFBE",0x4E0A],
+  ["DFBF",0x50B7],
+  ["DFC0",0x50CF],
+  ["DFC1",0x511F],
+  ["DFC2",0x5546],
+  ["DFC3",0x55AA],
+  ["DFC4",0x5617],
+  ["DFC5",0x5B40],
+  ["DFC6",0x5C19],
+  ["DFC7",0x5CE0],
+  ["DFC8",0x5E38],
+  ["DFC9",0x5E8A],
+  ["DFCA",0x5EA0],
+  ["DFCB",0x5EC2],
+  ["DFCC",0x60F3],
+  ["DFCD",0x6851],
+  ["DFCE",0x6A61],
+  ["DFCF",0x6E58],
+  ["DFD0",0x723D],
+  ["DFD1",0x7240],
+  ["DFD2",0x72C0],
+  ["DFD3",0x76F8],
+  ["DFD4",0x7965],
+  ["DFD5",0x7BB1],
+  ["DFD6",0x7FD4],
+  ["DFD7",0x88F3],
+  ["DFD8",0x89F4],
+  ["DFD9",0x8A73],
+  ["DFDA",0x8C61],
+  ["DFDB",0x8CDE],
+  ["DFDC",0x971C],
+  ["DFDD",0x585E],
+  ["DFDE",0x74BD],
+  ["DFDF",0x8CFD],
+  ["DFE0",0x55C7],
+  ["DFE1",0xF96C],
+  ["DFE2",0x7A61],
+  ["DFE3",0x7D22],
+  ["DFE4",0x8272],
+  ["DFE5",0x7272],
+  ["DFE6",0x751F],
+  ["DFE7",0x7525],
+  ["DFE8",0xF96D],
+  ["DFE9",0x7B19],
+  ["DFEA",0x5885],
+  ["DFEB",0x58FB],
+  ["DFEC",0x5DBC],
+  ["DFED",0x5E8F],
+  ["DFEE",0x5EB6],
+  ["DFEF",0x5F90],
+  ["DFF0",0x6055],
+  ["DFF1",0x6292],
+  ["DFF2",0x637F],
+  ["DFF3",0x654D],
+  ["DFF4",0x6691],
+  ["DFF5",0x66D9],
+  ["DFF6",0x66F8],
+  ["DFF7",0x6816],
+  ["DFF8",0x68F2],
+  ["DFF9",0x7280],
+  ["DFFA",0x745E],
+  ["DFFB",0x7B6E],
+  ["DFFC",0x7D6E],
+  ["DFFD",0x7DD6],
+  ["DFFE",0x7F72],
+  ["E0A1",0x80E5],
+  ["E0A2",0x8212],
+  ["E0A3",0x85AF],
+  ["E0A4",0x897F],
+  ["E0A5",0x8A93],
+  ["E0A6",0x901D],
+  ["E0A7",0x92E4],
+  ["E0A8",0x9ECD],
+  ["E0A9",0x9F20],
+  ["E0AA",0x5915],
+  ["E0AB",0x596D],
+  ["E0AC",0x5E2D],
+  ["E0AD",0x60DC],
+  ["E0AE",0x6614],
+  ["E0AF",0x6673],
+  ["E0B0",0x6790],
+  ["E0B1",0x6C50],
+  ["E0B2",0x6DC5],
+  ["E0B3",0x6F5F],
+  ["E0B4",0x77F3],
+  ["E0B5",0x78A9],
+  ["E0B6",0x84C6],
+  ["E0B7",0x91CB],
+  ["E0B8",0x932B],
+  ["E0B9",0x4ED9],
+  ["E0BA",0x50CA],
+  ["E0BB",0x5148],
+  ["E0BC",0x5584],
+  ["E0BD",0x5B0B],
+  ["E0BE",0x5BA3],
+  ["E0BF",0x6247],
+  ["E0C0",0x657E],
+  ["E0C1",0x65CB],
+  ["E0C2",0x6E32],
+  ["E0C3",0x717D],
+  ["E0C4",0x7401],
+  ["E0C5",0x7444],
+  ["E0C6",0x7487],
+  ["E0C7",0x74BF],
+  ["E0C8",0x766C],
+  ["E0C9",0x79AA],
+  ["E0CA",0x7DDA],
+  ["E0CB",0x7E55],
+  ["E0CC",0x7FA8],
+  ["E0CD",0x817A],
+  ["E0CE",0x81B3],
+  ["E0CF",0x8239],
+  ["E0D0",0x861A],
+  ["E0D1",0x87EC],
+  ["E0D2",0x8A75],
+  ["E0D3",0x8DE3],
+  ["E0D4",0x9078],
+  ["E0D5",0x9291],
+  ["E0D6",0x9425],
+  ["E0D7",0x994D],
+  ["E0D8",0x9BAE],
+  ["E0D9",0x5368],
+  ["E0DA",0x5C51],
+  ["E0DB",0x6954],
+  ["E0DC",0x6CC4],
+  ["E0DD",0x6D29],
+  ["E0DE",0x6E2B],
+  ["E0DF",0x820C],
+  ["E0E0",0x859B],
+  ["E0E1",0x893B],
+  ["E0E2",0x8A2D],
+  ["E0E3",0x8AAA],
+  ["E0E4",0x96EA],
+  ["E0E5",0x9F67],
+  ["E0E6",0x5261],
+  ["E0E7",0x66B9],
+  ["E0E8",0x6BB2],
+  ["E0E9",0x7E96],
+  ["E0EA",0x87FE],
+  ["E0EB",0x8D0D],
+  ["E0EC",0x9583],
+  ["E0ED",0x965D],
+  ["E0EE",0x651D],
+  ["E0EF",0x6D89],
+  ["E0F0",0x71EE],
+  ["E0F1",0xF96E],
+  ["E0F2",0x57CE],
+  ["E0F3",0x59D3],
+  ["E0F4",0x5BAC],
+  ["E0F5",0x6027],
+  ["E0F6",0x60FA],
+  ["E0F7",0x6210],
+  ["E0F8",0x661F],
+  ["E0F9",0x665F],
+  ["E0FA",0x7329],
+  ["E0FB",0x73F9],
+  ["E0FC",0x76DB],
+  ["E0FD",0x7701],
+  ["E0FE",0x7B6C],
+  ["E1A1",0x8056],
+  ["E1A2",0x8072],
+  ["E1A3",0x8165],
+  ["E1A4",0x8AA0],
+  ["E1A5",0x9192],
+  ["E1A6",0x4E16],
+  ["E1A7",0x52E2],
+  ["E1A8",0x6B72],
+  ["E1A9",0x6D17],
+  ["E1AA",0x7A05],
+  ["E1AB",0x7B39],
+  ["E1AC",0x7D30],
+  ["E1AD",0xF96F],
+  ["E1AE",0x8CB0],
+  ["E1AF",0x53EC],
+  ["E1B0",0x562F],
+  ["E1B1",0x5851],
+  ["E1B2",0x5BB5],
+  ["E1B3",0x5C0F],
+  ["E1B4",0x5C11],
+  ["E1B5",0x5DE2],
+  ["E1B6",0x6240],
+  ["E1B7",0x6383],
+  ["E1B8",0x6414],
+  ["E1B9",0x662D],
+  ["E1BA",0x68B3],
+  ["E1BB",0x6CBC],
+  ["E1BC",0x6D88],
+  ["E1BD",0x6EAF],
+  ["E1BE",0x701F],
+  ["E1BF",0x70A4],
+  ["E1C0",0x71D2],
+  ["E1C1",0x7526],
+  ["E1C2",0x758F],
+  ["E1C3",0x758E],
+  ["E1C4",0x7619],
+  ["E1C5",0x7B11],
+  ["E1C6",0x7BE0],
+  ["E1C7",0x7C2B],
+  ["E1C8",0x7D20],
+  ["E1C9",0x7D39],
+  ["E1CA",0x852C],
+  ["E1CB",0x856D],
+  ["E1CC",0x8607],
+  ["E1CD",0x8A34],
+  ["E1CE",0x900D],
+  ["E1CF",0x9061],
+  ["E1D0",0x90B5],
+  ["E1D1",0x92B7],
+  ["E1D2",0x97F6],
+  ["E1D3",0x9A37],
+  ["E1D4",0x4FD7],
+  ["E1D5",0x5C6C],
+  ["E1D6",0x675F],
+  ["E1D7",0x6D91],
+  ["E1D8",0x7C9F],
+  ["E1D9",0x7E8C],
+  ["E1DA",0x8B16],
+  ["E1DB",0x8D16],
+  ["E1DC",0x901F],
+  ["E1DD",0x5B6B],
+  ["E1DE",0x5DFD],
+  ["E1DF",0x640D],
+  ["E1E0",0x84C0],
+  ["E1E1",0x905C],
+  ["E1E2",0x98E1],
+  ["E1E3",0x7387],
+  ["E1E4",0x5B8B],
+  ["E1E5",0x609A],
+  ["E1E6",0x677E],
+  ["E1E7",0x6DDE],
+  ["E1E8",0x8A1F],
+  ["E1E9",0x8AA6],
+  ["E1EA",0x9001],
+  ["E1EB",0x980C],
+  ["E1EC",0x5237],
+  ["E1ED",0xF970],
+  ["E1EE",0x7051],
+  ["E1EF",0x788E],
+  ["E1F0",0x9396],
+  ["E1F1",0x8870],
+  ["E1F2",0x91D7],
+  ["E1F3",0x4FEE],
+  ["E1F4",0x53D7],
+  ["E1F5",0x55FD],
+  ["E1F6",0x56DA],
+  ["E1F7",0x5782],
+  ["E1F8",0x58FD],
+  ["E1F9",0x5AC2],
+  ["E1FA",0x5B88],
+  ["E1FB",0x5CAB],
+  ["E1FC",0x5CC0],
+  ["E1FD",0x5E25],
+  ["E1FE",0x6101],
+  ["E2A1",0x620D],
+  ["E2A2",0x624B],
+  ["E2A3",0x6388],
+  ["E2A4",0x641C],
+  ["E2A5",0x6536],
+  ["E2A6",0x6578],
+  ["E2A7",0x6A39],
+  ["E2A8",0x6B8A],
+  ["E2A9",0x6C34],
+  ["E2AA",0x6D19],
+  ["E2AB",0x6F31],
+  ["E2AC",0x71E7],
+  ["E2AD",0x72E9],
+  ["E2AE",0x7378],
+  ["E2AF",0x7407],
+  ["E2B0",0x74B2],
+  ["E2B1",0x7626],
+  ["E2B2",0x7761],
+  ["E2B3",0x79C0],
+  ["E2B4",0x7A57],
+  ["E2B5",0x7AEA],
+  ["E2B6",0x7CB9],
+  ["E2B7",0x7D8F],
+  ["E2B8",0x7DAC],
+  ["E2B9",0x7E61],
+  ["E2BA",0x7F9E],
+  ["E2BB",0x8129],
+  ["E2BC",0x8331],
+  ["E2BD",0x8490],
+  ["E2BE",0x84DA],
+  ["E2BF",0x85EA],
+  ["E2C0",0x8896],
+  ["E2C1",0x8AB0],
+  ["E2C2",0x8B90],
+  ["E2C3",0x8F38],
+  ["E2C4",0x9042],
+  ["E2C5",0x9083],
+  ["E2C6",0x916C],
+  ["E2C7",0x9296],
+  ["E2C8",0x92B9],
+  ["E2C9",0x968B],
+  ["E2CA",0x96A7],
+  ["E2CB",0x96A8],
+  ["E2CC",0x96D6],
+  ["E2CD",0x9700],
+  ["E2CE",0x9808],
+  ["E2CF",0x9996],
+  ["E2D0",0x9AD3],
+  ["E2D1",0x9B1A],
+  ["E2D2",0x53D4],
+  ["E2D3",0x587E],
+  ["E2D4",0x5919],
+  ["E2D5",0x5B70],
+  ["E2D6",0x5BBF],
+  ["E2D7",0x6DD1],
+  ["E2D8",0x6F5A],
+  ["E2D9",0x719F],
+  ["E2DA",0x7421],
+  ["E2DB",0x74B9],
+  ["E2DC",0x8085],
+  ["E2DD",0x83FD],
+  ["E2DE",0x5DE1],
+  ["E2DF",0x5F87],
+  ["E2E0",0x5FAA],
+  ["E2E1",0x6042],
+  ["E2E2",0x65EC],
+  ["E2E3",0x6812],
+  ["E2E4",0x696F],
+  ["E2E5",0x6A53],
+  ["E2E6",0x6B89],
+  ["E2E7",0x6D35],
+  ["E2E8",0x6DF3],
+  ["E2E9",0x73E3],
+  ["E2EA",0x76FE],
+  ["E2EB",0x77AC],
+  ["E2EC",0x7B4D],
+  ["E2ED",0x7D14],
+  ["E2EE",0x8123],
+  ["E2EF",0x821C],
+  ["E2F0",0x8340],
+  ["E2F1",0x84F4],
+  ["E2F2",0x8563],
+  ["E2F3",0x8A62],
+  ["E2F4",0x8AC4],
+  ["E2F5",0x9187],
+  ["E2F6",0x931E],
+  ["E2F7",0x9806],
+  ["E2F8",0x99B4],
+  ["E2F9",0x620C],
+  ["E2FA",0x8853],
+  ["E2FB",0x8FF0],
+  ["E2FC",0x9265],
+  ["E2FD",0x5D07],
+  ["E2FE",0x5D27],
+  ["E3A1",0x5D69],
+  ["E3A2",0x745F],
+  ["E3A3",0x819D],
+  ["E3A4",0x8768],
+  ["E3A5",0x6FD5],
+  ["E3A6",0x62FE],
+  ["E3A7",0x7FD2],
+  ["E3A8",0x8936],
+  ["E3A9",0x8972],
+  ["E3AA",0x4E1E],
+  ["E3AB",0x4E58],
+  ["E3AC",0x50E7],
+  ["E3AD",0x52DD],
+  ["E3AE",0x5347],
+  ["E3AF",0x627F],
+  ["E3B0",0x6607],
+  ["E3B1",0x7E69],
+  ["E3B2",0x8805],
+  ["E3B3",0x965E],
+  ["E3B4",0x4F8D],
+  ["E3B5",0x5319],
+  ["E3B6",0x5636],
+  ["E3B7",0x59CB],
+  ["E3B8",0x5AA4],
+  ["E3B9",0x5C38],
+  ["E3BA",0x5C4E],
+  ["E3BB",0x5C4D],
+  ["E3BC",0x5E02],
+  ["E3BD",0x5F11],
+  ["E3BE",0x6043],
+  ["E3BF",0x65BD],
+  ["E3C0",0x662F],
+  ["E3C1",0x6642],
+  ["E3C2",0x67BE],
+  ["E3C3",0x67F4],
+  ["E3C4",0x731C],
+  ["E3C5",0x77E2],
+  ["E3C6",0x793A],
+  ["E3C7",0x7FC5],
+  ["E3C8",0x8494],
+  ["E3C9",0x84CD],
+  ["E3CA",0x8996],
+  ["E3CB",0x8A66],
+  ["E3CC",0x8A69],
+  ["E3CD",0x8AE1],
+  ["E3CE",0x8C55],
+  ["E3CF",0x8C7A],
+  ["E3D0",0x57F4],
+  ["E3D1",0x5BD4],
+  ["E3D2",0x5F0F],
+  ["E3D3",0x606F],
+  ["E3D4",0x62ED],
+  ["E3D5",0x690D],
+  ["E3D6",0x6B96],
+  ["E3D7",0x6E5C],
+  ["E3D8",0x7184],
+  ["E3D9",0x7BD2],
+  ["E3DA",0x8755],
+  ["E3DB",0x8B58],
+  ["E3DC",0x8EFE],
+  ["E3DD",0x98DF],
+  ["E3DE",0x98FE],
+  ["E3DF",0x4F38],
+  ["E3E0",0x4F81],
+  ["E3E1",0x4FE1],
+  ["E3E2",0x547B],
+  ["E3E3",0x5A20],
+  ["E3E4",0x5BB8],
+  ["E3E5",0x613C],
+  ["E3E6",0x65B0],
+  ["E3E7",0x6668],
+  ["E3E8",0x71FC],
+  ["E3E9",0x7533],
+  ["E3EA",0x795E],
+  ["E3EB",0x7D33],
+  ["E3EC",0x814E],
+  ["E3ED",0x81E3],
+  ["E3EE",0x8398],
+  ["E3EF",0x85AA],
+  ["E3F0",0x85CE],
+  ["E3F1",0x8703],
+  ["E3F2",0x8A0A],
+  ["E3F3",0x8EAB],
+  ["E3F4",0x8F9B],
+  ["E3F5",0xF971],
+  ["E3F6",0x8FC5],
+  ["E3F7",0x5931],
+  ["E3F8",0x5BA4],
+  ["E3F9",0x5BE6],
+  ["E3FA",0x6089],
+  ["E3FB",0x5BE9],
+  ["E3FC",0x5C0B],
+  ["E3FD",0x5FC3],
+  ["E3FE",0x6C81],
+  ["E4A1",0xF972],
+  ["E4A2",0x6DF1],
+  ["E4A3",0x700B],
+  ["E4A4",0x751A],
+  ["E4A5",0x82AF],
+  ["E4A6",0x8AF6],
+  ["E4A7",0x4EC0],
+  ["E4A8",0x5341],
+  ["E4A9",0xF973],
+  ["E4AA",0x96D9],
+  ["E4AB",0x6C0F],
+  ["E4AC",0x4E9E],
+  ["E4AD",0x4FC4],
+  ["E4AE",0x5152],
+  ["E4AF",0x555E],
+  ["E4B0",0x5A25],
+  ["E4B1",0x5CE8],
+  ["E4B2",0x6211],
+  ["E4B3",0x7259],
+  ["E4B4",0x82BD],
+  ["E4B5",0x83AA],
+  ["E4B6",0x86FE],
+  ["E4B7",0x8859],
+  ["E4B8",0x8A1D],
+  ["E4B9",0x963F],
+  ["E4BA",0x96C5],
+  ["E4BB",0x9913],
+  ["E4BC",0x9D09],
+  ["E4BD",0x9D5D],
+  ["E4BE",0x580A],
+  ["E4BF",0x5CB3],
+  ["E4C0",0x5DBD],
+  ["E4C1",0x5E44],
+  ["E4C2",0x60E1],
+  ["E4C3",0x6115],
+  ["E4C4",0x63E1],
+  ["E4C5",0x6A02],
+  ["E4C6",0x6E25],
+  ["E4C7",0x9102],
+  ["E4C8",0x9354],
+  ["E4C9",0x984E],
+  ["E4CA",0x9C10],
+  ["E4CB",0x9F77],
+  ["E4CC",0x5B89],
+  ["E4CD",0x5CB8],
+  ["E4CE",0x6309],
+  ["E4CF",0x664F],
+  ["E4D0",0x6848],
+  ["E4D1",0x773C],
+  ["E4D2",0x96C1],
+  ["E4D3",0x978D],
+  ["E4D4",0x9854],
+  ["E4D5",0x9B9F],
+  ["E4D6",0x65A1],
+  ["E4D7",0x8B01],
+  ["E4D8",0x8ECB],
+  ["E4D9",0x95BC],
+  ["E4DA",0x5535],
+  ["E4DB",0x5CA9],
+  ["E4DC",0x5DD6],
+  ["E4DD",0x5EB5],
+  ["E4DE",0x6697],
+  ["E4DF",0x764C],
+  ["E4E0",0x83F4],
+  ["E4E1",0x95C7],
+  ["E4E2",0x58D3],
+  ["E4E3",0x62BC],
+  ["E4E4",0x72CE],
+  ["E4E5",0x9D28],
+  ["E4E6",0x4EF0],
+  ["E4E7",0x592E],
+  ["E4E8",0x600F],
+  ["E4E9",0x663B],
+  ["E4EA",0x6B83],
+  ["E4EB",0x79E7],
+  ["E4EC",0x9D26],
+  ["E4ED",0x5393],
+  ["E4EE",0x54C0],
+  ["E4EF",0x57C3],
+  ["E4F0",0x5D16],
+  ["E4F1",0x611B],
+  ["E4F2",0x66D6],
+  ["E4F3",0x6DAF],
+  ["E4F4",0x788D],
+  ["E4F5",0x827E],
+  ["E4F6",0x9698],
+  ["E4F7",0x9744],
+  ["E4F8",0x5384],
+  ["E4F9",0x627C],
+  ["E4FA",0x6396],
+  ["E4FB",0x6DB2],
+  ["E4FC",0x7E0A],
+  ["E4FD",0x814B],
+  ["E4FE",0x984D],
+  ["E5A1",0x6AFB],
+  ["E5A2",0x7F4C],
+  ["E5A3",0x9DAF],
+  ["E5A4",0x9E1A],
+  ["E5A5",0x4E5F],
+  ["E5A6",0x503B],
+  ["E5A7",0x51B6],
+  ["E5A8",0x591C],
+  ["E5A9",0x60F9],
+  ["E5AA",0x63F6],
+  ["E5AB",0x6930],
+  ["E5AC",0x723A],
+  ["E5AD",0x8036],
+  ["E5AE",0xF974],
+  ["E5AF",0x91CE],
+  ["E5B0",0x5F31],
+  ["E5B1",0xF975],
+  ["E5B2",0xF976],
+  ["E5B3",0x7D04],
+  ["E5B4",0x82E5],
+  ["E5B5",0x846F],
+  ["E5B6",0x84BB],
+  ["E5B7",0x85E5],
+  ["E5B8",0x8E8D],
+  ["E5B9",0xF977],
+  ["E5BA",0x4F6F],
+  ["E5BB",0xF978],
+  ["E5BC",0xF979],
+  ["E5BD",0x58E4],
+  ["E5BE",0x5B43],
+  ["E5BF",0x6059],
+  ["E5C0",0x63DA],
+  ["E5C1",0x6518],
+  ["E5C2",0x656D],
+  ["E5C3",0x6698],
+  ["E5C4",0xF97A],
+  ["E5C5",0x694A],
+  ["E5C6",0x6A23],
+  ["E5C7",0x6D0B],
+  ["E5C8",0x7001],
+  ["E5C9",0x716C],
+  ["E5CA",0x75D2],
+  ["E5CB",0x760D],
+  ["E5CC",0x79B3],
+  ["E5CD",0x7A70],
+  ["E5CE",0xF97B],
+  ["E5CF",0x7F8A],
+  ["E5D0",0xF97C],
+  ["E5D1",0x8944],
+  ["E5D2",0xF97D],
+  ["E5D3",0x8B93],
+  ["E5D4",0x91C0],
+  ["E5D5",0x967D],
+  ["E5D6",0xF97E],
+  ["E5D7",0x990A],
+  ["E5D8",0x5704],
+  ["E5D9",0x5FA1],
+  ["E5DA",0x65BC],
+  ["E5DB",0x6F01],
+  ["E5DC",0x7600],
+  ["E5DD",0x79A6],
+  ["E5DE",0x8A9E],
+  ["E5DF",0x99AD],
+  ["E5E0",0x9B5A],
+  ["E5E1",0x9F6C],
+  ["E5E2",0x5104],
+  ["E5E3",0x61B6],
+  ["E5E4",0x6291],
+  ["E5E5",0x6A8D],
+  ["E5E6",0x81C6],
+  ["E5E7",0x5043],
+  ["E5E8",0x5830],
+  ["E5E9",0x5F66],
+  ["E5EA",0x7109],
+  ["E5EB",0x8A00],
+  ["E5EC",0x8AFA],
+  ["E5ED",0x5B7C],
+  ["E5EE",0x8616],
+  ["E5EF",0x4FFA],
+  ["E5F0",0x513C],
+  ["E5F1",0x56B4],
+  ["E5F2",0x5944],
+  ["E5F3",0x63A9],
+  ["E5F4",0x6DF9],
+  ["E5F5",0x5DAA],
+  ["E5F6",0x696D],
+  ["E5F7",0x5186],
+  ["E5F8",0x4E88],
+  ["E5F9",0x4F59],
+  ["E5FA",0xF97F],
+  ["E5FB",0xF980],
+  ["E5FC",0xF981],
+  ["E5FD",0x5982],
+  ["E5FE",0xF982],
+  ["E6A1",0xF983],
+  ["E6A2",0x6B5F],
+  ["E6A3",0x6C5D],
+  ["E6A4",0xF984],
+  ["E6A5",0x74B5],
+  ["E6A6",0x7916],
+  ["E6A7",0xF985],
+  ["E6A8",0x8207],
+  ["E6A9",0x8245],
+  ["E6AA",0x8339],
+  ["E6AB",0x8F3F],
+  ["E6AC",0x8F5D],
+  ["E6AD",0xF986],
+  ["E6AE",0x9918],
+  ["E6AF",0xF987],
+  ["E6B0",0xF988],
+  ["E6B1",0xF989],
+  ["E6B2",0x4EA6],
+  ["E6B3",0xF98A],
+  ["E6B4",0x57DF],
+  ["E6B5",0x5F79],
+  ["E6B6",0x6613],
+  ["E6B7",0xF98B],
+  ["E6B8",0xF98C],
+  ["E6B9",0x75AB],
+  ["E6BA",0x7E79],
+  ["E6BB",0x8B6F],
+  ["E6BC",0xF98D],
+  ["E6BD",0x9006],
+  ["E6BE",0x9A5B],
+  ["E6BF",0x56A5],
+  ["E6C0",0x5827],
+  ["E6C1",0x59F8],
+  ["E6C2",0x5A1F],
+  ["E6C3",0x5BB4],
+  ["E6C4",0xF98E],
+  ["E6C5",0x5EF6],
+  ["E6C6",0xF98F],
+  ["E6C7",0xF990],
+  ["E6C8",0x6350],
+  ["E6C9",0x633B],
+  ["E6CA",0xF991],
+  ["E6CB",0x693D],
+  ["E6CC",0x6C87],
+  ["E6CD",0x6CBF],
+  ["E6CE",0x6D8E],
+  ["E6CF",0x6D93],
+  ["E6D0",0x6DF5],
+  ["E6D1",0x6F14],
+  ["E6D2",0xF992],
+  ["E6D3",0x70DF],
+  ["E6D4",0x7136],
+  ["E6D5",0x7159],
+  ["E6D6",0xF993],
+  ["E6D7",0x71C3],
+  ["E6D8",0x71D5],
+  ["E6D9",0xF994],
+  ["E6DA",0x784F],
+  ["E6DB",0x786F],
+  ["E6DC",0xF995],
+  ["E6DD",0x7B75],
+  ["E6DE",0x7DE3],
+  ["E6DF",0xF996],
+  ["E6E0",0x7E2F],
+  ["E6E1",0xF997],
+  ["E6E2",0x884D],
+  ["E6E3",0x8EDF],
+  ["E6E4",0xF998],
+  ["E6E5",0xF999],
+  ["E6E6",0xF99A],
+  ["E6E7",0x925B],
+  ["E6E8",0xF99B],
+  ["E6E9",0x9CF6],
+  ["E6EA",0xF99C],
+  ["E6EB",0xF99D],
+  ["E6EC",0xF99E],
+  ["E6ED",0x6085],
+  ["E6EE",0x6D85],
+  ["E6EF",0xF99F],
+  ["E6F0",0x71B1],
+  ["E6F1",0xF9A0],
+  ["E6F2",0xF9A1],
+  ["E6F3",0x95B1],
+  ["E6F4",0x53AD],
+  ["E6F5",0xF9A2],
+  ["E6F6",0xF9A3],
+  ["E6F7",0xF9A4],
+  ["E6F8",0x67D3],
+  ["E6F9",0xF9A5],
+  ["E6FA",0x708E],
+  ["E6FB",0x7130],
+  ["E6FC",0x7430],
+  ["E6FD",0x8276],
+  ["E6FE",0x82D2],
+  ["E7A1",0xF9A6],
+  ["E7A2",0x95BB],
+  ["E7A3",0x9AE5],
+  ["E7A4",0x9E7D],
+  ["E7A5",0x66C4],
+  ["E7A6",0xF9A7],
+  ["E7A7",0x71C1],
+  ["E7A8",0x8449],
+  ["E7A9",0xF9A8],
+  ["E7AA",0xF9A9],
+  ["E7AB",0x584B],
+  ["E7AC",0xF9AA],
+  ["E7AD",0xF9AB],
+  ["E7AE",0x5DB8],
+  ["E7AF",0x5F71],
+  ["E7B0",0xF9AC],
+  ["E7B1",0x6620],
+  ["E7B2",0x668E],
+  ["E7B3",0x6979],
+  ["E7B4",0x69AE],
+  ["E7B5",0x6C38],
+  ["E7B6",0x6CF3],
+  ["E7B7",0x6E36],
+  ["E7B8",0x6F41],
+  ["E7B9",0x6FDA],
+  ["E7BA",0x701B],
+  ["E7BB",0x702F],
+  ["E7BC",0x7150],
+  ["E7BD",0x71DF],
+  ["E7BE",0x7370],
+  ["E7BF",0xF9AD],
+  ["E7C0",0x745B],
+  ["E7C1",0xF9AE],
+  ["E7C2",0x74D4],
+  ["E7C3",0x76C8],
+  ["E7C4",0x7A4E],
+  ["E7C5",0x7E93],
+  ["E7C6",0xF9AF],
+  ["E7C7",0xF9B0],
+  ["E7C8",0x82F1],
+  ["E7C9",0x8A60],
+  ["E7CA",0x8FCE],
+  ["E7CB",0xF9B1],
+  ["E7CC",0x9348],
+  ["E7CD",0xF9B2],
+  ["E7CE",0x9719],
+  ["E7CF",0xF9B3],
+  ["E7D0",0xF9B4],
+  ["E7D1",0x4E42],
+  ["E7D2",0x502A],
+  ["E7D3",0xF9B5],
+  ["E7D4",0x5208],
+  ["E7D5",0x53E1],
+  ["E7D6",0x66F3],
+  ["E7D7",0x6C6D],
+  ["E7D8",0x6FCA],
+  ["E7D9",0x730A],
+  ["E7DA",0x777F],
+  ["E7DB",0x7A62],
+  ["E7DC",0x82AE],
+  ["E7DD",0x85DD],
+  ["E7DE",0x8602],
+  ["E7DF",0xF9B6],
+  ["E7E0",0x88D4],
+  ["E7E1",0x8A63],
+  ["E7E2",0x8B7D],
+  ["E7E3",0x8C6B],
+  ["E7E4",0xF9B7],
+  ["E7E5",0x92B3],
+  ["E7E6",0xF9B8],
+  ["E7E7",0x9713],
+  ["E7E8",0x9810],
+  ["E7E9",0x4E94],
+  ["E7EA",0x4F0D],
+  ["E7EB",0x4FC9],
+  ["E7EC",0x50B2],
+  ["E7ED",0x5348],
+  ["E7EE",0x543E],
+  ["E7EF",0x5433],
+  ["E7F0",0x55DA],
+  ["E7F1",0x5862],
+  ["E7F2",0x58BA],
+  ["E7F3",0x5967],
+  ["E7F4",0x5A1B],
+  ["E7F5",0x5BE4],
+  ["E7F6",0x609F],
+  ["E7F7",0xF9B9],
+  ["E7F8",0x61CA],
+  ["E7F9",0x6556],
+  ["E7FA",0x65FF],
+  ["E7FB",0x6664],
+  ["E7FC",0x68A7],
+  ["E7FD",0x6C5A],
+  ["E7FE",0x6FB3],
+  ["E8A1",0x70CF],
+  ["E8A2",0x71AC],
+  ["E8A3",0x7352],
+  ["E8A4",0x7B7D],
+  ["E8A5",0x8708],
+  ["E8A6",0x8AA4],
+  ["E8A7",0x9C32],
+  ["E8A8",0x9F07],
+  ["E8A9",0x5C4B],
+  ["E8AA",0x6C83],
+  ["E8AB",0x7344],
+  ["E8AC",0x7389],
+  ["E8AD",0x923A],
+  ["E8AE",0x6EAB],
+  ["E8AF",0x7465],
+  ["E8B0",0x761F],
+  ["E8B1",0x7A69],
+  ["E8B2",0x7E15],
+  ["E8B3",0x860A],
+  ["E8B4",0x5140],
+  ["E8B5",0x58C5],
+  ["E8B6",0x64C1],
+  ["E8B7",0x74EE],
+  ["E8B8",0x7515],
+  ["E8B9",0x7670],
+  ["E8BA",0x7FC1],
+  ["E8BB",0x9095],
+  ["E8BC",0x96CD],
+  ["E8BD",0x9954],
+  ["E8BE",0x6E26],
+  ["E8BF",0x74E6],
+  ["E8C0",0x7AA9],
+  ["E8C1",0x7AAA],
+  ["E8C2",0x81E5],
+  ["E8C3",0x86D9],
+  ["E8C4",0x8778],
+  ["E8C5",0x8A1B],
+  ["E8C6",0x5A49],
+  ["E8C7",0x5B8C],
+  ["E8C8",0x5B9B],
+  ["E8C9",0x68A1],
+  ["E8CA",0x6900],
+  ["E8CB",0x6D63],
+  ["E8CC",0x73A9],
+  ["E8CD",0x7413],
+  ["E8CE",0x742C],
+  ["E8CF",0x7897],
+  ["E8D0",0x7DE9],
+  ["E8D1",0x7FEB],
+  ["E8D2",0x8118],
+  ["E8D3",0x8155],
+  ["E8D4",0x839E],
+  ["E8D5",0x8C4C],
+  ["E8D6",0x962E],
+  ["E8D7",0x9811],
+  ["E8D8",0x66F0],
+  ["E8D9",0x5F80],
+  ["E8DA",0x65FA],
+  ["E8DB",0x6789],
+  ["E8DC",0x6C6A],
+  ["E8DD",0x738B],
+  ["E8DE",0x502D],
+  ["E8DF",0x5A03],
+  ["E8E0",0x6B6A],
+  ["E8E1",0x77EE],
+  ["E8E2",0x5916],
+  ["E8E3",0x5D6C],
+  ["E8E4",0x5DCD],
+  ["E8E5",0x7325],
+  ["E8E6",0x754F],
+  ["E8E7",0xF9BA],
+  ["E8E8",0xF9BB],
+  ["E8E9",0x50E5],
+  ["E8EA",0x51F9],
+  ["E8EB",0x582F],
+  ["E8EC",0x592D],
+  ["E8ED",0x5996],
+  ["E8EE",0x59DA],
+  ["E8EF",0x5BE5],
+  ["E8F0",0xF9BC],
+  ["E8F1",0xF9BD],
+  ["E8F2",0x5DA2],
+  ["E8F3",0x62D7],
+  ["E8F4",0x6416],
+  ["E8F5",0x6493],
+  ["E8F6",0x64FE],
+  ["E8F7",0xF9BE],
+  ["E8F8",0x66DC],
+  ["E8F9",0xF9BF],
+  ["E8FA",0x6A48],
+  ["E8FB",0xF9C0],
+  ["E8FC",0x71FF],
+  ["E8FD",0x7464],
+  ["E8FE",0xF9C1],
+  ["E9A1",0x7A88],
+  ["E9A2",0x7AAF],
+  ["E9A3",0x7E47],
+  ["E9A4",0x7E5E],
+  ["E9A5",0x8000],
+  ["E9A6",0x8170],
+  ["E9A7",0xF9C2],
+  ["E9A8",0x87EF],
+  ["E9A9",0x8981],
+  ["E9AA",0x8B20],
+  ["E9AB",0x9059],
+  ["E9AC",0xF9C3],
+  ["E9AD",0x9080],
+  ["E9AE",0x9952],
+  ["E9AF",0x617E],
+  ["E9B0",0x6B32],
+  ["E9B1",0x6D74],
+  ["E9B2",0x7E1F],
+  ["E9B3",0x8925],
+  ["E9B4",0x8FB1],
+  ["E9B5",0x4FD1],
+  ["E9B6",0x50AD],
+  ["E9B7",0x5197],
+  ["E9B8",0x52C7],
+  ["E9B9",0x57C7],
+  ["E9BA",0x5889],
+  ["E9BB",0x5BB9],
+  ["E9BC",0x5EB8],
+  ["E9BD",0x6142],
+  ["E9BE",0x6995],
+  ["E9BF",0x6D8C],
+  ["E9C0",0x6E67],
+  ["E9C1",0x6EB6],
+  ["E9C2",0x7194],
+  ["E9C3",0x7462],
+  ["E9C4",0x7528],
+  ["E9C5",0x752C],
+  ["E9C6",0x8073],
+  ["E9C7",0x8338],
+  ["E9C8",0x84C9],
+  ["E9C9",0x8E0A],
+  ["E9CA",0x9394],
+  ["E9CB",0x93DE],
+  ["E9CC",0xF9C4],
+  ["E9CD",0x4E8E],
+  ["E9CE",0x4F51],
+  ["E9CF",0x5076],
+  ["E9D0",0x512A],
+  ["E9D1",0x53C8],
+  ["E9D2",0x53CB],
+  ["E9D3",0x53F3],
+  ["E9D4",0x5B87],
+  ["E9D5",0x5BD3],
+  ["E9D6",0x5C24],
+  ["E9D7",0x611A],
+  ["E9D8",0x6182],
+  ["E9D9",0x65F4],
+  ["E9DA",0x725B],
+  ["E9DB",0x7397],
+  ["E9DC",0x7440],
+  ["E9DD",0x76C2],
+  ["E9DE",0x7950],
+  ["E9DF",0x7991],
+  ["E9E0",0x79B9],
+  ["E9E1",0x7D06],
+  ["E9E2",0x7FBD],
+  ["E9E3",0x828B],
+  ["E9E4",0x85D5],
+  ["E9E5",0x865E],
+  ["E9E6",0x8FC2],
+  ["E9E7",0x9047],
+  ["E9E8",0x90F5],
+  ["E9E9",0x91EA],
+  ["E9EA",0x9685],
+  ["E9EB",0x96E8],
+  ["E9EC",0x96E9],
+  ["E9ED",0x52D6],
+  ["E9EE",0x5F67],
+  ["E9EF",0x65ED],
+  ["E9F0",0x6631],
+  ["E9F1",0x682F],
+  ["E9F2",0x715C],
+  ["E9F3",0x7A36],
+  ["E9F4",0x90C1],
+  ["E9F5",0x980A],
+  ["E9F6",0x4E91],
+  ["E9F7",0xF9C5],
+  ["E9F8",0x6A52],
+  ["E9F9",0x6B9E],
+  ["E9FA",0x6F90],
+  ["E9FB",0x7189],
+  ["E9FC",0x8018],
+  ["E9FD",0x82B8],
+  ["E9FE",0x8553],
+  ["EAA1",0x904B],
+  ["EAA2",0x9695],
+  ["EAA3",0x96F2],
+  ["EAA4",0x97FB],
+  ["EAA5",0x851A],
+  ["EAA6",0x9B31],
+  ["EAA7",0x4E90],
+  ["EAA8",0x718A],
+  ["EAA9",0x96C4],
+  ["EAAA",0x5143],
+  ["EAAB",0x539F],
+  ["EAAC",0x54E1],
+  ["EAAD",0x5713],
+  ["EAAE",0x5712],
+  ["EAAF",0x57A3],
+  ["EAB0",0x5A9B],
+  ["EAB1",0x5AC4],
+  ["EAB2",0x5BC3],
+  ["EAB3",0x6028],
+  ["EAB4",0x613F],
+  ["EAB5",0x63F4],
+  ["EAB6",0x6C85],
+  ["EAB7",0x6D39],
+  ["EAB8",0x6E72],
+  ["EAB9",0x6E90],
+  ["EABA",0x7230],
+  ["EABB",0x733F],
+  ["EABC",0x7457],
+  ["EABD",0x82D1],
+  ["EABE",0x8881],
+  ["EABF",0x8F45],
+  ["EAC0",0x9060],
+  ["EAC1",0xF9C6],
+  ["EAC2",0x9662],
+  ["EAC3",0x9858],
+  ["EAC4",0x9D1B],
+  ["EAC5",0x6708],
+  ["EAC6",0x8D8A],
+  ["EAC7",0x925E],
+  ["EAC8",0x4F4D],
+  ["EAC9",0x5049],
+  ["EACA",0x50DE],
+  ["EACB",0x5371],
+  ["EACC",0x570D],
+  ["EACD",0x59D4],
+  ["EACE",0x5A01],
+  ["EACF",0x5C09],
+  ["EAD0",0x6170],
+  ["EAD1",0x6690],
+  ["EAD2",0x6E2D],
+  ["EAD3",0x7232],
+  ["EAD4",0x744B],
+  ["EAD5",0x7DEF],
+  ["EAD6",0x80C3],
+  ["EAD7",0x840E],
+  ["EAD8",0x8466],
+  ["EAD9",0x853F],
+  ["EADA",0x875F],
+  ["EADB",0x885B],
+  ["EADC",0x8918],
+  ["EADD",0x8B02],
+  ["EADE",0x9055],
+  ["EADF",0x97CB],
+  ["EAE0",0x9B4F],
+  ["EAE1",0x4E73],
+  ["EAE2",0x4F91],
+  ["EAE3",0x5112],
+  ["EAE4",0x516A],
+  ["EAE5",0xF9C7],
+  ["EAE6",0x552F],
+  ["EAE7",0x55A9],
+  ["EAE8",0x5B7A],
+  ["EAE9",0x5BA5],
+  ["EAEA",0x5E7C],
+  ["EAEB",0x5E7D],
+  ["EAEC",0x5EBE],
+  ["EAED",0x60A0],
+  ["EAEE",0x60DF],
+  ["EAEF",0x6108],
+  ["EAF0",0x6109],
+  ["EAF1",0x63C4],
+  ["EAF2",0x6538],
+  ["EAF3",0x6709],
+  ["EAF4",0xF9C8],
+  ["EAF5",0x67D4],
+  ["EAF6",0x67DA],
+  ["EAF7",0xF9C9],
+  ["EAF8",0x6961],
+  ["EAF9",0x6962],
+  ["EAFA",0x6CB9],
+  ["EAFB",0x6D27],
+  ["EAFC",0xF9CA],
+  ["EAFD",0x6E38],
+  ["EAFE",0xF9CB],
+  ["EBA1",0x6FE1],
+  ["EBA2",0x7336],
+  ["EBA3",0x7337],
+  ["EBA4",0xF9CC],
+  ["EBA5",0x745C],
+  ["EBA6",0x7531],
+  ["EBA7",0xF9CD],
+  ["EBA8",0x7652],
+  ["EBA9",0xF9CE],
+  ["EBAA",0xF9CF],
+  ["EBAB",0x7DAD],
+  ["EBAC",0x81FE],
+  ["EBAD",0x8438],
+  ["EBAE",0x88D5],
+  ["EBAF",0x8A98],
+  ["EBB0",0x8ADB],
+  ["EBB1",0x8AED],
+  ["EBB2",0x8E30],
+  ["EBB3",0x8E42],
+  ["EBB4",0x904A],
+  ["EBB5",0x903E],
+  ["EBB6",0x907A],
+  ["EBB7",0x9149],
+  ["EBB8",0x91C9],
+  ["EBB9",0x936E],
+  ["EBBA",0xF9D0],
+  ["EBBB",0xF9D1],
+  ["EBBC",0x5809],
+  ["EBBD",0xF9D2],
+  ["EBBE",0x6BD3],
+  ["EBBF",0x8089],
+  ["EBC0",0x80B2],
+  ["EBC1",0xF9D3],
+  ["EBC2",0xF9D4],
+  ["EBC3",0x5141],
+  ["EBC4",0x596B],
+  ["EBC5",0x5C39],
+  ["EBC6",0xF9D5],
+  ["EBC7",0xF9D6],
+  ["EBC8",0x6F64],
+  ["EBC9",0x73A7],
+  ["EBCA",0x80E4],
+  ["EBCB",0x8D07],
+  ["EBCC",0xF9D7],
+  ["EBCD",0x9217],
+  ["EBCE",0x958F],
+  ["EBCF",0xF9D8],
+  ["EBD0",0xF9D9],
+  ["EBD1",0xF9DA],
+  ["EBD2",0xF9DB],
+  ["EBD3",0x807F],
+  ["EBD4",0x620E],
+  ["EBD5",0x701C],
+  ["EBD6",0x7D68],
+  ["EBD7",0x878D],
+  ["EBD8",0xF9DC],
+  ["EBD9",0x57A0],
+  ["EBDA",0x6069],
+  ["EBDB",0x6147],
+  ["EBDC",0x6BB7],
+  ["EBDD",0x8ABE],
+  ["EBDE",0x9280],
+  ["EBDF",0x96B1],
+  ["EBE0",0x4E59],
+  ["EBE1",0x541F],
+  ["EBE2",0x6DEB],
+  ["EBE3",0x852D],
+  ["EBE4",0x9670],
+  ["EBE5",0x97F3],
+  ["EBE6",0x98EE],
+  ["EBE7",0x63D6],
+  ["EBE8",0x6CE3],
+  ["EBE9",0x9091],
+  ["EBEA",0x51DD],
+  ["EBEB",0x61C9],
+  ["EBEC",0x81BA],
+  ["EBED",0x9DF9],
+  ["EBEE",0x4F9D],
+  ["EBEF",0x501A],
+  ["EBF0",0x5100],
+  ["EBF1",0x5B9C],
+  ["EBF2",0x610F],
+  ["EBF3",0x61FF],
+  ["EBF4",0x64EC],
+  ["EBF5",0x6905],
+  ["EBF6",0x6BC5],
+  ["EBF7",0x7591],
+  ["EBF8",0x77E3],
+  ["EBF9",0x7FA9],
+  ["EBFA",0x8264],
+  ["EBFB",0x858F],
+  ["EBFC",0x87FB],
+  ["EBFD",0x8863],
+  ["EBFE",0x8ABC],
+  ["ECA1",0x8B70],
+  ["ECA2",0x91AB],
+  ["ECA3",0x4E8C],
+  ["ECA4",0x4EE5],
+  ["ECA5",0x4F0A],
+  ["ECA6",0xF9DD],
+  ["ECA7",0xF9DE],
+  ["ECA8",0x5937],
+  ["ECA9",0x59E8],
+  ["ECAA",0xF9DF],
+  ["ECAB",0x5DF2],
+  ["ECAC",0x5F1B],
+  ["ECAD",0x5F5B],
+  ["ECAE",0x6021],
+  ["ECAF",0xF9E0],
+  ["ECB0",0xF9E1],
+  ["ECB1",0xF9E2],
+  ["ECB2",0xF9E3],
+  ["ECB3",0x723E],
+  ["ECB4",0x73E5],
+  ["ECB5",0xF9E4],
+  ["ECB6",0x7570],
+  ["ECB7",0x75CD],
+  ["ECB8",0xF9E5],
+  ["ECB9",0x79FB],
+  ["ECBA",0xF9E6],
+  ["ECBB",0x800C],
+  ["ECBC",0x8033],
+  ["ECBD",0x8084],
+  ["ECBE",0x82E1],
+  ["ECBF",0x8351],
+  ["ECC0",0xF9E7],
+  ["ECC1",0xF9E8],
+  ["ECC2",0x8CBD],
+  ["ECC3",0x8CB3],
+  ["ECC4",0x9087],
+  ["ECC5",0xF9E9],
+  ["ECC6",0xF9EA],
+  ["ECC7",0x98F4],
+  ["ECC8",0x990C],
+  ["ECC9",0xF9EB],
+  ["ECCA",0xF9EC],
+  ["ECCB",0x7037],
+  ["ECCC",0x76CA],
+  ["ECCD",0x7FCA],
+  ["ECCE",0x7FCC],
+  ["ECCF",0x7FFC],
+  ["ECD0",0x8B1A],
+  ["ECD1",0x4EBA],
+  ["ECD2",0x4EC1],
+  ["ECD3",0x5203],
+  ["ECD4",0x5370],
+  ["ECD5",0xF9ED],
+  ["ECD6",0x54BD],
+  ["ECD7",0x56E0],
+  ["ECD8",0x59FB],
+  ["ECD9",0x5BC5],
+  ["ECDA",0x5F15],
+  ["ECDB",0x5FCD],
+  ["ECDC",0x6E6E],
+  ["ECDD",0xF9EE],
+  ["ECDE",0xF9EF],
+  ["ECDF",0x7D6A],
+  ["ECE0",0x8335],
+  ["ECE1",0xF9F0],
+  ["ECE2",0x8693],
+  ["ECE3",0x8A8D],
+  ["ECE4",0xF9F1],
+  ["ECE5",0x976D],
+  ["ECE6",0x9777],
+  ["ECE7",0xF9F2],
+  ["ECE8",0xF9F3],
+  ["ECE9",0x4E00],
+  ["ECEA",0x4F5A],
+  ["ECEB",0x4F7E],
+  ["ECEC",0x58F9],
+  ["ECED",0x65E5],
+  ["ECEE",0x6EA2],
+  ["ECEF",0x9038],
+  ["ECF0",0x93B0],
+  ["ECF1",0x99B9],
+  ["ECF2",0x4EFB],
+  ["ECF3",0x58EC],
+  ["ECF4",0x598A],
+  ["ECF5",0x59D9],
+  ["ECF6",0x6041],
+  ["ECF7",0xF9F4],
+  ["ECF8",0xF9F5],
+  ["ECF9",0x7A14],
+  ["ECFA",0xF9F6],
+  ["ECFB",0x834F],
+  ["ECFC",0x8CC3],
+  ["ECFD",0x5165],
+  ["ECFE",0x5344],
+  ["EDA1",0xF9F7],
+  ["EDA2",0xF9F8],
+  ["EDA3",0xF9F9],
+  ["EDA4",0x4ECD],
+  ["EDA5",0x5269],
+  ["EDA6",0x5B55],
+  ["EDA7",0x82BF],
+  ["EDA8",0x4ED4],
+  ["EDA9",0x523A],
+  ["EDAA",0x54A8],
+  ["EDAB",0x59C9],
+  ["EDAC",0x59FF],
+  ["EDAD",0x5B50],
+  ["EDAE",0x5B57],
+  ["EDAF",0x5B5C],
+  ["EDB0",0x6063],
+  ["EDB1",0x6148],
+  ["EDB2",0x6ECB],
+  ["EDB3",0x7099],
+  ["EDB4",0x716E],
+  ["EDB5",0x7386],
+  ["EDB6",0x74F7],
+  ["EDB7",0x75B5],
+  ["EDB8",0x78C1],
+  ["EDB9",0x7D2B],
+  ["EDBA",0x8005],
+  ["EDBB",0x81EA],
+  ["EDBC",0x8328],
+  ["EDBD",0x8517],
+  ["EDBE",0x85C9],
+  ["EDBF",0x8AEE],
+  ["EDC0",0x8CC7],
+  ["EDC1",0x96CC],
+  ["EDC2",0x4F5C],
+  ["EDC3",0x52FA],
+  ["EDC4",0x56BC],
+  ["EDC5",0x65AB],
+  ["EDC6",0x6628],
+  ["EDC7",0x707C],
+  ["EDC8",0x70B8],
+  ["EDC9",0x7235],
+  ["EDCA",0x7DBD],
+  ["EDCB",0x828D],
+  ["EDCC",0x914C],
+  ["EDCD",0x96C0],
+  ["EDCE",0x9D72],
+  ["EDCF",0x5B71],
+  ["EDD0",0x68E7],
+  ["EDD1",0x6B98],
+  ["EDD2",0x6F7A],
+  ["EDD3",0x76DE],
+  ["EDD4",0x5C91],
+  ["EDD5",0x66AB],
+  ["EDD6",0x6F5B],
+  ["EDD7",0x7BB4],
+  ["EDD8",0x7C2A],
+  ["EDD9",0x8836],
+  ["EDDA",0x96DC],
+  ["EDDB",0x4E08],
+  ["EDDC",0x4ED7],
+  ["EDDD",0x5320],
+  ["EDDE",0x5834],
+  ["EDDF",0x58BB],
+  ["EDE0",0x58EF],
+  ["EDE1",0x596C],
+  ["EDE2",0x5C07],
+  ["EDE3",0x5E33],
+  ["EDE4",0x5E84],
+  ["EDE5",0x5F35],
+  ["EDE6",0x638C],
+  ["EDE7",0x66B2],
+  ["EDE8",0x6756],
+  ["EDE9",0x6A1F],
+  ["EDEA",0x6AA3],
+  ["EDEB",0x6B0C],
+  ["EDEC",0x6F3F],
+  ["EDED",0x7246],
+  ["EDEE",0xF9FA],
+  ["EDEF",0x7350],
+  ["EDF0",0x748B],
+  ["EDF1",0x7AE0],
+  ["EDF2",0x7CA7],
+  ["EDF3",0x8178],
+  ["EDF4",0x81DF],
+  ["EDF5",0x81E7],
+  ["EDF6",0x838A],
+  ["EDF7",0x846C],
+  ["EDF8",0x8523],
+  ["EDF9",0x8594],
+  ["EDFA",0x85CF],
+  ["EDFB",0x88DD],
+  ["EDFC",0x8D13],
+  ["EDFD",0x91AC],
+  ["EDFE",0x9577],
+  ["EEA1",0x969C],
+  ["EEA2",0x518D],
+  ["EEA3",0x54C9],
+  ["EEA4",0x5728],
+  ["EEA5",0x5BB0],
+  ["EEA6",0x624D],
+  ["EEA7",0x6750],
+  ["EEA8",0x683D],
+  ["EEA9",0x6893],
+  ["EEAA",0x6E3D],
+  ["EEAB",0x6ED3],
+  ["EEAC",0x707D],
+  ["EEAD",0x7E21],
+  ["EEAE",0x88C1],
+  ["EEAF",0x8CA1],
+  ["EEB0",0x8F09],
+  ["EEB1",0x9F4B],
+  ["EEB2",0x9F4E],
+  ["EEB3",0x722D],
+  ["EEB4",0x7B8F],
+  ["EEB5",0x8ACD],
+  ["EEB6",0x931A],
+  ["EEB7",0x4F47],
+  ["EEB8",0x4F4E],
+  ["EEB9",0x5132],
+  ["EEBA",0x5480],
+  ["EEBB",0x59D0],
+  ["EEBC",0x5E95],
+  ["EEBD",0x62B5],
+  ["EEBE",0x6775],
+  ["EEBF",0x696E],
+  ["EEC0",0x6A17],
+  ["EEC1",0x6CAE],
+  ["EEC2",0x6E1A],
+  ["EEC3",0x72D9],
+  ["EEC4",0x732A],
+  ["EEC5",0x75BD],
+  ["EEC6",0x7BB8],
+  ["EEC7",0x7D35],
+  ["EEC8",0x82E7],
+  ["EEC9",0x83F9],
+  ["EECA",0x8457],
+  ["EECB",0x85F7],
+  ["EECC",0x8A5B],
+  ["EECD",0x8CAF],
+  ["EECE",0x8E87],
+  ["EECF",0x9019],
+  ["EED0",0x90B8],
+  ["EED1",0x96CE],
+  ["EED2",0x9F5F],
+  ["EED3",0x52E3],
+  ["EED4",0x540A],
+  ["EED5",0x5AE1],
+  ["EED6",0x5BC2],
+  ["EED7",0x6458],
+  ["EED8",0x6575],
+  ["EED9",0x6EF4],
+  ["EEDA",0x72C4],
+  ["EEDB",0xF9FB],
+  ["EEDC",0x7684],
+  ["EEDD",0x7A4D],
+  ["EEDE",0x7B1B],
+  ["EEDF",0x7C4D],
+  ["EEE0",0x7E3E],
+  ["EEE1",0x7FDF],
+  ["EEE2",0x837B],
+  ["EEE3",0x8B2B],
+  ["EEE4",0x8CCA],
+  ["EEE5",0x8D64],
+  ["EEE6",0x8DE1],
+  ["EEE7",0x8E5F],
+  ["EEE8",0x8FEA],
+  ["EEE9",0x8FF9],
+  ["EEEA",0x9069],
+  ["EEEB",0x93D1],
+  ["EEEC",0x4F43],
+  ["EEED",0x4F7A],
+  ["EEEE",0x50B3],
+  ["EEEF",0x5168],
+  ["EEF0",0x5178],
+  ["EEF1",0x524D],
+  ["EEF2",0x526A],
+  ["EEF3",0x5861],
+  ["EEF4",0x587C],
+  ["EEF5",0x5960],
+  ["EEF6",0x5C08],
+  ["EEF7",0x5C55],
+  ["EEF8",0x5EDB],
+  ["EEF9",0x609B],
+  ["EEFA",0x6230],
+  ["EEFB",0x6813],
+  ["EEFC",0x6BBF],
+  ["EEFD",0x6C08],
+  ["EEFE",0x6FB1],
+  ["EFA1",0x714E],
+  ["EFA2",0x7420],
+  ["EFA3",0x7530],
+  ["EFA4",0x7538],
+  ["EFA5",0x7551],
+  ["EFA6",0x7672],
+  ["EFA7",0x7B4C],
+  ["EFA8",0x7B8B],
+  ["EFA9",0x7BAD],
+  ["EFAA",0x7BC6],
+  ["EFAB",0x7E8F],
+  ["EFAC",0x8A6E],
+  ["EFAD",0x8F3E],
+  ["EFAE",0x8F49],
+  ["EFAF",0x923F],
+  ["EFB0",0x9293],
+  ["EFB1",0x9322],
+  ["EFB2",0x942B],
+  ["EFB3",0x96FB],
+  ["EFB4",0x985A],
+  ["EFB5",0x986B],
+  ["EFB6",0x991E],
+  ["EFB7",0x5207],
+  ["EFB8",0x622A],
+  ["EFB9",0x6298],
+  ["EFBA",0x6D59],
+  ["EFBB",0x7664],
+  ["EFBC",0x7ACA],
+  ["EFBD",0x7BC0],
+  ["EFBE",0x7D76],
+  ["EFBF",0x5360],
+  ["EFC0",0x5CBE],
+  ["EFC1",0x5E97],
+  ["EFC2",0x6F38],
+  ["EFC3",0x70B9],
+  ["EFC4",0x7C98],
+  ["EFC5",0x9711],
+  ["EFC6",0x9B8E],
+  ["EFC7",0x9EDE],
+  ["EFC8",0x63A5],
+  ["EFC9",0x647A],
+  ["EFCA",0x8776],
+  ["EFCB",0x4E01],
+  ["EFCC",0x4E95],
+  ["EFCD",0x4EAD],
+  ["EFCE",0x505C],
+  ["EFCF",0x5075],
+  ["EFD0",0x5448],
+  ["EFD1",0x59C3],
+  ["EFD2",0x5B9A],
+  ["EFD3",0x5E40],
+  ["EFD4",0x5EAD],
+  ["EFD5",0x5EF7],
+  ["EFD6",0x5F81],
+  ["EFD7",0x60C5],
+  ["EFD8",0x633A],
+  ["EFD9",0x653F],
+  ["EFDA",0x6574],
+  ["EFDB",0x65CC],
+  ["EFDC",0x6676],
+  ["EFDD",0x6678],
+  ["EFDE",0x67FE],
+  ["EFDF",0x6968],
+  ["EFE0",0x6A89],
+  ["EFE1",0x6B63],
+  ["EFE2",0x6C40],
+  ["EFE3",0x6DC0],
+  ["EFE4",0x6DE8],
+  ["EFE5",0x6E1F],
+  ["EFE6",0x6E5E],
+  ["EFE7",0x701E],
+  ["EFE8",0x70A1],
+  ["EFE9",0x738E],
+  ["EFEA",0x73FD],
+  ["EFEB",0x753A],
+  ["EFEC",0x775B],
+  ["EFED",0x7887],
+  ["EFEE",0x798E],
+  ["EFEF",0x7A0B],
+  ["EFF0",0x7A7D],
+  ["EFF1",0x7CBE],
+  ["EFF2",0x7D8E],
+  ["EFF3",0x8247],
+  ["EFF4",0x8A02],
+  ["EFF5",0x8AEA],
+  ["EFF6",0x8C9E],
+  ["EFF7",0x912D],
+  ["EFF8",0x914A],
+  ["EFF9",0x91D8],
+  ["EFFA",0x9266],
+  ["EFFB",0x92CC],
+  ["EFFC",0x9320],
+  ["EFFD",0x9706],
+  ["EFFE",0x9756],
+  ["F0A1",0x975C],
+  ["F0A2",0x9802],
+  ["F0A3",0x9F0E],
+  ["F0A4",0x5236],
+  ["F0A5",0x5291],
+  ["F0A6",0x557C],
+  ["F0A7",0x5824],
+  ["F0A8",0x5E1D],
+  ["F0A9",0x5F1F],
+  ["F0AA",0x608C],
+  ["F0AB",0x63D0],
+  ["F0AC",0x68AF],
+  ["F0AD",0x6FDF],
+  ["F0AE",0x796D],
+  ["F0AF",0x7B2C],
+  ["F0B0",0x81CD],
+  ["F0B1",0x85BA],
+  ["F0B2",0x88FD],
+  ["F0B3",0x8AF8],
+  ["F0B4",0x8E44],
+  ["F0B5",0x918D],
+  ["F0B6",0x9664],
+  ["F0B7",0x969B],
+  ["F0B8",0x973D],
+  ["F0B9",0x984C],
+  ["F0BA",0x9F4A],
+  ["F0BB",0x4FCE],
+  ["F0BC",0x5146],
+  ["F0BD",0x51CB],
+  ["F0BE",0x52A9],
+  ["F0BF",0x5632],
+  ["F0C0",0x5F14],
+  ["F0C1",0x5F6B],
+  ["F0C2",0x63AA],
+  ["F0C3",0x64CD],
+  ["F0C4",0x65E9],
+  ["F0C5",0x6641],
+  ["F0C6",0x66FA],
+  ["F0C7",0x66F9],
+  ["F0C8",0x671D],
+  ["F0C9",0x689D],
+  ["F0CA",0x68D7],
+  ["F0CB",0x69FD],
+  ["F0CC",0x6F15],
+  ["F0CD",0x6F6E],
+  ["F0CE",0x7167],
+  ["F0CF",0x71E5],
+  ["F0D0",0x722A],
+  ["F0D1",0x74AA],
+  ["F0D2",0x773A],
+  ["F0D3",0x7956],
+  ["F0D4",0x795A],
+  ["F0D5",0x79DF],
+  ["F0D6",0x7A20],
+  ["F0D7",0x7A95],
+  ["F0D8",0x7C97],
+  ["F0D9",0x7CDF],
+  ["F0DA",0x7D44],
+  ["F0DB",0x7E70],
+  ["F0DC",0x8087],
+  ["F0DD",0x85FB],
+  ["F0DE",0x86A4],
+  ["F0DF",0x8A54],
+  ["F0E0",0x8ABF],
+  ["F0E1",0x8D99],
+  ["F0E2",0x8E81],
+  ["F0E3",0x9020],
+  ["F0E4",0x906D],
+  ["F0E5",0x91E3],
+  ["F0E6",0x963B],
+  ["F0E7",0x96D5],
+  ["F0E8",0x9CE5],
+  ["F0E9",0x65CF],
+  ["F0EA",0x7C07],
+  ["F0EB",0x8DB3],
+  ["F0EC",0x93C3],
+  ["F0ED",0x5B58],
+  ["F0EE",0x5C0A],
+  ["F0EF",0x5352],
+  ["F0F0",0x62D9],
+  ["F0F1",0x731D],
+  ["F0F2",0x5027],
+  ["F0F3",0x5B97],
+  ["F0F4",0x5F9E],
+  ["F0F5",0x60B0],
+  ["F0F6",0x616B],
+  ["F0F7",0x68D5],
+  ["F0F8",0x6DD9],
+  ["F0F9",0x742E],
+  ["F0FA",0x7A2E],
+  ["F0FB",0x7D42],
+  ["F0FC",0x7D9C],
+  ["F0FD",0x7E31],
+  ["F0FE",0x816B],
+  ["F1A1",0x8E2A],
+  ["F1A2",0x8E35],
+  ["F1A3",0x937E],
+  ["F1A4",0x9418],
+  ["F1A5",0x4F50],
+  ["F1A6",0x5750],
+  ["F1A7",0x5DE6],
+  ["F1A8",0x5EA7],
+  ["F1A9",0x632B],
+  ["F1AA",0x7F6A],
+  ["F1AB",0x4E3B],
+  ["F1AC",0x4F4F],
+  ["F1AD",0x4F8F],
+  ["F1AE",0x505A],
+  ["F1AF",0x59DD],
+  ["F1B0",0x80C4],
+  ["F1B1",0x546A],
+  ["F1B2",0x5468],
+  ["F1B3",0x55FE],
+  ["F1B4",0x594F],
+  ["F1B5",0x5B99],
+  ["F1B6",0x5DDE],
+  ["F1B7",0x5EDA],
+  ["F1B8",0x665D],
+  ["F1B9",0x6731],
+  ["F1BA",0x67F1],
+  ["F1BB",0x682A],
+  ["F1BC",0x6CE8],
+  ["F1BD",0x6D32],
+  ["F1BE",0x6E4A],
+  ["F1BF",0x6F8D],
+  ["F1C0",0x70B7],
+  ["F1C1",0x73E0],
+  ["F1C2",0x7587],
+  ["F1C3",0x7C4C],
+  ["F1C4",0x7D02],
+  ["F1C5",0x7D2C],
+  ["F1C6",0x7DA2],
+  ["F1C7",0x821F],
+  ["F1C8",0x86DB],
+  ["F1C9",0x8A3B],
+  ["F1CA",0x8A85],
+  ["F1CB",0x8D70],
+  ["F1CC",0x8E8A],
+  ["F1CD",0x8F33],
+  ["F1CE",0x9031],
+  ["F1CF",0x914E],
+  ["F1D0",0x9152],
+  ["F1D1",0x9444],
+  ["F1D2",0x99D0],
+  ["F1D3",0x7AF9],
+  ["F1D4",0x7CA5],
+  ["F1D5",0x4FCA],
+  ["F1D6",0x5101],
+  ["F1D7",0x51C6],
+  ["F1D8",0x57C8],
+  ["F1D9",0x5BEF],
+  ["F1DA",0x5CFB],
+  ["F1DB",0x6659],
+  ["F1DC",0x6A3D],
+  ["F1DD",0x6D5A],
+  ["F1DE",0x6E96],
+  ["F1DF",0x6FEC],
+  ["F1E0",0x710C],
+  ["F1E1",0x756F],
+  ["F1E2",0x7AE3],
+  ["F1E3",0x8822],
+  ["F1E4",0x9021],
+  ["F1E5",0x9075],
+  ["F1E6",0x96CB],
+  ["F1E7",0x99FF],
+  ["F1E8",0x8301],
+  ["F1E9",0x4E2D],
+  ["F1EA",0x4EF2],
+  ["F1EB",0x8846],
+  ["F1EC",0x91CD],
+  ["F1ED",0x537D],
+  ["F1EE",0x6ADB],
+  ["F1EF",0x696B],
+  ["F1F0",0x6C41],
+  ["F1F1",0x847A],
+  ["F1F2",0x589E],
+  ["F1F3",0x618E],
+  ["F1F4",0x66FE],
+  ["F1F5",0x62EF],
+  ["F1F6",0x70DD],
+  ["F1F7",0x7511],
+  ["F1F8",0x75C7],
+  ["F1F9",0x7E52],
+  ["F1FA",0x84B8],
+  ["F1FB",0x8B49],
+  ["F1FC",0x8D08],
+  ["F1FD",0x4E4B],
+  ["F1FE",0x53EA],
+  ["F2A1",0x54AB],
+  ["F2A2",0x5730],
+  ["F2A3",0x5740],
+  ["F2A4",0x5FD7],
+  ["F2A5",0x6301],
+  ["F2A6",0x6307],
+  ["F2A7",0x646F],
+  ["F2A8",0x652F],
+  ["F2A9",0x65E8],
+  ["F2AA",0x667A],
+  ["F2AB",0x679D],
+  ["F2AC",0x67B3],
+  ["F2AD",0x6B62],
+  ["F2AE",0x6C60],
+  ["F2AF",0x6C9A],
+  ["F2B0",0x6F2C],
+  ["F2B1",0x77E5],
+  ["F2B2",0x7825],
+  ["F2B3",0x7949],
+  ["F2B4",0x7957],
+  ["F2B5",0x7D19],
+  ["F2B6",0x80A2],
+  ["F2B7",0x8102],
+  ["F2B8",0x81F3],
+  ["F2B9",0x829D],
+  ["F2BA",0x82B7],
+  ["F2BB",0x8718],
+  ["F2BC",0x8A8C],
+  ["F2BD",0xF9FC],
+  ["F2BE",0x8D04],
+  ["F2BF",0x8DBE],
+  ["F2C0",0x9072],
+  ["F2C1",0x76F4],
+  ["F2C2",0x7A19],
+  ["F2C3",0x7A37],
+  ["F2C4",0x7E54],
+  ["F2C5",0x8077],
+  ["F2C6",0x5507],
+  ["F2C7",0x55D4],
+  ["F2C8",0x5875],
+  ["F2C9",0x632F],
+  ["F2CA",0x6422],
+  ["F2CB",0x6649],
+  ["F2CC",0x664B],
+  ["F2CD",0x686D],
+  ["F2CE",0x699B],
+  ["F2CF",0x6B84],
+  ["F2D0",0x6D25],
+  ["F2D1",0x6EB1],
+  ["F2D2",0x73CD],
+  ["F2D3",0x7468],
+  ["F2D4",0x74A1],
+  ["F2D5",0x755B],
+  ["F2D6",0x75B9],
+  ["F2D7",0x76E1],
+  ["F2D8",0x771E],
+  ["F2D9",0x778B],
+  ["F2DA",0x79E6],
+  ["F2DB",0x7E09],
+  ["F2DC",0x7E1D],
+  ["F2DD",0x81FB],
+  ["F2DE",0x852F],
+  ["F2DF",0x8897],
+  ["F2E0",0x8A3A],
+  ["F2E1",0x8CD1],
+  ["F2E2",0x8EEB],
+  ["F2E3",0x8FB0],
+  ["F2E4",0x9032],
+  ["F2E5",0x93AD],
+  ["F2E6",0x9663],
+  ["F2E7",0x9673],
+  ["F2E8",0x9707],
+  ["F2E9",0x4F84],
+  ["F2EA",0x53F1],
+  ["F2EB",0x59EA],
+  ["F2EC",0x5AC9],
+  ["F2ED",0x5E19],
+  ["F2EE",0x684E],
+  ["F2EF",0x74C6],
+  ["F2F0",0x75BE],
+  ["F2F1",0x79E9],
+  ["F2F2",0x7A92],
+  ["F2F3",0x81A3],
+  ["F2F4",0x86ED],
+  ["F2F5",0x8CEA],
+  ["F2F6",0x8DCC],
+  ["F2F7",0x8FED],
+  ["F2F8",0x659F],
+  ["F2F9",0x6715],
+  ["F2FA",0xF9FD],
+  ["F2FB",0x57F7],
+  ["F2FC",0x6F57],
+  ["F2FD",0x7DDD],
+  ["F2FE",0x8F2F],
+  ["F3A1",0x93F6],
+  ["F3A2",0x96C6],
+  ["F3A3",0x5FB5],
+  ["F3A4",0x61F2],
+  ["F3A5",0x6F84],
+  ["F3A6",0x4E14],
+  ["F3A7",0x4F98],
+  ["F3A8",0x501F],
+  ["F3A9",0x53C9],
+  ["F3AA",0x55DF],
+  ["F3AB",0x5D6F],
+  ["F3AC",0x5DEE],
+  ["F3AD",0x6B21],
+  ["F3AE",0x6B64],
+  ["F3AF",0x78CB],
+  ["F3B0",0x7B9A],
+  ["F3B1",0xF9FE],
+  ["F3B2",0x8E49],
+  ["F3B3",0x8ECA],
+  ["F3B4",0x906E],
+  ["F3B5",0x6349],
+  ["F3B6",0x643E],
+  ["F3B7",0x7740],
+  ["F3B8",0x7A84],
+  ["F3B9",0x932F],
+  ["F3BA",0x947F],
+  ["F3BB",0x9F6A],
+  ["F3BC",0x64B0],
+  ["F3BD",0x6FAF],
+  ["F3BE",0x71E6],
+  ["F3BF",0x74A8],
+  ["F3C0",0x74DA],
+  ["F3C1",0x7AC4],
+  ["F3C2",0x7C12],
+  ["F3C3",0x7E82],
+  ["F3C4",0x7CB2],
+  ["F3C5",0x7E98],
+  ["F3C6",0x8B9A],
+  ["F3C7",0x8D0A],
+  ["F3C8",0x947D],
+  ["F3C9",0x9910],
+  ["F3CA",0x994C],
+  ["F3CB",0x5239],
+  ["F3CC",0x5BDF],
+  ["F3CD",0x64E6],
+  ["F3CE",0x672D],
+  ["F3CF",0x7D2E],
+  ["F3D0",0x50ED],
+  ["F3D1",0x53C3],
+  ["F3D2",0x5879],
+  ["F3D3",0x6158],
+  ["F3D4",0x6159],
+  ["F3D5",0x61FA],
+  ["F3D6",0x65AC],
+  ["F3D7",0x7AD9],
+  ["F3D8",0x8B92],
+  ["F3D9",0x8B96],
+  ["F3DA",0x5009],
+  ["F3DB",0x5021],
+  ["F3DC",0x5275],
+  ["F3DD",0x5531],
+  ["F3DE",0x5A3C],
+  ["F3DF",0x5EE0],
+  ["F3E0",0x5F70],
+  ["F3E1",0x6134],
+  ["F3E2",0x655E],
+  ["F3E3",0x660C],
+  ["F3E4",0x6636],
+  ["F3E5",0x66A2],
+  ["F3E6",0x69CD],
+  ["F3E7",0x6EC4],
+  ["F3E8",0x6F32],
+  ["F3E9",0x7316],
+  ["F3EA",0x7621],
+  ["F3EB",0x7A93],
+  ["F3EC",0x8139],
+  ["F3ED",0x8259],
+  ["F3EE",0x83D6],
+  ["F3EF",0x84BC],
+  ["F3F0",0x50B5],
+  ["F3F1",0x57F0],
+  ["F3F2",0x5BC0],
+  ["F3F3",0x5BE8],
+  ["F3F4",0x5F69],
+  ["F3F5",0x63A1],
+  ["F3F6",0x7826],
+  ["F3F7",0x7DB5],
+  ["F3F8",0x83DC],
+  ["F3F9",0x8521],
+  ["F3FA",0x91C7],
+  ["F3FB",0x91F5],
+  ["F3FC",0x518A],
+  ["F3FD",0x67F5],
+  ["F3FE",0x7B56],
+  ["F4A1",0x8CAC],
+  ["F4A2",0x51C4],
+  ["F4A3",0x59BB],
+  ["F4A4",0x60BD],
+  ["F4A5",0x8655],
+  ["F4A6",0x501C],
+  ["F4A7",0xF9FF],
+  ["F4A8",0x5254],
+  ["F4A9",0x5C3A],
+  ["F4AA",0x617D],
+  ["F4AB",0x621A],
+  ["F4AC",0x62D3],
+  ["F4AD",0x64F2],
+  ["F4AE",0x65A5],
+  ["F4AF",0x6ECC],
+  ["F4B0",0x7620],
+  ["F4B1",0x810A],
+  ["F4B2",0x8E60],
+  ["F4B3",0x965F],
+  ["F4B4",0x96BB],
+  ["F4B5",0x4EDF],
+  ["F4B6",0x5343],
+  ["F4B7",0x5598],
+  ["F4B8",0x5929],
+  ["F4B9",0x5DDD],
+  ["F4BA",0x64C5],
+  ["F4BB",0x6CC9],
+  ["F4BC",0x6DFA],
+  ["F4BD",0x7394],
+  ["F4BE",0x7A7F],
+  ["F4BF",0x821B],
+  ["F4C0",0x85A6],
+  ["F4C1",0x8CE4],
+  ["F4C2",0x8E10],
+  ["F4C3",0x9077],
+  ["F4C4",0x91E7],
+  ["F4C5",0x95E1],
+  ["F4C6",0x9621],
+  ["F4C7",0x97C6],
+  ["F4C8",0x51F8],
+  ["F4C9",0x54F2],
+  ["F4CA",0x5586],
+  ["F4CB",0x5FB9],
+  ["F4CC",0x64A4],
+  ["F4CD",0x6F88],
+  ["F4CE",0x7DB4],
+  ["F4CF",0x8F1F],
+  ["F4D0",0x8F4D],
+  ["F4D1",0x9435],
+  ["F4D2",0x50C9],
+  ["F4D3",0x5C16],
+  ["F4D4",0x6CBE],
+  ["F4D5",0x6DFB],
+  ["F4D6",0x751B],
+  ["F4D7",0x77BB],
+  ["F4D8",0x7C3D],
+  ["F4D9",0x7C64],
+  ["F4DA",0x8A79],
+  ["F4DB",0x8AC2],
+  ["F4DC",0x581E],
+  ["F4DD",0x59BE],
+  ["F4DE",0x5E16],
+  ["F4DF",0x6377],
+  ["F4E0",0x7252],
+  ["F4E1",0x758A],
+  ["F4E2",0x776B],
+  ["F4E3",0x8ADC],
+  ["F4E4",0x8CBC],
+  ["F4E5",0x8F12],
+  ["F4E6",0x5EF3],
+  ["F4E7",0x6674],
+  ["F4E8",0x6DF8],
+  ["F4E9",0x807D],
+  ["F4EA",0x83C1],
+  ["F4EB",0x8ACB],
+  ["F4EC",0x9751],
+  ["F4ED",0x9BD6],
+  ["F4EE",0xFA00],
+  ["F4EF",0x5243],
+  ["F4F0",0x66FF],
+  ["F4F1",0x6D95],
+  ["F4F2",0x6EEF],
+  ["F4F3",0x7DE0],
+  ["F4F4",0x8AE6],
+  ["F4F5",0x902E],
+  ["F4F6",0x905E],
+  ["F4F7",0x9AD4],
+  ["F4F8",0x521D],
+  ["F4F9",0x527F],
+  ["F4FA",0x54E8],
+  ["F4FB",0x6194],
+  ["F4FC",0x6284],
+  ["F4FD",0x62DB],
+  ["F4FE",0x68A2],
+  ["F5A1",0x6912],
+  ["F5A2",0x695A],
+  ["F5A3",0x6A35],
+  ["F5A4",0x7092],
+  ["F5A5",0x7126],
+  ["F5A6",0x785D],
+  ["F5A7",0x7901],
+  ["F5A8",0x790E],
+  ["F5A9",0x79D2],
+  ["F5AA",0x7A0D],
+  ["F5AB",0x8096],
+  ["F5AC",0x8278],
+  ["F5AD",0x82D5],
+  ["F5AE",0x8349],
+  ["F5AF",0x8549],
+  ["F5B0",0x8C82],
+  ["F5B1",0x8D85],
+  ["F5B2",0x9162],
+  ["F5B3",0x918B],
+  ["F5B4",0x91AE],
+  ["F5B5",0x4FC3],
+  ["F5B6",0x56D1],
+  ["F5B7",0x71ED],
+  ["F5B8",0x77D7],
+  ["F5B9",0x8700],
+  ["F5BA",0x89F8],
+  ["F5BB",0x5BF8],
+  ["F5BC",0x5FD6],
+  ["F5BD",0x6751],
+  ["F5BE",0x90A8],
+  ["F5BF",0x53E2],
+  ["F5C0",0x585A],
+  ["F5C1",0x5BF5],
+  ["F5C2",0x60A4],
+  ["F5C3",0x6181],
+  ["F5C4",0x6460],
+  ["F5C5",0x7E3D],
+  ["F5C6",0x8070],
+  ["F5C7",0x8525],
+  ["F5C8",0x9283],
+  ["F5C9",0x64AE],
+  ["F5CA",0x50AC],
+  ["F5CB",0x5D14],
+  ["F5CC",0x6700],
+  ["F5CD",0x589C],
+  ["F5CE",0x62BD],
+  ["F5CF",0x63A8],
+  ["F5D0",0x690E],
+  ["F5D1",0x6978],
+  ["F5D2",0x6A1E],
+  ["F5D3",0x6E6B],
+  ["F5D4",0x76BA],
+  ["F5D5",0x79CB],
+  ["F5D6",0x82BB],
+  ["F5D7",0x8429],
+  ["F5D8",0x8ACF],
+  ["F5D9",0x8DA8],
+  ["F5DA",0x8FFD],
+  ["F5DB",0x9112],
+  ["F5DC",0x914B],
+  ["F5DD",0x919C],
+  ["F5DE",0x9310],
+  ["F5DF",0x9318],
+  ["F5E0",0x939A],
+  ["F5E1",0x96DB],
+  ["F5E2",0x9A36],
+  ["F5E3",0x9C0D],
+  ["F5E4",0x4E11],
+  ["F5E5",0x755C],
+  ["F5E6",0x795D],
+  ["F5E7",0x7AFA],
+  ["F5E8",0x7B51],
+  ["F5E9",0x7BC9],
+  ["F5EA",0x7E2E],
+  ["F5EB",0x84C4],
+  ["F5EC",0x8E59],
+  ["F5ED",0x8E74],
+  ["F5EE",0x8EF8],
+  ["F5EF",0x9010],
+  ["F5F0",0x6625],
+  ["F5F1",0x693F],
+  ["F5F2",0x7443],
+  ["F5F3",0x51FA],
+  ["F5F4",0x672E],
+  ["F5F5",0x9EDC],
+  ["F5F6",0x5145],
+  ["F5F7",0x5FE0],
+  ["F5F8",0x6C96],
+  ["F5F9",0x87F2],
+  ["F5FA",0x885D],
+  ["F5FB",0x8877],
+  ["F5FC",0x60B4],
+  ["F5FD",0x81B5],
+  ["F5FE",0x8403],
+  ["F6A1",0x8D05],
+  ["F6A2",0x53D6],
+  ["F6A3",0x5439],
+  ["F6A4",0x5634],
+  ["F6A5",0x5A36],
+  ["F6A6",0x5C31],
+  ["F6A7",0x708A],
+  ["F6A8",0x7FE0],
+  ["F6A9",0x805A],
+  ["F6AA",0x8106],
+  ["F6AB",0x81ED],
+  ["F6AC",0x8DA3],
+  ["F6AD",0x9189],
+  ["F6AE",0x9A5F],
+  ["F6AF",0x9DF2],
+  ["F6B0",0x5074],
+  ["F6B1",0x4EC4],
+  ["F6B2",0x53A0],
+  ["F6B3",0x60FB],
+  ["F6B4",0x6E2C],
+  ["F6B5",0x5C64],
+  ["F6B6",0x4F88],
+  ["F6B7",0x5024],
+  ["F6B8",0x55E4],
+  ["F6B9",0x5CD9],
+  ["F6BA",0x5E5F],
+  ["F6BB",0x6065],
+  ["F6BC",0x6894],
+  ["F6BD",0x6CBB],
+  ["F6BE",0x6DC4],
+  ["F6BF",0x71BE],
+  ["F6C0",0x75D4],
+  ["F6C1",0x75F4],
+  ["F6C2",0x7661],
+  ["F6C3",0x7A1A],
+  ["F6C4",0x7A49],
+  ["F6C5",0x7DC7],
+  ["F6C6",0x7DFB],
+  ["F6C7",0x7F6E],
+  ["F6C8",0x81F4],
+  ["F6C9",0x86A9],
+  ["F6CA",0x8F1C],
+  ["F6CB",0x96C9],
+  ["F6CC",0x99B3],
+  ["F6CD",0x9F52],
+  ["F6CE",0x5247],
+  ["F6CF",0x52C5],
+  ["F6D0",0x98ED],
+  ["F6D1",0x89AA],
+  ["F6D2",0x4E03],
+  ["F6D3",0x67D2],
+  ["F6D4",0x6F06],
+  ["F6D5",0x4FB5],
+  ["F6D6",0x5BE2],
+  ["F6D7",0x6795],
+  ["F6D8",0x6C88],
+  ["F6D9",0x6D78],
+  ["F6DA",0x741B],
+  ["F6DB",0x7827],
+  ["F6DC",0x91DD],
+  ["F6DD",0x937C],
+  ["F6DE",0x87C4],
+  ["F6DF",0x79E4],
+  ["F6E0",0x7A31],
+  ["F6E1",0x5FEB],
+  ["F6E2",0x4ED6],
+  ["F6E3",0x54A4],
+  ["F6E4",0x553E],
+  ["F6E5",0x58AE],
+  ["F6E6",0x59A5],
+  ["F6E7",0x60F0],
+  ["F6E8",0x6253],
+  ["F6E9",0x62D6],
+  ["F6EA",0x6736],
+  ["F6EB",0x6955],
+  ["F6EC",0x8235],
+  ["F6ED",0x9640],
+  ["F6EE",0x99B1],
+  ["F6EF",0x99DD],
+  ["F6F0",0x502C],
+  ["F6F1",0x5353],
+  ["F6F2",0x5544],
+  ["F6F3",0x577C],
+  ["F6F4",0xFA01],
+  ["F6F5",0x6258],
+  ["F6F6",0xFA02],
+  ["F6F7",0x64E2],
+  ["F6F8",0x666B],
+  ["F6F9",0x67DD],
+  ["F6FA",0x6FC1],
+  ["F6FB",0x6FEF],
+  ["F6FC",0x7422],
+  ["F6FD",0x7438],
+  ["F6FE",0x8A17],
+  ["F7A1",0x9438],
+  ["F7A2",0x5451],
+  ["F7A3",0x5606],
+  ["F7A4",0x5766],
+  ["F7A5",0x5F48],
+  ["F7A6",0x619A],
+  ["F7A7",0x6B4E],
+  ["F7A8",0x7058],
+  ["F7A9",0x70AD],
+  ["F7AA",0x7DBB],
+  ["F7AB",0x8A95],
+  ["F7AC",0x596A],
+  ["F7AD",0x812B],
+  ["F7AE",0x63A2],
+  ["F7AF",0x7708],
+  ["F7B0",0x803D],
+  ["F7B1",0x8CAA],
+  ["F7B2",0x5854],
+  ["F7B3",0x642D],
+  ["F7B4",0x69BB],
+  ["F7B5",0x5B95],
+  ["F7B6",0x5E11],
+  ["F7B7",0x6E6F],
+  ["F7B8",0xFA03],
+  ["F7B9",0x8569],
+  ["F7BA",0x514C],
+  ["F7BB",0x53F0],
+  ["F7BC",0x592A],
+  ["F7BD",0x6020],
+  ["F7BE",0x614B],
+  ["F7BF",0x6B86],
+  ["F7C0",0x6C70],
+  ["F7C1",0x6CF0],
+  ["F7C2",0x7B1E],
+  ["F7C3",0x80CE],
+  ["F7C4",0x82D4],
+  ["F7C5",0x8DC6],
+  ["F7C6",0x90B0],
+  ["F7C7",0x98B1],
+  ["F7C8",0xFA04],
+  ["F7C9",0x64C7],
+  ["F7CA",0x6FA4],
+  ["F7CB",0x6491],
+  ["F7CC",0x6504],
+  ["F7CD",0x514E],
+  ["F7CE",0x5410],
+  ["F7CF",0x571F],
+  ["F7D0",0x8A0E],
+  ["F7D1",0x615F],
+  ["F7D2",0x6876],
+  ["F7D3",0xFA05],
+  ["F7D4",0x75DB],
+  ["F7D5",0x7B52],
+  ["F7D6",0x7D71],
+  ["F7D7",0x901A],
+  ["F7D8",0x5806],
+  ["F7D9",0x69CC],
+  ["F7DA",0x817F],
+  ["F7DB",0x892A],
+  ["F7DC",0x9000],
+  ["F7DD",0x9839],
+  ["F7DE",0x5078],
+  ["F7DF",0x5957],
+  ["F7E0",0x59AC],
+  ["F7E1",0x6295],
+  ["F7E2",0x900F],
+  ["F7E3",0x9B2A],
+  ["F7E4",0x615D],
+  ["F7E5",0x7279],
+  ["F7E6",0x95D6],
+  ["F7E7",0x5761],
+  ["F7E8",0x5A46],
+  ["F7E9",0x5DF4],
+  ["F7EA",0x628A],
+  ["F7EB",0x64AD],
+  ["F7EC",0x64FA],
+  ["F7ED",0x6777],
+  ["F7EE",0x6CE2],
+  ["F7EF",0x6D3E],
+  ["F7F0",0x722C],
+  ["F7F1",0x7436],
+  ["F7F2",0x7834],
+  ["F7F3",0x7F77],
+  ["F7F4",0x82AD],
+  ["F7F5",0x8DDB],
+  ["F7F6",0x9817],
+  ["F7F7",0x5224],
+  ["F7F8",0x5742],
+  ["F7F9",0x677F],
+  ["F7FA",0x7248],
+  ["F7FB",0x74E3],
+  ["F7FC",0x8CA9],
+  ["F7FD",0x8FA6],
+  ["F7FE",0x9211],
+  ["F8A1",0x962A],
+  ["F8A2",0x516B],
+  ["F8A3",0x53ED],
+  ["F8A4",0x634C],
+  ["F8A5",0x4F69],
+  ["F8A6",0x5504],
+  ["F8A7",0x6096],
+  ["F8A8",0x6557],
+  ["F8A9",0x6C9B],
+  ["F8AA",0x6D7F],
+  ["F8AB",0x724C],
+  ["F8AC",0x72FD],
+  ["F8AD",0x7A17],
+  ["F8AE",0x8987],
+  ["F8AF",0x8C9D],
+  ["F8B0",0x5F6D],
+  ["F8B1",0x6F8E],
+  ["F8B2",0x70F9],
+  ["F8B3",0x81A8],
+  ["F8B4",0x610E],
+  ["F8B5",0x4FBF],
+  ["F8B6",0x504F],
+  ["F8B7",0x6241],
+  ["F8B8",0x7247],
+  ["F8B9",0x7BC7],
+  ["F8BA",0x7DE8],
+  ["F8BB",0x7FE9],
+  ["F8BC",0x904D],
+  ["F8BD",0x97AD],
+  ["F8BE",0x9A19],
+  ["F8BF",0x8CB6],
+  ["F8C0",0x576A],
+  ["F8C1",0x5E73],
+  ["F8C2",0x67B0],
+  ["F8C3",0x840D],
+  ["F8C4",0x8A55],
+  ["F8C5",0x5420],
+  ["F8C6",0x5B16],
+  ["F8C7",0x5E63],
+  ["F8C8",0x5EE2],
+  ["F8C9",0x5F0A],
+  ["F8CA",0x6583],
+  ["F8CB",0x80BA],
+  ["F8CC",0x853D],
+  ["F8CD",0x9589],
+  ["F8CE",0x965B],
+  ["F8CF",0x4F48],
+  ["F8D0",0x5305],
+  ["F8D1",0x530D],
+  ["F8D2",0x530F],
+  ["F8D3",0x5486],
+  ["F8D4",0x54FA],
+  ["F8D5",0x5703],
+  ["F8D6",0x5E03],
+  ["F8D7",0x6016],
+  ["F8D8",0x629B],
+  ["F8D9",0x62B1],
+  ["F8DA",0x6355],
+  ["F8DB",0xFA06],
+  ["F8DC",0x6CE1],
+  ["F8DD",0x6D66],
+  ["F8DE",0x75B1],
+  ["F8DF",0x7832],
+  ["F8E0",0x80DE],
+  ["F8E1",0x812F],
+  ["F8E2",0x82DE],
+  ["F8E3",0x8461],
+  ["F8E4",0x84B2],
+  ["F8E5",0x888D],
+  ["F8E6",0x8912],
+  ["F8E7",0x900B],
+  ["F8E8",0x92EA],
+  ["F8E9",0x98FD],
+  ["F8EA",0x9B91],
+  ["F8EB",0x5E45],
+  ["F8EC",0x66B4],
+  ["F8ED",0x66DD],
+  ["F8EE",0x7011],
+  ["F8EF",0x7206],
+  ["F8F0",0xFA07],
+  ["F8F1",0x4FF5],
+  ["F8F2",0x527D],
+  ["F8F3",0x5F6A],
+  ["F8F4",0x6153],
+  ["F8F5",0x6753],
+  ["F8F6",0x6A19],
+  ["F8F7",0x6F02],
+  ["F8F8",0x74E2],
+  ["F8F9",0x7968],
+  ["F8FA",0x8868],
+  ["F8FB",0x8C79],
+  ["F8FC",0x98C7],
+  ["F8FD",0x98C4],
+  ["F8FE",0x9A43],
+  ["F9A1",0x54C1],
+  ["F9A2",0x7A1F],
+  ["F9A3",0x6953],
+  ["F9A4",0x8AF7],
+  ["F9A5",0x8C4A],
+  ["F9A6",0x98A8],
+  ["F9A7",0x99AE],
+  ["F9A8",0x5F7C],
+  ["F9A9",0x62AB],
+  ["F9AA",0x75B2],
+  ["F9AB",0x76AE],
+  ["F9AC",0x88AB],
+  ["F9AD",0x907F],
+  ["F9AE",0x9642],
+  ["F9AF",0x5339],
+  ["F9B0",0x5F3C],
+  ["F9B1",0x5FC5],
+  ["F9B2",0x6CCC],
+  ["F9B3",0x73CC],
+  ["F9B4",0x7562],
+  ["F9B5",0x758B],
+  ["F9B6",0x7B46],
+  ["F9B7",0x82FE],
+  ["F9B8",0x999D],
+  ["F9B9",0x4E4F],
+  ["F9BA",0x903C],
+  ["F9BB",0x4E0B],
+  ["F9BC",0x4F55],
+  ["F9BD",0x53A6],
+  ["F9BE",0x590F],
+  ["F9BF",0x5EC8],
+  ["F9C0",0x6630],
+  ["F9C1",0x6CB3],
+  ["F9C2",0x7455],
+  ["F9C3",0x8377],
+  ["F9C4",0x8766],
+  ["F9C5",0x8CC0],
+  ["F9C6",0x9050],
+  ["F9C7",0x971E],
+  ["F9C8",0x9C15],
+  ["F9C9",0x58D1],
+  ["F9CA",0x5B78],
+  ["F9CB",0x8650],
+  ["F9CC",0x8B14],
+  ["F9CD",0x9DB4],
+  ["F9CE",0x5BD2],
+  ["F9CF",0x6068],
+  ["F9D0",0x608D],
+  ["F9D1",0x65F1],
+  ["F9D2",0x6C57],
+  ["F9D3",0x6F22],
+  ["F9D4",0x6FA3],
+  ["F9D5",0x701A],
+  ["F9D6",0x7F55],
+  ["F9D7",0x7FF0],
+  ["F9D8",0x9591],
+  ["F9D9",0x9592],
+  ["F9DA",0x9650],
+  ["F9DB",0x97D3],
+  ["F9DC",0x5272],
+  ["F9DD",0x8F44],
+  ["F9DE",0x51FD],
+  ["F9DF",0x542B],
+  ["F9E0",0x54B8],
+  ["F9E1",0x5563],
+  ["F9E2",0x558A],
+  ["F9E3",0x6ABB],
+  ["F9E4",0x6DB5],
+  ["F9E5",0x7DD8],
+  ["F9E6",0x8266],
+  ["F9E7",0x929C],
+  ["F9E8",0x9677],
+  ["F9E9",0x9E79],
+  ["F9EA",0x5408],
+  ["F9EB",0x54C8],
+  ["F9EC",0x76D2],
+  ["F9ED",0x86E4],
+  ["F9EE",0x95A4],
+  ["F9EF",0x95D4],
+  ["F9F0",0x965C],
+  ["F9F1",0x4EA2],
+  ["F9F2",0x4F09],
+  ["F9F3",0x59EE],
+  ["F9F4",0x5AE6],
+  ["F9F5",0x5DF7],
+  ["F9F6",0x6052],
+  ["F9F7",0x6297],
+  ["F9F8",0x676D],
+  ["F9F9",0x6841],
+  ["F9FA",0x6C86],
+  ["F9FB",0x6E2F],
+  ["F9FC",0x7F38],
+  ["F9FD",0x809B],
+  ["F9FE",0x822A],
+  ["FAA1",0xFA08],
+  ["FAA2",0xFA09],
+  ["FAA3",0x9805],
+  ["FAA4",0x4EA5],
+  ["FAA5",0x5055],
+  ["FAA6",0x54B3],
+  ["FAA7",0x5793],
+  ["FAA8",0x595A],
+  ["FAA9",0x5B69],
+  ["FAAA",0x5BB3],
+  ["FAAB",0x61C8],
+  ["FAAC",0x6977],
+  ["FAAD",0x6D77],
+  ["FAAE",0x7023],
+  ["FAAF",0x87F9],
+  ["FAB0",0x89E3],
+  ["FAB1",0x8A72],
+  ["FAB2",0x8AE7],
+  ["FAB3",0x9082],
+  ["FAB4",0x99ED],
+  ["FAB5",0x9AB8],
+  ["FAB6",0x52BE],
+  ["FAB7",0x6838],
+  ["FAB8",0x5016],
+  ["FAB9",0x5E78],
+  ["FABA",0x674F],
+  ["FABB",0x8347],
+  ["FABC",0x884C],
+  ["FABD",0x4EAB],
+  ["FABE",0x5411],
+  ["FABF",0x56AE],
+  ["FAC0",0x73E6],
+  ["FAC1",0x9115],
+  ["FAC2",0x97FF],
+  ["FAC3",0x9909],
+  ["FAC4",0x9957],
+  ["FAC5",0x9999],
+  ["FAC6",0x5653],
+  ["FAC7",0x589F],
+  ["FAC8",0x865B],
+  ["FAC9",0x8A31],
+  ["FACA",0x61B2],
+  ["FACB",0x6AF6],
+  ["FACC",0x737B],
+  ["FACD",0x8ED2],
+  ["FACE",0x6B47],
+  ["FACF",0x96AA],
+  ["FAD0",0x9A57],
+  ["FAD1",0x5955],
+  ["FAD2",0x7200],
+  ["FAD3",0x8D6B],
+  ["FAD4",0x9769],
+  ["FAD5",0x4FD4],
+  ["FAD6",0x5CF4],
+  ["FAD7",0x5F26],
+  ["FAD8",0x61F8],
+  ["FAD9",0x665B],
+  ["FADA",0x6CEB],
+  ["FADB",0x70AB],
+  ["FADC",0x7384],
+  ["FADD",0x73B9],
+  ["FADE",0x73FE],
+  ["FADF",0x7729],
+  ["FAE0",0x774D],
+  ["FAE1",0x7D43],
+  ["FAE2",0x7D62],
+  ["FAE3",0x7E23],
+  ["FAE4",0x8237],
+  ["FAE5",0x8852],
+  ["FAE6",0xFA0A],
+  ["FAE7",0x8CE2],
+  ["FAE8",0x9249],
+  ["FAE9",0x986F],
+  ["FAEA",0x5B51],
+  ["FAEB",0x7A74],
+  ["FAEC",0x8840],
+  ["FAED",0x9801],
+  ["FAEE",0x5ACC],
+  ["FAEF",0x4FE0],
+  ["FAF0",0x5354],
+  ["FAF1",0x593E],
+  ["FAF2",0x5CFD],
+  ["FAF3",0x633E],
+  ["FAF4",0x6D79],
+  ["FAF5",0x72F9],
+  ["FAF6",0x8105],
+  ["FAF7",0x8107],
+  ["FAF8",0x83A2],
+  ["FAF9",0x92CF],
+  ["FAFA",0x9830],
+  ["FAFB",0x4EA8],
+  ["FAFC",0x5144],
+  ["FAFD",0x5211],
+  ["FAFE",0x578B],
+  ["FBA1",0x5F62],
+  ["FBA2",0x6CC2],
+  ["FBA3",0x6ECE],
+  ["FBA4",0x7005],
+  ["FBA5",0x7050],
+  ["FBA6",0x70AF],
+  ["FBA7",0x7192],
+  ["FBA8",0x73E9],
+  ["FBA9",0x7469],
+  ["FBAA",0x834A],
+  ["FBAB",0x87A2],
+  ["FBAC",0x8861],
+  ["FBAD",0x9008],
+  ["FBAE",0x90A2],
+  ["FBAF",0x93A3],
+  ["FBB0",0x99A8],
+  ["FBB1",0x516E],
+  ["FBB2",0x5F57],
+  ["FBB3",0x60E0],
+  ["FBB4",0x6167],
+  ["FBB5",0x66B3],
+  ["FBB6",0x8559],
+  ["FBB7",0x8E4A],
+  ["FBB8",0x91AF],
+  ["FBB9",0x978B],
+  ["FBBA",0x4E4E],
+  ["FBBB",0x4E92],
+  ["FBBC",0x547C],
+  ["FBBD",0x58D5],
+  ["FBBE",0x58FA],
+  ["FBBF",0x597D],
+  ["FBC0",0x5CB5],
+  ["FBC1",0x5F27],
+  ["FBC2",0x6236],
+  ["FBC3",0x6248],
+  ["FBC4",0x660A],
+  ["FBC5",0x6667],
+  ["FBC6",0x6BEB],
+  ["FBC7",0x6D69],
+  ["FBC8",0x6DCF],
+  ["FBC9",0x6E56],
+  ["FBCA",0x6EF8],
+  ["FBCB",0x6F94],
+  ["FBCC",0x6FE0],
+  ["FBCD",0x6FE9],
+  ["FBCE",0x705D],
+  ["FBCF",0x72D0],
+  ["FBD0",0x7425],
+  ["FBD1",0x745A],
+  ["FBD2",0x74E0],
+  ["FBD3",0x7693],
+  ["FBD4",0x795C],
+  ["FBD5",0x7CCA],
+  ["FBD6",0x7E1E],
+  ["FBD7",0x80E1],
+  ["FBD8",0x82A6],
+  ["FBD9",0x846B],
+  ["FBDA",0x84BF],
+  ["FBDB",0x864E],
+  ["FBDC",0x865F],
+  ["FBDD",0x8774],
+  ["FBDE",0x8B77],
+  ["FBDF",0x8C6A],
+  ["FBE0",0x93AC],
+  ["FBE1",0x9800],
+  ["FBE2",0x9865],
+  ["FBE3",0x60D1],
+  ["FBE4",0x6216],
+  ["FBE5",0x9177],
+  ["FBE6",0x5A5A],
+  ["FBE7",0x660F],
+  ["FBE8",0x6DF7],
+  ["FBE9",0x6E3E],
+  ["FBEA",0x743F],
+  ["FBEB",0x9B42],
+  ["FBEC",0x5FFD],
+  ["FBED",0x60DA],
+  ["FBEE",0x7B0F],
+  ["FBEF",0x54C4],
+  ["FBF0",0x5F18],
+  ["FBF1",0x6C5E],
+  ["FBF2",0x6CD3],
+  ["FBF3",0x6D2A],
+  ["FBF4",0x70D8],
+  ["FBF5",0x7D05],
+  ["FBF6",0x8679],
+  ["FBF7",0x8A0C],
+  ["FBF8",0x9D3B],
+  ["FBF9",0x5316],
+  ["FBFA",0x548C],
+  ["FBFB",0x5B05],
+  ["FBFC",0x6A3A],
+  ["FBFD",0x706B],
+  ["FBFE",0x7575],
+  ["FCA1",0x798D],
+  ["FCA2",0x79BE],
+  ["FCA3",0x82B1],
+  ["FCA4",0x83EF],
+  ["FCA5",0x8A71],
+  ["FCA6",0x8B41],
+  ["FCA7",0x8CA8],
+  ["FCA8",0x9774],
+  ["FCA9",0xFA0B],
+  ["FCAA",0x64F4],
+  ["FCAB",0x652B],
+  ["FCAC",0x78BA],
+  ["FCAD",0x78BB],
+  ["FCAE",0x7A6B],
+  ["FCAF",0x4E38],
+  ["FCB0",0x559A],
+  ["FCB1",0x5950],
+  ["FCB2",0x5BA6],
+  ["FCB3",0x5E7B],
+  ["FCB4",0x60A3],
+  ["FCB5",0x63DB],
+  ["FCB6",0x6B61],
+  ["FCB7",0x6665],
+  ["FCB8",0x6853],
+  ["FCB9",0x6E19],
+  ["FCBA",0x7165],
+  ["FCBB",0x74B0],
+  ["FCBC",0x7D08],
+  ["FCBD",0x9084],
+  ["FCBE",0x9A69],
+  ["FCBF",0x9C25],
+  ["FCC0",0x6D3B],
+  ["FCC1",0x6ED1],
+  ["FCC2",0x733E],
+  ["FCC3",0x8C41],
+  ["FCC4",0x95CA],
+  ["FCC5",0x51F0],
+  ["FCC6",0x5E4C],
+  ["FCC7",0x5FA8],
+  ["FCC8",0x604D],
+  ["FCC9",0x60F6],
+  ["FCCA",0x6130],
+  ["FCCB",0x614C],
+  ["FCCC",0x6643],
+  ["FCCD",0x6644],
+  ["FCCE",0x69A5],
+  ["FCCF",0x6CC1],
+  ["FCD0",0x6E5F],
+  ["FCD1",0x6EC9],
+  ["FCD2",0x6F62],
+  ["FCD3",0x714C],
+  ["FCD4",0x749C],
+  ["FCD5",0x7687],
+  ["FCD6",0x7BC1],
+  ["FCD7",0x7C27],
+  ["FCD8",0x8352],
+  ["FCD9",0x8757],
+  ["FCDA",0x9051],
+  ["FCDB",0x968D],
+  ["FCDC",0x9EC3],
+  ["FCDD",0x532F],
+  ["FCDE",0x56DE],
+  ["FCDF",0x5EFB],
+  ["FCE0",0x5F8A],
+  ["FCE1",0x6062],
+  ["FCE2",0x6094],
+  ["FCE3",0x61F7],
+  ["FCE4",0x6666],
+  ["FCE5",0x6703],
+  ["FCE6",0x6A9C],
+  ["FCE7",0x6DEE],
+  ["FCE8",0x6FAE],
+  ["FCE9",0x7070],
+  ["FCEA",0x736A],
+  ["FCEB",0x7E6A],
+  ["FCEC",0x81BE],
+  ["FCED",0x8334],
+  ["FCEE",0x86D4],
+  ["FCEF",0x8AA8],
+  ["FCF0",0x8CC4],
+  ["FCF1",0x5283],
+  ["FCF2",0x7372],
+  ["FCF3",0x5B96],
+  ["FCF4",0x6A6B],
+  ["FCF5",0x9404],
+  ["FCF6",0x54EE],
+  ["FCF7",0x5686],
+  ["FCF8",0x5B5D],
+  ["FCF9",0x6548],
+  ["FCFA",0x6585],
+  ["FCFB",0x66C9],
+  ["FCFC",0x689F],
+  ["FCFD",0x6D8D],
+  ["FCFE",0x6DC6],
+  ["FDA1",0x723B],
+  ["FDA2",0x80B4],
+  ["FDA3",0x9175],
+  ["FDA4",0x9A4D],
+  ["FDA5",0x4FAF],
+  ["FDA6",0x5019],
+  ["FDA7",0x539A],
+  ["FDA8",0x540E],
+  ["FDA9",0x543C],
+  ["FDAA",0x5589],
+  ["FDAB",0x55C5],
+  ["FDAC",0x5E3F],
+  ["FDAD",0x5F8C],
+  ["FDAE",0x673D],
+  ["FDAF",0x7166],
+  ["FDB0",0x73DD],
+  ["FDB1",0x9005],
+  ["FDB2",0x52DB],
+  ["FDB3",0x52F3],
+  ["FDB4",0x5864],
+  ["FDB5",0x58CE],
+  ["FDB6",0x7104],
+  ["FDB7",0x718F],
+  ["FDB8",0x71FB],
+  ["FDB9",0x85B0],
+  ["FDBA",0x8A13],
+  ["FDBB",0x6688],
+  ["FDBC",0x85A8],
+  ["FDBD",0x55A7],
+  ["FDBE",0x6684],
+  ["FDBF",0x714A],
+  ["FDC0",0x8431],
+  ["FDC1",0x5349],
+  ["FDC2",0x5599],
+  ["FDC3",0x6BC1],
+  ["FDC4",0x5F59],
+  ["FDC5",0x5FBD],
+  ["FDC6",0x63EE],
+  ["FDC7",0x6689],
+  ["FDC8",0x7147],
+  ["FDC9",0x8AF1],
+  ["FDCA",0x8F1D],
+  ["FDCB",0x9EBE],
+  ["FDCC",0x4F11],
+  ["FDCD",0x643A],
+  ["FDCE",0x70CB],
+  ["FDCF",0x7566],
+  ["FDD0",0x8667],
+  ["FDD1",0x6064],
+  ["FDD2",0x8B4E],
+  ["FDD3",0x9DF8],
+  ["FDD4",0x5147],
+  ["FDD5",0x51F6],
+  ["FDD6",0x5308],
+  ["FDD7",0x6D36],
+  ["FDD8",0x80F8],
+  ["FDD9",0x9ED1],
+  ["FDDA",0x6615],
+  ["FDDB",0x6B23],
+  ["FDDC",0x7098],
+  ["FDDD",0x75D5],
+  ["FDDE",0x5403],
+  ["FDDF",0x5C79],
+  ["FDE0",0x7D07],
+  ["FDE1",0x8A16],
+  ["FDE2",0x6B20],
+  ["FDE3",0x6B3D],
+  ["FDE4",0x6B46],
+  ["FDE5",0x5438],
+  ["FDE6",0x6070],
+  ["FDE7",0x6D3D],
+  ["FDE8",0x7FD5],
+  ["FDE9",0x8208],
+  ["FDEA",0x50D6],
+  ["FDEB",0x51DE],
+  ["FDEC",0x559C],
+  ["FDED",0x566B],
+  ["FDEE",0x56CD],
+  ["FDEF",0x59EC],
+  ["FDF0",0x5B09],
+  ["FDF1",0x5E0C],
+  ["FDF2",0x6199],
+  ["FDF3",0x6198],
+  ["FDF4",0x6231],
+  ["FDF5",0x665E],
+  ["FDF6",0x66E6],
+  ["FDF7",0x7199],
+  ["FDF8",0x71B9],
+  ["FDF9",0x71BA],
+  ["FDFA",0x72A7],
+  ["FDFB",0x79A7],
+  ["FDFC",0x7A00],
+  ["FDFD",0x7FB2],
+  ["FDFE",0x8A70],
+]
+
+UCS_TO_EUCKR_TBL = EUCKR_TO_UCS_TBL.map {|a,b| [b,a] }
diff --git a/enc/trans/gb18030-tbl.rb b/enc/trans/gb18030-tbl.rb
new file mode 100644
index 0000000000..e1c29deeb1
--- /dev/null
+++ b/enc/trans/gb18030-tbl.rb
@@ -0,0 +1,63362 @@
+GB18030_TO_UCS_TBL = [
+  ["81308130",0x80],
+  ["81308131",0x81],
+  ["81308132",0x82],
+  ["81308133",0x83],
+  ["81308134",0x84],
+  ["81308135",0x85],
+  ["81308136",0x86],
+  ["81308137",0x87],
+  ["81308138",0x88],
+  ["81308139",0x89],
+  ["81308230",0x8A],
+  ["81308231",0x8B],
+  ["81308232",0x8C],
+  ["81308233",0x8D],
+  ["81308234",0x8E],
+  ["81308235",0x8F],
+  ["81308236",0x90],
+  ["81308237",0x91],
+  ["81308238",0x92],
+  ["81308239",0x93],
+  ["81308330",0x94],
+  ["81308331",0x95],
+  ["81308332",0x96],
+  ["81308333",0x97],
+  ["81308334",0x98],
+  ["81308335",0x99],
+  ["81308336",0x9A],
+  ["81308337",0x9B],
+  ["81308338",0x9C],
+  ["81308339",0x9D],
+  ["81308430",0x9E],
+  ["81308431",0x9F],
+  ["81308432",0xA0],
+  ["81308433",0xA1],
+  ["81308434",0xA2],
+  ["81308435",0xA3],
+  ["A1E8",0xA4],
+  ["81308436",0xA5],
+  ["81308437",0xA6],
+  ["A1EC",0xA7],
+  ["A1A7",0xA8],
+  ["81308438",0xA9],
+  ["81308439",0xAA],
+  ["81308530",0xAB],
+  ["81308531",0xAC],
+  ["81308532",0xAD],
+  ["81308533",0xAE],
+  ["81308534",0xAF],
+  ["A1E3",0xB0],
+  ["A1C0",0xB1],
+  ["81308535",0xB2],
+  ["81308536",0xB3],
+  ["81308537",0xB4],
+  ["81308538",0xB5],
+  ["81308539",0xB6],
+  ["A1A4",0xB7],
+  ["81308630",0xB8],
+  ["81308631",0xB9],
+  ["81308632",0xBA],
+  ["81308633",0xBB],
+  ["81308634",0xBC],
+  ["81308635",0xBD],
+  ["81308636",0xBE],
+  ["81308637",0xBF],
+  ["81308638",0xC0],
+  ["81308639",0xC1],
+  ["81308730",0xC2],
+  ["81308731",0xC3],
+  ["81308732",0xC4],
+  ["81308733",0xC5],
+  ["81308734",0xC6],
+  ["81308735",0xC7],
+  ["81308736",0xC8],
+  ["81308737",0xC9],
+  ["81308738",0xCA],
+  ["81308739",0xCB],
+  ["81308830",0xCC],
+  ["81308831",0xCD],
+  ["81308832",0xCE],
+  ["81308833",0xCF],
+  ["81308834",0xD0],
+  ["81308835",0xD1],
+  ["81308836",0xD2],
+  ["81308837",0xD3],
+  ["81308838",0xD4],
+  ["81308839",0xD5],
+  ["81308930",0xD6],
+  ["A1C1",0xD7],
+  ["81308931",0xD8],
+  ["81308932",0xD9],
+  ["81308933",0xDA],
+  ["81308934",0xDB],
+  ["81308935",0xDC],
+  ["81308936",0xDD],
+  ["81308937",0xDE],
+  ["81308938",0xDF],
+  ["A8A4",0xE0],
+  ["A8A2",0xE1],
+  ["81308939",0xE2],
+  ["81308A30",0xE3],
+  ["81308A31",0xE4],
+  ["81308A32",0xE5],
+  ["81308A33",0xE6],
+  ["81308A34",0xE7],
+  ["A8A8",0xE8],
+  ["A8A6",0xE9],
+  ["A8BA",0xEA],
+  ["81308A35",0xEB],
+  ["A8AC",0xEC],
+  ["A8AA",0xED],
+  ["81308A36",0xEE],
+  ["81308A37",0xEF],
+  ["81308A38",0xF0],
+  ["81308A39",0xF1],
+  ["A8B0",0xF2],
+  ["A8AE",0xF3],
+  ["81308B30",0xF4],
+  ["81308B31",0xF5],
+  ["81308B32",0xF6],
+  ["A1C2",0xF7],
+  ["81308B33",0xF8],
+  ["A8B4",0xF9],
+  ["A8B2",0xFA],
+  ["81308B34",0xFB],
+  ["A8B9",0xFC],
+  ["81308B35",0xFD],
+  ["81308B36",0xFE],
+  ["81308B37",0xFF],
+  ["81308B38",0x100],
+  ["A8A1",0x101],
+  ["81308B39",0x102],
+  ["81308C30",0x103],
+  ["81308C31",0x104],
+  ["81308C32",0x105],
+  ["81308C33",0x106],
+  ["81308C34",0x107],
+  ["81308C35",0x108],
+  ["81308C36",0x109],
+  ["81308C37",0x10A],
+  ["81308C38",0x10B],
+  ["81308C39",0x10C],
+  ["81308D30",0x10D],
+  ["81308D31",0x10E],
+  ["81308D32",0x10F],
+  ["81308D33",0x110],
+  ["81308D34",0x111],
+  ["81308D35",0x112],
+  ["A8A5",0x113],
+  ["81308D36",0x114],
+  ["81308D37",0x115],
+  ["81308D38",0x116],
+  ["81308D39",0x117],
+  ["81308E30",0x118],
+  ["81308E31",0x119],
+  ["81308E32",0x11A],
+  ["A8A7",0x11B],
+  ["81308E33",0x11C],
+  ["81308E34",0x11D],
+  ["81308E35",0x11E],
+  ["81308E36",0x11F],
+  ["81308E37",0x120],
+  ["81308E38",0x121],
+  ["81308E39",0x122],
+  ["81308F30",0x123],
+  ["81308F31",0x124],
+  ["81308F32",0x125],
+  ["81308F33",0x126],
+  ["81308F34",0x127],
+  ["81308F35",0x128],
+  ["81308F36",0x129],
+  ["81308F37",0x12A],
+  ["A8A9",0x12B],
+  ["81308F38",0x12C],
+  ["81308F39",0x12D],
+  ["81309030",0x12E],
+  ["81309031",0x12F],
+  ["81309032",0x130],
+  ["81309033",0x131],
+  ["81309034",0x132],
+  ["81309035",0x133],
+  ["81309036",0x134],
+  ["81309037",0x135],
+  ["81309038",0x136],
+  ["81309039",0x137],
+  ["81309130",0x138],
+  ["81309131",0x139],
+  ["81309132",0x13A],
+  ["81309133",0x13B],
+  ["81309134",0x13C],
+  ["81309135",0x13D],
+  ["81309136",0x13E],
+  ["81309137",0x13F],
+  ["81309138",0x140],
+  ["81309139",0x141],
+  ["81309230",0x142],
+  ["81309231",0x143],
+  ["A8BD",0x144],
+  ["81309232",0x145],
+  ["81309233",0x146],
+  ["81309234",0x147],
+  ["A8BE",0x148],
+  ["81309235",0x149],
+  ["81309236",0x14A],
+  ["81309237",0x14B],
+  ["81309238",0x14C],
+  ["A8AD",0x14D],
+  ["81309239",0x14E],
+  ["81309330",0x14F],
+  ["81309331",0x150],
+  ["81309332",0x151],
+  ["81309333",0x152],
+  ["81309334",0x153],
+  ["81309335",0x154],
+  ["81309336",0x155],
+  ["81309337",0x156],
+  ["81309338",0x157],
+  ["81309339",0x158],
+  ["81309430",0x159],
+  ["81309431",0x15A],
+  ["81309432",0x15B],
+  ["81309433",0x15C],
+  ["81309434",0x15D],
+  ["81309435",0x15E],
+  ["81309436",0x15F],
+  ["81309437",0x160],
+  ["81309438",0x161],
+  ["81309439",0x162],
+  ["81309530",0x163],
+  ["81309531",0x164],
+  ["81309532",0x165],
+  ["81309533",0x166],
+  ["81309534",0x167],
+  ["81309535",0x168],
+  ["81309536",0x169],
+  ["81309537",0x16A],
+  ["A8B1",0x16B],
+  ["81309538",0x16C],
+  ["81309539",0x16D],
+  ["81309630",0x16E],
+  ["81309631",0x16F],
+  ["81309632",0x170],
+  ["81309633",0x171],
+  ["81309634",0x172],
+  ["81309635",0x173],
+  ["81309636",0x174],
+  ["81309637",0x175],
+  ["81309638",0x176],
+  ["81309639",0x177],
+  ["81309730",0x178],
+  ["81309731",0x179],
+  ["81309732",0x17A],
+  ["81309733",0x17B],
+  ["81309734",0x17C],
+  ["81309735",0x17D],
+  ["81309736",0x17E],
+  ["81309737",0x17F],
+  ["81309738",0x180],
+  ["81309739",0x181],
+  ["81309830",0x182],
+  ["81309831",0x183],
+  ["81309832",0x184],
+  ["81309833",0x185],
+  ["81309834",0x186],
+  ["81309835",0x187],
+  ["81309836",0x188],
+  ["81309837",0x189],
+  ["81309838",0x18A],
+  ["81309839",0x18B],
+  ["81309930",0x18C],
+  ["81309931",0x18D],
+  ["81309932",0x18E],
+  ["81309933",0x18F],
+  ["81309934",0x190],
+  ["81309935",0x191],
+  ["81309936",0x192],
+  ["81309937",0x193],
+  ["81309938",0x194],
+  ["81309939",0x195],
+  ["81309A30",0x196],
+  ["81309A31",0x197],
+  ["81309A32",0x198],
+  ["81309A33",0x199],
+  ["81309A34",0x19A],
+  ["81309A35",0x19B],
+  ["81309A36",0x19C],
+  ["81309A37",0x19D],
+  ["81309A38",0x19E],
+  ["81309A39",0x19F],
+  ["81309B30",0x1A0],
+  ["81309B31",0x1A1],
+  ["81309B32",0x1A2],
+  ["81309B33",0x1A3],
+  ["81309B34",0x1A4],
+  ["81309B35",0x1A5],
+  ["81309B36",0x1A6],
+  ["81309B37",0x1A7],
+  ["81309B38",0x1A8],
+  ["81309B39",0x1A9],
+  ["81309C30",0x1AA],
+  ["81309C31",0x1AB],
+  ["81309C32",0x1AC],
+  ["81309C33",0x1AD],
+  ["81309C34",0x1AE],
+  ["81309C35",0x1AF],
+  ["81309C36",0x1B0],
+  ["81309C37",0x1B1],
+  ["81309C38",0x1B2],
+  ["81309C39",0x1B3],
+  ["81309D30",0x1B4],
+  ["81309D31",0x1B5],
+  ["81309D32",0x1B6],
+  ["81309D33",0x1B7],
+  ["81309D34",0x1B8],
+  ["81309D35",0x1B9],
+  ["81309D36",0x1BA],
+  ["81309D37",0x1BB],
+  ["81309D38",0x1BC],
+  ["81309D39",0x1BD],
+  ["81309E30",0x1BE],
+  ["81309E31",0x1BF],
+  ["81309E32",0x1C0],
+  ["81309E33",0x1C1],
+  ["81309E34",0x1C2],
+  ["81309E35",0x1C3],
+  ["81309E36",0x1C4],
+  ["81309E37",0x1C5],
+  ["81309E38",0x1C6],
+  ["81309E39",0x1C7],
+  ["81309F30",0x1C8],
+  ["81309F31",0x1C9],
+  ["81309F32",0x1CA],
+  ["81309F33",0x1CB],
+  ["81309F34",0x1CC],
+  ["81309F35",0x1CD],
+  ["A8A3",0x1CE],
+  ["81309F36",0x1CF],
+  ["A8AB",0x1D0],
+  ["81309F37",0x1D1],
+  ["A8AF",0x1D2],
+  ["81309F38",0x1D3],
+  ["A8B3",0x1D4],
+  ["81309F39",0x1D5],
+  ["A8B5",0x1D6],
+  ["8130A030",0x1D7],
+  ["A8B6",0x1D8],
+  ["8130A031",0x1D9],
+  ["A8B7",0x1DA],
+  ["8130A032",0x1DB],
+  ["A8B8",0x1DC],
+  ["8130A033",0x1DD],
+  ["8130A034",0x1DE],
+  ["8130A035",0x1DF],
+  ["8130A036",0x1E0],
+  ["8130A037",0x1E1],
+  ["8130A038",0x1E2],
+  ["8130A039",0x1E3],
+  ["8130A130",0x1E4],
+  ["8130A131",0x1E5],
+  ["8130A132",0x1E6],
+  ["8130A133",0x1E7],
+  ["8130A134",0x1E8],
+  ["8130A135",0x1E9],
+  ["8130A136",0x1EA],
+  ["8130A137",0x1EB],
+  ["8130A138",0x1EC],
+  ["8130A139",0x1ED],
+  ["8130A230",0x1EE],
+  ["8130A231",0x1EF],
+  ["8130A232",0x1F0],
+  ["8130A233",0x1F1],
+  ["8130A234",0x1F2],
+  ["8130A235",0x1F3],
+  ["8130A236",0x1F4],
+  ["8130A237",0x1F5],
+  ["8130A238",0x1F6],
+  ["8130A239",0x1F7],
+  ["8130A330",0x1F8],
+  ["A8BF",0x1F9],
+  ["8130A331",0x1FA],
+  ["8130A332",0x1FB],
+  ["8130A333",0x1FC],
+  ["8130A334",0x1FD],
+  ["8130A335",0x1FE],
+  ["8130A336",0x1FF],
+  ["8130A337",0x200],
+  ["8130A338",0x201],
+  ["8130A339",0x202],
+  ["8130A430",0x203],
+  ["8130A431",0x204],
+  ["8130A432",0x205],
+  ["8130A433",0x206],
+  ["8130A434",0x207],
+  ["8130A435",0x208],
+  ["8130A436",0x209],
+  ["8130A437",0x20A],
+  ["8130A438",0x20B],
+  ["8130A439",0x20C],
+  ["8130A530",0x20D],
+  ["8130A531",0x20E],
+  ["8130A532",0x20F],
+  ["8130A533",0x210],
+  ["8130A534",0x211],
+  ["8130A535",0x212],
+  ["8130A536",0x213],
+  ["8130A537",0x214],
+  ["8130A538",0x215],
+  ["8130A539",0x216],
+  ["8130A630",0x217],
+  ["8130A631",0x218],
+  ["8130A632",0x219],
+  ["8130A633",0x21A],
+  ["8130A634",0x21B],
+  ["8130A635",0x21C],
+  ["8130A636",0x21D],
+  ["8130A637",0x21E],
+  ["8130A638",0x21F],
+  ["8130A639",0x220],
+  ["8130A730",0x221],
+  ["8130A731",0x222],
+  ["8130A732",0x223],
+  ["8130A733",0x224],
+  ["8130A734",0x225],
+  ["8130A735",0x226],
+  ["8130A736",0x227],
+  ["8130A737",0x228],
+  ["8130A738",0x229],
+  ["8130A739",0x22A],
+  ["8130A830",0x22B],
+  ["8130A831",0x22C],
+  ["8130A832",0x22D],
+  ["8130A833",0x22E],
+  ["8130A834",0x22F],
+  ["8130A835",0x230],
+  ["8130A836",0x231],
+  ["8130A837",0x232],
+  ["8130A838",0x233],
+  ["8130A839",0x234],
+  ["8130A930",0x235],
+  ["8130A931",0x236],
+  ["8130A932",0x237],
+  ["8130A933",0x238],
+  ["8130A934",0x239],
+  ["8130A935",0x23A],
+  ["8130A936",0x23B],
+  ["8130A937",0x23C],
+  ["8130A938",0x23D],
+  ["8130A939",0x23E],
+  ["8130AA30",0x23F],
+  ["8130AA31",0x240],
+  ["8130AA32",0x241],
+  ["8130AA33",0x242],
+  ["8130AA34",0x243],
+  ["8130AA35",0x244],
+  ["8130AA36",0x245],
+  ["8130AA37",0x246],
+  ["8130AA38",0x247],
+  ["8130AA39",0x248],
+  ["8130AB30",0x249],
+  ["8130AB31",0x24A],
+  ["8130AB32",0x24B],
+  ["8130AB33",0x24C],
+  ["8130AB34",0x24D],
+  ["8130AB35",0x24E],
+  ["8130AB36",0x24F],
+  ["8130AB37",0x250],
+  ["A8BB",0x251],
+  ["8130AB38",0x252],
+  ["8130AB39",0x253],
+  ["8130AC30",0x254],
+  ["8130AC31",0x255],
+  ["8130AC32",0x256],
+  ["8130AC33",0x257],
+  ["8130AC34",0x258],
+  ["8130AC35",0x259],
+  ["8130AC36",0x25A],
+  ["8130AC37",0x25B],
+  ["8130AC38",0x25C],
+  ["8130AC39",0x25D],
+  ["8130AD30",0x25E],
+  ["8130AD31",0x25F],
+  ["8130AD32",0x260],
+  ["A8C0",0x261],
+  ["8130AD33",0x262],
+  ["8130AD34",0x263],
+  ["8130AD35",0x264],
+  ["8130AD36",0x265],
+  ["8130AD37",0x266],
+  ["8130AD38",0x267],
+  ["8130AD39",0x268],
+  ["8130AE30",0x269],
+  ["8130AE31",0x26A],
+  ["8130AE32",0x26B],
+  ["8130AE33",0x26C],
+  ["8130AE34",0x26D],
+  ["8130AE35",0x26E],
+  ["8130AE36",0x26F],
+  ["8130AE37",0x270],
+  ["8130AE38",0x271],
+  ["8130AE39",0x272],
+  ["8130AF30",0x273],
+  ["8130AF31",0x274],
+  ["8130AF32",0x275],
+  ["8130AF33",0x276],
+  ["8130AF34",0x277],
+  ["8130AF35",0x278],
+  ["8130AF36",0x279],
+  ["8130AF37",0x27A],
+  ["8130AF38",0x27B],
+  ["8130AF39",0x27C],
+  ["8130B030",0x27D],
+  ["8130B031",0x27E],
+  ["8130B032",0x27F],
+  ["8130B033",0x280],
+  ["8130B034",0x281],
+  ["8130B035",0x282],
+  ["8130B036",0x283],
+  ["8130B037",0x284],
+  ["8130B038",0x285],
+  ["8130B039",0x286],
+  ["8130B130",0x287],
+  ["8130B131",0x288],
+  ["8130B132",0x289],
+  ["8130B133",0x28A],
+  ["8130B134",0x28B],
+  ["8130B135",0x28C],
+  ["8130B136",0x28D],
+  ["8130B137",0x28E],
+  ["8130B138",0x28F],
+  ["8130B139",0x290],
+  ["8130B230",0x291],
+  ["8130B231",0x292],
+  ["8130B232",0x293],
+  ["8130B233",0x294],
+  ["8130B234",0x295],
+  ["8130B235",0x296],
+  ["8130B236",0x297],
+  ["8130B237",0x298],
+  ["8130B238",0x299],
+  ["8130B239",0x29A],
+  ["8130B330",0x29B],
+  ["8130B331",0x29C],
+  ["8130B332",0x29D],
+  ["8130B333",0x29E],
+  ["8130B334",0x29F],
+  ["8130B335",0x2A0],
+  ["8130B336",0x2A1],
+  ["8130B337",0x2A2],
+  ["8130B338",0x2A3],
+  ["8130B339",0x2A4],
+  ["8130B430",0x2A5],
+  ["8130B431",0x2A6],
+  ["8130B432",0x2A7],
+  ["8130B433",0x2A8],
+  ["8130B434",0x2A9],
+  ["8130B435",0x2AA],
+  ["8130B436",0x2AB],
+  ["8130B437",0x2AC],
+  ["8130B438",0x2AD],
+  ["8130B439",0x2AE],
+  ["8130B530",0x2AF],
+  ["8130B531",0x2B0],
+  ["8130B532",0x2B1],
+  ["8130B533",0x2B2],
+  ["8130B534",0x2B3],
+  ["8130B535",0x2B4],
+  ["8130B536",0x2B5],
+  ["8130B537",0x2B6],
+  ["8130B538",0x2B7],
+  ["8130B539",0x2B8],
+  ["8130B630",0x2B9],
+  ["8130B631",0x2BA],
+  ["8130B632",0x2BB],
+  ["8130B633",0x2BC],
+  ["8130B634",0x2BD],
+  ["8130B635",0x2BE],
+  ["8130B636",0x2BF],
+  ["8130B637",0x2C0],
+  ["8130B638",0x2C1],
+  ["8130B639",0x2C2],
+  ["8130B730",0x2C3],
+  ["8130B731",0x2C4],
+  ["8130B732",0x2C5],
+  ["8130B733",0x2C6],
+  ["A1A6",0x2C7],
+  ["8130B734",0x2C8],
+  ["A1A5",0x2C9],
+  ["A840",0x2CA],
+  ["A841",0x2CB],
+  ["8130B735",0x2CC],
+  ["8130B736",0x2CD],
+  ["8130B737",0x2CE],
+  ["8130B738",0x2CF],
+  ["8130B739",0x2D0],
+  ["8130B830",0x2D1],
+  ["8130B831",0x2D2],
+  ["8130B832",0x2D3],
+  ["8130B833",0x2D4],
+  ["8130B834",0x2D5],
+  ["8130B835",0x2D6],
+  ["8130B836",0x2D7],
+  ["8130B837",0x2D8],
+  ["A842",0x2D9],
+  ["8130B838",0x2DA],
+  ["8130B839",0x2DB],
+  ["8130B930",0x2DC],
+  ["8130B931",0x2DD],
+  ["8130B932",0x2DE],
+  ["8130B933",0x2DF],
+  ["8130B934",0x2E0],
+  ["8130B935",0x2E1],
+  ["8130B936",0x2E2],
+  ["8130B937",0x2E3],
+  ["8130B938",0x2E4],
+  ["8130B939",0x2E5],
+  ["8130BA30",0x2E6],
+  ["8130BA31",0x2E7],
+  ["8130BA32",0x2E8],
+  ["8130BA33",0x2E9],
+  ["8130BA34",0x2EA],
+  ["8130BA35",0x2EB],
+  ["8130BA36",0x2EC],
+  ["8130BA37",0x2ED],
+  ["8130BA38",0x2EE],
+  ["8130BA39",0x2EF],
+  ["8130BB30",0x2F0],
+  ["8130BB31",0x2F1],
+  ["8130BB32",0x2F2],
+  ["8130BB33",0x2F3],
+  ["8130BB34",0x2F4],
+  ["8130BB35",0x2F5],
+  ["8130BB36",0x2F6],
+  ["8130BB37",0x2F7],
+  ["8130BB38",0x2F8],
+  ["8130BB39",0x2F9],
+  ["8130BC30",0x2FA],
+  ["8130BC31",0x2FB],
+  ["8130BC32",0x2FC],
+  ["8130BC33",0x2FD],
+  ["8130BC34",0x2FE],
+  ["8130BC35",0x2FF],
+  ["8130BC36",0x300],
+  ["8130BC37",0x301],
+  ["8130BC38",0x302],
+  ["8130BC39",0x303],
+  ["8130BD30",0x304],
+  ["8130BD31",0x305],
+  ["8130BD32",0x306],
+  ["8130BD33",0x307],
+  ["8130BD34",0x308],
+  ["8130BD35",0x309],
+  ["8130BD36",0x30A],
+  ["8130BD37",0x30B],
+  ["8130BD38",0x30C],
+  ["8130BD39",0x30D],
+  ["8130BE30",0x30E],
+  ["8130BE31",0x30F],
+  ["8130BE32",0x310],
+  ["8130BE33",0x311],
+  ["8130BE34",0x312],
+  ["8130BE35",0x313],
+  ["8130BE36",0x314],
+  ["8130BE37",0x315],
+  ["8130BE38",0x316],
+  ["8130BE39",0x317],
+  ["8130BF30",0x318],
+  ["8130BF31",0x319],
+  ["8130BF32",0x31A],
+  ["8130BF33",0x31B],
+  ["8130BF34",0x31C],
+  ["8130BF35",0x31D],
+  ["8130BF36",0x31E],
+  ["8130BF37",0x31F],
+  ["8130BF38",0x320],
+  ["8130BF39",0x321],
+  ["8130C030",0x322],
+  ["8130C031",0x323],
+  ["8130C032",0x324],
+  ["8130C033",0x325],
+  ["8130C034",0x326],
+  ["8130C035",0x327],
+  ["8130C036",0x328],
+  ["8130C037",0x329],
+  ["8130C038",0x32A],
+  ["8130C039",0x32B],
+  ["8130C130",0x32C],
+  ["8130C131",0x32D],
+  ["8130C132",0x32E],
+  ["8130C133",0x32F],
+  ["8130C134",0x330],
+  ["8130C135",0x331],
+  ["8130C136",0x332],
+  ["8130C137",0x333],
+  ["8130C138",0x334],
+  ["8130C139",0x335],
+  ["8130C230",0x336],
+  ["8130C231",0x337],
+  ["8130C232",0x338],
+  ["8130C233",0x339],
+  ["8130C234",0x33A],
+  ["8130C235",0x33B],
+  ["8130C236",0x33C],
+  ["8130C237",0x33D],
+  ["8130C238",0x33E],
+  ["8130C239",0x33F],
+  ["8130C330",0x340],
+  ["8130C331",0x341],
+  ["8130C332",0x342],
+  ["8130C333",0x343],
+  ["8130C334",0x344],
+  ["8130C335",0x345],
+  ["8130C336",0x346],
+  ["8130C337",0x347],
+  ["8130C338",0x348],
+  ["8130C339",0x349],
+  ["8130C430",0x34A],
+  ["8130C431",0x34B],
+  ["8130C432",0x34C],
+  ["8130C433",0x34D],
+  ["8130C434",0x34E],
+  ["8130C435",0x34F],
+  ["8130C436",0x350],
+  ["8130C437",0x351],
+  ["8130C438",0x352],
+  ["8130C439",0x353],
+  ["8130C530",0x354],
+  ["8130C531",0x355],
+  ["8130C532",0x356],
+  ["8130C533",0x357],
+  ["8130C534",0x358],
+  ["8130C535",0x359],
+  ["8130C536",0x35A],
+  ["8130C537",0x35B],
+  ["8130C538",0x35C],
+  ["8130C539",0x35D],
+  ["8130C630",0x35E],
+  ["8130C631",0x35F],
+  ["8130C632",0x360],
+  ["8130C633",0x361],
+  ["8130C634",0x362],
+  ["8130C635",0x363],
+  ["8130C636",0x364],
+  ["8130C637",0x365],
+  ["8130C638",0x366],
+  ["8130C639",0x367],
+  ["8130C730",0x368],
+  ["8130C731",0x369],
+  ["8130C732",0x36A],
+  ["8130C733",0x36B],
+  ["8130C734",0x36C],
+  ["8130C735",0x36D],
+  ["8130C736",0x36E],
+  ["8130C737",0x36F],
+  ["8130C738",0x370],
+  ["8130C739",0x371],
+  ["8130C830",0x372],
+  ["8130C831",0x373],
+  ["8130C832",0x374],
+  ["8130C833",0x375],
+  ["8130C834",0x376],
+  ["8130C835",0x377],
+  ["8130C836",0x378],
+  ["8130C837",0x379],
+  ["8130C838",0x37A],
+  ["8130C839",0x37B],
+  ["8130C930",0x37C],
+  ["8130C931",0x37D],
+  ["8130C932",0x37E],
+  ["8130C933",0x37F],
+  ["8130C934",0x380],
+  ["8130C935",0x381],
+  ["8130C936",0x382],
+  ["8130C937",0x383],
+  ["8130C938",0x384],
+  ["8130C939",0x385],
+  ["8130CA30",0x386],
+  ["8130CA31",0x387],
+  ["8130CA32",0x388],
+  ["8130CA33",0x389],
+  ["8130CA34",0x38A],
+  ["8130CA35",0x38B],
+  ["8130CA36",0x38C],
+  ["8130CA37",0x38D],
+  ["8130CA38",0x38E],
+  ["8130CA39",0x38F],
+  ["8130CB30",0x390],
+  ["A6A1",0x391],
+  ["A6A2",0x392],
+  ["A6A3",0x393],
+  ["A6A4",0x394],
+  ["A6A5",0x395],
+  ["A6A6",0x396],
+  ["A6A7",0x397],
+  ["A6A8",0x398],
+  ["A6A9",0x399],
+  ["A6AA",0x39A],
+  ["A6AB",0x39B],
+  ["A6AC",0x39C],
+  ["A6AD",0x39D],
+  ["A6AE",0x39E],
+  ["A6AF",0x39F],
+  ["A6B0",0x3A0],
+  ["A6B1",0x3A1],
+  ["8130CB31",0x3A2],
+  ["A6B2",0x3A3],
+  ["A6B3",0x3A4],
+  ["A6B4",0x3A5],
+  ["A6B5",0x3A6],
+  ["A6B6",0x3A7],
+  ["A6B7",0x3A8],
+  ["A6B8",0x3A9],
+  ["8130CB32",0x3AA],
+  ["8130CB33",0x3AB],
+  ["8130CB34",0x3AC],
+  ["8130CB35",0x3AD],
+  ["8130CB36",0x3AE],
+  ["8130CB37",0x3AF],
+  ["8130CB38",0x3B0],
+  ["A6C1",0x3B1],
+  ["A6C2",0x3B2],
+  ["A6C3",0x3B3],
+  ["A6C4",0x3B4],
+  ["A6C5",0x3B5],
+  ["A6C6",0x3B6],
+  ["A6C7",0x3B7],
+  ["A6C8",0x3B8],
+  ["A6C9",0x3B9],
+  ["A6CA",0x3BA],
+  ["A6CB",0x3BB],
+  ["A6CC",0x3BC],
+  ["A6CD",0x3BD],
+  ["A6CE",0x3BE],
+  ["A6CF",0x3BF],
+  ["A6D0",0x3C0],
+  ["A6D1",0x3C1],
+  ["8130CB39",0x3C2],
+  ["A6D2",0x3C3],
+  ["A6D3",0x3C4],
+  ["A6D4",0x3C5],
+  ["A6D5",0x3C6],
+  ["A6D6",0x3C7],
+  ["A6D7",0x3C8],
+  ["A6D8",0x3C9],
+  ["8130CC30",0x3CA],
+  ["8130CC31",0x3CB],
+  ["8130CC32",0x3CC],
+  ["8130CC33",0x3CD],
+  ["8130CC34",0x3CE],
+  ["8130CC35",0x3CF],
+  ["8130CC36",0x3D0],
+  ["8130CC37",0x3D1],
+  ["8130CC38",0x3D2],
+  ["8130CC39",0x3D3],
+  ["8130CD30",0x3D4],
+  ["8130CD31",0x3D5],
+  ["8130CD32",0x3D6],
+  ["8130CD33",0x3D7],
+  ["8130CD34",0x3D8],
+  ["8130CD35",0x3D9],
+  ["8130CD36",0x3DA],
+  ["8130CD37",0x3DB],
+  ["8130CD38",0x3DC],
+  ["8130CD39",0x3DD],
+  ["8130CE30",0x3DE],
+  ["8130CE31",0x3DF],
+  ["8130CE32",0x3E0],
+  ["8130CE33",0x3E1],
+  ["8130CE34",0x3E2],
+  ["8130CE35",0x3E3],
+  ["8130CE36",0x3E4],
+  ["8130CE37",0x3E5],
+  ["8130CE38",0x3E6],
+  ["8130CE39",0x3E7],
+  ["8130CF30",0x3E8],
+  ["8130CF31",0x3E9],
+  ["8130CF32",0x3EA],
+  ["8130CF33",0x3EB],
+  ["8130CF34",0x3EC],
+  ["8130CF35",0x3ED],
+  ["8130CF36",0x3EE],
+  ["8130CF37",0x3EF],
+  ["8130CF38",0x3F0],
+  ["8130CF39",0x3F1],
+  ["8130D030",0x3F2],
+  ["8130D031",0x3F3],
+  ["8130D032",0x3F4],
+  ["8130D033",0x3F5],
+  ["8130D034",0x3F6],
+  ["8130D035",0x3F7],
+  ["8130D036",0x3F8],
+  ["8130D037",0x3F9],
+  ["8130D038",0x3FA],
+  ["8130D039",0x3FB],
+  ["8130D130",0x3FC],
+  ["8130D131",0x3FD],
+  ["8130D132",0x3FE],
+  ["8130D133",0x3FF],
+  ["8130D134",0x400],
+  ["A7A7",0x401],
+  ["8130D135",0x402],
+  ["8130D136",0x403],
+  ["8130D137",0x404],
+  ["8130D138",0x405],
+  ["8130D139",0x406],
+  ["8130D230",0x407],
+  ["8130D231",0x408],
+  ["8130D232",0x409],
+  ["8130D233",0x40A],
+  ["8130D234",0x40B],
+  ["8130D235",0x40C],
+  ["8130D236",0x40D],
+  ["8130D237",0x40E],
+  ["8130D238",0x40F],
+  ["A7A1",0x410],
+  ["A7A2",0x411],
+  ["A7A3",0x412],
+  ["A7A4",0x413],
+  ["A7A5",0x414],
+  ["A7A6",0x415],
+  ["A7A8",0x416],
+  ["A7A9",0x417],
+  ["A7AA",0x418],
+  ["A7AB",0x419],
+  ["A7AC",0x41A],
+  ["A7AD",0x41B],
+  ["A7AE",0x41C],
+  ["A7AF",0x41D],
+  ["A7B0",0x41E],
+  ["A7B1",0x41F],
+  ["A7B2",0x420],
+  ["A7B3",0x421],
+  ["A7B4",0x422],
+  ["A7B5",0x423],
+  ["A7B6",0x424],
+  ["A7B7",0x425],
+  ["A7B8",0x426],
+  ["A7B9",0x427],
+  ["A7BA",0x428],
+  ["A7BB",0x429],
+  ["A7BC",0x42A],
+  ["A7BD",0x42B],
+  ["A7BE",0x42C],
+  ["A7BF",0x42D],
+  ["A7C0",0x42E],
+  ["A7C1",0x42F],
+  ["A7D1",0x430],
+  ["A7D2",0x431],
+  ["A7D3",0x432],
+  ["A7D4",0x433],
+  ["A7D5",0x434],
+  ["A7D6",0x435],
+  ["A7D8",0x436],
+  ["A7D9",0x437],
+  ["A7DA",0x438],
+  ["A7DB",0x439],
+  ["A7DC",0x43A],
+  ["A7DD",0x43B],
+  ["A7DE",0x43C],
+  ["A7DF",0x43D],
+  ["A7E0",0x43E],
+  ["A7E1",0x43F],
+  ["A7E2",0x440],
+  ["A7E3",0x441],
+  ["A7E4",0x442],
+  ["A7E5",0x443],
+  ["A7E6",0x444],
+  ["A7E7",0x445],
+  ["A7E8",0x446],
+  ["A7E9",0x447],
+  ["A7EA",0x448],
+  ["A7EB",0x449],
+  ["A7EC",0x44A],
+  ["A7ED",0x44B],
+  ["A7EE",0x44C],
+  ["A7EF",0x44D],
+  ["A7F0",0x44E],
+  ["A7F1",0x44F],
+  ["8130D239",0x450],
+  ["A7D7",0x451],
+  ["8130D330",0x452],
+  ["8130D331",0x453],
+  ["8130D332",0x454],
+  ["8130D333",0x455],
+  ["8130D334",0x456],
+  ["8130D335",0x457],
+  ["8130D336",0x458],
+  ["8130D337",0x459],
+  ["8130D338",0x45A],
+  ["8130D339",0x45B],
+  ["8130D430",0x45C],
+  ["8130D431",0x45D],
+  ["8130D432",0x45E],
+  ["8130D433",0x45F],
+  ["8130D434",0x460],
+  ["8130D435",0x461],
+  ["8130D436",0x462],
+  ["8130D437",0x463],
+  ["8130D438",0x464],
+  ["8130D439",0x465],
+  ["8130D530",0x466],
+  ["8130D531",0x467],
+  ["8130D532",0x468],
+  ["8130D533",0x469],
+  ["8130D534",0x46A],
+  ["8130D535",0x46B],
+  ["8130D536",0x46C],
+  ["8130D537",0x46D],
+  ["8130D538",0x46E],
+  ["8130D539",0x46F],
+  ["8130D630",0x470],
+  ["8130D631",0x471],
+  ["8130D632",0x472],
+  ["8130D633",0x473],
+  ["8130D634",0x474],
+  ["8130D635",0x475],
+  ["8130D636",0x476],
+  ["8130D637",0x477],
+  ["8130D638",0x478],
+  ["8130D639",0x479],
+  ["8130D730",0x47A],
+  ["8130D731",0x47B],
+  ["8130D732",0x47C],
+  ["8130D733",0x47D],
+  ["8130D734",0x47E],
+  ["8130D735",0x47F],
+  ["8130D736",0x480],
+  ["8130D737",0x481],
+  ["8130D738",0x482],
+  ["8130D739",0x483],
+  ["8130D830",0x484],
+  ["8130D831",0x485],
+  ["8130D832",0x486],
+  ["8130D833",0x487],
+  ["8130D834",0x488],
+  ["8130D835",0x489],
+  ["8130D836",0x48A],
+  ["8130D837",0x48B],
+  ["8130D838",0x48C],
+  ["8130D839",0x48D],
+  ["8130D930",0x48E],
+  ["8130D931",0x48F],
+  ["8130D932",0x490],
+  ["8130D933",0x491],
+  ["8130D934",0x492],
+  ["8130D935",0x493],
+  ["8130D936",0x494],
+  ["8130D937",0x495],
+  ["8130D938",0x496],
+  ["8130D939",0x497],
+  ["8130DA30",0x498],
+  ["8130DA31",0x499],
+  ["8130DA32",0x49A],
+  ["8130DA33",0x49B],
+  ["8130DA34",0x49C],
+  ["8130DA35",0x49D],
+  ["8130DA36",0x49E],
+  ["8130DA37",0x49F],
+  ["8130DA38",0x4A0],
+  ["8130DA39",0x4A1],
+  ["8130DB30",0x4A2],
+  ["8130DB31",0x4A3],
+  ["8130DB32",0x4A4],
+  ["8130DB33",0x4A5],
+  ["8130DB34",0x4A6],
+  ["8130DB35",0x4A7],
+  ["8130DB36",0x4A8],
+  ["8130DB37",0x4A9],
+  ["8130DB38",0x4AA],
+  ["8130DB39",0x4AB],
+  ["8130DC30",0x4AC],
+  ["8130DC31",0x4AD],
+  ["8130DC32",0x4AE],
+  ["8130DC33",0x4AF],
+  ["8130DC34",0x4B0],
+  ["8130DC35",0x4B1],
+  ["8130DC36",0x4B2],
+  ["8130DC37",0x4B3],
+  ["8130DC38",0x4B4],
+  ["8130DC39",0x4B5],
+  ["8130DD30",0x4B6],
+  ["8130DD31",0x4B7],
+  ["8130DD32",0x4B8],
+  ["8130DD33",0x4B9],
+  ["8130DD34",0x4BA],
+  ["8130DD35",0x4BB],
+  ["8130DD36",0x4BC],
+  ["8130DD37",0x4BD],
+  ["8130DD38",0x4BE],
+  ["8130DD39",0x4BF],
+  ["8130DE30",0x4C0],
+  ["8130DE31",0x4C1],
+  ["8130DE32",0x4C2],
+  ["8130DE33",0x4C3],
+  ["8130DE34",0x4C4],
+  ["8130DE35",0x4C5],
+  ["8130DE36",0x4C6],
+  ["8130DE37",0x4C7],
+  ["8130DE38",0x4C8],
+  ["8130DE39",0x4C9],
+  ["8130DF30",0x4CA],
+  ["8130DF31",0x4CB],
+  ["8130DF32",0x4CC],
+  ["8130DF33",0x4CD],
+  ["8130DF34",0x4CE],
+  ["8130DF35",0x4CF],
+  ["8130DF36",0x4D0],
+  ["8130DF37",0x4D1],
+  ["8130DF38",0x4D2],
+  ["8130DF39",0x4D3],
+  ["8130E030",0x4D4],
+  ["8130E031",0x4D5],
+  ["8130E032",0x4D6],
+  ["8130E033",0x4D7],
+  ["8130E034",0x4D8],
+  ["8130E035",0x4D9],
+  ["8130E036",0x4DA],
+  ["8130E037",0x4DB],
+  ["8130E038",0x4DC],
+  ["8130E039",0x4DD],
+  ["8130E130",0x4DE],
+  ["8130E131",0x4DF],
+  ["8130E132",0x4E0],
+  ["8130E133",0x4E1],
+  ["8130E134",0x4E2],
+  ["8130E135",0x4E3],
+  ["8130E136",0x4E4],
+  ["8130E137",0x4E5],
+  ["8130E138",0x4E6],
+  ["8130E139",0x4E7],
+  ["8130E230",0x4E8],
+  ["8130E231",0x4E9],
+  ["8130E232",0x4EA],
+  ["8130E233",0x4EB],
+  ["8130E234",0x4EC],
+  ["8130E235",0x4ED],
+  ["8130E236",0x4EE],
+  ["8130E237",0x4EF],
+  ["8130E238",0x4F0],
+  ["8130E239",0x4F1],
+  ["8130E330",0x4F2],
+  ["8130E331",0x4F3],
+  ["8130E332",0x4F4],
+  ["8130E333",0x4F5],
+  ["8130E334",0x4F6],
+  ["8130E335",0x4F7],
+  ["8130E336",0x4F8],
+  ["8130E337",0x4F9],
+  ["8130E338",0x4FA],
+  ["8130E339",0x4FB],
+  ["8130E430",0x4FC],
+  ["8130E431",0x4FD],
+  ["8130E432",0x4FE],
+  ["8130E433",0x4FF],
+  ["8130E434",0x500],
+  ["8130E435",0x501],
+  ["8130E436",0x502],
+  ["8130E437",0x503],
+  ["8130E438",0x504],
+  ["8130E439",0x505],
+  ["8130E530",0x506],
+  ["8130E531",0x507],
+  ["8130E532",0x508],
+  ["8130E533",0x509],
+  ["8130E534",0x50A],
+  ["8130E535",0x50B],
+  ["8130E536",0x50C],
+  ["8130E537",0x50D],
+  ["8130E538",0x50E],
+  ["8130E539",0x50F],
+  ["8130E630",0x510],
+  ["8130E631",0x511],
+  ["8130E632",0x512],
+  ["8130E633",0x513],
+  ["8130E634",0x514],
+  ["8130E635",0x515],
+  ["8130E636",0x516],
+  ["8130E637",0x517],
+  ["8130E638",0x518],
+  ["8130E639",0x519],
+  ["8130E730",0x51A],
+  ["8130E731",0x51B],
+  ["8130E732",0x51C],
+  ["8130E733",0x51D],
+  ["8130E734",0x51E],
+  ["8130E735",0x51F],
+  ["8130E736",0x520],
+  ["8130E737",0x521],
+  ["8130E738",0x522],
+  ["8130E739",0x523],
+  ["8130E830",0x524],
+  ["8130E831",0x525],
+  ["8130E832",0x526],
+  ["8130E833",0x527],
+  ["8130E834",0x528],
+  ["8130E835",0x529],
+  ["8130E836",0x52A],
+  ["8130E837",0x52B],
+  ["8130E838",0x52C],
+  ["8130E839",0x52D],
+  ["8130E930",0x52E],
+  ["8130E931",0x52F],
+  ["8130E932",0x530],
+  ["8130E933",0x531],
+  ["8130E934",0x532],
+  ["8130E935",0x533],
+  ["8130E936",0x534],
+  ["8130E937",0x535],
+  ["8130E938",0x536],
+  ["8130E939",0x537],
+  ["8130EA30",0x538],
+  ["8130EA31",0x539],
+  ["8130EA32",0x53A],
+  ["8130EA33",0x53B],
+  ["8130EA34",0x53C],
+  ["8130EA35",0x53D],
+  ["8130EA36",0x53E],
+  ["8130EA37",0x53F],
+  ["8130EA38",0x540],
+  ["8130EA39",0x541],
+  ["8130EB30",0x542],
+  ["8130EB31",0x543],
+  ["8130EB32",0x544],
+  ["8130EB33",0x545],
+  ["8130EB34",0x546],
+  ["8130EB35",0x547],
+  ["8130EB36",0x548],
+  ["8130EB37",0x549],
+  ["8130EB38",0x54A],
+  ["8130EB39",0x54B],
+  ["8130EC30",0x54C],
+  ["8130EC31",0x54D],
+  ["8130EC32",0x54E],
+  ["8130EC33",0x54F],
+  ["8130EC34",0x550],
+  ["8130EC35",0x551],
+  ["8130EC36",0x552],
+  ["8130EC37",0x553],
+  ["8130EC38",0x554],
+  ["8130EC39",0x555],
+  ["8130ED30",0x556],
+  ["8130ED31",0x557],
+  ["8130ED32",0x558],
+  ["8130ED33",0x559],
+  ["8130ED34",0x55A],
+  ["8130ED35",0x55B],
+  ["8130ED36",0x55C],
+  ["8130ED37",0x55D],
+  ["8130ED38",0x55E],
+  ["8130ED39",0x55F],
+  ["8130EE30",0x560],
+  ["8130EE31",0x561],
+  ["8130EE32",0x562],
+  ["8130EE33",0x563],
+  ["8130EE34",0x564],
+  ["8130EE35",0x565],
+  ["8130EE36",0x566],
+  ["8130EE37",0x567],
+  ["8130EE38",0x568],
+  ["8130EE39",0x569],
+  ["8130EF30",0x56A],
+  ["8130EF31",0x56B],
+  ["8130EF32",0x56C],
+  ["8130EF33",0x56D],
+  ["8130EF34",0x56E],
+  ["8130EF35",0x56F],
+  ["8130EF36",0x570],
+  ["8130EF37",0x571],
+  ["8130EF38",0x572],
+  ["8130EF39",0x573],
+  ["8130F030",0x574],
+  ["8130F031",0x575],
+  ["8130F032",0x576],
+  ["8130F033",0x577],
+  ["8130F034",0x578],
+  ["8130F035",0x579],
+  ["8130F036",0x57A],
+  ["8130F037",0x57B],
+  ["8130F038",0x57C],
+  ["8130F039",0x57D],
+  ["8130F130",0x57E],
+  ["8130F131",0x57F],
+  ["8130F132",0x580],
+  ["8130F133",0x581],
+  ["8130F134",0x582],
+  ["8130F135",0x583],
+  ["8130F136",0x584],
+  ["8130F137",0x585],
+  ["8130F138",0x586],
+  ["8130F139",0x587],
+  ["8130F230",0x588],
+  ["8130F231",0x589],
+  ["8130F232",0x58A],
+  ["8130F233",0x58B],
+  ["8130F234",0x58C],
+  ["8130F235",0x58D],
+  ["8130F236",0x58E],
+  ["8130F237",0x58F],
+  ["8130F238",0x590],
+  ["8130F239",0x591],
+  ["8130F330",0x592],
+  ["8130F331",0x593],
+  ["8130F332",0x594],
+  ["8130F333",0x595],
+  ["8130F334",0x596],
+  ["8130F335",0x597],
+  ["8130F336",0x598],
+  ["8130F337",0x599],
+  ["8130F338",0x59A],
+  ["8130F339",0x59B],
+  ["8130F430",0x59C],
+  ["8130F431",0x59D],
+  ["8130F432",0x59E],
+  ["8130F433",0x59F],
+  ["8130F434",0x5A0],
+  ["8130F435",0x5A1],
+  ["8130F436",0x5A2],
+  ["8130F437",0x5A3],
+  ["8130F438",0x5A4],
+  ["8130F439",0x5A5],
+  ["8130F530",0x5A6],
+  ["8130F531",0x5A7],
+  ["8130F532",0x5A8],
+  ["8130F533",0x5A9],
+  ["8130F534",0x5AA],
+  ["8130F535",0x5AB],
+  ["8130F536",0x5AC],
+  ["8130F537",0x5AD],
+  ["8130F538",0x5AE],
+  ["8130F539",0x5AF],
+  ["8130F630",0x5B0],
+  ["8130F631",0x5B1],
+  ["8130F632",0x5B2],
+  ["8130F633",0x5B3],
+  ["8130F634",0x5B4],
+  ["8130F635",0x5B5],
+  ["8130F636",0x5B6],
+  ["8130F637",0x5B7],
+  ["8130F638",0x5B8],
+  ["8130F639",0x5B9],
+  ["8130F730",0x5BA],
+  ["8130F731",0x5BB],
+  ["8130F732",0x5BC],
+  ["8130F733",0x5BD],
+  ["8130F734",0x5BE],
+  ["8130F735",0x5BF],
+  ["8130F736",0x5C0],
+  ["8130F737",0x5C1],
+  ["8130F738",0x5C2],
+  ["8130F739",0x5C3],
+  ["8130F830",0x5C4],
+  ["8130F831",0x5C5],
+  ["8130F832",0x5C6],
+  ["8130F833",0x5C7],
+  ["8130F834",0x5C8],
+  ["8130F835",0x5C9],
+  ["8130F836",0x5CA],
+  ["8130F837",0x5CB],
+  ["8130F838",0x5CC],
+  ["8130F839",0x5CD],
+  ["8130F930",0x5CE],
+  ["8130F931",0x5CF],
+  ["8130F932",0x5D0],
+  ["8130F933",0x5D1],
+  ["8130F934",0x5D2],
+  ["8130F935",0x5D3],
+  ["8130F936",0x5D4],
+  ["8130F937",0x5D5],
+  ["8130F938",0x5D6],
+  ["8130F939",0x5D7],
+  ["8130FA30",0x5D8],
+  ["8130FA31",0x5D9],
+  ["8130FA32",0x5DA],
+  ["8130FA33",0x5DB],
+  ["8130FA34",0x5DC],
+  ["8130FA35",0x5DD],
+  ["8130FA36",0x5DE],
+  ["8130FA37",0x5DF],
+  ["8130FA38",0x5E0],
+  ["8130FA39",0x5E1],
+  ["8130FB30",0x5E2],
+  ["8130FB31",0x5E3],
+  ["8130FB32",0x5E4],
+  ["8130FB33",0x5E5],
+  ["8130FB34",0x5E6],
+  ["8130FB35",0x5E7],
+  ["8130FB36",0x5E8],
+  ["8130FB37",0x5E9],
+  ["8130FB38",0x5EA],
+  ["8130FB39",0x5EB],
+  ["8130FC30",0x5EC],
+  ["8130FC31",0x5ED],
+  ["8130FC32",0x5EE],
+  ["8130FC33",0x5EF],
+  ["8130FC34",0x5F0],
+  ["8130FC35",0x5F1],
+  ["8130FC36",0x5F2],
+  ["8130FC37",0x5F3],
+  ["8130FC38",0x5F4],
+  ["8130FC39",0x5F5],
+  ["8130FD30",0x5F6],
+  ["8130FD31",0x5F7],
+  ["8130FD32",0x5F8],
+  ["8130FD33",0x5F9],
+  ["8130FD34",0x5FA],
+  ["8130FD35",0x5FB],
+  ["8130FD36",0x5FC],
+  ["8130FD37",0x5FD],
+  ["8130FD38",0x5FE],
+  ["8130FD39",0x5FF],
+  ["8130FE30",0x600],
+  ["8130FE31",0x601],
+  ["8130FE32",0x602],
+  ["8130FE33",0x603],
+  ["8130FE34",0x604],
+  ["8130FE35",0x605],
+  ["8130FE36",0x606],
+  ["8130FE37",0x607],
+  ["8130FE38",0x608],
+  ["8130FE39",0x609],
+  ["81318130",0x60A],
+  ["81318131",0x60B],
+  ["81318132",0x60C],
+  ["81318133",0x60D],
+  ["81318134",0x60E],
+  ["81318135",0x60F],
+  ["81318136",0x610],
+  ["81318137",0x611],
+  ["81318138",0x612],
+  ["81318139",0x613],
+  ["81318230",0x614],
+  ["81318231",0x615],
+  ["81318232",0x616],
+  ["81318233",0x617],
+  ["81318234",0x618],
+  ["81318235",0x619],
+  ["81318236",0x61A],
+  ["81318237",0x61B],
+  ["81318238",0x61C],
+  ["81318239",0x61D],
+  ["81318330",0x61E],
+  ["81318331",0x61F],
+  ["81318332",0x620],
+  ["81318333",0x621],
+  ["81318334",0x622],
+  ["81318335",0x623],
+  ["81318336",0x624],
+  ["81318337",0x625],
+  ["81318338",0x626],
+  ["81318339",0x627],
+  ["81318430",0x628],
+  ["81318431",0x629],
+  ["81318432",0x62A],
+  ["81318433",0x62B],
+  ["81318434",0x62C],
+  ["81318435",0x62D],
+  ["81318436",0x62E],
+  ["81318437",0x62F],
+  ["81318438",0x630],
+  ["81318439",0x631],
+  ["81318530",0x632],
+  ["81318531",0x633],
+  ["81318532",0x634],
+  ["81318533",0x635],
+  ["81318534",0x636],
+  ["81318535",0x637],
+  ["81318536",0x638],
+  ["81318537",0x639],
+  ["81318538",0x63A],
+  ["81318539",0x63B],
+  ["81318630",0x63C],
+  ["81318631",0x63D],
+  ["81318632",0x63E],
+  ["81318633",0x63F],
+  ["81318634",0x640],
+  ["81318635",0x641],
+  ["81318636",0x642],
+  ["81318637",0x643],
+  ["81318638",0x644],
+  ["81318639",0x645],
+  ["81318730",0x646],
+  ["81318731",0x647],
+  ["81318732",0x648],
+  ["81318733",0x649],
+  ["81318734",0x64A],
+  ["81318735",0x64B],
+  ["81318736",0x64C],
+  ["81318737",0x64D],
+  ["81318738",0x64E],
+  ["81318739",0x64F],
+  ["81318830",0x650],
+  ["81318831",0x651],
+  ["81318832",0x652],
+  ["81318833",0x653],
+  ["81318834",0x654],
+  ["81318835",0x655],
+  ["81318836",0x656],
+  ["81318837",0x657],
+  ["81318838",0x658],
+  ["81318839",0x659],
+  ["81318930",0x65A],
+  ["81318931",0x65B],
+  ["81318932",0x65C],
+  ["81318933",0x65D],
+  ["81318934",0x65E],
+  ["81318935",0x65F],
+  ["81318936",0x660],
+  ["81318937",0x661],
+  ["81318938",0x662],
+  ["81318939",0x663],
+  ["81318A30",0x664],
+  ["81318A31",0x665],
+  ["81318A32",0x666],
+  ["81318A33",0x667],
+  ["81318A34",0x668],
+  ["81318A35",0x669],
+  ["81318A36",0x66A],
+  ["81318A37",0x66B],
+  ["81318A38",0x66C],
+  ["81318A39",0x66D],
+  ["81318B30",0x66E],
+  ["81318B31",0x66F],
+  ["81318B32",0x670],
+  ["81318B33",0x671],
+  ["81318B34",0x672],
+  ["81318B35",0x673],
+  ["81318B36",0x674],
+  ["81318B37",0x675],
+  ["81318B38",0x676],
+  ["81318B39",0x677],
+  ["81318C30",0x678],
+  ["81318C31",0x679],
+  ["81318C32",0x67A],
+  ["81318C33",0x67B],
+  ["81318C34",0x67C],
+  ["81318C35",0x67D],
+  ["81318C36",0x67E],
+  ["81318C37",0x67F],
+  ["81318C38",0x680],
+  ["81318C39",0x681],
+  ["81318D30",0x682],
+  ["81318D31",0x683],
+  ["81318D32",0x684],
+  ["81318D33",0x685],
+  ["81318D34",0x686],
+  ["81318D35",0x687],
+  ["81318D36",0x688],
+  ["81318D37",0x689],
+  ["81318D38",0x68A],
+  ["81318D39",0x68B],
+  ["81318E30",0x68C],
+  ["81318E31",0x68D],
+  ["81318E32",0x68E],
+  ["81318E33",0x68F],
+  ["81318E34",0x690],
+  ["81318E35",0x691],
+  ["81318E36",0x692],
+  ["81318E37",0x693],
+  ["81318E38",0x694],
+  ["81318E39",0x695],
+  ["81318F30",0x696],
+  ["81318F31",0x697],
+  ["81318F32",0x698],
+  ["81318F33",0x699],
+  ["81318F34",0x69A],
+  ["81318F35",0x69B],
+  ["81318F36",0x69C],
+  ["81318F37",0x69D],
+  ["81318F38",0x69E],
+  ["81318F39",0x69F],
+  ["81319030",0x6A0],
+  ["81319031",0x6A1],
+  ["81319032",0x6A2],
+  ["81319033",0x6A3],
+  ["81319034",0x6A4],
+  ["81319035",0x6A5],
+  ["81319036",0x6A6],
+  ["81319037",0x6A7],
+  ["81319038",0x6A8],
+  ["81319039",0x6A9],
+  ["81319130",0x6AA],
+  ["81319131",0x6AB],
+  ["81319132",0x6AC],
+  ["81319133",0x6AD],
+  ["81319134",0x6AE],
+  ["81319135",0x6AF],
+  ["81319136",0x6B0],
+  ["81319137",0x6B1],
+  ["81319138",0x6B2],
+  ["81319139",0x6B3],
+  ["81319230",0x6B4],
+  ["81319231",0x6B5],
+  ["81319232",0x6B6],
+  ["81319233",0x6B7],
+  ["81319234",0x6B8],
+  ["81319235",0x6B9],
+  ["81319236",0x6BA],
+  ["81319237",0x6BB],
+  ["81319238",0x6BC],
+  ["81319239",0x6BD],
+  ["81319330",0x6BE],
+  ["81319331",0x6BF],
+  ["81319332",0x6C0],
+  ["81319333",0x6C1],
+  ["81319334",0x6C2],
+  ["81319335",0x6C3],
+  ["81319336",0x6C4],
+  ["81319337",0x6C5],
+  ["81319338",0x6C6],
+  ["81319339",0x6C7],
+  ["81319430",0x6C8],
+  ["81319431",0x6C9],
+  ["81319432",0x6CA],
+  ["81319433",0x6CB],
+  ["81319434",0x6CC],
+  ["81319435",0x6CD],
+  ["81319436",0x6CE],
+  ["81319437",0x6CF],
+  ["81319438",0x6D0],
+  ["81319439",0x6D1],
+  ["81319530",0x6D2],
+  ["81319531",0x6D3],
+  ["81319532",0x6D4],
+  ["81319533",0x6D5],
+  ["81319534",0x6D6],
+  ["81319535",0x6D7],
+  ["81319536",0x6D8],
+  ["81319537",0x6D9],
+  ["81319538",0x6DA],
+  ["81319539",0x6DB],
+  ["81319630",0x6DC],
+  ["81319631",0x6DD],
+  ["81319632",0x6DE],
+  ["81319633",0x6DF],
+  ["81319634",0x6E0],
+  ["81319635",0x6E1],
+  ["81319636",0x6E2],
+  ["81319637",0x6E3],
+  ["81319638",0x6E4],
+  ["81319639",0x6E5],
+  ["81319730",0x6E6],
+  ["81319731",0x6E7],
+  ["81319732",0x6E8],
+  ["81319733",0x6E9],
+  ["81319734",0x6EA],
+  ["81319735",0x6EB],
+  ["81319736",0x6EC],
+  ["81319737",0x6ED],
+  ["81319738",0x6EE],
+  ["81319739",0x6EF],
+  ["81319830",0x6F0],
+  ["81319831",0x6F1],
+  ["81319832",0x6F2],
+  ["81319833",0x6F3],
+  ["81319834",0x6F4],
+  ["81319835",0x6F5],
+  ["81319836",0x6F6],
+  ["81319837",0x6F7],
+  ["81319838",0x6F8],
+  ["81319839",0x6F9],
+  ["81319930",0x6FA],
+  ["81319931",0x6FB],
+  ["81319932",0x6FC],
+  ["81319933",0x6FD],
+  ["81319934",0x6FE],
+  ["81319935",0x6FF],
+  ["81319936",0x700],
+  ["81319937",0x701],
+  ["81319938",0x702],
+  ["81319939",0x703],
+  ["81319A30",0x704],
+  ["81319A31",0x705],
+  ["81319A32",0x706],
+  ["81319A33",0x707],
+  ["81319A34",0x708],
+  ["81319A35",0x709],
+  ["81319A36",0x70A],
+  ["81319A37",0x70B],
+  ["81319A38",0x70C],
+  ["81319A39",0x70D],
+  ["81319B30",0x70E],
+  ["81319B31",0x70F],
+  ["81319B32",0x710],
+  ["81319B33",0x711],
+  ["81319B34",0x712],
+  ["81319B35",0x713],
+  ["81319B36",0x714],
+  ["81319B37",0x715],
+  ["81319B38",0x716],
+  ["81319B39",0x717],
+  ["81319C30",0x718],
+  ["81319C31",0x719],
+  ["81319C32",0x71A],
+  ["81319C33",0x71B],
+  ["81319C34",0x71C],
+  ["81319C35",0x71D],
+  ["81319C36",0x71E],
+  ["81319C37",0x71F],
+  ["81319C38",0x720],
+  ["81319C39",0x721],
+  ["81319D30",0x722],
+  ["81319D31",0x723],
+  ["81319D32",0x724],
+  ["81319D33",0x725],
+  ["81319D34",0x726],
+  ["81319D35",0x727],
+  ["81319D36",0x728],
+  ["81319D37",0x729],
+  ["81319D38",0x72A],
+  ["81319D39",0x72B],
+  ["81319E30",0x72C],
+  ["81319E31",0x72D],
+  ["81319E32",0x72E],
+  ["81319E33",0x72F],
+  ["81319E34",0x730],
+  ["81319E35",0x731],
+  ["81319E36",0x732],
+  ["81319E37",0x733],
+  ["81319E38",0x734],
+  ["81319E39",0x735],
+  ["81319F30",0x736],
+  ["81319F31",0x737],
+  ["81319F32",0x738],
+  ["81319F33",0x739],
+  ["81319F34",0x73A],
+  ["81319F35",0x73B],
+  ["81319F36",0x73C],
+  ["81319F37",0x73D],
+  ["81319F38",0x73E],
+  ["81319F39",0x73F],
+  ["8131A030",0x740],
+  ["8131A031",0x741],
+  ["8131A032",0x742],
+  ["8131A033",0x743],
+  ["8131A034",0x744],
+  ["8131A035",0x745],
+  ["8131A036",0x746],
+  ["8131A037",0x747],
+  ["8131A038",0x748],
+  ["8131A039",0x749],
+  ["8131A130",0x74A],
+  ["8131A131",0x74B],
+  ["8131A132",0x74C],
+  ["8131A133",0x74D],
+  ["8131A134",0x74E],
+  ["8131A135",0x74F],
+  ["8131A136",0x750],
+  ["8131A137",0x751],
+  ["8131A138",0x752],
+  ["8131A139",0x753],
+  ["8131A230",0x754],
+  ["8131A231",0x755],
+  ["8131A232",0x756],
+  ["8131A233",0x757],
+  ["8131A234",0x758],
+  ["8131A235",0x759],
+  ["8131A236",0x75A],
+  ["8131A237",0x75B],
+  ["8131A238",0x75C],
+  ["8131A239",0x75D],
+  ["8131A330",0x75E],
+  ["8131A331",0x75F],
+  ["8131A332",0x760],
+  ["8131A333",0x761],
+  ["8131A334",0x762],
+  ["8131A335",0x763],
+  ["8131A336",0x764],
+  ["8131A337",0x765],
+  ["8131A338",0x766],
+  ["8131A339",0x767],
+  ["8131A430",0x768],
+  ["8131A431",0x769],
+  ["8131A432",0x76A],
+  ["8131A433",0x76B],
+  ["8131A434",0x76C],
+  ["8131A435",0x76D],
+  ["8131A436",0x76E],
+  ["8131A437",0x76F],
+  ["8131A438",0x770],
+  ["8131A439",0x771],
+  ["8131A530",0x772],
+  ["8131A531",0x773],
+  ["8131A532",0x774],
+  ["8131A533",0x775],
+  ["8131A534",0x776],
+  ["8131A535",0x777],
+  ["8131A536",0x778],
+  ["8131A537",0x779],
+  ["8131A538",0x77A],
+  ["8131A539",0x77B],
+  ["8131A630",0x77C],
+  ["8131A631",0x77D],
+  ["8131A632",0x77E],
+  ["8131A633",0x77F],
+  ["8131A634",0x780],
+  ["8131A635",0x781],
+  ["8131A636",0x782],
+  ["8131A637",0x783],
+  ["8131A638",0x784],
+  ["8131A639",0x785],
+  ["8131A730",0x786],
+  ["8131A731",0x787],
+  ["8131A732",0x788],
+  ["8131A733",0x789],
+  ["8131A734",0x78A],
+  ["8131A735",0x78B],
+  ["8131A736",0x78C],
+  ["8131A737",0x78D],
+  ["8131A738",0x78E],
+  ["8131A739",0x78F],
+  ["8131A830",0x790],
+  ["8131A831",0x791],
+  ["8131A832",0x792],
+  ["8131A833",0x793],
+  ["8131A834",0x794],
+  ["8131A835",0x795],
+  ["8131A836",0x796],
+  ["8131A837",0x797],
+  ["8131A838",0x798],
+  ["8131A839",0x799],
+  ["8131A930",0x79A],
+  ["8131A931",0x79B],
+  ["8131A932",0x79C],
+  ["8131A933",0x79D],
+  ["8131A934",0x79E],
+  ["8131A935",0x79F],
+  ["8131A936",0x7A0],
+  ["8131A937",0x7A1],
+  ["8131A938",0x7A2],
+  ["8131A939",0x7A3],
+  ["8131AA30",0x7A4],
+  ["8131AA31",0x7A5],
+  ["8131AA32",0x7A6],
+  ["8131AA33",0x7A7],
+  ["8131AA34",0x7A8],
+  ["8131AA35",0x7A9],
+  ["8131AA36",0x7AA],
+  ["8131AA37",0x7AB],
+  ["8131AA38",0x7AC],
+  ["8131AA39",0x7AD],
+  ["8131AB30",0x7AE],
+  ["8131AB31",0x7AF],
+  ["8131AB32",0x7B0],
+  ["8131AB33",0x7B1],
+  ["8131AB34",0x7B2],
+  ["8131AB35",0x7B3],
+  ["8131AB36",0x7B4],
+  ["8131AB37",0x7B5],
+  ["8131AB38",0x7B6],
+  ["8131AB39",0x7B7],
+  ["8131AC30",0x7B8],
+  ["8131AC31",0x7B9],
+  ["8131AC32",0x7BA],
+  ["8131AC33",0x7BB],
+  ["8131AC34",0x7BC],
+  ["8131AC35",0x7BD],
+  ["8131AC36",0x7BE],
+  ["8131AC37",0x7BF],
+  ["8131AC38",0x7C0],
+  ["8131AC39",0x7C1],
+  ["8131AD30",0x7C2],
+  ["8131AD31",0x7C3],
+  ["8131AD32",0x7C4],
+  ["8131AD33",0x7C5],
+  ["8131AD34",0x7C6],
+  ["8131AD35",0x7C7],
+  ["8131AD36",0x7C8],
+  ["8131AD37",0x7C9],
+  ["8131AD38",0x7CA],
+  ["8131AD39",0x7CB],
+  ["8131AE30",0x7CC],
+  ["8131AE31",0x7CD],
+  ["8131AE32",0x7CE],
+  ["8131AE33",0x7CF],
+  ["8131AE34",0x7D0],
+  ["8131AE35",0x7D1],
+  ["8131AE36",0x7D2],
+  ["8131AE37",0x7D3],
+  ["8131AE38",0x7D4],
+  ["8131AE39",0x7D5],
+  ["8131AF30",0x7D6],
+  ["8131AF31",0x7D7],
+  ["8131AF32",0x7D8],
+  ["8131AF33",0x7D9],
+  ["8131AF34",0x7DA],
+  ["8131AF35",0x7DB],
+  ["8131AF36",0x7DC],
+  ["8131AF37",0x7DD],
+  ["8131AF38",0x7DE],
+  ["8131AF39",0x7DF],
+  ["8131B030",0x7E0],
+  ["8131B031",0x7E1],
+  ["8131B032",0x7E2],
+  ["8131B033",0x7E3],
+  ["8131B034",0x7E4],
+  ["8131B035",0x7E5],
+  ["8131B036",0x7E6],
+  ["8131B037",0x7E7],
+  ["8131B038",0x7E8],
+  ["8131B039",0x7E9],
+  ["8131B130",0x7EA],
+  ["8131B131",0x7EB],
+  ["8131B132",0x7EC],
+  ["8131B133",0x7ED],
+  ["8131B134",0x7EE],
+  ["8131B135",0x7EF],
+  ["8131B136",0x7F0],
+  ["8131B137",0x7F1],
+  ["8131B138",0x7F2],
+  ["8131B139",0x7F3],
+  ["8131B230",0x7F4],
+  ["8131B231",0x7F5],
+  ["8131B232",0x7F6],
+  ["8131B233",0x7F7],
+  ["8131B234",0x7F8],
+  ["8131B235",0x7F9],
+  ["8131B236",0x7FA],
+  ["8131B237",0x7FB],
+  ["8131B238",0x7FC],
+  ["8131B239",0x7FD],
+  ["8131B330",0x7FE],
+  ["8131B331",0x7FF],
+  ["8131B332",0x800],
+  ["8131B333",0x801],
+  ["8131B334",0x802],
+  ["8131B335",0x803],
+  ["8131B336",0x804],
+  ["8131B337",0x805],
+  ["8131B338",0x806],
+  ["8131B339",0x807],
+  ["8131B430",0x808],
+  ["8131B431",0x809],
+  ["8131B432",0x80A],
+  ["8131B433",0x80B],
+  ["8131B434",0x80C],
+  ["8131B435",0x80D],
+  ["8131B436",0x80E],
+  ["8131B437",0x80F],
+  ["8131B438",0x810],
+  ["8131B439",0x811],
+  ["8131B530",0x812],
+  ["8131B531",0x813],
+  ["8131B532",0x814],
+  ["8131B533",0x815],
+  ["8131B534",0x816],
+  ["8131B535",0x817],
+  ["8131B536",0x818],
+  ["8131B537",0x819],
+  ["8131B538",0x81A],
+  ["8131B539",0x81B],
+  ["8131B630",0x81C],
+  ["8131B631",0x81D],
+  ["8131B632",0x81E],
+  ["8131B633",0x81F],
+  ["8131B634",0x820],
+  ["8131B635",0x821],
+  ["8131B636",0x822],
+  ["8131B637",0x823],
+  ["8131B638",0x824],
+  ["8131B639",0x825],
+  ["8131B730",0x826],
+  ["8131B731",0x827],
+  ["8131B732",0x828],
+  ["8131B733",0x829],
+  ["8131B734",0x82A],
+  ["8131B735",0x82B],
+  ["8131B736",0x82C],
+  ["8131B737",0x82D],
+  ["8131B738",0x82E],
+  ["8131B739",0x82F],
+  ["8131B830",0x830],
+  ["8131B831",0x831],
+  ["8131B832",0x832],
+  ["8131B833",0x833],
+  ["8131B834",0x834],
+  ["8131B835",0x835],
+  ["8131B836",0x836],
+  ["8131B837",0x837],
+  ["8131B838",0x838],
+  ["8131B839",0x839],
+  ["8131B930",0x83A],
+  ["8131B931",0x83B],
+  ["8131B932",0x83C],
+  ["8131B933",0x83D],
+  ["8131B934",0x83E],
+  ["8131B935",0x83F],
+  ["8131B936",0x840],
+  ["8131B937",0x841],
+  ["8131B938",0x842],
+  ["8131B939",0x843],
+  ["8131BA30",0x844],
+  ["8131BA31",0x845],
+  ["8131BA32",0x846],
+  ["8131BA33",0x847],
+  ["8131BA34",0x848],
+  ["8131BA35",0x849],
+  ["8131BA36",0x84A],
+  ["8131BA37",0x84B],
+  ["8131BA38",0x84C],
+  ["8131BA39",0x84D],
+  ["8131BB30",0x84E],
+  ["8131BB31",0x84F],
+  ["8131BB32",0x850],
+  ["8131BB33",0x851],
+  ["8131BB34",0x852],
+  ["8131BB35",0x853],
+  ["8131BB36",0x854],
+  ["8131BB37",0x855],
+  ["8131BB38",0x856],
+  ["8131BB39",0x857],
+  ["8131BC30",0x858],
+  ["8131BC31",0x859],
+  ["8131BC32",0x85A],
+  ["8131BC33",0x85B],
+  ["8131BC34",0x85C],
+  ["8131BC35",0x85D],
+  ["8131BC36",0x85E],
+  ["8131BC37",0x85F],
+  ["8131BC38",0x860],
+  ["8131BC39",0x861],
+  ["8131BD30",0x862],
+  ["8131BD31",0x863],
+  ["8131BD32",0x864],
+  ["8131BD33",0x865],
+  ["8131BD34",0x866],
+  ["8131BD35",0x867],
+  ["8131BD36",0x868],
+  ["8131BD37",0x869],
+  ["8131BD38",0x86A],
+  ["8131BD39",0x86B],
+  ["8131BE30",0x86C],
+  ["8131BE31",0x86D],
+  ["8131BE32",0x86E],
+  ["8131BE33",0x86F],
+  ["8131BE34",0x870],
+  ["8131BE35",0x871],
+  ["8131BE36",0x872],
+  ["8131BE37",0x873],
+  ["8131BE38",0x874],
+  ["8131BE39",0x875],
+  ["8131BF30",0x876],
+  ["8131BF31",0x877],
+  ["8131BF32",0x878],
+  ["8131BF33",0x879],
+  ["8131BF34",0x87A],
+  ["8131BF35",0x87B],
+  ["8131BF36",0x87C],
+  ["8131BF37",0x87D],
+  ["8131BF38",0x87E],
+  ["8131BF39",0x87F],
+  ["8131C030",0x880],
+  ["8131C031",0x881],
+  ["8131C032",0x882],
+  ["8131C033",0x883],
+  ["8131C034",0x884],
+  ["8131C035",0x885],
+  ["8131C036",0x886],
+  ["8131C037",0x887],
+  ["8131C038",0x888],
+  ["8131C039",0x889],
+  ["8131C130",0x88A],
+  ["8131C131",0x88B],
+  ["8131C132",0x88C],
+  ["8131C133",0x88D],
+  ["8131C134",0x88E],
+  ["8131C135",0x88F],
+  ["8131C136",0x890],
+  ["8131C137",0x891],
+  ["8131C138",0x892],
+  ["8131C139",0x893],
+  ["8131C230",0x894],
+  ["8131C231",0x895],
+  ["8131C232",0x896],
+  ["8131C233",0x897],
+  ["8131C234",0x898],
+  ["8131C235",0x899],
+  ["8131C236",0x89A],
+  ["8131C237",0x89B],
+  ["8131C238",0x89C],
+  ["8131C239",0x89D],
+  ["8131C330",0x89E],
+  ["8131C331",0x89F],
+  ["8131C332",0x8A0],
+  ["8131C333",0x8A1],
+  ["8131C334",0x8A2],
+  ["8131C335",0x8A3],
+  ["8131C336",0x8A4],
+  ["8131C337",0x8A5],
+  ["8131C338",0x8A6],
+  ["8131C339",0x8A7],
+  ["8131C430",0x8A8],
+  ["8131C431",0x8A9],
+  ["8131C432",0x8AA],
+  ["8131C433",0x8AB],
+  ["8131C434",0x8AC],
+  ["8131C435",0x8AD],
+  ["8131C436",0x8AE],
+  ["8131C437",0x8AF],
+  ["8131C438",0x8B0],
+  ["8131C439",0x8B1],
+  ["8131C530",0x8B2],
+  ["8131C531",0x8B3],
+  ["8131C532",0x8B4],
+  ["8131C533",0x8B5],
+  ["8131C534",0x8B6],
+  ["8131C535",0x8B7],
+  ["8131C536",0x8B8],
+  ["8131C537",0x8B9],
+  ["8131C538",0x8BA],
+  ["8131C539",0x8BB],
+  ["8131C630",0x8BC],
+  ["8131C631",0x8BD],
+  ["8131C632",0x8BE],
+  ["8131C633",0x8BF],
+  ["8131C634",0x8C0],
+  ["8131C635",0x8C1],
+  ["8131C636",0x8C2],
+  ["8131C637",0x8C3],
+  ["8131C638",0x8C4],
+  ["8131C639",0x8C5],
+  ["8131C730",0x8C6],
+  ["8131C731",0x8C7],
+  ["8131C732",0x8C8],
+  ["8131C733",0x8C9],
+  ["8131C734",0x8CA],
+  ["8131C735",0x8CB],
+  ["8131C736",0x8CC],
+  ["8131C737",0x8CD],
+  ["8131C738",0x8CE],
+  ["8131C739",0x8CF],
+  ["8131C830",0x8D0],
+  ["8131C831",0x8D1],
+  ["8131C832",0x8D2],
+  ["8131C833",0x8D3],
+  ["8131C834",0x8D4],
+  ["8131C835",0x8D5],
+  ["8131C836",0x8D6],
+  ["8131C837",0x8D7],
+  ["8131C838",0x8D8],
+  ["8131C839",0x8D9],
+  ["8131C930",0x8DA],
+  ["8131C931",0x8DB],
+  ["8131C932",0x8DC],
+  ["8131C933",0x8DD],
+  ["8131C934",0x8DE],
+  ["8131C935",0x8DF],
+  ["8131C936",0x8E0],
+  ["8131C937",0x8E1],
+  ["8131C938",0x8E2],
+  ["8131C939",0x8E3],
+  ["8131CA30",0x8E4],
+  ["8131CA31",0x8E5],
+  ["8131CA32",0x8E6],
+  ["8131CA33",0x8E7],
+  ["8131CA34",0x8E8],
+  ["8131CA35",0x8E9],
+  ["8131CA36",0x8EA],
+  ["8131CA37",0x8EB],
+  ["8131CA38",0x8EC],
+  ["8131CA39",0x8ED],
+  ["8131CB30",0x8EE],
+  ["8131CB31",0x8EF],
+  ["8131CB32",0x8F0],
+  ["8131CB33",0x8F1],
+  ["8131CB34",0x8F2],
+  ["8131CB35",0x8F3],
+  ["8131CB36",0x8F4],
+  ["8131CB37",0x8F5],
+  ["8131CB38",0x8F6],
+  ["8131CB39",0x8F7],
+  ["8131CC30",0x8F8],
+  ["8131CC31",0x8F9],
+  ["8131CC32",0x8FA],
+  ["8131CC33",0x8FB],
+  ["8131CC34",0x8FC],
+  ["8131CC35",0x8FD],
+  ["8131CC36",0x8FE],
+  ["8131CC37",0x8FF],
+  ["8131CC38",0x900],
+  ["8131CC39",0x901],
+  ["8131CD30",0x902],
+  ["8131CD31",0x903],
+  ["8131CD32",0x904],
+  ["8131CD33",0x905],
+  ["8131CD34",0x906],
+  ["8131CD35",0x907],
+  ["8131CD36",0x908],
+  ["8131CD37",0x909],
+  ["8131CD38",0x90A],
+  ["8131CD39",0x90B],
+  ["8131CE30",0x90C],
+  ["8131CE31",0x90D],
+  ["8131CE32",0x90E],
+  ["8131CE33",0x90F],
+  ["8131CE34",0x910],
+  ["8131CE35",0x911],
+  ["8131CE36",0x912],
+  ["8131CE37",0x913],
+  ["8131CE38",0x914],
+  ["8131CE39",0x915],
+  ["8131CF30",0x916],
+  ["8131CF31",0x917],
+  ["8131CF32",0x918],
+  ["8131CF33",0x919],
+  ["8131CF34",0x91A],
+  ["8131CF35",0x91B],
+  ["8131CF36",0x91C],
+  ["8131CF37",0x91D],
+  ["8131CF38",0x91E],
+  ["8131CF39",0x91F],
+  ["8131D030",0x920],
+  ["8131D031",0x921],
+  ["8131D032",0x922],
+  ["8131D033",0x923],
+  ["8131D034",0x924],
+  ["8131D035",0x925],
+  ["8131D036",0x926],
+  ["8131D037",0x927],
+  ["8131D038",0x928],
+  ["8131D039",0x929],
+  ["8131D130",0x92A],
+  ["8131D131",0x92B],
+  ["8131D132",0x92C],
+  ["8131D133",0x92D],
+  ["8131D134",0x92E],
+  ["8131D135",0x92F],
+  ["8131D136",0x930],
+  ["8131D137",0x931],
+  ["8131D138",0x932],
+  ["8131D139",0x933],
+  ["8131D230",0x934],
+  ["8131D231",0x935],
+  ["8131D232",0x936],
+  ["8131D233",0x937],
+  ["8131D234",0x938],
+  ["8131D235",0x939],
+  ["8131D236",0x93A],
+  ["8131D237",0x93B],
+  ["8131D238",0x93C],
+  ["8131D239",0x93D],
+  ["8131D330",0x93E],
+  ["8131D331",0x93F],
+  ["8131D332",0x940],
+  ["8131D333",0x941],
+  ["8131D334",0x942],
+  ["8131D335",0x943],
+  ["8131D336",0x944],
+  ["8131D337",0x945],
+  ["8131D338",0x946],
+  ["8131D339",0x947],
+  ["8131D430",0x948],
+  ["8131D431",0x949],
+  ["8131D432",0x94A],
+  ["8131D433",0x94B],
+  ["8131D434",0x94C],
+  ["8131D435",0x94D],
+  ["8131D436",0x94E],
+  ["8131D437",0x94F],
+  ["8131D438",0x950],
+  ["8131D439",0x951],
+  ["8131D530",0x952],
+  ["8131D531",0x953],
+  ["8131D532",0x954],
+  ["8131D533",0x955],
+  ["8131D534",0x956],
+  ["8131D535",0x957],
+  ["8131D536",0x958],
+  ["8131D537",0x959],
+  ["8131D538",0x95A],
+  ["8131D539",0x95B],
+  ["8131D630",0x95C],
+  ["8131D631",0x95D],
+  ["8131D632",0x95E],
+  ["8131D633",0x95F],
+  ["8131D634",0x960],
+  ["8131D635",0x961],
+  ["8131D636",0x962],
+  ["8131D637",0x963],
+  ["8131D638",0x964],
+  ["8131D639",0x965],
+  ["8131D730",0x966],
+  ["8131D731",0x967],
+  ["8131D732",0x968],
+  ["8131D733",0x969],
+  ["8131D734",0x96A],
+  ["8131D735",0x96B],
+  ["8131D736",0x96C],
+  ["8131D737",0x96D],
+  ["8131D738",0x96E],
+  ["8131D739",0x96F],
+  ["8131D830",0x970],
+  ["8131D831",0x971],
+  ["8131D832",0x972],
+  ["8131D833",0x973],
+  ["8131D834",0x974],
+  ["8131D835",0x975],
+  ["8131D836",0x976],
+  ["8131D837",0x977],
+  ["8131D838",0x978],
+  ["8131D839",0x979],
+  ["8131D930",0x97A],
+  ["8131D931",0x97B],
+  ["8131D932",0x97C],
+  ["8131D933",0x97D],
+  ["8131D934",0x97E],
+  ["8131D935",0x97F],
+  ["8131D936",0x980],
+  ["8131D937",0x981],
+  ["8131D938",0x982],
+  ["8131D939",0x983],
+  ["8131DA30",0x984],
+  ["8131DA31",0x985],
+  ["8131DA32",0x986],
+  ["8131DA33",0x987],
+  ["8131DA34",0x988],
+  ["8131DA35",0x989],
+  ["8131DA36",0x98A],
+  ["8131DA37",0x98B],
+  ["8131DA38",0x98C],
+  ["8131DA39",0x98D],
+  ["8131DB30",0x98E],
+  ["8131DB31",0x98F],
+  ["8131DB32",0x990],
+  ["8131DB33",0x991],
+  ["8131DB34",0x992],
+  ["8131DB35",0x993],
+  ["8131DB36",0x994],
+  ["8131DB37",0x995],
+  ["8131DB38",0x996],
+  ["8131DB39",0x997],
+  ["8131DC30",0x998],
+  ["8131DC31",0x999],
+  ["8131DC32",0x99A],
+  ["8131DC33",0x99B],
+  ["8131DC34",0x99C],
+  ["8131DC35",0x99D],
+  ["8131DC36",0x99E],
+  ["8131DC37",0x99F],
+  ["8131DC38",0x9A0],
+  ["8131DC39",0x9A1],
+  ["8131DD30",0x9A2],
+  ["8131DD31",0x9A3],
+  ["8131DD32",0x9A4],
+  ["8131DD33",0x9A5],
+  ["8131DD34",0x9A6],
+  ["8131DD35",0x9A7],
+  ["8131DD36",0x9A8],
+  ["8131DD37",0x9A9],
+  ["8131DD38",0x9AA],
+  ["8131DD39",0x9AB],
+  ["8131DE30",0x9AC],
+  ["8131DE31",0x9AD],
+  ["8131DE32",0x9AE],
+  ["8131DE33",0x9AF],
+  ["8131DE34",0x9B0],
+  ["8131DE35",0x9B1],
+  ["8131DE36",0x9B2],
+  ["8131DE37",0x9B3],
+  ["8131DE38",0x9B4],
+  ["8131DE39",0x9B5],
+  ["8131DF30",0x9B6],
+  ["8131DF31",0x9B7],
+  ["8131DF32",0x9B8],
+  ["8131DF33",0x9B9],
+  ["8131DF34",0x9BA],
+  ["8131DF35",0x9BB],
+  ["8131DF36",0x9BC],
+  ["8131DF37",0x9BD],
+  ["8131DF38",0x9BE],
+  ["8131DF39",0x9BF],
+  ["8131E030",0x9C0],
+  ["8131E031",0x9C1],
+  ["8131E032",0x9C2],
+  ["8131E033",0x9C3],
+  ["8131E034",0x9C4],
+  ["8131E035",0x9C5],
+  ["8131E036",0x9C6],
+  ["8131E037",0x9C7],
+  ["8131E038",0x9C8],
+  ["8131E039",0x9C9],
+  ["8131E130",0x9CA],
+  ["8131E131",0x9CB],
+  ["8131E132",0x9CC],
+  ["8131E133",0x9CD],
+  ["8131E134",0x9CE],
+  ["8131E135",0x9CF],
+  ["8131E136",0x9D0],
+  ["8131E137",0x9D1],
+  ["8131E138",0x9D2],
+  ["8131E139",0x9D3],
+  ["8131E230",0x9D4],
+  ["8131E231",0x9D5],
+  ["8131E232",0x9D6],
+  ["8131E233",0x9D7],
+  ["8131E234",0x9D8],
+  ["8131E235",0x9D9],
+  ["8131E236",0x9DA],
+  ["8131E237",0x9DB],
+  ["8131E238",0x9DC],
+  ["8131E239",0x9DD],
+  ["8131E330",0x9DE],
+  ["8131E331",0x9DF],
+  ["8131E332",0x9E0],
+  ["8131E333",0x9E1],
+  ["8131E334",0x9E2],
+  ["8131E335",0x9E3],
+  ["8131E336",0x9E4],
+  ["8131E337",0x9E5],
+  ["8131E338",0x9E6],
+  ["8131E339",0x9E7],
+  ["8131E430",0x9E8],
+  ["8131E431",0x9E9],
+  ["8131E432",0x9EA],
+  ["8131E433",0x9EB],
+  ["8131E434",0x9EC],
+  ["8131E435",0x9ED],
+  ["8131E436",0x9EE],
+  ["8131E437",0x9EF],
+  ["8131E438",0x9F0],
+  ["8131E439",0x9F1],
+  ["8131E530",0x9F2],
+  ["8131E531",0x9F3],
+  ["8131E532",0x9F4],
+  ["8131E533",0x9F5],
+  ["8131E534",0x9F6],
+  ["8131E535",0x9F7],
+  ["8131E536",0x9F8],
+  ["8131E537",0x9F9],
+  ["8131E538",0x9FA],
+  ["8131E539",0x9FB],
+  ["8131E630",0x9FC],
+  ["8131E631",0x9FD],
+  ["8131E632",0x9FE],
+  ["8131E633",0x9FF],
+  ["8131E634",0xA00],
+  ["8131E635",0xA01],
+  ["8131E636",0xA02],
+  ["8131E637",0xA03],
+  ["8131E638",0xA04],
+  ["8131E639",0xA05],
+  ["8131E730",0xA06],
+  ["8131E731",0xA07],
+  ["8131E732",0xA08],
+  ["8131E733",0xA09],
+  ["8131E734",0xA0A],
+  ["8131E735",0xA0B],
+  ["8131E736",0xA0C],
+  ["8131E737",0xA0D],
+  ["8131E738",0xA0E],
+  ["8131E739",0xA0F],
+  ["8131E830",0xA10],
+  ["8131E831",0xA11],
+  ["8131E832",0xA12],
+  ["8131E833",0xA13],
+  ["8131E834",0xA14],
+  ["8131E835",0xA15],
+  ["8131E836",0xA16],
+  ["8131E837",0xA17],
+  ["8131E838",0xA18],
+  ["8131E839",0xA19],
+  ["8131E930",0xA1A],
+  ["8131E931",0xA1B],
+  ["8131E932",0xA1C],
+  ["8131E933",0xA1D],
+  ["8131E934",0xA1E],
+  ["8131E935",0xA1F],
+  ["8131E936",0xA20],
+  ["8131E937",0xA21],
+  ["8131E938",0xA22],
+  ["8131E939",0xA23],
+  ["8131EA30",0xA24],
+  ["8131EA31",0xA25],
+  ["8131EA32",0xA26],
+  ["8131EA33",0xA27],
+  ["8131EA34",0xA28],
+  ["8131EA35",0xA29],
+  ["8131EA36",0xA2A],
+  ["8131EA37",0xA2B],
+  ["8131EA38",0xA2C],
+  ["8131EA39",0xA2D],
+  ["8131EB30",0xA2E],
+  ["8131EB31",0xA2F],
+  ["8131EB32",0xA30],
+  ["8131EB33",0xA31],
+  ["8131EB34",0xA32],
+  ["8131EB35",0xA33],
+  ["8131EB36",0xA34],
+  ["8131EB37",0xA35],
+  ["8131EB38",0xA36],
+  ["8131EB39",0xA37],
+  ["8131EC30",0xA38],
+  ["8131EC31",0xA39],
+  ["8131EC32",0xA3A],
+  ["8131EC33",0xA3B],
+  ["8131EC34",0xA3C],
+  ["8131EC35",0xA3D],
+  ["8131EC36",0xA3E],
+  ["8131EC37",0xA3F],
+  ["8131EC38",0xA40],
+  ["8131EC39",0xA41],
+  ["8131ED30",0xA42],
+  ["8131ED31",0xA43],
+  ["8131ED32",0xA44],
+  ["8131ED33",0xA45],
+  ["8131ED34",0xA46],
+  ["8131ED35",0xA47],
+  ["8131ED36",0xA48],
+  ["8131ED37",0xA49],
+  ["8131ED38",0xA4A],
+  ["8131ED39",0xA4B],
+  ["8131EE30",0xA4C],
+  ["8131EE31",0xA4D],
+  ["8131EE32",0xA4E],
+  ["8131EE33",0xA4F],
+  ["8131EE34",0xA50],
+  ["8131EE35",0xA51],
+  ["8131EE36",0xA52],
+  ["8131EE37",0xA53],
+  ["8131EE38",0xA54],
+  ["8131EE39",0xA55],
+  ["8131EF30",0xA56],
+  ["8131EF31",0xA57],
+  ["8131EF32",0xA58],
+  ["8131EF33",0xA59],
+  ["8131EF34",0xA5A],
+  ["8131EF35",0xA5B],
+  ["8131EF36",0xA5C],
+  ["8131EF37",0xA5D],
+  ["8131EF38",0xA5E],
+  ["8131EF39",0xA5F],
+  ["8131F030",0xA60],
+  ["8131F031",0xA61],
+  ["8131F032",0xA62],
+  ["8131F033",0xA63],
+  ["8131F034",0xA64],
+  ["8131F035",0xA65],
+  ["8131F036",0xA66],
+  ["8131F037",0xA67],
+  ["8131F038",0xA68],
+  ["8131F039",0xA69],
+  ["8131F130",0xA6A],
+  ["8131F131",0xA6B],
+  ["8131F132",0xA6C],
+  ["8131F133",0xA6D],
+  ["8131F134",0xA6E],
+  ["8131F135",0xA6F],
+  ["8131F136",0xA70],
+  ["8131F137",0xA71],
+  ["8131F138",0xA72],
+  ["8131F139",0xA73],
+  ["8131F230",0xA74],
+  ["8131F231",0xA75],
+  ["8131F232",0xA76],
+  ["8131F233",0xA77],
+  ["8131F234",0xA78],
+  ["8131F235",0xA79],
+  ["8131F236",0xA7A],
+  ["8131F237",0xA7B],
+  ["8131F238",0xA7C],
+  ["8131F239",0xA7D],
+  ["8131F330",0xA7E],
+  ["8131F331",0xA7F],
+  ["8131F332",0xA80],
+  ["8131F333",0xA81],
+  ["8131F334",0xA82],
+  ["8131F335",0xA83],
+  ["8131F336",0xA84],
+  ["8131F337",0xA85],
+  ["8131F338",0xA86],
+  ["8131F339",0xA87],
+  ["8131F430",0xA88],
+  ["8131F431",0xA89],
+  ["8131F432",0xA8A],
+  ["8131F433",0xA8B],
+  ["8131F434",0xA8C],
+  ["8131F435",0xA8D],
+  ["8131F436",0xA8E],
+  ["8131F437",0xA8F],
+  ["8131F438",0xA90],
+  ["8131F439",0xA91],
+  ["8131F530",0xA92],
+  ["8131F531",0xA93],
+  ["8131F532",0xA94],
+  ["8131F533",0xA95],
+  ["8131F534",0xA96],
+  ["8131F535",0xA97],
+  ["8131F536",0xA98],
+  ["8131F537",0xA99],
+  ["8131F538",0xA9A],
+  ["8131F539",0xA9B],
+  ["8131F630",0xA9C],
+  ["8131F631",0xA9D],
+  ["8131F632",0xA9E],
+  ["8131F633",0xA9F],
+  ["8131F634",0xAA0],
+  ["8131F635",0xAA1],
+  ["8131F636",0xAA2],
+  ["8131F637",0xAA3],
+  ["8131F638",0xAA4],
+  ["8131F639",0xAA5],
+  ["8131F730",0xAA6],
+  ["8131F731",0xAA7],
+  ["8131F732",0xAA8],
+  ["8131F733",0xAA9],
+  ["8131F734",0xAAA],
+  ["8131F735",0xAAB],
+  ["8131F736",0xAAC],
+  ["8131F737",0xAAD],
+  ["8131F738",0xAAE],
+  ["8131F739",0xAAF],
+  ["8131F830",0xAB0],
+  ["8131F831",0xAB1],
+  ["8131F832",0xAB2],
+  ["8131F833",0xAB3],
+  ["8131F834",0xAB4],
+  ["8131F835",0xAB5],
+  ["8131F836",0xAB6],
+  ["8131F837",0xAB7],
+  ["8131F838",0xAB8],
+  ["8131F839",0xAB9],
+  ["8131F930",0xABA],
+  ["8131F931",0xABB],
+  ["8131F932",0xABC],
+  ["8131F933",0xABD],
+  ["8131F934",0xABE],
+  ["8131F935",0xABF],
+  ["8131F936",0xAC0],
+  ["8131F937",0xAC1],
+  ["8131F938",0xAC2],
+  ["8131F939",0xAC3],
+  ["8131FA30",0xAC4],
+  ["8131FA31",0xAC5],
+  ["8131FA32",0xAC6],
+  ["8131FA33",0xAC7],
+  ["8131FA34",0xAC8],
+  ["8131FA35",0xAC9],
+  ["8131FA36",0xACA],
+  ["8131FA37",0xACB],
+  ["8131FA38",0xACC],
+  ["8131FA39",0xACD],
+  ["8131FB30",0xACE],
+  ["8131FB31",0xACF],
+  ["8131FB32",0xAD0],
+  ["8131FB33",0xAD1],
+  ["8131FB34",0xAD2],
+  ["8131FB35",0xAD3],
+  ["8131FB36",0xAD4],
+  ["8131FB37",0xAD5],
+  ["8131FB38",0xAD6],
+  ["8131FB39",0xAD7],
+  ["8131FC30",0xAD8],
+  ["8131FC31",0xAD9],
+  ["8131FC32",0xADA],
+  ["8131FC33",0xADB],
+  ["8131FC34",0xADC],
+  ["8131FC35",0xADD],
+  ["8131FC36",0xADE],
+  ["8131FC37",0xADF],
+  ["8131FC38",0xAE0],
+  ["8131FC39",0xAE1],
+  ["8131FD30",0xAE2],
+  ["8131FD31",0xAE3],
+  ["8131FD32",0xAE4],
+  ["8131FD33",0xAE5],
+  ["8131FD34",0xAE6],
+  ["8131FD35",0xAE7],
+  ["8131FD36",0xAE8],
+  ["8131FD37",0xAE9],
+  ["8131FD38",0xAEA],
+  ["8131FD39",0xAEB],
+  ["8131FE30",0xAEC],
+  ["8131FE31",0xAED],
+  ["8131FE32",0xAEE],
+  ["8131FE33",0xAEF],
+  ["8131FE34",0xAF0],
+  ["8131FE35",0xAF1],
+  ["8131FE36",0xAF2],
+  ["8131FE37",0xAF3],
+  ["8131FE38",0xAF4],
+  ["8131FE39",0xAF5],
+  ["81328130",0xAF6],
+  ["81328131",0xAF7],
+  ["81328132",0xAF8],
+  ["81328133",0xAF9],
+  ["81328134",0xAFA],
+  ["81328135",0xAFB],
+  ["81328136",0xAFC],
+  ["81328137",0xAFD],
+  ["81328138",0xAFE],
+  ["81328139",0xAFF],
+  ["81328230",0xB00],
+  ["81328231",0xB01],
+  ["81328232",0xB02],
+  ["81328233",0xB03],
+  ["81328234",0xB04],
+  ["81328235",0xB05],
+  ["81328236",0xB06],
+  ["81328237",0xB07],
+  ["81328238",0xB08],
+  ["81328239",0xB09],
+  ["81328330",0xB0A],
+  ["81328331",0xB0B],
+  ["81328332",0xB0C],
+  ["81328333",0xB0D],
+  ["81328334",0xB0E],
+  ["81328335",0xB0F],
+  ["81328336",0xB10],
+  ["81328337",0xB11],
+  ["81328338",0xB12],
+  ["81328339",0xB13],
+  ["81328430",0xB14],
+  ["81328431",0xB15],
+  ["81328432",0xB16],
+  ["81328433",0xB17],
+  ["81328434",0xB18],
+  ["81328435",0xB19],
+  ["81328436",0xB1A],
+  ["81328437",0xB1B],
+  ["81328438",0xB1C],
+  ["81328439",0xB1D],
+  ["81328530",0xB1E],
+  ["81328531",0xB1F],
+  ["81328532",0xB20],
+  ["81328533",0xB21],
+  ["81328534",0xB22],
+  ["81328535",0xB23],
+  ["81328536",0xB24],
+  ["81328537",0xB25],
+  ["81328538",0xB26],
+  ["81328539",0xB27],
+  ["81328630",0xB28],
+  ["81328631",0xB29],
+  ["81328632",0xB2A],
+  ["81328633",0xB2B],
+  ["81328634",0xB2C],
+  ["81328635",0xB2D],
+  ["81328636",0xB2E],
+  ["81328637",0xB2F],
+  ["81328638",0xB30],
+  ["81328639",0xB31],
+  ["81328730",0xB32],
+  ["81328731",0xB33],
+  ["81328732",0xB34],
+  ["81328733",0xB35],
+  ["81328734",0xB36],
+  ["81328735",0xB37],
+  ["81328736",0xB38],
+  ["81328737",0xB39],
+  ["81328738",0xB3A],
+  ["81328739",0xB3B],
+  ["81328830",0xB3C],
+  ["81328831",0xB3D],
+  ["81328832",0xB3E],
+  ["81328833",0xB3F],
+  ["81328834",0xB40],
+  ["81328835",0xB41],
+  ["81328836",0xB42],
+  ["81328837",0xB43],
+  ["81328838",0xB44],
+  ["81328839",0xB45],
+  ["81328930",0xB46],
+  ["81328931",0xB47],
+  ["81328932",0xB48],
+  ["81328933",0xB49],
+  ["81328934",0xB4A],
+  ["81328935",0xB4B],
+  ["81328936",0xB4C],
+  ["81328937",0xB4D],
+  ["81328938",0xB4E],
+  ["81328939",0xB4F],
+  ["81328A30",0xB50],
+  ["81328A31",0xB51],
+  ["81328A32",0xB52],
+  ["81328A33",0xB53],
+  ["81328A34",0xB54],
+  ["81328A35",0xB55],
+  ["81328A36",0xB56],
+  ["81328A37",0xB57],
+  ["81328A38",0xB58],
+  ["81328A39",0xB59],
+  ["81328B30",0xB5A],
+  ["81328B31",0xB5B],
+  ["81328B32",0xB5C],
+  ["81328B33",0xB5D],
+  ["81328B34",0xB5E],
+  ["81328B35",0xB5F],
+  ["81328B36",0xB60],
+  ["81328B37",0xB61],
+  ["81328B38",0xB62],
+  ["81328B39",0xB63],
+  ["81328C30",0xB64],
+  ["81328C31",0xB65],
+  ["81328C32",0xB66],
+  ["81328C33",0xB67],
+  ["81328C34",0xB68],
+  ["81328C35",0xB69],
+  ["81328C36",0xB6A],
+  ["81328C37",0xB6B],
+  ["81328C38",0xB6C],
+  ["81328C39",0xB6D],
+  ["81328D30",0xB6E],
+  ["81328D31",0xB6F],
+  ["81328D32",0xB70],
+  ["81328D33",0xB71],
+  ["81328D34",0xB72],
+  ["81328D35",0xB73],
+  ["81328D36",0xB74],
+  ["81328D37",0xB75],
+  ["81328D38",0xB76],
+  ["81328D39",0xB77],
+  ["81328E30",0xB78],
+  ["81328E31",0xB79],
+  ["81328E32",0xB7A],
+  ["81328E33",0xB7B],
+  ["81328E34",0xB7C],
+  ["81328E35",0xB7D],
+  ["81328E36",0xB7E],
+  ["81328E37",0xB7F],
+  ["81328E38",0xB80],
+  ["81328E39",0xB81],
+  ["81328F30",0xB82],
+  ["81328F31",0xB83],
+  ["81328F32",0xB84],
+  ["81328F33",0xB85],
+  ["81328F34",0xB86],
+  ["81328F35",0xB87],
+  ["81328F36",0xB88],
+  ["81328F37",0xB89],
+  ["81328F38",0xB8A],
+  ["81328F39",0xB8B],
+  ["81329030",0xB8C],
+  ["81329031",0xB8D],
+  ["81329032",0xB8E],
+  ["81329033",0xB8F],
+  ["81329034",0xB90],
+  ["81329035",0xB91],
+  ["81329036",0xB92],
+  ["81329037",0xB93],
+  ["81329038",0xB94],
+  ["81329039",0xB95],
+  ["81329130",0xB96],
+  ["81329131",0xB97],
+  ["81329132",0xB98],
+  ["81329133",0xB99],
+  ["81329134",0xB9A],
+  ["81329135",0xB9B],
+  ["81329136",0xB9C],
+  ["81329137",0xB9D],
+  ["81329138",0xB9E],
+  ["81329139",0xB9F],
+  ["81329230",0xBA0],
+  ["81329231",0xBA1],
+  ["81329232",0xBA2],
+  ["81329233",0xBA3],
+  ["81329234",0xBA4],
+  ["81329235",0xBA5],
+  ["81329236",0xBA6],
+  ["81329237",0xBA7],
+  ["81329238",0xBA8],
+  ["81329239",0xBA9],
+  ["81329330",0xBAA],
+  ["81329331",0xBAB],
+  ["81329332",0xBAC],
+  ["81329333",0xBAD],
+  ["81329334",0xBAE],
+  ["81329335",0xBAF],
+  ["81329336",0xBB0],
+  ["81329337",0xBB1],
+  ["81329338",0xBB2],
+  ["81329339",0xBB3],
+  ["81329430",0xBB4],
+  ["81329431",0xBB5],
+  ["81329432",0xBB6],
+  ["81329433",0xBB7],
+  ["81329434",0xBB8],
+  ["81329435",0xBB9],
+  ["81329436",0xBBA],
+  ["81329437",0xBBB],
+  ["81329438",0xBBC],
+  ["81329439",0xBBD],
+  ["81329530",0xBBE],
+  ["81329531",0xBBF],
+  ["81329532",0xBC0],
+  ["81329533",0xBC1],
+  ["81329534",0xBC2],
+  ["81329535",0xBC3],
+  ["81329536",0xBC4],
+  ["81329537",0xBC5],
+  ["81329538",0xBC6],
+  ["81329539",0xBC7],
+  ["81329630",0xBC8],
+  ["81329631",0xBC9],
+  ["81329632",0xBCA],
+  ["81329633",0xBCB],
+  ["81329634",0xBCC],
+  ["81329635",0xBCD],
+  ["81329636",0xBCE],
+  ["81329637",0xBCF],
+  ["81329638",0xBD0],
+  ["81329639",0xBD1],
+  ["81329730",0xBD2],
+  ["81329731",0xBD3],
+  ["81329732",0xBD4],
+  ["81329733",0xBD5],
+  ["81329734",0xBD6],
+  ["81329735",0xBD7],
+  ["81329736",0xBD8],
+  ["81329737",0xBD9],
+  ["81329738",0xBDA],
+  ["81329739",0xBDB],
+  ["81329830",0xBDC],
+  ["81329831",0xBDD],
+  ["81329832",0xBDE],
+  ["81329833",0xBDF],
+  ["81329834",0xBE0],
+  ["81329835",0xBE1],
+  ["81329836",0xBE2],
+  ["81329837",0xBE3],
+  ["81329838",0xBE4],
+  ["81329839",0xBE5],
+  ["81329930",0xBE6],
+  ["81329931",0xBE7],
+  ["81329932",0xBE8],
+  ["81329933",0xBE9],
+  ["81329934",0xBEA],
+  ["81329935",0xBEB],
+  ["81329936",0xBEC],
+  ["81329937",0xBED],
+  ["81329938",0xBEE],
+  ["81329939",0xBEF],
+  ["81329A30",0xBF0],
+  ["81329A31",0xBF1],
+  ["81329A32",0xBF2],
+  ["81329A33",0xBF3],
+  ["81329A34",0xBF4],
+  ["81329A35",0xBF5],
+  ["81329A36",0xBF6],
+  ["81329A37",0xBF7],
+  ["81329A38",0xBF8],
+  ["81329A39",0xBF9],
+  ["81329B30",0xBFA],
+  ["81329B31",0xBFB],
+  ["81329B32",0xBFC],
+  ["81329B33",0xBFD],
+  ["81329B34",0xBFE],
+  ["81329B35",0xBFF],
+  ["81329B36",0xC00],
+  ["81329B37",0xC01],
+  ["81329B38",0xC02],
+  ["81329B39",0xC03],
+  ["81329C30",0xC04],
+  ["81329C31",0xC05],
+  ["81329C32",0xC06],
+  ["81329C33",0xC07],
+  ["81329C34",0xC08],
+  ["81329C35",0xC09],
+  ["81329C36",0xC0A],
+  ["81329C37",0xC0B],
+  ["81329C38",0xC0C],
+  ["81329C39",0xC0D],
+  ["81329D30",0xC0E],
+  ["81329D31",0xC0F],
+  ["81329D32",0xC10],
+  ["81329D33",0xC11],
+  ["81329D34",0xC12],
+  ["81329D35",0xC13],
+  ["81329D36",0xC14],
+  ["81329D37",0xC15],
+  ["81329D38",0xC16],
+  ["81329D39",0xC17],
+  ["81329E30",0xC18],
+  ["81329E31",0xC19],
+  ["81329E32",0xC1A],
+  ["81329E33",0xC1B],
+  ["81329E34",0xC1C],
+  ["81329E35",0xC1D],
+  ["81329E36",0xC1E],
+  ["81329E37",0xC1F],
+  ["81329E38",0xC20],
+  ["81329E39",0xC21],
+  ["81329F30",0xC22],
+  ["81329F31",0xC23],
+  ["81329F32",0xC24],
+  ["81329F33",0xC25],
+  ["81329F34",0xC26],
+  ["81329F35",0xC27],
+  ["81329F36",0xC28],
+  ["81329F37",0xC29],
+  ["81329F38",0xC2A],
+  ["81329F39",0xC2B],
+  ["8132A030",0xC2C],
+  ["8132A031",0xC2D],
+  ["8132A032",0xC2E],
+  ["8132A033",0xC2F],
+  ["8132A034",0xC30],
+  ["8132A035",0xC31],
+  ["8132A036",0xC32],
+  ["8132A037",0xC33],
+  ["8132A038",0xC34],
+  ["8132A039",0xC35],
+  ["8132A130",0xC36],
+  ["8132A131",0xC37],
+  ["8132A132",0xC38],
+  ["8132A133",0xC39],
+  ["8132A134",0xC3A],
+  ["8132A135",0xC3B],
+  ["8132A136",0xC3C],
+  ["8132A137",0xC3D],
+  ["8132A138",0xC3E],
+  ["8132A139",0xC3F],
+  ["8132A230",0xC40],
+  ["8132A231",0xC41],
+  ["8132A232",0xC42],
+  ["8132A233",0xC43],
+  ["8132A234",0xC44],
+  ["8132A235",0xC45],
+  ["8132A236",0xC46],
+  ["8132A237",0xC47],
+  ["8132A238",0xC48],
+  ["8132A239",0xC49],
+  ["8132A330",0xC4A],
+  ["8132A331",0xC4B],
+  ["8132A332",0xC4C],
+  ["8132A333",0xC4D],
+  ["8132A334",0xC4E],
+  ["8132A335",0xC4F],
+  ["8132A336",0xC50],
+  ["8132A337",0xC51],
+  ["8132A338",0xC52],
+  ["8132A339",0xC53],
+  ["8132A430",0xC54],
+  ["8132A431",0xC55],
+  ["8132A432",0xC56],
+  ["8132A433",0xC57],
+  ["8132A434",0xC58],
+  ["8132A435",0xC59],
+  ["8132A436",0xC5A],
+  ["8132A437",0xC5B],
+  ["8132A438",0xC5C],
+  ["8132A439",0xC5D],
+  ["8132A530",0xC5E],
+  ["8132A531",0xC5F],
+  ["8132A532",0xC60],
+  ["8132A533",0xC61],
+  ["8132A534",0xC62],
+  ["8132A535",0xC63],
+  ["8132A536",0xC64],
+  ["8132A537",0xC65],
+  ["8132A538",0xC66],
+  ["8132A539",0xC67],
+  ["8132A630",0xC68],
+  ["8132A631",0xC69],
+  ["8132A632",0xC6A],
+  ["8132A633",0xC6B],
+  ["8132A634",0xC6C],
+  ["8132A635",0xC6D],
+  ["8132A636",0xC6E],
+  ["8132A637",0xC6F],
+  ["8132A638",0xC70],
+  ["8132A639",0xC71],
+  ["8132A730",0xC72],
+  ["8132A731",0xC73],
+  ["8132A732",0xC74],
+  ["8132A733",0xC75],
+  ["8132A734",0xC76],
+  ["8132A735",0xC77],
+  ["8132A736",0xC78],
+  ["8132A737",0xC79],
+  ["8132A738",0xC7A],
+  ["8132A739",0xC7B],
+  ["8132A830",0xC7C],
+  ["8132A831",0xC7D],
+  ["8132A832",0xC7E],
+  ["8132A833",0xC7F],
+  ["8132A834",0xC80],
+  ["8132A835",0xC81],
+  ["8132A836",0xC82],
+  ["8132A837",0xC83],
+  ["8132A838",0xC84],
+  ["8132A839",0xC85],
+  ["8132A930",0xC86],
+  ["8132A931",0xC87],
+  ["8132A932",0xC88],
+  ["8132A933",0xC89],
+  ["8132A934",0xC8A],
+  ["8132A935",0xC8B],
+  ["8132A936",0xC8C],
+  ["8132A937",0xC8D],
+  ["8132A938",0xC8E],
+  ["8132A939",0xC8F],
+  ["8132AA30",0xC90],
+  ["8132AA31",0xC91],
+  ["8132AA32",0xC92],
+  ["8132AA33",0xC93],
+  ["8132AA34",0xC94],
+  ["8132AA35",0xC95],
+  ["8132AA36",0xC96],
+  ["8132AA37",0xC97],
+  ["8132AA38",0xC98],
+  ["8132AA39",0xC99],
+  ["8132AB30",0xC9A],
+  ["8132AB31",0xC9B],
+  ["8132AB32",0xC9C],
+  ["8132AB33",0xC9D],
+  ["8132AB34",0xC9E],
+  ["8132AB35",0xC9F],
+  ["8132AB36",0xCA0],
+  ["8132AB37",0xCA1],
+  ["8132AB38",0xCA2],
+  ["8132AB39",0xCA3],
+  ["8132AC30",0xCA4],
+  ["8132AC31",0xCA5],
+  ["8132AC32",0xCA6],
+  ["8132AC33",0xCA7],
+  ["8132AC34",0xCA8],
+  ["8132AC35",0xCA9],
+  ["8132AC36",0xCAA],
+  ["8132AC37",0xCAB],
+  ["8132AC38",0xCAC],
+  ["8132AC39",0xCAD],
+  ["8132AD30",0xCAE],
+  ["8132AD31",0xCAF],
+  ["8132AD32",0xCB0],
+  ["8132AD33",0xCB1],
+  ["8132AD34",0xCB2],
+  ["8132AD35",0xCB3],
+  ["8132AD36",0xCB4],
+  ["8132AD37",0xCB5],
+  ["8132AD38",0xCB6],
+  ["8132AD39",0xCB7],
+  ["8132AE30",0xCB8],
+  ["8132AE31",0xCB9],
+  ["8132AE32",0xCBA],
+  ["8132AE33",0xCBB],
+  ["8132AE34",0xCBC],
+  ["8132AE35",0xCBD],
+  ["8132AE36",0xCBE],
+  ["8132AE37",0xCBF],
+  ["8132AE38",0xCC0],
+  ["8132AE39",0xCC1],
+  ["8132AF30",0xCC2],
+  ["8132AF31",0xCC3],
+  ["8132AF32",0xCC4],
+  ["8132AF33",0xCC5],
+  ["8132AF34",0xCC6],
+  ["8132AF35",0xCC7],
+  ["8132AF36",0xCC8],
+  ["8132AF37",0xCC9],
+  ["8132AF38",0xCCA],
+  ["8132AF39",0xCCB],
+  ["8132B030",0xCCC],
+  ["8132B031",0xCCD],
+  ["8132B032",0xCCE],
+  ["8132B033",0xCCF],
+  ["8132B034",0xCD0],
+  ["8132B035",0xCD1],
+  ["8132B036",0xCD2],
+  ["8132B037",0xCD3],
+  ["8132B038",0xCD4],
+  ["8132B039",0xCD5],
+  ["8132B130",0xCD6],
+  ["8132B131",0xCD7],
+  ["8132B132",0xCD8],
+  ["8132B133",0xCD9],
+  ["8132B134",0xCDA],
+  ["8132B135",0xCDB],
+  ["8132B136",0xCDC],
+  ["8132B137",0xCDD],
+  ["8132B138",0xCDE],
+  ["8132B139",0xCDF],
+  ["8132B230",0xCE0],
+  ["8132B231",0xCE1],
+  ["8132B232",0xCE2],
+  ["8132B233",0xCE3],
+  ["8132B234",0xCE4],
+  ["8132B235",0xCE5],
+  ["8132B236",0xCE6],
+  ["8132B237",0xCE7],
+  ["8132B238",0xCE8],
+  ["8132B239",0xCE9],
+  ["8132B330",0xCEA],
+  ["8132B331",0xCEB],
+  ["8132B332",0xCEC],
+  ["8132B333",0xCED],
+  ["8132B334",0xCEE],
+  ["8132B335",0xCEF],
+  ["8132B336",0xCF0],
+  ["8132B337",0xCF1],
+  ["8132B338",0xCF2],
+  ["8132B339",0xCF3],
+  ["8132B430",0xCF4],
+  ["8132B431",0xCF5],
+  ["8132B432",0xCF6],
+  ["8132B433",0xCF7],
+  ["8132B434",0xCF8],
+  ["8132B435",0xCF9],
+  ["8132B436",0xCFA],
+  ["8132B437",0xCFB],
+  ["8132B438",0xCFC],
+  ["8132B439",0xCFD],
+  ["8132B530",0xCFE],
+  ["8132B531",0xCFF],
+  ["8132B532",0xD00],
+  ["8132B533",0xD01],
+  ["8132B534",0xD02],
+  ["8132B535",0xD03],
+  ["8132B536",0xD04],
+  ["8132B537",0xD05],
+  ["8132B538",0xD06],
+  ["8132B539",0xD07],
+  ["8132B630",0xD08],
+  ["8132B631",0xD09],
+  ["8132B632",0xD0A],
+  ["8132B633",0xD0B],
+  ["8132B634",0xD0C],
+  ["8132B635",0xD0D],
+  ["8132B636",0xD0E],
+  ["8132B637",0xD0F],
+  ["8132B638",0xD10],
+  ["8132B639",0xD11],
+  ["8132B730",0xD12],
+  ["8132B731",0xD13],
+  ["8132B732",0xD14],
+  ["8132B733",0xD15],
+  ["8132B734",0xD16],
+  ["8132B735",0xD17],
+  ["8132B736",0xD18],
+  ["8132B737",0xD19],
+  ["8132B738",0xD1A],
+  ["8132B739",0xD1B],
+  ["8132B830",0xD1C],
+  ["8132B831",0xD1D],
+  ["8132B832",0xD1E],
+  ["8132B833",0xD1F],
+  ["8132B834",0xD20],
+  ["8132B835",0xD21],
+  ["8132B836",0xD22],
+  ["8132B837",0xD23],
+  ["8132B838",0xD24],
+  ["8132B839",0xD25],
+  ["8132B930",0xD26],
+  ["8132B931",0xD27],
+  ["8132B932",0xD28],
+  ["8132B933",0xD29],
+  ["8132B934",0xD2A],
+  ["8132B935",0xD2B],
+  ["8132B936",0xD2C],
+  ["8132B937",0xD2D],
+  ["8132B938",0xD2E],
+  ["8132B939",0xD2F],
+  ["8132BA30",0xD30],
+  ["8132BA31",0xD31],
+  ["8132BA32",0xD32],
+  ["8132BA33",0xD33],
+  ["8132BA34",0xD34],
+  ["8132BA35",0xD35],
+  ["8132BA36",0xD36],
+  ["8132BA37",0xD37],
+  ["8132BA38",0xD38],
+  ["8132BA39",0xD39],
+  ["8132BB30",0xD3A],
+  ["8132BB31",0xD3B],
+  ["8132BB32",0xD3C],
+  ["8132BB33",0xD3D],
+  ["8132BB34",0xD3E],
+  ["8132BB35",0xD3F],
+  ["8132BB36",0xD40],
+  ["8132BB37",0xD41],
+  ["8132BB38",0xD42],
+  ["8132BB39",0xD43],
+  ["8132BC30",0xD44],
+  ["8132BC31",0xD45],
+  ["8132BC32",0xD46],
+  ["8132BC33",0xD47],
+  ["8132BC34",0xD48],
+  ["8132BC35",0xD49],
+  ["8132BC36",0xD4A],
+  ["8132BC37",0xD4B],
+  ["8132BC38",0xD4C],
+  ["8132BC39",0xD4D],
+  ["8132BD30",0xD4E],
+  ["8132BD31",0xD4F],
+  ["8132BD32",0xD50],
+  ["8132BD33",0xD51],
+  ["8132BD34",0xD52],
+  ["8132BD35",0xD53],
+  ["8132BD36",0xD54],
+  ["8132BD37",0xD55],
+  ["8132BD38",0xD56],
+  ["8132BD39",0xD57],
+  ["8132BE30",0xD58],
+  ["8132BE31",0xD59],
+  ["8132BE32",0xD5A],
+  ["8132BE33",0xD5B],
+  ["8132BE34",0xD5C],
+  ["8132BE35",0xD5D],
+  ["8132BE36",0xD5E],
+  ["8132BE37",0xD5F],
+  ["8132BE38",0xD60],
+  ["8132BE39",0xD61],
+  ["8132BF30",0xD62],
+  ["8132BF31",0xD63],
+  ["8132BF32",0xD64],
+  ["8132BF33",0xD65],
+  ["8132BF34",0xD66],
+  ["8132BF35",0xD67],
+  ["8132BF36",0xD68],
+  ["8132BF37",0xD69],
+  ["8132BF38",0xD6A],
+  ["8132BF39",0xD6B],
+  ["8132C030",0xD6C],
+  ["8132C031",0xD6D],
+  ["8132C032",0xD6E],
+  ["8132C033",0xD6F],
+  ["8132C034",0xD70],
+  ["8132C035",0xD71],
+  ["8132C036",0xD72],
+  ["8132C037",0xD73],
+  ["8132C038",0xD74],
+  ["8132C039",0xD75],
+  ["8132C130",0xD76],
+  ["8132C131",0xD77],
+  ["8132C132",0xD78],
+  ["8132C133",0xD79],
+  ["8132C134",0xD7A],
+  ["8132C135",0xD7B],
+  ["8132C136",0xD7C],
+  ["8132C137",0xD7D],
+  ["8132C138",0xD7E],
+  ["8132C139",0xD7F],
+  ["8132C230",0xD80],
+  ["8132C231",0xD81],
+  ["8132C232",0xD82],
+  ["8132C233",0xD83],
+  ["8132C234",0xD84],
+  ["8132C235",0xD85],
+  ["8132C236",0xD86],
+  ["8132C237",0xD87],
+  ["8132C238",0xD88],
+  ["8132C239",0xD89],
+  ["8132C330",0xD8A],
+  ["8132C331",0xD8B],
+  ["8132C332",0xD8C],
+  ["8132C333",0xD8D],
+  ["8132C334",0xD8E],
+  ["8132C335",0xD8F],
+  ["8132C336",0xD90],
+  ["8132C337",0xD91],
+  ["8132C338",0xD92],
+  ["8132C339",0xD93],
+  ["8132C430",0xD94],
+  ["8132C431",0xD95],
+  ["8132C432",0xD96],
+  ["8132C433",0xD97],
+  ["8132C434",0xD98],
+  ["8132C435",0xD99],
+  ["8132C436",0xD9A],
+  ["8132C437",0xD9B],
+  ["8132C438",0xD9C],
+  ["8132C439",0xD9D],
+  ["8132C530",0xD9E],
+  ["8132C531",0xD9F],
+  ["8132C532",0xDA0],
+  ["8132C533",0xDA1],
+  ["8132C534",0xDA2],
+  ["8132C535",0xDA3],
+  ["8132C536",0xDA4],
+  ["8132C537",0xDA5],
+  ["8132C538",0xDA6],
+  ["8132C539",0xDA7],
+  ["8132C630",0xDA8],
+  ["8132C631",0xDA9],
+  ["8132C632",0xDAA],
+  ["8132C633",0xDAB],
+  ["8132C634",0xDAC],
+  ["8132C635",0xDAD],
+  ["8132C636",0xDAE],
+  ["8132C637",0xDAF],
+  ["8132C638",0xDB0],
+  ["8132C639",0xDB1],
+  ["8132C730",0xDB2],
+  ["8132C731",0xDB3],
+  ["8132C732",0xDB4],
+  ["8132C733",0xDB5],
+  ["8132C734",0xDB6],
+  ["8132C735",0xDB7],
+  ["8132C736",0xDB8],
+  ["8132C737",0xDB9],
+  ["8132C738",0xDBA],
+  ["8132C739",0xDBB],
+  ["8132C830",0xDBC],
+  ["8132C831",0xDBD],
+  ["8132C832",0xDBE],
+  ["8132C833",0xDBF],
+  ["8132C834",0xDC0],
+  ["8132C835",0xDC1],
+  ["8132C836",0xDC2],
+  ["8132C837",0xDC3],
+  ["8132C838",0xDC4],
+  ["8132C839",0xDC5],
+  ["8132C930",0xDC6],
+  ["8132C931",0xDC7],
+  ["8132C932",0xDC8],
+  ["8132C933",0xDC9],
+  ["8132C934",0xDCA],
+  ["8132C935",0xDCB],
+  ["8132C936",0xDCC],
+  ["8132C937",0xDCD],
+  ["8132C938",0xDCE],
+  ["8132C939",0xDCF],
+  ["8132CA30",0xDD0],
+  ["8132CA31",0xDD1],
+  ["8132CA32",0xDD2],
+  ["8132CA33",0xDD3],
+  ["8132CA34",0xDD4],
+  ["8132CA35",0xDD5],
+  ["8132CA36",0xDD6],
+  ["8132CA37",0xDD7],
+  ["8132CA38",0xDD8],
+  ["8132CA39",0xDD9],
+  ["8132CB30",0xDDA],
+  ["8132CB31",0xDDB],
+  ["8132CB32",0xDDC],
+  ["8132CB33",0xDDD],
+  ["8132CB34",0xDDE],
+  ["8132CB35",0xDDF],
+  ["8132CB36",0xDE0],
+  ["8132CB37",0xDE1],
+  ["8132CB38",0xDE2],
+  ["8132CB39",0xDE3],
+  ["8132CC30",0xDE4],
+  ["8132CC31",0xDE5],
+  ["8132CC32",0xDE6],
+  ["8132CC33",0xDE7],
+  ["8132CC34",0xDE8],
+  ["8132CC35",0xDE9],
+  ["8132CC36",0xDEA],
+  ["8132CC37",0xDEB],
+  ["8132CC38",0xDEC],
+  ["8132CC39",0xDED],
+  ["8132CD30",0xDEE],
+  ["8132CD31",0xDEF],
+  ["8132CD32",0xDF0],
+  ["8132CD33",0xDF1],
+  ["8132CD34",0xDF2],
+  ["8132CD35",0xDF3],
+  ["8132CD36",0xDF4],
+  ["8132CD37",0xDF5],
+  ["8132CD38",0xDF6],
+  ["8132CD39",0xDF7],
+  ["8132CE30",0xDF8],
+  ["8132CE31",0xDF9],
+  ["8132CE32",0xDFA],
+  ["8132CE33",0xDFB],
+  ["8132CE34",0xDFC],
+  ["8132CE35",0xDFD],
+  ["8132CE36",0xDFE],
+  ["8132CE37",0xDFF],
+  ["8132CE38",0xE00],
+  ["8132CE39",0xE01],
+  ["8132CF30",0xE02],
+  ["8132CF31",0xE03],
+  ["8132CF32",0xE04],
+  ["8132CF33",0xE05],
+  ["8132CF34",0xE06],
+  ["8132CF35",0xE07],
+  ["8132CF36",0xE08],
+  ["8132CF37",0xE09],
+  ["8132CF38",0xE0A],
+  ["8132CF39",0xE0B],
+  ["8132D030",0xE0C],
+  ["8132D031",0xE0D],
+  ["8132D032",0xE0E],
+  ["8132D033",0xE0F],
+  ["8132D034",0xE10],
+  ["8132D035",0xE11],
+  ["8132D036",0xE12],
+  ["8132D037",0xE13],
+  ["8132D038",0xE14],
+  ["8132D039",0xE15],
+  ["8132D130",0xE16],
+  ["8132D131",0xE17],
+  ["8132D132",0xE18],
+  ["8132D133",0xE19],
+  ["8132D134",0xE1A],
+  ["8132D135",0xE1B],
+  ["8132D136",0xE1C],
+  ["8132D137",0xE1D],
+  ["8132D138",0xE1E],
+  ["8132D139",0xE1F],
+  ["8132D230",0xE20],
+  ["8132D231",0xE21],
+  ["8132D232",0xE22],
+  ["8132D233",0xE23],
+  ["8132D234",0xE24],
+  ["8132D235",0xE25],
+  ["8132D236",0xE26],
+  ["8132D237",0xE27],
+  ["8132D238",0xE28],
+  ["8132D239",0xE29],
+  ["8132D330",0xE2A],
+  ["8132D331",0xE2B],
+  ["8132D332",0xE2C],
+  ["8132D333",0xE2D],
+  ["8132D334",0xE2E],
+  ["8132D335",0xE2F],
+  ["8132D336",0xE30],
+  ["8132D337",0xE31],
+  ["8132D338",0xE32],
+  ["8132D339",0xE33],
+  ["8132D430",0xE34],
+  ["8132D431",0xE35],
+  ["8132D432",0xE36],
+  ["8132D433",0xE37],
+  ["8132D434",0xE38],
+  ["8132D435",0xE39],
+  ["8132D436",0xE3A],
+  ["8132D437",0xE3B],
+  ["8132D438",0xE3C],
+  ["8132D439",0xE3D],
+  ["8132D530",0xE3E],
+  ["8132D531",0xE3F],
+  ["8132D532",0xE40],
+  ["8132D533",0xE41],
+  ["8132D534",0xE42],
+  ["8132D535",0xE43],
+  ["8132D536",0xE44],
+  ["8132D537",0xE45],
+  ["8132D538",0xE46],
+  ["8132D539",0xE47],
+  ["8132D630",0xE48],
+  ["8132D631",0xE49],
+  ["8132D632",0xE4A],
+  ["8132D633",0xE4B],
+  ["8132D634",0xE4C],
+  ["8132D635",0xE4D],
+  ["8132D636",0xE4E],
+  ["8132D637",0xE4F],
+  ["8132D638",0xE50],
+  ["8132D639",0xE51],
+  ["8132D730",0xE52],
+  ["8132D731",0xE53],
+  ["8132D732",0xE54],
+  ["8132D733",0xE55],
+  ["8132D734",0xE56],
+  ["8132D735",0xE57],
+  ["8132D736",0xE58],
+  ["8132D737",0xE59],
+  ["8132D738",0xE5A],
+  ["8132D739",0xE5B],
+  ["8132D830",0xE5C],
+  ["8132D831",0xE5D],
+  ["8132D832",0xE5E],
+  ["8132D833",0xE5F],
+  ["8132D834",0xE60],
+  ["8132D835",0xE61],
+  ["8132D836",0xE62],
+  ["8132D837",0xE63],
+  ["8132D838",0xE64],
+  ["8132D839",0xE65],
+  ["8132D930",0xE66],
+  ["8132D931",0xE67],
+  ["8132D932",0xE68],
+  ["8132D933",0xE69],
+  ["8132D934",0xE6A],
+  ["8132D935",0xE6B],
+  ["8132D936",0xE6C],
+  ["8132D937",0xE6D],
+  ["8132D938",0xE6E],
+  ["8132D939",0xE6F],
+  ["8132DA30",0xE70],
+  ["8132DA31",0xE71],
+  ["8132DA32",0xE72],
+  ["8132DA33",0xE73],
+  ["8132DA34",0xE74],
+  ["8132DA35",0xE75],
+  ["8132DA36",0xE76],
+  ["8132DA37",0xE77],
+  ["8132DA38",0xE78],
+  ["8132DA39",0xE79],
+  ["8132DB30",0xE7A],
+  ["8132DB31",0xE7B],
+  ["8132DB32",0xE7C],
+  ["8132DB33",0xE7D],
+  ["8132DB34",0xE7E],
+  ["8132DB35",0xE7F],
+  ["8132DB36",0xE80],
+  ["8132DB37",0xE81],
+  ["8132DB38",0xE82],
+  ["8132DB39",0xE83],
+  ["8132DC30",0xE84],
+  ["8132DC31",0xE85],
+  ["8132DC32",0xE86],
+  ["8132DC33",0xE87],
+  ["8132DC34",0xE88],
+  ["8132DC35",0xE89],
+  ["8132DC36",0xE8A],
+  ["8132DC37",0xE8B],
+  ["8132DC38",0xE8C],
+  ["8132DC39",0xE8D],
+  ["8132DD30",0xE8E],
+  ["8132DD31",0xE8F],
+  ["8132DD32",0xE90],
+  ["8132DD33",0xE91],
+  ["8132DD34",0xE92],
+  ["8132DD35",0xE93],
+  ["8132DD36",0xE94],
+  ["8132DD37",0xE95],
+  ["8132DD38",0xE96],
+  ["8132DD39",0xE97],
+  ["8132DE30",0xE98],
+  ["8132DE31",0xE99],
+  ["8132DE32",0xE9A],
+  ["8132DE33",0xE9B],
+  ["8132DE34",0xE9C],
+  ["8132DE35",0xE9D],
+  ["8132DE36",0xE9E],
+  ["8132DE37",0xE9F],
+  ["8132DE38",0xEA0],
+  ["8132DE39",0xEA1],
+  ["8132DF30",0xEA2],
+  ["8132DF31",0xEA3],
+  ["8132DF32",0xEA4],
+  ["8132DF33",0xEA5],
+  ["8132DF34",0xEA6],
+  ["8132DF35",0xEA7],
+  ["8132DF36",0xEA8],
+  ["8132DF37",0xEA9],
+  ["8132DF38",0xEAA],
+  ["8132DF39",0xEAB],
+  ["8132E030",0xEAC],
+  ["8132E031",0xEAD],
+  ["8132E032",0xEAE],
+  ["8132E033",0xEAF],
+  ["8132E034",0xEB0],
+  ["8132E035",0xEB1],
+  ["8132E036",0xEB2],
+  ["8132E037",0xEB3],
+  ["8132E038",0xEB4],
+  ["8132E039",0xEB5],
+  ["8132E130",0xEB6],
+  ["8132E131",0xEB7],
+  ["8132E132",0xEB8],
+  ["8132E133",0xEB9],
+  ["8132E134",0xEBA],
+  ["8132E135",0xEBB],
+  ["8132E136",0xEBC],
+  ["8132E137",0xEBD],
+  ["8132E138",0xEBE],
+  ["8132E139",0xEBF],
+  ["8132E230",0xEC0],
+  ["8132E231",0xEC1],
+  ["8132E232",0xEC2],
+  ["8132E233",0xEC3],
+  ["8132E234",0xEC4],
+  ["8132E235",0xEC5],
+  ["8132E236",0xEC6],
+  ["8132E237",0xEC7],
+  ["8132E238",0xEC8],
+  ["8132E239",0xEC9],
+  ["8132E330",0xECA],
+  ["8132E331",0xECB],
+  ["8132E332",0xECC],
+  ["8132E333",0xECD],
+  ["8132E334",0xECE],
+  ["8132E335",0xECF],
+  ["8132E336",0xED0],
+  ["8132E337",0xED1],
+  ["8132E338",0xED2],
+  ["8132E339",0xED3],
+  ["8132E430",0xED4],
+  ["8132E431",0xED5],
+  ["8132E432",0xED6],
+  ["8132E433",0xED7],
+  ["8132E434",0xED8],
+  ["8132E435",0xED9],
+  ["8132E436",0xEDA],
+  ["8132E437",0xEDB],
+  ["8132E438",0xEDC],
+  ["8132E439",0xEDD],
+  ["8132E530",0xEDE],
+  ["8132E531",0xEDF],
+  ["8132E532",0xEE0],
+  ["8132E533",0xEE1],
+  ["8132E534",0xEE2],
+  ["8132E535",0xEE3],
+  ["8132E536",0xEE4],
+  ["8132E537",0xEE5],
+  ["8132E538",0xEE6],
+  ["8132E539",0xEE7],
+  ["8132E630",0xEE8],
+  ["8132E631",0xEE9],
+  ["8132E632",0xEEA],
+  ["8132E633",0xEEB],
+  ["8132E634",0xEEC],
+  ["8132E635",0xEED],
+  ["8132E636",0xEEE],
+  ["8132E637",0xEEF],
+  ["8132E638",0xEF0],
+  ["8132E639",0xEF1],
+  ["8132E730",0xEF2],
+  ["8132E731",0xEF3],
+  ["8132E732",0xEF4],
+  ["8132E733",0xEF5],
+  ["8132E734",0xEF6],
+  ["8132E735",0xEF7],
+  ["8132E736",0xEF8],
+  ["8132E737",0xEF9],
+  ["8132E738",0xEFA],
+  ["8132E739",0xEFB],
+  ["8132E830",0xEFC],
+  ["8132E831",0xEFD],
+  ["8132E832",0xEFE],
+  ["8132E833",0xEFF],
+  ["8132E834",0xF00],
+  ["8132E835",0xF01],
+  ["8132E836",0xF02],
+  ["8132E837",0xF03],
+  ["8132E838",0xF04],
+  ["8132E839",0xF05],
+  ["8132E930",0xF06],
+  ["8132E931",0xF07],
+  ["8132E932",0xF08],
+  ["8132E933",0xF09],
+  ["8132E934",0xF0A],
+  ["8132E935",0xF0B],
+  ["8132E936",0xF0C],
+  ["8132E937",0xF0D],
+  ["8132E938",0xF0E],
+  ["8132E939",0xF0F],
+  ["8132EA30",0xF10],
+  ["8132EA31",0xF11],
+  ["8132EA32",0xF12],
+  ["8132EA33",0xF13],
+  ["8132EA34",0xF14],
+  ["8132EA35",0xF15],
+  ["8132EA36",0xF16],
+  ["8132EA37",0xF17],
+  ["8132EA38",0xF18],
+  ["8132EA39",0xF19],
+  ["8132EB30",0xF1A],
+  ["8132EB31",0xF1B],
+  ["8132EB32",0xF1C],
+  ["8132EB33",0xF1D],
+  ["8132EB34",0xF1E],
+  ["8132EB35",0xF1F],
+  ["8132EB36",0xF20],
+  ["8132EB37",0xF21],
+  ["8132EB38",0xF22],
+  ["8132EB39",0xF23],
+  ["8132EC30",0xF24],
+  ["8132EC31",0xF25],
+  ["8132EC32",0xF26],
+  ["8132EC33",0xF27],
+  ["8132EC34",0xF28],
+  ["8132EC35",0xF29],
+  ["8132EC36",0xF2A],
+  ["8132EC37",0xF2B],
+  ["8132EC38",0xF2C],
+  ["8132EC39",0xF2D],
+  ["8132ED30",0xF2E],
+  ["8132ED31",0xF2F],
+  ["8132ED32",0xF30],
+  ["8132ED33",0xF31],
+  ["8132ED34",0xF32],
+  ["8132ED35",0xF33],
+  ["8132ED36",0xF34],
+  ["8132ED37",0xF35],
+  ["8132ED38",0xF36],
+  ["8132ED39",0xF37],
+  ["8132EE30",0xF38],
+  ["8132EE31",0xF39],
+  ["8132EE32",0xF3A],
+  ["8132EE33",0xF3B],
+  ["8132EE34",0xF3C],
+  ["8132EE35",0xF3D],
+  ["8132EE36",0xF3E],
+  ["8132EE37",0xF3F],
+  ["8132EE38",0xF40],
+  ["8132EE39",0xF41],
+  ["8132EF30",0xF42],
+  ["8132EF31",0xF43],
+  ["8132EF32",0xF44],
+  ["8132EF33",0xF45],
+  ["8132EF34",0xF46],
+  ["8132EF35",0xF47],
+  ["8132EF36",0xF48],
+  ["8132EF37",0xF49],
+  ["8132EF38",0xF4A],
+  ["8132EF39",0xF4B],
+  ["8132F030",0xF4C],
+  ["8132F031",0xF4D],
+  ["8132F032",0xF4E],
+  ["8132F033",0xF4F],
+  ["8132F034",0xF50],
+  ["8132F035",0xF51],
+  ["8132F036",0xF52],
+  ["8132F037",0xF53],
+  ["8132F038",0xF54],
+  ["8132F039",0xF55],
+  ["8132F130",0xF56],
+  ["8132F131",0xF57],
+  ["8132F132",0xF58],
+  ["8132F133",0xF59],
+  ["8132F134",0xF5A],
+  ["8132F135",0xF5B],
+  ["8132F136",0xF5C],
+  ["8132F137",0xF5D],
+  ["8132F138",0xF5E],
+  ["8132F139",0xF5F],
+  ["8132F230",0xF60],
+  ["8132F231",0xF61],
+  ["8132F232",0xF62],
+  ["8132F233",0xF63],
+  ["8132F234",0xF64],
+  ["8132F235",0xF65],
+  ["8132F236",0xF66],
+  ["8132F237",0xF67],
+  ["8132F238",0xF68],
+  ["8132F239",0xF69],
+  ["8132F330",0xF6A],
+  ["8132F331",0xF6B],
+  ["8132F332",0xF6C],
+  ["8132F333",0xF6D],
+  ["8132F334",0xF6E],
+  ["8132F335",0xF6F],
+  ["8132F336",0xF70],
+  ["8132F337",0xF71],
+  ["8132F338",0xF72],
+  ["8132F339",0xF73],
+  ["8132F430",0xF74],
+  ["8132F431",0xF75],
+  ["8132F432",0xF76],
+  ["8132F433",0xF77],
+  ["8132F434",0xF78],
+  ["8132F435",0xF79],
+  ["8132F436",0xF7A],
+  ["8132F437",0xF7B],
+  ["8132F438",0xF7C],
+  ["8132F439",0xF7D],
+  ["8132F530",0xF7E],
+  ["8132F531",0xF7F],
+  ["8132F532",0xF80],
+  ["8132F533",0xF81],
+  ["8132F534",0xF82],
+  ["8132F535",0xF83],
+  ["8132F536",0xF84],
+  ["8132F537",0xF85],
+  ["8132F538",0xF86],
+  ["8132F539",0xF87],
+  ["8132F630",0xF88],
+  ["8132F631",0xF89],
+  ["8132F632",0xF8A],
+  ["8132F633",0xF8B],
+  ["8132F634",0xF8C],
+  ["8132F635",0xF8D],
+  ["8132F636",0xF8E],
+  ["8132F637",0xF8F],
+  ["8132F638",0xF90],
+  ["8132F639",0xF91],
+  ["8132F730",0xF92],
+  ["8132F731",0xF93],
+  ["8132F732",0xF94],
+  ["8132F733",0xF95],
+  ["8132F734",0xF96],
+  ["8132F735",0xF97],
+  ["8132F736",0xF98],
+  ["8132F737",0xF99],
+  ["8132F738",0xF9A],
+  ["8132F739",0xF9B],
+  ["8132F830",0xF9C],
+  ["8132F831",0xF9D],
+  ["8132F832",0xF9E],
+  ["8132F833",0xF9F],
+  ["8132F834",0xFA0],
+  ["8132F835",0xFA1],
+  ["8132F836",0xFA2],
+  ["8132F837",0xFA3],
+  ["8132F838",0xFA4],
+  ["8132F839",0xFA5],
+  ["8132F930",0xFA6],
+  ["8132F931",0xFA7],
+  ["8132F932",0xFA8],
+  ["8132F933",0xFA9],
+  ["8132F934",0xFAA],
+  ["8132F935",0xFAB],
+  ["8132F936",0xFAC],
+  ["8132F937",0xFAD],
+  ["8132F938",0xFAE],
+  ["8132F939",0xFAF],
+  ["8132FA30",0xFB0],
+  ["8132FA31",0xFB1],
+  ["8132FA32",0xFB2],
+  ["8132FA33",0xFB3],
+  ["8132FA34",0xFB4],
+  ["8132FA35",0xFB5],
+  ["8132FA36",0xFB6],
+  ["8132FA37",0xFB7],
+  ["8132FA38",0xFB8],
+  ["8132FA39",0xFB9],
+  ["8132FB30",0xFBA],
+  ["8132FB31",0xFBB],
+  ["8132FB32",0xFBC],
+  ["8132FB33",0xFBD],
+  ["8132FB34",0xFBE],
+  ["8132FB35",0xFBF],
+  ["8132FB36",0xFC0],
+  ["8132FB37",0xFC1],
+  ["8132FB38",0xFC2],
+  ["8132FB39",0xFC3],
+  ["8132FC30",0xFC4],
+  ["8132FC31",0xFC5],
+  ["8132FC32",0xFC6],
+  ["8132FC33",0xFC7],
+  ["8132FC34",0xFC8],
+  ["8132FC35",0xFC9],
+  ["8132FC36",0xFCA],
+  ["8132FC37",0xFCB],
+  ["8132FC38",0xFCC],
+  ["8132FC39",0xFCD],
+  ["8132FD30",0xFCE],
+  ["8132FD31",0xFCF],
+  ["8132FD32",0xFD0],
+  ["8132FD33",0xFD1],
+  ["8132FD34",0xFD2],
+  ["8132FD35",0xFD3],
+  ["8132FD36",0xFD4],
+  ["8132FD37",0xFD5],
+  ["8132FD38",0xFD6],
+  ["8132FD39",0xFD7],
+  ["8132FE30",0xFD8],
+  ["8132FE31",0xFD9],
+  ["8132FE32",0xFDA],
+  ["8132FE33",0xFDB],
+  ["8132FE34",0xFDC],
+  ["8132FE35",0xFDD],
+  ["8132FE36",0xFDE],
+  ["8132FE37",0xFDF],
+  ["8132FE38",0xFE0],
+  ["8132FE39",0xFE1],
+  ["81338130",0xFE2],
+  ["81338131",0xFE3],
+  ["81338132",0xFE4],
+  ["81338133",0xFE5],
+  ["81338134",0xFE6],
+  ["81338135",0xFE7],
+  ["81338136",0xFE8],
+  ["81338137",0xFE9],
+  ["81338138",0xFEA],
+  ["81338139",0xFEB],
+  ["81338230",0xFEC],
+  ["81338231",0xFED],
+  ["81338232",0xFEE],
+  ["81338233",0xFEF],
+  ["81338234",0xFF0],
+  ["81338235",0xFF1],
+  ["81338236",0xFF2],
+  ["81338237",0xFF3],
+  ["81338238",0xFF4],
+  ["81338239",0xFF5],
+  ["81338330",0xFF6],
+  ["81338331",0xFF7],
+  ["81338332",0xFF8],
+  ["81338333",0xFF9],
+  ["81338334",0xFFA],
+  ["81338335",0xFFB],
+  ["81338336",0xFFC],
+  ["81338337",0xFFD],
+  ["81338338",0xFFE],
+  ["81338339",0xFFF],
+  ["81338430",0x1000],
+  ["81338431",0x1001],
+  ["81338432",0x1002],
+  ["81338433",0x1003],
+  ["81338434",0x1004],
+  ["81338435",0x1005],
+  ["81338436",0x1006],
+  ["81338437",0x1007],
+  ["81338438",0x1008],
+  ["81338439",0x1009],
+  ["81338530",0x100A],
+  ["81338531",0x100B],
+  ["81338532",0x100C],
+  ["81338533",0x100D],
+  ["81338534",0x100E],
+  ["81338535",0x100F],
+  ["81338536",0x1010],
+  ["81338537",0x1011],
+  ["81338538",0x1012],
+  ["81338539",0x1013],
+  ["81338630",0x1014],
+  ["81338631",0x1015],
+  ["81338632",0x1016],
+  ["81338633",0x1017],
+  ["81338634",0x1018],
+  ["81338635",0x1019],
+  ["81338636",0x101A],
+  ["81338637",0x101B],
+  ["81338638",0x101C],
+  ["81338639",0x101D],
+  ["81338730",0x101E],
+  ["81338731",0x101F],
+  ["81338732",0x1020],
+  ["81338733",0x1021],
+  ["81338734",0x1022],
+  ["81338735",0x1023],
+  ["81338736",0x1024],
+  ["81338737",0x1025],
+  ["81338738",0x1026],
+  ["81338739",0x1027],
+  ["81338830",0x1028],
+  ["81338831",0x1029],
+  ["81338832",0x102A],
+  ["81338833",0x102B],
+  ["81338834",0x102C],
+  ["81338835",0x102D],
+  ["81338836",0x102E],
+  ["81338837",0x102F],
+  ["81338838",0x1030],
+  ["81338839",0x1031],
+  ["81338930",0x1032],
+  ["81338931",0x1033],
+  ["81338932",0x1034],
+  ["81338933",0x1035],
+  ["81338934",0x1036],
+  ["81338935",0x1037],
+  ["81338936",0x1038],
+  ["81338937",0x1039],
+  ["81338938",0x103A],
+  ["81338939",0x103B],
+  ["81338A30",0x103C],
+  ["81338A31",0x103D],
+  ["81338A32",0x103E],
+  ["81338A33",0x103F],
+  ["81338A34",0x1040],
+  ["81338A35",0x1041],
+  ["81338A36",0x1042],
+  ["81338A37",0x1043],
+  ["81338A38",0x1044],
+  ["81338A39",0x1045],
+  ["81338B30",0x1046],
+  ["81338B31",0x1047],
+  ["81338B32",0x1048],
+  ["81338B33",0x1049],
+  ["81338B34",0x104A],
+  ["81338B35",0x104B],
+  ["81338B36",0x104C],
+  ["81338B37",0x104D],
+  ["81338B38",0x104E],
+  ["81338B39",0x104F],
+  ["81338C30",0x1050],
+  ["81338C31",0x1051],
+  ["81338C32",0x1052],
+  ["81338C33",0x1053],
+  ["81338C34",0x1054],
+  ["81338C35",0x1055],
+  ["81338C36",0x1056],
+  ["81338C37",0x1057],
+  ["81338C38",0x1058],
+  ["81338C39",0x1059],
+  ["81338D30",0x105A],
+  ["81338D31",0x105B],
+  ["81338D32",0x105C],
+  ["81338D33",0x105D],
+  ["81338D34",0x105E],
+  ["81338D35",0x105F],
+  ["81338D36",0x1060],
+  ["81338D37",0x1061],
+  ["81338D38",0x1062],
+  ["81338D39",0x1063],
+  ["81338E30",0x1064],
+  ["81338E31",0x1065],
+  ["81338E32",0x1066],
+  ["81338E33",0x1067],
+  ["81338E34",0x1068],
+  ["81338E35",0x1069],
+  ["81338E36",0x106A],
+  ["81338E37",0x106B],
+  ["81338E38",0x106C],
+  ["81338E39",0x106D],
+  ["81338F30",0x106E],
+  ["81338F31",0x106F],
+  ["81338F32",0x1070],
+  ["81338F33",0x1071],
+  ["81338F34",0x1072],
+  ["81338F35",0x1073],
+  ["81338F36",0x1074],
+  ["81338F37",0x1075],
+  ["81338F38",0x1076],
+  ["81338F39",0x1077],
+  ["81339030",0x1078],
+  ["81339031",0x1079],
+  ["81339032",0x107A],
+  ["81339033",0x107B],
+  ["81339034",0x107C],
+  ["81339035",0x107D],
+  ["81339036",0x107E],
+  ["81339037",0x107F],
+  ["81339038",0x1080],
+  ["81339039",0x1081],
+  ["81339130",0x1082],
+  ["81339131",0x1083],
+  ["81339132",0x1084],
+  ["81339133",0x1085],
+  ["81339134",0x1086],
+  ["81339135",0x1087],
+  ["81339136",0x1088],
+  ["81339137",0x1089],
+  ["81339138",0x108A],
+  ["81339139",0x108B],
+  ["81339230",0x108C],
+  ["81339231",0x108D],
+  ["81339232",0x108E],
+  ["81339233",0x108F],
+  ["81339234",0x1090],
+  ["81339235",0x1091],
+  ["81339236",0x1092],
+  ["81339237",0x1093],
+  ["81339238",0x1094],
+  ["81339239",0x1095],
+  ["81339330",0x1096],
+  ["81339331",0x1097],
+  ["81339332",0x1098],
+  ["81339333",0x1099],
+  ["81339334",0x109A],
+  ["81339335",0x109B],
+  ["81339336",0x109C],
+  ["81339337",0x109D],
+  ["81339338",0x109E],
+  ["81339339",0x109F],
+  ["81339430",0x10A0],
+  ["81339431",0x10A1],
+  ["81339432",0x10A2],
+  ["81339433",0x10A3],
+  ["81339434",0x10A4],
+  ["81339435",0x10A5],
+  ["81339436",0x10A6],
+  ["81339437",0x10A7],
+  ["81339438",0x10A8],
+  ["81339439",0x10A9],
+  ["81339530",0x10AA],
+  ["81339531",0x10AB],
+  ["81339532",0x10AC],
+  ["81339533",0x10AD],
+  ["81339534",0x10AE],
+  ["81339535",0x10AF],
+  ["81339536",0x10B0],
+  ["81339537",0x10B1],
+  ["81339538",0x10B2],
+  ["81339539",0x10B3],
+  ["81339630",0x10B4],
+  ["81339631",0x10B5],
+  ["81339632",0x10B6],
+  ["81339633",0x10B7],
+  ["81339634",0x10B8],
+  ["81339635",0x10B9],
+  ["81339636",0x10BA],
+  ["81339637",0x10BB],
+  ["81339638",0x10BC],
+  ["81339639",0x10BD],
+  ["81339730",0x10BE],
+  ["81339731",0x10BF],
+  ["81339732",0x10C0],
+  ["81339733",0x10C1],
+  ["81339734",0x10C2],
+  ["81339735",0x10C3],
+  ["81339736",0x10C4],
+  ["81339737",0x10C5],
+  ["81339738",0x10C6],
+  ["81339739",0x10C7],
+  ["81339830",0x10C8],
+  ["81339831",0x10C9],
+  ["81339832",0x10CA],
+  ["81339833",0x10CB],
+  ["81339834",0x10CC],
+  ["81339835",0x10CD],
+  ["81339836",0x10CE],
+  ["81339837",0x10CF],
+  ["81339838",0x10D0],
+  ["81339839",0x10D1],
+  ["81339930",0x10D2],
+  ["81339931",0x10D3],
+  ["81339932",0x10D4],
+  ["81339933",0x10D5],
+  ["81339934",0x10D6],
+  ["81339935",0x10D7],
+  ["81339936",0x10D8],
+  ["81339937",0x10D9],
+  ["81339938",0x10DA],
+  ["81339939",0x10DB],
+  ["81339A30",0x10DC],
+  ["81339A31",0x10DD],
+  ["81339A32",0x10DE],
+  ["81339A33",0x10DF],
+  ["81339A34",0x10E0],
+  ["81339A35",0x10E1],
+  ["81339A36",0x10E2],
+  ["81339A37",0x10E3],
+  ["81339A38",0x10E4],
+  ["81339A39",0x10E5],
+  ["81339B30",0x10E6],
+  ["81339B31",0x10E7],
+  ["81339B32",0x10E8],
+  ["81339B33",0x10E9],
+  ["81339B34",0x10EA],
+  ["81339B35",0x10EB],
+  ["81339B36",0x10EC],
+  ["81339B37",0x10ED],
+  ["81339B38",0x10EE],
+  ["81339B39",0x10EF],
+  ["81339C30",0x10F0],
+  ["81339C31",0x10F1],
+  ["81339C32",0x10F2],
+  ["81339C33",0x10F3],
+  ["81339C34",0x10F4],
+  ["81339C35",0x10F5],
+  ["81339C36",0x10F6],
+  ["81339C37",0x10F7],
+  ["81339C38",0x10F8],
+  ["81339C39",0x10F9],
+  ["81339D30",0x10FA],
+  ["81339D31",0x10FB],
+  ["81339D32",0x10FC],
+  ["81339D33",0x10FD],
+  ["81339D34",0x10FE],
+  ["81339D35",0x10FF],
+  ["81339D36",0x1100],
+  ["81339D37",0x1101],
+  ["81339D38",0x1102],
+  ["81339D39",0x1103],
+  ["81339E30",0x1104],
+  ["81339E31",0x1105],
+  ["81339E32",0x1106],
+  ["81339E33",0x1107],
+  ["81339E34",0x1108],
+  ["81339E35",0x1109],
+  ["81339E36",0x110A],
+  ["81339E37",0x110B],
+  ["81339E38",0x110C],
+  ["81339E39",0x110D],
+  ["81339F30",0x110E],
+  ["81339F31",0x110F],
+  ["81339F32",0x1110],
+  ["81339F33",0x1111],
+  ["81339F34",0x1112],
+  ["81339F35",0x1113],
+  ["81339F36",0x1114],
+  ["81339F37",0x1115],
+  ["81339F38",0x1116],
+  ["81339F39",0x1117],
+  ["8133A030",0x1118],
+  ["8133A031",0x1119],
+  ["8133A032",0x111A],
+  ["8133A033",0x111B],
+  ["8133A034",0x111C],
+  ["8133A035",0x111D],
+  ["8133A036",0x111E],
+  ["8133A037",0x111F],
+  ["8133A038",0x1120],
+  ["8133A039",0x1121],
+  ["8133A130",0x1122],
+  ["8133A131",0x1123],
+  ["8133A132",0x1124],
+  ["8133A133",0x1125],
+  ["8133A134",0x1126],
+  ["8133A135",0x1127],
+  ["8133A136",0x1128],
+  ["8133A137",0x1129],
+  ["8133A138",0x112A],
+  ["8133A139",0x112B],
+  ["8133A230",0x112C],
+  ["8133A231",0x112D],
+  ["8133A232",0x112E],
+  ["8133A233",0x112F],
+  ["8133A234",0x1130],
+  ["8133A235",0x1131],
+  ["8133A236",0x1132],
+  ["8133A237",0x1133],
+  ["8133A238",0x1134],
+  ["8133A239",0x1135],
+  ["8133A330",0x1136],
+  ["8133A331",0x1137],
+  ["8133A332",0x1138],
+  ["8133A333",0x1139],
+  ["8133A334",0x113A],
+  ["8133A335",0x113B],
+  ["8133A336",0x113C],
+  ["8133A337",0x113D],
+  ["8133A338",0x113E],
+  ["8133A339",0x113F],
+  ["8133A430",0x1140],
+  ["8133A431",0x1141],
+  ["8133A432",0x1142],
+  ["8133A433",0x1143],
+  ["8133A434",0x1144],
+  ["8133A435",0x1145],
+  ["8133A436",0x1146],
+  ["8133A437",0x1147],
+  ["8133A438",0x1148],
+  ["8133A439",0x1149],
+  ["8133A530",0x114A],
+  ["8133A531",0x114B],
+  ["8133A532",0x114C],
+  ["8133A533",0x114D],
+  ["8133A534",0x114E],
+  ["8133A535",0x114F],
+  ["8133A536",0x1150],
+  ["8133A537",0x1151],
+  ["8133A538",0x1152],
+  ["8133A539",0x1153],
+  ["8133A630",0x1154],
+  ["8133A631",0x1155],
+  ["8133A632",0x1156],
+  ["8133A633",0x1157],
+  ["8133A634",0x1158],
+  ["8133A635",0x1159],
+  ["8133A636",0x115A],
+  ["8133A637",0x115B],
+  ["8133A638",0x115C],
+  ["8133A639",0x115D],
+  ["8133A730",0x115E],
+  ["8133A731",0x115F],
+  ["8133A732",0x1160],
+  ["8133A733",0x1161],
+  ["8133A734",0x1162],
+  ["8133A735",0x1163],
+  ["8133A736",0x1164],
+  ["8133A737",0x1165],
+  ["8133A738",0x1166],
+  ["8133A739",0x1167],
+  ["8133A830",0x1168],
+  ["8133A831",0x1169],
+  ["8133A832",0x116A],
+  ["8133A833",0x116B],
+  ["8133A834",0x116C],
+  ["8133A835",0x116D],
+  ["8133A836",0x116E],
+  ["8133A837",0x116F],
+  ["8133A838",0x1170],
+  ["8133A839",0x1171],
+  ["8133A930",0x1172],
+  ["8133A931",0x1173],
+  ["8133A932",0x1174],
+  ["8133A933",0x1175],
+  ["8133A934",0x1176],
+  ["8133A935",0x1177],
+  ["8133A936",0x1178],
+  ["8133A937",0x1179],
+  ["8133A938",0x117A],
+  ["8133A939",0x117B],
+  ["8133AA30",0x117C],
+  ["8133AA31",0x117D],
+  ["8133AA32",0x117E],
+  ["8133AA33",0x117F],
+  ["8133AA34",0x1180],
+  ["8133AA35",0x1181],
+  ["8133AA36",0x1182],
+  ["8133AA37",0x1183],
+  ["8133AA38",0x1184],
+  ["8133AA39",0x1185],
+  ["8133AB30",0x1186],
+  ["8133AB31",0x1187],
+  ["8133AB32",0x1188],
+  ["8133AB33",0x1189],
+  ["8133AB34",0x118A],
+  ["8133AB35",0x118B],
+  ["8133AB36",0x118C],
+  ["8133AB37",0x118D],
+  ["8133AB38",0x118E],
+  ["8133AB39",0x118F],
+  ["8133AC30",0x1190],
+  ["8133AC31",0x1191],
+  ["8133AC32",0x1192],
+  ["8133AC33",0x1193],
+  ["8133AC34",0x1194],
+  ["8133AC35",0x1195],
+  ["8133AC36",0x1196],
+  ["8133AC37",0x1197],
+  ["8133AC38",0x1198],
+  ["8133AC39",0x1199],
+  ["8133AD30",0x119A],
+  ["8133AD31",0x119B],
+  ["8133AD32",0x119C],
+  ["8133AD33",0x119D],
+  ["8133AD34",0x119E],
+  ["8133AD35",0x119F],
+  ["8133AD36",0x11A0],
+  ["8133AD37",0x11A1],
+  ["8133AD38",0x11A2],
+  ["8133AD39",0x11A3],
+  ["8133AE30",0x11A4],
+  ["8133AE31",0x11A5],
+  ["8133AE32",0x11A6],
+  ["8133AE33",0x11A7],
+  ["8133AE34",0x11A8],
+  ["8133AE35",0x11A9],
+  ["8133AE36",0x11AA],
+  ["8133AE37",0x11AB],
+  ["8133AE38",0x11AC],
+  ["8133AE39",0x11AD],
+  ["8133AF30",0x11AE],
+  ["8133AF31",0x11AF],
+  ["8133AF32",0x11B0],
+  ["8133AF33",0x11B1],
+  ["8133AF34",0x11B2],
+  ["8133AF35",0x11B3],
+  ["8133AF36",0x11B4],
+  ["8133AF37",0x11B5],
+  ["8133AF38",0x11B6],
+  ["8133AF39",0x11B7],
+  ["8133B030",0x11B8],
+  ["8133B031",0x11B9],
+  ["8133B032",0x11BA],
+  ["8133B033",0x11BB],
+  ["8133B034",0x11BC],
+  ["8133B035",0x11BD],
+  ["8133B036",0x11BE],
+  ["8133B037",0x11BF],
+  ["8133B038",0x11C0],
+  ["8133B039",0x11C1],
+  ["8133B130",0x11C2],
+  ["8133B131",0x11C3],
+  ["8133B132",0x11C4],
+  ["8133B133",0x11C5],
+  ["8133B134",0x11C6],
+  ["8133B135",0x11C7],
+  ["8133B136",0x11C8],
+  ["8133B137",0x11C9],
+  ["8133B138",0x11CA],
+  ["8133B139",0x11CB],
+  ["8133B230",0x11CC],
+  ["8133B231",0x11CD],
+  ["8133B232",0x11CE],
+  ["8133B233",0x11CF],
+  ["8133B234",0x11D0],
+  ["8133B235",0x11D1],
+  ["8133B236",0x11D2],
+  ["8133B237",0x11D3],
+  ["8133B238",0x11D4],
+  ["8133B239",0x11D5],
+  ["8133B330",0x11D6],
+  ["8133B331",0x11D7],
+  ["8133B332",0x11D8],
+  ["8133B333",0x11D9],
+  ["8133B334",0x11DA],
+  ["8133B335",0x11DB],
+  ["8133B336",0x11DC],
+  ["8133B337",0x11DD],
+  ["8133B338",0x11DE],
+  ["8133B339",0x11DF],
+  ["8133B430",0x11E0],
+  ["8133B431",0x11E1],
+  ["8133B432",0x11E2],
+  ["8133B433",0x11E3],
+  ["8133B434",0x11E4],
+  ["8133B435",0x11E5],
+  ["8133B436",0x11E6],
+  ["8133B437",0x11E7],
+  ["8133B438",0x11E8],
+  ["8133B439",0x11E9],
+  ["8133B530",0x11EA],
+  ["8133B531",0x11EB],
+  ["8133B532",0x11EC],
+  ["8133B533",0x11ED],
+  ["8133B534",0x11EE],
+  ["8133B535",0x11EF],
+  ["8133B536",0x11F0],
+  ["8133B537",0x11F1],
+  ["8133B538",0x11F2],
+  ["8133B539",0x11F3],
+  ["8133B630",0x11F4],
+  ["8133B631",0x11F5],
+  ["8133B632",0x11F6],
+  ["8133B633",0x11F7],
+  ["8133B634",0x11F8],
+  ["8133B635",0x11F9],
+  ["8133B636",0x11FA],
+  ["8133B637",0x11FB],
+  ["8133B638",0x11FC],
+  ["8133B639",0x11FD],
+  ["8133B730",0x11FE],
+  ["8133B731",0x11FF],
+  ["8133B732",0x1200],
+  ["8133B733",0x1201],
+  ["8133B734",0x1202],
+  ["8133B735",0x1203],
+  ["8133B736",0x1204],
+  ["8133B737",0x1205],
+  ["8133B738",0x1206],
+  ["8133B739",0x1207],
+  ["8133B830",0x1208],
+  ["8133B831",0x1209],
+  ["8133B832",0x120A],
+  ["8133B833",0x120B],
+  ["8133B834",0x120C],
+  ["8133B835",0x120D],
+  ["8133B836",0x120E],
+  ["8133B837",0x120F],
+  ["8133B838",0x1210],
+  ["8133B839",0x1211],
+  ["8133B930",0x1212],
+  ["8133B931",0x1213],
+  ["8133B932",0x1214],
+  ["8133B933",0x1215],
+  ["8133B934",0x1216],
+  ["8133B935",0x1217],
+  ["8133B936",0x1218],
+  ["8133B937",0x1219],
+  ["8133B938",0x121A],
+  ["8133B939",0x121B],
+  ["8133BA30",0x121C],
+  ["8133BA31",0x121D],
+  ["8133BA32",0x121E],
+  ["8133BA33",0x121F],
+  ["8133BA34",0x1220],
+  ["8133BA35",0x1221],
+  ["8133BA36",0x1222],
+  ["8133BA37",0x1223],
+  ["8133BA38",0x1224],
+  ["8133BA39",0x1225],
+  ["8133BB30",0x1226],
+  ["8133BB31",0x1227],
+  ["8133BB32",0x1228],
+  ["8133BB33",0x1229],
+  ["8133BB34",0x122A],
+  ["8133BB35",0x122B],
+  ["8133BB36",0x122C],
+  ["8133BB37",0x122D],
+  ["8133BB38",0x122E],
+  ["8133BB39",0x122F],
+  ["8133BC30",0x1230],
+  ["8133BC31",0x1231],
+  ["8133BC32",0x1232],
+  ["8133BC33",0x1233],
+  ["8133BC34",0x1234],
+  ["8133BC35",0x1235],
+  ["8133BC36",0x1236],
+  ["8133BC37",0x1237],
+  ["8133BC38",0x1238],
+  ["8133BC39",0x1239],
+  ["8133BD30",0x123A],
+  ["8133BD31",0x123B],
+  ["8133BD32",0x123C],
+  ["8133BD33",0x123D],
+  ["8133BD34",0x123E],
+  ["8133BD35",0x123F],
+  ["8133BD36",0x1240],
+  ["8133BD37",0x1241],
+  ["8133BD38",0x1242],
+  ["8133BD39",0x1243],
+  ["8133BE30",0x1244],
+  ["8133BE31",0x1245],
+  ["8133BE32",0x1246],
+  ["8133BE33",0x1247],
+  ["8133BE34",0x1248],
+  ["8133BE35",0x1249],
+  ["8133BE36",0x124A],
+  ["8133BE37",0x124B],
+  ["8133BE38",0x124C],
+  ["8133BE39",0x124D],
+  ["8133BF30",0x124E],
+  ["8133BF31",0x124F],
+  ["8133BF32",0x1250],
+  ["8133BF33",0x1251],
+  ["8133BF34",0x1252],
+  ["8133BF35",0x1253],
+  ["8133BF36",0x1254],
+  ["8133BF37",0x1255],
+  ["8133BF38",0x1256],
+  ["8133BF39",0x1257],
+  ["8133C030",0x1258],
+  ["8133C031",0x1259],
+  ["8133C032",0x125A],
+  ["8133C033",0x125B],
+  ["8133C034",0x125C],
+  ["8133C035",0x125D],
+  ["8133C036",0x125E],
+  ["8133C037",0x125F],
+  ["8133C038",0x1260],
+  ["8133C039",0x1261],
+  ["8133C130",0x1262],
+  ["8133C131",0x1263],
+  ["8133C132",0x1264],
+  ["8133C133",0x1265],
+  ["8133C134",0x1266],
+  ["8133C135",0x1267],
+  ["8133C136",0x1268],
+  ["8133C137",0x1269],
+  ["8133C138",0x126A],
+  ["8133C139",0x126B],
+  ["8133C230",0x126C],
+  ["8133C231",0x126D],
+  ["8133C232",0x126E],
+  ["8133C233",0x126F],
+  ["8133C234",0x1270],
+  ["8133C235",0x1271],
+  ["8133C236",0x1272],
+  ["8133C237",0x1273],
+  ["8133C238",0x1274],
+  ["8133C239",0x1275],
+  ["8133C330",0x1276],
+  ["8133C331",0x1277],
+  ["8133C332",0x1278],
+  ["8133C333",0x1279],
+  ["8133C334",0x127A],
+  ["8133C335",0x127B],
+  ["8133C336",0x127C],
+  ["8133C337",0x127D],
+  ["8133C338",0x127E],
+  ["8133C339",0x127F],
+  ["8133C430",0x1280],
+  ["8133C431",0x1281],
+  ["8133C432",0x1282],
+  ["8133C433",0x1283],
+  ["8133C434",0x1284],
+  ["8133C435",0x1285],
+  ["8133C436",0x1286],
+  ["8133C437",0x1287],
+  ["8133C438",0x1288],
+  ["8133C439",0x1289],
+  ["8133C530",0x128A],
+  ["8133C531",0x128B],
+  ["8133C532",0x128C],
+  ["8133C533",0x128D],
+  ["8133C534",0x128E],
+  ["8133C535",0x128F],
+  ["8133C536",0x1290],
+  ["8133C537",0x1291],
+  ["8133C538",0x1292],
+  ["8133C539",0x1293],
+  ["8133C630",0x1294],
+  ["8133C631",0x1295],
+  ["8133C632",0x1296],
+  ["8133C633",0x1297],
+  ["8133C634",0x1298],
+  ["8133C635",0x1299],
+  ["8133C636",0x129A],
+  ["8133C637",0x129B],
+  ["8133C638",0x129C],
+  ["8133C639",0x129D],
+  ["8133C730",0x129E],
+  ["8133C731",0x129F],
+  ["8133C732",0x12A0],
+  ["8133C733",0x12A1],
+  ["8133C734",0x12A2],
+  ["8133C735",0x12A3],
+  ["8133C736",0x12A4],
+  ["8133C737",0x12A5],
+  ["8133C738",0x12A6],
+  ["8133C739",0x12A7],
+  ["8133C830",0x12A8],
+  ["8133C831",0x12A9],
+  ["8133C832",0x12AA],
+  ["8133C833",0x12AB],
+  ["8133C834",0x12AC],
+  ["8133C835",0x12AD],
+  ["8133C836",0x12AE],
+  ["8133C837",0x12AF],
+  ["8133C838",0x12B0],
+  ["8133C839",0x12B1],
+  ["8133C930",0x12B2],
+  ["8133C931",0x12B3],
+  ["8133C932",0x12B4],
+  ["8133C933",0x12B5],
+  ["8133C934",0x12B6],
+  ["8133C935",0x12B7],
+  ["8133C936",0x12B8],
+  ["8133C937",0x12B9],
+  ["8133C938",0x12BA],
+  ["8133C939",0x12BB],
+  ["8133CA30",0x12BC],
+  ["8133CA31",0x12BD],
+  ["8133CA32",0x12BE],
+  ["8133CA33",0x12BF],
+  ["8133CA34",0x12C0],
+  ["8133CA35",0x12C1],
+  ["8133CA36",0x12C2],
+  ["8133CA37",0x12C3],
+  ["8133CA38",0x12C4],
+  ["8133CA39",0x12C5],
+  ["8133CB30",0x12C6],
+  ["8133CB31",0x12C7],
+  ["8133CB32",0x12C8],
+  ["8133CB33",0x12C9],
+  ["8133CB34",0x12CA],
+  ["8133CB35",0x12CB],
+  ["8133CB36",0x12CC],
+  ["8133CB37",0x12CD],
+  ["8133CB38",0x12CE],
+  ["8133CB39",0x12CF],
+  ["8133CC30",0x12D0],
+  ["8133CC31",0x12D1],
+  ["8133CC32",0x12D2],
+  ["8133CC33",0x12D3],
+  ["8133CC34",0x12D4],
+  ["8133CC35",0x12D5],
+  ["8133CC36",0x12D6],
+  ["8133CC37",0x12D7],
+  ["8133CC38",0x12D8],
+  ["8133CC39",0x12D9],
+  ["8133CD30",0x12DA],
+  ["8133CD31",0x12DB],
+  ["8133CD32",0x12DC],
+  ["8133CD33",0x12DD],
+  ["8133CD34",0x12DE],
+  ["8133CD35",0x12DF],
+  ["8133CD36",0x12E0],
+  ["8133CD37",0x12E1],
+  ["8133CD38",0x12E2],
+  ["8133CD39",0x12E3],
+  ["8133CE30",0x12E4],
+  ["8133CE31",0x12E5],
+  ["8133CE32",0x12E6],
+  ["8133CE33",0x12E7],
+  ["8133CE34",0x12E8],
+  ["8133CE35",0x12E9],
+  ["8133CE36",0x12EA],
+  ["8133CE37",0x12EB],
+  ["8133CE38",0x12EC],
+  ["8133CE39",0x12ED],
+  ["8133CF30",0x12EE],
+  ["8133CF31",0x12EF],
+  ["8133CF32",0x12F0],
+  ["8133CF33",0x12F1],
+  ["8133CF34",0x12F2],
+  ["8133CF35",0x12F3],
+  ["8133CF36",0x12F4],
+  ["8133CF37",0x12F5],
+  ["8133CF38",0x12F6],
+  ["8133CF39",0x12F7],
+  ["8133D030",0x12F8],
+  ["8133D031",0x12F9],
+  ["8133D032",0x12FA],
+  ["8133D033",0x12FB],
+  ["8133D034",0x12FC],
+  ["8133D035",0x12FD],
+  ["8133D036",0x12FE],
+  ["8133D037",0x12FF],
+  ["8133D038",0x1300],
+  ["8133D039",0x1301],
+  ["8133D130",0x1302],
+  ["8133D131",0x1303],
+  ["8133D132",0x1304],
+  ["8133D133",0x1305],
+  ["8133D134",0x1306],
+  ["8133D135",0x1307],
+  ["8133D136",0x1308],
+  ["8133D137",0x1309],
+  ["8133D138",0x130A],
+  ["8133D139",0x130B],
+  ["8133D230",0x130C],
+  ["8133D231",0x130D],
+  ["8133D232",0x130E],
+  ["8133D233",0x130F],
+  ["8133D234",0x1310],
+  ["8133D235",0x1311],
+  ["8133D236",0x1312],
+  ["8133D237",0x1313],
+  ["8133D238",0x1314],
+  ["8133D239",0x1315],
+  ["8133D330",0x1316],
+  ["8133D331",0x1317],
+  ["8133D332",0x1318],
+  ["8133D333",0x1319],
+  ["8133D334",0x131A],
+  ["8133D335",0x131B],
+  ["8133D336",0x131C],
+  ["8133D337",0x131D],
+  ["8133D338",0x131E],
+  ["8133D339",0x131F],
+  ["8133D430",0x1320],
+  ["8133D431",0x1321],
+  ["8133D432",0x1322],
+  ["8133D433",0x1323],
+  ["8133D434",0x1324],
+  ["8133D435",0x1325],
+  ["8133D436",0x1326],
+  ["8133D437",0x1327],
+  ["8133D438",0x1328],
+  ["8133D439",0x1329],
+  ["8133D530",0x132A],
+  ["8133D531",0x132B],
+  ["8133D532",0x132C],
+  ["8133D533",0x132D],
+  ["8133D534",0x132E],
+  ["8133D535",0x132F],
+  ["8133D536",0x1330],
+  ["8133D537",0x1331],
+  ["8133D538",0x1332],
+  ["8133D539",0x1333],
+  ["8133D630",0x1334],
+  ["8133D631",0x1335],
+  ["8133D632",0x1336],
+  ["8133D633",0x1337],
+  ["8133D634",0x1338],
+  ["8133D635",0x1339],
+  ["8133D636",0x133A],
+  ["8133D637",0x133B],
+  ["8133D638",0x133C],
+  ["8133D639",0x133D],
+  ["8133D730",0x133E],
+  ["8133D731",0x133F],
+  ["8133D732",0x1340],
+  ["8133D733",0x1341],
+  ["8133D734",0x1342],
+  ["8133D735",0x1343],
+  ["8133D736",0x1344],
+  ["8133D737",0x1345],
+  ["8133D738",0x1346],
+  ["8133D739",0x1347],
+  ["8133D830",0x1348],
+  ["8133D831",0x1349],
+  ["8133D832",0x134A],
+  ["8133D833",0x134B],
+  ["8133D834",0x134C],
+  ["8133D835",0x134D],
+  ["8133D836",0x134E],
+  ["8133D837",0x134F],
+  ["8133D838",0x1350],
+  ["8133D839",0x1351],
+  ["8133D930",0x1352],
+  ["8133D931",0x1353],
+  ["8133D932",0x1354],
+  ["8133D933",0x1355],
+  ["8133D934",0x1356],
+  ["8133D935",0x1357],
+  ["8133D936",0x1358],
+  ["8133D937",0x1359],
+  ["8133D938",0x135A],
+  ["8133D939",0x135B],
+  ["8133DA30",0x135C],
+  ["8133DA31",0x135D],
+  ["8133DA32",0x135E],
+  ["8133DA33",0x135F],
+  ["8133DA34",0x1360],
+  ["8133DA35",0x1361],
+  ["8133DA36",0x1362],
+  ["8133DA37",0x1363],
+  ["8133DA38",0x1364],
+  ["8133DA39",0x1365],
+  ["8133DB30",0x1366],
+  ["8133DB31",0x1367],
+  ["8133DB32",0x1368],
+  ["8133DB33",0x1369],
+  ["8133DB34",0x136A],
+  ["8133DB35",0x136B],
+  ["8133DB36",0x136C],
+  ["8133DB37",0x136D],
+  ["8133DB38",0x136E],
+  ["8133DB39",0x136F],
+  ["8133DC30",0x1370],
+  ["8133DC31",0x1371],
+  ["8133DC32",0x1372],
+  ["8133DC33",0x1373],
+  ["8133DC34",0x1374],
+  ["8133DC35",0x1375],
+  ["8133DC36",0x1376],
+  ["8133DC37",0x1377],
+  ["8133DC38",0x1378],
+  ["8133DC39",0x1379],
+  ["8133DD30",0x137A],
+  ["8133DD31",0x137B],
+  ["8133DD32",0x137C],
+  ["8133DD33",0x137D],
+  ["8133DD34",0x137E],
+  ["8133DD35",0x137F],
+  ["8133DD36",0x1380],
+  ["8133DD37",0x1381],
+  ["8133DD38",0x1382],
+  ["8133DD39",0x1383],
+  ["8133DE30",0x1384],
+  ["8133DE31",0x1385],
+  ["8133DE32",0x1386],
+  ["8133DE33",0x1387],
+  ["8133DE34",0x1388],
+  ["8133DE35",0x1389],
+  ["8133DE36",0x138A],
+  ["8133DE37",0x138B],
+  ["8133DE38",0x138C],
+  ["8133DE39",0x138D],
+  ["8133DF30",0x138E],
+  ["8133DF31",0x138F],
+  ["8133DF32",0x1390],
+  ["8133DF33",0x1391],
+  ["8133DF34",0x1392],
+  ["8133DF35",0x1393],
+  ["8133DF36",0x1394],
+  ["8133DF37",0x1395],
+  ["8133DF38",0x1396],
+  ["8133DF39",0x1397],
+  ["8133E030",0x1398],
+  ["8133E031",0x1399],
+  ["8133E032",0x139A],
+  ["8133E033",0x139B],
+  ["8133E034",0x139C],
+  ["8133E035",0x139D],
+  ["8133E036",0x139E],
+  ["8133E037",0x139F],
+  ["8133E038",0x13A0],
+  ["8133E039",0x13A1],
+  ["8133E130",0x13A2],
+  ["8133E131",0x13A3],
+  ["8133E132",0x13A4],
+  ["8133E133",0x13A5],
+  ["8133E134",0x13A6],
+  ["8133E135",0x13A7],
+  ["8133E136",0x13A8],
+  ["8133E137",0x13A9],
+  ["8133E138",0x13AA],
+  ["8133E139",0x13AB],
+  ["8133E230",0x13AC],
+  ["8133E231",0x13AD],
+  ["8133E232",0x13AE],
+  ["8133E233",0x13AF],
+  ["8133E234",0x13B0],
+  ["8133E235",0x13B1],
+  ["8133E236",0x13B2],
+  ["8133E237",0x13B3],
+  ["8133E238",0x13B4],
+  ["8133E239",0x13B5],
+  ["8133E330",0x13B6],
+  ["8133E331",0x13B7],
+  ["8133E332",0x13B8],
+  ["8133E333",0x13B9],
+  ["8133E334",0x13BA],
+  ["8133E335",0x13BB],
+  ["8133E336",0x13BC],
+  ["8133E337",0x13BD],
+  ["8133E338",0x13BE],
+  ["8133E339",0x13BF],
+  ["8133E430",0x13C0],
+  ["8133E431",0x13C1],
+  ["8133E432",0x13C2],
+  ["8133E433",0x13C3],
+  ["8133E434",0x13C4],
+  ["8133E435",0x13C5],
+  ["8133E436",0x13C6],
+  ["8133E437",0x13C7],
+  ["8133E438",0x13C8],
+  ["8133E439",0x13C9],
+  ["8133E530",0x13CA],
+  ["8133E531",0x13CB],
+  ["8133E532",0x13CC],
+  ["8133E533",0x13CD],
+  ["8133E534",0x13CE],
+  ["8133E535",0x13CF],
+  ["8133E536",0x13D0],
+  ["8133E537",0x13D1],
+  ["8133E538",0x13D2],
+  ["8133E539",0x13D3],
+  ["8133E630",0x13D4],
+  ["8133E631",0x13D5],
+  ["8133E632",0x13D6],
+  ["8133E633",0x13D7],
+  ["8133E634",0x13D8],
+  ["8133E635",0x13D9],
+  ["8133E636",0x13DA],
+  ["8133E637",0x13DB],
+  ["8133E638",0x13DC],
+  ["8133E639",0x13DD],
+  ["8133E730",0x13DE],
+  ["8133E731",0x13DF],
+  ["8133E732",0x13E0],
+  ["8133E733",0x13E1],
+  ["8133E734",0x13E2],
+  ["8133E735",0x13E3],
+  ["8133E736",0x13E4],
+  ["8133E737",0x13E5],
+  ["8133E738",0x13E6],
+  ["8133E739",0x13E7],
+  ["8133E830",0x13E8],
+  ["8133E831",0x13E9],
+  ["8133E832",0x13EA],
+  ["8133E833",0x13EB],
+  ["8133E834",0x13EC],
+  ["8133E835",0x13ED],
+  ["8133E836",0x13EE],
+  ["8133E837",0x13EF],
+  ["8133E838",0x13F0],
+  ["8133E839",0x13F1],
+  ["8133E930",0x13F2],
+  ["8133E931",0x13F3],
+  ["8133E932",0x13F4],
+  ["8133E933",0x13F5],
+  ["8133E934",0x13F6],
+  ["8133E935",0x13F7],
+  ["8133E936",0x13F8],
+  ["8133E937",0x13F9],
+  ["8133E938",0x13FA],
+  ["8133E939",0x13FB],
+  ["8133EA30",0x13FC],
+  ["8133EA31",0x13FD],
+  ["8133EA32",0x13FE],
+  ["8133EA33",0x13FF],
+  ["8133EA34",0x1400],
+  ["8133EA35",0x1401],
+  ["8133EA36",0x1402],
+  ["8133EA37",0x1403],
+  ["8133EA38",0x1404],
+  ["8133EA39",0x1405],
+  ["8133EB30",0x1406],
+  ["8133EB31",0x1407],
+  ["8133EB32",0x1408],
+  ["8133EB33",0x1409],
+  ["8133EB34",0x140A],
+  ["8133EB35",0x140B],
+  ["8133EB36",0x140C],
+  ["8133EB37",0x140D],
+  ["8133EB38",0x140E],
+  ["8133EB39",0x140F],
+  ["8133EC30",0x1410],
+  ["8133EC31",0x1411],
+  ["8133EC32",0x1412],
+  ["8133EC33",0x1413],
+  ["8133EC34",0x1414],
+  ["8133EC35",0x1415],
+  ["8133EC36",0x1416],
+  ["8133EC37",0x1417],
+  ["8133EC38",0x1418],
+  ["8133EC39",0x1419],
+  ["8133ED30",0x141A],
+  ["8133ED31",0x141B],
+  ["8133ED32",0x141C],
+  ["8133ED33",0x141D],
+  ["8133ED34",0x141E],
+  ["8133ED35",0x141F],
+  ["8133ED36",0x1420],
+  ["8133ED37",0x1421],
+  ["8133ED38",0x1422],
+  ["8133ED39",0x1423],
+  ["8133EE30",0x1424],
+  ["8133EE31",0x1425],
+  ["8133EE32",0x1426],
+  ["8133EE33",0x1427],
+  ["8133EE34",0x1428],
+  ["8133EE35",0x1429],
+  ["8133EE36",0x142A],
+  ["8133EE37",0x142B],
+  ["8133EE38",0x142C],
+  ["8133EE39",0x142D],
+  ["8133EF30",0x142E],
+  ["8133EF31",0x142F],
+  ["8133EF32",0x1430],
+  ["8133EF33",0x1431],
+  ["8133EF34",0x1432],
+  ["8133EF35",0x1433],
+  ["8133EF36",0x1434],
+  ["8133EF37",0x1435],
+  ["8133EF38",0x1436],
+  ["8133EF39",0x1437],
+  ["8133F030",0x1438],
+  ["8133F031",0x1439],
+  ["8133F032",0x143A],
+  ["8133F033",0x143B],
+  ["8133F034",0x143C],
+  ["8133F035",0x143D],
+  ["8133F036",0x143E],
+  ["8133F037",0x143F],
+  ["8133F038",0x1440],
+  ["8133F039",0x1441],
+  ["8133F130",0x1442],
+  ["8133F131",0x1443],
+  ["8133F132",0x1444],
+  ["8133F133",0x1445],
+  ["8133F134",0x1446],
+  ["8133F135",0x1447],
+  ["8133F136",0x1448],
+  ["8133F137",0x1449],
+  ["8133F138",0x144A],
+  ["8133F139",0x144B],
+  ["8133F230",0x144C],
+  ["8133F231",0x144D],
+  ["8133F232",0x144E],
+  ["8133F233",0x144F],
+  ["8133F234",0x1450],
+  ["8133F235",0x1451],
+  ["8133F236",0x1452],
+  ["8133F237",0x1453],
+  ["8133F238",0x1454],
+  ["8133F239",0x1455],
+  ["8133F330",0x1456],
+  ["8133F331",0x1457],
+  ["8133F332",0x1458],
+  ["8133F333",0x1459],
+  ["8133F334",0x145A],
+  ["8133F335",0x145B],
+  ["8133F336",0x145C],
+  ["8133F337",0x145D],
+  ["8133F338",0x145E],
+  ["8133F339",0x145F],
+  ["8133F430",0x1460],
+  ["8133F431",0x1461],
+  ["8133F432",0x1462],
+  ["8133F433",0x1463],
+  ["8133F434",0x1464],
+  ["8133F435",0x1465],
+  ["8133F436",0x1466],
+  ["8133F437",0x1467],
+  ["8133F438",0x1468],
+  ["8133F439",0x1469],
+  ["8133F530",0x146A],
+  ["8133F531",0x146B],
+  ["8133F532",0x146C],
+  ["8133F533",0x146D],
+  ["8133F534",0x146E],
+  ["8133F535",0x146F],
+  ["8133F536",0x1470],
+  ["8133F537",0x1471],
+  ["8133F538",0x1472],
+  ["8133F539",0x1473],
+  ["8133F630",0x1474],
+  ["8133F631",0x1475],
+  ["8133F632",0x1476],
+  ["8133F633",0x1477],
+  ["8133F634",0x1478],
+  ["8133F635",0x1479],
+  ["8133F636",0x147A],
+  ["8133F637",0x147B],
+  ["8133F638",0x147C],
+  ["8133F639",0x147D],
+  ["8133F730",0x147E],
+  ["8133F731",0x147F],
+  ["8133F732",0x1480],
+  ["8133F733",0x1481],
+  ["8133F734",0x1482],
+  ["8133F735",0x1483],
+  ["8133F736",0x1484],
+  ["8133F737",0x1485],
+  ["8133F738",0x1486],
+  ["8133F739",0x1487],
+  ["8133F830",0x1488],
+  ["8133F831",0x1489],
+  ["8133F832",0x148A],
+  ["8133F833",0x148B],
+  ["8133F834",0x148C],
+  ["8133F835",0x148D],
+  ["8133F836",0x148E],
+  ["8133F837",0x148F],
+  ["8133F838",0x1490],
+  ["8133F839",0x1491],
+  ["8133F930",0x1492],
+  ["8133F931",0x1493],
+  ["8133F932",0x1494],
+  ["8133F933",0x1495],
+  ["8133F934",0x1496],
+  ["8133F935",0x1497],
+  ["8133F936",0x1498],
+  ["8133F937",0x1499],
+  ["8133F938",0x149A],
+  ["8133F939",0x149B],
+  ["8133FA30",0x149C],
+  ["8133FA31",0x149D],
+  ["8133FA32",0x149E],
+  ["8133FA33",0x149F],
+  ["8133FA34",0x14A0],
+  ["8133FA35",0x14A1],
+  ["8133FA36",0x14A2],
+  ["8133FA37",0x14A3],
+  ["8133FA38",0x14A4],
+  ["8133FA39",0x14A5],
+  ["8133FB30",0x14A6],
+  ["8133FB31",0x14A7],
+  ["8133FB32",0x14A8],
+  ["8133FB33",0x14A9],
+  ["8133FB34",0x14AA],
+  ["8133FB35",0x14AB],
+  ["8133FB36",0x14AC],
+  ["8133FB37",0x14AD],
+  ["8133FB38",0x14AE],
+  ["8133FB39",0x14AF],
+  ["8133FC30",0x14B0],
+  ["8133FC31",0x14B1],
+  ["8133FC32",0x14B2],
+  ["8133FC33",0x14B3],
+  ["8133FC34",0x14B4],
+  ["8133FC35",0x14B5],
+  ["8133FC36",0x14B6],
+  ["8133FC37",0x14B7],
+  ["8133FC38",0x14B8],
+  ["8133FC39",0x14B9],
+  ["8133FD30",0x14BA],
+  ["8133FD31",0x14BB],
+  ["8133FD32",0x14BC],
+  ["8133FD33",0x14BD],
+  ["8133FD34",0x14BE],
+  ["8133FD35",0x14BF],
+  ["8133FD36",0x14C0],
+  ["8133FD37",0x14C1],
+  ["8133FD38",0x14C2],
+  ["8133FD39",0x14C3],
+  ["8133FE30",0x14C4],
+  ["8133FE31",0x14C5],
+  ["8133FE32",0x14C6],
+  ["8133FE33",0x14C7],
+  ["8133FE34",0x14C8],
+  ["8133FE35",0x14C9],
+  ["8133FE36",0x14CA],
+  ["8133FE37",0x14CB],
+  ["8133FE38",0x14CC],
+  ["8133FE39",0x14CD],
+  ["81348130",0x14CE],
+  ["81348131",0x14CF],
+  ["81348132",0x14D0],
+  ["81348133",0x14D1],
+  ["81348134",0x14D2],
+  ["81348135",0x14D3],
+  ["81348136",0x14D4],
+  ["81348137",0x14D5],
+  ["81348138",0x14D6],
+  ["81348139",0x14D7],
+  ["81348230",0x14D8],
+  ["81348231",0x14D9],
+  ["81348232",0x14DA],
+  ["81348233",0x14DB],
+  ["81348234",0x14DC],
+  ["81348235",0x14DD],
+  ["81348236",0x14DE],
+  ["81348237",0x14DF],
+  ["81348238",0x14E0],
+  ["81348239",0x14E1],
+  ["81348330",0x14E2],
+  ["81348331",0x14E3],
+  ["81348332",0x14E4],
+  ["81348333",0x14E5],
+  ["81348334",0x14E6],
+  ["81348335",0x14E7],
+  ["81348336",0x14E8],
+  ["81348337",0x14E9],
+  ["81348338",0x14EA],
+  ["81348339",0x14EB],
+  ["81348430",0x14EC],
+  ["81348431",0x14ED],
+  ["81348432",0x14EE],
+  ["81348433",0x14EF],
+  ["81348434",0x14F0],
+  ["81348435",0x14F1],
+  ["81348436",0x14F2],
+  ["81348437",0x14F3],
+  ["81348438",0x14F4],
+  ["81348439",0x14F5],
+  ["81348530",0x14F6],
+  ["81348531",0x14F7],
+  ["81348532",0x14F8],
+  ["81348533",0x14F9],
+  ["81348534",0x14FA],
+  ["81348535",0x14FB],
+  ["81348536",0x14FC],
+  ["81348537",0x14FD],
+  ["81348538",0x14FE],
+  ["81348539",0x14FF],
+  ["81348630",0x1500],
+  ["81348631",0x1501],
+  ["81348632",0x1502],
+  ["81348633",0x1503],
+  ["81348634",0x1504],
+  ["81348635",0x1505],
+  ["81348636",0x1506],
+  ["81348637",0x1507],
+  ["81348638",0x1508],
+  ["81348639",0x1509],
+  ["81348730",0x150A],
+  ["81348731",0x150B],
+  ["81348732",0x150C],
+  ["81348733",0x150D],
+  ["81348734",0x150E],
+  ["81348735",0x150F],
+  ["81348736",0x1510],
+  ["81348737",0x1511],
+  ["81348738",0x1512],
+  ["81348739",0x1513],
+  ["81348830",0x1514],
+  ["81348831",0x1515],
+  ["81348832",0x1516],
+  ["81348833",0x1517],
+  ["81348834",0x1518],
+  ["81348835",0x1519],
+  ["81348836",0x151A],
+  ["81348837",0x151B],
+  ["81348838",0x151C],
+  ["81348839",0x151D],
+  ["81348930",0x151E],
+  ["81348931",0x151F],
+  ["81348932",0x1520],
+  ["81348933",0x1521],
+  ["81348934",0x1522],
+  ["81348935",0x1523],
+  ["81348936",0x1524],
+  ["81348937",0x1525],
+  ["81348938",0x1526],
+  ["81348939",0x1527],
+  ["81348A30",0x1528],
+  ["81348A31",0x1529],
+  ["81348A32",0x152A],
+  ["81348A33",0x152B],
+  ["81348A34",0x152C],
+  ["81348A35",0x152D],
+  ["81348A36",0x152E],
+  ["81348A37",0x152F],
+  ["81348A38",0x1530],
+  ["81348A39",0x1531],
+  ["81348B30",0x1532],
+  ["81348B31",0x1533],
+  ["81348B32",0x1534],
+  ["81348B33",0x1535],
+  ["81348B34",0x1536],
+  ["81348B35",0x1537],
+  ["81348B36",0x1538],
+  ["81348B37",0x1539],
+  ["81348B38",0x153A],
+  ["81348B39",0x153B],
+  ["81348C30",0x153C],
+  ["81348C31",0x153D],
+  ["81348C32",0x153E],
+  ["81348C33",0x153F],
+  ["81348C34",0x1540],
+  ["81348C35",0x1541],
+  ["81348C36",0x1542],
+  ["81348C37",0x1543],
+  ["81348C38",0x1544],
+  ["81348C39",0x1545],
+  ["81348D30",0x1546],
+  ["81348D31",0x1547],
+  ["81348D32",0x1548],
+  ["81348D33",0x1549],
+  ["81348D34",0x154A],
+  ["81348D35",0x154B],
+  ["81348D36",0x154C],
+  ["81348D37",0x154D],
+  ["81348D38",0x154E],
+  ["81348D39",0x154F],
+  ["81348E30",0x1550],
+  ["81348E31",0x1551],
+  ["81348E32",0x1552],
+  ["81348E33",0x1553],
+  ["81348E34",0x1554],
+  ["81348E35",0x1555],
+  ["81348E36",0x1556],
+  ["81348E37",0x1557],
+  ["81348E38",0x1558],
+  ["81348E39",0x1559],
+  ["81348F30",0x155A],
+  ["81348F31",0x155B],
+  ["81348F32",0x155C],
+  ["81348F33",0x155D],
+  ["81348F34",0x155E],
+  ["81348F35",0x155F],
+  ["81348F36",0x1560],
+  ["81348F37",0x1561],
+  ["81348F38",0x1562],
+  ["81348F39",0x1563],
+  ["81349030",0x1564],
+  ["81349031",0x1565],
+  ["81349032",0x1566],
+  ["81349033",0x1567],
+  ["81349034",0x1568],
+  ["81349035",0x1569],
+  ["81349036",0x156A],
+  ["81349037",0x156B],
+  ["81349038",0x156C],
+  ["81349039",0x156D],
+  ["81349130",0x156E],
+  ["81349131",0x156F],
+  ["81349132",0x1570],
+  ["81349133",0x1571],
+  ["81349134",0x1572],
+  ["81349135",0x1573],
+  ["81349136",0x1574],
+  ["81349137",0x1575],
+  ["81349138",0x1576],
+  ["81349139",0x1577],
+  ["81349230",0x1578],
+  ["81349231",0x1579],
+  ["81349232",0x157A],
+  ["81349233",0x157B],
+  ["81349234",0x157C],
+  ["81349235",0x157D],
+  ["81349236",0x157E],
+  ["81349237",0x157F],
+  ["81349238",0x1580],
+  ["81349239",0x1581],
+  ["81349330",0x1582],
+  ["81349331",0x1583],
+  ["81349332",0x1584],
+  ["81349333",0x1585],
+  ["81349334",0x1586],
+  ["81349335",0x1587],
+  ["81349336",0x1588],
+  ["81349337",0x1589],
+  ["81349338",0x158A],
+  ["81349339",0x158B],
+  ["81349430",0x158C],
+  ["81349431",0x158D],
+  ["81349432",0x158E],
+  ["81349433",0x158F],
+  ["81349434",0x1590],
+  ["81349435",0x1591],
+  ["81349436",0x1592],
+  ["81349437",0x1593],
+  ["81349438",0x1594],
+  ["81349439",0x1595],
+  ["81349530",0x1596],
+  ["81349531",0x1597],
+  ["81349532",0x1598],
+  ["81349533",0x1599],
+  ["81349534",0x159A],
+  ["81349535",0x159B],
+  ["81349536",0x159C],
+  ["81349537",0x159D],
+  ["81349538",0x159E],
+  ["81349539",0x159F],
+  ["81349630",0x15A0],
+  ["81349631",0x15A1],
+  ["81349632",0x15A2],
+  ["81349633",0x15A3],
+  ["81349634",0x15A4],
+  ["81349635",0x15A5],
+  ["81349636",0x15A6],
+  ["81349637",0x15A7],
+  ["81349638",0x15A8],
+  ["81349639",0x15A9],
+  ["81349730",0x15AA],
+  ["81349731",0x15AB],
+  ["81349732",0x15AC],
+  ["81349733",0x15AD],
+  ["81349734",0x15AE],
+  ["81349735",0x15AF],
+  ["81349736",0x15B0],
+  ["81349737",0x15B1],
+  ["81349738",0x15B2],
+  ["81349739",0x15B3],
+  ["81349830",0x15B4],
+  ["81349831",0x15B5],
+  ["81349832",0x15B6],
+  ["81349833",0x15B7],
+  ["81349834",0x15B8],
+  ["81349835",0x15B9],
+  ["81349836",0x15BA],
+  ["81349837",0x15BB],
+  ["81349838",0x15BC],
+  ["81349839",0x15BD],
+  ["81349930",0x15BE],
+  ["81349931",0x15BF],
+  ["81349932",0x15C0],
+  ["81349933",0x15C1],
+  ["81349934",0x15C2],
+  ["81349935",0x15C3],
+  ["81349936",0x15C4],
+  ["81349937",0x15C5],
+  ["81349938",0x15C6],
+  ["81349939",0x15C7],
+  ["81349A30",0x15C8],
+  ["81349A31",0x15C9],
+  ["81349A32",0x15CA],
+  ["81349A33",0x15CB],
+  ["81349A34",0x15CC],
+  ["81349A35",0x15CD],
+  ["81349A36",0x15CE],
+  ["81349A37",0x15CF],
+  ["81349A38",0x15D0],
+  ["81349A39",0x15D1],
+  ["81349B30",0x15D2],
+  ["81349B31",0x15D3],
+  ["81349B32",0x15D4],
+  ["81349B33",0x15D5],
+  ["81349B34",0x15D6],
+  ["81349B35",0x15D7],
+  ["81349B36",0x15D8],
+  ["81349B37",0x15D9],
+  ["81349B38",0x15DA],
+  ["81349B39",0x15DB],
+  ["81349C30",0x15DC],
+  ["81349C31",0x15DD],
+  ["81349C32",0x15DE],
+  ["81349C33",0x15DF],
+  ["81349C34",0x15E0],
+  ["81349C35",0x15E1],
+  ["81349C36",0x15E2],
+  ["81349C37",0x15E3],
+  ["81349C38",0x15E4],
+  ["81349C39",0x15E5],
+  ["81349D30",0x15E6],
+  ["81349D31",0x15E7],
+  ["81349D32",0x15E8],
+  ["81349D33",0x15E9],
+  ["81349D34",0x15EA],
+  ["81349D35",0x15EB],
+  ["81349D36",0x15EC],
+  ["81349D37",0x15ED],
+  ["81349D38",0x15EE],
+  ["81349D39",0x15EF],
+  ["81349E30",0x15F0],
+  ["81349E31",0x15F1],
+  ["81349E32",0x15F2],
+  ["81349E33",0x15F3],
+  ["81349E34",0x15F4],
+  ["81349E35",0x15F5],
+  ["81349E36",0x15F6],
+  ["81349E37",0x15F7],
+  ["81349E38",0x15F8],
+  ["81349E39",0x15F9],
+  ["81349F30",0x15FA],
+  ["81349F31",0x15FB],
+  ["81349F32",0x15FC],
+  ["81349F33",0x15FD],
+  ["81349F34",0x15FE],
+  ["81349F35",0x15FF],
+  ["81349F36",0x1600],
+  ["81349F37",0x1601],
+  ["81349F38",0x1602],
+  ["81349F39",0x1603],
+  ["8134A030",0x1604],
+  ["8134A031",0x1605],
+  ["8134A032",0x1606],
+  ["8134A033",0x1607],
+  ["8134A034",0x1608],
+  ["8134A035",0x1609],
+  ["8134A036",0x160A],
+  ["8134A037",0x160B],
+  ["8134A038",0x160C],
+  ["8134A039",0x160D],
+  ["8134A130",0x160E],
+  ["8134A131",0x160F],
+  ["8134A132",0x1610],
+  ["8134A133",0x1611],
+  ["8134A134",0x1612],
+  ["8134A135",0x1613],
+  ["8134A136",0x1614],
+  ["8134A137",0x1615],
+  ["8134A138",0x1616],
+  ["8134A139",0x1617],
+  ["8134A230",0x1618],
+  ["8134A231",0x1619],
+  ["8134A232",0x161A],
+  ["8134A233",0x161B],
+  ["8134A234",0x161C],
+  ["8134A235",0x161D],
+  ["8134A236",0x161E],
+  ["8134A237",0x161F],
+  ["8134A238",0x1620],
+  ["8134A239",0x1621],
+  ["8134A330",0x1622],
+  ["8134A331",0x1623],
+  ["8134A332",0x1624],
+  ["8134A333",0x1625],
+  ["8134A334",0x1626],
+  ["8134A335",0x1627],
+  ["8134A336",0x1628],
+  ["8134A337",0x1629],
+  ["8134A338",0x162A],
+  ["8134A339",0x162B],
+  ["8134A430",0x162C],
+  ["8134A431",0x162D],
+  ["8134A432",0x162E],
+  ["8134A433",0x162F],
+  ["8134A434",0x1630],
+  ["8134A435",0x1631],
+  ["8134A436",0x1632],
+  ["8134A437",0x1633],
+  ["8134A438",0x1634],
+  ["8134A439",0x1635],
+  ["8134A530",0x1636],
+  ["8134A531",0x1637],
+  ["8134A532",0x1638],
+  ["8134A533",0x1639],
+  ["8134A534",0x163A],
+  ["8134A535",0x163B],
+  ["8134A536",0x163C],
+  ["8134A537",0x163D],
+  ["8134A538",0x163E],
+  ["8134A539",0x163F],
+  ["8134A630",0x1640],
+  ["8134A631",0x1641],
+  ["8134A632",0x1642],
+  ["8134A633",0x1643],
+  ["8134A634",0x1644],
+  ["8134A635",0x1645],
+  ["8134A636",0x1646],
+  ["8134A637",0x1647],
+  ["8134A638",0x1648],
+  ["8134A639",0x1649],
+  ["8134A730",0x164A],
+  ["8134A731",0x164B],
+  ["8134A732",0x164C],
+  ["8134A733",0x164D],
+  ["8134A734",0x164E],
+  ["8134A735",0x164F],
+  ["8134A736",0x1650],
+  ["8134A737",0x1651],
+  ["8134A738",0x1652],
+  ["8134A739",0x1653],
+  ["8134A830",0x1654],
+  ["8134A831",0x1655],
+  ["8134A832",0x1656],
+  ["8134A833",0x1657],
+  ["8134A834",0x1658],
+  ["8134A835",0x1659],
+  ["8134A836",0x165A],
+  ["8134A837",0x165B],
+  ["8134A838",0x165C],
+  ["8134A839",0x165D],
+  ["8134A930",0x165E],
+  ["8134A931",0x165F],
+  ["8134A932",0x1660],
+  ["8134A933",0x1661],
+  ["8134A934",0x1662],
+  ["8134A935",0x1663],
+  ["8134A936",0x1664],
+  ["8134A937",0x1665],
+  ["8134A938",0x1666],
+  ["8134A939",0x1667],
+  ["8134AA30",0x1668],
+  ["8134AA31",0x1669],
+  ["8134AA32",0x166A],
+  ["8134AA33",0x166B],
+  ["8134AA34",0x166C],
+  ["8134AA35",0x166D],
+  ["8134AA36",0x166E],
+  ["8134AA37",0x166F],
+  ["8134AA38",0x1670],
+  ["8134AA39",0x1671],
+  ["8134AB30",0x1672],
+  ["8134AB31",0x1673],
+  ["8134AB32",0x1674],
+  ["8134AB33",0x1675],
+  ["8134AB34",0x1676],
+  ["8134AB35",0x1677],
+  ["8134AB36",0x1678],
+  ["8134AB37",0x1679],
+  ["8134AB38",0x167A],
+  ["8134AB39",0x167B],
+  ["8134AC30",0x167C],
+  ["8134AC31",0x167D],
+  ["8134AC32",0x167E],
+  ["8134AC33",0x167F],
+  ["8134AC34",0x1680],
+  ["8134AC35",0x1681],
+  ["8134AC36",0x1682],
+  ["8134AC37",0x1683],
+  ["8134AC38",0x1684],
+  ["8134AC39",0x1685],
+  ["8134AD30",0x1686],
+  ["8134AD31",0x1687],
+  ["8134AD32",0x1688],
+  ["8134AD33",0x1689],
+  ["8134AD34",0x168A],
+  ["8134AD35",0x168B],
+  ["8134AD36",0x168C],
+  ["8134AD37",0x168D],
+  ["8134AD38",0x168E],
+  ["8134AD39",0x168F],
+  ["8134AE30",0x1690],
+  ["8134AE31",0x1691],
+  ["8134AE32",0x1692],
+  ["8134AE33",0x1693],
+  ["8134AE34",0x1694],
+  ["8134AE35",0x1695],
+  ["8134AE36",0x1696],
+  ["8134AE37",0x1697],
+  ["8134AE38",0x1698],
+  ["8134AE39",0x1699],
+  ["8134AF30",0x169A],
+  ["8134AF31",0x169B],
+  ["8134AF32",0x169C],
+  ["8134AF33",0x169D],
+  ["8134AF34",0x169E],
+  ["8134AF35",0x169F],
+  ["8134AF36",0x16A0],
+  ["8134AF37",0x16A1],
+  ["8134AF38",0x16A2],
+  ["8134AF39",0x16A3],
+  ["8134B030",0x16A4],
+  ["8134B031",0x16A5],
+  ["8134B032",0x16A6],
+  ["8134B033",0x16A7],
+  ["8134B034",0x16A8],
+  ["8134B035",0x16A9],
+  ["8134B036",0x16AA],
+  ["8134B037",0x16AB],
+  ["8134B038",0x16AC],
+  ["8134B039",0x16AD],
+  ["8134B130",0x16AE],
+  ["8134B131",0x16AF],
+  ["8134B132",0x16B0],
+  ["8134B133",0x16B1],
+  ["8134B134",0x16B2],
+  ["8134B135",0x16B3],
+  ["8134B136",0x16B4],
+  ["8134B137",0x16B5],
+  ["8134B138",0x16B6],
+  ["8134B139",0x16B7],
+  ["8134B230",0x16B8],
+  ["8134B231",0x16B9],
+  ["8134B232",0x16BA],
+  ["8134B233",0x16BB],
+  ["8134B234",0x16BC],
+  ["8134B235",0x16BD],
+  ["8134B236",0x16BE],
+  ["8134B237",0x16BF],
+  ["8134B238",0x16C0],
+  ["8134B239",0x16C1],
+  ["8134B330",0x16C2],
+  ["8134B331",0x16C3],
+  ["8134B332",0x16C4],
+  ["8134B333",0x16C5],
+  ["8134B334",0x16C6],
+  ["8134B335",0x16C7],
+  ["8134B336",0x16C8],
+  ["8134B337",0x16C9],
+  ["8134B338",0x16CA],
+  ["8134B339",0x16CB],
+  ["8134B430",0x16CC],
+  ["8134B431",0x16CD],
+  ["8134B432",0x16CE],
+  ["8134B433",0x16CF],
+  ["8134B434",0x16D0],
+  ["8134B435",0x16D1],
+  ["8134B436",0x16D2],
+  ["8134B437",0x16D3],
+  ["8134B438",0x16D4],
+  ["8134B439",0x16D5],
+  ["8134B530",0x16D6],
+  ["8134B531",0x16D7],
+  ["8134B532",0x16D8],
+  ["8134B533",0x16D9],
+  ["8134B534",0x16DA],
+  ["8134B535",0x16DB],
+  ["8134B536",0x16DC],
+  ["8134B537",0x16DD],
+  ["8134B538",0x16DE],
+  ["8134B539",0x16DF],
+  ["8134B630",0x16E0],
+  ["8134B631",0x16E1],
+  ["8134B632",0x16E2],
+  ["8134B633",0x16E3],
+  ["8134B634",0x16E4],
+  ["8134B635",0x16E5],
+  ["8134B636",0x16E6],
+  ["8134B637",0x16E7],
+  ["8134B638",0x16E8],
+  ["8134B639",0x16E9],
+  ["8134B730",0x16EA],
+  ["8134B731",0x16EB],
+  ["8134B732",0x16EC],
+  ["8134B733",0x16ED],
+  ["8134B734",0x16EE],
+  ["8134B735",0x16EF],
+  ["8134B736",0x16F0],
+  ["8134B737",0x16F1],
+  ["8134B738",0x16F2],
+  ["8134B739",0x16F3],
+  ["8134B830",0x16F4],
+  ["8134B831",0x16F5],
+  ["8134B832",0x16F6],
+  ["8134B833",0x16F7],
+  ["8134B834",0x16F8],
+  ["8134B835",0x16F9],
+  ["8134B836",0x16FA],
+  ["8134B837",0x16FB],
+  ["8134B838",0x16FC],
+  ["8134B839",0x16FD],
+  ["8134B930",0x16FE],
+  ["8134B931",0x16FF],
+  ["8134B932",0x1700],
+  ["8134B933",0x1701],
+  ["8134B934",0x1702],
+  ["8134B935",0x1703],
+  ["8134B936",0x1704],
+  ["8134B937",0x1705],
+  ["8134B938",0x1706],
+  ["8134B939",0x1707],
+  ["8134BA30",0x1708],
+  ["8134BA31",0x1709],
+  ["8134BA32",0x170A],
+  ["8134BA33",0x170B],
+  ["8134BA34",0x170C],
+  ["8134BA35",0x170D],
+  ["8134BA36",0x170E],
+  ["8134BA37",0x170F],
+  ["8134BA38",0x1710],
+  ["8134BA39",0x1711],
+  ["8134BB30",0x1712],
+  ["8134BB31",0x1713],
+  ["8134BB32",0x1714],
+  ["8134BB33",0x1715],
+  ["8134BB34",0x1716],
+  ["8134BB35",0x1717],
+  ["8134BB36",0x1718],
+  ["8134BB37",0x1719],
+  ["8134BB38",0x171A],
+  ["8134BB39",0x171B],
+  ["8134BC30",0x171C],
+  ["8134BC31",0x171D],
+  ["8134BC32",0x171E],
+  ["8134BC33",0x171F],
+  ["8134BC34",0x1720],
+  ["8134BC35",0x1721],
+  ["8134BC36",0x1722],
+  ["8134BC37",0x1723],
+  ["8134BC38",0x1724],
+  ["8134BC39",0x1725],
+  ["8134BD30",0x1726],
+  ["8134BD31",0x1727],
+  ["8134BD32",0x1728],
+  ["8134BD33",0x1729],
+  ["8134BD34",0x172A],
+  ["8134BD35",0x172B],
+  ["8134BD36",0x172C],
+  ["8134BD37",0x172D],
+  ["8134BD38",0x172E],
+  ["8134BD39",0x172F],
+  ["8134BE30",0x1730],
+  ["8134BE31",0x1731],
+  ["8134BE32",0x1732],
+  ["8134BE33",0x1733],
+  ["8134BE34",0x1734],
+  ["8134BE35",0x1735],
+  ["8134BE36",0x1736],
+  ["8134BE37",0x1737],
+  ["8134BE38",0x1738],
+  ["8134BE39",0x1739],
+  ["8134BF30",0x173A],
+  ["8134BF31",0x173B],
+  ["8134BF32",0x173C],
+  ["8134BF33",0x173D],
+  ["8134BF34",0x173E],
+  ["8134BF35",0x173F],
+  ["8134BF36",0x1740],
+  ["8134BF37",0x1741],
+  ["8134BF38",0x1742],
+  ["8134BF39",0x1743],
+  ["8134C030",0x1744],
+  ["8134C031",0x1745],
+  ["8134C032",0x1746],
+  ["8134C033",0x1747],
+  ["8134C034",0x1748],
+  ["8134C035",0x1749],
+  ["8134C036",0x174A],
+  ["8134C037",0x174B],
+  ["8134C038",0x174C],
+  ["8134C039",0x174D],
+  ["8134C130",0x174E],
+  ["8134C131",0x174F],
+  ["8134C132",0x1750],
+  ["8134C133",0x1751],
+  ["8134C134",0x1752],
+  ["8134C135",0x1753],
+  ["8134C136",0x1754],
+  ["8134C137",0x1755],
+  ["8134C138",0x1756],
+  ["8134C139",0x1757],
+  ["8134C230",0x1758],
+  ["8134C231",0x1759],
+  ["8134C232",0x175A],
+  ["8134C233",0x175B],
+  ["8134C234",0x175C],
+  ["8134C235",0x175D],
+  ["8134C236",0x175E],
+  ["8134C237",0x175F],
+  ["8134C238",0x1760],
+  ["8134C239",0x1761],
+  ["8134C330",0x1762],
+  ["8134C331",0x1763],
+  ["8134C332",0x1764],
+  ["8134C333",0x1765],
+  ["8134C334",0x1766],
+  ["8134C335",0x1767],
+  ["8134C336",0x1768],
+  ["8134C337",0x1769],
+  ["8134C338",0x176A],
+  ["8134C339",0x176B],
+  ["8134C430",0x176C],
+  ["8134C431",0x176D],
+  ["8134C432",0x176E],
+  ["8134C433",0x176F],
+  ["8134C434",0x1770],
+  ["8134C435",0x1771],
+  ["8134C436",0x1772],
+  ["8134C437",0x1773],
+  ["8134C438",0x1774],
+  ["8134C439",0x1775],
+  ["8134C530",0x1776],
+  ["8134C531",0x1777],
+  ["8134C532",0x1778],
+  ["8134C533",0x1779],
+  ["8134C534",0x177A],
+  ["8134C535",0x177B],
+  ["8134C536",0x177C],
+  ["8134C537",0x177D],
+  ["8134C538",0x177E],
+  ["8134C539",0x177F],
+  ["8134C630",0x1780],
+  ["8134C631",0x1781],
+  ["8134C632",0x1782],
+  ["8134C633",0x1783],
+  ["8134C634",0x1784],
+  ["8134C635",0x1785],
+  ["8134C636",0x1786],
+  ["8134C637",0x1787],
+  ["8134C638",0x1788],
+  ["8134C639",0x1789],
+  ["8134C730",0x178A],
+  ["8134C731",0x178B],
+  ["8134C732",0x178C],
+  ["8134C733",0x178D],
+  ["8134C734",0x178E],
+  ["8134C735",0x178F],
+  ["8134C736",0x1790],
+  ["8134C737",0x1791],
+  ["8134C738",0x1792],
+  ["8134C739",0x1793],
+  ["8134C830",0x1794],
+  ["8134C831",0x1795],
+  ["8134C832",0x1796],
+  ["8134C833",0x1797],
+  ["8134C834",0x1798],
+  ["8134C835",0x1799],
+  ["8134C836",0x179A],
+  ["8134C837",0x179B],
+  ["8134C838",0x179C],
+  ["8134C839",0x179D],
+  ["8134C930",0x179E],
+  ["8134C931",0x179F],
+  ["8134C932",0x17A0],
+  ["8134C933",0x17A1],
+  ["8134C934",0x17A2],
+  ["8134C935",0x17A3],
+  ["8134C936",0x17A4],
+  ["8134C937",0x17A5],
+  ["8134C938",0x17A6],
+  ["8134C939",0x17A7],
+  ["8134CA30",0x17A8],
+  ["8134CA31",0x17A9],
+  ["8134CA32",0x17AA],
+  ["8134CA33",0x17AB],
+  ["8134CA34",0x17AC],
+  ["8134CA35",0x17AD],
+  ["8134CA36",0x17AE],
+  ["8134CA37",0x17AF],
+  ["8134CA38",0x17B0],
+  ["8134CA39",0x17B1],
+  ["8134CB30",0x17B2],
+  ["8134CB31",0x17B3],
+  ["8134CB32",0x17B4],
+  ["8134CB33",0x17B5],
+  ["8134CB34",0x17B6],
+  ["8134CB35",0x17B7],
+  ["8134CB36",0x17B8],
+  ["8134CB37",0x17B9],
+  ["8134CB38",0x17BA],
+  ["8134CB39",0x17BB],
+  ["8134CC30",0x17BC],
+  ["8134CC31",0x17BD],
+  ["8134CC32",0x17BE],
+  ["8134CC33",0x17BF],
+  ["8134CC34",0x17C0],
+  ["8134CC35",0x17C1],
+  ["8134CC36",0x17C2],
+  ["8134CC37",0x17C3],
+  ["8134CC38",0x17C4],
+  ["8134CC39",0x17C5],
+  ["8134CD30",0x17C6],
+  ["8134CD31",0x17C7],
+  ["8134CD32",0x17C8],
+  ["8134CD33",0x17C9],
+  ["8134CD34",0x17CA],
+  ["8134CD35",0x17CB],
+  ["8134CD36",0x17CC],
+  ["8134CD37",0x17CD],
+  ["8134CD38",0x17CE],
+  ["8134CD39",0x17CF],
+  ["8134CE30",0x17D0],
+  ["8134CE31",0x17D1],
+  ["8134CE32",0x17D2],
+  ["8134CE33",0x17D3],
+  ["8134CE34",0x17D4],
+  ["8134CE35",0x17D5],
+  ["8134CE36",0x17D6],
+  ["8134CE37",0x17D7],
+  ["8134CE38",0x17D8],
+  ["8134CE39",0x17D9],
+  ["8134CF30",0x17DA],
+  ["8134CF31",0x17DB],
+  ["8134CF32",0x17DC],
+  ["8134CF33",0x17DD],
+  ["8134CF34",0x17DE],
+  ["8134CF35",0x17DF],
+  ["8134CF36",0x17E0],
+  ["8134CF37",0x17E1],
+  ["8134CF38",0x17E2],
+  ["8134CF39",0x17E3],
+  ["8134D030",0x17E4],
+  ["8134D031",0x17E5],
+  ["8134D032",0x17E6],
+  ["8134D033",0x17E7],
+  ["8134D034",0x17E8],
+  ["8134D035",0x17E9],
+  ["8134D036",0x17EA],
+  ["8134D037",0x17EB],
+  ["8134D038",0x17EC],
+  ["8134D039",0x17ED],
+  ["8134D130",0x17EE],
+  ["8134D131",0x17EF],
+  ["8134D132",0x17F0],
+  ["8134D133",0x17F1],
+  ["8134D134",0x17F2],
+  ["8134D135",0x17F3],
+  ["8134D136",0x17F4],
+  ["8134D137",0x17F5],
+  ["8134D138",0x17F6],
+  ["8134D139",0x17F7],
+  ["8134D230",0x17F8],
+  ["8134D231",0x17F9],
+  ["8134D232",0x17FA],
+  ["8134D233",0x17FB],
+  ["8134D234",0x17FC],
+  ["8134D235",0x17FD],
+  ["8134D236",0x17FE],
+  ["8134D237",0x17FF],
+  ["8134D238",0x1800],
+  ["8134D239",0x1801],
+  ["8134D330",0x1802],
+  ["8134D331",0x1803],
+  ["8134D332",0x1804],
+  ["8134D333",0x1805],
+  ["8134D334",0x1806],
+  ["8134D335",0x1807],
+  ["8134D336",0x1808],
+  ["8134D337",0x1809],
+  ["8134D338",0x180A],
+  ["8134D339",0x180B],
+  ["8134D430",0x180C],
+  ["8134D431",0x180D],
+  ["8134D432",0x180E],
+  ["8134D433",0x180F],
+  ["8134D434",0x1810],
+  ["8134D435",0x1811],
+  ["8134D436",0x1812],
+  ["8134D437",0x1813],
+  ["8134D438",0x1814],
+  ["8134D439",0x1815],
+  ["8134D530",0x1816],
+  ["8134D531",0x1817],
+  ["8134D532",0x1818],
+  ["8134D533",0x1819],
+  ["8134D534",0x181A],
+  ["8134D535",0x181B],
+  ["8134D536",0x181C],
+  ["8134D537",0x181D],
+  ["8134D538",0x181E],
+  ["8134D539",0x181F],
+  ["8134D630",0x1820],
+  ["8134D631",0x1821],
+  ["8134D632",0x1822],
+  ["8134D633",0x1823],
+  ["8134D634",0x1824],
+  ["8134D635",0x1825],
+  ["8134D636",0x1826],
+  ["8134D637",0x1827],
+  ["8134D638",0x1828],
+  ["8134D639",0x1829],
+  ["8134D730",0x182A],
+  ["8134D731",0x182B],
+  ["8134D732",0x182C],
+  ["8134D733",0x182D],
+  ["8134D734",0x182E],
+  ["8134D735",0x182F],
+  ["8134D736",0x1830],
+  ["8134D737",0x1831],
+  ["8134D738",0x1832],
+  ["8134D739",0x1833],
+  ["8134D830",0x1834],
+  ["8134D831",0x1835],
+  ["8134D832",0x1836],
+  ["8134D833",0x1837],
+  ["8134D834",0x1838],
+  ["8134D835",0x1839],
+  ["8134D836",0x183A],
+  ["8134D837",0x183B],
+  ["8134D838",0x183C],
+  ["8134D839",0x183D],
+  ["8134D930",0x183E],
+  ["8134D931",0x183F],
+  ["8134D932",0x1840],
+  ["8134D933",0x1841],
+  ["8134D934",0x1842],
+  ["8134D935",0x1843],
+  ["8134D936",0x1844],
+  ["8134D937",0x1845],
+  ["8134D938",0x1846],
+  ["8134D939",0x1847],
+  ["8134DA30",0x1848],
+  ["8134DA31",0x1849],
+  ["8134DA32",0x184A],
+  ["8134DA33",0x184B],
+  ["8134DA34",0x184C],
+  ["8134DA35",0x184D],
+  ["8134DA36",0x184E],
+  ["8134DA37",0x184F],
+  ["8134DA38",0x1850],
+  ["8134DA39",0x1851],
+  ["8134DB30",0x1852],
+  ["8134DB31",0x1853],
+  ["8134DB32",0x1854],
+  ["8134DB33",0x1855],
+  ["8134DB34",0x1856],
+  ["8134DB35",0x1857],
+  ["8134DB36",0x1858],
+  ["8134DB37",0x1859],
+  ["8134DB38",0x185A],
+  ["8134DB39",0x185B],
+  ["8134DC30",0x185C],
+  ["8134DC31",0x185D],
+  ["8134DC32",0x185E],
+  ["8134DC33",0x185F],
+  ["8134DC34",0x1860],
+  ["8134DC35",0x1861],
+  ["8134DC36",0x1862],
+  ["8134DC37",0x1863],
+  ["8134DC38",0x1864],
+  ["8134DC39",0x1865],
+  ["8134DD30",0x1866],
+  ["8134DD31",0x1867],
+  ["8134DD32",0x1868],
+  ["8134DD33",0x1869],
+  ["8134DD34",0x186A],
+  ["8134DD35",0x186B],
+  ["8134DD36",0x186C],
+  ["8134DD37",0x186D],
+  ["8134DD38",0x186E],
+  ["8134DD39",0x186F],
+  ["8134DE30",0x1870],
+  ["8134DE31",0x1871],
+  ["8134DE32",0x1872],
+  ["8134DE33",0x1873],
+  ["8134DE34",0x1874],
+  ["8134DE35",0x1875],
+  ["8134DE36",0x1876],
+  ["8134DE37",0x1877],
+  ["8134DE38",0x1878],
+  ["8134DE39",0x1879],
+  ["8134DF30",0x187A],
+  ["8134DF31",0x187B],
+  ["8134DF32",0x187C],
+  ["8134DF33",0x187D],
+  ["8134DF34",0x187E],
+  ["8134DF35",0x187F],
+  ["8134DF36",0x1880],
+  ["8134DF37",0x1881],
+  ["8134DF38",0x1882],
+  ["8134DF39",0x1883],
+  ["8134E030",0x1884],
+  ["8134E031",0x1885],
+  ["8134E032",0x1886],
+  ["8134E033",0x1887],
+  ["8134E034",0x1888],
+  ["8134E035",0x1889],
+  ["8134E036",0x188A],
+  ["8134E037",0x188B],
+  ["8134E038",0x188C],
+  ["8134E039",0x188D],
+  ["8134E130",0x188E],
+  ["8134E131",0x188F],
+  ["8134E132",0x1890],
+  ["8134E133",0x1891],
+  ["8134E134",0x1892],
+  ["8134E135",0x1893],
+  ["8134E136",0x1894],
+  ["8134E137",0x1895],
+  ["8134E138",0x1896],
+  ["8134E139",0x1897],
+  ["8134E230",0x1898],
+  ["8134E231",0x1899],
+  ["8134E232",0x189A],
+  ["8134E233",0x189B],
+  ["8134E234",0x189C],
+  ["8134E235",0x189D],
+  ["8134E236",0x189E],
+  ["8134E237",0x189F],
+  ["8134E238",0x18A0],
+  ["8134E239",0x18A1],
+  ["8134E330",0x18A2],
+  ["8134E331",0x18A3],
+  ["8134E332",0x18A4],
+  ["8134E333",0x18A5],
+  ["8134E334",0x18A6],
+  ["8134E335",0x18A7],
+  ["8134E336",0x18A8],
+  ["8134E337",0x18A9],
+  ["8134E338",0x18AA],
+  ["8134E339",0x18AB],
+  ["8134E430",0x18AC],
+  ["8134E431",0x18AD],
+  ["8134E432",0x18AE],
+  ["8134E433",0x18AF],
+  ["8134E434",0x18B0],
+  ["8134E435",0x18B1],
+  ["8134E436",0x18B2],
+  ["8134E437",0x18B3],
+  ["8134E438",0x18B4],
+  ["8134E439",0x18B5],
+  ["8134E530",0x18B6],
+  ["8134E531",0x18B7],
+  ["8134E532",0x18B8],
+  ["8134E533",0x18B9],
+  ["8134E534",0x18BA],
+  ["8134E535",0x18BB],
+  ["8134E536",0x18BC],
+  ["8134E537",0x18BD],
+  ["8134E538",0x18BE],
+  ["8134E539",0x18BF],
+  ["8134E630",0x18C0],
+  ["8134E631",0x18C1],
+  ["8134E632",0x18C2],
+  ["8134E633",0x18C3],
+  ["8134E634",0x18C4],
+  ["8134E635",0x18C5],
+  ["8134E636",0x18C6],
+  ["8134E637",0x18C7],
+  ["8134E638",0x18C8],
+  ["8134E639",0x18C9],
+  ["8134E730",0x18CA],
+  ["8134E731",0x18CB],
+  ["8134E732",0x18CC],
+  ["8134E733",0x18CD],
+  ["8134E734",0x18CE],
+  ["8134E735",0x18CF],
+  ["8134E736",0x18D0],
+  ["8134E737",0x18D1],
+  ["8134E738",0x18D2],
+  ["8134E739",0x18D3],
+  ["8134E830",0x18D4],
+  ["8134E831",0x18D5],
+  ["8134E832",0x18D6],
+  ["8134E833",0x18D7],
+  ["8134E834",0x18D8],
+  ["8134E835",0x18D9],
+  ["8134E836",0x18DA],
+  ["8134E837",0x18DB],
+  ["8134E838",0x18DC],
+  ["8134E839",0x18DD],
+  ["8134E930",0x18DE],
+  ["8134E931",0x18DF],
+  ["8134E932",0x18E0],
+  ["8134E933",0x18E1],
+  ["8134E934",0x18E2],
+  ["8134E935",0x18E3],
+  ["8134E936",0x18E4],
+  ["8134E937",0x18E5],
+  ["8134E938",0x18E6],
+  ["8134E939",0x18E7],
+  ["8134EA30",0x18E8],
+  ["8134EA31",0x18E9],
+  ["8134EA32",0x18EA],
+  ["8134EA33",0x18EB],
+  ["8134EA34",0x18EC],
+  ["8134EA35",0x18ED],
+  ["8134EA36",0x18EE],
+  ["8134EA37",0x18EF],
+  ["8134EA38",0x18F0],
+  ["8134EA39",0x18F1],
+  ["8134EB30",0x18F2],
+  ["8134EB31",0x18F3],
+  ["8134EB32",0x18F4],
+  ["8134EB33",0x18F5],
+  ["8134EB34",0x18F6],
+  ["8134EB35",0x18F7],
+  ["8134EB36",0x18F8],
+  ["8134EB37",0x18F9],
+  ["8134EB38",0x18FA],
+  ["8134EB39",0x18FB],
+  ["8134EC30",0x18FC],
+  ["8134EC31",0x18FD],
+  ["8134EC32",0x18FE],
+  ["8134EC33",0x18FF],
+  ["8134EC34",0x1900],
+  ["8134EC35",0x1901],
+  ["8134EC36",0x1902],
+  ["8134EC37",0x1903],
+  ["8134EC38",0x1904],
+  ["8134EC39",0x1905],
+  ["8134ED30",0x1906],
+  ["8134ED31",0x1907],
+  ["8134ED32",0x1908],
+  ["8134ED33",0x1909],
+  ["8134ED34",0x190A],
+  ["8134ED35",0x190B],
+  ["8134ED36",0x190C],
+  ["8134ED37",0x190D],
+  ["8134ED38",0x190E],
+  ["8134ED39",0x190F],
+  ["8134EE30",0x1910],
+  ["8134EE31",0x1911],
+  ["8134EE32",0x1912],
+  ["8134EE33",0x1913],
+  ["8134EE34",0x1914],
+  ["8134EE35",0x1915],
+  ["8134EE36",0x1916],
+  ["8134EE37",0x1917],
+  ["8134EE38",0x1918],
+  ["8134EE39",0x1919],
+  ["8134EF30",0x191A],
+  ["8134EF31",0x191B],
+  ["8134EF32",0x191C],
+  ["8134EF33",0x191D],
+  ["8134EF34",0x191E],
+  ["8134EF35",0x191F],
+  ["8134EF36",0x1920],
+  ["8134EF37",0x1921],
+  ["8134EF38",0x1922],
+  ["8134EF39",0x1923],
+  ["8134F030",0x1924],
+  ["8134F031",0x1925],
+  ["8134F032",0x1926],
+  ["8134F033",0x1927],
+  ["8134F034",0x1928],
+  ["8134F035",0x1929],
+  ["8134F036",0x192A],
+  ["8134F037",0x192B],
+  ["8134F038",0x192C],
+  ["8134F039",0x192D],
+  ["8134F130",0x192E],
+  ["8134F131",0x192F],
+  ["8134F132",0x1930],
+  ["8134F133",0x1931],
+  ["8134F134",0x1932],
+  ["8134F135",0x1933],
+  ["8134F136",0x1934],
+  ["8134F137",0x1935],
+  ["8134F138",0x1936],
+  ["8134F139",0x1937],
+  ["8134F230",0x1938],
+  ["8134F231",0x1939],
+  ["8134F232",0x193A],
+  ["8134F233",0x193B],
+  ["8134F234",0x193C],
+  ["8134F235",0x193D],
+  ["8134F236",0x193E],
+  ["8134F237",0x193F],
+  ["8134F238",0x1940],
+  ["8134F239",0x1941],
+  ["8134F330",0x1942],
+  ["8134F331",0x1943],
+  ["8134F332",0x1944],
+  ["8134F333",0x1945],
+  ["8134F334",0x1946],
+  ["8134F335",0x1947],
+  ["8134F336",0x1948],
+  ["8134F337",0x1949],
+  ["8134F338",0x194A],
+  ["8134F339",0x194B],
+  ["8134F430",0x194C],
+  ["8134F431",0x194D],
+  ["8134F432",0x194E],
+  ["8134F433",0x194F],
+  ["8134F434",0x1950],
+  ["8134F435",0x1951],
+  ["8134F436",0x1952],
+  ["8134F437",0x1953],
+  ["8134F438",0x1954],
+  ["8134F439",0x1955],
+  ["8134F530",0x1956],
+  ["8134F531",0x1957],
+  ["8134F532",0x1958],
+  ["8134F533",0x1959],
+  ["8134F534",0x195A],
+  ["8134F535",0x195B],
+  ["8134F536",0x195C],
+  ["8134F537",0x195D],
+  ["8134F538",0x195E],
+  ["8134F539",0x195F],
+  ["8134F630",0x1960],
+  ["8134F631",0x1961],
+  ["8134F632",0x1962],
+  ["8134F633",0x1963],
+  ["8134F634",0x1964],
+  ["8134F635",0x1965],
+  ["8134F636",0x1966],
+  ["8134F637",0x1967],
+  ["8134F638",0x1968],
+  ["8134F639",0x1969],
+  ["8134F730",0x196A],
+  ["8134F731",0x196B],
+  ["8134F732",0x196C],
+  ["8134F733",0x196D],
+  ["8134F734",0x196E],
+  ["8134F735",0x196F],
+  ["8134F736",0x1970],
+  ["8134F737",0x1971],
+  ["8134F738",0x1972],
+  ["8134F739",0x1973],
+  ["8134F830",0x1974],
+  ["8134F831",0x1975],
+  ["8134F832",0x1976],
+  ["8134F833",0x1977],
+  ["8134F834",0x1978],
+  ["8134F835",0x1979],
+  ["8134F836",0x197A],
+  ["8134F837",0x197B],
+  ["8134F838",0x197C],
+  ["8134F839",0x197D],
+  ["8134F930",0x197E],
+  ["8134F931",0x197F],
+  ["8134F932",0x1980],
+  ["8134F933",0x1981],
+  ["8134F934",0x1982],
+  ["8134F935",0x1983],
+  ["8134F936",0x1984],
+  ["8134F937",0x1985],
+  ["8134F938",0x1986],
+  ["8134F939",0x1987],
+  ["8134FA30",0x1988],
+  ["8134FA31",0x1989],
+  ["8134FA32",0x198A],
+  ["8134FA33",0x198B],
+  ["8134FA34",0x198C],
+  ["8134FA35",0x198D],
+  ["8134FA36",0x198E],
+  ["8134FA37",0x198F],
+  ["8134FA38",0x1990],
+  ["8134FA39",0x1991],
+  ["8134FB30",0x1992],
+  ["8134FB31",0x1993],
+  ["8134FB32",0x1994],
+  ["8134FB33",0x1995],
+  ["8134FB34",0x1996],
+  ["8134FB35",0x1997],
+  ["8134FB36",0x1998],
+  ["8134FB37",0x1999],
+  ["8134FB38",0x199A],
+  ["8134FB39",0x199B],
+  ["8134FC30",0x199C],
+  ["8134FC31",0x199D],
+  ["8134FC32",0x199E],
+  ["8134FC33",0x199F],
+  ["8134FC34",0x19A0],
+  ["8134FC35",0x19A1],
+  ["8134FC36",0x19A2],
+  ["8134FC37",0x19A3],
+  ["8134FC38",0x19A4],
+  ["8134FC39",0x19A5],
+  ["8134FD30",0x19A6],
+  ["8134FD31",0x19A7],
+  ["8134FD32",0x19A8],
+  ["8134FD33",0x19A9],
+  ["8134FD34",0x19AA],
+  ["8134FD35",0x19AB],
+  ["8134FD36",0x19AC],
+  ["8134FD37",0x19AD],
+  ["8134FD38",0x19AE],
+  ["8134FD39",0x19AF],
+  ["8134FE30",0x19B0],
+  ["8134FE31",0x19B1],
+  ["8134FE32",0x19B2],
+  ["8134FE33",0x19B3],
+  ["8134FE34",0x19B4],
+  ["8134FE35",0x19B5],
+  ["8134FE36",0x19B6],
+  ["8134FE37",0x19B7],
+  ["8134FE38",0x19B8],
+  ["8134FE39",0x19B9],
+  ["81358130",0x19BA],
+  ["81358131",0x19BB],
+  ["81358132",0x19BC],
+  ["81358133",0x19BD],
+  ["81358134",0x19BE],
+  ["81358135",0x19BF],
+  ["81358136",0x19C0],
+  ["81358137",0x19C1],
+  ["81358138",0x19C2],
+  ["81358139",0x19C3],
+  ["81358230",0x19C4],
+  ["81358231",0x19C5],
+  ["81358232",0x19C6],
+  ["81358233",0x19C7],
+  ["81358234",0x19C8],
+  ["81358235",0x19C9],
+  ["81358236",0x19CA],
+  ["81358237",0x19CB],
+  ["81358238",0x19CC],
+  ["81358239",0x19CD],
+  ["81358330",0x19CE],
+  ["81358331",0x19CF],
+  ["81358332",0x19D0],
+  ["81358333",0x19D1],
+  ["81358334",0x19D2],
+  ["81358335",0x19D3],
+  ["81358336",0x19D4],
+  ["81358337",0x19D5],
+  ["81358338",0x19D6],
+  ["81358339",0x19D7],
+  ["81358430",0x19D8],
+  ["81358431",0x19D9],
+  ["81358432",0x19DA],
+  ["81358433",0x19DB],
+  ["81358434",0x19DC],
+  ["81358435",0x19DD],
+  ["81358436",0x19DE],
+  ["81358437",0x19DF],
+  ["81358438",0x19E0],
+  ["81358439",0x19E1],
+  ["81358530",0x19E2],
+  ["81358531",0x19E3],
+  ["81358532",0x19E4],
+  ["81358533",0x19E5],
+  ["81358534",0x19E6],
+  ["81358535",0x19E7],
+  ["81358536",0x19E8],
+  ["81358537",0x19E9],
+  ["81358538",0x19EA],
+  ["81358539",0x19EB],
+  ["81358630",0x19EC],
+  ["81358631",0x19ED],
+  ["81358632",0x19EE],
+  ["81358633",0x19EF],
+  ["81358634",0x19F0],
+  ["81358635",0x19F1],
+  ["81358636",0x19F2],
+  ["81358637",0x19F3],
+  ["81358638",0x19F4],
+  ["81358639",0x19F5],
+  ["81358730",0x19F6],
+  ["81358731",0x19F7],
+  ["81358732",0x19F8],
+  ["81358733",0x19F9],
+  ["81358734",0x19FA],
+  ["81358735",0x19FB],
+  ["81358736",0x19FC],
+  ["81358737",0x19FD],
+  ["81358738",0x19FE],
+  ["81358739",0x19FF],
+  ["81358830",0x1A00],
+  ["81358831",0x1A01],
+  ["81358832",0x1A02],
+  ["81358833",0x1A03],
+  ["81358834",0x1A04],
+  ["81358835",0x1A05],
+  ["81358836",0x1A06],
+  ["81358837",0x1A07],
+  ["81358838",0x1A08],
+  ["81358839",0x1A09],
+  ["81358930",0x1A0A],
+  ["81358931",0x1A0B],
+  ["81358932",0x1A0C],
+  ["81358933",0x1A0D],
+  ["81358934",0x1A0E],
+  ["81358935",0x1A0F],
+  ["81358936",0x1A10],
+  ["81358937",0x1A11],
+  ["81358938",0x1A12],
+  ["81358939",0x1A13],
+  ["81358A30",0x1A14],
+  ["81358A31",0x1A15],
+  ["81358A32",0x1A16],
+  ["81358A33",0x1A17],
+  ["81358A34",0x1A18],
+  ["81358A35",0x1A19],
+  ["81358A36",0x1A1A],
+  ["81358A37",0x1A1B],
+  ["81358A38",0x1A1C],
+  ["81358A39",0x1A1D],
+  ["81358B30",0x1A1E],
+  ["81358B31",0x1A1F],
+  ["81358B32",0x1A20],
+  ["81358B33",0x1A21],
+  ["81358B34",0x1A22],
+  ["81358B35",0x1A23],
+  ["81358B36",0x1A24],
+  ["81358B37",0x1A25],
+  ["81358B38",0x1A26],
+  ["81358B39",0x1A27],
+  ["81358C30",0x1A28],
+  ["81358C31",0x1A29],
+  ["81358C32",0x1A2A],
+  ["81358C33",0x1A2B],
+  ["81358C34",0x1A2C],
+  ["81358C35",0x1A2D],
+  ["81358C36",0x1A2E],
+  ["81358C37",0x1A2F],
+  ["81358C38",0x1A30],
+  ["81358C39",0x1A31],
+  ["81358D30",0x1A32],
+  ["81358D31",0x1A33],
+  ["81358D32",0x1A34],
+  ["81358D33",0x1A35],
+  ["81358D34",0x1A36],
+  ["81358D35",0x1A37],
+  ["81358D36",0x1A38],
+  ["81358D37",0x1A39],
+  ["81358D38",0x1A3A],
+  ["81358D39",0x1A3B],
+  ["81358E30",0x1A3C],
+  ["81358E31",0x1A3D],
+  ["81358E32",0x1A3E],
+  ["81358E33",0x1A3F],
+  ["81358E34",0x1A40],
+  ["81358E35",0x1A41],
+  ["81358E36",0x1A42],
+  ["81358E37",0x1A43],
+  ["81358E38",0x1A44],
+  ["81358E39",0x1A45],
+  ["81358F30",0x1A46],
+  ["81358F31",0x1A47],
+  ["81358F32",0x1A48],
+  ["81358F33",0x1A49],
+  ["81358F34",0x1A4A],
+  ["81358F35",0x1A4B],
+  ["81358F36",0x1A4C],
+  ["81358F37",0x1A4D],
+  ["81358F38",0x1A4E],
+  ["81358F39",0x1A4F],
+  ["81359030",0x1A50],
+  ["81359031",0x1A51],
+  ["81359032",0x1A52],
+  ["81359033",0x1A53],
+  ["81359034",0x1A54],
+  ["81359035",0x1A55],
+  ["81359036",0x1A56],
+  ["81359037",0x1A57],
+  ["81359038",0x1A58],
+  ["81359039",0x1A59],
+  ["81359130",0x1A5A],
+  ["81359131",0x1A5B],
+  ["81359132",0x1A5C],
+  ["81359133",0x1A5D],
+  ["81359134",0x1A5E],
+  ["81359135",0x1A5F],
+  ["81359136",0x1A60],
+  ["81359137",0x1A61],
+  ["81359138",0x1A62],
+  ["81359139",0x1A63],
+  ["81359230",0x1A64],
+  ["81359231",0x1A65],
+  ["81359232",0x1A66],
+  ["81359233",0x1A67],
+  ["81359234",0x1A68],
+  ["81359235",0x1A69],
+  ["81359236",0x1A6A],
+  ["81359237",0x1A6B],
+  ["81359238",0x1A6C],
+  ["81359239",0x1A6D],
+  ["81359330",0x1A6E],
+  ["81359331",0x1A6F],
+  ["81359332",0x1A70],
+  ["81359333",0x1A71],
+  ["81359334",0x1A72],
+  ["81359335",0x1A73],
+  ["81359336",0x1A74],
+  ["81359337",0x1A75],
+  ["81359338",0x1A76],
+  ["81359339",0x1A77],
+  ["81359430",0x1A78],
+  ["81359431",0x1A79],
+  ["81359432",0x1A7A],
+  ["81359433",0x1A7B],
+  ["81359434",0x1A7C],
+  ["81359435",0x1A7D],
+  ["81359436",0x1A7E],
+  ["81359437",0x1A7F],
+  ["81359438",0x1A80],
+  ["81359439",0x1A81],
+  ["81359530",0x1A82],
+  ["81359531",0x1A83],
+  ["81359532",0x1A84],
+  ["81359533",0x1A85],
+  ["81359534",0x1A86],
+  ["81359535",0x1A87],
+  ["81359536",0x1A88],
+  ["81359537",0x1A89],
+  ["81359538",0x1A8A],
+  ["81359539",0x1A8B],
+  ["81359630",0x1A8C],
+  ["81359631",0x1A8D],
+  ["81359632",0x1A8E],
+  ["81359633",0x1A8F],
+  ["81359634",0x1A90],
+  ["81359635",0x1A91],
+  ["81359636",0x1A92],
+  ["81359637",0x1A93],
+  ["81359638",0x1A94],
+  ["81359639",0x1A95],
+  ["81359730",0x1A96],
+  ["81359731",0x1A97],
+  ["81359732",0x1A98],
+  ["81359733",0x1A99],
+  ["81359734",0x1A9A],
+  ["81359735",0x1A9B],
+  ["81359736",0x1A9C],
+  ["81359737",0x1A9D],
+  ["81359738",0x1A9E],
+  ["81359739",0x1A9F],
+  ["81359830",0x1AA0],
+  ["81359831",0x1AA1],
+  ["81359832",0x1AA2],
+  ["81359833",0x1AA3],
+  ["81359834",0x1AA4],
+  ["81359835",0x1AA5],
+  ["81359836",0x1AA6],
+  ["81359837",0x1AA7],
+  ["81359838",0x1AA8],
+  ["81359839",0x1AA9],
+  ["81359930",0x1AAA],
+  ["81359931",0x1AAB],
+  ["81359932",0x1AAC],
+  ["81359933",0x1AAD],
+  ["81359934",0x1AAE],
+  ["81359935",0x1AAF],
+  ["81359936",0x1AB0],
+  ["81359937",0x1AB1],
+  ["81359938",0x1AB2],
+  ["81359939",0x1AB3],
+  ["81359A30",0x1AB4],
+  ["81359A31",0x1AB5],
+  ["81359A32",0x1AB6],
+  ["81359A33",0x1AB7],
+  ["81359A34",0x1AB8],
+  ["81359A35",0x1AB9],
+  ["81359A36",0x1ABA],
+  ["81359A37",0x1ABB],
+  ["81359A38",0x1ABC],
+  ["81359A39",0x1ABD],
+  ["81359B30",0x1ABE],
+  ["81359B31",0x1ABF],
+  ["81359B32",0x1AC0],
+  ["81359B33",0x1AC1],
+  ["81359B34",0x1AC2],
+  ["81359B35",0x1AC3],
+  ["81359B36",0x1AC4],
+  ["81359B37",0x1AC5],
+  ["81359B38",0x1AC6],
+  ["81359B39",0x1AC7],
+  ["81359C30",0x1AC8],
+  ["81359C31",0x1AC9],
+  ["81359C32",0x1ACA],
+  ["81359C33",0x1ACB],
+  ["81359C34",0x1ACC],
+  ["81359C35",0x1ACD],
+  ["81359C36",0x1ACE],
+  ["81359C37",0x1ACF],
+  ["81359C38",0x1AD0],
+  ["81359C39",0x1AD1],
+  ["81359D30",0x1AD2],
+  ["81359D31",0x1AD3],
+  ["81359D32",0x1AD4],
+  ["81359D33",0x1AD5],
+  ["81359D34",0x1AD6],
+  ["81359D35",0x1AD7],
+  ["81359D36",0x1AD8],
+  ["81359D37",0x1AD9],
+  ["81359D38",0x1ADA],
+  ["81359D39",0x1ADB],
+  ["81359E30",0x1ADC],
+  ["81359E31",0x1ADD],
+  ["81359E32",0x1ADE],
+  ["81359E33",0x1ADF],
+  ["81359E34",0x1AE0],
+  ["81359E35",0x1AE1],
+  ["81359E36",0x1AE2],
+  ["81359E37",0x1AE3],
+  ["81359E38",0x1AE4],
+  ["81359E39",0x1AE5],
+  ["81359F30",0x1AE6],
+  ["81359F31",0x1AE7],
+  ["81359F32",0x1AE8],
+  ["81359F33",0x1AE9],
+  ["81359F34",0x1AEA],
+  ["81359F35",0x1AEB],
+  ["81359F36",0x1AEC],
+  ["81359F37",0x1AED],
+  ["81359F38",0x1AEE],
+  ["81359F39",0x1AEF],
+  ["8135A030",0x1AF0],
+  ["8135A031",0x1AF1],
+  ["8135A032",0x1AF2],
+  ["8135A033",0x1AF3],
+  ["8135A034",0x1AF4],
+  ["8135A035",0x1AF5],
+  ["8135A036",0x1AF6],
+  ["8135A037",0x1AF7],
+  ["8135A038",0x1AF8],
+  ["8135A039",0x1AF9],
+  ["8135A130",0x1AFA],
+  ["8135A131",0x1AFB],
+  ["8135A132",0x1AFC],
+  ["8135A133",0x1AFD],
+  ["8135A134",0x1AFE],
+  ["8135A135",0x1AFF],
+  ["8135A136",0x1B00],
+  ["8135A137",0x1B01],
+  ["8135A138",0x1B02],
+  ["8135A139",0x1B03],
+  ["8135A230",0x1B04],
+  ["8135A231",0x1B05],
+  ["8135A232",0x1B06],
+  ["8135A233",0x1B07],
+  ["8135A234",0x1B08],
+  ["8135A235",0x1B09],
+  ["8135A236",0x1B0A],
+  ["8135A237",0x1B0B],
+  ["8135A238",0x1B0C],
+  ["8135A239",0x1B0D],
+  ["8135A330",0x1B0E],
+  ["8135A331",0x1B0F],
+  ["8135A332",0x1B10],
+  ["8135A333",0x1B11],
+  ["8135A334",0x1B12],
+  ["8135A335",0x1B13],
+  ["8135A336",0x1B14],
+  ["8135A337",0x1B15],
+  ["8135A338",0x1B16],
+  ["8135A339",0x1B17],
+  ["8135A430",0x1B18],
+  ["8135A431",0x1B19],
+  ["8135A432",0x1B1A],
+  ["8135A433",0x1B1B],
+  ["8135A434",0x1B1C],
+  ["8135A435",0x1B1D],
+  ["8135A436",0x1B1E],
+  ["8135A437",0x1B1F],
+  ["8135A438",0x1B20],
+  ["8135A439",0x1B21],
+  ["8135A530",0x1B22],
+  ["8135A531",0x1B23],
+  ["8135A532",0x1B24],
+  ["8135A533",0x1B25],
+  ["8135A534",0x1B26],
+  ["8135A535",0x1B27],
+  ["8135A536",0x1B28],
+  ["8135A537",0x1B29],
+  ["8135A538",0x1B2A],
+  ["8135A539",0x1B2B],
+  ["8135A630",0x1B2C],
+  ["8135A631",0x1B2D],
+  ["8135A632",0x1B2E],
+  ["8135A633",0x1B2F],
+  ["8135A634",0x1B30],
+  ["8135A635",0x1B31],
+  ["8135A636",0x1B32],
+  ["8135A637",0x1B33],
+  ["8135A638",0x1B34],
+  ["8135A639",0x1B35],
+  ["8135A730",0x1B36],
+  ["8135A731",0x1B37],
+  ["8135A732",0x1B38],
+  ["8135A733",0x1B39],
+  ["8135A734",0x1B3A],
+  ["8135A735",0x1B3B],
+  ["8135A736",0x1B3C],
+  ["8135A737",0x1B3D],
+  ["8135A738",0x1B3E],
+  ["8135A739",0x1B3F],
+  ["8135A830",0x1B40],
+  ["8135A831",0x1B41],
+  ["8135A832",0x1B42],
+  ["8135A833",0x1B43],
+  ["8135A834",0x1B44],
+  ["8135A835",0x1B45],
+  ["8135A836",0x1B46],
+  ["8135A837",0x1B47],
+  ["8135A838",0x1B48],
+  ["8135A839",0x1B49],
+  ["8135A930",0x1B4A],
+  ["8135A931",0x1B4B],
+  ["8135A932",0x1B4C],
+  ["8135A933",0x1B4D],
+  ["8135A934",0x1B4E],
+  ["8135A935",0x1B4F],
+  ["8135A936",0x1B50],
+  ["8135A937",0x1B51],
+  ["8135A938",0x1B52],
+  ["8135A939",0x1B53],
+  ["8135AA30",0x1B54],
+  ["8135AA31",0x1B55],
+  ["8135AA32",0x1B56],
+  ["8135AA33",0x1B57],
+  ["8135AA34",0x1B58],
+  ["8135AA35",0x1B59],
+  ["8135AA36",0x1B5A],
+  ["8135AA37",0x1B5B],
+  ["8135AA38",0x1B5C],
+  ["8135AA39",0x1B5D],
+  ["8135AB30",0x1B5E],
+  ["8135AB31",0x1B5F],
+  ["8135AB32",0x1B60],
+  ["8135AB33",0x1B61],
+  ["8135AB34",0x1B62],
+  ["8135AB35",0x1B63],
+  ["8135AB36",0x1B64],
+  ["8135AB37",0x1B65],
+  ["8135AB38",0x1B66],
+  ["8135AB39",0x1B67],
+  ["8135AC30",0x1B68],
+  ["8135AC31",0x1B69],
+  ["8135AC32",0x1B6A],
+  ["8135AC33",0x1B6B],
+  ["8135AC34",0x1B6C],
+  ["8135AC35",0x1B6D],
+  ["8135AC36",0x1B6E],
+  ["8135AC37",0x1B6F],
+  ["8135AC38",0x1B70],
+  ["8135AC39",0x1B71],
+  ["8135AD30",0x1B72],
+  ["8135AD31",0x1B73],
+  ["8135AD32",0x1B74],
+  ["8135AD33",0x1B75],
+  ["8135AD34",0x1B76],
+  ["8135AD35",0x1B77],
+  ["8135AD36",0x1B78],
+  ["8135AD37",0x1B79],
+  ["8135AD38",0x1B7A],
+  ["8135AD39",0x1B7B],
+  ["8135AE30",0x1B7C],
+  ["8135AE31",0x1B7D],
+  ["8135AE32",0x1B7E],
+  ["8135AE33",0x1B7F],
+  ["8135AE34",0x1B80],
+  ["8135AE35",0x1B81],
+  ["8135AE36",0x1B82],
+  ["8135AE37",0x1B83],
+  ["8135AE38",0x1B84],
+  ["8135AE39",0x1B85],
+  ["8135AF30",0x1B86],
+  ["8135AF31",0x1B87],
+  ["8135AF32",0x1B88],
+  ["8135AF33",0x1B89],
+  ["8135AF34",0x1B8A],
+  ["8135AF35",0x1B8B],
+  ["8135AF36",0x1B8C],
+  ["8135AF37",0x1B8D],
+  ["8135AF38",0x1B8E],
+  ["8135AF39",0x1B8F],
+  ["8135B030",0x1B90],
+  ["8135B031",0x1B91],
+  ["8135B032",0x1B92],
+  ["8135B033",0x1B93],
+  ["8135B034",0x1B94],
+  ["8135B035",0x1B95],
+  ["8135B036",0x1B96],
+  ["8135B037",0x1B97],
+  ["8135B038",0x1B98],
+  ["8135B039",0x1B99],
+  ["8135B130",0x1B9A],
+  ["8135B131",0x1B9B],
+  ["8135B132",0x1B9C],
+  ["8135B133",0x1B9D],
+  ["8135B134",0x1B9E],
+  ["8135B135",0x1B9F],
+  ["8135B136",0x1BA0],
+  ["8135B137",0x1BA1],
+  ["8135B138",0x1BA2],
+  ["8135B139",0x1BA3],
+  ["8135B230",0x1BA4],
+  ["8135B231",0x1BA5],
+  ["8135B232",0x1BA6],
+  ["8135B233",0x1BA7],
+  ["8135B234",0x1BA8],
+  ["8135B235",0x1BA9],
+  ["8135B236",0x1BAA],
+  ["8135B237",0x1BAB],
+  ["8135B238",0x1BAC],
+  ["8135B239",0x1BAD],
+  ["8135B330",0x1BAE],
+  ["8135B331",0x1BAF],
+  ["8135B332",0x1BB0],
+  ["8135B333",0x1BB1],
+  ["8135B334",0x1BB2],
+  ["8135B335",0x1BB3],
+  ["8135B336",0x1BB4],
+  ["8135B337",0x1BB5],
+  ["8135B338",0x1BB6],
+  ["8135B339",0x1BB7],
+  ["8135B430",0x1BB8],
+  ["8135B431",0x1BB9],
+  ["8135B432",0x1BBA],
+  ["8135B433",0x1BBB],
+  ["8135B434",0x1BBC],
+  ["8135B435",0x1BBD],
+  ["8135B436",0x1BBE],
+  ["8135B437",0x1BBF],
+  ["8135B438",0x1BC0],
+  ["8135B439",0x1BC1],
+  ["8135B530",0x1BC2],
+  ["8135B531",0x1BC3],
+  ["8135B532",0x1BC4],
+  ["8135B533",0x1BC5],
+  ["8135B534",0x1BC6],
+  ["8135B535",0x1BC7],
+  ["8135B536",0x1BC8],
+  ["8135B537",0x1BC9],
+  ["8135B538",0x1BCA],
+  ["8135B539",0x1BCB],
+  ["8135B630",0x1BCC],
+  ["8135B631",0x1BCD],
+  ["8135B632",0x1BCE],
+  ["8135B633",0x1BCF],
+  ["8135B634",0x1BD0],
+  ["8135B635",0x1BD1],
+  ["8135B636",0x1BD2],
+  ["8135B637",0x1BD3],
+  ["8135B638",0x1BD4],
+  ["8135B639",0x1BD5],
+  ["8135B730",0x1BD6],
+  ["8135B731",0x1BD7],
+  ["8135B732",0x1BD8],
+  ["8135B733",0x1BD9],
+  ["8135B734",0x1BDA],
+  ["8135B735",0x1BDB],
+  ["8135B736",0x1BDC],
+  ["8135B737",0x1BDD],
+  ["8135B738",0x1BDE],
+  ["8135B739",0x1BDF],
+  ["8135B830",0x1BE0],
+  ["8135B831",0x1BE1],
+  ["8135B832",0x1BE2],
+  ["8135B833",0x1BE3],
+  ["8135B834",0x1BE4],
+  ["8135B835",0x1BE5],
+  ["8135B836",0x1BE6],
+  ["8135B837",0x1BE7],
+  ["8135B838",0x1BE8],
+  ["8135B839",0x1BE9],
+  ["8135B930",0x1BEA],
+  ["8135B931",0x1BEB],
+  ["8135B932",0x1BEC],
+  ["8135B933",0x1BED],
+  ["8135B934",0x1BEE],
+  ["8135B935",0x1BEF],
+  ["8135B936",0x1BF0],
+  ["8135B937",0x1BF1],
+  ["8135B938",0x1BF2],
+  ["8135B939",0x1BF3],
+  ["8135BA30",0x1BF4],
+  ["8135BA31",0x1BF5],
+  ["8135BA32",0x1BF6],
+  ["8135BA33",0x1BF7],
+  ["8135BA34",0x1BF8],
+  ["8135BA35",0x1BF9],
+  ["8135BA36",0x1BFA],
+  ["8135BA37",0x1BFB],
+  ["8135BA38",0x1BFC],
+  ["8135BA39",0x1BFD],
+  ["8135BB30",0x1BFE],
+  ["8135BB31",0x1BFF],
+  ["8135BB32",0x1C00],
+  ["8135BB33",0x1C01],
+  ["8135BB34",0x1C02],
+  ["8135BB35",0x1C03],
+  ["8135BB36",0x1C04],
+  ["8135BB37",0x1C05],
+  ["8135BB38",0x1C06],
+  ["8135BB39",0x1C07],
+  ["8135BC30",0x1C08],
+  ["8135BC31",0x1C09],
+  ["8135BC32",0x1C0A],
+  ["8135BC33",0x1C0B],
+  ["8135BC34",0x1C0C],
+  ["8135BC35",0x1C0D],
+  ["8135BC36",0x1C0E],
+  ["8135BC37",0x1C0F],
+  ["8135BC38",0x1C10],
+  ["8135BC39",0x1C11],
+  ["8135BD30",0x1C12],
+  ["8135BD31",0x1C13],
+  ["8135BD32",0x1C14],
+  ["8135BD33",0x1C15],
+  ["8135BD34",0x1C16],
+  ["8135BD35",0x1C17],
+  ["8135BD36",0x1C18],
+  ["8135BD37",0x1C19],
+  ["8135BD38",0x1C1A],
+  ["8135BD39",0x1C1B],
+  ["8135BE30",0x1C1C],
+  ["8135BE31",0x1C1D],
+  ["8135BE32",0x1C1E],
+  ["8135BE33",0x1C1F],
+  ["8135BE34",0x1C20],
+  ["8135BE35",0x1C21],
+  ["8135BE36",0x1C22],
+  ["8135BE37",0x1C23],
+  ["8135BE38",0x1C24],
+  ["8135BE39",0x1C25],
+  ["8135BF30",0x1C26],
+  ["8135BF31",0x1C27],
+  ["8135BF32",0x1C28],
+  ["8135BF33",0x1C29],
+  ["8135BF34",0x1C2A],
+  ["8135BF35",0x1C2B],
+  ["8135BF36",0x1C2C],
+  ["8135BF37",0x1C2D],
+  ["8135BF38",0x1C2E],
+  ["8135BF39",0x1C2F],
+  ["8135C030",0x1C30],
+  ["8135C031",0x1C31],
+  ["8135C032",0x1C32],
+  ["8135C033",0x1C33],
+  ["8135C034",0x1C34],
+  ["8135C035",0x1C35],
+  ["8135C036",0x1C36],
+  ["8135C037",0x1C37],
+  ["8135C038",0x1C38],
+  ["8135C039",0x1C39],
+  ["8135C130",0x1C3A],
+  ["8135C131",0x1C3B],
+  ["8135C132",0x1C3C],
+  ["8135C133",0x1C3D],
+  ["8135C134",0x1C3E],
+  ["8135C135",0x1C3F],
+  ["8135C136",0x1C40],
+  ["8135C137",0x1C41],
+  ["8135C138",0x1C42],
+  ["8135C139",0x1C43],
+  ["8135C230",0x1C44],
+  ["8135C231",0x1C45],
+  ["8135C232",0x1C46],
+  ["8135C233",0x1C47],
+  ["8135C234",0x1C48],
+  ["8135C235",0x1C49],
+  ["8135C236",0x1C4A],
+  ["8135C237",0x1C4B],
+  ["8135C238",0x1C4C],
+  ["8135C239",0x1C4D],
+  ["8135C330",0x1C4E],
+  ["8135C331",0x1C4F],
+  ["8135C332",0x1C50],
+  ["8135C333",0x1C51],
+  ["8135C334",0x1C52],
+  ["8135C335",0x1C53],
+  ["8135C336",0x1C54],
+  ["8135C337",0x1C55],
+  ["8135C338",0x1C56],
+  ["8135C339",0x1C57],
+  ["8135C430",0x1C58],
+  ["8135C431",0x1C59],
+  ["8135C432",0x1C5A],
+  ["8135C433",0x1C5B],
+  ["8135C434",0x1C5C],
+  ["8135C435",0x1C5D],
+  ["8135C436",0x1C5E],
+  ["8135C437",0x1C5F],
+  ["8135C438",0x1C60],
+  ["8135C439",0x1C61],
+  ["8135C530",0x1C62],
+  ["8135C531",0x1C63],
+  ["8135C532",0x1C64],
+  ["8135C533",0x1C65],
+  ["8135C534",0x1C66],
+  ["8135C535",0x1C67],
+  ["8135C536",0x1C68],
+  ["8135C537",0x1C69],
+  ["8135C538",0x1C6A],
+  ["8135C539",0x1C6B],
+  ["8135C630",0x1C6C],
+  ["8135C631",0x1C6D],
+  ["8135C632",0x1C6E],
+  ["8135C633",0x1C6F],
+  ["8135C634",0x1C70],
+  ["8135C635",0x1C71],
+  ["8135C636",0x1C72],
+  ["8135C637",0x1C73],
+  ["8135C638",0x1C74],
+  ["8135C639",0x1C75],
+  ["8135C730",0x1C76],
+  ["8135C731",0x1C77],
+  ["8135C732",0x1C78],
+  ["8135C733",0x1C79],
+  ["8135C734",0x1C7A],
+  ["8135C735",0x1C7B],
+  ["8135C736",0x1C7C],
+  ["8135C737",0x1C7D],
+  ["8135C738",0x1C7E],
+  ["8135C739",0x1C7F],
+  ["8135C830",0x1C80],
+  ["8135C831",0x1C81],
+  ["8135C832",0x1C82],
+  ["8135C833",0x1C83],
+  ["8135C834",0x1C84],
+  ["8135C835",0x1C85],
+  ["8135C836",0x1C86],
+  ["8135C837",0x1C87],
+  ["8135C838",0x1C88],
+  ["8135C839",0x1C89],
+  ["8135C930",0x1C8A],
+  ["8135C931",0x1C8B],
+  ["8135C932",0x1C8C],
+  ["8135C933",0x1C8D],
+  ["8135C934",0x1C8E],
+  ["8135C935",0x1C8F],
+  ["8135C936",0x1C90],
+  ["8135C937",0x1C91],
+  ["8135C938",0x1C92],
+  ["8135C939",0x1C93],
+  ["8135CA30",0x1C94],
+  ["8135CA31",0x1C95],
+  ["8135CA32",0x1C96],
+  ["8135CA33",0x1C97],
+  ["8135CA34",0x1C98],
+  ["8135CA35",0x1C99],
+  ["8135CA36",0x1C9A],
+  ["8135CA37",0x1C9B],
+  ["8135CA38",0x1C9C],
+  ["8135CA39",0x1C9D],
+  ["8135CB30",0x1C9E],
+  ["8135CB31",0x1C9F],
+  ["8135CB32",0x1CA0],
+  ["8135CB33",0x1CA1],
+  ["8135CB34",0x1CA2],
+  ["8135CB35",0x1CA3],
+  ["8135CB36",0x1CA4],
+  ["8135CB37",0x1CA5],
+  ["8135CB38",0x1CA6],
+  ["8135CB39",0x1CA7],
+  ["8135CC30",0x1CA8],
+  ["8135CC31",0x1CA9],
+  ["8135CC32",0x1CAA],
+  ["8135CC33",0x1CAB],
+  ["8135CC34",0x1CAC],
+  ["8135CC35",0x1CAD],
+  ["8135CC36",0x1CAE],
+  ["8135CC37",0x1CAF],
+  ["8135CC38",0x1CB0],
+  ["8135CC39",0x1CB1],
+  ["8135CD30",0x1CB2],
+  ["8135CD31",0x1CB3],
+  ["8135CD32",0x1CB4],
+  ["8135CD33",0x1CB5],
+  ["8135CD34",0x1CB6],
+  ["8135CD35",0x1CB7],
+  ["8135CD36",0x1CB8],
+  ["8135CD37",0x1CB9],
+  ["8135CD38",0x1CBA],
+  ["8135CD39",0x1CBB],
+  ["8135CE30",0x1CBC],
+  ["8135CE31",0x1CBD],
+  ["8135CE32",0x1CBE],
+  ["8135CE33",0x1CBF],
+  ["8135CE34",0x1CC0],
+  ["8135CE35",0x1CC1],
+  ["8135CE36",0x1CC2],
+  ["8135CE37",0x1CC3],
+  ["8135CE38",0x1CC4],
+  ["8135CE39",0x1CC5],
+  ["8135CF30",0x1CC6],
+  ["8135CF31",0x1CC7],
+  ["8135CF32",0x1CC8],
+  ["8135CF33",0x1CC9],
+  ["8135CF34",0x1CCA],
+  ["8135CF35",0x1CCB],
+  ["8135CF36",0x1CCC],
+  ["8135CF37",0x1CCD],
+  ["8135CF38",0x1CCE],
+  ["8135CF39",0x1CCF],
+  ["8135D030",0x1CD0],
+  ["8135D031",0x1CD1],
+  ["8135D032",0x1CD2],
+  ["8135D033",0x1CD3],
+  ["8135D034",0x1CD4],
+  ["8135D035",0x1CD5],
+  ["8135D036",0x1CD6],
+  ["8135D037",0x1CD7],
+  ["8135D038",0x1CD8],
+  ["8135D039",0x1CD9],
+  ["8135D130",0x1CDA],
+  ["8135D131",0x1CDB],
+  ["8135D132",0x1CDC],
+  ["8135D133",0x1CDD],
+  ["8135D134",0x1CDE],
+  ["8135D135",0x1CDF],
+  ["8135D136",0x1CE0],
+  ["8135D137",0x1CE1],
+  ["8135D138",0x1CE2],
+  ["8135D139",0x1CE3],
+  ["8135D230",0x1CE4],
+  ["8135D231",0x1CE5],
+  ["8135D232",0x1CE6],
+  ["8135D233",0x1CE7],
+  ["8135D234",0x1CE8],
+  ["8135D235",0x1CE9],
+  ["8135D236",0x1CEA],
+  ["8135D237",0x1CEB],
+  ["8135D238",0x1CEC],
+  ["8135D239",0x1CED],
+  ["8135D330",0x1CEE],
+  ["8135D331",0x1CEF],
+  ["8135D332",0x1CF0],
+  ["8135D333",0x1CF1],
+  ["8135D334",0x1CF2],
+  ["8135D335",0x1CF3],
+  ["8135D336",0x1CF4],
+  ["8135D337",0x1CF5],
+  ["8135D338",0x1CF6],
+  ["8135D339",0x1CF7],
+  ["8135D430",0x1CF8],
+  ["8135D431",0x1CF9],
+  ["8135D432",0x1CFA],
+  ["8135D433",0x1CFB],
+  ["8135D434",0x1CFC],
+  ["8135D435",0x1CFD],
+  ["8135D436",0x1CFE],
+  ["8135D437",0x1CFF],
+  ["8135D438",0x1D00],
+  ["8135D439",0x1D01],
+  ["8135D530",0x1D02],
+  ["8135D531",0x1D03],
+  ["8135D532",0x1D04],
+  ["8135D533",0x1D05],
+  ["8135D534",0x1D06],
+  ["8135D535",0x1D07],
+  ["8135D536",0x1D08],
+  ["8135D537",0x1D09],
+  ["8135D538",0x1D0A],
+  ["8135D539",0x1D0B],
+  ["8135D630",0x1D0C],
+  ["8135D631",0x1D0D],
+  ["8135D632",0x1D0E],
+  ["8135D633",0x1D0F],
+  ["8135D634",0x1D10],
+  ["8135D635",0x1D11],
+  ["8135D636",0x1D12],
+  ["8135D637",0x1D13],
+  ["8135D638",0x1D14],
+  ["8135D639",0x1D15],
+  ["8135D730",0x1D16],
+  ["8135D731",0x1D17],
+  ["8135D732",0x1D18],
+  ["8135D733",0x1D19],
+  ["8135D734",0x1D1A],
+  ["8135D735",0x1D1B],
+  ["8135D736",0x1D1C],
+  ["8135D737",0x1D1D],
+  ["8135D738",0x1D1E],
+  ["8135D739",0x1D1F],
+  ["8135D830",0x1D20],
+  ["8135D831",0x1D21],
+  ["8135D832",0x1D22],
+  ["8135D833",0x1D23],
+  ["8135D834",0x1D24],
+  ["8135D835",0x1D25],
+  ["8135D836",0x1D26],
+  ["8135D837",0x1D27],
+  ["8135D838",0x1D28],
+  ["8135D839",0x1D29],
+  ["8135D930",0x1D2A],
+  ["8135D931",0x1D2B],
+  ["8135D932",0x1D2C],
+  ["8135D933",0x1D2D],
+  ["8135D934",0x1D2E],
+  ["8135D935",0x1D2F],
+  ["8135D936",0x1D30],
+  ["8135D937",0x1D31],
+  ["8135D938",0x1D32],
+  ["8135D939",0x1D33],
+  ["8135DA30",0x1D34],
+  ["8135DA31",0x1D35],
+  ["8135DA32",0x1D36],
+  ["8135DA33",0x1D37],
+  ["8135DA34",0x1D38],
+  ["8135DA35",0x1D39],
+  ["8135DA36",0x1D3A],
+  ["8135DA37",0x1D3B],
+  ["8135DA38",0x1D3C],
+  ["8135DA39",0x1D3D],
+  ["8135DB30",0x1D3E],
+  ["8135DB31",0x1D3F],
+  ["8135DB32",0x1D40],
+  ["8135DB33",0x1D41],
+  ["8135DB34",0x1D42],
+  ["8135DB35",0x1D43],
+  ["8135DB36",0x1D44],
+  ["8135DB37",0x1D45],
+  ["8135DB38",0x1D46],
+  ["8135DB39",0x1D47],
+  ["8135DC30",0x1D48],
+  ["8135DC31",0x1D49],
+  ["8135DC32",0x1D4A],
+  ["8135DC33",0x1D4B],
+  ["8135DC34",0x1D4C],
+  ["8135DC35",0x1D4D],
+  ["8135DC36",0x1D4E],
+  ["8135DC37",0x1D4F],
+  ["8135DC38",0x1D50],
+  ["8135DC39",0x1D51],
+  ["8135DD30",0x1D52],
+  ["8135DD31",0x1D53],
+  ["8135DD32",0x1D54],
+  ["8135DD33",0x1D55],
+  ["8135DD34",0x1D56],
+  ["8135DD35",0x1D57],
+  ["8135DD36",0x1D58],
+  ["8135DD37",0x1D59],
+  ["8135DD38",0x1D5A],
+  ["8135DD39",0x1D5B],
+  ["8135DE30",0x1D5C],
+  ["8135DE31",0x1D5D],
+  ["8135DE32",0x1D5E],
+  ["8135DE33",0x1D5F],
+  ["8135DE34",0x1D60],
+  ["8135DE35",0x1D61],
+  ["8135DE36",0x1D62],
+  ["8135DE37",0x1D63],
+  ["8135DE38",0x1D64],
+  ["8135DE39",0x1D65],
+  ["8135DF30",0x1D66],
+  ["8135DF31",0x1D67],
+  ["8135DF32",0x1D68],
+  ["8135DF33",0x1D69],
+  ["8135DF34",0x1D6A],
+  ["8135DF35",0x1D6B],
+  ["8135DF36",0x1D6C],
+  ["8135DF37",0x1D6D],
+  ["8135DF38",0x1D6E],
+  ["8135DF39",0x1D6F],
+  ["8135E030",0x1D70],
+  ["8135E031",0x1D71],
+  ["8135E032",0x1D72],
+  ["8135E033",0x1D73],
+  ["8135E034",0x1D74],
+  ["8135E035",0x1D75],
+  ["8135E036",0x1D76],
+  ["8135E037",0x1D77],
+  ["8135E038",0x1D78],
+  ["8135E039",0x1D79],
+  ["8135E130",0x1D7A],
+  ["8135E131",0x1D7B],
+  ["8135E132",0x1D7C],
+  ["8135E133",0x1D7D],
+  ["8135E134",0x1D7E],
+  ["8135E135",0x1D7F],
+  ["8135E136",0x1D80],
+  ["8135E137",0x1D81],
+  ["8135E138",0x1D82],
+  ["8135E139",0x1D83],
+  ["8135E230",0x1D84],
+  ["8135E231",0x1D85],
+  ["8135E232",0x1D86],
+  ["8135E233",0x1D87],
+  ["8135E234",0x1D88],
+  ["8135E235",0x1D89],
+  ["8135E236",0x1D8A],
+  ["8135E237",0x1D8B],
+  ["8135E238",0x1D8C],
+  ["8135E239",0x1D8D],
+  ["8135E330",0x1D8E],
+  ["8135E331",0x1D8F],
+  ["8135E332",0x1D90],
+  ["8135E333",0x1D91],
+  ["8135E334",0x1D92],
+  ["8135E335",0x1D93],
+  ["8135E336",0x1D94],
+  ["8135E337",0x1D95],
+  ["8135E338",0x1D96],
+  ["8135E339",0x1D97],
+  ["8135E430",0x1D98],
+  ["8135E431",0x1D99],
+  ["8135E432",0x1D9A],
+  ["8135E433",0x1D9B],
+  ["8135E434",0x1D9C],
+  ["8135E435",0x1D9D],
+  ["8135E436",0x1D9E],
+  ["8135E437",0x1D9F],
+  ["8135E438",0x1DA0],
+  ["8135E439",0x1DA1],
+  ["8135E530",0x1DA2],
+  ["8135E531",0x1DA3],
+  ["8135E532",0x1DA4],
+  ["8135E533",0x1DA5],
+  ["8135E534",0x1DA6],
+  ["8135E535",0x1DA7],
+  ["8135E536",0x1DA8],
+  ["8135E537",0x1DA9],
+  ["8135E538",0x1DAA],
+  ["8135E539",0x1DAB],
+  ["8135E630",0x1DAC],
+  ["8135E631",0x1DAD],
+  ["8135E632",0x1DAE],
+  ["8135E633",0x1DAF],
+  ["8135E634",0x1DB0],
+  ["8135E635",0x1DB1],
+  ["8135E636",0x1DB2],
+  ["8135E637",0x1DB3],
+  ["8135E638",0x1DB4],
+  ["8135E639",0x1DB5],
+  ["8135E730",0x1DB6],
+  ["8135E731",0x1DB7],
+  ["8135E732",0x1DB8],
+  ["8135E733",0x1DB9],
+  ["8135E734",0x1DBA],
+  ["8135E735",0x1DBB],
+  ["8135E736",0x1DBC],
+  ["8135E737",0x1DBD],
+  ["8135E738",0x1DBE],
+  ["8135E739",0x1DBF],
+  ["8135E830",0x1DC0],
+  ["8135E831",0x1DC1],
+  ["8135E832",0x1DC2],
+  ["8135E833",0x1DC3],
+  ["8135E834",0x1DC4],
+  ["8135E835",0x1DC5],
+  ["8135E836",0x1DC6],
+  ["8135E837",0x1DC7],
+  ["8135E838",0x1DC8],
+  ["8135E839",0x1DC9],
+  ["8135E930",0x1DCA],
+  ["8135E931",0x1DCB],
+  ["8135E932",0x1DCC],
+  ["8135E933",0x1DCD],
+  ["8135E934",0x1DCE],
+  ["8135E935",0x1DCF],
+  ["8135E936",0x1DD0],
+  ["8135E937",0x1DD1],
+  ["8135E938",0x1DD2],
+  ["8135E939",0x1DD3],
+  ["8135EA30",0x1DD4],
+  ["8135EA31",0x1DD5],
+  ["8135EA32",0x1DD6],
+  ["8135EA33",0x1DD7],
+  ["8135EA34",0x1DD8],
+  ["8135EA35",0x1DD9],
+  ["8135EA36",0x1DDA],
+  ["8135EA37",0x1DDB],
+  ["8135EA38",0x1DDC],
+  ["8135EA39",0x1DDD],
+  ["8135EB30",0x1DDE],
+  ["8135EB31",0x1DDF],
+  ["8135EB32",0x1DE0],
+  ["8135EB33",0x1DE1],
+  ["8135EB34",0x1DE2],
+  ["8135EB35",0x1DE3],
+  ["8135EB36",0x1DE4],
+  ["8135EB37",0x1DE5],
+  ["8135EB38",0x1DE6],
+  ["8135EB39",0x1DE7],
+  ["8135EC30",0x1DE8],
+  ["8135EC31",0x1DE9],
+  ["8135EC32",0x1DEA],
+  ["8135EC33",0x1DEB],
+  ["8135EC34",0x1DEC],
+  ["8135EC35",0x1DED],
+  ["8135EC36",0x1DEE],
+  ["8135EC37",0x1DEF],
+  ["8135EC38",0x1DF0],
+  ["8135EC39",0x1DF1],
+  ["8135ED30",0x1DF2],
+  ["8135ED31",0x1DF3],
+  ["8135ED32",0x1DF4],
+  ["8135ED33",0x1DF5],
+  ["8135ED34",0x1DF6],
+  ["8135ED35",0x1DF7],
+  ["8135ED36",0x1DF8],
+  ["8135ED37",0x1DF9],
+  ["8135ED38",0x1DFA],
+  ["8135ED39",0x1DFB],
+  ["8135EE30",0x1DFC],
+  ["8135EE31",0x1DFD],
+  ["8135EE32",0x1DFE],
+  ["8135EE33",0x1DFF],
+  ["8135EE34",0x1E00],
+  ["8135EE35",0x1E01],
+  ["8135EE36",0x1E02],
+  ["8135EE37",0x1E03],
+  ["8135EE38",0x1E04],
+  ["8135EE39",0x1E05],
+  ["8135EF30",0x1E06],
+  ["8135EF31",0x1E07],
+  ["8135EF32",0x1E08],
+  ["8135EF33",0x1E09],
+  ["8135EF34",0x1E0A],
+  ["8135EF35",0x1E0B],
+  ["8135EF36",0x1E0C],
+  ["8135EF37",0x1E0D],
+  ["8135EF38",0x1E0E],
+  ["8135EF39",0x1E0F],
+  ["8135F030",0x1E10],
+  ["8135F031",0x1E11],
+  ["8135F032",0x1E12],
+  ["8135F033",0x1E13],
+  ["8135F034",0x1E14],
+  ["8135F035",0x1E15],
+  ["8135F036",0x1E16],
+  ["8135F037",0x1E17],
+  ["8135F038",0x1E18],
+  ["8135F039",0x1E19],
+  ["8135F130",0x1E1A],
+  ["8135F131",0x1E1B],
+  ["8135F132",0x1E1C],
+  ["8135F133",0x1E1D],
+  ["8135F134",0x1E1E],
+  ["8135F135",0x1E1F],
+  ["8135F136",0x1E20],
+  ["8135F137",0x1E21],
+  ["8135F138",0x1E22],
+  ["8135F139",0x1E23],
+  ["8135F230",0x1E24],
+  ["8135F231",0x1E25],
+  ["8135F232",0x1E26],
+  ["8135F233",0x1E27],
+  ["8135F234",0x1E28],
+  ["8135F235",0x1E29],
+  ["8135F236",0x1E2A],
+  ["8135F237",0x1E2B],
+  ["8135F238",0x1E2C],
+  ["8135F239",0x1E2D],
+  ["8135F330",0x1E2E],
+  ["8135F331",0x1E2F],
+  ["8135F332",0x1E30],
+  ["8135F333",0x1E31],
+  ["8135F334",0x1E32],
+  ["8135F335",0x1E33],
+  ["8135F336",0x1E34],
+  ["8135F337",0x1E35],
+  ["8135F338",0x1E36],
+  ["8135F339",0x1E37],
+  ["8135F430",0x1E38],
+  ["8135F431",0x1E39],
+  ["8135F432",0x1E3A],
+  ["8135F433",0x1E3B],
+  ["8135F434",0x1E3C],
+  ["8135F435",0x1E3D],
+  ["8135F436",0x1E3E],
+  ["8135F437",0x1E3F],
+  ["8135F438",0x1E40],
+  ["8135F439",0x1E41],
+  ["8135F530",0x1E42],
+  ["8135F531",0x1E43],
+  ["8135F532",0x1E44],
+  ["8135F533",0x1E45],
+  ["8135F534",0x1E46],
+  ["8135F535",0x1E47],
+  ["8135F536",0x1E48],
+  ["8135F537",0x1E49],
+  ["8135F538",0x1E4A],
+  ["8135F539",0x1E4B],
+  ["8135F630",0x1E4C],
+  ["8135F631",0x1E4D],
+  ["8135F632",0x1E4E],
+  ["8135F633",0x1E4F],
+  ["8135F634",0x1E50],
+  ["8135F635",0x1E51],
+  ["8135F636",0x1E52],
+  ["8135F637",0x1E53],
+  ["8135F638",0x1E54],
+  ["8135F639",0x1E55],
+  ["8135F730",0x1E56],
+  ["8135F731",0x1E57],
+  ["8135F732",0x1E58],
+  ["8135F733",0x1E59],
+  ["8135F734",0x1E5A],
+  ["8135F735",0x1E5B],
+  ["8135F736",0x1E5C],
+  ["8135F737",0x1E5D],
+  ["8135F738",0x1E5E],
+  ["8135F739",0x1E5F],
+  ["8135F830",0x1E60],
+  ["8135F831",0x1E61],
+  ["8135F832",0x1E62],
+  ["8135F833",0x1E63],
+  ["8135F834",0x1E64],
+  ["8135F835",0x1E65],
+  ["8135F836",0x1E66],
+  ["8135F837",0x1E67],
+  ["8135F838",0x1E68],
+  ["8135F839",0x1E69],
+  ["8135F930",0x1E6A],
+  ["8135F931",0x1E6B],
+  ["8135F932",0x1E6C],
+  ["8135F933",0x1E6D],
+  ["8135F934",0x1E6E],
+  ["8135F935",0x1E6F],
+  ["8135F936",0x1E70],
+  ["8135F937",0x1E71],
+  ["8135F938",0x1E72],
+  ["8135F939",0x1E73],
+  ["8135FA30",0x1E74],
+  ["8135FA31",0x1E75],
+  ["8135FA32",0x1E76],
+  ["8135FA33",0x1E77],
+  ["8135FA34",0x1E78],
+  ["8135FA35",0x1E79],
+  ["8135FA36",0x1E7A],
+  ["8135FA37",0x1E7B],
+  ["8135FA38",0x1E7C],
+  ["8135FA39",0x1E7D],
+  ["8135FB30",0x1E7E],
+  ["8135FB31",0x1E7F],
+  ["8135FB32",0x1E80],
+  ["8135FB33",0x1E81],
+  ["8135FB34",0x1E82],
+  ["8135FB35",0x1E83],
+  ["8135FB36",0x1E84],
+  ["8135FB37",0x1E85],
+  ["8135FB38",0x1E86],
+  ["8135FB39",0x1E87],
+  ["8135FC30",0x1E88],
+  ["8135FC31",0x1E89],
+  ["8135FC32",0x1E8A],
+  ["8135FC33",0x1E8B],
+  ["8135FC34",0x1E8C],
+  ["8135FC35",0x1E8D],
+  ["8135FC36",0x1E8E],
+  ["8135FC37",0x1E8F],
+  ["8135FC38",0x1E90],
+  ["8135FC39",0x1E91],
+  ["8135FD30",0x1E92],
+  ["8135FD31",0x1E93],
+  ["8135FD32",0x1E94],
+  ["8135FD33",0x1E95],
+  ["8135FD34",0x1E96],
+  ["8135FD35",0x1E97],
+  ["8135FD36",0x1E98],
+  ["8135FD37",0x1E99],
+  ["8135FD38",0x1E9A],
+  ["8135FD39",0x1E9B],
+  ["8135FE30",0x1E9C],
+  ["8135FE31",0x1E9D],
+  ["8135FE32",0x1E9E],
+  ["8135FE33",0x1E9F],
+  ["8135FE34",0x1EA0],
+  ["8135FE35",0x1EA1],
+  ["8135FE36",0x1EA2],
+  ["8135FE37",0x1EA3],
+  ["8135FE38",0x1EA4],
+  ["8135FE39",0x1EA5],
+  ["81368130",0x1EA6],
+  ["81368131",0x1EA7],
+  ["81368132",0x1EA8],
+  ["81368133",0x1EA9],
+  ["81368134",0x1EAA],
+  ["81368135",0x1EAB],
+  ["81368136",0x1EAC],
+  ["81368137",0x1EAD],
+  ["81368138",0x1EAE],
+  ["81368139",0x1EAF],
+  ["81368230",0x1EB0],
+  ["81368231",0x1EB1],
+  ["81368232",0x1EB2],
+  ["81368233",0x1EB3],
+  ["81368234",0x1EB4],
+  ["81368235",0x1EB5],
+  ["81368236",0x1EB6],
+  ["81368237",0x1EB7],
+  ["81368238",0x1EB8],
+  ["81368239",0x1EB9],
+  ["81368330",0x1EBA],
+  ["81368331",0x1EBB],
+  ["81368332",0x1EBC],
+  ["81368333",0x1EBD],
+  ["81368334",0x1EBE],
+  ["81368335",0x1EBF],
+  ["81368336",0x1EC0],
+  ["81368337",0x1EC1],
+  ["81368338",0x1EC2],
+  ["81368339",0x1EC3],
+  ["81368430",0x1EC4],
+  ["81368431",0x1EC5],
+  ["81368432",0x1EC6],
+  ["81368433",0x1EC7],
+  ["81368434",0x1EC8],
+  ["81368435",0x1EC9],
+  ["81368436",0x1ECA],
+  ["81368437",0x1ECB],
+  ["81368438",0x1ECC],
+  ["81368439",0x1ECD],
+  ["81368530",0x1ECE],
+  ["81368531",0x1ECF],
+  ["81368532",0x1ED0],
+  ["81368533",0x1ED1],
+  ["81368534",0x1ED2],
+  ["81368535",0x1ED3],
+  ["81368536",0x1ED4],
+  ["81368537",0x1ED5],
+  ["81368538",0x1ED6],
+  ["81368539",0x1ED7],
+  ["81368630",0x1ED8],
+  ["81368631",0x1ED9],
+  ["81368632",0x1EDA],
+  ["81368633",0x1EDB],
+  ["81368634",0x1EDC],
+  ["81368635",0x1EDD],
+  ["81368636",0x1EDE],
+  ["81368637",0x1EDF],
+  ["81368638",0x1EE0],
+  ["81368639",0x1EE1],
+  ["81368730",0x1EE2],
+  ["81368731",0x1EE3],
+  ["81368732",0x1EE4],
+  ["81368733",0x1EE5],
+  ["81368734",0x1EE6],
+  ["81368735",0x1EE7],
+  ["81368736",0x1EE8],
+  ["81368737",0x1EE9],
+  ["81368738",0x1EEA],
+  ["81368739",0x1EEB],
+  ["81368830",0x1EEC],
+  ["81368831",0x1EED],
+  ["81368832",0x1EEE],
+  ["81368833",0x1EEF],
+  ["81368834",0x1EF0],
+  ["81368835",0x1EF1],
+  ["81368836",0x1EF2],
+  ["81368837",0x1EF3],
+  ["81368838",0x1EF4],
+  ["81368839",0x1EF5],
+  ["81368930",0x1EF6],
+  ["81368931",0x1EF7],
+  ["81368932",0x1EF8],
+  ["81368933",0x1EF9],
+  ["81368934",0x1EFA],
+  ["81368935",0x1EFB],
+  ["81368936",0x1EFC],
+  ["81368937",0x1EFD],
+  ["81368938",0x1EFE],
+  ["81368939",0x1EFF],
+  ["81368A30",0x1F00],
+  ["81368A31",0x1F01],
+  ["81368A32",0x1F02],
+  ["81368A33",0x1F03],
+  ["81368A34",0x1F04],
+  ["81368A35",0x1F05],
+  ["81368A36",0x1F06],
+  ["81368A37",0x1F07],
+  ["81368A38",0x1F08],
+  ["81368A39",0x1F09],
+  ["81368B30",0x1F0A],
+  ["81368B31",0x1F0B],
+  ["81368B32",0x1F0C],
+  ["81368B33",0x1F0D],
+  ["81368B34",0x1F0E],
+  ["81368B35",0x1F0F],
+  ["81368B36",0x1F10],
+  ["81368B37",0x1F11],
+  ["81368B38",0x1F12],
+  ["81368B39",0x1F13],
+  ["81368C30",0x1F14],
+  ["81368C31",0x1F15],
+  ["81368C32",0x1F16],
+  ["81368C33",0x1F17],
+  ["81368C34",0x1F18],
+  ["81368C35",0x1F19],
+  ["81368C36",0x1F1A],
+  ["81368C37",0x1F1B],
+  ["81368C38",0x1F1C],
+  ["81368C39",0x1F1D],
+  ["81368D30",0x1F1E],
+  ["81368D31",0x1F1F],
+  ["81368D32",0x1F20],
+  ["81368D33",0x1F21],
+  ["81368D34",0x1F22],
+  ["81368D35",0x1F23],
+  ["81368D36",0x1F24],
+  ["81368D37",0x1F25],
+  ["81368D38",0x1F26],
+  ["81368D39",0x1F27],
+  ["81368E30",0x1F28],
+  ["81368E31",0x1F29],
+  ["81368E32",0x1F2A],
+  ["81368E33",0x1F2B],
+  ["81368E34",0x1F2C],
+  ["81368E35",0x1F2D],
+  ["81368E36",0x1F2E],
+  ["81368E37",0x1F2F],
+  ["81368E38",0x1F30],
+  ["81368E39",0x1F31],
+  ["81368F30",0x1F32],
+  ["81368F31",0x1F33],
+  ["81368F32",0x1F34],
+  ["81368F33",0x1F35],
+  ["81368F34",0x1F36],
+  ["81368F35",0x1F37],
+  ["81368F36",0x1F38],
+  ["81368F37",0x1F39],
+  ["81368F38",0x1F3A],
+  ["81368F39",0x1F3B],
+  ["81369030",0x1F3C],
+  ["81369031",0x1F3D],
+  ["81369032",0x1F3E],
+  ["81369033",0x1F3F],
+  ["81369034",0x1F40],
+  ["81369035",0x1F41],
+  ["81369036",0x1F42],
+  ["81369037",0x1F43],
+  ["81369038",0x1F44],
+  ["81369039",0x1F45],
+  ["81369130",0x1F46],
+  ["81369131",0x1F47],
+  ["81369132",0x1F48],
+  ["81369133",0x1F49],
+  ["81369134",0x1F4A],
+  ["81369135",0x1F4B],
+  ["81369136",0x1F4C],
+  ["81369137",0x1F4D],
+  ["81369138",0x1F4E],
+  ["81369139",0x1F4F],
+  ["81369230",0x1F50],
+  ["81369231",0x1F51],
+  ["81369232",0x1F52],
+  ["81369233",0x1F53],
+  ["81369234",0x1F54],
+  ["81369235",0x1F55],
+  ["81369236",0x1F56],
+  ["81369237",0x1F57],
+  ["81369238",0x1F58],
+  ["81369239",0x1F59],
+  ["81369330",0x1F5A],
+  ["81369331",0x1F5B],
+  ["81369332",0x1F5C],
+  ["81369333",0x1F5D],
+  ["81369334",0x1F5E],
+  ["81369335",0x1F5F],
+  ["81369336",0x1F60],
+  ["81369337",0x1F61],
+  ["81369338",0x1F62],
+  ["81369339",0x1F63],
+  ["81369430",0x1F64],
+  ["81369431",0x1F65],
+  ["81369432",0x1F66],
+  ["81369433",0x1F67],
+  ["81369434",0x1F68],
+  ["81369435",0x1F69],
+  ["81369436",0x1F6A],
+  ["81369437",0x1F6B],
+  ["81369438",0x1F6C],
+  ["81369439",0x1F6D],
+  ["81369530",0x1F6E],
+  ["81369531",0x1F6F],
+  ["81369532",0x1F70],
+  ["81369533",0x1F71],
+  ["81369534",0x1F72],
+  ["81369535",0x1F73],
+  ["81369536",0x1F74],
+  ["81369537",0x1F75],
+  ["81369538",0x1F76],
+  ["81369539",0x1F77],
+  ["81369630",0x1F78],
+  ["81369631",0x1F79],
+  ["81369632",0x1F7A],
+  ["81369633",0x1F7B],
+  ["81369634",0x1F7C],
+  ["81369635",0x1F7D],
+  ["81369636",0x1F7E],
+  ["81369637",0x1F7F],
+  ["81369638",0x1F80],
+  ["81369639",0x1F81],
+  ["81369730",0x1F82],
+  ["81369731",0x1F83],
+  ["81369732",0x1F84],
+  ["81369733",0x1F85],
+  ["81369734",0x1F86],
+  ["81369735",0x1F87],
+  ["81369736",0x1F88],
+  ["81369737",0x1F89],
+  ["81369738",0x1F8A],
+  ["81369739",0x1F8B],
+  ["81369830",0x1F8C],
+  ["81369831",0x1F8D],
+  ["81369832",0x1F8E],
+  ["81369833",0x1F8F],
+  ["81369834",0x1F90],
+  ["81369835",0x1F91],
+  ["81369836",0x1F92],
+  ["81369837",0x1F93],
+  ["81369838",0x1F94],
+  ["81369839",0x1F95],
+  ["81369930",0x1F96],
+  ["81369931",0x1F97],
+  ["81369932",0x1F98],
+  ["81369933",0x1F99],
+  ["81369934",0x1F9A],
+  ["81369935",0x1F9B],
+  ["81369936",0x1F9C],
+  ["81369937",0x1F9D],
+  ["81369938",0x1F9E],
+  ["81369939",0x1F9F],
+  ["81369A30",0x1FA0],
+  ["81369A31",0x1FA1],
+  ["81369A32",0x1FA2],
+  ["81369A33",0x1FA3],
+  ["81369A34",0x1FA4],
+  ["81369A35",0x1FA5],
+  ["81369A36",0x1FA6],
+  ["81369A37",0x1FA7],
+  ["81369A38",0x1FA8],
+  ["81369A39",0x1FA9],
+  ["81369B30",0x1FAA],
+  ["81369B31",0x1FAB],
+  ["81369B32",0x1FAC],
+  ["81369B33",0x1FAD],
+  ["81369B34",0x1FAE],
+  ["81369B35",0x1FAF],
+  ["81369B36",0x1FB0],
+  ["81369B37",0x1FB1],
+  ["81369B38",0x1FB2],
+  ["81369B39",0x1FB3],
+  ["81369C30",0x1FB4],
+  ["81369C31",0x1FB5],
+  ["81369C32",0x1FB6],
+  ["81369C33",0x1FB7],
+  ["81369C34",0x1FB8],
+  ["81369C35",0x1FB9],
+  ["81369C36",0x1FBA],
+  ["81369C37",0x1FBB],
+  ["81369C38",0x1FBC],
+  ["81369C39",0x1FBD],
+  ["81369D30",0x1FBE],
+  ["81369D31",0x1FBF],
+  ["81369D32",0x1FC0],
+  ["81369D33",0x1FC1],
+  ["81369D34",0x1FC2],
+  ["81369D35",0x1FC3],
+  ["81369D36",0x1FC4],
+  ["81369D37",0x1FC5],
+  ["81369D38",0x1FC6],
+  ["81369D39",0x1FC7],
+  ["81369E30",0x1FC8],
+  ["81369E31",0x1FC9],
+  ["81369E32",0x1FCA],
+  ["81369E33",0x1FCB],
+  ["81369E34",0x1FCC],
+  ["81369E35",0x1FCD],
+  ["81369E36",0x1FCE],
+  ["81369E37",0x1FCF],
+  ["81369E38",0x1FD0],
+  ["81369E39",0x1FD1],
+  ["81369F30",0x1FD2],
+  ["81369F31",0x1FD3],
+  ["81369F32",0x1FD4],
+  ["81369F33",0x1FD5],
+  ["81369F34",0x1FD6],
+  ["81369F35",0x1FD7],
+  ["81369F36",0x1FD8],
+  ["81369F37",0x1FD9],
+  ["81369F38",0x1FDA],
+  ["81369F39",0x1FDB],
+  ["8136A030",0x1FDC],
+  ["8136A031",0x1FDD],
+  ["8136A032",0x1FDE],
+  ["8136A033",0x1FDF],
+  ["8136A034",0x1FE0],
+  ["8136A035",0x1FE1],
+  ["8136A036",0x1FE2],
+  ["8136A037",0x1FE3],
+  ["8136A038",0x1FE4],
+  ["8136A039",0x1FE5],
+  ["8136A130",0x1FE6],
+  ["8136A131",0x1FE7],
+  ["8136A132",0x1FE8],
+  ["8136A133",0x1FE9],
+  ["8136A134",0x1FEA],
+  ["8136A135",0x1FEB],
+  ["8136A136",0x1FEC],
+  ["8136A137",0x1FED],
+  ["8136A138",0x1FEE],
+  ["8136A139",0x1FEF],
+  ["8136A230",0x1FF0],
+  ["8136A231",0x1FF1],
+  ["8136A232",0x1FF2],
+  ["8136A233",0x1FF3],
+  ["8136A234",0x1FF4],
+  ["8136A235",0x1FF5],
+  ["8136A236",0x1FF6],
+  ["8136A237",0x1FF7],
+  ["8136A238",0x1FF8],
+  ["8136A239",0x1FF9],
+  ["8136A330",0x1FFA],
+  ["8136A331",0x1FFB],
+  ["8136A332",0x1FFC],
+  ["8136A333",0x1FFD],
+  ["8136A334",0x1FFE],
+  ["8136A335",0x1FFF],
+  ["8136A336",0x2000],
+  ["8136A337",0x2001],
+  ["8136A338",0x2002],
+  ["8136A339",0x2003],
+  ["8136A430",0x2004],
+  ["8136A431",0x2005],
+  ["8136A432",0x2006],
+  ["8136A433",0x2007],
+  ["8136A434",0x2008],
+  ["8136A435",0x2009],
+  ["8136A436",0x200A],
+  ["8136A437",0x200B],
+  ["8136A438",0x200C],
+  ["8136A439",0x200D],
+  ["8136A530",0x200E],
+  ["8136A531",0x200F],
+  ["A95C",0x2010],
+  ["8136A532",0x2011],
+  ["8136A533",0x2012],
+  ["A843",0x2013],
+  ["A1AA",0x2014],
+  ["A844",0x2015],
+  ["A1AC",0x2016],
+  ["8136A534",0x2017],
+  ["A1AE",0x2018],
+  ["A1AF",0x2019],
+  ["8136A535",0x201A],
+  ["8136A536",0x201B],
+  ["A1B0",0x201C],
+  ["A1B1",0x201D],
+  ["8136A537",0x201E],
+  ["8136A538",0x201F],
+  ["8136A539",0x2020],
+  ["8136A630",0x2021],
+  ["8136A631",0x2022],
+  ["8136A632",0x2023],
+  ["8136A633",0x2024],
+  ["A845",0x2025],
+  ["A1AD",0x2026],
+  ["8136A634",0x2027],
+  ["8136A635",0x2028],
+  ["8136A636",0x2029],
+  ["8136A637",0x202A],
+  ["8136A638",0x202B],
+  ["8136A639",0x202C],
+  ["8136A730",0x202D],
+  ["8136A731",0x202E],
+  ["8136A732",0x202F],
+  ["A1EB",0x2030],
+  ["8136A733",0x2031],
+  ["A1E4",0x2032],
+  ["A1E5",0x2033],
+  ["8136A734",0x2034],
+  ["A846",0x2035],
+  ["8136A735",0x2036],
+  ["8136A736",0x2037],
+  ["8136A737",0x2038],
+  ["8136A738",0x2039],
+  ["8136A739",0x203A],
+  ["A1F9",0x203B],
+  ["8136A830",0x203C],
+  ["8136A831",0x203D],
+  ["8136A832",0x203E],
+  ["8136A833",0x203F],
+  ["8136A834",0x2040],
+  ["8136A835",0x2041],
+  ["8136A836",0x2042],
+  ["8136A837",0x2043],
+  ["8136A838",0x2044],
+  ["8136A839",0x2045],
+  ["8136A930",0x2046],
+  ["8136A931",0x2047],
+  ["8136A932",0x2048],
+  ["8136A933",0x2049],
+  ["8136A934",0x204A],
+  ["8136A935",0x204B],
+  ["8136A936",0x204C],
+  ["8136A937",0x204D],
+  ["8136A938",0x204E],
+  ["8136A939",0x204F],
+  ["8136AA30",0x2050],
+  ["8136AA31",0x2051],
+  ["8136AA32",0x2052],
+  ["8136AA33",0x2053],
+  ["8136AA34",0x2054],
+  ["8136AA35",0x2055],
+  ["8136AA36",0x2056],
+  ["8136AA37",0x2057],
+  ["8136AA38",0x2058],
+  ["8136AA39",0x2059],
+  ["8136AB30",0x205A],
+  ["8136AB31",0x205B],
+  ["8136AB32",0x205C],
+  ["8136AB33",0x205D],
+  ["8136AB34",0x205E],
+  ["8136AB35",0x205F],
+  ["8136AB36",0x2060],
+  ["8136AB37",0x2061],
+  ["8136AB38",0x2062],
+  ["8136AB39",0x2063],
+  ["8136AC30",0x2064],
+  ["8136AC31",0x2065],
+  ["8136AC32",0x2066],
+  ["8136AC33",0x2067],
+  ["8136AC34",0x2068],
+  ["8136AC35",0x2069],
+  ["8136AC36",0x206A],
+  ["8136AC37",0x206B],
+  ["8136AC38",0x206C],
+  ["8136AC39",0x206D],
+  ["8136AD30",0x206E],
+  ["8136AD31",0x206F],
+  ["8136AD32",0x2070],
+  ["8136AD33",0x2071],
+  ["8136AD34",0x2072],
+  ["8136AD35",0x2073],
+  ["8136AD36",0x2074],
+  ["8136AD37",0x2075],
+  ["8136AD38",0x2076],
+  ["8136AD39",0x2077],
+  ["8136AE30",0x2078],
+  ["8136AE31",0x2079],
+  ["8136AE32",0x207A],
+  ["8136AE33",0x207B],
+  ["8136AE34",0x207C],
+  ["8136AE35",0x207D],
+  ["8136AE36",0x207E],
+  ["8136AE37",0x207F],
+  ["8136AE38",0x2080],
+  ["8136AE39",0x2081],
+  ["8136AF30",0x2082],
+  ["8136AF31",0x2083],
+  ["8136AF32",0x2084],
+  ["8136AF33",0x2085],
+  ["8136AF34",0x2086],
+  ["8136AF35",0x2087],
+  ["8136AF36",0x2088],
+  ["8136AF37",0x2089],
+  ["8136AF38",0x208A],
+  ["8136AF39",0x208B],
+  ["8136B030",0x208C],
+  ["8136B031",0x208D],
+  ["8136B032",0x208E],
+  ["8136B033",0x208F],
+  ["8136B034",0x2090],
+  ["8136B035",0x2091],
+  ["8136B036",0x2092],
+  ["8136B037",0x2093],
+  ["8136B038",0x2094],
+  ["8136B039",0x2095],
+  ["8136B130",0x2096],
+  ["8136B131",0x2097],
+  ["8136B132",0x2098],
+  ["8136B133",0x2099],
+  ["8136B134",0x209A],
+  ["8136B135",0x209B],
+  ["8136B136",0x209C],
+  ["8136B137",0x209D],
+  ["8136B138",0x209E],
+  ["8136B139",0x209F],
+  ["8136B230",0x20A0],
+  ["8136B231",0x20A1],
+  ["8136B232",0x20A2],
+  ["8136B233",0x20A3],
+  ["8136B234",0x20A4],
+  ["8136B235",0x20A5],
+  ["8136B236",0x20A6],
+  ["8136B237",0x20A7],
+  ["8136B238",0x20A8],
+  ["8136B239",0x20A9],
+  ["8136B330",0x20AA],
+  ["8136B331",0x20AB],
+  ["A2E3",0x20AC],
+  ["8136B332",0x20AD],
+  ["8136B333",0x20AE],
+  ["8136B334",0x20AF],
+  ["8136B335",0x20B0],
+  ["8136B336",0x20B1],
+  ["8136B337",0x20B2],
+  ["8136B338",0x20B3],
+  ["8136B339",0x20B4],
+  ["8136B430",0x20B5],
+  ["8136B431",0x20B6],
+  ["8136B432",0x20B7],
+  ["8136B433",0x20B8],
+  ["8136B434",0x20B9],
+  ["8136B435",0x20BA],
+  ["8136B436",0x20BB],
+  ["8136B437",0x20BC],
+  ["8136B438",0x20BD],
+  ["8136B439",0x20BE],
+  ["8136B530",0x20BF],
+  ["8136B531",0x20C0],
+  ["8136B532",0x20C1],
+  ["8136B533",0x20C2],
+  ["8136B534",0x20C3],
+  ["8136B535",0x20C4],
+  ["8136B536",0x20C5],
+  ["8136B537",0x20C6],
+  ["8136B538",0x20C7],
+  ["8136B539",0x20C8],
+  ["8136B630",0x20C9],
+  ["8136B631",0x20CA],
+  ["8136B632",0x20CB],
+  ["8136B633",0x20CC],
+  ["8136B634",0x20CD],
+  ["8136B635",0x20CE],
+  ["8136B636",0x20CF],
+  ["8136B637",0x20D0],
+  ["8136B638",0x20D1],
+  ["8136B639",0x20D2],
+  ["8136B730",0x20D3],
+  ["8136B731",0x20D4],
+  ["8136B732",0x20D5],
+  ["8136B733",0x20D6],
+  ["8136B734",0x20D7],
+  ["8136B735",0x20D8],
+  ["8136B736",0x20D9],
+  ["8136B737",0x20DA],
+  ["8136B738",0x20DB],
+  ["8136B739",0x20DC],
+  ["8136B830",0x20DD],
+  ["8136B831",0x20DE],
+  ["8136B832",0x20DF],
+  ["8136B833",0x20E0],
+  ["8136B834",0x20E1],
+  ["8136B835",0x20E2],
+  ["8136B836",0x20E3],
+  ["8136B837",0x20E4],
+  ["8136B838",0x20E5],
+  ["8136B839",0x20E6],
+  ["8136B930",0x20E7],
+  ["8136B931",0x20E8],
+  ["8136B932",0x20E9],
+  ["8136B933",0x20EA],
+  ["8136B934",0x20EB],
+  ["8136B935",0x20EC],
+  ["8136B936",0x20ED],
+  ["8136B937",0x20EE],
+  ["8136B938",0x20EF],
+  ["8136B939",0x20F0],
+  ["8136BA30",0x20F1],
+  ["8136BA31",0x20F2],
+  ["8136BA32",0x20F3],
+  ["8136BA33",0x20F4],
+  ["8136BA34",0x20F5],
+  ["8136BA35",0x20F6],
+  ["8136BA36",0x20F7],
+  ["8136BA37",0x20F8],
+  ["8136BA38",0x20F9],
+  ["8136BA39",0x20FA],
+  ["8136BB30",0x20FB],
+  ["8136BB31",0x20FC],
+  ["8136BB32",0x20FD],
+  ["8136BB33",0x20FE],
+  ["8136BB34",0x20FF],
+  ["8136BB35",0x2100],
+  ["8136BB36",0x2101],
+  ["8136BB37",0x2102],
+  ["A1E6",0x2103],
+  ["8136BB38",0x2104],
+  ["A847",0x2105],
+  ["8136BB39",0x2106],
+  ["8136BC30",0x2107],
+  ["8136BC31",0x2108],
+  ["A848",0x2109],
+  ["8136BC32",0x210A],
+  ["8136BC33",0x210B],
+  ["8136BC34",0x210C],
+  ["8136BC35",0x210D],
+  ["8136BC36",0x210E],
+  ["8136BC37",0x210F],
+  ["8136BC38",0x2110],
+  ["8136BC39",0x2111],
+  ["8136BD30",0x2112],
+  ["8136BD31",0x2113],
+  ["8136BD32",0x2114],
+  ["8136BD33",0x2115],
+  ["A1ED",0x2116],
+  ["8136BD34",0x2117],
+  ["8136BD35",0x2118],
+  ["8136BD36",0x2119],
+  ["8136BD37",0x211A],
+  ["8136BD38",0x211B],
+  ["8136BD39",0x211C],
+  ["8136BE30",0x211D],
+  ["8136BE31",0x211E],
+  ["8136BE32",0x211F],
+  ["8136BE33",0x2120],
+  ["A959",0x2121],
+  ["8136BE34",0x2122],
+  ["8136BE35",0x2123],
+  ["8136BE36",0x2124],
+  ["8136BE37",0x2125],
+  ["8136BE38",0x2126],
+  ["8136BE39",0x2127],
+  ["8136BF30",0x2128],
+  ["8136BF31",0x2129],
+  ["8136BF32",0x212A],
+  ["8136BF33",0x212B],
+  ["8136BF34",0x212C],
+  ["8136BF35",0x212D],
+  ["8136BF36",0x212E],
+  ["8136BF37",0x212F],
+  ["8136BF38",0x2130],
+  ["8136BF39",0x2131],
+  ["8136C030",0x2132],
+  ["8136C031",0x2133],
+  ["8136C032",0x2134],
+  ["8136C033",0x2135],
+  ["8136C034",0x2136],
+  ["8136C035",0x2137],
+  ["8136C036",0x2138],
+  ["8136C037",0x2139],
+  ["8136C038",0x213A],
+  ["8136C039",0x213B],
+  ["8136C130",0x213C],
+  ["8136C131",0x213D],
+  ["8136C132",0x213E],
+  ["8136C133",0x213F],
+  ["8136C134",0x2140],
+  ["8136C135",0x2141],
+  ["8136C136",0x2142],
+  ["8136C137",0x2143],
+  ["8136C138",0x2144],
+  ["8136C139",0x2145],
+  ["8136C230",0x2146],
+  ["8136C231",0x2147],
+  ["8136C232",0x2148],
+  ["8136C233",0x2149],
+  ["8136C234",0x214A],
+  ["8136C235",0x214B],
+  ["8136C236",0x214C],
+  ["8136C237",0x214D],
+  ["8136C238",0x214E],
+  ["8136C239",0x214F],
+  ["8136C330",0x2150],
+  ["8136C331",0x2151],
+  ["8136C332",0x2152],
+  ["8136C333",0x2153],
+  ["8136C334",0x2154],
+  ["8136C335",0x2155],
+  ["8136C336",0x2156],
+  ["8136C337",0x2157],
+  ["8136C338",0x2158],
+  ["8136C339",0x2159],
+  ["8136C430",0x215A],
+  ["8136C431",0x215B],
+  ["8136C432",0x215C],
+  ["8136C433",0x215D],
+  ["8136C434",0x215E],
+  ["8136C435",0x215F],
+  ["A2F1",0x2160],
+  ["A2F2",0x2161],
+  ["A2F3",0x2162],
+  ["A2F4",0x2163],
+  ["A2F5",0x2164],
+  ["A2F6",0x2165],
+  ["A2F7",0x2166],
+  ["A2F8",0x2167],
+  ["A2F9",0x2168],
+  ["A2FA",0x2169],
+  ["A2FB",0x216A],
+  ["A2FC",0x216B],
+  ["8136C436",0x216C],
+  ["8136C437",0x216D],
+  ["8136C438",0x216E],
+  ["8136C439",0x216F],
+  ["A2A1",0x2170],
+  ["A2A2",0x2171],
+  ["A2A3",0x2172],
+  ["A2A4",0x2173],
+  ["A2A5",0x2174],
+  ["A2A6",0x2175],
+  ["A2A7",0x2176],
+  ["A2A8",0x2177],
+  ["A2A9",0x2178],
+  ["A2AA",0x2179],
+  ["8136C530",0x217A],
+  ["8136C531",0x217B],
+  ["8136C532",0x217C],
+  ["8136C533",0x217D],
+  ["8136C534",0x217E],
+  ["8136C535",0x217F],
+  ["8136C536",0x2180],
+  ["8136C537",0x2181],
+  ["8136C538",0x2182],
+  ["8136C539",0x2183],
+  ["8136C630",0x2184],
+  ["8136C631",0x2185],
+  ["8136C632",0x2186],
+  ["8136C633",0x2187],
+  ["8136C634",0x2188],
+  ["8136C635",0x2189],
+  ["8136C636",0x218A],
+  ["8136C637",0x218B],
+  ["8136C638",0x218C],
+  ["8136C639",0x218D],
+  ["8136C730",0x218E],
+  ["8136C731",0x218F],
+  ["A1FB",0x2190],
+  ["A1FC",0x2191],
+  ["A1FA",0x2192],
+  ["A1FD",0x2193],
+  ["8136C732",0x2194],
+  ["8136C733",0x2195],
+  ["A849",0x2196],
+  ["A84A",0x2197],
+  ["A84B",0x2198],
+  ["A84C",0x2199],
+  ["8136C734",0x219A],
+  ["8136C735",0x219B],
+  ["8136C736",0x219C],
+  ["8136C737",0x219D],
+  ["8136C738",0x219E],
+  ["8136C739",0x219F],
+  ["8136C830",0x21A0],
+  ["8136C831",0x21A1],
+  ["8136C832",0x21A2],
+  ["8136C833",0x21A3],
+  ["8136C834",0x21A4],
+  ["8136C835",0x21A5],
+  ["8136C836",0x21A6],
+  ["8136C837",0x21A7],
+  ["8136C838",0x21A8],
+  ["8136C839",0x21A9],
+  ["8136C930",0x21AA],
+  ["8136C931",0x21AB],
+  ["8136C932",0x21AC],
+  ["8136C933",0x21AD],
+  ["8136C934",0x21AE],
+  ["8136C935",0x21AF],
+  ["8136C936",0x21B0],
+  ["8136C937",0x21B1],
+  ["8136C938",0x21B2],
+  ["8136C939",0x21B3],
+  ["8136CA30",0x21B4],
+  ["8136CA31",0x21B5],
+  ["8136CA32",0x21B6],
+  ["8136CA33",0x21B7],
+  ["8136CA34",0x21B8],
+  ["8136CA35",0x21B9],
+  ["8136CA36",0x21BA],
+  ["8136CA37",0x21BB],
+  ["8136CA38",0x21BC],
+  ["8136CA39",0x21BD],
+  ["8136CB30",0x21BE],
+  ["8136CB31",0x21BF],
+  ["8136CB32",0x21C0],
+  ["8136CB33",0x21C1],
+  ["8136CB34",0x21C2],
+  ["8136CB35",0x21C3],
+  ["8136CB36",0x21C4],
+  ["8136CB37",0x21C5],
+  ["8136CB38",0x21C6],
+  ["8136CB39",0x21C7],
+  ["8136CC30",0x21C8],
+  ["8136CC31",0x21C9],
+  ["8136CC32",0x21CA],
+  ["8136CC33",0x21CB],
+  ["8136CC34",0x21CC],
+  ["8136CC35",0x21CD],
+  ["8136CC36",0x21CE],
+  ["8136CC37",0x21CF],
+  ["8136CC38",0x21D0],
+  ["8136CC39",0x21D1],
+  ["8136CD30",0x21D2],
+  ["8136CD31",0x21D3],
+  ["8136CD32",0x21D4],
+  ["8136CD33",0x21D5],
+  ["8136CD34",0x21D6],
+  ["8136CD35",0x21D7],
+  ["8136CD36",0x21D8],
+  ["8136CD37",0x21D9],
+  ["8136CD38",0x21DA],
+  ["8136CD39",0x21DB],
+  ["8136CE30",0x21DC],
+  ["8136CE31",0x21DD],
+  ["8136CE32",0x21DE],
+  ["8136CE33",0x21DF],
+  ["8136CE34",0x21E0],
+  ["8136CE35",0x21E1],
+  ["8136CE36",0x21E2],
+  ["8136CE37",0x21E3],
+  ["8136CE38",0x21E4],
+  ["8136CE39",0x21E5],
+  ["8136CF30",0x21E6],
+  ["8136CF31",0x21E7],
+  ["8136CF32",0x21E8],
+  ["8136CF33",0x21E9],
+  ["8136CF34",0x21EA],
+  ["8136CF35",0x21EB],
+  ["8136CF36",0x21EC],
+  ["8136CF37",0x21ED],
+  ["8136CF38",0x21EE],
+  ["8136CF39",0x21EF],
+  ["8136D030",0x21F0],
+  ["8136D031",0x21F1],
+  ["8136D032",0x21F2],
+  ["8136D033",0x21F3],
+  ["8136D034",0x21F4],
+  ["8136D035",0x21F5],
+  ["8136D036",0x21F6],
+  ["8136D037",0x21F7],
+  ["8136D038",0x21F8],
+  ["8136D039",0x21F9],
+  ["8136D130",0x21FA],
+  ["8136D131",0x21FB],
+  ["8136D132",0x21FC],
+  ["8136D133",0x21FD],
+  ["8136D134",0x21FE],
+  ["8136D135",0x21FF],
+  ["8136D136",0x2200],
+  ["8136D137",0x2201],
+  ["8136D138",0x2202],
+  ["8136D139",0x2203],
+  ["8136D230",0x2204],
+  ["8136D231",0x2205],
+  ["8136D232",0x2206],
+  ["8136D233",0x2207],
+  ["A1CA",0x2208],
+  ["8136D234",0x2209],
+  ["8136D235",0x220A],
+  ["8136D236",0x220B],
+  ["8136D237",0x220C],
+  ["8136D238",0x220D],
+  ["8136D239",0x220E],
+  ["A1C7",0x220F],
+  ["8136D330",0x2210],
+  ["A1C6",0x2211],
+  ["8136D331",0x2212],
+  ["8136D332",0x2213],
+  ["8136D333",0x2214],
+  ["A84D",0x2215],
+  ["8136D334",0x2216],
+  ["8136D335",0x2217],
+  ["8136D336",0x2218],
+  ["8136D337",0x2219],
+  ["A1CC",0x221A],
+  ["8136D338",0x221B],
+  ["8136D339",0x221C],
+  ["A1D8",0x221D],
+  ["A1DE",0x221E],
+  ["A84E",0x221F],
+  ["A1CF",0x2220],
+  ["8136D430",0x2221],
+  ["8136D431",0x2222],
+  ["A84F",0x2223],
+  ["8136D432",0x2224],
+  ["A1CE",0x2225],
+  ["8136D433",0x2226],
+  ["A1C4",0x2227],
+  ["A1C5",0x2228],
+  ["A1C9",0x2229],
+  ["A1C8",0x222A],
+  ["A1D2",0x222B],
+  ["8136D434",0x222C],
+  ["8136D435",0x222D],
+  ["A1D3",0x222E],
+  ["8136D436",0x222F],
+  ["8136D437",0x2230],
+  ["8136D438",0x2231],
+  ["8136D439",0x2232],
+  ["8136D530",0x2233],
+  ["A1E0",0x2234],
+  ["A1DF",0x2235],
+  ["A1C3",0x2236],
+  ["A1CB",0x2237],
+  ["8136D531",0x2238],
+  ["8136D532",0x2239],
+  ["8136D533",0x223A],
+  ["8136D534",0x223B],
+  ["8136D535",0x223C],
+  ["A1D7",0x223D],
+  ["8136D536",0x223E],
+  ["8136D537",0x223F],
+  ["8136D538",0x2240],
+  ["8136D539",0x2241],
+  ["8136D630",0x2242],
+  ["8136D631",0x2243],
+  ["8136D632",0x2244],
+  ["8136D633",0x2245],
+  ["8136D634",0x2246],
+  ["8136D635",0x2247],
+  ["A1D6",0x2248],
+  ["8136D636",0x2249],
+  ["8136D637",0x224A],
+  ["8136D638",0x224B],
+  ["A1D5",0x224C],
+  ["8136D639",0x224D],
+  ["8136D730",0x224E],
+  ["8136D731",0x224F],
+  ["8136D732",0x2250],
+  ["8136D733",0x2251],
+  ["A850",0x2252],
+  ["8136D734",0x2253],
+  ["8136D735",0x2254],
+  ["8136D736",0x2255],
+  ["8136D737",0x2256],
+  ["8136D738",0x2257],
+  ["8136D739",0x2258],
+  ["8136D830",0x2259],
+  ["8136D831",0x225A],
+  ["8136D832",0x225B],
+  ["8136D833",0x225C],
+  ["8136D834",0x225D],
+  ["8136D835",0x225E],
+  ["8136D836",0x225F],
+  ["A1D9",0x2260],
+  ["A1D4",0x2261],
+  ["8136D837",0x2262],
+  ["8136D838",0x2263],
+  ["A1DC",0x2264],
+  ["A1DD",0x2265],
+  ["A851",0x2266],
+  ["A852",0x2267],
+  ["8136D839",0x2268],
+  ["8136D930",0x2269],
+  ["8136D931",0x226A],
+  ["8136D932",0x226B],
+  ["8136D933",0x226C],
+  ["8136D934",0x226D],
+  ["A1DA",0x226E],
+  ["A1DB",0x226F],
+  ["8136D935",0x2270],
+  ["8136D936",0x2271],
+  ["8136D937",0x2272],
+  ["8136D938",0x2273],
+  ["8136D939",0x2274],
+  ["8136DA30",0x2275],
+  ["8136DA31",0x2276],
+  ["8136DA32",0x2277],
+  ["8136DA33",0x2278],
+  ["8136DA34",0x2279],
+  ["8136DA35",0x227A],
+  ["8136DA36",0x227B],
+  ["8136DA37",0x227C],
+  ["8136DA38",0x227D],
+  ["8136DA39",0x227E],
+  ["8136DB30",0x227F],
+  ["8136DB31",0x2280],
+  ["8136DB32",0x2281],
+  ["8136DB33",0x2282],
+  ["8136DB34",0x2283],
+  ["8136DB35",0x2284],
+  ["8136DB36",0x2285],
+  ["8136DB37",0x2286],
+  ["8136DB38",0x2287],
+  ["8136DB39",0x2288],
+  ["8136DC30",0x2289],
+  ["8136DC31",0x228A],
+  ["8136DC32",0x228B],
+  ["8136DC33",0x228C],
+  ["8136DC34",0x228D],
+  ["8136DC35",0x228E],
+  ["8136DC36",0x228F],
+  ["8136DC37",0x2290],
+  ["8136DC38",0x2291],
+  ["8136DC39",0x2292],
+  ["8136DD30",0x2293],
+  ["8136DD31",0x2294],
+  ["A892",0x2295],
+  ["8136DD32",0x2296],
+  ["8136DD33",0x2297],
+  ["8136DD34",0x2298],
+  ["A1D1",0x2299],
+  ["8136DD35",0x229A],
+  ["8136DD36",0x229B],
+  ["8136DD37",0x229C],
+  ["8136DD38",0x229D],
+  ["8136DD39",0x229E],
+  ["8136DE30",0x229F],
+  ["8136DE31",0x22A0],
+  ["8136DE32",0x22A1],
+  ["8136DE33",0x22A2],
+  ["8136DE34",0x22A3],
+  ["8136DE35",0x22A4],
+  ["A1CD",0x22A5],
+  ["8136DE36",0x22A6],
+  ["8136DE37",0x22A7],
+  ["8136DE38",0x22A8],
+  ["8136DE39",0x22A9],
+  ["8136DF30",0x22AA],
+  ["8136DF31",0x22AB],
+  ["8136DF32",0x22AC],
+  ["8136DF33",0x22AD],
+  ["8136DF34",0x22AE],
+  ["8136DF35",0x22AF],
+  ["8136DF36",0x22B0],
+  ["8136DF37",0x22B1],
+  ["8136DF38",0x22B2],
+  ["8136DF39",0x22B3],
+  ["8136E030",0x22B4],
+  ["8136E031",0x22B5],
+  ["8136E032",0x22B6],
+  ["8136E033",0x22B7],
+  ["8136E034",0x22B8],
+  ["8136E035",0x22B9],
+  ["8136E036",0x22BA],
+  ["8136E037",0x22BB],
+  ["8136E038",0x22BC],
+  ["8136E039",0x22BD],
+  ["8136E130",0x22BE],
+  ["A853",0x22BF],
+  ["8136E131",0x22C0],
+  ["8136E132",0x22C1],
+  ["8136E133",0x22C2],
+  ["8136E134",0x22C3],
+  ["8136E135",0x22C4],
+  ["8136E136",0x22C5],
+  ["8136E137",0x22C6],
+  ["8136E138",0x22C7],
+  ["8136E139",0x22C8],
+  ["8136E230",0x22C9],
+  ["8136E231",0x22CA],
+  ["8136E232",0x22CB],
+  ["8136E233",0x22CC],
+  ["8136E234",0x22CD],
+  ["8136E235",0x22CE],
+  ["8136E236",0x22CF],
+  ["8136E237",0x22D0],
+  ["8136E238",0x22D1],
+  ["8136E239",0x22D2],
+  ["8136E330",0x22D3],
+  ["8136E331",0x22D4],
+  ["8136E332",0x22D5],
+  ["8136E333",0x22D6],
+  ["8136E334",0x22D7],
+  ["8136E335",0x22D8],
+  ["8136E336",0x22D9],
+  ["8136E337",0x22DA],
+  ["8136E338",0x22DB],
+  ["8136E339",0x22DC],
+  ["8136E430",0x22DD],
+  ["8136E431",0x22DE],
+  ["8136E432",0x22DF],
+  ["8136E433",0x22E0],
+  ["8136E434",0x22E1],
+  ["8136E435",0x22E2],
+  ["8136E436",0x22E3],
+  ["8136E437",0x22E4],
+  ["8136E438",0x22E5],
+  ["8136E439",0x22E6],
+  ["8136E530",0x22E7],
+  ["8136E531",0x22E8],
+  ["8136E532",0x22E9],
+  ["8136E533",0x22EA],
+  ["8136E534",0x22EB],
+  ["8136E535",0x22EC],
+  ["8136E536",0x22ED],
+  ["8136E537",0x22EE],
+  ["8136E538",0x22EF],
+  ["8136E539",0x22F0],
+  ["8136E630",0x22F1],
+  ["8136E631",0x22F2],
+  ["8136E632",0x22F3],
+  ["8136E633",0x22F4],
+  ["8136E634",0x22F5],
+  ["8136E635",0x22F6],
+  ["8136E636",0x22F7],
+  ["8136E637",0x22F8],
+  ["8136E638",0x22F9],
+  ["8136E639",0x22FA],
+  ["8136E730",0x22FB],
+  ["8136E731",0x22FC],
+  ["8136E732",0x22FD],
+  ["8136E733",0x22FE],
+  ["8136E734",0x22FF],
+  ["8136E735",0x2300],
+  ["8136E736",0x2301],
+  ["8136E737",0x2302],
+  ["8136E738",0x2303],
+  ["8136E739",0x2304],
+  ["8136E830",0x2305],
+  ["8136E831",0x2306],
+  ["8136E832",0x2307],
+  ["8136E833",0x2308],
+  ["8136E834",0x2309],
+  ["8136E835",0x230A],
+  ["8136E836",0x230B],
+  ["8136E837",0x230C],
+  ["8136E838",0x230D],
+  ["8136E839",0x230E],
+  ["8136E930",0x230F],
+  ["8136E931",0x2310],
+  ["8136E932",0x2311],
+  ["A1D0",0x2312],
+  ["8136E933",0x2313],
+  ["8136E934",0x2314],
+  ["8136E935",0x2315],
+  ["8136E936",0x2316],
+  ["8136E937",0x2317],
+  ["8136E938",0x2318],
+  ["8136E939",0x2319],
+  ["8136EA30",0x231A],
+  ["8136EA31",0x231B],
+  ["8136EA32",0x231C],
+  ["8136EA33",0x231D],
+  ["8136EA34",0x231E],
+  ["8136EA35",0x231F],
+  ["8136EA36",0x2320],
+  ["8136EA37",0x2321],
+  ["8136EA38",0x2322],
+  ["8136EA39",0x2323],
+  ["8136EB30",0x2324],
+  ["8136EB31",0x2325],
+  ["8136EB32",0x2326],
+  ["8136EB33",0x2327],
+  ["8136EB34",0x2328],
+  ["8136EB35",0x2329],
+  ["8136EB36",0x232A],
+  ["8136EB37",0x232B],
+  ["8136EB38",0x232C],
+  ["8136EB39",0x232D],
+  ["8136EC30",0x232E],
+  ["8136EC31",0x232F],
+  ["8136EC32",0x2330],
+  ["8136EC33",0x2331],
+  ["8136EC34",0x2332],
+  ["8136EC35",0x2333],
+  ["8136EC36",0x2334],
+  ["8136EC37",0x2335],
+  ["8136EC38",0x2336],
+  ["8136EC39",0x2337],
+  ["8136ED30",0x2338],
+  ["8136ED31",0x2339],
+  ["8136ED32",0x233A],
+  ["8136ED33",0x233B],
+  ["8136ED34",0x233C],
+  ["8136ED35",0x233D],
+  ["8136ED36",0x233E],
+  ["8136ED37",0x233F],
+  ["8136ED38",0x2340],
+  ["8136ED39",0x2341],
+  ["8136EE30",0x2342],
+  ["8136EE31",0x2343],
+  ["8136EE32",0x2344],
+  ["8136EE33",0x2345],
+  ["8136EE34",0x2346],
+  ["8136EE35",0x2347],
+  ["8136EE36",0x2348],
+  ["8136EE37",0x2349],
+  ["8136EE38",0x234A],
+  ["8136EE39",0x234B],
+  ["8136EF30",0x234C],
+  ["8136EF31",0x234D],
+  ["8136EF32",0x234E],
+  ["8136EF33",0x234F],
+  ["8136EF34",0x2350],
+  ["8136EF35",0x2351],
+  ["8136EF36",0x2352],
+  ["8136EF37",0x2353],
+  ["8136EF38",0x2354],
+  ["8136EF39",0x2355],
+  ["8136F030",0x2356],
+  ["8136F031",0x2357],
+  ["8136F032",0x2358],
+  ["8136F033",0x2359],
+  ["8136F034",0x235A],
+  ["8136F035",0x235B],
+  ["8136F036",0x235C],
+  ["8136F037",0x235D],
+  ["8136F038",0x235E],
+  ["8136F039",0x235F],
+  ["8136F130",0x2360],
+  ["8136F131",0x2361],
+  ["8136F132",0x2362],
+  ["8136F133",0x2363],
+  ["8136F134",0x2364],
+  ["8136F135",0x2365],
+  ["8136F136",0x2366],
+  ["8136F137",0x2367],
+  ["8136F138",0x2368],
+  ["8136F139",0x2369],
+  ["8136F230",0x236A],
+  ["8136F231",0x236B],
+  ["8136F232",0x236C],
+  ["8136F233",0x236D],
+  ["8136F234",0x236E],
+  ["8136F235",0x236F],
+  ["8136F236",0x2370],
+  ["8136F237",0x2371],
+  ["8136F238",0x2372],
+  ["8136F239",0x2373],
+  ["8136F330",0x2374],
+  ["8136F331",0x2375],
+  ["8136F332",0x2376],
+  ["8136F333",0x2377],
+  ["8136F334",0x2378],
+  ["8136F335",0x2379],
+  ["8136F336",0x237A],
+  ["8136F337",0x237B],
+  ["8136F338",0x237C],
+  ["8136F339",0x237D],
+  ["8136F430",0x237E],
+  ["8136F431",0x237F],
+  ["8136F432",0x2380],
+  ["8136F433",0x2381],
+  ["8136F434",0x2382],
+  ["8136F435",0x2383],
+  ["8136F436",0x2384],
+  ["8136F437",0x2385],
+  ["8136F438",0x2386],
+  ["8136F439",0x2387],
+  ["8136F530",0x2388],
+  ["8136F531",0x2389],
+  ["8136F532",0x238A],
+  ["8136F533",0x238B],
+  ["8136F534",0x238C],
+  ["8136F535",0x238D],
+  ["8136F536",0x238E],
+  ["8136F537",0x238F],
+  ["8136F538",0x2390],
+  ["8136F539",0x2391],
+  ["8136F630",0x2392],
+  ["8136F631",0x2393],
+  ["8136F632",0x2394],
+  ["8136F633",0x2395],
+  ["8136F634",0x2396],
+  ["8136F635",0x2397],
+  ["8136F636",0x2398],
+  ["8136F637",0x2399],
+  ["8136F638",0x239A],
+  ["8136F639",0x239B],
+  ["8136F730",0x239C],
+  ["8136F731",0x239D],
+  ["8136F732",0x239E],
+  ["8136F733",0x239F],
+  ["8136F734",0x23A0],
+  ["8136F735",0x23A1],
+  ["8136F736",0x23A2],
+  ["8136F737",0x23A3],
+  ["8136F738",0x23A4],
+  ["8136F739",0x23A5],
+  ["8136F830",0x23A6],
+  ["8136F831",0x23A7],
+  ["8136F832",0x23A8],
+  ["8136F833",0x23A9],
+  ["8136F834",0x23AA],
+  ["8136F835",0x23AB],
+  ["8136F836",0x23AC],
+  ["8136F837",0x23AD],
+  ["8136F838",0x23AE],
+  ["8136F839",0x23AF],
+  ["8136F930",0x23B0],
+  ["8136F931",0x23B1],
+  ["8136F932",0x23B2],
+  ["8136F933",0x23B3],
+  ["8136F934",0x23B4],
+  ["8136F935",0x23B5],
+  ["8136F936",0x23B6],
+  ["8136F937",0x23B7],
+  ["8136F938",0x23B8],
+  ["8136F939",0x23B9],
+  ["8136FA30",0x23BA],
+  ["8136FA31",0x23BB],
+  ["8136FA32",0x23BC],
+  ["8136FA33",0x23BD],
+  ["8136FA34",0x23BE],
+  ["8136FA35",0x23BF],
+  ["8136FA36",0x23C0],
+  ["8136FA37",0x23C1],
+  ["8136FA38",0x23C2],
+  ["8136FA39",0x23C3],
+  ["8136FB30",0x23C4],
+  ["8136FB31",0x23C5],
+  ["8136FB32",0x23C6],
+  ["8136FB33",0x23C7],
+  ["8136FB34",0x23C8],
+  ["8136FB35",0x23C9],
+  ["8136FB36",0x23CA],
+  ["8136FB37",0x23CB],
+  ["8136FB38",0x23CC],
+  ["8136FB39",0x23CD],
+  ["8136FC30",0x23CE],
+  ["8136FC31",0x23CF],
+  ["8136FC32",0x23D0],
+  ["8136FC33",0x23D1],
+  ["8136FC34",0x23D2],
+  ["8136FC35",0x23D3],
+  ["8136FC36",0x23D4],
+  ["8136FC37",0x23D5],
+  ["8136FC38",0x23D6],
+  ["8136FC39",0x23D7],
+  ["8136FD30",0x23D8],
+  ["8136FD31",0x23D9],
+  ["8136FD32",0x23DA],
+  ["8136FD33",0x23DB],
+  ["8136FD34",0x23DC],
+  ["8136FD35",0x23DD],
+  ["8136FD36",0x23DE],
+  ["8136FD37",0x23DF],
+  ["8136FD38",0x23E0],
+  ["8136FD39",0x23E1],
+  ["8136FE30",0x23E2],
+  ["8136FE31",0x23E3],
+  ["8136FE32",0x23E4],
+  ["8136FE33",0x23E5],
+  ["8136FE34",0x23E6],
+  ["8136FE35",0x23E7],
+  ["8136FE36",0x23E8],
+  ["8136FE37",0x23E9],
+  ["8136FE38",0x23EA],
+  ["8136FE39",0x23EB],
+  ["81378130",0x23EC],
+  ["81378131",0x23ED],
+  ["81378132",0x23EE],
+  ["81378133",0x23EF],
+  ["81378134",0x23F0],
+  ["81378135",0x23F1],
+  ["81378136",0x23F2],
+  ["81378137",0x23F3],
+  ["81378138",0x23F4],
+  ["81378139",0x23F5],
+  ["81378230",0x23F6],
+  ["81378231",0x23F7],
+  ["81378232",0x23F8],
+  ["81378233",0x23F9],
+  ["81378234",0x23FA],
+  ["81378235",0x23FB],
+  ["81378236",0x23FC],
+  ["81378237",0x23FD],
+  ["81378238",0x23FE],
+  ["81378239",0x23FF],
+  ["81378330",0x2400],
+  ["81378331",0x2401],
+  ["81378332",0x2402],
+  ["81378333",0x2403],
+  ["81378334",0x2404],
+  ["81378335",0x2405],
+  ["81378336",0x2406],
+  ["81378337",0x2407],
+  ["81378338",0x2408],
+  ["81378339",0x2409],
+  ["81378430",0x240A],
+  ["81378431",0x240B],
+  ["81378432",0x240C],
+  ["81378433",0x240D],
+  ["81378434",0x240E],
+  ["81378435",0x240F],
+  ["81378436",0x2410],
+  ["81378437",0x2411],
+  ["81378438",0x2412],
+  ["81378439",0x2413],
+  ["81378530",0x2414],
+  ["81378531",0x2415],
+  ["81378532",0x2416],
+  ["81378533",0x2417],
+  ["81378534",0x2418],
+  ["81378535",0x2419],
+  ["81378536",0x241A],
+  ["81378537",0x241B],
+  ["81378538",0x241C],
+  ["81378539",0x241D],
+  ["81378630",0x241E],
+  ["81378631",0x241F],
+  ["81378632",0x2420],
+  ["81378633",0x2421],
+  ["81378634",0x2422],
+  ["81378635",0x2423],
+  ["81378636",0x2424],
+  ["81378637",0x2425],
+  ["81378638",0x2426],
+  ["81378639",0x2427],
+  ["81378730",0x2428],
+  ["81378731",0x2429],
+  ["81378732",0x242A],
+  ["81378733",0x242B],
+  ["81378734",0x242C],
+  ["81378735",0x242D],
+  ["81378736",0x242E],
+  ["81378737",0x242F],
+  ["81378738",0x2430],
+  ["81378739",0x2431],
+  ["81378830",0x2432],
+  ["81378831",0x2433],
+  ["81378832",0x2434],
+  ["81378833",0x2435],
+  ["81378834",0x2436],
+  ["81378835",0x2437],
+  ["81378836",0x2438],
+  ["81378837",0x2439],
+  ["81378838",0x243A],
+  ["81378839",0x243B],
+  ["81378930",0x243C],
+  ["81378931",0x243D],
+  ["81378932",0x243E],
+  ["81378933",0x243F],
+  ["81378934",0x2440],
+  ["81378935",0x2441],
+  ["81378936",0x2442],
+  ["81378937",0x2443],
+  ["81378938",0x2444],
+  ["81378939",0x2445],
+  ["81378A30",0x2446],
+  ["81378A31",0x2447],
+  ["81378A32",0x2448],
+  ["81378A33",0x2449],
+  ["81378A34",0x244A],
+  ["81378A35",0x244B],
+  ["81378A36",0x244C],
+  ["81378A37",0x244D],
+  ["81378A38",0x244E],
+  ["81378A39",0x244F],
+  ["81378B30",0x2450],
+  ["81378B31",0x2451],
+  ["81378B32",0x2452],
+  ["81378B33",0x2453],
+  ["81378B34",0x2454],
+  ["81378B35",0x2455],
+  ["81378B36",0x2456],
+  ["81378B37",0x2457],
+  ["81378B38",0x2458],
+  ["81378B39",0x2459],
+  ["81378C30",0x245A],
+  ["81378C31",0x245B],
+  ["81378C32",0x245C],
+  ["81378C33",0x245D],
+  ["81378C34",0x245E],
+  ["81378C35",0x245F],
+  ["A2D9",0x2460],
+  ["A2DA",0x2461],
+  ["A2DB",0x2462],
+  ["A2DC",0x2463],
+  ["A2DD",0x2464],
+  ["A2DE",0x2465],
+  ["A2DF",0x2466],
+  ["A2E0",0x2467],
+  ["A2E1",0x2468],
+  ["A2E2",0x2469],
+  ["81378C36",0x246A],
+  ["81378C37",0x246B],
+  ["81378C38",0x246C],
+  ["81378C39",0x246D],
+  ["81378D30",0x246E],
+  ["81378D31",0x246F],
+  ["81378D32",0x2470],
+  ["81378D33",0x2471],
+  ["81378D34",0x2472],
+  ["81378D35",0x2473],
+  ["A2C5",0x2474],
+  ["A2C6",0x2475],
+  ["A2C7",0x2476],
+  ["A2C8",0x2477],
+  ["A2C9",0x2478],
+  ["A2CA",0x2479],
+  ["A2CB",0x247A],
+  ["A2CC",0x247B],
+  ["A2CD",0x247C],
+  ["A2CE",0x247D],
+  ["A2CF",0x247E],
+  ["A2D0",0x247F],
+  ["A2D1",0x2480],
+  ["A2D2",0x2481],
+  ["A2D3",0x2482],
+  ["A2D4",0x2483],
+  ["A2D5",0x2484],
+  ["A2D6",0x2485],
+  ["A2D7",0x2486],
+  ["A2D8",0x2487],
+  ["A2B1",0x2488],
+  ["A2B2",0x2489],
+  ["A2B3",0x248A],
+  ["A2B4",0x248B],
+  ["A2B5",0x248C],
+  ["A2B6",0x248D],
+  ["A2B7",0x248E],
+  ["A2B8",0x248F],
+  ["A2B9",0x2490],
+  ["A2BA",0x2491],
+  ["A2BB",0x2492],
+  ["A2BC",0x2493],
+  ["A2BD",0x2494],
+  ["A2BE",0x2495],
+  ["A2BF",0x2496],
+  ["A2C0",0x2497],
+  ["A2C1",0x2498],
+  ["A2C2",0x2499],
+  ["A2C3",0x249A],
+  ["A2C4",0x249B],
+  ["81378D36",0x249C],
+  ["81378D37",0x249D],
+  ["81378D38",0x249E],
+  ["81378D39",0x249F],
+  ["81378E30",0x24A0],
+  ["81378E31",0x24A1],
+  ["81378E32",0x24A2],
+  ["81378E33",0x24A3],
+  ["81378E34",0x24A4],
+  ["81378E35",0x24A5],
+  ["81378E36",0x24A6],
+  ["81378E37",0x24A7],
+  ["81378E38",0x24A8],
+  ["81378E39",0x24A9],
+  ["81378F30",0x24AA],
+  ["81378F31",0x24AB],
+  ["81378F32",0x24AC],
+  ["81378F33",0x24AD],
+  ["81378F34",0x24AE],
+  ["81378F35",0x24AF],
+  ["81378F36",0x24B0],
+  ["81378F37",0x24B1],
+  ["81378F38",0x24B2],
+  ["81378F39",0x24B3],
+  ["81379030",0x24B4],
+  ["81379031",0x24B5],
+  ["81379032",0x24B6],
+  ["81379033",0x24B7],
+  ["81379034",0x24B8],
+  ["81379035",0x24B9],
+  ["81379036",0x24BA],
+  ["81379037",0x24BB],
+  ["81379038",0x24BC],
+  ["81379039",0x24BD],
+  ["81379130",0x24BE],
+  ["81379131",0x24BF],
+  ["81379132",0x24C0],
+  ["81379133",0x24C1],
+  ["81379134",0x24C2],
+  ["81379135",0x24C3],
+  ["81379136",0x24C4],
+  ["81379137",0x24C5],
+  ["81379138",0x24C6],
+  ["81379139",0x24C7],
+  ["81379230",0x24C8],
+  ["81379231",0x24C9],
+  ["81379232",0x24CA],
+  ["81379233",0x24CB],
+  ["81379234",0x24CC],
+  ["81379235",0x24CD],
+  ["81379236",0x24CE],
+  ["81379237",0x24CF],
+  ["81379238",0x24D0],
+  ["81379239",0x24D1],
+  ["81379330",0x24D2],
+  ["81379331",0x24D3],
+  ["81379332",0x24D4],
+  ["81379333",0x24D5],
+  ["81379334",0x24D6],
+  ["81379335",0x24D7],
+  ["81379336",0x24D8],
+  ["81379337",0x24D9],
+  ["81379338",0x24DA],
+  ["81379339",0x24DB],
+  ["81379430",0x24DC],
+  ["81379431",0x24DD],
+  ["81379432",0x24DE],
+  ["81379433",0x24DF],
+  ["81379434",0x24E0],
+  ["81379435",0x24E1],
+  ["81379436",0x24E2],
+  ["81379437",0x24E3],
+  ["81379438",0x24E4],
+  ["81379439",0x24E5],
+  ["81379530",0x24E6],
+  ["81379531",0x24E7],
+  ["81379532",0x24E8],
+  ["81379533",0x24E9],
+  ["81379534",0x24EA],
+  ["81379535",0x24EB],
+  ["81379536",0x24EC],
+  ["81379537",0x24ED],
+  ["81379538",0x24EE],
+  ["81379539",0x24EF],
+  ["81379630",0x24F0],
+  ["81379631",0x24F1],
+  ["81379632",0x24F2],
+  ["81379633",0x24F3],
+  ["81379634",0x24F4],
+  ["81379635",0x24F5],
+  ["81379636",0x24F6],
+  ["81379637",0x24F7],
+  ["81379638",0x24F8],
+  ["81379639",0x24F9],
+  ["81379730",0x24FA],
+  ["81379731",0x24FB],
+  ["81379732",0x24FC],
+  ["81379733",0x24FD],
+  ["81379734",0x24FE],
+  ["81379735",0x24FF],
+  ["A9A4",0x2500],
+  ["A9A5",0x2501],
+  ["A9A6",0x2502],
+  ["A9A7",0x2503],
+  ["A9A8",0x2504],
+  ["A9A9",0x2505],
+  ["A9AA",0x2506],
+  ["A9AB",0x2507],
+  ["A9AC",0x2508],
+  ["A9AD",0x2509],
+  ["A9AE",0x250A],
+  ["A9AF",0x250B],
+  ["A9B0",0x250C],
+  ["A9B1",0x250D],
+  ["A9B2",0x250E],
+  ["A9B3",0x250F],
+  ["A9B4",0x2510],
+  ["A9B5",0x2511],
+  ["A9B6",0x2512],
+  ["A9B7",0x2513],
+  ["A9B8",0x2514],
+  ["A9B9",0x2515],
+  ["A9BA",0x2516],
+  ["A9BB",0x2517],
+  ["A9BC",0x2518],
+  ["A9BD",0x2519],
+  ["A9BE",0x251A],
+  ["A9BF",0x251B],
+  ["A9C0",0x251C],
+  ["A9C1",0x251D],
+  ["A9C2",0x251E],
+  ["A9C3",0x251F],
+  ["A9C4",0x2520],
+  ["A9C5",0x2521],
+  ["A9C6",0x2522],
+  ["A9C7",0x2523],
+  ["A9C8",0x2524],
+  ["A9C9",0x2525],
+  ["A9CA",0x2526],
+  ["A9CB",0x2527],
+  ["A9CC",0x2528],
+  ["A9CD",0x2529],
+  ["A9CE",0x252A],
+  ["A9CF",0x252B],
+  ["A9D0",0x252C],
+  ["A9D1",0x252D],
+  ["A9D2",0x252E],
+  ["A9D3",0x252F],
+  ["A9D4",0x2530],
+  ["A9D5",0x2531],
+  ["A9D6",0x2532],
+  ["A9D7",0x2533],
+  ["A9D8",0x2534],
+  ["A9D9",0x2535],
+  ["A9DA",0x2536],
+  ["A9DB",0x2537],
+  ["A9DC",0x2538],
+  ["A9DD",0x2539],
+  ["A9DE",0x253A],
+  ["A9DF",0x253B],
+  ["A9E0",0x253C],
+  ["A9E1",0x253D],
+  ["A9E2",0x253E],
+  ["A9E3",0x253F],
+  ["A9E4",0x2540],
+  ["A9E5",0x2541],
+  ["A9E6",0x2542],
+  ["A9E7",0x2543],
+  ["A9E8",0x2544],
+  ["A9E9",0x2545],
+  ["A9EA",0x2546],
+  ["A9EB",0x2547],
+  ["A9EC",0x2548],
+  ["A9ED",0x2549],
+  ["A9EE",0x254A],
+  ["A9EF",0x254B],
+  ["81379736",0x254C],
+  ["81379737",0x254D],
+  ["81379738",0x254E],
+  ["81379739",0x254F],
+  ["A854",0x2550],
+  ["A855",0x2551],
+  ["A856",0x2552],
+  ["A857",0x2553],
+  ["A858",0x2554],
+  ["A859",0x2555],
+  ["A85A",0x2556],
+  ["A85B",0x2557],
+  ["A85C",0x2558],
+  ["A85D",0x2559],
+  ["A85E",0x255A],
+  ["A85F",0x255B],
+  ["A860",0x255C],
+  ["A861",0x255D],
+  ["A862",0x255E],
+  ["A863",0x255F],
+  ["A864",0x2560],
+  ["A865",0x2561],
+  ["A866",0x2562],
+  ["A867",0x2563],
+  ["A868",0x2564],
+  ["A869",0x2565],
+  ["A86A",0x2566],
+  ["A86B",0x2567],
+  ["A86C",0x2568],
+  ["A86D",0x2569],
+  ["A86E",0x256A],
+  ["A86F",0x256B],
+  ["A870",0x256C],
+  ["A871",0x256D],
+  ["A872",0x256E],
+  ["A873",0x256F],
+  ["A874",0x2570],
+  ["A875",0x2571],
+  ["A876",0x2572],
+  ["A877",0x2573],
+  ["81379830",0x2574],
+  ["81379831",0x2575],
+  ["81379832",0x2576],
+  ["81379833",0x2577],
+  ["81379834",0x2578],
+  ["81379835",0x2579],
+  ["81379836",0x257A],
+  ["81379837",0x257B],
+  ["81379838",0x257C],
+  ["81379839",0x257D],
+  ["81379930",0x257E],
+  ["81379931",0x257F],
+  ["81379932",0x2580],
+  ["A878",0x2581],
+  ["A879",0x2582],
+  ["A87A",0x2583],
+  ["A87B",0x2584],
+  ["A87C",0x2585],
+  ["A87D",0x2586],
+  ["A87E",0x2587],
+  ["A880",0x2588],
+  ["A881",0x2589],
+  ["A882",0x258A],
+  ["A883",0x258B],
+  ["A884",0x258C],
+  ["A885",0x258D],
+  ["A886",0x258E],
+  ["A887",0x258F],
+  ["81379933",0x2590],
+  ["81379934",0x2591],
+  ["81379935",0x2592],
+  ["A888",0x2593],
+  ["A889",0x2594],
+  ["A88A",0x2595],
+  ["81379936",0x2596],
+  ["81379937",0x2597],
+  ["81379938",0x2598],
+  ["81379939",0x2599],
+  ["81379A30",0x259A],
+  ["81379A31",0x259B],
+  ["81379A32",0x259C],
+  ["81379A33",0x259D],
+  ["81379A34",0x259E],
+  ["81379A35",0x259F],
+  ["A1F6",0x25A0],
+  ["A1F5",0x25A1],
+  ["81379A36",0x25A2],
+  ["81379A37",0x25A3],
+  ["81379A38",0x25A4],
+  ["81379A39",0x25A5],
+  ["81379B30",0x25A6],
+  ["81379B31",0x25A7],
+  ["81379B32",0x25A8],
+  ["81379B33",0x25A9],
+  ["81379B34",0x25AA],
+  ["81379B35",0x25AB],
+  ["81379B36",0x25AC],
+  ["81379B37",0x25AD],
+  ["81379B38",0x25AE],
+  ["81379B39",0x25AF],
+  ["81379C30",0x25B0],
+  ["81379C31",0x25B1],
+  ["A1F8",0x25B2],
+  ["A1F7",0x25B3],
+  ["81379C32",0x25B4],
+  ["81379C33",0x25B5],
+  ["81379C34",0x25B6],
+  ["81379C35",0x25B7],
+  ["81379C36",0x25B8],
+  ["81379C37",0x25B9],
+  ["81379C38",0x25BA],
+  ["81379C39",0x25BB],
+  ["A88B",0x25BC],
+  ["A88C",0x25BD],
+  ["81379D30",0x25BE],
+  ["81379D31",0x25BF],
+  ["81379D32",0x25C0],
+  ["81379D33",0x25C1],
+  ["81379D34",0x25C2],
+  ["81379D35",0x25C3],
+  ["81379D36",0x25C4],
+  ["81379D37",0x25C5],
+  ["A1F4",0x25C6],
+  ["A1F3",0x25C7],
+  ["81379D38",0x25C8],
+  ["81379D39",0x25C9],
+  ["81379E30",0x25CA],
+  ["A1F0",0x25CB],
+  ["81379E31",0x25CC],
+  ["81379E32",0x25CD],
+  ["A1F2",0x25CE],
+  ["A1F1",0x25CF],
+  ["81379E33",0x25D0],
+  ["81379E34",0x25D1],
+  ["81379E35",0x25D2],
+  ["81379E36",0x25D3],
+  ["81379E37",0x25D4],
+  ["81379E38",0x25D5],
+  ["81379E39",0x25D6],
+  ["81379F30",0x25D7],
+  ["81379F31",0x25D8],
+  ["81379F32",0x25D9],
+  ["81379F33",0x25DA],
+  ["81379F34",0x25DB],
+  ["81379F35",0x25DC],
+  ["81379F36",0x25DD],
+  ["81379F37",0x25DE],
+  ["81379F38",0x25DF],
+  ["81379F39",0x25E0],
+  ["8137A030",0x25E1],
+  ["A88D",0x25E2],
+  ["A88E",0x25E3],
+  ["A88F",0x25E4],
+  ["A890",0x25E5],
+  ["8137A031",0x25E6],
+  ["8137A032",0x25E7],
+  ["8137A033",0x25E8],
+  ["8137A034",0x25E9],
+  ["8137A035",0x25EA],
+  ["8137A036",0x25EB],
+  ["8137A037",0x25EC],
+  ["8137A038",0x25ED],
+  ["8137A039",0x25EE],
+  ["8137A130",0x25EF],
+  ["8137A131",0x25F0],
+  ["8137A132",0x25F1],
+  ["8137A133",0x25F2],
+  ["8137A134",0x25F3],
+  ["8137A135",0x25F4],
+  ["8137A136",0x25F5],
+  ["8137A137",0x25F6],
+  ["8137A138",0x25F7],
+  ["8137A139",0x25F8],
+  ["8137A230",0x25F9],
+  ["8137A231",0x25FA],
+  ["8137A232",0x25FB],
+  ["8137A233",0x25FC],
+  ["8137A234",0x25FD],
+  ["8137A235",0x25FE],
+  ["8137A236",0x25FF],
+  ["8137A237",0x2600],
+  ["8137A238",0x2601],
+  ["8137A239",0x2602],
+  ["8137A330",0x2603],
+  ["8137A331",0x2604],
+  ["A1EF",0x2605],
+  ["A1EE",0x2606],
+  ["8137A332",0x2607],
+  ["8137A333",0x2608],
+  ["A891",0x2609],
+  ["8137A334",0x260A],
+  ["8137A335",0x260B],
+  ["8137A336",0x260C],
+  ["8137A337",0x260D],
+  ["8137A338",0x260E],
+  ["8137A339",0x260F],
+  ["8137A430",0x2610],
+  ["8137A431",0x2611],
+  ["8137A432",0x2612],
+  ["8137A433",0x2613],
+  ["8137A434",0x2614],
+  ["8137A435",0x2615],
+  ["8137A436",0x2616],
+  ["8137A437",0x2617],
+  ["8137A438",0x2618],
+  ["8137A439",0x2619],
+  ["8137A530",0x261A],
+  ["8137A531",0x261B],
+  ["8137A532",0x261C],
+  ["8137A533",0x261D],
+  ["8137A534",0x261E],
+  ["8137A535",0x261F],
+  ["8137A536",0x2620],
+  ["8137A537",0x2621],
+  ["8137A538",0x2622],
+  ["8137A539",0x2623],
+  ["8137A630",0x2624],
+  ["8137A631",0x2625],
+  ["8137A632",0x2626],
+  ["8137A633",0x2627],
+  ["8137A634",0x2628],
+  ["8137A635",0x2629],
+  ["8137A636",0x262A],
+  ["8137A637",0x262B],
+  ["8137A638",0x262C],
+  ["8137A639",0x262D],
+  ["8137A730",0x262E],
+  ["8137A731",0x262F],
+  ["8137A732",0x2630],
+  ["8137A733",0x2631],
+  ["8137A734",0x2632],
+  ["8137A735",0x2633],
+  ["8137A736",0x2634],
+  ["8137A737",0x2635],
+  ["8137A738",0x2636],
+  ["8137A739",0x2637],
+  ["8137A830",0x2638],
+  ["8137A831",0x2639],
+  ["8137A832",0x263A],
+  ["8137A833",0x263B],
+  ["8137A834",0x263C],
+  ["8137A835",0x263D],
+  ["8137A836",0x263E],
+  ["8137A837",0x263F],
+  ["A1E2",0x2640],
+  ["8137A838",0x2641],
+  ["A1E1",0x2642],
+  ["8137A839",0x2643],
+  ["8137A930",0x2644],
+  ["8137A931",0x2645],
+  ["8137A932",0x2646],
+  ["8137A933",0x2647],
+  ["8137A934",0x2648],
+  ["8137A935",0x2649],
+  ["8137A936",0x264A],
+  ["8137A937",0x264B],
+  ["8137A938",0x264C],
+  ["8137A939",0x264D],
+  ["8137AA30",0x264E],
+  ["8137AA31",0x264F],
+  ["8137AA32",0x2650],
+  ["8137AA33",0x2651],
+  ["8137AA34",0x2652],
+  ["8137AA35",0x2653],
+  ["8137AA36",0x2654],
+  ["8137AA37",0x2655],
+  ["8137AA38",0x2656],
+  ["8137AA39",0x2657],
+  ["8137AB30",0x2658],
+  ["8137AB31",0x2659],
+  ["8137AB32",0x265A],
+  ["8137AB33",0x265B],
+  ["8137AB34",0x265C],
+  ["8137AB35",0x265D],
+  ["8137AB36",0x265E],
+  ["8137AB37",0x265F],
+  ["8137AB38",0x2660],
+  ["8137AB39",0x2661],
+  ["8137AC30",0x2662],
+  ["8137AC31",0x2663],
+  ["8137AC32",0x2664],
+  ["8137AC33",0x2665],
+  ["8137AC34",0x2666],
+  ["8137AC35",0x2667],
+  ["8137AC36",0x2668],
+  ["8137AC37",0x2669],
+  ["8137AC38",0x266A],
+  ["8137AC39",0x266B],
+  ["8137AD30",0x266C],
+  ["8137AD31",0x266D],
+  ["8137AD32",0x266E],
+  ["8137AD33",0x266F],
+  ["8137AD34",0x2670],
+  ["8137AD35",0x2671],
+  ["8137AD36",0x2672],
+  ["8137AD37",0x2673],
+  ["8137AD38",0x2674],
+  ["8137AD39",0x2675],
+  ["8137AE30",0x2676],
+  ["8137AE31",0x2677],
+  ["8137AE32",0x2678],
+  ["8137AE33",0x2679],
+  ["8137AE34",0x267A],
+  ["8137AE35",0x267B],
+  ["8137AE36",0x267C],
+  ["8137AE37",0x267D],
+  ["8137AE38",0x267E],
+  ["8137AE39",0x267F],
+  ["8137AF30",0x2680],
+  ["8137AF31",0x2681],
+  ["8137AF32",0x2682],
+  ["8137AF33",0x2683],
+  ["8137AF34",0x2684],
+  ["8137AF35",0x2685],
+  ["8137AF36",0x2686],
+  ["8137AF37",0x2687],
+  ["8137AF38",0x2688],
+  ["8137AF39",0x2689],
+  ["8137B030",0x268A],
+  ["8137B031",0x268B],
+  ["8137B032",0x268C],
+  ["8137B033",0x268D],
+  ["8137B034",0x268E],
+  ["8137B035",0x268F],
+  ["8137B036",0x2690],
+  ["8137B037",0x2691],
+  ["8137B038",0x2692],
+  ["8137B039",0x2693],
+  ["8137B130",0x2694],
+  ["8137B131",0x2695],
+  ["8137B132",0x2696],
+  ["8137B133",0x2697],
+  ["8137B134",0x2698],
+  ["8137B135",0x2699],
+  ["8137B136",0x269A],
+  ["8137B137",0x269B],
+  ["8137B138",0x269C],
+  ["8137B139",0x269D],
+  ["8137B230",0x269E],
+  ["8137B231",0x269F],
+  ["8137B232",0x26A0],
+  ["8137B233",0x26A1],
+  ["8137B234",0x26A2],
+  ["8137B235",0x26A3],
+  ["8137B236",0x26A4],
+  ["8137B237",0x26A5],
+  ["8137B238",0x26A6],
+  ["8137B239",0x26A7],
+  ["8137B330",0x26A8],
+  ["8137B331",0x26A9],
+  ["8137B332",0x26AA],
+  ["8137B333",0x26AB],
+  ["8137B334",0x26AC],
+  ["8137B335",0x26AD],
+  ["8137B336",0x26AE],
+  ["8137B337",0x26AF],
+  ["8137B338",0x26B0],
+  ["8137B339",0x26B1],
+  ["8137B430",0x26B2],
+  ["8137B431",0x26B3],
+  ["8137B432",0x26B4],
+  ["8137B433",0x26B5],
+  ["8137B434",0x26B6],
+  ["8137B435",0x26B7],
+  ["8137B436",0x26B8],
+  ["8137B437",0x26B9],
+  ["8137B438",0x26BA],
+  ["8137B439",0x26BB],
+  ["8137B530",0x26BC],
+  ["8137B531",0x26BD],
+  ["8137B532",0x26BE],
+  ["8137B533",0x26BF],
+  ["8137B534",0x26C0],
+  ["8137B535",0x26C1],
+  ["8137B536",0x26C2],
+  ["8137B537",0x26C3],
+  ["8137B538",0x26C4],
+  ["8137B539",0x26C5],
+  ["8137B630",0x26C6],
+  ["8137B631",0x26C7],
+  ["8137B632",0x26C8],
+  ["8137B633",0x26C9],
+  ["8137B634",0x26CA],
+  ["8137B635",0x26CB],
+  ["8137B636",0x26CC],
+  ["8137B637",0x26CD],
+  ["8137B638",0x26CE],
+  ["8137B639",0x26CF],
+  ["8137B730",0x26D0],
+  ["8137B731",0x26D1],
+  ["8137B732",0x26D2],
+  ["8137B733",0x26D3],
+  ["8137B734",0x26D4],
+  ["8137B735",0x26D5],
+  ["8137B736",0x26D6],
+  ["8137B737",0x26D7],
+  ["8137B738",0x26D8],
+  ["8137B739",0x26D9],
+  ["8137B830",0x26DA],
+  ["8137B831",0x26DB],
+  ["8137B832",0x26DC],
+  ["8137B833",0x26DD],
+  ["8137B834",0x26DE],
+  ["8137B835",0x26DF],
+  ["8137B836",0x26E0],
+  ["8137B837",0x26E1],
+  ["8137B838",0x26E2],
+  ["8137B839",0x26E3],
+  ["8137B930",0x26E4],
+  ["8137B931",0x26E5],
+  ["8137B932",0x26E6],
+  ["8137B933",0x26E7],
+  ["8137B934",0x26E8],
+  ["8137B935",0x26E9],
+  ["8137B936",0x26EA],
+  ["8137B937",0x26EB],
+  ["8137B938",0x26EC],
+  ["8137B939",0x26ED],
+  ["8137BA30",0x26EE],
+  ["8137BA31",0x26EF],
+  ["8137BA32",0x26F0],
+  ["8137BA33",0x26F1],
+  ["8137BA34",0x26F2],
+  ["8137BA35",0x26F3],
+  ["8137BA36",0x26F4],
+  ["8137BA37",0x26F5],
+  ["8137BA38",0x26F6],
+  ["8137BA39",0x26F7],
+  ["8137BB30",0x26F8],
+  ["8137BB31",0x26F9],
+  ["8137BB32",0x26FA],
+  ["8137BB33",0x26FB],
+  ["8137BB34",0x26FC],
+  ["8137BB35",0x26FD],
+  ["8137BB36",0x26FE],
+  ["8137BB37",0x26FF],
+  ["8137BB38",0x2700],
+  ["8137BB39",0x2701],
+  ["8137BC30",0x2702],
+  ["8137BC31",0x2703],
+  ["8137BC32",0x2704],
+  ["8137BC33",0x2705],
+  ["8137BC34",0x2706],
+  ["8137BC35",0x2707],
+  ["8137BC36",0x2708],
+  ["8137BC37",0x2709],
+  ["8137BC38",0x270A],
+  ["8137BC39",0x270B],
+  ["8137BD30",0x270C],
+  ["8137BD31",0x270D],
+  ["8137BD32",0x270E],
+  ["8137BD33",0x270F],
+  ["8137BD34",0x2710],
+  ["8137BD35",0x2711],
+  ["8137BD36",0x2712],
+  ["8137BD37",0x2713],
+  ["8137BD38",0x2714],
+  ["8137BD39",0x2715],
+  ["8137BE30",0x2716],
+  ["8137BE31",0x2717],
+  ["8137BE32",0x2718],
+  ["8137BE33",0x2719],
+  ["8137BE34",0x271A],
+  ["8137BE35",0x271B],
+  ["8137BE36",0x271C],
+  ["8137BE37",0x271D],
+  ["8137BE38",0x271E],
+  ["8137BE39",0x271F],
+  ["8137BF30",0x2720],
+  ["8137BF31",0x2721],
+  ["8137BF32",0x2722],
+  ["8137BF33",0x2723],
+  ["8137BF34",0x2724],
+  ["8137BF35",0x2725],
+  ["8137BF36",0x2726],
+  ["8137BF37",0x2727],
+  ["8137BF38",0x2728],
+  ["8137BF39",0x2729],
+  ["8137C030",0x272A],
+  ["8137C031",0x272B],
+  ["8137C032",0x272C],
+  ["8137C033",0x272D],
+  ["8137C034",0x272E],
+  ["8137C035",0x272F],
+  ["8137C036",0x2730],
+  ["8137C037",0x2731],
+  ["8137C038",0x2732],
+  ["8137C039",0x2733],
+  ["8137C130",0x2734],
+  ["8137C131",0x2735],
+  ["8137C132",0x2736],
+  ["8137C133",0x2737],
+  ["8137C134",0x2738],
+  ["8137C135",0x2739],
+  ["8137C136",0x273A],
+  ["8137C137",0x273B],
+  ["8137C138",0x273C],
+  ["8137C139",0x273D],
+  ["8137C230",0x273E],
+  ["8137C231",0x273F],
+  ["8137C232",0x2740],
+  ["8137C233",0x2741],
+  ["8137C234",0x2742],
+  ["8137C235",0x2743],
+  ["8137C236",0x2744],
+  ["8137C237",0x2745],
+  ["8137C238",0x2746],
+  ["8137C239",0x2747],
+  ["8137C330",0x2748],
+  ["8137C331",0x2749],
+  ["8137C332",0x274A],
+  ["8137C333",0x274B],
+  ["8137C334",0x274C],
+  ["8137C335",0x274D],
+  ["8137C336",0x274E],
+  ["8137C337",0x274F],
+  ["8137C338",0x2750],
+  ["8137C339",0x2751],
+  ["8137C430",0x2752],
+  ["8137C431",0x2753],
+  ["8137C432",0x2754],
+  ["8137C433",0x2755],
+  ["8137C434",0x2756],
+  ["8137C435",0x2757],
+  ["8137C436",0x2758],
+  ["8137C437",0x2759],
+  ["8137C438",0x275A],
+  ["8137C439",0x275B],
+  ["8137C530",0x275C],
+  ["8137C531",0x275D],
+  ["8137C532",0x275E],
+  ["8137C533",0x275F],
+  ["8137C534",0x2760],
+  ["8137C535",0x2761],
+  ["8137C536",0x2762],
+  ["8137C537",0x2763],
+  ["8137C538",0x2764],
+  ["8137C539",0x2765],
+  ["8137C630",0x2766],
+  ["8137C631",0x2767],
+  ["8137C632",0x2768],
+  ["8137C633",0x2769],
+  ["8137C634",0x276A],
+  ["8137C635",0x276B],
+  ["8137C636",0x276C],
+  ["8137C637",0x276D],
+  ["8137C638",0x276E],
+  ["8137C639",0x276F],
+  ["8137C730",0x2770],
+  ["8137C731",0x2771],
+  ["8137C732",0x2772],
+  ["8137C733",0x2773],
+  ["8137C734",0x2774],
+  ["8137C735",0x2775],
+  ["8137C736",0x2776],
+  ["8137C737",0x2777],
+  ["8137C738",0x2778],
+  ["8137C739",0x2779],
+  ["8137C830",0x277A],
+  ["8137C831",0x277B],
+  ["8137C832",0x277C],
+  ["8137C833",0x277D],
+  ["8137C834",0x277E],
+  ["8137C835",0x277F],
+  ["8137C836",0x2780],
+  ["8137C837",0x2781],
+  ["8137C838",0x2782],
+  ["8137C839",0x2783],
+  ["8137C930",0x2784],
+  ["8137C931",0x2785],
+  ["8137C932",0x2786],
+  ["8137C933",0x2787],
+  ["8137C934",0x2788],
+  ["8137C935",0x2789],
+  ["8137C936",0x278A],
+  ["8137C937",0x278B],
+  ["8137C938",0x278C],
+  ["8137C939",0x278D],
+  ["8137CA30",0x278E],
+  ["8137CA31",0x278F],
+  ["8137CA32",0x2790],
+  ["8137CA33",0x2791],
+  ["8137CA34",0x2792],
+  ["8137CA35",0x2793],
+  ["8137CA36",0x2794],
+  ["8137CA37",0x2795],
+  ["8137CA38",0x2796],
+  ["8137CA39",0x2797],
+  ["8137CB30",0x2798],
+  ["8137CB31",0x2799],
+  ["8137CB32",0x279A],
+  ["8137CB33",0x279B],
+  ["8137CB34",0x279C],
+  ["8137CB35",0x279D],
+  ["8137CB36",0x279E],
+  ["8137CB37",0x279F],
+  ["8137CB38",0x27A0],
+  ["8137CB39",0x27A1],
+  ["8137CC30",0x27A2],
+  ["8137CC31",0x27A3],
+  ["8137CC32",0x27A4],
+  ["8137CC33",0x27A5],
+  ["8137CC34",0x27A6],
+  ["8137CC35",0x27A7],
+  ["8137CC36",0x27A8],
+  ["8137CC37",0x27A9],
+  ["8137CC38",0x27AA],
+  ["8137CC39",0x27AB],
+  ["8137CD30",0x27AC],
+  ["8137CD31",0x27AD],
+  ["8137CD32",0x27AE],
+  ["8137CD33",0x27AF],
+  ["8137CD34",0x27B0],
+  ["8137CD35",0x27B1],
+  ["8137CD36",0x27B2],
+  ["8137CD37",0x27B3],
+  ["8137CD38",0x27B4],
+  ["8137CD39",0x27B5],
+  ["8137CE30",0x27B6],
+  ["8137CE31",0x27B7],
+  ["8137CE32",0x27B8],
+  ["8137CE33",0x27B9],
+  ["8137CE34",0x27BA],
+  ["8137CE35",0x27BB],
+  ["8137CE36",0x27BC],
+  ["8137CE37",0x27BD],
+  ["8137CE38",0x27BE],
+  ["8137CE39",0x27BF],
+  ["8137CF30",0x27C0],
+  ["8137CF31",0x27C1],
+  ["8137CF32",0x27C2],
+  ["8137CF33",0x27C3],
+  ["8137CF34",0x27C4],
+  ["8137CF35",0x27C5],
+  ["8137CF36",0x27C6],
+  ["8137CF37",0x27C7],
+  ["8137CF38",0x27C8],
+  ["8137CF39",0x27C9],
+  ["8137D030",0x27CA],
+  ["8137D031",0x27CB],
+  ["8137D032",0x27CC],
+  ["8137D033",0x27CD],
+  ["8137D034",0x27CE],
+  ["8137D035",0x27CF],
+  ["8137D036",0x27D0],
+  ["8137D037",0x27D1],
+  ["8137D038",0x27D2],
+  ["8137D039",0x27D3],
+  ["8137D130",0x27D4],
+  ["8137D131",0x27D5],
+  ["8137D132",0x27D6],
+  ["8137D133",0x27D7],
+  ["8137D134",0x27D8],
+  ["8137D135",0x27D9],
+  ["8137D136",0x27DA],
+  ["8137D137",0x27DB],
+  ["8137D138",0x27DC],
+  ["8137D139",0x27DD],
+  ["8137D230",0x27DE],
+  ["8137D231",0x27DF],
+  ["8137D232",0x27E0],
+  ["8137D233",0x27E1],
+  ["8137D234",0x27E2],
+  ["8137D235",0x27E3],
+  ["8137D236",0x27E4],
+  ["8137D237",0x27E5],
+  ["8137D238",0x27E6],
+  ["8137D239",0x27E7],
+  ["8137D330",0x27E8],
+  ["8137D331",0x27E9],
+  ["8137D332",0x27EA],
+  ["8137D333",0x27EB],
+  ["8137D334",0x27EC],
+  ["8137D335",0x27ED],
+  ["8137D336",0x27EE],
+  ["8137D337",0x27EF],
+  ["8137D338",0x27F0],
+  ["8137D339",0x27F1],
+  ["8137D430",0x27F2],
+  ["8137D431",0x27F3],
+  ["8137D432",0x27F4],
+  ["8137D433",0x27F5],
+  ["8137D434",0x27F6],
+  ["8137D435",0x27F7],
+  ["8137D436",0x27F8],
+  ["8137D437",0x27F9],
+  ["8137D438",0x27FA],
+  ["8137D439",0x27FB],
+  ["8137D530",0x27FC],
+  ["8137D531",0x27FD],
+  ["8137D532",0x27FE],
+  ["8137D533",0x27FF],
+  ["8137D534",0x2800],
+  ["8137D535",0x2801],
+  ["8137D536",0x2802],
+  ["8137D537",0x2803],
+  ["8137D538",0x2804],
+  ["8137D539",0x2805],
+  ["8137D630",0x2806],
+  ["8137D631",0x2807],
+  ["8137D632",0x2808],
+  ["8137D633",0x2809],
+  ["8137D634",0x280A],
+  ["8137D635",0x280B],
+  ["8137D636",0x280C],
+  ["8137D637",0x280D],
+  ["8137D638",0x280E],
+  ["8137D639",0x280F],
+  ["8137D730",0x2810],
+  ["8137D731",0x2811],
+  ["8137D732",0x2812],
+  ["8137D733",0x2813],
+  ["8137D734",0x2814],
+  ["8137D735",0x2815],
+  ["8137D736",0x2816],
+  ["8137D737",0x2817],
+  ["8137D738",0x2818],
+  ["8137D739",0x2819],
+  ["8137D830",0x281A],
+  ["8137D831",0x281B],
+  ["8137D832",0x281C],
+  ["8137D833",0x281D],
+  ["8137D834",0x281E],
+  ["8137D835",0x281F],
+  ["8137D836",0x2820],
+  ["8137D837",0x2821],
+  ["8137D838",0x2822],
+  ["8137D839",0x2823],
+  ["8137D930",0x2824],
+  ["8137D931",0x2825],
+  ["8137D932",0x2826],
+  ["8137D933",0x2827],
+  ["8137D934",0x2828],
+  ["8137D935",0x2829],
+  ["8137D936",0x282A],
+  ["8137D937",0x282B],
+  ["8137D938",0x282C],
+  ["8137D939",0x282D],
+  ["8137DA30",0x282E],
+  ["8137DA31",0x282F],
+  ["8137DA32",0x2830],
+  ["8137DA33",0x2831],
+  ["8137DA34",0x2832],
+  ["8137DA35",0x2833],
+  ["8137DA36",0x2834],
+  ["8137DA37",0x2835],
+  ["8137DA38",0x2836],
+  ["8137DA39",0x2837],
+  ["8137DB30",0x2838],
+  ["8137DB31",0x2839],
+  ["8137DB32",0x283A],
+  ["8137DB33",0x283B],
+  ["8137DB34",0x283C],
+  ["8137DB35",0x283D],
+  ["8137DB36",0x283E],
+  ["8137DB37",0x283F],
+  ["8137DB38",0x2840],
+  ["8137DB39",0x2841],
+  ["8137DC30",0x2842],
+  ["8137DC31",0x2843],
+  ["8137DC32",0x2844],
+  ["8137DC33",0x2845],
+  ["8137DC34",0x2846],
+  ["8137DC35",0x2847],
+  ["8137DC36",0x2848],
+  ["8137DC37",0x2849],
+  ["8137DC38",0x284A],
+  ["8137DC39",0x284B],
+  ["8137DD30",0x284C],
+  ["8137DD31",0x284D],
+  ["8137DD32",0x284E],
+  ["8137DD33",0x284F],
+  ["8137DD34",0x2850],
+  ["8137DD35",0x2851],
+  ["8137DD36",0x2852],
+  ["8137DD37",0x2853],
+  ["8137DD38",0x2854],
+  ["8137DD39",0x2855],
+  ["8137DE30",0x2856],
+  ["8137DE31",0x2857],
+  ["8137DE32",0x2858],
+  ["8137DE33",0x2859],
+  ["8137DE34",0x285A],
+  ["8137DE35",0x285B],
+  ["8137DE36",0x285C],
+  ["8137DE37",0x285D],
+  ["8137DE38",0x285E],
+  ["8137DE39",0x285F],
+  ["8137DF30",0x2860],
+  ["8137DF31",0x2861],
+  ["8137DF32",0x2862],
+  ["8137DF33",0x2863],
+  ["8137DF34",0x2864],
+  ["8137DF35",0x2865],
+  ["8137DF36",0x2866],
+  ["8137DF37",0x2867],
+  ["8137DF38",0x2868],
+  ["8137DF39",0x2869],
+  ["8137E030",0x286A],
+  ["8137E031",0x286B],
+  ["8137E032",0x286C],
+  ["8137E033",0x286D],
+  ["8137E034",0x286E],
+  ["8137E035",0x286F],
+  ["8137E036",0x2870],
+  ["8137E037",0x2871],
+  ["8137E038",0x2872],
+  ["8137E039",0x2873],
+  ["8137E130",0x2874],
+  ["8137E131",0x2875],
+  ["8137E132",0x2876],
+  ["8137E133",0x2877],
+  ["8137E134",0x2878],
+  ["8137E135",0x2879],
+  ["8137E136",0x287A],
+  ["8137E137",0x287B],
+  ["8137E138",0x287C],
+  ["8137E139",0x287D],
+  ["8137E230",0x287E],
+  ["8137E231",0x287F],
+  ["8137E232",0x2880],
+  ["8137E233",0x2881],
+  ["8137E234",0x2882],
+  ["8137E235",0x2883],
+  ["8137E236",0x2884],
+  ["8137E237",0x2885],
+  ["8137E238",0x2886],
+  ["8137E239",0x2887],
+  ["8137E330",0x2888],
+  ["8137E331",0x2889],
+  ["8137E332",0x288A],
+  ["8137E333",0x288B],
+  ["8137E334",0x288C],
+  ["8137E335",0x288D],
+  ["8137E336",0x288E],
+  ["8137E337",0x288F],
+  ["8137E338",0x2890],
+  ["8137E339",0x2891],
+  ["8137E430",0x2892],
+  ["8137E431",0x2893],
+  ["8137E432",0x2894],
+  ["8137E433",0x2895],
+  ["8137E434",0x2896],
+  ["8137E435",0x2897],
+  ["8137E436",0x2898],
+  ["8137E437",0x2899],
+  ["8137E438",0x289A],
+  ["8137E439",0x289B],
+  ["8137E530",0x289C],
+  ["8137E531",0x289D],
+  ["8137E532",0x289E],
+  ["8137E533",0x289F],
+  ["8137E534",0x28A0],
+  ["8137E535",0x28A1],
+  ["8137E536",0x28A2],
+  ["8137E537",0x28A3],
+  ["8137E538",0x28A4],
+  ["8137E539",0x28A5],
+  ["8137E630",0x28A6],
+  ["8137E631",0x28A7],
+  ["8137E632",0x28A8],
+  ["8137E633",0x28A9],
+  ["8137E634",0x28AA],
+  ["8137E635",0x28AB],
+  ["8137E636",0x28AC],
+  ["8137E637",0x28AD],
+  ["8137E638",0x28AE],
+  ["8137E639",0x28AF],
+  ["8137E730",0x28B0],
+  ["8137E731",0x28B1],
+  ["8137E732",0x28B2],
+  ["8137E733",0x28B3],
+  ["8137E734",0x28B4],
+  ["8137E735",0x28B5],
+  ["8137E736",0x28B6],
+  ["8137E737",0x28B7],
+  ["8137E738",0x28B8],
+  ["8137E739",0x28B9],
+  ["8137E830",0x28BA],
+  ["8137E831",0x28BB],
+  ["8137E832",0x28BC],
+  ["8137E833",0x28BD],
+  ["8137E834",0x28BE],
+  ["8137E835",0x28BF],
+  ["8137E836",0x28C0],
+  ["8137E837",0x28C1],
+  ["8137E838",0x28C2],
+  ["8137E839",0x28C3],
+  ["8137E930",0x28C4],
+  ["8137E931",0x28C5],
+  ["8137E932",0x28C6],
+  ["8137E933",0x28C7],
+  ["8137E934",0x28C8],
+  ["8137E935",0x28C9],
+  ["8137E936",0x28CA],
+  ["8137E937",0x28CB],
+  ["8137E938",0x28CC],
+  ["8137E939",0x28CD],
+  ["8137EA30",0x28CE],
+  ["8137EA31",0x28CF],
+  ["8137EA32",0x28D0],
+  ["8137EA33",0x28D1],
+  ["8137EA34",0x28D2],
+  ["8137EA35",0x28D3],
+  ["8137EA36",0x28D4],
+  ["8137EA37",0x28D5],
+  ["8137EA38",0x28D6],
+  ["8137EA39",0x28D7],
+  ["8137EB30",0x28D8],
+  ["8137EB31",0x28D9],
+  ["8137EB32",0x28DA],
+  ["8137EB33",0x28DB],
+  ["8137EB34",0x28DC],
+  ["8137EB35",0x28DD],
+  ["8137EB36",0x28DE],
+  ["8137EB37",0x28DF],
+  ["8137EB38",0x28E0],
+  ["8137EB39",0x28E1],
+  ["8137EC30",0x28E2],
+  ["8137EC31",0x28E3],
+  ["8137EC32",0x28E4],
+  ["8137EC33",0x28E5],
+  ["8137EC34",0x28E6],
+  ["8137EC35",0x28E7],
+  ["8137EC36",0x28E8],
+  ["8137EC37",0x28E9],
+  ["8137EC38",0x28EA],
+  ["8137EC39",0x28EB],
+  ["8137ED30",0x28EC],
+  ["8137ED31",0x28ED],
+  ["8137ED32",0x28EE],
+  ["8137ED33",0x28EF],
+  ["8137ED34",0x28F0],
+  ["8137ED35",0x28F1],
+  ["8137ED36",0x28F2],
+  ["8137ED37",0x28F3],
+  ["8137ED38",0x28F4],
+  ["8137ED39",0x28F5],
+  ["8137EE30",0x28F6],
+  ["8137EE31",0x28F7],
+  ["8137EE32",0x28F8],
+  ["8137EE33",0x28F9],
+  ["8137EE34",0x28FA],
+  ["8137EE35",0x28FB],
+  ["8137EE36",0x28FC],
+  ["8137EE37",0x28FD],
+  ["8137EE38",0x28FE],
+  ["8137EE39",0x28FF],
+  ["8137EF30",0x2900],
+  ["8137EF31",0x2901],
+  ["8137EF32",0x2902],
+  ["8137EF33",0x2903],
+  ["8137EF34",0x2904],
+  ["8137EF35",0x2905],
+  ["8137EF36",0x2906],
+  ["8137EF37",0x2907],
+  ["8137EF38",0x2908],
+  ["8137EF39",0x2909],
+  ["8137F030",0x290A],
+  ["8137F031",0x290B],
+  ["8137F032",0x290C],
+  ["8137F033",0x290D],
+  ["8137F034",0x290E],
+  ["8137F035",0x290F],
+  ["8137F036",0x2910],
+  ["8137F037",0x2911],
+  ["8137F038",0x2912],
+  ["8137F039",0x2913],
+  ["8137F130",0x2914],
+  ["8137F131",0x2915],
+  ["8137F132",0x2916],
+  ["8137F133",0x2917],
+  ["8137F134",0x2918],
+  ["8137F135",0x2919],
+  ["8137F136",0x291A],
+  ["8137F137",0x291B],
+  ["8137F138",0x291C],
+  ["8137F139",0x291D],
+  ["8137F230",0x291E],
+  ["8137F231",0x291F],
+  ["8137F232",0x2920],
+  ["8137F233",0x2921],
+  ["8137F234",0x2922],
+  ["8137F235",0x2923],
+  ["8137F236",0x2924],
+  ["8137F237",0x2925],
+  ["8137F238",0x2926],
+  ["8137F239",0x2927],
+  ["8137F330",0x2928],
+  ["8137F331",0x2929],
+  ["8137F332",0x292A],
+  ["8137F333",0x292B],
+  ["8137F334",0x292C],
+  ["8137F335",0x292D],
+  ["8137F336",0x292E],
+  ["8137F337",0x292F],
+  ["8137F338",0x2930],
+  ["8137F339",0x2931],
+  ["8137F430",0x2932],
+  ["8137F431",0x2933],
+  ["8137F432",0x2934],
+  ["8137F433",0x2935],
+  ["8137F434",0x2936],
+  ["8137F435",0x2937],
+  ["8137F436",0x2938],
+  ["8137F437",0x2939],
+  ["8137F438",0x293A],
+  ["8137F439",0x293B],
+  ["8137F530",0x293C],
+  ["8137F531",0x293D],
+  ["8137F532",0x293E],
+  ["8137F533",0x293F],
+  ["8137F534",0x2940],
+  ["8137F535",0x2941],
+  ["8137F536",0x2942],
+  ["8137F537",0x2943],
+  ["8137F538",0x2944],
+  ["8137F539",0x2945],
+  ["8137F630",0x2946],
+  ["8137F631",0x2947],
+  ["8137F632",0x2948],
+  ["8137F633",0x2949],
+  ["8137F634",0x294A],
+  ["8137F635",0x294B],
+  ["8137F636",0x294C],
+  ["8137F637",0x294D],
+  ["8137F638",0x294E],
+  ["8137F639",0x294F],
+  ["8137F730",0x2950],
+  ["8137F731",0x2951],
+  ["8137F732",0x2952],
+  ["8137F733",0x2953],
+  ["8137F734",0x2954],
+  ["8137F735",0x2955],
+  ["8137F736",0x2956],
+  ["8137F737",0x2957],
+  ["8137F738",0x2958],
+  ["8137F739",0x2959],
+  ["8137F830",0x295A],
+  ["8137F831",0x295B],
+  ["8137F832",0x295C],
+  ["8137F833",0x295D],
+  ["8137F834",0x295E],
+  ["8137F835",0x295F],
+  ["8137F836",0x2960],
+  ["8137F837",0x2961],
+  ["8137F838",0x2962],
+  ["8137F839",0x2963],
+  ["8137F930",0x2964],
+  ["8137F931",0x2965],
+  ["8137F932",0x2966],
+  ["8137F933",0x2967],
+  ["8137F934",0x2968],
+  ["8137F935",0x2969],
+  ["8137F936",0x296A],
+  ["8137F937",0x296B],
+  ["8137F938",0x296C],
+  ["8137F939",0x296D],
+  ["8137FA30",0x296E],
+  ["8137FA31",0x296F],
+  ["8137FA32",0x2970],
+  ["8137FA33",0x2971],
+  ["8137FA34",0x2972],
+  ["8137FA35",0x2973],
+  ["8137FA36",0x2974],
+  ["8137FA37",0x2975],
+  ["8137FA38",0x2976],
+  ["8137FA39",0x2977],
+  ["8137FB30",0x2978],
+  ["8137FB31",0x2979],
+  ["8137FB32",0x297A],
+  ["8137FB33",0x297B],
+  ["8137FB34",0x297C],
+  ["8137FB35",0x297D],
+  ["8137FB36",0x297E],
+  ["8137FB37",0x297F],
+  ["8137FB38",0x2980],
+  ["8137FB39",0x2981],
+  ["8137FC30",0x2982],
+  ["8137FC31",0x2983],
+  ["8137FC32",0x2984],
+  ["8137FC33",0x2985],
+  ["8137FC34",0x2986],
+  ["8137FC35",0x2987],
+  ["8137FC36",0x2988],
+  ["8137FC37",0x2989],
+  ["8137FC38",0x298A],
+  ["8137FC39",0x298B],
+  ["8137FD30",0x298C],
+  ["8137FD31",0x298D],
+  ["8137FD32",0x298E],
+  ["8137FD33",0x298F],
+  ["8137FD34",0x2990],
+  ["8137FD35",0x2991],
+  ["8137FD36",0x2992],
+  ["8137FD37",0x2993],
+  ["8137FD38",0x2994],
+  ["8137FD39",0x2995],
+  ["8137FE30",0x2996],
+  ["8137FE31",0x2997],
+  ["8137FE32",0x2998],
+  ["8137FE33",0x2999],
+  ["8137FE34",0x299A],
+  ["8137FE35",0x299B],
+  ["8137FE36",0x299C],
+  ["8137FE37",0x299D],
+  ["8137FE38",0x299E],
+  ["8137FE39",0x299F],
+  ["81388130",0x29A0],
+  ["81388131",0x29A1],
+  ["81388132",0x29A2],
+  ["81388133",0x29A3],
+  ["81388134",0x29A4],
+  ["81388135",0x29A5],
+  ["81388136",0x29A6],
+  ["81388137",0x29A7],
+  ["81388138",0x29A8],
+  ["81388139",0x29A9],
+  ["81388230",0x29AA],
+  ["81388231",0x29AB],
+  ["81388232",0x29AC],
+  ["81388233",0x29AD],
+  ["81388234",0x29AE],
+  ["81388235",0x29AF],
+  ["81388236",0x29B0],
+  ["81388237",0x29B1],
+  ["81388238",0x29B2],
+  ["81388239",0x29B3],
+  ["81388330",0x29B4],
+  ["81388331",0x29B5],
+  ["81388332",0x29B6],
+  ["81388333",0x29B7],
+  ["81388334",0x29B8],
+  ["81388335",0x29B9],
+  ["81388336",0x29BA],
+  ["81388337",0x29BB],
+  ["81388338",0x29BC],
+  ["81388339",0x29BD],
+  ["81388430",0x29BE],
+  ["81388431",0x29BF],
+  ["81388432",0x29C0],
+  ["81388433",0x29C1],
+  ["81388434",0x29C2],
+  ["81388435",0x29C3],
+  ["81388436",0x29C4],
+  ["81388437",0x29C5],
+  ["81388438",0x29C6],
+  ["81388439",0x29C7],
+  ["81388530",0x29C8],
+  ["81388531",0x29C9],
+  ["81388532",0x29CA],
+  ["81388533",0x29CB],
+  ["81388534",0x29CC],
+  ["81388535",0x29CD],
+  ["81388536",0x29CE],
+  ["81388537",0x29CF],
+  ["81388538",0x29D0],
+  ["81388539",0x29D1],
+  ["81388630",0x29D2],
+  ["81388631",0x29D3],
+  ["81388632",0x29D4],
+  ["81388633",0x29D5],
+  ["81388634",0x29D6],
+  ["81388635",0x29D7],
+  ["81388636",0x29D8],
+  ["81388637",0x29D9],
+  ["81388638",0x29DA],
+  ["81388639",0x29DB],
+  ["81388730",0x29DC],
+  ["81388731",0x29DD],
+  ["81388732",0x29DE],
+  ["81388733",0x29DF],
+  ["81388734",0x29E0],
+  ["81388735",0x29E1],
+  ["81388736",0x29E2],
+  ["81388737",0x29E3],
+  ["81388738",0x29E4],
+  ["81388739",0x29E5],
+  ["81388830",0x29E6],
+  ["81388831",0x29E7],
+  ["81388832",0x29E8],
+  ["81388833",0x29E9],
+  ["81388834",0x29EA],
+  ["81388835",0x29EB],
+  ["81388836",0x29EC],
+  ["81388837",0x29ED],
+  ["81388838",0x29EE],
+  ["81388839",0x29EF],
+  ["81388930",0x29F0],
+  ["81388931",0x29F1],
+  ["81388932",0x29F2],
+  ["81388933",0x29F3],
+  ["81388934",0x29F4],
+  ["81388935",0x29F5],
+  ["81388936",0x29F6],
+  ["81388937",0x29F7],
+  ["81388938",0x29F8],
+  ["81388939",0x29F9],
+  ["81388A30",0x29FA],
+  ["81388A31",0x29FB],
+  ["81388A32",0x29FC],
+  ["81388A33",0x29FD],
+  ["81388A34",0x29FE],
+  ["81388A35",0x29FF],
+  ["81388A36",0x2A00],
+  ["81388A37",0x2A01],
+  ["81388A38",0x2A02],
+  ["81388A39",0x2A03],
+  ["81388B30",0x2A04],
+  ["81388B31",0x2A05],
+  ["81388B32",0x2A06],
+  ["81388B33",0x2A07],
+  ["81388B34",0x2A08],
+  ["81388B35",0x2A09],
+  ["81388B36",0x2A0A],
+  ["81388B37",0x2A0B],
+  ["81388B38",0x2A0C],
+  ["81388B39",0x2A0D],
+  ["81388C30",0x2A0E],
+  ["81388C31",0x2A0F],
+  ["81388C32",0x2A10],
+  ["81388C33",0x2A11],
+  ["81388C34",0x2A12],
+  ["81388C35",0x2A13],
+  ["81388C36",0x2A14],
+  ["81388C37",0x2A15],
+  ["81388C38",0x2A16],
+  ["81388C39",0x2A17],
+  ["81388D30",0x2A18],
+  ["81388D31",0x2A19],
+  ["81388D32",0x2A1A],
+  ["81388D33",0x2A1B],
+  ["81388D34",0x2A1C],
+  ["81388D35",0x2A1D],
+  ["81388D36",0x2A1E],
+  ["81388D37",0x2A1F],
+  ["81388D38",0x2A20],
+  ["81388D39",0x2A21],
+  ["81388E30",0x2A22],
+  ["81388E31",0x2A23],
+  ["81388E32",0x2A24],
+  ["81388E33",0x2A25],
+  ["81388E34",0x2A26],
+  ["81388E35",0x2A27],
+  ["81388E36",0x2A28],
+  ["81388E37",0x2A29],
+  ["81388E38",0x2A2A],
+  ["81388E39",0x2A2B],
+  ["81388F30",0x2A2C],
+  ["81388F31",0x2A2D],
+  ["81388F32",0x2A2E],
+  ["81388F33",0x2A2F],
+  ["81388F34",0x2A30],
+  ["81388F35",0x2A31],
+  ["81388F36",0x2A32],
+  ["81388F37",0x2A33],
+  ["81388F38",0x2A34],
+  ["81388F39",0x2A35],
+  ["81389030",0x2A36],
+  ["81389031",0x2A37],
+  ["81389032",0x2A38],
+  ["81389033",0x2A39],
+  ["81389034",0x2A3A],
+  ["81389035",0x2A3B],
+  ["81389036",0x2A3C],
+  ["81389037",0x2A3D],
+  ["81389038",0x2A3E],
+  ["81389039",0x2A3F],
+  ["81389130",0x2A40],
+  ["81389131",0x2A41],
+  ["81389132",0x2A42],
+  ["81389133",0x2A43],
+  ["81389134",0x2A44],
+  ["81389135",0x2A45],
+  ["81389136",0x2A46],
+  ["81389137",0x2A47],
+  ["81389138",0x2A48],
+  ["81389139",0x2A49],
+  ["81389230",0x2A4A],
+  ["81389231",0x2A4B],
+  ["81389232",0x2A4C],
+  ["81389233",0x2A4D],
+  ["81389234",0x2A4E],
+  ["81389235",0x2A4F],
+  ["81389236",0x2A50],
+  ["81389237",0x2A51],
+  ["81389238",0x2A52],
+  ["81389239",0x2A53],
+  ["81389330",0x2A54],
+  ["81389331",0x2A55],
+  ["81389332",0x2A56],
+  ["81389333",0x2A57],
+  ["81389334",0x2A58],
+  ["81389335",0x2A59],
+  ["81389336",0x2A5A],
+  ["81389337",0x2A5B],
+  ["81389338",0x2A5C],
+  ["81389339",0x2A5D],
+  ["81389430",0x2A5E],
+  ["81389431",0x2A5F],
+  ["81389432",0x2A60],
+  ["81389433",0x2A61],
+  ["81389434",0x2A62],
+  ["81389435",0x2A63],
+  ["81389436",0x2A64],
+  ["81389437",0x2A65],
+  ["81389438",0x2A66],
+  ["81389439",0x2A67],
+  ["81389530",0x2A68],
+  ["81389531",0x2A69],
+  ["81389532",0x2A6A],
+  ["81389533",0x2A6B],
+  ["81389534",0x2A6C],
+  ["81389535",0x2A6D],
+  ["81389536",0x2A6E],
+  ["81389537",0x2A6F],
+  ["81389538",0x2A70],
+  ["81389539",0x2A71],
+  ["81389630",0x2A72],
+  ["81389631",0x2A73],
+  ["81389632",0x2A74],
+  ["81389633",0x2A75],
+  ["81389634",0x2A76],
+  ["81389635",0x2A77],
+  ["81389636",0x2A78],
+  ["81389637",0x2A79],
+  ["81389638",0x2A7A],
+  ["81389639",0x2A7B],
+  ["81389730",0x2A7C],
+  ["81389731",0x2A7D],
+  ["81389732",0x2A7E],
+  ["81389733",0x2A7F],
+  ["81389734",0x2A80],
+  ["81389735",0x2A81],
+  ["81389736",0x2A82],
+  ["81389737",0x2A83],
+  ["81389738",0x2A84],
+  ["81389739",0x2A85],
+  ["81389830",0x2A86],
+  ["81389831",0x2A87],
+  ["81389832",0x2A88],
+  ["81389833",0x2A89],
+  ["81389834",0x2A8A],
+  ["81389835",0x2A8B],
+  ["81389836",0x2A8C],
+  ["81389837",0x2A8D],
+  ["81389838",0x2A8E],
+  ["81389839",0x2A8F],
+  ["81389930",0x2A90],
+  ["81389931",0x2A91],
+  ["81389932",0x2A92],
+  ["81389933",0x2A93],
+  ["81389934",0x2A94],
+  ["81389935",0x2A95],
+  ["81389936",0x2A96],
+  ["81389937",0x2A97],
+  ["81389938",0x2A98],
+  ["81389939",0x2A99],
+  ["81389A30",0x2A9A],
+  ["81389A31",0x2A9B],
+  ["81389A32",0x2A9C],
+  ["81389A33",0x2A9D],
+  ["81389A34",0x2A9E],
+  ["81389A35",0x2A9F],
+  ["81389A36",0x2AA0],
+  ["81389A37",0x2AA1],
+  ["81389A38",0x2AA2],
+  ["81389A39",0x2AA3],
+  ["81389B30",0x2AA4],
+  ["81389B31",0x2AA5],
+  ["81389B32",0x2AA6],
+  ["81389B33",0x2AA7],
+  ["81389B34",0x2AA8],
+  ["81389B35",0x2AA9],
+  ["81389B36",0x2AAA],
+  ["81389B37",0x2AAB],
+  ["81389B38",0x2AAC],
+  ["81389B39",0x2AAD],
+  ["81389C30",0x2AAE],
+  ["81389C31",0x2AAF],
+  ["81389C32",0x2AB0],
+  ["81389C33",0x2AB1],
+  ["81389C34",0x2AB2],
+  ["81389C35",0x2AB3],
+  ["81389C36",0x2AB4],
+  ["81389C37",0x2AB5],
+  ["81389C38",0x2AB6],
+  ["81389C39",0x2AB7],
+  ["81389D30",0x2AB8],
+  ["81389D31",0x2AB9],
+  ["81389D32",0x2ABA],
+  ["81389D33",0x2ABB],
+  ["81389D34",0x2ABC],
+  ["81389D35",0x2ABD],
+  ["81389D36",0x2ABE],
+  ["81389D37",0x2ABF],
+  ["81389D38",0x2AC0],
+  ["81389D39",0x2AC1],
+  ["81389E30",0x2AC2],
+  ["81389E31",0x2AC3],
+  ["81389E32",0x2AC4],
+  ["81389E33",0x2AC5],
+  ["81389E34",0x2AC6],
+  ["81389E35",0x2AC7],
+  ["81389E36",0x2AC8],
+  ["81389E37",0x2AC9],
+  ["81389E38",0x2ACA],
+  ["81389E39",0x2ACB],
+  ["81389F30",0x2ACC],
+  ["81389F31",0x2ACD],
+  ["81389F32",0x2ACE],
+  ["81389F33",0x2ACF],
+  ["81389F34",0x2AD0],
+  ["81389F35",0x2AD1],
+  ["81389F36",0x2AD2],
+  ["81389F37",0x2AD3],
+  ["81389F38",0x2AD4],
+  ["81389F39",0x2AD5],
+  ["8138A030",0x2AD6],
+  ["8138A031",0x2AD7],
+  ["8138A032",0x2AD8],
+  ["8138A033",0x2AD9],
+  ["8138A034",0x2ADA],
+  ["8138A035",0x2ADB],
+  ["8138A036",0x2ADC],
+  ["8138A037",0x2ADD],
+  ["8138A038",0x2ADE],
+  ["8138A039",0x2ADF],
+  ["8138A130",0x2AE0],
+  ["8138A131",0x2AE1],
+  ["8138A132",0x2AE2],
+  ["8138A133",0x2AE3],
+  ["8138A134",0x2AE4],
+  ["8138A135",0x2AE5],
+  ["8138A136",0x2AE6],
+  ["8138A137",0x2AE7],
+  ["8138A138",0x2AE8],
+  ["8138A139",0x2AE9],
+  ["8138A230",0x2AEA],
+  ["8138A231",0x2AEB],
+  ["8138A232",0x2AEC],
+  ["8138A233",0x2AED],
+  ["8138A234",0x2AEE],
+  ["8138A235",0x2AEF],
+  ["8138A236",0x2AF0],
+  ["8138A237",0x2AF1],
+  ["8138A238",0x2AF2],
+  ["8138A239",0x2AF3],
+  ["8138A330",0x2AF4],
+  ["8138A331",0x2AF5],
+  ["8138A332",0x2AF6],
+  ["8138A333",0x2AF7],
+  ["8138A334",0x2AF8],
+  ["8138A335",0x2AF9],
+  ["8138A336",0x2AFA],
+  ["8138A337",0x2AFB],
+  ["8138A338",0x2AFC],
+  ["8138A339",0x2AFD],
+  ["8138A430",0x2AFE],
+  ["8138A431",0x2AFF],
+  ["8138A432",0x2B00],
+  ["8138A433",0x2B01],
+  ["8138A434",0x2B02],
+  ["8138A435",0x2B03],
+  ["8138A436",0x2B04],
+  ["8138A437",0x2B05],
+  ["8138A438",0x2B06],
+  ["8138A439",0x2B07],
+  ["8138A530",0x2B08],
+  ["8138A531",0x2B09],
+  ["8138A532",0x2B0A],
+  ["8138A533",0x2B0B],
+  ["8138A534",0x2B0C],
+  ["8138A535",0x2B0D],
+  ["8138A536",0x2B0E],
+  ["8138A537",0x2B0F],
+  ["8138A538",0x2B10],
+  ["8138A539",0x2B11],
+  ["8138A630",0x2B12],
+  ["8138A631",0x2B13],
+  ["8138A632",0x2B14],
+  ["8138A633",0x2B15],
+  ["8138A634",0x2B16],
+  ["8138A635",0x2B17],
+  ["8138A636",0x2B18],
+  ["8138A637",0x2B19],
+  ["8138A638",0x2B1A],
+  ["8138A639",0x2B1B],
+  ["8138A730",0x2B1C],
+  ["8138A731",0x2B1D],
+  ["8138A732",0x2B1E],
+  ["8138A733",0x2B1F],
+  ["8138A734",0x2B20],
+  ["8138A735",0x2B21],
+  ["8138A736",0x2B22],
+  ["8138A737",0x2B23],
+  ["8138A738",0x2B24],
+  ["8138A739",0x2B25],
+  ["8138A830",0x2B26],
+  ["8138A831",0x2B27],
+  ["8138A832",0x2B28],
+  ["8138A833",0x2B29],
+  ["8138A834",0x2B2A],
+  ["8138A835",0x2B2B],
+  ["8138A836",0x2B2C],
+  ["8138A837",0x2B2D],
+  ["8138A838",0x2B2E],
+  ["8138A839",0x2B2F],
+  ["8138A930",0x2B30],
+  ["8138A931",0x2B31],
+  ["8138A932",0x2B32],
+  ["8138A933",0x2B33],
+  ["8138A934",0x2B34],
+  ["8138A935",0x2B35],
+  ["8138A936",0x2B36],
+  ["8138A937",0x2B37],
+  ["8138A938",0x2B38],
+  ["8138A939",0x2B39],
+  ["8138AA30",0x2B3A],
+  ["8138AA31",0x2B3B],
+  ["8138AA32",0x2B3C],
+  ["8138AA33",0x2B3D],
+  ["8138AA34",0x2B3E],
+  ["8138AA35",0x2B3F],
+  ["8138AA36",0x2B40],
+  ["8138AA37",0x2B41],
+  ["8138AA38",0x2B42],
+  ["8138AA39",0x2B43],
+  ["8138AB30",0x2B44],
+  ["8138AB31",0x2B45],
+  ["8138AB32",0x2B46],
+  ["8138AB33",0x2B47],
+  ["8138AB34",0x2B48],
+  ["8138AB35",0x2B49],
+  ["8138AB36",0x2B4A],
+  ["8138AB37",0x2B4B],
+  ["8138AB38",0x2B4C],
+  ["8138AB39",0x2B4D],
+  ["8138AC30",0x2B4E],
+  ["8138AC31",0x2B4F],
+  ["8138AC32",0x2B50],
+  ["8138AC33",0x2B51],
+  ["8138AC34",0x2B52],
+  ["8138AC35",0x2B53],
+  ["8138AC36",0x2B54],
+  ["8138AC37",0x2B55],
+  ["8138AC38",0x2B56],
+  ["8138AC39",0x2B57],
+  ["8138AD30",0x2B58],
+  ["8138AD31",0x2B59],
+  ["8138AD32",0x2B5A],
+  ["8138AD33",0x2B5B],
+  ["8138AD34",0x2B5C],
+  ["8138AD35",0x2B5D],
+  ["8138AD36",0x2B5E],
+  ["8138AD37",0x2B5F],
+  ["8138AD38",0x2B60],
+  ["8138AD39",0x2B61],
+  ["8138AE30",0x2B62],
+  ["8138AE31",0x2B63],
+  ["8138AE32",0x2B64],
+  ["8138AE33",0x2B65],
+  ["8138AE34",0x2B66],
+  ["8138AE35",0x2B67],
+  ["8138AE36",0x2B68],
+  ["8138AE37",0x2B69],
+  ["8138AE38",0x2B6A],
+  ["8138AE39",0x2B6B],
+  ["8138AF30",0x2B6C],
+  ["8138AF31",0x2B6D],
+  ["8138AF32",0x2B6E],
+  ["8138AF33",0x2B6F],
+  ["8138AF34",0x2B70],
+  ["8138AF35",0x2B71],
+  ["8138AF36",0x2B72],
+  ["8138AF37",0x2B73],
+  ["8138AF38",0x2B74],
+  ["8138AF39",0x2B75],
+  ["8138B030",0x2B76],
+  ["8138B031",0x2B77],
+  ["8138B032",0x2B78],
+  ["8138B033",0x2B79],
+  ["8138B034",0x2B7A],
+  ["8138B035",0x2B7B],
+  ["8138B036",0x2B7C],
+  ["8138B037",0x2B7D],
+  ["8138B038",0x2B7E],
+  ["8138B039",0x2B7F],
+  ["8138B130",0x2B80],
+  ["8138B131",0x2B81],
+  ["8138B132",0x2B82],
+  ["8138B133",0x2B83],
+  ["8138B134",0x2B84],
+  ["8138B135",0x2B85],
+  ["8138B136",0x2B86],
+  ["8138B137",0x2B87],
+  ["8138B138",0x2B88],
+  ["8138B139",0x2B89],
+  ["8138B230",0x2B8A],
+  ["8138B231",0x2B8B],
+  ["8138B232",0x2B8C],
+  ["8138B233",0x2B8D],
+  ["8138B234",0x2B8E],
+  ["8138B235",0x2B8F],
+  ["8138B236",0x2B90],
+  ["8138B237",0x2B91],
+  ["8138B238",0x2B92],
+  ["8138B239",0x2B93],
+  ["8138B330",0x2B94],
+  ["8138B331",0x2B95],
+  ["8138B332",0x2B96],
+  ["8138B333",0x2B97],
+  ["8138B334",0x2B98],
+  ["8138B335",0x2B99],
+  ["8138B336",0x2B9A],
+  ["8138B337",0x2B9B],
+  ["8138B338",0x2B9C],
+  ["8138B339",0x2B9D],
+  ["8138B430",0x2B9E],
+  ["8138B431",0x2B9F],
+  ["8138B432",0x2BA0],
+  ["8138B433",0x2BA1],
+  ["8138B434",0x2BA2],
+  ["8138B435",0x2BA3],
+  ["8138B436",0x2BA4],
+  ["8138B437",0x2BA5],
+  ["8138B438",0x2BA6],
+  ["8138B439",0x2BA7],
+  ["8138B530",0x2BA8],
+  ["8138B531",0x2BA9],
+  ["8138B532",0x2BAA],
+  ["8138B533",0x2BAB],
+  ["8138B534",0x2BAC],
+  ["8138B535",0x2BAD],
+  ["8138B536",0x2BAE],
+  ["8138B537",0x2BAF],
+  ["8138B538",0x2BB0],
+  ["8138B539",0x2BB1],
+  ["8138B630",0x2BB2],
+  ["8138B631",0x2BB3],
+  ["8138B632",0x2BB4],
+  ["8138B633",0x2BB5],
+  ["8138B634",0x2BB6],
+  ["8138B635",0x2BB7],
+  ["8138B636",0x2BB8],
+  ["8138B637",0x2BB9],
+  ["8138B638",0x2BBA],
+  ["8138B639",0x2BBB],
+  ["8138B730",0x2BBC],
+  ["8138B731",0x2BBD],
+  ["8138B732",0x2BBE],
+  ["8138B733",0x2BBF],
+  ["8138B734",0x2BC0],
+  ["8138B735",0x2BC1],
+  ["8138B736",0x2BC2],
+  ["8138B737",0x2BC3],
+  ["8138B738",0x2BC4],
+  ["8138B739",0x2BC5],
+  ["8138B830",0x2BC6],
+  ["8138B831",0x2BC7],
+  ["8138B832",0x2BC8],
+  ["8138B833",0x2BC9],
+  ["8138B834",0x2BCA],
+  ["8138B835",0x2BCB],
+  ["8138B836",0x2BCC],
+  ["8138B837",0x2BCD],
+  ["8138B838",0x2BCE],
+  ["8138B839",0x2BCF],
+  ["8138B930",0x2BD0],
+  ["8138B931",0x2BD1],
+  ["8138B932",0x2BD2],
+  ["8138B933",0x2BD3],
+  ["8138B934",0x2BD4],
+  ["8138B935",0x2BD5],
+  ["8138B936",0x2BD6],
+  ["8138B937",0x2BD7],
+  ["8138B938",0x2BD8],
+  ["8138B939",0x2BD9],
+  ["8138BA30",0x2BDA],
+  ["8138BA31",0x2BDB],
+  ["8138BA32",0x2BDC],
+  ["8138BA33",0x2BDD],
+  ["8138BA34",0x2BDE],
+  ["8138BA35",0x2BDF],
+  ["8138BA36",0x2BE0],
+  ["8138BA37",0x2BE1],
+  ["8138BA38",0x2BE2],
+  ["8138BA39",0x2BE3],
+  ["8138BB30",0x2BE4],
+  ["8138BB31",0x2BE5],
+  ["8138BB32",0x2BE6],
+  ["8138BB33",0x2BE7],
+  ["8138BB34",0x2BE8],
+  ["8138BB35",0x2BE9],
+  ["8138BB36",0x2BEA],
+  ["8138BB37",0x2BEB],
+  ["8138BB38",0x2BEC],
+  ["8138BB39",0x2BED],
+  ["8138BC30",0x2BEE],
+  ["8138BC31",0x2BEF],
+  ["8138BC32",0x2BF0],
+  ["8138BC33",0x2BF1],
+  ["8138BC34",0x2BF2],
+  ["8138BC35",0x2BF3],
+  ["8138BC36",0x2BF4],
+  ["8138BC37",0x2BF5],
+  ["8138BC38",0x2BF6],
+  ["8138BC39",0x2BF7],
+  ["8138BD30",0x2BF8],
+  ["8138BD31",0x2BF9],
+  ["8138BD32",0x2BFA],
+  ["8138BD33",0x2BFB],
+  ["8138BD34",0x2BFC],
+  ["8138BD35",0x2BFD],
+  ["8138BD36",0x2BFE],
+  ["8138BD37",0x2BFF],
+  ["8138BD38",0x2C00],
+  ["8138BD39",0x2C01],
+  ["8138BE30",0x2C02],
+  ["8138BE31",0x2C03],
+  ["8138BE32",0x2C04],
+  ["8138BE33",0x2C05],
+  ["8138BE34",0x2C06],
+  ["8138BE35",0x2C07],
+  ["8138BE36",0x2C08],
+  ["8138BE37",0x2C09],
+  ["8138BE38",0x2C0A],
+  ["8138BE39",0x2C0B],
+  ["8138BF30",0x2C0C],
+  ["8138BF31",0x2C0D],
+  ["8138BF32",0x2C0E],
+  ["8138BF33",0x2C0F],
+  ["8138BF34",0x2C10],
+  ["8138BF35",0x2C11],
+  ["8138BF36",0x2C12],
+  ["8138BF37",0x2C13],
+  ["8138BF38",0x2C14],
+  ["8138BF39",0x2C15],
+  ["8138C030",0x2C16],
+  ["8138C031",0x2C17],
+  ["8138C032",0x2C18],
+  ["8138C033",0x2C19],
+  ["8138C034",0x2C1A],
+  ["8138C035",0x2C1B],
+  ["8138C036",0x2C1C],
+  ["8138C037",0x2C1D],
+  ["8138C038",0x2C1E],
+  ["8138C039",0x2C1F],
+  ["8138C130",0x2C20],
+  ["8138C131",0x2C21],
+  ["8138C132",0x2C22],
+  ["8138C133",0x2C23],
+  ["8138C134",0x2C24],
+  ["8138C135",0x2C25],
+  ["8138C136",0x2C26],
+  ["8138C137",0x2C27],
+  ["8138C138",0x2C28],
+  ["8138C139",0x2C29],
+  ["8138C230",0x2C2A],
+  ["8138C231",0x2C2B],
+  ["8138C232",0x2C2C],
+  ["8138C233",0x2C2D],
+  ["8138C234",0x2C2E],
+  ["8138C235",0x2C2F],
+  ["8138C236",0x2C30],
+  ["8138C237",0x2C31],
+  ["8138C238",0x2C32],
+  ["8138C239",0x2C33],
+  ["8138C330",0x2C34],
+  ["8138C331",0x2C35],
+  ["8138C332",0x2C36],
+  ["8138C333",0x2C37],
+  ["8138C334",0x2C38],
+  ["8138C335",0x2C39],
+  ["8138C336",0x2C3A],
+  ["8138C337",0x2C3B],
+  ["8138C338",0x2C3C],
+  ["8138C339",0x2C3D],
+  ["8138C430",0x2C3E],
+  ["8138C431",0x2C3F],
+  ["8138C432",0x2C40],
+  ["8138C433",0x2C41],
+  ["8138C434",0x2C42],
+  ["8138C435",0x2C43],
+  ["8138C436",0x2C44],
+  ["8138C437",0x2C45],
+  ["8138C438",0x2C46],
+  ["8138C439",0x2C47],
+  ["8138C530",0x2C48],
+  ["8138C531",0x2C49],
+  ["8138C532",0x2C4A],
+  ["8138C533",0x2C4B],
+  ["8138C534",0x2C4C],
+  ["8138C535",0x2C4D],
+  ["8138C536",0x2C4E],
+  ["8138C537",0x2C4F],
+  ["8138C538",0x2C50],
+  ["8138C539",0x2C51],
+  ["8138C630",0x2C52],
+  ["8138C631",0x2C53],
+  ["8138C632",0x2C54],
+  ["8138C633",0x2C55],
+  ["8138C634",0x2C56],
+  ["8138C635",0x2C57],
+  ["8138C636",0x2C58],
+  ["8138C637",0x2C59],
+  ["8138C638",0x2C5A],
+  ["8138C639",0x2C5B],
+  ["8138C730",0x2C5C],
+  ["8138C731",0x2C5D],
+  ["8138C732",0x2C5E],
+  ["8138C733",0x2C5F],
+  ["8138C734",0x2C60],
+  ["8138C735",0x2C61],
+  ["8138C736",0x2C62],
+  ["8138C737",0x2C63],
+  ["8138C738",0x2C64],
+  ["8138C739",0x2C65],
+  ["8138C830",0x2C66],
+  ["8138C831",0x2C67],
+  ["8138C832",0x2C68],
+  ["8138C833",0x2C69],
+  ["8138C834",0x2C6A],
+  ["8138C835",0x2C6B],
+  ["8138C836",0x2C6C],
+  ["8138C837",0x2C6D],
+  ["8138C838",0x2C6E],
+  ["8138C839",0x2C6F],
+  ["8138C930",0x2C70],
+  ["8138C931",0x2C71],
+  ["8138C932",0x2C72],
+  ["8138C933",0x2C73],
+  ["8138C934",0x2C74],
+  ["8138C935",0x2C75],
+  ["8138C936",0x2C76],
+  ["8138C937",0x2C77],
+  ["8138C938",0x2C78],
+  ["8138C939",0x2C79],
+  ["8138CA30",0x2C7A],
+  ["8138CA31",0x2C7B],
+  ["8138CA32",0x2C7C],
+  ["8138CA33",0x2C7D],
+  ["8138CA34",0x2C7E],
+  ["8138CA35",0x2C7F],
+  ["8138CA36",0x2C80],
+  ["8138CA37",0x2C81],
+  ["8138CA38",0x2C82],
+  ["8138CA39",0x2C83],
+  ["8138CB30",0x2C84],
+  ["8138CB31",0x2C85],
+  ["8138CB32",0x2C86],
+  ["8138CB33",0x2C87],
+  ["8138CB34",0x2C88],
+  ["8138CB35",0x2C89],
+  ["8138CB36",0x2C8A],
+  ["8138CB37",0x2C8B],
+  ["8138CB38",0x2C8C],
+  ["8138CB39",0x2C8D],
+  ["8138CC30",0x2C8E],
+  ["8138CC31",0x2C8F],
+  ["8138CC32",0x2C90],
+  ["8138CC33",0x2C91],
+  ["8138CC34",0x2C92],
+  ["8138CC35",0x2C93],
+  ["8138CC36",0x2C94],
+  ["8138CC37",0x2C95],
+  ["8138CC38",0x2C96],
+  ["8138CC39",0x2C97],
+  ["8138CD30",0x2C98],
+  ["8138CD31",0x2C99],
+  ["8138CD32",0x2C9A],
+  ["8138CD33",0x2C9B],
+  ["8138CD34",0x2C9C],
+  ["8138CD35",0x2C9D],
+  ["8138CD36",0x2C9E],
+  ["8138CD37",0x2C9F],
+  ["8138CD38",0x2CA0],
+  ["8138CD39",0x2CA1],
+  ["8138CE30",0x2CA2],
+  ["8138CE31",0x2CA3],
+  ["8138CE32",0x2CA4],
+  ["8138CE33",0x2CA5],
+  ["8138CE34",0x2CA6],
+  ["8138CE35",0x2CA7],
+  ["8138CE36",0x2CA8],
+  ["8138CE37",0x2CA9],
+  ["8138CE38",0x2CAA],
+  ["8138CE39",0x2CAB],
+  ["8138CF30",0x2CAC],
+  ["8138CF31",0x2CAD],
+  ["8138CF32",0x2CAE],
+  ["8138CF33",0x2CAF],
+  ["8138CF34",0x2CB0],
+  ["8138CF35",0x2CB1],
+  ["8138CF36",0x2CB2],
+  ["8138CF37",0x2CB3],
+  ["8138CF38",0x2CB4],
+  ["8138CF39",0x2CB5],
+  ["8138D030",0x2CB6],
+  ["8138D031",0x2CB7],
+  ["8138D032",0x2CB8],
+  ["8138D033",0x2CB9],
+  ["8138D034",0x2CBA],
+  ["8138D035",0x2CBB],
+  ["8138D036",0x2CBC],
+  ["8138D037",0x2CBD],
+  ["8138D038",0x2CBE],
+  ["8138D039",0x2CBF],
+  ["8138D130",0x2CC0],
+  ["8138D131",0x2CC1],
+  ["8138D132",0x2CC2],
+  ["8138D133",0x2CC3],
+  ["8138D134",0x2CC4],
+  ["8138D135",0x2CC5],
+  ["8138D136",0x2CC6],
+  ["8138D137",0x2CC7],
+  ["8138D138",0x2CC8],
+  ["8138D139",0x2CC9],
+  ["8138D230",0x2CCA],
+  ["8138D231",0x2CCB],
+  ["8138D232",0x2CCC],
+  ["8138D233",0x2CCD],
+  ["8138D234",0x2CCE],
+  ["8138D235",0x2CCF],
+  ["8138D236",0x2CD0],
+  ["8138D237",0x2CD1],
+  ["8138D238",0x2CD2],
+  ["8138D239",0x2CD3],
+  ["8138D330",0x2CD4],
+  ["8138D331",0x2CD5],
+  ["8138D332",0x2CD6],
+  ["8138D333",0x2CD7],
+  ["8138D334",0x2CD8],
+  ["8138D335",0x2CD9],
+  ["8138D336",0x2CDA],
+  ["8138D337",0x2CDB],
+  ["8138D338",0x2CDC],
+  ["8138D339",0x2CDD],
+  ["8138D430",0x2CDE],
+  ["8138D431",0x2CDF],
+  ["8138D432",0x2CE0],
+  ["8138D433",0x2CE1],
+  ["8138D434",0x2CE2],
+  ["8138D435",0x2CE3],
+  ["8138D436",0x2CE4],
+  ["8138D437",0x2CE5],
+  ["8138D438",0x2CE6],
+  ["8138D439",0x2CE7],
+  ["8138D530",0x2CE8],
+  ["8138D531",0x2CE9],
+  ["8138D532",0x2CEA],
+  ["8138D533",0x2CEB],
+  ["8138D534",0x2CEC],
+  ["8138D535",0x2CED],
+  ["8138D536",0x2CEE],
+  ["8138D537",0x2CEF],
+  ["8138D538",0x2CF0],
+  ["8138D539",0x2CF1],
+  ["8138D630",0x2CF2],
+  ["8138D631",0x2CF3],
+  ["8138D632",0x2CF4],
+  ["8138D633",0x2CF5],
+  ["8138D634",0x2CF6],
+  ["8138D635",0x2CF7],
+  ["8138D636",0x2CF8],
+  ["8138D637",0x2CF9],
+  ["8138D638",0x2CFA],
+  ["8138D639",0x2CFB],
+  ["8138D730",0x2CFC],
+  ["8138D731",0x2CFD],
+  ["8138D732",0x2CFE],
+  ["8138D733",0x2CFF],
+  ["8138D734",0x2D00],
+  ["8138D735",0x2D01],
+  ["8138D736",0x2D02],
+  ["8138D737",0x2D03],
+  ["8138D738",0x2D04],
+  ["8138D739",0x2D05],
+  ["8138D830",0x2D06],
+  ["8138D831",0x2D07],
+  ["8138D832",0x2D08],
+  ["8138D833",0x2D09],
+  ["8138D834",0x2D0A],
+  ["8138D835",0x2D0B],
+  ["8138D836",0x2D0C],
+  ["8138D837",0x2D0D],
+  ["8138D838",0x2D0E],
+  ["8138D839",0x2D0F],
+  ["8138D930",0x2D10],
+  ["8138D931",0x2D11],
+  ["8138D932",0x2D12],
+  ["8138D933",0x2D13],
+  ["8138D934",0x2D14],
+  ["8138D935",0x2D15],
+  ["8138D936",0x2D16],
+  ["8138D937",0x2D17],
+  ["8138D938",0x2D18],
+  ["8138D939",0x2D19],
+  ["8138DA30",0x2D1A],
+  ["8138DA31",0x2D1B],
+  ["8138DA32",0x2D1C],
+  ["8138DA33",0x2D1D],
+  ["8138DA34",0x2D1E],
+  ["8138DA35",0x2D1F],
+  ["8138DA36",0x2D20],
+  ["8138DA37",0x2D21],
+  ["8138DA38",0x2D22],
+  ["8138DA39",0x2D23],
+  ["8138DB30",0x2D24],
+  ["8138DB31",0x2D25],
+  ["8138DB32",0x2D26],
+  ["8138DB33",0x2D27],
+  ["8138DB34",0x2D28],
+  ["8138DB35",0x2D29],
+  ["8138DB36",0x2D2A],
+  ["8138DB37",0x2D2B],
+  ["8138DB38",0x2D2C],
+  ["8138DB39",0x2D2D],
+  ["8138DC30",0x2D2E],
+  ["8138DC31",0x2D2F],
+  ["8138DC32",0x2D30],
+  ["8138DC33",0x2D31],
+  ["8138DC34",0x2D32],
+  ["8138DC35",0x2D33],
+  ["8138DC36",0x2D34],
+  ["8138DC37",0x2D35],
+  ["8138DC38",0x2D36],
+  ["8138DC39",0x2D37],
+  ["8138DD30",0x2D38],
+  ["8138DD31",0x2D39],
+  ["8138DD32",0x2D3A],
+  ["8138DD33",0x2D3B],
+  ["8138DD34",0x2D3C],
+  ["8138DD35",0x2D3D],
+  ["8138DD36",0x2D3E],
+  ["8138DD37",0x2D3F],
+  ["8138DD38",0x2D40],
+  ["8138DD39",0x2D41],
+  ["8138DE30",0x2D42],
+  ["8138DE31",0x2D43],
+  ["8138DE32",0x2D44],
+  ["8138DE33",0x2D45],
+  ["8138DE34",0x2D46],
+  ["8138DE35",0x2D47],
+  ["8138DE36",0x2D48],
+  ["8138DE37",0x2D49],
+  ["8138DE38",0x2D4A],
+  ["8138DE39",0x2D4B],
+  ["8138DF30",0x2D4C],
+  ["8138DF31",0x2D4D],
+  ["8138DF32",0x2D4E],
+  ["8138DF33",0x2D4F],
+  ["8138DF34",0x2D50],
+  ["8138DF35",0x2D51],
+  ["8138DF36",0x2D52],
+  ["8138DF37",0x2D53],
+  ["8138DF38",0x2D54],
+  ["8138DF39",0x2D55],
+  ["8138E030",0x2D56],
+  ["8138E031",0x2D57],
+  ["8138E032",0x2D58],
+  ["8138E033",0x2D59],
+  ["8138E034",0x2D5A],
+  ["8138E035",0x2D5B],
+  ["8138E036",0x2D5C],
+  ["8138E037",0x2D5D],
+  ["8138E038",0x2D5E],
+  ["8138E039",0x2D5F],
+  ["8138E130",0x2D60],
+  ["8138E131",0x2D61],
+  ["8138E132",0x2D62],
+  ["8138E133",0x2D63],
+  ["8138E134",0x2D64],
+  ["8138E135",0x2D65],
+  ["8138E136",0x2D66],
+  ["8138E137",0x2D67],
+  ["8138E138",0x2D68],
+  ["8138E139",0x2D69],
+  ["8138E230",0x2D6A],
+  ["8138E231",0x2D6B],
+  ["8138E232",0x2D6C],
+  ["8138E233",0x2D6D],
+  ["8138E234",0x2D6E],
+  ["8138E235",0x2D6F],
+  ["8138E236",0x2D70],
+  ["8138E237",0x2D71],
+  ["8138E238",0x2D72],
+  ["8138E239",0x2D73],
+  ["8138E330",0x2D74],
+  ["8138E331",0x2D75],
+  ["8138E332",0x2D76],
+  ["8138E333",0x2D77],
+  ["8138E334",0x2D78],
+  ["8138E335",0x2D79],
+  ["8138E336",0x2D7A],
+  ["8138E337",0x2D7B],
+  ["8138E338",0x2D7C],
+  ["8138E339",0x2D7D],
+  ["8138E430",0x2D7E],
+  ["8138E431",0x2D7F],
+  ["8138E432",0x2D80],
+  ["8138E433",0x2D81],
+  ["8138E434",0x2D82],
+  ["8138E435",0x2D83],
+  ["8138E436",0x2D84],
+  ["8138E437",0x2D85],
+  ["8138E438",0x2D86],
+  ["8138E439",0x2D87],
+  ["8138E530",0x2D88],
+  ["8138E531",0x2D89],
+  ["8138E532",0x2D8A],
+  ["8138E533",0x2D8B],
+  ["8138E534",0x2D8C],
+  ["8138E535",0x2D8D],
+  ["8138E536",0x2D8E],
+  ["8138E537",0x2D8F],
+  ["8138E538",0x2D90],
+  ["8138E539",0x2D91],
+  ["8138E630",0x2D92],
+  ["8138E631",0x2D93],
+  ["8138E632",0x2D94],
+  ["8138E633",0x2D95],
+  ["8138E634",0x2D96],
+  ["8138E635",0x2D97],
+  ["8138E636",0x2D98],
+  ["8138E637",0x2D99],
+  ["8138E638",0x2D9A],
+  ["8138E639",0x2D9B],
+  ["8138E730",0x2D9C],
+  ["8138E731",0x2D9D],
+  ["8138E732",0x2D9E],
+  ["8138E733",0x2D9F],
+  ["8138E734",0x2DA0],
+  ["8138E735",0x2DA1],
+  ["8138E736",0x2DA2],
+  ["8138E737",0x2DA3],
+  ["8138E738",0x2DA4],
+  ["8138E739",0x2DA5],
+  ["8138E830",0x2DA6],
+  ["8138E831",0x2DA7],
+  ["8138E832",0x2DA8],
+  ["8138E833",0x2DA9],
+  ["8138E834",0x2DAA],
+  ["8138E835",0x2DAB],
+  ["8138E836",0x2DAC],
+  ["8138E837",0x2DAD],
+  ["8138E838",0x2DAE],
+  ["8138E839",0x2DAF],
+  ["8138E930",0x2DB0],
+  ["8138E931",0x2DB1],
+  ["8138E932",0x2DB2],
+  ["8138E933",0x2DB3],
+  ["8138E934",0x2DB4],
+  ["8138E935",0x2DB5],
+  ["8138E936",0x2DB6],
+  ["8138E937",0x2DB7],
+  ["8138E938",0x2DB8],
+  ["8138E939",0x2DB9],
+  ["8138EA30",0x2DBA],
+  ["8138EA31",0x2DBB],
+  ["8138EA32",0x2DBC],
+  ["8138EA33",0x2DBD],
+  ["8138EA34",0x2DBE],
+  ["8138EA35",0x2DBF],
+  ["8138EA36",0x2DC0],
+  ["8138EA37",0x2DC1],
+  ["8138EA38",0x2DC2],
+  ["8138EA39",0x2DC3],
+  ["8138EB30",0x2DC4],
+  ["8138EB31",0x2DC5],
+  ["8138EB32",0x2DC6],
+  ["8138EB33",0x2DC7],
+  ["8138EB34",0x2DC8],
+  ["8138EB35",0x2DC9],
+  ["8138EB36",0x2DCA],
+  ["8138EB37",0x2DCB],
+  ["8138EB38",0x2DCC],
+  ["8138EB39",0x2DCD],
+  ["8138EC30",0x2DCE],
+  ["8138EC31",0x2DCF],
+  ["8138EC32",0x2DD0],
+  ["8138EC33",0x2DD1],
+  ["8138EC34",0x2DD2],
+  ["8138EC35",0x2DD3],
+  ["8138EC36",0x2DD4],
+  ["8138EC37",0x2DD5],
+  ["8138EC38",0x2DD6],
+  ["8138EC39",0x2DD7],
+  ["8138ED30",0x2DD8],
+  ["8138ED31",0x2DD9],
+  ["8138ED32",0x2DDA],
+  ["8138ED33",0x2DDB],
+  ["8138ED34",0x2DDC],
+  ["8138ED35",0x2DDD],
+  ["8138ED36",0x2DDE],
+  ["8138ED37",0x2DDF],
+  ["8138ED38",0x2DE0],
+  ["8138ED39",0x2DE1],
+  ["8138EE30",0x2DE2],
+  ["8138EE31",0x2DE3],
+  ["8138EE32",0x2DE4],
+  ["8138EE33",0x2DE5],
+  ["8138EE34",0x2DE6],
+  ["8138EE35",0x2DE7],
+  ["8138EE36",0x2DE8],
+  ["8138EE37",0x2DE9],
+  ["8138EE38",0x2DEA],
+  ["8138EE39",0x2DEB],
+  ["8138EF30",0x2DEC],
+  ["8138EF31",0x2DED],
+  ["8138EF32",0x2DEE],
+  ["8138EF33",0x2DEF],
+  ["8138EF34",0x2DF0],
+  ["8138EF35",0x2DF1],
+  ["8138EF36",0x2DF2],
+  ["8138EF37",0x2DF3],
+  ["8138EF38",0x2DF4],
+  ["8138EF39",0x2DF5],
+  ["8138F030",0x2DF6],
+  ["8138F031",0x2DF7],
+  ["8138F032",0x2DF8],
+  ["8138F033",0x2DF9],
+  ["8138F034",0x2DFA],
+  ["8138F035",0x2DFB],
+  ["8138F036",0x2DFC],
+  ["8138F037",0x2DFD],
+  ["8138F038",0x2DFE],
+  ["8138F039",0x2DFF],
+  ["8138F130",0x2E00],
+  ["8138F131",0x2E01],
+  ["8138F132",0x2E02],
+  ["8138F133",0x2E03],
+  ["8138F134",0x2E04],
+  ["8138F135",0x2E05],
+  ["8138F136",0x2E06],
+  ["8138F137",0x2E07],
+  ["8138F138",0x2E08],
+  ["8138F139",0x2E09],
+  ["8138F230",0x2E0A],
+  ["8138F231",0x2E0B],
+  ["8138F232",0x2E0C],
+  ["8138F233",0x2E0D],
+  ["8138F234",0x2E0E],
+  ["8138F235",0x2E0F],
+  ["8138F236",0x2E10],
+  ["8138F237",0x2E11],
+  ["8138F238",0x2E12],
+  ["8138F239",0x2E13],
+  ["8138F330",0x2E14],
+  ["8138F331",0x2E15],
+  ["8138F332",0x2E16],
+  ["8138F333",0x2E17],
+  ["8138F334",0x2E18],
+  ["8138F335",0x2E19],
+  ["8138F336",0x2E1A],
+  ["8138F337",0x2E1B],
+  ["8138F338",0x2E1C],
+  ["8138F339",0x2E1D],
+  ["8138F430",0x2E1E],
+  ["8138F431",0x2E1F],
+  ["8138F432",0x2E20],
+  ["8138F433",0x2E21],
+  ["8138F434",0x2E22],
+  ["8138F435",0x2E23],
+  ["8138F436",0x2E24],
+  ["8138F437",0x2E25],
+  ["8138F438",0x2E26],
+  ["8138F439",0x2E27],
+  ["8138F530",0x2E28],
+  ["8138F531",0x2E29],
+  ["8138F532",0x2E2A],
+  ["8138F533",0x2E2B],
+  ["8138F534",0x2E2C],
+  ["8138F535",0x2E2D],
+  ["8138F536",0x2E2E],
+  ["8138F537",0x2E2F],
+  ["8138F538",0x2E30],
+  ["8138F539",0x2E31],
+  ["8138F630",0x2E32],
+  ["8138F631",0x2E33],
+  ["8138F632",0x2E34],
+  ["8138F633",0x2E35],
+  ["8138F634",0x2E36],
+  ["8138F635",0x2E37],
+  ["8138F636",0x2E38],
+  ["8138F637",0x2E39],
+  ["8138F638",0x2E3A],
+  ["8138F639",0x2E3B],
+  ["8138F730",0x2E3C],
+  ["8138F731",0x2E3D],
+  ["8138F732",0x2E3E],
+  ["8138F733",0x2E3F],
+  ["8138F734",0x2E40],
+  ["8138F735",0x2E41],
+  ["8138F736",0x2E42],
+  ["8138F737",0x2E43],
+  ["8138F738",0x2E44],
+  ["8138F739",0x2E45],
+  ["8138F830",0x2E46],
+  ["8138F831",0x2E47],
+  ["8138F832",0x2E48],
+  ["8138F833",0x2E49],
+  ["8138F834",0x2E4A],
+  ["8138F835",0x2E4B],
+  ["8138F836",0x2E4C],
+  ["8138F837",0x2E4D],
+  ["8138F838",0x2E4E],
+  ["8138F839",0x2E4F],
+  ["8138F930",0x2E50],
+  ["8138F931",0x2E51],
+  ["8138F932",0x2E52],
+  ["8138F933",0x2E53],
+  ["8138F934",0x2E54],
+  ["8138F935",0x2E55],
+  ["8138F936",0x2E56],
+  ["8138F937",0x2E57],
+  ["8138F938",0x2E58],
+  ["8138F939",0x2E59],
+  ["8138FA30",0x2E5A],
+  ["8138FA31",0x2E5B],
+  ["8138FA32",0x2E5C],
+  ["8138FA33",0x2E5D],
+  ["8138FA34",0x2E5E],
+  ["8138FA35",0x2E5F],
+  ["8138FA36",0x2E60],
+  ["8138FA37",0x2E61],
+  ["8138FA38",0x2E62],
+  ["8138FA39",0x2E63],
+  ["8138FB30",0x2E64],
+  ["8138FB31",0x2E65],
+  ["8138FB32",0x2E66],
+  ["8138FB33",0x2E67],
+  ["8138FB34",0x2E68],
+  ["8138FB35",0x2E69],
+  ["8138FB36",0x2E6A],
+  ["8138FB37",0x2E6B],
+  ["8138FB38",0x2E6C],
+  ["8138FB39",0x2E6D],
+  ["8138FC30",0x2E6E],
+  ["8138FC31",0x2E6F],
+  ["8138FC32",0x2E70],
+  ["8138FC33",0x2E71],
+  ["8138FC34",0x2E72],
+  ["8138FC35",0x2E73],
+  ["8138FC36",0x2E74],
+  ["8138FC37",0x2E75],
+  ["8138FC38",0x2E76],
+  ["8138FC39",0x2E77],
+  ["8138FD30",0x2E78],
+  ["8138FD31",0x2E79],
+  ["8138FD32",0x2E7A],
+  ["8138FD33",0x2E7B],
+  ["8138FD34",0x2E7C],
+  ["8138FD35",0x2E7D],
+  ["8138FD36",0x2E7E],
+  ["8138FD37",0x2E7F],
+  ["8138FD38",0x2E80],
+  ["FE50",0x2E81],
+  ["8138FD39",0x2E82],
+  ["8138FE30",0x2E83],
+  ["FE54",0x2E84],
+  ["8138FE31",0x2E85],
+  ["8138FE32",0x2E86],
+  ["8138FE33",0x2E87],
+  ["FE57",0x2E88],
+  ["8138FE34",0x2E89],
+  ["8138FE35",0x2E8A],
+  ["FE58",0x2E8B],
+  ["FE5D",0x2E8C],
+  ["8138FE36",0x2E8D],
+  ["8138FE37",0x2E8E],
+  ["8138FE38",0x2E8F],
+  ["8138FE39",0x2E90],
+  ["81398130",0x2E91],
+  ["81398131",0x2E92],
+  ["81398132",0x2E93],
+  ["81398133",0x2E94],
+  ["81398134",0x2E95],
+  ["81398135",0x2E96],
+  ["FE5E",0x2E97],
+  ["81398136",0x2E98],
+  ["81398137",0x2E99],
+  ["81398138",0x2E9A],
+  ["81398139",0x2E9B],
+  ["81398230",0x2E9C],
+  ["81398231",0x2E9D],
+  ["81398232",0x2E9E],
+  ["81398233",0x2E9F],
+  ["81398234",0x2EA0],
+  ["81398235",0x2EA1],
+  ["81398236",0x2EA2],
+  ["81398237",0x2EA3],
+  ["81398238",0x2EA4],
+  ["81398239",0x2EA5],
+  ["81398330",0x2EA6],
+  ["FE6B",0x2EA7],
+  ["81398331",0x2EA8],
+  ["81398332",0x2EA9],
+  ["FE6E",0x2EAA],
+  ["81398333",0x2EAB],
+  ["81398334",0x2EAC],
+  ["81398335",0x2EAD],
+  ["FE71",0x2EAE],
+  ["81398336",0x2EAF],
+  ["81398337",0x2EB0],
+  ["81398338",0x2EB1],
+  ["81398339",0x2EB2],
+  ["FE73",0x2EB3],
+  ["81398430",0x2EB4],
+  ["81398431",0x2EB5],
+  ["FE74",0x2EB6],
+  ["FE75",0x2EB7],
+  ["81398432",0x2EB8],
+  ["81398433",0x2EB9],
+  ["81398434",0x2EBA],
+  ["FE79",0x2EBB],
+  ["81398435",0x2EBC],
+  ["81398436",0x2EBD],
+  ["81398437",0x2EBE],
+  ["81398438",0x2EBF],
+  ["81398439",0x2EC0],
+  ["81398530",0x2EC1],
+  ["81398531",0x2EC2],
+  ["81398532",0x2EC3],
+  ["81398533",0x2EC4],
+  ["81398534",0x2EC5],
+  ["81398535",0x2EC6],
+  ["81398536",0x2EC7],
+  ["81398537",0x2EC8],
+  ["81398538",0x2EC9],
+  ["FE84",0x2ECA],
+  ["81398539",0x2ECB],
+  ["81398630",0x2ECC],
+  ["81398631",0x2ECD],
+  ["81398632",0x2ECE],
+  ["81398633",0x2ECF],
+  ["81398634",0x2ED0],
+  ["81398635",0x2ED1],
+  ["81398636",0x2ED2],
+  ["81398637",0x2ED3],
+  ["81398638",0x2ED4],
+  ["81398639",0x2ED5],
+  ["81398730",0x2ED6],
+  ["81398731",0x2ED7],
+  ["81398732",0x2ED8],
+  ["81398733",0x2ED9],
+  ["81398734",0x2EDA],
+  ["81398735",0x2EDB],
+  ["81398736",0x2EDC],
+  ["81398737",0x2EDD],
+  ["81398738",0x2EDE],
+  ["81398739",0x2EDF],
+  ["81398830",0x2EE0],
+  ["81398831",0x2EE1],
+  ["81398832",0x2EE2],
+  ["81398833",0x2EE3],
+  ["81398834",0x2EE4],
+  ["81398835",0x2EE5],
+  ["81398836",0x2EE6],
+  ["81398837",0x2EE7],
+  ["81398838",0x2EE8],
+  ["81398839",0x2EE9],
+  ["81398930",0x2EEA],
+  ["81398931",0x2EEB],
+  ["81398932",0x2EEC],
+  ["81398933",0x2EED],
+  ["81398934",0x2EEE],
+  ["81398935",0x2EEF],
+  ["81398936",0x2EF0],
+  ["81398937",0x2EF1],
+  ["81398938",0x2EF2],
+  ["81398939",0x2EF3],
+  ["81398A30",0x2EF4],
+  ["81398A31",0x2EF5],
+  ["81398A32",0x2EF6],
+  ["81398A33",0x2EF7],
+  ["81398A34",0x2EF8],
+  ["81398A35",0x2EF9],
+  ["81398A36",0x2EFA],
+  ["81398A37",0x2EFB],
+  ["81398A38",0x2EFC],
+  ["81398A39",0x2EFD],
+  ["81398B30",0x2EFE],
+  ["81398B31",0x2EFF],
+  ["81398B32",0x2F00],
+  ["81398B33",0x2F01],
+  ["81398B34",0x2F02],
+  ["81398B35",0x2F03],
+  ["81398B36",0x2F04],
+  ["81398B37",0x2F05],
+  ["81398B38",0x2F06],
+  ["81398B39",0x2F07],
+  ["81398C30",0x2F08],
+  ["81398C31",0x2F09],
+  ["81398C32",0x2F0A],
+  ["81398C33",0x2F0B],
+  ["81398C34",0x2F0C],
+  ["81398C35",0x2F0D],
+  ["81398C36",0x2F0E],
+  ["81398C37",0x2F0F],
+  ["81398C38",0x2F10],
+  ["81398C39",0x2F11],
+  ["81398D30",0x2F12],
+  ["81398D31",0x2F13],
+  ["81398D32",0x2F14],
+  ["81398D33",0x2F15],
+  ["81398D34",0x2F16],
+  ["81398D35",0x2F17],
+  ["81398D36",0x2F18],
+  ["81398D37",0x2F19],
+  ["81398D38",0x2F1A],
+  ["81398D39",0x2F1B],
+  ["81398E30",0x2F1C],
+  ["81398E31",0x2F1D],
+  ["81398E32",0x2F1E],
+  ["81398E33",0x2F1F],
+  ["81398E34",0x2F20],
+  ["81398E35",0x2F21],
+  ["81398E36",0x2F22],
+  ["81398E37",0x2F23],
+  ["81398E38",0x2F24],
+  ["81398E39",0x2F25],
+  ["81398F30",0x2F26],
+  ["81398F31",0x2F27],
+  ["81398F32",0x2F28],
+  ["81398F33",0x2F29],
+  ["81398F34",0x2F2A],
+  ["81398F35",0x2F2B],
+  ["81398F36",0x2F2C],
+  ["81398F37",0x2F2D],
+  ["81398F38",0x2F2E],
+  ["81398F39",0x2F2F],
+  ["81399030",0x2F30],
+  ["81399031",0x2F31],
+  ["81399032",0x2F32],
+  ["81399033",0x2F33],
+  ["81399034",0x2F34],
+  ["81399035",0x2F35],
+  ["81399036",0x2F36],
+  ["81399037",0x2F37],
+  ["81399038",0x2F38],
+  ["81399039",0x2F39],
+  ["81399130",0x2F3A],
+  ["81399131",0x2F3B],
+  ["81399132",0x2F3C],
+  ["81399133",0x2F3D],
+  ["81399134",0x2F3E],
+  ["81399135",0x2F3F],
+  ["81399136",0x2F40],
+  ["81399137",0x2F41],
+  ["81399138",0x2F42],
+  ["81399139",0x2F43],
+  ["81399230",0x2F44],
+  ["81399231",0x2F45],
+  ["81399232",0x2F46],
+  ["81399233",0x2F47],
+  ["81399234",0x2F48],
+  ["81399235",0x2F49],
+  ["81399236",0x2F4A],
+  ["81399237",0x2F4B],
+  ["81399238",0x2F4C],
+  ["81399239",0x2F4D],
+  ["81399330",0x2F4E],
+  ["81399331",0x2F4F],
+  ["81399332",0x2F50],
+  ["81399333",0x2F51],
+  ["81399334",0x2F52],
+  ["81399335",0x2F53],
+  ["81399336",0x2F54],
+  ["81399337",0x2F55],
+  ["81399338",0x2F56],
+  ["81399339",0x2F57],
+  ["81399430",0x2F58],
+  ["81399431",0x2F59],
+  ["81399432",0x2F5A],
+  ["81399433",0x2F5B],
+  ["81399434",0x2F5C],
+  ["81399435",0x2F5D],
+  ["81399436",0x2F5E],
+  ["81399437",0x2F5F],
+  ["81399438",0x2F60],
+  ["81399439",0x2F61],
+  ["81399530",0x2F62],
+  ["81399531",0x2F63],
+  ["81399532",0x2F64],
+  ["81399533",0x2F65],
+  ["81399534",0x2F66],
+  ["81399535",0x2F67],
+  ["81399536",0x2F68],
+  ["81399537",0x2F69],
+  ["81399538",0x2F6A],
+  ["81399539",0x2F6B],
+  ["81399630",0x2F6C],
+  ["81399631",0x2F6D],
+  ["81399632",0x2F6E],
+  ["81399633",0x2F6F],
+  ["81399634",0x2F70],
+  ["81399635",0x2F71],
+  ["81399636",0x2F72],
+  ["81399637",0x2F73],
+  ["81399638",0x2F74],
+  ["81399639",0x2F75],
+  ["81399730",0x2F76],
+  ["81399731",0x2F77],
+  ["81399732",0x2F78],
+  ["81399733",0x2F79],
+  ["81399734",0x2F7A],
+  ["81399735",0x2F7B],
+  ["81399736",0x2F7C],
+  ["81399737",0x2F7D],
+  ["81399738",0x2F7E],
+  ["81399739",0x2F7F],
+  ["81399830",0x2F80],
+  ["81399831",0x2F81],
+  ["81399832",0x2F82],
+  ["81399833",0x2F83],
+  ["81399834",0x2F84],
+  ["81399835",0x2F85],
+  ["81399836",0x2F86],
+  ["81399837",0x2F87],
+  ["81399838",0x2F88],
+  ["81399839",0x2F89],
+  ["81399930",0x2F8A],
+  ["81399931",0x2F8B],
+  ["81399932",0x2F8C],
+  ["81399933",0x2F8D],
+  ["81399934",0x2F8E],
+  ["81399935",0x2F8F],
+  ["81399936",0x2F90],
+  ["81399937",0x2F91],
+  ["81399938",0x2F92],
+  ["81399939",0x2F93],
+  ["81399A30",0x2F94],
+  ["81399A31",0x2F95],
+  ["81399A32",0x2F96],
+  ["81399A33",0x2F97],
+  ["81399A34",0x2F98],
+  ["81399A35",0x2F99],
+  ["81399A36",0x2F9A],
+  ["81399A37",0x2F9B],
+  ["81399A38",0x2F9C],
+  ["81399A39",0x2F9D],
+  ["81399B30",0x2F9E],
+  ["81399B31",0x2F9F],
+  ["81399B32",0x2FA0],
+  ["81399B33",0x2FA1],
+  ["81399B34",0x2FA2],
+  ["81399B35",0x2FA3],
+  ["81399B36",0x2FA4],
+  ["81399B37",0x2FA5],
+  ["81399B38",0x2FA6],
+  ["81399B39",0x2FA7],
+  ["81399C30",0x2FA8],
+  ["81399C31",0x2FA9],
+  ["81399C32",0x2FAA],
+  ["81399C33",0x2FAB],
+  ["81399C34",0x2FAC],
+  ["81399C35",0x2FAD],
+  ["81399C36",0x2FAE],
+  ["81399C37",0x2FAF],
+  ["81399C38",0x2FB0],
+  ["81399C39",0x2FB1],
+  ["81399D30",0x2FB2],
+  ["81399D31",0x2FB3],
+  ["81399D32",0x2FB4],
+  ["81399D33",0x2FB5],
+  ["81399D34",0x2FB6],
+  ["81399D35",0x2FB7],
+  ["81399D36",0x2FB8],
+  ["81399D37",0x2FB9],
+  ["81399D38",0x2FBA],
+  ["81399D39",0x2FBB],
+  ["81399E30",0x2FBC],
+  ["81399E31",0x2FBD],
+  ["81399E32",0x2FBE],
+  ["81399E33",0x2FBF],
+  ["81399E34",0x2FC0],
+  ["81399E35",0x2FC1],
+  ["81399E36",0x2FC2],
+  ["81399E37",0x2FC3],
+  ["81399E38",0x2FC4],
+  ["81399E39",0x2FC5],
+  ["81399F30",0x2FC6],
+  ["81399F31",0x2FC7],
+  ["81399F32",0x2FC8],
+  ["81399F33",0x2FC9],
+  ["81399F34",0x2FCA],
+  ["81399F35",0x2FCB],
+  ["81399F36",0x2FCC],
+  ["81399F37",0x2FCD],
+  ["81399F38",0x2FCE],
+  ["81399F39",0x2FCF],
+  ["8139A030",0x2FD0],
+  ["8139A031",0x2FD1],
+  ["8139A032",0x2FD2],
+  ["8139A033",0x2FD3],
+  ["8139A034",0x2FD4],
+  ["8139A035",0x2FD5],
+  ["8139A036",0x2FD6],
+  ["8139A037",0x2FD7],
+  ["8139A038",0x2FD8],
+  ["8139A039",0x2FD9],
+  ["8139A130",0x2FDA],
+  ["8139A131",0x2FDB],
+  ["8139A132",0x2FDC],
+  ["8139A133",0x2FDD],
+  ["8139A134",0x2FDE],
+  ["8139A135",0x2FDF],
+  ["8139A136",0x2FE0],
+  ["8139A137",0x2FE1],
+  ["8139A138",0x2FE2],
+  ["8139A139",0x2FE3],
+  ["8139A230",0x2FE4],
+  ["8139A231",0x2FE5],
+  ["8139A232",0x2FE6],
+  ["8139A233",0x2FE7],
+  ["8139A234",0x2FE8],
+  ["8139A235",0x2FE9],
+  ["8139A236",0x2FEA],
+  ["8139A237",0x2FEB],
+  ["8139A238",0x2FEC],
+  ["8139A239",0x2FED],
+  ["8139A330",0x2FEE],
+  ["8139A331",0x2FEF],
+  ["A98A",0x2FF0],
+  ["A98B",0x2FF1],
+  ["A98C",0x2FF2],
+  ["A98D",0x2FF3],
+  ["A98E",0x2FF4],
+  ["A98F",0x2FF5],
+  ["A990",0x2FF6],
+  ["A991",0x2FF7],
+  ["A992",0x2FF8],
+  ["A993",0x2FF9],
+  ["A994",0x2FFA],
+  ["A995",0x2FFB],
+  ["8139A332",0x2FFC],
+  ["8139A333",0x2FFD],
+  ["8139A334",0x2FFE],
+  ["8139A335",0x2FFF],
+  ["A1A1",0x3000],
+  ["A1A2",0x3001],
+  ["A1A3",0x3002],
+  ["A1A8",0x3003],
+  ["8139A336",0x3004],
+  ["A1A9",0x3005],
+  ["A965",0x3006],
+  ["A996",0x3007],
+  ["A1B4",0x3008],
+  ["A1B5",0x3009],
+  ["A1B6",0x300A],
+  ["A1B7",0x300B],
+  ["A1B8",0x300C],
+  ["A1B9",0x300D],
+  ["A1BA",0x300E],
+  ["A1BB",0x300F],
+  ["A1BE",0x3010],
+  ["A1BF",0x3011],
+  ["A893",0x3012],
+  ["A1FE",0x3013],
+  ["A1B2",0x3014],
+  ["A1B3",0x3015],
+  ["A1BC",0x3016],
+  ["A1BD",0x3017],
+  ["8139A337",0x3018],
+  ["8139A338",0x3019],
+  ["8139A339",0x301A],
+  ["8139A430",0x301B],
+  ["8139A431",0x301C],
+  ["A894",0x301D],
+  ["A895",0x301E],
+  ["8139A432",0x301F],
+  ["8139A433",0x3020],
+  ["A940",0x3021],
+  ["A941",0x3022],
+  ["A942",0x3023],
+  ["A943",0x3024],
+  ["A944",0x3025],
+  ["A945",0x3026],
+  ["A946",0x3027],
+  ["A947",0x3028],
+  ["A948",0x3029],
+  ["8139A434",0x302A],
+  ["8139A435",0x302B],
+  ["8139A436",0x302C],
+  ["8139A437",0x302D],
+  ["8139A438",0x302E],
+  ["8139A439",0x302F],
+  ["8139A530",0x3030],
+  ["8139A531",0x3031],
+  ["8139A532",0x3032],
+  ["8139A533",0x3033],
+  ["8139A534",0x3034],
+  ["8139A535",0x3035],
+  ["8139A536",0x3036],
+  ["8139A537",0x3037],
+  ["8139A538",0x3038],
+  ["8139A539",0x3039],
+  ["8139A630",0x303A],
+  ["8139A631",0x303B],
+  ["8139A632",0x303C],
+  ["8139A633",0x303D],
+  ["A989",0x303E],
+  ["8139A634",0x303F],
+  ["8139A635",0x3040],
+  ["A4A1",0x3041],
+  ["A4A2",0x3042],
+  ["A4A3",0x3043],
+  ["A4A4",0x3044],
+  ["A4A5",0x3045],
+  ["A4A6",0x3046],
+  ["A4A7",0x3047],
+  ["A4A8",0x3048],
+  ["A4A9",0x3049],
+  ["A4AA",0x304A],
+  ["A4AB",0x304B],
+  ["A4AC",0x304C],
+  ["A4AD",0x304D],
+  ["A4AE",0x304E],
+  ["A4AF",0x304F],
+  ["A4B0",0x3050],
+  ["A4B1",0x3051],
+  ["A4B2",0x3052],
+  ["A4B3",0x3053],
+  ["A4B4",0x3054],
+  ["A4B5",0x3055],
+  ["A4B6",0x3056],
+  ["A4B7",0x3057],
+  ["A4B8",0x3058],
+  ["A4B9",0x3059],
+  ["A4BA",0x305A],
+  ["A4BB",0x305B],
+  ["A4BC",0x305C],
+  ["A4BD",0x305D],
+  ["A4BE",0x305E],
+  ["A4BF",0x305F],
+  ["A4C0",0x3060],
+  ["A4C1",0x3061],
+  ["A4C2",0x3062],
+  ["A4C3",0x3063],
+  ["A4C4",0x3064],
+  ["A4C5",0x3065],
+  ["A4C6",0x3066],
+  ["A4C7",0x3067],
+  ["A4C8",0x3068],
+  ["A4C9",0x3069],
+  ["A4CA",0x306A],
+  ["A4CB",0x306B],
+  ["A4CC",0x306C],
+  ["A4CD",0x306D],
+  ["A4CE",0x306E],
+  ["A4CF",0x306F],
+  ["A4D0",0x3070],
+  ["A4D1",0x3071],
+  ["A4D2",0x3072],
+  ["A4D3",0x3073],
+  ["A4D4",0x3074],
+  ["A4D5",0x3075],
+  ["A4D6",0x3076],
+  ["A4D7",0x3077],
+  ["A4D8",0x3078],
+  ["A4D9",0x3079],
+  ["A4DA",0x307A],
+  ["A4DB",0x307B],
+  ["A4DC",0x307C],
+  ["A4DD",0x307D],
+  ["A4DE",0x307E],
+  ["A4DF",0x307F],
+  ["A4E0",0x3080],
+  ["A4E1",0x3081],
+  ["A4E2",0x3082],
+  ["A4E3",0x3083],
+  ["A4E4",0x3084],
+  ["A4E5",0x3085],
+  ["A4E6",0x3086],
+  ["A4E7",0x3087],
+  ["A4E8",0x3088],
+  ["A4E9",0x3089],
+  ["A4EA",0x308A],
+  ["A4EB",0x308B],
+  ["A4EC",0x308C],
+  ["A4ED",0x308D],
+  ["A4EE",0x308E],
+  ["A4EF",0x308F],
+  ["A4F0",0x3090],
+  ["A4F1",0x3091],
+  ["A4F2",0x3092],
+  ["A4F3",0x3093],
+  ["8139A636",0x3094],
+  ["8139A637",0x3095],
+  ["8139A638",0x3096],
+  ["8139A639",0x3097],
+  ["8139A730",0x3098],
+  ["8139A731",0x3099],
+  ["8139A732",0x309A],
+  ["A961",0x309B],
+  ["A962",0x309C],
+  ["A966",0x309D],
+  ["A967",0x309E],
+  ["8139A733",0x309F],
+  ["8139A734",0x30A0],
+  ["A5A1",0x30A1],
+  ["A5A2",0x30A2],
+  ["A5A3",0x30A3],
+  ["A5A4",0x30A4],
+  ["A5A5",0x30A5],
+  ["A5A6",0x30A6],
+  ["A5A7",0x30A7],
+  ["A5A8",0x30A8],
+  ["A5A9",0x30A9],
+  ["A5AA",0x30AA],
+  ["A5AB",0x30AB],
+  ["A5AC",0x30AC],
+  ["A5AD",0x30AD],
+  ["A5AE",0x30AE],
+  ["A5AF",0x30AF],
+  ["A5B0",0x30B0],
+  ["A5B1",0x30B1],
+  ["A5B2",0x30B2],
+  ["A5B3",0x30B3],
+  ["A5B4",0x30B4],
+  ["A5B5",0x30B5],
+  ["A5B6",0x30B6],
+  ["A5B7",0x30B7],
+  ["A5B8",0x30B8],
+  ["A5B9",0x30B9],
+  ["A5BA",0x30BA],
+  ["A5BB",0x30BB],
+  ["A5BC",0x30BC],
+  ["A5BD",0x30BD],
+  ["A5BE",0x30BE],
+  ["A5BF",0x30BF],
+  ["A5C0",0x30C0],
+  ["A5C1",0x30C1],
+  ["A5C2",0x30C2],
+  ["A5C3",0x30C3],
+  ["A5C4",0x30C4],
+  ["A5C5",0x30C5],
+  ["A5C6",0x30C6],
+  ["A5C7",0x30C7],
+  ["A5C8",0x30C8],
+  ["A5C9",0x30C9],
+  ["A5CA",0x30CA],
+  ["A5CB",0x30CB],
+  ["A5CC",0x30CC],
+  ["A5CD",0x30CD],
+  ["A5CE",0x30CE],
+  ["A5CF",0x30CF],
+  ["A5D0",0x30D0],
+  ["A5D1",0x30D1],
+  ["A5D2",0x30D2],
+  ["A5D3",0x30D3],
+  ["A5D4",0x30D4],
+  ["A5D5",0x30D5],
+  ["A5D6",0x30D6],
+  ["A5D7",0x30D7],
+  ["A5D8",0x30D8],
+  ["A5D9",0x30D9],
+  ["A5DA",0x30DA],
+  ["A5DB",0x30DB],
+  ["A5DC",0x30DC],
+  ["A5DD",0x30DD],
+  ["A5DE",0x30DE],
+  ["A5DF",0x30DF],
+  ["A5E0",0x30E0],
+  ["A5E1",0x30E1],
+  ["A5E2",0x30E2],
+  ["A5E3",0x30E3],
+  ["A5E4",0x30E4],
+  ["A5E5",0x30E5],
+  ["A5E6",0x30E6],
+  ["A5E7",0x30E7],
+  ["A5E8",0x30E8],
+  ["A5E9",0x30E9],
+  ["A5EA",0x30EA],
+  ["A5EB",0x30EB],
+  ["A5EC",0x30EC],
+  ["A5ED",0x30ED],
+  ["A5EE",0x30EE],
+  ["A5EF",0x30EF],
+  ["A5F0",0x30F0],
+  ["A5F1",0x30F1],
+  ["A5F2",0x30F2],
+  ["A5F3",0x30F3],
+  ["A5F4",0x30F4],
+  ["A5F5",0x30F5],
+  ["A5F6",0x30F6],
+  ["8139A735",0x30F7],
+  ["8139A736",0x30F8],
+  ["8139A737",0x30F9],
+  ["8139A738",0x30FA],
+  ["8139A739",0x30FB],
+  ["A960",0x30FC],
+  ["A963",0x30FD],
+  ["A964",0x30FE],
+  ["8139A830",0x30FF],
+  ["8139A831",0x3100],
+  ["8139A832",0x3101],
+  ["8139A833",0x3102],
+  ["8139A834",0x3103],
+  ["8139A835",0x3104],
+  ["A8C5",0x3105],
+  ["A8C6",0x3106],
+  ["A8C7",0x3107],
+  ["A8C8",0x3108],
+  ["A8C9",0x3109],
+  ["A8CA",0x310A],
+  ["A8CB",0x310B],
+  ["A8CC",0x310C],
+  ["A8CD",0x310D],
+  ["A8CE",0x310E],
+  ["A8CF",0x310F],
+  ["A8D0",0x3110],
+  ["A8D1",0x3111],
+  ["A8D2",0x3112],
+  ["A8D3",0x3113],
+  ["A8D4",0x3114],
+  ["A8D5",0x3115],
+  ["A8D6",0x3116],
+  ["A8D7",0x3117],
+  ["A8D8",0x3118],
+  ["A8D9",0x3119],
+  ["A8DA",0x311A],
+  ["A8DB",0x311B],
+  ["A8DC",0x311C],
+  ["A8DD",0x311D],
+  ["A8DE",0x311E],
+  ["A8DF",0x311F],
+  ["A8E0",0x3120],
+  ["A8E1",0x3121],
+  ["A8E2",0x3122],
+  ["A8E3",0x3123],
+  ["A8E4",0x3124],
+  ["A8E5",0x3125],
+  ["A8E6",0x3126],
+  ["A8E7",0x3127],
+  ["A8E8",0x3128],
+  ["A8E9",0x3129],
+  ["8139A836",0x312A],
+  ["8139A837",0x312B],
+  ["8139A838",0x312C],
+  ["8139A839",0x312D],
+  ["8139A930",0x312E],
+  ["8139A931",0x312F],
+  ["8139A932",0x3130],
+  ["8139A933",0x3131],
+  ["8139A934",0x3132],
+  ["8139A935",0x3133],
+  ["8139A936",0x3134],
+  ["8139A937",0x3135],
+  ["8139A938",0x3136],
+  ["8139A939",0x3137],
+  ["8139AA30",0x3138],
+  ["8139AA31",0x3139],
+  ["8139AA32",0x313A],
+  ["8139AA33",0x313B],
+  ["8139AA34",0x313C],
+  ["8139AA35",0x313D],
+  ["8139AA36",0x313E],
+  ["8139AA37",0x313F],
+  ["8139AA38",0x3140],
+  ["8139AA39",0x3141],
+  ["8139AB30",0x3142],
+  ["8139AB31",0x3143],
+  ["8139AB32",0x3144],
+  ["8139AB33",0x3145],
+  ["8139AB34",0x3146],
+  ["8139AB35",0x3147],
+  ["8139AB36",0x3148],
+  ["8139AB37",0x3149],
+  ["8139AB38",0x314A],
+  ["8139AB39",0x314B],
+  ["8139AC30",0x314C],
+  ["8139AC31",0x314D],
+  ["8139AC32",0x314E],
+  ["8139AC33",0x314F],
+  ["8139AC34",0x3150],
+  ["8139AC35",0x3151],
+  ["8139AC36",0x3152],
+  ["8139AC37",0x3153],
+  ["8139AC38",0x3154],
+  ["8139AC39",0x3155],
+  ["8139AD30",0x3156],
+  ["8139AD31",0x3157],
+  ["8139AD32",0x3158],
+  ["8139AD33",0x3159],
+  ["8139AD34",0x315A],
+  ["8139AD35",0x315B],
+  ["8139AD36",0x315C],
+  ["8139AD37",0x315D],
+  ["8139AD38",0x315E],
+  ["8139AD39",0x315F],
+  ["8139AE30",0x3160],
+  ["8139AE31",0x3161],
+  ["8139AE32",0x3162],
+  ["8139AE33",0x3163],
+  ["8139AE34",0x3164],
+  ["8139AE35",0x3165],
+  ["8139AE36",0x3166],
+  ["8139AE37",0x3167],
+  ["8139AE38",0x3168],
+  ["8139AE39",0x3169],
+  ["8139AF30",0x316A],
+  ["8139AF31",0x316B],
+  ["8139AF32",0x316C],
+  ["8139AF33",0x316D],
+  ["8139AF34",0x316E],
+  ["8139AF35",0x316F],
+  ["8139AF36",0x3170],
+  ["8139AF37",0x3171],
+  ["8139AF38",0x3172],
+  ["8139AF39",0x3173],
+  ["8139B030",0x3174],
+  ["8139B031",0x3175],
+  ["8139B032",0x3176],
+  ["8139B033",0x3177],
+  ["8139B034",0x3178],
+  ["8139B035",0x3179],
+  ["8139B036",0x317A],
+  ["8139B037",0x317B],
+  ["8139B038",0x317C],
+  ["8139B039",0x317D],
+  ["8139B130",0x317E],
+  ["8139B131",0x317F],
+  ["8139B132",0x3180],
+  ["8139B133",0x3181],
+  ["8139B134",0x3182],
+  ["8139B135",0x3183],
+  ["8139B136",0x3184],
+  ["8139B137",0x3185],
+  ["8139B138",0x3186],
+  ["8139B139",0x3187],
+  ["8139B230",0x3188],
+  ["8139B231",0x3189],
+  ["8139B232",0x318A],
+  ["8139B233",0x318B],
+  ["8139B234",0x318C],
+  ["8139B235",0x318D],
+  ["8139B236",0x318E],
+  ["8139B237",0x318F],
+  ["8139B238",0x3190],
+  ["8139B239",0x3191],
+  ["8139B330",0x3192],
+  ["8139B331",0x3193],
+  ["8139B332",0x3194],
+  ["8139B333",0x3195],
+  ["8139B334",0x3196],
+  ["8139B335",0x3197],
+  ["8139B336",0x3198],
+  ["8139B337",0x3199],
+  ["8139B338",0x319A],
+  ["8139B339",0x319B],
+  ["8139B430",0x319C],
+  ["8139B431",0x319D],
+  ["8139B432",0x319E],
+  ["8139B433",0x319F],
+  ["8139B434",0x31A0],
+  ["8139B435",0x31A1],
+  ["8139B436",0x31A2],
+  ["8139B437",0x31A3],
+  ["8139B438",0x31A4],
+  ["8139B439",0x31A5],
+  ["8139B530",0x31A6],
+  ["8139B531",0x31A7],
+  ["8139B532",0x31A8],
+  ["8139B533",0x31A9],
+  ["8139B534",0x31AA],
+  ["8139B535",0x31AB],
+  ["8139B536",0x31AC],
+  ["8139B537",0x31AD],
+  ["8139B538",0x31AE],
+  ["8139B539",0x31AF],
+  ["8139B630",0x31B0],
+  ["8139B631",0x31B1],
+  ["8139B632",0x31B2],
+  ["8139B633",0x31B3],
+  ["8139B634",0x31B4],
+  ["8139B635",0x31B5],
+  ["8139B636",0x31B6],
+  ["8139B637",0x31B7],
+  ["8139B638",0x31B8],
+  ["8139B639",0x31B9],
+  ["8139B730",0x31BA],
+  ["8139B731",0x31BB],
+  ["8139B732",0x31BC],
+  ["8139B733",0x31BD],
+  ["8139B734",0x31BE],
+  ["8139B735",0x31BF],
+  ["8139B736",0x31C0],
+  ["8139B737",0x31C1],
+  ["8139B738",0x31C2],
+  ["8139B739",0x31C3],
+  ["8139B830",0x31C4],
+  ["8139B831",0x31C5],
+  ["8139B832",0x31C6],
+  ["8139B833",0x31C7],
+  ["8139B834",0x31C8],
+  ["8139B835",0x31C9],
+  ["8139B836",0x31CA],
+  ["8139B837",0x31CB],
+  ["8139B838",0x31CC],
+  ["8139B839",0x31CD],
+  ["8139B930",0x31CE],
+  ["8139B931",0x31CF],
+  ["8139B932",0x31D0],
+  ["8139B933",0x31D1],
+  ["8139B934",0x31D2],
+  ["8139B935",0x31D3],
+  ["8139B936",0x31D4],
+  ["8139B937",0x31D5],
+  ["8139B938",0x31D6],
+  ["8139B939",0x31D7],
+  ["8139BA30",0x31D8],
+  ["8139BA31",0x31D9],
+  ["8139BA32",0x31DA],
+  ["8139BA33",0x31DB],
+  ["8139BA34",0x31DC],
+  ["8139BA35",0x31DD],
+  ["8139BA36",0x31DE],
+  ["8139BA37",0x31DF],
+  ["8139BA38",0x31E0],
+  ["8139BA39",0x31E1],
+  ["8139BB30",0x31E2],
+  ["8139BB31",0x31E3],
+  ["8139BB32",0x31E4],
+  ["8139BB33",0x31E5],
+  ["8139BB34",0x31E6],
+  ["8139BB35",0x31E7],
+  ["8139BB36",0x31E8],
+  ["8139BB37",0x31E9],
+  ["8139BB38",0x31EA],
+  ["8139BB39",0x31EB],
+  ["8139BC30",0x31EC],
+  ["8139BC31",0x31ED],
+  ["8139BC32",0x31EE],
+  ["8139BC33",0x31EF],
+  ["8139BC34",0x31F0],
+  ["8139BC35",0x31F1],
+  ["8139BC36",0x31F2],
+  ["8139BC37",0x31F3],
+  ["8139BC38",0x31F4],
+  ["8139BC39",0x31F5],
+  ["8139BD30",0x31F6],
+  ["8139BD31",0x31F7],
+  ["8139BD32",0x31F8],
+  ["8139BD33",0x31F9],
+  ["8139BD34",0x31FA],
+  ["8139BD35",0x31FB],
+  ["8139BD36",0x31FC],
+  ["8139BD37",0x31FD],
+  ["8139BD38",0x31FE],
+  ["8139BD39",0x31FF],
+  ["8139BE30",0x3200],
+  ["8139BE31",0x3201],
+  ["8139BE32",0x3202],
+  ["8139BE33",0x3203],
+  ["8139BE34",0x3204],
+  ["8139BE35",0x3205],
+  ["8139BE36",0x3206],
+  ["8139BE37",0x3207],
+  ["8139BE38",0x3208],
+  ["8139BE39",0x3209],
+  ["8139BF30",0x320A],
+  ["8139BF31",0x320B],
+  ["8139BF32",0x320C],
+  ["8139BF33",0x320D],
+  ["8139BF34",0x320E],
+  ["8139BF35",0x320F],
+  ["8139BF36",0x3210],
+  ["8139BF37",0x3211],
+  ["8139BF38",0x3212],
+  ["8139BF39",0x3213],
+  ["8139C030",0x3214],
+  ["8139C031",0x3215],
+  ["8139C032",0x3216],
+  ["8139C033",0x3217],
+  ["8139C034",0x3218],
+  ["8139C035",0x3219],
+  ["8139C036",0x321A],
+  ["8139C037",0x321B],
+  ["8139C038",0x321C],
+  ["8139C039",0x321D],
+  ["8139C130",0x321E],
+  ["8139C131",0x321F],
+  ["A2E5",0x3220],
+  ["A2E6",0x3221],
+  ["A2E7",0x3222],
+  ["A2E8",0x3223],
+  ["A2E9",0x3224],
+  ["A2EA",0x3225],
+  ["A2EB",0x3226],
+  ["A2EC",0x3227],
+  ["A2ED",0x3228],
+  ["A2EE",0x3229],
+  ["8139C132",0x322A],
+  ["8139C133",0x322B],
+  ["8139C134",0x322C],
+  ["8139C135",0x322D],
+  ["8139C136",0x322E],
+  ["8139C137",0x322F],
+  ["8139C138",0x3230],
+  ["A95A",0x3231],
+  ["8139C139",0x3232],
+  ["8139C230",0x3233],
+  ["8139C231",0x3234],
+  ["8139C232",0x3235],
+  ["8139C233",0x3236],
+  ["8139C234",0x3237],
+  ["8139C235",0x3238],
+  ["8139C236",0x3239],
+  ["8139C237",0x323A],
+  ["8139C238",0x323B],
+  ["8139C239",0x323C],
+  ["8139C330",0x323D],
+  ["8139C331",0x323E],
+  ["8139C332",0x323F],
+  ["8139C333",0x3240],
+  ["8139C334",0x3241],
+  ["8139C335",0x3242],
+  ["8139C336",0x3243],
+  ["8139C337",0x3244],
+  ["8139C338",0x3245],
+  ["8139C339",0x3246],
+  ["8139C430",0x3247],
+  ["8139C431",0x3248],
+  ["8139C432",0x3249],
+  ["8139C433",0x324A],
+  ["8139C434",0x324B],
+  ["8139C435",0x324C],
+  ["8139C436",0x324D],
+  ["8139C437",0x324E],
+  ["8139C438",0x324F],
+  ["8139C439",0x3250],
+  ["8139C530",0x3251],
+  ["8139C531",0x3252],
+  ["8139C532",0x3253],
+  ["8139C533",0x3254],
+  ["8139C534",0x3255],
+  ["8139C535",0x3256],
+  ["8139C536",0x3257],
+  ["8139C537",0x3258],
+  ["8139C538",0x3259],
+  ["8139C539",0x325A],
+  ["8139C630",0x325B],
+  ["8139C631",0x325C],
+  ["8139C632",0x325D],
+  ["8139C633",0x325E],
+  ["8139C634",0x325F],
+  ["8139C635",0x3260],
+  ["8139C636",0x3261],
+  ["8139C637",0x3262],
+  ["8139C638",0x3263],
+  ["8139C639",0x3264],
+  ["8139C730",0x3265],
+  ["8139C731",0x3266],
+  ["8139C732",0x3267],
+  ["8139C733",0x3268],
+  ["8139C734",0x3269],
+  ["8139C735",0x326A],
+  ["8139C736",0x326B],
+  ["8139C737",0x326C],
+  ["8139C738",0x326D],
+  ["8139C739",0x326E],
+  ["8139C830",0x326F],
+  ["8139C831",0x3270],
+  ["8139C832",0x3271],
+  ["8139C833",0x3272],
+  ["8139C834",0x3273],
+  ["8139C835",0x3274],
+  ["8139C836",0x3275],
+  ["8139C837",0x3276],
+  ["8139C838",0x3277],
+  ["8139C839",0x3278],
+  ["8139C930",0x3279],
+  ["8139C931",0x327A],
+  ["8139C932",0x327B],
+  ["8139C933",0x327C],
+  ["8139C934",0x327D],
+  ["8139C935",0x327E],
+  ["8139C936",0x327F],
+  ["8139C937",0x3280],
+  ["8139C938",0x3281],
+  ["8139C939",0x3282],
+  ["8139CA30",0x3283],
+  ["8139CA31",0x3284],
+  ["8139CA32",0x3285],
+  ["8139CA33",0x3286],
+  ["8139CA34",0x3287],
+  ["8139CA35",0x3288],
+  ["8139CA36",0x3289],
+  ["8139CA37",0x328A],
+  ["8139CA38",0x328B],
+  ["8139CA39",0x328C],
+  ["8139CB30",0x328D],
+  ["8139CB31",0x328E],
+  ["8139CB32",0x328F],
+  ["8139CB33",0x3290],
+  ["8139CB34",0x3291],
+  ["8139CB35",0x3292],
+  ["8139CB36",0x3293],
+  ["8139CB37",0x3294],
+  ["8139CB38",0x3295],
+  ["8139CB39",0x3296],
+  ["8139CC30",0x3297],
+  ["8139CC31",0x3298],
+  ["8139CC32",0x3299],
+  ["8139CC33",0x329A],
+  ["8139CC34",0x329B],
+  ["8139CC35",0x329C],
+  ["8139CC36",0x329D],
+  ["8139CC37",0x329E],
+  ["8139CC38",0x329F],
+  ["8139CC39",0x32A0],
+  ["8139CD30",0x32A1],
+  ["8139CD31",0x32A2],
+  ["A949",0x32A3],
+  ["8139CD32",0x32A4],
+  ["8139CD33",0x32A5],
+  ["8139CD34",0x32A6],
+  ["8139CD35",0x32A7],
+  ["8139CD36",0x32A8],
+  ["8139CD37",0x32A9],
+  ["8139CD38",0x32AA],
+  ["8139CD39",0x32AB],
+  ["8139CE30",0x32AC],
+  ["8139CE31",0x32AD],
+  ["8139CE32",0x32AE],
+  ["8139CE33",0x32AF],
+  ["8139CE34",0x32B0],
+  ["8139CE35",0x32B1],
+  ["8139CE36",0x32B2],
+  ["8139CE37",0x32B3],
+  ["8139CE38",0x32B4],
+  ["8139CE39",0x32B5],
+  ["8139CF30",0x32B6],
+  ["8139CF31",0x32B7],
+  ["8139CF32",0x32B8],
+  ["8139CF33",0x32B9],
+  ["8139CF34",0x32BA],
+  ["8139CF35",0x32BB],
+  ["8139CF36",0x32BC],
+  ["8139CF37",0x32BD],
+  ["8139CF38",0x32BE],
+  ["8139CF39",0x32BF],
+  ["8139D030",0x32C0],
+  ["8139D031",0x32C1],
+  ["8139D032",0x32C2],
+  ["8139D033",0x32C3],
+  ["8139D034",0x32C4],
+  ["8139D035",0x32C5],
+  ["8139D036",0x32C6],
+  ["8139D037",0x32C7],
+  ["8139D038",0x32C8],
+  ["8139D039",0x32C9],
+  ["8139D130",0x32CA],
+  ["8139D131",0x32CB],
+  ["8139D132",0x32CC],
+  ["8139D133",0x32CD],
+  ["8139D134",0x32CE],
+  ["8139D135",0x32CF],
+  ["8139D136",0x32D0],
+  ["8139D137",0x32D1],
+  ["8139D138",0x32D2],
+  ["8139D139",0x32D3],
+  ["8139D230",0x32D4],
+  ["8139D231",0x32D5],
+  ["8139D232",0x32D6],
+  ["8139D233",0x32D7],
+  ["8139D234",0x32D8],
+  ["8139D235",0x32D9],
+  ["8139D236",0x32DA],
+  ["8139D237",0x32DB],
+  ["8139D238",0x32DC],
+  ["8139D239",0x32DD],
+  ["8139D330",0x32DE],
+  ["8139D331",0x32DF],
+  ["8139D332",0x32E0],
+  ["8139D333",0x32E1],
+  ["8139D334",0x32E2],
+  ["8139D335",0x32E3],
+  ["8139D336",0x32E4],
+  ["8139D337",0x32E5],
+  ["8139D338",0x32E6],
+  ["8139D339",0x32E7],
+  ["8139D430",0x32E8],
+  ["8139D431",0x32E9],
+  ["8139D432",0x32EA],
+  ["8139D433",0x32EB],
+  ["8139D434",0x32EC],
+  ["8139D435",0x32ED],
+  ["8139D436",0x32EE],
+  ["8139D437",0x32EF],
+  ["8139D438",0x32F0],
+  ["8139D439",0x32F1],
+  ["8139D530",0x32F2],
+  ["8139D531",0x32F3],
+  ["8139D532",0x32F4],
+  ["8139D533",0x32F5],
+  ["8139D534",0x32F6],
+  ["8139D535",0x32F7],
+  ["8139D536",0x32F8],
+  ["8139D537",0x32F9],
+  ["8139D538",0x32FA],
+  ["8139D539",0x32FB],
+  ["8139D630",0x32FC],
+  ["8139D631",0x32FD],
+  ["8139D632",0x32FE],
+  ["8139D633",0x32FF],
+  ["8139D634",0x3300],
+  ["8139D635",0x3301],
+  ["8139D636",0x3302],
+  ["8139D637",0x3303],
+  ["8139D638",0x3304],
+  ["8139D639",0x3305],
+  ["8139D730",0x3306],
+  ["8139D731",0x3307],
+  ["8139D732",0x3308],
+  ["8139D733",0x3309],
+  ["8139D734",0x330A],
+  ["8139D735",0x330B],
+  ["8139D736",0x330C],
+  ["8139D737",0x330D],
+  ["8139D738",0x330E],
+  ["8139D739",0x330F],
+  ["8139D830",0x3310],
+  ["8139D831",0x3311],
+  ["8139D832",0x3312],
+  ["8139D833",0x3313],
+  ["8139D834",0x3314],
+  ["8139D835",0x3315],
+  ["8139D836",0x3316],
+  ["8139D837",0x3317],
+  ["8139D838",0x3318],
+  ["8139D839",0x3319],
+  ["8139D930",0x331A],
+  ["8139D931",0x331B],
+  ["8139D932",0x331C],
+  ["8139D933",0x331D],
+  ["8139D934",0x331E],
+  ["8139D935",0x331F],
+  ["8139D936",0x3320],
+  ["8139D937",0x3321],
+  ["8139D938",0x3322],
+  ["8139D939",0x3323],
+  ["8139DA30",0x3324],
+  ["8139DA31",0x3325],
+  ["8139DA32",0x3326],
+  ["8139DA33",0x3327],
+  ["8139DA34",0x3328],
+  ["8139DA35",0x3329],
+  ["8139DA36",0x332A],
+  ["8139DA37",0x332B],
+  ["8139DA38",0x332C],
+  ["8139DA39",0x332D],
+  ["8139DB30",0x332E],
+  ["8139DB31",0x332F],
+  ["8139DB32",0x3330],
+  ["8139DB33",0x3331],
+  ["8139DB34",0x3332],
+  ["8139DB35",0x3333],
+  ["8139DB36",0x3334],
+  ["8139DB37",0x3335],
+  ["8139DB38",0x3336],
+  ["8139DB39",0x3337],
+  ["8139DC30",0x3338],
+  ["8139DC31",0x3339],
+  ["8139DC32",0x333A],
+  ["8139DC33",0x333B],
+  ["8139DC34",0x333C],
+  ["8139DC35",0x333D],
+  ["8139DC36",0x333E],
+  ["8139DC37",0x333F],
+  ["8139DC38",0x3340],
+  ["8139DC39",0x3341],
+  ["8139DD30",0x3342],
+  ["8139DD31",0x3343],
+  ["8139DD32",0x3344],
+  ["8139DD33",0x3345],
+  ["8139DD34",0x3346],
+  ["8139DD35",0x3347],
+  ["8139DD36",0x3348],
+  ["8139DD37",0x3349],
+  ["8139DD38",0x334A],
+  ["8139DD39",0x334B],
+  ["8139DE30",0x334C],
+  ["8139DE31",0x334D],
+  ["8139DE32",0x334E],
+  ["8139DE33",0x334F],
+  ["8139DE34",0x3350],
+  ["8139DE35",0x3351],
+  ["8139DE36",0x3352],
+  ["8139DE37",0x3353],
+  ["8139DE38",0x3354],
+  ["8139DE39",0x3355],
+  ["8139DF30",0x3356],
+  ["8139DF31",0x3357],
+  ["8139DF32",0x3358],
+  ["8139DF33",0x3359],
+  ["8139DF34",0x335A],
+  ["8139DF35",0x335B],
+  ["8139DF36",0x335C],
+  ["8139DF37",0x335D],
+  ["8139DF38",0x335E],
+  ["8139DF39",0x335F],
+  ["8139E030",0x3360],
+  ["8139E031",0x3361],
+  ["8139E032",0x3362],
+  ["8139E033",0x3363],
+  ["8139E034",0x3364],
+  ["8139E035",0x3365],
+  ["8139E036",0x3366],
+  ["8139E037",0x3367],
+  ["8139E038",0x3368],
+  ["8139E039",0x3369],
+  ["8139E130",0x336A],
+  ["8139E131",0x336B],
+  ["8139E132",0x336C],
+  ["8139E133",0x336D],
+  ["8139E134",0x336E],
+  ["8139E135",0x336F],
+  ["8139E136",0x3370],
+  ["8139E137",0x3371],
+  ["8139E138",0x3372],
+  ["8139E139",0x3373],
+  ["8139E230",0x3374],
+  ["8139E231",0x3375],
+  ["8139E232",0x3376],
+  ["8139E233",0x3377],
+  ["8139E234",0x3378],
+  ["8139E235",0x3379],
+  ["8139E236",0x337A],
+  ["8139E237",0x337B],
+  ["8139E238",0x337C],
+  ["8139E239",0x337D],
+  ["8139E330",0x337E],
+  ["8139E331",0x337F],
+  ["8139E332",0x3380],
+  ["8139E333",0x3381],
+  ["8139E334",0x3382],
+  ["8139E335",0x3383],
+  ["8139E336",0x3384],
+  ["8139E337",0x3385],
+  ["8139E338",0x3386],
+  ["8139E339",0x3387],
+  ["8139E430",0x3388],
+  ["8139E431",0x3389],
+  ["8139E432",0x338A],
+  ["8139E433",0x338B],
+  ["8139E434",0x338C],
+  ["8139E435",0x338D],
+  ["A94A",0x338E],
+  ["A94B",0x338F],
+  ["8139E436",0x3390],
+  ["8139E437",0x3391],
+  ["8139E438",0x3392],
+  ["8139E439",0x3393],
+  ["8139E530",0x3394],
+  ["8139E531",0x3395],
+  ["8139E532",0x3396],
+  ["8139E533",0x3397],
+  ["8139E534",0x3398],
+  ["8139E535",0x3399],
+  ["8139E536",0x339A],
+  ["8139E537",0x339B],
+  ["A94C",0x339C],
+  ["A94D",0x339D],
+  ["A94E",0x339E],
+  ["8139E538",0x339F],
+  ["8139E539",0x33A0],
+  ["A94F",0x33A1],
+  ["8139E630",0x33A2],
+  ["8139E631",0x33A3],
+  ["8139E632",0x33A4],
+  ["8139E633",0x33A5],
+  ["8139E634",0x33A6],
+  ["8139E635",0x33A7],
+  ["8139E636",0x33A8],
+  ["8139E637",0x33A9],
+  ["8139E638",0x33AA],
+  ["8139E639",0x33AB],
+  ["8139E730",0x33AC],
+  ["8139E731",0x33AD],
+  ["8139E732",0x33AE],
+  ["8139E733",0x33AF],
+  ["8139E734",0x33B0],
+  ["8139E735",0x33B1],
+  ["8139E736",0x33B2],
+  ["8139E737",0x33B3],
+  ["8139E738",0x33B4],
+  ["8139E739",0x33B5],
+  ["8139E830",0x33B6],
+  ["8139E831",0x33B7],
+  ["8139E832",0x33B8],
+  ["8139E833",0x33B9],
+  ["8139E834",0x33BA],
+  ["8139E835",0x33BB],
+  ["8139E836",0x33BC],
+  ["8139E837",0x33BD],
+  ["8139E838",0x33BE],
+  ["8139E839",0x33BF],
+  ["8139E930",0x33C0],
+  ["8139E931",0x33C1],
+  ["8139E932",0x33C2],
+  ["8139E933",0x33C3],
+  ["A950",0x33C4],
+  ["8139E934",0x33C5],
+  ["8139E935",0x33C6],
+  ["8139E936",0x33C7],
+  ["8139E937",0x33C8],
+  ["8139E938",0x33C9],
+  ["8139E939",0x33CA],
+  ["8139EA30",0x33CB],
+  ["8139EA31",0x33CC],
+  ["8139EA32",0x33CD],
+  ["A951",0x33CE],
+  ["8139EA33",0x33CF],
+  ["8139EA34",0x33D0],
+  ["A952",0x33D1],
+  ["A953",0x33D2],
+  ["8139EA35",0x33D3],
+  ["8139EA36",0x33D4],
+  ["A954",0x33D5],
+  ["8139EA37",0x33D6],
+  ["8139EA38",0x33D7],
+  ["8139EA39",0x33D8],
+  ["8139EB30",0x33D9],
+  ["8139EB31",0x33DA],
+  ["8139EB32",0x33DB],
+  ["8139EB33",0x33DC],
+  ["8139EB34",0x33DD],
+  ["8139EB35",0x33DE],
+  ["8139EB36",0x33DF],
+  ["8139EB37",0x33E0],
+  ["8139EB38",0x33E1],
+  ["8139EB39",0x33E2],
+  ["8139EC30",0x33E3],
+  ["8139EC31",0x33E4],
+  ["8139EC32",0x33E5],
+  ["8139EC33",0x33E6],
+  ["8139EC34",0x33E7],
+  ["8139EC35",0x33E8],
+  ["8139EC36",0x33E9],
+  ["8139EC37",0x33EA],
+  ["8139EC38",0x33EB],
+  ["8139EC39",0x33EC],
+  ["8139ED30",0x33ED],
+  ["8139ED31",0x33EE],
+  ["8139ED32",0x33EF],
+  ["8139ED33",0x33F0],
+  ["8139ED34",0x33F1],
+  ["8139ED35",0x33F2],
+  ["8139ED36",0x33F3],
+  ["8139ED37",0x33F4],
+  ["8139ED38",0x33F5],
+  ["8139ED39",0x33F6],
+  ["8139EE30",0x33F7],
+  ["8139EE31",0x33F8],
+  ["8139EE32",0x33F9],
+  ["8139EE33",0x33FA],
+  ["8139EE34",0x33FB],
+  ["8139EE35",0x33FC],
+  ["8139EE36",0x33FD],
+  ["8139EE37",0x33FE],
+  ["8139EE38",0x33FF],
+  ["8139EE39",0x3400],
+  ["8139EF30",0x3401],
+  ["8139EF31",0x3402],
+  ["8139EF32",0x3403],
+  ["8139EF33",0x3404],
+  ["8139EF34",0x3405],
+  ["8139EF35",0x3406],
+  ["8139EF36",0x3407],
+  ["8139EF37",0x3408],
+  ["8139EF38",0x3409],
+  ["8139EF39",0x340A],
+  ["8139F030",0x340B],
+  ["8139F031",0x340C],
+  ["8139F032",0x340D],
+  ["8139F033",0x340E],
+  ["8139F034",0x340F],
+  ["8139F035",0x3410],
+  ["8139F036",0x3411],
+  ["8139F037",0x3412],
+  ["8139F038",0x3413],
+  ["8139F039",0x3414],
+  ["8139F130",0x3415],
+  ["8139F131",0x3416],
+  ["8139F132",0x3417],
+  ["8139F133",0x3418],
+  ["8139F134",0x3419],
+  ["8139F135",0x341A],
+  ["8139F136",0x341B],
+  ["8139F137",0x341C],
+  ["8139F138",0x341D],
+  ["8139F139",0x341E],
+  ["8139F230",0x341F],
+  ["8139F231",0x3420],
+  ["8139F232",0x3421],
+  ["8139F233",0x3422],
+  ["8139F234",0x3423],
+  ["8139F235",0x3424],
+  ["8139F236",0x3425],
+  ["8139F237",0x3426],
+  ["8139F238",0x3427],
+  ["8139F239",0x3428],
+  ["8139F330",0x3429],
+  ["8139F331",0x342A],
+  ["8139F332",0x342B],
+  ["8139F333",0x342C],
+  ["8139F334",0x342D],
+  ["8139F335",0x342E],
+  ["8139F336",0x342F],
+  ["8139F337",0x3430],
+  ["8139F338",0x3431],
+  ["8139F339",0x3432],
+  ["8139F430",0x3433],
+  ["8139F431",0x3434],
+  ["8139F432",0x3435],
+  ["8139F433",0x3436],
+  ["8139F434",0x3437],
+  ["8139F435",0x3438],
+  ["8139F436",0x3439],
+  ["8139F437",0x343A],
+  ["8139F438",0x343B],
+  ["8139F439",0x343C],
+  ["8139F530",0x343D],
+  ["8139F531",0x343E],
+  ["8139F532",0x343F],
+  ["8139F533",0x3440],
+  ["8139F534",0x3441],
+  ["8139F535",0x3442],
+  ["8139F536",0x3443],
+  ["8139F537",0x3444],
+  ["8139F538",0x3445],
+  ["8139F539",0x3446],
+  ["FE56",0x3447],
+  ["8139F630",0x3448],
+  ["8139F631",0x3449],
+  ["8139F632",0x344A],
+  ["8139F633",0x344B],
+  ["8139F634",0x344C],
+  ["8139F635",0x344D],
+  ["8139F636",0x344E],
+  ["8139F637",0x344F],
+  ["8139F638",0x3450],
+  ["8139F639",0x3451],
+  ["8139F730",0x3452],
+  ["8139F731",0x3453],
+  ["8139F732",0x3454],
+  ["8139F733",0x3455],
+  ["8139F734",0x3456],
+  ["8139F735",0x3457],
+  ["8139F736",0x3458],
+  ["8139F737",0x3459],
+  ["8139F738",0x345A],
+  ["8139F739",0x345B],
+  ["8139F830",0x345C],
+  ["8139F831",0x345D],
+  ["8139F832",0x345E],
+  ["8139F833",0x345F],
+  ["8139F834",0x3460],
+  ["8139F835",0x3461],
+  ["8139F836",0x3462],
+  ["8139F837",0x3463],
+  ["8139F838",0x3464],
+  ["8139F839",0x3465],
+  ["8139F930",0x3466],
+  ["8139F931",0x3467],
+  ["8139F932",0x3468],
+  ["8139F933",0x3469],
+  ["8139F934",0x346A],
+  ["8139F935",0x346B],
+  ["8139F936",0x346C],
+  ["8139F937",0x346D],
+  ["8139F938",0x346E],
+  ["8139F939",0x346F],
+  ["8139FA30",0x3470],
+  ["8139FA31",0x3471],
+  ["8139FA32",0x3472],
+  ["FE55",0x3473],
+  ["8139FA33",0x3474],
+  ["8139FA34",0x3475],
+  ["8139FA35",0x3476],
+  ["8139FA36",0x3477],
+  ["8139FA37",0x3478],
+  ["8139FA38",0x3479],
+  ["8139FA39",0x347A],
+  ["8139FB30",0x347B],
+  ["8139FB31",0x347C],
+  ["8139FB32",0x347D],
+  ["8139FB33",0x347E],
+  ["8139FB34",0x347F],
+  ["8139FB35",0x3480],
+  ["8139FB36",0x3481],
+  ["8139FB37",0x3482],
+  ["8139FB38",0x3483],
+  ["8139FB39",0x3484],
+  ["8139FC30",0x3485],
+  ["8139FC31",0x3486],
+  ["8139FC32",0x3487],
+  ["8139FC33",0x3488],
+  ["8139FC34",0x3489],
+  ["8139FC35",0x348A],
+  ["8139FC36",0x348B],
+  ["8139FC37",0x348C],
+  ["8139FC38",0x348D],
+  ["8139FC39",0x348E],
+  ["8139FD30",0x348F],
+  ["8139FD31",0x3490],
+  ["8139FD32",0x3491],
+  ["8139FD33",0x3492],
+  ["8139FD34",0x3493],
+  ["8139FD35",0x3494],
+  ["8139FD36",0x3495],
+  ["8139FD37",0x3496],
+  ["8139FD38",0x3497],
+  ["8139FD39",0x3498],
+  ["8139FE30",0x3499],
+  ["8139FE31",0x349A],
+  ["8139FE32",0x349B],
+  ["8139FE33",0x349C],
+  ["8139FE34",0x349D],
+  ["8139FE35",0x349E],
+  ["8139FE36",0x349F],
+  ["8139FE37",0x34A0],
+  ["8139FE38",0x34A1],
+  ["8139FE39",0x34A2],
+  ["82308130",0x34A3],
+  ["82308131",0x34A4],
+  ["82308132",0x34A5],
+  ["82308133",0x34A6],
+  ["82308134",0x34A7],
+  ["82308135",0x34A8],
+  ["82308136",0x34A9],
+  ["82308137",0x34AA],
+  ["82308138",0x34AB],
+  ["82308139",0x34AC],
+  ["82308230",0x34AD],
+  ["82308231",0x34AE],
+  ["82308232",0x34AF],
+  ["82308233",0x34B0],
+  ["82308234",0x34B1],
+  ["82308235",0x34B2],
+  ["82308236",0x34B3],
+  ["82308237",0x34B4],
+  ["82308238",0x34B5],
+  ["82308239",0x34B6],
+  ["82308330",0x34B7],
+  ["82308331",0x34B8],
+  ["82308332",0x34B9],
+  ["82308333",0x34BA],
+  ["82308334",0x34BB],
+  ["82308335",0x34BC],
+  ["82308336",0x34BD],
+  ["82308337",0x34BE],
+  ["82308338",0x34BF],
+  ["82308339",0x34C0],
+  ["82308430",0x34C1],
+  ["82308431",0x34C2],
+  ["82308432",0x34C3],
+  ["82308433",0x34C4],
+  ["82308434",0x34C5],
+  ["82308435",0x34C6],
+  ["82308436",0x34C7],
+  ["82308437",0x34C8],
+  ["82308438",0x34C9],
+  ["82308439",0x34CA],
+  ["82308530",0x34CB],
+  ["82308531",0x34CC],
+  ["82308532",0x34CD],
+  ["82308533",0x34CE],
+  ["82308534",0x34CF],
+  ["82308535",0x34D0],
+  ["82308536",0x34D1],
+  ["82308537",0x34D2],
+  ["82308538",0x34D3],
+  ["82308539",0x34D4],
+  ["82308630",0x34D5],
+  ["82308631",0x34D6],
+  ["82308632",0x34D7],
+  ["82308633",0x34D8],
+  ["82308634",0x34D9],
+  ["82308635",0x34DA],
+  ["82308636",0x34DB],
+  ["82308637",0x34DC],
+  ["82308638",0x34DD],
+  ["82308639",0x34DE],
+  ["82308730",0x34DF],
+  ["82308731",0x34E0],
+  ["82308732",0x34E1],
+  ["82308733",0x34E2],
+  ["82308734",0x34E3],
+  ["82308735",0x34E4],
+  ["82308736",0x34E5],
+  ["82308737",0x34E6],
+  ["82308738",0x34E7],
+  ["82308739",0x34E8],
+  ["82308830",0x34E9],
+  ["82308831",0x34EA],
+  ["82308832",0x34EB],
+  ["82308833",0x34EC],
+  ["82308834",0x34ED],
+  ["82308835",0x34EE],
+  ["82308836",0x34EF],
+  ["82308837",0x34F0],
+  ["82308838",0x34F1],
+  ["82308839",0x34F2],
+  ["82308930",0x34F3],
+  ["82308931",0x34F4],
+  ["82308932",0x34F5],
+  ["82308933",0x34F6],
+  ["82308934",0x34F7],
+  ["82308935",0x34F8],
+  ["82308936",0x34F9],
+  ["82308937",0x34FA],
+  ["82308938",0x34FB],
+  ["82308939",0x34FC],
+  ["82308A30",0x34FD],
+  ["82308A31",0x34FE],
+  ["82308A32",0x34FF],
+  ["82308A33",0x3500],
+  ["82308A34",0x3501],
+  ["82308A35",0x3502],
+  ["82308A36",0x3503],
+  ["82308A37",0x3504],
+  ["82308A38",0x3505],
+  ["82308A39",0x3506],
+  ["82308B30",0x3507],
+  ["82308B31",0x3508],
+  ["82308B32",0x3509],
+  ["82308B33",0x350A],
+  ["82308B34",0x350B],
+  ["82308B35",0x350C],
+  ["82308B36",0x350D],
+  ["82308B37",0x350E],
+  ["82308B38",0x350F],
+  ["82308B39",0x3510],
+  ["82308C30",0x3511],
+  ["82308C31",0x3512],
+  ["82308C32",0x3513],
+  ["82308C33",0x3514],
+  ["82308C34",0x3515],
+  ["82308C35",0x3516],
+  ["82308C36",0x3517],
+  ["82308C37",0x3518],
+  ["82308C38",0x3519],
+  ["82308C39",0x351A],
+  ["82308D30",0x351B],
+  ["82308D31",0x351C],
+  ["82308D32",0x351D],
+  ["82308D33",0x351E],
+  ["82308D34",0x351F],
+  ["82308D35",0x3520],
+  ["82308D36",0x3521],
+  ["82308D37",0x3522],
+  ["82308D38",0x3523],
+  ["82308D39",0x3524],
+  ["82308E30",0x3525],
+  ["82308E31",0x3526],
+  ["82308E32",0x3527],
+  ["82308E33",0x3528],
+  ["82308E34",0x3529],
+  ["82308E35",0x352A],
+  ["82308E36",0x352B],
+  ["82308E37",0x352C],
+  ["82308E38",0x352D],
+  ["82308E39",0x352E],
+  ["82308F30",0x352F],
+  ["82308F31",0x3530],
+  ["82308F32",0x3531],
+  ["82308F33",0x3532],
+  ["82308F34",0x3533],
+  ["82308F35",0x3534],
+  ["82308F36",0x3535],
+  ["82308F37",0x3536],
+  ["82308F38",0x3537],
+  ["82308F39",0x3538],
+  ["82309030",0x3539],
+  ["82309031",0x353A],
+  ["82309032",0x353B],
+  ["82309033",0x353C],
+  ["82309034",0x353D],
+  ["82309035",0x353E],
+  ["82309036",0x353F],
+  ["82309037",0x3540],
+  ["82309038",0x3541],
+  ["82309039",0x3542],
+  ["82309130",0x3543],
+  ["82309131",0x3544],
+  ["82309132",0x3545],
+  ["82309133",0x3546],
+  ["82309134",0x3547],
+  ["82309135",0x3548],
+  ["82309136",0x3549],
+  ["82309137",0x354A],
+  ["82309138",0x354B],
+  ["82309139",0x354C],
+  ["82309230",0x354D],
+  ["82309231",0x354E],
+  ["82309232",0x354F],
+  ["82309233",0x3550],
+  ["82309234",0x3551],
+  ["82309235",0x3552],
+  ["82309236",0x3553],
+  ["82309237",0x3554],
+  ["82309238",0x3555],
+  ["82309239",0x3556],
+  ["82309330",0x3557],
+  ["82309331",0x3558],
+  ["82309332",0x3559],
+  ["82309333",0x355A],
+  ["82309334",0x355B],
+  ["82309335",0x355C],
+  ["82309336",0x355D],
+  ["82309337",0x355E],
+  ["82309338",0x355F],
+  ["82309339",0x3560],
+  ["82309430",0x3561],
+  ["82309431",0x3562],
+  ["82309432",0x3563],
+  ["82309433",0x3564],
+  ["82309434",0x3565],
+  ["82309435",0x3566],
+  ["82309436",0x3567],
+  ["82309437",0x3568],
+  ["82309438",0x3569],
+  ["82309439",0x356A],
+  ["82309530",0x356B],
+  ["82309531",0x356C],
+  ["82309532",0x356D],
+  ["82309533",0x356E],
+  ["82309534",0x356F],
+  ["82309535",0x3570],
+  ["82309536",0x3571],
+  ["82309537",0x3572],
+  ["82309538",0x3573],
+  ["82309539",0x3574],
+  ["82309630",0x3575],
+  ["82309631",0x3576],
+  ["82309632",0x3577],
+  ["82309633",0x3578],
+  ["82309634",0x3579],
+  ["82309635",0x357A],
+  ["82309636",0x357B],
+  ["82309637",0x357C],
+  ["82309638",0x357D],
+  ["82309639",0x357E],
+  ["82309730",0x357F],
+  ["82309731",0x3580],
+  ["82309732",0x3581],
+  ["82309733",0x3582],
+  ["82309734",0x3583],
+  ["82309735",0x3584],
+  ["82309736",0x3585],
+  ["82309737",0x3586],
+  ["82309738",0x3587],
+  ["82309739",0x3588],
+  ["82309830",0x3589],
+  ["82309831",0x358A],
+  ["82309832",0x358B],
+  ["82309833",0x358C],
+  ["82309834",0x358D],
+  ["82309835",0x358E],
+  ["82309836",0x358F],
+  ["82309837",0x3590],
+  ["82309838",0x3591],
+  ["82309839",0x3592],
+  ["82309930",0x3593],
+  ["82309931",0x3594],
+  ["82309932",0x3595],
+  ["82309933",0x3596],
+  ["82309934",0x3597],
+  ["82309935",0x3598],
+  ["82309936",0x3599],
+  ["82309937",0x359A],
+  ["82309938",0x359B],
+  ["82309939",0x359C],
+  ["82309A30",0x359D],
+  ["FE5A",0x359E],
+  ["82309A31",0x359F],
+  ["82309A32",0x35A0],
+  ["82309A33",0x35A1],
+  ["82309A34",0x35A2],
+  ["82309A35",0x35A3],
+  ["82309A36",0x35A4],
+  ["82309A37",0x35A5],
+  ["82309A38",0x35A6],
+  ["82309A39",0x35A7],
+  ["82309B30",0x35A8],
+  ["82309B31",0x35A9],
+  ["82309B32",0x35AA],
+  ["82309B33",0x35AB],
+  ["82309B34",0x35AC],
+  ["82309B35",0x35AD],
+  ["82309B36",0x35AE],
+  ["82309B37",0x35AF],
+  ["82309B38",0x35B0],
+  ["82309B39",0x35B1],
+  ["82309C30",0x35B2],
+  ["82309C31",0x35B3],
+  ["82309C32",0x35B4],
+  ["82309C33",0x35B5],
+  ["82309C34",0x35B6],
+  ["82309C35",0x35B7],
+  ["82309C36",0x35B8],
+  ["82309C37",0x35B9],
+  ["82309C38",0x35BA],
+  ["82309C39",0x35BB],
+  ["82309D30",0x35BC],
+  ["82309D31",0x35BD],
+  ["82309D32",0x35BE],
+  ["82309D33",0x35BF],
+  ["82309D34",0x35C0],
+  ["82309D35",0x35C1],
+  ["82309D36",0x35C2],
+  ["82309D37",0x35C3],
+  ["82309D38",0x35C4],
+  ["82309D39",0x35C5],
+  ["82309E30",0x35C6],
+  ["82309E31",0x35C7],
+  ["82309E32",0x35C8],
+  ["82309E33",0x35C9],
+  ["82309E34",0x35CA],
+  ["82309E35",0x35CB],
+  ["82309E36",0x35CC],
+  ["82309E37",0x35CD],
+  ["82309E38",0x35CE],
+  ["82309E39",0x35CF],
+  ["82309F30",0x35D0],
+  ["82309F31",0x35D1],
+  ["82309F32",0x35D2],
+  ["82309F33",0x35D3],
+  ["82309F34",0x35D4],
+  ["82309F35",0x35D5],
+  ["82309F36",0x35D6],
+  ["82309F37",0x35D7],
+  ["82309F38",0x35D8],
+  ["82309F39",0x35D9],
+  ["8230A030",0x35DA],
+  ["8230A031",0x35DB],
+  ["8230A032",0x35DC],
+  ["8230A033",0x35DD],
+  ["8230A034",0x35DE],
+  ["8230A035",0x35DF],
+  ["8230A036",0x35E0],
+  ["8230A037",0x35E1],
+  ["8230A038",0x35E2],
+  ["8230A039",0x35E3],
+  ["8230A130",0x35E4],
+  ["8230A131",0x35E5],
+  ["8230A132",0x35E6],
+  ["8230A133",0x35E7],
+  ["8230A134",0x35E8],
+  ["8230A135",0x35E9],
+  ["8230A136",0x35EA],
+  ["8230A137",0x35EB],
+  ["8230A138",0x35EC],
+  ["8230A139",0x35ED],
+  ["8230A230",0x35EE],
+  ["8230A231",0x35EF],
+  ["8230A232",0x35F0],
+  ["8230A233",0x35F1],
+  ["8230A234",0x35F2],
+  ["8230A235",0x35F3],
+  ["8230A236",0x35F4],
+  ["8230A237",0x35F5],
+  ["8230A238",0x35F6],
+  ["8230A239",0x35F7],
+  ["8230A330",0x35F8],
+  ["8230A331",0x35F9],
+  ["8230A332",0x35FA],
+  ["8230A333",0x35FB],
+  ["8230A334",0x35FC],
+  ["8230A335",0x35FD],
+  ["8230A336",0x35FE],
+  ["8230A337",0x35FF],
+  ["8230A338",0x3600],
+  ["8230A339",0x3601],
+  ["8230A430",0x3602],
+  ["8230A431",0x3603],
+  ["8230A432",0x3604],
+  ["8230A433",0x3605],
+  ["8230A434",0x3606],
+  ["8230A435",0x3607],
+  ["8230A436",0x3608],
+  ["8230A437",0x3609],
+  ["8230A438",0x360A],
+  ["8230A439",0x360B],
+  ["8230A530",0x360C],
+  ["8230A531",0x360D],
+  ["FE5C",0x360E],
+  ["8230A532",0x360F],
+  ["8230A533",0x3610],
+  ["8230A534",0x3611],
+  ["8230A535",0x3612],
+  ["8230A536",0x3613],
+  ["8230A537",0x3614],
+  ["8230A538",0x3615],
+  ["8230A539",0x3616],
+  ["8230A630",0x3617],
+  ["8230A631",0x3618],
+  ["8230A632",0x3619],
+  ["FE5B",0x361A],
+  ["8230A633",0x361B],
+  ["8230A634",0x361C],
+  ["8230A635",0x361D],
+  ["8230A636",0x361E],
+  ["8230A637",0x361F],
+  ["8230A638",0x3620],
+  ["8230A639",0x3621],
+  ["8230A730",0x3622],
+  ["8230A731",0x3623],
+  ["8230A732",0x3624],
+  ["8230A733",0x3625],
+  ["8230A734",0x3626],
+  ["8230A735",0x3627],
+  ["8230A736",0x3628],
+  ["8230A737",0x3629],
+  ["8230A738",0x362A],
+  ["8230A739",0x362B],
+  ["8230A830",0x362C],
+  ["8230A831",0x362D],
+  ["8230A832",0x362E],
+  ["8230A833",0x362F],
+  ["8230A834",0x3630],
+  ["8230A835",0x3631],
+  ["8230A836",0x3632],
+  ["8230A837",0x3633],
+  ["8230A838",0x3634],
+  ["8230A839",0x3635],
+  ["8230A930",0x3636],
+  ["8230A931",0x3637],
+  ["8230A932",0x3638],
+  ["8230A933",0x3639],
+  ["8230A934",0x363A],
+  ["8230A935",0x363B],
+  ["8230A936",0x363C],
+  ["8230A937",0x363D],
+  ["8230A938",0x363E],
+  ["8230A939",0x363F],
+  ["8230AA30",0x3640],
+  ["8230AA31",0x3641],
+  ["8230AA32",0x3642],
+  ["8230AA33",0x3643],
+  ["8230AA34",0x3644],
+  ["8230AA35",0x3645],
+  ["8230AA36",0x3646],
+  ["8230AA37",0x3647],
+  ["8230AA38",0x3648],
+  ["8230AA39",0x3649],
+  ["8230AB30",0x364A],
+  ["8230AB31",0x364B],
+  ["8230AB32",0x364C],
+  ["8230AB33",0x364D],
+  ["8230AB34",0x364E],
+  ["8230AB35",0x364F],
+  ["8230AB36",0x3650],
+  ["8230AB37",0x3651],
+  ["8230AB38",0x3652],
+  ["8230AB39",0x3653],
+  ["8230AC30",0x3654],
+  ["8230AC31",0x3655],
+  ["8230AC32",0x3656],
+  ["8230AC33",0x3657],
+  ["8230AC34",0x3658],
+  ["8230AC35",0x3659],
+  ["8230AC36",0x365A],
+  ["8230AC37",0x365B],
+  ["8230AC38",0x365C],
+  ["8230AC39",0x365D],
+  ["8230AD30",0x365E],
+  ["8230AD31",0x365F],
+  ["8230AD32",0x3660],
+  ["8230AD33",0x3661],
+  ["8230AD34",0x3662],
+  ["8230AD35",0x3663],
+  ["8230AD36",0x3664],
+  ["8230AD37",0x3665],
+  ["8230AD38",0x3666],
+  ["8230AD39",0x3667],
+  ["8230AE30",0x3668],
+  ["8230AE31",0x3669],
+  ["8230AE32",0x366A],
+  ["8230AE33",0x366B],
+  ["8230AE34",0x366C],
+  ["8230AE35",0x366D],
+  ["8230AE36",0x366E],
+  ["8230AE37",0x366F],
+  ["8230AE38",0x3670],
+  ["8230AE39",0x3671],
+  ["8230AF30",0x3672],
+  ["8230AF31",0x3673],
+  ["8230AF32",0x3674],
+  ["8230AF33",0x3675],
+  ["8230AF34",0x3676],
+  ["8230AF35",0x3677],
+  ["8230AF36",0x3678],
+  ["8230AF37",0x3679],
+  ["8230AF38",0x367A],
+  ["8230AF39",0x367B],
+  ["8230B030",0x367C],
+  ["8230B031",0x367D],
+  ["8230B032",0x367E],
+  ["8230B033",0x367F],
+  ["8230B034",0x3680],
+  ["8230B035",0x3681],
+  ["8230B036",0x3682],
+  ["8230B037",0x3683],
+  ["8230B038",0x3684],
+  ["8230B039",0x3685],
+  ["8230B130",0x3686],
+  ["8230B131",0x3687],
+  ["8230B132",0x3688],
+  ["8230B133",0x3689],
+  ["8230B134",0x368A],
+  ["8230B135",0x368B],
+  ["8230B136",0x368C],
+  ["8230B137",0x368D],
+  ["8230B138",0x368E],
+  ["8230B139",0x368F],
+  ["8230B230",0x3690],
+  ["8230B231",0x3691],
+  ["8230B232",0x3692],
+  ["8230B233",0x3693],
+  ["8230B234",0x3694],
+  ["8230B235",0x3695],
+  ["8230B236",0x3696],
+  ["8230B237",0x3697],
+  ["8230B238",0x3698],
+  ["8230B239",0x3699],
+  ["8230B330",0x369A],
+  ["8230B331",0x369B],
+  ["8230B332",0x369C],
+  ["8230B333",0x369D],
+  ["8230B334",0x369E],
+  ["8230B335",0x369F],
+  ["8230B336",0x36A0],
+  ["8230B337",0x36A1],
+  ["8230B338",0x36A2],
+  ["8230B339",0x36A3],
+  ["8230B430",0x36A4],
+  ["8230B431",0x36A5],
+  ["8230B432",0x36A6],
+  ["8230B433",0x36A7],
+  ["8230B434",0x36A8],
+  ["8230B435",0x36A9],
+  ["8230B436",0x36AA],
+  ["8230B437",0x36AB],
+  ["8230B438",0x36AC],
+  ["8230B439",0x36AD],
+  ["8230B530",0x36AE],
+  ["8230B531",0x36AF],
+  ["8230B532",0x36B0],
+  ["8230B533",0x36B1],
+  ["8230B534",0x36B2],
+  ["8230B535",0x36B3],
+  ["8230B536",0x36B4],
+  ["8230B537",0x36B5],
+  ["8230B538",0x36B6],
+  ["8230B539",0x36B7],
+  ["8230B630",0x36B8],
+  ["8230B631",0x36B9],
+  ["8230B632",0x36BA],
+  ["8230B633",0x36BB],
+  ["8230B634",0x36BC],
+  ["8230B635",0x36BD],
+  ["8230B636",0x36BE],
+  ["8230B637",0x36BF],
+  ["8230B638",0x36C0],
+  ["8230B639",0x36C1],
+  ["8230B730",0x36C2],
+  ["8230B731",0x36C3],
+  ["8230B732",0x36C4],
+  ["8230B733",0x36C5],
+  ["8230B734",0x36C6],
+  ["8230B735",0x36C7],
+  ["8230B736",0x36C8],
+  ["8230B737",0x36C9],
+  ["8230B738",0x36CA],
+  ["8230B739",0x36CB],
+  ["8230B830",0x36CC],
+  ["8230B831",0x36CD],
+  ["8230B832",0x36CE],
+  ["8230B833",0x36CF],
+  ["8230B834",0x36D0],
+  ["8230B835",0x36D1],
+  ["8230B836",0x36D2],
+  ["8230B837",0x36D3],
+  ["8230B838",0x36D4],
+  ["8230B839",0x36D5],
+  ["8230B930",0x36D6],
+  ["8230B931",0x36D7],
+  ["8230B932",0x36D8],
+  ["8230B933",0x36D9],
+  ["8230B934",0x36DA],
+  ["8230B935",0x36DB],
+  ["8230B936",0x36DC],
+  ["8230B937",0x36DD],
+  ["8230B938",0x36DE],
+  ["8230B939",0x36DF],
+  ["8230BA30",0x36E0],
+  ["8230BA31",0x36E1],
+  ["8230BA32",0x36E2],
+  ["8230BA33",0x36E3],
+  ["8230BA34",0x36E4],
+  ["8230BA35",0x36E5],
+  ["8230BA36",0x36E6],
+  ["8230BA37",0x36E7],
+  ["8230BA38",0x36E8],
+  ["8230BA39",0x36E9],
+  ["8230BB30",0x36EA],
+  ["8230BB31",0x36EB],
+  ["8230BB32",0x36EC],
+  ["8230BB33",0x36ED],
+  ["8230BB34",0x36EE],
+  ["8230BB35",0x36EF],
+  ["8230BB36",0x36F0],
+  ["8230BB37",0x36F1],
+  ["8230BB38",0x36F2],
+  ["8230BB39",0x36F3],
+  ["8230BC30",0x36F4],
+  ["8230BC31",0x36F5],
+  ["8230BC32",0x36F6],
+  ["8230BC33",0x36F7],
+  ["8230BC34",0x36F8],
+  ["8230BC35",0x36F9],
+  ["8230BC36",0x36FA],
+  ["8230BC37",0x36FB],
+  ["8230BC38",0x36FC],
+  ["8230BC39",0x36FD],
+  ["8230BD30",0x36FE],
+  ["8230BD31",0x36FF],
+  ["8230BD32",0x3700],
+  ["8230BD33",0x3701],
+  ["8230BD34",0x3702],
+  ["8230BD35",0x3703],
+  ["8230BD36",0x3704],
+  ["8230BD37",0x3705],
+  ["8230BD38",0x3706],
+  ["8230BD39",0x3707],
+  ["8230BE30",0x3708],
+  ["8230BE31",0x3709],
+  ["8230BE32",0x370A],
+  ["8230BE33",0x370B],
+  ["8230BE34",0x370C],
+  ["8230BE35",0x370D],
+  ["8230BE36",0x370E],
+  ["8230BE37",0x370F],
+  ["8230BE38",0x3710],
+  ["8230BE39",0x3711],
+  ["8230BF30",0x3712],
+  ["8230BF31",0x3713],
+  ["8230BF32",0x3714],
+  ["8230BF33",0x3715],
+  ["8230BF34",0x3716],
+  ["8230BF35",0x3717],
+  ["8230BF36",0x3718],
+  ["8230BF37",0x3719],
+  ["8230BF38",0x371A],
+  ["8230BF39",0x371B],
+  ["8230C030",0x371C],
+  ["8230C031",0x371D],
+  ["8230C032",0x371E],
+  ["8230C033",0x371F],
+  ["8230C034",0x3720],
+  ["8230C035",0x3721],
+  ["8230C036",0x3722],
+  ["8230C037",0x3723],
+  ["8230C038",0x3724],
+  ["8230C039",0x3725],
+  ["8230C130",0x3726],
+  ["8230C131",0x3727],
+  ["8230C132",0x3728],
+  ["8230C133",0x3729],
+  ["8230C134",0x372A],
+  ["8230C135",0x372B],
+  ["8230C136",0x372C],
+  ["8230C137",0x372D],
+  ["8230C138",0x372E],
+  ["8230C139",0x372F],
+  ["8230C230",0x3730],
+  ["8230C231",0x3731],
+  ["8230C232",0x3732],
+  ["8230C233",0x3733],
+  ["8230C234",0x3734],
+  ["8230C235",0x3735],
+  ["8230C236",0x3736],
+  ["8230C237",0x3737],
+  ["8230C238",0x3738],
+  ["8230C239",0x3739],
+  ["8230C330",0x373A],
+  ["8230C331",0x373B],
+  ["8230C332",0x373C],
+  ["8230C333",0x373D],
+  ["8230C334",0x373E],
+  ["8230C335",0x373F],
+  ["8230C336",0x3740],
+  ["8230C337",0x3741],
+  ["8230C338",0x3742],
+  ["8230C339",0x3743],
+  ["8230C430",0x3744],
+  ["8230C431",0x3745],
+  ["8230C432",0x3746],
+  ["8230C433",0x3747],
+  ["8230C434",0x3748],
+  ["8230C435",0x3749],
+  ["8230C436",0x374A],
+  ["8230C437",0x374B],
+  ["8230C438",0x374C],
+  ["8230C439",0x374D],
+  ["8230C530",0x374E],
+  ["8230C531",0x374F],
+  ["8230C532",0x3750],
+  ["8230C533",0x3751],
+  ["8230C534",0x3752],
+  ["8230C535",0x3753],
+  ["8230C536",0x3754],
+  ["8230C537",0x3755],
+  ["8230C538",0x3756],
+  ["8230C539",0x3757],
+  ["8230C630",0x3758],
+  ["8230C631",0x3759],
+  ["8230C632",0x375A],
+  ["8230C633",0x375B],
+  ["8230C634",0x375C],
+  ["8230C635",0x375D],
+  ["8230C636",0x375E],
+  ["8230C637",0x375F],
+  ["8230C638",0x3760],
+  ["8230C639",0x3761],
+  ["8230C730",0x3762],
+  ["8230C731",0x3763],
+  ["8230C732",0x3764],
+  ["8230C733",0x3765],
+  ["8230C734",0x3766],
+  ["8230C735",0x3767],
+  ["8230C736",0x3768],
+  ["8230C737",0x3769],
+  ["8230C738",0x376A],
+  ["8230C739",0x376B],
+  ["8230C830",0x376C],
+  ["8230C831",0x376D],
+  ["8230C832",0x376E],
+  ["8230C833",0x376F],
+  ["8230C834",0x3770],
+  ["8230C835",0x3771],
+  ["8230C836",0x3772],
+  ["8230C837",0x3773],
+  ["8230C838",0x3774],
+  ["8230C839",0x3775],
+  ["8230C930",0x3776],
+  ["8230C931",0x3777],
+  ["8230C932",0x3778],
+  ["8230C933",0x3779],
+  ["8230C934",0x377A],
+  ["8230C935",0x377B],
+  ["8230C936",0x377C],
+  ["8230C937",0x377D],
+  ["8230C938",0x377E],
+  ["8230C939",0x377F],
+  ["8230CA30",0x3780],
+  ["8230CA31",0x3781],
+  ["8230CA32",0x3782],
+  ["8230CA33",0x3783],
+  ["8230CA34",0x3784],
+  ["8230CA35",0x3785],
+  ["8230CA36",0x3786],
+  ["8230CA37",0x3787],
+  ["8230CA38",0x3788],
+  ["8230CA39",0x3789],
+  ["8230CB30",0x378A],
+  ["8230CB31",0x378B],
+  ["8230CB32",0x378C],
+  ["8230CB33",0x378D],
+  ["8230CB34",0x378E],
+  ["8230CB35",0x378F],
+  ["8230CB36",0x3790],
+  ["8230CB37",0x3791],
+  ["8230CB38",0x3792],
+  ["8230CB39",0x3793],
+  ["8230CC30",0x3794],
+  ["8230CC31",0x3795],
+  ["8230CC32",0x3796],
+  ["8230CC33",0x3797],
+  ["8230CC34",0x3798],
+  ["8230CC35",0x3799],
+  ["8230CC36",0x379A],
+  ["8230CC37",0x379B],
+  ["8230CC38",0x379C],
+  ["8230CC39",0x379D],
+  ["8230CD30",0x379E],
+  ["8230CD31",0x379F],
+  ["8230CD32",0x37A0],
+  ["8230CD33",0x37A1],
+  ["8230CD34",0x37A2],
+  ["8230CD35",0x37A3],
+  ["8230CD36",0x37A4],
+  ["8230CD37",0x37A5],
+  ["8230CD38",0x37A6],
+  ["8230CD39",0x37A7],
+  ["8230CE30",0x37A8],
+  ["8230CE31",0x37A9],
+  ["8230CE32",0x37AA],
+  ["8230CE33",0x37AB],
+  ["8230CE34",0x37AC],
+  ["8230CE35",0x37AD],
+  ["8230CE36",0x37AE],
+  ["8230CE37",0x37AF],
+  ["8230CE38",0x37B0],
+  ["8230CE39",0x37B1],
+  ["8230CF30",0x37B2],
+  ["8230CF31",0x37B3],
+  ["8230CF32",0x37B4],
+  ["8230CF33",0x37B5],
+  ["8230CF34",0x37B6],
+  ["8230CF35",0x37B7],
+  ["8230CF36",0x37B8],
+  ["8230CF37",0x37B9],
+  ["8230CF38",0x37BA],
+  ["8230CF39",0x37BB],
+  ["8230D030",0x37BC],
+  ["8230D031",0x37BD],
+  ["8230D032",0x37BE],
+  ["8230D033",0x37BF],
+  ["8230D034",0x37C0],
+  ["8230D035",0x37C1],
+  ["8230D036",0x37C2],
+  ["8230D037",0x37C3],
+  ["8230D038",0x37C4],
+  ["8230D039",0x37C5],
+  ["8230D130",0x37C6],
+  ["8230D131",0x37C7],
+  ["8230D132",0x37C8],
+  ["8230D133",0x37C9],
+  ["8230D134",0x37CA],
+  ["8230D135",0x37CB],
+  ["8230D136",0x37CC],
+  ["8230D137",0x37CD],
+  ["8230D138",0x37CE],
+  ["8230D139",0x37CF],
+  ["8230D230",0x37D0],
+  ["8230D231",0x37D1],
+  ["8230D232",0x37D2],
+  ["8230D233",0x37D3],
+  ["8230D234",0x37D4],
+  ["8230D235",0x37D5],
+  ["8230D236",0x37D6],
+  ["8230D237",0x37D7],
+  ["8230D238",0x37D8],
+  ["8230D239",0x37D9],
+  ["8230D330",0x37DA],
+  ["8230D331",0x37DB],
+  ["8230D332",0x37DC],
+  ["8230D333",0x37DD],
+  ["8230D334",0x37DE],
+  ["8230D335",0x37DF],
+  ["8230D336",0x37E0],
+  ["8230D337",0x37E1],
+  ["8230D338",0x37E2],
+  ["8230D339",0x37E3],
+  ["8230D430",0x37E4],
+  ["8230D431",0x37E5],
+  ["8230D432",0x37E6],
+  ["8230D433",0x37E7],
+  ["8230D434",0x37E8],
+  ["8230D435",0x37E9],
+  ["8230D436",0x37EA],
+  ["8230D437",0x37EB],
+  ["8230D438",0x37EC],
+  ["8230D439",0x37ED],
+  ["8230D530",0x37EE],
+  ["8230D531",0x37EF],
+  ["8230D532",0x37F0],
+  ["8230D533",0x37F1],
+  ["8230D534",0x37F2],
+  ["8230D535",0x37F3],
+  ["8230D536",0x37F4],
+  ["8230D537",0x37F5],
+  ["8230D538",0x37F6],
+  ["8230D539",0x37F7],
+  ["8230D630",0x37F8],
+  ["8230D631",0x37F9],
+  ["8230D632",0x37FA],
+  ["8230D633",0x37FB],
+  ["8230D634",0x37FC],
+  ["8230D635",0x37FD],
+  ["8230D636",0x37FE],
+  ["8230D637",0x37FF],
+  ["8230D638",0x3800],
+  ["8230D639",0x3801],
+  ["8230D730",0x3802],
+  ["8230D731",0x3803],
+  ["8230D732",0x3804],
+  ["8230D733",0x3805],
+  ["8230D734",0x3806],
+  ["8230D735",0x3807],
+  ["8230D736",0x3808],
+  ["8230D737",0x3809],
+  ["8230D738",0x380A],
+  ["8230D739",0x380B],
+  ["8230D830",0x380C],
+  ["8230D831",0x380D],
+  ["8230D832",0x380E],
+  ["8230D833",0x380F],
+  ["8230D834",0x3810],
+  ["8230D835",0x3811],
+  ["8230D836",0x3812],
+  ["8230D837",0x3813],
+  ["8230D838",0x3814],
+  ["8230D839",0x3815],
+  ["8230D930",0x3816],
+  ["8230D931",0x3817],
+  ["8230D932",0x3818],
+  ["8230D933",0x3819],
+  ["8230D934",0x381A],
+  ["8230D935",0x381B],
+  ["8230D936",0x381C],
+  ["8230D937",0x381D],
+  ["8230D938",0x381E],
+  ["8230D939",0x381F],
+  ["8230DA30",0x3820],
+  ["8230DA31",0x3821],
+  ["8230DA32",0x3822],
+  ["8230DA33",0x3823],
+  ["8230DA34",0x3824],
+  ["8230DA35",0x3825],
+  ["8230DA36",0x3826],
+  ["8230DA37",0x3827],
+  ["8230DA38",0x3828],
+  ["8230DA39",0x3829],
+  ["8230DB30",0x382A],
+  ["8230DB31",0x382B],
+  ["8230DB32",0x382C],
+  ["8230DB33",0x382D],
+  ["8230DB34",0x382E],
+  ["8230DB35",0x382F],
+  ["8230DB36",0x3830],
+  ["8230DB37",0x3831],
+  ["8230DB38",0x3832],
+  ["8230DB39",0x3833],
+  ["8230DC30",0x3834],
+  ["8230DC31",0x3835],
+  ["8230DC32",0x3836],
+  ["8230DC33",0x3837],
+  ["8230DC34",0x3838],
+  ["8230DC35",0x3839],
+  ["8230DC36",0x383A],
+  ["8230DC37",0x383B],
+  ["8230DC38",0x383C],
+  ["8230DC39",0x383D],
+  ["8230DD30",0x383E],
+  ["8230DD31",0x383F],
+  ["8230DD32",0x3840],
+  ["8230DD33",0x3841],
+  ["8230DD34",0x3842],
+  ["8230DD35",0x3843],
+  ["8230DD36",0x3844],
+  ["8230DD37",0x3845],
+  ["8230DD38",0x3846],
+  ["8230DD39",0x3847],
+  ["8230DE30",0x3848],
+  ["8230DE31",0x3849],
+  ["8230DE32",0x384A],
+  ["8230DE33",0x384B],
+  ["8230DE34",0x384C],
+  ["8230DE35",0x384D],
+  ["8230DE36",0x384E],
+  ["8230DE37",0x384F],
+  ["8230DE38",0x3850],
+  ["8230DE39",0x3851],
+  ["8230DF30",0x3852],
+  ["8230DF31",0x3853],
+  ["8230DF32",0x3854],
+  ["8230DF33",0x3855],
+  ["8230DF34",0x3856],
+  ["8230DF35",0x3857],
+  ["8230DF36",0x3858],
+  ["8230DF37",0x3859],
+  ["8230DF38",0x385A],
+  ["8230DF39",0x385B],
+  ["8230E030",0x385C],
+  ["8230E031",0x385D],
+  ["8230E032",0x385E],
+  ["8230E033",0x385F],
+  ["8230E034",0x3860],
+  ["8230E035",0x3861],
+  ["8230E036",0x3862],
+  ["8230E037",0x3863],
+  ["8230E038",0x3864],
+  ["8230E039",0x3865],
+  ["8230E130",0x3866],
+  ["8230E131",0x3867],
+  ["8230E132",0x3868],
+  ["8230E133",0x3869],
+  ["8230E134",0x386A],
+  ["8230E135",0x386B],
+  ["8230E136",0x386C],
+  ["8230E137",0x386D],
+  ["8230E138",0x386E],
+  ["8230E139",0x386F],
+  ["8230E230",0x3870],
+  ["8230E231",0x3871],
+  ["8230E232",0x3872],
+  ["8230E233",0x3873],
+  ["8230E234",0x3874],
+  ["8230E235",0x3875],
+  ["8230E236",0x3876],
+  ["8230E237",0x3877],
+  ["8230E238",0x3878],
+  ["8230E239",0x3879],
+  ["8230E330",0x387A],
+  ["8230E331",0x387B],
+  ["8230E332",0x387C],
+  ["8230E333",0x387D],
+  ["8230E334",0x387E],
+  ["8230E335",0x387F],
+  ["8230E336",0x3880],
+  ["8230E337",0x3881],
+  ["8230E338",0x3882],
+  ["8230E339",0x3883],
+  ["8230E430",0x3884],
+  ["8230E431",0x3885],
+  ["8230E432",0x3886],
+  ["8230E433",0x3887],
+  ["8230E434",0x3888],
+  ["8230E435",0x3889],
+  ["8230E436",0x388A],
+  ["8230E437",0x388B],
+  ["8230E438",0x388C],
+  ["8230E439",0x388D],
+  ["8230E530",0x388E],
+  ["8230E531",0x388F],
+  ["8230E532",0x3890],
+  ["8230E533",0x3891],
+  ["8230E534",0x3892],
+  ["8230E535",0x3893],
+  ["8230E536",0x3894],
+  ["8230E537",0x3895],
+  ["8230E538",0x3896],
+  ["8230E539",0x3897],
+  ["8230E630",0x3898],
+  ["8230E631",0x3899],
+  ["8230E632",0x389A],
+  ["8230E633",0x389B],
+  ["8230E634",0x389C],
+  ["8230E635",0x389D],
+  ["8230E636",0x389E],
+  ["8230E637",0x389F],
+  ["8230E638",0x38A0],
+  ["8230E639",0x38A1],
+  ["8230E730",0x38A2],
+  ["8230E731",0x38A3],
+  ["8230E732",0x38A4],
+  ["8230E733",0x38A5],
+  ["8230E734",0x38A6],
+  ["8230E735",0x38A7],
+  ["8230E736",0x38A8],
+  ["8230E737",0x38A9],
+  ["8230E738",0x38AA],
+  ["8230E739",0x38AB],
+  ["8230E830",0x38AC],
+  ["8230E831",0x38AD],
+  ["8230E832",0x38AE],
+  ["8230E833",0x38AF],
+  ["8230E834",0x38B0],
+  ["8230E835",0x38B1],
+  ["8230E836",0x38B2],
+  ["8230E837",0x38B3],
+  ["8230E838",0x38B4],
+  ["8230E839",0x38B5],
+  ["8230E930",0x38B6],
+  ["8230E931",0x38B7],
+  ["8230E932",0x38B8],
+  ["8230E933",0x38B9],
+  ["8230E934",0x38BA],
+  ["8230E935",0x38BB],
+  ["8230E936",0x38BC],
+  ["8230E937",0x38BD],
+  ["8230E938",0x38BE],
+  ["8230E939",0x38BF],
+  ["8230EA30",0x38C0],
+  ["8230EA31",0x38C1],
+  ["8230EA32",0x38C2],
+  ["8230EA33",0x38C3],
+  ["8230EA34",0x38C4],
+  ["8230EA35",0x38C5],
+  ["8230EA36",0x38C6],
+  ["8230EA37",0x38C7],
+  ["8230EA38",0x38C8],
+  ["8230EA39",0x38C9],
+  ["8230EB30",0x38CA],
+  ["8230EB31",0x38CB],
+  ["8230EB32",0x38CC],
+  ["8230EB33",0x38CD],
+  ["8230EB34",0x38CE],
+  ["8230EB35",0x38CF],
+  ["8230EB36",0x38D0],
+  ["8230EB37",0x38D1],
+  ["8230EB38",0x38D2],
+  ["8230EB39",0x38D3],
+  ["8230EC30",0x38D4],
+  ["8230EC31",0x38D5],
+  ["8230EC32",0x38D6],
+  ["8230EC33",0x38D7],
+  ["8230EC34",0x38D8],
+  ["8230EC35",0x38D9],
+  ["8230EC36",0x38DA],
+  ["8230EC37",0x38DB],
+  ["8230EC38",0x38DC],
+  ["8230EC39",0x38DD],
+  ["8230ED30",0x38DE],
+  ["8230ED31",0x38DF],
+  ["8230ED32",0x38E0],
+  ["8230ED33",0x38E1],
+  ["8230ED34",0x38E2],
+  ["8230ED35",0x38E3],
+  ["8230ED36",0x38E4],
+  ["8230ED37",0x38E5],
+  ["8230ED38",0x38E6],
+  ["8230ED39",0x38E7],
+  ["8230EE30",0x38E8],
+  ["8230EE31",0x38E9],
+  ["8230EE32",0x38EA],
+  ["8230EE33",0x38EB],
+  ["8230EE34",0x38EC],
+  ["8230EE35",0x38ED],
+  ["8230EE36",0x38EE],
+  ["8230EE37",0x38EF],
+  ["8230EE38",0x38F0],
+  ["8230EE39",0x38F1],
+  ["8230EF30",0x38F2],
+  ["8230EF31",0x38F3],
+  ["8230EF32",0x38F4],
+  ["8230EF33",0x38F5],
+  ["8230EF34",0x38F6],
+  ["8230EF35",0x38F7],
+  ["8230EF36",0x38F8],
+  ["8230EF37",0x38F9],
+  ["8230EF38",0x38FA],
+  ["8230EF39",0x38FB],
+  ["8230F030",0x38FC],
+  ["8230F031",0x38FD],
+  ["8230F032",0x38FE],
+  ["8230F033",0x38FF],
+  ["8230F034",0x3900],
+  ["8230F035",0x3901],
+  ["8230F036",0x3902],
+  ["8230F037",0x3903],
+  ["8230F038",0x3904],
+  ["8230F039",0x3905],
+  ["8230F130",0x3906],
+  ["8230F131",0x3907],
+  ["8230F132",0x3908],
+  ["8230F133",0x3909],
+  ["8230F134",0x390A],
+  ["8230F135",0x390B],
+  ["8230F136",0x390C],
+  ["8230F137",0x390D],
+  ["8230F138",0x390E],
+  ["8230F139",0x390F],
+  ["8230F230",0x3910],
+  ["8230F231",0x3911],
+  ["8230F232",0x3912],
+  ["8230F233",0x3913],
+  ["8230F234",0x3914],
+  ["8230F235",0x3915],
+  ["8230F236",0x3916],
+  ["8230F237",0x3917],
+  ["FE60",0x3918],
+  ["8230F238",0x3919],
+  ["8230F239",0x391A],
+  ["8230F330",0x391B],
+  ["8230F331",0x391C],
+  ["8230F332",0x391D],
+  ["8230F333",0x391E],
+  ["8230F334",0x391F],
+  ["8230F335",0x3920],
+  ["8230F336",0x3921],
+  ["8230F337",0x3922],
+  ["8230F338",0x3923],
+  ["8230F339",0x3924],
+  ["8230F430",0x3925],
+  ["8230F431",0x3926],
+  ["8230F432",0x3927],
+  ["8230F433",0x3928],
+  ["8230F434",0x3929],
+  ["8230F435",0x392A],
+  ["8230F436",0x392B],
+  ["8230F437",0x392C],
+  ["8230F438",0x392D],
+  ["8230F439",0x392E],
+  ["8230F530",0x392F],
+  ["8230F531",0x3930],
+  ["8230F532",0x3931],
+  ["8230F533",0x3932],
+  ["8230F534",0x3933],
+  ["8230F535",0x3934],
+  ["8230F536",0x3935],
+  ["8230F537",0x3936],
+  ["8230F538",0x3937],
+  ["8230F539",0x3938],
+  ["8230F630",0x3939],
+  ["8230F631",0x393A],
+  ["8230F632",0x393B],
+  ["8230F633",0x393C],
+  ["8230F634",0x393D],
+  ["8230F635",0x393E],
+  ["8230F636",0x393F],
+  ["8230F637",0x3940],
+  ["8230F638",0x3941],
+  ["8230F639",0x3942],
+  ["8230F730",0x3943],
+  ["8230F731",0x3944],
+  ["8230F732",0x3945],
+  ["8230F733",0x3946],
+  ["8230F734",0x3947],
+  ["8230F735",0x3948],
+  ["8230F736",0x3949],
+  ["8230F737",0x394A],
+  ["8230F738",0x394B],
+  ["8230F739",0x394C],
+  ["8230F830",0x394D],
+  ["8230F831",0x394E],
+  ["8230F832",0x394F],
+  ["8230F833",0x3950],
+  ["8230F834",0x3951],
+  ["8230F835",0x3952],
+  ["8230F836",0x3953],
+  ["8230F837",0x3954],
+  ["8230F838",0x3955],
+  ["8230F839",0x3956],
+  ["8230F930",0x3957],
+  ["8230F931",0x3958],
+  ["8230F932",0x3959],
+  ["8230F933",0x395A],
+  ["8230F934",0x395B],
+  ["8230F935",0x395C],
+  ["8230F936",0x395D],
+  ["8230F937",0x395E],
+  ["8230F938",0x395F],
+  ["8230F939",0x3960],
+  ["8230FA30",0x3961],
+  ["8230FA31",0x3962],
+  ["8230FA32",0x3963],
+  ["8230FA33",0x3964],
+  ["8230FA34",0x3965],
+  ["8230FA35",0x3966],
+  ["8230FA36",0x3967],
+  ["8230FA37",0x3968],
+  ["8230FA38",0x3969],
+  ["8230FA39",0x396A],
+  ["8230FB30",0x396B],
+  ["8230FB31",0x396C],
+  ["8230FB32",0x396D],
+  ["FE5F",0x396E],
+  ["8230FB33",0x396F],
+  ["8230FB34",0x3970],
+  ["8230FB35",0x3971],
+  ["8230FB36",0x3972],
+  ["8230FB37",0x3973],
+  ["8230FB38",0x3974],
+  ["8230FB39",0x3975],
+  ["8230FC30",0x3976],
+  ["8230FC31",0x3977],
+  ["8230FC32",0x3978],
+  ["8230FC33",0x3979],
+  ["8230FC34",0x397A],
+  ["8230FC35",0x397B],
+  ["8230FC36",0x397C],
+  ["8230FC37",0x397D],
+  ["8230FC38",0x397E],
+  ["8230FC39",0x397F],
+  ["8230FD30",0x3980],
+  ["8230FD31",0x3981],
+  ["8230FD32",0x3982],
+  ["8230FD33",0x3983],
+  ["8230FD34",0x3984],
+  ["8230FD35",0x3985],
+  ["8230FD36",0x3986],
+  ["8230FD37",0x3987],
+  ["8230FD38",0x3988],
+  ["8230FD39",0x3989],
+  ["8230FE30",0x398A],
+  ["8230FE31",0x398B],
+  ["8230FE32",0x398C],
+  ["8230FE33",0x398D],
+  ["8230FE34",0x398E],
+  ["8230FE35",0x398F],
+  ["8230FE36",0x3990],
+  ["8230FE37",0x3991],
+  ["8230FE38",0x3992],
+  ["8230FE39",0x3993],
+  ["82318130",0x3994],
+  ["82318131",0x3995],
+  ["82318132",0x3996],
+  ["82318133",0x3997],
+  ["82318134",0x3998],
+  ["82318135",0x3999],
+  ["82318136",0x399A],
+  ["82318137",0x399B],
+  ["82318138",0x399C],
+  ["82318139",0x399D],
+  ["82318230",0x399E],
+  ["82318231",0x399F],
+  ["82318232",0x39A0],
+  ["82318233",0x39A1],
+  ["82318234",0x39A2],
+  ["82318235",0x39A3],
+  ["82318236",0x39A4],
+  ["82318237",0x39A5],
+  ["82318238",0x39A6],
+  ["82318239",0x39A7],
+  ["82318330",0x39A8],
+  ["82318331",0x39A9],
+  ["82318332",0x39AA],
+  ["82318333",0x39AB],
+  ["82318334",0x39AC],
+  ["82318335",0x39AD],
+  ["82318336",0x39AE],
+  ["82318337",0x39AF],
+  ["82318338",0x39B0],
+  ["82318339",0x39B1],
+  ["82318430",0x39B2],
+  ["82318431",0x39B3],
+  ["82318432",0x39B4],
+  ["82318433",0x39B5],
+  ["82318434",0x39B6],
+  ["82318435",0x39B7],
+  ["82318436",0x39B8],
+  ["82318437",0x39B9],
+  ["82318438",0x39BA],
+  ["82318439",0x39BB],
+  ["82318530",0x39BC],
+  ["82318531",0x39BD],
+  ["82318532",0x39BE],
+  ["82318533",0x39BF],
+  ["82318534",0x39C0],
+  ["82318535",0x39C1],
+  ["82318536",0x39C2],
+  ["82318537",0x39C3],
+  ["82318538",0x39C4],
+  ["82318539",0x39C5],
+  ["82318630",0x39C6],
+  ["82318631",0x39C7],
+  ["82318632",0x39C8],
+  ["82318633",0x39C9],
+  ["82318634",0x39CA],
+  ["82318635",0x39CB],
+  ["82318636",0x39CC],
+  ["82318637",0x39CD],
+  ["82318638",0x39CE],
+  ["FE62",0x39CF],
+  ["FE65",0x39D0],
+  ["82318639",0x39D1],
+  ["82318730",0x39D2],
+  ["82318731",0x39D3],
+  ["82318732",0x39D4],
+  ["82318733",0x39D5],
+  ["82318734",0x39D6],
+  ["82318735",0x39D7],
+  ["82318736",0x39D8],
+  ["82318737",0x39D9],
+  ["82318738",0x39DA],
+  ["82318739",0x39DB],
+  ["82318830",0x39DC],
+  ["82318831",0x39DD],
+  ["82318832",0x39DE],
+  ["FE63",0x39DF],
+  ["82318833",0x39E0],
+  ["82318834",0x39E1],
+  ["82318835",0x39E2],
+  ["82318836",0x39E3],
+  ["82318837",0x39E4],
+  ["82318838",0x39E5],
+  ["82318839",0x39E6],
+  ["82318930",0x39E7],
+  ["82318931",0x39E8],
+  ["82318932",0x39E9],
+  ["82318933",0x39EA],
+  ["82318934",0x39EB],
+  ["82318935",0x39EC],
+  ["82318936",0x39ED],
+  ["82318937",0x39EE],
+  ["82318938",0x39EF],
+  ["82318939",0x39F0],
+  ["82318A30",0x39F1],
+  ["82318A31",0x39F2],
+  ["82318A32",0x39F3],
+  ["82318A33",0x39F4],
+  ["82318A34",0x39F5],
+  ["82318A35",0x39F6],
+  ["82318A36",0x39F7],
+  ["82318A37",0x39F8],
+  ["82318A38",0x39F9],
+  ["82318A39",0x39FA],
+  ["82318B30",0x39FB],
+  ["82318B31",0x39FC],
+  ["82318B32",0x39FD],
+  ["82318B33",0x39FE],
+  ["82318B34",0x39FF],
+  ["82318B35",0x3A00],
+  ["82318B36",0x3A01],
+  ["82318B37",0x3A02],
+  ["82318B38",0x3A03],
+  ["82318B39",0x3A04],
+  ["82318C30",0x3A05],
+  ["82318C31",0x3A06],
+  ["82318C32",0x3A07],
+  ["82318C33",0x3A08],
+  ["82318C34",0x3A09],
+  ["82318C35",0x3A0A],
+  ["82318C36",0x3A0B],
+  ["82318C37",0x3A0C],
+  ["82318C38",0x3A0D],
+  ["82318C39",0x3A0E],
+  ["82318D30",0x3A0F],
+  ["82318D31",0x3A10],
+  ["82318D32",0x3A11],
+  ["82318D33",0x3A12],
+  ["82318D34",0x3A13],
+  ["82318D35",0x3A14],
+  ["82318D36",0x3A15],
+  ["82318D37",0x3A16],
+  ["82318D38",0x3A17],
+  ["82318D39",0x3A18],
+  ["82318E30",0x3A19],
+  ["82318E31",0x3A1A],
+  ["82318E32",0x3A1B],
+  ["82318E33",0x3A1C],
+  ["82318E34",0x3A1D],
+  ["82318E35",0x3A1E],
+  ["82318E36",0x3A1F],
+  ["82318E37",0x3A20],
+  ["82318E38",0x3A21],
+  ["82318E39",0x3A22],
+  ["82318F30",0x3A23],
+  ["82318F31",0x3A24],
+  ["82318F32",0x3A25],
+  ["82318F33",0x3A26],
+  ["82318F34",0x3A27],
+  ["82318F35",0x3A28],
+  ["82318F36",0x3A29],
+  ["82318F37",0x3A2A],
+  ["82318F38",0x3A2B],
+  ["82318F39",0x3A2C],
+  ["82319030",0x3A2D],
+  ["82319031",0x3A2E],
+  ["82319032",0x3A2F],
+  ["82319033",0x3A30],
+  ["82319034",0x3A31],
+  ["82319035",0x3A32],
+  ["82319036",0x3A33],
+  ["82319037",0x3A34],
+  ["82319038",0x3A35],
+  ["82319039",0x3A36],
+  ["82319130",0x3A37],
+  ["82319131",0x3A38],
+  ["82319132",0x3A39],
+  ["82319133",0x3A3A],
+  ["82319134",0x3A3B],
+  ["82319135",0x3A3C],
+  ["82319136",0x3A3D],
+  ["82319137",0x3A3E],
+  ["82319138",0x3A3F],
+  ["82319139",0x3A40],
+  ["82319230",0x3A41],
+  ["82319231",0x3A42],
+  ["82319232",0x3A43],
+  ["82319233",0x3A44],
+  ["82319234",0x3A45],
+  ["82319235",0x3A46],
+  ["82319236",0x3A47],
+  ["82319237",0x3A48],
+  ["82319238",0x3A49],
+  ["82319239",0x3A4A],
+  ["82319330",0x3A4B],
+  ["82319331",0x3A4C],
+  ["82319332",0x3A4D],
+  ["82319333",0x3A4E],
+  ["82319334",0x3A4F],
+  ["82319335",0x3A50],
+  ["82319336",0x3A51],
+  ["82319337",0x3A52],
+  ["82319338",0x3A53],
+  ["82319339",0x3A54],
+  ["82319430",0x3A55],
+  ["82319431",0x3A56],
+  ["82319432",0x3A57],
+  ["82319433",0x3A58],
+  ["82319434",0x3A59],
+  ["82319435",0x3A5A],
+  ["82319436",0x3A5B],
+  ["82319437",0x3A5C],
+  ["82319438",0x3A5D],
+  ["82319439",0x3A5E],
+  ["82319530",0x3A5F],
+  ["82319531",0x3A60],
+  ["82319532",0x3A61],
+  ["82319533",0x3A62],
+  ["82319534",0x3A63],
+  ["82319535",0x3A64],
+  ["82319536",0x3A65],
+  ["82319537",0x3A66],
+  ["82319538",0x3A67],
+  ["82319539",0x3A68],
+  ["82319630",0x3A69],
+  ["82319631",0x3A6A],
+  ["82319632",0x3A6B],
+  ["82319633",0x3A6C],
+  ["82319634",0x3A6D],
+  ["82319635",0x3A6E],
+  ["82319636",0x3A6F],
+  ["82319637",0x3A70],
+  ["82319638",0x3A71],
+  ["82319639",0x3A72],
+  ["FE64",0x3A73],
+  ["82319730",0x3A74],
+  ["82319731",0x3A75],
+  ["82319732",0x3A76],
+  ["82319733",0x3A77],
+  ["82319734",0x3A78],
+  ["82319735",0x3A79],
+  ["82319736",0x3A7A],
+  ["82319737",0x3A7B],
+  ["82319738",0x3A7C],
+  ["82319739",0x3A7D],
+  ["82319830",0x3A7E],
+  ["82319831",0x3A7F],
+  ["82319832",0x3A80],
+  ["82319833",0x3A81],
+  ["82319834",0x3A82],
+  ["82319835",0x3A83],
+  ["82319836",0x3A84],
+  ["82319837",0x3A85],
+  ["82319838",0x3A86],
+  ["82319839",0x3A87],
+  ["82319930",0x3A88],
+  ["82319931",0x3A89],
+  ["82319932",0x3A8A],
+  ["82319933",0x3A8B],
+  ["82319934",0x3A8C],
+  ["82319935",0x3A8D],
+  ["82319936",0x3A8E],
+  ["82319937",0x3A8F],
+  ["82319938",0x3A90],
+  ["82319939",0x3A91],
+  ["82319A30",0x3A92],
+  ["82319A31",0x3A93],
+  ["82319A32",0x3A94],
+  ["82319A33",0x3A95],
+  ["82319A34",0x3A96],
+  ["82319A35",0x3A97],
+  ["82319A36",0x3A98],
+  ["82319A37",0x3A99],
+  ["82319A38",0x3A9A],
+  ["82319A39",0x3A9B],
+  ["82319B30",0x3A9C],
+  ["82319B31",0x3A9D],
+  ["82319B32",0x3A9E],
+  ["82319B33",0x3A9F],
+  ["82319B34",0x3AA0],
+  ["82319B35",0x3AA1],
+  ["82319B36",0x3AA2],
+  ["82319B37",0x3AA3],
+  ["82319B38",0x3AA4],
+  ["82319B39",0x3AA5],
+  ["82319C30",0x3AA6],
+  ["82319C31",0x3AA7],
+  ["82319C32",0x3AA8],
+  ["82319C33",0x3AA9],
+  ["82319C34",0x3AAA],
+  ["82319C35",0x3AAB],
+  ["82319C36",0x3AAC],
+  ["82319C37",0x3AAD],
+  ["82319C38",0x3AAE],
+  ["82319C39",0x3AAF],
+  ["82319D30",0x3AB0],
+  ["82319D31",0x3AB1],
+  ["82319D32",0x3AB2],
+  ["82319D33",0x3AB3],
+  ["82319D34",0x3AB4],
+  ["82319D35",0x3AB5],
+  ["82319D36",0x3AB6],
+  ["82319D37",0x3AB7],
+  ["82319D38",0x3AB8],
+  ["82319D39",0x3AB9],
+  ["82319E30",0x3ABA],
+  ["82319E31",0x3ABB],
+  ["82319E32",0x3ABC],
+  ["82319E33",0x3ABD],
+  ["82319E34",0x3ABE],
+  ["82319E35",0x3ABF],
+  ["82319E36",0x3AC0],
+  ["82319E37",0x3AC1],
+  ["82319E38",0x3AC2],
+  ["82319E39",0x3AC3],
+  ["82319F30",0x3AC4],
+  ["82319F31",0x3AC5],
+  ["82319F32",0x3AC6],
+  ["82319F33",0x3AC7],
+  ["82319F34",0x3AC8],
+  ["82319F35",0x3AC9],
+  ["82319F36",0x3ACA],
+  ["82319F37",0x3ACB],
+  ["82319F38",0x3ACC],
+  ["82319F39",0x3ACD],
+  ["8231A030",0x3ACE],
+  ["8231A031",0x3ACF],
+  ["8231A032",0x3AD0],
+  ["8231A033",0x3AD1],
+  ["8231A034",0x3AD2],
+  ["8231A035",0x3AD3],
+  ["8231A036",0x3AD4],
+  ["8231A037",0x3AD5],
+  ["8231A038",0x3AD6],
+  ["8231A039",0x3AD7],
+  ["8231A130",0x3AD8],
+  ["8231A131",0x3AD9],
+  ["8231A132",0x3ADA],
+  ["8231A133",0x3ADB],
+  ["8231A134",0x3ADC],
+  ["8231A135",0x3ADD],
+  ["8231A136",0x3ADE],
+  ["8231A137",0x3ADF],
+  ["8231A138",0x3AE0],
+  ["8231A139",0x3AE1],
+  ["8231A230",0x3AE2],
+  ["8231A231",0x3AE3],
+  ["8231A232",0x3AE4],
+  ["8231A233",0x3AE5],
+  ["8231A234",0x3AE6],
+  ["8231A235",0x3AE7],
+  ["8231A236",0x3AE8],
+  ["8231A237",0x3AE9],
+  ["8231A238",0x3AEA],
+  ["8231A239",0x3AEB],
+  ["8231A330",0x3AEC],
+  ["8231A331",0x3AED],
+  ["8231A332",0x3AEE],
+  ["8231A333",0x3AEF],
+  ["8231A334",0x3AF0],
+  ["8231A335",0x3AF1],
+  ["8231A336",0x3AF2],
+  ["8231A337",0x3AF3],
+  ["8231A338",0x3AF4],
+  ["8231A339",0x3AF5],
+  ["8231A430",0x3AF6],
+  ["8231A431",0x3AF7],
+  ["8231A432",0x3AF8],
+  ["8231A433",0x3AF9],
+  ["8231A434",0x3AFA],
+  ["8231A435",0x3AFB],
+  ["8231A436",0x3AFC],
+  ["8231A437",0x3AFD],
+  ["8231A438",0x3AFE],
+  ["8231A439",0x3AFF],
+  ["8231A530",0x3B00],
+  ["8231A531",0x3B01],
+  ["8231A532",0x3B02],
+  ["8231A533",0x3B03],
+  ["8231A534",0x3B04],
+  ["8231A535",0x3B05],
+  ["8231A536",0x3B06],
+  ["8231A537",0x3B07],
+  ["8231A538",0x3B08],
+  ["8231A539",0x3B09],
+  ["8231A630",0x3B0A],
+  ["8231A631",0x3B0B],
+  ["8231A632",0x3B0C],
+  ["8231A633",0x3B0D],
+  ["8231A634",0x3B0E],
+  ["8231A635",0x3B0F],
+  ["8231A636",0x3B10],
+  ["8231A637",0x3B11],
+  ["8231A638",0x3B12],
+  ["8231A639",0x3B13],
+  ["8231A730",0x3B14],
+  ["8231A731",0x3B15],
+  ["8231A732",0x3B16],
+  ["8231A733",0x3B17],
+  ["8231A734",0x3B18],
+  ["8231A735",0x3B19],
+  ["8231A736",0x3B1A],
+  ["8231A737",0x3B1B],
+  ["8231A738",0x3B1C],
+  ["8231A739",0x3B1D],
+  ["8231A830",0x3B1E],
+  ["8231A831",0x3B1F],
+  ["8231A832",0x3B20],
+  ["8231A833",0x3B21],
+  ["8231A834",0x3B22],
+  ["8231A835",0x3B23],
+  ["8231A836",0x3B24],
+  ["8231A837",0x3B25],
+  ["8231A838",0x3B26],
+  ["8231A839",0x3B27],
+  ["8231A930",0x3B28],
+  ["8231A931",0x3B29],
+  ["8231A932",0x3B2A],
+  ["8231A933",0x3B2B],
+  ["8231A934",0x3B2C],
+  ["8231A935",0x3B2D],
+  ["8231A936",0x3B2E],
+  ["8231A937",0x3B2F],
+  ["8231A938",0x3B30],
+  ["8231A939",0x3B31],
+  ["8231AA30",0x3B32],
+  ["8231AA31",0x3B33],
+  ["8231AA32",0x3B34],
+  ["8231AA33",0x3B35],
+  ["8231AA34",0x3B36],
+  ["8231AA35",0x3B37],
+  ["8231AA36",0x3B38],
+  ["8231AA37",0x3B39],
+  ["8231AA38",0x3B3A],
+  ["8231AA39",0x3B3B],
+  ["8231AB30",0x3B3C],
+  ["8231AB31",0x3B3D],
+  ["8231AB32",0x3B3E],
+  ["8231AB33",0x3B3F],
+  ["8231AB34",0x3B40],
+  ["8231AB35",0x3B41],
+  ["8231AB36",0x3B42],
+  ["8231AB37",0x3B43],
+  ["8231AB38",0x3B44],
+  ["8231AB39",0x3B45],
+  ["8231AC30",0x3B46],
+  ["8231AC31",0x3B47],
+  ["8231AC32",0x3B48],
+  ["8231AC33",0x3B49],
+  ["8231AC34",0x3B4A],
+  ["8231AC35",0x3B4B],
+  ["8231AC36",0x3B4C],
+  ["8231AC37",0x3B4D],
+  ["FE68",0x3B4E],
+  ["8231AC38",0x3B4F],
+  ["8231AC39",0x3B50],
+  ["8231AD30",0x3B51],
+  ["8231AD31",0x3B52],
+  ["8231AD32",0x3B53],
+  ["8231AD33",0x3B54],
+  ["8231AD34",0x3B55],
+  ["8231AD35",0x3B56],
+  ["8231AD36",0x3B57],
+  ["8231AD37",0x3B58],
+  ["8231AD38",0x3B59],
+  ["8231AD39",0x3B5A],
+  ["8231AE30",0x3B5B],
+  ["8231AE31",0x3B5C],
+  ["8231AE32",0x3B5D],
+  ["8231AE33",0x3B5E],
+  ["8231AE34",0x3B5F],
+  ["8231AE35",0x3B60],
+  ["8231AE36",0x3B61],
+  ["8231AE37",0x3B62],
+  ["8231AE38",0x3B63],
+  ["8231AE39",0x3B64],
+  ["8231AF30",0x3B65],
+  ["8231AF31",0x3B66],
+  ["8231AF32",0x3B67],
+  ["8231AF33",0x3B68],
+  ["8231AF34",0x3B69],
+  ["8231AF35",0x3B6A],
+  ["8231AF36",0x3B6B],
+  ["8231AF37",0x3B6C],
+  ["8231AF38",0x3B6D],
+  ["8231AF39",0x3B6E],
+  ["8231B030",0x3B6F],
+  ["8231B031",0x3B70],
+  ["8231B032",0x3B71],
+  ["8231B033",0x3B72],
+  ["8231B034",0x3B73],
+  ["8231B035",0x3B74],
+  ["8231B036",0x3B75],
+  ["8231B037",0x3B76],
+  ["8231B038",0x3B77],
+  ["8231B039",0x3B78],
+  ["8231B130",0x3B79],
+  ["8231B131",0x3B7A],
+  ["8231B132",0x3B7B],
+  ["8231B133",0x3B7C],
+  ["8231B134",0x3B7D],
+  ["8231B135",0x3B7E],
+  ["8231B136",0x3B7F],
+  ["8231B137",0x3B80],
+  ["8231B138",0x3B81],
+  ["8231B139",0x3B82],
+  ["8231B230",0x3B83],
+  ["8231B231",0x3B84],
+  ["8231B232",0x3B85],
+  ["8231B233",0x3B86],
+  ["8231B234",0x3B87],
+  ["8231B235",0x3B88],
+  ["8231B236",0x3B89],
+  ["8231B237",0x3B8A],
+  ["8231B238",0x3B8B],
+  ["8231B239",0x3B8C],
+  ["8231B330",0x3B8D],
+  ["8231B331",0x3B8E],
+  ["8231B332",0x3B8F],
+  ["8231B333",0x3B90],
+  ["8231B334",0x3B91],
+  ["8231B335",0x3B92],
+  ["8231B336",0x3B93],
+  ["8231B337",0x3B94],
+  ["8231B338",0x3B95],
+  ["8231B339",0x3B96],
+  ["8231B430",0x3B97],
+  ["8231B431",0x3B98],
+  ["8231B432",0x3B99],
+  ["8231B433",0x3B9A],
+  ["8231B434",0x3B9B],
+  ["8231B435",0x3B9C],
+  ["8231B436",0x3B9D],
+  ["8231B437",0x3B9E],
+  ["8231B438",0x3B9F],
+  ["8231B439",0x3BA0],
+  ["8231B530",0x3BA1],
+  ["8231B531",0x3BA2],
+  ["8231B532",0x3BA3],
+  ["8231B533",0x3BA4],
+  ["8231B534",0x3BA5],
+  ["8231B535",0x3BA6],
+  ["8231B536",0x3BA7],
+  ["8231B537",0x3BA8],
+  ["8231B538",0x3BA9],
+  ["8231B539",0x3BAA],
+  ["8231B630",0x3BAB],
+  ["8231B631",0x3BAC],
+  ["8231B632",0x3BAD],
+  ["8231B633",0x3BAE],
+  ["8231B634",0x3BAF],
+  ["8231B635",0x3BB0],
+  ["8231B636",0x3BB1],
+  ["8231B637",0x3BB2],
+  ["8231B638",0x3BB3],
+  ["8231B639",0x3BB4],
+  ["8231B730",0x3BB5],
+  ["8231B731",0x3BB6],
+  ["8231B732",0x3BB7],
+  ["8231B733",0x3BB8],
+  ["8231B734",0x3BB9],
+  ["8231B735",0x3BBA],
+  ["8231B736",0x3BBB],
+  ["8231B737",0x3BBC],
+  ["8231B738",0x3BBD],
+  ["8231B739",0x3BBE],
+  ["8231B830",0x3BBF],
+  ["8231B831",0x3BC0],
+  ["8231B832",0x3BC1],
+  ["8231B833",0x3BC2],
+  ["8231B834",0x3BC3],
+  ["8231B835",0x3BC4],
+  ["8231B836",0x3BC5],
+  ["8231B837",0x3BC6],
+  ["8231B838",0x3BC7],
+  ["8231B839",0x3BC8],
+  ["8231B930",0x3BC9],
+  ["8231B931",0x3BCA],
+  ["8231B932",0x3BCB],
+  ["8231B933",0x3BCC],
+  ["8231B934",0x3BCD],
+  ["8231B935",0x3BCE],
+  ["8231B936",0x3BCF],
+  ["8231B937",0x3BD0],
+  ["8231B938",0x3BD1],
+  ["8231B939",0x3BD2],
+  ["8231BA30",0x3BD3],
+  ["8231BA31",0x3BD4],
+  ["8231BA32",0x3BD5],
+  ["8231BA33",0x3BD6],
+  ["8231BA34",0x3BD7],
+  ["8231BA35",0x3BD8],
+  ["8231BA36",0x3BD9],
+  ["8231BA37",0x3BDA],
+  ["8231BA38",0x3BDB],
+  ["8231BA39",0x3BDC],
+  ["8231BB30",0x3BDD],
+  ["8231BB31",0x3BDE],
+  ["8231BB32",0x3BDF],
+  ["8231BB33",0x3BE0],
+  ["8231BB34",0x3BE1],
+  ["8231BB35",0x3BE2],
+  ["8231BB36",0x3BE3],
+  ["8231BB37",0x3BE4],
+  ["8231BB38",0x3BE5],
+  ["8231BB39",0x3BE6],
+  ["8231BC30",0x3BE7],
+  ["8231BC31",0x3BE8],
+  ["8231BC32",0x3BE9],
+  ["8231BC33",0x3BEA],
+  ["8231BC34",0x3BEB],
+  ["8231BC35",0x3BEC],
+  ["8231BC36",0x3BED],
+  ["8231BC37",0x3BEE],
+  ["8231BC38",0x3BEF],
+  ["8231BC39",0x3BF0],
+  ["8231BD30",0x3BF1],
+  ["8231BD31",0x3BF2],
+  ["8231BD32",0x3BF3],
+  ["8231BD33",0x3BF4],
+  ["8231BD34",0x3BF5],
+  ["8231BD35",0x3BF6],
+  ["8231BD36",0x3BF7],
+  ["8231BD37",0x3BF8],
+  ["8231BD38",0x3BF9],
+  ["8231BD39",0x3BFA],
+  ["8231BE30",0x3BFB],
+  ["8231BE31",0x3BFC],
+  ["8231BE32",0x3BFD],
+  ["8231BE33",0x3BFE],
+  ["8231BE34",0x3BFF],
+  ["8231BE35",0x3C00],
+  ["8231BE36",0x3C01],
+  ["8231BE37",0x3C02],
+  ["8231BE38",0x3C03],
+  ["8231BE39",0x3C04],
+  ["8231BF30",0x3C05],
+  ["8231BF31",0x3C06],
+  ["8231BF32",0x3C07],
+  ["8231BF33",0x3C08],
+  ["8231BF34",0x3C09],
+  ["8231BF35",0x3C0A],
+  ["8231BF36",0x3C0B],
+  ["8231BF37",0x3C0C],
+  ["8231BF38",0x3C0D],
+  ["8231BF39",0x3C0E],
+  ["8231C030",0x3C0F],
+  ["8231C031",0x3C10],
+  ["8231C032",0x3C11],
+  ["8231C033",0x3C12],
+  ["8231C034",0x3C13],
+  ["8231C035",0x3C14],
+  ["8231C036",0x3C15],
+  ["8231C037",0x3C16],
+  ["8231C038",0x3C17],
+  ["8231C039",0x3C18],
+  ["8231C130",0x3C19],
+  ["8231C131",0x3C1A],
+  ["8231C132",0x3C1B],
+  ["8231C133",0x3C1C],
+  ["8231C134",0x3C1D],
+  ["8231C135",0x3C1E],
+  ["8231C136",0x3C1F],
+  ["8231C137",0x3C20],
+  ["8231C138",0x3C21],
+  ["8231C139",0x3C22],
+  ["8231C230",0x3C23],
+  ["8231C231",0x3C24],
+  ["8231C232",0x3C25],
+  ["8231C233",0x3C26],
+  ["8231C234",0x3C27],
+  ["8231C235",0x3C28],
+  ["8231C236",0x3C29],
+  ["8231C237",0x3C2A],
+  ["8231C238",0x3C2B],
+  ["8231C239",0x3C2C],
+  ["8231C330",0x3C2D],
+  ["8231C331",0x3C2E],
+  ["8231C332",0x3C2F],
+  ["8231C333",0x3C30],
+  ["8231C334",0x3C31],
+  ["8231C335",0x3C32],
+  ["8231C336",0x3C33],
+  ["8231C337",0x3C34],
+  ["8231C338",0x3C35],
+  ["8231C339",0x3C36],
+  ["8231C430",0x3C37],
+  ["8231C431",0x3C38],
+  ["8231C432",0x3C39],
+  ["8231C433",0x3C3A],
+  ["8231C434",0x3C3B],
+  ["8231C435",0x3C3C],
+  ["8231C436",0x3C3D],
+  ["8231C437",0x3C3E],
+  ["8231C438",0x3C3F],
+  ["8231C439",0x3C40],
+  ["8231C530",0x3C41],
+  ["8231C531",0x3C42],
+  ["8231C532",0x3C43],
+  ["8231C533",0x3C44],
+  ["8231C534",0x3C45],
+  ["8231C535",0x3C46],
+  ["8231C536",0x3C47],
+  ["8231C537",0x3C48],
+  ["8231C538",0x3C49],
+  ["8231C539",0x3C4A],
+  ["8231C630",0x3C4B],
+  ["8231C631",0x3C4C],
+  ["8231C632",0x3C4D],
+  ["8231C633",0x3C4E],
+  ["8231C634",0x3C4F],
+  ["8231C635",0x3C50],
+  ["8231C636",0x3C51],
+  ["8231C637",0x3C52],
+  ["8231C638",0x3C53],
+  ["8231C639",0x3C54],
+  ["8231C730",0x3C55],
+  ["8231C731",0x3C56],
+  ["8231C732",0x3C57],
+  ["8231C733",0x3C58],
+  ["8231C734",0x3C59],
+  ["8231C735",0x3C5A],
+  ["8231C736",0x3C5B],
+  ["8231C737",0x3C5C],
+  ["8231C738",0x3C5D],
+  ["8231C739",0x3C5E],
+  ["8231C830",0x3C5F],
+  ["8231C831",0x3C60],
+  ["8231C832",0x3C61],
+  ["8231C833",0x3C62],
+  ["8231C834",0x3C63],
+  ["8231C835",0x3C64],
+  ["8231C836",0x3C65],
+  ["8231C837",0x3C66],
+  ["8231C838",0x3C67],
+  ["8231C839",0x3C68],
+  ["8231C930",0x3C69],
+  ["8231C931",0x3C6A],
+  ["8231C932",0x3C6B],
+  ["8231C933",0x3C6C],
+  ["8231C934",0x3C6D],
+  ["FE69",0x3C6E],
+  ["8231C935",0x3C6F],
+  ["8231C936",0x3C70],
+  ["8231C937",0x3C71],
+  ["8231C938",0x3C72],
+  ["8231C939",0x3C73],
+  ["8231CA30",0x3C74],
+  ["8231CA31",0x3C75],
+  ["8231CA32",0x3C76],
+  ["8231CA33",0x3C77],
+  ["8231CA34",0x3C78],
+  ["8231CA35",0x3C79],
+  ["8231CA36",0x3C7A],
+  ["8231CA37",0x3C7B],
+  ["8231CA38",0x3C7C],
+  ["8231CA39",0x3C7D],
+  ["8231CB30",0x3C7E],
+  ["8231CB31",0x3C7F],
+  ["8231CB32",0x3C80],
+  ["8231CB33",0x3C81],
+  ["8231CB34",0x3C82],
+  ["8231CB35",0x3C83],
+  ["8231CB36",0x3C84],
+  ["8231CB37",0x3C85],
+  ["8231CB38",0x3C86],
+  ["8231CB39",0x3C87],
+  ["8231CC30",0x3C88],
+  ["8231CC31",0x3C89],
+  ["8231CC32",0x3C8A],
+  ["8231CC33",0x3C8B],
+  ["8231CC34",0x3C8C],
+  ["8231CC35",0x3C8D],
+  ["8231CC36",0x3C8E],
+  ["8231CC37",0x3C8F],
+  ["8231CC38",0x3C90],
+  ["8231CC39",0x3C91],
+  ["8231CD30",0x3C92],
+  ["8231CD31",0x3C93],
+  ["8231CD32",0x3C94],
+  ["8231CD33",0x3C95],
+  ["8231CD34",0x3C96],
+  ["8231CD35",0x3C97],
+  ["8231CD36",0x3C98],
+  ["8231CD37",0x3C99],
+  ["8231CD38",0x3C9A],
+  ["8231CD39",0x3C9B],
+  ["8231CE30",0x3C9C],
+  ["8231CE31",0x3C9D],
+  ["8231CE32",0x3C9E],
+  ["8231CE33",0x3C9F],
+  ["8231CE34",0x3CA0],
+  ["8231CE35",0x3CA1],
+  ["8231CE36",0x3CA2],
+  ["8231CE37",0x3CA3],
+  ["8231CE38",0x3CA4],
+  ["8231CE39",0x3CA5],
+  ["8231CF30",0x3CA6],
+  ["8231CF31",0x3CA7],
+  ["8231CF32",0x3CA8],
+  ["8231CF33",0x3CA9],
+  ["8231CF34",0x3CAA],
+  ["8231CF35",0x3CAB],
+  ["8231CF36",0x3CAC],
+  ["8231CF37",0x3CAD],
+  ["8231CF38",0x3CAE],
+  ["8231CF39",0x3CAF],
+  ["8231D030",0x3CB0],
+  ["8231D031",0x3CB1],
+  ["8231D032",0x3CB2],
+  ["8231D033",0x3CB3],
+  ["8231D034",0x3CB4],
+  ["8231D035",0x3CB5],
+  ["8231D036",0x3CB6],
+  ["8231D037",0x3CB7],
+  ["8231D038",0x3CB8],
+  ["8231D039",0x3CB9],
+  ["8231D130",0x3CBA],
+  ["8231D131",0x3CBB],
+  ["8231D132",0x3CBC],
+  ["8231D133",0x3CBD],
+  ["8231D134",0x3CBE],
+  ["8231D135",0x3CBF],
+  ["8231D136",0x3CC0],
+  ["8231D137",0x3CC1],
+  ["8231D138",0x3CC2],
+  ["8231D139",0x3CC3],
+  ["8231D230",0x3CC4],
+  ["8231D231",0x3CC5],
+  ["8231D232",0x3CC6],
+  ["8231D233",0x3CC7],
+  ["8231D234",0x3CC8],
+  ["8231D235",0x3CC9],
+  ["8231D236",0x3CCA],
+  ["8231D237",0x3CCB],
+  ["8231D238",0x3CCC],
+  ["8231D239",0x3CCD],
+  ["8231D330",0x3CCE],
+  ["8231D331",0x3CCF],
+  ["8231D332",0x3CD0],
+  ["8231D333",0x3CD1],
+  ["8231D334",0x3CD2],
+  ["8231D335",0x3CD3],
+  ["8231D336",0x3CD4],
+  ["8231D337",0x3CD5],
+  ["8231D338",0x3CD6],
+  ["8231D339",0x3CD7],
+  ["8231D430",0x3CD8],
+  ["8231D431",0x3CD9],
+  ["8231D432",0x3CDA],
+  ["8231D433",0x3CDB],
+  ["8231D434",0x3CDC],
+  ["8231D435",0x3CDD],
+  ["8231D436",0x3CDE],
+  ["8231D437",0x3CDF],
+  ["FE6A",0x3CE0],
+  ["8231D438",0x3CE1],
+  ["8231D439",0x3CE2],
+  ["8231D530",0x3CE3],
+  ["8231D531",0x3CE4],
+  ["8231D532",0x3CE5],
+  ["8231D533",0x3CE6],
+  ["8231D534",0x3CE7],
+  ["8231D535",0x3CE8],
+  ["8231D536",0x3CE9],
+  ["8231D537",0x3CEA],
+  ["8231D538",0x3CEB],
+  ["8231D539",0x3CEC],
+  ["8231D630",0x3CED],
+  ["8231D631",0x3CEE],
+  ["8231D632",0x3CEF],
+  ["8231D633",0x3CF0],
+  ["8231D634",0x3CF1],
+  ["8231D635",0x3CF2],
+  ["8231D636",0x3CF3],
+  ["8231D637",0x3CF4],
+  ["8231D638",0x3CF5],
+  ["8231D639",0x3CF6],
+  ["8231D730",0x3CF7],
+  ["8231D731",0x3CF8],
+  ["8231D732",0x3CF9],
+  ["8231D733",0x3CFA],
+  ["8231D734",0x3CFB],
+  ["8231D735",0x3CFC],
+  ["8231D736",0x3CFD],
+  ["8231D737",0x3CFE],
+  ["8231D738",0x3CFF],
+  ["8231D739",0x3D00],
+  ["8231D830",0x3D01],
+  ["8231D831",0x3D02],
+  ["8231D832",0x3D03],
+  ["8231D833",0x3D04],
+  ["8231D834",0x3D05],
+  ["8231D835",0x3D06],
+  ["8231D836",0x3D07],
+  ["8231D837",0x3D08],
+  ["8231D838",0x3D09],
+  ["8231D839",0x3D0A],
+  ["8231D930",0x3D0B],
+  ["8231D931",0x3D0C],
+  ["8231D932",0x3D0D],
+  ["8231D933",0x3D0E],
+  ["8231D934",0x3D0F],
+  ["8231D935",0x3D10],
+  ["8231D936",0x3D11],
+  ["8231D937",0x3D12],
+  ["8231D938",0x3D13],
+  ["8231D939",0x3D14],
+  ["8231DA30",0x3D15],
+  ["8231DA31",0x3D16],
+  ["8231DA32",0x3D17],
+  ["8231DA33",0x3D18],
+  ["8231DA34",0x3D19],
+  ["8231DA35",0x3D1A],
+  ["8231DA36",0x3D1B],
+  ["8231DA37",0x3D1C],
+  ["8231DA38",0x3D1D],
+  ["8231DA39",0x3D1E],
+  ["8231DB30",0x3D1F],
+  ["8231DB31",0x3D20],
+  ["8231DB32",0x3D21],
+  ["8231DB33",0x3D22],
+  ["8231DB34",0x3D23],
+  ["8231DB35",0x3D24],
+  ["8231DB36",0x3D25],
+  ["8231DB37",0x3D26],
+  ["8231DB38",0x3D27],
+  ["8231DB39",0x3D28],
+  ["8231DC30",0x3D29],
+  ["8231DC31",0x3D2A],
+  ["8231DC32",0x3D2B],
+  ["8231DC33",0x3D2C],
+  ["8231DC34",0x3D2D],
+  ["8231DC35",0x3D2E],
+  ["8231DC36",0x3D2F],
+  ["8231DC37",0x3D30],
+  ["8231DC38",0x3D31],
+  ["8231DC39",0x3D32],
+  ["8231DD30",0x3D33],
+  ["8231DD31",0x3D34],
+  ["8231DD32",0x3D35],
+  ["8231DD33",0x3D36],
+  ["8231DD34",0x3D37],
+  ["8231DD35",0x3D38],
+  ["8231DD36",0x3D39],
+  ["8231DD37",0x3D3A],
+  ["8231DD38",0x3D3B],
+  ["8231DD39",0x3D3C],
+  ["8231DE30",0x3D3D],
+  ["8231DE31",0x3D3E],
+  ["8231DE32",0x3D3F],
+  ["8231DE33",0x3D40],
+  ["8231DE34",0x3D41],
+  ["8231DE35",0x3D42],
+  ["8231DE36",0x3D43],
+  ["8231DE37",0x3D44],
+  ["8231DE38",0x3D45],
+  ["8231DE39",0x3D46],
+  ["8231DF30",0x3D47],
+  ["8231DF31",0x3D48],
+  ["8231DF32",0x3D49],
+  ["8231DF33",0x3D4A],
+  ["8231DF34",0x3D4B],
+  ["8231DF35",0x3D4C],
+  ["8231DF36",0x3D4D],
+  ["8231DF37",0x3D4E],
+  ["8231DF38",0x3D4F],
+  ["8231DF39",0x3D50],
+  ["8231E030",0x3D51],
+  ["8231E031",0x3D52],
+  ["8231E032",0x3D53],
+  ["8231E033",0x3D54],
+  ["8231E034",0x3D55],
+  ["8231E035",0x3D56],
+  ["8231E036",0x3D57],
+  ["8231E037",0x3D58],
+  ["8231E038",0x3D59],
+  ["8231E039",0x3D5A],
+  ["8231E130",0x3D5B],
+  ["8231E131",0x3D5C],
+  ["8231E132",0x3D5D],
+  ["8231E133",0x3D5E],
+  ["8231E134",0x3D5F],
+  ["8231E135",0x3D60],
+  ["8231E136",0x3D61],
+  ["8231E137",0x3D62],
+  ["8231E138",0x3D63],
+  ["8231E139",0x3D64],
+  ["8231E230",0x3D65],
+  ["8231E231",0x3D66],
+  ["8231E232",0x3D67],
+  ["8231E233",0x3D68],
+  ["8231E234",0x3D69],
+  ["8231E235",0x3D6A],
+  ["8231E236",0x3D6B],
+  ["8231E237",0x3D6C],
+  ["8231E238",0x3D6D],
+  ["8231E239",0x3D6E],
+  ["8231E330",0x3D6F],
+  ["8231E331",0x3D70],
+  ["8231E332",0x3D71],
+  ["8231E333",0x3D72],
+  ["8231E334",0x3D73],
+  ["8231E335",0x3D74],
+  ["8231E336",0x3D75],
+  ["8231E337",0x3D76],
+  ["8231E338",0x3D77],
+  ["8231E339",0x3D78],
+  ["8231E430",0x3D79],
+  ["8231E431",0x3D7A],
+  ["8231E432",0x3D7B],
+  ["8231E433",0x3D7C],
+  ["8231E434",0x3D7D],
+  ["8231E435",0x3D7E],
+  ["8231E436",0x3D7F],
+  ["8231E437",0x3D80],
+  ["8231E438",0x3D81],
+  ["8231E439",0x3D82],
+  ["8231E530",0x3D83],
+  ["8231E531",0x3D84],
+  ["8231E532",0x3D85],
+  ["8231E533",0x3D86],
+  ["8231E534",0x3D87],
+  ["8231E535",0x3D88],
+  ["8231E536",0x3D89],
+  ["8231E537",0x3D8A],
+  ["8231E538",0x3D8B],
+  ["8231E539",0x3D8C],
+  ["8231E630",0x3D8D],
+  ["8231E631",0x3D8E],
+  ["8231E632",0x3D8F],
+  ["8231E633",0x3D90],
+  ["8231E634",0x3D91],
+  ["8231E635",0x3D92],
+  ["8231E636",0x3D93],
+  ["8231E637",0x3D94],
+  ["8231E638",0x3D95],
+  ["8231E639",0x3D96],
+  ["8231E730",0x3D97],
+  ["8231E731",0x3D98],
+  ["8231E732",0x3D99],
+  ["8231E733",0x3D9A],
+  ["8231E734",0x3D9B],
+  ["8231E735",0x3D9C],
+  ["8231E736",0x3D9D],
+  ["8231E737",0x3D9E],
+  ["8231E738",0x3D9F],
+  ["8231E739",0x3DA0],
+  ["8231E830",0x3DA1],
+  ["8231E831",0x3DA2],
+  ["8231E832",0x3DA3],
+  ["8231E833",0x3DA4],
+  ["8231E834",0x3DA5],
+  ["8231E835",0x3DA6],
+  ["8231E836",0x3DA7],
+  ["8231E837",0x3DA8],
+  ["8231E838",0x3DA9],
+  ["8231E839",0x3DAA],
+  ["8231E930",0x3DAB],
+  ["8231E931",0x3DAC],
+  ["8231E932",0x3DAD],
+  ["8231E933",0x3DAE],
+  ["8231E934",0x3DAF],
+  ["8231E935",0x3DB0],
+  ["8231E936",0x3DB1],
+  ["8231E937",0x3DB2],
+  ["8231E938",0x3DB3],
+  ["8231E939",0x3DB4],
+  ["8231EA30",0x3DB5],
+  ["8231EA31",0x3DB6],
+  ["8231EA32",0x3DB7],
+  ["8231EA33",0x3DB8],
+  ["8231EA34",0x3DB9],
+  ["8231EA35",0x3DBA],
+  ["8231EA36",0x3DBB],
+  ["8231EA37",0x3DBC],
+  ["8231EA38",0x3DBD],
+  ["8231EA39",0x3DBE],
+  ["8231EB30",0x3DBF],
+  ["8231EB31",0x3DC0],
+  ["8231EB32",0x3DC1],
+  ["8231EB33",0x3DC2],
+  ["8231EB34",0x3DC3],
+  ["8231EB35",0x3DC4],
+  ["8231EB36",0x3DC5],
+  ["8231EB37",0x3DC6],
+  ["8231EB38",0x3DC7],
+  ["8231EB39",0x3DC8],
+  ["8231EC30",0x3DC9],
+  ["8231EC31",0x3DCA],
+  ["8231EC32",0x3DCB],
+  ["8231EC33",0x3DCC],
+  ["8231EC34",0x3DCD],
+  ["8231EC35",0x3DCE],
+  ["8231EC36",0x3DCF],
+  ["8231EC37",0x3DD0],
+  ["8231EC38",0x3DD1],
+  ["8231EC39",0x3DD2],
+  ["8231ED30",0x3DD3],
+  ["8231ED31",0x3DD4],
+  ["8231ED32",0x3DD5],
+  ["8231ED33",0x3DD6],
+  ["8231ED34",0x3DD7],
+  ["8231ED35",0x3DD8],
+  ["8231ED36",0x3DD9],
+  ["8231ED37",0x3DDA],
+  ["8231ED38",0x3DDB],
+  ["8231ED39",0x3DDC],
+  ["8231EE30",0x3DDD],
+  ["8231EE31",0x3DDE],
+  ["8231EE32",0x3DDF],
+  ["8231EE33",0x3DE0],
+  ["8231EE34",0x3DE1],
+  ["8231EE35",0x3DE2],
+  ["8231EE36",0x3DE3],
+  ["8231EE37",0x3DE4],
+  ["8231EE38",0x3DE5],
+  ["8231EE39",0x3DE6],
+  ["8231EF30",0x3DE7],
+  ["8231EF31",0x3DE8],
+  ["8231EF32",0x3DE9],
+  ["8231EF33",0x3DEA],
+  ["8231EF34",0x3DEB],
+  ["8231EF35",0x3DEC],
+  ["8231EF36",0x3DED],
+  ["8231EF37",0x3DEE],
+  ["8231EF38",0x3DEF],
+  ["8231EF39",0x3DF0],
+  ["8231F030",0x3DF1],
+  ["8231F031",0x3DF2],
+  ["8231F032",0x3DF3],
+  ["8231F033",0x3DF4],
+  ["8231F034",0x3DF5],
+  ["8231F035",0x3DF6],
+  ["8231F036",0x3DF7],
+  ["8231F037",0x3DF8],
+  ["8231F038",0x3DF9],
+  ["8231F039",0x3DFA],
+  ["8231F130",0x3DFB],
+  ["8231F131",0x3DFC],
+  ["8231F132",0x3DFD],
+  ["8231F133",0x3DFE],
+  ["8231F134",0x3DFF],
+  ["8231F135",0x3E00],
+  ["8231F136",0x3E01],
+  ["8231F137",0x3E02],
+  ["8231F138",0x3E03],
+  ["8231F139",0x3E04],
+  ["8231F230",0x3E05],
+  ["8231F231",0x3E06],
+  ["8231F232",0x3E07],
+  ["8231F233",0x3E08],
+  ["8231F234",0x3E09],
+  ["8231F235",0x3E0A],
+  ["8231F236",0x3E0B],
+  ["8231F237",0x3E0C],
+  ["8231F238",0x3E0D],
+  ["8231F239",0x3E0E],
+  ["8231F330",0x3E0F],
+  ["8231F331",0x3E10],
+  ["8231F332",0x3E11],
+  ["8231F333",0x3E12],
+  ["8231F334",0x3E13],
+  ["8231F335",0x3E14],
+  ["8231F336",0x3E15],
+  ["8231F337",0x3E16],
+  ["8231F338",0x3E17],
+  ["8231F339",0x3E18],
+  ["8231F430",0x3E19],
+  ["8231F431",0x3E1A],
+  ["8231F432",0x3E1B],
+  ["8231F433",0x3E1C],
+  ["8231F434",0x3E1D],
+  ["8231F435",0x3E1E],
+  ["8231F436",0x3E1F],
+  ["8231F437",0x3E20],
+  ["8231F438",0x3E21],
+  ["8231F439",0x3E22],
+  ["8231F530",0x3E23],
+  ["8231F531",0x3E24],
+  ["8231F532",0x3E25],
+  ["8231F533",0x3E26],
+  ["8231F534",0x3E27],
+  ["8231F535",0x3E28],
+  ["8231F536",0x3E29],
+  ["8231F537",0x3E2A],
+  ["8231F538",0x3E2B],
+  ["8231F539",0x3E2C],
+  ["8231F630",0x3E2D],
+  ["8231F631",0x3E2E],
+  ["8231F632",0x3E2F],
+  ["8231F633",0x3E30],
+  ["8231F634",0x3E31],
+  ["8231F635",0x3E32],
+  ["8231F636",0x3E33],
+  ["8231F637",0x3E34],
+  ["8231F638",0x3E35],
+  ["8231F639",0x3E36],
+  ["8231F730",0x3E37],
+  ["8231F731",0x3E38],
+  ["8231F732",0x3E39],
+  ["8231F733",0x3E3A],
+  ["8231F734",0x3E3B],
+  ["8231F735",0x3E3C],
+  ["8231F736",0x3E3D],
+  ["8231F737",0x3E3E],
+  ["8231F738",0x3E3F],
+  ["8231F739",0x3E40],
+  ["8231F830",0x3E41],
+  ["8231F831",0x3E42],
+  ["8231F832",0x3E43],
+  ["8231F833",0x3E44],
+  ["8231F834",0x3E45],
+  ["8231F835",0x3E46],
+  ["8231F836",0x3E47],
+  ["8231F837",0x3E48],
+  ["8231F838",0x3E49],
+  ["8231F839",0x3E4A],
+  ["8231F930",0x3E4B],
+  ["8231F931",0x3E4C],
+  ["8231F932",0x3E4D],
+  ["8231F933",0x3E4E],
+  ["8231F934",0x3E4F],
+  ["8231F935",0x3E50],
+  ["8231F936",0x3E51],
+  ["8231F937",0x3E52],
+  ["8231F938",0x3E53],
+  ["8231F939",0x3E54],
+  ["8231FA30",0x3E55],
+  ["8231FA31",0x3E56],
+  ["8231FA32",0x3E57],
+  ["8231FA33",0x3E58],
+  ["8231FA34",0x3E59],
+  ["8231FA35",0x3E5A],
+  ["8231FA36",0x3E5B],
+  ["8231FA37",0x3E5C],
+  ["8231FA38",0x3E5D],
+  ["8231FA39",0x3E5E],
+  ["8231FB30",0x3E5F],
+  ["8231FB31",0x3E60],
+  ["8231FB32",0x3E61],
+  ["8231FB33",0x3E62],
+  ["8231FB34",0x3E63],
+  ["8231FB35",0x3E64],
+  ["8231FB36",0x3E65],
+  ["8231FB37",0x3E66],
+  ["8231FB38",0x3E67],
+  ["8231FB39",0x3E68],
+  ["8231FC30",0x3E69],
+  ["8231FC31",0x3E6A],
+  ["8231FC32",0x3E6B],
+  ["8231FC33",0x3E6C],
+  ["8231FC34",0x3E6D],
+  ["8231FC35",0x3E6E],
+  ["8231FC36",0x3E6F],
+  ["8231FC37",0x3E70],
+  ["8231FC38",0x3E71],
+  ["8231FC39",0x3E72],
+  ["8231FD30",0x3E73],
+  ["8231FD31",0x3E74],
+  ["8231FD32",0x3E75],
+  ["8231FD33",0x3E76],
+  ["8231FD34",0x3E77],
+  ["8231FD35",0x3E78],
+  ["8231FD36",0x3E79],
+  ["8231FD37",0x3E7A],
+  ["8231FD38",0x3E7B],
+  ["8231FD39",0x3E7C],
+  ["8231FE30",0x3E7D],
+  ["8231FE31",0x3E7E],
+  ["8231FE32",0x3E7F],
+  ["8231FE33",0x3E80],
+  ["8231FE34",0x3E81],
+  ["8231FE35",0x3E82],
+  ["8231FE36",0x3E83],
+  ["8231FE37",0x3E84],
+  ["8231FE38",0x3E85],
+  ["8231FE39",0x3E86],
+  ["82328130",0x3E87],
+  ["82328131",0x3E88],
+  ["82328132",0x3E89],
+  ["82328133",0x3E8A],
+  ["82328134",0x3E8B],
+  ["82328135",0x3E8C],
+  ["82328136",0x3E8D],
+  ["82328137",0x3E8E],
+  ["82328138",0x3E8F],
+  ["82328139",0x3E90],
+  ["82328230",0x3E91],
+  ["82328231",0x3E92],
+  ["82328232",0x3E93],
+  ["82328233",0x3E94],
+  ["82328234",0x3E95],
+  ["82328235",0x3E96],
+  ["82328236",0x3E97],
+  ["82328237",0x3E98],
+  ["82328238",0x3E99],
+  ["82328239",0x3E9A],
+  ["82328330",0x3E9B],
+  ["82328331",0x3E9C],
+  ["82328332",0x3E9D],
+  ["82328333",0x3E9E],
+  ["82328334",0x3E9F],
+  ["82328335",0x3EA0],
+  ["82328336",0x3EA1],
+  ["82328337",0x3EA2],
+  ["82328338",0x3EA3],
+  ["82328339",0x3EA4],
+  ["82328430",0x3EA5],
+  ["82328431",0x3EA6],
+  ["82328432",0x3EA7],
+  ["82328433",0x3EA8],
+  ["82328434",0x3EA9],
+  ["82328435",0x3EAA],
+  ["82328436",0x3EAB],
+  ["82328437",0x3EAC],
+  ["82328438",0x3EAD],
+  ["82328439",0x3EAE],
+  ["82328530",0x3EAF],
+  ["82328531",0x3EB0],
+  ["82328532",0x3EB1],
+  ["82328533",0x3EB2],
+  ["82328534",0x3EB3],
+  ["82328535",0x3EB4],
+  ["82328536",0x3EB5],
+  ["82328537",0x3EB6],
+  ["82328538",0x3EB7],
+  ["82328539",0x3EB8],
+  ["82328630",0x3EB9],
+  ["82328631",0x3EBA],
+  ["82328632",0x3EBB],
+  ["82328633",0x3EBC],
+  ["82328634",0x3EBD],
+  ["82328635",0x3EBE],
+  ["82328636",0x3EBF],
+  ["82328637",0x3EC0],
+  ["82328638",0x3EC1],
+  ["82328639",0x3EC2],
+  ["82328730",0x3EC3],
+  ["82328731",0x3EC4],
+  ["82328732",0x3EC5],
+  ["82328733",0x3EC6],
+  ["82328734",0x3EC7],
+  ["82328735",0x3EC8],
+  ["82328736",0x3EC9],
+  ["82328737",0x3ECA],
+  ["82328738",0x3ECB],
+  ["82328739",0x3ECC],
+  ["82328830",0x3ECD],
+  ["82328831",0x3ECE],
+  ["82328832",0x3ECF],
+  ["82328833",0x3ED0],
+  ["82328834",0x3ED1],
+  ["82328835",0x3ED2],
+  ["82328836",0x3ED3],
+  ["82328837",0x3ED4],
+  ["82328838",0x3ED5],
+  ["82328839",0x3ED6],
+  ["82328930",0x3ED7],
+  ["82328931",0x3ED8],
+  ["82328932",0x3ED9],
+  ["82328933",0x3EDA],
+  ["82328934",0x3EDB],
+  ["82328935",0x3EDC],
+  ["82328936",0x3EDD],
+  ["82328937",0x3EDE],
+  ["82328938",0x3EDF],
+  ["82328939",0x3EE0],
+  ["82328A30",0x3EE1],
+  ["82328A31",0x3EE2],
+  ["82328A32",0x3EE3],
+  ["82328A33",0x3EE4],
+  ["82328A34",0x3EE5],
+  ["82328A35",0x3EE6],
+  ["82328A36",0x3EE7],
+  ["82328A37",0x3EE8],
+  ["82328A38",0x3EE9],
+  ["82328A39",0x3EEA],
+  ["82328B30",0x3EEB],
+  ["82328B31",0x3EEC],
+  ["82328B32",0x3EED],
+  ["82328B33",0x3EEE],
+  ["82328B34",0x3EEF],
+  ["82328B35",0x3EF0],
+  ["82328B36",0x3EF1],
+  ["82328B37",0x3EF2],
+  ["82328B38",0x3EF3],
+  ["82328B39",0x3EF4],
+  ["82328C30",0x3EF5],
+  ["82328C31",0x3EF6],
+  ["82328C32",0x3EF7],
+  ["82328C33",0x3EF8],
+  ["82328C34",0x3EF9],
+  ["82328C35",0x3EFA],
+  ["82328C36",0x3EFB],
+  ["82328C37",0x3EFC],
+  ["82328C38",0x3EFD],
+  ["82328C39",0x3EFE],
+  ["82328D30",0x3EFF],
+  ["82328D31",0x3F00],
+  ["82328D32",0x3F01],
+  ["82328D33",0x3F02],
+  ["82328D34",0x3F03],
+  ["82328D35",0x3F04],
+  ["82328D36",0x3F05],
+  ["82328D37",0x3F06],
+  ["82328D38",0x3F07],
+  ["82328D39",0x3F08],
+  ["82328E30",0x3F09],
+  ["82328E31",0x3F0A],
+  ["82328E32",0x3F0B],
+  ["82328E33",0x3F0C],
+  ["82328E34",0x3F0D],
+  ["82328E35",0x3F0E],
+  ["82328E36",0x3F0F],
+  ["82328E37",0x3F10],
+  ["82328E38",0x3F11],
+  ["82328E39",0x3F12],
+  ["82328F30",0x3F13],
+  ["82328F31",0x3F14],
+  ["82328F32",0x3F15],
+  ["82328F33",0x3F16],
+  ["82328F34",0x3F17],
+  ["82328F35",0x3F18],
+  ["82328F36",0x3F19],
+  ["82328F37",0x3F1A],
+  ["82328F38",0x3F1B],
+  ["82328F39",0x3F1C],
+  ["82329030",0x3F1D],
+  ["82329031",0x3F1E],
+  ["82329032",0x3F1F],
+  ["82329033",0x3F20],
+  ["82329034",0x3F21],
+  ["82329035",0x3F22],
+  ["82329036",0x3F23],
+  ["82329037",0x3F24],
+  ["82329038",0x3F25],
+  ["82329039",0x3F26],
+  ["82329130",0x3F27],
+  ["82329131",0x3F28],
+  ["82329132",0x3F29],
+  ["82329133",0x3F2A],
+  ["82329134",0x3F2B],
+  ["82329135",0x3F2C],
+  ["82329136",0x3F2D],
+  ["82329137",0x3F2E],
+  ["82329138",0x3F2F],
+  ["82329139",0x3F30],
+  ["82329230",0x3F31],
+  ["82329231",0x3F32],
+  ["82329232",0x3F33],
+  ["82329233",0x3F34],
+  ["82329234",0x3F35],
+  ["82329235",0x3F36],
+  ["82329236",0x3F37],
+  ["82329237",0x3F38],
+  ["82329238",0x3F39],
+  ["82329239",0x3F3A],
+  ["82329330",0x3F3B],
+  ["82329331",0x3F3C],
+  ["82329332",0x3F3D],
+  ["82329333",0x3F3E],
+  ["82329334",0x3F3F],
+  ["82329335",0x3F40],
+  ["82329336",0x3F41],
+  ["82329337",0x3F42],
+  ["82329338",0x3F43],
+  ["82329339",0x3F44],
+  ["82329430",0x3F45],
+  ["82329431",0x3F46],
+  ["82329432",0x3F47],
+  ["82329433",0x3F48],
+  ["82329434",0x3F49],
+  ["82329435",0x3F4A],
+  ["82329436",0x3F4B],
+  ["82329437",0x3F4C],
+  ["82329438",0x3F4D],
+  ["82329439",0x3F4E],
+  ["82329530",0x3F4F],
+  ["82329531",0x3F50],
+  ["82329532",0x3F51],
+  ["82329533",0x3F52],
+  ["82329534",0x3F53],
+  ["82329535",0x3F54],
+  ["82329536",0x3F55],
+  ["82329537",0x3F56],
+  ["82329538",0x3F57],
+  ["82329539",0x3F58],
+  ["82329630",0x3F59],
+  ["82329631",0x3F5A],
+  ["82329632",0x3F5B],
+  ["82329633",0x3F5C],
+  ["82329634",0x3F5D],
+  ["82329635",0x3F5E],
+  ["82329636",0x3F5F],
+  ["82329637",0x3F60],
+  ["82329638",0x3F61],
+  ["82329639",0x3F62],
+  ["82329730",0x3F63],
+  ["82329731",0x3F64],
+  ["82329732",0x3F65],
+  ["82329733",0x3F66],
+  ["82329734",0x3F67],
+  ["82329735",0x3F68],
+  ["82329736",0x3F69],
+  ["82329737",0x3F6A],
+  ["82329738",0x3F6B],
+  ["82329739",0x3F6C],
+  ["82329830",0x3F6D],
+  ["82329831",0x3F6E],
+  ["82329832",0x3F6F],
+  ["82329833",0x3F70],
+  ["82329834",0x3F71],
+  ["82329835",0x3F72],
+  ["82329836",0x3F73],
+  ["82329837",0x3F74],
+  ["82329838",0x3F75],
+  ["82329839",0x3F76],
+  ["82329930",0x3F77],
+  ["82329931",0x3F78],
+  ["82329932",0x3F79],
+  ["82329933",0x3F7A],
+  ["82329934",0x3F7B],
+  ["82329935",0x3F7C],
+  ["82329936",0x3F7D],
+  ["82329937",0x3F7E],
+  ["82329938",0x3F7F],
+  ["82329939",0x3F80],
+  ["82329A30",0x3F81],
+  ["82329A31",0x3F82],
+  ["82329A32",0x3F83],
+  ["82329A33",0x3F84],
+  ["82329A34",0x3F85],
+  ["82329A35",0x3F86],
+  ["82329A36",0x3F87],
+  ["82329A37",0x3F88],
+  ["82329A38",0x3F89],
+  ["82329A39",0x3F8A],
+  ["82329B30",0x3F8B],
+  ["82329B31",0x3F8C],
+  ["82329B32",0x3F8D],
+  ["82329B33",0x3F8E],
+  ["82329B34",0x3F8F],
+  ["82329B35",0x3F90],
+  ["82329B36",0x3F91],
+  ["82329B37",0x3F92],
+  ["82329B38",0x3F93],
+  ["82329B39",0x3F94],
+  ["82329C30",0x3F95],
+  ["82329C31",0x3F96],
+  ["82329C32",0x3F97],
+  ["82329C33",0x3F98],
+  ["82329C34",0x3F99],
+  ["82329C35",0x3F9A],
+  ["82329C36",0x3F9B],
+  ["82329C37",0x3F9C],
+  ["82329C38",0x3F9D],
+  ["82329C39",0x3F9E],
+  ["82329D30",0x3F9F],
+  ["82329D31",0x3FA0],
+  ["82329D32",0x3FA1],
+  ["82329D33",0x3FA2],
+  ["82329D34",0x3FA3],
+  ["82329D35",0x3FA4],
+  ["82329D36",0x3FA5],
+  ["82329D37",0x3FA6],
+  ["82329D38",0x3FA7],
+  ["82329D39",0x3FA8],
+  ["82329E30",0x3FA9],
+  ["82329E31",0x3FAA],
+  ["82329E32",0x3FAB],
+  ["82329E33",0x3FAC],
+  ["82329E34",0x3FAD],
+  ["82329E35",0x3FAE],
+  ["82329E36",0x3FAF],
+  ["82329E37",0x3FB0],
+  ["82329E38",0x3FB1],
+  ["82329E39",0x3FB2],
+  ["82329F30",0x3FB3],
+  ["82329F31",0x3FB4],
+  ["82329F32",0x3FB5],
+  ["82329F33",0x3FB6],
+  ["82329F34",0x3FB7],
+  ["82329F35",0x3FB8],
+  ["82329F36",0x3FB9],
+  ["82329F37",0x3FBA],
+  ["82329F38",0x3FBB],
+  ["82329F39",0x3FBC],
+  ["8232A030",0x3FBD],
+  ["8232A031",0x3FBE],
+  ["8232A032",0x3FBF],
+  ["8232A033",0x3FC0],
+  ["8232A034",0x3FC1],
+  ["8232A035",0x3FC2],
+  ["8232A036",0x3FC3],
+  ["8232A037",0x3FC4],
+  ["8232A038",0x3FC5],
+  ["8232A039",0x3FC6],
+  ["8232A130",0x3FC7],
+  ["8232A131",0x3FC8],
+  ["8232A132",0x3FC9],
+  ["8232A133",0x3FCA],
+  ["8232A134",0x3FCB],
+  ["8232A135",0x3FCC],
+  ["8232A136",0x3FCD],
+  ["8232A137",0x3FCE],
+  ["8232A138",0x3FCF],
+  ["8232A139",0x3FD0],
+  ["8232A230",0x3FD1],
+  ["8232A231",0x3FD2],
+  ["8232A232",0x3FD3],
+  ["8232A233",0x3FD4],
+  ["8232A234",0x3FD5],
+  ["8232A235",0x3FD6],
+  ["8232A236",0x3FD7],
+  ["8232A237",0x3FD8],
+  ["8232A238",0x3FD9],
+  ["8232A239",0x3FDA],
+  ["8232A330",0x3FDB],
+  ["8232A331",0x3FDC],
+  ["8232A332",0x3FDD],
+  ["8232A333",0x3FDE],
+  ["8232A334",0x3FDF],
+  ["8232A335",0x3FE0],
+  ["8232A336",0x3FE1],
+  ["8232A337",0x3FE2],
+  ["8232A338",0x3FE3],
+  ["8232A339",0x3FE4],
+  ["8232A430",0x3FE5],
+  ["8232A431",0x3FE6],
+  ["8232A432",0x3FE7],
+  ["8232A433",0x3FE8],
+  ["8232A434",0x3FE9],
+  ["8232A435",0x3FEA],
+  ["8232A436",0x3FEB],
+  ["8232A437",0x3FEC],
+  ["8232A438",0x3FED],
+  ["8232A439",0x3FEE],
+  ["8232A530",0x3FEF],
+  ["8232A531",0x3FF0],
+  ["8232A532",0x3FF1],
+  ["8232A533",0x3FF2],
+  ["8232A534",0x3FF3],
+  ["8232A535",0x3FF4],
+  ["8232A536",0x3FF5],
+  ["8232A537",0x3FF6],
+  ["8232A538",0x3FF7],
+  ["8232A539",0x3FF8],
+  ["8232A630",0x3FF9],
+  ["8232A631",0x3FFA],
+  ["8232A632",0x3FFB],
+  ["8232A633",0x3FFC],
+  ["8232A634",0x3FFD],
+  ["8232A635",0x3FFE],
+  ["8232A636",0x3FFF],
+  ["8232A637",0x4000],
+  ["8232A638",0x4001],
+  ["8232A639",0x4002],
+  ["8232A730",0x4003],
+  ["8232A731",0x4004],
+  ["8232A732",0x4005],
+  ["8232A733",0x4006],
+  ["8232A734",0x4007],
+  ["8232A735",0x4008],
+  ["8232A736",0x4009],
+  ["8232A737",0x400A],
+  ["8232A738",0x400B],
+  ["8232A739",0x400C],
+  ["8232A830",0x400D],
+  ["8232A831",0x400E],
+  ["8232A832",0x400F],
+  ["8232A833",0x4010],
+  ["8232A834",0x4011],
+  ["8232A835",0x4012],
+  ["8232A836",0x4013],
+  ["8232A837",0x4014],
+  ["8232A838",0x4015],
+  ["8232A839",0x4016],
+  ["8232A930",0x4017],
+  ["8232A931",0x4018],
+  ["8232A932",0x4019],
+  ["8232A933",0x401A],
+  ["8232A934",0x401B],
+  ["8232A935",0x401C],
+  ["8232A936",0x401D],
+  ["8232A937",0x401E],
+  ["8232A938",0x401F],
+  ["8232A939",0x4020],
+  ["8232AA30",0x4021],
+  ["8232AA31",0x4022],
+  ["8232AA32",0x4023],
+  ["8232AA33",0x4024],
+  ["8232AA34",0x4025],
+  ["8232AA35",0x4026],
+  ["8232AA36",0x4027],
+  ["8232AA37",0x4028],
+  ["8232AA38",0x4029],
+  ["8232AA39",0x402A],
+  ["8232AB30",0x402B],
+  ["8232AB31",0x402C],
+  ["8232AB32",0x402D],
+  ["8232AB33",0x402E],
+  ["8232AB34",0x402F],
+  ["8232AB35",0x4030],
+  ["8232AB36",0x4031],
+  ["8232AB37",0x4032],
+  ["8232AB38",0x4033],
+  ["8232AB39",0x4034],
+  ["8232AC30",0x4035],
+  ["8232AC31",0x4036],
+  ["8232AC32",0x4037],
+  ["8232AC33",0x4038],
+  ["8232AC34",0x4039],
+  ["8232AC35",0x403A],
+  ["8232AC36",0x403B],
+  ["8232AC37",0x403C],
+  ["8232AC38",0x403D],
+  ["8232AC39",0x403E],
+  ["8232AD30",0x403F],
+  ["8232AD31",0x4040],
+  ["8232AD32",0x4041],
+  ["8232AD33",0x4042],
+  ["8232AD34",0x4043],
+  ["8232AD35",0x4044],
+  ["8232AD36",0x4045],
+  ["8232AD37",0x4046],
+  ["8232AD38",0x4047],
+  ["8232AD39",0x4048],
+  ["8232AE30",0x4049],
+  ["8232AE31",0x404A],
+  ["8232AE32",0x404B],
+  ["8232AE33",0x404C],
+  ["8232AE34",0x404D],
+  ["8232AE35",0x404E],
+  ["8232AE36",0x404F],
+  ["8232AE37",0x4050],
+  ["8232AE38",0x4051],
+  ["8232AE39",0x4052],
+  ["8232AF30",0x4053],
+  ["8232AF31",0x4054],
+  ["8232AF32",0x4055],
+  ["FE6F",0x4056],
+  ["8232AF33",0x4057],
+  ["8232AF34",0x4058],
+  ["8232AF35",0x4059],
+  ["8232AF36",0x405A],
+  ["8232AF37",0x405B],
+  ["8232AF38",0x405C],
+  ["8232AF39",0x405D],
+  ["8232B030",0x405E],
+  ["8232B031",0x405F],
+  ["8232B032",0x4060],
+  ["8232B033",0x4061],
+  ["8232B034",0x4062],
+  ["8232B035",0x4063],
+  ["8232B036",0x4064],
+  ["8232B037",0x4065],
+  ["8232B038",0x4066],
+  ["8232B039",0x4067],
+  ["8232B130",0x4068],
+  ["8232B131",0x4069],
+  ["8232B132",0x406A],
+  ["8232B133",0x406B],
+  ["8232B134",0x406C],
+  ["8232B135",0x406D],
+  ["8232B136",0x406E],
+  ["8232B137",0x406F],
+  ["8232B138",0x4070],
+  ["8232B139",0x4071],
+  ["8232B230",0x4072],
+  ["8232B231",0x4073],
+  ["8232B232",0x4074],
+  ["8232B233",0x4075],
+  ["8232B234",0x4076],
+  ["8232B235",0x4077],
+  ["8232B236",0x4078],
+  ["8232B237",0x4079],
+  ["8232B238",0x407A],
+  ["8232B239",0x407B],
+  ["8232B330",0x407C],
+  ["8232B331",0x407D],
+  ["8232B332",0x407E],
+  ["8232B333",0x407F],
+  ["8232B334",0x4080],
+  ["8232B335",0x4081],
+  ["8232B336",0x4082],
+  ["8232B337",0x4083],
+  ["8232B338",0x4084],
+  ["8232B339",0x4085],
+  ["8232B430",0x4086],
+  ["8232B431",0x4087],
+  ["8232B432",0x4088],
+  ["8232B433",0x4089],
+  ["8232B434",0x408A],
+  ["8232B435",0x408B],
+  ["8232B436",0x408C],
+  ["8232B437",0x408D],
+  ["8232B438",0x408E],
+  ["8232B439",0x408F],
+  ["8232B530",0x4090],
+  ["8232B531",0x4091],
+  ["8232B532",0x4092],
+  ["8232B533",0x4093],
+  ["8232B534",0x4094],
+  ["8232B535",0x4095],
+  ["8232B536",0x4096],
+  ["8232B537",0x4097],
+  ["8232B538",0x4098],
+  ["8232B539",0x4099],
+  ["8232B630",0x409A],
+  ["8232B631",0x409B],
+  ["8232B632",0x409C],
+  ["8232B633",0x409D],
+  ["8232B634",0x409E],
+  ["8232B635",0x409F],
+  ["8232B636",0x40A0],
+  ["8232B637",0x40A1],
+  ["8232B638",0x40A2],
+  ["8232B639",0x40A3],
+  ["8232B730",0x40A4],
+  ["8232B731",0x40A5],
+  ["8232B732",0x40A6],
+  ["8232B733",0x40A7],
+  ["8232B734",0x40A8],
+  ["8232B735",0x40A9],
+  ["8232B736",0x40AA],
+  ["8232B737",0x40AB],
+  ["8232B738",0x40AC],
+  ["8232B739",0x40AD],
+  ["8232B830",0x40AE],
+  ["8232B831",0x40AF],
+  ["8232B832",0x40B0],
+  ["8232B833",0x40B1],
+  ["8232B834",0x40B2],
+  ["8232B835",0x40B3],
+  ["8232B836",0x40B4],
+  ["8232B837",0x40B5],
+  ["8232B838",0x40B6],
+  ["8232B839",0x40B7],
+  ["8232B930",0x40B8],
+  ["8232B931",0x40B9],
+  ["8232B932",0x40BA],
+  ["8232B933",0x40BB],
+  ["8232B934",0x40BC],
+  ["8232B935",0x40BD],
+  ["8232B936",0x40BE],
+  ["8232B937",0x40BF],
+  ["8232B938",0x40C0],
+  ["8232B939",0x40C1],
+  ["8232BA30",0x40C2],
+  ["8232BA31",0x40C3],
+  ["8232BA32",0x40C4],
+  ["8232BA33",0x40C5],
+  ["8232BA34",0x40C6],
+  ["8232BA35",0x40C7],
+  ["8232BA36",0x40C8],
+  ["8232BA37",0x40C9],
+  ["8232BA38",0x40CA],
+  ["8232BA39",0x40CB],
+  ["8232BB30",0x40CC],
+  ["8232BB31",0x40CD],
+  ["8232BB32",0x40CE],
+  ["8232BB33",0x40CF],
+  ["8232BB34",0x40D0],
+  ["8232BB35",0x40D1],
+  ["8232BB36",0x40D2],
+  ["8232BB37",0x40D3],
+  ["8232BB38",0x40D4],
+  ["8232BB39",0x40D5],
+  ["8232BC30",0x40D6],
+  ["8232BC31",0x40D7],
+  ["8232BC32",0x40D8],
+  ["8232BC33",0x40D9],
+  ["8232BC34",0x40DA],
+  ["8232BC35",0x40DB],
+  ["8232BC36",0x40DC],
+  ["8232BC37",0x40DD],
+  ["8232BC38",0x40DE],
+  ["8232BC39",0x40DF],
+  ["8232BD30",0x40E0],
+  ["8232BD31",0x40E1],
+  ["8232BD32",0x40E2],
+  ["8232BD33",0x40E3],
+  ["8232BD34",0x40E4],
+  ["8232BD35",0x40E5],
+  ["8232BD36",0x40E6],
+  ["8232BD37",0x40E7],
+  ["8232BD38",0x40E8],
+  ["8232BD39",0x40E9],
+  ["8232BE30",0x40EA],
+  ["8232BE31",0x40EB],
+  ["8232BE32",0x40EC],
+  ["8232BE33",0x40ED],
+  ["8232BE34",0x40EE],
+  ["8232BE35",0x40EF],
+  ["8232BE36",0x40F0],
+  ["8232BE37",0x40F1],
+  ["8232BE38",0x40F2],
+  ["8232BE39",0x40F3],
+  ["8232BF30",0x40F4],
+  ["8232BF31",0x40F5],
+  ["8232BF32",0x40F6],
+  ["8232BF33",0x40F7],
+  ["8232BF34",0x40F8],
+  ["8232BF35",0x40F9],
+  ["8232BF36",0x40FA],
+  ["8232BF37",0x40FB],
+  ["8232BF38",0x40FC],
+  ["8232BF39",0x40FD],
+  ["8232C030",0x40FE],
+  ["8232C031",0x40FF],
+  ["8232C032",0x4100],
+  ["8232C033",0x4101],
+  ["8232C034",0x4102],
+  ["8232C035",0x4103],
+  ["8232C036",0x4104],
+  ["8232C037",0x4105],
+  ["8232C038",0x4106],
+  ["8232C039",0x4107],
+  ["8232C130",0x4108],
+  ["8232C131",0x4109],
+  ["8232C132",0x410A],
+  ["8232C133",0x410B],
+  ["8232C134",0x410C],
+  ["8232C135",0x410D],
+  ["8232C136",0x410E],
+  ["8232C137",0x410F],
+  ["8232C138",0x4110],
+  ["8232C139",0x4111],
+  ["8232C230",0x4112],
+  ["8232C231",0x4113],
+  ["8232C232",0x4114],
+  ["8232C233",0x4115],
+  ["8232C234",0x4116],
+  ["8232C235",0x4117],
+  ["8232C236",0x4118],
+  ["8232C237",0x4119],
+  ["8232C238",0x411A],
+  ["8232C239",0x411B],
+  ["8232C330",0x411C],
+  ["8232C331",0x411D],
+  ["8232C332",0x411E],
+  ["8232C333",0x411F],
+  ["8232C334",0x4120],
+  ["8232C335",0x4121],
+  ["8232C336",0x4122],
+  ["8232C337",0x4123],
+  ["8232C338",0x4124],
+  ["8232C339",0x4125],
+  ["8232C430",0x4126],
+  ["8232C431",0x4127],
+  ["8232C432",0x4128],
+  ["8232C433",0x4129],
+  ["8232C434",0x412A],
+  ["8232C435",0x412B],
+  ["8232C436",0x412C],
+  ["8232C437",0x412D],
+  ["8232C438",0x412E],
+  ["8232C439",0x412F],
+  ["8232C530",0x4130],
+  ["8232C531",0x4131],
+  ["8232C532",0x4132],
+  ["8232C533",0x4133],
+  ["8232C534",0x4134],
+  ["8232C535",0x4135],
+  ["8232C536",0x4136],
+  ["8232C537",0x4137],
+  ["8232C538",0x4138],
+  ["8232C539",0x4139],
+  ["8232C630",0x413A],
+  ["8232C631",0x413B],
+  ["8232C632",0x413C],
+  ["8232C633",0x413D],
+  ["8232C634",0x413E],
+  ["8232C635",0x413F],
+  ["8232C636",0x4140],
+  ["8232C637",0x4141],
+  ["8232C638",0x4142],
+  ["8232C639",0x4143],
+  ["8232C730",0x4144],
+  ["8232C731",0x4145],
+  ["8232C732",0x4146],
+  ["8232C733",0x4147],
+  ["8232C734",0x4148],
+  ["8232C735",0x4149],
+  ["8232C736",0x414A],
+  ["8232C737",0x414B],
+  ["8232C738",0x414C],
+  ["8232C739",0x414D],
+  ["8232C830",0x414E],
+  ["8232C831",0x414F],
+  ["8232C832",0x4150],
+  ["8232C833",0x4151],
+  ["8232C834",0x4152],
+  ["8232C835",0x4153],
+  ["8232C836",0x4154],
+  ["8232C837",0x4155],
+  ["8232C838",0x4156],
+  ["8232C839",0x4157],
+  ["8232C930",0x4158],
+  ["8232C931",0x4159],
+  ["8232C932",0x415A],
+  ["8232C933",0x415B],
+  ["8232C934",0x415C],
+  ["8232C935",0x415D],
+  ["8232C936",0x415E],
+  ["FE70",0x415F],
+  ["8232C937",0x4160],
+  ["8232C938",0x4161],
+  ["8232C939",0x4162],
+  ["8232CA30",0x4163],
+  ["8232CA31",0x4164],
+  ["8232CA32",0x4165],
+  ["8232CA33",0x4166],
+  ["8232CA34",0x4167],
+  ["8232CA35",0x4168],
+  ["8232CA36",0x4169],
+  ["8232CA37",0x416A],
+  ["8232CA38",0x416B],
+  ["8232CA39",0x416C],
+  ["8232CB30",0x416D],
+  ["8232CB31",0x416E],
+  ["8232CB32",0x416F],
+  ["8232CB33",0x4170],
+  ["8232CB34",0x4171],
+  ["8232CB35",0x4172],
+  ["8232CB36",0x4173],
+  ["8232CB37",0x4174],
+  ["8232CB38",0x4175],
+  ["8232CB39",0x4176],
+  ["8232CC30",0x4177],
+  ["8232CC31",0x4178],
+  ["8232CC32",0x4179],
+  ["8232CC33",0x417A],
+  ["8232CC34",0x417B],
+  ["8232CC35",0x417C],
+  ["8232CC36",0x417D],
+  ["8232CC37",0x417E],
+  ["8232CC38",0x417F],
+  ["8232CC39",0x4180],
+  ["8232CD30",0x4181],
+  ["8232CD31",0x4182],
+  ["8232CD32",0x4183],
+  ["8232CD33",0x4184],
+  ["8232CD34",0x4185],
+  ["8232CD35",0x4186],
+  ["8232CD36",0x4187],
+  ["8232CD37",0x4188],
+  ["8232CD38",0x4189],
+  ["8232CD39",0x418A],
+  ["8232CE30",0x418B],
+  ["8232CE31",0x418C],
+  ["8232CE32",0x418D],
+  ["8232CE33",0x418E],
+  ["8232CE34",0x418F],
+  ["8232CE35",0x4190],
+  ["8232CE36",0x4191],
+  ["8232CE37",0x4192],
+  ["8232CE38",0x4193],
+  ["8232CE39",0x4194],
+  ["8232CF30",0x4195],
+  ["8232CF31",0x4196],
+  ["8232CF32",0x4197],
+  ["8232CF33",0x4198],
+  ["8232CF34",0x4199],
+  ["8232CF35",0x419A],
+  ["8232CF36",0x419B],
+  ["8232CF37",0x419C],
+  ["8232CF38",0x419D],
+  ["8232CF39",0x419E],
+  ["8232D030",0x419F],
+  ["8232D031",0x41A0],
+  ["8232D032",0x41A1],
+  ["8232D033",0x41A2],
+  ["8232D034",0x41A3],
+  ["8232D035",0x41A4],
+  ["8232D036",0x41A5],
+  ["8232D037",0x41A6],
+  ["8232D038",0x41A7],
+  ["8232D039",0x41A8],
+  ["8232D130",0x41A9],
+  ["8232D131",0x41AA],
+  ["8232D132",0x41AB],
+  ["8232D133",0x41AC],
+  ["8232D134",0x41AD],
+  ["8232D135",0x41AE],
+  ["8232D136",0x41AF],
+  ["8232D137",0x41B0],
+  ["8232D138",0x41B1],
+  ["8232D139",0x41B2],
+  ["8232D230",0x41B3],
+  ["8232D231",0x41B4],
+  ["8232D232",0x41B5],
+  ["8232D233",0x41B6],
+  ["8232D234",0x41B7],
+  ["8232D235",0x41B8],
+  ["8232D236",0x41B9],
+  ["8232D237",0x41BA],
+  ["8232D238",0x41BB],
+  ["8232D239",0x41BC],
+  ["8232D330",0x41BD],
+  ["8232D331",0x41BE],
+  ["8232D332",0x41BF],
+  ["8232D333",0x41C0],
+  ["8232D334",0x41C1],
+  ["8232D335",0x41C2],
+  ["8232D336",0x41C3],
+  ["8232D337",0x41C4],
+  ["8232D338",0x41C5],
+  ["8232D339",0x41C6],
+  ["8232D430",0x41C7],
+  ["8232D431",0x41C8],
+  ["8232D432",0x41C9],
+  ["8232D433",0x41CA],
+  ["8232D434",0x41CB],
+  ["8232D435",0x41CC],
+  ["8232D436",0x41CD],
+  ["8232D437",0x41CE],
+  ["8232D438",0x41CF],
+  ["8232D439",0x41D0],
+  ["8232D530",0x41D1],
+  ["8232D531",0x41D2],
+  ["8232D532",0x41D3],
+  ["8232D533",0x41D4],
+  ["8232D534",0x41D5],
+  ["8232D535",0x41D6],
+  ["8232D536",0x41D7],
+  ["8232D537",0x41D8],
+  ["8232D538",0x41D9],
+  ["8232D539",0x41DA],
+  ["8232D630",0x41DB],
+  ["8232D631",0x41DC],
+  ["8232D632",0x41DD],
+  ["8232D633",0x41DE],
+  ["8232D634",0x41DF],
+  ["8232D635",0x41E0],
+  ["8232D636",0x41E1],
+  ["8232D637",0x41E2],
+  ["8232D638",0x41E3],
+  ["8232D639",0x41E4],
+  ["8232D730",0x41E5],
+  ["8232D731",0x41E6],
+  ["8232D732",0x41E7],
+  ["8232D733",0x41E8],
+  ["8232D734",0x41E9],
+  ["8232D735",0x41EA],
+  ["8232D736",0x41EB],
+  ["8232D737",0x41EC],
+  ["8232D738",0x41ED],
+  ["8232D739",0x41EE],
+  ["8232D830",0x41EF],
+  ["8232D831",0x41F0],
+  ["8232D832",0x41F1],
+  ["8232D833",0x41F2],
+  ["8232D834",0x41F3],
+  ["8232D835",0x41F4],
+  ["8232D836",0x41F5],
+  ["8232D837",0x41F6],
+  ["8232D838",0x41F7],
+  ["8232D839",0x41F8],
+  ["8232D930",0x41F9],
+  ["8232D931",0x41FA],
+  ["8232D932",0x41FB],
+  ["8232D933",0x41FC],
+  ["8232D934",0x41FD],
+  ["8232D935",0x41FE],
+  ["8232D936",0x41FF],
+  ["8232D937",0x4200],
+  ["8232D938",0x4201],
+  ["8232D939",0x4202],
+  ["8232DA30",0x4203],
+  ["8232DA31",0x4204],
+  ["8232DA32",0x4205],
+  ["8232DA33",0x4206],
+  ["8232DA34",0x4207],
+  ["8232DA35",0x4208],
+  ["8232DA36",0x4209],
+  ["8232DA37",0x420A],
+  ["8232DA38",0x420B],
+  ["8232DA39",0x420C],
+  ["8232DB30",0x420D],
+  ["8232DB31",0x420E],
+  ["8232DB32",0x420F],
+  ["8232DB33",0x4210],
+  ["8232DB34",0x4211],
+  ["8232DB35",0x4212],
+  ["8232DB36",0x4213],
+  ["8232DB37",0x4214],
+  ["8232DB38",0x4215],
+  ["8232DB39",0x4216],
+  ["8232DC30",0x4217],
+  ["8232DC31",0x4218],
+  ["8232DC32",0x4219],
+  ["8232DC33",0x421A],
+  ["8232DC34",0x421B],
+  ["8232DC35",0x421C],
+  ["8232DC36",0x421D],
+  ["8232DC37",0x421E],
+  ["8232DC38",0x421F],
+  ["8232DC39",0x4220],
+  ["8232DD30",0x4221],
+  ["8232DD31",0x4222],
+  ["8232DD32",0x4223],
+  ["8232DD33",0x4224],
+  ["8232DD34",0x4225],
+  ["8232DD35",0x4226],
+  ["8232DD36",0x4227],
+  ["8232DD37",0x4228],
+  ["8232DD38",0x4229],
+  ["8232DD39",0x422A],
+  ["8232DE30",0x422B],
+  ["8232DE31",0x422C],
+  ["8232DE32",0x422D],
+  ["8232DE33",0x422E],
+  ["8232DE34",0x422F],
+  ["8232DE35",0x4230],
+  ["8232DE36",0x4231],
+  ["8232DE37",0x4232],
+  ["8232DE38",0x4233],
+  ["8232DE39",0x4234],
+  ["8232DF30",0x4235],
+  ["8232DF31",0x4236],
+  ["8232DF32",0x4237],
+  ["8232DF33",0x4238],
+  ["8232DF34",0x4239],
+  ["8232DF35",0x423A],
+  ["8232DF36",0x423B],
+  ["8232DF37",0x423C],
+  ["8232DF38",0x423D],
+  ["8232DF39",0x423E],
+  ["8232E030",0x423F],
+  ["8232E031",0x4240],
+  ["8232E032",0x4241],
+  ["8232E033",0x4242],
+  ["8232E034",0x4243],
+  ["8232E035",0x4244],
+  ["8232E036",0x4245],
+  ["8232E037",0x4246],
+  ["8232E038",0x4247],
+  ["8232E039",0x4248],
+  ["8232E130",0x4249],
+  ["8232E131",0x424A],
+  ["8232E132",0x424B],
+  ["8232E133",0x424C],
+  ["8232E134",0x424D],
+  ["8232E135",0x424E],
+  ["8232E136",0x424F],
+  ["8232E137",0x4250],
+  ["8232E138",0x4251],
+  ["8232E139",0x4252],
+  ["8232E230",0x4253],
+  ["8232E231",0x4254],
+  ["8232E232",0x4255],
+  ["8232E233",0x4256],
+  ["8232E234",0x4257],
+  ["8232E235",0x4258],
+  ["8232E236",0x4259],
+  ["8232E237",0x425A],
+  ["8232E238",0x425B],
+  ["8232E239",0x425C],
+  ["8232E330",0x425D],
+  ["8232E331",0x425E],
+  ["8232E332",0x425F],
+  ["8232E333",0x4260],
+  ["8232E334",0x4261],
+  ["8232E335",0x4262],
+  ["8232E336",0x4263],
+  ["8232E337",0x4264],
+  ["8232E338",0x4265],
+  ["8232E339",0x4266],
+  ["8232E430",0x4267],
+  ["8232E431",0x4268],
+  ["8232E432",0x4269],
+  ["8232E433",0x426A],
+  ["8232E434",0x426B],
+  ["8232E435",0x426C],
+  ["8232E436",0x426D],
+  ["8232E437",0x426E],
+  ["8232E438",0x426F],
+  ["8232E439",0x4270],
+  ["8232E530",0x4271],
+  ["8232E531",0x4272],
+  ["8232E532",0x4273],
+  ["8232E533",0x4274],
+  ["8232E534",0x4275],
+  ["8232E535",0x4276],
+  ["8232E536",0x4277],
+  ["8232E537",0x4278],
+  ["8232E538",0x4279],
+  ["8232E539",0x427A],
+  ["8232E630",0x427B],
+  ["8232E631",0x427C],
+  ["8232E632",0x427D],
+  ["8232E633",0x427E],
+  ["8232E634",0x427F],
+  ["8232E635",0x4280],
+  ["8232E636",0x4281],
+  ["8232E637",0x4282],
+  ["8232E638",0x4283],
+  ["8232E639",0x4284],
+  ["8232E730",0x4285],
+  ["8232E731",0x4286],
+  ["8232E732",0x4287],
+  ["8232E733",0x4288],
+  ["8232E734",0x4289],
+  ["8232E735",0x428A],
+  ["8232E736",0x428B],
+  ["8232E737",0x428C],
+  ["8232E738",0x428D],
+  ["8232E739",0x428E],
+  ["8232E830",0x428F],
+  ["8232E831",0x4290],
+  ["8232E832",0x4291],
+  ["8232E833",0x4292],
+  ["8232E834",0x4293],
+  ["8232E835",0x4294],
+  ["8232E836",0x4295],
+  ["8232E837",0x4296],
+  ["8232E838",0x4297],
+  ["8232E839",0x4298],
+  ["8232E930",0x4299],
+  ["8232E931",0x429A],
+  ["8232E932",0x429B],
+  ["8232E933",0x429C],
+  ["8232E934",0x429D],
+  ["8232E935",0x429E],
+  ["8232E936",0x429F],
+  ["8232E937",0x42A0],
+  ["8232E938",0x42A1],
+  ["8232E939",0x42A2],
+  ["8232EA30",0x42A3],
+  ["8232EA31",0x42A4],
+  ["8232EA32",0x42A5],
+  ["8232EA33",0x42A6],
+  ["8232EA34",0x42A7],
+  ["8232EA35",0x42A8],
+  ["8232EA36",0x42A9],
+  ["8232EA37",0x42AA],
+  ["8232EA38",0x42AB],
+  ["8232EA39",0x42AC],
+  ["8232EB30",0x42AD],
+  ["8232EB31",0x42AE],
+  ["8232EB32",0x42AF],
+  ["8232EB33",0x42B0],
+  ["8232EB34",0x42B1],
+  ["8232EB35",0x42B2],
+  ["8232EB36",0x42B3],
+  ["8232EB37",0x42B4],
+  ["8232EB38",0x42B5],
+  ["8232EB39",0x42B6],
+  ["8232EC30",0x42B7],
+  ["8232EC31",0x42B8],
+  ["8232EC32",0x42B9],
+  ["8232EC33",0x42BA],
+  ["8232EC34",0x42BB],
+  ["8232EC35",0x42BC],
+  ["8232EC36",0x42BD],
+  ["8232EC37",0x42BE],
+  ["8232EC38",0x42BF],
+  ["8232EC39",0x42C0],
+  ["8232ED30",0x42C1],
+  ["8232ED31",0x42C2],
+  ["8232ED32",0x42C3],
+  ["8232ED33",0x42C4],
+  ["8232ED34",0x42C5],
+  ["8232ED35",0x42C6],
+  ["8232ED36",0x42C7],
+  ["8232ED37",0x42C8],
+  ["8232ED38",0x42C9],
+  ["8232ED39",0x42CA],
+  ["8232EE30",0x42CB],
+  ["8232EE31",0x42CC],
+  ["8232EE32",0x42CD],
+  ["8232EE33",0x42CE],
+  ["8232EE34",0x42CF],
+  ["8232EE35",0x42D0],
+  ["8232EE36",0x42D1],
+  ["8232EE37",0x42D2],
+  ["8232EE38",0x42D3],
+  ["8232EE39",0x42D4],
+  ["8232EF30",0x42D5],
+  ["8232EF31",0x42D6],
+  ["8232EF32",0x42D7],
+  ["8232EF33",0x42D8],
+  ["8232EF34",0x42D9],
+  ["8232EF35",0x42DA],
+  ["8232EF36",0x42DB],
+  ["8232EF37",0x42DC],
+  ["8232EF38",0x42DD],
+  ["8232EF39",0x42DE],
+  ["8232F030",0x42DF],
+  ["8232F031",0x42E0],
+  ["8232F032",0x42E1],
+  ["8232F033",0x42E2],
+  ["8232F034",0x42E3],
+  ["8232F035",0x42E4],
+  ["8232F036",0x42E5],
+  ["8232F037",0x42E6],
+  ["8232F038",0x42E7],
+  ["8232F039",0x42E8],
+  ["8232F130",0x42E9],
+  ["8232F131",0x42EA],
+  ["8232F132",0x42EB],
+  ["8232F133",0x42EC],
+  ["8232F134",0x42ED],
+  ["8232F135",0x42EE],
+  ["8232F136",0x42EF],
+  ["8232F137",0x42F0],
+  ["8232F138",0x42F1],
+  ["8232F139",0x42F2],
+  ["8232F230",0x42F3],
+  ["8232F231",0x42F4],
+  ["8232F232",0x42F5],
+  ["8232F233",0x42F6],
+  ["8232F234",0x42F7],
+  ["8232F235",0x42F8],
+  ["8232F236",0x42F9],
+  ["8232F237",0x42FA],
+  ["8232F238",0x42FB],
+  ["8232F239",0x42FC],
+  ["8232F330",0x42FD],
+  ["8232F331",0x42FE],
+  ["8232F332",0x42FF],
+  ["8232F333",0x4300],
+  ["8232F334",0x4301],
+  ["8232F335",0x4302],
+  ["8232F336",0x4303],
+  ["8232F337",0x4304],
+  ["8232F338",0x4305],
+  ["8232F339",0x4306],
+  ["8232F430",0x4307],
+  ["8232F431",0x4308],
+  ["8232F432",0x4309],
+  ["8232F433",0x430A],
+  ["8232F434",0x430B],
+  ["8232F435",0x430C],
+  ["8232F436",0x430D],
+  ["8232F437",0x430E],
+  ["8232F438",0x430F],
+  ["8232F439",0x4310],
+  ["8232F530",0x4311],
+  ["8232F531",0x4312],
+  ["8232F532",0x4313],
+  ["8232F533",0x4314],
+  ["8232F534",0x4315],
+  ["8232F535",0x4316],
+  ["8232F536",0x4317],
+  ["8232F537",0x4318],
+  ["8232F538",0x4319],
+  ["8232F539",0x431A],
+  ["8232F630",0x431B],
+  ["8232F631",0x431C],
+  ["8232F632",0x431D],
+  ["8232F633",0x431E],
+  ["8232F634",0x431F],
+  ["8232F635",0x4320],
+  ["8232F636",0x4321],
+  ["8232F637",0x4322],
+  ["8232F638",0x4323],
+  ["8232F639",0x4324],
+  ["8232F730",0x4325],
+  ["8232F731",0x4326],
+  ["8232F732",0x4327],
+  ["8232F733",0x4328],
+  ["8232F734",0x4329],
+  ["8232F735",0x432A],
+  ["8232F736",0x432B],
+  ["8232F737",0x432C],
+  ["8232F738",0x432D],
+  ["8232F739",0x432E],
+  ["8232F830",0x432F],
+  ["8232F831",0x4330],
+  ["8232F832",0x4331],
+  ["8232F833",0x4332],
+  ["8232F834",0x4333],
+  ["8232F835",0x4334],
+  ["8232F836",0x4335],
+  ["8232F837",0x4336],
+  ["FE72",0x4337],
+  ["8232F838",0x4338],
+  ["8232F839",0x4339],
+  ["8232F930",0x433A],
+  ["8232F931",0x433B],
+  ["8232F932",0x433C],
+  ["8232F933",0x433D],
+  ["8232F934",0x433E],
+  ["8232F935",0x433F],
+  ["8232F936",0x4340],
+  ["8232F937",0x4341],
+  ["8232F938",0x4342],
+  ["8232F939",0x4343],
+  ["8232FA30",0x4344],
+  ["8232FA31",0x4345],
+  ["8232FA32",0x4346],
+  ["8232FA33",0x4347],
+  ["8232FA34",0x4348],
+  ["8232FA35",0x4349],
+  ["8232FA36",0x434A],
+  ["8232FA37",0x434B],
+  ["8232FA38",0x434C],
+  ["8232FA39",0x434D],
+  ["8232FB30",0x434E],
+  ["8232FB31",0x434F],
+  ["8232FB32",0x4350],
+  ["8232FB33",0x4351],
+  ["8232FB34",0x4352],
+  ["8232FB35",0x4353],
+  ["8232FB36",0x4354],
+  ["8232FB37",0x4355],
+  ["8232FB38",0x4356],
+  ["8232FB39",0x4357],
+  ["8232FC30",0x4358],
+  ["8232FC31",0x4359],
+  ["8232FC32",0x435A],
+  ["8232FC33",0x435B],
+  ["8232FC34",0x435C],
+  ["8232FC35",0x435D],
+  ["8232FC36",0x435E],
+  ["8232FC37",0x435F],
+  ["8232FC38",0x4360],
+  ["8232FC39",0x4361],
+  ["8232FD30",0x4362],
+  ["8232FD31",0x4363],
+  ["8232FD32",0x4364],
+  ["8232FD33",0x4365],
+  ["8232FD34",0x4366],
+  ["8232FD35",0x4367],
+  ["8232FD36",0x4368],
+  ["8232FD37",0x4369],
+  ["8232FD38",0x436A],
+  ["8232FD39",0x436B],
+  ["8232FE30",0x436C],
+  ["8232FE31",0x436D],
+  ["8232FE32",0x436E],
+  ["8232FE33",0x436F],
+  ["8232FE34",0x4370],
+  ["8232FE35",0x4371],
+  ["8232FE36",0x4372],
+  ["8232FE37",0x4373],
+  ["8232FE38",0x4374],
+  ["8232FE39",0x4375],
+  ["82338130",0x4376],
+  ["82338131",0x4377],
+  ["82338132",0x4378],
+  ["82338133",0x4379],
+  ["82338134",0x437A],
+  ["82338135",0x437B],
+  ["82338136",0x437C],
+  ["82338137",0x437D],
+  ["82338138",0x437E],
+  ["82338139",0x437F],
+  ["82338230",0x4380],
+  ["82338231",0x4381],
+  ["82338232",0x4382],
+  ["82338233",0x4383],
+  ["82338234",0x4384],
+  ["82338235",0x4385],
+  ["82338236",0x4386],
+  ["82338237",0x4387],
+  ["82338238",0x4388],
+  ["82338239",0x4389],
+  ["82338330",0x438A],
+  ["82338331",0x438B],
+  ["82338332",0x438C],
+  ["82338333",0x438D],
+  ["82338334",0x438E],
+  ["82338335",0x438F],
+  ["82338336",0x4390],
+  ["82338337",0x4391],
+  ["82338338",0x4392],
+  ["82338339",0x4393],
+  ["82338430",0x4394],
+  ["82338431",0x4395],
+  ["82338432",0x4396],
+  ["82338433",0x4397],
+  ["82338434",0x4398],
+  ["82338435",0x4399],
+  ["82338436",0x439A],
+  ["82338437",0x439B],
+  ["82338438",0x439C],
+  ["82338439",0x439D],
+  ["82338530",0x439E],
+  ["82338531",0x439F],
+  ["82338532",0x43A0],
+  ["82338533",0x43A1],
+  ["82338534",0x43A2],
+  ["82338535",0x43A3],
+  ["82338536",0x43A4],
+  ["82338537",0x43A5],
+  ["82338538",0x43A6],
+  ["82338539",0x43A7],
+  ["82338630",0x43A8],
+  ["82338631",0x43A9],
+  ["82338632",0x43AA],
+  ["82338633",0x43AB],
+  ["FE78",0x43AC],
+  ["82338634",0x43AD],
+  ["82338635",0x43AE],
+  ["82338636",0x43AF],
+  ["82338637",0x43B0],
+  ["FE77",0x43B1],
+  ["82338638",0x43B2],
+  ["82338639",0x43B3],
+  ["82338730",0x43B4],
+  ["82338731",0x43B5],
+  ["82338732",0x43B6],
+  ["82338733",0x43B7],
+  ["82338734",0x43B8],
+  ["82338735",0x43B9],
+  ["82338736",0x43BA],
+  ["82338737",0x43BB],
+  ["82338738",0x43BC],
+  ["82338739",0x43BD],
+  ["82338830",0x43BE],
+  ["82338831",0x43BF],
+  ["82338832",0x43C0],
+  ["82338833",0x43C1],
+  ["82338834",0x43C2],
+  ["82338835",0x43C3],
+  ["82338836",0x43C4],
+  ["82338837",0x43C5],
+  ["82338838",0x43C6],
+  ["82338839",0x43C7],
+  ["82338930",0x43C8],
+  ["82338931",0x43C9],
+  ["82338932",0x43CA],
+  ["82338933",0x43CB],
+  ["82338934",0x43CC],
+  ["82338935",0x43CD],
+  ["82338936",0x43CE],
+  ["82338937",0x43CF],
+  ["82338938",0x43D0],
+  ["82338939",0x43D1],
+  ["82338A30",0x43D2],
+  ["82338A31",0x43D3],
+  ["82338A32",0x43D4],
+  ["82338A33",0x43D5],
+  ["82338A34",0x43D6],
+  ["82338A35",0x43D7],
+  ["82338A36",0x43D8],
+  ["82338A37",0x43D9],
+  ["82338A38",0x43DA],
+  ["82338A39",0x43DB],
+  ["82338B30",0x43DC],
+  ["FE7A",0x43DD],
+  ["82338B31",0x43DE],
+  ["82338B32",0x43DF],
+  ["82338B33",0x43E0],
+  ["82338B34",0x43E1],
+  ["82338B35",0x43E2],
+  ["82338B36",0x43E3],
+  ["82338B37",0x43E4],
+  ["82338B38",0x43E5],
+  ["82338B39",0x43E6],
+  ["82338C30",0x43E7],
+  ["82338C31",0x43E8],
+  ["82338C32",0x43E9],
+  ["82338C33",0x43EA],
+  ["82338C34",0x43EB],
+  ["82338C35",0x43EC],
+  ["82338C36",0x43ED],
+  ["82338C37",0x43EE],
+  ["82338C38",0x43EF],
+  ["82338C39",0x43F0],
+  ["82338D30",0x43F1],
+  ["82338D31",0x43F2],
+  ["82338D32",0x43F3],
+  ["82338D33",0x43F4],
+  ["82338D34",0x43F5],
+  ["82338D35",0x43F6],
+  ["82338D36",0x43F7],
+  ["82338D37",0x43F8],
+  ["82338D38",0x43F9],
+  ["82338D39",0x43FA],
+  ["82338E30",0x43FB],
+  ["82338E31",0x43FC],
+  ["82338E32",0x43FD],
+  ["82338E33",0x43FE],
+  ["82338E34",0x43FF],
+  ["82338E35",0x4400],
+  ["82338E36",0x4401],
+  ["82338E37",0x4402],
+  ["82338E38",0x4403],
+  ["82338E39",0x4404],
+  ["82338F30",0x4405],
+  ["82338F31",0x4406],
+  ["82338F32",0x4407],
+  ["82338F33",0x4408],
+  ["82338F34",0x4409],
+  ["82338F35",0x440A],
+  ["82338F36",0x440B],
+  ["82338F37",0x440C],
+  ["82338F38",0x440D],
+  ["82338F39",0x440E],
+  ["82339030",0x440F],
+  ["82339031",0x4410],
+  ["82339032",0x4411],
+  ["82339033",0x4412],
+  ["82339034",0x4413],
+  ["82339035",0x4414],
+  ["82339036",0x4415],
+  ["82339037",0x4416],
+  ["82339038",0x4417],
+  ["82339039",0x4418],
+  ["82339130",0x4419],
+  ["82339131",0x441A],
+  ["82339132",0x441B],
+  ["82339133",0x441C],
+  ["82339134",0x441D],
+  ["82339135",0x441E],
+  ["82339136",0x441F],
+  ["82339137",0x4420],
+  ["82339138",0x4421],
+  ["82339139",0x4422],
+  ["82339230",0x4423],
+  ["82339231",0x4424],
+  ["82339232",0x4425],
+  ["82339233",0x4426],
+  ["82339234",0x4427],
+  ["82339235",0x4428],
+  ["82339236",0x4429],
+  ["82339237",0x442A],
+  ["82339238",0x442B],
+  ["82339239",0x442C],
+  ["82339330",0x442D],
+  ["82339331",0x442E],
+  ["82339332",0x442F],
+  ["82339333",0x4430],
+  ["82339334",0x4431],
+  ["82339335",0x4432],
+  ["82339336",0x4433],
+  ["82339337",0x4434],
+  ["82339338",0x4435],
+  ["82339339",0x4436],
+  ["82339430",0x4437],
+  ["82339431",0x4438],
+  ["82339432",0x4439],
+  ["82339433",0x443A],
+  ["82339434",0x443B],
+  ["82339435",0x443C],
+  ["82339436",0x443D],
+  ["82339437",0x443E],
+  ["82339438",0x443F],
+  ["82339439",0x4440],
+  ["82339530",0x4441],
+  ["82339531",0x4442],
+  ["82339532",0x4443],
+  ["82339533",0x4444],
+  ["82339534",0x4445],
+  ["82339535",0x4446],
+  ["82339536",0x4447],
+  ["82339537",0x4448],
+  ["82339538",0x4449],
+  ["82339539",0x444A],
+  ["82339630",0x444B],
+  ["82339631",0x444C],
+  ["82339632",0x444D],
+  ["82339633",0x444E],
+  ["82339634",0x444F],
+  ["82339635",0x4450],
+  ["82339636",0x4451],
+  ["82339637",0x4452],
+  ["82339638",0x4453],
+  ["82339639",0x4454],
+  ["82339730",0x4455],
+  ["82339731",0x4456],
+  ["82339732",0x4457],
+  ["82339733",0x4458],
+  ["82339734",0x4459],
+  ["82339735",0x445A],
+  ["82339736",0x445B],
+  ["82339737",0x445C],
+  ["82339738",0x445D],
+  ["82339739",0x445E],
+  ["82339830",0x445F],
+  ["82339831",0x4460],
+  ["82339832",0x4461],
+  ["82339833",0x4462],
+  ["82339834",0x4463],
+  ["82339835",0x4464],
+  ["82339836",0x4465],
+  ["82339837",0x4466],
+  ["82339838",0x4467],
+  ["82339839",0x4468],
+  ["82339930",0x4469],
+  ["82339931",0x446A],
+  ["82339932",0x446B],
+  ["82339933",0x446C],
+  ["82339934",0x446D],
+  ["82339935",0x446E],
+  ["82339936",0x446F],
+  ["82339937",0x4470],
+  ["82339938",0x4471],
+  ["82339939",0x4472],
+  ["82339A30",0x4473],
+  ["82339A31",0x4474],
+  ["82339A32",0x4475],
+  ["82339A33",0x4476],
+  ["82339A34",0x4477],
+  ["82339A35",0x4478],
+  ["82339A36",0x4479],
+  ["82339A37",0x447A],
+  ["82339A38",0x447B],
+  ["82339A39",0x447C],
+  ["82339B30",0x447D],
+  ["82339B31",0x447E],
+  ["82339B32",0x447F],
+  ["82339B33",0x4480],
+  ["82339B34",0x4481],
+  ["82339B35",0x4482],
+  ["82339B36",0x4483],
+  ["82339B37",0x4484],
+  ["82339B38",0x4485],
+  ["82339B39",0x4486],
+  ["82339C30",0x4487],
+  ["82339C31",0x4488],
+  ["82339C32",0x4489],
+  ["82339C33",0x448A],
+  ["82339C34",0x448B],
+  ["82339C35",0x448C],
+  ["82339C36",0x448D],
+  ["82339C37",0x448E],
+  ["82339C38",0x448F],
+  ["82339C39",0x4490],
+  ["82339D30",0x4491],
+  ["82339D31",0x4492],
+  ["82339D32",0x4493],
+  ["82339D33",0x4494],
+  ["82339D34",0x4495],
+  ["82339D35",0x4496],
+  ["82339D36",0x4497],
+  ["82339D37",0x4498],
+  ["82339D38",0x4499],
+  ["82339D39",0x449A],
+  ["82339E30",0x449B],
+  ["82339E31",0x449C],
+  ["82339E32",0x449D],
+  ["82339E33",0x449E],
+  ["82339E34",0x449F],
+  ["82339E35",0x44A0],
+  ["82339E36",0x44A1],
+  ["82339E37",0x44A2],
+  ["82339E38",0x44A3],
+  ["82339E39",0x44A4],
+  ["82339F30",0x44A5],
+  ["82339F31",0x44A6],
+  ["82339F32",0x44A7],
+  ["82339F33",0x44A8],
+  ["82339F34",0x44A9],
+  ["82339F35",0x44AA],
+  ["82339F36",0x44AB],
+  ["82339F37",0x44AC],
+  ["82339F38",0x44AD],
+  ["82339F39",0x44AE],
+  ["8233A030",0x44AF],
+  ["8233A031",0x44B0],
+  ["8233A032",0x44B1],
+  ["8233A033",0x44B2],
+  ["8233A034",0x44B3],
+  ["8233A035",0x44B4],
+  ["8233A036",0x44B5],
+  ["8233A037",0x44B6],
+  ["8233A038",0x44B7],
+  ["8233A039",0x44B8],
+  ["8233A130",0x44B9],
+  ["8233A131",0x44BA],
+  ["8233A132",0x44BB],
+  ["8233A133",0x44BC],
+  ["8233A134",0x44BD],
+  ["8233A135",0x44BE],
+  ["8233A136",0x44BF],
+  ["8233A137",0x44C0],
+  ["8233A138",0x44C1],
+  ["8233A139",0x44C2],
+  ["8233A230",0x44C3],
+  ["8233A231",0x44C4],
+  ["8233A232",0x44C5],
+  ["8233A233",0x44C6],
+  ["8233A234",0x44C7],
+  ["8233A235",0x44C8],
+  ["8233A236",0x44C9],
+  ["8233A237",0x44CA],
+  ["8233A238",0x44CB],
+  ["8233A239",0x44CC],
+  ["8233A330",0x44CD],
+  ["8233A331",0x44CE],
+  ["8233A332",0x44CF],
+  ["8233A333",0x44D0],
+  ["8233A334",0x44D1],
+  ["8233A335",0x44D2],
+  ["8233A336",0x44D3],
+  ["8233A337",0x44D4],
+  ["8233A338",0x44D5],
+  ["FE7B",0x44D6],
+  ["8233A339",0x44D7],
+  ["8233A430",0x44D8],
+  ["8233A431",0x44D9],
+  ["8233A432",0x44DA],
+  ["8233A433",0x44DB],
+  ["8233A434",0x44DC],
+  ["8233A435",0x44DD],
+  ["8233A436",0x44DE],
+  ["8233A437",0x44DF],
+  ["8233A438",0x44E0],
+  ["8233A439",0x44E1],
+  ["8233A530",0x44E2],
+  ["8233A531",0x44E3],
+  ["8233A532",0x44E4],
+  ["8233A533",0x44E5],
+  ["8233A534",0x44E6],
+  ["8233A535",0x44E7],
+  ["8233A536",0x44E8],
+  ["8233A537",0x44E9],
+  ["8233A538",0x44EA],
+  ["8233A539",0x44EB],
+  ["8233A630",0x44EC],
+  ["8233A631",0x44ED],
+  ["8233A632",0x44EE],
+  ["8233A633",0x44EF],
+  ["8233A634",0x44F0],
+  ["8233A635",0x44F1],
+  ["8233A636",0x44F2],
+  ["8233A637",0x44F3],
+  ["8233A638",0x44F4],
+  ["8233A639",0x44F5],
+  ["8233A730",0x44F6],
+  ["8233A731",0x44F7],
+  ["8233A732",0x44F8],
+  ["8233A733",0x44F9],
+  ["8233A734",0x44FA],
+  ["8233A735",0x44FB],
+  ["8233A736",0x44FC],
+  ["8233A737",0x44FD],
+  ["8233A738",0x44FE],
+  ["8233A739",0x44FF],
+  ["8233A830",0x4500],
+  ["8233A831",0x4501],
+  ["8233A832",0x4502],
+  ["8233A833",0x4503],
+  ["8233A834",0x4504],
+  ["8233A835",0x4505],
+  ["8233A836",0x4506],
+  ["8233A837",0x4507],
+  ["8233A838",0x4508],
+  ["8233A839",0x4509],
+  ["8233A930",0x450A],
+  ["8233A931",0x450B],
+  ["8233A932",0x450C],
+  ["8233A933",0x450D],
+  ["8233A934",0x450E],
+  ["8233A935",0x450F],
+  ["8233A936",0x4510],
+  ["8233A937",0x4511],
+  ["8233A938",0x4512],
+  ["8233A939",0x4513],
+  ["8233AA30",0x4514],
+  ["8233AA31",0x4515],
+  ["8233AA32",0x4516],
+  ["8233AA33",0x4517],
+  ["8233AA34",0x4518],
+  ["8233AA35",0x4519],
+  ["8233AA36",0x451A],
+  ["8233AA37",0x451B],
+  ["8233AA38",0x451C],
+  ["8233AA39",0x451D],
+  ["8233AB30",0x451E],
+  ["8233AB31",0x451F],
+  ["8233AB32",0x4520],
+  ["8233AB33",0x4521],
+  ["8233AB34",0x4522],
+  ["8233AB35",0x4523],
+  ["8233AB36",0x4524],
+  ["8233AB37",0x4525],
+  ["8233AB38",0x4526],
+  ["8233AB39",0x4527],
+  ["8233AC30",0x4528],
+  ["8233AC31",0x4529],
+  ["8233AC32",0x452A],
+  ["8233AC33",0x452B],
+  ["8233AC34",0x452C],
+  ["8233AC35",0x452D],
+  ["8233AC36",0x452E],
+  ["8233AC37",0x452F],
+  ["8233AC38",0x4530],
+  ["8233AC39",0x4531],
+  ["8233AD30",0x4532],
+  ["8233AD31",0x4533],
+  ["8233AD32",0x4534],
+  ["8233AD33",0x4535],
+  ["8233AD34",0x4536],
+  ["8233AD35",0x4537],
+  ["8233AD36",0x4538],
+  ["8233AD37",0x4539],
+  ["8233AD38",0x453A],
+  ["8233AD39",0x453B],
+  ["8233AE30",0x453C],
+  ["8233AE31",0x453D],
+  ["8233AE32",0x453E],
+  ["8233AE33",0x453F],
+  ["8233AE34",0x4540],
+  ["8233AE35",0x4541],
+  ["8233AE36",0x4542],
+  ["8233AE37",0x4543],
+  ["8233AE38",0x4544],
+  ["8233AE39",0x4545],
+  ["8233AF30",0x4546],
+  ["8233AF31",0x4547],
+  ["8233AF32",0x4548],
+  ["8233AF33",0x4549],
+  ["8233AF34",0x454A],
+  ["8233AF35",0x454B],
+  ["8233AF36",0x454C],
+  ["8233AF37",0x454D],
+  ["8233AF38",0x454E],
+  ["8233AF39",0x454F],
+  ["8233B030",0x4550],
+  ["8233B031",0x4551],
+  ["8233B032",0x4552],
+  ["8233B033",0x4553],
+  ["8233B034",0x4554],
+  ["8233B035",0x4555],
+  ["8233B036",0x4556],
+  ["8233B037",0x4557],
+  ["8233B038",0x4558],
+  ["8233B039",0x4559],
+  ["8233B130",0x455A],
+  ["8233B131",0x455B],
+  ["8233B132",0x455C],
+  ["8233B133",0x455D],
+  ["8233B134",0x455E],
+  ["8233B135",0x455F],
+  ["8233B136",0x4560],
+  ["8233B137",0x4561],
+  ["8233B138",0x4562],
+  ["8233B139",0x4563],
+  ["8233B230",0x4564],
+  ["8233B231",0x4565],
+  ["8233B232",0x4566],
+  ["8233B233",0x4567],
+  ["8233B234",0x4568],
+  ["8233B235",0x4569],
+  ["8233B236",0x456A],
+  ["8233B237",0x456B],
+  ["8233B238",0x456C],
+  ["8233B239",0x456D],
+  ["8233B330",0x456E],
+  ["8233B331",0x456F],
+  ["8233B332",0x4570],
+  ["8233B333",0x4571],
+  ["8233B334",0x4572],
+  ["8233B335",0x4573],
+  ["8233B336",0x4574],
+  ["8233B337",0x4575],
+  ["8233B338",0x4576],
+  ["8233B339",0x4577],
+  ["8233B430",0x4578],
+  ["8233B431",0x4579],
+  ["8233B432",0x457A],
+  ["8233B433",0x457B],
+  ["8233B434",0x457C],
+  ["8233B435",0x457D],
+  ["8233B436",0x457E],
+  ["8233B437",0x457F],
+  ["8233B438",0x4580],
+  ["8233B439",0x4581],
+  ["8233B530",0x4582],
+  ["8233B531",0x4583],
+  ["8233B532",0x4584],
+  ["8233B533",0x4585],
+  ["8233B534",0x4586],
+  ["8233B535",0x4587],
+  ["8233B536",0x4588],
+  ["8233B537",0x4589],
+  ["8233B538",0x458A],
+  ["8233B539",0x458B],
+  ["8233B630",0x458C],
+  ["8233B631",0x458D],
+  ["8233B632",0x458E],
+  ["8233B633",0x458F],
+  ["8233B634",0x4590],
+  ["8233B635",0x4591],
+  ["8233B636",0x4592],
+  ["8233B637",0x4593],
+  ["8233B638",0x4594],
+  ["8233B639",0x4595],
+  ["8233B730",0x4596],
+  ["8233B731",0x4597],
+  ["8233B732",0x4598],
+  ["8233B733",0x4599],
+  ["8233B734",0x459A],
+  ["8233B735",0x459B],
+  ["8233B736",0x459C],
+  ["8233B737",0x459D],
+  ["8233B738",0x459E],
+  ["8233B739",0x459F],
+  ["8233B830",0x45A0],
+  ["8233B831",0x45A1],
+  ["8233B832",0x45A2],
+  ["8233B833",0x45A3],
+  ["8233B834",0x45A4],
+  ["8233B835",0x45A5],
+  ["8233B836",0x45A6],
+  ["8233B837",0x45A7],
+  ["8233B838",0x45A8],
+  ["8233B839",0x45A9],
+  ["8233B930",0x45AA],
+  ["8233B931",0x45AB],
+  ["8233B932",0x45AC],
+  ["8233B933",0x45AD],
+  ["8233B934",0x45AE],
+  ["8233B935",0x45AF],
+  ["8233B936",0x45B0],
+  ["8233B937",0x45B1],
+  ["8233B938",0x45B2],
+  ["8233B939",0x45B3],
+  ["8233BA30",0x45B4],
+  ["8233BA31",0x45B5],
+  ["8233BA32",0x45B6],
+  ["8233BA33",0x45B7],
+  ["8233BA34",0x45B8],
+  ["8233BA35",0x45B9],
+  ["8233BA36",0x45BA],
+  ["8233BA37",0x45BB],
+  ["8233BA38",0x45BC],
+  ["8233BA39",0x45BD],
+  ["8233BB30",0x45BE],
+  ["8233BB31",0x45BF],
+  ["8233BB32",0x45C0],
+  ["8233BB33",0x45C1],
+  ["8233BB34",0x45C2],
+  ["8233BB35",0x45C3],
+  ["8233BB36",0x45C4],
+  ["8233BB37",0x45C5],
+  ["8233BB38",0x45C6],
+  ["8233BB39",0x45C7],
+  ["8233BC30",0x45C8],
+  ["8233BC31",0x45C9],
+  ["8233BC32",0x45CA],
+  ["8233BC33",0x45CB],
+  ["8233BC34",0x45CC],
+  ["8233BC35",0x45CD],
+  ["8233BC36",0x45CE],
+  ["8233BC37",0x45CF],
+  ["8233BC38",0x45D0],
+  ["8233BC39",0x45D1],
+  ["8233BD30",0x45D2],
+  ["8233BD31",0x45D3],
+  ["8233BD32",0x45D4],
+  ["8233BD33",0x45D5],
+  ["8233BD34",0x45D6],
+  ["8233BD35",0x45D7],
+  ["8233BD36",0x45D8],
+  ["8233BD37",0x45D9],
+  ["8233BD38",0x45DA],
+  ["8233BD39",0x45DB],
+  ["8233BE30",0x45DC],
+  ["8233BE31",0x45DD],
+  ["8233BE32",0x45DE],
+  ["8233BE33",0x45DF],
+  ["8233BE34",0x45E0],
+  ["8233BE35",0x45E1],
+  ["8233BE36",0x45E2],
+  ["8233BE37",0x45E3],
+  ["8233BE38",0x45E4],
+  ["8233BE39",0x45E5],
+  ["8233BF30",0x45E6],
+  ["8233BF31",0x45E7],
+  ["8233BF32",0x45E8],
+  ["8233BF33",0x45E9],
+  ["8233BF34",0x45EA],
+  ["8233BF35",0x45EB],
+  ["8233BF36",0x45EC],
+  ["8233BF37",0x45ED],
+  ["8233BF38",0x45EE],
+  ["8233BF39",0x45EF],
+  ["8233C030",0x45F0],
+  ["8233C031",0x45F1],
+  ["8233C032",0x45F2],
+  ["8233C033",0x45F3],
+  ["8233C034",0x45F4],
+  ["8233C035",0x45F5],
+  ["8233C036",0x45F6],
+  ["8233C037",0x45F7],
+  ["8233C038",0x45F8],
+  ["8233C039",0x45F9],
+  ["8233C130",0x45FA],
+  ["8233C131",0x45FB],
+  ["8233C132",0x45FC],
+  ["8233C133",0x45FD],
+  ["8233C134",0x45FE],
+  ["8233C135",0x45FF],
+  ["8233C136",0x4600],
+  ["8233C137",0x4601],
+  ["8233C138",0x4602],
+  ["8233C139",0x4603],
+  ["8233C230",0x4604],
+  ["8233C231",0x4605],
+  ["8233C232",0x4606],
+  ["8233C233",0x4607],
+  ["8233C234",0x4608],
+  ["8233C235",0x4609],
+  ["8233C236",0x460A],
+  ["8233C237",0x460B],
+  ["8233C238",0x460C],
+  ["8233C239",0x460D],
+  ["8233C330",0x460E],
+  ["8233C331",0x460F],
+  ["8233C332",0x4610],
+  ["8233C333",0x4611],
+  ["8233C334",0x4612],
+  ["8233C335",0x4613],
+  ["8233C336",0x4614],
+  ["8233C337",0x4615],
+  ["8233C338",0x4616],
+  ["8233C339",0x4617],
+  ["8233C430",0x4618],
+  ["8233C431",0x4619],
+  ["8233C432",0x461A],
+  ["8233C433",0x461B],
+  ["8233C434",0x461C],
+  ["8233C435",0x461D],
+  ["8233C436",0x461E],
+  ["8233C437",0x461F],
+  ["8233C438",0x4620],
+  ["8233C439",0x4621],
+  ["8233C530",0x4622],
+  ["8233C531",0x4623],
+  ["8233C532",0x4624],
+  ["8233C533",0x4625],
+  ["8233C534",0x4626],
+  ["8233C535",0x4627],
+  ["8233C536",0x4628],
+  ["8233C537",0x4629],
+  ["8233C538",0x462A],
+  ["8233C539",0x462B],
+  ["8233C630",0x462C],
+  ["8233C631",0x462D],
+  ["8233C632",0x462E],
+  ["8233C633",0x462F],
+  ["8233C634",0x4630],
+  ["8233C635",0x4631],
+  ["8233C636",0x4632],
+  ["8233C637",0x4633],
+  ["8233C638",0x4634],
+  ["8233C639",0x4635],
+  ["8233C730",0x4636],
+  ["8233C731",0x4637],
+  ["8233C732",0x4638],
+  ["8233C733",0x4639],
+  ["8233C734",0x463A],
+  ["8233C735",0x463B],
+  ["8233C736",0x463C],
+  ["8233C737",0x463D],
+  ["8233C738",0x463E],
+  ["8233C739",0x463F],
+  ["8233C830",0x4640],
+  ["8233C831",0x4641],
+  ["8233C832",0x4642],
+  ["8233C833",0x4643],
+  ["8233C834",0x4644],
+  ["8233C835",0x4645],
+  ["8233C836",0x4646],
+  ["8233C837",0x4647],
+  ["8233C838",0x4648],
+  ["8233C839",0x4649],
+  ["8233C930",0x464A],
+  ["8233C931",0x464B],
+  ["FE7D",0x464C],
+  ["8233C932",0x464D],
+  ["8233C933",0x464E],
+  ["8233C934",0x464F],
+  ["8233C935",0x4650],
+  ["8233C936",0x4651],
+  ["8233C937",0x4652],
+  ["8233C938",0x4653],
+  ["8233C939",0x4654],
+  ["8233CA30",0x4655],
+  ["8233CA31",0x4656],
+  ["8233CA32",0x4657],
+  ["8233CA33",0x4658],
+  ["8233CA34",0x4659],
+  ["8233CA35",0x465A],
+  ["8233CA36",0x465B],
+  ["8233CA37",0x465C],
+  ["8233CA38",0x465D],
+  ["8233CA39",0x465E],
+  ["8233CB30",0x465F],
+  ["8233CB31",0x4660],
+  ["FE7C",0x4661],
+  ["8233CB32",0x4662],
+  ["8233CB33",0x4663],
+  ["8233CB34",0x4664],
+  ["8233CB35",0x4665],
+  ["8233CB36",0x4666],
+  ["8233CB37",0x4667],
+  ["8233CB38",0x4668],
+  ["8233CB39",0x4669],
+  ["8233CC30",0x466A],
+  ["8233CC31",0x466B],
+  ["8233CC32",0x466C],
+  ["8233CC33",0x466D],
+  ["8233CC34",0x466E],
+  ["8233CC35",0x466F],
+  ["8233CC36",0x4670],
+  ["8233CC37",0x4671],
+  ["8233CC38",0x4672],
+  ["8233CC39",0x4673],
+  ["8233CD30",0x4674],
+  ["8233CD31",0x4675],
+  ["8233CD32",0x4676],
+  ["8233CD33",0x4677],
+  ["8233CD34",0x4678],
+  ["8233CD35",0x4679],
+  ["8233CD36",0x467A],
+  ["8233CD37",0x467B],
+  ["8233CD38",0x467C],
+  ["8233CD39",0x467D],
+  ["8233CE30",0x467E],
+  ["8233CE31",0x467F],
+  ["8233CE32",0x4680],
+  ["8233CE33",0x4681],
+  ["8233CE34",0x4682],
+  ["8233CE35",0x4683],
+  ["8233CE36",0x4684],
+  ["8233CE37",0x4685],
+  ["8233CE38",0x4686],
+  ["8233CE39",0x4687],
+  ["8233CF30",0x4688],
+  ["8233CF31",0x4689],
+  ["8233CF32",0x468A],
+  ["8233CF33",0x468B],
+  ["8233CF34",0x468C],
+  ["8233CF35",0x468D],
+  ["8233CF36",0x468E],
+  ["8233CF37",0x468F],
+  ["8233CF38",0x4690],
+  ["8233CF39",0x4691],
+  ["8233D030",0x4692],
+  ["8233D031",0x4693],
+  ["8233D032",0x4694],
+  ["8233D033",0x4695],
+  ["8233D034",0x4696],
+  ["8233D035",0x4697],
+  ["8233D036",0x4698],
+  ["8233D037",0x4699],
+  ["8233D038",0x469A],
+  ["8233D039",0x469B],
+  ["8233D130",0x469C],
+  ["8233D131",0x469D],
+  ["8233D132",0x469E],
+  ["8233D133",0x469F],
+  ["8233D134",0x46A0],
+  ["8233D135",0x46A1],
+  ["8233D136",0x46A2],
+  ["8233D137",0x46A3],
+  ["8233D138",0x46A4],
+  ["8233D139",0x46A5],
+  ["8233D230",0x46A6],
+  ["8233D231",0x46A7],
+  ["8233D232",0x46A8],
+  ["8233D233",0x46A9],
+  ["8233D234",0x46AA],
+  ["8233D235",0x46AB],
+  ["8233D236",0x46AC],
+  ["8233D237",0x46AD],
+  ["8233D238",0x46AE],
+  ["8233D239",0x46AF],
+  ["8233D330",0x46B0],
+  ["8233D331",0x46B1],
+  ["8233D332",0x46B2],
+  ["8233D333",0x46B3],
+  ["8233D334",0x46B4],
+  ["8233D335",0x46B5],
+  ["8233D336",0x46B6],
+  ["8233D337",0x46B7],
+  ["8233D338",0x46B8],
+  ["8233D339",0x46B9],
+  ["8233D430",0x46BA],
+  ["8233D431",0x46BB],
+  ["8233D432",0x46BC],
+  ["8233D433",0x46BD],
+  ["8233D434",0x46BE],
+  ["8233D435",0x46BF],
+  ["8233D436",0x46C0],
+  ["8233D437",0x46C1],
+  ["8233D438",0x46C2],
+  ["8233D439",0x46C3],
+  ["8233D530",0x46C4],
+  ["8233D531",0x46C5],
+  ["8233D532",0x46C6],
+  ["8233D533",0x46C7],
+  ["8233D534",0x46C8],
+  ["8233D535",0x46C9],
+  ["8233D536",0x46CA],
+  ["8233D537",0x46CB],
+  ["8233D538",0x46CC],
+  ["8233D539",0x46CD],
+  ["8233D630",0x46CE],
+  ["8233D631",0x46CF],
+  ["8233D632",0x46D0],
+  ["8233D633",0x46D1],
+  ["8233D634",0x46D2],
+  ["8233D635",0x46D3],
+  ["8233D636",0x46D4],
+  ["8233D637",0x46D5],
+  ["8233D638",0x46D6],
+  ["8233D639",0x46D7],
+  ["8233D730",0x46D8],
+  ["8233D731",0x46D9],
+  ["8233D732",0x46DA],
+  ["8233D733",0x46DB],
+  ["8233D734",0x46DC],
+  ["8233D735",0x46DD],
+  ["8233D736",0x46DE],
+  ["8233D737",0x46DF],
+  ["8233D738",0x46E0],
+  ["8233D739",0x46E1],
+  ["8233D830",0x46E2],
+  ["8233D831",0x46E3],
+  ["8233D832",0x46E4],
+  ["8233D833",0x46E5],
+  ["8233D834",0x46E6],
+  ["8233D835",0x46E7],
+  ["8233D836",0x46E8],
+  ["8233D837",0x46E9],
+  ["8233D838",0x46EA],
+  ["8233D839",0x46EB],
+  ["8233D930",0x46EC],
+  ["8233D931",0x46ED],
+  ["8233D932",0x46EE],
+  ["8233D933",0x46EF],
+  ["8233D934",0x46F0],
+  ["8233D935",0x46F1],
+  ["8233D936",0x46F2],
+  ["8233D937",0x46F3],
+  ["8233D938",0x46F4],
+  ["8233D939",0x46F5],
+  ["8233DA30",0x46F6],
+  ["8233DA31",0x46F7],
+  ["8233DA32",0x46F8],
+  ["8233DA33",0x46F9],
+  ["8233DA34",0x46FA],
+  ["8233DA35",0x46FB],
+  ["8233DA36",0x46FC],
+  ["8233DA37",0x46FD],
+  ["8233DA38",0x46FE],
+  ["8233DA39",0x46FF],
+  ["8233DB30",0x4700],
+  ["8233DB31",0x4701],
+  ["8233DB32",0x4702],
+  ["8233DB33",0x4703],
+  ["8233DB34",0x4704],
+  ["8233DB35",0x4705],
+  ["8233DB36",0x4706],
+  ["8233DB37",0x4707],
+  ["8233DB38",0x4708],
+  ["8233DB39",0x4709],
+  ["8233DC30",0x470A],
+  ["8233DC31",0x470B],
+  ["8233DC32",0x470C],
+  ["8233DC33",0x470D],
+  ["8233DC34",0x470E],
+  ["8233DC35",0x470F],
+  ["8233DC36",0x4710],
+  ["8233DC37",0x4711],
+  ["8233DC38",0x4712],
+  ["8233DC39",0x4713],
+  ["8233DD30",0x4714],
+  ["8233DD31",0x4715],
+  ["8233DD32",0x4716],
+  ["8233DD33",0x4717],
+  ["8233DD34",0x4718],
+  ["8233DD35",0x4719],
+  ["8233DD36",0x471A],
+  ["8233DD37",0x471B],
+  ["8233DD38",0x471C],
+  ["8233DD39",0x471D],
+  ["8233DE30",0x471E],
+  ["8233DE31",0x471F],
+  ["8233DE32",0x4720],
+  ["8233DE33",0x4721],
+  ["8233DE34",0x4722],
+  ["FE80",0x4723],
+  ["8233DE35",0x4724],
+  ["8233DE36",0x4725],
+  ["8233DE37",0x4726],
+  ["8233DE38",0x4727],
+  ["8233DE39",0x4728],
+  ["FE81",0x4729],
+  ["8233DF30",0x472A],
+  ["8233DF31",0x472B],
+  ["8233DF32",0x472C],
+  ["8233DF33",0x472D],
+  ["8233DF34",0x472E],
+  ["8233DF35",0x472F],
+  ["8233DF36",0x4730],
+  ["8233DF37",0x4731],
+  ["8233DF38",0x4732],
+  ["8233DF39",0x4733],
+  ["8233E030",0x4734],
+  ["8233E031",0x4735],
+  ["8233E032",0x4736],
+  ["8233E033",0x4737],
+  ["8233E034",0x4738],
+  ["8233E035",0x4739],
+  ["8233E036",0x473A],
+  ["8233E037",0x473B],
+  ["8233E038",0x473C],
+  ["8233E039",0x473D],
+  ["8233E130",0x473E],
+  ["8233E131",0x473F],
+  ["8233E132",0x4740],
+  ["8233E133",0x4741],
+  ["8233E134",0x4742],
+  ["8233E135",0x4743],
+  ["8233E136",0x4744],
+  ["8233E137",0x4745],
+  ["8233E138",0x4746],
+  ["8233E139",0x4747],
+  ["8233E230",0x4748],
+  ["8233E231",0x4749],
+  ["8233E232",0x474A],
+  ["8233E233",0x474B],
+  ["8233E234",0x474C],
+  ["8233E235",0x474D],
+  ["8233E236",0x474E],
+  ["8233E237",0x474F],
+  ["8233E238",0x4750],
+  ["8233E239",0x4751],
+  ["8233E330",0x4752],
+  ["8233E331",0x4753],
+  ["8233E332",0x4754],
+  ["8233E333",0x4755],
+  ["8233E334",0x4756],
+  ["8233E335",0x4757],
+  ["8233E336",0x4758],
+  ["8233E337",0x4759],
+  ["8233E338",0x475A],
+  ["8233E339",0x475B],
+  ["8233E430",0x475C],
+  ["8233E431",0x475D],
+  ["8233E432",0x475E],
+  ["8233E433",0x475F],
+  ["8233E434",0x4760],
+  ["8233E435",0x4761],
+  ["8233E436",0x4762],
+  ["8233E437",0x4763],
+  ["8233E438",0x4764],
+  ["8233E439",0x4765],
+  ["8233E530",0x4766],
+  ["8233E531",0x4767],
+  ["8233E532",0x4768],
+  ["8233E533",0x4769],
+  ["8233E534",0x476A],
+  ["8233E535",0x476B],
+  ["8233E536",0x476C],
+  ["8233E537",0x476D],
+  ["8233E538",0x476E],
+  ["8233E539",0x476F],
+  ["8233E630",0x4770],
+  ["8233E631",0x4771],
+  ["8233E632",0x4772],
+  ["8233E633",0x4773],
+  ["8233E634",0x4774],
+  ["8233E635",0x4775],
+  ["8233E636",0x4776],
+  ["8233E637",0x4777],
+  ["8233E638",0x4778],
+  ["8233E639",0x4779],
+  ["8233E730",0x477A],
+  ["8233E731",0x477B],
+  ["FE82",0x477C],
+  ["8233E732",0x477D],
+  ["8233E733",0x477E],
+  ["8233E734",0x477F],
+  ["8233E735",0x4780],
+  ["8233E736",0x4781],
+  ["8233E737",0x4782],
+  ["8233E738",0x4783],
+  ["8233E739",0x4784],
+  ["8233E830",0x4785],
+  ["8233E831",0x4786],
+  ["8233E832",0x4787],
+  ["8233E833",0x4788],
+  ["8233E834",0x4789],
+  ["8233E835",0x478A],
+  ["8233E836",0x478B],
+  ["8233E837",0x478C],
+  ["FE83",0x478D],
+  ["8233E838",0x478E],
+  ["8233E839",0x478F],
+  ["8233E930",0x4790],
+  ["8233E931",0x4791],
+  ["8233E932",0x4792],
+  ["8233E933",0x4793],
+  ["8233E934",0x4794],
+  ["8233E935",0x4795],
+  ["8233E936",0x4796],
+  ["8233E937",0x4797],
+  ["8233E938",0x4798],
+  ["8233E939",0x4799],
+  ["8233EA30",0x479A],
+  ["8233EA31",0x479B],
+  ["8233EA32",0x479C],
+  ["8233EA33",0x479D],
+  ["8233EA34",0x479E],
+  ["8233EA35",0x479F],
+  ["8233EA36",0x47A0],
+  ["8233EA37",0x47A1],
+  ["8233EA38",0x47A2],
+  ["8233EA39",0x47A3],
+  ["8233EB30",0x47A4],
+  ["8233EB31",0x47A5],
+  ["8233EB32",0x47A6],
+  ["8233EB33",0x47A7],
+  ["8233EB34",0x47A8],
+  ["8233EB35",0x47A9],
+  ["8233EB36",0x47AA],
+  ["8233EB37",0x47AB],
+  ["8233EB38",0x47AC],
+  ["8233EB39",0x47AD],
+  ["8233EC30",0x47AE],
+  ["8233EC31",0x47AF],
+  ["8233EC32",0x47B0],
+  ["8233EC33",0x47B1],
+  ["8233EC34",0x47B2],
+  ["8233EC35",0x47B3],
+  ["8233EC36",0x47B4],
+  ["8233EC37",0x47B5],
+  ["8233EC38",0x47B6],
+  ["8233EC39",0x47B7],
+  ["8233ED30",0x47B8],
+  ["8233ED31",0x47B9],
+  ["8233ED32",0x47BA],
+  ["8233ED33",0x47BB],
+  ["8233ED34",0x47BC],
+  ["8233ED35",0x47BD],
+  ["8233ED36",0x47BE],
+  ["8233ED37",0x47BF],
+  ["8233ED38",0x47C0],
+  ["8233ED39",0x47C1],
+  ["8233EE30",0x47C2],
+  ["8233EE31",0x47C3],
+  ["8233EE32",0x47C4],
+  ["8233EE33",0x47C5],
+  ["8233EE34",0x47C6],
+  ["8233EE35",0x47C7],
+  ["8233EE36",0x47C8],
+  ["8233EE37",0x47C9],
+  ["8233EE38",0x47CA],
+  ["8233EE39",0x47CB],
+  ["8233EF30",0x47CC],
+  ["8233EF31",0x47CD],
+  ["8233EF32",0x47CE],
+  ["8233EF33",0x47CF],
+  ["8233EF34",0x47D0],
+  ["8233EF35",0x47D1],
+  ["8233EF36",0x47D2],
+  ["8233EF37",0x47D3],
+  ["8233EF38",0x47D4],
+  ["8233EF39",0x47D5],
+  ["8233F030",0x47D6],
+  ["8233F031",0x47D7],
+  ["8233F032",0x47D8],
+  ["8233F033",0x47D9],
+  ["8233F034",0x47DA],
+  ["8233F035",0x47DB],
+  ["8233F036",0x47DC],
+  ["8233F037",0x47DD],
+  ["8233F038",0x47DE],
+  ["8233F039",0x47DF],
+  ["8233F130",0x47E0],
+  ["8233F131",0x47E1],
+  ["8233F132",0x47E2],
+  ["8233F133",0x47E3],
+  ["8233F134",0x47E4],
+  ["8233F135",0x47E5],
+  ["8233F136",0x47E6],
+  ["8233F137",0x47E7],
+  ["8233F138",0x47E8],
+  ["8233F139",0x47E9],
+  ["8233F230",0x47EA],
+  ["8233F231",0x47EB],
+  ["8233F232",0x47EC],
+  ["8233F233",0x47ED],
+  ["8233F234",0x47EE],
+  ["8233F235",0x47EF],
+  ["8233F236",0x47F0],
+  ["8233F237",0x47F1],
+  ["8233F238",0x47F2],
+  ["8233F239",0x47F3],
+  ["8233F330",0x47F4],
+  ["8233F331",0x47F5],
+  ["8233F332",0x47F6],
+  ["8233F333",0x47F7],
+  ["8233F334",0x47F8],
+  ["8233F335",0x47F9],
+  ["8233F336",0x47FA],
+  ["8233F337",0x47FB],
+  ["8233F338",0x47FC],
+  ["8233F339",0x47FD],
+  ["8233F430",0x47FE],
+  ["8233F431",0x47FF],
+  ["8233F432",0x4800],
+  ["8233F433",0x4801],
+  ["8233F434",0x4802],
+  ["8233F435",0x4803],
+  ["8233F436",0x4804],
+  ["8233F437",0x4805],
+  ["8233F438",0x4806],
+  ["8233F439",0x4807],
+  ["8233F530",0x4808],
+  ["8233F531",0x4809],
+  ["8233F532",0x480A],
+  ["8233F533",0x480B],
+  ["8233F534",0x480C],
+  ["8233F535",0x480D],
+  ["8233F536",0x480E],
+  ["8233F537",0x480F],
+  ["8233F538",0x4810],
+  ["8233F539",0x4811],
+  ["8233F630",0x4812],
+  ["8233F631",0x4813],
+  ["8233F632",0x4814],
+  ["8233F633",0x4815],
+  ["8233F634",0x4816],
+  ["8233F635",0x4817],
+  ["8233F636",0x4818],
+  ["8233F637",0x4819],
+  ["8233F638",0x481A],
+  ["8233F639",0x481B],
+  ["8233F730",0x481C],
+  ["8233F731",0x481D],
+  ["8233F732",0x481E],
+  ["8233F733",0x481F],
+  ["8233F734",0x4820],
+  ["8233F735",0x4821],
+  ["8233F736",0x4822],
+  ["8233F737",0x4823],
+  ["8233F738",0x4824],
+  ["8233F739",0x4825],
+  ["8233F830",0x4826],
+  ["8233F831",0x4827],
+  ["8233F832",0x4828],
+  ["8233F833",0x4829],
+  ["8233F834",0x482A],
+  ["8233F835",0x482B],
+  ["8233F836",0x482C],
+  ["8233F837",0x482D],
+  ["8233F838",0x482E],
+  ["8233F839",0x482F],
+  ["8233F930",0x4830],
+  ["8233F931",0x4831],
+  ["8233F932",0x4832],
+  ["8233F933",0x4833],
+  ["8233F934",0x4834],
+  ["8233F935",0x4835],
+  ["8233F936",0x4836],
+  ["8233F937",0x4837],
+  ["8233F938",0x4838],
+  ["8233F939",0x4839],
+  ["8233FA30",0x483A],
+  ["8233FA31",0x483B],
+  ["8233FA32",0x483C],
+  ["8233FA33",0x483D],
+  ["8233FA34",0x483E],
+  ["8233FA35",0x483F],
+  ["8233FA36",0x4840],
+  ["8233FA37",0x4841],
+  ["8233FA38",0x4842],
+  ["8233FA39",0x4843],
+  ["8233FB30",0x4844],
+  ["8233FB31",0x4845],
+  ["8233FB32",0x4846],
+  ["8233FB33",0x4847],
+  ["8233FB34",0x4848],
+  ["8233FB35",0x4849],
+  ["8233FB36",0x484A],
+  ["8233FB37",0x484B],
+  ["8233FB38",0x484C],
+  ["8233FB39",0x484D],
+  ["8233FC30",0x484E],
+  ["8233FC31",0x484F],
+  ["8233FC32",0x4850],
+  ["8233FC33",0x4851],
+  ["8233FC34",0x4852],
+  ["8233FC35",0x4853],
+  ["8233FC36",0x4854],
+  ["8233FC37",0x4855],
+  ["8233FC38",0x4856],
+  ["8233FC39",0x4857],
+  ["8233FD30",0x4858],
+  ["8233FD31",0x4859],
+  ["8233FD32",0x485A],
+  ["8233FD33",0x485B],
+  ["8233FD34",0x485C],
+  ["8233FD35",0x485D],
+  ["8233FD36",0x485E],
+  ["8233FD37",0x485F],
+  ["8233FD38",0x4860],
+  ["8233FD39",0x4861],
+  ["8233FE30",0x4862],
+  ["8233FE31",0x4863],
+  ["8233FE32",0x4864],
+  ["8233FE33",0x4865],
+  ["8233FE34",0x4866],
+  ["8233FE35",0x4867],
+  ["8233FE36",0x4868],
+  ["8233FE37",0x4869],
+  ["8233FE38",0x486A],
+  ["8233FE39",0x486B],
+  ["82348130",0x486C],
+  ["82348131",0x486D],
+  ["82348132",0x486E],
+  ["82348133",0x486F],
+  ["82348134",0x4870],
+  ["82348135",0x4871],
+  ["82348136",0x4872],
+  ["82348137",0x4873],
+  ["82348138",0x4874],
+  ["82348139",0x4875],
+  ["82348230",0x4876],
+  ["82348231",0x4877],
+  ["82348232",0x4878],
+  ["82348233",0x4879],
+  ["82348234",0x487A],
+  ["82348235",0x487B],
+  ["82348236",0x487C],
+  ["82348237",0x487D],
+  ["82348238",0x487E],
+  ["82348239",0x487F],
+  ["82348330",0x4880],
+  ["82348331",0x4881],
+  ["82348332",0x4882],
+  ["82348333",0x4883],
+  ["82348334",0x4884],
+  ["82348335",0x4885],
+  ["82348336",0x4886],
+  ["82348337",0x4887],
+  ["82348338",0x4888],
+  ["82348339",0x4889],
+  ["82348430",0x488A],
+  ["82348431",0x488B],
+  ["82348432",0x488C],
+  ["82348433",0x488D],
+  ["82348434",0x488E],
+  ["82348435",0x488F],
+  ["82348436",0x4890],
+  ["82348437",0x4891],
+  ["82348438",0x4892],
+  ["82348439",0x4893],
+  ["82348530",0x4894],
+  ["82348531",0x4895],
+  ["82348532",0x4896],
+  ["82348533",0x4897],
+  ["82348534",0x4898],
+  ["82348535",0x4899],
+  ["82348536",0x489A],
+  ["82348537",0x489B],
+  ["82348538",0x489C],
+  ["82348539",0x489D],
+  ["82348630",0x489E],
+  ["82348631",0x489F],
+  ["82348632",0x48A0],
+  ["82348633",0x48A1],
+  ["82348634",0x48A2],
+  ["82348635",0x48A3],
+  ["82348636",0x48A4],
+  ["82348637",0x48A5],
+  ["82348638",0x48A6],
+  ["82348639",0x48A7],
+  ["82348730",0x48A8],
+  ["82348731",0x48A9],
+  ["82348732",0x48AA],
+  ["82348733",0x48AB],
+  ["82348734",0x48AC],
+  ["82348735",0x48AD],
+  ["82348736",0x48AE],
+  ["82348737",0x48AF],
+  ["82348738",0x48B0],
+  ["82348739",0x48B1],
+  ["82348830",0x48B2],
+  ["82348831",0x48B3],
+  ["82348832",0x48B4],
+  ["82348833",0x48B5],
+  ["82348834",0x48B6],
+  ["82348835",0x48B7],
+  ["82348836",0x48B8],
+  ["82348837",0x48B9],
+  ["82348838",0x48BA],
+  ["82348839",0x48BB],
+  ["82348930",0x48BC],
+  ["82348931",0x48BD],
+  ["82348932",0x48BE],
+  ["82348933",0x48BF],
+  ["82348934",0x48C0],
+  ["82348935",0x48C1],
+  ["82348936",0x48C2],
+  ["82348937",0x48C3],
+  ["82348938",0x48C4],
+  ["82348939",0x48C5],
+  ["82348A30",0x48C6],
+  ["82348A31",0x48C7],
+  ["82348A32",0x48C8],
+  ["82348A33",0x48C9],
+  ["82348A34",0x48CA],
+  ["82348A35",0x48CB],
+  ["82348A36",0x48CC],
+  ["82348A37",0x48CD],
+  ["82348A38",0x48CE],
+  ["82348A39",0x48CF],
+  ["82348B30",0x48D0],
+  ["82348B31",0x48D1],
+  ["82348B32",0x48D2],
+  ["82348B33",0x48D3],
+  ["82348B34",0x48D4],
+  ["82348B35",0x48D5],
+  ["82348B36",0x48D6],
+  ["82348B37",0x48D7],
+  ["82348B38",0x48D8],
+  ["82348B39",0x48D9],
+  ["82348C30",0x48DA],
+  ["82348C31",0x48DB],
+  ["82348C32",0x48DC],
+  ["82348C33",0x48DD],
+  ["82348C34",0x48DE],
+  ["82348C35",0x48DF],
+  ["82348C36",0x48E0],
+  ["82348C37",0x48E1],
+  ["82348C38",0x48E2],
+  ["82348C39",0x48E3],
+  ["82348D30",0x48E4],
+  ["82348D31",0x48E5],
+  ["82348D32",0x48E6],
+  ["82348D33",0x48E7],
+  ["82348D34",0x48E8],
+  ["82348D35",0x48E9],
+  ["82348D36",0x48EA],
+  ["82348D37",0x48EB],
+  ["82348D38",0x48EC],
+  ["82348D39",0x48ED],
+  ["82348E30",0x48EE],
+  ["82348E31",0x48EF],
+  ["82348E32",0x48F0],
+  ["82348E33",0x48F1],
+  ["82348E34",0x48F2],
+  ["82348E35",0x48F3],
+  ["82348E36",0x48F4],
+  ["82348E37",0x48F5],
+  ["82348E38",0x48F6],
+  ["82348E39",0x48F7],
+  ["82348F30",0x48F8],
+  ["82348F31",0x48F9],
+  ["82348F32",0x48FA],
+  ["82348F33",0x48FB],
+  ["82348F34",0x48FC],
+  ["82348F35",0x48FD],
+  ["82348F36",0x48FE],
+  ["82348F37",0x48FF],
+  ["82348F38",0x4900],
+  ["82348F39",0x4901],
+  ["82349030",0x4902],
+  ["82349031",0x4903],
+  ["82349032",0x4904],
+  ["82349033",0x4905],
+  ["82349034",0x4906],
+  ["82349035",0x4907],
+  ["82349036",0x4908],
+  ["82349037",0x4909],
+  ["82349038",0x490A],
+  ["82349039",0x490B],
+  ["82349130",0x490C],
+  ["82349131",0x490D],
+  ["82349132",0x490E],
+  ["82349133",0x490F],
+  ["82349134",0x4910],
+  ["82349135",0x4911],
+  ["82349136",0x4912],
+  ["82349137",0x4913],
+  ["82349138",0x4914],
+  ["82349139",0x4915],
+  ["82349230",0x4916],
+  ["82349231",0x4917],
+  ["82349232",0x4918],
+  ["82349233",0x4919],
+  ["82349234",0x491A],
+  ["82349235",0x491B],
+  ["82349236",0x491C],
+  ["82349237",0x491D],
+  ["82349238",0x491E],
+  ["82349239",0x491F],
+  ["82349330",0x4920],
+  ["82349331",0x4921],
+  ["82349332",0x4922],
+  ["82349333",0x4923],
+  ["82349334",0x4924],
+  ["82349335",0x4925],
+  ["82349336",0x4926],
+  ["82349337",0x4927],
+  ["82349338",0x4928],
+  ["82349339",0x4929],
+  ["82349430",0x492A],
+  ["82349431",0x492B],
+  ["82349432",0x492C],
+  ["82349433",0x492D],
+  ["82349434",0x492E],
+  ["82349435",0x492F],
+  ["82349436",0x4930],
+  ["82349437",0x4931],
+  ["82349438",0x4932],
+  ["82349439",0x4933],
+  ["82349530",0x4934],
+  ["82349531",0x4935],
+  ["82349532",0x4936],
+  ["82349533",0x4937],
+  ["82349534",0x4938],
+  ["82349535",0x4939],
+  ["82349536",0x493A],
+  ["82349537",0x493B],
+  ["82349538",0x493C],
+  ["82349539",0x493D],
+  ["82349630",0x493E],
+  ["82349631",0x493F],
+  ["82349632",0x4940],
+  ["82349633",0x4941],
+  ["82349634",0x4942],
+  ["82349635",0x4943],
+  ["82349636",0x4944],
+  ["82349637",0x4945],
+  ["82349638",0x4946],
+  ["FE85",0x4947],
+  ["82349639",0x4948],
+  ["82349730",0x4949],
+  ["82349731",0x494A],
+  ["82349732",0x494B],
+  ["82349733",0x494C],
+  ["82349734",0x494D],
+  ["82349735",0x494E],
+  ["82349736",0x494F],
+  ["82349737",0x4950],
+  ["82349738",0x4951],
+  ["82349739",0x4952],
+  ["82349830",0x4953],
+  ["82349831",0x4954],
+  ["82349832",0x4955],
+  ["82349833",0x4956],
+  ["82349834",0x4957],
+  ["82349835",0x4958],
+  ["82349836",0x4959],
+  ["82349837",0x495A],
+  ["82349838",0x495B],
+  ["82349839",0x495C],
+  ["82349930",0x495D],
+  ["82349931",0x495E],
+  ["82349932",0x495F],
+  ["82349933",0x4960],
+  ["82349934",0x4961],
+  ["82349935",0x4962],
+  ["82349936",0x4963],
+  ["82349937",0x4964],
+  ["82349938",0x4965],
+  ["82349939",0x4966],
+  ["82349A30",0x4967],
+  ["82349A31",0x4968],
+  ["82349A32",0x4969],
+  ["82349A33",0x496A],
+  ["82349A34",0x496B],
+  ["82349A35",0x496C],
+  ["82349A36",0x496D],
+  ["82349A37",0x496E],
+  ["82349A38",0x496F],
+  ["82349A39",0x4970],
+  ["82349B30",0x4971],
+  ["82349B31",0x4972],
+  ["82349B32",0x4973],
+  ["82349B33",0x4974],
+  ["82349B34",0x4975],
+  ["82349B35",0x4976],
+  ["82349B36",0x4977],
+  ["82349B37",0x4978],
+  ["82349B38",0x4979],
+  ["FE86",0x497A],
+  ["82349B39",0x497B],
+  ["82349C30",0x497C],
+  ["FE87",0x497D],
+  ["82349C31",0x497E],
+  ["82349C32",0x497F],
+  ["82349C33",0x4980],
+  ["82349C34",0x4981],
+  ["FE88",0x4982],
+  ["FE89",0x4983],
+  ["82349C35",0x4984],
+  ["FE8A",0x4985],
+  ["FE8B",0x4986],
+  ["82349C36",0x4987],
+  ["82349C37",0x4988],
+  ["82349C38",0x4989],
+  ["82349C39",0x498A],
+  ["82349D30",0x498B],
+  ["82349D31",0x498C],
+  ["82349D32",0x498D],
+  ["82349D33",0x498E],
+  ["82349D34",0x498F],
+  ["82349D35",0x4990],
+  ["82349D36",0x4991],
+  ["82349D37",0x4992],
+  ["82349D38",0x4993],
+  ["82349D39",0x4994],
+  ["82349E30",0x4995],
+  ["82349E31",0x4996],
+  ["82349E32",0x4997],
+  ["82349E33",0x4998],
+  ["82349E34",0x4999],
+  ["82349E35",0x499A],
+  ["FE8D",0x499B],
+  ["82349E36",0x499C],
+  ["82349E37",0x499D],
+  ["82349E38",0x499E],
+  ["FE8C",0x499F],
+  ["82349E39",0x49A0],
+  ["82349F30",0x49A1],
+  ["82349F31",0x49A2],
+  ["82349F32",0x49A3],
+  ["82349F33",0x49A4],
+  ["82349F34",0x49A5],
+  ["82349F35",0x49A6],
+  ["82349F36",0x49A7],
+  ["82349F37",0x49A8],
+  ["82349F38",0x49A9],
+  ["82349F39",0x49AA],
+  ["8234A030",0x49AB],
+  ["8234A031",0x49AC],
+  ["8234A032",0x49AD],
+  ["8234A033",0x49AE],
+  ["8234A034",0x49AF],
+  ["8234A035",0x49B0],
+  ["8234A036",0x49B1],
+  ["8234A037",0x49B2],
+  ["8234A038",0x49B3],
+  ["8234A039",0x49B4],
+  ["8234A130",0x49B5],
+  ["FE8F",0x49B6],
+  ["FE8E",0x49B7],
+  ["8234A131",0x49B8],
+  ["8234A132",0x49B9],
+  ["8234A133",0x49BA],
+  ["8234A134",0x49BB],
+  ["8234A135",0x49BC],
+  ["8234A136",0x49BD],
+  ["8234A137",0x49BE],
+  ["8234A138",0x49BF],
+  ["8234A139",0x49C0],
+  ["8234A230",0x49C1],
+  ["8234A231",0x49C2],
+  ["8234A232",0x49C3],
+  ["8234A233",0x49C4],
+  ["8234A234",0x49C5],
+  ["8234A235",0x49C6],
+  ["8234A236",0x49C7],
+  ["8234A237",0x49C8],
+  ["8234A238",0x49C9],
+  ["8234A239",0x49CA],
+  ["8234A330",0x49CB],
+  ["8234A331",0x49CC],
+  ["8234A332",0x49CD],
+  ["8234A333",0x49CE],
+  ["8234A334",0x49CF],
+  ["8234A335",0x49D0],
+  ["8234A336",0x49D1],
+  ["8234A337",0x49D2],
+  ["8234A338",0x49D3],
+  ["8234A339",0x49D4],
+  ["8234A430",0x49D5],
+  ["8234A431",0x49D6],
+  ["8234A432",0x49D7],
+  ["8234A433",0x49D8],
+  ["8234A434",0x49D9],
+  ["8234A435",0x49DA],
+  ["8234A436",0x49DB],
+  ["8234A437",0x49DC],
+  ["8234A438",0x49DD],
+  ["8234A439",0x49DE],
+  ["8234A530",0x49DF],
+  ["8234A531",0x49E0],
+  ["8234A532",0x49E1],
+  ["8234A533",0x49E2],
+  ["8234A534",0x49E3],
+  ["8234A535",0x49E4],
+  ["8234A536",0x49E5],
+  ["8234A537",0x49E6],
+  ["8234A538",0x49E7],
+  ["8234A539",0x49E8],
+  ["8234A630",0x49E9],
+  ["8234A631",0x49EA],
+  ["8234A632",0x49EB],
+  ["8234A633",0x49EC],
+  ["8234A634",0x49ED],
+  ["8234A635",0x49EE],
+  ["8234A636",0x49EF],
+  ["8234A637",0x49F0],
+  ["8234A638",0x49F1],
+  ["8234A639",0x49F2],
+  ["8234A730",0x49F3],
+  ["8234A731",0x49F4],
+  ["8234A732",0x49F5],
+  ["8234A733",0x49F6],
+  ["8234A734",0x49F7],
+  ["8234A735",0x49F8],
+  ["8234A736",0x49F9],
+  ["8234A737",0x49FA],
+  ["8234A738",0x49FB],
+  ["8234A739",0x49FC],
+  ["8234A830",0x49FD],
+  ["8234A831",0x49FE],
+  ["8234A832",0x49FF],
+  ["8234A833",0x4A00],
+  ["8234A834",0x4A01],
+  ["8234A835",0x4A02],
+  ["8234A836",0x4A03],
+  ["8234A837",0x4A04],
+  ["8234A838",0x4A05],
+  ["8234A839",0x4A06],
+  ["8234A930",0x4A07],
+  ["8234A931",0x4A08],
+  ["8234A932",0x4A09],
+  ["8234A933",0x4A0A],
+  ["8234A934",0x4A0B],
+  ["8234A935",0x4A0C],
+  ["8234A936",0x4A0D],
+  ["8234A937",0x4A0E],
+  ["8234A938",0x4A0F],
+  ["8234A939",0x4A10],
+  ["8234AA30",0x4A11],
+  ["8234AA31",0x4A12],
+  ["8234AA32",0x4A13],
+  ["8234AA33",0x4A14],
+  ["8234AA34",0x4A15],
+  ["8234AA35",0x4A16],
+  ["8234AA36",0x4A17],
+  ["8234AA37",0x4A18],
+  ["8234AA38",0x4A19],
+  ["8234AA39",0x4A1A],
+  ["8234AB30",0x4A1B],
+  ["8234AB31",0x4A1C],
+  ["8234AB32",0x4A1D],
+  ["8234AB33",0x4A1E],
+  ["8234AB34",0x4A1F],
+  ["8234AB35",0x4A20],
+  ["8234AB36",0x4A21],
+  ["8234AB37",0x4A22],
+  ["8234AB38",0x4A23],
+  ["8234AB39",0x4A24],
+  ["8234AC30",0x4A25],
+  ["8234AC31",0x4A26],
+  ["8234AC32",0x4A27],
+  ["8234AC33",0x4A28],
+  ["8234AC34",0x4A29],
+  ["8234AC35",0x4A2A],
+  ["8234AC36",0x4A2B],
+  ["8234AC37",0x4A2C],
+  ["8234AC38",0x4A2D],
+  ["8234AC39",0x4A2E],
+  ["8234AD30",0x4A2F],
+  ["8234AD31",0x4A30],
+  ["8234AD32",0x4A31],
+  ["8234AD33",0x4A32],
+  ["8234AD34",0x4A33],
+  ["8234AD35",0x4A34],
+  ["8234AD36",0x4A35],
+  ["8234AD37",0x4A36],
+  ["8234AD38",0x4A37],
+  ["8234AD39",0x4A38],
+  ["8234AE30",0x4A39],
+  ["8234AE31",0x4A3A],
+  ["8234AE32",0x4A3B],
+  ["8234AE33",0x4A3C],
+  ["8234AE34",0x4A3D],
+  ["8234AE35",0x4A3E],
+  ["8234AE36",0x4A3F],
+  ["8234AE37",0x4A40],
+  ["8234AE38",0x4A41],
+  ["8234AE39",0x4A42],
+  ["8234AF30",0x4A43],
+  ["8234AF31",0x4A44],
+  ["8234AF32",0x4A45],
+  ["8234AF33",0x4A46],
+  ["8234AF34",0x4A47],
+  ["8234AF35",0x4A48],
+  ["8234AF36",0x4A49],
+  ["8234AF37",0x4A4A],
+  ["8234AF38",0x4A4B],
+  ["8234AF39",0x4A4C],
+  ["8234B030",0x4A4D],
+  ["8234B031",0x4A4E],
+  ["8234B032",0x4A4F],
+  ["8234B033",0x4A50],
+  ["8234B034",0x4A51],
+  ["8234B035",0x4A52],
+  ["8234B036",0x4A53],
+  ["8234B037",0x4A54],
+  ["8234B038",0x4A55],
+  ["8234B039",0x4A56],
+  ["8234B130",0x4A57],
+  ["8234B131",0x4A58],
+  ["8234B132",0x4A59],
+  ["8234B133",0x4A5A],
+  ["8234B134",0x4A5B],
+  ["8234B135",0x4A5C],
+  ["8234B136",0x4A5D],
+  ["8234B137",0x4A5E],
+  ["8234B138",0x4A5F],
+  ["8234B139",0x4A60],
+  ["8234B230",0x4A61],
+  ["8234B231",0x4A62],
+  ["8234B232",0x4A63],
+  ["8234B233",0x4A64],
+  ["8234B234",0x4A65],
+  ["8234B235",0x4A66],
+  ["8234B236",0x4A67],
+  ["8234B237",0x4A68],
+  ["8234B238",0x4A69],
+  ["8234B239",0x4A6A],
+  ["8234B330",0x4A6B],
+  ["8234B331",0x4A6C],
+  ["8234B332",0x4A6D],
+  ["8234B333",0x4A6E],
+  ["8234B334",0x4A6F],
+  ["8234B335",0x4A70],
+  ["8234B336",0x4A71],
+  ["8234B337",0x4A72],
+  ["8234B338",0x4A73],
+  ["8234B339",0x4A74],
+  ["8234B430",0x4A75],
+  ["8234B431",0x4A76],
+  ["8234B432",0x4A77],
+  ["8234B433",0x4A78],
+  ["8234B434",0x4A79],
+  ["8234B435",0x4A7A],
+  ["8234B436",0x4A7B],
+  ["8234B437",0x4A7C],
+  ["8234B438",0x4A7D],
+  ["8234B439",0x4A7E],
+  ["8234B530",0x4A7F],
+  ["8234B531",0x4A80],
+  ["8234B532",0x4A81],
+  ["8234B533",0x4A82],
+  ["8234B534",0x4A83],
+  ["8234B535",0x4A84],
+  ["8234B536",0x4A85],
+  ["8234B537",0x4A86],
+  ["8234B538",0x4A87],
+  ["8234B539",0x4A88],
+  ["8234B630",0x4A89],
+  ["8234B631",0x4A8A],
+  ["8234B632",0x4A8B],
+  ["8234B633",0x4A8C],
+  ["8234B634",0x4A8D],
+  ["8234B635",0x4A8E],
+  ["8234B636",0x4A8F],
+  ["8234B637",0x4A90],
+  ["8234B638",0x4A91],
+  ["8234B639",0x4A92],
+  ["8234B730",0x4A93],
+  ["8234B731",0x4A94],
+  ["8234B732",0x4A95],
+  ["8234B733",0x4A96],
+  ["8234B734",0x4A97],
+  ["8234B735",0x4A98],
+  ["8234B736",0x4A99],
+  ["8234B737",0x4A9A],
+  ["8234B738",0x4A9B],
+  ["8234B739",0x4A9C],
+  ["8234B830",0x4A9D],
+  ["8234B831",0x4A9E],
+  ["8234B832",0x4A9F],
+  ["8234B833",0x4AA0],
+  ["8234B834",0x4AA1],
+  ["8234B835",0x4AA2],
+  ["8234B836",0x4AA3],
+  ["8234B837",0x4AA4],
+  ["8234B838",0x4AA5],
+  ["8234B839",0x4AA6],
+  ["8234B930",0x4AA7],
+  ["8234B931",0x4AA8],
+  ["8234B932",0x4AA9],
+  ["8234B933",0x4AAA],
+  ["8234B934",0x4AAB],
+  ["8234B935",0x4AAC],
+  ["8234B936",0x4AAD],
+  ["8234B937",0x4AAE],
+  ["8234B938",0x4AAF],
+  ["8234B939",0x4AB0],
+  ["8234BA30",0x4AB1],
+  ["8234BA31",0x4AB2],
+  ["8234BA32",0x4AB3],
+  ["8234BA33",0x4AB4],
+  ["8234BA34",0x4AB5],
+  ["8234BA35",0x4AB6],
+  ["8234BA36",0x4AB7],
+  ["8234BA37",0x4AB8],
+  ["8234BA38",0x4AB9],
+  ["8234BA39",0x4ABA],
+  ["8234BB30",0x4ABB],
+  ["8234BB31",0x4ABC],
+  ["8234BB32",0x4ABD],
+  ["8234BB33",0x4ABE],
+  ["8234BB34",0x4ABF],
+  ["8234BB35",0x4AC0],
+  ["8234BB36",0x4AC1],
+  ["8234BB37",0x4AC2],
+  ["8234BB38",0x4AC3],
+  ["8234BB39",0x4AC4],
+  ["8234BC30",0x4AC5],
+  ["8234BC31",0x4AC6],
+  ["8234BC32",0x4AC7],
+  ["8234BC33",0x4AC8],
+  ["8234BC34",0x4AC9],
+  ["8234BC35",0x4ACA],
+  ["8234BC36",0x4ACB],
+  ["8234BC37",0x4ACC],
+  ["8234BC38",0x4ACD],
+  ["8234BC39",0x4ACE],
+  ["8234BD30",0x4ACF],
+  ["8234BD31",0x4AD0],
+  ["8234BD32",0x4AD1],
+  ["8234BD33",0x4AD2],
+  ["8234BD34",0x4AD3],
+  ["8234BD35",0x4AD4],
+  ["8234BD36",0x4AD5],
+  ["8234BD37",0x4AD6],
+  ["8234BD38",0x4AD7],
+  ["8234BD39",0x4AD8],
+  ["8234BE30",0x4AD9],
+  ["8234BE31",0x4ADA],
+  ["8234BE32",0x4ADB],
+  ["8234BE33",0x4ADC],
+  ["8234BE34",0x4ADD],
+  ["8234BE35",0x4ADE],
+  ["8234BE36",0x4ADF],
+  ["8234BE37",0x4AE0],
+  ["8234BE38",0x4AE1],
+  ["8234BE39",0x4AE2],
+  ["8234BF30",0x4AE3],
+  ["8234BF31",0x4AE4],
+  ["8234BF32",0x4AE5],
+  ["8234BF33",0x4AE6],
+  ["8234BF34",0x4AE7],
+  ["8234BF35",0x4AE8],
+  ["8234BF36",0x4AE9],
+  ["8234BF37",0x4AEA],
+  ["8234BF38",0x4AEB],
+  ["8234BF39",0x4AEC],
+  ["8234C030",0x4AED],
+  ["8234C031",0x4AEE],
+  ["8234C032",0x4AEF],
+  ["8234C033",0x4AF0],
+  ["8234C034",0x4AF1],
+  ["8234C035",0x4AF2],
+  ["8234C036",0x4AF3],
+  ["8234C037",0x4AF4],
+  ["8234C038",0x4AF5],
+  ["8234C039",0x4AF6],
+  ["8234C130",0x4AF7],
+  ["8234C131",0x4AF8],
+  ["8234C132",0x4AF9],
+  ["8234C133",0x4AFA],
+  ["8234C134",0x4AFB],
+  ["8234C135",0x4AFC],
+  ["8234C136",0x4AFD],
+  ["8234C137",0x4AFE],
+  ["8234C138",0x4AFF],
+  ["8234C139",0x4B00],
+  ["8234C230",0x4B01],
+  ["8234C231",0x4B02],
+  ["8234C232",0x4B03],
+  ["8234C233",0x4B04],
+  ["8234C234",0x4B05],
+  ["8234C235",0x4B06],
+  ["8234C236",0x4B07],
+  ["8234C237",0x4B08],
+  ["8234C238",0x4B09],
+  ["8234C239",0x4B0A],
+  ["8234C330",0x4B0B],
+  ["8234C331",0x4B0C],
+  ["8234C332",0x4B0D],
+  ["8234C333",0x4B0E],
+  ["8234C334",0x4B0F],
+  ["8234C335",0x4B10],
+  ["8234C336",0x4B11],
+  ["8234C337",0x4B12],
+  ["8234C338",0x4B13],
+  ["8234C339",0x4B14],
+  ["8234C430",0x4B15],
+  ["8234C431",0x4B16],
+  ["8234C432",0x4B17],
+  ["8234C433",0x4B18],
+  ["8234C434",0x4B19],
+  ["8234C435",0x4B1A],
+  ["8234C436",0x4B1B],
+  ["8234C437",0x4B1C],
+  ["8234C438",0x4B1D],
+  ["8234C439",0x4B1E],
+  ["8234C530",0x4B1F],
+  ["8234C531",0x4B20],
+  ["8234C532",0x4B21],
+  ["8234C533",0x4B22],
+  ["8234C534",0x4B23],
+  ["8234C535",0x4B24],
+  ["8234C536",0x4B25],
+  ["8234C537",0x4B26],
+  ["8234C538",0x4B27],
+  ["8234C539",0x4B28],
+  ["8234C630",0x4B29],
+  ["8234C631",0x4B2A],
+  ["8234C632",0x4B2B],
+  ["8234C633",0x4B2C],
+  ["8234C634",0x4B2D],
+  ["8234C635",0x4B2E],
+  ["8234C636",0x4B2F],
+  ["8234C637",0x4B30],
+  ["8234C638",0x4B31],
+  ["8234C639",0x4B32],
+  ["8234C730",0x4B33],
+  ["8234C731",0x4B34],
+  ["8234C732",0x4B35],
+  ["8234C733",0x4B36],
+  ["8234C734",0x4B37],
+  ["8234C735",0x4B38],
+  ["8234C736",0x4B39],
+  ["8234C737",0x4B3A],
+  ["8234C738",0x4B3B],
+  ["8234C739",0x4B3C],
+  ["8234C830",0x4B3D],
+  ["8234C831",0x4B3E],
+  ["8234C832",0x4B3F],
+  ["8234C833",0x4B40],
+  ["8234C834",0x4B41],
+  ["8234C835",0x4B42],
+  ["8234C836",0x4B43],
+  ["8234C837",0x4B44],
+  ["8234C838",0x4B45],
+  ["8234C839",0x4B46],
+  ["8234C930",0x4B47],
+  ["8234C931",0x4B48],
+  ["8234C932",0x4B49],
+  ["8234C933",0x4B4A],
+  ["8234C934",0x4B4B],
+  ["8234C935",0x4B4C],
+  ["8234C936",0x4B4D],
+  ["8234C937",0x4B4E],
+  ["8234C938",0x4B4F],
+  ["8234C939",0x4B50],
+  ["8234CA30",0x4B51],
+  ["8234CA31",0x4B52],
+  ["8234CA32",0x4B53],
+  ["8234CA33",0x4B54],
+  ["8234CA34",0x4B55],
+  ["8234CA35",0x4B56],
+  ["8234CA36",0x4B57],
+  ["8234CA37",0x4B58],
+  ["8234CA38",0x4B59],
+  ["8234CA39",0x4B5A],
+  ["8234CB30",0x4B5B],
+  ["8234CB31",0x4B5C],
+  ["8234CB32",0x4B5D],
+  ["8234CB33",0x4B5E],
+  ["8234CB34",0x4B5F],
+  ["8234CB35",0x4B60],
+  ["8234CB36",0x4B61],
+  ["8234CB37",0x4B62],
+  ["8234CB38",0x4B63],
+  ["8234CB39",0x4B64],
+  ["8234CC30",0x4B65],
+  ["8234CC31",0x4B66],
+  ["8234CC32",0x4B67],
+  ["8234CC33",0x4B68],
+  ["8234CC34",0x4B69],
+  ["8234CC35",0x4B6A],
+  ["8234CC36",0x4B6B],
+  ["8234CC37",0x4B6C],
+  ["8234CC38",0x4B6D],
+  ["8234CC39",0x4B6E],
+  ["8234CD30",0x4B6F],
+  ["8234CD31",0x4B70],
+  ["8234CD32",0x4B71],
+  ["8234CD33",0x4B72],
+  ["8234CD34",0x4B73],
+  ["8234CD35",0x4B74],
+  ["8234CD36",0x4B75],
+  ["8234CD37",0x4B76],
+  ["8234CD38",0x4B77],
+  ["8234CD39",0x4B78],
+  ["8234CE30",0x4B79],
+  ["8234CE31",0x4B7A],
+  ["8234CE32",0x4B7B],
+  ["8234CE33",0x4B7C],
+  ["8234CE34",0x4B7D],
+  ["8234CE35",0x4B7E],
+  ["8234CE36",0x4B7F],
+  ["8234CE37",0x4B80],
+  ["8234CE38",0x4B81],
+  ["8234CE39",0x4B82],
+  ["8234CF30",0x4B83],
+  ["8234CF31",0x4B84],
+  ["8234CF32",0x4B85],
+  ["8234CF33",0x4B86],
+  ["8234CF34",0x4B87],
+  ["8234CF35",0x4B88],
+  ["8234CF36",0x4B89],
+  ["8234CF37",0x4B8A],
+  ["8234CF38",0x4B8B],
+  ["8234CF39",0x4B8C],
+  ["8234D030",0x4B8D],
+  ["8234D031",0x4B8E],
+  ["8234D032",0x4B8F],
+  ["8234D033",0x4B90],
+  ["8234D034",0x4B91],
+  ["8234D035",0x4B92],
+  ["8234D036",0x4B93],
+  ["8234D037",0x4B94],
+  ["8234D038",0x4B95],
+  ["8234D039",0x4B96],
+  ["8234D130",0x4B97],
+  ["8234D131",0x4B98],
+  ["8234D132",0x4B99],
+  ["8234D133",0x4B9A],
+  ["8234D134",0x4B9B],
+  ["8234D135",0x4B9C],
+  ["8234D136",0x4B9D],
+  ["8234D137",0x4B9E],
+  ["8234D138",0x4B9F],
+  ["8234D139",0x4BA0],
+  ["8234D230",0x4BA1],
+  ["8234D231",0x4BA2],
+  ["8234D232",0x4BA3],
+  ["8234D233",0x4BA4],
+  ["8234D234",0x4BA5],
+  ["8234D235",0x4BA6],
+  ["8234D236",0x4BA7],
+  ["8234D237",0x4BA8],
+  ["8234D238",0x4BA9],
+  ["8234D239",0x4BAA],
+  ["8234D330",0x4BAB],
+  ["8234D331",0x4BAC],
+  ["8234D332",0x4BAD],
+  ["8234D333",0x4BAE],
+  ["8234D334",0x4BAF],
+  ["8234D335",0x4BB0],
+  ["8234D336",0x4BB1],
+  ["8234D337",0x4BB2],
+  ["8234D338",0x4BB3],
+  ["8234D339",0x4BB4],
+  ["8234D430",0x4BB5],
+  ["8234D431",0x4BB6],
+  ["8234D432",0x4BB7],
+  ["8234D433",0x4BB8],
+  ["8234D434",0x4BB9],
+  ["8234D435",0x4BBA],
+  ["8234D436",0x4BBB],
+  ["8234D437",0x4BBC],
+  ["8234D438",0x4BBD],
+  ["8234D439",0x4BBE],
+  ["8234D530",0x4BBF],
+  ["8234D531",0x4BC0],
+  ["8234D532",0x4BC1],
+  ["8234D533",0x4BC2],
+  ["8234D534",0x4BC3],
+  ["8234D535",0x4BC4],
+  ["8234D536",0x4BC5],
+  ["8234D537",0x4BC6],
+  ["8234D538",0x4BC7],
+  ["8234D539",0x4BC8],
+  ["8234D630",0x4BC9],
+  ["8234D631",0x4BCA],
+  ["8234D632",0x4BCB],
+  ["8234D633",0x4BCC],
+  ["8234D634",0x4BCD],
+  ["8234D635",0x4BCE],
+  ["8234D636",0x4BCF],
+  ["8234D637",0x4BD0],
+  ["8234D638",0x4BD1],
+  ["8234D639",0x4BD2],
+  ["8234D730",0x4BD3],
+  ["8234D731",0x4BD4],
+  ["8234D732",0x4BD5],
+  ["8234D733",0x4BD6],
+  ["8234D734",0x4BD7],
+  ["8234D735",0x4BD8],
+  ["8234D736",0x4BD9],
+  ["8234D737",0x4BDA],
+  ["8234D738",0x4BDB],
+  ["8234D739",0x4BDC],
+  ["8234D830",0x4BDD],
+  ["8234D831",0x4BDE],
+  ["8234D832",0x4BDF],
+  ["8234D833",0x4BE0],
+  ["8234D834",0x4BE1],
+  ["8234D835",0x4BE2],
+  ["8234D836",0x4BE3],
+  ["8234D837",0x4BE4],
+  ["8234D838",0x4BE5],
+  ["8234D839",0x4BE6],
+  ["8234D930",0x4BE7],
+  ["8234D931",0x4BE8],
+  ["8234D932",0x4BE9],
+  ["8234D933",0x4BEA],
+  ["8234D934",0x4BEB],
+  ["8234D935",0x4BEC],
+  ["8234D936",0x4BED],
+  ["8234D937",0x4BEE],
+  ["8234D938",0x4BEF],
+  ["8234D939",0x4BF0],
+  ["8234DA30",0x4BF1],
+  ["8234DA31",0x4BF2],
+  ["8234DA32",0x4BF3],
+  ["8234DA33",0x4BF4],
+  ["8234DA34",0x4BF5],
+  ["8234DA35",0x4BF6],
+  ["8234DA36",0x4BF7],
+  ["8234DA37",0x4BF8],
+  ["8234DA38",0x4BF9],
+  ["8234DA39",0x4BFA],
+  ["8234DB30",0x4BFB],
+  ["8234DB31",0x4BFC],
+  ["8234DB32",0x4BFD],
+  ["8234DB33",0x4BFE],
+  ["8234DB34",0x4BFF],
+  ["8234DB35",0x4C00],
+  ["8234DB36",0x4C01],
+  ["8234DB37",0x4C02],
+  ["8234DB38",0x4C03],
+  ["8234DB39",0x4C04],
+  ["8234DC30",0x4C05],
+  ["8234DC31",0x4C06],
+  ["8234DC32",0x4C07],
+  ["8234DC33",0x4C08],
+  ["8234DC34",0x4C09],
+  ["8234DC35",0x4C0A],
+  ["8234DC36",0x4C0B],
+  ["8234DC37",0x4C0C],
+  ["8234DC38",0x4C0D],
+  ["8234DC39",0x4C0E],
+  ["8234DD30",0x4C0F],
+  ["8234DD31",0x4C10],
+  ["8234DD32",0x4C11],
+  ["8234DD33",0x4C12],
+  ["8234DD34",0x4C13],
+  ["8234DD35",0x4C14],
+  ["8234DD36",0x4C15],
+  ["8234DD37",0x4C16],
+  ["8234DD38",0x4C17],
+  ["8234DD39",0x4C18],
+  ["8234DE30",0x4C19],
+  ["8234DE31",0x4C1A],
+  ["8234DE32",0x4C1B],
+  ["8234DE33",0x4C1C],
+  ["8234DE34",0x4C1D],
+  ["8234DE35",0x4C1E],
+  ["8234DE36",0x4C1F],
+  ["8234DE37",0x4C20],
+  ["8234DE38",0x4C21],
+  ["8234DE39",0x4C22],
+  ["8234DF30",0x4C23],
+  ["8234DF31",0x4C24],
+  ["8234DF32",0x4C25],
+  ["8234DF33",0x4C26],
+  ["8234DF34",0x4C27],
+  ["8234DF35",0x4C28],
+  ["8234DF36",0x4C29],
+  ["8234DF37",0x4C2A],
+  ["8234DF38",0x4C2B],
+  ["8234DF39",0x4C2C],
+  ["8234E030",0x4C2D],
+  ["8234E031",0x4C2E],
+  ["8234E032",0x4C2F],
+  ["8234E033",0x4C30],
+  ["8234E034",0x4C31],
+  ["8234E035",0x4C32],
+  ["8234E036",0x4C33],
+  ["8234E037",0x4C34],
+  ["8234E038",0x4C35],
+  ["8234E039",0x4C36],
+  ["8234E130",0x4C37],
+  ["8234E131",0x4C38],
+  ["8234E132",0x4C39],
+  ["8234E133",0x4C3A],
+  ["8234E134",0x4C3B],
+  ["8234E135",0x4C3C],
+  ["8234E136",0x4C3D],
+  ["8234E137",0x4C3E],
+  ["8234E138",0x4C3F],
+  ["8234E139",0x4C40],
+  ["8234E230",0x4C41],
+  ["8234E231",0x4C42],
+  ["8234E232",0x4C43],
+  ["8234E233",0x4C44],
+  ["8234E234",0x4C45],
+  ["8234E235",0x4C46],
+  ["8234E236",0x4C47],
+  ["8234E237",0x4C48],
+  ["8234E238",0x4C49],
+  ["8234E239",0x4C4A],
+  ["8234E330",0x4C4B],
+  ["8234E331",0x4C4C],
+  ["8234E332",0x4C4D],
+  ["8234E333",0x4C4E],
+  ["8234E334",0x4C4F],
+  ["8234E335",0x4C50],
+  ["8234E336",0x4C51],
+  ["8234E337",0x4C52],
+  ["8234E338",0x4C53],
+  ["8234E339",0x4C54],
+  ["8234E430",0x4C55],
+  ["8234E431",0x4C56],
+  ["8234E432",0x4C57],
+  ["8234E433",0x4C58],
+  ["8234E434",0x4C59],
+  ["8234E435",0x4C5A],
+  ["8234E436",0x4C5B],
+  ["8234E437",0x4C5C],
+  ["8234E438",0x4C5D],
+  ["8234E439",0x4C5E],
+  ["8234E530",0x4C5F],
+  ["8234E531",0x4C60],
+  ["8234E532",0x4C61],
+  ["8234E533",0x4C62],
+  ["8234E534",0x4C63],
+  ["8234E535",0x4C64],
+  ["8234E536",0x4C65],
+  ["8234E537",0x4C66],
+  ["8234E538",0x4C67],
+  ["8234E539",0x4C68],
+  ["8234E630",0x4C69],
+  ["8234E631",0x4C6A],
+  ["8234E632",0x4C6B],
+  ["8234E633",0x4C6C],
+  ["8234E634",0x4C6D],
+  ["8234E635",0x4C6E],
+  ["8234E636",0x4C6F],
+  ["8234E637",0x4C70],
+  ["8234E638",0x4C71],
+  ["8234E639",0x4C72],
+  ["8234E730",0x4C73],
+  ["8234E731",0x4C74],
+  ["8234E732",0x4C75],
+  ["8234E733",0x4C76],
+  ["FE96",0x4C77],
+  ["8234E734",0x4C78],
+  ["8234E735",0x4C79],
+  ["8234E736",0x4C7A],
+  ["8234E737",0x4C7B],
+  ["8234E738",0x4C7C],
+  ["8234E739",0x4C7D],
+  ["8234E830",0x4C7E],
+  ["8234E831",0x4C7F],
+  ["8234E832",0x4C80],
+  ["8234E833",0x4C81],
+  ["8234E834",0x4C82],
+  ["8234E835",0x4C83],
+  ["8234E836",0x4C84],
+  ["8234E837",0x4C85],
+  ["8234E838",0x4C86],
+  ["8234E839",0x4C87],
+  ["8234E930",0x4C88],
+  ["8234E931",0x4C89],
+  ["8234E932",0x4C8A],
+  ["8234E933",0x4C8B],
+  ["8234E934",0x4C8C],
+  ["8234E935",0x4C8D],
+  ["8234E936",0x4C8E],
+  ["8234E937",0x4C8F],
+  ["8234E938",0x4C90],
+  ["8234E939",0x4C91],
+  ["8234EA30",0x4C92],
+  ["8234EA31",0x4C93],
+  ["8234EA32",0x4C94],
+  ["8234EA33",0x4C95],
+  ["8234EA34",0x4C96],
+  ["8234EA35",0x4C97],
+  ["8234EA36",0x4C98],
+  ["8234EA37",0x4C99],
+  ["8234EA38",0x4C9A],
+  ["8234EA39",0x4C9B],
+  ["8234EB30",0x4C9C],
+  ["8234EB31",0x4C9D],
+  ["8234EB32",0x4C9E],
+  ["FE93",0x4C9F],
+  ["FE94",0x4CA0],
+  ["FE95",0x4CA1],
+  ["FE97",0x4CA2],
+  ["FE92",0x4CA3],
+  ["8234EB33",0x4CA4],
+  ["8234EB34",0x4CA5],
+  ["8234EB35",0x4CA6],
+  ["8234EB36",0x4CA7],
+  ["8234EB37",0x4CA8],
+  ["8234EB38",0x4CA9],
+  ["8234EB39",0x4CAA],
+  ["8234EC30",0x4CAB],
+  ["8234EC31",0x4CAC],
+  ["8234EC32",0x4CAD],
+  ["8234EC33",0x4CAE],
+  ["8234EC34",0x4CAF],
+  ["8234EC35",0x4CB0],
+  ["8234EC36",0x4CB1],
+  ["8234EC37",0x4CB2],
+  ["8234EC38",0x4CB3],
+  ["8234EC39",0x4CB4],
+  ["8234ED30",0x4CB5],
+  ["8234ED31",0x4CB6],
+  ["8234ED32",0x4CB7],
+  ["8234ED33",0x4CB8],
+  ["8234ED34",0x4CB9],
+  ["8234ED35",0x4CBA],
+  ["8234ED36",0x4CBB],
+  ["8234ED37",0x4CBC],
+  ["8234ED38",0x4CBD],
+  ["8234ED39",0x4CBE],
+  ["8234EE30",0x4CBF],
+  ["8234EE31",0x4CC0],
+  ["8234EE32",0x4CC1],
+  ["8234EE33",0x4CC2],
+  ["8234EE34",0x4CC3],
+  ["8234EE35",0x4CC4],
+  ["8234EE36",0x4CC5],
+  ["8234EE37",0x4CC6],
+  ["8234EE38",0x4CC7],
+  ["8234EE39",0x4CC8],
+  ["8234EF30",0x4CC9],
+  ["8234EF31",0x4CCA],
+  ["8234EF32",0x4CCB],
+  ["8234EF33",0x4CCC],
+  ["8234EF34",0x4CCD],
+  ["8234EF35",0x4CCE],
+  ["8234EF36",0x4CCF],
+  ["8234EF37",0x4CD0],
+  ["8234EF38",0x4CD1],
+  ["8234EF39",0x4CD2],
+  ["8234F030",0x4CD3],
+  ["8234F031",0x4CD4],
+  ["8234F032",0x4CD5],
+  ["8234F033",0x4CD6],
+  ["8234F034",0x4CD7],
+  ["8234F035",0x4CD8],
+  ["8234F036",0x4CD9],
+  ["8234F037",0x4CDA],
+  ["8234F038",0x4CDB],
+  ["8234F039",0x4CDC],
+  ["8234F130",0x4CDD],
+  ["8234F131",0x4CDE],
+  ["8234F132",0x4CDF],
+  ["8234F133",0x4CE0],
+  ["8234F134",0x4CE1],
+  ["8234F135",0x4CE2],
+  ["8234F136",0x4CE3],
+  ["8234F137",0x4CE4],
+  ["8234F138",0x4CE5],
+  ["8234F139",0x4CE6],
+  ["8234F230",0x4CE7],
+  ["8234F231",0x4CE8],
+  ["8234F232",0x4CE9],
+  ["8234F233",0x4CEA],
+  ["8234F234",0x4CEB],
+  ["8234F235",0x4CEC],
+  ["8234F236",0x4CED],
+  ["8234F237",0x4CEE],
+  ["8234F238",0x4CEF],
+  ["8234F239",0x4CF0],
+  ["8234F330",0x4CF1],
+  ["8234F331",0x4CF2],
+  ["8234F332",0x4CF3],
+  ["8234F333",0x4CF4],
+  ["8234F334",0x4CF5],
+  ["8234F335",0x4CF6],
+  ["8234F336",0x4CF7],
+  ["8234F337",0x4CF8],
+  ["8234F338",0x4CF9],
+  ["8234F339",0x4CFA],
+  ["8234F430",0x4CFB],
+  ["8234F431",0x4CFC],
+  ["8234F432",0x4CFD],
+  ["8234F433",0x4CFE],
+  ["8234F434",0x4CFF],
+  ["8234F435",0x4D00],
+  ["8234F436",0x4D01],
+  ["8234F437",0x4D02],
+  ["8234F438",0x4D03],
+  ["8234F439",0x4D04],
+  ["8234F530",0x4D05],
+  ["8234F531",0x4D06],
+  ["8234F532",0x4D07],
+  ["8234F533",0x4D08],
+  ["8234F534",0x4D09],
+  ["8234F535",0x4D0A],
+  ["8234F536",0x4D0B],
+  ["8234F537",0x4D0C],
+  ["8234F538",0x4D0D],
+  ["8234F539",0x4D0E],
+  ["8234F630",0x4D0F],
+  ["8234F631",0x4D10],
+  ["8234F632",0x4D11],
+  ["8234F633",0x4D12],
+  ["FE98",0x4D13],
+  ["FE99",0x4D14],
+  ["FE9A",0x4D15],
+  ["FE9B",0x4D16],
+  ["FE9C",0x4D17],
+  ["FE9D",0x4D18],
+  ["FE9E",0x4D19],
+  ["8234F634",0x4D1A],
+  ["8234F635",0x4D1B],
+  ["8234F636",0x4D1C],
+  ["8234F637",0x4D1D],
+  ["8234F638",0x4D1E],
+  ["8234F639",0x4D1F],
+  ["8234F730",0x4D20],
+  ["8234F731",0x4D21],
+  ["8234F732",0x4D22],
+  ["8234F733",0x4D23],
+  ["8234F734",0x4D24],
+  ["8234F735",0x4D25],
+  ["8234F736",0x4D26],
+  ["8234F737",0x4D27],
+  ["8234F738",0x4D28],
+  ["8234F739",0x4D29],
+  ["8234F830",0x4D2A],
+  ["8234F831",0x4D2B],
+  ["8234F832",0x4D2C],
+  ["8234F833",0x4D2D],
+  ["8234F834",0x4D2E],
+  ["8234F835",0x4D2F],
+  ["8234F836",0x4D30],
+  ["8234F837",0x4D31],
+  ["8234F838",0x4D32],
+  ["8234F839",0x4D33],
+  ["8234F930",0x4D34],
+  ["8234F931",0x4D35],
+  ["8234F932",0x4D36],
+  ["8234F933",0x4D37],
+  ["8234F934",0x4D38],
+  ["8234F935",0x4D39],
+  ["8234F936",0x4D3A],
+  ["8234F937",0x4D3B],
+  ["8234F938",0x4D3C],
+  ["8234F939",0x4D3D],
+  ["8234FA30",0x4D3E],
+  ["8234FA31",0x4D3F],
+  ["8234FA32",0x4D40],
+  ["8234FA33",0x4D41],
+  ["8234FA34",0x4D42],
+  ["8234FA35",0x4D43],
+  ["8234FA36",0x4D44],
+  ["8234FA37",0x4D45],
+  ["8234FA38",0x4D46],
+  ["8234FA39",0x4D47],
+  ["8234FB30",0x4D48],
+  ["8234FB31",0x4D49],
+  ["8234FB32",0x4D4A],
+  ["8234FB33",0x4D4B],
+  ["8234FB34",0x4D4C],
+  ["8234FB35",0x4D4D],
+  ["8234FB36",0x4D4E],
+  ["8234FB37",0x4D4F],
+  ["8234FB38",0x4D50],
+  ["8234FB39",0x4D51],
+  ["8234FC30",0x4D52],
+  ["8234FC31",0x4D53],
+  ["8234FC32",0x4D54],
+  ["8234FC33",0x4D55],
+  ["8234FC34",0x4D56],
+  ["8234FC35",0x4D57],
+  ["8234FC36",0x4D58],
+  ["8234FC37",0x4D59],
+  ["8234FC38",0x4D5A],
+  ["8234FC39",0x4D5B],
+  ["8234FD30",0x4D5C],
+  ["8234FD31",0x4D5D],
+  ["8234FD32",0x4D5E],
+  ["8234FD33",0x4D5F],
+  ["8234FD34",0x4D60],
+  ["8234FD35",0x4D61],
+  ["8234FD36",0x4D62],
+  ["8234FD37",0x4D63],
+  ["8234FD38",0x4D64],
+  ["8234FD39",0x4D65],
+  ["8234FE30",0x4D66],
+  ["8234FE31",0x4D67],
+  ["8234FE32",0x4D68],
+  ["8234FE33",0x4D69],
+  ["8234FE34",0x4D6A],
+  ["8234FE35",0x4D6B],
+  ["8234FE36",0x4D6C],
+  ["8234FE37",0x4D6D],
+  ["8234FE38",0x4D6E],
+  ["8234FE39",0x4D6F],
+  ["82358130",0x4D70],
+  ["82358131",0x4D71],
+  ["82358132",0x4D72],
+  ["82358133",0x4D73],
+  ["82358134",0x4D74],
+  ["82358135",0x4D75],
+  ["82358136",0x4D76],
+  ["82358137",0x4D77],
+  ["82358138",0x4D78],
+  ["82358139",0x4D79],
+  ["82358230",0x4D7A],
+  ["82358231",0x4D7B],
+  ["82358232",0x4D7C],
+  ["82358233",0x4D7D],
+  ["82358234",0x4D7E],
+  ["82358235",0x4D7F],
+  ["82358236",0x4D80],
+  ["82358237",0x4D81],
+  ["82358238",0x4D82],
+  ["82358239",0x4D83],
+  ["82358330",0x4D84],
+  ["82358331",0x4D85],
+  ["82358332",0x4D86],
+  ["82358333",0x4D87],
+  ["82358334",0x4D88],
+  ["82358335",0x4D89],
+  ["82358336",0x4D8A],
+  ["82358337",0x4D8B],
+  ["82358338",0x4D8C],
+  ["82358339",0x4D8D],
+  ["82358430",0x4D8E],
+  ["82358431",0x4D8F],
+  ["82358432",0x4D90],
+  ["82358433",0x4D91],
+  ["82358434",0x4D92],
+  ["82358435",0x4D93],
+  ["82358436",0x4D94],
+  ["82358437",0x4D95],
+  ["82358438",0x4D96],
+  ["82358439",0x4D97],
+  ["82358530",0x4D98],
+  ["82358531",0x4D99],
+  ["82358532",0x4D9A],
+  ["82358533",0x4D9B],
+  ["82358534",0x4D9C],
+  ["82358535",0x4D9D],
+  ["82358536",0x4D9E],
+  ["82358537",0x4D9F],
+  ["82358538",0x4DA0],
+  ["82358539",0x4DA1],
+  ["82358630",0x4DA2],
+  ["82358631",0x4DA3],
+  ["82358632",0x4DA4],
+  ["82358633",0x4DA5],
+  ["82358634",0x4DA6],
+  ["82358635",0x4DA7],
+  ["82358636",0x4DA8],
+  ["82358637",0x4DA9],
+  ["82358638",0x4DAA],
+  ["82358639",0x4DAB],
+  ["82358730",0x4DAC],
+  ["82358731",0x4DAD],
+  ["FE9F",0x4DAE],
+  ["82358732",0x4DAF],
+  ["82358733",0x4DB0],
+  ["82358734",0x4DB1],
+  ["82358735",0x4DB2],
+  ["82358736",0x4DB3],
+  ["82358737",0x4DB4],
+  ["82358738",0x4DB5],
+  ["82358739",0x4DB6],
+  ["82358830",0x4DB7],
+  ["82358831",0x4DB8],
+  ["82358832",0x4DB9],
+  ["82358833",0x4DBA],
+  ["82358834",0x4DBB],
+  ["82358835",0x4DBC],
+  ["82358836",0x4DBD],
+  ["82358837",0x4DBE],
+  ["82358838",0x4DBF],
+  ["82358839",0x4DC0],
+  ["82358930",0x4DC1],
+  ["82358931",0x4DC2],
+  ["82358932",0x4DC3],
+  ["82358933",0x4DC4],
+  ["82358934",0x4DC5],
+  ["82358935",0x4DC6],
+  ["82358936",0x4DC7],
+  ["82358937",0x4DC8],
+  ["82358938",0x4DC9],
+  ["82358939",0x4DCA],
+  ["82358A30",0x4DCB],
+  ["82358A31",0x4DCC],
+  ["82358A32",0x4DCD],
+  ["82358A33",0x4DCE],
+  ["82358A34",0x4DCF],
+  ["82358A35",0x4DD0],
+  ["82358A36",0x4DD1],
+  ["82358A37",0x4DD2],
+  ["82358A38",0x4DD3],
+  ["82358A39",0x4DD4],
+  ["82358B30",0x4DD5],
+  ["82358B31",0x4DD6],
+  ["82358B32",0x4DD7],
+  ["82358B33",0x4DD8],
+  ["82358B34",0x4DD9],
+  ["82358B35",0x4DDA],
+  ["82358B36",0x4DDB],
+  ["82358B37",0x4DDC],
+  ["82358B38",0x4DDD],
+  ["82358B39",0x4DDE],
+  ["82358C30",0x4DDF],
+  ["82358C31",0x4DE0],
+  ["82358C32",0x4DE1],
+  ["82358C33",0x4DE2],
+  ["82358C34",0x4DE3],
+  ["82358C35",0x4DE4],
+  ["82358C36",0x4DE5],
+  ["82358C37",0x4DE6],
+  ["82358C38",0x4DE7],
+  ["82358C39",0x4DE8],
+  ["82358D30",0x4DE9],
+  ["82358D31",0x4DEA],
+  ["82358D32",0x4DEB],
+  ["82358D33",0x4DEC],
+  ["82358D34",0x4DED],
+  ["82358D35",0x4DEE],
+  ["82358D36",0x4DEF],
+  ["82358D37",0x4DF0],
+  ["82358D38",0x4DF1],
+  ["82358D39",0x4DF2],
+  ["82358E30",0x4DF3],
+  ["82358E31",0x4DF4],
+  ["82358E32",0x4DF5],
+  ["82358E33",0x4DF6],
+  ["82358E34",0x4DF7],
+  ["82358E35",0x4DF8],
+  ["82358E36",0x4DF9],
+  ["82358E37",0x4DFA],
+  ["82358E38",0x4DFB],
+  ["82358E39",0x4DFC],
+  ["82358F30",0x4DFD],
+  ["82358F31",0x4DFE],
+  ["82358F32",0x4DFF],
+  ["D2BB",0x4E00],
+  ["B6A1",0x4E01],
+  ["8140",0x4E02],
+  ["C6DF",0x4E03],
+  ["8141",0x4E04],
+  ["8142",0x4E05],
+  ["8143",0x4E06],
+  ["CDF2",0x4E07],
+  ["D5C9",0x4E08],
+  ["C8FD",0x4E09],
+  ["C9CF",0x4E0A],
+  ["CFC2",0x4E0B],
+  ["D8A2",0x4E0C],
+  ["B2BB",0x4E0D],
+  ["D3EB",0x4E0E],
+  ["8144",0x4E0F],
+  ["D8A4",0x4E10],
+  ["B3F3",0x4E11],
+  ["8145",0x4E12],
+  ["D7A8",0x4E13],
+  ["C7D2",0x4E14],
+  ["D8A7",0x4E15],
+  ["CAC0",0x4E16],
+  ["8146",0x4E17],
+  ["C7F0",0x4E18],
+  ["B1FB",0x4E19],
+  ["D2B5",0x4E1A],
+  ["B4D4",0x4E1B],
+  ["B6AB",0x4E1C],
+  ["CBBF",0x4E1D],
+  ["D8A9",0x4E1E],
+  ["8147",0x4E1F],
+  ["8148",0x4E20],
+  ["8149",0x4E21],
+  ["B6AA",0x4E22],
+  ["814A",0x4E23],
+  ["C1BD",0x4E24],
+  ["D1CF",0x4E25],
+  ["814B",0x4E26],
+  ["C9A5",0x4E27],
+  ["D8AD",0x4E28],
+  ["814C",0x4E29],
+  ["B8F6",0x4E2A],
+  ["D1BE",0x4E2B],
+  ["E3DC",0x4E2C],
+  ["D6D0",0x4E2D],
+  ["814D",0x4E2E],
+  ["814E",0x4E2F],
+  ["B7E1",0x4E30],
+  ["814F",0x4E31],
+  ["B4AE",0x4E32],
+  ["8150",0x4E33],
+  ["C1D9",0x4E34],
+  ["8151",0x4E35],
+  ["D8BC",0x4E36],
+  ["8152",0x4E37],
+  ["CDE8",0x4E38],
+  ["B5A4",0x4E39],
+  ["CEAA",0x4E3A],
+  ["D6F7",0x4E3B],
+  ["8153",0x4E3C],
+  ["C0F6",0x4E3D],
+  ["BED9",0x4E3E],
+  ["D8AF",0x4E3F],
+  ["8154",0x4E40],
+  ["8155",0x4E41],
+  ["8156",0x4E42],
+  ["C4CB",0x4E43],
+  ["8157",0x4E44],
+  ["BEC3",0x4E45],
+  ["8158",0x4E46],
+  ["D8B1",0x4E47],
+  ["C3B4",0x4E48],
+  ["D2E5",0x4E49],
+  ["8159",0x4E4A],
+  ["D6AE",0x4E4B],
+  ["CEDA",0x4E4C],
+  ["D5A7",0x4E4D],
+  ["BAF5",0x4E4E],
+  ["B7A6",0x4E4F],
+  ["C0D6",0x4E50],
+  ["815A",0x4E51],
+  ["C6B9",0x4E52],
+  ["C5D2",0x4E53],
+  ["C7C7",0x4E54],
+  ["815B",0x4E55],
+  ["B9D4",0x4E56],
+  ["815C",0x4E57],
+  ["B3CB",0x4E58],
+  ["D2D2",0x4E59],
+  ["815D",0x4E5A],
+  ["815E",0x4E5B],
+  ["D8BF",0x4E5C],
+  ["BEC5",0x4E5D],
+  ["C6F2",0x4E5E],
+  ["D2B2",0x4E5F],
+  ["CFB0",0x4E60],
+  ["CFE7",0x4E61],
+  ["815F",0x4E62],
+  ["8160",0x4E63],
+  ["8161",0x4E64],
+  ["8162",0x4E65],
+  ["CAE9",0x4E66],
+  ["8163",0x4E67],
+  ["8164",0x4E68],
+  ["D8C0",0x4E69],
+  ["8165",0x4E6A],
+  ["8166",0x4E6B],
+  ["8167",0x4E6C],
+  ["8168",0x4E6D],
+  ["8169",0x4E6E],
+  ["816A",0x4E6F],
+  ["C2F2",0x4E70],
+  ["C2D2",0x4E71],
+  ["816B",0x4E72],
+  ["C8E9",0x4E73],
+  ["816C",0x4E74],
+  ["816D",0x4E75],
+  ["816E",0x4E76],
+  ["816F",0x4E77],
+  ["8170",0x4E78],
+  ["8171",0x4E79],
+  ["8172",0x4E7A],
+  ["8173",0x4E7B],
+  ["8174",0x4E7C],
+  ["8175",0x4E7D],
+  ["C7AC",0x4E7E],
+  ["8176",0x4E7F],
+  ["8177",0x4E80],
+  ["8178",0x4E81],
+  ["8179",0x4E82],
+  ["817A",0x4E83],
+  ["817B",0x4E84],
+  ["817C",0x4E85],
+  ["C1CB",0x4E86],
+  ["817D",0x4E87],
+  ["D3E8",0x4E88],
+  ["D5F9",0x4E89],
+  ["817E",0x4E8A],
+  ["CAC2",0x4E8B],
+  ["B6FE",0x4E8C],
+  ["D8A1",0x4E8D],
+  ["D3DA",0x4E8E],
+  ["BFF7",0x4E8F],
+  ["8180",0x4E90],
+  ["D4C6",0x4E91],
+  ["BBA5",0x4E92],
+  ["D8C1",0x4E93],
+  ["CEE5",0x4E94],
+  ["BEAE",0x4E95],
+  ["8181",0x4E96],
+  ["8182",0x4E97],
+  ["D8A8",0x4E98],
+  ["8183",0x4E99],
+  ["D1C7",0x4E9A],
+  ["D0A9",0x4E9B],
+  ["8184",0x4E9C],
+  ["8185",0x4E9D],
+  ["8186",0x4E9E],
+  ["D8BD",0x4E9F],
+  ["D9EF",0x4EA0],
+  ["CDF6",0x4EA1],
+  ["BFBA",0x4EA2],
+  ["8187",0x4EA3],
+  ["BDBB",0x4EA4],
+  ["BAA5",0x4EA5],
+  ["D2E0",0x4EA6],
+  ["B2FA",0x4EA7],
+  ["BAE0",0x4EA8],
+  ["C4B6",0x4EA9],
+  ["8188",0x4EAA],
+  ["CFED",0x4EAB],
+  ["BEA9",0x4EAC],
+  ["CDA4",0x4EAD],
+  ["C1C1",0x4EAE],
+  ["8189",0x4EAF],
+  ["818A",0x4EB0],
+  ["818B",0x4EB1],
+  ["C7D7",0x4EB2],
+  ["D9F1",0x4EB3],
+  ["818C",0x4EB4],
+  ["D9F4",0x4EB5],
+  ["818D",0x4EB6],
+  ["818E",0x4EB7],
+  ["818F",0x4EB8],
+  ["8190",0x4EB9],
+  ["C8CB",0x4EBA],
+  ["D8E9",0x4EBB],
+  ["8191",0x4EBC],
+  ["8192",0x4EBD],
+  ["8193",0x4EBE],
+  ["D2DA",0x4EBF],
+  ["CAB2",0x4EC0],
+  ["C8CA",0x4EC1],
+  ["D8EC",0x4EC2],
+  ["D8EA",0x4EC3],
+  ["D8C6",0x4EC4],
+  ["BDF6",0x4EC5],
+  ["C6CD",0x4EC6],
+  ["B3F0",0x4EC7],
+  ["8194",0x4EC8],
+  ["D8EB",0x4EC9],
+  ["BDF1",0x4ECA],
+  ["BDE9",0x4ECB],
+  ["8195",0x4ECC],
+  ["C8D4",0x4ECD],
+  ["B4D3",0x4ECE],
+  ["8196",0x4ECF],
+  ["8197",0x4ED0],
+  ["C2D8",0x4ED1],
+  ["8198",0x4ED2],
+  ["B2D6",0x4ED3],
+  ["D7D0",0x4ED4],
+  ["CACB",0x4ED5],
+  ["CBFB",0x4ED6],
+  ["D5CC",0x4ED7],
+  ["B8B6",0x4ED8],
+  ["CFC9",0x4ED9],
+  ["8199",0x4EDA],
+  ["819A",0x4EDB],
+  ["819B",0x4EDC],
+  ["D9DA",0x4EDD],
+  ["D8F0",0x4EDE],
+  ["C7AA",0x4EDF],
+  ["819C",0x4EE0],
+  ["D8EE",0x4EE1],
+  ["819D",0x4EE2],
+  ["B4FA",0x4EE3],
+  ["C1EE",0x4EE4],
+  ["D2D4",0x4EE5],
+  ["819E",0x4EE6],
+  ["819F",0x4EE7],
+  ["D8ED",0x4EE8],
+  ["81A0",0x4EE9],
+  ["D2C7",0x4EEA],
+  ["D8EF",0x4EEB],
+  ["C3C7",0x4EEC],
+  ["81A1",0x4EED],
+  ["81A2",0x4EEE],
+  ["81A3",0x4EEF],
+  ["D1F6",0x4EF0],
+  ["81A4",0x4EF1],
+  ["D6D9",0x4EF2],
+  ["D8F2",0x4EF3],
+  ["81A5",0x4EF4],
+  ["D8F5",0x4EF5],
+  ["BCFE",0x4EF6],
+  ["BCDB",0x4EF7],
+  ["81A6",0x4EF8],
+  ["81A7",0x4EF9],
+  ["81A8",0x4EFA],
+  ["C8CE",0x4EFB],
+  ["81A9",0x4EFC],
+  ["B7DD",0x4EFD],
+  ["81AA",0x4EFE],
+  ["B7C2",0x4EFF],
+  ["81AB",0x4F00],
+  ["C6F3",0x4F01],
+  ["81AC",0x4F02],
+  ["81AD",0x4F03],
+  ["81AE",0x4F04],
+  ["81AF",0x4F05],
+  ["81B0",0x4F06],
+  ["81B1",0x4F07],
+  ["81B2",0x4F08],
+  ["D8F8",0x4F09],
+  ["D2C1",0x4F0A],
+  ["81B3",0x4F0B],
+  ["81B4",0x4F0C],
+  ["CEE9",0x4F0D],
+  ["BCBF",0x4F0E],
+  ["B7FC",0x4F0F],
+  ["B7A5",0x4F10],
+  ["D0DD",0x4F11],
+  ["81B5",0x4F12],
+  ["81B6",0x4F13],
+  ["81B7",0x4F14],
+  ["81B8",0x4F15],
+  ["81B9",0x4F16],
+  ["D6DA",0x4F17],
+  ["D3C5",0x4F18],
+  ["BBEF",0x4F19],
+  ["BBE1",0x4F1A],
+  ["D8F1",0x4F1B],
+  ["81BA",0x4F1C],
+  ["81BB",0x4F1D],
+  ["C9A1",0x4F1E],
+  ["CEB0",0x4F1F],
+  ["B4AB",0x4F20],
+  ["81BC",0x4F21],
+  ["D8F3",0x4F22],
+  ["81BD",0x4F23],
+  ["C9CB",0x4F24],
+  ["D8F6",0x4F25],
+  ["C2D7",0x4F26],
+  ["D8F7",0x4F27],
+  ["81BE",0x4F28],
+  ["81BF",0x4F29],
+  ["CEB1",0x4F2A],
+  ["D8F9",0x4F2B],
+  ["81C0",0x4F2C],
+  ["81C1",0x4F2D],
+  ["81C2",0x4F2E],
+  ["B2AE",0x4F2F],
+  ["B9C0",0x4F30],
+  ["81C3",0x4F31],
+  ["D9A3",0x4F32],
+  ["81C4",0x4F33],
+  ["B0E9",0x4F34],
+  ["81C5",0x4F35],
+  ["C1E6",0x4F36],
+  ["81C6",0x4F37],
+  ["C9EC",0x4F38],
+  ["81C7",0x4F39],
+  ["CBC5",0x4F3A],
+  ["81C8",0x4F3B],
+  ["CBC6",0x4F3C],
+  ["D9A4",0x4F3D],
+  ["81C9",0x4F3E],
+  ["81CA",0x4F3F],
+  ["81CB",0x4F40],
+  ["81CC",0x4F41],
+  ["81CD",0x4F42],
+  ["B5E8",0x4F43],
+  ["81CE",0x4F44],
+  ["81CF",0x4F45],
+  ["B5AB",0x4F46],
+  ["81D0",0x4F47],
+  ["81D1",0x4F48],
+  ["81D2",0x4F49],
+  ["81D3",0x4F4A],
+  ["81D4",0x4F4B],
+  ["81D5",0x4F4C],
+  ["CEBB",0x4F4D],
+  ["B5CD",0x4F4E],
+  ["D7A1",0x4F4F],
+  ["D7F4",0x4F50],
+  ["D3D3",0x4F51],
+  ["81D6",0x4F52],
+  ["CCE5",0x4F53],
+  ["81D7",0x4F54],
+  ["BACE",0x4F55],
+  ["81D8",0x4F56],
+  ["D9A2",0x4F57],
+  ["D9DC",0x4F58],
+  ["D3E0",0x4F59],
+  ["D8FD",0x4F5A],
+  ["B7F0",0x4F5B],
+  ["D7F7",0x4F5C],
+  ["D8FE",0x4F5D],
+  ["D8FA",0x4F5E],
+  ["D9A1",0x4F5F],
+  ["C4E3",0x4F60],
+  ["81D9",0x4F61],
+  ["81DA",0x4F62],
+  ["D3B6",0x4F63],
+  ["D8F4",0x4F64],
+  ["D9DD",0x4F65],
+  ["81DB",0x4F66],
+  ["D8FB",0x4F67],
+  ["81DC",0x4F68],
+  ["C5E5",0x4F69],
+  ["81DD",0x4F6A],
+  ["81DE",0x4F6B],
+  ["C0D0",0x4F6C],
+  ["81DF",0x4F6D],
+  ["81E0",0x4F6E],
+  ["D1F0",0x4F6F],
+  ["B0DB",0x4F70],
+  ["81E1",0x4F71],
+  ["81E2",0x4F72],
+  ["BCD1",0x4F73],
+  ["D9A6",0x4F74],
+  ["81E3",0x4F75],
+  ["D9A5",0x4F76],
+  ["81E4",0x4F77],
+  ["81E5",0x4F78],
+  ["81E6",0x4F79],
+  ["81E7",0x4F7A],
+  ["D9AC",0x4F7B],
+  ["D9AE",0x4F7C],
+  ["81E8",0x4F7D],
+  ["D9AB",0x4F7E],
+  ["CAB9",0x4F7F],
+  ["81E9",0x4F80],
+  ["81EA",0x4F81],
+  ["81EB",0x4F82],
+  ["D9A9",0x4F83],
+  ["D6B6",0x4F84],
+  ["81EC",0x4F85],
+  ["81ED",0x4F86],
+  ["81EE",0x4F87],
+  ["B3DE",0x4F88],
+  ["D9A8",0x4F89],
+  ["81EF",0x4F8A],
+  ["C0FD",0x4F8B],
+  ["81F0",0x4F8C],
+  ["CACC",0x4F8D],
+  ["81F1",0x4F8E],
+  ["D9AA",0x4F8F],
+  ["81F2",0x4F90],
+  ["D9A7",0x4F91],
+  ["81F3",0x4F92],
+  ["81F4",0x4F93],
+  ["D9B0",0x4F94],
+  ["81F5",0x4F95],
+  ["81F6",0x4F96],
+  ["B6B1",0x4F97],
+  ["81F7",0x4F98],
+  ["81F8",0x4F99],
+  ["81F9",0x4F9A],
+  ["B9A9",0x4F9B],
+  ["81FA",0x4F9C],
+  ["D2C0",0x4F9D],
+  ["81FB",0x4F9E],
+  ["81FC",0x4F9F],
+  ["CFC0",0x4FA0],
+  ["81FD",0x4FA1],
+  ["81FE",0x4FA2],
+  ["C2C2",0x4FA3],
+  ["8240",0x4FA4],
+  ["BDC4",0x4FA5],
+  ["D5EC",0x4FA6],
+  ["B2E0",0x4FA7],
+  ["C7C8",0x4FA8],
+  ["BFEB",0x4FA9],
+  ["D9AD",0x4FAA],
+  ["8241",0x4FAB],
+  ["D9AF",0x4FAC],
+  ["8242",0x4FAD],
+  ["CEEA",0x4FAE],
+  ["BAEE",0x4FAF],
+  ["8243",0x4FB0],
+  ["8244",0x4FB1],
+  ["8245",0x4FB2],
+  ["8246",0x4FB3],
+  ["8247",0x4FB4],
+  ["C7D6",0x4FB5],
+  ["8248",0x4FB6],
+  ["8249",0x4FB7],
+  ["824A",0x4FB8],
+  ["824B",0x4FB9],
+  ["824C",0x4FBA],
+  ["824D",0x4FBB],
+  ["824E",0x4FBC],
+  ["824F",0x4FBD],
+  ["8250",0x4FBE],
+  ["B1E3",0x4FBF],
+  ["8251",0x4FC0],
+  ["8252",0x4FC1],
+  ["8253",0x4FC2],
+  ["B4D9",0x4FC3],
+  ["B6ED",0x4FC4],
+  ["D9B4",0x4FC5],
+  ["8254",0x4FC6],
+  ["8255",0x4FC7],
+  ["8256",0x4FC8],
+  ["8257",0x4FC9],
+  ["BFA1",0x4FCA],
+  ["8258",0x4FCB],
+  ["8259",0x4FCC],
+  ["825A",0x4FCD],
+  ["D9DE",0x4FCE],
+  ["C7CE",0x4FCF],
+  ["C0FE",0x4FD0],
+  ["D9B8",0x4FD1],
+  ["825B",0x4FD2],
+  ["825C",0x4FD3],
+  ["825D",0x4FD4],
+  ["825E",0x4FD5],
+  ["825F",0x4FD6],
+  ["CBD7",0x4FD7],
+  ["B7FD",0x4FD8],
+  ["8260",0x4FD9],
+  ["D9B5",0x4FDA],
+  ["8261",0x4FDB],
+  ["D9B7",0x4FDC],
+  ["B1A3",0x4FDD],
+  ["D3E1",0x4FDE],
+  ["D9B9",0x4FDF],
+  ["8262",0x4FE0],
+  ["D0C5",0x4FE1],
+  ["8263",0x4FE2],
+  ["D9B6",0x4FE3],
+  ["8264",0x4FE4],
+  ["8265",0x4FE5],
+  ["D9B1",0x4FE6],
+  ["8266",0x4FE7],
+  ["D9B2",0x4FE8],
+  ["C1A9",0x4FE9],
+  ["D9B3",0x4FEA],
+  ["8267",0x4FEB],
+  ["8268",0x4FEC],
+  ["BCF3",0x4FED],
+  ["D0DE",0x4FEE],
+  ["B8A9",0x4FEF],
+  ["8269",0x4FF0],
+  ["BEE3",0x4FF1],
+  ["826A",0x4FF2],
+  ["D9BD",0x4FF3],
+  ["826B",0x4FF4],
+  ["826C",0x4FF5],
+  ["826D",0x4FF6],
+  ["826E",0x4FF7],
+  ["D9BA",0x4FF8],
+  ["826F",0x4FF9],
+  ["B0B3",0x4FFA],
+  ["8270",0x4FFB],
+  ["8271",0x4FFC],
+  ["8272",0x4FFD],
+  ["D9C2",0x4FFE],
+  ["8273",0x4FFF],
+  ["8274",0x5000],
+  ["8275",0x5001],
+  ["8276",0x5002],
+  ["8277",0x5003],
+  ["8278",0x5004],
+  ["8279",0x5005],
+  ["827A",0x5006],
+  ["827B",0x5007],
+  ["827C",0x5008],
+  ["827D",0x5009],
+  ["827E",0x500A],
+  ["8280",0x500B],
+  ["D9C4",0x500C],
+  ["B1B6",0x500D],
+  ["8281",0x500E],
+  ["D9BF",0x500F],
+  ["8282",0x5010],
+  ["8283",0x5011],
+  ["B5B9",0x5012],
+  ["8284",0x5013],
+  ["BEF3",0x5014],
+  ["8285",0x5015],
+  ["8286",0x5016],
+  ["8287",0x5017],
+  ["CCC8",0x5018],
+  ["BAF2",0x5019],
+  ["D2D0",0x501A],
+  ["8288",0x501B],
+  ["D9C3",0x501C],
+  ["8289",0x501D],
+  ["828A",0x501E],
+  ["BDE8",0x501F],
+  ["828B",0x5020],
+  ["B3AB",0x5021],
+  ["828C",0x5022],
+  ["828D",0x5023],
+  ["828E",0x5024],
+  ["D9C5",0x5025],
+  ["BEEB",0x5026],
+  ["828F",0x5027],
+  ["D9C6",0x5028],
+  ["D9BB",0x5029],
+  ["C4DF",0x502A],
+  ["8290",0x502B],
+  ["D9BE",0x502C],
+  ["D9C1",0x502D],
+  ["D9C0",0x502E],
+  ["8291",0x502F],
+  ["8292",0x5030],
+  ["8293",0x5031],
+  ["8294",0x5032],
+  ["8295",0x5033],
+  ["8296",0x5034],
+  ["8297",0x5035],
+  ["8298",0x5036],
+  ["8299",0x5037],
+  ["829A",0x5038],
+  ["829B",0x5039],
+  ["D5AE",0x503A],
+  ["829C",0x503B],
+  ["D6B5",0x503C],
+  ["829D",0x503D],
+  ["C7E3",0x503E],
+  ["829E",0x503F],
+  ["829F",0x5040],
+  ["82A0",0x5041],
+  ["82A1",0x5042],
+  ["D9C8",0x5043],
+  ["82A2",0x5044],
+  ["82A3",0x5045],
+  ["82A4",0x5046],
+  ["BCD9",0x5047],
+  ["D9CA",0x5048],
+  ["82A5",0x5049],
+  ["82A6",0x504A],
+  ["82A7",0x504B],
+  ["D9BC",0x504C],
+  ["82A8",0x504D],
+  ["D9CB",0x504E],
+  ["C6AB",0x504F],
+  ["82A9",0x5050],
+  ["82AA",0x5051],
+  ["82AB",0x5052],
+  ["82AC",0x5053],
+  ["82AD",0x5054],
+  ["D9C9",0x5055],
+  ["82AE",0x5056],
+  ["82AF",0x5057],
+  ["82B0",0x5058],
+  ["82B1",0x5059],
+  ["D7F6",0x505A],
+  ["82B2",0x505B],
+  ["CDA3",0x505C],
+  ["82B3",0x505D],
+  ["82B4",0x505E],
+  ["82B5",0x505F],
+  ["82B6",0x5060],
+  ["82B7",0x5061],
+  ["82B8",0x5062],
+  ["82B9",0x5063],
+  ["82BA",0x5064],
+  ["BDA1",0x5065],
+  ["82BB",0x5066],
+  ["82BC",0x5067],
+  ["82BD",0x5068],
+  ["82BE",0x5069],
+  ["82BF",0x506A],
+  ["82C0",0x506B],
+  ["D9CC",0x506C],
+  ["82C1",0x506D],
+  ["82C2",0x506E],
+  ["82C3",0x506F],
+  ["82C4",0x5070],
+  ["82C5",0x5071],
+  ["82C6",0x5072],
+  ["82C7",0x5073],
+  ["82C8",0x5074],
+  ["82C9",0x5075],
+  ["C5BC",0x5076],
+  ["CDB5",0x5077],
+  ["82CA",0x5078],
+  ["82CB",0x5079],
+  ["82CC",0x507A],
+  ["D9CD",0x507B],
+  ["82CD",0x507C],
+  ["82CE",0x507D],
+  ["D9C7",0x507E],
+  ["B3A5",0x507F],
+  ["BFFE",0x5080],
+  ["82CF",0x5081],
+  ["82D0",0x5082],
+  ["82D1",0x5083],
+  ["82D2",0x5084],
+  ["B8B5",0x5085],
+  ["82D3",0x5086],
+  ["82D4",0x5087],
+  ["C0FC",0x5088],
+  ["82D5",0x5089],
+  ["82D6",0x508A],
+  ["82D7",0x508B],
+  ["82D8",0x508C],
+  ["B0F8",0x508D],
+  ["82D9",0x508E],
+  ["82DA",0x508F],
+  ["82DB",0x5090],
+  ["82DC",0x5091],
+  ["82DD",0x5092],
+  ["82DE",0x5093],
+  ["82DF",0x5094],
+  ["82E0",0x5095],
+  ["82E1",0x5096],
+  ["82E2",0x5097],
+  ["82E3",0x5098],
+  ["82E4",0x5099],
+  ["82E5",0x509A],
+  ["82E6",0x509B],
+  ["82E7",0x509C],
+  ["82E8",0x509D],
+  ["82E9",0x509E],
+  ["82EA",0x509F],
+  ["82EB",0x50A0],
+  ["82EC",0x50A1],
+  ["82ED",0x50A2],
+  ["B4F6",0x50A3],
+  ["82EE",0x50A4],
+  ["D9CE",0x50A5],
+  ["82EF",0x50A6],
+  ["D9CF",0x50A7],
+  ["B4A2",0x50A8],
+  ["D9D0",0x50A9],
+  ["82F0",0x50AA],
+  ["82F1",0x50AB],
+  ["B4DF",0x50AC],
+  ["82F2",0x50AD],
+  ["82F3",0x50AE],
+  ["82F4",0x50AF],
+  ["82F5",0x50B0],
+  ["82F6",0x50B1],
+  ["B0C1",0x50B2],
+  ["82F7",0x50B3],
+  ["82F8",0x50B4],
+  ["82F9",0x50B5],
+  ["82FA",0x50B6],
+  ["82FB",0x50B7],
+  ["82FC",0x50B8],
+  ["82FD",0x50B9],
+  ["D9D1",0x50BA],
+  ["C9B5",0x50BB],
+  ["82FE",0x50BC],
+  ["8340",0x50BD],
+  ["8341",0x50BE],
+  ["8342",0x50BF],
+  ["8343",0x50C0],
+  ["8344",0x50C1],
+  ["8345",0x50C2],
+  ["8346",0x50C3],
+  ["8347",0x50C4],
+  ["8348",0x50C5],
+  ["8349",0x50C6],
+  ["834A",0x50C7],
+  ["834B",0x50C8],
+  ["834C",0x50C9],
+  ["834D",0x50CA],
+  ["834E",0x50CB],
+  ["834F",0x50CC],
+  ["8350",0x50CD],
+  ["8351",0x50CE],
+  ["CFF1",0x50CF],
+  ["8352",0x50D0],
+  ["8353",0x50D1],
+  ["8354",0x50D2],
+  ["8355",0x50D3],
+  ["8356",0x50D4],
+  ["8357",0x50D5],
+  ["D9D2",0x50D6],
+  ["8358",0x50D7],
+  ["8359",0x50D8],
+  ["835A",0x50D9],
+  ["C1C5",0x50DA],
+  ["835B",0x50DB],
+  ["835C",0x50DC],
+  ["835D",0x50DD],
+  ["835E",0x50DE],
+  ["835F",0x50DF],
+  ["8360",0x50E0],
+  ["8361",0x50E1],
+  ["8362",0x50E2],
+  ["8363",0x50E3],
+  ["8364",0x50E4],
+  ["8365",0x50E5],
+  ["D9D6",0x50E6],
+  ["C9AE",0x50E7],
+  ["8366",0x50E8],
+  ["8367",0x50E9],
+  ["8368",0x50EA],
+  ["8369",0x50EB],
+  ["D9D5",0x50EC],
+  ["D9D4",0x50ED],
+  ["D9D7",0x50EE],
+  ["836A",0x50EF],
+  ["836B",0x50F0],
+  ["836C",0x50F1],
+  ["836D",0x50F2],
+  ["CBDB",0x50F3],
+  ["836E",0x50F4],
+  ["BDA9",0x50F5],
+  ["836F",0x50F6],
+  ["8370",0x50F7],
+  ["8371",0x50F8],
+  ["8372",0x50F9],
+  ["8373",0x50FA],
+  ["C6A7",0x50FB],
+  ["8374",0x50FC],
+  ["8375",0x50FD],
+  ["8376",0x50FE],
+  ["8377",0x50FF],
+  ["8378",0x5100],
+  ["8379",0x5101],
+  ["837A",0x5102],
+  ["837B",0x5103],
+  ["837C",0x5104],
+  ["837D",0x5105],
+  ["D9D3",0x5106],
+  ["D9D8",0x5107],
+  ["837E",0x5108],
+  ["8380",0x5109],
+  ["8381",0x510A],
+  ["D9D9",0x510B],
+  ["8382",0x510C],
+  ["8383",0x510D],
+  ["8384",0x510E],
+  ["8385",0x510F],
+  ["8386",0x5110],
+  ["8387",0x5111],
+  ["C8E5",0x5112],
+  ["8388",0x5113],
+  ["8389",0x5114],
+  ["838A",0x5115],
+  ["838B",0x5116],
+  ["838C",0x5117],
+  ["838D",0x5118],
+  ["838E",0x5119],
+  ["838F",0x511A],
+  ["8390",0x511B],
+  ["8391",0x511C],
+  ["8392",0x511D],
+  ["8393",0x511E],
+  ["8394",0x511F],
+  ["8395",0x5120],
+  ["C0DC",0x5121],
+  ["8396",0x5122],
+  ["8397",0x5123],
+  ["8398",0x5124],
+  ["8399",0x5125],
+  ["839A",0x5126],
+  ["839B",0x5127],
+  ["839C",0x5128],
+  ["839D",0x5129],
+  ["839E",0x512A],
+  ["839F",0x512B],
+  ["83A0",0x512C],
+  ["83A1",0x512D],
+  ["83A2",0x512E],
+  ["83A3",0x512F],
+  ["83A4",0x5130],
+  ["83A5",0x5131],
+  ["83A6",0x5132],
+  ["83A7",0x5133],
+  ["83A8",0x5134],
+  ["83A9",0x5135],
+  ["83AA",0x5136],
+  ["83AB",0x5137],
+  ["83AC",0x5138],
+  ["83AD",0x5139],
+  ["83AE",0x513A],
+  ["83AF",0x513B],
+  ["83B0",0x513C],
+  ["83B1",0x513D],
+  ["83B2",0x513E],
+  ["B6F9",0x513F],
+  ["D8A3",0x5140],
+  ["D4CA",0x5141],
+  ["83B3",0x5142],
+  ["D4AA",0x5143],
+  ["D0D6",0x5144],
+  ["B3E4",0x5145],
+  ["D5D7",0x5146],
+  ["83B4",0x5147],
+  ["CFC8",0x5148],
+  ["B9E2",0x5149],
+  ["83B5",0x514A],
+  ["BFCB",0x514B],
+  ["83B6",0x514C],
+  ["C3E2",0x514D],
+  ["83B7",0x514E],
+  ["83B8",0x514F],
+  ["83B9",0x5150],
+  ["B6D2",0x5151],
+  ["83BA",0x5152],
+  ["83BB",0x5153],
+  ["CDC3",0x5154],
+  ["D9EE",0x5155],
+  ["D9F0",0x5156],
+  ["83BC",0x5157],
+  ["83BD",0x5158],
+  ["83BE",0x5159],
+  ["B5B3",0x515A],
+  ["83BF",0x515B],
+  ["B6B5",0x515C],
+  ["83C0",0x515D],
+  ["83C1",0x515E],
+  ["83C2",0x515F],
+  ["83C3",0x5160],
+  ["83C4",0x5161],
+  ["BEA4",0x5162],
+  ["83C5",0x5163],
+  ["83C6",0x5164],
+  ["C8EB",0x5165],
+  ["83C7",0x5166],
+  ["83C8",0x5167],
+  ["C8AB",0x5168],
+  ["83C9",0x5169],
+  ["83CA",0x516A],
+  ["B0CB",0x516B],
+  ["B9AB",0x516C],
+  ["C1F9",0x516D],
+  ["D9E2",0x516E],
+  ["83CB",0x516F],
+  ["C0BC",0x5170],
+  ["B9B2",0x5171],
+  ["83CC",0x5172],
+  ["B9D8",0x5173],
+  ["D0CB",0x5174],
+  ["B1F8",0x5175],
+  ["C6E4",0x5176],
+  ["BEDF",0x5177],
+  ["B5E4",0x5178],
+  ["D7C8",0x5179],
+  ["83CD",0x517A],
+  ["D1F8",0x517B],
+  ["BCE6",0x517C],
+  ["CADE",0x517D],
+  ["83CE",0x517E],
+  ["83CF",0x517F],
+  ["BCBD",0x5180],
+  ["D9E6",0x5181],
+  ["D8E7",0x5182],
+  ["83D0",0x5183],
+  ["83D1",0x5184],
+  ["C4DA",0x5185],
+  ["83D2",0x5186],
+  ["83D3",0x5187],
+  ["B8D4",0x5188],
+  ["C8BD",0x5189],
+  ["83D4",0x518A],
+  ["83D5",0x518B],
+  ["B2E1",0x518C],
+  ["D4D9",0x518D],
+  ["83D6",0x518E],
+  ["83D7",0x518F],
+  ["83D8",0x5190],
+  ["83D9",0x5191],
+  ["C3B0",0x5192],
+  ["83DA",0x5193],
+  ["83DB",0x5194],
+  ["C3E1",0x5195],
+  ["DAA2",0x5196],
+  ["C8DF",0x5197],
+  ["83DC",0x5198],
+  ["D0B4",0x5199],
+  ["83DD",0x519A],
+  ["BEFC",0x519B],
+  ["C5A9",0x519C],
+  ["83DE",0x519D],
+  ["83DF",0x519E],
+  ["83E0",0x519F],
+  ["B9DA",0x51A0],
+  ["83E1",0x51A1],
+  ["DAA3",0x51A2],
+  ["83E2",0x51A3],
+  ["D4A9",0x51A4],
+  ["DAA4",0x51A5],
+  ["83E3",0x51A6],
+  ["83E4",0x51A7],
+  ["83E5",0x51A8],
+  ["83E6",0x51A9],
+  ["83E7",0x51AA],
+  ["D9FB",0x51AB],
+  ["B6AC",0x51AC],
+  ["83E8",0x51AD],
+  ["83E9",0x51AE],
+  ["B7EB",0x51AF],
+  ["B1F9",0x51B0],
+  ["D9FC",0x51B1],
+  ["B3E5",0x51B2],
+  ["BEF6",0x51B3],
+  ["83EA",0x51B4],
+  ["BFF6",0x51B5],
+  ["D2B1",0x51B6],
+  ["C0E4",0x51B7],
+  ["83EB",0x51B8],
+  ["83EC",0x51B9],
+  ["83ED",0x51BA],
+  ["B6B3",0x51BB],
+  ["D9FE",0x51BC],
+  ["D9FD",0x51BD],
+  ["83EE",0x51BE],
+  ["83EF",0x51BF],
+  ["BEBB",0x51C0],
+  ["83F0",0x51C1],
+  ["83F1",0x51C2],
+  ["83F2",0x51C3],
+  ["C6E0",0x51C4],
+  ["83F3",0x51C5],
+  ["D7BC",0x51C6],
+  ["DAA1",0x51C7],
+  ["83F4",0x51C8],
+  ["C1B9",0x51C9],
+  ["83F5",0x51CA],
+  ["B5F2",0x51CB],
+  ["C1E8",0x51CC],
+  ["83F6",0x51CD],
+  ["83F7",0x51CE],
+  ["BCF5",0x51CF],
+  ["83F8",0x51D0],
+  ["B4D5",0x51D1],
+  ["83F9",0x51D2],
+  ["83FA",0x51D3],
+  ["83FB",0x51D4],
+  ["83FC",0x51D5],
+  ["83FD",0x51D6],
+  ["83FE",0x51D7],
+  ["8440",0x51D8],
+  ["8441",0x51D9],
+  ["8442",0x51DA],
+  ["C1DD",0x51DB],
+  ["8443",0x51DC],
+  ["C4FD",0x51DD],
+  ["8444",0x51DE],
+  ["8445",0x51DF],
+  ["BCB8",0x51E0],
+  ["B7B2",0x51E1],
+  ["8446",0x51E2],
+  ["8447",0x51E3],
+  ["B7EF",0x51E4],
+  ["8448",0x51E5],
+  ["8449",0x51E6],
+  ["844A",0x51E7],
+  ["844B",0x51E8],
+  ["844C",0x51E9],
+  ["844D",0x51EA],
+  ["D9EC",0x51EB],
+  ["844E",0x51EC],
+  ["C6BE",0x51ED],
+  ["844F",0x51EE],
+  ["BFAD",0x51EF],
+  ["BBCB",0x51F0],
+  ["8450",0x51F1],
+  ["8451",0x51F2],
+  ["B5CA",0x51F3],
+  ["8452",0x51F4],
+  ["DBC9",0x51F5],
+  ["D0D7",0x51F6],
+  ["8453",0x51F7],
+  ["CDB9",0x51F8],
+  ["B0BC",0x51F9],
+  ["B3F6",0x51FA],
+  ["BBF7",0x51FB],
+  ["DBCA",0x51FC],
+  ["BAAF",0x51FD],
+  ["8454",0x51FE],
+  ["D4E4",0x51FF],
+  ["B5B6",0x5200],
+  ["B5F3",0x5201],
+  ["D8D6",0x5202],
+  ["C8D0",0x5203],
+  ["8455",0x5204],
+  ["8456",0x5205],
+  ["B7D6",0x5206],
+  ["C7D0",0x5207],
+  ["D8D7",0x5208],
+  ["8457",0x5209],
+  ["BFAF",0x520A],
+  ["8458",0x520B],
+  ["8459",0x520C],
+  ["DBBB",0x520D],
+  ["D8D8",0x520E],
+  ["845A",0x520F],
+  ["845B",0x5210],
+  ["D0CC",0x5211],
+  ["BBAE",0x5212],
+  ["845C",0x5213],
+  ["845D",0x5214],
+  ["845E",0x5215],
+  ["EBBE",0x5216],
+  ["C1D0",0x5217],
+  ["C1F5",0x5218],
+  ["D4F2",0x5219],
+  ["B8D5",0x521A],
+  ["B4B4",0x521B],
+  ["845F",0x521C],
+  ["B3F5",0x521D],
+  ["8460",0x521E],
+  ["8461",0x521F],
+  ["C9BE",0x5220],
+  ["8462",0x5221],
+  ["8463",0x5222],
+  ["8464",0x5223],
+  ["C5D0",0x5224],
+  ["8465",0x5225],
+  ["8466",0x5226],
+  ["8467",0x5227],
+  ["C5D9",0x5228],
+  ["C0FB",0x5229],
+  ["8468",0x522A],
+  ["B1F0",0x522B],
+  ["8469",0x522C],
+  ["D8D9",0x522D],
+  ["B9CE",0x522E],
+  ["846A",0x522F],
+  ["B5BD",0x5230],
+  ["846B",0x5231],
+  ["846C",0x5232],
+  ["D8DA",0x5233],
+  ["846D",0x5234],
+  ["846E",0x5235],
+  ["D6C6",0x5236],
+  ["CBA2",0x5237],
+  ["C8AF",0x5238],
+  ["C9B2",0x5239],
+  ["B4CC",0x523A],
+  ["BFCC",0x523B],
+  ["846F",0x523C],
+  ["B9F4",0x523D],
+  ["8470",0x523E],
+  ["D8DB",0x523F],
+  ["D8DC",0x5240],
+  ["B6E7",0x5241],
+  ["BCC1",0x5242],
+  ["CCEA",0x5243],
+  ["8471",0x5244],
+  ["8472",0x5245],
+  ["8473",0x5246],
+  ["8474",0x5247],
+  ["8475",0x5248],
+  ["8476",0x5249],
+  ["CFF7",0x524A],
+  ["8477",0x524B],
+  ["D8DD",0x524C],
+  ["C7B0",0x524D],
+  ["8478",0x524E],
+  ["8479",0x524F],
+  ["B9D0",0x5250],
+  ["BDA3",0x5251],
+  ["847A",0x5252],
+  ["847B",0x5253],
+  ["CCDE",0x5254],
+  ["847C",0x5255],
+  ["C6CA",0x5256],
+  ["847D",0x5257],
+  ["847E",0x5258],
+  ["8480",0x5259],
+  ["8481",0x525A],
+  ["8482",0x525B],
+  ["D8E0",0x525C],
+  ["8483",0x525D],
+  ["D8DE",0x525E],
+  ["8484",0x525F],
+  ["8485",0x5260],
+  ["D8DF",0x5261],
+  ["8486",0x5262],
+  ["8487",0x5263],
+  ["8488",0x5264],
+  ["B0FE",0x5265],
+  ["8489",0x5266],
+  ["BEE7",0x5267],
+  ["848A",0x5268],
+  ["CAA3",0x5269],
+  ["BCF4",0x526A],
+  ["848B",0x526B],
+  ["848C",0x526C],
+  ["848D",0x526D],
+  ["848E",0x526E],
+  ["B8B1",0x526F],
+  ["848F",0x5270],
+  ["8490",0x5271],
+  ["B8EE",0x5272],
+  ["8491",0x5273],
+  ["8492",0x5274],
+  ["8493",0x5275],
+  ["8494",0x5276],
+  ["8495",0x5277],
+  ["8496",0x5278],
+  ["8497",0x5279],
+  ["8498",0x527A],
+  ["8499",0x527B],
+  ["849A",0x527C],
+  ["D8E2",0x527D],
+  ["849B",0x527E],
+  ["BDCB",0x527F],
+  ["849C",0x5280],
+  ["D8E4",0x5281],
+  ["D8E3",0x5282],
+  ["849D",0x5283],
+  ["849E",0x5284],
+  ["849F",0x5285],
+  ["84A0",0x5286],
+  ["84A1",0x5287],
+  ["C5FC",0x5288],
+  ["84A2",0x5289],
+  ["84A3",0x528A],
+  ["84A4",0x528B],
+  ["84A5",0x528C],
+  ["84A6",0x528D],
+  ["84A7",0x528E],
+  ["84A8",0x528F],
+  ["D8E5",0x5290],
+  ["84A9",0x5291],
+  ["84AA",0x5292],
+  ["D8E6",0x5293],
+  ["84AB",0x5294],
+  ["84AC",0x5295],
+  ["84AD",0x5296],
+  ["84AE",0x5297],
+  ["84AF",0x5298],
+  ["84B0",0x5299],
+  ["84B1",0x529A],
+  ["C1A6",0x529B],
+  ["84B2",0x529C],
+  ["C8B0",0x529D],
+  ["B0EC",0x529E],
+  ["B9A6",0x529F],
+  ["BCD3",0x52A0],
+  ["CEF1",0x52A1],
+  ["DBBD",0x52A2],
+  ["C1D3",0x52A3],
+  ["84B3",0x52A4],
+  ["84B4",0x52A5],
+  ["84B5",0x52A6],
+  ["84B6",0x52A7],
+  ["B6AF",0x52A8],
+  ["D6FA",0x52A9],
+  ["C5AC",0x52AA],
+  ["BDD9",0x52AB],
+  ["DBBE",0x52AC],
+  ["DBBF",0x52AD],
+  ["84B7",0x52AE],
+  ["84B8",0x52AF],
+  ["84B9",0x52B0],
+  ["C0F8",0x52B1],
+  ["BEA2",0x52B2],
+  ["C0CD",0x52B3],
+  ["84BA",0x52B4],
+  ["84BB",0x52B5],
+  ["84BC",0x52B6],
+  ["84BD",0x52B7],
+  ["84BE",0x52B8],
+  ["84BF",0x52B9],
+  ["84C0",0x52BA],
+  ["84C1",0x52BB],
+  ["84C2",0x52BC],
+  ["84C3",0x52BD],
+  ["DBC0",0x52BE],
+  ["CAC6",0x52BF],
+  ["84C4",0x52C0],
+  ["84C5",0x52C1],
+  ["84C6",0x52C2],
+  ["B2AA",0x52C3],
+  ["84C7",0x52C4],
+  ["84C8",0x52C5],
+  ["84C9",0x52C6],
+  ["D3C2",0x52C7],
+  ["84CA",0x52C8],
+  ["C3E3",0x52C9],
+  ["84CB",0x52CA],
+  ["D1AB",0x52CB],
+  ["84CC",0x52CC],
+  ["84CD",0x52CD],
+  ["84CE",0x52CE],
+  ["84CF",0x52CF],
+  ["DBC2",0x52D0],
+  ["84D0",0x52D1],
+  ["C0D5",0x52D2],
+  ["84D1",0x52D3],
+  ["84D2",0x52D4],
+  ["84D3",0x52D5],
+  ["DBC3",0x52D6],
+  ["84D4",0x52D7],
+  ["BFB1",0x52D8],
+  ["84D5",0x52D9],
+  ["84D6",0x52DA],
+  ["84D7",0x52DB],
+  ["84D8",0x52DC],
+  ["84D9",0x52DD],
+  ["84DA",0x52DE],
+  ["C4BC",0x52DF],
+  ["84DB",0x52E0],
+  ["84DC",0x52E1],
+  ["84DD",0x52E2],
+  ["84DE",0x52E3],
+  ["C7DA",0x52E4],
+  ["84DF",0x52E5],
+  ["84E0",0x52E6],
+  ["84E1",0x52E7],
+  ["84E2",0x52E8],
+  ["84E3",0x52E9],
+  ["84E4",0x52EA],
+  ["84E5",0x52EB],
+  ["84E6",0x52EC],
+  ["84E7",0x52ED],
+  ["84E8",0x52EE],
+  ["84E9",0x52EF],
+  ["DBC4",0x52F0],
+  ["84EA",0x52F1],
+  ["84EB",0x52F2],
+  ["84EC",0x52F3],
+  ["84ED",0x52F4],
+  ["84EE",0x52F5],
+  ["84EF",0x52F6],
+  ["84F0",0x52F7],
+  ["84F1",0x52F8],
+  ["D9E8",0x52F9],
+  ["C9D7",0x52FA],
+  ["84F2",0x52FB],
+  ["84F3",0x52FC],
+  ["84F4",0x52FD],
+  ["B9B4",0x52FE],
+  ["CEF0",0x52FF],
+  ["D4C8",0x5300],
+  ["84F5",0x5301],
+  ["84F6",0x5302],
+  ["84F7",0x5303],
+  ["84F8",0x5304],
+  ["B0FC",0x5305],
+  ["B4D2",0x5306],
+  ["84F9",0x5307],
+  ["D0D9",0x5308],
+  ["84FA",0x5309],
+  ["84FB",0x530A],
+  ["84FC",0x530B],
+  ["84FD",0x530C],
+  ["D9E9",0x530D],
+  ["84FE",0x530E],
+  ["DECB",0x530F],
+  ["D9EB",0x5310],
+  ["8540",0x5311],
+  ["8541",0x5312],
+  ["8542",0x5313],
+  ["8543",0x5314],
+  ["D8B0",0x5315],
+  ["BBAF",0x5316],
+  ["B1B1",0x5317],
+  ["8544",0x5318],
+  ["B3D7",0x5319],
+  ["D8CE",0x531A],
+  ["8545",0x531B],
+  ["8546",0x531C],
+  ["D4D1",0x531D],
+  ["8547",0x531E],
+  ["8548",0x531F],
+  ["BDB3",0x5320],
+  ["BFEF",0x5321],
+  ["8549",0x5322],
+  ["CFBB",0x5323],
+  ["854A",0x5324],
+  ["854B",0x5325],
+  ["D8D0",0x5326],
+  ["854C",0x5327],
+  ["854D",0x5328],
+  ["854E",0x5329],
+  ["B7CB",0x532A],
+  ["854F",0x532B],
+  ["8550",0x532C],
+  ["8551",0x532D],
+  ["D8D1",0x532E],
+  ["8552",0x532F],
+  ["8553",0x5330],
+  ["8554",0x5331],
+  ["8555",0x5332],
+  ["8556",0x5333],
+  ["8557",0x5334],
+  ["8558",0x5335],
+  ["8559",0x5336],
+  ["855A",0x5337],
+  ["855B",0x5338],
+  ["C6A5",0x5339],
+  ["C7F8",0x533A],
+  ["D2BD",0x533B],
+  ["855C",0x533C],
+  ["855D",0x533D],
+  ["D8D2",0x533E],
+  ["C4E4",0x533F],
+  ["855E",0x5340],
+  ["CAAE",0x5341],
+  ["855F",0x5342],
+  ["C7A7",0x5343],
+  ["8560",0x5344],
+  ["D8A6",0x5345],
+  ["8561",0x5346],
+  ["C9FD",0x5347],
+  ["CEE7",0x5348],
+  ["BBDC",0x5349],
+  ["B0EB",0x534A],
+  ["8562",0x534B],
+  ["8563",0x534C],
+  ["8564",0x534D],
+  ["BBAA",0x534E],
+  ["D0AD",0x534F],
+  ["8565",0x5350],
+  ["B1B0",0x5351],
+  ["D7E4",0x5352],
+  ["D7BF",0x5353],
+  ["8566",0x5354],
+  ["B5A5",0x5355],
+  ["C2F4",0x5356],
+  ["C4CF",0x5357],
+  ["8567",0x5358],
+  ["8568",0x5359],
+  ["B2A9",0x535A],
+  ["8569",0x535B],
+  ["B2B7",0x535C],
+  ["856A",0x535D],
+  ["B1E5",0x535E],
+  ["DFB2",0x535F],
+  ["D5BC",0x5360],
+  ["BFA8",0x5361],
+  ["C2AC",0x5362],
+  ["D8D5",0x5363],
+  ["C2B1",0x5364],
+  ["856B",0x5365],
+  ["D8D4",0x5366],
+  ["CED4",0x5367],
+  ["856C",0x5368],
+  ["DAE0",0x5369],
+  ["856D",0x536A],
+  ["CEC0",0x536B],
+  ["856E",0x536C],
+  ["856F",0x536D],
+  ["D8B4",0x536E],
+  ["C3AE",0x536F],
+  ["D3A1",0x5370],
+  ["CEA3",0x5371],
+  ["8570",0x5372],
+  ["BCB4",0x5373],
+  ["C8B4",0x5374],
+  ["C2D1",0x5375],
+  ["8571",0x5376],
+  ["BEED",0x5377],
+  ["D0B6",0x5378],
+  ["8572",0x5379],
+  ["DAE1",0x537A],
+  ["8573",0x537B],
+  ["8574",0x537C],
+  ["8575",0x537D],
+  ["8576",0x537E],
+  ["C7E4",0x537F],
+  ["8577",0x5380],
+  ["8578",0x5381],
+  ["B3A7",0x5382],
+  ["8579",0x5383],
+  ["B6F2",0x5384],
+  ["CCFC",0x5385],
+  ["C0FA",0x5386],
+  ["857A",0x5387],
+  ["857B",0x5388],
+  ["C0F7",0x5389],
+  ["857C",0x538A],
+  ["D1B9",0x538B],
+  ["D1E1",0x538C],
+  ["D8C7",0x538D],
+  ["857D",0x538E],
+  ["857E",0x538F],
+  ["8580",0x5390],
+  ["8581",0x5391],
+  ["8582",0x5392],
+  ["8583",0x5393],
+  ["8584",0x5394],
+  ["B2DE",0x5395],
+  ["8585",0x5396],
+  ["8586",0x5397],
+  ["C0E5",0x5398],
+  ["8587",0x5399],
+  ["BAF1",0x539A],
+  ["8588",0x539B],
+  ["8589",0x539C],
+  ["D8C8",0x539D],
+  ["858A",0x539E],
+  ["D4AD",0x539F],
+  ["858B",0x53A0],
+  ["858C",0x53A1],
+  ["CFE1",0x53A2],
+  ["D8C9",0x53A3],
+  ["858D",0x53A4],
+  ["D8CA",0x53A5],
+  ["CFC3",0x53A6],
+  ["858E",0x53A7],
+  ["B3F8",0x53A8],
+  ["BEC7",0x53A9],
+  ["858F",0x53AA],
+  ["8590",0x53AB],
+  ["8591",0x53AC],
+  ["8592",0x53AD],
+  ["D8CB",0x53AE],
+  ["8593",0x53AF],
+  ["8594",0x53B0],
+  ["8595",0x53B1],
+  ["8596",0x53B2],
+  ["8597",0x53B3],
+  ["8598",0x53B4],
+  ["8599",0x53B5],
+  ["DBCC",0x53B6],
+  ["859A",0x53B7],
+  ["859B",0x53B8],
+  ["859C",0x53B9],
+  ["859D",0x53BA],
+  ["C8A5",0x53BB],
+  ["859E",0x53BC],
+  ["859F",0x53BD],
+  ["85A0",0x53BE],
+  ["CFD8",0x53BF],
+  ["85A1",0x53C0],
+  ["C8FE",0x53C1],
+  ["B2CE",0x53C2],
+  ["85A2",0x53C3],
+  ["85A3",0x53C4],
+  ["85A4",0x53C5],
+  ["85A5",0x53C6],
+  ["85A6",0x53C7],
+  ["D3D6",0x53C8],
+  ["B2E6",0x53C9],
+  ["BCB0",0x53CA],
+  ["D3D1",0x53CB],
+  ["CBAB",0x53CC],
+  ["B7B4",0x53CD],
+  ["85A7",0x53CE],
+  ["85A8",0x53CF],
+  ["85A9",0x53D0],
+  ["B7A2",0x53D1],
+  ["85AA",0x53D2],
+  ["85AB",0x53D3],
+  ["CAE5",0x53D4],
+  ["85AC",0x53D5],
+  ["C8A1",0x53D6],
+  ["CADC",0x53D7],
+  ["B1E4",0x53D8],
+  ["D0F0",0x53D9],
+  ["85AD",0x53DA],
+  ["C5D1",0x53DB],
+  ["85AE",0x53DC],
+  ["85AF",0x53DD],
+  ["85B0",0x53DE],
+  ["DBC5",0x53DF],
+  ["B5FE",0x53E0],
+  ["85B1",0x53E1],
+  ["85B2",0x53E2],
+  ["BFDA",0x53E3],
+  ["B9C5",0x53E4],
+  ["BEE4",0x53E5],
+  ["C1ED",0x53E6],
+  ["85B3",0x53E7],
+  ["DFB6",0x53E8],
+  ["DFB5",0x53E9],
+  ["D6BB",0x53EA],
+  ["BDD0",0x53EB],
+  ["D5D9",0x53EC],
+  ["B0C8",0x53ED],
+  ["B6A3",0x53EE],
+  ["BFC9",0x53EF],
+  ["CCA8",0x53F0],
+  ["DFB3",0x53F1],
+  ["CAB7",0x53F2],
+  ["D3D2",0x53F3],
+  ["85B4",0x53F4],
+  ["D8CF",0x53F5],
+  ["D2B6",0x53F6],
+  ["BAC5",0x53F7],
+  ["CBBE",0x53F8],
+  ["CCBE",0x53F9],
+  ["85B5",0x53FA],
+  ["DFB7",0x53FB],
+  ["B5F0",0x53FC],
+  ["DFB4",0x53FD],
+  ["85B6",0x53FE],
+  ["85B7",0x53FF],
+  ["85B8",0x5400],
+  ["D3F5",0x5401],
+  ["85B9",0x5402],
+  ["B3D4",0x5403],
+  ["B8F7",0x5404],
+  ["85BA",0x5405],
+  ["DFBA",0x5406],
+  ["85BB",0x5407],
+  ["BACF",0x5408],
+  ["BCAA",0x5409],
+  ["B5F5",0x540A],
+  ["85BC",0x540B],
+  ["CDAC",0x540C],
+  ["C3FB",0x540D],
+  ["BAF3",0x540E],
+  ["C0F4",0x540F],
+  ["CDC2",0x5410],
+  ["CFF2",0x5411],
+  ["DFB8",0x5412],
+  ["CFC5",0x5413],
+  ["85BD",0x5414],
+  ["C2C0",0x5415],
+  ["DFB9",0x5416],
+  ["C2F0",0x5417],
+  ["85BE",0x5418],
+  ["85BF",0x5419],
+  ["85C0",0x541A],
+  ["BEFD",0x541B],
+  ["85C1",0x541C],
+  ["C1DF",0x541D],
+  ["CDCC",0x541E],
+  ["D2F7",0x541F],
+  ["B7CD",0x5420],
+  ["DFC1",0x5421],
+  ["85C2",0x5422],
+  ["DFC4",0x5423],
+  ["85C3",0x5424],
+  ["85C4",0x5425],
+  ["B7F1",0x5426],
+  ["B0C9",0x5427],
+  ["B6D6",0x5428],
+  ["B7D4",0x5429],
+  ["85C5",0x542A],
+  ["BAAC",0x542B],
+  ["CCFD",0x542C],
+  ["BFD4",0x542D],
+  ["CBB1",0x542E],
+  ["C6F4",0x542F],
+  ["85C6",0x5430],
+  ["D6A8",0x5431],
+  ["DFC5",0x5432],
+  ["85C7",0x5433],
+  ["CEE2",0x5434],
+  ["B3B3",0x5435],
+  ["85C8",0x5436],
+  ["85C9",0x5437],
+  ["CEFC",0x5438],
+  ["B4B5",0x5439],
+  ["85CA",0x543A],
+  ["CEC7",0x543B],
+  ["BAF0",0x543C],
+  ["85CB",0x543D],
+  ["CEE1",0x543E],
+  ["85CC",0x543F],
+  ["D1BD",0x5440],
+  ["85CD",0x5441],
+  ["85CE",0x5442],
+  ["DFC0",0x5443],
+  ["85CF",0x5444],
+  ["85D0",0x5445],
+  ["B4F4",0x5446],
+  ["85D1",0x5447],
+  ["B3CA",0x5448],
+  ["85D2",0x5449],
+  ["B8E6",0x544A],
+  ["DFBB",0x544B],
+  ["85D3",0x544C],
+  ["85D4",0x544D],
+  ["85D5",0x544E],
+  ["85D6",0x544F],
+  ["C4C5",0x5450],
+  ["85D7",0x5451],
+  ["DFBC",0x5452],
+  ["DFBD",0x5453],
+  ["DFBE",0x5454],
+  ["C5BB",0x5455],
+  ["DFBF",0x5456],
+  ["DFC2",0x5457],
+  ["D4B1",0x5458],
+  ["DFC3",0x5459],
+  ["85D8",0x545A],
+  ["C7BA",0x545B],
+  ["CED8",0x545C],
+  ["85D9",0x545D],
+  ["85DA",0x545E],
+  ["85DB",0x545F],
+  ["85DC",0x5460],
+  ["85DD",0x5461],
+  ["C4D8",0x5462],
+  ["85DE",0x5463],
+  ["DFCA",0x5464],
+  ["85DF",0x5465],
+  ["DFCF",0x5466],
+  ["85E0",0x5467],
+  ["D6DC",0x5468],
+  ["85E1",0x5469],
+  ["85E2",0x546A],
+  ["85E3",0x546B],
+  ["85E4",0x546C],
+  ["85E5",0x546D],
+  ["85E6",0x546E],
+  ["85E7",0x546F],
+  ["85E8",0x5470],
+  ["DFC9",0x5471],
+  ["DFDA",0x5472],
+  ["CEB6",0x5473],
+  ["85E9",0x5474],
+  ["BAC7",0x5475],
+  ["DFCE",0x5476],
+  ["DFC8",0x5477],
+  ["C5DE",0x5478],
+  ["85EA",0x5479],
+  ["85EB",0x547A],
+  ["C9EB",0x547B],
+  ["BAF4",0x547C],
+  ["C3FC",0x547D],
+  ["85EC",0x547E],
+  ["85ED",0x547F],
+  ["BED7",0x5480],
+  ["85EE",0x5481],
+  ["DFC6",0x5482],
+  ["85EF",0x5483],
+  ["DFCD",0x5484],
+  ["85F0",0x5485],
+  ["C5D8",0x5486],
+  ["85F1",0x5487],
+  ["85F2",0x5488],
+  ["85F3",0x5489],
+  ["85F4",0x548A],
+  ["D5A6",0x548B],
+  ["BACD",0x548C],
+  ["85F5",0x548D],
+  ["BECC",0x548E],
+  ["D3BD",0x548F],
+  ["B8C0",0x5490],
+  ["85F6",0x5491],
+  ["D6E4",0x5492],
+  ["85F7",0x5493],
+  ["DFC7",0x5494],
+  ["B9BE",0x5495],
+  ["BFA7",0x5496],
+  ["85F8",0x5497],
+  ["85F9",0x5498],
+  ["C1FC",0x5499],
+  ["DFCB",0x549A],
+  ["DFCC",0x549B],
+  ["85FA",0x549C],
+  ["DFD0",0x549D],
+  ["85FB",0x549E],
+  ["85FC",0x549F],
+  ["85FD",0x54A0],
+  ["85FE",0x54A1],
+  ["8640",0x54A2],
+  ["DFDB",0x54A3],
+  ["DFE5",0x54A4],
+  ["8641",0x54A5],
+  ["DFD7",0x54A6],
+  ["DFD6",0x54A7],
+  ["D7C9",0x54A8],
+  ["DFE3",0x54A9],
+  ["DFE4",0x54AA],
+  ["E5EB",0x54AB],
+  ["D2A7",0x54AC],
+  ["DFD2",0x54AD],
+  ["8642",0x54AE],
+  ["BFA9",0x54AF],
+  ["8643",0x54B0],
+  ["D4DB",0x54B1],
+  ["8644",0x54B2],
+  ["BFC8",0x54B3],
+  ["DFD4",0x54B4],
+  ["8645",0x54B5],
+  ["8646",0x54B6],
+  ["8647",0x54B7],
+  ["CFCC",0x54B8],
+  ["8648",0x54B9],
+  ["8649",0x54BA],
+  ["DFDD",0x54BB],
+  ["864A",0x54BC],
+  ["D1CA",0x54BD],
+  ["864B",0x54BE],
+  ["DFDE",0x54BF],
+  ["B0A7",0x54C0],
+  ["C6B7",0x54C1],
+  ["DFD3",0x54C2],
+  ["864C",0x54C3],
+  ["BAE5",0x54C4],
+  ["864D",0x54C5],
+  ["B6DF",0x54C6],
+  ["CDDB",0x54C7],
+  ["B9FE",0x54C8],
+  ["D4D5",0x54C9],
+  ["864E",0x54CA],
+  ["864F",0x54CB],
+  ["DFDF",0x54CC],
+  ["CFEC",0x54CD],
+  ["B0A5",0x54CE],
+  ["DFE7",0x54CF],
+  ["DFD1",0x54D0],
+  ["D1C6",0x54D1],
+  ["DFD5",0x54D2],
+  ["DFD8",0x54D3],
+  ["DFD9",0x54D4],
+  ["DFDC",0x54D5],
+  ["8650",0x54D6],
+  ["BBA9",0x54D7],
+  ["8651",0x54D8],
+  ["DFE0",0x54D9],
+  ["DFE1",0x54DA],
+  ["8652",0x54DB],
+  ["DFE2",0x54DC],
+  ["DFE6",0x54DD],
+  ["DFE8",0x54DE],
+  ["D3B4",0x54DF],
+  ["8653",0x54E0],
+  ["8654",0x54E1],
+  ["8655",0x54E2],
+  ["8656",0x54E3],
+  ["8657",0x54E4],
+  ["B8E7",0x54E5],
+  ["C5B6",0x54E6],
+  ["DFEA",0x54E7],
+  ["C9DA",0x54E8],
+  ["C1A8",0x54E9],
+  ["C4C4",0x54EA],
+  ["8658",0x54EB],
+  ["8659",0x54EC],
+  ["BFDE",0x54ED],
+  ["CFF8",0x54EE],
+  ["865A",0x54EF],
+  ["865B",0x54F0],
+  ["865C",0x54F1],
+  ["D5DC",0x54F2],
+  ["DFEE",0x54F3],
+  ["865D",0x54F4],
+  ["865E",0x54F5],
+  ["865F",0x54F6],
+  ["8660",0x54F7],
+  ["8661",0x54F8],
+  ["8662",0x54F9],
+  ["B2B8",0x54FA],
+  ["8663",0x54FB],
+  ["BADF",0x54FC],
+  ["DFEC",0x54FD],
+  ["8664",0x54FE],
+  ["DBC1",0x54FF],
+  ["8665",0x5500],
+  ["D1E4",0x5501],
+  ["8666",0x5502],
+  ["8667",0x5503],
+  ["8668",0x5504],
+  ["8669",0x5505],
+  ["CBF4",0x5506],
+  ["B4BD",0x5507],
+  ["866A",0x5508],
+  ["B0A6",0x5509],
+  ["866B",0x550A],
+  ["866C",0x550B],
+  ["866D",0x550C],
+  ["866E",0x550D],
+  ["866F",0x550E],
+  ["DFF1",0x550F],
+  ["CCC6",0x5510],
+  ["DFF2",0x5511],
+  ["8670",0x5512],
+  ["8671",0x5513],
+  ["DFED",0x5514],
+  ["8672",0x5515],
+  ["8673",0x5516],
+  ["8674",0x5517],
+  ["8675",0x5518],
+  ["8676",0x5519],
+  ["8677",0x551A],
+  ["DFE9",0x551B],
+  ["8678",0x551C],
+  ["8679",0x551D],
+  ["867A",0x551E],
+  ["867B",0x551F],
+  ["DFEB",0x5520],
+  ["867C",0x5521],
+  ["DFEF",0x5522],
+  ["DFF0",0x5523],
+  ["BBBD",0x5524],
+  ["867D",0x5525],
+  ["867E",0x5526],
+  ["DFF3",0x5527],
+  ["8680",0x5528],
+  ["8681",0x5529],
+  ["DFF4",0x552A],
+  ["8682",0x552B],
+  ["BBA3",0x552C],
+  ["8683",0x552D],
+  ["CADB",0x552E],
+  ["CEA8",0x552F],
+  ["E0A7",0x5530],
+  ["B3AA",0x5531],
+  ["8684",0x5532],
+  ["E0A6",0x5533],
+  ["8685",0x5534],
+  ["8686",0x5535],
+  ["8687",0x5536],
+  ["E0A1",0x5537],
+  ["8688",0x5538],
+  ["8689",0x5539],
+  ["868A",0x553A],
+  ["868B",0x553B],
+  ["DFFE",0x553C],
+  ["868C",0x553D],
+  ["CDD9",0x553E],
+  ["DFFC",0x553F],
+  ["868D",0x5540],
+  ["DFFA",0x5541],
+  ["868E",0x5542],
+  ["BFD0",0x5543],
+  ["D7C4",0x5544],
+  ["868F",0x5545],
+  ["C9CC",0x5546],
+  ["8690",0x5547],
+  ["8691",0x5548],
+  ["DFF8",0x5549],
+  ["B0A1",0x554A],
+  ["8692",0x554B],
+  ["8693",0x554C],
+  ["8694",0x554D],
+  ["8695",0x554E],
+  ["8696",0x554F],
+  ["DFFD",0x5550],
+  ["8697",0x5551],
+  ["8698",0x5552],
+  ["8699",0x5553],
+  ["869A",0x5554],
+  ["DFFB",0x5555],
+  ["E0A2",0x5556],
+  ["869B",0x5557],
+  ["869C",0x5558],
+  ["869D",0x5559],
+  ["869E",0x555A],
+  ["869F",0x555B],
+  ["E0A8",0x555C],
+  ["86A0",0x555D],
+  ["86A1",0x555E],
+  ["86A2",0x555F],
+  ["86A3",0x5560],
+  ["B7C8",0x5561],
+  ["86A4",0x5562],
+  ["86A5",0x5563],
+  ["C6A1",0x5564],
+  ["C9B6",0x5565],
+  ["C0B2",0x5566],
+  ["DFF5",0x5567],
+  ["86A6",0x5568],
+  ["86A7",0x5569],
+  ["C5BE",0x556A],
+  ["86A8",0x556B],
+  ["D8C4",0x556C],
+  ["DFF9",0x556D],
+  ["C4F6",0x556E],
+  ["86A9",0x556F],
+  ["86AA",0x5570],
+  ["86AB",0x5571],
+  ["86AC",0x5572],
+  ["86AD",0x5573],
+  ["86AE",0x5574],
+  ["E0A3",0x5575],
+  ["E0A4",0x5576],
+  ["E0A5",0x5577],
+  ["D0A5",0x5578],
+  ["86AF",0x5579],
+  ["86B0",0x557A],
+  ["E0B4",0x557B],
+  ["CCE4",0x557C],
+  ["86B1",0x557D],
+  ["E0B1",0x557E],
+  ["86B2",0x557F],
+  ["BFA6",0x5580],
+  ["E0AF",0x5581],
+  ["CEB9",0x5582],
+  ["E0AB",0x5583],
+  ["C9C6",0x5584],
+  ["86B3",0x5585],
+  ["86B4",0x5586],
+  ["C0AE",0x5587],
+  ["E0AE",0x5588],
+  ["BAED",0x5589],
+  ["BAB0",0x558A],
+  ["E0A9",0x558B],
+  ["86B5",0x558C],
+  ["86B6",0x558D],
+  ["86B7",0x558E],
+  ["DFF6",0x558F],
+  ["86B8",0x5590],
+  ["E0B3",0x5591],
+  ["86B9",0x5592],
+  ["86BA",0x5593],
+  ["E0B8",0x5594],
+  ["86BB",0x5595],
+  ["86BC",0x5596],
+  ["86BD",0x5597],
+  ["B4AD",0x5598],
+  ["E0B9",0x5599],
+  ["86BE",0x559A],
+  ["86BF",0x559B],
+  ["CFB2",0x559C],
+  ["BAC8",0x559D],
+  ["86C0",0x559E],
+  ["E0B0",0x559F],
+  ["86C1",0x55A0],
+  ["86C2",0x55A1],
+  ["86C3",0x55A2],
+  ["86C4",0x55A3],
+  ["86C5",0x55A4],
+  ["86C6",0x55A5],
+  ["86C7",0x55A6],
+  ["D0FA",0x55A7],
+  ["86C8",0x55A8],
+  ["86C9",0x55A9],
+  ["86CA",0x55AA],
+  ["86CB",0x55AB],
+  ["86CC",0x55AC],
+  ["86CD",0x55AD],
+  ["86CE",0x55AE],
+  ["86CF",0x55AF],
+  ["86D0",0x55B0],
+  ["E0AC",0x55B1],
+  ["86D1",0x55B2],
+  ["D4FB",0x55B3],
+  ["86D2",0x55B4],
+  ["DFF7",0x55B5],
+  ["86D3",0x55B6],
+  ["C5E7",0x55B7],
+  ["86D4",0x55B8],
+  ["E0AD",0x55B9],
+  ["86D5",0x55BA],
+  ["D3F7",0x55BB],
+  ["86D6",0x55BC],
+  ["E0B6",0x55BD],
+  ["E0B7",0x55BE],
+  ["86D7",0x55BF],
+  ["86D8",0x55C0],
+  ["86D9",0x55C1],
+  ["86DA",0x55C2],
+  ["86DB",0x55C3],
+  ["E0C4",0x55C4],
+  ["D0E1",0x55C5],
+  ["86DC",0x55C6],
+  ["86DD",0x55C7],
+  ["86DE",0x55C8],
+  ["E0BC",0x55C9],
+  ["86DF",0x55CA],
+  ["86E0",0x55CB],
+  ["E0C9",0x55CC],
+  ["E0CA",0x55CD],
+  ["86E1",0x55CE],
+  ["86E2",0x55CF],
+  ["86E3",0x55D0],
+  ["E0BE",0x55D1],
+  ["E0AA",0x55D2],
+  ["C9A4",0x55D3],
+  ["E0C1",0x55D4],
+  ["86E4",0x55D5],
+  ["E0B2",0x55D6],
+  ["86E5",0x55D7],
+  ["86E6",0x55D8],
+  ["86E7",0x55D9],
+  ["86E8",0x55DA],
+  ["86E9",0x55DB],
+  ["CAC8",0x55DC],
+  ["E0C3",0x55DD],
+  ["86EA",0x55DE],
+  ["E0B5",0x55DF],
+  ["86EB",0x55E0],
+  ["CECB",0x55E1],
+  ["86EC",0x55E2],
+  ["CBC3",0x55E3],
+  ["E0CD",0x55E4],
+  ["E0C6",0x55E5],
+  ["E0C2",0x55E6],
+  ["86ED",0x55E7],
+  ["E0CB",0x55E8],
+  ["86EE",0x55E9],
+  ["E0BA",0x55EA],
+  ["E0BF",0x55EB],
+  ["E0C0",0x55EC],
+  ["86EF",0x55ED],
+  ["86F0",0x55EE],
+  ["E0C5",0x55EF],
+  ["86F1",0x55F0],
+  ["86F2",0x55F1],
+  ["E0C7",0x55F2],
+  ["E0C8",0x55F3],
+  ["86F3",0x55F4],
+  ["E0CC",0x55F5],
+  ["86F4",0x55F6],
+  ["E0BB",0x55F7],
+  ["86F5",0x55F8],
+  ["86F6",0x55F9],
+  ["86F7",0x55FA],
+  ["86F8",0x55FB],
+  ["86F9",0x55FC],
+  ["CBD4",0x55FD],
+  ["E0D5",0x55FE],
+  ["86FA",0x55FF],
+  ["E0D6",0x5600],
+  ["E0D2",0x5601],
+  ["86FB",0x5602],
+  ["86FC",0x5603],
+  ["86FD",0x5604],
+  ["86FE",0x5605],
+  ["8740",0x5606],
+  ["8741",0x5607],
+  ["E0D0",0x5608],
+  ["BCCE",0x5609],
+  ["8742",0x560A],
+  ["8743",0x560B],
+  ["E0D1",0x560C],
+  ["8744",0x560D],
+  ["B8C2",0x560E],
+  ["D8C5",0x560F],
+  ["8745",0x5610],
+  ["8746",0x5611],
+  ["8747",0x5612],
+  ["8748",0x5613],
+  ["8749",0x5614],
+  ["874A",0x5615],
+  ["874B",0x5616],
+  ["874C",0x5617],
+  ["D0EA",0x5618],
+  ["874D",0x5619],
+  ["874E",0x561A],
+  ["C2EF",0x561B],
+  ["874F",0x561C],
+  ["8750",0x561D],
+  ["E0CF",0x561E],
+  ["E0BD",0x561F],
+  ["8751",0x5620],
+  ["8752",0x5621],
+  ["8753",0x5622],
+  ["E0D4",0x5623],
+  ["E0D3",0x5624],
+  ["8754",0x5625],
+  ["8755",0x5626],
+  ["E0D7",0x5627],
+  ["8756",0x5628],
+  ["8757",0x5629],
+  ["8758",0x562A],
+  ["8759",0x562B],
+  ["E0DC",0x562C],
+  ["E0D8",0x562D],
+  ["875A",0x562E],
+  ["875B",0x562F],
+  ["875C",0x5630],
+  ["D6F6",0x5631],
+  ["B3B0",0x5632],
+  ["875D",0x5633],
+  ["D7EC",0x5634],
+  ["875E",0x5635],
+  ["CBBB",0x5636],
+  ["875F",0x5637],
+  ["8760",0x5638],
+  ["E0DA",0x5639],
+  ["8761",0x563A],
+  ["CEFB",0x563B],
+  ["8762",0x563C],
+  ["8763",0x563D],
+  ["8764",0x563E],
+  ["BAD9",0x563F],
+  ["8765",0x5640],
+  ["8766",0x5641],
+  ["8767",0x5642],
+  ["8768",0x5643],
+  ["8769",0x5644],
+  ["876A",0x5645],
+  ["876B",0x5646],
+  ["876C",0x5647],
+  ["876D",0x5648],
+  ["876E",0x5649],
+  ["876F",0x564A],
+  ["8770",0x564B],
+  ["E0E1",0x564C],
+  ["E0DD",0x564D],
+  ["D2AD",0x564E],
+  ["8771",0x564F],
+  ["8772",0x5650],
+  ["8773",0x5651],
+  ["8774",0x5652],
+  ["8775",0x5653],
+  ["E0E2",0x5654],
+  ["8776",0x5655],
+  ["8777",0x5656],
+  ["E0DB",0x5657],
+  ["E0D9",0x5658],
+  ["E0DF",0x5659],
+  ["8778",0x565A],
+  ["8779",0x565B],
+  ["E0E0",0x565C],
+  ["877A",0x565D],
+  ["877B",0x565E],
+  ["877C",0x565F],
+  ["877D",0x5660],
+  ["877E",0x5661],
+  ["E0DE",0x5662],
+  ["8780",0x5663],
+  ["E0E4",0x5664],
+  ["8781",0x5665],
+  ["8782",0x5666],
+  ["8783",0x5667],
+  ["C6F7",0x5668],
+  ["D8AC",0x5669],
+  ["D4EB",0x566A],
+  ["E0E6",0x566B],
+  ["CAC9",0x566C],
+  ["8784",0x566D],
+  ["8785",0x566E],
+  ["8786",0x566F],
+  ["8787",0x5670],
+  ["E0E5",0x5671],
+  ["8788",0x5672],
+  ["8789",0x5673],
+  ["878A",0x5674],
+  ["878B",0x5675],
+  ["B8C1",0x5676],
+  ["878C",0x5677],
+  ["878D",0x5678],
+  ["878E",0x5679],
+  ["878F",0x567A],
+  ["E0E7",0x567B],
+  ["E0E8",0x567C],
+  ["8790",0x567D],
+  ["8791",0x567E],
+  ["8792",0x567F],
+  ["8793",0x5680],
+  ["8794",0x5681],
+  ["8795",0x5682],
+  ["8796",0x5683],
+  ["8797",0x5684],
+  ["E0E9",0x5685],
+  ["E0E3",0x5686],
+  ["8798",0x5687],
+  ["8799",0x5688],
+  ["879A",0x5689],
+  ["879B",0x568A],
+  ["879C",0x568B],
+  ["879D",0x568C],
+  ["879E",0x568D],
+  ["BABF",0x568E],
+  ["CCE7",0x568F],
+  ["879F",0x5690],
+  ["87A0",0x5691],
+  ["87A1",0x5692],
+  ["E0EA",0x5693],
+  ["87A2",0x5694],
+  ["87A3",0x5695],
+  ["87A4",0x5696],
+  ["87A5",0x5697],
+  ["87A6",0x5698],
+  ["87A7",0x5699],
+  ["87A8",0x569A],
+  ["87A9",0x569B],
+  ["87AA",0x569C],
+  ["87AB",0x569D],
+  ["87AC",0x569E],
+  ["87AD",0x569F],
+  ["87AE",0x56A0],
+  ["87AF",0x56A1],
+  ["87B0",0x56A2],
+  ["CFF9",0x56A3],
+  ["87B1",0x56A4],
+  ["87B2",0x56A5],
+  ["87B3",0x56A6],
+  ["87B4",0x56A7],
+  ["87B5",0x56A8],
+  ["87B6",0x56A9],
+  ["87B7",0x56AA],
+  ["87B8",0x56AB],
+  ["87B9",0x56AC],
+  ["87BA",0x56AD],
+  ["87BB",0x56AE],
+  ["E0EB",0x56AF],
+  ["87BC",0x56B0],
+  ["87BD",0x56B1],
+  ["87BE",0x56B2],
+  ["87BF",0x56B3],
+  ["87C0",0x56B4],
+  ["87C1",0x56B5],
+  ["87C2",0x56B6],
+  ["C8C2",0x56B7],
+  ["87C3",0x56B8],
+  ["87C4",0x56B9],
+  ["87C5",0x56BA],
+  ["87C6",0x56BB],
+  ["BDC0",0x56BC],
+  ["87C7",0x56BD],
+  ["87C8",0x56BE],
+  ["87C9",0x56BF],
+  ["87CA",0x56C0],
+  ["87CB",0x56C1],
+  ["87CC",0x56C2],
+  ["87CD",0x56C3],
+  ["87CE",0x56C4],
+  ["87CF",0x56C5],
+  ["87D0",0x56C6],
+  ["87D1",0x56C7],
+  ["87D2",0x56C8],
+  ["87D3",0x56C9],
+  ["C4D2",0x56CA],
+  ["87D4",0x56CB],
+  ["87D5",0x56CC],
+  ["87D6",0x56CD],
+  ["87D7",0x56CE],
+  ["87D8",0x56CF],
+  ["87D9",0x56D0],
+  ["87DA",0x56D1],
+  ["87DB",0x56D2],
+  ["87DC",0x56D3],
+  ["E0EC",0x56D4],
+  ["87DD",0x56D5],
+  ["87DE",0x56D6],
+  ["E0ED",0x56D7],
+  ["87DF",0x56D8],
+  ["87E0",0x56D9],
+  ["C7F4",0x56DA],
+  ["CBC4",0x56DB],
+  ["87E1",0x56DC],
+  ["E0EE",0x56DD],
+  ["BBD8",0x56DE],
+  ["D8B6",0x56DF],
+  ["D2F2",0x56E0],
+  ["E0EF",0x56E1],
+  ["CDC5",0x56E2],
+  ["87E2",0x56E3],
+  ["B6DA",0x56E4],
+  ["87E3",0x56E5],
+  ["87E4",0x56E6],
+  ["87E5",0x56E7],
+  ["87E6",0x56E8],
+  ["87E7",0x56E9],
+  ["87E8",0x56EA],
+  ["E0F1",0x56EB],
+  ["87E9",0x56EC],
+  ["D4B0",0x56ED],
+  ["87EA",0x56EE],
+  ["87EB",0x56EF],
+  ["C0A7",0x56F0],
+  ["B4D1",0x56F1],
+  ["87EC",0x56F2],
+  ["87ED",0x56F3],
+  ["CEA7",0x56F4],
+  ["E0F0",0x56F5],
+  ["87EE",0x56F6],
+  ["87EF",0x56F7],
+  ["87F0",0x56F8],
+  ["E0F2",0x56F9],
+  ["B9CC",0x56FA],
+  ["87F1",0x56FB],
+  ["87F2",0x56FC],
+  ["B9FA",0x56FD],
+  ["CDBC",0x56FE],
+  ["E0F3",0x56FF],
+  ["87F3",0x5700],
+  ["87F4",0x5701],
+  ["87F5",0x5702],
+  ["C6D4",0x5703],
+  ["E0F4",0x5704],
+  ["87F6",0x5705],
+  ["D4B2",0x5706],
+  ["87F7",0x5707],
+  ["C8A6",0x5708],
+  ["E0F6",0x5709],
+  ["E0F5",0x570A],
+  ["87F8",0x570B],
+  ["87F9",0x570C],
+  ["87FA",0x570D],
+  ["87FB",0x570E],
+  ["87FC",0x570F],
+  ["87FD",0x5710],
+  ["87FE",0x5711],
+  ["8840",0x5712],
+  ["8841",0x5713],
+  ["8842",0x5714],
+  ["8843",0x5715],
+  ["8844",0x5716],
+  ["8845",0x5717],
+  ["8846",0x5718],
+  ["8847",0x5719],
+  ["8848",0x571A],
+  ["8849",0x571B],
+  ["E0F7",0x571C],
+  ["884A",0x571D],
+  ["884B",0x571E],
+  ["CDC1",0x571F],
+  ["884C",0x5720],
+  ["884D",0x5721],
+  ["884E",0x5722],
+  ["CAA5",0x5723],
+  ["884F",0x5724],
+  ["8850",0x5725],
+  ["8851",0x5726],
+  ["8852",0x5727],
+  ["D4DA",0x5728],
+  ["DBD7",0x5729],
+  ["DBD9",0x572A],
+  ["8853",0x572B],
+  ["DBD8",0x572C],
+  ["B9E7",0x572D],
+  ["DBDC",0x572E],
+  ["DBDD",0x572F],
+  ["B5D8",0x5730],
+  ["8854",0x5731],
+  ["8855",0x5732],
+  ["DBDA",0x5733],
+  ["8856",0x5734],
+  ["8857",0x5735],
+  ["8858",0x5736],
+  ["8859",0x5737],
+  ["885A",0x5738],
+  ["DBDB",0x5739],
+  ["B3A1",0x573A],
+  ["DBDF",0x573B],
+  ["885B",0x573C],
+  ["885C",0x573D],
+  ["BBF8",0x573E],
+  ["885D",0x573F],
+  ["D6B7",0x5740],
+  ["885E",0x5741],
+  ["DBE0",0x5742],
+  ["885F",0x5743],
+  ["8860",0x5744],
+  ["8861",0x5745],
+  ["8862",0x5746],
+  ["BEF9",0x5747],
+  ["8863",0x5748],
+  ["8864",0x5749],
+  ["B7BB",0x574A],
+  ["8865",0x574B],
+  ["DBD0",0x574C],
+  ["CCAE",0x574D],
+  ["BFB2",0x574E],
+  ["BBB5",0x574F],
+  ["D7F8",0x5750],
+  ["BFD3",0x5751],
+  ["8866",0x5752],
+  ["8867",0x5753],
+  ["8868",0x5754],
+  ["8869",0x5755],
+  ["886A",0x5756],
+  ["BFE9",0x5757],
+  ["886B",0x5758],
+  ["886C",0x5759],
+  ["BCE1",0x575A],
+  ["CCB3",0x575B],
+  ["DBDE",0x575C],
+  ["B0D3",0x575D],
+  ["CEEB",0x575E],
+  ["B7D8",0x575F],
+  ["D7B9",0x5760],
+  ["C6C2",0x5761],
+  ["886D",0x5762],
+  ["886E",0x5763],
+  ["C0A4",0x5764],
+  ["886F",0x5765],
+  ["CCB9",0x5766],
+  ["8870",0x5767],
+  ["DBE7",0x5768],
+  ["DBE1",0x5769],
+  ["C6BA",0x576A],
+  ["DBE3",0x576B],
+  ["8871",0x576C],
+  ["DBE8",0x576D],
+  ["8872",0x576E],
+  ["C5F7",0x576F],
+  ["8873",0x5770],
+  ["8874",0x5771],
+  ["8875",0x5772],
+  ["DBEA",0x5773],
+  ["8876",0x5774],
+  ["8877",0x5775],
+  ["DBE9",0x5776],
+  ["BFC0",0x5777],
+  ["8878",0x5778],
+  ["8879",0x5779],
+  ["887A",0x577A],
+  ["DBE6",0x577B],
+  ["DBE5",0x577C],
+  ["887B",0x577D],
+  ["887C",0x577E],
+  ["887D",0x577F],
+  ["887E",0x5780],
+  ["8880",0x5781],
+  ["B4B9",0x5782],
+  ["C0AC",0x5783],
+  ["C2A2",0x5784],
+  ["DBE2",0x5785],
+  ["DBE4",0x5786],
+  ["8881",0x5787],
+  ["8882",0x5788],
+  ["8883",0x5789],
+  ["8884",0x578A],
+  ["D0CD",0x578B],
+  ["DBED",0x578C],
+  ["8885",0x578D],
+  ["8886",0x578E],
+  ["8887",0x578F],
+  ["8888",0x5790],
+  ["8889",0x5791],
+  ["C0DD",0x5792],
+  ["DBF2",0x5793],
+  ["888A",0x5794],
+  ["888B",0x5795],
+  ["888C",0x5796],
+  ["888D",0x5797],
+  ["888E",0x5798],
+  ["888F",0x5799],
+  ["8890",0x579A],
+  ["B6E2",0x579B],
+  ["8891",0x579C],
+  ["8892",0x579D],
+  ["8893",0x579E],
+  ["8894",0x579F],
+  ["DBF3",0x57A0],
+  ["DBD2",0x57A1],
+  ["B9B8",0x57A2],
+  ["D4AB",0x57A3],
+  ["DBEC",0x57A4],
+  ["8895",0x57A5],
+  ["BFD1",0x57A6],
+  ["DBF0",0x57A7],
+  ["8896",0x57A8],
+  ["DBD1",0x57A9],
+  ["8897",0x57AA],
+  ["B5E6",0x57AB],
+  ["8898",0x57AC],
+  ["DBEB",0x57AD],
+  ["BFE5",0x57AE],
+  ["8899",0x57AF],
+  ["889A",0x57B0],
+  ["889B",0x57B1],
+  ["DBEE",0x57B2],
+  ["889C",0x57B3],
+  ["DBF1",0x57B4],
+  ["889D",0x57B5],
+  ["889E",0x57B6],
+  ["889F",0x57B7],
+  ["DBF9",0x57B8],
+  ["88A0",0x57B9],
+  ["88A1",0x57BA],
+  ["88A2",0x57BB],
+  ["88A3",0x57BC],
+  ["88A4",0x57BD],
+  ["88A5",0x57BE],
+  ["88A6",0x57BF],
+  ["88A7",0x57C0],
+  ["88A8",0x57C1],
+  ["B9A1",0x57C2],
+  ["B0A3",0x57C3],
+  ["88A9",0x57C4],
+  ["88AA",0x57C5],
+  ["88AB",0x57C6],
+  ["88AC",0x57C7],
+  ["88AD",0x57C8],
+  ["88AE",0x57C9],
+  ["88AF",0x57CA],
+  ["C2F1",0x57CB],
+  ["88B0",0x57CC],
+  ["88B1",0x57CD],
+  ["B3C7",0x57CE],
+  ["DBEF",0x57CF],
+  ["88B2",0x57D0],
+  ["88B3",0x57D1],
+  ["DBF8",0x57D2],
+  ["88B4",0x57D3],
+  ["C6D2",0x57D4],
+  ["DBF4",0x57D5],
+  ["88B5",0x57D6],
+  ["88B6",0x57D7],
+  ["DBF5",0x57D8],
+  ["DBF7",0x57D9],
+  ["DBF6",0x57DA],
+  ["88B7",0x57DB],
+  ["88B8",0x57DC],
+  ["DBFE",0x57DD],
+  ["88B9",0x57DE],
+  ["D3F2",0x57DF],
+  ["B2BA",0x57E0],
+  ["88BA",0x57E1],
+  ["88BB",0x57E2],
+  ["88BC",0x57E3],
+  ["DBFD",0x57E4],
+  ["88BD",0x57E5],
+  ["88BE",0x57E6],
+  ["88BF",0x57E7],
+  ["88C0",0x57E8],
+  ["88C1",0x57E9],
+  ["88C2",0x57EA],
+  ["88C3",0x57EB],
+  ["88C4",0x57EC],
+  ["DCA4",0x57ED],
+  ["88C5",0x57EE],
+  ["DBFB",0x57EF],
+  ["88C6",0x57F0],
+  ["88C7",0x57F1],
+  ["88C8",0x57F2],
+  ["88C9",0x57F3],
+  ["DBFA",0x57F4],
+  ["88CA",0x57F5],
+  ["88CB",0x57F6],
+  ["88CC",0x57F7],
+  ["DBFC",0x57F8],
+  ["C5E0",0x57F9],
+  ["BBF9",0x57FA],
+  ["88CD",0x57FB],
+  ["88CE",0x57FC],
+  ["DCA3",0x57FD],
+  ["88CF",0x57FE],
+  ["88D0",0x57FF],
+  ["DCA5",0x5800],
+  ["88D1",0x5801],
+  ["CCC3",0x5802],
+  ["88D2",0x5803],
+  ["88D3",0x5804],
+  ["88D4",0x5805],
+  ["B6D1",0x5806],
+  ["DDC0",0x5807],
+  ["88D5",0x5808],
+  ["88D6",0x5809],
+  ["88D7",0x580A],
+  ["DCA1",0x580B],
+  ["88D8",0x580C],
+  ["DCA2",0x580D],
+  ["88D9",0x580E],
+  ["88DA",0x580F],
+  ["88DB",0x5810],
+  ["C7B5",0x5811],
+  ["88DC",0x5812],
+  ["88DD",0x5813],
+  ["88DE",0x5814],
+  ["B6E9",0x5815],
+  ["88DF",0x5816],
+  ["88E0",0x5817],
+  ["88E1",0x5818],
+  ["DCA7",0x5819],
+  ["88E2",0x581A],
+  ["88E3",0x581B],
+  ["88E4",0x581C],
+  ["88E5",0x581D],
+  ["DCA6",0x581E],
+  ["88E6",0x581F],
+  ["DCA9",0x5820],
+  ["B1A4",0x5821],
+  ["88E7",0x5822],
+  ["88E8",0x5823],
+  ["B5CC",0x5824],
+  ["88E9",0x5825],
+  ["88EA",0x5826],
+  ["88EB",0x5827],
+  ["88EC",0x5828],
+  ["88ED",0x5829],
+  ["BFB0",0x582A],
+  ["88EE",0x582B],
+  ["88EF",0x582C],
+  ["88F0",0x582D],
+  ["88F1",0x582E],
+  ["88F2",0x582F],
+  ["D1DF",0x5830],
+  ["88F3",0x5831],
+  ["88F4",0x5832],
+  ["88F5",0x5833],
+  ["88F6",0x5834],
+  ["B6C2",0x5835],
+  ["88F7",0x5836],
+  ["88F8",0x5837],
+  ["88F9",0x5838],
+  ["88FA",0x5839],
+  ["88FB",0x583A],
+  ["88FC",0x583B],
+  ["88FD",0x583C],
+  ["88FE",0x583D],
+  ["8940",0x583E],
+  ["8941",0x583F],
+  ["8942",0x5840],
+  ["8943",0x5841],
+  ["8944",0x5842],
+  ["8945",0x5843],
+  ["DCA8",0x5844],
+  ["8946",0x5845],
+  ["8947",0x5846],
+  ["8948",0x5847],
+  ["8949",0x5848],
+  ["894A",0x5849],
+  ["894B",0x584A],
+  ["894C",0x584B],
+  ["CBFA",0x584C],
+  ["EBF3",0x584D],
+  ["894D",0x584E],
+  ["894E",0x584F],
+  ["894F",0x5850],
+  ["CBDC",0x5851],
+  ["8950",0x5852],
+  ["8951",0x5853],
+  ["CBFE",0x5854],
+  ["8952",0x5855],
+  ["8953",0x5856],
+  ["8954",0x5857],
+  ["CCC1",0x5858],
+  ["8955",0x5859],
+  ["8956",0x585A],
+  ["8957",0x585B],
+  ["8958",0x585C],
+  ["8959",0x585D],
+  ["C8FB",0x585E],
+  ["895A",0x585F],
+  ["895B",0x5860],
+  ["895C",0x5861],
+  ["895D",0x5862],
+  ["895E",0x5863],
+  ["895F",0x5864],
+  ["DCAA",0x5865],
+  ["8960",0x5866],
+  ["8961",0x5867],
+  ["8962",0x5868],
+  ["8963",0x5869],
+  ["8964",0x586A],
+  ["CCEE",0x586B],
+  ["DCAB",0x586C],
+  ["8965",0x586D],
+  ["8966",0x586E],
+  ["8967",0x586F],
+  ["8968",0x5870],
+  ["8969",0x5871],
+  ["896A",0x5872],
+  ["896B",0x5873],
+  ["896C",0x5874],
+  ["896D",0x5875],
+  ["896E",0x5876],
+  ["896F",0x5877],
+  ["8970",0x5878],
+  ["8971",0x5879],
+  ["8972",0x587A],
+  ["8973",0x587B],
+  ["8974",0x587C],
+  ["8975",0x587D],
+  ["DBD3",0x587E],
+  ["8976",0x587F],
+  ["DCAF",0x5880],
+  ["DCAC",0x5881],
+  ["8977",0x5882],
+  ["BEB3",0x5883],
+  ["8978",0x5884],
+  ["CAFB",0x5885],
+  ["8979",0x5886],
+  ["897A",0x5887],
+  ["897B",0x5888],
+  ["DCAD",0x5889],
+  ["897C",0x588A],
+  ["897D",0x588B],
+  ["897E",0x588C],
+  ["8980",0x588D],
+  ["8981",0x588E],
+  ["8982",0x588F],
+  ["8983",0x5890],
+  ["8984",0x5891],
+  ["C9CA",0x5892],
+  ["C4B9",0x5893],
+  ["8985",0x5894],
+  ["8986",0x5895],
+  ["8987",0x5896],
+  ["8988",0x5897],
+  ["8989",0x5898],
+  ["C7BD",0x5899],
+  ["DCAE",0x589A],
+  ["898A",0x589B],
+  ["898B",0x589C],
+  ["898C",0x589D],
+  ["D4F6",0x589E],
+  ["D0E6",0x589F],
+  ["898D",0x58A0],
+  ["898E",0x58A1],
+  ["898F",0x58A2],
+  ["8990",0x58A3],
+  ["8991",0x58A4],
+  ["8992",0x58A5],
+  ["8993",0x58A6],
+  ["8994",0x58A7],
+  ["C4AB",0x58A8],
+  ["B6D5",0x58A9],
+  ["8995",0x58AA],
+  ["8996",0x58AB],
+  ["8997",0x58AC],
+  ["8998",0x58AD],
+  ["8999",0x58AE],
+  ["899A",0x58AF],
+  ["899B",0x58B0],
+  ["899C",0x58B1],
+  ["899D",0x58B2],
+  ["899E",0x58B3],
+  ["899F",0x58B4],
+  ["89A0",0x58B5],
+  ["89A1",0x58B6],
+  ["89A2",0x58B7],
+  ["89A3",0x58B8],
+  ["89A4",0x58B9],
+  ["89A5",0x58BA],
+  ["89A6",0x58BB],
+  ["DBD4",0x58BC],
+  ["89A7",0x58BD],
+  ["89A8",0x58BE],
+  ["89A9",0x58BF],
+  ["89AA",0x58C0],
+  ["B1DA",0x58C1],
+  ["89AB",0x58C2],
+  ["89AC",0x58C3],
+  ["89AD",0x58C4],
+  ["DBD5",0x58C5],
+  ["89AE",0x58C6],
+  ["89AF",0x58C7],
+  ["89B0",0x58C8],
+  ["89B1",0x58C9],
+  ["89B2",0x58CA],
+  ["89B3",0x58CB],
+  ["89B4",0x58CC],
+  ["89B5",0x58CD],
+  ["89B6",0x58CE],
+  ["89B7",0x58CF],
+  ["89B8",0x58D0],
+  ["DBD6",0x58D1],
+  ["89B9",0x58D2],
+  ["89BA",0x58D3],
+  ["89BB",0x58D4],
+  ["BABE",0x58D5],
+  ["89BC",0x58D6],
+  ["89BD",0x58D7],
+  ["89BE",0x58D8],
+  ["89BF",0x58D9],
+  ["89C0",0x58DA],
+  ["89C1",0x58DB],
+  ["89C2",0x58DC],
+  ["89C3",0x58DD],
+  ["89C4",0x58DE],
+  ["89C5",0x58DF],
+  ["89C6",0x58E0],
+  ["89C7",0x58E1],
+  ["89C8",0x58E2],
+  ["89C9",0x58E3],
+  ["C8C0",0x58E4],
+  ["89CA",0x58E5],
+  ["89CB",0x58E6],
+  ["89CC",0x58E7],
+  ["89CD",0x58E8],
+  ["89CE",0x58E9],
+  ["89CF",0x58EA],
+  ["CABF",0x58EB],
+  ["C8C9",0x58EC],
+  ["89D0",0x58ED],
+  ["D7B3",0x58EE],
+  ["89D1",0x58EF],
+  ["C9F9",0x58F0],
+  ["89D2",0x58F1],
+  ["89D3",0x58F2],
+  ["BFC7",0x58F3],
+  ["89D4",0x58F4],
+  ["89D5",0x58F5],
+  ["BAF8",0x58F6],
+  ["89D6",0x58F7],
+  ["89D7",0x58F8],
+  ["D2BC",0x58F9],
+  ["89D8",0x58FA],
+  ["89D9",0x58FB],
+  ["89DA",0x58FC],
+  ["89DB",0x58FD],
+  ["89DC",0x58FE],
+  ["89DD",0x58FF],
+  ["89DE",0x5900],
+  ["89DF",0x5901],
+  ["E2BA",0x5902],
+  ["89E0",0x5903],
+  ["B4A6",0x5904],
+  ["89E1",0x5905],
+  ["89E2",0x5906],
+  ["B1B8",0x5907],
+  ["89E3",0x5908],
+  ["89E4",0x5909],
+  ["89E5",0x590A],
+  ["89E6",0x590B],
+  ["89E7",0x590C],
+  ["B8B4",0x590D],
+  ["89E8",0x590E],
+  ["CFC4",0x590F],
+  ["89E9",0x5910],
+  ["89EA",0x5911],
+  ["89EB",0x5912],
+  ["89EC",0x5913],
+  ["D9E7",0x5914],
+  ["CFA6",0x5915],
+  ["CDE2",0x5916],
+  ["89ED",0x5917],
+  ["89EE",0x5918],
+  ["D9ED",0x5919],
+  ["B6E0",0x591A],
+  ["89EF",0x591B],
+  ["D2B9",0x591C],
+  ["89F0",0x591D],
+  ["89F1",0x591E],
+  ["B9BB",0x591F],
+  ["89F2",0x5920],
+  ["89F3",0x5921],
+  ["89F4",0x5922],
+  ["89F5",0x5923],
+  ["E2B9",0x5924],
+  ["E2B7",0x5925],
+  ["89F6",0x5926],
+  ["B4F3",0x5927],
+  ["89F7",0x5928],
+  ["CCEC",0x5929],
+  ["CCAB",0x592A],
+  ["B7F2",0x592B],
+  ["89F8",0x592C],
+  ["D8B2",0x592D],
+  ["D1EB",0x592E],
+  ["BABB",0x592F],
+  ["89F9",0x5930],
+  ["CAA7",0x5931],
+  ["89FA",0x5932],
+  ["89FB",0x5933],
+  ["CDB7",0x5934],
+  ["89FC",0x5935],
+  ["89FD",0x5936],
+  ["D2C4",0x5937],
+  ["BFE4",0x5938],
+  ["BCD0",0x5939],
+  ["B6E1",0x593A],
+  ["89FE",0x593B],
+  ["DEC5",0x593C],
+  ["8A40",0x593D],
+  ["8A41",0x593E],
+  ["8A42",0x593F],
+  ["8A43",0x5940],
+  ["DEC6",0x5941],
+  ["DBBC",0x5942],
+  ["8A44",0x5943],
+  ["D1D9",0x5944],
+  ["8A45",0x5945],
+  ["8A46",0x5946],
+  ["C6E6",0x5947],
+  ["C4CE",0x5948],
+  ["B7EE",0x5949],
+  ["8A47",0x594A],
+  ["B7DC",0x594B],
+  ["8A48",0x594C],
+  ["8A49",0x594D],
+  ["BFFC",0x594E],
+  ["D7E0",0x594F],
+  ["8A4A",0x5950],
+  ["C6F5",0x5951],
+  ["8A4B",0x5952],
+  ["8A4C",0x5953],
+  ["B1BC",0x5954],
+  ["DEC8",0x5955],
+  ["BDB1",0x5956],
+  ["CCD7",0x5957],
+  ["DECA",0x5958],
+  ["8A4D",0x5959],
+  ["DEC9",0x595A],
+  ["8A4E",0x595B],
+  ["8A4F",0x595C],
+  ["8A50",0x595D],
+  ["8A51",0x595E],
+  ["8A52",0x595F],
+  ["B5EC",0x5960],
+  ["8A53",0x5961],
+  ["C9DD",0x5962],
+  ["8A54",0x5963],
+  ["8A55",0x5964],
+  ["B0C2",0x5965],
+  ["8A56",0x5966],
+  ["8A57",0x5967],
+  ["8A58",0x5968],
+  ["8A59",0x5969],
+  ["8A5A",0x596A],
+  ["8A5B",0x596B],
+  ["8A5C",0x596C],
+  ["8A5D",0x596D],
+  ["8A5E",0x596E],
+  ["8A5F",0x596F],
+  ["8A60",0x5970],
+  ["8A61",0x5971],
+  ["8A62",0x5972],
+  ["C5AE",0x5973],
+  ["C5AB",0x5974],
+  ["8A63",0x5975],
+  ["C4CC",0x5976],
+  ["8A64",0x5977],
+  ["BCE9",0x5978],
+  ["CBFD",0x5979],
+  ["8A65",0x597A],
+  ["8A66",0x597B],
+  ["8A67",0x597C],
+  ["BAC3",0x597D],
+  ["8A68",0x597E],
+  ["8A69",0x597F],
+  ["8A6A",0x5980],
+  ["E5F9",0x5981],
+  ["C8E7",0x5982],
+  ["E5FA",0x5983],
+  ["CDFD",0x5984],
+  ["8A6B",0x5985],
+  ["D7B1",0x5986],
+  ["B8BE",0x5987],
+  ["C2E8",0x5988],
+  ["8A6C",0x5989],
+  ["C8D1",0x598A],
+  ["8A6D",0x598B],
+  ["8A6E",0x598C],
+  ["E5FB",0x598D],
+  ["8A6F",0x598E],
+  ["8A70",0x598F],
+  ["8A71",0x5990],
+  ["8A72",0x5991],
+  ["B6CA",0x5992],
+  ["BCCB",0x5993],
+  ["8A73",0x5994],
+  ["8A74",0x5995],
+  ["D1FD",0x5996],
+  ["E6A1",0x5997],
+  ["8A75",0x5998],
+  ["C3EE",0x5999],
+  ["8A76",0x599A],
+  ["8A77",0x599B],
+  ["8A78",0x599C],
+  ["8A79",0x599D],
+  ["E6A4",0x599E],
+  ["8A7A",0x599F],
+  ["8A7B",0x59A0],
+  ["8A7C",0x59A1],
+  ["8A7D",0x59A2],
+  ["E5FE",0x59A3],
+  ["E6A5",0x59A4],
+  ["CDD7",0x59A5],
+  ["8A7E",0x59A6],
+  ["8A80",0x59A7],
+  ["B7C1",0x59A8],
+  ["E5FC",0x59A9],
+  ["E5FD",0x59AA],
+  ["E6A3",0x59AB],
+  ["8A81",0x59AC],
+  ["8A82",0x59AD],
+  ["C4DD",0x59AE],
+  ["E6A8",0x59AF],
+  ["8A83",0x59B0],
+  ["8A84",0x59B1],
+  ["E6A7",0x59B2],
+  ["8A85",0x59B3],
+  ["8A86",0x59B4],
+  ["8A87",0x59B5],
+  ["8A88",0x59B6],
+  ["8A89",0x59B7],
+  ["8A8A",0x59B8],
+  ["C3C3",0x59B9],
+  ["8A8B",0x59BA],
+  ["C6DE",0x59BB],
+  ["8A8C",0x59BC],
+  ["8A8D",0x59BD],
+  ["E6AA",0x59BE],
+  ["8A8E",0x59BF],
+  ["8A8F",0x59C0],
+  ["8A90",0x59C1],
+  ["8A91",0x59C2],
+  ["8A92",0x59C3],
+  ["8A93",0x59C4],
+  ["8A94",0x59C5],
+  ["C4B7",0x59C6],
+  ["8A95",0x59C7],
+  ["8A96",0x59C8],
+  ["8A97",0x59C9],
+  ["E6A2",0x59CA],
+  ["CABC",0x59CB],
+  ["8A98",0x59CC],
+  ["8A99",0x59CD],
+  ["8A9A",0x59CE],
+  ["8A9B",0x59CF],
+  ["BDE3",0x59D0],
+  ["B9C3",0x59D1],
+  ["E6A6",0x59D2],
+  ["D0D5",0x59D3],
+  ["CEAF",0x59D4],
+  ["8A9C",0x59D5],
+  ["8A9D",0x59D6],
+  ["E6A9",0x59D7],
+  ["E6B0",0x59D8],
+  ["8A9E",0x59D9],
+  ["D2A6",0x59DA],
+  ["8A9F",0x59DB],
+  ["BDAA",0x59DC],
+  ["E6AD",0x59DD],
+  ["8AA0",0x59DE],
+  ["8AA1",0x59DF],
+  ["8AA2",0x59E0],
+  ["8AA3",0x59E1],
+  ["8AA4",0x59E2],
+  ["E6AF",0x59E3],
+  ["8AA5",0x59E4],
+  ["C0D1",0x59E5],
+  ["8AA6",0x59E6],
+  ["8AA7",0x59E7],
+  ["D2CC",0x59E8],
+  ["8AA8",0x59E9],
+  ["8AA9",0x59EA],
+  ["8AAA",0x59EB],
+  ["BCA7",0x59EC],
+  ["8AAB",0x59ED],
+  ["8AAC",0x59EE],
+  ["8AAD",0x59EF],
+  ["8AAE",0x59F0],
+  ["8AAF",0x59F1],
+  ["8AB0",0x59F2],
+  ["8AB1",0x59F3],
+  ["8AB2",0x59F4],
+  ["8AB3",0x59F5],
+  ["8AB4",0x59F6],
+  ["8AB5",0x59F7],
+  ["8AB6",0x59F8],
+  ["E6B1",0x59F9],
+  ["8AB7",0x59FA],
+  ["D2F6",0x59FB],
+  ["8AB8",0x59FC],
+  ["8AB9",0x59FD],
+  ["8ABA",0x59FE],
+  ["D7CB",0x59FF],
+  ["8ABB",0x5A00],
+  ["CDFE",0x5A01],
+  ["8ABC",0x5A02],
+  ["CDDE",0x5A03],
+  ["C2A6",0x5A04],
+  ["E6AB",0x5A05],
+  ["E6AC",0x5A06],
+  ["BDBF",0x5A07],
+  ["E6AE",0x5A08],
+  ["E6B3",0x5A09],
+  ["8ABD",0x5A0A],
+  ["8ABE",0x5A0B],
+  ["E6B2",0x5A0C],
+  ["8ABF",0x5A0D],
+  ["8AC0",0x5A0E],
+  ["8AC1",0x5A0F],
+  ["8AC2",0x5A10],
+  ["E6B6",0x5A11],
+  ["8AC3",0x5A12],
+  ["E6B8",0x5A13],
+  ["8AC4",0x5A14],
+  ["8AC5",0x5A15],
+  ["8AC6",0x5A16],
+  ["8AC7",0x5A17],
+  ["C4EF",0x5A18],
+  ["8AC8",0x5A19],
+  ["8AC9",0x5A1A],
+  ["8ACA",0x5A1B],
+  ["C4C8",0x5A1C],
+  ["8ACB",0x5A1D],
+  ["8ACC",0x5A1E],
+  ["BEEA",0x5A1F],
+  ["C9EF",0x5A20],
+  ["8ACD",0x5A21],
+  ["8ACE",0x5A22],
+  ["E6B7",0x5A23],
+  ["8ACF",0x5A24],
+  ["B6F0",0x5A25],
+  ["8AD0",0x5A26],
+  ["8AD1",0x5A27],
+  ["8AD2",0x5A28],
+  ["C3E4",0x5A29],
+  ["8AD3",0x5A2A],
+  ["8AD4",0x5A2B],
+  ["8AD5",0x5A2C],
+  ["8AD6",0x5A2D],
+  ["8AD7",0x5A2E],
+  ["8AD8",0x5A2F],
+  ["8AD9",0x5A30],
+  ["D3E9",0x5A31],
+  ["E6B4",0x5A32],
+  ["8ADA",0x5A33],
+  ["E6B5",0x5A34],
+  ["8ADB",0x5A35],
+  ["C8A2",0x5A36],
+  ["8ADC",0x5A37],
+  ["8ADD",0x5A38],
+  ["8ADE",0x5A39],
+  ["8ADF",0x5A3A],
+  ["8AE0",0x5A3B],
+  ["E6BD",0x5A3C],
+  ["8AE1",0x5A3D],
+  ["8AE2",0x5A3E],
+  ["8AE3",0x5A3F],
+  ["E6B9",0x5A40],
+  ["8AE4",0x5A41],
+  ["8AE5",0x5A42],
+  ["8AE6",0x5A43],
+  ["8AE7",0x5A44],
+  ["8AE8",0x5A45],
+  ["C6C5",0x5A46],
+  ["8AE9",0x5A47],
+  ["8AEA",0x5A48],
+  ["CDF1",0x5A49],
+  ["E6BB",0x5A4A],
+  ["8AEB",0x5A4B],
+  ["8AEC",0x5A4C],
+  ["8AED",0x5A4D],
+  ["8AEE",0x5A4E],
+  ["8AEF",0x5A4F],
+  ["8AF0",0x5A50],
+  ["8AF1",0x5A51],
+  ["8AF2",0x5A52],
+  ["8AF3",0x5A53],
+  ["8AF4",0x5A54],
+  ["E6BC",0x5A55],
+  ["8AF5",0x5A56],
+  ["8AF6",0x5A57],
+  ["8AF7",0x5A58],
+  ["8AF8",0x5A59],
+  ["BBE9",0x5A5A],
+  ["8AF9",0x5A5B],
+  ["8AFA",0x5A5C],
+  ["8AFB",0x5A5D],
+  ["8AFC",0x5A5E],
+  ["8AFD",0x5A5F],
+  ["8AFE",0x5A60],
+  ["8B40",0x5A61],
+  ["E6BE",0x5A62],
+  ["8B41",0x5A63],
+  ["8B42",0x5A64],
+  ["8B43",0x5A65],
+  ["8B44",0x5A66],
+  ["E6BA",0x5A67],
+  ["8B45",0x5A68],
+  ["8B46",0x5A69],
+  ["C0B7",0x5A6A],
+  ["8B47",0x5A6B],
+  ["8B48",0x5A6C],
+  ["8B49",0x5A6D],
+  ["8B4A",0x5A6E],
+  ["8B4B",0x5A6F],
+  ["8B4C",0x5A70],
+  ["8B4D",0x5A71],
+  ["8B4E",0x5A72],
+  ["8B4F",0x5A73],
+  ["D3A4",0x5A74],
+  ["E6BF",0x5A75],
+  ["C9F4",0x5A76],
+  ["E6C3",0x5A77],
+  ["8B50",0x5A78],
+  ["8B51",0x5A79],
+  ["E6C4",0x5A7A],
+  ["8B52",0x5A7B],
+  ["8B53",0x5A7C],
+  ["8B54",0x5A7D],
+  ["8B55",0x5A7E],
+  ["D0F6",0x5A7F],
+  ["8B56",0x5A80],
+  ["8B57",0x5A81],
+  ["8B58",0x5A82],
+  ["8B59",0x5A83],
+  ["8B5A",0x5A84],
+  ["8B5B",0x5A85],
+  ["8B5C",0x5A86],
+  ["8B5D",0x5A87],
+  ["8B5E",0x5A88],
+  ["8B5F",0x5A89],
+  ["8B60",0x5A8A],
+  ["8B61",0x5A8B],
+  ["8B62",0x5A8C],
+  ["8B63",0x5A8D],
+  ["8B64",0x5A8E],
+  ["8B65",0x5A8F],
+  ["8B66",0x5A90],
+  ["8B67",0x5A91],
+  ["C3BD",0x5A92],
+  ["8B68",0x5A93],
+  ["8B69",0x5A94],
+  ["8B6A",0x5A95],
+  ["8B6B",0x5A96],
+  ["8B6C",0x5A97],
+  ["8B6D",0x5A98],
+  ["8B6E",0x5A99],
+  ["C3C4",0x5A9A],
+  ["E6C2",0x5A9B],
+  ["8B6F",0x5A9C],
+  ["8B70",0x5A9D],
+  ["8B71",0x5A9E],
+  ["8B72",0x5A9F],
+  ["8B73",0x5AA0],
+  ["8B74",0x5AA1],
+  ["8B75",0x5AA2],
+  ["8B76",0x5AA3],
+  ["8B77",0x5AA4],
+  ["8B78",0x5AA5],
+  ["8B79",0x5AA6],
+  ["8B7A",0x5AA7],
+  ["8B7B",0x5AA8],
+  ["8B7C",0x5AA9],
+  ["E6C1",0x5AAA],
+  ["8B7D",0x5AAB],
+  ["8B7E",0x5AAC],
+  ["8B80",0x5AAD],
+  ["8B81",0x5AAE],
+  ["8B82",0x5AAF],
+  ["8B83",0x5AB0],
+  ["8B84",0x5AB1],
+  ["E6C7",0x5AB2],
+  ["CFB1",0x5AB3],
+  ["8B85",0x5AB4],
+  ["EBF4",0x5AB5],
+  ["8B86",0x5AB6],
+  ["8B87",0x5AB7],
+  ["E6CA",0x5AB8],
+  ["8B88",0x5AB9],
+  ["8B89",0x5ABA],
+  ["8B8A",0x5ABB],
+  ["8B8B",0x5ABC],
+  ["8B8C",0x5ABD],
+  ["E6C5",0x5ABE],
+  ["8B8D",0x5ABF],
+  ["8B8E",0x5AC0],
+  ["BCDE",0x5AC1],
+  ["C9A9",0x5AC2],
+  ["8B8F",0x5AC3],
+  ["8B90",0x5AC4],
+  ["8B91",0x5AC5],
+  ["8B92",0x5AC6],
+  ["8B93",0x5AC7],
+  ["8B94",0x5AC8],
+  ["BCB5",0x5AC9],
+  ["8B95",0x5ACA],
+  ["8B96",0x5ACB],
+  ["CFD3",0x5ACC],
+  ["8B97",0x5ACD],
+  ["8B98",0x5ACE],
+  ["8B99",0x5ACF],
+  ["8B9A",0x5AD0],
+  ["8B9B",0x5AD1],
+  ["E6C8",0x5AD2],
+  ["8B9C",0x5AD3],
+  ["E6C9",0x5AD4],
+  ["8B9D",0x5AD5],
+  ["E6CE",0x5AD6],
+  ["8B9E",0x5AD7],
+  ["E6D0",0x5AD8],
+  ["8B9F",0x5AD9],
+  ["8BA0",0x5ADA],
+  ["8BA1",0x5ADB],
+  ["E6D1",0x5ADC],
+  ["8BA2",0x5ADD],
+  ["8BA3",0x5ADE],
+  ["8BA4",0x5ADF],
+  ["E6CB",0x5AE0],
+  ["B5D5",0x5AE1],
+  ["8BA5",0x5AE2],
+  ["E6CC",0x5AE3],
+  ["8BA6",0x5AE4],
+  ["8BA7",0x5AE5],
+  ["E6CF",0x5AE6],
+  ["8BA8",0x5AE7],
+  ["8BA9",0x5AE8],
+  ["C4DB",0x5AE9],
+  ["8BAA",0x5AEA],
+  ["E6C6",0x5AEB],
+  ["8BAB",0x5AEC],
+  ["8BAC",0x5AED],
+  ["8BAD",0x5AEE],
+  ["8BAE",0x5AEF],
+  ["8BAF",0x5AF0],
+  ["E6CD",0x5AF1],
+  ["8BB0",0x5AF2],
+  ["8BB1",0x5AF3],
+  ["8BB2",0x5AF4],
+  ["8BB3",0x5AF5],
+  ["8BB4",0x5AF6],
+  ["8BB5",0x5AF7],
+  ["8BB6",0x5AF8],
+  ["8BB7",0x5AF9],
+  ["8BB8",0x5AFA],
+  ["8BB9",0x5AFB],
+  ["8BBA",0x5AFC],
+  ["8BBB",0x5AFD],
+  ["8BBC",0x5AFE],
+  ["8BBD",0x5AFF],
+  ["8BBE",0x5B00],
+  ["8BBF",0x5B01],
+  ["8BC0",0x5B02],
+  ["8BC1",0x5B03],
+  ["8BC2",0x5B04],
+  ["8BC3",0x5B05],
+  ["8BC4",0x5B06],
+  ["8BC5",0x5B07],
+  ["8BC6",0x5B08],
+  ["E6D2",0x5B09],
+  ["8BC7",0x5B0A],
+  ["8BC8",0x5B0B],
+  ["8BC9",0x5B0C],
+  ["8BCA",0x5B0D],
+  ["8BCB",0x5B0E],
+  ["8BCC",0x5B0F],
+  ["8BCD",0x5B10],
+  ["8BCE",0x5B11],
+  ["8BCF",0x5B12],
+  ["8BD0",0x5B13],
+  ["8BD1",0x5B14],
+  ["8BD2",0x5B15],
+  ["E6D4",0x5B16],
+  ["E6D3",0x5B17],
+  ["8BD3",0x5B18],
+  ["8BD4",0x5B19],
+  ["8BD5",0x5B1A],
+  ["8BD6",0x5B1B],
+  ["8BD7",0x5B1C],
+  ["8BD8",0x5B1D],
+  ["8BD9",0x5B1E],
+  ["8BDA",0x5B1F],
+  ["8BDB",0x5B20],
+  ["8BDC",0x5B21],
+  ["8BDD",0x5B22],
+  ["8BDE",0x5B23],
+  ["8BDF",0x5B24],
+  ["8BE0",0x5B25],
+  ["8BE1",0x5B26],
+  ["8BE2",0x5B27],
+  ["8BE3",0x5B28],
+  ["8BE4",0x5B29],
+  ["8BE5",0x5B2A],
+  ["8BE6",0x5B2B],
+  ["8BE7",0x5B2C],
+  ["8BE8",0x5B2D],
+  ["8BE9",0x5B2E],
+  ["8BEA",0x5B2F],
+  ["8BEB",0x5B30],
+  ["8BEC",0x5B31],
+  ["E6D5",0x5B32],
+  ["8BED",0x5B33],
+  ["D9F8",0x5B34],
+  ["8BEE",0x5B35],
+  ["8BEF",0x5B36],
+  ["E6D6",0x5B37],
+  ["8BF0",0x5B38],
+  ["8BF1",0x5B39],
+  ["8BF2",0x5B3A],
+  ["8BF3",0x5B3B],
+  ["8BF4",0x5B3C],
+  ["8BF5",0x5B3D],
+  ["8BF6",0x5B3E],
+  ["8BF7",0x5B3F],
+  ["E6D7",0x5B40],
+  ["8BF8",0x5B41],
+  ["8BF9",0x5B42],
+  ["8BFA",0x5B43],
+  ["8BFB",0x5B44],
+  ["8BFC",0x5B45],
+  ["8BFD",0x5B46],
+  ["8BFE",0x5B47],
+  ["8C40",0x5B48],
+  ["8C41",0x5B49],
+  ["8C42",0x5B4A],
+  ["8C43",0x5B4B],
+  ["8C44",0x5B4C],
+  ["8C45",0x5B4D],
+  ["8C46",0x5B4E],
+  ["8C47",0x5B4F],
+  ["D7D3",0x5B50],
+  ["E6DD",0x5B51],
+  ["8C48",0x5B52],
+  ["E6DE",0x5B53],
+  ["BFD7",0x5B54],
+  ["D4D0",0x5B55],
+  ["8C49",0x5B56],
+  ["D7D6",0x5B57],
+  ["B4E6",0x5B58],
+  ["CBEF",0x5B59],
+  ["E6DA",0x5B5A],
+  ["D8C3",0x5B5B],
+  ["D7CE",0x5B5C],
+  ["D0A2",0x5B5D],
+  ["8C4A",0x5B5E],
+  ["C3CF",0x5B5F],
+  ["8C4B",0x5B60],
+  ["8C4C",0x5B61],
+  ["E6DF",0x5B62],
+  ["BCBE",0x5B63],
+  ["B9C2",0x5B64],
+  ["E6DB",0x5B65],
+  ["D1A7",0x5B66],
+  ["8C4D",0x5B67],
+  ["8C4E",0x5B68],
+  ["BAA2",0x5B69],
+  ["C2CF",0x5B6A],
+  ["8C4F",0x5B6B],
+  ["D8AB",0x5B6C],
+  ["8C50",0x5B6D],
+  ["8C51",0x5B6E],
+  ["8C52",0x5B6F],
+  ["CAEB",0x5B70],
+  ["E5EE",0x5B71],
+  ["8C53",0x5B72],
+  ["E6DC",0x5B73],
+  ["8C54",0x5B74],
+  ["B7F5",0x5B75],
+  ["8C55",0x5B76],
+  ["8C56",0x5B77],
+  ["8C57",0x5B78],
+  ["8C58",0x5B79],
+  ["C8E6",0x5B7A],
+  ["8C59",0x5B7B],
+  ["8C5A",0x5B7C],
+  ["C4F5",0x5B7D],
+  ["8C5B",0x5B7E],
+  ["8C5C",0x5B7F],
+  ["E5B2",0x5B80],
+  ["C4FE",0x5B81],
+  ["8C5D",0x5B82],
+  ["CBFC",0x5B83],
+  ["E5B3",0x5B84],
+  ["D5AC",0x5B85],
+  ["8C5E",0x5B86],
+  ["D3EE",0x5B87],
+  ["CAD8",0x5B88],
+  ["B0B2",0x5B89],
+  ["8C5F",0x5B8A],
+  ["CBCE",0x5B8B],
+  ["CDEA",0x5B8C],
+  ["8C60",0x5B8D],
+  ["8C61",0x5B8E],
+  ["BAEA",0x5B8F],
+  ["8C62",0x5B90],
+  ["8C63",0x5B91],
+  ["8C64",0x5B92],
+  ["E5B5",0x5B93],
+  ["8C65",0x5B94],
+  ["E5B4",0x5B95],
+  ["8C66",0x5B96],
+  ["D7DA",0x5B97],
+  ["B9D9",0x5B98],
+  ["D6E6",0x5B99],
+  ["B6A8",0x5B9A],
+  ["CDF0",0x5B9B],
+  ["D2CB",0x5B9C],
+  ["B1A6",0x5B9D],
+  ["CAB5",0x5B9E],
+  ["8C67",0x5B9F],
+  ["B3E8",0x5BA0],
+  ["C9F3",0x5BA1],
+  ["BFCD",0x5BA2],
+  ["D0FB",0x5BA3],
+  ["CAD2",0x5BA4],
+  ["E5B6",0x5BA5],
+  ["BBC2",0x5BA6],
+  ["8C68",0x5BA7],
+  ["8C69",0x5BA8],
+  ["8C6A",0x5BA9],
+  ["CFDC",0x5BAA],
+  ["B9AC",0x5BAB],
+  ["8C6B",0x5BAC],
+  ["8C6C",0x5BAD],
+  ["8C6D",0x5BAE],
+  ["8C6E",0x5BAF],
+  ["D4D7",0x5BB0],
+  ["8C6F",0x5BB1],
+  ["8C70",0x5BB2],
+  ["BAA6",0x5BB3],
+  ["D1E7",0x5BB4],
+  ["CFFC",0x5BB5],
+  ["BCD2",0x5BB6],
+  ["8C71",0x5BB7],
+  ["E5B7",0x5BB8],
+  ["C8DD",0x5BB9],
+  ["8C72",0x5BBA],
+  ["8C73",0x5BBB],
+  ["8C74",0x5BBC],
+  ["BFED",0x5BBD],
+  ["B1F6",0x5BBE],
+  ["CBDE",0x5BBF],
+  ["8C75",0x5BC0],
+  ["8C76",0x5BC1],
+  ["BCC5",0x5BC2],
+  ["8C77",0x5BC3],
+  ["BCC4",0x5BC4],
+  ["D2FA",0x5BC5],
+  ["C3DC",0x5BC6],
+  ["BFDC",0x5BC7],
+  ["8C78",0x5BC8],
+  ["8C79",0x5BC9],
+  ["8C7A",0x5BCA],
+  ["8C7B",0x5BCB],
+  ["B8BB",0x5BCC],
+  ["8C7C",0x5BCD],
+  ["8C7D",0x5BCE],
+  ["8C7E",0x5BCF],
+  ["C3C2",0x5BD0],
+  ["8C80",0x5BD1],
+  ["BAAE",0x5BD2],
+  ["D4A2",0x5BD3],
+  ["8C81",0x5BD4],
+  ["8C82",0x5BD5],
+  ["8C83",0x5BD6],
+  ["8C84",0x5BD7],
+  ["8C85",0x5BD8],
+  ["8C86",0x5BD9],
+  ["8C87",0x5BDA],
+  ["8C88",0x5BDB],
+  ["8C89",0x5BDC],
+  ["C7DE",0x5BDD],
+  ["C4AF",0x5BDE],
+  ["B2EC",0x5BDF],
+  ["8C8A",0x5BE0],
+  ["B9D1",0x5BE1],
+  ["8C8B",0x5BE2],
+  ["8C8C",0x5BE3],
+  ["E5BB",0x5BE4],
+  ["C1C8",0x5BE5],
+  ["8C8D",0x5BE6],
+  ["8C8E",0x5BE7],
+  ["D5AF",0x5BE8],
+  ["8C8F",0x5BE9],
+  ["8C90",0x5BEA],
+  ["8C91",0x5BEB],
+  ["8C92",0x5BEC],
+  ["8C93",0x5BED],
+  ["E5BC",0x5BEE],
+  ["8C94",0x5BEF],
+  ["E5BE",0x5BF0],
+  ["8C95",0x5BF1],
+  ["8C96",0x5BF2],
+  ["8C97",0x5BF3],
+  ["8C98",0x5BF4],
+  ["8C99",0x5BF5],
+  ["8C9A",0x5BF6],
+  ["8C9B",0x5BF7],
+  ["B4E7",0x5BF8],
+  ["B6D4",0x5BF9],
+  ["CBC2",0x5BFA],
+  ["D1B0",0x5BFB],
+  ["B5BC",0x5BFC],
+  ["8C9C",0x5BFD],
+  ["8C9D",0x5BFE],
+  ["CAD9",0x5BFF],
+  ["8C9E",0x5C00],
+  ["B7E2",0x5C01],
+  ["8C9F",0x5C02],
+  ["8CA0",0x5C03],
+  ["C9E4",0x5C04],
+  ["8CA1",0x5C05],
+  ["BDAB",0x5C06],
+  ["8CA2",0x5C07],
+  ["8CA3",0x5C08],
+  ["CEBE",0x5C09],
+  ["D7F0",0x5C0A],
+  ["8CA4",0x5C0B],
+  ["8CA5",0x5C0C],
+  ["8CA6",0x5C0D],
+  ["8CA7",0x5C0E],
+  ["D0A1",0x5C0F],
+  ["8CA8",0x5C10],
+  ["C9D9",0x5C11],
+  ["8CA9",0x5C12],
+  ["8CAA",0x5C13],
+  ["B6FB",0x5C14],
+  ["E6D8",0x5C15],
+  ["BCE2",0x5C16],
+  ["8CAB",0x5C17],
+  ["B3BE",0x5C18],
+  ["8CAC",0x5C19],
+  ["C9D0",0x5C1A],
+  ["8CAD",0x5C1B],
+  ["E6D9",0x5C1C],
+  ["B3A2",0x5C1D],
+  ["8CAE",0x5C1E],
+  ["8CAF",0x5C1F],
+  ["8CB0",0x5C20],
+  ["8CB1",0x5C21],
+  ["DECC",0x5C22],
+  ["8CB2",0x5C23],
+  ["D3C8",0x5C24],
+  ["DECD",0x5C25],
+  ["8CB3",0x5C26],
+  ["D2A2",0x5C27],
+  ["8CB4",0x5C28],
+  ["8CB5",0x5C29],
+  ["8CB6",0x5C2A],
+  ["8CB7",0x5C2B],
+  ["DECE",0x5C2C],
+  ["8CB8",0x5C2D],
+  ["8CB9",0x5C2E],
+  ["8CBA",0x5C2F],
+  ["8CBB",0x5C30],
+  ["BECD",0x5C31],
+  ["8CBC",0x5C32],
+  ["8CBD",0x5C33],
+  ["DECF",0x5C34],
+  ["8CBE",0x5C35],
+  ["8CBF",0x5C36],
+  ["8CC0",0x5C37],
+  ["CAAC",0x5C38],
+  ["D2FC",0x5C39],
+  ["B3DF",0x5C3A],
+  ["E5EA",0x5C3B],
+  ["C4E1",0x5C3C],
+  ["BEA1",0x5C3D],
+  ["CEB2",0x5C3E],
+  ["C4F2",0x5C3F],
+  ["BED6",0x5C40],
+  ["C6A8",0x5C41],
+  ["B2E3",0x5C42],
+  ["8CC1",0x5C43],
+  ["8CC2",0x5C44],
+  ["BED3",0x5C45],
+  ["8CC3",0x5C46],
+  ["8CC4",0x5C47],
+  ["C7FC",0x5C48],
+  ["CCEB",0x5C49],
+  ["BDEC",0x5C4A],
+  ["CEDD",0x5C4B],
+  ["8CC5",0x5C4C],
+  ["8CC6",0x5C4D],
+  ["CABA",0x5C4E],
+  ["C6C1",0x5C4F],
+  ["E5EC",0x5C50],
+  ["D0BC",0x5C51],
+  ["8CC7",0x5C52],
+  ["8CC8",0x5C53],
+  ["8CC9",0x5C54],
+  ["D5B9",0x5C55],
+  ["8CCA",0x5C56],
+  ["8CCB",0x5C57],
+  ["8CCC",0x5C58],
+  ["E5ED",0x5C59],
+  ["8CCD",0x5C5A],
+  ["8CCE",0x5C5B],
+  ["8CCF",0x5C5C],
+  ["8CD0",0x5C5D],
+  ["CAF4",0x5C5E],
+  ["8CD1",0x5C5F],
+  ["CDC0",0x5C60],
+  ["C2C5",0x5C61],
+  ["8CD2",0x5C62],
+  ["E5EF",0x5C63],
+  ["8CD3",0x5C64],
+  ["C2C4",0x5C65],
+  ["E5F0",0x5C66],
+  ["8CD4",0x5C67],
+  ["8CD5",0x5C68],
+  ["8CD6",0x5C69],
+  ["8CD7",0x5C6A],
+  ["8CD8",0x5C6B],
+  ["8CD9",0x5C6C],
+  ["8CDA",0x5C6D],
+  ["E5F8",0x5C6E],
+  ["CDCD",0x5C6F],
+  ["8CDB",0x5C70],
+  ["C9BD",0x5C71],
+  ["8CDC",0x5C72],
+  ["8CDD",0x5C73],
+  ["8CDE",0x5C74],
+  ["8CDF",0x5C75],
+  ["8CE0",0x5C76],
+  ["8CE1",0x5C77],
+  ["8CE2",0x5C78],
+  ["D2D9",0x5C79],
+  ["E1A8",0x5C7A],
+  ["8CE3",0x5C7B],
+  ["8CE4",0x5C7C],
+  ["8CE5",0x5C7D],
+  ["8CE6",0x5C7E],
+  ["D3EC",0x5C7F],
+  ["8CE7",0x5C80],
+  ["CBEA",0x5C81],
+  ["C6F1",0x5C82],
+  ["8CE8",0x5C83],
+  ["8CE9",0x5C84],
+  ["8CEA",0x5C85],
+  ["8CEB",0x5C86],
+  ["8CEC",0x5C87],
+  ["E1AC",0x5C88],
+  ["8CED",0x5C89],
+  ["8CEE",0x5C8A],
+  ["8CEF",0x5C8B],
+  ["E1A7",0x5C8C],
+  ["E1A9",0x5C8D],
+  ["8CF0",0x5C8E],
+  ["8CF1",0x5C8F],
+  ["E1AA",0x5C90],
+  ["E1AF",0x5C91],
+  ["8CF2",0x5C92],
+  ["8CF3",0x5C93],
+  ["B2ED",0x5C94],
+  ["8CF4",0x5C95],
+  ["E1AB",0x5C96],
+  ["B8DA",0x5C97],
+  ["E1AD",0x5C98],
+  ["E1AE",0x5C99],
+  ["E1B0",0x5C9A],
+  ["B5BA",0x5C9B],
+  ["E1B1",0x5C9C],
+  ["8CF5",0x5C9D],
+  ["8CF6",0x5C9E],
+  ["8CF7",0x5C9F],
+  ["8CF8",0x5CA0],
+  ["8CF9",0x5CA1],
+  ["E1B3",0x5CA2],
+  ["E1B8",0x5CA3],
+  ["8CFA",0x5CA4],
+  ["8CFB",0x5CA5],
+  ["8CFC",0x5CA6],
+  ["8CFD",0x5CA7],
+  ["8CFE",0x5CA8],
+  ["D1D2",0x5CA9],
+  ["8D40",0x5CAA],
+  ["E1B6",0x5CAB],
+  ["E1B5",0x5CAC],
+  ["C1EB",0x5CAD],
+  ["8D41",0x5CAE],
+  ["8D42",0x5CAF],
+  ["8D43",0x5CB0],
+  ["E1B7",0x5CB1],
+  ["8D44",0x5CB2],
+  ["D4C0",0x5CB3],
+  ["8D45",0x5CB4],
+  ["E1B2",0x5CB5],
+  ["8D46",0x5CB6],
+  ["E1BA",0x5CB7],
+  ["B0B6",0x5CB8],
+  ["8D47",0x5CB9],
+  ["8D48",0x5CBA],
+  ["8D49",0x5CBB],
+  ["8D4A",0x5CBC],
+  ["E1B4",0x5CBD],
+  ["8D4B",0x5CBE],
+  ["BFF9",0x5CBF],
+  ["8D4C",0x5CC0],
+  ["E1B9",0x5CC1],
+  ["8D4D",0x5CC2],
+  ["8D4E",0x5CC3],
+  ["E1BB",0x5CC4],
+  ["8D4F",0x5CC5],
+  ["8D50",0x5CC6],
+  ["8D51",0x5CC7],
+  ["8D52",0x5CC8],
+  ["8D53",0x5CC9],
+  ["8D54",0x5CCA],
+  ["E1BE",0x5CCB],
+  ["8D55",0x5CCC],
+  ["8D56",0x5CCD],
+  ["8D57",0x5CCE],
+  ["8D58",0x5CCF],
+  ["8D59",0x5CD0],
+  ["8D5A",0x5CD1],
+  ["E1BC",0x5CD2],
+  ["8D5B",0x5CD3],
+  ["8D5C",0x5CD4],
+  ["8D5D",0x5CD5],
+  ["8D5E",0x5CD6],
+  ["8D5F",0x5CD7],
+  ["8D60",0x5CD8],
+  ["D6C5",0x5CD9],
+  ["8D61",0x5CDA],
+  ["8D62",0x5CDB],
+  ["8D63",0x5CDC],
+  ["8D64",0x5CDD],
+  ["8D65",0x5CDE],
+  ["8D66",0x5CDF],
+  ["8D67",0x5CE0],
+  ["CFBF",0x5CE1],
+  ["8D68",0x5CE2],
+  ["8D69",0x5CE3],
+  ["E1BD",0x5CE4],
+  ["E1BF",0x5CE5],
+  ["C2CD",0x5CE6],
+  ["8D6A",0x5CE7],
+  ["B6EB",0x5CE8],
+  ["8D6B",0x5CE9],
+  ["D3F8",0x5CEA],
+  ["8D6C",0x5CEB],
+  ["8D6D",0x5CEC],
+  ["C7CD",0x5CED],
+  ["8D6E",0x5CEE],
+  ["8D6F",0x5CEF],
+  ["B7E5",0x5CF0],
+  ["8D70",0x5CF1],
+  ["8D71",0x5CF2],
+  ["8D72",0x5CF3],
+  ["8D73",0x5CF4],
+  ["8D74",0x5CF5],
+  ["8D75",0x5CF6],
+  ["8D76",0x5CF7],
+  ["8D77",0x5CF8],
+  ["8D78",0x5CF9],
+  ["8D79",0x5CFA],
+  ["BEFE",0x5CFB],
+  ["8D7A",0x5CFC],
+  ["8D7B",0x5CFD],
+  ["8D7C",0x5CFE],
+  ["8D7D",0x5CFF],
+  ["8D7E",0x5D00],
+  ["8D80",0x5D01],
+  ["E1C0",0x5D02],
+  ["E1C1",0x5D03],
+  ["8D81",0x5D04],
+  ["8D82",0x5D05],
+  ["E1C7",0x5D06],
+  ["B3E7",0x5D07],
+  ["8D83",0x5D08],
+  ["8D84",0x5D09],
+  ["8D85",0x5D0A],
+  ["8D86",0x5D0B],
+  ["8D87",0x5D0C],
+  ["8D88",0x5D0D],
+  ["C6E9",0x5D0E],
+  ["8D89",0x5D0F],
+  ["8D8A",0x5D10],
+  ["8D8B",0x5D11],
+  ["8D8C",0x5D12],
+  ["8D8D",0x5D13],
+  ["B4DE",0x5D14],
+  ["8D8E",0x5D15],
+  ["D1C2",0x5D16],
+  ["8D8F",0x5D17],
+  ["8D90",0x5D18],
+  ["8D91",0x5D19],
+  ["8D92",0x5D1A],
+  ["E1C8",0x5D1B],
+  ["8D93",0x5D1C],
+  ["8D94",0x5D1D],
+  ["E1C6",0x5D1E],
+  ["8D95",0x5D1F],
+  ["8D96",0x5D20],
+  ["8D97",0x5D21],
+  ["8D98",0x5D22],
+  ["8D99",0x5D23],
+  ["E1C5",0x5D24],
+  ["8D9A",0x5D25],
+  ["E1C3",0x5D26],
+  ["E1C2",0x5D27],
+  ["8D9B",0x5D28],
+  ["B1C0",0x5D29],
+  ["8D9C",0x5D2A],
+  ["8D9D",0x5D2B],
+  ["8D9E",0x5D2C],
+  ["D5B8",0x5D2D],
+  ["E1C4",0x5D2E],
+  ["8D9F",0x5D2F],
+  ["8DA0",0x5D30],
+  ["8DA1",0x5D31],
+  ["8DA2",0x5D32],
+  ["8DA3",0x5D33],
+  ["E1CB",0x5D34],
+  ["8DA4",0x5D35],
+  ["8DA5",0x5D36],
+  ["8DA6",0x5D37],
+  ["8DA7",0x5D38],
+  ["8DA8",0x5D39],
+  ["8DA9",0x5D3A],
+  ["8DAA",0x5D3B],
+  ["8DAB",0x5D3C],
+  ["E1CC",0x5D3D],
+  ["E1CA",0x5D3E],
+  ["8DAC",0x5D3F],
+  ["8DAD",0x5D40],
+  ["8DAE",0x5D41],
+  ["8DAF",0x5D42],
+  ["8DB0",0x5D43],
+  ["8DB1",0x5D44],
+  ["8DB2",0x5D45],
+  ["8DB3",0x5D46],
+  ["EFFA",0x5D47],
+  ["8DB4",0x5D48],
+  ["8DB5",0x5D49],
+  ["E1D3",0x5D4A],
+  ["E1D2",0x5D4B],
+  ["C7B6",0x5D4C],
+  ["8DB6",0x5D4D],
+  ["8DB7",0x5D4E],
+  ["8DB8",0x5D4F],
+  ["8DB9",0x5D50],
+  ["8DBA",0x5D51],
+  ["8DBB",0x5D52],
+  ["8DBC",0x5D53],
+  ["8DBD",0x5D54],
+  ["8DBE",0x5D55],
+  ["8DBF",0x5D56],
+  ["8DC0",0x5D57],
+  ["E1C9",0x5D58],
+  ["8DC1",0x5D59],
+  ["8DC2",0x5D5A],
+  ["E1CE",0x5D5B],
+  ["8DC3",0x5D5C],
+  ["E1D0",0x5D5D],
+  ["8DC4",0x5D5E],
+  ["8DC5",0x5D5F],
+  ["8DC6",0x5D60],
+  ["8DC7",0x5D61],
+  ["8DC8",0x5D62],
+  ["8DC9",0x5D63],
+  ["8DCA",0x5D64],
+  ["8DCB",0x5D65],
+  ["8DCC",0x5D66],
+  ["8DCD",0x5D67],
+  ["8DCE",0x5D68],
+  ["E1D4",0x5D69],
+  ["8DCF",0x5D6A],
+  ["E1D1",0x5D6B],
+  ["E1CD",0x5D6C],
+  ["8DD0",0x5D6D],
+  ["8DD1",0x5D6E],
+  ["E1CF",0x5D6F],
+  ["8DD2",0x5D70],
+  ["8DD3",0x5D71],
+  ["8DD4",0x5D72],
+  ["8DD5",0x5D73],
+  ["E1D5",0x5D74],
+  ["8DD6",0x5D75],
+  ["8DD7",0x5D76],
+  ["8DD8",0x5D77],
+  ["8DD9",0x5D78],
+  ["8DDA",0x5D79],
+  ["8DDB",0x5D7A],
+  ["8DDC",0x5D7B],
+  ["8DDD",0x5D7C],
+  ["8DDE",0x5D7D],
+  ["8DDF",0x5D7E],
+  ["8DE0",0x5D7F],
+  ["8DE1",0x5D80],
+  ["8DE2",0x5D81],
+  ["E1D6",0x5D82],
+  ["8DE3",0x5D83],
+  ["8DE4",0x5D84],
+  ["8DE5",0x5D85],
+  ["8DE6",0x5D86],
+  ["8DE7",0x5D87],
+  ["8DE8",0x5D88],
+  ["8DE9",0x5D89],
+  ["8DEA",0x5D8A],
+  ["8DEB",0x5D8B],
+  ["8DEC",0x5D8C],
+  ["8DED",0x5D8D],
+  ["8DEE",0x5D8E],
+  ["8DEF",0x5D8F],
+  ["8DF0",0x5D90],
+  ["8DF1",0x5D91],
+  ["8DF2",0x5D92],
+  ["8DF3",0x5D93],
+  ["8DF4",0x5D94],
+  ["8DF5",0x5D95],
+  ["8DF6",0x5D96],
+  ["8DF7",0x5D97],
+  ["8DF8",0x5D98],
+  ["E1D7",0x5D99],
+  ["8DF9",0x5D9A],
+  ["8DFA",0x5D9B],
+  ["8DFB",0x5D9C],
+  ["E1D8",0x5D9D],
+  ["8DFC",0x5D9E],
+  ["8DFD",0x5D9F],
+  ["8DFE",0x5DA0],
+  ["8E40",0x5DA1],
+  ["8E41",0x5DA2],
+  ["8E42",0x5DA3],
+  ["8E43",0x5DA4],
+  ["8E44",0x5DA5],
+  ["8E45",0x5DA6],
+  ["8E46",0x5DA7],
+  ["8E47",0x5DA8],
+  ["8E48",0x5DA9],
+  ["8E49",0x5DAA],
+  ["8E4A",0x5DAB],
+  ["8E4B",0x5DAC],
+  ["8E4C",0x5DAD],
+  ["8E4D",0x5DAE],
+  ["8E4E",0x5DAF],
+  ["8E4F",0x5DB0],
+  ["8E50",0x5DB1],
+  ["8E51",0x5DB2],
+  ["8E52",0x5DB3],
+  ["8E53",0x5DB4],
+  ["8E54",0x5DB5],
+  ["8E55",0x5DB6],
+  ["E1DA",0x5DB7],
+  ["8E56",0x5DB8],
+  ["8E57",0x5DB9],
+  ["8E58",0x5DBA],
+  ["8E59",0x5DBB],
+  ["8E5A",0x5DBC],
+  ["8E5B",0x5DBD],
+  ["8E5C",0x5DBE],
+  ["8E5D",0x5DBF],
+  ["8E5E",0x5DC0],
+  ["8E5F",0x5DC1],
+  ["8E60",0x5DC2],
+  ["8E61",0x5DC3],
+  ["8E62",0x5DC4],
+  ["E1DB",0x5DC5],
+  ["8E63",0x5DC6],
+  ["8E64",0x5DC7],
+  ["8E65",0x5DC8],
+  ["8E66",0x5DC9],
+  ["8E67",0x5DCA],
+  ["8E68",0x5DCB],
+  ["8E69",0x5DCC],
+  ["CEA1",0x5DCD],
+  ["8E6A",0x5DCE],
+  ["8E6B",0x5DCF],
+  ["8E6C",0x5DD0],
+  ["8E6D",0x5DD1],
+  ["8E6E",0x5DD2],
+  ["8E6F",0x5DD3],
+  ["8E70",0x5DD4],
+  ["8E71",0x5DD5],
+  ["8E72",0x5DD6],
+  ["8E73",0x5DD7],
+  ["8E74",0x5DD8],
+  ["8E75",0x5DD9],
+  ["8E76",0x5DDA],
+  ["E7DD",0x5DDB],
+  ["8E77",0x5DDC],
+  ["B4A8",0x5DDD],
+  ["D6DD",0x5DDE],
+  ["8E78",0x5DDF],
+  ["8E79",0x5DE0],
+  ["D1B2",0x5DE1],
+  ["B3B2",0x5DE2],
+  ["8E7A",0x5DE3],
+  ["8E7B",0x5DE4],
+  ["B9A4",0x5DE5],
+  ["D7F3",0x5DE6],
+  ["C7C9",0x5DE7],
+  ["BEDE",0x5DE8],
+  ["B9AE",0x5DE9],
+  ["8E7C",0x5DEA],
+  ["CED7",0x5DEB],
+  ["8E7D",0x5DEC],
+  ["8E7E",0x5DED],
+  ["B2EE",0x5DEE],
+  ["DBCF",0x5DEF],
+  ["8E80",0x5DF0],
+  ["BCBA",0x5DF1],
+  ["D2D1",0x5DF2],
+  ["CBC8",0x5DF3],
+  ["B0CD",0x5DF4],
+  ["8E81",0x5DF5],
+  ["8E82",0x5DF6],
+  ["CFEF",0x5DF7],
+  ["8E83",0x5DF8],
+  ["8E84",0x5DF9],
+  ["8E85",0x5DFA],
+  ["8E86",0x5DFB],
+  ["8E87",0x5DFC],
+  ["D9E3",0x5DFD],
+  ["BDED",0x5DFE],
+  ["8E88",0x5DFF],
+  ["8E89",0x5E00],
+  ["B1D2",0x5E01],
+  ["CAD0",0x5E02],
+  ["B2BC",0x5E03],
+  ["8E8A",0x5E04],
+  ["CBA7",0x5E05],
+  ["B7AB",0x5E06],
+  ["8E8B",0x5E07],
+  ["CAA6",0x5E08],
+  ["8E8C",0x5E09],
+  ["8E8D",0x5E0A],
+  ["8E8E",0x5E0B],
+  ["CFA3",0x5E0C],
+  ["8E8F",0x5E0D],
+  ["8E90",0x5E0E],
+  ["E0F8",0x5E0F],
+  ["D5CA",0x5E10],
+  ["E0FB",0x5E11],
+  ["8E91",0x5E12],
+  ["8E92",0x5E13],
+  ["E0FA",0x5E14],
+  ["C5C1",0x5E15],
+  ["CCFB",0x5E16],
+  ["8E93",0x5E17],
+  ["C1B1",0x5E18],
+  ["E0F9",0x5E19],
+  ["D6E3",0x5E1A],
+  ["B2AF",0x5E1B],
+  ["D6C4",0x5E1C],
+  ["B5DB",0x5E1D],
+  ["8E94",0x5E1E],
+  ["8E95",0x5E1F],
+  ["8E96",0x5E20],
+  ["8E97",0x5E21],
+  ["8E98",0x5E22],
+  ["8E99",0x5E23],
+  ["8E9A",0x5E24],
+  ["8E9B",0x5E25],
+  ["B4F8",0x5E26],
+  ["D6A1",0x5E27],
+  ["8E9C",0x5E28],
+  ["8E9D",0x5E29],
+  ["8E9E",0x5E2A],
+  ["8E9F",0x5E2B],
+  ["8EA0",0x5E2C],
+  ["CFAF",0x5E2D],
+  ["B0EF",0x5E2E],
+  ["8EA1",0x5E2F],
+  ["8EA2",0x5E30],
+  ["E0FC",0x5E31],
+  ["8EA3",0x5E32],
+  ["8EA4",0x5E33],
+  ["8EA5",0x5E34],
+  ["8EA6",0x5E35],
+  ["8EA7",0x5E36],
+  ["E1A1",0x5E37],
+  ["B3A3",0x5E38],
+  ["8EA8",0x5E39],
+  ["8EA9",0x5E3A],
+  ["E0FD",0x5E3B],
+  ["E0FE",0x5E3C],
+  ["C3B1",0x5E3D],
+  ["8EAA",0x5E3E],
+  ["8EAB",0x5E3F],
+  ["8EAC",0x5E40],
+  ["8EAD",0x5E41],
+  ["C3DD",0x5E42],
+  ["8EAE",0x5E43],
+  ["E1A2",0x5E44],
+  ["B7F9",0x5E45],
+  ["8EAF",0x5E46],
+  ["8EB0",0x5E47],
+  ["8EB1",0x5E48],
+  ["8EB2",0x5E49],
+  ["8EB3",0x5E4A],
+  ["8EB4",0x5E4B],
+  ["BBCF",0x5E4C],
+  ["8EB5",0x5E4D],
+  ["8EB6",0x5E4E],
+  ["8EB7",0x5E4F],
+  ["8EB8",0x5E50],
+  ["8EB9",0x5E51],
+  ["8EBA",0x5E52],
+  ["8EBB",0x5E53],
+  ["E1A3",0x5E54],
+  ["C4BB",0x5E55],
+  ["8EBC",0x5E56],
+  ["8EBD",0x5E57],
+  ["8EBE",0x5E58],
+  ["8EBF",0x5E59],
+  ["8EC0",0x5E5A],
+  ["E1A4",0x5E5B],
+  ["8EC1",0x5E5C],
+  ["8EC2",0x5E5D],
+  ["E1A5",0x5E5E],
+  ["8EC3",0x5E5F],
+  ["8EC4",0x5E60],
+  ["E1A6",0x5E61],
+  ["B4B1",0x5E62],
+  ["8EC5",0x5E63],
+  ["8EC6",0x5E64],
+  ["8EC7",0x5E65],
+  ["8EC8",0x5E66],
+  ["8EC9",0x5E67],
+  ["8ECA",0x5E68],
+  ["8ECB",0x5E69],
+  ["8ECC",0x5E6A],
+  ["8ECD",0x5E6B],
+  ["8ECE",0x5E6C],
+  ["8ECF",0x5E6D],
+  ["8ED0",0x5E6E],
+  ["8ED1",0x5E6F],
+  ["8ED2",0x5E70],
+  ["8ED3",0x5E71],
+  ["B8C9",0x5E72],
+  ["C6BD",0x5E73],
+  ["C4EA",0x5E74],
+  ["8ED4",0x5E75],
+  ["B2A2",0x5E76],
+  ["8ED5",0x5E77],
+  ["D0D2",0x5E78],
+  ["8ED6",0x5E79],
+  ["E7DB",0x5E7A],
+  ["BBC3",0x5E7B],
+  ["D3D7",0x5E7C],
+  ["D3C4",0x5E7D],
+  ["8ED7",0x5E7E],
+  ["B9E3",0x5E7F],
+  ["E2CF",0x5E80],
+  ["8ED8",0x5E81],
+  ["8ED9",0x5E82],
+  ["8EDA",0x5E83],
+  ["D7AF",0x5E84],
+  ["8EDB",0x5E85],
+  ["C7EC",0x5E86],
+  ["B1D3",0x5E87],
+  ["8EDC",0x5E88],
+  ["8EDD",0x5E89],
+  ["B4B2",0x5E8A],
+  ["E2D1",0x5E8B],
+  ["8EDE",0x5E8C],
+  ["8EDF",0x5E8D],
+  ["8EE0",0x5E8E],
+  ["D0F2",0x5E8F],
+  ["C2AE",0x5E90],
+  ["E2D0",0x5E91],
+  ["8EE1",0x5E92],
+  ["BFE2",0x5E93],
+  ["D3A6",0x5E94],
+  ["B5D7",0x5E95],
+  ["E2D2",0x5E96],
+  ["B5EA",0x5E97],
+  ["8EE2",0x5E98],
+  ["C3ED",0x5E99],
+  ["B8FD",0x5E9A],
+  ["8EE3",0x5E9B],
+  ["B8AE",0x5E9C],
+  ["8EE4",0x5E9D],
+  ["C5D3",0x5E9E],
+  ["B7CF",0x5E9F],
+  ["E2D4",0x5EA0],
+  ["8EE5",0x5EA1],
+  ["8EE6",0x5EA2],
+  ["8EE7",0x5EA3],
+  ["8EE8",0x5EA4],
+  ["E2D3",0x5EA5],
+  ["B6C8",0x5EA6],
+  ["D7F9",0x5EA7],
+  ["8EE9",0x5EA8],
+  ["8EEA",0x5EA9],
+  ["8EEB",0x5EAA],
+  ["8EEC",0x5EAB],
+  ["8EED",0x5EAC],
+  ["CDA5",0x5EAD],
+  ["8EEE",0x5EAE],
+  ["8EEF",0x5EAF],
+  ["8EF0",0x5EB0],
+  ["8EF1",0x5EB1],
+  ["8EF2",0x5EB2],
+  ["E2D8",0x5EB3],
+  ["8EF3",0x5EB4],
+  ["E2D6",0x5EB5],
+  ["CAFC",0x5EB6],
+  ["BFB5",0x5EB7],
+  ["D3B9",0x5EB8],
+  ["E2D5",0x5EB9],
+  ["8EF4",0x5EBA],
+  ["8EF5",0x5EBB],
+  ["8EF6",0x5EBC],
+  ["8EF7",0x5EBD],
+  ["E2D7",0x5EBE],
+  ["8EF8",0x5EBF],
+  ["8EF9",0x5EC0],
+  ["8EFA",0x5EC1],
+  ["8EFB",0x5EC2],
+  ["8EFC",0x5EC3],
+  ["8EFD",0x5EC4],
+  ["8EFE",0x5EC5],
+  ["8F40",0x5EC6],
+  ["8F41",0x5EC7],
+  ["8F42",0x5EC8],
+  ["C1AE",0x5EC9],
+  ["C0C8",0x5ECA],
+  ["8F43",0x5ECB],
+  ["8F44",0x5ECC],
+  ["8F45",0x5ECD],
+  ["8F46",0x5ECE],
+  ["8F47",0x5ECF],
+  ["8F48",0x5ED0],
+  ["E2DB",0x5ED1],
+  ["E2DA",0x5ED2],
+  ["C0AA",0x5ED3],
+  ["8F49",0x5ED4],
+  ["8F4A",0x5ED5],
+  ["C1CE",0x5ED6],
+  ["8F4B",0x5ED7],
+  ["8F4C",0x5ED8],
+  ["8F4D",0x5ED9],
+  ["8F4E",0x5EDA],
+  ["E2DC",0x5EDB],
+  ["8F4F",0x5EDC],
+  ["8F50",0x5EDD],
+  ["8F51",0x5EDE],
+  ["8F52",0x5EDF],
+  ["8F53",0x5EE0],
+  ["8F54",0x5EE1],
+  ["8F55",0x5EE2],
+  ["8F56",0x5EE3],
+  ["8F57",0x5EE4],
+  ["8F58",0x5EE5],
+  ["8F59",0x5EE6],
+  ["8F5A",0x5EE7],
+  ["E2DD",0x5EE8],
+  ["8F5B",0x5EE9],
+  ["E2DE",0x5EEA],
+  ["8F5C",0x5EEB],
+  ["8F5D",0x5EEC],
+  ["8F5E",0x5EED],
+  ["8F5F",0x5EEE],
+  ["8F60",0x5EEF],
+  ["8F61",0x5EF0],
+  ["8F62",0x5EF1],
+  ["8F63",0x5EF2],
+  ["8F64",0x5EF3],
+  ["DBC8",0x5EF4],
+  ["8F65",0x5EF5],
+  ["D1D3",0x5EF6],
+  ["CDA2",0x5EF7],
+  ["8F66",0x5EF8],
+  ["8F67",0x5EF9],
+  ["BDA8",0x5EFA],
+  ["8F68",0x5EFB],
+  ["8F69",0x5EFC],
+  ["8F6A",0x5EFD],
+  ["DEC3",0x5EFE],
+  ["D8A5",0x5EFF],
+  ["BFAA",0x5F00],
+  ["DBCD",0x5F01],
+  ["D2EC",0x5F02],
+  ["C6FA",0x5F03],
+  ["C5AA",0x5F04],
+  ["8F6B",0x5F05],
+  ["8F6C",0x5F06],
+  ["8F6D",0x5F07],
+  ["DEC4",0x5F08],
+  ["8F6E",0x5F09],
+  ["B1D7",0x5F0A],
+  ["DFAE",0x5F0B],
+  ["8F6F",0x5F0C],
+  ["8F70",0x5F0D],
+  ["8F71",0x5F0E],
+  ["CABD",0x5F0F],
+  ["8F72",0x5F10],
+  ["DFB1",0x5F11],
+  ["8F73",0x5F12],
+  ["B9AD",0x5F13],
+  ["8F74",0x5F14],
+  ["D2FD",0x5F15],
+  ["8F75",0x5F16],
+  ["B8A5",0x5F17],
+  ["BAEB",0x5F18],
+  ["8F76",0x5F19],
+  ["8F77",0x5F1A],
+  ["B3DA",0x5F1B],
+  ["8F78",0x5F1C],
+  ["8F79",0x5F1D],
+  ["8F7A",0x5F1E],
+  ["B5DC",0x5F1F],
+  ["D5C5",0x5F20],
+  ["8F7B",0x5F21],
+  ["8F7C",0x5F22],
+  ["8F7D",0x5F23],
+  ["8F7E",0x5F24],
+  ["C3D6",0x5F25],
+  ["CFD2",0x5F26],
+  ["BBA1",0x5F27],
+  ["8F80",0x5F28],
+  ["E5F3",0x5F29],
+  ["E5F2",0x5F2A],
+  ["8F81",0x5F2B],
+  ["8F82",0x5F2C],
+  ["E5F4",0x5F2D],
+  ["8F83",0x5F2E],
+  ["CDE4",0x5F2F],
+  ["8F84",0x5F30],
+  ["C8F5",0x5F31],
+  ["8F85",0x5F32],
+  ["8F86",0x5F33],
+  ["8F87",0x5F34],
+  ["8F88",0x5F35],
+  ["8F89",0x5F36],
+  ["8F8A",0x5F37],
+  ["8F8B",0x5F38],
+  ["B5AF",0x5F39],
+  ["C7BF",0x5F3A],
+  ["8F8C",0x5F3B],
+  ["E5F6",0x5F3C],
+  ["8F8D",0x5F3D],
+  ["8F8E",0x5F3E],
+  ["8F8F",0x5F3F],
+  ["ECB0",0x5F40],
+  ["8F90",0x5F41],
+  ["8F91",0x5F42],
+  ["8F92",0x5F43],
+  ["8F93",0x5F44],
+  ["8F94",0x5F45],
+  ["8F95",0x5F46],
+  ["8F96",0x5F47],
+  ["8F97",0x5F48],
+  ["8F98",0x5F49],
+  ["8F99",0x5F4A],
+  ["8F9A",0x5F4B],
+  ["8F9B",0x5F4C],
+  ["8F9C",0x5F4D],
+  ["8F9D",0x5F4E],
+  ["8F9E",0x5F4F],
+  ["E5E6",0x5F50],
+  ["8F9F",0x5F51],
+  ["B9E9",0x5F52],
+  ["B5B1",0x5F53],
+  ["8FA0",0x5F54],
+  ["C2BC",0x5F55],
+  ["E5E8",0x5F56],
+  ["E5E7",0x5F57],
+  ["E5E9",0x5F58],
+  ["8FA1",0x5F59],
+  ["8FA2",0x5F5A],
+  ["8FA3",0x5F5B],
+  ["8FA4",0x5F5C],
+  ["D2CD",0x5F5D],
+  ["8FA5",0x5F5E],
+  ["8FA6",0x5F5F],
+  ["8FA7",0x5F60],
+  ["E1EA",0x5F61],
+  ["D0CE",0x5F62],
+  ["8FA8",0x5F63],
+  ["CDAE",0x5F64],
+  ["8FA9",0x5F65],
+  ["D1E5",0x5F66],
+  ["8FAA",0x5F67],
+  ["8FAB",0x5F68],
+  ["B2CA",0x5F69],
+  ["B1EB",0x5F6A],
+  ["8FAC",0x5F6B],
+  ["B1F2",0x5F6C],
+  ["C5ED",0x5F6D],
+  ["8FAD",0x5F6E],
+  ["8FAE",0x5F6F],
+  ["D5C3",0x5F70],
+  ["D3B0",0x5F71],
+  ["8FAF",0x5F72],
+  ["E1DC",0x5F73],
+  ["8FB0",0x5F74],
+  ["8FB1",0x5F75],
+  ["8FB2",0x5F76],
+  ["E1DD",0x5F77],
+  ["8FB3",0x5F78],
+  ["D2DB",0x5F79],
+  ["8FB4",0x5F7A],
+  ["B3B9",0x5F7B],
+  ["B1CB",0x5F7C],
+  ["8FB5",0x5F7D],
+  ["8FB6",0x5F7E],
+  ["8FB7",0x5F7F],
+  ["CDF9",0x5F80],
+  ["D5F7",0x5F81],
+  ["E1DE",0x5F82],
+  ["8FB8",0x5F83],
+  ["BEB6",0x5F84],
+  ["B4FD",0x5F85],
+  ["8FB9",0x5F86],
+  ["E1DF",0x5F87],
+  ["BADC",0x5F88],
+  ["E1E0",0x5F89],
+  ["BBB2",0x5F8A],
+  ["C2C9",0x5F8B],
+  ["E1E1",0x5F8C],
+  ["8FBA",0x5F8D],
+  ["8FBB",0x5F8E],
+  ["8FBC",0x5F8F],
+  ["D0EC",0x5F90],
+  ["8FBD",0x5F91],
+  ["CDBD",0x5F92],
+  ["8FBE",0x5F93],
+  ["8FBF",0x5F94],
+  ["E1E2",0x5F95],
+  ["8FC0",0x5F96],
+  ["B5C3",0x5F97],
+  ["C5C7",0x5F98],
+  ["E1E3",0x5F99],
+  ["8FC1",0x5F9A],
+  ["8FC2",0x5F9B],
+  ["E1E4",0x5F9C],
+  ["8FC3",0x5F9D],
+  ["8FC4",0x5F9E],
+  ["8FC5",0x5F9F],
+  ["8FC6",0x5FA0],
+  ["D3F9",0x5FA1],
+  ["8FC7",0x5FA2],
+  ["8FC8",0x5FA3],
+  ["8FC9",0x5FA4],
+  ["8FCA",0x5FA5],
+  ["8FCB",0x5FA6],
+  ["8FCC",0x5FA7],
+  ["E1E5",0x5FA8],
+  ["8FCD",0x5FA9],
+  ["D1AD",0x5FAA],
+  ["8FCE",0x5FAB],
+  ["8FCF",0x5FAC],
+  ["E1E6",0x5FAD],
+  ["CEA2",0x5FAE],
+  ["8FD0",0x5FAF],
+  ["8FD1",0x5FB0],
+  ["8FD2",0x5FB1],
+  ["8FD3",0x5FB2],
+  ["8FD4",0x5FB3],
+  ["8FD5",0x5FB4],
+  ["E1E7",0x5FB5],
+  ["8FD6",0x5FB6],
+  ["B5C2",0x5FB7],
+  ["8FD7",0x5FB8],
+  ["8FD8",0x5FB9],
+  ["8FD9",0x5FBA],
+  ["8FDA",0x5FBB],
+  ["E1E8",0x5FBC],
+  ["BBD5",0x5FBD],
+  ["8FDB",0x5FBE],
+  ["8FDC",0x5FBF],
+  ["8FDD",0x5FC0],
+  ["8FDE",0x5FC1],
+  ["8FDF",0x5FC2],
+  ["D0C4",0x5FC3],
+  ["E2E0",0x5FC4],
+  ["B1D8",0x5FC5],
+  ["D2E4",0x5FC6],
+  ["8FE0",0x5FC7],
+  ["8FE1",0x5FC8],
+  ["E2E1",0x5FC9],
+  ["8FE2",0x5FCA],
+  ["8FE3",0x5FCB],
+  ["BCC9",0x5FCC],
+  ["C8CC",0x5FCD],
+  ["8FE4",0x5FCE],
+  ["E2E3",0x5FCF],
+  ["ECFE",0x5FD0],
+  ["ECFD",0x5FD1],
+  ["DFAF",0x5FD2],
+  ["8FE5",0x5FD3],
+  ["8FE6",0x5FD4],
+  ["8FE7",0x5FD5],
+  ["E2E2",0x5FD6],
+  ["D6BE",0x5FD7],
+  ["CDFC",0x5FD8],
+  ["C3A6",0x5FD9],
+  ["8FE8",0x5FDA],
+  ["8FE9",0x5FDB],
+  ["8FEA",0x5FDC],
+  ["E3C3",0x5FDD],
+  ["8FEB",0x5FDE],
+  ["8FEC",0x5FDF],
+  ["D6D2",0x5FE0],
+  ["E2E7",0x5FE1],
+  ["8FED",0x5FE2],
+  ["8FEE",0x5FE3],
+  ["E2E8",0x5FE4],
+  ["8FEF",0x5FE5],
+  ["8FF0",0x5FE6],
+  ["D3C7",0x5FE7],
+  ["8FF1",0x5FE8],
+  ["8FF2",0x5FE9],
+  ["E2EC",0x5FEA],
+  ["BFEC",0x5FEB],
+  ["8FF3",0x5FEC],
+  ["E2ED",0x5FED],
+  ["E2E5",0x5FEE],
+  ["8FF4",0x5FEF],
+  ["8FF5",0x5FF0],
+  ["B3C0",0x5FF1],
+  ["8FF6",0x5FF2],
+  ["8FF7",0x5FF3],
+  ["8FF8",0x5FF4],
+  ["C4EE",0x5FF5],
+  ["8FF9",0x5FF6],
+  ["8FFA",0x5FF7],
+  ["E2EE",0x5FF8],
+  ["8FFB",0x5FF9],
+  ["8FFC",0x5FFA],
+  ["D0C3",0x5FFB],
+  ["8FFD",0x5FFC],
+  ["BAF6",0x5FFD],
+  ["E2E9",0x5FFE],
+  ["B7DE",0x5FFF],
+  ["BBB3",0x6000],
+  ["CCAC",0x6001],
+  ["CBCB",0x6002],
+  ["E2E4",0x6003],
+  ["E2E6",0x6004],
+  ["E2EA",0x6005],
+  ["E2EB",0x6006],
+  ["8FFE",0x6007],
+  ["9040",0x6008],
+  ["9041",0x6009],
+  ["E2F7",0x600A],
+  ["9042",0x600B],
+  ["9043",0x600C],
+  ["E2F4",0x600D],
+  ["D4F5",0x600E],
+  ["E2F3",0x600F],
+  ["9044",0x6010],
+  ["9045",0x6011],
+  ["C5AD",0x6012],
+  ["9046",0x6013],
+  ["D5FA",0x6014],
+  ["C5C2",0x6015],
+  ["B2C0",0x6016],
+  ["9047",0x6017],
+  ["9048",0x6018],
+  ["E2EF",0x6019],
+  ["9049",0x601A],
+  ["E2F2",0x601B],
+  ["C1AF",0x601C],
+  ["CBBC",0x601D],
+  ["904A",0x601E],
+  ["904B",0x601F],
+  ["B5A1",0x6020],
+  ["E2F9",0x6021],
+  ["904C",0x6022],
+  ["904D",0x6023],
+  ["904E",0x6024],
+  ["BCB1",0x6025],
+  ["E2F1",0x6026],
+  ["D0D4",0x6027],
+  ["D4B9",0x6028],
+  ["E2F5",0x6029],
+  ["B9D6",0x602A],
+  ["E2F6",0x602B],
+  ["904F",0x602C],
+  ["9050",0x602D],
+  ["9051",0x602E],
+  ["C7D3",0x602F],
+  ["9052",0x6030],
+  ["9053",0x6031],
+  ["9054",0x6032],
+  ["9055",0x6033],
+  ["9056",0x6034],
+  ["E2F0",0x6035],
+  ["9057",0x6036],
+  ["9058",0x6037],
+  ["9059",0x6038],
+  ["905A",0x6039],
+  ["905B",0x603A],
+  ["D7DC",0x603B],
+  ["EDA1",0x603C],
+  ["905C",0x603D],
+  ["905D",0x603E],
+  ["E2F8",0x603F],
+  ["905E",0x6040],
+  ["EDA5",0x6041],
+  ["E2FE",0x6042],
+  ["CAD1",0x6043],
+  ["905F",0x6044],
+  ["9060",0x6045],
+  ["9061",0x6046],
+  ["9062",0x6047],
+  ["9063",0x6048],
+  ["9064",0x6049],
+  ["9065",0x604A],
+  ["C1B5",0x604B],
+  ["9066",0x604C],
+  ["BBD0",0x604D],
+  ["9067",0x604E],
+  ["9068",0x604F],
+  ["BFD6",0x6050],
+  ["9069",0x6051],
+  ["BAE3",0x6052],
+  ["906A",0x6053],
+  ["906B",0x6054],
+  ["CBA1",0x6055],
+  ["906C",0x6056],
+  ["906D",0x6057],
+  ["906E",0x6058],
+  ["EDA6",0x6059],
+  ["EDA3",0x605A],
+  ["906F",0x605B],
+  ["9070",0x605C],
+  ["EDA2",0x605D],
+  ["9071",0x605E],
+  ["9072",0x605F],
+  ["9073",0x6060],
+  ["9074",0x6061],
+  ["BBD6",0x6062],
+  ["EDA7",0x6063],
+  ["D0F4",0x6064],
+  ["9075",0x6065],
+  ["9076",0x6066],
+  ["EDA4",0x6067],
+  ["BADE",0x6068],
+  ["B6F7",0x6069],
+  ["E3A1",0x606A],
+  ["B6B2",0x606B],
+  ["CCF1",0x606C],
+  ["B9A7",0x606D],
+  ["9077",0x606E],
+  ["CFA2",0x606F],
+  ["C7A1",0x6070],
+  ["9078",0x6071],
+  ["9079",0x6072],
+  ["BFD2",0x6073],
+  ["907A",0x6074],
+  ["907B",0x6075],
+  ["B6F1",0x6076],
+  ["907C",0x6077],
+  ["E2FA",0x6078],
+  ["E2FB",0x6079],
+  ["E2FD",0x607A],
+  ["E2FC",0x607B],
+  ["C4D5",0x607C],
+  ["E3A2",0x607D],
+  ["907D",0x607E],
+  ["D3C1",0x607F],
+  ["907E",0x6080],
+  ["9080",0x6081],
+  ["9081",0x6082],
+  ["E3A7",0x6083],
+  ["C7C4",0x6084],
+  ["9082",0x6085],
+  ["9083",0x6086],
+  ["9084",0x6087],
+  ["9085",0x6088],
+  ["CFA4",0x6089],
+  ["9086",0x608A],
+  ["9087",0x608B],
+  ["E3A9",0x608C],
+  ["BAB7",0x608D],
+  ["9088",0x608E],
+  ["9089",0x608F],
+  ["908A",0x6090],
+  ["908B",0x6091],
+  ["E3A8",0x6092],
+  ["908C",0x6093],
+  ["BBDA",0x6094],
+  ["908D",0x6095],
+  ["E3A3",0x6096],
+  ["908E",0x6097],
+  ["908F",0x6098],
+  ["9090",0x6099],
+  ["E3A4",0x609A],
+  ["E3AA",0x609B],
+  ["9091",0x609C],
+  ["E3A6",0x609D],
+  ["9092",0x609E],
+  ["CEF2",0x609F],
+  ["D3C6",0x60A0],
+  ["9093",0x60A1],
+  ["9094",0x60A2],
+  ["BBBC",0x60A3],
+  ["9095",0x60A4],
+  ["9096",0x60A5],
+  ["D4C3",0x60A6],
+  ["9097",0x60A7],
+  ["C4FA",0x60A8],
+  ["9098",0x60A9],
+  ["9099",0x60AA],
+  ["EDA8",0x60AB],
+  ["D0FC",0x60AC],
+  ["E3A5",0x60AD],
+  ["909A",0x60AE],
+  ["C3F5",0x60AF],
+  ["909B",0x60B0],
+  ["E3AD",0x60B1],
+  ["B1AF",0x60B2],
+  ["909C",0x60B3],
+  ["E3B2",0x60B4],
+  ["909D",0x60B5],
+  ["909E",0x60B6],
+  ["909F",0x60B7],
+  ["BCC2",0x60B8],
+  ["90A0",0x60B9],
+  ["90A1",0x60BA],
+  ["E3AC",0x60BB],
+  ["B5BF",0x60BC],
+  ["90A2",0x60BD],
+  ["90A3",0x60BE],
+  ["90A4",0x60BF],
+  ["90A5",0x60C0],
+  ["90A6",0x60C1],
+  ["90A7",0x60C2],
+  ["90A8",0x60C3],
+  ["90A9",0x60C4],
+  ["C7E9",0x60C5],
+  ["E3B0",0x60C6],
+  ["90AA",0x60C7],
+  ["90AB",0x60C8],
+  ["90AC",0x60C9],
+  ["BEAA",0x60CA],
+  ["CDEF",0x60CB],
+  ["90AD",0x60CC],
+  ["90AE",0x60CD],
+  ["90AF",0x60CE],
+  ["90B0",0x60CF],
+  ["90B1",0x60D0],
+  ["BBF3",0x60D1],
+  ["90B2",0x60D2],
+  ["90B3",0x60D3],
+  ["90B4",0x60D4],
+  ["CCE8",0x60D5],
+  ["90B5",0x60D6],
+  ["90B6",0x60D7],
+  ["E3AF",0x60D8],
+  ["90B7",0x60D9],
+  ["E3B1",0x60DA],
+  ["90B8",0x60DB],
+  ["CFA7",0x60DC],
+  ["E3AE",0x60DD],
+  ["90B9",0x60DE],
+  ["CEA9",0x60DF],
+  ["BBDD",0x60E0],
+  ["90BA",0x60E1],
+  ["90BB",0x60E2],
+  ["90BC",0x60E3],
+  ["90BD",0x60E4],
+  ["90BE",0x60E5],
+  ["B5EB",0x60E6],
+  ["BEE5",0x60E7],
+  ["B2D2",0x60E8],
+  ["B3CD",0x60E9],
+  ["90BF",0x60EA],
+  ["B1B9",0x60EB],
+  ["E3AB",0x60EC],
+  ["B2D1",0x60ED],
+  ["B5AC",0x60EE],
+  ["B9DF",0x60EF],
+  ["B6E8",0x60F0],
+  ["90C0",0x60F1],
+  ["90C1",0x60F2],
+  ["CFEB",0x60F3],
+  ["E3B7",0x60F4],
+  ["90C2",0x60F5],
+  ["BBCC",0x60F6],
+  ["90C3",0x60F7],
+  ["90C4",0x60F8],
+  ["C8C7",0x60F9],
+  ["D0CA",0x60FA],
+  ["90C5",0x60FB],
+  ["90C6",0x60FC],
+  ["90C7",0x60FD],
+  ["90C8",0x60FE],
+  ["90C9",0x60FF],
+  ["E3B8",0x6100],
+  ["B3EE",0x6101],
+  ["90CA",0x6102],
+  ["90CB",0x6103],
+  ["90CC",0x6104],
+  ["90CD",0x6105],
+  ["EDA9",0x6106],
+  ["90CE",0x6107],
+  ["D3FA",0x6108],
+  ["D3E4",0x6109],
+  ["90CF",0x610A],
+  ["90D0",0x610B],
+  ["90D1",0x610C],
+  ["EDAA",0x610D],
+  ["E3B9",0x610E],
+  ["D2E2",0x610F],
+  ["90D2",0x6110],
+  ["90D3",0x6111],
+  ["90D4",0x6112],
+  ["90D5",0x6113],
+  ["90D6",0x6114],
+  ["E3B5",0x6115],
+  ["90D7",0x6116],
+  ["90D8",0x6117],
+  ["90D9",0x6118],
+  ["90DA",0x6119],
+  ["D3DE",0x611A],
+  ["90DB",0x611B],
+  ["90DC",0x611C],
+  ["90DD",0x611D],
+  ["90DE",0x611E],
+  ["B8D0",0x611F],
+  ["E3B3",0x6120],
+  ["90DF",0x6121],
+  ["90E0",0x6122],
+  ["E3B6",0x6123],
+  ["B7DF",0x6124],
+  ["90E1",0x6125],
+  ["E3B4",0x6126],
+  ["C0A2",0x6127],
+  ["90E2",0x6128],
+  ["90E3",0x6129],
+  ["90E4",0x612A],
+  ["E3BA",0x612B],
+  ["90E5",0x612C],
+  ["90E6",0x612D],
+  ["90E7",0x612E],
+  ["90E8",0x612F],
+  ["90E9",0x6130],
+  ["90EA",0x6131],
+  ["90EB",0x6132],
+  ["90EC",0x6133],
+  ["90ED",0x6134],
+  ["90EE",0x6135],
+  ["90EF",0x6136],
+  ["90F0",0x6137],
+  ["90F1",0x6138],
+  ["90F2",0x6139],
+  ["90F3",0x613A],
+  ["90F4",0x613B],
+  ["90F5",0x613C],
+  ["90F6",0x613D],
+  ["90F7",0x613E],
+  ["D4B8",0x613F],
+  ["90F8",0x6140],
+  ["90F9",0x6141],
+  ["90FA",0x6142],
+  ["90FB",0x6143],
+  ["90FC",0x6144],
+  ["90FD",0x6145],
+  ["90FE",0x6146],
+  ["9140",0x6147],
+  ["B4C8",0x6148],
+  ["9141",0x6149],
+  ["E3BB",0x614A],
+  ["9142",0x614B],
+  ["BBC5",0x614C],
+  ["9143",0x614D],
+  ["C9F7",0x614E],
+  ["9144",0x614F],
+  ["9145",0x6150],
+  ["C9E5",0x6151],
+  ["9146",0x6152],
+  ["9147",0x6153],
+  ["9148",0x6154],
+  ["C4BD",0x6155],
+  ["9149",0x6156],
+  ["914A",0x6157],
+  ["914B",0x6158],
+  ["914C",0x6159],
+  ["914D",0x615A],
+  ["914E",0x615B],
+  ["914F",0x615C],
+  ["EDAB",0x615D],
+  ["9150",0x615E],
+  ["9151",0x615F],
+  ["9152",0x6160],
+  ["9153",0x6161],
+  ["C2FD",0x6162],
+  ["9154",0x6163],
+  ["9155",0x6164],
+  ["9156",0x6165],
+  ["9157",0x6166],
+  ["BBDB",0x6167],
+  ["BFAE",0x6168],
+  ["9158",0x6169],
+  ["9159",0x616A],
+  ["915A",0x616B],
+  ["915B",0x616C],
+  ["915C",0x616D],
+  ["915D",0x616E],
+  ["915E",0x616F],
+  ["CEBF",0x6170],
+  ["915F",0x6171],
+  ["9160",0x6172],
+  ["9161",0x6173],
+  ["9162",0x6174],
+  ["E3BC",0x6175],
+  ["9163",0x6176],
+  ["BFB6",0x6177],
+  ["9164",0x6178],
+  ["9165",0x6179],
+  ["9166",0x617A],
+  ["9167",0x617B],
+  ["9168",0x617C],
+  ["9169",0x617D],
+  ["916A",0x617E],
+  ["916B",0x617F],
+  ["916C",0x6180],
+  ["916D",0x6181],
+  ["916E",0x6182],
+  ["916F",0x6183],
+  ["9170",0x6184],
+  ["9171",0x6185],
+  ["9172",0x6186],
+  ["9173",0x6187],
+  ["9174",0x6188],
+  ["9175",0x6189],
+  ["9176",0x618A],
+  ["B1EF",0x618B],
+  ["9177",0x618C],
+  ["9178",0x618D],
+  ["D4F7",0x618E],
+  ["9179",0x618F],
+  ["917A",0x6190],
+  ["917B",0x6191],
+  ["917C",0x6192],
+  ["917D",0x6193],
+  ["E3BE",0x6194],
+  ["917E",0x6195],
+  ["9180",0x6196],
+  ["9181",0x6197],
+  ["9182",0x6198],
+  ["9183",0x6199],
+  ["9184",0x619A],
+  ["9185",0x619B],
+  ["9186",0x619C],
+  ["EDAD",0x619D],
+  ["9187",0x619E],
+  ["9188",0x619F],
+  ["9189",0x61A0],
+  ["918A",0x61A1],
+  ["918B",0x61A2],
+  ["918C",0x61A3],
+  ["918D",0x61A4],
+  ["918E",0x61A5],
+  ["918F",0x61A6],
+  ["E3BF",0x61A7],
+  ["BAA9",0x61A8],
+  ["EDAC",0x61A9],
+  ["9190",0x61AA],
+  ["9191",0x61AB],
+  ["E3BD",0x61AC],
+  ["9192",0x61AD],
+  ["9193",0x61AE],
+  ["9194",0x61AF],
+  ["9195",0x61B0],
+  ["9196",0x61B1],
+  ["9197",0x61B2],
+  ["9198",0x61B3],
+  ["9199",0x61B4],
+  ["919A",0x61B5],
+  ["919B",0x61B6],
+  ["E3C0",0x61B7],
+  ["919C",0x61B8],
+  ["919D",0x61B9],
+  ["919E",0x61BA],
+  ["919F",0x61BB],
+  ["91A0",0x61BC],
+  ["91A1",0x61BD],
+  ["BAB6",0x61BE],
+  ["91A2",0x61BF],
+  ["91A3",0x61C0],
+  ["91A4",0x61C1],
+  ["B6AE",0x61C2],
+  ["91A5",0x61C3],
+  ["91A6",0x61C4],
+  ["91A7",0x61C5],
+  ["91A8",0x61C6],
+  ["91A9",0x61C7],
+  ["D0B8",0x61C8],
+  ["91AA",0x61C9],
+  ["B0C3",0x61CA],
+  ["EDAE",0x61CB],
+  ["91AB",0x61CC],
+  ["91AC",0x61CD],
+  ["91AD",0x61CE],
+  ["91AE",0x61CF],
+  ["91AF",0x61D0],
+  ["EDAF",0x61D1],
+  ["C0C1",0x61D2],
+  ["91B0",0x61D3],
+  ["E3C1",0x61D4],
+  ["91B1",0x61D5],
+  ["91B2",0x61D6],
+  ["91B3",0x61D7],
+  ["91B4",0x61D8],
+  ["91B5",0x61D9],
+  ["91B6",0x61DA],
+  ["91B7",0x61DB],
+  ["91B8",0x61DC],
+  ["91B9",0x61DD],
+  ["91BA",0x61DE],
+  ["91BB",0x61DF],
+  ["91BC",0x61E0],
+  ["91BD",0x61E1],
+  ["91BE",0x61E2],
+  ["91BF",0x61E3],
+  ["91C0",0x61E4],
+  ["91C1",0x61E5],
+  ["C5B3",0x61E6],
+  ["91C2",0x61E7],
+  ["91C3",0x61E8],
+  ["91C4",0x61E9],
+  ["91C5",0x61EA],
+  ["91C6",0x61EB],
+  ["91C7",0x61EC],
+  ["91C8",0x61ED],
+  ["91C9",0x61EE],
+  ["91CA",0x61EF],
+  ["91CB",0x61F0],
+  ["91CC",0x61F1],
+  ["91CD",0x61F2],
+  ["91CE",0x61F3],
+  ["91CF",0x61F4],
+  ["E3C2",0x61F5],
+  ["91D0",0x61F6],
+  ["91D1",0x61F7],
+  ["91D2",0x61F8],
+  ["91D3",0x61F9],
+  ["91D4",0x61FA],
+  ["91D5",0x61FB],
+  ["91D6",0x61FC],
+  ["91D7",0x61FD],
+  ["91D8",0x61FE],
+  ["DCB2",0x61FF],
+  ["91D9",0x6200],
+  ["91DA",0x6201],
+  ["91DB",0x6202],
+  ["91DC",0x6203],
+  ["91DD",0x6204],
+  ["91DE",0x6205],
+  ["EDB0",0x6206],
+  ["91DF",0x6207],
+  ["B8EA",0x6208],
+  ["91E0",0x6209],
+  ["CEEC",0x620A],
+  ["EAA7",0x620B],
+  ["D0E7",0x620C],
+  ["CAF9",0x620D],
+  ["C8D6",0x620E],
+  ["CFB7",0x620F],
+  ["B3C9",0x6210],
+  ["CED2",0x6211],
+  ["BDE4",0x6212],
+  ["91E1",0x6213],
+  ["91E2",0x6214],
+  ["E3DE",0x6215],
+  ["BBF2",0x6216],
+  ["EAA8",0x6217],
+  ["D5BD",0x6218],
+  ["91E3",0x6219],
+  ["C6DD",0x621A],
+  ["EAA9",0x621B],
+  ["91E4",0x621C],
+  ["91E5",0x621D],
+  ["91E6",0x621E],
+  ["EAAA",0x621F],
+  ["91E7",0x6220],
+  ["EAAC",0x6221],
+  ["EAAB",0x6222],
+  ["91E8",0x6223],
+  ["EAAE",0x6224],
+  ["EAAD",0x6225],
+  ["91E9",0x6226],
+  ["91EA",0x6227],
+  ["91EB",0x6228],
+  ["91EC",0x6229],
+  ["BDD8",0x622A],
+  ["91ED",0x622B],
+  ["EAAF",0x622C],
+  ["91EE",0x622D],
+  ["C2BE",0x622E],
+  ["91EF",0x622F],
+  ["91F0",0x6230],
+  ["91F1",0x6231],
+  ["91F2",0x6232],
+  ["B4C1",0x6233],
+  ["B4F7",0x6234],
+  ["91F3",0x6235],
+  ["91F4",0x6236],
+  ["BBA7",0x6237],
+  ["91F5",0x6238],
+  ["91F6",0x6239],
+  ["91F7",0x623A],
+  ["91F8",0x623B],
+  ["91F9",0x623C],
+  ["ECE6",0x623D],
+  ["ECE5",0x623E],
+  ["B7BF",0x623F],
+  ["CBF9",0x6240],
+  ["B1E2",0x6241],
+  ["91FA",0x6242],
+  ["ECE7",0x6243],
+  ["91FB",0x6244],
+  ["91FC",0x6245],
+  ["91FD",0x6246],
+  ["C9C8",0x6247],
+  ["ECE8",0x6248],
+  ["ECE9",0x6249],
+  ["91FE",0x624A],
+  ["CAD6",0x624B],
+  ["DED0",0x624C],
+  ["B2C5",0x624D],
+  ["D4FA",0x624E],
+  ["9240",0x624F],
+  ["9241",0x6250],
+  ["C6CB",0x6251],
+  ["B0C7",0x6252],
+  ["B4F2",0x6253],
+  ["C8D3",0x6254],
+  ["9242",0x6255],
+  ["9243",0x6256],
+  ["9244",0x6257],
+  ["CDD0",0x6258],
+  ["9245",0x6259],
+  ["9246",0x625A],
+  ["BFB8",0x625B],
+  ["9247",0x625C],
+  ["9248",0x625D],
+  ["9249",0x625E],
+  ["924A",0x625F],
+  ["924B",0x6260],
+  ["924C",0x6261],
+  ["924D",0x6262],
+  ["BFDB",0x6263],
+  ["924E",0x6264],
+  ["924F",0x6265],
+  ["C7A4",0x6266],
+  ["D6B4",0x6267],
+  ["9250",0x6268],
+  ["C0A9",0x6269],
+  ["DED1",0x626A],
+  ["C9A8",0x626B],
+  ["D1EF",0x626C],
+  ["C5A4",0x626D],
+  ["B0E7",0x626E],
+  ["B3B6",0x626F],
+  ["C8C5",0x6270],
+  ["9251",0x6271],
+  ["9252",0x6272],
+  ["B0E2",0x6273],
+  ["9253",0x6274],
+  ["9254",0x6275],
+  ["B7F6",0x6276],
+  ["9255",0x6277],
+  ["9256",0x6278],
+  ["C5FA",0x6279],
+  ["9257",0x627A],
+  ["9258",0x627B],
+  ["B6F3",0x627C],
+  ["9259",0x627D],
+  ["D5D2",0x627E],
+  ["B3D0",0x627F],
+  ["BCBC",0x6280],
+  ["925A",0x6281],
+  ["925B",0x6282],
+  ["925C",0x6283],
+  ["B3AD",0x6284],
+  ["925D",0x6285],
+  ["925E",0x6286],
+  ["925F",0x6287],
+  ["9260",0x6288],
+  ["BEF1",0x6289],
+  ["B0D1",0x628A],
+  ["9261",0x628B],
+  ["9262",0x628C],
+  ["9263",0x628D],
+  ["9264",0x628E],
+  ["9265",0x628F],
+  ["9266",0x6290],
+  ["D2D6",0x6291],
+  ["CAE3",0x6292],
+  ["D7A5",0x6293],
+  ["9267",0x6294],
+  ["CDB6",0x6295],
+  ["B6B6",0x6296],
+  ["BFB9",0x6297],
+  ["D5DB",0x6298],
+  ["9268",0x6299],
+  ["B8A7",0x629A],
+  ["C5D7",0x629B],
+  ["9269",0x629C],
+  ["926A",0x629D],
+  ["926B",0x629E],
+  ["DED2",0x629F],
+  ["BFD9",0x62A0],
+  ["C2D5",0x62A1],
+  ["C7C0",0x62A2],
+  ["926C",0x62A3],
+  ["BBA4",0x62A4],
+  ["B1A8",0x62A5],
+  ["926D",0x62A6],
+  ["926E",0x62A7],
+  ["C5EA",0x62A8],
+  ["926F",0x62A9],
+  ["9270",0x62AA],
+  ["C5FB",0x62AB],
+  ["CCA7",0x62AC],
+  ["9271",0x62AD],
+  ["9272",0x62AE],
+  ["9273",0x62AF],
+  ["9274",0x62B0],
+  ["B1A7",0x62B1],
+  ["9275",0x62B2],
+  ["9276",0x62B3],
+  ["9277",0x62B4],
+  ["B5D6",0x62B5],
+  ["9278",0x62B6],
+  ["9279",0x62B7],
+  ["927A",0x62B8],
+  ["C4A8",0x62B9],
+  ["927B",0x62BA],
+  ["DED3",0x62BB],
+  ["D1BA",0x62BC],
+  ["B3E9",0x62BD],
+  ["927C",0x62BE],
+  ["C3F2",0x62BF],
+  ["927D",0x62C0],
+  ["927E",0x62C1],
+  ["B7F7",0x62C2],
+  ["9280",0x62C3],
+  ["D6F4",0x62C4],
+  ["B5A3",0x62C5],
+  ["B2F0",0x62C6],
+  ["C4B4",0x62C7],
+  ["C4E9",0x62C8],
+  ["C0AD",0x62C9],
+  ["DED4",0x62CA],
+  ["9281",0x62CB],
+  ["B0E8",0x62CC],
+  ["C5C4",0x62CD],
+  ["C1E0",0x62CE],
+  ["9282",0x62CF],
+  ["B9D5",0x62D0],
+  ["9283",0x62D1],
+  ["BEDC",0x62D2],
+  ["CDD8",0x62D3],
+  ["B0CE",0x62D4],
+  ["9284",0x62D5],
+  ["CDCF",0x62D6],
+  ["DED6",0x62D7],
+  ["BED0",0x62D8],
+  ["D7BE",0x62D9],
+  ["DED5",0x62DA],
+  ["D5D0",0x62DB],
+  ["B0DD",0x62DC],
+  ["9285",0x62DD],
+  ["9286",0x62DE],
+  ["C4E2",0x62DF],
+  ["9287",0x62E0],
+  ["9288",0x62E1],
+  ["C2A3",0x62E2],
+  ["BCF0",0x62E3],
+  ["9289",0x62E4],
+  ["D3B5",0x62E5],
+  ["C0B9",0x62E6],
+  ["C5A1",0x62E7],
+  ["B2A6",0x62E8],
+  ["D4F1",0x62E9],
+  ["928A",0x62EA],
+  ["928B",0x62EB],
+  ["C0A8",0x62EC],
+  ["CAC3",0x62ED],
+  ["DED7",0x62EE],
+  ["D5FC",0x62EF],
+  ["928C",0x62F0],
+  ["B9B0",0x62F1],
+  ["928D",0x62F2],
+  ["C8AD",0x62F3],
+  ["CBA9",0x62F4],
+  ["928E",0x62F5],
+  ["DED9",0x62F6],
+  ["BFBD",0x62F7],
+  ["928F",0x62F8],
+  ["9290",0x62F9],
+  ["9291",0x62FA],
+  ["9292",0x62FB],
+  ["C6B4",0x62FC],
+  ["D7A7",0x62FD],
+  ["CAB0",0x62FE],
+  ["C4C3",0x62FF],
+  ["9293",0x6300],
+  ["B3D6",0x6301],
+  ["B9D2",0x6302],
+  ["9294",0x6303],
+  ["9295",0x6304],
+  ["9296",0x6305],
+  ["9297",0x6306],
+  ["D6B8",0x6307],
+  ["EAFC",0x6308],
+  ["B0B4",0x6309],
+  ["9298",0x630A],
+  ["9299",0x630B],
+  ["929A",0x630C],
+  ["929B",0x630D],
+  ["BFE6",0x630E],
+  ["929C",0x630F],
+  ["929D",0x6310],
+  ["CCF4",0x6311],
+  ["929E",0x6312],
+  ["929F",0x6313],
+  ["92A0",0x6314],
+  ["92A1",0x6315],
+  ["CDDA",0x6316],
+  ["92A2",0x6317],
+  ["92A3",0x6318],
+  ["92A4",0x6319],
+  ["D6BF",0x631A],
+  ["C2CE",0x631B],
+  ["92A5",0x631C],
+  ["CECE",0x631D],
+  ["CCA2",0x631E],
+  ["D0AE",0x631F],
+  ["C4D3",0x6320],
+  ["B5B2",0x6321],
+  ["DED8",0x6322],
+  ["D5F5",0x6323],
+  ["BCB7",0x6324],
+  ["BBD3",0x6325],
+  ["92A6",0x6326],
+  ["92A7",0x6327],
+  ["B0A4",0x6328],
+  ["92A8",0x6329],
+  ["C5B2",0x632A],
+  ["B4EC",0x632B],
+  ["92A9",0x632C],
+  ["92AA",0x632D],
+  ["92AB",0x632E],
+  ["D5F1",0x632F],
+  ["92AC",0x6330],
+  ["92AD",0x6331],
+  ["EAFD",0x6332],
+  ["92AE",0x6333],
+  ["92AF",0x6334],
+  ["92B0",0x6335],
+  ["92B1",0x6336],
+  ["92B2",0x6337],
+  ["92B3",0x6338],
+  ["DEDA",0x6339],
+  ["CDA6",0x633A],
+  ["92B4",0x633B],
+  ["92B5",0x633C],
+  ["CDEC",0x633D],
+  ["92B6",0x633E],
+  ["92B7",0x633F],
+  ["92B8",0x6340],
+  ["92B9",0x6341],
+  ["CEE6",0x6342],
+  ["DEDC",0x6343],
+  ["92BA",0x6344],
+  ["CDB1",0x6345],
+  ["C0A6",0x6346],
+  ["92BB",0x6347],
+  ["92BC",0x6348],
+  ["D7BD",0x6349],
+  ["92BD",0x634A],
+  ["DEDB",0x634B],
+  ["B0C6",0x634C],
+  ["BAB4",0x634D],
+  ["C9D3",0x634E],
+  ["C4F3",0x634F],
+  ["BEE8",0x6350],
+  ["92BE",0x6351],
+  ["92BF",0x6352],
+  ["92C0",0x6353],
+  ["92C1",0x6354],
+  ["B2B6",0x6355],
+  ["92C2",0x6356],
+  ["92C3",0x6357],
+  ["92C4",0x6358],
+  ["92C5",0x6359],
+  ["92C6",0x635A],
+  ["92C7",0x635B],
+  ["92C8",0x635C],
+  ["92C9",0x635D],
+  ["C0CC",0x635E],
+  ["CBF0",0x635F],
+  ["92CA",0x6360],
+  ["BCF1",0x6361],
+  ["BBBB",0x6362],
+  ["B5B7",0x6363],
+  ["92CB",0x6364],
+  ["92CC",0x6365],
+  ["92CD",0x6366],
+  ["C5F5",0x6367],
+  ["92CE",0x6368],
+  ["DEE6",0x6369],
+  ["92CF",0x636A],
+  ["92D0",0x636B],
+  ["92D1",0x636C],
+  ["DEE3",0x636D],
+  ["BEDD",0x636E],
+  ["92D2",0x636F],
+  ["92D3",0x6370],
+  ["DEDF",0x6371],
+  ["92D4",0x6372],
+  ["92D5",0x6373],
+  ["92D6",0x6374],
+  ["92D7",0x6375],
+  ["B4B7",0x6376],
+  ["BDDD",0x6377],
+  ["92D8",0x6378],
+  ["92D9",0x6379],
+  ["DEE0",0x637A],
+  ["C4ED",0x637B],
+  ["92DA",0x637C],
+  ["92DB",0x637D],
+  ["92DC",0x637E],
+  ["92DD",0x637F],
+  ["CFC6",0x6380],
+  ["92DE",0x6381],
+  ["B5E0",0x6382],
+  ["92DF",0x6383],
+  ["92E0",0x6384],
+  ["92E1",0x6385],
+  ["92E2",0x6386],
+  ["B6DE",0x6387],
+  ["CADA",0x6388],
+  ["B5F4",0x6389],
+  ["DEE5",0x638A],
+  ["92E3",0x638B],
+  ["D5C6",0x638C],
+  ["92E4",0x638D],
+  ["DEE1",0x638E],
+  ["CCCD",0x638F],
+  ["C6FE",0x6390],
+  ["92E5",0x6391],
+  ["C5C5",0x6392],
+  ["92E6",0x6393],
+  ["92E7",0x6394],
+  ["92E8",0x6395],
+  ["D2B4",0x6396],
+  ["92E9",0x6397],
+  ["BEF2",0x6398],
+  ["92EA",0x6399],
+  ["92EB",0x639A],
+  ["92EC",0x639B],
+  ["92ED",0x639C],
+  ["92EE",0x639D],
+  ["92EF",0x639E],
+  ["92F0",0x639F],
+  ["C2D3",0x63A0],
+  ["92F1",0x63A1],
+  ["CCBD",0x63A2],
+  ["B3B8",0x63A3],
+  ["92F2",0x63A4],
+  ["BDD3",0x63A5],
+  ["92F3",0x63A6],
+  ["BFD8",0x63A7],
+  ["CDC6",0x63A8],
+  ["D1DA",0x63A9],
+  ["B4EB",0x63AA],
+  ["92F4",0x63AB],
+  ["DEE4",0x63AC],
+  ["DEDD",0x63AD],
+  ["DEE7",0x63AE],
+  ["92F5",0x63AF],
+  ["EAFE",0x63B0],
+  ["92F6",0x63B1],
+  ["92F7",0x63B2],
+  ["C2B0",0x63B3],
+  ["DEE2",0x63B4],
+  ["92F8",0x63B5],
+  ["92F9",0x63B6],
+  ["D6C0",0x63B7],
+  ["B5A7",0x63B8],
+  ["92FA",0x63B9],
+  ["B2F4",0x63BA],
+  ["92FB",0x63BB],
+  ["DEE8",0x63BC],
+  ["92FC",0x63BD],
+  ["DEF2",0x63BE],
+  ["92FD",0x63BF],
+  ["92FE",0x63C0],
+  ["9340",0x63C1],
+  ["9341",0x63C2],
+  ["9342",0x63C3],
+  ["DEED",0x63C4],
+  ["9343",0x63C5],
+  ["DEF1",0x63C6],
+  ["9344",0x63C7],
+  ["9345",0x63C8],
+  ["C8E0",0x63C9],
+  ["9346",0x63CA],
+  ["9347",0x63CB],
+  ["9348",0x63CC],
+  ["D7E1",0x63CD],
+  ["DEEF",0x63CE],
+  ["C3E8",0x63CF],
+  ["CCE1",0x63D0],
+  ["9349",0x63D1],
+  ["B2E5",0x63D2],
+  ["934A",0x63D3],
+  ["934B",0x63D4],
+  ["934C",0x63D5],
+  ["D2BE",0x63D6],
+  ["934D",0x63D7],
+  ["934E",0x63D8],
+  ["934F",0x63D9],
+  ["9350",0x63DA],
+  ["9351",0x63DB],
+  ["9352",0x63DC],
+  ["9353",0x63DD],
+  ["DEEE",0x63DE],
+  ["9354",0x63DF],
+  ["DEEB",0x63E0],
+  ["CED5",0x63E1],
+  ["9355",0x63E2],
+  ["B4A7",0x63E3],
+  ["9356",0x63E4],
+  ["9357",0x63E5],
+  ["9358",0x63E6],
+  ["9359",0x63E7],
+  ["935A",0x63E8],
+  ["BFAB",0x63E9],
+  ["BEBE",0x63EA],
+  ["935B",0x63EB],
+  ["935C",0x63EC],
+  ["BDD2",0x63ED],
+  ["935D",0x63EE],
+  ["935E",0x63EF],
+  ["935F",0x63F0],
+  ["9360",0x63F1],
+  ["DEE9",0x63F2],
+  ["9361",0x63F3],
+  ["D4AE",0x63F4],
+  ["9362",0x63F5],
+  ["DEDE",0x63F6],
+  ["9363",0x63F7],
+  ["DEEA",0x63F8],
+  ["9364",0x63F9],
+  ["9365",0x63FA],
+  ["9366",0x63FB],
+  ["9367",0x63FC],
+  ["C0BF",0x63FD],
+  ["9368",0x63FE],
+  ["DEEC",0x63FF],
+  ["B2F3",0x6400],
+  ["B8E9",0x6401],
+  ["C2A7",0x6402],
+  ["9369",0x6403],
+  ["936A",0x6404],
+  ["BDC1",0x6405],
+  ["936B",0x6406],
+  ["936C",0x6407],
+  ["936D",0x6408],
+  ["936E",0x6409],
+  ["936F",0x640A],
+  ["DEF5",0x640B],
+  ["DEF8",0x640C],
+  ["9370",0x640D],
+  ["9371",0x640E],
+  ["B2AB",0x640F],
+  ["B4A4",0x6410],
+  ["9372",0x6411],
+  ["9373",0x6412],
+  ["B4EA",0x6413],
+  ["C9A6",0x6414],
+  ["9374",0x6415],
+  ["9375",0x6416],
+  ["9376",0x6417],
+  ["9377",0x6418],
+  ["9378",0x6419],
+  ["9379",0x641A],
+  ["DEF6",0x641B],
+  ["CBD1",0x641C],
+  ["937A",0x641D],
+  ["B8E3",0x641E],
+  ["937B",0x641F],
+  ["DEF7",0x6420],
+  ["DEFA",0x6421],
+  ["937C",0x6422],
+  ["937D",0x6423],
+  ["937E",0x6424],
+  ["9380",0x6425],
+  ["DEF9",0x6426],
+  ["9381",0x6427],
+  ["9382",0x6428],
+  ["9383",0x6429],
+  ["CCC2",0x642A],
+  ["9384",0x642B],
+  ["B0E1",0x642C],
+  ["B4EE",0x642D],
+  ["9385",0x642E],
+  ["9386",0x642F],
+  ["9387",0x6430],
+  ["9388",0x6431],
+  ["9389",0x6432],
+  ["938A",0x6433],
+  ["E5BA",0x6434],
+  ["938B",0x6435],
+  ["938C",0x6436],
+  ["938D",0x6437],
+  ["938E",0x6438],
+  ["938F",0x6439],
+  ["D0AF",0x643A],
+  ["9390",0x643B],
+  ["9391",0x643C],
+  ["B2EB",0x643D],
+  ["9392",0x643E],
+  ["EBA1",0x643F],
+  ["9393",0x6440],
+  ["DEF4",0x6441],
+  ["9394",0x6442],
+  ["9395",0x6443],
+  ["C9E3",0x6444],
+  ["DEF3",0x6445],
+  ["B0DA",0x6446],
+  ["D2A1",0x6447],
+  ["B1F7",0x6448],
+  ["9396",0x6449],
+  ["CCAF",0x644A],
+  ["9397",0x644B],
+  ["9398",0x644C],
+  ["9399",0x644D],
+  ["939A",0x644E],
+  ["939B",0x644F],
+  ["939C",0x6450],
+  ["939D",0x6451],
+  ["DEF0",0x6452],
+  ["939E",0x6453],
+  ["CBA4",0x6454],
+  ["939F",0x6455],
+  ["93A0",0x6456],
+  ["93A1",0x6457],
+  ["D5AA",0x6458],
+  ["93A2",0x6459],
+  ["93A3",0x645A],
+  ["93A4",0x645B],
+  ["93A5",0x645C],
+  ["93A6",0x645D],
+  ["DEFB",0x645E],
+  ["93A7",0x645F],
+  ["93A8",0x6460],
+  ["93A9",0x6461],
+  ["93AA",0x6462],
+  ["93AB",0x6463],
+  ["93AC",0x6464],
+  ["93AD",0x6465],
+  ["93AE",0x6466],
+  ["B4DD",0x6467],
+  ["93AF",0x6468],
+  ["C4A6",0x6469],
+  ["93B0",0x646A],
+  ["93B1",0x646B],
+  ["93B2",0x646C],
+  ["DEFD",0x646D],
+  ["93B3",0x646E],
+  ["93B4",0x646F],
+  ["93B5",0x6470],
+  ["93B6",0x6471],
+  ["93B7",0x6472],
+  ["93B8",0x6473],
+  ["93B9",0x6474],
+  ["93BA",0x6475],
+  ["93BB",0x6476],
+  ["93BC",0x6477],
+  ["C3FE",0x6478],
+  ["C4A1",0x6479],
+  ["DFA1",0x647A],
+  ["93BD",0x647B],
+  ["93BE",0x647C],
+  ["93BF",0x647D],
+  ["93C0",0x647E],
+  ["93C1",0x647F],
+  ["93C2",0x6480],
+  ["93C3",0x6481],
+  ["C1CC",0x6482],
+  ["93C4",0x6483],
+  ["DEFC",0x6484],
+  ["BEEF",0x6485],
+  ["93C5",0x6486],
+  ["C6B2",0x6487],
+  ["93C6",0x6488],
+  ["93C7",0x6489],
+  ["93C8",0x648A],
+  ["93C9",0x648B],
+  ["93CA",0x648C],
+  ["93CB",0x648D],
+  ["93CC",0x648E],
+  ["93CD",0x648F],
+  ["93CE",0x6490],
+  ["B3C5",0x6491],
+  ["C8F6",0x6492],
+  ["93CF",0x6493],
+  ["93D0",0x6494],
+  ["CBBA",0x6495],
+  ["DEFE",0x6496],
+  ["93D1",0x6497],
+  ["93D2",0x6498],
+  ["DFA4",0x6499],
+  ["93D3",0x649A],
+  ["93D4",0x649B],
+  ["93D5",0x649C],
+  ["93D6",0x649D],
+  ["D7B2",0x649E],
+  ["93D7",0x649F],
+  ["93D8",0x64A0],
+  ["93D9",0x64A1],
+  ["93DA",0x64A2],
+  ["93DB",0x64A3],
+  ["B3B7",0x64A4],
+  ["93DC",0x64A5],
+  ["93DD",0x64A6],
+  ["93DE",0x64A7],
+  ["93DF",0x64A8],
+  ["C1C3",0x64A9],
+  ["93E0",0x64AA],
+  ["93E1",0x64AB],
+  ["C7CB",0x64AC],
+  ["B2A5",0x64AD],
+  ["B4E9",0x64AE],
+  ["93E2",0x64AF],
+  ["D7AB",0x64B0],
+  ["93E3",0x64B1],
+  ["93E4",0x64B2],
+  ["93E5",0x64B3],
+  ["93E6",0x64B4],
+  ["C4EC",0x64B5],
+  ["93E7",0x64B6],
+  ["DFA2",0x64B7],
+  ["DFA3",0x64B8],
+  ["93E8",0x64B9],
+  ["DFA5",0x64BA],
+  ["93E9",0x64BB],
+  ["BAB3",0x64BC],
+  ["93EA",0x64BD],
+  ["93EB",0x64BE],
+  ["93EC",0x64BF],
+  ["DFA6",0x64C0],
+  ["93ED",0x64C1],
+  ["C0DE",0x64C2],
+  ["93EE",0x64C3],
+  ["93EF",0x64C4],
+  ["C9C3",0x64C5],
+  ["93F0",0x64C6],
+  ["93F1",0x64C7],
+  ["93F2",0x64C8],
+  ["93F3",0x64C9],
+  ["93F4",0x64CA],
+  ["93F5",0x64CB],
+  ["93F6",0x64CC],
+  ["B2D9",0x64CD],
+  ["C7E6",0x64CE],
+  ["93F7",0x64CF],
+  ["DFA7",0x64D0],
+  ["93F8",0x64D1],
+  ["C7DC",0x64D2],
+  ["93F9",0x64D3],
+  ["93FA",0x64D4],
+  ["93FB",0x64D5],
+  ["93FC",0x64D6],
+  ["DFA8",0x64D7],
+  ["EBA2",0x64D8],
+  ["93FD",0x64D9],
+  ["93FE",0x64DA],
+  ["9440",0x64DB],
+  ["9441",0x64DC],
+  ["9442",0x64DD],
+  ["CBD3",0x64DE],
+  ["9443",0x64DF],
+  ["9444",0x64E0],
+  ["9445",0x64E1],
+  ["DFAA",0x64E2],
+  ["9446",0x64E3],
+  ["DFA9",0x64E4],
+  ["9447",0x64E5],
+  ["B2C1",0x64E6],
+  ["9448",0x64E7],
+  ["9449",0x64E8],
+  ["944A",0x64E9],
+  ["944B",0x64EA],
+  ["944C",0x64EB],
+  ["944D",0x64EC],
+  ["944E",0x64ED],
+  ["944F",0x64EE],
+  ["9450",0x64EF],
+  ["9451",0x64F0],
+  ["9452",0x64F1],
+  ["9453",0x64F2],
+  ["9454",0x64F3],
+  ["9455",0x64F4],
+  ["9456",0x64F5],
+  ["9457",0x64F6],
+  ["9458",0x64F7],
+  ["9459",0x64F8],
+  ["945A",0x64F9],
+  ["945B",0x64FA],
+  ["945C",0x64FB],
+  ["945D",0x64FC],
+  ["945E",0x64FD],
+  ["945F",0x64FE],
+  ["9460",0x64FF],
+  ["C5CA",0x6500],
+  ["9461",0x6501],
+  ["9462",0x6502],
+  ["9463",0x6503],
+  ["9464",0x6504],
+  ["9465",0x6505],
+  ["9466",0x6506],
+  ["9467",0x6507],
+  ["9468",0x6508],
+  ["DFAB",0x6509],
+  ["9469",0x650A],
+  ["946A",0x650B],
+  ["946B",0x650C],
+  ["946C",0x650D],
+  ["946D",0x650E],
+  ["946E",0x650F],
+  ["946F",0x6510],
+  ["9470",0x6511],
+  ["D4DC",0x6512],
+  ["9471",0x6513],
+  ["9472",0x6514],
+  ["9473",0x6515],
+  ["9474",0x6516],
+  ["9475",0x6517],
+  ["C8C1",0x6518],
+  ["9476",0x6519],
+  ["9477",0x651A],
+  ["9478",0x651B],
+  ["9479",0x651C],
+  ["947A",0x651D],
+  ["947B",0x651E],
+  ["947C",0x651F],
+  ["947D",0x6520],
+  ["947E",0x6521],
+  ["9480",0x6522],
+  ["9481",0x6523],
+  ["9482",0x6524],
+  ["DFAC",0x6525],
+  ["9483",0x6526],
+  ["9484",0x6527],
+  ["9485",0x6528],
+  ["9486",0x6529],
+  ["9487",0x652A],
+  ["BEF0",0x652B],
+  ["9488",0x652C],
+  ["9489",0x652D],
+  ["DFAD",0x652E],
+  ["D6A7",0x652F],
+  ["948A",0x6530],
+  ["948B",0x6531],
+  ["948C",0x6532],
+  ["948D",0x6533],
+  ["EAB7",0x6534],
+  ["EBB6",0x6535],
+  ["CAD5",0x6536],
+  ["948E",0x6537],
+  ["D8FC",0x6538],
+  ["B8C4",0x6539],
+  ["948F",0x653A],
+  ["B9A5",0x653B],
+  ["9490",0x653C],
+  ["9491",0x653D],
+  ["B7C5",0x653E],
+  ["D5FE",0x653F],
+  ["9492",0x6540],
+  ["9493",0x6541],
+  ["9494",0x6542],
+  ["9495",0x6543],
+  ["9496",0x6544],
+  ["B9CA",0x6545],
+  ["9497",0x6546],
+  ["9498",0x6547],
+  ["D0A7",0x6548],
+  ["F4CD",0x6549],
+  ["9499",0x654A],
+  ["949A",0x654B],
+  ["B5D0",0x654C],
+  ["949B",0x654D],
+  ["949C",0x654E],
+  ["C3F4",0x654F],
+  ["949D",0x6550],
+  ["BEC8",0x6551],
+  ["949E",0x6552],
+  ["949F",0x6553],
+  ["94A0",0x6554],
+  ["EBB7",0x6555],
+  ["B0BD",0x6556],
+  ["94A1",0x6557],
+  ["94A2",0x6558],
+  ["BDCC",0x6559],
+  ["94A3",0x655A],
+  ["C1B2",0x655B],
+  ["94A4",0x655C],
+  ["B1D6",0x655D],
+  ["B3A8",0x655E],
+  ["94A5",0x655F],
+  ["94A6",0x6560],
+  ["94A7",0x6561],
+  ["B8D2",0x6562],
+  ["C9A2",0x6563],
+  ["94A8",0x6564],
+  ["94A9",0x6565],
+  ["B6D8",0x6566],
+  ["94AA",0x6567],
+  ["94AB",0x6568],
+  ["94AC",0x6569],
+  ["94AD",0x656A],
+  ["EBB8",0x656B],
+  ["BEB4",0x656C],
+  ["94AE",0x656D],
+  ["94AF",0x656E],
+  ["94B0",0x656F],
+  ["CAFD",0x6570],
+  ["94B1",0x6571],
+  ["C7C3",0x6572],
+  ["94B2",0x6573],
+  ["D5FB",0x6574],
+  ["94B3",0x6575],
+  ["94B4",0x6576],
+  ["B7F3",0x6577],
+  ["94B5",0x6578],
+  ["94B6",0x6579],
+  ["94B7",0x657A],
+  ["94B8",0x657B],
+  ["94B9",0x657C],
+  ["94BA",0x657D],
+  ["94BB",0x657E],
+  ["94BC",0x657F],
+  ["94BD",0x6580],
+  ["94BE",0x6581],
+  ["94BF",0x6582],
+  ["94C0",0x6583],
+  ["94C1",0x6584],
+  ["94C2",0x6585],
+  ["94C3",0x6586],
+  ["CEC4",0x6587],
+  ["94C4",0x6588],
+  ["94C5",0x6589],
+  ["94C6",0x658A],
+  ["D5AB",0x658B],
+  ["B1F3",0x658C],
+  ["94C7",0x658D],
+  ["94C8",0x658E],
+  ["94C9",0x658F],
+  ["ECB3",0x6590],
+  ["B0DF",0x6591],
+  ["94CA",0x6592],
+  ["ECB5",0x6593],
+  ["94CB",0x6594],
+  ["94CC",0x6595],
+  ["94CD",0x6596],
+  ["B6B7",0x6597],
+  ["94CE",0x6598],
+  ["C1CF",0x6599],
+  ["94CF",0x659A],
+  ["F5FA",0x659B],
+  ["D0B1",0x659C],
+  ["94D0",0x659D],
+  ["94D1",0x659E],
+  ["D5E5",0x659F],
+  ["94D2",0x65A0],
+  ["CED3",0x65A1],
+  ["94D3",0x65A2],
+  ["94D4",0x65A3],
+  ["BDEF",0x65A4],
+  ["B3E2",0x65A5],
+  ["94D5",0x65A6],
+  ["B8AB",0x65A7],
+  ["94D6",0x65A8],
+  ["D5B6",0x65A9],
+  ["94D7",0x65AA],
+  ["EDBD",0x65AB],
+  ["94D8",0x65AC],
+  ["B6CF",0x65AD],
+  ["94D9",0x65AE],
+  ["CBB9",0x65AF],
+  ["D0C2",0x65B0],
+  ["94DA",0x65B1],
+  ["94DB",0x65B2],
+  ["94DC",0x65B3],
+  ["94DD",0x65B4],
+  ["94DE",0x65B5],
+  ["94DF",0x65B6],
+  ["94E0",0x65B7],
+  ["94E1",0x65B8],
+  ["B7BD",0x65B9],
+  ["94E2",0x65BA],
+  ["94E3",0x65BB],
+  ["ECB6",0x65BC],
+  ["CAA9",0x65BD],
+  ["94E4",0x65BE],
+  ["94E5",0x65BF],
+  ["94E6",0x65C0],
+  ["C5D4",0x65C1],
+  ["94E7",0x65C2],
+  ["ECB9",0x65C3],
+  ["ECB8",0x65C4],
+  ["C2C3",0x65C5],
+  ["ECB7",0x65C6],
+  ["94E8",0x65C7],
+  ["94E9",0x65C8],
+  ["94EA",0x65C9],
+  ["94EB",0x65CA],
+  ["D0FD",0x65CB],
+  ["ECBA",0x65CC],
+  ["94EC",0x65CD],
+  ["ECBB",0x65CE],
+  ["D7E5",0x65CF],
+  ["94ED",0x65D0],
+  ["94EE",0x65D1],
+  ["ECBC",0x65D2],
+  ["94EF",0x65D3],
+  ["94F0",0x65D4],
+  ["94F1",0x65D5],
+  ["ECBD",0x65D6],
+  ["C6EC",0x65D7],
+  ["94F2",0x65D8],
+  ["94F3",0x65D9],
+  ["94F4",0x65DA],
+  ["94F5",0x65DB],
+  ["94F6",0x65DC],
+  ["94F7",0x65DD],
+  ["94F8",0x65DE],
+  ["94F9",0x65DF],
+  ["CEDE",0x65E0],
+  ["94FA",0x65E1],
+  ["BCC8",0x65E2],
+  ["94FB",0x65E3],
+  ["94FC",0x65E4],
+  ["C8D5",0x65E5],
+  ["B5A9",0x65E6],
+  ["BEC9",0x65E7],
+  ["D6BC",0x65E8],
+  ["D4E7",0x65E9],
+  ["94FD",0x65EA],
+  ["94FE",0x65EB],
+  ["D1AE",0x65EC],
+  ["D0F1",0x65ED],
+  ["EAB8",0x65EE],
+  ["EAB9",0x65EF],
+  ["EABA",0x65F0],
+  ["BAB5",0x65F1],
+  ["9540",0x65F2],
+  ["9541",0x65F3],
+  ["9542",0x65F4],
+  ["9543",0x65F5],
+  ["CAB1",0x65F6],
+  ["BFF5",0x65F7],
+  ["9544",0x65F8],
+  ["9545",0x65F9],
+  ["CDFA",0x65FA],
+  ["9546",0x65FB],
+  ["9547",0x65FC],
+  ["9548",0x65FD],
+  ["9549",0x65FE],
+  ["954A",0x65FF],
+  ["EAC0",0x6600],
+  ["954B",0x6601],
+  ["B0BA",0x6602],
+  ["EABE",0x6603],
+  ["954C",0x6604],
+  ["954D",0x6605],
+  ["C0A5",0x6606],
+  ["954E",0x6607],
+  ["954F",0x6608],
+  ["9550",0x6609],
+  ["EABB",0x660A],
+  ["9551",0x660B],
+  ["B2FD",0x660C],
+  ["9552",0x660D],
+  ["C3F7",0x660E],
+  ["BBE8",0x660F],
+  ["9553",0x6610],
+  ["9554",0x6611],
+  ["9555",0x6612],
+  ["D2D7",0x6613],
+  ["CEF4",0x6614],
+  ["EABF",0x6615],
+  ["9556",0x6616],
+  ["9557",0x6617],
+  ["9558",0x6618],
+  ["EABC",0x6619],
+  ["9559",0x661A],
+  ["955A",0x661B],
+  ["955B",0x661C],
+  ["EAC3",0x661D],
+  ["955C",0x661E],
+  ["D0C7",0x661F],
+  ["D3B3",0x6620],
+  ["955D",0x6621],
+  ["955E",0x6622],
+  ["955F",0x6623],
+  ["9560",0x6624],
+  ["B4BA",0x6625],
+  ["9561",0x6626],
+  ["C3C1",0x6627],
+  ["D7F2",0x6628],
+  ["9562",0x6629],
+  ["9563",0x662A],
+  ["9564",0x662B],
+  ["9565",0x662C],
+  ["D5D1",0x662D],
+  ["9566",0x662E],
+  ["CAC7",0x662F],
+  ["9567",0x6630],
+  ["EAC5",0x6631],
+  ["9568",0x6632],
+  ["9569",0x6633],
+  ["EAC4",0x6634],
+  ["EAC7",0x6635],
+  ["EAC6",0x6636],
+  ["956A",0x6637],
+  ["956B",0x6638],
+  ["956C",0x6639],
+  ["956D",0x663A],
+  ["956E",0x663B],
+  ["D6E7",0x663C],
+  ["956F",0x663D],
+  ["CFD4",0x663E],
+  ["9570",0x663F],
+  ["9571",0x6640],
+  ["EACB",0x6641],
+  ["9572",0x6642],
+  ["BBCE",0x6643],
+  ["9573",0x6644],
+  ["9574",0x6645],
+  ["9575",0x6646],
+  ["9576",0x6647],
+  ["9577",0x6648],
+  ["9578",0x6649],
+  ["9579",0x664A],
+  ["BDFA",0x664B],
+  ["C9CE",0x664C],
+  ["957A",0x664D],
+  ["957B",0x664E],
+  ["EACC",0x664F],
+  ["957C",0x6650],
+  ["957D",0x6651],
+  ["C9B9",0x6652],
+  ["CFFE",0x6653],
+  ["EACA",0x6654],
+  ["D4CE",0x6655],
+  ["EACD",0x6656],
+  ["EACF",0x6657],
+  ["957E",0x6658],
+  ["9580",0x6659],
+  ["CDED",0x665A],
+  ["9581",0x665B],
+  ["9582",0x665C],
+  ["9583",0x665D],
+  ["9584",0x665E],
+  ["EAC9",0x665F],
+  ["9585",0x6660],
+  ["EACE",0x6661],
+  ["9586",0x6662],
+  ["9587",0x6663],
+  ["CEEE",0x6664],
+  ["9588",0x6665],
+  ["BBDE",0x6666],
+  ["9589",0x6667],
+  ["B3BF",0x6668],
+  ["958A",0x6669],
+  ["958B",0x666A],
+  ["958C",0x666B],
+  ["958D",0x666C],
+  ["958E",0x666D],
+  ["C6D5",0x666E],
+  ["BEB0",0x666F],
+  ["CEFA",0x6670],
+  ["958F",0x6671],
+  ["9590",0x6672],
+  ["9591",0x6673],
+  ["C7E7",0x6674],
+  ["9592",0x6675],
+  ["BEA7",0x6676],
+  ["EAD0",0x6677],
+  ["9593",0x6678],
+  ["9594",0x6679],
+  ["D6C7",0x667A],
+  ["9595",0x667B],
+  ["9596",0x667C],
+  ["9597",0x667D],
+  ["C1C0",0x667E],
+  ["9598",0x667F],
+  ["9599",0x6680],
+  ["959A",0x6681],
+  ["D4DD",0x6682],
+  ["959B",0x6683],
+  ["EAD1",0x6684],
+  ["959C",0x6685],
+  ["959D",0x6686],
+  ["CFBE",0x6687],
+  ["959E",0x6688],
+  ["959F",0x6689],
+  ["95A0",0x668A],
+  ["95A1",0x668B],
+  ["EAD2",0x668C],
+  ["95A2",0x668D],
+  ["95A3",0x668E],
+  ["95A4",0x668F],
+  ["95A5",0x6690],
+  ["CAEE",0x6691],
+  ["95A6",0x6692],
+  ["95A7",0x6693],
+  ["95A8",0x6694],
+  ["95A9",0x6695],
+  ["C5AF",0x6696],
+  ["B0B5",0x6697],
+  ["95AA",0x6698],
+  ["95AB",0x6699],
+  ["95AC",0x669A],
+  ["95AD",0x669B],
+  ["95AE",0x669C],
+  ["EAD4",0x669D],
+  ["95AF",0x669E],
+  ["95B0",0x669F],
+  ["95B1",0x66A0],
+  ["95B2",0x66A1],
+  ["95B3",0x66A2],
+  ["95B4",0x66A3],
+  ["95B5",0x66A4],
+  ["95B6",0x66A5],
+  ["95B7",0x66A6],
+  ["EAD3",0x66A7],
+  ["F4DF",0x66A8],
+  ["95B8",0x66A9],
+  ["95B9",0x66AA],
+  ["95BA",0x66AB],
+  ["95BB",0x66AC],
+  ["95BC",0x66AD],
+  ["C4BA",0x66AE],
+  ["95BD",0x66AF],
+  ["95BE",0x66B0],
+  ["95BF",0x66B1],
+  ["95C0",0x66B2],
+  ["95C1",0x66B3],
+  ["B1A9",0x66B4],
+  ["95C2",0x66B5],
+  ["95C3",0x66B6],
+  ["95C4",0x66B7],
+  ["95C5",0x66B8],
+  ["E5DF",0x66B9],
+  ["95C6",0x66BA],
+  ["95C7",0x66BB],
+  ["95C8",0x66BC],
+  ["95C9",0x66BD],
+  ["EAD5",0x66BE],
+  ["95CA",0x66BF],
+  ["95CB",0x66C0],
+  ["95CC",0x66C1],
+  ["95CD",0x66C2],
+  ["95CE",0x66C3],
+  ["95CF",0x66C4],
+  ["95D0",0x66C5],
+  ["95D1",0x66C6],
+  ["95D2",0x66C7],
+  ["95D3",0x66C8],
+  ["95D4",0x66C9],
+  ["95D5",0x66CA],
+  ["95D6",0x66CB],
+  ["95D7",0x66CC],
+  ["95D8",0x66CD],
+  ["95D9",0x66CE],
+  ["95DA",0x66CF],
+  ["95DB",0x66D0],
+  ["95DC",0x66D1],
+  ["95DD",0x66D2],
+  ["95DE",0x66D3],
+  ["95DF",0x66D4],
+  ["95E0",0x66D5],
+  ["95E1",0x66D6],
+  ["95E2",0x66D7],
+  ["95E3",0x66D8],
+  ["CAEF",0x66D9],
+  ["95E4",0x66DA],
+  ["EAD6",0x66DB],
+  ["EAD7",0x66DC],
+  ["C6D8",0x66DD],
+  ["95E5",0x66DE],
+  ["95E6",0x66DF],
+  ["95E7",0x66E0],
+  ["95E8",0x66E1],
+  ["95E9",0x66E2],
+  ["95EA",0x66E3],
+  ["95EB",0x66E4],
+  ["95EC",0x66E5],
+  ["EAD8",0x66E6],
+  ["95ED",0x66E7],
+  ["95EE",0x66E8],
+  ["EAD9",0x66E9],
+  ["95EF",0x66EA],
+  ["95F0",0x66EB],
+  ["95F1",0x66EC],
+  ["95F2",0x66ED],
+  ["95F3",0x66EE],
+  ["95F4",0x66EF],
+  ["D4BB",0x66F0],
+  ["95F5",0x66F1],
+  ["C7FA",0x66F2],
+  ["D2B7",0x66F3],
+  ["B8FC",0x66F4],
+  ["95F6",0x66F5],
+  ["95F7",0x66F6],
+  ["EAC2",0x66F7],
+  ["95F8",0x66F8],
+  ["B2DC",0x66F9],
+  ["95F9",0x66FA],
+  ["95FA",0x66FB],
+  ["C2FC",0x66FC],
+  ["95FB",0x66FD],
+  ["D4F8",0x66FE],
+  ["CCE6",0x66FF],
+  ["D7EE",0x6700],
+  ["95FC",0x6701],
+  ["95FD",0x6702],
+  ["95FE",0x6703],
+  ["9640",0x6704],
+  ["9641",0x6705],
+  ["9642",0x6706],
+  ["9643",0x6707],
+  ["D4C2",0x6708],
+  ["D3D0",0x6709],
+  ["EBC3",0x670A],
+  ["C5F3",0x670B],
+  ["9644",0x670C],
+  ["B7FE",0x670D],
+  ["9645",0x670E],
+  ["9646",0x670F],
+  ["EBD4",0x6710],
+  ["9647",0x6711],
+  ["9648",0x6712],
+  ["9649",0x6713],
+  ["CBB7",0x6714],
+  ["EBDE",0x6715],
+  ["964A",0x6716],
+  ["C0CA",0x6717],
+  ["964B",0x6718],
+  ["964C",0x6719],
+  ["964D",0x671A],
+  ["CDFB",0x671B],
+  ["964E",0x671C],
+  ["B3AF",0x671D],
+  ["964F",0x671E],
+  ["C6DA",0x671F],
+  ["9650",0x6720],
+  ["9651",0x6721],
+  ["9652",0x6722],
+  ["9653",0x6723],
+  ["9654",0x6724],
+  ["9655",0x6725],
+  ["EBFC",0x6726],
+  ["9656",0x6727],
+  ["C4BE",0x6728],
+  ["9657",0x6729],
+  ["CEB4",0x672A],
+  ["C4A9",0x672B],
+  ["B1BE",0x672C],
+  ["D4FD",0x672D],
+  ["9658",0x672E],
+  ["CAF5",0x672F],
+  ["9659",0x6730],
+  ["D6EC",0x6731],
+  ["965A",0x6732],
+  ["965B",0x6733],
+  ["C6D3",0x6734],
+  ["B6E4",0x6735],
+  ["965C",0x6736],
+  ["965D",0x6737],
+  ["965E",0x6738],
+  ["965F",0x6739],
+  ["BBFA",0x673A],
+  ["9660",0x673B],
+  ["9661",0x673C],
+  ["D0E0",0x673D],
+  ["9662",0x673E],
+  ["9663",0x673F],
+  ["C9B1",0x6740],
+  ["9664",0x6741],
+  ["D4D3",0x6742],
+  ["C8A8",0x6743],
+  ["9665",0x6744],
+  ["9666",0x6745],
+  ["B8CB",0x6746],
+  ["9667",0x6747],
+  ["E8BE",0x6748],
+  ["C9BC",0x6749],
+  ["9668",0x674A],
+  ["9669",0x674B],
+  ["E8BB",0x674C],
+  ["966A",0x674D],
+  ["C0EE",0x674E],
+  ["D0D3",0x674F],
+  ["B2C4",0x6750],
+  ["B4E5",0x6751],
+  ["966B",0x6752],
+  ["E8BC",0x6753],
+  ["966C",0x6754],
+  ["966D",0x6755],
+  ["D5C8",0x6756],
+  ["966E",0x6757],
+  ["966F",0x6758],
+  ["9670",0x6759],
+  ["9671",0x675A],
+  ["9672",0x675B],
+  ["B6C5",0x675C],
+  ["9673",0x675D],
+  ["E8BD",0x675E],
+  ["CAF8",0x675F],
+  ["B8DC",0x6760],
+  ["CCF5",0x6761],
+  ["9674",0x6762],
+  ["9675",0x6763],
+  ["9676",0x6764],
+  ["C0B4",0x6765],
+  ["9677",0x6766],
+  ["9678",0x6767],
+  ["D1EE",0x6768],
+  ["E8BF",0x6769],
+  ["E8C2",0x676A],
+  ["9679",0x676B],
+  ["967A",0x676C],
+  ["BABC",0x676D],
+  ["967B",0x676E],
+  ["B1AD",0x676F],
+  ["BDDC",0x6770],
+  ["967C",0x6771],
+  ["EABD",0x6772],
+  ["E8C3",0x6773],
+  ["967D",0x6774],
+  ["E8C6",0x6775],
+  ["967E",0x6776],
+  ["E8CB",0x6777],
+  ["9680",0x6778],
+  ["9681",0x6779],
+  ["9682",0x677A],
+  ["9683",0x677B],
+  ["E8CC",0x677C],
+  ["9684",0x677D],
+  ["CBC9",0x677E],
+  ["B0E5",0x677F],
+  ["9685",0x6780],
+  ["BCAB",0x6781],
+  ["9686",0x6782],
+  ["9687",0x6783],
+  ["B9B9",0x6784],
+  ["9688",0x6785],
+  ["9689",0x6786],
+  ["E8C1",0x6787],
+  ["968A",0x6788],
+  ["CDF7",0x6789],
+  ["968B",0x678A],
+  ["E8CA",0x678B],
+  ["968C",0x678C],
+  ["968D",0x678D],
+  ["968E",0x678E],
+  ["968F",0x678F],
+  ["CEF6",0x6790],
+  ["9690",0x6791],
+  ["9691",0x6792],
+  ["9692",0x6793],
+  ["9693",0x6794],
+  ["D5ED",0x6795],
+  ["9694",0x6796],
+  ["C1D6",0x6797],
+  ["E8C4",0x6798],
+  ["9695",0x6799],
+  ["C3B6",0x679A],
+  ["9696",0x679B],
+  ["B9FB",0x679C],
+  ["D6A6",0x679D],
+  ["E8C8",0x679E],
+  ["9697",0x679F],
+  ["9698",0x67A0],
+  ["9699",0x67A1],
+  ["CAE0",0x67A2],
+  ["D4E6",0x67A3],
+  ["969A",0x67A4],
+  ["E8C0",0x67A5],
+  ["969B",0x67A6],
+  ["E8C5",0x67A7],
+  ["E8C7",0x67A8],
+  ["969C",0x67A9],
+  ["C7B9",0x67AA],
+  ["B7E3",0x67AB],
+  ["969D",0x67AC],
+  ["E8C9",0x67AD],
+  ["969E",0x67AE],
+  ["BFDD",0x67AF],
+  ["E8D2",0x67B0],
+  ["969F",0x67B1],
+  ["96A0",0x67B2],
+  ["E8D7",0x67B3],
+  ["96A1",0x67B4],
+  ["E8D5",0x67B5],
+  ["BCDC",0x67B6],
+  ["BCCF",0x67B7],
+  ["E8DB",0x67B8],
+  ["96A2",0x67B9],
+  ["96A3",0x67BA],
+  ["96A4",0x67BB],
+  ["96A5",0x67BC],
+  ["96A6",0x67BD],
+  ["96A7",0x67BE],
+  ["96A8",0x67BF],
+  ["96A9",0x67C0],
+  ["E8DE",0x67C1],
+  ["96AA",0x67C2],
+  ["E8DA",0x67C3],
+  ["B1FA",0x67C4],
+  ["96AB",0x67C5],
+  ["96AC",0x67C6],
+  ["96AD",0x67C7],
+  ["96AE",0x67C8],
+  ["96AF",0x67C9],
+  ["96B0",0x67CA],
+  ["96B1",0x67CB],
+  ["96B2",0x67CC],
+  ["96B3",0x67CD],
+  ["96B4",0x67CE],
+  ["B0D8",0x67CF],
+  ["C4B3",0x67D0],
+  ["B8CC",0x67D1],
+  ["C6E2",0x67D2],
+  ["C8BE",0x67D3],
+  ["C8E1",0x67D4],
+  ["96B5",0x67D5],
+  ["96B6",0x67D6],
+  ["96B7",0x67D7],
+  ["E8CF",0x67D8],
+  ["E8D4",0x67D9],
+  ["E8D6",0x67DA],
+  ["96B8",0x67DB],
+  ["B9F1",0x67DC],
+  ["E8D8",0x67DD],
+  ["D7F5",0x67DE],
+  ["96B9",0x67DF],
+  ["C4FB",0x67E0],
+  ["96BA",0x67E1],
+  ["E8DC",0x67E2],
+  ["96BB",0x67E3],
+  ["96BC",0x67E4],
+  ["B2E9",0x67E5],
+  ["96BD",0x67E6],
+  ["96BE",0x67E7],
+  ["96BF",0x67E8],
+  ["E8D1",0x67E9],
+  ["96C0",0x67EA],
+  ["96C1",0x67EB],
+  ["BCED",0x67EC],
+  ["96C2",0x67ED],
+  ["96C3",0x67EE],
+  ["BFC2",0x67EF],
+  ["E8CD",0x67F0],
+  ["D6F9",0x67F1],
+  ["96C4",0x67F2],
+  ["C1F8",0x67F3],
+  ["B2F1",0x67F4],
+  ["96C5",0x67F5],
+  ["96C6",0x67F6],
+  ["96C7",0x67F7],
+  ["96C8",0x67F8],
+  ["96C9",0x67F9],
+  ["96CA",0x67FA],
+  ["96CB",0x67FB],
+  ["96CC",0x67FC],
+  ["E8DF",0x67FD],
+  ["96CD",0x67FE],
+  ["CAC1",0x67FF],
+  ["E8D9",0x6800],
+  ["96CE",0x6801],
+  ["96CF",0x6802],
+  ["96D0",0x6803],
+  ["96D1",0x6804],
+  ["D5A4",0x6805],
+  ["96D2",0x6806],
+  ["B1EA",0x6807],
+  ["D5BB",0x6808],
+  ["E8CE",0x6809],
+  ["E8D0",0x680A],
+  ["B6B0",0x680B],
+  ["E8D3",0x680C],
+  ["96D3",0x680D],
+  ["E8DD",0x680E],
+  ["C0B8",0x680F],
+  ["96D4",0x6810],
+  ["CAF7",0x6811],
+  ["96D5",0x6812],
+  ["CBA8",0x6813],
+  ["96D6",0x6814],
+  ["96D7",0x6815],
+  ["C6DC",0x6816],
+  ["C0F5",0x6817],
+  ["96D8",0x6818],
+  ["96D9",0x6819],
+  ["96DA",0x681A],
+  ["96DB",0x681B],
+  ["96DC",0x681C],
+  ["E8E9",0x681D],
+  ["96DD",0x681E],
+  ["96DE",0x681F],
+  ["96DF",0x6820],
+  ["D0A3",0x6821],
+  ["96E0",0x6822],
+  ["96E1",0x6823],
+  ["96E2",0x6824],
+  ["96E3",0x6825],
+  ["96E4",0x6826],
+  ["96E5",0x6827],
+  ["96E6",0x6828],
+  ["E8F2",0x6829],
+  ["D6EA",0x682A],
+  ["96E7",0x682B],
+  ["96E8",0x682C],
+  ["96E9",0x682D],
+  ["96EA",0x682E],
+  ["96EB",0x682F],
+  ["96EC",0x6830],
+  ["96ED",0x6831],
+  ["E8E0",0x6832],
+  ["E8E1",0x6833],
+  ["96EE",0x6834],
+  ["96EF",0x6835],
+  ["96F0",0x6836],
+  ["D1F9",0x6837],
+  ["BACB",0x6838],
+  ["B8F9",0x6839],
+  ["96F1",0x683A],
+  ["96F2",0x683B],
+  ["B8F1",0x683C],
+  ["D4D4",0x683D],
+  ["E8EF",0x683E],
+  ["96F3",0x683F],
+  ["E8EE",0x6840],
+  ["E8EC",0x6841],
+  ["B9F0",0x6842],
+  ["CCD2",0x6843],
+  ["E8E6",0x6844],
+  ["CEA6",0x6845],
+  ["BFF2",0x6846],
+  ["96F4",0x6847],
+  ["B0B8",0x6848],
+  ["E8F1",0x6849],
+  ["E8F0",0x684A],
+  ["96F5",0x684B],
+  ["D7C0",0x684C],
+  ["96F6",0x684D],
+  ["E8E4",0x684E],
+  ["96F7",0x684F],
+  ["CDA9",0x6850],
+  ["C9A3",0x6851],
+  ["96F8",0x6852],
+  ["BBB8",0x6853],
+  ["BDDB",0x6854],
+  ["E8EA",0x6855],
+  ["96F9",0x6856],
+  ["96FA",0x6857],
+  ["96FB",0x6858],
+  ["96FC",0x6859],
+  ["96FD",0x685A],
+  ["96FE",0x685B],
+  ["9740",0x685C],
+  ["9741",0x685D],
+  ["9742",0x685E],
+  ["9743",0x685F],
+  ["E8E2",0x6860],
+  ["E8E3",0x6861],
+  ["E8E5",0x6862],
+  ["B5B5",0x6863],
+  ["E8E7",0x6864],
+  ["C7C5",0x6865],
+  ["E8EB",0x6866],
+  ["E8ED",0x6867],
+  ["BDB0",0x6868],
+  ["D7AE",0x6869],
+  ["9744",0x686A],
+  ["E8F8",0x686B],
+  ["9745",0x686C],
+  ["9746",0x686D],
+  ["9747",0x686E],
+  ["9748",0x686F],
+  ["9749",0x6870],
+  ["974A",0x6871],
+  ["974B",0x6872],
+  ["974C",0x6873],
+  ["E8F5",0x6874],
+  ["974D",0x6875],
+  ["CDB0",0x6876],
+  ["E8F6",0x6877],
+  ["974E",0x6878],
+  ["974F",0x6879],
+  ["9750",0x687A],
+  ["9751",0x687B],
+  ["9752",0x687C],
+  ["9753",0x687D],
+  ["9754",0x687E],
+  ["9755",0x687F],
+  ["9756",0x6880],
+  ["C1BA",0x6881],
+  ["9757",0x6882],
+  ["E8E8",0x6883],
+  ["9758",0x6884],
+  ["C3B7",0x6885],
+  ["B0F0",0x6886],
+  ["9759",0x6887],
+  ["975A",0x6888],
+  ["975B",0x6889],
+  ["975C",0x688A],
+  ["975D",0x688B],
+  ["975E",0x688C],
+  ["975F",0x688D],
+  ["9760",0x688E],
+  ["E8F4",0x688F],
+  ["9761",0x6890],
+  ["9762",0x6891],
+  ["9763",0x6892],
+  ["E8F7",0x6893],
+  ["9764",0x6894],
+  ["9765",0x6895],
+  ["9766",0x6896],
+  ["B9A3",0x6897],
+  ["9767",0x6898],
+  ["9768",0x6899],
+  ["9769",0x689A],
+  ["976A",0x689B],
+  ["976B",0x689C],
+  ["976C",0x689D],
+  ["976D",0x689E],
+  ["976E",0x689F],
+  ["976F",0x68A0],
+  ["9770",0x68A1],
+  ["C9D2",0x68A2],
+  ["9771",0x68A3],
+  ["9772",0x68A4],
+  ["9773",0x68A5],
+  ["C3CE",0x68A6],
+  ["CEE0",0x68A7],
+  ["C0E6",0x68A8],
+  ["9774",0x68A9],
+  ["9775",0x68AA],
+  ["9776",0x68AB],
+  ["9777",0x68AC],
+  ["CBF3",0x68AD],
+  ["9778",0x68AE],
+  ["CCDD",0x68AF],
+  ["D0B5",0x68B0],
+  ["9779",0x68B1],
+  ["977A",0x68B2],
+  ["CAE1",0x68B3],
+  ["977B",0x68B4],
+  ["E8F3",0x68B5],
+  ["977C",0x68B6],
+  ["977D",0x68B7],
+  ["977E",0x68B8],
+  ["9780",0x68B9],
+  ["9781",0x68BA],
+  ["9782",0x68BB],
+  ["9783",0x68BC],
+  ["9784",0x68BD],
+  ["9785",0x68BE],
+  ["9786",0x68BF],
+  ["BCEC",0x68C0],
+  ["9787",0x68C1],
+  ["E8F9",0x68C2],
+  ["9788",0x68C3],
+  ["9789",0x68C4],
+  ["978A",0x68C5],
+  ["978B",0x68C6],
+  ["978C",0x68C7],
+  ["978D",0x68C8],
+  ["C3DE",0x68C9],
+  ["978E",0x68CA],
+  ["C6E5",0x68CB],
+  ["978F",0x68CC],
+  ["B9F7",0x68CD],
+  ["9790",0x68CE],
+  ["9791",0x68CF],
+  ["9792",0x68D0],
+  ["9793",0x68D1],
+  ["B0F4",0x68D2],
+  ["9794",0x68D3],
+  ["9795",0x68D4],
+  ["D7D8",0x68D5],
+  ["9796",0x68D6],
+  ["9797",0x68D7],
+  ["BCAC",0x68D8],
+  ["9798",0x68D9],
+  ["C5EF",0x68DA],
+  ["9799",0x68DB],
+  ["979A",0x68DC],
+  ["979B",0x68DD],
+  ["979C",0x68DE],
+  ["979D",0x68DF],
+  ["CCC4",0x68E0],
+  ["979E",0x68E1],
+  ["979F",0x68E2],
+  ["E9A6",0x68E3],
+  ["97A0",0x68E4],
+  ["97A1",0x68E5],
+  ["97A2",0x68E6],
+  ["97A3",0x68E7],
+  ["97A4",0x68E8],
+  ["97A5",0x68E9],
+  ["97A6",0x68EA],
+  ["97A7",0x68EB],
+  ["97A8",0x68EC],
+  ["97A9",0x68ED],
+  ["C9AD",0x68EE],
+  ["97AA",0x68EF],
+  ["E9A2",0x68F0],
+  ["C0E2",0x68F1],
+  ["97AB",0x68F2],
+  ["97AC",0x68F3],
+  ["97AD",0x68F4],
+  ["BFC3",0x68F5],
+  ["97AE",0x68F6],
+  ["97AF",0x68F7],
+  ["97B0",0x68F8],
+  ["E8FE",0x68F9],
+  ["B9D7",0x68FA],
+  ["97B1",0x68FB],
+  ["E8FB",0x68FC],
+  ["97B2",0x68FD],
+  ["97B3",0x68FE],
+  ["97B4",0x68FF],
+  ["97B5",0x6900],
+  ["E9A4",0x6901],
+  ["97B6",0x6902],
+  ["97B7",0x6903],
+  ["97B8",0x6904],
+  ["D2CE",0x6905],
+  ["97B9",0x6906],
+  ["97BA",0x6907],
+  ["97BB",0x6908],
+  ["97BC",0x6909],
+  ["97BD",0x690A],
+  ["E9A3",0x690B],
+  ["97BE",0x690C],
+  ["D6B2",0x690D],
+  ["D7B5",0x690E],
+  ["97BF",0x690F],
+  ["E9A7",0x6910],
+  ["97C0",0x6911],
+  ["BDB7",0x6912],
+  ["97C1",0x6913],
+  ["97C2",0x6914],
+  ["97C3",0x6915],
+  ["97C4",0x6916],
+  ["97C5",0x6917],
+  ["97C6",0x6918],
+  ["97C7",0x6919],
+  ["97C8",0x691A],
+  ["97C9",0x691B],
+  ["97CA",0x691C],
+  ["97CB",0x691D],
+  ["97CC",0x691E],
+  ["E8FC",0x691F],
+  ["E8FD",0x6920],
+  ["97CD",0x6921],
+  ["97CE",0x6922],
+  ["97CF",0x6923],
+  ["E9A1",0x6924],
+  ["97D0",0x6925],
+  ["97D1",0x6926],
+  ["97D2",0x6927],
+  ["97D3",0x6928],
+  ["97D4",0x6929],
+  ["97D5",0x692A],
+  ["97D6",0x692B],
+  ["97D7",0x692C],
+  ["CDD6",0x692D],
+  ["97D8",0x692E],
+  ["97D9",0x692F],
+  ["D2AC",0x6930],
+  ["97DA",0x6931],
+  ["97DB",0x6932],
+  ["97DC",0x6933],
+  ["E9B2",0x6934],
+  ["97DD",0x6935],
+  ["97DE",0x6936],
+  ["97DF",0x6937],
+  ["97E0",0x6938],
+  ["E9A9",0x6939],
+  ["97E1",0x693A],
+  ["97E2",0x693B],
+  ["97E3",0x693C],
+  ["B4AA",0x693D],
+  ["97E4",0x693E],
+  ["B4BB",0x693F],
+  ["97E5",0x6940],
+  ["97E6",0x6941],
+  ["E9AB",0x6942],
+  ["97E7",0x6943],
+  ["97E8",0x6944],
+  ["97E9",0x6945],
+  ["97EA",0x6946],
+  ["97EB",0x6947],
+  ["97EC",0x6948],
+  ["97ED",0x6949],
+  ["97EE",0x694A],
+  ["97EF",0x694B],
+  ["97F0",0x694C],
+  ["97F1",0x694D],
+  ["97F2",0x694E],
+  ["97F3",0x694F],
+  ["97F4",0x6950],
+  ["97F5",0x6951],
+  ["97F6",0x6952],
+  ["97F7",0x6953],
+  ["D0A8",0x6954],
+  ["97F8",0x6955],
+  ["97F9",0x6956],
+  ["E9A5",0x6957],
+  ["97FA",0x6958],
+  ["97FB",0x6959],
+  ["B3FE",0x695A],
+  ["97FC",0x695B],
+  ["97FD",0x695C],
+  ["E9AC",0x695D],
+  ["C0E3",0x695E],
+  ["97FE",0x695F],
+  ["E9AA",0x6960],
+  ["9840",0x6961],
+  ["9841",0x6962],
+  ["E9B9",0x6963],
+  ["9842",0x6964],
+  ["9843",0x6965],
+  ["E9B8",0x6966],
+  ["9844",0x6967],
+  ["9845",0x6968],
+  ["9846",0x6969],
+  ["9847",0x696A],
+  ["E9AE",0x696B],
+  ["9848",0x696C],
+  ["9849",0x696D],
+  ["E8FA",0x696E],
+  ["984A",0x696F],
+  ["984B",0x6970],
+  ["E9A8",0x6971],
+  ["984C",0x6972],
+  ["984D",0x6973],
+  ["984E",0x6974],
+  ["984F",0x6975],
+  ["9850",0x6976],
+  ["BFAC",0x6977],
+  ["E9B1",0x6978],
+  ["E9BA",0x6979],
+  ["9851",0x697A],
+  ["9852",0x697B],
+  ["C2A5",0x697C],
+  ["9853",0x697D],
+  ["9854",0x697E],
+  ["9855",0x697F],
+  ["E9AF",0x6980],
+  ["9856",0x6981],
+  ["B8C5",0x6982],
+  ["9857",0x6983],
+  ["E9AD",0x6984],
+  ["9858",0x6985],
+  ["D3DC",0x6986],
+  ["E9B4",0x6987],
+  ["E9B5",0x6988],
+  ["E9B7",0x6989],
+  ["9859",0x698A],
+  ["985A",0x698B],
+  ["985B",0x698C],
+  ["E9C7",0x698D],
+  ["985C",0x698E],
+  ["985D",0x698F],
+  ["985E",0x6990],
+  ["985F",0x6991],
+  ["9860",0x6992],
+  ["9861",0x6993],
+  ["C0C6",0x6994],
+  ["E9C5",0x6995],
+  ["9862",0x6996],
+  ["9863",0x6997],
+  ["E9B0",0x6998],
+  ["9864",0x6999],
+  ["9865",0x699A],
+  ["E9BB",0x699B],
+  ["B0F1",0x699C],
+  ["9866",0x699D],
+  ["9867",0x699E],
+  ["9868",0x699F],
+  ["9869",0x69A0],
+  ["986A",0x69A1],
+  ["986B",0x69A2],
+  ["986C",0x69A3],
+  ["986D",0x69A4],
+  ["986E",0x69A5],
+  ["986F",0x69A6],
+  ["E9BC",0x69A7],
+  ["D5A5",0x69A8],
+  ["9870",0x69A9],
+  ["9871",0x69AA],
+  ["E9BE",0x69AB],
+  ["9872",0x69AC],
+  ["E9BF",0x69AD],
+  ["9873",0x69AE],
+  ["9874",0x69AF],
+  ["9875",0x69B0],
+  ["E9C1",0x69B1],
+  ["9876",0x69B2],
+  ["9877",0x69B3],
+  ["C1F1",0x69B4],
+  ["9878",0x69B5],
+  ["9879",0x69B6],
+  ["C8B6",0x69B7],
+  ["987A",0x69B8],
+  ["987B",0x69B9],
+  ["987C",0x69BA],
+  ["E9BD",0x69BB],
+  ["987D",0x69BC],
+  ["987E",0x69BD],
+  ["9880",0x69BE],
+  ["9881",0x69BF],
+  ["9882",0x69C0],
+  ["E9C2",0x69C1],
+  ["9883",0x69C2],
+  ["9884",0x69C3],
+  ["9885",0x69C4],
+  ["9886",0x69C5],
+  ["9887",0x69C6],
+  ["9888",0x69C7],
+  ["9889",0x69C8],
+  ["988A",0x69C9],
+  ["E9C3",0x69CA],
+  ["988B",0x69CB],
+  ["E9B3",0x69CC],
+  ["988C",0x69CD],
+  ["E9B6",0x69CE],
+  ["988D",0x69CF],
+  ["BBB1",0x69D0],
+  ["988E",0x69D1],
+  ["988F",0x69D2],
+  ["9890",0x69D3],
+  ["E9C0",0x69D4],
+  ["9891",0x69D5],
+  ["9892",0x69D6],
+  ["9893",0x69D7],
+  ["9894",0x69D8],
+  ["9895",0x69D9],
+  ["9896",0x69DA],
+  ["BCF7",0x69DB],
+  ["9897",0x69DC],
+  ["9898",0x69DD],
+  ["9899",0x69DE],
+  ["E9C4",0x69DF],
+  ["E9C6",0x69E0],
+  ["989A",0x69E1],
+  ["989B",0x69E2],
+  ["989C",0x69E3],
+  ["989D",0x69E4],
+  ["989E",0x69E5],
+  ["989F",0x69E6],
+  ["98A0",0x69E7],
+  ["98A1",0x69E8],
+  ["98A2",0x69E9],
+  ["98A3",0x69EA],
+  ["98A4",0x69EB],
+  ["98A5",0x69EC],
+  ["E9CA",0x69ED],
+  ["98A6",0x69EE],
+  ["98A7",0x69EF],
+  ["98A8",0x69F0],
+  ["98A9",0x69F1],
+  ["E9CE",0x69F2],
+  ["98AA",0x69F3],
+  ["98AB",0x69F4],
+  ["98AC",0x69F5],
+  ["98AD",0x69F6],
+  ["98AE",0x69F7],
+  ["98AF",0x69F8],
+  ["98B0",0x69F9],
+  ["98B1",0x69FA],
+  ["98B2",0x69FB],
+  ["98B3",0x69FC],
+  ["B2DB",0x69FD],
+  ["98B4",0x69FE],
+  ["E9C8",0x69FF],
+  ["98B5",0x6A00],
+  ["98B6",0x6A01],
+  ["98B7",0x6A02],
+  ["98B8",0x6A03],
+  ["98B9",0x6A04],
+  ["98BA",0x6A05],
+  ["98BB",0x6A06],
+  ["98BC",0x6A07],
+  ["98BD",0x6A08],
+  ["98BE",0x6A09],
+  ["B7AE",0x6A0A],
+  ["98BF",0x6A0B],
+  ["98C0",0x6A0C],
+  ["98C1",0x6A0D],
+  ["98C2",0x6A0E],
+  ["98C3",0x6A0F],
+  ["98C4",0x6A10],
+  ["98C5",0x6A11],
+  ["98C6",0x6A12],
+  ["98C7",0x6A13],
+  ["98C8",0x6A14],
+  ["98C9",0x6A15],
+  ["98CA",0x6A16],
+  ["E9CB",0x6A17],
+  ["E9CC",0x6A18],
+  ["98CB",0x6A19],
+  ["98CC",0x6A1A],
+  ["98CD",0x6A1B],
+  ["98CE",0x6A1C],
+  ["98CF",0x6A1D],
+  ["98D0",0x6A1E],
+  ["D5C1",0x6A1F],
+  ["98D1",0x6A20],
+  ["C4A3",0x6A21],
+  ["98D2",0x6A22],
+  ["98D3",0x6A23],
+  ["98D4",0x6A24],
+  ["98D5",0x6A25],
+  ["98D6",0x6A26],
+  ["98D7",0x6A27],
+  ["E9D8",0x6A28],
+  ["98D8",0x6A29],
+  ["BAE1",0x6A2A],
+  ["98D9",0x6A2B],
+  ["98DA",0x6A2C],
+  ["98DB",0x6A2D],
+  ["98DC",0x6A2E],
+  ["E9C9",0x6A2F],
+  ["98DD",0x6A30],
+  ["D3A3",0x6A31],
+  ["98DE",0x6A32],
+  ["98DF",0x6A33],
+  ["98E0",0x6A34],
+  ["E9D4",0x6A35],
+  ["98E1",0x6A36],
+  ["98E2",0x6A37],
+  ["98E3",0x6A38],
+  ["98E4",0x6A39],
+  ["98E5",0x6A3A],
+  ["98E6",0x6A3B],
+  ["98E7",0x6A3C],
+  ["E9D7",0x6A3D],
+  ["E9D0",0x6A3E],
+  ["98E8",0x6A3F],
+  ["98E9",0x6A40],
+  ["98EA",0x6A41],
+  ["98EB",0x6A42],
+  ["98EC",0x6A43],
+  ["E9CF",0x6A44],
+  ["98ED",0x6A45],
+  ["98EE",0x6A46],
+  ["C7C1",0x6A47],
+  ["98EF",0x6A48],
+  ["98F0",0x6A49],
+  ["98F1",0x6A4A],
+  ["98F2",0x6A4B],
+  ["98F3",0x6A4C],
+  ["98F4",0x6A4D],
+  ["98F5",0x6A4E],
+  ["98F6",0x6A4F],
+  ["E9D2",0x6A50],
+  ["98F7",0x6A51],
+  ["98F8",0x6A52],
+  ["98F9",0x6A53],
+  ["98FA",0x6A54],
+  ["98FB",0x6A55],
+  ["98FC",0x6A56],
+  ["98FD",0x6A57],
+  ["E9D9",0x6A58],
+  ["B3C8",0x6A59],
+  ["98FE",0x6A5A],
+  ["E9D3",0x6A5B],
+  ["9940",0x6A5C],
+  ["9941",0x6A5D],
+  ["9942",0x6A5E],
+  ["9943",0x6A5F],
+  ["9944",0x6A60],
+  ["CFF0",0x6A61],
+  ["9945",0x6A62],
+  ["9946",0x6A63],
+  ["9947",0x6A64],
+  ["E9CD",0x6A65],
+  ["9948",0x6A66],
+  ["9949",0x6A67],
+  ["994A",0x6A68],
+  ["994B",0x6A69],
+  ["994C",0x6A6A],
+  ["994D",0x6A6B],
+  ["994E",0x6A6C],
+  ["994F",0x6A6D],
+  ["9950",0x6A6E],
+  ["9951",0x6A6F],
+  ["9952",0x6A70],
+  ["B3F7",0x6A71],
+  ["9953",0x6A72],
+  ["9954",0x6A73],
+  ["9955",0x6A74],
+  ["9956",0x6A75],
+  ["9957",0x6A76],
+  ["9958",0x6A77],
+  ["9959",0x6A78],
+  ["E9D6",0x6A79],
+  ["995A",0x6A7A],
+  ["995B",0x6A7B],
+  ["E9DA",0x6A7C],
+  ["995C",0x6A7D],
+  ["995D",0x6A7E],
+  ["995E",0x6A7F],
+  ["CCB4",0x6A80],
+  ["995F",0x6A81],
+  ["9960",0x6A82],
+  ["9961",0x6A83],
+  ["CFAD",0x6A84],
+  ["9962",0x6A85],
+  ["9963",0x6A86],
+  ["9964",0x6A87],
+  ["9965",0x6A88],
+  ["9966",0x6A89],
+  ["9967",0x6A8A],
+  ["9968",0x6A8B],
+  ["9969",0x6A8C],
+  ["996A",0x6A8D],
+  ["E9D5",0x6A8E],
+  ["996B",0x6A8F],
+  ["E9DC",0x6A90],
+  ["E9DB",0x6A91],
+  ["996C",0x6A92],
+  ["996D",0x6A93],
+  ["996E",0x6A94],
+  ["996F",0x6A95],
+  ["9970",0x6A96],
+  ["E9DE",0x6A97],
+  ["9971",0x6A98],
+  ["9972",0x6A99],
+  ["9973",0x6A9A],
+  ["9974",0x6A9B],
+  ["9975",0x6A9C],
+  ["9976",0x6A9D],
+  ["9977",0x6A9E],
+  ["9978",0x6A9F],
+  ["E9D1",0x6AA0],
+  ["9979",0x6AA1],
+  ["997A",0x6AA2],
+  ["997B",0x6AA3],
+  ["997C",0x6AA4],
+  ["997D",0x6AA5],
+  ["997E",0x6AA6],
+  ["9980",0x6AA7],
+  ["9981",0x6AA8],
+  ["E9DD",0x6AA9],
+  ["9982",0x6AAA],
+  ["E9DF",0x6AAB],
+  ["C3CA",0x6AAC],
+  ["9983",0x6AAD],
+  ["9984",0x6AAE],
+  ["9985",0x6AAF],
+  ["9986",0x6AB0],
+  ["9987",0x6AB1],
+  ["9988",0x6AB2],
+  ["9989",0x6AB3],
+  ["998A",0x6AB4],
+  ["998B",0x6AB5],
+  ["998C",0x6AB6],
+  ["998D",0x6AB7],
+  ["998E",0x6AB8],
+  ["998F",0x6AB9],
+  ["9990",0x6ABA],
+  ["9991",0x6ABB],
+  ["9992",0x6ABC],
+  ["9993",0x6ABD],
+  ["9994",0x6ABE],
+  ["9995",0x6ABF],
+  ["9996",0x6AC0],
+  ["9997",0x6AC1],
+  ["9998",0x6AC2],
+  ["9999",0x6AC3],
+  ["999A",0x6AC4],
+  ["999B",0x6AC5],
+  ["999C",0x6AC6],
+  ["999D",0x6AC7],
+  ["999E",0x6AC8],
+  ["999F",0x6AC9],
+  ["99A0",0x6ACA],
+  ["99A1",0x6ACB],
+  ["99A2",0x6ACC],
+  ["99A3",0x6ACD],
+  ["99A4",0x6ACE],
+  ["99A5",0x6ACF],
+  ["99A6",0x6AD0],
+  ["99A7",0x6AD1],
+  ["99A8",0x6AD2],
+  ["99A9",0x6AD3],
+  ["99AA",0x6AD4],
+  ["99AB",0x6AD5],
+  ["99AC",0x6AD6],
+  ["99AD",0x6AD7],
+  ["99AE",0x6AD8],
+  ["99AF",0x6AD9],
+  ["99B0",0x6ADA],
+  ["99B1",0x6ADB],
+  ["99B2",0x6ADC],
+  ["99B3",0x6ADD],
+  ["99B4",0x6ADE],
+  ["99B5",0x6ADF],
+  ["99B6",0x6AE0],
+  ["99B7",0x6AE1],
+  ["99B8",0x6AE2],
+  ["99B9",0x6AE3],
+  ["99BA",0x6AE4],
+  ["99BB",0x6AE5],
+  ["99BC",0x6AE6],
+  ["99BD",0x6AE7],
+  ["99BE",0x6AE8],
+  ["99BF",0x6AE9],
+  ["99C0",0x6AEA],
+  ["99C1",0x6AEB],
+  ["99C2",0x6AEC],
+  ["99C3",0x6AED],
+  ["99C4",0x6AEE],
+  ["99C5",0x6AEF],
+  ["99C6",0x6AF0],
+  ["99C7",0x6AF1],
+  ["99C8",0x6AF2],
+  ["99C9",0x6AF3],
+  ["99CA",0x6AF4],
+  ["99CB",0x6AF5],
+  ["99CC",0x6AF6],
+  ["99CD",0x6AF7],
+  ["99CE",0x6AF8],
+  ["99CF",0x6AF9],
+  ["99D0",0x6AFA],
+  ["99D1",0x6AFB],
+  ["99D2",0x6AFC],
+  ["99D3",0x6AFD],
+  ["99D4",0x6AFE],
+  ["99D5",0x6AFF],
+  ["99D6",0x6B00],
+  ["99D7",0x6B01],
+  ["99D8",0x6B02],
+  ["99D9",0x6B03],
+  ["99DA",0x6B04],
+  ["99DB",0x6B05],
+  ["99DC",0x6B06],
+  ["99DD",0x6B07],
+  ["99DE",0x6B08],
+  ["99DF",0x6B09],
+  ["99E0",0x6B0A],
+  ["99E1",0x6B0B],
+  ["99E2",0x6B0C],
+  ["99E3",0x6B0D],
+  ["99E4",0x6B0E],
+  ["99E5",0x6B0F],
+  ["99E6",0x6B10],
+  ["99E7",0x6B11],
+  ["99E8",0x6B12],
+  ["99E9",0x6B13],
+  ["99EA",0x6B14],
+  ["99EB",0x6B15],
+  ["99EC",0x6B16],
+  ["99ED",0x6B17],
+  ["99EE",0x6B18],
+  ["99EF",0x6B19],
+  ["99F0",0x6B1A],
+  ["99F1",0x6B1B],
+  ["99F2",0x6B1C],
+  ["99F3",0x6B1D],
+  ["99F4",0x6B1E],
+  ["99F5",0x6B1F],
+  ["C7B7",0x6B20],
+  ["B4CE",0x6B21],
+  ["BBB6",0x6B22],
+  ["D0C0",0x6B23],
+  ["ECA3",0x6B24],
+  ["99F6",0x6B25],
+  ["99F7",0x6B26],
+  ["C5B7",0x6B27],
+  ["99F8",0x6B28],
+  ["99F9",0x6B29],
+  ["99FA",0x6B2A],
+  ["99FB",0x6B2B],
+  ["99FC",0x6B2C],
+  ["99FD",0x6B2D],
+  ["99FE",0x6B2E],
+  ["9A40",0x6B2F],
+  ["9A41",0x6B30],
+  ["9A42",0x6B31],
+  ["D3FB",0x6B32],
+  ["9A43",0x6B33],
+  ["9A44",0x6B34],
+  ["9A45",0x6B35],
+  ["9A46",0x6B36],
+  ["ECA4",0x6B37],
+  ["9A47",0x6B38],
+  ["ECA5",0x6B39],
+  ["C6DB",0x6B3A],
+  ["9A48",0x6B3B],
+  ["9A49",0x6B3C],
+  ["9A4A",0x6B3D],
+  ["BFEE",0x6B3E],
+  ["9A4B",0x6B3F],
+  ["9A4C",0x6B40],
+  ["9A4D",0x6B41],
+  ["9A4E",0x6B42],
+  ["ECA6",0x6B43],
+  ["9A4F",0x6B44],
+  ["9A50",0x6B45],
+  ["ECA7",0x6B46],
+  ["D0AA",0x6B47],
+  ["9A51",0x6B48],
+  ["C7B8",0x6B49],
+  ["9A52",0x6B4A],
+  ["9A53",0x6B4B],
+  ["B8E8",0x6B4C],
+  ["9A54",0x6B4D],
+  ["9A55",0x6B4E],
+  ["9A56",0x6B4F],
+  ["9A57",0x6B50],
+  ["9A58",0x6B51],
+  ["9A59",0x6B52],
+  ["9A5A",0x6B53],
+  ["9A5B",0x6B54],
+  ["9A5C",0x6B55],
+  ["9A5D",0x6B56],
+  ["9A5E",0x6B57],
+  ["9A5F",0x6B58],
+  ["ECA8",0x6B59],
+  ["9A60",0x6B5A],
+  ["9A61",0x6B5B],
+  ["9A62",0x6B5C],
+  ["9A63",0x6B5D],
+  ["9A64",0x6B5E],
+  ["9A65",0x6B5F],
+  ["9A66",0x6B60],
+  ["9A67",0x6B61],
+  ["D6B9",0x6B62],
+  ["D5FD",0x6B63],
+  ["B4CB",0x6B64],
+  ["B2BD",0x6B65],
+  ["CEE4",0x6B66],
+  ["C6E7",0x6B67],
+  ["9A68",0x6B68],
+  ["9A69",0x6B69],
+  ["CDE1",0x6B6A],
+  ["9A6A",0x6B6B],
+  ["9A6B",0x6B6C],
+  ["9A6C",0x6B6D],
+  ["9A6D",0x6B6E],
+  ["9A6E",0x6B6F],
+  ["9A6F",0x6B70],
+  ["9A70",0x6B71],
+  ["9A71",0x6B72],
+  ["9A72",0x6B73],
+  ["9A73",0x6B74],
+  ["9A74",0x6B75],
+  ["9A75",0x6B76],
+  ["9A76",0x6B77],
+  ["9A77",0x6B78],
+  ["B4F5",0x6B79],
+  ["9A78",0x6B7A],
+  ["CBC0",0x6B7B],
+  ["BCDF",0x6B7C],
+  ["9A79",0x6B7D],
+  ["9A7A",0x6B7E],
+  ["9A7B",0x6B7F],
+  ["9A7C",0x6B80],
+  ["E9E2",0x6B81],
+  ["E9E3",0x6B82],
+  ["D1EA",0x6B83],
+  ["E9E5",0x6B84],
+  ["9A7D",0x6B85],
+  ["B4F9",0x6B86],
+  ["E9E4",0x6B87],
+  ["9A7E",0x6B88],
+  ["D1B3",0x6B89],
+  ["CAE2",0x6B8A],
+  ["B2D0",0x6B8B],
+  ["9A80",0x6B8C],
+  ["E9E8",0x6B8D],
+  ["9A81",0x6B8E],
+  ["9A82",0x6B8F],
+  ["9A83",0x6B90],
+  ["9A84",0x6B91],
+  ["E9E6",0x6B92],
+  ["E9E7",0x6B93],
+  ["9A85",0x6B94],
+  ["9A86",0x6B95],
+  ["D6B3",0x6B96],
+  ["9A87",0x6B97],
+  ["9A88",0x6B98],
+  ["9A89",0x6B99],
+  ["E9E9",0x6B9A],
+  ["E9EA",0x6B9B],
+  ["9A8A",0x6B9C],
+  ["9A8B",0x6B9D],
+  ["9A8C",0x6B9E],
+  ["9A8D",0x6B9F],
+  ["9A8E",0x6BA0],
+  ["E9EB",0x6BA1],
+  ["9A8F",0x6BA2],
+  ["9A90",0x6BA3],
+  ["9A91",0x6BA4],
+  ["9A92",0x6BA5],
+  ["9A93",0x6BA6],
+  ["9A94",0x6BA7],
+  ["9A95",0x6BA8],
+  ["9A96",0x6BA9],
+  ["E9EC",0x6BAA],
+  ["9A97",0x6BAB],
+  ["9A98",0x6BAC],
+  ["9A99",0x6BAD],
+  ["9A9A",0x6BAE],
+  ["9A9B",0x6BAF],
+  ["9A9C",0x6BB0],
+  ["9A9D",0x6BB1],
+  ["9A9E",0x6BB2],
+  ["ECAF",0x6BB3],
+  ["C5B9",0x6BB4],
+  ["B6CE",0x6BB5],
+  ["9A9F",0x6BB6],
+  ["D2F3",0x6BB7],
+  ["9AA0",0x6BB8],
+  ["9AA1",0x6BB9],
+  ["9AA2",0x6BBA],
+  ["9AA3",0x6BBB],
+  ["9AA4",0x6BBC],
+  ["9AA5",0x6BBD],
+  ["9AA6",0x6BBE],
+  ["B5EE",0x6BBF],
+  ["9AA7",0x6BC0],
+  ["BBD9",0x6BC1],
+  ["ECB1",0x6BC2],
+  ["9AA8",0x6BC3],
+  ["9AA9",0x6BC4],
+  ["D2E3",0x6BC5],
+  ["9AAA",0x6BC6],
+  ["9AAB",0x6BC7],
+  ["9AAC",0x6BC8],
+  ["9AAD",0x6BC9],
+  ["9AAE",0x6BCA],
+  ["CEE3",0x6BCB],
+  ["9AAF",0x6BCC],
+  ["C4B8",0x6BCD],
+  ["9AB0",0x6BCE],
+  ["C3BF",0x6BCF],
+  ["9AB1",0x6BD0],
+  ["9AB2",0x6BD1],
+  ["B6BE",0x6BD2],
+  ["D8B9",0x6BD3],
+  ["B1C8",0x6BD4],
+  ["B1CF",0x6BD5],
+  ["B1D1",0x6BD6],
+  ["C5FE",0x6BD7],
+  ["9AB3",0x6BD8],
+  ["B1D0",0x6BD9],
+  ["9AB4",0x6BDA],
+  ["C3AB",0x6BDB],
+  ["9AB5",0x6BDC],
+  ["9AB6",0x6BDD],
+  ["9AB7",0x6BDE],
+  ["9AB8",0x6BDF],
+  ["9AB9",0x6BE0],
+  ["D5B1",0x6BE1],
+  ["9ABA",0x6BE2],
+  ["9ABB",0x6BE3],
+  ["9ABC",0x6BE4],
+  ["9ABD",0x6BE5],
+  ["9ABE",0x6BE6],
+  ["9ABF",0x6BE7],
+  ["9AC0",0x6BE8],
+  ["9AC1",0x6BE9],
+  ["EBA4",0x6BEA],
+  ["BAC1",0x6BEB],
+  ["9AC2",0x6BEC],
+  ["9AC3",0x6BED],
+  ["9AC4",0x6BEE],
+  ["CCBA",0x6BEF],
+  ["9AC5",0x6BF0],
+  ["9AC6",0x6BF1],
+  ["9AC7",0x6BF2],
+  ["EBA5",0x6BF3],
+  ["9AC8",0x6BF4],
+  ["EBA7",0x6BF5],
+  ["9AC9",0x6BF6],
+  ["9ACA",0x6BF7],
+  ["9ACB",0x6BF8],
+  ["EBA8",0x6BF9],
+  ["9ACC",0x6BFA],
+  ["9ACD",0x6BFB],
+  ["9ACE",0x6BFC],
+  ["EBA6",0x6BFD],
+  ["9ACF",0x6BFE],
+  ["9AD0",0x6BFF],
+  ["9AD1",0x6C00],
+  ["9AD2",0x6C01],
+  ["9AD3",0x6C02],
+  ["9AD4",0x6C03],
+  ["9AD5",0x6C04],
+  ["EBA9",0x6C05],
+  ["EBAB",0x6C06],
+  ["EBAA",0x6C07],
+  ["9AD6",0x6C08],
+  ["9AD7",0x6C09],
+  ["9AD8",0x6C0A],
+  ["9AD9",0x6C0B],
+  ["9ADA",0x6C0C],
+  ["EBAC",0x6C0D],
+  ["9ADB",0x6C0E],
+  ["CACF",0x6C0F],
+  ["D8B5",0x6C10],
+  ["C3F1",0x6C11],
+  ["9ADC",0x6C12],
+  ["C3A5",0x6C13],
+  ["C6F8",0x6C14],
+  ["EBAD",0x6C15],
+  ["C4CA",0x6C16],
+  ["9ADD",0x6C17],
+  ["EBAE",0x6C18],
+  ["EBAF",0x6C19],
+  ["EBB0",0x6C1A],
+  ["B7D5",0x6C1B],
+  ["9ADE",0x6C1C],
+  ["9ADF",0x6C1D],
+  ["9AE0",0x6C1E],
+  ["B7FA",0x6C1F],
+  ["9AE1",0x6C20],
+  ["EBB1",0x6C21],
+  ["C7E2",0x6C22],
+  ["9AE2",0x6C23],
+  ["EBB3",0x6C24],
+  ["9AE3",0x6C25],
+  ["BAA4",0x6C26],
+  ["D1F5",0x6C27],
+  ["B0B1",0x6C28],
+  ["EBB2",0x6C29],
+  ["EBB4",0x6C2A],
+  ["9AE4",0x6C2B],
+  ["9AE5",0x6C2C],
+  ["9AE6",0x6C2D],
+  ["B5AA",0x6C2E],
+  ["C2C8",0x6C2F],
+  ["C7E8",0x6C30],
+  ["9AE7",0x6C31],
+  ["EBB5",0x6C32],
+  ["9AE8",0x6C33],
+  ["CBAE",0x6C34],
+  ["E3DF",0x6C35],
+  ["9AE9",0x6C36],
+  ["9AEA",0x6C37],
+  ["D3C0",0x6C38],
+  ["9AEB",0x6C39],
+  ["9AEC",0x6C3A],
+  ["9AED",0x6C3B],
+  ["9AEE",0x6C3C],
+  ["D9DB",0x6C3D],
+  ["9AEF",0x6C3E],
+  ["9AF0",0x6C3F],
+  ["CDA1",0x6C40],
+  ["D6AD",0x6C41],
+  ["C7F3",0x6C42],
+  ["9AF1",0x6C43],
+  ["9AF2",0x6C44],
+  ["9AF3",0x6C45],
+  ["D9E0",0x6C46],
+  ["BBE3",0x6C47],
+  ["9AF4",0x6C48],
+  ["BABA",0x6C49],
+  ["E3E2",0x6C4A],
+  ["9AF5",0x6C4B],
+  ["9AF6",0x6C4C],
+  ["9AF7",0x6C4D],
+  ["9AF8",0x6C4E],
+  ["9AF9",0x6C4F],
+  ["CFAB",0x6C50],
+  ["9AFA",0x6C51],
+  ["9AFB",0x6C52],
+  ["9AFC",0x6C53],
+  ["E3E0",0x6C54],
+  ["C9C7",0x6C55],
+  ["9AFD",0x6C56],
+  ["BAB9",0x6C57],
+  ["9AFE",0x6C58],
+  ["9B40",0x6C59],
+  ["9B41",0x6C5A],
+  ["D1B4",0x6C5B],
+  ["E3E1",0x6C5C],
+  ["C8EA",0x6C5D],
+  ["B9AF",0x6C5E],
+  ["BDAD",0x6C5F],
+  ["B3D8",0x6C60],
+  ["CEDB",0x6C61],
+  ["9B42",0x6C62],
+  ["9B43",0x6C63],
+  ["CCC0",0x6C64],
+  ["9B44",0x6C65],
+  ["9B45",0x6C66],
+  ["9B46",0x6C67],
+  ["E3E8",0x6C68],
+  ["E3E9",0x6C69],
+  ["CDF4",0x6C6A],
+  ["9B47",0x6C6B],
+  ["9B48",0x6C6C],
+  ["9B49",0x6C6D],
+  ["9B4A",0x6C6E],
+  ["9B4B",0x6C6F],
+  ["CCAD",0x6C70],
+  ["9B4C",0x6C71],
+  ["BCB3",0x6C72],
+  ["9B4D",0x6C73],
+  ["E3EA",0x6C74],
+  ["9B4E",0x6C75],
+  ["E3EB",0x6C76],
+  ["9B4F",0x6C77],
+  ["9B50",0x6C78],
+  ["D0DA",0x6C79],
+  ["9B51",0x6C7A],
+  ["9B52",0x6C7B],
+  ["9B53",0x6C7C],
+  ["C6FB",0x6C7D],
+  ["B7DA",0x6C7E],
+  ["9B54",0x6C7F],
+  ["9B55",0x6C80],
+  ["C7DF",0x6C81],
+  ["D2CA",0x6C82],
+  ["CED6",0x6C83],
+  ["9B56",0x6C84],
+  ["E3E4",0x6C85],
+  ["E3EC",0x6C86],
+  ["9B57",0x6C87],
+  ["C9F2",0x6C88],
+  ["B3C1",0x6C89],
+  ["9B58",0x6C8A],
+  ["9B59",0x6C8B],
+  ["E3E7",0x6C8C],
+  ["9B5A",0x6C8D],
+  ["9B5B",0x6C8E],
+  ["C6E3",0x6C8F],
+  ["E3E5",0x6C90],
+  ["9B5C",0x6C91],
+  ["9B5D",0x6C92],
+  ["EDB3",0x6C93],
+  ["E3E6",0x6C94],
+  ["9B5E",0x6C95],
+  ["9B5F",0x6C96],
+  ["9B60",0x6C97],
+  ["9B61",0x6C98],
+  ["C9B3",0x6C99],
+  ["9B62",0x6C9A],
+  ["C5E6",0x6C9B],
+  ["9B63",0x6C9C],
+  ["9B64",0x6C9D],
+  ["9B65",0x6C9E],
+  ["B9B5",0x6C9F],
+  ["9B66",0x6CA0],
+  ["C3BB",0x6CA1],
+  ["9B67",0x6CA2],
+  ["E3E3",0x6CA3],
+  ["C5BD",0x6CA4],
+  ["C1A4",0x6CA5],
+  ["C2D9",0x6CA6],
+  ["B2D7",0x6CA7],
+  ["9B68",0x6CA8],
+  ["E3ED",0x6CA9],
+  ["BBA6",0x6CAA],
+  ["C4AD",0x6CAB],
+  ["9B69",0x6CAC],
+  ["E3F0",0x6CAD],
+  ["BEDA",0x6CAE],
+  ["9B6A",0x6CAF],
+  ["9B6B",0x6CB0],
+  ["E3FB",0x6CB1],
+  ["E3F5",0x6CB2],
+  ["BAD3",0x6CB3],
+  ["9B6C",0x6CB4],
+  ["9B6D",0x6CB5],
+  ["9B6E",0x6CB6],
+  ["9B6F",0x6CB7],
+  ["B7D0",0x6CB8],
+  ["D3CD",0x6CB9],
+  ["9B70",0x6CBA],
+  ["D6CE",0x6CBB],
+  ["D5D3",0x6CBC],
+  ["B9C1",0x6CBD],
+  ["D5B4",0x6CBE],
+  ["D1D8",0x6CBF],
+  ["9B71",0x6CC0],
+  ["9B72",0x6CC1],
+  ["9B73",0x6CC2],
+  ["9B74",0x6CC3],
+  ["D0B9",0x6CC4],
+  ["C7F6",0x6CC5],
+  ["9B75",0x6CC6],
+  ["9B76",0x6CC7],
+  ["9B77",0x6CC8],
+  ["C8AA",0x6CC9],
+  ["B2B4",0x6CCA],
+  ["9B78",0x6CCB],
+  ["C3DA",0x6CCC],
+  ["9B79",0x6CCD],
+  ["9B7A",0x6CCE],
+  ["9B7B",0x6CCF],
+  ["E3EE",0x6CD0],
+  ["9B7C",0x6CD1],
+  ["9B7D",0x6CD2],
+  ["E3FC",0x6CD3],
+  ["E3EF",0x6CD4],
+  ["B7A8",0x6CD5],
+  ["E3F7",0x6CD6],
+  ["E3F4",0x6CD7],
+  ["9B7E",0x6CD8],
+  ["9B80",0x6CD9],
+  ["9B81",0x6CDA],
+  ["B7BA",0x6CDB],
+  ["9B82",0x6CDC],
+  ["9B83",0x6CDD],
+  ["C5A2",0x6CDE],
+  ["9B84",0x6CDF],
+  ["E3F6",0x6CE0],
+  ["C5DD",0x6CE1],
+  ["B2A8",0x6CE2],
+  ["C6FC",0x6CE3],
+  ["9B85",0x6CE4],
+  ["C4E0",0x6CE5],
+  ["9B86",0x6CE6],
+  ["9B87",0x6CE7],
+  ["D7A2",0x6CE8],
+  ["9B88",0x6CE9],
+  ["C0E1",0x6CEA],
+  ["E3F9",0x6CEB],
+  ["9B89",0x6CEC],
+  ["9B8A",0x6CED],
+  ["E3FA",0x6CEE],
+  ["E3FD",0x6CEF],
+  ["CCA9",0x6CF0],
+  ["E3F3",0x6CF1],
+  ["9B8B",0x6CF2],
+  ["D3BE",0x6CF3],
+  ["9B8C",0x6CF4],
+  ["B1C3",0x6CF5],
+  ["EDB4",0x6CF6],
+  ["E3F1",0x6CF7],
+  ["E3F2",0x6CF8],
+  ["9B8D",0x6CF9],
+  ["E3F8",0x6CFA],
+  ["D0BA",0x6CFB],
+  ["C6C3",0x6CFC],
+  ["D4F3",0x6CFD],
+  ["E3FE",0x6CFE],
+  ["9B8E",0x6CFF],
+  ["9B8F",0x6D00],
+  ["BDE0",0x6D01],
+  ["9B90",0x6D02],
+  ["9B91",0x6D03],
+  ["E4A7",0x6D04],
+  ["9B92",0x6D05],
+  ["9B93",0x6D06],
+  ["E4A6",0x6D07],
+  ["9B94",0x6D08],
+  ["9B95",0x6D09],
+  ["9B96",0x6D0A],
+  ["D1F3",0x6D0B],
+  ["E4A3",0x6D0C],
+  ["9B97",0x6D0D],
+  ["E4A9",0x6D0E],
+  ["9B98",0x6D0F],
+  ["9B99",0x6D10],
+  ["9B9A",0x6D11],
+  ["C8F7",0x6D12],
+  ["9B9B",0x6D13],
+  ["9B9C",0x6D14],
+  ["9B9D",0x6D15],
+  ["9B9E",0x6D16],
+  ["CFB4",0x6D17],
+  ["9B9F",0x6D18],
+  ["E4A8",0x6D19],
+  ["E4AE",0x6D1A],
+  ["C2E5",0x6D1B],
+  ["9BA0",0x6D1C],
+  ["9BA1",0x6D1D],
+  ["B6B4",0x6D1E],
+  ["9BA2",0x6D1F],
+  ["9BA3",0x6D20],
+  ["9BA4",0x6D21],
+  ["9BA5",0x6D22],
+  ["9BA6",0x6D23],
+  ["9BA7",0x6D24],
+  ["BDF2",0x6D25],
+  ["9BA8",0x6D26],
+  ["E4A2",0x6D27],
+  ["9BA9",0x6D28],
+  ["9BAA",0x6D29],
+  ["BAE9",0x6D2A],
+  ["E4AA",0x6D2B],
+  ["9BAB",0x6D2C],
+  ["9BAC",0x6D2D],
+  ["E4AC",0x6D2E],
+  ["9BAD",0x6D2F],
+  ["9BAE",0x6D30],
+  ["B6FD",0x6D31],
+  ["D6DE",0x6D32],
+  ["E4B2",0x6D33],
+  ["9BAF",0x6D34],
+  ["E4AD",0x6D35],
+  ["9BB0",0x6D36],
+  ["9BB1",0x6D37],
+  ["9BB2",0x6D38],
+  ["E4A1",0x6D39],
+  ["9BB3",0x6D3A],
+  ["BBEE",0x6D3B],
+  ["CDDD",0x6D3C],
+  ["C7A2",0x6D3D],
+  ["C5C9",0x6D3E],
+  ["9BB4",0x6D3F],
+  ["9BB5",0x6D40],
+  ["C1F7",0x6D41],
+  ["9BB6",0x6D42],
+  ["E4A4",0x6D43],
+  ["9BB7",0x6D44],
+  ["C7B3",0x6D45],
+  ["BDAC",0x6D46],
+  ["BDBD",0x6D47],
+  ["E4A5",0x6D48],
+  ["9BB8",0x6D49],
+  ["D7C7",0x6D4A],
+  ["B2E2",0x6D4B],
+  ["9BB9",0x6D4C],
+  ["E4AB",0x6D4D],
+  ["BCC3",0x6D4E],
+  ["E4AF",0x6D4F],
+  ["9BBA",0x6D50],
+  ["BBEB",0x6D51],
+  ["E4B0",0x6D52],
+  ["C5A8",0x6D53],
+  ["E4B1",0x6D54],
+  ["9BBB",0x6D55],
+  ["9BBC",0x6D56],
+  ["9BBD",0x6D57],
+  ["9BBE",0x6D58],
+  ["D5E3",0x6D59],
+  ["BFA3",0x6D5A],
+  ["9BBF",0x6D5B],
+  ["E4BA",0x6D5C],
+  ["9BC0",0x6D5D],
+  ["E4B7",0x6D5E],
+  ["9BC1",0x6D5F],
+  ["E4BB",0x6D60],
+  ["9BC2",0x6D61],
+  ["9BC3",0x6D62],
+  ["E4BD",0x6D63],
+  ["9BC4",0x6D64],
+  ["9BC5",0x6D65],
+  ["C6D6",0x6D66],
+  ["9BC6",0x6D67],
+  ["9BC7",0x6D68],
+  ["BAC6",0x6D69],
+  ["C0CB",0x6D6A],
+  ["9BC8",0x6D6B],
+  ["9BC9",0x6D6C],
+  ["9BCA",0x6D6D],
+  ["B8A1",0x6D6E],
+  ["E4B4",0x6D6F],
+  ["9BCB",0x6D70],
+  ["9BCC",0x6D71],
+  ["9BCD",0x6D72],
+  ["9BCE",0x6D73],
+  ["D4A1",0x6D74],
+  ["9BCF",0x6D75],
+  ["9BD0",0x6D76],
+  ["BAA3",0x6D77],
+  ["BDFE",0x6D78],
+  ["9BD1",0x6D79],
+  ["9BD2",0x6D7A],
+  ["9BD3",0x6D7B],
+  ["E4BC",0x6D7C],
+  ["9BD4",0x6D7D],
+  ["9BD5",0x6D7E],
+  ["9BD6",0x6D7F],
+  ["9BD7",0x6D80],
+  ["9BD8",0x6D81],
+  ["CDBF",0x6D82],
+  ["9BD9",0x6D83],
+  ["9BDA",0x6D84],
+  ["C4F9",0x6D85],
+  ["9BDB",0x6D86],
+  ["9BDC",0x6D87],
+  ["CFFB",0x6D88],
+  ["C9E6",0x6D89],
+  ["9BDD",0x6D8A],
+  ["9BDE",0x6D8B],
+  ["D3BF",0x6D8C],
+  ["9BDF",0x6D8D],
+  ["CFD1",0x6D8E],
+  ["9BE0",0x6D8F],
+  ["9BE1",0x6D90],
+  ["E4B3",0x6D91],
+  ["9BE2",0x6D92],
+  ["E4B8",0x6D93],
+  ["E4B9",0x6D94],
+  ["CCE9",0x6D95],
+  ["9BE3",0x6D96],
+  ["9BE4",0x6D97],
+  ["9BE5",0x6D98],
+  ["9BE6",0x6D99],
+  ["9BE7",0x6D9A],
+  ["CCCE",0x6D9B],
+  ["9BE8",0x6D9C],
+  ["C0D4",0x6D9D],
+  ["E4B5",0x6D9E],
+  ["C1B0",0x6D9F],
+  ["E4B6",0x6DA0],
+  ["CED0",0x6DA1],
+  ["9BE9",0x6DA2],
+  ["BBC1",0x6DA3],
+  ["B5D3",0x6DA4],
+  ["9BEA",0x6DA5],
+  ["C8F3",0x6DA6],
+  ["BDA7",0x6DA7],
+  ["D5C7",0x6DA8],
+  ["C9AC",0x6DA9],
+  ["B8A2",0x6DAA],
+  ["E4CA",0x6DAB],
+  ["9BEB",0x6DAC],
+  ["9BEC",0x6DAD],
+  ["E4CC",0x6DAE],
+  ["D1C4",0x6DAF],
+  ["9BED",0x6DB0],
+  ["9BEE",0x6DB1],
+  ["D2BA",0x6DB2],
+  ["9BEF",0x6DB3],
+  ["9BF0",0x6DB4],
+  ["BAAD",0x6DB5],
+  ["9BF1",0x6DB6],
+  ["9BF2",0x6DB7],
+  ["BAD4",0x6DB8],
+  ["9BF3",0x6DB9],
+  ["9BF4",0x6DBA],
+  ["9BF5",0x6DBB],
+  ["9BF6",0x6DBC],
+  ["9BF7",0x6DBD],
+  ["9BF8",0x6DBE],
+  ["E4C3",0x6DBF],
+  ["B5ED",0x6DC0],
+  ["9BF9",0x6DC1],
+  ["9BFA",0x6DC2],
+  ["9BFB",0x6DC3],
+  ["D7CD",0x6DC4],
+  ["E4C0",0x6DC5],
+  ["CFFD",0x6DC6],
+  ["E4BF",0x6DC7],
+  ["9BFC",0x6DC8],
+  ["9BFD",0x6DC9],
+  ["9BFE",0x6DCA],
+  ["C1DC",0x6DCB],
+  ["CCCA",0x6DCC],
+  ["9C40",0x6DCD],
+  ["9C41",0x6DCE],
+  ["9C42",0x6DCF],
+  ["9C43",0x6DD0],
+  ["CAE7",0x6DD1],
+  ["9C44",0x6DD2],
+  ["9C45",0x6DD3],
+  ["9C46",0x6DD4],
+  ["9C47",0x6DD5],
+  ["C4D7",0x6DD6],
+  ["9C48",0x6DD7],
+  ["CCD4",0x6DD8],
+  ["E4C8",0x6DD9],
+  ["9C49",0x6DDA],
+  ["9C4A",0x6DDB],
+  ["9C4B",0x6DDC],
+  ["E4C7",0x6DDD],
+  ["E4C1",0x6DDE],
+  ["9C4C",0x6DDF],
+  ["E4C4",0x6DE0],
+  ["B5AD",0x6DE1],
+  ["9C4D",0x6DE2],
+  ["9C4E",0x6DE3],
+  ["D3D9",0x6DE4],
+  ["9C4F",0x6DE5],
+  ["E4C6",0x6DE6],
+  ["9C50",0x6DE7],
+  ["9C51",0x6DE8],
+  ["9C52",0x6DE9],
+  ["9C53",0x6DEA],
+  ["D2F9",0x6DEB],
+  ["B4E3",0x6DEC],
+  ["9C54",0x6DED],
+  ["BBB4",0x6DEE],
+  ["9C55",0x6DEF],
+  ["9C56",0x6DF0],
+  ["C9EE",0x6DF1],
+  ["9C57",0x6DF2],
+  ["B4BE",0x6DF3],
+  ["9C58",0x6DF4],
+  ["9C59",0x6DF5],
+  ["9C5A",0x6DF6],
+  ["BBEC",0x6DF7],
+  ["9C5B",0x6DF8],
+  ["D1CD",0x6DF9],
+  ["9C5C",0x6DFA],
+  ["CCED",0x6DFB],
+  ["EDB5",0x6DFC],
+  ["9C5D",0x6DFD],
+  ["9C5E",0x6DFE],
+  ["9C5F",0x6DFF],
+  ["9C60",0x6E00],
+  ["9C61",0x6E01],
+  ["9C62",0x6E02],
+  ["9C63",0x6E03],
+  ["9C64",0x6E04],
+  ["C7E5",0x6E05],
+  ["9C65",0x6E06],
+  ["9C66",0x6E07],
+  ["9C67",0x6E08],
+  ["9C68",0x6E09],
+  ["D4A8",0x6E0A],
+  ["9C69",0x6E0B],
+  ["E4CB",0x6E0C],
+  ["D7D5",0x6E0D],
+  ["E4C2",0x6E0E],
+  ["9C6A",0x6E0F],
+  ["BDA5",0x6E10],
+  ["E4C5",0x6E11],
+  ["9C6B",0x6E12],
+  ["9C6C",0x6E13],
+  ["D3E6",0x6E14],
+  ["9C6D",0x6E15],
+  ["E4C9",0x6E16],
+  ["C9F8",0x6E17],
+  ["9C6E",0x6E18],
+  ["9C6F",0x6E19],
+  ["E4BE",0x6E1A],
+  ["9C70",0x6E1B],
+  ["9C71",0x6E1C],
+  ["D3E5",0x6E1D],
+  ["9C72",0x6E1E],
+  ["9C73",0x6E1F],
+  ["C7FE",0x6E20],
+  ["B6C9",0x6E21],
+  ["9C74",0x6E22],
+  ["D4FC",0x6E23],
+  ["B2B3",0x6E24],
+  ["E4D7",0x6E25],
+  ["9C75",0x6E26],
+  ["9C76",0x6E27],
+  ["9C77",0x6E28],
+  ["CEC2",0x6E29],
+  ["9C78",0x6E2A],
+  ["E4CD",0x6E2B],
+  ["9C79",0x6E2C],
+  ["CEBC",0x6E2D],
+  ["9C7A",0x6E2E],
+  ["B8DB",0x6E2F],
+  ["9C7B",0x6E30],
+  ["9C7C",0x6E31],
+  ["E4D6",0x6E32],
+  ["9C7D",0x6E33],
+  ["BFCA",0x6E34],
+  ["9C7E",0x6E35],
+  ["9C80",0x6E36],
+  ["9C81",0x6E37],
+  ["D3CE",0x6E38],
+  ["9C82",0x6E39],
+  ["C3EC",0x6E3A],
+  ["9C83",0x6E3B],
+  ["9C84",0x6E3C],
+  ["9C85",0x6E3D],
+  ["9C86",0x6E3E],
+  ["9C87",0x6E3F],
+  ["9C88",0x6E40],
+  ["9C89",0x6E41],
+  ["9C8A",0x6E42],
+  ["C5C8",0x6E43],
+  ["E4D8",0x6E44],
+  ["9C8B",0x6E45],
+  ["9C8C",0x6E46],
+  ["9C8D",0x6E47],
+  ["9C8E",0x6E48],
+  ["9C8F",0x6E49],
+  ["9C90",0x6E4A],
+  ["9C91",0x6E4B],
+  ["9C92",0x6E4C],
+  ["CDC4",0x6E4D],
+  ["E4CF",0x6E4E],
+  ["9C93",0x6E4F],
+  ["9C94",0x6E50],
+  ["9C95",0x6E51],
+  ["9C96",0x6E52],
+  ["E4D4",0x6E53],
+  ["E4D5",0x6E54],
+  ["9C97",0x6E55],
+  ["BAFE",0x6E56],
+  ["9C98",0x6E57],
+  ["CFE6",0x6E58],
+  ["9C99",0x6E59],
+  ["9C9A",0x6E5A],
+  ["D5BF",0x6E5B],
+  ["9C9B",0x6E5C],
+  ["9C9C",0x6E5D],
+  ["9C9D",0x6E5E],
+  ["E4D2",0x6E5F],
+  ["9C9E",0x6E60],
+  ["9C9F",0x6E61],
+  ["9CA0",0x6E62],
+  ["9CA1",0x6E63],
+  ["9CA2",0x6E64],
+  ["9CA3",0x6E65],
+  ["9CA4",0x6E66],
+  ["9CA5",0x6E67],
+  ["9CA6",0x6E68],
+  ["9CA7",0x6E69],
+  ["9CA8",0x6E6A],
+  ["E4D0",0x6E6B],
+  ["9CA9",0x6E6C],
+  ["9CAA",0x6E6D],
+  ["E4CE",0x6E6E],
+  ["9CAB",0x6E6F],
+  ["9CAC",0x6E70],
+  ["9CAD",0x6E71],
+  ["9CAE",0x6E72],
+  ["9CAF",0x6E73],
+  ["9CB0",0x6E74],
+  ["9CB1",0x6E75],
+  ["9CB2",0x6E76],
+  ["9CB3",0x6E77],
+  ["9CB4",0x6E78],
+  ["9CB5",0x6E79],
+  ["9CB6",0x6E7A],
+  ["9CB7",0x6E7B],
+  ["9CB8",0x6E7C],
+  ["9CB9",0x6E7D],
+  ["CDE5",0x6E7E],
+  ["CAAA",0x6E7F],
+  ["9CBA",0x6E80],
+  ["9CBB",0x6E81],
+  ["9CBC",0x6E82],
+  ["C0A3",0x6E83],
+  ["9CBD",0x6E84],
+  ["BDA6",0x6E85],
+  ["E4D3",0x6E86],
+  ["9CBE",0x6E87],
+  ["9CBF",0x6E88],
+  ["B8C8",0x6E89],
+  ["9CC0",0x6E8A],
+  ["9CC1",0x6E8B],
+  ["9CC2",0x6E8C],
+  ["9CC3",0x6E8D],
+  ["9CC4",0x6E8E],
+  ["E4E7",0x6E8F],
+  ["D4B4",0x6E90],
+  ["9CC5",0x6E91],
+  ["9CC6",0x6E92],
+  ["9CC7",0x6E93],
+  ["9CC8",0x6E94],
+  ["9CC9",0x6E95],
+  ["9CCA",0x6E96],
+  ["9CCB",0x6E97],
+  ["E4DB",0x6E98],
+  ["9CCC",0x6E99],
+  ["9CCD",0x6E9A],
+  ["9CCE",0x6E9B],
+  ["C1EF",0x6E9C],
+  ["9CCF",0x6E9D],
+  ["9CD0",0x6E9E],
+  ["E4E9",0x6E9F],
+  ["9CD1",0x6EA0],
+  ["9CD2",0x6EA1],
+  ["D2E7",0x6EA2],
+  ["9CD3",0x6EA3],
+  ["9CD4",0x6EA4],
+  ["E4DF",0x6EA5],
+  ["9CD5",0x6EA6],
+  ["E4E0",0x6EA7],
+  ["9CD6",0x6EA8],
+  ["9CD7",0x6EA9],
+  ["CFAA",0x6EAA],
+  ["9CD8",0x6EAB],
+  ["9CD9",0x6EAC],
+  ["9CDA",0x6EAD],
+  ["9CDB",0x6EAE],
+  ["CBDD",0x6EAF],
+  ["9CDC",0x6EB0],
+  ["E4DA",0x6EB1],
+  ["E4D1",0x6EB2],
+  ["9CDD",0x6EB3],
+  ["E4E5",0x6EB4],
+  ["9CDE",0x6EB5],
+  ["C8DC",0x6EB6],
+  ["E4E3",0x6EB7],
+  ["9CDF",0x6EB8],
+  ["9CE0",0x6EB9],
+  ["C4E7",0x6EBA],
+  ["E4E2",0x6EBB],
+  ["9CE1",0x6EBC],
+  ["E4E1",0x6EBD],
+  ["9CE2",0x6EBE],
+  ["9CE3",0x6EBF],
+  ["9CE4",0x6EC0],
+  ["B3FC",0x6EC1],
+  ["E4E8",0x6EC2],
+  ["9CE5",0x6EC3],
+  ["9CE6",0x6EC4],
+  ["9CE7",0x6EC5],
+  ["9CE8",0x6EC6],
+  ["B5E1",0x6EC7],
+  ["9CE9",0x6EC8],
+  ["9CEA",0x6EC9],
+  ["9CEB",0x6ECA],
+  ["D7CC",0x6ECB],
+  ["9CEC",0x6ECC],
+  ["9CED",0x6ECD],
+  ["9CEE",0x6ECE],
+  ["E4E6",0x6ECF],
+  ["9CEF",0x6ED0],
+  ["BBAC",0x6ED1],
+  ["9CF0",0x6ED2],
+  ["D7D2",0x6ED3],
+  ["CCCF",0x6ED4],
+  ["EBF8",0x6ED5],
+  ["9CF1",0x6ED6],
+  ["E4E4",0x6ED7],
+  ["9CF2",0x6ED8],
+  ["9CF3",0x6ED9],
+  ["B9F6",0x6EDA],
+  ["9CF4",0x6EDB],
+  ["9CF5",0x6EDC],
+  ["9CF6",0x6EDD],
+  ["D6CD",0x6EDE],
+  ["E4D9",0x6EDF],
+  ["E4DC",0x6EE0],
+  ["C2FA",0x6EE1],
+  ["E4DE",0x6EE2],
+  ["9CF7",0x6EE3],
+  ["C2CB",0x6EE4],
+  ["C0C4",0x6EE5],
+  ["C2D0",0x6EE6],
+  ["9CF8",0x6EE7],
+  ["B1F5",0x6EE8],
+  ["CCB2",0x6EE9],
+  ["9CF9",0x6EEA],
+  ["9CFA",0x6EEB],
+  ["9CFB",0x6EEC],
+  ["9CFC",0x6EED],
+  ["9CFD",0x6EEE],
+  ["9CFE",0x6EEF],
+  ["9D40",0x6EF0],
+  ["9D41",0x6EF1],
+  ["9D42",0x6EF2],
+  ["9D43",0x6EF3],
+  ["B5CE",0x6EF4],
+  ["9D44",0x6EF5],
+  ["9D45",0x6EF6],
+  ["9D46",0x6EF7],
+  ["9D47",0x6EF8],
+  ["E4EF",0x6EF9],
+  ["9D48",0x6EFA],
+  ["9D49",0x6EFB],
+  ["9D4A",0x6EFC],
+  ["9D4B",0x6EFD],
+  ["9D4C",0x6EFE],
+  ["9D4D",0x6EFF],
+  ["9D4E",0x6F00],
+  ["9D4F",0x6F01],
+  ["C6AF",0x6F02],
+  ["9D50",0x6F03],
+  ["9D51",0x6F04],
+  ["9D52",0x6F05],
+  ["C6E1",0x6F06],
+  ["9D53",0x6F07],
+  ["9D54",0x6F08],
+  ["E4F5",0x6F09],
+  ["9D55",0x6F0A],
+  ["9D56",0x6F0B],
+  ["9D57",0x6F0C],
+  ["9D58",0x6F0D],
+  ["9D59",0x6F0E],
+  ["C2A9",0x6F0F],
+  ["9D5A",0x6F10],
+  ["9D5B",0x6F11],
+  ["9D5C",0x6F12],
+  ["C0EC",0x6F13],
+  ["D1DD",0x6F14],
+  ["E4EE",0x6F15],
+  ["9D5D",0x6F16],
+  ["9D5E",0x6F17],
+  ["9D5F",0x6F18],
+  ["9D60",0x6F19],
+  ["9D61",0x6F1A],
+  ["9D62",0x6F1B],
+  ["9D63",0x6F1C],
+  ["9D64",0x6F1D],
+  ["9D65",0x6F1E],
+  ["9D66",0x6F1F],
+  ["C4AE",0x6F20],
+  ["9D67",0x6F21],
+  ["9D68",0x6F22],
+  ["9D69",0x6F23],
+  ["E4ED",0x6F24],
+  ["9D6A",0x6F25],
+  ["9D6B",0x6F26],
+  ["9D6C",0x6F27],
+  ["9D6D",0x6F28],
+  ["E4F6",0x6F29],
+  ["E4F4",0x6F2A],
+  ["C2FE",0x6F2B],
+  ["9D6E",0x6F2C],
+  ["E4DD",0x6F2D],
+  ["9D6F",0x6F2E],
+  ["E4F0",0x6F2F],
+  ["9D70",0x6F30],
+  ["CAFE",0x6F31],
+  ["9D71",0x6F32],
+  ["D5C4",0x6F33],
+  ["9D72",0x6F34],
+  ["9D73",0x6F35],
+  ["E4F1",0x6F36],
+  ["9D74",0x6F37],
+  ["9D75",0x6F38],
+  ["9D76",0x6F39],
+  ["9D77",0x6F3A],
+  ["9D78",0x6F3B],
+  ["9D79",0x6F3C],
+  ["9D7A",0x6F3D],
+  ["D1FA",0x6F3E],
+  ["9D7B",0x6F3F],
+  ["9D7C",0x6F40],
+  ["9D7D",0x6F41],
+  ["9D7E",0x6F42],
+  ["9D80",0x6F43],
+  ["9D81",0x6F44],
+  ["9D82",0x6F45],
+  ["E4EB",0x6F46],
+  ["E4EC",0x6F47],
+  ["9D83",0x6F48],
+  ["9D84",0x6F49],
+  ["9D85",0x6F4A],
+  ["E4F2",0x6F4B],
+  ["9D86",0x6F4C],
+  ["CEAB",0x6F4D],
+  ["9D87",0x6F4E],
+  ["9D88",0x6F4F],
+  ["9D89",0x6F50],
+  ["9D8A",0x6F51],
+  ["9D8B",0x6F52],
+  ["9D8C",0x6F53],
+  ["9D8D",0x6F54],
+  ["9D8E",0x6F55],
+  ["9D8F",0x6F56],
+  ["9D90",0x6F57],
+  ["C5CB",0x6F58],
+  ["9D91",0x6F59],
+  ["9D92",0x6F5A],
+  ["9D93",0x6F5B],
+  ["C7B1",0x6F5C],
+  ["9D94",0x6F5D],
+  ["C2BA",0x6F5E],
+  ["9D95",0x6F5F],
+  ["9D96",0x6F60],
+  ["9D97",0x6F61],
+  ["E4EA",0x6F62],
+  ["9D98",0x6F63],
+  ["9D99",0x6F64],
+  ["9D9A",0x6F65],
+  ["C1CA",0x6F66],
+  ["9D9B",0x6F67],
+  ["9D9C",0x6F68],
+  ["9D9D",0x6F69],
+  ["9D9E",0x6F6A],
+  ["9D9F",0x6F6B],
+  ["9DA0",0x6F6C],
+  ["CCB6",0x6F6D],
+  ["B3B1",0x6F6E],
+  ["9DA1",0x6F6F],
+  ["9DA2",0x6F70],
+  ["9DA3",0x6F71],
+  ["E4FB",0x6F72],
+  ["9DA4",0x6F73],
+  ["E4F3",0x6F74],
+  ["9DA5",0x6F75],
+  ["9DA6",0x6F76],
+  ["9DA7",0x6F77],
+  ["E4FA",0x6F78],
+  ["9DA8",0x6F79],
+  ["E4FD",0x6F7A],
+  ["9DA9",0x6F7B],
+  ["E4FC",0x6F7C],
+  ["9DAA",0x6F7D],
+  ["9DAB",0x6F7E],
+  ["9DAC",0x6F7F],
+  ["9DAD",0x6F80],
+  ["9DAE",0x6F81],
+  ["9DAF",0x6F82],
+  ["9DB0",0x6F83],
+  ["B3CE",0x6F84],
+  ["9DB1",0x6F85],
+  ["9DB2",0x6F86],
+  ["9DB3",0x6F87],
+  ["B3BA",0x6F88],
+  ["E4F7",0x6F89],
+  ["9DB4",0x6F8A],
+  ["9DB5",0x6F8B],
+  ["E4F9",0x6F8C],
+  ["E4F8",0x6F8D],
+  ["C5EC",0x6F8E],
+  ["9DB6",0x6F8F],
+  ["9DB7",0x6F90],
+  ["9DB8",0x6F91],
+  ["9DB9",0x6F92],
+  ["9DBA",0x6F93],
+  ["9DBB",0x6F94],
+  ["9DBC",0x6F95],
+  ["9DBD",0x6F96],
+  ["9DBE",0x6F97],
+  ["9DBF",0x6F98],
+  ["9DC0",0x6F99],
+  ["9DC1",0x6F9A],
+  ["9DC2",0x6F9B],
+  ["C0BD",0x6F9C],
+  ["9DC3",0x6F9D],
+  ["9DC4",0x6F9E],
+  ["9DC5",0x6F9F],
+  ["9DC6",0x6FA0],
+  ["D4E8",0x6FA1],
+  ["9DC7",0x6FA2],
+  ["9DC8",0x6FA3],
+  ["9DC9",0x6FA4],
+  ["9DCA",0x6FA5],
+  ["9DCB",0x6FA6],
+  ["E5A2",0x6FA7],
+  ["9DCC",0x6FA8],
+  ["9DCD",0x6FA9],
+  ["9DCE",0x6FAA],
+  ["9DCF",0x6FAB],
+  ["9DD0",0x6FAC],
+  ["9DD1",0x6FAD],
+  ["9DD2",0x6FAE],
+  ["9DD3",0x6FAF],
+  ["9DD4",0x6FB0],
+  ["9DD5",0x6FB1],
+  ["9DD6",0x6FB2],
+  ["B0C4",0x6FB3],
+  ["9DD7",0x6FB4],
+  ["9DD8",0x6FB5],
+  ["E5A4",0x6FB6],
+  ["9DD9",0x6FB7],
+  ["9DDA",0x6FB8],
+  ["E5A3",0x6FB9],
+  ["9DDB",0x6FBA],
+  ["9DDC",0x6FBB],
+  ["9DDD",0x6FBC],
+  ["9DDE",0x6FBD],
+  ["9DDF",0x6FBE],
+  ["9DE0",0x6FBF],
+  ["BCA4",0x6FC0],
+  ["9DE1",0x6FC1],
+  ["E5A5",0x6FC2],
+  ["9DE2",0x6FC3],
+  ["9DE3",0x6FC4],
+  ["9DE4",0x6FC5],
+  ["9DE5",0x6FC6],
+  ["9DE6",0x6FC7],
+  ["9DE7",0x6FC8],
+  ["E5A1",0x6FC9],
+  ["9DE8",0x6FCA],
+  ["9DE9",0x6FCB],
+  ["9DEA",0x6FCC],
+  ["9DEB",0x6FCD],
+  ["9DEC",0x6FCE],
+  ["9DED",0x6FCF],
+  ["9DEE",0x6FD0],
+  ["E4FE",0x6FD1],
+  ["B1F4",0x6FD2],
+  ["9DEF",0x6FD3],
+  ["9DF0",0x6FD4],
+  ["9DF1",0x6FD5],
+  ["9DF2",0x6FD6],
+  ["9DF3",0x6FD7],
+  ["9DF4",0x6FD8],
+  ["9DF5",0x6FD9],
+  ["9DF6",0x6FDA],
+  ["9DF7",0x6FDB],
+  ["9DF8",0x6FDC],
+  ["9DF9",0x6FDD],
+  ["E5A8",0x6FDE],
+  ["9DFA",0x6FDF],
+  ["E5A9",0x6FE0],
+  ["E5A6",0x6FE1],
+  ["9DFB",0x6FE2],
+  ["9DFC",0x6FE3],
+  ["9DFD",0x6FE4],
+  ["9DFE",0x6FE5],
+  ["9E40",0x6FE6],
+  ["9E41",0x6FE7],
+  ["9E42",0x6FE8],
+  ["9E43",0x6FE9],
+  ["9E44",0x6FEA],
+  ["9E45",0x6FEB],
+  ["9E46",0x6FEC],
+  ["9E47",0x6FED],
+  ["E5A7",0x6FEE],
+  ["E5AA",0x6FEF],
+  ["9E48",0x6FF0],
+  ["9E49",0x6FF1],
+  ["9E4A",0x6FF2],
+  ["9E4B",0x6FF3],
+  ["9E4C",0x6FF4],
+  ["9E4D",0x6FF5],
+  ["9E4E",0x6FF6],
+  ["9E4F",0x6FF7],
+  ["9E50",0x6FF8],
+  ["9E51",0x6FF9],
+  ["9E52",0x6FFA],
+  ["9E53",0x6FFB],
+  ["9E54",0x6FFC],
+  ["9E55",0x6FFD],
+  ["9E56",0x6FFE],
+  ["9E57",0x6FFF],
+  ["9E58",0x7000],
+  ["9E59",0x7001],
+  ["9E5A",0x7002],
+  ["9E5B",0x7003],
+  ["9E5C",0x7004],
+  ["9E5D",0x7005],
+  ["9E5E",0x7006],
+  ["9E5F",0x7007],
+  ["9E60",0x7008],
+  ["9E61",0x7009],
+  ["9E62",0x700A],
+  ["9E63",0x700B],
+  ["9E64",0x700C],
+  ["9E65",0x700D],
+  ["9E66",0x700E],
+  ["9E67",0x700F],
+  ["9E68",0x7010],
+  ["C6D9",0x7011],
+  ["9E69",0x7012],
+  ["9E6A",0x7013],
+  ["9E6B",0x7014],
+  ["9E6C",0x7015],
+  ["9E6D",0x7016],
+  ["9E6E",0x7017],
+  ["9E6F",0x7018],
+  ["9E70",0x7019],
+  ["E5AB",0x701A],
+  ["E5AD",0x701B],
+  ["9E71",0x701C],
+  ["9E72",0x701D],
+  ["9E73",0x701E],
+  ["9E74",0x701F],
+  ["9E75",0x7020],
+  ["9E76",0x7021],
+  ["9E77",0x7022],
+  ["E5AC",0x7023],
+  ["9E78",0x7024],
+  ["9E79",0x7025],
+  ["9E7A",0x7026],
+  ["9E7B",0x7027],
+  ["9E7C",0x7028],
+  ["9E7D",0x7029],
+  ["9E7E",0x702A],
+  ["9E80",0x702B],
+  ["9E81",0x702C],
+  ["9E82",0x702D],
+  ["9E83",0x702E],
+  ["9E84",0x702F],
+  ["9E85",0x7030],
+  ["9E86",0x7031],
+  ["9E87",0x7032],
+  ["9E88",0x7033],
+  ["9E89",0x7034],
+  ["E5AF",0x7035],
+  ["9E8A",0x7036],
+  ["9E8B",0x7037],
+  ["9E8C",0x7038],
+  ["E5AE",0x7039],
+  ["9E8D",0x703A],
+  ["9E8E",0x703B],
+  ["9E8F",0x703C],
+  ["9E90",0x703D],
+  ["9E91",0x703E],
+  ["9E92",0x703F],
+  ["9E93",0x7040],
+  ["9E94",0x7041],
+  ["9E95",0x7042],
+  ["9E96",0x7043],
+  ["9E97",0x7044],
+  ["9E98",0x7045],
+  ["9E99",0x7046],
+  ["9E9A",0x7047],
+  ["9E9B",0x7048],
+  ["9E9C",0x7049],
+  ["9E9D",0x704A],
+  ["9E9E",0x704B],
+  ["B9E0",0x704C],
+  ["9E9F",0x704D],
+  ["9EA0",0x704E],
+  ["E5B0",0x704F],
+  ["9EA1",0x7050],
+  ["9EA2",0x7051],
+  ["9EA3",0x7052],
+  ["9EA4",0x7053],
+  ["9EA5",0x7054],
+  ["9EA6",0x7055],
+  ["9EA7",0x7056],
+  ["9EA8",0x7057],
+  ["9EA9",0x7058],
+  ["9EAA",0x7059],
+  ["9EAB",0x705A],
+  ["9EAC",0x705B],
+  ["9EAD",0x705C],
+  ["9EAE",0x705D],
+  ["E5B1",0x705E],
+  ["9EAF",0x705F],
+  ["9EB0",0x7060],
+  ["9EB1",0x7061],
+  ["9EB2",0x7062],
+  ["9EB3",0x7063],
+  ["9EB4",0x7064],
+  ["9EB5",0x7065],
+  ["9EB6",0x7066],
+  ["9EB7",0x7067],
+  ["9EB8",0x7068],
+  ["9EB9",0x7069],
+  ["9EBA",0x706A],
+  ["BBF0",0x706B],
+  ["ECE1",0x706C],
+  ["C3F0",0x706D],
+  ["9EBB",0x706E],
+  ["B5C6",0x706F],
+  ["BBD2",0x7070],
+  ["9EBC",0x7071],
+  ["9EBD",0x7072],
+  ["9EBE",0x7073],
+  ["9EBF",0x7074],
+  ["C1E9",0x7075],
+  ["D4EE",0x7076],
+  ["9EC0",0x7077],
+  ["BEC4",0x7078],
+  ["9EC1",0x7079],
+  ["9EC2",0x707A],
+  ["9EC3",0x707B],
+  ["D7C6",0x707C],
+  ["9EC4",0x707D],
+  ["D4D6",0x707E],
+  ["B2D3",0x707F],
+  ["ECBE",0x7080],
+  ["9EC5",0x7081],
+  ["9EC6",0x7082],
+  ["9EC7",0x7083],
+  ["9EC8",0x7084],
+  ["EAC1",0x7085],
+  ["9EC9",0x7086],
+  ["9ECA",0x7087],
+  ["9ECB",0x7088],
+  ["C2AF",0x7089],
+  ["B4B6",0x708A],
+  ["9ECC",0x708B],
+  ["9ECD",0x708C],
+  ["9ECE",0x708D],
+  ["D1D7",0x708E],
+  ["9ECF",0x708F],
+  ["9ED0",0x7090],
+  ["9ED1",0x7091],
+  ["B3B4",0x7092],
+  ["9ED2",0x7093],
+  ["C8B2",0x7094],
+  ["BFBB",0x7095],
+  ["ECC0",0x7096],
+  ["9ED3",0x7097],
+  ["9ED4",0x7098],
+  ["D6CB",0x7099],
+  ["9ED5",0x709A],
+  ["9ED6",0x709B],
+  ["ECBF",0x709C],
+  ["ECC1",0x709D],
+  ["9ED7",0x709E],
+  ["9ED8",0x709F],
+  ["9ED9",0x70A0],
+  ["9EDA",0x70A1],
+  ["9EDB",0x70A2],
+  ["9EDC",0x70A3],
+  ["9EDD",0x70A4],
+  ["9EDE",0x70A5],
+  ["9EDF",0x70A6],
+  ["9EE0",0x70A7],
+  ["9EE1",0x70A8],
+  ["9EE2",0x70A9],
+  ["9EE3",0x70AA],
+  ["ECC5",0x70AB],
+  ["BEE6",0x70AC],
+  ["CCBF",0x70AD],
+  ["C5DA",0x70AE],
+  ["BEBC",0x70AF],
+  ["9EE4",0x70B0],
+  ["ECC6",0x70B1],
+  ["9EE5",0x70B2],
+  ["B1FE",0x70B3],
+  ["9EE6",0x70B4],
+  ["9EE7",0x70B5],
+  ["9EE8",0x70B6],
+  ["ECC4",0x70B7],
+  ["D5A8",0x70B8],
+  ["B5E3",0x70B9],
+  ["9EE9",0x70BA],
+  ["ECC2",0x70BB],
+  ["C1B6",0x70BC],
+  ["B3E3",0x70BD],
+  ["9EEA",0x70BE],
+  ["9EEB",0x70BF],
+  ["ECC3",0x70C0],
+  ["CBB8",0x70C1],
+  ["C0C3",0x70C2],
+  ["CCFE",0x70C3],
+  ["9EEC",0x70C4],
+  ["9EED",0x70C5],
+  ["9EEE",0x70C6],
+  ["9EEF",0x70C7],
+  ["C1D2",0x70C8],
+  ["9EF0",0x70C9],
+  ["ECC8",0x70CA],
+  ["9EF1",0x70CB],
+  ["9EF2",0x70CC],
+  ["9EF3",0x70CD],
+  ["9EF4",0x70CE],
+  ["9EF5",0x70CF],
+  ["9EF6",0x70D0],
+  ["9EF7",0x70D1],
+  ["9EF8",0x70D2],
+  ["9EF9",0x70D3],
+  ["9EFA",0x70D4],
+  ["9EFB",0x70D5],
+  ["9EFC",0x70D6],
+  ["9EFD",0x70D7],
+  ["BAE6",0x70D8],
+  ["C0D3",0x70D9],
+  ["9EFE",0x70DA],
+  ["D6F2",0x70DB],
+  ["9F40",0x70DC],
+  ["9F41",0x70DD],
+  ["9F42",0x70DE],
+  ["D1CC",0x70DF],
+  ["9F43",0x70E0],
+  ["9F44",0x70E1],
+  ["9F45",0x70E2],
+  ["9F46",0x70E3],
+  ["BFBE",0x70E4],
+  ["9F47",0x70E5],
+  ["B7B3",0x70E6],
+  ["C9D5",0x70E7],
+  ["ECC7",0x70E8],
+  ["BBE2",0x70E9],
+  ["9F48",0x70EA],
+  ["CCCC",0x70EB],
+  ["BDFD",0x70EC],
+  ["C8C8",0x70ED],
+  ["9F49",0x70EE],
+  ["CFA9",0x70EF],
+  ["9F4A",0x70F0],
+  ["9F4B",0x70F1],
+  ["9F4C",0x70F2],
+  ["9F4D",0x70F3],
+  ["9F4E",0x70F4],
+  ["9F4F",0x70F5],
+  ["9F50",0x70F6],
+  ["CDE9",0x70F7],
+  ["9F51",0x70F8],
+  ["C5EB",0x70F9],
+  ["9F52",0x70FA],
+  ["9F53",0x70FB],
+  ["9F54",0x70FC],
+  ["B7E9",0x70FD],
+  ["9F55",0x70FE],
+  ["9F56",0x70FF],
+  ["9F57",0x7100],
+  ["9F58",0x7101],
+  ["9F59",0x7102],
+  ["9F5A",0x7103],
+  ["9F5B",0x7104],
+  ["9F5C",0x7105],
+  ["9F5D",0x7106],
+  ["9F5E",0x7107],
+  ["9F5F",0x7108],
+  ["D1C9",0x7109],
+  ["BAB8",0x710A],
+  ["9F60",0x710B],
+  ["9F61",0x710C],
+  ["9F62",0x710D],
+  ["9F63",0x710E],
+  ["9F64",0x710F],
+  ["ECC9",0x7110],
+  ["9F65",0x7111],
+  ["9F66",0x7112],
+  ["ECCA",0x7113],
+  ["9F67",0x7114],
+  ["BBC0",0x7115],
+  ["ECCB",0x7116],
+  ["9F68",0x7117],
+  ["ECE2",0x7118],
+  ["B1BA",0x7119],
+  ["B7D9",0x711A],
+  ["9F69",0x711B],
+  ["9F6A",0x711C],
+  ["9F6B",0x711D],
+  ["9F6C",0x711E],
+  ["9F6D",0x711F],
+  ["9F6E",0x7120],
+  ["9F6F",0x7121],
+  ["9F70",0x7122],
+  ["9F71",0x7123],
+  ["9F72",0x7124],
+  ["9F73",0x7125],
+  ["BDB9",0x7126],
+  ["9F74",0x7127],
+  ["9F75",0x7128],
+  ["9F76",0x7129],
+  ["9F77",0x712A],
+  ["9F78",0x712B],
+  ["9F79",0x712C],
+  ["9F7A",0x712D],
+  ["9F7B",0x712E],
+  ["ECCC",0x712F],
+  ["D1E6",0x7130],
+  ["ECCD",0x7131],
+  ["9F7C",0x7132],
+  ["9F7D",0x7133],
+  ["9F7E",0x7134],
+  ["9F80",0x7135],
+  ["C8BB",0x7136],
+  ["9F81",0x7137],
+  ["9F82",0x7138],
+  ["9F83",0x7139],
+  ["9F84",0x713A],
+  ["9F85",0x713B],
+  ["9F86",0x713C],
+  ["9F87",0x713D],
+  ["9F88",0x713E],
+  ["9F89",0x713F],
+  ["9F8A",0x7140],
+  ["9F8B",0x7141],
+  ["9F8C",0x7142],
+  ["9F8D",0x7143],
+  ["9F8E",0x7144],
+  ["ECD1",0x7145],
+  ["9F8F",0x7146],
+  ["9F90",0x7147],
+  ["9F91",0x7148],
+  ["9F92",0x7149],
+  ["ECD3",0x714A],
+  ["9F93",0x714B],
+  ["BBCD",0x714C],
+  ["9F94",0x714D],
+  ["BCE5",0x714E],
+  ["9F95",0x714F],
+  ["9F96",0x7150],
+  ["9F97",0x7151],
+  ["9F98",0x7152],
+  ["9F99",0x7153],
+  ["9F9A",0x7154],
+  ["9F9B",0x7155],
+  ["9F9C",0x7156],
+  ["9F9D",0x7157],
+  ["9F9E",0x7158],
+  ["9F9F",0x7159],
+  ["9FA0",0x715A],
+  ["9FA1",0x715B],
+  ["ECCF",0x715C],
+  ["9FA2",0x715D],
+  ["C9B7",0x715E],
+  ["9FA3",0x715F],
+  ["9FA4",0x7160],
+  ["9FA5",0x7161],
+  ["9FA6",0x7162],
+  ["9FA7",0x7163],
+  ["C3BA",0x7164],
+  ["9FA8",0x7165],
+  ["ECE3",0x7166],
+  ["D5D5",0x7167],
+  ["ECD0",0x7168],
+  ["9FA9",0x7169],
+  ["9FAA",0x716A],
+  ["9FAB",0x716B],
+  ["9FAC",0x716C],
+  ["9FAD",0x716D],
+  ["D6F3",0x716E],
+  ["9FAE",0x716F],
+  ["9FAF",0x7170],
+  ["9FB0",0x7171],
+  ["ECD2",0x7172],
+  ["ECCE",0x7173],
+  ["9FB1",0x7174],
+  ["9FB2",0x7175],
+  ["9FB3",0x7176],
+  ["9FB4",0x7177],
+  ["ECD4",0x7178],
+  ["9FB5",0x7179],
+  ["ECD5",0x717A],
+  ["9FB6",0x717B],
+  ["9FB7",0x717C],
+  ["C9BF",0x717D],
+  ["9FB8",0x717E],
+  ["9FB9",0x717F],
+  ["9FBA",0x7180],
+  ["9FBB",0x7181],
+  ["9FBC",0x7182],
+  ["9FBD",0x7183],
+  ["CFA8",0x7184],
+  ["9FBE",0x7185],
+  ["9FBF",0x7186],
+  ["9FC0",0x7187],
+  ["9FC1",0x7188],
+  ["9FC2",0x7189],
+  ["D0DC",0x718A],
+  ["9FC3",0x718B],
+  ["9FC4",0x718C],
+  ["9FC5",0x718D],
+  ["9FC6",0x718E],
+  ["D1AC",0x718F],
+  ["9FC7",0x7190],
+  ["9FC8",0x7191],
+  ["9FC9",0x7192],
+  ["9FCA",0x7193],
+  ["C8DB",0x7194],
+  ["9FCB",0x7195],
+  ["9FCC",0x7196],
+  ["9FCD",0x7197],
+  ["ECD6",0x7198],
+  ["CEF5",0x7199],
+  ["9FCE",0x719A],
+  ["9FCF",0x719B],
+  ["9FD0",0x719C],
+  ["9FD1",0x719D],
+  ["9FD2",0x719E],
+  ["CAEC",0x719F],
+  ["ECDA",0x71A0],
+  ["9FD3",0x71A1],
+  ["9FD4",0x71A2],
+  ["9FD5",0x71A3],
+  ["9FD6",0x71A4],
+  ["9FD7",0x71A5],
+  ["9FD8",0x71A6],
+  ["9FD9",0x71A7],
+  ["ECD9",0x71A8],
+  ["9FDA",0x71A9],
+  ["9FDB",0x71AA],
+  ["9FDC",0x71AB],
+  ["B0BE",0x71AC],
+  ["9FDD",0x71AD],
+  ["9FDE",0x71AE],
+  ["9FDF",0x71AF],
+  ["9FE0",0x71B0],
+  ["9FE1",0x71B1],
+  ["9FE2",0x71B2],
+  ["ECD7",0x71B3],
+  ["9FE3",0x71B4],
+  ["ECD8",0x71B5],
+  ["9FE4",0x71B6],
+  ["9FE5",0x71B7],
+  ["9FE6",0x71B8],
+  ["ECE4",0x71B9],
+  ["9FE7",0x71BA],
+  ["9FE8",0x71BB],
+  ["9FE9",0x71BC],
+  ["9FEA",0x71BD],
+  ["9FEB",0x71BE],
+  ["9FEC",0x71BF],
+  ["9FED",0x71C0],
+  ["9FEE",0x71C1],
+  ["9FEF",0x71C2],
+  ["C8BC",0x71C3],
+  ["9FF0",0x71C4],
+  ["9FF1",0x71C5],
+  ["9FF2",0x71C6],
+  ["9FF3",0x71C7],
+  ["9FF4",0x71C8],
+  ["9FF5",0x71C9],
+  ["9FF6",0x71CA],
+  ["9FF7",0x71CB],
+  ["9FF8",0x71CC],
+  ["9FF9",0x71CD],
+  ["C1C7",0x71CE],
+  ["9FFA",0x71CF],
+  ["9FFB",0x71D0],
+  ["9FFC",0x71D1],
+  ["9FFD",0x71D2],
+  ["9FFE",0x71D3],
+  ["ECDC",0x71D4],
+  ["D1E0",0x71D5],
+  ["A040",0x71D6],
+  ["A041",0x71D7],
+  ["A042",0x71D8],
+  ["A043",0x71D9],
+  ["A044",0x71DA],
+  ["A045",0x71DB],
+  ["A046",0x71DC],
+  ["A047",0x71DD],
+  ["A048",0x71DE],
+  ["A049",0x71DF],
+  ["ECDB",0x71E0],
+  ["A04A",0x71E1],
+  ["A04B",0x71E2],
+  ["A04C",0x71E3],
+  ["A04D",0x71E4],
+  ["D4EF",0x71E5],
+  ["A04E",0x71E6],
+  ["ECDD",0x71E7],
+  ["A04F",0x71E8],
+  ["A050",0x71E9],
+  ["A051",0x71EA],
+  ["A052",0x71EB],
+  ["A053",0x71EC],
+  ["A054",0x71ED],
+  ["DBC6",0x71EE],
+  ["A055",0x71EF],
+  ["A056",0x71F0],
+  ["A057",0x71F1],
+  ["A058",0x71F2],
+  ["A059",0x71F3],
+  ["A05A",0x71F4],
+  ["A05B",0x71F5],
+  ["A05C",0x71F6],
+  ["A05D",0x71F7],
+  ["A05E",0x71F8],
+  ["ECDE",0x71F9],
+  ["A05F",0x71FA],
+  ["A060",0x71FB],
+  ["A061",0x71FC],
+  ["A062",0x71FD],
+  ["A063",0x71FE],
+  ["A064",0x71FF],
+  ["A065",0x7200],
+  ["A066",0x7201],
+  ["A067",0x7202],
+  ["A068",0x7203],
+  ["A069",0x7204],
+  ["A06A",0x7205],
+  ["B1AC",0x7206],
+  ["A06B",0x7207],
+  ["A06C",0x7208],
+  ["A06D",0x7209],
+  ["A06E",0x720A],
+  ["A06F",0x720B],
+  ["A070",0x720C],
+  ["A071",0x720D],
+  ["A072",0x720E],
+  ["A073",0x720F],
+  ["A074",0x7210],
+  ["A075",0x7211],
+  ["A076",0x7212],
+  ["A077",0x7213],
+  ["A078",0x7214],
+  ["A079",0x7215],
+  ["A07A",0x7216],
+  ["A07B",0x7217],
+  ["A07C",0x7218],
+  ["A07D",0x7219],
+  ["A07E",0x721A],
+  ["A080",0x721B],
+  ["A081",0x721C],
+  ["ECDF",0x721D],
+  ["A082",0x721E],
+  ["A083",0x721F],
+  ["A084",0x7220],
+  ["A085",0x7221],
+  ["A086",0x7222],
+  ["A087",0x7223],
+  ["A088",0x7224],
+  ["A089",0x7225],
+  ["A08A",0x7226],
+  ["A08B",0x7227],
+  ["ECE0",0x7228],
+  ["A08C",0x7229],
+  ["D7A6",0x722A],
+  ["A08D",0x722B],
+  ["C5C0",0x722C],
+  ["A08E",0x722D],
+  ["A08F",0x722E],
+  ["A090",0x722F],
+  ["EBBC",0x7230],
+  ["B0AE",0x7231],
+  ["A091",0x7232],
+  ["A092",0x7233],
+  ["A093",0x7234],
+  ["BEF4",0x7235],
+  ["B8B8",0x7236],
+  ["D2AF",0x7237],
+  ["B0D6",0x7238],
+  ["B5F9",0x7239],
+  ["A094",0x723A],
+  ["D8B3",0x723B],
+  ["A095",0x723C],
+  ["CBAC",0x723D],
+  ["A096",0x723E],
+  ["E3DD",0x723F],
+  ["A097",0x7240],
+  ["A098",0x7241],
+  ["A099",0x7242],
+  ["A09A",0x7243],
+  ["A09B",0x7244],
+  ["A09C",0x7245],
+  ["A09D",0x7246],
+  ["C6AC",0x7247],
+  ["B0E6",0x7248],
+  ["A09E",0x7249],
+  ["A09F",0x724A],
+  ["A0A0",0x724B],
+  ["C5C6",0x724C],
+  ["EBB9",0x724D],
+  ["A0A1",0x724E],
+  ["A0A2",0x724F],
+  ["A0A3",0x7250],
+  ["A0A4",0x7251],
+  ["EBBA",0x7252],
+  ["A0A5",0x7253],
+  ["A0A6",0x7254],
+  ["A0A7",0x7255],
+  ["EBBB",0x7256],
+  ["A0A8",0x7257],
+  ["A0A9",0x7258],
+  ["D1C0",0x7259],
+  ["A0AA",0x725A],
+  ["C5A3",0x725B],
+  ["A0AB",0x725C],
+  ["EAF2",0x725D],
+  ["A0AC",0x725E],
+  ["C4B2",0x725F],
+  ["A0AD",0x7260],
+  ["C4B5",0x7261],
+  ["C0CE",0x7262],
+  ["A0AE",0x7263],
+  ["A0AF",0x7264],
+  ["A0B0",0x7265],
+  ["EAF3",0x7266],
+  ["C4C1",0x7267],
+  ["A0B1",0x7268],
+  ["CEEF",0x7269],
+  ["A0B2",0x726A],
+  ["A0B3",0x726B],
+  ["A0B4",0x726C],
+  ["A0B5",0x726D],
+  ["EAF0",0x726E],
+  ["EAF4",0x726F],
+  ["A0B6",0x7270],
+  ["A0B7",0x7271],
+  ["C9FC",0x7272],
+  ["A0B8",0x7273],
+  ["A0B9",0x7274],
+  ["C7A3",0x7275],
+  ["A0BA",0x7276],
+  ["A0BB",0x7277],
+  ["A0BC",0x7278],
+  ["CCD8",0x7279],
+  ["CEFE",0x727A],
+  ["A0BD",0x727B],
+  ["A0BE",0x727C],
+  ["A0BF",0x727D],
+  ["EAF5",0x727E],
+  ["EAF6",0x727F],
+  ["CFAC",0x7280],
+  ["C0E7",0x7281],
+  ["A0C0",0x7282],
+  ["A0C1",0x7283],
+  ["EAF7",0x7284],
+  ["A0C2",0x7285],
+  ["A0C3",0x7286],
+  ["A0C4",0x7287],
+  ["A0C5",0x7288],
+  ["A0C6",0x7289],
+  ["B6BF",0x728A],
+  ["EAF8",0x728B],
+  ["A0C7",0x728C],
+  ["EAF9",0x728D],
+  ["A0C8",0x728E],
+  ["EAFA",0x728F],
+  ["A0C9",0x7290],
+  ["A0CA",0x7291],
+  ["EAFB",0x7292],
+  ["A0CB",0x7293],
+  ["A0CC",0x7294],
+  ["A0CD",0x7295],
+  ["A0CE",0x7296],
+  ["A0CF",0x7297],
+  ["A0D0",0x7298],
+  ["A0D1",0x7299],
+  ["A0D2",0x729A],
+  ["A0D3",0x729B],
+  ["A0D4",0x729C],
+  ["A0D5",0x729D],
+  ["A0D6",0x729E],
+  ["EAF1",0x729F],
+  ["A0D7",0x72A0],
+  ["A0D8",0x72A1],
+  ["A0D9",0x72A2],
+  ["A0DA",0x72A3],
+  ["A0DB",0x72A4],
+  ["A0DC",0x72A5],
+  ["A0DD",0x72A6],
+  ["A0DE",0x72A7],
+  ["A0DF",0x72A8],
+  ["A0E0",0x72A9],
+  ["A0E1",0x72AA],
+  ["A0E2",0x72AB],
+  ["C8AE",0x72AC],
+  ["E1EB",0x72AD],
+  ["A0E3",0x72AE],
+  ["B7B8",0x72AF],
+  ["E1EC",0x72B0],
+  ["A0E4",0x72B1],
+  ["A0E5",0x72B2],
+  ["A0E6",0x72B3],
+  ["E1ED",0x72B4],
+  ["A0E7",0x72B5],
+  ["D7B4",0x72B6],
+  ["E1EE",0x72B7],
+  ["E1EF",0x72B8],
+  ["D3CC",0x72B9],
+  ["A0E8",0x72BA],
+  ["A0E9",0x72BB],
+  ["A0EA",0x72BC],
+  ["A0EB",0x72BD],
+  ["A0EC",0x72BE],
+  ["A0ED",0x72BF],
+  ["A0EE",0x72C0],
+  ["E1F1",0x72C1],
+  ["BFF1",0x72C2],
+  ["E1F0",0x72C3],
+  ["B5D2",0x72C4],
+  ["A0EF",0x72C5],
+  ["A0F0",0x72C6],
+  ["A0F1",0x72C7],
+  ["B1B7",0x72C8],
+  ["A0F2",0x72C9],
+  ["A0F3",0x72CA],
+  ["A0F4",0x72CB],
+  ["A0F5",0x72CC],
+  ["E1F3",0x72CD],
+  ["E1F2",0x72CE],
+  ["A0F6",0x72CF],
+  ["BAFC",0x72D0],
+  ["A0F7",0x72D1],
+  ["E1F4",0x72D2],
+  ["A0F8",0x72D3],
+  ["A0F9",0x72D4],
+  ["A0FA",0x72D5],
+  ["A0FB",0x72D6],
+  ["B9B7",0x72D7],
+  ["A0FC",0x72D8],
+  ["BED1",0x72D9],
+  ["A0FD",0x72DA],
+  ["A0FE",0x72DB],
+  ["AA40",0x72DC],
+  ["AA41",0x72DD],
+  ["C4FC",0x72DE],
+  ["AA42",0x72DF],
+  ["BADD",0x72E0],
+  ["BDC6",0x72E1],
+  ["AA43",0x72E2],
+  ["AA44",0x72E3],
+  ["AA45",0x72E4],
+  ["AA46",0x72E5],
+  ["AA47",0x72E6],
+  ["AA48",0x72E7],
+  ["E1F5",0x72E8],
+  ["E1F7",0x72E9],
+  ["AA49",0x72EA],
+  ["AA4A",0x72EB],
+  ["B6C0",0x72EC],
+  ["CFC1",0x72ED],
+  ["CAA8",0x72EE],
+  ["E1F6",0x72EF],
+  ["D5F8",0x72F0],
+  ["D3FC",0x72F1],
+  ["E1F8",0x72F2],
+  ["E1FC",0x72F3],
+  ["E1F9",0x72F4],
+  ["AA4B",0x72F5],
+  ["AA4C",0x72F6],
+  ["E1FA",0x72F7],
+  ["C0EA",0x72F8],
+  ["AA4D",0x72F9],
+  ["E1FE",0x72FA],
+  ["E2A1",0x72FB],
+  ["C0C7",0x72FC],
+  ["AA4E",0x72FD],
+  ["AA4F",0x72FE],
+  ["AA50",0x72FF],
+  ["AA51",0x7300],
+  ["E1FB",0x7301],
+  ["AA52",0x7302],
+  ["E1FD",0x7303],
+  ["AA53",0x7304],
+  ["AA54",0x7305],
+  ["AA55",0x7306],
+  ["AA56",0x7307],
+  ["AA57",0x7308],
+  ["AA58",0x7309],
+  ["E2A5",0x730A],
+  ["AA59",0x730B],
+  ["AA5A",0x730C],
+  ["AA5B",0x730D],
+  ["C1D4",0x730E],
+  ["AA5C",0x730F],
+  ["AA5D",0x7310],
+  ["AA5E",0x7311],
+  ["AA5F",0x7312],
+  ["E2A3",0x7313],
+  ["AA60",0x7314],
+  ["E2A8",0x7315],
+  ["B2FE",0x7316],
+  ["E2A2",0x7317],
+  ["AA61",0x7318],
+  ["AA62",0x7319],
+  ["AA63",0x731A],
+  ["C3CD",0x731B],
+  ["B2C2",0x731C],
+  ["E2A7",0x731D],
+  ["E2A6",0x731E],
+  ["AA64",0x731F],
+  ["AA65",0x7320],
+  ["E2A4",0x7321],
+  ["E2A9",0x7322],
+  ["AA66",0x7323],
+  ["AA67",0x7324],
+  ["E2AB",0x7325],
+  ["AA68",0x7326],
+  ["AA69",0x7327],
+  ["AA6A",0x7328],
+  ["D0C9",0x7329],
+  ["D6ED",0x732A],
+  ["C3A8",0x732B],
+  ["E2AC",0x732C],
+  ["AA6B",0x732D],
+  ["CFD7",0x732E],
+  ["AA6C",0x732F],
+  ["AA6D",0x7330],
+  ["E2AE",0x7331],
+  ["AA6E",0x7332],
+  ["AA6F",0x7333],
+  ["BAEF",0x7334],
+  ["AA70",0x7335],
+  ["AA71",0x7336],
+  ["E9E0",0x7337],
+  ["E2AD",0x7338],
+  ["E2AA",0x7339],
+  ["AA72",0x733A],
+  ["AA73",0x733B],
+  ["AA74",0x733C],
+  ["AA75",0x733D],
+  ["BBAB",0x733E],
+  ["D4B3",0x733F],
+  ["AA76",0x7340],
+  ["AA77",0x7341],
+  ["AA78",0x7342],
+  ["AA79",0x7343],
+  ["AA7A",0x7344],
+  ["AA7B",0x7345],
+  ["AA7C",0x7346],
+  ["AA7D",0x7347],
+  ["AA7E",0x7348],
+  ["AA80",0x7349],
+  ["AA81",0x734A],
+  ["AA82",0x734B],
+  ["AA83",0x734C],
+  ["E2B0",0x734D],
+  ["AA84",0x734E],
+  ["AA85",0x734F],
+  ["E2AF",0x7350],
+  ["AA86",0x7351],
+  ["E9E1",0x7352],
+  ["AA87",0x7353],
+  ["AA88",0x7354],
+  ["AA89",0x7355],
+  ["AA8A",0x7356],
+  ["E2B1",0x7357],
+  ["AA8B",0x7358],
+  ["AA8C",0x7359],
+  ["AA8D",0x735A],
+  ["AA8E",0x735B],
+  ["AA8F",0x735C],
+  ["AA90",0x735D],
+  ["AA91",0x735E],
+  ["AA92",0x735F],
+  ["E2B2",0x7360],
+  ["AA93",0x7361],
+  ["AA94",0x7362],
+  ["AA95",0x7363],
+  ["AA96",0x7364],
+  ["AA97",0x7365],
+  ["AA98",0x7366],
+  ["AA99",0x7367],
+  ["AA9A",0x7368],
+  ["AA9B",0x7369],
+  ["AA9C",0x736A],
+  ["AA9D",0x736B],
+  ["E2B3",0x736C],
+  ["CCA1",0x736D],
+  ["AA9E",0x736E],
+  ["E2B4",0x736F],
+  ["AA9F",0x7370],
+  ["AAA0",0x7371],
+  ["AB40",0x7372],
+  ["AB41",0x7373],
+  ["AB42",0x7374],
+  ["AB43",0x7375],
+  ["AB44",0x7376],
+  ["AB45",0x7377],
+  ["AB46",0x7378],
+  ["AB47",0x7379],
+  ["AB48",0x737A],
+  ["AB49",0x737B],
+  ["AB4A",0x737C],
+  ["AB4B",0x737D],
+  ["E2B5",0x737E],
+  ["AB4C",0x737F],
+  ["AB4D",0x7380],
+  ["AB4E",0x7381],
+  ["AB4F",0x7382],
+  ["AB50",0x7383],
+  ["D0FE",0x7384],
+  ["AB51",0x7385],
+  ["AB52",0x7386],
+  ["C2CA",0x7387],
+  ["AB53",0x7388],
+  ["D3F1",0x7389],
+  ["AB54",0x738A],
+  ["CDF5",0x738B],
+  ["AB55",0x738C],
+  ["AB56",0x738D],
+  ["E7E0",0x738E],
+  ["AB57",0x738F],
+  ["AB58",0x7390],
+  ["E7E1",0x7391],
+  ["AB59",0x7392],
+  ["AB5A",0x7393],
+  ["AB5B",0x7394],
+  ["AB5C",0x7395],
+  ["BEC1",0x7396],
+  ["AB5D",0x7397],
+  ["AB5E",0x7398],
+  ["AB5F",0x7399],
+  ["AB60",0x739A],
+  ["C2EA",0x739B],
+  ["AB61",0x739C],
+  ["AB62",0x739D],
+  ["AB63",0x739E],
+  ["E7E4",0x739F],
+  ["AB64",0x73A0],
+  ["AB65",0x73A1],
+  ["E7E3",0x73A2],
+  ["AB66",0x73A3],
+  ["AB67",0x73A4],
+  ["AB68",0x73A5],
+  ["AB69",0x73A6],
+  ["AB6A",0x73A7],
+  ["AB6B",0x73A8],
+  ["CDE6",0x73A9],
+  ["AB6C",0x73AA],
+  ["C3B5",0x73AB],
+  ["AB6D",0x73AC],
+  ["AB6E",0x73AD],
+  ["E7E2",0x73AE],
+  ["BBB7",0x73AF],
+  ["CFD6",0x73B0],
+  ["AB6F",0x73B1],
+  ["C1E1",0x73B2],
+  ["E7E9",0x73B3],
+  ["AB70",0x73B4],
+  ["AB71",0x73B5],
+  ["AB72",0x73B6],
+  ["E7E8",0x73B7],
+  ["AB73",0x73B8],
+  ["AB74",0x73B9],
+  ["E7F4",0x73BA],
+  ["B2A3",0x73BB],
+  ["AB75",0x73BC],
+  ["AB76",0x73BD],
+  ["AB77",0x73BE],
+  ["AB78",0x73BF],
+  ["E7EA",0x73C0],
+  ["AB79",0x73C1],
+  ["E7E6",0x73C2],
+  ["AB7A",0x73C3],
+  ["AB7B",0x73C4],
+  ["AB7C",0x73C5],
+  ["AB7D",0x73C6],
+  ["AB7E",0x73C7],
+  ["E7EC",0x73C8],
+  ["E7EB",0x73C9],
+  ["C9BA",0x73CA],
+  ["AB80",0x73CB],
+  ["AB81",0x73CC],
+  ["D5E4",0x73CD],
+  ["AB82",0x73CE],
+  ["E7E5",0x73CF],
+  ["B7A9",0x73D0],
+  ["E7E7",0x73D1],
+  ["AB83",0x73D2],
+  ["AB84",0x73D3],
+  ["AB85",0x73D4],
+  ["AB86",0x73D5],
+  ["AB87",0x73D6],
+  ["AB88",0x73D7],
+  ["AB89",0x73D8],
+  ["E7EE",0x73D9],
+  ["AB8A",0x73DA],
+  ["AB8B",0x73DB],
+  ["AB8C",0x73DC],
+  ["AB8D",0x73DD],
+  ["E7F3",0x73DE],
+  ["AB8E",0x73DF],
+  ["D6E9",0x73E0],
+  ["AB8F",0x73E1],
+  ["AB90",0x73E2],
+  ["AB91",0x73E3],
+  ["AB92",0x73E4],
+  ["E7ED",0x73E5],
+  ["AB93",0x73E6],
+  ["E7F2",0x73E7],
+  ["AB94",0x73E8],
+  ["E7F1",0x73E9],
+  ["AB95",0x73EA],
+  ["AB96",0x73EB],
+  ["AB97",0x73EC],
+  ["B0E0",0x73ED],
+  ["AB98",0x73EE],
+  ["AB99",0x73EF],
+  ["AB9A",0x73F0],
+  ["AB9B",0x73F1],
+  ["E7F5",0x73F2],
+  ["AB9C",0x73F3],
+  ["AB9D",0x73F4],
+  ["AB9E",0x73F5],
+  ["AB9F",0x73F6],
+  ["ABA0",0x73F7],
+  ["AC40",0x73F8],
+  ["AC41",0x73F9],
+  ["AC42",0x73FA],
+  ["AC43",0x73FB],
+  ["AC44",0x73FC],
+  ["AC45",0x73FD],
+  ["AC46",0x73FE],
+  ["AC47",0x73FF],
+  ["AC48",0x7400],
+  ["AC49",0x7401],
+  ["AC4A",0x7402],
+  ["C7F2",0x7403],
+  ["AC4B",0x7404],
+  ["C0C5",0x7405],
+  ["C0ED",0x7406],
+  ["AC4C",0x7407],
+  ["AC4D",0x7408],
+  ["C1F0",0x7409],
+  ["E7F0",0x740A],
+  ["AC4E",0x740B],
+  ["AC4F",0x740C],
+  ["AC50",0x740D],
+  ["AC51",0x740E],
+  ["E7F6",0x740F],
+  ["CBF6",0x7410],
+  ["AC52",0x7411],
+  ["AC53",0x7412],
+  ["AC54",0x7413],
+  ["AC55",0x7414],
+  ["AC56",0x7415],
+  ["AC57",0x7416],
+  ["AC58",0x7417],
+  ["AC59",0x7418],
+  ["AC5A",0x7419],
+  ["E8A2",0x741A],
+  ["E8A1",0x741B],
+  ["AC5B",0x741C],
+  ["AC5C",0x741D],
+  ["AC5D",0x741E],
+  ["AC5E",0x741F],
+  ["AC5F",0x7420],
+  ["AC60",0x7421],
+  ["D7C1",0x7422],
+  ["AC61",0x7423],
+  ["AC62",0x7424],
+  ["E7FA",0x7425],
+  ["E7F9",0x7426],
+  ["AC63",0x7427],
+  ["E7FB",0x7428],
+  ["AC64",0x7429],
+  ["E7F7",0x742A],
+  ["AC65",0x742B],
+  ["E7FE",0x742C],
+  ["AC66",0x742D],
+  ["E7FD",0x742E],
+  ["AC67",0x742F],
+  ["E7FC",0x7430],
+  ["AC68",0x7431],
+  ["AC69",0x7432],
+  ["C1D5",0x7433],
+  ["C7D9",0x7434],
+  ["C5FD",0x7435],
+  ["C5C3",0x7436],
+  ["AC6A",0x7437],
+  ["AC6B",0x7438],
+  ["AC6C",0x7439],
+  ["AC6D",0x743A],
+  ["AC6E",0x743B],
+  ["C7ED",0x743C],
+  ["AC6F",0x743D],
+  ["AC70",0x743E],
+  ["AC71",0x743F],
+  ["AC72",0x7440],
+  ["E8A3",0x7441],
+  ["AC73",0x7442],
+  ["AC74",0x7443],
+  ["AC75",0x7444],
+  ["AC76",0x7445],
+  ["AC77",0x7446],
+  ["AC78",0x7447],
+  ["AC79",0x7448],
+  ["AC7A",0x7449],
+  ["AC7B",0x744A],
+  ["AC7C",0x744B],
+  ["AC7D",0x744C],
+  ["AC7E",0x744D],
+  ["AC80",0x744E],
+  ["AC81",0x744F],
+  ["AC82",0x7450],
+  ["AC83",0x7451],
+  ["AC84",0x7452],
+  ["AC85",0x7453],
+  ["AC86",0x7454],
+  ["E8A6",0x7455],
+  ["AC87",0x7456],
+  ["E8A5",0x7457],
+  ["AC88",0x7458],
+  ["E8A7",0x7459],
+  ["BAF7",0x745A],
+  ["E7F8",0x745B],
+  ["E8A4",0x745C],
+  ["AC89",0x745D],
+  ["C8F0",0x745E],
+  ["C9AA",0x745F],
+  ["AC8A",0x7460],
+  ["AC8B",0x7461],
+  ["AC8C",0x7462],
+  ["AC8D",0x7463],
+  ["AC8E",0x7464],
+  ["AC8F",0x7465],
+  ["AC90",0x7466],
+  ["AC91",0x7467],
+  ["AC92",0x7468],
+  ["AC93",0x7469],
+  ["AC94",0x746A],
+  ["AC95",0x746B],
+  ["AC96",0x746C],
+  ["E8A9",0x746D],
+  ["AC97",0x746E],
+  ["AC98",0x746F],
+  ["B9E5",0x7470],
+  ["AC99",0x7471],
+  ["AC9A",0x7472],
+  ["AC9B",0x7473],
+  ["AC9C",0x7474],
+  ["AC9D",0x7475],
+  ["D1FE",0x7476],
+  ["E8A8",0x7477],
+  ["AC9E",0x7478],
+  ["AC9F",0x7479],
+  ["ACA0",0x747A],
+  ["AD40",0x747B],
+  ["AD41",0x747C],
+  ["AD42",0x747D],
+  ["E8AA",0x747E],
+  ["AD43",0x747F],
+  ["E8AD",0x7480],
+  ["E8AE",0x7481],
+  ["AD44",0x7482],
+  ["C1A7",0x7483],
+  ["AD45",0x7484],
+  ["AD46",0x7485],
+  ["AD47",0x7486],
+  ["E8AF",0x7487],
+  ["AD48",0x7488],
+  ["AD49",0x7489],
+  ["AD4A",0x748A],
+  ["E8B0",0x748B],
+  ["AD4B",0x748C],
+  ["AD4C",0x748D],
+  ["E8AC",0x748E],
+  ["AD4D",0x748F],
+  ["E8B4",0x7490],
+  ["AD4E",0x7491],
+  ["AD4F",0x7492],
+  ["AD50",0x7493],
+  ["AD51",0x7494],
+  ["AD52",0x7495],
+  ["AD53",0x7496],
+  ["AD54",0x7497],
+  ["AD55",0x7498],
+  ["AD56",0x7499],
+  ["AD57",0x749A],
+  ["AD58",0x749B],
+  ["E8AB",0x749C],
+  ["AD59",0x749D],
+  ["E8B1",0x749E],
+  ["AD5A",0x749F],
+  ["AD5B",0x74A0],
+  ["AD5C",0x74A1],
+  ["AD5D",0x74A2],
+  ["AD5E",0x74A3],
+  ["AD5F",0x74A4],
+  ["AD60",0x74A5],
+  ["AD61",0x74A6],
+  ["E8B5",0x74A7],
+  ["E8B2",0x74A8],
+  ["E8B3",0x74A9],
+  ["AD62",0x74AA],
+  ["AD63",0x74AB],
+  ["AD64",0x74AC],
+  ["AD65",0x74AD],
+  ["AD66",0x74AE],
+  ["AD67",0x74AF],
+  ["AD68",0x74B0],
+  ["AD69",0x74B1],
+  ["AD6A",0x74B2],
+  ["AD6B",0x74B3],
+  ["AD6C",0x74B4],
+  ["AD6D",0x74B5],
+  ["AD6E",0x74B6],
+  ["AD6F",0x74B7],
+  ["AD70",0x74B8],
+  ["AD71",0x74B9],
+  ["E8B7",0x74BA],
+  ["AD72",0x74BB],
+  ["AD73",0x74BC],
+  ["AD74",0x74BD],
+  ["AD75",0x74BE],
+  ["AD76",0x74BF],
+  ["AD77",0x74C0],
+  ["AD78",0x74C1],
+  ["AD79",0x74C2],
+  ["AD7A",0x74C3],
+  ["AD7B",0x74C4],
+  ["AD7C",0x74C5],
+  ["AD7D",0x74C6],
+  ["AD7E",0x74C7],
+  ["AD80",0x74C8],
+  ["AD81",0x74C9],
+  ["AD82",0x74CA],
+  ["AD83",0x74CB],
+  ["AD84",0x74CC],
+  ["AD85",0x74CD],
+  ["AD86",0x74CE],
+  ["AD87",0x74CF],
+  ["AD88",0x74D0],
+  ["AD89",0x74D1],
+  ["E8B6",0x74D2],
+  ["AD8A",0x74D3],
+  ["AD8B",0x74D4],
+  ["AD8C",0x74D5],
+  ["AD8D",0x74D6],
+  ["AD8E",0x74D7],
+  ["AD8F",0x74D8],
+  ["AD90",0x74D9],
+  ["AD91",0x74DA],
+  ["AD92",0x74DB],
+  ["B9CF",0x74DC],
+  ["AD93",0x74DD],
+  ["F0AC",0x74DE],
+  ["AD94",0x74DF],
+  ["F0AD",0x74E0],
+  ["AD95",0x74E1],
+  ["C6B0",0x74E2],
+  ["B0EA",0x74E3],
+  ["C8BF",0x74E4],
+  ["AD96",0x74E5],
+  ["CDDF",0x74E6],
+  ["AD97",0x74E7],
+  ["AD98",0x74E8],
+  ["AD99",0x74E9],
+  ["AD9A",0x74EA],
+  ["AD9B",0x74EB],
+  ["AD9C",0x74EC],
+  ["AD9D",0x74ED],
+  ["CECD",0x74EE],
+  ["EAB1",0x74EF],
+  ["AD9E",0x74F0],
+  ["AD9F",0x74F1],
+  ["ADA0",0x74F2],
+  ["AE40",0x74F3],
+  ["EAB2",0x74F4],
+  ["AE41",0x74F5],
+  ["C6BF",0x74F6],
+  ["B4C9",0x74F7],
+  ["AE42",0x74F8],
+  ["AE43",0x74F9],
+  ["AE44",0x74FA],
+  ["AE45",0x74FB],
+  ["AE46",0x74FC],
+  ["AE47",0x74FD],
+  ["AE48",0x74FE],
+  ["EAB3",0x74FF],
+  ["AE49",0x7500],
+  ["AE4A",0x7501],
+  ["AE4B",0x7502],
+  ["AE4C",0x7503],
+  ["D5E7",0x7504],
+  ["AE4D",0x7505],
+  ["AE4E",0x7506],
+  ["AE4F",0x7507],
+  ["AE50",0x7508],
+  ["AE51",0x7509],
+  ["AE52",0x750A],
+  ["AE53",0x750B],
+  ["AE54",0x750C],
+  ["DDF9",0x750D],
+  ["AE55",0x750E],
+  ["EAB4",0x750F],
+  ["AE56",0x7510],
+  ["EAB5",0x7511],
+  ["AE57",0x7512],
+  ["EAB6",0x7513],
+  ["AE58",0x7514],
+  ["AE59",0x7515],
+  ["AE5A",0x7516],
+  ["AE5B",0x7517],
+  ["B8CA",0x7518],
+  ["DFB0",0x7519],
+  ["C9F5",0x751A],
+  ["AE5C",0x751B],
+  ["CCF0",0x751C],
+  ["AE5D",0x751D],
+  ["AE5E",0x751E],
+  ["C9FA",0x751F],
+  ["AE5F",0x7520],
+  ["AE60",0x7521],
+  ["AE61",0x7522],
+  ["AE62",0x7523],
+  ["AE63",0x7524],
+  ["C9FB",0x7525],
+  ["AE64",0x7526],
+  ["AE65",0x7527],
+  ["D3C3",0x7528],
+  ["CBA6",0x7529],
+  ["AE66",0x752A],
+  ["B8A6",0x752B],
+  ["F0AE",0x752C],
+  ["B1C2",0x752D],
+  ["AE67",0x752E],
+  ["E5B8",0x752F],
+  ["CCEF",0x7530],
+  ["D3C9",0x7531],
+  ["BCD7",0x7532],
+  ["C9EA",0x7533],
+  ["AE68",0x7534],
+  ["B5E7",0x7535],
+  ["AE69",0x7536],
+  ["C4D0",0x7537],
+  ["B5E9",0x7538],
+  ["AE6A",0x7539],
+  ["EEAE",0x753A],
+  ["BBAD",0x753B],
+  ["AE6B",0x753C],
+  ["AE6C",0x753D],
+  ["E7DE",0x753E],
+  ["AE6D",0x753F],
+  ["EEAF",0x7540],
+  ["AE6E",0x7541],
+  ["AE6F",0x7542],
+  ["AE70",0x7543],
+  ["AE71",0x7544],
+  ["B3A9",0x7545],
+  ["AE72",0x7546],
+  ["AE73",0x7547],
+  ["EEB2",0x7548],
+  ["AE74",0x7549],
+  ["AE75",0x754A],
+  ["EEB1",0x754B],
+  ["BDE7",0x754C],
+  ["AE76",0x754D],
+  ["EEB0",0x754E],
+  ["CEB7",0x754F],
+  ["AE77",0x7550],
+  ["AE78",0x7551],
+  ["AE79",0x7552],
+  ["AE7A",0x7553],
+  ["C5CF",0x7554],
+  ["AE7B",0x7555],
+  ["AE7C",0x7556],
+  ["AE7D",0x7557],
+  ["AE7E",0x7558],
+  ["C1F4",0x7559],
+  ["DBCE",0x755A],
+  ["EEB3",0x755B],
+  ["D0F3",0x755C],
+  ["AE80",0x755D],
+  ["AE81",0x755E],
+  ["AE82",0x755F],
+  ["AE83",0x7560],
+  ["AE84",0x7561],
+  ["AE85",0x7562],
+  ["AE86",0x7563],
+  ["AE87",0x7564],
+  ["C2D4",0x7565],
+  ["C6E8",0x7566],
+  ["AE88",0x7567],
+  ["AE89",0x7568],
+  ["AE8A",0x7569],
+  ["B7AC",0x756A],
+  ["AE8B",0x756B],
+  ["AE8C",0x756C],
+  ["AE8D",0x756D],
+  ["AE8E",0x756E],
+  ["AE8F",0x756F],
+  ["AE90",0x7570],
+  ["AE91",0x7571],
+  ["EEB4",0x7572],
+  ["AE92",0x7573],
+  ["B3EB",0x7574],
+  ["AE93",0x7575],
+  ["AE94",0x7576],
+  ["AE95",0x7577],
+  ["BBFB",0x7578],
+  ["EEB5",0x7579],
+  ["AE96",0x757A],
+  ["AE97",0x757B],
+  ["AE98",0x757C],
+  ["AE99",0x757D],
+  ["AE9A",0x757E],
+  ["E7DC",0x757F],
+  ["AE9B",0x7580],
+  ["AE9C",0x7581],
+  ["AE9D",0x7582],
+  ["EEB6",0x7583],
+  ["AE9E",0x7584],
+  ["AE9F",0x7585],
+  ["BDAE",0x7586],
+  ["AEA0",0x7587],
+  ["AF40",0x7588],
+  ["AF41",0x7589],
+  ["AF42",0x758A],
+  ["F1E2",0x758B],
+  ["AF43",0x758C],
+  ["AF44",0x758D],
+  ["AF45",0x758E],
+  ["CAE8",0x758F],
+  ["AF46",0x7590],
+  ["D2C9",0x7591],
+  ["F0DA",0x7592],
+  ["AF47",0x7593],
+  ["F0DB",0x7594],
+  ["AF48",0x7595],
+  ["F0DC",0x7596],
+  ["C1C6",0x7597],
+  ["AF49",0x7598],
+  ["B8ED",0x7599],
+  ["BECE",0x759A],
+  ["AF4A",0x759B],
+  ["AF4B",0x759C],
+  ["F0DE",0x759D],
+  ["AF4C",0x759E],
+  ["C5B1",0x759F],
+  ["F0DD",0x75A0],
+  ["D1F1",0x75A1],
+  ["AF4D",0x75A2],
+  ["F0E0",0x75A3],
+  ["B0CC",0x75A4],
+  ["BDEA",0x75A5],
+  ["AF4E",0x75A6],
+  ["AF4F",0x75A7],
+  ["AF50",0x75A8],
+  ["AF51",0x75A9],
+  ["AF52",0x75AA],
+  ["D2DF",0x75AB],
+  ["F0DF",0x75AC],
+  ["AF53",0x75AD],
+  ["B4AF",0x75AE],
+  ["B7E8",0x75AF],
+  ["F0E6",0x75B0],
+  ["F0E5",0x75B1],
+  ["C6A3",0x75B2],
+  ["F0E1",0x75B3],
+  ["F0E2",0x75B4],
+  ["B4C3",0x75B5],
+  ["AF54",0x75B6],
+  ["AF55",0x75B7],
+  ["F0E3",0x75B8],
+  ["D5EE",0x75B9],
+  ["AF56",0x75BA],
+  ["AF57",0x75BB],
+  ["CCDB",0x75BC],
+  ["BED2",0x75BD],
+  ["BCB2",0x75BE],
+  ["AF58",0x75BF],
+  ["AF59",0x75C0],
+  ["AF5A",0x75C1],
+  ["F0E8",0x75C2],
+  ["F0E7",0x75C3],
+  ["F0E4",0x75C4],
+  ["B2A1",0x75C5],
+  ["AF5B",0x75C6],
+  ["D6A2",0x75C7],
+  ["D3B8",0x75C8],
+  ["BEB7",0x75C9],
+  ["C8AC",0x75CA],
+  ["AF5C",0x75CB],
+  ["AF5D",0x75CC],
+  ["F0EA",0x75CD],
+  ["AF5E",0x75CE],
+  ["AF5F",0x75CF],
+  ["AF60",0x75D0],
+  ["AF61",0x75D1],
+  ["D1F7",0x75D2],
+  ["AF62",0x75D3],
+  ["D6CC",0x75D4],
+  ["BADB",0x75D5],
+  ["F0E9",0x75D6],
+  ["AF63",0x75D7],
+  ["B6BB",0x75D8],
+  ["AF64",0x75D9],
+  ["AF65",0x75DA],
+  ["CDB4",0x75DB],
+  ["AF66",0x75DC],
+  ["AF67",0x75DD],
+  ["C6A6",0x75DE],
+  ["AF68",0x75DF],
+  ["AF69",0x75E0],
+  ["AF6A",0x75E1],
+  ["C1A1",0x75E2],
+  ["F0EB",0x75E3],
+  ["F0EE",0x75E4],
+  ["AF6B",0x75E5],
+  ["F0ED",0x75E6],
+  ["F0F0",0x75E7],
+  ["F0EC",0x75E8],
+  ["AF6C",0x75E9],
+  ["BBBE",0x75EA],
+  ["F0EF",0x75EB],
+  ["AF6D",0x75EC],
+  ["AF6E",0x75ED],
+  ["AF6F",0x75EE],
+  ["AF70",0x75EF],
+  ["CCB5",0x75F0],
+  ["F0F2",0x75F1],
+  ["AF71",0x75F2],
+  ["AF72",0x75F3],
+  ["B3D5",0x75F4],
+  ["AF73",0x75F5],
+  ["AF74",0x75F6],
+  ["AF75",0x75F7],
+  ["AF76",0x75F8],
+  ["B1D4",0x75F9],
+  ["AF77",0x75FA],
+  ["AF78",0x75FB],
+  ["F0F3",0x75FC],
+  ["AF79",0x75FD],
+  ["AF7A",0x75FE],
+  ["F0F4",0x75FF],
+  ["F0F6",0x7600],
+  ["B4E1",0x7601],
+  ["AF7B",0x7602],
+  ["F0F1",0x7603],
+  ["AF7C",0x7604],
+  ["F0F7",0x7605],
+  ["AF7D",0x7606],
+  ["AF7E",0x7607],
+  ["AF80",0x7608],
+  ["AF81",0x7609],
+  ["F0FA",0x760A],
+  ["AF82",0x760B],
+  ["F0F8",0x760C],
+  ["AF83",0x760D],
+  ["AF84",0x760E],
+  ["AF85",0x760F],
+  ["F0F5",0x7610],
+  ["AF86",0x7611],
+  ["AF87",0x7612],
+  ["AF88",0x7613],
+  ["AF89",0x7614],
+  ["F0FD",0x7615],
+  ["AF8A",0x7616],
+  ["F0F9",0x7617],
+  ["F0FC",0x7618],
+  ["F0FE",0x7619],
+  ["AF8B",0x761A],
+  ["F1A1",0x761B],
+  ["AF8C",0x761C],
+  ["AF8D",0x761D],
+  ["AF8E",0x761E],
+  ["CEC1",0x761F],
+  ["F1A4",0x7620],
+  ["AF8F",0x7621],
+  ["F1A3",0x7622],
+  ["AF90",0x7623],
+  ["C1F6",0x7624],
+  ["F0FB",0x7625],
+  ["CADD",0x7626],
+  ["AF91",0x7627],
+  ["AF92",0x7628],
+  ["B4F1",0x7629],
+  ["B1F1",0x762A],
+  ["CCB1",0x762B],
+  ["AF93",0x762C],
+  ["F1A6",0x762D],
+  ["AF94",0x762E],
+  ["AF95",0x762F],
+  ["F1A7",0x7630],
+  ["AF96",0x7631],
+  ["AF97",0x7632],
+  ["F1AC",0x7633],
+  ["D5CE",0x7634],
+  ["F1A9",0x7635],
+  ["AF98",0x7636],
+  ["AF99",0x7637],
+  ["C8B3",0x7638],
+  ["AF9A",0x7639],
+  ["AF9B",0x763A],
+  ["AF9C",0x763B],
+  ["F1A2",0x763C],
+  ["AF9D",0x763D],
+  ["F1AB",0x763E],
+  ["F1A8",0x763F],
+  ["F1A5",0x7640],
+  ["AF9E",0x7641],
+  ["AF9F",0x7642],
+  ["F1AA",0x7643],
+  ["AFA0",0x7644],
+  ["B040",0x7645],
+  ["B041",0x7646],
+  ["B042",0x7647],
+  ["B043",0x7648],
+  ["B044",0x7649],
+  ["B045",0x764A],
+  ["B046",0x764B],
+  ["B0A9",0x764C],
+  ["F1AD",0x764D],
+  ["B047",0x764E],
+  ["B048",0x764F],
+  ["B049",0x7650],
+  ["B04A",0x7651],
+  ["B04B",0x7652],
+  ["B04C",0x7653],
+  ["F1AF",0x7654],
+  ["B04D",0x7655],
+  ["F1B1",0x7656],
+  ["B04E",0x7657],
+  ["B04F",0x7658],
+  ["B050",0x7659],
+  ["B051",0x765A],
+  ["B052",0x765B],
+  ["F1B0",0x765C],
+  ["B053",0x765D],
+  ["F1AE",0x765E],
+  ["B054",0x765F],
+  ["B055",0x7660],
+  ["B056",0x7661],
+  ["B057",0x7662],
+  ["D1A2",0x7663],
+  ["B058",0x7664],
+  ["B059",0x7665],
+  ["B05A",0x7666],
+  ["B05B",0x7667],
+  ["B05C",0x7668],
+  ["B05D",0x7669],
+  ["B05E",0x766A],
+  ["F1B2",0x766B],
+  ["B05F",0x766C],
+  ["B060",0x766D],
+  ["B061",0x766E],
+  ["F1B3",0x766F],
+  ["B062",0x7670],
+  ["B063",0x7671],
+  ["B064",0x7672],
+  ["B065",0x7673],
+  ["B066",0x7674],
+  ["B067",0x7675],
+  ["B068",0x7676],
+  ["B069",0x7677],
+  ["B9EF",0x7678],
+  ["B06A",0x7679],
+  ["B06B",0x767A],
+  ["B5C7",0x767B],
+  ["B06C",0x767C],
+  ["B0D7",0x767D],
+  ["B0D9",0x767E],
+  ["B06D",0x767F],
+  ["B06E",0x7680],
+  ["B06F",0x7681],
+  ["D4ED",0x7682],
+  ["B070",0x7683],
+  ["B5C4",0x7684],
+  ["B071",0x7685],
+  ["BDD4",0x7686],
+  ["BBCA",0x7687],
+  ["F0A7",0x7688],
+  ["B072",0x7689],
+  ["B073",0x768A],
+  ["B8DE",0x768B],
+  ["B074",0x768C],
+  ["B075",0x768D],
+  ["F0A8",0x768E],
+  ["B076",0x768F],
+  ["B077",0x7690],
+  ["B0A8",0x7691],
+  ["B078",0x7692],
+  ["F0A9",0x7693],
+  ["B079",0x7694],
+  ["B07A",0x7695],
+  ["CDEE",0x7696],
+  ["B07B",0x7697],
+  ["B07C",0x7698],
+  ["F0AA",0x7699],
+  ["B07D",0x769A],
+  ["B07E",0x769B],
+  ["B080",0x769C],
+  ["B081",0x769D],
+  ["B082",0x769E],
+  ["B083",0x769F],
+  ["B084",0x76A0],
+  ["B085",0x76A1],
+  ["B086",0x76A2],
+  ["B087",0x76A3],
+  ["F0AB",0x76A4],
+  ["B088",0x76A5],
+  ["B089",0x76A6],
+  ["B08A",0x76A7],
+  ["B08B",0x76A8],
+  ["B08C",0x76A9],
+  ["B08D",0x76AA],
+  ["B08E",0x76AB],
+  ["B08F",0x76AC],
+  ["B090",0x76AD],
+  ["C6A4",0x76AE],
+  ["B091",0x76AF],
+  ["B092",0x76B0],
+  ["D6E5",0x76B1],
+  ["F1E4",0x76B2],
+  ["B093",0x76B3],
+  ["F1E5",0x76B4],
+  ["B094",0x76B5],
+  ["B095",0x76B6],
+  ["B096",0x76B7],
+  ["B097",0x76B8],
+  ["B098",0x76B9],
+  ["B099",0x76BA],
+  ["B09A",0x76BB],
+  ["B09B",0x76BC],
+  ["B09C",0x76BD],
+  ["B09D",0x76BE],
+  ["C3F3",0x76BF],
+  ["B09E",0x76C0],
+  ["B09F",0x76C1],
+  ["D3DB",0x76C2],
+  ["B0A0",0x76C3],
+  ["B140",0x76C4],
+  ["D6D1",0x76C5],
+  ["C5E8",0x76C6],
+  ["B141",0x76C7],
+  ["D3AF",0x76C8],
+  ["B142",0x76C9],
+  ["D2E6",0x76CA],
+  ["B143",0x76CB],
+  ["B144",0x76CC],
+  ["EEC1",0x76CD],
+  ["B0BB",0x76CE],
+  ["D5B5",0x76CF],
+  ["D1CE",0x76D0],
+  ["BCE0",0x76D1],
+  ["BAD0",0x76D2],
+  ["B145",0x76D3],
+  ["BFF8",0x76D4],
+  ["B146",0x76D5],
+  ["B8C7",0x76D6],
+  ["B5C1",0x76D7],
+  ["C5CC",0x76D8],
+  ["B147",0x76D9],
+  ["B148",0x76DA],
+  ["CAA2",0x76DB],
+  ["B149",0x76DC],
+  ["B14A",0x76DD],
+  ["B14B",0x76DE],
+  ["C3CB",0x76DF],
+  ["B14C",0x76E0],
+  ["B14D",0x76E1],
+  ["B14E",0x76E2],
+  ["B14F",0x76E3],
+  ["B150",0x76E4],
+  ["EEC2",0x76E5],
+  ["B151",0x76E6],
+  ["B152",0x76E7],
+  ["B153",0x76E8],
+  ["B154",0x76E9],
+  ["B155",0x76EA],
+  ["B156",0x76EB],
+  ["B157",0x76EC],
+  ["B158",0x76ED],
+  ["C4BF",0x76EE],
+  ["B6A2",0x76EF],
+  ["B159",0x76F0],
+  ["EDEC",0x76F1],
+  ["C3A4",0x76F2],
+  ["B15A",0x76F3],
+  ["D6B1",0x76F4],
+  ["B15B",0x76F5],
+  ["B15C",0x76F6],
+  ["B15D",0x76F7],
+  ["CFE0",0x76F8],
+  ["EDEF",0x76F9],
+  ["B15E",0x76FA],
+  ["B15F",0x76FB],
+  ["C5CE",0x76FC],
+  ["B160",0x76FD],
+  ["B6DC",0x76FE],
+  ["B161",0x76FF],
+  ["B162",0x7700],
+  ["CAA1",0x7701],
+  ["B163",0x7702],
+  ["B164",0x7703],
+  ["EDED",0x7704],
+  ["B165",0x7705],
+  ["B166",0x7706],
+  ["EDF0",0x7707],
+  ["EDF1",0x7708],
+  ["C3BC",0x7709],
+  ["B167",0x770A],
+  ["BFB4",0x770B],
+  ["B168",0x770C],
+  ["EDEE",0x770D],
+  ["B169",0x770E],
+  ["B16A",0x770F],
+  ["B16B",0x7710],
+  ["B16C",0x7711],
+  ["B16D",0x7712],
+  ["B16E",0x7713],
+  ["B16F",0x7714],
+  ["B170",0x7715],
+  ["B171",0x7716],
+  ["B172",0x7717],
+  ["B173",0x7718],
+  ["EDF4",0x7719],
+  ["EDF2",0x771A],
+  ["B174",0x771B],
+  ["B175",0x771C],
+  ["B176",0x771D],
+  ["B177",0x771E],
+  ["D5E6",0x771F],
+  ["C3DF",0x7720],
+  ["B178",0x7721],
+  ["EDF3",0x7722],
+  ["B179",0x7723],
+  ["B17A",0x7724],
+  ["B17B",0x7725],
+  ["EDF6",0x7726],
+  ["B17C",0x7727],
+  ["D5A3",0x7728],
+  ["D1A3",0x7729],
+  ["B17D",0x772A],
+  ["B17E",0x772B],
+  ["B180",0x772C],
+  ["EDF5",0x772D],
+  ["B181",0x772E],
+  ["C3D0",0x772F],
+  ["B182",0x7730],
+  ["B183",0x7731],
+  ["B184",0x7732],
+  ["B185",0x7733],
+  ["B186",0x7734],
+  ["EDF7",0x7735],
+  ["BFF4",0x7736],
+  ["BEEC",0x7737],
+  ["EDF8",0x7738],
+  ["B187",0x7739],
+  ["CCF7",0x773A],
+  ["B188",0x773B],
+  ["D1DB",0x773C],
+  ["B189",0x773D],
+  ["B18A",0x773E],
+  ["B18B",0x773F],
+  ["D7C5",0x7740],
+  ["D5F6",0x7741],
+  ["B18C",0x7742],
+  ["EDFC",0x7743],
+  ["B18D",0x7744],
+  ["B18E",0x7745],
+  ["B18F",0x7746],
+  ["EDFB",0x7747],
+  ["B190",0x7748],
+  ["B191",0x7749],
+  ["B192",0x774A],
+  ["B193",0x774B],
+  ["B194",0x774C],
+  ["B195",0x774D],
+  ["B196",0x774E],
+  ["B197",0x774F],
+  ["EDF9",0x7750],
+  ["EDFA",0x7751],
+  ["B198",0x7752],
+  ["B199",0x7753],
+  ["B19A",0x7754],
+  ["B19B",0x7755],
+  ["B19C",0x7756],
+  ["B19D",0x7757],
+  ["B19E",0x7758],
+  ["B19F",0x7759],
+  ["EDFD",0x775A],
+  ["BEA6",0x775B],
+  ["B1A0",0x775C],
+  ["B240",0x775D],
+  ["B241",0x775E],
+  ["B242",0x775F],
+  ["B243",0x7760],
+  ["CBAF",0x7761],
+  ["EEA1",0x7762],
+  ["B6BD",0x7763],
+  ["B244",0x7764],
+  ["EEA2",0x7765],
+  ["C4C0",0x7766],
+  ["B245",0x7767],
+  ["EDFE",0x7768],
+  ["B246",0x7769],
+  ["B247",0x776A],
+  ["BDDE",0x776B],
+  ["B2C7",0x776C],
+  ["B248",0x776D],
+  ["B249",0x776E],
+  ["B24A",0x776F],
+  ["B24B",0x7770],
+  ["B24C",0x7771],
+  ["B24D",0x7772],
+  ["B24E",0x7773],
+  ["B24F",0x7774],
+  ["B250",0x7775],
+  ["B251",0x7776],
+  ["B252",0x7777],
+  ["B253",0x7778],
+  ["B6C3",0x7779],
+  ["B254",0x777A],
+  ["B255",0x777B],
+  ["B256",0x777C],
+  ["EEA5",0x777D],
+  ["D8BA",0x777E],
+  ["EEA3",0x777F],
+  ["EEA6",0x7780],
+  ["B257",0x7781],
+  ["B258",0x7782],
+  ["B259",0x7783],
+  ["C3E9",0x7784],
+  ["B3F2",0x7785],
+  ["B25A",0x7786],
+  ["B25B",0x7787],
+  ["B25C",0x7788],
+  ["B25D",0x7789],
+  ["B25E",0x778A],
+  ["B25F",0x778B],
+  ["EEA7",0x778C],
+  ["EEA4",0x778D],
+  ["CFB9",0x778E],
+  ["B260",0x778F],
+  ["B261",0x7790],
+  ["EEA8",0x7791],
+  ["C2F7",0x7792],
+  ["B262",0x7793],
+  ["B263",0x7794],
+  ["B264",0x7795],
+  ["B265",0x7796],
+  ["B266",0x7797],
+  ["B267",0x7798],
+  ["B268",0x7799],
+  ["B269",0x779A],
+  ["B26A",0x779B],
+  ["B26B",0x779C],
+  ["B26C",0x779D],
+  ["B26D",0x779E],
+  ["EEA9",0x779F],
+  ["EEAA",0x77A0],
+  ["B26E",0x77A1],
+  ["DEAB",0x77A2],
+  ["B26F",0x77A3],
+  ["B270",0x77A4],
+  ["C6B3",0x77A5],
+  ["B271",0x77A6],
+  ["C7C6",0x77A7],
+  ["B272",0x77A8],
+  ["D6F5",0x77A9],
+  ["B5C9",0x77AA],
+  ["B273",0x77AB],
+  ["CBB2",0x77AC],
+  ["B274",0x77AD],
+  ["B275",0x77AE],
+  ["B276",0x77AF],
+  ["EEAB",0x77B0],
+  ["B277",0x77B1],
+  ["B278",0x77B2],
+  ["CDAB",0x77B3],
+  ["B279",0x77B4],
+  ["EEAC",0x77B5],
+  ["B27A",0x77B6],
+  ["B27B",0x77B7],
+  ["B27C",0x77B8],
+  ["B27D",0x77B9],
+  ["B27E",0x77BA],
+  ["D5B0",0x77BB],
+  ["B280",0x77BC],
+  ["EEAD",0x77BD],
+  ["B281",0x77BE],
+  ["F6C4",0x77BF],
+  ["B282",0x77C0],
+  ["B283",0x77C1],
+  ["B284",0x77C2],
+  ["B285",0x77C3],
+  ["B286",0x77C4],
+  ["B287",0x77C5],
+  ["B288",0x77C6],
+  ["B289",0x77C7],
+  ["B28A",0x77C8],
+  ["B28B",0x77C9],
+  ["B28C",0x77CA],
+  ["B28D",0x77CB],
+  ["B28E",0x77CC],
+  ["DBC7",0x77CD],
+  ["B28F",0x77CE],
+  ["B290",0x77CF],
+  ["B291",0x77D0],
+  ["B292",0x77D1],
+  ["B293",0x77D2],
+  ["B294",0x77D3],
+  ["B295",0x77D4],
+  ["B296",0x77D5],
+  ["B297",0x77D6],
+  ["B4A3",0x77D7],
+  ["B298",0x77D8],
+  ["B299",0x77D9],
+  ["B29A",0x77DA],
+  ["C3AC",0x77DB],
+  ["F1E6",0x77DC],
+  ["B29B",0x77DD],
+  ["B29C",0x77DE],
+  ["B29D",0x77DF],
+  ["B29E",0x77E0],
+  ["B29F",0x77E1],
+  ["CAB8",0x77E2],
+  ["D2D3",0x77E3],
+  ["B2A0",0x77E4],
+  ["D6AA",0x77E5],
+  ["B340",0x77E6],
+  ["EFF2",0x77E7],
+  ["B341",0x77E8],
+  ["BED8",0x77E9],
+  ["B342",0x77EA],
+  ["BDC3",0x77EB],
+  ["EFF3",0x77EC],
+  ["B6CC",0x77ED],
+  ["B0AB",0x77EE],
+  ["B343",0x77EF],
+  ["B344",0x77F0],
+  ["B345",0x77F1],
+  ["B346",0x77F2],
+  ["CAAF",0x77F3],
+  ["B347",0x77F4],
+  ["B348",0x77F5],
+  ["EDB6",0x77F6],
+  ["B349",0x77F7],
+  ["EDB7",0x77F8],
+  ["B34A",0x77F9],
+  ["B34B",0x77FA],
+  ["B34C",0x77FB],
+  ["B34D",0x77FC],
+  ["CEF9",0x77FD],
+  ["B7AF",0x77FE],
+  ["BFF3",0x77FF],
+  ["EDB8",0x7800],
+  ["C2EB",0x7801],
+  ["C9B0",0x7802],
+  ["B34E",0x7803],
+  ["B34F",0x7804],
+  ["B350",0x7805],
+  ["B351",0x7806],
+  ["B352",0x7807],
+  ["B353",0x7808],
+  ["EDB9",0x7809],
+  ["B354",0x780A],
+  ["B355",0x780B],
+  ["C6F6",0x780C],
+  ["BFB3",0x780D],
+  ["B356",0x780E],
+  ["B357",0x780F],
+  ["B358",0x7810],
+  ["EDBC",0x7811],
+  ["C5F8",0x7812],
+  ["B359",0x7813],
+  ["D1D0",0x7814],
+  ["B35A",0x7815],
+  ["D7A9",0x7816],
+  ["EDBA",0x7817],
+  ["EDBB",0x7818],
+  ["B35B",0x7819],
+  ["D1E2",0x781A],
+  ["B35C",0x781B],
+  ["EDBF",0x781C],
+  ["EDC0",0x781D],
+  ["B35D",0x781E],
+  ["EDC4",0x781F],
+  ["B35E",0x7820],
+  ["B35F",0x7821],
+  ["B360",0x7822],
+  ["EDC8",0x7823],
+  ["B361",0x7824],
+  ["EDC6",0x7825],
+  ["EDCE",0x7826],
+  ["D5E8",0x7827],
+  ["B362",0x7828],
+  ["EDC9",0x7829],
+  ["B363",0x782A],
+  ["B364",0x782B],
+  ["EDC7",0x782C],
+  ["EDBE",0x782D],
+  ["B365",0x782E],
+  ["B366",0x782F],
+  ["C5E9",0x7830],
+  ["B367",0x7831],
+  ["B368",0x7832],
+  ["B369",0x7833],
+  ["C6C6",0x7834],
+  ["B36A",0x7835],
+  ["B36B",0x7836],
+  ["C9E9",0x7837],
+  ["D4D2",0x7838],
+  ["EDC1",0x7839],
+  ["EDC2",0x783A],
+  ["EDC3",0x783B],
+  ["EDC5",0x783C],
+  ["B36C",0x783D],
+  ["C0F9",0x783E],
+  ["B36D",0x783F],
+  ["B4A1",0x7840],
+  ["B36E",0x7841],
+  ["B36F",0x7842],
+  ["B370",0x7843],
+  ["B371",0x7844],
+  ["B9E8",0x7845],
+  ["B372",0x7846],
+  ["EDD0",0x7847],
+  ["B373",0x7848],
+  ["B374",0x7849],
+  ["B375",0x784A],
+  ["B376",0x784B],
+  ["EDD1",0x784C],
+  ["B377",0x784D],
+  ["EDCA",0x784E],
+  ["B378",0x784F],
+  ["EDCF",0x7850],
+  ["B379",0x7851],
+  ["CEF8",0x7852],
+  ["B37A",0x7853],
+  ["B37B",0x7854],
+  ["CBB6",0x7855],
+  ["EDCC",0x7856],
+  ["EDCD",0x7857],
+  ["B37C",0x7858],
+  ["B37D",0x7859],
+  ["B37E",0x785A],
+  ["B380",0x785B],
+  ["B381",0x785C],
+  ["CFF5",0x785D],
+  ["B382",0x785E],
+  ["B383",0x785F],
+  ["B384",0x7860],
+  ["B385",0x7861],
+  ["B386",0x7862],
+  ["B387",0x7863],
+  ["B388",0x7864],
+  ["B389",0x7865],
+  ["B38A",0x7866],
+  ["B38B",0x7867],
+  ["B38C",0x7868],
+  ["B38D",0x7869],
+  ["EDD2",0x786A],
+  ["C1F2",0x786B],
+  ["D3B2",0x786C],
+  ["EDCB",0x786D],
+  ["C8B7",0x786E],
+  ["B38E",0x786F],
+  ["B38F",0x7870],
+  ["B390",0x7871],
+  ["B391",0x7872],
+  ["B392",0x7873],
+  ["B393",0x7874],
+  ["B394",0x7875],
+  ["B395",0x7876],
+  ["BCEF",0x7877],
+  ["B396",0x7878],
+  ["B397",0x7879],
+  ["B398",0x787A],
+  ["B399",0x787B],
+  ["C5F0",0x787C],
+  ["B39A",0x787D],
+  ["B39B",0x787E],
+  ["B39C",0x787F],
+  ["B39D",0x7880],
+  ["B39E",0x7881],
+  ["B39F",0x7882],
+  ["B3A0",0x7883],
+  ["B440",0x7884],
+  ["B441",0x7885],
+  ["B442",0x7886],
+  ["EDD6",0x7887],
+  ["B443",0x7888],
+  ["B5EF",0x7889],
+  ["B444",0x788A],
+  ["B445",0x788B],
+  ["C2B5",0x788C],
+  ["B0AD",0x788D],
+  ["CBE9",0x788E],
+  ["B446",0x788F],
+  ["B447",0x7890],
+  ["B1AE",0x7891],
+  ["B448",0x7892],
+  ["EDD4",0x7893],
+  ["B449",0x7894],
+  ["B44A",0x7895],
+  ["B44B",0x7896],
+  ["CDEB",0x7897],
+  ["B5E2",0x7898],
+  ["B44C",0x7899],
+  ["EDD5",0x789A],
+  ["EDD3",0x789B],
+  ["EDD7",0x789C],
+  ["B44D",0x789D],
+  ["B44E",0x789E],
+  ["B5FA",0x789F],
+  ["B44F",0x78A0],
+  ["EDD8",0x78A1],
+  ["B450",0x78A2],
+  ["EDD9",0x78A3],
+  ["B451",0x78A4],
+  ["EDDC",0x78A5],
+  ["B452",0x78A6],
+  ["B1CC",0x78A7],
+  ["B453",0x78A8],
+  ["B454",0x78A9],
+  ["B455",0x78AA],
+  ["B456",0x78AB],
+  ["B457",0x78AC],
+  ["B458",0x78AD],
+  ["B459",0x78AE],
+  ["B45A",0x78AF],
+  ["C5F6",0x78B0],
+  ["BCEE",0x78B1],
+  ["EDDA",0x78B2],
+  ["CCBC",0x78B3],
+  ["B2EA",0x78B4],
+  ["B45B",0x78B5],
+  ["B45C",0x78B6],
+  ["B45D",0x78B7],
+  ["B45E",0x78B8],
+  ["EDDB",0x78B9],
+  ["B45F",0x78BA],
+  ["B460",0x78BB],
+  ["B461",0x78BC],
+  ["B462",0x78BD],
+  ["C4EB",0x78BE],
+  ["B463",0x78BF],
+  ["B464",0x78C0],
+  ["B4C5",0x78C1],
+  ["B465",0x78C2],
+  ["B466",0x78C3],
+  ["B467",0x78C4],
+  ["B0F5",0x78C5],
+  ["B468",0x78C6],
+  ["B469",0x78C7],
+  ["B46A",0x78C8],
+  ["EDDF",0x78C9],
+  ["C0DA",0x78CA],
+  ["B4E8",0x78CB],
+  ["B46B",0x78CC],
+  ["B46C",0x78CD],
+  ["B46D",0x78CE],
+  ["B46E",0x78CF],
+  ["C5CD",0x78D0],
+  ["B46F",0x78D1],
+  ["B470",0x78D2],
+  ["B471",0x78D3],
+  ["EDDD",0x78D4],
+  ["BFC4",0x78D5],
+  ["B472",0x78D6],
+  ["B473",0x78D7],
+  ["B474",0x78D8],
+  ["EDDE",0x78D9],
+  ["B475",0x78DA],
+  ["B476",0x78DB],
+  ["B477",0x78DC],
+  ["B478",0x78DD],
+  ["B479",0x78DE],
+  ["B47A",0x78DF],
+  ["B47B",0x78E0],
+  ["B47C",0x78E1],
+  ["B47D",0x78E2],
+  ["B47E",0x78E3],
+  ["B480",0x78E4],
+  ["B481",0x78E5],
+  ["B482",0x78E6],
+  ["B483",0x78E7],
+  ["C4A5",0x78E8],
+  ["B484",0x78E9],
+  ["B485",0x78EA],
+  ["B486",0x78EB],
+  ["EDE0",0x78EC],
+  ["B487",0x78ED],
+  ["B488",0x78EE],
+  ["B489",0x78EF],
+  ["B48A",0x78F0],
+  ["B48B",0x78F1],
+  ["EDE1",0x78F2],
+  ["B48C",0x78F3],
+  ["EDE3",0x78F4],
+  ["B48D",0x78F5],
+  ["B48E",0x78F6],
+  ["C1D7",0x78F7],
+  ["B48F",0x78F8],
+  ["B490",0x78F9],
+  ["BBC7",0x78FA],
+  ["B491",0x78FB],
+  ["B492",0x78FC],
+  ["B493",0x78FD],
+  ["B494",0x78FE],
+  ["B495",0x78FF],
+  ["B496",0x7900],
+  ["BDB8",0x7901],
+  ["B497",0x7902],
+  ["B498",0x7903],
+  ["B499",0x7904],
+  ["EDE2",0x7905],
+  ["B49A",0x7906],
+  ["B49B",0x7907],
+  ["B49C",0x7908],
+  ["B49D",0x7909],
+  ["B49E",0x790A],
+  ["B49F",0x790B],
+  ["B4A0",0x790C],
+  ["B540",0x790D],
+  ["B541",0x790E],
+  ["B542",0x790F],
+  ["B543",0x7910],
+  ["B544",0x7911],
+  ["B545",0x7912],
+  ["EDE4",0x7913],
+  ["B546",0x7914],
+  ["B547",0x7915],
+  ["B548",0x7916],
+  ["B549",0x7917],
+  ["B54A",0x7918],
+  ["B54B",0x7919],
+  ["B54C",0x791A],
+  ["B54D",0x791B],
+  ["B54E",0x791C],
+  ["B54F",0x791D],
+  ["EDE6",0x791E],
+  ["B550",0x791F],
+  ["B551",0x7920],
+  ["B552",0x7921],
+  ["B553",0x7922],
+  ["B554",0x7923],
+  ["EDE5",0x7924],
+  ["B555",0x7925],
+  ["B556",0x7926],
+  ["B557",0x7927],
+  ["B558",0x7928],
+  ["B559",0x7929],
+  ["B55A",0x792A],
+  ["B55B",0x792B],
+  ["B55C",0x792C],
+  ["B55D",0x792D],
+  ["B55E",0x792E],
+  ["B55F",0x792F],
+  ["B560",0x7930],
+  ["B561",0x7931],
+  ["B562",0x7932],
+  ["B563",0x7933],
+  ["EDE7",0x7934],
+  ["B564",0x7935],
+  ["B565",0x7936],
+  ["B566",0x7937],
+  ["B567",0x7938],
+  ["B568",0x7939],
+  ["CABE",0x793A],
+  ["ECEA",0x793B],
+  ["C0F1",0x793C],
+  ["B569",0x793D],
+  ["C9E7",0x793E],
+  ["B56A",0x793F],
+  ["ECEB",0x7940],
+  ["C6EE",0x7941],
+  ["B56B",0x7942],
+  ["B56C",0x7943],
+  ["B56D",0x7944],
+  ["B56E",0x7945],
+  ["ECEC",0x7946],
+  ["B56F",0x7947],
+  ["C6ED",0x7948],
+  ["ECED",0x7949],
+  ["B570",0x794A],
+  ["B571",0x794B],
+  ["B572",0x794C],
+  ["B573",0x794D],
+  ["B574",0x794E],
+  ["B575",0x794F],
+  ["B576",0x7950],
+  ["B577",0x7951],
+  ["B578",0x7952],
+  ["ECF0",0x7953],
+  ["B579",0x7954],
+  ["B57A",0x7955],
+  ["D7E6",0x7956],
+  ["ECF3",0x7957],
+  ["B57B",0x7958],
+  ["B57C",0x7959],
+  ["ECF1",0x795A],
+  ["ECEE",0x795B],
+  ["ECEF",0x795C],
+  ["D7A3",0x795D],
+  ["C9F1",0x795E],
+  ["CBEE",0x795F],
+  ["ECF4",0x7960],
+  ["B57D",0x7961],
+  ["ECF2",0x7962],
+  ["B57E",0x7963],
+  ["B580",0x7964],
+  ["CFE9",0x7965],
+  ["B581",0x7966],
+  ["ECF6",0x7967],
+  ["C6B1",0x7968],
+  ["B582",0x7969],
+  ["B583",0x796A],
+  ["B584",0x796B],
+  ["B585",0x796C],
+  ["BCC0",0x796D],
+  ["B586",0x796E],
+  ["ECF5",0x796F],
+  ["B587",0x7970],
+  ["B588",0x7971],
+  ["B589",0x7972],
+  ["B58A",0x7973],
+  ["B58B",0x7974],
+  ["B58C",0x7975],
+  ["B58D",0x7976],
+  ["B5BB",0x7977],
+  ["BBF6",0x7978],
+  ["B58E",0x7979],
+  ["ECF7",0x797A],
+  ["B58F",0x797B],
+  ["B590",0x797C],
+  ["B591",0x797D],
+  ["B592",0x797E],
+  ["B593",0x797F],
+  ["D9F7",0x7980],
+  ["BDFB",0x7981],
+  ["B594",0x7982],
+  ["B595",0x7983],
+  ["C2BB",0x7984],
+  ["ECF8",0x7985],
+  ["B596",0x7986],
+  ["B597",0x7987],
+  ["B598",0x7988],
+  ["B599",0x7989],
+  ["ECF9",0x798A],
+  ["B59A",0x798B],
+  ["B59B",0x798C],
+  ["B59C",0x798D],
+  ["B59D",0x798E],
+  ["B8A3",0x798F],
+  ["B59E",0x7990],
+  ["B59F",0x7991],
+  ["B5A0",0x7992],
+  ["B640",0x7993],
+  ["B641",0x7994],
+  ["B642",0x7995],
+  ["B643",0x7996],
+  ["B644",0x7997],
+  ["B645",0x7998],
+  ["B646",0x7999],
+  ["ECFA",0x799A],
+  ["B647",0x799B],
+  ["B648",0x799C],
+  ["B649",0x799D],
+  ["B64A",0x799E],
+  ["B64B",0x799F],
+  ["B64C",0x79A0],
+  ["B64D",0x79A1],
+  ["B64E",0x79A2],
+  ["B64F",0x79A3],
+  ["B650",0x79A4],
+  ["B651",0x79A5],
+  ["B652",0x79A6],
+  ["ECFB",0x79A7],
+  ["B653",0x79A8],
+  ["B654",0x79A9],
+  ["B655",0x79AA],
+  ["B656",0x79AB],
+  ["B657",0x79AC],
+  ["B658",0x79AD],
+  ["B659",0x79AE],
+  ["B65A",0x79AF],
+  ["B65B",0x79B0],
+  ["B65C",0x79B1],
+  ["B65D",0x79B2],
+  ["ECFC",0x79B3],
+  ["B65E",0x79B4],
+  ["B65F",0x79B5],
+  ["B660",0x79B6],
+  ["B661",0x79B7],
+  ["B662",0x79B8],
+  ["D3ED",0x79B9],
+  ["D8AE",0x79BA],
+  ["C0EB",0x79BB],
+  ["B663",0x79BC],
+  ["C7DD",0x79BD],
+  ["BACC",0x79BE],
+  ["B664",0x79BF],
+  ["D0E3",0x79C0],
+  ["CBBD",0x79C1],
+  ["B665",0x79C2],
+  ["CDBA",0x79C3],
+  ["B666",0x79C4],
+  ["B667",0x79C5],
+  ["B8D1",0x79C6],
+  ["B668",0x79C7],
+  ["B669",0x79C8],
+  ["B1FC",0x79C9],
+  ["B66A",0x79CA],
+  ["C7EF",0x79CB],
+  ["B66B",0x79CC],
+  ["D6D6",0x79CD],
+  ["B66C",0x79CE],
+  ["B66D",0x79CF],
+  ["B66E",0x79D0],
+  ["BFC6",0x79D1],
+  ["C3EB",0x79D2],
+  ["B66F",0x79D3],
+  ["B670",0x79D4],
+  ["EFF5",0x79D5],
+  ["B671",0x79D6],
+  ["B672",0x79D7],
+  ["C3D8",0x79D8],
+  ["B673",0x79D9],
+  ["B674",0x79DA],
+  ["B675",0x79DB],
+  ["B676",0x79DC],
+  ["B677",0x79DD],
+  ["B678",0x79DE],
+  ["D7E2",0x79DF],
+  ["B679",0x79E0],
+  ["B67A",0x79E1],
+  ["B67B",0x79E2],
+  ["EFF7",0x79E3],
+  ["B3D3",0x79E4],
+  ["B67C",0x79E5],
+  ["C7D8",0x79E6],
+  ["D1ED",0x79E7],
+  ["B67D",0x79E8],
+  ["D6C8",0x79E9],
+  ["B67E",0x79EA],
+  ["EFF8",0x79EB],
+  ["B680",0x79EC],
+  ["EFF6",0x79ED],
+  ["B681",0x79EE],
+  ["BBFD",0x79EF],
+  ["B3C6",0x79F0],
+  ["B682",0x79F1],
+  ["B683",0x79F2],
+  ["B684",0x79F3],
+  ["B685",0x79F4],
+  ["B686",0x79F5],
+  ["B687",0x79F6],
+  ["B688",0x79F7],
+  ["BDD5",0x79F8],
+  ["B689",0x79F9],
+  ["B68A",0x79FA],
+  ["D2C6",0x79FB],
+  ["B68B",0x79FC],
+  ["BBE0",0x79FD],
+  ["B68C",0x79FE],
+  ["B68D",0x79FF],
+  ["CFA1",0x7A00],
+  ["B68E",0x7A01],
+  ["EFFC",0x7A02],
+  ["EFFB",0x7A03],
+  ["B68F",0x7A04],
+  ["B690",0x7A05],
+  ["EFF9",0x7A06],
+  ["B691",0x7A07],
+  ["B692",0x7A08],
+  ["B693",0x7A09],
+  ["B694",0x7A0A],
+  ["B3CC",0x7A0B],
+  ["B695",0x7A0C],
+  ["C9D4",0x7A0D],
+  ["CBB0",0x7A0E],
+  ["B696",0x7A0F],
+  ["B697",0x7A10],
+  ["B698",0x7A11],
+  ["B699",0x7A12],
+  ["B69A",0x7A13],
+  ["EFFE",0x7A14],
+  ["B69B",0x7A15],
+  ["B69C",0x7A16],
+  ["B0DE",0x7A17],
+  ["B69D",0x7A18],
+  ["B69E",0x7A19],
+  ["D6C9",0x7A1A],
+  ["B69F",0x7A1B],
+  ["B6A0",0x7A1C],
+  ["B740",0x7A1D],
+  ["EFFD",0x7A1E],
+  ["B741",0x7A1F],
+  ["B3ED",0x7A20],
+  ["B742",0x7A21],
+  ["B743",0x7A22],
+  ["F6D5",0x7A23],
+  ["B744",0x7A24],
+  ["B745",0x7A25],
+  ["B746",0x7A26],
+  ["B747",0x7A27],
+  ["B748",0x7A28],
+  ["B749",0x7A29],
+  ["B74A",0x7A2A],
+  ["B74B",0x7A2B],
+  ["B74C",0x7A2C],
+  ["B74D",0x7A2D],
+  ["B74E",0x7A2E],
+  ["B74F",0x7A2F],
+  ["B750",0x7A30],
+  ["B751",0x7A31],
+  ["B752",0x7A32],
+  ["CEC8",0x7A33],
+  ["B753",0x7A34],
+  ["B754",0x7A35],
+  ["B755",0x7A36],
+  ["F0A2",0x7A37],
+  ["B756",0x7A38],
+  ["F0A1",0x7A39],
+  ["B757",0x7A3A],
+  ["B5BE",0x7A3B],
+  ["BCDA",0x7A3C],
+  ["BBFC",0x7A3D],
+  ["B758",0x7A3E],
+  ["B8E5",0x7A3F],
+  ["B759",0x7A40],
+  ["B75A",0x7A41],
+  ["B75B",0x7A42],
+  ["B75C",0x7A43],
+  ["B75D",0x7A44],
+  ["B75E",0x7A45],
+  ["C4C2",0x7A46],
+  ["B75F",0x7A47],
+  ["B760",0x7A48],
+  ["B761",0x7A49],
+  ["B762",0x7A4A],
+  ["B763",0x7A4B],
+  ["B764",0x7A4C],
+  ["B765",0x7A4D],
+  ["B766",0x7A4E],
+  ["B767",0x7A4F],
+  ["B768",0x7A50],
+  ["F0A3",0x7A51],
+  ["B769",0x7A52],
+  ["B76A",0x7A53],
+  ["B76B",0x7A54],
+  ["B76C",0x7A55],
+  ["B76D",0x7A56],
+  ["CBEB",0x7A57],
+  ["B76E",0x7A58],
+  ["B76F",0x7A59],
+  ["B770",0x7A5A],
+  ["B771",0x7A5B],
+  ["B772",0x7A5C],
+  ["B773",0x7A5D],
+  ["B774",0x7A5E],
+  ["B775",0x7A5F],
+  ["B776",0x7A60],
+  ["B777",0x7A61],
+  ["B778",0x7A62],
+  ["B779",0x7A63],
+  ["B77A",0x7A64],
+  ["B77B",0x7A65],
+  ["B77C",0x7A66],
+  ["B77D",0x7A67],
+  ["B77E",0x7A68],
+  ["B780",0x7A69],
+  ["B781",0x7A6A],
+  ["B782",0x7A6B],
+  ["B783",0x7A6C],
+  ["B784",0x7A6D],
+  ["B785",0x7A6E],
+  ["B786",0x7A6F],
+  ["F0A6",0x7A70],
+  ["B787",0x7A71],
+  ["B788",0x7A72],
+  ["B789",0x7A73],
+  ["D1A8",0x7A74],
+  ["B78A",0x7A75],
+  ["BEBF",0x7A76],
+  ["C7EE",0x7A77],
+  ["F1B6",0x7A78],
+  ["F1B7",0x7A79],
+  ["BFD5",0x7A7A],
+  ["B78B",0x7A7B],
+  ["B78C",0x7A7C],
+  ["B78D",0x7A7D],
+  ["B78E",0x7A7E],
+  ["B4A9",0x7A7F],
+  ["F1B8",0x7A80],
+  ["CDBB",0x7A81],
+  ["B78F",0x7A82],
+  ["C7D4",0x7A83],
+  ["D5AD",0x7A84],
+  ["B790",0x7A85],
+  ["F1B9",0x7A86],
+  ["B791",0x7A87],
+  ["F1BA",0x7A88],
+  ["B792",0x7A89],
+  ["B793",0x7A8A],
+  ["B794",0x7A8B],
+  ["B795",0x7A8C],
+  ["C7CF",0x7A8D],
+  ["B796",0x7A8E],
+  ["B797",0x7A8F],
+  ["B798",0x7A90],
+  ["D2A4",0x7A91],
+  ["D6CF",0x7A92],
+  ["B799",0x7A93],
+  ["B79A",0x7A94],
+  ["F1BB",0x7A95],
+  ["BDD1",0x7A96],
+  ["B4B0",0x7A97],
+  ["BEBD",0x7A98],
+  ["B79B",0x7A99],
+  ["B79C",0x7A9A],
+  ["B79D",0x7A9B],
+  ["B4DC",0x7A9C],
+  ["CED1",0x7A9D],
+  ["B79E",0x7A9E],
+  ["BFDF",0x7A9F],
+  ["F1BD",0x7AA0],
+  ["B79F",0x7AA1],
+  ["B7A0",0x7AA2],
+  ["B840",0x7AA3],
+  ["B841",0x7AA4],
+  ["BFFA",0x7AA5],
+  ["F1BC",0x7AA6],
+  ["B842",0x7AA7],
+  ["F1BF",0x7AA8],
+  ["B843",0x7AA9],
+  ["B844",0x7AAA],
+  ["B845",0x7AAB],
+  ["F1BE",0x7AAC],
+  ["F1C0",0x7AAD],
+  ["B846",0x7AAE],
+  ["B847",0x7AAF],
+  ["B848",0x7AB0],
+  ["B849",0x7AB1],
+  ["B84A",0x7AB2],
+  ["F1C1",0x7AB3],
+  ["B84B",0x7AB4],
+  ["B84C",0x7AB5],
+  ["B84D",0x7AB6],
+  ["B84E",0x7AB7],
+  ["B84F",0x7AB8],
+  ["B850",0x7AB9],
+  ["B851",0x7ABA],
+  ["B852",0x7ABB],
+  ["B853",0x7ABC],
+  ["B854",0x7ABD],
+  ["B855",0x7ABE],
+  ["C1FE",0x7ABF],
+  ["B856",0x7AC0],
+  ["B857",0x7AC1],
+  ["B858",0x7AC2],
+  ["B859",0x7AC3],
+  ["B85A",0x7AC4],
+  ["B85B",0x7AC5],
+  ["B85C",0x7AC6],
+  ["B85D",0x7AC7],
+  ["B85E",0x7AC8],
+  ["B85F",0x7AC9],
+  ["B860",0x7ACA],
+  ["C1A2",0x7ACB],
+  ["B861",0x7ACC],
+  ["B862",0x7ACD],
+  ["B863",0x7ACE],
+  ["B864",0x7ACF],
+  ["B865",0x7AD0],
+  ["B866",0x7AD1],
+  ["B867",0x7AD2],
+  ["B868",0x7AD3],
+  ["B869",0x7AD4],
+  ["B86A",0x7AD5],
+  ["CAFA",0x7AD6],
+  ["B86B",0x7AD7],
+  ["B86C",0x7AD8],
+  ["D5BE",0x7AD9],
+  ["B86D",0x7ADA],
+  ["B86E",0x7ADB],
+  ["B86F",0x7ADC],
+  ["B870",0x7ADD],
+  ["BEBA",0x7ADE],
+  ["BEB9",0x7ADF],
+  ["D5C2",0x7AE0],
+  ["B871",0x7AE1],
+  ["B872",0x7AE2],
+  ["BFA2",0x7AE3],
+  ["B873",0x7AE4],
+  ["CDAF",0x7AE5],
+  ["F1B5",0x7AE6],
+  ["B874",0x7AE7],
+  ["B875",0x7AE8],
+  ["B876",0x7AE9],
+  ["B877",0x7AEA],
+  ["B878",0x7AEB],
+  ["B879",0x7AEC],
+  ["BDDF",0x7AED],
+  ["B87A",0x7AEE],
+  ["B6CB",0x7AEF],
+  ["B87B",0x7AF0],
+  ["B87C",0x7AF1],
+  ["B87D",0x7AF2],
+  ["B87E",0x7AF3],
+  ["B880",0x7AF4],
+  ["B881",0x7AF5],
+  ["B882",0x7AF6],
+  ["B883",0x7AF7],
+  ["B884",0x7AF8],
+  ["D6F1",0x7AF9],
+  ["F3C3",0x7AFA],
+  ["B885",0x7AFB],
+  ["B886",0x7AFC],
+  ["F3C4",0x7AFD],
+  ["B887",0x7AFE],
+  ["B8CD",0x7AFF],
+  ["B888",0x7B00],
+  ["B889",0x7B01],
+  ["B88A",0x7B02],
+  ["F3C6",0x7B03],
+  ["F3C7",0x7B04],
+  ["B88B",0x7B05],
+  ["B0CA",0x7B06],
+  ["B88C",0x7B07],
+  ["F3C5",0x7B08],
+  ["B88D",0x7B09],
+  ["F3C9",0x7B0A],
+  ["CBF1",0x7B0B],
+  ["B88E",0x7B0C],
+  ["B88F",0x7B0D],
+  ["B890",0x7B0E],
+  ["F3CB",0x7B0F],
+  ["B891",0x7B10],
+  ["D0A6",0x7B11],
+  ["B892",0x7B12],
+  ["B893",0x7B13],
+  ["B1CA",0x7B14],
+  ["F3C8",0x7B15],
+  ["B894",0x7B16],
+  ["B895",0x7B17],
+  ["B896",0x7B18],
+  ["F3CF",0x7B19],
+  ["B897",0x7B1A],
+  ["B5D1",0x7B1B],
+  ["B898",0x7B1C],
+  ["B899",0x7B1D],
+  ["F3D7",0x7B1E],
+  ["B89A",0x7B1F],
+  ["F3D2",0x7B20],
+  ["B89B",0x7B21],
+  ["B89C",0x7B22],
+  ["B89D",0x7B23],
+  ["F3D4",0x7B24],
+  ["F3D3",0x7B25],
+  ["B7FB",0x7B26],
+  ["B89E",0x7B27],
+  ["B1BF",0x7B28],
+  ["B89F",0x7B29],
+  ["F3CE",0x7B2A],
+  ["F3CA",0x7B2B],
+  ["B5DA",0x7B2C],
+  ["B8A0",0x7B2D],
+  ["F3D0",0x7B2E],
+  ["B940",0x7B2F],
+  ["B941",0x7B30],
+  ["F3D1",0x7B31],
+  ["B942",0x7B32],
+  ["F3D5",0x7B33],
+  ["B943",0x7B34],
+  ["B944",0x7B35],
+  ["B945",0x7B36],
+  ["B946",0x7B37],
+  ["F3CD",0x7B38],
+  ["B947",0x7B39],
+  ["BCE3",0x7B3A],
+  ["B948",0x7B3B],
+  ["C1FD",0x7B3C],
+  ["B949",0x7B3D],
+  ["F3D6",0x7B3E],
+  ["B94A",0x7B3F],
+  ["B94B",0x7B40],
+  ["B94C",0x7B41],
+  ["B94D",0x7B42],
+  ["B94E",0x7B43],
+  ["B94F",0x7B44],
+  ["F3DA",0x7B45],
+  ["B950",0x7B46],
+  ["F3CC",0x7B47],
+  ["B951",0x7B48],
+  ["B5C8",0x7B49],
+  ["B952",0x7B4A],
+  ["BDEE",0x7B4B],
+  ["F3DC",0x7B4C],
+  ["B953",0x7B4D],
+  ["B954",0x7B4E],
+  ["B7A4",0x7B4F],
+  ["BFF0",0x7B50],
+  ["D6FE",0x7B51],
+  ["CDB2",0x7B52],
+  ["B955",0x7B53],
+  ["B4F0",0x7B54],
+  ["B956",0x7B55],
+  ["B2DF",0x7B56],
+  ["B957",0x7B57],
+  ["F3D8",0x7B58],
+  ["B958",0x7B59],
+  ["F3D9",0x7B5A],
+  ["C9B8",0x7B5B],
+  ["B959",0x7B5C],
+  ["F3DD",0x7B5D],
+  ["B95A",0x7B5E],
+  ["B95B",0x7B5F],
+  ["F3DE",0x7B60],
+  ["B95C",0x7B61],
+  ["F3E1",0x7B62],
+  ["B95D",0x7B63],
+  ["B95E",0x7B64],
+  ["B95F",0x7B65],
+  ["B960",0x7B66],
+  ["B961",0x7B67],
+  ["B962",0x7B68],
+  ["B963",0x7B69],
+  ["B964",0x7B6A],
+  ["B965",0x7B6B],
+  ["B966",0x7B6C],
+  ["B967",0x7B6D],
+  ["F3DF",0x7B6E],
+  ["B968",0x7B6F],
+  ["B969",0x7B70],
+  ["F3E3",0x7B71],
+  ["F3E2",0x7B72],
+  ["B96A",0x7B73],
+  ["B96B",0x7B74],
+  ["F3DB",0x7B75],
+  ["B96C",0x7B76],
+  ["BFEA",0x7B77],
+  ["B96D",0x7B78],
+  ["B3EF",0x7B79],
+  ["B96E",0x7B7A],
+  ["F3E0",0x7B7B],
+  ["B96F",0x7B7C],
+  ["B970",0x7B7D],
+  ["C7A9",0x7B7E],
+  ["B971",0x7B7F],
+  ["BCF2",0x7B80],
+  ["B972",0x7B81],
+  ["B973",0x7B82],
+  ["B974",0x7B83],
+  ["B975",0x7B84],
+  ["F3EB",0x7B85],
+  ["B976",0x7B86],
+  ["B977",0x7B87],
+  ["B978",0x7B88],
+  ["B979",0x7B89],
+  ["B97A",0x7B8A],
+  ["B97B",0x7B8B],
+  ["B97C",0x7B8C],
+  ["B9BF",0x7B8D],
+  ["B97D",0x7B8E],
+  ["B97E",0x7B8F],
+  ["F3E4",0x7B90],
+  ["B980",0x7B91],
+  ["B981",0x7B92],
+  ["B982",0x7B93],
+  ["B2AD",0x7B94],
+  ["BBFE",0x7B95],
+  ["B983",0x7B96],
+  ["CBE3",0x7B97],
+  ["B984",0x7B98],
+  ["B985",0x7B99],
+  ["B986",0x7B9A],
+  ["B987",0x7B9B],
+  ["F3ED",0x7B9C],
+  ["F3E9",0x7B9D],
+  ["B988",0x7B9E],
+  ["B989",0x7B9F],
+  ["B98A",0x7BA0],
+  ["B9DC",0x7BA1],
+  ["F3EE",0x7BA2],
+  ["B98B",0x7BA3],
+  ["B98C",0x7BA4],
+  ["B98D",0x7BA5],
+  ["F3E5",0x7BA6],
+  ["F3E6",0x7BA7],
+  ["F3EA",0x7BA8],
+  ["C2E1",0x7BA9],
+  ["F3EC",0x7BAA],
+  ["F3EF",0x7BAB],
+  ["F3E8",0x7BAC],
+  ["BCFD",0x7BAD],
+  ["B98E",0x7BAE],
+  ["B98F",0x7BAF],
+  ["B990",0x7BB0],
+  ["CFE4",0x7BB1],
+  ["B991",0x7BB2],
+  ["B992",0x7BB3],
+  ["F3F0",0x7BB4],
+  ["B993",0x7BB5],
+  ["B994",0x7BB6],
+  ["B995",0x7BB7],
+  ["F3E7",0x7BB8],
+  ["B996",0x7BB9],
+  ["B997",0x7BBA],
+  ["B998",0x7BBB],
+  ["B999",0x7BBC],
+  ["B99A",0x7BBD],
+  ["B99B",0x7BBE],
+  ["B99C",0x7BBF],
+  ["B99D",0x7BC0],
+  ["F3F2",0x7BC1],
+  ["B99E",0x7BC2],
+  ["B99F",0x7BC3],
+  ["B9A0",0x7BC4],
+  ["BA40",0x7BC5],
+  ["D7AD",0x7BC6],
+  ["C6AA",0x7BC7],
+  ["BA41",0x7BC8],
+  ["BA42",0x7BC9],
+  ["BA43",0x7BCA],
+  ["BA44",0x7BCB],
+  ["F3F3",0x7BCC],
+  ["BA45",0x7BCD],
+  ["BA46",0x7BCE],
+  ["BA47",0x7BCF],
+  ["BA48",0x7BD0],
+  ["F3F1",0x7BD1],
+  ["BA49",0x7BD2],
+  ["C2A8",0x7BD3],
+  ["BA4A",0x7BD4],
+  ["BA4B",0x7BD5],
+  ["BA4C",0x7BD6],
+  ["BA4D",0x7BD7],
+  ["BA4E",0x7BD8],
+  ["B8DD",0x7BD9],
+  ["F3F5",0x7BDA],
+  ["BA4F",0x7BDB],
+  ["BA50",0x7BDC],
+  ["F3F4",0x7BDD],
+  ["BA51",0x7BDE],
+  ["BA52",0x7BDF],
+  ["BA53",0x7BE0],
+  ["B4DB",0x7BE1],
+  ["BA54",0x7BE2],
+  ["BA55",0x7BE3],
+  ["BA56",0x7BE4],
+  ["F3F6",0x7BE5],
+  ["F3F7",0x7BE6],
+  ["BA57",0x7BE7],
+  ["BA58",0x7BE8],
+  ["BA59",0x7BE9],
+  ["F3F8",0x7BEA],
+  ["BA5A",0x7BEB],
+  ["BA5B",0x7BEC],
+  ["BA5C",0x7BED],
+  ["C0BA",0x7BEE],
+  ["BA5D",0x7BEF],
+  ["BA5E",0x7BF0],
+  ["C0E9",0x7BF1],
+  ["BA5F",0x7BF2],
+  ["BA60",0x7BF3],
+  ["BA61",0x7BF4],
+  ["BA62",0x7BF5],
+  ["BA63",0x7BF6],
+  ["C5F1",0x7BF7],
+  ["BA64",0x7BF8],
+  ["BA65",0x7BF9],
+  ["BA66",0x7BFA],
+  ["BA67",0x7BFB],
+  ["F3FB",0x7BFC],
+  ["BA68",0x7BFD],
+  ["F3FA",0x7BFE],
+  ["BA69",0x7BFF],
+  ["BA6A",0x7C00],
+  ["BA6B",0x7C01],
+  ["BA6C",0x7C02],
+  ["BA6D",0x7C03],
+  ["BA6E",0x7C04],
+  ["BA6F",0x7C05],
+  ["BA70",0x7C06],
+  ["B4D8",0x7C07],
+  ["BA71",0x7C08],
+  ["BA72",0x7C09],
+  ["BA73",0x7C0A],
+  ["F3FE",0x7C0B],
+  ["F3F9",0x7C0C],
+  ["BA74",0x7C0D],
+  ["BA75",0x7C0E],
+  ["F3FC",0x7C0F],
+  ["BA76",0x7C10],
+  ["BA77",0x7C11],
+  ["BA78",0x7C12],
+  ["BA79",0x7C13],
+  ["BA7A",0x7C14],
+  ["BA7B",0x7C15],
+  ["F3FD",0x7C16],
+  ["BA7C",0x7C17],
+  ["BA7D",0x7C18],
+  ["BA7E",0x7C19],
+  ["BA80",0x7C1A],
+  ["BA81",0x7C1B],
+  ["BA82",0x7C1C],
+  ["BA83",0x7C1D],
+  ["BA84",0x7C1E],
+  ["F4A1",0x7C1F],
+  ["BA85",0x7C20],
+  ["BA86",0x7C21],
+  ["BA87",0x7C22],
+  ["BA88",0x7C23],
+  ["BA89",0x7C24],
+  ["BA8A",0x7C25],
+  ["F4A3",0x7C26],
+  ["BBC9",0x7C27],
+  ["BA8B",0x7C28],
+  ["BA8C",0x7C29],
+  ["F4A2",0x7C2A],
+  ["BA8D",0x7C2B],
+  ["BA8E",0x7C2C],
+  ["BA8F",0x7C2D],
+  ["BA90",0x7C2E],
+  ["BA91",0x7C2F],
+  ["BA92",0x7C30],
+  ["BA93",0x7C31],
+  ["BA94",0x7C32],
+  ["BA95",0x7C33],
+  ["BA96",0x7C34],
+  ["BA97",0x7C35],
+  ["BA98",0x7C36],
+  ["BA99",0x7C37],
+  ["F4A4",0x7C38],
+  ["BA9A",0x7C39],
+  ["BA9B",0x7C3A],
+  ["BA9C",0x7C3B],
+  ["BA9D",0x7C3C],
+  ["BA9E",0x7C3D],
+  ["BA9F",0x7C3E],
+  ["B2BE",0x7C3F],
+  ["F4A6",0x7C40],
+  ["F4A5",0x7C41],
+  ["BAA0",0x7C42],
+  ["BB40",0x7C43],
+  ["BB41",0x7C44],
+  ["BB42",0x7C45],
+  ["BB43",0x7C46],
+  ["BB44",0x7C47],
+  ["BB45",0x7C48],
+  ["BB46",0x7C49],
+  ["BB47",0x7C4A],
+  ["BB48",0x7C4B],
+  ["BB49",0x7C4C],
+  ["BCAE",0x7C4D],
+  ["BB4A",0x7C4E],
+  ["BB4B",0x7C4F],
+  ["BB4C",0x7C50],
+  ["BB4D",0x7C51],
+  ["BB4E",0x7C52],
+  ["BB4F",0x7C53],
+  ["BB50",0x7C54],
+  ["BB51",0x7C55],
+  ["BB52",0x7C56],
+  ["BB53",0x7C57],
+  ["BB54",0x7C58],
+  ["BB55",0x7C59],
+  ["BB56",0x7C5A],
+  ["BB57",0x7C5B],
+  ["BB58",0x7C5C],
+  ["BB59",0x7C5D],
+  ["BB5A",0x7C5E],
+  ["BB5B",0x7C5F],
+  ["BB5C",0x7C60],
+  ["BB5D",0x7C61],
+  ["BB5E",0x7C62],
+  ["BB5F",0x7C63],
+  ["BB60",0x7C64],
+  ["BB61",0x7C65],
+  ["BB62",0x7C66],
+  ["BB63",0x7C67],
+  ["BB64",0x7C68],
+  ["BB65",0x7C69],
+  ["BB66",0x7C6A],
+  ["BB67",0x7C6B],
+  ["BB68",0x7C6C],
+  ["BB69",0x7C6D],
+  ["BB6A",0x7C6E],
+  ["BB6B",0x7C6F],
+  ["BB6C",0x7C70],
+  ["BB6D",0x7C71],
+  ["BB6E",0x7C72],
+  ["C3D7",0x7C73],
+  ["D9E1",0x7C74],
+  ["BB6F",0x7C75],
+  ["BB70",0x7C76],
+  ["BB71",0x7C77],
+  ["BB72",0x7C78],
+  ["BB73",0x7C79],
+  ["BB74",0x7C7A],
+  ["C0E0",0x7C7B],
+  ["F4CC",0x7C7C],
+  ["D7D1",0x7C7D],
+  ["BB75",0x7C7E],
+  ["BB76",0x7C7F],
+  ["BB77",0x7C80],
+  ["BB78",0x7C81],
+  ["BB79",0x7C82],
+  ["BB7A",0x7C83],
+  ["BB7B",0x7C84],
+  ["BB7C",0x7C85],
+  ["BB7D",0x7C86],
+  ["BB7E",0x7C87],
+  ["BB80",0x7C88],
+  ["B7DB",0x7C89],
+  ["BB81",0x7C8A],
+  ["BB82",0x7C8B],
+  ["BB83",0x7C8C],
+  ["BB84",0x7C8D],
+  ["BB85",0x7C8E],
+  ["BB86",0x7C8F],
+  ["BB87",0x7C90],
+  ["F4CE",0x7C91],
+  ["C1A3",0x7C92],
+  ["BB88",0x7C93],
+  ["BB89",0x7C94],
+  ["C6C9",0x7C95],
+  ["BB8A",0x7C96],
+  ["B4D6",0x7C97],
+  ["D5B3",0x7C98],
+  ["BB8B",0x7C99],
+  ["BB8C",0x7C9A],
+  ["BB8D",0x7C9B],
+  ["F4D0",0x7C9C],
+  ["F4CF",0x7C9D],
+  ["F4D1",0x7C9E],
+  ["CBDA",0x7C9F],
+  ["BB8E",0x7CA0],
+  ["BB8F",0x7CA1],
+  ["F4D2",0x7CA2],
+  ["BB90",0x7CA3],
+  ["D4C1",0x7CA4],
+  ["D6E0",0x7CA5],
+  ["BB91",0x7CA6],
+  ["BB92",0x7CA7],
+  ["BB93",0x7CA8],
+  ["BB94",0x7CA9],
+  ["B7E0",0x7CAA],
+  ["BB95",0x7CAB],
+  ["BB96",0x7CAC],
+  ["BB97",0x7CAD],
+  ["C1B8",0x7CAE],
+  ["BB98",0x7CAF],
+  ["BB99",0x7CB0],
+  ["C1BB",0x7CB1],
+  ["F4D3",0x7CB2],
+  ["BEAC",0x7CB3],
+  ["BB9A",0x7CB4],
+  ["BB9B",0x7CB5],
+  ["BB9C",0x7CB6],
+  ["BB9D",0x7CB7],
+  ["BB9E",0x7CB8],
+  ["B4E2",0x7CB9],
+  ["BB9F",0x7CBA],
+  ["BBA0",0x7CBB],
+  ["F4D4",0x7CBC],
+  ["F4D5",0x7CBD],
+  ["BEAB",0x7CBE],
+  ["BC40",0x7CBF],
+  ["BC41",0x7CC0],
+  ["F4D6",0x7CC1],
+  ["BC42",0x7CC2],
+  ["BC43",0x7CC3],
+  ["BC44",0x7CC4],
+  ["F4DB",0x7CC5],
+  ["BC45",0x7CC6],
+  ["F4D7",0x7CC7],
+  ["F4DA",0x7CC8],
+  ["BC46",0x7CC9],
+  ["BAFD",0x7CCA],
+  ["BC47",0x7CCB],
+  ["F4D8",0x7CCC],
+  ["F4D9",0x7CCD],
+  ["BC48",0x7CCE],
+  ["BC49",0x7CCF],
+  ["BC4A",0x7CD0],
+  ["BC4B",0x7CD1],
+  ["BC4C",0x7CD2],
+  ["BC4D",0x7CD3],
+  ["BC4E",0x7CD4],
+  ["B8E2",0x7CD5],
+  ["CCC7",0x7CD6],
+  ["F4DC",0x7CD7],
+  ["BC4F",0x7CD8],
+  ["B2DA",0x7CD9],
+  ["BC50",0x7CDA],
+  ["BC51",0x7CDB],
+  ["C3D3",0x7CDC],
+  ["BC52",0x7CDD],
+  ["BC53",0x7CDE],
+  ["D4E3",0x7CDF],
+  ["BFB7",0x7CE0],
+  ["BC54",0x7CE1],
+  ["BC55",0x7CE2],
+  ["BC56",0x7CE3],
+  ["BC57",0x7CE4],
+  ["BC58",0x7CE5],
+  ["BC59",0x7CE6],
+  ["BC5A",0x7CE7],
+  ["F4DD",0x7CE8],
+  ["BC5B",0x7CE9],
+  ["BC5C",0x7CEA],
+  ["BC5D",0x7CEB],
+  ["BC5E",0x7CEC],
+  ["BC5F",0x7CED],
+  ["BC60",0x7CEE],
+  ["C5B4",0x7CEF],
+  ["BC61",0x7CF0],
+  ["BC62",0x7CF1],
+  ["BC63",0x7CF2],
+  ["BC64",0x7CF3],
+  ["BC65",0x7CF4],
+  ["BC66",0x7CF5],
+  ["BC67",0x7CF6],
+  ["BC68",0x7CF7],
+  ["F4E9",0x7CF8],
+  ["BC69",0x7CF9],
+  ["BC6A",0x7CFA],
+  ["CFB5",0x7CFB],
+  ["BC6B",0x7CFC],
+  ["BC6C",0x7CFD],
+  ["BC6D",0x7CFE],
+  ["BC6E",0x7CFF],
+  ["BC6F",0x7D00],
+  ["BC70",0x7D01],
+  ["BC71",0x7D02],
+  ["BC72",0x7D03],
+  ["BC73",0x7D04],
+  ["BC74",0x7D05],
+  ["BC75",0x7D06],
+  ["BC76",0x7D07],
+  ["BC77",0x7D08],
+  ["BC78",0x7D09],
+  ["CEC9",0x7D0A],
+  ["BC79",0x7D0B],
+  ["BC7A",0x7D0C],
+  ["BC7B",0x7D0D],
+  ["BC7C",0x7D0E],
+  ["BC7D",0x7D0F],
+  ["BC7E",0x7D10],
+  ["BC80",0x7D11],
+  ["BC81",0x7D12],
+  ["BC82",0x7D13],
+  ["BC83",0x7D14],
+  ["BC84",0x7D15],
+  ["BC85",0x7D16],
+  ["BC86",0x7D17],
+  ["BC87",0x7D18],
+  ["BC88",0x7D19],
+  ["BC89",0x7D1A],
+  ["BC8A",0x7D1B],
+  ["BC8B",0x7D1C],
+  ["BC8C",0x7D1D],
+  ["BC8D",0x7D1E],
+  ["BC8E",0x7D1F],
+  ["CBD8",0x7D20],
+  ["BC8F",0x7D21],
+  ["CBF7",0x7D22],
+  ["BC90",0x7D23],
+  ["BC91",0x7D24],
+  ["BC92",0x7D25],
+  ["BC93",0x7D26],
+  ["BDF4",0x7D27],
+  ["BC94",0x7D28],
+  ["BC95",0x7D29],
+  ["BC96",0x7D2A],
+  ["D7CF",0x7D2B],
+  ["BC97",0x7D2C],
+  ["BC98",0x7D2D],
+  ["BC99",0x7D2E],
+  ["C0DB",0x7D2F],
+  ["BC9A",0x7D30],
+  ["BC9B",0x7D31],
+  ["BC9C",0x7D32],
+  ["BC9D",0x7D33],
+  ["BC9E",0x7D34],
+  ["BC9F",0x7D35],
+  ["BCA0",0x7D36],
+  ["BD40",0x7D37],
+  ["BD41",0x7D38],
+  ["BD42",0x7D39],
+  ["BD43",0x7D3A],
+  ["BD44",0x7D3B],
+  ["BD45",0x7D3C],
+  ["BD46",0x7D3D],
+  ["BD47",0x7D3E],
+  ["BD48",0x7D3F],
+  ["BD49",0x7D40],
+  ["BD4A",0x7D41],
+  ["BD4B",0x7D42],
+  ["BD4C",0x7D43],
+  ["BD4D",0x7D44],
+  ["BD4E",0x7D45],
+  ["BD4F",0x7D46],
+  ["BD50",0x7D47],
+  ["BD51",0x7D48],
+  ["BD52",0x7D49],
+  ["BD53",0x7D4A],
+  ["BD54",0x7D4B],
+  ["BD55",0x7D4C],
+  ["BD56",0x7D4D],
+  ["BD57",0x7D4E],
+  ["BD58",0x7D4F],
+  ["BD59",0x7D50],
+  ["BD5A",0x7D51],
+  ["BD5B",0x7D52],
+  ["BD5C",0x7D53],
+  ["BD5D",0x7D54],
+  ["BD5E",0x7D55],
+  ["BD5F",0x7D56],
+  ["BD60",0x7D57],
+  ["BD61",0x7D58],
+  ["BD62",0x7D59],
+  ["BD63",0x7D5A],
+  ["BD64",0x7D5B],
+  ["BD65",0x7D5C],
+  ["BD66",0x7D5D],
+  ["BD67",0x7D5E],
+  ["BD68",0x7D5F],
+  ["BD69",0x7D60],
+  ["BD6A",0x7D61],
+  ["BD6B",0x7D62],
+  ["BD6C",0x7D63],
+  ["BD6D",0x7D64],
+  ["BD6E",0x7D65],
+  ["BD6F",0x7D66],
+  ["BD70",0x7D67],
+  ["BD71",0x7D68],
+  ["BD72",0x7D69],
+  ["BD73",0x7D6A],
+  ["BD74",0x7D6B],
+  ["BD75",0x7D6C],
+  ["BD76",0x7D6D],
+  ["D0F5",0x7D6E],
+  ["BD77",0x7D6F],
+  ["BD78",0x7D70],
+  ["BD79",0x7D71],
+  ["BD7A",0x7D72],
+  ["BD7B",0x7D73],
+  ["BD7C",0x7D74],
+  ["BD7D",0x7D75],
+  ["BD7E",0x7D76],
+  ["F4EA",0x7D77],
+  ["BD80",0x7D78],
+  ["BD81",0x7D79],
+  ["BD82",0x7D7A],
+  ["BD83",0x7D7B],
+  ["BD84",0x7D7C],
+  ["BD85",0x7D7D],
+  ["BD86",0x7D7E],
+  ["BD87",0x7D7F],
+  ["BD88",0x7D80],
+  ["BD89",0x7D81],
+  ["BD8A",0x7D82],
+  ["BD8B",0x7D83],
+  ["BD8C",0x7D84],
+  ["BD8D",0x7D85],
+  ["BD8E",0x7D86],
+  ["BD8F",0x7D87],
+  ["BD90",0x7D88],
+  ["BD91",0x7D89],
+  ["BD92",0x7D8A],
+  ["BD93",0x7D8B],
+  ["BD94",0x7D8C],
+  ["BD95",0x7D8D],
+  ["BD96",0x7D8E],
+  ["BD97",0x7D8F],
+  ["BD98",0x7D90],
+  ["BD99",0x7D91],
+  ["BD9A",0x7D92],
+  ["BD9B",0x7D93],
+  ["BD9C",0x7D94],
+  ["BD9D",0x7D95],
+  ["BD9E",0x7D96],
+  ["BD9F",0x7D97],
+  ["BDA0",0x7D98],
+  ["BE40",0x7D99],
+  ["BE41",0x7D9A],
+  ["BE42",0x7D9B],
+  ["BE43",0x7D9C],
+  ["BE44",0x7D9D],
+  ["BE45",0x7D9E],
+  ["BE46",0x7D9F],
+  ["BE47",0x7DA0],
+  ["BE48",0x7DA1],
+  ["BE49",0x7DA2],
+  ["BE4A",0x7DA3],
+  ["BE4B",0x7DA4],
+  ["BE4C",0x7DA5],
+  ["F4EB",0x7DA6],
+  ["BE4D",0x7DA7],
+  ["BE4E",0x7DA8],
+  ["BE4F",0x7DA9],
+  ["BE50",0x7DAA],
+  ["BE51",0x7DAB],
+  ["BE52",0x7DAC],
+  ["BE53",0x7DAD],
+  ["F4EC",0x7DAE],
+  ["BE54",0x7DAF],
+  ["BE55",0x7DB0],
+  ["BE56",0x7DB1],
+  ["BE57",0x7DB2],
+  ["BE58",0x7DB3],
+  ["BE59",0x7DB4],
+  ["BE5A",0x7DB5],
+  ["BE5B",0x7DB6],
+  ["BE5C",0x7DB7],
+  ["BE5D",0x7DB8],
+  ["BE5E",0x7DB9],
+  ["BE5F",0x7DBA],
+  ["BE60",0x7DBB],
+  ["BE61",0x7DBC],
+  ["BE62",0x7DBD],
+  ["BE63",0x7DBE],
+  ["BE64",0x7DBF],
+  ["BE65",0x7DC0],
+  ["BE66",0x7DC1],
+  ["BE67",0x7DC2],
+  ["BE68",0x7DC3],
+  ["BE69",0x7DC4],
+  ["BE6A",0x7DC5],
+  ["BE6B",0x7DC6],
+  ["BE6C",0x7DC7],
+  ["BE6D",0x7DC8],
+  ["BE6E",0x7DC9],
+  ["BE6F",0x7DCA],
+  ["BE70",0x7DCB],
+  ["BE71",0x7DCC],
+  ["BE72",0x7DCD],
+  ["BE73",0x7DCE],
+  ["BE74",0x7DCF],
+  ["BE75",0x7DD0],
+  ["BE76",0x7DD1],
+  ["BE77",0x7DD2],
+  ["BE78",0x7DD3],
+  ["BE79",0x7DD4],
+  ["BE7A",0x7DD5],
+  ["BE7B",0x7DD6],
+  ["BE7C",0x7DD7],
+  ["BE7D",0x7DD8],
+  ["BE7E",0x7DD9],
+  ["BE80",0x7DDA],
+  ["BE81",0x7DDB],
+  ["BE82",0x7DDC],
+  ["BE83",0x7DDD],
+  ["BE84",0x7DDE],
+  ["BE85",0x7DDF],
+  ["BE86",0x7DE0],
+  ["BE87",0x7DE1],
+  ["BE88",0x7DE2],
+  ["BE89",0x7DE3],
+  ["BE8A",0x7DE4],
+  ["BE8B",0x7DE5],
+  ["BE8C",0x7DE6],
+  ["BE8D",0x7DE7],
+  ["BE8E",0x7DE8],
+  ["BE8F",0x7DE9],
+  ["BE90",0x7DEA],
+  ["BE91",0x7DEB],
+  ["BE92",0x7DEC],
+  ["BE93",0x7DED],
+  ["BE94",0x7DEE],
+  ["BE95",0x7DEF],
+  ["BE96",0x7DF0],
+  ["BE97",0x7DF1],
+  ["BE98",0x7DF2],
+  ["BE99",0x7DF3],
+  ["BE9A",0x7DF4],
+  ["BE9B",0x7DF5],
+  ["BE9C",0x7DF6],
+  ["BE9D",0x7DF7],
+  ["BE9E",0x7DF8],
+  ["BE9F",0x7DF9],
+  ["BEA0",0x7DFA],
+  ["BF40",0x7DFB],
+  ["BF41",0x7DFC],
+  ["BF42",0x7DFD],
+  ["BF43",0x7DFE],
+  ["BF44",0x7DFF],
+  ["BF45",0x7E00],
+  ["BF46",0x7E01],
+  ["BF47",0x7E02],
+  ["BF48",0x7E03],
+  ["BF49",0x7E04],
+  ["BF4A",0x7E05],
+  ["BF4B",0x7E06],
+  ["BF4C",0x7E07],
+  ["BF4D",0x7E08],
+  ["BF4E",0x7E09],
+  ["BF4F",0x7E0A],
+  ["BF50",0x7E0B],
+  ["BF51",0x7E0C],
+  ["BF52",0x7E0D],
+  ["BF53",0x7E0E],
+  ["BF54",0x7E0F],
+  ["BF55",0x7E10],
+  ["BF56",0x7E11],
+  ["BF57",0x7E12],
+  ["BF58",0x7E13],
+  ["BF59",0x7E14],
+  ["BF5A",0x7E15],
+  ["BF5B",0x7E16],
+  ["BF5C",0x7E17],
+  ["BF5D",0x7E18],
+  ["BF5E",0x7E19],
+  ["BF5F",0x7E1A],
+  ["BF60",0x7E1B],
+  ["BF61",0x7E1C],
+  ["BF62",0x7E1D],
+  ["BF63",0x7E1E],
+  ["BF64",0x7E1F],
+  ["BF65",0x7E20],
+  ["BF66",0x7E21],
+  ["BF67",0x7E22],
+  ["BF68",0x7E23],
+  ["BF69",0x7E24],
+  ["BF6A",0x7E25],
+  ["BF6B",0x7E26],
+  ["BF6C",0x7E27],
+  ["BF6D",0x7E28],
+  ["BF6E",0x7E29],
+  ["BF6F",0x7E2A],
+  ["BF70",0x7E2B],
+  ["BF71",0x7E2C],
+  ["BF72",0x7E2D],
+  ["BF73",0x7E2E],
+  ["BF74",0x7E2F],
+  ["BF75",0x7E30],
+  ["BF76",0x7E31],
+  ["BF77",0x7E32],
+  ["BF78",0x7E33],
+  ["BF79",0x7E34],
+  ["BF7A",0x7E35],
+  ["BF7B",0x7E36],
+  ["BF7C",0x7E37],
+  ["BF7D",0x7E38],
+  ["BF7E",0x7E39],
+  ["BF80",0x7E3A],
+  ["F7E3",0x7E3B],
+  ["BF81",0x7E3C],
+  ["BF82",0x7E3D],
+  ["BF83",0x7E3E],
+  ["BF84",0x7E3F],
+  ["BF85",0x7E40],
+  ["B7B1",0x7E41],
+  ["BF86",0x7E42],
+  ["BF87",0x7E43],
+  ["BF88",0x7E44],
+  ["BF89",0x7E45],
+  ["BF8A",0x7E46],
+  ["F4ED",0x7E47],
+  ["BF8B",0x7E48],
+  ["BF8C",0x7E49],
+  ["BF8D",0x7E4A],
+  ["BF8E",0x7E4B],
+  ["BF8F",0x7E4C],
+  ["BF90",0x7E4D],
+  ["BF91",0x7E4E],
+  ["BF92",0x7E4F],
+  ["BF93",0x7E50],
+  ["BF94",0x7E51],
+  ["BF95",0x7E52],
+  ["BF96",0x7E53],
+  ["BF97",0x7E54],
+  ["BF98",0x7E55],
+  ["BF99",0x7E56],
+  ["BF9A",0x7E57],
+  ["BF9B",0x7E58],
+  ["BF9C",0x7E59],
+  ["BF9D",0x7E5A],
+  ["BF9E",0x7E5B],
+  ["BF9F",0x7E5C],
+  ["BFA0",0x7E5D],
+  ["C040",0x7E5E],
+  ["C041",0x7E5F],
+  ["C042",0x7E60],
+  ["C043",0x7E61],
+  ["C044",0x7E62],
+  ["C045",0x7E63],
+  ["C046",0x7E64],
+  ["C047",0x7E65],
+  ["C048",0x7E66],
+  ["C049",0x7E67],
+  ["C04A",0x7E68],
+  ["C04B",0x7E69],
+  ["C04C",0x7E6A],
+  ["C04D",0x7E6B],
+  ["C04E",0x7E6C],
+  ["C04F",0x7E6D],
+  ["C050",0x7E6E],
+  ["C051",0x7E6F],
+  ["C052",0x7E70],
+  ["C053",0x7E71],
+  ["C054",0x7E72],
+  ["C055",0x7E73],
+  ["C056",0x7E74],
+  ["C057",0x7E75],
+  ["C058",0x7E76],
+  ["C059",0x7E77],
+  ["C05A",0x7E78],
+  ["C05B",0x7E79],
+  ["C05C",0x7E7A],
+  ["C05D",0x7E7B],
+  ["C05E",0x7E7C],
+  ["C05F",0x7E7D],
+  ["C060",0x7E7E],
+  ["C061",0x7E7F],
+  ["C062",0x7E80],
+  ["C063",0x7E81],
+  ["D7EB",0x7E82],
+  ["C064",0x7E83],
+  ["C065",0x7E84],
+  ["C066",0x7E85],
+  ["C067",0x7E86],
+  ["C068",0x7E87],
+  ["C069",0x7E88],
+  ["C06A",0x7E89],
+  ["C06B",0x7E8A],
+  ["C06C",0x7E8B],
+  ["C06D",0x7E8C],
+  ["C06E",0x7E8D],
+  ["C06F",0x7E8E],
+  ["C070",0x7E8F],
+  ["C071",0x7E90],
+  ["C072",0x7E91],
+  ["C073",0x7E92],
+  ["C074",0x7E93],
+  ["C075",0x7E94],
+  ["C076",0x7E95],
+  ["C077",0x7E96],
+  ["C078",0x7E97],
+  ["C079",0x7E98],
+  ["C07A",0x7E99],
+  ["C07B",0x7E9A],
+  ["F4EE",0x7E9B],
+  ["C07C",0x7E9C],
+  ["C07D",0x7E9D],
+  ["C07E",0x7E9E],
+  ["E6F9",0x7E9F],
+  ["BEC0",0x7EA0],
+  ["E6FA",0x7EA1],
+  ["BAEC",0x7EA2],
+  ["E6FB",0x7EA3],
+  ["CFCB",0x7EA4],
+  ["E6FC",0x7EA5],
+  ["D4BC",0x7EA6],
+  ["BCB6",0x7EA7],
+  ["E6FD",0x7EA8],
+  ["E6FE",0x7EA9],
+  ["BCCD",0x7EAA],
+  ["C8D2",0x7EAB],
+  ["CEB3",0x7EAC],
+  ["E7A1",0x7EAD],
+  ["C080",0x7EAE],
+  ["B4BF",0x7EAF],
+  ["E7A2",0x7EB0],
+  ["C9B4",0x7EB1],
+  ["B8D9",0x7EB2],
+  ["C4C9",0x7EB3],
+  ["C081",0x7EB4],
+  ["D7DD",0x7EB5],
+  ["C2DA",0x7EB6],
+  ["B7D7",0x7EB7],
+  ["D6BD",0x7EB8],
+  ["CEC6",0x7EB9],
+  ["B7C4",0x7EBA],
+  ["C082",0x7EBB],
+  ["C083",0x7EBC],
+  ["C5A6",0x7EBD],
+  ["E7A3",0x7EBE],
+  ["CFDF",0x7EBF],
+  ["E7A4",0x7EC0],
+  ["E7A5",0x7EC1],
+  ["E7A6",0x7EC2],
+  ["C1B7",0x7EC3],
+  ["D7E9",0x7EC4],
+  ["C9F0",0x7EC5],
+  ["CFB8",0x7EC6],
+  ["D6AF",0x7EC7],
+  ["D6D5",0x7EC8],
+  ["E7A7",0x7EC9],
+  ["B0ED",0x7ECA],
+  ["E7A8",0x7ECB],
+  ["E7A9",0x7ECC],
+  ["C9DC",0x7ECD],
+  ["D2EF",0x7ECE],
+  ["BEAD",0x7ECF],
+  ["E7AA",0x7ED0],
+  ["B0F3",0x7ED1],
+  ["C8DE",0x7ED2],
+  ["BDE1",0x7ED3],
+  ["E7AB",0x7ED4],
+  ["C8C6",0x7ED5],
+  ["C084",0x7ED6],
+  ["E7AC",0x7ED7],
+  ["BBE6",0x7ED8],
+  ["B8F8",0x7ED9],
+  ["D1A4",0x7EDA],
+  ["E7AD",0x7EDB],
+  ["C2E7",0x7EDC],
+  ["BEF8",0x7EDD],
+  ["BDCA",0x7EDE],
+  ["CDB3",0x7EDF],
+  ["E7AE",0x7EE0],
+  ["E7AF",0x7EE1],
+  ["BEEE",0x7EE2],
+  ["D0E5",0x7EE3],
+  ["C085",0x7EE4],
+  ["CBE7",0x7EE5],
+  ["CCD0",0x7EE6],
+  ["BCCC",0x7EE7],
+  ["E7B0",0x7EE8],
+  ["BCA8",0x7EE9],
+  ["D0F7",0x7EEA],
+  ["E7B1",0x7EEB],
+  ["C086",0x7EEC],
+  ["D0F8",0x7EED],
+  ["E7B2",0x7EEE],
+  ["E7B3",0x7EEF],
+  ["B4C2",0x7EF0],
+  ["E7B4",0x7EF1],
+  ["E7B5",0x7EF2],
+  ["C9FE",0x7EF3],
+  ["CEAC",0x7EF4],
+  ["C3E0",0x7EF5],
+  ["E7B7",0x7EF6],
+  ["B1C1",0x7EF7],
+  ["B3F1",0x7EF8],
+  ["C087",0x7EF9],
+  ["E7B8",0x7EFA],
+  ["E7B9",0x7EFB],
+  ["D7DB",0x7EFC],
+  ["D5C0",0x7EFD],
+  ["E7BA",0x7EFE],
+  ["C2CC",0x7EFF],
+  ["D7BA",0x7F00],
+  ["E7BB",0x7F01],
+  ["E7BC",0x7F02],
+  ["E7BD",0x7F03],
+  ["BCEA",0x7F04],
+  ["C3E5",0x7F05],
+  ["C0C2",0x7F06],
+  ["E7BE",0x7F07],
+  ["E7BF",0x7F08],
+  ["BCA9",0x7F09],
+  ["C088",0x7F0A],
+  ["E7C0",0x7F0B],
+  ["E7C1",0x7F0C],
+  ["E7B6",0x7F0D],
+  ["B6D0",0x7F0E],
+  ["E7C2",0x7F0F],
+  ["C089",0x7F10],
+  ["E7C3",0x7F11],
+  ["E7C4",0x7F12],
+  ["BBBA",0x7F13],
+  ["B5DE",0x7F14],
+  ["C2C6",0x7F15],
+  ["B1E0",0x7F16],
+  ["E7C5",0x7F17],
+  ["D4B5",0x7F18],
+  ["E7C6",0x7F19],
+  ["B8BF",0x7F1A],
+  ["E7C8",0x7F1B],
+  ["E7C7",0x7F1C],
+  ["B7EC",0x7F1D],
+  ["C08A",0x7F1E],
+  ["E7C9",0x7F1F],
+  ["B2F8",0x7F20],
+  ["E7CA",0x7F21],
+  ["E7CB",0x7F22],
+  ["E7CC",0x7F23],
+  ["E7CD",0x7F24],
+  ["E7CE",0x7F25],
+  ["E7CF",0x7F26],
+  ["E7D0",0x7F27],
+  ["D3A7",0x7F28],
+  ["CBF5",0x7F29],
+  ["E7D1",0x7F2A],
+  ["E7D2",0x7F2B],
+  ["E7D3",0x7F2C],
+  ["E7D4",0x7F2D],
+  ["C9C9",0x7F2E],
+  ["E7D5",0x7F2F],
+  ["E7D6",0x7F30],
+  ["E7D7",0x7F31],
+  ["E7D8",0x7F32],
+  ["E7D9",0x7F33],
+  ["BDC9",0x7F34],
+  ["E7DA",0x7F35],
+  ["F3BE",0x7F36],
+  ["C08B",0x7F37],
+  ["B8D7",0x7F38],
+  ["C08C",0x7F39],
+  ["C8B1",0x7F3A],
+  ["C08D",0x7F3B],
+  ["C08E",0x7F3C],
+  ["C08F",0x7F3D],
+  ["C090",0x7F3E],
+  ["C091",0x7F3F],
+  ["C092",0x7F40],
+  ["C093",0x7F41],
+  ["F3BF",0x7F42],
+  ["C094",0x7F43],
+  ["F3C0",0x7F44],
+  ["F3C1",0x7F45],
+  ["C095",0x7F46],
+  ["C096",0x7F47],
+  ["C097",0x7F48],
+  ["C098",0x7F49],
+  ["C099",0x7F4A],
+  ["C09A",0x7F4B],
+  ["C09B",0x7F4C],
+  ["C09C",0x7F4D],
+  ["C09D",0x7F4E],
+  ["C09E",0x7F4F],
+  ["B9DE",0x7F50],
+  ["CDF8",0x7F51],
+  ["C09F",0x7F52],
+  ["C0A0",0x7F53],
+  ["D8E8",0x7F54],
+  ["BAB1",0x7F55],
+  ["C140",0x7F56],
+  ["C2DE",0x7F57],
+  ["EEB7",0x7F58],
+  ["C141",0x7F59],
+  ["B7A3",0x7F5A],
+  ["C142",0x7F5B],
+  ["C143",0x7F5C],
+  ["C144",0x7F5D],
+  ["C145",0x7F5E],
+  ["EEB9",0x7F5F],
+  ["C146",0x7F60],
+  ["EEB8",0x7F61],
+  ["B0D5",0x7F62],
+  ["C147",0x7F63],
+  ["C148",0x7F64],
+  ["C149",0x7F65],
+  ["C14A",0x7F66],
+  ["C14B",0x7F67],
+  ["EEBB",0x7F68],
+  ["D5D6",0x7F69],
+  ["D7EF",0x7F6A],
+  ["C14C",0x7F6B],
+  ["C14D",0x7F6C],
+  ["C14E",0x7F6D],
+  ["D6C3",0x7F6E],
+  ["C14F",0x7F6F],
+  ["C150",0x7F70],
+  ["EEBD",0x7F71],
+  ["CAF0",0x7F72],
+  ["C151",0x7F73],
+  ["EEBC",0x7F74],
+  ["C152",0x7F75],
+  ["C153",0x7F76],
+  ["C154",0x7F77],
+  ["C155",0x7F78],
+  ["EEBE",0x7F79],
+  ["C156",0x7F7A],
+  ["C157",0x7F7B],
+  ["C158",0x7F7C],
+  ["C159",0x7F7D],
+  ["EEC0",0x7F7E],
+  ["C15A",0x7F7F],
+  ["C15B",0x7F80],
+  ["EEBF",0x7F81],
+  ["C15C",0x7F82],
+  ["C15D",0x7F83],
+  ["C15E",0x7F84],
+  ["C15F",0x7F85],
+  ["C160",0x7F86],
+  ["C161",0x7F87],
+  ["C162",0x7F88],
+  ["C163",0x7F89],
+  ["D1F2",0x7F8A],
+  ["C164",0x7F8B],
+  ["C7BC",0x7F8C],
+  ["C165",0x7F8D],
+  ["C3C0",0x7F8E],
+  ["C166",0x7F8F],
+  ["C167",0x7F90],
+  ["C168",0x7F91],
+  ["C169",0x7F92],
+  ["C16A",0x7F93],
+  ["B8E1",0x7F94],
+  ["C16B",0x7F95],
+  ["C16C",0x7F96],
+  ["C16D",0x7F97],
+  ["C16E",0x7F98],
+  ["C16F",0x7F99],
+  ["C1E7",0x7F9A],
+  ["C170",0x7F9B],
+  ["C171",0x7F9C],
+  ["F4C6",0x7F9D],
+  ["D0DF",0x7F9E],
+  ["F4C7",0x7F9F],
+  ["C172",0x7FA0],
+  ["CFDB",0x7FA1],
+  ["C173",0x7FA2],
+  ["C174",0x7FA3],
+  ["C8BA",0x7FA4],
+  ["C175",0x7FA5],
+  ["C176",0x7FA6],
+  ["F4C8",0x7FA7],
+  ["C177",0x7FA8],
+  ["C178",0x7FA9],
+  ["C179",0x7FAA],
+  ["C17A",0x7FAB],
+  ["C17B",0x7FAC],
+  ["C17C",0x7FAD],
+  ["C17D",0x7FAE],
+  ["F4C9",0x7FAF],
+  ["F4CA",0x7FB0],
+  ["C17E",0x7FB1],
+  ["F4CB",0x7FB2],
+  ["C180",0x7FB3],
+  ["C181",0x7FB4],
+  ["C182",0x7FB5],
+  ["C183",0x7FB6],
+  ["C184",0x7FB7],
+  ["D9FA",0x7FB8],
+  ["B8FE",0x7FB9],
+  ["C185",0x7FBA],
+  ["C186",0x7FBB],
+  ["E5F1",0x7FBC],
+  ["D3F0",0x7FBD],
+  ["C187",0x7FBE],
+  ["F4E0",0x7FBF],
+  ["C188",0x7FC0],
+  ["CECC",0x7FC1],
+  ["C189",0x7FC2],
+  ["C18A",0x7FC3],
+  ["C18B",0x7FC4],
+  ["B3E1",0x7FC5],
+  ["C18C",0x7FC6],
+  ["C18D",0x7FC7],
+  ["C18E",0x7FC8],
+  ["C18F",0x7FC9],
+  ["F1B4",0x7FCA],
+  ["C190",0x7FCB],
+  ["D2EE",0x7FCC],
+  ["C191",0x7FCD],
+  ["F4E1",0x7FCE],
+  ["C192",0x7FCF],
+  ["C193",0x7FD0],
+  ["C194",0x7FD1],
+  ["C195",0x7FD2],
+  ["C196",0x7FD3],
+  ["CFE8",0x7FD4],
+  ["F4E2",0x7FD5],
+  ["C197",0x7FD6],
+  ["C198",0x7FD7],
+  ["C7CC",0x7FD8],
+  ["C199",0x7FD9],
+  ["C19A",0x7FDA],
+  ["C19B",0x7FDB],
+  ["C19C",0x7FDC],
+  ["C19D",0x7FDD],
+  ["C19E",0x7FDE],
+  ["B5D4",0x7FDF],
+  ["B4E4",0x7FE0],
+  ["F4E4",0x7FE1],
+  ["C19F",0x7FE2],
+  ["C1A0",0x7FE3],
+  ["C240",0x7FE4],
+  ["F4E3",0x7FE5],
+  ["F4E5",0x7FE6],
+  ["C241",0x7FE7],
+  ["C242",0x7FE8],
+  ["F4E6",0x7FE9],
+  ["C243",0x7FEA],
+  ["C244",0x7FEB],
+  ["C245",0x7FEC],
+  ["C246",0x7FED],
+  ["F4E7",0x7FEE],
+  ["C247",0x7FEF],
+  ["BAB2",0x7FF0],
+  ["B0BF",0x7FF1],
+  ["C248",0x7FF2],
+  ["F4E8",0x7FF3],
+  ["C249",0x7FF4],
+  ["C24A",0x7FF5],
+  ["C24B",0x7FF6],
+  ["C24C",0x7FF7],
+  ["C24D",0x7FF8],
+  ["C24E",0x7FF9],
+  ["C24F",0x7FFA],
+  ["B7AD",0x7FFB],
+  ["D2ED",0x7FFC],
+  ["C250",0x7FFD],
+  ["C251",0x7FFE],
+  ["C252",0x7FFF],
+  ["D2AB",0x8000],
+  ["C0CF",0x8001],
+  ["C253",0x8002],
+  ["BFBC",0x8003],
+  ["EBA3",0x8004],
+  ["D5DF",0x8005],
+  ["EAC8",0x8006],
+  ["C254",0x8007],
+  ["C255",0x8008],
+  ["C256",0x8009],
+  ["C257",0x800A],
+  ["F1F3",0x800B],
+  ["B6F8",0x800C],
+  ["CBA3",0x800D],
+  ["C258",0x800E],
+  ["C259",0x800F],
+  ["C4CD",0x8010],
+  ["C25A",0x8011],
+  ["F1E7",0x8012],
+  ["C25B",0x8013],
+  ["F1E8",0x8014],
+  ["B8FB",0x8015],
+  ["F1E9",0x8016],
+  ["BAC4",0x8017],
+  ["D4C5",0x8018],
+  ["B0D2",0x8019],
+  ["C25C",0x801A],
+  ["C25D",0x801B],
+  ["F1EA",0x801C],
+  ["C25E",0x801D],
+  ["C25F",0x801E],
+  ["C260",0x801F],
+  ["F1EB",0x8020],
+  ["C261",0x8021],
+  ["F1EC",0x8022],
+  ["C262",0x8023],
+  ["C263",0x8024],
+  ["F1ED",0x8025],
+  ["F1EE",0x8026],
+  ["F1EF",0x8027],
+  ["F1F1",0x8028],
+  ["F1F0",0x8029],
+  ["C5D5",0x802A],
+  ["C264",0x802B],
+  ["C265",0x802C],
+  ["C266",0x802D],
+  ["C267",0x802E],
+  ["C268",0x802F],
+  ["C269",0x8030],
+  ["F1F2",0x8031],
+  ["C26A",0x8032],
+  ["B6FA",0x8033],
+  ["C26B",0x8034],
+  ["F1F4",0x8035],
+  ["D2AE",0x8036],
+  ["DEC7",0x8037],
+  ["CBCA",0x8038],
+  ["C26C",0x8039],
+  ["C26D",0x803A],
+  ["B3DC",0x803B],
+  ["C26E",0x803C],
+  ["B5A2",0x803D],
+  ["C26F",0x803E],
+  ["B9A2",0x803F],
+  ["C270",0x8040],
+  ["C271",0x8041],
+  ["C4F4",0x8042],
+  ["F1F5",0x8043],
+  ["C272",0x8044],
+  ["C273",0x8045],
+  ["F1F6",0x8046],
+  ["C274",0x8047],
+  ["C275",0x8048],
+  ["C276",0x8049],
+  ["C1C4",0x804A],
+  ["C1FB",0x804B],
+  ["D6B0",0x804C],
+  ["F1F7",0x804D],
+  ["C277",0x804E],
+  ["C278",0x804F],
+  ["C279",0x8050],
+  ["C27A",0x8051],
+  ["F1F8",0x8052],
+  ["C27B",0x8053],
+  ["C1AA",0x8054],
+  ["C27C",0x8055],
+  ["C27D",0x8056],
+  ["C27E",0x8057],
+  ["C6B8",0x8058],
+  ["C280",0x8059],
+  ["BEDB",0x805A],
+  ["C281",0x805B],
+  ["C282",0x805C],
+  ["C283",0x805D],
+  ["C284",0x805E],
+  ["C285",0x805F],
+  ["C286",0x8060],
+  ["C287",0x8061],
+  ["C288",0x8062],
+  ["C289",0x8063],
+  ["C28A",0x8064],
+  ["C28B",0x8065],
+  ["C28C",0x8066],
+  ["C28D",0x8067],
+  ["C28E",0x8068],
+  ["F1F9",0x8069],
+  ["B4CF",0x806A],
+  ["C28F",0x806B],
+  ["C290",0x806C],
+  ["C291",0x806D],
+  ["C292",0x806E],
+  ["C293",0x806F],
+  ["C294",0x8070],
+  ["F1FA",0x8071],
+  ["C295",0x8072],
+  ["C296",0x8073],
+  ["C297",0x8074],
+  ["C298",0x8075],
+  ["C299",0x8076],
+  ["C29A",0x8077],
+  ["C29B",0x8078],
+  ["C29C",0x8079],
+  ["C29D",0x807A],
+  ["C29E",0x807B],
+  ["C29F",0x807C],
+  ["C2A0",0x807D],
+  ["C340",0x807E],
+  ["EDB2",0x807F],
+  ["EDB1",0x8080],
+  ["C341",0x8081],
+  ["C342",0x8082],
+  ["CBE0",0x8083],
+  ["D2DE",0x8084],
+  ["C343",0x8085],
+  ["CBC1",0x8086],
+  ["D5D8",0x8087],
+  ["C344",0x8088],
+  ["C8E2",0x8089],
+  ["C345",0x808A],
+  ["C0DF",0x808B],
+  ["BCA1",0x808C],
+  ["C346",0x808D],
+  ["C347",0x808E],
+  ["C348",0x808F],
+  ["C349",0x8090],
+  ["C34A",0x8091],
+  ["C34B",0x8092],
+  ["EBC1",0x8093],
+  ["C34C",0x8094],
+  ["C34D",0x8095],
+  ["D0A4",0x8096],
+  ["C34E",0x8097],
+  ["D6E2",0x8098],
+  ["C34F",0x8099],
+  ["B6C7",0x809A],
+  ["B8D8",0x809B],
+  ["EBC0",0x809C],
+  ["B8CE",0x809D],
+  ["C350",0x809E],
+  ["EBBF",0x809F],
+  ["B3A6",0x80A0],
+  ["B9C9",0x80A1],
+  ["D6AB",0x80A2],
+  ["C351",0x80A3],
+  ["B7F4",0x80A4],
+  ["B7CA",0x80A5],
+  ["C352",0x80A6],
+  ["C353",0x80A7],
+  ["C354",0x80A8],
+  ["BCE7",0x80A9],
+  ["B7BE",0x80AA],
+  ["EBC6",0x80AB],
+  ["C355",0x80AC],
+  ["EBC7",0x80AD],
+  ["B0B9",0x80AE],
+  ["BFCF",0x80AF],
+  ["C356",0x80B0],
+  ["EBC5",0x80B1],
+  ["D3FD",0x80B2],
+  ["C357",0x80B3],
+  ["EBC8",0x80B4],
+  ["C358",0x80B5],
+  ["C359",0x80B6],
+  ["EBC9",0x80B7],
+  ["C35A",0x80B8],
+  ["C35B",0x80B9],
+  ["B7CE",0x80BA],
+  ["C35C",0x80BB],
+  ["EBC2",0x80BC],
+  ["EBC4",0x80BD],
+  ["C9F6",0x80BE],
+  ["D6D7",0x80BF],
+  ["D5CD",0x80C0],
+  ["D0B2",0x80C1],
+  ["EBCF",0x80C2],
+  ["CEB8",0x80C3],
+  ["EBD0",0x80C4],
+  ["C35D",0x80C5],
+  ["B5A8",0x80C6],
+  ["C35E",0x80C7],
+  ["C35F",0x80C8],
+  ["C360",0x80C9],
+  ["C361",0x80CA],
+  ["C362",0x80CB],
+  ["B1B3",0x80CC],
+  ["EBD2",0x80CD],
+  ["CCA5",0x80CE],
+  ["C363",0x80CF],
+  ["C364",0x80D0],
+  ["C365",0x80D1],
+  ["C366",0x80D2],
+  ["C367",0x80D3],
+  ["C368",0x80D4],
+  ["C369",0x80D5],
+  ["C5D6",0x80D6],
+  ["EBD3",0x80D7],
+  ["C36A",0x80D8],
+  ["EBD1",0x80D9],
+  ["C5DF",0x80DA],
+  ["EBCE",0x80DB],
+  ["CAA4",0x80DC],
+  ["EBD5",0x80DD],
+  ["B0FB",0x80DE],
+  ["C36B",0x80DF],
+  ["C36C",0x80E0],
+  ["BAFA",0x80E1],
+  ["C36D",0x80E2],
+  ["C36E",0x80E3],
+  ["D8B7",0x80E4],
+  ["F1E3",0x80E5],
+  ["C36F",0x80E6],
+  ["EBCA",0x80E7],
+  ["EBCB",0x80E8],
+  ["EBCC",0x80E9],
+  ["EBCD",0x80EA],
+  ["EBD6",0x80EB],
+  ["E6C0",0x80EC],
+  ["EBD9",0x80ED],
+  ["C370",0x80EE],
+  ["BFE8",0x80EF],
+  ["D2C8",0x80F0],
+  ["EBD7",0x80F1],
+  ["EBDC",0x80F2],
+  ["B8EC",0x80F3],
+  ["EBD8",0x80F4],
+  ["C371",0x80F5],
+  ["BDBA",0x80F6],
+  ["C372",0x80F7],
+  ["D0D8",0x80F8],
+  ["C373",0x80F9],
+  ["B0B7",0x80FA],
+  ["C374",0x80FB],
+  ["EBDD",0x80FC],
+  ["C4DC",0x80FD],
+  ["C375",0x80FE],
+  ["C376",0x80FF],
+  ["C377",0x8100],
+  ["C378",0x8101],
+  ["D6AC",0x8102],
+  ["C379",0x8103],
+  ["C37A",0x8104],
+  ["C37B",0x8105],
+  ["B4E0",0x8106],
+  ["C37C",0x8107],
+  ["C37D",0x8108],
+  ["C2F6",0x8109],
+  ["BCB9",0x810A],
+  ["C37E",0x810B],
+  ["C380",0x810C],
+  ["EBDA",0x810D],
+  ["EBDB",0x810E],
+  ["D4E0",0x810F],
+  ["C6EA",0x8110],
+  ["C4D4",0x8111],
+  ["EBDF",0x8112],
+  ["C5A7",0x8113],
+  ["D9F5",0x8114],
+  ["C381",0x8115],
+  ["B2B1",0x8116],
+  ["C382",0x8117],
+  ["EBE4",0x8118],
+  ["C383",0x8119],
+  ["BDC5",0x811A],
+  ["C384",0x811B],
+  ["C385",0x811C],
+  ["C386",0x811D],
+  ["EBE2",0x811E],
+  ["C387",0x811F],
+  ["C388",0x8120],
+  ["C389",0x8121],
+  ["C38A",0x8122],
+  ["C38B",0x8123],
+  ["C38C",0x8124],
+  ["C38D",0x8125],
+  ["C38E",0x8126],
+  ["C38F",0x8127],
+  ["C390",0x8128],
+  ["C391",0x8129],
+  ["C392",0x812A],
+  ["C393",0x812B],
+  ["EBE3",0x812C],
+  ["C394",0x812D],
+  ["C395",0x812E],
+  ["B8AC",0x812F],
+  ["C396",0x8130],
+  ["CDD1",0x8131],
+  ["EBE5",0x8132],
+  ["C397",0x8133],
+  ["C398",0x8134],
+  ["C399",0x8135],
+  ["EBE1",0x8136],
+  ["C39A",0x8137],
+  ["C1B3",0x8138],
+  ["C39B",0x8139],
+  ["C39C",0x813A],
+  ["C39D",0x813B],
+  ["C39E",0x813C],
+  ["C39F",0x813D],
+  ["C6A2",0x813E],
+  ["C3A0",0x813F],
+  ["C440",0x8140],
+  ["C441",0x8141],
+  ["C442",0x8142],
+  ["C443",0x8143],
+  ["C444",0x8144],
+  ["C445",0x8145],
+  ["CCF3",0x8146],
+  ["C446",0x8147],
+  ["EBE6",0x8148],
+  ["C447",0x8149],
+  ["C0B0",0x814A],
+  ["D2B8",0x814B],
+  ["EBE7",0x814C],
+  ["C448",0x814D],
+  ["C449",0x814E],
+  ["C44A",0x814F],
+  ["B8AF",0x8150],
+  ["B8AD",0x8151],
+  ["C44B",0x8152],
+  ["EBE8",0x8153],
+  ["C7BB",0x8154],
+  ["CDF3",0x8155],
+  ["C44C",0x8156],
+  ["C44D",0x8157],
+  ["C44E",0x8158],
+  ["EBEA",0x8159],
+  ["EBEB",0x815A],
+  ["C44F",0x815B],
+  ["C450",0x815C],
+  ["C451",0x815D],
+  ["C452",0x815E],
+  ["C453",0x815F],
+  ["EBED",0x8160],
+  ["C454",0x8161],
+  ["C455",0x8162],
+  ["C456",0x8163],
+  ["C457",0x8164],
+  ["D0C8",0x8165],
+  ["C458",0x8166],
+  ["EBF2",0x8167],
+  ["C459",0x8168],
+  ["EBEE",0x8169],
+  ["C45A",0x816A],
+  ["C45B",0x816B],
+  ["C45C",0x816C],
+  ["EBF1",0x816D],
+  ["C8F9",0x816E],
+  ["C45D",0x816F],
+  ["D1FC",0x8170],
+  ["EBEC",0x8171],
+  ["C45E",0x8172],
+  ["C45F",0x8173],
+  ["EBE9",0x8174],
+  ["C460",0x8175],
+  ["C461",0x8176],
+  ["C462",0x8177],
+  ["C463",0x8178],
+  ["B8B9",0x8179],
+  ["CFD9",0x817A],
+  ["C4E5",0x817B],
+  ["EBEF",0x817C],
+  ["EBF0",0x817D],
+  ["CCDA",0x817E],
+  ["CDC8",0x817F],
+  ["B0F2",0x8180],
+  ["C464",0x8181],
+  ["EBF6",0x8182],
+  ["C465",0x8183],
+  ["C466",0x8184],
+  ["C467",0x8185],
+  ["C468",0x8186],
+  ["C469",0x8187],
+  ["EBF5",0x8188],
+  ["C46A",0x8189],
+  ["B2B2",0x818A],
+  ["C46B",0x818B],
+  ["C46C",0x818C],
+  ["C46D",0x818D],
+  ["C46E",0x818E],
+  ["B8E0",0x818F],
+  ["C46F",0x8190],
+  ["EBF7",0x8191],
+  ["C470",0x8192],
+  ["C471",0x8193],
+  ["C472",0x8194],
+  ["C473",0x8195],
+  ["C474",0x8196],
+  ["C475",0x8197],
+  ["B1EC",0x8198],
+  ["C476",0x8199],
+  ["C477",0x819A],
+  ["CCC5",0x819B],
+  ["C4A4",0x819C],
+  ["CFA5",0x819D],
+  ["C478",0x819E],
+  ["C479",0x819F],
+  ["C47A",0x81A0],
+  ["C47B",0x81A1],
+  ["C47C",0x81A2],
+  ["EBF9",0x81A3],
+  ["C47D",0x81A4],
+  ["C47E",0x81A5],
+  ["ECA2",0x81A6],
+  ["C480",0x81A7],
+  ["C5F2",0x81A8],
+  ["C481",0x81A9],
+  ["EBFA",0x81AA],
+  ["C482",0x81AB],
+  ["C483",0x81AC],
+  ["C484",0x81AD],
+  ["C485",0x81AE],
+  ["C486",0x81AF],
+  ["C487",0x81B0],
+  ["C488",0x81B1],
+  ["C489",0x81B2],
+  ["C9C5",0x81B3],
+  ["C48A",0x81B4],
+  ["C48B",0x81B5],
+  ["C48C",0x81B6],
+  ["C48D",0x81B7],
+  ["C48E",0x81B8],
+  ["C48F",0x81B9],
+  ["E2DF",0x81BA],
+  ["EBFE",0x81BB],
+  ["C490",0x81BC],
+  ["C491",0x81BD],
+  ["C492",0x81BE],
+  ["C493",0x81BF],
+  ["CDCE",0x81C0],
+  ["ECA1",0x81C1],
+  ["B1DB",0x81C2],
+  ["D3B7",0x81C3],
+  ["C494",0x81C4],
+  ["C495",0x81C5],
+  ["D2DC",0x81C6],
+  ["C496",0x81C7],
+  ["C497",0x81C8],
+  ["C498",0x81C9],
+  ["EBFD",0x81CA],
+  ["C499",0x81CB],
+  ["EBFB",0x81CC],
+  ["C49A",0x81CD],
+  ["C49B",0x81CE],
+  ["C49C",0x81CF],
+  ["C49D",0x81D0],
+  ["C49E",0x81D1],
+  ["C49F",0x81D2],
+  ["C4A0",0x81D3],
+  ["C540",0x81D4],
+  ["C541",0x81D5],
+  ["C542",0x81D6],
+  ["C543",0x81D7],
+  ["C544",0x81D8],
+  ["C545",0x81D9],
+  ["C546",0x81DA],
+  ["C547",0x81DB],
+  ["C548",0x81DC],
+  ["C549",0x81DD],
+  ["C54A",0x81DE],
+  ["C54B",0x81DF],
+  ["C54C",0x81E0],
+  ["C54D",0x81E1],
+  ["C54E",0x81E2],
+  ["B3BC",0x81E3],
+  ["C54F",0x81E4],
+  ["C550",0x81E5],
+  ["C551",0x81E6],
+  ["EAB0",0x81E7],
+  ["C552",0x81E8],
+  ["C553",0x81E9],
+  ["D7D4",0x81EA],
+  ["C554",0x81EB],
+  ["F4AB",0x81EC],
+  ["B3F4",0x81ED],
+  ["C555",0x81EE],
+  ["C556",0x81EF],
+  ["C557",0x81F0],
+  ["C558",0x81F1],
+  ["C559",0x81F2],
+  ["D6C1",0x81F3],
+  ["D6C2",0x81F4],
+  ["C55A",0x81F5],
+  ["C55B",0x81F6],
+  ["C55C",0x81F7],
+  ["C55D",0x81F8],
+  ["C55E",0x81F9],
+  ["C55F",0x81FA],
+  ["D5E9",0x81FB],
+  ["BECA",0x81FC],
+  ["C560",0x81FD],
+  ["F4A7",0x81FE],
+  ["C561",0x81FF],
+  ["D2A8",0x8200],
+  ["F4A8",0x8201],
+  ["F4A9",0x8202],
+  ["C562",0x8203],
+  ["F4AA",0x8204],
+  ["BECB",0x8205],
+  ["D3DF",0x8206],
+  ["C563",0x8207],
+  ["C564",0x8208],
+  ["C565",0x8209],
+  ["C566",0x820A],
+  ["C567",0x820B],
+  ["C9E0",0x820C],
+  ["C9E1",0x820D],
+  ["C568",0x820E],
+  ["C569",0x820F],
+  ["F3C2",0x8210],
+  ["C56A",0x8211],
+  ["CAE6",0x8212],
+  ["C56B",0x8213],
+  ["CCF2",0x8214],
+  ["C56C",0x8215],
+  ["C56D",0x8216],
+  ["C56E",0x8217],
+  ["C56F",0x8218],
+  ["C570",0x8219],
+  ["C571",0x821A],
+  ["E2B6",0x821B],
+  ["CBB4",0x821C],
+  ["C572",0x821D],
+  ["CEE8",0x821E],
+  ["D6DB",0x821F],
+  ["C573",0x8220],
+  ["F4AD",0x8221],
+  ["F4AE",0x8222],
+  ["F4AF",0x8223],
+  ["C574",0x8224],
+  ["C575",0x8225],
+  ["C576",0x8226],
+  ["C577",0x8227],
+  ["F4B2",0x8228],
+  ["C578",0x8229],
+  ["BABD",0x822A],
+  ["F4B3",0x822B],
+  ["B0E3",0x822C],
+  ["F4B0",0x822D],
+  ["C579",0x822E],
+  ["F4B1",0x822F],
+  ["BDA2",0x8230],
+  ["B2D5",0x8231],
+  ["C57A",0x8232],
+  ["F4B6",0x8233],
+  ["F4B7",0x8234],
+  ["B6E6",0x8235],
+  ["B2B0",0x8236],
+  ["CFCF",0x8237],
+  ["F4B4",0x8238],
+  ["B4AC",0x8239],
+  ["C57B",0x823A],
+  ["F4B5",0x823B],
+  ["C57C",0x823C],
+  ["C57D",0x823D],
+  ["F4B8",0x823E],
+  ["C57E",0x823F],
+  ["C580",0x8240],
+  ["C581",0x8241],
+  ["C582",0x8242],
+  ["C583",0x8243],
+  ["F4B9",0x8244],
+  ["C584",0x8245],
+  ["C585",0x8246],
+  ["CDA7",0x8247],
+  ["C586",0x8248],
+  ["F4BA",0x8249],
+  ["C587",0x824A],
+  ["F4BB",0x824B],
+  ["C588",0x824C],
+  ["C589",0x824D],
+  ["C58A",0x824E],
+  ["F4BC",0x824F],
+  ["C58B",0x8250],
+  ["C58C",0x8251],
+  ["C58D",0x8252],
+  ["C58E",0x8253],
+  ["C58F",0x8254],
+  ["C590",0x8255],
+  ["C591",0x8256],
+  ["C592",0x8257],
+  ["CBD2",0x8258],
+  ["C593",0x8259],
+  ["F4BD",0x825A],
+  ["C594",0x825B],
+  ["C595",0x825C],
+  ["C596",0x825D],
+  ["C597",0x825E],
+  ["F4BE",0x825F],
+  ["C598",0x8260],
+  ["C599",0x8261],
+  ["C59A",0x8262],
+  ["C59B",0x8263],
+  ["C59C",0x8264],
+  ["C59D",0x8265],
+  ["C59E",0x8266],
+  ["C59F",0x8267],
+  ["F4BF",0x8268],
+  ["C5A0",0x8269],
+  ["C640",0x826A],
+  ["C641",0x826B],
+  ["C642",0x826C],
+  ["C643",0x826D],
+  ["F4DE",0x826E],
+  ["C1BC",0x826F],
+  ["BCE8",0x8270],
+  ["C644",0x8271],
+  ["C9AB",0x8272],
+  ["D1DE",0x8273],
+  ["E5F5",0x8274],
+  ["C645",0x8275],
+  ["C646",0x8276],
+  ["C647",0x8277],
+  ["C648",0x8278],
+  ["DCB3",0x8279],
+  ["D2D5",0x827A],
+  ["C649",0x827B],
+  ["C64A",0x827C],
+  ["DCB4",0x827D],
+  ["B0AC",0x827E],
+  ["DCB5",0x827F],
+  ["C64B",0x8280],
+  ["C64C",0x8281],
+  ["BDDA",0x8282],
+  ["C64D",0x8283],
+  ["DCB9",0x8284],
+  ["C64E",0x8285],
+  ["C64F",0x8286],
+  ["C650",0x8287],
+  ["D8C2",0x8288],
+  ["C651",0x8289],
+  ["DCB7",0x828A],
+  ["D3F3",0x828B],
+  ["C652",0x828C],
+  ["C9D6",0x828D],
+  ["DCBA",0x828E],
+  ["DCB6",0x828F],
+  ["C653",0x8290],
+  ["DCBB",0x8291],
+  ["C3A2",0x8292],
+  ["C654",0x8293],
+  ["C655",0x8294],
+  ["C656",0x8295],
+  ["C657",0x8296],
+  ["DCBC",0x8297],
+  ["DCC5",0x8298],
+  ["DCBD",0x8299],
+  ["C658",0x829A],
+  ["C659",0x829B],
+  ["CEDF",0x829C],
+  ["D6A5",0x829D],
+  ["C65A",0x829E],
+  ["DCCF",0x829F],
+  ["C65B",0x82A0],
+  ["DCCD",0x82A1],
+  ["C65C",0x82A2],
+  ["C65D",0x82A3],
+  ["DCD2",0x82A4],
+  ["BDE6",0x82A5],
+  ["C2AB",0x82A6],
+  ["C65E",0x82A7],
+  ["DCB8",0x82A8],
+  ["DCCB",0x82A9],
+  ["DCCE",0x82AA],
+  ["DCBE",0x82AB],
+  ["B7D2",0x82AC],
+  ["B0C5",0x82AD],
+  ["DCC7",0x82AE],
+  ["D0BE",0x82AF],
+  ["DCC1",0x82B0],
+  ["BBA8",0x82B1],
+  ["C65F",0x82B2],
+  ["B7BC",0x82B3],
+  ["DCCC",0x82B4],
+  ["C660",0x82B5],
+  ["C661",0x82B6],
+  ["DCC6",0x82B7],
+  ["DCBF",0x82B8],
+  ["C7DB",0x82B9],
+  ["C662",0x82BA],
+  ["C663",0x82BB],
+  ["C664",0x82BC],
+  ["D1BF",0x82BD],
+  ["DCC0",0x82BE],
+  ["C665",0x82BF],
+  ["C666",0x82C0],
+  ["DCCA",0x82C1],
+  ["C667",0x82C2],
+  ["C668",0x82C3],
+  ["DCD0",0x82C4],
+  ["C669",0x82C5],
+  ["C66A",0x82C6],
+  ["CEAD",0x82C7],
+  ["DCC2",0x82C8],
+  ["C66B",0x82C9],
+  ["DCC3",0x82CA],
+  ["DCC8",0x82CB],
+  ["DCC9",0x82CC],
+  ["B2D4",0x82CD],
+  ["DCD1",0x82CE],
+  ["CBD5",0x82CF],
+  ["C66C",0x82D0],
+  ["D4B7",0x82D1],
+  ["DCDB",0x82D2],
+  ["DCDF",0x82D3],
+  ["CCA6",0x82D4],
+  ["DCE6",0x82D5],
+  ["C66D",0x82D6],
+  ["C3E7",0x82D7],
+  ["DCDC",0x82D8],
+  ["C66E",0x82D9],
+  ["C66F",0x82DA],
+  ["BFC1",0x82DB],
+  ["DCD9",0x82DC],
+  ["C670",0x82DD],
+  ["B0FA",0x82DE],
+  ["B9B6",0x82DF],
+  ["DCE5",0x82E0],
+  ["DCD3",0x82E1],
+  ["C671",0x82E2],
+  ["DCC4",0x82E3],
+  ["DCD6",0x82E4],
+  ["C8F4",0x82E5],
+  ["BFE0",0x82E6],
+  ["C672",0x82E7],
+  ["C673",0x82E8],
+  ["C674",0x82E9],
+  ["C675",0x82EA],
+  ["C9BB",0x82EB],
+  ["C676",0x82EC],
+  ["C677",0x82ED],
+  ["C678",0x82EE],
+  ["B1BD",0x82EF],
+  ["C679",0x82F0],
+  ["D3A2",0x82F1],
+  ["C67A",0x82F2],
+  ["C67B",0x82F3],
+  ["DCDA",0x82F4],
+  ["C67C",0x82F5],
+  ["C67D",0x82F6],
+  ["DCD5",0x82F7],
+  ["C67E",0x82F8],
+  ["C6BB",0x82F9],
+  ["C680",0x82FA],
+  ["DCDE",0x82FB],
+  ["C681",0x82FC],
+  ["C682",0x82FD],
+  ["C683",0x82FE],
+  ["C684",0x82FF],
+  ["C685",0x8300],
+  ["D7C2",0x8301],
+  ["C3AF",0x8302],
+  ["B7B6",0x8303],
+  ["C7D1",0x8304],
+  ["C3A9",0x8305],
+  ["DCE2",0x8306],
+  ["DCD8",0x8307],
+  ["DCEB",0x8308],
+  ["DCD4",0x8309],
+  ["C686",0x830A],
+  ["C687",0x830B],
+  ["DCDD",0x830C],
+  ["C688",0x830D],
+  ["BEA5",0x830E],
+  ["DCD7",0x830F],
+  ["C689",0x8310],
+  ["DCE0",0x8311],
+  ["C68A",0x8312],
+  ["C68B",0x8313],
+  ["DCE3",0x8314],
+  ["DCE4",0x8315],
+  ["C68C",0x8316],
+  ["DCF8",0x8317],
+  ["C68D",0x8318],
+  ["C68E",0x8319],
+  ["DCE1",0x831A],
+  ["DDA2",0x831B],
+  ["DCE7",0x831C],
+  ["C68F",0x831D],
+  ["C690",0x831E],
+  ["C691",0x831F],
+  ["C692",0x8320],
+  ["C693",0x8321],
+  ["C694",0x8322],
+  ["C695",0x8323],
+  ["C696",0x8324],
+  ["C697",0x8325],
+  ["C698",0x8326],
+  ["BCEB",0x8327],
+  ["B4C4",0x8328],
+  ["C699",0x8329],
+  ["C69A",0x832A],
+  ["C3A3",0x832B],
+  ["B2E7",0x832C],
+  ["DCFA",0x832D],
+  ["C69B",0x832E],
+  ["DCF2",0x832F],
+  ["C69C",0x8330],
+  ["DCEF",0x8331],
+  ["C69D",0x8332],
+  ["DCFC",0x8333],
+  ["DCEE",0x8334],
+  ["D2F0",0x8335],
+  ["B2E8",0x8336],
+  ["C69E",0x8337],
+  ["C8D7",0x8338],
+  ["C8E3",0x8339],
+  ["DCFB",0x833A],
+  ["C69F",0x833B],
+  ["DCED",0x833C],
+  ["C6A0",0x833D],
+  ["C740",0x833E],
+  ["C741",0x833F],
+  ["DCF7",0x8340],
+  ["C742",0x8341],
+  ["C743",0x8342],
+  ["DCF5",0x8343],
+  ["C744",0x8344],
+  ["C745",0x8345],
+  ["BEA3",0x8346],
+  ["DCF4",0x8347],
+  ["C746",0x8348],
+  ["B2DD",0x8349],
+  ["C747",0x834A],
+  ["C748",0x834B],
+  ["C749",0x834C],
+  ["C74A",0x834D],
+  ["C74B",0x834E],
+  ["DCF3",0x834F],
+  ["BCF6",0x8350],
+  ["DCE8",0x8351],
+  ["BBC4",0x8352],
+  ["C74C",0x8353],
+  ["C0F3",0x8354],
+  ["C74D",0x8355],
+  ["C74E",0x8356],
+  ["C74F",0x8357],
+  ["C750",0x8358],
+  ["C751",0x8359],
+  ["BCD4",0x835A],
+  ["DCE9",0x835B],
+  ["DCEA",0x835C],
+  ["C752",0x835D],
+  ["DCF1",0x835E],
+  ["DCF6",0x835F],
+  ["DCF9",0x8360],
+  ["B5B4",0x8361],
+  ["C753",0x8362],
+  ["C8D9",0x8363],
+  ["BBE7",0x8364],
+  ["DCFE",0x8365],
+  ["DCFD",0x8366],
+  ["D3AB",0x8367],
+  ["DDA1",0x8368],
+  ["DDA3",0x8369],
+  ["DDA5",0x836A],
+  ["D2F1",0x836B],
+  ["DDA4",0x836C],
+  ["DDA6",0x836D],
+  ["DDA7",0x836E],
+  ["D2A9",0x836F],
+  ["C754",0x8370],
+  ["C755",0x8371],
+  ["C756",0x8372],
+  ["C757",0x8373],
+  ["C758",0x8374],
+  ["C759",0x8375],
+  ["C75A",0x8376],
+  ["BAC9",0x8377],
+  ["DDA9",0x8378],
+  ["C75B",0x8379],
+  ["C75C",0x837A],
+  ["DDB6",0x837B],
+  ["DDB1",0x837C],
+  ["DDB4",0x837D],
+  ["C75D",0x837E],
+  ["C75E",0x837F],
+  ["C75F",0x8380],
+  ["C760",0x8381],
+  ["C761",0x8382],
+  ["C762",0x8383],
+  ["C763",0x8384],
+  ["DDB0",0x8385],
+  ["C6CE",0x8386],
+  ["C764",0x8387],
+  ["C765",0x8388],
+  ["C0F2",0x8389],
+  ["C766",0x838A],
+  ["C767",0x838B],
+  ["C768",0x838C],
+  ["C769",0x838D],
+  ["C9AF",0x838E],
+  ["C76A",0x838F],
+  ["C76B",0x8390],
+  ["C76C",0x8391],
+  ["DCEC",0x8392],
+  ["DDAE",0x8393],
+  ["C76D",0x8394],
+  ["C76E",0x8395],
+  ["C76F",0x8396],
+  ["C770",0x8397],
+  ["DDB7",0x8398],
+  ["C771",0x8399],
+  ["C772",0x839A],
+  ["DCF0",0x839B],
+  ["DDAF",0x839C],
+  ["C773",0x839D],
+  ["DDB8",0x839E],
+  ["C774",0x839F],
+  ["DDAC",0x83A0],
+  ["C775",0x83A1],
+  ["C776",0x83A2],
+  ["C777",0x83A3],
+  ["C778",0x83A4],
+  ["C779",0x83A5],
+  ["C77A",0x83A6],
+  ["C77B",0x83A7],
+  ["DDB9",0x83A8],
+  ["DDB3",0x83A9],
+  ["DDAD",0x83AA],
+  ["C4AA",0x83AB],
+  ["C77C",0x83AC],
+  ["C77D",0x83AD],
+  ["C77E",0x83AE],
+  ["C780",0x83AF],
+  ["DDA8",0x83B0],
+  ["C0B3",0x83B1],
+  ["C1AB",0x83B2],
+  ["DDAA",0x83B3],
+  ["DDAB",0x83B4],
+  ["C781",0x83B5],
+  ["DDB2",0x83B6],
+  ["BBF1",0x83B7],
+  ["DDB5",0x83B8],
+  ["D3A8",0x83B9],
+  ["DDBA",0x83BA],
+  ["C782",0x83BB],
+  ["DDBB",0x83BC],
+  ["C3A7",0x83BD],
+  ["C783",0x83BE],
+  ["C784",0x83BF],
+  ["DDD2",0x83C0],
+  ["DDBC",0x83C1],
+  ["C785",0x83C2],
+  ["C786",0x83C3],
+  ["C787",0x83C4],
+  ["DDD1",0x83C5],
+  ["C788",0x83C6],
+  ["B9BD",0x83C7],
+  ["C789",0x83C8],
+  ["C78A",0x83C9],
+  ["BED5",0x83CA],
+  ["C78B",0x83CB],
+  ["BEFA",0x83CC],
+  ["C78C",0x83CD],
+  ["C78D",0x83CE],
+  ["BACA",0x83CF],
+  ["C78E",0x83D0],
+  ["C78F",0x83D1],
+  ["C790",0x83D2],
+  ["C791",0x83D3],
+  ["DDCA",0x83D4],
+  ["C792",0x83D5],
+  ["DDC5",0x83D6],
+  ["C793",0x83D7],
+  ["DDBF",0x83D8],
+  ["C794",0x83D9],
+  ["C795",0x83DA],
+  ["C796",0x83DB],
+  ["B2CB",0x83DC],
+  ["DDC3",0x83DD],
+  ["C797",0x83DE],
+  ["DDCB",0x83DF],
+  ["B2A4",0x83E0],
+  ["DDD5",0x83E1],
+  ["C798",0x83E2],
+  ["C799",0x83E3],
+  ["C79A",0x83E4],
+  ["DDBE",0x83E5],
+  ["C79B",0x83E6],
+  ["C79C",0x83E7],
+  ["C79D",0x83E8],
+  ["C6D0",0x83E9],
+  ["DDD0",0x83EA],
+  ["C79E",0x83EB],
+  ["C79F",0x83EC],
+  ["C7A0",0x83ED],
+  ["C840",0x83EE],
+  ["C841",0x83EF],
+  ["DDD4",0x83F0],
+  ["C1E2",0x83F1],
+  ["B7C6",0x83F2],
+  ["C842",0x83F3],
+  ["C843",0x83F4],
+  ["C844",0x83F5],
+  ["C845",0x83F6],
+  ["C846",0x83F7],
+  ["DDCE",0x83F8],
+  ["DDCF",0x83F9],
+  ["C847",0x83FA],
+  ["C848",0x83FB],
+  ["C849",0x83FC],
+  ["DDC4",0x83FD],
+  ["C84A",0x83FE],
+  ["C84B",0x83FF],
+  ["C84C",0x8400],
+  ["DDBD",0x8401],
+  ["C84D",0x8402],
+  ["DDCD",0x8403],
+  ["CCD1",0x8404],
+  ["C84E",0x8405],
+  ["DDC9",0x8406],
+  ["C84F",0x8407],
+  ["C850",0x8408],
+  ["C851",0x8409],
+  ["C852",0x840A],
+  ["DDC2",0x840B],
+  ["C3C8",0x840C],
+  ["C6BC",0x840D],
+  ["CEAE",0x840E],
+  ["DDCC",0x840F],
+  ["C853",0x8410],
+  ["DDC8",0x8411],
+  ["C854",0x8412],
+  ["C855",0x8413],
+  ["C856",0x8414],
+  ["C857",0x8415],
+  ["C858",0x8416],
+  ["C859",0x8417],
+  ["DDC1",0x8418],
+  ["C85A",0x8419],
+  ["C85B",0x841A],
+  ["C85C",0x841B],
+  ["DDC6",0x841C],
+  ["C2DC",0x841D],
+  ["C85D",0x841E],
+  ["C85E",0x841F],
+  ["C85F",0x8420],
+  ["C860",0x8421],
+  ["C861",0x8422],
+  ["C862",0x8423],
+  ["D3A9",0x8424],
+  ["D3AA",0x8425],
+  ["DDD3",0x8426],
+  ["CFF4",0x8427],
+  ["C8F8",0x8428],
+  ["C863",0x8429],
+  ["C864",0x842A],
+  ["C865",0x842B],
+  ["C866",0x842C],
+  ["C867",0x842D],
+  ["C868",0x842E],
+  ["C869",0x842F],
+  ["C86A",0x8430],
+  ["DDE6",0x8431],
+  ["C86B",0x8432],
+  ["C86C",0x8433],
+  ["C86D",0x8434],
+  ["C86E",0x8435],
+  ["C86F",0x8436],
+  ["C870",0x8437],
+  ["DDC7",0x8438],
+  ["C871",0x8439],
+  ["C872",0x843A],
+  ["C873",0x843B],
+  ["DDE0",0x843C],
+  ["C2E4",0x843D],
+  ["C874",0x843E],
+  ["C875",0x843F],
+  ["C876",0x8440],
+  ["C877",0x8441],
+  ["C878",0x8442],
+  ["C879",0x8443],
+  ["C87A",0x8444],
+  ["C87B",0x8445],
+  ["DDE1",0x8446],
+  ["C87C",0x8447],
+  ["C87D",0x8448],
+  ["C87E",0x8449],
+  ["C880",0x844A],
+  ["C881",0x844B],
+  ["C882",0x844C],
+  ["C883",0x844D],
+  ["C884",0x844E],
+  ["C885",0x844F],
+  ["C886",0x8450],
+  ["DDD7",0x8451],
+  ["C887",0x8452],
+  ["C888",0x8453],
+  ["C889",0x8454],
+  ["C88A",0x8455],
+  ["C88B",0x8456],
+  ["D6F8",0x8457],
+  ["C88C",0x8458],
+  ["DDD9",0x8459],
+  ["DDD8",0x845A],
+  ["B8F0",0x845B],
+  ["DDD6",0x845C],
+  ["C88D",0x845D],
+  ["C88E",0x845E],
+  ["C88F",0x845F],
+  ["C890",0x8460],
+  ["C6CF",0x8461],
+  ["C891",0x8462],
+  ["B6AD",0x8463],
+  ["C892",0x8464],
+  ["C893",0x8465],
+  ["C894",0x8466],
+  ["C895",0x8467],
+  ["C896",0x8468],
+  ["DDE2",0x8469],
+  ["C897",0x846A],
+  ["BAF9",0x846B],
+  ["D4E1",0x846C],
+  ["DDE7",0x846D],
+  ["C898",0x846E],
+  ["C899",0x846F],
+  ["C89A",0x8470],
+  ["B4D0",0x8471],
+  ["C89B",0x8472],
+  ["DDDA",0x8473],
+  ["C89C",0x8474],
+  ["BFFB",0x8475],
+  ["DDE3",0x8476],
+  ["C89D",0x8477],
+  ["DDDF",0x8478],
+  ["C89E",0x8479],
+  ["DDDD",0x847A],
+  ["C89F",0x847B],
+  ["C8A0",0x847C],
+  ["C940",0x847D],
+  ["C941",0x847E],
+  ["C942",0x847F],
+  ["C943",0x8480],
+  ["C944",0x8481],
+  ["B5D9",0x8482],
+  ["C945",0x8483],
+  ["C946",0x8484],
+  ["C947",0x8485],
+  ["C948",0x8486],
+  ["DDDB",0x8487],
+  ["DDDC",0x8488],
+  ["DDDE",0x8489],
+  ["C949",0x848A],
+  ["BDAF",0x848B],
+  ["DDE4",0x848C],
+  ["C94A",0x848D],
+  ["DDE5",0x848E],
+  ["C94B",0x848F],
+  ["C94C",0x8490],
+  ["C94D",0x8491],
+  ["C94E",0x8492],
+  ["C94F",0x8493],
+  ["C950",0x8494],
+  ["C951",0x8495],
+  ["C952",0x8496],
+  ["DDF5",0x8497],
+  ["C953",0x8498],
+  ["C3C9",0x8499],
+  ["C954",0x849A],
+  ["C955",0x849B],
+  ["CBE2",0x849C],
+  ["C956",0x849D],
+  ["C957",0x849E],
+  ["C958",0x849F],
+  ["C959",0x84A0],
+  ["DDF2",0x84A1],
+  ["C95A",0x84A2],
+  ["C95B",0x84A3],
+  ["C95C",0x84A4],
+  ["C95D",0x84A5],
+  ["C95E",0x84A6],
+  ["C95F",0x84A7],
+  ["C960",0x84A8],
+  ["C961",0x84A9],
+  ["C962",0x84AA],
+  ["C963",0x84AB],
+  ["C964",0x84AC],
+  ["C965",0x84AD],
+  ["C966",0x84AE],
+  ["D8E1",0x84AF],
+  ["C967",0x84B0],
+  ["C968",0x84B1],
+  ["C6D1",0x84B2],
+  ["C969",0x84B3],
+  ["DDF4",0x84B4],
+  ["C96A",0x84B5],
+  ["C96B",0x84B6],
+  ["C96C",0x84B7],
+  ["D5F4",0x84B8],
+  ["DDF3",0x84B9],
+  ["DDF0",0x84BA],
+  ["C96D",0x84BB],
+  ["C96E",0x84BC],
+  ["DDEC",0x84BD],
+  ["C96F",0x84BE],
+  ["DDEF",0x84BF],
+  ["C970",0x84C0],
+  ["DDE8",0x84C1],
+  ["C971",0x84C2],
+  ["C972",0x84C3],
+  ["D0EE",0x84C4],
+  ["C973",0x84C5],
+  ["C974",0x84C6],
+  ["C975",0x84C7],
+  ["C976",0x84C8],
+  ["C8D8",0x84C9],
+  ["DDEE",0x84CA],
+  ["C977",0x84CB],
+  ["C978",0x84CC],
+  ["DDE9",0x84CD],
+  ["C979",0x84CE],
+  ["C97A",0x84CF],
+  ["DDEA",0x84D0],
+  ["CBF2",0x84D1],
+  ["C97B",0x84D2],
+  ["DDED",0x84D3],
+  ["C97C",0x84D4],
+  ["C97D",0x84D5],
+  ["B1CD",0x84D6],
+  ["C97E",0x84D7],
+  ["C980",0x84D8],
+  ["C981",0x84D9],
+  ["C982",0x84DA],
+  ["C983",0x84DB],
+  ["C984",0x84DC],
+  ["C0B6",0x84DD],
+  ["C985",0x84DE],
+  ["BCBB",0x84DF],
+  ["DDF1",0x84E0],
+  ["C986",0x84E1],
+  ["C987",0x84E2],
+  ["DDF7",0x84E3],
+  ["C988",0x84E4],
+  ["DDF6",0x84E5],
+  ["DDEB",0x84E6],
+  ["C989",0x84E7],
+  ["C98A",0x84E8],
+  ["C98B",0x84E9],
+  ["C98C",0x84EA],
+  ["C98D",0x84EB],
+  ["C5EE",0x84EC],
+  ["C98E",0x84ED],
+  ["C98F",0x84EE],
+  ["C990",0x84EF],
+  ["DDFB",0x84F0],
+  ["C991",0x84F1],
+  ["C992",0x84F2],
+  ["C993",0x84F3],
+  ["C994",0x84F4],
+  ["C995",0x84F5],
+  ["C996",0x84F6],
+  ["C997",0x84F7],
+  ["C998",0x84F8],
+  ["C999",0x84F9],
+  ["C99A",0x84FA],
+  ["C99B",0x84FB],
+  ["DEA4",0x84FC],
+  ["C99C",0x84FD],
+  ["C99D",0x84FE],
+  ["DEA3",0x84FF],
+  ["C99E",0x8500],
+  ["C99F",0x8501],
+  ["C9A0",0x8502],
+  ["CA40",0x8503],
+  ["CA41",0x8504],
+  ["CA42",0x8505],
+  ["CA43",0x8506],
+  ["CA44",0x8507],
+  ["CA45",0x8508],
+  ["CA46",0x8509],
+  ["CA47",0x850A],
+  ["CA48",0x850B],
+  ["DDF8",0x850C],
+  ["CA49",0x850D],
+  ["CA4A",0x850E],
+  ["CA4B",0x850F],
+  ["CA4C",0x8510],
+  ["C3EF",0x8511],
+  ["CA4D",0x8512],
+  ["C2FB",0x8513],
+  ["CA4E",0x8514],
+  ["CA4F",0x8515],
+  ["CA50",0x8516],
+  ["D5E1",0x8517],
+  ["CA51",0x8518],
+  ["CA52",0x8519],
+  ["CEB5",0x851A],
+  ["CA53",0x851B],
+  ["CA54",0x851C],
+  ["CA55",0x851D],
+  ["CA56",0x851E],
+  ["DDFD",0x851F],
+  ["CA57",0x8520],
+  ["B2CC",0x8521],
+  ["CA58",0x8522],
+  ["CA59",0x8523],
+  ["CA5A",0x8524],
+  ["CA5B",0x8525],
+  ["CA5C",0x8526],
+  ["CA5D",0x8527],
+  ["CA5E",0x8528],
+  ["CA5F",0x8529],
+  ["CA60",0x852A],
+  ["C4E8",0x852B],
+  ["CADF",0x852C],
+  ["CA61",0x852D],
+  ["CA62",0x852E],
+  ["CA63",0x852F],
+  ["CA64",0x8530],
+  ["CA65",0x8531],
+  ["CA66",0x8532],
+  ["CA67",0x8533],
+  ["CA68",0x8534],
+  ["CA69",0x8535],
+  ["CA6A",0x8536],
+  ["C7BE",0x8537],
+  ["DDFA",0x8538],
+  ["DDFC",0x8539],
+  ["DDFE",0x853A],
+  ["DEA2",0x853B],
+  ["B0AA",0x853C],
+  ["B1CE",0x853D],
+  ["CA6B",0x853E],
+  ["CA6C",0x853F],
+  ["CA6D",0x8540],
+  ["CA6E",0x8541],
+  ["CA6F",0x8542],
+  ["DEAC",0x8543],
+  ["CA70",0x8544],
+  ["CA71",0x8545],
+  ["CA72",0x8546],
+  ["CA73",0x8547],
+  ["DEA6",0x8548],
+  ["BDB6",0x8549],
+  ["C8EF",0x854A],
+  ["CA74",0x854B],
+  ["CA75",0x854C],
+  ["CA76",0x854D],
+  ["CA77",0x854E],
+  ["CA78",0x854F],
+  ["CA79",0x8550],
+  ["CA7A",0x8551],
+  ["CA7B",0x8552],
+  ["CA7C",0x8553],
+  ["CA7D",0x8554],
+  ["CA7E",0x8555],
+  ["DEA1",0x8556],
+  ["CA80",0x8557],
+  ["CA81",0x8558],
+  ["DEA5",0x8559],
+  ["CA82",0x855A],
+  ["CA83",0x855B],
+  ["CA84",0x855C],
+  ["CA85",0x855D],
+  ["DEA9",0x855E],
+  ["CA86",0x855F],
+  ["CA87",0x8560],
+  ["CA88",0x8561],
+  ["CA89",0x8562],
+  ["CA8A",0x8563],
+  ["DEA8",0x8564],
+  ["CA8B",0x8565],
+  ["CA8C",0x8566],
+  ["CA8D",0x8567],
+  ["DEA7",0x8568],
+  ["CA8E",0x8569],
+  ["CA8F",0x856A],
+  ["CA90",0x856B],
+  ["CA91",0x856C],
+  ["CA92",0x856D],
+  ["CA93",0x856E],
+  ["CA94",0x856F],
+  ["CA95",0x8570],
+  ["CA96",0x8571],
+  ["DEAD",0x8572],
+  ["CA97",0x8573],
+  ["D4CC",0x8574],
+  ["CA98",0x8575],
+  ["CA99",0x8576],
+  ["CA9A",0x8577],
+  ["CA9B",0x8578],
+  ["DEB3",0x8579],
+  ["DEAA",0x857A],
+  ["DEAE",0x857B],
+  ["CA9C",0x857C],
+  ["CA9D",0x857D],
+  ["C0D9",0x857E],
+  ["CA9E",0x857F],
+  ["CA9F",0x8580],
+  ["CAA0",0x8581],
+  ["CB40",0x8582],
+  ["CB41",0x8583],
+  ["B1A1",0x8584],
+  ["DEB6",0x8585],
+  ["CB42",0x8586],
+  ["DEB1",0x8587],
+  ["CB43",0x8588],
+  ["CB44",0x8589],
+  ["CB45",0x858A],
+  ["CB46",0x858B],
+  ["CB47",0x858C],
+  ["CB48",0x858D],
+  ["CB49",0x858E],
+  ["DEB2",0x858F],
+  ["CB4A",0x8590],
+  ["CB4B",0x8591],
+  ["CB4C",0x8592],
+  ["CB4D",0x8593],
+  ["CB4E",0x8594],
+  ["CB4F",0x8595],
+  ["CB50",0x8596],
+  ["CB51",0x8597],
+  ["CB52",0x8598],
+  ["CB53",0x8599],
+  ["CB54",0x859A],
+  ["D1A6",0x859B],
+  ["DEB5",0x859C],
+  ["CB55",0x859D],
+  ["CB56",0x859E],
+  ["CB57",0x859F],
+  ["CB58",0x85A0],
+  ["CB59",0x85A1],
+  ["CB5A",0x85A2],
+  ["CB5B",0x85A3],
+  ["DEAF",0x85A4],
+  ["CB5C",0x85A5],
+  ["CB5D",0x85A6],
+  ["CB5E",0x85A7],
+  ["DEB0",0x85A8],
+  ["CB5F",0x85A9],
+  ["D0BD",0x85AA],
+  ["CB60",0x85AB],
+  ["CB61",0x85AC],
+  ["CB62",0x85AD],
+  ["DEB4",0x85AE],
+  ["CAED",0x85AF],
+  ["DEB9",0x85B0],
+  ["CB63",0x85B1],
+  ["CB64",0x85B2],
+  ["CB65",0x85B3],
+  ["CB66",0x85B4],
+  ["CB67",0x85B5],
+  ["CB68",0x85B6],
+  ["DEB8",0x85B7],
+  ["CB69",0x85B8],
+  ["DEB7",0x85B9],
+  ["CB6A",0x85BA],
+  ["CB6B",0x85BB],
+  ["CB6C",0x85BC],
+  ["CB6D",0x85BD],
+  ["CB6E",0x85BE],
+  ["CB6F",0x85BF],
+  ["CB70",0x85C0],
+  ["DEBB",0x85C1],
+  ["CB71",0x85C2],
+  ["CB72",0x85C3],
+  ["CB73",0x85C4],
+  ["CB74",0x85C5],
+  ["CB75",0x85C6],
+  ["CB76",0x85C7],
+  ["CB77",0x85C8],
+  ["BDE5",0x85C9],
+  ["CB78",0x85CA],
+  ["CB79",0x85CB],
+  ["CB7A",0x85CC],
+  ["CB7B",0x85CD],
+  ["CB7C",0x85CE],
+  ["B2D8",0x85CF],
+  ["C3EA",0x85D0],
+  ["CB7D",0x85D1],
+  ["CB7E",0x85D2],
+  ["DEBA",0x85D3],
+  ["CB80",0x85D4],
+  ["C5BA",0x85D5],
+  ["CB81",0x85D6],
+  ["CB82",0x85D7],
+  ["CB83",0x85D8],
+  ["CB84",0x85D9],
+  ["CB85",0x85DA],
+  ["CB86",0x85DB],
+  ["DEBC",0x85DC],
+  ["CB87",0x85DD],
+  ["CB88",0x85DE],
+  ["CB89",0x85DF],
+  ["CB8A",0x85E0],
+  ["CB8B",0x85E1],
+  ["CB8C",0x85E2],
+  ["CB8D",0x85E3],
+  ["CCD9",0x85E4],
+  ["CB8E",0x85E5],
+  ["CB8F",0x85E6],
+  ["CB90",0x85E7],
+  ["CB91",0x85E8],
+  ["B7AA",0x85E9],
+  ["CB92",0x85EA],
+  ["CB93",0x85EB],
+  ["CB94",0x85EC],
+  ["CB95",0x85ED],
+  ["CB96",0x85EE],
+  ["CB97",0x85EF],
+  ["CB98",0x85F0],
+  ["CB99",0x85F1],
+  ["CB9A",0x85F2],
+  ["CB9B",0x85F3],
+  ["CB9C",0x85F4],
+  ["CB9D",0x85F5],
+  ["CB9E",0x85F6],
+  ["CB9F",0x85F7],
+  ["CBA0",0x85F8],
+  ["CC40",0x85F9],
+  ["CC41",0x85FA],
+  ["D4E5",0x85FB],
+  ["CC42",0x85FC],
+  ["CC43",0x85FD],
+  ["CC44",0x85FE],
+  ["DEBD",0x85FF],
+  ["CC45",0x8600],
+  ["CC46",0x8601],
+  ["CC47",0x8602],
+  ["CC48",0x8603],
+  ["CC49",0x8604],
+  ["DEBF",0x8605],
+  ["CC4A",0x8606],
+  ["CC4B",0x8607],
+  ["CC4C",0x8608],
+  ["CC4D",0x8609],
+  ["CC4E",0x860A],
+  ["CC4F",0x860B],
+  ["CC50",0x860C],
+  ["CC51",0x860D],
+  ["CC52",0x860E],
+  ["CC53",0x860F],
+  ["CC54",0x8610],
+  ["C4A2",0x8611],
+  ["CC55",0x8612],
+  ["CC56",0x8613],
+  ["CC57",0x8614],
+  ["CC58",0x8615],
+  ["DEC1",0x8616],
+  ["CC59",0x8617],
+  ["CC5A",0x8618],
+  ["CC5B",0x8619],
+  ["CC5C",0x861A],
+  ["CC5D",0x861B],
+  ["CC5E",0x861C],
+  ["CC5F",0x861D],
+  ["CC60",0x861E],
+  ["CC61",0x861F],
+  ["CC62",0x8620],
+  ["CC63",0x8621],
+  ["CC64",0x8622],
+  ["CC65",0x8623],
+  ["CC66",0x8624],
+  ["CC67",0x8625],
+  ["CC68",0x8626],
+  ["DEBE",0x8627],
+  ["CC69",0x8628],
+  ["DEC0",0x8629],
+  ["CC6A",0x862A],
+  ["CC6B",0x862B],
+  ["CC6C",0x862C],
+  ["CC6D",0x862D],
+  ["CC6E",0x862E],
+  ["CC6F",0x862F],
+  ["CC70",0x8630],
+  ["CC71",0x8631],
+  ["CC72",0x8632],
+  ["CC73",0x8633],
+  ["CC74",0x8634],
+  ["CC75",0x8635],
+  ["CC76",0x8636],
+  ["CC77",0x8637],
+  ["D5BA",0x8638],
+  ["CC78",0x8639],
+  ["CC79",0x863A],
+  ["CC7A",0x863B],
+  ["DEC2",0x863C],
+  ["CC7B",0x863D],
+  ["CC7C",0x863E],
+  ["CC7D",0x863F],
+  ["CC7E",0x8640],
+  ["CC80",0x8641],
+  ["CC81",0x8642],
+  ["CC82",0x8643],
+  ["CC83",0x8644],
+  ["CC84",0x8645],
+  ["CC85",0x8646],
+  ["CC86",0x8647],
+  ["CC87",0x8648],
+  ["CC88",0x8649],
+  ["CC89",0x864A],
+  ["CC8A",0x864B],
+  ["CC8B",0x864C],
+  ["F2AE",0x864D],
+  ["BBA2",0x864E],
+  ["C2B2",0x864F],
+  ["C5B0",0x8650],
+  ["C2C7",0x8651],
+  ["CC8C",0x8652],
+  ["CC8D",0x8653],
+  ["F2AF",0x8654],
+  ["CC8E",0x8655],
+  ["CC8F",0x8656],
+  ["CC90",0x8657],
+  ["CC91",0x8658],
+  ["CC92",0x8659],
+  ["D0E9",0x865A],
+  ["CC93",0x865B],
+  ["CC94",0x865C],
+  ["CC95",0x865D],
+  ["D3DD",0x865E],
+  ["CC96",0x865F],
+  ["CC97",0x8660],
+  ["CC98",0x8661],
+  ["EBBD",0x8662],
+  ["CC99",0x8663],
+  ["CC9A",0x8664],
+  ["CC9B",0x8665],
+  ["CC9C",0x8666],
+  ["CC9D",0x8667],
+  ["CC9E",0x8668],
+  ["CC9F",0x8669],
+  ["CCA0",0x866A],
+  ["B3E6",0x866B],
+  ["F2B0",0x866C],
+  ["CD40",0x866D],
+  ["F2B1",0x866E],
+  ["CD41",0x866F],
+  ["CD42",0x8670],
+  ["CAAD",0x8671],
+  ["CD43",0x8672],
+  ["CD44",0x8673],
+  ["CD45",0x8674],
+  ["CD46",0x8675],
+  ["CD47",0x8676],
+  ["CD48",0x8677],
+  ["CD49",0x8678],
+  ["BAE7",0x8679],
+  ["F2B3",0x867A],
+  ["F2B5",0x867B],
+  ["F2B4",0x867C],
+  ["CBE4",0x867D],
+  ["CFBA",0x867E],
+  ["F2B2",0x867F],
+  ["CAB4",0x8680],
+  ["D2CF",0x8681],
+  ["C2EC",0x8682],
+  ["CD4A",0x8683],
+  ["CD4B",0x8684],
+  ["CD4C",0x8685],
+  ["CD4D",0x8686],
+  ["CD4E",0x8687],
+  ["CD4F",0x8688],
+  ["CD50",0x8689],
+  ["CEC3",0x868A],
+  ["F2B8",0x868B],
+  ["B0F6",0x868C],
+  ["F2B7",0x868D],
+  ["CD51",0x868E],
+  ["CD52",0x868F],
+  ["CD53",0x8690],
+  ["CD54",0x8691],
+  ["CD55",0x8692],
+  ["F2BE",0x8693],
+  ["CD56",0x8694],
+  ["B2CF",0x8695],
+  ["CD57",0x8696],
+  ["CD58",0x8697],
+  ["CD59",0x8698],
+  ["CD5A",0x8699],
+  ["CD5B",0x869A],
+  ["CD5C",0x869B],
+  ["D1C1",0x869C],
+  ["F2BA",0x869D],
+  ["CD5D",0x869E],
+  ["CD5E",0x869F],
+  ["CD5F",0x86A0],
+  ["CD60",0x86A1],
+  ["CD61",0x86A2],
+  ["F2BC",0x86A3],
+  ["D4E9",0x86A4],
+  ["CD62",0x86A5],
+  ["CD63",0x86A6],
+  ["F2BB",0x86A7],
+  ["F2B6",0x86A8],
+  ["F2BF",0x86A9],
+  ["F2BD",0x86AA],
+  ["CD64",0x86AB],
+  ["F2B9",0x86AC],
+  ["CD65",0x86AD],
+  ["CD66",0x86AE],
+  ["F2C7",0x86AF],
+  ["F2C4",0x86B0],
+  ["F2C6",0x86B1],
+  ["CD67",0x86B2],
+  ["CD68",0x86B3],
+  ["F2CA",0x86B4],
+  ["F2C2",0x86B5],
+  ["F2C0",0x86B6],
+  ["CD69",0x86B7],
+  ["CD6A",0x86B8],
+  ["CD6B",0x86B9],
+  ["F2C5",0x86BA],
+  ["CD6C",0x86BB],
+  ["CD6D",0x86BC],
+  ["CD6E",0x86BD],
+  ["CD6F",0x86BE],
+  ["CD70",0x86BF],
+  ["D6FB",0x86C0],
+  ["CD71",0x86C1],
+  ["CD72",0x86C2],
+  ["CD73",0x86C3],
+  ["F2C1",0x86C4],
+  ["CD74",0x86C5],
+  ["C7F9",0x86C6],
+  ["C9DF",0x86C7],
+  ["CD75",0x86C8],
+  ["F2C8",0x86C9],
+  ["B9C6",0x86CA],
+  ["B5B0",0x86CB],
+  ["CD76",0x86CC],
+  ["CD77",0x86CD],
+  ["F2C3",0x86CE],
+  ["F2C9",0x86CF],
+  ["F2D0",0x86D0],
+  ["F2D6",0x86D1],
+  ["CD78",0x86D2],
+  ["CD79",0x86D3],
+  ["BBD7",0x86D4],
+  ["CD7A",0x86D5],
+  ["CD7B",0x86D6],
+  ["CD7C",0x86D7],
+  ["F2D5",0x86D8],
+  ["CDDC",0x86D9],
+  ["CD7D",0x86DA],
+  ["D6EB",0x86DB],
+  ["CD7E",0x86DC],
+  ["CD80",0x86DD],
+  ["F2D2",0x86DE],
+  ["F2D4",0x86DF],
+  ["CD81",0x86E0],
+  ["CD82",0x86E1],
+  ["CD83",0x86E2],
+  ["CD84",0x86E3],
+  ["B8F2",0x86E4],
+  ["CD85",0x86E5],
+  ["CD86",0x86E6],
+  ["CD87",0x86E7],
+  ["CD88",0x86E8],
+  ["F2CB",0x86E9],
+  ["CD89",0x86EA],
+  ["CD8A",0x86EB],
+  ["CD8B",0x86EC],
+  ["F2CE",0x86ED],
+  ["C2F9",0x86EE],
+  ["CD8C",0x86EF],
+  ["D5DD",0x86F0],
+  ["F2CC",0x86F1],
+  ["F2CD",0x86F2],
+  ["F2CF",0x86F3],
+  ["F2D3",0x86F4],
+  ["CD8D",0x86F5],
+  ["CD8E",0x86F6],
+  ["CD8F",0x86F7],
+  ["F2D9",0x86F8],
+  ["D3BC",0x86F9],
+  ["CD90",0x86FA],
+  ["CD91",0x86FB],
+  ["CD92",0x86FC],
+  ["CD93",0x86FD],
+  ["B6EA",0x86FE],
+  ["CD94",0x86FF],
+  ["CAF1",0x8700],
+  ["CD95",0x8701],
+  ["B7E4",0x8702],
+  ["F2D7",0x8703],
+  ["CD96",0x8704],
+  ["CD97",0x8705],
+  ["CD98",0x8706],
+  ["F2D8",0x8707],
+  ["F2DA",0x8708],
+  ["F2DD",0x8709],
+  ["F2DB",0x870A],
+  ["CD99",0x870B],
+  ["CD9A",0x870C],
+  ["F2DC",0x870D],
+  ["CD9B",0x870E],
+  ["CD9C",0x870F],
+  ["CD9D",0x8710],
+  ["CD9E",0x8711],
+  ["D1D1",0x8712],
+  ["F2D1",0x8713],
+  ["CD9F",0x8714],
+  ["CDC9",0x8715],
+  ["CDA0",0x8716],
+  ["CECF",0x8717],
+  ["D6A9",0x8718],
+  ["CE40",0x8719],
+  ["F2E3",0x871A],
+  ["CE41",0x871B],
+  ["C3DB",0x871C],
+  ["CE42",0x871D],
+  ["F2E0",0x871E],
+  ["CE43",0x871F],
+  ["CE44",0x8720],
+  ["C0AF",0x8721],
+  ["F2EC",0x8722],
+  ["F2DE",0x8723],
+  ["CE45",0x8724],
+  ["F2E1",0x8725],
+  ["CE46",0x8726],
+  ["CE47",0x8727],
+  ["CE48",0x8728],
+  ["F2E8",0x8729],
+  ["CE49",0x872A],
+  ["CE4A",0x872B],
+  ["CE4B",0x872C],
+  ["CE4C",0x872D],
+  ["F2E2",0x872E],
+  ["CE4D",0x872F],
+  ["CE4E",0x8730],
+  ["F2E7",0x8731],
+  ["CE4F",0x8732],
+  ["CE50",0x8733],
+  ["F2E6",0x8734],
+  ["CE51",0x8735],
+  ["CE52",0x8736],
+  ["F2E9",0x8737],
+  ["CE53",0x8738],
+  ["CE54",0x8739],
+  ["CE55",0x873A],
+  ["F2DF",0x873B],
+  ["CE56",0x873C],
+  ["CE57",0x873D],
+  ["F2E4",0x873E],
+  ["F2EA",0x873F],
+  ["CE58",0x8740],
+  ["CE59",0x8741],
+  ["CE5A",0x8742],
+  ["CE5B",0x8743],
+  ["CE5C",0x8744],
+  ["CE5D",0x8745],
+  ["CE5E",0x8746],
+  ["D3AC",0x8747],
+  ["F2E5",0x8748],
+  ["B2F5",0x8749],
+  ["CE5F",0x874A],
+  ["CE60",0x874B],
+  ["F2F2",0x874C],
+  ["CE61",0x874D],
+  ["D0AB",0x874E],
+  ["CE62",0x874F],
+  ["CE63",0x8750],
+  ["CE64",0x8751],
+  ["CE65",0x8752],
+  ["F2F5",0x8753],
+  ["CE66",0x8754],
+  ["CE67",0x8755],
+  ["CE68",0x8756],
+  ["BBC8",0x8757],
+  ["CE69",0x8758],
+  ["F2F9",0x8759],
+  ["CE6A",0x875A],
+  ["CE6B",0x875B],
+  ["CE6C",0x875C],
+  ["CE6D",0x875D],
+  ["CE6E",0x875E],
+  ["CE6F",0x875F],
+  ["F2F0",0x8760],
+  ["CE70",0x8761],
+  ["CE71",0x8762],
+  ["F2F6",0x8763],
+  ["F2F8",0x8764],
+  ["F2FA",0x8765],
+  ["CE72",0x8766],
+  ["CE73",0x8767],
+  ["CE74",0x8768],
+  ["CE75",0x8769],
+  ["CE76",0x876A],
+  ["CE77",0x876B],
+  ["CE78",0x876C],
+  ["CE79",0x876D],
+  ["F2F3",0x876E],
+  ["CE7A",0x876F],
+  ["F2F1",0x8770],
+  ["CE7B",0x8771],
+  ["CE7C",0x8772],
+  ["CE7D",0x8773],
+  ["BAFB",0x8774],
+  ["CE7E",0x8775],
+  ["B5FB",0x8776],
+  ["CE80",0x8777],
+  ["CE81",0x8778],
+  ["CE82",0x8779],
+  ["CE83",0x877A],
+  ["F2EF",0x877B],
+  ["F2F7",0x877C],
+  ["F2ED",0x877D],
+  ["F2EE",0x877E],
+  ["CE84",0x877F],
+  ["CE85",0x8780],
+  ["CE86",0x8781],
+  ["F2EB",0x8782],
+  ["F3A6",0x8783],
+  ["CE87",0x8784],
+  ["F3A3",0x8785],
+  ["CE88",0x8786],
+  ["CE89",0x8787],
+  ["F3A2",0x8788],
+  ["CE8A",0x8789],
+  ["CE8B",0x878A],
+  ["F2F4",0x878B],
+  ["CE8C",0x878C],
+  ["C8DA",0x878D],
+  ["CE8D",0x878E],
+  ["CE8E",0x878F],
+  ["CE8F",0x8790],
+  ["CE90",0x8791],
+  ["CE91",0x8792],
+  ["F2FB",0x8793],
+  ["CE92",0x8794],
+  ["CE93",0x8795],
+  ["CE94",0x8796],
+  ["F3A5",0x8797],
+  ["CE95",0x8798],
+  ["CE96",0x8799],
+  ["CE97",0x879A],
+  ["CE98",0x879B],
+  ["CE99",0x879C],
+  ["CE9A",0x879D],
+  ["CE9B",0x879E],
+  ["C3F8",0x879F],
+  ["CE9C",0x87A0],
+  ["CE9D",0x87A1],
+  ["CE9E",0x87A2],
+  ["CE9F",0x87A3],
+  ["CEA0",0x87A4],
+  ["CF40",0x87A5],
+  ["CF41",0x87A6],
+  ["CF42",0x87A7],
+  ["F2FD",0x87A8],
+  ["CF43",0x87A9],
+  ["CF44",0x87AA],
+  ["F3A7",0x87AB],
+  ["F3A9",0x87AC],
+  ["F3A4",0x87AD],
+  ["CF45",0x87AE],
+  ["F2FC",0x87AF],
+  ["CF46",0x87B0],
+  ["CF47",0x87B1],
+  ["CF48",0x87B2],
+  ["F3AB",0x87B3],
+  ["CF49",0x87B4],
+  ["F3AA",0x87B5],
+  ["CF4A",0x87B6],
+  ["CF4B",0x87B7],
+  ["CF4C",0x87B8],
+  ["CF4D",0x87B9],
+  ["C2DD",0x87BA],
+  ["CF4E",0x87BB],
+  ["CF4F",0x87BC],
+  ["F3AE",0x87BD],
+  ["CF50",0x87BE],
+  ["CF51",0x87BF],
+  ["F3B0",0x87C0],
+  ["CF52",0x87C1],
+  ["CF53",0x87C2],
+  ["CF54",0x87C3],
+  ["CF55",0x87C4],
+  ["CF56",0x87C5],
+  ["F3A1",0x87C6],
+  ["CF57",0x87C7],
+  ["CF58",0x87C8],
+  ["CF59",0x87C9],
+  ["F3B1",0x87CA],
+  ["F3AC",0x87CB],
+  ["CF5A",0x87CC],
+  ["CF5B",0x87CD],
+  ["CF5C",0x87CE],
+  ["CF5D",0x87CF],
+  ["CF5E",0x87D0],
+  ["F3AF",0x87D1],
+  ["F2FE",0x87D2],
+  ["F3AD",0x87D3],
+  ["CF5F",0x87D4],
+  ["CF60",0x87D5],
+  ["CF61",0x87D6],
+  ["CF62",0x87D7],
+  ["CF63",0x87D8],
+  ["CF64",0x87D9],
+  ["CF65",0x87DA],
+  ["F3B2",0x87DB],
+  ["CF66",0x87DC],
+  ["CF67",0x87DD],
+  ["CF68",0x87DE],
+  ["CF69",0x87DF],
+  ["F3B4",0x87E0],
+  ["CF6A",0x87E1],
+  ["CF6B",0x87E2],
+  ["CF6C",0x87E3],
+  ["CF6D",0x87E4],
+  ["F3A8",0x87E5],
+  ["CF6E",0x87E6],
+  ["CF6F",0x87E7],
+  ["CF70",0x87E8],
+  ["CF71",0x87E9],
+  ["F3B3",0x87EA],
+  ["CF72",0x87EB],
+  ["CF73",0x87EC],
+  ["CF74",0x87ED],
+  ["F3B5",0x87EE],
+  ["CF75",0x87EF],
+  ["CF76",0x87F0],
+  ["CF77",0x87F1],
+  ["CF78",0x87F2],
+  ["CF79",0x87F3],
+  ["CF7A",0x87F4],
+  ["CF7B",0x87F5],
+  ["CF7C",0x87F6],
+  ["CF7D",0x87F7],
+  ["CF7E",0x87F8],
+  ["D0B7",0x87F9],
+  ["CF80",0x87FA],
+  ["CF81",0x87FB],
+  ["CF82",0x87FC],
+  ["CF83",0x87FD],
+  ["F3B8",0x87FE],
+  ["CF84",0x87FF],
+  ["CF85",0x8800],
+  ["CF86",0x8801],
+  ["CF87",0x8802],
+  ["D9F9",0x8803],
+  ["CF88",0x8804],
+  ["CF89",0x8805],
+  ["CF8A",0x8806],
+  ["CF8B",0x8807],
+  ["CF8C",0x8808],
+  ["CF8D",0x8809],
+  ["F3B9",0x880A],
+  ["CF8E",0x880B],
+  ["CF8F",0x880C],
+  ["CF90",0x880D],
+  ["CF91",0x880E],
+  ["CF92",0x880F],
+  ["CF93",0x8810],
+  ["CF94",0x8811],
+  ["CF95",0x8812],
+  ["F3B7",0x8813],
+  ["CF96",0x8814],
+  ["C8E4",0x8815],
+  ["F3B6",0x8816],
+  ["CF97",0x8817],
+  ["CF98",0x8818],
+  ["CF99",0x8819],
+  ["CF9A",0x881A],
+  ["F3BA",0x881B],
+  ["CF9B",0x881C],
+  ["CF9C",0x881D],
+  ["CF9D",0x881E],
+  ["CF9E",0x881F],
+  ["CF9F",0x8820],
+  ["F3BB",0x8821],
+  ["B4C0",0x8822],
+  ["CFA0",0x8823],
+  ["D040",0x8824],
+  ["D041",0x8825],
+  ["D042",0x8826],
+  ["D043",0x8827],
+  ["D044",0x8828],
+  ["D045",0x8829],
+  ["D046",0x882A],
+  ["D047",0x882B],
+  ["D048",0x882C],
+  ["D049",0x882D],
+  ["D04A",0x882E],
+  ["D04B",0x882F],
+  ["D04C",0x8830],
+  ["D04D",0x8831],
+  ["EEC3",0x8832],
+  ["D04E",0x8833],
+  ["D04F",0x8834],
+  ["D050",0x8835],
+  ["D051",0x8836],
+  ["D052",0x8837],
+  ["D053",0x8838],
+  ["F3BC",0x8839],
+  ["D054",0x883A],
+  ["D055",0x883B],
+  ["F3BD",0x883C],
+  ["D056",0x883D],
+  ["D057",0x883E],
+  ["D058",0x883F],
+  ["D1AA",0x8840],
+  ["D059",0x8841],
+  ["D05A",0x8842],
+  ["D05B",0x8843],
+  ["F4AC",0x8844],
+  ["D0C6",0x8845],
+  ["D05C",0x8846],
+  ["D05D",0x8847],
+  ["D05E",0x8848],
+  ["D05F",0x8849],
+  ["D060",0x884A],
+  ["D061",0x884B],
+  ["D0D0",0x884C],
+  ["D1DC",0x884D],
+  ["D062",0x884E],
+  ["D063",0x884F],
+  ["D064",0x8850],
+  ["D065",0x8851],
+  ["D066",0x8852],
+  ["D067",0x8853],
+  ["CFCE",0x8854],
+  ["D068",0x8855],
+  ["D069",0x8856],
+  ["BDD6",0x8857],
+  ["D06A",0x8858],
+  ["D1C3",0x8859],
+  ["D06B",0x885A],
+  ["D06C",0x885B],
+  ["D06D",0x885C],
+  ["D06E",0x885D],
+  ["D06F",0x885E],
+  ["D070",0x885F],
+  ["D071",0x8860],
+  ["BAE2",0x8861],
+  ["E1E9",0x8862],
+  ["D2C2",0x8863],
+  ["F1C2",0x8864],
+  ["B2B9",0x8865],
+  ["D072",0x8866],
+  ["D073",0x8867],
+  ["B1ED",0x8868],
+  ["F1C3",0x8869],
+  ["D074",0x886A],
+  ["C9C0",0x886B],
+  ["B3C4",0x886C],
+  ["D075",0x886D],
+  ["D9F2",0x886E],
+  ["D076",0x886F],
+  ["CBA5",0x8870],
+  ["D077",0x8871],
+  ["F1C4",0x8872],
+  ["D078",0x8873],
+  ["D079",0x8874],
+  ["D07A",0x8875],
+  ["D07B",0x8876],
+  ["D6D4",0x8877],
+  ["D07C",0x8878],
+  ["D07D",0x8879],
+  ["D07E",0x887A],
+  ["D080",0x887B],
+  ["D081",0x887C],
+  ["F1C5",0x887D],
+  ["F4C0",0x887E],
+  ["F1C6",0x887F],
+  ["D082",0x8880],
+  ["D4AC",0x8881],
+  ["F1C7",0x8882],
+  ["D083",0x8883],
+  ["B0C0",0x8884],
+  ["F4C1",0x8885],
+  ["D084",0x8886],
+  ["D085",0x8887],
+  ["F4C2",0x8888],
+  ["D086",0x8889],
+  ["D087",0x888A],
+  ["B4FC",0x888B],
+  ["D088",0x888C],
+  ["C5DB",0x888D],
+  ["D089",0x888E],
+  ["D08A",0x888F],
+  ["D08B",0x8890],
+  ["D08C",0x8891],
+  ["CCBB",0x8892],
+  ["D08D",0x8893],
+  ["D08E",0x8894],
+  ["D08F",0x8895],
+  ["D0E4",0x8896],
+  ["D090",0x8897],
+  ["D091",0x8898],
+  ["D092",0x8899],
+  ["D093",0x889A],
+  ["D094",0x889B],
+  ["CDE0",0x889C],
+  ["D095",0x889D],
+  ["D096",0x889E],
+  ["D097",0x889F],
+  ["D098",0x88A0],
+  ["D099",0x88A1],
+  ["F1C8",0x88A2],
+  ["D09A",0x88A3],
+  ["D9F3",0x88A4],
+  ["D09B",0x88A5],
+  ["D09C",0x88A6],
+  ["D09D",0x88A7],
+  ["D09E",0x88A8],
+  ["D09F",0x88A9],
+  ["D0A0",0x88AA],
+  ["B1BB",0x88AB],
+  ["D140",0x88AC],
+  ["CFAE",0x88AD],
+  ["D141",0x88AE],
+  ["D142",0x88AF],
+  ["D143",0x88B0],
+  ["B8A4",0x88B1],
+  ["D144",0x88B2],
+  ["D145",0x88B3],
+  ["D146",0x88B4],
+  ["D147",0x88B5],
+  ["D148",0x88B6],
+  ["F1CA",0x88B7],
+  ["D149",0x88B8],
+  ["D14A",0x88B9],
+  ["D14B",0x88BA],
+  ["D14C",0x88BB],
+  ["F1CB",0x88BC],
+  ["D14D",0x88BD],
+  ["D14E",0x88BE],
+  ["D14F",0x88BF],
+  ["D150",0x88C0],
+  ["B2C3",0x88C1],
+  ["C1D1",0x88C2],
+  ["D151",0x88C3],
+  ["D152",0x88C4],
+  ["D7B0",0x88C5],
+  ["F1C9",0x88C6],
+  ["D153",0x88C7],
+  ["D154",0x88C8],
+  ["F1CC",0x88C9],
+  ["D155",0x88CA],
+  ["D156",0x88CB],
+  ["D157",0x88CC],
+  ["D158",0x88CD],
+  ["F1CE",0x88CE],
+  ["D159",0x88CF],
+  ["D15A",0x88D0],
+  ["D15B",0x88D1],
+  ["D9F6",0x88D2],
+  ["D15C",0x88D3],
+  ["D2E1",0x88D4],
+  ["D4A3",0x88D5],
+  ["D15D",0x88D6],
+  ["D15E",0x88D7],
+  ["F4C3",0x88D8],
+  ["C8B9",0x88D9],
+  ["D15F",0x88DA],
+  ["D160",0x88DB],
+  ["D161",0x88DC],
+  ["D162",0x88DD],
+  ["D163",0x88DE],
+  ["F4C4",0x88DF],
+  ["D164",0x88E0],
+  ["D165",0x88E1],
+  ["F1CD",0x88E2],
+  ["F1CF",0x88E3],
+  ["BFE3",0x88E4],
+  ["F1D0",0x88E5],
+  ["D166",0x88E6],
+  ["D167",0x88E7],
+  ["F1D4",0x88E8],
+  ["D168",0x88E9],
+  ["D169",0x88EA],
+  ["D16A",0x88EB],
+  ["D16B",0x88EC],
+  ["D16C",0x88ED],
+  ["D16D",0x88EE],
+  ["D16E",0x88EF],
+  ["F1D6",0x88F0],
+  ["F1D1",0x88F1],
+  ["D16F",0x88F2],
+  ["C9D1",0x88F3],
+  ["C5E1",0x88F4],
+  ["D170",0x88F5],
+  ["D171",0x88F6],
+  ["D172",0x88F7],
+  ["C2E3",0x88F8],
+  ["B9FC",0x88F9],
+  ["D173",0x88FA],
+  ["D174",0x88FB],
+  ["F1D3",0x88FC],
+  ["D175",0x88FD],
+  ["F1D5",0x88FE],
+  ["D176",0x88FF],
+  ["D177",0x8900],
+  ["D178",0x8901],
+  ["B9D3",0x8902],
+  ["D179",0x8903],
+  ["D17A",0x8904],
+  ["D17B",0x8905],
+  ["D17C",0x8906],
+  ["D17D",0x8907],
+  ["D17E",0x8908],
+  ["D180",0x8909],
+  ["F1DB",0x890A],
+  ["D181",0x890B],
+  ["D182",0x890C],
+  ["D183",0x890D],
+  ["D184",0x890E],
+  ["D185",0x890F],
+  ["BAD6",0x8910],
+  ["D186",0x8911],
+  ["B0FD",0x8912],
+  ["F1D9",0x8913],
+  ["D187",0x8914],
+  ["D188",0x8915],
+  ["D189",0x8916],
+  ["D18A",0x8917],
+  ["D18B",0x8918],
+  ["F1D8",0x8919],
+  ["F1D2",0x891A],
+  ["F1DA",0x891B],
+  ["D18C",0x891C],
+  ["D18D",0x891D],
+  ["D18E",0x891E],
+  ["D18F",0x891F],
+  ["D190",0x8920],
+  ["F1D7",0x8921],
+  ["D191",0x8922],
+  ["D192",0x8923],
+  ["D193",0x8924],
+  ["C8EC",0x8925],
+  ["D194",0x8926],
+  ["D195",0x8927],
+  ["D196",0x8928],
+  ["D197",0x8929],
+  ["CDCA",0x892A],
+  ["F1DD",0x892B],
+  ["D198",0x892C],
+  ["D199",0x892D],
+  ["D19A",0x892E],
+  ["D19B",0x892F],
+  ["E5BD",0x8930],
+  ["D19C",0x8931],
+  ["D19D",0x8932],
+  ["D19E",0x8933],
+  ["F1DC",0x8934],
+  ["D19F",0x8935],
+  ["F1DE",0x8936],
+  ["D1A0",0x8937],
+  ["D240",0x8938],
+  ["D241",0x8939],
+  ["D242",0x893A],
+  ["D243",0x893B],
+  ["D244",0x893C],
+  ["D245",0x893D],
+  ["D246",0x893E],
+  ["D247",0x893F],
+  ["D248",0x8940],
+  ["F1DF",0x8941],
+  ["D249",0x8942],
+  ["D24A",0x8943],
+  ["CFE5",0x8944],
+  ["D24B",0x8945],
+  ["D24C",0x8946],
+  ["D24D",0x8947],
+  ["D24E",0x8948],
+  ["D24F",0x8949],
+  ["D250",0x894A],
+  ["D251",0x894B],
+  ["D252",0x894C],
+  ["D253",0x894D],
+  ["D254",0x894E],
+  ["D255",0x894F],
+  ["D256",0x8950],
+  ["D257",0x8951],
+  ["D258",0x8952],
+  ["D259",0x8953],
+  ["D25A",0x8954],
+  ["D25B",0x8955],
+  ["D25C",0x8956],
+  ["D25D",0x8957],
+  ["D25E",0x8958],
+  ["D25F",0x8959],
+  ["D260",0x895A],
+  ["D261",0x895B],
+  ["D262",0x895C],
+  ["D263",0x895D],
+  ["F4C5",0x895E],
+  ["BDF3",0x895F],
+  ["D264",0x8960],
+  ["D265",0x8961],
+  ["D266",0x8962],
+  ["D267",0x8963],
+  ["D268",0x8964],
+  ["D269",0x8965],
+  ["F1E0",0x8966],
+  ["D26A",0x8967],
+  ["D26B",0x8968],
+  ["D26C",0x8969],
+  ["D26D",0x896A],
+  ["D26E",0x896B],
+  ["D26F",0x896C],
+  ["D270",0x896D],
+  ["D271",0x896E],
+  ["D272",0x896F],
+  ["D273",0x8970],
+  ["D274",0x8971],
+  ["D275",0x8972],
+  ["D276",0x8973],
+  ["D277",0x8974],
+  ["D278",0x8975],
+  ["D279",0x8976],
+  ["D27A",0x8977],
+  ["D27B",0x8978],
+  ["D27C",0x8979],
+  ["D27D",0x897A],
+  ["F1E1",0x897B],
+  ["D27E",0x897C],
+  ["D280",0x897D],
+  ["D281",0x897E],
+  ["CEF7",0x897F],
+  ["D282",0x8980],
+  ["D2AA",0x8981],
+  ["D283",0x8982],
+  ["F1FB",0x8983],
+  ["D284",0x8984],
+  ["D285",0x8985],
+  ["B8B2",0x8986],
+  ["D286",0x8987],
+  ["D287",0x8988],
+  ["D288",0x8989],
+  ["D289",0x898A],
+  ["D28A",0x898B],
+  ["D28B",0x898C],
+  ["D28C",0x898D],
+  ["D28D",0x898E],
+  ["D28E",0x898F],
+  ["D28F",0x8990],
+  ["D290",0x8991],
+  ["D291",0x8992],
+  ["D292",0x8993],
+  ["D293",0x8994],
+  ["D294",0x8995],
+  ["D295",0x8996],
+  ["D296",0x8997],
+  ["D297",0x8998],
+  ["D298",0x8999],
+  ["D299",0x899A],
+  ["D29A",0x899B],
+  ["D29B",0x899C],
+  ["D29C",0x899D],
+  ["D29D",0x899E],
+  ["D29E",0x899F],
+  ["D29F",0x89A0],
+  ["D2A0",0x89A1],
+  ["D340",0x89A2],
+  ["D341",0x89A3],
+  ["D342",0x89A4],
+  ["D343",0x89A5],
+  ["D344",0x89A6],
+  ["D345",0x89A7],
+  ["D346",0x89A8],
+  ["D347",0x89A9],
+  ["D348",0x89AA],
+  ["D349",0x89AB],
+  ["D34A",0x89AC],
+  ["D34B",0x89AD],
+  ["D34C",0x89AE],
+  ["D34D",0x89AF],
+  ["D34E",0x89B0],
+  ["D34F",0x89B1],
+  ["D350",0x89B2],
+  ["D351",0x89B3],
+  ["D352",0x89B4],
+  ["D353",0x89B5],
+  ["D354",0x89B6],
+  ["D355",0x89B7],
+  ["D356",0x89B8],
+  ["D357",0x89B9],
+  ["D358",0x89BA],
+  ["D359",0x89BB],
+  ["D35A",0x89BC],
+  ["D35B",0x89BD],
+  ["D35C",0x89BE],
+  ["D35D",0x89BF],
+  ["D35E",0x89C0],
+  ["BCFB",0x89C1],
+  ["B9DB",0x89C2],
+  ["D35F",0x89C3],
+  ["B9E6",0x89C4],
+  ["C3D9",0x89C5],
+  ["CAD3",0x89C6],
+  ["EAE8",0x89C7],
+  ["C0C0",0x89C8],
+  ["BEF5",0x89C9],
+  ["EAE9",0x89CA],
+  ["EAEA",0x89CB],
+  ["EAEB",0x89CC],
+  ["D360",0x89CD],
+  ["EAEC",0x89CE],
+  ["EAED",0x89CF],
+  ["EAEE",0x89D0],
+  ["EAEF",0x89D1],
+  ["BDC7",0x89D2],
+  ["D361",0x89D3],
+  ["D362",0x89D4],
+  ["D363",0x89D5],
+  ["F5FB",0x89D6],
+  ["D364",0x89D7],
+  ["D365",0x89D8],
+  ["D366",0x89D9],
+  ["F5FD",0x89DA],
+  ["D367",0x89DB],
+  ["F5FE",0x89DC],
+  ["D368",0x89DD],
+  ["F5FC",0x89DE],
+  ["D369",0x89DF],
+  ["D36A",0x89E0],
+  ["D36B",0x89E1],
+  ["D36C",0x89E2],
+  ["BDE2",0x89E3],
+  ["D36D",0x89E4],
+  ["F6A1",0x89E5],
+  ["B4A5",0x89E6],
+  ["D36E",0x89E7],
+  ["D36F",0x89E8],
+  ["D370",0x89E9],
+  ["D371",0x89EA],
+  ["F6A2",0x89EB],
+  ["D372",0x89EC],
+  ["D373",0x89ED],
+  ["D374",0x89EE],
+  ["F6A3",0x89EF],
+  ["D375",0x89F0],
+  ["D376",0x89F1],
+  ["D377",0x89F2],
+  ["ECB2",0x89F3],
+  ["D378",0x89F4],
+  ["D379",0x89F5],
+  ["D37A",0x89F6],
+  ["D37B",0x89F7],
+  ["D37C",0x89F8],
+  ["D37D",0x89F9],
+  ["D37E",0x89FA],
+  ["D380",0x89FB],
+  ["D381",0x89FC],
+  ["D382",0x89FD],
+  ["D383",0x89FE],
+  ["D384",0x89FF],
+  ["D1D4",0x8A00],
+  ["D385",0x8A01],
+  ["D386",0x8A02],
+  ["D387",0x8A03],
+  ["D388",0x8A04],
+  ["D389",0x8A05],
+  ["D38A",0x8A06],
+  ["D9EA",0x8A07],
+  ["D38B",0x8A08],
+  ["D38C",0x8A09],
+  ["D38D",0x8A0A],
+  ["D38E",0x8A0B],
+  ["D38F",0x8A0C],
+  ["D390",0x8A0D],
+  ["D391",0x8A0E],
+  ["D392",0x8A0F],
+  ["D393",0x8A10],
+  ["D394",0x8A11],
+  ["D395",0x8A12],
+  ["D396",0x8A13],
+  ["D397",0x8A14],
+  ["D398",0x8A15],
+  ["D399",0x8A16],
+  ["D39A",0x8A17],
+  ["D39B",0x8A18],
+  ["D39C",0x8A19],
+  ["D39D",0x8A1A],
+  ["D39E",0x8A1B],
+  ["D39F",0x8A1C],
+  ["D3A0",0x8A1D],
+  ["D440",0x8A1E],
+  ["D441",0x8A1F],
+  ["D442",0x8A20],
+  ["D443",0x8A21],
+  ["D444",0x8A22],
+  ["D445",0x8A23],
+  ["D446",0x8A24],
+  ["D447",0x8A25],
+  ["D448",0x8A26],
+  ["D449",0x8A27],
+  ["D44A",0x8A28],
+  ["D44B",0x8A29],
+  ["D44C",0x8A2A],
+  ["D44D",0x8A2B],
+  ["D44E",0x8A2C],
+  ["D44F",0x8A2D],
+  ["D450",0x8A2E],
+  ["D451",0x8A2F],
+  ["D452",0x8A30],
+  ["D453",0x8A31],
+  ["D454",0x8A32],
+  ["D455",0x8A33],
+  ["D456",0x8A34],
+  ["D457",0x8A35],
+  ["D458",0x8A36],
+  ["D459",0x8A37],
+  ["D45A",0x8A38],
+  ["D45B",0x8A39],
+  ["D45C",0x8A3A],
+  ["D45D",0x8A3B],
+  ["D45E",0x8A3C],
+  ["D45F",0x8A3D],
+  ["F6A4",0x8A3E],
+  ["D460",0x8A3F],
+  ["D461",0x8A40],
+  ["D462",0x8A41],
+  ["D463",0x8A42],
+  ["D464",0x8A43],
+  ["D465",0x8A44],
+  ["D466",0x8A45],
+  ["D467",0x8A46],
+  ["D468",0x8A47],
+  ["EEBA",0x8A48],
+  ["D469",0x8A49],
+  ["D46A",0x8A4A],
+  ["D46B",0x8A4B],
+  ["D46C",0x8A4C],
+  ["D46D",0x8A4D],
+  ["D46E",0x8A4E],
+  ["D46F",0x8A4F],
+  ["D470",0x8A50],
+  ["D471",0x8A51],
+  ["D472",0x8A52],
+  ["D473",0x8A53],
+  ["D474",0x8A54],
+  ["D475",0x8A55],
+  ["D476",0x8A56],
+  ["D477",0x8A57],
+  ["D478",0x8A58],
+  ["D479",0x8A59],
+  ["D47A",0x8A5A],
+  ["D47B",0x8A5B],
+  ["D47C",0x8A5C],
+  ["D47D",0x8A5D],
+  ["D47E",0x8A5E],
+  ["D480",0x8A5F],
+  ["D481",0x8A60],
+  ["D482",0x8A61],
+  ["D483",0x8A62],
+  ["D484",0x8A63],
+  ["D485",0x8A64],
+  ["D486",0x8A65],
+  ["D487",0x8A66],
+  ["D488",0x8A67],
+  ["D489",0x8A68],
+  ["D48A",0x8A69],
+  ["D48B",0x8A6A],
+  ["D48C",0x8A6B],
+  ["D48D",0x8A6C],
+  ["D48E",0x8A6D],
+  ["D48F",0x8A6E],
+  ["D490",0x8A6F],
+  ["D491",0x8A70],
+  ["D492",0x8A71],
+  ["D493",0x8A72],
+  ["D494",0x8A73],
+  ["D495",0x8A74],
+  ["D496",0x8A75],
+  ["D497",0x8A76],
+  ["D498",0x8A77],
+  ["D499",0x8A78],
+  ["D5B2",0x8A79],
+  ["D49A",0x8A7A],
+  ["D49B",0x8A7B],
+  ["D49C",0x8A7C],
+  ["D49D",0x8A7D],
+  ["D49E",0x8A7E],
+  ["D49F",0x8A7F],
+  ["D4A0",0x8A80],
+  ["D540",0x8A81],
+  ["D541",0x8A82],
+  ["D542",0x8A83],
+  ["D543",0x8A84],
+  ["D544",0x8A85],
+  ["D545",0x8A86],
+  ["D546",0x8A87],
+  ["D547",0x8A88],
+  ["D3FE",0x8A89],
+  ["CCDC",0x8A8A],
+  ["D548",0x8A8B],
+  ["D549",0x8A8C],
+  ["D54A",0x8A8D],
+  ["D54B",0x8A8E],
+  ["D54C",0x8A8F],
+  ["D54D",0x8A90],
+  ["D54E",0x8A91],
+  ["D54F",0x8A92],
+  ["CAC4",0x8A93],
+  ["D550",0x8A94],
+  ["D551",0x8A95],
+  ["D552",0x8A96],
+  ["D553",0x8A97],
+  ["D554",0x8A98],
+  ["D555",0x8A99],
+  ["D556",0x8A9A],
+  ["D557",0x8A9B],
+  ["D558",0x8A9C],
+  ["D559",0x8A9D],
+  ["D55A",0x8A9E],
+  ["D55B",0x8A9F],
+  ["D55C",0x8AA0],
+  ["D55D",0x8AA1],
+  ["D55E",0x8AA2],
+  ["D55F",0x8AA3],
+  ["D560",0x8AA4],
+  ["D561",0x8AA5],
+  ["D562",0x8AA6],
+  ["D563",0x8AA7],
+  ["D564",0x8AA8],
+  ["D565",0x8AA9],
+  ["D566",0x8AAA],
+  ["D567",0x8AAB],
+  ["D568",0x8AAC],
+  ["D569",0x8AAD],
+  ["D56A",0x8AAE],
+  ["D56B",0x8AAF],
+  ["D56C",0x8AB0],
+  ["D56D",0x8AB1],
+  ["D56E",0x8AB2],
+  ["D56F",0x8AB3],
+  ["D570",0x8AB4],
+  ["D571",0x8AB5],
+  ["D572",0x8AB6],
+  ["D573",0x8AB7],
+  ["D574",0x8AB8],
+  ["D575",0x8AB9],
+  ["D576",0x8ABA],
+  ["D577",0x8ABB],
+  ["D578",0x8ABC],
+  ["D579",0x8ABD],
+  ["D57A",0x8ABE],
+  ["D57B",0x8ABF],
+  ["D57C",0x8AC0],
+  ["D57D",0x8AC1],
+  ["D57E",0x8AC2],
+  ["D580",0x8AC3],
+  ["D581",0x8AC4],
+  ["D582",0x8AC5],
+  ["D583",0x8AC6],
+  ["D584",0x8AC7],
+  ["D585",0x8AC8],
+  ["D586",0x8AC9],
+  ["D587",0x8ACA],
+  ["D588",0x8ACB],
+  ["D589",0x8ACC],
+  ["D58A",0x8ACD],
+  ["D58B",0x8ACE],
+  ["D58C",0x8ACF],
+  ["D58D",0x8AD0],
+  ["D58E",0x8AD1],
+  ["D58F",0x8AD2],
+  ["D590",0x8AD3],
+  ["D591",0x8AD4],
+  ["D592",0x8AD5],
+  ["D593",0x8AD6],
+  ["D594",0x8AD7],
+  ["D595",0x8AD8],
+  ["D596",0x8AD9],
+  ["D597",0x8ADA],
+  ["D598",0x8ADB],
+  ["D599",0x8ADC],
+  ["D59A",0x8ADD],
+  ["D59B",0x8ADE],
+  ["D59C",0x8ADF],
+  ["D59D",0x8AE0],
+  ["D59E",0x8AE1],
+  ["D59F",0x8AE2],
+  ["D5A0",0x8AE3],
+  ["D640",0x8AE4],
+  ["D641",0x8AE5],
+  ["D642",0x8AE6],
+  ["D643",0x8AE7],
+  ["D644",0x8AE8],
+  ["D645",0x8AE9],
+  ["D646",0x8AEA],
+  ["D647",0x8AEB],
+  ["D648",0x8AEC],
+  ["D649",0x8AED],
+  ["D64A",0x8AEE],
+  ["D64B",0x8AEF],
+  ["D64C",0x8AF0],
+  ["D64D",0x8AF1],
+  ["D64E",0x8AF2],
+  ["D64F",0x8AF3],
+  ["D650",0x8AF4],
+  ["D651",0x8AF5],
+  ["D652",0x8AF6],
+  ["D653",0x8AF7],
+  ["D654",0x8AF8],
+  ["D655",0x8AF9],
+  ["D656",0x8AFA],
+  ["D657",0x8AFB],
+  ["D658",0x8AFC],
+  ["D659",0x8AFD],
+  ["D65A",0x8AFE],
+  ["D65B",0x8AFF],
+  ["D65C",0x8B00],
+  ["D65D",0x8B01],
+  ["D65E",0x8B02],
+  ["D65F",0x8B03],
+  ["D660",0x8B04],
+  ["D661",0x8B05],
+  ["D662",0x8B06],
+  ["E5C0",0x8B07],
+  ["D663",0x8B08],
+  ["D664",0x8B09],
+  ["D665",0x8B0A],
+  ["D666",0x8B0B],
+  ["D667",0x8B0C],
+  ["D668",0x8B0D],
+  ["D669",0x8B0E],
+  ["D66A",0x8B0F],
+  ["D66B",0x8B10],
+  ["D66C",0x8B11],
+  ["D66D",0x8B12],
+  ["D66E",0x8B13],
+  ["D66F",0x8B14],
+  ["D670",0x8B15],
+  ["D671",0x8B16],
+  ["D672",0x8B17],
+  ["D673",0x8B18],
+  ["D674",0x8B19],
+  ["D675",0x8B1A],
+  ["D676",0x8B1B],
+  ["D677",0x8B1C],
+  ["D678",0x8B1D],
+  ["D679",0x8B1E],
+  ["D67A",0x8B1F],
+  ["D67B",0x8B20],
+  ["D67C",0x8B21],
+  ["D67D",0x8B22],
+  ["D67E",0x8B23],
+  ["D680",0x8B24],
+  ["D681",0x8B25],
+  ["F6A5",0x8B26],
+  ["D682",0x8B27],
+  ["D683",0x8B28],
+  ["D684",0x8B29],
+  ["D685",0x8B2A],
+  ["D686",0x8B2B],
+  ["D687",0x8B2C],
+  ["D688",0x8B2D],
+  ["D689",0x8B2E],
+  ["D68A",0x8B2F],
+  ["D68B",0x8B30],
+  ["D68C",0x8B31],
+  ["D68D",0x8B32],
+  ["D68E",0x8B33],
+  ["D68F",0x8B34],
+  ["D690",0x8B35],
+  ["D691",0x8B36],
+  ["D692",0x8B37],
+  ["D693",0x8B38],
+  ["D694",0x8B39],
+  ["D695",0x8B3A],
+  ["D696",0x8B3B],
+  ["D697",0x8B3C],
+  ["D698",0x8B3D],
+  ["D699",0x8B3E],
+  ["D69A",0x8B3F],
+  ["D69B",0x8B40],
+  ["D69C",0x8B41],
+  ["D69D",0x8B42],
+  ["D69E",0x8B43],
+  ["D69F",0x8B44],
+  ["D6A0",0x8B45],
+  ["D740",0x8B46],
+  ["D741",0x8B47],
+  ["D742",0x8B48],
+  ["D743",0x8B49],
+  ["D744",0x8B4A],
+  ["D745",0x8B4B],
+  ["D746",0x8B4C],
+  ["D747",0x8B4D],
+  ["D748",0x8B4E],
+  ["D749",0x8B4F],
+  ["D74A",0x8B50],
+  ["D74B",0x8B51],
+  ["D74C",0x8B52],
+  ["D74D",0x8B53],
+  ["D74E",0x8B54],
+  ["D74F",0x8B55],
+  ["D750",0x8B56],
+  ["D751",0x8B57],
+  ["D752",0x8B58],
+  ["D753",0x8B59],
+  ["D754",0x8B5A],
+  ["D755",0x8B5B],
+  ["D756",0x8B5C],
+  ["D757",0x8B5D],
+  ["D758",0x8B5E],
+  ["D759",0x8B5F],
+  ["D75A",0x8B60],
+  ["D75B",0x8B61],
+  ["D75C",0x8B62],
+  ["D75D",0x8B63],
+  ["D75E",0x8B64],
+  ["D75F",0x8B65],
+  ["BEAF",0x8B66],
+  ["D760",0x8B67],
+  ["D761",0x8B68],
+  ["D762",0x8B69],
+  ["D763",0x8B6A],
+  ["D764",0x8B6B],
+  ["C6A9",0x8B6C],
+  ["D765",0x8B6D],
+  ["D766",0x8B6E],
+  ["D767",0x8B6F],
+  ["D768",0x8B70],
+  ["D769",0x8B71],
+  ["D76A",0x8B72],
+  ["D76B",0x8B73],
+  ["D76C",0x8B74],
+  ["D76D",0x8B75],
+  ["D76E",0x8B76],
+  ["D76F",0x8B77],
+  ["D770",0x8B78],
+  ["D771",0x8B79],
+  ["D772",0x8B7A],
+  ["D773",0x8B7B],
+  ["D774",0x8B7C],
+  ["D775",0x8B7D],
+  ["D776",0x8B7E],
+  ["D777",0x8B7F],
+  ["D778",0x8B80],
+  ["D779",0x8B81],
+  ["D77A",0x8B82],
+  ["D77B",0x8B83],
+  ["D77C",0x8B84],
+  ["D77D",0x8B85],
+  ["D77E",0x8B86],
+  ["D780",0x8B87],
+  ["D781",0x8B88],
+  ["D782",0x8B89],
+  ["D783",0x8B8A],
+  ["D784",0x8B8B],
+  ["D785",0x8B8C],
+  ["D786",0x8B8D],
+  ["D787",0x8B8E],
+  ["D788",0x8B8F],
+  ["D789",0x8B90],
+  ["D78A",0x8B91],
+  ["D78B",0x8B92],
+  ["D78C",0x8B93],
+  ["D78D",0x8B94],
+  ["D78E",0x8B95],
+  ["D78F",0x8B96],
+  ["D790",0x8B97],
+  ["D791",0x8B98],
+  ["D792",0x8B99],
+  ["D793",0x8B9A],
+  ["D794",0x8B9B],
+  ["D795",0x8B9C],
+  ["D796",0x8B9D],
+  ["D797",0x8B9E],
+  ["D798",0x8B9F],
+  ["DAA5",0x8BA0],
+  ["BCC6",0x8BA1],
+  ["B6A9",0x8BA2],
+  ["B8BC",0x8BA3],
+  ["C8CF",0x8BA4],
+  ["BCA5",0x8BA5],
+  ["DAA6",0x8BA6],
+  ["DAA7",0x8BA7],
+  ["CCD6",0x8BA8],
+  ["C8C3",0x8BA9],
+  ["DAA8",0x8BAA],
+  ["C6FD",0x8BAB],
+  ["D799",0x8BAC],
+  ["D1B5",0x8BAD],
+  ["D2E9",0x8BAE],
+  ["D1B6",0x8BAF],
+  ["BCC7",0x8BB0],
+  ["D79A",0x8BB1],
+  ["BDB2",0x8BB2],
+  ["BBE4",0x8BB3],
+  ["DAA9",0x8BB4],
+  ["DAAA",0x8BB5],
+  ["D1C8",0x8BB6],
+  ["DAAB",0x8BB7],
+  ["D0ED",0x8BB8],
+  ["B6EF",0x8BB9],
+  ["C2DB",0x8BBA],
+  ["D79B",0x8BBB],
+  ["CBCF",0x8BBC],
+  ["B7ED",0x8BBD],
+  ["C9E8",0x8BBE],
+  ["B7C3",0x8BBF],
+  ["BEF7",0x8BC0],
+  ["D6A4",0x8BC1],
+  ["DAAC",0x8BC2],
+  ["DAAD",0x8BC3],
+  ["C6C0",0x8BC4],
+  ["D7E7",0x8BC5],
+  ["CAB6",0x8BC6],
+  ["D79C",0x8BC7],
+  ["D5A9",0x8BC8],
+  ["CBDF",0x8BC9],
+  ["D5EF",0x8BCA],
+  ["DAAE",0x8BCB],
+  ["D6DF",0x8BCC],
+  ["B4CA",0x8BCD],
+  ["DAB0",0x8BCE],
+  ["DAAF",0x8BCF],
+  ["D79D",0x8BD0],
+  ["D2EB",0x8BD1],
+  ["DAB1",0x8BD2],
+  ["DAB2",0x8BD3],
+  ["DAB3",0x8BD4],
+  ["CAD4",0x8BD5],
+  ["DAB4",0x8BD6],
+  ["CAAB",0x8BD7],
+  ["DAB5",0x8BD8],
+  ["DAB6",0x8BD9],
+  ["B3CF",0x8BDA],
+  ["D6EF",0x8BDB],
+  ["DAB7",0x8BDC],
+  ["BBB0",0x8BDD],
+  ["B5AE",0x8BDE],
+  ["DAB8",0x8BDF],
+  ["DAB9",0x8BE0],
+  ["B9EE",0x8BE1],
+  ["D1AF",0x8BE2],
+  ["D2E8",0x8BE3],
+  ["DABA",0x8BE4],
+  ["B8C3",0x8BE5],
+  ["CFEA",0x8BE6],
+  ["B2EF",0x8BE7],
+  ["DABB",0x8BE8],
+  ["DABC",0x8BE9],
+  ["D79E",0x8BEA],
+  ["BDEB",0x8BEB],
+  ["CEDC",0x8BEC],
+  ["D3EF",0x8BED],
+  ["DABD",0x8BEE],
+  ["CEF3",0x8BEF],
+  ["DABE",0x8BF0],
+  ["D3D5",0x8BF1],
+  ["BBE5",0x8BF2],
+  ["DABF",0x8BF3],
+  ["CBB5",0x8BF4],
+  ["CBD0",0x8BF5],
+  ["DAC0",0x8BF6],
+  ["C7EB",0x8BF7],
+  ["D6EE",0x8BF8],
+  ["DAC1",0x8BF9],
+  ["C5B5",0x8BFA],
+  ["B6C1",0x8BFB],
+  ["DAC2",0x8BFC],
+  ["B7CC",0x8BFD],
+  ["BFCE",0x8BFE],
+  ["DAC3",0x8BFF],
+  ["DAC4",0x8C00],
+  ["CBAD",0x8C01],
+  ["DAC5",0x8C02],
+  ["B5F7",0x8C03],
+  ["DAC6",0x8C04],
+  ["C1C2",0x8C05],
+  ["D7BB",0x8C06],
+  ["DAC7",0x8C07],
+  ["CCB8",0x8C08],
+  ["D79F",0x8C09],
+  ["D2EA",0x8C0A],
+  ["C4B1",0x8C0B],
+  ["DAC8",0x8C0C],
+  ["B5FD",0x8C0D],
+  ["BBD1",0x8C0E],
+  ["DAC9",0x8C0F],
+  ["D0B3",0x8C10],
+  ["DACA",0x8C11],
+  ["DACB",0x8C12],
+  ["CEBD",0x8C13],
+  ["DACC",0x8C14],
+  ["DACD",0x8C15],
+  ["DACE",0x8C16],
+  ["B2F7",0x8C17],
+  ["DAD1",0x8C18],
+  ["DACF",0x8C19],
+  ["D1E8",0x8C1A],
+  ["DAD0",0x8C1B],
+  ["C3D5",0x8C1C],
+  ["DAD2",0x8C1D],
+  ["D7A0",0x8C1E],
+  ["DAD3",0x8C1F],
+  ["DAD4",0x8C20],
+  ["DAD5",0x8C21],
+  ["D0BB",0x8C22],
+  ["D2A5",0x8C23],
+  ["B0F9",0x8C24],
+  ["DAD6",0x8C25],
+  ["C7AB",0x8C26],
+  ["DAD7",0x8C27],
+  ["BDF7",0x8C28],
+  ["C3A1",0x8C29],
+  ["DAD8",0x8C2A],
+  ["DAD9",0x8C2B],
+  ["C3FD",0x8C2C],
+  ["CCB7",0x8C2D],
+  ["DADA",0x8C2E],
+  ["DADB",0x8C2F],
+  ["C0BE",0x8C30],
+  ["C6D7",0x8C31],
+  ["DADC",0x8C32],
+  ["DADD",0x8C33],
+  ["C7B4",0x8C34],
+  ["DADE",0x8C35],
+  ["DADF",0x8C36],
+  ["B9C8",0x8C37],
+  ["D840",0x8C38],
+  ["D841",0x8C39],
+  ["D842",0x8C3A],
+  ["D843",0x8C3B],
+  ["D844",0x8C3C],
+  ["D845",0x8C3D],
+  ["D846",0x8C3E],
+  ["D847",0x8C3F],
+  ["D848",0x8C40],
+  ["BBED",0x8C41],
+  ["D849",0x8C42],
+  ["D84A",0x8C43],
+  ["D84B",0x8C44],
+  ["D84C",0x8C45],
+  ["B6B9",0x8C46],
+  ["F4F8",0x8C47],
+  ["D84D",0x8C48],
+  ["F4F9",0x8C49],
+  ["D84E",0x8C4A],
+  ["D84F",0x8C4B],
+  ["CDE3",0x8C4C],
+  ["D850",0x8C4D],
+  ["D851",0x8C4E],
+  ["D852",0x8C4F],
+  ["D853",0x8C50],
+  ["D854",0x8C51],
+  ["D855",0x8C52],
+  ["D856",0x8C53],
+  ["D857",0x8C54],
+  ["F5B9",0x8C55],
+  ["D858",0x8C56],
+  ["D859",0x8C57],
+  ["D85A",0x8C58],
+  ["D85B",0x8C59],
+  ["EBE0",0x8C5A],
+  ["D85C",0x8C5B],
+  ["D85D",0x8C5C],
+  ["D85E",0x8C5D],
+  ["D85F",0x8C5E],
+  ["D860",0x8C5F],
+  ["D861",0x8C60],
+  ["CFF3",0x8C61],
+  ["BBBF",0x8C62],
+  ["D862",0x8C63],
+  ["D863",0x8C64],
+  ["D864",0x8C65],
+  ["D865",0x8C66],
+  ["D866",0x8C67],
+  ["D867",0x8C68],
+  ["D868",0x8C69],
+  ["BAC0",0x8C6A],
+  ["D4A5",0x8C6B],
+  ["D869",0x8C6C],
+  ["D86A",0x8C6D],
+  ["D86B",0x8C6E],
+  ["D86C",0x8C6F],
+  ["D86D",0x8C70],
+  ["D86E",0x8C71],
+  ["D86F",0x8C72],
+  ["E1D9",0x8C73],
+  ["D870",0x8C74],
+  ["D871",0x8C75],
+  ["D872",0x8C76],
+  ["D873",0x8C77],
+  ["F5F4",0x8C78],
+  ["B1AA",0x8C79],
+  ["B2F2",0x8C7A],
+  ["D874",0x8C7B],
+  ["D875",0x8C7C],
+  ["D876",0x8C7D],
+  ["D877",0x8C7E],
+  ["D878",0x8C7F],
+  ["D879",0x8C80],
+  ["D87A",0x8C81],
+  ["F5F5",0x8C82],
+  ["D87B",0x8C83],
+  ["D87C",0x8C84],
+  ["F5F7",0x8C85],
+  ["D87D",0x8C86],
+  ["D87E",0x8C87],
+  ["D880",0x8C88],
+  ["BAD1",0x8C89],
+  ["F5F6",0x8C8A],
+  ["D881",0x8C8B],
+  ["C3B2",0x8C8C],
+  ["D882",0x8C8D],
+  ["D883",0x8C8E],
+  ["D884",0x8C8F],
+  ["D885",0x8C90],
+  ["D886",0x8C91],
+  ["D887",0x8C92],
+  ["D888",0x8C93],
+  ["F5F9",0x8C94],
+  ["D889",0x8C95],
+  ["D88A",0x8C96],
+  ["D88B",0x8C97],
+  ["F5F8",0x8C98],
+  ["D88C",0x8C99],
+  ["D88D",0x8C9A],
+  ["D88E",0x8C9B],
+  ["D88F",0x8C9C],
+  ["D890",0x8C9D],
+  ["D891",0x8C9E],
+  ["D892",0x8C9F],
+  ["D893",0x8CA0],
+  ["D894",0x8CA1],
+  ["D895",0x8CA2],
+  ["D896",0x8CA3],
+  ["D897",0x8CA4],
+  ["D898",0x8CA5],
+  ["D899",0x8CA6],
+  ["D89A",0x8CA7],
+  ["D89B",0x8CA8],
+  ["D89C",0x8CA9],
+  ["D89D",0x8CAA],
+  ["D89E",0x8CAB],
+  ["D89F",0x8CAC],
+  ["D8A0",0x8CAD],
+  ["D940",0x8CAE],
+  ["D941",0x8CAF],
+  ["D942",0x8CB0],
+  ["D943",0x8CB1],
+  ["D944",0x8CB2],
+  ["D945",0x8CB3],
+  ["D946",0x8CB4],
+  ["D947",0x8CB5],
+  ["D948",0x8CB6],
+  ["D949",0x8CB7],
+  ["D94A",0x8CB8],
+  ["D94B",0x8CB9],
+  ["D94C",0x8CBA],
+  ["D94D",0x8CBB],
+  ["D94E",0x8CBC],
+  ["D94F",0x8CBD],
+  ["D950",0x8CBE],
+  ["D951",0x8CBF],
+  ["D952",0x8CC0],
+  ["D953",0x8CC1],
+  ["D954",0x8CC2],
+  ["D955",0x8CC3],
+  ["D956",0x8CC4],
+  ["D957",0x8CC5],
+  ["D958",0x8CC6],
+  ["D959",0x8CC7],
+  ["D95A",0x8CC8],
+  ["D95B",0x8CC9],
+  ["D95C",0x8CCA],
+  ["D95D",0x8CCB],
+  ["D95E",0x8CCC],
+  ["D95F",0x8CCD],
+  ["D960",0x8CCE],
+  ["D961",0x8CCF],
+  ["D962",0x8CD0],
+  ["D963",0x8CD1],
+  ["D964",0x8CD2],
+  ["D965",0x8CD3],
+  ["D966",0x8CD4],
+  ["D967",0x8CD5],
+  ["D968",0x8CD6],
+  ["D969",0x8CD7],
+  ["D96A",0x8CD8],
+  ["D96B",0x8CD9],
+  ["D96C",0x8CDA],
+  ["D96D",0x8CDB],
+  ["D96E",0x8CDC],
+  ["D96F",0x8CDD],
+  ["D970",0x8CDE],
+  ["D971",0x8CDF],
+  ["D972",0x8CE0],
+  ["D973",0x8CE1],
+  ["D974",0x8CE2],
+  ["D975",0x8CE3],
+  ["D976",0x8CE4],
+  ["D977",0x8CE5],
+  ["D978",0x8CE6],
+  ["D979",0x8CE7],
+  ["D97A",0x8CE8],
+  ["D97B",0x8CE9],
+  ["D97C",0x8CEA],
+  ["D97D",0x8CEB],
+  ["D97E",0x8CEC],
+  ["D980",0x8CED],
+  ["D981",0x8CEE],
+  ["D982",0x8CEF],
+  ["D983",0x8CF0],
+  ["D984",0x8CF1],
+  ["D985",0x8CF2],
+  ["D986",0x8CF3],
+  ["D987",0x8CF4],
+  ["D988",0x8CF5],
+  ["D989",0x8CF6],
+  ["D98A",0x8CF7],
+  ["D98B",0x8CF8],
+  ["D98C",0x8CF9],
+  ["D98D",0x8CFA],
+  ["D98E",0x8CFB],
+  ["D98F",0x8CFC],
+  ["D990",0x8CFD],
+  ["D991",0x8CFE],
+  ["D992",0x8CFF],
+  ["D993",0x8D00],
+  ["D994",0x8D01],
+  ["D995",0x8D02],
+  ["D996",0x8D03],
+  ["D997",0x8D04],
+  ["D998",0x8D05],
+  ["D999",0x8D06],
+  ["D99A",0x8D07],
+  ["D99B",0x8D08],
+  ["D99C",0x8D09],
+  ["D99D",0x8D0A],
+  ["D99E",0x8D0B],
+  ["D99F",0x8D0C],
+  ["D9A0",0x8D0D],
+  ["DA40",0x8D0E],
+  ["DA41",0x8D0F],
+  ["DA42",0x8D10],
+  ["DA43",0x8D11],
+  ["DA44",0x8D12],
+  ["DA45",0x8D13],
+  ["DA46",0x8D14],
+  ["DA47",0x8D15],
+  ["DA48",0x8D16],
+  ["DA49",0x8D17],
+  ["DA4A",0x8D18],
+  ["DA4B",0x8D19],
+  ["DA4C",0x8D1A],
+  ["DA4D",0x8D1B],
+  ["DA4E",0x8D1C],
+  ["B1B4",0x8D1D],
+  ["D5EA",0x8D1E],
+  ["B8BA",0x8D1F],
+  ["DA4F",0x8D20],
+  ["B9B1",0x8D21],
+  ["B2C6",0x8D22],
+  ["D4F0",0x8D23],
+  ["CFCD",0x8D24],
+  ["B0DC",0x8D25],
+  ["D5CB",0x8D26],
+  ["BBF5",0x8D27],
+  ["D6CA",0x8D28],
+  ["B7B7",0x8D29],
+  ["CCB0",0x8D2A],
+  ["C6B6",0x8D2B],
+  ["B1E1",0x8D2C],
+  ["B9BA",0x8D2D],
+  ["D6FC",0x8D2E],
+  ["B9E1",0x8D2F],
+  ["B7A1",0x8D30],
+  ["BCFA",0x8D31],
+  ["EADA",0x8D32],
+  ["EADB",0x8D33],
+  ["CCF9",0x8D34],
+  ["B9F3",0x8D35],
+  ["EADC",0x8D36],
+  ["B4FB",0x8D37],
+  ["C3B3",0x8D38],
+  ["B7D1",0x8D39],
+  ["BAD8",0x8D3A],
+  ["EADD",0x8D3B],
+  ["D4F4",0x8D3C],
+  ["EADE",0x8D3D],
+  ["BCD6",0x8D3E],
+  ["BBDF",0x8D3F],
+  ["EADF",0x8D40],
+  ["C1DE",0x8D41],
+  ["C2B8",0x8D42],
+  ["D4DF",0x8D43],
+  ["D7CA",0x8D44],
+  ["EAE0",0x8D45],
+  ["EAE1",0x8D46],
+  ["EAE4",0x8D47],
+  ["EAE2",0x8D48],
+  ["EAE3",0x8D49],
+  ["C9DE",0x8D4A],
+  ["B8B3",0x8D4B],
+  ["B6C4",0x8D4C],
+  ["EAE5",0x8D4D],
+  ["CAEA",0x8D4E],
+  ["C9CD",0x8D4F],
+  ["B4CD",0x8D50],
+  ["DA50",0x8D51],
+  ["DA51",0x8D52],
+  ["E2D9",0x8D53],
+  ["C5E2",0x8D54],
+  ["EAE6",0x8D55],
+  ["C0B5",0x8D56],
+  ["DA52",0x8D57],
+  ["D7B8",0x8D58],
+  ["EAE7",0x8D59],
+  ["D7AC",0x8D5A],
+  ["C8FC",0x8D5B],
+  ["D8D3",0x8D5C],
+  ["D8CD",0x8D5D],
+  ["D4DE",0x8D5E],
+  ["DA53",0x8D5F],
+  ["D4F9",0x8D60],
+  ["C9C4",0x8D61],
+  ["D3AE",0x8D62],
+  ["B8D3",0x8D63],
+  ["B3E0",0x8D64],
+  ["DA54",0x8D65],
+  ["C9E2",0x8D66],
+  ["F4F6",0x8D67],
+  ["DA55",0x8D68],
+  ["DA56",0x8D69],
+  ["DA57",0x8D6A],
+  ["BAD5",0x8D6B],
+  ["DA58",0x8D6C],
+  ["F4F7",0x8D6D],
+  ["DA59",0x8D6E],
+  ["DA5A",0x8D6F],
+  ["D7DF",0x8D70],
+  ["DA5B",0x8D71],
+  ["DA5C",0x8D72],
+  ["F4F1",0x8D73],
+  ["B8B0",0x8D74],
+  ["D5D4",0x8D75],
+  ["B8CF",0x8D76],
+  ["C6F0",0x8D77],
+  ["DA5D",0x8D78],
+  ["DA5E",0x8D79],
+  ["DA5F",0x8D7A],
+  ["DA60",0x8D7B],
+  ["DA61",0x8D7C],
+  ["DA62",0x8D7D],
+  ["DA63",0x8D7E],
+  ["DA64",0x8D7F],
+  ["DA65",0x8D80],
+  ["B3C3",0x8D81],
+  ["DA66",0x8D82],
+  ["DA67",0x8D83],
+  ["F4F2",0x8D84],
+  ["B3AC",0x8D85],
+  ["DA68",0x8D86],
+  ["DA69",0x8D87],
+  ["DA6A",0x8D88],
+  ["DA6B",0x8D89],
+  ["D4BD",0x8D8A],
+  ["C7F7",0x8D8B],
+  ["DA6C",0x8D8C],
+  ["DA6D",0x8D8D],
+  ["DA6E",0x8D8E],
+  ["DA6F",0x8D8F],
+  ["DA70",0x8D90],
+  ["F4F4",0x8D91],
+  ["DA71",0x8D92],
+  ["DA72",0x8D93],
+  ["F4F3",0x8D94],
+  ["DA73",0x8D95],
+  ["DA74",0x8D96],
+  ["DA75",0x8D97],
+  ["DA76",0x8D98],
+  ["DA77",0x8D99],
+  ["DA78",0x8D9A],
+  ["DA79",0x8D9B],
+  ["DA7A",0x8D9C],
+  ["DA7B",0x8D9D],
+  ["DA7C",0x8D9E],
+  ["CCCB",0x8D9F],
+  ["DA7D",0x8DA0],
+  ["DA7E",0x8DA1],
+  ["DA80",0x8DA2],
+  ["C8A4",0x8DA3],
+  ["DA81",0x8DA4],
+  ["DA82",0x8DA5],
+  ["DA83",0x8DA6],
+  ["DA84",0x8DA7],
+  ["DA85",0x8DA8],
+  ["DA86",0x8DA9],
+  ["DA87",0x8DAA],
+  ["DA88",0x8DAB],
+  ["DA89",0x8DAC],
+  ["DA8A",0x8DAD],
+  ["DA8B",0x8DAE],
+  ["DA8C",0x8DAF],
+  ["DA8D",0x8DB0],
+  ["F4F5",0x8DB1],
+  ["DA8E",0x8DB2],
+  ["D7E3",0x8DB3],
+  ["C5BF",0x8DB4],
+  ["F5C0",0x8DB5],
+  ["DA8F",0x8DB6],
+  ["DA90",0x8DB7],
+  ["F5BB",0x8DB8],
+  ["DA91",0x8DB9],
+  ["F5C3",0x8DBA],
+  ["DA92",0x8DBB],
+  ["F5C2",0x8DBC],
+  ["DA93",0x8DBD],
+  ["D6BA",0x8DBE],
+  ["F5C1",0x8DBF],
+  ["DA94",0x8DC0],
+  ["DA95",0x8DC1],
+  ["DA96",0x8DC2],
+  ["D4BE",0x8DC3],
+  ["F5C4",0x8DC4],
+  ["DA97",0x8DC5],
+  ["F5CC",0x8DC6],
+  ["DA98",0x8DC7],
+  ["DA99",0x8DC8],
+  ["DA9A",0x8DC9],
+  ["DA9B",0x8DCA],
+  ["B0CF",0x8DCB],
+  ["B5F8",0x8DCC],
+  ["DA9C",0x8DCD],
+  ["F5C9",0x8DCE],
+  ["F5CA",0x8DCF],
+  ["DA9D",0x8DD0],
+  ["C5DC",0x8DD1],
+  ["DA9E",0x8DD2],
+  ["DA9F",0x8DD3],
+  ["DAA0",0x8DD4],
+  ["DB40",0x8DD5],
+  ["F5C5",0x8DD6],
+  ["F5C6",0x8DD7],
+  ["DB41",0x8DD8],
+  ["DB42",0x8DD9],
+  ["F5C7",0x8DDA],
+  ["F5CB",0x8DDB],
+  ["DB43",0x8DDC],
+  ["BEE0",0x8DDD],
+  ["F5C8",0x8DDE],
+  ["B8FA",0x8DDF],
+  ["DB44",0x8DE0],
+  ["DB45",0x8DE1],
+  ["DB46",0x8DE2],
+  ["F5D0",0x8DE3],
+  ["F5D3",0x8DE4],
+  ["DB47",0x8DE5],
+  ["DB48",0x8DE6],
+  ["DB49",0x8DE7],
+  ["BFE7",0x8DE8],
+  ["DB4A",0x8DE9],
+  ["B9F2",0x8DEA],
+  ["F5BC",0x8DEB],
+  ["F5CD",0x8DEC],
+  ["DB4B",0x8DED],
+  ["DB4C",0x8DEE],
+  ["C2B7",0x8DEF],
+  ["DB4D",0x8DF0],
+  ["DB4E",0x8DF1],
+  ["DB4F",0x8DF2],
+  ["CCF8",0x8DF3],
+  ["DB50",0x8DF4],
+  ["BCF9",0x8DF5],
+  ["DB51",0x8DF6],
+  ["F5CE",0x8DF7],
+  ["F5CF",0x8DF8],
+  ["F5D1",0x8DF9],
+  ["B6E5",0x8DFA],
+  ["F5D2",0x8DFB],
+  ["DB52",0x8DFC],
+  ["F5D5",0x8DFD],
+  ["DB53",0x8DFE],
+  ["DB54",0x8DFF],
+  ["DB55",0x8E00],
+  ["DB56",0x8E01],
+  ["DB57",0x8E02],
+  ["DB58",0x8E03],
+  ["DB59",0x8E04],
+  ["F5BD",0x8E05],
+  ["DB5A",0x8E06],
+  ["DB5B",0x8E07],
+  ["DB5C",0x8E08],
+  ["F5D4",0x8E09],
+  ["D3BB",0x8E0A],
+  ["DB5D",0x8E0B],
+  ["B3EC",0x8E0C],
+  ["DB5E",0x8E0D],
+  ["DB5F",0x8E0E],
+  ["CCA4",0x8E0F],
+  ["DB60",0x8E10],
+  ["DB61",0x8E11],
+  ["DB62",0x8E12],
+  ["DB63",0x8E13],
+  ["F5D6",0x8E14],
+  ["DB64",0x8E15],
+  ["DB65",0x8E16],
+  ["DB66",0x8E17],
+  ["DB67",0x8E18],
+  ["DB68",0x8E19],
+  ["DB69",0x8E1A],
+  ["DB6A",0x8E1B],
+  ["DB6B",0x8E1C],
+  ["F5D7",0x8E1D],
+  ["BEE1",0x8E1E],
+  ["F5D8",0x8E1F],
+  ["DB6C",0x8E20],
+  ["DB6D",0x8E21],
+  ["CCDF",0x8E22],
+  ["F5DB",0x8E23],
+  ["DB6E",0x8E24],
+  ["DB6F",0x8E25],
+  ["DB70",0x8E26],
+  ["DB71",0x8E27],
+  ["DB72",0x8E28],
+  ["B2C8",0x8E29],
+  ["D7D9",0x8E2A],
+  ["DB73",0x8E2B],
+  ["F5D9",0x8E2C],
+  ["DB74",0x8E2D],
+  ["F5DA",0x8E2E],
+  ["F5DC",0x8E2F],
+  ["DB75",0x8E30],
+  ["F5E2",0x8E31],
+  ["DB76",0x8E32],
+  ["DB77",0x8E33],
+  ["DB78",0x8E34],
+  ["F5E0",0x8E35],
+  ["DB79",0x8E36],
+  ["DB7A",0x8E37],
+  ["DB7B",0x8E38],
+  ["F5DF",0x8E39],
+  ["F5DD",0x8E3A],
+  ["DB7C",0x8E3B],
+  ["DB7D",0x8E3C],
+  ["F5E1",0x8E3D],
+  ["DB7E",0x8E3E],
+  ["DB80",0x8E3F],
+  ["F5DE",0x8E40],
+  ["F5E4",0x8E41],
+  ["F5E5",0x8E42],
+  ["DB81",0x8E43],
+  ["CCE3",0x8E44],
+  ["DB82",0x8E45],
+  ["DB83",0x8E46],
+  ["E5BF",0x8E47],
+  ["B5B8",0x8E48],
+  ["F5E3",0x8E49],
+  ["F5E8",0x8E4A],
+  ["CCA3",0x8E4B],
+  ["DB84",0x8E4C],
+  ["DB85",0x8E4D],
+  ["DB86",0x8E4E],
+  ["DB87",0x8E4F],
+  ["DB88",0x8E50],
+  ["F5E6",0x8E51],
+  ["F5E7",0x8E52],
+  ["DB89",0x8E53],
+  ["DB8A",0x8E54],
+  ["DB8B",0x8E55],
+  ["DB8C",0x8E56],
+  ["DB8D",0x8E57],
+  ["DB8E",0x8E58],
+  ["F5BE",0x8E59],
+  ["DB8F",0x8E5A],
+  ["DB90",0x8E5B],
+  ["DB91",0x8E5C],
+  ["DB92",0x8E5D],
+  ["DB93",0x8E5E],
+  ["DB94",0x8E5F],
+  ["DB95",0x8E60],
+  ["DB96",0x8E61],
+  ["DB97",0x8E62],
+  ["DB98",0x8E63],
+  ["DB99",0x8E64],
+  ["DB9A",0x8E65],
+  ["B1C4",0x8E66],
+  ["DB9B",0x8E67],
+  ["DB9C",0x8E68],
+  ["F5BF",0x8E69],
+  ["DB9D",0x8E6A],
+  ["DB9E",0x8E6B],
+  ["B5C5",0x8E6C],
+  ["B2E4",0x8E6D],
+  ["DB9F",0x8E6E],
+  ["F5EC",0x8E6F],
+  ["F5E9",0x8E70],
+  ["DBA0",0x8E71],
+  ["B6D7",0x8E72],
+  ["DC40",0x8E73],
+  ["F5ED",0x8E74],
+  ["DC41",0x8E75],
+  ["F5EA",0x8E76],
+  ["DC42",0x8E77],
+  ["DC43",0x8E78],
+  ["DC44",0x8E79],
+  ["DC45",0x8E7A],
+  ["DC46",0x8E7B],
+  ["F5EB",0x8E7C],
+  ["DC47",0x8E7D],
+  ["DC48",0x8E7E],
+  ["B4DA",0x8E7F],
+  ["DC49",0x8E80],
+  ["D4EA",0x8E81],
+  ["DC4A",0x8E82],
+  ["DC4B",0x8E83],
+  ["DC4C",0x8E84],
+  ["F5EE",0x8E85],
+  ["DC4D",0x8E86],
+  ["B3F9",0x8E87],
+  ["DC4E",0x8E88],
+  ["DC4F",0x8E89],
+  ["DC50",0x8E8A],
+  ["DC51",0x8E8B],
+  ["DC52",0x8E8C],
+  ["DC53",0x8E8D],
+  ["DC54",0x8E8E],
+  ["F5EF",0x8E8F],
+  ["F5F1",0x8E90],
+  ["DC55",0x8E91],
+  ["DC56",0x8E92],
+  ["DC57",0x8E93],
+  ["F5F0",0x8E94],
+  ["DC58",0x8E95],
+  ["DC59",0x8E96],
+  ["DC5A",0x8E97],
+  ["DC5B",0x8E98],
+  ["DC5C",0x8E99],
+  ["DC5D",0x8E9A],
+  ["DC5E",0x8E9B],
+  ["F5F2",0x8E9C],
+  ["DC5F",0x8E9D],
+  ["F5F3",0x8E9E],
+  ["DC60",0x8E9F],
+  ["DC61",0x8EA0],
+  ["DC62",0x8EA1],
+  ["DC63",0x8EA2],
+  ["DC64",0x8EA3],
+  ["DC65",0x8EA4],
+  ["DC66",0x8EA5],
+  ["DC67",0x8EA6],
+  ["DC68",0x8EA7],
+  ["DC69",0x8EA8],
+  ["DC6A",0x8EA9],
+  ["DC6B",0x8EAA],
+  ["C9ED",0x8EAB],
+  ["B9AA",0x8EAC],
+  ["DC6C",0x8EAD],
+  ["DC6D",0x8EAE],
+  ["C7FB",0x8EAF],
+  ["DC6E",0x8EB0],
+  ["DC6F",0x8EB1],
+  ["B6E3",0x8EB2],
+  ["DC70",0x8EB3],
+  ["DC71",0x8EB4],
+  ["DC72",0x8EB5],
+  ["DC73",0x8EB6],
+  ["DC74",0x8EB7],
+  ["DC75",0x8EB8],
+  ["DC76",0x8EB9],
+  ["CCC9",0x8EBA],
+  ["DC77",0x8EBB],
+  ["DC78",0x8EBC],
+  ["DC79",0x8EBD],
+  ["DC7A",0x8EBE],
+  ["DC7B",0x8EBF],
+  ["DC7C",0x8EC0],
+  ["DC7D",0x8EC1],
+  ["DC7E",0x8EC2],
+  ["DC80",0x8EC3],
+  ["DC81",0x8EC4],
+  ["DC82",0x8EC5],
+  ["DC83",0x8EC6],
+  ["DC84",0x8EC7],
+  ["DC85",0x8EC8],
+  ["DC86",0x8EC9],
+  ["DC87",0x8ECA],
+  ["DC88",0x8ECB],
+  ["DC89",0x8ECC],
+  ["DC8A",0x8ECD],
+  ["EAA6",0x8ECE],
+  ["DC8B",0x8ECF],
+  ["DC8C",0x8ED0],
+  ["DC8D",0x8ED1],
+  ["DC8E",0x8ED2],
+  ["DC8F",0x8ED3],
+  ["DC90",0x8ED4],
+  ["DC91",0x8ED5],
+  ["DC92",0x8ED6],
+  ["DC93",0x8ED7],
+  ["DC94",0x8ED8],
+  ["DC95",0x8ED9],
+  ["DC96",0x8EDA],
+  ["DC97",0x8EDB],
+  ["DC98",0x8EDC],
+  ["DC99",0x8EDD],
+  ["DC9A",0x8EDE],
+  ["DC9B",0x8EDF],
+  ["DC9C",0x8EE0],
+  ["DC9D",0x8EE1],
+  ["DC9E",0x8EE2],
+  ["DC9F",0x8EE3],
+  ["DCA0",0x8EE4],
+  ["DD40",0x8EE5],
+  ["DD41",0x8EE6],
+  ["DD42",0x8EE7],
+  ["DD43",0x8EE8],
+  ["DD44",0x8EE9],
+  ["DD45",0x8EEA],
+  ["DD46",0x8EEB],
+  ["DD47",0x8EEC],
+  ["DD48",0x8EED],
+  ["DD49",0x8EEE],
+  ["DD4A",0x8EEF],
+  ["DD4B",0x8EF0],
+  ["DD4C",0x8EF1],
+  ["DD4D",0x8EF2],
+  ["DD4E",0x8EF3],
+  ["DD4F",0x8EF4],
+  ["DD50",0x8EF5],
+  ["DD51",0x8EF6],
+  ["DD52",0x8EF7],
+  ["DD53",0x8EF8],
+  ["DD54",0x8EF9],
+  ["DD55",0x8EFA],
+  ["DD56",0x8EFB],
+  ["DD57",0x8EFC],
+  ["DD58",0x8EFD],
+  ["DD59",0x8EFE],
+  ["DD5A",0x8EFF],
+  ["DD5B",0x8F00],
+  ["DD5C",0x8F01],
+  ["DD5D",0x8F02],
+  ["DD5E",0x8F03],
+  ["DD5F",0x8F04],
+  ["DD60",0x8F05],
+  ["DD61",0x8F06],
+  ["DD62",0x8F07],
+  ["DD63",0x8F08],
+  ["DD64",0x8F09],
+  ["DD65",0x8F0A],
+  ["DD66",0x8F0B],
+  ["DD67",0x8F0C],
+  ["DD68",0x8F0D],
+  ["DD69",0x8F0E],
+  ["DD6A",0x8F0F],
+  ["DD6B",0x8F10],
+  ["DD6C",0x8F11],
+  ["DD6D",0x8F12],
+  ["DD6E",0x8F13],
+  ["DD6F",0x8F14],
+  ["DD70",0x8F15],
+  ["DD71",0x8F16],
+  ["DD72",0x8F17],
+  ["DD73",0x8F18],
+  ["DD74",0x8F19],
+  ["DD75",0x8F1A],
+  ["DD76",0x8F1B],
+  ["DD77",0x8F1C],
+  ["DD78",0x8F1D],
+  ["DD79",0x8F1E],
+  ["DD7A",0x8F1F],
+  ["DD7B",0x8F20],
+  ["DD7C",0x8F21],
+  ["DD7D",0x8F22],
+  ["DD7E",0x8F23],
+  ["DD80",0x8F24],
+  ["DD81",0x8F25],
+  ["DD82",0x8F26],
+  ["DD83",0x8F27],
+  ["DD84",0x8F28],
+  ["DD85",0x8F29],
+  ["DD86",0x8F2A],
+  ["DD87",0x8F2B],
+  ["DD88",0x8F2C],
+  ["DD89",0x8F2D],
+  ["DD8A",0x8F2E],
+  ["DD8B",0x8F2F],
+  ["DD8C",0x8F30],
+  ["DD8D",0x8F31],
+  ["DD8E",0x8F32],
+  ["DD8F",0x8F33],
+  ["DD90",0x8F34],
+  ["DD91",0x8F35],
+  ["DD92",0x8F36],
+  ["DD93",0x8F37],
+  ["DD94",0x8F38],
+  ["DD95",0x8F39],
+  ["DD96",0x8F3A],
+  ["DD97",0x8F3B],
+  ["DD98",0x8F3C],
+  ["DD99",0x8F3D],
+  ["DD9A",0x8F3E],
+  ["DD9B",0x8F3F],
+  ["DD9C",0x8F40],
+  ["DD9D",0x8F41],
+  ["DD9E",0x8F42],
+  ["DD9F",0x8F43],
+  ["DDA0",0x8F44],
+  ["DE40",0x8F45],
+  ["DE41",0x8F46],
+  ["DE42",0x8F47],
+  ["DE43",0x8F48],
+  ["DE44",0x8F49],
+  ["DE45",0x8F4A],
+  ["DE46",0x8F4B],
+  ["DE47",0x8F4C],
+  ["DE48",0x8F4D],
+  ["DE49",0x8F4E],
+  ["DE4A",0x8F4F],
+  ["DE4B",0x8F50],
+  ["DE4C",0x8F51],
+  ["DE4D",0x8F52],
+  ["DE4E",0x8F53],
+  ["DE4F",0x8F54],
+  ["DE50",0x8F55],
+  ["DE51",0x8F56],
+  ["DE52",0x8F57],
+  ["DE53",0x8F58],
+  ["DE54",0x8F59],
+  ["DE55",0x8F5A],
+  ["DE56",0x8F5B],
+  ["DE57",0x8F5C],
+  ["DE58",0x8F5D],
+  ["DE59",0x8F5E],
+  ["DE5A",0x8F5F],
+  ["DE5B",0x8F60],
+  ["DE5C",0x8F61],
+  ["DE5D",0x8F62],
+  ["DE5E",0x8F63],
+  ["DE5F",0x8F64],
+  ["DE60",0x8F65],
+  ["B3B5",0x8F66],
+  ["D4FE",0x8F67],
+  ["B9EC",0x8F68],
+  ["D0F9",0x8F69],
+  ["DE61",0x8F6A],
+  ["E9ED",0x8F6B],
+  ["D7AA",0x8F6C],
+  ["E9EE",0x8F6D],
+  ["C2D6",0x8F6E],
+  ["C8ED",0x8F6F],
+  ["BAE4",0x8F70],
+  ["E9EF",0x8F71],
+  ["E9F0",0x8F72],
+  ["E9F1",0x8F73],
+  ["D6E1",0x8F74],
+  ["E9F2",0x8F75],
+  ["E9F3",0x8F76],
+  ["E9F5",0x8F77],
+  ["E9F4",0x8F78],
+  ["E9F6",0x8F79],
+  ["E9F7",0x8F7A],
+  ["C7E1",0x8F7B],
+  ["E9F8",0x8F7C],
+  ["D4D8",0x8F7D],
+  ["E9F9",0x8F7E],
+  ["BDCE",0x8F7F],
+  ["DE62",0x8F80],
+  ["E9FA",0x8F81],
+  ["E9FB",0x8F82],
+  ["BDCF",0x8F83],
+  ["E9FC",0x8F84],
+  ["B8A8",0x8F85],
+  ["C1BE",0x8F86],
+  ["E9FD",0x8F87],
+  ["B1B2",0x8F88],
+  ["BBD4",0x8F89],
+  ["B9F5",0x8F8A],
+  ["E9FE",0x8F8B],
+  ["DE63",0x8F8C],
+  ["EAA1",0x8F8D],
+  ["EAA2",0x8F8E],
+  ["EAA3",0x8F8F],
+  ["B7F8",0x8F90],
+  ["BCAD",0x8F91],
+  ["DE64",0x8F92],
+  ["CAE4",0x8F93],
+  ["E0CE",0x8F94],
+  ["D4AF",0x8F95],
+  ["CFBD",0x8F96],
+  ["D5B7",0x8F97],
+  ["EAA4",0x8F98],
+  ["D5DE",0x8F99],
+  ["EAA5",0x8F9A],
+  ["D0C1",0x8F9B],
+  ["B9BC",0x8F9C],
+  ["DE65",0x8F9D],
+  ["B4C7",0x8F9E],
+  ["B1D9",0x8F9F],
+  ["DE66",0x8FA0],
+  ["DE67",0x8FA1],
+  ["DE68",0x8FA2],
+  ["C0B1",0x8FA3],
+  ["DE69",0x8FA4],
+  ["DE6A",0x8FA5],
+  ["DE6B",0x8FA6],
+  ["DE6C",0x8FA7],
+  ["B1E6",0x8FA8],
+  ["B1E7",0x8FA9],
+  ["DE6D",0x8FAA],
+  ["B1E8",0x8FAB],
+  ["DE6E",0x8FAC],
+  ["DE6F",0x8FAD],
+  ["DE70",0x8FAE],
+  ["DE71",0x8FAF],
+  ["B3BD",0x8FB0],
+  ["C8E8",0x8FB1],
+  ["DE72",0x8FB2],
+  ["DE73",0x8FB3],
+  ["DE74",0x8FB4],
+  ["DE75",0x8FB5],
+  ["E5C1",0x8FB6],
+  ["DE76",0x8FB7],
+  ["DE77",0x8FB8],
+  ["B1DF",0x8FB9],
+  ["DE78",0x8FBA],
+  ["DE79",0x8FBB],
+  ["DE7A",0x8FBC],
+  ["C1C9",0x8FBD],
+  ["B4EF",0x8FBE],
+  ["DE7B",0x8FBF],
+  ["DE7C",0x8FC0],
+  ["C7A8",0x8FC1],
+  ["D3D8",0x8FC2],
+  ["DE7D",0x8FC3],
+  ["C6F9",0x8FC4],
+  ["D1B8",0x8FC5],
+  ["DE7E",0x8FC6],
+  ["B9FD",0x8FC7],
+  ["C2F5",0x8FC8],
+  ["DE80",0x8FC9],
+  ["DE81",0x8FCA],
+  ["DE82",0x8FCB],
+  ["DE83",0x8FCC],
+  ["DE84",0x8FCD],
+  ["D3AD",0x8FCE],
+  ["DE85",0x8FCF],
+  ["D4CB",0x8FD0],
+  ["BDFC",0x8FD1],
+  ["DE86",0x8FD2],
+  ["E5C2",0x8FD3],
+  ["B7B5",0x8FD4],
+  ["E5C3",0x8FD5],
+  ["DE87",0x8FD6],
+  ["DE88",0x8FD7],
+  ["BBB9",0x8FD8],
+  ["D5E2",0x8FD9],
+  ["DE89",0x8FDA],
+  ["BDF8",0x8FDB],
+  ["D4B6",0x8FDC],
+  ["CEA5",0x8FDD],
+  ["C1AC",0x8FDE],
+  ["B3D9",0x8FDF],
+  ["DE8A",0x8FE0],
+  ["DE8B",0x8FE1],
+  ["CCF6",0x8FE2],
+  ["DE8C",0x8FE3],
+  ["E5C6",0x8FE4],
+  ["E5C4",0x8FE5],
+  ["E5C8",0x8FE6],
+  ["DE8D",0x8FE7],
+  ["E5CA",0x8FE8],
+  ["E5C7",0x8FE9],
+  ["B5CF",0x8FEA],
+  ["C6C8",0x8FEB],
+  ["DE8E",0x8FEC],
+  ["B5FC",0x8FED],
+  ["E5C5",0x8FEE],
+  ["DE8F",0x8FEF],
+  ["CAF6",0x8FF0],
+  ["DE90",0x8FF1],
+  ["DE91",0x8FF2],
+  ["E5C9",0x8FF3],
+  ["DE92",0x8FF4],
+  ["DE93",0x8FF5],
+  ["DE94",0x8FF6],
+  ["C3D4",0x8FF7],
+  ["B1C5",0x8FF8],
+  ["BCA3",0x8FF9],
+  ["DE95",0x8FFA],
+  ["DE96",0x8FFB],
+  ["DE97",0x8FFC],
+  ["D7B7",0x8FFD],
+  ["DE98",0x8FFE],
+  ["DE99",0x8FFF],
+  ["CDCB",0x9000],
+  ["CBCD",0x9001],
+  ["CACA",0x9002],
+  ["CCD3",0x9003],
+  ["E5CC",0x9004],
+  ["E5CB",0x9005],
+  ["C4E6",0x9006],
+  ["DE9A",0x9007],
+  ["DE9B",0x9008],
+  ["D1A1",0x9009],
+  ["D1B7",0x900A],
+  ["E5CD",0x900B],
+  ["DE9C",0x900C],
+  ["E5D0",0x900D],
+  ["DE9D",0x900E],
+  ["CDB8",0x900F],
+  ["D6F0",0x9010],
+  ["E5CF",0x9011],
+  ["B5DD",0x9012],
+  ["DE9E",0x9013],
+  ["CDBE",0x9014],
+  ["DE9F",0x9015],
+  ["E5D1",0x9016],
+  ["B6BA",0x9017],
+  ["DEA0",0x9018],
+  ["DF40",0x9019],
+  ["CDA8",0x901A],
+  ["B9E4",0x901B],
+  ["DF41",0x901C],
+  ["CAC5",0x901D],
+  ["B3D1",0x901E],
+  ["CBD9",0x901F],
+  ["D4EC",0x9020],
+  ["E5D2",0x9021],
+  ["B7EA",0x9022],
+  ["DF42",0x9023],
+  ["DF43",0x9024],
+  ["DF44",0x9025],
+  ["E5CE",0x9026],
+  ["DF45",0x9027],
+  ["DF46",0x9028],
+  ["DF47",0x9029],
+  ["DF48",0x902A],
+  ["DF49",0x902B],
+  ["DF4A",0x902C],
+  ["E5D5",0x902D],
+  ["B4FE",0x902E],
+  ["E5D6",0x902F],
+  ["DF4B",0x9030],
+  ["DF4C",0x9031],
+  ["DF4D",0x9032],
+  ["DF4E",0x9033],
+  ["DF4F",0x9034],
+  ["E5D3",0x9035],
+  ["E5D4",0x9036],
+  ["DF50",0x9037],
+  ["D2DD",0x9038],
+  ["DF51",0x9039],
+  ["DF52",0x903A],
+  ["C2DF",0x903B],
+  ["B1C6",0x903C],
+  ["DF53",0x903D],
+  ["D3E2",0x903E],
+  ["DF54",0x903F],
+  ["DF55",0x9040],
+  ["B6DD",0x9041],
+  ["CBEC",0x9042],
+  ["DF56",0x9043],
+  ["E5D7",0x9044],
+  ["DF57",0x9045],
+  ["DF58",0x9046],
+  ["D3F6",0x9047],
+  ["DF59",0x9048],
+  ["DF5A",0x9049],
+  ["DF5B",0x904A],
+  ["DF5C",0x904B],
+  ["DF5D",0x904C],
+  ["B1E9",0x904D],
+  ["DF5E",0x904E],
+  ["B6F4",0x904F],
+  ["E5DA",0x9050],
+  ["E5D8",0x9051],
+  ["E5D9",0x9052],
+  ["B5C0",0x9053],
+  ["DF5F",0x9054],
+  ["DF60",0x9055],
+  ["DF61",0x9056],
+  ["D2C5",0x9057],
+  ["E5DC",0x9058],
+  ["DF62",0x9059],
+  ["DF63",0x905A],
+  ["E5DE",0x905B],
+  ["DF64",0x905C],
+  ["DF65",0x905D],
+  ["DF66",0x905E],
+  ["DF67",0x905F],
+  ["DF68",0x9060],
+  ["DF69",0x9061],
+  ["E5DD",0x9062],
+  ["C7B2",0x9063],
+  ["DF6A",0x9064],
+  ["D2A3",0x9065],
+  ["DF6B",0x9066],
+  ["DF6C",0x9067],
+  ["E5DB",0x9068],
+  ["DF6D",0x9069],
+  ["DF6E",0x906A],
+  ["DF6F",0x906B],
+  ["DF70",0x906C],
+  ["D4E2",0x906D],
+  ["D5DA",0x906E],
+  ["DF71",0x906F],
+  ["DF72",0x9070],
+  ["DF73",0x9071],
+  ["DF74",0x9072],
+  ["DF75",0x9073],
+  ["E5E0",0x9074],
+  ["D7F1",0x9075],
+  ["DF76",0x9076],
+  ["DF77",0x9077],
+  ["DF78",0x9078],
+  ["DF79",0x9079],
+  ["DF7A",0x907A],
+  ["DF7B",0x907B],
+  ["DF7C",0x907C],
+  ["E5E1",0x907D],
+  ["DF7D",0x907E],
+  ["B1DC",0x907F],
+  ["D1FB",0x9080],
+  ["DF7E",0x9081],
+  ["E5E2",0x9082],
+  ["E5E4",0x9083],
+  ["DF80",0x9084],
+  ["DF81",0x9085],
+  ["DF82",0x9086],
+  ["DF83",0x9087],
+  ["E5E3",0x9088],
+  ["DF84",0x9089],
+  ["DF85",0x908A],
+  ["E5E5",0x908B],
+  ["DF86",0x908C],
+  ["DF87",0x908D],
+  ["DF88",0x908E],
+  ["DF89",0x908F],
+  ["DF8A",0x9090],
+  ["D2D8",0x9091],
+  ["DF8B",0x9092],
+  ["B5CB",0x9093],
+  ["DF8C",0x9094],
+  ["E7DF",0x9095],
+  ["DF8D",0x9096],
+  ["DAF5",0x9097],
+  ["DF8E",0x9098],
+  ["DAF8",0x9099],
+  ["DF8F",0x909A],
+  ["DAF6",0x909B],
+  ["DF90",0x909C],
+  ["DAF7",0x909D],
+  ["DF91",0x909E],
+  ["DF92",0x909F],
+  ["DF93",0x90A0],
+  ["DAFA",0x90A1],
+  ["D0CF",0x90A2],
+  ["C4C7",0x90A3],
+  ["DF94",0x90A4],
+  ["DF95",0x90A5],
+  ["B0EE",0x90A6],
+  ["DF96",0x90A7],
+  ["DF97",0x90A8],
+  ["DF98",0x90A9],
+  ["D0B0",0x90AA],
+  ["DF99",0x90AB],
+  ["DAF9",0x90AC],
+  ["DF9A",0x90AD],
+  ["D3CA",0x90AE],
+  ["BAAA",0x90AF],
+  ["DBA2",0x90B0],
+  ["C7F1",0x90B1],
+  ["DF9B",0x90B2],
+  ["DAFC",0x90B3],
+  ["DAFB",0x90B4],
+  ["C9DB",0x90B5],
+  ["DAFD",0x90B6],
+  ["DF9C",0x90B7],
+  ["DBA1",0x90B8],
+  ["D7DE",0x90B9],
+  ["DAFE",0x90BA],
+  ["C1DA",0x90BB],
+  ["DF9D",0x90BC],
+  ["DF9E",0x90BD],
+  ["DBA5",0x90BE],
+  ["DF9F",0x90BF],
+  ["DFA0",0x90C0],
+  ["D3F4",0x90C1],
+  ["E040",0x90C2],
+  ["E041",0x90C3],
+  ["DBA7",0x90C4],
+  ["DBA4",0x90C5],
+  ["E042",0x90C6],
+  ["DBA8",0x90C7],
+  ["E043",0x90C8],
+  ["E044",0x90C9],
+  ["BDBC",0x90CA],
+  ["E045",0x90CB],
+  ["E046",0x90CC],
+  ["E047",0x90CD],
+  ["C0C9",0x90CE],
+  ["DBA3",0x90CF],
+  ["DBA6",0x90D0],
+  ["D6A3",0x90D1],
+  ["E048",0x90D2],
+  ["DBA9",0x90D3],
+  ["E049",0x90D4],
+  ["E04A",0x90D5],
+  ["E04B",0x90D6],
+  ["DBAD",0x90D7],
+  ["E04C",0x90D8],
+  ["E04D",0x90D9],
+  ["E04E",0x90DA],
+  ["DBAE",0x90DB],
+  ["DBAC",0x90DC],
+  ["BAC2",0x90DD],
+  ["E04F",0x90DE],
+  ["E050",0x90DF],
+  ["E051",0x90E0],
+  ["BFA4",0x90E1],
+  ["DBAB",0x90E2],
+  ["E052",0x90E3],
+  ["E053",0x90E4],
+  ["E054",0x90E5],
+  ["DBAA",0x90E6],
+  ["D4C7",0x90E7],
+  ["B2BF",0x90E8],
+  ["E055",0x90E9],
+  ["E056",0x90EA],
+  ["DBAF",0x90EB],
+  ["E057",0x90EC],
+  ["B9F9",0x90ED],
+  ["E058",0x90EE],
+  ["DBB0",0x90EF],
+  ["E059",0x90F0],
+  ["E05A",0x90F1],
+  ["E05B",0x90F2],
+  ["E05C",0x90F3],
+  ["B3BB",0x90F4],
+  ["E05D",0x90F5],
+  ["E05E",0x90F6],
+  ["E05F",0x90F7],
+  ["B5A6",0x90F8],
+  ["E060",0x90F9],
+  ["E061",0x90FA],
+  ["E062",0x90FB],
+  ["E063",0x90FC],
+  ["B6BC",0x90FD],
+  ["DBB1",0x90FE],
+  ["E064",0x90FF],
+  ["E065",0x9100],
+  ["E066",0x9101],
+  ["B6F5",0x9102],
+  ["E067",0x9103],
+  ["DBB2",0x9104],
+  ["E068",0x9105],
+  ["E069",0x9106],
+  ["E06A",0x9107],
+  ["E06B",0x9108],
+  ["E06C",0x9109],
+  ["E06D",0x910A],
+  ["E06E",0x910B],
+  ["E06F",0x910C],
+  ["E070",0x910D],
+  ["E071",0x910E],
+  ["E072",0x910F],
+  ["E073",0x9110],
+  ["E074",0x9111],
+  ["E075",0x9112],
+  ["E076",0x9113],
+  ["E077",0x9114],
+  ["E078",0x9115],
+  ["E079",0x9116],
+  ["E07A",0x9117],
+  ["E07B",0x9118],
+  ["B1C9",0x9119],
+  ["E07C",0x911A],
+  ["E07D",0x911B],
+  ["E07E",0x911C],
+  ["E080",0x911D],
+  ["DBB4",0x911E],
+  ["E081",0x911F],
+  ["E082",0x9120],
+  ["E083",0x9121],
+  ["DBB3",0x9122],
+  ["DBB5",0x9123],
+  ["E084",0x9124],
+  ["E085",0x9125],
+  ["E086",0x9126],
+  ["E087",0x9127],
+  ["E088",0x9128],
+  ["E089",0x9129],
+  ["E08A",0x912A],
+  ["E08B",0x912B],
+  ["E08C",0x912C],
+  ["E08D",0x912D],
+  ["E08E",0x912E],
+  ["DBB7",0x912F],
+  ["E08F",0x9130],
+  ["DBB6",0x9131],
+  ["E090",0x9132],
+  ["E091",0x9133],
+  ["E092",0x9134],
+  ["E093",0x9135],
+  ["E094",0x9136],
+  ["E095",0x9137],
+  ["E096",0x9138],
+  ["DBB8",0x9139],
+  ["E097",0x913A],
+  ["E098",0x913B],
+  ["E099",0x913C],
+  ["E09A",0x913D],
+  ["E09B",0x913E],
+  ["E09C",0x913F],
+  ["E09D",0x9140],
+  ["E09E",0x9141],
+  ["E09F",0x9142],
+  ["DBB9",0x9143],
+  ["E0A0",0x9144],
+  ["E140",0x9145],
+  ["DBBA",0x9146],
+  ["E141",0x9147],
+  ["E142",0x9148],
+  ["D3CF",0x9149],
+  ["F4FA",0x914A],
+  ["C7F5",0x914B],
+  ["D7C3",0x914C],
+  ["C5E4",0x914D],
+  ["F4FC",0x914E],
+  ["F4FD",0x914F],
+  ["F4FB",0x9150],
+  ["E143",0x9151],
+  ["BEC6",0x9152],
+  ["E144",0x9153],
+  ["E145",0x9154],
+  ["E146",0x9155],
+  ["E147",0x9156],
+  ["D0EF",0x9157],
+  ["E148",0x9158],
+  ["E149",0x9159],
+  ["B7D3",0x915A],
+  ["E14A",0x915B],
+  ["E14B",0x915C],
+  ["D4CD",0x915D],
+  ["CCAA",0x915E],
+  ["E14C",0x915F],
+  ["E14D",0x9160],
+  ["F5A2",0x9161],
+  ["F5A1",0x9162],
+  ["BAA8",0x9163],
+  ["F4FE",0x9164],
+  ["CBD6",0x9165],
+  ["E14E",0x9166],
+  ["E14F",0x9167],
+  ["E150",0x9168],
+  ["F5A4",0x9169],
+  ["C0D2",0x916A],
+  ["E151",0x916B],
+  ["B3EA",0x916C],
+  ["E152",0x916D],
+  ["CDAA",0x916E],
+  ["F5A5",0x916F],
+  ["F5A3",0x9170],
+  ["BDB4",0x9171],
+  ["F5A8",0x9172],
+  ["E153",0x9173],
+  ["F5A9",0x9174],
+  ["BDCD",0x9175],
+  ["C3B8",0x9176],
+  ["BFE1",0x9177],
+  ["CBE1",0x9178],
+  ["F5AA",0x9179],
+  ["E154",0x917A],
+  ["E155",0x917B],
+  ["E156",0x917C],
+  ["F5A6",0x917D],
+  ["F5A7",0x917E],
+  ["C4F0",0x917F],
+  ["E157",0x9180],
+  ["E158",0x9181],
+  ["E159",0x9182],
+  ["E15A",0x9183],
+  ["E15B",0x9184],
+  ["F5AC",0x9185],
+  ["E15C",0x9186],
+  ["B4BC",0x9187],
+  ["E15D",0x9188],
+  ["D7ED",0x9189],
+  ["E15E",0x918A],
+  ["B4D7",0x918B],
+  ["F5AB",0x918C],
+  ["F5AE",0x918D],
+  ["E15F",0x918E],
+  ["E160",0x918F],
+  ["F5AD",0x9190],
+  ["F5AF",0x9191],
+  ["D0D1",0x9192],
+  ["E161",0x9193],
+  ["E162",0x9194],
+  ["E163",0x9195],
+  ["E164",0x9196],
+  ["E165",0x9197],
+  ["E166",0x9198],
+  ["E167",0x9199],
+  ["C3D1",0x919A],
+  ["C8A9",0x919B],
+  ["E168",0x919C],
+  ["E169",0x919D],
+  ["E16A",0x919E],
+  ["E16B",0x919F],
+  ["E16C",0x91A0],
+  ["E16D",0x91A1],
+  ["F5B0",0x91A2],
+  ["F5B1",0x91A3],
+  ["E16E",0x91A4],
+  ["E16F",0x91A5],
+  ["E170",0x91A6],
+  ["E171",0x91A7],
+  ["E172",0x91A8],
+  ["E173",0x91A9],
+  ["F5B2",0x91AA],
+  ["E174",0x91AB],
+  ["E175",0x91AC],
+  ["F5B3",0x91AD],
+  ["F5B4",0x91AE],
+  ["F5B5",0x91AF],
+  ["E176",0x91B0],
+  ["E177",0x91B1],
+  ["E178",0x91B2],
+  ["E179",0x91B3],
+  ["F5B7",0x91B4],
+  ["F5B6",0x91B5],
+  ["E17A",0x91B6],
+  ["E17B",0x91B7],
+  ["E17C",0x91B8],
+  ["E17D",0x91B9],
+  ["F5B8",0x91BA],
+  ["E17E",0x91BB],
+  ["E180",0x91BC],
+  ["E181",0x91BD],
+  ["E182",0x91BE],
+  ["E183",0x91BF],
+  ["E184",0x91C0],
+  ["E185",0x91C1],
+  ["E186",0x91C2],
+  ["E187",0x91C3],
+  ["E188",0x91C4],
+  ["E189",0x91C5],
+  ["E18A",0x91C6],
+  ["B2C9",0x91C7],
+  ["E18B",0x91C8],
+  ["D3D4",0x91C9],
+  ["CACD",0x91CA],
+  ["E18C",0x91CB],
+  ["C0EF",0x91CC],
+  ["D6D8",0x91CD],
+  ["D2B0",0x91CE],
+  ["C1BF",0x91CF],
+  ["E18D",0x91D0],
+  ["BDF0",0x91D1],
+  ["E18E",0x91D2],
+  ["E18F",0x91D3],
+  ["E190",0x91D4],
+  ["E191",0x91D5],
+  ["E192",0x91D6],
+  ["E193",0x91D7],
+  ["E194",0x91D8],
+  ["E195",0x91D9],
+  ["E196",0x91DA],
+  ["E197",0x91DB],
+  ["B8AA",0x91DC],
+  ["E198",0x91DD],
+  ["E199",0x91DE],
+  ["E19A",0x91DF],
+  ["E19B",0x91E0],
+  ["E19C",0x91E1],
+  ["E19D",0x91E2],
+  ["E19E",0x91E3],
+  ["E19F",0x91E4],
+  ["E1A0",0x91E5],
+  ["E240",0x91E6],
+  ["E241",0x91E7],
+  ["E242",0x91E8],
+  ["E243",0x91E9],
+  ["E244",0x91EA],
+  ["E245",0x91EB],
+  ["E246",0x91EC],
+  ["E247",0x91ED],
+  ["E248",0x91EE],
+  ["E249",0x91EF],
+  ["E24A",0x91F0],
+  ["E24B",0x91F1],
+  ["E24C",0x91F2],
+  ["E24D",0x91F3],
+  ["E24E",0x91F4],
+  ["E24F",0x91F5],
+  ["E250",0x91F6],
+  ["E251",0x91F7],
+  ["E252",0x91F8],
+  ["E253",0x91F9],
+  ["E254",0x91FA],
+  ["E255",0x91FB],
+  ["E256",0x91FC],
+  ["E257",0x91FD],
+  ["E258",0x91FE],
+  ["E259",0x91FF],
+  ["E25A",0x9200],
+  ["E25B",0x9201],
+  ["E25C",0x9202],
+  ["E25D",0x9203],
+  ["E25E",0x9204],
+  ["E25F",0x9205],
+  ["E260",0x9206],
+  ["E261",0x9207],
+  ["E262",0x9208],
+  ["E263",0x9209],
+  ["E264",0x920A],
+  ["E265",0x920B],
+  ["E266",0x920C],
+  ["E267",0x920D],
+  ["E268",0x920E],
+  ["E269",0x920F],
+  ["E26A",0x9210],
+  ["E26B",0x9211],
+  ["E26C",0x9212],
+  ["E26D",0x9213],
+  ["E26E",0x9214],
+  ["E26F",0x9215],
+  ["E270",0x9216],
+  ["E271",0x9217],
+  ["E272",0x9218],
+  ["E273",0x9219],
+  ["E274",0x921A],
+  ["E275",0x921B],
+  ["E276",0x921C],
+  ["E277",0x921D],
+  ["E278",0x921E],
+  ["E279",0x921F],
+  ["E27A",0x9220],
+  ["E27B",0x9221],
+  ["E27C",0x9222],
+  ["E27D",0x9223],
+  ["E27E",0x9224],
+  ["E280",0x9225],
+  ["E281",0x9226],
+  ["E282",0x9227],
+  ["E283",0x9228],
+  ["E284",0x9229],
+  ["E285",0x922A],
+  ["E286",0x922B],
+  ["E287",0x922C],
+  ["E288",0x922D],
+  ["E289",0x922E],
+  ["E28A",0x922F],
+  ["E28B",0x9230],
+  ["E28C",0x9231],
+  ["E28D",0x9232],
+  ["E28E",0x9233],
+  ["E28F",0x9234],
+  ["E290",0x9235],
+  ["E291",0x9236],
+  ["E292",0x9237],
+  ["E293",0x9238],
+  ["E294",0x9239],
+  ["E295",0x923A],
+  ["E296",0x923B],
+  ["E297",0x923C],
+  ["E298",0x923D],
+  ["E299",0x923E],
+  ["E29A",0x923F],
+  ["E29B",0x9240],
+  ["E29C",0x9241],
+  ["E29D",0x9242],
+  ["E29E",0x9243],
+  ["E29F",0x9244],
+  ["E2A0",0x9245],
+  ["E340",0x9246],
+  ["E341",0x9247],
+  ["E342",0x9248],
+  ["E343",0x9249],
+  ["E344",0x924A],
+  ["E345",0x924B],
+  ["E346",0x924C],
+  ["E347",0x924D],
+  ["E348",0x924E],
+  ["E349",0x924F],
+  ["E34A",0x9250],
+  ["E34B",0x9251],
+  ["E34C",0x9252],
+  ["E34D",0x9253],
+  ["E34E",0x9254],
+  ["E34F",0x9255],
+  ["E350",0x9256],
+  ["E351",0x9257],
+  ["E352",0x9258],
+  ["E353",0x9259],
+  ["E354",0x925A],
+  ["E355",0x925B],
+  ["E356",0x925C],
+  ["E357",0x925D],
+  ["E358",0x925E],
+  ["E359",0x925F],
+  ["E35A",0x9260],
+  ["E35B",0x9261],
+  ["E35C",0x9262],
+  ["E35D",0x9263],
+  ["E35E",0x9264],
+  ["E35F",0x9265],
+  ["E360",0x9266],
+  ["E361",0x9267],
+  ["E362",0x9268],
+  ["E363",0x9269],
+  ["E364",0x926A],
+  ["E365",0x926B],
+  ["E366",0x926C],
+  ["E367",0x926D],
+  ["E368",0x926E],
+  ["E369",0x926F],
+  ["E36A",0x9270],
+  ["E36B",0x9271],
+  ["E36C",0x9272],
+  ["E36D",0x9273],
+  ["BCF8",0x9274],
+  ["E36E",0x9275],
+  ["E36F",0x9276],
+  ["E370",0x9277],
+  ["E371",0x9278],
+  ["E372",0x9279],
+  ["E373",0x927A],
+  ["E374",0x927B],
+  ["E375",0x927C],
+  ["E376",0x927D],
+  ["E377",0x927E],
+  ["E378",0x927F],
+  ["E379",0x9280],
+  ["E37A",0x9281],
+  ["E37B",0x9282],
+  ["E37C",0x9283],
+  ["E37D",0x9284],
+  ["E37E",0x9285],
+  ["E380",0x9286],
+  ["E381",0x9287],
+  ["E382",0x9288],
+  ["E383",0x9289],
+  ["E384",0x928A],
+  ["E385",0x928B],
+  ["E386",0x928C],
+  ["E387",0x928D],
+  ["F6C6",0x928E],
+  ["E388",0x928F],
+  ["E389",0x9290],
+  ["E38A",0x9291],
+  ["E38B",0x9292],
+  ["E38C",0x9293],
+  ["E38D",0x9294],
+  ["E38E",0x9295],
+  ["E38F",0x9296],
+  ["E390",0x9297],
+  ["E391",0x9298],
+  ["E392",0x9299],
+  ["E393",0x929A],
+  ["E394",0x929B],
+  ["E395",0x929C],
+  ["E396",0x929D],
+  ["E397",0x929E],
+  ["E398",0x929F],
+  ["E399",0x92A0],
+  ["E39A",0x92A1],
+  ["E39B",0x92A2],
+  ["E39C",0x92A3],
+  ["E39D",0x92A4],
+  ["E39E",0x92A5],
+  ["E39F",0x92A6],
+  ["E3A0",0x92A7],
+  ["E440",0x92A8],
+  ["E441",0x92A9],
+  ["E442",0x92AA],
+  ["E443",0x92AB],
+  ["E444",0x92AC],
+  ["E445",0x92AD],
+  ["F6C7",0x92AE],
+  ["E446",0x92AF],
+  ["E447",0x92B0],
+  ["E448",0x92B1],
+  ["E449",0x92B2],
+  ["E44A",0x92B3],
+  ["E44B",0x92B4],
+  ["E44C",0x92B5],
+  ["E44D",0x92B6],
+  ["E44E",0x92B7],
+  ["E44F",0x92B8],
+  ["E450",0x92B9],
+  ["E451",0x92BA],
+  ["E452",0x92BB],
+  ["E453",0x92BC],
+  ["E454",0x92BD],
+  ["E455",0x92BE],
+  ["E456",0x92BF],
+  ["E457",0x92C0],
+  ["E458",0x92C1],
+  ["E459",0x92C2],
+  ["E45A",0x92C3],
+  ["E45B",0x92C4],
+  ["E45C",0x92C5],
+  ["E45D",0x92C6],
+  ["E45E",0x92C7],
+  ["F6C8",0x92C8],
+  ["E45F",0x92C9],
+  ["E460",0x92CA],
+  ["E461",0x92CB],
+  ["E462",0x92CC],
+  ["E463",0x92CD],
+  ["E464",0x92CE],
+  ["E465",0x92CF],
+  ["E466",0x92D0],
+  ["E467",0x92D1],
+  ["E468",0x92D2],
+  ["E469",0x92D3],
+  ["E46A",0x92D4],
+  ["E46B",0x92D5],
+  ["E46C",0x92D6],
+  ["E46D",0x92D7],
+  ["E46E",0x92D8],
+  ["E46F",0x92D9],
+  ["E470",0x92DA],
+  ["E471",0x92DB],
+  ["E472",0x92DC],
+  ["E473",0x92DD],
+  ["E474",0x92DE],
+  ["E475",0x92DF],
+  ["E476",0x92E0],
+  ["E477",0x92E1],
+  ["E478",0x92E2],
+  ["E479",0x92E3],
+  ["E47A",0x92E4],
+  ["E47B",0x92E5],
+  ["E47C",0x92E6],
+  ["E47D",0x92E7],
+  ["E47E",0x92E8],
+  ["E480",0x92E9],
+  ["E481",0x92EA],
+  ["E482",0x92EB],
+  ["E483",0x92EC],
+  ["E484",0x92ED],
+  ["E485",0x92EE],
+  ["E486",0x92EF],
+  ["E487",0x92F0],
+  ["E488",0x92F1],
+  ["E489",0x92F2],
+  ["E48A",0x92F3],
+  ["E48B",0x92F4],
+  ["E48C",0x92F5],
+  ["E48D",0x92F6],
+  ["E48E",0x92F7],
+  ["E48F",0x92F8],
+  ["E490",0x92F9],
+  ["E491",0x92FA],
+  ["E492",0x92FB],
+  ["E493",0x92FC],
+  ["E494",0x92FD],
+  ["E495",0x92FE],
+  ["E496",0x92FF],
+  ["E497",0x9300],
+  ["E498",0x9301],
+  ["E499",0x9302],
+  ["E49A",0x9303],
+  ["E49B",0x9304],
+  ["E49C",0x9305],
+  ["E49D",0x9306],
+  ["E49E",0x9307],
+  ["E49F",0x9308],
+  ["E4A0",0x9309],
+  ["E540",0x930A],
+  ["E541",0x930B],
+  ["E542",0x930C],
+  ["E543",0x930D],
+  ["E544",0x930E],
+  ["E545",0x930F],
+  ["E546",0x9310],
+  ["E547",0x9311],
+  ["E548",0x9312],
+  ["E549",0x9313],
+  ["E54A",0x9314],
+  ["E54B",0x9315],
+  ["E54C",0x9316],
+  ["E54D",0x9317],
+  ["E54E",0x9318],
+  ["E54F",0x9319],
+  ["E550",0x931A],
+  ["E551",0x931B],
+  ["E552",0x931C],
+  ["E553",0x931D],
+  ["E554",0x931E],
+  ["E555",0x931F],
+  ["E556",0x9320],
+  ["E557",0x9321],
+  ["E558",0x9322],
+  ["E559",0x9323],
+  ["E55A",0x9324],
+  ["E55B",0x9325],
+  ["E55C",0x9326],
+  ["E55D",0x9327],
+  ["E55E",0x9328],
+  ["E55F",0x9329],
+  ["E560",0x932A],
+  ["E561",0x932B],
+  ["E562",0x932C],
+  ["E563",0x932D],
+  ["E564",0x932E],
+  ["E565",0x932F],
+  ["E566",0x9330],
+  ["E567",0x9331],
+  ["E568",0x9332],
+  ["E569",0x9333],
+  ["E56A",0x9334],
+  ["E56B",0x9335],
+  ["E56C",0x9336],
+  ["E56D",0x9337],
+  ["E56E",0x9338],
+  ["E56F",0x9339],
+  ["E570",0x933A],
+  ["E571",0x933B],
+  ["E572",0x933C],
+  ["E573",0x933D],
+  ["F6C9",0x933E],
+  ["E574",0x933F],
+  ["E575",0x9340],
+  ["E576",0x9341],
+  ["E577",0x9342],
+  ["E578",0x9343],
+  ["E579",0x9344],
+  ["E57A",0x9345],
+  ["E57B",0x9346],
+  ["E57C",0x9347],
+  ["E57D",0x9348],
+  ["E57E",0x9349],
+  ["E580",0x934A],
+  ["E581",0x934B],
+  ["E582",0x934C],
+  ["E583",0x934D],
+  ["E584",0x934E],
+  ["E585",0x934F],
+  ["E586",0x9350],
+  ["E587",0x9351],
+  ["E588",0x9352],
+  ["E589",0x9353],
+  ["E58A",0x9354],
+  ["E58B",0x9355],
+  ["E58C",0x9356],
+  ["E58D",0x9357],
+  ["E58E",0x9358],
+  ["E58F",0x9359],
+  ["E590",0x935A],
+  ["E591",0x935B],
+  ["E592",0x935C],
+  ["E593",0x935D],
+  ["E594",0x935E],
+  ["E595",0x935F],
+  ["E596",0x9360],
+  ["E597",0x9361],
+  ["E598",0x9362],
+  ["E599",0x9363],
+  ["E59A",0x9364],
+  ["E59B",0x9365],
+  ["E59C",0x9366],
+  ["E59D",0x9367],
+  ["E59E",0x9368],
+  ["E59F",0x9369],
+  ["F6CA",0x936A],
+  ["E5A0",0x936B],
+  ["E640",0x936C],
+  ["E641",0x936D],
+  ["E642",0x936E],
+  ["E643",0x936F],
+  ["E644",0x9370],
+  ["E645",0x9371],
+  ["E646",0x9372],
+  ["E647",0x9373],
+  ["E648",0x9374],
+  ["E649",0x9375],
+  ["E64A",0x9376],
+  ["E64B",0x9377],
+  ["E64C",0x9378],
+  ["E64D",0x9379],
+  ["E64E",0x937A],
+  ["E64F",0x937B],
+  ["E650",0x937C],
+  ["E651",0x937D],
+  ["E652",0x937E],
+  ["E653",0x937F],
+  ["E654",0x9380],
+  ["E655",0x9381],
+  ["E656",0x9382],
+  ["E657",0x9383],
+  ["E658",0x9384],
+  ["E659",0x9385],
+  ["E65A",0x9386],
+  ["E65B",0x9387],
+  ["E65C",0x9388],
+  ["E65D",0x9389],
+  ["E65E",0x938A],
+  ["E65F",0x938B],
+  ["E660",0x938C],
+  ["E661",0x938D],
+  ["E662",0x938E],
+  ["F6CC",0x938F],
+  ["E663",0x9390],
+  ["E664",0x9391],
+  ["E665",0x9392],
+  ["E666",0x9393],
+  ["E667",0x9394],
+  ["E668",0x9395],
+  ["E669",0x9396],
+  ["E66A",0x9397],
+  ["E66B",0x9398],
+  ["E66C",0x9399],
+  ["E66D",0x939A],
+  ["E66E",0x939B],
+  ["E66F",0x939C],
+  ["E670",0x939D],
+  ["E671",0x939E],
+  ["E672",0x939F],
+  ["E673",0x93A0],
+  ["E674",0x93A1],
+  ["E675",0x93A2],
+  ["E676",0x93A3],
+  ["E677",0x93A4],
+  ["E678",0x93A5],
+  ["E679",0x93A6],
+  ["E67A",0x93A7],
+  ["E67B",0x93A8],
+  ["E67C",0x93A9],
+  ["E67D",0x93AA],
+  ["E67E",0x93AB],
+  ["E680",0x93AC],
+  ["E681",0x93AD],
+  ["E682",0x93AE],
+  ["E683",0x93AF],
+  ["E684",0x93B0],
+  ["E685",0x93B1],
+  ["E686",0x93B2],
+  ["E687",0x93B3],
+  ["E688",0x93B4],
+  ["E689",0x93B5],
+  ["E68A",0x93B6],
+  ["E68B",0x93B7],
+  ["E68C",0x93B8],
+  ["E68D",0x93B9],
+  ["E68E",0x93BA],
+  ["E68F",0x93BB],
+  ["E690",0x93BC],
+  ["E691",0x93BD],
+  ["E692",0x93BE],
+  ["E693",0x93BF],
+  ["E694",0x93C0],
+  ["E695",0x93C1],
+  ["E696",0x93C2],
+  ["E697",0x93C3],
+  ["E698",0x93C4],
+  ["E699",0x93C5],
+  ["E69A",0x93C6],
+  ["E69B",0x93C7],
+  ["E69C",0x93C8],
+  ["E69D",0x93C9],
+  ["F6CB",0x93CA],
+  ["E69E",0x93CB],
+  ["E69F",0x93CC],
+  ["E6A0",0x93CD],
+  ["E740",0x93CE],
+  ["E741",0x93CF],
+  ["E742",0x93D0],
+  ["E743",0x93D1],
+  ["E744",0x93D2],
+  ["E745",0x93D3],
+  ["E746",0x93D4],
+  ["E747",0x93D5],
+  ["F7E9",0x93D6],
+  ["E748",0x93D7],
+  ["E749",0x93D8],
+  ["E74A",0x93D9],
+  ["E74B",0x93DA],
+  ["E74C",0x93DB],
+  ["E74D",0x93DC],
+  ["E74E",0x93DD],
+  ["E74F",0x93DE],
+  ["E750",0x93DF],
+  ["E751",0x93E0],
+  ["E752",0x93E1],
+  ["E753",0x93E2],
+  ["E754",0x93E3],
+  ["E755",0x93E4],
+  ["E756",0x93E5],
+  ["E757",0x93E6],
+  ["E758",0x93E7],
+  ["E759",0x93E8],
+  ["E75A",0x93E9],
+  ["E75B",0x93EA],
+  ["E75C",0x93EB],
+  ["E75D",0x93EC],
+  ["E75E",0x93ED],
+  ["E75F",0x93EE],
+  ["E760",0x93EF],
+  ["E761",0x93F0],
+  ["E762",0x93F1],
+  ["E763",0x93F2],
+  ["E764",0x93F3],
+  ["E765",0x93F4],
+  ["E766",0x93F5],
+  ["E767",0x93F6],
+  ["E768",0x93F7],
+  ["E769",0x93F8],
+  ["E76A",0x93F9],
+  ["E76B",0x93FA],
+  ["E76C",0x93FB],
+  ["E76D",0x93FC],
+  ["E76E",0x93FD],
+  ["E76F",0x93FE],
+  ["E770",0x93FF],
+  ["E771",0x9400],
+  ["E772",0x9401],
+  ["E773",0x9402],
+  ["E774",0x9403],
+  ["E775",0x9404],
+  ["E776",0x9405],
+  ["E777",0x9406],
+  ["E778",0x9407],
+  ["E779",0x9408],
+  ["E77A",0x9409],
+  ["E77B",0x940A],
+  ["E77C",0x940B],
+  ["E77D",0x940C],
+  ["E77E",0x940D],
+  ["E780",0x940E],
+  ["E781",0x940F],
+  ["E782",0x9410],
+  ["E783",0x9411],
+  ["E784",0x9412],
+  ["E785",0x9413],
+  ["E786",0x9414],
+  ["E787",0x9415],
+  ["E788",0x9416],
+  ["E789",0x9417],
+  ["E78A",0x9418],
+  ["E78B",0x9419],
+  ["E78C",0x941A],
+  ["E78D",0x941B],
+  ["E78E",0x941C],
+  ["E78F",0x941D],
+  ["E790",0x941E],
+  ["E791",0x941F],
+  ["E792",0x9420],
+  ["E793",0x9421],
+  ["E794",0x9422],
+  ["E795",0x9423],
+  ["E796",0x9424],
+  ["E797",0x9425],
+  ["E798",0x9426],
+  ["E799",0x9427],
+  ["E79A",0x9428],
+  ["E79B",0x9429],
+  ["E79C",0x942A],
+  ["E79D",0x942B],
+  ["E79E",0x942C],
+  ["E79F",0x942D],
+  ["E7A0",0x942E],
+  ["E840",0x942F],
+  ["E841",0x9430],
+  ["E842",0x9431],
+  ["E843",0x9432],
+  ["E844",0x9433],
+  ["E845",0x9434],
+  ["E846",0x9435],
+  ["E847",0x9436],
+  ["E848",0x9437],
+  ["E849",0x9438],
+  ["E84A",0x9439],
+  ["E84B",0x943A],
+  ["E84C",0x943B],
+  ["E84D",0x943C],
+  ["E84E",0x943D],
+  ["F6CD",0x943E],
+  ["E84F",0x943F],
+  ["E850",0x9440],
+  ["E851",0x9441],
+  ["E852",0x9442],
+  ["E853",0x9443],
+  ["E854",0x9444],
+  ["E855",0x9445],
+  ["E856",0x9446],
+  ["E857",0x9447],
+  ["E858",0x9448],
+  ["E859",0x9449],
+  ["E85A",0x944A],
+  ["E85B",0x944B],
+  ["E85C",0x944C],
+  ["E85D",0x944D],
+  ["E85E",0x944E],
+  ["E85F",0x944F],
+  ["E860",0x9450],
+  ["E861",0x9451],
+  ["E862",0x9452],
+  ["E863",0x9453],
+  ["E864",0x9454],
+  ["E865",0x9455],
+  ["E866",0x9456],
+  ["E867",0x9457],
+  ["E868",0x9458],
+  ["E869",0x9459],
+  ["E86A",0x945A],
+  ["E86B",0x945B],
+  ["E86C",0x945C],
+  ["E86D",0x945D],
+  ["E86E",0x945E],
+  ["E86F",0x945F],
+  ["E870",0x9460],
+  ["E871",0x9461],
+  ["E872",0x9462],
+  ["E873",0x9463],
+  ["E874",0x9464],
+  ["E875",0x9465],
+  ["E876",0x9466],
+  ["E877",0x9467],
+  ["E878",0x9468],
+  ["E879",0x9469],
+  ["E87A",0x946A],
+  ["F6CE",0x946B],
+  ["E87B",0x946C],
+  ["E87C",0x946D],
+  ["E87D",0x946E],
+  ["E87E",0x946F],
+  ["E880",0x9470],
+  ["E881",0x9471],
+  ["E882",0x9472],
+  ["E883",0x9473],
+  ["E884",0x9474],
+  ["E885",0x9475],
+  ["E886",0x9476],
+  ["E887",0x9477],
+  ["E888",0x9478],
+  ["E889",0x9479],
+  ["E88A",0x947A],
+  ["E88B",0x947B],
+  ["E88C",0x947C],
+  ["E88D",0x947D],
+  ["E88E",0x947E],
+  ["E88F",0x947F],
+  ["E890",0x9480],
+  ["E891",0x9481],
+  ["E892",0x9482],
+  ["E893",0x9483],
+  ["E894",0x9484],
+  ["EEC4",0x9485],
+  ["EEC5",0x9486],
+  ["EEC6",0x9487],
+  ["D5EB",0x9488],
+  ["B6A4",0x9489],
+  ["EEC8",0x948A],
+  ["EEC7",0x948B],
+  ["EEC9",0x948C],
+  ["EECA",0x948D],
+  ["C7A5",0x948E],
+  ["EECB",0x948F],
+  ["EECC",0x9490],
+  ["E895",0x9491],
+  ["B7B0",0x9492],
+  ["B5F6",0x9493],
+  ["EECD",0x9494],
+  ["EECF",0x9495],
+  ["E896",0x9496],
+  ["EECE",0x9497],
+  ["E897",0x9498],
+  ["B8C6",0x9499],
+  ["EED0",0x949A],
+  ["EED1",0x949B],
+  ["EED2",0x949C],
+  ["B6DB",0x949D],
+  ["B3AE",0x949E],
+  ["D6D3",0x949F],
+  ["C4C6",0x94A0],
+  ["B1B5",0x94A1],
+  ["B8D6",0x94A2],
+  ["EED3",0x94A3],
+  ["EED4",0x94A4],
+  ["D4BF",0x94A5],
+  ["C7D5",0x94A6],
+  ["BEFB",0x94A7],
+  ["CED9",0x94A8],
+  ["B9B3",0x94A9],
+  ["EED6",0x94AA],
+  ["EED5",0x94AB],
+  ["EED8",0x94AC],
+  ["EED7",0x94AD],
+  ["C5A5",0x94AE],
+  ["EED9",0x94AF],
+  ["EEDA",0x94B0],
+  ["C7AE",0x94B1],
+  ["EEDB",0x94B2],
+  ["C7AF",0x94B3],
+  ["EEDC",0x94B4],
+  ["B2A7",0x94B5],
+  ["EEDD",0x94B6],
+  ["EEDE",0x94B7],
+  ["EEDF",0x94B8],
+  ["EEE0",0x94B9],
+  ["EEE1",0x94BA],
+  ["D7EA",0x94BB],
+  ["EEE2",0x94BC],
+  ["EEE3",0x94BD],
+  ["BCD8",0x94BE],
+  ["EEE4",0x94BF],
+  ["D3CB",0x94C0],
+  ["CCFA",0x94C1],
+  ["B2AC",0x94C2],
+  ["C1E5",0x94C3],
+  ["EEE5",0x94C4],
+  ["C7A6",0x94C5],
+  ["C3AD",0x94C6],
+  ["E898",0x94C7],
+  ["EEE6",0x94C8],
+  ["EEE7",0x94C9],
+  ["EEE8",0x94CA],
+  ["EEE9",0x94CB],
+  ["EEEA",0x94CC],
+  ["EEEB",0x94CD],
+  ["EEEC",0x94CE],
+  ["E899",0x94CF],
+  ["EEED",0x94D0],
+  ["EEEE",0x94D1],
+  ["EEEF",0x94D2],
+  ["E89A",0x94D3],
+  ["E89B",0x94D4],
+  ["EEF0",0x94D5],
+  ["EEF1",0x94D6],
+  ["EEF2",0x94D7],
+  ["EEF4",0x94D8],
+  ["EEF3",0x94D9],
+  ["E89C",0x94DA],
+  ["EEF5",0x94DB],
+  ["CDAD",0x94DC],
+  ["C2C1",0x94DD],
+  ["EEF6",0x94DE],
+  ["EEF7",0x94DF],
+  ["EEF8",0x94E0],
+  ["D5A1",0x94E1],
+  ["EEF9",0x94E2],
+  ["CFB3",0x94E3],
+  ["EEFA",0x94E4],
+  ["EEFB",0x94E5],
+  ["E89D",0x94E6],
+  ["EEFC",0x94E7],
+  ["EEFD",0x94E8],
+  ["EFA1",0x94E9],
+  ["EEFE",0x94EA],
+  ["EFA2",0x94EB],
+  ["B8F5",0x94EC],
+  ["C3FA",0x94ED],
+  ["EFA3",0x94EE],
+  ["EFA4",0x94EF],
+  ["BDC2",0x94F0],
+  ["D2BF",0x94F1],
+  ["B2F9",0x94F2],
+  ["EFA5",0x94F3],
+  ["EFA6",0x94F4],
+  ["EFA7",0x94F5],
+  ["D2F8",0x94F6],
+  ["EFA8",0x94F7],
+  ["D6FD",0x94F8],
+  ["EFA9",0x94F9],
+  ["C6CC",0x94FA],
+  ["E89E",0x94FB],
+  ["EFAA",0x94FC],
+  ["EFAB",0x94FD],
+  ["C1B4",0x94FE],
+  ["EFAC",0x94FF],
+  ["CFFA",0x9500],
+  ["CBF8",0x9501],
+  ["EFAE",0x9502],
+  ["EFAD",0x9503],
+  ["B3FA",0x9504],
+  ["B9F8",0x9505],
+  ["EFAF",0x9506],
+  ["EFB0",0x9507],
+  ["D0E2",0x9508],
+  ["EFB1",0x9509],
+  ["EFB2",0x950A],
+  ["B7E6",0x950B],
+  ["D0BF",0x950C],
+  ["EFB3",0x950D],
+  ["EFB4",0x950E],
+  ["EFB5",0x950F],
+  ["C8F1",0x9510],
+  ["CCE0",0x9511],
+  ["EFB6",0x9512],
+  ["EFB7",0x9513],
+  ["EFB8",0x9514],
+  ["EFB9",0x9515],
+  ["EFBA",0x9516],
+  ["D5E0",0x9517],
+  ["EFBB",0x9518],
+  ["B4ED",0x9519],
+  ["C3AA",0x951A],
+  ["EFBC",0x951B],
+  ["E89F",0x951C],
+  ["EFBD",0x951D],
+  ["EFBE",0x951E],
+  ["EFBF",0x951F],
+  ["E8A0",0x9520],
+  ["CEFD",0x9521],
+  ["EFC0",0x9522],
+  ["C2E0",0x9523],
+  ["B4B8",0x9524],
+  ["D7B6",0x9525],
+  ["BDF5",0x9526],
+  ["E940",0x9527],
+  ["CFC7",0x9528],
+  ["EFC3",0x9529],
+  ["EFC1",0x952A],
+  ["EFC2",0x952B],
+  ["EFC4",0x952C],
+  ["B6A7",0x952D],
+  ["BCFC",0x952E],
+  ["BEE2",0x952F],
+  ["C3CC",0x9530],
+  ["EFC5",0x9531],
+  ["EFC6",0x9532],
+  ["E941",0x9533],
+  ["EFC7",0x9534],
+  ["EFCF",0x9535],
+  ["EFC8",0x9536],
+  ["EFC9",0x9537],
+  ["EFCA",0x9538],
+  ["C7C2",0x9539],
+  ["EFF1",0x953A],
+  ["B6CD",0x953B],
+  ["EFCB",0x953C],
+  ["E942",0x953D],
+  ["EFCC",0x953E],
+  ["EFCD",0x953F],
+  ["B6C6",0x9540],
+  ["C3BE",0x9541],
+  ["EFCE",0x9542],
+  ["E943",0x9543],
+  ["EFD0",0x9544],
+  ["EFD1",0x9545],
+  ["EFD2",0x9546],
+  ["D5F2",0x9547],
+  ["E944",0x9548],
+  ["EFD3",0x9549],
+  ["C4F7",0x954A],
+  ["E945",0x954B],
+  ["EFD4",0x954C],
+  ["C4F8",0x954D],
+  ["EFD5",0x954E],
+  ["EFD6",0x954F],
+  ["B8E4",0x9550],
+  ["B0F7",0x9551],
+  ["EFD7",0x9552],
+  ["EFD8",0x9553],
+  ["EFD9",0x9554],
+  ["E946",0x9555],
+  ["EFDA",0x9556],
+  ["EFDB",0x9557],
+  ["EFDC",0x9558],
+  ["EFDD",0x9559],
+  ["E947",0x955A],
+  ["EFDE",0x955B],
+  ["BEB5",0x955C],
+  ["EFE1",0x955D],
+  ["EFDF",0x955E],
+  ["EFE0",0x955F],
+  ["E948",0x9560],
+  ["EFE2",0x9561],
+  ["EFE3",0x9562],
+  ["C1CD",0x9563],
+  ["EFE4",0x9564],
+  ["EFE5",0x9565],
+  ["EFE6",0x9566],
+  ["EFE7",0x9567],
+  ["EFE8",0x9568],
+  ["EFE9",0x9569],
+  ["EFEA",0x956A],
+  ["EFEB",0x956B],
+  ["EFEC",0x956C],
+  ["C0D8",0x956D],
+  ["E949",0x956E],
+  ["EFED",0x956F],
+  ["C1AD",0x9570],
+  ["EFEE",0x9571],
+  ["EFEF",0x9572],
+  ["EFF0",0x9573],
+  ["E94A",0x9574],
+  ["E94B",0x9575],
+  ["CFE2",0x9576],
+  ["E94C",0x9577],
+  ["E94D",0x9578],
+  ["E94E",0x9579],
+  ["E94F",0x957A],
+  ["E950",0x957B],
+  ["E951",0x957C],
+  ["E952",0x957D],
+  ["E953",0x957E],
+  ["B3A4",0x957F],
+  ["E954",0x9580],
+  ["E955",0x9581],
+  ["E956",0x9582],
+  ["E957",0x9583],
+  ["E958",0x9584],
+  ["E959",0x9585],
+  ["E95A",0x9586],
+  ["E95B",0x9587],
+  ["E95C",0x9588],
+  ["E95D",0x9589],
+  ["E95E",0x958A],
+  ["E95F",0x958B],
+  ["E960",0x958C],
+  ["E961",0x958D],
+  ["E962",0x958E],
+  ["E963",0x958F],
+  ["E964",0x9590],
+  ["E965",0x9591],
+  ["E966",0x9592],
+  ["E967",0x9593],
+  ["E968",0x9594],
+  ["E969",0x9595],
+  ["E96A",0x9596],
+  ["E96B",0x9597],
+  ["E96C",0x9598],
+  ["E96D",0x9599],
+  ["E96E",0x959A],
+  ["E96F",0x959B],
+  ["E970",0x959C],
+  ["E971",0x959D],
+  ["E972",0x959E],
+  ["E973",0x959F],
+  ["E974",0x95A0],
+  ["E975",0x95A1],
+  ["E976",0x95A2],
+  ["E977",0x95A3],
+  ["E978",0x95A4],
+  ["E979",0x95A5],
+  ["E97A",0x95A6],
+  ["E97B",0x95A7],
+  ["E97C",0x95A8],
+  ["E97D",0x95A9],
+  ["E97E",0x95AA],
+  ["E980",0x95AB],
+  ["E981",0x95AC],
+  ["E982",0x95AD],
+  ["E983",0x95AE],
+  ["E984",0x95AF],
+  ["E985",0x95B0],
+  ["E986",0x95B1],
+  ["E987",0x95B2],
+  ["E988",0x95B3],
+  ["E989",0x95B4],
+  ["E98A",0x95B5],
+  ["E98B",0x95B6],
+  ["E98C",0x95B7],
+  ["E98D",0x95B8],
+  ["E98E",0x95B9],
+  ["E98F",0x95BA],
+  ["E990",0x95BB],
+  ["E991",0x95BC],
+  ["E992",0x95BD],
+  ["E993",0x95BE],
+  ["E994",0x95BF],
+  ["E995",0x95C0],
+  ["E996",0x95C1],
+  ["E997",0x95C2],
+  ["E998",0x95C3],
+  ["E999",0x95C4],
+  ["E99A",0x95C5],
+  ["E99B",0x95C6],
+  ["E99C",0x95C7],
+  ["E99D",0x95C8],
+  ["E99E",0x95C9],
+  ["E99F",0x95CA],
+  ["E9A0",0x95CB],
+  ["EA40",0x95CC],
+  ["EA41",0x95CD],
+  ["EA42",0x95CE],
+  ["EA43",0x95CF],
+  ["EA44",0x95D0],
+  ["EA45",0x95D1],
+  ["EA46",0x95D2],
+  ["EA47",0x95D3],
+  ["EA48",0x95D4],
+  ["EA49",0x95D5],
+  ["EA4A",0x95D6],
+  ["EA4B",0x95D7],
+  ["EA4C",0x95D8],
+  ["EA4D",0x95D9],
+  ["EA4E",0x95DA],
+  ["EA4F",0x95DB],
+  ["EA50",0x95DC],
+  ["EA51",0x95DD],
+  ["EA52",0x95DE],
+  ["EA53",0x95DF],
+  ["EA54",0x95E0],
+  ["EA55",0x95E1],
+  ["EA56",0x95E2],
+  ["EA57",0x95E3],
+  ["EA58",0x95E4],
+  ["EA59",0x95E5],
+  ["EA5A",0x95E6],
+  ["EA5B",0x95E7],
+  ["C3C5",0x95E8],
+  ["E3C5",0x95E9],
+  ["C9C1",0x95EA],
+  ["E3C6",0x95EB],
+  ["EA5C",0x95EC],
+  ["B1D5",0x95ED],
+  ["CECA",0x95EE],
+  ["B4B3",0x95EF],
+  ["C8F2",0x95F0],
+  ["E3C7",0x95F1],
+  ["CFD0",0x95F2],
+  ["E3C8",0x95F3],
+  ["BCE4",0x95F4],
+  ["E3C9",0x95F5],
+  ["E3CA",0x95F6],
+  ["C3C6",0x95F7],
+  ["D5A2",0x95F8],
+  ["C4D6",0x95F9],
+  ["B9EB",0x95FA],
+  ["CEC5",0x95FB],
+  ["E3CB",0x95FC],
+  ["C3F6",0x95FD],
+  ["E3CC",0x95FE],
+  ["EA5D",0x95FF],
+  ["B7A7",0x9600],
+  ["B8F3",0x9601],
+  ["BAD2",0x9602],
+  ["E3CD",0x9603],
+  ["E3CE",0x9604],
+  ["D4C4",0x9605],
+  ["E3CF",0x9606],
+  ["EA5E",0x9607],
+  ["E3D0",0x9608],
+  ["D1CB",0x9609],
+  ["E3D1",0x960A],
+  ["E3D2",0x960B],
+  ["E3D3",0x960C],
+  ["E3D4",0x960D],
+  ["D1D6",0x960E],
+  ["E3D5",0x960F],
+  ["B2FB",0x9610],
+  ["C0BB",0x9611],
+  ["E3D6",0x9612],
+  ["EA5F",0x9613],
+  ["C0AB",0x9614],
+  ["E3D7",0x9615],
+  ["E3D8",0x9616],
+  ["E3D9",0x9617],
+  ["EA60",0x9618],
+  ["E3DA",0x9619],
+  ["E3DB",0x961A],
+  ["EA61",0x961B],
+  ["B8B7",0x961C],
+  ["DAE2",0x961D],
+  ["EA62",0x961E],
+  ["B6D3",0x961F],
+  ["EA63",0x9620],
+  ["DAE4",0x9621],
+  ["DAE3",0x9622],
+  ["EA64",0x9623],
+  ["EA65",0x9624],
+  ["EA66",0x9625],
+  ["EA67",0x9626],
+  ["EA68",0x9627],
+  ["EA69",0x9628],
+  ["EA6A",0x9629],
+  ["DAE6",0x962A],
+  ["EA6B",0x962B],
+  ["EA6C",0x962C],
+  ["EA6D",0x962D],
+  ["C8EE",0x962E],
+  ["EA6E",0x962F],
+  ["EA6F",0x9630],
+  ["DAE5",0x9631],
+  ["B7C0",0x9632],
+  ["D1F4",0x9633],
+  ["D2F5",0x9634],
+  ["D5F3",0x9635],
+  ["BDD7",0x9636],
+  ["EA70",0x9637],
+  ["EA71",0x9638],
+  ["EA72",0x9639],
+  ["EA73",0x963A],
+  ["D7E8",0x963B],
+  ["DAE8",0x963C],
+  ["DAE7",0x963D],
+  ["EA74",0x963E],
+  ["B0A2",0x963F],
+  ["CDD3",0x9640],
+  ["EA75",0x9641],
+  ["DAE9",0x9642],
+  ["EA76",0x9643],
+  ["B8BD",0x9644],
+  ["BCCA",0x9645],
+  ["C2BD",0x9646],
+  ["C2A4",0x9647],
+  ["B3C2",0x9648],
+  ["DAEA",0x9649],
+  ["EA77",0x964A],
+  ["C2AA",0x964B],
+  ["C4B0",0x964C],
+  ["BDB5",0x964D],
+  ["EA78",0x964E],
+  ["EA79",0x964F],
+  ["CFDE",0x9650],
+  ["EA7A",0x9651],
+  ["EA7B",0x9652],
+  ["EA7C",0x9653],
+  ["DAEB",0x9654],
+  ["C9C2",0x9655],
+  ["EA7D",0x9656],
+  ["EA7E",0x9657],
+  ["EA80",0x9658],
+  ["EA81",0x9659],
+  ["EA82",0x965A],
+  ["B1DD",0x965B],
+  ["EA83",0x965C],
+  ["EA84",0x965D],
+  ["EA85",0x965E],
+  ["DAEC",0x965F],
+  ["EA86",0x9660],
+  ["B6B8",0x9661],
+  ["D4BA",0x9662],
+  ["EA87",0x9663],
+  ["B3FD",0x9664],
+  ["EA88",0x9665],
+  ["EA89",0x9666],
+  ["DAED",0x9667],
+  ["D4C9",0x9668],
+  ["CFD5",0x9669],
+  ["C5E3",0x966A],
+  ["EA8A",0x966B],
+  ["DAEE",0x966C],
+  ["EA8B",0x966D],
+  ["EA8C",0x966E],
+  ["EA8D",0x966F],
+  ["EA8E",0x9670],
+  ["EA8F",0x9671],
+  ["DAEF",0x9672],
+  ["EA90",0x9673],
+  ["DAF0",0x9674],
+  ["C1EA",0x9675],
+  ["CCD5",0x9676],
+  ["CFDD",0x9677],
+  ["EA91",0x9678],
+  ["EA92",0x9679],
+  ["EA93",0x967A],
+  ["EA94",0x967B],
+  ["EA95",0x967C],
+  ["EA96",0x967D],
+  ["EA97",0x967E],
+  ["EA98",0x967F],
+  ["EA99",0x9680],
+  ["EA9A",0x9681],
+  ["EA9B",0x9682],
+  ["EA9C",0x9683],
+  ["EA9D",0x9684],
+  ["D3E7",0x9685],
+  ["C2A1",0x9686],
+  ["EA9E",0x9687],
+  ["DAF1",0x9688],
+  ["EA9F",0x9689],
+  ["EAA0",0x968A],
+  ["CBE5",0x968B],
+  ["EB40",0x968C],
+  ["DAF2",0x968D],
+  ["EB41",0x968E],
+  ["CBE6",0x968F],
+  ["D2FE",0x9690],
+  ["EB42",0x9691],
+  ["EB43",0x9692],
+  ["EB44",0x9693],
+  ["B8F4",0x9694],
+  ["EB45",0x9695],
+  ["EB46",0x9696],
+  ["DAF3",0x9697],
+  ["B0AF",0x9698],
+  ["CFB6",0x9699],
+  ["EB47",0x969A],
+  ["EB48",0x969B],
+  ["D5CF",0x969C],
+  ["EB49",0x969D],
+  ["EB4A",0x969E],
+  ["EB4B",0x969F],
+  ["EB4C",0x96A0],
+  ["EB4D",0x96A1],
+  ["EB4E",0x96A2],
+  ["EB4F",0x96A3],
+  ["EB50",0x96A4],
+  ["EB51",0x96A5],
+  ["EB52",0x96A6],
+  ["CBED",0x96A7],
+  ["EB53",0x96A8],
+  ["EB54",0x96A9],
+  ["EB55",0x96AA],
+  ["EB56",0x96AB],
+  ["EB57",0x96AC],
+  ["EB58",0x96AD],
+  ["EB59",0x96AE],
+  ["EB5A",0x96AF],
+  ["DAF4",0x96B0],
+  ["EB5B",0x96B1],
+  ["EB5C",0x96B2],
+  ["E3C4",0x96B3],
+  ["EB5D",0x96B4],
+  ["EB5E",0x96B5],
+  ["C1A5",0x96B6],
+  ["EB5F",0x96B7],
+  ["EB60",0x96B8],
+  ["F6BF",0x96B9],
+  ["EB61",0x96BA],
+  ["EB62",0x96BB],
+  ["F6C0",0x96BC],
+  ["F6C1",0x96BD],
+  ["C4D1",0x96BE],
+  ["EB63",0x96BF],
+  ["C8B8",0x96C0],
+  ["D1E3",0x96C1],
+  ["EB64",0x96C2],
+  ["EB65",0x96C3],
+  ["D0DB",0x96C4],
+  ["D1C5",0x96C5],
+  ["BCAF",0x96C6],
+  ["B9CD",0x96C7],
+  ["EB66",0x96C8],
+  ["EFF4",0x96C9],
+  ["EB67",0x96CA],
+  ["EB68",0x96CB],
+  ["B4C6",0x96CC],
+  ["D3BA",0x96CD],
+  ["F6C2",0x96CE],
+  ["B3FB",0x96CF],
+  ["EB69",0x96D0],
+  ["EB6A",0x96D1],
+  ["F6C3",0x96D2],
+  ["EB6B",0x96D3],
+  ["EB6C",0x96D4],
+  ["B5F1",0x96D5],
+  ["EB6D",0x96D6],
+  ["EB6E",0x96D7],
+  ["EB6F",0x96D8],
+  ["EB70",0x96D9],
+  ["EB71",0x96DA],
+  ["EB72",0x96DB],
+  ["EB73",0x96DC],
+  ["EB74",0x96DD],
+  ["EB75",0x96DE],
+  ["EB76",0x96DF],
+  ["F6C5",0x96E0],
+  ["EB77",0x96E1],
+  ["EB78",0x96E2],
+  ["EB79",0x96E3],
+  ["EB7A",0x96E4],
+  ["EB7B",0x96E5],
+  ["EB7C",0x96E6],
+  ["EB7D",0x96E7],
+  ["D3EA",0x96E8],
+  ["F6A7",0x96E9],
+  ["D1A9",0x96EA],
+  ["EB7E",0x96EB],
+  ["EB80",0x96EC],
+  ["EB81",0x96ED],
+  ["EB82",0x96EE],
+  ["F6A9",0x96EF],
+  ["EB83",0x96F0],
+  ["EB84",0x96F1],
+  ["EB85",0x96F2],
+  ["F6A8",0x96F3],
+  ["EB86",0x96F4],
+  ["EB87",0x96F5],
+  ["C1E3",0x96F6],
+  ["C0D7",0x96F7],
+  ["EB88",0x96F8],
+  ["B1A2",0x96F9],
+  ["EB89",0x96FA],
+  ["EB8A",0x96FB],
+  ["EB8B",0x96FC],
+  ["EB8C",0x96FD],
+  ["CEED",0x96FE],
+  ["EB8D",0x96FF],
+  ["D0E8",0x9700],
+  ["F6AB",0x9701],
+  ["EB8E",0x9702],
+  ["EB8F",0x9703],
+  ["CFF6",0x9704],
+  ["EB90",0x9705],
+  ["F6AA",0x9706],
+  ["D5F0",0x9707],
+  ["F6AC",0x9708],
+  ["C3B9",0x9709],
+  ["EB91",0x970A],
+  ["EB92",0x970B],
+  ["EB93",0x970C],
+  ["BBF4",0x970D],
+  ["F6AE",0x970E],
+  ["F6AD",0x970F],
+  ["EB94",0x9710],
+  ["EB95",0x9711],
+  ["EB96",0x9712],
+  ["C4DE",0x9713],
+  ["EB97",0x9714],
+  ["EB98",0x9715],
+  ["C1D8",0x9716],
+  ["EB99",0x9717],
+  ["EB9A",0x9718],
+  ["EB9B",0x9719],
+  ["EB9C",0x971A],
+  ["EB9D",0x971B],
+  ["CBAA",0x971C],
+  ["EB9E",0x971D],
+  ["CFBC",0x971E],
+  ["EB9F",0x971F],
+  ["EBA0",0x9720],
+  ["EC40",0x9721],
+  ["EC41",0x9722],
+  ["EC42",0x9723],
+  ["EC43",0x9724],
+  ["EC44",0x9725],
+  ["EC45",0x9726],
+  ["EC46",0x9727],
+  ["EC47",0x9728],
+  ["EC48",0x9729],
+  ["F6AF",0x972A],
+  ["EC49",0x972B],
+  ["EC4A",0x972C],
+  ["F6B0",0x972D],
+  ["EC4B",0x972E],
+  ["EC4C",0x972F],
+  ["F6B1",0x9730],
+  ["EC4D",0x9731],
+  ["C2B6",0x9732],
+  ["EC4E",0x9733],
+  ["EC4F",0x9734],
+  ["EC50",0x9735],
+  ["EC51",0x9736],
+  ["EC52",0x9737],
+  ["B0D4",0x9738],
+  ["C5F9",0x9739],
+  ["EC53",0x973A],
+  ["EC54",0x973B],
+  ["EC55",0x973C],
+  ["EC56",0x973D],
+  ["F6B2",0x973E],
+  ["EC57",0x973F],
+  ["EC58",0x9740],
+  ["EC59",0x9741],
+  ["EC5A",0x9742],
+  ["EC5B",0x9743],
+  ["EC5C",0x9744],
+  ["EC5D",0x9745],
+  ["EC5E",0x9746],
+  ["EC5F",0x9747],
+  ["EC60",0x9748],
+  ["EC61",0x9749],
+  ["EC62",0x974A],
+  ["EC63",0x974B],
+  ["EC64",0x974C],
+  ["EC65",0x974D],
+  ["EC66",0x974E],
+  ["EC67",0x974F],
+  ["EC68",0x9750],
+  ["EC69",0x9751],
+  ["C7E0",0x9752],
+  ["F6A6",0x9753],
+  ["EC6A",0x9754],
+  ["EC6B",0x9755],
+  ["BEB8",0x9756],
+  ["EC6C",0x9757],
+  ["EC6D",0x9758],
+  ["BEB2",0x9759],
+  ["EC6E",0x975A],
+  ["B5E5",0x975B],
+  ["EC6F",0x975C],
+  ["EC70",0x975D],
+  ["B7C7",0x975E],
+  ["EC71",0x975F],
+  ["BFBF",0x9760],
+  ["C3D2",0x9761],
+  ["C3E6",0x9762],
+  ["EC72",0x9763],
+  ["EC73",0x9764],
+  ["D8CC",0x9765],
+  ["EC74",0x9766],
+  ["EC75",0x9767],
+  ["EC76",0x9768],
+  ["B8EF",0x9769],
+  ["EC77",0x976A],
+  ["EC78",0x976B],
+  ["EC79",0x976C],
+  ["EC7A",0x976D],
+  ["EC7B",0x976E],
+  ["EC7C",0x976F],
+  ["EC7D",0x9770],
+  ["EC7E",0x9771],
+  ["EC80",0x9772],
+  ["BDF9",0x9773],
+  ["D1A5",0x9774],
+  ["EC81",0x9775],
+  ["B0D0",0x9776],
+  ["EC82",0x9777],
+  ["EC83",0x9778],
+  ["EC84",0x9779],
+  ["EC85",0x977A],
+  ["EC86",0x977B],
+  ["F7B0",0x977C],
+  ["EC87",0x977D],
+  ["EC88",0x977E],
+  ["EC89",0x977F],
+  ["EC8A",0x9780],
+  ["EC8B",0x9781],
+  ["EC8C",0x9782],
+  ["EC8D",0x9783],
+  ["EC8E",0x9784],
+  ["F7B1",0x9785],
+  ["EC8F",0x9786],
+  ["EC90",0x9787],
+  ["EC91",0x9788],
+  ["EC92",0x9789],
+  ["EC93",0x978A],
+  ["D0AC",0x978B],
+  ["EC94",0x978C],
+  ["B0B0",0x978D],
+  ["EC95",0x978E],
+  ["EC96",0x978F],
+  ["EC97",0x9790],
+  ["F7B2",0x9791],
+  ["F7B3",0x9792],
+  ["EC98",0x9793],
+  ["F7B4",0x9794],
+  ["EC99",0x9795],
+  ["EC9A",0x9796],
+  ["EC9B",0x9797],
+  ["C7CA",0x9798],
+  ["EC9C",0x9799],
+  ["EC9D",0x979A],
+  ["EC9E",0x979B],
+  ["EC9F",0x979C],
+  ["ECA0",0x979D],
+  ["ED40",0x979E],
+  ["ED41",0x979F],
+  ["BECF",0x97A0],
+  ["ED42",0x97A1],
+  ["ED43",0x97A2],
+  ["F7B7",0x97A3],
+  ["ED44",0x97A4],
+  ["ED45",0x97A5],
+  ["ED46",0x97A6],
+  ["ED47",0x97A7],
+  ["ED48",0x97A8],
+  ["ED49",0x97A9],
+  ["ED4A",0x97AA],
+  ["F7B6",0x97AB],
+  ["ED4B",0x97AC],
+  ["B1DE",0x97AD],
+  ["ED4C",0x97AE],
+  ["F7B5",0x97AF],
+  ["ED4D",0x97B0],
+  ["ED4E",0x97B1],
+  ["F7B8",0x97B2],
+  ["ED4F",0x97B3],
+  ["F7B9",0x97B4],
+  ["ED50",0x97B5],
+  ["ED51",0x97B6],
+  ["ED52",0x97B7],
+  ["ED53",0x97B8],
+  ["ED54",0x97B9],
+  ["ED55",0x97BA],
+  ["ED56",0x97BB],
+  ["ED57",0x97BC],
+  ["ED58",0x97BD],
+  ["ED59",0x97BE],
+  ["ED5A",0x97BF],
+  ["ED5B",0x97C0],
+  ["ED5C",0x97C1],
+  ["ED5D",0x97C2],
+  ["ED5E",0x97C3],
+  ["ED5F",0x97C4],
+  ["ED60",0x97C5],
+  ["ED61",0x97C6],
+  ["ED62",0x97C7],
+  ["ED63",0x97C8],
+  ["ED64",0x97C9],
+  ["ED65",0x97CA],
+  ["ED66",0x97CB],
+  ["ED67",0x97CC],
+  ["ED68",0x97CD],
+  ["ED69",0x97CE],
+  ["ED6A",0x97CF],
+  ["ED6B",0x97D0],
+  ["ED6C",0x97D1],
+  ["ED6D",0x97D2],
+  ["ED6E",0x97D3],
+  ["ED6F",0x97D4],
+  ["ED70",0x97D5],
+  ["ED71",0x97D6],
+  ["ED72",0x97D7],
+  ["ED73",0x97D8],
+  ["ED74",0x97D9],
+  ["ED75",0x97DA],
+  ["ED76",0x97DB],
+  ["ED77",0x97DC],
+  ["ED78",0x97DD],
+  ["ED79",0x97DE],
+  ["ED7A",0x97DF],
+  ["ED7B",0x97E0],
+  ["ED7C",0x97E1],
+  ["ED7D",0x97E2],
+  ["ED7E",0x97E3],
+  ["ED80",0x97E4],
+  ["ED81",0x97E5],
+  ["CEA4",0x97E6],
+  ["C8CD",0x97E7],
+  ["ED82",0x97E8],
+  ["BAAB",0x97E9],
+  ["E8B8",0x97EA],
+  ["E8B9",0x97EB],
+  ["E8BA",0x97EC],
+  ["BEC2",0x97ED],
+  ["ED83",0x97EE],
+  ["ED84",0x97EF],
+  ["ED85",0x97F0],
+  ["ED86",0x97F1],
+  ["ED87",0x97F2],
+  ["D2F4",0x97F3],
+  ["ED88",0x97F4],
+  ["D4CF",0x97F5],
+  ["C9D8",0x97F6],
+  ["ED89",0x97F7],
+  ["ED8A",0x97F8],
+  ["ED8B",0x97F9],
+  ["ED8C",0x97FA],
+  ["ED8D",0x97FB],
+  ["ED8E",0x97FC],
+  ["ED8F",0x97FD],
+  ["ED90",0x97FE],
+  ["ED91",0x97FF],
+  ["ED92",0x9800],
+  ["ED93",0x9801],
+  ["ED94",0x9802],
+  ["ED95",0x9803],
+  ["ED96",0x9804],
+  ["ED97",0x9805],
+  ["ED98",0x9806],
+  ["ED99",0x9807],
+  ["ED9A",0x9808],
+  ["ED9B",0x9809],
+  ["ED9C",0x980A],
+  ["ED9D",0x980B],
+  ["ED9E",0x980C],
+  ["ED9F",0x980D],
+  ["EDA0",0x980E],
+  ["EE40",0x980F],
+  ["EE41",0x9810],
+  ["EE42",0x9811],
+  ["EE43",0x9812],
+  ["EE44",0x9813],
+  ["EE45",0x9814],
+  ["EE46",0x9815],
+  ["EE47",0x9816],
+  ["EE48",0x9817],
+  ["EE49",0x9818],
+  ["EE4A",0x9819],
+  ["EE4B",0x981A],
+  ["EE4C",0x981B],
+  ["EE4D",0x981C],
+  ["EE4E",0x981D],
+  ["EE4F",0x981E],
+  ["EE50",0x981F],
+  ["EE51",0x9820],
+  ["EE52",0x9821],
+  ["EE53",0x9822],
+  ["EE54",0x9823],
+  ["EE55",0x9824],
+  ["EE56",0x9825],
+  ["EE57",0x9826],
+  ["EE58",0x9827],
+  ["EE59",0x9828],
+  ["EE5A",0x9829],
+  ["EE5B",0x982A],
+  ["EE5C",0x982B],
+  ["EE5D",0x982C],
+  ["EE5E",0x982D],
+  ["EE5F",0x982E],
+  ["EE60",0x982F],
+  ["EE61",0x9830],
+  ["EE62",0x9831],
+  ["EE63",0x9832],
+  ["EE64",0x9833],
+  ["EE65",0x9834],
+  ["EE66",0x9835],
+  ["EE67",0x9836],
+  ["EE68",0x9837],
+  ["EE69",0x9838],
+  ["EE6A",0x9839],
+  ["EE6B",0x983A],
+  ["EE6C",0x983B],
+  ["EE6D",0x983C],
+  ["EE6E",0x983D],
+  ["EE6F",0x983E],
+  ["EE70",0x983F],
+  ["EE71",0x9840],
+  ["EE72",0x9841],
+  ["EE73",0x9842],
+  ["EE74",0x9843],
+  ["EE75",0x9844],
+  ["EE76",0x9845],
+  ["EE77",0x9846],
+  ["EE78",0x9847],
+  ["EE79",0x9848],
+  ["EE7A",0x9849],
+  ["EE7B",0x984A],
+  ["EE7C",0x984B],
+  ["EE7D",0x984C],
+  ["EE7E",0x984D],
+  ["EE80",0x984E],
+  ["EE81",0x984F],
+  ["EE82",0x9850],
+  ["EE83",0x9851],
+  ["EE84",0x9852],
+  ["EE85",0x9853],
+  ["EE86",0x9854],
+  ["EE87",0x9855],
+  ["EE88",0x9856],
+  ["EE89",0x9857],
+  ["EE8A",0x9858],
+  ["EE8B",0x9859],
+  ["EE8C",0x985A],
+  ["EE8D",0x985B],
+  ["EE8E",0x985C],
+  ["EE8F",0x985D],
+  ["EE90",0x985E],
+  ["EE91",0x985F],
+  ["EE92",0x9860],
+  ["EE93",0x9861],
+  ["EE94",0x9862],
+  ["EE95",0x9863],
+  ["EE96",0x9864],
+  ["EE97",0x9865],
+  ["EE98",0x9866],
+  ["EE99",0x9867],
+  ["EE9A",0x9868],
+  ["EE9B",0x9869],
+  ["EE9C",0x986A],
+  ["EE9D",0x986B],
+  ["EE9E",0x986C],
+  ["EE9F",0x986D],
+  ["EEA0",0x986E],
+  ["EF40",0x986F],
+  ["EF41",0x9870],
+  ["EF42",0x9871],
+  ["EF43",0x9872],
+  ["EF44",0x9873],
+  ["EF45",0x9874],
+  ["D2B3",0x9875],
+  ["B6A5",0x9876],
+  ["C7EA",0x9877],
+  ["F1FC",0x9878],
+  ["CFEE",0x9879],
+  ["CBB3",0x987A],
+  ["D0EB",0x987B],
+  ["E7EF",0x987C],
+  ["CDE7",0x987D],
+  ["B9CB",0x987E],
+  ["B6D9",0x987F],
+  ["F1FD",0x9880],
+  ["B0E4",0x9881],
+  ["CBCC",0x9882],
+  ["F1FE",0x9883],
+  ["D4A4",0x9884],
+  ["C2AD",0x9885],
+  ["C1EC",0x9886],
+  ["C6C4",0x9887],
+  ["BEB1",0x9888],
+  ["F2A1",0x9889],
+  ["BCD5",0x988A],
+  ["EF46",0x988B],
+  ["F2A2",0x988C],
+  ["F2A3",0x988D],
+  ["EF47",0x988E],
+  ["F2A4",0x988F],
+  ["D2C3",0x9890],
+  ["C6B5",0x9891],
+  ["EF48",0x9892],
+  ["CDC7",0x9893],
+  ["F2A5",0x9894],
+  ["EF49",0x9895],
+  ["D3B1",0x9896],
+  ["BFC5",0x9897],
+  ["CCE2",0x9898],
+  ["EF4A",0x9899],
+  ["F2A6",0x989A],
+  ["F2A7",0x989B],
+  ["D1D5",0x989C],
+  ["B6EE",0x989D],
+  ["F2A8",0x989E],
+  ["F2A9",0x989F],
+  ["B5DF",0x98A0],
+  ["F2AA",0x98A1],
+  ["F2AB",0x98A2],
+  ["EF4B",0x98A3],
+  ["B2FC",0x98A4],
+  ["F2AC",0x98A5],
+  ["F2AD",0x98A6],
+  ["C8A7",0x98A7],
+  ["EF4C",0x98A8],
+  ["EF4D",0x98A9],
+  ["EF4E",0x98AA],
+  ["EF4F",0x98AB],
+  ["EF50",0x98AC],
+  ["EF51",0x98AD],
+  ["EF52",0x98AE],
+  ["EF53",0x98AF],
+  ["EF54",0x98B0],
+  ["EF55",0x98B1],
+  ["EF56",0x98B2],
+  ["EF57",0x98B3],
+  ["EF58",0x98B4],
+  ["EF59",0x98B5],
+  ["EF5A",0x98B6],
+  ["EF5B",0x98B7],
+  ["EF5C",0x98B8],
+  ["EF5D",0x98B9],
+  ["EF5E",0x98BA],
+  ["EF5F",0x98BB],
+  ["EF60",0x98BC],
+  ["EF61",0x98BD],
+  ["EF62",0x98BE],
+  ["EF63",0x98BF],
+  ["EF64",0x98C0],
+  ["EF65",0x98C1],
+  ["EF66",0x98C2],
+  ["EF67",0x98C3],
+  ["EF68",0x98C4],
+  ["EF69",0x98C5],
+  ["EF6A",0x98C6],
+  ["EF6B",0x98C7],
+  ["EF6C",0x98C8],
+  ["EF6D",0x98C9],
+  ["EF6E",0x98CA],
+  ["EF6F",0x98CB],
+  ["EF70",0x98CC],
+  ["EF71",0x98CD],
+  ["B7E7",0x98CE],
+  ["EF72",0x98CF],
+  ["EF73",0x98D0],
+  ["ECA9",0x98D1],
+  ["ECAA",0x98D2],
+  ["ECAB",0x98D3],
+  ["EF74",0x98D4],
+  ["ECAC",0x98D5],
+  ["EF75",0x98D6],
+  ["EF76",0x98D7],
+  ["C6AE",0x98D8],
+  ["ECAD",0x98D9],
+  ["ECAE",0x98DA],
+  ["EF77",0x98DB],
+  ["EF78",0x98DC],
+  ["EF79",0x98DD],
+  ["B7C9",0x98DE],
+  ["CAB3",0x98DF],
+  ["EF7A",0x98E0],
+  ["EF7B",0x98E1],
+  ["EF7C",0x98E2],
+  ["EF7D",0x98E3],
+  ["EF7E",0x98E4],
+  ["EF80",0x98E5],
+  ["EF81",0x98E6],
+  ["E2B8",0x98E7],
+  ["F7CF",0x98E8],
+  ["EF82",0x98E9],
+  ["EF83",0x98EA],
+  ["EF84",0x98EB],
+  ["EF85",0x98EC],
+  ["EF86",0x98ED],
+  ["EF87",0x98EE],
+  ["EF88",0x98EF],
+  ["EF89",0x98F0],
+  ["EF8A",0x98F1],
+  ["EF8B",0x98F2],
+  ["EF8C",0x98F3],
+  ["EF8D",0x98F4],
+  ["EF8E",0x98F5],
+  ["EF8F",0x98F6],
+  ["EF90",0x98F7],
+  ["EF91",0x98F8],
+  ["EF92",0x98F9],
+  ["EF93",0x98FA],
+  ["EF94",0x98FB],
+  ["EF95",0x98FC],
+  ["EF96",0x98FD],
+  ["EF97",0x98FE],
+  ["EF98",0x98FF],
+  ["EF99",0x9900],
+  ["EF9A",0x9901],
+  ["EF9B",0x9902],
+  ["EF9C",0x9903],
+  ["EF9D",0x9904],
+  ["EF9E",0x9905],
+  ["EF9F",0x9906],
+  ["EFA0",0x9907],
+  ["F040",0x9908],
+  ["F041",0x9909],
+  ["F042",0x990A],
+  ["F043",0x990B],
+  ["F044",0x990C],
+  ["F7D0",0x990D],
+  ["F045",0x990E],
+  ["F046",0x990F],
+  ["B2CD",0x9910],
+  ["F047",0x9911],
+  ["F048",0x9912],
+  ["F049",0x9913],
+  ["F04A",0x9914],
+  ["F04B",0x9915],
+  ["F04C",0x9916],
+  ["F04D",0x9917],
+  ["F04E",0x9918],
+  ["F04F",0x9919],
+  ["F050",0x991A],
+  ["F051",0x991B],
+  ["F052",0x991C],
+  ["F053",0x991D],
+  ["F054",0x991E],
+  ["F055",0x991F],
+  ["F056",0x9920],
+  ["F057",0x9921],
+  ["F058",0x9922],
+  ["F059",0x9923],
+  ["F05A",0x9924],
+  ["F05B",0x9925],
+  ["F05C",0x9926],
+  ["F05D",0x9927],
+  ["F05E",0x9928],
+  ["F05F",0x9929],
+  ["F060",0x992A],
+  ["F061",0x992B],
+  ["F062",0x992C],
+  ["F063",0x992D],
+  ["F7D1",0x992E],
+  ["F064",0x992F],
+  ["F065",0x9930],
+  ["F066",0x9931],
+  ["F067",0x9932],
+  ["F068",0x9933],
+  ["F069",0x9934],
+  ["F06A",0x9935],
+  ["F06B",0x9936],
+  ["F06C",0x9937],
+  ["F06D",0x9938],
+  ["F06E",0x9939],
+  ["F06F",0x993A],
+  ["F070",0x993B],
+  ["F071",0x993C],
+  ["F072",0x993D],
+  ["F073",0x993E],
+  ["F074",0x993F],
+  ["F075",0x9940],
+  ["F076",0x9941],
+  ["F077",0x9942],
+  ["F078",0x9943],
+  ["F079",0x9944],
+  ["F07A",0x9945],
+  ["F07B",0x9946],
+  ["F07C",0x9947],
+  ["F07D",0x9948],
+  ["F07E",0x9949],
+  ["F080",0x994A],
+  ["F081",0x994B],
+  ["F082",0x994C],
+  ["F083",0x994D],
+  ["F084",0x994E],
+  ["F085",0x994F],
+  ["F086",0x9950],
+  ["F087",0x9951],
+  ["F088",0x9952],
+  ["F089",0x9953],
+  ["F7D3",0x9954],
+  ["F7D2",0x9955],
+  ["F08A",0x9956],
+  ["F08B",0x9957],
+  ["F08C",0x9958],
+  ["F08D",0x9959],
+  ["F08E",0x995A],
+  ["F08F",0x995B],
+  ["F090",0x995C],
+  ["F091",0x995D],
+  ["F092",0x995E],
+  ["F093",0x995F],
+  ["F094",0x9960],
+  ["F095",0x9961],
+  ["F096",0x9962],
+  ["E2BB",0x9963],
+  ["F097",0x9964],
+  ["BCA2",0x9965],
+  ["F098",0x9966],
+  ["E2BC",0x9967],
+  ["E2BD",0x9968],
+  ["E2BE",0x9969],
+  ["E2BF",0x996A],
+  ["E2C0",0x996B],
+  ["E2C1",0x996C],
+  ["B7B9",0x996D],
+  ["D2FB",0x996E],
+  ["BDA4",0x996F],
+  ["CACE",0x9970],
+  ["B1A5",0x9971],
+  ["CBC7",0x9972],
+  ["F099",0x9973],
+  ["E2C2",0x9974],
+  ["B6FC",0x9975],
+  ["C8C4",0x9976],
+  ["E2C3",0x9977],
+  ["F09A",0x9978],
+  ["F09B",0x9979],
+  ["BDC8",0x997A],
+  ["F09C",0x997B],
+  ["B1FD",0x997C],
+  ["E2C4",0x997D],
+  ["F09D",0x997E],
+  ["B6F6",0x997F],
+  ["E2C5",0x9980],
+  ["C4D9",0x9981],
+  ["F09E",0x9982],
+  ["F09F",0x9983],
+  ["E2C6",0x9984],
+  ["CFDA",0x9985],
+  ["B9DD",0x9986],
+  ["E2C7",0x9987],
+  ["C0A1",0x9988],
+  ["F0A0",0x9989],
+  ["E2C8",0x998A],
+  ["B2F6",0x998B],
+  ["F140",0x998C],
+  ["E2C9",0x998D],
+  ["F141",0x998E],
+  ["C1F3",0x998F],
+  ["E2CA",0x9990],
+  ["E2CB",0x9991],
+  ["C2F8",0x9992],
+  ["E2CC",0x9993],
+  ["E2CD",0x9994],
+  ["E2CE",0x9995],
+  ["CAD7",0x9996],
+  ["D8B8",0x9997],
+  ["D9E5",0x9998],
+  ["CFE3",0x9999],
+  ["F142",0x999A],
+  ["F143",0x999B],
+  ["F144",0x999C],
+  ["F145",0x999D],
+  ["F146",0x999E],
+  ["F147",0x999F],
+  ["F148",0x99A0],
+  ["F149",0x99A1],
+  ["F14A",0x99A2],
+  ["F14B",0x99A3],
+  ["F14C",0x99A4],
+  ["F0A5",0x99A5],
+  ["F14D",0x99A6],
+  ["F14E",0x99A7],
+  ["DCB0",0x99A8],
+  ["F14F",0x99A9],
+  ["F150",0x99AA],
+  ["F151",0x99AB],
+  ["F152",0x99AC],
+  ["F153",0x99AD],
+  ["F154",0x99AE],
+  ["F155",0x99AF],
+  ["F156",0x99B0],
+  ["F157",0x99B1],
+  ["F158",0x99B2],
+  ["F159",0x99B3],
+  ["F15A",0x99B4],
+  ["F15B",0x99B5],
+  ["F15C",0x99B6],
+  ["F15D",0x99B7],
+  ["F15E",0x99B8],
+  ["F15F",0x99B9],
+  ["F160",0x99BA],
+  ["F161",0x99BB],
+  ["F162",0x99BC],
+  ["F163",0x99BD],
+  ["F164",0x99BE],
+  ["F165",0x99BF],
+  ["F166",0x99C0],
+  ["F167",0x99C1],
+  ["F168",0x99C2],
+  ["F169",0x99C3],
+  ["F16A",0x99C4],
+  ["F16B",0x99C5],
+  ["F16C",0x99C6],
+  ["F16D",0x99C7],
+  ["F16E",0x99C8],
+  ["F16F",0x99C9],
+  ["F170",0x99CA],
+  ["F171",0x99CB],
+  ["F172",0x99CC],
+  ["F173",0x99CD],
+  ["F174",0x99CE],
+  ["F175",0x99CF],
+  ["F176",0x99D0],
+  ["F177",0x99D1],
+  ["F178",0x99D2],
+  ["F179",0x99D3],
+  ["F17A",0x99D4],
+  ["F17B",0x99D5],
+  ["F17C",0x99D6],
+  ["F17D",0x99D7],
+  ["F17E",0x99D8],
+  ["F180",0x99D9],
+  ["F181",0x99DA],
+  ["F182",0x99DB],
+  ["F183",0x99DC],
+  ["F184",0x99DD],
+  ["F185",0x99DE],
+  ["F186",0x99DF],
+  ["F187",0x99E0],
+  ["F188",0x99E1],
+  ["F189",0x99E2],
+  ["F18A",0x99E3],
+  ["F18B",0x99E4],
+  ["F18C",0x99E5],
+  ["F18D",0x99E6],
+  ["F18E",0x99E7],
+  ["F18F",0x99E8],
+  ["F190",0x99E9],
+  ["F191",0x99EA],
+  ["F192",0x99EB],
+  ["F193",0x99EC],
+  ["F194",0x99ED],
+  ["F195",0x99EE],
+  ["F196",0x99EF],
+  ["F197",0x99F0],
+  ["F198",0x99F1],
+  ["F199",0x99F2],
+  ["F19A",0x99F3],
+  ["F19B",0x99F4],
+  ["F19C",0x99F5],
+  ["F19D",0x99F6],
+  ["F19E",0x99F7],
+  ["F19F",0x99F8],
+  ["F1A0",0x99F9],
+  ["F240",0x99FA],
+  ["F241",0x99FB],
+  ["F242",0x99FC],
+  ["F243",0x99FD],
+  ["F244",0x99FE],
+  ["F245",0x99FF],
+  ["F246",0x9A00],
+  ["F247",0x9A01],
+  ["F248",0x9A02],
+  ["F249",0x9A03],
+  ["F24A",0x9A04],
+  ["F24B",0x9A05],
+  ["F24C",0x9A06],
+  ["F24D",0x9A07],
+  ["F24E",0x9A08],
+  ["F24F",0x9A09],
+  ["F250",0x9A0A],
+  ["F251",0x9A0B],
+  ["F252",0x9A0C],
+  ["F253",0x9A0D],
+  ["F254",0x9A0E],
+  ["F255",0x9A0F],
+  ["F256",0x9A10],
+  ["F257",0x9A11],
+  ["F258",0x9A12],
+  ["F259",0x9A13],
+  ["F25A",0x9A14],
+  ["F25B",0x9A15],
+  ["F25C",0x9A16],
+  ["F25D",0x9A17],
+  ["F25E",0x9A18],
+  ["F25F",0x9A19],
+  ["F260",0x9A1A],
+  ["F261",0x9A1B],
+  ["F262",0x9A1C],
+  ["F263",0x9A1D],
+  ["F264",0x9A1E],
+  ["F265",0x9A1F],
+  ["F266",0x9A20],
+  ["F267",0x9A21],
+  ["F268",0x9A22],
+  ["F269",0x9A23],
+  ["F26A",0x9A24],
+  ["F26B",0x9A25],
+  ["F26C",0x9A26],
+  ["F26D",0x9A27],
+  ["F26E",0x9A28],
+  ["F26F",0x9A29],
+  ["F270",0x9A2A],
+  ["F271",0x9A2B],
+  ["F272",0x9A2C],
+  ["F273",0x9A2D],
+  ["F274",0x9A2E],
+  ["F275",0x9A2F],
+  ["F276",0x9A30],
+  ["F277",0x9A31],
+  ["F278",0x9A32],
+  ["F279",0x9A33],
+  ["F27A",0x9A34],
+  ["F27B",0x9A35],
+  ["F27C",0x9A36],
+  ["F27D",0x9A37],
+  ["F27E",0x9A38],
+  ["F280",0x9A39],
+  ["F281",0x9A3A],
+  ["F282",0x9A3B],
+  ["F283",0x9A3C],
+  ["F284",0x9A3D],
+  ["F285",0x9A3E],
+  ["F286",0x9A3F],
+  ["F287",0x9A40],
+  ["F288",0x9A41],
+  ["F289",0x9A42],
+  ["F28A",0x9A43],
+  ["F28B",0x9A44],
+  ["F28C",0x9A45],
+  ["F28D",0x9A46],
+  ["F28E",0x9A47],
+  ["F28F",0x9A48],
+  ["F290",0x9A49],
+  ["F291",0x9A4A],
+  ["F292",0x9A4B],
+  ["F293",0x9A4C],
+  ["F294",0x9A4D],
+  ["F295",0x9A4E],
+  ["F296",0x9A4F],
+  ["F297",0x9A50],
+  ["F298",0x9A51],
+  ["F299",0x9A52],
+  ["F29A",0x9A53],
+  ["F29B",0x9A54],
+  ["F29C",0x9A55],
+  ["F29D",0x9A56],
+  ["F29E",0x9A57],
+  ["F29F",0x9A58],
+  ["F2A0",0x9A59],
+  ["F340",0x9A5A],
+  ["F341",0x9A5B],
+  ["F342",0x9A5C],
+  ["F343",0x9A5D],
+  ["F344",0x9A5E],
+  ["F345",0x9A5F],
+  ["F346",0x9A60],
+  ["F347",0x9A61],
+  ["F348",0x9A62],
+  ["F349",0x9A63],
+  ["F34A",0x9A64],
+  ["F34B",0x9A65],
+  ["F34C",0x9A66],
+  ["F34D",0x9A67],
+  ["F34E",0x9A68],
+  ["F34F",0x9A69],
+  ["F350",0x9A6A],
+  ["F351",0x9A6B],
+  ["C2ED",0x9A6C],
+  ["D4A6",0x9A6D],
+  ["CDD4",0x9A6E],
+  ["D1B1",0x9A6F],
+  ["B3DB",0x9A70],
+  ["C7FD",0x9A71],
+  ["F352",0x9A72],
+  ["B2B5",0x9A73],
+  ["C2BF",0x9A74],
+  ["E6E0",0x9A75],
+  ["CABB",0x9A76],
+  ["E6E1",0x9A77],
+  ["E6E2",0x9A78],
+  ["BED4",0x9A79],
+  ["E6E3",0x9A7A],
+  ["D7A4",0x9A7B],
+  ["CDD5",0x9A7C],
+  ["E6E5",0x9A7D],
+  ["BCDD",0x9A7E],
+  ["E6E4",0x9A7F],
+  ["E6E6",0x9A80],
+  ["E6E7",0x9A81],
+  ["C2EE",0x9A82],
+  ["F353",0x9A83],
+  ["BDBE",0x9A84],
+  ["E6E8",0x9A85],
+  ["C2E6",0x9A86],
+  ["BAA7",0x9A87],
+  ["E6E9",0x9A88],
+  ["F354",0x9A89],
+  ["E6EA",0x9A8A],
+  ["B3D2",0x9A8B],
+  ["D1E9",0x9A8C],
+  ["F355",0x9A8D],
+  ["F356",0x9A8E],
+  ["BFA5",0x9A8F],
+  ["E6EB",0x9A90],
+  ["C6EF",0x9A91],
+  ["E6EC",0x9A92],
+  ["E6ED",0x9A93],
+  ["F357",0x9A94],
+  ["F358",0x9A95],
+  ["E6EE",0x9A96],
+  ["C6AD",0x9A97],
+  ["E6EF",0x9A98],
+  ["F359",0x9A99],
+  ["C9A7",0x9A9A],
+  ["E6F0",0x9A9B],
+  ["E6F1",0x9A9C],
+  ["E6F2",0x9A9D],
+  ["E5B9",0x9A9E],
+  ["E6F3",0x9A9F],
+  ["E6F4",0x9AA0],
+  ["C2E2",0x9AA1],
+  ["E6F5",0x9AA2],
+  ["E6F6",0x9AA3],
+  ["D6E8",0x9AA4],
+  ["E6F7",0x9AA5],
+  ["F35A",0x9AA6],
+  ["E6F8",0x9AA7],
+  ["B9C7",0x9AA8],
+  ["F35B",0x9AA9],
+  ["F35C",0x9AAA],
+  ["F35D",0x9AAB],
+  ["F35E",0x9AAC],
+  ["F35F",0x9AAD],
+  ["F360",0x9AAE],
+  ["F361",0x9AAF],
+  ["F7BB",0x9AB0],
+  ["F7BA",0x9AB1],
+  ["F362",0x9AB2],
+  ["F363",0x9AB3],
+  ["F364",0x9AB4],
+  ["F365",0x9AB5],
+  ["F7BE",0x9AB6],
+  ["F7BC",0x9AB7],
+  ["BAA1",0x9AB8],
+  ["F366",0x9AB9],
+  ["F7BF",0x9ABA],
+  ["F367",0x9ABB],
+  ["F7C0",0x9ABC],
+  ["F368",0x9ABD],
+  ["F369",0x9ABE],
+  ["F36A",0x9ABF],
+  ["F7C2",0x9AC0],
+  ["F7C1",0x9AC1],
+  ["F7C4",0x9AC2],
+  ["F36B",0x9AC3],
+  ["F36C",0x9AC4],
+  ["F7C3",0x9AC5],
+  ["F36D",0x9AC6],
+  ["F36E",0x9AC7],
+  ["F36F",0x9AC8],
+  ["F370",0x9AC9],
+  ["F371",0x9ACA],
+  ["F7C5",0x9ACB],
+  ["F7C6",0x9ACC],
+  ["F372",0x9ACD],
+  ["F373",0x9ACE],
+  ["F374",0x9ACF],
+  ["F375",0x9AD0],
+  ["F7C7",0x9AD1],
+  ["F376",0x9AD2],
+  ["CBE8",0x9AD3],
+  ["F377",0x9AD4],
+  ["F378",0x9AD5],
+  ["F379",0x9AD6],
+  ["F37A",0x9AD7],
+  ["B8DF",0x9AD8],
+  ["F37B",0x9AD9],
+  ["F37C",0x9ADA],
+  ["F37D",0x9ADB],
+  ["F37E",0x9ADC],
+  ["F380",0x9ADD],
+  ["F381",0x9ADE],
+  ["F7D4",0x9ADF],
+  ["F382",0x9AE0],
+  ["F7D5",0x9AE1],
+  ["F383",0x9AE2],
+  ["F384",0x9AE3],
+  ["F385",0x9AE4],
+  ["F386",0x9AE5],
+  ["F7D6",0x9AE6],
+  ["F387",0x9AE7],
+  ["F388",0x9AE8],
+  ["F389",0x9AE9],
+  ["F38A",0x9AEA],
+  ["F7D8",0x9AEB],
+  ["F38B",0x9AEC],
+  ["F7DA",0x9AED],
+  ["F38C",0x9AEE],
+  ["F7D7",0x9AEF],
+  ["F38D",0x9AF0],
+  ["F38E",0x9AF1],
+  ["F38F",0x9AF2],
+  ["F390",0x9AF3],
+  ["F391",0x9AF4],
+  ["F392",0x9AF5],
+  ["F393",0x9AF6],
+  ["F394",0x9AF7],
+  ["F395",0x9AF8],
+  ["F7DB",0x9AF9],
+  ["F396",0x9AFA],
+  ["F7D9",0x9AFB],
+  ["F397",0x9AFC],
+  ["F398",0x9AFD],
+  ["F399",0x9AFE],
+  ["F39A",0x9AFF],
+  ["F39B",0x9B00],
+  ["F39C",0x9B01],
+  ["F39D",0x9B02],
+  ["D7D7",0x9B03],
+  ["F39E",0x9B04],
+  ["F39F",0x9B05],
+  ["F3A0",0x9B06],
+  ["F440",0x9B07],
+  ["F7DC",0x9B08],
+  ["F441",0x9B09],
+  ["F442",0x9B0A],
+  ["F443",0x9B0B],
+  ["F444",0x9B0C],
+  ["F445",0x9B0D],
+  ["F446",0x9B0E],
+  ["F7DD",0x9B0F],
+  ["F447",0x9B10],
+  ["F448",0x9B11],
+  ["F449",0x9B12],
+  ["F7DE",0x9B13],
+  ["F44A",0x9B14],
+  ["F44B",0x9B15],
+  ["F44C",0x9B16],
+  ["F44D",0x9B17],
+  ["F44E",0x9B18],
+  ["F44F",0x9B19],
+  ["F450",0x9B1A],
+  ["F451",0x9B1B],
+  ["F452",0x9B1C],
+  ["F453",0x9B1D],
+  ["F454",0x9B1E],
+  ["F7DF",0x9B1F],
+  ["F455",0x9B20],
+  ["F456",0x9B21],
+  ["F457",0x9B22],
+  ["F7E0",0x9B23],
+  ["F458",0x9B24],
+  ["F459",0x9B25],
+  ["F45A",0x9B26],
+  ["F45B",0x9B27],
+  ["F45C",0x9B28],
+  ["F45D",0x9B29],
+  ["F45E",0x9B2A],
+  ["F45F",0x9B2B],
+  ["F460",0x9B2C],
+  ["F461",0x9B2D],
+  ["F462",0x9B2E],
+  ["DBCB",0x9B2F],
+  ["F463",0x9B30],
+  ["F464",0x9B31],
+  ["D8AA",0x9B32],
+  ["F465",0x9B33],
+  ["F466",0x9B34],
+  ["F467",0x9B35],
+  ["F468",0x9B36],
+  ["F469",0x9B37],
+  ["F46A",0x9B38],
+  ["F46B",0x9B39],
+  ["F46C",0x9B3A],
+  ["E5F7",0x9B3B],
+  ["B9ED",0x9B3C],
+  ["F46D",0x9B3D],
+  ["F46E",0x9B3E],
+  ["F46F",0x9B3F],
+  ["F470",0x9B40],
+  ["BFFD",0x9B41],
+  ["BBEA",0x9B42],
+  ["F7C9",0x9B43],
+  ["C6C7",0x9B44],
+  ["F7C8",0x9B45],
+  ["F471",0x9B46],
+  ["F7CA",0x9B47],
+  ["F7CC",0x9B48],
+  ["F7CB",0x9B49],
+  ["F472",0x9B4A],
+  ["F473",0x9B4B],
+  ["F474",0x9B4C],
+  ["F7CD",0x9B4D],
+  ["F475",0x9B4E],
+  ["CEBA",0x9B4F],
+  ["F476",0x9B50],
+  ["F7CE",0x9B51],
+  ["F477",0x9B52],
+  ["F478",0x9B53],
+  ["C4A7",0x9B54],
+  ["F479",0x9B55],
+  ["F47A",0x9B56],
+  ["F47B",0x9B57],
+  ["F47C",0x9B58],
+  ["F47D",0x9B59],
+  ["F47E",0x9B5A],
+  ["F480",0x9B5B],
+  ["F481",0x9B5C],
+  ["F482",0x9B5D],
+  ["F483",0x9B5E],
+  ["F484",0x9B5F],
+  ["F485",0x9B60],
+  ["F486",0x9B61],
+  ["F487",0x9B62],
+  ["F488",0x9B63],
+  ["F489",0x9B64],
+  ["F48A",0x9B65],
+  ["F48B",0x9B66],
+  ["F48C",0x9B67],
+  ["F48D",0x9B68],
+  ["F48E",0x9B69],
+  ["F48F",0x9B6A],
+  ["F490",0x9B6B],
+  ["F491",0x9B6C],
+  ["F492",0x9B6D],
+  ["F493",0x9B6E],
+  ["F494",0x9B6F],
+  ["F495",0x9B70],
+  ["F496",0x9B71],
+  ["F497",0x9B72],
+  ["F498",0x9B73],
+  ["F499",0x9B74],
+  ["F49A",0x9B75],
+  ["F49B",0x9B76],
+  ["F49C",0x9B77],
+  ["F49D",0x9B78],
+  ["F49E",0x9B79],
+  ["F49F",0x9B7A],
+  ["F4A0",0x9B7B],
+  ["F540",0x9B7C],
+  ["F541",0x9B7D],
+  ["F542",0x9B7E],
+  ["F543",0x9B7F],
+  ["F544",0x9B80],
+  ["F545",0x9B81],
+  ["F546",0x9B82],
+  ["F547",0x9B83],
+  ["F548",0x9B84],
+  ["F549",0x9B85],
+  ["F54A",0x9B86],
+  ["F54B",0x9B87],
+  ["F54C",0x9B88],
+  ["F54D",0x9B89],
+  ["F54E",0x9B8A],
+  ["F54F",0x9B8B],
+  ["F550",0x9B8C],
+  ["F551",0x9B8D],
+  ["F552",0x9B8E],
+  ["F553",0x9B8F],
+  ["F554",0x9B90],
+  ["F555",0x9B91],
+  ["F556",0x9B92],
+  ["F557",0x9B93],
+  ["F558",0x9B94],
+  ["F559",0x9B95],
+  ["F55A",0x9B96],
+  ["F55B",0x9B97],
+  ["F55C",0x9B98],
+  ["F55D",0x9B99],
+  ["F55E",0x9B9A],
+  ["F55F",0x9B9B],
+  ["F560",0x9B9C],
+  ["F561",0x9B9D],
+  ["F562",0x9B9E],
+  ["F563",0x9B9F],
+  ["F564",0x9BA0],
+  ["F565",0x9BA1],
+  ["F566",0x9BA2],
+  ["F567",0x9BA3],
+  ["F568",0x9BA4],
+  ["F569",0x9BA5],
+  ["F56A",0x9BA6],
+  ["F56B",0x9BA7],
+  ["F56C",0x9BA8],
+  ["F56D",0x9BA9],
+  ["F56E",0x9BAA],
+  ["F56F",0x9BAB],
+  ["F570",0x9BAC],
+  ["F571",0x9BAD],
+  ["F572",0x9BAE],
+  ["F573",0x9BAF],
+  ["F574",0x9BB0],
+  ["F575",0x9BB1],
+  ["F576",0x9BB2],
+  ["F577",0x9BB3],
+  ["F578",0x9BB4],
+  ["F579",0x9BB5],
+  ["F57A",0x9BB6],
+  ["F57B",0x9BB7],
+  ["F57C",0x9BB8],
+  ["F57D",0x9BB9],
+  ["F57E",0x9BBA],
+  ["F580",0x9BBB],
+  ["F581",0x9BBC],
+  ["F582",0x9BBD],
+  ["F583",0x9BBE],
+  ["F584",0x9BBF],
+  ["F585",0x9BC0],
+  ["F586",0x9BC1],
+  ["F587",0x9BC2],
+  ["F588",0x9BC3],
+  ["F589",0x9BC4],
+  ["F58A",0x9BC5],
+  ["F58B",0x9BC6],
+  ["F58C",0x9BC7],
+  ["F58D",0x9BC8],
+  ["F58E",0x9BC9],
+  ["F58F",0x9BCA],
+  ["F590",0x9BCB],
+  ["F591",0x9BCC],
+  ["F592",0x9BCD],
+  ["F593",0x9BCE],
+  ["F594",0x9BCF],
+  ["F595",0x9BD0],
+  ["F596",0x9BD1],
+  ["F597",0x9BD2],
+  ["F598",0x9BD3],
+  ["F599",0x9BD4],
+  ["F59A",0x9BD5],
+  ["F59B",0x9BD6],
+  ["F59C",0x9BD7],
+  ["F59D",0x9BD8],
+  ["F59E",0x9BD9],
+  ["F59F",0x9BDA],
+  ["F5A0",0x9BDB],
+  ["F640",0x9BDC],
+  ["F641",0x9BDD],
+  ["F642",0x9BDE],
+  ["F643",0x9BDF],
+  ["F644",0x9BE0],
+  ["F645",0x9BE1],
+  ["F646",0x9BE2],
+  ["F647",0x9BE3],
+  ["F648",0x9BE4],
+  ["F649",0x9BE5],
+  ["F64A",0x9BE6],
+  ["F64B",0x9BE7],
+  ["F64C",0x9BE8],
+  ["F64D",0x9BE9],
+  ["F64E",0x9BEA],
+  ["F64F",0x9BEB],
+  ["F650",0x9BEC],
+  ["F651",0x9BED],
+  ["F652",0x9BEE],
+  ["F653",0x9BEF],
+  ["F654",0x9BF0],
+  ["F655",0x9BF1],
+  ["F656",0x9BF2],
+  ["F657",0x9BF3],
+  ["F658",0x9BF4],
+  ["F659",0x9BF5],
+  ["F65A",0x9BF6],
+  ["F65B",0x9BF7],
+  ["F65C",0x9BF8],
+  ["F65D",0x9BF9],
+  ["F65E",0x9BFA],
+  ["F65F",0x9BFB],
+  ["F660",0x9BFC],
+  ["F661",0x9BFD],
+  ["F662",0x9BFE],
+  ["F663",0x9BFF],
+  ["F664",0x9C00],
+  ["F665",0x9C01],
+  ["F666",0x9C02],
+  ["F667",0x9C03],
+  ["F668",0x9C04],
+  ["F669",0x9C05],
+  ["F66A",0x9C06],
+  ["F66B",0x9C07],
+  ["F66C",0x9C08],
+  ["F66D",0x9C09],
+  ["F66E",0x9C0A],
+  ["F66F",0x9C0B],
+  ["F670",0x9C0C],
+  ["F671",0x9C0D],
+  ["F672",0x9C0E],
+  ["F673",0x9C0F],
+  ["F674",0x9C10],
+  ["F675",0x9C11],
+  ["F676",0x9C12],
+  ["F677",0x9C13],
+  ["F678",0x9C14],
+  ["F679",0x9C15],
+  ["F67A",0x9C16],
+  ["F67B",0x9C17],
+  ["F67C",0x9C18],
+  ["F67D",0x9C19],
+  ["F67E",0x9C1A],
+  ["F680",0x9C1B],
+  ["F681",0x9C1C],
+  ["F682",0x9C1D],
+  ["F683",0x9C1E],
+  ["F684",0x9C1F],
+  ["F685",0x9C20],
+  ["F686",0x9C21],
+  ["F687",0x9C22],
+  ["F688",0x9C23],
+  ["F689",0x9C24],
+  ["F68A",0x9C25],
+  ["F68B",0x9C26],
+  ["F68C",0x9C27],
+  ["F68D",0x9C28],
+  ["F68E",0x9C29],
+  ["F68F",0x9C2A],
+  ["F690",0x9C2B],
+  ["F691",0x9C2C],
+  ["F692",0x9C2D],
+  ["F693",0x9C2E],
+  ["F694",0x9C2F],
+  ["F695",0x9C30],
+  ["F696",0x9C31],
+  ["F697",0x9C32],
+  ["F698",0x9C33],
+  ["F699",0x9C34],
+  ["F69A",0x9C35],
+  ["F69B",0x9C36],
+  ["F69C",0x9C37],
+  ["F69D",0x9C38],
+  ["F69E",0x9C39],
+  ["F69F",0x9C3A],
+  ["F6A0",0x9C3B],
+  ["F740",0x9C3C],
+  ["F741",0x9C3D],
+  ["F742",0x9C3E],
+  ["F743",0x9C3F],
+  ["F744",0x9C40],
+  ["F745",0x9C41],
+  ["F746",0x9C42],
+  ["F747",0x9C43],
+  ["F748",0x9C44],
+  ["F749",0x9C45],
+  ["F74A",0x9C46],
+  ["F74B",0x9C47],
+  ["F74C",0x9C48],
+  ["F74D",0x9C49],
+  ["F74E",0x9C4A],
+  ["F74F",0x9C4B],
+  ["F750",0x9C4C],
+  ["F751",0x9C4D],
+  ["F752",0x9C4E],
+  ["F753",0x9C4F],
+  ["F754",0x9C50],
+  ["F755",0x9C51],
+  ["F756",0x9C52],
+  ["F757",0x9C53],
+  ["F758",0x9C54],
+  ["F759",0x9C55],
+  ["F75A",0x9C56],
+  ["F75B",0x9C57],
+  ["F75C",0x9C58],
+  ["F75D",0x9C59],
+  ["F75E",0x9C5A],
+  ["F75F",0x9C5B],
+  ["F760",0x9C5C],
+  ["F761",0x9C5D],
+  ["F762",0x9C5E],
+  ["F763",0x9C5F],
+  ["F764",0x9C60],
+  ["F765",0x9C61],
+  ["F766",0x9C62],
+  ["F767",0x9C63],
+  ["F768",0x9C64],
+  ["F769",0x9C65],
+  ["F76A",0x9C66],
+  ["F76B",0x9C67],
+  ["F76C",0x9C68],
+  ["F76D",0x9C69],
+  ["F76E",0x9C6A],
+  ["F76F",0x9C6B],
+  ["F770",0x9C6C],
+  ["F771",0x9C6D],
+  ["F772",0x9C6E],
+  ["F773",0x9C6F],
+  ["F774",0x9C70],
+  ["F775",0x9C71],
+  ["F776",0x9C72],
+  ["F777",0x9C73],
+  ["F778",0x9C74],
+  ["F779",0x9C75],
+  ["F77A",0x9C76],
+  ["F77B",0x9C77],
+  ["F77C",0x9C78],
+  ["F77D",0x9C79],
+  ["F77E",0x9C7A],
+  ["F780",0x9C7B],
+  ["D3E3",0x9C7C],
+  ["F781",0x9C7D],
+  ["F782",0x9C7E],
+  ["F6CF",0x9C7F],
+  ["F783",0x9C80],
+  ["C2B3",0x9C81],
+  ["F6D0",0x9C82],
+  ["F784",0x9C83],
+  ["F785",0x9C84],
+  ["F6D1",0x9C85],
+  ["F6D2",0x9C86],
+  ["F6D3",0x9C87],
+  ["F6D4",0x9C88],
+  ["F786",0x9C89],
+  ["F787",0x9C8A],
+  ["F6D6",0x9C8B],
+  ["F788",0x9C8C],
+  ["B1AB",0x9C8D],
+  ["F6D7",0x9C8E],
+  ["F789",0x9C8F],
+  ["F6D8",0x9C90],
+  ["F6D9",0x9C91],
+  ["F6DA",0x9C92],
+  ["F78A",0x9C93],
+  ["F6DB",0x9C94],
+  ["F6DC",0x9C95],
+  ["F78B",0x9C96],
+  ["F78C",0x9C97],
+  ["F78D",0x9C98],
+  ["F78E",0x9C99],
+  ["F6DD",0x9C9A],
+  ["F6DE",0x9C9B],
+  ["CFCA",0x9C9C],
+  ["F78F",0x9C9D],
+  ["F6DF",0x9C9E],
+  ["F6E0",0x9C9F],
+  ["F6E1",0x9CA0],
+  ["F6E2",0x9CA1],
+  ["F6E3",0x9CA2],
+  ["F6E4",0x9CA3],
+  ["C0F0",0x9CA4],
+  ["F6E5",0x9CA5],
+  ["F6E6",0x9CA6],
+  ["F6E7",0x9CA7],
+  ["F6E8",0x9CA8],
+  ["F6E9",0x9CA9],
+  ["F790",0x9CAA],
+  ["F6EA",0x9CAB],
+  ["F791",0x9CAC],
+  ["F6EB",0x9CAD],
+  ["F6EC",0x9CAE],
+  ["F792",0x9CAF],
+  ["F6ED",0x9CB0],
+  ["F6EE",0x9CB1],
+  ["F6EF",0x9CB2],
+  ["F6F0",0x9CB3],
+  ["F6F1",0x9CB4],
+  ["F6F2",0x9CB5],
+  ["F6F3",0x9CB6],
+  ["F6F4",0x9CB7],
+  ["BEA8",0x9CB8],
+  ["F793",0x9CB9],
+  ["F6F5",0x9CBA],
+  ["F6F6",0x9CBB],
+  ["F6F7",0x9CBC],
+  ["F6F8",0x9CBD],
+  ["F794",0x9CBE],
+  ["F795",0x9CBF],
+  ["F796",0x9CC0],
+  ["F797",0x9CC1],
+  ["F798",0x9CC2],
+  ["C8FA",0x9CC3],
+  ["F6F9",0x9CC4],
+  ["F6FA",0x9CC5],
+  ["F6FB",0x9CC6],
+  ["F6FC",0x9CC7],
+  ["F799",0x9CC8],
+  ["F79A",0x9CC9],
+  ["F6FD",0x9CCA],
+  ["F6FE",0x9CCB],
+  ["F7A1",0x9CCC],
+  ["F7A2",0x9CCD],
+  ["F7A3",0x9CCE],
+  ["F7A4",0x9CCF],
+  ["F7A5",0x9CD0],
+  ["F79B",0x9CD1],
+  ["F79C",0x9CD2],
+  ["F7A6",0x9CD3],
+  ["F7A7",0x9CD4],
+  ["F7A8",0x9CD5],
+  ["B1EE",0x9CD6],
+  ["F7A9",0x9CD7],
+  ["F7AA",0x9CD8],
+  ["F7AB",0x9CD9],
+  ["F79D",0x9CDA],
+  ["F79E",0x9CDB],
+  ["F7AC",0x9CDC],
+  ["F7AD",0x9CDD],
+  ["C1DB",0x9CDE],
+  ["F7AE",0x9CDF],
+  ["F79F",0x9CE0],
+  ["F7A0",0x9CE1],
+  ["F7AF",0x9CE2],
+  ["F840",0x9CE3],
+  ["F841",0x9CE4],
+  ["F842",0x9CE5],
+  ["F843",0x9CE6],
+  ["F844",0x9CE7],
+  ["F845",0x9CE8],
+  ["F846",0x9CE9],
+  ["F847",0x9CEA],
+  ["F848",0x9CEB],
+  ["F849",0x9CEC],
+  ["F84A",0x9CED],
+  ["F84B",0x9CEE],
+  ["F84C",0x9CEF],
+  ["F84D",0x9CF0],
+  ["F84E",0x9CF1],
+  ["F84F",0x9CF2],
+  ["F850",0x9CF3],
+  ["F851",0x9CF4],
+  ["F852",0x9CF5],
+  ["F853",0x9CF6],
+  ["F854",0x9CF7],
+  ["F855",0x9CF8],
+  ["F856",0x9CF9],
+  ["F857",0x9CFA],
+  ["F858",0x9CFB],
+  ["F859",0x9CFC],
+  ["F85A",0x9CFD],
+  ["F85B",0x9CFE],
+  ["F85C",0x9CFF],
+  ["F85D",0x9D00],
+  ["F85E",0x9D01],
+  ["F85F",0x9D02],
+  ["F860",0x9D03],
+  ["F861",0x9D04],
+  ["F862",0x9D05],
+  ["F863",0x9D06],
+  ["F864",0x9D07],
+  ["F865",0x9D08],
+  ["F866",0x9D09],
+  ["F867",0x9D0A],
+  ["F868",0x9D0B],
+  ["F869",0x9D0C],
+  ["F86A",0x9D0D],
+  ["F86B",0x9D0E],
+  ["F86C",0x9D0F],
+  ["F86D",0x9D10],
+  ["F86E",0x9D11],
+  ["F86F",0x9D12],
+  ["F870",0x9D13],
+  ["F871",0x9D14],
+  ["F872",0x9D15],
+  ["F873",0x9D16],
+  ["F874",0x9D17],
+  ["F875",0x9D18],
+  ["F876",0x9D19],
+  ["F877",0x9D1A],
+  ["F878",0x9D1B],
+  ["F879",0x9D1C],
+  ["F87A",0x9D1D],
+  ["F87B",0x9D1E],
+  ["F87C",0x9D1F],
+  ["F87D",0x9D20],
+  ["F87E",0x9D21],
+  ["F880",0x9D22],
+  ["F881",0x9D23],
+  ["F882",0x9D24],
+  ["F883",0x9D25],
+  ["F884",0x9D26],
+  ["F885",0x9D27],
+  ["F886",0x9D28],
+  ["F887",0x9D29],
+  ["F888",0x9D2A],
+  ["F889",0x9D2B],
+  ["F88A",0x9D2C],
+  ["F88B",0x9D2D],
+  ["F88C",0x9D2E],
+  ["F88D",0x9D2F],
+  ["F88E",0x9D30],
+  ["F88F",0x9D31],
+  ["F890",0x9D32],
+  ["F891",0x9D33],
+  ["F892",0x9D34],
+  ["F893",0x9D35],
+  ["F894",0x9D36],
+  ["F895",0x9D37],
+  ["F896",0x9D38],
+  ["F897",0x9D39],
+  ["F898",0x9D3A],
+  ["F899",0x9D3B],
+  ["F89A",0x9D3C],
+  ["F89B",0x9D3D],
+  ["F89C",0x9D3E],
+  ["F89D",0x9D3F],
+  ["F89E",0x9D40],
+  ["F89F",0x9D41],
+  ["F8A0",0x9D42],
+  ["F940",0x9D43],
+  ["F941",0x9D44],
+  ["F942",0x9D45],
+  ["F943",0x9D46],
+  ["F944",0x9D47],
+  ["F945",0x9D48],
+  ["F946",0x9D49],
+  ["F947",0x9D4A],
+  ["F948",0x9D4B],
+  ["F949",0x9D4C],
+  ["F94A",0x9D4D],
+  ["F94B",0x9D4E],
+  ["F94C",0x9D4F],
+  ["F94D",0x9D50],
+  ["F94E",0x9D51],
+  ["F94F",0x9D52],
+  ["F950",0x9D53],
+  ["F951",0x9D54],
+  ["F952",0x9D55],
+  ["F953",0x9D56],
+  ["F954",0x9D57],
+  ["F955",0x9D58],
+  ["F956",0x9D59],
+  ["F957",0x9D5A],
+  ["F958",0x9D5B],
+  ["F959",0x9D5C],
+  ["F95A",0x9D5D],
+  ["F95B",0x9D5E],
+  ["F95C",0x9D5F],
+  ["F95D",0x9D60],
+  ["F95E",0x9D61],
+  ["F95F",0x9D62],
+  ["F960",0x9D63],
+  ["F961",0x9D64],
+  ["F962",0x9D65],
+  ["F963",0x9D66],
+  ["F964",0x9D67],
+  ["F965",0x9D68],
+  ["F966",0x9D69],
+  ["F967",0x9D6A],
+  ["F968",0x9D6B],
+  ["F969",0x9D6C],
+  ["F96A",0x9D6D],
+  ["F96B",0x9D6E],
+  ["F96C",0x9D6F],
+  ["F96D",0x9D70],
+  ["F96E",0x9D71],
+  ["F96F",0x9D72],
+  ["F970",0x9D73],
+  ["F971",0x9D74],
+  ["F972",0x9D75],
+  ["F973",0x9D76],
+  ["F974",0x9D77],
+  ["F975",0x9D78],
+  ["F976",0x9D79],
+  ["F977",0x9D7A],
+  ["F978",0x9D7B],
+  ["F979",0x9D7C],
+  ["F97A",0x9D7D],
+  ["F97B",0x9D7E],
+  ["F97C",0x9D7F],
+  ["F97D",0x9D80],
+  ["F97E",0x9D81],
+  ["F980",0x9D82],
+  ["F981",0x9D83],
+  ["F982",0x9D84],
+  ["F983",0x9D85],
+  ["F984",0x9D86],
+  ["F985",0x9D87],
+  ["F986",0x9D88],
+  ["F987",0x9D89],
+  ["F988",0x9D8A],
+  ["F989",0x9D8B],
+  ["F98A",0x9D8C],
+  ["F98B",0x9D8D],
+  ["F98C",0x9D8E],
+  ["F98D",0x9D8F],
+  ["F98E",0x9D90],
+  ["F98F",0x9D91],
+  ["F990",0x9D92],
+  ["F991",0x9D93],
+  ["F992",0x9D94],
+  ["F993",0x9D95],
+  ["F994",0x9D96],
+  ["F995",0x9D97],
+  ["F996",0x9D98],
+  ["F997",0x9D99],
+  ["F998",0x9D9A],
+  ["F999",0x9D9B],
+  ["F99A",0x9D9C],
+  ["F99B",0x9D9D],
+  ["F99C",0x9D9E],
+  ["F99D",0x9D9F],
+  ["F99E",0x9DA0],
+  ["F99F",0x9DA1],
+  ["F9A0",0x9DA2],
+  ["FA40",0x9DA3],
+  ["FA41",0x9DA4],
+  ["FA42",0x9DA5],
+  ["FA43",0x9DA6],
+  ["FA44",0x9DA7],
+  ["FA45",0x9DA8],
+  ["FA46",0x9DA9],
+  ["FA47",0x9DAA],
+  ["FA48",0x9DAB],
+  ["FA49",0x9DAC],
+  ["FA4A",0x9DAD],
+  ["FA4B",0x9DAE],
+  ["FA4C",0x9DAF],
+  ["FA4D",0x9DB0],
+  ["FA4E",0x9DB1],
+  ["FA4F",0x9DB2],
+  ["FA50",0x9DB3],
+  ["FA51",0x9DB4],
+  ["FA52",0x9DB5],
+  ["FA53",0x9DB6],
+  ["FA54",0x9DB7],
+  ["FA55",0x9DB8],
+  ["FA56",0x9DB9],
+  ["FA57",0x9DBA],
+  ["FA58",0x9DBB],
+  ["FA59",0x9DBC],
+  ["FA5A",0x9DBD],
+  ["FA5B",0x9DBE],
+  ["FA5C",0x9DBF],
+  ["FA5D",0x9DC0],
+  ["FA5E",0x9DC1],
+  ["FA5F",0x9DC2],
+  ["FA60",0x9DC3],
+  ["FA61",0x9DC4],
+  ["FA62",0x9DC5],
+  ["FA63",0x9DC6],
+  ["FA64",0x9DC7],
+  ["FA65",0x9DC8],
+  ["FA66",0x9DC9],
+  ["FA67",0x9DCA],
+  ["FA68",0x9DCB],
+  ["FA69",0x9DCC],
+  ["FA6A",0x9DCD],
+  ["FA6B",0x9DCE],
+  ["FA6C",0x9DCF],
+  ["FA6D",0x9DD0],
+  ["FA6E",0x9DD1],
+  ["FA6F",0x9DD2],
+  ["FA70",0x9DD3],
+  ["FA71",0x9DD4],
+  ["FA72",0x9DD5],
+  ["FA73",0x9DD6],
+  ["FA74",0x9DD7],
+  ["FA75",0x9DD8],
+  ["FA76",0x9DD9],
+  ["FA77",0x9DDA],
+  ["FA78",0x9DDB],
+  ["FA79",0x9DDC],
+  ["FA7A",0x9DDD],
+  ["FA7B",0x9DDE],
+  ["FA7C",0x9DDF],
+  ["FA7D",0x9DE0],
+  ["FA7E",0x9DE1],
+  ["FA80",0x9DE2],
+  ["FA81",0x9DE3],
+  ["FA82",0x9DE4],
+  ["FA83",0x9DE5],
+  ["FA84",0x9DE6],
+  ["FA85",0x9DE7],
+  ["FA86",0x9DE8],
+  ["FA87",0x9DE9],
+  ["FA88",0x9DEA],
+  ["FA89",0x9DEB],
+  ["FA8A",0x9DEC],
+  ["FA8B",0x9DED],
+  ["FA8C",0x9DEE],
+  ["FA8D",0x9DEF],
+  ["FA8E",0x9DF0],
+  ["FA8F",0x9DF1],
+  ["FA90",0x9DF2],
+  ["FA91",0x9DF3],
+  ["FA92",0x9DF4],
+  ["FA93",0x9DF5],
+  ["FA94",0x9DF6],
+  ["FA95",0x9DF7],
+  ["FA96",0x9DF8],
+  ["FA97",0x9DF9],
+  ["FA98",0x9DFA],
+  ["FA99",0x9DFB],
+  ["FA9A",0x9DFC],
+  ["FA9B",0x9DFD],
+  ["FA9C",0x9DFE],
+  ["FA9D",0x9DFF],
+  ["FA9E",0x9E00],
+  ["FA9F",0x9E01],
+  ["FAA0",0x9E02],
+  ["FB40",0x9E03],
+  ["FB41",0x9E04],
+  ["FB42",0x9E05],
+  ["FB43",0x9E06],
+  ["FB44",0x9E07],
+  ["FB45",0x9E08],
+  ["FB46",0x9E09],
+  ["FB47",0x9E0A],
+  ["FB48",0x9E0B],
+  ["FB49",0x9E0C],
+  ["FB4A",0x9E0D],
+  ["FB4B",0x9E0E],
+  ["FB4C",0x9E0F],
+  ["FB4D",0x9E10],
+  ["FB4E",0x9E11],
+  ["FB4F",0x9E12],
+  ["FB50",0x9E13],
+  ["FB51",0x9E14],
+  ["FB52",0x9E15],
+  ["FB53",0x9E16],
+  ["FB54",0x9E17],
+  ["FB55",0x9E18],
+  ["FB56",0x9E19],
+  ["FB57",0x9E1A],
+  ["FB58",0x9E1B],
+  ["FB59",0x9E1C],
+  ["FB5A",0x9E1D],
+  ["FB5B",0x9E1E],
+  ["C4F1",0x9E1F],
+  ["F0AF",0x9E20],
+  ["BCA6",0x9E21],
+  ["F0B0",0x9E22],
+  ["C3F9",0x9E23],
+  ["FB5C",0x9E24],
+  ["C5B8",0x9E25],
+  ["D1BB",0x9E26],
+  ["FB5D",0x9E27],
+  ["F0B1",0x9E28],
+  ["F0B2",0x9E29],
+  ["F0B3",0x9E2A],
+  ["F0B4",0x9E2B],
+  ["F0B5",0x9E2C],
+  ["D1BC",0x9E2D],
+  ["FB5E",0x9E2E],
+  ["D1EC",0x9E2F],
+  ["FB5F",0x9E30],
+  ["F0B7",0x9E31],
+  ["F0B6",0x9E32],
+  ["D4A7",0x9E33],
+  ["FB60",0x9E34],
+  ["CDD2",0x9E35],
+  ["F0B8",0x9E36],
+  ["F0BA",0x9E37],
+  ["F0B9",0x9E38],
+  ["F0BB",0x9E39],
+  ["F0BC",0x9E3A],
+  ["FB61",0x9E3B],
+  ["FB62",0x9E3C],
+  ["B8EB",0x9E3D],
+  ["F0BD",0x9E3E],
+  ["BAE8",0x9E3F],
+  ["FB63",0x9E40],
+  ["F0BE",0x9E41],
+  ["F0BF",0x9E42],
+  ["BEE9",0x9E43],
+  ["F0C0",0x9E44],
+  ["B6EC",0x9E45],
+  ["F0C1",0x9E46],
+  ["F0C2",0x9E47],
+  ["F0C3",0x9E48],
+  ["F0C4",0x9E49],
+  ["C8B5",0x9E4A],
+  ["F0C5",0x9E4B],
+  ["F0C6",0x9E4C],
+  ["FB64",0x9E4D],
+  ["F0C7",0x9E4E],
+  ["C5F4",0x9E4F],
+  ["FB65",0x9E50],
+  ["F0C8",0x9E51],
+  ["FB66",0x9E52],
+  ["FB67",0x9E53],
+  ["FB68",0x9E54],
+  ["F0C9",0x9E55],
+  ["FB69",0x9E56],
+  ["F0CA",0x9E57],
+  ["F7BD",0x9E58],
+  ["FB6A",0x9E59],
+  ["F0CB",0x9E5A],
+  ["F0CC",0x9E5B],
+  ["F0CD",0x9E5C],
+  ["FB6B",0x9E5D],
+  ["F0CE",0x9E5E],
+  ["FB6C",0x9E5F],
+  ["FB6D",0x9E60],
+  ["FB6E",0x9E61],
+  ["FB6F",0x9E62],
+  ["F0CF",0x9E63],
+  ["BAD7",0x9E64],
+  ["FB70",0x9E65],
+  ["F0D0",0x9E66],
+  ["F0D1",0x9E67],
+  ["F0D2",0x9E68],
+  ["F0D3",0x9E69],
+  ["F0D4",0x9E6A],
+  ["F0D5",0x9E6B],
+  ["F0D6",0x9E6C],
+  ["F0D8",0x9E6D],
+  ["FB71",0x9E6E],
+  ["FB72",0x9E6F],
+  ["D3A5",0x9E70],
+  ["F0D7",0x9E71],
+  ["FB73",0x9E72],
+  ["F0D9",0x9E73],
+  ["FB74",0x9E74],
+  ["FB75",0x9E75],
+  ["FB76",0x9E76],
+  ["FB77",0x9E77],
+  ["FB78",0x9E78],
+  ["FB79",0x9E79],
+  ["FB7A",0x9E7A],
+  ["FB7B",0x9E7B],
+  ["FB7C",0x9E7C],
+  ["FB7D",0x9E7D],
+  ["F5BA",0x9E7E],
+  ["C2B9",0x9E7F],
+  ["FB7E",0x9E80],
+  ["FB80",0x9E81],
+  ["F7E4",0x9E82],
+  ["FB81",0x9E83],
+  ["FB82",0x9E84],
+  ["FB83",0x9E85],
+  ["FB84",0x9E86],
+  ["F7E5",0x9E87],
+  ["F7E6",0x9E88],
+  ["FB85",0x9E89],
+  ["FB86",0x9E8A],
+  ["F7E7",0x9E8B],
+  ["FB87",0x9E8C],
+  ["FB88",0x9E8D],
+  ["FB89",0x9E8E],
+  ["FB8A",0x9E8F],
+  ["FB8B",0x9E90],
+  ["FB8C",0x9E91],
+  ["F7E8",0x9E92],
+  ["C2B4",0x9E93],
+  ["FB8D",0x9E94],
+  ["FB8E",0x9E95],
+  ["FB8F",0x9E96],
+  ["FB90",0x9E97],
+  ["FB91",0x9E98],
+  ["FB92",0x9E99],
+  ["FB93",0x9E9A],
+  ["FB94",0x9E9B],
+  ["FB95",0x9E9C],
+  ["F7EA",0x9E9D],
+  ["FB96",0x9E9E],
+  ["F7EB",0x9E9F],
+  ["FB97",0x9EA0],
+  ["FB98",0x9EA1],
+  ["FB99",0x9EA2],
+  ["FB9A",0x9EA3],
+  ["FB9B",0x9EA4],
+  ["FB9C",0x9EA5],
+  ["C2F3",0x9EA6],
+  ["FB9D",0x9EA7],
+  ["FB9E",0x9EA8],
+  ["FB9F",0x9EA9],
+  ["FBA0",0x9EAA],
+  ["FC40",0x9EAB],
+  ["FC41",0x9EAC],
+  ["FC42",0x9EAD],
+  ["FC43",0x9EAE],
+  ["FC44",0x9EAF],
+  ["FC45",0x9EB0],
+  ["FC46",0x9EB1],
+  ["FC47",0x9EB2],
+  ["FC48",0x9EB3],
+  ["F4F0",0x9EB4],
+  ["FC49",0x9EB5],
+  ["FC4A",0x9EB6],
+  ["FC4B",0x9EB7],
+  ["F4EF",0x9EB8],
+  ["FC4C",0x9EB9],
+  ["FC4D",0x9EBA],
+  ["C2E9",0x9EBB],
+  ["FC4E",0x9EBC],
+  ["F7E1",0x9EBD],
+  ["F7E2",0x9EBE],
+  ["FC4F",0x9EBF],
+  ["FC50",0x9EC0],
+  ["FC51",0x9EC1],
+  ["FC52",0x9EC2],
+  ["FC53",0x9EC3],
+  ["BBC6",0x9EC4],
+  ["FC54",0x9EC5],
+  ["FC55",0x9EC6],
+  ["FC56",0x9EC7],
+  ["FC57",0x9EC8],
+  ["D9E4",0x9EC9],
+  ["FC58",0x9ECA],
+  ["FC59",0x9ECB],
+  ["FC5A",0x9ECC],
+  ["CAF2",0x9ECD],
+  ["C0E8",0x9ECE],
+  ["F0A4",0x9ECF],
+  ["FC5B",0x9ED0],
+  ["BADA",0x9ED1],
+  ["FC5C",0x9ED2],
+  ["FC5D",0x9ED3],
+  ["C7AD",0x9ED4],
+  ["FC5E",0x9ED5],
+  ["FC5F",0x9ED6],
+  ["FC60",0x9ED7],
+  ["C4AC",0x9ED8],
+  ["FC61",0x9ED9],
+  ["FC62",0x9EDA],
+  ["F7EC",0x9EDB],
+  ["F7ED",0x9EDC],
+  ["F7EE",0x9EDD],
+  ["FC63",0x9EDE],
+  ["F7F0",0x9EDF],
+  ["F7EF",0x9EE0],
+  ["FC64",0x9EE1],
+  ["F7F1",0x9EE2],
+  ["FC65",0x9EE3],
+  ["FC66",0x9EE4],
+  ["F7F4",0x9EE5],
+  ["FC67",0x9EE6],
+  ["F7F3",0x9EE7],
+  ["FC68",0x9EE8],
+  ["F7F2",0x9EE9],
+  ["F7F5",0x9EEA],
+  ["FC69",0x9EEB],
+  ["FC6A",0x9EEC],
+  ["FC6B",0x9EED],
+  ["FC6C",0x9EEE],
+  ["F7F6",0x9EEF],
+  ["FC6D",0x9EF0],
+  ["FC6E",0x9EF1],
+  ["FC6F",0x9EF2],
+  ["FC70",0x9EF3],
+  ["FC71",0x9EF4],
+  ["FC72",0x9EF5],
+  ["FC73",0x9EF6],
+  ["FC74",0x9EF7],
+  ["FC75",0x9EF8],
+  ["EDE9",0x9EF9],
+  ["FC76",0x9EFA],
+  ["EDEA",0x9EFB],
+  ["EDEB",0x9EFC],
+  ["FC77",0x9EFD],
+  ["F6BC",0x9EFE],
+  ["FC78",0x9EFF],
+  ["FC79",0x9F00],
+  ["FC7A",0x9F01],
+  ["FC7B",0x9F02],
+  ["FC7C",0x9F03],
+  ["FC7D",0x9F04],
+  ["FC7E",0x9F05],
+  ["FC80",0x9F06],
+  ["FC81",0x9F07],
+  ["FC82",0x9F08],
+  ["FC83",0x9F09],
+  ["FC84",0x9F0A],
+  ["F6BD",0x9F0B],
+  ["FC85",0x9F0C],
+  ["F6BE",0x9F0D],
+  ["B6A6",0x9F0E],
+  ["FC86",0x9F0F],
+  ["D8BE",0x9F10],
+  ["FC87",0x9F11],
+  ["FC88",0x9F12],
+  ["B9C4",0x9F13],
+  ["FC89",0x9F14],
+  ["FC8A",0x9F15],
+  ["FC8B",0x9F16],
+  ["D8BB",0x9F17],
+  ["FC8C",0x9F18],
+  ["DCB1",0x9F19],
+  ["FC8D",0x9F1A],
+  ["FC8E",0x9F1B],
+  ["FC8F",0x9F1C],
+  ["FC90",0x9F1D],
+  ["FC91",0x9F1E],
+  ["FC92",0x9F1F],
+  ["CAF3",0x9F20],
+  ["FC93",0x9F21],
+  ["F7F7",0x9F22],
+  ["FC94",0x9F23],
+  ["FC95",0x9F24],
+  ["FC96",0x9F25],
+  ["FC97",0x9F26],
+  ["FC98",0x9F27],
+  ["FC99",0x9F28],
+  ["FC9A",0x9F29],
+  ["FC9B",0x9F2A],
+  ["FC9C",0x9F2B],
+  ["F7F8",0x9F2C],
+  ["FC9D",0x9F2D],
+  ["FC9E",0x9F2E],
+  ["F7F9",0x9F2F],
+  ["FC9F",0x9F30],
+  ["FCA0",0x9F31],
+  ["FD40",0x9F32],
+  ["FD41",0x9F33],
+  ["FD42",0x9F34],
+  ["FD43",0x9F35],
+  ["FD44",0x9F36],
+  ["F7FB",0x9F37],
+  ["FD45",0x9F38],
+  ["F7FA",0x9F39],
+  ["FD46",0x9F3A],
+  ["B1C7",0x9F3B],
+  ["FD47",0x9F3C],
+  ["F7FC",0x9F3D],
+  ["F7FD",0x9F3E],
+  ["FD48",0x9F3F],
+  ["FD49",0x9F40],
+  ["FD4A",0x9F41],
+  ["FD4B",0x9F42],
+  ["FD4C",0x9F43],
+  ["F7FE",0x9F44],
+  ["FD4D",0x9F45],
+  ["FD4E",0x9F46],
+  ["FD4F",0x9F47],
+  ["FD50",0x9F48],
+  ["FD51",0x9F49],
+  ["FD52",0x9F4A],
+  ["FD53",0x9F4B],
+  ["FD54",0x9F4C],
+  ["FD55",0x9F4D],
+  ["FD56",0x9F4E],
+  ["FD57",0x9F4F],
+  ["C6EB",0x9F50],
+  ["ECB4",0x9F51],
+  ["FD58",0x9F52],
+  ["FD59",0x9F53],
+  ["FD5A",0x9F54],
+  ["FD5B",0x9F55],
+  ["FD5C",0x9F56],
+  ["FD5D",0x9F57],
+  ["FD5E",0x9F58],
+  ["FD5F",0x9F59],
+  ["FD60",0x9F5A],
+  ["FD61",0x9F5B],
+  ["FD62",0x9F5C],
+  ["FD63",0x9F5D],
+  ["FD64",0x9F5E],
+  ["FD65",0x9F5F],
+  ["FD66",0x9F60],
+  ["FD67",0x9F61],
+  ["FD68",0x9F62],
+  ["FD69",0x9F63],
+  ["FD6A",0x9F64],
+  ["FD6B",0x9F65],
+  ["FD6C",0x9F66],
+  ["FD6D",0x9F67],
+  ["FD6E",0x9F68],
+  ["FD6F",0x9F69],
+  ["FD70",0x9F6A],
+  ["FD71",0x9F6B],
+  ["FD72",0x9F6C],
+  ["FD73",0x9F6D],
+  ["FD74",0x9F6E],
+  ["FD75",0x9F6F],
+  ["FD76",0x9F70],
+  ["FD77",0x9F71],
+  ["FD78",0x9F72],
+  ["FD79",0x9F73],
+  ["FD7A",0x9F74],
+  ["FD7B",0x9F75],
+  ["FD7C",0x9F76],
+  ["FD7D",0x9F77],
+  ["FD7E",0x9F78],
+  ["FD80",0x9F79],
+  ["FD81",0x9F7A],
+  ["FD82",0x9F7B],
+  ["FD83",0x9F7C],
+  ["FD84",0x9F7D],
+  ["FD85",0x9F7E],
+  ["B3DD",0x9F7F],
+  ["F6B3",0x9F80],
+  ["FD86",0x9F81],
+  ["FD87",0x9F82],
+  ["F6B4",0x9F83],
+  ["C1E4",0x9F84],
+  ["F6B5",0x9F85],
+  ["F6B6",0x9F86],
+  ["F6B7",0x9F87],
+  ["F6B8",0x9F88],
+  ["F6B9",0x9F89],
+  ["F6BA",0x9F8A],
+  ["C8A3",0x9F8B],
+  ["F6BB",0x9F8C],
+  ["FD88",0x9F8D],
+  ["FD89",0x9F8E],
+  ["FD8A",0x9F8F],
+  ["FD8B",0x9F90],
+  ["FD8C",0x9F91],
+  ["FD8D",0x9F92],
+  ["FD8E",0x9F93],
+  ["FD8F",0x9F94],
+  ["FD90",0x9F95],
+  ["FD91",0x9F96],
+  ["FD92",0x9F97],
+  ["FD93",0x9F98],
+  ["C1FA",0x9F99],
+  ["B9A8",0x9F9A],
+  ["EDE8",0x9F9B],
+  ["FD94",0x9F9C],
+  ["FD95",0x9F9D],
+  ["FD96",0x9F9E],
+  ["B9EA",0x9F9F],
+  ["D9DF",0x9FA0],
+  ["FD97",0x9FA1],
+  ["FD98",0x9FA2],
+  ["FD99",0x9FA3],
+  ["FD9A",0x9FA4],
+  ["FD9B",0x9FA5],
+  ["82358F33",0x9FA6],
+  ["82358F34",0x9FA7],
+  ["82358F35",0x9FA8],
+  ["82358F36",0x9FA9],
+  ["82358F37",0x9FAA],
+  ["82358F38",0x9FAB],
+  ["82358F39",0x9FAC],
+  ["82359030",0x9FAD],
+  ["82359031",0x9FAE],
+  ["82359032",0x9FAF],
+  ["82359033",0x9FB0],
+  ["82359034",0x9FB1],
+  ["82359035",0x9FB2],
+  ["82359036",0x9FB3],
+  ["82359037",0x9FB4],
+  ["82359038",0x9FB5],
+  ["82359039",0x9FB6],
+  ["82359130",0x9FB7],
+  ["82359131",0x9FB8],
+  ["82359132",0x9FB9],
+  ["82359133",0x9FBA],
+  ["82359134",0x9FBB],
+  ["82359135",0x9FBC],
+  ["82359136",0x9FBD],
+  ["82359137",0x9FBE],
+  ["82359138",0x9FBF],
+  ["82359139",0x9FC0],
+  ["82359230",0x9FC1],
+  ["82359231",0x9FC2],
+  ["82359232",0x9FC3],
+  ["82359233",0x9FC4],
+  ["82359234",0x9FC5],
+  ["82359235",0x9FC6],
+  ["82359236",0x9FC7],
+  ["82359237",0x9FC8],
+  ["82359238",0x9FC9],
+  ["82359239",0x9FCA],
+  ["82359330",0x9FCB],
+  ["82359331",0x9FCC],
+  ["82359332",0x9FCD],
+  ["82359333",0x9FCE],
+  ["82359334",0x9FCF],
+  ["82359335",0x9FD0],
+  ["82359336",0x9FD1],
+  ["82359337",0x9FD2],
+  ["82359338",0x9FD3],
+  ["82359339",0x9FD4],
+  ["82359430",0x9FD5],
+  ["82359431",0x9FD6],
+  ["82359432",0x9FD7],
+  ["82359433",0x9FD8],
+  ["82359434",0x9FD9],
+  ["82359435",0x9FDA],
+  ["82359436",0x9FDB],
+  ["82359437",0x9FDC],
+  ["82359438",0x9FDD],
+  ["82359439",0x9FDE],
+  ["82359530",0x9FDF],
+  ["82359531",0x9FE0],
+  ["82359532",0x9FE1],
+  ["82359533",0x9FE2],
+  ["82359534",0x9FE3],
+  ["82359535",0x9FE4],
+  ["82359536",0x9FE5],
+  ["82359537",0x9FE6],
+  ["82359538",0x9FE7],
+  ["82359539",0x9FE8],
+  ["82359630",0x9FE9],
+  ["82359631",0x9FEA],
+  ["82359632",0x9FEB],
+  ["82359633",0x9FEC],
+  ["82359634",0x9FED],
+  ["82359635",0x9FEE],
+  ["82359636",0x9FEF],
+  ["82359637",0x9FF0],
+  ["82359638",0x9FF1],
+  ["82359639",0x9FF2],
+  ["82359730",0x9FF3],
+  ["82359731",0x9FF4],
+  ["82359732",0x9FF5],
+  ["82359733",0x9FF6],
+  ["82359734",0x9FF7],
+  ["82359735",0x9FF8],
+  ["82359736",0x9FF9],
+  ["82359737",0x9FFA],
+  ["82359738",0x9FFB],
+  ["82359739",0x9FFC],
+  ["82359830",0x9FFD],
+  ["82359831",0x9FFE],
+  ["82359832",0x9FFF],
+  ["82359833",0xA000],
+  ["82359834",0xA001],
+  ["82359835",0xA002],
+  ["82359836",0xA003],
+  ["82359837",0xA004],
+  ["82359838",0xA005],
+  ["82359839",0xA006],
+  ["82359930",0xA007],
+  ["82359931",0xA008],
+  ["82359932",0xA009],
+  ["82359933",0xA00A],
+  ["82359934",0xA00B],
+  ["82359935",0xA00C],
+  ["82359936",0xA00D],
+  ["82359937",0xA00E],
+  ["82359938",0xA00F],
+  ["82359939",0xA010],
+  ["82359A30",0xA011],
+  ["82359A31",0xA012],
+  ["82359A32",0xA013],
+  ["82359A33",0xA014],
+  ["82359A34",0xA015],
+  ["82359A35",0xA016],
+  ["82359A36",0xA017],
+  ["82359A37",0xA018],
+  ["82359A38",0xA019],
+  ["82359A39",0xA01A],
+  ["82359B30",0xA01B],
+  ["82359B31",0xA01C],
+  ["82359B32",0xA01D],
+  ["82359B33",0xA01E],
+  ["82359B34",0xA01F],
+  ["82359B35",0xA020],
+  ["82359B36",0xA021],
+  ["82359B37",0xA022],
+  ["82359B38",0xA023],
+  ["82359B39",0xA024],
+  ["82359C30",0xA025],
+  ["82359C31",0xA026],
+  ["82359C32",0xA027],
+  ["82359C33",0xA028],
+  ["82359C34",0xA029],
+  ["82359C35",0xA02A],
+  ["82359C36",0xA02B],
+  ["82359C37",0xA02C],
+  ["82359C38",0xA02D],
+  ["82359C39",0xA02E],
+  ["82359D30",0xA02F],
+  ["82359D31",0xA030],
+  ["82359D32",0xA031],
+  ["82359D33",0xA032],
+  ["82359D34",0xA033],
+  ["82359D35",0xA034],
+  ["82359D36",0xA035],
+  ["82359D37",0xA036],
+  ["82359D38",0xA037],
+  ["82359D39",0xA038],
+  ["82359E30",0xA039],
+  ["82359E31",0xA03A],
+  ["82359E32",0xA03B],
+  ["82359E33",0xA03C],
+  ["82359E34",0xA03D],
+  ["82359E35",0xA03E],
+  ["82359E36",0xA03F],
+  ["82359E37",0xA040],
+  ["82359E38",0xA041],
+  ["82359E39",0xA042],
+  ["82359F30",0xA043],
+  ["82359F31",0xA044],
+  ["82359F32",0xA045],
+  ["82359F33",0xA046],
+  ["82359F34",0xA047],
+  ["82359F35",0xA048],
+  ["82359F36",0xA049],
+  ["82359F37",0xA04A],
+  ["82359F38",0xA04B],
+  ["82359F39",0xA04C],
+  ["8235A030",0xA04D],
+  ["8235A031",0xA04E],
+  ["8235A032",0xA04F],
+  ["8235A033",0xA050],
+  ["8235A034",0xA051],
+  ["8235A035",0xA052],
+  ["8235A036",0xA053],
+  ["8235A037",0xA054],
+  ["8235A038",0xA055],
+  ["8235A039",0xA056],
+  ["8235A130",0xA057],
+  ["8235A131",0xA058],
+  ["8235A132",0xA059],
+  ["8235A133",0xA05A],
+  ["8235A134",0xA05B],
+  ["8235A135",0xA05C],
+  ["8235A136",0xA05D],
+  ["8235A137",0xA05E],
+  ["8235A138",0xA05F],
+  ["8235A139",0xA060],
+  ["8235A230",0xA061],
+  ["8235A231",0xA062],
+  ["8235A232",0xA063],
+  ["8235A233",0xA064],
+  ["8235A234",0xA065],
+  ["8235A235",0xA066],
+  ["8235A236",0xA067],
+  ["8235A237",0xA068],
+  ["8235A238",0xA069],
+  ["8235A239",0xA06A],
+  ["8235A330",0xA06B],
+  ["8235A331",0xA06C],
+  ["8235A332",0xA06D],
+  ["8235A333",0xA06E],
+  ["8235A334",0xA06F],
+  ["8235A335",0xA070],
+  ["8235A336",0xA071],
+  ["8235A337",0xA072],
+  ["8235A338",0xA073],
+  ["8235A339",0xA074],
+  ["8235A430",0xA075],
+  ["8235A431",0xA076],
+  ["8235A432",0xA077],
+  ["8235A433",0xA078],
+  ["8235A434",0xA079],
+  ["8235A435",0xA07A],
+  ["8235A436",0xA07B],
+  ["8235A437",0xA07C],
+  ["8235A438",0xA07D],
+  ["8235A439",0xA07E],
+  ["8235A530",0xA07F],
+  ["8235A531",0xA080],
+  ["8235A532",0xA081],
+  ["8235A533",0xA082],
+  ["8235A534",0xA083],
+  ["8235A535",0xA084],
+  ["8235A536",0xA085],
+  ["8235A537",0xA086],
+  ["8235A538",0xA087],
+  ["8235A539",0xA088],
+  ["8235A630",0xA089],
+  ["8235A631",0xA08A],
+  ["8235A632",0xA08B],
+  ["8235A633",0xA08C],
+  ["8235A634",0xA08D],
+  ["8235A635",0xA08E],
+  ["8235A636",0xA08F],
+  ["8235A637",0xA090],
+  ["8235A638",0xA091],
+  ["8235A639",0xA092],
+  ["8235A730",0xA093],
+  ["8235A731",0xA094],
+  ["8235A732",0xA095],
+  ["8235A733",0xA096],
+  ["8235A734",0xA097],
+  ["8235A735",0xA098],
+  ["8235A736",0xA099],
+  ["8235A737",0xA09A],
+  ["8235A738",0xA09B],
+  ["8235A739",0xA09C],
+  ["8235A830",0xA09D],
+  ["8235A831",0xA09E],
+  ["8235A832",0xA09F],
+  ["8235A833",0xA0A0],
+  ["8235A834",0xA0A1],
+  ["8235A835",0xA0A2],
+  ["8235A836",0xA0A3],
+  ["8235A837",0xA0A4],
+  ["8235A838",0xA0A5],
+  ["8235A839",0xA0A6],
+  ["8235A930",0xA0A7],
+  ["8235A931",0xA0A8],
+  ["8235A932",0xA0A9],
+  ["8235A933",0xA0AA],
+  ["8235A934",0xA0AB],
+  ["8235A935",0xA0AC],
+  ["8235A936",0xA0AD],
+  ["8235A937",0xA0AE],
+  ["8235A938",0xA0AF],
+  ["8235A939",0xA0B0],
+  ["8235AA30",0xA0B1],
+  ["8235AA31",0xA0B2],
+  ["8235AA32",0xA0B3],
+  ["8235AA33",0xA0B4],
+  ["8235AA34",0xA0B5],
+  ["8235AA35",0xA0B6],
+  ["8235AA36",0xA0B7],
+  ["8235AA37",0xA0B8],
+  ["8235AA38",0xA0B9],
+  ["8235AA39",0xA0BA],
+  ["8235AB30",0xA0BB],
+  ["8235AB31",0xA0BC],
+  ["8235AB32",0xA0BD],
+  ["8235AB33",0xA0BE],
+  ["8235AB34",0xA0BF],
+  ["8235AB35",0xA0C0],
+  ["8235AB36",0xA0C1],
+  ["8235AB37",0xA0C2],
+  ["8235AB38",0xA0C3],
+  ["8235AB39",0xA0C4],
+  ["8235AC30",0xA0C5],
+  ["8235AC31",0xA0C6],
+  ["8235AC32",0xA0C7],
+  ["8235AC33",0xA0C8],
+  ["8235AC34",0xA0C9],
+  ["8235AC35",0xA0CA],
+  ["8235AC36",0xA0CB],
+  ["8235AC37",0xA0CC],
+  ["8235AC38",0xA0CD],
+  ["8235AC39",0xA0CE],
+  ["8235AD30",0xA0CF],
+  ["8235AD31",0xA0D0],
+  ["8235AD32",0xA0D1],
+  ["8235AD33",0xA0D2],
+  ["8235AD34",0xA0D3],
+  ["8235AD35",0xA0D4],
+  ["8235AD36",0xA0D5],
+  ["8235AD37",0xA0D6],
+  ["8235AD38",0xA0D7],
+  ["8235AD39",0xA0D8],
+  ["8235AE30",0xA0D9],
+  ["8235AE31",0xA0DA],
+  ["8235AE32",0xA0DB],
+  ["8235AE33",0xA0DC],
+  ["8235AE34",0xA0DD],
+  ["8235AE35",0xA0DE],
+  ["8235AE36",0xA0DF],
+  ["8235AE37",0xA0E0],
+  ["8235AE38",0xA0E1],
+  ["8235AE39",0xA0E2],
+  ["8235AF30",0xA0E3],
+  ["8235AF31",0xA0E4],
+  ["8235AF32",0xA0E5],
+  ["8235AF33",0xA0E6],
+  ["8235AF34",0xA0E7],
+  ["8235AF35",0xA0E8],
+  ["8235AF36",0xA0E9],
+  ["8235AF37",0xA0EA],
+  ["8235AF38",0xA0EB],
+  ["8235AF39",0xA0EC],
+  ["8235B030",0xA0ED],
+  ["8235B031",0xA0EE],
+  ["8235B032",0xA0EF],
+  ["8235B033",0xA0F0],
+  ["8235B034",0xA0F1],
+  ["8235B035",0xA0F2],
+  ["8235B036",0xA0F3],
+  ["8235B037",0xA0F4],
+  ["8235B038",0xA0F5],
+  ["8235B039",0xA0F6],
+  ["8235B130",0xA0F7],
+  ["8235B131",0xA0F8],
+  ["8235B132",0xA0F9],
+  ["8235B133",0xA0FA],
+  ["8235B134",0xA0FB],
+  ["8235B135",0xA0FC],
+  ["8235B136",0xA0FD],
+  ["8235B137",0xA0FE],
+  ["8235B138",0xA0FF],
+  ["8235B139",0xA100],
+  ["8235B230",0xA101],
+  ["8235B231",0xA102],
+  ["8235B232",0xA103],
+  ["8235B233",0xA104],
+  ["8235B234",0xA105],
+  ["8235B235",0xA106],
+  ["8235B236",0xA107],
+  ["8235B237",0xA108],
+  ["8235B238",0xA109],
+  ["8235B239",0xA10A],
+  ["8235B330",0xA10B],
+  ["8235B331",0xA10C],
+  ["8235B332",0xA10D],
+  ["8235B333",0xA10E],
+  ["8235B334",0xA10F],
+  ["8235B335",0xA110],
+  ["8235B336",0xA111],
+  ["8235B337",0xA112],
+  ["8235B338",0xA113],
+  ["8235B339",0xA114],
+  ["8235B430",0xA115],
+  ["8235B431",0xA116],
+  ["8235B432",0xA117],
+  ["8235B433",0xA118],
+  ["8235B434",0xA119],
+  ["8235B435",0xA11A],
+  ["8235B436",0xA11B],
+  ["8235B437",0xA11C],
+  ["8235B438",0xA11D],
+  ["8235B439",0xA11E],
+  ["8235B530",0xA11F],
+  ["8235B531",0xA120],
+  ["8235B532",0xA121],
+  ["8235B533",0xA122],
+  ["8235B534",0xA123],
+  ["8235B535",0xA124],
+  ["8235B536",0xA125],
+  ["8235B537",0xA126],
+  ["8235B538",0xA127],
+  ["8235B539",0xA128],
+  ["8235B630",0xA129],
+  ["8235B631",0xA12A],
+  ["8235B632",0xA12B],
+  ["8235B633",0xA12C],
+  ["8235B634",0xA12D],
+  ["8235B635",0xA12E],
+  ["8235B636",0xA12F],
+  ["8235B637",0xA130],
+  ["8235B638",0xA131],
+  ["8235B639",0xA132],
+  ["8235B730",0xA133],
+  ["8235B731",0xA134],
+  ["8235B732",0xA135],
+  ["8235B733",0xA136],
+  ["8235B734",0xA137],
+  ["8235B735",0xA138],
+  ["8235B736",0xA139],
+  ["8235B737",0xA13A],
+  ["8235B738",0xA13B],
+  ["8235B739",0xA13C],
+  ["8235B830",0xA13D],
+  ["8235B831",0xA13E],
+  ["8235B832",0xA13F],
+  ["8235B833",0xA140],
+  ["8235B834",0xA141],
+  ["8235B835",0xA142],
+  ["8235B836",0xA143],
+  ["8235B837",0xA144],
+  ["8235B838",0xA145],
+  ["8235B839",0xA146],
+  ["8235B930",0xA147],
+  ["8235B931",0xA148],
+  ["8235B932",0xA149],
+  ["8235B933",0xA14A],
+  ["8235B934",0xA14B],
+  ["8235B935",0xA14C],
+  ["8235B936",0xA14D],
+  ["8235B937",0xA14E],
+  ["8235B938",0xA14F],
+  ["8235B939",0xA150],
+  ["8235BA30",0xA151],
+  ["8235BA31",0xA152],
+  ["8235BA32",0xA153],
+  ["8235BA33",0xA154],
+  ["8235BA34",0xA155],
+  ["8235BA35",0xA156],
+  ["8235BA36",0xA157],
+  ["8235BA37",0xA158],
+  ["8235BA38",0xA159],
+  ["8235BA39",0xA15A],
+  ["8235BB30",0xA15B],
+  ["8235BB31",0xA15C],
+  ["8235BB32",0xA15D],
+  ["8235BB33",0xA15E],
+  ["8235BB34",0xA15F],
+  ["8235BB35",0xA160],
+  ["8235BB36",0xA161],
+  ["8235BB37",0xA162],
+  ["8235BB38",0xA163],
+  ["8235BB39",0xA164],
+  ["8235BC30",0xA165],
+  ["8235BC31",0xA166],
+  ["8235BC32",0xA167],
+  ["8235BC33",0xA168],
+  ["8235BC34",0xA169],
+  ["8235BC35",0xA16A],
+  ["8235BC36",0xA16B],
+  ["8235BC37",0xA16C],
+  ["8235BC38",0xA16D],
+  ["8235BC39",0xA16E],
+  ["8235BD30",0xA16F],
+  ["8235BD31",0xA170],
+  ["8235BD32",0xA171],
+  ["8235BD33",0xA172],
+  ["8235BD34",0xA173],
+  ["8235BD35",0xA174],
+  ["8235BD36",0xA175],
+  ["8235BD37",0xA176],
+  ["8235BD38",0xA177],
+  ["8235BD39",0xA178],
+  ["8235BE30",0xA179],
+  ["8235BE31",0xA17A],
+  ["8235BE32",0xA17B],
+  ["8235BE33",0xA17C],
+  ["8235BE34",0xA17D],
+  ["8235BE35",0xA17E],
+  ["8235BE36",0xA17F],
+  ["8235BE37",0xA180],
+  ["8235BE38",0xA181],
+  ["8235BE39",0xA182],
+  ["8235BF30",0xA183],
+  ["8235BF31",0xA184],
+  ["8235BF32",0xA185],
+  ["8235BF33",0xA186],
+  ["8235BF34",0xA187],
+  ["8235BF35",0xA188],
+  ["8235BF36",0xA189],
+  ["8235BF37",0xA18A],
+  ["8235BF38",0xA18B],
+  ["8235BF39",0xA18C],
+  ["8235C030",0xA18D],
+  ["8235C031",0xA18E],
+  ["8235C032",0xA18F],
+  ["8235C033",0xA190],
+  ["8235C034",0xA191],
+  ["8235C035",0xA192],
+  ["8235C036",0xA193],
+  ["8235C037",0xA194],
+  ["8235C038",0xA195],
+  ["8235C039",0xA196],
+  ["8235C130",0xA197],
+  ["8235C131",0xA198],
+  ["8235C132",0xA199],
+  ["8235C133",0xA19A],
+  ["8235C134",0xA19B],
+  ["8235C135",0xA19C],
+  ["8235C136",0xA19D],
+  ["8235C137",0xA19E],
+  ["8235C138",0xA19F],
+  ["8235C139",0xA1A0],
+  ["8235C230",0xA1A1],
+  ["8235C231",0xA1A2],
+  ["8235C232",0xA1A3],
+  ["8235C233",0xA1A4],
+  ["8235C234",0xA1A5],
+  ["8235C235",0xA1A6],
+  ["8235C236",0xA1A7],
+  ["8235C237",0xA1A8],
+  ["8235C238",0xA1A9],
+  ["8235C239",0xA1AA],
+  ["8235C330",0xA1AB],
+  ["8235C331",0xA1AC],
+  ["8235C332",0xA1AD],
+  ["8235C333",0xA1AE],
+  ["8235C334",0xA1AF],
+  ["8235C335",0xA1B0],
+  ["8235C336",0xA1B1],
+  ["8235C337",0xA1B2],
+  ["8235C338",0xA1B3],
+  ["8235C339",0xA1B4],
+  ["8235C430",0xA1B5],
+  ["8235C431",0xA1B6],
+  ["8235C432",0xA1B7],
+  ["8235C433",0xA1B8],
+  ["8235C434",0xA1B9],
+  ["8235C435",0xA1BA],
+  ["8235C436",0xA1BB],
+  ["8235C437",0xA1BC],
+  ["8235C438",0xA1BD],
+  ["8235C439",0xA1BE],
+  ["8235C530",0xA1BF],
+  ["8235C531",0xA1C0],
+  ["8235C532",0xA1C1],
+  ["8235C533",0xA1C2],
+  ["8235C534",0xA1C3],
+  ["8235C535",0xA1C4],
+  ["8235C536",0xA1C5],
+  ["8235C537",0xA1C6],
+  ["8235C538",0xA1C7],
+  ["8235C539",0xA1C8],
+  ["8235C630",0xA1C9],
+  ["8235C631",0xA1CA],
+  ["8235C632",0xA1CB],
+  ["8235C633",0xA1CC],
+  ["8235C634",0xA1CD],
+  ["8235C635",0xA1CE],
+  ["8235C636",0xA1CF],
+  ["8235C637",0xA1D0],
+  ["8235C638",0xA1D1],
+  ["8235C639",0xA1D2],
+  ["8235C730",0xA1D3],
+  ["8235C731",0xA1D4],
+  ["8235C732",0xA1D5],
+  ["8235C733",0xA1D6],
+  ["8235C734",0xA1D7],
+  ["8235C735",0xA1D8],
+  ["8235C736",0xA1D9],
+  ["8235C737",0xA1DA],
+  ["8235C738",0xA1DB],
+  ["8235C739",0xA1DC],
+  ["8235C830",0xA1DD],
+  ["8235C831",0xA1DE],
+  ["8235C832",0xA1DF],
+  ["8235C833",0xA1E0],
+  ["8235C834",0xA1E1],
+  ["8235C835",0xA1E2],
+  ["8235C836",0xA1E3],
+  ["8235C837",0xA1E4],
+  ["8235C838",0xA1E5],
+  ["8235C839",0xA1E6],
+  ["8235C930",0xA1E7],
+  ["8235C931",0xA1E8],
+  ["8235C932",0xA1E9],
+  ["8235C933",0xA1EA],
+  ["8235C934",0xA1EB],
+  ["8235C935",0xA1EC],
+  ["8235C936",0xA1ED],
+  ["8235C937",0xA1EE],
+  ["8235C938",0xA1EF],
+  ["8235C939",0xA1F0],
+  ["8235CA30",0xA1F1],
+  ["8235CA31",0xA1F2],
+  ["8235CA32",0xA1F3],
+  ["8235CA33",0xA1F4],
+  ["8235CA34",0xA1F5],
+  ["8235CA35",0xA1F6],
+  ["8235CA36",0xA1F7],
+  ["8235CA37",0xA1F8],
+  ["8235CA38",0xA1F9],
+  ["8235CA39",0xA1FA],
+  ["8235CB30",0xA1FB],
+  ["8235CB31",0xA1FC],
+  ["8235CB32",0xA1FD],
+  ["8235CB33",0xA1FE],
+  ["8235CB34",0xA1FF],
+  ["8235CB35",0xA200],
+  ["8235CB36",0xA201],
+  ["8235CB37",0xA202],
+  ["8235CB38",0xA203],
+  ["8235CB39",0xA204],
+  ["8235CC30",0xA205],
+  ["8235CC31",0xA206],
+  ["8235CC32",0xA207],
+  ["8235CC33",0xA208],
+  ["8235CC34",0xA209],
+  ["8235CC35",0xA20A],
+  ["8235CC36",0xA20B],
+  ["8235CC37",0xA20C],
+  ["8235CC38",0xA20D],
+  ["8235CC39",0xA20E],
+  ["8235CD30",0xA20F],
+  ["8235CD31",0xA210],
+  ["8235CD32",0xA211],
+  ["8235CD33",0xA212],
+  ["8235CD34",0xA213],
+  ["8235CD35",0xA214],
+  ["8235CD36",0xA215],
+  ["8235CD37",0xA216],
+  ["8235CD38",0xA217],
+  ["8235CD39",0xA218],
+  ["8235CE30",0xA219],
+  ["8235CE31",0xA21A],
+  ["8235CE32",0xA21B],
+  ["8235CE33",0xA21C],
+  ["8235CE34",0xA21D],
+  ["8235CE35",0xA21E],
+  ["8235CE36",0xA21F],
+  ["8235CE37",0xA220],
+  ["8235CE38",0xA221],
+  ["8235CE39",0xA222],
+  ["8235CF30",0xA223],
+  ["8235CF31",0xA224],
+  ["8235CF32",0xA225],
+  ["8235CF33",0xA226],
+  ["8235CF34",0xA227],
+  ["8235CF35",0xA228],
+  ["8235CF36",0xA229],
+  ["8235CF37",0xA22A],
+  ["8235CF38",0xA22B],
+  ["8235CF39",0xA22C],
+  ["8235D030",0xA22D],
+  ["8235D031",0xA22E],
+  ["8235D032",0xA22F],
+  ["8235D033",0xA230],
+  ["8235D034",0xA231],
+  ["8235D035",0xA232],
+  ["8235D036",0xA233],
+  ["8235D037",0xA234],
+  ["8235D038",0xA235],
+  ["8235D039",0xA236],
+  ["8235D130",0xA237],
+  ["8235D131",0xA238],
+  ["8235D132",0xA239],
+  ["8235D133",0xA23A],
+  ["8235D134",0xA23B],
+  ["8235D135",0xA23C],
+  ["8235D136",0xA23D],
+  ["8235D137",0xA23E],
+  ["8235D138",0xA23F],
+  ["8235D139",0xA240],
+  ["8235D230",0xA241],
+  ["8235D231",0xA242],
+  ["8235D232",0xA243],
+  ["8235D233",0xA244],
+  ["8235D234",0xA245],
+  ["8235D235",0xA246],
+  ["8235D236",0xA247],
+  ["8235D237",0xA248],
+  ["8235D238",0xA249],
+  ["8235D239",0xA24A],
+  ["8235D330",0xA24B],
+  ["8235D331",0xA24C],
+  ["8235D332",0xA24D],
+  ["8235D333",0xA24E],
+  ["8235D334",0xA24F],
+  ["8235D335",0xA250],
+  ["8235D336",0xA251],
+  ["8235D337",0xA252],
+  ["8235D338",0xA253],
+  ["8235D339",0xA254],
+  ["8235D430",0xA255],
+  ["8235D431",0xA256],
+  ["8235D432",0xA257],
+  ["8235D433",0xA258],
+  ["8235D434",0xA259],
+  ["8235D435",0xA25A],
+  ["8235D436",0xA25B],
+  ["8235D437",0xA25C],
+  ["8235D438",0xA25D],
+  ["8235D439",0xA25E],
+  ["8235D530",0xA25F],
+  ["8235D531",0xA260],
+  ["8235D532",0xA261],
+  ["8235D533",0xA262],
+  ["8235D534",0xA263],
+  ["8235D535",0xA264],
+  ["8235D536",0xA265],
+  ["8235D537",0xA266],
+  ["8235D538",0xA267],
+  ["8235D539",0xA268],
+  ["8235D630",0xA269],
+  ["8235D631",0xA26A],
+  ["8235D632",0xA26B],
+  ["8235D633",0xA26C],
+  ["8235D634",0xA26D],
+  ["8235D635",0xA26E],
+  ["8235D636",0xA26F],
+  ["8235D637",0xA270],
+  ["8235D638",0xA271],
+  ["8235D639",0xA272],
+  ["8235D730",0xA273],
+  ["8235D731",0xA274],
+  ["8235D732",0xA275],
+  ["8235D733",0xA276],
+  ["8235D734",0xA277],
+  ["8235D735",0xA278],
+  ["8235D736",0xA279],
+  ["8235D737",0xA27A],
+  ["8235D738",0xA27B],
+  ["8235D739",0xA27C],
+  ["8235D830",0xA27D],
+  ["8235D831",0xA27E],
+  ["8235D832",0xA27F],
+  ["8235D833",0xA280],
+  ["8235D834",0xA281],
+  ["8235D835",0xA282],
+  ["8235D836",0xA283],
+  ["8235D837",0xA284],
+  ["8235D838",0xA285],
+  ["8235D839",0xA286],
+  ["8235D930",0xA287],
+  ["8235D931",0xA288],
+  ["8235D932",0xA289],
+  ["8235D933",0xA28A],
+  ["8235D934",0xA28B],
+  ["8235D935",0xA28C],
+  ["8235D936",0xA28D],
+  ["8235D937",0xA28E],
+  ["8235D938",0xA28F],
+  ["8235D939",0xA290],
+  ["8235DA30",0xA291],
+  ["8235DA31",0xA292],
+  ["8235DA32",0xA293],
+  ["8235DA33",0xA294],
+  ["8235DA34",0xA295],
+  ["8235DA35",0xA296],
+  ["8235DA36",0xA297],
+  ["8235DA37",0xA298],
+  ["8235DA38",0xA299],
+  ["8235DA39",0xA29A],
+  ["8235DB30",0xA29B],
+  ["8235DB31",0xA29C],
+  ["8235DB32",0xA29D],
+  ["8235DB33",0xA29E],
+  ["8235DB34",0xA29F],
+  ["8235DB35",0xA2A0],
+  ["8235DB36",0xA2A1],
+  ["8235DB37",0xA2A2],
+  ["8235DB38",0xA2A3],
+  ["8235DB39",0xA2A4],
+  ["8235DC30",0xA2A5],
+  ["8235DC31",0xA2A6],
+  ["8235DC32",0xA2A7],
+  ["8235DC33",0xA2A8],
+  ["8235DC34",0xA2A9],
+  ["8235DC35",0xA2AA],
+  ["8235DC36",0xA2AB],
+  ["8235DC37",0xA2AC],
+  ["8235DC38",0xA2AD],
+  ["8235DC39",0xA2AE],
+  ["8235DD30",0xA2AF],
+  ["8235DD31",0xA2B0],
+  ["8235DD32",0xA2B1],
+  ["8235DD33",0xA2B2],
+  ["8235DD34",0xA2B3],
+  ["8235DD35",0xA2B4],
+  ["8235DD36",0xA2B5],
+  ["8235DD37",0xA2B6],
+  ["8235DD38",0xA2B7],
+  ["8235DD39",0xA2B8],
+  ["8235DE30",0xA2B9],
+  ["8235DE31",0xA2BA],
+  ["8235DE32",0xA2BB],
+  ["8235DE33",0xA2BC],
+  ["8235DE34",0xA2BD],
+  ["8235DE35",0xA2BE],
+  ["8235DE36",0xA2BF],
+  ["8235DE37",0xA2C0],
+  ["8235DE38",0xA2C1],
+  ["8235DE39",0xA2C2],
+  ["8235DF30",0xA2C3],
+  ["8235DF31",0xA2C4],
+  ["8235DF32",0xA2C5],
+  ["8235DF33",0xA2C6],
+  ["8235DF34",0xA2C7],
+  ["8235DF35",0xA2C8],
+  ["8235DF36",0xA2C9],
+  ["8235DF37",0xA2CA],
+  ["8235DF38",0xA2CB],
+  ["8235DF39",0xA2CC],
+  ["8235E030",0xA2CD],
+  ["8235E031",0xA2CE],
+  ["8235E032",0xA2CF],
+  ["8235E033",0xA2D0],
+  ["8235E034",0xA2D1],
+  ["8235E035",0xA2D2],
+  ["8235E036",0xA2D3],
+  ["8235E037",0xA2D4],
+  ["8235E038",0xA2D5],
+  ["8235E039",0xA2D6],
+  ["8235E130",0xA2D7],
+  ["8235E131",0xA2D8],
+  ["8235E132",0xA2D9],
+  ["8235E133",0xA2DA],
+  ["8235E134",0xA2DB],
+  ["8235E135",0xA2DC],
+  ["8235E136",0xA2DD],
+  ["8235E137",0xA2DE],
+  ["8235E138",0xA2DF],
+  ["8235E139",0xA2E0],
+  ["8235E230",0xA2E1],
+  ["8235E231",0xA2E2],
+  ["8235E232",0xA2E3],
+  ["8235E233",0xA2E4],
+  ["8235E234",0xA2E5],
+  ["8235E235",0xA2E6],
+  ["8235E236",0xA2E7],
+  ["8235E237",0xA2E8],
+  ["8235E238",0xA2E9],
+  ["8235E239",0xA2EA],
+  ["8235E330",0xA2EB],
+  ["8235E331",0xA2EC],
+  ["8235E332",0xA2ED],
+  ["8235E333",0xA2EE],
+  ["8235E334",0xA2EF],
+  ["8235E335",0xA2F0],
+  ["8235E336",0xA2F1],
+  ["8235E337",0xA2F2],
+  ["8235E338",0xA2F3],
+  ["8235E339",0xA2F4],
+  ["8235E430",0xA2F5],
+  ["8235E431",0xA2F6],
+  ["8235E432",0xA2F7],
+  ["8235E433",0xA2F8],
+  ["8235E434",0xA2F9],
+  ["8235E435",0xA2FA],
+  ["8235E436",0xA2FB],
+  ["8235E437",0xA2FC],
+  ["8235E438",0xA2FD],
+  ["8235E439",0xA2FE],
+  ["8235E530",0xA2FF],
+  ["8235E531",0xA300],
+  ["8235E532",0xA301],
+  ["8235E533",0xA302],
+  ["8235E534",0xA303],
+  ["8235E535",0xA304],
+  ["8235E536",0xA305],
+  ["8235E537",0xA306],
+  ["8235E538",0xA307],
+  ["8235E539",0xA308],
+  ["8235E630",0xA309],
+  ["8235E631",0xA30A],
+  ["8235E632",0xA30B],
+  ["8235E633",0xA30C],
+  ["8235E634",0xA30D],
+  ["8235E635",0xA30E],
+  ["8235E636",0xA30F],
+  ["8235E637",0xA310],
+  ["8235E638",0xA311],
+  ["8235E639",0xA312],
+  ["8235E730",0xA313],
+  ["8235E731",0xA314],
+  ["8235E732",0xA315],
+  ["8235E733",0xA316],
+  ["8235E734",0xA317],
+  ["8235E735",0xA318],
+  ["8235E736",0xA319],
+  ["8235E737",0xA31A],
+  ["8235E738",0xA31B],
+  ["8235E739",0xA31C],
+  ["8235E830",0xA31D],
+  ["8235E831",0xA31E],
+  ["8235E832",0xA31F],
+  ["8235E833",0xA320],
+  ["8235E834",0xA321],
+  ["8235E835",0xA322],
+  ["8235E836",0xA323],
+  ["8235E837",0xA324],
+  ["8235E838",0xA325],
+  ["8235E839",0xA326],
+  ["8235E930",0xA327],
+  ["8235E931",0xA328],
+  ["8235E932",0xA329],
+  ["8235E933",0xA32A],
+  ["8235E934",0xA32B],
+  ["8235E935",0xA32C],
+  ["8235E936",0xA32D],
+  ["8235E937",0xA32E],
+  ["8235E938",0xA32F],
+  ["8235E939",0xA330],
+  ["8235EA30",0xA331],
+  ["8235EA31",0xA332],
+  ["8235EA32",0xA333],
+  ["8235EA33",0xA334],
+  ["8235EA34",0xA335],
+  ["8235EA35",0xA336],
+  ["8235EA36",0xA337],
+  ["8235EA37",0xA338],
+  ["8235EA38",0xA339],
+  ["8235EA39",0xA33A],
+  ["8235EB30",0xA33B],
+  ["8235EB31",0xA33C],
+  ["8235EB32",0xA33D],
+  ["8235EB33",0xA33E],
+  ["8235EB34",0xA33F],
+  ["8235EB35",0xA340],
+  ["8235EB36",0xA341],
+  ["8235EB37",0xA342],
+  ["8235EB38",0xA343],
+  ["8235EB39",0xA344],
+  ["8235EC30",0xA345],
+  ["8235EC31",0xA346],
+  ["8235EC32",0xA347],
+  ["8235EC33",0xA348],
+  ["8235EC34",0xA349],
+  ["8235EC35",0xA34A],
+  ["8235EC36",0xA34B],
+  ["8235EC37",0xA34C],
+  ["8235EC38",0xA34D],
+  ["8235EC39",0xA34E],
+  ["8235ED30",0xA34F],
+  ["8235ED31",0xA350],
+  ["8235ED32",0xA351],
+  ["8235ED33",0xA352],
+  ["8235ED34",0xA353],
+  ["8235ED35",0xA354],
+  ["8235ED36",0xA355],
+  ["8235ED37",0xA356],
+  ["8235ED38",0xA357],
+  ["8235ED39",0xA358],
+  ["8235EE30",0xA359],
+  ["8235EE31",0xA35A],
+  ["8235EE32",0xA35B],
+  ["8235EE33",0xA35C],
+  ["8235EE34",0xA35D],
+  ["8235EE35",0xA35E],
+  ["8235EE36",0xA35F],
+  ["8235EE37",0xA360],
+  ["8235EE38",0xA361],
+  ["8235EE39",0xA362],
+  ["8235EF30",0xA363],
+  ["8235EF31",0xA364],
+  ["8235EF32",0xA365],
+  ["8235EF33",0xA366],
+  ["8235EF34",0xA367],
+  ["8235EF35",0xA368],
+  ["8235EF36",0xA369],
+  ["8235EF37",0xA36A],
+  ["8235EF38",0xA36B],
+  ["8235EF39",0xA36C],
+  ["8235F030",0xA36D],
+  ["8235F031",0xA36E],
+  ["8235F032",0xA36F],
+  ["8235F033",0xA370],
+  ["8235F034",0xA371],
+  ["8235F035",0xA372],
+  ["8235F036",0xA373],
+  ["8235F037",0xA374],
+  ["8235F038",0xA375],
+  ["8235F039",0xA376],
+  ["8235F130",0xA377],
+  ["8235F131",0xA378],
+  ["8235F132",0xA379],
+  ["8235F133",0xA37A],
+  ["8235F134",0xA37B],
+  ["8235F135",0xA37C],
+  ["8235F136",0xA37D],
+  ["8235F137",0xA37E],
+  ["8235F138",0xA37F],
+  ["8235F139",0xA380],
+  ["8235F230",0xA381],
+  ["8235F231",0xA382],
+  ["8235F232",0xA383],
+  ["8235F233",0xA384],
+  ["8235F234",0xA385],
+  ["8235F235",0xA386],
+  ["8235F236",0xA387],
+  ["8235F237",0xA388],
+  ["8235F238",0xA389],
+  ["8235F239",0xA38A],
+  ["8235F330",0xA38B],
+  ["8235F331",0xA38C],
+  ["8235F332",0xA38D],
+  ["8235F333",0xA38E],
+  ["8235F334",0xA38F],
+  ["8235F335",0xA390],
+  ["8235F336",0xA391],
+  ["8235F337",0xA392],
+  ["8235F338",0xA393],
+  ["8235F339",0xA394],
+  ["8235F430",0xA395],
+  ["8235F431",0xA396],
+  ["8235F432",0xA397],
+  ["8235F433",0xA398],
+  ["8235F434",0xA399],
+  ["8235F435",0xA39A],
+  ["8235F436",0xA39B],
+  ["8235F437",0xA39C],
+  ["8235F438",0xA39D],
+  ["8235F439",0xA39E],
+  ["8235F530",0xA39F],
+  ["8235F531",0xA3A0],
+  ["8235F532",0xA3A1],
+  ["8235F533",0xA3A2],
+  ["8235F534",0xA3A3],
+  ["8235F535",0xA3A4],
+  ["8235F536",0xA3A5],
+  ["8235F537",0xA3A6],
+  ["8235F538",0xA3A7],
+  ["8235F539",0xA3A8],
+  ["8235F630",0xA3A9],
+  ["8235F631",0xA3AA],
+  ["8235F632",0xA3AB],
+  ["8235F633",0xA3AC],
+  ["8235F634",0xA3AD],
+  ["8235F635",0xA3AE],
+  ["8235F636",0xA3AF],
+  ["8235F637",0xA3B0],
+  ["8235F638",0xA3B1],
+  ["8235F639",0xA3B2],
+  ["8235F730",0xA3B3],
+  ["8235F731",0xA3B4],
+  ["8235F732",0xA3B5],
+  ["8235F733",0xA3B6],
+  ["8235F734",0xA3B7],
+  ["8235F735",0xA3B8],
+  ["8235F736",0xA3B9],
+  ["8235F737",0xA3BA],
+  ["8235F738",0xA3BB],
+  ["8235F739",0xA3BC],
+  ["8235F830",0xA3BD],
+  ["8235F831",0xA3BE],
+  ["8235F832",0xA3BF],
+  ["8235F833",0xA3C0],
+  ["8235F834",0xA3C1],
+  ["8235F835",0xA3C2],
+  ["8235F836",0xA3C3],
+  ["8235F837",0xA3C4],
+  ["8235F838",0xA3C5],
+  ["8235F839",0xA3C6],
+  ["8235F930",0xA3C7],
+  ["8235F931",0xA3C8],
+  ["8235F932",0xA3C9],
+  ["8235F933",0xA3CA],
+  ["8235F934",0xA3CB],
+  ["8235F935",0xA3CC],
+  ["8235F936",0xA3CD],
+  ["8235F937",0xA3CE],
+  ["8235F938",0xA3CF],
+  ["8235F939",0xA3D0],
+  ["8235FA30",0xA3D1],
+  ["8235FA31",0xA3D2],
+  ["8235FA32",0xA3D3],
+  ["8235FA33",0xA3D4],
+  ["8235FA34",0xA3D5],
+  ["8235FA35",0xA3D6],
+  ["8235FA36",0xA3D7],
+  ["8235FA37",0xA3D8],
+  ["8235FA38",0xA3D9],
+  ["8235FA39",0xA3DA],
+  ["8235FB30",0xA3DB],
+  ["8235FB31",0xA3DC],
+  ["8235FB32",0xA3DD],
+  ["8235FB33",0xA3DE],
+  ["8235FB34",0xA3DF],
+  ["8235FB35",0xA3E0],
+  ["8235FB36",0xA3E1],
+  ["8235FB37",0xA3E2],
+  ["8235FB38",0xA3E3],
+  ["8235FB39",0xA3E4],
+  ["8235FC30",0xA3E5],
+  ["8235FC31",0xA3E6],
+  ["8235FC32",0xA3E7],
+  ["8235FC33",0xA3E8],
+  ["8235FC34",0xA3E9],
+  ["8235FC35",0xA3EA],
+  ["8235FC36",0xA3EB],
+  ["8235FC37",0xA3EC],
+  ["8235FC38",0xA3ED],
+  ["8235FC39",0xA3EE],
+  ["8235FD30",0xA3EF],
+  ["8235FD31",0xA3F0],
+  ["8235FD32",0xA3F1],
+  ["8235FD33",0xA3F2],
+  ["8235FD34",0xA3F3],
+  ["8235FD35",0xA3F4],
+  ["8235FD36",0xA3F5],
+  ["8235FD37",0xA3F6],
+  ["8235FD38",0xA3F7],
+  ["8235FD39",0xA3F8],
+  ["8235FE30",0xA3F9],
+  ["8235FE31",0xA3FA],
+  ["8235FE32",0xA3FB],
+  ["8235FE33",0xA3FC],
+  ["8235FE34",0xA3FD],
+  ["8235FE35",0xA3FE],
+  ["8235FE36",0xA3FF],
+  ["8235FE37",0xA400],
+  ["8235FE38",0xA401],
+  ["8235FE39",0xA402],
+  ["82368130",0xA403],
+  ["82368131",0xA404],
+  ["82368132",0xA405],
+  ["82368133",0xA406],
+  ["82368134",0xA407],
+  ["82368135",0xA408],
+  ["82368136",0xA409],
+  ["82368137",0xA40A],
+  ["82368138",0xA40B],
+  ["82368139",0xA40C],
+  ["82368230",0xA40D],
+  ["82368231",0xA40E],
+  ["82368232",0xA40F],
+  ["82368233",0xA410],
+  ["82368234",0xA411],
+  ["82368235",0xA412],
+  ["82368236",0xA413],
+  ["82368237",0xA414],
+  ["82368238",0xA415],
+  ["82368239",0xA416],
+  ["82368330",0xA417],
+  ["82368331",0xA418],
+  ["82368332",0xA419],
+  ["82368333",0xA41A],
+  ["82368334",0xA41B],
+  ["82368335",0xA41C],
+  ["82368336",0xA41D],
+  ["82368337",0xA41E],
+  ["82368338",0xA41F],
+  ["82368339",0xA420],
+  ["82368430",0xA421],
+  ["82368431",0xA422],
+  ["82368432",0xA423],
+  ["82368433",0xA424],
+  ["82368434",0xA425],
+  ["82368435",0xA426],
+  ["82368436",0xA427],
+  ["82368437",0xA428],
+  ["82368438",0xA429],
+  ["82368439",0xA42A],
+  ["82368530",0xA42B],
+  ["82368531",0xA42C],
+  ["82368532",0xA42D],
+  ["82368533",0xA42E],
+  ["82368534",0xA42F],
+  ["82368535",0xA430],
+  ["82368536",0xA431],
+  ["82368537",0xA432],
+  ["82368538",0xA433],
+  ["82368539",0xA434],
+  ["82368630",0xA435],
+  ["82368631",0xA436],
+  ["82368632",0xA437],
+  ["82368633",0xA438],
+  ["82368634",0xA439],
+  ["82368635",0xA43A],
+  ["82368636",0xA43B],
+  ["82368637",0xA43C],
+  ["82368638",0xA43D],
+  ["82368639",0xA43E],
+  ["82368730",0xA43F],
+  ["82368731",0xA440],
+  ["82368732",0xA441],
+  ["82368733",0xA442],
+  ["82368734",0xA443],
+  ["82368735",0xA444],
+  ["82368736",0xA445],
+  ["82368737",0xA446],
+  ["82368738",0xA447],
+  ["82368739",0xA448],
+  ["82368830",0xA449],
+  ["82368831",0xA44A],
+  ["82368832",0xA44B],
+  ["82368833",0xA44C],
+  ["82368834",0xA44D],
+  ["82368835",0xA44E],
+  ["82368836",0xA44F],
+  ["82368837",0xA450],
+  ["82368838",0xA451],
+  ["82368839",0xA452],
+  ["82368930",0xA453],
+  ["82368931",0xA454],
+  ["82368932",0xA455],
+  ["82368933",0xA456],
+  ["82368934",0xA457],
+  ["82368935",0xA458],
+  ["82368936",0xA459],
+  ["82368937",0xA45A],
+  ["82368938",0xA45B],
+  ["82368939",0xA45C],
+  ["82368A30",0xA45D],
+  ["82368A31",0xA45E],
+  ["82368A32",0xA45F],
+  ["82368A33",0xA460],
+  ["82368A34",0xA461],
+  ["82368A35",0xA462],
+  ["82368A36",0xA463],
+  ["82368A37",0xA464],
+  ["82368A38",0xA465],
+  ["82368A39",0xA466],
+  ["82368B30",0xA467],
+  ["82368B31",0xA468],
+  ["82368B32",0xA469],
+  ["82368B33",0xA46A],
+  ["82368B34",0xA46B],
+  ["82368B35",0xA46C],
+  ["82368B36",0xA46D],
+  ["82368B37",0xA46E],
+  ["82368B38",0xA46F],
+  ["82368B39",0xA470],
+  ["82368C30",0xA471],
+  ["82368C31",0xA472],
+  ["82368C32",0xA473],
+  ["82368C33",0xA474],
+  ["82368C34",0xA475],
+  ["82368C35",0xA476],
+  ["82368C36",0xA477],
+  ["82368C37",0xA478],
+  ["82368C38",0xA479],
+  ["82368C39",0xA47A],
+  ["82368D30",0xA47B],
+  ["82368D31",0xA47C],
+  ["82368D32",0xA47D],
+  ["82368D33",0xA47E],
+  ["82368D34",0xA47F],
+  ["82368D35",0xA480],
+  ["82368D36",0xA481],
+  ["82368D37",0xA482],
+  ["82368D38",0xA483],
+  ["82368D39",0xA484],
+  ["82368E30",0xA485],
+  ["82368E31",0xA486],
+  ["82368E32",0xA487],
+  ["82368E33",0xA488],
+  ["82368E34",0xA489],
+  ["82368E35",0xA48A],
+  ["82368E36",0xA48B],
+  ["82368E37",0xA48C],
+  ["82368E38",0xA48D],
+  ["82368E39",0xA48E],
+  ["82368F30",0xA48F],
+  ["82368F31",0xA490],
+  ["82368F32",0xA491],
+  ["82368F33",0xA492],
+  ["82368F34",0xA493],
+  ["82368F35",0xA494],
+  ["82368F36",0xA495],
+  ["82368F37",0xA496],
+  ["82368F38",0xA497],
+  ["82368F39",0xA498],
+  ["82369030",0xA499],
+  ["82369031",0xA49A],
+  ["82369032",0xA49B],
+  ["82369033",0xA49C],
+  ["82369034",0xA49D],
+  ["82369035",0xA49E],
+  ["82369036",0xA49F],
+  ["82369037",0xA4A0],
+  ["82369038",0xA4A1],
+  ["82369039",0xA4A2],
+  ["82369130",0xA4A3],
+  ["82369131",0xA4A4],
+  ["82369132",0xA4A5],
+  ["82369133",0xA4A6],
+  ["82369134",0xA4A7],
+  ["82369135",0xA4A8],
+  ["82369136",0xA4A9],
+  ["82369137",0xA4AA],
+  ["82369138",0xA4AB],
+  ["82369139",0xA4AC],
+  ["82369230",0xA4AD],
+  ["82369231",0xA4AE],
+  ["82369232",0xA4AF],
+  ["82369233",0xA4B0],
+  ["82369234",0xA4B1],
+  ["82369235",0xA4B2],
+  ["82369236",0xA4B3],
+  ["82369237",0xA4B4],
+  ["82369238",0xA4B5],
+  ["82369239",0xA4B6],
+  ["82369330",0xA4B7],
+  ["82369331",0xA4B8],
+  ["82369332",0xA4B9],
+  ["82369333",0xA4BA],
+  ["82369334",0xA4BB],
+  ["82369335",0xA4BC],
+  ["82369336",0xA4BD],
+  ["82369337",0xA4BE],
+  ["82369338",0xA4BF],
+  ["82369339",0xA4C0],
+  ["82369430",0xA4C1],
+  ["82369431",0xA4C2],
+  ["82369432",0xA4C3],
+  ["82369433",0xA4C4],
+  ["82369434",0xA4C5],
+  ["82369435",0xA4C6],
+  ["82369436",0xA4C7],
+  ["82369437",0xA4C8],
+  ["82369438",0xA4C9],
+  ["82369439",0xA4CA],
+  ["82369530",0xA4CB],
+  ["82369531",0xA4CC],
+  ["82369532",0xA4CD],
+  ["82369533",0xA4CE],
+  ["82369534",0xA4CF],
+  ["82369535",0xA4D0],
+  ["82369536",0xA4D1],
+  ["82369537",0xA4D2],
+  ["82369538",0xA4D3],
+  ["82369539",0xA4D4],
+  ["82369630",0xA4D5],
+  ["82369631",0xA4D6],
+  ["82369632",0xA4D7],
+  ["82369633",0xA4D8],
+  ["82369634",0xA4D9],
+  ["82369635",0xA4DA],
+  ["82369636",0xA4DB],
+  ["82369637",0xA4DC],
+  ["82369638",0xA4DD],
+  ["82369639",0xA4DE],
+  ["82369730",0xA4DF],
+  ["82369731",0xA4E0],
+  ["82369732",0xA4E1],
+  ["82369733",0xA4E2],
+  ["82369734",0xA4E3],
+  ["82369735",0xA4E4],
+  ["82369736",0xA4E5],
+  ["82369737",0xA4E6],
+  ["82369738",0xA4E7],
+  ["82369739",0xA4E8],
+  ["82369830",0xA4E9],
+  ["82369831",0xA4EA],
+  ["82369832",0xA4EB],
+  ["82369833",0xA4EC],
+  ["82369834",0xA4ED],
+  ["82369835",0xA4EE],
+  ["82369836",0xA4EF],
+  ["82369837",0xA4F0],
+  ["82369838",0xA4F1],
+  ["82369839",0xA4F2],
+  ["82369930",0xA4F3],
+  ["82369931",0xA4F4],
+  ["82369932",0xA4F5],
+  ["82369933",0xA4F6],
+  ["82369934",0xA4F7],
+  ["82369935",0xA4F8],
+  ["82369936",0xA4F9],
+  ["82369937",0xA4FA],
+  ["82369938",0xA4FB],
+  ["82369939",0xA4FC],
+  ["82369A30",0xA4FD],
+  ["82369A31",0xA4FE],
+  ["82369A32",0xA4FF],
+  ["82369A33",0xA500],
+  ["82369A34",0xA501],
+  ["82369A35",0xA502],
+  ["82369A36",0xA503],
+  ["82369A37",0xA504],
+  ["82369A38",0xA505],
+  ["82369A39",0xA506],
+  ["82369B30",0xA507],
+  ["82369B31",0xA508],
+  ["82369B32",0xA509],
+  ["82369B33",0xA50A],
+  ["82369B34",0xA50B],
+  ["82369B35",0xA50C],
+  ["82369B36",0xA50D],
+  ["82369B37",0xA50E],
+  ["82369B38",0xA50F],
+  ["82369B39",0xA510],
+  ["82369C30",0xA511],
+  ["82369C31",0xA512],
+  ["82369C32",0xA513],
+  ["82369C33",0xA514],
+  ["82369C34",0xA515],
+  ["82369C35",0xA516],
+  ["82369C36",0xA517],
+  ["82369C37",0xA518],
+  ["82369C38",0xA519],
+  ["82369C39",0xA51A],
+  ["82369D30",0xA51B],
+  ["82369D31",0xA51C],
+  ["82369D32",0xA51D],
+  ["82369D33",0xA51E],
+  ["82369D34",0xA51F],
+  ["82369D35",0xA520],
+  ["82369D36",0xA521],
+  ["82369D37",0xA522],
+  ["82369D38",0xA523],
+  ["82369D39",0xA524],
+  ["82369E30",0xA525],
+  ["82369E31",0xA526],
+  ["82369E32",0xA527],
+  ["82369E33",0xA528],
+  ["82369E34",0xA529],
+  ["82369E35",0xA52A],
+  ["82369E36",0xA52B],
+  ["82369E37",0xA52C],
+  ["82369E38",0xA52D],
+  ["82369E39",0xA52E],
+  ["82369F30",0xA52F],
+  ["82369F31",0xA530],
+  ["82369F32",0xA531],
+  ["82369F33",0xA532],
+  ["82369F34",0xA533],
+  ["82369F35",0xA534],
+  ["82369F36",0xA535],
+  ["82369F37",0xA536],
+  ["82369F38",0xA537],
+  ["82369F39",0xA538],
+  ["8236A030",0xA539],
+  ["8236A031",0xA53A],
+  ["8236A032",0xA53B],
+  ["8236A033",0xA53C],
+  ["8236A034",0xA53D],
+  ["8236A035",0xA53E],
+  ["8236A036",0xA53F],
+  ["8236A037",0xA540],
+  ["8236A038",0xA541],
+  ["8236A039",0xA542],
+  ["8236A130",0xA543],
+  ["8236A131",0xA544],
+  ["8236A132",0xA545],
+  ["8236A133",0xA546],
+  ["8236A134",0xA547],
+  ["8236A135",0xA548],
+  ["8236A136",0xA549],
+  ["8236A137",0xA54A],
+  ["8236A138",0xA54B],
+  ["8236A139",0xA54C],
+  ["8236A230",0xA54D],
+  ["8236A231",0xA54E],
+  ["8236A232",0xA54F],
+  ["8236A233",0xA550],
+  ["8236A234",0xA551],
+  ["8236A235",0xA552],
+  ["8236A236",0xA553],
+  ["8236A237",0xA554],
+  ["8236A238",0xA555],
+  ["8236A239",0xA556],
+  ["8236A330",0xA557],
+  ["8236A331",0xA558],
+  ["8236A332",0xA559],
+  ["8236A333",0xA55A],
+  ["8236A334",0xA55B],
+  ["8236A335",0xA55C],
+  ["8236A336",0xA55D],
+  ["8236A337",0xA55E],
+  ["8236A338",0xA55F],
+  ["8236A339",0xA560],
+  ["8236A430",0xA561],
+  ["8236A431",0xA562],
+  ["8236A432",0xA563],
+  ["8236A433",0xA564],
+  ["8236A434",0xA565],
+  ["8236A435",0xA566],
+  ["8236A436",0xA567],
+  ["8236A437",0xA568],
+  ["8236A438",0xA569],
+  ["8236A439",0xA56A],
+  ["8236A530",0xA56B],
+  ["8236A531",0xA56C],
+  ["8236A532",0xA56D],
+  ["8236A533",0xA56E],
+  ["8236A534",0xA56F],
+  ["8236A535",0xA570],
+  ["8236A536",0xA571],
+  ["8236A537",0xA572],
+  ["8236A538",0xA573],
+  ["8236A539",0xA574],
+  ["8236A630",0xA575],
+  ["8236A631",0xA576],
+  ["8236A632",0xA577],
+  ["8236A633",0xA578],
+  ["8236A634",0xA579],
+  ["8236A635",0xA57A],
+  ["8236A636",0xA57B],
+  ["8236A637",0xA57C],
+  ["8236A638",0xA57D],
+  ["8236A639",0xA57E],
+  ["8236A730",0xA57F],
+  ["8236A731",0xA580],
+  ["8236A732",0xA581],
+  ["8236A733",0xA582],
+  ["8236A734",0xA583],
+  ["8236A735",0xA584],
+  ["8236A736",0xA585],
+  ["8236A737",0xA586],
+  ["8236A738",0xA587],
+  ["8236A739",0xA588],
+  ["8236A830",0xA589],
+  ["8236A831",0xA58A],
+  ["8236A832",0xA58B],
+  ["8236A833",0xA58C],
+  ["8236A834",0xA58D],
+  ["8236A835",0xA58E],
+  ["8236A836",0xA58F],
+  ["8236A837",0xA590],
+  ["8236A838",0xA591],
+  ["8236A839",0xA592],
+  ["8236A930",0xA593],
+  ["8236A931",0xA594],
+  ["8236A932",0xA595],
+  ["8236A933",0xA596],
+  ["8236A934",0xA597],
+  ["8236A935",0xA598],
+  ["8236A936",0xA599],
+  ["8236A937",0xA59A],
+  ["8236A938",0xA59B],
+  ["8236A939",0xA59C],
+  ["8236AA30",0xA59D],
+  ["8236AA31",0xA59E],
+  ["8236AA32",0xA59F],
+  ["8236AA33",0xA5A0],
+  ["8236AA34",0xA5A1],
+  ["8236AA35",0xA5A2],
+  ["8236AA36",0xA5A3],
+  ["8236AA37",0xA5A4],
+  ["8236AA38",0xA5A5],
+  ["8236AA39",0xA5A6],
+  ["8236AB30",0xA5A7],
+  ["8236AB31",0xA5A8],
+  ["8236AB32",0xA5A9],
+  ["8236AB33",0xA5AA],
+  ["8236AB34",0xA5AB],
+  ["8236AB35",0xA5AC],
+  ["8236AB36",0xA5AD],
+  ["8236AB37",0xA5AE],
+  ["8236AB38",0xA5AF],
+  ["8236AB39",0xA5B0],
+  ["8236AC30",0xA5B1],
+  ["8236AC31",0xA5B2],
+  ["8236AC32",0xA5B3],
+  ["8236AC33",0xA5B4],
+  ["8236AC34",0xA5B5],
+  ["8236AC35",0xA5B6],
+  ["8236AC36",0xA5B7],
+  ["8236AC37",0xA5B8],
+  ["8236AC38",0xA5B9],
+  ["8236AC39",0xA5BA],
+  ["8236AD30",0xA5BB],
+  ["8236AD31",0xA5BC],
+  ["8236AD32",0xA5BD],
+  ["8236AD33",0xA5BE],
+  ["8236AD34",0xA5BF],
+  ["8236AD35",0xA5C0],
+  ["8236AD36",0xA5C1],
+  ["8236AD37",0xA5C2],
+  ["8236AD38",0xA5C3],
+  ["8236AD39",0xA5C4],
+  ["8236AE30",0xA5C5],
+  ["8236AE31",0xA5C6],
+  ["8236AE32",0xA5C7],
+  ["8236AE33",0xA5C8],
+  ["8236AE34",0xA5C9],
+  ["8236AE35",0xA5CA],
+  ["8236AE36",0xA5CB],
+  ["8236AE37",0xA5CC],
+  ["8236AE38",0xA5CD],
+  ["8236AE39",0xA5CE],
+  ["8236AF30",0xA5CF],
+  ["8236AF31",0xA5D0],
+  ["8236AF32",0xA5D1],
+  ["8236AF33",0xA5D2],
+  ["8236AF34",0xA5D3],
+  ["8236AF35",0xA5D4],
+  ["8236AF36",0xA5D5],
+  ["8236AF37",0xA5D6],
+  ["8236AF38",0xA5D7],
+  ["8236AF39",0xA5D8],
+  ["8236B030",0xA5D9],
+  ["8236B031",0xA5DA],
+  ["8236B032",0xA5DB],
+  ["8236B033",0xA5DC],
+  ["8236B034",0xA5DD],
+  ["8236B035",0xA5DE],
+  ["8236B036",0xA5DF],
+  ["8236B037",0xA5E0],
+  ["8236B038",0xA5E1],
+  ["8236B039",0xA5E2],
+  ["8236B130",0xA5E3],
+  ["8236B131",0xA5E4],
+  ["8236B132",0xA5E5],
+  ["8236B133",0xA5E6],
+  ["8236B134",0xA5E7],
+  ["8236B135",0xA5E8],
+  ["8236B136",0xA5E9],
+  ["8236B137",0xA5EA],
+  ["8236B138",0xA5EB],
+  ["8236B139",0xA5EC],
+  ["8236B230",0xA5ED],
+  ["8236B231",0xA5EE],
+  ["8236B232",0xA5EF],
+  ["8236B233",0xA5F0],
+  ["8236B234",0xA5F1],
+  ["8236B235",0xA5F2],
+  ["8236B236",0xA5F3],
+  ["8236B237",0xA5F4],
+  ["8236B238",0xA5F5],
+  ["8236B239",0xA5F6],
+  ["8236B330",0xA5F7],
+  ["8236B331",0xA5F8],
+  ["8236B332",0xA5F9],
+  ["8236B333",0xA5FA],
+  ["8236B334",0xA5FB],
+  ["8236B335",0xA5FC],
+  ["8236B336",0xA5FD],
+  ["8236B337",0xA5FE],
+  ["8236B338",0xA5FF],
+  ["8236B339",0xA600],
+  ["8236B430",0xA601],
+  ["8236B431",0xA602],
+  ["8236B432",0xA603],
+  ["8236B433",0xA604],
+  ["8236B434",0xA605],
+  ["8236B435",0xA606],
+  ["8236B436",0xA607],
+  ["8236B437",0xA608],
+  ["8236B438",0xA609],
+  ["8236B439",0xA60A],
+  ["8236B530",0xA60B],
+  ["8236B531",0xA60C],
+  ["8236B532",0xA60D],
+  ["8236B533",0xA60E],
+  ["8236B534",0xA60F],
+  ["8236B535",0xA610],
+  ["8236B536",0xA611],
+  ["8236B537",0xA612],
+  ["8236B538",0xA613],
+  ["8236B539",0xA614],
+  ["8236B630",0xA615],
+  ["8236B631",0xA616],
+  ["8236B632",0xA617],
+  ["8236B633",0xA618],
+  ["8236B634",0xA619],
+  ["8236B635",0xA61A],
+  ["8236B636",0xA61B],
+  ["8236B637",0xA61C],
+  ["8236B638",0xA61D],
+  ["8236B639",0xA61E],
+  ["8236B730",0xA61F],
+  ["8236B731",0xA620],
+  ["8236B732",0xA621],
+  ["8236B733",0xA622],
+  ["8236B734",0xA623],
+  ["8236B735",0xA624],
+  ["8236B736",0xA625],
+  ["8236B737",0xA626],
+  ["8236B738",0xA627],
+  ["8236B739",0xA628],
+  ["8236B830",0xA629],
+  ["8236B831",0xA62A],
+  ["8236B832",0xA62B],
+  ["8236B833",0xA62C],
+  ["8236B834",0xA62D],
+  ["8236B835",0xA62E],
+  ["8236B836",0xA62F],
+  ["8236B837",0xA630],
+  ["8236B838",0xA631],
+  ["8236B839",0xA632],
+  ["8236B930",0xA633],
+  ["8236B931",0xA634],
+  ["8236B932",0xA635],
+  ["8236B933",0xA636],
+  ["8236B934",0xA637],
+  ["8236B935",0xA638],
+  ["8236B936",0xA639],
+  ["8236B937",0xA63A],
+  ["8236B938",0xA63B],
+  ["8236B939",0xA63C],
+  ["8236BA30",0xA63D],
+  ["8236BA31",0xA63E],
+  ["8236BA32",0xA63F],
+  ["8236BA33",0xA640],
+  ["8236BA34",0xA641],
+  ["8236BA35",0xA642],
+  ["8236BA36",0xA643],
+  ["8236BA37",0xA644],
+  ["8236BA38",0xA645],
+  ["8236BA39",0xA646],
+  ["8236BB30",0xA647],
+  ["8236BB31",0xA648],
+  ["8236BB32",0xA649],
+  ["8236BB33",0xA64A],
+  ["8236BB34",0xA64B],
+  ["8236BB35",0xA64C],
+  ["8236BB36",0xA64D],
+  ["8236BB37",0xA64E],
+  ["8236BB38",0xA64F],
+  ["8236BB39",0xA650],
+  ["8236BC30",0xA651],
+  ["8236BC31",0xA652],
+  ["8236BC32",0xA653],
+  ["8236BC33",0xA654],
+  ["8236BC34",0xA655],
+  ["8236BC35",0xA656],
+  ["8236BC36",0xA657],
+  ["8236BC37",0xA658],
+  ["8236BC38",0xA659],
+  ["8236BC39",0xA65A],
+  ["8236BD30",0xA65B],
+  ["8236BD31",0xA65C],
+  ["8236BD32",0xA65D],
+  ["8236BD33",0xA65E],
+  ["8236BD34",0xA65F],
+  ["8236BD35",0xA660],
+  ["8236BD36",0xA661],
+  ["8236BD37",0xA662],
+  ["8236BD38",0xA663],
+  ["8236BD39",0xA664],
+  ["8236BE30",0xA665],
+  ["8236BE31",0xA666],
+  ["8236BE32",0xA667],
+  ["8236BE33",0xA668],
+  ["8236BE34",0xA669],
+  ["8236BE35",0xA66A],
+  ["8236BE36",0xA66B],
+  ["8236BE37",0xA66C],
+  ["8236BE38",0xA66D],
+  ["8236BE39",0xA66E],
+  ["8236BF30",0xA66F],
+  ["8236BF31",0xA670],
+  ["8236BF32",0xA671],
+  ["8236BF33",0xA672],
+  ["8236BF34",0xA673],
+  ["8236BF35",0xA674],
+  ["8236BF36",0xA675],
+  ["8236BF37",0xA676],
+  ["8236BF38",0xA677],
+  ["8236BF39",0xA678],
+  ["8236C030",0xA679],
+  ["8236C031",0xA67A],
+  ["8236C032",0xA67B],
+  ["8236C033",0xA67C],
+  ["8236C034",0xA67D],
+  ["8236C035",0xA67E],
+  ["8236C036",0xA67F],
+  ["8236C037",0xA680],
+  ["8236C038",0xA681],
+  ["8236C039",0xA682],
+  ["8236C130",0xA683],
+  ["8236C131",0xA684],
+  ["8236C132",0xA685],
+  ["8236C133",0xA686],
+  ["8236C134",0xA687],
+  ["8236C135",0xA688],
+  ["8236C136",0xA689],
+  ["8236C137",0xA68A],
+  ["8236C138",0xA68B],
+  ["8236C139",0xA68C],
+  ["8236C230",0xA68D],
+  ["8236C231",0xA68E],
+  ["8236C232",0xA68F],
+  ["8236C233",0xA690],
+  ["8236C234",0xA691],
+  ["8236C235",0xA692],
+  ["8236C236",0xA693],
+  ["8236C237",0xA694],
+  ["8236C238",0xA695],
+  ["8236C239",0xA696],
+  ["8236C330",0xA697],
+  ["8236C331",0xA698],
+  ["8236C332",0xA699],
+  ["8236C333",0xA69A],
+  ["8236C334",0xA69B],
+  ["8236C335",0xA69C],
+  ["8236C336",0xA69D],
+  ["8236C337",0xA69E],
+  ["8236C338",0xA69F],
+  ["8236C339",0xA6A0],
+  ["8236C430",0xA6A1],
+  ["8236C431",0xA6A2],
+  ["8236C432",0xA6A3],
+  ["8236C433",0xA6A4],
+  ["8236C434",0xA6A5],
+  ["8236C435",0xA6A6],
+  ["8236C436",0xA6A7],
+  ["8236C437",0xA6A8],
+  ["8236C438",0xA6A9],
+  ["8236C439",0xA6AA],
+  ["8236C530",0xA6AB],
+  ["8236C531",0xA6AC],
+  ["8236C532",0xA6AD],
+  ["8236C533",0xA6AE],
+  ["8236C534",0xA6AF],
+  ["8236C535",0xA6B0],
+  ["8236C536",0xA6B1],
+  ["8236C537",0xA6B2],
+  ["8236C538",0xA6B3],
+  ["8236C539",0xA6B4],
+  ["8236C630",0xA6B5],
+  ["8236C631",0xA6B6],
+  ["8236C632",0xA6B7],
+  ["8236C633",0xA6B8],
+  ["8236C634",0xA6B9],
+  ["8236C635",0xA6BA],
+  ["8236C636",0xA6BB],
+  ["8236C637",0xA6BC],
+  ["8236C638",0xA6BD],
+  ["8236C639",0xA6BE],
+  ["8236C730",0xA6BF],
+  ["8236C731",0xA6C0],
+  ["8236C732",0xA6C1],
+  ["8236C733",0xA6C2],
+  ["8236C734",0xA6C3],
+  ["8236C735",0xA6C4],
+  ["8236C736",0xA6C5],
+  ["8236C737",0xA6C6],
+  ["8236C738",0xA6C7],
+  ["8236C739",0xA6C8],
+  ["8236C830",0xA6C9],
+  ["8236C831",0xA6CA],
+  ["8236C832",0xA6CB],
+  ["8236C833",0xA6CC],
+  ["8236C834",0xA6CD],
+  ["8236C835",0xA6CE],
+  ["8236C836",0xA6CF],
+  ["8236C837",0xA6D0],
+  ["8236C838",0xA6D1],
+  ["8236C839",0xA6D2],
+  ["8236C930",0xA6D3],
+  ["8236C931",0xA6D4],
+  ["8236C932",0xA6D5],
+  ["8236C933",0xA6D6],
+  ["8236C934",0xA6D7],
+  ["8236C935",0xA6D8],
+  ["8236C936",0xA6D9],
+  ["8236C937",0xA6DA],
+  ["8236C938",0xA6DB],
+  ["8236C939",0xA6DC],
+  ["8236CA30",0xA6DD],
+  ["8236CA31",0xA6DE],
+  ["8236CA32",0xA6DF],
+  ["8236CA33",0xA6E0],
+  ["8236CA34",0xA6E1],
+  ["8236CA35",0xA6E2],
+  ["8236CA36",0xA6E3],
+  ["8236CA37",0xA6E4],
+  ["8236CA38",0xA6E5],
+  ["8236CA39",0xA6E6],
+  ["8236CB30",0xA6E7],
+  ["8236CB31",0xA6E8],
+  ["8236CB32",0xA6E9],
+  ["8236CB33",0xA6EA],
+  ["8236CB34",0xA6EB],
+  ["8236CB35",0xA6EC],
+  ["8236CB36",0xA6ED],
+  ["8236CB37",0xA6EE],
+  ["8236CB38",0xA6EF],
+  ["8236CB39",0xA6F0],
+  ["8236CC30",0xA6F1],
+  ["8236CC31",0xA6F2],
+  ["8236CC32",0xA6F3],
+  ["8236CC33",0xA6F4],
+  ["8236CC34",0xA6F5],
+  ["8236CC35",0xA6F6],
+  ["8236CC36",0xA6F7],
+  ["8236CC37",0xA6F8],
+  ["8236CC38",0xA6F9],
+  ["8236CC39",0xA6FA],
+  ["8236CD30",0xA6FB],
+  ["8236CD31",0xA6FC],
+  ["8236CD32",0xA6FD],
+  ["8236CD33",0xA6FE],
+  ["8236CD34",0xA6FF],
+  ["8236CD35",0xA700],
+  ["8236CD36",0xA701],
+  ["8236CD37",0xA702],
+  ["8236CD38",0xA703],
+  ["8236CD39",0xA704],
+  ["8236CE30",0xA705],
+  ["8236CE31",0xA706],
+  ["8236CE32",0xA707],
+  ["8236CE33",0xA708],
+  ["8236CE34",0xA709],
+  ["8236CE35",0xA70A],
+  ["8236CE36",0xA70B],
+  ["8236CE37",0xA70C],
+  ["8236CE38",0xA70D],
+  ["8236CE39",0xA70E],
+  ["8236CF30",0xA70F],
+  ["8236CF31",0xA710],
+  ["8236CF32",0xA711],
+  ["8236CF33",0xA712],
+  ["8236CF34",0xA713],
+  ["8236CF35",0xA714],
+  ["8236CF36",0xA715],
+  ["8236CF37",0xA716],
+  ["8236CF38",0xA717],
+  ["8236CF39",0xA718],
+  ["8236D030",0xA719],
+  ["8236D031",0xA71A],
+  ["8236D032",0xA71B],
+  ["8236D033",0xA71C],
+  ["8236D034",0xA71D],
+  ["8236D035",0xA71E],
+  ["8236D036",0xA71F],
+  ["8236D037",0xA720],
+  ["8236D038",0xA721],
+  ["8236D039",0xA722],
+  ["8236D130",0xA723],
+  ["8236D131",0xA724],
+  ["8236D132",0xA725],
+  ["8236D133",0xA726],
+  ["8236D134",0xA727],
+  ["8236D135",0xA728],
+  ["8236D136",0xA729],
+  ["8236D137",0xA72A],
+  ["8236D138",0xA72B],
+  ["8236D139",0xA72C],
+  ["8236D230",0xA72D],
+  ["8236D231",0xA72E],
+  ["8236D232",0xA72F],
+  ["8236D233",0xA730],
+  ["8236D234",0xA731],
+  ["8236D235",0xA732],
+  ["8236D236",0xA733],
+  ["8236D237",0xA734],
+  ["8236D238",0xA735],
+  ["8236D239",0xA736],
+  ["8236D330",0xA737],
+  ["8236D331",0xA738],
+  ["8236D332",0xA739],
+  ["8236D333",0xA73A],
+  ["8236D334",0xA73B],
+  ["8236D335",0xA73C],
+  ["8236D336",0xA73D],
+  ["8236D337",0xA73E],
+  ["8236D338",0xA73F],
+  ["8236D339",0xA740],
+  ["8236D430",0xA741],
+  ["8236D431",0xA742],
+  ["8236D432",0xA743],
+  ["8236D433",0xA744],
+  ["8236D434",0xA745],
+  ["8236D435",0xA746],
+  ["8236D436",0xA747],
+  ["8236D437",0xA748],
+  ["8236D438",0xA749],
+  ["8236D439",0xA74A],
+  ["8236D530",0xA74B],
+  ["8236D531",0xA74C],
+  ["8236D532",0xA74D],
+  ["8236D533",0xA74E],
+  ["8236D534",0xA74F],
+  ["8236D535",0xA750],
+  ["8236D536",0xA751],
+  ["8236D537",0xA752],
+  ["8236D538",0xA753],
+  ["8236D539",0xA754],
+  ["8236D630",0xA755],
+  ["8236D631",0xA756],
+  ["8236D632",0xA757],
+  ["8236D633",0xA758],
+  ["8236D634",0xA759],
+  ["8236D635",0xA75A],
+  ["8236D636",0xA75B],
+  ["8236D637",0xA75C],
+  ["8236D638",0xA75D],
+  ["8236D639",0xA75E],
+  ["8236D730",0xA75F],
+  ["8236D731",0xA760],
+  ["8236D732",0xA761],
+  ["8236D733",0xA762],
+  ["8236D734",0xA763],
+  ["8236D735",0xA764],
+  ["8236D736",0xA765],
+  ["8236D737",0xA766],
+  ["8236D738",0xA767],
+  ["8236D739",0xA768],
+  ["8236D830",0xA769],
+  ["8236D831",0xA76A],
+  ["8236D832",0xA76B],
+  ["8236D833",0xA76C],
+  ["8236D834",0xA76D],
+  ["8236D835",0xA76E],
+  ["8236D836",0xA76F],
+  ["8236D837",0xA770],
+  ["8236D838",0xA771],
+  ["8236D839",0xA772],
+  ["8236D930",0xA773],
+  ["8236D931",0xA774],
+  ["8236D932",0xA775],
+  ["8236D933",0xA776],
+  ["8236D934",0xA777],
+  ["8236D935",0xA778],
+  ["8236D936",0xA779],
+  ["8236D937",0xA77A],
+  ["8236D938",0xA77B],
+  ["8236D939",0xA77C],
+  ["8236DA30",0xA77D],
+  ["8236DA31",0xA77E],
+  ["8236DA32",0xA77F],
+  ["8236DA33",0xA780],
+  ["8236DA34",0xA781],
+  ["8236DA35",0xA782],
+  ["8236DA36",0xA783],
+  ["8236DA37",0xA784],
+  ["8236DA38",0xA785],
+  ["8236DA39",0xA786],
+  ["8236DB30",0xA787],
+  ["8236DB31",0xA788],
+  ["8236DB32",0xA789],
+  ["8236DB33",0xA78A],
+  ["8236DB34",0xA78B],
+  ["8236DB35",0xA78C],
+  ["8236DB36",0xA78D],
+  ["8236DB37",0xA78E],
+  ["8236DB38",0xA78F],
+  ["8236DB39",0xA790],
+  ["8236DC30",0xA791],
+  ["8236DC31",0xA792],
+  ["8236DC32",0xA793],
+  ["8236DC33",0xA794],
+  ["8236DC34",0xA795],
+  ["8236DC35",0xA796],
+  ["8236DC36",0xA797],
+  ["8236DC37",0xA798],
+  ["8236DC38",0xA799],
+  ["8236DC39",0xA79A],
+  ["8236DD30",0xA79B],
+  ["8236DD31",0xA79C],
+  ["8236DD32",0xA79D],
+  ["8236DD33",0xA79E],
+  ["8236DD34",0xA79F],
+  ["8236DD35",0xA7A0],
+  ["8236DD36",0xA7A1],
+  ["8236DD37",0xA7A2],
+  ["8236DD38",0xA7A3],
+  ["8236DD39",0xA7A4],
+  ["8236DE30",0xA7A5],
+  ["8236DE31",0xA7A6],
+  ["8236DE32",0xA7A7],
+  ["8236DE33",0xA7A8],
+  ["8236DE34",0xA7A9],
+  ["8236DE35",0xA7AA],
+  ["8236DE36",0xA7AB],
+  ["8236DE37",0xA7AC],
+  ["8236DE38",0xA7AD],
+  ["8236DE39",0xA7AE],
+  ["8236DF30",0xA7AF],
+  ["8236DF31",0xA7B0],
+  ["8236DF32",0xA7B1],
+  ["8236DF33",0xA7B2],
+  ["8236DF34",0xA7B3],
+  ["8236DF35",0xA7B4],
+  ["8236DF36",0xA7B5],
+  ["8236DF37",0xA7B6],
+  ["8236DF38",0xA7B7],
+  ["8236DF39",0xA7B8],
+  ["8236E030",0xA7B9],
+  ["8236E031",0xA7BA],
+  ["8236E032",0xA7BB],
+  ["8236E033",0xA7BC],
+  ["8236E034",0xA7BD],
+  ["8236E035",0xA7BE],
+  ["8236E036",0xA7BF],
+  ["8236E037",0xA7C0],
+  ["8236E038",0xA7C1],
+  ["8236E039",0xA7C2],
+  ["8236E130",0xA7C3],
+  ["8236E131",0xA7C4],
+  ["8236E132",0xA7C5],
+  ["8236E133",0xA7C6],
+  ["8236E134",0xA7C7],
+  ["8236E135",0xA7C8],
+  ["8236E136",0xA7C9],
+  ["8236E137",0xA7CA],
+  ["8236E138",0xA7CB],
+  ["8236E139",0xA7CC],
+  ["8236E230",0xA7CD],
+  ["8236E231",0xA7CE],
+  ["8236E232",0xA7CF],
+  ["8236E233",0xA7D0],
+  ["8236E234",0xA7D1],
+  ["8236E235",0xA7D2],
+  ["8236E236",0xA7D3],
+  ["8236E237",0xA7D4],
+  ["8236E238",0xA7D5],
+  ["8236E239",0xA7D6],
+  ["8236E330",0xA7D7],
+  ["8236E331",0xA7D8],
+  ["8236E332",0xA7D9],
+  ["8236E333",0xA7DA],
+  ["8236E334",0xA7DB],
+  ["8236E335",0xA7DC],
+  ["8236E336",0xA7DD],
+  ["8236E337",0xA7DE],
+  ["8236E338",0xA7DF],
+  ["8236E339",0xA7E0],
+  ["8236E430",0xA7E1],
+  ["8236E431",0xA7E2],
+  ["8236E432",0xA7E3],
+  ["8236E433",0xA7E4],
+  ["8236E434",0xA7E5],
+  ["8236E435",0xA7E6],
+  ["8236E436",0xA7E7],
+  ["8236E437",0xA7E8],
+  ["8236E438",0xA7E9],
+  ["8236E439",0xA7EA],
+  ["8236E530",0xA7EB],
+  ["8236E531",0xA7EC],
+  ["8236E532",0xA7ED],
+  ["8236E533",0xA7EE],
+  ["8236E534",0xA7EF],
+  ["8236E535",0xA7F0],
+  ["8236E536",0xA7F1],
+  ["8236E537",0xA7F2],
+  ["8236E538",0xA7F3],
+  ["8236E539",0xA7F4],
+  ["8236E630",0xA7F5],
+  ["8236E631",0xA7F6],
+  ["8236E632",0xA7F7],
+  ["8236E633",0xA7F8],
+  ["8236E634",0xA7F9],
+  ["8236E635",0xA7FA],
+  ["8236E636",0xA7FB],
+  ["8236E637",0xA7FC],
+  ["8236E638",0xA7FD],
+  ["8236E639",0xA7FE],
+  ["8236E730",0xA7FF],
+  ["8236E731",0xA800],
+  ["8236E732",0xA801],
+  ["8236E733",0xA802],
+  ["8236E734",0xA803],
+  ["8236E735",0xA804],
+  ["8236E736",0xA805],
+  ["8236E737",0xA806],
+  ["8236E738",0xA807],
+  ["8236E739",0xA808],
+  ["8236E830",0xA809],
+  ["8236E831",0xA80A],
+  ["8236E832",0xA80B],
+  ["8236E833",0xA80C],
+  ["8236E834",0xA80D],
+  ["8236E835",0xA80E],
+  ["8236E836",0xA80F],
+  ["8236E837",0xA810],
+  ["8236E838",0xA811],
+  ["8236E839",0xA812],
+  ["8236E930",0xA813],
+  ["8236E931",0xA814],
+  ["8236E932",0xA815],
+  ["8236E933",0xA816],
+  ["8236E934",0xA817],
+  ["8236E935",0xA818],
+  ["8236E936",0xA819],
+  ["8236E937",0xA81A],
+  ["8236E938",0xA81B],
+  ["8236E939",0xA81C],
+  ["8236EA30",0xA81D],
+  ["8236EA31",0xA81E],
+  ["8236EA32",0xA81F],
+  ["8236EA33",0xA820],
+  ["8236EA34",0xA821],
+  ["8236EA35",0xA822],
+  ["8236EA36",0xA823],
+  ["8236EA37",0xA824],
+  ["8236EA38",0xA825],
+  ["8236EA39",0xA826],
+  ["8236EB30",0xA827],
+  ["8236EB31",0xA828],
+  ["8236EB32",0xA829],
+  ["8236EB33",0xA82A],
+  ["8236EB34",0xA82B],
+  ["8236EB35",0xA82C],
+  ["8236EB36",0xA82D],
+  ["8236EB37",0xA82E],
+  ["8236EB38",0xA82F],
+  ["8236EB39",0xA830],
+  ["8236EC30",0xA831],
+  ["8236EC31",0xA832],
+  ["8236EC32",0xA833],
+  ["8236EC33",0xA834],
+  ["8236EC34",0xA835],
+  ["8236EC35",0xA836],
+  ["8236EC36",0xA837],
+  ["8236EC37",0xA838],
+  ["8236EC38",0xA839],
+  ["8236EC39",0xA83A],
+  ["8236ED30",0xA83B],
+  ["8236ED31",0xA83C],
+  ["8236ED32",0xA83D],
+  ["8236ED33",0xA83E],
+  ["8236ED34",0xA83F],
+  ["8236ED35",0xA840],
+  ["8236ED36",0xA841],
+  ["8236ED37",0xA842],
+  ["8236ED38",0xA843],
+  ["8236ED39",0xA844],
+  ["8236EE30",0xA845],
+  ["8236EE31",0xA846],
+  ["8236EE32",0xA847],
+  ["8236EE33",0xA848],
+  ["8236EE34",0xA849],
+  ["8236EE35",0xA84A],
+  ["8236EE36",0xA84B],
+  ["8236EE37",0xA84C],
+  ["8236EE38",0xA84D],
+  ["8236EE39",0xA84E],
+  ["8236EF30",0xA84F],
+  ["8236EF31",0xA850],
+  ["8236EF32",0xA851],
+  ["8236EF33",0xA852],
+  ["8236EF34",0xA853],
+  ["8236EF35",0xA854],
+  ["8236EF36",0xA855],
+  ["8236EF37",0xA856],
+  ["8236EF38",0xA857],
+  ["8236EF39",0xA858],
+  ["8236F030",0xA859],
+  ["8236F031",0xA85A],
+  ["8236F032",0xA85B],
+  ["8236F033",0xA85C],
+  ["8236F034",0xA85D],
+  ["8236F035",0xA85E],
+  ["8236F036",0xA85F],
+  ["8236F037",0xA860],
+  ["8236F038",0xA861],
+  ["8236F039",0xA862],
+  ["8236F130",0xA863],
+  ["8236F131",0xA864],
+  ["8236F132",0xA865],
+  ["8236F133",0xA866],
+  ["8236F134",0xA867],
+  ["8236F135",0xA868],
+  ["8236F136",0xA869],
+  ["8236F137",0xA86A],
+  ["8236F138",0xA86B],
+  ["8236F139",0xA86C],
+  ["8236F230",0xA86D],
+  ["8236F231",0xA86E],
+  ["8236F232",0xA86F],
+  ["8236F233",0xA870],
+  ["8236F234",0xA871],
+  ["8236F235",0xA872],
+  ["8236F236",0xA873],
+  ["8236F237",0xA874],
+  ["8236F238",0xA875],
+  ["8236F239",0xA876],
+  ["8236F330",0xA877],
+  ["8236F331",0xA878],
+  ["8236F332",0xA879],
+  ["8236F333",0xA87A],
+  ["8236F334",0xA87B],
+  ["8236F335",0xA87C],
+  ["8236F336",0xA87D],
+  ["8236F337",0xA87E],
+  ["8236F338",0xA87F],
+  ["8236F339",0xA880],
+  ["8236F430",0xA881],
+  ["8236F431",0xA882],
+  ["8236F432",0xA883],
+  ["8236F433",0xA884],
+  ["8236F434",0xA885],
+  ["8236F435",0xA886],
+  ["8236F436",0xA887],
+  ["8236F437",0xA888],
+  ["8236F438",0xA889],
+  ["8236F439",0xA88A],
+  ["8236F530",0xA88B],
+  ["8236F531",0xA88C],
+  ["8236F532",0xA88D],
+  ["8236F533",0xA88E],
+  ["8236F534",0xA88F],
+  ["8236F535",0xA890],
+  ["8236F536",0xA891],
+  ["8236F537",0xA892],
+  ["8236F538",0xA893],
+  ["8236F539",0xA894],
+  ["8236F630",0xA895],
+  ["8236F631",0xA896],
+  ["8236F632",0xA897],
+  ["8236F633",0xA898],
+  ["8236F634",0xA899],
+  ["8236F635",0xA89A],
+  ["8236F636",0xA89B],
+  ["8236F637",0xA89C],
+  ["8236F638",0xA89D],
+  ["8236F639",0xA89E],
+  ["8236F730",0xA89F],
+  ["8236F731",0xA8A0],
+  ["8236F732",0xA8A1],
+  ["8236F733",0xA8A2],
+  ["8236F734",0xA8A3],
+  ["8236F735",0xA8A4],
+  ["8236F736",0xA8A5],
+  ["8236F737",0xA8A6],
+  ["8236F738",0xA8A7],
+  ["8236F739",0xA8A8],
+  ["8236F830",0xA8A9],
+  ["8236F831",0xA8AA],
+  ["8236F832",0xA8AB],
+  ["8236F833",0xA8AC],
+  ["8236F834",0xA8AD],
+  ["8236F835",0xA8AE],
+  ["8236F836",0xA8AF],
+  ["8236F837",0xA8B0],
+  ["8236F838",0xA8B1],
+  ["8236F839",0xA8B2],
+  ["8236F930",0xA8B3],
+  ["8236F931",0xA8B4],
+  ["8236F932",0xA8B5],
+  ["8236F933",0xA8B6],
+  ["8236F934",0xA8B7],
+  ["8236F935",0xA8B8],
+  ["8236F936",0xA8B9],
+  ["8236F937",0xA8BA],
+  ["8236F938",0xA8BB],
+  ["8236F939",0xA8BC],
+  ["8236FA30",0xA8BD],
+  ["8236FA31",0xA8BE],
+  ["8236FA32",0xA8BF],
+  ["8236FA33",0xA8C0],
+  ["8236FA34",0xA8C1],
+  ["8236FA35",0xA8C2],
+  ["8236FA36",0xA8C3],
+  ["8236FA37",0xA8C4],
+  ["8236FA38",0xA8C5],
+  ["8236FA39",0xA8C6],
+  ["8236FB30",0xA8C7],
+  ["8236FB31",0xA8C8],
+  ["8236FB32",0xA8C9],
+  ["8236FB33",0xA8CA],
+  ["8236FB34",0xA8CB],
+  ["8236FB35",0xA8CC],
+  ["8236FB36",0xA8CD],
+  ["8236FB37",0xA8CE],
+  ["8236FB38",0xA8CF],
+  ["8236FB39",0xA8D0],
+  ["8236FC30",0xA8D1],
+  ["8236FC31",0xA8D2],
+  ["8236FC32",0xA8D3],
+  ["8236FC33",0xA8D4],
+  ["8236FC34",0xA8D5],
+  ["8236FC35",0xA8D6],
+  ["8236FC36",0xA8D7],
+  ["8236FC37",0xA8D8],
+  ["8236FC38",0xA8D9],
+  ["8236FC39",0xA8DA],
+  ["8236FD30",0xA8DB],
+  ["8236FD31",0xA8DC],
+  ["8236FD32",0xA8DD],
+  ["8236FD33",0xA8DE],
+  ["8236FD34",0xA8DF],
+  ["8236FD35",0xA8E0],
+  ["8236FD36",0xA8E1],
+  ["8236FD37",0xA8E2],
+  ["8236FD38",0xA8E3],
+  ["8236FD39",0xA8E4],
+  ["8236FE30",0xA8E5],
+  ["8236FE31",0xA8E6],
+  ["8236FE32",0xA8E7],
+  ["8236FE33",0xA8E8],
+  ["8236FE34",0xA8E9],
+  ["8236FE35",0xA8EA],
+  ["8236FE36",0xA8EB],
+  ["8236FE37",0xA8EC],
+  ["8236FE38",0xA8ED],
+  ["8236FE39",0xA8EE],
+  ["82378130",0xA8EF],
+  ["82378131",0xA8F0],
+  ["82378132",0xA8F1],
+  ["82378133",0xA8F2],
+  ["82378134",0xA8F3],
+  ["82378135",0xA8F4],
+  ["82378136",0xA8F5],
+  ["82378137",0xA8F6],
+  ["82378138",0xA8F7],
+  ["82378139",0xA8F8],
+  ["82378230",0xA8F9],
+  ["82378231",0xA8FA],
+  ["82378232",0xA8FB],
+  ["82378233",0xA8FC],
+  ["82378234",0xA8FD],
+  ["82378235",0xA8FE],
+  ["82378236",0xA8FF],
+  ["82378237",0xA900],
+  ["82378238",0xA901],
+  ["82378239",0xA902],
+  ["82378330",0xA903],
+  ["82378331",0xA904],
+  ["82378332",0xA905],
+  ["82378333",0xA906],
+  ["82378334",0xA907],
+  ["82378335",0xA908],
+  ["82378336",0xA909],
+  ["82378337",0xA90A],
+  ["82378338",0xA90B],
+  ["82378339",0xA90C],
+  ["82378430",0xA90D],
+  ["82378431",0xA90E],
+  ["82378432",0xA90F],
+  ["82378433",0xA910],
+  ["82378434",0xA911],
+  ["82378435",0xA912],
+  ["82378436",0xA913],
+  ["82378437",0xA914],
+  ["82378438",0xA915],
+  ["82378439",0xA916],
+  ["82378530",0xA917],
+  ["82378531",0xA918],
+  ["82378532",0xA919],
+  ["82378533",0xA91A],
+  ["82378534",0xA91B],
+  ["82378535",0xA91C],
+  ["82378536",0xA91D],
+  ["82378537",0xA91E],
+  ["82378538",0xA91F],
+  ["82378539",0xA920],
+  ["82378630",0xA921],
+  ["82378631",0xA922],
+  ["82378632",0xA923],
+  ["82378633",0xA924],
+  ["82378634",0xA925],
+  ["82378635",0xA926],
+  ["82378636",0xA927],
+  ["82378637",0xA928],
+  ["82378638",0xA929],
+  ["82378639",0xA92A],
+  ["82378730",0xA92B],
+  ["82378731",0xA92C],
+  ["82378732",0xA92D],
+  ["82378733",0xA92E],
+  ["82378734",0xA92F],
+  ["82378735",0xA930],
+  ["82378736",0xA931],
+  ["82378737",0xA932],
+  ["82378738",0xA933],
+  ["82378739",0xA934],
+  ["82378830",0xA935],
+  ["82378831",0xA936],
+  ["82378832",0xA937],
+  ["82378833",0xA938],
+  ["82378834",0xA939],
+  ["82378835",0xA93A],
+  ["82378836",0xA93B],
+  ["82378837",0xA93C],
+  ["82378838",0xA93D],
+  ["82378839",0xA93E],
+  ["82378930",0xA93F],
+  ["82378931",0xA940],
+  ["82378932",0xA941],
+  ["82378933",0xA942],
+  ["82378934",0xA943],
+  ["82378935",0xA944],
+  ["82378936",0xA945],
+  ["82378937",0xA946],
+  ["82378938",0xA947],
+  ["82378939",0xA948],
+  ["82378A30",0xA949],
+  ["82378A31",0xA94A],
+  ["82378A32",0xA94B],
+  ["82378A33",0xA94C],
+  ["82378A34",0xA94D],
+  ["82378A35",0xA94E],
+  ["82378A36",0xA94F],
+  ["82378A37",0xA950],
+  ["82378A38",0xA951],
+  ["82378A39",0xA952],
+  ["82378B30",0xA953],
+  ["82378B31",0xA954],
+  ["82378B32",0xA955],
+  ["82378B33",0xA956],
+  ["82378B34",0xA957],
+  ["82378B35",0xA958],
+  ["82378B36",0xA959],
+  ["82378B37",0xA95A],
+  ["82378B38",0xA95B],
+  ["82378B39",0xA95C],
+  ["82378C30",0xA95D],
+  ["82378C31",0xA95E],
+  ["82378C32",0xA95F],
+  ["82378C33",0xA960],
+  ["82378C34",0xA961],
+  ["82378C35",0xA962],
+  ["82378C36",0xA963],
+  ["82378C37",0xA964],
+  ["82378C38",0xA965],
+  ["82378C39",0xA966],
+  ["82378D30",0xA967],
+  ["82378D31",0xA968],
+  ["82378D32",0xA969],
+  ["82378D33",0xA96A],
+  ["82378D34",0xA96B],
+  ["82378D35",0xA96C],
+  ["82378D36",0xA96D],
+  ["82378D37",0xA96E],
+  ["82378D38",0xA96F],
+  ["82378D39",0xA970],
+  ["82378E30",0xA971],
+  ["82378E31",0xA972],
+  ["82378E32",0xA973],
+  ["82378E33",0xA974],
+  ["82378E34",0xA975],
+  ["82378E35",0xA976],
+  ["82378E36",0xA977],
+  ["82378E37",0xA978],
+  ["82378E38",0xA979],
+  ["82378E39",0xA97A],
+  ["82378F30",0xA97B],
+  ["82378F31",0xA97C],
+  ["82378F32",0xA97D],
+  ["82378F33",0xA97E],
+  ["82378F34",0xA97F],
+  ["82378F35",0xA980],
+  ["82378F36",0xA981],
+  ["82378F37",0xA982],
+  ["82378F38",0xA983],
+  ["82378F39",0xA984],
+  ["82379030",0xA985],
+  ["82379031",0xA986],
+  ["82379032",0xA987],
+  ["82379033",0xA988],
+  ["82379034",0xA989],
+  ["82379035",0xA98A],
+  ["82379036",0xA98B],
+  ["82379037",0xA98C],
+  ["82379038",0xA98D],
+  ["82379039",0xA98E],
+  ["82379130",0xA98F],
+  ["82379131",0xA990],
+  ["82379132",0xA991],
+  ["82379133",0xA992],
+  ["82379134",0xA993],
+  ["82379135",0xA994],
+  ["82379136",0xA995],
+  ["82379137",0xA996],
+  ["82379138",0xA997],
+  ["82379139",0xA998],
+  ["82379230",0xA999],
+  ["82379231",0xA99A],
+  ["82379232",0xA99B],
+  ["82379233",0xA99C],
+  ["82379234",0xA99D],
+  ["82379235",0xA99E],
+  ["82379236",0xA99F],
+  ["82379237",0xA9A0],
+  ["82379238",0xA9A1],
+  ["82379239",0xA9A2],
+  ["82379330",0xA9A3],
+  ["82379331",0xA9A4],
+  ["82379332",0xA9A5],
+  ["82379333",0xA9A6],
+  ["82379334",0xA9A7],
+  ["82379335",0xA9A8],
+  ["82379336",0xA9A9],
+  ["82379337",0xA9AA],
+  ["82379338",0xA9AB],
+  ["82379339",0xA9AC],
+  ["82379430",0xA9AD],
+  ["82379431",0xA9AE],
+  ["82379432",0xA9AF],
+  ["82379433",0xA9B0],
+  ["82379434",0xA9B1],
+  ["82379435",0xA9B2],
+  ["82379436",0xA9B3],
+  ["82379437",0xA9B4],
+  ["82379438",0xA9B5],
+  ["82379439",0xA9B6],
+  ["82379530",0xA9B7],
+  ["82379531",0xA9B8],
+  ["82379532",0xA9B9],
+  ["82379533",0xA9BA],
+  ["82379534",0xA9BB],
+  ["82379535",0xA9BC],
+  ["82379536",0xA9BD],
+  ["82379537",0xA9BE],
+  ["82379538",0xA9BF],
+  ["82379539",0xA9C0],
+  ["82379630",0xA9C1],
+  ["82379631",0xA9C2],
+  ["82379632",0xA9C3],
+  ["82379633",0xA9C4],
+  ["82379634",0xA9C5],
+  ["82379635",0xA9C6],
+  ["82379636",0xA9C7],
+  ["82379637",0xA9C8],
+  ["82379638",0xA9C9],
+  ["82379639",0xA9CA],
+  ["82379730",0xA9CB],
+  ["82379731",0xA9CC],
+  ["82379732",0xA9CD],
+  ["82379733",0xA9CE],
+  ["82379734",0xA9CF],
+  ["82379735",0xA9D0],
+  ["82379736",0xA9D1],
+  ["82379737",0xA9D2],
+  ["82379738",0xA9D3],
+  ["82379739",0xA9D4],
+  ["82379830",0xA9D5],
+  ["82379831",0xA9D6],
+  ["82379832",0xA9D7],
+  ["82379833",0xA9D8],
+  ["82379834",0xA9D9],
+  ["82379835",0xA9DA],
+  ["82379836",0xA9DB],
+  ["82379837",0xA9DC],
+  ["82379838",0xA9DD],
+  ["82379839",0xA9DE],
+  ["82379930",0xA9DF],
+  ["82379931",0xA9E0],
+  ["82379932",0xA9E1],
+  ["82379933",0xA9E2],
+  ["82379934",0xA9E3],
+  ["82379935",0xA9E4],
+  ["82379936",0xA9E5],
+  ["82379937",0xA9E6],
+  ["82379938",0xA9E7],
+  ["82379939",0xA9E8],
+  ["82379A30",0xA9E9],
+  ["82379A31",0xA9EA],
+  ["82379A32",0xA9EB],
+  ["82379A33",0xA9EC],
+  ["82379A34",0xA9ED],
+  ["82379A35",0xA9EE],
+  ["82379A36",0xA9EF],
+  ["82379A37",0xA9F0],
+  ["82379A38",0xA9F1],
+  ["82379A39",0xA9F2],
+  ["82379B30",0xA9F3],
+  ["82379B31",0xA9F4],
+  ["82379B32",0xA9F5],
+  ["82379B33",0xA9F6],
+  ["82379B34",0xA9F7],
+  ["82379B35",0xA9F8],
+  ["82379B36",0xA9F9],
+  ["82379B37",0xA9FA],
+  ["82379B38",0xA9FB],
+  ["82379B39",0xA9FC],
+  ["82379C30",0xA9FD],
+  ["82379C31",0xA9FE],
+  ["82379C32",0xA9FF],
+  ["82379C33",0xAA00],
+  ["82379C34",0xAA01],
+  ["82379C35",0xAA02],
+  ["82379C36",0xAA03],
+  ["82379C37",0xAA04],
+  ["82379C38",0xAA05],
+  ["82379C39",0xAA06],
+  ["82379D30",0xAA07],
+  ["82379D31",0xAA08],
+  ["82379D32",0xAA09],
+  ["82379D33",0xAA0A],
+  ["82379D34",0xAA0B],
+  ["82379D35",0xAA0C],
+  ["82379D36",0xAA0D],
+  ["82379D37",0xAA0E],
+  ["82379D38",0xAA0F],
+  ["82379D39",0xAA10],
+  ["82379E30",0xAA11],
+  ["82379E31",0xAA12],
+  ["82379E32",0xAA13],
+  ["82379E33",0xAA14],
+  ["82379E34",0xAA15],
+  ["82379E35",0xAA16],
+  ["82379E36",0xAA17],
+  ["82379E37",0xAA18],
+  ["82379E38",0xAA19],
+  ["82379E39",0xAA1A],
+  ["82379F30",0xAA1B],
+  ["82379F31",0xAA1C],
+  ["82379F32",0xAA1D],
+  ["82379F33",0xAA1E],
+  ["82379F34",0xAA1F],
+  ["82379F35",0xAA20],
+  ["82379F36",0xAA21],
+  ["82379F37",0xAA22],
+  ["82379F38",0xAA23],
+  ["82379F39",0xAA24],
+  ["8237A030",0xAA25],
+  ["8237A031",0xAA26],
+  ["8237A032",0xAA27],
+  ["8237A033",0xAA28],
+  ["8237A034",0xAA29],
+  ["8237A035",0xAA2A],
+  ["8237A036",0xAA2B],
+  ["8237A037",0xAA2C],
+  ["8237A038",0xAA2D],
+  ["8237A039",0xAA2E],
+  ["8237A130",0xAA2F],
+  ["8237A131",0xAA30],
+  ["8237A132",0xAA31],
+  ["8237A133",0xAA32],
+  ["8237A134",0xAA33],
+  ["8237A135",0xAA34],
+  ["8237A136",0xAA35],
+  ["8237A137",0xAA36],
+  ["8237A138",0xAA37],
+  ["8237A139",0xAA38],
+  ["8237A230",0xAA39],
+  ["8237A231",0xAA3A],
+  ["8237A232",0xAA3B],
+  ["8237A233",0xAA3C],
+  ["8237A234",0xAA3D],
+  ["8237A235",0xAA3E],
+  ["8237A236",0xAA3F],
+  ["8237A237",0xAA40],
+  ["8237A238",0xAA41],
+  ["8237A239",0xAA42],
+  ["8237A330",0xAA43],
+  ["8237A331",0xAA44],
+  ["8237A332",0xAA45],
+  ["8237A333",0xAA46],
+  ["8237A334",0xAA47],
+  ["8237A335",0xAA48],
+  ["8237A336",0xAA49],
+  ["8237A337",0xAA4A],
+  ["8237A338",0xAA4B],
+  ["8237A339",0xAA4C],
+  ["8237A430",0xAA4D],
+  ["8237A431",0xAA4E],
+  ["8237A432",0xAA4F],
+  ["8237A433",0xAA50],
+  ["8237A434",0xAA51],
+  ["8237A435",0xAA52],
+  ["8237A436",0xAA53],
+  ["8237A437",0xAA54],
+  ["8237A438",0xAA55],
+  ["8237A439",0xAA56],
+  ["8237A530",0xAA57],
+  ["8237A531",0xAA58],
+  ["8237A532",0xAA59],
+  ["8237A533",0xAA5A],
+  ["8237A534",0xAA5B],
+  ["8237A535",0xAA5C],
+  ["8237A536",0xAA5D],
+  ["8237A537",0xAA5E],
+  ["8237A538",0xAA5F],
+  ["8237A539",0xAA60],
+  ["8237A630",0xAA61],
+  ["8237A631",0xAA62],
+  ["8237A632",0xAA63],
+  ["8237A633",0xAA64],
+  ["8237A634",0xAA65],
+  ["8237A635",0xAA66],
+  ["8237A636",0xAA67],
+  ["8237A637",0xAA68],
+  ["8237A638",0xAA69],
+  ["8237A639",0xAA6A],
+  ["8237A730",0xAA6B],
+  ["8237A731",0xAA6C],
+  ["8237A732",0xAA6D],
+  ["8237A733",0xAA6E],
+  ["8237A734",0xAA6F],
+  ["8237A735",0xAA70],
+  ["8237A736",0xAA71],
+  ["8237A737",0xAA72],
+  ["8237A738",0xAA73],
+  ["8237A739",0xAA74],
+  ["8237A830",0xAA75],
+  ["8237A831",0xAA76],
+  ["8237A832",0xAA77],
+  ["8237A833",0xAA78],
+  ["8237A834",0xAA79],
+  ["8237A835",0xAA7A],
+  ["8237A836",0xAA7B],
+  ["8237A837",0xAA7C],
+  ["8237A838",0xAA7D],
+  ["8237A839",0xAA7E],
+  ["8237A930",0xAA7F],
+  ["8237A931",0xAA80],
+  ["8237A932",0xAA81],
+  ["8237A933",0xAA82],
+  ["8237A934",0xAA83],
+  ["8237A935",0xAA84],
+  ["8237A936",0xAA85],
+  ["8237A937",0xAA86],
+  ["8237A938",0xAA87],
+  ["8237A939",0xAA88],
+  ["8237AA30",0xAA89],
+  ["8237AA31",0xAA8A],
+  ["8237AA32",0xAA8B],
+  ["8237AA33",0xAA8C],
+  ["8237AA34",0xAA8D],
+  ["8237AA35",0xAA8E],
+  ["8237AA36",0xAA8F],
+  ["8237AA37",0xAA90],
+  ["8237AA38",0xAA91],
+  ["8237AA39",0xAA92],
+  ["8237AB30",0xAA93],
+  ["8237AB31",0xAA94],
+  ["8237AB32",0xAA95],
+  ["8237AB33",0xAA96],
+  ["8237AB34",0xAA97],
+  ["8237AB35",0xAA98],
+  ["8237AB36",0xAA99],
+  ["8237AB37",0xAA9A],
+  ["8237AB38",0xAA9B],
+  ["8237AB39",0xAA9C],
+  ["8237AC30",0xAA9D],
+  ["8237AC31",0xAA9E],
+  ["8237AC32",0xAA9F],
+  ["8237AC33",0xAAA0],
+  ["8237AC34",0xAAA1],
+  ["8237AC35",0xAAA2],
+  ["8237AC36",0xAAA3],
+  ["8237AC37",0xAAA4],
+  ["8237AC38",0xAAA5],
+  ["8237AC39",0xAAA6],
+  ["8237AD30",0xAAA7],
+  ["8237AD31",0xAAA8],
+  ["8237AD32",0xAAA9],
+  ["8237AD33",0xAAAA],
+  ["8237AD34",0xAAAB],
+  ["8237AD35",0xAAAC],
+  ["8237AD36",0xAAAD],
+  ["8237AD37",0xAAAE],
+  ["8237AD38",0xAAAF],
+  ["8237AD39",0xAAB0],
+  ["8237AE30",0xAAB1],
+  ["8237AE31",0xAAB2],
+  ["8237AE32",0xAAB3],
+  ["8237AE33",0xAAB4],
+  ["8237AE34",0xAAB5],
+  ["8237AE35",0xAAB6],
+  ["8237AE36",0xAAB7],
+  ["8237AE37",0xAAB8],
+  ["8237AE38",0xAAB9],
+  ["8237AE39",0xAABA],
+  ["8237AF30",0xAABB],
+  ["8237AF31",0xAABC],
+  ["8237AF32",0xAABD],
+  ["8237AF33",0xAABE],
+  ["8237AF34",0xAABF],
+  ["8237AF35",0xAAC0],
+  ["8237AF36",0xAAC1],
+  ["8237AF37",0xAAC2],
+  ["8237AF38",0xAAC3],
+  ["8237AF39",0xAAC4],
+  ["8237B030",0xAAC5],
+  ["8237B031",0xAAC6],
+  ["8237B032",0xAAC7],
+  ["8237B033",0xAAC8],
+  ["8237B034",0xAAC9],
+  ["8237B035",0xAACA],
+  ["8237B036",0xAACB],
+  ["8237B037",0xAACC],
+  ["8237B038",0xAACD],
+  ["8237B039",0xAACE],
+  ["8237B130",0xAACF],
+  ["8237B131",0xAAD0],
+  ["8237B132",0xAAD1],
+  ["8237B133",0xAAD2],
+  ["8237B134",0xAAD3],
+  ["8237B135",0xAAD4],
+  ["8237B136",0xAAD5],
+  ["8237B137",0xAAD6],
+  ["8237B138",0xAAD7],
+  ["8237B139",0xAAD8],
+  ["8237B230",0xAAD9],
+  ["8237B231",0xAADA],
+  ["8237B232",0xAADB],
+  ["8237B233",0xAADC],
+  ["8237B234",0xAADD],
+  ["8237B235",0xAADE],
+  ["8237B236",0xAADF],
+  ["8237B237",0xAAE0],
+  ["8237B238",0xAAE1],
+  ["8237B239",0xAAE2],
+  ["8237B330",0xAAE3],
+  ["8237B331",0xAAE4],
+  ["8237B332",0xAAE5],
+  ["8237B333",0xAAE6],
+  ["8237B334",0xAAE7],
+  ["8237B335",0xAAE8],
+  ["8237B336",0xAAE9],
+  ["8237B337",0xAAEA],
+  ["8237B338",0xAAEB],
+  ["8237B339",0xAAEC],
+  ["8237B430",0xAAED],
+  ["8237B431",0xAAEE],
+  ["8237B432",0xAAEF],
+  ["8237B433",0xAAF0],
+  ["8237B434",0xAAF1],
+  ["8237B435",0xAAF2],
+  ["8237B436",0xAAF3],
+  ["8237B437",0xAAF4],
+  ["8237B438",0xAAF5],
+  ["8237B439",0xAAF6],
+  ["8237B530",0xAAF7],
+  ["8237B531",0xAAF8],
+  ["8237B532",0xAAF9],
+  ["8237B533",0xAAFA],
+  ["8237B534",0xAAFB],
+  ["8237B535",0xAAFC],
+  ["8237B536",0xAAFD],
+  ["8237B537",0xAAFE],
+  ["8237B538",0xAAFF],
+  ["8237B539",0xAB00],
+  ["8237B630",0xAB01],
+  ["8237B631",0xAB02],
+  ["8237B632",0xAB03],
+  ["8237B633",0xAB04],
+  ["8237B634",0xAB05],
+  ["8237B635",0xAB06],
+  ["8237B636",0xAB07],
+  ["8237B637",0xAB08],
+  ["8237B638",0xAB09],
+  ["8237B639",0xAB0A],
+  ["8237B730",0xAB0B],
+  ["8237B731",0xAB0C],
+  ["8237B732",0xAB0D],
+  ["8237B733",0xAB0E],
+  ["8237B734",0xAB0F],
+  ["8237B735",0xAB10],
+  ["8237B736",0xAB11],
+  ["8237B737",0xAB12],
+  ["8237B738",0xAB13],
+  ["8237B739",0xAB14],
+  ["8237B830",0xAB15],
+  ["8237B831",0xAB16],
+  ["8237B832",0xAB17],
+  ["8237B833",0xAB18],
+  ["8237B834",0xAB19],
+  ["8237B835",0xAB1A],
+  ["8237B836",0xAB1B],
+  ["8237B837",0xAB1C],
+  ["8237B838",0xAB1D],
+  ["8237B839",0xAB1E],
+  ["8237B930",0xAB1F],
+  ["8237B931",0xAB20],
+  ["8237B932",0xAB21],
+  ["8237B933",0xAB22],
+  ["8237B934",0xAB23],
+  ["8237B935",0xAB24],
+  ["8237B936",0xAB25],
+  ["8237B937",0xAB26],
+  ["8237B938",0xAB27],
+  ["8237B939",0xAB28],
+  ["8237BA30",0xAB29],
+  ["8237BA31",0xAB2A],
+  ["8237BA32",0xAB2B],
+  ["8237BA33",0xAB2C],
+  ["8237BA34",0xAB2D],
+  ["8237BA35",0xAB2E],
+  ["8237BA36",0xAB2F],
+  ["8237BA37",0xAB30],
+  ["8237BA38",0xAB31],
+  ["8237BA39",0xAB32],
+  ["8237BB30",0xAB33],
+  ["8237BB31",0xAB34],
+  ["8237BB32",0xAB35],
+  ["8237BB33",0xAB36],
+  ["8237BB34",0xAB37],
+  ["8237BB35",0xAB38],
+  ["8237BB36",0xAB39],
+  ["8237BB37",0xAB3A],
+  ["8237BB38",0xAB3B],
+  ["8237BB39",0xAB3C],
+  ["8237BC30",0xAB3D],
+  ["8237BC31",0xAB3E],
+  ["8237BC32",0xAB3F],
+  ["8237BC33",0xAB40],
+  ["8237BC34",0xAB41],
+  ["8237BC35",0xAB42],
+  ["8237BC36",0xAB43],
+  ["8237BC37",0xAB44],
+  ["8237BC38",0xAB45],
+  ["8237BC39",0xAB46],
+  ["8237BD30",0xAB47],
+  ["8237BD31",0xAB48],
+  ["8237BD32",0xAB49],
+  ["8237BD33",0xAB4A],
+  ["8237BD34",0xAB4B],
+  ["8237BD35",0xAB4C],
+  ["8237BD36",0xAB4D],
+  ["8237BD37",0xAB4E],
+  ["8237BD38",0xAB4F],
+  ["8237BD39",0xAB50],
+  ["8237BE30",0xAB51],
+  ["8237BE31",0xAB52],
+  ["8237BE32",0xAB53],
+  ["8237BE33",0xAB54],
+  ["8237BE34",0xAB55],
+  ["8237BE35",0xAB56],
+  ["8237BE36",0xAB57],
+  ["8237BE37",0xAB58],
+  ["8237BE38",0xAB59],
+  ["8237BE39",0xAB5A],
+  ["8237BF30",0xAB5B],
+  ["8237BF31",0xAB5C],
+  ["8237BF32",0xAB5D],
+  ["8237BF33",0xAB5E],
+  ["8237BF34",0xAB5F],
+  ["8237BF35",0xAB60],
+  ["8237BF36",0xAB61],
+  ["8237BF37",0xAB62],
+  ["8237BF38",0xAB63],
+  ["8237BF39",0xAB64],
+  ["8237C030",0xAB65],
+  ["8237C031",0xAB66],
+  ["8237C032",0xAB67],
+  ["8237C033",0xAB68],
+  ["8237C034",0xAB69],
+  ["8237C035",0xAB6A],
+  ["8237C036",0xAB6B],
+  ["8237C037",0xAB6C],
+  ["8237C038",0xAB6D],
+  ["8237C039",0xAB6E],
+  ["8237C130",0xAB6F],
+  ["8237C131",0xAB70],
+  ["8237C132",0xAB71],
+  ["8237C133",0xAB72],
+  ["8237C134",0xAB73],
+  ["8237C135",0xAB74],
+  ["8237C136",0xAB75],
+  ["8237C137",0xAB76],
+  ["8237C138",0xAB77],
+  ["8237C139",0xAB78],
+  ["8237C230",0xAB79],
+  ["8237C231",0xAB7A],
+  ["8237C232",0xAB7B],
+  ["8237C233",0xAB7C],
+  ["8237C234",0xAB7D],
+  ["8237C235",0xAB7E],
+  ["8237C236",0xAB7F],
+  ["8237C237",0xAB80],
+  ["8237C238",0xAB81],
+  ["8237C239",0xAB82],
+  ["8237C330",0xAB83],
+  ["8237C331",0xAB84],
+  ["8237C332",0xAB85],
+  ["8237C333",0xAB86],
+  ["8237C334",0xAB87],
+  ["8237C335",0xAB88],
+  ["8237C336",0xAB89],
+  ["8237C337",0xAB8A],
+  ["8237C338",0xAB8B],
+  ["8237C339",0xAB8C],
+  ["8237C430",0xAB8D],
+  ["8237C431",0xAB8E],
+  ["8237C432",0xAB8F],
+  ["8237C433",0xAB90],
+  ["8237C434",0xAB91],
+  ["8237C435",0xAB92],
+  ["8237C436",0xAB93],
+  ["8237C437",0xAB94],
+  ["8237C438",0xAB95],
+  ["8237C439",0xAB96],
+  ["8237C530",0xAB97],
+  ["8237C531",0xAB98],
+  ["8237C532",0xAB99],
+  ["8237C533",0xAB9A],
+  ["8237C534",0xAB9B],
+  ["8237C535",0xAB9C],
+  ["8237C536",0xAB9D],
+  ["8237C537",0xAB9E],
+  ["8237C538",0xAB9F],
+  ["8237C539",0xABA0],
+  ["8237C630",0xABA1],
+  ["8237C631",0xABA2],
+  ["8237C632",0xABA3],
+  ["8237C633",0xABA4],
+  ["8237C634",0xABA5],
+  ["8237C635",0xABA6],
+  ["8237C636",0xABA7],
+  ["8237C637",0xABA8],
+  ["8237C638",0xABA9],
+  ["8237C639",0xABAA],
+  ["8237C730",0xABAB],
+  ["8237C731",0xABAC],
+  ["8237C732",0xABAD],
+  ["8237C733",0xABAE],
+  ["8237C734",0xABAF],
+  ["8237C735",0xABB0],
+  ["8237C736",0xABB1],
+  ["8237C737",0xABB2],
+  ["8237C738",0xABB3],
+  ["8237C739",0xABB4],
+  ["8237C830",0xABB5],
+  ["8237C831",0xABB6],
+  ["8237C832",0xABB7],
+  ["8237C833",0xABB8],
+  ["8237C834",0xABB9],
+  ["8237C835",0xABBA],
+  ["8237C836",0xABBB],
+  ["8237C837",0xABBC],
+  ["8237C838",0xABBD],
+  ["8237C839",0xABBE],
+  ["8237C930",0xABBF],
+  ["8237C931",0xABC0],
+  ["8237C932",0xABC1],
+  ["8237C933",0xABC2],
+  ["8237C934",0xABC3],
+  ["8237C935",0xABC4],
+  ["8237C936",0xABC5],
+  ["8237C937",0xABC6],
+  ["8237C938",0xABC7],
+  ["8237C939",0xABC8],
+  ["8237CA30",0xABC9],
+  ["8237CA31",0xABCA],
+  ["8237CA32",0xABCB],
+  ["8237CA33",0xABCC],
+  ["8237CA34",0xABCD],
+  ["8237CA35",0xABCE],
+  ["8237CA36",0xABCF],
+  ["8237CA37",0xABD0],
+  ["8237CA38",0xABD1],
+  ["8237CA39",0xABD2],
+  ["8237CB30",0xABD3],
+  ["8237CB31",0xABD4],
+  ["8237CB32",0xABD5],
+  ["8237CB33",0xABD6],
+  ["8237CB34",0xABD7],
+  ["8237CB35",0xABD8],
+  ["8237CB36",0xABD9],
+  ["8237CB37",0xABDA],
+  ["8237CB38",0xABDB],
+  ["8237CB39",0xABDC],
+  ["8237CC30",0xABDD],
+  ["8237CC31",0xABDE],
+  ["8237CC32",0xABDF],
+  ["8237CC33",0xABE0],
+  ["8237CC34",0xABE1],
+  ["8237CC35",0xABE2],
+  ["8237CC36",0xABE3],
+  ["8237CC37",0xABE4],
+  ["8237CC38",0xABE5],
+  ["8237CC39",0xABE6],
+  ["8237CD30",0xABE7],
+  ["8237CD31",0xABE8],
+  ["8237CD32",0xABE9],
+  ["8237CD33",0xABEA],
+  ["8237CD34",0xABEB],
+  ["8237CD35",0xABEC],
+  ["8237CD36",0xABED],
+  ["8237CD37",0xABEE],
+  ["8237CD38",0xABEF],
+  ["8237CD39",0xABF0],
+  ["8237CE30",0xABF1],
+  ["8237CE31",0xABF2],
+  ["8237CE32",0xABF3],
+  ["8237CE33",0xABF4],
+  ["8237CE34",0xABF5],
+  ["8237CE35",0xABF6],
+  ["8237CE36",0xABF7],
+  ["8237CE37",0xABF8],
+  ["8237CE38",0xABF9],
+  ["8237CE39",0xABFA],
+  ["8237CF30",0xABFB],
+  ["8237CF31",0xABFC],
+  ["8237CF32",0xABFD],
+  ["8237CF33",0xABFE],
+  ["8237CF34",0xABFF],
+  ["8237CF35",0xAC00],
+  ["8237CF36",0xAC01],
+  ["8237CF37",0xAC02],
+  ["8237CF38",0xAC03],
+  ["8237CF39",0xAC04],
+  ["8237D030",0xAC05],
+  ["8237D031",0xAC06],
+  ["8237D032",0xAC07],
+  ["8237D033",0xAC08],
+  ["8237D034",0xAC09],
+  ["8237D035",0xAC0A],
+  ["8237D036",0xAC0B],
+  ["8237D037",0xAC0C],
+  ["8237D038",0xAC0D],
+  ["8237D039",0xAC0E],
+  ["8237D130",0xAC0F],
+  ["8237D131",0xAC10],
+  ["8237D132",0xAC11],
+  ["8237D133",0xAC12],
+  ["8237D134",0xAC13],
+  ["8237D135",0xAC14],
+  ["8237D136",0xAC15],
+  ["8237D137",0xAC16],
+  ["8237D138",0xAC17],
+  ["8237D139",0xAC18],
+  ["8237D230",0xAC19],
+  ["8237D231",0xAC1A],
+  ["8237D232",0xAC1B],
+  ["8237D233",0xAC1C],
+  ["8237D234",0xAC1D],
+  ["8237D235",0xAC1E],
+  ["8237D236",0xAC1F],
+  ["8237D237",0xAC20],
+  ["8237D238",0xAC21],
+  ["8237D239",0xAC22],
+  ["8237D330",0xAC23],
+  ["8237D331",0xAC24],
+  ["8237D332",0xAC25],
+  ["8237D333",0xAC26],
+  ["8237D334",0xAC27],
+  ["8237D335",0xAC28],
+  ["8237D336",0xAC29],
+  ["8237D337",0xAC2A],
+  ["8237D338",0xAC2B],
+  ["8237D339",0xAC2C],
+  ["8237D430",0xAC2D],
+  ["8237D431",0xAC2E],
+  ["8237D432",0xAC2F],
+  ["8237D433",0xAC30],
+  ["8237D434",0xAC31],
+  ["8237D435",0xAC32],
+  ["8237D436",0xAC33],
+  ["8237D437",0xAC34],
+  ["8237D438",0xAC35],
+  ["8237D439",0xAC36],
+  ["8237D530",0xAC37],
+  ["8237D531",0xAC38],
+  ["8237D532",0xAC39],
+  ["8237D533",0xAC3A],
+  ["8237D534",0xAC3B],
+  ["8237D535",0xAC3C],
+  ["8237D536",0xAC3D],
+  ["8237D537",0xAC3E],
+  ["8237D538",0xAC3F],
+  ["8237D539",0xAC40],
+  ["8237D630",0xAC41],
+  ["8237D631",0xAC42],
+  ["8237D632",0xAC43],
+  ["8237D633",0xAC44],
+  ["8237D634",0xAC45],
+  ["8237D635",0xAC46],
+  ["8237D636",0xAC47],
+  ["8237D637",0xAC48],
+  ["8237D638",0xAC49],
+  ["8237D639",0xAC4A],
+  ["8237D730",0xAC4B],
+  ["8237D731",0xAC4C],
+  ["8237D732",0xAC4D],
+  ["8237D733",0xAC4E],
+  ["8237D734",0xAC4F],
+  ["8237D735",0xAC50],
+  ["8237D736",0xAC51],
+  ["8237D737",0xAC52],
+  ["8237D738",0xAC53],
+  ["8237D739",0xAC54],
+  ["8237D830",0xAC55],
+  ["8237D831",0xAC56],
+  ["8237D832",0xAC57],
+  ["8237D833",0xAC58],
+  ["8237D834",0xAC59],
+  ["8237D835",0xAC5A],
+  ["8237D836",0xAC5B],
+  ["8237D837",0xAC5C],
+  ["8237D838",0xAC5D],
+  ["8237D839",0xAC5E],
+  ["8237D930",0xAC5F],
+  ["8237D931",0xAC60],
+  ["8237D932",0xAC61],
+  ["8237D933",0xAC62],
+  ["8237D934",0xAC63],
+  ["8237D935",0xAC64],
+  ["8237D936",0xAC65],
+  ["8237D937",0xAC66],
+  ["8237D938",0xAC67],
+  ["8237D939",0xAC68],
+  ["8237DA30",0xAC69],
+  ["8237DA31",0xAC6A],
+  ["8237DA32",0xAC6B],
+  ["8237DA33",0xAC6C],
+  ["8237DA34",0xAC6D],
+  ["8237DA35",0xAC6E],
+  ["8237DA36",0xAC6F],
+  ["8237DA37",0xAC70],
+  ["8237DA38",0xAC71],
+  ["8237DA39",0xAC72],
+  ["8237DB30",0xAC73],
+  ["8237DB31",0xAC74],
+  ["8237DB32",0xAC75],
+  ["8237DB33",0xAC76],
+  ["8237DB34",0xAC77],
+  ["8237DB35",0xAC78],
+  ["8237DB36",0xAC79],
+  ["8237DB37",0xAC7A],
+  ["8237DB38",0xAC7B],
+  ["8237DB39",0xAC7C],
+  ["8237DC30",0xAC7D],
+  ["8237DC31",0xAC7E],
+  ["8237DC32",0xAC7F],
+  ["8237DC33",0xAC80],
+  ["8237DC34",0xAC81],
+  ["8237DC35",0xAC82],
+  ["8237DC36",0xAC83],
+  ["8237DC37",0xAC84],
+  ["8237DC38",0xAC85],
+  ["8237DC39",0xAC86],
+  ["8237DD30",0xAC87],
+  ["8237DD31",0xAC88],
+  ["8237DD32",0xAC89],
+  ["8237DD33",0xAC8A],
+  ["8237DD34",0xAC8B],
+  ["8237DD35",0xAC8C],
+  ["8237DD36",0xAC8D],
+  ["8237DD37",0xAC8E],
+  ["8237DD38",0xAC8F],
+  ["8237DD39",0xAC90],
+  ["8237DE30",0xAC91],
+  ["8237DE31",0xAC92],
+  ["8237DE32",0xAC93],
+  ["8237DE33",0xAC94],
+  ["8237DE34",0xAC95],
+  ["8237DE35",0xAC96],
+  ["8237DE36",0xAC97],
+  ["8237DE37",0xAC98],
+  ["8237DE38",0xAC99],
+  ["8237DE39",0xAC9A],
+  ["8237DF30",0xAC9B],
+  ["8237DF31",0xAC9C],
+  ["8237DF32",0xAC9D],
+  ["8237DF33",0xAC9E],
+  ["8237DF34",0xAC9F],
+  ["8237DF35",0xACA0],
+  ["8237DF36",0xACA1],
+  ["8237DF37",0xACA2],
+  ["8237DF38",0xACA3],
+  ["8237DF39",0xACA4],
+  ["8237E030",0xACA5],
+  ["8237E031",0xACA6],
+  ["8237E032",0xACA7],
+  ["8237E033",0xACA8],
+  ["8237E034",0xACA9],
+  ["8237E035",0xACAA],
+  ["8237E036",0xACAB],
+  ["8237E037",0xACAC],
+  ["8237E038",0xACAD],
+  ["8237E039",0xACAE],
+  ["8237E130",0xACAF],
+  ["8237E131",0xACB0],
+  ["8237E132",0xACB1],
+  ["8237E133",0xACB2],
+  ["8237E134",0xACB3],
+  ["8237E135",0xACB4],
+  ["8237E136",0xACB5],
+  ["8237E137",0xACB6],
+  ["8237E138",0xACB7],
+  ["8237E139",0xACB8],
+  ["8237E230",0xACB9],
+  ["8237E231",0xACBA],
+  ["8237E232",0xACBB],
+  ["8237E233",0xACBC],
+  ["8237E234",0xACBD],
+  ["8237E235",0xACBE],
+  ["8237E236",0xACBF],
+  ["8237E237",0xACC0],
+  ["8237E238",0xACC1],
+  ["8237E239",0xACC2],
+  ["8237E330",0xACC3],
+  ["8237E331",0xACC4],
+  ["8237E332",0xACC5],
+  ["8237E333",0xACC6],
+  ["8237E334",0xACC7],
+  ["8237E335",0xACC8],
+  ["8237E336",0xACC9],
+  ["8237E337",0xACCA],
+  ["8237E338",0xACCB],
+  ["8237E339",0xACCC],
+  ["8237E430",0xACCD],
+  ["8237E431",0xACCE],
+  ["8237E432",0xACCF],
+  ["8237E433",0xACD0],
+  ["8237E434",0xACD1],
+  ["8237E435",0xACD2],
+  ["8237E436",0xACD3],
+  ["8237E437",0xACD4],
+  ["8237E438",0xACD5],
+  ["8237E439",0xACD6],
+  ["8237E530",0xACD7],
+  ["8237E531",0xACD8],
+  ["8237E532",0xACD9],
+  ["8237E533",0xACDA],
+  ["8237E534",0xACDB],
+  ["8237E535",0xACDC],
+  ["8237E536",0xACDD],
+  ["8237E537",0xACDE],
+  ["8237E538",0xACDF],
+  ["8237E539",0xACE0],
+  ["8237E630",0xACE1],
+  ["8237E631",0xACE2],
+  ["8237E632",0xACE3],
+  ["8237E633",0xACE4],
+  ["8237E634",0xACE5],
+  ["8237E635",0xACE6],
+  ["8237E636",0xACE7],
+  ["8237E637",0xACE8],
+  ["8237E638",0xACE9],
+  ["8237E639",0xACEA],
+  ["8237E730",0xACEB],
+  ["8237E731",0xACEC],
+  ["8237E732",0xACED],
+  ["8237E733",0xACEE],
+  ["8237E734",0xACEF],
+  ["8237E735",0xACF0],
+  ["8237E736",0xACF1],
+  ["8237E737",0xACF2],
+  ["8237E738",0xACF3],
+  ["8237E739",0xACF4],
+  ["8237E830",0xACF5],
+  ["8237E831",0xACF6],
+  ["8237E832",0xACF7],
+  ["8237E833",0xACF8],
+  ["8237E834",0xACF9],
+  ["8237E835",0xACFA],
+  ["8237E836",0xACFB],
+  ["8237E837",0xACFC],
+  ["8237E838",0xACFD],
+  ["8237E839",0xACFE],
+  ["8237E930",0xACFF],
+  ["8237E931",0xAD00],
+  ["8237E932",0xAD01],
+  ["8237E933",0xAD02],
+  ["8237E934",0xAD03],
+  ["8237E935",0xAD04],
+  ["8237E936",0xAD05],
+  ["8237E937",0xAD06],
+  ["8237E938",0xAD07],
+  ["8237E939",0xAD08],
+  ["8237EA30",0xAD09],
+  ["8237EA31",0xAD0A],
+  ["8237EA32",0xAD0B],
+  ["8237EA33",0xAD0C],
+  ["8237EA34",0xAD0D],
+  ["8237EA35",0xAD0E],
+  ["8237EA36",0xAD0F],
+  ["8237EA37",0xAD10],
+  ["8237EA38",0xAD11],
+  ["8237EA39",0xAD12],
+  ["8237EB30",0xAD13],
+  ["8237EB31",0xAD14],
+  ["8237EB32",0xAD15],
+  ["8237EB33",0xAD16],
+  ["8237EB34",0xAD17],
+  ["8237EB35",0xAD18],
+  ["8237EB36",0xAD19],
+  ["8237EB37",0xAD1A],
+  ["8237EB38",0xAD1B],
+  ["8237EB39",0xAD1C],
+  ["8237EC30",0xAD1D],
+  ["8237EC31",0xAD1E],
+  ["8237EC32",0xAD1F],
+  ["8237EC33",0xAD20],
+  ["8237EC34",0xAD21],
+  ["8237EC35",0xAD22],
+  ["8237EC36",0xAD23],
+  ["8237EC37",0xAD24],
+  ["8237EC38",0xAD25],
+  ["8237EC39",0xAD26],
+  ["8237ED30",0xAD27],
+  ["8237ED31",0xAD28],
+  ["8237ED32",0xAD29],
+  ["8237ED33",0xAD2A],
+  ["8237ED34",0xAD2B],
+  ["8237ED35",0xAD2C],
+  ["8237ED36",0xAD2D],
+  ["8237ED37",0xAD2E],
+  ["8237ED38",0xAD2F],
+  ["8237ED39",0xAD30],
+  ["8237EE30",0xAD31],
+  ["8237EE31",0xAD32],
+  ["8237EE32",0xAD33],
+  ["8237EE33",0xAD34],
+  ["8237EE34",0xAD35],
+  ["8237EE35",0xAD36],
+  ["8237EE36",0xAD37],
+  ["8237EE37",0xAD38],
+  ["8237EE38",0xAD39],
+  ["8237EE39",0xAD3A],
+  ["8237EF30",0xAD3B],
+  ["8237EF31",0xAD3C],
+  ["8237EF32",0xAD3D],
+  ["8237EF33",0xAD3E],
+  ["8237EF34",0xAD3F],
+  ["8237EF35",0xAD40],
+  ["8237EF36",0xAD41],
+  ["8237EF37",0xAD42],
+  ["8237EF38",0xAD43],
+  ["8237EF39",0xAD44],
+  ["8237F030",0xAD45],
+  ["8237F031",0xAD46],
+  ["8237F032",0xAD47],
+  ["8237F033",0xAD48],
+  ["8237F034",0xAD49],
+  ["8237F035",0xAD4A],
+  ["8237F036",0xAD4B],
+  ["8237F037",0xAD4C],
+  ["8237F038",0xAD4D],
+  ["8237F039",0xAD4E],
+  ["8237F130",0xAD4F],
+  ["8237F131",0xAD50],
+  ["8237F132",0xAD51],
+  ["8237F133",0xAD52],
+  ["8237F134",0xAD53],
+  ["8237F135",0xAD54],
+  ["8237F136",0xAD55],
+  ["8237F137",0xAD56],
+  ["8237F138",0xAD57],
+  ["8237F139",0xAD58],
+  ["8237F230",0xAD59],
+  ["8237F231",0xAD5A],
+  ["8237F232",0xAD5B],
+  ["8237F233",0xAD5C],
+  ["8237F234",0xAD5D],
+  ["8237F235",0xAD5E],
+  ["8237F236",0xAD5F],
+  ["8237F237",0xAD60],
+  ["8237F238",0xAD61],
+  ["8237F239",0xAD62],
+  ["8237F330",0xAD63],
+  ["8237F331",0xAD64],
+  ["8237F332",0xAD65],
+  ["8237F333",0xAD66],
+  ["8237F334",0xAD67],
+  ["8237F335",0xAD68],
+  ["8237F336",0xAD69],
+  ["8237F337",0xAD6A],
+  ["8237F338",0xAD6B],
+  ["8237F339",0xAD6C],
+  ["8237F430",0xAD6D],
+  ["8237F431",0xAD6E],
+  ["8237F432",0xAD6F],
+  ["8237F433",0xAD70],
+  ["8237F434",0xAD71],
+  ["8237F435",0xAD72],
+  ["8237F436",0xAD73],
+  ["8237F437",0xAD74],
+  ["8237F438",0xAD75],
+  ["8237F439",0xAD76],
+  ["8237F530",0xAD77],
+  ["8237F531",0xAD78],
+  ["8237F532",0xAD79],
+  ["8237F533",0xAD7A],
+  ["8237F534",0xAD7B],
+  ["8237F535",0xAD7C],
+  ["8237F536",0xAD7D],
+  ["8237F537",0xAD7E],
+  ["8237F538",0xAD7F],
+  ["8237F539",0xAD80],
+  ["8237F630",0xAD81],
+  ["8237F631",0xAD82],
+  ["8237F632",0xAD83],
+  ["8237F633",0xAD84],
+  ["8237F634",0xAD85],
+  ["8237F635",0xAD86],
+  ["8237F636",0xAD87],
+  ["8237F637",0xAD88],
+  ["8237F638",0xAD89],
+  ["8237F639",0xAD8A],
+  ["8237F730",0xAD8B],
+  ["8237F731",0xAD8C],
+  ["8237F732",0xAD8D],
+  ["8237F733",0xAD8E],
+  ["8237F734",0xAD8F],
+  ["8237F735",0xAD90],
+  ["8237F736",0xAD91],
+  ["8237F737",0xAD92],
+  ["8237F738",0xAD93],
+  ["8237F739",0xAD94],
+  ["8237F830",0xAD95],
+  ["8237F831",0xAD96],
+  ["8237F832",0xAD97],
+  ["8237F833",0xAD98],
+  ["8237F834",0xAD99],
+  ["8237F835",0xAD9A],
+  ["8237F836",0xAD9B],
+  ["8237F837",0xAD9C],
+  ["8237F838",0xAD9D],
+  ["8237F839",0xAD9E],
+  ["8237F930",0xAD9F],
+  ["8237F931",0xADA0],
+  ["8237F932",0xADA1],
+  ["8237F933",0xADA2],
+  ["8237F934",0xADA3],
+  ["8237F935",0xADA4],
+  ["8237F936",0xADA5],
+  ["8237F937",0xADA6],
+  ["8237F938",0xADA7],
+  ["8237F939",0xADA8],
+  ["8237FA30",0xADA9],
+  ["8237FA31",0xADAA],
+  ["8237FA32",0xADAB],
+  ["8237FA33",0xADAC],
+  ["8237FA34",0xADAD],
+  ["8237FA35",0xADAE],
+  ["8237FA36",0xADAF],
+  ["8237FA37",0xADB0],
+  ["8237FA38",0xADB1],
+  ["8237FA39",0xADB2],
+  ["8237FB30",0xADB3],
+  ["8237FB31",0xADB4],
+  ["8237FB32",0xADB5],
+  ["8237FB33",0xADB6],
+  ["8237FB34",0xADB7],
+  ["8237FB35",0xADB8],
+  ["8237FB36",0xADB9],
+  ["8237FB37",0xADBA],
+  ["8237FB38",0xADBB],
+  ["8237FB39",0xADBC],
+  ["8237FC30",0xADBD],
+  ["8237FC31",0xADBE],
+  ["8237FC32",0xADBF],
+  ["8237FC33",0xADC0],
+  ["8237FC34",0xADC1],
+  ["8237FC35",0xADC2],
+  ["8237FC36",0xADC3],
+  ["8237FC37",0xADC4],
+  ["8237FC38",0xADC5],
+  ["8237FC39",0xADC6],
+  ["8237FD30",0xADC7],
+  ["8237FD31",0xADC8],
+  ["8237FD32",0xADC9],
+  ["8237FD33",0xADCA],
+  ["8237FD34",0xADCB],
+  ["8237FD35",0xADCC],
+  ["8237FD36",0xADCD],
+  ["8237FD37",0xADCE],
+  ["8237FD38",0xADCF],
+  ["8237FD39",0xADD0],
+  ["8237FE30",0xADD1],
+  ["8237FE31",0xADD2],
+  ["8237FE32",0xADD3],
+  ["8237FE33",0xADD4],
+  ["8237FE34",0xADD5],
+  ["8237FE35",0xADD6],
+  ["8237FE36",0xADD7],
+  ["8237FE37",0xADD8],
+  ["8237FE38",0xADD9],
+  ["8237FE39",0xADDA],
+  ["82388130",0xADDB],
+  ["82388131",0xADDC],
+  ["82388132",0xADDD],
+  ["82388133",0xADDE],
+  ["82388134",0xADDF],
+  ["82388135",0xADE0],
+  ["82388136",0xADE1],
+  ["82388137",0xADE2],
+  ["82388138",0xADE3],
+  ["82388139",0xADE4],
+  ["82388230",0xADE5],
+  ["82388231",0xADE6],
+  ["82388232",0xADE7],
+  ["82388233",0xADE8],
+  ["82388234",0xADE9],
+  ["82388235",0xADEA],
+  ["82388236",0xADEB],
+  ["82388237",0xADEC],
+  ["82388238",0xADED],
+  ["82388239",0xADEE],
+  ["82388330",0xADEF],
+  ["82388331",0xADF0],
+  ["82388332",0xADF1],
+  ["82388333",0xADF2],
+  ["82388334",0xADF3],
+  ["82388335",0xADF4],
+  ["82388336",0xADF5],
+  ["82388337",0xADF6],
+  ["82388338",0xADF7],
+  ["82388339",0xADF8],
+  ["82388430",0xADF9],
+  ["82388431",0xADFA],
+  ["82388432",0xADFB],
+  ["82388433",0xADFC],
+  ["82388434",0xADFD],
+  ["82388435",0xADFE],
+  ["82388436",0xADFF],
+  ["82388437",0xAE00],
+  ["82388438",0xAE01],
+  ["82388439",0xAE02],
+  ["82388530",0xAE03],
+  ["82388531",0xAE04],
+  ["82388532",0xAE05],
+  ["82388533",0xAE06],
+  ["82388534",0xAE07],
+  ["82388535",0xAE08],
+  ["82388536",0xAE09],
+  ["82388537",0xAE0A],
+  ["82388538",0xAE0B],
+  ["82388539",0xAE0C],
+  ["82388630",0xAE0D],
+  ["82388631",0xAE0E],
+  ["82388632",0xAE0F],
+  ["82388633",0xAE10],
+  ["82388634",0xAE11],
+  ["82388635",0xAE12],
+  ["82388636",0xAE13],
+  ["82388637",0xAE14],
+  ["82388638",0xAE15],
+  ["82388639",0xAE16],
+  ["82388730",0xAE17],
+  ["82388731",0xAE18],
+  ["82388732",0xAE19],
+  ["82388733",0xAE1A],
+  ["82388734",0xAE1B],
+  ["82388735",0xAE1C],
+  ["82388736",0xAE1D],
+  ["82388737",0xAE1E],
+  ["82388738",0xAE1F],
+  ["82388739",0xAE20],
+  ["82388830",0xAE21],
+  ["82388831",0xAE22],
+  ["82388832",0xAE23],
+  ["82388833",0xAE24],
+  ["82388834",0xAE25],
+  ["82388835",0xAE26],
+  ["82388836",0xAE27],
+  ["82388837",0xAE28],
+  ["82388838",0xAE29],
+  ["82388839",0xAE2A],
+  ["82388930",0xAE2B],
+  ["82388931",0xAE2C],
+  ["82388932",0xAE2D],
+  ["82388933",0xAE2E],
+  ["82388934",0xAE2F],
+  ["82388935",0xAE30],
+  ["82388936",0xAE31],
+  ["82388937",0xAE32],
+  ["82388938",0xAE33],
+  ["82388939",0xAE34],
+  ["82388A30",0xAE35],
+  ["82388A31",0xAE36],
+  ["82388A32",0xAE37],
+  ["82388A33",0xAE38],
+  ["82388A34",0xAE39],
+  ["82388A35",0xAE3A],
+  ["82388A36",0xAE3B],
+  ["82388A37",0xAE3C],
+  ["82388A38",0xAE3D],
+  ["82388A39",0xAE3E],
+  ["82388B30",0xAE3F],
+  ["82388B31",0xAE40],
+  ["82388B32",0xAE41],
+  ["82388B33",0xAE42],
+  ["82388B34",0xAE43],
+  ["82388B35",0xAE44],
+  ["82388B36",0xAE45],
+  ["82388B37",0xAE46],
+  ["82388B38",0xAE47],
+  ["82388B39",0xAE48],
+  ["82388C30",0xAE49],
+  ["82388C31",0xAE4A],
+  ["82388C32",0xAE4B],
+  ["82388C33",0xAE4C],
+  ["82388C34",0xAE4D],
+  ["82388C35",0xAE4E],
+  ["82388C36",0xAE4F],
+  ["82388C37",0xAE50],
+  ["82388C38",0xAE51],
+  ["82388C39",0xAE52],
+  ["82388D30",0xAE53],
+  ["82388D31",0xAE54],
+  ["82388D32",0xAE55],
+  ["82388D33",0xAE56],
+  ["82388D34",0xAE57],
+  ["82388D35",0xAE58],
+  ["82388D36",0xAE59],
+  ["82388D37",0xAE5A],
+  ["82388D38",0xAE5B],
+  ["82388D39",0xAE5C],
+  ["82388E30",0xAE5D],
+  ["82388E31",0xAE5E],
+  ["82388E32",0xAE5F],
+  ["82388E33",0xAE60],
+  ["82388E34",0xAE61],
+  ["82388E35",0xAE62],
+  ["82388E36",0xAE63],
+  ["82388E37",0xAE64],
+  ["82388E38",0xAE65],
+  ["82388E39",0xAE66],
+  ["82388F30",0xAE67],
+  ["82388F31",0xAE68],
+  ["82388F32",0xAE69],
+  ["82388F33",0xAE6A],
+  ["82388F34",0xAE6B],
+  ["82388F35",0xAE6C],
+  ["82388F36",0xAE6D],
+  ["82388F37",0xAE6E],
+  ["82388F38",0xAE6F],
+  ["82388F39",0xAE70],
+  ["82389030",0xAE71],
+  ["82389031",0xAE72],
+  ["82389032",0xAE73],
+  ["82389033",0xAE74],
+  ["82389034",0xAE75],
+  ["82389035",0xAE76],
+  ["82389036",0xAE77],
+  ["82389037",0xAE78],
+  ["82389038",0xAE79],
+  ["82389039",0xAE7A],
+  ["82389130",0xAE7B],
+  ["82389131",0xAE7C],
+  ["82389132",0xAE7D],
+  ["82389133",0xAE7E],
+  ["82389134",0xAE7F],
+  ["82389135",0xAE80],
+  ["82389136",0xAE81],
+  ["82389137",0xAE82],
+  ["82389138",0xAE83],
+  ["82389139",0xAE84],
+  ["82389230",0xAE85],
+  ["82389231",0xAE86],
+  ["82389232",0xAE87],
+  ["82389233",0xAE88],
+  ["82389234",0xAE89],
+  ["82389235",0xAE8A],
+  ["82389236",0xAE8B],
+  ["82389237",0xAE8C],
+  ["82389238",0xAE8D],
+  ["82389239",0xAE8E],
+  ["82389330",0xAE8F],
+  ["82389331",0xAE90],
+  ["82389332",0xAE91],
+  ["82389333",0xAE92],
+  ["82389334",0xAE93],
+  ["82389335",0xAE94],
+  ["82389336",0xAE95],
+  ["82389337",0xAE96],
+  ["82389338",0xAE97],
+  ["82389339",0xAE98],
+  ["82389430",0xAE99],
+  ["82389431",0xAE9A],
+  ["82389432",0xAE9B],
+  ["82389433",0xAE9C],
+  ["82389434",0xAE9D],
+  ["82389435",0xAE9E],
+  ["82389436",0xAE9F],
+  ["82389437",0xAEA0],
+  ["82389438",0xAEA1],
+  ["82389439",0xAEA2],
+  ["82389530",0xAEA3],
+  ["82389531",0xAEA4],
+  ["82389532",0xAEA5],
+  ["82389533",0xAEA6],
+  ["82389534",0xAEA7],
+  ["82389535",0xAEA8],
+  ["82389536",0xAEA9],
+  ["82389537",0xAEAA],
+  ["82389538",0xAEAB],
+  ["82389539",0xAEAC],
+  ["82389630",0xAEAD],
+  ["82389631",0xAEAE],
+  ["82389632",0xAEAF],
+  ["82389633",0xAEB0],
+  ["82389634",0xAEB1],
+  ["82389635",0xAEB2],
+  ["82389636",0xAEB3],
+  ["82389637",0xAEB4],
+  ["82389638",0xAEB5],
+  ["82389639",0xAEB6],
+  ["82389730",0xAEB7],
+  ["82389731",0xAEB8],
+  ["82389732",0xAEB9],
+  ["82389733",0xAEBA],
+  ["82389734",0xAEBB],
+  ["82389735",0xAEBC],
+  ["82389736",0xAEBD],
+  ["82389737",0xAEBE],
+  ["82389738",0xAEBF],
+  ["82389739",0xAEC0],
+  ["82389830",0xAEC1],
+  ["82389831",0xAEC2],
+  ["82389832",0xAEC3],
+  ["82389833",0xAEC4],
+  ["82389834",0xAEC5],
+  ["82389835",0xAEC6],
+  ["82389836",0xAEC7],
+  ["82389837",0xAEC8],
+  ["82389838",0xAEC9],
+  ["82389839",0xAECA],
+  ["82389930",0xAECB],
+  ["82389931",0xAECC],
+  ["82389932",0xAECD],
+  ["82389933",0xAECE],
+  ["82389934",0xAECF],
+  ["82389935",0xAED0],
+  ["82389936",0xAED1],
+  ["82389937",0xAED2],
+  ["82389938",0xAED3],
+  ["82389939",0xAED4],
+  ["82389A30",0xAED5],
+  ["82389A31",0xAED6],
+  ["82389A32",0xAED7],
+  ["82389A33",0xAED8],
+  ["82389A34",0xAED9],
+  ["82389A35",0xAEDA],
+  ["82389A36",0xAEDB],
+  ["82389A37",0xAEDC],
+  ["82389A38",0xAEDD],
+  ["82389A39",0xAEDE],
+  ["82389B30",0xAEDF],
+  ["82389B31",0xAEE0],
+  ["82389B32",0xAEE1],
+  ["82389B33",0xAEE2],
+  ["82389B34",0xAEE3],
+  ["82389B35",0xAEE4],
+  ["82389B36",0xAEE5],
+  ["82389B37",0xAEE6],
+  ["82389B38",0xAEE7],
+  ["82389B39",0xAEE8],
+  ["82389C30",0xAEE9],
+  ["82389C31",0xAEEA],
+  ["82389C32",0xAEEB],
+  ["82389C33",0xAEEC],
+  ["82389C34",0xAEED],
+  ["82389C35",0xAEEE],
+  ["82389C36",0xAEEF],
+  ["82389C37",0xAEF0],
+  ["82389C38",0xAEF1],
+  ["82389C39",0xAEF2],
+  ["82389D30",0xAEF3],
+  ["82389D31",0xAEF4],
+  ["82389D32",0xAEF5],
+  ["82389D33",0xAEF6],
+  ["82389D34",0xAEF7],
+  ["82389D35",0xAEF8],
+  ["82389D36",0xAEF9],
+  ["82389D37",0xAEFA],
+  ["82389D38",0xAEFB],
+  ["82389D39",0xAEFC],
+  ["82389E30",0xAEFD],
+  ["82389E31",0xAEFE],
+  ["82389E32",0xAEFF],
+  ["82389E33",0xAF00],
+  ["82389E34",0xAF01],
+  ["82389E35",0xAF02],
+  ["82389E36",0xAF03],
+  ["82389E37",0xAF04],
+  ["82389E38",0xAF05],
+  ["82389E39",0xAF06],
+  ["82389F30",0xAF07],
+  ["82389F31",0xAF08],
+  ["82389F32",0xAF09],
+  ["82389F33",0xAF0A],
+  ["82389F34",0xAF0B],
+  ["82389F35",0xAF0C],
+  ["82389F36",0xAF0D],
+  ["82389F37",0xAF0E],
+  ["82389F38",0xAF0F],
+  ["82389F39",0xAF10],
+  ["8238A030",0xAF11],
+  ["8238A031",0xAF12],
+  ["8238A032",0xAF13],
+  ["8238A033",0xAF14],
+  ["8238A034",0xAF15],
+  ["8238A035",0xAF16],
+  ["8238A036",0xAF17],
+  ["8238A037",0xAF18],
+  ["8238A038",0xAF19],
+  ["8238A039",0xAF1A],
+  ["8238A130",0xAF1B],
+  ["8238A131",0xAF1C],
+  ["8238A132",0xAF1D],
+  ["8238A133",0xAF1E],
+  ["8238A134",0xAF1F],
+  ["8238A135",0xAF20],
+  ["8238A136",0xAF21],
+  ["8238A137",0xAF22],
+  ["8238A138",0xAF23],
+  ["8238A139",0xAF24],
+  ["8238A230",0xAF25],
+  ["8238A231",0xAF26],
+  ["8238A232",0xAF27],
+  ["8238A233",0xAF28],
+  ["8238A234",0xAF29],
+  ["8238A235",0xAF2A],
+  ["8238A236",0xAF2B],
+  ["8238A237",0xAF2C],
+  ["8238A238",0xAF2D],
+  ["8238A239",0xAF2E],
+  ["8238A330",0xAF2F],
+  ["8238A331",0xAF30],
+  ["8238A332",0xAF31],
+  ["8238A333",0xAF32],
+  ["8238A334",0xAF33],
+  ["8238A335",0xAF34],
+  ["8238A336",0xAF35],
+  ["8238A337",0xAF36],
+  ["8238A338",0xAF37],
+  ["8238A339",0xAF38],
+  ["8238A430",0xAF39],
+  ["8238A431",0xAF3A],
+  ["8238A432",0xAF3B],
+  ["8238A433",0xAF3C],
+  ["8238A434",0xAF3D],
+  ["8238A435",0xAF3E],
+  ["8238A436",0xAF3F],
+  ["8238A437",0xAF40],
+  ["8238A438",0xAF41],
+  ["8238A439",0xAF42],
+  ["8238A530",0xAF43],
+  ["8238A531",0xAF44],
+  ["8238A532",0xAF45],
+  ["8238A533",0xAF46],
+  ["8238A534",0xAF47],
+  ["8238A535",0xAF48],
+  ["8238A536",0xAF49],
+  ["8238A537",0xAF4A],
+  ["8238A538",0xAF4B],
+  ["8238A539",0xAF4C],
+  ["8238A630",0xAF4D],
+  ["8238A631",0xAF4E],
+  ["8238A632",0xAF4F],
+  ["8238A633",0xAF50],
+  ["8238A634",0xAF51],
+  ["8238A635",0xAF52],
+  ["8238A636",0xAF53],
+  ["8238A637",0xAF54],
+  ["8238A638",0xAF55],
+  ["8238A639",0xAF56],
+  ["8238A730",0xAF57],
+  ["8238A731",0xAF58],
+  ["8238A732",0xAF59],
+  ["8238A733",0xAF5A],
+  ["8238A734",0xAF5B],
+  ["8238A735",0xAF5C],
+  ["8238A736",0xAF5D],
+  ["8238A737",0xAF5E],
+  ["8238A738",0xAF5F],
+  ["8238A739",0xAF60],
+  ["8238A830",0xAF61],
+  ["8238A831",0xAF62],
+  ["8238A832",0xAF63],
+  ["8238A833",0xAF64],
+  ["8238A834",0xAF65],
+  ["8238A835",0xAF66],
+  ["8238A836",0xAF67],
+  ["8238A837",0xAF68],
+  ["8238A838",0xAF69],
+  ["8238A839",0xAF6A],
+  ["8238A930",0xAF6B],
+  ["8238A931",0xAF6C],
+  ["8238A932",0xAF6D],
+  ["8238A933",0xAF6E],
+  ["8238A934",0xAF6F],
+  ["8238A935",0xAF70],
+  ["8238A936",0xAF71],
+  ["8238A937",0xAF72],
+  ["8238A938",0xAF73],
+  ["8238A939",0xAF74],
+  ["8238AA30",0xAF75],
+  ["8238AA31",0xAF76],
+  ["8238AA32",0xAF77],
+  ["8238AA33",0xAF78],
+  ["8238AA34",0xAF79],
+  ["8238AA35",0xAF7A],
+  ["8238AA36",0xAF7B],
+  ["8238AA37",0xAF7C],
+  ["8238AA38",0xAF7D],
+  ["8238AA39",0xAF7E],
+  ["8238AB30",0xAF7F],
+  ["8238AB31",0xAF80],
+  ["8238AB32",0xAF81],
+  ["8238AB33",0xAF82],
+  ["8238AB34",0xAF83],
+  ["8238AB35",0xAF84],
+  ["8238AB36",0xAF85],
+  ["8238AB37",0xAF86],
+  ["8238AB38",0xAF87],
+  ["8238AB39",0xAF88],
+  ["8238AC30",0xAF89],
+  ["8238AC31",0xAF8A],
+  ["8238AC32",0xAF8B],
+  ["8238AC33",0xAF8C],
+  ["8238AC34",0xAF8D],
+  ["8238AC35",0xAF8E],
+  ["8238AC36",0xAF8F],
+  ["8238AC37",0xAF90],
+  ["8238AC38",0xAF91],
+  ["8238AC39",0xAF92],
+  ["8238AD30",0xAF93],
+  ["8238AD31",0xAF94],
+  ["8238AD32",0xAF95],
+  ["8238AD33",0xAF96],
+  ["8238AD34",0xAF97],
+  ["8238AD35",0xAF98],
+  ["8238AD36",0xAF99],
+  ["8238AD37",0xAF9A],
+  ["8238AD38",0xAF9B],
+  ["8238AD39",0xAF9C],
+  ["8238AE30",0xAF9D],
+  ["8238AE31",0xAF9E],
+  ["8238AE32",0xAF9F],
+  ["8238AE33",0xAFA0],
+  ["8238AE34",0xAFA1],
+  ["8238AE35",0xAFA2],
+  ["8238AE36",0xAFA3],
+  ["8238AE37",0xAFA4],
+  ["8238AE38",0xAFA5],
+  ["8238AE39",0xAFA6],
+  ["8238AF30",0xAFA7],
+  ["8238AF31",0xAFA8],
+  ["8238AF32",0xAFA9],
+  ["8238AF33",0xAFAA],
+  ["8238AF34",0xAFAB],
+  ["8238AF35",0xAFAC],
+  ["8238AF36",0xAFAD],
+  ["8238AF37",0xAFAE],
+  ["8238AF38",0xAFAF],
+  ["8238AF39",0xAFB0],
+  ["8238B030",0xAFB1],
+  ["8238B031",0xAFB2],
+  ["8238B032",0xAFB3],
+  ["8238B033",0xAFB4],
+  ["8238B034",0xAFB5],
+  ["8238B035",0xAFB6],
+  ["8238B036",0xAFB7],
+  ["8238B037",0xAFB8],
+  ["8238B038",0xAFB9],
+  ["8238B039",0xAFBA],
+  ["8238B130",0xAFBB],
+  ["8238B131",0xAFBC],
+  ["8238B132",0xAFBD],
+  ["8238B133",0xAFBE],
+  ["8238B134",0xAFBF],
+  ["8238B135",0xAFC0],
+  ["8238B136",0xAFC1],
+  ["8238B137",0xAFC2],
+  ["8238B138",0xAFC3],
+  ["8238B139",0xAFC4],
+  ["8238B230",0xAFC5],
+  ["8238B231",0xAFC6],
+  ["8238B232",0xAFC7],
+  ["8238B233",0xAFC8],
+  ["8238B234",0xAFC9],
+  ["8238B235",0xAFCA],
+  ["8238B236",0xAFCB],
+  ["8238B237",0xAFCC],
+  ["8238B238",0xAFCD],
+  ["8238B239",0xAFCE],
+  ["8238B330",0xAFCF],
+  ["8238B331",0xAFD0],
+  ["8238B332",0xAFD1],
+  ["8238B333",0xAFD2],
+  ["8238B334",0xAFD3],
+  ["8238B335",0xAFD4],
+  ["8238B336",0xAFD5],
+  ["8238B337",0xAFD6],
+  ["8238B338",0xAFD7],
+  ["8238B339",0xAFD8],
+  ["8238B430",0xAFD9],
+  ["8238B431",0xAFDA],
+  ["8238B432",0xAFDB],
+  ["8238B433",0xAFDC],
+  ["8238B434",0xAFDD],
+  ["8238B435",0xAFDE],
+  ["8238B436",0xAFDF],
+  ["8238B437",0xAFE0],
+  ["8238B438",0xAFE1],
+  ["8238B439",0xAFE2],
+  ["8238B530",0xAFE3],
+  ["8238B531",0xAFE4],
+  ["8238B532",0xAFE5],
+  ["8238B533",0xAFE6],
+  ["8238B534",0xAFE7],
+  ["8238B535",0xAFE8],
+  ["8238B536",0xAFE9],
+  ["8238B537",0xAFEA],
+  ["8238B538",0xAFEB],
+  ["8238B539",0xAFEC],
+  ["8238B630",0xAFED],
+  ["8238B631",0xAFEE],
+  ["8238B632",0xAFEF],
+  ["8238B633",0xAFF0],
+  ["8238B634",0xAFF1],
+  ["8238B635",0xAFF2],
+  ["8238B636",0xAFF3],
+  ["8238B637",0xAFF4],
+  ["8238B638",0xAFF5],
+  ["8238B639",0xAFF6],
+  ["8238B730",0xAFF7],
+  ["8238B731",0xAFF8],
+  ["8238B732",0xAFF9],
+  ["8238B733",0xAFFA],
+  ["8238B734",0xAFFB],
+  ["8238B735",0xAFFC],
+  ["8238B736",0xAFFD],
+  ["8238B737",0xAFFE],
+  ["8238B738",0xAFFF],
+  ["8238B739",0xB000],
+  ["8238B830",0xB001],
+  ["8238B831",0xB002],
+  ["8238B832",0xB003],
+  ["8238B833",0xB004],
+  ["8238B834",0xB005],
+  ["8238B835",0xB006],
+  ["8238B836",0xB007],
+  ["8238B837",0xB008],
+  ["8238B838",0xB009],
+  ["8238B839",0xB00A],
+  ["8238B930",0xB00B],
+  ["8238B931",0xB00C],
+  ["8238B932",0xB00D],
+  ["8238B933",0xB00E],
+  ["8238B934",0xB00F],
+  ["8238B935",0xB010],
+  ["8238B936",0xB011],
+  ["8238B937",0xB012],
+  ["8238B938",0xB013],
+  ["8238B939",0xB014],
+  ["8238BA30",0xB015],
+  ["8238BA31",0xB016],
+  ["8238BA32",0xB017],
+  ["8238BA33",0xB018],
+  ["8238BA34",0xB019],
+  ["8238BA35",0xB01A],
+  ["8238BA36",0xB01B],
+  ["8238BA37",0xB01C],
+  ["8238BA38",0xB01D],
+  ["8238BA39",0xB01E],
+  ["8238BB30",0xB01F],
+  ["8238BB31",0xB020],
+  ["8238BB32",0xB021],
+  ["8238BB33",0xB022],
+  ["8238BB34",0xB023],
+  ["8238BB35",0xB024],
+  ["8238BB36",0xB025],
+  ["8238BB37",0xB026],
+  ["8238BB38",0xB027],
+  ["8238BB39",0xB028],
+  ["8238BC30",0xB029],
+  ["8238BC31",0xB02A],
+  ["8238BC32",0xB02B],
+  ["8238BC33",0xB02C],
+  ["8238BC34",0xB02D],
+  ["8238BC35",0xB02E],
+  ["8238BC36",0xB02F],
+  ["8238BC37",0xB030],
+  ["8238BC38",0xB031],
+  ["8238BC39",0xB032],
+  ["8238BD30",0xB033],
+  ["8238BD31",0xB034],
+  ["8238BD32",0xB035],
+  ["8238BD33",0xB036],
+  ["8238BD34",0xB037],
+  ["8238BD35",0xB038],
+  ["8238BD36",0xB039],
+  ["8238BD37",0xB03A],
+  ["8238BD38",0xB03B],
+  ["8238BD39",0xB03C],
+  ["8238BE30",0xB03D],
+  ["8238BE31",0xB03E],
+  ["8238BE32",0xB03F],
+  ["8238BE33",0xB040],
+  ["8238BE34",0xB041],
+  ["8238BE35",0xB042],
+  ["8238BE36",0xB043],
+  ["8238BE37",0xB044],
+  ["8238BE38",0xB045],
+  ["8238BE39",0xB046],
+  ["8238BF30",0xB047],
+  ["8238BF31",0xB048],
+  ["8238BF32",0xB049],
+  ["8238BF33",0xB04A],
+  ["8238BF34",0xB04B],
+  ["8238BF35",0xB04C],
+  ["8238BF36",0xB04D],
+  ["8238BF37",0xB04E],
+  ["8238BF38",0xB04F],
+  ["8238BF39",0xB050],
+  ["8238C030",0xB051],
+  ["8238C031",0xB052],
+  ["8238C032",0xB053],
+  ["8238C033",0xB054],
+  ["8238C034",0xB055],
+  ["8238C035",0xB056],
+  ["8238C036",0xB057],
+  ["8238C037",0xB058],
+  ["8238C038",0xB059],
+  ["8238C039",0xB05A],
+  ["8238C130",0xB05B],
+  ["8238C131",0xB05C],
+  ["8238C132",0xB05D],
+  ["8238C133",0xB05E],
+  ["8238C134",0xB05F],
+  ["8238C135",0xB060],
+  ["8238C136",0xB061],
+  ["8238C137",0xB062],
+  ["8238C138",0xB063],
+  ["8238C139",0xB064],
+  ["8238C230",0xB065],
+  ["8238C231",0xB066],
+  ["8238C232",0xB067],
+  ["8238C233",0xB068],
+  ["8238C234",0xB069],
+  ["8238C235",0xB06A],
+  ["8238C236",0xB06B],
+  ["8238C237",0xB06C],
+  ["8238C238",0xB06D],
+  ["8238C239",0xB06E],
+  ["8238C330",0xB06F],
+  ["8238C331",0xB070],
+  ["8238C332",0xB071],
+  ["8238C333",0xB072],
+  ["8238C334",0xB073],
+  ["8238C335",0xB074],
+  ["8238C336",0xB075],
+  ["8238C337",0xB076],
+  ["8238C338",0xB077],
+  ["8238C339",0xB078],
+  ["8238C430",0xB079],
+  ["8238C431",0xB07A],
+  ["8238C432",0xB07B],
+  ["8238C433",0xB07C],
+  ["8238C434",0xB07D],
+  ["8238C435",0xB07E],
+  ["8238C436",0xB07F],
+  ["8238C437",0xB080],
+  ["8238C438",0xB081],
+  ["8238C439",0xB082],
+  ["8238C530",0xB083],
+  ["8238C531",0xB084],
+  ["8238C532",0xB085],
+  ["8238C533",0xB086],
+  ["8238C534",0xB087],
+  ["8238C535",0xB088],
+  ["8238C536",0xB089],
+  ["8238C537",0xB08A],
+  ["8238C538",0xB08B],
+  ["8238C539",0xB08C],
+  ["8238C630",0xB08D],
+  ["8238C631",0xB08E],
+  ["8238C632",0xB08F],
+  ["8238C633",0xB090],
+  ["8238C634",0xB091],
+  ["8238C635",0xB092],
+  ["8238C636",0xB093],
+  ["8238C637",0xB094],
+  ["8238C638",0xB095],
+  ["8238C639",0xB096],
+  ["8238C730",0xB097],
+  ["8238C731",0xB098],
+  ["8238C732",0xB099],
+  ["8238C733",0xB09A],
+  ["8238C734",0xB09B],
+  ["8238C735",0xB09C],
+  ["8238C736",0xB09D],
+  ["8238C737",0xB09E],
+  ["8238C738",0xB09F],
+  ["8238C739",0xB0A0],
+  ["8238C830",0xB0A1],
+  ["8238C831",0xB0A2],
+  ["8238C832",0xB0A3],
+  ["8238C833",0xB0A4],
+  ["8238C834",0xB0A5],
+  ["8238C835",0xB0A6],
+  ["8238C836",0xB0A7],
+  ["8238C837",0xB0A8],
+  ["8238C838",0xB0A9],
+  ["8238C839",0xB0AA],
+  ["8238C930",0xB0AB],
+  ["8238C931",0xB0AC],
+  ["8238C932",0xB0AD],
+  ["8238C933",0xB0AE],
+  ["8238C934",0xB0AF],
+  ["8238C935",0xB0B0],
+  ["8238C936",0xB0B1],
+  ["8238C937",0xB0B2],
+  ["8238C938",0xB0B3],
+  ["8238C939",0xB0B4],
+  ["8238CA30",0xB0B5],
+  ["8238CA31",0xB0B6],
+  ["8238CA32",0xB0B7],
+  ["8238CA33",0xB0B8],
+  ["8238CA34",0xB0B9],
+  ["8238CA35",0xB0BA],
+  ["8238CA36",0xB0BB],
+  ["8238CA37",0xB0BC],
+  ["8238CA38",0xB0BD],
+  ["8238CA39",0xB0BE],
+  ["8238CB30",0xB0BF],
+  ["8238CB31",0xB0C0],
+  ["8238CB32",0xB0C1],
+  ["8238CB33",0xB0C2],
+  ["8238CB34",0xB0C3],
+  ["8238CB35",0xB0C4],
+  ["8238CB36",0xB0C5],
+  ["8238CB37",0xB0C6],
+  ["8238CB38",0xB0C7],
+  ["8238CB39",0xB0C8],
+  ["8238CC30",0xB0C9],
+  ["8238CC31",0xB0CA],
+  ["8238CC32",0xB0CB],
+  ["8238CC33",0xB0CC],
+  ["8238CC34",0xB0CD],
+  ["8238CC35",0xB0CE],
+  ["8238CC36",0xB0CF],
+  ["8238CC37",0xB0D0],
+  ["8238CC38",0xB0D1],
+  ["8238CC39",0xB0D2],
+  ["8238CD30",0xB0D3],
+  ["8238CD31",0xB0D4],
+  ["8238CD32",0xB0D5],
+  ["8238CD33",0xB0D6],
+  ["8238CD34",0xB0D7],
+  ["8238CD35",0xB0D8],
+  ["8238CD36",0xB0D9],
+  ["8238CD37",0xB0DA],
+  ["8238CD38",0xB0DB],
+  ["8238CD39",0xB0DC],
+  ["8238CE30",0xB0DD],
+  ["8238CE31",0xB0DE],
+  ["8238CE32",0xB0DF],
+  ["8238CE33",0xB0E0],
+  ["8238CE34",0xB0E1],
+  ["8238CE35",0xB0E2],
+  ["8238CE36",0xB0E3],
+  ["8238CE37",0xB0E4],
+  ["8238CE38",0xB0E5],
+  ["8238CE39",0xB0E6],
+  ["8238CF30",0xB0E7],
+  ["8238CF31",0xB0E8],
+  ["8238CF32",0xB0E9],
+  ["8238CF33",0xB0EA],
+  ["8238CF34",0xB0EB],
+  ["8238CF35",0xB0EC],
+  ["8238CF36",0xB0ED],
+  ["8238CF37",0xB0EE],
+  ["8238CF38",0xB0EF],
+  ["8238CF39",0xB0F0],
+  ["8238D030",0xB0F1],
+  ["8238D031",0xB0F2],
+  ["8238D032",0xB0F3],
+  ["8238D033",0xB0F4],
+  ["8238D034",0xB0F5],
+  ["8238D035",0xB0F6],
+  ["8238D036",0xB0F7],
+  ["8238D037",0xB0F8],
+  ["8238D038",0xB0F9],
+  ["8238D039",0xB0FA],
+  ["8238D130",0xB0FB],
+  ["8238D131",0xB0FC],
+  ["8238D132",0xB0FD],
+  ["8238D133",0xB0FE],
+  ["8238D134",0xB0FF],
+  ["8238D135",0xB100],
+  ["8238D136",0xB101],
+  ["8238D137",0xB102],
+  ["8238D138",0xB103],
+  ["8238D139",0xB104],
+  ["8238D230",0xB105],
+  ["8238D231",0xB106],
+  ["8238D232",0xB107],
+  ["8238D233",0xB108],
+  ["8238D234",0xB109],
+  ["8238D235",0xB10A],
+  ["8238D236",0xB10B],
+  ["8238D237",0xB10C],
+  ["8238D238",0xB10D],
+  ["8238D239",0xB10E],
+  ["8238D330",0xB10F],
+  ["8238D331",0xB110],
+  ["8238D332",0xB111],
+  ["8238D333",0xB112],
+  ["8238D334",0xB113],
+  ["8238D335",0xB114],
+  ["8238D336",0xB115],
+  ["8238D337",0xB116],
+  ["8238D338",0xB117],
+  ["8238D339",0xB118],
+  ["8238D430",0xB119],
+  ["8238D431",0xB11A],
+  ["8238D432",0xB11B],
+  ["8238D433",0xB11C],
+  ["8238D434",0xB11D],
+  ["8238D435",0xB11E],
+  ["8238D436",0xB11F],
+  ["8238D437",0xB120],
+  ["8238D438",0xB121],
+  ["8238D439",0xB122],
+  ["8238D530",0xB123],
+  ["8238D531",0xB124],
+  ["8238D532",0xB125],
+  ["8238D533",0xB126],
+  ["8238D534",0xB127],
+  ["8238D535",0xB128],
+  ["8238D536",0xB129],
+  ["8238D537",0xB12A],
+  ["8238D538",0xB12B],
+  ["8238D539",0xB12C],
+  ["8238D630",0xB12D],
+  ["8238D631",0xB12E],
+  ["8238D632",0xB12F],
+  ["8238D633",0xB130],
+  ["8238D634",0xB131],
+  ["8238D635",0xB132],
+  ["8238D636",0xB133],
+  ["8238D637",0xB134],
+  ["8238D638",0xB135],
+  ["8238D639",0xB136],
+  ["8238D730",0xB137],
+  ["8238D731",0xB138],
+  ["8238D732",0xB139],
+  ["8238D733",0xB13A],
+  ["8238D734",0xB13B],
+  ["8238D735",0xB13C],
+  ["8238D736",0xB13D],
+  ["8238D737",0xB13E],
+  ["8238D738",0xB13F],
+  ["8238D739",0xB140],
+  ["8238D830",0xB141],
+  ["8238D831",0xB142],
+  ["8238D832",0xB143],
+  ["8238D833",0xB144],
+  ["8238D834",0xB145],
+  ["8238D835",0xB146],
+  ["8238D836",0xB147],
+  ["8238D837",0xB148],
+  ["8238D838",0xB149],
+  ["8238D839",0xB14A],
+  ["8238D930",0xB14B],
+  ["8238D931",0xB14C],
+  ["8238D932",0xB14D],
+  ["8238D933",0xB14E],
+  ["8238D934",0xB14F],
+  ["8238D935",0xB150],
+  ["8238D936",0xB151],
+  ["8238D937",0xB152],
+  ["8238D938",0xB153],
+  ["8238D939",0xB154],
+  ["8238DA30",0xB155],
+  ["8238DA31",0xB156],
+  ["8238DA32",0xB157],
+  ["8238DA33",0xB158],
+  ["8238DA34",0xB159],
+  ["8238DA35",0xB15A],
+  ["8238DA36",0xB15B],
+  ["8238DA37",0xB15C],
+  ["8238DA38",0xB15D],
+  ["8238DA39",0xB15E],
+  ["8238DB30",0xB15F],
+  ["8238DB31",0xB160],
+  ["8238DB32",0xB161],
+  ["8238DB33",0xB162],
+  ["8238DB34",0xB163],
+  ["8238DB35",0xB164],
+  ["8238DB36",0xB165],
+  ["8238DB37",0xB166],
+  ["8238DB38",0xB167],
+  ["8238DB39",0xB168],
+  ["8238DC30",0xB169],
+  ["8238DC31",0xB16A],
+  ["8238DC32",0xB16B],
+  ["8238DC33",0xB16C],
+  ["8238DC34",0xB16D],
+  ["8238DC35",0xB16E],
+  ["8238DC36",0xB16F],
+  ["8238DC37",0xB170],
+  ["8238DC38",0xB171],
+  ["8238DC39",0xB172],
+  ["8238DD30",0xB173],
+  ["8238DD31",0xB174],
+  ["8238DD32",0xB175],
+  ["8238DD33",0xB176],
+  ["8238DD34",0xB177],
+  ["8238DD35",0xB178],
+  ["8238DD36",0xB179],
+  ["8238DD37",0xB17A],
+  ["8238DD38",0xB17B],
+  ["8238DD39",0xB17C],
+  ["8238DE30",0xB17D],
+  ["8238DE31",0xB17E],
+  ["8238DE32",0xB17F],
+  ["8238DE33",0xB180],
+  ["8238DE34",0xB181],
+  ["8238DE35",0xB182],
+  ["8238DE36",0xB183],
+  ["8238DE37",0xB184],
+  ["8238DE38",0xB185],
+  ["8238DE39",0xB186],
+  ["8238DF30",0xB187],
+  ["8238DF31",0xB188],
+  ["8238DF32",0xB189],
+  ["8238DF33",0xB18A],
+  ["8238DF34",0xB18B],
+  ["8238DF35",0xB18C],
+  ["8238DF36",0xB18D],
+  ["8238DF37",0xB18E],
+  ["8238DF38",0xB18F],
+  ["8238DF39",0xB190],
+  ["8238E030",0xB191],
+  ["8238E031",0xB192],
+  ["8238E032",0xB193],
+  ["8238E033",0xB194],
+  ["8238E034",0xB195],
+  ["8238E035",0xB196],
+  ["8238E036",0xB197],
+  ["8238E037",0xB198],
+  ["8238E038",0xB199],
+  ["8238E039",0xB19A],
+  ["8238E130",0xB19B],
+  ["8238E131",0xB19C],
+  ["8238E132",0xB19D],
+  ["8238E133",0xB19E],
+  ["8238E134",0xB19F],
+  ["8238E135",0xB1A0],
+  ["8238E136",0xB1A1],
+  ["8238E137",0xB1A2],
+  ["8238E138",0xB1A3],
+  ["8238E139",0xB1A4],
+  ["8238E230",0xB1A5],
+  ["8238E231",0xB1A6],
+  ["8238E232",0xB1A7],
+  ["8238E233",0xB1A8],
+  ["8238E234",0xB1A9],
+  ["8238E235",0xB1AA],
+  ["8238E236",0xB1AB],
+  ["8238E237",0xB1AC],
+  ["8238E238",0xB1AD],
+  ["8238E239",0xB1AE],
+  ["8238E330",0xB1AF],
+  ["8238E331",0xB1B0],
+  ["8238E332",0xB1B1],
+  ["8238E333",0xB1B2],
+  ["8238E334",0xB1B3],
+  ["8238E335",0xB1B4],
+  ["8238E336",0xB1B5],
+  ["8238E337",0xB1B6],
+  ["8238E338",0xB1B7],
+  ["8238E339",0xB1B8],
+  ["8238E430",0xB1B9],
+  ["8238E431",0xB1BA],
+  ["8238E432",0xB1BB],
+  ["8238E433",0xB1BC],
+  ["8238E434",0xB1BD],
+  ["8238E435",0xB1BE],
+  ["8238E436",0xB1BF],
+  ["8238E437",0xB1C0],
+  ["8238E438",0xB1C1],
+  ["8238E439",0xB1C2],
+  ["8238E530",0xB1C3],
+  ["8238E531",0xB1C4],
+  ["8238E532",0xB1C5],
+  ["8238E533",0xB1C6],
+  ["8238E534",0xB1C7],
+  ["8238E535",0xB1C8],
+  ["8238E536",0xB1C9],
+  ["8238E537",0xB1CA],
+  ["8238E538",0xB1CB],
+  ["8238E539",0xB1CC],
+  ["8238E630",0xB1CD],
+  ["8238E631",0xB1CE],
+  ["8238E632",0xB1CF],
+  ["8238E633",0xB1D0],
+  ["8238E634",0xB1D1],
+  ["8238E635",0xB1D2],
+  ["8238E636",0xB1D3],
+  ["8238E637",0xB1D4],
+  ["8238E638",0xB1D5],
+  ["8238E639",0xB1D6],
+  ["8238E730",0xB1D7],
+  ["8238E731",0xB1D8],
+  ["8238E732",0xB1D9],
+  ["8238E733",0xB1DA],
+  ["8238E734",0xB1DB],
+  ["8238E735",0xB1DC],
+  ["8238E736",0xB1DD],
+  ["8238E737",0xB1DE],
+  ["8238E738",0xB1DF],
+  ["8238E739",0xB1E0],
+  ["8238E830",0xB1E1],
+  ["8238E831",0xB1E2],
+  ["8238E832",0xB1E3],
+  ["8238E833",0xB1E4],
+  ["8238E834",0xB1E5],
+  ["8238E835",0xB1E6],
+  ["8238E836",0xB1E7],
+  ["8238E837",0xB1E8],
+  ["8238E838",0xB1E9],
+  ["8238E839",0xB1EA],
+  ["8238E930",0xB1EB],
+  ["8238E931",0xB1EC],
+  ["8238E932",0xB1ED],
+  ["8238E933",0xB1EE],
+  ["8238E934",0xB1EF],
+  ["8238E935",0xB1F0],
+  ["8238E936",0xB1F1],
+  ["8238E937",0xB1F2],
+  ["8238E938",0xB1F3],
+  ["8238E939",0xB1F4],
+  ["8238EA30",0xB1F5],
+  ["8238EA31",0xB1F6],
+  ["8238EA32",0xB1F7],
+  ["8238EA33",0xB1F8],
+  ["8238EA34",0xB1F9],
+  ["8238EA35",0xB1FA],
+  ["8238EA36",0xB1FB],
+  ["8238EA37",0xB1FC],
+  ["8238EA38",0xB1FD],
+  ["8238EA39",0xB1FE],
+  ["8238EB30",0xB1FF],
+  ["8238EB31",0xB200],
+  ["8238EB32",0xB201],
+  ["8238EB33",0xB202],
+  ["8238EB34",0xB203],
+  ["8238EB35",0xB204],
+  ["8238EB36",0xB205],
+  ["8238EB37",0xB206],
+  ["8238EB38",0xB207],
+  ["8238EB39",0xB208],
+  ["8238EC30",0xB209],
+  ["8238EC31",0xB20A],
+  ["8238EC32",0xB20B],
+  ["8238EC33",0xB20C],
+  ["8238EC34",0xB20D],
+  ["8238EC35",0xB20E],
+  ["8238EC36",0xB20F],
+  ["8238EC37",0xB210],
+  ["8238EC38",0xB211],
+  ["8238EC39",0xB212],
+  ["8238ED30",0xB213],
+  ["8238ED31",0xB214],
+  ["8238ED32",0xB215],
+  ["8238ED33",0xB216],
+  ["8238ED34",0xB217],
+  ["8238ED35",0xB218],
+  ["8238ED36",0xB219],
+  ["8238ED37",0xB21A],
+  ["8238ED38",0xB21B],
+  ["8238ED39",0xB21C],
+  ["8238EE30",0xB21D],
+  ["8238EE31",0xB21E],
+  ["8238EE32",0xB21F],
+  ["8238EE33",0xB220],
+  ["8238EE34",0xB221],
+  ["8238EE35",0xB222],
+  ["8238EE36",0xB223],
+  ["8238EE37",0xB224],
+  ["8238EE38",0xB225],
+  ["8238EE39",0xB226],
+  ["8238EF30",0xB227],
+  ["8238EF31",0xB228],
+  ["8238EF32",0xB229],
+  ["8238EF33",0xB22A],
+  ["8238EF34",0xB22B],
+  ["8238EF35",0xB22C],
+  ["8238EF36",0xB22D],
+  ["8238EF37",0xB22E],
+  ["8238EF38",0xB22F],
+  ["8238EF39",0xB230],
+  ["8238F030",0xB231],
+  ["8238F031",0xB232],
+  ["8238F032",0xB233],
+  ["8238F033",0xB234],
+  ["8238F034",0xB235],
+  ["8238F035",0xB236],
+  ["8238F036",0xB237],
+  ["8238F037",0xB238],
+  ["8238F038",0xB239],
+  ["8238F039",0xB23A],
+  ["8238F130",0xB23B],
+  ["8238F131",0xB23C],
+  ["8238F132",0xB23D],
+  ["8238F133",0xB23E],
+  ["8238F134",0xB23F],
+  ["8238F135",0xB240],
+  ["8238F136",0xB241],
+  ["8238F137",0xB242],
+  ["8238F138",0xB243],
+  ["8238F139",0xB244],
+  ["8238F230",0xB245],
+  ["8238F231",0xB246],
+  ["8238F232",0xB247],
+  ["8238F233",0xB248],
+  ["8238F234",0xB249],
+  ["8238F235",0xB24A],
+  ["8238F236",0xB24B],
+  ["8238F237",0xB24C],
+  ["8238F238",0xB24D],
+  ["8238F239",0xB24E],
+  ["8238F330",0xB24F],
+  ["8238F331",0xB250],
+  ["8238F332",0xB251],
+  ["8238F333",0xB252],
+  ["8238F334",0xB253],
+  ["8238F335",0xB254],
+  ["8238F336",0xB255],
+  ["8238F337",0xB256],
+  ["8238F338",0xB257],
+  ["8238F339",0xB258],
+  ["8238F430",0xB259],
+  ["8238F431",0xB25A],
+  ["8238F432",0xB25B],
+  ["8238F433",0xB25C],
+  ["8238F434",0xB25D],
+  ["8238F435",0xB25E],
+  ["8238F436",0xB25F],
+  ["8238F437",0xB260],
+  ["8238F438",0xB261],
+  ["8238F439",0xB262],
+  ["8238F530",0xB263],
+  ["8238F531",0xB264],
+  ["8238F532",0xB265],
+  ["8238F533",0xB266],
+  ["8238F534",0xB267],
+  ["8238F535",0xB268],
+  ["8238F536",0xB269],
+  ["8238F537",0xB26A],
+  ["8238F538",0xB26B],
+  ["8238F539",0xB26C],
+  ["8238F630",0xB26D],
+  ["8238F631",0xB26E],
+  ["8238F632",0xB26F],
+  ["8238F633",0xB270],
+  ["8238F634",0xB271],
+  ["8238F635",0xB272],
+  ["8238F636",0xB273],
+  ["8238F637",0xB274],
+  ["8238F638",0xB275],
+  ["8238F639",0xB276],
+  ["8238F730",0xB277],
+  ["8238F731",0xB278],
+  ["8238F732",0xB279],
+  ["8238F733",0xB27A],
+  ["8238F734",0xB27B],
+  ["8238F735",0xB27C],
+  ["8238F736",0xB27D],
+  ["8238F737",0xB27E],
+  ["8238F738",0xB27F],
+  ["8238F739",0xB280],
+  ["8238F830",0xB281],
+  ["8238F831",0xB282],
+  ["8238F832",0xB283],
+  ["8238F833",0xB284],
+  ["8238F834",0xB285],
+  ["8238F835",0xB286],
+  ["8238F836",0xB287],
+  ["8238F837",0xB288],
+  ["8238F838",0xB289],
+  ["8238F839",0xB28A],
+  ["8238F930",0xB28B],
+  ["8238F931",0xB28C],
+  ["8238F932",0xB28D],
+  ["8238F933",0xB28E],
+  ["8238F934",0xB28F],
+  ["8238F935",0xB290],
+  ["8238F936",0xB291],
+  ["8238F937",0xB292],
+  ["8238F938",0xB293],
+  ["8238F939",0xB294],
+  ["8238FA30",0xB295],
+  ["8238FA31",0xB296],
+  ["8238FA32",0xB297],
+  ["8238FA33",0xB298],
+  ["8238FA34",0xB299],
+  ["8238FA35",0xB29A],
+  ["8238FA36",0xB29B],
+  ["8238FA37",0xB29C],
+  ["8238FA38",0xB29D],
+  ["8238FA39",0xB29E],
+  ["8238FB30",0xB29F],
+  ["8238FB31",0xB2A0],
+  ["8238FB32",0xB2A1],
+  ["8238FB33",0xB2A2],
+  ["8238FB34",0xB2A3],
+  ["8238FB35",0xB2A4],
+  ["8238FB36",0xB2A5],
+  ["8238FB37",0xB2A6],
+  ["8238FB38",0xB2A7],
+  ["8238FB39",0xB2A8],
+  ["8238FC30",0xB2A9],
+  ["8238FC31",0xB2AA],
+  ["8238FC32",0xB2AB],
+  ["8238FC33",0xB2AC],
+  ["8238FC34",0xB2AD],
+  ["8238FC35",0xB2AE],
+  ["8238FC36",0xB2AF],
+  ["8238FC37",0xB2B0],
+  ["8238FC38",0xB2B1],
+  ["8238FC39",0xB2B2],
+  ["8238FD30",0xB2B3],
+  ["8238FD31",0xB2B4],
+  ["8238FD32",0xB2B5],
+  ["8238FD33",0xB2B6],
+  ["8238FD34",0xB2B7],
+  ["8238FD35",0xB2B8],
+  ["8238FD36",0xB2B9],
+  ["8238FD37",0xB2BA],
+  ["8238FD38",0xB2BB],
+  ["8238FD39",0xB2BC],
+  ["8238FE30",0xB2BD],
+  ["8238FE31",0xB2BE],
+  ["8238FE32",0xB2BF],
+  ["8238FE33",0xB2C0],
+  ["8238FE34",0xB2C1],
+  ["8238FE35",0xB2C2],
+  ["8238FE36",0xB2C3],
+  ["8238FE37",0xB2C4],
+  ["8238FE38",0xB2C5],
+  ["8238FE39",0xB2C6],
+  ["82398130",0xB2C7],
+  ["82398131",0xB2C8],
+  ["82398132",0xB2C9],
+  ["82398133",0xB2CA],
+  ["82398134",0xB2CB],
+  ["82398135",0xB2CC],
+  ["82398136",0xB2CD],
+  ["82398137",0xB2CE],
+  ["82398138",0xB2CF],
+  ["82398139",0xB2D0],
+  ["82398230",0xB2D1],
+  ["82398231",0xB2D2],
+  ["82398232",0xB2D3],
+  ["82398233",0xB2D4],
+  ["82398234",0xB2D5],
+  ["82398235",0xB2D6],
+  ["82398236",0xB2D7],
+  ["82398237",0xB2D8],
+  ["82398238",0xB2D9],
+  ["82398239",0xB2DA],
+  ["82398330",0xB2DB],
+  ["82398331",0xB2DC],
+  ["82398332",0xB2DD],
+  ["82398333",0xB2DE],
+  ["82398334",0xB2DF],
+  ["82398335",0xB2E0],
+  ["82398336",0xB2E1],
+  ["82398337",0xB2E2],
+  ["82398338",0xB2E3],
+  ["82398339",0xB2E4],
+  ["82398430",0xB2E5],
+  ["82398431",0xB2E6],
+  ["82398432",0xB2E7],
+  ["82398433",0xB2E8],
+  ["82398434",0xB2E9],
+  ["82398435",0xB2EA],
+  ["82398436",0xB2EB],
+  ["82398437",0xB2EC],
+  ["82398438",0xB2ED],
+  ["82398439",0xB2EE],
+  ["82398530",0xB2EF],
+  ["82398531",0xB2F0],
+  ["82398532",0xB2F1],
+  ["82398533",0xB2F2],
+  ["82398534",0xB2F3],
+  ["82398535",0xB2F4],
+  ["82398536",0xB2F5],
+  ["82398537",0xB2F6],
+  ["82398538",0xB2F7],
+  ["82398539",0xB2F8],
+  ["82398630",0xB2F9],
+  ["82398631",0xB2FA],
+  ["82398632",0xB2FB],
+  ["82398633",0xB2FC],
+  ["82398634",0xB2FD],
+  ["82398635",0xB2FE],
+  ["82398636",0xB2FF],
+  ["82398637",0xB300],
+  ["82398638",0xB301],
+  ["82398639",0xB302],
+  ["82398730",0xB303],
+  ["82398731",0xB304],
+  ["82398732",0xB305],
+  ["82398733",0xB306],
+  ["82398734",0xB307],
+  ["82398735",0xB308],
+  ["82398736",0xB309],
+  ["82398737",0xB30A],
+  ["82398738",0xB30B],
+  ["82398739",0xB30C],
+  ["82398830",0xB30D],
+  ["82398831",0xB30E],
+  ["82398832",0xB30F],
+  ["82398833",0xB310],
+  ["82398834",0xB311],
+  ["82398835",0xB312],
+  ["82398836",0xB313],
+  ["82398837",0xB314],
+  ["82398838",0xB315],
+  ["82398839",0xB316],
+  ["82398930",0xB317],
+  ["82398931",0xB318],
+  ["82398932",0xB319],
+  ["82398933",0xB31A],
+  ["82398934",0xB31B],
+  ["82398935",0xB31C],
+  ["82398936",0xB31D],
+  ["82398937",0xB31E],
+  ["82398938",0xB31F],
+  ["82398939",0xB320],
+  ["82398A30",0xB321],
+  ["82398A31",0xB322],
+  ["82398A32",0xB323],
+  ["82398A33",0xB324],
+  ["82398A34",0xB325],
+  ["82398A35",0xB326],
+  ["82398A36",0xB327],
+  ["82398A37",0xB328],
+  ["82398A38",0xB329],
+  ["82398A39",0xB32A],
+  ["82398B30",0xB32B],
+  ["82398B31",0xB32C],
+  ["82398B32",0xB32D],
+  ["82398B33",0xB32E],
+  ["82398B34",0xB32F],
+  ["82398B35",0xB330],
+  ["82398B36",0xB331],
+  ["82398B37",0xB332],
+  ["82398B38",0xB333],
+  ["82398B39",0xB334],
+  ["82398C30",0xB335],
+  ["82398C31",0xB336],
+  ["82398C32",0xB337],
+  ["82398C33",0xB338],
+  ["82398C34",0xB339],
+  ["82398C35",0xB33A],
+  ["82398C36",0xB33B],
+  ["82398C37",0xB33C],
+  ["82398C38",0xB33D],
+  ["82398C39",0xB33E],
+  ["82398D30",0xB33F],
+  ["82398D31",0xB340],
+  ["82398D32",0xB341],
+  ["82398D33",0xB342],
+  ["82398D34",0xB343],
+  ["82398D35",0xB344],
+  ["82398D36",0xB345],
+  ["82398D37",0xB346],
+  ["82398D38",0xB347],
+  ["82398D39",0xB348],
+  ["82398E30",0xB349],
+  ["82398E31",0xB34A],
+  ["82398E32",0xB34B],
+  ["82398E33",0xB34C],
+  ["82398E34",0xB34D],
+  ["82398E35",0xB34E],
+  ["82398E36",0xB34F],
+  ["82398E37",0xB350],
+  ["82398E38",0xB351],
+  ["82398E39",0xB352],
+  ["82398F30",0xB353],
+  ["82398F31",0xB354],
+  ["82398F32",0xB355],
+  ["82398F33",0xB356],
+  ["82398F34",0xB357],
+  ["82398F35",0xB358],
+  ["82398F36",0xB359],
+  ["82398F37",0xB35A],
+  ["82398F38",0xB35B],
+  ["82398F39",0xB35C],
+  ["82399030",0xB35D],
+  ["82399031",0xB35E],
+  ["82399032",0xB35F],
+  ["82399033",0xB360],
+  ["82399034",0xB361],
+  ["82399035",0xB362],
+  ["82399036",0xB363],
+  ["82399037",0xB364],
+  ["82399038",0xB365],
+  ["82399039",0xB366],
+  ["82399130",0xB367],
+  ["82399131",0xB368],
+  ["82399132",0xB369],
+  ["82399133",0xB36A],
+  ["82399134",0xB36B],
+  ["82399135",0xB36C],
+  ["82399136",0xB36D],
+  ["82399137",0xB36E],
+  ["82399138",0xB36F],
+  ["82399139",0xB370],
+  ["82399230",0xB371],
+  ["82399231",0xB372],
+  ["82399232",0xB373],
+  ["82399233",0xB374],
+  ["82399234",0xB375],
+  ["82399235",0xB376],
+  ["82399236",0xB377],
+  ["82399237",0xB378],
+  ["82399238",0xB379],
+  ["82399239",0xB37A],
+  ["82399330",0xB37B],
+  ["82399331",0xB37C],
+  ["82399332",0xB37D],
+  ["82399333",0xB37E],
+  ["82399334",0xB37F],
+  ["82399335",0xB380],
+  ["82399336",0xB381],
+  ["82399337",0xB382],
+  ["82399338",0xB383],
+  ["82399339",0xB384],
+  ["82399430",0xB385],
+  ["82399431",0xB386],
+  ["82399432",0xB387],
+  ["82399433",0xB388],
+  ["82399434",0xB389],
+  ["82399435",0xB38A],
+  ["82399436",0xB38B],
+  ["82399437",0xB38C],
+  ["82399438",0xB38D],
+  ["82399439",0xB38E],
+  ["82399530",0xB38F],
+  ["82399531",0xB390],
+  ["82399532",0xB391],
+  ["82399533",0xB392],
+  ["82399534",0xB393],
+  ["82399535",0xB394],
+  ["82399536",0xB395],
+  ["82399537",0xB396],
+  ["82399538",0xB397],
+  ["82399539",0xB398],
+  ["82399630",0xB399],
+  ["82399631",0xB39A],
+  ["82399632",0xB39B],
+  ["82399633",0xB39C],
+  ["82399634",0xB39D],
+  ["82399635",0xB39E],
+  ["82399636",0xB39F],
+  ["82399637",0xB3A0],
+  ["82399638",0xB3A1],
+  ["82399639",0xB3A2],
+  ["82399730",0xB3A3],
+  ["82399731",0xB3A4],
+  ["82399732",0xB3A5],
+  ["82399733",0xB3A6],
+  ["82399734",0xB3A7],
+  ["82399735",0xB3A8],
+  ["82399736",0xB3A9],
+  ["82399737",0xB3AA],
+  ["82399738",0xB3AB],
+  ["82399739",0xB3AC],
+  ["82399830",0xB3AD],
+  ["82399831",0xB3AE],
+  ["82399832",0xB3AF],
+  ["82399833",0xB3B0],
+  ["82399834",0xB3B1],
+  ["82399835",0xB3B2],
+  ["82399836",0xB3B3],
+  ["82399837",0xB3B4],
+  ["82399838",0xB3B5],
+  ["82399839",0xB3B6],
+  ["82399930",0xB3B7],
+  ["82399931",0xB3B8],
+  ["82399932",0xB3B9],
+  ["82399933",0xB3BA],
+  ["82399934",0xB3BB],
+  ["82399935",0xB3BC],
+  ["82399936",0xB3BD],
+  ["82399937",0xB3BE],
+  ["82399938",0xB3BF],
+  ["82399939",0xB3C0],
+  ["82399A30",0xB3C1],
+  ["82399A31",0xB3C2],
+  ["82399A32",0xB3C3],
+  ["82399A33",0xB3C4],
+  ["82399A34",0xB3C5],
+  ["82399A35",0xB3C6],
+  ["82399A36",0xB3C7],
+  ["82399A37",0xB3C8],
+  ["82399A38",0xB3C9],
+  ["82399A39",0xB3CA],
+  ["82399B30",0xB3CB],
+  ["82399B31",0xB3CC],
+  ["82399B32",0xB3CD],
+  ["82399B33",0xB3CE],
+  ["82399B34",0xB3CF],
+  ["82399B35",0xB3D0],
+  ["82399B36",0xB3D1],
+  ["82399B37",0xB3D2],
+  ["82399B38",0xB3D3],
+  ["82399B39",0xB3D4],
+  ["82399C30",0xB3D5],
+  ["82399C31",0xB3D6],
+  ["82399C32",0xB3D7],
+  ["82399C33",0xB3D8],
+  ["82399C34",0xB3D9],
+  ["82399C35",0xB3DA],
+  ["82399C36",0xB3DB],
+  ["82399C37",0xB3DC],
+  ["82399C38",0xB3DD],
+  ["82399C39",0xB3DE],
+  ["82399D30",0xB3DF],
+  ["82399D31",0xB3E0],
+  ["82399D32",0xB3E1],
+  ["82399D33",0xB3E2],
+  ["82399D34",0xB3E3],
+  ["82399D35",0xB3E4],
+  ["82399D36",0xB3E5],
+  ["82399D37",0xB3E6],
+  ["82399D38",0xB3E7],
+  ["82399D39",0xB3E8],
+  ["82399E30",0xB3E9],
+  ["82399E31",0xB3EA],
+  ["82399E32",0xB3EB],
+  ["82399E33",0xB3EC],
+  ["82399E34",0xB3ED],
+  ["82399E35",0xB3EE],
+  ["82399E36",0xB3EF],
+  ["82399E37",0xB3F0],
+  ["82399E38",0xB3F1],
+  ["82399E39",0xB3F2],
+  ["82399F30",0xB3F3],
+  ["82399F31",0xB3F4],
+  ["82399F32",0xB3F5],
+  ["82399F33",0xB3F6],
+  ["82399F34",0xB3F7],
+  ["82399F35",0xB3F8],
+  ["82399F36",0xB3F9],
+  ["82399F37",0xB3FA],
+  ["82399F38",0xB3FB],
+  ["82399F39",0xB3FC],
+  ["8239A030",0xB3FD],
+  ["8239A031",0xB3FE],
+  ["8239A032",0xB3FF],
+  ["8239A033",0xB400],
+  ["8239A034",0xB401],
+  ["8239A035",0xB402],
+  ["8239A036",0xB403],
+  ["8239A037",0xB404],
+  ["8239A038",0xB405],
+  ["8239A039",0xB406],
+  ["8239A130",0xB407],
+  ["8239A131",0xB408],
+  ["8239A132",0xB409],
+  ["8239A133",0xB40A],
+  ["8239A134",0xB40B],
+  ["8239A135",0xB40C],
+  ["8239A136",0xB40D],
+  ["8239A137",0xB40E],
+  ["8239A138",0xB40F],
+  ["8239A139",0xB410],
+  ["8239A230",0xB411],
+  ["8239A231",0xB412],
+  ["8239A232",0xB413],
+  ["8239A233",0xB414],
+  ["8239A234",0xB415],
+  ["8239A235",0xB416],
+  ["8239A236",0xB417],
+  ["8239A237",0xB418],
+  ["8239A238",0xB419],
+  ["8239A239",0xB41A],
+  ["8239A330",0xB41B],
+  ["8239A331",0xB41C],
+  ["8239A332",0xB41D],
+  ["8239A333",0xB41E],
+  ["8239A334",0xB41F],
+  ["8239A335",0xB420],
+  ["8239A336",0xB421],
+  ["8239A337",0xB422],
+  ["8239A338",0xB423],
+  ["8239A339",0xB424],
+  ["8239A430",0xB425],
+  ["8239A431",0xB426],
+  ["8239A432",0xB427],
+  ["8239A433",0xB428],
+  ["8239A434",0xB429],
+  ["8239A435",0xB42A],
+  ["8239A436",0xB42B],
+  ["8239A437",0xB42C],
+  ["8239A438",0xB42D],
+  ["8239A439",0xB42E],
+  ["8239A530",0xB42F],
+  ["8239A531",0xB430],
+  ["8239A532",0xB431],
+  ["8239A533",0xB432],
+  ["8239A534",0xB433],
+  ["8239A535",0xB434],
+  ["8239A536",0xB435],
+  ["8239A537",0xB436],
+  ["8239A538",0xB437],
+  ["8239A539",0xB438],
+  ["8239A630",0xB439],
+  ["8239A631",0xB43A],
+  ["8239A632",0xB43B],
+  ["8239A633",0xB43C],
+  ["8239A634",0xB43D],
+  ["8239A635",0xB43E],
+  ["8239A636",0xB43F],
+  ["8239A637",0xB440],
+  ["8239A638",0xB441],
+  ["8239A639",0xB442],
+  ["8239A730",0xB443],
+  ["8239A731",0xB444],
+  ["8239A732",0xB445],
+  ["8239A733",0xB446],
+  ["8239A734",0xB447],
+  ["8239A735",0xB448],
+  ["8239A736",0xB449],
+  ["8239A737",0xB44A],
+  ["8239A738",0xB44B],
+  ["8239A739",0xB44C],
+  ["8239A830",0xB44D],
+  ["8239A831",0xB44E],
+  ["8239A832",0xB44F],
+  ["8239A833",0xB450],
+  ["8239A834",0xB451],
+  ["8239A835",0xB452],
+  ["8239A836",0xB453],
+  ["8239A837",0xB454],
+  ["8239A838",0xB455],
+  ["8239A839",0xB456],
+  ["8239A930",0xB457],
+  ["8239A931",0xB458],
+  ["8239A932",0xB459],
+  ["8239A933",0xB45A],
+  ["8239A934",0xB45B],
+  ["8239A935",0xB45C],
+  ["8239A936",0xB45D],
+  ["8239A937",0xB45E],
+  ["8239A938",0xB45F],
+  ["8239A939",0xB460],
+  ["8239AA30",0xB461],
+  ["8239AA31",0xB462],
+  ["8239AA32",0xB463],
+  ["8239AA33",0xB464],
+  ["8239AA34",0xB465],
+  ["8239AA35",0xB466],
+  ["8239AA36",0xB467],
+  ["8239AA37",0xB468],
+  ["8239AA38",0xB469],
+  ["8239AA39",0xB46A],
+  ["8239AB30",0xB46B],
+  ["8239AB31",0xB46C],
+  ["8239AB32",0xB46D],
+  ["8239AB33",0xB46E],
+  ["8239AB34",0xB46F],
+  ["8239AB35",0xB470],
+  ["8239AB36",0xB471],
+  ["8239AB37",0xB472],
+  ["8239AB38",0xB473],
+  ["8239AB39",0xB474],
+  ["8239AC30",0xB475],
+  ["8239AC31",0xB476],
+  ["8239AC32",0xB477],
+  ["8239AC33",0xB478],
+  ["8239AC34",0xB479],
+  ["8239AC35",0xB47A],
+  ["8239AC36",0xB47B],
+  ["8239AC37",0xB47C],
+  ["8239AC38",0xB47D],
+  ["8239AC39",0xB47E],
+  ["8239AD30",0xB47F],
+  ["8239AD31",0xB480],
+  ["8239AD32",0xB481],
+  ["8239AD33",0xB482],
+  ["8239AD34",0xB483],
+  ["8239AD35",0xB484],
+  ["8239AD36",0xB485],
+  ["8239AD37",0xB486],
+  ["8239AD38",0xB487],
+  ["8239AD39",0xB488],
+  ["8239AE30",0xB489],
+  ["8239AE31",0xB48A],
+  ["8239AE32",0xB48B],
+  ["8239AE33",0xB48C],
+  ["8239AE34",0xB48D],
+  ["8239AE35",0xB48E],
+  ["8239AE36",0xB48F],
+  ["8239AE37",0xB490],
+  ["8239AE38",0xB491],
+  ["8239AE39",0xB492],
+  ["8239AF30",0xB493],
+  ["8239AF31",0xB494],
+  ["8239AF32",0xB495],
+  ["8239AF33",0xB496],
+  ["8239AF34",0xB497],
+  ["8239AF35",0xB498],
+  ["8239AF36",0xB499],
+  ["8239AF37",0xB49A],
+  ["8239AF38",0xB49B],
+  ["8239AF39",0xB49C],
+  ["8239B030",0xB49D],
+  ["8239B031",0xB49E],
+  ["8239B032",0xB49F],
+  ["8239B033",0xB4A0],
+  ["8239B034",0xB4A1],
+  ["8239B035",0xB4A2],
+  ["8239B036",0xB4A3],
+  ["8239B037",0xB4A4],
+  ["8239B038",0xB4A5],
+  ["8239B039",0xB4A6],
+  ["8239B130",0xB4A7],
+  ["8239B131",0xB4A8],
+  ["8239B132",0xB4A9],
+  ["8239B133",0xB4AA],
+  ["8239B134",0xB4AB],
+  ["8239B135",0xB4AC],
+  ["8239B136",0xB4AD],
+  ["8239B137",0xB4AE],
+  ["8239B138",0xB4AF],
+  ["8239B139",0xB4B0],
+  ["8239B230",0xB4B1],
+  ["8239B231",0xB4B2],
+  ["8239B232",0xB4B3],
+  ["8239B233",0xB4B4],
+  ["8239B234",0xB4B5],
+  ["8239B235",0xB4B6],
+  ["8239B236",0xB4B7],
+  ["8239B237",0xB4B8],
+  ["8239B238",0xB4B9],
+  ["8239B239",0xB4BA],
+  ["8239B330",0xB4BB],
+  ["8239B331",0xB4BC],
+  ["8239B332",0xB4BD],
+  ["8239B333",0xB4BE],
+  ["8239B334",0xB4BF],
+  ["8239B335",0xB4C0],
+  ["8239B336",0xB4C1],
+  ["8239B337",0xB4C2],
+  ["8239B338",0xB4C3],
+  ["8239B339",0xB4C4],
+  ["8239B430",0xB4C5],
+  ["8239B431",0xB4C6],
+  ["8239B432",0xB4C7],
+  ["8239B433",0xB4C8],
+  ["8239B434",0xB4C9],
+  ["8239B435",0xB4CA],
+  ["8239B436",0xB4CB],
+  ["8239B437",0xB4CC],
+  ["8239B438",0xB4CD],
+  ["8239B439",0xB4CE],
+  ["8239B530",0xB4CF],
+  ["8239B531",0xB4D0],
+  ["8239B532",0xB4D1],
+  ["8239B533",0xB4D2],
+  ["8239B534",0xB4D3],
+  ["8239B535",0xB4D4],
+  ["8239B536",0xB4D5],
+  ["8239B537",0xB4D6],
+  ["8239B538",0xB4D7],
+  ["8239B539",0xB4D8],
+  ["8239B630",0xB4D9],
+  ["8239B631",0xB4DA],
+  ["8239B632",0xB4DB],
+  ["8239B633",0xB4DC],
+  ["8239B634",0xB4DD],
+  ["8239B635",0xB4DE],
+  ["8239B636",0xB4DF],
+  ["8239B637",0xB4E0],
+  ["8239B638",0xB4E1],
+  ["8239B639",0xB4E2],
+  ["8239B730",0xB4E3],
+  ["8239B731",0xB4E4],
+  ["8239B732",0xB4E5],
+  ["8239B733",0xB4E6],
+  ["8239B734",0xB4E7],
+  ["8239B735",0xB4E8],
+  ["8239B736",0xB4E9],
+  ["8239B737",0xB4EA],
+  ["8239B738",0xB4EB],
+  ["8239B739",0xB4EC],
+  ["8239B830",0xB4ED],
+  ["8239B831",0xB4EE],
+  ["8239B832",0xB4EF],
+  ["8239B833",0xB4F0],
+  ["8239B834",0xB4F1],
+  ["8239B835",0xB4F2],
+  ["8239B836",0xB4F3],
+  ["8239B837",0xB4F4],
+  ["8239B838",0xB4F5],
+  ["8239B839",0xB4F6],
+  ["8239B930",0xB4F7],
+  ["8239B931",0xB4F8],
+  ["8239B932",0xB4F9],
+  ["8239B933",0xB4FA],
+  ["8239B934",0xB4FB],
+  ["8239B935",0xB4FC],
+  ["8239B936",0xB4FD],
+  ["8239B937",0xB4FE],
+  ["8239B938",0xB4FF],
+  ["8239B939",0xB500],
+  ["8239BA30",0xB501],
+  ["8239BA31",0xB502],
+  ["8239BA32",0xB503],
+  ["8239BA33",0xB504],
+  ["8239BA34",0xB505],
+  ["8239BA35",0xB506],
+  ["8239BA36",0xB507],
+  ["8239BA37",0xB508],
+  ["8239BA38",0xB509],
+  ["8239BA39",0xB50A],
+  ["8239BB30",0xB50B],
+  ["8239BB31",0xB50C],
+  ["8239BB32",0xB50D],
+  ["8239BB33",0xB50E],
+  ["8239BB34",0xB50F],
+  ["8239BB35",0xB510],
+  ["8239BB36",0xB511],
+  ["8239BB37",0xB512],
+  ["8239BB38",0xB513],
+  ["8239BB39",0xB514],
+  ["8239BC30",0xB515],
+  ["8239BC31",0xB516],
+  ["8239BC32",0xB517],
+  ["8239BC33",0xB518],
+  ["8239BC34",0xB519],
+  ["8239BC35",0xB51A],
+  ["8239BC36",0xB51B],
+  ["8239BC37",0xB51C],
+  ["8239BC38",0xB51D],
+  ["8239BC39",0xB51E],
+  ["8239BD30",0xB51F],
+  ["8239BD31",0xB520],
+  ["8239BD32",0xB521],
+  ["8239BD33",0xB522],
+  ["8239BD34",0xB523],
+  ["8239BD35",0xB524],
+  ["8239BD36",0xB525],
+  ["8239BD37",0xB526],
+  ["8239BD38",0xB527],
+  ["8239BD39",0xB528],
+  ["8239BE30",0xB529],
+  ["8239BE31",0xB52A],
+  ["8239BE32",0xB52B],
+  ["8239BE33",0xB52C],
+  ["8239BE34",0xB52D],
+  ["8239BE35",0xB52E],
+  ["8239BE36",0xB52F],
+  ["8239BE37",0xB530],
+  ["8239BE38",0xB531],
+  ["8239BE39",0xB532],
+  ["8239BF30",0xB533],
+  ["8239BF31",0xB534],
+  ["8239BF32",0xB535],
+  ["8239BF33",0xB536],
+  ["8239BF34",0xB537],
+  ["8239BF35",0xB538],
+  ["8239BF36",0xB539],
+  ["8239BF37",0xB53A],
+  ["8239BF38",0xB53B],
+  ["8239BF39",0xB53C],
+  ["8239C030",0xB53D],
+  ["8239C031",0xB53E],
+  ["8239C032",0xB53F],
+  ["8239C033",0xB540],
+  ["8239C034",0xB541],
+  ["8239C035",0xB542],
+  ["8239C036",0xB543],
+  ["8239C037",0xB544],
+  ["8239C038",0xB545],
+  ["8239C039",0xB546],
+  ["8239C130",0xB547],
+  ["8239C131",0xB548],
+  ["8239C132",0xB549],
+  ["8239C133",0xB54A],
+  ["8239C134",0xB54B],
+  ["8239C135",0xB54C],
+  ["8239C136",0xB54D],
+  ["8239C137",0xB54E],
+  ["8239C138",0xB54F],
+  ["8239C139",0xB550],
+  ["8239C230",0xB551],
+  ["8239C231",0xB552],
+  ["8239C232",0xB553],
+  ["8239C233",0xB554],
+  ["8239C234",0xB555],
+  ["8239C235",0xB556],
+  ["8239C236",0xB557],
+  ["8239C237",0xB558],
+  ["8239C238",0xB559],
+  ["8239C239",0xB55A],
+  ["8239C330",0xB55B],
+  ["8239C331",0xB55C],
+  ["8239C332",0xB55D],
+  ["8239C333",0xB55E],
+  ["8239C334",0xB55F],
+  ["8239C335",0xB560],
+  ["8239C336",0xB561],
+  ["8239C337",0xB562],
+  ["8239C338",0xB563],
+  ["8239C339",0xB564],
+  ["8239C430",0xB565],
+  ["8239C431",0xB566],
+  ["8239C432",0xB567],
+  ["8239C433",0xB568],
+  ["8239C434",0xB569],
+  ["8239C435",0xB56A],
+  ["8239C436",0xB56B],
+  ["8239C437",0xB56C],
+  ["8239C438",0xB56D],
+  ["8239C439",0xB56E],
+  ["8239C530",0xB56F],
+  ["8239C531",0xB570],
+  ["8239C532",0xB571],
+  ["8239C533",0xB572],
+  ["8239C534",0xB573],
+  ["8239C535",0xB574],
+  ["8239C536",0xB575],
+  ["8239C537",0xB576],
+  ["8239C538",0xB577],
+  ["8239C539",0xB578],
+  ["8239C630",0xB579],
+  ["8239C631",0xB57A],
+  ["8239C632",0xB57B],
+  ["8239C633",0xB57C],
+  ["8239C634",0xB57D],
+  ["8239C635",0xB57E],
+  ["8239C636",0xB57F],
+  ["8239C637",0xB580],
+  ["8239C638",0xB581],
+  ["8239C639",0xB582],
+  ["8239C730",0xB583],
+  ["8239C731",0xB584],
+  ["8239C732",0xB585],
+  ["8239C733",0xB586],
+  ["8239C734",0xB587],
+  ["8239C735",0xB588],
+  ["8239C736",0xB589],
+  ["8239C737",0xB58A],
+  ["8239C738",0xB58B],
+  ["8239C739",0xB58C],
+  ["8239C830",0xB58D],
+  ["8239C831",0xB58E],
+  ["8239C832",0xB58F],
+  ["8239C833",0xB590],
+  ["8239C834",0xB591],
+  ["8239C835",0xB592],
+  ["8239C836",0xB593],
+  ["8239C837",0xB594],
+  ["8239C838",0xB595],
+  ["8239C839",0xB596],
+  ["8239C930",0xB597],
+  ["8239C931",0xB598],
+  ["8239C932",0xB599],
+  ["8239C933",0xB59A],
+  ["8239C934",0xB59B],
+  ["8239C935",0xB59C],
+  ["8239C936",0xB59D],
+  ["8239C937",0xB59E],
+  ["8239C938",0xB59F],
+  ["8239C939",0xB5A0],
+  ["8239CA30",0xB5A1],
+  ["8239CA31",0xB5A2],
+  ["8239CA32",0xB5A3],
+  ["8239CA33",0xB5A4],
+  ["8239CA34",0xB5A5],
+  ["8239CA35",0xB5A6],
+  ["8239CA36",0xB5A7],
+  ["8239CA37",0xB5A8],
+  ["8239CA38",0xB5A9],
+  ["8239CA39",0xB5AA],
+  ["8239CB30",0xB5AB],
+  ["8239CB31",0xB5AC],
+  ["8239CB32",0xB5AD],
+  ["8239CB33",0xB5AE],
+  ["8239CB34",0xB5AF],
+  ["8239CB35",0xB5B0],
+  ["8239CB36",0xB5B1],
+  ["8239CB37",0xB5B2],
+  ["8239CB38",0xB5B3],
+  ["8239CB39",0xB5B4],
+  ["8239CC30",0xB5B5],
+  ["8239CC31",0xB5B6],
+  ["8239CC32",0xB5B7],
+  ["8239CC33",0xB5B8],
+  ["8239CC34",0xB5B9],
+  ["8239CC35",0xB5BA],
+  ["8239CC36",0xB5BB],
+  ["8239CC37",0xB5BC],
+  ["8239CC38",0xB5BD],
+  ["8239CC39",0xB5BE],
+  ["8239CD30",0xB5BF],
+  ["8239CD31",0xB5C0],
+  ["8239CD32",0xB5C1],
+  ["8239CD33",0xB5C2],
+  ["8239CD34",0xB5C3],
+  ["8239CD35",0xB5C4],
+  ["8239CD36",0xB5C5],
+  ["8239CD37",0xB5C6],
+  ["8239CD38",0xB5C7],
+  ["8239CD39",0xB5C8],
+  ["8239CE30",0xB5C9],
+  ["8239CE31",0xB5CA],
+  ["8239CE32",0xB5CB],
+  ["8239CE33",0xB5CC],
+  ["8239CE34",0xB5CD],
+  ["8239CE35",0xB5CE],
+  ["8239CE36",0xB5CF],
+  ["8239CE37",0xB5D0],
+  ["8239CE38",0xB5D1],
+  ["8239CE39",0xB5D2],
+  ["8239CF30",0xB5D3],
+  ["8239CF31",0xB5D4],
+  ["8239CF32",0xB5D5],
+  ["8239CF33",0xB5D6],
+  ["8239CF34",0xB5D7],
+  ["8239CF35",0xB5D8],
+  ["8239CF36",0xB5D9],
+  ["8239CF37",0xB5DA],
+  ["8239CF38",0xB5DB],
+  ["8239CF39",0xB5DC],
+  ["8239D030",0xB5DD],
+  ["8239D031",0xB5DE],
+  ["8239D032",0xB5DF],
+  ["8239D033",0xB5E0],
+  ["8239D034",0xB5E1],
+  ["8239D035",0xB5E2],
+  ["8239D036",0xB5E3],
+  ["8239D037",0xB5E4],
+  ["8239D038",0xB5E5],
+  ["8239D039",0xB5E6],
+  ["8239D130",0xB5E7],
+  ["8239D131",0xB5E8],
+  ["8239D132",0xB5E9],
+  ["8239D133",0xB5EA],
+  ["8239D134",0xB5EB],
+  ["8239D135",0xB5EC],
+  ["8239D136",0xB5ED],
+  ["8239D137",0xB5EE],
+  ["8239D138",0xB5EF],
+  ["8239D139",0xB5F0],
+  ["8239D230",0xB5F1],
+  ["8239D231",0xB5F2],
+  ["8239D232",0xB5F3],
+  ["8239D233",0xB5F4],
+  ["8239D234",0xB5F5],
+  ["8239D235",0xB5F6],
+  ["8239D236",0xB5F7],
+  ["8239D237",0xB5F8],
+  ["8239D238",0xB5F9],
+  ["8239D239",0xB5FA],
+  ["8239D330",0xB5FB],
+  ["8239D331",0xB5FC],
+  ["8239D332",0xB5FD],
+  ["8239D333",0xB5FE],
+  ["8239D334",0xB5FF],
+  ["8239D335",0xB600],
+  ["8239D336",0xB601],
+  ["8239D337",0xB602],
+  ["8239D338",0xB603],
+  ["8239D339",0xB604],
+  ["8239D430",0xB605],
+  ["8239D431",0xB606],
+  ["8239D432",0xB607],
+  ["8239D433",0xB608],
+  ["8239D434",0xB609],
+  ["8239D435",0xB60A],
+  ["8239D436",0xB60B],
+  ["8239D437",0xB60C],
+  ["8239D438",0xB60D],
+  ["8239D439",0xB60E],
+  ["8239D530",0xB60F],
+  ["8239D531",0xB610],
+  ["8239D532",0xB611],
+  ["8239D533",0xB612],
+  ["8239D534",0xB613],
+  ["8239D535",0xB614],
+  ["8239D536",0xB615],
+  ["8239D537",0xB616],
+  ["8239D538",0xB617],
+  ["8239D539",0xB618],
+  ["8239D630",0xB619],
+  ["8239D631",0xB61A],
+  ["8239D632",0xB61B],
+  ["8239D633",0xB61C],
+  ["8239D634",0xB61D],
+  ["8239D635",0xB61E],
+  ["8239D636",0xB61F],
+  ["8239D637",0xB620],
+  ["8239D638",0xB621],
+  ["8239D639",0xB622],
+  ["8239D730",0xB623],
+  ["8239D731",0xB624],
+  ["8239D732",0xB625],
+  ["8239D733",0xB626],
+  ["8239D734",0xB627],
+  ["8239D735",0xB628],
+  ["8239D736",0xB629],
+  ["8239D737",0xB62A],
+  ["8239D738",0xB62B],
+  ["8239D739",0xB62C],
+  ["8239D830",0xB62D],
+  ["8239D831",0xB62E],
+  ["8239D832",0xB62F],
+  ["8239D833",0xB630],
+  ["8239D834",0xB631],
+  ["8239D835",0xB632],
+  ["8239D836",0xB633],
+  ["8239D837",0xB634],
+  ["8239D838",0xB635],
+  ["8239D839",0xB636],
+  ["8239D930",0xB637],
+  ["8239D931",0xB638],
+  ["8239D932",0xB639],
+  ["8239D933",0xB63A],
+  ["8239D934",0xB63B],
+  ["8239D935",0xB63C],
+  ["8239D936",0xB63D],
+  ["8239D937",0xB63E],
+  ["8239D938",0xB63F],
+  ["8239D939",0xB640],
+  ["8239DA30",0xB641],
+  ["8239DA31",0xB642],
+  ["8239DA32",0xB643],
+  ["8239DA33",0xB644],
+  ["8239DA34",0xB645],
+  ["8239DA35",0xB646],
+  ["8239DA36",0xB647],
+  ["8239DA37",0xB648],
+  ["8239DA38",0xB649],
+  ["8239DA39",0xB64A],
+  ["8239DB30",0xB64B],
+  ["8239DB31",0xB64C],
+  ["8239DB32",0xB64D],
+  ["8239DB33",0xB64E],
+  ["8239DB34",0xB64F],
+  ["8239DB35",0xB650],
+  ["8239DB36",0xB651],
+  ["8239DB37",0xB652],
+  ["8239DB38",0xB653],
+  ["8239DB39",0xB654],
+  ["8239DC30",0xB655],
+  ["8239DC31",0xB656],
+  ["8239DC32",0xB657],
+  ["8239DC33",0xB658],
+  ["8239DC34",0xB659],
+  ["8239DC35",0xB65A],
+  ["8239DC36",0xB65B],
+  ["8239DC37",0xB65C],
+  ["8239DC38",0xB65D],
+  ["8239DC39",0xB65E],
+  ["8239DD30",0xB65F],
+  ["8239DD31",0xB660],
+  ["8239DD32",0xB661],
+  ["8239DD33",0xB662],
+  ["8239DD34",0xB663],
+  ["8239DD35",0xB664],
+  ["8239DD36",0xB665],
+  ["8239DD37",0xB666],
+  ["8239DD38",0xB667],
+  ["8239DD39",0xB668],
+  ["8239DE30",0xB669],
+  ["8239DE31",0xB66A],
+  ["8239DE32",0xB66B],
+  ["8239DE33",0xB66C],
+  ["8239DE34",0xB66D],
+  ["8239DE35",0xB66E],
+  ["8239DE36",0xB66F],
+  ["8239DE37",0xB670],
+  ["8239DE38",0xB671],
+  ["8239DE39",0xB672],
+  ["8239DF30",0xB673],
+  ["8239DF31",0xB674],
+  ["8239DF32",0xB675],
+  ["8239DF33",0xB676],
+  ["8239DF34",0xB677],
+  ["8239DF35",0xB678],
+  ["8239DF36",0xB679],
+  ["8239DF37",0xB67A],
+  ["8239DF38",0xB67B],
+  ["8239DF39",0xB67C],
+  ["8239E030",0xB67D],
+  ["8239E031",0xB67E],
+  ["8239E032",0xB67F],
+  ["8239E033",0xB680],
+  ["8239E034",0xB681],
+  ["8239E035",0xB682],
+  ["8239E036",0xB683],
+  ["8239E037",0xB684],
+  ["8239E038",0xB685],
+  ["8239E039",0xB686],
+  ["8239E130",0xB687],
+  ["8239E131",0xB688],
+  ["8239E132",0xB689],
+  ["8239E133",0xB68A],
+  ["8239E134",0xB68B],
+  ["8239E135",0xB68C],
+  ["8239E136",0xB68D],
+  ["8239E137",0xB68E],
+  ["8239E138",0xB68F],
+  ["8239E139",0xB690],
+  ["8239E230",0xB691],
+  ["8239E231",0xB692],
+  ["8239E232",0xB693],
+  ["8239E233",0xB694],
+  ["8239E234",0xB695],
+  ["8239E235",0xB696],
+  ["8239E236",0xB697],
+  ["8239E237",0xB698],
+  ["8239E238",0xB699],
+  ["8239E239",0xB69A],
+  ["8239E330",0xB69B],
+  ["8239E331",0xB69C],
+  ["8239E332",0xB69D],
+  ["8239E333",0xB69E],
+  ["8239E334",0xB69F],
+  ["8239E335",0xB6A0],
+  ["8239E336",0xB6A1],
+  ["8239E337",0xB6A2],
+  ["8239E338",0xB6A3],
+  ["8239E339",0xB6A4],
+  ["8239E430",0xB6A5],
+  ["8239E431",0xB6A6],
+  ["8239E432",0xB6A7],
+  ["8239E433",0xB6A8],
+  ["8239E434",0xB6A9],
+  ["8239E435",0xB6AA],
+  ["8239E436",0xB6AB],
+  ["8239E437",0xB6AC],
+  ["8239E438",0xB6AD],
+  ["8239E439",0xB6AE],
+  ["8239E530",0xB6AF],
+  ["8239E531",0xB6B0],
+  ["8239E532",0xB6B1],
+  ["8239E533",0xB6B2],
+  ["8239E534",0xB6B3],
+  ["8239E535",0xB6B4],
+  ["8239E536",0xB6B5],
+  ["8239E537",0xB6B6],
+  ["8239E538",0xB6B7],
+  ["8239E539",0xB6B8],
+  ["8239E630",0xB6B9],
+  ["8239E631",0xB6BA],
+  ["8239E632",0xB6BB],
+  ["8239E633",0xB6BC],
+  ["8239E634",0xB6BD],
+  ["8239E635",0xB6BE],
+  ["8239E636",0xB6BF],
+  ["8239E637",0xB6C0],
+  ["8239E638",0xB6C1],
+  ["8239E639",0xB6C2],
+  ["8239E730",0xB6C3],
+  ["8239E731",0xB6C4],
+  ["8239E732",0xB6C5],
+  ["8239E733",0xB6C6],
+  ["8239E734",0xB6C7],
+  ["8239E735",0xB6C8],
+  ["8239E736",0xB6C9],
+  ["8239E737",0xB6CA],
+  ["8239E738",0xB6CB],
+  ["8239E739",0xB6CC],
+  ["8239E830",0xB6CD],
+  ["8239E831",0xB6CE],
+  ["8239E832",0xB6CF],
+  ["8239E833",0xB6D0],
+  ["8239E834",0xB6D1],
+  ["8239E835",0xB6D2],
+  ["8239E836",0xB6D3],
+  ["8239E837",0xB6D4],
+  ["8239E838",0xB6D5],
+  ["8239E839",0xB6D6],
+  ["8239E930",0xB6D7],
+  ["8239E931",0xB6D8],
+  ["8239E932",0xB6D9],
+  ["8239E933",0xB6DA],
+  ["8239E934",0xB6DB],
+  ["8239E935",0xB6DC],
+  ["8239E936",0xB6DD],
+  ["8239E937",0xB6DE],
+  ["8239E938",0xB6DF],
+  ["8239E939",0xB6E0],
+  ["8239EA30",0xB6E1],
+  ["8239EA31",0xB6E2],
+  ["8239EA32",0xB6E3],
+  ["8239EA33",0xB6E4],
+  ["8239EA34",0xB6E5],
+  ["8239EA35",0xB6E6],
+  ["8239EA36",0xB6E7],
+  ["8239EA37",0xB6E8],
+  ["8239EA38",0xB6E9],
+  ["8239EA39",0xB6EA],
+  ["8239EB30",0xB6EB],
+  ["8239EB31",0xB6EC],
+  ["8239EB32",0xB6ED],
+  ["8239EB33",0xB6EE],
+  ["8239EB34",0xB6EF],
+  ["8239EB35",0xB6F0],
+  ["8239EB36",0xB6F1],
+  ["8239EB37",0xB6F2],
+  ["8239EB38",0xB6F3],
+  ["8239EB39",0xB6F4],
+  ["8239EC30",0xB6F5],
+  ["8239EC31",0xB6F6],
+  ["8239EC32",0xB6F7],
+  ["8239EC33",0xB6F8],
+  ["8239EC34",0xB6F9],
+  ["8239EC35",0xB6FA],
+  ["8239EC36",0xB6FB],
+  ["8239EC37",0xB6FC],
+  ["8239EC38",0xB6FD],
+  ["8239EC39",0xB6FE],
+  ["8239ED30",0xB6FF],
+  ["8239ED31",0xB700],
+  ["8239ED32",0xB701],
+  ["8239ED33",0xB702],
+  ["8239ED34",0xB703],
+  ["8239ED35",0xB704],
+  ["8239ED36",0xB705],
+  ["8239ED37",0xB706],
+  ["8239ED38",0xB707],
+  ["8239ED39",0xB708],
+  ["8239EE30",0xB709],
+  ["8239EE31",0xB70A],
+  ["8239EE32",0xB70B],
+  ["8239EE33",0xB70C],
+  ["8239EE34",0xB70D],
+  ["8239EE35",0xB70E],
+  ["8239EE36",0xB70F],
+  ["8239EE37",0xB710],
+  ["8239EE38",0xB711],
+  ["8239EE39",0xB712],
+  ["8239EF30",0xB713],
+  ["8239EF31",0xB714],
+  ["8239EF32",0xB715],
+  ["8239EF33",0xB716],
+  ["8239EF34",0xB717],
+  ["8239EF35",0xB718],
+  ["8239EF36",0xB719],
+  ["8239EF37",0xB71A],
+  ["8239EF38",0xB71B],
+  ["8239EF39",0xB71C],
+  ["8239F030",0xB71D],
+  ["8239F031",0xB71E],
+  ["8239F032",0xB71F],
+  ["8239F033",0xB720],
+  ["8239F034",0xB721],
+  ["8239F035",0xB722],
+  ["8239F036",0xB723],
+  ["8239F037",0xB724],
+  ["8239F038",0xB725],
+  ["8239F039",0xB726],
+  ["8239F130",0xB727],
+  ["8239F131",0xB728],
+  ["8239F132",0xB729],
+  ["8239F133",0xB72A],
+  ["8239F134",0xB72B],
+  ["8239F135",0xB72C],
+  ["8239F136",0xB72D],
+  ["8239F137",0xB72E],
+  ["8239F138",0xB72F],
+  ["8239F139",0xB730],
+  ["8239F230",0xB731],
+  ["8239F231",0xB732],
+  ["8239F232",0xB733],
+  ["8239F233",0xB734],
+  ["8239F234",0xB735],
+  ["8239F235",0xB736],
+  ["8239F236",0xB737],
+  ["8239F237",0xB738],
+  ["8239F238",0xB739],
+  ["8239F239",0xB73A],
+  ["8239F330",0xB73B],
+  ["8239F331",0xB73C],
+  ["8239F332",0xB73D],
+  ["8239F333",0xB73E],
+  ["8239F334",0xB73F],
+  ["8239F335",0xB740],
+  ["8239F336",0xB741],
+  ["8239F337",0xB742],
+  ["8239F338",0xB743],
+  ["8239F339",0xB744],
+  ["8239F430",0xB745],
+  ["8239F431",0xB746],
+  ["8239F432",0xB747],
+  ["8239F433",0xB748],
+  ["8239F434",0xB749],
+  ["8239F435",0xB74A],
+  ["8239F436",0xB74B],
+  ["8239F437",0xB74C],
+  ["8239F438",0xB74D],
+  ["8239F439",0xB74E],
+  ["8239F530",0xB74F],
+  ["8239F531",0xB750],
+  ["8239F532",0xB751],
+  ["8239F533",0xB752],
+  ["8239F534",0xB753],
+  ["8239F535",0xB754],
+  ["8239F536",0xB755],
+  ["8239F537",0xB756],
+  ["8239F538",0xB757],
+  ["8239F539",0xB758],
+  ["8239F630",0xB759],
+  ["8239F631",0xB75A],
+  ["8239F632",0xB75B],
+  ["8239F633",0xB75C],
+  ["8239F634",0xB75D],
+  ["8239F635",0xB75E],
+  ["8239F636",0xB75F],
+  ["8239F637",0xB760],
+  ["8239F638",0xB761],
+  ["8239F639",0xB762],
+  ["8239F730",0xB763],
+  ["8239F731",0xB764],
+  ["8239F732",0xB765],
+  ["8239F733",0xB766],
+  ["8239F734",0xB767],
+  ["8239F735",0xB768],
+  ["8239F736",0xB769],
+  ["8239F737",0xB76A],
+  ["8239F738",0xB76B],
+  ["8239F739",0xB76C],
+  ["8239F830",0xB76D],
+  ["8239F831",0xB76E],
+  ["8239F832",0xB76F],
+  ["8239F833",0xB770],
+  ["8239F834",0xB771],
+  ["8239F835",0xB772],
+  ["8239F836",0xB773],
+  ["8239F837",0xB774],
+  ["8239F838",0xB775],
+  ["8239F839",0xB776],
+  ["8239F930",0xB777],
+  ["8239F931",0xB778],
+  ["8239F932",0xB779],
+  ["8239F933",0xB77A],
+  ["8239F934",0xB77B],
+  ["8239F935",0xB77C],
+  ["8239F936",0xB77D],
+  ["8239F937",0xB77E],
+  ["8239F938",0xB77F],
+  ["8239F939",0xB780],
+  ["8239FA30",0xB781],
+  ["8239FA31",0xB782],
+  ["8239FA32",0xB783],
+  ["8239FA33",0xB784],
+  ["8239FA34",0xB785],
+  ["8239FA35",0xB786],
+  ["8239FA36",0xB787],
+  ["8239FA37",0xB788],
+  ["8239FA38",0xB789],
+  ["8239FA39",0xB78A],
+  ["8239FB30",0xB78B],
+  ["8239FB31",0xB78C],
+  ["8239FB32",0xB78D],
+  ["8239FB33",0xB78E],
+  ["8239FB34",0xB78F],
+  ["8239FB35",0xB790],
+  ["8239FB36",0xB791],
+  ["8239FB37",0xB792],
+  ["8239FB38",0xB793],
+  ["8239FB39",0xB794],
+  ["8239FC30",0xB795],
+  ["8239FC31",0xB796],
+  ["8239FC32",0xB797],
+  ["8239FC33",0xB798],
+  ["8239FC34",0xB799],
+  ["8239FC35",0xB79A],
+  ["8239FC36",0xB79B],
+  ["8239FC37",0xB79C],
+  ["8239FC38",0xB79D],
+  ["8239FC39",0xB79E],
+  ["8239FD30",0xB79F],
+  ["8239FD31",0xB7A0],
+  ["8239FD32",0xB7A1],
+  ["8239FD33",0xB7A2],
+  ["8239FD34",0xB7A3],
+  ["8239FD35",0xB7A4],
+  ["8239FD36",0xB7A5],
+  ["8239FD37",0xB7A6],
+  ["8239FD38",0xB7A7],
+  ["8239FD39",0xB7A8],
+  ["8239FE30",0xB7A9],
+  ["8239FE31",0xB7AA],
+  ["8239FE32",0xB7AB],
+  ["8239FE33",0xB7AC],
+  ["8239FE34",0xB7AD],
+  ["8239FE35",0xB7AE],
+  ["8239FE36",0xB7AF],
+  ["8239FE37",0xB7B0],
+  ["8239FE38",0xB7B1],
+  ["8239FE39",0xB7B2],
+  ["83308130",0xB7B3],
+  ["83308131",0xB7B4],
+  ["83308132",0xB7B5],
+  ["83308133",0xB7B6],
+  ["83308134",0xB7B7],
+  ["83308135",0xB7B8],
+  ["83308136",0xB7B9],
+  ["83308137",0xB7BA],
+  ["83308138",0xB7BB],
+  ["83308139",0xB7BC],
+  ["83308230",0xB7BD],
+  ["83308231",0xB7BE],
+  ["83308232",0xB7BF],
+  ["83308233",0xB7C0],
+  ["83308234",0xB7C1],
+  ["83308235",0xB7C2],
+  ["83308236",0xB7C3],
+  ["83308237",0xB7C4],
+  ["83308238",0xB7C5],
+  ["83308239",0xB7C6],
+  ["83308330",0xB7C7],
+  ["83308331",0xB7C8],
+  ["83308332",0xB7C9],
+  ["83308333",0xB7CA],
+  ["83308334",0xB7CB],
+  ["83308335",0xB7CC],
+  ["83308336",0xB7CD],
+  ["83308337",0xB7CE],
+  ["83308338",0xB7CF],
+  ["83308339",0xB7D0],
+  ["83308430",0xB7D1],
+  ["83308431",0xB7D2],
+  ["83308432",0xB7D3],
+  ["83308433",0xB7D4],
+  ["83308434",0xB7D5],
+  ["83308435",0xB7D6],
+  ["83308436",0xB7D7],
+  ["83308437",0xB7D8],
+  ["83308438",0xB7D9],
+  ["83308439",0xB7DA],
+  ["83308530",0xB7DB],
+  ["83308531",0xB7DC],
+  ["83308532",0xB7DD],
+  ["83308533",0xB7DE],
+  ["83308534",0xB7DF],
+  ["83308535",0xB7E0],
+  ["83308536",0xB7E1],
+  ["83308537",0xB7E2],
+  ["83308538",0xB7E3],
+  ["83308539",0xB7E4],
+  ["83308630",0xB7E5],
+  ["83308631",0xB7E6],
+  ["83308632",0xB7E7],
+  ["83308633",0xB7E8],
+  ["83308634",0xB7E9],
+  ["83308635",0xB7EA],
+  ["83308636",0xB7EB],
+  ["83308637",0xB7EC],
+  ["83308638",0xB7ED],
+  ["83308639",0xB7EE],
+  ["83308730",0xB7EF],
+  ["83308731",0xB7F0],
+  ["83308732",0xB7F1],
+  ["83308733",0xB7F2],
+  ["83308734",0xB7F3],
+  ["83308735",0xB7F4],
+  ["83308736",0xB7F5],
+  ["83308737",0xB7F6],
+  ["83308738",0xB7F7],
+  ["83308739",0xB7F8],
+  ["83308830",0xB7F9],
+  ["83308831",0xB7FA],
+  ["83308832",0xB7FB],
+  ["83308833",0xB7FC],
+  ["83308834",0xB7FD],
+  ["83308835",0xB7FE],
+  ["83308836",0xB7FF],
+  ["83308837",0xB800],
+  ["83308838",0xB801],
+  ["83308839",0xB802],
+  ["83308930",0xB803],
+  ["83308931",0xB804],
+  ["83308932",0xB805],
+  ["83308933",0xB806],
+  ["83308934",0xB807],
+  ["83308935",0xB808],
+  ["83308936",0xB809],
+  ["83308937",0xB80A],
+  ["83308938",0xB80B],
+  ["83308939",0xB80C],
+  ["83308A30",0xB80D],
+  ["83308A31",0xB80E],
+  ["83308A32",0xB80F],
+  ["83308A33",0xB810],
+  ["83308A34",0xB811],
+  ["83308A35",0xB812],
+  ["83308A36",0xB813],
+  ["83308A37",0xB814],
+  ["83308A38",0xB815],
+  ["83308A39",0xB816],
+  ["83308B30",0xB817],
+  ["83308B31",0xB818],
+  ["83308B32",0xB819],
+  ["83308B33",0xB81A],
+  ["83308B34",0xB81B],
+  ["83308B35",0xB81C],
+  ["83308B36",0xB81D],
+  ["83308B37",0xB81E],
+  ["83308B38",0xB81F],
+  ["83308B39",0xB820],
+  ["83308C30",0xB821],
+  ["83308C31",0xB822],
+  ["83308C32",0xB823],
+  ["83308C33",0xB824],
+  ["83308C34",0xB825],
+  ["83308C35",0xB826],
+  ["83308C36",0xB827],
+  ["83308C37",0xB828],
+  ["83308C38",0xB829],
+  ["83308C39",0xB82A],
+  ["83308D30",0xB82B],
+  ["83308D31",0xB82C],
+  ["83308D32",0xB82D],
+  ["83308D33",0xB82E],
+  ["83308D34",0xB82F],
+  ["83308D35",0xB830],
+  ["83308D36",0xB831],
+  ["83308D37",0xB832],
+  ["83308D38",0xB833],
+  ["83308D39",0xB834],
+  ["83308E30",0xB835],
+  ["83308E31",0xB836],
+  ["83308E32",0xB837],
+  ["83308E33",0xB838],
+  ["83308E34",0xB839],
+  ["83308E35",0xB83A],
+  ["83308E36",0xB83B],
+  ["83308E37",0xB83C],
+  ["83308E38",0xB83D],
+  ["83308E39",0xB83E],
+  ["83308F30",0xB83F],
+  ["83308F31",0xB840],
+  ["83308F32",0xB841],
+  ["83308F33",0xB842],
+  ["83308F34",0xB843],
+  ["83308F35",0xB844],
+  ["83308F36",0xB845],
+  ["83308F37",0xB846],
+  ["83308F38",0xB847],
+  ["83308F39",0xB848],
+  ["83309030",0xB849],
+  ["83309031",0xB84A],
+  ["83309032",0xB84B],
+  ["83309033",0xB84C],
+  ["83309034",0xB84D],
+  ["83309035",0xB84E],
+  ["83309036",0xB84F],
+  ["83309037",0xB850],
+  ["83309038",0xB851],
+  ["83309039",0xB852],
+  ["83309130",0xB853],
+  ["83309131",0xB854],
+  ["83309132",0xB855],
+  ["83309133",0xB856],
+  ["83309134",0xB857],
+  ["83309135",0xB858],
+  ["83309136",0xB859],
+  ["83309137",0xB85A],
+  ["83309138",0xB85B],
+  ["83309139",0xB85C],
+  ["83309230",0xB85D],
+  ["83309231",0xB85E],
+  ["83309232",0xB85F],
+  ["83309233",0xB860],
+  ["83309234",0xB861],
+  ["83309235",0xB862],
+  ["83309236",0xB863],
+  ["83309237",0xB864],
+  ["83309238",0xB865],
+  ["83309239",0xB866],
+  ["83309330",0xB867],
+  ["83309331",0xB868],
+  ["83309332",0xB869],
+  ["83309333",0xB86A],
+  ["83309334",0xB86B],
+  ["83309335",0xB86C],
+  ["83309336",0xB86D],
+  ["83309337",0xB86E],
+  ["83309338",0xB86F],
+  ["83309339",0xB870],
+  ["83309430",0xB871],
+  ["83309431",0xB872],
+  ["83309432",0xB873],
+  ["83309433",0xB874],
+  ["83309434",0xB875],
+  ["83309435",0xB876],
+  ["83309436",0xB877],
+  ["83309437",0xB878],
+  ["83309438",0xB879],
+  ["83309439",0xB87A],
+  ["83309530",0xB87B],
+  ["83309531",0xB87C],
+  ["83309532",0xB87D],
+  ["83309533",0xB87E],
+  ["83309534",0xB87F],
+  ["83309535",0xB880],
+  ["83309536",0xB881],
+  ["83309537",0xB882],
+  ["83309538",0xB883],
+  ["83309539",0xB884],
+  ["83309630",0xB885],
+  ["83309631",0xB886],
+  ["83309632",0xB887],
+  ["83309633",0xB888],
+  ["83309634",0xB889],
+  ["83309635",0xB88A],
+  ["83309636",0xB88B],
+  ["83309637",0xB88C],
+  ["83309638",0xB88D],
+  ["83309639",0xB88E],
+  ["83309730",0xB88F],
+  ["83309731",0xB890],
+  ["83309732",0xB891],
+  ["83309733",0xB892],
+  ["83309734",0xB893],
+  ["83309735",0xB894],
+  ["83309736",0xB895],
+  ["83309737",0xB896],
+  ["83309738",0xB897],
+  ["83309739",0xB898],
+  ["83309830",0xB899],
+  ["83309831",0xB89A],
+  ["83309832",0xB89B],
+  ["83309833",0xB89C],
+  ["83309834",0xB89D],
+  ["83309835",0xB89E],
+  ["83309836",0xB89F],
+  ["83309837",0xB8A0],
+  ["83309838",0xB8A1],
+  ["83309839",0xB8A2],
+  ["83309930",0xB8A3],
+  ["83309931",0xB8A4],
+  ["83309932",0xB8A5],
+  ["83309933",0xB8A6],
+  ["83309934",0xB8A7],
+  ["83309935",0xB8A8],
+  ["83309936",0xB8A9],
+  ["83309937",0xB8AA],
+  ["83309938",0xB8AB],
+  ["83309939",0xB8AC],
+  ["83309A30",0xB8AD],
+  ["83309A31",0xB8AE],
+  ["83309A32",0xB8AF],
+  ["83309A33",0xB8B0],
+  ["83309A34",0xB8B1],
+  ["83309A35",0xB8B2],
+  ["83309A36",0xB8B3],
+  ["83309A37",0xB8B4],
+  ["83309A38",0xB8B5],
+  ["83309A39",0xB8B6],
+  ["83309B30",0xB8B7],
+  ["83309B31",0xB8B8],
+  ["83309B32",0xB8B9],
+  ["83309B33",0xB8BA],
+  ["83309B34",0xB8BB],
+  ["83309B35",0xB8BC],
+  ["83309B36",0xB8BD],
+  ["83309B37",0xB8BE],
+  ["83309B38",0xB8BF],
+  ["83309B39",0xB8C0],
+  ["83309C30",0xB8C1],
+  ["83309C31",0xB8C2],
+  ["83309C32",0xB8C3],
+  ["83309C33",0xB8C4],
+  ["83309C34",0xB8C5],
+  ["83309C35",0xB8C6],
+  ["83309C36",0xB8C7],
+  ["83309C37",0xB8C8],
+  ["83309C38",0xB8C9],
+  ["83309C39",0xB8CA],
+  ["83309D30",0xB8CB],
+  ["83309D31",0xB8CC],
+  ["83309D32",0xB8CD],
+  ["83309D33",0xB8CE],
+  ["83309D34",0xB8CF],
+  ["83309D35",0xB8D0],
+  ["83309D36",0xB8D1],
+  ["83309D37",0xB8D2],
+  ["83309D38",0xB8D3],
+  ["83309D39",0xB8D4],
+  ["83309E30",0xB8D5],
+  ["83309E31",0xB8D6],
+  ["83309E32",0xB8D7],
+  ["83309E33",0xB8D8],
+  ["83309E34",0xB8D9],
+  ["83309E35",0xB8DA],
+  ["83309E36",0xB8DB],
+  ["83309E37",0xB8DC],
+  ["83309E38",0xB8DD],
+  ["83309E39",0xB8DE],
+  ["83309F30",0xB8DF],
+  ["83309F31",0xB8E0],
+  ["83309F32",0xB8E1],
+  ["83309F33",0xB8E2],
+  ["83309F34",0xB8E3],
+  ["83309F35",0xB8E4],
+  ["83309F36",0xB8E5],
+  ["83309F37",0xB8E6],
+  ["83309F38",0xB8E7],
+  ["83309F39",0xB8E8],
+  ["8330A030",0xB8E9],
+  ["8330A031",0xB8EA],
+  ["8330A032",0xB8EB],
+  ["8330A033",0xB8EC],
+  ["8330A034",0xB8ED],
+  ["8330A035",0xB8EE],
+  ["8330A036",0xB8EF],
+  ["8330A037",0xB8F0],
+  ["8330A038",0xB8F1],
+  ["8330A039",0xB8F2],
+  ["8330A130",0xB8F3],
+  ["8330A131",0xB8F4],
+  ["8330A132",0xB8F5],
+  ["8330A133",0xB8F6],
+  ["8330A134",0xB8F7],
+  ["8330A135",0xB8F8],
+  ["8330A136",0xB8F9],
+  ["8330A137",0xB8FA],
+  ["8330A138",0xB8FB],
+  ["8330A139",0xB8FC],
+  ["8330A230",0xB8FD],
+  ["8330A231",0xB8FE],
+  ["8330A232",0xB8FF],
+  ["8330A233",0xB900],
+  ["8330A234",0xB901],
+  ["8330A235",0xB902],
+  ["8330A236",0xB903],
+  ["8330A237",0xB904],
+  ["8330A238",0xB905],
+  ["8330A239",0xB906],
+  ["8330A330",0xB907],
+  ["8330A331",0xB908],
+  ["8330A332",0xB909],
+  ["8330A333",0xB90A],
+  ["8330A334",0xB90B],
+  ["8330A335",0xB90C],
+  ["8330A336",0xB90D],
+  ["8330A337",0xB90E],
+  ["8330A338",0xB90F],
+  ["8330A339",0xB910],
+  ["8330A430",0xB911],
+  ["8330A431",0xB912],
+  ["8330A432",0xB913],
+  ["8330A433",0xB914],
+  ["8330A434",0xB915],
+  ["8330A435",0xB916],
+  ["8330A436",0xB917],
+  ["8330A437",0xB918],
+  ["8330A438",0xB919],
+  ["8330A439",0xB91A],
+  ["8330A530",0xB91B],
+  ["8330A531",0xB91C],
+  ["8330A532",0xB91D],
+  ["8330A533",0xB91E],
+  ["8330A534",0xB91F],
+  ["8330A535",0xB920],
+  ["8330A536",0xB921],
+  ["8330A537",0xB922],
+  ["8330A538",0xB923],
+  ["8330A539",0xB924],
+  ["8330A630",0xB925],
+  ["8330A631",0xB926],
+  ["8330A632",0xB927],
+  ["8330A633",0xB928],
+  ["8330A634",0xB929],
+  ["8330A635",0xB92A],
+  ["8330A636",0xB92B],
+  ["8330A637",0xB92C],
+  ["8330A638",0xB92D],
+  ["8330A639",0xB92E],
+  ["8330A730",0xB92F],
+  ["8330A731",0xB930],
+  ["8330A732",0xB931],
+  ["8330A733",0xB932],
+  ["8330A734",0xB933],
+  ["8330A735",0xB934],
+  ["8330A736",0xB935],
+  ["8330A737",0xB936],
+  ["8330A738",0xB937],
+  ["8330A739",0xB938],
+  ["8330A830",0xB939],
+  ["8330A831",0xB93A],
+  ["8330A832",0xB93B],
+  ["8330A833",0xB93C],
+  ["8330A834",0xB93D],
+  ["8330A835",0xB93E],
+  ["8330A836",0xB93F],
+  ["8330A837",0xB940],
+  ["8330A838",0xB941],
+  ["8330A839",0xB942],
+  ["8330A930",0xB943],
+  ["8330A931",0xB944],
+  ["8330A932",0xB945],
+  ["8330A933",0xB946],
+  ["8330A934",0xB947],
+  ["8330A935",0xB948],
+  ["8330A936",0xB949],
+  ["8330A937",0xB94A],
+  ["8330A938",0xB94B],
+  ["8330A939",0xB94C],
+  ["8330AA30",0xB94D],
+  ["8330AA31",0xB94E],
+  ["8330AA32",0xB94F],
+  ["8330AA33",0xB950],
+  ["8330AA34",0xB951],
+  ["8330AA35",0xB952],
+  ["8330AA36",0xB953],
+  ["8330AA37",0xB954],
+  ["8330AA38",0xB955],
+  ["8330AA39",0xB956],
+  ["8330AB30",0xB957],
+  ["8330AB31",0xB958],
+  ["8330AB32",0xB959],
+  ["8330AB33",0xB95A],
+  ["8330AB34",0xB95B],
+  ["8330AB35",0xB95C],
+  ["8330AB36",0xB95D],
+  ["8330AB37",0xB95E],
+  ["8330AB38",0xB95F],
+  ["8330AB39",0xB960],
+  ["8330AC30",0xB961],
+  ["8330AC31",0xB962],
+  ["8330AC32",0xB963],
+  ["8330AC33",0xB964],
+  ["8330AC34",0xB965],
+  ["8330AC35",0xB966],
+  ["8330AC36",0xB967],
+  ["8330AC37",0xB968],
+  ["8330AC38",0xB969],
+  ["8330AC39",0xB96A],
+  ["8330AD30",0xB96B],
+  ["8330AD31",0xB96C],
+  ["8330AD32",0xB96D],
+  ["8330AD33",0xB96E],
+  ["8330AD34",0xB96F],
+  ["8330AD35",0xB970],
+  ["8330AD36",0xB971],
+  ["8330AD37",0xB972],
+  ["8330AD38",0xB973],
+  ["8330AD39",0xB974],
+  ["8330AE30",0xB975],
+  ["8330AE31",0xB976],
+  ["8330AE32",0xB977],
+  ["8330AE33",0xB978],
+  ["8330AE34",0xB979],
+  ["8330AE35",0xB97A],
+  ["8330AE36",0xB97B],
+  ["8330AE37",0xB97C],
+  ["8330AE38",0xB97D],
+  ["8330AE39",0xB97E],
+  ["8330AF30",0xB97F],
+  ["8330AF31",0xB980],
+  ["8330AF32",0xB981],
+  ["8330AF33",0xB982],
+  ["8330AF34",0xB983],
+  ["8330AF35",0xB984],
+  ["8330AF36",0xB985],
+  ["8330AF37",0xB986],
+  ["8330AF38",0xB987],
+  ["8330AF39",0xB988],
+  ["8330B030",0xB989],
+  ["8330B031",0xB98A],
+  ["8330B032",0xB98B],
+  ["8330B033",0xB98C],
+  ["8330B034",0xB98D],
+  ["8330B035",0xB98E],
+  ["8330B036",0xB98F],
+  ["8330B037",0xB990],
+  ["8330B038",0xB991],
+  ["8330B039",0xB992],
+  ["8330B130",0xB993],
+  ["8330B131",0xB994],
+  ["8330B132",0xB995],
+  ["8330B133",0xB996],
+  ["8330B134",0xB997],
+  ["8330B135",0xB998],
+  ["8330B136",0xB999],
+  ["8330B137",0xB99A],
+  ["8330B138",0xB99B],
+  ["8330B139",0xB99C],
+  ["8330B230",0xB99D],
+  ["8330B231",0xB99E],
+  ["8330B232",0xB99F],
+  ["8330B233",0xB9A0],
+  ["8330B234",0xB9A1],
+  ["8330B235",0xB9A2],
+  ["8330B236",0xB9A3],
+  ["8330B237",0xB9A4],
+  ["8330B238",0xB9A5],
+  ["8330B239",0xB9A6],
+  ["8330B330",0xB9A7],
+  ["8330B331",0xB9A8],
+  ["8330B332",0xB9A9],
+  ["8330B333",0xB9AA],
+  ["8330B334",0xB9AB],
+  ["8330B335",0xB9AC],
+  ["8330B336",0xB9AD],
+  ["8330B337",0xB9AE],
+  ["8330B338",0xB9AF],
+  ["8330B339",0xB9B0],
+  ["8330B430",0xB9B1],
+  ["8330B431",0xB9B2],
+  ["8330B432",0xB9B3],
+  ["8330B433",0xB9B4],
+  ["8330B434",0xB9B5],
+  ["8330B435",0xB9B6],
+  ["8330B436",0xB9B7],
+  ["8330B437",0xB9B8],
+  ["8330B438",0xB9B9],
+  ["8330B439",0xB9BA],
+  ["8330B530",0xB9BB],
+  ["8330B531",0xB9BC],
+  ["8330B532",0xB9BD],
+  ["8330B533",0xB9BE],
+  ["8330B534",0xB9BF],
+  ["8330B535",0xB9C0],
+  ["8330B536",0xB9C1],
+  ["8330B537",0xB9C2],
+  ["8330B538",0xB9C3],
+  ["8330B539",0xB9C4],
+  ["8330B630",0xB9C5],
+  ["8330B631",0xB9C6],
+  ["8330B632",0xB9C7],
+  ["8330B633",0xB9C8],
+  ["8330B634",0xB9C9],
+  ["8330B635",0xB9CA],
+  ["8330B636",0xB9CB],
+  ["8330B637",0xB9CC],
+  ["8330B638",0xB9CD],
+  ["8330B639",0xB9CE],
+  ["8330B730",0xB9CF],
+  ["8330B731",0xB9D0],
+  ["8330B732",0xB9D1],
+  ["8330B733",0xB9D2],
+  ["8330B734",0xB9D3],
+  ["8330B735",0xB9D4],
+  ["8330B736",0xB9D5],
+  ["8330B737",0xB9D6],
+  ["8330B738",0xB9D7],
+  ["8330B739",0xB9D8],
+  ["8330B830",0xB9D9],
+  ["8330B831",0xB9DA],
+  ["8330B832",0xB9DB],
+  ["8330B833",0xB9DC],
+  ["8330B834",0xB9DD],
+  ["8330B835",0xB9DE],
+  ["8330B836",0xB9DF],
+  ["8330B837",0xB9E0],
+  ["8330B838",0xB9E1],
+  ["8330B839",0xB9E2],
+  ["8330B930",0xB9E3],
+  ["8330B931",0xB9E4],
+  ["8330B932",0xB9E5],
+  ["8330B933",0xB9E6],
+  ["8330B934",0xB9E7],
+  ["8330B935",0xB9E8],
+  ["8330B936",0xB9E9],
+  ["8330B937",0xB9EA],
+  ["8330B938",0xB9EB],
+  ["8330B939",0xB9EC],
+  ["8330BA30",0xB9ED],
+  ["8330BA31",0xB9EE],
+  ["8330BA32",0xB9EF],
+  ["8330BA33",0xB9F0],
+  ["8330BA34",0xB9F1],
+  ["8330BA35",0xB9F2],
+  ["8330BA36",0xB9F3],
+  ["8330BA37",0xB9F4],
+  ["8330BA38",0xB9F5],
+  ["8330BA39",0xB9F6],
+  ["8330BB30",0xB9F7],
+  ["8330BB31",0xB9F8],
+  ["8330BB32",0xB9F9],
+  ["8330BB33",0xB9FA],
+  ["8330BB34",0xB9FB],
+  ["8330BB35",0xB9FC],
+  ["8330BB36",0xB9FD],
+  ["8330BB37",0xB9FE],
+  ["8330BB38",0xB9FF],
+  ["8330BB39",0xBA00],
+  ["8330BC30",0xBA01],
+  ["8330BC31",0xBA02],
+  ["8330BC32",0xBA03],
+  ["8330BC33",0xBA04],
+  ["8330BC34",0xBA05],
+  ["8330BC35",0xBA06],
+  ["8330BC36",0xBA07],
+  ["8330BC37",0xBA08],
+  ["8330BC38",0xBA09],
+  ["8330BC39",0xBA0A],
+  ["8330BD30",0xBA0B],
+  ["8330BD31",0xBA0C],
+  ["8330BD32",0xBA0D],
+  ["8330BD33",0xBA0E],
+  ["8330BD34",0xBA0F],
+  ["8330BD35",0xBA10],
+  ["8330BD36",0xBA11],
+  ["8330BD37",0xBA12],
+  ["8330BD38",0xBA13],
+  ["8330BD39",0xBA14],
+  ["8330BE30",0xBA15],
+  ["8330BE31",0xBA16],
+  ["8330BE32",0xBA17],
+  ["8330BE33",0xBA18],
+  ["8330BE34",0xBA19],
+  ["8330BE35",0xBA1A],
+  ["8330BE36",0xBA1B],
+  ["8330BE37",0xBA1C],
+  ["8330BE38",0xBA1D],
+  ["8330BE39",0xBA1E],
+  ["8330BF30",0xBA1F],
+  ["8330BF31",0xBA20],
+  ["8330BF32",0xBA21],
+  ["8330BF33",0xBA22],
+  ["8330BF34",0xBA23],
+  ["8330BF35",0xBA24],
+  ["8330BF36",0xBA25],
+  ["8330BF37",0xBA26],
+  ["8330BF38",0xBA27],
+  ["8330BF39",0xBA28],
+  ["8330C030",0xBA29],
+  ["8330C031",0xBA2A],
+  ["8330C032",0xBA2B],
+  ["8330C033",0xBA2C],
+  ["8330C034",0xBA2D],
+  ["8330C035",0xBA2E],
+  ["8330C036",0xBA2F],
+  ["8330C037",0xBA30],
+  ["8330C038",0xBA31],
+  ["8330C039",0xBA32],
+  ["8330C130",0xBA33],
+  ["8330C131",0xBA34],
+  ["8330C132",0xBA35],
+  ["8330C133",0xBA36],
+  ["8330C134",0xBA37],
+  ["8330C135",0xBA38],
+  ["8330C136",0xBA39],
+  ["8330C137",0xBA3A],
+  ["8330C138",0xBA3B],
+  ["8330C139",0xBA3C],
+  ["8330C230",0xBA3D],
+  ["8330C231",0xBA3E],
+  ["8330C232",0xBA3F],
+  ["8330C233",0xBA40],
+  ["8330C234",0xBA41],
+  ["8330C235",0xBA42],
+  ["8330C236",0xBA43],
+  ["8330C237",0xBA44],
+  ["8330C238",0xBA45],
+  ["8330C239",0xBA46],
+  ["8330C330",0xBA47],
+  ["8330C331",0xBA48],
+  ["8330C332",0xBA49],
+  ["8330C333",0xBA4A],
+  ["8330C334",0xBA4B],
+  ["8330C335",0xBA4C],
+  ["8330C336",0xBA4D],
+  ["8330C337",0xBA4E],
+  ["8330C338",0xBA4F],
+  ["8330C339",0xBA50],
+  ["8330C430",0xBA51],
+  ["8330C431",0xBA52],
+  ["8330C432",0xBA53],
+  ["8330C433",0xBA54],
+  ["8330C434",0xBA55],
+  ["8330C435",0xBA56],
+  ["8330C436",0xBA57],
+  ["8330C437",0xBA58],
+  ["8330C438",0xBA59],
+  ["8330C439",0xBA5A],
+  ["8330C530",0xBA5B],
+  ["8330C531",0xBA5C],
+  ["8330C532",0xBA5D],
+  ["8330C533",0xBA5E],
+  ["8330C534",0xBA5F],
+  ["8330C535",0xBA60],
+  ["8330C536",0xBA61],
+  ["8330C537",0xBA62],
+  ["8330C538",0xBA63],
+  ["8330C539",0xBA64],
+  ["8330C630",0xBA65],
+  ["8330C631",0xBA66],
+  ["8330C632",0xBA67],
+  ["8330C633",0xBA68],
+  ["8330C634",0xBA69],
+  ["8330C635",0xBA6A],
+  ["8330C636",0xBA6B],
+  ["8330C637",0xBA6C],
+  ["8330C638",0xBA6D],
+  ["8330C639",0xBA6E],
+  ["8330C730",0xBA6F],
+  ["8330C731",0xBA70],
+  ["8330C732",0xBA71],
+  ["8330C733",0xBA72],
+  ["8330C734",0xBA73],
+  ["8330C735",0xBA74],
+  ["8330C736",0xBA75],
+  ["8330C737",0xBA76],
+  ["8330C738",0xBA77],
+  ["8330C739",0xBA78],
+  ["8330C830",0xBA79],
+  ["8330C831",0xBA7A],
+  ["8330C832",0xBA7B],
+  ["8330C833",0xBA7C],
+  ["8330C834",0xBA7D],
+  ["8330C835",0xBA7E],
+  ["8330C836",0xBA7F],
+  ["8330C837",0xBA80],
+  ["8330C838",0xBA81],
+  ["8330C839",0xBA82],
+  ["8330C930",0xBA83],
+  ["8330C931",0xBA84],
+  ["8330C932",0xBA85],
+  ["8330C933",0xBA86],
+  ["8330C934",0xBA87],
+  ["8330C935",0xBA88],
+  ["8330C936",0xBA89],
+  ["8330C937",0xBA8A],
+  ["8330C938",0xBA8B],
+  ["8330C939",0xBA8C],
+  ["8330CA30",0xBA8D],
+  ["8330CA31",0xBA8E],
+  ["8330CA32",0xBA8F],
+  ["8330CA33",0xBA90],
+  ["8330CA34",0xBA91],
+  ["8330CA35",0xBA92],
+  ["8330CA36",0xBA93],
+  ["8330CA37",0xBA94],
+  ["8330CA38",0xBA95],
+  ["8330CA39",0xBA96],
+  ["8330CB30",0xBA97],
+  ["8330CB31",0xBA98],
+  ["8330CB32",0xBA99],
+  ["8330CB33",0xBA9A],
+  ["8330CB34",0xBA9B],
+  ["8330CB35",0xBA9C],
+  ["8330CB36",0xBA9D],
+  ["8330CB37",0xBA9E],
+  ["8330CB38",0xBA9F],
+  ["8330CB39",0xBAA0],
+  ["8330CC30",0xBAA1],
+  ["8330CC31",0xBAA2],
+  ["8330CC32",0xBAA3],
+  ["8330CC33",0xBAA4],
+  ["8330CC34",0xBAA5],
+  ["8330CC35",0xBAA6],
+  ["8330CC36",0xBAA7],
+  ["8330CC37",0xBAA8],
+  ["8330CC38",0xBAA9],
+  ["8330CC39",0xBAAA],
+  ["8330CD30",0xBAAB],
+  ["8330CD31",0xBAAC],
+  ["8330CD32",0xBAAD],
+  ["8330CD33",0xBAAE],
+  ["8330CD34",0xBAAF],
+  ["8330CD35",0xBAB0],
+  ["8330CD36",0xBAB1],
+  ["8330CD37",0xBAB2],
+  ["8330CD38",0xBAB3],
+  ["8330CD39",0xBAB4],
+  ["8330CE30",0xBAB5],
+  ["8330CE31",0xBAB6],
+  ["8330CE32",0xBAB7],
+  ["8330CE33",0xBAB8],
+  ["8330CE34",0xBAB9],
+  ["8330CE35",0xBABA],
+  ["8330CE36",0xBABB],
+  ["8330CE37",0xBABC],
+  ["8330CE38",0xBABD],
+  ["8330CE39",0xBABE],
+  ["8330CF30",0xBABF],
+  ["8330CF31",0xBAC0],
+  ["8330CF32",0xBAC1],
+  ["8330CF33",0xBAC2],
+  ["8330CF34",0xBAC3],
+  ["8330CF35",0xBAC4],
+  ["8330CF36",0xBAC5],
+  ["8330CF37",0xBAC6],
+  ["8330CF38",0xBAC7],
+  ["8330CF39",0xBAC8],
+  ["8330D030",0xBAC9],
+  ["8330D031",0xBACA],
+  ["8330D032",0xBACB],
+  ["8330D033",0xBACC],
+  ["8330D034",0xBACD],
+  ["8330D035",0xBACE],
+  ["8330D036",0xBACF],
+  ["8330D037",0xBAD0],
+  ["8330D038",0xBAD1],
+  ["8330D039",0xBAD2],
+  ["8330D130",0xBAD3],
+  ["8330D131",0xBAD4],
+  ["8330D132",0xBAD5],
+  ["8330D133",0xBAD6],
+  ["8330D134",0xBAD7],
+  ["8330D135",0xBAD8],
+  ["8330D136",0xBAD9],
+  ["8330D137",0xBADA],
+  ["8330D138",0xBADB],
+  ["8330D139",0xBADC],
+  ["8330D230",0xBADD],
+  ["8330D231",0xBADE],
+  ["8330D232",0xBADF],
+  ["8330D233",0xBAE0],
+  ["8330D234",0xBAE1],
+  ["8330D235",0xBAE2],
+  ["8330D236",0xBAE3],
+  ["8330D237",0xBAE4],
+  ["8330D238",0xBAE5],
+  ["8330D239",0xBAE6],
+  ["8330D330",0xBAE7],
+  ["8330D331",0xBAE8],
+  ["8330D332",0xBAE9],
+  ["8330D333",0xBAEA],
+  ["8330D334",0xBAEB],
+  ["8330D335",0xBAEC],
+  ["8330D336",0xBAED],
+  ["8330D337",0xBAEE],
+  ["8330D338",0xBAEF],
+  ["8330D339",0xBAF0],
+  ["8330D430",0xBAF1],
+  ["8330D431",0xBAF2],
+  ["8330D432",0xBAF3],
+  ["8330D433",0xBAF4],
+  ["8330D434",0xBAF5],
+  ["8330D435",0xBAF6],
+  ["8330D436",0xBAF7],
+  ["8330D437",0xBAF8],
+  ["8330D438",0xBAF9],
+  ["8330D439",0xBAFA],
+  ["8330D530",0xBAFB],
+  ["8330D531",0xBAFC],
+  ["8330D532",0xBAFD],
+  ["8330D533",0xBAFE],
+  ["8330D534",0xBAFF],
+  ["8330D535",0xBB00],
+  ["8330D536",0xBB01],
+  ["8330D537",0xBB02],
+  ["8330D538",0xBB03],
+  ["8330D539",0xBB04],
+  ["8330D630",0xBB05],
+  ["8330D631",0xBB06],
+  ["8330D632",0xBB07],
+  ["8330D633",0xBB08],
+  ["8330D634",0xBB09],
+  ["8330D635",0xBB0A],
+  ["8330D636",0xBB0B],
+  ["8330D637",0xBB0C],
+  ["8330D638",0xBB0D],
+  ["8330D639",0xBB0E],
+  ["8330D730",0xBB0F],
+  ["8330D731",0xBB10],
+  ["8330D732",0xBB11],
+  ["8330D733",0xBB12],
+  ["8330D734",0xBB13],
+  ["8330D735",0xBB14],
+  ["8330D736",0xBB15],
+  ["8330D737",0xBB16],
+  ["8330D738",0xBB17],
+  ["8330D739",0xBB18],
+  ["8330D830",0xBB19],
+  ["8330D831",0xBB1A],
+  ["8330D832",0xBB1B],
+  ["8330D833",0xBB1C],
+  ["8330D834",0xBB1D],
+  ["8330D835",0xBB1E],
+  ["8330D836",0xBB1F],
+  ["8330D837",0xBB20],
+  ["8330D838",0xBB21],
+  ["8330D839",0xBB22],
+  ["8330D930",0xBB23],
+  ["8330D931",0xBB24],
+  ["8330D932",0xBB25],
+  ["8330D933",0xBB26],
+  ["8330D934",0xBB27],
+  ["8330D935",0xBB28],
+  ["8330D936",0xBB29],
+  ["8330D937",0xBB2A],
+  ["8330D938",0xBB2B],
+  ["8330D939",0xBB2C],
+  ["8330DA30",0xBB2D],
+  ["8330DA31",0xBB2E],
+  ["8330DA32",0xBB2F],
+  ["8330DA33",0xBB30],
+  ["8330DA34",0xBB31],
+  ["8330DA35",0xBB32],
+  ["8330DA36",0xBB33],
+  ["8330DA37",0xBB34],
+  ["8330DA38",0xBB35],
+  ["8330DA39",0xBB36],
+  ["8330DB30",0xBB37],
+  ["8330DB31",0xBB38],
+  ["8330DB32",0xBB39],
+  ["8330DB33",0xBB3A],
+  ["8330DB34",0xBB3B],
+  ["8330DB35",0xBB3C],
+  ["8330DB36",0xBB3D],
+  ["8330DB37",0xBB3E],
+  ["8330DB38",0xBB3F],
+  ["8330DB39",0xBB40],
+  ["8330DC30",0xBB41],
+  ["8330DC31",0xBB42],
+  ["8330DC32",0xBB43],
+  ["8330DC33",0xBB44],
+  ["8330DC34",0xBB45],
+  ["8330DC35",0xBB46],
+  ["8330DC36",0xBB47],
+  ["8330DC37",0xBB48],
+  ["8330DC38",0xBB49],
+  ["8330DC39",0xBB4A],
+  ["8330DD30",0xBB4B],
+  ["8330DD31",0xBB4C],
+  ["8330DD32",0xBB4D],
+  ["8330DD33",0xBB4E],
+  ["8330DD34",0xBB4F],
+  ["8330DD35",0xBB50],
+  ["8330DD36",0xBB51],
+  ["8330DD37",0xBB52],
+  ["8330DD38",0xBB53],
+  ["8330DD39",0xBB54],
+  ["8330DE30",0xBB55],
+  ["8330DE31",0xBB56],
+  ["8330DE32",0xBB57],
+  ["8330DE33",0xBB58],
+  ["8330DE34",0xBB59],
+  ["8330DE35",0xBB5A],
+  ["8330DE36",0xBB5B],
+  ["8330DE37",0xBB5C],
+  ["8330DE38",0xBB5D],
+  ["8330DE39",0xBB5E],
+  ["8330DF30",0xBB5F],
+  ["8330DF31",0xBB60],
+  ["8330DF32",0xBB61],
+  ["8330DF33",0xBB62],
+  ["8330DF34",0xBB63],
+  ["8330DF35",0xBB64],
+  ["8330DF36",0xBB65],
+  ["8330DF37",0xBB66],
+  ["8330DF38",0xBB67],
+  ["8330DF39",0xBB68],
+  ["8330E030",0xBB69],
+  ["8330E031",0xBB6A],
+  ["8330E032",0xBB6B],
+  ["8330E033",0xBB6C],
+  ["8330E034",0xBB6D],
+  ["8330E035",0xBB6E],
+  ["8330E036",0xBB6F],
+  ["8330E037",0xBB70],
+  ["8330E038",0xBB71],
+  ["8330E039",0xBB72],
+  ["8330E130",0xBB73],
+  ["8330E131",0xBB74],
+  ["8330E132",0xBB75],
+  ["8330E133",0xBB76],
+  ["8330E134",0xBB77],
+  ["8330E135",0xBB78],
+  ["8330E136",0xBB79],
+  ["8330E137",0xBB7A],
+  ["8330E138",0xBB7B],
+  ["8330E139",0xBB7C],
+  ["8330E230",0xBB7D],
+  ["8330E231",0xBB7E],
+  ["8330E232",0xBB7F],
+  ["8330E233",0xBB80],
+  ["8330E234",0xBB81],
+  ["8330E235",0xBB82],
+  ["8330E236",0xBB83],
+  ["8330E237",0xBB84],
+  ["8330E238",0xBB85],
+  ["8330E239",0xBB86],
+  ["8330E330",0xBB87],
+  ["8330E331",0xBB88],
+  ["8330E332",0xBB89],
+  ["8330E333",0xBB8A],
+  ["8330E334",0xBB8B],
+  ["8330E335",0xBB8C],
+  ["8330E336",0xBB8D],
+  ["8330E337",0xBB8E],
+  ["8330E338",0xBB8F],
+  ["8330E339",0xBB90],
+  ["8330E430",0xBB91],
+  ["8330E431",0xBB92],
+  ["8330E432",0xBB93],
+  ["8330E433",0xBB94],
+  ["8330E434",0xBB95],
+  ["8330E435",0xBB96],
+  ["8330E436",0xBB97],
+  ["8330E437",0xBB98],
+  ["8330E438",0xBB99],
+  ["8330E439",0xBB9A],
+  ["8330E530",0xBB9B],
+  ["8330E531",0xBB9C],
+  ["8330E532",0xBB9D],
+  ["8330E533",0xBB9E],
+  ["8330E534",0xBB9F],
+  ["8330E535",0xBBA0],
+  ["8330E536",0xBBA1],
+  ["8330E537",0xBBA2],
+  ["8330E538",0xBBA3],
+  ["8330E539",0xBBA4],
+  ["8330E630",0xBBA5],
+  ["8330E631",0xBBA6],
+  ["8330E632",0xBBA7],
+  ["8330E633",0xBBA8],
+  ["8330E634",0xBBA9],
+  ["8330E635",0xBBAA],
+  ["8330E636",0xBBAB],
+  ["8330E637",0xBBAC],
+  ["8330E638",0xBBAD],
+  ["8330E639",0xBBAE],
+  ["8330E730",0xBBAF],
+  ["8330E731",0xBBB0],
+  ["8330E732",0xBBB1],
+  ["8330E733",0xBBB2],
+  ["8330E734",0xBBB3],
+  ["8330E735",0xBBB4],
+  ["8330E736",0xBBB5],
+  ["8330E737",0xBBB6],
+  ["8330E738",0xBBB7],
+  ["8330E739",0xBBB8],
+  ["8330E830",0xBBB9],
+  ["8330E831",0xBBBA],
+  ["8330E832",0xBBBB],
+  ["8330E833",0xBBBC],
+  ["8330E834",0xBBBD],
+  ["8330E835",0xBBBE],
+  ["8330E836",0xBBBF],
+  ["8330E837",0xBBC0],
+  ["8330E838",0xBBC1],
+  ["8330E839",0xBBC2],
+  ["8330E930",0xBBC3],
+  ["8330E931",0xBBC4],
+  ["8330E932",0xBBC5],
+  ["8330E933",0xBBC6],
+  ["8330E934",0xBBC7],
+  ["8330E935",0xBBC8],
+  ["8330E936",0xBBC9],
+  ["8330E937",0xBBCA],
+  ["8330E938",0xBBCB],
+  ["8330E939",0xBBCC],
+  ["8330EA30",0xBBCD],
+  ["8330EA31",0xBBCE],
+  ["8330EA32",0xBBCF],
+  ["8330EA33",0xBBD0],
+  ["8330EA34",0xBBD1],
+  ["8330EA35",0xBBD2],
+  ["8330EA36",0xBBD3],
+  ["8330EA37",0xBBD4],
+  ["8330EA38",0xBBD5],
+  ["8330EA39",0xBBD6],
+  ["8330EB30",0xBBD7],
+  ["8330EB31",0xBBD8],
+  ["8330EB32",0xBBD9],
+  ["8330EB33",0xBBDA],
+  ["8330EB34",0xBBDB],
+  ["8330EB35",0xBBDC],
+  ["8330EB36",0xBBDD],
+  ["8330EB37",0xBBDE],
+  ["8330EB38",0xBBDF],
+  ["8330EB39",0xBBE0],
+  ["8330EC30",0xBBE1],
+  ["8330EC31",0xBBE2],
+  ["8330EC32",0xBBE3],
+  ["8330EC33",0xBBE4],
+  ["8330EC34",0xBBE5],
+  ["8330EC35",0xBBE6],
+  ["8330EC36",0xBBE7],
+  ["8330EC37",0xBBE8],
+  ["8330EC38",0xBBE9],
+  ["8330EC39",0xBBEA],
+  ["8330ED30",0xBBEB],
+  ["8330ED31",0xBBEC],
+  ["8330ED32",0xBBED],
+  ["8330ED33",0xBBEE],
+  ["8330ED34",0xBBEF],
+  ["8330ED35",0xBBF0],
+  ["8330ED36",0xBBF1],
+  ["8330ED37",0xBBF2],
+  ["8330ED38",0xBBF3],
+  ["8330ED39",0xBBF4],
+  ["8330EE30",0xBBF5],
+  ["8330EE31",0xBBF6],
+  ["8330EE32",0xBBF7],
+  ["8330EE33",0xBBF8],
+  ["8330EE34",0xBBF9],
+  ["8330EE35",0xBBFA],
+  ["8330EE36",0xBBFB],
+  ["8330EE37",0xBBFC],
+  ["8330EE38",0xBBFD],
+  ["8330EE39",0xBBFE],
+  ["8330EF30",0xBBFF],
+  ["8330EF31",0xBC00],
+  ["8330EF32",0xBC01],
+  ["8330EF33",0xBC02],
+  ["8330EF34",0xBC03],
+  ["8330EF35",0xBC04],
+  ["8330EF36",0xBC05],
+  ["8330EF37",0xBC06],
+  ["8330EF38",0xBC07],
+  ["8330EF39",0xBC08],
+  ["8330F030",0xBC09],
+  ["8330F031",0xBC0A],
+  ["8330F032",0xBC0B],
+  ["8330F033",0xBC0C],
+  ["8330F034",0xBC0D],
+  ["8330F035",0xBC0E],
+  ["8330F036",0xBC0F],
+  ["8330F037",0xBC10],
+  ["8330F038",0xBC11],
+  ["8330F039",0xBC12],
+  ["8330F130",0xBC13],
+  ["8330F131",0xBC14],
+  ["8330F132",0xBC15],
+  ["8330F133",0xBC16],
+  ["8330F134",0xBC17],
+  ["8330F135",0xBC18],
+  ["8330F136",0xBC19],
+  ["8330F137",0xBC1A],
+  ["8330F138",0xBC1B],
+  ["8330F139",0xBC1C],
+  ["8330F230",0xBC1D],
+  ["8330F231",0xBC1E],
+  ["8330F232",0xBC1F],
+  ["8330F233",0xBC20],
+  ["8330F234",0xBC21],
+  ["8330F235",0xBC22],
+  ["8330F236",0xBC23],
+  ["8330F237",0xBC24],
+  ["8330F238",0xBC25],
+  ["8330F239",0xBC26],
+  ["8330F330",0xBC27],
+  ["8330F331",0xBC28],
+  ["8330F332",0xBC29],
+  ["8330F333",0xBC2A],
+  ["8330F334",0xBC2B],
+  ["8330F335",0xBC2C],
+  ["8330F336",0xBC2D],
+  ["8330F337",0xBC2E],
+  ["8330F338",0xBC2F],
+  ["8330F339",0xBC30],
+  ["8330F430",0xBC31],
+  ["8330F431",0xBC32],
+  ["8330F432",0xBC33],
+  ["8330F433",0xBC34],
+  ["8330F434",0xBC35],
+  ["8330F435",0xBC36],
+  ["8330F436",0xBC37],
+  ["8330F437",0xBC38],
+  ["8330F438",0xBC39],
+  ["8330F439",0xBC3A],
+  ["8330F530",0xBC3B],
+  ["8330F531",0xBC3C],
+  ["8330F532",0xBC3D],
+  ["8330F533",0xBC3E],
+  ["8330F534",0xBC3F],
+  ["8330F535",0xBC40],
+  ["8330F536",0xBC41],
+  ["8330F537",0xBC42],
+  ["8330F538",0xBC43],
+  ["8330F539",0xBC44],
+  ["8330F630",0xBC45],
+  ["8330F631",0xBC46],
+  ["8330F632",0xBC47],
+  ["8330F633",0xBC48],
+  ["8330F634",0xBC49],
+  ["8330F635",0xBC4A],
+  ["8330F636",0xBC4B],
+  ["8330F637",0xBC4C],
+  ["8330F638",0xBC4D],
+  ["8330F639",0xBC4E],
+  ["8330F730",0xBC4F],
+  ["8330F731",0xBC50],
+  ["8330F732",0xBC51],
+  ["8330F733",0xBC52],
+  ["8330F734",0xBC53],
+  ["8330F735",0xBC54],
+  ["8330F736",0xBC55],
+  ["8330F737",0xBC56],
+  ["8330F738",0xBC57],
+  ["8330F739",0xBC58],
+  ["8330F830",0xBC59],
+  ["8330F831",0xBC5A],
+  ["8330F832",0xBC5B],
+  ["8330F833",0xBC5C],
+  ["8330F834",0xBC5D],
+  ["8330F835",0xBC5E],
+  ["8330F836",0xBC5F],
+  ["8330F837",0xBC60],
+  ["8330F838",0xBC61],
+  ["8330F839",0xBC62],
+  ["8330F930",0xBC63],
+  ["8330F931",0xBC64],
+  ["8330F932",0xBC65],
+  ["8330F933",0xBC66],
+  ["8330F934",0xBC67],
+  ["8330F935",0xBC68],
+  ["8330F936",0xBC69],
+  ["8330F937",0xBC6A],
+  ["8330F938",0xBC6B],
+  ["8330F939",0xBC6C],
+  ["8330FA30",0xBC6D],
+  ["8330FA31",0xBC6E],
+  ["8330FA32",0xBC6F],
+  ["8330FA33",0xBC70],
+  ["8330FA34",0xBC71],
+  ["8330FA35",0xBC72],
+  ["8330FA36",0xBC73],
+  ["8330FA37",0xBC74],
+  ["8330FA38",0xBC75],
+  ["8330FA39",0xBC76],
+  ["8330FB30",0xBC77],
+  ["8330FB31",0xBC78],
+  ["8330FB32",0xBC79],
+  ["8330FB33",0xBC7A],
+  ["8330FB34",0xBC7B],
+  ["8330FB35",0xBC7C],
+  ["8330FB36",0xBC7D],
+  ["8330FB37",0xBC7E],
+  ["8330FB38",0xBC7F],
+  ["8330FB39",0xBC80],
+  ["8330FC30",0xBC81],
+  ["8330FC31",0xBC82],
+  ["8330FC32",0xBC83],
+  ["8330FC33",0xBC84],
+  ["8330FC34",0xBC85],
+  ["8330FC35",0xBC86],
+  ["8330FC36",0xBC87],
+  ["8330FC37",0xBC88],
+  ["8330FC38",0xBC89],
+  ["8330FC39",0xBC8A],
+  ["8330FD30",0xBC8B],
+  ["8330FD31",0xBC8C],
+  ["8330FD32",0xBC8D],
+  ["8330FD33",0xBC8E],
+  ["8330FD34",0xBC8F],
+  ["8330FD35",0xBC90],
+  ["8330FD36",0xBC91],
+  ["8330FD37",0xBC92],
+  ["8330FD38",0xBC93],
+  ["8330FD39",0xBC94],
+  ["8330FE30",0xBC95],
+  ["8330FE31",0xBC96],
+  ["8330FE32",0xBC97],
+  ["8330FE33",0xBC98],
+  ["8330FE34",0xBC99],
+  ["8330FE35",0xBC9A],
+  ["8330FE36",0xBC9B],
+  ["8330FE37",0xBC9C],
+  ["8330FE38",0xBC9D],
+  ["8330FE39",0xBC9E],
+  ["83318130",0xBC9F],
+  ["83318131",0xBCA0],
+  ["83318132",0xBCA1],
+  ["83318133",0xBCA2],
+  ["83318134",0xBCA3],
+  ["83318135",0xBCA4],
+  ["83318136",0xBCA5],
+  ["83318137",0xBCA6],
+  ["83318138",0xBCA7],
+  ["83318139",0xBCA8],
+  ["83318230",0xBCA9],
+  ["83318231",0xBCAA],
+  ["83318232",0xBCAB],
+  ["83318233",0xBCAC],
+  ["83318234",0xBCAD],
+  ["83318235",0xBCAE],
+  ["83318236",0xBCAF],
+  ["83318237",0xBCB0],
+  ["83318238",0xBCB1],
+  ["83318239",0xBCB2],
+  ["83318330",0xBCB3],
+  ["83318331",0xBCB4],
+  ["83318332",0xBCB5],
+  ["83318333",0xBCB6],
+  ["83318334",0xBCB7],
+  ["83318335",0xBCB8],
+  ["83318336",0xBCB9],
+  ["83318337",0xBCBA],
+  ["83318338",0xBCBB],
+  ["83318339",0xBCBC],
+  ["83318430",0xBCBD],
+  ["83318431",0xBCBE],
+  ["83318432",0xBCBF],
+  ["83318433",0xBCC0],
+  ["83318434",0xBCC1],
+  ["83318435",0xBCC2],
+  ["83318436",0xBCC3],
+  ["83318437",0xBCC4],
+  ["83318438",0xBCC5],
+  ["83318439",0xBCC6],
+  ["83318530",0xBCC7],
+  ["83318531",0xBCC8],
+  ["83318532",0xBCC9],
+  ["83318533",0xBCCA],
+  ["83318534",0xBCCB],
+  ["83318535",0xBCCC],
+  ["83318536",0xBCCD],
+  ["83318537",0xBCCE],
+  ["83318538",0xBCCF],
+  ["83318539",0xBCD0],
+  ["83318630",0xBCD1],
+  ["83318631",0xBCD2],
+  ["83318632",0xBCD3],
+  ["83318633",0xBCD4],
+  ["83318634",0xBCD5],
+  ["83318635",0xBCD6],
+  ["83318636",0xBCD7],
+  ["83318637",0xBCD8],
+  ["83318638",0xBCD9],
+  ["83318639",0xBCDA],
+  ["83318730",0xBCDB],
+  ["83318731",0xBCDC],
+  ["83318732",0xBCDD],
+  ["83318733",0xBCDE],
+  ["83318734",0xBCDF],
+  ["83318735",0xBCE0],
+  ["83318736",0xBCE1],
+  ["83318737",0xBCE2],
+  ["83318738",0xBCE3],
+  ["83318739",0xBCE4],
+  ["83318830",0xBCE5],
+  ["83318831",0xBCE6],
+  ["83318832",0xBCE7],
+  ["83318833",0xBCE8],
+  ["83318834",0xBCE9],
+  ["83318835",0xBCEA],
+  ["83318836",0xBCEB],
+  ["83318837",0xBCEC],
+  ["83318838",0xBCED],
+  ["83318839",0xBCEE],
+  ["83318930",0xBCEF],
+  ["83318931",0xBCF0],
+  ["83318932",0xBCF1],
+  ["83318933",0xBCF2],
+  ["83318934",0xBCF3],
+  ["83318935",0xBCF4],
+  ["83318936",0xBCF5],
+  ["83318937",0xBCF6],
+  ["83318938",0xBCF7],
+  ["83318939",0xBCF8],
+  ["83318A30",0xBCF9],
+  ["83318A31",0xBCFA],
+  ["83318A32",0xBCFB],
+  ["83318A33",0xBCFC],
+  ["83318A34",0xBCFD],
+  ["83318A35",0xBCFE],
+  ["83318A36",0xBCFF],
+  ["83318A37",0xBD00],
+  ["83318A38",0xBD01],
+  ["83318A39",0xBD02],
+  ["83318B30",0xBD03],
+  ["83318B31",0xBD04],
+  ["83318B32",0xBD05],
+  ["83318B33",0xBD06],
+  ["83318B34",0xBD07],
+  ["83318B35",0xBD08],
+  ["83318B36",0xBD09],
+  ["83318B37",0xBD0A],
+  ["83318B38",0xBD0B],
+  ["83318B39",0xBD0C],
+  ["83318C30",0xBD0D],
+  ["83318C31",0xBD0E],
+  ["83318C32",0xBD0F],
+  ["83318C33",0xBD10],
+  ["83318C34",0xBD11],
+  ["83318C35",0xBD12],
+  ["83318C36",0xBD13],
+  ["83318C37",0xBD14],
+  ["83318C38",0xBD15],
+  ["83318C39",0xBD16],
+  ["83318D30",0xBD17],
+  ["83318D31",0xBD18],
+  ["83318D32",0xBD19],
+  ["83318D33",0xBD1A],
+  ["83318D34",0xBD1B],
+  ["83318D35",0xBD1C],
+  ["83318D36",0xBD1D],
+  ["83318D37",0xBD1E],
+  ["83318D38",0xBD1F],
+  ["83318D39",0xBD20],
+  ["83318E30",0xBD21],
+  ["83318E31",0xBD22],
+  ["83318E32",0xBD23],
+  ["83318E33",0xBD24],
+  ["83318E34",0xBD25],
+  ["83318E35",0xBD26],
+  ["83318E36",0xBD27],
+  ["83318E37",0xBD28],
+  ["83318E38",0xBD29],
+  ["83318E39",0xBD2A],
+  ["83318F30",0xBD2B],
+  ["83318F31",0xBD2C],
+  ["83318F32",0xBD2D],
+  ["83318F33",0xBD2E],
+  ["83318F34",0xBD2F],
+  ["83318F35",0xBD30],
+  ["83318F36",0xBD31],
+  ["83318F37",0xBD32],
+  ["83318F38",0xBD33],
+  ["83318F39",0xBD34],
+  ["83319030",0xBD35],
+  ["83319031",0xBD36],
+  ["83319032",0xBD37],
+  ["83319033",0xBD38],
+  ["83319034",0xBD39],
+  ["83319035",0xBD3A],
+  ["83319036",0xBD3B],
+  ["83319037",0xBD3C],
+  ["83319038",0xBD3D],
+  ["83319039",0xBD3E],
+  ["83319130",0xBD3F],
+  ["83319131",0xBD40],
+  ["83319132",0xBD41],
+  ["83319133",0xBD42],
+  ["83319134",0xBD43],
+  ["83319135",0xBD44],
+  ["83319136",0xBD45],
+  ["83319137",0xBD46],
+  ["83319138",0xBD47],
+  ["83319139",0xBD48],
+  ["83319230",0xBD49],
+  ["83319231",0xBD4A],
+  ["83319232",0xBD4B],
+  ["83319233",0xBD4C],
+  ["83319234",0xBD4D],
+  ["83319235",0xBD4E],
+  ["83319236",0xBD4F],
+  ["83319237",0xBD50],
+  ["83319238",0xBD51],
+  ["83319239",0xBD52],
+  ["83319330",0xBD53],
+  ["83319331",0xBD54],
+  ["83319332",0xBD55],
+  ["83319333",0xBD56],
+  ["83319334",0xBD57],
+  ["83319335",0xBD58],
+  ["83319336",0xBD59],
+  ["83319337",0xBD5A],
+  ["83319338",0xBD5B],
+  ["83319339",0xBD5C],
+  ["83319430",0xBD5D],
+  ["83319431",0xBD5E],
+  ["83319432",0xBD5F],
+  ["83319433",0xBD60],
+  ["83319434",0xBD61],
+  ["83319435",0xBD62],
+  ["83319436",0xBD63],
+  ["83319437",0xBD64],
+  ["83319438",0xBD65],
+  ["83319439",0xBD66],
+  ["83319530",0xBD67],
+  ["83319531",0xBD68],
+  ["83319532",0xBD69],
+  ["83319533",0xBD6A],
+  ["83319534",0xBD6B],
+  ["83319535",0xBD6C],
+  ["83319536",0xBD6D],
+  ["83319537",0xBD6E],
+  ["83319538",0xBD6F],
+  ["83319539",0xBD70],
+  ["83319630",0xBD71],
+  ["83319631",0xBD72],
+  ["83319632",0xBD73],
+  ["83319633",0xBD74],
+  ["83319634",0xBD75],
+  ["83319635",0xBD76],
+  ["83319636",0xBD77],
+  ["83319637",0xBD78],
+  ["83319638",0xBD79],
+  ["83319639",0xBD7A],
+  ["83319730",0xBD7B],
+  ["83319731",0xBD7C],
+  ["83319732",0xBD7D],
+  ["83319733",0xBD7E],
+  ["83319734",0xBD7F],
+  ["83319735",0xBD80],
+  ["83319736",0xBD81],
+  ["83319737",0xBD82],
+  ["83319738",0xBD83],
+  ["83319739",0xBD84],
+  ["83319830",0xBD85],
+  ["83319831",0xBD86],
+  ["83319832",0xBD87],
+  ["83319833",0xBD88],
+  ["83319834",0xBD89],
+  ["83319835",0xBD8A],
+  ["83319836",0xBD8B],
+  ["83319837",0xBD8C],
+  ["83319838",0xBD8D],
+  ["83319839",0xBD8E],
+  ["83319930",0xBD8F],
+  ["83319931",0xBD90],
+  ["83319932",0xBD91],
+  ["83319933",0xBD92],
+  ["83319934",0xBD93],
+  ["83319935",0xBD94],
+  ["83319936",0xBD95],
+  ["83319937",0xBD96],
+  ["83319938",0xBD97],
+  ["83319939",0xBD98],
+  ["83319A30",0xBD99],
+  ["83319A31",0xBD9A],
+  ["83319A32",0xBD9B],
+  ["83319A33",0xBD9C],
+  ["83319A34",0xBD9D],
+  ["83319A35",0xBD9E],
+  ["83319A36",0xBD9F],
+  ["83319A37",0xBDA0],
+  ["83319A38",0xBDA1],
+  ["83319A39",0xBDA2],
+  ["83319B30",0xBDA3],
+  ["83319B31",0xBDA4],
+  ["83319B32",0xBDA5],
+  ["83319B33",0xBDA6],
+  ["83319B34",0xBDA7],
+  ["83319B35",0xBDA8],
+  ["83319B36",0xBDA9],
+  ["83319B37",0xBDAA],
+  ["83319B38",0xBDAB],
+  ["83319B39",0xBDAC],
+  ["83319C30",0xBDAD],
+  ["83319C31",0xBDAE],
+  ["83319C32",0xBDAF],
+  ["83319C33",0xBDB0],
+  ["83319C34",0xBDB1],
+  ["83319C35",0xBDB2],
+  ["83319C36",0xBDB3],
+  ["83319C37",0xBDB4],
+  ["83319C38",0xBDB5],
+  ["83319C39",0xBDB6],
+  ["83319D30",0xBDB7],
+  ["83319D31",0xBDB8],
+  ["83319D32",0xBDB9],
+  ["83319D33",0xBDBA],
+  ["83319D34",0xBDBB],
+  ["83319D35",0xBDBC],
+  ["83319D36",0xBDBD],
+  ["83319D37",0xBDBE],
+  ["83319D38",0xBDBF],
+  ["83319D39",0xBDC0],
+  ["83319E30",0xBDC1],
+  ["83319E31",0xBDC2],
+  ["83319E32",0xBDC3],
+  ["83319E33",0xBDC4],
+  ["83319E34",0xBDC5],
+  ["83319E35",0xBDC6],
+  ["83319E36",0xBDC7],
+  ["83319E37",0xBDC8],
+  ["83319E38",0xBDC9],
+  ["83319E39",0xBDCA],
+  ["83319F30",0xBDCB],
+  ["83319F31",0xBDCC],
+  ["83319F32",0xBDCD],
+  ["83319F33",0xBDCE],
+  ["83319F34",0xBDCF],
+  ["83319F35",0xBDD0],
+  ["83319F36",0xBDD1],
+  ["83319F37",0xBDD2],
+  ["83319F38",0xBDD3],
+  ["83319F39",0xBDD4],
+  ["8331A030",0xBDD5],
+  ["8331A031",0xBDD6],
+  ["8331A032",0xBDD7],
+  ["8331A033",0xBDD8],
+  ["8331A034",0xBDD9],
+  ["8331A035",0xBDDA],
+  ["8331A036",0xBDDB],
+  ["8331A037",0xBDDC],
+  ["8331A038",0xBDDD],
+  ["8331A039",0xBDDE],
+  ["8331A130",0xBDDF],
+  ["8331A131",0xBDE0],
+  ["8331A132",0xBDE1],
+  ["8331A133",0xBDE2],
+  ["8331A134",0xBDE3],
+  ["8331A135",0xBDE4],
+  ["8331A136",0xBDE5],
+  ["8331A137",0xBDE6],
+  ["8331A138",0xBDE7],
+  ["8331A139",0xBDE8],
+  ["8331A230",0xBDE9],
+  ["8331A231",0xBDEA],
+  ["8331A232",0xBDEB],
+  ["8331A233",0xBDEC],
+  ["8331A234",0xBDED],
+  ["8331A235",0xBDEE],
+  ["8331A236",0xBDEF],
+  ["8331A237",0xBDF0],
+  ["8331A238",0xBDF1],
+  ["8331A239",0xBDF2],
+  ["8331A330",0xBDF3],
+  ["8331A331",0xBDF4],
+  ["8331A332",0xBDF5],
+  ["8331A333",0xBDF6],
+  ["8331A334",0xBDF7],
+  ["8331A335",0xBDF8],
+  ["8331A336",0xBDF9],
+  ["8331A337",0xBDFA],
+  ["8331A338",0xBDFB],
+  ["8331A339",0xBDFC],
+  ["8331A430",0xBDFD],
+  ["8331A431",0xBDFE],
+  ["8331A432",0xBDFF],
+  ["8331A433",0xBE00],
+  ["8331A434",0xBE01],
+  ["8331A435",0xBE02],
+  ["8331A436",0xBE03],
+  ["8331A437",0xBE04],
+  ["8331A438",0xBE05],
+  ["8331A439",0xBE06],
+  ["8331A530",0xBE07],
+  ["8331A531",0xBE08],
+  ["8331A532",0xBE09],
+  ["8331A533",0xBE0A],
+  ["8331A534",0xBE0B],
+  ["8331A535",0xBE0C],
+  ["8331A536",0xBE0D],
+  ["8331A537",0xBE0E],
+  ["8331A538",0xBE0F],
+  ["8331A539",0xBE10],
+  ["8331A630",0xBE11],
+  ["8331A631",0xBE12],
+  ["8331A632",0xBE13],
+  ["8331A633",0xBE14],
+  ["8331A634",0xBE15],
+  ["8331A635",0xBE16],
+  ["8331A636",0xBE17],
+  ["8331A637",0xBE18],
+  ["8331A638",0xBE19],
+  ["8331A639",0xBE1A],
+  ["8331A730",0xBE1B],
+  ["8331A731",0xBE1C],
+  ["8331A732",0xBE1D],
+  ["8331A733",0xBE1E],
+  ["8331A734",0xBE1F],
+  ["8331A735",0xBE20],
+  ["8331A736",0xBE21],
+  ["8331A737",0xBE22],
+  ["8331A738",0xBE23],
+  ["8331A739",0xBE24],
+  ["8331A830",0xBE25],
+  ["8331A831",0xBE26],
+  ["8331A832",0xBE27],
+  ["8331A833",0xBE28],
+  ["8331A834",0xBE29],
+  ["8331A835",0xBE2A],
+  ["8331A836",0xBE2B],
+  ["8331A837",0xBE2C],
+  ["8331A838",0xBE2D],
+  ["8331A839",0xBE2E],
+  ["8331A930",0xBE2F],
+  ["8331A931",0xBE30],
+  ["8331A932",0xBE31],
+  ["8331A933",0xBE32],
+  ["8331A934",0xBE33],
+  ["8331A935",0xBE34],
+  ["8331A936",0xBE35],
+  ["8331A937",0xBE36],
+  ["8331A938",0xBE37],
+  ["8331A939",0xBE38],
+  ["8331AA30",0xBE39],
+  ["8331AA31",0xBE3A],
+  ["8331AA32",0xBE3B],
+  ["8331AA33",0xBE3C],
+  ["8331AA34",0xBE3D],
+  ["8331AA35",0xBE3E],
+  ["8331AA36",0xBE3F],
+  ["8331AA37",0xBE40],
+  ["8331AA38",0xBE41],
+  ["8331AA39",0xBE42],
+  ["8331AB30",0xBE43],
+  ["8331AB31",0xBE44],
+  ["8331AB32",0xBE45],
+  ["8331AB33",0xBE46],
+  ["8331AB34",0xBE47],
+  ["8331AB35",0xBE48],
+  ["8331AB36",0xBE49],
+  ["8331AB37",0xBE4A],
+  ["8331AB38",0xBE4B],
+  ["8331AB39",0xBE4C],
+  ["8331AC30",0xBE4D],
+  ["8331AC31",0xBE4E],
+  ["8331AC32",0xBE4F],
+  ["8331AC33",0xBE50],
+  ["8331AC34",0xBE51],
+  ["8331AC35",0xBE52],
+  ["8331AC36",0xBE53],
+  ["8331AC37",0xBE54],
+  ["8331AC38",0xBE55],
+  ["8331AC39",0xBE56],
+  ["8331AD30",0xBE57],
+  ["8331AD31",0xBE58],
+  ["8331AD32",0xBE59],
+  ["8331AD33",0xBE5A],
+  ["8331AD34",0xBE5B],
+  ["8331AD35",0xBE5C],
+  ["8331AD36",0xBE5D],
+  ["8331AD37",0xBE5E],
+  ["8331AD38",0xBE5F],
+  ["8331AD39",0xBE60],
+  ["8331AE30",0xBE61],
+  ["8331AE31",0xBE62],
+  ["8331AE32",0xBE63],
+  ["8331AE33",0xBE64],
+  ["8331AE34",0xBE65],
+  ["8331AE35",0xBE66],
+  ["8331AE36",0xBE67],
+  ["8331AE37",0xBE68],
+  ["8331AE38",0xBE69],
+  ["8331AE39",0xBE6A],
+  ["8331AF30",0xBE6B],
+  ["8331AF31",0xBE6C],
+  ["8331AF32",0xBE6D],
+  ["8331AF33",0xBE6E],
+  ["8331AF34",0xBE6F],
+  ["8331AF35",0xBE70],
+  ["8331AF36",0xBE71],
+  ["8331AF37",0xBE72],
+  ["8331AF38",0xBE73],
+  ["8331AF39",0xBE74],
+  ["8331B030",0xBE75],
+  ["8331B031",0xBE76],
+  ["8331B032",0xBE77],
+  ["8331B033",0xBE78],
+  ["8331B034",0xBE79],
+  ["8331B035",0xBE7A],
+  ["8331B036",0xBE7B],
+  ["8331B037",0xBE7C],
+  ["8331B038",0xBE7D],
+  ["8331B039",0xBE7E],
+  ["8331B130",0xBE7F],
+  ["8331B131",0xBE80],
+  ["8331B132",0xBE81],
+  ["8331B133",0xBE82],
+  ["8331B134",0xBE83],
+  ["8331B135",0xBE84],
+  ["8331B136",0xBE85],
+  ["8331B137",0xBE86],
+  ["8331B138",0xBE87],
+  ["8331B139",0xBE88],
+  ["8331B230",0xBE89],
+  ["8331B231",0xBE8A],
+  ["8331B232",0xBE8B],
+  ["8331B233",0xBE8C],
+  ["8331B234",0xBE8D],
+  ["8331B235",0xBE8E],
+  ["8331B236",0xBE8F],
+  ["8331B237",0xBE90],
+  ["8331B238",0xBE91],
+  ["8331B239",0xBE92],
+  ["8331B330",0xBE93],
+  ["8331B331",0xBE94],
+  ["8331B332",0xBE95],
+  ["8331B333",0xBE96],
+  ["8331B334",0xBE97],
+  ["8331B335",0xBE98],
+  ["8331B336",0xBE99],
+  ["8331B337",0xBE9A],
+  ["8331B338",0xBE9B],
+  ["8331B339",0xBE9C],
+  ["8331B430",0xBE9D],
+  ["8331B431",0xBE9E],
+  ["8331B432",0xBE9F],
+  ["8331B433",0xBEA0],
+  ["8331B434",0xBEA1],
+  ["8331B435",0xBEA2],
+  ["8331B436",0xBEA3],
+  ["8331B437",0xBEA4],
+  ["8331B438",0xBEA5],
+  ["8331B439",0xBEA6],
+  ["8331B530",0xBEA7],
+  ["8331B531",0xBEA8],
+  ["8331B532",0xBEA9],
+  ["8331B533",0xBEAA],
+  ["8331B534",0xBEAB],
+  ["8331B535",0xBEAC],
+  ["8331B536",0xBEAD],
+  ["8331B537",0xBEAE],
+  ["8331B538",0xBEAF],
+  ["8331B539",0xBEB0],
+  ["8331B630",0xBEB1],
+  ["8331B631",0xBEB2],
+  ["8331B632",0xBEB3],
+  ["8331B633",0xBEB4],
+  ["8331B634",0xBEB5],
+  ["8331B635",0xBEB6],
+  ["8331B636",0xBEB7],
+  ["8331B637",0xBEB8],
+  ["8331B638",0xBEB9],
+  ["8331B639",0xBEBA],
+  ["8331B730",0xBEBB],
+  ["8331B731",0xBEBC],
+  ["8331B732",0xBEBD],
+  ["8331B733",0xBEBE],
+  ["8331B734",0xBEBF],
+  ["8331B735",0xBEC0],
+  ["8331B736",0xBEC1],
+  ["8331B737",0xBEC2],
+  ["8331B738",0xBEC3],
+  ["8331B739",0xBEC4],
+  ["8331B830",0xBEC5],
+  ["8331B831",0xBEC6],
+  ["8331B832",0xBEC7],
+  ["8331B833",0xBEC8],
+  ["8331B834",0xBEC9],
+  ["8331B835",0xBECA],
+  ["8331B836",0xBECB],
+  ["8331B837",0xBECC],
+  ["8331B838",0xBECD],
+  ["8331B839",0xBECE],
+  ["8331B930",0xBECF],
+  ["8331B931",0xBED0],
+  ["8331B932",0xBED1],
+  ["8331B933",0xBED2],
+  ["8331B934",0xBED3],
+  ["8331B935",0xBED4],
+  ["8331B936",0xBED5],
+  ["8331B937",0xBED6],
+  ["8331B938",0xBED7],
+  ["8331B939",0xBED8],
+  ["8331BA30",0xBED9],
+  ["8331BA31",0xBEDA],
+  ["8331BA32",0xBEDB],
+  ["8331BA33",0xBEDC],
+  ["8331BA34",0xBEDD],
+  ["8331BA35",0xBEDE],
+  ["8331BA36",0xBEDF],
+  ["8331BA37",0xBEE0],
+  ["8331BA38",0xBEE1],
+  ["8331BA39",0xBEE2],
+  ["8331BB30",0xBEE3],
+  ["8331BB31",0xBEE4],
+  ["8331BB32",0xBEE5],
+  ["8331BB33",0xBEE6],
+  ["8331BB34",0xBEE7],
+  ["8331BB35",0xBEE8],
+  ["8331BB36",0xBEE9],
+  ["8331BB37",0xBEEA],
+  ["8331BB38",0xBEEB],
+  ["8331BB39",0xBEEC],
+  ["8331BC30",0xBEED],
+  ["8331BC31",0xBEEE],
+  ["8331BC32",0xBEEF],
+  ["8331BC33",0xBEF0],
+  ["8331BC34",0xBEF1],
+  ["8331BC35",0xBEF2],
+  ["8331BC36",0xBEF3],
+  ["8331BC37",0xBEF4],
+  ["8331BC38",0xBEF5],
+  ["8331BC39",0xBEF6],
+  ["8331BD30",0xBEF7],
+  ["8331BD31",0xBEF8],
+  ["8331BD32",0xBEF9],
+  ["8331BD33",0xBEFA],
+  ["8331BD34",0xBEFB],
+  ["8331BD35",0xBEFC],
+  ["8331BD36",0xBEFD],
+  ["8331BD37",0xBEFE],
+  ["8331BD38",0xBEFF],
+  ["8331BD39",0xBF00],
+  ["8331BE30",0xBF01],
+  ["8331BE31",0xBF02],
+  ["8331BE32",0xBF03],
+  ["8331BE33",0xBF04],
+  ["8331BE34",0xBF05],
+  ["8331BE35",0xBF06],
+  ["8331BE36",0xBF07],
+  ["8331BE37",0xBF08],
+  ["8331BE38",0xBF09],
+  ["8331BE39",0xBF0A],
+  ["8331BF30",0xBF0B],
+  ["8331BF31",0xBF0C],
+  ["8331BF32",0xBF0D],
+  ["8331BF33",0xBF0E],
+  ["8331BF34",0xBF0F],
+  ["8331BF35",0xBF10],
+  ["8331BF36",0xBF11],
+  ["8331BF37",0xBF12],
+  ["8331BF38",0xBF13],
+  ["8331BF39",0xBF14],
+  ["8331C030",0xBF15],
+  ["8331C031",0xBF16],
+  ["8331C032",0xBF17],
+  ["8331C033",0xBF18],
+  ["8331C034",0xBF19],
+  ["8331C035",0xBF1A],
+  ["8331C036",0xBF1B],
+  ["8331C037",0xBF1C],
+  ["8331C038",0xBF1D],
+  ["8331C039",0xBF1E],
+  ["8331C130",0xBF1F],
+  ["8331C131",0xBF20],
+  ["8331C132",0xBF21],
+  ["8331C133",0xBF22],
+  ["8331C134",0xBF23],
+  ["8331C135",0xBF24],
+  ["8331C136",0xBF25],
+  ["8331C137",0xBF26],
+  ["8331C138",0xBF27],
+  ["8331C139",0xBF28],
+  ["8331C230",0xBF29],
+  ["8331C231",0xBF2A],
+  ["8331C232",0xBF2B],
+  ["8331C233",0xBF2C],
+  ["8331C234",0xBF2D],
+  ["8331C235",0xBF2E],
+  ["8331C236",0xBF2F],
+  ["8331C237",0xBF30],
+  ["8331C238",0xBF31],
+  ["8331C239",0xBF32],
+  ["8331C330",0xBF33],
+  ["8331C331",0xBF34],
+  ["8331C332",0xBF35],
+  ["8331C333",0xBF36],
+  ["8331C334",0xBF37],
+  ["8331C335",0xBF38],
+  ["8331C336",0xBF39],
+  ["8331C337",0xBF3A],
+  ["8331C338",0xBF3B],
+  ["8331C339",0xBF3C],
+  ["8331C430",0xBF3D],
+  ["8331C431",0xBF3E],
+  ["8331C432",0xBF3F],
+  ["8331C433",0xBF40],
+  ["8331C434",0xBF41],
+  ["8331C435",0xBF42],
+  ["8331C436",0xBF43],
+  ["8331C437",0xBF44],
+  ["8331C438",0xBF45],
+  ["8331C439",0xBF46],
+  ["8331C530",0xBF47],
+  ["8331C531",0xBF48],
+  ["8331C532",0xBF49],
+  ["8331C533",0xBF4A],
+  ["8331C534",0xBF4B],
+  ["8331C535",0xBF4C],
+  ["8331C536",0xBF4D],
+  ["8331C537",0xBF4E],
+  ["8331C538",0xBF4F],
+  ["8331C539",0xBF50],
+  ["8331C630",0xBF51],
+  ["8331C631",0xBF52],
+  ["8331C632",0xBF53],
+  ["8331C633",0xBF54],
+  ["8331C634",0xBF55],
+  ["8331C635",0xBF56],
+  ["8331C636",0xBF57],
+  ["8331C637",0xBF58],
+  ["8331C638",0xBF59],
+  ["8331C639",0xBF5A],
+  ["8331C730",0xBF5B],
+  ["8331C731",0xBF5C],
+  ["8331C732",0xBF5D],
+  ["8331C733",0xBF5E],
+  ["8331C734",0xBF5F],
+  ["8331C735",0xBF60],
+  ["8331C736",0xBF61],
+  ["8331C737",0xBF62],
+  ["8331C738",0xBF63],
+  ["8331C739",0xBF64],
+  ["8331C830",0xBF65],
+  ["8331C831",0xBF66],
+  ["8331C832",0xBF67],
+  ["8331C833",0xBF68],
+  ["8331C834",0xBF69],
+  ["8331C835",0xBF6A],
+  ["8331C836",0xBF6B],
+  ["8331C837",0xBF6C],
+  ["8331C838",0xBF6D],
+  ["8331C839",0xBF6E],
+  ["8331C930",0xBF6F],
+  ["8331C931",0xBF70],
+  ["8331C932",0xBF71],
+  ["8331C933",0xBF72],
+  ["8331C934",0xBF73],
+  ["8331C935",0xBF74],
+  ["8331C936",0xBF75],
+  ["8331C937",0xBF76],
+  ["8331C938",0xBF77],
+  ["8331C939",0xBF78],
+  ["8331CA30",0xBF79],
+  ["8331CA31",0xBF7A],
+  ["8331CA32",0xBF7B],
+  ["8331CA33",0xBF7C],
+  ["8331CA34",0xBF7D],
+  ["8331CA35",0xBF7E],
+  ["8331CA36",0xBF7F],
+  ["8331CA37",0xBF80],
+  ["8331CA38",0xBF81],
+  ["8331CA39",0xBF82],
+  ["8331CB30",0xBF83],
+  ["8331CB31",0xBF84],
+  ["8331CB32",0xBF85],
+  ["8331CB33",0xBF86],
+  ["8331CB34",0xBF87],
+  ["8331CB35",0xBF88],
+  ["8331CB36",0xBF89],
+  ["8331CB37",0xBF8A],
+  ["8331CB38",0xBF8B],
+  ["8331CB39",0xBF8C],
+  ["8331CC30",0xBF8D],
+  ["8331CC31",0xBF8E],
+  ["8331CC32",0xBF8F],
+  ["8331CC33",0xBF90],
+  ["8331CC34",0xBF91],
+  ["8331CC35",0xBF92],
+  ["8331CC36",0xBF93],
+  ["8331CC37",0xBF94],
+  ["8331CC38",0xBF95],
+  ["8331CC39",0xBF96],
+  ["8331CD30",0xBF97],
+  ["8331CD31",0xBF98],
+  ["8331CD32",0xBF99],
+  ["8331CD33",0xBF9A],
+  ["8331CD34",0xBF9B],
+  ["8331CD35",0xBF9C],
+  ["8331CD36",0xBF9D],
+  ["8331CD37",0xBF9E],
+  ["8331CD38",0xBF9F],
+  ["8331CD39",0xBFA0],
+  ["8331CE30",0xBFA1],
+  ["8331CE31",0xBFA2],
+  ["8331CE32",0xBFA3],
+  ["8331CE33",0xBFA4],
+  ["8331CE34",0xBFA5],
+  ["8331CE35",0xBFA6],
+  ["8331CE36",0xBFA7],
+  ["8331CE37",0xBFA8],
+  ["8331CE38",0xBFA9],
+  ["8331CE39",0xBFAA],
+  ["8331CF30",0xBFAB],
+  ["8331CF31",0xBFAC],
+  ["8331CF32",0xBFAD],
+  ["8331CF33",0xBFAE],
+  ["8331CF34",0xBFAF],
+  ["8331CF35",0xBFB0],
+  ["8331CF36",0xBFB1],
+  ["8331CF37",0xBFB2],
+  ["8331CF38",0xBFB3],
+  ["8331CF39",0xBFB4],
+  ["8331D030",0xBFB5],
+  ["8331D031",0xBFB6],
+  ["8331D032",0xBFB7],
+  ["8331D033",0xBFB8],
+  ["8331D034",0xBFB9],
+  ["8331D035",0xBFBA],
+  ["8331D036",0xBFBB],
+  ["8331D037",0xBFBC],
+  ["8331D038",0xBFBD],
+  ["8331D039",0xBFBE],
+  ["8331D130",0xBFBF],
+  ["8331D131",0xBFC0],
+  ["8331D132",0xBFC1],
+  ["8331D133",0xBFC2],
+  ["8331D134",0xBFC3],
+  ["8331D135",0xBFC4],
+  ["8331D136",0xBFC5],
+  ["8331D137",0xBFC6],
+  ["8331D138",0xBFC7],
+  ["8331D139",0xBFC8],
+  ["8331D230",0xBFC9],
+  ["8331D231",0xBFCA],
+  ["8331D232",0xBFCB],
+  ["8331D233",0xBFCC],
+  ["8331D234",0xBFCD],
+  ["8331D235",0xBFCE],
+  ["8331D236",0xBFCF],
+  ["8331D237",0xBFD0],
+  ["8331D238",0xBFD1],
+  ["8331D239",0xBFD2],
+  ["8331D330",0xBFD3],
+  ["8331D331",0xBFD4],
+  ["8331D332",0xBFD5],
+  ["8331D333",0xBFD6],
+  ["8331D334",0xBFD7],
+  ["8331D335",0xBFD8],
+  ["8331D336",0xBFD9],
+  ["8331D337",0xBFDA],
+  ["8331D338",0xBFDB],
+  ["8331D339",0xBFDC],
+  ["8331D430",0xBFDD],
+  ["8331D431",0xBFDE],
+  ["8331D432",0xBFDF],
+  ["8331D433",0xBFE0],
+  ["8331D434",0xBFE1],
+  ["8331D435",0xBFE2],
+  ["8331D436",0xBFE3],
+  ["8331D437",0xBFE4],
+  ["8331D438",0xBFE5],
+  ["8331D439",0xBFE6],
+  ["8331D530",0xBFE7],
+  ["8331D531",0xBFE8],
+  ["8331D532",0xBFE9],
+  ["8331D533",0xBFEA],
+  ["8331D534",0xBFEB],
+  ["8331D535",0xBFEC],
+  ["8331D536",0xBFED],
+  ["8331D537",0xBFEE],
+  ["8331D538",0xBFEF],
+  ["8331D539",0xBFF0],
+  ["8331D630",0xBFF1],
+  ["8331D631",0xBFF2],
+  ["8331D632",0xBFF3],
+  ["8331D633",0xBFF4],
+  ["8331D634",0xBFF5],
+  ["8331D635",0xBFF6],
+  ["8331D636",0xBFF7],
+  ["8331D637",0xBFF8],
+  ["8331D638",0xBFF9],
+  ["8331D639",0xBFFA],
+  ["8331D730",0xBFFB],
+  ["8331D731",0xBFFC],
+  ["8331D732",0xBFFD],
+  ["8331D733",0xBFFE],
+  ["8331D734",0xBFFF],
+  ["8331D735",0xC000],
+  ["8331D736",0xC001],
+  ["8331D737",0xC002],
+  ["8331D738",0xC003],
+  ["8331D739",0xC004],
+  ["8331D830",0xC005],
+  ["8331D831",0xC006],
+  ["8331D832",0xC007],
+  ["8331D833",0xC008],
+  ["8331D834",0xC009],
+  ["8331D835",0xC00A],
+  ["8331D836",0xC00B],
+  ["8331D837",0xC00C],
+  ["8331D838",0xC00D],
+  ["8331D839",0xC00E],
+  ["8331D930",0xC00F],
+  ["8331D931",0xC010],
+  ["8331D932",0xC011],
+  ["8331D933",0xC012],
+  ["8331D934",0xC013],
+  ["8331D935",0xC014],
+  ["8331D936",0xC015],
+  ["8331D937",0xC016],
+  ["8331D938",0xC017],
+  ["8331D939",0xC018],
+  ["8331DA30",0xC019],
+  ["8331DA31",0xC01A],
+  ["8331DA32",0xC01B],
+  ["8331DA33",0xC01C],
+  ["8331DA34",0xC01D],
+  ["8331DA35",0xC01E],
+  ["8331DA36",0xC01F],
+  ["8331DA37",0xC020],
+  ["8331DA38",0xC021],
+  ["8331DA39",0xC022],
+  ["8331DB30",0xC023],
+  ["8331DB31",0xC024],
+  ["8331DB32",0xC025],
+  ["8331DB33",0xC026],
+  ["8331DB34",0xC027],
+  ["8331DB35",0xC028],
+  ["8331DB36",0xC029],
+  ["8331DB37",0xC02A],
+  ["8331DB38",0xC02B],
+  ["8331DB39",0xC02C],
+  ["8331DC30",0xC02D],
+  ["8331DC31",0xC02E],
+  ["8331DC32",0xC02F],
+  ["8331DC33",0xC030],
+  ["8331DC34",0xC031],
+  ["8331DC35",0xC032],
+  ["8331DC36",0xC033],
+  ["8331DC37",0xC034],
+  ["8331DC38",0xC035],
+  ["8331DC39",0xC036],
+  ["8331DD30",0xC037],
+  ["8331DD31",0xC038],
+  ["8331DD32",0xC039],
+  ["8331DD33",0xC03A],
+  ["8331DD34",0xC03B],
+  ["8331DD35",0xC03C],
+  ["8331DD36",0xC03D],
+  ["8331DD37",0xC03E],
+  ["8331DD38",0xC03F],
+  ["8331DD39",0xC040],
+  ["8331DE30",0xC041],
+  ["8331DE31",0xC042],
+  ["8331DE32",0xC043],
+  ["8331DE33",0xC044],
+  ["8331DE34",0xC045],
+  ["8331DE35",0xC046],
+  ["8331DE36",0xC047],
+  ["8331DE37",0xC048],
+  ["8331DE38",0xC049],
+  ["8331DE39",0xC04A],
+  ["8331DF30",0xC04B],
+  ["8331DF31",0xC04C],
+  ["8331DF32",0xC04D],
+  ["8331DF33",0xC04E],
+  ["8331DF34",0xC04F],
+  ["8331DF35",0xC050],
+  ["8331DF36",0xC051],
+  ["8331DF37",0xC052],
+  ["8331DF38",0xC053],
+  ["8331DF39",0xC054],
+  ["8331E030",0xC055],
+  ["8331E031",0xC056],
+  ["8331E032",0xC057],
+  ["8331E033",0xC058],
+  ["8331E034",0xC059],
+  ["8331E035",0xC05A],
+  ["8331E036",0xC05B],
+  ["8331E037",0xC05C],
+  ["8331E038",0xC05D],
+  ["8331E039",0xC05E],
+  ["8331E130",0xC05F],
+  ["8331E131",0xC060],
+  ["8331E132",0xC061],
+  ["8331E133",0xC062],
+  ["8331E134",0xC063],
+  ["8331E135",0xC064],
+  ["8331E136",0xC065],
+  ["8331E137",0xC066],
+  ["8331E138",0xC067],
+  ["8331E139",0xC068],
+  ["8331E230",0xC069],
+  ["8331E231",0xC06A],
+  ["8331E232",0xC06B],
+  ["8331E233",0xC06C],
+  ["8331E234",0xC06D],
+  ["8331E235",0xC06E],
+  ["8331E236",0xC06F],
+  ["8331E237",0xC070],
+  ["8331E238",0xC071],
+  ["8331E239",0xC072],
+  ["8331E330",0xC073],
+  ["8331E331",0xC074],
+  ["8331E332",0xC075],
+  ["8331E333",0xC076],
+  ["8331E334",0xC077],
+  ["8331E335",0xC078],
+  ["8331E336",0xC079],
+  ["8331E337",0xC07A],
+  ["8331E338",0xC07B],
+  ["8331E339",0xC07C],
+  ["8331E430",0xC07D],
+  ["8331E431",0xC07E],
+  ["8331E432",0xC07F],
+  ["8331E433",0xC080],
+  ["8331E434",0xC081],
+  ["8331E435",0xC082],
+  ["8331E436",0xC083],
+  ["8331E437",0xC084],
+  ["8331E438",0xC085],
+  ["8331E439",0xC086],
+  ["8331E530",0xC087],
+  ["8331E531",0xC088],
+  ["8331E532",0xC089],
+  ["8331E533",0xC08A],
+  ["8331E534",0xC08B],
+  ["8331E535",0xC08C],
+  ["8331E536",0xC08D],
+  ["8331E537",0xC08E],
+  ["8331E538",0xC08F],
+  ["8331E539",0xC090],
+  ["8331E630",0xC091],
+  ["8331E631",0xC092],
+  ["8331E632",0xC093],
+  ["8331E633",0xC094],
+  ["8331E634",0xC095],
+  ["8331E635",0xC096],
+  ["8331E636",0xC097],
+  ["8331E637",0xC098],
+  ["8331E638",0xC099],
+  ["8331E639",0xC09A],
+  ["8331E730",0xC09B],
+  ["8331E731",0xC09C],
+  ["8331E732",0xC09D],
+  ["8331E733",0xC09E],
+  ["8331E734",0xC09F],
+  ["8331E735",0xC0A0],
+  ["8331E736",0xC0A1],
+  ["8331E737",0xC0A2],
+  ["8331E738",0xC0A3],
+  ["8331E739",0xC0A4],
+  ["8331E830",0xC0A5],
+  ["8331E831",0xC0A6],
+  ["8331E832",0xC0A7],
+  ["8331E833",0xC0A8],
+  ["8331E834",0xC0A9],
+  ["8331E835",0xC0AA],
+  ["8331E836",0xC0AB],
+  ["8331E837",0xC0AC],
+  ["8331E838",0xC0AD],
+  ["8331E839",0xC0AE],
+  ["8331E930",0xC0AF],
+  ["8331E931",0xC0B0],
+  ["8331E932",0xC0B1],
+  ["8331E933",0xC0B2],
+  ["8331E934",0xC0B3],
+  ["8331E935",0xC0B4],
+  ["8331E936",0xC0B5],
+  ["8331E937",0xC0B6],
+  ["8331E938",0xC0B7],
+  ["8331E939",0xC0B8],
+  ["8331EA30",0xC0B9],
+  ["8331EA31",0xC0BA],
+  ["8331EA32",0xC0BB],
+  ["8331EA33",0xC0BC],
+  ["8331EA34",0xC0BD],
+  ["8331EA35",0xC0BE],
+  ["8331EA36",0xC0BF],
+  ["8331EA37",0xC0C0],
+  ["8331EA38",0xC0C1],
+  ["8331EA39",0xC0C2],
+  ["8331EB30",0xC0C3],
+  ["8331EB31",0xC0C4],
+  ["8331EB32",0xC0C5],
+  ["8331EB33",0xC0C6],
+  ["8331EB34",0xC0C7],
+  ["8331EB35",0xC0C8],
+  ["8331EB36",0xC0C9],
+  ["8331EB37",0xC0CA],
+  ["8331EB38",0xC0CB],
+  ["8331EB39",0xC0CC],
+  ["8331EC30",0xC0CD],
+  ["8331EC31",0xC0CE],
+  ["8331EC32",0xC0CF],
+  ["8331EC33",0xC0D0],
+  ["8331EC34",0xC0D1],
+  ["8331EC35",0xC0D2],
+  ["8331EC36",0xC0D3],
+  ["8331EC37",0xC0D4],
+  ["8331EC38",0xC0D5],
+  ["8331EC39",0xC0D6],
+  ["8331ED30",0xC0D7],
+  ["8331ED31",0xC0D8],
+  ["8331ED32",0xC0D9],
+  ["8331ED33",0xC0DA],
+  ["8331ED34",0xC0DB],
+  ["8331ED35",0xC0DC],
+  ["8331ED36",0xC0DD],
+  ["8331ED37",0xC0DE],
+  ["8331ED38",0xC0DF],
+  ["8331ED39",0xC0E0],
+  ["8331EE30",0xC0E1],
+  ["8331EE31",0xC0E2],
+  ["8331EE32",0xC0E3],
+  ["8331EE33",0xC0E4],
+  ["8331EE34",0xC0E5],
+  ["8331EE35",0xC0E6],
+  ["8331EE36",0xC0E7],
+  ["8331EE37",0xC0E8],
+  ["8331EE38",0xC0E9],
+  ["8331EE39",0xC0EA],
+  ["8331EF30",0xC0EB],
+  ["8331EF31",0xC0EC],
+  ["8331EF32",0xC0ED],
+  ["8331EF33",0xC0EE],
+  ["8331EF34",0xC0EF],
+  ["8331EF35",0xC0F0],
+  ["8331EF36",0xC0F1],
+  ["8331EF37",0xC0F2],
+  ["8331EF38",0xC0F3],
+  ["8331EF39",0xC0F4],
+  ["8331F030",0xC0F5],
+  ["8331F031",0xC0F6],
+  ["8331F032",0xC0F7],
+  ["8331F033",0xC0F8],
+  ["8331F034",0xC0F9],
+  ["8331F035",0xC0FA],
+  ["8331F036",0xC0FB],
+  ["8331F037",0xC0FC],
+  ["8331F038",0xC0FD],
+  ["8331F039",0xC0FE],
+  ["8331F130",0xC0FF],
+  ["8331F131",0xC100],
+  ["8331F132",0xC101],
+  ["8331F133",0xC102],
+  ["8331F134",0xC103],
+  ["8331F135",0xC104],
+  ["8331F136",0xC105],
+  ["8331F137",0xC106],
+  ["8331F138",0xC107],
+  ["8331F139",0xC108],
+  ["8331F230",0xC109],
+  ["8331F231",0xC10A],
+  ["8331F232",0xC10B],
+  ["8331F233",0xC10C],
+  ["8331F234",0xC10D],
+  ["8331F235",0xC10E],
+  ["8331F236",0xC10F],
+  ["8331F237",0xC110],
+  ["8331F238",0xC111],
+  ["8331F239",0xC112],
+  ["8331F330",0xC113],
+  ["8331F331",0xC114],
+  ["8331F332",0xC115],
+  ["8331F333",0xC116],
+  ["8331F334",0xC117],
+  ["8331F335",0xC118],
+  ["8331F336",0xC119],
+  ["8331F337",0xC11A],
+  ["8331F338",0xC11B],
+  ["8331F339",0xC11C],
+  ["8331F430",0xC11D],
+  ["8331F431",0xC11E],
+  ["8331F432",0xC11F],
+  ["8331F433",0xC120],
+  ["8331F434",0xC121],
+  ["8331F435",0xC122],
+  ["8331F436",0xC123],
+  ["8331F437",0xC124],
+  ["8331F438",0xC125],
+  ["8331F439",0xC126],
+  ["8331F530",0xC127],
+  ["8331F531",0xC128],
+  ["8331F532",0xC129],
+  ["8331F533",0xC12A],
+  ["8331F534",0xC12B],
+  ["8331F535",0xC12C],
+  ["8331F536",0xC12D],
+  ["8331F537",0xC12E],
+  ["8331F538",0xC12F],
+  ["8331F539",0xC130],
+  ["8331F630",0xC131],
+  ["8331F631",0xC132],
+  ["8331F632",0xC133],
+  ["8331F633",0xC134],
+  ["8331F634",0xC135],
+  ["8331F635",0xC136],
+  ["8331F636",0xC137],
+  ["8331F637",0xC138],
+  ["8331F638",0xC139],
+  ["8331F639",0xC13A],
+  ["8331F730",0xC13B],
+  ["8331F731",0xC13C],
+  ["8331F732",0xC13D],
+  ["8331F733",0xC13E],
+  ["8331F734",0xC13F],
+  ["8331F735",0xC140],
+  ["8331F736",0xC141],
+  ["8331F737",0xC142],
+  ["8331F738",0xC143],
+  ["8331F739",0xC144],
+  ["8331F830",0xC145],
+  ["8331F831",0xC146],
+  ["8331F832",0xC147],
+  ["8331F833",0xC148],
+  ["8331F834",0xC149],
+  ["8331F835",0xC14A],
+  ["8331F836",0xC14B],
+  ["8331F837",0xC14C],
+  ["8331F838",0xC14D],
+  ["8331F839",0xC14E],
+  ["8331F930",0xC14F],
+  ["8331F931",0xC150],
+  ["8331F932",0xC151],
+  ["8331F933",0xC152],
+  ["8331F934",0xC153],
+  ["8331F935",0xC154],
+  ["8331F936",0xC155],
+  ["8331F937",0xC156],
+  ["8331F938",0xC157],
+  ["8331F939",0xC158],
+  ["8331FA30",0xC159],
+  ["8331FA31",0xC15A],
+  ["8331FA32",0xC15B],
+  ["8331FA33",0xC15C],
+  ["8331FA34",0xC15D],
+  ["8331FA35",0xC15E],
+  ["8331FA36",0xC15F],
+  ["8331FA37",0xC160],
+  ["8331FA38",0xC161],
+  ["8331FA39",0xC162],
+  ["8331FB30",0xC163],
+  ["8331FB31",0xC164],
+  ["8331FB32",0xC165],
+  ["8331FB33",0xC166],
+  ["8331FB34",0xC167],
+  ["8331FB35",0xC168],
+  ["8331FB36",0xC169],
+  ["8331FB37",0xC16A],
+  ["8331FB38",0xC16B],
+  ["8331FB39",0xC16C],
+  ["8331FC30",0xC16D],
+  ["8331FC31",0xC16E],
+  ["8331FC32",0xC16F],
+  ["8331FC33",0xC170],
+  ["8331FC34",0xC171],
+  ["8331FC35",0xC172],
+  ["8331FC36",0xC173],
+  ["8331FC37",0xC174],
+  ["8331FC38",0xC175],
+  ["8331FC39",0xC176],
+  ["8331FD30",0xC177],
+  ["8331FD31",0xC178],
+  ["8331FD32",0xC179],
+  ["8331FD33",0xC17A],
+  ["8331FD34",0xC17B],
+  ["8331FD35",0xC17C],
+  ["8331FD36",0xC17D],
+  ["8331FD37",0xC17E],
+  ["8331FD38",0xC17F],
+  ["8331FD39",0xC180],
+  ["8331FE30",0xC181],
+  ["8331FE31",0xC182],
+  ["8331FE32",0xC183],
+  ["8331FE33",0xC184],
+  ["8331FE34",0xC185],
+  ["8331FE35",0xC186],
+  ["8331FE36",0xC187],
+  ["8331FE37",0xC188],
+  ["8331FE38",0xC189],
+  ["8331FE39",0xC18A],
+  ["83328130",0xC18B],
+  ["83328131",0xC18C],
+  ["83328132",0xC18D],
+  ["83328133",0xC18E],
+  ["83328134",0xC18F],
+  ["83328135",0xC190],
+  ["83328136",0xC191],
+  ["83328137",0xC192],
+  ["83328138",0xC193],
+  ["83328139",0xC194],
+  ["83328230",0xC195],
+  ["83328231",0xC196],
+  ["83328232",0xC197],
+  ["83328233",0xC198],
+  ["83328234",0xC199],
+  ["83328235",0xC19A],
+  ["83328236",0xC19B],
+  ["83328237",0xC19C],
+  ["83328238",0xC19D],
+  ["83328239",0xC19E],
+  ["83328330",0xC19F],
+  ["83328331",0xC1A0],
+  ["83328332",0xC1A1],
+  ["83328333",0xC1A2],
+  ["83328334",0xC1A3],
+  ["83328335",0xC1A4],
+  ["83328336",0xC1A5],
+  ["83328337",0xC1A6],
+  ["83328338",0xC1A7],
+  ["83328339",0xC1A8],
+  ["83328430",0xC1A9],
+  ["83328431",0xC1AA],
+  ["83328432",0xC1AB],
+  ["83328433",0xC1AC],
+  ["83328434",0xC1AD],
+  ["83328435",0xC1AE],
+  ["83328436",0xC1AF],
+  ["83328437",0xC1B0],
+  ["83328438",0xC1B1],
+  ["83328439",0xC1B2],
+  ["83328530",0xC1B3],
+  ["83328531",0xC1B4],
+  ["83328532",0xC1B5],
+  ["83328533",0xC1B6],
+  ["83328534",0xC1B7],
+  ["83328535",0xC1B8],
+  ["83328536",0xC1B9],
+  ["83328537",0xC1BA],
+  ["83328538",0xC1BB],
+  ["83328539",0xC1BC],
+  ["83328630",0xC1BD],
+  ["83328631",0xC1BE],
+  ["83328632",0xC1BF],
+  ["83328633",0xC1C0],
+  ["83328634",0xC1C1],
+  ["83328635",0xC1C2],
+  ["83328636",0xC1C3],
+  ["83328637",0xC1C4],
+  ["83328638",0xC1C5],
+  ["83328639",0xC1C6],
+  ["83328730",0xC1C7],
+  ["83328731",0xC1C8],
+  ["83328732",0xC1C9],
+  ["83328733",0xC1CA],
+  ["83328734",0xC1CB],
+  ["83328735",0xC1CC],
+  ["83328736",0xC1CD],
+  ["83328737",0xC1CE],
+  ["83328738",0xC1CF],
+  ["83328739",0xC1D0],
+  ["83328830",0xC1D1],
+  ["83328831",0xC1D2],
+  ["83328832",0xC1D3],
+  ["83328833",0xC1D4],
+  ["83328834",0xC1D5],
+  ["83328835",0xC1D6],
+  ["83328836",0xC1D7],
+  ["83328837",0xC1D8],
+  ["83328838",0xC1D9],
+  ["83328839",0xC1DA],
+  ["83328930",0xC1DB],
+  ["83328931",0xC1DC],
+  ["83328932",0xC1DD],
+  ["83328933",0xC1DE],
+  ["83328934",0xC1DF],
+  ["83328935",0xC1E0],
+  ["83328936",0xC1E1],
+  ["83328937",0xC1E2],
+  ["83328938",0xC1E3],
+  ["83328939",0xC1E4],
+  ["83328A30",0xC1E5],
+  ["83328A31",0xC1E6],
+  ["83328A32",0xC1E7],
+  ["83328A33",0xC1E8],
+  ["83328A34",0xC1E9],
+  ["83328A35",0xC1EA],
+  ["83328A36",0xC1EB],
+  ["83328A37",0xC1EC],
+  ["83328A38",0xC1ED],
+  ["83328A39",0xC1EE],
+  ["83328B30",0xC1EF],
+  ["83328B31",0xC1F0],
+  ["83328B32",0xC1F1],
+  ["83328B33",0xC1F2],
+  ["83328B34",0xC1F3],
+  ["83328B35",0xC1F4],
+  ["83328B36",0xC1F5],
+  ["83328B37",0xC1F6],
+  ["83328B38",0xC1F7],
+  ["83328B39",0xC1F8],
+  ["83328C30",0xC1F9],
+  ["83328C31",0xC1FA],
+  ["83328C32",0xC1FB],
+  ["83328C33",0xC1FC],
+  ["83328C34",0xC1FD],
+  ["83328C35",0xC1FE],
+  ["83328C36",0xC1FF],
+  ["83328C37",0xC200],
+  ["83328C38",0xC201],
+  ["83328C39",0xC202],
+  ["83328D30",0xC203],
+  ["83328D31",0xC204],
+  ["83328D32",0xC205],
+  ["83328D33",0xC206],
+  ["83328D34",0xC207],
+  ["83328D35",0xC208],
+  ["83328D36",0xC209],
+  ["83328D37",0xC20A],
+  ["83328D38",0xC20B],
+  ["83328D39",0xC20C],
+  ["83328E30",0xC20D],
+  ["83328E31",0xC20E],
+  ["83328E32",0xC20F],
+  ["83328E33",0xC210],
+  ["83328E34",0xC211],
+  ["83328E35",0xC212],
+  ["83328E36",0xC213],
+  ["83328E37",0xC214],
+  ["83328E38",0xC215],
+  ["83328E39",0xC216],
+  ["83328F30",0xC217],
+  ["83328F31",0xC218],
+  ["83328F32",0xC219],
+  ["83328F33",0xC21A],
+  ["83328F34",0xC21B],
+  ["83328F35",0xC21C],
+  ["83328F36",0xC21D],
+  ["83328F37",0xC21E],
+  ["83328F38",0xC21F],
+  ["83328F39",0xC220],
+  ["83329030",0xC221],
+  ["83329031",0xC222],
+  ["83329032",0xC223],
+  ["83329033",0xC224],
+  ["83329034",0xC225],
+  ["83329035",0xC226],
+  ["83329036",0xC227],
+  ["83329037",0xC228],
+  ["83329038",0xC229],
+  ["83329039",0xC22A],
+  ["83329130",0xC22B],
+  ["83329131",0xC22C],
+  ["83329132",0xC22D],
+  ["83329133",0xC22E],
+  ["83329134",0xC22F],
+  ["83329135",0xC230],
+  ["83329136",0xC231],
+  ["83329137",0xC232],
+  ["83329138",0xC233],
+  ["83329139",0xC234],
+  ["83329230",0xC235],
+  ["83329231",0xC236],
+  ["83329232",0xC237],
+  ["83329233",0xC238],
+  ["83329234",0xC239],
+  ["83329235",0xC23A],
+  ["83329236",0xC23B],
+  ["83329237",0xC23C],
+  ["83329238",0xC23D],
+  ["83329239",0xC23E],
+  ["83329330",0xC23F],
+  ["83329331",0xC240],
+  ["83329332",0xC241],
+  ["83329333",0xC242],
+  ["83329334",0xC243],
+  ["83329335",0xC244],
+  ["83329336",0xC245],
+  ["83329337",0xC246],
+  ["83329338",0xC247],
+  ["83329339",0xC248],
+  ["83329430",0xC249],
+  ["83329431",0xC24A],
+  ["83329432",0xC24B],
+  ["83329433",0xC24C],
+  ["83329434",0xC24D],
+  ["83329435",0xC24E],
+  ["83329436",0xC24F],
+  ["83329437",0xC250],
+  ["83329438",0xC251],
+  ["83329439",0xC252],
+  ["83329530",0xC253],
+  ["83329531",0xC254],
+  ["83329532",0xC255],
+  ["83329533",0xC256],
+  ["83329534",0xC257],
+  ["83329535",0xC258],
+  ["83329536",0xC259],
+  ["83329537",0xC25A],
+  ["83329538",0xC25B],
+  ["83329539",0xC25C],
+  ["83329630",0xC25D],
+  ["83329631",0xC25E],
+  ["83329632",0xC25F],
+  ["83329633",0xC260],
+  ["83329634",0xC261],
+  ["83329635",0xC262],
+  ["83329636",0xC263],
+  ["83329637",0xC264],
+  ["83329638",0xC265],
+  ["83329639",0xC266],
+  ["83329730",0xC267],
+  ["83329731",0xC268],
+  ["83329732",0xC269],
+  ["83329733",0xC26A],
+  ["83329734",0xC26B],
+  ["83329735",0xC26C],
+  ["83329736",0xC26D],
+  ["83329737",0xC26E],
+  ["83329738",0xC26F],
+  ["83329739",0xC270],
+  ["83329830",0xC271],
+  ["83329831",0xC272],
+  ["83329832",0xC273],
+  ["83329833",0xC274],
+  ["83329834",0xC275],
+  ["83329835",0xC276],
+  ["83329836",0xC277],
+  ["83329837",0xC278],
+  ["83329838",0xC279],
+  ["83329839",0xC27A],
+  ["83329930",0xC27B],
+  ["83329931",0xC27C],
+  ["83329932",0xC27D],
+  ["83329933",0xC27E],
+  ["83329934",0xC27F],
+  ["83329935",0xC280],
+  ["83329936",0xC281],
+  ["83329937",0xC282],
+  ["83329938",0xC283],
+  ["83329939",0xC284],
+  ["83329A30",0xC285],
+  ["83329A31",0xC286],
+  ["83329A32",0xC287],
+  ["83329A33",0xC288],
+  ["83329A34",0xC289],
+  ["83329A35",0xC28A],
+  ["83329A36",0xC28B],
+  ["83329A37",0xC28C],
+  ["83329A38",0xC28D],
+  ["83329A39",0xC28E],
+  ["83329B30",0xC28F],
+  ["83329B31",0xC290],
+  ["83329B32",0xC291],
+  ["83329B33",0xC292],
+  ["83329B34",0xC293],
+  ["83329B35",0xC294],
+  ["83329B36",0xC295],
+  ["83329B37",0xC296],
+  ["83329B38",0xC297],
+  ["83329B39",0xC298],
+  ["83329C30",0xC299],
+  ["83329C31",0xC29A],
+  ["83329C32",0xC29B],
+  ["83329C33",0xC29C],
+  ["83329C34",0xC29D],
+  ["83329C35",0xC29E],
+  ["83329C36",0xC29F],
+  ["83329C37",0xC2A0],
+  ["83329C38",0xC2A1],
+  ["83329C39",0xC2A2],
+  ["83329D30",0xC2A3],
+  ["83329D31",0xC2A4],
+  ["83329D32",0xC2A5],
+  ["83329D33",0xC2A6],
+  ["83329D34",0xC2A7],
+  ["83329D35",0xC2A8],
+  ["83329D36",0xC2A9],
+  ["83329D37",0xC2AA],
+  ["83329D38",0xC2AB],
+  ["83329D39",0xC2AC],
+  ["83329E30",0xC2AD],
+  ["83329E31",0xC2AE],
+  ["83329E32",0xC2AF],
+  ["83329E33",0xC2B0],
+  ["83329E34",0xC2B1],
+  ["83329E35",0xC2B2],
+  ["83329E36",0xC2B3],
+  ["83329E37",0xC2B4],
+  ["83329E38",0xC2B5],
+  ["83329E39",0xC2B6],
+  ["83329F30",0xC2B7],
+  ["83329F31",0xC2B8],
+  ["83329F32",0xC2B9],
+  ["83329F33",0xC2BA],
+  ["83329F34",0xC2BB],
+  ["83329F35",0xC2BC],
+  ["83329F36",0xC2BD],
+  ["83329F37",0xC2BE],
+  ["83329F38",0xC2BF],
+  ["83329F39",0xC2C0],
+  ["8332A030",0xC2C1],
+  ["8332A031",0xC2C2],
+  ["8332A032",0xC2C3],
+  ["8332A033",0xC2C4],
+  ["8332A034",0xC2C5],
+  ["8332A035",0xC2C6],
+  ["8332A036",0xC2C7],
+  ["8332A037",0xC2C8],
+  ["8332A038",0xC2C9],
+  ["8332A039",0xC2CA],
+  ["8332A130",0xC2CB],
+  ["8332A131",0xC2CC],
+  ["8332A132",0xC2CD],
+  ["8332A133",0xC2CE],
+  ["8332A134",0xC2CF],
+  ["8332A135",0xC2D0],
+  ["8332A136",0xC2D1],
+  ["8332A137",0xC2D2],
+  ["8332A138",0xC2D3],
+  ["8332A139",0xC2D4],
+  ["8332A230",0xC2D5],
+  ["8332A231",0xC2D6],
+  ["8332A232",0xC2D7],
+  ["8332A233",0xC2D8],
+  ["8332A234",0xC2D9],
+  ["8332A235",0xC2DA],
+  ["8332A236",0xC2DB],
+  ["8332A237",0xC2DC],
+  ["8332A238",0xC2DD],
+  ["8332A239",0xC2DE],
+  ["8332A330",0xC2DF],
+  ["8332A331",0xC2E0],
+  ["8332A332",0xC2E1],
+  ["8332A333",0xC2E2],
+  ["8332A334",0xC2E3],
+  ["8332A335",0xC2E4],
+  ["8332A336",0xC2E5],
+  ["8332A337",0xC2E6],
+  ["8332A338",0xC2E7],
+  ["8332A339",0xC2E8],
+  ["8332A430",0xC2E9],
+  ["8332A431",0xC2EA],
+  ["8332A432",0xC2EB],
+  ["8332A433",0xC2EC],
+  ["8332A434",0xC2ED],
+  ["8332A435",0xC2EE],
+  ["8332A436",0xC2EF],
+  ["8332A437",0xC2F0],
+  ["8332A438",0xC2F1],
+  ["8332A439",0xC2F2],
+  ["8332A530",0xC2F3],
+  ["8332A531",0xC2F4],
+  ["8332A532",0xC2F5],
+  ["8332A533",0xC2F6],
+  ["8332A534",0xC2F7],
+  ["8332A535",0xC2F8],
+  ["8332A536",0xC2F9],
+  ["8332A537",0xC2FA],
+  ["8332A538",0xC2FB],
+  ["8332A539",0xC2FC],
+  ["8332A630",0xC2FD],
+  ["8332A631",0xC2FE],
+  ["8332A632",0xC2FF],
+  ["8332A633",0xC300],
+  ["8332A634",0xC301],
+  ["8332A635",0xC302],
+  ["8332A636",0xC303],
+  ["8332A637",0xC304],
+  ["8332A638",0xC305],
+  ["8332A639",0xC306],
+  ["8332A730",0xC307],
+  ["8332A731",0xC308],
+  ["8332A732",0xC309],
+  ["8332A733",0xC30A],
+  ["8332A734",0xC30B],
+  ["8332A735",0xC30C],
+  ["8332A736",0xC30D],
+  ["8332A737",0xC30E],
+  ["8332A738",0xC30F],
+  ["8332A739",0xC310],
+  ["8332A830",0xC311],
+  ["8332A831",0xC312],
+  ["8332A832",0xC313],
+  ["8332A833",0xC314],
+  ["8332A834",0xC315],
+  ["8332A835",0xC316],
+  ["8332A836",0xC317],
+  ["8332A837",0xC318],
+  ["8332A838",0xC319],
+  ["8332A839",0xC31A],
+  ["8332A930",0xC31B],
+  ["8332A931",0xC31C],
+  ["8332A932",0xC31D],
+  ["8332A933",0xC31E],
+  ["8332A934",0xC31F],
+  ["8332A935",0xC320],
+  ["8332A936",0xC321],
+  ["8332A937",0xC322],
+  ["8332A938",0xC323],
+  ["8332A939",0xC324],
+  ["8332AA30",0xC325],
+  ["8332AA31",0xC326],
+  ["8332AA32",0xC327],
+  ["8332AA33",0xC328],
+  ["8332AA34",0xC329],
+  ["8332AA35",0xC32A],
+  ["8332AA36",0xC32B],
+  ["8332AA37",0xC32C],
+  ["8332AA38",0xC32D],
+  ["8332AA39",0xC32E],
+  ["8332AB30",0xC32F],
+  ["8332AB31",0xC330],
+  ["8332AB32",0xC331],
+  ["8332AB33",0xC332],
+  ["8332AB34",0xC333],
+  ["8332AB35",0xC334],
+  ["8332AB36",0xC335],
+  ["8332AB37",0xC336],
+  ["8332AB38",0xC337],
+  ["8332AB39",0xC338],
+  ["8332AC30",0xC339],
+  ["8332AC31",0xC33A],
+  ["8332AC32",0xC33B],
+  ["8332AC33",0xC33C],
+  ["8332AC34",0xC33D],
+  ["8332AC35",0xC33E],
+  ["8332AC36",0xC33F],
+  ["8332AC37",0xC340],
+  ["8332AC38",0xC341],
+  ["8332AC39",0xC342],
+  ["8332AD30",0xC343],
+  ["8332AD31",0xC344],
+  ["8332AD32",0xC345],
+  ["8332AD33",0xC346],
+  ["8332AD34",0xC347],
+  ["8332AD35",0xC348],
+  ["8332AD36",0xC349],
+  ["8332AD37",0xC34A],
+  ["8332AD38",0xC34B],
+  ["8332AD39",0xC34C],
+  ["8332AE30",0xC34D],
+  ["8332AE31",0xC34E],
+  ["8332AE32",0xC34F],
+  ["8332AE33",0xC350],
+  ["8332AE34",0xC351],
+  ["8332AE35",0xC352],
+  ["8332AE36",0xC353],
+  ["8332AE37",0xC354],
+  ["8332AE38",0xC355],
+  ["8332AE39",0xC356],
+  ["8332AF30",0xC357],
+  ["8332AF31",0xC358],
+  ["8332AF32",0xC359],
+  ["8332AF33",0xC35A],
+  ["8332AF34",0xC35B],
+  ["8332AF35",0xC35C],
+  ["8332AF36",0xC35D],
+  ["8332AF37",0xC35E],
+  ["8332AF38",0xC35F],
+  ["8332AF39",0xC360],
+  ["8332B030",0xC361],
+  ["8332B031",0xC362],
+  ["8332B032",0xC363],
+  ["8332B033",0xC364],
+  ["8332B034",0xC365],
+  ["8332B035",0xC366],
+  ["8332B036",0xC367],
+  ["8332B037",0xC368],
+  ["8332B038",0xC369],
+  ["8332B039",0xC36A],
+  ["8332B130",0xC36B],
+  ["8332B131",0xC36C],
+  ["8332B132",0xC36D],
+  ["8332B133",0xC36E],
+  ["8332B134",0xC36F],
+  ["8332B135",0xC370],
+  ["8332B136",0xC371],
+  ["8332B137",0xC372],
+  ["8332B138",0xC373],
+  ["8332B139",0xC374],
+  ["8332B230",0xC375],
+  ["8332B231",0xC376],
+  ["8332B232",0xC377],
+  ["8332B233",0xC378],
+  ["8332B234",0xC379],
+  ["8332B235",0xC37A],
+  ["8332B236",0xC37B],
+  ["8332B237",0xC37C],
+  ["8332B238",0xC37D],
+  ["8332B239",0xC37E],
+  ["8332B330",0xC37F],
+  ["8332B331",0xC380],
+  ["8332B332",0xC381],
+  ["8332B333",0xC382],
+  ["8332B334",0xC383],
+  ["8332B335",0xC384],
+  ["8332B336",0xC385],
+  ["8332B337",0xC386],
+  ["8332B338",0xC387],
+  ["8332B339",0xC388],
+  ["8332B430",0xC389],
+  ["8332B431",0xC38A],
+  ["8332B432",0xC38B],
+  ["8332B433",0xC38C],
+  ["8332B434",0xC38D],
+  ["8332B435",0xC38E],
+  ["8332B436",0xC38F],
+  ["8332B437",0xC390],
+  ["8332B438",0xC391],
+  ["8332B439",0xC392],
+  ["8332B530",0xC393],
+  ["8332B531",0xC394],
+  ["8332B532",0xC395],
+  ["8332B533",0xC396],
+  ["8332B534",0xC397],
+  ["8332B535",0xC398],
+  ["8332B536",0xC399],
+  ["8332B537",0xC39A],
+  ["8332B538",0xC39B],
+  ["8332B539",0xC39C],
+  ["8332B630",0xC39D],
+  ["8332B631",0xC39E],
+  ["8332B632",0xC39F],
+  ["8332B633",0xC3A0],
+  ["8332B634",0xC3A1],
+  ["8332B635",0xC3A2],
+  ["8332B636",0xC3A3],
+  ["8332B637",0xC3A4],
+  ["8332B638",0xC3A5],
+  ["8332B639",0xC3A6],
+  ["8332B730",0xC3A7],
+  ["8332B731",0xC3A8],
+  ["8332B732",0xC3A9],
+  ["8332B733",0xC3AA],
+  ["8332B734",0xC3AB],
+  ["8332B735",0xC3AC],
+  ["8332B736",0xC3AD],
+  ["8332B737",0xC3AE],
+  ["8332B738",0xC3AF],
+  ["8332B739",0xC3B0],
+  ["8332B830",0xC3B1],
+  ["8332B831",0xC3B2],
+  ["8332B832",0xC3B3],
+  ["8332B833",0xC3B4],
+  ["8332B834",0xC3B5],
+  ["8332B835",0xC3B6],
+  ["8332B836",0xC3B7],
+  ["8332B837",0xC3B8],
+  ["8332B838",0xC3B9],
+  ["8332B839",0xC3BA],
+  ["8332B930",0xC3BB],
+  ["8332B931",0xC3BC],
+  ["8332B932",0xC3BD],
+  ["8332B933",0xC3BE],
+  ["8332B934",0xC3BF],
+  ["8332B935",0xC3C0],
+  ["8332B936",0xC3C1],
+  ["8332B937",0xC3C2],
+  ["8332B938",0xC3C3],
+  ["8332B939",0xC3C4],
+  ["8332BA30",0xC3C5],
+  ["8332BA31",0xC3C6],
+  ["8332BA32",0xC3C7],
+  ["8332BA33",0xC3C8],
+  ["8332BA34",0xC3C9],
+  ["8332BA35",0xC3CA],
+  ["8332BA36",0xC3CB],
+  ["8332BA37",0xC3CC],
+  ["8332BA38",0xC3CD],
+  ["8332BA39",0xC3CE],
+  ["8332BB30",0xC3CF],
+  ["8332BB31",0xC3D0],
+  ["8332BB32",0xC3D1],
+  ["8332BB33",0xC3D2],
+  ["8332BB34",0xC3D3],
+  ["8332BB35",0xC3D4],
+  ["8332BB36",0xC3D5],
+  ["8332BB37",0xC3D6],
+  ["8332BB38",0xC3D7],
+  ["8332BB39",0xC3D8],
+  ["8332BC30",0xC3D9],
+  ["8332BC31",0xC3DA],
+  ["8332BC32",0xC3DB],
+  ["8332BC33",0xC3DC],
+  ["8332BC34",0xC3DD],
+  ["8332BC35",0xC3DE],
+  ["8332BC36",0xC3DF],
+  ["8332BC37",0xC3E0],
+  ["8332BC38",0xC3E1],
+  ["8332BC39",0xC3E2],
+  ["8332BD30",0xC3E3],
+  ["8332BD31",0xC3E4],
+  ["8332BD32",0xC3E5],
+  ["8332BD33",0xC3E6],
+  ["8332BD34",0xC3E7],
+  ["8332BD35",0xC3E8],
+  ["8332BD36",0xC3E9],
+  ["8332BD37",0xC3EA],
+  ["8332BD38",0xC3EB],
+  ["8332BD39",0xC3EC],
+  ["8332BE30",0xC3ED],
+  ["8332BE31",0xC3EE],
+  ["8332BE32",0xC3EF],
+  ["8332BE33",0xC3F0],
+  ["8332BE34",0xC3F1],
+  ["8332BE35",0xC3F2],
+  ["8332BE36",0xC3F3],
+  ["8332BE37",0xC3F4],
+  ["8332BE38",0xC3F5],
+  ["8332BE39",0xC3F6],
+  ["8332BF30",0xC3F7],
+  ["8332BF31",0xC3F8],
+  ["8332BF32",0xC3F9],
+  ["8332BF33",0xC3FA],
+  ["8332BF34",0xC3FB],
+  ["8332BF35",0xC3FC],
+  ["8332BF36",0xC3FD],
+  ["8332BF37",0xC3FE],
+  ["8332BF38",0xC3FF],
+  ["8332BF39",0xC400],
+  ["8332C030",0xC401],
+  ["8332C031",0xC402],
+  ["8332C032",0xC403],
+  ["8332C033",0xC404],
+  ["8332C034",0xC405],
+  ["8332C035",0xC406],
+  ["8332C036",0xC407],
+  ["8332C037",0xC408],
+  ["8332C038",0xC409],
+  ["8332C039",0xC40A],
+  ["8332C130",0xC40B],
+  ["8332C131",0xC40C],
+  ["8332C132",0xC40D],
+  ["8332C133",0xC40E],
+  ["8332C134",0xC40F],
+  ["8332C135",0xC410],
+  ["8332C136",0xC411],
+  ["8332C137",0xC412],
+  ["8332C138",0xC413],
+  ["8332C139",0xC414],
+  ["8332C230",0xC415],
+  ["8332C231",0xC416],
+  ["8332C232",0xC417],
+  ["8332C233",0xC418],
+  ["8332C234",0xC419],
+  ["8332C235",0xC41A],
+  ["8332C236",0xC41B],
+  ["8332C237",0xC41C],
+  ["8332C238",0xC41D],
+  ["8332C239",0xC41E],
+  ["8332C330",0xC41F],
+  ["8332C331",0xC420],
+  ["8332C332",0xC421],
+  ["8332C333",0xC422],
+  ["8332C334",0xC423],
+  ["8332C335",0xC424],
+  ["8332C336",0xC425],
+  ["8332C337",0xC426],
+  ["8332C338",0xC427],
+  ["8332C339",0xC428],
+  ["8332C430",0xC429],
+  ["8332C431",0xC42A],
+  ["8332C432",0xC42B],
+  ["8332C433",0xC42C],
+  ["8332C434",0xC42D],
+  ["8332C435",0xC42E],
+  ["8332C436",0xC42F],
+  ["8332C437",0xC430],
+  ["8332C438",0xC431],
+  ["8332C439",0xC432],
+  ["8332C530",0xC433],
+  ["8332C531",0xC434],
+  ["8332C532",0xC435],
+  ["8332C533",0xC436],
+  ["8332C534",0xC437],
+  ["8332C535",0xC438],
+  ["8332C536",0xC439],
+  ["8332C537",0xC43A],
+  ["8332C538",0xC43B],
+  ["8332C539",0xC43C],
+  ["8332C630",0xC43D],
+  ["8332C631",0xC43E],
+  ["8332C632",0xC43F],
+  ["8332C633",0xC440],
+  ["8332C634",0xC441],
+  ["8332C635",0xC442],
+  ["8332C636",0xC443],
+  ["8332C637",0xC444],
+  ["8332C638",0xC445],
+  ["8332C639",0xC446],
+  ["8332C730",0xC447],
+  ["8332C731",0xC448],
+  ["8332C732",0xC449],
+  ["8332C733",0xC44A],
+  ["8332C734",0xC44B],
+  ["8332C735",0xC44C],
+  ["8332C736",0xC44D],
+  ["8332C737",0xC44E],
+  ["8332C738",0xC44F],
+  ["8332C739",0xC450],
+  ["8332C830",0xC451],
+  ["8332C831",0xC452],
+  ["8332C832",0xC453],
+  ["8332C833",0xC454],
+  ["8332C834",0xC455],
+  ["8332C835",0xC456],
+  ["8332C836",0xC457],
+  ["8332C837",0xC458],
+  ["8332C838",0xC459],
+  ["8332C839",0xC45A],
+  ["8332C930",0xC45B],
+  ["8332C931",0xC45C],
+  ["8332C932",0xC45D],
+  ["8332C933",0xC45E],
+  ["8332C934",0xC45F],
+  ["8332C935",0xC460],
+  ["8332C936",0xC461],
+  ["8332C937",0xC462],
+  ["8332C938",0xC463],
+  ["8332C939",0xC464],
+  ["8332CA30",0xC465],
+  ["8332CA31",0xC466],
+  ["8332CA32",0xC467],
+  ["8332CA33",0xC468],
+  ["8332CA34",0xC469],
+  ["8332CA35",0xC46A],
+  ["8332CA36",0xC46B],
+  ["8332CA37",0xC46C],
+  ["8332CA38",0xC46D],
+  ["8332CA39",0xC46E],
+  ["8332CB30",0xC46F],
+  ["8332CB31",0xC470],
+  ["8332CB32",0xC471],
+  ["8332CB33",0xC472],
+  ["8332CB34",0xC473],
+  ["8332CB35",0xC474],
+  ["8332CB36",0xC475],
+  ["8332CB37",0xC476],
+  ["8332CB38",0xC477],
+  ["8332CB39",0xC478],
+  ["8332CC30",0xC479],
+  ["8332CC31",0xC47A],
+  ["8332CC32",0xC47B],
+  ["8332CC33",0xC47C],
+  ["8332CC34",0xC47D],
+  ["8332CC35",0xC47E],
+  ["8332CC36",0xC47F],
+  ["8332CC37",0xC480],
+  ["8332CC38",0xC481],
+  ["8332CC39",0xC482],
+  ["8332CD30",0xC483],
+  ["8332CD31",0xC484],
+  ["8332CD32",0xC485],
+  ["8332CD33",0xC486],
+  ["8332CD34",0xC487],
+  ["8332CD35",0xC488],
+  ["8332CD36",0xC489],
+  ["8332CD37",0xC48A],
+  ["8332CD38",0xC48B],
+  ["8332CD39",0xC48C],
+  ["8332CE30",0xC48D],
+  ["8332CE31",0xC48E],
+  ["8332CE32",0xC48F],
+  ["8332CE33",0xC490],
+  ["8332CE34",0xC491],
+  ["8332CE35",0xC492],
+  ["8332CE36",0xC493],
+  ["8332CE37",0xC494],
+  ["8332CE38",0xC495],
+  ["8332CE39",0xC496],
+  ["8332CF30",0xC497],
+  ["8332CF31",0xC498],
+  ["8332CF32",0xC499],
+  ["8332CF33",0xC49A],
+  ["8332CF34",0xC49B],
+  ["8332CF35",0xC49C],
+  ["8332CF36",0xC49D],
+  ["8332CF37",0xC49E],
+  ["8332CF38",0xC49F],
+  ["8332CF39",0xC4A0],
+  ["8332D030",0xC4A1],
+  ["8332D031",0xC4A2],
+  ["8332D032",0xC4A3],
+  ["8332D033",0xC4A4],
+  ["8332D034",0xC4A5],
+  ["8332D035",0xC4A6],
+  ["8332D036",0xC4A7],
+  ["8332D037",0xC4A8],
+  ["8332D038",0xC4A9],
+  ["8332D039",0xC4AA],
+  ["8332D130",0xC4AB],
+  ["8332D131",0xC4AC],
+  ["8332D132",0xC4AD],
+  ["8332D133",0xC4AE],
+  ["8332D134",0xC4AF],
+  ["8332D135",0xC4B0],
+  ["8332D136",0xC4B1],
+  ["8332D137",0xC4B2],
+  ["8332D138",0xC4B3],
+  ["8332D139",0xC4B4],
+  ["8332D230",0xC4B5],
+  ["8332D231",0xC4B6],
+  ["8332D232",0xC4B7],
+  ["8332D233",0xC4B8],
+  ["8332D234",0xC4B9],
+  ["8332D235",0xC4BA],
+  ["8332D236",0xC4BB],
+  ["8332D237",0xC4BC],
+  ["8332D238",0xC4BD],
+  ["8332D239",0xC4BE],
+  ["8332D330",0xC4BF],
+  ["8332D331",0xC4C0],
+  ["8332D332",0xC4C1],
+  ["8332D333",0xC4C2],
+  ["8332D334",0xC4C3],
+  ["8332D335",0xC4C4],
+  ["8332D336",0xC4C5],
+  ["8332D337",0xC4C6],
+  ["8332D338",0xC4C7],
+  ["8332D339",0xC4C8],
+  ["8332D430",0xC4C9],
+  ["8332D431",0xC4CA],
+  ["8332D432",0xC4CB],
+  ["8332D433",0xC4CC],
+  ["8332D434",0xC4CD],
+  ["8332D435",0xC4CE],
+  ["8332D436",0xC4CF],
+  ["8332D437",0xC4D0],
+  ["8332D438",0xC4D1],
+  ["8332D439",0xC4D2],
+  ["8332D530",0xC4D3],
+  ["8332D531",0xC4D4],
+  ["8332D532",0xC4D5],
+  ["8332D533",0xC4D6],
+  ["8332D534",0xC4D7],
+  ["8332D535",0xC4D8],
+  ["8332D536",0xC4D9],
+  ["8332D537",0xC4DA],
+  ["8332D538",0xC4DB],
+  ["8332D539",0xC4DC],
+  ["8332D630",0xC4DD],
+  ["8332D631",0xC4DE],
+  ["8332D632",0xC4DF],
+  ["8332D633",0xC4E0],
+  ["8332D634",0xC4E1],
+  ["8332D635",0xC4E2],
+  ["8332D636",0xC4E3],
+  ["8332D637",0xC4E4],
+  ["8332D638",0xC4E5],
+  ["8332D639",0xC4E6],
+  ["8332D730",0xC4E7],
+  ["8332D731",0xC4E8],
+  ["8332D732",0xC4E9],
+  ["8332D733",0xC4EA],
+  ["8332D734",0xC4EB],
+  ["8332D735",0xC4EC],
+  ["8332D736",0xC4ED],
+  ["8332D737",0xC4EE],
+  ["8332D738",0xC4EF],
+  ["8332D739",0xC4F0],
+  ["8332D830",0xC4F1],
+  ["8332D831",0xC4F2],
+  ["8332D832",0xC4F3],
+  ["8332D833",0xC4F4],
+  ["8332D834",0xC4F5],
+  ["8332D835",0xC4F6],
+  ["8332D836",0xC4F7],
+  ["8332D837",0xC4F8],
+  ["8332D838",0xC4F9],
+  ["8332D839",0xC4FA],
+  ["8332D930",0xC4FB],
+  ["8332D931",0xC4FC],
+  ["8332D932",0xC4FD],
+  ["8332D933",0xC4FE],
+  ["8332D934",0xC4FF],
+  ["8332D935",0xC500],
+  ["8332D936",0xC501],
+  ["8332D937",0xC502],
+  ["8332D938",0xC503],
+  ["8332D939",0xC504],
+  ["8332DA30",0xC505],
+  ["8332DA31",0xC506],
+  ["8332DA32",0xC507],
+  ["8332DA33",0xC508],
+  ["8332DA34",0xC509],
+  ["8332DA35",0xC50A],
+  ["8332DA36",0xC50B],
+  ["8332DA37",0xC50C],
+  ["8332DA38",0xC50D],
+  ["8332DA39",0xC50E],
+  ["8332DB30",0xC50F],
+  ["8332DB31",0xC510],
+  ["8332DB32",0xC511],
+  ["8332DB33",0xC512],
+  ["8332DB34",0xC513],
+  ["8332DB35",0xC514],
+  ["8332DB36",0xC515],
+  ["8332DB37",0xC516],
+  ["8332DB38",0xC517],
+  ["8332DB39",0xC518],
+  ["8332DC30",0xC519],
+  ["8332DC31",0xC51A],
+  ["8332DC32",0xC51B],
+  ["8332DC33",0xC51C],
+  ["8332DC34",0xC51D],
+  ["8332DC35",0xC51E],
+  ["8332DC36",0xC51F],
+  ["8332DC37",0xC520],
+  ["8332DC38",0xC521],
+  ["8332DC39",0xC522],
+  ["8332DD30",0xC523],
+  ["8332DD31",0xC524],
+  ["8332DD32",0xC525],
+  ["8332DD33",0xC526],
+  ["8332DD34",0xC527],
+  ["8332DD35",0xC528],
+  ["8332DD36",0xC529],
+  ["8332DD37",0xC52A],
+  ["8332DD38",0xC52B],
+  ["8332DD39",0xC52C],
+  ["8332DE30",0xC52D],
+  ["8332DE31",0xC52E],
+  ["8332DE32",0xC52F],
+  ["8332DE33",0xC530],
+  ["8332DE34",0xC531],
+  ["8332DE35",0xC532],
+  ["8332DE36",0xC533],
+  ["8332DE37",0xC534],
+  ["8332DE38",0xC535],
+  ["8332DE39",0xC536],
+  ["8332DF30",0xC537],
+  ["8332DF31",0xC538],
+  ["8332DF32",0xC539],
+  ["8332DF33",0xC53A],
+  ["8332DF34",0xC53B],
+  ["8332DF35",0xC53C],
+  ["8332DF36",0xC53D],
+  ["8332DF37",0xC53E],
+  ["8332DF38",0xC53F],
+  ["8332DF39",0xC540],
+  ["8332E030",0xC541],
+  ["8332E031",0xC542],
+  ["8332E032",0xC543],
+  ["8332E033",0xC544],
+  ["8332E034",0xC545],
+  ["8332E035",0xC546],
+  ["8332E036",0xC547],
+  ["8332E037",0xC548],
+  ["8332E038",0xC549],
+  ["8332E039",0xC54A],
+  ["8332E130",0xC54B],
+  ["8332E131",0xC54C],
+  ["8332E132",0xC54D],
+  ["8332E133",0xC54E],
+  ["8332E134",0xC54F],
+  ["8332E135",0xC550],
+  ["8332E136",0xC551],
+  ["8332E137",0xC552],
+  ["8332E138",0xC553],
+  ["8332E139",0xC554],
+  ["8332E230",0xC555],
+  ["8332E231",0xC556],
+  ["8332E232",0xC557],
+  ["8332E233",0xC558],
+  ["8332E234",0xC559],
+  ["8332E235",0xC55A],
+  ["8332E236",0xC55B],
+  ["8332E237",0xC55C],
+  ["8332E238",0xC55D],
+  ["8332E239",0xC55E],
+  ["8332E330",0xC55F],
+  ["8332E331",0xC560],
+  ["8332E332",0xC561],
+  ["8332E333",0xC562],
+  ["8332E334",0xC563],
+  ["8332E335",0xC564],
+  ["8332E336",0xC565],
+  ["8332E337",0xC566],
+  ["8332E338",0xC567],
+  ["8332E339",0xC568],
+  ["8332E430",0xC569],
+  ["8332E431",0xC56A],
+  ["8332E432",0xC56B],
+  ["8332E433",0xC56C],
+  ["8332E434",0xC56D],
+  ["8332E435",0xC56E],
+  ["8332E436",0xC56F],
+  ["8332E437",0xC570],
+  ["8332E438",0xC571],
+  ["8332E439",0xC572],
+  ["8332E530",0xC573],
+  ["8332E531",0xC574],
+  ["8332E532",0xC575],
+  ["8332E533",0xC576],
+  ["8332E534",0xC577],
+  ["8332E535",0xC578],
+  ["8332E536",0xC579],
+  ["8332E537",0xC57A],
+  ["8332E538",0xC57B],
+  ["8332E539",0xC57C],
+  ["8332E630",0xC57D],
+  ["8332E631",0xC57E],
+  ["8332E632",0xC57F],
+  ["8332E633",0xC580],
+  ["8332E634",0xC581],
+  ["8332E635",0xC582],
+  ["8332E636",0xC583],
+  ["8332E637",0xC584],
+  ["8332E638",0xC585],
+  ["8332E639",0xC586],
+  ["8332E730",0xC587],
+  ["8332E731",0xC588],
+  ["8332E732",0xC589],
+  ["8332E733",0xC58A],
+  ["8332E734",0xC58B],
+  ["8332E735",0xC58C],
+  ["8332E736",0xC58D],
+  ["8332E737",0xC58E],
+  ["8332E738",0xC58F],
+  ["8332E739",0xC590],
+  ["8332E830",0xC591],
+  ["8332E831",0xC592],
+  ["8332E832",0xC593],
+  ["8332E833",0xC594],
+  ["8332E834",0xC595],
+  ["8332E835",0xC596],
+  ["8332E836",0xC597],
+  ["8332E837",0xC598],
+  ["8332E838",0xC599],
+  ["8332E839",0xC59A],
+  ["8332E930",0xC59B],
+  ["8332E931",0xC59C],
+  ["8332E932",0xC59D],
+  ["8332E933",0xC59E],
+  ["8332E934",0xC59F],
+  ["8332E935",0xC5A0],
+  ["8332E936",0xC5A1],
+  ["8332E937",0xC5A2],
+  ["8332E938",0xC5A3],
+  ["8332E939",0xC5A4],
+  ["8332EA30",0xC5A5],
+  ["8332EA31",0xC5A6],
+  ["8332EA32",0xC5A7],
+  ["8332EA33",0xC5A8],
+  ["8332EA34",0xC5A9],
+  ["8332EA35",0xC5AA],
+  ["8332EA36",0xC5AB],
+  ["8332EA37",0xC5AC],
+  ["8332EA38",0xC5AD],
+  ["8332EA39",0xC5AE],
+  ["8332EB30",0xC5AF],
+  ["8332EB31",0xC5B0],
+  ["8332EB32",0xC5B1],
+  ["8332EB33",0xC5B2],
+  ["8332EB34",0xC5B3],
+  ["8332EB35",0xC5B4],
+  ["8332EB36",0xC5B5],
+  ["8332EB37",0xC5B6],
+  ["8332EB38",0xC5B7],
+  ["8332EB39",0xC5B8],
+  ["8332EC30",0xC5B9],
+  ["8332EC31",0xC5BA],
+  ["8332EC32",0xC5BB],
+  ["8332EC33",0xC5BC],
+  ["8332EC34",0xC5BD],
+  ["8332EC35",0xC5BE],
+  ["8332EC36",0xC5BF],
+  ["8332EC37",0xC5C0],
+  ["8332EC38",0xC5C1],
+  ["8332EC39",0xC5C2],
+  ["8332ED30",0xC5C3],
+  ["8332ED31",0xC5C4],
+  ["8332ED32",0xC5C5],
+  ["8332ED33",0xC5C6],
+  ["8332ED34",0xC5C7],
+  ["8332ED35",0xC5C8],
+  ["8332ED36",0xC5C9],
+  ["8332ED37",0xC5CA],
+  ["8332ED38",0xC5CB],
+  ["8332ED39",0xC5CC],
+  ["8332EE30",0xC5CD],
+  ["8332EE31",0xC5CE],
+  ["8332EE32",0xC5CF],
+  ["8332EE33",0xC5D0],
+  ["8332EE34",0xC5D1],
+  ["8332EE35",0xC5D2],
+  ["8332EE36",0xC5D3],
+  ["8332EE37",0xC5D4],
+  ["8332EE38",0xC5D5],
+  ["8332EE39",0xC5D6],
+  ["8332EF30",0xC5D7],
+  ["8332EF31",0xC5D8],
+  ["8332EF32",0xC5D9],
+  ["8332EF33",0xC5DA],
+  ["8332EF34",0xC5DB],
+  ["8332EF35",0xC5DC],
+  ["8332EF36",0xC5DD],
+  ["8332EF37",0xC5DE],
+  ["8332EF38",0xC5DF],
+  ["8332EF39",0xC5E0],
+  ["8332F030",0xC5E1],
+  ["8332F031",0xC5E2],
+  ["8332F032",0xC5E3],
+  ["8332F033",0xC5E4],
+  ["8332F034",0xC5E5],
+  ["8332F035",0xC5E6],
+  ["8332F036",0xC5E7],
+  ["8332F037",0xC5E8],
+  ["8332F038",0xC5E9],
+  ["8332F039",0xC5EA],
+  ["8332F130",0xC5EB],
+  ["8332F131",0xC5EC],
+  ["8332F132",0xC5ED],
+  ["8332F133",0xC5EE],
+  ["8332F134",0xC5EF],
+  ["8332F135",0xC5F0],
+  ["8332F136",0xC5F1],
+  ["8332F137",0xC5F2],
+  ["8332F138",0xC5F3],
+  ["8332F139",0xC5F4],
+  ["8332F230",0xC5F5],
+  ["8332F231",0xC5F6],
+  ["8332F232",0xC5F7],
+  ["8332F233",0xC5F8],
+  ["8332F234",0xC5F9],
+  ["8332F235",0xC5FA],
+  ["8332F236",0xC5FB],
+  ["8332F237",0xC5FC],
+  ["8332F238",0xC5FD],
+  ["8332F239",0xC5FE],
+  ["8332F330",0xC5FF],
+  ["8332F331",0xC600],
+  ["8332F332",0xC601],
+  ["8332F333",0xC602],
+  ["8332F334",0xC603],
+  ["8332F335",0xC604],
+  ["8332F336",0xC605],
+  ["8332F337",0xC606],
+  ["8332F338",0xC607],
+  ["8332F339",0xC608],
+  ["8332F430",0xC609],
+  ["8332F431",0xC60A],
+  ["8332F432",0xC60B],
+  ["8332F433",0xC60C],
+  ["8332F434",0xC60D],
+  ["8332F435",0xC60E],
+  ["8332F436",0xC60F],
+  ["8332F437",0xC610],
+  ["8332F438",0xC611],
+  ["8332F439",0xC612],
+  ["8332F530",0xC613],
+  ["8332F531",0xC614],
+  ["8332F532",0xC615],
+  ["8332F533",0xC616],
+  ["8332F534",0xC617],
+  ["8332F535",0xC618],
+  ["8332F536",0xC619],
+  ["8332F537",0xC61A],
+  ["8332F538",0xC61B],
+  ["8332F539",0xC61C],
+  ["8332F630",0xC61D],
+  ["8332F631",0xC61E],
+  ["8332F632",0xC61F],
+  ["8332F633",0xC620],
+  ["8332F634",0xC621],
+  ["8332F635",0xC622],
+  ["8332F636",0xC623],
+  ["8332F637",0xC624],
+  ["8332F638",0xC625],
+  ["8332F639",0xC626],
+  ["8332F730",0xC627],
+  ["8332F731",0xC628],
+  ["8332F732",0xC629],
+  ["8332F733",0xC62A],
+  ["8332F734",0xC62B],
+  ["8332F735",0xC62C],
+  ["8332F736",0xC62D],
+  ["8332F737",0xC62E],
+  ["8332F738",0xC62F],
+  ["8332F739",0xC630],
+  ["8332F830",0xC631],
+  ["8332F831",0xC632],
+  ["8332F832",0xC633],
+  ["8332F833",0xC634],
+  ["8332F834",0xC635],
+  ["8332F835",0xC636],
+  ["8332F836",0xC637],
+  ["8332F837",0xC638],
+  ["8332F838",0xC639],
+  ["8332F839",0xC63A],
+  ["8332F930",0xC63B],
+  ["8332F931",0xC63C],
+  ["8332F932",0xC63D],
+  ["8332F933",0xC63E],
+  ["8332F934",0xC63F],
+  ["8332F935",0xC640],
+  ["8332F936",0xC641],
+  ["8332F937",0xC642],
+  ["8332F938",0xC643],
+  ["8332F939",0xC644],
+  ["8332FA30",0xC645],
+  ["8332FA31",0xC646],
+  ["8332FA32",0xC647],
+  ["8332FA33",0xC648],
+  ["8332FA34",0xC649],
+  ["8332FA35",0xC64A],
+  ["8332FA36",0xC64B],
+  ["8332FA37",0xC64C],
+  ["8332FA38",0xC64D],
+  ["8332FA39",0xC64E],
+  ["8332FB30",0xC64F],
+  ["8332FB31",0xC650],
+  ["8332FB32",0xC651],
+  ["8332FB33",0xC652],
+  ["8332FB34",0xC653],
+  ["8332FB35",0xC654],
+  ["8332FB36",0xC655],
+  ["8332FB37",0xC656],
+  ["8332FB38",0xC657],
+  ["8332FB39",0xC658],
+  ["8332FC30",0xC659],
+  ["8332FC31",0xC65A],
+  ["8332FC32",0xC65B],
+  ["8332FC33",0xC65C],
+  ["8332FC34",0xC65D],
+  ["8332FC35",0xC65E],
+  ["8332FC36",0xC65F],
+  ["8332FC37",0xC660],
+  ["8332FC38",0xC661],
+  ["8332FC39",0xC662],
+  ["8332FD30",0xC663],
+  ["8332FD31",0xC664],
+  ["8332FD32",0xC665],
+  ["8332FD33",0xC666],
+  ["8332FD34",0xC667],
+  ["8332FD35",0xC668],
+  ["8332FD36",0xC669],
+  ["8332FD37",0xC66A],
+  ["8332FD38",0xC66B],
+  ["8332FD39",0xC66C],
+  ["8332FE30",0xC66D],
+  ["8332FE31",0xC66E],
+  ["8332FE32",0xC66F],
+  ["8332FE33",0xC670],
+  ["8332FE34",0xC671],
+  ["8332FE35",0xC672],
+  ["8332FE36",0xC673],
+  ["8332FE37",0xC674],
+  ["8332FE38",0xC675],
+  ["8332FE39",0xC676],
+  ["83338130",0xC677],
+  ["83338131",0xC678],
+  ["83338132",0xC679],
+  ["83338133",0xC67A],
+  ["83338134",0xC67B],
+  ["83338135",0xC67C],
+  ["83338136",0xC67D],
+  ["83338137",0xC67E],
+  ["83338138",0xC67F],
+  ["83338139",0xC680],
+  ["83338230",0xC681],
+  ["83338231",0xC682],
+  ["83338232",0xC683],
+  ["83338233",0xC684],
+  ["83338234",0xC685],
+  ["83338235",0xC686],
+  ["83338236",0xC687],
+  ["83338237",0xC688],
+  ["83338238",0xC689],
+  ["83338239",0xC68A],
+  ["83338330",0xC68B],
+  ["83338331",0xC68C],
+  ["83338332",0xC68D],
+  ["83338333",0xC68E],
+  ["83338334",0xC68F],
+  ["83338335",0xC690],
+  ["83338336",0xC691],
+  ["83338337",0xC692],
+  ["83338338",0xC693],
+  ["83338339",0xC694],
+  ["83338430",0xC695],
+  ["83338431",0xC696],
+  ["83338432",0xC697],
+  ["83338433",0xC698],
+  ["83338434",0xC699],
+  ["83338435",0xC69A],
+  ["83338436",0xC69B],
+  ["83338437",0xC69C],
+  ["83338438",0xC69D],
+  ["83338439",0xC69E],
+  ["83338530",0xC69F],
+  ["83338531",0xC6A0],
+  ["83338532",0xC6A1],
+  ["83338533",0xC6A2],
+  ["83338534",0xC6A3],
+  ["83338535",0xC6A4],
+  ["83338536",0xC6A5],
+  ["83338537",0xC6A6],
+  ["83338538",0xC6A7],
+  ["83338539",0xC6A8],
+  ["83338630",0xC6A9],
+  ["83338631",0xC6AA],
+  ["83338632",0xC6AB],
+  ["83338633",0xC6AC],
+  ["83338634",0xC6AD],
+  ["83338635",0xC6AE],
+  ["83338636",0xC6AF],
+  ["83338637",0xC6B0],
+  ["83338638",0xC6B1],
+  ["83338639",0xC6B2],
+  ["83338730",0xC6B3],
+  ["83338731",0xC6B4],
+  ["83338732",0xC6B5],
+  ["83338733",0xC6B6],
+  ["83338734",0xC6B7],
+  ["83338735",0xC6B8],
+  ["83338736",0xC6B9],
+  ["83338737",0xC6BA],
+  ["83338738",0xC6BB],
+  ["83338739",0xC6BC],
+  ["83338830",0xC6BD],
+  ["83338831",0xC6BE],
+  ["83338832",0xC6BF],
+  ["83338833",0xC6C0],
+  ["83338834",0xC6C1],
+  ["83338835",0xC6C2],
+  ["83338836",0xC6C3],
+  ["83338837",0xC6C4],
+  ["83338838",0xC6C5],
+  ["83338839",0xC6C6],
+  ["83338930",0xC6C7],
+  ["83338931",0xC6C8],
+  ["83338932",0xC6C9],
+  ["83338933",0xC6CA],
+  ["83338934",0xC6CB],
+  ["83338935",0xC6CC],
+  ["83338936",0xC6CD],
+  ["83338937",0xC6CE],
+  ["83338938",0xC6CF],
+  ["83338939",0xC6D0],
+  ["83338A30",0xC6D1],
+  ["83338A31",0xC6D2],
+  ["83338A32",0xC6D3],
+  ["83338A33",0xC6D4],
+  ["83338A34",0xC6D5],
+  ["83338A35",0xC6D6],
+  ["83338A36",0xC6D7],
+  ["83338A37",0xC6D8],
+  ["83338A38",0xC6D9],
+  ["83338A39",0xC6DA],
+  ["83338B30",0xC6DB],
+  ["83338B31",0xC6DC],
+  ["83338B32",0xC6DD],
+  ["83338B33",0xC6DE],
+  ["83338B34",0xC6DF],
+  ["83338B35",0xC6E0],
+  ["83338B36",0xC6E1],
+  ["83338B37",0xC6E2],
+  ["83338B38",0xC6E3],
+  ["83338B39",0xC6E4],
+  ["83338C30",0xC6E5],
+  ["83338C31",0xC6E6],
+  ["83338C32",0xC6E7],
+  ["83338C33",0xC6E8],
+  ["83338C34",0xC6E9],
+  ["83338C35",0xC6EA],
+  ["83338C36",0xC6EB],
+  ["83338C37",0xC6EC],
+  ["83338C38",0xC6ED],
+  ["83338C39",0xC6EE],
+  ["83338D30",0xC6EF],
+  ["83338D31",0xC6F0],
+  ["83338D32",0xC6F1],
+  ["83338D33",0xC6F2],
+  ["83338D34",0xC6F3],
+  ["83338D35",0xC6F4],
+  ["83338D36",0xC6F5],
+  ["83338D37",0xC6F6],
+  ["83338D38",0xC6F7],
+  ["83338D39",0xC6F8],
+  ["83338E30",0xC6F9],
+  ["83338E31",0xC6FA],
+  ["83338E32",0xC6FB],
+  ["83338E33",0xC6FC],
+  ["83338E34",0xC6FD],
+  ["83338E35",0xC6FE],
+  ["83338E36",0xC6FF],
+  ["83338E37",0xC700],
+  ["83338E38",0xC701],
+  ["83338E39",0xC702],
+  ["83338F30",0xC703],
+  ["83338F31",0xC704],
+  ["83338F32",0xC705],
+  ["83338F33",0xC706],
+  ["83338F34",0xC707],
+  ["83338F35",0xC708],
+  ["83338F36",0xC709],
+  ["83338F37",0xC70A],
+  ["83338F38",0xC70B],
+  ["83338F39",0xC70C],
+  ["83339030",0xC70D],
+  ["83339031",0xC70E],
+  ["83339032",0xC70F],
+  ["83339033",0xC710],
+  ["83339034",0xC711],
+  ["83339035",0xC712],
+  ["83339036",0xC713],
+  ["83339037",0xC714],
+  ["83339038",0xC715],
+  ["83339039",0xC716],
+  ["83339130",0xC717],
+  ["83339131",0xC718],
+  ["83339132",0xC719],
+  ["83339133",0xC71A],
+  ["83339134",0xC71B],
+  ["83339135",0xC71C],
+  ["83339136",0xC71D],
+  ["83339137",0xC71E],
+  ["83339138",0xC71F],
+  ["83339139",0xC720],
+  ["83339230",0xC721],
+  ["83339231",0xC722],
+  ["83339232",0xC723],
+  ["83339233",0xC724],
+  ["83339234",0xC725],
+  ["83339235",0xC726],
+  ["83339236",0xC727],
+  ["83339237",0xC728],
+  ["83339238",0xC729],
+  ["83339239",0xC72A],
+  ["83339330",0xC72B],
+  ["83339331",0xC72C],
+  ["83339332",0xC72D],
+  ["83339333",0xC72E],
+  ["83339334",0xC72F],
+  ["83339335",0xC730],
+  ["83339336",0xC731],
+  ["83339337",0xC732],
+  ["83339338",0xC733],
+  ["83339339",0xC734],
+  ["83339430",0xC735],
+  ["83339431",0xC736],
+  ["83339432",0xC737],
+  ["83339433",0xC738],
+  ["83339434",0xC739],
+  ["83339435",0xC73A],
+  ["83339436",0xC73B],
+  ["83339437",0xC73C],
+  ["83339438",0xC73D],
+  ["83339439",0xC73E],
+  ["83339530",0xC73F],
+  ["83339531",0xC740],
+  ["83339532",0xC741],
+  ["83339533",0xC742],
+  ["83339534",0xC743],
+  ["83339535",0xC744],
+  ["83339536",0xC745],
+  ["83339537",0xC746],
+  ["83339538",0xC747],
+  ["83339539",0xC748],
+  ["83339630",0xC749],
+  ["83339631",0xC74A],
+  ["83339632",0xC74B],
+  ["83339633",0xC74C],
+  ["83339634",0xC74D],
+  ["83339635",0xC74E],
+  ["83339636",0xC74F],
+  ["83339637",0xC750],
+  ["83339638",0xC751],
+  ["83339639",0xC752],
+  ["83339730",0xC753],
+  ["83339731",0xC754],
+  ["83339732",0xC755],
+  ["83339733",0xC756],
+  ["83339734",0xC757],
+  ["83339735",0xC758],
+  ["83339736",0xC759],
+  ["83339737",0xC75A],
+  ["83339738",0xC75B],
+  ["83339739",0xC75C],
+  ["83339830",0xC75D],
+  ["83339831",0xC75E],
+  ["83339832",0xC75F],
+  ["83339833",0xC760],
+  ["83339834",0xC761],
+  ["83339835",0xC762],
+  ["83339836",0xC763],
+  ["83339837",0xC764],
+  ["83339838",0xC765],
+  ["83339839",0xC766],
+  ["83339930",0xC767],
+  ["83339931",0xC768],
+  ["83339932",0xC769],
+  ["83339933",0xC76A],
+  ["83339934",0xC76B],
+  ["83339935",0xC76C],
+  ["83339936",0xC76D],
+  ["83339937",0xC76E],
+  ["83339938",0xC76F],
+  ["83339939",0xC770],
+  ["83339A30",0xC771],
+  ["83339A31",0xC772],
+  ["83339A32",0xC773],
+  ["83339A33",0xC774],
+  ["83339A34",0xC775],
+  ["83339A35",0xC776],
+  ["83339A36",0xC777],
+  ["83339A37",0xC778],
+  ["83339A38",0xC779],
+  ["83339A39",0xC77A],
+  ["83339B30",0xC77B],
+  ["83339B31",0xC77C],
+  ["83339B32",0xC77D],
+  ["83339B33",0xC77E],
+  ["83339B34",0xC77F],
+  ["83339B35",0xC780],
+  ["83339B36",0xC781],
+  ["83339B37",0xC782],
+  ["83339B38",0xC783],
+  ["83339B39",0xC784],
+  ["83339C30",0xC785],
+  ["83339C31",0xC786],
+  ["83339C32",0xC787],
+  ["83339C33",0xC788],
+  ["83339C34",0xC789],
+  ["83339C35",0xC78A],
+  ["83339C36",0xC78B],
+  ["83339C37",0xC78C],
+  ["83339C38",0xC78D],
+  ["83339C39",0xC78E],
+  ["83339D30",0xC78F],
+  ["83339D31",0xC790],
+  ["83339D32",0xC791],
+  ["83339D33",0xC792],
+  ["83339D34",0xC793],
+  ["83339D35",0xC794],
+  ["83339D36",0xC795],
+  ["83339D37",0xC796],
+  ["83339D38",0xC797],
+  ["83339D39",0xC798],
+  ["83339E30",0xC799],
+  ["83339E31",0xC79A],
+  ["83339E32",0xC79B],
+  ["83339E33",0xC79C],
+  ["83339E34",0xC79D],
+  ["83339E35",0xC79E],
+  ["83339E36",0xC79F],
+  ["83339E37",0xC7A0],
+  ["83339E38",0xC7A1],
+  ["83339E39",0xC7A2],
+  ["83339F30",0xC7A3],
+  ["83339F31",0xC7A4],
+  ["83339F32",0xC7A5],
+  ["83339F33",0xC7A6],
+  ["83339F34",0xC7A7],
+  ["83339F35",0xC7A8],
+  ["83339F36",0xC7A9],
+  ["83339F37",0xC7AA],
+  ["83339F38",0xC7AB],
+  ["83339F39",0xC7AC],
+  ["8333A030",0xC7AD],
+  ["8333A031",0xC7AE],
+  ["8333A032",0xC7AF],
+  ["8333A033",0xC7B0],
+  ["8333A034",0xC7B1],
+  ["8333A035",0xC7B2],
+  ["8333A036",0xC7B3],
+  ["8333A037",0xC7B4],
+  ["8333A038",0xC7B5],
+  ["8333A039",0xC7B6],
+  ["8333A130",0xC7B7],
+  ["8333A131",0xC7B8],
+  ["8333A132",0xC7B9],
+  ["8333A133",0xC7BA],
+  ["8333A134",0xC7BB],
+  ["8333A135",0xC7BC],
+  ["8333A136",0xC7BD],
+  ["8333A137",0xC7BE],
+  ["8333A138",0xC7BF],
+  ["8333A139",0xC7C0],
+  ["8333A230",0xC7C1],
+  ["8333A231",0xC7C2],
+  ["8333A232",0xC7C3],
+  ["8333A233",0xC7C4],
+  ["8333A234",0xC7C5],
+  ["8333A235",0xC7C6],
+  ["8333A236",0xC7C7],
+  ["8333A237",0xC7C8],
+  ["8333A238",0xC7C9],
+  ["8333A239",0xC7CA],
+  ["8333A330",0xC7CB],
+  ["8333A331",0xC7CC],
+  ["8333A332",0xC7CD],
+  ["8333A333",0xC7CE],
+  ["8333A334",0xC7CF],
+  ["8333A335",0xC7D0],
+  ["8333A336",0xC7D1],
+  ["8333A337",0xC7D2],
+  ["8333A338",0xC7D3],
+  ["8333A339",0xC7D4],
+  ["8333A430",0xC7D5],
+  ["8333A431",0xC7D6],
+  ["8333A432",0xC7D7],
+  ["8333A433",0xC7D8],
+  ["8333A434",0xC7D9],
+  ["8333A435",0xC7DA],
+  ["8333A436",0xC7DB],
+  ["8333A437",0xC7DC],
+  ["8333A438",0xC7DD],
+  ["8333A439",0xC7DE],
+  ["8333A530",0xC7DF],
+  ["8333A531",0xC7E0],
+  ["8333A532",0xC7E1],
+  ["8333A533",0xC7E2],
+  ["8333A534",0xC7E3],
+  ["8333A535",0xC7E4],
+  ["8333A536",0xC7E5],
+  ["8333A537",0xC7E6],
+  ["8333A538",0xC7E7],
+  ["8333A539",0xC7E8],
+  ["8333A630",0xC7E9],
+  ["8333A631",0xC7EA],
+  ["8333A632",0xC7EB],
+  ["8333A633",0xC7EC],
+  ["8333A634",0xC7ED],
+  ["8333A635",0xC7EE],
+  ["8333A636",0xC7EF],
+  ["8333A637",0xC7F0],
+  ["8333A638",0xC7F1],
+  ["8333A639",0xC7F2],
+  ["8333A730",0xC7F3],
+  ["8333A731",0xC7F4],
+  ["8333A732",0xC7F5],
+  ["8333A733",0xC7F6],
+  ["8333A734",0xC7F7],
+  ["8333A735",0xC7F8],
+  ["8333A736",0xC7F9],
+  ["8333A737",0xC7FA],
+  ["8333A738",0xC7FB],
+  ["8333A739",0xC7FC],
+  ["8333A830",0xC7FD],
+  ["8333A831",0xC7FE],
+  ["8333A832",0xC7FF],
+  ["8333A833",0xC800],
+  ["8333A834",0xC801],
+  ["8333A835",0xC802],
+  ["8333A836",0xC803],
+  ["8333A837",0xC804],
+  ["8333A838",0xC805],
+  ["8333A839",0xC806],
+  ["8333A930",0xC807],
+  ["8333A931",0xC808],
+  ["8333A932",0xC809],
+  ["8333A933",0xC80A],
+  ["8333A934",0xC80B],
+  ["8333A935",0xC80C],
+  ["8333A936",0xC80D],
+  ["8333A937",0xC80E],
+  ["8333A938",0xC80F],
+  ["8333A939",0xC810],
+  ["8333AA30",0xC811],
+  ["8333AA31",0xC812],
+  ["8333AA32",0xC813],
+  ["8333AA33",0xC814],
+  ["8333AA34",0xC815],
+  ["8333AA35",0xC816],
+  ["8333AA36",0xC817],
+  ["8333AA37",0xC818],
+  ["8333AA38",0xC819],
+  ["8333AA39",0xC81A],
+  ["8333AB30",0xC81B],
+  ["8333AB31",0xC81C],
+  ["8333AB32",0xC81D],
+  ["8333AB33",0xC81E],
+  ["8333AB34",0xC81F],
+  ["8333AB35",0xC820],
+  ["8333AB36",0xC821],
+  ["8333AB37",0xC822],
+  ["8333AB38",0xC823],
+  ["8333AB39",0xC824],
+  ["8333AC30",0xC825],
+  ["8333AC31",0xC826],
+  ["8333AC32",0xC827],
+  ["8333AC33",0xC828],
+  ["8333AC34",0xC829],
+  ["8333AC35",0xC82A],
+  ["8333AC36",0xC82B],
+  ["8333AC37",0xC82C],
+  ["8333AC38",0xC82D],
+  ["8333AC39",0xC82E],
+  ["8333AD30",0xC82F],
+  ["8333AD31",0xC830],
+  ["8333AD32",0xC831],
+  ["8333AD33",0xC832],
+  ["8333AD34",0xC833],
+  ["8333AD35",0xC834],
+  ["8333AD36",0xC835],
+  ["8333AD37",0xC836],
+  ["8333AD38",0xC837],
+  ["8333AD39",0xC838],
+  ["8333AE30",0xC839],
+  ["8333AE31",0xC83A],
+  ["8333AE32",0xC83B],
+  ["8333AE33",0xC83C],
+  ["8333AE34",0xC83D],
+  ["8333AE35",0xC83E],
+  ["8333AE36",0xC83F],
+  ["8333AE37",0xC840],
+  ["8333AE38",0xC841],
+  ["8333AE39",0xC842],
+  ["8333AF30",0xC843],
+  ["8333AF31",0xC844],
+  ["8333AF32",0xC845],
+  ["8333AF33",0xC846],
+  ["8333AF34",0xC847],
+  ["8333AF35",0xC848],
+  ["8333AF36",0xC849],
+  ["8333AF37",0xC84A],
+  ["8333AF38",0xC84B],
+  ["8333AF39",0xC84C],
+  ["8333B030",0xC84D],
+  ["8333B031",0xC84E],
+  ["8333B032",0xC84F],
+  ["8333B033",0xC850],
+  ["8333B034",0xC851],
+  ["8333B035",0xC852],
+  ["8333B036",0xC853],
+  ["8333B037",0xC854],
+  ["8333B038",0xC855],
+  ["8333B039",0xC856],
+  ["8333B130",0xC857],
+  ["8333B131",0xC858],
+  ["8333B132",0xC859],
+  ["8333B133",0xC85A],
+  ["8333B134",0xC85B],
+  ["8333B135",0xC85C],
+  ["8333B136",0xC85D],
+  ["8333B137",0xC85E],
+  ["8333B138",0xC85F],
+  ["8333B139",0xC860],
+  ["8333B230",0xC861],
+  ["8333B231",0xC862],
+  ["8333B232",0xC863],
+  ["8333B233",0xC864],
+  ["8333B234",0xC865],
+  ["8333B235",0xC866],
+  ["8333B236",0xC867],
+  ["8333B237",0xC868],
+  ["8333B238",0xC869],
+  ["8333B239",0xC86A],
+  ["8333B330",0xC86B],
+  ["8333B331",0xC86C],
+  ["8333B332",0xC86D],
+  ["8333B333",0xC86E],
+  ["8333B334",0xC86F],
+  ["8333B335",0xC870],
+  ["8333B336",0xC871],
+  ["8333B337",0xC872],
+  ["8333B338",0xC873],
+  ["8333B339",0xC874],
+  ["8333B430",0xC875],
+  ["8333B431",0xC876],
+  ["8333B432",0xC877],
+  ["8333B433",0xC878],
+  ["8333B434",0xC879],
+  ["8333B435",0xC87A],
+  ["8333B436",0xC87B],
+  ["8333B437",0xC87C],
+  ["8333B438",0xC87D],
+  ["8333B439",0xC87E],
+  ["8333B530",0xC87F],
+  ["8333B531",0xC880],
+  ["8333B532",0xC881],
+  ["8333B533",0xC882],
+  ["8333B534",0xC883],
+  ["8333B535",0xC884],
+  ["8333B536",0xC885],
+  ["8333B537",0xC886],
+  ["8333B538",0xC887],
+  ["8333B539",0xC888],
+  ["8333B630",0xC889],
+  ["8333B631",0xC88A],
+  ["8333B632",0xC88B],
+  ["8333B633",0xC88C],
+  ["8333B634",0xC88D],
+  ["8333B635",0xC88E],
+  ["8333B636",0xC88F],
+  ["8333B637",0xC890],
+  ["8333B638",0xC891],
+  ["8333B639",0xC892],
+  ["8333B730",0xC893],
+  ["8333B731",0xC894],
+  ["8333B732",0xC895],
+  ["8333B733",0xC896],
+  ["8333B734",0xC897],
+  ["8333B735",0xC898],
+  ["8333B736",0xC899],
+  ["8333B737",0xC89A],
+  ["8333B738",0xC89B],
+  ["8333B739",0xC89C],
+  ["8333B830",0xC89D],
+  ["8333B831",0xC89E],
+  ["8333B832",0xC89F],
+  ["8333B833",0xC8A0],
+  ["8333B834",0xC8A1],
+  ["8333B835",0xC8A2],
+  ["8333B836",0xC8A3],
+  ["8333B837",0xC8A4],
+  ["8333B838",0xC8A5],
+  ["8333B839",0xC8A6],
+  ["8333B930",0xC8A7],
+  ["8333B931",0xC8A8],
+  ["8333B932",0xC8A9],
+  ["8333B933",0xC8AA],
+  ["8333B934",0xC8AB],
+  ["8333B935",0xC8AC],
+  ["8333B936",0xC8AD],
+  ["8333B937",0xC8AE],
+  ["8333B938",0xC8AF],
+  ["8333B939",0xC8B0],
+  ["8333BA30",0xC8B1],
+  ["8333BA31",0xC8B2],
+  ["8333BA32",0xC8B3],
+  ["8333BA33",0xC8B4],
+  ["8333BA34",0xC8B5],
+  ["8333BA35",0xC8B6],
+  ["8333BA36",0xC8B7],
+  ["8333BA37",0xC8B8],
+  ["8333BA38",0xC8B9],
+  ["8333BA39",0xC8BA],
+  ["8333BB30",0xC8BB],
+  ["8333BB31",0xC8BC],
+  ["8333BB32",0xC8BD],
+  ["8333BB33",0xC8BE],
+  ["8333BB34",0xC8BF],
+  ["8333BB35",0xC8C0],
+  ["8333BB36",0xC8C1],
+  ["8333BB37",0xC8C2],
+  ["8333BB38",0xC8C3],
+  ["8333BB39",0xC8C4],
+  ["8333BC30",0xC8C5],
+  ["8333BC31",0xC8C6],
+  ["8333BC32",0xC8C7],
+  ["8333BC33",0xC8C8],
+  ["8333BC34",0xC8C9],
+  ["8333BC35",0xC8CA],
+  ["8333BC36",0xC8CB],
+  ["8333BC37",0xC8CC],
+  ["8333BC38",0xC8CD],
+  ["8333BC39",0xC8CE],
+  ["8333BD30",0xC8CF],
+  ["8333BD31",0xC8D0],
+  ["8333BD32",0xC8D1],
+  ["8333BD33",0xC8D2],
+  ["8333BD34",0xC8D3],
+  ["8333BD35",0xC8D4],
+  ["8333BD36",0xC8D5],
+  ["8333BD37",0xC8D6],
+  ["8333BD38",0xC8D7],
+  ["8333BD39",0xC8D8],
+  ["8333BE30",0xC8D9],
+  ["8333BE31",0xC8DA],
+  ["8333BE32",0xC8DB],
+  ["8333BE33",0xC8DC],
+  ["8333BE34",0xC8DD],
+  ["8333BE35",0xC8DE],
+  ["8333BE36",0xC8DF],
+  ["8333BE37",0xC8E0],
+  ["8333BE38",0xC8E1],
+  ["8333BE39",0xC8E2],
+  ["8333BF30",0xC8E3],
+  ["8333BF31",0xC8E4],
+  ["8333BF32",0xC8E5],
+  ["8333BF33",0xC8E6],
+  ["8333BF34",0xC8E7],
+  ["8333BF35",0xC8E8],
+  ["8333BF36",0xC8E9],
+  ["8333BF37",0xC8EA],
+  ["8333BF38",0xC8EB],
+  ["8333BF39",0xC8EC],
+  ["8333C030",0xC8ED],
+  ["8333C031",0xC8EE],
+  ["8333C032",0xC8EF],
+  ["8333C033",0xC8F0],
+  ["8333C034",0xC8F1],
+  ["8333C035",0xC8F2],
+  ["8333C036",0xC8F3],
+  ["8333C037",0xC8F4],
+  ["8333C038",0xC8F5],
+  ["8333C039",0xC8F6],
+  ["8333C130",0xC8F7],
+  ["8333C131",0xC8F8],
+  ["8333C132",0xC8F9],
+  ["8333C133",0xC8FA],
+  ["8333C134",0xC8FB],
+  ["8333C135",0xC8FC],
+  ["8333C136",0xC8FD],
+  ["8333C137",0xC8FE],
+  ["8333C138",0xC8FF],
+  ["8333C139",0xC900],
+  ["8333C230",0xC901],
+  ["8333C231",0xC902],
+  ["8333C232",0xC903],
+  ["8333C233",0xC904],
+  ["8333C234",0xC905],
+  ["8333C235",0xC906],
+  ["8333C236",0xC907],
+  ["8333C237",0xC908],
+  ["8333C238",0xC909],
+  ["8333C239",0xC90A],
+  ["8333C330",0xC90B],
+  ["8333C331",0xC90C],
+  ["8333C332",0xC90D],
+  ["8333C333",0xC90E],
+  ["8333C334",0xC90F],
+  ["8333C335",0xC910],
+  ["8333C336",0xC911],
+  ["8333C337",0xC912],
+  ["8333C338",0xC913],
+  ["8333C339",0xC914],
+  ["8333C430",0xC915],
+  ["8333C431",0xC916],
+  ["8333C432",0xC917],
+  ["8333C433",0xC918],
+  ["8333C434",0xC919],
+  ["8333C435",0xC91A],
+  ["8333C436",0xC91B],
+  ["8333C437",0xC91C],
+  ["8333C438",0xC91D],
+  ["8333C439",0xC91E],
+  ["8333C530",0xC91F],
+  ["8333C531",0xC920],
+  ["8333C532",0xC921],
+  ["8333C533",0xC922],
+  ["8333C534",0xC923],
+  ["8333C535",0xC924],
+  ["8333C536",0xC925],
+  ["8333C537",0xC926],
+  ["8333C538",0xC927],
+  ["8333C539",0xC928],
+  ["8333C630",0xC929],
+  ["8333C631",0xC92A],
+  ["8333C632",0xC92B],
+  ["8333C633",0xC92C],
+  ["8333C634",0xC92D],
+  ["8333C635",0xC92E],
+  ["8333C636",0xC92F],
+  ["8333C637",0xC930],
+  ["8333C638",0xC931],
+  ["8333C639",0xC932],
+  ["8333C730",0xC933],
+  ["8333C731",0xC934],
+  ["8333C732",0xC935],
+  ["8333C733",0xC936],
+  ["8333C734",0xC937],
+  ["8333C735",0xC938],
+  ["8333C736",0xC939],
+  ["8333C737",0xC93A],
+  ["8333C738",0xC93B],
+  ["8333C739",0xC93C],
+  ["8333C830",0xC93D],
+  ["8333C831",0xC93E],
+  ["8333C832",0xC93F],
+  ["8333C833",0xC940],
+  ["8333C834",0xC941],
+  ["8333C835",0xC942],
+  ["8333C836",0xC943],
+  ["8333C837",0xC944],
+  ["8333C838",0xC945],
+  ["8333C839",0xC946],
+  ["8333C930",0xC947],
+  ["8333C931",0xC948],
+  ["8333C932",0xC949],
+  ["8333C933",0xC94A],
+  ["8333C934",0xC94B],
+  ["8333C935",0xC94C],
+  ["8333C936",0xC94D],
+  ["8333C937",0xC94E],
+  ["8333C938",0xC94F],
+  ["8333C939",0xC950],
+  ["8333CA30",0xC951],
+  ["8333CA31",0xC952],
+  ["8333CA32",0xC953],
+  ["8333CA33",0xC954],
+  ["8333CA34",0xC955],
+  ["8333CA35",0xC956],
+  ["8333CA36",0xC957],
+  ["8333CA37",0xC958],
+  ["8333CA38",0xC959],
+  ["8333CA39",0xC95A],
+  ["8333CB30",0xC95B],
+  ["8333CB31",0xC95C],
+  ["8333CB32",0xC95D],
+  ["8333CB33",0xC95E],
+  ["8333CB34",0xC95F],
+  ["8333CB35",0xC960],
+  ["8333CB36",0xC961],
+  ["8333CB37",0xC962],
+  ["8333CB38",0xC963],
+  ["8333CB39",0xC964],
+  ["8333CC30",0xC965],
+  ["8333CC31",0xC966],
+  ["8333CC32",0xC967],
+  ["8333CC33",0xC968],
+  ["8333CC34",0xC969],
+  ["8333CC35",0xC96A],
+  ["8333CC36",0xC96B],
+  ["8333CC37",0xC96C],
+  ["8333CC38",0xC96D],
+  ["8333CC39",0xC96E],
+  ["8333CD30",0xC96F],
+  ["8333CD31",0xC970],
+  ["8333CD32",0xC971],
+  ["8333CD33",0xC972],
+  ["8333CD34",0xC973],
+  ["8333CD35",0xC974],
+  ["8333CD36",0xC975],
+  ["8333CD37",0xC976],
+  ["8333CD38",0xC977],
+  ["8333CD39",0xC978],
+  ["8333CE30",0xC979],
+  ["8333CE31",0xC97A],
+  ["8333CE32",0xC97B],
+  ["8333CE33",0xC97C],
+  ["8333CE34",0xC97D],
+  ["8333CE35",0xC97E],
+  ["8333CE36",0xC97F],
+  ["8333CE37",0xC980],
+  ["8333CE38",0xC981],
+  ["8333CE39",0xC982],
+  ["8333CF30",0xC983],
+  ["8333CF31",0xC984],
+  ["8333CF32",0xC985],
+  ["8333CF33",0xC986],
+  ["8333CF34",0xC987],
+  ["8333CF35",0xC988],
+  ["8333CF36",0xC989],
+  ["8333CF37",0xC98A],
+  ["8333CF38",0xC98B],
+  ["8333CF39",0xC98C],
+  ["8333D030",0xC98D],
+  ["8333D031",0xC98E],
+  ["8333D032",0xC98F],
+  ["8333D033",0xC990],
+  ["8333D034",0xC991],
+  ["8333D035",0xC992],
+  ["8333D036",0xC993],
+  ["8333D037",0xC994],
+  ["8333D038",0xC995],
+  ["8333D039",0xC996],
+  ["8333D130",0xC997],
+  ["8333D131",0xC998],
+  ["8333D132",0xC999],
+  ["8333D133",0xC99A],
+  ["8333D134",0xC99B],
+  ["8333D135",0xC99C],
+  ["8333D136",0xC99D],
+  ["8333D137",0xC99E],
+  ["8333D138",0xC99F],
+  ["8333D139",0xC9A0],
+  ["8333D230",0xC9A1],
+  ["8333D231",0xC9A2],
+  ["8333D232",0xC9A3],
+  ["8333D233",0xC9A4],
+  ["8333D234",0xC9A5],
+  ["8333D235",0xC9A6],
+  ["8333D236",0xC9A7],
+  ["8333D237",0xC9A8],
+  ["8333D238",0xC9A9],
+  ["8333D239",0xC9AA],
+  ["8333D330",0xC9AB],
+  ["8333D331",0xC9AC],
+  ["8333D332",0xC9AD],
+  ["8333D333",0xC9AE],
+  ["8333D334",0xC9AF],
+  ["8333D335",0xC9B0],
+  ["8333D336",0xC9B1],
+  ["8333D337",0xC9B2],
+  ["8333D338",0xC9B3],
+  ["8333D339",0xC9B4],
+  ["8333D430",0xC9B5],
+  ["8333D431",0xC9B6],
+  ["8333D432",0xC9B7],
+  ["8333D433",0xC9B8],
+  ["8333D434",0xC9B9],
+  ["8333D435",0xC9BA],
+  ["8333D436",0xC9BB],
+  ["8333D437",0xC9BC],
+  ["8333D438",0xC9BD],
+  ["8333D439",0xC9BE],
+  ["8333D530",0xC9BF],
+  ["8333D531",0xC9C0],
+  ["8333D532",0xC9C1],
+  ["8333D533",0xC9C2],
+  ["8333D534",0xC9C3],
+  ["8333D535",0xC9C4],
+  ["8333D536",0xC9C5],
+  ["8333D537",0xC9C6],
+  ["8333D538",0xC9C7],
+  ["8333D539",0xC9C8],
+  ["8333D630",0xC9C9],
+  ["8333D631",0xC9CA],
+  ["8333D632",0xC9CB],
+  ["8333D633",0xC9CC],
+  ["8333D634",0xC9CD],
+  ["8333D635",0xC9CE],
+  ["8333D636",0xC9CF],
+  ["8333D637",0xC9D0],
+  ["8333D638",0xC9D1],
+  ["8333D639",0xC9D2],
+  ["8333D730",0xC9D3],
+  ["8333D731",0xC9D4],
+  ["8333D732",0xC9D5],
+  ["8333D733",0xC9D6],
+  ["8333D734",0xC9D7],
+  ["8333D735",0xC9D8],
+  ["8333D736",0xC9D9],
+  ["8333D737",0xC9DA],
+  ["8333D738",0xC9DB],
+  ["8333D739",0xC9DC],
+  ["8333D830",0xC9DD],
+  ["8333D831",0xC9DE],
+  ["8333D832",0xC9DF],
+  ["8333D833",0xC9E0],
+  ["8333D834",0xC9E1],
+  ["8333D835",0xC9E2],
+  ["8333D836",0xC9E3],
+  ["8333D837",0xC9E4],
+  ["8333D838",0xC9E5],
+  ["8333D839",0xC9E6],
+  ["8333D930",0xC9E7],
+  ["8333D931",0xC9E8],
+  ["8333D932",0xC9E9],
+  ["8333D933",0xC9EA],
+  ["8333D934",0xC9EB],
+  ["8333D935",0xC9EC],
+  ["8333D936",0xC9ED],
+  ["8333D937",0xC9EE],
+  ["8333D938",0xC9EF],
+  ["8333D939",0xC9F0],
+  ["8333DA30",0xC9F1],
+  ["8333DA31",0xC9F2],
+  ["8333DA32",0xC9F3],
+  ["8333DA33",0xC9F4],
+  ["8333DA34",0xC9F5],
+  ["8333DA35",0xC9F6],
+  ["8333DA36",0xC9F7],
+  ["8333DA37",0xC9F8],
+  ["8333DA38",0xC9F9],
+  ["8333DA39",0xC9FA],
+  ["8333DB30",0xC9FB],
+  ["8333DB31",0xC9FC],
+  ["8333DB32",0xC9FD],
+  ["8333DB33",0xC9FE],
+  ["8333DB34",0xC9FF],
+  ["8333DB35",0xCA00],
+  ["8333DB36",0xCA01],
+  ["8333DB37",0xCA02],
+  ["8333DB38",0xCA03],
+  ["8333DB39",0xCA04],
+  ["8333DC30",0xCA05],
+  ["8333DC31",0xCA06],
+  ["8333DC32",0xCA07],
+  ["8333DC33",0xCA08],
+  ["8333DC34",0xCA09],
+  ["8333DC35",0xCA0A],
+  ["8333DC36",0xCA0B],
+  ["8333DC37",0xCA0C],
+  ["8333DC38",0xCA0D],
+  ["8333DC39",0xCA0E],
+  ["8333DD30",0xCA0F],
+  ["8333DD31",0xCA10],
+  ["8333DD32",0xCA11],
+  ["8333DD33",0xCA12],
+  ["8333DD34",0xCA13],
+  ["8333DD35",0xCA14],
+  ["8333DD36",0xCA15],
+  ["8333DD37",0xCA16],
+  ["8333DD38",0xCA17],
+  ["8333DD39",0xCA18],
+  ["8333DE30",0xCA19],
+  ["8333DE31",0xCA1A],
+  ["8333DE32",0xCA1B],
+  ["8333DE33",0xCA1C],
+  ["8333DE34",0xCA1D],
+  ["8333DE35",0xCA1E],
+  ["8333DE36",0xCA1F],
+  ["8333DE37",0xCA20],
+  ["8333DE38",0xCA21],
+  ["8333DE39",0xCA22],
+  ["8333DF30",0xCA23],
+  ["8333DF31",0xCA24],
+  ["8333DF32",0xCA25],
+  ["8333DF33",0xCA26],
+  ["8333DF34",0xCA27],
+  ["8333DF35",0xCA28],
+  ["8333DF36",0xCA29],
+  ["8333DF37",0xCA2A],
+  ["8333DF38",0xCA2B],
+  ["8333DF39",0xCA2C],
+  ["8333E030",0xCA2D],
+  ["8333E031",0xCA2E],
+  ["8333E032",0xCA2F],
+  ["8333E033",0xCA30],
+  ["8333E034",0xCA31],
+  ["8333E035",0xCA32],
+  ["8333E036",0xCA33],
+  ["8333E037",0xCA34],
+  ["8333E038",0xCA35],
+  ["8333E039",0xCA36],
+  ["8333E130",0xCA37],
+  ["8333E131",0xCA38],
+  ["8333E132",0xCA39],
+  ["8333E133",0xCA3A],
+  ["8333E134",0xCA3B],
+  ["8333E135",0xCA3C],
+  ["8333E136",0xCA3D],
+  ["8333E137",0xCA3E],
+  ["8333E138",0xCA3F],
+  ["8333E139",0xCA40],
+  ["8333E230",0xCA41],
+  ["8333E231",0xCA42],
+  ["8333E232",0xCA43],
+  ["8333E233",0xCA44],
+  ["8333E234",0xCA45],
+  ["8333E235",0xCA46],
+  ["8333E236",0xCA47],
+  ["8333E237",0xCA48],
+  ["8333E238",0xCA49],
+  ["8333E239",0xCA4A],
+  ["8333E330",0xCA4B],
+  ["8333E331",0xCA4C],
+  ["8333E332",0xCA4D],
+  ["8333E333",0xCA4E],
+  ["8333E334",0xCA4F],
+  ["8333E335",0xCA50],
+  ["8333E336",0xCA51],
+  ["8333E337",0xCA52],
+  ["8333E338",0xCA53],
+  ["8333E339",0xCA54],
+  ["8333E430",0xCA55],
+  ["8333E431",0xCA56],
+  ["8333E432",0xCA57],
+  ["8333E433",0xCA58],
+  ["8333E434",0xCA59],
+  ["8333E435",0xCA5A],
+  ["8333E436",0xCA5B],
+  ["8333E437",0xCA5C],
+  ["8333E438",0xCA5D],
+  ["8333E439",0xCA5E],
+  ["8333E530",0xCA5F],
+  ["8333E531",0xCA60],
+  ["8333E532",0xCA61],
+  ["8333E533",0xCA62],
+  ["8333E534",0xCA63],
+  ["8333E535",0xCA64],
+  ["8333E536",0xCA65],
+  ["8333E537",0xCA66],
+  ["8333E538",0xCA67],
+  ["8333E539",0xCA68],
+  ["8333E630",0xCA69],
+  ["8333E631",0xCA6A],
+  ["8333E632",0xCA6B],
+  ["8333E633",0xCA6C],
+  ["8333E634",0xCA6D],
+  ["8333E635",0xCA6E],
+  ["8333E636",0xCA6F],
+  ["8333E637",0xCA70],
+  ["8333E638",0xCA71],
+  ["8333E639",0xCA72],
+  ["8333E730",0xCA73],
+  ["8333E731",0xCA74],
+  ["8333E732",0xCA75],
+  ["8333E733",0xCA76],
+  ["8333E734",0xCA77],
+  ["8333E735",0xCA78],
+  ["8333E736",0xCA79],
+  ["8333E737",0xCA7A],
+  ["8333E738",0xCA7B],
+  ["8333E739",0xCA7C],
+  ["8333E830",0xCA7D],
+  ["8333E831",0xCA7E],
+  ["8333E832",0xCA7F],
+  ["8333E833",0xCA80],
+  ["8333E834",0xCA81],
+  ["8333E835",0xCA82],
+  ["8333E836",0xCA83],
+  ["8333E837",0xCA84],
+  ["8333E838",0xCA85],
+  ["8333E839",0xCA86],
+  ["8333E930",0xCA87],
+  ["8333E931",0xCA88],
+  ["8333E932",0xCA89],
+  ["8333E933",0xCA8A],
+  ["8333E934",0xCA8B],
+  ["8333E935",0xCA8C],
+  ["8333E936",0xCA8D],
+  ["8333E937",0xCA8E],
+  ["8333E938",0xCA8F],
+  ["8333E939",0xCA90],
+  ["8333EA30",0xCA91],
+  ["8333EA31",0xCA92],
+  ["8333EA32",0xCA93],
+  ["8333EA33",0xCA94],
+  ["8333EA34",0xCA95],
+  ["8333EA35",0xCA96],
+  ["8333EA36",0xCA97],
+  ["8333EA37",0xCA98],
+  ["8333EA38",0xCA99],
+  ["8333EA39",0xCA9A],
+  ["8333EB30",0xCA9B],
+  ["8333EB31",0xCA9C],
+  ["8333EB32",0xCA9D],
+  ["8333EB33",0xCA9E],
+  ["8333EB34",0xCA9F],
+  ["8333EB35",0xCAA0],
+  ["8333EB36",0xCAA1],
+  ["8333EB37",0xCAA2],
+  ["8333EB38",0xCAA3],
+  ["8333EB39",0xCAA4],
+  ["8333EC30",0xCAA5],
+  ["8333EC31",0xCAA6],
+  ["8333EC32",0xCAA7],
+  ["8333EC33",0xCAA8],
+  ["8333EC34",0xCAA9],
+  ["8333EC35",0xCAAA],
+  ["8333EC36",0xCAAB],
+  ["8333EC37",0xCAAC],
+  ["8333EC38",0xCAAD],
+  ["8333EC39",0xCAAE],
+  ["8333ED30",0xCAAF],
+  ["8333ED31",0xCAB0],
+  ["8333ED32",0xCAB1],
+  ["8333ED33",0xCAB2],
+  ["8333ED34",0xCAB3],
+  ["8333ED35",0xCAB4],
+  ["8333ED36",0xCAB5],
+  ["8333ED37",0xCAB6],
+  ["8333ED38",0xCAB7],
+  ["8333ED39",0xCAB8],
+  ["8333EE30",0xCAB9],
+  ["8333EE31",0xCABA],
+  ["8333EE32",0xCABB],
+  ["8333EE33",0xCABC],
+  ["8333EE34",0xCABD],
+  ["8333EE35",0xCABE],
+  ["8333EE36",0xCABF],
+  ["8333EE37",0xCAC0],
+  ["8333EE38",0xCAC1],
+  ["8333EE39",0xCAC2],
+  ["8333EF30",0xCAC3],
+  ["8333EF31",0xCAC4],
+  ["8333EF32",0xCAC5],
+  ["8333EF33",0xCAC6],
+  ["8333EF34",0xCAC7],
+  ["8333EF35",0xCAC8],
+  ["8333EF36",0xCAC9],
+  ["8333EF37",0xCACA],
+  ["8333EF38",0xCACB],
+  ["8333EF39",0xCACC],
+  ["8333F030",0xCACD],
+  ["8333F031",0xCACE],
+  ["8333F032",0xCACF],
+  ["8333F033",0xCAD0],
+  ["8333F034",0xCAD1],
+  ["8333F035",0xCAD2],
+  ["8333F036",0xCAD3],
+  ["8333F037",0xCAD4],
+  ["8333F038",0xCAD5],
+  ["8333F039",0xCAD6],
+  ["8333F130",0xCAD7],
+  ["8333F131",0xCAD8],
+  ["8333F132",0xCAD9],
+  ["8333F133",0xCADA],
+  ["8333F134",0xCADB],
+  ["8333F135",0xCADC],
+  ["8333F136",0xCADD],
+  ["8333F137",0xCADE],
+  ["8333F138",0xCADF],
+  ["8333F139",0xCAE0],
+  ["8333F230",0xCAE1],
+  ["8333F231",0xCAE2],
+  ["8333F232",0xCAE3],
+  ["8333F233",0xCAE4],
+  ["8333F234",0xCAE5],
+  ["8333F235",0xCAE6],
+  ["8333F236",0xCAE7],
+  ["8333F237",0xCAE8],
+  ["8333F238",0xCAE9],
+  ["8333F239",0xCAEA],
+  ["8333F330",0xCAEB],
+  ["8333F331",0xCAEC],
+  ["8333F332",0xCAED],
+  ["8333F333",0xCAEE],
+  ["8333F334",0xCAEF],
+  ["8333F335",0xCAF0],
+  ["8333F336",0xCAF1],
+  ["8333F337",0xCAF2],
+  ["8333F338",0xCAF3],
+  ["8333F339",0xCAF4],
+  ["8333F430",0xCAF5],
+  ["8333F431",0xCAF6],
+  ["8333F432",0xCAF7],
+  ["8333F433",0xCAF8],
+  ["8333F434",0xCAF9],
+  ["8333F435",0xCAFA],
+  ["8333F436",0xCAFB],
+  ["8333F437",0xCAFC],
+  ["8333F438",0xCAFD],
+  ["8333F439",0xCAFE],
+  ["8333F530",0xCAFF],
+  ["8333F531",0xCB00],
+  ["8333F532",0xCB01],
+  ["8333F533",0xCB02],
+  ["8333F534",0xCB03],
+  ["8333F535",0xCB04],
+  ["8333F536",0xCB05],
+  ["8333F537",0xCB06],
+  ["8333F538",0xCB07],
+  ["8333F539",0xCB08],
+  ["8333F630",0xCB09],
+  ["8333F631",0xCB0A],
+  ["8333F632",0xCB0B],
+  ["8333F633",0xCB0C],
+  ["8333F634",0xCB0D],
+  ["8333F635",0xCB0E],
+  ["8333F636",0xCB0F],
+  ["8333F637",0xCB10],
+  ["8333F638",0xCB11],
+  ["8333F639",0xCB12],
+  ["8333F730",0xCB13],
+  ["8333F731",0xCB14],
+  ["8333F732",0xCB15],
+  ["8333F733",0xCB16],
+  ["8333F734",0xCB17],
+  ["8333F735",0xCB18],
+  ["8333F736",0xCB19],
+  ["8333F737",0xCB1A],
+  ["8333F738",0xCB1B],
+  ["8333F739",0xCB1C],
+  ["8333F830",0xCB1D],
+  ["8333F831",0xCB1E],
+  ["8333F832",0xCB1F],
+  ["8333F833",0xCB20],
+  ["8333F834",0xCB21],
+  ["8333F835",0xCB22],
+  ["8333F836",0xCB23],
+  ["8333F837",0xCB24],
+  ["8333F838",0xCB25],
+  ["8333F839",0xCB26],
+  ["8333F930",0xCB27],
+  ["8333F931",0xCB28],
+  ["8333F932",0xCB29],
+  ["8333F933",0xCB2A],
+  ["8333F934",0xCB2B],
+  ["8333F935",0xCB2C],
+  ["8333F936",0xCB2D],
+  ["8333F937",0xCB2E],
+  ["8333F938",0xCB2F],
+  ["8333F939",0xCB30],
+  ["8333FA30",0xCB31],
+  ["8333FA31",0xCB32],
+  ["8333FA32",0xCB33],
+  ["8333FA33",0xCB34],
+  ["8333FA34",0xCB35],
+  ["8333FA35",0xCB36],
+  ["8333FA36",0xCB37],
+  ["8333FA37",0xCB38],
+  ["8333FA38",0xCB39],
+  ["8333FA39",0xCB3A],
+  ["8333FB30",0xCB3B],
+  ["8333FB31",0xCB3C],
+  ["8333FB32",0xCB3D],
+  ["8333FB33",0xCB3E],
+  ["8333FB34",0xCB3F],
+  ["8333FB35",0xCB40],
+  ["8333FB36",0xCB41],
+  ["8333FB37",0xCB42],
+  ["8333FB38",0xCB43],
+  ["8333FB39",0xCB44],
+  ["8333FC30",0xCB45],
+  ["8333FC31",0xCB46],
+  ["8333FC32",0xCB47],
+  ["8333FC33",0xCB48],
+  ["8333FC34",0xCB49],
+  ["8333FC35",0xCB4A],
+  ["8333FC36",0xCB4B],
+  ["8333FC37",0xCB4C],
+  ["8333FC38",0xCB4D],
+  ["8333FC39",0xCB4E],
+  ["8333FD30",0xCB4F],
+  ["8333FD31",0xCB50],
+  ["8333FD32",0xCB51],
+  ["8333FD33",0xCB52],
+  ["8333FD34",0xCB53],
+  ["8333FD35",0xCB54],
+  ["8333FD36",0xCB55],
+  ["8333FD37",0xCB56],
+  ["8333FD38",0xCB57],
+  ["8333FD39",0xCB58],
+  ["8333FE30",0xCB59],
+  ["8333FE31",0xCB5A],
+  ["8333FE32",0xCB5B],
+  ["8333FE33",0xCB5C],
+  ["8333FE34",0xCB5D],
+  ["8333FE35",0xCB5E],
+  ["8333FE36",0xCB5F],
+  ["8333FE37",0xCB60],
+  ["8333FE38",0xCB61],
+  ["8333FE39",0xCB62],
+  ["83348130",0xCB63],
+  ["83348131",0xCB64],
+  ["83348132",0xCB65],
+  ["83348133",0xCB66],
+  ["83348134",0xCB67],
+  ["83348135",0xCB68],
+  ["83348136",0xCB69],
+  ["83348137",0xCB6A],
+  ["83348138",0xCB6B],
+  ["83348139",0xCB6C],
+  ["83348230",0xCB6D],
+  ["83348231",0xCB6E],
+  ["83348232",0xCB6F],
+  ["83348233",0xCB70],
+  ["83348234",0xCB71],
+  ["83348235",0xCB72],
+  ["83348236",0xCB73],
+  ["83348237",0xCB74],
+  ["83348238",0xCB75],
+  ["83348239",0xCB76],
+  ["83348330",0xCB77],
+  ["83348331",0xCB78],
+  ["83348332",0xCB79],
+  ["83348333",0xCB7A],
+  ["83348334",0xCB7B],
+  ["83348335",0xCB7C],
+  ["83348336",0xCB7D],
+  ["83348337",0xCB7E],
+  ["83348338",0xCB7F],
+  ["83348339",0xCB80],
+  ["83348430",0xCB81],
+  ["83348431",0xCB82],
+  ["83348432",0xCB83],
+  ["83348433",0xCB84],
+  ["83348434",0xCB85],
+  ["83348435",0xCB86],
+  ["83348436",0xCB87],
+  ["83348437",0xCB88],
+  ["83348438",0xCB89],
+  ["83348439",0xCB8A],
+  ["83348530",0xCB8B],
+  ["83348531",0xCB8C],
+  ["83348532",0xCB8D],
+  ["83348533",0xCB8E],
+  ["83348534",0xCB8F],
+  ["83348535",0xCB90],
+  ["83348536",0xCB91],
+  ["83348537",0xCB92],
+  ["83348538",0xCB93],
+  ["83348539",0xCB94],
+  ["83348630",0xCB95],
+  ["83348631",0xCB96],
+  ["83348632",0xCB97],
+  ["83348633",0xCB98],
+  ["83348634",0xCB99],
+  ["83348635",0xCB9A],
+  ["83348636",0xCB9B],
+  ["83348637",0xCB9C],
+  ["83348638",0xCB9D],
+  ["83348639",0xCB9E],
+  ["83348730",0xCB9F],
+  ["83348731",0xCBA0],
+  ["83348732",0xCBA1],
+  ["83348733",0xCBA2],
+  ["83348734",0xCBA3],
+  ["83348735",0xCBA4],
+  ["83348736",0xCBA5],
+  ["83348737",0xCBA6],
+  ["83348738",0xCBA7],
+  ["83348739",0xCBA8],
+  ["83348830",0xCBA9],
+  ["83348831",0xCBAA],
+  ["83348832",0xCBAB],
+  ["83348833",0xCBAC],
+  ["83348834",0xCBAD],
+  ["83348835",0xCBAE],
+  ["83348836",0xCBAF],
+  ["83348837",0xCBB0],
+  ["83348838",0xCBB1],
+  ["83348839",0xCBB2],
+  ["83348930",0xCBB3],
+  ["83348931",0xCBB4],
+  ["83348932",0xCBB5],
+  ["83348933",0xCBB6],
+  ["83348934",0xCBB7],
+  ["83348935",0xCBB8],
+  ["83348936",0xCBB9],
+  ["83348937",0xCBBA],
+  ["83348938",0xCBBB],
+  ["83348939",0xCBBC],
+  ["83348A30",0xCBBD],
+  ["83348A31",0xCBBE],
+  ["83348A32",0xCBBF],
+  ["83348A33",0xCBC0],
+  ["83348A34",0xCBC1],
+  ["83348A35",0xCBC2],
+  ["83348A36",0xCBC3],
+  ["83348A37",0xCBC4],
+  ["83348A38",0xCBC5],
+  ["83348A39",0xCBC6],
+  ["83348B30",0xCBC7],
+  ["83348B31",0xCBC8],
+  ["83348B32",0xCBC9],
+  ["83348B33",0xCBCA],
+  ["83348B34",0xCBCB],
+  ["83348B35",0xCBCC],
+  ["83348B36",0xCBCD],
+  ["83348B37",0xCBCE],
+  ["83348B38",0xCBCF],
+  ["83348B39",0xCBD0],
+  ["83348C30",0xCBD1],
+  ["83348C31",0xCBD2],
+  ["83348C32",0xCBD3],
+  ["83348C33",0xCBD4],
+  ["83348C34",0xCBD5],
+  ["83348C35",0xCBD6],
+  ["83348C36",0xCBD7],
+  ["83348C37",0xCBD8],
+  ["83348C38",0xCBD9],
+  ["83348C39",0xCBDA],
+  ["83348D30",0xCBDB],
+  ["83348D31",0xCBDC],
+  ["83348D32",0xCBDD],
+  ["83348D33",0xCBDE],
+  ["83348D34",0xCBDF],
+  ["83348D35",0xCBE0],
+  ["83348D36",0xCBE1],
+  ["83348D37",0xCBE2],
+  ["83348D38",0xCBE3],
+  ["83348D39",0xCBE4],
+  ["83348E30",0xCBE5],
+  ["83348E31",0xCBE6],
+  ["83348E32",0xCBE7],
+  ["83348E33",0xCBE8],
+  ["83348E34",0xCBE9],
+  ["83348E35",0xCBEA],
+  ["83348E36",0xCBEB],
+  ["83348E37",0xCBEC],
+  ["83348E38",0xCBED],
+  ["83348E39",0xCBEE],
+  ["83348F30",0xCBEF],
+  ["83348F31",0xCBF0],
+  ["83348F32",0xCBF1],
+  ["83348F33",0xCBF2],
+  ["83348F34",0xCBF3],
+  ["83348F35",0xCBF4],
+  ["83348F36",0xCBF5],
+  ["83348F37",0xCBF6],
+  ["83348F38",0xCBF7],
+  ["83348F39",0xCBF8],
+  ["83349030",0xCBF9],
+  ["83349031",0xCBFA],
+  ["83349032",0xCBFB],
+  ["83349033",0xCBFC],
+  ["83349034",0xCBFD],
+  ["83349035",0xCBFE],
+  ["83349036",0xCBFF],
+  ["83349037",0xCC00],
+  ["83349038",0xCC01],
+  ["83349039",0xCC02],
+  ["83349130",0xCC03],
+  ["83349131",0xCC04],
+  ["83349132",0xCC05],
+  ["83349133",0xCC06],
+  ["83349134",0xCC07],
+  ["83349135",0xCC08],
+  ["83349136",0xCC09],
+  ["83349137",0xCC0A],
+  ["83349138",0xCC0B],
+  ["83349139",0xCC0C],
+  ["83349230",0xCC0D],
+  ["83349231",0xCC0E],
+  ["83349232",0xCC0F],
+  ["83349233",0xCC10],
+  ["83349234",0xCC11],
+  ["83349235",0xCC12],
+  ["83349236",0xCC13],
+  ["83349237",0xCC14],
+  ["83349238",0xCC15],
+  ["83349239",0xCC16],
+  ["83349330",0xCC17],
+  ["83349331",0xCC18],
+  ["83349332",0xCC19],
+  ["83349333",0xCC1A],
+  ["83349334",0xCC1B],
+  ["83349335",0xCC1C],
+  ["83349336",0xCC1D],
+  ["83349337",0xCC1E],
+  ["83349338",0xCC1F],
+  ["83349339",0xCC20],
+  ["83349430",0xCC21],
+  ["83349431",0xCC22],
+  ["83349432",0xCC23],
+  ["83349433",0xCC24],
+  ["83349434",0xCC25],
+  ["83349435",0xCC26],
+  ["83349436",0xCC27],
+  ["83349437",0xCC28],
+  ["83349438",0xCC29],
+  ["83349439",0xCC2A],
+  ["83349530",0xCC2B],
+  ["83349531",0xCC2C],
+  ["83349532",0xCC2D],
+  ["83349533",0xCC2E],
+  ["83349534",0xCC2F],
+  ["83349535",0xCC30],
+  ["83349536",0xCC31],
+  ["83349537",0xCC32],
+  ["83349538",0xCC33],
+  ["83349539",0xCC34],
+  ["83349630",0xCC35],
+  ["83349631",0xCC36],
+  ["83349632",0xCC37],
+  ["83349633",0xCC38],
+  ["83349634",0xCC39],
+  ["83349635",0xCC3A],
+  ["83349636",0xCC3B],
+  ["83349637",0xCC3C],
+  ["83349638",0xCC3D],
+  ["83349639",0xCC3E],
+  ["83349730",0xCC3F],
+  ["83349731",0xCC40],
+  ["83349732",0xCC41],
+  ["83349733",0xCC42],
+  ["83349734",0xCC43],
+  ["83349735",0xCC44],
+  ["83349736",0xCC45],
+  ["83349737",0xCC46],
+  ["83349738",0xCC47],
+  ["83349739",0xCC48],
+  ["83349830",0xCC49],
+  ["83349831",0xCC4A],
+  ["83349832",0xCC4B],
+  ["83349833",0xCC4C],
+  ["83349834",0xCC4D],
+  ["83349835",0xCC4E],
+  ["83349836",0xCC4F],
+  ["83349837",0xCC50],
+  ["83349838",0xCC51],
+  ["83349839",0xCC52],
+  ["83349930",0xCC53],
+  ["83349931",0xCC54],
+  ["83349932",0xCC55],
+  ["83349933",0xCC56],
+  ["83349934",0xCC57],
+  ["83349935",0xCC58],
+  ["83349936",0xCC59],
+  ["83349937",0xCC5A],
+  ["83349938",0xCC5B],
+  ["83349939",0xCC5C],
+  ["83349A30",0xCC5D],
+  ["83349A31",0xCC5E],
+  ["83349A32",0xCC5F],
+  ["83349A33",0xCC60],
+  ["83349A34",0xCC61],
+  ["83349A35",0xCC62],
+  ["83349A36",0xCC63],
+  ["83349A37",0xCC64],
+  ["83349A38",0xCC65],
+  ["83349A39",0xCC66],
+  ["83349B30",0xCC67],
+  ["83349B31",0xCC68],
+  ["83349B32",0xCC69],
+  ["83349B33",0xCC6A],
+  ["83349B34",0xCC6B],
+  ["83349B35",0xCC6C],
+  ["83349B36",0xCC6D],
+  ["83349B37",0xCC6E],
+  ["83349B38",0xCC6F],
+  ["83349B39",0xCC70],
+  ["83349C30",0xCC71],
+  ["83349C31",0xCC72],
+  ["83349C32",0xCC73],
+  ["83349C33",0xCC74],
+  ["83349C34",0xCC75],
+  ["83349C35",0xCC76],
+  ["83349C36",0xCC77],
+  ["83349C37",0xCC78],
+  ["83349C38",0xCC79],
+  ["83349C39",0xCC7A],
+  ["83349D30",0xCC7B],
+  ["83349D31",0xCC7C],
+  ["83349D32",0xCC7D],
+  ["83349D33",0xCC7E],
+  ["83349D34",0xCC7F],
+  ["83349D35",0xCC80],
+  ["83349D36",0xCC81],
+  ["83349D37",0xCC82],
+  ["83349D38",0xCC83],
+  ["83349D39",0xCC84],
+  ["83349E30",0xCC85],
+  ["83349E31",0xCC86],
+  ["83349E32",0xCC87],
+  ["83349E33",0xCC88],
+  ["83349E34",0xCC89],
+  ["83349E35",0xCC8A],
+  ["83349E36",0xCC8B],
+  ["83349E37",0xCC8C],
+  ["83349E38",0xCC8D],
+  ["83349E39",0xCC8E],
+  ["83349F30",0xCC8F],
+  ["83349F31",0xCC90],
+  ["83349F32",0xCC91],
+  ["83349F33",0xCC92],
+  ["83349F34",0xCC93],
+  ["83349F35",0xCC94],
+  ["83349F36",0xCC95],
+  ["83349F37",0xCC96],
+  ["83349F38",0xCC97],
+  ["83349F39",0xCC98],
+  ["8334A030",0xCC99],
+  ["8334A031",0xCC9A],
+  ["8334A032",0xCC9B],
+  ["8334A033",0xCC9C],
+  ["8334A034",0xCC9D],
+  ["8334A035",0xCC9E],
+  ["8334A036",0xCC9F],
+  ["8334A037",0xCCA0],
+  ["8334A038",0xCCA1],
+  ["8334A039",0xCCA2],
+  ["8334A130",0xCCA3],
+  ["8334A131",0xCCA4],
+  ["8334A132",0xCCA5],
+  ["8334A133",0xCCA6],
+  ["8334A134",0xCCA7],
+  ["8334A135",0xCCA8],
+  ["8334A136",0xCCA9],
+  ["8334A137",0xCCAA],
+  ["8334A138",0xCCAB],
+  ["8334A139",0xCCAC],
+  ["8334A230",0xCCAD],
+  ["8334A231",0xCCAE],
+  ["8334A232",0xCCAF],
+  ["8334A233",0xCCB0],
+  ["8334A234",0xCCB1],
+  ["8334A235",0xCCB2],
+  ["8334A236",0xCCB3],
+  ["8334A237",0xCCB4],
+  ["8334A238",0xCCB5],
+  ["8334A239",0xCCB6],
+  ["8334A330",0xCCB7],
+  ["8334A331",0xCCB8],
+  ["8334A332",0xCCB9],
+  ["8334A333",0xCCBA],
+  ["8334A334",0xCCBB],
+  ["8334A335",0xCCBC],
+  ["8334A336",0xCCBD],
+  ["8334A337",0xCCBE],
+  ["8334A338",0xCCBF],
+  ["8334A339",0xCCC0],
+  ["8334A430",0xCCC1],
+  ["8334A431",0xCCC2],
+  ["8334A432",0xCCC3],
+  ["8334A433",0xCCC4],
+  ["8334A434",0xCCC5],
+  ["8334A435",0xCCC6],
+  ["8334A436",0xCCC7],
+  ["8334A437",0xCCC8],
+  ["8334A438",0xCCC9],
+  ["8334A439",0xCCCA],
+  ["8334A530",0xCCCB],
+  ["8334A531",0xCCCC],
+  ["8334A532",0xCCCD],
+  ["8334A533",0xCCCE],
+  ["8334A534",0xCCCF],
+  ["8334A535",0xCCD0],
+  ["8334A536",0xCCD1],
+  ["8334A537",0xCCD2],
+  ["8334A538",0xCCD3],
+  ["8334A539",0xCCD4],
+  ["8334A630",0xCCD5],
+  ["8334A631",0xCCD6],
+  ["8334A632",0xCCD7],
+  ["8334A633",0xCCD8],
+  ["8334A634",0xCCD9],
+  ["8334A635",0xCCDA],
+  ["8334A636",0xCCDB],
+  ["8334A637",0xCCDC],
+  ["8334A638",0xCCDD],
+  ["8334A639",0xCCDE],
+  ["8334A730",0xCCDF],
+  ["8334A731",0xCCE0],
+  ["8334A732",0xCCE1],
+  ["8334A733",0xCCE2],
+  ["8334A734",0xCCE3],
+  ["8334A735",0xCCE4],
+  ["8334A736",0xCCE5],
+  ["8334A737",0xCCE6],
+  ["8334A738",0xCCE7],
+  ["8334A739",0xCCE8],
+  ["8334A830",0xCCE9],
+  ["8334A831",0xCCEA],
+  ["8334A832",0xCCEB],
+  ["8334A833",0xCCEC],
+  ["8334A834",0xCCED],
+  ["8334A835",0xCCEE],
+  ["8334A836",0xCCEF],
+  ["8334A837",0xCCF0],
+  ["8334A838",0xCCF1],
+  ["8334A839",0xCCF2],
+  ["8334A930",0xCCF3],
+  ["8334A931",0xCCF4],
+  ["8334A932",0xCCF5],
+  ["8334A933",0xCCF6],
+  ["8334A934",0xCCF7],
+  ["8334A935",0xCCF8],
+  ["8334A936",0xCCF9],
+  ["8334A937",0xCCFA],
+  ["8334A938",0xCCFB],
+  ["8334A939",0xCCFC],
+  ["8334AA30",0xCCFD],
+  ["8334AA31",0xCCFE],
+  ["8334AA32",0xCCFF],
+  ["8334AA33",0xCD00],
+  ["8334AA34",0xCD01],
+  ["8334AA35",0xCD02],
+  ["8334AA36",0xCD03],
+  ["8334AA37",0xCD04],
+  ["8334AA38",0xCD05],
+  ["8334AA39",0xCD06],
+  ["8334AB30",0xCD07],
+  ["8334AB31",0xCD08],
+  ["8334AB32",0xCD09],
+  ["8334AB33",0xCD0A],
+  ["8334AB34",0xCD0B],
+  ["8334AB35",0xCD0C],
+  ["8334AB36",0xCD0D],
+  ["8334AB37",0xCD0E],
+  ["8334AB38",0xCD0F],
+  ["8334AB39",0xCD10],
+  ["8334AC30",0xCD11],
+  ["8334AC31",0xCD12],
+  ["8334AC32",0xCD13],
+  ["8334AC33",0xCD14],
+  ["8334AC34",0xCD15],
+  ["8334AC35",0xCD16],
+  ["8334AC36",0xCD17],
+  ["8334AC37",0xCD18],
+  ["8334AC38",0xCD19],
+  ["8334AC39",0xCD1A],
+  ["8334AD30",0xCD1B],
+  ["8334AD31",0xCD1C],
+  ["8334AD32",0xCD1D],
+  ["8334AD33",0xCD1E],
+  ["8334AD34",0xCD1F],
+  ["8334AD35",0xCD20],
+  ["8334AD36",0xCD21],
+  ["8334AD37",0xCD22],
+  ["8334AD38",0xCD23],
+  ["8334AD39",0xCD24],
+  ["8334AE30",0xCD25],
+  ["8334AE31",0xCD26],
+  ["8334AE32",0xCD27],
+  ["8334AE33",0xCD28],
+  ["8334AE34",0xCD29],
+  ["8334AE35",0xCD2A],
+  ["8334AE36",0xCD2B],
+  ["8334AE37",0xCD2C],
+  ["8334AE38",0xCD2D],
+  ["8334AE39",0xCD2E],
+  ["8334AF30",0xCD2F],
+  ["8334AF31",0xCD30],
+  ["8334AF32",0xCD31],
+  ["8334AF33",0xCD32],
+  ["8334AF34",0xCD33],
+  ["8334AF35",0xCD34],
+  ["8334AF36",0xCD35],
+  ["8334AF37",0xCD36],
+  ["8334AF38",0xCD37],
+  ["8334AF39",0xCD38],
+  ["8334B030",0xCD39],
+  ["8334B031",0xCD3A],
+  ["8334B032",0xCD3B],
+  ["8334B033",0xCD3C],
+  ["8334B034",0xCD3D],
+  ["8334B035",0xCD3E],
+  ["8334B036",0xCD3F],
+  ["8334B037",0xCD40],
+  ["8334B038",0xCD41],
+  ["8334B039",0xCD42],
+  ["8334B130",0xCD43],
+  ["8334B131",0xCD44],
+  ["8334B132",0xCD45],
+  ["8334B133",0xCD46],
+  ["8334B134",0xCD47],
+  ["8334B135",0xCD48],
+  ["8334B136",0xCD49],
+  ["8334B137",0xCD4A],
+  ["8334B138",0xCD4B],
+  ["8334B139",0xCD4C],
+  ["8334B230",0xCD4D],
+  ["8334B231",0xCD4E],
+  ["8334B232",0xCD4F],
+  ["8334B233",0xCD50],
+  ["8334B234",0xCD51],
+  ["8334B235",0xCD52],
+  ["8334B236",0xCD53],
+  ["8334B237",0xCD54],
+  ["8334B238",0xCD55],
+  ["8334B239",0xCD56],
+  ["8334B330",0xCD57],
+  ["8334B331",0xCD58],
+  ["8334B332",0xCD59],
+  ["8334B333",0xCD5A],
+  ["8334B334",0xCD5B],
+  ["8334B335",0xCD5C],
+  ["8334B336",0xCD5D],
+  ["8334B337",0xCD5E],
+  ["8334B338",0xCD5F],
+  ["8334B339",0xCD60],
+  ["8334B430",0xCD61],
+  ["8334B431",0xCD62],
+  ["8334B432",0xCD63],
+  ["8334B433",0xCD64],
+  ["8334B434",0xCD65],
+  ["8334B435",0xCD66],
+  ["8334B436",0xCD67],
+  ["8334B437",0xCD68],
+  ["8334B438",0xCD69],
+  ["8334B439",0xCD6A],
+  ["8334B530",0xCD6B],
+  ["8334B531",0xCD6C],
+  ["8334B532",0xCD6D],
+  ["8334B533",0xCD6E],
+  ["8334B534",0xCD6F],
+  ["8334B535",0xCD70],
+  ["8334B536",0xCD71],
+  ["8334B537",0xCD72],
+  ["8334B538",0xCD73],
+  ["8334B539",0xCD74],
+  ["8334B630",0xCD75],
+  ["8334B631",0xCD76],
+  ["8334B632",0xCD77],
+  ["8334B633",0xCD78],
+  ["8334B634",0xCD79],
+  ["8334B635",0xCD7A],
+  ["8334B636",0xCD7B],
+  ["8334B637",0xCD7C],
+  ["8334B638",0xCD7D],
+  ["8334B639",0xCD7E],
+  ["8334B730",0xCD7F],
+  ["8334B731",0xCD80],
+  ["8334B732",0xCD81],
+  ["8334B733",0xCD82],
+  ["8334B734",0xCD83],
+  ["8334B735",0xCD84],
+  ["8334B736",0xCD85],
+  ["8334B737",0xCD86],
+  ["8334B738",0xCD87],
+  ["8334B739",0xCD88],
+  ["8334B830",0xCD89],
+  ["8334B831",0xCD8A],
+  ["8334B832",0xCD8B],
+  ["8334B833",0xCD8C],
+  ["8334B834",0xCD8D],
+  ["8334B835",0xCD8E],
+  ["8334B836",0xCD8F],
+  ["8334B837",0xCD90],
+  ["8334B838",0xCD91],
+  ["8334B839",0xCD92],
+  ["8334B930",0xCD93],
+  ["8334B931",0xCD94],
+  ["8334B932",0xCD95],
+  ["8334B933",0xCD96],
+  ["8334B934",0xCD97],
+  ["8334B935",0xCD98],
+  ["8334B936",0xCD99],
+  ["8334B937",0xCD9A],
+  ["8334B938",0xCD9B],
+  ["8334B939",0xCD9C],
+  ["8334BA30",0xCD9D],
+  ["8334BA31",0xCD9E],
+  ["8334BA32",0xCD9F],
+  ["8334BA33",0xCDA0],
+  ["8334BA34",0xCDA1],
+  ["8334BA35",0xCDA2],
+  ["8334BA36",0xCDA3],
+  ["8334BA37",0xCDA4],
+  ["8334BA38",0xCDA5],
+  ["8334BA39",0xCDA6],
+  ["8334BB30",0xCDA7],
+  ["8334BB31",0xCDA8],
+  ["8334BB32",0xCDA9],
+  ["8334BB33",0xCDAA],
+  ["8334BB34",0xCDAB],
+  ["8334BB35",0xCDAC],
+  ["8334BB36",0xCDAD],
+  ["8334BB37",0xCDAE],
+  ["8334BB38",0xCDAF],
+  ["8334BB39",0xCDB0],
+  ["8334BC30",0xCDB1],
+  ["8334BC31",0xCDB2],
+  ["8334BC32",0xCDB3],
+  ["8334BC33",0xCDB4],
+  ["8334BC34",0xCDB5],
+  ["8334BC35",0xCDB6],
+  ["8334BC36",0xCDB7],
+  ["8334BC37",0xCDB8],
+  ["8334BC38",0xCDB9],
+  ["8334BC39",0xCDBA],
+  ["8334BD30",0xCDBB],
+  ["8334BD31",0xCDBC],
+  ["8334BD32",0xCDBD],
+  ["8334BD33",0xCDBE],
+  ["8334BD34",0xCDBF],
+  ["8334BD35",0xCDC0],
+  ["8334BD36",0xCDC1],
+  ["8334BD37",0xCDC2],
+  ["8334BD38",0xCDC3],
+  ["8334BD39",0xCDC4],
+  ["8334BE30",0xCDC5],
+  ["8334BE31",0xCDC6],
+  ["8334BE32",0xCDC7],
+  ["8334BE33",0xCDC8],
+  ["8334BE34",0xCDC9],
+  ["8334BE35",0xCDCA],
+  ["8334BE36",0xCDCB],
+  ["8334BE37",0xCDCC],
+  ["8334BE38",0xCDCD],
+  ["8334BE39",0xCDCE],
+  ["8334BF30",0xCDCF],
+  ["8334BF31",0xCDD0],
+  ["8334BF32",0xCDD1],
+  ["8334BF33",0xCDD2],
+  ["8334BF34",0xCDD3],
+  ["8334BF35",0xCDD4],
+  ["8334BF36",0xCDD5],
+  ["8334BF37",0xCDD6],
+  ["8334BF38",0xCDD7],
+  ["8334BF39",0xCDD8],
+  ["8334C030",0xCDD9],
+  ["8334C031",0xCDDA],
+  ["8334C032",0xCDDB],
+  ["8334C033",0xCDDC],
+  ["8334C034",0xCDDD],
+  ["8334C035",0xCDDE],
+  ["8334C036",0xCDDF],
+  ["8334C037",0xCDE0],
+  ["8334C038",0xCDE1],
+  ["8334C039",0xCDE2],
+  ["8334C130",0xCDE3],
+  ["8334C131",0xCDE4],
+  ["8334C132",0xCDE5],
+  ["8334C133",0xCDE6],
+  ["8334C134",0xCDE7],
+  ["8334C135",0xCDE8],
+  ["8334C136",0xCDE9],
+  ["8334C137",0xCDEA],
+  ["8334C138",0xCDEB],
+  ["8334C139",0xCDEC],
+  ["8334C230",0xCDED],
+  ["8334C231",0xCDEE],
+  ["8334C232",0xCDEF],
+  ["8334C233",0xCDF0],
+  ["8334C234",0xCDF1],
+  ["8334C235",0xCDF2],
+  ["8334C236",0xCDF3],
+  ["8334C237",0xCDF4],
+  ["8334C238",0xCDF5],
+  ["8334C239",0xCDF6],
+  ["8334C330",0xCDF7],
+  ["8334C331",0xCDF8],
+  ["8334C332",0xCDF9],
+  ["8334C333",0xCDFA],
+  ["8334C334",0xCDFB],
+  ["8334C335",0xCDFC],
+  ["8334C336",0xCDFD],
+  ["8334C337",0xCDFE],
+  ["8334C338",0xCDFF],
+  ["8334C339",0xCE00],
+  ["8334C430",0xCE01],
+  ["8334C431",0xCE02],
+  ["8334C432",0xCE03],
+  ["8334C433",0xCE04],
+  ["8334C434",0xCE05],
+  ["8334C435",0xCE06],
+  ["8334C436",0xCE07],
+  ["8334C437",0xCE08],
+  ["8334C438",0xCE09],
+  ["8334C439",0xCE0A],
+  ["8334C530",0xCE0B],
+  ["8334C531",0xCE0C],
+  ["8334C532",0xCE0D],
+  ["8334C533",0xCE0E],
+  ["8334C534",0xCE0F],
+  ["8334C535",0xCE10],
+  ["8334C536",0xCE11],
+  ["8334C537",0xCE12],
+  ["8334C538",0xCE13],
+  ["8334C539",0xCE14],
+  ["8334C630",0xCE15],
+  ["8334C631",0xCE16],
+  ["8334C632",0xCE17],
+  ["8334C633",0xCE18],
+  ["8334C634",0xCE19],
+  ["8334C635",0xCE1A],
+  ["8334C636",0xCE1B],
+  ["8334C637",0xCE1C],
+  ["8334C638",0xCE1D],
+  ["8334C639",0xCE1E],
+  ["8334C730",0xCE1F],
+  ["8334C731",0xCE20],
+  ["8334C732",0xCE21],
+  ["8334C733",0xCE22],
+  ["8334C734",0xCE23],
+  ["8334C735",0xCE24],
+  ["8334C736",0xCE25],
+  ["8334C737",0xCE26],
+  ["8334C738",0xCE27],
+  ["8334C739",0xCE28],
+  ["8334C830",0xCE29],
+  ["8334C831",0xCE2A],
+  ["8334C832",0xCE2B],
+  ["8334C833",0xCE2C],
+  ["8334C834",0xCE2D],
+  ["8334C835",0xCE2E],
+  ["8334C836",0xCE2F],
+  ["8334C837",0xCE30],
+  ["8334C838",0xCE31],
+  ["8334C839",0xCE32],
+  ["8334C930",0xCE33],
+  ["8334C931",0xCE34],
+  ["8334C932",0xCE35],
+  ["8334C933",0xCE36],
+  ["8334C934",0xCE37],
+  ["8334C935",0xCE38],
+  ["8334C936",0xCE39],
+  ["8334C937",0xCE3A],
+  ["8334C938",0xCE3B],
+  ["8334C939",0xCE3C],
+  ["8334CA30",0xCE3D],
+  ["8334CA31",0xCE3E],
+  ["8334CA32",0xCE3F],
+  ["8334CA33",0xCE40],
+  ["8334CA34",0xCE41],
+  ["8334CA35",0xCE42],
+  ["8334CA36",0xCE43],
+  ["8334CA37",0xCE44],
+  ["8334CA38",0xCE45],
+  ["8334CA39",0xCE46],
+  ["8334CB30",0xCE47],
+  ["8334CB31",0xCE48],
+  ["8334CB32",0xCE49],
+  ["8334CB33",0xCE4A],
+  ["8334CB34",0xCE4B],
+  ["8334CB35",0xCE4C],
+  ["8334CB36",0xCE4D],
+  ["8334CB37",0xCE4E],
+  ["8334CB38",0xCE4F],
+  ["8334CB39",0xCE50],
+  ["8334CC30",0xCE51],
+  ["8334CC31",0xCE52],
+  ["8334CC32",0xCE53],
+  ["8334CC33",0xCE54],
+  ["8334CC34",0xCE55],
+  ["8334CC35",0xCE56],
+  ["8334CC36",0xCE57],
+  ["8334CC37",0xCE58],
+  ["8334CC38",0xCE59],
+  ["8334CC39",0xCE5A],
+  ["8334CD30",0xCE5B],
+  ["8334CD31",0xCE5C],
+  ["8334CD32",0xCE5D],
+  ["8334CD33",0xCE5E],
+  ["8334CD34",0xCE5F],
+  ["8334CD35",0xCE60],
+  ["8334CD36",0xCE61],
+  ["8334CD37",0xCE62],
+  ["8334CD38",0xCE63],
+  ["8334CD39",0xCE64],
+  ["8334CE30",0xCE65],
+  ["8334CE31",0xCE66],
+  ["8334CE32",0xCE67],
+  ["8334CE33",0xCE68],
+  ["8334CE34",0xCE69],
+  ["8334CE35",0xCE6A],
+  ["8334CE36",0xCE6B],
+  ["8334CE37",0xCE6C],
+  ["8334CE38",0xCE6D],
+  ["8334CE39",0xCE6E],
+  ["8334CF30",0xCE6F],
+  ["8334CF31",0xCE70],
+  ["8334CF32",0xCE71],
+  ["8334CF33",0xCE72],
+  ["8334CF34",0xCE73],
+  ["8334CF35",0xCE74],
+  ["8334CF36",0xCE75],
+  ["8334CF37",0xCE76],
+  ["8334CF38",0xCE77],
+  ["8334CF39",0xCE78],
+  ["8334D030",0xCE79],
+  ["8334D031",0xCE7A],
+  ["8334D032",0xCE7B],
+  ["8334D033",0xCE7C],
+  ["8334D034",0xCE7D],
+  ["8334D035",0xCE7E],
+  ["8334D036",0xCE7F],
+  ["8334D037",0xCE80],
+  ["8334D038",0xCE81],
+  ["8334D039",0xCE82],
+  ["8334D130",0xCE83],
+  ["8334D131",0xCE84],
+  ["8334D132",0xCE85],
+  ["8334D133",0xCE86],
+  ["8334D134",0xCE87],
+  ["8334D135",0xCE88],
+  ["8334D136",0xCE89],
+  ["8334D137",0xCE8A],
+  ["8334D138",0xCE8B],
+  ["8334D139",0xCE8C],
+  ["8334D230",0xCE8D],
+  ["8334D231",0xCE8E],
+  ["8334D232",0xCE8F],
+  ["8334D233",0xCE90],
+  ["8334D234",0xCE91],
+  ["8334D235",0xCE92],
+  ["8334D236",0xCE93],
+  ["8334D237",0xCE94],
+  ["8334D238",0xCE95],
+  ["8334D239",0xCE96],
+  ["8334D330",0xCE97],
+  ["8334D331",0xCE98],
+  ["8334D332",0xCE99],
+  ["8334D333",0xCE9A],
+  ["8334D334",0xCE9B],
+  ["8334D335",0xCE9C],
+  ["8334D336",0xCE9D],
+  ["8334D337",0xCE9E],
+  ["8334D338",0xCE9F],
+  ["8334D339",0xCEA0],
+  ["8334D430",0xCEA1],
+  ["8334D431",0xCEA2],
+  ["8334D432",0xCEA3],
+  ["8334D433",0xCEA4],
+  ["8334D434",0xCEA5],
+  ["8334D435",0xCEA6],
+  ["8334D436",0xCEA7],
+  ["8334D437",0xCEA8],
+  ["8334D438",0xCEA9],
+  ["8334D439",0xCEAA],
+  ["8334D530",0xCEAB],
+  ["8334D531",0xCEAC],
+  ["8334D532",0xCEAD],
+  ["8334D533",0xCEAE],
+  ["8334D534",0xCEAF],
+  ["8334D535",0xCEB0],
+  ["8334D536",0xCEB1],
+  ["8334D537",0xCEB2],
+  ["8334D538",0xCEB3],
+  ["8334D539",0xCEB4],
+  ["8334D630",0xCEB5],
+  ["8334D631",0xCEB6],
+  ["8334D632",0xCEB7],
+  ["8334D633",0xCEB8],
+  ["8334D634",0xCEB9],
+  ["8334D635",0xCEBA],
+  ["8334D636",0xCEBB],
+  ["8334D637",0xCEBC],
+  ["8334D638",0xCEBD],
+  ["8334D639",0xCEBE],
+  ["8334D730",0xCEBF],
+  ["8334D731",0xCEC0],
+  ["8334D732",0xCEC1],
+  ["8334D733",0xCEC2],
+  ["8334D734",0xCEC3],
+  ["8334D735",0xCEC4],
+  ["8334D736",0xCEC5],
+  ["8334D737",0xCEC6],
+  ["8334D738",0xCEC7],
+  ["8334D739",0xCEC8],
+  ["8334D830",0xCEC9],
+  ["8334D831",0xCECA],
+  ["8334D832",0xCECB],
+  ["8334D833",0xCECC],
+  ["8334D834",0xCECD],
+  ["8334D835",0xCECE],
+  ["8334D836",0xCECF],
+  ["8334D837",0xCED0],
+  ["8334D838",0xCED1],
+  ["8334D839",0xCED2],
+  ["8334D930",0xCED3],
+  ["8334D931",0xCED4],
+  ["8334D932",0xCED5],
+  ["8334D933",0xCED6],
+  ["8334D934",0xCED7],
+  ["8334D935",0xCED8],
+  ["8334D936",0xCED9],
+  ["8334D937",0xCEDA],
+  ["8334D938",0xCEDB],
+  ["8334D939",0xCEDC],
+  ["8334DA30",0xCEDD],
+  ["8334DA31",0xCEDE],
+  ["8334DA32",0xCEDF],
+  ["8334DA33",0xCEE0],
+  ["8334DA34",0xCEE1],
+  ["8334DA35",0xCEE2],
+  ["8334DA36",0xCEE3],
+  ["8334DA37",0xCEE4],
+  ["8334DA38",0xCEE5],
+  ["8334DA39",0xCEE6],
+  ["8334DB30",0xCEE7],
+  ["8334DB31",0xCEE8],
+  ["8334DB32",0xCEE9],
+  ["8334DB33",0xCEEA],
+  ["8334DB34",0xCEEB],
+  ["8334DB35",0xCEEC],
+  ["8334DB36",0xCEED],
+  ["8334DB37",0xCEEE],
+  ["8334DB38",0xCEEF],
+  ["8334DB39",0xCEF0],
+  ["8334DC30",0xCEF1],
+  ["8334DC31",0xCEF2],
+  ["8334DC32",0xCEF3],
+  ["8334DC33",0xCEF4],
+  ["8334DC34",0xCEF5],
+  ["8334DC35",0xCEF6],
+  ["8334DC36",0xCEF7],
+  ["8334DC37",0xCEF8],
+  ["8334DC38",0xCEF9],
+  ["8334DC39",0xCEFA],
+  ["8334DD30",0xCEFB],
+  ["8334DD31",0xCEFC],
+  ["8334DD32",0xCEFD],
+  ["8334DD33",0xCEFE],
+  ["8334DD34",0xCEFF],
+  ["8334DD35",0xCF00],
+  ["8334DD36",0xCF01],
+  ["8334DD37",0xCF02],
+  ["8334DD38",0xCF03],
+  ["8334DD39",0xCF04],
+  ["8334DE30",0xCF05],
+  ["8334DE31",0xCF06],
+  ["8334DE32",0xCF07],
+  ["8334DE33",0xCF08],
+  ["8334DE34",0xCF09],
+  ["8334DE35",0xCF0A],
+  ["8334DE36",0xCF0B],
+  ["8334DE37",0xCF0C],
+  ["8334DE38",0xCF0D],
+  ["8334DE39",0xCF0E],
+  ["8334DF30",0xCF0F],
+  ["8334DF31",0xCF10],
+  ["8334DF32",0xCF11],
+  ["8334DF33",0xCF12],
+  ["8334DF34",0xCF13],
+  ["8334DF35",0xCF14],
+  ["8334DF36",0xCF15],
+  ["8334DF37",0xCF16],
+  ["8334DF38",0xCF17],
+  ["8334DF39",0xCF18],
+  ["8334E030",0xCF19],
+  ["8334E031",0xCF1A],
+  ["8334E032",0xCF1B],
+  ["8334E033",0xCF1C],
+  ["8334E034",0xCF1D],
+  ["8334E035",0xCF1E],
+  ["8334E036",0xCF1F],
+  ["8334E037",0xCF20],
+  ["8334E038",0xCF21],
+  ["8334E039",0xCF22],
+  ["8334E130",0xCF23],
+  ["8334E131",0xCF24],
+  ["8334E132",0xCF25],
+  ["8334E133",0xCF26],
+  ["8334E134",0xCF27],
+  ["8334E135",0xCF28],
+  ["8334E136",0xCF29],
+  ["8334E137",0xCF2A],
+  ["8334E138",0xCF2B],
+  ["8334E139",0xCF2C],
+  ["8334E230",0xCF2D],
+  ["8334E231",0xCF2E],
+  ["8334E232",0xCF2F],
+  ["8334E233",0xCF30],
+  ["8334E234",0xCF31],
+  ["8334E235",0xCF32],
+  ["8334E236",0xCF33],
+  ["8334E237",0xCF34],
+  ["8334E238",0xCF35],
+  ["8334E239",0xCF36],
+  ["8334E330",0xCF37],
+  ["8334E331",0xCF38],
+  ["8334E332",0xCF39],
+  ["8334E333",0xCF3A],
+  ["8334E334",0xCF3B],
+  ["8334E335",0xCF3C],
+  ["8334E336",0xCF3D],
+  ["8334E337",0xCF3E],
+  ["8334E338",0xCF3F],
+  ["8334E339",0xCF40],
+  ["8334E430",0xCF41],
+  ["8334E431",0xCF42],
+  ["8334E432",0xCF43],
+  ["8334E433",0xCF44],
+  ["8334E434",0xCF45],
+  ["8334E435",0xCF46],
+  ["8334E436",0xCF47],
+  ["8334E437",0xCF48],
+  ["8334E438",0xCF49],
+  ["8334E439",0xCF4A],
+  ["8334E530",0xCF4B],
+  ["8334E531",0xCF4C],
+  ["8334E532",0xCF4D],
+  ["8334E533",0xCF4E],
+  ["8334E534",0xCF4F],
+  ["8334E535",0xCF50],
+  ["8334E536",0xCF51],
+  ["8334E537",0xCF52],
+  ["8334E538",0xCF53],
+  ["8334E539",0xCF54],
+  ["8334E630",0xCF55],
+  ["8334E631",0xCF56],
+  ["8334E632",0xCF57],
+  ["8334E633",0xCF58],
+  ["8334E634",0xCF59],
+  ["8334E635",0xCF5A],
+  ["8334E636",0xCF5B],
+  ["8334E637",0xCF5C],
+  ["8334E638",0xCF5D],
+  ["8334E639",0xCF5E],
+  ["8334E730",0xCF5F],
+  ["8334E731",0xCF60],
+  ["8334E732",0xCF61],
+  ["8334E733",0xCF62],
+  ["8334E734",0xCF63],
+  ["8334E735",0xCF64],
+  ["8334E736",0xCF65],
+  ["8334E737",0xCF66],
+  ["8334E738",0xCF67],
+  ["8334E739",0xCF68],
+  ["8334E830",0xCF69],
+  ["8334E831",0xCF6A],
+  ["8334E832",0xCF6B],
+  ["8334E833",0xCF6C],
+  ["8334E834",0xCF6D],
+  ["8334E835",0xCF6E],
+  ["8334E836",0xCF6F],
+  ["8334E837",0xCF70],
+  ["8334E838",0xCF71],
+  ["8334E839",0xCF72],
+  ["8334E930",0xCF73],
+  ["8334E931",0xCF74],
+  ["8334E932",0xCF75],
+  ["8334E933",0xCF76],
+  ["8334E934",0xCF77],
+  ["8334E935",0xCF78],
+  ["8334E936",0xCF79],
+  ["8334E937",0xCF7A],
+  ["8334E938",0xCF7B],
+  ["8334E939",0xCF7C],
+  ["8334EA30",0xCF7D],
+  ["8334EA31",0xCF7E],
+  ["8334EA32",0xCF7F],
+  ["8334EA33",0xCF80],
+  ["8334EA34",0xCF81],
+  ["8334EA35",0xCF82],
+  ["8334EA36",0xCF83],
+  ["8334EA37",0xCF84],
+  ["8334EA38",0xCF85],
+  ["8334EA39",0xCF86],
+  ["8334EB30",0xCF87],
+  ["8334EB31",0xCF88],
+  ["8334EB32",0xCF89],
+  ["8334EB33",0xCF8A],
+  ["8334EB34",0xCF8B],
+  ["8334EB35",0xCF8C],
+  ["8334EB36",0xCF8D],
+  ["8334EB37",0xCF8E],
+  ["8334EB38",0xCF8F],
+  ["8334EB39",0xCF90],
+  ["8334EC30",0xCF91],
+  ["8334EC31",0xCF92],
+  ["8334EC32",0xCF93],
+  ["8334EC33",0xCF94],
+  ["8334EC34",0xCF95],
+  ["8334EC35",0xCF96],
+  ["8334EC36",0xCF97],
+  ["8334EC37",0xCF98],
+  ["8334EC38",0xCF99],
+  ["8334EC39",0xCF9A],
+  ["8334ED30",0xCF9B],
+  ["8334ED31",0xCF9C],
+  ["8334ED32",0xCF9D],
+  ["8334ED33",0xCF9E],
+  ["8334ED34",0xCF9F],
+  ["8334ED35",0xCFA0],
+  ["8334ED36",0xCFA1],
+  ["8334ED37",0xCFA2],
+  ["8334ED38",0xCFA3],
+  ["8334ED39",0xCFA4],
+  ["8334EE30",0xCFA5],
+  ["8334EE31",0xCFA6],
+  ["8334EE32",0xCFA7],
+  ["8334EE33",0xCFA8],
+  ["8334EE34",0xCFA9],
+  ["8334EE35",0xCFAA],
+  ["8334EE36",0xCFAB],
+  ["8334EE37",0xCFAC],
+  ["8334EE38",0xCFAD],
+  ["8334EE39",0xCFAE],
+  ["8334EF30",0xCFAF],
+  ["8334EF31",0xCFB0],
+  ["8334EF32",0xCFB1],
+  ["8334EF33",0xCFB2],
+  ["8334EF34",0xCFB3],
+  ["8334EF35",0xCFB4],
+  ["8334EF36",0xCFB5],
+  ["8334EF37",0xCFB6],
+  ["8334EF38",0xCFB7],
+  ["8334EF39",0xCFB8],
+  ["8334F030",0xCFB9],
+  ["8334F031",0xCFBA],
+  ["8334F032",0xCFBB],
+  ["8334F033",0xCFBC],
+  ["8334F034",0xCFBD],
+  ["8334F035",0xCFBE],
+  ["8334F036",0xCFBF],
+  ["8334F037",0xCFC0],
+  ["8334F038",0xCFC1],
+  ["8334F039",0xCFC2],
+  ["8334F130",0xCFC3],
+  ["8334F131",0xCFC4],
+  ["8334F132",0xCFC5],
+  ["8334F133",0xCFC6],
+  ["8334F134",0xCFC7],
+  ["8334F135",0xCFC8],
+  ["8334F136",0xCFC9],
+  ["8334F137",0xCFCA],
+  ["8334F138",0xCFCB],
+  ["8334F139",0xCFCC],
+  ["8334F230",0xCFCD],
+  ["8334F231",0xCFCE],
+  ["8334F232",0xCFCF],
+  ["8334F233",0xCFD0],
+  ["8334F234",0xCFD1],
+  ["8334F235",0xCFD2],
+  ["8334F236",0xCFD3],
+  ["8334F237",0xCFD4],
+  ["8334F238",0xCFD5],
+  ["8334F239",0xCFD6],
+  ["8334F330",0xCFD7],
+  ["8334F331",0xCFD8],
+  ["8334F332",0xCFD9],
+  ["8334F333",0xCFDA],
+  ["8334F334",0xCFDB],
+  ["8334F335",0xCFDC],
+  ["8334F336",0xCFDD],
+  ["8334F337",0xCFDE],
+  ["8334F338",0xCFDF],
+  ["8334F339",0xCFE0],
+  ["8334F430",0xCFE1],
+  ["8334F431",0xCFE2],
+  ["8334F432",0xCFE3],
+  ["8334F433",0xCFE4],
+  ["8334F434",0xCFE5],
+  ["8334F435",0xCFE6],
+  ["8334F436",0xCFE7],
+  ["8334F437",0xCFE8],
+  ["8334F438",0xCFE9],
+  ["8334F439",0xCFEA],
+  ["8334F530",0xCFEB],
+  ["8334F531",0xCFEC],
+  ["8334F532",0xCFED],
+  ["8334F533",0xCFEE],
+  ["8334F534",0xCFEF],
+  ["8334F535",0xCFF0],
+  ["8334F536",0xCFF1],
+  ["8334F537",0xCFF2],
+  ["8334F538",0xCFF3],
+  ["8334F539",0xCFF4],
+  ["8334F630",0xCFF5],
+  ["8334F631",0xCFF6],
+  ["8334F632",0xCFF7],
+  ["8334F633",0xCFF8],
+  ["8334F634",0xCFF9],
+  ["8334F635",0xCFFA],
+  ["8334F636",0xCFFB],
+  ["8334F637",0xCFFC],
+  ["8334F638",0xCFFD],
+  ["8334F639",0xCFFE],
+  ["8334F730",0xCFFF],
+  ["8334F731",0xD000],
+  ["8334F732",0xD001],
+  ["8334F733",0xD002],
+  ["8334F734",0xD003],
+  ["8334F735",0xD004],
+  ["8334F736",0xD005],
+  ["8334F737",0xD006],
+  ["8334F738",0xD007],
+  ["8334F739",0xD008],
+  ["8334F830",0xD009],
+  ["8334F831",0xD00A],
+  ["8334F832",0xD00B],
+  ["8334F833",0xD00C],
+  ["8334F834",0xD00D],
+  ["8334F835",0xD00E],
+  ["8334F836",0xD00F],
+  ["8334F837",0xD010],
+  ["8334F838",0xD011],
+  ["8334F839",0xD012],
+  ["8334F930",0xD013],
+  ["8334F931",0xD014],
+  ["8334F932",0xD015],
+  ["8334F933",0xD016],
+  ["8334F934",0xD017],
+  ["8334F935",0xD018],
+  ["8334F936",0xD019],
+  ["8334F937",0xD01A],
+  ["8334F938",0xD01B],
+  ["8334F939",0xD01C],
+  ["8334FA30",0xD01D],
+  ["8334FA31",0xD01E],
+  ["8334FA32",0xD01F],
+  ["8334FA33",0xD020],
+  ["8334FA34",0xD021],
+  ["8334FA35",0xD022],
+  ["8334FA36",0xD023],
+  ["8334FA37",0xD024],
+  ["8334FA38",0xD025],
+  ["8334FA39",0xD026],
+  ["8334FB30",0xD027],
+  ["8334FB31",0xD028],
+  ["8334FB32",0xD029],
+  ["8334FB33",0xD02A],
+  ["8334FB34",0xD02B],
+  ["8334FB35",0xD02C],
+  ["8334FB36",0xD02D],
+  ["8334FB37",0xD02E],
+  ["8334FB38",0xD02F],
+  ["8334FB39",0xD030],
+  ["8334FC30",0xD031],
+  ["8334FC31",0xD032],
+  ["8334FC32",0xD033],
+  ["8334FC33",0xD034],
+  ["8334FC34",0xD035],
+  ["8334FC35",0xD036],
+  ["8334FC36",0xD037],
+  ["8334FC37",0xD038],
+  ["8334FC38",0xD039],
+  ["8334FC39",0xD03A],
+  ["8334FD30",0xD03B],
+  ["8334FD31",0xD03C],
+  ["8334FD32",0xD03D],
+  ["8334FD33",0xD03E],
+  ["8334FD34",0xD03F],
+  ["8334FD35",0xD040],
+  ["8334FD36",0xD041],
+  ["8334FD37",0xD042],
+  ["8334FD38",0xD043],
+  ["8334FD39",0xD044],
+  ["8334FE30",0xD045],
+  ["8334FE31",0xD046],
+  ["8334FE32",0xD047],
+  ["8334FE33",0xD048],
+  ["8334FE34",0xD049],
+  ["8334FE35",0xD04A],
+  ["8334FE36",0xD04B],
+  ["8334FE37",0xD04C],
+  ["8334FE38",0xD04D],
+  ["8334FE39",0xD04E],
+  ["83358130",0xD04F],
+  ["83358131",0xD050],
+  ["83358132",0xD051],
+  ["83358133",0xD052],
+  ["83358134",0xD053],
+  ["83358135",0xD054],
+  ["83358136",0xD055],
+  ["83358137",0xD056],
+  ["83358138",0xD057],
+  ["83358139",0xD058],
+  ["83358230",0xD059],
+  ["83358231",0xD05A],
+  ["83358232",0xD05B],
+  ["83358233",0xD05C],
+  ["83358234",0xD05D],
+  ["83358235",0xD05E],
+  ["83358236",0xD05F],
+  ["83358237",0xD060],
+  ["83358238",0xD061],
+  ["83358239",0xD062],
+  ["83358330",0xD063],
+  ["83358331",0xD064],
+  ["83358332",0xD065],
+  ["83358333",0xD066],
+  ["83358334",0xD067],
+  ["83358335",0xD068],
+  ["83358336",0xD069],
+  ["83358337",0xD06A],
+  ["83358338",0xD06B],
+  ["83358339",0xD06C],
+  ["83358430",0xD06D],
+  ["83358431",0xD06E],
+  ["83358432",0xD06F],
+  ["83358433",0xD070],
+  ["83358434",0xD071],
+  ["83358435",0xD072],
+  ["83358436",0xD073],
+  ["83358437",0xD074],
+  ["83358438",0xD075],
+  ["83358439",0xD076],
+  ["83358530",0xD077],
+  ["83358531",0xD078],
+  ["83358532",0xD079],
+  ["83358533",0xD07A],
+  ["83358534",0xD07B],
+  ["83358535",0xD07C],
+  ["83358536",0xD07D],
+  ["83358537",0xD07E],
+  ["83358538",0xD07F],
+  ["83358539",0xD080],
+  ["83358630",0xD081],
+  ["83358631",0xD082],
+  ["83358632",0xD083],
+  ["83358633",0xD084],
+  ["83358634",0xD085],
+  ["83358635",0xD086],
+  ["83358636",0xD087],
+  ["83358637",0xD088],
+  ["83358638",0xD089],
+  ["83358639",0xD08A],
+  ["83358730",0xD08B],
+  ["83358731",0xD08C],
+  ["83358732",0xD08D],
+  ["83358733",0xD08E],
+  ["83358734",0xD08F],
+  ["83358735",0xD090],
+  ["83358736",0xD091],
+  ["83358737",0xD092],
+  ["83358738",0xD093],
+  ["83358739",0xD094],
+  ["83358830",0xD095],
+  ["83358831",0xD096],
+  ["83358832",0xD097],
+  ["83358833",0xD098],
+  ["83358834",0xD099],
+  ["83358835",0xD09A],
+  ["83358836",0xD09B],
+  ["83358837",0xD09C],
+  ["83358838",0xD09D],
+  ["83358839",0xD09E],
+  ["83358930",0xD09F],
+  ["83358931",0xD0A0],
+  ["83358932",0xD0A1],
+  ["83358933",0xD0A2],
+  ["83358934",0xD0A3],
+  ["83358935",0xD0A4],
+  ["83358936",0xD0A5],
+  ["83358937",0xD0A6],
+  ["83358938",0xD0A7],
+  ["83358939",0xD0A8],
+  ["83358A30",0xD0A9],
+  ["83358A31",0xD0AA],
+  ["83358A32",0xD0AB],
+  ["83358A33",0xD0AC],
+  ["83358A34",0xD0AD],
+  ["83358A35",0xD0AE],
+  ["83358A36",0xD0AF],
+  ["83358A37",0xD0B0],
+  ["83358A38",0xD0B1],
+  ["83358A39",0xD0B2],
+  ["83358B30",0xD0B3],
+  ["83358B31",0xD0B4],
+  ["83358B32",0xD0B5],
+  ["83358B33",0xD0B6],
+  ["83358B34",0xD0B7],
+  ["83358B35",0xD0B8],
+  ["83358B36",0xD0B9],
+  ["83358B37",0xD0BA],
+  ["83358B38",0xD0BB],
+  ["83358B39",0xD0BC],
+  ["83358C30",0xD0BD],
+  ["83358C31",0xD0BE],
+  ["83358C32",0xD0BF],
+  ["83358C33",0xD0C0],
+  ["83358C34",0xD0C1],
+  ["83358C35",0xD0C2],
+  ["83358C36",0xD0C3],
+  ["83358C37",0xD0C4],
+  ["83358C38",0xD0C5],
+  ["83358C39",0xD0C6],
+  ["83358D30",0xD0C7],
+  ["83358D31",0xD0C8],
+  ["83358D32",0xD0C9],
+  ["83358D33",0xD0CA],
+  ["83358D34",0xD0CB],
+  ["83358D35",0xD0CC],
+  ["83358D36",0xD0CD],
+  ["83358D37",0xD0CE],
+  ["83358D38",0xD0CF],
+  ["83358D39",0xD0D0],
+  ["83358E30",0xD0D1],
+  ["83358E31",0xD0D2],
+  ["83358E32",0xD0D3],
+  ["83358E33",0xD0D4],
+  ["83358E34",0xD0D5],
+  ["83358E35",0xD0D6],
+  ["83358E36",0xD0D7],
+  ["83358E37",0xD0D8],
+  ["83358E38",0xD0D9],
+  ["83358E39",0xD0DA],
+  ["83358F30",0xD0DB],
+  ["83358F31",0xD0DC],
+  ["83358F32",0xD0DD],
+  ["83358F33",0xD0DE],
+  ["83358F34",0xD0DF],
+  ["83358F35",0xD0E0],
+  ["83358F36",0xD0E1],
+  ["83358F37",0xD0E2],
+  ["83358F38",0xD0E3],
+  ["83358F39",0xD0E4],
+  ["83359030",0xD0E5],
+  ["83359031",0xD0E6],
+  ["83359032",0xD0E7],
+  ["83359033",0xD0E8],
+  ["83359034",0xD0E9],
+  ["83359035",0xD0EA],
+  ["83359036",0xD0EB],
+  ["83359037",0xD0EC],
+  ["83359038",0xD0ED],
+  ["83359039",0xD0EE],
+  ["83359130",0xD0EF],
+  ["83359131",0xD0F0],
+  ["83359132",0xD0F1],
+  ["83359133",0xD0F2],
+  ["83359134",0xD0F3],
+  ["83359135",0xD0F4],
+  ["83359136",0xD0F5],
+  ["83359137",0xD0F6],
+  ["83359138",0xD0F7],
+  ["83359139",0xD0F8],
+  ["83359230",0xD0F9],
+  ["83359231",0xD0FA],
+  ["83359232",0xD0FB],
+  ["83359233",0xD0FC],
+  ["83359234",0xD0FD],
+  ["83359235",0xD0FE],
+  ["83359236",0xD0FF],
+  ["83359237",0xD100],
+  ["83359238",0xD101],
+  ["83359239",0xD102],
+  ["83359330",0xD103],
+  ["83359331",0xD104],
+  ["83359332",0xD105],
+  ["83359333",0xD106],
+  ["83359334",0xD107],
+  ["83359335",0xD108],
+  ["83359336",0xD109],
+  ["83359337",0xD10A],
+  ["83359338",0xD10B],
+  ["83359339",0xD10C],
+  ["83359430",0xD10D],
+  ["83359431",0xD10E],
+  ["83359432",0xD10F],
+  ["83359433",0xD110],
+  ["83359434",0xD111],
+  ["83359435",0xD112],
+  ["83359436",0xD113],
+  ["83359437",0xD114],
+  ["83359438",0xD115],
+  ["83359439",0xD116],
+  ["83359530",0xD117],
+  ["83359531",0xD118],
+  ["83359532",0xD119],
+  ["83359533",0xD11A],
+  ["83359534",0xD11B],
+  ["83359535",0xD11C],
+  ["83359536",0xD11D],
+  ["83359537",0xD11E],
+  ["83359538",0xD11F],
+  ["83359539",0xD120],
+  ["83359630",0xD121],
+  ["83359631",0xD122],
+  ["83359632",0xD123],
+  ["83359633",0xD124],
+  ["83359634",0xD125],
+  ["83359635",0xD126],
+  ["83359636",0xD127],
+  ["83359637",0xD128],
+  ["83359638",0xD129],
+  ["83359639",0xD12A],
+  ["83359730",0xD12B],
+  ["83359731",0xD12C],
+  ["83359732",0xD12D],
+  ["83359733",0xD12E],
+  ["83359734",0xD12F],
+  ["83359735",0xD130],
+  ["83359736",0xD131],
+  ["83359737",0xD132],
+  ["83359738",0xD133],
+  ["83359739",0xD134],
+  ["83359830",0xD135],
+  ["83359831",0xD136],
+  ["83359832",0xD137],
+  ["83359833",0xD138],
+  ["83359834",0xD139],
+  ["83359835",0xD13A],
+  ["83359836",0xD13B],
+  ["83359837",0xD13C],
+  ["83359838",0xD13D],
+  ["83359839",0xD13E],
+  ["83359930",0xD13F],
+  ["83359931",0xD140],
+  ["83359932",0xD141],
+  ["83359933",0xD142],
+  ["83359934",0xD143],
+  ["83359935",0xD144],
+  ["83359936",0xD145],
+  ["83359937",0xD146],
+  ["83359938",0xD147],
+  ["83359939",0xD148],
+  ["83359A30",0xD149],
+  ["83359A31",0xD14A],
+  ["83359A32",0xD14B],
+  ["83359A33",0xD14C],
+  ["83359A34",0xD14D],
+  ["83359A35",0xD14E],
+  ["83359A36",0xD14F],
+  ["83359A37",0xD150],
+  ["83359A38",0xD151],
+  ["83359A39",0xD152],
+  ["83359B30",0xD153],
+  ["83359B31",0xD154],
+  ["83359B32",0xD155],
+  ["83359B33",0xD156],
+  ["83359B34",0xD157],
+  ["83359B35",0xD158],
+  ["83359B36",0xD159],
+  ["83359B37",0xD15A],
+  ["83359B38",0xD15B],
+  ["83359B39",0xD15C],
+  ["83359C30",0xD15D],
+  ["83359C31",0xD15E],
+  ["83359C32",0xD15F],
+  ["83359C33",0xD160],
+  ["83359C34",0xD161],
+  ["83359C35",0xD162],
+  ["83359C36",0xD163],
+  ["83359C37",0xD164],
+  ["83359C38",0xD165],
+  ["83359C39",0xD166],
+  ["83359D30",0xD167],
+  ["83359D31",0xD168],
+  ["83359D32",0xD169],
+  ["83359D33",0xD16A],
+  ["83359D34",0xD16B],
+  ["83359D35",0xD16C],
+  ["83359D36",0xD16D],
+  ["83359D37",0xD16E],
+  ["83359D38",0xD16F],
+  ["83359D39",0xD170],
+  ["83359E30",0xD171],
+  ["83359E31",0xD172],
+  ["83359E32",0xD173],
+  ["83359E33",0xD174],
+  ["83359E34",0xD175],
+  ["83359E35",0xD176],
+  ["83359E36",0xD177],
+  ["83359E37",0xD178],
+  ["83359E38",0xD179],
+  ["83359E39",0xD17A],
+  ["83359F30",0xD17B],
+  ["83359F31",0xD17C],
+  ["83359F32",0xD17D],
+  ["83359F33",0xD17E],
+  ["83359F34",0xD17F],
+  ["83359F35",0xD180],
+  ["83359F36",0xD181],
+  ["83359F37",0xD182],
+  ["83359F38",0xD183],
+  ["83359F39",0xD184],
+  ["8335A030",0xD185],
+  ["8335A031",0xD186],
+  ["8335A032",0xD187],
+  ["8335A033",0xD188],
+  ["8335A034",0xD189],
+  ["8335A035",0xD18A],
+  ["8335A036",0xD18B],
+  ["8335A037",0xD18C],
+  ["8335A038",0xD18D],
+  ["8335A039",0xD18E],
+  ["8335A130",0xD18F],
+  ["8335A131",0xD190],
+  ["8335A132",0xD191],
+  ["8335A133",0xD192],
+  ["8335A134",0xD193],
+  ["8335A135",0xD194],
+  ["8335A136",0xD195],
+  ["8335A137",0xD196],
+  ["8335A138",0xD197],
+  ["8335A139",0xD198],
+  ["8335A230",0xD199],
+  ["8335A231",0xD19A],
+  ["8335A232",0xD19B],
+  ["8335A233",0xD19C],
+  ["8335A234",0xD19D],
+  ["8335A235",0xD19E],
+  ["8335A236",0xD19F],
+  ["8335A237",0xD1A0],
+  ["8335A238",0xD1A1],
+  ["8335A239",0xD1A2],
+  ["8335A330",0xD1A3],
+  ["8335A331",0xD1A4],
+  ["8335A332",0xD1A5],
+  ["8335A333",0xD1A6],
+  ["8335A334",0xD1A7],
+  ["8335A335",0xD1A8],
+  ["8335A336",0xD1A9],
+  ["8335A337",0xD1AA],
+  ["8335A338",0xD1AB],
+  ["8335A339",0xD1AC],
+  ["8335A430",0xD1AD],
+  ["8335A431",0xD1AE],
+  ["8335A432",0xD1AF],
+  ["8335A433",0xD1B0],
+  ["8335A434",0xD1B1],
+  ["8335A435",0xD1B2],
+  ["8335A436",0xD1B3],
+  ["8335A437",0xD1B4],
+  ["8335A438",0xD1B5],
+  ["8335A439",0xD1B6],
+  ["8335A530",0xD1B7],
+  ["8335A531",0xD1B8],
+  ["8335A532",0xD1B9],
+  ["8335A533",0xD1BA],
+  ["8335A534",0xD1BB],
+  ["8335A535",0xD1BC],
+  ["8335A536",0xD1BD],
+  ["8335A537",0xD1BE],
+  ["8335A538",0xD1BF],
+  ["8335A539",0xD1C0],
+  ["8335A630",0xD1C1],
+  ["8335A631",0xD1C2],
+  ["8335A632",0xD1C3],
+  ["8335A633",0xD1C4],
+  ["8335A634",0xD1C5],
+  ["8335A635",0xD1C6],
+  ["8335A636",0xD1C7],
+  ["8335A637",0xD1C8],
+  ["8335A638",0xD1C9],
+  ["8335A639",0xD1CA],
+  ["8335A730",0xD1CB],
+  ["8335A731",0xD1CC],
+  ["8335A732",0xD1CD],
+  ["8335A733",0xD1CE],
+  ["8335A734",0xD1CF],
+  ["8335A735",0xD1D0],
+  ["8335A736",0xD1D1],
+  ["8335A737",0xD1D2],
+  ["8335A738",0xD1D3],
+  ["8335A739",0xD1D4],
+  ["8335A830",0xD1D5],
+  ["8335A831",0xD1D6],
+  ["8335A832",0xD1D7],
+  ["8335A833",0xD1D8],
+  ["8335A834",0xD1D9],
+  ["8335A835",0xD1DA],
+  ["8335A836",0xD1DB],
+  ["8335A837",0xD1DC],
+  ["8335A838",0xD1DD],
+  ["8335A839",0xD1DE],
+  ["8335A930",0xD1DF],
+  ["8335A931",0xD1E0],
+  ["8335A932",0xD1E1],
+  ["8335A933",0xD1E2],
+  ["8335A934",0xD1E3],
+  ["8335A935",0xD1E4],
+  ["8335A936",0xD1E5],
+  ["8335A937",0xD1E6],
+  ["8335A938",0xD1E7],
+  ["8335A939",0xD1E8],
+  ["8335AA30",0xD1E9],
+  ["8335AA31",0xD1EA],
+  ["8335AA32",0xD1EB],
+  ["8335AA33",0xD1EC],
+  ["8335AA34",0xD1ED],
+  ["8335AA35",0xD1EE],
+  ["8335AA36",0xD1EF],
+  ["8335AA37",0xD1F0],
+  ["8335AA38",0xD1F1],
+  ["8335AA39",0xD1F2],
+  ["8335AB30",0xD1F3],
+  ["8335AB31",0xD1F4],
+  ["8335AB32",0xD1F5],
+  ["8335AB33",0xD1F6],
+  ["8335AB34",0xD1F7],
+  ["8335AB35",0xD1F8],
+  ["8335AB36",0xD1F9],
+  ["8335AB37",0xD1FA],
+  ["8335AB38",0xD1FB],
+  ["8335AB39",0xD1FC],
+  ["8335AC30",0xD1FD],
+  ["8335AC31",0xD1FE],
+  ["8335AC32",0xD1FF],
+  ["8335AC33",0xD200],
+  ["8335AC34",0xD201],
+  ["8335AC35",0xD202],
+  ["8335AC36",0xD203],
+  ["8335AC37",0xD204],
+  ["8335AC38",0xD205],
+  ["8335AC39",0xD206],
+  ["8335AD30",0xD207],
+  ["8335AD31",0xD208],
+  ["8335AD32",0xD209],
+  ["8335AD33",0xD20A],
+  ["8335AD34",0xD20B],
+  ["8335AD35",0xD20C],
+  ["8335AD36",0xD20D],
+  ["8335AD37",0xD20E],
+  ["8335AD38",0xD20F],
+  ["8335AD39",0xD210],
+  ["8335AE30",0xD211],
+  ["8335AE31",0xD212],
+  ["8335AE32",0xD213],
+  ["8335AE33",0xD214],
+  ["8335AE34",0xD215],
+  ["8335AE35",0xD216],
+  ["8335AE36",0xD217],
+  ["8335AE37",0xD218],
+  ["8335AE38",0xD219],
+  ["8335AE39",0xD21A],
+  ["8335AF30",0xD21B],
+  ["8335AF31",0xD21C],
+  ["8335AF32",0xD21D],
+  ["8335AF33",0xD21E],
+  ["8335AF34",0xD21F],
+  ["8335AF35",0xD220],
+  ["8335AF36",0xD221],
+  ["8335AF37",0xD222],
+  ["8335AF38",0xD223],
+  ["8335AF39",0xD224],
+  ["8335B030",0xD225],
+  ["8335B031",0xD226],
+  ["8335B032",0xD227],
+  ["8335B033",0xD228],
+  ["8335B034",0xD229],
+  ["8335B035",0xD22A],
+  ["8335B036",0xD22B],
+  ["8335B037",0xD22C],
+  ["8335B038",0xD22D],
+  ["8335B039",0xD22E],
+  ["8335B130",0xD22F],
+  ["8335B131",0xD230],
+  ["8335B132",0xD231],
+  ["8335B133",0xD232],
+  ["8335B134",0xD233],
+  ["8335B135",0xD234],
+  ["8335B136",0xD235],
+  ["8335B137",0xD236],
+  ["8335B138",0xD237],
+  ["8335B139",0xD238],
+  ["8335B230",0xD239],
+  ["8335B231",0xD23A],
+  ["8335B232",0xD23B],
+  ["8335B233",0xD23C],
+  ["8335B234",0xD23D],
+  ["8335B235",0xD23E],
+  ["8335B236",0xD23F],
+  ["8335B237",0xD240],
+  ["8335B238",0xD241],
+  ["8335B239",0xD242],
+  ["8335B330",0xD243],
+  ["8335B331",0xD244],
+  ["8335B332",0xD245],
+  ["8335B333",0xD246],
+  ["8335B334",0xD247],
+  ["8335B335",0xD248],
+  ["8335B336",0xD249],
+  ["8335B337",0xD24A],
+  ["8335B338",0xD24B],
+  ["8335B339",0xD24C],
+  ["8335B430",0xD24D],
+  ["8335B431",0xD24E],
+  ["8335B432",0xD24F],
+  ["8335B433",0xD250],
+  ["8335B434",0xD251],
+  ["8335B435",0xD252],
+  ["8335B436",0xD253],
+  ["8335B437",0xD254],
+  ["8335B438",0xD255],
+  ["8335B439",0xD256],
+  ["8335B530",0xD257],
+  ["8335B531",0xD258],
+  ["8335B532",0xD259],
+  ["8335B533",0xD25A],
+  ["8335B534",0xD25B],
+  ["8335B535",0xD25C],
+  ["8335B536",0xD25D],
+  ["8335B537",0xD25E],
+  ["8335B538",0xD25F],
+  ["8335B539",0xD260],
+  ["8335B630",0xD261],
+  ["8335B631",0xD262],
+  ["8335B632",0xD263],
+  ["8335B633",0xD264],
+  ["8335B634",0xD265],
+  ["8335B635",0xD266],
+  ["8335B636",0xD267],
+  ["8335B637",0xD268],
+  ["8335B638",0xD269],
+  ["8335B639",0xD26A],
+  ["8335B730",0xD26B],
+  ["8335B731",0xD26C],
+  ["8335B732",0xD26D],
+  ["8335B733",0xD26E],
+  ["8335B734",0xD26F],
+  ["8335B735",0xD270],
+  ["8335B736",0xD271],
+  ["8335B737",0xD272],
+  ["8335B738",0xD273],
+  ["8335B739",0xD274],
+  ["8335B830",0xD275],
+  ["8335B831",0xD276],
+  ["8335B832",0xD277],
+  ["8335B833",0xD278],
+  ["8335B834",0xD279],
+  ["8335B835",0xD27A],
+  ["8335B836",0xD27B],
+  ["8335B837",0xD27C],
+  ["8335B838",0xD27D],
+  ["8335B839",0xD27E],
+  ["8335B930",0xD27F],
+  ["8335B931",0xD280],
+  ["8335B932",0xD281],
+  ["8335B933",0xD282],
+  ["8335B934",0xD283],
+  ["8335B935",0xD284],
+  ["8335B936",0xD285],
+  ["8335B937",0xD286],
+  ["8335B938",0xD287],
+  ["8335B939",0xD288],
+  ["8335BA30",0xD289],
+  ["8335BA31",0xD28A],
+  ["8335BA32",0xD28B],
+  ["8335BA33",0xD28C],
+  ["8335BA34",0xD28D],
+  ["8335BA35",0xD28E],
+  ["8335BA36",0xD28F],
+  ["8335BA37",0xD290],
+  ["8335BA38",0xD291],
+  ["8335BA39",0xD292],
+  ["8335BB30",0xD293],
+  ["8335BB31",0xD294],
+  ["8335BB32",0xD295],
+  ["8335BB33",0xD296],
+  ["8335BB34",0xD297],
+  ["8335BB35",0xD298],
+  ["8335BB36",0xD299],
+  ["8335BB37",0xD29A],
+  ["8335BB38",0xD29B],
+  ["8335BB39",0xD29C],
+  ["8335BC30",0xD29D],
+  ["8335BC31",0xD29E],
+  ["8335BC32",0xD29F],
+  ["8335BC33",0xD2A0],
+  ["8335BC34",0xD2A1],
+  ["8335BC35",0xD2A2],
+  ["8335BC36",0xD2A3],
+  ["8335BC37",0xD2A4],
+  ["8335BC38",0xD2A5],
+  ["8335BC39",0xD2A6],
+  ["8335BD30",0xD2A7],
+  ["8335BD31",0xD2A8],
+  ["8335BD32",0xD2A9],
+  ["8335BD33",0xD2AA],
+  ["8335BD34",0xD2AB],
+  ["8335BD35",0xD2AC],
+  ["8335BD36",0xD2AD],
+  ["8335BD37",0xD2AE],
+  ["8335BD38",0xD2AF],
+  ["8335BD39",0xD2B0],
+  ["8335BE30",0xD2B1],
+  ["8335BE31",0xD2B2],
+  ["8335BE32",0xD2B3],
+  ["8335BE33",0xD2B4],
+  ["8335BE34",0xD2B5],
+  ["8335BE35",0xD2B6],
+  ["8335BE36",0xD2B7],
+  ["8335BE37",0xD2B8],
+  ["8335BE38",0xD2B9],
+  ["8335BE39",0xD2BA],
+  ["8335BF30",0xD2BB],
+  ["8335BF31",0xD2BC],
+  ["8335BF32",0xD2BD],
+  ["8335BF33",0xD2BE],
+  ["8335BF34",0xD2BF],
+  ["8335BF35",0xD2C0],
+  ["8335BF36",0xD2C1],
+  ["8335BF37",0xD2C2],
+  ["8335BF38",0xD2C3],
+  ["8335BF39",0xD2C4],
+  ["8335C030",0xD2C5],
+  ["8335C031",0xD2C6],
+  ["8335C032",0xD2C7],
+  ["8335C033",0xD2C8],
+  ["8335C034",0xD2C9],
+  ["8335C035",0xD2CA],
+  ["8335C036",0xD2CB],
+  ["8335C037",0xD2CC],
+  ["8335C038",0xD2CD],
+  ["8335C039",0xD2CE],
+  ["8335C130",0xD2CF],
+  ["8335C131",0xD2D0],
+  ["8335C132",0xD2D1],
+  ["8335C133",0xD2D2],
+  ["8335C134",0xD2D3],
+  ["8335C135",0xD2D4],
+  ["8335C136",0xD2D5],
+  ["8335C137",0xD2D6],
+  ["8335C138",0xD2D7],
+  ["8335C139",0xD2D8],
+  ["8335C230",0xD2D9],
+  ["8335C231",0xD2DA],
+  ["8335C232",0xD2DB],
+  ["8335C233",0xD2DC],
+  ["8335C234",0xD2DD],
+  ["8335C235",0xD2DE],
+  ["8335C236",0xD2DF],
+  ["8335C237",0xD2E0],
+  ["8335C238",0xD2E1],
+  ["8335C239",0xD2E2],
+  ["8335C330",0xD2E3],
+  ["8335C331",0xD2E4],
+  ["8335C332",0xD2E5],
+  ["8335C333",0xD2E6],
+  ["8335C334",0xD2E7],
+  ["8335C335",0xD2E8],
+  ["8335C336",0xD2E9],
+  ["8335C337",0xD2EA],
+  ["8335C338",0xD2EB],
+  ["8335C339",0xD2EC],
+  ["8335C430",0xD2ED],
+  ["8335C431",0xD2EE],
+  ["8335C432",0xD2EF],
+  ["8335C433",0xD2F0],
+  ["8335C434",0xD2F1],
+  ["8335C435",0xD2F2],
+  ["8335C436",0xD2F3],
+  ["8335C437",0xD2F4],
+  ["8335C438",0xD2F5],
+  ["8335C439",0xD2F6],
+  ["8335C530",0xD2F7],
+  ["8335C531",0xD2F8],
+  ["8335C532",0xD2F9],
+  ["8335C533",0xD2FA],
+  ["8335C534",0xD2FB],
+  ["8335C535",0xD2FC],
+  ["8335C536",0xD2FD],
+  ["8335C537",0xD2FE],
+  ["8335C538",0xD2FF],
+  ["8335C539",0xD300],
+  ["8335C630",0xD301],
+  ["8335C631",0xD302],
+  ["8335C632",0xD303],
+  ["8335C633",0xD304],
+  ["8335C634",0xD305],
+  ["8335C635",0xD306],
+  ["8335C636",0xD307],
+  ["8335C637",0xD308],
+  ["8335C638",0xD309],
+  ["8335C639",0xD30A],
+  ["8335C730",0xD30B],
+  ["8335C731",0xD30C],
+  ["8335C732",0xD30D],
+  ["8335C733",0xD30E],
+  ["8335C734",0xD30F],
+  ["8335C735",0xD310],
+  ["8335C736",0xD311],
+  ["8335C737",0xD312],
+  ["8335C738",0xD313],
+  ["8335C739",0xD314],
+  ["8335C830",0xD315],
+  ["8335C831",0xD316],
+  ["8335C832",0xD317],
+  ["8335C833",0xD318],
+  ["8335C834",0xD319],
+  ["8335C835",0xD31A],
+  ["8335C836",0xD31B],
+  ["8335C837",0xD31C],
+  ["8335C838",0xD31D],
+  ["8335C839",0xD31E],
+  ["8335C930",0xD31F],
+  ["8335C931",0xD320],
+  ["8335C932",0xD321],
+  ["8335C933",0xD322],
+  ["8335C934",0xD323],
+  ["8335C935",0xD324],
+  ["8335C936",0xD325],
+  ["8335C937",0xD326],
+  ["8335C938",0xD327],
+  ["8335C939",0xD328],
+  ["8335CA30",0xD329],
+  ["8335CA31",0xD32A],
+  ["8335CA32",0xD32B],
+  ["8335CA33",0xD32C],
+  ["8335CA34",0xD32D],
+  ["8335CA35",0xD32E],
+  ["8335CA36",0xD32F],
+  ["8335CA37",0xD330],
+  ["8335CA38",0xD331],
+  ["8335CA39",0xD332],
+  ["8335CB30",0xD333],
+  ["8335CB31",0xD334],
+  ["8335CB32",0xD335],
+  ["8335CB33",0xD336],
+  ["8335CB34",0xD337],
+  ["8335CB35",0xD338],
+  ["8335CB36",0xD339],
+  ["8335CB37",0xD33A],
+  ["8335CB38",0xD33B],
+  ["8335CB39",0xD33C],
+  ["8335CC30",0xD33D],
+  ["8335CC31",0xD33E],
+  ["8335CC32",0xD33F],
+  ["8335CC33",0xD340],
+  ["8335CC34",0xD341],
+  ["8335CC35",0xD342],
+  ["8335CC36",0xD343],
+  ["8335CC37",0xD344],
+  ["8335CC38",0xD345],
+  ["8335CC39",0xD346],
+  ["8335CD30",0xD347],
+  ["8335CD31",0xD348],
+  ["8335CD32",0xD349],
+  ["8335CD33",0xD34A],
+  ["8335CD34",0xD34B],
+  ["8335CD35",0xD34C],
+  ["8335CD36",0xD34D],
+  ["8335CD37",0xD34E],
+  ["8335CD38",0xD34F],
+  ["8335CD39",0xD350],
+  ["8335CE30",0xD351],
+  ["8335CE31",0xD352],
+  ["8335CE32",0xD353],
+  ["8335CE33",0xD354],
+  ["8335CE34",0xD355],
+  ["8335CE35",0xD356],
+  ["8335CE36",0xD357],
+  ["8335CE37",0xD358],
+  ["8335CE38",0xD359],
+  ["8335CE39",0xD35A],
+  ["8335CF30",0xD35B],
+  ["8335CF31",0xD35C],
+  ["8335CF32",0xD35D],
+  ["8335CF33",0xD35E],
+  ["8335CF34",0xD35F],
+  ["8335CF35",0xD360],
+  ["8335CF36",0xD361],
+  ["8335CF37",0xD362],
+  ["8335CF38",0xD363],
+  ["8335CF39",0xD364],
+  ["8335D030",0xD365],
+  ["8335D031",0xD366],
+  ["8335D032",0xD367],
+  ["8335D033",0xD368],
+  ["8335D034",0xD369],
+  ["8335D035",0xD36A],
+  ["8335D036",0xD36B],
+  ["8335D037",0xD36C],
+  ["8335D038",0xD36D],
+  ["8335D039",0xD36E],
+  ["8335D130",0xD36F],
+  ["8335D131",0xD370],
+  ["8335D132",0xD371],
+  ["8335D133",0xD372],
+  ["8335D134",0xD373],
+  ["8335D135",0xD374],
+  ["8335D136",0xD375],
+  ["8335D137",0xD376],
+  ["8335D138",0xD377],
+  ["8335D139",0xD378],
+  ["8335D230",0xD379],
+  ["8335D231",0xD37A],
+  ["8335D232",0xD37B],
+  ["8335D233",0xD37C],
+  ["8335D234",0xD37D],
+  ["8335D235",0xD37E],
+  ["8335D236",0xD37F],
+  ["8335D237",0xD380],
+  ["8335D238",0xD381],
+  ["8335D239",0xD382],
+  ["8335D330",0xD383],
+  ["8335D331",0xD384],
+  ["8335D332",0xD385],
+  ["8335D333",0xD386],
+  ["8335D334",0xD387],
+  ["8335D335",0xD388],
+  ["8335D336",0xD389],
+  ["8335D337",0xD38A],
+  ["8335D338",0xD38B],
+  ["8335D339",0xD38C],
+  ["8335D430",0xD38D],
+  ["8335D431",0xD38E],
+  ["8335D432",0xD38F],
+  ["8335D433",0xD390],
+  ["8335D434",0xD391],
+  ["8335D435",0xD392],
+  ["8335D436",0xD393],
+  ["8335D437",0xD394],
+  ["8335D438",0xD395],
+  ["8335D439",0xD396],
+  ["8335D530",0xD397],
+  ["8335D531",0xD398],
+  ["8335D532",0xD399],
+  ["8335D533",0xD39A],
+  ["8335D534",0xD39B],
+  ["8335D535",0xD39C],
+  ["8335D536",0xD39D],
+  ["8335D537",0xD39E],
+  ["8335D538",0xD39F],
+  ["8335D539",0xD3A0],
+  ["8335D630",0xD3A1],
+  ["8335D631",0xD3A2],
+  ["8335D632",0xD3A3],
+  ["8335D633",0xD3A4],
+  ["8335D634",0xD3A5],
+  ["8335D635",0xD3A6],
+  ["8335D636",0xD3A7],
+  ["8335D637",0xD3A8],
+  ["8335D638",0xD3A9],
+  ["8335D639",0xD3AA],
+  ["8335D730",0xD3AB],
+  ["8335D731",0xD3AC],
+  ["8335D732",0xD3AD],
+  ["8335D733",0xD3AE],
+  ["8335D734",0xD3AF],
+  ["8335D735",0xD3B0],
+  ["8335D736",0xD3B1],
+  ["8335D737",0xD3B2],
+  ["8335D738",0xD3B3],
+  ["8335D739",0xD3B4],
+  ["8335D830",0xD3B5],
+  ["8335D831",0xD3B6],
+  ["8335D832",0xD3B7],
+  ["8335D833",0xD3B8],
+  ["8335D834",0xD3B9],
+  ["8335D835",0xD3BA],
+  ["8335D836",0xD3BB],
+  ["8335D837",0xD3BC],
+  ["8335D838",0xD3BD],
+  ["8335D839",0xD3BE],
+  ["8335D930",0xD3BF],
+  ["8335D931",0xD3C0],
+  ["8335D932",0xD3C1],
+  ["8335D933",0xD3C2],
+  ["8335D934",0xD3C3],
+  ["8335D935",0xD3C4],
+  ["8335D936",0xD3C5],
+  ["8335D937",0xD3C6],
+  ["8335D938",0xD3C7],
+  ["8335D939",0xD3C8],
+  ["8335DA30",0xD3C9],
+  ["8335DA31",0xD3CA],
+  ["8335DA32",0xD3CB],
+  ["8335DA33",0xD3CC],
+  ["8335DA34",0xD3CD],
+  ["8335DA35",0xD3CE],
+  ["8335DA36",0xD3CF],
+  ["8335DA37",0xD3D0],
+  ["8335DA38",0xD3D1],
+  ["8335DA39",0xD3D2],
+  ["8335DB30",0xD3D3],
+  ["8335DB31",0xD3D4],
+  ["8335DB32",0xD3D5],
+  ["8335DB33",0xD3D6],
+  ["8335DB34",0xD3D7],
+  ["8335DB35",0xD3D8],
+  ["8335DB36",0xD3D9],
+  ["8335DB37",0xD3DA],
+  ["8335DB38",0xD3DB],
+  ["8335DB39",0xD3DC],
+  ["8335DC30",0xD3DD],
+  ["8335DC31",0xD3DE],
+  ["8335DC32",0xD3DF],
+  ["8335DC33",0xD3E0],
+  ["8335DC34",0xD3E1],
+  ["8335DC35",0xD3E2],
+  ["8335DC36",0xD3E3],
+  ["8335DC37",0xD3E4],
+  ["8335DC38",0xD3E5],
+  ["8335DC39",0xD3E6],
+  ["8335DD30",0xD3E7],
+  ["8335DD31",0xD3E8],
+  ["8335DD32",0xD3E9],
+  ["8335DD33",0xD3EA],
+  ["8335DD34",0xD3EB],
+  ["8335DD35",0xD3EC],
+  ["8335DD36",0xD3ED],
+  ["8335DD37",0xD3EE],
+  ["8335DD38",0xD3EF],
+  ["8335DD39",0xD3F0],
+  ["8335DE30",0xD3F1],
+  ["8335DE31",0xD3F2],
+  ["8335DE32",0xD3F3],
+  ["8335DE33",0xD3F4],
+  ["8335DE34",0xD3F5],
+  ["8335DE35",0xD3F6],
+  ["8335DE36",0xD3F7],
+  ["8335DE37",0xD3F8],
+  ["8335DE38",0xD3F9],
+  ["8335DE39",0xD3FA],
+  ["8335DF30",0xD3FB],
+  ["8335DF31",0xD3FC],
+  ["8335DF32",0xD3FD],
+  ["8335DF33",0xD3FE],
+  ["8335DF34",0xD3FF],
+  ["8335DF35",0xD400],
+  ["8335DF36",0xD401],
+  ["8335DF37",0xD402],
+  ["8335DF38",0xD403],
+  ["8335DF39",0xD404],
+  ["8335E030",0xD405],
+  ["8335E031",0xD406],
+  ["8335E032",0xD407],
+  ["8335E033",0xD408],
+  ["8335E034",0xD409],
+  ["8335E035",0xD40A],
+  ["8335E036",0xD40B],
+  ["8335E037",0xD40C],
+  ["8335E038",0xD40D],
+  ["8335E039",0xD40E],
+  ["8335E130",0xD40F],
+  ["8335E131",0xD410],
+  ["8335E132",0xD411],
+  ["8335E133",0xD412],
+  ["8335E134",0xD413],
+  ["8335E135",0xD414],
+  ["8335E136",0xD415],
+  ["8335E137",0xD416],
+  ["8335E138",0xD417],
+  ["8335E139",0xD418],
+  ["8335E230",0xD419],
+  ["8335E231",0xD41A],
+  ["8335E232",0xD41B],
+  ["8335E233",0xD41C],
+  ["8335E234",0xD41D],
+  ["8335E235",0xD41E],
+  ["8335E236",0xD41F],
+  ["8335E237",0xD420],
+  ["8335E238",0xD421],
+  ["8335E239",0xD422],
+  ["8335E330",0xD423],
+  ["8335E331",0xD424],
+  ["8335E332",0xD425],
+  ["8335E333",0xD426],
+  ["8335E334",0xD427],
+  ["8335E335",0xD428],
+  ["8335E336",0xD429],
+  ["8335E337",0xD42A],
+  ["8335E338",0xD42B],
+  ["8335E339",0xD42C],
+  ["8335E430",0xD42D],
+  ["8335E431",0xD42E],
+  ["8335E432",0xD42F],
+  ["8335E433",0xD430],
+  ["8335E434",0xD431],
+  ["8335E435",0xD432],
+  ["8335E436",0xD433],
+  ["8335E437",0xD434],
+  ["8335E438",0xD435],
+  ["8335E439",0xD436],
+  ["8335E530",0xD437],
+  ["8335E531",0xD438],
+  ["8335E532",0xD439],
+  ["8335E533",0xD43A],
+  ["8335E534",0xD43B],
+  ["8335E535",0xD43C],
+  ["8335E536",0xD43D],
+  ["8335E537",0xD43E],
+  ["8335E538",0xD43F],
+  ["8335E539",0xD440],
+  ["8335E630",0xD441],
+  ["8335E631",0xD442],
+  ["8335E632",0xD443],
+  ["8335E633",0xD444],
+  ["8335E634",0xD445],
+  ["8335E635",0xD446],
+  ["8335E636",0xD447],
+  ["8335E637",0xD448],
+  ["8335E638",0xD449],
+  ["8335E639",0xD44A],
+  ["8335E730",0xD44B],
+  ["8335E731",0xD44C],
+  ["8335E732",0xD44D],
+  ["8335E733",0xD44E],
+  ["8335E734",0xD44F],
+  ["8335E735",0xD450],
+  ["8335E736",0xD451],
+  ["8335E737",0xD452],
+  ["8335E738",0xD453],
+  ["8335E739",0xD454],
+  ["8335E830",0xD455],
+  ["8335E831",0xD456],
+  ["8335E832",0xD457],
+  ["8335E833",0xD458],
+  ["8335E834",0xD459],
+  ["8335E835",0xD45A],
+  ["8335E836",0xD45B],
+  ["8335E837",0xD45C],
+  ["8335E838",0xD45D],
+  ["8335E839",0xD45E],
+  ["8335E930",0xD45F],
+  ["8335E931",0xD460],
+  ["8335E932",0xD461],
+  ["8335E933",0xD462],
+  ["8335E934",0xD463],
+  ["8335E935",0xD464],
+  ["8335E936",0xD465],
+  ["8335E937",0xD466],
+  ["8335E938",0xD467],
+  ["8335E939",0xD468],
+  ["8335EA30",0xD469],
+  ["8335EA31",0xD46A],
+  ["8335EA32",0xD46B],
+  ["8335EA33",0xD46C],
+  ["8335EA34",0xD46D],
+  ["8335EA35",0xD46E],
+  ["8335EA36",0xD46F],
+  ["8335EA37",0xD470],
+  ["8335EA38",0xD471],
+  ["8335EA39",0xD472],
+  ["8335EB30",0xD473],
+  ["8335EB31",0xD474],
+  ["8335EB32",0xD475],
+  ["8335EB33",0xD476],
+  ["8335EB34",0xD477],
+  ["8335EB35",0xD478],
+  ["8335EB36",0xD479],
+  ["8335EB37",0xD47A],
+  ["8335EB38",0xD47B],
+  ["8335EB39",0xD47C],
+  ["8335EC30",0xD47D],
+  ["8335EC31",0xD47E],
+  ["8335EC32",0xD47F],
+  ["8335EC33",0xD480],
+  ["8335EC34",0xD481],
+  ["8335EC35",0xD482],
+  ["8335EC36",0xD483],
+  ["8335EC37",0xD484],
+  ["8335EC38",0xD485],
+  ["8335EC39",0xD486],
+  ["8335ED30",0xD487],
+  ["8335ED31",0xD488],
+  ["8335ED32",0xD489],
+  ["8335ED33",0xD48A],
+  ["8335ED34",0xD48B],
+  ["8335ED35",0xD48C],
+  ["8335ED36",0xD48D],
+  ["8335ED37",0xD48E],
+  ["8335ED38",0xD48F],
+  ["8335ED39",0xD490],
+  ["8335EE30",0xD491],
+  ["8335EE31",0xD492],
+  ["8335EE32",0xD493],
+  ["8335EE33",0xD494],
+  ["8335EE34",0xD495],
+  ["8335EE35",0xD496],
+  ["8335EE36",0xD497],
+  ["8335EE37",0xD498],
+  ["8335EE38",0xD499],
+  ["8335EE39",0xD49A],
+  ["8335EF30",0xD49B],
+  ["8335EF31",0xD49C],
+  ["8335EF32",0xD49D],
+  ["8335EF33",0xD49E],
+  ["8335EF34",0xD49F],
+  ["8335EF35",0xD4A0],
+  ["8335EF36",0xD4A1],
+  ["8335EF37",0xD4A2],
+  ["8335EF38",0xD4A3],
+  ["8335EF39",0xD4A4],
+  ["8335F030",0xD4A5],
+  ["8335F031",0xD4A6],
+  ["8335F032",0xD4A7],
+  ["8335F033",0xD4A8],
+  ["8335F034",0xD4A9],
+  ["8335F035",0xD4AA],
+  ["8335F036",0xD4AB],
+  ["8335F037",0xD4AC],
+  ["8335F038",0xD4AD],
+  ["8335F039",0xD4AE],
+  ["8335F130",0xD4AF],
+  ["8335F131",0xD4B0],
+  ["8335F132",0xD4B1],
+  ["8335F133",0xD4B2],
+  ["8335F134",0xD4B3],
+  ["8335F135",0xD4B4],
+  ["8335F136",0xD4B5],
+  ["8335F137",0xD4B6],
+  ["8335F138",0xD4B7],
+  ["8335F139",0xD4B8],
+  ["8335F230",0xD4B9],
+  ["8335F231",0xD4BA],
+  ["8335F232",0xD4BB],
+  ["8335F233",0xD4BC],
+  ["8335F234",0xD4BD],
+  ["8335F235",0xD4BE],
+  ["8335F236",0xD4BF],
+  ["8335F237",0xD4C0],
+  ["8335F238",0xD4C1],
+  ["8335F239",0xD4C2],
+  ["8335F330",0xD4C3],
+  ["8335F331",0xD4C4],
+  ["8335F332",0xD4C5],
+  ["8335F333",0xD4C6],
+  ["8335F334",0xD4C7],
+  ["8335F335",0xD4C8],
+  ["8335F336",0xD4C9],
+  ["8335F337",0xD4CA],
+  ["8335F338",0xD4CB],
+  ["8335F339",0xD4CC],
+  ["8335F430",0xD4CD],
+  ["8335F431",0xD4CE],
+  ["8335F432",0xD4CF],
+  ["8335F433",0xD4D0],
+  ["8335F434",0xD4D1],
+  ["8335F435",0xD4D2],
+  ["8335F436",0xD4D3],
+  ["8335F437",0xD4D4],
+  ["8335F438",0xD4D5],
+  ["8335F439",0xD4D6],
+  ["8335F530",0xD4D7],
+  ["8335F531",0xD4D8],
+  ["8335F532",0xD4D9],
+  ["8335F533",0xD4DA],
+  ["8335F534",0xD4DB],
+  ["8335F535",0xD4DC],
+  ["8335F536",0xD4DD],
+  ["8335F537",0xD4DE],
+  ["8335F538",0xD4DF],
+  ["8335F539",0xD4E0],
+  ["8335F630",0xD4E1],
+  ["8335F631",0xD4E2],
+  ["8335F632",0xD4E3],
+  ["8335F633",0xD4E4],
+  ["8335F634",0xD4E5],
+  ["8335F635",0xD4E6],
+  ["8335F636",0xD4E7],
+  ["8335F637",0xD4E8],
+  ["8335F638",0xD4E9],
+  ["8335F639",0xD4EA],
+  ["8335F730",0xD4EB],
+  ["8335F731",0xD4EC],
+  ["8335F732",0xD4ED],
+  ["8335F733",0xD4EE],
+  ["8335F734",0xD4EF],
+  ["8335F735",0xD4F0],
+  ["8335F736",0xD4F1],
+  ["8335F737",0xD4F2],
+  ["8335F738",0xD4F3],
+  ["8335F739",0xD4F4],
+  ["8335F830",0xD4F5],
+  ["8335F831",0xD4F6],
+  ["8335F832",0xD4F7],
+  ["8335F833",0xD4F8],
+  ["8335F834",0xD4F9],
+  ["8335F835",0xD4FA],
+  ["8335F836",0xD4FB],
+  ["8335F837",0xD4FC],
+  ["8335F838",0xD4FD],
+  ["8335F839",0xD4FE],
+  ["8335F930",0xD4FF],
+  ["8335F931",0xD500],
+  ["8335F932",0xD501],
+  ["8335F933",0xD502],
+  ["8335F934",0xD503],
+  ["8335F935",0xD504],
+  ["8335F936",0xD505],
+  ["8335F937",0xD506],
+  ["8335F938",0xD507],
+  ["8335F939",0xD508],
+  ["8335FA30",0xD509],
+  ["8335FA31",0xD50A],
+  ["8335FA32",0xD50B],
+  ["8335FA33",0xD50C],
+  ["8335FA34",0xD50D],
+  ["8335FA35",0xD50E],
+  ["8335FA36",0xD50F],
+  ["8335FA37",0xD510],
+  ["8335FA38",0xD511],
+  ["8335FA39",0xD512],
+  ["8335FB30",0xD513],
+  ["8335FB31",0xD514],
+  ["8335FB32",0xD515],
+  ["8335FB33",0xD516],
+  ["8335FB34",0xD517],
+  ["8335FB35",0xD518],
+  ["8335FB36",0xD519],
+  ["8335FB37",0xD51A],
+  ["8335FB38",0xD51B],
+  ["8335FB39",0xD51C],
+  ["8335FC30",0xD51D],
+  ["8335FC31",0xD51E],
+  ["8335FC32",0xD51F],
+  ["8335FC33",0xD520],
+  ["8335FC34",0xD521],
+  ["8335FC35",0xD522],
+  ["8335FC36",0xD523],
+  ["8335FC37",0xD524],
+  ["8335FC38",0xD525],
+  ["8335FC39",0xD526],
+  ["8335FD30",0xD527],
+  ["8335FD31",0xD528],
+  ["8335FD32",0xD529],
+  ["8335FD33",0xD52A],
+  ["8335FD34",0xD52B],
+  ["8335FD35",0xD52C],
+  ["8335FD36",0xD52D],
+  ["8335FD37",0xD52E],
+  ["8335FD38",0xD52F],
+  ["8335FD39",0xD530],
+  ["8335FE30",0xD531],
+  ["8335FE31",0xD532],
+  ["8335FE32",0xD533],
+  ["8335FE33",0xD534],
+  ["8335FE34",0xD535],
+  ["8335FE35",0xD536],
+  ["8335FE36",0xD537],
+  ["8335FE37",0xD538],
+  ["8335FE38",0xD539],
+  ["8335FE39",0xD53A],
+  ["83368130",0xD53B],
+  ["83368131",0xD53C],
+  ["83368132",0xD53D],
+  ["83368133",0xD53E],
+  ["83368134",0xD53F],
+  ["83368135",0xD540],
+  ["83368136",0xD541],
+  ["83368137",0xD542],
+  ["83368138",0xD543],
+  ["83368139",0xD544],
+  ["83368230",0xD545],
+  ["83368231",0xD546],
+  ["83368232",0xD547],
+  ["83368233",0xD548],
+  ["83368234",0xD549],
+  ["83368235",0xD54A],
+  ["83368236",0xD54B],
+  ["83368237",0xD54C],
+  ["83368238",0xD54D],
+  ["83368239",0xD54E],
+  ["83368330",0xD54F],
+  ["83368331",0xD550],
+  ["83368332",0xD551],
+  ["83368333",0xD552],
+  ["83368334",0xD553],
+  ["83368335",0xD554],
+  ["83368336",0xD555],
+  ["83368337",0xD556],
+  ["83368338",0xD557],
+  ["83368339",0xD558],
+  ["83368430",0xD559],
+  ["83368431",0xD55A],
+  ["83368432",0xD55B],
+  ["83368433",0xD55C],
+  ["83368434",0xD55D],
+  ["83368435",0xD55E],
+  ["83368436",0xD55F],
+  ["83368437",0xD560],
+  ["83368438",0xD561],
+  ["83368439",0xD562],
+  ["83368530",0xD563],
+  ["83368531",0xD564],
+  ["83368532",0xD565],
+  ["83368533",0xD566],
+  ["83368534",0xD567],
+  ["83368535",0xD568],
+  ["83368536",0xD569],
+  ["83368537",0xD56A],
+  ["83368538",0xD56B],
+  ["83368539",0xD56C],
+  ["83368630",0xD56D],
+  ["83368631",0xD56E],
+  ["83368632",0xD56F],
+  ["83368633",0xD570],
+  ["83368634",0xD571],
+  ["83368635",0xD572],
+  ["83368636",0xD573],
+  ["83368637",0xD574],
+  ["83368638",0xD575],
+  ["83368639",0xD576],
+  ["83368730",0xD577],
+  ["83368731",0xD578],
+  ["83368732",0xD579],
+  ["83368733",0xD57A],
+  ["83368734",0xD57B],
+  ["83368735",0xD57C],
+  ["83368736",0xD57D],
+  ["83368737",0xD57E],
+  ["83368738",0xD57F],
+  ["83368739",0xD580],
+  ["83368830",0xD581],
+  ["83368831",0xD582],
+  ["83368832",0xD583],
+  ["83368833",0xD584],
+  ["83368834",0xD585],
+  ["83368835",0xD586],
+  ["83368836",0xD587],
+  ["83368837",0xD588],
+  ["83368838",0xD589],
+  ["83368839",0xD58A],
+  ["83368930",0xD58B],
+  ["83368931",0xD58C],
+  ["83368932",0xD58D],
+  ["83368933",0xD58E],
+  ["83368934",0xD58F],
+  ["83368935",0xD590],
+  ["83368936",0xD591],
+  ["83368937",0xD592],
+  ["83368938",0xD593],
+  ["83368939",0xD594],
+  ["83368A30",0xD595],
+  ["83368A31",0xD596],
+  ["83368A32",0xD597],
+  ["83368A33",0xD598],
+  ["83368A34",0xD599],
+  ["83368A35",0xD59A],
+  ["83368A36",0xD59B],
+  ["83368A37",0xD59C],
+  ["83368A38",0xD59D],
+  ["83368A39",0xD59E],
+  ["83368B30",0xD59F],
+  ["83368B31",0xD5A0],
+  ["83368B32",0xD5A1],
+  ["83368B33",0xD5A2],
+  ["83368B34",0xD5A3],
+  ["83368B35",0xD5A4],
+  ["83368B36",0xD5A5],
+  ["83368B37",0xD5A6],
+  ["83368B38",0xD5A7],
+  ["83368B39",0xD5A8],
+  ["83368C30",0xD5A9],
+  ["83368C31",0xD5AA],
+  ["83368C32",0xD5AB],
+  ["83368C33",0xD5AC],
+  ["83368C34",0xD5AD],
+  ["83368C35",0xD5AE],
+  ["83368C36",0xD5AF],
+  ["83368C37",0xD5B0],
+  ["83368C38",0xD5B1],
+  ["83368C39",0xD5B2],
+  ["83368D30",0xD5B3],
+  ["83368D31",0xD5B4],
+  ["83368D32",0xD5B5],
+  ["83368D33",0xD5B6],
+  ["83368D34",0xD5B7],
+  ["83368D35",0xD5B8],
+  ["83368D36",0xD5B9],
+  ["83368D37",0xD5BA],
+  ["83368D38",0xD5BB],
+  ["83368D39",0xD5BC],
+  ["83368E30",0xD5BD],
+  ["83368E31",0xD5BE],
+  ["83368E32",0xD5BF],
+  ["83368E33",0xD5C0],
+  ["83368E34",0xD5C1],
+  ["83368E35",0xD5C2],
+  ["83368E36",0xD5C3],
+  ["83368E37",0xD5C4],
+  ["83368E38",0xD5C5],
+  ["83368E39",0xD5C6],
+  ["83368F30",0xD5C7],
+  ["83368F31",0xD5C8],
+  ["83368F32",0xD5C9],
+  ["83368F33",0xD5CA],
+  ["83368F34",0xD5CB],
+  ["83368F35",0xD5CC],
+  ["83368F36",0xD5CD],
+  ["83368F37",0xD5CE],
+  ["83368F38",0xD5CF],
+  ["83368F39",0xD5D0],
+  ["83369030",0xD5D1],
+  ["83369031",0xD5D2],
+  ["83369032",0xD5D3],
+  ["83369033",0xD5D4],
+  ["83369034",0xD5D5],
+  ["83369035",0xD5D6],
+  ["83369036",0xD5D7],
+  ["83369037",0xD5D8],
+  ["83369038",0xD5D9],
+  ["83369039",0xD5DA],
+  ["83369130",0xD5DB],
+  ["83369131",0xD5DC],
+  ["83369132",0xD5DD],
+  ["83369133",0xD5DE],
+  ["83369134",0xD5DF],
+  ["83369135",0xD5E0],
+  ["83369136",0xD5E1],
+  ["83369137",0xD5E2],
+  ["83369138",0xD5E3],
+  ["83369139",0xD5E4],
+  ["83369230",0xD5E5],
+  ["83369231",0xD5E6],
+  ["83369232",0xD5E7],
+  ["83369233",0xD5E8],
+  ["83369234",0xD5E9],
+  ["83369235",0xD5EA],
+  ["83369236",0xD5EB],
+  ["83369237",0xD5EC],
+  ["83369238",0xD5ED],
+  ["83369239",0xD5EE],
+  ["83369330",0xD5EF],
+  ["83369331",0xD5F0],
+  ["83369332",0xD5F1],
+  ["83369333",0xD5F2],
+  ["83369334",0xD5F3],
+  ["83369335",0xD5F4],
+  ["83369336",0xD5F5],
+  ["83369337",0xD5F6],
+  ["83369338",0xD5F7],
+  ["83369339",0xD5F8],
+  ["83369430",0xD5F9],
+  ["83369431",0xD5FA],
+  ["83369432",0xD5FB],
+  ["83369433",0xD5FC],
+  ["83369434",0xD5FD],
+  ["83369435",0xD5FE],
+  ["83369436",0xD5FF],
+  ["83369437",0xD600],
+  ["83369438",0xD601],
+  ["83369439",0xD602],
+  ["83369530",0xD603],
+  ["83369531",0xD604],
+  ["83369532",0xD605],
+  ["83369533",0xD606],
+  ["83369534",0xD607],
+  ["83369535",0xD608],
+  ["83369536",0xD609],
+  ["83369537",0xD60A],
+  ["83369538",0xD60B],
+  ["83369539",0xD60C],
+  ["83369630",0xD60D],
+  ["83369631",0xD60E],
+  ["83369632",0xD60F],
+  ["83369633",0xD610],
+  ["83369634",0xD611],
+  ["83369635",0xD612],
+  ["83369636",0xD613],
+  ["83369637",0xD614],
+  ["83369638",0xD615],
+  ["83369639",0xD616],
+  ["83369730",0xD617],
+  ["83369731",0xD618],
+  ["83369732",0xD619],
+  ["83369733",0xD61A],
+  ["83369734",0xD61B],
+  ["83369735",0xD61C],
+  ["83369736",0xD61D],
+  ["83369737",0xD61E],
+  ["83369738",0xD61F],
+  ["83369739",0xD620],
+  ["83369830",0xD621],
+  ["83369831",0xD622],
+  ["83369832",0xD623],
+  ["83369833",0xD624],
+  ["83369834",0xD625],
+  ["83369835",0xD626],
+  ["83369836",0xD627],
+  ["83369837",0xD628],
+  ["83369838",0xD629],
+  ["83369839",0xD62A],
+  ["83369930",0xD62B],
+  ["83369931",0xD62C],
+  ["83369932",0xD62D],
+  ["83369933",0xD62E],
+  ["83369934",0xD62F],
+  ["83369935",0xD630],
+  ["83369936",0xD631],
+  ["83369937",0xD632],
+  ["83369938",0xD633],
+  ["83369939",0xD634],
+  ["83369A30",0xD635],
+  ["83369A31",0xD636],
+  ["83369A32",0xD637],
+  ["83369A33",0xD638],
+  ["83369A34",0xD639],
+  ["83369A35",0xD63A],
+  ["83369A36",0xD63B],
+  ["83369A37",0xD63C],
+  ["83369A38",0xD63D],
+  ["83369A39",0xD63E],
+  ["83369B30",0xD63F],
+  ["83369B31",0xD640],
+  ["83369B32",0xD641],
+  ["83369B33",0xD642],
+  ["83369B34",0xD643],
+  ["83369B35",0xD644],
+  ["83369B36",0xD645],
+  ["83369B37",0xD646],
+  ["83369B38",0xD647],
+  ["83369B39",0xD648],
+  ["83369C30",0xD649],
+  ["83369C31",0xD64A],
+  ["83369C32",0xD64B],
+  ["83369C33",0xD64C],
+  ["83369C34",0xD64D],
+  ["83369C35",0xD64E],
+  ["83369C36",0xD64F],
+  ["83369C37",0xD650],
+  ["83369C38",0xD651],
+  ["83369C39",0xD652],
+  ["83369D30",0xD653],
+  ["83369D31",0xD654],
+  ["83369D32",0xD655],
+  ["83369D33",0xD656],
+  ["83369D34",0xD657],
+  ["83369D35",0xD658],
+  ["83369D36",0xD659],
+  ["83369D37",0xD65A],
+  ["83369D38",0xD65B],
+  ["83369D39",0xD65C],
+  ["83369E30",0xD65D],
+  ["83369E31",0xD65E],
+  ["83369E32",0xD65F],
+  ["83369E33",0xD660],
+  ["83369E34",0xD661],
+  ["83369E35",0xD662],
+  ["83369E36",0xD663],
+  ["83369E37",0xD664],
+  ["83369E38",0xD665],
+  ["83369E39",0xD666],
+  ["83369F30",0xD667],
+  ["83369F31",0xD668],
+  ["83369F32",0xD669],
+  ["83369F33",0xD66A],
+  ["83369F34",0xD66B],
+  ["83369F35",0xD66C],
+  ["83369F36",0xD66D],
+  ["83369F37",0xD66E],
+  ["83369F38",0xD66F],
+  ["83369F39",0xD670],
+  ["8336A030",0xD671],
+  ["8336A031",0xD672],
+  ["8336A032",0xD673],
+  ["8336A033",0xD674],
+  ["8336A034",0xD675],
+  ["8336A035",0xD676],
+  ["8336A036",0xD677],
+  ["8336A037",0xD678],
+  ["8336A038",0xD679],
+  ["8336A039",0xD67A],
+  ["8336A130",0xD67B],
+  ["8336A131",0xD67C],
+  ["8336A132",0xD67D],
+  ["8336A133",0xD67E],
+  ["8336A134",0xD67F],
+  ["8336A135",0xD680],
+  ["8336A136",0xD681],
+  ["8336A137",0xD682],
+  ["8336A138",0xD683],
+  ["8336A139",0xD684],
+  ["8336A230",0xD685],
+  ["8336A231",0xD686],
+  ["8336A232",0xD687],
+  ["8336A233",0xD688],
+  ["8336A234",0xD689],
+  ["8336A235",0xD68A],
+  ["8336A236",0xD68B],
+  ["8336A237",0xD68C],
+  ["8336A238",0xD68D],
+  ["8336A239",0xD68E],
+  ["8336A330",0xD68F],
+  ["8336A331",0xD690],
+  ["8336A332",0xD691],
+  ["8336A333",0xD692],
+  ["8336A334",0xD693],
+  ["8336A335",0xD694],
+  ["8336A336",0xD695],
+  ["8336A337",0xD696],
+  ["8336A338",0xD697],
+  ["8336A339",0xD698],
+  ["8336A430",0xD699],
+  ["8336A431",0xD69A],
+  ["8336A432",0xD69B],
+  ["8336A433",0xD69C],
+  ["8336A434",0xD69D],
+  ["8336A435",0xD69E],
+  ["8336A436",0xD69F],
+  ["8336A437",0xD6A0],
+  ["8336A438",0xD6A1],
+  ["8336A439",0xD6A2],
+  ["8336A530",0xD6A3],
+  ["8336A531",0xD6A4],
+  ["8336A532",0xD6A5],
+  ["8336A533",0xD6A6],
+  ["8336A534",0xD6A7],
+  ["8336A535",0xD6A8],
+  ["8336A536",0xD6A9],
+  ["8336A537",0xD6AA],
+  ["8336A538",0xD6AB],
+  ["8336A539",0xD6AC],
+  ["8336A630",0xD6AD],
+  ["8336A631",0xD6AE],
+  ["8336A632",0xD6AF],
+  ["8336A633",0xD6B0],
+  ["8336A634",0xD6B1],
+  ["8336A635",0xD6B2],
+  ["8336A636",0xD6B3],
+  ["8336A637",0xD6B4],
+  ["8336A638",0xD6B5],
+  ["8336A639",0xD6B6],
+  ["8336A730",0xD6B7],
+  ["8336A731",0xD6B8],
+  ["8336A732",0xD6B9],
+  ["8336A733",0xD6BA],
+  ["8336A734",0xD6BB],
+  ["8336A735",0xD6BC],
+  ["8336A736",0xD6BD],
+  ["8336A737",0xD6BE],
+  ["8336A738",0xD6BF],
+  ["8336A739",0xD6C0],
+  ["8336A830",0xD6C1],
+  ["8336A831",0xD6C2],
+  ["8336A832",0xD6C3],
+  ["8336A833",0xD6C4],
+  ["8336A834",0xD6C5],
+  ["8336A835",0xD6C6],
+  ["8336A836",0xD6C7],
+  ["8336A837",0xD6C8],
+  ["8336A838",0xD6C9],
+  ["8336A839",0xD6CA],
+  ["8336A930",0xD6CB],
+  ["8336A931",0xD6CC],
+  ["8336A932",0xD6CD],
+  ["8336A933",0xD6CE],
+  ["8336A934",0xD6CF],
+  ["8336A935",0xD6D0],
+  ["8336A936",0xD6D1],
+  ["8336A937",0xD6D2],
+  ["8336A938",0xD6D3],
+  ["8336A939",0xD6D4],
+  ["8336AA30",0xD6D5],
+  ["8336AA31",0xD6D6],
+  ["8336AA32",0xD6D7],
+  ["8336AA33",0xD6D8],
+  ["8336AA34",0xD6D9],
+  ["8336AA35",0xD6DA],
+  ["8336AA36",0xD6DB],
+  ["8336AA37",0xD6DC],
+  ["8336AA38",0xD6DD],
+  ["8336AA39",0xD6DE],
+  ["8336AB30",0xD6DF],
+  ["8336AB31",0xD6E0],
+  ["8336AB32",0xD6E1],
+  ["8336AB33",0xD6E2],
+  ["8336AB34",0xD6E3],
+  ["8336AB35",0xD6E4],
+  ["8336AB36",0xD6E5],
+  ["8336AB37",0xD6E6],
+  ["8336AB38",0xD6E7],
+  ["8336AB39",0xD6E8],
+  ["8336AC30",0xD6E9],
+  ["8336AC31",0xD6EA],
+  ["8336AC32",0xD6EB],
+  ["8336AC33",0xD6EC],
+  ["8336AC34",0xD6ED],
+  ["8336AC35",0xD6EE],
+  ["8336AC36",0xD6EF],
+  ["8336AC37",0xD6F0],
+  ["8336AC38",0xD6F1],
+  ["8336AC39",0xD6F2],
+  ["8336AD30",0xD6F3],
+  ["8336AD31",0xD6F4],
+  ["8336AD32",0xD6F5],
+  ["8336AD33",0xD6F6],
+  ["8336AD34",0xD6F7],
+  ["8336AD35",0xD6F8],
+  ["8336AD36",0xD6F9],
+  ["8336AD37",0xD6FA],
+  ["8336AD38",0xD6FB],
+  ["8336AD39",0xD6FC],
+  ["8336AE30",0xD6FD],
+  ["8336AE31",0xD6FE],
+  ["8336AE32",0xD6FF],
+  ["8336AE33",0xD700],
+  ["8336AE34",0xD701],
+  ["8336AE35",0xD702],
+  ["8336AE36",0xD703],
+  ["8336AE37",0xD704],
+  ["8336AE38",0xD705],
+  ["8336AE39",0xD706],
+  ["8336AF30",0xD707],
+  ["8336AF31",0xD708],
+  ["8336AF32",0xD709],
+  ["8336AF33",0xD70A],
+  ["8336AF34",0xD70B],
+  ["8336AF35",0xD70C],
+  ["8336AF36",0xD70D],
+  ["8336AF37",0xD70E],
+  ["8336AF38",0xD70F],
+  ["8336AF39",0xD710],
+  ["8336B030",0xD711],
+  ["8336B031",0xD712],
+  ["8336B032",0xD713],
+  ["8336B033",0xD714],
+  ["8336B034",0xD715],
+  ["8336B035",0xD716],
+  ["8336B036",0xD717],
+  ["8336B037",0xD718],
+  ["8336B038",0xD719],
+  ["8336B039",0xD71A],
+  ["8336B130",0xD71B],
+  ["8336B131",0xD71C],
+  ["8336B132",0xD71D],
+  ["8336B133",0xD71E],
+  ["8336B134",0xD71F],
+  ["8336B135",0xD720],
+  ["8336B136",0xD721],
+  ["8336B137",0xD722],
+  ["8336B138",0xD723],
+  ["8336B139",0xD724],
+  ["8336B230",0xD725],
+  ["8336B231",0xD726],
+  ["8336B232",0xD727],
+  ["8336B233",0xD728],
+  ["8336B234",0xD729],
+  ["8336B235",0xD72A],
+  ["8336B236",0xD72B],
+  ["8336B237",0xD72C],
+  ["8336B238",0xD72D],
+  ["8336B239",0xD72E],
+  ["8336B330",0xD72F],
+  ["8336B331",0xD730],
+  ["8336B332",0xD731],
+  ["8336B333",0xD732],
+  ["8336B334",0xD733],
+  ["8336B335",0xD734],
+  ["8336B336",0xD735],
+  ["8336B337",0xD736],
+  ["8336B338",0xD737],
+  ["8336B339",0xD738],
+  ["8336B430",0xD739],
+  ["8336B431",0xD73A],
+  ["8336B432",0xD73B],
+  ["8336B433",0xD73C],
+  ["8336B434",0xD73D],
+  ["8336B435",0xD73E],
+  ["8336B436",0xD73F],
+  ["8336B437",0xD740],
+  ["8336B438",0xD741],
+  ["8336B439",0xD742],
+  ["8336B530",0xD743],
+  ["8336B531",0xD744],
+  ["8336B532",0xD745],
+  ["8336B533",0xD746],
+  ["8336B534",0xD747],
+  ["8336B535",0xD748],
+  ["8336B536",0xD749],
+  ["8336B537",0xD74A],
+  ["8336B538",0xD74B],
+  ["8336B539",0xD74C],
+  ["8336B630",0xD74D],
+  ["8336B631",0xD74E],
+  ["8336B632",0xD74F],
+  ["8336B633",0xD750],
+  ["8336B634",0xD751],
+  ["8336B635",0xD752],
+  ["8336B636",0xD753],
+  ["8336B637",0xD754],
+  ["8336B638",0xD755],
+  ["8336B639",0xD756],
+  ["8336B730",0xD757],
+  ["8336B731",0xD758],
+  ["8336B732",0xD759],
+  ["8336B733",0xD75A],
+  ["8336B734",0xD75B],
+  ["8336B735",0xD75C],
+  ["8336B736",0xD75D],
+  ["8336B737",0xD75E],
+  ["8336B738",0xD75F],
+  ["8336B739",0xD760],
+  ["8336B830",0xD761],
+  ["8336B831",0xD762],
+  ["8336B832",0xD763],
+  ["8336B833",0xD764],
+  ["8336B834",0xD765],
+  ["8336B835",0xD766],
+  ["8336B836",0xD767],
+  ["8336B837",0xD768],
+  ["8336B838",0xD769],
+  ["8336B839",0xD76A],
+  ["8336B930",0xD76B],
+  ["8336B931",0xD76C],
+  ["8336B932",0xD76D],
+  ["8336B933",0xD76E],
+  ["8336B934",0xD76F],
+  ["8336B935",0xD770],
+  ["8336B936",0xD771],
+  ["8336B937",0xD772],
+  ["8336B938",0xD773],
+  ["8336B939",0xD774],
+  ["8336BA30",0xD775],
+  ["8336BA31",0xD776],
+  ["8336BA32",0xD777],
+  ["8336BA33",0xD778],
+  ["8336BA34",0xD779],
+  ["8336BA35",0xD77A],
+  ["8336BA36",0xD77B],
+  ["8336BA37",0xD77C],
+  ["8336BA38",0xD77D],
+  ["8336BA39",0xD77E],
+  ["8336BB30",0xD77F],
+  ["8336BB31",0xD780],
+  ["8336BB32",0xD781],
+  ["8336BB33",0xD782],
+  ["8336BB34",0xD783],
+  ["8336BB35",0xD784],
+  ["8336BB36",0xD785],
+  ["8336BB37",0xD786],
+  ["8336BB38",0xD787],
+  ["8336BB39",0xD788],
+  ["8336BC30",0xD789],
+  ["8336BC31",0xD78A],
+  ["8336BC32",0xD78B],
+  ["8336BC33",0xD78C],
+  ["8336BC34",0xD78D],
+  ["8336BC35",0xD78E],
+  ["8336BC36",0xD78F],
+  ["8336BC37",0xD790],
+  ["8336BC38",0xD791],
+  ["8336BC39",0xD792],
+  ["8336BD30",0xD793],
+  ["8336BD31",0xD794],
+  ["8336BD32",0xD795],
+  ["8336BD33",0xD796],
+  ["8336BD34",0xD797],
+  ["8336BD35",0xD798],
+  ["8336BD36",0xD799],
+  ["8336BD37",0xD79A],
+  ["8336BD38",0xD79B],
+  ["8336BD39",0xD79C],
+  ["8336BE30",0xD79D],
+  ["8336BE31",0xD79E],
+  ["8336BE32",0xD79F],
+  ["8336BE33",0xD7A0],
+  ["8336BE34",0xD7A1],
+  ["8336BE35",0xD7A2],
+  ["8336BE36",0xD7A3],
+  ["8336BE37",0xD7A4],
+  ["8336BE38",0xD7A5],
+  ["8336BE39",0xD7A6],
+  ["8336BF30",0xD7A7],
+  ["8336BF31",0xD7A8],
+  ["8336BF32",0xD7A9],
+  ["8336BF33",0xD7AA],
+  ["8336BF34",0xD7AB],
+  ["8336BF35",0xD7AC],
+  ["8336BF36",0xD7AD],
+  ["8336BF37",0xD7AE],
+  ["8336BF38",0xD7AF],
+  ["8336BF39",0xD7B0],
+  ["8336C030",0xD7B1],
+  ["8336C031",0xD7B2],
+  ["8336C032",0xD7B3],
+  ["8336C033",0xD7B4],
+  ["8336C034",0xD7B5],
+  ["8336C035",0xD7B6],
+  ["8336C036",0xD7B7],
+  ["8336C037",0xD7B8],
+  ["8336C038",0xD7B9],
+  ["8336C039",0xD7BA],
+  ["8336C130",0xD7BB],
+  ["8336C131",0xD7BC],
+  ["8336C132",0xD7BD],
+  ["8336C133",0xD7BE],
+  ["8336C134",0xD7BF],
+  ["8336C135",0xD7C0],
+  ["8336C136",0xD7C1],
+  ["8336C137",0xD7C2],
+  ["8336C138",0xD7C3],
+  ["8336C139",0xD7C4],
+  ["8336C230",0xD7C5],
+  ["8336C231",0xD7C6],
+  ["8336C232",0xD7C7],
+  ["8336C233",0xD7C8],
+  ["8336C234",0xD7C9],
+  ["8336C235",0xD7CA],
+  ["8336C236",0xD7CB],
+  ["8336C237",0xD7CC],
+  ["8336C238",0xD7CD],
+  ["8336C239",0xD7CE],
+  ["8336C330",0xD7CF],
+  ["8336C331",0xD7D0],
+  ["8336C332",0xD7D1],
+  ["8336C333",0xD7D2],
+  ["8336C334",0xD7D3],
+  ["8336C335",0xD7D4],
+  ["8336C336",0xD7D5],
+  ["8336C337",0xD7D6],
+  ["8336C338",0xD7D7],
+  ["8336C339",0xD7D8],
+  ["8336C430",0xD7D9],
+  ["8336C431",0xD7DA],
+  ["8336C432",0xD7DB],
+  ["8336C433",0xD7DC],
+  ["8336C434",0xD7DD],
+  ["8336C435",0xD7DE],
+  ["8336C436",0xD7DF],
+  ["8336C437",0xD7E0],
+  ["8336C438",0xD7E1],
+  ["8336C439",0xD7E2],
+  ["8336C530",0xD7E3],
+  ["8336C531",0xD7E4],
+  ["8336C532",0xD7E5],
+  ["8336C533",0xD7E6],
+  ["8336C534",0xD7E7],
+  ["8336C535",0xD7E8],
+  ["8336C536",0xD7E9],
+  ["8336C537",0xD7EA],
+  ["8336C538",0xD7EB],
+  ["8336C539",0xD7EC],
+  ["8336C630",0xD7ED],
+  ["8336C631",0xD7EE],
+  ["8336C632",0xD7EF],
+  ["8336C633",0xD7F0],
+  ["8336C634",0xD7F1],
+  ["8336C635",0xD7F2],
+  ["8336C636",0xD7F3],
+  ["8336C637",0xD7F4],
+  ["8336C638",0xD7F5],
+  ["8336C639",0xD7F6],
+  ["8336C730",0xD7F7],
+  ["8336C731",0xD7F8],
+  ["8336C732",0xD7F9],
+  ["8336C733",0xD7FA],
+  ["8336C734",0xD7FB],
+  ["8336C735",0xD7FC],
+  ["8336C736",0xD7FD],
+  ["8336C737",0xD7FE],
+  ["8336C738",0xD7FF],
+  ["AAA1",0xE000],
+  ["AAA2",0xE001],
+  ["AAA3",0xE002],
+  ["AAA4",0xE003],
+  ["AAA5",0xE004],
+  ["AAA6",0xE005],
+  ["AAA7",0xE006],
+  ["AAA8",0xE007],
+  ["AAA9",0xE008],
+  ["AAAA",0xE009],
+  ["AAAB",0xE00A],
+  ["AAAC",0xE00B],
+  ["AAAD",0xE00C],
+  ["AAAE",0xE00D],
+  ["AAAF",0xE00E],
+  ["AAB0",0xE00F],
+  ["AAB1",0xE010],
+  ["AAB2",0xE011],
+  ["AAB3",0xE012],
+  ["AAB4",0xE013],
+  ["AAB5",0xE014],
+  ["AAB6",0xE015],
+  ["AAB7",0xE016],
+  ["AAB8",0xE017],
+  ["AAB9",0xE018],
+  ["AABA",0xE019],
+  ["AABB",0xE01A],
+  ["AABC",0xE01B],
+  ["AABD",0xE01C],
+  ["AABE",0xE01D],
+  ["AABF",0xE01E],
+  ["AAC0",0xE01F],
+  ["AAC1",0xE020],
+  ["AAC2",0xE021],
+  ["AAC3",0xE022],
+  ["AAC4",0xE023],
+  ["AAC5",0xE024],
+  ["AAC6",0xE025],
+  ["AAC7",0xE026],
+  ["AAC8",0xE027],
+  ["AAC9",0xE028],
+  ["AACA",0xE029],
+  ["AACB",0xE02A],
+  ["AACC",0xE02B],
+  ["AACD",0xE02C],
+  ["AACE",0xE02D],
+  ["AACF",0xE02E],
+  ["AAD0",0xE02F],
+  ["AAD1",0xE030],
+  ["AAD2",0xE031],
+  ["AAD3",0xE032],
+  ["AAD4",0xE033],
+  ["AAD5",0xE034],
+  ["AAD6",0xE035],
+  ["AAD7",0xE036],
+  ["AAD8",0xE037],
+  ["AAD9",0xE038],
+  ["AADA",0xE039],
+  ["AADB",0xE03A],
+  ["AADC",0xE03B],
+  ["AADD",0xE03C],
+  ["AADE",0xE03D],
+  ["AADF",0xE03E],
+  ["AAE0",0xE03F],
+  ["AAE1",0xE040],
+  ["AAE2",0xE041],
+  ["AAE3",0xE042],
+  ["AAE4",0xE043],
+  ["AAE5",0xE044],
+  ["AAE6",0xE045],
+  ["AAE7",0xE046],
+  ["AAE8",0xE047],
+  ["AAE9",0xE048],
+  ["AAEA",0xE049],
+  ["AAEB",0xE04A],
+  ["AAEC",0xE04B],
+  ["AAED",0xE04C],
+  ["AAEE",0xE04D],
+  ["AAEF",0xE04E],
+  ["AAF0",0xE04F],
+  ["AAF1",0xE050],
+  ["AAF2",0xE051],
+  ["AAF3",0xE052],
+  ["AAF4",0xE053],
+  ["AAF5",0xE054],
+  ["AAF6",0xE055],
+  ["AAF7",0xE056],
+  ["AAF8",0xE057],
+  ["AAF9",0xE058],
+  ["AAFA",0xE059],
+  ["AAFB",0xE05A],
+  ["AAFC",0xE05B],
+  ["AAFD",0xE05C],
+  ["AAFE",0xE05D],
+  ["ABA1",0xE05E],
+  ["ABA2",0xE05F],
+  ["ABA3",0xE060],
+  ["ABA4",0xE061],
+  ["ABA5",0xE062],
+  ["ABA6",0xE063],
+  ["ABA7",0xE064],
+  ["ABA8",0xE065],
+  ["ABA9",0xE066],
+  ["ABAA",0xE067],
+  ["ABAB",0xE068],
+  ["ABAC",0xE069],
+  ["ABAD",0xE06A],
+  ["ABAE",0xE06B],
+  ["ABAF",0xE06C],
+  ["ABB0",0xE06D],
+  ["ABB1",0xE06E],
+  ["ABB2",0xE06F],
+  ["ABB3",0xE070],
+  ["ABB4",0xE071],
+  ["ABB5",0xE072],
+  ["ABB6",0xE073],
+  ["ABB7",0xE074],
+  ["ABB8",0xE075],
+  ["ABB9",0xE076],
+  ["ABBA",0xE077],
+  ["ABBB",0xE078],
+  ["ABBC",0xE079],
+  ["ABBD",0xE07A],
+  ["ABBE",0xE07B],
+  ["ABBF",0xE07C],
+  ["ABC0",0xE07D],
+  ["ABC1",0xE07E],
+  ["ABC2",0xE07F],
+  ["ABC3",0xE080],
+  ["ABC4",0xE081],
+  ["ABC5",0xE082],
+  ["ABC6",0xE083],
+  ["ABC7",0xE084],
+  ["ABC8",0xE085],
+  ["ABC9",0xE086],
+  ["ABCA",0xE087],
+  ["ABCB",0xE088],
+  ["ABCC",0xE089],
+  ["ABCD",0xE08A],
+  ["ABCE",0xE08B],
+  ["ABCF",0xE08C],
+  ["ABD0",0xE08D],
+  ["ABD1",0xE08E],
+  ["ABD2",0xE08F],
+  ["ABD3",0xE090],
+  ["ABD4",0xE091],
+  ["ABD5",0xE092],
+  ["ABD6",0xE093],
+  ["ABD7",0xE094],
+  ["ABD8",0xE095],
+  ["ABD9",0xE096],
+  ["ABDA",0xE097],
+  ["ABDB",0xE098],
+  ["ABDC",0xE099],
+  ["ABDD",0xE09A],
+  ["ABDE",0xE09B],
+  ["ABDF",0xE09C],
+  ["ABE0",0xE09D],
+  ["ABE1",0xE09E],
+  ["ABE2",0xE09F],
+  ["ABE3",0xE0A0],
+  ["ABE4",0xE0A1],
+  ["ABE5",0xE0A2],
+  ["ABE6",0xE0A3],
+  ["ABE7",0xE0A4],
+  ["ABE8",0xE0A5],
+  ["ABE9",0xE0A6],
+  ["ABEA",0xE0A7],
+  ["ABEB",0xE0A8],
+  ["ABEC",0xE0A9],
+  ["ABED",0xE0AA],
+  ["ABEE",0xE0AB],
+  ["ABEF",0xE0AC],
+  ["ABF0",0xE0AD],
+  ["ABF1",0xE0AE],
+  ["ABF2",0xE0AF],
+  ["ABF3",0xE0B0],
+  ["ABF4",0xE0B1],
+  ["ABF5",0xE0B2],
+  ["ABF6",0xE0B3],
+  ["ABF7",0xE0B4],
+  ["ABF8",0xE0B5],
+  ["ABF9",0xE0B6],
+  ["ABFA",0xE0B7],
+  ["ABFB",0xE0B8],
+  ["ABFC",0xE0B9],
+  ["ABFD",0xE0BA],
+  ["ABFE",0xE0BB],
+  ["ACA1",0xE0BC],
+  ["ACA2",0xE0BD],
+  ["ACA3",0xE0BE],
+  ["ACA4",0xE0BF],
+  ["ACA5",0xE0C0],
+  ["ACA6",0xE0C1],
+  ["ACA7",0xE0C2],
+  ["ACA8",0xE0C3],
+  ["ACA9",0xE0C4],
+  ["ACAA",0xE0C5],
+  ["ACAB",0xE0C6],
+  ["ACAC",0xE0C7],
+  ["ACAD",0xE0C8],
+  ["ACAE",0xE0C9],
+  ["ACAF",0xE0CA],
+  ["ACB0",0xE0CB],
+  ["ACB1",0xE0CC],
+  ["ACB2",0xE0CD],
+  ["ACB3",0xE0CE],
+  ["ACB4",0xE0CF],
+  ["ACB5",0xE0D0],
+  ["ACB6",0xE0D1],
+  ["ACB7",0xE0D2],
+  ["ACB8",0xE0D3],
+  ["ACB9",0xE0D4],
+  ["ACBA",0xE0D5],
+  ["ACBB",0xE0D6],
+  ["ACBC",0xE0D7],
+  ["ACBD",0xE0D8],
+  ["ACBE",0xE0D9],
+  ["ACBF",0xE0DA],
+  ["ACC0",0xE0DB],
+  ["ACC1",0xE0DC],
+  ["ACC2",0xE0DD],
+  ["ACC3",0xE0DE],
+  ["ACC4",0xE0DF],
+  ["ACC5",0xE0E0],
+  ["ACC6",0xE0E1],
+  ["ACC7",0xE0E2],
+  ["ACC8",0xE0E3],
+  ["ACC9",0xE0E4],
+  ["ACCA",0xE0E5],
+  ["ACCB",0xE0E6],
+  ["ACCC",0xE0E7],
+  ["ACCD",0xE0E8],
+  ["ACCE",0xE0E9],
+  ["ACCF",0xE0EA],
+  ["ACD0",0xE0EB],
+  ["ACD1",0xE0EC],
+  ["ACD2",0xE0ED],
+  ["ACD3",0xE0EE],
+  ["ACD4",0xE0EF],
+  ["ACD5",0xE0F0],
+  ["ACD6",0xE0F1],
+  ["ACD7",0xE0F2],
+  ["ACD8",0xE0F3],
+  ["ACD9",0xE0F4],
+  ["ACDA",0xE0F5],
+  ["ACDB",0xE0F6],
+  ["ACDC",0xE0F7],
+  ["ACDD",0xE0F8],
+  ["ACDE",0xE0F9],
+  ["ACDF",0xE0FA],
+  ["ACE0",0xE0FB],
+  ["ACE1",0xE0FC],
+  ["ACE2",0xE0FD],
+  ["ACE3",0xE0FE],
+  ["ACE4",0xE0FF],
+  ["ACE5",0xE100],
+  ["ACE6",0xE101],
+  ["ACE7",0xE102],
+  ["ACE8",0xE103],
+  ["ACE9",0xE104],
+  ["ACEA",0xE105],
+  ["ACEB",0xE106],
+  ["ACEC",0xE107],
+  ["ACED",0xE108],
+  ["ACEE",0xE109],
+  ["ACEF",0xE10A],
+  ["ACF0",0xE10B],
+  ["ACF1",0xE10C],
+  ["ACF2",0xE10D],
+  ["ACF3",0xE10E],
+  ["ACF4",0xE10F],
+  ["ACF5",0xE110],
+  ["ACF6",0xE111],
+  ["ACF7",0xE112],
+  ["ACF8",0xE113],
+  ["ACF9",0xE114],
+  ["ACFA",0xE115],
+  ["ACFB",0xE116],
+  ["ACFC",0xE117],
+  ["ACFD",0xE118],
+  ["ACFE",0xE119],
+  ["ADA1",0xE11A],
+  ["ADA2",0xE11B],
+  ["ADA3",0xE11C],
+  ["ADA4",0xE11D],
+  ["ADA5",0xE11E],
+  ["ADA6",0xE11F],
+  ["ADA7",0xE120],
+  ["ADA8",0xE121],
+  ["ADA9",0xE122],
+  ["ADAA",0xE123],
+  ["ADAB",0xE124],
+  ["ADAC",0xE125],
+  ["ADAD",0xE126],
+  ["ADAE",0xE127],
+  ["ADAF",0xE128],
+  ["ADB0",0xE129],
+  ["ADB1",0xE12A],
+  ["ADB2",0xE12B],
+  ["ADB3",0xE12C],
+  ["ADB4",0xE12D],
+  ["ADB5",0xE12E],
+  ["ADB6",0xE12F],
+  ["ADB7",0xE130],
+  ["ADB8",0xE131],
+  ["ADB9",0xE132],
+  ["ADBA",0xE133],
+  ["ADBB",0xE134],
+  ["ADBC",0xE135],
+  ["ADBD",0xE136],
+  ["ADBE",0xE137],
+  ["ADBF",0xE138],
+  ["ADC0",0xE139],
+  ["ADC1",0xE13A],
+  ["ADC2",0xE13B],
+  ["ADC3",0xE13C],
+  ["ADC4",0xE13D],
+  ["ADC5",0xE13E],
+  ["ADC6",0xE13F],
+  ["ADC7",0xE140],
+  ["ADC8",0xE141],
+  ["ADC9",0xE142],
+  ["ADCA",0xE143],
+  ["ADCB",0xE144],
+  ["ADCC",0xE145],
+  ["ADCD",0xE146],
+  ["ADCE",0xE147],
+  ["ADCF",0xE148],
+  ["ADD0",0xE149],
+  ["ADD1",0xE14A],
+  ["ADD2",0xE14B],
+  ["ADD3",0xE14C],
+  ["ADD4",0xE14D],
+  ["ADD5",0xE14E],
+  ["ADD6",0xE14F],
+  ["ADD7",0xE150],
+  ["ADD8",0xE151],
+  ["ADD9",0xE152],
+  ["ADDA",0xE153],
+  ["ADDB",0xE154],
+  ["ADDC",0xE155],
+  ["ADDD",0xE156],
+  ["ADDE",0xE157],
+  ["ADDF",0xE158],
+  ["ADE0",0xE159],
+  ["ADE1",0xE15A],
+  ["ADE2",0xE15B],
+  ["ADE3",0xE15C],
+  ["ADE4",0xE15D],
+  ["ADE5",0xE15E],
+  ["ADE6",0xE15F],
+  ["ADE7",0xE160],
+  ["ADE8",0xE161],
+  ["ADE9",0xE162],
+  ["ADEA",0xE163],
+  ["ADEB",0xE164],
+  ["ADEC",0xE165],
+  ["ADED",0xE166],
+  ["ADEE",0xE167],
+  ["ADEF",0xE168],
+  ["ADF0",0xE169],
+  ["ADF1",0xE16A],
+  ["ADF2",0xE16B],
+  ["ADF3",0xE16C],
+  ["ADF4",0xE16D],
+  ["ADF5",0xE16E],
+  ["ADF6",0xE16F],
+  ["ADF7",0xE170],
+  ["ADF8",0xE171],
+  ["ADF9",0xE172],
+  ["ADFA",0xE173],
+  ["ADFB",0xE174],
+  ["ADFC",0xE175],
+  ["ADFD",0xE176],
+  ["ADFE",0xE177],
+  ["AEA1",0xE178],
+  ["AEA2",0xE179],
+  ["AEA3",0xE17A],
+  ["AEA4",0xE17B],
+  ["AEA5",0xE17C],
+  ["AEA6",0xE17D],
+  ["AEA7",0xE17E],
+  ["AEA8",0xE17F],
+  ["AEA9",0xE180],
+  ["AEAA",0xE181],
+  ["AEAB",0xE182],
+  ["AEAC",0xE183],
+  ["AEAD",0xE184],
+  ["AEAE",0xE185],
+  ["AEAF",0xE186],
+  ["AEB0",0xE187],
+  ["AEB1",0xE188],
+  ["AEB2",0xE189],
+  ["AEB3",0xE18A],
+  ["AEB4",0xE18B],
+  ["AEB5",0xE18C],
+  ["AEB6",0xE18D],
+  ["AEB7",0xE18E],
+  ["AEB8",0xE18F],
+  ["AEB9",0xE190],
+  ["AEBA",0xE191],
+  ["AEBB",0xE192],
+  ["AEBC",0xE193],
+  ["AEBD",0xE194],
+  ["AEBE",0xE195],
+  ["AEBF",0xE196],
+  ["AEC0",0xE197],
+  ["AEC1",0xE198],
+  ["AEC2",0xE199],
+  ["AEC3",0xE19A],
+  ["AEC4",0xE19B],
+  ["AEC5",0xE19C],
+  ["AEC6",0xE19D],
+  ["AEC7",0xE19E],
+  ["AEC8",0xE19F],
+  ["AEC9",0xE1A0],
+  ["AECA",0xE1A1],
+  ["AECB",0xE1A2],
+  ["AECC",0xE1A3],
+  ["AECD",0xE1A4],
+  ["AECE",0xE1A5],
+  ["AECF",0xE1A6],
+  ["AED0",0xE1A7],
+  ["AED1",0xE1A8],
+  ["AED2",0xE1A9],
+  ["AED3",0xE1AA],
+  ["AED4",0xE1AB],
+  ["AED5",0xE1AC],
+  ["AED6",0xE1AD],
+  ["AED7",0xE1AE],
+  ["AED8",0xE1AF],
+  ["AED9",0xE1B0],
+  ["AEDA",0xE1B1],
+  ["AEDB",0xE1B2],
+  ["AEDC",0xE1B3],
+  ["AEDD",0xE1B4],
+  ["AEDE",0xE1B5],
+  ["AEDF",0xE1B6],
+  ["AEE0",0xE1B7],
+  ["AEE1",0xE1B8],
+  ["AEE2",0xE1B9],
+  ["AEE3",0xE1BA],
+  ["AEE4",0xE1BB],
+  ["AEE5",0xE1BC],
+  ["AEE6",0xE1BD],
+  ["AEE7",0xE1BE],
+  ["AEE8",0xE1BF],
+  ["AEE9",0xE1C0],
+  ["AEEA",0xE1C1],
+  ["AEEB",0xE1C2],
+  ["AEEC",0xE1C3],
+  ["AEED",0xE1C4],
+  ["AEEE",0xE1C5],
+  ["AEEF",0xE1C6],
+  ["AEF0",0xE1C7],
+  ["AEF1",0xE1C8],
+  ["AEF2",0xE1C9],
+  ["AEF3",0xE1CA],
+  ["AEF4",0xE1CB],
+  ["AEF5",0xE1CC],
+  ["AEF6",0xE1CD],
+  ["AEF7",0xE1CE],
+  ["AEF8",0xE1CF],
+  ["AEF9",0xE1D0],
+  ["AEFA",0xE1D1],
+  ["AEFB",0xE1D2],
+  ["AEFC",0xE1D3],
+  ["AEFD",0xE1D4],
+  ["AEFE",0xE1D5],
+  ["AFA1",0xE1D6],
+  ["AFA2",0xE1D7],
+  ["AFA3",0xE1D8],
+  ["AFA4",0xE1D9],
+  ["AFA5",0xE1DA],
+  ["AFA6",0xE1DB],
+  ["AFA7",0xE1DC],
+  ["AFA8",0xE1DD],
+  ["AFA9",0xE1DE],
+  ["AFAA",0xE1DF],
+  ["AFAB",0xE1E0],
+  ["AFAC",0xE1E1],
+  ["AFAD",0xE1E2],
+  ["AFAE",0xE1E3],
+  ["AFAF",0xE1E4],
+  ["AFB0",0xE1E5],
+  ["AFB1",0xE1E6],
+  ["AFB2",0xE1E7],
+  ["AFB3",0xE1E8],
+  ["AFB4",0xE1E9],
+  ["AFB5",0xE1EA],
+  ["AFB6",0xE1EB],
+  ["AFB7",0xE1EC],
+  ["AFB8",0xE1ED],
+  ["AFB9",0xE1EE],
+  ["AFBA",0xE1EF],
+  ["AFBB",0xE1F0],
+  ["AFBC",0xE1F1],
+  ["AFBD",0xE1F2],
+  ["AFBE",0xE1F3],
+  ["AFBF",0xE1F4],
+  ["AFC0",0xE1F5],
+  ["AFC1",0xE1F6],
+  ["AFC2",0xE1F7],
+  ["AFC3",0xE1F8],
+  ["AFC4",0xE1F9],
+  ["AFC5",0xE1FA],
+  ["AFC6",0xE1FB],
+  ["AFC7",0xE1FC],
+  ["AFC8",0xE1FD],
+  ["AFC9",0xE1FE],
+  ["AFCA",0xE1FF],
+  ["AFCB",0xE200],
+  ["AFCC",0xE201],
+  ["AFCD",0xE202],
+  ["AFCE",0xE203],
+  ["AFCF",0xE204],
+  ["AFD0",0xE205],
+  ["AFD1",0xE206],
+  ["AFD2",0xE207],
+  ["AFD3",0xE208],
+  ["AFD4",0xE209],
+  ["AFD5",0xE20A],
+  ["AFD6",0xE20B],
+  ["AFD7",0xE20C],
+  ["AFD8",0xE20D],
+  ["AFD9",0xE20E],
+  ["AFDA",0xE20F],
+  ["AFDB",0xE210],
+  ["AFDC",0xE211],
+  ["AFDD",0xE212],
+  ["AFDE",0xE213],
+  ["AFDF",0xE214],
+  ["AFE0",0xE215],
+  ["AFE1",0xE216],
+  ["AFE2",0xE217],
+  ["AFE3",0xE218],
+  ["AFE4",0xE219],
+  ["AFE5",0xE21A],
+  ["AFE6",0xE21B],
+  ["AFE7",0xE21C],
+  ["AFE8",0xE21D],
+  ["AFE9",0xE21E],
+  ["AFEA",0xE21F],
+  ["AFEB",0xE220],
+  ["AFEC",0xE221],
+  ["AFED",0xE222],
+  ["AFEE",0xE223],
+  ["AFEF",0xE224],
+  ["AFF0",0xE225],
+  ["AFF1",0xE226],
+  ["AFF2",0xE227],
+  ["AFF3",0xE228],
+  ["AFF4",0xE229],
+  ["AFF5",0xE22A],
+  ["AFF6",0xE22B],
+  ["AFF7",0xE22C],
+  ["AFF8",0xE22D],
+  ["AFF9",0xE22E],
+  ["AFFA",0xE22F],
+  ["AFFB",0xE230],
+  ["AFFC",0xE231],
+  ["AFFD",0xE232],
+  ["AFFE",0xE233],
+  ["F8A1",0xE234],
+  ["F8A2",0xE235],
+  ["F8A3",0xE236],
+  ["F8A4",0xE237],
+  ["F8A5",0xE238],
+  ["F8A6",0xE239],
+  ["F8A7",0xE23A],
+  ["F8A8",0xE23B],
+  ["F8A9",0xE23C],
+  ["F8AA",0xE23D],
+  ["F8AB",0xE23E],
+  ["F8AC",0xE23F],
+  ["F8AD",0xE240],
+  ["F8AE",0xE241],
+  ["F8AF",0xE242],
+  ["F8B0",0xE243],
+  ["F8B1",0xE244],
+  ["F8B2",0xE245],
+  ["F8B3",0xE246],
+  ["F8B4",0xE247],
+  ["F8B5",0xE248],
+  ["F8B6",0xE249],
+  ["F8B7",0xE24A],
+  ["F8B8",0xE24B],
+  ["F8B9",0xE24C],
+  ["F8BA",0xE24D],
+  ["F8BB",0xE24E],
+  ["F8BC",0xE24F],
+  ["F8BD",0xE250],
+  ["F8BE",0xE251],
+  ["F8BF",0xE252],
+  ["F8C0",0xE253],
+  ["F8C1",0xE254],
+  ["F8C2",0xE255],
+  ["F8C3",0xE256],
+  ["F8C4",0xE257],
+  ["F8C5",0xE258],
+  ["F8C6",0xE259],
+  ["F8C7",0xE25A],
+  ["F8C8",0xE25B],
+  ["F8C9",0xE25C],
+  ["F8CA",0xE25D],
+  ["F8CB",0xE25E],
+  ["F8CC",0xE25F],
+  ["F8CD",0xE260],
+  ["F8CE",0xE261],
+  ["F8CF",0xE262],
+  ["F8D0",0xE263],
+  ["F8D1",0xE264],
+  ["F8D2",0xE265],
+  ["F8D3",0xE266],
+  ["F8D4",0xE267],
+  ["F8D5",0xE268],
+  ["F8D6",0xE269],
+  ["F8D7",0xE26A],
+  ["F8D8",0xE26B],
+  ["F8D9",0xE26C],
+  ["F8DA",0xE26D],
+  ["F8DB",0xE26E],
+  ["F8DC",0xE26F],
+  ["F8DD",0xE270],
+  ["F8DE",0xE271],
+  ["F8DF",0xE272],
+  ["F8E0",0xE273],
+  ["F8E1",0xE274],
+  ["F8E2",0xE275],
+  ["F8E3",0xE276],
+  ["F8E4",0xE277],
+  ["F8E5",0xE278],
+  ["F8E6",0xE279],
+  ["F8E7",0xE27A],
+  ["F8E8",0xE27B],
+  ["F8E9",0xE27C],
+  ["F8EA",0xE27D],
+  ["F8EB",0xE27E],
+  ["F8EC",0xE27F],
+  ["F8ED",0xE280],
+  ["F8EE",0xE281],
+  ["F8EF",0xE282],
+  ["F8F0",0xE283],
+  ["F8F1",0xE284],
+  ["F8F2",0xE285],
+  ["F8F3",0xE286],
+  ["F8F4",0xE287],
+  ["F8F5",0xE288],
+  ["F8F6",0xE289],
+  ["F8F7",0xE28A],
+  ["F8F8",0xE28B],
+  ["F8F9",0xE28C],
+  ["F8FA",0xE28D],
+  ["F8FB",0xE28E],
+  ["F8FC",0xE28F],
+  ["F8FD",0xE290],
+  ["F8FE",0xE291],
+  ["F9A1",0xE292],
+  ["F9A2",0xE293],
+  ["F9A3",0xE294],
+  ["F9A4",0xE295],
+  ["F9A5",0xE296],
+  ["F9A6",0xE297],
+  ["F9A7",0xE298],
+  ["F9A8",0xE299],
+  ["F9A9",0xE29A],
+  ["F9AA",0xE29B],
+  ["F9AB",0xE29C],
+  ["F9AC",0xE29D],
+  ["F9AD",0xE29E],
+  ["F9AE",0xE29F],
+  ["F9AF",0xE2A0],
+  ["F9B0",0xE2A1],
+  ["F9B1",0xE2A2],
+  ["F9B2",0xE2A3],
+  ["F9B3",0xE2A4],
+  ["F9B4",0xE2A5],
+  ["F9B5",0xE2A6],
+  ["F9B6",0xE2A7],
+  ["F9B7",0xE2A8],
+  ["F9B8",0xE2A9],
+  ["F9B9",0xE2AA],
+  ["F9BA",0xE2AB],
+  ["F9BB",0xE2AC],
+  ["F9BC",0xE2AD],
+  ["F9BD",0xE2AE],
+  ["F9BE",0xE2AF],
+  ["F9BF",0xE2B0],
+  ["F9C0",0xE2B1],
+  ["F9C1",0xE2B2],
+  ["F9C2",0xE2B3],
+  ["F9C3",0xE2B4],
+  ["F9C4",0xE2B5],
+  ["F9C5",0xE2B6],
+  ["F9C6",0xE2B7],
+  ["F9C7",0xE2B8],
+  ["F9C8",0xE2B9],
+  ["F9C9",0xE2BA],
+  ["F9CA",0xE2BB],
+  ["F9CB",0xE2BC],
+  ["F9CC",0xE2BD],
+  ["F9CD",0xE2BE],
+  ["F9CE",0xE2BF],
+  ["F9CF",0xE2C0],
+  ["F9D0",0xE2C1],
+  ["F9D1",0xE2C2],
+  ["F9D2",0xE2C3],
+  ["F9D3",0xE2C4],
+  ["F9D4",0xE2C5],
+  ["F9D5",0xE2C6],
+  ["F9D6",0xE2C7],
+  ["F9D7",0xE2C8],
+  ["F9D8",0xE2C9],
+  ["F9D9",0xE2CA],
+  ["F9DA",0xE2CB],
+  ["F9DB",0xE2CC],
+  ["F9DC",0xE2CD],
+  ["F9DD",0xE2CE],
+  ["F9DE",0xE2CF],
+  ["F9DF",0xE2D0],
+  ["F9E0",0xE2D1],
+  ["F9E1",0xE2D2],
+  ["F9E2",0xE2D3],
+  ["F9E3",0xE2D4],
+  ["F9E4",0xE2D5],
+  ["F9E5",0xE2D6],
+  ["F9E6",0xE2D7],
+  ["F9E7",0xE2D8],
+  ["F9E8",0xE2D9],
+  ["F9E9",0xE2DA],
+  ["F9EA",0xE2DB],
+  ["F9EB",0xE2DC],
+  ["F9EC",0xE2DD],
+  ["F9ED",0xE2DE],
+  ["F9EE",0xE2DF],
+  ["F9EF",0xE2E0],
+  ["F9F0",0xE2E1],
+  ["F9F1",0xE2E2],
+  ["F9F2",0xE2E3],
+  ["F9F3",0xE2E4],
+  ["F9F4",0xE2E5],
+  ["F9F5",0xE2E6],
+  ["F9F6",0xE2E7],
+  ["F9F7",0xE2E8],
+  ["F9F8",0xE2E9],
+  ["F9F9",0xE2EA],
+  ["F9FA",0xE2EB],
+  ["F9FB",0xE2EC],
+  ["F9FC",0xE2ED],
+  ["F9FD",0xE2EE],
+  ["F9FE",0xE2EF],
+  ["FAA1",0xE2F0],
+  ["FAA2",0xE2F1],
+  ["FAA3",0xE2F2],
+  ["FAA4",0xE2F3],
+  ["FAA5",0xE2F4],
+  ["FAA6",0xE2F5],
+  ["FAA7",0xE2F6],
+  ["FAA8",0xE2F7],
+  ["FAA9",0xE2F8],
+  ["FAAA",0xE2F9],
+  ["FAAB",0xE2FA],
+  ["FAAC",0xE2FB],
+  ["FAAD",0xE2FC],
+  ["FAAE",0xE2FD],
+  ["FAAF",0xE2FE],
+  ["FAB0",0xE2FF],
+  ["FAB1",0xE300],
+  ["FAB2",0xE301],
+  ["FAB3",0xE302],
+  ["FAB4",0xE303],
+  ["FAB5",0xE304],
+  ["FAB6",0xE305],
+  ["FAB7",0xE306],
+  ["FAB8",0xE307],
+  ["FAB9",0xE308],
+  ["FABA",0xE309],
+  ["FABB",0xE30A],
+  ["FABC",0xE30B],
+  ["FABD",0xE30C],
+  ["FABE",0xE30D],
+  ["FABF",0xE30E],
+  ["FAC0",0xE30F],
+  ["FAC1",0xE310],
+  ["FAC2",0xE311],
+  ["FAC3",0xE312],
+  ["FAC4",0xE313],
+  ["FAC5",0xE314],
+  ["FAC6",0xE315],
+  ["FAC7",0xE316],
+  ["FAC8",0xE317],
+  ["FAC9",0xE318],
+  ["FACA",0xE319],
+  ["FACB",0xE31A],
+  ["FACC",0xE31B],
+  ["FACD",0xE31C],
+  ["FACE",0xE31D],
+  ["FACF",0xE31E],
+  ["FAD0",0xE31F],
+  ["FAD1",0xE320],
+  ["FAD2",0xE321],
+  ["FAD3",0xE322],
+  ["FAD4",0xE323],
+  ["FAD5",0xE324],
+  ["FAD6",0xE325],
+  ["FAD7",0xE326],
+  ["FAD8",0xE327],
+  ["FAD9",0xE328],
+  ["FADA",0xE329],
+  ["FADB",0xE32A],
+  ["FADC",0xE32B],
+  ["FADD",0xE32C],
+  ["FADE",0xE32D],
+  ["FADF",0xE32E],
+  ["FAE0",0xE32F],
+  ["FAE1",0xE330],
+  ["FAE2",0xE331],
+  ["FAE3",0xE332],
+  ["FAE4",0xE333],
+  ["FAE5",0xE334],
+  ["FAE6",0xE335],
+  ["FAE7",0xE336],
+  ["FAE8",0xE337],
+  ["FAE9",0xE338],
+  ["FAEA",0xE339],
+  ["FAEB",0xE33A],
+  ["FAEC",0xE33B],
+  ["FAED",0xE33C],
+  ["FAEE",0xE33D],
+  ["FAEF",0xE33E],
+  ["FAF0",0xE33F],
+  ["FAF1",0xE340],
+  ["FAF2",0xE341],
+  ["FAF3",0xE342],
+  ["FAF4",0xE343],
+  ["FAF5",0xE344],
+  ["FAF6",0xE345],
+  ["FAF7",0xE346],
+  ["FAF8",0xE347],
+  ["FAF9",0xE348],
+  ["FAFA",0xE349],
+  ["FAFB",0xE34A],
+  ["FAFC",0xE34B],
+  ["FAFD",0xE34C],
+  ["FAFE",0xE34D],
+  ["FBA1",0xE34E],
+  ["FBA2",0xE34F],
+  ["FBA3",0xE350],
+  ["FBA4",0xE351],
+  ["FBA5",0xE352],
+  ["FBA6",0xE353],
+  ["FBA7",0xE354],
+  ["FBA8",0xE355],
+  ["FBA9",0xE356],
+  ["FBAA",0xE357],
+  ["FBAB",0xE358],
+  ["FBAC",0xE359],
+  ["FBAD",0xE35A],
+  ["FBAE",0xE35B],
+  ["FBAF",0xE35C],
+  ["FBB0",0xE35D],
+  ["FBB1",0xE35E],
+  ["FBB2",0xE35F],
+  ["FBB3",0xE360],
+  ["FBB4",0xE361],
+  ["FBB5",0xE362],
+  ["FBB6",0xE363],
+  ["FBB7",0xE364],
+  ["FBB8",0xE365],
+  ["FBB9",0xE366],
+  ["FBBA",0xE367],
+  ["FBBB",0xE368],
+  ["FBBC",0xE369],
+  ["FBBD",0xE36A],
+  ["FBBE",0xE36B],
+  ["FBBF",0xE36C],
+  ["FBC0",0xE36D],
+  ["FBC1",0xE36E],
+  ["FBC2",0xE36F],
+  ["FBC3",0xE370],
+  ["FBC4",0xE371],
+  ["FBC5",0xE372],
+  ["FBC6",0xE373],
+  ["FBC7",0xE374],
+  ["FBC8",0xE375],
+  ["FBC9",0xE376],
+  ["FBCA",0xE377],
+  ["FBCB",0xE378],
+  ["FBCC",0xE379],
+  ["FBCD",0xE37A],
+  ["FBCE",0xE37B],
+  ["FBCF",0xE37C],
+  ["FBD0",0xE37D],
+  ["FBD1",0xE37E],
+  ["FBD2",0xE37F],
+  ["FBD3",0xE380],
+  ["FBD4",0xE381],
+  ["FBD5",0xE382],
+  ["FBD6",0xE383],
+  ["FBD7",0xE384],
+  ["FBD8",0xE385],
+  ["FBD9",0xE386],
+  ["FBDA",0xE387],
+  ["FBDB",0xE388],
+  ["FBDC",0xE389],
+  ["FBDD",0xE38A],
+  ["FBDE",0xE38B],
+  ["FBDF",0xE38C],
+  ["FBE0",0xE38D],
+  ["FBE1",0xE38E],
+  ["FBE2",0xE38F],
+  ["FBE3",0xE390],
+  ["FBE4",0xE391],
+  ["FBE5",0xE392],
+  ["FBE6",0xE393],
+  ["FBE7",0xE394],
+  ["FBE8",0xE395],
+  ["FBE9",0xE396],
+  ["FBEA",0xE397],
+  ["FBEB",0xE398],
+  ["FBEC",0xE399],
+  ["FBED",0xE39A],
+  ["FBEE",0xE39B],
+  ["FBEF",0xE39C],
+  ["FBF0",0xE39D],
+  ["FBF1",0xE39E],
+  ["FBF2",0xE39F],
+  ["FBF3",0xE3A0],
+  ["FBF4",0xE3A1],
+  ["FBF5",0xE3A2],
+  ["FBF6",0xE3A3],
+  ["FBF7",0xE3A4],
+  ["FBF8",0xE3A5],
+  ["FBF9",0xE3A6],
+  ["FBFA",0xE3A7],
+  ["FBFB",0xE3A8],
+  ["FBFC",0xE3A9],
+  ["FBFD",0xE3AA],
+  ["FBFE",0xE3AB],
+  ["FCA1",0xE3AC],
+  ["FCA2",0xE3AD],
+  ["FCA3",0xE3AE],
+  ["FCA4",0xE3AF],
+  ["FCA5",0xE3B0],
+  ["FCA6",0xE3B1],
+  ["FCA7",0xE3B2],
+  ["FCA8",0xE3B3],
+  ["FCA9",0xE3B4],
+  ["FCAA",0xE3B5],
+  ["FCAB",0xE3B6],
+  ["FCAC",0xE3B7],
+  ["FCAD",0xE3B8],
+  ["FCAE",0xE3B9],
+  ["FCAF",0xE3BA],
+  ["FCB0",0xE3BB],
+  ["FCB1",0xE3BC],
+  ["FCB2",0xE3BD],
+  ["FCB3",0xE3BE],
+  ["FCB4",0xE3BF],
+  ["FCB5",0xE3C0],
+  ["FCB6",0xE3C1],
+  ["FCB7",0xE3C2],
+  ["FCB8",0xE3C3],
+  ["FCB9",0xE3C4],
+  ["FCBA",0xE3C5],
+  ["FCBB",0xE3C6],
+  ["FCBC",0xE3C7],
+  ["FCBD",0xE3C8],
+  ["FCBE",0xE3C9],
+  ["FCBF",0xE3CA],
+  ["FCC0",0xE3CB],
+  ["FCC1",0xE3CC],
+  ["FCC2",0xE3CD],
+  ["FCC3",0xE3CE],
+  ["FCC4",0xE3CF],
+  ["FCC5",0xE3D0],
+  ["FCC6",0xE3D1],
+  ["FCC7",0xE3D2],
+  ["FCC8",0xE3D3],
+  ["FCC9",0xE3D4],
+  ["FCCA",0xE3D5],
+  ["FCCB",0xE3D6],
+  ["FCCC",0xE3D7],
+  ["FCCD",0xE3D8],
+  ["FCCE",0xE3D9],
+  ["FCCF",0xE3DA],
+  ["FCD0",0xE3DB],
+  ["FCD1",0xE3DC],
+  ["FCD2",0xE3DD],
+  ["FCD3",0xE3DE],
+  ["FCD4",0xE3DF],
+  ["FCD5",0xE3E0],
+  ["FCD6",0xE3E1],
+  ["FCD7",0xE3E2],
+  ["FCD8",0xE3E3],
+  ["FCD9",0xE3E4],
+  ["FCDA",0xE3E5],
+  ["FCDB",0xE3E6],
+  ["FCDC",0xE3E7],
+  ["FCDD",0xE3E8],
+  ["FCDE",0xE3E9],
+  ["FCDF",0xE3EA],
+  ["FCE0",0xE3EB],
+  ["FCE1",0xE3EC],
+  ["FCE2",0xE3ED],
+  ["FCE3",0xE3EE],
+  ["FCE4",0xE3EF],
+  ["FCE5",0xE3F0],
+  ["FCE6",0xE3F1],
+  ["FCE7",0xE3F2],
+  ["FCE8",0xE3F3],
+  ["FCE9",0xE3F4],
+  ["FCEA",0xE3F5],
+  ["FCEB",0xE3F6],
+  ["FCEC",0xE3F7],
+  ["FCED",0xE3F8],
+  ["FCEE",0xE3F9],
+  ["FCEF",0xE3FA],
+  ["FCF0",0xE3FB],
+  ["FCF1",0xE3FC],
+  ["FCF2",0xE3FD],
+  ["FCF3",0xE3FE],
+  ["FCF4",0xE3FF],
+  ["FCF5",0xE400],
+  ["FCF6",0xE401],
+  ["FCF7",0xE402],
+  ["FCF8",0xE403],
+  ["FCF9",0xE404],
+  ["FCFA",0xE405],
+  ["FCFB",0xE406],
+  ["FCFC",0xE407],
+  ["FCFD",0xE408],
+  ["FCFE",0xE409],
+  ["FDA1",0xE40A],
+  ["FDA2",0xE40B],
+  ["FDA3",0xE40C],
+  ["FDA4",0xE40D],
+  ["FDA5",0xE40E],
+  ["FDA6",0xE40F],
+  ["FDA7",0xE410],
+  ["FDA8",0xE411],
+  ["FDA9",0xE412],
+  ["FDAA",0xE413],
+  ["FDAB",0xE414],
+  ["FDAC",0xE415],
+  ["FDAD",0xE416],
+  ["FDAE",0xE417],
+  ["FDAF",0xE418],
+  ["FDB0",0xE419],
+  ["FDB1",0xE41A],
+  ["FDB2",0xE41B],
+  ["FDB3",0xE41C],
+  ["FDB4",0xE41D],
+  ["FDB5",0xE41E],
+  ["FDB6",0xE41F],
+  ["FDB7",0xE420],
+  ["FDB8",0xE421],
+  ["FDB9",0xE422],
+  ["FDBA",0xE423],
+  ["FDBB",0xE424],
+  ["FDBC",0xE425],
+  ["FDBD",0xE426],
+  ["FDBE",0xE427],
+  ["FDBF",0xE428],
+  ["FDC0",0xE429],
+  ["FDC1",0xE42A],
+  ["FDC2",0xE42B],
+  ["FDC3",0xE42C],
+  ["FDC4",0xE42D],
+  ["FDC5",0xE42E],
+  ["FDC6",0xE42F],
+  ["FDC7",0xE430],
+  ["FDC8",0xE431],
+  ["FDC9",0xE432],
+  ["FDCA",0xE433],
+  ["FDCB",0xE434],
+  ["FDCC",0xE435],
+  ["FDCD",0xE436],
+  ["FDCE",0xE437],
+  ["FDCF",0xE438],
+  ["FDD0",0xE439],
+  ["FDD1",0xE43A],
+  ["FDD2",0xE43B],
+  ["FDD3",0xE43C],
+  ["FDD4",0xE43D],
+  ["FDD5",0xE43E],
+  ["FDD6",0xE43F],
+  ["FDD7",0xE440],
+  ["FDD8",0xE441],
+  ["FDD9",0xE442],
+  ["FDDA",0xE443],
+  ["FDDB",0xE444],
+  ["FDDC",0xE445],
+  ["FDDD",0xE446],
+  ["FDDE",0xE447],
+  ["FDDF",0xE448],
+  ["FDE0",0xE449],
+  ["FDE1",0xE44A],
+  ["FDE2",0xE44B],
+  ["FDE3",0xE44C],
+  ["FDE4",0xE44D],
+  ["FDE5",0xE44E],
+  ["FDE6",0xE44F],
+  ["FDE7",0xE450],
+  ["FDE8",0xE451],
+  ["FDE9",0xE452],
+  ["FDEA",0xE453],
+  ["FDEB",0xE454],
+  ["FDEC",0xE455],
+  ["FDED",0xE456],
+  ["FDEE",0xE457],
+  ["FDEF",0xE458],
+  ["FDF0",0xE459],
+  ["FDF1",0xE45A],
+  ["FDF2",0xE45B],
+  ["FDF3",0xE45C],
+  ["FDF4",0xE45D],
+  ["FDF5",0xE45E],
+  ["FDF6",0xE45F],
+  ["FDF7",0xE460],
+  ["FDF8",0xE461],
+  ["FDF9",0xE462],
+  ["FDFA",0xE463],
+  ["FDFB",0xE464],
+  ["FDFC",0xE465],
+  ["FDFD",0xE466],
+  ["FDFE",0xE467],
+  ["FEA1",0xE468],
+  ["FEA2",0xE469],
+  ["FEA3",0xE46A],
+  ["FEA4",0xE46B],
+  ["FEA5",0xE46C],
+  ["FEA6",0xE46D],
+  ["FEA7",0xE46E],
+  ["FEA8",0xE46F],
+  ["FEA9",0xE470],
+  ["FEAA",0xE471],
+  ["FEAB",0xE472],
+  ["FEAC",0xE473],
+  ["FEAD",0xE474],
+  ["FEAE",0xE475],
+  ["FEAF",0xE476],
+  ["FEB0",0xE477],
+  ["FEB1",0xE478],
+  ["FEB2",0xE479],
+  ["FEB3",0xE47A],
+  ["FEB4",0xE47B],
+  ["FEB5",0xE47C],
+  ["FEB6",0xE47D],
+  ["FEB7",0xE47E],
+  ["FEB8",0xE47F],
+  ["FEB9",0xE480],
+  ["FEBA",0xE481],
+  ["FEBB",0xE482],
+  ["FEBC",0xE483],
+  ["FEBD",0xE484],
+  ["FEBE",0xE485],
+  ["FEBF",0xE486],
+  ["FEC0",0xE487],
+  ["FEC1",0xE488],
+  ["FEC2",0xE489],
+  ["FEC3",0xE48A],
+  ["FEC4",0xE48B],
+  ["FEC5",0xE48C],
+  ["FEC6",0xE48D],
+  ["FEC7",0xE48E],
+  ["FEC8",0xE48F],
+  ["FEC9",0xE490],
+  ["FECA",0xE491],
+  ["FECB",0xE492],
+  ["FECC",0xE493],
+  ["FECD",0xE494],
+  ["FECE",0xE495],
+  ["FECF",0xE496],
+  ["FED0",0xE497],
+  ["FED1",0xE498],
+  ["FED2",0xE499],
+  ["FED3",0xE49A],
+  ["FED4",0xE49B],
+  ["FED5",0xE49C],
+  ["FED6",0xE49D],
+  ["FED7",0xE49E],
+  ["FED8",0xE49F],
+  ["FED9",0xE4A0],
+  ["FEDA",0xE4A1],
+  ["FEDB",0xE4A2],
+  ["FEDC",0xE4A3],
+  ["FEDD",0xE4A4],
+  ["FEDE",0xE4A5],
+  ["FEDF",0xE4A6],
+  ["FEE0",0xE4A7],
+  ["FEE1",0xE4A8],
+  ["FEE2",0xE4A9],
+  ["FEE3",0xE4AA],
+  ["FEE4",0xE4AB],
+  ["FEE5",0xE4AC],
+  ["FEE6",0xE4AD],
+  ["FEE7",0xE4AE],
+  ["FEE8",0xE4AF],
+  ["FEE9",0xE4B0],
+  ["FEEA",0xE4B1],
+  ["FEEB",0xE4B2],
+  ["FEEC",0xE4B3],
+  ["FEED",0xE4B4],
+  ["FEEE",0xE4B5],
+  ["FEEF",0xE4B6],
+  ["FEF0",0xE4B7],
+  ["FEF1",0xE4B8],
+  ["FEF2",0xE4B9],
+  ["FEF3",0xE4BA],
+  ["FEF4",0xE4BB],
+  ["FEF5",0xE4BC],
+  ["FEF6",0xE4BD],
+  ["FEF7",0xE4BE],
+  ["FEF8",0xE4BF],
+  ["FEF9",0xE4C0],
+  ["FEFA",0xE4C1],
+  ["FEFB",0xE4C2],
+  ["FEFC",0xE4C3],
+  ["FEFD",0xE4C4],
+  ["FEFE",0xE4C5],
+  ["A140",0xE4C6],
+  ["A141",0xE4C7],
+  ["A142",0xE4C8],
+  ["A143",0xE4C9],
+  ["A144",0xE4CA],
+  ["A145",0xE4CB],
+  ["A146",0xE4CC],
+  ["A147",0xE4CD],
+  ["A148",0xE4CE],
+  ["A149",0xE4CF],
+  ["A14A",0xE4D0],
+  ["A14B",0xE4D1],
+  ["A14C",0xE4D2],
+  ["A14D",0xE4D3],
+  ["A14E",0xE4D4],
+  ["A14F",0xE4D5],
+  ["A150",0xE4D6],
+  ["A151",0xE4D7],
+  ["A152",0xE4D8],
+  ["A153",0xE4D9],
+  ["A154",0xE4DA],
+  ["A155",0xE4DB],
+  ["A156",0xE4DC],
+  ["A157",0xE4DD],
+  ["A158",0xE4DE],
+  ["A159",0xE4DF],
+  ["A15A",0xE4E0],
+  ["A15B",0xE4E1],
+  ["A15C",0xE4E2],
+  ["A15D",0xE4E3],
+  ["A15E",0xE4E4],
+  ["A15F",0xE4E5],
+  ["A160",0xE4E6],
+  ["A161",0xE4E7],
+  ["A162",0xE4E8],
+  ["A163",0xE4E9],
+  ["A164",0xE4EA],
+  ["A165",0xE4EB],
+  ["A166",0xE4EC],
+  ["A167",0xE4ED],
+  ["A168",0xE4EE],
+  ["A169",0xE4EF],
+  ["A16A",0xE4F0],
+  ["A16B",0xE4F1],
+  ["A16C",0xE4F2],
+  ["A16D",0xE4F3],
+  ["A16E",0xE4F4],
+  ["A16F",0xE4F5],
+  ["A170",0xE4F6],
+  ["A171",0xE4F7],
+  ["A172",0xE4F8],
+  ["A173",0xE4F9],
+  ["A174",0xE4FA],
+  ["A175",0xE4FB],
+  ["A176",0xE4FC],
+  ["A177",0xE4FD],
+  ["A178",0xE4FE],
+  ["A179",0xE4FF],
+  ["A17A",0xE500],
+  ["A17B",0xE501],
+  ["A17C",0xE502],
+  ["A17D",0xE503],
+  ["A17E",0xE504],
+  ["A180",0xE505],
+  ["A181",0xE506],
+  ["A182",0xE507],
+  ["A183",0xE508],
+  ["A184",0xE509],
+  ["A185",0xE50A],
+  ["A186",0xE50B],
+  ["A187",0xE50C],
+  ["A188",0xE50D],
+  ["A189",0xE50E],
+  ["A18A",0xE50F],
+  ["A18B",0xE510],
+  ["A18C",0xE511],
+  ["A18D",0xE512],
+  ["A18E",0xE513],
+  ["A18F",0xE514],
+  ["A190",0xE515],
+  ["A191",0xE516],
+  ["A192",0xE517],
+  ["A193",0xE518],
+  ["A194",0xE519],
+  ["A195",0xE51A],
+  ["A196",0xE51B],
+  ["A197",0xE51C],
+  ["A198",0xE51D],
+  ["A199",0xE51E],
+  ["A19A",0xE51F],
+  ["A19B",0xE520],
+  ["A19C",0xE521],
+  ["A19D",0xE522],
+  ["A19E",0xE523],
+  ["A19F",0xE524],
+  ["A1A0",0xE525],
+  ["A240",0xE526],
+  ["A241",0xE527],
+  ["A242",0xE528],
+  ["A243",0xE529],
+  ["A244",0xE52A],
+  ["A245",0xE52B],
+  ["A246",0xE52C],
+  ["A247",0xE52D],
+  ["A248",0xE52E],
+  ["A249",0xE52F],
+  ["A24A",0xE530],
+  ["A24B",0xE531],
+  ["A24C",0xE532],
+  ["A24D",0xE533],
+  ["A24E",0xE534],
+  ["A24F",0xE535],
+  ["A250",0xE536],
+  ["A251",0xE537],
+  ["A252",0xE538],
+  ["A253",0xE539],
+  ["A254",0xE53A],
+  ["A255",0xE53B],
+  ["A256",0xE53C],
+  ["A257",0xE53D],
+  ["A258",0xE53E],
+  ["A259",0xE53F],
+  ["A25A",0xE540],
+  ["A25B",0xE541],
+  ["A25C",0xE542],
+  ["A25D",0xE543],
+  ["A25E",0xE544],
+  ["A25F",0xE545],
+  ["A260",0xE546],
+  ["A261",0xE547],
+  ["A262",0xE548],
+  ["A263",0xE549],
+  ["A264",0xE54A],
+  ["A265",0xE54B],
+  ["A266",0xE54C],
+  ["A267",0xE54D],
+  ["A268",0xE54E],
+  ["A269",0xE54F],
+  ["A26A",0xE550],
+  ["A26B",0xE551],
+  ["A26C",0xE552],
+  ["A26D",0xE553],
+  ["A26E",0xE554],
+  ["A26F",0xE555],
+  ["A270",0xE556],
+  ["A271",0xE557],
+  ["A272",0xE558],
+  ["A273",0xE559],
+  ["A274",0xE55A],
+  ["A275",0xE55B],
+  ["A276",0xE55C],
+  ["A277",0xE55D],
+  ["A278",0xE55E],
+  ["A279",0xE55F],
+  ["A27A",0xE560],
+  ["A27B",0xE561],
+  ["A27C",0xE562],
+  ["A27D",0xE563],
+  ["A27E",0xE564],
+  ["A280",0xE565],
+  ["A281",0xE566],
+  ["A282",0xE567],
+  ["A283",0xE568],
+  ["A284",0xE569],
+  ["A285",0xE56A],
+  ["A286",0xE56B],
+  ["A287",0xE56C],
+  ["A288",0xE56D],
+  ["A289",0xE56E],
+  ["A28A",0xE56F],
+  ["A28B",0xE570],
+  ["A28C",0xE571],
+  ["A28D",0xE572],
+  ["A28E",0xE573],
+  ["A28F",0xE574],
+  ["A290",0xE575],
+  ["A291",0xE576],
+  ["A292",0xE577],
+  ["A293",0xE578],
+  ["A294",0xE579],
+  ["A295",0xE57A],
+  ["A296",0xE57B],
+  ["A297",0xE57C],
+  ["A298",0xE57D],
+  ["A299",0xE57E],
+  ["A29A",0xE57F],
+  ["A29B",0xE580],
+  ["A29C",0xE581],
+  ["A29D",0xE582],
+  ["A29E",0xE583],
+  ["A29F",0xE584],
+  ["A2A0",0xE585],
+  ["A340",0xE586],
+  ["A341",0xE587],
+  ["A342",0xE588],
+  ["A343",0xE589],
+  ["A344",0xE58A],
+  ["A345",0xE58B],
+  ["A346",0xE58C],
+  ["A347",0xE58D],
+  ["A348",0xE58E],
+  ["A349",0xE58F],
+  ["A34A",0xE590],
+  ["A34B",0xE591],
+  ["A34C",0xE592],
+  ["A34D",0xE593],
+  ["A34E",0xE594],
+  ["A34F",0xE595],
+  ["A350",0xE596],
+  ["A351",0xE597],
+  ["A352",0xE598],
+  ["A353",0xE599],
+  ["A354",0xE59A],
+  ["A355",0xE59B],
+  ["A356",0xE59C],
+  ["A357",0xE59D],
+  ["A358",0xE59E],
+  ["A359",0xE59F],
+  ["A35A",0xE5A0],
+  ["A35B",0xE5A1],
+  ["A35C",0xE5A2],
+  ["A35D",0xE5A3],
+  ["A35E",0xE5A4],
+  ["A35F",0xE5A5],
+  ["A360",0xE5A6],
+  ["A361",0xE5A7],
+  ["A362",0xE5A8],
+  ["A363",0xE5A9],
+  ["A364",0xE5AA],
+  ["A365",0xE5AB],
+  ["A366",0xE5AC],
+  ["A367",0xE5AD],
+  ["A368",0xE5AE],
+  ["A369",0xE5AF],
+  ["A36A",0xE5B0],
+  ["A36B",0xE5B1],
+  ["A36C",0xE5B2],
+  ["A36D",0xE5B3],
+  ["A36E",0xE5B4],
+  ["A36F",0xE5B5],
+  ["A370",0xE5B6],
+  ["A371",0xE5B7],
+  ["A372",0xE5B8],
+  ["A373",0xE5B9],
+  ["A374",0xE5BA],
+  ["A375",0xE5BB],
+  ["A376",0xE5BC],
+  ["A377",0xE5BD],
+  ["A378",0xE5BE],
+  ["A379",0xE5BF],
+  ["A37A",0xE5C0],
+  ["A37B",0xE5C1],
+  ["A37C",0xE5C2],
+  ["A37D",0xE5C3],
+  ["A37E",0xE5C4],
+  ["A380",0xE5C5],
+  ["A381",0xE5C6],
+  ["A382",0xE5C7],
+  ["A383",0xE5C8],
+  ["A384",0xE5C9],
+  ["A385",0xE5CA],
+  ["A386",0xE5CB],
+  ["A387",0xE5CC],
+  ["A388",0xE5CD],
+  ["A389",0xE5CE],
+  ["A38A",0xE5CF],
+  ["A38B",0xE5D0],
+  ["A38C",0xE5D1],
+  ["A38D",0xE5D2],
+  ["A38E",0xE5D3],
+  ["A38F",0xE5D4],
+  ["A390",0xE5D5],
+  ["A391",0xE5D6],
+  ["A392",0xE5D7],
+  ["A393",0xE5D8],
+  ["A394",0xE5D9],
+  ["A395",0xE5DA],
+  ["A396",0xE5DB],
+  ["A397",0xE5DC],
+  ["A398",0xE5DD],
+  ["A399",0xE5DE],
+  ["A39A",0xE5DF],
+  ["A39B",0xE5E0],
+  ["A39C",0xE5E1],
+  ["A39D",0xE5E2],
+  ["A39E",0xE5E3],
+  ["A39F",0xE5E4],
+  ["A3A0",0xE5E5],
+  ["A440",0xE5E6],
+  ["A441",0xE5E7],
+  ["A442",0xE5E8],
+  ["A443",0xE5E9],
+  ["A444",0xE5EA],
+  ["A445",0xE5EB],
+  ["A446",0xE5EC],
+  ["A447",0xE5ED],
+  ["A448",0xE5EE],
+  ["A449",0xE5EF],
+  ["A44A",0xE5F0],
+  ["A44B",0xE5F1],
+  ["A44C",0xE5F2],
+  ["A44D",0xE5F3],
+  ["A44E",0xE5F4],
+  ["A44F",0xE5F5],
+  ["A450",0xE5F6],
+  ["A451",0xE5F7],
+  ["A452",0xE5F8],
+  ["A453",0xE5F9],
+  ["A454",0xE5FA],
+  ["A455",0xE5FB],
+  ["A456",0xE5FC],
+  ["A457",0xE5FD],
+  ["A458",0xE5FE],
+  ["A459",0xE5FF],
+  ["A45A",0xE600],
+  ["A45B",0xE601],
+  ["A45C",0xE602],
+  ["A45D",0xE603],
+  ["A45E",0xE604],
+  ["A45F",0xE605],
+  ["A460",0xE606],
+  ["A461",0xE607],
+  ["A462",0xE608],
+  ["A463",0xE609],
+  ["A464",0xE60A],
+  ["A465",0xE60B],
+  ["A466",0xE60C],
+  ["A467",0xE60D],
+  ["A468",0xE60E],
+  ["A469",0xE60F],
+  ["A46A",0xE610],
+  ["A46B",0xE611],
+  ["A46C",0xE612],
+  ["A46D",0xE613],
+  ["A46E",0xE614],
+  ["A46F",0xE615],
+  ["A470",0xE616],
+  ["A471",0xE617],
+  ["A472",0xE618],
+  ["A473",0xE619],
+  ["A474",0xE61A],
+  ["A475",0xE61B],
+  ["A476",0xE61C],
+  ["A477",0xE61D],
+  ["A478",0xE61E],
+  ["A479",0xE61F],
+  ["A47A",0xE620],
+  ["A47B",0xE621],
+  ["A47C",0xE622],
+  ["A47D",0xE623],
+  ["A47E",0xE624],
+  ["A480",0xE625],
+  ["A481",0xE626],
+  ["A482",0xE627],
+  ["A483",0xE628],
+  ["A484",0xE629],
+  ["A485",0xE62A],
+  ["A486",0xE62B],
+  ["A487",0xE62C],
+  ["A488",0xE62D],
+  ["A489",0xE62E],
+  ["A48A",0xE62F],
+  ["A48B",0xE630],
+  ["A48C",0xE631],
+  ["A48D",0xE632],
+  ["A48E",0xE633],
+  ["A48F",0xE634],
+  ["A490",0xE635],
+  ["A491",0xE636],
+  ["A492",0xE637],
+  ["A493",0xE638],
+  ["A494",0xE639],
+  ["A495",0xE63A],
+  ["A496",0xE63B],
+  ["A497",0xE63C],
+  ["A498",0xE63D],
+  ["A499",0xE63E],
+  ["A49A",0xE63F],
+  ["A49B",0xE640],
+  ["A49C",0xE641],
+  ["A49D",0xE642],
+  ["A49E",0xE643],
+  ["A49F",0xE644],
+  ["A4A0",0xE645],
+  ["A540",0xE646],
+  ["A541",0xE647],
+  ["A542",0xE648],
+  ["A543",0xE649],
+  ["A544",0xE64A],
+  ["A545",0xE64B],
+  ["A546",0xE64C],
+  ["A547",0xE64D],
+  ["A548",0xE64E],
+  ["A549",0xE64F],
+  ["A54A",0xE650],
+  ["A54B",0xE651],
+  ["A54C",0xE652],
+  ["A54D",0xE653],
+  ["A54E",0xE654],
+  ["A54F",0xE655],
+  ["A550",0xE656],
+  ["A551",0xE657],
+  ["A552",0xE658],
+  ["A553",0xE659],
+  ["A554",0xE65A],
+  ["A555",0xE65B],
+  ["A556",0xE65C],
+  ["A557",0xE65D],
+  ["A558",0xE65E],
+  ["A559",0xE65F],
+  ["A55A",0xE660],
+  ["A55B",0xE661],
+  ["A55C",0xE662],
+  ["A55D",0xE663],
+  ["A55E",0xE664],
+  ["A55F",0xE665],
+  ["A560",0xE666],
+  ["A561",0xE667],
+  ["A562",0xE668],
+  ["A563",0xE669],
+  ["A564",0xE66A],
+  ["A565",0xE66B],
+  ["A566",0xE66C],
+  ["A567",0xE66D],
+  ["A568",0xE66E],
+  ["A569",0xE66F],
+  ["A56A",0xE670],
+  ["A56B",0xE671],
+  ["A56C",0xE672],
+  ["A56D",0xE673],
+  ["A56E",0xE674],
+  ["A56F",0xE675],
+  ["A570",0xE676],
+  ["A571",0xE677],
+  ["A572",0xE678],
+  ["A573",0xE679],
+  ["A574",0xE67A],
+  ["A575",0xE67B],
+  ["A576",0xE67C],
+  ["A577",0xE67D],
+  ["A578",0xE67E],
+  ["A579",0xE67F],
+  ["A57A",0xE680],
+  ["A57B",0xE681],
+  ["A57C",0xE682],
+  ["A57D",0xE683],
+  ["A57E",0xE684],
+  ["A580",0xE685],
+  ["A581",0xE686],
+  ["A582",0xE687],
+  ["A583",0xE688],
+  ["A584",0xE689],
+  ["A585",0xE68A],
+  ["A586",0xE68B],
+  ["A587",0xE68C],
+  ["A588",0xE68D],
+  ["A589",0xE68E],
+  ["A58A",0xE68F],
+  ["A58B",0xE690],
+  ["A58C",0xE691],
+  ["A58D",0xE692],
+  ["A58E",0xE693],
+  ["A58F",0xE694],
+  ["A590",0xE695],
+  ["A591",0xE696],
+  ["A592",0xE697],
+  ["A593",0xE698],
+  ["A594",0xE699],
+  ["A595",0xE69A],
+  ["A596",0xE69B],
+  ["A597",0xE69C],
+  ["A598",0xE69D],
+  ["A599",0xE69E],
+  ["A59A",0xE69F],
+  ["A59B",0xE6A0],
+  ["A59C",0xE6A1],
+  ["A59D",0xE6A2],
+  ["A59E",0xE6A3],
+  ["A59F",0xE6A4],
+  ["A5A0",0xE6A5],
+  ["A640",0xE6A6],
+  ["A641",0xE6A7],
+  ["A642",0xE6A8],
+  ["A643",0xE6A9],
+  ["A644",0xE6AA],
+  ["A645",0xE6AB],
+  ["A646",0xE6AC],
+  ["A647",0xE6AD],
+  ["A648",0xE6AE],
+  ["A649",0xE6AF],
+  ["A64A",0xE6B0],
+  ["A64B",0xE6B1],
+  ["A64C",0xE6B2],
+  ["A64D",0xE6B3],
+  ["A64E",0xE6B4],
+  ["A64F",0xE6B5],
+  ["A650",0xE6B6],
+  ["A651",0xE6B7],
+  ["A652",0xE6B8],
+  ["A653",0xE6B9],
+  ["A654",0xE6BA],
+  ["A655",0xE6BB],
+  ["A656",0xE6BC],
+  ["A657",0xE6BD],
+  ["A658",0xE6BE],
+  ["A659",0xE6BF],
+  ["A65A",0xE6C0],
+  ["A65B",0xE6C1],
+  ["A65C",0xE6C2],
+  ["A65D",0xE6C3],
+  ["A65E",0xE6C4],
+  ["A65F",0xE6C5],
+  ["A660",0xE6C6],
+  ["A661",0xE6C7],
+  ["A662",0xE6C8],
+  ["A663",0xE6C9],
+  ["A664",0xE6CA],
+  ["A665",0xE6CB],
+  ["A666",0xE6CC],
+  ["A667",0xE6CD],
+  ["A668",0xE6CE],
+  ["A669",0xE6CF],
+  ["A66A",0xE6D0],
+  ["A66B",0xE6D1],
+  ["A66C",0xE6D2],
+  ["A66D",0xE6D3],
+  ["A66E",0xE6D4],
+  ["A66F",0xE6D5],
+  ["A670",0xE6D6],
+  ["A671",0xE6D7],
+  ["A672",0xE6D8],
+  ["A673",0xE6D9],
+  ["A674",0xE6DA],
+  ["A675",0xE6DB],
+  ["A676",0xE6DC],
+  ["A677",0xE6DD],
+  ["A678",0xE6DE],
+  ["A679",0xE6DF],
+  ["A67A",0xE6E0],
+  ["A67B",0xE6E1],
+  ["A67C",0xE6E2],
+  ["A67D",0xE6E3],
+  ["A67E",0xE6E4],
+  ["A680",0xE6E5],
+  ["A681",0xE6E6],
+  ["A682",0xE6E7],
+  ["A683",0xE6E8],
+  ["A684",0xE6E9],
+  ["A685",0xE6EA],
+  ["A686",0xE6EB],
+  ["A687",0xE6EC],
+  ["A688",0xE6ED],
+  ["A689",0xE6EE],
+  ["A68A",0xE6EF],
+  ["A68B",0xE6F0],
+  ["A68C",0xE6F1],
+  ["A68D",0xE6F2],
+  ["A68E",0xE6F3],
+  ["A68F",0xE6F4],
+  ["A690",0xE6F5],
+  ["A691",0xE6F6],
+  ["A692",0xE6F7],
+  ["A693",0xE6F8],
+  ["A694",0xE6F9],
+  ["A695",0xE6FA],
+  ["A696",0xE6FB],
+  ["A697",0xE6FC],
+  ["A698",0xE6FD],
+  ["A699",0xE6FE],
+  ["A69A",0xE6FF],
+  ["A69B",0xE700],
+  ["A69C",0xE701],
+  ["A69D",0xE702],
+  ["A69E",0xE703],
+  ["A69F",0xE704],
+  ["A6A0",0xE705],
+  ["A740",0xE706],
+  ["A741",0xE707],
+  ["A742",0xE708],
+  ["A743",0xE709],
+  ["A744",0xE70A],
+  ["A745",0xE70B],
+  ["A746",0xE70C],
+  ["A747",0xE70D],
+  ["A748",0xE70E],
+  ["A749",0xE70F],
+  ["A74A",0xE710],
+  ["A74B",0xE711],
+  ["A74C",0xE712],
+  ["A74D",0xE713],
+  ["A74E",0xE714],
+  ["A74F",0xE715],
+  ["A750",0xE716],
+  ["A751",0xE717],
+  ["A752",0xE718],
+  ["A753",0xE719],
+  ["A754",0xE71A],
+  ["A755",0xE71B],
+  ["A756",0xE71C],
+  ["A757",0xE71D],
+  ["A758",0xE71E],
+  ["A759",0xE71F],
+  ["A75A",0xE720],
+  ["A75B",0xE721],
+  ["A75C",0xE722],
+  ["A75D",0xE723],
+  ["A75E",0xE724],
+  ["A75F",0xE725],
+  ["A760",0xE726],
+  ["A761",0xE727],
+  ["A762",0xE728],
+  ["A763",0xE729],
+  ["A764",0xE72A],
+  ["A765",0xE72B],
+  ["A766",0xE72C],
+  ["A767",0xE72D],
+  ["A768",0xE72E],
+  ["A769",0xE72F],
+  ["A76A",0xE730],
+  ["A76B",0xE731],
+  ["A76C",0xE732],
+  ["A76D",0xE733],
+  ["A76E",0xE734],
+  ["A76F",0xE735],
+  ["A770",0xE736],
+  ["A771",0xE737],
+  ["A772",0xE738],
+  ["A773",0xE739],
+  ["A774",0xE73A],
+  ["A775",0xE73B],
+  ["A776",0xE73C],
+  ["A777",0xE73D],
+  ["A778",0xE73E],
+  ["A779",0xE73F],
+  ["A77A",0xE740],
+  ["A77B",0xE741],
+  ["A77C",0xE742],
+  ["A77D",0xE743],
+  ["A77E",0xE744],
+  ["A780",0xE745],
+  ["A781",0xE746],
+  ["A782",0xE747],
+  ["A783",0xE748],
+  ["A784",0xE749],
+  ["A785",0xE74A],
+  ["A786",0xE74B],
+  ["A787",0xE74C],
+  ["A788",0xE74D],
+  ["A789",0xE74E],
+  ["A78A",0xE74F],
+  ["A78B",0xE750],
+  ["A78C",0xE751],
+  ["A78D",0xE752],
+  ["A78E",0xE753],
+  ["A78F",0xE754],
+  ["A790",0xE755],
+  ["A791",0xE756],
+  ["A792",0xE757],
+  ["A793",0xE758],
+  ["A794",0xE759],
+  ["A795",0xE75A],
+  ["A796",0xE75B],
+  ["A797",0xE75C],
+  ["A798",0xE75D],
+  ["A799",0xE75E],
+  ["A79A",0xE75F],
+  ["A79B",0xE760],
+  ["A79C",0xE761],
+  ["A79D",0xE762],
+  ["A79E",0xE763],
+  ["A79F",0xE764],
+  ["A7A0",0xE765],
+  ["A2AB",0xE766],
+  ["A2AC",0xE767],
+  ["A2AD",0xE768],
+  ["A2AE",0xE769],
+  ["A2AF",0xE76A],
+  ["A2B0",0xE76B],
+  ["8336C739",0xE76C],
+  ["A2E4",0xE76D],
+  ["A2EF",0xE76E],
+  ["A2F0",0xE76F],
+  ["A2FD",0xE770],
+  ["A2FE",0xE771],
+  ["A4F4",0xE772],
+  ["A4F5",0xE773],
+  ["A4F6",0xE774],
+  ["A4F7",0xE775],
+  ["A4F8",0xE776],
+  ["A4F9",0xE777],
+  ["A4FA",0xE778],
+  ["A4FB",0xE779],
+  ["A4FC",0xE77A],
+  ["A4FD",0xE77B],
+  ["A4FE",0xE77C],
+  ["A5F7",0xE77D],
+  ["A5F8",0xE77E],
+  ["A5F9",0xE77F],
+  ["A5FA",0xE780],
+  ["A5FB",0xE781],
+  ["A5FC",0xE782],
+  ["A5FD",0xE783],
+  ["A5FE",0xE784],
+  ["A6B9",0xE785],
+  ["A6BA",0xE786],
+  ["A6BB",0xE787],
+  ["A6BC",0xE788],
+  ["A6BD",0xE789],
+  ["A6BE",0xE78A],
+  ["A6BF",0xE78B],
+  ["A6C0",0xE78C],
+  ["A6D9",0xE78D],
+  ["A6DA",0xE78E],
+  ["A6DB",0xE78F],
+  ["A6DC",0xE790],
+  ["A6DD",0xE791],
+  ["A6DE",0xE792],
+  ["A6DF",0xE793],
+  ["A6EC",0xE794],
+  ["A6ED",0xE795],
+  ["A6F3",0xE796],
+  ["A6F6",0xE797],
+  ["A6F7",0xE798],
+  ["A6F8",0xE799],
+  ["A6F9",0xE79A],
+  ["A6FA",0xE79B],
+  ["A6FB",0xE79C],
+  ["A6FC",0xE79D],
+  ["A6FD",0xE79E],
+  ["A6FE",0xE79F],
+  ["A7C2",0xE7A0],
+  ["A7C3",0xE7A1],
+  ["A7C4",0xE7A2],
+  ["A7C5",0xE7A3],
+  ["A7C6",0xE7A4],
+  ["A7C7",0xE7A5],
+  ["A7C8",0xE7A6],
+  ["A7C9",0xE7A7],
+  ["A7CA",0xE7A8],
+  ["A7CB",0xE7A9],
+  ["A7CC",0xE7AA],
+  ["A7CD",0xE7AB],
+  ["A7CE",0xE7AC],
+  ["A7CF",0xE7AD],
+  ["A7D0",0xE7AE],
+  ["A7F2",0xE7AF],
+  ["A7F3",0xE7B0],
+  ["A7F4",0xE7B1],
+  ["A7F5",0xE7B2],
+  ["A7F6",0xE7B3],
+  ["A7F7",0xE7B4],
+  ["A7F8",0xE7B5],
+  ["A7F9",0xE7B6],
+  ["A7FA",0xE7B7],
+  ["A7FB",0xE7B8],
+  ["A7FC",0xE7B9],
+  ["A7FD",0xE7BA],
+  ["A7FE",0xE7BB],
+  ["A896",0xE7BC],
+  ["A897",0xE7BD],
+  ["A898",0xE7BE],
+  ["A899",0xE7BF],
+  ["A89A",0xE7C0],
+  ["A89B",0xE7C1],
+  ["A89C",0xE7C2],
+  ["A89D",0xE7C3],
+  ["A89E",0xE7C4],
+  ["A89F",0xE7C5],
+  ["A8A0",0xE7C6],
+  ["A8BC",0xE7C7],
+  ["8336C830",0xE7C8],
+  ["A8C1",0xE7C9],
+  ["A8C2",0xE7CA],
+  ["A8C3",0xE7CB],
+  ["A8C4",0xE7CC],
+  ["A8EA",0xE7CD],
+  ["A8EB",0xE7CE],
+  ["A8EC",0xE7CF],
+  ["A8ED",0xE7D0],
+  ["A8EE",0xE7D1],
+  ["A8EF",0xE7D2],
+  ["A8F0",0xE7D3],
+  ["A8F1",0xE7D4],
+  ["A8F2",0xE7D5],
+  ["A8F3",0xE7D6],
+  ["A8F4",0xE7D7],
+  ["A8F5",0xE7D8],
+  ["A8F6",0xE7D9],
+  ["A8F7",0xE7DA],
+  ["A8F8",0xE7DB],
+  ["A8F9",0xE7DC],
+  ["A8FA",0xE7DD],
+  ["A8FB",0xE7DE],
+  ["A8FC",0xE7DF],
+  ["A8FD",0xE7E0],
+  ["A8FE",0xE7E1],
+  ["A958",0xE7E2],
+  ["A95B",0xE7E3],
+  ["A95D",0xE7E4],
+  ["A95E",0xE7E5],
+  ["A95F",0xE7E6],
+  ["8336C831",0xE7E7],
+  ["8336C832",0xE7E8],
+  ["8336C833",0xE7E9],
+  ["8336C834",0xE7EA],
+  ["8336C835",0xE7EB],
+  ["8336C836",0xE7EC],
+  ["8336C837",0xE7ED],
+  ["8336C838",0xE7EE],
+  ["8336C839",0xE7EF],
+  ["8336C930",0xE7F0],
+  ["8336C931",0xE7F1],
+  ["8336C932",0xE7F2],
+  ["8336C933",0xE7F3],
+  ["A997",0xE7F4],
+  ["A998",0xE7F5],
+  ["A999",0xE7F6],
+  ["A99A",0xE7F7],
+  ["A99B",0xE7F8],
+  ["A99C",0xE7F9],
+  ["A99D",0xE7FA],
+  ["A99E",0xE7FB],
+  ["A99F",0xE7FC],
+  ["A9A0",0xE7FD],
+  ["A9A1",0xE7FE],
+  ["A9A2",0xE7FF],
+  ["A9A3",0xE800],
+  ["A9F0",0xE801],
+  ["A9F1",0xE802],
+  ["A9F2",0xE803],
+  ["A9F3",0xE804],
+  ["A9F4",0xE805],
+  ["A9F5",0xE806],
+  ["A9F6",0xE807],
+  ["A9F7",0xE808],
+  ["A9F8",0xE809],
+  ["A9F9",0xE80A],
+  ["A9FA",0xE80B],
+  ["A9FB",0xE80C],
+  ["A9FC",0xE80D],
+  ["A9FD",0xE80E],
+  ["A9FE",0xE80F],
+  ["D7FA",0xE810],
+  ["D7FB",0xE811],
+  ["D7FC",0xE812],
+  ["D7FD",0xE813],
+  ["D7FE",0xE814],
+  ["8336C934",0xE815],
+  ["FE51",0xE816],
+  ["FE52",0xE817],
+  ["FE53",0xE818],
+  ["8336C935",0xE819],
+  ["8336C936",0xE81A],
+  ["8336C937",0xE81B],
+  ["8336C938",0xE81C],
+  ["8336C939",0xE81D],
+  ["FE59",0xE81E],
+  ["8336CA30",0xE81F],
+  ["8336CA31",0xE820],
+  ["8336CA32",0xE821],
+  ["8336CA33",0xE822],
+  ["8336CA34",0xE823],
+  ["8336CA35",0xE824],
+  ["8336CA36",0xE825],
+  ["FE61",0xE826],
+  ["8336CA37",0xE827],
+  ["8336CA38",0xE828],
+  ["8336CA39",0xE829],
+  ["8336CB30",0xE82A],
+  ["FE66",0xE82B],
+  ["FE67",0xE82C],
+  ["8336CB31",0xE82D],
+  ["8336CB32",0xE82E],
+  ["8336CB33",0xE82F],
+  ["8336CB34",0xE830],
+  ["FE6C",0xE831],
+  ["FE6D",0xE832],
+  ["8336CB35",0xE833],
+  ["8336CB36",0xE834],
+  ["8336CB37",0xE835],
+  ["8336CB38",0xE836],
+  ["8336CB39",0xE837],
+  ["8336CC30",0xE838],
+  ["8336CC31",0xE839],
+  ["8336CC32",0xE83A],
+  ["FE76",0xE83B],
+  ["8336CC33",0xE83C],
+  ["8336CC34",0xE83D],
+  ["8336CC35",0xE83E],
+  ["8336CC36",0xE83F],
+  ["8336CC37",0xE840],
+  ["8336CC38",0xE841],
+  ["8336CC39",0xE842],
+  ["FE7E",0xE843],
+  ["8336CD30",0xE844],
+  ["8336CD31",0xE845],
+  ["8336CD32",0xE846],
+  ["8336CD33",0xE847],
+  ["8336CD34",0xE848],
+  ["8336CD35",0xE849],
+  ["8336CD36",0xE84A],
+  ["8336CD37",0xE84B],
+  ["8336CD38",0xE84C],
+  ["8336CD39",0xE84D],
+  ["8336CE30",0xE84E],
+  ["8336CE31",0xE84F],
+  ["8336CE32",0xE850],
+  ["8336CE33",0xE851],
+  ["8336CE34",0xE852],
+  ["8336CE35",0xE853],
+  ["FE90",0xE854],
+  ["FE91",0xE855],
+  ["8336CE36",0xE856],
+  ["8336CE37",0xE857],
+  ["8336CE38",0xE858],
+  ["8336CE39",0xE859],
+  ["8336CF30",0xE85A],
+  ["8336CF31",0xE85B],
+  ["8336CF32",0xE85C],
+  ["8336CF33",0xE85D],
+  ["8336CF34",0xE85E],
+  ["8336CF35",0xE85F],
+  ["8336CF36",0xE860],
+  ["8336CF37",0xE861],
+  ["8336CF38",0xE862],
+  ["8336CF39",0xE863],
+  ["FEA0",0xE864],
+  ["8336D030",0xE865],
+  ["8336D031",0xE866],
+  ["8336D032",0xE867],
+  ["8336D033",0xE868],
+  ["8336D034",0xE869],
+  ["8336D035",0xE86A],
+  ["8336D036",0xE86B],
+  ["8336D037",0xE86C],
+  ["8336D038",0xE86D],
+  ["8336D039",0xE86E],
+  ["8336D130",0xE86F],
+  ["8336D131",0xE870],
+  ["8336D132",0xE871],
+  ["8336D133",0xE872],
+  ["8336D134",0xE873],
+  ["8336D135",0xE874],
+  ["8336D136",0xE875],
+  ["8336D137",0xE876],
+  ["8336D138",0xE877],
+  ["8336D139",0xE878],
+  ["8336D230",0xE879],
+  ["8336D231",0xE87A],
+  ["8336D232",0xE87B],
+  ["8336D233",0xE87C],
+  ["8336D234",0xE87D],
+  ["8336D235",0xE87E],
+  ["8336D236",0xE87F],
+  ["8336D237",0xE880],
+  ["8336D238",0xE881],
+  ["8336D239",0xE882],
+  ["8336D330",0xE883],
+  ["8336D331",0xE884],
+  ["8336D332",0xE885],
+  ["8336D333",0xE886],
+  ["8336D334",0xE887],
+  ["8336D335",0xE888],
+  ["8336D336",0xE889],
+  ["8336D337",0xE88A],
+  ["8336D338",0xE88B],
+  ["8336D339",0xE88C],
+  ["8336D430",0xE88D],
+  ["8336D431",0xE88E],
+  ["8336D432",0xE88F],
+  ["8336D433",0xE890],
+  ["8336D434",0xE891],
+  ["8336D435",0xE892],
+  ["8336D436",0xE893],
+  ["8336D437",0xE894],
+  ["8336D438",0xE895],
+  ["8336D439",0xE896],
+  ["8336D530",0xE897],
+  ["8336D531",0xE898],
+  ["8336D532",0xE899],
+  ["8336D533",0xE89A],
+  ["8336D534",0xE89B],
+  ["8336D535",0xE89C],
+  ["8336D536",0xE89D],
+  ["8336D537",0xE89E],
+  ["8336D538",0xE89F],
+  ["8336D539",0xE8A0],
+  ["8336D630",0xE8A1],
+  ["8336D631",0xE8A2],
+  ["8336D632",0xE8A3],
+  ["8336D633",0xE8A4],
+  ["8336D634",0xE8A5],
+  ["8336D635",0xE8A6],
+  ["8336D636",0xE8A7],
+  ["8336D637",0xE8A8],
+  ["8336D638",0xE8A9],
+  ["8336D639",0xE8AA],
+  ["8336D730",0xE8AB],
+  ["8336D731",0xE8AC],
+  ["8336D732",0xE8AD],
+  ["8336D733",0xE8AE],
+  ["8336D734",0xE8AF],
+  ["8336D735",0xE8B0],
+  ["8336D736",0xE8B1],
+  ["8336D737",0xE8B2],
+  ["8336D738",0xE8B3],
+  ["8336D739",0xE8B4],
+  ["8336D830",0xE8B5],
+  ["8336D831",0xE8B6],
+  ["8336D832",0xE8B7],
+  ["8336D833",0xE8B8],
+  ["8336D834",0xE8B9],
+  ["8336D835",0xE8BA],
+  ["8336D836",0xE8BB],
+  ["8336D837",0xE8BC],
+  ["8336D838",0xE8BD],
+  ["8336D839",0xE8BE],
+  ["8336D930",0xE8BF],
+  ["8336D931",0xE8C0],
+  ["8336D932",0xE8C1],
+  ["8336D933",0xE8C2],
+  ["8336D934",0xE8C3],
+  ["8336D935",0xE8C4],
+  ["8336D936",0xE8C5],
+  ["8336D937",0xE8C6],
+  ["8336D938",0xE8C7],
+  ["8336D939",0xE8C8],
+  ["8336DA30",0xE8C9],
+  ["8336DA31",0xE8CA],
+  ["8336DA32",0xE8CB],
+  ["8336DA33",0xE8CC],
+  ["8336DA34",0xE8CD],
+  ["8336DA35",0xE8CE],
+  ["8336DA36",0xE8CF],
+  ["8336DA37",0xE8D0],
+  ["8336DA38",0xE8D1],
+  ["8336DA39",0xE8D2],
+  ["8336DB30",0xE8D3],
+  ["8336DB31",0xE8D4],
+  ["8336DB32",0xE8D5],
+  ["8336DB33",0xE8D6],
+  ["8336DB34",0xE8D7],
+  ["8336DB35",0xE8D8],
+  ["8336DB36",0xE8D9],
+  ["8336DB37",0xE8DA],
+  ["8336DB38",0xE8DB],
+  ["8336DB39",0xE8DC],
+  ["8336DC30",0xE8DD],
+  ["8336DC31",0xE8DE],
+  ["8336DC32",0xE8DF],
+  ["8336DC33",0xE8E0],
+  ["8336DC34",0xE8E1],
+  ["8336DC35",0xE8E2],
+  ["8336DC36",0xE8E3],
+  ["8336DC37",0xE8E4],
+  ["8336DC38",0xE8E5],
+  ["8336DC39",0xE8E6],
+  ["8336DD30",0xE8E7],
+  ["8336DD31",0xE8E8],
+  ["8336DD32",0xE8E9],
+  ["8336DD33",0xE8EA],
+  ["8336DD34",0xE8EB],
+  ["8336DD35",0xE8EC],
+  ["8336DD36",0xE8ED],
+  ["8336DD37",0xE8EE],
+  ["8336DD38",0xE8EF],
+  ["8336DD39",0xE8F0],
+  ["8336DE30",0xE8F1],
+  ["8336DE31",0xE8F2],
+  ["8336DE32",0xE8F3],
+  ["8336DE33",0xE8F4],
+  ["8336DE34",0xE8F5],
+  ["8336DE35",0xE8F6],
+  ["8336DE36",0xE8F7],
+  ["8336DE37",0xE8F8],
+  ["8336DE38",0xE8F9],
+  ["8336DE39",0xE8FA],
+  ["8336DF30",0xE8FB],
+  ["8336DF31",0xE8FC],
+  ["8336DF32",0xE8FD],
+  ["8336DF33",0xE8FE],
+  ["8336DF34",0xE8FF],
+  ["8336DF35",0xE900],
+  ["8336DF36",0xE901],
+  ["8336DF37",0xE902],
+  ["8336DF38",0xE903],
+  ["8336DF39",0xE904],
+  ["8336E030",0xE905],
+  ["8336E031",0xE906],
+  ["8336E032",0xE907],
+  ["8336E033",0xE908],
+  ["8336E034",0xE909],
+  ["8336E035",0xE90A],
+  ["8336E036",0xE90B],
+  ["8336E037",0xE90C],
+  ["8336E038",0xE90D],
+  ["8336E039",0xE90E],
+  ["8336E130",0xE90F],
+  ["8336E131",0xE910],
+  ["8336E132",0xE911],
+  ["8336E133",0xE912],
+  ["8336E134",0xE913],
+  ["8336E135",0xE914],
+  ["8336E136",0xE915],
+  ["8336E137",0xE916],
+  ["8336E138",0xE917],
+  ["8336E139",0xE918],
+  ["8336E230",0xE919],
+  ["8336E231",0xE91A],
+  ["8336E232",0xE91B],
+  ["8336E233",0xE91C],
+  ["8336E234",0xE91D],
+  ["8336E235",0xE91E],
+  ["8336E236",0xE91F],
+  ["8336E237",0xE920],
+  ["8336E238",0xE921],
+  ["8336E239",0xE922],
+  ["8336E330",0xE923],
+  ["8336E331",0xE924],
+  ["8336E332",0xE925],
+  ["8336E333",0xE926],
+  ["8336E334",0xE927],
+  ["8336E335",0xE928],
+  ["8336E336",0xE929],
+  ["8336E337",0xE92A],
+  ["8336E338",0xE92B],
+  ["8336E339",0xE92C],
+  ["8336E430",0xE92D],
+  ["8336E431",0xE92E],
+  ["8336E432",0xE92F],
+  ["8336E433",0xE930],
+  ["8336E434",0xE931],
+  ["8336E435",0xE932],
+  ["8336E436",0xE933],
+  ["8336E437",0xE934],
+  ["8336E438",0xE935],
+  ["8336E439",0xE936],
+  ["8336E530",0xE937],
+  ["8336E531",0xE938],
+  ["8336E532",0xE939],
+  ["8336E533",0xE93A],
+  ["8336E534",0xE93B],
+  ["8336E535",0xE93C],
+  ["8336E536",0xE93D],
+  ["8336E537",0xE93E],
+  ["8336E538",0xE93F],
+  ["8336E539",0xE940],
+  ["8336E630",0xE941],
+  ["8336E631",0xE942],
+  ["8336E632",0xE943],
+  ["8336E633",0xE944],
+  ["8336E634",0xE945],
+  ["8336E635",0xE946],
+  ["8336E636",0xE947],
+  ["8336E637",0xE948],
+  ["8336E638",0xE949],
+  ["8336E639",0xE94A],
+  ["8336E730",0xE94B],
+  ["8336E731",0xE94C],
+  ["8336E732",0xE94D],
+  ["8336E733",0xE94E],
+  ["8336E734",0xE94F],
+  ["8336E735",0xE950],
+  ["8336E736",0xE951],
+  ["8336E737",0xE952],
+  ["8336E738",0xE953],
+  ["8336E739",0xE954],
+  ["8336E830",0xE955],
+  ["8336E831",0xE956],
+  ["8336E832",0xE957],
+  ["8336E833",0xE958],
+  ["8336E834",0xE959],
+  ["8336E835",0xE95A],
+  ["8336E836",0xE95B],
+  ["8336E837",0xE95C],
+  ["8336E838",0xE95D],
+  ["8336E839",0xE95E],
+  ["8336E930",0xE95F],
+  ["8336E931",0xE960],
+  ["8336E932",0xE961],
+  ["8336E933",0xE962],
+  ["8336E934",0xE963],
+  ["8336E935",0xE964],
+  ["8336E936",0xE965],
+  ["8336E937",0xE966],
+  ["8336E938",0xE967],
+  ["8336E939",0xE968],
+  ["8336EA30",0xE969],
+  ["8336EA31",0xE96A],
+  ["8336EA32",0xE96B],
+  ["8336EA33",0xE96C],
+  ["8336EA34",0xE96D],
+  ["8336EA35",0xE96E],
+  ["8336EA36",0xE96F],
+  ["8336EA37",0xE970],
+  ["8336EA38",0xE971],
+  ["8336EA39",0xE972],
+  ["8336EB30",0xE973],
+  ["8336EB31",0xE974],
+  ["8336EB32",0xE975],
+  ["8336EB33",0xE976],
+  ["8336EB34",0xE977],
+  ["8336EB35",0xE978],
+  ["8336EB36",0xE979],
+  ["8336EB37",0xE97A],
+  ["8336EB38",0xE97B],
+  ["8336EB39",0xE97C],
+  ["8336EC30",0xE97D],
+  ["8336EC31",0xE97E],
+  ["8336EC32",0xE97F],
+  ["8336EC33",0xE980],
+  ["8336EC34",0xE981],
+  ["8336EC35",0xE982],
+  ["8336EC36",0xE983],
+  ["8336EC37",0xE984],
+  ["8336EC38",0xE985],
+  ["8336EC39",0xE986],
+  ["8336ED30",0xE987],
+  ["8336ED31",0xE988],
+  ["8336ED32",0xE989],
+  ["8336ED33",0xE98A],
+  ["8336ED34",0xE98B],
+  ["8336ED35",0xE98C],
+  ["8336ED36",0xE98D],
+  ["8336ED37",0xE98E],
+  ["8336ED38",0xE98F],
+  ["8336ED39",0xE990],
+  ["8336EE30",0xE991],
+  ["8336EE31",0xE992],
+  ["8336EE32",0xE993],
+  ["8336EE33",0xE994],
+  ["8336EE34",0xE995],
+  ["8336EE35",0xE996],
+  ["8336EE36",0xE997],
+  ["8336EE37",0xE998],
+  ["8336EE38",0xE999],
+  ["8336EE39",0xE99A],
+  ["8336EF30",0xE99B],
+  ["8336EF31",0xE99C],
+  ["8336EF32",0xE99D],
+  ["8336EF33",0xE99E],
+  ["8336EF34",0xE99F],
+  ["8336EF35",0xE9A0],
+  ["8336EF36",0xE9A1],
+  ["8336EF37",0xE9A2],
+  ["8336EF38",0xE9A3],
+  ["8336EF39",0xE9A4],
+  ["8336F030",0xE9A5],
+  ["8336F031",0xE9A6],
+  ["8336F032",0xE9A7],
+  ["8336F033",0xE9A8],
+  ["8336F034",0xE9A9],
+  ["8336F035",0xE9AA],
+  ["8336F036",0xE9AB],
+  ["8336F037",0xE9AC],
+  ["8336F038",0xE9AD],
+  ["8336F039",0xE9AE],
+  ["8336F130",0xE9AF],
+  ["8336F131",0xE9B0],
+  ["8336F132",0xE9B1],
+  ["8336F133",0xE9B2],
+  ["8336F134",0xE9B3],
+  ["8336F135",0xE9B4],
+  ["8336F136",0xE9B5],
+  ["8336F137",0xE9B6],
+  ["8336F138",0xE9B7],
+  ["8336F139",0xE9B8],
+  ["8336F230",0xE9B9],
+  ["8336F231",0xE9BA],
+  ["8336F232",0xE9BB],
+  ["8336F233",0xE9BC],
+  ["8336F234",0xE9BD],
+  ["8336F235",0xE9BE],
+  ["8336F236",0xE9BF],
+  ["8336F237",0xE9C0],
+  ["8336F238",0xE9C1],
+  ["8336F239",0xE9C2],
+  ["8336F330",0xE9C3],
+  ["8336F331",0xE9C4],
+  ["8336F332",0xE9C5],
+  ["8336F333",0xE9C6],
+  ["8336F334",0xE9C7],
+  ["8336F335",0xE9C8],
+  ["8336F336",0xE9C9],
+  ["8336F337",0xE9CA],
+  ["8336F338",0xE9CB],
+  ["8336F339",0xE9CC],
+  ["8336F430",0xE9CD],
+  ["8336F431",0xE9CE],
+  ["8336F432",0xE9CF],
+  ["8336F433",0xE9D0],
+  ["8336F434",0xE9D1],
+  ["8336F435",0xE9D2],
+  ["8336F436",0xE9D3],
+  ["8336F437",0xE9D4],
+  ["8336F438",0xE9D5],
+  ["8336F439",0xE9D6],
+  ["8336F530",0xE9D7],
+  ["8336F531",0xE9D8],
+  ["8336F532",0xE9D9],
+  ["8336F533",0xE9DA],
+  ["8336F534",0xE9DB],
+  ["8336F535",0xE9DC],
+  ["8336F536",0xE9DD],
+  ["8336F537",0xE9DE],
+  ["8336F538",0xE9DF],
+  ["8336F539",0xE9E0],
+  ["8336F630",0xE9E1],
+  ["8336F631",0xE9E2],
+  ["8336F632",0xE9E3],
+  ["8336F633",0xE9E4],
+  ["8336F634",0xE9E5],
+  ["8336F635",0xE9E6],
+  ["8336F636",0xE9E7],
+  ["8336F637",0xE9E8],
+  ["8336F638",0xE9E9],
+  ["8336F639",0xE9EA],
+  ["8336F730",0xE9EB],
+  ["8336F731",0xE9EC],
+  ["8336F732",0xE9ED],
+  ["8336F733",0xE9EE],
+  ["8336F734",0xE9EF],
+  ["8336F735",0xE9F0],
+  ["8336F736",0xE9F1],
+  ["8336F737",0xE9F2],
+  ["8336F738",0xE9F3],
+  ["8336F739",0xE9F4],
+  ["8336F830",0xE9F5],
+  ["8336F831",0xE9F6],
+  ["8336F832",0xE9F7],
+  ["8336F833",0xE9F8],
+  ["8336F834",0xE9F9],
+  ["8336F835",0xE9FA],
+  ["8336F836",0xE9FB],
+  ["8336F837",0xE9FC],
+  ["8336F838",0xE9FD],
+  ["8336F839",0xE9FE],
+  ["8336F930",0xE9FF],
+  ["8336F931",0xEA00],
+  ["8336F932",0xEA01],
+  ["8336F933",0xEA02],
+  ["8336F934",0xEA03],
+  ["8336F935",0xEA04],
+  ["8336F936",0xEA05],
+  ["8336F937",0xEA06],
+  ["8336F938",0xEA07],
+  ["8336F939",0xEA08],
+  ["8336FA30",0xEA09],
+  ["8336FA31",0xEA0A],
+  ["8336FA32",0xEA0B],
+  ["8336FA33",0xEA0C],
+  ["8336FA34",0xEA0D],
+  ["8336FA35",0xEA0E],
+  ["8336FA36",0xEA0F],
+  ["8336FA37",0xEA10],
+  ["8336FA38",0xEA11],
+  ["8336FA39",0xEA12],
+  ["8336FB30",0xEA13],
+  ["8336FB31",0xEA14],
+  ["8336FB32",0xEA15],
+  ["8336FB33",0xEA16],
+  ["8336FB34",0xEA17],
+  ["8336FB35",0xEA18],
+  ["8336FB36",0xEA19],
+  ["8336FB37",0xEA1A],
+  ["8336FB38",0xEA1B],
+  ["8336FB39",0xEA1C],
+  ["8336FC30",0xEA1D],
+  ["8336FC31",0xEA1E],
+  ["8336FC32",0xEA1F],
+  ["8336FC33",0xEA20],
+  ["8336FC34",0xEA21],
+  ["8336FC35",0xEA22],
+  ["8336FC36",0xEA23],
+  ["8336FC37",0xEA24],
+  ["8336FC38",0xEA25],
+  ["8336FC39",0xEA26],
+  ["8336FD30",0xEA27],
+  ["8336FD31",0xEA28],
+  ["8336FD32",0xEA29],
+  ["8336FD33",0xEA2A],
+  ["8336FD34",0xEA2B],
+  ["8336FD35",0xEA2C],
+  ["8336FD36",0xEA2D],
+  ["8336FD37",0xEA2E],
+  ["8336FD38",0xEA2F],
+  ["8336FD39",0xEA30],
+  ["8336FE30",0xEA31],
+  ["8336FE31",0xEA32],
+  ["8336FE32",0xEA33],
+  ["8336FE33",0xEA34],
+  ["8336FE34",0xEA35],
+  ["8336FE35",0xEA36],
+  ["8336FE36",0xEA37],
+  ["8336FE37",0xEA38],
+  ["8336FE38",0xEA39],
+  ["8336FE39",0xEA3A],
+  ["83378130",0xEA3B],
+  ["83378131",0xEA3C],
+  ["83378132",0xEA3D],
+  ["83378133",0xEA3E],
+  ["83378134",0xEA3F],
+  ["83378135",0xEA40],
+  ["83378136",0xEA41],
+  ["83378137",0xEA42],
+  ["83378138",0xEA43],
+  ["83378139",0xEA44],
+  ["83378230",0xEA45],
+  ["83378231",0xEA46],
+  ["83378232",0xEA47],
+  ["83378233",0xEA48],
+  ["83378234",0xEA49],
+  ["83378235",0xEA4A],
+  ["83378236",0xEA4B],
+  ["83378237",0xEA4C],
+  ["83378238",0xEA4D],
+  ["83378239",0xEA4E],
+  ["83378330",0xEA4F],
+  ["83378331",0xEA50],
+  ["83378332",0xEA51],
+  ["83378333",0xEA52],
+  ["83378334",0xEA53],
+  ["83378335",0xEA54],
+  ["83378336",0xEA55],
+  ["83378337",0xEA56],
+  ["83378338",0xEA57],
+  ["83378339",0xEA58],
+  ["83378430",0xEA59],
+  ["83378431",0xEA5A],
+  ["83378432",0xEA5B],
+  ["83378433",0xEA5C],
+  ["83378434",0xEA5D],
+  ["83378435",0xEA5E],
+  ["83378436",0xEA5F],
+  ["83378437",0xEA60],
+  ["83378438",0xEA61],
+  ["83378439",0xEA62],
+  ["83378530",0xEA63],
+  ["83378531",0xEA64],
+  ["83378532",0xEA65],
+  ["83378533",0xEA66],
+  ["83378534",0xEA67],
+  ["83378535",0xEA68],
+  ["83378536",0xEA69],
+  ["83378537",0xEA6A],
+  ["83378538",0xEA6B],
+  ["83378539",0xEA6C],
+  ["83378630",0xEA6D],
+  ["83378631",0xEA6E],
+  ["83378632",0xEA6F],
+  ["83378633",0xEA70],
+  ["83378634",0xEA71],
+  ["83378635",0xEA72],
+  ["83378636",0xEA73],
+  ["83378637",0xEA74],
+  ["83378638",0xEA75],
+  ["83378639",0xEA76],
+  ["83378730",0xEA77],
+  ["83378731",0xEA78],
+  ["83378732",0xEA79],
+  ["83378733",0xEA7A],
+  ["83378734",0xEA7B],
+  ["83378735",0xEA7C],
+  ["83378736",0xEA7D],
+  ["83378737",0xEA7E],
+  ["83378738",0xEA7F],
+  ["83378739",0xEA80],
+  ["83378830",0xEA81],
+  ["83378831",0xEA82],
+  ["83378832",0xEA83],
+  ["83378833",0xEA84],
+  ["83378834",0xEA85],
+  ["83378835",0xEA86],
+  ["83378836",0xEA87],
+  ["83378837",0xEA88],
+  ["83378838",0xEA89],
+  ["83378839",0xEA8A],
+  ["83378930",0xEA8B],
+  ["83378931",0xEA8C],
+  ["83378932",0xEA8D],
+  ["83378933",0xEA8E],
+  ["83378934",0xEA8F],
+  ["83378935",0xEA90],
+  ["83378936",0xEA91],
+  ["83378937",0xEA92],
+  ["83378938",0xEA93],
+  ["83378939",0xEA94],
+  ["83378A30",0xEA95],
+  ["83378A31",0xEA96],
+  ["83378A32",0xEA97],
+  ["83378A33",0xEA98],
+  ["83378A34",0xEA99],
+  ["83378A35",0xEA9A],
+  ["83378A36",0xEA9B],
+  ["83378A37",0xEA9C],
+  ["83378A38",0xEA9D],
+  ["83378A39",0xEA9E],
+  ["83378B30",0xEA9F],
+  ["83378B31",0xEAA0],
+  ["83378B32",0xEAA1],
+  ["83378B33",0xEAA2],
+  ["83378B34",0xEAA3],
+  ["83378B35",0xEAA4],
+  ["83378B36",0xEAA5],
+  ["83378B37",0xEAA6],
+  ["83378B38",0xEAA7],
+  ["83378B39",0xEAA8],
+  ["83378C30",0xEAA9],
+  ["83378C31",0xEAAA],
+  ["83378C32",0xEAAB],
+  ["83378C33",0xEAAC],
+  ["83378C34",0xEAAD],
+  ["83378C35",0xEAAE],
+  ["83378C36",0xEAAF],
+  ["83378C37",0xEAB0],
+  ["83378C38",0xEAB1],
+  ["83378C39",0xEAB2],
+  ["83378D30",0xEAB3],
+  ["83378D31",0xEAB4],
+  ["83378D32",0xEAB5],
+  ["83378D33",0xEAB6],
+  ["83378D34",0xEAB7],
+  ["83378D35",0xEAB8],
+  ["83378D36",0xEAB9],
+  ["83378D37",0xEABA],
+  ["83378D38",0xEABB],
+  ["83378D39",0xEABC],
+  ["83378E30",0xEABD],
+  ["83378E31",0xEABE],
+  ["83378E32",0xEABF],
+  ["83378E33",0xEAC0],
+  ["83378E34",0xEAC1],
+  ["83378E35",0xEAC2],
+  ["83378E36",0xEAC3],
+  ["83378E37",0xEAC4],
+  ["83378E38",0xEAC5],
+  ["83378E39",0xEAC6],
+  ["83378F30",0xEAC7],
+  ["83378F31",0xEAC8],
+  ["83378F32",0xEAC9],
+  ["83378F33",0xEACA],
+  ["83378F34",0xEACB],
+  ["83378F35",0xEACC],
+  ["83378F36",0xEACD],
+  ["83378F37",0xEACE],
+  ["83378F38",0xEACF],
+  ["83378F39",0xEAD0],
+  ["83379030",0xEAD1],
+  ["83379031",0xEAD2],
+  ["83379032",0xEAD3],
+  ["83379033",0xEAD4],
+  ["83379034",0xEAD5],
+  ["83379035",0xEAD6],
+  ["83379036",0xEAD7],
+  ["83379037",0xEAD8],
+  ["83379038",0xEAD9],
+  ["83379039",0xEADA],
+  ["83379130",0xEADB],
+  ["83379131",0xEADC],
+  ["83379132",0xEADD],
+  ["83379133",0xEADE],
+  ["83379134",0xEADF],
+  ["83379135",0xEAE0],
+  ["83379136",0xEAE1],
+  ["83379137",0xEAE2],
+  ["83379138",0xEAE3],
+  ["83379139",0xEAE4],
+  ["83379230",0xEAE5],
+  ["83379231",0xEAE6],
+  ["83379232",0xEAE7],
+  ["83379233",0xEAE8],
+  ["83379234",0xEAE9],
+  ["83379235",0xEAEA],
+  ["83379236",0xEAEB],
+  ["83379237",0xEAEC],
+  ["83379238",0xEAED],
+  ["83379239",0xEAEE],
+  ["83379330",0xEAEF],
+  ["83379331",0xEAF0],
+  ["83379332",0xEAF1],
+  ["83379333",0xEAF2],
+  ["83379334",0xEAF3],
+  ["83379335",0xEAF4],
+  ["83379336",0xEAF5],
+  ["83379337",0xEAF6],
+  ["83379338",0xEAF7],
+  ["83379339",0xEAF8],
+  ["83379430",0xEAF9],
+  ["83379431",0xEAFA],
+  ["83379432",0xEAFB],
+  ["83379433",0xEAFC],
+  ["83379434",0xEAFD],
+  ["83379435",0xEAFE],
+  ["83379436",0xEAFF],
+  ["83379437",0xEB00],
+  ["83379438",0xEB01],
+  ["83379439",0xEB02],
+  ["83379530",0xEB03],
+  ["83379531",0xEB04],
+  ["83379532",0xEB05],
+  ["83379533",0xEB06],
+  ["83379534",0xEB07],
+  ["83379535",0xEB08],
+  ["83379536",0xEB09],
+  ["83379537",0xEB0A],
+  ["83379538",0xEB0B],
+  ["83379539",0xEB0C],
+  ["83379630",0xEB0D],
+  ["83379631",0xEB0E],
+  ["83379632",0xEB0F],
+  ["83379633",0xEB10],
+  ["83379634",0xEB11],
+  ["83379635",0xEB12],
+  ["83379636",0xEB13],
+  ["83379637",0xEB14],
+  ["83379638",0xEB15],
+  ["83379639",0xEB16],
+  ["83379730",0xEB17],
+  ["83379731",0xEB18],
+  ["83379732",0xEB19],
+  ["83379733",0xEB1A],
+  ["83379734",0xEB1B],
+  ["83379735",0xEB1C],
+  ["83379736",0xEB1D],
+  ["83379737",0xEB1E],
+  ["83379738",0xEB1F],
+  ["83379739",0xEB20],
+  ["83379830",0xEB21],
+  ["83379831",0xEB22],
+  ["83379832",0xEB23],
+  ["83379833",0xEB24],
+  ["83379834",0xEB25],
+  ["83379835",0xEB26],
+  ["83379836",0xEB27],
+  ["83379837",0xEB28],
+  ["83379838",0xEB29],
+  ["83379839",0xEB2A],
+  ["83379930",0xEB2B],
+  ["83379931",0xEB2C],
+  ["83379932",0xEB2D],
+  ["83379933",0xEB2E],
+  ["83379934",0xEB2F],
+  ["83379935",0xEB30],
+  ["83379936",0xEB31],
+  ["83379937",0xEB32],
+  ["83379938",0xEB33],
+  ["83379939",0xEB34],
+  ["83379A30",0xEB35],
+  ["83379A31",0xEB36],
+  ["83379A32",0xEB37],
+  ["83379A33",0xEB38],
+  ["83379A34",0xEB39],
+  ["83379A35",0xEB3A],
+  ["83379A36",0xEB3B],
+  ["83379A37",0xEB3C],
+  ["83379A38",0xEB3D],
+  ["83379A39",0xEB3E],
+  ["83379B30",0xEB3F],
+  ["83379B31",0xEB40],
+  ["83379B32",0xEB41],
+  ["83379B33",0xEB42],
+  ["83379B34",0xEB43],
+  ["83379B35",0xEB44],
+  ["83379B36",0xEB45],
+  ["83379B37",0xEB46],
+  ["83379B38",0xEB47],
+  ["83379B39",0xEB48],
+  ["83379C30",0xEB49],
+  ["83379C31",0xEB4A],
+  ["83379C32",0xEB4B],
+  ["83379C33",0xEB4C],
+  ["83379C34",0xEB4D],
+  ["83379C35",0xEB4E],
+  ["83379C36",0xEB4F],
+  ["83379C37",0xEB50],
+  ["83379C38",0xEB51],
+  ["83379C39",0xEB52],
+  ["83379D30",0xEB53],
+  ["83379D31",0xEB54],
+  ["83379D32",0xEB55],
+  ["83379D33",0xEB56],
+  ["83379D34",0xEB57],
+  ["83379D35",0xEB58],
+  ["83379D36",0xEB59],
+  ["83379D37",0xEB5A],
+  ["83379D38",0xEB5B],
+  ["83379D39",0xEB5C],
+  ["83379E30",0xEB5D],
+  ["83379E31",0xEB5E],
+  ["83379E32",0xEB5F],
+  ["83379E33",0xEB60],
+  ["83379E34",0xEB61],
+  ["83379E35",0xEB62],
+  ["83379E36",0xEB63],
+  ["83379E37",0xEB64],
+  ["83379E38",0xEB65],
+  ["83379E39",0xEB66],
+  ["83379F30",0xEB67],
+  ["83379F31",0xEB68],
+  ["83379F32",0xEB69],
+  ["83379F33",0xEB6A],
+  ["83379F34",0xEB6B],
+  ["83379F35",0xEB6C],
+  ["83379F36",0xEB6D],
+  ["83379F37",0xEB6E],
+  ["83379F38",0xEB6F],
+  ["83379F39",0xEB70],
+  ["8337A030",0xEB71],
+  ["8337A031",0xEB72],
+  ["8337A032",0xEB73],
+  ["8337A033",0xEB74],
+  ["8337A034",0xEB75],
+  ["8337A035",0xEB76],
+  ["8337A036",0xEB77],
+  ["8337A037",0xEB78],
+  ["8337A038",0xEB79],
+  ["8337A039",0xEB7A],
+  ["8337A130",0xEB7B],
+  ["8337A131",0xEB7C],
+  ["8337A132",0xEB7D],
+  ["8337A133",0xEB7E],
+  ["8337A134",0xEB7F],
+  ["8337A135",0xEB80],
+  ["8337A136",0xEB81],
+  ["8337A137",0xEB82],
+  ["8337A138",0xEB83],
+  ["8337A139",0xEB84],
+  ["8337A230",0xEB85],
+  ["8337A231",0xEB86],
+  ["8337A232",0xEB87],
+  ["8337A233",0xEB88],
+  ["8337A234",0xEB89],
+  ["8337A235",0xEB8A],
+  ["8337A236",0xEB8B],
+  ["8337A237",0xEB8C],
+  ["8337A238",0xEB8D],
+  ["8337A239",0xEB8E],
+  ["8337A330",0xEB8F],
+  ["8337A331",0xEB90],
+  ["8337A332",0xEB91],
+  ["8337A333",0xEB92],
+  ["8337A334",0xEB93],
+  ["8337A335",0xEB94],
+  ["8337A336",0xEB95],
+  ["8337A337",0xEB96],
+  ["8337A338",0xEB97],
+  ["8337A339",0xEB98],
+  ["8337A430",0xEB99],
+  ["8337A431",0xEB9A],
+  ["8337A432",0xEB9B],
+  ["8337A433",0xEB9C],
+  ["8337A434",0xEB9D],
+  ["8337A435",0xEB9E],
+  ["8337A436",0xEB9F],
+  ["8337A437",0xEBA0],
+  ["8337A438",0xEBA1],
+  ["8337A439",0xEBA2],
+  ["8337A530",0xEBA3],
+  ["8337A531",0xEBA4],
+  ["8337A532",0xEBA5],
+  ["8337A533",0xEBA6],
+  ["8337A534",0xEBA7],
+  ["8337A535",0xEBA8],
+  ["8337A536",0xEBA9],
+  ["8337A537",0xEBAA],
+  ["8337A538",0xEBAB],
+  ["8337A539",0xEBAC],
+  ["8337A630",0xEBAD],
+  ["8337A631",0xEBAE],
+  ["8337A632",0xEBAF],
+  ["8337A633",0xEBB0],
+  ["8337A634",0xEBB1],
+  ["8337A635",0xEBB2],
+  ["8337A636",0xEBB3],
+  ["8337A637",0xEBB4],
+  ["8337A638",0xEBB5],
+  ["8337A639",0xEBB6],
+  ["8337A730",0xEBB7],
+  ["8337A731",0xEBB8],
+  ["8337A732",0xEBB9],
+  ["8337A733",0xEBBA],
+  ["8337A734",0xEBBB],
+  ["8337A735",0xEBBC],
+  ["8337A736",0xEBBD],
+  ["8337A737",0xEBBE],
+  ["8337A738",0xEBBF],
+  ["8337A739",0xEBC0],
+  ["8337A830",0xEBC1],
+  ["8337A831",0xEBC2],
+  ["8337A832",0xEBC3],
+  ["8337A833",0xEBC4],
+  ["8337A834",0xEBC5],
+  ["8337A835",0xEBC6],
+  ["8337A836",0xEBC7],
+  ["8337A837",0xEBC8],
+  ["8337A838",0xEBC9],
+  ["8337A839",0xEBCA],
+  ["8337A930",0xEBCB],
+  ["8337A931",0xEBCC],
+  ["8337A932",0xEBCD],
+  ["8337A933",0xEBCE],
+  ["8337A934",0xEBCF],
+  ["8337A935",0xEBD0],
+  ["8337A936",0xEBD1],
+  ["8337A937",0xEBD2],
+  ["8337A938",0xEBD3],
+  ["8337A939",0xEBD4],
+  ["8337AA30",0xEBD5],
+  ["8337AA31",0xEBD6],
+  ["8337AA32",0xEBD7],
+  ["8337AA33",0xEBD8],
+  ["8337AA34",0xEBD9],
+  ["8337AA35",0xEBDA],
+  ["8337AA36",0xEBDB],
+  ["8337AA37",0xEBDC],
+  ["8337AA38",0xEBDD],
+  ["8337AA39",0xEBDE],
+  ["8337AB30",0xEBDF],
+  ["8337AB31",0xEBE0],
+  ["8337AB32",0xEBE1],
+  ["8337AB33",0xEBE2],
+  ["8337AB34",0xEBE3],
+  ["8337AB35",0xEBE4],
+  ["8337AB36",0xEBE5],
+  ["8337AB37",0xEBE6],
+  ["8337AB38",0xEBE7],
+  ["8337AB39",0xEBE8],
+  ["8337AC30",0xEBE9],
+  ["8337AC31",0xEBEA],
+  ["8337AC32",0xEBEB],
+  ["8337AC33",0xEBEC],
+  ["8337AC34",0xEBED],
+  ["8337AC35",0xEBEE],
+  ["8337AC36",0xEBEF],
+  ["8337AC37",0xEBF0],
+  ["8337AC38",0xEBF1],
+  ["8337AC39",0xEBF2],
+  ["8337AD30",0xEBF3],
+  ["8337AD31",0xEBF4],
+  ["8337AD32",0xEBF5],
+  ["8337AD33",0xEBF6],
+  ["8337AD34",0xEBF7],
+  ["8337AD35",0xEBF8],
+  ["8337AD36",0xEBF9],
+  ["8337AD37",0xEBFA],
+  ["8337AD38",0xEBFB],
+  ["8337AD39",0xEBFC],
+  ["8337AE30",0xEBFD],
+  ["8337AE31",0xEBFE],
+  ["8337AE32",0xEBFF],
+  ["8337AE33",0xEC00],
+  ["8337AE34",0xEC01],
+  ["8337AE35",0xEC02],
+  ["8337AE36",0xEC03],
+  ["8337AE37",0xEC04],
+  ["8337AE38",0xEC05],
+  ["8337AE39",0xEC06],
+  ["8337AF30",0xEC07],
+  ["8337AF31",0xEC08],
+  ["8337AF32",0xEC09],
+  ["8337AF33",0xEC0A],
+  ["8337AF34",0xEC0B],
+  ["8337AF35",0xEC0C],
+  ["8337AF36",0xEC0D],
+  ["8337AF37",0xEC0E],
+  ["8337AF38",0xEC0F],
+  ["8337AF39",0xEC10],
+  ["8337B030",0xEC11],
+  ["8337B031",0xEC12],
+  ["8337B032",0xEC13],
+  ["8337B033",0xEC14],
+  ["8337B034",0xEC15],
+  ["8337B035",0xEC16],
+  ["8337B036",0xEC17],
+  ["8337B037",0xEC18],
+  ["8337B038",0xEC19],
+  ["8337B039",0xEC1A],
+  ["8337B130",0xEC1B],
+  ["8337B131",0xEC1C],
+  ["8337B132",0xEC1D],
+  ["8337B133",0xEC1E],
+  ["8337B134",0xEC1F],
+  ["8337B135",0xEC20],
+  ["8337B136",0xEC21],
+  ["8337B137",0xEC22],
+  ["8337B138",0xEC23],
+  ["8337B139",0xEC24],
+  ["8337B230",0xEC25],
+  ["8337B231",0xEC26],
+  ["8337B232",0xEC27],
+  ["8337B233",0xEC28],
+  ["8337B234",0xEC29],
+  ["8337B235",0xEC2A],
+  ["8337B236",0xEC2B],
+  ["8337B237",0xEC2C],
+  ["8337B238",0xEC2D],
+  ["8337B239",0xEC2E],
+  ["8337B330",0xEC2F],
+  ["8337B331",0xEC30],
+  ["8337B332",0xEC31],
+  ["8337B333",0xEC32],
+  ["8337B334",0xEC33],
+  ["8337B335",0xEC34],
+  ["8337B336",0xEC35],
+  ["8337B337",0xEC36],
+  ["8337B338",0xEC37],
+  ["8337B339",0xEC38],
+  ["8337B430",0xEC39],
+  ["8337B431",0xEC3A],
+  ["8337B432",0xEC3B],
+  ["8337B433",0xEC3C],
+  ["8337B434",0xEC3D],
+  ["8337B435",0xEC3E],
+  ["8337B436",0xEC3F],
+  ["8337B437",0xEC40],
+  ["8337B438",0xEC41],
+  ["8337B439",0xEC42],
+  ["8337B530",0xEC43],
+  ["8337B531",0xEC44],
+  ["8337B532",0xEC45],
+  ["8337B533",0xEC46],
+  ["8337B534",0xEC47],
+  ["8337B535",0xEC48],
+  ["8337B536",0xEC49],
+  ["8337B537",0xEC4A],
+  ["8337B538",0xEC4B],
+  ["8337B539",0xEC4C],
+  ["8337B630",0xEC4D],
+  ["8337B631",0xEC4E],
+  ["8337B632",0xEC4F],
+  ["8337B633",0xEC50],
+  ["8337B634",0xEC51],
+  ["8337B635",0xEC52],
+  ["8337B636",0xEC53],
+  ["8337B637",0xEC54],
+  ["8337B638",0xEC55],
+  ["8337B639",0xEC56],
+  ["8337B730",0xEC57],
+  ["8337B731",0xEC58],
+  ["8337B732",0xEC59],
+  ["8337B733",0xEC5A],
+  ["8337B734",0xEC5B],
+  ["8337B735",0xEC5C],
+  ["8337B736",0xEC5D],
+  ["8337B737",0xEC5E],
+  ["8337B738",0xEC5F],
+  ["8337B739",0xEC60],
+  ["8337B830",0xEC61],
+  ["8337B831",0xEC62],
+  ["8337B832",0xEC63],
+  ["8337B833",0xEC64],
+  ["8337B834",0xEC65],
+  ["8337B835",0xEC66],
+  ["8337B836",0xEC67],
+  ["8337B837",0xEC68],
+  ["8337B838",0xEC69],
+  ["8337B839",0xEC6A],
+  ["8337B930",0xEC6B],
+  ["8337B931",0xEC6C],
+  ["8337B932",0xEC6D],
+  ["8337B933",0xEC6E],
+  ["8337B934",0xEC6F],
+  ["8337B935",0xEC70],
+  ["8337B936",0xEC71],
+  ["8337B937",0xEC72],
+  ["8337B938",0xEC73],
+  ["8337B939",0xEC74],
+  ["8337BA30",0xEC75],
+  ["8337BA31",0xEC76],
+  ["8337BA32",0xEC77],
+  ["8337BA33",0xEC78],
+  ["8337BA34",0xEC79],
+  ["8337BA35",0xEC7A],
+  ["8337BA36",0xEC7B],
+  ["8337BA37",0xEC7C],
+  ["8337BA38",0xEC7D],
+  ["8337BA39",0xEC7E],
+  ["8337BB30",0xEC7F],
+  ["8337BB31",0xEC80],
+  ["8337BB32",0xEC81],
+  ["8337BB33",0xEC82],
+  ["8337BB34",0xEC83],
+  ["8337BB35",0xEC84],
+  ["8337BB36",0xEC85],
+  ["8337BB37",0xEC86],
+  ["8337BB38",0xEC87],
+  ["8337BB39",0xEC88],
+  ["8337BC30",0xEC89],
+  ["8337BC31",0xEC8A],
+  ["8337BC32",0xEC8B],
+  ["8337BC33",0xEC8C],
+  ["8337BC34",0xEC8D],
+  ["8337BC35",0xEC8E],
+  ["8337BC36",0xEC8F],
+  ["8337BC37",0xEC90],
+  ["8337BC38",0xEC91],
+  ["8337BC39",0xEC92],
+  ["8337BD30",0xEC93],
+  ["8337BD31",0xEC94],
+  ["8337BD32",0xEC95],
+  ["8337BD33",0xEC96],
+  ["8337BD34",0xEC97],
+  ["8337BD35",0xEC98],
+  ["8337BD36",0xEC99],
+  ["8337BD37",0xEC9A],
+  ["8337BD38",0xEC9B],
+  ["8337BD39",0xEC9C],
+  ["8337BE30",0xEC9D],
+  ["8337BE31",0xEC9E],
+  ["8337BE32",0xEC9F],
+  ["8337BE33",0xECA0],
+  ["8337BE34",0xECA1],
+  ["8337BE35",0xECA2],
+  ["8337BE36",0xECA3],
+  ["8337BE37",0xECA4],
+  ["8337BE38",0xECA5],
+  ["8337BE39",0xECA6],
+  ["8337BF30",0xECA7],
+  ["8337BF31",0xECA8],
+  ["8337BF32",0xECA9],
+  ["8337BF33",0xECAA],
+  ["8337BF34",0xECAB],
+  ["8337BF35",0xECAC],
+  ["8337BF36",0xECAD],
+  ["8337BF37",0xECAE],
+  ["8337BF38",0xECAF],
+  ["8337BF39",0xECB0],
+  ["8337C030",0xECB1],
+  ["8337C031",0xECB2],
+  ["8337C032",0xECB3],
+  ["8337C033",0xECB4],
+  ["8337C034",0xECB5],
+  ["8337C035",0xECB6],
+  ["8337C036",0xECB7],
+  ["8337C037",0xECB8],
+  ["8337C038",0xECB9],
+  ["8337C039",0xECBA],
+  ["8337C130",0xECBB],
+  ["8337C131",0xECBC],
+  ["8337C132",0xECBD],
+  ["8337C133",0xECBE],
+  ["8337C134",0xECBF],
+  ["8337C135",0xECC0],
+  ["8337C136",0xECC1],
+  ["8337C137",0xECC2],
+  ["8337C138",0xECC3],
+  ["8337C139",0xECC4],
+  ["8337C230",0xECC5],
+  ["8337C231",0xECC6],
+  ["8337C232",0xECC7],
+  ["8337C233",0xECC8],
+  ["8337C234",0xECC9],
+  ["8337C235",0xECCA],
+  ["8337C236",0xECCB],
+  ["8337C237",0xECCC],
+  ["8337C238",0xECCD],
+  ["8337C239",0xECCE],
+  ["8337C330",0xECCF],
+  ["8337C331",0xECD0],
+  ["8337C332",0xECD1],
+  ["8337C333",0xECD2],
+  ["8337C334",0xECD3],
+  ["8337C335",0xECD4],
+  ["8337C336",0xECD5],
+  ["8337C337",0xECD6],
+  ["8337C338",0xECD7],
+  ["8337C339",0xECD8],
+  ["8337C430",0xECD9],
+  ["8337C431",0xECDA],
+  ["8337C432",0xECDB],
+  ["8337C433",0xECDC],
+  ["8337C434",0xECDD],
+  ["8337C435",0xECDE],
+  ["8337C436",0xECDF],
+  ["8337C437",0xECE0],
+  ["8337C438",0xECE1],
+  ["8337C439",0xECE2],
+  ["8337C530",0xECE3],
+  ["8337C531",0xECE4],
+  ["8337C532",0xECE5],
+  ["8337C533",0xECE6],
+  ["8337C534",0xECE7],
+  ["8337C535",0xECE8],
+  ["8337C536",0xECE9],
+  ["8337C537",0xECEA],
+  ["8337C538",0xECEB],
+  ["8337C539",0xECEC],
+  ["8337C630",0xECED],
+  ["8337C631",0xECEE],
+  ["8337C632",0xECEF],
+  ["8337C633",0xECF0],
+  ["8337C634",0xECF1],
+  ["8337C635",0xECF2],
+  ["8337C636",0xECF3],
+  ["8337C637",0xECF4],
+  ["8337C638",0xECF5],
+  ["8337C639",0xECF6],
+  ["8337C730",0xECF7],
+  ["8337C731",0xECF8],
+  ["8337C732",0xECF9],
+  ["8337C733",0xECFA],
+  ["8337C734",0xECFB],
+  ["8337C735",0xECFC],
+  ["8337C736",0xECFD],
+  ["8337C737",0xECFE],
+  ["8337C738",0xECFF],
+  ["8337C739",0xED00],
+  ["8337C830",0xED01],
+  ["8337C831",0xED02],
+  ["8337C832",0xED03],
+  ["8337C833",0xED04],
+  ["8337C834",0xED05],
+  ["8337C835",0xED06],
+  ["8337C836",0xED07],
+  ["8337C837",0xED08],
+  ["8337C838",0xED09],
+  ["8337C839",0xED0A],
+  ["8337C930",0xED0B],
+  ["8337C931",0xED0C],
+  ["8337C932",0xED0D],
+  ["8337C933",0xED0E],
+  ["8337C934",0xED0F],
+  ["8337C935",0xED10],
+  ["8337C936",0xED11],
+  ["8337C937",0xED12],
+  ["8337C938",0xED13],
+  ["8337C939",0xED14],
+  ["8337CA30",0xED15],
+  ["8337CA31",0xED16],
+  ["8337CA32",0xED17],
+  ["8337CA33",0xED18],
+  ["8337CA34",0xED19],
+  ["8337CA35",0xED1A],
+  ["8337CA36",0xED1B],
+  ["8337CA37",0xED1C],
+  ["8337CA38",0xED1D],
+  ["8337CA39",0xED1E],
+  ["8337CB30",0xED1F],
+  ["8337CB31",0xED20],
+  ["8337CB32",0xED21],
+  ["8337CB33",0xED22],
+  ["8337CB34",0xED23],
+  ["8337CB35",0xED24],
+  ["8337CB36",0xED25],
+  ["8337CB37",0xED26],
+  ["8337CB38",0xED27],
+  ["8337CB39",0xED28],
+  ["8337CC30",0xED29],
+  ["8337CC31",0xED2A],
+  ["8337CC32",0xED2B],
+  ["8337CC33",0xED2C],
+  ["8337CC34",0xED2D],
+  ["8337CC35",0xED2E],
+  ["8337CC36",0xED2F],
+  ["8337CC37",0xED30],
+  ["8337CC38",0xED31],
+  ["8337CC39",0xED32],
+  ["8337CD30",0xED33],
+  ["8337CD31",0xED34],
+  ["8337CD32",0xED35],
+  ["8337CD33",0xED36],
+  ["8337CD34",0xED37],
+  ["8337CD35",0xED38],
+  ["8337CD36",0xED39],
+  ["8337CD37",0xED3A],
+  ["8337CD38",0xED3B],
+  ["8337CD39",0xED3C],
+  ["8337CE30",0xED3D],
+  ["8337CE31",0xED3E],
+  ["8337CE32",0xED3F],
+  ["8337CE33",0xED40],
+  ["8337CE34",0xED41],
+  ["8337CE35",0xED42],
+  ["8337CE36",0xED43],
+  ["8337CE37",0xED44],
+  ["8337CE38",0xED45],
+  ["8337CE39",0xED46],
+  ["8337CF30",0xED47],
+  ["8337CF31",0xED48],
+  ["8337CF32",0xED49],
+  ["8337CF33",0xED4A],
+  ["8337CF34",0xED4B],
+  ["8337CF35",0xED4C],
+  ["8337CF36",0xED4D],
+  ["8337CF37",0xED4E],
+  ["8337CF38",0xED4F],
+  ["8337CF39",0xED50],
+  ["8337D030",0xED51],
+  ["8337D031",0xED52],
+  ["8337D032",0xED53],
+  ["8337D033",0xED54],
+  ["8337D034",0xED55],
+  ["8337D035",0xED56],
+  ["8337D036",0xED57],
+  ["8337D037",0xED58],
+  ["8337D038",0xED59],
+  ["8337D039",0xED5A],
+  ["8337D130",0xED5B],
+  ["8337D131",0xED5C],
+  ["8337D132",0xED5D],
+  ["8337D133",0xED5E],
+  ["8337D134",0xED5F],
+  ["8337D135",0xED60],
+  ["8337D136",0xED61],
+  ["8337D137",0xED62],
+  ["8337D138",0xED63],
+  ["8337D139",0xED64],
+  ["8337D230",0xED65],
+  ["8337D231",0xED66],
+  ["8337D232",0xED67],
+  ["8337D233",0xED68],
+  ["8337D234",0xED69],
+  ["8337D235",0xED6A],
+  ["8337D236",0xED6B],
+  ["8337D237",0xED6C],
+  ["8337D238",0xED6D],
+  ["8337D239",0xED6E],
+  ["8337D330",0xED6F],
+  ["8337D331",0xED70],
+  ["8337D332",0xED71],
+  ["8337D333",0xED72],
+  ["8337D334",0xED73],
+  ["8337D335",0xED74],
+  ["8337D336",0xED75],
+  ["8337D337",0xED76],
+  ["8337D338",0xED77],
+  ["8337D339",0xED78],
+  ["8337D430",0xED79],
+  ["8337D431",0xED7A],
+  ["8337D432",0xED7B],
+  ["8337D433",0xED7C],
+  ["8337D434",0xED7D],
+  ["8337D435",0xED7E],
+  ["8337D436",0xED7F],
+  ["8337D437",0xED80],
+  ["8337D438",0xED81],
+  ["8337D439",0xED82],
+  ["8337D530",0xED83],
+  ["8337D531",0xED84],
+  ["8337D532",0xED85],
+  ["8337D533",0xED86],
+  ["8337D534",0xED87],
+  ["8337D535",0xED88],
+  ["8337D536",0xED89],
+  ["8337D537",0xED8A],
+  ["8337D538",0xED8B],
+  ["8337D539",0xED8C],
+  ["8337D630",0xED8D],
+  ["8337D631",0xED8E],
+  ["8337D632",0xED8F],
+  ["8337D633",0xED90],
+  ["8337D634",0xED91],
+  ["8337D635",0xED92],
+  ["8337D636",0xED93],
+  ["8337D637",0xED94],
+  ["8337D638",0xED95],
+  ["8337D639",0xED96],
+  ["8337D730",0xED97],
+  ["8337D731",0xED98],
+  ["8337D732",0xED99],
+  ["8337D733",0xED9A],
+  ["8337D734",0xED9B],
+  ["8337D735",0xED9C],
+  ["8337D736",0xED9D],
+  ["8337D737",0xED9E],
+  ["8337D738",0xED9F],
+  ["8337D739",0xEDA0],
+  ["8337D830",0xEDA1],
+  ["8337D831",0xEDA2],
+  ["8337D832",0xEDA3],
+  ["8337D833",0xEDA4],
+  ["8337D834",0xEDA5],
+  ["8337D835",0xEDA6],
+  ["8337D836",0xEDA7],
+  ["8337D837",0xEDA8],
+  ["8337D838",0xEDA9],
+  ["8337D839",0xEDAA],
+  ["8337D930",0xEDAB],
+  ["8337D931",0xEDAC],
+  ["8337D932",0xEDAD],
+  ["8337D933",0xEDAE],
+  ["8337D934",0xEDAF],
+  ["8337D935",0xEDB0],
+  ["8337D936",0xEDB1],
+  ["8337D937",0xEDB2],
+  ["8337D938",0xEDB3],
+  ["8337D939",0xEDB4],
+  ["8337DA30",0xEDB5],
+  ["8337DA31",0xEDB6],
+  ["8337DA32",0xEDB7],
+  ["8337DA33",0xEDB8],
+  ["8337DA34",0xEDB9],
+  ["8337DA35",0xEDBA],
+  ["8337DA36",0xEDBB],
+  ["8337DA37",0xEDBC],
+  ["8337DA38",0xEDBD],
+  ["8337DA39",0xEDBE],
+  ["8337DB30",0xEDBF],
+  ["8337DB31",0xEDC0],
+  ["8337DB32",0xEDC1],
+  ["8337DB33",0xEDC2],
+  ["8337DB34",0xEDC3],
+  ["8337DB35",0xEDC4],
+  ["8337DB36",0xEDC5],
+  ["8337DB37",0xEDC6],
+  ["8337DB38",0xEDC7],
+  ["8337DB39",0xEDC8],
+  ["8337DC30",0xEDC9],
+  ["8337DC31",0xEDCA],
+  ["8337DC32",0xEDCB],
+  ["8337DC33",0xEDCC],
+  ["8337DC34",0xEDCD],
+  ["8337DC35",0xEDCE],
+  ["8337DC36",0xEDCF],
+  ["8337DC37",0xEDD0],
+  ["8337DC38",0xEDD1],
+  ["8337DC39",0xEDD2],
+  ["8337DD30",0xEDD3],
+  ["8337DD31",0xEDD4],
+  ["8337DD32",0xEDD5],
+  ["8337DD33",0xEDD6],
+  ["8337DD34",0xEDD7],
+  ["8337DD35",0xEDD8],
+  ["8337DD36",0xEDD9],
+  ["8337DD37",0xEDDA],
+  ["8337DD38",0xEDDB],
+  ["8337DD39",0xEDDC],
+  ["8337DE30",0xEDDD],
+  ["8337DE31",0xEDDE],
+  ["8337DE32",0xEDDF],
+  ["8337DE33",0xEDE0],
+  ["8337DE34",0xEDE1],
+  ["8337DE35",0xEDE2],
+  ["8337DE36",0xEDE3],
+  ["8337DE37",0xEDE4],
+  ["8337DE38",0xEDE5],
+  ["8337DE39",0xEDE6],
+  ["8337DF30",0xEDE7],
+  ["8337DF31",0xEDE8],
+  ["8337DF32",0xEDE9],
+  ["8337DF33",0xEDEA],
+  ["8337DF34",0xEDEB],
+  ["8337DF35",0xEDEC],
+  ["8337DF36",0xEDED],
+  ["8337DF37",0xEDEE],
+  ["8337DF38",0xEDEF],
+  ["8337DF39",0xEDF0],
+  ["8337E030",0xEDF1],
+  ["8337E031",0xEDF2],
+  ["8337E032",0xEDF3],
+  ["8337E033",0xEDF4],
+  ["8337E034",0xEDF5],
+  ["8337E035",0xEDF6],
+  ["8337E036",0xEDF7],
+  ["8337E037",0xEDF8],
+  ["8337E038",0xEDF9],
+  ["8337E039",0xEDFA],
+  ["8337E130",0xEDFB],
+  ["8337E131",0xEDFC],
+  ["8337E132",0xEDFD],
+  ["8337E133",0xEDFE],
+  ["8337E134",0xEDFF],
+  ["8337E135",0xEE00],
+  ["8337E136",0xEE01],
+  ["8337E137",0xEE02],
+  ["8337E138",0xEE03],
+  ["8337E139",0xEE04],
+  ["8337E230",0xEE05],
+  ["8337E231",0xEE06],
+  ["8337E232",0xEE07],
+  ["8337E233",0xEE08],
+  ["8337E234",0xEE09],
+  ["8337E235",0xEE0A],
+  ["8337E236",0xEE0B],
+  ["8337E237",0xEE0C],
+  ["8337E238",0xEE0D],
+  ["8337E239",0xEE0E],
+  ["8337E330",0xEE0F],
+  ["8337E331",0xEE10],
+  ["8337E332",0xEE11],
+  ["8337E333",0xEE12],
+  ["8337E334",0xEE13],
+  ["8337E335",0xEE14],
+  ["8337E336",0xEE15],
+  ["8337E337",0xEE16],
+  ["8337E338",0xEE17],
+  ["8337E339",0xEE18],
+  ["8337E430",0xEE19],
+  ["8337E431",0xEE1A],
+  ["8337E432",0xEE1B],
+  ["8337E433",0xEE1C],
+  ["8337E434",0xEE1D],
+  ["8337E435",0xEE1E],
+  ["8337E436",0xEE1F],
+  ["8337E437",0xEE20],
+  ["8337E438",0xEE21],
+  ["8337E439",0xEE22],
+  ["8337E530",0xEE23],
+  ["8337E531",0xEE24],
+  ["8337E532",0xEE25],
+  ["8337E533",0xEE26],
+  ["8337E534",0xEE27],
+  ["8337E535",0xEE28],
+  ["8337E536",0xEE29],
+  ["8337E537",0xEE2A],
+  ["8337E538",0xEE2B],
+  ["8337E539",0xEE2C],
+  ["8337E630",0xEE2D],
+  ["8337E631",0xEE2E],
+  ["8337E632",0xEE2F],
+  ["8337E633",0xEE30],
+  ["8337E634",0xEE31],
+  ["8337E635",0xEE32],
+  ["8337E636",0xEE33],
+  ["8337E637",0xEE34],
+  ["8337E638",0xEE35],
+  ["8337E639",0xEE36],
+  ["8337E730",0xEE37],
+  ["8337E731",0xEE38],
+  ["8337E732",0xEE39],
+  ["8337E733",0xEE3A],
+  ["8337E734",0xEE3B],
+  ["8337E735",0xEE3C],
+  ["8337E736",0xEE3D],
+  ["8337E737",0xEE3E],
+  ["8337E738",0xEE3F],
+  ["8337E739",0xEE40],
+  ["8337E830",0xEE41],
+  ["8337E831",0xEE42],
+  ["8337E832",0xEE43],
+  ["8337E833",0xEE44],
+  ["8337E834",0xEE45],
+  ["8337E835",0xEE46],
+  ["8337E836",0xEE47],
+  ["8337E837",0xEE48],
+  ["8337E838",0xEE49],
+  ["8337E839",0xEE4A],
+  ["8337E930",0xEE4B],
+  ["8337E931",0xEE4C],
+  ["8337E932",0xEE4D],
+  ["8337E933",0xEE4E],
+  ["8337E934",0xEE4F],
+  ["8337E935",0xEE50],
+  ["8337E936",0xEE51],
+  ["8337E937",0xEE52],
+  ["8337E938",0xEE53],
+  ["8337E939",0xEE54],
+  ["8337EA30",0xEE55],
+  ["8337EA31",0xEE56],
+  ["8337EA32",0xEE57],
+  ["8337EA33",0xEE58],
+  ["8337EA34",0xEE59],
+  ["8337EA35",0xEE5A],
+  ["8337EA36",0xEE5B],
+  ["8337EA37",0xEE5C],
+  ["8337EA38",0xEE5D],
+  ["8337EA39",0xEE5E],
+  ["8337EB30",0xEE5F],
+  ["8337EB31",0xEE60],
+  ["8337EB32",0xEE61],
+  ["8337EB33",0xEE62],
+  ["8337EB34",0xEE63],
+  ["8337EB35",0xEE64],
+  ["8337EB36",0xEE65],
+  ["8337EB37",0xEE66],
+  ["8337EB38",0xEE67],
+  ["8337EB39",0xEE68],
+  ["8337EC30",0xEE69],
+  ["8337EC31",0xEE6A],
+  ["8337EC32",0xEE6B],
+  ["8337EC33",0xEE6C],
+  ["8337EC34",0xEE6D],
+  ["8337EC35",0xEE6E],
+  ["8337EC36",0xEE6F],
+  ["8337EC37",0xEE70],
+  ["8337EC38",0xEE71],
+  ["8337EC39",0xEE72],
+  ["8337ED30",0xEE73],
+  ["8337ED31",0xEE74],
+  ["8337ED32",0xEE75],
+  ["8337ED33",0xEE76],
+  ["8337ED34",0xEE77],
+  ["8337ED35",0xEE78],
+  ["8337ED36",0xEE79],
+  ["8337ED37",0xEE7A],
+  ["8337ED38",0xEE7B],
+  ["8337ED39",0xEE7C],
+  ["8337EE30",0xEE7D],
+  ["8337EE31",0xEE7E],
+  ["8337EE32",0xEE7F],
+  ["8337EE33",0xEE80],
+  ["8337EE34",0xEE81],
+  ["8337EE35",0xEE82],
+  ["8337EE36",0xEE83],
+  ["8337EE37",0xEE84],
+  ["8337EE38",0xEE85],
+  ["8337EE39",0xEE86],
+  ["8337EF30",0xEE87],
+  ["8337EF31",0xEE88],
+  ["8337EF32",0xEE89],
+  ["8337EF33",0xEE8A],
+  ["8337EF34",0xEE8B],
+  ["8337EF35",0xEE8C],
+  ["8337EF36",0xEE8D],
+  ["8337EF37",0xEE8E],
+  ["8337EF38",0xEE8F],
+  ["8337EF39",0xEE90],
+  ["8337F030",0xEE91],
+  ["8337F031",0xEE92],
+  ["8337F032",0xEE93],
+  ["8337F033",0xEE94],
+  ["8337F034",0xEE95],
+  ["8337F035",0xEE96],
+  ["8337F036",0xEE97],
+  ["8337F037",0xEE98],
+  ["8337F038",0xEE99],
+  ["8337F039",0xEE9A],
+  ["8337F130",0xEE9B],
+  ["8337F131",0xEE9C],
+  ["8337F132",0xEE9D],
+  ["8337F133",0xEE9E],
+  ["8337F134",0xEE9F],
+  ["8337F135",0xEEA0],
+  ["8337F136",0xEEA1],
+  ["8337F137",0xEEA2],
+  ["8337F138",0xEEA3],
+  ["8337F139",0xEEA4],
+  ["8337F230",0xEEA5],
+  ["8337F231",0xEEA6],
+  ["8337F232",0xEEA7],
+  ["8337F233",0xEEA8],
+  ["8337F234",0xEEA9],
+  ["8337F235",0xEEAA],
+  ["8337F236",0xEEAB],
+  ["8337F237",0xEEAC],
+  ["8337F238",0xEEAD],
+  ["8337F239",0xEEAE],
+  ["8337F330",0xEEAF],
+  ["8337F331",0xEEB0],
+  ["8337F332",0xEEB1],
+  ["8337F333",0xEEB2],
+  ["8337F334",0xEEB3],
+  ["8337F335",0xEEB4],
+  ["8337F336",0xEEB5],
+  ["8337F337",0xEEB6],
+  ["8337F338",0xEEB7],
+  ["8337F339",0xEEB8],
+  ["8337F430",0xEEB9],
+  ["8337F431",0xEEBA],
+  ["8337F432",0xEEBB],
+  ["8337F433",0xEEBC],
+  ["8337F434",0xEEBD],
+  ["8337F435",0xEEBE],
+  ["8337F436",0xEEBF],
+  ["8337F437",0xEEC0],
+  ["8337F438",0xEEC1],
+  ["8337F439",0xEEC2],
+  ["8337F530",0xEEC3],
+  ["8337F531",0xEEC4],
+  ["8337F532",0xEEC5],
+  ["8337F533",0xEEC6],
+  ["8337F534",0xEEC7],
+  ["8337F535",0xEEC8],
+  ["8337F536",0xEEC9],
+  ["8337F537",0xEECA],
+  ["8337F538",0xEECB],
+  ["8337F539",0xEECC],
+  ["8337F630",0xEECD],
+  ["8337F631",0xEECE],
+  ["8337F632",0xEECF],
+  ["8337F633",0xEED0],
+  ["8337F634",0xEED1],
+  ["8337F635",0xEED2],
+  ["8337F636",0xEED3],
+  ["8337F637",0xEED4],
+  ["8337F638",0xEED5],
+  ["8337F639",0xEED6],
+  ["8337F730",0xEED7],
+  ["8337F731",0xEED8],
+  ["8337F732",0xEED9],
+  ["8337F733",0xEEDA],
+  ["8337F734",0xEEDB],
+  ["8337F735",0xEEDC],
+  ["8337F736",0xEEDD],
+  ["8337F737",0xEEDE],
+  ["8337F738",0xEEDF],
+  ["8337F739",0xEEE0],
+  ["8337F830",0xEEE1],
+  ["8337F831",0xEEE2],
+  ["8337F832",0xEEE3],
+  ["8337F833",0xEEE4],
+  ["8337F834",0xEEE5],
+  ["8337F835",0xEEE6],
+  ["8337F836",0xEEE7],
+  ["8337F837",0xEEE8],
+  ["8337F838",0xEEE9],
+  ["8337F839",0xEEEA],
+  ["8337F930",0xEEEB],
+  ["8337F931",0xEEEC],
+  ["8337F932",0xEEED],
+  ["8337F933",0xEEEE],
+  ["8337F934",0xEEEF],
+  ["8337F935",0xEEF0],
+  ["8337F936",0xEEF1],
+  ["8337F937",0xEEF2],
+  ["8337F938",0xEEF3],
+  ["8337F939",0xEEF4],
+  ["8337FA30",0xEEF5],
+  ["8337FA31",0xEEF6],
+  ["8337FA32",0xEEF7],
+  ["8337FA33",0xEEF8],
+  ["8337FA34",0xEEF9],
+  ["8337FA35",0xEEFA],
+  ["8337FA36",0xEEFB],
+  ["8337FA37",0xEEFC],
+  ["8337FA38",0xEEFD],
+  ["8337FA39",0xEEFE],
+  ["8337FB30",0xEEFF],
+  ["8337FB31",0xEF00],
+  ["8337FB32",0xEF01],
+  ["8337FB33",0xEF02],
+  ["8337FB34",0xEF03],
+  ["8337FB35",0xEF04],
+  ["8337FB36",0xEF05],
+  ["8337FB37",0xEF06],
+  ["8337FB38",0xEF07],
+  ["8337FB39",0xEF08],
+  ["8337FC30",0xEF09],
+  ["8337FC31",0xEF0A],
+  ["8337FC32",0xEF0B],
+  ["8337FC33",0xEF0C],
+  ["8337FC34",0xEF0D],
+  ["8337FC35",0xEF0E],
+  ["8337FC36",0xEF0F],
+  ["8337FC37",0xEF10],
+  ["8337FC38",0xEF11],
+  ["8337FC39",0xEF12],
+  ["8337FD30",0xEF13],
+  ["8337FD31",0xEF14],
+  ["8337FD32",0xEF15],
+  ["8337FD33",0xEF16],
+  ["8337FD34",0xEF17],
+  ["8337FD35",0xEF18],
+  ["8337FD36",0xEF19],
+  ["8337FD37",0xEF1A],
+  ["8337FD38",0xEF1B],
+  ["8337FD39",0xEF1C],
+  ["8337FE30",0xEF1D],
+  ["8337FE31",0xEF1E],
+  ["8337FE32",0xEF1F],
+  ["8337FE33",0xEF20],
+  ["8337FE34",0xEF21],
+  ["8337FE35",0xEF22],
+  ["8337FE36",0xEF23],
+  ["8337FE37",0xEF24],
+  ["8337FE38",0xEF25],
+  ["8337FE39",0xEF26],
+  ["83388130",0xEF27],
+  ["83388131",0xEF28],
+  ["83388132",0xEF29],
+  ["83388133",0xEF2A],
+  ["83388134",0xEF2B],
+  ["83388135",0xEF2C],
+  ["83388136",0xEF2D],
+  ["83388137",0xEF2E],
+  ["83388138",0xEF2F],
+  ["83388139",0xEF30],
+  ["83388230",0xEF31],
+  ["83388231",0xEF32],
+  ["83388232",0xEF33],
+  ["83388233",0xEF34],
+  ["83388234",0xEF35],
+  ["83388235",0xEF36],
+  ["83388236",0xEF37],
+  ["83388237",0xEF38],
+  ["83388238",0xEF39],
+  ["83388239",0xEF3A],
+  ["83388330",0xEF3B],
+  ["83388331",0xEF3C],
+  ["83388332",0xEF3D],
+  ["83388333",0xEF3E],
+  ["83388334",0xEF3F],
+  ["83388335",0xEF40],
+  ["83388336",0xEF41],
+  ["83388337",0xEF42],
+  ["83388338",0xEF43],
+  ["83388339",0xEF44],
+  ["83388430",0xEF45],
+  ["83388431",0xEF46],
+  ["83388432",0xEF47],
+  ["83388433",0xEF48],
+  ["83388434",0xEF49],
+  ["83388435",0xEF4A],
+  ["83388436",0xEF4B],
+  ["83388437",0xEF4C],
+  ["83388438",0xEF4D],
+  ["83388439",0xEF4E],
+  ["83388530",0xEF4F],
+  ["83388531",0xEF50],
+  ["83388532",0xEF51],
+  ["83388533",0xEF52],
+  ["83388534",0xEF53],
+  ["83388535",0xEF54],
+  ["83388536",0xEF55],
+  ["83388537",0xEF56],
+  ["83388538",0xEF57],
+  ["83388539",0xEF58],
+  ["83388630",0xEF59],
+  ["83388631",0xEF5A],
+  ["83388632",0xEF5B],
+  ["83388633",0xEF5C],
+  ["83388634",0xEF5D],
+  ["83388635",0xEF5E],
+  ["83388636",0xEF5F],
+  ["83388637",0xEF60],
+  ["83388638",0xEF61],
+  ["83388639",0xEF62],
+  ["83388730",0xEF63],
+  ["83388731",0xEF64],
+  ["83388732",0xEF65],
+  ["83388733",0xEF66],
+  ["83388734",0xEF67],
+  ["83388735",0xEF68],
+  ["83388736",0xEF69],
+  ["83388737",0xEF6A],
+  ["83388738",0xEF6B],
+  ["83388739",0xEF6C],
+  ["83388830",0xEF6D],
+  ["83388831",0xEF6E],
+  ["83388832",0xEF6F],
+  ["83388833",0xEF70],
+  ["83388834",0xEF71],
+  ["83388835",0xEF72],
+  ["83388836",0xEF73],
+  ["83388837",0xEF74],
+  ["83388838",0xEF75],
+  ["83388839",0xEF76],
+  ["83388930",0xEF77],
+  ["83388931",0xEF78],
+  ["83388932",0xEF79],
+  ["83388933",0xEF7A],
+  ["83388934",0xEF7B],
+  ["83388935",0xEF7C],
+  ["83388936",0xEF7D],
+  ["83388937",0xEF7E],
+  ["83388938",0xEF7F],
+  ["83388939",0xEF80],
+  ["83388A30",0xEF81],
+  ["83388A31",0xEF82],
+  ["83388A32",0xEF83],
+  ["83388A33",0xEF84],
+  ["83388A34",0xEF85],
+  ["83388A35",0xEF86],
+  ["83388A36",0xEF87],
+  ["83388A37",0xEF88],
+  ["83388A38",0xEF89],
+  ["83388A39",0xEF8A],
+  ["83388B30",0xEF8B],
+  ["83388B31",0xEF8C],
+  ["83388B32",0xEF8D],
+  ["83388B33",0xEF8E],
+  ["83388B34",0xEF8F],
+  ["83388B35",0xEF90],
+  ["83388B36",0xEF91],
+  ["83388B37",0xEF92],
+  ["83388B38",0xEF93],
+  ["83388B39",0xEF94],
+  ["83388C30",0xEF95],
+  ["83388C31",0xEF96],
+  ["83388C32",0xEF97],
+  ["83388C33",0xEF98],
+  ["83388C34",0xEF99],
+  ["83388C35",0xEF9A],
+  ["83388C36",0xEF9B],
+  ["83388C37",0xEF9C],
+  ["83388C38",0xEF9D],
+  ["83388C39",0xEF9E],
+  ["83388D30",0xEF9F],
+  ["83388D31",0xEFA0],
+  ["83388D32",0xEFA1],
+  ["83388D33",0xEFA2],
+  ["83388D34",0xEFA3],
+  ["83388D35",0xEFA4],
+  ["83388D36",0xEFA5],
+  ["83388D37",0xEFA6],
+  ["83388D38",0xEFA7],
+  ["83388D39",0xEFA8],
+  ["83388E30",0xEFA9],
+  ["83388E31",0xEFAA],
+  ["83388E32",0xEFAB],
+  ["83388E33",0xEFAC],
+  ["83388E34",0xEFAD],
+  ["83388E35",0xEFAE],
+  ["83388E36",0xEFAF],
+  ["83388E37",0xEFB0],
+  ["83388E38",0xEFB1],
+  ["83388E39",0xEFB2],
+  ["83388F30",0xEFB3],
+  ["83388F31",0xEFB4],
+  ["83388F32",0xEFB5],
+  ["83388F33",0xEFB6],
+  ["83388F34",0xEFB7],
+  ["83388F35",0xEFB8],
+  ["83388F36",0xEFB9],
+  ["83388F37",0xEFBA],
+  ["83388F38",0xEFBB],
+  ["83388F39",0xEFBC],
+  ["83389030",0xEFBD],
+  ["83389031",0xEFBE],
+  ["83389032",0xEFBF],
+  ["83389033",0xEFC0],
+  ["83389034",0xEFC1],
+  ["83389035",0xEFC2],
+  ["83389036",0xEFC3],
+  ["83389037",0xEFC4],
+  ["83389038",0xEFC5],
+  ["83389039",0xEFC6],
+  ["83389130",0xEFC7],
+  ["83389131",0xEFC8],
+  ["83389132",0xEFC9],
+  ["83389133",0xEFCA],
+  ["83389134",0xEFCB],
+  ["83389135",0xEFCC],
+  ["83389136",0xEFCD],
+  ["83389137",0xEFCE],
+  ["83389138",0xEFCF],
+  ["83389139",0xEFD0],
+  ["83389230",0xEFD1],
+  ["83389231",0xEFD2],
+  ["83389232",0xEFD3],
+  ["83389233",0xEFD4],
+  ["83389234",0xEFD5],
+  ["83389235",0xEFD6],
+  ["83389236",0xEFD7],
+  ["83389237",0xEFD8],
+  ["83389238",0xEFD9],
+  ["83389239",0xEFDA],
+  ["83389330",0xEFDB],
+  ["83389331",0xEFDC],
+  ["83389332",0xEFDD],
+  ["83389333",0xEFDE],
+  ["83389334",0xEFDF],
+  ["83389335",0xEFE0],
+  ["83389336",0xEFE1],
+  ["83389337",0xEFE2],
+  ["83389338",0xEFE3],
+  ["83389339",0xEFE4],
+  ["83389430",0xEFE5],
+  ["83389431",0xEFE6],
+  ["83389432",0xEFE7],
+  ["83389433",0xEFE8],
+  ["83389434",0xEFE9],
+  ["83389435",0xEFEA],
+  ["83389436",0xEFEB],
+  ["83389437",0xEFEC],
+  ["83389438",0xEFED],
+  ["83389439",0xEFEE],
+  ["83389530",0xEFEF],
+  ["83389531",0xEFF0],
+  ["83389532",0xEFF1],
+  ["83389533",0xEFF2],
+  ["83389534",0xEFF3],
+  ["83389535",0xEFF4],
+  ["83389536",0xEFF5],
+  ["83389537",0xEFF6],
+  ["83389538",0xEFF7],
+  ["83389539",0xEFF8],
+  ["83389630",0xEFF9],
+  ["83389631",0xEFFA],
+  ["83389632",0xEFFB],
+  ["83389633",0xEFFC],
+  ["83389634",0xEFFD],
+  ["83389635",0xEFFE],
+  ["83389636",0xEFFF],
+  ["83389637",0xF000],
+  ["83389638",0xF001],
+  ["83389639",0xF002],
+  ["83389730",0xF003],
+  ["83389731",0xF004],
+  ["83389732",0xF005],
+  ["83389733",0xF006],
+  ["83389734",0xF007],
+  ["83389735",0xF008],
+  ["83389736",0xF009],
+  ["83389737",0xF00A],
+  ["83389738",0xF00B],
+  ["83389739",0xF00C],
+  ["83389830",0xF00D],
+  ["83389831",0xF00E],
+  ["83389832",0xF00F],
+  ["83389833",0xF010],
+  ["83389834",0xF011],
+  ["83389835",0xF012],
+  ["83389836",0xF013],
+  ["83389837",0xF014],
+  ["83389838",0xF015],
+  ["83389839",0xF016],
+  ["83389930",0xF017],
+  ["83389931",0xF018],
+  ["83389932",0xF019],
+  ["83389933",0xF01A],
+  ["83389934",0xF01B],
+  ["83389935",0xF01C],
+  ["83389936",0xF01D],
+  ["83389937",0xF01E],
+  ["83389938",0xF01F],
+  ["83389939",0xF020],
+  ["83389A30",0xF021],
+  ["83389A31",0xF022],
+  ["83389A32",0xF023],
+  ["83389A33",0xF024],
+  ["83389A34",0xF025],
+  ["83389A35",0xF026],
+  ["83389A36",0xF027],
+  ["83389A37",0xF028],
+  ["83389A38",0xF029],
+  ["83389A39",0xF02A],
+  ["83389B30",0xF02B],
+  ["83389B31",0xF02C],
+  ["83389B32",0xF02D],
+  ["83389B33",0xF02E],
+  ["83389B34",0xF02F],
+  ["83389B35",0xF030],
+  ["83389B36",0xF031],
+  ["83389B37",0xF032],
+  ["83389B38",0xF033],
+  ["83389B39",0xF034],
+  ["83389C30",0xF035],
+  ["83389C31",0xF036],
+  ["83389C32",0xF037],
+  ["83389C33",0xF038],
+  ["83389C34",0xF039],
+  ["83389C35",0xF03A],
+  ["83389C36",0xF03B],
+  ["83389C37",0xF03C],
+  ["83389C38",0xF03D],
+  ["83389C39",0xF03E],
+  ["83389D30",0xF03F],
+  ["83389D31",0xF040],
+  ["83389D32",0xF041],
+  ["83389D33",0xF042],
+  ["83389D34",0xF043],
+  ["83389D35",0xF044],
+  ["83389D36",0xF045],
+  ["83389D37",0xF046],
+  ["83389D38",0xF047],
+  ["83389D39",0xF048],
+  ["83389E30",0xF049],
+  ["83389E31",0xF04A],
+  ["83389E32",0xF04B],
+  ["83389E33",0xF04C],
+  ["83389E34",0xF04D],
+  ["83389E35",0xF04E],
+  ["83389E36",0xF04F],
+  ["83389E37",0xF050],
+  ["83389E38",0xF051],
+  ["83389E39",0xF052],
+  ["83389F30",0xF053],
+  ["83389F31",0xF054],
+  ["83389F32",0xF055],
+  ["83389F33",0xF056],
+  ["83389F34",0xF057],
+  ["83389F35",0xF058],
+  ["83389F36",0xF059],
+  ["83389F37",0xF05A],
+  ["83389F38",0xF05B],
+  ["83389F39",0xF05C],
+  ["8338A030",0xF05D],
+  ["8338A031",0xF05E],
+  ["8338A032",0xF05F],
+  ["8338A033",0xF060],
+  ["8338A034",0xF061],
+  ["8338A035",0xF062],
+  ["8338A036",0xF063],
+  ["8338A037",0xF064],
+  ["8338A038",0xF065],
+  ["8338A039",0xF066],
+  ["8338A130",0xF067],
+  ["8338A131",0xF068],
+  ["8338A132",0xF069],
+  ["8338A133",0xF06A],
+  ["8338A134",0xF06B],
+  ["8338A135",0xF06C],
+  ["8338A136",0xF06D],
+  ["8338A137",0xF06E],
+  ["8338A138",0xF06F],
+  ["8338A139",0xF070],
+  ["8338A230",0xF071],
+  ["8338A231",0xF072],
+  ["8338A232",0xF073],
+  ["8338A233",0xF074],
+  ["8338A234",0xF075],
+  ["8338A235",0xF076],
+  ["8338A236",0xF077],
+  ["8338A237",0xF078],
+  ["8338A238",0xF079],
+  ["8338A239",0xF07A],
+  ["8338A330",0xF07B],
+  ["8338A331",0xF07C],
+  ["8338A332",0xF07D],
+  ["8338A333",0xF07E],
+  ["8338A334",0xF07F],
+  ["8338A335",0xF080],
+  ["8338A336",0xF081],
+  ["8338A337",0xF082],
+  ["8338A338",0xF083],
+  ["8338A339",0xF084],
+  ["8338A430",0xF085],
+  ["8338A431",0xF086],
+  ["8338A432",0xF087],
+  ["8338A433",0xF088],
+  ["8338A434",0xF089],
+  ["8338A435",0xF08A],
+  ["8338A436",0xF08B],
+  ["8338A437",0xF08C],
+  ["8338A438",0xF08D],
+  ["8338A439",0xF08E],
+  ["8338A530",0xF08F],
+  ["8338A531",0xF090],
+  ["8338A532",0xF091],
+  ["8338A533",0xF092],
+  ["8338A534",0xF093],
+  ["8338A535",0xF094],
+  ["8338A536",0xF095],
+  ["8338A537",0xF096],
+  ["8338A538",0xF097],
+  ["8338A539",0xF098],
+  ["8338A630",0xF099],
+  ["8338A631",0xF09A],
+  ["8338A632",0xF09B],
+  ["8338A633",0xF09C],
+  ["8338A634",0xF09D],
+  ["8338A635",0xF09E],
+  ["8338A636",0xF09F],
+  ["8338A637",0xF0A0],
+  ["8338A638",0xF0A1],
+  ["8338A639",0xF0A2],
+  ["8338A730",0xF0A3],
+  ["8338A731",0xF0A4],
+  ["8338A732",0xF0A5],
+  ["8338A733",0xF0A6],
+  ["8338A734",0xF0A7],
+  ["8338A735",0xF0A8],
+  ["8338A736",0xF0A9],
+  ["8338A737",0xF0AA],
+  ["8338A738",0xF0AB],
+  ["8338A739",0xF0AC],
+  ["8338A830",0xF0AD],
+  ["8338A831",0xF0AE],
+  ["8338A832",0xF0AF],
+  ["8338A833",0xF0B0],
+  ["8338A834",0xF0B1],
+  ["8338A835",0xF0B2],
+  ["8338A836",0xF0B3],
+  ["8338A837",0xF0B4],
+  ["8338A838",0xF0B5],
+  ["8338A839",0xF0B6],
+  ["8338A930",0xF0B7],
+  ["8338A931",0xF0B8],
+  ["8338A932",0xF0B9],
+  ["8338A933",0xF0BA],
+  ["8338A934",0xF0BB],
+  ["8338A935",0xF0BC],
+  ["8338A936",0xF0BD],
+  ["8338A937",0xF0BE],
+  ["8338A938",0xF0BF],
+  ["8338A939",0xF0C0],
+  ["8338AA30",0xF0C1],
+  ["8338AA31",0xF0C2],
+  ["8338AA32",0xF0C3],
+  ["8338AA33",0xF0C4],
+  ["8338AA34",0xF0C5],
+  ["8338AA35",0xF0C6],
+  ["8338AA36",0xF0C7],
+  ["8338AA37",0xF0C8],
+  ["8338AA38",0xF0C9],
+  ["8338AA39",0xF0CA],
+  ["8338AB30",0xF0CB],
+  ["8338AB31",0xF0CC],
+  ["8338AB32",0xF0CD],
+  ["8338AB33",0xF0CE],
+  ["8338AB34",0xF0CF],
+  ["8338AB35",0xF0D0],
+  ["8338AB36",0xF0D1],
+  ["8338AB37",0xF0D2],
+  ["8338AB38",0xF0D3],
+  ["8338AB39",0xF0D4],
+  ["8338AC30",0xF0D5],
+  ["8338AC31",0xF0D6],
+  ["8338AC32",0xF0D7],
+  ["8338AC33",0xF0D8],
+  ["8338AC34",0xF0D9],
+  ["8338AC35",0xF0DA],
+  ["8338AC36",0xF0DB],
+  ["8338AC37",0xF0DC],
+  ["8338AC38",0xF0DD],
+  ["8338AC39",0xF0DE],
+  ["8338AD30",0xF0DF],
+  ["8338AD31",0xF0E0],
+  ["8338AD32",0xF0E1],
+  ["8338AD33",0xF0E2],
+  ["8338AD34",0xF0E3],
+  ["8338AD35",0xF0E4],
+  ["8338AD36",0xF0E5],
+  ["8338AD37",0xF0E6],
+  ["8338AD38",0xF0E7],
+  ["8338AD39",0xF0E8],
+  ["8338AE30",0xF0E9],
+  ["8338AE31",0xF0EA],
+  ["8338AE32",0xF0EB],
+  ["8338AE33",0xF0EC],
+  ["8338AE34",0xF0ED],
+  ["8338AE35",0xF0EE],
+  ["8338AE36",0xF0EF],
+  ["8338AE37",0xF0F0],
+  ["8338AE38",0xF0F1],
+  ["8338AE39",0xF0F2],
+  ["8338AF30",0xF0F3],
+  ["8338AF31",0xF0F4],
+  ["8338AF32",0xF0F5],
+  ["8338AF33",0xF0F6],
+  ["8338AF34",0xF0F7],
+  ["8338AF35",0xF0F8],
+  ["8338AF36",0xF0F9],
+  ["8338AF37",0xF0FA],
+  ["8338AF38",0xF0FB],
+  ["8338AF39",0xF0FC],
+  ["8338B030",0xF0FD],
+  ["8338B031",0xF0FE],
+  ["8338B032",0xF0FF],
+  ["8338B033",0xF100],
+  ["8338B034",0xF101],
+  ["8338B035",0xF102],
+  ["8338B036",0xF103],
+  ["8338B037",0xF104],
+  ["8338B038",0xF105],
+  ["8338B039",0xF106],
+  ["8338B130",0xF107],
+  ["8338B131",0xF108],
+  ["8338B132",0xF109],
+  ["8338B133",0xF10A],
+  ["8338B134",0xF10B],
+  ["8338B135",0xF10C],
+  ["8338B136",0xF10D],
+  ["8338B137",0xF10E],
+  ["8338B138",0xF10F],
+  ["8338B139",0xF110],
+  ["8338B230",0xF111],
+  ["8338B231",0xF112],
+  ["8338B232",0xF113],
+  ["8338B233",0xF114],
+  ["8338B234",0xF115],
+  ["8338B235",0xF116],
+  ["8338B236",0xF117],
+  ["8338B237",0xF118],
+  ["8338B238",0xF119],
+  ["8338B239",0xF11A],
+  ["8338B330",0xF11B],
+  ["8338B331",0xF11C],
+  ["8338B332",0xF11D],
+  ["8338B333",0xF11E],
+  ["8338B334",0xF11F],
+  ["8338B335",0xF120],
+  ["8338B336",0xF121],
+  ["8338B337",0xF122],
+  ["8338B338",0xF123],
+  ["8338B339",0xF124],
+  ["8338B430",0xF125],
+  ["8338B431",0xF126],
+  ["8338B432",0xF127],
+  ["8338B433",0xF128],
+  ["8338B434",0xF129],
+  ["8338B435",0xF12A],
+  ["8338B436",0xF12B],
+  ["8338B437",0xF12C],
+  ["8338B438",0xF12D],
+  ["8338B439",0xF12E],
+  ["8338B530",0xF12F],
+  ["8338B531",0xF130],
+  ["8338B532",0xF131],
+  ["8338B533",0xF132],
+  ["8338B534",0xF133],
+  ["8338B535",0xF134],
+  ["8338B536",0xF135],
+  ["8338B537",0xF136],
+  ["8338B538",0xF137],
+  ["8338B539",0xF138],
+  ["8338B630",0xF139],
+  ["8338B631",0xF13A],
+  ["8338B632",0xF13B],
+  ["8338B633",0xF13C],
+  ["8338B634",0xF13D],
+  ["8338B635",0xF13E],
+  ["8338B636",0xF13F],
+  ["8338B637",0xF140],
+  ["8338B638",0xF141],
+  ["8338B639",0xF142],
+  ["8338B730",0xF143],
+  ["8338B731",0xF144],
+  ["8338B732",0xF145],
+  ["8338B733",0xF146],
+  ["8338B734",0xF147],
+  ["8338B735",0xF148],
+  ["8338B736",0xF149],
+  ["8338B737",0xF14A],
+  ["8338B738",0xF14B],
+  ["8338B739",0xF14C],
+  ["8338B830",0xF14D],
+  ["8338B831",0xF14E],
+  ["8338B832",0xF14F],
+  ["8338B833",0xF150],
+  ["8338B834",0xF151],
+  ["8338B835",0xF152],
+  ["8338B836",0xF153],
+  ["8338B837",0xF154],
+  ["8338B838",0xF155],
+  ["8338B839",0xF156],
+  ["8338B930",0xF157],
+  ["8338B931",0xF158],
+  ["8338B932",0xF159],
+  ["8338B933",0xF15A],
+  ["8338B934",0xF15B],
+  ["8338B935",0xF15C],
+  ["8338B936",0xF15D],
+  ["8338B937",0xF15E],
+  ["8338B938",0xF15F],
+  ["8338B939",0xF160],
+  ["8338BA30",0xF161],
+  ["8338BA31",0xF162],
+  ["8338BA32",0xF163],
+  ["8338BA33",0xF164],
+  ["8338BA34",0xF165],
+  ["8338BA35",0xF166],
+  ["8338BA36",0xF167],
+  ["8338BA37",0xF168],
+  ["8338BA38",0xF169],
+  ["8338BA39",0xF16A],
+  ["8338BB30",0xF16B],
+  ["8338BB31",0xF16C],
+  ["8338BB32",0xF16D],
+  ["8338BB33",0xF16E],
+  ["8338BB34",0xF16F],
+  ["8338BB35",0xF170],
+  ["8338BB36",0xF171],
+  ["8338BB37",0xF172],
+  ["8338BB38",0xF173],
+  ["8338BB39",0xF174],
+  ["8338BC30",0xF175],
+  ["8338BC31",0xF176],
+  ["8338BC32",0xF177],
+  ["8338BC33",0xF178],
+  ["8338BC34",0xF179],
+  ["8338BC35",0xF17A],
+  ["8338BC36",0xF17B],
+  ["8338BC37",0xF17C],
+  ["8338BC38",0xF17D],
+  ["8338BC39",0xF17E],
+  ["8338BD30",0xF17F],
+  ["8338BD31",0xF180],
+  ["8338BD32",0xF181],
+  ["8338BD33",0xF182],
+  ["8338BD34",0xF183],
+  ["8338BD35",0xF184],
+  ["8338BD36",0xF185],
+  ["8338BD37",0xF186],
+  ["8338BD38",0xF187],
+  ["8338BD39",0xF188],
+  ["8338BE30",0xF189],
+  ["8338BE31",0xF18A],
+  ["8338BE32",0xF18B],
+  ["8338BE33",0xF18C],
+  ["8338BE34",0xF18D],
+  ["8338BE35",0xF18E],
+  ["8338BE36",0xF18F],
+  ["8338BE37",0xF190],
+  ["8338BE38",0xF191],
+  ["8338BE39",0xF192],
+  ["8338BF30",0xF193],
+  ["8338BF31",0xF194],
+  ["8338BF32",0xF195],
+  ["8338BF33",0xF196],
+  ["8338BF34",0xF197],
+  ["8338BF35",0xF198],
+  ["8338BF36",0xF199],
+  ["8338BF37",0xF19A],
+  ["8338BF38",0xF19B],
+  ["8338BF39",0xF19C],
+  ["8338C030",0xF19D],
+  ["8338C031",0xF19E],
+  ["8338C032",0xF19F],
+  ["8338C033",0xF1A0],
+  ["8338C034",0xF1A1],
+  ["8338C035",0xF1A2],
+  ["8338C036",0xF1A3],
+  ["8338C037",0xF1A4],
+  ["8338C038",0xF1A5],
+  ["8338C039",0xF1A6],
+  ["8338C130",0xF1A7],
+  ["8338C131",0xF1A8],
+  ["8338C132",0xF1A9],
+  ["8338C133",0xF1AA],
+  ["8338C134",0xF1AB],
+  ["8338C135",0xF1AC],
+  ["8338C136",0xF1AD],
+  ["8338C137",0xF1AE],
+  ["8338C138",0xF1AF],
+  ["8338C139",0xF1B0],
+  ["8338C230",0xF1B1],
+  ["8338C231",0xF1B2],
+  ["8338C232",0xF1B3],
+  ["8338C233",0xF1B4],
+  ["8338C234",0xF1B5],
+  ["8338C235",0xF1B6],
+  ["8338C236",0xF1B7],
+  ["8338C237",0xF1B8],
+  ["8338C238",0xF1B9],
+  ["8338C239",0xF1BA],
+  ["8338C330",0xF1BB],
+  ["8338C331",0xF1BC],
+  ["8338C332",0xF1BD],
+  ["8338C333",0xF1BE],
+  ["8338C334",0xF1BF],
+  ["8338C335",0xF1C0],
+  ["8338C336",0xF1C1],
+  ["8338C337",0xF1C2],
+  ["8338C338",0xF1C3],
+  ["8338C339",0xF1C4],
+  ["8338C430",0xF1C5],
+  ["8338C431",0xF1C6],
+  ["8338C432",0xF1C7],
+  ["8338C433",0xF1C8],
+  ["8338C434",0xF1C9],
+  ["8338C435",0xF1CA],
+  ["8338C436",0xF1CB],
+  ["8338C437",0xF1CC],
+  ["8338C438",0xF1CD],
+  ["8338C439",0xF1CE],
+  ["8338C530",0xF1CF],
+  ["8338C531",0xF1D0],
+  ["8338C532",0xF1D1],
+  ["8338C533",0xF1D2],
+  ["8338C534",0xF1D3],
+  ["8338C535",0xF1D4],
+  ["8338C536",0xF1D5],
+  ["8338C537",0xF1D6],
+  ["8338C538",0xF1D7],
+  ["8338C539",0xF1D8],
+  ["8338C630",0xF1D9],
+  ["8338C631",0xF1DA],
+  ["8338C632",0xF1DB],
+  ["8338C633",0xF1DC],
+  ["8338C634",0xF1DD],
+  ["8338C635",0xF1DE],
+  ["8338C636",0xF1DF],
+  ["8338C637",0xF1E0],
+  ["8338C638",0xF1E1],
+  ["8338C639",0xF1E2],
+  ["8338C730",0xF1E3],
+  ["8338C731",0xF1E4],
+  ["8338C732",0xF1E5],
+  ["8338C733",0xF1E6],
+  ["8338C734",0xF1E7],
+  ["8338C735",0xF1E8],
+  ["8338C736",0xF1E9],
+  ["8338C737",0xF1EA],
+  ["8338C738",0xF1EB],
+  ["8338C739",0xF1EC],
+  ["8338C830",0xF1ED],
+  ["8338C831",0xF1EE],
+  ["8338C832",0xF1EF],
+  ["8338C833",0xF1F0],
+  ["8338C834",0xF1F1],
+  ["8338C835",0xF1F2],
+  ["8338C836",0xF1F3],
+  ["8338C837",0xF1F4],
+  ["8338C838",0xF1F5],
+  ["8338C839",0xF1F6],
+  ["8338C930",0xF1F7],
+  ["8338C931",0xF1F8],
+  ["8338C932",0xF1F9],
+  ["8338C933",0xF1FA],
+  ["8338C934",0xF1FB],
+  ["8338C935",0xF1FC],
+  ["8338C936",0xF1FD],
+  ["8338C937",0xF1FE],
+  ["8338C938",0xF1FF],
+  ["8338C939",0xF200],
+  ["8338CA30",0xF201],
+  ["8338CA31",0xF202],
+  ["8338CA32",0xF203],
+  ["8338CA33",0xF204],
+  ["8338CA34",0xF205],
+  ["8338CA35",0xF206],
+  ["8338CA36",0xF207],
+  ["8338CA37",0xF208],
+  ["8338CA38",0xF209],
+  ["8338CA39",0xF20A],
+  ["8338CB30",0xF20B],
+  ["8338CB31",0xF20C],
+  ["8338CB32",0xF20D],
+  ["8338CB33",0xF20E],
+  ["8338CB34",0xF20F],
+  ["8338CB35",0xF210],
+  ["8338CB36",0xF211],
+  ["8338CB37",0xF212],
+  ["8338CB38",0xF213],
+  ["8338CB39",0xF214],
+  ["8338CC30",0xF215],
+  ["8338CC31",0xF216],
+  ["8338CC32",0xF217],
+  ["8338CC33",0xF218],
+  ["8338CC34",0xF219],
+  ["8338CC35",0xF21A],
+  ["8338CC36",0xF21B],
+  ["8338CC37",0xF21C],
+  ["8338CC38",0xF21D],
+  ["8338CC39",0xF21E],
+  ["8338CD30",0xF21F],
+  ["8338CD31",0xF220],
+  ["8338CD32",0xF221],
+  ["8338CD33",0xF222],
+  ["8338CD34",0xF223],
+  ["8338CD35",0xF224],
+  ["8338CD36",0xF225],
+  ["8338CD37",0xF226],
+  ["8338CD38",0xF227],
+  ["8338CD39",0xF228],
+  ["8338CE30",0xF229],
+  ["8338CE31",0xF22A],
+  ["8338CE32",0xF22B],
+  ["8338CE33",0xF22C],
+  ["8338CE34",0xF22D],
+  ["8338CE35",0xF22E],
+  ["8338CE36",0xF22F],
+  ["8338CE37",0xF230],
+  ["8338CE38",0xF231],
+  ["8338CE39",0xF232],
+  ["8338CF30",0xF233],
+  ["8338CF31",0xF234],
+  ["8338CF32",0xF235],
+  ["8338CF33",0xF236],
+  ["8338CF34",0xF237],
+  ["8338CF35",0xF238],
+  ["8338CF36",0xF239],
+  ["8338CF37",0xF23A],
+  ["8338CF38",0xF23B],
+  ["8338CF39",0xF23C],
+  ["8338D030",0xF23D],
+  ["8338D031",0xF23E],
+  ["8338D032",0xF23F],
+  ["8338D033",0xF240],
+  ["8338D034",0xF241],
+  ["8338D035",0xF242],
+  ["8338D036",0xF243],
+  ["8338D037",0xF244],
+  ["8338D038",0xF245],
+  ["8338D039",0xF246],
+  ["8338D130",0xF247],
+  ["8338D131",0xF248],
+  ["8338D132",0xF249],
+  ["8338D133",0xF24A],
+  ["8338D134",0xF24B],
+  ["8338D135",0xF24C],
+  ["8338D136",0xF24D],
+  ["8338D137",0xF24E],
+  ["8338D138",0xF24F],
+  ["8338D139",0xF250],
+  ["8338D230",0xF251],
+  ["8338D231",0xF252],
+  ["8338D232",0xF253],
+  ["8338D233",0xF254],
+  ["8338D234",0xF255],
+  ["8338D235",0xF256],
+  ["8338D236",0xF257],
+  ["8338D237",0xF258],
+  ["8338D238",0xF259],
+  ["8338D239",0xF25A],
+  ["8338D330",0xF25B],
+  ["8338D331",0xF25C],
+  ["8338D332",0xF25D],
+  ["8338D333",0xF25E],
+  ["8338D334",0xF25F],
+  ["8338D335",0xF260],
+  ["8338D336",0xF261],
+  ["8338D337",0xF262],
+  ["8338D338",0xF263],
+  ["8338D339",0xF264],
+  ["8338D430",0xF265],
+  ["8338D431",0xF266],
+  ["8338D432",0xF267],
+  ["8338D433",0xF268],
+  ["8338D434",0xF269],
+  ["8338D435",0xF26A],
+  ["8338D436",0xF26B],
+  ["8338D437",0xF26C],
+  ["8338D438",0xF26D],
+  ["8338D439",0xF26E],
+  ["8338D530",0xF26F],
+  ["8338D531",0xF270],
+  ["8338D532",0xF271],
+  ["8338D533",0xF272],
+  ["8338D534",0xF273],
+  ["8338D535",0xF274],
+  ["8338D536",0xF275],
+  ["8338D537",0xF276],
+  ["8338D538",0xF277],
+  ["8338D539",0xF278],
+  ["8338D630",0xF279],
+  ["8338D631",0xF27A],
+  ["8338D632",0xF27B],
+  ["8338D633",0xF27C],
+  ["8338D634",0xF27D],
+  ["8338D635",0xF27E],
+  ["8338D636",0xF27F],
+  ["8338D637",0xF280],
+  ["8338D638",0xF281],
+  ["8338D639",0xF282],
+  ["8338D730",0xF283],
+  ["8338D731",0xF284],
+  ["8338D732",0xF285],
+  ["8338D733",0xF286],
+  ["8338D734",0xF287],
+  ["8338D735",0xF288],
+  ["8338D736",0xF289],
+  ["8338D737",0xF28A],
+  ["8338D738",0xF28B],
+  ["8338D739",0xF28C],
+  ["8338D830",0xF28D],
+  ["8338D831",0xF28E],
+  ["8338D832",0xF28F],
+  ["8338D833",0xF290],
+  ["8338D834",0xF291],
+  ["8338D835",0xF292],
+  ["8338D836",0xF293],
+  ["8338D837",0xF294],
+  ["8338D838",0xF295],
+  ["8338D839",0xF296],
+  ["8338D930",0xF297],
+  ["8338D931",0xF298],
+  ["8338D932",0xF299],
+  ["8338D933",0xF29A],
+  ["8338D934",0xF29B],
+  ["8338D935",0xF29C],
+  ["8338D936",0xF29D],
+  ["8338D937",0xF29E],
+  ["8338D938",0xF29F],
+  ["8338D939",0xF2A0],
+  ["8338DA30",0xF2A1],
+  ["8338DA31",0xF2A2],
+  ["8338DA32",0xF2A3],
+  ["8338DA33",0xF2A4],
+  ["8338DA34",0xF2A5],
+  ["8338DA35",0xF2A6],
+  ["8338DA36",0xF2A7],
+  ["8338DA37",0xF2A8],
+  ["8338DA38",0xF2A9],
+  ["8338DA39",0xF2AA],
+  ["8338DB30",0xF2AB],
+  ["8338DB31",0xF2AC],
+  ["8338DB32",0xF2AD],
+  ["8338DB33",0xF2AE],
+  ["8338DB34",0xF2AF],
+  ["8338DB35",0xF2B0],
+  ["8338DB36",0xF2B1],
+  ["8338DB37",0xF2B2],
+  ["8338DB38",0xF2B3],
+  ["8338DB39",0xF2B4],
+  ["8338DC30",0xF2B5],
+  ["8338DC31",0xF2B6],
+  ["8338DC32",0xF2B7],
+  ["8338DC33",0xF2B8],
+  ["8338DC34",0xF2B9],
+  ["8338DC35",0xF2BA],
+  ["8338DC36",0xF2BB],
+  ["8338DC37",0xF2BC],
+  ["8338DC38",0xF2BD],
+  ["8338DC39",0xF2BE],
+  ["8338DD30",0xF2BF],
+  ["8338DD31",0xF2C0],
+  ["8338DD32",0xF2C1],
+  ["8338DD33",0xF2C2],
+  ["8338DD34",0xF2C3],
+  ["8338DD35",0xF2C4],
+  ["8338DD36",0xF2C5],
+  ["8338DD37",0xF2C6],
+  ["8338DD38",0xF2C7],
+  ["8338DD39",0xF2C8],
+  ["8338DE30",0xF2C9],
+  ["8338DE31",0xF2CA],
+  ["8338DE32",0xF2CB],
+  ["8338DE33",0xF2CC],
+  ["8338DE34",0xF2CD],
+  ["8338DE35",0xF2CE],
+  ["8338DE36",0xF2CF],
+  ["8338DE37",0xF2D0],
+  ["8338DE38",0xF2D1],
+  ["8338DE39",0xF2D2],
+  ["8338DF30",0xF2D3],
+  ["8338DF31",0xF2D4],
+  ["8338DF32",0xF2D5],
+  ["8338DF33",0xF2D6],
+  ["8338DF34",0xF2D7],
+  ["8338DF35",0xF2D8],
+  ["8338DF36",0xF2D9],
+  ["8338DF37",0xF2DA],
+  ["8338DF38",0xF2DB],
+  ["8338DF39",0xF2DC],
+  ["8338E030",0xF2DD],
+  ["8338E031",0xF2DE],
+  ["8338E032",0xF2DF],
+  ["8338E033",0xF2E0],
+  ["8338E034",0xF2E1],
+  ["8338E035",0xF2E2],
+  ["8338E036",0xF2E3],
+  ["8338E037",0xF2E4],
+  ["8338E038",0xF2E5],
+  ["8338E039",0xF2E6],
+  ["8338E130",0xF2E7],
+  ["8338E131",0xF2E8],
+  ["8338E132",0xF2E9],
+  ["8338E133",0xF2EA],
+  ["8338E134",0xF2EB],
+  ["8338E135",0xF2EC],
+  ["8338E136",0xF2ED],
+  ["8338E137",0xF2EE],
+  ["8338E138",0xF2EF],
+  ["8338E139",0xF2F0],
+  ["8338E230",0xF2F1],
+  ["8338E231",0xF2F2],
+  ["8338E232",0xF2F3],
+  ["8338E233",0xF2F4],
+  ["8338E234",0xF2F5],
+  ["8338E235",0xF2F6],
+  ["8338E236",0xF2F7],
+  ["8338E237",0xF2F8],
+  ["8338E238",0xF2F9],
+  ["8338E239",0xF2FA],
+  ["8338E330",0xF2FB],
+  ["8338E331",0xF2FC],
+  ["8338E332",0xF2FD],
+  ["8338E333",0xF2FE],
+  ["8338E334",0xF2FF],
+  ["8338E335",0xF300],
+  ["8338E336",0xF301],
+  ["8338E337",0xF302],
+  ["8338E338",0xF303],
+  ["8338E339",0xF304],
+  ["8338E430",0xF305],
+  ["8338E431",0xF306],
+  ["8338E432",0xF307],
+  ["8338E433",0xF308],
+  ["8338E434",0xF309],
+  ["8338E435",0xF30A],
+  ["8338E436",0xF30B],
+  ["8338E437",0xF30C],
+  ["8338E438",0xF30D],
+  ["8338E439",0xF30E],
+  ["8338E530",0xF30F],
+  ["8338E531",0xF310],
+  ["8338E532",0xF311],
+  ["8338E533",0xF312],
+  ["8338E534",0xF313],
+  ["8338E535",0xF314],
+  ["8338E536",0xF315],
+  ["8338E537",0xF316],
+  ["8338E538",0xF317],
+  ["8338E539",0xF318],
+  ["8338E630",0xF319],
+  ["8338E631",0xF31A],
+  ["8338E632",0xF31B],
+  ["8338E633",0xF31C],
+  ["8338E634",0xF31D],
+  ["8338E635",0xF31E],
+  ["8338E636",0xF31F],
+  ["8338E637",0xF320],
+  ["8338E638",0xF321],
+  ["8338E639",0xF322],
+  ["8338E730",0xF323],
+  ["8338E731",0xF324],
+  ["8338E732",0xF325],
+  ["8338E733",0xF326],
+  ["8338E734",0xF327],
+  ["8338E735",0xF328],
+  ["8338E736",0xF329],
+  ["8338E737",0xF32A],
+  ["8338E738",0xF32B],
+  ["8338E739",0xF32C],
+  ["8338E830",0xF32D],
+  ["8338E831",0xF32E],
+  ["8338E832",0xF32F],
+  ["8338E833",0xF330],
+  ["8338E834",0xF331],
+  ["8338E835",0xF332],
+  ["8338E836",0xF333],
+  ["8338E837",0xF334],
+  ["8338E838",0xF335],
+  ["8338E839",0xF336],
+  ["8338E930",0xF337],
+  ["8338E931",0xF338],
+  ["8338E932",0xF339],
+  ["8338E933",0xF33A],
+  ["8338E934",0xF33B],
+  ["8338E935",0xF33C],
+  ["8338E936",0xF33D],
+  ["8338E937",0xF33E],
+  ["8338E938",0xF33F],
+  ["8338E939",0xF340],
+  ["8338EA30",0xF341],
+  ["8338EA31",0xF342],
+  ["8338EA32",0xF343],
+  ["8338EA33",0xF344],
+  ["8338EA34",0xF345],
+  ["8338EA35",0xF346],
+  ["8338EA36",0xF347],
+  ["8338EA37",0xF348],
+  ["8338EA38",0xF349],
+  ["8338EA39",0xF34A],
+  ["8338EB30",0xF34B],
+  ["8338EB31",0xF34C],
+  ["8338EB32",0xF34D],
+  ["8338EB33",0xF34E],
+  ["8338EB34",0xF34F],
+  ["8338EB35",0xF350],
+  ["8338EB36",0xF351],
+  ["8338EB37",0xF352],
+  ["8338EB38",0xF353],
+  ["8338EB39",0xF354],
+  ["8338EC30",0xF355],
+  ["8338EC31",0xF356],
+  ["8338EC32",0xF357],
+  ["8338EC33",0xF358],
+  ["8338EC34",0xF359],
+  ["8338EC35",0xF35A],
+  ["8338EC36",0xF35B],
+  ["8338EC37",0xF35C],
+  ["8338EC38",0xF35D],
+  ["8338EC39",0xF35E],
+  ["8338ED30",0xF35F],
+  ["8338ED31",0xF360],
+  ["8338ED32",0xF361],
+  ["8338ED33",0xF362],
+  ["8338ED34",0xF363],
+  ["8338ED35",0xF364],
+  ["8338ED36",0xF365],
+  ["8338ED37",0xF366],
+  ["8338ED38",0xF367],
+  ["8338ED39",0xF368],
+  ["8338EE30",0xF369],
+  ["8338EE31",0xF36A],
+  ["8338EE32",0xF36B],
+  ["8338EE33",0xF36C],
+  ["8338EE34",0xF36D],
+  ["8338EE35",0xF36E],
+  ["8338EE36",0xF36F],
+  ["8338EE37",0xF370],
+  ["8338EE38",0xF371],
+  ["8338EE39",0xF372],
+  ["8338EF30",0xF373],
+  ["8338EF31",0xF374],
+  ["8338EF32",0xF375],
+  ["8338EF33",0xF376],
+  ["8338EF34",0xF377],
+  ["8338EF35",0xF378],
+  ["8338EF36",0xF379],
+  ["8338EF37",0xF37A],
+  ["8338EF38",0xF37B],
+  ["8338EF39",0xF37C],
+  ["8338F030",0xF37D],
+  ["8338F031",0xF37E],
+  ["8338F032",0xF37F],
+  ["8338F033",0xF380],
+  ["8338F034",0xF381],
+  ["8338F035",0xF382],
+  ["8338F036",0xF383],
+  ["8338F037",0xF384],
+  ["8338F038",0xF385],
+  ["8338F039",0xF386],
+  ["8338F130",0xF387],
+  ["8338F131",0xF388],
+  ["8338F132",0xF389],
+  ["8338F133",0xF38A],
+  ["8338F134",0xF38B],
+  ["8338F135",0xF38C],
+  ["8338F136",0xF38D],
+  ["8338F137",0xF38E],
+  ["8338F138",0xF38F],
+  ["8338F139",0xF390],
+  ["8338F230",0xF391],
+  ["8338F231",0xF392],
+  ["8338F232",0xF393],
+  ["8338F233",0xF394],
+  ["8338F234",0xF395],
+  ["8338F235",0xF396],
+  ["8338F236",0xF397],
+  ["8338F237",0xF398],
+  ["8338F238",0xF399],
+  ["8338F239",0xF39A],
+  ["8338F330",0xF39B],
+  ["8338F331",0xF39C],
+  ["8338F332",0xF39D],
+  ["8338F333",0xF39E],
+  ["8338F334",0xF39F],
+  ["8338F335",0xF3A0],
+  ["8338F336",0xF3A1],
+  ["8338F337",0xF3A2],
+  ["8338F338",0xF3A3],
+  ["8338F339",0xF3A4],
+  ["8338F430",0xF3A5],
+  ["8338F431",0xF3A6],
+  ["8338F432",0xF3A7],
+  ["8338F433",0xF3A8],
+  ["8338F434",0xF3A9],
+  ["8338F435",0xF3AA],
+  ["8338F436",0xF3AB],
+  ["8338F437",0xF3AC],
+  ["8338F438",0xF3AD],
+  ["8338F439",0xF3AE],
+  ["8338F530",0xF3AF],
+  ["8338F531",0xF3B0],
+  ["8338F532",0xF3B1],
+  ["8338F533",0xF3B2],
+  ["8338F534",0xF3B3],
+  ["8338F535",0xF3B4],
+  ["8338F536",0xF3B5],
+  ["8338F537",0xF3B6],
+  ["8338F538",0xF3B7],
+  ["8338F539",0xF3B8],
+  ["8338F630",0xF3B9],
+  ["8338F631",0xF3BA],
+  ["8338F632",0xF3BB],
+  ["8338F633",0xF3BC],
+  ["8338F634",0xF3BD],
+  ["8338F635",0xF3BE],
+  ["8338F636",0xF3BF],
+  ["8338F637",0xF3C0],
+  ["8338F638",0xF3C1],
+  ["8338F639",0xF3C2],
+  ["8338F730",0xF3C3],
+  ["8338F731",0xF3C4],
+  ["8338F732",0xF3C5],
+  ["8338F733",0xF3C6],
+  ["8338F734",0xF3C7],
+  ["8338F735",0xF3C8],
+  ["8338F736",0xF3C9],
+  ["8338F737",0xF3CA],
+  ["8338F738",0xF3CB],
+  ["8338F739",0xF3CC],
+  ["8338F830",0xF3CD],
+  ["8338F831",0xF3CE],
+  ["8338F832",0xF3CF],
+  ["8338F833",0xF3D0],
+  ["8338F834",0xF3D1],
+  ["8338F835",0xF3D2],
+  ["8338F836",0xF3D3],
+  ["8338F837",0xF3D4],
+  ["8338F838",0xF3D5],
+  ["8338F839",0xF3D6],
+  ["8338F930",0xF3D7],
+  ["8338F931",0xF3D8],
+  ["8338F932",0xF3D9],
+  ["8338F933",0xF3DA],
+  ["8338F934",0xF3DB],
+  ["8338F935",0xF3DC],
+  ["8338F936",0xF3DD],
+  ["8338F937",0xF3DE],
+  ["8338F938",0xF3DF],
+  ["8338F939",0xF3E0],
+  ["8338FA30",0xF3E1],
+  ["8338FA31",0xF3E2],
+  ["8338FA32",0xF3E3],
+  ["8338FA33",0xF3E4],
+  ["8338FA34",0xF3E5],
+  ["8338FA35",0xF3E6],
+  ["8338FA36",0xF3E7],
+  ["8338FA37",0xF3E8],
+  ["8338FA38",0xF3E9],
+  ["8338FA39",0xF3EA],
+  ["8338FB30",0xF3EB],
+  ["8338FB31",0xF3EC],
+  ["8338FB32",0xF3ED],
+  ["8338FB33",0xF3EE],
+  ["8338FB34",0xF3EF],
+  ["8338FB35",0xF3F0],
+  ["8338FB36",0xF3F1],
+  ["8338FB37",0xF3F2],
+  ["8338FB38",0xF3F3],
+  ["8338FB39",0xF3F4],
+  ["8338FC30",0xF3F5],
+  ["8338FC31",0xF3F6],
+  ["8338FC32",0xF3F7],
+  ["8338FC33",0xF3F8],
+  ["8338FC34",0xF3F9],
+  ["8338FC35",0xF3FA],
+  ["8338FC36",0xF3FB],
+  ["8338FC37",0xF3FC],
+  ["8338FC38",0xF3FD],
+  ["8338FC39",0xF3FE],
+  ["8338FD30",0xF3FF],
+  ["8338FD31",0xF400],
+  ["8338FD32",0xF401],
+  ["8338FD33",0xF402],
+  ["8338FD34",0xF403],
+  ["8338FD35",0xF404],
+  ["8338FD36",0xF405],
+  ["8338FD37",0xF406],
+  ["8338FD38",0xF407],
+  ["8338FD39",0xF408],
+  ["8338FE30",0xF409],
+  ["8338FE31",0xF40A],
+  ["8338FE32",0xF40B],
+  ["8338FE33",0xF40C],
+  ["8338FE34",0xF40D],
+  ["8338FE35",0xF40E],
+  ["8338FE36",0xF40F],
+  ["8338FE37",0xF410],
+  ["8338FE38",0xF411],
+  ["8338FE39",0xF412],
+  ["83398130",0xF413],
+  ["83398131",0xF414],
+  ["83398132",0xF415],
+  ["83398133",0xF416],
+  ["83398134",0xF417],
+  ["83398135",0xF418],
+  ["83398136",0xF419],
+  ["83398137",0xF41A],
+  ["83398138",0xF41B],
+  ["83398139",0xF41C],
+  ["83398230",0xF41D],
+  ["83398231",0xF41E],
+  ["83398232",0xF41F],
+  ["83398233",0xF420],
+  ["83398234",0xF421],
+  ["83398235",0xF422],
+  ["83398236",0xF423],
+  ["83398237",0xF424],
+  ["83398238",0xF425],
+  ["83398239",0xF426],
+  ["83398330",0xF427],
+  ["83398331",0xF428],
+  ["83398332",0xF429],
+  ["83398333",0xF42A],
+  ["83398334",0xF42B],
+  ["83398335",0xF42C],
+  ["83398336",0xF42D],
+  ["83398337",0xF42E],
+  ["83398338",0xF42F],
+  ["83398339",0xF430],
+  ["83398430",0xF431],
+  ["83398431",0xF432],
+  ["83398432",0xF433],
+  ["83398433",0xF434],
+  ["83398434",0xF435],
+  ["83398435",0xF436],
+  ["83398436",0xF437],
+  ["83398437",0xF438],
+  ["83398438",0xF439],
+  ["83398439",0xF43A],
+  ["83398530",0xF43B],
+  ["83398531",0xF43C],
+  ["83398532",0xF43D],
+  ["83398533",0xF43E],
+  ["83398534",0xF43F],
+  ["83398535",0xF440],
+  ["83398536",0xF441],
+  ["83398537",0xF442],
+  ["83398538",0xF443],
+  ["83398539",0xF444],
+  ["83398630",0xF445],
+  ["83398631",0xF446],
+  ["83398632",0xF447],
+  ["83398633",0xF448],
+  ["83398634",0xF449],
+  ["83398635",0xF44A],
+  ["83398636",0xF44B],
+  ["83398637",0xF44C],
+  ["83398638",0xF44D],
+  ["83398639",0xF44E],
+  ["83398730",0xF44F],
+  ["83398731",0xF450],
+  ["83398732",0xF451],
+  ["83398733",0xF452],
+  ["83398734",0xF453],
+  ["83398735",0xF454],
+  ["83398736",0xF455],
+  ["83398737",0xF456],
+  ["83398738",0xF457],
+  ["83398739",0xF458],
+  ["83398830",0xF459],
+  ["83398831",0xF45A],
+  ["83398832",0xF45B],
+  ["83398833",0xF45C],
+  ["83398834",0xF45D],
+  ["83398835",0xF45E],
+  ["83398836",0xF45F],
+  ["83398837",0xF460],
+  ["83398838",0xF461],
+  ["83398839",0xF462],
+  ["83398930",0xF463],
+  ["83398931",0xF464],
+  ["83398932",0xF465],
+  ["83398933",0xF466],
+  ["83398934",0xF467],
+  ["83398935",0xF468],
+  ["83398936",0xF469],
+  ["83398937",0xF46A],
+  ["83398938",0xF46B],
+  ["83398939",0xF46C],
+  ["83398A30",0xF46D],
+  ["83398A31",0xF46E],
+  ["83398A32",0xF46F],
+  ["83398A33",0xF470],
+  ["83398A34",0xF471],
+  ["83398A35",0xF472],
+  ["83398A36",0xF473],
+  ["83398A37",0xF474],
+  ["83398A38",0xF475],
+  ["83398A39",0xF476],
+  ["83398B30",0xF477],
+  ["83398B31",0xF478],
+  ["83398B32",0xF479],
+  ["83398B33",0xF47A],
+  ["83398B34",0xF47B],
+  ["83398B35",0xF47C],
+  ["83398B36",0xF47D],
+  ["83398B37",0xF47E],
+  ["83398B38",0xF47F],
+  ["83398B39",0xF480],
+  ["83398C30",0xF481],
+  ["83398C31",0xF482],
+  ["83398C32",0xF483],
+  ["83398C33",0xF484],
+  ["83398C34",0xF485],
+  ["83398C35",0xF486],
+  ["83398C36",0xF487],
+  ["83398C37",0xF488],
+  ["83398C38",0xF489],
+  ["83398C39",0xF48A],
+  ["83398D30",0xF48B],
+  ["83398D31",0xF48C],
+  ["83398D32",0xF48D],
+  ["83398D33",0xF48E],
+  ["83398D34",0xF48F],
+  ["83398D35",0xF490],
+  ["83398D36",0xF491],
+  ["83398D37",0xF492],
+  ["83398D38",0xF493],
+  ["83398D39",0xF494],
+  ["83398E30",0xF495],
+  ["83398E31",0xF496],
+  ["83398E32",0xF497],
+  ["83398E33",0xF498],
+  ["83398E34",0xF499],
+  ["83398E35",0xF49A],
+  ["83398E36",0xF49B],
+  ["83398E37",0xF49C],
+  ["83398E38",0xF49D],
+  ["83398E39",0xF49E],
+  ["83398F30",0xF49F],
+  ["83398F31",0xF4A0],
+  ["83398F32",0xF4A1],
+  ["83398F33",0xF4A2],
+  ["83398F34",0xF4A3],
+  ["83398F35",0xF4A4],
+  ["83398F36",0xF4A5],
+  ["83398F37",0xF4A6],
+  ["83398F38",0xF4A7],
+  ["83398F39",0xF4A8],
+  ["83399030",0xF4A9],
+  ["83399031",0xF4AA],
+  ["83399032",0xF4AB],
+  ["83399033",0xF4AC],
+  ["83399034",0xF4AD],
+  ["83399035",0xF4AE],
+  ["83399036",0xF4AF],
+  ["83399037",0xF4B0],
+  ["83399038",0xF4B1],
+  ["83399039",0xF4B2],
+  ["83399130",0xF4B3],
+  ["83399131",0xF4B4],
+  ["83399132",0xF4B5],
+  ["83399133",0xF4B6],
+  ["83399134",0xF4B7],
+  ["83399135",0xF4B8],
+  ["83399136",0xF4B9],
+  ["83399137",0xF4BA],
+  ["83399138",0xF4BB],
+  ["83399139",0xF4BC],
+  ["83399230",0xF4BD],
+  ["83399231",0xF4BE],
+  ["83399232",0xF4BF],
+  ["83399233",0xF4C0],
+  ["83399234",0xF4C1],
+  ["83399235",0xF4C2],
+  ["83399236",0xF4C3],
+  ["83399237",0xF4C4],
+  ["83399238",0xF4C5],
+  ["83399239",0xF4C6],
+  ["83399330",0xF4C7],
+  ["83399331",0xF4C8],
+  ["83399332",0xF4C9],
+  ["83399333",0xF4CA],
+  ["83399334",0xF4CB],
+  ["83399335",0xF4CC],
+  ["83399336",0xF4CD],
+  ["83399337",0xF4CE],
+  ["83399338",0xF4CF],
+  ["83399339",0xF4D0],
+  ["83399430",0xF4D1],
+  ["83399431",0xF4D2],
+  ["83399432",0xF4D3],
+  ["83399433",0xF4D4],
+  ["83399434",0xF4D5],
+  ["83399435",0xF4D6],
+  ["83399436",0xF4D7],
+  ["83399437",0xF4D8],
+  ["83399438",0xF4D9],
+  ["83399439",0xF4DA],
+  ["83399530",0xF4DB],
+  ["83399531",0xF4DC],
+  ["83399532",0xF4DD],
+  ["83399533",0xF4DE],
+  ["83399534",0xF4DF],
+  ["83399535",0xF4E0],
+  ["83399536",0xF4E1],
+  ["83399537",0xF4E2],
+  ["83399538",0xF4E3],
+  ["83399539",0xF4E4],
+  ["83399630",0xF4E5],
+  ["83399631",0xF4E6],
+  ["83399632",0xF4E7],
+  ["83399633",0xF4E8],
+  ["83399634",0xF4E9],
+  ["83399635",0xF4EA],
+  ["83399636",0xF4EB],
+  ["83399637",0xF4EC],
+  ["83399638",0xF4ED],
+  ["83399639",0xF4EE],
+  ["83399730",0xF4EF],
+  ["83399731",0xF4F0],
+  ["83399732",0xF4F1],
+  ["83399733",0xF4F2],
+  ["83399734",0xF4F3],
+  ["83399735",0xF4F4],
+  ["83399736",0xF4F5],
+  ["83399737",0xF4F6],
+  ["83399738",0xF4F7],
+  ["83399739",0xF4F8],
+  ["83399830",0xF4F9],
+  ["83399831",0xF4FA],
+  ["83399832",0xF4FB],
+  ["83399833",0xF4FC],
+  ["83399834",0xF4FD],
+  ["83399835",0xF4FE],
+  ["83399836",0xF4FF],
+  ["83399837",0xF500],
+  ["83399838",0xF501],
+  ["83399839",0xF502],
+  ["83399930",0xF503],
+  ["83399931",0xF504],
+  ["83399932",0xF505],
+  ["83399933",0xF506],
+  ["83399934",0xF507],
+  ["83399935",0xF508],
+  ["83399936",0xF509],
+  ["83399937",0xF50A],
+  ["83399938",0xF50B],
+  ["83399939",0xF50C],
+  ["83399A30",0xF50D],
+  ["83399A31",0xF50E],
+  ["83399A32",0xF50F],
+  ["83399A33",0xF510],
+  ["83399A34",0xF511],
+  ["83399A35",0xF512],
+  ["83399A36",0xF513],
+  ["83399A37",0xF514],
+  ["83399A38",0xF515],
+  ["83399A39",0xF516],
+  ["83399B30",0xF517],
+  ["83399B31",0xF518],
+  ["83399B32",0xF519],
+  ["83399B33",0xF51A],
+  ["83399B34",0xF51B],
+  ["83399B35",0xF51C],
+  ["83399B36",0xF51D],
+  ["83399B37",0xF51E],
+  ["83399B38",0xF51F],
+  ["83399B39",0xF520],
+  ["83399C30",0xF521],
+  ["83399C31",0xF522],
+  ["83399C32",0xF523],
+  ["83399C33",0xF524],
+  ["83399C34",0xF525],
+  ["83399C35",0xF526],
+  ["83399C36",0xF527],
+  ["83399C37",0xF528],
+  ["83399C38",0xF529],
+  ["83399C39",0xF52A],
+  ["83399D30",0xF52B],
+  ["83399D31",0xF52C],
+  ["83399D32",0xF52D],
+  ["83399D33",0xF52E],
+  ["83399D34",0xF52F],
+  ["83399D35",0xF530],
+  ["83399D36",0xF531],
+  ["83399D37",0xF532],
+  ["83399D38",0xF533],
+  ["83399D39",0xF534],
+  ["83399E30",0xF535],
+  ["83399E31",0xF536],
+  ["83399E32",0xF537],
+  ["83399E33",0xF538],
+  ["83399E34",0xF539],
+  ["83399E35",0xF53A],
+  ["83399E36",0xF53B],
+  ["83399E37",0xF53C],
+  ["83399E38",0xF53D],
+  ["83399E39",0xF53E],
+  ["83399F30",0xF53F],
+  ["83399F31",0xF540],
+  ["83399F32",0xF541],
+  ["83399F33",0xF542],
+  ["83399F34",0xF543],
+  ["83399F35",0xF544],
+  ["83399F36",0xF545],
+  ["83399F37",0xF546],
+  ["83399F38",0xF547],
+  ["83399F39",0xF548],
+  ["8339A030",0xF549],
+  ["8339A031",0xF54A],
+  ["8339A032",0xF54B],
+  ["8339A033",0xF54C],
+  ["8339A034",0xF54D],
+  ["8339A035",0xF54E],
+  ["8339A036",0xF54F],
+  ["8339A037",0xF550],
+  ["8339A038",0xF551],
+  ["8339A039",0xF552],
+  ["8339A130",0xF553],
+  ["8339A131",0xF554],
+  ["8339A132",0xF555],
+  ["8339A133",0xF556],
+  ["8339A134",0xF557],
+  ["8339A135",0xF558],
+  ["8339A136",0xF559],
+  ["8339A137",0xF55A],
+  ["8339A138",0xF55B],
+  ["8339A139",0xF55C],
+  ["8339A230",0xF55D],
+  ["8339A231",0xF55E],
+  ["8339A232",0xF55F],
+  ["8339A233",0xF560],
+  ["8339A234",0xF561],
+  ["8339A235",0xF562],
+  ["8339A236",0xF563],
+  ["8339A237",0xF564],
+  ["8339A238",0xF565],
+  ["8339A239",0xF566],
+  ["8339A330",0xF567],
+  ["8339A331",0xF568],
+  ["8339A332",0xF569],
+  ["8339A333",0xF56A],
+  ["8339A334",0xF56B],
+  ["8339A335",0xF56C],
+  ["8339A336",0xF56D],
+  ["8339A337",0xF56E],
+  ["8339A338",0xF56F],
+  ["8339A339",0xF570],
+  ["8339A430",0xF571],
+  ["8339A431",0xF572],
+  ["8339A432",0xF573],
+  ["8339A433",0xF574],
+  ["8339A434",0xF575],
+  ["8339A435",0xF576],
+  ["8339A436",0xF577],
+  ["8339A437",0xF578],
+  ["8339A438",0xF579],
+  ["8339A439",0xF57A],
+  ["8339A530",0xF57B],
+  ["8339A531",0xF57C],
+  ["8339A532",0xF57D],
+  ["8339A533",0xF57E],
+  ["8339A534",0xF57F],
+  ["8339A535",0xF580],
+  ["8339A536",0xF581],
+  ["8339A537",0xF582],
+  ["8339A538",0xF583],
+  ["8339A539",0xF584],
+  ["8339A630",0xF585],
+  ["8339A631",0xF586],
+  ["8339A632",0xF587],
+  ["8339A633",0xF588],
+  ["8339A634",0xF589],
+  ["8339A635",0xF58A],
+  ["8339A636",0xF58B],
+  ["8339A637",0xF58C],
+  ["8339A638",0xF58D],
+  ["8339A639",0xF58E],
+  ["8339A730",0xF58F],
+  ["8339A731",0xF590],
+  ["8339A732",0xF591],
+  ["8339A733",0xF592],
+  ["8339A734",0xF593],
+  ["8339A735",0xF594],
+  ["8339A736",0xF595],
+  ["8339A737",0xF596],
+  ["8339A738",0xF597],
+  ["8339A739",0xF598],
+  ["8339A830",0xF599],
+  ["8339A831",0xF59A],
+  ["8339A832",0xF59B],
+  ["8339A833",0xF59C],
+  ["8339A834",0xF59D],
+  ["8339A835",0xF59E],
+  ["8339A836",0xF59F],
+  ["8339A837",0xF5A0],
+  ["8339A838",0xF5A1],
+  ["8339A839",0xF5A2],
+  ["8339A930",0xF5A3],
+  ["8339A931",0xF5A4],
+  ["8339A932",0xF5A5],
+  ["8339A933",0xF5A6],
+  ["8339A934",0xF5A7],
+  ["8339A935",0xF5A8],
+  ["8339A936",0xF5A9],
+  ["8339A937",0xF5AA],
+  ["8339A938",0xF5AB],
+  ["8339A939",0xF5AC],
+  ["8339AA30",0xF5AD],
+  ["8339AA31",0xF5AE],
+  ["8339AA32",0xF5AF],
+  ["8339AA33",0xF5B0],
+  ["8339AA34",0xF5B1],
+  ["8339AA35",0xF5B2],
+  ["8339AA36",0xF5B3],
+  ["8339AA37",0xF5B4],
+  ["8339AA38",0xF5B5],
+  ["8339AA39",0xF5B6],
+  ["8339AB30",0xF5B7],
+  ["8339AB31",0xF5B8],
+  ["8339AB32",0xF5B9],
+  ["8339AB33",0xF5BA],
+  ["8339AB34",0xF5BB],
+  ["8339AB35",0xF5BC],
+  ["8339AB36",0xF5BD],
+  ["8339AB37",0xF5BE],
+  ["8339AB38",0xF5BF],
+  ["8339AB39",0xF5C0],
+  ["8339AC30",0xF5C1],
+  ["8339AC31",0xF5C2],
+  ["8339AC32",0xF5C3],
+  ["8339AC33",0xF5C4],
+  ["8339AC34",0xF5C5],
+  ["8339AC35",0xF5C6],
+  ["8339AC36",0xF5C7],
+  ["8339AC37",0xF5C8],
+  ["8339AC38",0xF5C9],
+  ["8339AC39",0xF5CA],
+  ["8339AD30",0xF5CB],
+  ["8339AD31",0xF5CC],
+  ["8339AD32",0xF5CD],
+  ["8339AD33",0xF5CE],
+  ["8339AD34",0xF5CF],
+  ["8339AD35",0xF5D0],
+  ["8339AD36",0xF5D1],
+  ["8339AD37",0xF5D2],
+  ["8339AD38",0xF5D3],
+  ["8339AD39",0xF5D4],
+  ["8339AE30",0xF5D5],
+  ["8339AE31",0xF5D6],
+  ["8339AE32",0xF5D7],
+  ["8339AE33",0xF5D8],
+  ["8339AE34",0xF5D9],
+  ["8339AE35",0xF5DA],
+  ["8339AE36",0xF5DB],
+  ["8339AE37",0xF5DC],
+  ["8339AE38",0xF5DD],
+  ["8339AE39",0xF5DE],
+  ["8339AF30",0xF5DF],
+  ["8339AF31",0xF5E0],
+  ["8339AF32",0xF5E1],
+  ["8339AF33",0xF5E2],
+  ["8339AF34",0xF5E3],
+  ["8339AF35",0xF5E4],
+  ["8339AF36",0xF5E5],
+  ["8339AF37",0xF5E6],
+  ["8339AF38",0xF5E7],
+  ["8339AF39",0xF5E8],
+  ["8339B030",0xF5E9],
+  ["8339B031",0xF5EA],
+  ["8339B032",0xF5EB],
+  ["8339B033",0xF5EC],
+  ["8339B034",0xF5ED],
+  ["8339B035",0xF5EE],
+  ["8339B036",0xF5EF],
+  ["8339B037",0xF5F0],
+  ["8339B038",0xF5F1],
+  ["8339B039",0xF5F2],
+  ["8339B130",0xF5F3],
+  ["8339B131",0xF5F4],
+  ["8339B132",0xF5F5],
+  ["8339B133",0xF5F6],
+  ["8339B134",0xF5F7],
+  ["8339B135",0xF5F8],
+  ["8339B136",0xF5F9],
+  ["8339B137",0xF5FA],
+  ["8339B138",0xF5FB],
+  ["8339B139",0xF5FC],
+  ["8339B230",0xF5FD],
+  ["8339B231",0xF5FE],
+  ["8339B232",0xF5FF],
+  ["8339B233",0xF600],
+  ["8339B234",0xF601],
+  ["8339B235",0xF602],
+  ["8339B236",0xF603],
+  ["8339B237",0xF604],
+  ["8339B238",0xF605],
+  ["8339B239",0xF606],
+  ["8339B330",0xF607],
+  ["8339B331",0xF608],
+  ["8339B332",0xF609],
+  ["8339B333",0xF60A],
+  ["8339B334",0xF60B],
+  ["8339B335",0xF60C],
+  ["8339B336",0xF60D],
+  ["8339B337",0xF60E],
+  ["8339B338",0xF60F],
+  ["8339B339",0xF610],
+  ["8339B430",0xF611],
+  ["8339B431",0xF612],
+  ["8339B432",0xF613],
+  ["8339B433",0xF614],
+  ["8339B434",0xF615],
+  ["8339B435",0xF616],
+  ["8339B436",0xF617],
+  ["8339B437",0xF618],
+  ["8339B438",0xF619],
+  ["8339B439",0xF61A],
+  ["8339B530",0xF61B],
+  ["8339B531",0xF61C],
+  ["8339B532",0xF61D],
+  ["8339B533",0xF61E],
+  ["8339B534",0xF61F],
+  ["8339B535",0xF620],
+  ["8339B536",0xF621],
+  ["8339B537",0xF622],
+  ["8339B538",0xF623],
+  ["8339B539",0xF624],
+  ["8339B630",0xF625],
+  ["8339B631",0xF626],
+  ["8339B632",0xF627],
+  ["8339B633",0xF628],
+  ["8339B634",0xF629],
+  ["8339B635",0xF62A],
+  ["8339B636",0xF62B],
+  ["8339B637",0xF62C],
+  ["8339B638",0xF62D],
+  ["8339B639",0xF62E],
+  ["8339B730",0xF62F],
+  ["8339B731",0xF630],
+  ["8339B732",0xF631],
+  ["8339B733",0xF632],
+  ["8339B734",0xF633],
+  ["8339B735",0xF634],
+  ["8339B736",0xF635],
+  ["8339B737",0xF636],
+  ["8339B738",0xF637],
+  ["8339B739",0xF638],
+  ["8339B830",0xF639],
+  ["8339B831",0xF63A],
+  ["8339B832",0xF63B],
+  ["8339B833",0xF63C],
+  ["8339B834",0xF63D],
+  ["8339B835",0xF63E],
+  ["8339B836",0xF63F],
+  ["8339B837",0xF640],
+  ["8339B838",0xF641],
+  ["8339B839",0xF642],
+  ["8339B930",0xF643],
+  ["8339B931",0xF644],
+  ["8339B932",0xF645],
+  ["8339B933",0xF646],
+  ["8339B934",0xF647],
+  ["8339B935",0xF648],
+  ["8339B936",0xF649],
+  ["8339B937",0xF64A],
+  ["8339B938",0xF64B],
+  ["8339B939",0xF64C],
+  ["8339BA30",0xF64D],
+  ["8339BA31",0xF64E],
+  ["8339BA32",0xF64F],
+  ["8339BA33",0xF650],
+  ["8339BA34",0xF651],
+  ["8339BA35",0xF652],
+  ["8339BA36",0xF653],
+  ["8339BA37",0xF654],
+  ["8339BA38",0xF655],
+  ["8339BA39",0xF656],
+  ["8339BB30",0xF657],
+  ["8339BB31",0xF658],
+  ["8339BB32",0xF659],
+  ["8339BB33",0xF65A],
+  ["8339BB34",0xF65B],
+  ["8339BB35",0xF65C],
+  ["8339BB36",0xF65D],
+  ["8339BB37",0xF65E],
+  ["8339BB38",0xF65F],
+  ["8339BB39",0xF660],
+  ["8339BC30",0xF661],
+  ["8339BC31",0xF662],
+  ["8339BC32",0xF663],
+  ["8339BC33",0xF664],
+  ["8339BC34",0xF665],
+  ["8339BC35",0xF666],
+  ["8339BC36",0xF667],
+  ["8339BC37",0xF668],
+  ["8339BC38",0xF669],
+  ["8339BC39",0xF66A],
+  ["8339BD30",0xF66B],
+  ["8339BD31",0xF66C],
+  ["8339BD32",0xF66D],
+  ["8339BD33",0xF66E],
+  ["8339BD34",0xF66F],
+  ["8339BD35",0xF670],
+  ["8339BD36",0xF671],
+  ["8339BD37",0xF672],
+  ["8339BD38",0xF673],
+  ["8339BD39",0xF674],
+  ["8339BE30",0xF675],
+  ["8339BE31",0xF676],
+  ["8339BE32",0xF677],
+  ["8339BE33",0xF678],
+  ["8339BE34",0xF679],
+  ["8339BE35",0xF67A],
+  ["8339BE36",0xF67B],
+  ["8339BE37",0xF67C],
+  ["8339BE38",0xF67D],
+  ["8339BE39",0xF67E],
+  ["8339BF30",0xF67F],
+  ["8339BF31",0xF680],
+  ["8339BF32",0xF681],
+  ["8339BF33",0xF682],
+  ["8339BF34",0xF683],
+  ["8339BF35",0xF684],
+  ["8339BF36",0xF685],
+  ["8339BF37",0xF686],
+  ["8339BF38",0xF687],
+  ["8339BF39",0xF688],
+  ["8339C030",0xF689],
+  ["8339C031",0xF68A],
+  ["8339C032",0xF68B],
+  ["8339C033",0xF68C],
+  ["8339C034",0xF68D],
+  ["8339C035",0xF68E],
+  ["8339C036",0xF68F],
+  ["8339C037",0xF690],
+  ["8339C038",0xF691],
+  ["8339C039",0xF692],
+  ["8339C130",0xF693],
+  ["8339C131",0xF694],
+  ["8339C132",0xF695],
+  ["8339C133",0xF696],
+  ["8339C134",0xF697],
+  ["8339C135",0xF698],
+  ["8339C136",0xF699],
+  ["8339C137",0xF69A],
+  ["8339C138",0xF69B],
+  ["8339C139",0xF69C],
+  ["8339C230",0xF69D],
+  ["8339C231",0xF69E],
+  ["8339C232",0xF69F],
+  ["8339C233",0xF6A0],
+  ["8339C234",0xF6A1],
+  ["8339C235",0xF6A2],
+  ["8339C236",0xF6A3],
+  ["8339C237",0xF6A4],
+  ["8339C238",0xF6A5],
+  ["8339C239",0xF6A6],
+  ["8339C330",0xF6A7],
+  ["8339C331",0xF6A8],
+  ["8339C332",0xF6A9],
+  ["8339C333",0xF6AA],
+  ["8339C334",0xF6AB],
+  ["8339C335",0xF6AC],
+  ["8339C336",0xF6AD],
+  ["8339C337",0xF6AE],
+  ["8339C338",0xF6AF],
+  ["8339C339",0xF6B0],
+  ["8339C430",0xF6B1],
+  ["8339C431",0xF6B2],
+  ["8339C432",0xF6B3],
+  ["8339C433",0xF6B4],
+  ["8339C434",0xF6B5],
+  ["8339C435",0xF6B6],
+  ["8339C436",0xF6B7],
+  ["8339C437",0xF6B8],
+  ["8339C438",0xF6B9],
+  ["8339C439",0xF6BA],
+  ["8339C530",0xF6BB],
+  ["8339C531",0xF6BC],
+  ["8339C532",0xF6BD],
+  ["8339C533",0xF6BE],
+  ["8339C534",0xF6BF],
+  ["8339C535",0xF6C0],
+  ["8339C536",0xF6C1],
+  ["8339C537",0xF6C2],
+  ["8339C538",0xF6C3],
+  ["8339C539",0xF6C4],
+  ["8339C630",0xF6C5],
+  ["8339C631",0xF6C6],
+  ["8339C632",0xF6C7],
+  ["8339C633",0xF6C8],
+  ["8339C634",0xF6C9],
+  ["8339C635",0xF6CA],
+  ["8339C636",0xF6CB],
+  ["8339C637",0xF6CC],
+  ["8339C638",0xF6CD],
+  ["8339C639",0xF6CE],
+  ["8339C730",0xF6CF],
+  ["8339C731",0xF6D0],
+  ["8339C732",0xF6D1],
+  ["8339C733",0xF6D2],
+  ["8339C734",0xF6D3],
+  ["8339C735",0xF6D4],
+  ["8339C736",0xF6D5],
+  ["8339C737",0xF6D6],
+  ["8339C738",0xF6D7],
+  ["8339C739",0xF6D8],
+  ["8339C830",0xF6D9],
+  ["8339C831",0xF6DA],
+  ["8339C832",0xF6DB],
+  ["8339C833",0xF6DC],
+  ["8339C834",0xF6DD],
+  ["8339C835",0xF6DE],
+  ["8339C836",0xF6DF],
+  ["8339C837",0xF6E0],
+  ["8339C838",0xF6E1],
+  ["8339C839",0xF6E2],
+  ["8339C930",0xF6E3],
+  ["8339C931",0xF6E4],
+  ["8339C932",0xF6E5],
+  ["8339C933",0xF6E6],
+  ["8339C934",0xF6E7],
+  ["8339C935",0xF6E8],
+  ["8339C936",0xF6E9],
+  ["8339C937",0xF6EA],
+  ["8339C938",0xF6EB],
+  ["8339C939",0xF6EC],
+  ["8339CA30",0xF6ED],
+  ["8339CA31",0xF6EE],
+  ["8339CA32",0xF6EF],
+  ["8339CA33",0xF6F0],
+  ["8339CA34",0xF6F1],
+  ["8339CA35",0xF6F2],
+  ["8339CA36",0xF6F3],
+  ["8339CA37",0xF6F4],
+  ["8339CA38",0xF6F5],
+  ["8339CA39",0xF6F6],
+  ["8339CB30",0xF6F7],
+  ["8339CB31",0xF6F8],
+  ["8339CB32",0xF6F9],
+  ["8339CB33",0xF6FA],
+  ["8339CB34",0xF6FB],
+  ["8339CB35",0xF6FC],
+  ["8339CB36",0xF6FD],
+  ["8339CB37",0xF6FE],
+  ["8339CB38",0xF6FF],
+  ["8339CB39",0xF700],
+  ["8339CC30",0xF701],
+  ["8339CC31",0xF702],
+  ["8339CC32",0xF703],
+  ["8339CC33",0xF704],
+  ["8339CC34",0xF705],
+  ["8339CC35",0xF706],
+  ["8339CC36",0xF707],
+  ["8339CC37",0xF708],
+  ["8339CC38",0xF709],
+  ["8339CC39",0xF70A],
+  ["8339CD30",0xF70B],
+  ["8339CD31",0xF70C],
+  ["8339CD32",0xF70D],
+  ["8339CD33",0xF70E],
+  ["8339CD34",0xF70F],
+  ["8339CD35",0xF710],
+  ["8339CD36",0xF711],
+  ["8339CD37",0xF712],
+  ["8339CD38",0xF713],
+  ["8339CD39",0xF714],
+  ["8339CE30",0xF715],
+  ["8339CE31",0xF716],
+  ["8339CE32",0xF717],
+  ["8339CE33",0xF718],
+  ["8339CE34",0xF719],
+  ["8339CE35",0xF71A],
+  ["8339CE36",0xF71B],
+  ["8339CE37",0xF71C],
+  ["8339CE38",0xF71D],
+  ["8339CE39",0xF71E],
+  ["8339CF30",0xF71F],
+  ["8339CF31",0xF720],
+  ["8339CF32",0xF721],
+  ["8339CF33",0xF722],
+  ["8339CF34",0xF723],
+  ["8339CF35",0xF724],
+  ["8339CF36",0xF725],
+  ["8339CF37",0xF726],
+  ["8339CF38",0xF727],
+  ["8339CF39",0xF728],
+  ["8339D030",0xF729],
+  ["8339D031",0xF72A],
+  ["8339D032",0xF72B],
+  ["8339D033",0xF72C],
+  ["8339D034",0xF72D],
+  ["8339D035",0xF72E],
+  ["8339D036",0xF72F],
+  ["8339D037",0xF730],
+  ["8339D038",0xF731],
+  ["8339D039",0xF732],
+  ["8339D130",0xF733],
+  ["8339D131",0xF734],
+  ["8339D132",0xF735],
+  ["8339D133",0xF736],
+  ["8339D134",0xF737],
+  ["8339D135",0xF738],
+  ["8339D136",0xF739],
+  ["8339D137",0xF73A],
+  ["8339D138",0xF73B],
+  ["8339D139",0xF73C],
+  ["8339D230",0xF73D],
+  ["8339D231",0xF73E],
+  ["8339D232",0xF73F],
+  ["8339D233",0xF740],
+  ["8339D234",0xF741],
+  ["8339D235",0xF742],
+  ["8339D236",0xF743],
+  ["8339D237",0xF744],
+  ["8339D238",0xF745],
+  ["8339D239",0xF746],
+  ["8339D330",0xF747],
+  ["8339D331",0xF748],
+  ["8339D332",0xF749],
+  ["8339D333",0xF74A],
+  ["8339D334",0xF74B],
+  ["8339D335",0xF74C],
+  ["8339D336",0xF74D],
+  ["8339D337",0xF74E],
+  ["8339D338",0xF74F],
+  ["8339D339",0xF750],
+  ["8339D430",0xF751],
+  ["8339D431",0xF752],
+  ["8339D432",0xF753],
+  ["8339D433",0xF754],
+  ["8339D434",0xF755],
+  ["8339D435",0xF756],
+  ["8339D436",0xF757],
+  ["8339D437",0xF758],
+  ["8339D438",0xF759],
+  ["8339D439",0xF75A],
+  ["8339D530",0xF75B],
+  ["8339D531",0xF75C],
+  ["8339D532",0xF75D],
+  ["8339D533",0xF75E],
+  ["8339D534",0xF75F],
+  ["8339D535",0xF760],
+  ["8339D536",0xF761],
+  ["8339D537",0xF762],
+  ["8339D538",0xF763],
+  ["8339D539",0xF764],
+  ["8339D630",0xF765],
+  ["8339D631",0xF766],
+  ["8339D632",0xF767],
+  ["8339D633",0xF768],
+  ["8339D634",0xF769],
+  ["8339D635",0xF76A],
+  ["8339D636",0xF76B],
+  ["8339D637",0xF76C],
+  ["8339D638",0xF76D],
+  ["8339D639",0xF76E],
+  ["8339D730",0xF76F],
+  ["8339D731",0xF770],
+  ["8339D732",0xF771],
+  ["8339D733",0xF772],
+  ["8339D734",0xF773],
+  ["8339D735",0xF774],
+  ["8339D736",0xF775],
+  ["8339D737",0xF776],
+  ["8339D738",0xF777],
+  ["8339D739",0xF778],
+  ["8339D830",0xF779],
+  ["8339D831",0xF77A],
+  ["8339D832",0xF77B],
+  ["8339D833",0xF77C],
+  ["8339D834",0xF77D],
+  ["8339D835",0xF77E],
+  ["8339D836",0xF77F],
+  ["8339D837",0xF780],
+  ["8339D838",0xF781],
+  ["8339D839",0xF782],
+  ["8339D930",0xF783],
+  ["8339D931",0xF784],
+  ["8339D932",0xF785],
+  ["8339D933",0xF786],
+  ["8339D934",0xF787],
+  ["8339D935",0xF788],
+  ["8339D936",0xF789],
+  ["8339D937",0xF78A],
+  ["8339D938",0xF78B],
+  ["8339D939",0xF78C],
+  ["8339DA30",0xF78D],
+  ["8339DA31",0xF78E],
+  ["8339DA32",0xF78F],
+  ["8339DA33",0xF790],
+  ["8339DA34",0xF791],
+  ["8339DA35",0xF792],
+  ["8339DA36",0xF793],
+  ["8339DA37",0xF794],
+  ["8339DA38",0xF795],
+  ["8339DA39",0xF796],
+  ["8339DB30",0xF797],
+  ["8339DB31",0xF798],
+  ["8339DB32",0xF799],
+  ["8339DB33",0xF79A],
+  ["8339DB34",0xF79B],
+  ["8339DB35",0xF79C],
+  ["8339DB36",0xF79D],
+  ["8339DB37",0xF79E],
+  ["8339DB38",0xF79F],
+  ["8339DB39",0xF7A0],
+  ["8339DC30",0xF7A1],
+  ["8339DC31",0xF7A2],
+  ["8339DC32",0xF7A3],
+  ["8339DC33",0xF7A4],
+  ["8339DC34",0xF7A5],
+  ["8339DC35",0xF7A6],
+  ["8339DC36",0xF7A7],
+  ["8339DC37",0xF7A8],
+  ["8339DC38",0xF7A9],
+  ["8339DC39",0xF7AA],
+  ["8339DD30",0xF7AB],
+  ["8339DD31",0xF7AC],
+  ["8339DD32",0xF7AD],
+  ["8339DD33",0xF7AE],
+  ["8339DD34",0xF7AF],
+  ["8339DD35",0xF7B0],
+  ["8339DD36",0xF7B1],
+  ["8339DD37",0xF7B2],
+  ["8339DD38",0xF7B3],
+  ["8339DD39",0xF7B4],
+  ["8339DE30",0xF7B5],
+  ["8339DE31",0xF7B6],
+  ["8339DE32",0xF7B7],
+  ["8339DE33",0xF7B8],
+  ["8339DE34",0xF7B9],
+  ["8339DE35",0xF7BA],
+  ["8339DE36",0xF7BB],
+  ["8339DE37",0xF7BC],
+  ["8339DE38",0xF7BD],
+  ["8339DE39",0xF7BE],
+  ["8339DF30",0xF7BF],
+  ["8339DF31",0xF7C0],
+  ["8339DF32",0xF7C1],
+  ["8339DF33",0xF7C2],
+  ["8339DF34",0xF7C3],
+  ["8339DF35",0xF7C4],
+  ["8339DF36",0xF7C5],
+  ["8339DF37",0xF7C6],
+  ["8339DF38",0xF7C7],
+  ["8339DF39",0xF7C8],
+  ["8339E030",0xF7C9],
+  ["8339E031",0xF7CA],
+  ["8339E032",0xF7CB],
+  ["8339E033",0xF7CC],
+  ["8339E034",0xF7CD],
+  ["8339E035",0xF7CE],
+  ["8339E036",0xF7CF],
+  ["8339E037",0xF7D0],
+  ["8339E038",0xF7D1],
+  ["8339E039",0xF7D2],
+  ["8339E130",0xF7D3],
+  ["8339E131",0xF7D4],
+  ["8339E132",0xF7D5],
+  ["8339E133",0xF7D6],
+  ["8339E134",0xF7D7],
+  ["8339E135",0xF7D8],
+  ["8339E136",0xF7D9],
+  ["8339E137",0xF7DA],
+  ["8339E138",0xF7DB],
+  ["8339E139",0xF7DC],
+  ["8339E230",0xF7DD],
+  ["8339E231",0xF7DE],
+  ["8339E232",0xF7DF],
+  ["8339E233",0xF7E0],
+  ["8339E234",0xF7E1],
+  ["8339E235",0xF7E2],
+  ["8339E236",0xF7E3],
+  ["8339E237",0xF7E4],
+  ["8339E238",0xF7E5],
+  ["8339E239",0xF7E6],
+  ["8339E330",0xF7E7],
+  ["8339E331",0xF7E8],
+  ["8339E332",0xF7E9],
+  ["8339E333",0xF7EA],
+  ["8339E334",0xF7EB],
+  ["8339E335",0xF7EC],
+  ["8339E336",0xF7ED],
+  ["8339E337",0xF7EE],
+  ["8339E338",0xF7EF],
+  ["8339E339",0xF7F0],
+  ["8339E430",0xF7F1],
+  ["8339E431",0xF7F2],
+  ["8339E432",0xF7F3],
+  ["8339E433",0xF7F4],
+  ["8339E434",0xF7F5],
+  ["8339E435",0xF7F6],
+  ["8339E436",0xF7F7],
+  ["8339E437",0xF7F8],
+  ["8339E438",0xF7F9],
+  ["8339E439",0xF7FA],
+  ["8339E530",0xF7FB],
+  ["8339E531",0xF7FC],
+  ["8339E532",0xF7FD],
+  ["8339E533",0xF7FE],
+  ["8339E534",0xF7FF],
+  ["8339E535",0xF800],
+  ["8339E536",0xF801],
+  ["8339E537",0xF802],
+  ["8339E538",0xF803],
+  ["8339E539",0xF804],
+  ["8339E630",0xF805],
+  ["8339E631",0xF806],
+  ["8339E632",0xF807],
+  ["8339E633",0xF808],
+  ["8339E634",0xF809],
+  ["8339E635",0xF80A],
+  ["8339E636",0xF80B],
+  ["8339E637",0xF80C],
+  ["8339E638",0xF80D],
+  ["8339E639",0xF80E],
+  ["8339E730",0xF80F],
+  ["8339E731",0xF810],
+  ["8339E732",0xF811],
+  ["8339E733",0xF812],
+  ["8339E734",0xF813],
+  ["8339E735",0xF814],
+  ["8339E736",0xF815],
+  ["8339E737",0xF816],
+  ["8339E738",0xF817],
+  ["8339E739",0xF818],
+  ["8339E830",0xF819],
+  ["8339E831",0xF81A],
+  ["8339E832",0xF81B],
+  ["8339E833",0xF81C],
+  ["8339E834",0xF81D],
+  ["8339E835",0xF81E],
+  ["8339E836",0xF81F],
+  ["8339E837",0xF820],
+  ["8339E838",0xF821],
+  ["8339E839",0xF822],
+  ["8339E930",0xF823],
+  ["8339E931",0xF824],
+  ["8339E932",0xF825],
+  ["8339E933",0xF826],
+  ["8339E934",0xF827],
+  ["8339E935",0xF828],
+  ["8339E936",0xF829],
+  ["8339E937",0xF82A],
+  ["8339E938",0xF82B],
+  ["8339E939",0xF82C],
+  ["8339EA30",0xF82D],
+  ["8339EA31",0xF82E],
+  ["8339EA32",0xF82F],
+  ["8339EA33",0xF830],
+  ["8339EA34",0xF831],
+  ["8339EA35",0xF832],
+  ["8339EA36",0xF833],
+  ["8339EA37",0xF834],
+  ["8339EA38",0xF835],
+  ["8339EA39",0xF836],
+  ["8339EB30",0xF837],
+  ["8339EB31",0xF838],
+  ["8339EB32",0xF839],
+  ["8339EB33",0xF83A],
+  ["8339EB34",0xF83B],
+  ["8339EB35",0xF83C],
+  ["8339EB36",0xF83D],
+  ["8339EB37",0xF83E],
+  ["8339EB38",0xF83F],
+  ["8339EB39",0xF840],
+  ["8339EC30",0xF841],
+  ["8339EC31",0xF842],
+  ["8339EC32",0xF843],
+  ["8339EC33",0xF844],
+  ["8339EC34",0xF845],
+  ["8339EC35",0xF846],
+  ["8339EC36",0xF847],
+  ["8339EC37",0xF848],
+  ["8339EC38",0xF849],
+  ["8339EC39",0xF84A],
+  ["8339ED30",0xF84B],
+  ["8339ED31",0xF84C],
+  ["8339ED32",0xF84D],
+  ["8339ED33",0xF84E],
+  ["8339ED34",0xF84F],
+  ["8339ED35",0xF850],
+  ["8339ED36",0xF851],
+  ["8339ED37",0xF852],
+  ["8339ED38",0xF853],
+  ["8339ED39",0xF854],
+  ["8339EE30",0xF855],
+  ["8339EE31",0xF856],
+  ["8339EE32",0xF857],
+  ["8339EE33",0xF858],
+  ["8339EE34",0xF859],
+  ["8339EE35",0xF85A],
+  ["8339EE36",0xF85B],
+  ["8339EE37",0xF85C],
+  ["8339EE38",0xF85D],
+  ["8339EE39",0xF85E],
+  ["8339EF30",0xF85F],
+  ["8339EF31",0xF860],
+  ["8339EF32",0xF861],
+  ["8339EF33",0xF862],
+  ["8339EF34",0xF863],
+  ["8339EF35",0xF864],
+  ["8339EF36",0xF865],
+  ["8339EF37",0xF866],
+  ["8339EF38",0xF867],
+  ["8339EF39",0xF868],
+  ["8339F030",0xF869],
+  ["8339F031",0xF86A],
+  ["8339F032",0xF86B],
+  ["8339F033",0xF86C],
+  ["8339F034",0xF86D],
+  ["8339F035",0xF86E],
+  ["8339F036",0xF86F],
+  ["8339F037",0xF870],
+  ["8339F038",0xF871],
+  ["8339F039",0xF872],
+  ["8339F130",0xF873],
+  ["8339F131",0xF874],
+  ["8339F132",0xF875],
+  ["8339F133",0xF876],
+  ["8339F134",0xF877],
+  ["8339F135",0xF878],
+  ["8339F136",0xF879],
+  ["8339F137",0xF87A],
+  ["8339F138",0xF87B],
+  ["8339F139",0xF87C],
+  ["8339F230",0xF87D],
+  ["8339F231",0xF87E],
+  ["8339F232",0xF87F],
+  ["8339F233",0xF880],
+  ["8339F234",0xF881],
+  ["8339F235",0xF882],
+  ["8339F236",0xF883],
+  ["8339F237",0xF884],
+  ["8339F238",0xF885],
+  ["8339F239",0xF886],
+  ["8339F330",0xF887],
+  ["8339F331",0xF888],
+  ["8339F332",0xF889],
+  ["8339F333",0xF88A],
+  ["8339F334",0xF88B],
+  ["8339F335",0xF88C],
+  ["8339F336",0xF88D],
+  ["8339F337",0xF88E],
+  ["8339F338",0xF88F],
+  ["8339F339",0xF890],
+  ["8339F430",0xF891],
+  ["8339F431",0xF892],
+  ["8339F432",0xF893],
+  ["8339F433",0xF894],
+  ["8339F434",0xF895],
+  ["8339F435",0xF896],
+  ["8339F436",0xF897],
+  ["8339F437",0xF898],
+  ["8339F438",0xF899],
+  ["8339F439",0xF89A],
+  ["8339F530",0xF89B],
+  ["8339F531",0xF89C],
+  ["8339F532",0xF89D],
+  ["8339F533",0xF89E],
+  ["8339F534",0xF89F],
+  ["8339F535",0xF8A0],
+  ["8339F536",0xF8A1],
+  ["8339F537",0xF8A2],
+  ["8339F538",0xF8A3],
+  ["8339F539",0xF8A4],
+  ["8339F630",0xF8A5],
+  ["8339F631",0xF8A6],
+  ["8339F632",0xF8A7],
+  ["8339F633",0xF8A8],
+  ["8339F634",0xF8A9],
+  ["8339F635",0xF8AA],
+  ["8339F636",0xF8AB],
+  ["8339F637",0xF8AC],
+  ["8339F638",0xF8AD],
+  ["8339F639",0xF8AE],
+  ["8339F730",0xF8AF],
+  ["8339F731",0xF8B0],
+  ["8339F732",0xF8B1],
+  ["8339F733",0xF8B2],
+  ["8339F734",0xF8B3],
+  ["8339F735",0xF8B4],
+  ["8339F736",0xF8B5],
+  ["8339F737",0xF8B6],
+  ["8339F738",0xF8B7],
+  ["8339F739",0xF8B8],
+  ["8339F830",0xF8B9],
+  ["8339F831",0xF8BA],
+  ["8339F832",0xF8BB],
+  ["8339F833",0xF8BC],
+  ["8339F834",0xF8BD],
+  ["8339F835",0xF8BE],
+  ["8339F836",0xF8BF],
+  ["8339F837",0xF8C0],
+  ["8339F838",0xF8C1],
+  ["8339F839",0xF8C2],
+  ["8339F930",0xF8C3],
+  ["8339F931",0xF8C4],
+  ["8339F932",0xF8C5],
+  ["8339F933",0xF8C6],
+  ["8339F934",0xF8C7],
+  ["8339F935",0xF8C8],
+  ["8339F936",0xF8C9],
+  ["8339F937",0xF8CA],
+  ["8339F938",0xF8CB],
+  ["8339F939",0xF8CC],
+  ["8339FA30",0xF8CD],
+  ["8339FA31",0xF8CE],
+  ["8339FA32",0xF8CF],
+  ["8339FA33",0xF8D0],
+  ["8339FA34",0xF8D1],
+  ["8339FA35",0xF8D2],
+  ["8339FA36",0xF8D3],
+  ["8339FA37",0xF8D4],
+  ["8339FA38",0xF8D5],
+  ["8339FA39",0xF8D6],
+  ["8339FB30",0xF8D7],
+  ["8339FB31",0xF8D8],
+  ["8339FB32",0xF8D9],
+  ["8339FB33",0xF8DA],
+  ["8339FB34",0xF8DB],
+  ["8339FB35",0xF8DC],
+  ["8339FB36",0xF8DD],
+  ["8339FB37",0xF8DE],
+  ["8339FB38",0xF8DF],
+  ["8339FB39",0xF8E0],
+  ["8339FC30",0xF8E1],
+  ["8339FC31",0xF8E2],
+  ["8339FC32",0xF8E3],
+  ["8339FC33",0xF8E4],
+  ["8339FC34",0xF8E5],
+  ["8339FC35",0xF8E6],
+  ["8339FC36",0xF8E7],
+  ["8339FC37",0xF8E8],
+  ["8339FC38",0xF8E9],
+  ["8339FC39",0xF8EA],
+  ["8339FD30",0xF8EB],
+  ["8339FD31",0xF8EC],
+  ["8339FD32",0xF8ED],
+  ["8339FD33",0xF8EE],
+  ["8339FD34",0xF8EF],
+  ["8339FD35",0xF8F0],
+  ["8339FD36",0xF8F1],
+  ["8339FD37",0xF8F2],
+  ["8339FD38",0xF8F3],
+  ["8339FD39",0xF8F4],
+  ["8339FE30",0xF8F5],
+  ["8339FE31",0xF8F6],
+  ["8339FE32",0xF8F7],
+  ["8339FE33",0xF8F8],
+  ["8339FE34",0xF8F9],
+  ["8339FE35",0xF8FA],
+  ["8339FE36",0xF8FB],
+  ["8339FE37",0xF8FC],
+  ["8339FE38",0xF8FD],
+  ["8339FE39",0xF8FE],
+  ["84308130",0xF8FF],
+  ["84308131",0xF900],
+  ["84308132",0xF901],
+  ["84308133",0xF902],
+  ["84308134",0xF903],
+  ["84308135",0xF904],
+  ["84308136",0xF905],
+  ["84308137",0xF906],
+  ["84308138",0xF907],
+  ["84308139",0xF908],
+  ["84308230",0xF909],
+  ["84308231",0xF90A],
+  ["84308232",0xF90B],
+  ["84308233",0xF90C],
+  ["84308234",0xF90D],
+  ["84308235",0xF90E],
+  ["84308236",0xF90F],
+  ["84308237",0xF910],
+  ["84308238",0xF911],
+  ["84308239",0xF912],
+  ["84308330",0xF913],
+  ["84308331",0xF914],
+  ["84308332",0xF915],
+  ["84308333",0xF916],
+  ["84308334",0xF917],
+  ["84308335",0xF918],
+  ["84308336",0xF919],
+  ["84308337",0xF91A],
+  ["84308338",0xF91B],
+  ["84308339",0xF91C],
+  ["84308430",0xF91D],
+  ["84308431",0xF91E],
+  ["84308432",0xF91F],
+  ["84308433",0xF920],
+  ["84308434",0xF921],
+  ["84308435",0xF922],
+  ["84308436",0xF923],
+  ["84308437",0xF924],
+  ["84308438",0xF925],
+  ["84308439",0xF926],
+  ["84308530",0xF927],
+  ["84308531",0xF928],
+  ["84308532",0xF929],
+  ["84308533",0xF92A],
+  ["84308534",0xF92B],
+  ["FD9C",0xF92C],
+  ["84308535",0xF92D],
+  ["84308536",0xF92E],
+  ["84308537",0xF92F],
+  ["84308538",0xF930],
+  ["84308539",0xF931],
+  ["84308630",0xF932],
+  ["84308631",0xF933],
+  ["84308632",0xF934],
+  ["84308633",0xF935],
+  ["84308634",0xF936],
+  ["84308635",0xF937],
+  ["84308636",0xF938],
+  ["84308637",0xF939],
+  ["84308638",0xF93A],
+  ["84308639",0xF93B],
+  ["84308730",0xF93C],
+  ["84308731",0xF93D],
+  ["84308732",0xF93E],
+  ["84308733",0xF93F],
+  ["84308734",0xF940],
+  ["84308735",0xF941],
+  ["84308736",0xF942],
+  ["84308737",0xF943],
+  ["84308738",0xF944],
+  ["84308739",0xF945],
+  ["84308830",0xF946],
+  ["84308831",0xF947],
+  ["84308832",0xF948],
+  ["84308833",0xF949],
+  ["84308834",0xF94A],
+  ["84308835",0xF94B],
+  ["84308836",0xF94C],
+  ["84308837",0xF94D],
+  ["84308838",0xF94E],
+  ["84308839",0xF94F],
+  ["84308930",0xF950],
+  ["84308931",0xF951],
+  ["84308932",0xF952],
+  ["84308933",0xF953],
+  ["84308934",0xF954],
+  ["84308935",0xF955],
+  ["84308936",0xF956],
+  ["84308937",0xF957],
+  ["84308938",0xF958],
+  ["84308939",0xF959],
+  ["84308A30",0xF95A],
+  ["84308A31",0xF95B],
+  ["84308A32",0xF95C],
+  ["84308A33",0xF95D],
+  ["84308A34",0xF95E],
+  ["84308A35",0xF95F],
+  ["84308A36",0xF960],
+  ["84308A37",0xF961],
+  ["84308A38",0xF962],
+  ["84308A39",0xF963],
+  ["84308B30",0xF964],
+  ["84308B31",0xF965],
+  ["84308B32",0xF966],
+  ["84308B33",0xF967],
+  ["84308B34",0xF968],
+  ["84308B35",0xF969],
+  ["84308B36",0xF96A],
+  ["84308B37",0xF96B],
+  ["84308B38",0xF96C],
+  ["84308B39",0xF96D],
+  ["84308C30",0xF96E],
+  ["84308C31",0xF96F],
+  ["84308C32",0xF970],
+  ["84308C33",0xF971],
+  ["84308C34",0xF972],
+  ["84308C35",0xF973],
+  ["84308C36",0xF974],
+  ["84308C37",0xF975],
+  ["84308C38",0xF976],
+  ["84308C39",0xF977],
+  ["84308D30",0xF978],
+  ["FD9D",0xF979],
+  ["84308D31",0xF97A],
+  ["84308D32",0xF97B],
+  ["84308D33",0xF97C],
+  ["84308D34",0xF97D],
+  ["84308D35",0xF97E],
+  ["84308D36",0xF97F],
+  ["84308D37",0xF980],
+  ["84308D38",0xF981],
+  ["84308D39",0xF982],
+  ["84308E30",0xF983],
+  ["84308E31",0xF984],
+  ["84308E32",0xF985],
+  ["84308E33",0xF986],
+  ["84308E34",0xF987],
+  ["84308E35",0xF988],
+  ["84308E36",0xF989],
+  ["84308E37",0xF98A],
+  ["84308E38",0xF98B],
+  ["84308E39",0xF98C],
+  ["84308F30",0xF98D],
+  ["84308F31",0xF98E],
+  ["84308F32",0xF98F],
+  ["84308F33",0xF990],
+  ["84308F34",0xF991],
+  ["84308F35",0xF992],
+  ["84308F36",0xF993],
+  ["84308F37",0xF994],
+  ["FD9E",0xF995],
+  ["84308F38",0xF996],
+  ["84308F39",0xF997],
+  ["84309030",0xF998],
+  ["84309031",0xF999],
+  ["84309032",0xF99A],
+  ["84309033",0xF99B],
+  ["84309034",0xF99C],
+  ["84309035",0xF99D],
+  ["84309036",0xF99E],
+  ["84309037",0xF99F],
+  ["84309038",0xF9A0],
+  ["84309039",0xF9A1],
+  ["84309130",0xF9A2],
+  ["84309131",0xF9A3],
+  ["84309132",0xF9A4],
+  ["84309133",0xF9A5],
+  ["84309134",0xF9A6],
+  ["84309135",0xF9A7],
+  ["84309136",0xF9A8],
+  ["84309137",0xF9A9],
+  ["84309138",0xF9AA],
+  ["84309139",0xF9AB],
+  ["84309230",0xF9AC],
+  ["84309231",0xF9AD],
+  ["84309232",0xF9AE],
+  ["84309233",0xF9AF],
+  ["84309234",0xF9B0],
+  ["84309235",0xF9B1],
+  ["84309236",0xF9B2],
+  ["84309237",0xF9B3],
+  ["84309238",0xF9B4],
+  ["84309239",0xF9B5],
+  ["84309330",0xF9B6],
+  ["84309331",0xF9B7],
+  ["84309332",0xF9B8],
+  ["84309333",0xF9B9],
+  ["84309334",0xF9BA],
+  ["84309335",0xF9BB],
+  ["84309336",0xF9BC],
+  ["84309337",0xF9BD],
+  ["84309338",0xF9BE],
+  ["84309339",0xF9BF],
+  ["84309430",0xF9C0],
+  ["84309431",0xF9C1],
+  ["84309432",0xF9C2],
+  ["84309433",0xF9C3],
+  ["84309434",0xF9C4],
+  ["84309435",0xF9C5],
+  ["84309436",0xF9C6],
+  ["84309437",0xF9C7],
+  ["84309438",0xF9C8],
+  ["84309439",0xF9C9],
+  ["84309530",0xF9CA],
+  ["84309531",0xF9CB],
+  ["84309532",0xF9CC],
+  ["84309533",0xF9CD],
+  ["84309534",0xF9CE],
+  ["84309535",0xF9CF],
+  ["84309536",0xF9D0],
+  ["84309537",0xF9D1],
+  ["84309538",0xF9D2],
+  ["84309539",0xF9D3],
+  ["84309630",0xF9D4],
+  ["84309631",0xF9D5],
+  ["84309632",0xF9D6],
+  ["84309633",0xF9D7],
+  ["84309634",0xF9D8],
+  ["84309635",0xF9D9],
+  ["84309636",0xF9DA],
+  ["84309637",0xF9DB],
+  ["84309638",0xF9DC],
+  ["84309639",0xF9DD],
+  ["84309730",0xF9DE],
+  ["84309731",0xF9DF],
+  ["84309732",0xF9E0],
+  ["84309733",0xF9E1],
+  ["84309734",0xF9E2],
+  ["84309735",0xF9E3],
+  ["84309736",0xF9E4],
+  ["84309737",0xF9E5],
+  ["84309738",0xF9E6],
+  ["FD9F",0xF9E7],
+  ["84309739",0xF9E8],
+  ["84309830",0xF9E9],
+  ["84309831",0xF9EA],
+  ["84309832",0xF9EB],
+  ["84309833",0xF9EC],
+  ["84309834",0xF9ED],
+  ["84309835",0xF9EE],
+  ["84309836",0xF9EF],
+  ["84309837",0xF9F0],
+  ["FDA0",0xF9F1],
+  ["84309838",0xF9F2],
+  ["84309839",0xF9F3],
+  ["84309930",0xF9F4],
+  ["84309931",0xF9F5],
+  ["84309932",0xF9F6],
+  ["84309933",0xF9F7],
+  ["84309934",0xF9F8],
+  ["84309935",0xF9F9],
+  ["84309936",0xF9FA],
+  ["84309937",0xF9FB],
+  ["84309938",0xF9FC],
+  ["84309939",0xF9FD],
+  ["84309A30",0xF9FE],
+  ["84309A31",0xF9FF],
+  ["84309A32",0xFA00],
+  ["84309A33",0xFA01],
+  ["84309A34",0xFA02],
+  ["84309A35",0xFA03],
+  ["84309A36",0xFA04],
+  ["84309A37",0xFA05],
+  ["84309A38",0xFA06],
+  ["84309A39",0xFA07],
+  ["84309B30",0xFA08],
+  ["84309B31",0xFA09],
+  ["84309B32",0xFA0A],
+  ["84309B33",0xFA0B],
+  ["FE40",0xFA0C],
+  ["FE41",0xFA0D],
+  ["FE42",0xFA0E],
+  ["FE43",0xFA0F],
+  ["84309B34",0xFA10],
+  ["FE44",0xFA11],
+  ["84309B35",0xFA12],
+  ["FE45",0xFA13],
+  ["FE46",0xFA14],
+  ["84309B36",0xFA15],
+  ["84309B37",0xFA16],
+  ["84309B38",0xFA17],
+  ["FE47",0xFA18],
+  ["84309B39",0xFA19],
+  ["84309C30",0xFA1A],
+  ["84309C31",0xFA1B],
+  ["84309C32",0xFA1C],
+  ["84309C33",0xFA1D],
+  ["84309C34",0xFA1E],
+  ["FE48",0xFA1F],
+  ["FE49",0xFA20],
+  ["FE4A",0xFA21],
+  ["84309C35",0xFA22],
+  ["FE4B",0xFA23],
+  ["FE4C",0xFA24],
+  ["84309C36",0xFA25],
+  ["84309C37",0xFA26],
+  ["FE4D",0xFA27],
+  ["FE4E",0xFA28],
+  ["FE4F",0xFA29],
+  ["84309C38",0xFA2A],
+  ["84309C39",0xFA2B],
+  ["84309D30",0xFA2C],
+  ["84309D31",0xFA2D],
+  ["84309D32",0xFA2E],
+  ["84309D33",0xFA2F],
+  ["84309D34",0xFA30],
+  ["84309D35",0xFA31],
+  ["84309D36",0xFA32],
+  ["84309D37",0xFA33],
+  ["84309D38",0xFA34],
+  ["84309D39",0xFA35],
+  ["84309E30",0xFA36],
+  ["84309E31",0xFA37],
+  ["84309E32",0xFA38],
+  ["84309E33",0xFA39],
+  ["84309E34",0xFA3A],
+  ["84309E35",0xFA3B],
+  ["84309E36",0xFA3C],
+  ["84309E37",0xFA3D],
+  ["84309E38",0xFA3E],
+  ["84309E39",0xFA3F],
+  ["84309F30",0xFA40],
+  ["84309F31",0xFA41],
+  ["84309F32",0xFA42],
+  ["84309F33",0xFA43],
+  ["84309F34",0xFA44],
+  ["84309F35",0xFA45],
+  ["84309F36",0xFA46],
+  ["84309F37",0xFA47],
+  ["84309F38",0xFA48],
+  ["84309F39",0xFA49],
+  ["8430A030",0xFA4A],
+  ["8430A031",0xFA4B],
+  ["8430A032",0xFA4C],
+  ["8430A033",0xFA4D],
+  ["8430A034",0xFA4E],
+  ["8430A035",0xFA4F],
+  ["8430A036",0xFA50],
+  ["8430A037",0xFA51],
+  ["8430A038",0xFA52],
+  ["8430A039",0xFA53],
+  ["8430A130",0xFA54],
+  ["8430A131",0xFA55],
+  ["8430A132",0xFA56],
+  ["8430A133",0xFA57],
+  ["8430A134",0xFA58],
+  ["8430A135",0xFA59],
+  ["8430A136",0xFA5A],
+  ["8430A137",0xFA5B],
+  ["8430A138",0xFA5C],
+  ["8430A139",0xFA5D],
+  ["8430A230",0xFA5E],
+  ["8430A231",0xFA5F],
+  ["8430A232",0xFA60],
+  ["8430A233",0xFA61],
+  ["8430A234",0xFA62],
+  ["8430A235",0xFA63],
+  ["8430A236",0xFA64],
+  ["8430A237",0xFA65],
+  ["8430A238",0xFA66],
+  ["8430A239",0xFA67],
+  ["8430A330",0xFA68],
+  ["8430A331",0xFA69],
+  ["8430A332",0xFA6A],
+  ["8430A333",0xFA6B],
+  ["8430A334",0xFA6C],
+  ["8430A335",0xFA6D],
+  ["8430A336",0xFA6E],
+  ["8430A337",0xFA6F],
+  ["8430A338",0xFA70],
+  ["8430A339",0xFA71],
+  ["8430A430",0xFA72],
+  ["8430A431",0xFA73],
+  ["8430A432",0xFA74],
+  ["8430A433",0xFA75],
+  ["8430A434",0xFA76],
+  ["8430A435",0xFA77],
+  ["8430A436",0xFA78],
+  ["8430A437",0xFA79],
+  ["8430A438",0xFA7A],
+  ["8430A439",0xFA7B],
+  ["8430A530",0xFA7C],
+  ["8430A531",0xFA7D],
+  ["8430A532",0xFA7E],
+  ["8430A533",0xFA7F],
+  ["8430A534",0xFA80],
+  ["8430A535",0xFA81],
+  ["8430A536",0xFA82],
+  ["8430A537",0xFA83],
+  ["8430A538",0xFA84],
+  ["8430A539",0xFA85],
+  ["8430A630",0xFA86],
+  ["8430A631",0xFA87],
+  ["8430A632",0xFA88],
+  ["8430A633",0xFA89],
+  ["8430A634",0xFA8A],
+  ["8430A635",0xFA8B],
+  ["8430A636",0xFA8C],
+  ["8430A637",0xFA8D],
+  ["8430A638",0xFA8E],
+  ["8430A639",0xFA8F],
+  ["8430A730",0xFA90],
+  ["8430A731",0xFA91],
+  ["8430A732",0xFA92],
+  ["8430A733",0xFA93],
+  ["8430A734",0xFA94],
+  ["8430A735",0xFA95],
+  ["8430A736",0xFA96],
+  ["8430A737",0xFA97],
+  ["8430A738",0xFA98],
+  ["8430A739",0xFA99],
+  ["8430A830",0xFA9A],
+  ["8430A831",0xFA9B],
+  ["8430A832",0xFA9C],
+  ["8430A833",0xFA9D],
+  ["8430A834",0xFA9E],
+  ["8430A835",0xFA9F],
+  ["8430A836",0xFAA0],
+  ["8430A837",0xFAA1],
+  ["8430A838",0xFAA2],
+  ["8430A839",0xFAA3],
+  ["8430A930",0xFAA4],
+  ["8430A931",0xFAA5],
+  ["8430A932",0xFAA6],
+  ["8430A933",0xFAA7],
+  ["8430A934",0xFAA8],
+  ["8430A935",0xFAA9],
+  ["8430A936",0xFAAA],
+  ["8430A937",0xFAAB],
+  ["8430A938",0xFAAC],
+  ["8430A939",0xFAAD],
+  ["8430AA30",0xFAAE],
+  ["8430AA31",0xFAAF],
+  ["8430AA32",0xFAB0],
+  ["8430AA33",0xFAB1],
+  ["8430AA34",0xFAB2],
+  ["8430AA35",0xFAB3],
+  ["8430AA36",0xFAB4],
+  ["8430AA37",0xFAB5],
+  ["8430AA38",0xFAB6],
+  ["8430AA39",0xFAB7],
+  ["8430AB30",0xFAB8],
+  ["8430AB31",0xFAB9],
+  ["8430AB32",0xFABA],
+  ["8430AB33",0xFABB],
+  ["8430AB34",0xFABC],
+  ["8430AB35",0xFABD],
+  ["8430AB36",0xFABE],
+  ["8430AB37",0xFABF],
+  ["8430AB38",0xFAC0],
+  ["8430AB39",0xFAC1],
+  ["8430AC30",0xFAC2],
+  ["8430AC31",0xFAC3],
+  ["8430AC32",0xFAC4],
+  ["8430AC33",0xFAC5],
+  ["8430AC34",0xFAC6],
+  ["8430AC35",0xFAC7],
+  ["8430AC36",0xFAC8],
+  ["8430AC37",0xFAC9],
+  ["8430AC38",0xFACA],
+  ["8430AC39",0xFACB],
+  ["8430AD30",0xFACC],
+  ["8430AD31",0xFACD],
+  ["8430AD32",0xFACE],
+  ["8430AD33",0xFACF],
+  ["8430AD34",0xFAD0],
+  ["8430AD35",0xFAD1],
+  ["8430AD36",0xFAD2],
+  ["8430AD37",0xFAD3],
+  ["8430AD38",0xFAD4],
+  ["8430AD39",0xFAD5],
+  ["8430AE30",0xFAD6],
+  ["8430AE31",0xFAD7],
+  ["8430AE32",0xFAD8],
+  ["8430AE33",0xFAD9],
+  ["8430AE34",0xFADA],
+  ["8430AE35",0xFADB],
+  ["8430AE36",0xFADC],
+  ["8430AE37",0xFADD],
+  ["8430AE38",0xFADE],
+  ["8430AE39",0xFADF],
+  ["8430AF30",0xFAE0],
+  ["8430AF31",0xFAE1],
+  ["8430AF32",0xFAE2],
+  ["8430AF33",0xFAE3],
+  ["8430AF34",0xFAE4],
+  ["8430AF35",0xFAE5],
+  ["8430AF36",0xFAE6],
+  ["8430AF37",0xFAE7],
+  ["8430AF38",0xFAE8],
+  ["8430AF39",0xFAE9],
+  ["8430B030",0xFAEA],
+  ["8430B031",0xFAEB],
+  ["8430B032",0xFAEC],
+  ["8430B033",0xFAED],
+  ["8430B034",0xFAEE],
+  ["8430B035",0xFAEF],
+  ["8430B036",0xFAF0],
+  ["8430B037",0xFAF1],
+  ["8430B038",0xFAF2],
+  ["8430B039",0xFAF3],
+  ["8430B130",0xFAF4],
+  ["8430B131",0xFAF5],
+  ["8430B132",0xFAF6],
+  ["8430B133",0xFAF7],
+  ["8430B134",0xFAF8],
+  ["8430B135",0xFAF9],
+  ["8430B136",0xFAFA],
+  ["8430B137",0xFAFB],
+  ["8430B138",0xFAFC],
+  ["8430B139",0xFAFD],
+  ["8430B230",0xFAFE],
+  ["8430B231",0xFAFF],
+  ["8430B232",0xFB00],
+  ["8430B233",0xFB01],
+  ["8430B234",0xFB02],
+  ["8430B235",0xFB03],
+  ["8430B236",0xFB04],
+  ["8430B237",0xFB05],
+  ["8430B238",0xFB06],
+  ["8430B239",0xFB07],
+  ["8430B330",0xFB08],
+  ["8430B331",0xFB09],
+  ["8430B332",0xFB0A],
+  ["8430B333",0xFB0B],
+  ["8430B334",0xFB0C],
+  ["8430B335",0xFB0D],
+  ["8430B336",0xFB0E],
+  ["8430B337",0xFB0F],
+  ["8430B338",0xFB10],
+  ["8430B339",0xFB11],
+  ["8430B430",0xFB12],
+  ["8430B431",0xFB13],
+  ["8430B432",0xFB14],
+  ["8430B433",0xFB15],
+  ["8430B434",0xFB16],
+  ["8430B435",0xFB17],
+  ["8430B436",0xFB18],
+  ["8430B437",0xFB19],
+  ["8430B438",0xFB1A],
+  ["8430B439",0xFB1B],
+  ["8430B530",0xFB1C],
+  ["8430B531",0xFB1D],
+  ["8430B532",0xFB1E],
+  ["8430B533",0xFB1F],
+  ["8430B534",0xFB20],
+  ["8430B535",0xFB21],
+  ["8430B536",0xFB22],
+  ["8430B537",0xFB23],
+  ["8430B538",0xFB24],
+  ["8430B539",0xFB25],
+  ["8430B630",0xFB26],
+  ["8430B631",0xFB27],
+  ["8430B632",0xFB28],
+  ["8430B633",0xFB29],
+  ["8430B634",0xFB2A],
+  ["8430B635",0xFB2B],
+  ["8430B636",0xFB2C],
+  ["8430B637",0xFB2D],
+  ["8430B638",0xFB2E],
+  ["8430B639",0xFB2F],
+  ["8430B730",0xFB30],
+  ["8430B731",0xFB31],
+  ["8430B732",0xFB32],
+  ["8430B733",0xFB33],
+  ["8430B734",0xFB34],
+  ["8430B735",0xFB35],
+  ["8430B736",0xFB36],
+  ["8430B737",0xFB37],
+  ["8430B738",0xFB38],
+  ["8430B739",0xFB39],
+  ["8430B830",0xFB3A],
+  ["8430B831",0xFB3B],
+  ["8430B832",0xFB3C],
+  ["8430B833",0xFB3D],
+  ["8430B834",0xFB3E],
+  ["8430B835",0xFB3F],
+  ["8430B836",0xFB40],
+  ["8430B837",0xFB41],
+  ["8430B838",0xFB42],
+  ["8430B839",0xFB43],
+  ["8430B930",0xFB44],
+  ["8430B931",0xFB45],
+  ["8430B932",0xFB46],
+  ["8430B933",0xFB47],
+  ["8430B934",0xFB48],
+  ["8430B935",0xFB49],
+  ["8430B936",0xFB4A],
+  ["8430B937",0xFB4B],
+  ["8430B938",0xFB4C],
+  ["8430B939",0xFB4D],
+  ["8430BA30",0xFB4E],
+  ["8430BA31",0xFB4F],
+  ["8430BA32",0xFB50],
+  ["8430BA33",0xFB51],
+  ["8430BA34",0xFB52],
+  ["8430BA35",0xFB53],
+  ["8430BA36",0xFB54],
+  ["8430BA37",0xFB55],
+  ["8430BA38",0xFB56],
+  ["8430BA39",0xFB57],
+  ["8430BB30",0xFB58],
+  ["8430BB31",0xFB59],
+  ["8430BB32",0xFB5A],
+  ["8430BB33",0xFB5B],
+  ["8430BB34",0xFB5C],
+  ["8430BB35",0xFB5D],
+  ["8430BB36",0xFB5E],
+  ["8430BB37",0xFB5F],
+  ["8430BB38",0xFB60],
+  ["8430BB39",0xFB61],
+  ["8430BC30",0xFB62],
+  ["8430BC31",0xFB63],
+  ["8430BC32",0xFB64],
+  ["8430BC33",0xFB65],
+  ["8430BC34",0xFB66],
+  ["8430BC35",0xFB67],
+  ["8430BC36",0xFB68],
+  ["8430BC37",0xFB69],
+  ["8430BC38",0xFB6A],
+  ["8430BC39",0xFB6B],
+  ["8430BD30",0xFB6C],
+  ["8430BD31",0xFB6D],
+  ["8430BD32",0xFB6E],
+  ["8430BD33",0xFB6F],
+  ["8430BD34",0xFB70],
+  ["8430BD35",0xFB71],
+  ["8430BD36",0xFB72],
+  ["8430BD37",0xFB73],
+  ["8430BD38",0xFB74],
+  ["8430BD39",0xFB75],
+  ["8430BE30",0xFB76],
+  ["8430BE31",0xFB77],
+  ["8430BE32",0xFB78],
+  ["8430BE33",0xFB79],
+  ["8430BE34",0xFB7A],
+  ["8430BE35",0xFB7B],
+  ["8430BE36",0xFB7C],
+  ["8430BE37",0xFB7D],
+  ["8430BE38",0xFB7E],
+  ["8430BE39",0xFB7F],
+  ["8430BF30",0xFB80],
+  ["8430BF31",0xFB81],
+  ["8430BF32",0xFB82],
+  ["8430BF33",0xFB83],
+  ["8430BF34",0xFB84],
+  ["8430BF35",0xFB85],
+  ["8430BF36",0xFB86],
+  ["8430BF37",0xFB87],
+  ["8430BF38",0xFB88],
+  ["8430BF39",0xFB89],
+  ["8430C030",0xFB8A],
+  ["8430C031",0xFB8B],
+  ["8430C032",0xFB8C],
+  ["8430C033",0xFB8D],
+  ["8430C034",0xFB8E],
+  ["8430C035",0xFB8F],
+  ["8430C036",0xFB90],
+  ["8430C037",0xFB91],
+  ["8430C038",0xFB92],
+  ["8430C039",0xFB93],
+  ["8430C130",0xFB94],
+  ["8430C131",0xFB95],
+  ["8430C132",0xFB96],
+  ["8430C133",0xFB97],
+  ["8430C134",0xFB98],
+  ["8430C135",0xFB99],
+  ["8430C136",0xFB9A],
+  ["8430C137",0xFB9B],
+  ["8430C138",0xFB9C],
+  ["8430C139",0xFB9D],
+  ["8430C230",0xFB9E],
+  ["8430C231",0xFB9F],
+  ["8430C232",0xFBA0],
+  ["8430C233",0xFBA1],
+  ["8430C234",0xFBA2],
+  ["8430C235",0xFBA3],
+  ["8430C236",0xFBA4],
+  ["8430C237",0xFBA5],
+  ["8430C238",0xFBA6],
+  ["8430C239",0xFBA7],
+  ["8430C330",0xFBA8],
+  ["8430C331",0xFBA9],
+  ["8430C332",0xFBAA],
+  ["8430C333",0xFBAB],
+  ["8430C334",0xFBAC],
+  ["8430C335",0xFBAD],
+  ["8430C336",0xFBAE],
+  ["8430C337",0xFBAF],
+  ["8430C338",0xFBB0],
+  ["8430C339",0xFBB1],
+  ["8430C430",0xFBB2],
+  ["8430C431",0xFBB3],
+  ["8430C432",0xFBB4],
+  ["8430C433",0xFBB5],
+  ["8430C434",0xFBB6],
+  ["8430C435",0xFBB7],
+  ["8430C436",0xFBB8],
+  ["8430C437",0xFBB9],
+  ["8430C438",0xFBBA],
+  ["8430C439",0xFBBB],
+  ["8430C530",0xFBBC],
+  ["8430C531",0xFBBD],
+  ["8430C532",0xFBBE],
+  ["8430C533",0xFBBF],
+  ["8430C534",0xFBC0],
+  ["8430C535",0xFBC1],
+  ["8430C536",0xFBC2],
+  ["8430C537",0xFBC3],
+  ["8430C538",0xFBC4],
+  ["8430C539",0xFBC5],
+  ["8430C630",0xFBC6],
+  ["8430C631",0xFBC7],
+  ["8430C632",0xFBC8],
+  ["8430C633",0xFBC9],
+  ["8430C634",0xFBCA],
+  ["8430C635",0xFBCB],
+  ["8430C636",0xFBCC],
+  ["8430C637",0xFBCD],
+  ["8430C638",0xFBCE],
+  ["8430C639",0xFBCF],
+  ["8430C730",0xFBD0],
+  ["8430C731",0xFBD1],
+  ["8430C732",0xFBD2],
+  ["8430C733",0xFBD3],
+  ["8430C734",0xFBD4],
+  ["8430C735",0xFBD5],
+  ["8430C736",0xFBD6],
+  ["8430C737",0xFBD7],
+  ["8430C738",0xFBD8],
+  ["8430C739",0xFBD9],
+  ["8430C830",0xFBDA],
+  ["8430C831",0xFBDB],
+  ["8430C832",0xFBDC],
+  ["8430C833",0xFBDD],
+  ["8430C834",0xFBDE],
+  ["8430C835",0xFBDF],
+  ["8430C836",0xFBE0],
+  ["8430C837",0xFBE1],
+  ["8430C838",0xFBE2],
+  ["8430C839",0xFBE3],
+  ["8430C930",0xFBE4],
+  ["8430C931",0xFBE5],
+  ["8430C932",0xFBE6],
+  ["8430C933",0xFBE7],
+  ["8430C934",0xFBE8],
+  ["8430C935",0xFBE9],
+  ["8430C936",0xFBEA],
+  ["8430C937",0xFBEB],
+  ["8430C938",0xFBEC],
+  ["8430C939",0xFBED],
+  ["8430CA30",0xFBEE],
+  ["8430CA31",0xFBEF],
+  ["8430CA32",0xFBF0],
+  ["8430CA33",0xFBF1],
+  ["8430CA34",0xFBF2],
+  ["8430CA35",0xFBF3],
+  ["8430CA36",0xFBF4],
+  ["8430CA37",0xFBF5],
+  ["8430CA38",0xFBF6],
+  ["8430CA39",0xFBF7],
+  ["8430CB30",0xFBF8],
+  ["8430CB31",0xFBF9],
+  ["8430CB32",0xFBFA],
+  ["8430CB33",0xFBFB],
+  ["8430CB34",0xFBFC],
+  ["8430CB35",0xFBFD],
+  ["8430CB36",0xFBFE],
+  ["8430CB37",0xFBFF],
+  ["8430CB38",0xFC00],
+  ["8430CB39",0xFC01],
+  ["8430CC30",0xFC02],
+  ["8430CC31",0xFC03],
+  ["8430CC32",0xFC04],
+  ["8430CC33",0xFC05],
+  ["8430CC34",0xFC06],
+  ["8430CC35",0xFC07],
+  ["8430CC36",0xFC08],
+  ["8430CC37",0xFC09],
+  ["8430CC38",0xFC0A],
+  ["8430CC39",0xFC0B],
+  ["8430CD30",0xFC0C],
+  ["8430CD31",0xFC0D],
+  ["8430CD32",0xFC0E],
+  ["8430CD33",0xFC0F],
+  ["8430CD34",0xFC10],
+  ["8430CD35",0xFC11],
+  ["8430CD36",0xFC12],
+  ["8430CD37",0xFC13],
+  ["8430CD38",0xFC14],
+  ["8430CD39",0xFC15],
+  ["8430CE30",0xFC16],
+  ["8430CE31",0xFC17],
+  ["8430CE32",0xFC18],
+  ["8430CE33",0xFC19],
+  ["8430CE34",0xFC1A],
+  ["8430CE35",0xFC1B],
+  ["8430CE36",0xFC1C],
+  ["8430CE37",0xFC1D],
+  ["8430CE38",0xFC1E],
+  ["8430CE39",0xFC1F],
+  ["8430CF30",0xFC20],
+  ["8430CF31",0xFC21],
+  ["8430CF32",0xFC22],
+  ["8430CF33",0xFC23],
+  ["8430CF34",0xFC24],
+  ["8430CF35",0xFC25],
+  ["8430CF36",0xFC26],
+  ["8430CF37",0xFC27],
+  ["8430CF38",0xFC28],
+  ["8430CF39",0xFC29],
+  ["8430D030",0xFC2A],
+  ["8430D031",0xFC2B],
+  ["8430D032",0xFC2C],
+  ["8430D033",0xFC2D],
+  ["8430D034",0xFC2E],
+  ["8430D035",0xFC2F],
+  ["8430D036",0xFC30],
+  ["8430D037",0xFC31],
+  ["8430D038",0xFC32],
+  ["8430D039",0xFC33],
+  ["8430D130",0xFC34],
+  ["8430D131",0xFC35],
+  ["8430D132",0xFC36],
+  ["8430D133",0xFC37],
+  ["8430D134",0xFC38],
+  ["8430D135",0xFC39],
+  ["8430D136",0xFC3A],
+  ["8430D137",0xFC3B],
+  ["8430D138",0xFC3C],
+  ["8430D139",0xFC3D],
+  ["8430D230",0xFC3E],
+  ["8430D231",0xFC3F],
+  ["8430D232",0xFC40],
+  ["8430D233",0xFC41],
+  ["8430D234",0xFC42],
+  ["8430D235",0xFC43],
+  ["8430D236",0xFC44],
+  ["8430D237",0xFC45],
+  ["8430D238",0xFC46],
+  ["8430D239",0xFC47],
+  ["8430D330",0xFC48],
+  ["8430D331",0xFC49],
+  ["8430D332",0xFC4A],
+  ["8430D333",0xFC4B],
+  ["8430D334",0xFC4C],
+  ["8430D335",0xFC4D],
+  ["8430D336",0xFC4E],
+  ["8430D337",0xFC4F],
+  ["8430D338",0xFC50],
+  ["8430D339",0xFC51],
+  ["8430D430",0xFC52],
+  ["8430D431",0xFC53],
+  ["8430D432",0xFC54],
+  ["8430D433",0xFC55],
+  ["8430D434",0xFC56],
+  ["8430D435",0xFC57],
+  ["8430D436",0xFC58],
+  ["8430D437",0xFC59],
+  ["8430D438",0xFC5A],
+  ["8430D439",0xFC5B],
+  ["8430D530",0xFC5C],
+  ["8430D531",0xFC5D],
+  ["8430D532",0xFC5E],
+  ["8430D533",0xFC5F],
+  ["8430D534",0xFC60],
+  ["8430D535",0xFC61],
+  ["8430D536",0xFC62],
+  ["8430D537",0xFC63],
+  ["8430D538",0xFC64],
+  ["8430D539",0xFC65],
+  ["8430D630",0xFC66],
+  ["8430D631",0xFC67],
+  ["8430D632",0xFC68],
+  ["8430D633",0xFC69],
+  ["8430D634",0xFC6A],
+  ["8430D635",0xFC6B],
+  ["8430D636",0xFC6C],
+  ["8430D637",0xFC6D],
+  ["8430D638",0xFC6E],
+  ["8430D639",0xFC6F],
+  ["8430D730",0xFC70],
+  ["8430D731",0xFC71],
+  ["8430D732",0xFC72],
+  ["8430D733",0xFC73],
+  ["8430D734",0xFC74],
+  ["8430D735",0xFC75],
+  ["8430D736",0xFC76],
+  ["8430D737",0xFC77],
+  ["8430D738",0xFC78],
+  ["8430D739",0xFC79],
+  ["8430D830",0xFC7A],
+  ["8430D831",0xFC7B],
+  ["8430D832",0xFC7C],
+  ["8430D833",0xFC7D],
+  ["8430D834",0xFC7E],
+  ["8430D835",0xFC7F],
+  ["8430D836",0xFC80],
+  ["8430D837",0xFC81],
+  ["8430D838",0xFC82],
+  ["8430D839",0xFC83],
+  ["8430D930",0xFC84],
+  ["8430D931",0xFC85],
+  ["8430D932",0xFC86],
+  ["8430D933",0xFC87],
+  ["8430D934",0xFC88],
+  ["8430D935",0xFC89],
+  ["8430D936",0xFC8A],
+  ["8430D937",0xFC8B],
+  ["8430D938",0xFC8C],
+  ["8430D939",0xFC8D],
+  ["8430DA30",0xFC8E],
+  ["8430DA31",0xFC8F],
+  ["8430DA32",0xFC90],
+  ["8430DA33",0xFC91],
+  ["8430DA34",0xFC92],
+  ["8430DA35",0xFC93],
+  ["8430DA36",0xFC94],
+  ["8430DA37",0xFC95],
+  ["8430DA38",0xFC96],
+  ["8430DA39",0xFC97],
+  ["8430DB30",0xFC98],
+  ["8430DB31",0xFC99],
+  ["8430DB32",0xFC9A],
+  ["8430DB33",0xFC9B],
+  ["8430DB34",0xFC9C],
+  ["8430DB35",0xFC9D],
+  ["8430DB36",0xFC9E],
+  ["8430DB37",0xFC9F],
+  ["8430DB38",0xFCA0],
+  ["8430DB39",0xFCA1],
+  ["8430DC30",0xFCA2],
+  ["8430DC31",0xFCA3],
+  ["8430DC32",0xFCA4],
+  ["8430DC33",0xFCA5],
+  ["8430DC34",0xFCA6],
+  ["8430DC35",0xFCA7],
+  ["8430DC36",0xFCA8],
+  ["8430DC37",0xFCA9],
+  ["8430DC38",0xFCAA],
+  ["8430DC39",0xFCAB],
+  ["8430DD30",0xFCAC],
+  ["8430DD31",0xFCAD],
+  ["8430DD32",0xFCAE],
+  ["8430DD33",0xFCAF],
+  ["8430DD34",0xFCB0],
+  ["8430DD35",0xFCB1],
+  ["8430DD36",0xFCB2],
+  ["8430DD37",0xFCB3],
+  ["8430DD38",0xFCB4],
+  ["8430DD39",0xFCB5],
+  ["8430DE30",0xFCB6],
+  ["8430DE31",0xFCB7],
+  ["8430DE32",0xFCB8],
+  ["8430DE33",0xFCB9],
+  ["8430DE34",0xFCBA],
+  ["8430DE35",0xFCBB],
+  ["8430DE36",0xFCBC],
+  ["8430DE37",0xFCBD],
+  ["8430DE38",0xFCBE],
+  ["8430DE39",0xFCBF],
+  ["8430DF30",0xFCC0],
+  ["8430DF31",0xFCC1],
+  ["8430DF32",0xFCC2],
+  ["8430DF33",0xFCC3],
+  ["8430DF34",0xFCC4],
+  ["8430DF35",0xFCC5],
+  ["8430DF36",0xFCC6],
+  ["8430DF37",0xFCC7],
+  ["8430DF38",0xFCC8],
+  ["8430DF39",0xFCC9],
+  ["8430E030",0xFCCA],
+  ["8430E031",0xFCCB],
+  ["8430E032",0xFCCC],
+  ["8430E033",0xFCCD],
+  ["8430E034",0xFCCE],
+  ["8430E035",0xFCCF],
+  ["8430E036",0xFCD0],
+  ["8430E037",0xFCD1],
+  ["8430E038",0xFCD2],
+  ["8430E039",0xFCD3],
+  ["8430E130",0xFCD4],
+  ["8430E131",0xFCD5],
+  ["8430E132",0xFCD6],
+  ["8430E133",0xFCD7],
+  ["8430E134",0xFCD8],
+  ["8430E135",0xFCD9],
+  ["8430E136",0xFCDA],
+  ["8430E137",0xFCDB],
+  ["8430E138",0xFCDC],
+  ["8430E139",0xFCDD],
+  ["8430E230",0xFCDE],
+  ["8430E231",0xFCDF],
+  ["8430E232",0xFCE0],
+  ["8430E233",0xFCE1],
+  ["8430E234",0xFCE2],
+  ["8430E235",0xFCE3],
+  ["8430E236",0xFCE4],
+  ["8430E237",0xFCE5],
+  ["8430E238",0xFCE6],
+  ["8430E239",0xFCE7],
+  ["8430E330",0xFCE8],
+  ["8430E331",0xFCE9],
+  ["8430E332",0xFCEA],
+  ["8430E333",0xFCEB],
+  ["8430E334",0xFCEC],
+  ["8430E335",0xFCED],
+  ["8430E336",0xFCEE],
+  ["8430E337",0xFCEF],
+  ["8430E338",0xFCF0],
+  ["8430E339",0xFCF1],
+  ["8430E430",0xFCF2],
+  ["8430E431",0xFCF3],
+  ["8430E432",0xFCF4],
+  ["8430E433",0xFCF5],
+  ["8430E434",0xFCF6],
+  ["8430E435",0xFCF7],
+  ["8430E436",0xFCF8],
+  ["8430E437",0xFCF9],
+  ["8430E438",0xFCFA],
+  ["8430E439",0xFCFB],
+  ["8430E530",0xFCFC],
+  ["8430E531",0xFCFD],
+  ["8430E532",0xFCFE],
+  ["8430E533",0xFCFF],
+  ["8430E534",0xFD00],
+  ["8430E535",0xFD01],
+  ["8430E536",0xFD02],
+  ["8430E537",0xFD03],
+  ["8430E538",0xFD04],
+  ["8430E539",0xFD05],
+  ["8430E630",0xFD06],
+  ["8430E631",0xFD07],
+  ["8430E632",0xFD08],
+  ["8430E633",0xFD09],
+  ["8430E634",0xFD0A],
+  ["8430E635",0xFD0B],
+  ["8430E636",0xFD0C],
+  ["8430E637",0xFD0D],
+  ["8430E638",0xFD0E],
+  ["8430E639",0xFD0F],
+  ["8430E730",0xFD10],
+  ["8430E731",0xFD11],
+  ["8430E732",0xFD12],
+  ["8430E733",0xFD13],
+  ["8430E734",0xFD14],
+  ["8430E735",0xFD15],
+  ["8430E736",0xFD16],
+  ["8430E737",0xFD17],
+  ["8430E738",0xFD18],
+  ["8430E739",0xFD19],
+  ["8430E830",0xFD1A],
+  ["8430E831",0xFD1B],
+  ["8430E832",0xFD1C],
+  ["8430E833",0xFD1D],
+  ["8430E834",0xFD1E],
+  ["8430E835",0xFD1F],
+  ["8430E836",0xFD20],
+  ["8430E837",0xFD21],
+  ["8430E838",0xFD22],
+  ["8430E839",0xFD23],
+  ["8430E930",0xFD24],
+  ["8430E931",0xFD25],
+  ["8430E932",0xFD26],
+  ["8430E933",0xFD27],
+  ["8430E934",0xFD28],
+  ["8430E935",0xFD29],
+  ["8430E936",0xFD2A],
+  ["8430E937",0xFD2B],
+  ["8430E938",0xFD2C],
+  ["8430E939",0xFD2D],
+  ["8430EA30",0xFD2E],
+  ["8430EA31",0xFD2F],
+  ["8430EA32",0xFD30],
+  ["8430EA33",0xFD31],
+  ["8430EA34",0xFD32],
+  ["8430EA35",0xFD33],
+  ["8430EA36",0xFD34],
+  ["8430EA37",0xFD35],
+  ["8430EA38",0xFD36],
+  ["8430EA39",0xFD37],
+  ["8430EB30",0xFD38],
+  ["8430EB31",0xFD39],
+  ["8430EB32",0xFD3A],
+  ["8430EB33",0xFD3B],
+  ["8430EB34",0xFD3C],
+  ["8430EB35",0xFD3D],
+  ["8430EB36",0xFD3E],
+  ["8430EB37",0xFD3F],
+  ["8430EB38",0xFD40],
+  ["8430EB39",0xFD41],
+  ["8430EC30",0xFD42],
+  ["8430EC31",0xFD43],
+  ["8430EC32",0xFD44],
+  ["8430EC33",0xFD45],
+  ["8430EC34",0xFD46],
+  ["8430EC35",0xFD47],
+  ["8430EC36",0xFD48],
+  ["8430EC37",0xFD49],
+  ["8430EC38",0xFD4A],
+  ["8430EC39",0xFD4B],
+  ["8430ED30",0xFD4C],
+  ["8430ED31",0xFD4D],
+  ["8430ED32",0xFD4E],
+  ["8430ED33",0xFD4F],
+  ["8430ED34",0xFD50],
+  ["8430ED35",0xFD51],
+  ["8430ED36",0xFD52],
+  ["8430ED37",0xFD53],
+  ["8430ED38",0xFD54],
+  ["8430ED39",0xFD55],
+  ["8430EE30",0xFD56],
+  ["8430EE31",0xFD57],
+  ["8430EE32",0xFD58],
+  ["8430EE33",0xFD59],
+  ["8430EE34",0xFD5A],
+  ["8430EE35",0xFD5B],
+  ["8430EE36",0xFD5C],
+  ["8430EE37",0xFD5D],
+  ["8430EE38",0xFD5E],
+  ["8430EE39",0xFD5F],
+  ["8430EF30",0xFD60],
+  ["8430EF31",0xFD61],
+  ["8430EF32",0xFD62],
+  ["8430EF33",0xFD63],
+  ["8430EF34",0xFD64],
+  ["8430EF35",0xFD65],
+  ["8430EF36",0xFD66],
+  ["8430EF37",0xFD67],
+  ["8430EF38",0xFD68],
+  ["8430EF39",0xFD69],
+  ["8430F030",0xFD6A],
+  ["8430F031",0xFD6B],
+  ["8430F032",0xFD6C],
+  ["8430F033",0xFD6D],
+  ["8430F034",0xFD6E],
+  ["8430F035",0xFD6F],
+  ["8430F036",0xFD70],
+  ["8430F037",0xFD71],
+  ["8430F038",0xFD72],
+  ["8430F039",0xFD73],
+  ["8430F130",0xFD74],
+  ["8430F131",0xFD75],
+  ["8430F132",0xFD76],
+  ["8430F133",0xFD77],
+  ["8430F134",0xFD78],
+  ["8430F135",0xFD79],
+  ["8430F136",0xFD7A],
+  ["8430F137",0xFD7B],
+  ["8430F138",0xFD7C],
+  ["8430F139",0xFD7D],
+  ["8430F230",0xFD7E],
+  ["8430F231",0xFD7F],
+  ["8430F232",0xFD80],
+  ["8430F233",0xFD81],
+  ["8430F234",0xFD82],
+  ["8430F235",0xFD83],
+  ["8430F236",0xFD84],
+  ["8430F237",0xFD85],
+  ["8430F238",0xFD86],
+  ["8430F239",0xFD87],
+  ["8430F330",0xFD88],
+  ["8430F331",0xFD89],
+  ["8430F332",0xFD8A],
+  ["8430F333",0xFD8B],
+  ["8430F334",0xFD8C],
+  ["8430F335",0xFD8D],
+  ["8430F336",0xFD8E],
+  ["8430F337",0xFD8F],
+  ["8430F338",0xFD90],
+  ["8430F339",0xFD91],
+  ["8430F430",0xFD92],
+  ["8430F431",0xFD93],
+  ["8430F432",0xFD94],
+  ["8430F433",0xFD95],
+  ["8430F434",0xFD96],
+  ["8430F435",0xFD97],
+  ["8430F436",0xFD98],
+  ["8430F437",0xFD99],
+  ["8430F438",0xFD9A],
+  ["8430F439",0xFD9B],
+  ["8430F530",0xFD9C],
+  ["8430F531",0xFD9D],
+  ["8430F532",0xFD9E],
+  ["8430F533",0xFD9F],
+  ["8430F534",0xFDA0],
+  ["8430F535",0xFDA1],
+  ["8430F536",0xFDA2],
+  ["8430F537",0xFDA3],
+  ["8430F538",0xFDA4],
+  ["8430F539",0xFDA5],
+  ["8430F630",0xFDA6],
+  ["8430F631",0xFDA7],
+  ["8430F632",0xFDA8],
+  ["8430F633",0xFDA9],
+  ["8430F634",0xFDAA],
+  ["8430F635",0xFDAB],
+  ["8430F636",0xFDAC],
+  ["8430F637",0xFDAD],
+  ["8430F638",0xFDAE],
+  ["8430F639",0xFDAF],
+  ["8430F730",0xFDB0],
+  ["8430F731",0xFDB1],
+  ["8430F732",0xFDB2],
+  ["8430F733",0xFDB3],
+  ["8430F734",0xFDB4],
+  ["8430F735",0xFDB5],
+  ["8430F736",0xFDB6],
+  ["8430F737",0xFDB7],
+  ["8430F738",0xFDB8],
+  ["8430F739",0xFDB9],
+  ["8430F830",0xFDBA],
+  ["8430F831",0xFDBB],
+  ["8430F832",0xFDBC],
+  ["8430F833",0xFDBD],
+  ["8430F834",0xFDBE],
+  ["8430F835",0xFDBF],
+  ["8430F836",0xFDC0],
+  ["8430F837",0xFDC1],
+  ["8430F838",0xFDC2],
+  ["8430F839",0xFDC3],
+  ["8430F930",0xFDC4],
+  ["8430F931",0xFDC5],
+  ["8430F932",0xFDC6],
+  ["8430F933",0xFDC7],
+  ["8430F934",0xFDC8],
+  ["8430F935",0xFDC9],
+  ["8430F936",0xFDCA],
+  ["8430F937",0xFDCB],
+  ["8430F938",0xFDCC],
+  ["8430F939",0xFDCD],
+  ["8430FA30",0xFDCE],
+  ["8430FA31",0xFDCF],
+  ["8430FA32",0xFDD0],
+  ["8430FA33",0xFDD1],
+  ["8430FA34",0xFDD2],
+  ["8430FA35",0xFDD3],
+  ["8430FA36",0xFDD4],
+  ["8430FA37",0xFDD5],
+  ["8430FA38",0xFDD6],
+  ["8430FA39",0xFDD7],
+  ["8430FB30",0xFDD8],
+  ["8430FB31",0xFDD9],
+  ["8430FB32",0xFDDA],
+  ["8430FB33",0xFDDB],
+  ["8430FB34",0xFDDC],
+  ["8430FB35",0xFDDD],
+  ["8430FB36",0xFDDE],
+  ["8430FB37",0xFDDF],
+  ["8430FB38",0xFDE0],
+  ["8430FB39",0xFDE1],
+  ["8430FC30",0xFDE2],
+  ["8430FC31",0xFDE3],
+  ["8430FC32",0xFDE4],
+  ["8430FC33",0xFDE5],
+  ["8430FC34",0xFDE6],
+  ["8430FC35",0xFDE7],
+  ["8430FC36",0xFDE8],
+  ["8430FC37",0xFDE9],
+  ["8430FC38",0xFDEA],
+  ["8430FC39",0xFDEB],
+  ["8430FD30",0xFDEC],
+  ["8430FD31",0xFDED],
+  ["8430FD32",0xFDEE],
+  ["8430FD33",0xFDEF],
+  ["8430FD34",0xFDF0],
+  ["8430FD35",0xFDF1],
+  ["8430FD36",0xFDF2],
+  ["8430FD37",0xFDF3],
+  ["8430FD38",0xFDF4],
+  ["8430FD39",0xFDF5],
+  ["8430FE30",0xFDF6],
+  ["8430FE31",0xFDF7],
+  ["8430FE32",0xFDF8],
+  ["8430FE33",0xFDF9],
+  ["8430FE34",0xFDFA],
+  ["8430FE35",0xFDFB],
+  ["8430FE36",0xFDFC],
+  ["8430FE37",0xFDFD],
+  ["8430FE38",0xFDFE],
+  ["8430FE39",0xFDFF],
+  ["84318130",0xFE00],
+  ["84318131",0xFE01],
+  ["84318132",0xFE02],
+  ["84318133",0xFE03],
+  ["84318134",0xFE04],
+  ["84318135",0xFE05],
+  ["84318136",0xFE06],
+  ["84318137",0xFE07],
+  ["84318138",0xFE08],
+  ["84318139",0xFE09],
+  ["84318230",0xFE0A],
+  ["84318231",0xFE0B],
+  ["84318232",0xFE0C],
+  ["84318233",0xFE0D],
+  ["84318234",0xFE0E],
+  ["84318235",0xFE0F],
+  ["84318236",0xFE10],
+  ["84318237",0xFE11],
+  ["84318238",0xFE12],
+  ["84318239",0xFE13],
+  ["84318330",0xFE14],
+  ["84318331",0xFE15],
+  ["84318332",0xFE16],
+  ["84318333",0xFE17],
+  ["84318334",0xFE18],
+  ["84318335",0xFE19],
+  ["84318336",0xFE1A],
+  ["84318337",0xFE1B],
+  ["84318338",0xFE1C],
+  ["84318339",0xFE1D],
+  ["84318430",0xFE1E],
+  ["84318431",0xFE1F],
+  ["84318432",0xFE20],
+  ["84318433",0xFE21],
+  ["84318434",0xFE22],
+  ["84318435",0xFE23],
+  ["84318436",0xFE24],
+  ["84318437",0xFE25],
+  ["84318438",0xFE26],
+  ["84318439",0xFE27],
+  ["84318530",0xFE28],
+  ["84318531",0xFE29],
+  ["84318532",0xFE2A],
+  ["84318533",0xFE2B],
+  ["84318534",0xFE2C],
+  ["84318535",0xFE2D],
+  ["84318536",0xFE2E],
+  ["84318537",0xFE2F],
+  ["A955",0xFE30],
+  ["A6F2",0xFE31],
+  ["84318538",0xFE32],
+  ["A6F4",0xFE33],
+  ["A6F5",0xFE34],
+  ["A6E0",0xFE35],
+  ["A6E1",0xFE36],
+  ["A6F0",0xFE37],
+  ["A6F1",0xFE38],
+  ["A6E2",0xFE39],
+  ["A6E3",0xFE3A],
+  ["A6EE",0xFE3B],
+  ["A6EF",0xFE3C],
+  ["A6E6",0xFE3D],
+  ["A6E7",0xFE3E],
+  ["A6E4",0xFE3F],
+  ["A6E5",0xFE40],
+  ["A6E8",0xFE41],
+  ["A6E9",0xFE42],
+  ["A6EA",0xFE43],
+  ["A6EB",0xFE44],
+  ["84318539",0xFE45],
+  ["84318630",0xFE46],
+  ["84318631",0xFE47],
+  ["84318632",0xFE48],
+  ["A968",0xFE49],
+  ["A969",0xFE4A],
+  ["A96A",0xFE4B],
+  ["A96B",0xFE4C],
+  ["A96C",0xFE4D],
+  ["A96D",0xFE4E],
+  ["A96E",0xFE4F],
+  ["A96F",0xFE50],
+  ["A970",0xFE51],
+  ["A971",0xFE52],
+  ["84318633",0xFE53],
+  ["A972",0xFE54],
+  ["A973",0xFE55],
+  ["A974",0xFE56],
+  ["A975",0xFE57],
+  ["84318634",0xFE58],
+  ["A976",0xFE59],
+  ["A977",0xFE5A],
+  ["A978",0xFE5B],
+  ["A979",0xFE5C],
+  ["A97A",0xFE5D],
+  ["A97B",0xFE5E],
+  ["A97C",0xFE5F],
+  ["A97D",0xFE60],
+  ["A97E",0xFE61],
+  ["A980",0xFE62],
+  ["A981",0xFE63],
+  ["A982",0xFE64],
+  ["A983",0xFE65],
+  ["A984",0xFE66],
+  ["84318635",0xFE67],
+  ["A985",0xFE68],
+  ["A986",0xFE69],
+  ["A987",0xFE6A],
+  ["A988",0xFE6B],
+  ["84318636",0xFE6C],
+  ["84318637",0xFE6D],
+  ["84318638",0xFE6E],
+  ["84318639",0xFE6F],
+  ["84318730",0xFE70],
+  ["84318731",0xFE71],
+  ["84318732",0xFE72],
+  ["84318733",0xFE73],
+  ["84318734",0xFE74],
+  ["84318735",0xFE75],
+  ["84318736",0xFE76],
+  ["84318737",0xFE77],
+  ["84318738",0xFE78],
+  ["84318739",0xFE79],
+  ["84318830",0xFE7A],
+  ["84318831",0xFE7B],
+  ["84318832",0xFE7C],
+  ["84318833",0xFE7D],
+  ["84318834",0xFE7E],
+  ["84318835",0xFE7F],
+  ["84318836",0xFE80],
+  ["84318837",0xFE81],
+  ["84318838",0xFE82],
+  ["84318839",0xFE83],
+  ["84318930",0xFE84],
+  ["84318931",0xFE85],
+  ["84318932",0xFE86],
+  ["84318933",0xFE87],
+  ["84318934",0xFE88],
+  ["84318935",0xFE89],
+  ["84318936",0xFE8A],
+  ["84318937",0xFE8B],
+  ["84318938",0xFE8C],
+  ["84318939",0xFE8D],
+  ["84318A30",0xFE8E],
+  ["84318A31",0xFE8F],
+  ["84318A32",0xFE90],
+  ["84318A33",0xFE91],
+  ["84318A34",0xFE92],
+  ["84318A35",0xFE93],
+  ["84318A36",0xFE94],
+  ["84318A37",0xFE95],
+  ["84318A38",0xFE96],
+  ["84318A39",0xFE97],
+  ["84318B30",0xFE98],
+  ["84318B31",0xFE99],
+  ["84318B32",0xFE9A],
+  ["84318B33",0xFE9B],
+  ["84318B34",0xFE9C],
+  ["84318B35",0xFE9D],
+  ["84318B36",0xFE9E],
+  ["84318B37",0xFE9F],
+  ["84318B38",0xFEA0],
+  ["84318B39",0xFEA1],
+  ["84318C30",0xFEA2],
+  ["84318C31",0xFEA3],
+  ["84318C32",0xFEA4],
+  ["84318C33",0xFEA5],
+  ["84318C34",0xFEA6],
+  ["84318C35",0xFEA7],
+  ["84318C36",0xFEA8],
+  ["84318C37",0xFEA9],
+  ["84318C38",0xFEAA],
+  ["84318C39",0xFEAB],
+  ["84318D30",0xFEAC],
+  ["84318D31",0xFEAD],
+  ["84318D32",0xFEAE],
+  ["84318D33",0xFEAF],
+  ["84318D34",0xFEB0],
+  ["84318D35",0xFEB1],
+  ["84318D36",0xFEB2],
+  ["84318D37",0xFEB3],
+  ["84318D38",0xFEB4],
+  ["84318D39",0xFEB5],
+  ["84318E30",0xFEB6],
+  ["84318E31",0xFEB7],
+  ["84318E32",0xFEB8],
+  ["84318E33",0xFEB9],
+  ["84318E34",0xFEBA],
+  ["84318E35",0xFEBB],
+  ["84318E36",0xFEBC],
+  ["84318E37",0xFEBD],
+  ["84318E38",0xFEBE],
+  ["84318E39",0xFEBF],
+  ["84318F30",0xFEC0],
+  ["84318F31",0xFEC1],
+  ["84318F32",0xFEC2],
+  ["84318F33",0xFEC3],
+  ["84318F34",0xFEC4],
+  ["84318F35",0xFEC5],
+  ["84318F36",0xFEC6],
+  ["84318F37",0xFEC7],
+  ["84318F38",0xFEC8],
+  ["84318F39",0xFEC9],
+  ["84319030",0xFECA],
+  ["84319031",0xFECB],
+  ["84319032",0xFECC],
+  ["84319033",0xFECD],
+  ["84319034",0xFECE],
+  ["84319035",0xFECF],
+  ["84319036",0xFED0],
+  ["84319037",0xFED1],
+  ["84319038",0xFED2],
+  ["84319039",0xFED3],
+  ["84319130",0xFED4],
+  ["84319131",0xFED5],
+  ["84319132",0xFED6],
+  ["84319133",0xFED7],
+  ["84319134",0xFED8],
+  ["84319135",0xFED9],
+  ["84319136",0xFEDA],
+  ["84319137",0xFEDB],
+  ["84319138",0xFEDC],
+  ["84319139",0xFEDD],
+  ["84319230",0xFEDE],
+  ["84319231",0xFEDF],
+  ["84319232",0xFEE0],
+  ["84319233",0xFEE1],
+  ["84319234",0xFEE2],
+  ["84319235",0xFEE3],
+  ["84319236",0xFEE4],
+  ["84319237",0xFEE5],
+  ["84319238",0xFEE6],
+  ["84319239",0xFEE7],
+  ["84319330",0xFEE8],
+  ["84319331",0xFEE9],
+  ["84319332",0xFEEA],
+  ["84319333",0xFEEB],
+  ["84319334",0xFEEC],
+  ["84319335",0xFEED],
+  ["84319336",0xFEEE],
+  ["84319337",0xFEEF],
+  ["84319338",0xFEF0],
+  ["84319339",0xFEF1],
+  ["84319430",0xFEF2],
+  ["84319431",0xFEF3],
+  ["84319432",0xFEF4],
+  ["84319433",0xFEF5],
+  ["84319434",0xFEF6],
+  ["84319435",0xFEF7],
+  ["84319436",0xFEF8],
+  ["84319437",0xFEF9],
+  ["84319438",0xFEFA],
+  ["84319439",0xFEFB],
+  ["84319530",0xFEFC],
+  ["84319531",0xFEFD],
+  ["84319532",0xFEFE],
+  ["84319533",0xFEFF],
+  ["84319534",0xFF00],
+  ["A3A1",0xFF01],
+  ["A3A2",0xFF02],
+  ["A3A3",0xFF03],
+  ["A1E7",0xFF04],
+  ["A3A5",0xFF05],
+  ["A3A6",0xFF06],
+  ["A3A7",0xFF07],
+  ["A3A8",0xFF08],
+  ["A3A9",0xFF09],
+  ["A3AA",0xFF0A],
+  ["A3AB",0xFF0B],
+  ["A3AC",0xFF0C],
+  ["A3AD",0xFF0D],
+  ["A3AE",0xFF0E],
+  ["A3AF",0xFF0F],
+  ["A3B0",0xFF10],
+  ["A3B1",0xFF11],
+  ["A3B2",0xFF12],
+  ["A3B3",0xFF13],
+  ["A3B4",0xFF14],
+  ["A3B5",0xFF15],
+  ["A3B6",0xFF16],
+  ["A3B7",0xFF17],
+  ["A3B8",0xFF18],
+  ["A3B9",0xFF19],
+  ["A3BA",0xFF1A],
+  ["A3BB",0xFF1B],
+  ["A3BC",0xFF1C],
+  ["A3BD",0xFF1D],
+  ["A3BE",0xFF1E],
+  ["A3BF",0xFF1F],
+  ["A3C0",0xFF20],
+  ["A3C1",0xFF21],
+  ["A3C2",0xFF22],
+  ["A3C3",0xFF23],
+  ["A3C4",0xFF24],
+  ["A3C5",0xFF25],
+  ["A3C6",0xFF26],
+  ["A3C7",0xFF27],
+  ["A3C8",0xFF28],
+  ["A3C9",0xFF29],
+  ["A3CA",0xFF2A],
+  ["A3CB",0xFF2B],
+  ["A3CC",0xFF2C],
+  ["A3CD",0xFF2D],
+  ["A3CE",0xFF2E],
+  ["A3CF",0xFF2F],
+  ["A3D0",0xFF30],
+  ["A3D1",0xFF31],
+  ["A3D2",0xFF32],
+  ["A3D3",0xFF33],
+  ["A3D4",0xFF34],
+  ["A3D5",0xFF35],
+  ["A3D6",0xFF36],
+  ["A3D7",0xFF37],
+  ["A3D8",0xFF38],
+  ["A3D9",0xFF39],
+  ["A3DA",0xFF3A],
+  ["A3DB",0xFF3B],
+  ["A3DC",0xFF3C],
+  ["A3DD",0xFF3D],
+  ["A3DE",0xFF3E],
+  ["A3DF",0xFF3F],
+  ["A3E0",0xFF40],
+  ["A3E1",0xFF41],
+  ["A3E2",0xFF42],
+  ["A3E3",0xFF43],
+  ["A3E4",0xFF44],
+  ["A3E5",0xFF45],
+  ["A3E6",0xFF46],
+  ["A3E7",0xFF47],
+  ["A3E8",0xFF48],
+  ["A3E9",0xFF49],
+  ["A3EA",0xFF4A],
+  ["A3EB",0xFF4B],
+  ["A3EC",0xFF4C],
+  ["A3ED",0xFF4D],
+  ["A3EE",0xFF4E],
+  ["A3EF",0xFF4F],
+  ["A3F0",0xFF50],
+  ["A3F1",0xFF51],
+  ["A3F2",0xFF52],
+  ["A3F3",0xFF53],
+  ["A3F4",0xFF54],
+  ["A3F5",0xFF55],
+  ["A3F6",0xFF56],
+  ["A3F7",0xFF57],
+  ["A3F8",0xFF58],
+  ["A3F9",0xFF59],
+  ["A3FA",0xFF5A],
+  ["A3FB",0xFF5B],
+  ["A3FC",0xFF5C],
+  ["A3FD",0xFF5D],
+  ["A1AB",0xFF5E],
+  ["84319535",0xFF5F],
+  ["84319536",0xFF60],
+  ["84319537",0xFF61],
+  ["84319538",0xFF62],
+  ["84319539",0xFF63],
+  ["84319630",0xFF64],
+  ["84319631",0xFF65],
+  ["84319632",0xFF66],
+  ["84319633",0xFF67],
+  ["84319634",0xFF68],
+  ["84319635",0xFF69],
+  ["84319636",0xFF6A],
+  ["84319637",0xFF6B],
+  ["84319638",0xFF6C],
+  ["84319639",0xFF6D],
+  ["84319730",0xFF6E],
+  ["84319731",0xFF6F],
+  ["84319732",0xFF70],
+  ["84319733",0xFF71],
+  ["84319734",0xFF72],
+  ["84319735",0xFF73],
+  ["84319736",0xFF74],
+  ["84319737",0xFF75],
+  ["84319738",0xFF76],
+  ["84319739",0xFF77],
+  ["84319830",0xFF78],
+  ["84319831",0xFF79],
+  ["84319832",0xFF7A],
+  ["84319833",0xFF7B],
+  ["84319834",0xFF7C],
+  ["84319835",0xFF7D],
+  ["84319836",0xFF7E],
+  ["84319837",0xFF7F],
+  ["84319838",0xFF80],
+  ["84319839",0xFF81],
+  ["84319930",0xFF82],
+  ["84319931",0xFF83],
+  ["84319932",0xFF84],
+  ["84319933",0xFF85],
+  ["84319934",0xFF86],
+  ["84319935",0xFF87],
+  ["84319936",0xFF88],
+  ["84319937",0xFF89],
+  ["84319938",0xFF8A],
+  ["84319939",0xFF8B],
+  ["84319A30",0xFF8C],
+  ["84319A31",0xFF8D],
+  ["84319A32",0xFF8E],
+  ["84319A33",0xFF8F],
+  ["84319A34",0xFF90],
+  ["84319A35",0xFF91],
+  ["84319A36",0xFF92],
+  ["84319A37",0xFF93],
+  ["84319A38",0xFF94],
+  ["84319A39",0xFF95],
+  ["84319B30",0xFF96],
+  ["84319B31",0xFF97],
+  ["84319B32",0xFF98],
+  ["84319B33",0xFF99],
+  ["84319B34",0xFF9A],
+  ["84319B35",0xFF9B],
+  ["84319B36",0xFF9C],
+  ["84319B37",0xFF9D],
+  ["84319B38",0xFF9E],
+  ["84319B39",0xFF9F],
+  ["84319C30",0xFFA0],
+  ["84319C31",0xFFA1],
+  ["84319C32",0xFFA2],
+  ["84319C33",0xFFA3],
+  ["84319C34",0xFFA4],
+  ["84319C35",0xFFA5],
+  ["84319C36",0xFFA6],
+  ["84319C37",0xFFA7],
+  ["84319C38",0xFFA8],
+  ["84319C39",0xFFA9],
+  ["84319D30",0xFFAA],
+  ["84319D31",0xFFAB],
+  ["84319D32",0xFFAC],
+  ["84319D33",0xFFAD],
+  ["84319D34",0xFFAE],
+  ["84319D35",0xFFAF],
+  ["84319D36",0xFFB0],
+  ["84319D37",0xFFB1],
+  ["84319D38",0xFFB2],
+  ["84319D39",0xFFB3],
+  ["84319E30",0xFFB4],
+  ["84319E31",0xFFB5],
+  ["84319E32",0xFFB6],
+  ["84319E33",0xFFB7],
+  ["84319E34",0xFFB8],
+  ["84319E35",0xFFB9],
+  ["84319E36",0xFFBA],
+  ["84319E37",0xFFBB],
+  ["84319E38",0xFFBC],
+  ["84319E39",0xFFBD],
+  ["84319F30",0xFFBE],
+  ["84319F31",0xFFBF],
+  ["84319F32",0xFFC0],
+  ["84319F33",0xFFC1],
+  ["84319F34",0xFFC2],
+  ["84319F35",0xFFC3],
+  ["84319F36",0xFFC4],
+  ["84319F37",0xFFC5],
+  ["84319F38",0xFFC6],
+  ["84319F39",0xFFC7],
+  ["8431A030",0xFFC8],
+  ["8431A031",0xFFC9],
+  ["8431A032",0xFFCA],
+  ["8431A033",0xFFCB],
+  ["8431A034",0xFFCC],
+  ["8431A035",0xFFCD],
+  ["8431A036",0xFFCE],
+  ["8431A037",0xFFCF],
+  ["8431A038",0xFFD0],
+  ["8431A039",0xFFD1],
+  ["8431A130",0xFFD2],
+  ["8431A131",0xFFD3],
+  ["8431A132",0xFFD4],
+  ["8431A133",0xFFD5],
+  ["8431A134",0xFFD6],
+  ["8431A135",0xFFD7],
+  ["8431A136",0xFFD8],
+  ["8431A137",0xFFD9],
+  ["8431A138",0xFFDA],
+  ["8431A139",0xFFDB],
+  ["8431A230",0xFFDC],
+  ["8431A231",0xFFDD],
+  ["8431A232",0xFFDE],
+  ["8431A233",0xFFDF],
+  ["A1E9",0xFFE0],
+  ["A1EA",0xFFE1],
+  ["A956",0xFFE2],
+  ["A3FE",0xFFE3],
+  ["A957",0xFFE4],
+  ["A3A4",0xFFE5],
+  ["8431A234",0xFFE6],
+  ["8431A235",0xFFE7],
+  ["8431A236",0xFFE8],
+  ["8431A237",0xFFE9],
+  ["8431A238",0xFFEA],
+  ["8431A239",0xFFEB],
+  ["8431A330",0xFFEC],
+  ["8431A331",0xFFED],
+  ["8431A332",0xFFEE],
+  ["8431A333",0xFFEF],
+  ["8431A334",0xFFF0],
+  ["8431A335",0xFFF1],
+  ["8431A336",0xFFF2],
+  ["8431A337",0xFFF3],
+  ["8431A338",0xFFF4],
+  ["8431A339",0xFFF5],
+  ["8431A430",0xFFF6],
+  ["8431A431",0xFFF7],
+  ["8431A432",0xFFF8],
+  ["8431A433",0xFFF9],
+  ["8431A434",0xFFFA],
+  ["8431A435",0xFFFB],
+  ["8431A436",0xFFFC],
+  ["8431A437",0xFFFD],
+  ["8431A438",0xFFFE],
+  ["8431A439",0xFFFF],
+]
diff --git a/enc/trans/gb18030.trans b/enc/trans/gb18030.trans
new file mode 100644
index 0000000000..c7da4c64b4
--- /dev/null
+++ b/enc/trans/gb18030.trans
@@ -0,0 +1,184 @@
+#include "transcode_data.h"
+
+<%
+  require "gb18030-tbl"
+  
+  def linear(code)
+    bytes = [code].pack('H8').unpack 'C4' 
+    ((bytes[0]*10+bytes[1])*126+bytes[2])*10+bytes[3]
+  end
+
+  def calculate_differences_gb_utf(table)
+    table.collect do |code|
+      code = code.dup
+      if code[0].length == 4
+        if code[1] < 0x800 # GB-18030: 2 bytes, UTF-8: 2 bytes
+          # do nothing
+        else # GB-18030: 2 bytes, UTF-8: 3 bytes
+          gb_linear2b = code[0].to_i(16)
+          diff2b = gb_linear2b - code[1] + 24055
+          code[1] = "funsio(#{diff2b})"
+        end
+      else
+        if code[1] < 0x800 # GB-18030: 4 bytes, UTF-8: 2 bytes
+          # do nothing
+        else # GB-18030: 4 bytes, UTF-8: 3 bytes
+          gb_linear4b = linear(code[0])
+          diff4b = gb_linear4b - code[1] - 0x170000
+          code[1] = "funsio(#{diff4b})"
+        end
+      end
+      code
+    end
+  end
+  
+  def calculate_differences_utf_gb(table)
+    table_rev = table.map{|a,b| [b,a]}
+    table_rev.collect do |code|
+      code = code.dup
+      if code[0] >= 0x800
+        if code[1].length == 4 #GB18030 2byte UTF-8 3byte
+          gb_linear2b = code[1].to_i(16)
+          diff2b = gb_linear2b - code[0] + 24055
+          code[1] = "funsio(#{diff2b})"
+        else # GB-18030: 4 bytes, UTF-8: 3 bytes
+          gb_linear4b = linear(code[1])
+          diff4b = gb_linear4b - code[0] - 0x170000
+          code[1] = "funsio(#{diff4b})"
+        end
+      end
+      code
+    end
+  end
+
+  transcode_tbl_only "GB18030", "UTF-8", [["{00-7f}", :nomap]] +
+                                         calculate_differences_gb_utf(GB18030_TO_UCS_TBL) + [
+                                        ["{90-e2}{30-39}{81-fe}{30-39}", :func_so],
+                                        ["e3{30-31}{81-fe}{30-39}", :func_so],
+                                        ["e332{81-99}{30-39}", :func_so],
+                                        ["e3329a{30-35}", :func_so],   #  "E3329A35" is U+10FFFF
+                                       ]
+  transcode_tbl_only "UTF-8", "GB18030", [["{00-7f}", :nomap]] +
+                                        calculate_differences_utf_gb(GB18030_TO_UCS_TBL) + [
+                                        ["f0{90-bf}{80-bf}{80-bf}", :func_so],
+                                        ["{f1-f3}{80-bf}{80-bf}{80-bf}", :func_so],
+                                        ["f4{80-8f}{80-bf}{80-bf}", :func_so]
+                                       ]
+%>
+
+<%= transcode_generated_code %>
+
+/* GB18030 4byte, UTF-8 4byte*/
+static ssize_t
+fun_so_from_gb18030(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    /* outside BMP only */
+    /* u: Unicode Scalar Value */
+    unsigned int u = (s[0]-0x90)*10*126*10 + (s[1]-0x30)*126*10 + (s[2]-0x81)*10 + (s[3]-0x30) + 0x10000;
+    o[0] = 0xF0 | (u>>18);
+    o[1] = 0x80 | ((u>>12)&0x3F);
+    o[2] = 0x80 | ((u>>6)&0x3F);
+    o[3] = 0x80 | (u&0x3F);
+    return 4;
+}
+
+/* GB18030 4byte, UTF-8 4byte*/
+static ssize_t
+fun_so_to_gb18030(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    /* outside BMP only */
+    /* u: Unicode Scalar Value */
+    unsigned int u = ((s[0]&0x07)<<18) | ((s[1]&0x3F)<<12) | ((s[2]&0x3F)<<6) | (s[3]&0x3F);
+    u -= 0x10000;
+    o[3] = 0x30 + u%10;
+    u /= 10;
+    o[2] = 0x81 + u%126;
+    u /= 126;
+    o[1] = 0x30 + u%10;
+    o[0] = 0x90 + u/10;
+    return 4;
+}
+
+/* GB18030 2byte, UTF-8 3byte and GB18030 4byte, UTF-8 3byte*/
+static ssize_t
+fun_sio_from_gb18030(void *statep, const unsigned char *s, size_t l, VALUE info, unsigned char *o, size_t osize)
+{
+    unsigned int diff = (unsigned int)(info >> 8);
+    unsigned int u;    /* Unicode Scalar Value */
+    if (diff & 0x20000) { /* GB18030 4 bytes */
+        u = ((s[0]*10+s[1])*126+s[2])*10+s[3] - diff - 0x170000;
+    }
+    else { /* GB18030 2 bytes */
+        u = s[0]*256 + s[1] + 24055 - diff;
+    }
+    o[0] = 0xE0 | (u>>12);
+    o[1] = 0x80 | ((u>>6)&0x3F);
+    o[2] = 0x80 | (u&0x3F);
+    return 3;
+}
+
+/* GB18030 2byte, UTF-8 3byte and GB18030 4byte, UTF-8 3byte*/
+static ssize_t
+fun_sio_to_gb18030(void *statep, const unsigned char *s, size_t l, VALUE info, unsigned char *o, size_t osize)
+{
+    unsigned int diff = (unsigned int)(info >> 8);
+    unsigned int u;    /* Unicode Scalar Value */
+    
+    u = ((s[0]&0x0F)<<12) | ((s[1]&0x3F)<<6) | (s[2]&0x3F);
+
+    if (diff & 0x20000) { /* GB18030 4 bytes */
+        u += (diff + 0x170000);
+	u -= 1688980;
+	u += 0x2;
+        o[3] = 0x30 + u%10;
+        u /= 10;
+        u += 0x32;
+        o[2] = 0x81 + u%126;
+        u /= 126;
+        u += 0x1;
+        o[1] = 0x30 + u%10;
+        u /= 10;
+        o[0] = 0x81 + u;
+	return 4;
+    }
+    else { /* GB18030 2 bytes */
+        u += (diff - 24055);
+	o[1] = u%256;
+	o[0] = u/256;
+	return 2;
+    }
+}
+
+
+static const rb_transcoder
+rb_from_GB18030 = {
+    "GB18030", "UTF-8", from_GB18030,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_from_gb18030,
+    NULL, NULL, NULL, fun_sio_from_gb18030
+};
+static const rb_transcoder
+rb_to_GB18030 = {
+    "UTF-8", "GB18030", to_GB18030,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_to_gb18030,
+    NULL, NULL, NULL, fun_sio_to_gb18030
+};
+
+
+void
+Init_gb18030(void)
+{
+    rb_register_transcoder(&rb_from_GB18030);
+    rb_register_transcoder(&rb_to_GB18030);
+}
diff --git a/enc/trans/gbk-tbl.rb b/enc/trans/gbk-tbl.rb
new file mode 100644
index 0000000000..5b4374bb61
--- /dev/null
+++ b/enc/trans/gbk-tbl.rb
@@ -0,0 +1,21793 @@
+GBK_TO_UCS_TBL= [
+  ["A1E8",0xA4],
+  ["A1EC",0xA7],
+  ["A1A7",0xA8],
+  ["A1E3",0xB0],
+  ["A1C0",0xB1],
+  ["A1A4",0xB7],
+  ["A1C1",0xD7],
+  ["A8A4",0xE0],
+  ["A8A2",0xE1],
+  ["A8A8",0xE8],
+  ["A8A6",0xE9],
+  ["A8BA",0xEA],
+  ["A8AC",0xEC],
+  ["A8AA",0xED],
+  ["A8B0",0xF2],
+  ["A8AE",0xF3],
+  ["A1C2",0xF7],
+  ["A8B4",0xF9],
+  ["A8B2",0xFA],
+  ["A8B9",0xFC],
+  ["A8A1",0x101],
+  ["A8A5",0x113],
+  ["A8A7",0x11B],
+  ["A8A9",0x12B],
+  ["A8BD",0x144],
+  ["A8BE",0x148],
+  ["A8AD",0x14D],
+  ["A8B1",0x16B],
+  ["A8A3",0x1CE],
+  ["A8AB",0x1D0],
+  ["A8AF",0x1D2],
+  ["A8B3",0x1D4],
+  ["A8B5",0x1D6],
+  ["A8B6",0x1D8],
+  ["A8B7",0x1DA],
+  ["A8B8",0x1DC],
+  ["A8BB",0x251],
+  ["A8C0",0x261],
+  ["A1A6",0x2C7],
+  ["A1A5",0x2C9],
+  ["A840",0x2CA],
+  ["A841",0x2CB],
+  ["A842",0x2D9],
+  ["A6A1",0x391],
+  ["A6A2",0x392],
+  ["A6A3",0x393],
+  ["A6A4",0x394],
+  ["A6A5",0x395],
+  ["A6A6",0x396],
+  ["A6A7",0x397],
+  ["A6A8",0x398],
+  ["A6A9",0x399],
+  ["A6AA",0x39A],
+  ["A6AB",0x39B],
+  ["A6AC",0x39C],
+  ["A6AD",0x39D],
+  ["A6AE",0x39E],
+  ["A6AF",0x39F],
+  ["A6B0",0x3A0],
+  ["A6B1",0x3A1],
+  ["A6B2",0x3A3],
+  ["A6B3",0x3A4],
+  ["A6B4",0x3A5],
+  ["A6B5",0x3A6],
+  ["A6B6",0x3A7],
+  ["A6B7",0x3A8],
+  ["A6B8",0x3A9],
+  ["A6C1",0x3B1],
+  ["A6C2",0x3B2],
+  ["A6C3",0x3B3],
+  ["A6C4",0x3B4],
+  ["A6C5",0x3B5],
+  ["A6C6",0x3B6],
+  ["A6C7",0x3B7],
+  ["A6C8",0x3B8],
+  ["A6C9",0x3B9],
+  ["A6CA",0x3BA],
+  ["A6CB",0x3BB],
+  ["A6CC",0x3BC],
+  ["A6CD",0x3BD],
+  ["A6CE",0x3BE],
+  ["A6CF",0x3BF],
+  ["A6D0",0x3C0],
+  ["A6D1",0x3C1],
+  ["A6D2",0x3C3],
+  ["A6D3",0x3C4],
+  ["A6D4",0x3C5],
+  ["A6D5",0x3C6],
+  ["A6D6",0x3C7],
+  ["A6D7",0x3C8],
+  ["A6D8",0x3C9],
+  ["A7A7",0x401],
+  ["A7A1",0x410],
+  ["A7A2",0x411],
+  ["A7A3",0x412],
+  ["A7A4",0x413],
+  ["A7A5",0x414],
+  ["A7A6",0x415],
+  ["A7A8",0x416],
+  ["A7A9",0x417],
+  ["A7AA",0x418],
+  ["A7AB",0x419],
+  ["A7AC",0x41A],
+  ["A7AD",0x41B],
+  ["A7AE",0x41C],
+  ["A7AF",0x41D],
+  ["A7B0",0x41E],
+  ["A7B1",0x41F],
+  ["A7B2",0x420],
+  ["A7B3",0x421],
+  ["A7B4",0x422],
+  ["A7B5",0x423],
+  ["A7B6",0x424],
+  ["A7B7",0x425],
+  ["A7B8",0x426],
+  ["A7B9",0x427],
+  ["A7BA",0x428],
+  ["A7BB",0x429],
+  ["A7BC",0x42A],
+  ["A7BD",0x42B],
+  ["A7BE",0x42C],
+  ["A7BF",0x42D],
+  ["A7C0",0x42E],
+  ["A7C1",0x42F],
+  ["A7D1",0x430],
+  ["A7D2",0x431],
+  ["A7D3",0x432],
+  ["A7D4",0x433],
+  ["A7D5",0x434],
+  ["A7D6",0x435],
+  ["A7D8",0x436],
+  ["A7D9",0x437],
+  ["A7DA",0x438],
+  ["A7DB",0x439],
+  ["A7DC",0x43A],
+  ["A7DD",0x43B],
+  ["A7DE",0x43C],
+  ["A7DF",0x43D],
+  ["A7E0",0x43E],
+  ["A7E1",0x43F],
+  ["A7E2",0x440],
+  ["A7E3",0x441],
+  ["A7E4",0x442],
+  ["A7E5",0x443],
+  ["A7E6",0x444],
+  ["A7E7",0x445],
+  ["A7E8",0x446],
+  ["A7E9",0x447],
+  ["A7EA",0x448],
+  ["A7EB",0x449],
+  ["A7EC",0x44A],
+  ["A7ED",0x44B],
+  ["A7EE",0x44C],
+  ["A7EF",0x44D],
+  ["A7F0",0x44E],
+  ["A7F1",0x44F],
+  ["A7D7",0x451],
+  ["A95C",0x2010],
+  ["A843",0x2013],
+  ["A1AA",0x2014],
+  ["A844",0x2015],
+  ["A1AC",0x2016],
+  ["A1AE",0x2018],
+  ["A1AF",0x2019],
+  ["A1B0",0x201C],
+  ["A1B1",0x201D],
+  ["A845",0x2025],
+  ["A1AD",0x2026],
+  ["A1EB",0x2030],
+  ["A1E4",0x2032],
+  ["A1E5",0x2033],
+  ["A846",0x2035],
+  ["A1F9",0x203B],
+  ["A1E6",0x2103],
+  ["A847",0x2105],
+  ["A848",0x2109],
+  ["A1ED",0x2116],
+  ["A959",0x2121],
+  ["A2F1",0x2160],
+  ["A2F2",0x2161],
+  ["A2F3",0x2162],
+  ["A2F4",0x2163],
+  ["A2F5",0x2164],
+  ["A2F6",0x2165],
+  ["A2F7",0x2166],
+  ["A2F8",0x2167],
+  ["A2F9",0x2168],
+  ["A2FA",0x2169],
+  ["A2FB",0x216A],
+  ["A2FC",0x216B],
+  ["A2A1",0x2170],
+  ["A2A2",0x2171],
+  ["A2A3",0x2172],
+  ["A2A4",0x2173],
+  ["A2A5",0x2174],
+  ["A2A6",0x2175],
+  ["A2A7",0x2176],
+  ["A2A8",0x2177],
+  ["A2A9",0x2178],
+  ["A2AA",0x2179],
+  ["A1FB",0x2190],
+  ["A1FC",0x2191],
+  ["A1FA",0x2192],
+  ["A1FD",0x2193],
+  ["A849",0x2196],
+  ["A84A",0x2197],
+  ["A84B",0x2198],
+  ["A84C",0x2199],
+  ["A1CA",0x2208],
+  ["A1C7",0x220F],
+  ["A1C6",0x2211],
+  ["A84D",0x2215],
+  ["A1CC",0x221A],
+  ["A1D8",0x221D],
+  ["A1DE",0x221E],
+  ["A84E",0x221F],
+  ["A1CF",0x2220],
+  ["A84F",0x2223],
+  ["A1CE",0x2225],
+  ["A1C4",0x2227],
+  ["A1C5",0x2228],
+  ["A1C9",0x2229],
+  ["A1C8",0x222A],
+  ["A1D2",0x222B],
+  ["A1D3",0x222E],
+  ["A1E0",0x2234],
+  ["A1DF",0x2235],
+  ["A1C3",0x2236],
+  ["A1CB",0x2237],
+  ["A1D7",0x223D],
+  ["A1D6",0x2248],
+  ["A1D5",0x224C],
+  ["A850",0x2252],
+  ["A1D9",0x2260],
+  ["A1D4",0x2261],
+  ["A1DC",0x2264],
+  ["A1DD",0x2265],
+  ["A851",0x2266],
+  ["A852",0x2267],
+  ["A1DA",0x226E],
+  ["A1DB",0x226F],
+  ["A892",0x2295],
+  ["A1D1",0x2299],
+  ["A1CD",0x22A5],
+  ["A853",0x22BF],
+  ["A1D0",0x2312],
+  ["A2D9",0x2460],
+  ["A2DA",0x2461],
+  ["A2DB",0x2462],
+  ["A2DC",0x2463],
+  ["A2DD",0x2464],
+  ["A2DE",0x2465],
+  ["A2DF",0x2466],
+  ["A2E0",0x2467],
+  ["A2E1",0x2468],
+  ["A2E2",0x2469],
+  ["A2C5",0x2474],
+  ["A2C6",0x2475],
+  ["A2C7",0x2476],
+  ["A2C8",0x2477],
+  ["A2C9",0x2478],
+  ["A2CA",0x2479],
+  ["A2CB",0x247A],
+  ["A2CC",0x247B],
+  ["A2CD",0x247C],
+  ["A2CE",0x247D],
+  ["A2CF",0x247E],
+  ["A2D0",0x247F],
+  ["A2D1",0x2480],
+  ["A2D2",0x2481],
+  ["A2D3",0x2482],
+  ["A2D4",0x2483],
+  ["A2D5",0x2484],
+  ["A2D6",0x2485],
+  ["A2D7",0x2486],
+  ["A2D8",0x2487],
+  ["A2B1",0x2488],
+  ["A2B2",0x2489],
+  ["A2B3",0x248A],
+  ["A2B4",0x248B],
+  ["A2B5",0x248C],
+  ["A2B6",0x248D],
+  ["A2B7",0x248E],
+  ["A2B8",0x248F],
+  ["A2B9",0x2490],
+  ["A2BA",0x2491],
+  ["A2BB",0x2492],
+  ["A2BC",0x2493],
+  ["A2BD",0x2494],
+  ["A2BE",0x2495],
+  ["A2BF",0x2496],
+  ["A2C0",0x2497],
+  ["A2C1",0x2498],
+  ["A2C2",0x2499],
+  ["A2C3",0x249A],
+  ["A2C4",0x249B],
+  ["A9A4",0x2500],
+  ["A9A5",0x2501],
+  ["A9A6",0x2502],
+  ["A9A7",0x2503],
+  ["A9A8",0x2504],
+  ["A9A9",0x2505],
+  ["A9AA",0x2506],
+  ["A9AB",0x2507],
+  ["A9AC",0x2508],
+  ["A9AD",0x2509],
+  ["A9AE",0x250A],
+  ["A9AF",0x250B],
+  ["A9B0",0x250C],
+  ["A9B1",0x250D],
+  ["A9B2",0x250E],
+  ["A9B3",0x250F],
+  ["A9B4",0x2510],
+  ["A9B5",0x2511],
+  ["A9B6",0x2512],
+  ["A9B7",0x2513],
+  ["A9B8",0x2514],
+  ["A9B9",0x2515],
+  ["A9BA",0x2516],
+  ["A9BB",0x2517],
+  ["A9BC",0x2518],
+  ["A9BD",0x2519],
+  ["A9BE",0x251A],
+  ["A9BF",0x251B],
+  ["A9C0",0x251C],
+  ["A9C1",0x251D],
+  ["A9C2",0x251E],
+  ["A9C3",0x251F],
+  ["A9C4",0x2520],
+  ["A9C5",0x2521],
+  ["A9C6",0x2522],
+  ["A9C7",0x2523],
+  ["A9C8",0x2524],
+  ["A9C9",0x2525],
+  ["A9CA",0x2526],
+  ["A9CB",0x2527],
+  ["A9CC",0x2528],
+  ["A9CD",0x2529],
+  ["A9CE",0x252A],
+  ["A9CF",0x252B],
+  ["A9D0",0x252C],
+  ["A9D1",0x252D],
+  ["A9D2",0x252E],
+  ["A9D3",0x252F],
+  ["A9D4",0x2530],
+  ["A9D5",0x2531],
+  ["A9D6",0x2532],
+  ["A9D7",0x2533],
+  ["A9D8",0x2534],
+  ["A9D9",0x2535],
+  ["A9DA",0x2536],
+  ["A9DB",0x2537],
+  ["A9DC",0x2538],
+  ["A9DD",0x2539],
+  ["A9DE",0x253A],
+  ["A9DF",0x253B],
+  ["A9E0",0x253C],
+  ["A9E1",0x253D],
+  ["A9E2",0x253E],
+  ["A9E3",0x253F],
+  ["A9E4",0x2540],
+  ["A9E5",0x2541],
+  ["A9E6",0x2542],
+  ["A9E7",0x2543],
+  ["A9E8",0x2544],
+  ["A9E9",0x2545],
+  ["A9EA",0x2546],
+  ["A9EB",0x2547],
+  ["A9EC",0x2548],
+  ["A9ED",0x2549],
+  ["A9EE",0x254A],
+  ["A9EF",0x254B],
+  ["A854",0x2550],
+  ["A855",0x2551],
+  ["A856",0x2552],
+  ["A857",0x2553],
+  ["A858",0x2554],
+  ["A859",0x2555],
+  ["A85A",0x2556],
+  ["A85B",0x2557],
+  ["A85C",0x2558],
+  ["A85D",0x2559],
+  ["A85E",0x255A],
+  ["A85F",0x255B],
+  ["A860",0x255C],
+  ["A861",0x255D],
+  ["A862",0x255E],
+  ["A863",0x255F],
+  ["A864",0x2560],
+  ["A865",0x2561],
+  ["A866",0x2562],
+  ["A867",0x2563],
+  ["A868",0x2564],
+  ["A869",0x2565],
+  ["A86A",0x2566],
+  ["A86B",0x2567],
+  ["A86C",0x2568],
+  ["A86D",0x2569],
+  ["A86E",0x256A],
+  ["A86F",0x256B],
+  ["A870",0x256C],
+  ["A871",0x256D],
+  ["A872",0x256E],
+  ["A873",0x256F],
+  ["A874",0x2570],
+  ["A875",0x2571],
+  ["A876",0x2572],
+  ["A877",0x2573],
+  ["A878",0x2581],
+  ["A879",0x2582],
+  ["A87A",0x2583],
+  ["A87B",0x2584],
+  ["A87C",0x2585],
+  ["A87D",0x2586],
+  ["A87E",0x2587],
+  ["A880",0x2588],
+  ["A881",0x2589],
+  ["A882",0x258A],
+  ["A883",0x258B],
+  ["A884",0x258C],
+  ["A885",0x258D],
+  ["A886",0x258E],
+  ["A887",0x258F],
+  ["A888",0x2593],
+  ["A889",0x2594],
+  ["A88A",0x2595],
+  ["A1F6",0x25A0],
+  ["A1F5",0x25A1],
+  ["A1F8",0x25B2],
+  ["A1F7",0x25B3],
+  ["A88B",0x25BC],
+  ["A88C",0x25BD],
+  ["A1F4",0x25C6],
+  ["A1F3",0x25C7],
+  ["A1F0",0x25CB],
+  ["A1F2",0x25CE],
+  ["A1F1",0x25CF],
+  ["A88D",0x25E2],
+  ["A88E",0x25E3],
+  ["A88F",0x25E4],
+  ["A890",0x25E5],
+  ["A1EF",0x2605],
+  ["A1EE",0x2606],
+  ["A891",0x2609],
+  ["A1E2",0x2640],
+  ["A1E1",0x2642],
+  ["A1A1",0x3000],
+  ["A1A2",0x3001],
+  ["A1A3",0x3002],
+  ["A1A8",0x3003],
+  ["A1A9",0x3005],
+  ["A965",0x3006],
+  ["A996",0x3007],
+  ["A1B4",0x3008],
+  ["A1B5",0x3009],
+  ["A1B6",0x300A],
+  ["A1B7",0x300B],
+  ["A1B8",0x300C],
+  ["A1B9",0x300D],
+  ["A1BA",0x300E],
+  ["A1BB",0x300F],
+  ["A1BE",0x3010],
+  ["A1BF",0x3011],
+  ["A893",0x3012],
+  ["A1FE",0x3013],
+  ["A1B2",0x3014],
+  ["A1B3",0x3015],
+  ["A1BC",0x3016],
+  ["A1BD",0x3017],
+  ["A894",0x301D],
+  ["A895",0x301E],
+  ["A940",0x3021],
+  ["A941",0x3022],
+  ["A942",0x3023],
+  ["A943",0x3024],
+  ["A944",0x3025],
+  ["A945",0x3026],
+  ["A946",0x3027],
+  ["A947",0x3028],
+  ["A948",0x3029],
+  ["A4A1",0x3041],
+  ["A4A2",0x3042],
+  ["A4A3",0x3043],
+  ["A4A4",0x3044],
+  ["A4A5",0x3045],
+  ["A4A6",0x3046],
+  ["A4A7",0x3047],
+  ["A4A8",0x3048],
+  ["A4A9",0x3049],
+  ["A4AA",0x304A],
+  ["A4AB",0x304B],
+  ["A4AC",0x304C],
+  ["A4AD",0x304D],
+  ["A4AE",0x304E],
+  ["A4AF",0x304F],
+  ["A4B0",0x3050],
+  ["A4B1",0x3051],
+  ["A4B2",0x3052],
+  ["A4B3",0x3053],
+  ["A4B4",0x3054],
+  ["A4B5",0x3055],
+  ["A4B6",0x3056],
+  ["A4B7",0x3057],
+  ["A4B8",0x3058],
+  ["A4B9",0x3059],
+  ["A4BA",0x305A],
+  ["A4BB",0x305B],
+  ["A4BC",0x305C],
+  ["A4BD",0x305D],
+  ["A4BE",0x305E],
+  ["A4BF",0x305F],
+  ["A4C0",0x3060],
+  ["A4C1",0x3061],
+  ["A4C2",0x3062],
+  ["A4C3",0x3063],
+  ["A4C4",0x3064],
+  ["A4C5",0x3065],
+  ["A4C6",0x3066],
+  ["A4C7",0x3067],
+  ["A4C8",0x3068],
+  ["A4C9",0x3069],
+  ["A4CA",0x306A],
+  ["A4CB",0x306B],
+  ["A4CC",0x306C],
+  ["A4CD",0x306D],
+  ["A4CE",0x306E],
+  ["A4CF",0x306F],
+  ["A4D0",0x3070],
+  ["A4D1",0x3071],
+  ["A4D2",0x3072],
+  ["A4D3",0x3073],
+  ["A4D4",0x3074],
+  ["A4D5",0x3075],
+  ["A4D6",0x3076],
+  ["A4D7",0x3077],
+  ["A4D8",0x3078],
+  ["A4D9",0x3079],
+  ["A4DA",0x307A],
+  ["A4DB",0x307B],
+  ["A4DC",0x307C],
+  ["A4DD",0x307D],
+  ["A4DE",0x307E],
+  ["A4DF",0x307F],
+  ["A4E0",0x3080],
+  ["A4E1",0x3081],
+  ["A4E2",0x3082],
+  ["A4E3",0x3083],
+  ["A4E4",0x3084],
+  ["A4E5",0x3085],
+  ["A4E6",0x3086],
+  ["A4E7",0x3087],
+  ["A4E8",0x3088],
+  ["A4E9",0x3089],
+  ["A4EA",0x308A],
+  ["A4EB",0x308B],
+  ["A4EC",0x308C],
+  ["A4ED",0x308D],
+  ["A4EE",0x308E],
+  ["A4EF",0x308F],
+  ["A4F0",0x3090],
+  ["A4F1",0x3091],
+  ["A4F2",0x3092],
+  ["A4F3",0x3093],
+  ["A961",0x309B],
+  ["A962",0x309C],
+  ["A966",0x309D],
+  ["A967",0x309E],
+  ["A5A1",0x30A1],
+  ["A5A2",0x30A2],
+  ["A5A3",0x30A3],
+  ["A5A4",0x30A4],
+  ["A5A5",0x30A5],
+  ["A5A6",0x30A6],
+  ["A5A7",0x30A7],
+  ["A5A8",0x30A8],
+  ["A5A9",0x30A9],
+  ["A5AA",0x30AA],
+  ["A5AB",0x30AB],
+  ["A5AC",0x30AC],
+  ["A5AD",0x30AD],
+  ["A5AE",0x30AE],
+  ["A5AF",0x30AF],
+  ["A5B0",0x30B0],
+  ["A5B1",0x30B1],
+  ["A5B2",0x30B2],
+  ["A5B3",0x30B3],
+  ["A5B4",0x30B4],
+  ["A5B5",0x30B5],
+  ["A5B6",0x30B6],
+  ["A5B7",0x30B7],
+  ["A5B8",0x30B8],
+  ["A5B9",0x30B9],
+  ["A5BA",0x30BA],
+  ["A5BB",0x30BB],
+  ["A5BC",0x30BC],
+  ["A5BD",0x30BD],
+  ["A5BE",0x30BE],
+  ["A5BF",0x30BF],
+  ["A5C0",0x30C0],
+  ["A5C1",0x30C1],
+  ["A5C2",0x30C2],
+  ["A5C3",0x30C3],
+  ["A5C4",0x30C4],
+  ["A5C5",0x30C5],
+  ["A5C6",0x30C6],
+  ["A5C7",0x30C7],
+  ["A5C8",0x30C8],
+  ["A5C9",0x30C9],
+  ["A5CA",0x30CA],
+  ["A5CB",0x30CB],
+  ["A5CC",0x30CC],
+  ["A5CD",0x30CD],
+  ["A5CE",0x30CE],
+  ["A5CF",0x30CF],
+  ["A5D0",0x30D0],
+  ["A5D1",0x30D1],
+  ["A5D2",0x30D2],
+  ["A5D3",0x30D3],
+  ["A5D4",0x30D4],
+  ["A5D5",0x30D5],
+  ["A5D6",0x30D6],
+  ["A5D7",0x30D7],
+  ["A5D8",0x30D8],
+  ["A5D9",0x30D9],
+  ["A5DA",0x30DA],
+  ["A5DB",0x30DB],
+  ["A5DC",0x30DC],
+  ["A5DD",0x30DD],
+  ["A5DE",0x30DE],
+  ["A5DF",0x30DF],
+  ["A5E0",0x30E0],
+  ["A5E1",0x30E1],
+  ["A5E2",0x30E2],
+  ["A5E3",0x30E3],
+  ["A5E4",0x30E4],
+  ["A5E5",0x30E5],
+  ["A5E6",0x30E6],
+  ["A5E7",0x30E7],
+  ["A5E8",0x30E8],
+  ["A5E9",0x30E9],
+  ["A5EA",0x30EA],
+  ["A5EB",0x30EB],
+  ["A5EC",0x30EC],
+  ["A5ED",0x30ED],
+  ["A5EE",0x30EE],
+  ["A5EF",0x30EF],
+  ["A5F0",0x30F0],
+  ["A5F1",0x30F1],
+  ["A5F2",0x30F2],
+  ["A5F3",0x30F3],
+  ["A5F4",0x30F4],
+  ["A5F5",0x30F5],
+  ["A5F6",0x30F6],
+  ["A960",0x30FC],
+  ["A963",0x30FD],
+  ["A964",0x30FE],
+  ["A8C5",0x3105],
+  ["A8C6",0x3106],
+  ["A8C7",0x3107],
+  ["A8C8",0x3108],
+  ["A8C9",0x3109],
+  ["A8CA",0x310A],
+  ["A8CB",0x310B],
+  ["A8CC",0x310C],
+  ["A8CD",0x310D],
+  ["A8CE",0x310E],
+  ["A8CF",0x310F],
+  ["A8D0",0x3110],
+  ["A8D1",0x3111],
+  ["A8D2",0x3112],
+  ["A8D3",0x3113],
+  ["A8D4",0x3114],
+  ["A8D5",0x3115],
+  ["A8D6",0x3116],
+  ["A8D7",0x3117],
+  ["A8D8",0x3118],
+  ["A8D9",0x3119],
+  ["A8DA",0x311A],
+  ["A8DB",0x311B],
+  ["A8DC",0x311C],
+  ["A8DD",0x311D],
+  ["A8DE",0x311E],
+  ["A8DF",0x311F],
+  ["A8E0",0x3120],
+  ["A8E1",0x3121],
+  ["A8E2",0x3122],
+  ["A8E3",0x3123],
+  ["A8E4",0x3124],
+  ["A8E5",0x3125],
+  ["A8E6",0x3126],
+  ["A8E7",0x3127],
+  ["A8E8",0x3128],
+  ["A8E9",0x3129],
+  ["A2E5",0x3220],
+  ["A2E6",0x3221],
+  ["A2E7",0x3222],
+  ["A2E8",0x3223],
+  ["A2E9",0x3224],
+  ["A2EA",0x3225],
+  ["A2EB",0x3226],
+  ["A2EC",0x3227],
+  ["A2ED",0x3228],
+  ["A2EE",0x3229],
+  ["A95A",0x3231],
+  ["A949",0x32A3],
+  ["A94A",0x338E],
+  ["A94B",0x338F],
+  ["A94C",0x339C],
+  ["A94D",0x339D],
+  ["A94E",0x339E],
+  ["A94F",0x33A1],
+  ["A950",0x33C4],
+  ["A951",0x33CE],
+  ["A952",0x33D1],
+  ["A953",0x33D2],
+  ["A954",0x33D5],
+  ["D2BB",0x4E00],
+  ["B6A1",0x4E01],
+  ["8140",0x4E02],
+  ["C6DF",0x4E03],
+  ["8141",0x4E04],
+  ["8142",0x4E05],
+  ["8143",0x4E06],
+  ["CDF2",0x4E07],
+  ["D5C9",0x4E08],
+  ["C8FD",0x4E09],
+  ["C9CF",0x4E0A],
+  ["CFC2",0x4E0B],
+  ["D8A2",0x4E0C],
+  ["B2BB",0x4E0D],
+  ["D3EB",0x4E0E],
+  ["8144",0x4E0F],
+  ["D8A4",0x4E10],
+  ["B3F3",0x4E11],
+  ["8145",0x4E12],
+  ["D7A8",0x4E13],
+  ["C7D2",0x4E14],
+  ["D8A7",0x4E15],
+  ["CAC0",0x4E16],
+  ["8146",0x4E17],
+  ["C7F0",0x4E18],
+  ["B1FB",0x4E19],
+  ["D2B5",0x4E1A],
+  ["B4D4",0x4E1B],
+  ["B6AB",0x4E1C],
+  ["CBBF",0x4E1D],
+  ["D8A9",0x4E1E],
+  ["8147",0x4E1F],
+  ["8148",0x4E20],
+  ["8149",0x4E21],
+  ["B6AA",0x4E22],
+  ["814A",0x4E23],
+  ["C1BD",0x4E24],
+  ["D1CF",0x4E25],
+  ["814B",0x4E26],
+  ["C9A5",0x4E27],
+  ["D8AD",0x4E28],
+  ["814C",0x4E29],
+  ["B8F6",0x4E2A],
+  ["D1BE",0x4E2B],
+  ["E3DC",0x4E2C],
+  ["D6D0",0x4E2D],
+  ["814D",0x4E2E],
+  ["814E",0x4E2F],
+  ["B7E1",0x4E30],
+  ["814F",0x4E31],
+  ["B4AE",0x4E32],
+  ["8150",0x4E33],
+  ["C1D9",0x4E34],
+  ["8151",0x4E35],
+  ["D8BC",0x4E36],
+  ["8152",0x4E37],
+  ["CDE8",0x4E38],
+  ["B5A4",0x4E39],
+  ["CEAA",0x4E3A],
+  ["D6F7",0x4E3B],
+  ["8153",0x4E3C],
+  ["C0F6",0x4E3D],
+  ["BED9",0x4E3E],
+  ["D8AF",0x4E3F],
+  ["8154",0x4E40],
+  ["8155",0x4E41],
+  ["8156",0x4E42],
+  ["C4CB",0x4E43],
+  ["8157",0x4E44],
+  ["BEC3",0x4E45],
+  ["8158",0x4E46],
+  ["D8B1",0x4E47],
+  ["C3B4",0x4E48],
+  ["D2E5",0x4E49],
+  ["8159",0x4E4A],
+  ["D6AE",0x4E4B],
+  ["CEDA",0x4E4C],
+  ["D5A7",0x4E4D],
+  ["BAF5",0x4E4E],
+  ["B7A6",0x4E4F],
+  ["C0D6",0x4E50],
+  ["815A",0x4E51],
+  ["C6B9",0x4E52],
+  ["C5D2",0x4E53],
+  ["C7C7",0x4E54],
+  ["815B",0x4E55],
+  ["B9D4",0x4E56],
+  ["815C",0x4E57],
+  ["B3CB",0x4E58],
+  ["D2D2",0x4E59],
+  ["815D",0x4E5A],
+  ["815E",0x4E5B],
+  ["D8BF",0x4E5C],
+  ["BEC5",0x4E5D],
+  ["C6F2",0x4E5E],
+  ["D2B2",0x4E5F],
+  ["CFB0",0x4E60],
+  ["CFE7",0x4E61],
+  ["815F",0x4E62],
+  ["8160",0x4E63],
+  ["8161",0x4E64],
+  ["8162",0x4E65],
+  ["CAE9",0x4E66],
+  ["8163",0x4E67],
+  ["8164",0x4E68],
+  ["D8C0",0x4E69],
+  ["8165",0x4E6A],
+  ["8166",0x4E6B],
+  ["8167",0x4E6C],
+  ["8168",0x4E6D],
+  ["8169",0x4E6E],
+  ["816A",0x4E6F],
+  ["C2F2",0x4E70],
+  ["C2D2",0x4E71],
+  ["816B",0x4E72],
+  ["C8E9",0x4E73],
+  ["816C",0x4E74],
+  ["816D",0x4E75],
+  ["816E",0x4E76],
+  ["816F",0x4E77],
+  ["8170",0x4E78],
+  ["8171",0x4E79],
+  ["8172",0x4E7A],
+  ["8173",0x4E7B],
+  ["8174",0x4E7C],
+  ["8175",0x4E7D],
+  ["C7AC",0x4E7E],
+  ["8176",0x4E7F],
+  ["8177",0x4E80],
+  ["8178",0x4E81],
+  ["8179",0x4E82],
+  ["817A",0x4E83],
+  ["817B",0x4E84],
+  ["817C",0x4E85],
+  ["C1CB",0x4E86],
+  ["817D",0x4E87],
+  ["D3E8",0x4E88],
+  ["D5F9",0x4E89],
+  ["817E",0x4E8A],
+  ["CAC2",0x4E8B],
+  ["B6FE",0x4E8C],
+  ["D8A1",0x4E8D],
+  ["D3DA",0x4E8E],
+  ["BFF7",0x4E8F],
+  ["8180",0x4E90],
+  ["D4C6",0x4E91],
+  ["BBA5",0x4E92],
+  ["D8C1",0x4E93],
+  ["CEE5",0x4E94],
+  ["BEAE",0x4E95],
+  ["8181",0x4E96],
+  ["8182",0x4E97],
+  ["D8A8",0x4E98],
+  ["8183",0x4E99],
+  ["D1C7",0x4E9A],
+  ["D0A9",0x4E9B],
+  ["8184",0x4E9C],
+  ["8185",0x4E9D],
+  ["8186",0x4E9E],
+  ["D8BD",0x4E9F],
+  ["D9EF",0x4EA0],
+  ["CDF6",0x4EA1],
+  ["BFBA",0x4EA2],
+  ["8187",0x4EA3],
+  ["BDBB",0x4EA4],
+  ["BAA5",0x4EA5],
+  ["D2E0",0x4EA6],
+  ["B2FA",0x4EA7],
+  ["BAE0",0x4EA8],
+  ["C4B6",0x4EA9],
+  ["8188",0x4EAA],
+  ["CFED",0x4EAB],
+  ["BEA9",0x4EAC],
+  ["CDA4",0x4EAD],
+  ["C1C1",0x4EAE],
+  ["8189",0x4EAF],
+  ["818A",0x4EB0],
+  ["818B",0x4EB1],
+  ["C7D7",0x4EB2],
+  ["D9F1",0x4EB3],
+  ["818C",0x4EB4],
+  ["D9F4",0x4EB5],
+  ["818D",0x4EB6],
+  ["818E",0x4EB7],
+  ["818F",0x4EB8],
+  ["8190",0x4EB9],
+  ["C8CB",0x4EBA],
+  ["D8E9",0x4EBB],
+  ["8191",0x4EBC],
+  ["8192",0x4EBD],
+  ["8193",0x4EBE],
+  ["D2DA",0x4EBF],
+  ["CAB2",0x4EC0],
+  ["C8CA",0x4EC1],
+  ["D8EC",0x4EC2],
+  ["D8EA",0x4EC3],
+  ["D8C6",0x4EC4],
+  ["BDF6",0x4EC5],
+  ["C6CD",0x4EC6],
+  ["B3F0",0x4EC7],
+  ["8194",0x4EC8],
+  ["D8EB",0x4EC9],
+  ["BDF1",0x4ECA],
+  ["BDE9",0x4ECB],
+  ["8195",0x4ECC],
+  ["C8D4",0x4ECD],
+  ["B4D3",0x4ECE],
+  ["8196",0x4ECF],
+  ["8197",0x4ED0],
+  ["C2D8",0x4ED1],
+  ["8198",0x4ED2],
+  ["B2D6",0x4ED3],
+  ["D7D0",0x4ED4],
+  ["CACB",0x4ED5],
+  ["CBFB",0x4ED6],
+  ["D5CC",0x4ED7],
+  ["B8B6",0x4ED8],
+  ["CFC9",0x4ED9],
+  ["8199",0x4EDA],
+  ["819A",0x4EDB],
+  ["819B",0x4EDC],
+  ["D9DA",0x4EDD],
+  ["D8F0",0x4EDE],
+  ["C7AA",0x4EDF],
+  ["819C",0x4EE0],
+  ["D8EE",0x4EE1],
+  ["819D",0x4EE2],
+  ["B4FA",0x4EE3],
+  ["C1EE",0x4EE4],
+  ["D2D4",0x4EE5],
+  ["819E",0x4EE6],
+  ["819F",0x4EE7],
+  ["D8ED",0x4EE8],
+  ["81A0",0x4EE9],
+  ["D2C7",0x4EEA],
+  ["D8EF",0x4EEB],
+  ["C3C7",0x4EEC],
+  ["81A1",0x4EED],
+  ["81A2",0x4EEE],
+  ["81A3",0x4EEF],
+  ["D1F6",0x4EF0],
+  ["81A4",0x4EF1],
+  ["D6D9",0x4EF2],
+  ["D8F2",0x4EF3],
+  ["81A5",0x4EF4],
+  ["D8F5",0x4EF5],
+  ["BCFE",0x4EF6],
+  ["BCDB",0x4EF7],
+  ["81A6",0x4EF8],
+  ["81A7",0x4EF9],
+  ["81A8",0x4EFA],
+  ["C8CE",0x4EFB],
+  ["81A9",0x4EFC],
+  ["B7DD",0x4EFD],
+  ["81AA",0x4EFE],
+  ["B7C2",0x4EFF],
+  ["81AB",0x4F00],
+  ["C6F3",0x4F01],
+  ["81AC",0x4F02],
+  ["81AD",0x4F03],
+  ["81AE",0x4F04],
+  ["81AF",0x4F05],
+  ["81B0",0x4F06],
+  ["81B1",0x4F07],
+  ["81B2",0x4F08],
+  ["D8F8",0x4F09],
+  ["D2C1",0x4F0A],
+  ["81B3",0x4F0B],
+  ["81B4",0x4F0C],
+  ["CEE9",0x4F0D],
+  ["BCBF",0x4F0E],
+  ["B7FC",0x4F0F],
+  ["B7A5",0x4F10],
+  ["D0DD",0x4F11],
+  ["81B5",0x4F12],
+  ["81B6",0x4F13],
+  ["81B7",0x4F14],
+  ["81B8",0x4F15],
+  ["81B9",0x4F16],
+  ["D6DA",0x4F17],
+  ["D3C5",0x4F18],
+  ["BBEF",0x4F19],
+  ["BBE1",0x4F1A],
+  ["D8F1",0x4F1B],
+  ["81BA",0x4F1C],
+  ["81BB",0x4F1D],
+  ["C9A1",0x4F1E],
+  ["CEB0",0x4F1F],
+  ["B4AB",0x4F20],
+  ["81BC",0x4F21],
+  ["D8F3",0x4F22],
+  ["81BD",0x4F23],
+  ["C9CB",0x4F24],
+  ["D8F6",0x4F25],
+  ["C2D7",0x4F26],
+  ["D8F7",0x4F27],
+  ["81BE",0x4F28],
+  ["81BF",0x4F29],
+  ["CEB1",0x4F2A],
+  ["D8F9",0x4F2B],
+  ["81C0",0x4F2C],
+  ["81C1",0x4F2D],
+  ["81C2",0x4F2E],
+  ["B2AE",0x4F2F],
+  ["B9C0",0x4F30],
+  ["81C3",0x4F31],
+  ["D9A3",0x4F32],
+  ["81C4",0x4F33],
+  ["B0E9",0x4F34],
+  ["81C5",0x4F35],
+  ["C1E6",0x4F36],
+  ["81C6",0x4F37],
+  ["C9EC",0x4F38],
+  ["81C7",0x4F39],
+  ["CBC5",0x4F3A],
+  ["81C8",0x4F3B],
+  ["CBC6",0x4F3C],
+  ["D9A4",0x4F3D],
+  ["81C9",0x4F3E],
+  ["81CA",0x4F3F],
+  ["81CB",0x4F40],
+  ["81CC",0x4F41],
+  ["81CD",0x4F42],
+  ["B5E8",0x4F43],
+  ["81CE",0x4F44],
+  ["81CF",0x4F45],
+  ["B5AB",0x4F46],
+  ["81D0",0x4F47],
+  ["81D1",0x4F48],
+  ["81D2",0x4F49],
+  ["81D3",0x4F4A],
+  ["81D4",0x4F4B],
+  ["81D5",0x4F4C],
+  ["CEBB",0x4F4D],
+  ["B5CD",0x4F4E],
+  ["D7A1",0x4F4F],
+  ["D7F4",0x4F50],
+  ["D3D3",0x4F51],
+  ["81D6",0x4F52],
+  ["CCE5",0x4F53],
+  ["81D7",0x4F54],
+  ["BACE",0x4F55],
+  ["81D8",0x4F56],
+  ["D9A2",0x4F57],
+  ["D9DC",0x4F58],
+  ["D3E0",0x4F59],
+  ["D8FD",0x4F5A],
+  ["B7F0",0x4F5B],
+  ["D7F7",0x4F5C],
+  ["D8FE",0x4F5D],
+  ["D8FA",0x4F5E],
+  ["D9A1",0x4F5F],
+  ["C4E3",0x4F60],
+  ["81D9",0x4F61],
+  ["81DA",0x4F62],
+  ["D3B6",0x4F63],
+  ["D8F4",0x4F64],
+  ["D9DD",0x4F65],
+  ["81DB",0x4F66],
+  ["D8FB",0x4F67],
+  ["81DC",0x4F68],
+  ["C5E5",0x4F69],
+  ["81DD",0x4F6A],
+  ["81DE",0x4F6B],
+  ["C0D0",0x4F6C],
+  ["81DF",0x4F6D],
+  ["81E0",0x4F6E],
+  ["D1F0",0x4F6F],
+  ["B0DB",0x4F70],
+  ["81E1",0x4F71],
+  ["81E2",0x4F72],
+  ["BCD1",0x4F73],
+  ["D9A6",0x4F74],
+  ["81E3",0x4F75],
+  ["D9A5",0x4F76],
+  ["81E4",0x4F77],
+  ["81E5",0x4F78],
+  ["81E6",0x4F79],
+  ["81E7",0x4F7A],
+  ["D9AC",0x4F7B],
+  ["D9AE",0x4F7C],
+  ["81E8",0x4F7D],
+  ["D9AB",0x4F7E],
+  ["CAB9",0x4F7F],
+  ["81E9",0x4F80],
+  ["81EA",0x4F81],
+  ["81EB",0x4F82],
+  ["D9A9",0x4F83],
+  ["D6B6",0x4F84],
+  ["81EC",0x4F85],
+  ["81ED",0x4F86],
+  ["81EE",0x4F87],
+  ["B3DE",0x4F88],
+  ["D9A8",0x4F89],
+  ["81EF",0x4F8A],
+  ["C0FD",0x4F8B],
+  ["81F0",0x4F8C],
+  ["CACC",0x4F8D],
+  ["81F1",0x4F8E],
+  ["D9AA",0x4F8F],
+  ["81F2",0x4F90],
+  ["D9A7",0x4F91],
+  ["81F3",0x4F92],
+  ["81F4",0x4F93],
+  ["D9B0",0x4F94],
+  ["81F5",0x4F95],
+  ["81F6",0x4F96],
+  ["B6B1",0x4F97],
+  ["81F7",0x4F98],
+  ["81F8",0x4F99],
+  ["81F9",0x4F9A],
+  ["B9A9",0x4F9B],
+  ["81FA",0x4F9C],
+  ["D2C0",0x4F9D],
+  ["81FB",0x4F9E],
+  ["81FC",0x4F9F],
+  ["CFC0",0x4FA0],
+  ["81FD",0x4FA1],
+  ["81FE",0x4FA2],
+  ["C2C2",0x4FA3],
+  ["8240",0x4FA4],
+  ["BDC4",0x4FA5],
+  ["D5EC",0x4FA6],
+  ["B2E0",0x4FA7],
+  ["C7C8",0x4FA8],
+  ["BFEB",0x4FA9],
+  ["D9AD",0x4FAA],
+  ["8241",0x4FAB],
+  ["D9AF",0x4FAC],
+  ["8242",0x4FAD],
+  ["CEEA",0x4FAE],
+  ["BAEE",0x4FAF],
+  ["8243",0x4FB0],
+  ["8244",0x4FB1],
+  ["8245",0x4FB2],
+  ["8246",0x4FB3],
+  ["8247",0x4FB4],
+  ["C7D6",0x4FB5],
+  ["8248",0x4FB6],
+  ["8249",0x4FB7],
+  ["824A",0x4FB8],
+  ["824B",0x4FB9],
+  ["824C",0x4FBA],
+  ["824D",0x4FBB],
+  ["824E",0x4FBC],
+  ["824F",0x4FBD],
+  ["8250",0x4FBE],
+  ["B1E3",0x4FBF],
+  ["8251",0x4FC0],
+  ["8252",0x4FC1],
+  ["8253",0x4FC2],
+  ["B4D9",0x4FC3],
+  ["B6ED",0x4FC4],
+  ["D9B4",0x4FC5],
+  ["8254",0x4FC6],
+  ["8255",0x4FC7],
+  ["8256",0x4FC8],
+  ["8257",0x4FC9],
+  ["BFA1",0x4FCA],
+  ["8258",0x4FCB],
+  ["8259",0x4FCC],
+  ["825A",0x4FCD],
+  ["D9DE",0x4FCE],
+  ["C7CE",0x4FCF],
+  ["C0FE",0x4FD0],
+  ["D9B8",0x4FD1],
+  ["825B",0x4FD2],
+  ["825C",0x4FD3],
+  ["825D",0x4FD4],
+  ["825E",0x4FD5],
+  ["825F",0x4FD6],
+  ["CBD7",0x4FD7],
+  ["B7FD",0x4FD8],
+  ["8260",0x4FD9],
+  ["D9B5",0x4FDA],
+  ["8261",0x4FDB],
+  ["D9B7",0x4FDC],
+  ["B1A3",0x4FDD],
+  ["D3E1",0x4FDE],
+  ["D9B9",0x4FDF],
+  ["8262",0x4FE0],
+  ["D0C5",0x4FE1],
+  ["8263",0x4FE2],
+  ["D9B6",0x4FE3],
+  ["8264",0x4FE4],
+  ["8265",0x4FE5],
+  ["D9B1",0x4FE6],
+  ["8266",0x4FE7],
+  ["D9B2",0x4FE8],
+  ["C1A9",0x4FE9],
+  ["D9B3",0x4FEA],
+  ["8267",0x4FEB],
+  ["8268",0x4FEC],
+  ["BCF3",0x4FED],
+  ["D0DE",0x4FEE],
+  ["B8A9",0x4FEF],
+  ["8269",0x4FF0],
+  ["BEE3",0x4FF1],
+  ["826A",0x4FF2],
+  ["D9BD",0x4FF3],
+  ["826B",0x4FF4],
+  ["826C",0x4FF5],
+  ["826D",0x4FF6],
+  ["826E",0x4FF7],
+  ["D9BA",0x4FF8],
+  ["826F",0x4FF9],
+  ["B0B3",0x4FFA],
+  ["8270",0x4FFB],
+  ["8271",0x4FFC],
+  ["8272",0x4FFD],
+  ["D9C2",0x4FFE],
+  ["8273",0x4FFF],
+  ["8274",0x5000],
+  ["8275",0x5001],
+  ["8276",0x5002],
+  ["8277",0x5003],
+  ["8278",0x5004],
+  ["8279",0x5005],
+  ["827A",0x5006],
+  ["827B",0x5007],
+  ["827C",0x5008],
+  ["827D",0x5009],
+  ["827E",0x500A],
+  ["8280",0x500B],
+  ["D9C4",0x500C],
+  ["B1B6",0x500D],
+  ["8281",0x500E],
+  ["D9BF",0x500F],
+  ["8282",0x5010],
+  ["8283",0x5011],
+  ["B5B9",0x5012],
+  ["8284",0x5013],
+  ["BEF3",0x5014],
+  ["8285",0x5015],
+  ["8286",0x5016],
+  ["8287",0x5017],
+  ["CCC8",0x5018],
+  ["BAF2",0x5019],
+  ["D2D0",0x501A],
+  ["8288",0x501B],
+  ["D9C3",0x501C],
+  ["8289",0x501D],
+  ["828A",0x501E],
+  ["BDE8",0x501F],
+  ["828B",0x5020],
+  ["B3AB",0x5021],
+  ["828C",0x5022],
+  ["828D",0x5023],
+  ["828E",0x5024],
+  ["D9C5",0x5025],
+  ["BEEB",0x5026],
+  ["828F",0x5027],
+  ["D9C6",0x5028],
+  ["D9BB",0x5029],
+  ["C4DF",0x502A],
+  ["8290",0x502B],
+  ["D9BE",0x502C],
+  ["D9C1",0x502D],
+  ["D9C0",0x502E],
+  ["8291",0x502F],
+  ["8292",0x5030],
+  ["8293",0x5031],
+  ["8294",0x5032],
+  ["8295",0x5033],
+  ["8296",0x5034],
+  ["8297",0x5035],
+  ["8298",0x5036],
+  ["8299",0x5037],
+  ["829A",0x5038],
+  ["829B",0x5039],
+  ["D5AE",0x503A],
+  ["829C",0x503B],
+  ["D6B5",0x503C],
+  ["829D",0x503D],
+  ["C7E3",0x503E],
+  ["829E",0x503F],
+  ["829F",0x5040],
+  ["82A0",0x5041],
+  ["82A1",0x5042],
+  ["D9C8",0x5043],
+  ["82A2",0x5044],
+  ["82A3",0x5045],
+  ["82A4",0x5046],
+  ["BCD9",0x5047],
+  ["D9CA",0x5048],
+  ["82A5",0x5049],
+  ["82A6",0x504A],
+  ["82A7",0x504B],
+  ["D9BC",0x504C],
+  ["82A8",0x504D],
+  ["D9CB",0x504E],
+  ["C6AB",0x504F],
+  ["82A9",0x5050],
+  ["82AA",0x5051],
+  ["82AB",0x5052],
+  ["82AC",0x5053],
+  ["82AD",0x5054],
+  ["D9C9",0x5055],
+  ["82AE",0x5056],
+  ["82AF",0x5057],
+  ["82B0",0x5058],
+  ["82B1",0x5059],
+  ["D7F6",0x505A],
+  ["82B2",0x505B],
+  ["CDA3",0x505C],
+  ["82B3",0x505D],
+  ["82B4",0x505E],
+  ["82B5",0x505F],
+  ["82B6",0x5060],
+  ["82B7",0x5061],
+  ["82B8",0x5062],
+  ["82B9",0x5063],
+  ["82BA",0x5064],
+  ["BDA1",0x5065],
+  ["82BB",0x5066],
+  ["82BC",0x5067],
+  ["82BD",0x5068],
+  ["82BE",0x5069],
+  ["82BF",0x506A],
+  ["82C0",0x506B],
+  ["D9CC",0x506C],
+  ["82C1",0x506D],
+  ["82C2",0x506E],
+  ["82C3",0x506F],
+  ["82C4",0x5070],
+  ["82C5",0x5071],
+  ["82C6",0x5072],
+  ["82C7",0x5073],
+  ["82C8",0x5074],
+  ["82C9",0x5075],
+  ["C5BC",0x5076],
+  ["CDB5",0x5077],
+  ["82CA",0x5078],
+  ["82CB",0x5079],
+  ["82CC",0x507A],
+  ["D9CD",0x507B],
+  ["82CD",0x507C],
+  ["82CE",0x507D],
+  ["D9C7",0x507E],
+  ["B3A5",0x507F],
+  ["BFFE",0x5080],
+  ["82CF",0x5081],
+  ["82D0",0x5082],
+  ["82D1",0x5083],
+  ["82D2",0x5084],
+  ["B8B5",0x5085],
+  ["82D3",0x5086],
+  ["82D4",0x5087],
+  ["C0FC",0x5088],
+  ["82D5",0x5089],
+  ["82D6",0x508A],
+  ["82D7",0x508B],
+  ["82D8",0x508C],
+  ["B0F8",0x508D],
+  ["82D9",0x508E],
+  ["82DA",0x508F],
+  ["82DB",0x5090],
+  ["82DC",0x5091],
+  ["82DD",0x5092],
+  ["82DE",0x5093],
+  ["82DF",0x5094],
+  ["82E0",0x5095],
+  ["82E1",0x5096],
+  ["82E2",0x5097],
+  ["82E3",0x5098],
+  ["82E4",0x5099],
+  ["82E5",0x509A],
+  ["82E6",0x509B],
+  ["82E7",0x509C],
+  ["82E8",0x509D],
+  ["82E9",0x509E],
+  ["82EA",0x509F],
+  ["82EB",0x50A0],
+  ["82EC",0x50A1],
+  ["82ED",0x50A2],
+  ["B4F6",0x50A3],
+  ["82EE",0x50A4],
+  ["D9CE",0x50A5],
+  ["82EF",0x50A6],
+  ["D9CF",0x50A7],
+  ["B4A2",0x50A8],
+  ["D9D0",0x50A9],
+  ["82F0",0x50AA],
+  ["82F1",0x50AB],
+  ["B4DF",0x50AC],
+  ["82F2",0x50AD],
+  ["82F3",0x50AE],
+  ["82F4",0x50AF],
+  ["82F5",0x50B0],
+  ["82F6",0x50B1],
+  ["B0C1",0x50B2],
+  ["82F7",0x50B3],
+  ["82F8",0x50B4],
+  ["82F9",0x50B5],
+  ["82FA",0x50B6],
+  ["82FB",0x50B7],
+  ["82FC",0x50B8],
+  ["82FD",0x50B9],
+  ["D9D1",0x50BA],
+  ["C9B5",0x50BB],
+  ["82FE",0x50BC],
+  ["8340",0x50BD],
+  ["8341",0x50BE],
+  ["8342",0x50BF],
+  ["8343",0x50C0],
+  ["8344",0x50C1],
+  ["8345",0x50C2],
+  ["8346",0x50C3],
+  ["8347",0x50C4],
+  ["8348",0x50C5],
+  ["8349",0x50C6],
+  ["834A",0x50C7],
+  ["834B",0x50C8],
+  ["834C",0x50C9],
+  ["834D",0x50CA],
+  ["834E",0x50CB],
+  ["834F",0x50CC],
+  ["8350",0x50CD],
+  ["8351",0x50CE],
+  ["CFF1",0x50CF],
+  ["8352",0x50D0],
+  ["8353",0x50D1],
+  ["8354",0x50D2],
+  ["8355",0x50D3],
+  ["8356",0x50D4],
+  ["8357",0x50D5],
+  ["D9D2",0x50D6],
+  ["8358",0x50D7],
+  ["8359",0x50D8],
+  ["835A",0x50D9],
+  ["C1C5",0x50DA],
+  ["835B",0x50DB],
+  ["835C",0x50DC],
+  ["835D",0x50DD],
+  ["835E",0x50DE],
+  ["835F",0x50DF],
+  ["8360",0x50E0],
+  ["8361",0x50E1],
+  ["8362",0x50E2],
+  ["8363",0x50E3],
+  ["8364",0x50E4],
+  ["8365",0x50E5],
+  ["D9D6",0x50E6],
+  ["C9AE",0x50E7],
+  ["8366",0x50E8],
+  ["8367",0x50E9],
+  ["8368",0x50EA],
+  ["8369",0x50EB],
+  ["D9D5",0x50EC],
+  ["D9D4",0x50ED],
+  ["D9D7",0x50EE],
+  ["836A",0x50EF],
+  ["836B",0x50F0],
+  ["836C",0x50F1],
+  ["836D",0x50F2],
+  ["CBDB",0x50F3],
+  ["836E",0x50F4],
+  ["BDA9",0x50F5],
+  ["836F",0x50F6],
+  ["8370",0x50F7],
+  ["8371",0x50F8],
+  ["8372",0x50F9],
+  ["8373",0x50FA],
+  ["C6A7",0x50FB],
+  ["8374",0x50FC],
+  ["8375",0x50FD],
+  ["8376",0x50FE],
+  ["8377",0x50FF],
+  ["8378",0x5100],
+  ["8379",0x5101],
+  ["837A",0x5102],
+  ["837B",0x5103],
+  ["837C",0x5104],
+  ["837D",0x5105],
+  ["D9D3",0x5106],
+  ["D9D8",0x5107],
+  ["837E",0x5108],
+  ["8380",0x5109],
+  ["8381",0x510A],
+  ["D9D9",0x510B],
+  ["8382",0x510C],
+  ["8383",0x510D],
+  ["8384",0x510E],
+  ["8385",0x510F],
+  ["8386",0x5110],
+  ["8387",0x5111],
+  ["C8E5",0x5112],
+  ["8388",0x5113],
+  ["8389",0x5114],
+  ["838A",0x5115],
+  ["838B",0x5116],
+  ["838C",0x5117],
+  ["838D",0x5118],
+  ["838E",0x5119],
+  ["838F",0x511A],
+  ["8390",0x511B],
+  ["8391",0x511C],
+  ["8392",0x511D],
+  ["8393",0x511E],
+  ["8394",0x511F],
+  ["8395",0x5120],
+  ["C0DC",0x5121],
+  ["8396",0x5122],
+  ["8397",0x5123],
+  ["8398",0x5124],
+  ["8399",0x5125],
+  ["839A",0x5126],
+  ["839B",0x5127],
+  ["839C",0x5128],
+  ["839D",0x5129],
+  ["839E",0x512A],
+  ["839F",0x512B],
+  ["83A0",0x512C],
+  ["83A1",0x512D],
+  ["83A2",0x512E],
+  ["83A3",0x512F],
+  ["83A4",0x5130],
+  ["83A5",0x5131],
+  ["83A6",0x5132],
+  ["83A7",0x5133],
+  ["83A8",0x5134],
+  ["83A9",0x5135],
+  ["83AA",0x5136],
+  ["83AB",0x5137],
+  ["83AC",0x5138],
+  ["83AD",0x5139],
+  ["83AE",0x513A],
+  ["83AF",0x513B],
+  ["83B0",0x513C],
+  ["83B1",0x513D],
+  ["83B2",0x513E],
+  ["B6F9",0x513F],
+  ["D8A3",0x5140],
+  ["D4CA",0x5141],
+  ["83B3",0x5142],
+  ["D4AA",0x5143],
+  ["D0D6",0x5144],
+  ["B3E4",0x5145],
+  ["D5D7",0x5146],
+  ["83B4",0x5147],
+  ["CFC8",0x5148],
+  ["B9E2",0x5149],
+  ["83B5",0x514A],
+  ["BFCB",0x514B],
+  ["83B6",0x514C],
+  ["C3E2",0x514D],
+  ["83B7",0x514E],
+  ["83B8",0x514F],
+  ["83B9",0x5150],
+  ["B6D2",0x5151],
+  ["83BA",0x5152],
+  ["83BB",0x5153],
+  ["CDC3",0x5154],
+  ["D9EE",0x5155],
+  ["D9F0",0x5156],
+  ["83BC",0x5157],
+  ["83BD",0x5158],
+  ["83BE",0x5159],
+  ["B5B3",0x515A],
+  ["83BF",0x515B],
+  ["B6B5",0x515C],
+  ["83C0",0x515D],
+  ["83C1",0x515E],
+  ["83C2",0x515F],
+  ["83C3",0x5160],
+  ["83C4",0x5161],
+  ["BEA4",0x5162],
+  ["83C5",0x5163],
+  ["83C6",0x5164],
+  ["C8EB",0x5165],
+  ["83C7",0x5166],
+  ["83C8",0x5167],
+  ["C8AB",0x5168],
+  ["83C9",0x5169],
+  ["83CA",0x516A],
+  ["B0CB",0x516B],
+  ["B9AB",0x516C],
+  ["C1F9",0x516D],
+  ["D9E2",0x516E],
+  ["83CB",0x516F],
+  ["C0BC",0x5170],
+  ["B9B2",0x5171],
+  ["83CC",0x5172],
+  ["B9D8",0x5173],
+  ["D0CB",0x5174],
+  ["B1F8",0x5175],
+  ["C6E4",0x5176],
+  ["BEDF",0x5177],
+  ["B5E4",0x5178],
+  ["D7C8",0x5179],
+  ["83CD",0x517A],
+  ["D1F8",0x517B],
+  ["BCE6",0x517C],
+  ["CADE",0x517D],
+  ["83CE",0x517E],
+  ["83CF",0x517F],
+  ["BCBD",0x5180],
+  ["D9E6",0x5181],
+  ["D8E7",0x5182],
+  ["83D0",0x5183],
+  ["83D1",0x5184],
+  ["C4DA",0x5185],
+  ["83D2",0x5186],
+  ["83D3",0x5187],
+  ["B8D4",0x5188],
+  ["C8BD",0x5189],
+  ["83D4",0x518A],
+  ["83D5",0x518B],
+  ["B2E1",0x518C],
+  ["D4D9",0x518D],
+  ["83D6",0x518E],
+  ["83D7",0x518F],
+  ["83D8",0x5190],
+  ["83D9",0x5191],
+  ["C3B0",0x5192],
+  ["83DA",0x5193],
+  ["83DB",0x5194],
+  ["C3E1",0x5195],
+  ["DAA2",0x5196],
+  ["C8DF",0x5197],
+  ["83DC",0x5198],
+  ["D0B4",0x5199],
+  ["83DD",0x519A],
+  ["BEFC",0x519B],
+  ["C5A9",0x519C],
+  ["83DE",0x519D],
+  ["83DF",0x519E],
+  ["83E0",0x519F],
+  ["B9DA",0x51A0],
+  ["83E1",0x51A1],
+  ["DAA3",0x51A2],
+  ["83E2",0x51A3],
+  ["D4A9",0x51A4],
+  ["DAA4",0x51A5],
+  ["83E3",0x51A6],
+  ["83E4",0x51A7],
+  ["83E5",0x51A8],
+  ["83E6",0x51A9],
+  ["83E7",0x51AA],
+  ["D9FB",0x51AB],
+  ["B6AC",0x51AC],
+  ["83E8",0x51AD],
+  ["83E9",0x51AE],
+  ["B7EB",0x51AF],
+  ["B1F9",0x51B0],
+  ["D9FC",0x51B1],
+  ["B3E5",0x51B2],
+  ["BEF6",0x51B3],
+  ["83EA",0x51B4],
+  ["BFF6",0x51B5],
+  ["D2B1",0x51B6],
+  ["C0E4",0x51B7],
+  ["83EB",0x51B8],
+  ["83EC",0x51B9],
+  ["83ED",0x51BA],
+  ["B6B3",0x51BB],
+  ["D9FE",0x51BC],
+  ["D9FD",0x51BD],
+  ["83EE",0x51BE],
+  ["83EF",0x51BF],
+  ["BEBB",0x51C0],
+  ["83F0",0x51C1],
+  ["83F1",0x51C2],
+  ["83F2",0x51C3],
+  ["C6E0",0x51C4],
+  ["83F3",0x51C5],
+  ["D7BC",0x51C6],
+  ["DAA1",0x51C7],
+  ["83F4",0x51C8],
+  ["C1B9",0x51C9],
+  ["83F5",0x51CA],
+  ["B5F2",0x51CB],
+  ["C1E8",0x51CC],
+  ["83F6",0x51CD],
+  ["83F7",0x51CE],
+  ["BCF5",0x51CF],
+  ["83F8",0x51D0],
+  ["B4D5",0x51D1],
+  ["83F9",0x51D2],
+  ["83FA",0x51D3],
+  ["83FB",0x51D4],
+  ["83FC",0x51D5],
+  ["83FD",0x51D6],
+  ["83FE",0x51D7],
+  ["8440",0x51D8],
+  ["8441",0x51D9],
+  ["8442",0x51DA],
+  ["C1DD",0x51DB],
+  ["8443",0x51DC],
+  ["C4FD",0x51DD],
+  ["8444",0x51DE],
+  ["8445",0x51DF],
+  ["BCB8",0x51E0],
+  ["B7B2",0x51E1],
+  ["8446",0x51E2],
+  ["8447",0x51E3],
+  ["B7EF",0x51E4],
+  ["8448",0x51E5],
+  ["8449",0x51E6],
+  ["844A",0x51E7],
+  ["844B",0x51E8],
+  ["844C",0x51E9],
+  ["844D",0x51EA],
+  ["D9EC",0x51EB],
+  ["844E",0x51EC],
+  ["C6BE",0x51ED],
+  ["844F",0x51EE],
+  ["BFAD",0x51EF],
+  ["BBCB",0x51F0],
+  ["8450",0x51F1],
+  ["8451",0x51F2],
+  ["B5CA",0x51F3],
+  ["8452",0x51F4],
+  ["DBC9",0x51F5],
+  ["D0D7",0x51F6],
+  ["8453",0x51F7],
+  ["CDB9",0x51F8],
+  ["B0BC",0x51F9],
+  ["B3F6",0x51FA],
+  ["BBF7",0x51FB],
+  ["DBCA",0x51FC],
+  ["BAAF",0x51FD],
+  ["8454",0x51FE],
+  ["D4E4",0x51FF],
+  ["B5B6",0x5200],
+  ["B5F3",0x5201],
+  ["D8D6",0x5202],
+  ["C8D0",0x5203],
+  ["8455",0x5204],
+  ["8456",0x5205],
+  ["B7D6",0x5206],
+  ["C7D0",0x5207],
+  ["D8D7",0x5208],
+  ["8457",0x5209],
+  ["BFAF",0x520A],
+  ["8458",0x520B],
+  ["8459",0x520C],
+  ["DBBB",0x520D],
+  ["D8D8",0x520E],
+  ["845A",0x520F],
+  ["845B",0x5210],
+  ["D0CC",0x5211],
+  ["BBAE",0x5212],
+  ["845C",0x5213],
+  ["845D",0x5214],
+  ["845E",0x5215],
+  ["EBBE",0x5216],
+  ["C1D0",0x5217],
+  ["C1F5",0x5218],
+  ["D4F2",0x5219],
+  ["B8D5",0x521A],
+  ["B4B4",0x521B],
+  ["845F",0x521C],
+  ["B3F5",0x521D],
+  ["8460",0x521E],
+  ["8461",0x521F],
+  ["C9BE",0x5220],
+  ["8462",0x5221],
+  ["8463",0x5222],
+  ["8464",0x5223],
+  ["C5D0",0x5224],
+  ["8465",0x5225],
+  ["8466",0x5226],
+  ["8467",0x5227],
+  ["C5D9",0x5228],
+  ["C0FB",0x5229],
+  ["8468",0x522A],
+  ["B1F0",0x522B],
+  ["8469",0x522C],
+  ["D8D9",0x522D],
+  ["B9CE",0x522E],
+  ["846A",0x522F],
+  ["B5BD",0x5230],
+  ["846B",0x5231],
+  ["846C",0x5232],
+  ["D8DA",0x5233],
+  ["846D",0x5234],
+  ["846E",0x5235],
+  ["D6C6",0x5236],
+  ["CBA2",0x5237],
+  ["C8AF",0x5238],
+  ["C9B2",0x5239],
+  ["B4CC",0x523A],
+  ["BFCC",0x523B],
+  ["846F",0x523C],
+  ["B9F4",0x523D],
+  ["8470",0x523E],
+  ["D8DB",0x523F],
+  ["D8DC",0x5240],
+  ["B6E7",0x5241],
+  ["BCC1",0x5242],
+  ["CCEA",0x5243],
+  ["8471",0x5244],
+  ["8472",0x5245],
+  ["8473",0x5246],
+  ["8474",0x5247],
+  ["8475",0x5248],
+  ["8476",0x5249],
+  ["CFF7",0x524A],
+  ["8477",0x524B],
+  ["D8DD",0x524C],
+  ["C7B0",0x524D],
+  ["8478",0x524E],
+  ["8479",0x524F],
+  ["B9D0",0x5250],
+  ["BDA3",0x5251],
+  ["847A",0x5252],
+  ["847B",0x5253],
+  ["CCDE",0x5254],
+  ["847C",0x5255],
+  ["C6CA",0x5256],
+  ["847D",0x5257],
+  ["847E",0x5258],
+  ["8480",0x5259],
+  ["8481",0x525A],
+  ["8482",0x525B],
+  ["D8E0",0x525C],
+  ["8483",0x525D],
+  ["D8DE",0x525E],
+  ["8484",0x525F],
+  ["8485",0x5260],
+  ["D8DF",0x5261],
+  ["8486",0x5262],
+  ["8487",0x5263],
+  ["8488",0x5264],
+  ["B0FE",0x5265],
+  ["8489",0x5266],
+  ["BEE7",0x5267],
+  ["848A",0x5268],
+  ["CAA3",0x5269],
+  ["BCF4",0x526A],
+  ["848B",0x526B],
+  ["848C",0x526C],
+  ["848D",0x526D],
+  ["848E",0x526E],
+  ["B8B1",0x526F],
+  ["848F",0x5270],
+  ["8490",0x5271],
+  ["B8EE",0x5272],
+  ["8491",0x5273],
+  ["8492",0x5274],
+  ["8493",0x5275],
+  ["8494",0x5276],
+  ["8495",0x5277],
+  ["8496",0x5278],
+  ["8497",0x5279],
+  ["8498",0x527A],
+  ["8499",0x527B],
+  ["849A",0x527C],
+  ["D8E2",0x527D],
+  ["849B",0x527E],
+  ["BDCB",0x527F],
+  ["849C",0x5280],
+  ["D8E4",0x5281],
+  ["D8E3",0x5282],
+  ["849D",0x5283],
+  ["849E",0x5284],
+  ["849F",0x5285],
+  ["84A0",0x5286],
+  ["84A1",0x5287],
+  ["C5FC",0x5288],
+  ["84A2",0x5289],
+  ["84A3",0x528A],
+  ["84A4",0x528B],
+  ["84A5",0x528C],
+  ["84A6",0x528D],
+  ["84A7",0x528E],
+  ["84A8",0x528F],
+  ["D8E5",0x5290],
+  ["84A9",0x5291],
+  ["84AA",0x5292],
+  ["D8E6",0x5293],
+  ["84AB",0x5294],
+  ["84AC",0x5295],
+  ["84AD",0x5296],
+  ["84AE",0x5297],
+  ["84AF",0x5298],
+  ["84B0",0x5299],
+  ["84B1",0x529A],
+  ["C1A6",0x529B],
+  ["84B2",0x529C],
+  ["C8B0",0x529D],
+  ["B0EC",0x529E],
+  ["B9A6",0x529F],
+  ["BCD3",0x52A0],
+  ["CEF1",0x52A1],
+  ["DBBD",0x52A2],
+  ["C1D3",0x52A3],
+  ["84B3",0x52A4],
+  ["84B4",0x52A5],
+  ["84B5",0x52A6],
+  ["84B6",0x52A7],
+  ["B6AF",0x52A8],
+  ["D6FA",0x52A9],
+  ["C5AC",0x52AA],
+  ["BDD9",0x52AB],
+  ["DBBE",0x52AC],
+  ["DBBF",0x52AD],
+  ["84B7",0x52AE],
+  ["84B8",0x52AF],
+  ["84B9",0x52B0],
+  ["C0F8",0x52B1],
+  ["BEA2",0x52B2],
+  ["C0CD",0x52B3],
+  ["84BA",0x52B4],
+  ["84BB",0x52B5],
+  ["84BC",0x52B6],
+  ["84BD",0x52B7],
+  ["84BE",0x52B8],
+  ["84BF",0x52B9],
+  ["84C0",0x52BA],
+  ["84C1",0x52BB],
+  ["84C2",0x52BC],
+  ["84C3",0x52BD],
+  ["DBC0",0x52BE],
+  ["CAC6",0x52BF],
+  ["84C4",0x52C0],
+  ["84C5",0x52C1],
+  ["84C6",0x52C2],
+  ["B2AA",0x52C3],
+  ["84C7",0x52C4],
+  ["84C8",0x52C5],
+  ["84C9",0x52C6],
+  ["D3C2",0x52C7],
+  ["84CA",0x52C8],
+  ["C3E3",0x52C9],
+  ["84CB",0x52CA],
+  ["D1AB",0x52CB],
+  ["84CC",0x52CC],
+  ["84CD",0x52CD],
+  ["84CE",0x52CE],
+  ["84CF",0x52CF],
+  ["DBC2",0x52D0],
+  ["84D0",0x52D1],
+  ["C0D5",0x52D2],
+  ["84D1",0x52D3],
+  ["84D2",0x52D4],
+  ["84D3",0x52D5],
+  ["DBC3",0x52D6],
+  ["84D4",0x52D7],
+  ["BFB1",0x52D8],
+  ["84D5",0x52D9],
+  ["84D6",0x52DA],
+  ["84D7",0x52DB],
+  ["84D8",0x52DC],
+  ["84D9",0x52DD],
+  ["84DA",0x52DE],
+  ["C4BC",0x52DF],
+  ["84DB",0x52E0],
+  ["84DC",0x52E1],
+  ["84DD",0x52E2],
+  ["84DE",0x52E3],
+  ["C7DA",0x52E4],
+  ["84DF",0x52E5],
+  ["84E0",0x52E6],
+  ["84E1",0x52E7],
+  ["84E2",0x52E8],
+  ["84E3",0x52E9],
+  ["84E4",0x52EA],
+  ["84E5",0x52EB],
+  ["84E6",0x52EC],
+  ["84E7",0x52ED],
+  ["84E8",0x52EE],
+  ["84E9",0x52EF],
+  ["DBC4",0x52F0],
+  ["84EA",0x52F1],
+  ["84EB",0x52F2],
+  ["84EC",0x52F3],
+  ["84ED",0x52F4],
+  ["84EE",0x52F5],
+  ["84EF",0x52F6],
+  ["84F0",0x52F7],
+  ["84F1",0x52F8],
+  ["D9E8",0x52F9],
+  ["C9D7",0x52FA],
+  ["84F2",0x52FB],
+  ["84F3",0x52FC],
+  ["84F4",0x52FD],
+  ["B9B4",0x52FE],
+  ["CEF0",0x52FF],
+  ["D4C8",0x5300],
+  ["84F5",0x5301],
+  ["84F6",0x5302],
+  ["84F7",0x5303],
+  ["84F8",0x5304],
+  ["B0FC",0x5305],
+  ["B4D2",0x5306],
+  ["84F9",0x5307],
+  ["D0D9",0x5308],
+  ["84FA",0x5309],
+  ["84FB",0x530A],
+  ["84FC",0x530B],
+  ["84FD",0x530C],
+  ["D9E9",0x530D],
+  ["84FE",0x530E],
+  ["DECB",0x530F],
+  ["D9EB",0x5310],
+  ["8540",0x5311],
+  ["8541",0x5312],
+  ["8542",0x5313],
+  ["8543",0x5314],
+  ["D8B0",0x5315],
+  ["BBAF",0x5316],
+  ["B1B1",0x5317],
+  ["8544",0x5318],
+  ["B3D7",0x5319],
+  ["D8CE",0x531A],
+  ["8545",0x531B],
+  ["8546",0x531C],
+  ["D4D1",0x531D],
+  ["8547",0x531E],
+  ["8548",0x531F],
+  ["BDB3",0x5320],
+  ["BFEF",0x5321],
+  ["8549",0x5322],
+  ["CFBB",0x5323],
+  ["854A",0x5324],
+  ["854B",0x5325],
+  ["D8D0",0x5326],
+  ["854C",0x5327],
+  ["854D",0x5328],
+  ["854E",0x5329],
+  ["B7CB",0x532A],
+  ["854F",0x532B],
+  ["8550",0x532C],
+  ["8551",0x532D],
+  ["D8D1",0x532E],
+  ["8552",0x532F],
+  ["8553",0x5330],
+  ["8554",0x5331],
+  ["8555",0x5332],
+  ["8556",0x5333],
+  ["8557",0x5334],
+  ["8558",0x5335],
+  ["8559",0x5336],
+  ["855A",0x5337],
+  ["855B",0x5338],
+  ["C6A5",0x5339],
+  ["C7F8",0x533A],
+  ["D2BD",0x533B],
+  ["855C",0x533C],
+  ["855D",0x533D],
+  ["D8D2",0x533E],
+  ["C4E4",0x533F],
+  ["855E",0x5340],
+  ["CAAE",0x5341],
+  ["855F",0x5342],
+  ["C7A7",0x5343],
+  ["8560",0x5344],
+  ["D8A6",0x5345],
+  ["8561",0x5346],
+  ["C9FD",0x5347],
+  ["CEE7",0x5348],
+  ["BBDC",0x5349],
+  ["B0EB",0x534A],
+  ["8562",0x534B],
+  ["8563",0x534C],
+  ["8564",0x534D],
+  ["BBAA",0x534E],
+  ["D0AD",0x534F],
+  ["8565",0x5350],
+  ["B1B0",0x5351],
+  ["D7E4",0x5352],
+  ["D7BF",0x5353],
+  ["8566",0x5354],
+  ["B5A5",0x5355],
+  ["C2F4",0x5356],
+  ["C4CF",0x5357],
+  ["8567",0x5358],
+  ["8568",0x5359],
+  ["B2A9",0x535A],
+  ["8569",0x535B],
+  ["B2B7",0x535C],
+  ["856A",0x535D],
+  ["B1E5",0x535E],
+  ["DFB2",0x535F],
+  ["D5BC",0x5360],
+  ["BFA8",0x5361],
+  ["C2AC",0x5362],
+  ["D8D5",0x5363],
+  ["C2B1",0x5364],
+  ["856B",0x5365],
+  ["D8D4",0x5366],
+  ["CED4",0x5367],
+  ["856C",0x5368],
+  ["DAE0",0x5369],
+  ["856D",0x536A],
+  ["CEC0",0x536B],
+  ["856E",0x536C],
+  ["856F",0x536D],
+  ["D8B4",0x536E],
+  ["C3AE",0x536F],
+  ["D3A1",0x5370],
+  ["CEA3",0x5371],
+  ["8570",0x5372],
+  ["BCB4",0x5373],
+  ["C8B4",0x5374],
+  ["C2D1",0x5375],
+  ["8571",0x5376],
+  ["BEED",0x5377],
+  ["D0B6",0x5378],
+  ["8572",0x5379],
+  ["DAE1",0x537A],
+  ["8573",0x537B],
+  ["8574",0x537C],
+  ["8575",0x537D],
+  ["8576",0x537E],
+  ["C7E4",0x537F],
+  ["8577",0x5380],
+  ["8578",0x5381],
+  ["B3A7",0x5382],
+  ["8579",0x5383],
+  ["B6F2",0x5384],
+  ["CCFC",0x5385],
+  ["C0FA",0x5386],
+  ["857A",0x5387],
+  ["857B",0x5388],
+  ["C0F7",0x5389],
+  ["857C",0x538A],
+  ["D1B9",0x538B],
+  ["D1E1",0x538C],
+  ["D8C7",0x538D],
+  ["857D",0x538E],
+  ["857E",0x538F],
+  ["8580",0x5390],
+  ["8581",0x5391],
+  ["8582",0x5392],
+  ["8583",0x5393],
+  ["8584",0x5394],
+  ["B2DE",0x5395],
+  ["8585",0x5396],
+  ["8586",0x5397],
+  ["C0E5",0x5398],
+  ["8587",0x5399],
+  ["BAF1",0x539A],
+  ["8588",0x539B],
+  ["8589",0x539C],
+  ["D8C8",0x539D],
+  ["858A",0x539E],
+  ["D4AD",0x539F],
+  ["858B",0x53A0],
+  ["858C",0x53A1],
+  ["CFE1",0x53A2],
+  ["D8C9",0x53A3],
+  ["858D",0x53A4],
+  ["D8CA",0x53A5],
+  ["CFC3",0x53A6],
+  ["858E",0x53A7],
+  ["B3F8",0x53A8],
+  ["BEC7",0x53A9],
+  ["858F",0x53AA],
+  ["8590",0x53AB],
+  ["8591",0x53AC],
+  ["8592",0x53AD],
+  ["D8CB",0x53AE],
+  ["8593",0x53AF],
+  ["8594",0x53B0],
+  ["8595",0x53B1],
+  ["8596",0x53B2],
+  ["8597",0x53B3],
+  ["8598",0x53B4],
+  ["8599",0x53B5],
+  ["DBCC",0x53B6],
+  ["859A",0x53B7],
+  ["859B",0x53B8],
+  ["859C",0x53B9],
+  ["859D",0x53BA],
+  ["C8A5",0x53BB],
+  ["859E",0x53BC],
+  ["859F",0x53BD],
+  ["85A0",0x53BE],
+  ["CFD8",0x53BF],
+  ["85A1",0x53C0],
+  ["C8FE",0x53C1],
+  ["B2CE",0x53C2],
+  ["85A2",0x53C3],
+  ["85A3",0x53C4],
+  ["85A4",0x53C5],
+  ["85A5",0x53C6],
+  ["85A6",0x53C7],
+  ["D3D6",0x53C8],
+  ["B2E6",0x53C9],
+  ["BCB0",0x53CA],
+  ["D3D1",0x53CB],
+  ["CBAB",0x53CC],
+  ["B7B4",0x53CD],
+  ["85A7",0x53CE],
+  ["85A8",0x53CF],
+  ["85A9",0x53D0],
+  ["B7A2",0x53D1],
+  ["85AA",0x53D2],
+  ["85AB",0x53D3],
+  ["CAE5",0x53D4],
+  ["85AC",0x53D5],
+  ["C8A1",0x53D6],
+  ["CADC",0x53D7],
+  ["B1E4",0x53D8],
+  ["D0F0",0x53D9],
+  ["85AD",0x53DA],
+  ["C5D1",0x53DB],
+  ["85AE",0x53DC],
+  ["85AF",0x53DD],
+  ["85B0",0x53DE],
+  ["DBC5",0x53DF],
+  ["B5FE",0x53E0],
+  ["85B1",0x53E1],
+  ["85B2",0x53E2],
+  ["BFDA",0x53E3],
+  ["B9C5",0x53E4],
+  ["BEE4",0x53E5],
+  ["C1ED",0x53E6],
+  ["85B3",0x53E7],
+  ["DFB6",0x53E8],
+  ["DFB5",0x53E9],
+  ["D6BB",0x53EA],
+  ["BDD0",0x53EB],
+  ["D5D9",0x53EC],
+  ["B0C8",0x53ED],
+  ["B6A3",0x53EE],
+  ["BFC9",0x53EF],
+  ["CCA8",0x53F0],
+  ["DFB3",0x53F1],
+  ["CAB7",0x53F2],
+  ["D3D2",0x53F3],
+  ["85B4",0x53F4],
+  ["D8CF",0x53F5],
+  ["D2B6",0x53F6],
+  ["BAC5",0x53F7],
+  ["CBBE",0x53F8],
+  ["CCBE",0x53F9],
+  ["85B5",0x53FA],
+  ["DFB7",0x53FB],
+  ["B5F0",0x53FC],
+  ["DFB4",0x53FD],
+  ["85B6",0x53FE],
+  ["85B7",0x53FF],
+  ["85B8",0x5400],
+  ["D3F5",0x5401],
+  ["85B9",0x5402],
+  ["B3D4",0x5403],
+  ["B8F7",0x5404],
+  ["85BA",0x5405],
+  ["DFBA",0x5406],
+  ["85BB",0x5407],
+  ["BACF",0x5408],
+  ["BCAA",0x5409],
+  ["B5F5",0x540A],
+  ["85BC",0x540B],
+  ["CDAC",0x540C],
+  ["C3FB",0x540D],
+  ["BAF3",0x540E],
+  ["C0F4",0x540F],
+  ["CDC2",0x5410],
+  ["CFF2",0x5411],
+  ["DFB8",0x5412],
+  ["CFC5",0x5413],
+  ["85BD",0x5414],
+  ["C2C0",0x5415],
+  ["DFB9",0x5416],
+  ["C2F0",0x5417],
+  ["85BE",0x5418],
+  ["85BF",0x5419],
+  ["85C0",0x541A],
+  ["BEFD",0x541B],
+  ["85C1",0x541C],
+  ["C1DF",0x541D],
+  ["CDCC",0x541E],
+  ["D2F7",0x541F],
+  ["B7CD",0x5420],
+  ["DFC1",0x5421],
+  ["85C2",0x5422],
+  ["DFC4",0x5423],
+  ["85C3",0x5424],
+  ["85C4",0x5425],
+  ["B7F1",0x5426],
+  ["B0C9",0x5427],
+  ["B6D6",0x5428],
+  ["B7D4",0x5429],
+  ["85C5",0x542A],
+  ["BAAC",0x542B],
+  ["CCFD",0x542C],
+  ["BFD4",0x542D],
+  ["CBB1",0x542E],
+  ["C6F4",0x542F],
+  ["85C6",0x5430],
+  ["D6A8",0x5431],
+  ["DFC5",0x5432],
+  ["85C7",0x5433],
+  ["CEE2",0x5434],
+  ["B3B3",0x5435],
+  ["85C8",0x5436],
+  ["85C9",0x5437],
+  ["CEFC",0x5438],
+  ["B4B5",0x5439],
+  ["85CA",0x543A],
+  ["CEC7",0x543B],
+  ["BAF0",0x543C],
+  ["85CB",0x543D],
+  ["CEE1",0x543E],
+  ["85CC",0x543F],
+  ["D1BD",0x5440],
+  ["85CD",0x5441],
+  ["85CE",0x5442],
+  ["DFC0",0x5443],
+  ["85CF",0x5444],
+  ["85D0",0x5445],
+  ["B4F4",0x5446],
+  ["85D1",0x5447],
+  ["B3CA",0x5448],
+  ["85D2",0x5449],
+  ["B8E6",0x544A],
+  ["DFBB",0x544B],
+  ["85D3",0x544C],
+  ["85D4",0x544D],
+  ["85D5",0x544E],
+  ["85D6",0x544F],
+  ["C4C5",0x5450],
+  ["85D7",0x5451],
+  ["DFBC",0x5452],
+  ["DFBD",0x5453],
+  ["DFBE",0x5454],
+  ["C5BB",0x5455],
+  ["DFBF",0x5456],
+  ["DFC2",0x5457],
+  ["D4B1",0x5458],
+  ["DFC3",0x5459],
+  ["85D8",0x545A],
+  ["C7BA",0x545B],
+  ["CED8",0x545C],
+  ["85D9",0x545D],
+  ["85DA",0x545E],
+  ["85DB",0x545F],
+  ["85DC",0x5460],
+  ["85DD",0x5461],
+  ["C4D8",0x5462],
+  ["85DE",0x5463],
+  ["DFCA",0x5464],
+  ["85DF",0x5465],
+  ["DFCF",0x5466],
+  ["85E0",0x5467],
+  ["D6DC",0x5468],
+  ["85E1",0x5469],
+  ["85E2",0x546A],
+  ["85E3",0x546B],
+  ["85E4",0x546C],
+  ["85E5",0x546D],
+  ["85E6",0x546E],
+  ["85E7",0x546F],
+  ["85E8",0x5470],
+  ["DFC9",0x5471],
+  ["DFDA",0x5472],
+  ["CEB6",0x5473],
+  ["85E9",0x5474],
+  ["BAC7",0x5475],
+  ["DFCE",0x5476],
+  ["DFC8",0x5477],
+  ["C5DE",0x5478],
+  ["85EA",0x5479],
+  ["85EB",0x547A],
+  ["C9EB",0x547B],
+  ["BAF4",0x547C],
+  ["C3FC",0x547D],
+  ["85EC",0x547E],
+  ["85ED",0x547F],
+  ["BED7",0x5480],
+  ["85EE",0x5481],
+  ["DFC6",0x5482],
+  ["85EF",0x5483],
+  ["DFCD",0x5484],
+  ["85F0",0x5485],
+  ["C5D8",0x5486],
+  ["85F1",0x5487],
+  ["85F2",0x5488],
+  ["85F3",0x5489],
+  ["85F4",0x548A],
+  ["D5A6",0x548B],
+  ["BACD",0x548C],
+  ["85F5",0x548D],
+  ["BECC",0x548E],
+  ["D3BD",0x548F],
+  ["B8C0",0x5490],
+  ["85F6",0x5491],
+  ["D6E4",0x5492],
+  ["85F7",0x5493],
+  ["DFC7",0x5494],
+  ["B9BE",0x5495],
+  ["BFA7",0x5496],
+  ["85F8",0x5497],
+  ["85F9",0x5498],
+  ["C1FC",0x5499],
+  ["DFCB",0x549A],
+  ["DFCC",0x549B],
+  ["85FA",0x549C],
+  ["DFD0",0x549D],
+  ["85FB",0x549E],
+  ["85FC",0x549F],
+  ["85FD",0x54A0],
+  ["85FE",0x54A1],
+  ["8640",0x54A2],
+  ["DFDB",0x54A3],
+  ["DFE5",0x54A4],
+  ["8641",0x54A5],
+  ["DFD7",0x54A6],
+  ["DFD6",0x54A7],
+  ["D7C9",0x54A8],
+  ["DFE3",0x54A9],
+  ["DFE4",0x54AA],
+  ["E5EB",0x54AB],
+  ["D2A7",0x54AC],
+  ["DFD2",0x54AD],
+  ["8642",0x54AE],
+  ["BFA9",0x54AF],
+  ["8643",0x54B0],
+  ["D4DB",0x54B1],
+  ["8644",0x54B2],
+  ["BFC8",0x54B3],
+  ["DFD4",0x54B4],
+  ["8645",0x54B5],
+  ["8646",0x54B6],
+  ["8647",0x54B7],
+  ["CFCC",0x54B8],
+  ["8648",0x54B9],
+  ["8649",0x54BA],
+  ["DFDD",0x54BB],
+  ["864A",0x54BC],
+  ["D1CA",0x54BD],
+  ["864B",0x54BE],
+  ["DFDE",0x54BF],
+  ["B0A7",0x54C0],
+  ["C6B7",0x54C1],
+  ["DFD3",0x54C2],
+  ["864C",0x54C3],
+  ["BAE5",0x54C4],
+  ["864D",0x54C5],
+  ["B6DF",0x54C6],
+  ["CDDB",0x54C7],
+  ["B9FE",0x54C8],
+  ["D4D5",0x54C9],
+  ["864E",0x54CA],
+  ["864F",0x54CB],
+  ["DFDF",0x54CC],
+  ["CFEC",0x54CD],
+  ["B0A5",0x54CE],
+  ["DFE7",0x54CF],
+  ["DFD1",0x54D0],
+  ["D1C6",0x54D1],
+  ["DFD5",0x54D2],
+  ["DFD8",0x54D3],
+  ["DFD9",0x54D4],
+  ["DFDC",0x54D5],
+  ["8650",0x54D6],
+  ["BBA9",0x54D7],
+  ["8651",0x54D8],
+  ["DFE0",0x54D9],
+  ["DFE1",0x54DA],
+  ["8652",0x54DB],
+  ["DFE2",0x54DC],
+  ["DFE6",0x54DD],
+  ["DFE8",0x54DE],
+  ["D3B4",0x54DF],
+  ["8653",0x54E0],
+  ["8654",0x54E1],
+  ["8655",0x54E2],
+  ["8656",0x54E3],
+  ["8657",0x54E4],
+  ["B8E7",0x54E5],
+  ["C5B6",0x54E6],
+  ["DFEA",0x54E7],
+  ["C9DA",0x54E8],
+  ["C1A8",0x54E9],
+  ["C4C4",0x54EA],
+  ["8658",0x54EB],
+  ["8659",0x54EC],
+  ["BFDE",0x54ED],
+  ["CFF8",0x54EE],
+  ["865A",0x54EF],
+  ["865B",0x54F0],
+  ["865C",0x54F1],
+  ["D5DC",0x54F2],
+  ["DFEE",0x54F3],
+  ["865D",0x54F4],
+  ["865E",0x54F5],
+  ["865F",0x54F6],
+  ["8660",0x54F7],
+  ["8661",0x54F8],
+  ["8662",0x54F9],
+  ["B2B8",0x54FA],
+  ["8663",0x54FB],
+  ["BADF",0x54FC],
+  ["DFEC",0x54FD],
+  ["8664",0x54FE],
+  ["DBC1",0x54FF],
+  ["8665",0x5500],
+  ["D1E4",0x5501],
+  ["8666",0x5502],
+  ["8667",0x5503],
+  ["8668",0x5504],
+  ["8669",0x5505],
+  ["CBF4",0x5506],
+  ["B4BD",0x5507],
+  ["866A",0x5508],
+  ["B0A6",0x5509],
+  ["866B",0x550A],
+  ["866C",0x550B],
+  ["866D",0x550C],
+  ["866E",0x550D],
+  ["866F",0x550E],
+  ["DFF1",0x550F],
+  ["CCC6",0x5510],
+  ["DFF2",0x5511],
+  ["8670",0x5512],
+  ["8671",0x5513],
+  ["DFED",0x5514],
+  ["8672",0x5515],
+  ["8673",0x5516],
+  ["8674",0x5517],
+  ["8675",0x5518],
+  ["8676",0x5519],
+  ["8677",0x551A],
+  ["DFE9",0x551B],
+  ["8678",0x551C],
+  ["8679",0x551D],
+  ["867A",0x551E],
+  ["867B",0x551F],
+  ["DFEB",0x5520],
+  ["867C",0x5521],
+  ["DFEF",0x5522],
+  ["DFF0",0x5523],
+  ["BBBD",0x5524],
+  ["867D",0x5525],
+  ["867E",0x5526],
+  ["DFF3",0x5527],
+  ["8680",0x5528],
+  ["8681",0x5529],
+  ["DFF4",0x552A],
+  ["8682",0x552B],
+  ["BBA3",0x552C],
+  ["8683",0x552D],
+  ["CADB",0x552E],
+  ["CEA8",0x552F],
+  ["E0A7",0x5530],
+  ["B3AA",0x5531],
+  ["8684",0x5532],
+  ["E0A6",0x5533],
+  ["8685",0x5534],
+  ["8686",0x5535],
+  ["8687",0x5536],
+  ["E0A1",0x5537],
+  ["8688",0x5538],
+  ["8689",0x5539],
+  ["868A",0x553A],
+  ["868B",0x553B],
+  ["DFFE",0x553C],
+  ["868C",0x553D],
+  ["CDD9",0x553E],
+  ["DFFC",0x553F],
+  ["868D",0x5540],
+  ["DFFA",0x5541],
+  ["868E",0x5542],
+  ["BFD0",0x5543],
+  ["D7C4",0x5544],
+  ["868F",0x5545],
+  ["C9CC",0x5546],
+  ["8690",0x5547],
+  ["8691",0x5548],
+  ["DFF8",0x5549],
+  ["B0A1",0x554A],
+  ["8692",0x554B],
+  ["8693",0x554C],
+  ["8694",0x554D],
+  ["8695",0x554E],
+  ["8696",0x554F],
+  ["DFFD",0x5550],
+  ["8697",0x5551],
+  ["8698",0x5552],
+  ["8699",0x5553],
+  ["869A",0x5554],
+  ["DFFB",0x5555],
+  ["E0A2",0x5556],
+  ["869B",0x5557],
+  ["869C",0x5558],
+  ["869D",0x5559],
+  ["869E",0x555A],
+  ["869F",0x555B],
+  ["E0A8",0x555C],
+  ["86A0",0x555D],
+  ["86A1",0x555E],
+  ["86A2",0x555F],
+  ["86A3",0x5560],
+  ["B7C8",0x5561],
+  ["86A4",0x5562],
+  ["86A5",0x5563],
+  ["C6A1",0x5564],
+  ["C9B6",0x5565],
+  ["C0B2",0x5566],
+  ["DFF5",0x5567],
+  ["86A6",0x5568],
+  ["86A7",0x5569],
+  ["C5BE",0x556A],
+  ["86A8",0x556B],
+  ["D8C4",0x556C],
+  ["DFF9",0x556D],
+  ["C4F6",0x556E],
+  ["86A9",0x556F],
+  ["86AA",0x5570],
+  ["86AB",0x5571],
+  ["86AC",0x5572],
+  ["86AD",0x5573],
+  ["86AE",0x5574],
+  ["E0A3",0x5575],
+  ["E0A4",0x5576],
+  ["E0A5",0x5577],
+  ["D0A5",0x5578],
+  ["86AF",0x5579],
+  ["86B0",0x557A],
+  ["E0B4",0x557B],
+  ["CCE4",0x557C],
+  ["86B1",0x557D],
+  ["E0B1",0x557E],
+  ["86B2",0x557F],
+  ["BFA6",0x5580],
+  ["E0AF",0x5581],
+  ["CEB9",0x5582],
+  ["E0AB",0x5583],
+  ["C9C6",0x5584],
+  ["86B3",0x5585],
+  ["86B4",0x5586],
+  ["C0AE",0x5587],
+  ["E0AE",0x5588],
+  ["BAED",0x5589],
+  ["BAB0",0x558A],
+  ["E0A9",0x558B],
+  ["86B5",0x558C],
+  ["86B6",0x558D],
+  ["86B7",0x558E],
+  ["DFF6",0x558F],
+  ["86B8",0x5590],
+  ["E0B3",0x5591],
+  ["86B9",0x5592],
+  ["86BA",0x5593],
+  ["E0B8",0x5594],
+  ["86BB",0x5595],
+  ["86BC",0x5596],
+  ["86BD",0x5597],
+  ["B4AD",0x5598],
+  ["E0B9",0x5599],
+  ["86BE",0x559A],
+  ["86BF",0x559B],
+  ["CFB2",0x559C],
+  ["BAC8",0x559D],
+  ["86C0",0x559E],
+  ["E0B0",0x559F],
+  ["86C1",0x55A0],
+  ["86C2",0x55A1],
+  ["86C3",0x55A2],
+  ["86C4",0x55A3],
+  ["86C5",0x55A4],
+  ["86C6",0x55A5],
+  ["86C7",0x55A6],
+  ["D0FA",0x55A7],
+  ["86C8",0x55A8],
+  ["86C9",0x55A9],
+  ["86CA",0x55AA],
+  ["86CB",0x55AB],
+  ["86CC",0x55AC],
+  ["86CD",0x55AD],
+  ["86CE",0x55AE],
+  ["86CF",0x55AF],
+  ["86D0",0x55B0],
+  ["E0AC",0x55B1],
+  ["86D1",0x55B2],
+  ["D4FB",0x55B3],
+  ["86D2",0x55B4],
+  ["DFF7",0x55B5],
+  ["86D3",0x55B6],
+  ["C5E7",0x55B7],
+  ["86D4",0x55B8],
+  ["E0AD",0x55B9],
+  ["86D5",0x55BA],
+  ["D3F7",0x55BB],
+  ["86D6",0x55BC],
+  ["E0B6",0x55BD],
+  ["E0B7",0x55BE],
+  ["86D7",0x55BF],
+  ["86D8",0x55C0],
+  ["86D9",0x55C1],
+  ["86DA",0x55C2],
+  ["86DB",0x55C3],
+  ["E0C4",0x55C4],
+  ["D0E1",0x55C5],
+  ["86DC",0x55C6],
+  ["86DD",0x55C7],
+  ["86DE",0x55C8],
+  ["E0BC",0x55C9],
+  ["86DF",0x55CA],
+  ["86E0",0x55CB],
+  ["E0C9",0x55CC],
+  ["E0CA",0x55CD],
+  ["86E1",0x55CE],
+  ["86E2",0x55CF],
+  ["86E3",0x55D0],
+  ["E0BE",0x55D1],
+  ["E0AA",0x55D2],
+  ["C9A4",0x55D3],
+  ["E0C1",0x55D4],
+  ["86E4",0x55D5],
+  ["E0B2",0x55D6],
+  ["86E5",0x55D7],
+  ["86E6",0x55D8],
+  ["86E7",0x55D9],
+  ["86E8",0x55DA],
+  ["86E9",0x55DB],
+  ["CAC8",0x55DC],
+  ["E0C3",0x55DD],
+  ["86EA",0x55DE],
+  ["E0B5",0x55DF],
+  ["86EB",0x55E0],
+  ["CECB",0x55E1],
+  ["86EC",0x55E2],
+  ["CBC3",0x55E3],
+  ["E0CD",0x55E4],
+  ["E0C6",0x55E5],
+  ["E0C2",0x55E6],
+  ["86ED",0x55E7],
+  ["E0CB",0x55E8],
+  ["86EE",0x55E9],
+  ["E0BA",0x55EA],
+  ["E0BF",0x55EB],
+  ["E0C0",0x55EC],
+  ["86EF",0x55ED],
+  ["86F0",0x55EE],
+  ["E0C5",0x55EF],
+  ["86F1",0x55F0],
+  ["86F2",0x55F1],
+  ["E0C7",0x55F2],
+  ["E0C8",0x55F3],
+  ["86F3",0x55F4],
+  ["E0CC",0x55F5],
+  ["86F4",0x55F6],
+  ["E0BB",0x55F7],
+  ["86F5",0x55F8],
+  ["86F6",0x55F9],
+  ["86F7",0x55FA],
+  ["86F8",0x55FB],
+  ["86F9",0x55FC],
+  ["CBD4",0x55FD],
+  ["E0D5",0x55FE],
+  ["86FA",0x55FF],
+  ["E0D6",0x5600],
+  ["E0D2",0x5601],
+  ["86FB",0x5602],
+  ["86FC",0x5603],
+  ["86FD",0x5604],
+  ["86FE",0x5605],
+  ["8740",0x5606],
+  ["8741",0x5607],
+  ["E0D0",0x5608],
+  ["BCCE",0x5609],
+  ["8742",0x560A],
+  ["8743",0x560B],
+  ["E0D1",0x560C],
+  ["8744",0x560D],
+  ["B8C2",0x560E],
+  ["D8C5",0x560F],
+  ["8745",0x5610],
+  ["8746",0x5611],
+  ["8747",0x5612],
+  ["8748",0x5613],
+  ["8749",0x5614],
+  ["874A",0x5615],
+  ["874B",0x5616],
+  ["874C",0x5617],
+  ["D0EA",0x5618],
+  ["874D",0x5619],
+  ["874E",0x561A],
+  ["C2EF",0x561B],
+  ["874F",0x561C],
+  ["8750",0x561D],
+  ["E0CF",0x561E],
+  ["E0BD",0x561F],
+  ["8751",0x5620],
+  ["8752",0x5621],
+  ["8753",0x5622],
+  ["E0D4",0x5623],
+  ["E0D3",0x5624],
+  ["8754",0x5625],
+  ["8755",0x5626],
+  ["E0D7",0x5627],
+  ["8756",0x5628],
+  ["8757",0x5629],
+  ["8758",0x562A],
+  ["8759",0x562B],
+  ["E0DC",0x562C],
+  ["E0D8",0x562D],
+  ["875A",0x562E],
+  ["875B",0x562F],
+  ["875C",0x5630],
+  ["D6F6",0x5631],
+  ["B3B0",0x5632],
+  ["875D",0x5633],
+  ["D7EC",0x5634],
+  ["875E",0x5635],
+  ["CBBB",0x5636],
+  ["875F",0x5637],
+  ["8760",0x5638],
+  ["E0DA",0x5639],
+  ["8761",0x563A],
+  ["CEFB",0x563B],
+  ["8762",0x563C],
+  ["8763",0x563D],
+  ["8764",0x563E],
+  ["BAD9",0x563F],
+  ["8765",0x5640],
+  ["8766",0x5641],
+  ["8767",0x5642],
+  ["8768",0x5643],
+  ["8769",0x5644],
+  ["876A",0x5645],
+  ["876B",0x5646],
+  ["876C",0x5647],
+  ["876D",0x5648],
+  ["876E",0x5649],
+  ["876F",0x564A],
+  ["8770",0x564B],
+  ["E0E1",0x564C],
+  ["E0DD",0x564D],
+  ["D2AD",0x564E],
+  ["8771",0x564F],
+  ["8772",0x5650],
+  ["8773",0x5651],
+  ["8774",0x5652],
+  ["8775",0x5653],
+  ["E0E2",0x5654],
+  ["8776",0x5655],
+  ["8777",0x5656],
+  ["E0DB",0x5657],
+  ["E0D9",0x5658],
+  ["E0DF",0x5659],
+  ["8778",0x565A],
+  ["8779",0x565B],
+  ["E0E0",0x565C],
+  ["877A",0x565D],
+  ["877B",0x565E],
+  ["877C",0x565F],
+  ["877D",0x5660],
+  ["877E",0x5661],
+  ["E0DE",0x5662],
+  ["8780",0x5663],
+  ["E0E4",0x5664],
+  ["8781",0x5665],
+  ["8782",0x5666],
+  ["8783",0x5667],
+  ["C6F7",0x5668],
+  ["D8AC",0x5669],
+  ["D4EB",0x566A],
+  ["E0E6",0x566B],
+  ["CAC9",0x566C],
+  ["8784",0x566D],
+  ["8785",0x566E],
+  ["8786",0x566F],
+  ["8787",0x5670],
+  ["E0E5",0x5671],
+  ["8788",0x5672],
+  ["8789",0x5673],
+  ["878A",0x5674],
+  ["878B",0x5675],
+  ["B8C1",0x5676],
+  ["878C",0x5677],
+  ["878D",0x5678],
+  ["878E",0x5679],
+  ["878F",0x567A],
+  ["E0E7",0x567B],
+  ["E0E8",0x567C],
+  ["8790",0x567D],
+  ["8791",0x567E],
+  ["8792",0x567F],
+  ["8793",0x5680],
+  ["8794",0x5681],
+  ["8795",0x5682],
+  ["8796",0x5683],
+  ["8797",0x5684],
+  ["E0E9",0x5685],
+  ["E0E3",0x5686],
+  ["8798",0x5687],
+  ["8799",0x5688],
+  ["879A",0x5689],
+  ["879B",0x568A],
+  ["879C",0x568B],
+  ["879D",0x568C],
+  ["879E",0x568D],
+  ["BABF",0x568E],
+  ["CCE7",0x568F],
+  ["879F",0x5690],
+  ["87A0",0x5691],
+  ["87A1",0x5692],
+  ["E0EA",0x5693],
+  ["87A2",0x5694],
+  ["87A3",0x5695],
+  ["87A4",0x5696],
+  ["87A5",0x5697],
+  ["87A6",0x5698],
+  ["87A7",0x5699],
+  ["87A8",0x569A],
+  ["87A9",0x569B],
+  ["87AA",0x569C],
+  ["87AB",0x569D],
+  ["87AC",0x569E],
+  ["87AD",0x569F],
+  ["87AE",0x56A0],
+  ["87AF",0x56A1],
+  ["87B0",0x56A2],
+  ["CFF9",0x56A3],
+  ["87B1",0x56A4],
+  ["87B2",0x56A5],
+  ["87B3",0x56A6],
+  ["87B4",0x56A7],
+  ["87B5",0x56A8],
+  ["87B6",0x56A9],
+  ["87B7",0x56AA],
+  ["87B8",0x56AB],
+  ["87B9",0x56AC],
+  ["87BA",0x56AD],
+  ["87BB",0x56AE],
+  ["E0EB",0x56AF],
+  ["87BC",0x56B0],
+  ["87BD",0x56B1],
+  ["87BE",0x56B2],
+  ["87BF",0x56B3],
+  ["87C0",0x56B4],
+  ["87C1",0x56B5],
+  ["87C2",0x56B6],
+  ["C8C2",0x56B7],
+  ["87C3",0x56B8],
+  ["87C4",0x56B9],
+  ["87C5",0x56BA],
+  ["87C6",0x56BB],
+  ["BDC0",0x56BC],
+  ["87C7",0x56BD],
+  ["87C8",0x56BE],
+  ["87C9",0x56BF],
+  ["87CA",0x56C0],
+  ["87CB",0x56C1],
+  ["87CC",0x56C2],
+  ["87CD",0x56C3],
+  ["87CE",0x56C4],
+  ["87CF",0x56C5],
+  ["87D0",0x56C6],
+  ["87D1",0x56C7],
+  ["87D2",0x56C8],
+  ["87D3",0x56C9],
+  ["C4D2",0x56CA],
+  ["87D4",0x56CB],
+  ["87D5",0x56CC],
+  ["87D6",0x56CD],
+  ["87D7",0x56CE],
+  ["87D8",0x56CF],
+  ["87D9",0x56D0],
+  ["87DA",0x56D1],
+  ["87DB",0x56D2],
+  ["87DC",0x56D3],
+  ["E0EC",0x56D4],
+  ["87DD",0x56D5],
+  ["87DE",0x56D6],
+  ["E0ED",0x56D7],
+  ["87DF",0x56D8],
+  ["87E0",0x56D9],
+  ["C7F4",0x56DA],
+  ["CBC4",0x56DB],
+  ["87E1",0x56DC],
+  ["E0EE",0x56DD],
+  ["BBD8",0x56DE],
+  ["D8B6",0x56DF],
+  ["D2F2",0x56E0],
+  ["E0EF",0x56E1],
+  ["CDC5",0x56E2],
+  ["87E2",0x56E3],
+  ["B6DA",0x56E4],
+  ["87E3",0x56E5],
+  ["87E4",0x56E6],
+  ["87E5",0x56E7],
+  ["87E6",0x56E8],
+  ["87E7",0x56E9],
+  ["87E8",0x56EA],
+  ["E0F1",0x56EB],
+  ["87E9",0x56EC],
+  ["D4B0",0x56ED],
+  ["87EA",0x56EE],
+  ["87EB",0x56EF],
+  ["C0A7",0x56F0],
+  ["B4D1",0x56F1],
+  ["87EC",0x56F2],
+  ["87ED",0x56F3],
+  ["CEA7",0x56F4],
+  ["E0F0",0x56F5],
+  ["87EE",0x56F6],
+  ["87EF",0x56F7],
+  ["87F0",0x56F8],
+  ["E0F2",0x56F9],
+  ["B9CC",0x56FA],
+  ["87F1",0x56FB],
+  ["87F2",0x56FC],
+  ["B9FA",0x56FD],
+  ["CDBC",0x56FE],
+  ["E0F3",0x56FF],
+  ["87F3",0x5700],
+  ["87F4",0x5701],
+  ["87F5",0x5702],
+  ["C6D4",0x5703],
+  ["E0F4",0x5704],
+  ["87F6",0x5705],
+  ["D4B2",0x5706],
+  ["87F7",0x5707],
+  ["C8A6",0x5708],
+  ["E0F6",0x5709],
+  ["E0F5",0x570A],
+  ["87F8",0x570B],
+  ["87F9",0x570C],
+  ["87FA",0x570D],
+  ["87FB",0x570E],
+  ["87FC",0x570F],
+  ["87FD",0x5710],
+  ["87FE",0x5711],
+  ["8840",0x5712],
+  ["8841",0x5713],
+  ["8842",0x5714],
+  ["8843",0x5715],
+  ["8844",0x5716],
+  ["8845",0x5717],
+  ["8846",0x5718],
+  ["8847",0x5719],
+  ["8848",0x571A],
+  ["8849",0x571B],
+  ["E0F7",0x571C],
+  ["884A",0x571D],
+  ["884B",0x571E],
+  ["CDC1",0x571F],
+  ["884C",0x5720],
+  ["884D",0x5721],
+  ["884E",0x5722],
+  ["CAA5",0x5723],
+  ["884F",0x5724],
+  ["8850",0x5725],
+  ["8851",0x5726],
+  ["8852",0x5727],
+  ["D4DA",0x5728],
+  ["DBD7",0x5729],
+  ["DBD9",0x572A],
+  ["8853",0x572B],
+  ["DBD8",0x572C],
+  ["B9E7",0x572D],
+  ["DBDC",0x572E],
+  ["DBDD",0x572F],
+  ["B5D8",0x5730],
+  ["8854",0x5731],
+  ["8855",0x5732],
+  ["DBDA",0x5733],
+  ["8856",0x5734],
+  ["8857",0x5735],
+  ["8858",0x5736],
+  ["8859",0x5737],
+  ["885A",0x5738],
+  ["DBDB",0x5739],
+  ["B3A1",0x573A],
+  ["DBDF",0x573B],
+  ["885B",0x573C],
+  ["885C",0x573D],
+  ["BBF8",0x573E],
+  ["885D",0x573F],
+  ["D6B7",0x5740],
+  ["885E",0x5741],
+  ["DBE0",0x5742],
+  ["885F",0x5743],
+  ["8860",0x5744],
+  ["8861",0x5745],
+  ["8862",0x5746],
+  ["BEF9",0x5747],
+  ["8863",0x5748],
+  ["8864",0x5749],
+  ["B7BB",0x574A],
+  ["8865",0x574B],
+  ["DBD0",0x574C],
+  ["CCAE",0x574D],
+  ["BFB2",0x574E],
+  ["BBB5",0x574F],
+  ["D7F8",0x5750],
+  ["BFD3",0x5751],
+  ["8866",0x5752],
+  ["8867",0x5753],
+  ["8868",0x5754],
+  ["8869",0x5755],
+  ["886A",0x5756],
+  ["BFE9",0x5757],
+  ["886B",0x5758],
+  ["886C",0x5759],
+  ["BCE1",0x575A],
+  ["CCB3",0x575B],
+  ["DBDE",0x575C],
+  ["B0D3",0x575D],
+  ["CEEB",0x575E],
+  ["B7D8",0x575F],
+  ["D7B9",0x5760],
+  ["C6C2",0x5761],
+  ["886D",0x5762],
+  ["886E",0x5763],
+  ["C0A4",0x5764],
+  ["886F",0x5765],
+  ["CCB9",0x5766],
+  ["8870",0x5767],
+  ["DBE7",0x5768],
+  ["DBE1",0x5769],
+  ["C6BA",0x576A],
+  ["DBE3",0x576B],
+  ["8871",0x576C],
+  ["DBE8",0x576D],
+  ["8872",0x576E],
+  ["C5F7",0x576F],
+  ["8873",0x5770],
+  ["8874",0x5771],
+  ["8875",0x5772],
+  ["DBEA",0x5773],
+  ["8876",0x5774],
+  ["8877",0x5775],
+  ["DBE9",0x5776],
+  ["BFC0",0x5777],
+  ["8878",0x5778],
+  ["8879",0x5779],
+  ["887A",0x577A],
+  ["DBE6",0x577B],
+  ["DBE5",0x577C],
+  ["887B",0x577D],
+  ["887C",0x577E],
+  ["887D",0x577F],
+  ["887E",0x5780],
+  ["8880",0x5781],
+  ["B4B9",0x5782],
+  ["C0AC",0x5783],
+  ["C2A2",0x5784],
+  ["DBE2",0x5785],
+  ["DBE4",0x5786],
+  ["8881",0x5787],
+  ["8882",0x5788],
+  ["8883",0x5789],
+  ["8884",0x578A],
+  ["D0CD",0x578B],
+  ["DBED",0x578C],
+  ["8885",0x578D],
+  ["8886",0x578E],
+  ["8887",0x578F],
+  ["8888",0x5790],
+  ["8889",0x5791],
+  ["C0DD",0x5792],
+  ["DBF2",0x5793],
+  ["888A",0x5794],
+  ["888B",0x5795],
+  ["888C",0x5796],
+  ["888D",0x5797],
+  ["888E",0x5798],
+  ["888F",0x5799],
+  ["8890",0x579A],
+  ["B6E2",0x579B],
+  ["8891",0x579C],
+  ["8892",0x579D],
+  ["8893",0x579E],
+  ["8894",0x579F],
+  ["DBF3",0x57A0],
+  ["DBD2",0x57A1],
+  ["B9B8",0x57A2],
+  ["D4AB",0x57A3],
+  ["DBEC",0x57A4],
+  ["8895",0x57A5],
+  ["BFD1",0x57A6],
+  ["DBF0",0x57A7],
+  ["8896",0x57A8],
+  ["DBD1",0x57A9],
+  ["8897",0x57AA],
+  ["B5E6",0x57AB],
+  ["8898",0x57AC],
+  ["DBEB",0x57AD],
+  ["BFE5",0x57AE],
+  ["8899",0x57AF],
+  ["889A",0x57B0],
+  ["889B",0x57B1],
+  ["DBEE",0x57B2],
+  ["889C",0x57B3],
+  ["DBF1",0x57B4],
+  ["889D",0x57B5],
+  ["889E",0x57B6],
+  ["889F",0x57B7],
+  ["DBF9",0x57B8],
+  ["88A0",0x57B9],
+  ["88A1",0x57BA],
+  ["88A2",0x57BB],
+  ["88A3",0x57BC],
+  ["88A4",0x57BD],
+  ["88A5",0x57BE],
+  ["88A6",0x57BF],
+  ["88A7",0x57C0],
+  ["88A8",0x57C1],
+  ["B9A1",0x57C2],
+  ["B0A3",0x57C3],
+  ["88A9",0x57C4],
+  ["88AA",0x57C5],
+  ["88AB",0x57C6],
+  ["88AC",0x57C7],
+  ["88AD",0x57C8],
+  ["88AE",0x57C9],
+  ["88AF",0x57CA],
+  ["C2F1",0x57CB],
+  ["88B0",0x57CC],
+  ["88B1",0x57CD],
+  ["B3C7",0x57CE],
+  ["DBEF",0x57CF],
+  ["88B2",0x57D0],
+  ["88B3",0x57D1],
+  ["DBF8",0x57D2],
+  ["88B4",0x57D3],
+  ["C6D2",0x57D4],
+  ["DBF4",0x57D5],
+  ["88B5",0x57D6],
+  ["88B6",0x57D7],
+  ["DBF5",0x57D8],
+  ["DBF7",0x57D9],
+  ["DBF6",0x57DA],
+  ["88B7",0x57DB],
+  ["88B8",0x57DC],
+  ["DBFE",0x57DD],
+  ["88B9",0x57DE],
+  ["D3F2",0x57DF],
+  ["B2BA",0x57E0],
+  ["88BA",0x57E1],
+  ["88BB",0x57E2],
+  ["88BC",0x57E3],
+  ["DBFD",0x57E4],
+  ["88BD",0x57E5],
+  ["88BE",0x57E6],
+  ["88BF",0x57E7],
+  ["88C0",0x57E8],
+  ["88C1",0x57E9],
+  ["88C2",0x57EA],
+  ["88C3",0x57EB],
+  ["88C4",0x57EC],
+  ["DCA4",0x57ED],
+  ["88C5",0x57EE],
+  ["DBFB",0x57EF],
+  ["88C6",0x57F0],
+  ["88C7",0x57F1],
+  ["88C8",0x57F2],
+  ["88C9",0x57F3],
+  ["DBFA",0x57F4],
+  ["88CA",0x57F5],
+  ["88CB",0x57F6],
+  ["88CC",0x57F7],
+  ["DBFC",0x57F8],
+  ["C5E0",0x57F9],
+  ["BBF9",0x57FA],
+  ["88CD",0x57FB],
+  ["88CE",0x57FC],
+  ["DCA3",0x57FD],
+  ["88CF",0x57FE],
+  ["88D0",0x57FF],
+  ["DCA5",0x5800],
+  ["88D1",0x5801],
+  ["CCC3",0x5802],
+  ["88D2",0x5803],
+  ["88D3",0x5804],
+  ["88D4",0x5805],
+  ["B6D1",0x5806],
+  ["DDC0",0x5807],
+  ["88D5",0x5808],
+  ["88D6",0x5809],
+  ["88D7",0x580A],
+  ["DCA1",0x580B],
+  ["88D8",0x580C],
+  ["DCA2",0x580D],
+  ["88D9",0x580E],
+  ["88DA",0x580F],
+  ["88DB",0x5810],
+  ["C7B5",0x5811],
+  ["88DC",0x5812],
+  ["88DD",0x5813],
+  ["88DE",0x5814],
+  ["B6E9",0x5815],
+  ["88DF",0x5816],
+  ["88E0",0x5817],
+  ["88E1",0x5818],
+  ["DCA7",0x5819],
+  ["88E2",0x581A],
+  ["88E3",0x581B],
+  ["88E4",0x581C],
+  ["88E5",0x581D],
+  ["DCA6",0x581E],
+  ["88E6",0x581F],
+  ["DCA9",0x5820],
+  ["B1A4",0x5821],
+  ["88E7",0x5822],
+  ["88E8",0x5823],
+  ["B5CC",0x5824],
+  ["88E9",0x5825],
+  ["88EA",0x5826],
+  ["88EB",0x5827],
+  ["88EC",0x5828],
+  ["88ED",0x5829],
+  ["BFB0",0x582A],
+  ["88EE",0x582B],
+  ["88EF",0x582C],
+  ["88F0",0x582D],
+  ["88F1",0x582E],
+  ["88F2",0x582F],
+  ["D1DF",0x5830],
+  ["88F3",0x5831],
+  ["88F4",0x5832],
+  ["88F5",0x5833],
+  ["88F6",0x5834],
+  ["B6C2",0x5835],
+  ["88F7",0x5836],
+  ["88F8",0x5837],
+  ["88F9",0x5838],
+  ["88FA",0x5839],
+  ["88FB",0x583A],
+  ["88FC",0x583B],
+  ["88FD",0x583C],
+  ["88FE",0x583D],
+  ["8940",0x583E],
+  ["8941",0x583F],
+  ["8942",0x5840],
+  ["8943",0x5841],
+  ["8944",0x5842],
+  ["8945",0x5843],
+  ["DCA8",0x5844],
+  ["8946",0x5845],
+  ["8947",0x5846],
+  ["8948",0x5847],
+  ["8949",0x5848],
+  ["894A",0x5849],
+  ["894B",0x584A],
+  ["894C",0x584B],
+  ["CBFA",0x584C],
+  ["EBF3",0x584D],
+  ["894D",0x584E],
+  ["894E",0x584F],
+  ["894F",0x5850],
+  ["CBDC",0x5851],
+  ["8950",0x5852],
+  ["8951",0x5853],
+  ["CBFE",0x5854],
+  ["8952",0x5855],
+  ["8953",0x5856],
+  ["8954",0x5857],
+  ["CCC1",0x5858],
+  ["8955",0x5859],
+  ["8956",0x585A],
+  ["8957",0x585B],
+  ["8958",0x585C],
+  ["8959",0x585D],
+  ["C8FB",0x585E],
+  ["895A",0x585F],
+  ["895B",0x5860],
+  ["895C",0x5861],
+  ["895D",0x5862],
+  ["895E",0x5863],
+  ["895F",0x5864],
+  ["DCAA",0x5865],
+  ["8960",0x5866],
+  ["8961",0x5867],
+  ["8962",0x5868],
+  ["8963",0x5869],
+  ["8964",0x586A],
+  ["CCEE",0x586B],
+  ["DCAB",0x586C],
+  ["8965",0x586D],
+  ["8966",0x586E],
+  ["8967",0x586F],
+  ["8968",0x5870],
+  ["8969",0x5871],
+  ["896A",0x5872],
+  ["896B",0x5873],
+  ["896C",0x5874],
+  ["896D",0x5875],
+  ["896E",0x5876],
+  ["896F",0x5877],
+  ["8970",0x5878],
+  ["8971",0x5879],
+  ["8972",0x587A],
+  ["8973",0x587B],
+  ["8974",0x587C],
+  ["8975",0x587D],
+  ["DBD3",0x587E],
+  ["8976",0x587F],
+  ["DCAF",0x5880],
+  ["DCAC",0x5881],
+  ["8977",0x5882],
+  ["BEB3",0x5883],
+  ["8978",0x5884],
+  ["CAFB",0x5885],
+  ["8979",0x5886],
+  ["897A",0x5887],
+  ["897B",0x5888],
+  ["DCAD",0x5889],
+  ["897C",0x588A],
+  ["897D",0x588B],
+  ["897E",0x588C],
+  ["8980",0x588D],
+  ["8981",0x588E],
+  ["8982",0x588F],
+  ["8983",0x5890],
+  ["8984",0x5891],
+  ["C9CA",0x5892],
+  ["C4B9",0x5893],
+  ["8985",0x5894],
+  ["8986",0x5895],
+  ["8987",0x5896],
+  ["8988",0x5897],
+  ["8989",0x5898],
+  ["C7BD",0x5899],
+  ["DCAE",0x589A],
+  ["898A",0x589B],
+  ["898B",0x589C],
+  ["898C",0x589D],
+  ["D4F6",0x589E],
+  ["D0E6",0x589F],
+  ["898D",0x58A0],
+  ["898E",0x58A1],
+  ["898F",0x58A2],
+  ["8990",0x58A3],
+  ["8991",0x58A4],
+  ["8992",0x58A5],
+  ["8993",0x58A6],
+  ["8994",0x58A7],
+  ["C4AB",0x58A8],
+  ["B6D5",0x58A9],
+  ["8995",0x58AA],
+  ["8996",0x58AB],
+  ["8997",0x58AC],
+  ["8998",0x58AD],
+  ["8999",0x58AE],
+  ["899A",0x58AF],
+  ["899B",0x58B0],
+  ["899C",0x58B1],
+  ["899D",0x58B2],
+  ["899E",0x58B3],
+  ["899F",0x58B4],
+  ["89A0",0x58B5],
+  ["89A1",0x58B6],
+  ["89A2",0x58B7],
+  ["89A3",0x58B8],
+  ["89A4",0x58B9],
+  ["89A5",0x58BA],
+  ["89A6",0x58BB],
+  ["DBD4",0x58BC],
+  ["89A7",0x58BD],
+  ["89A8",0x58BE],
+  ["89A9",0x58BF],
+  ["89AA",0x58C0],
+  ["B1DA",0x58C1],
+  ["89AB",0x58C2],
+  ["89AC",0x58C3],
+  ["89AD",0x58C4],
+  ["DBD5",0x58C5],
+  ["89AE",0x58C6],
+  ["89AF",0x58C7],
+  ["89B0",0x58C8],
+  ["89B1",0x58C9],
+  ["89B2",0x58CA],
+  ["89B3",0x58CB],
+  ["89B4",0x58CC],
+  ["89B5",0x58CD],
+  ["89B6",0x58CE],
+  ["89B7",0x58CF],
+  ["89B8",0x58D0],
+  ["DBD6",0x58D1],
+  ["89B9",0x58D2],
+  ["89BA",0x58D3],
+  ["89BB",0x58D4],
+  ["BABE",0x58D5],
+  ["89BC",0x58D6],
+  ["89BD",0x58D7],
+  ["89BE",0x58D8],
+  ["89BF",0x58D9],
+  ["89C0",0x58DA],
+  ["89C1",0x58DB],
+  ["89C2",0x58DC],
+  ["89C3",0x58DD],
+  ["89C4",0x58DE],
+  ["89C5",0x58DF],
+  ["89C6",0x58E0],
+  ["89C7",0x58E1],
+  ["89C8",0x58E2],
+  ["89C9",0x58E3],
+  ["C8C0",0x58E4],
+  ["89CA",0x58E5],
+  ["89CB",0x58E6],
+  ["89CC",0x58E7],
+  ["89CD",0x58E8],
+  ["89CE",0x58E9],
+  ["89CF",0x58EA],
+  ["CABF",0x58EB],
+  ["C8C9",0x58EC],
+  ["89D0",0x58ED],
+  ["D7B3",0x58EE],
+  ["89D1",0x58EF],
+  ["C9F9",0x58F0],
+  ["89D2",0x58F1],
+  ["89D3",0x58F2],
+  ["BFC7",0x58F3],
+  ["89D4",0x58F4],
+  ["89D5",0x58F5],
+  ["BAF8",0x58F6],
+  ["89D6",0x58F7],
+  ["89D7",0x58F8],
+  ["D2BC",0x58F9],
+  ["89D8",0x58FA],
+  ["89D9",0x58FB],
+  ["89DA",0x58FC],
+  ["89DB",0x58FD],
+  ["89DC",0x58FE],
+  ["89DD",0x58FF],
+  ["89DE",0x5900],
+  ["89DF",0x5901],
+  ["E2BA",0x5902],
+  ["89E0",0x5903],
+  ["B4A6",0x5904],
+  ["89E1",0x5905],
+  ["89E2",0x5906],
+  ["B1B8",0x5907],
+  ["89E3",0x5908],
+  ["89E4",0x5909],
+  ["89E5",0x590A],
+  ["89E6",0x590B],
+  ["89E7",0x590C],
+  ["B8B4",0x590D],
+  ["89E8",0x590E],
+  ["CFC4",0x590F],
+  ["89E9",0x5910],
+  ["89EA",0x5911],
+  ["89EB",0x5912],
+  ["89EC",0x5913],
+  ["D9E7",0x5914],
+  ["CFA6",0x5915],
+  ["CDE2",0x5916],
+  ["89ED",0x5917],
+  ["89EE",0x5918],
+  ["D9ED",0x5919],
+  ["B6E0",0x591A],
+  ["89EF",0x591B],
+  ["D2B9",0x591C],
+  ["89F0",0x591D],
+  ["89F1",0x591E],
+  ["B9BB",0x591F],
+  ["89F2",0x5920],
+  ["89F3",0x5921],
+  ["89F4",0x5922],
+  ["89F5",0x5923],
+  ["E2B9",0x5924],
+  ["E2B7",0x5925],
+  ["89F6",0x5926],
+  ["B4F3",0x5927],
+  ["89F7",0x5928],
+  ["CCEC",0x5929],
+  ["CCAB",0x592A],
+  ["B7F2",0x592B],
+  ["89F8",0x592C],
+  ["D8B2",0x592D],
+  ["D1EB",0x592E],
+  ["BABB",0x592F],
+  ["89F9",0x5930],
+  ["CAA7",0x5931],
+  ["89FA",0x5932],
+  ["89FB",0x5933],
+  ["CDB7",0x5934],
+  ["89FC",0x5935],
+  ["89FD",0x5936],
+  ["D2C4",0x5937],
+  ["BFE4",0x5938],
+  ["BCD0",0x5939],
+  ["B6E1",0x593A],
+  ["89FE",0x593B],
+  ["DEC5",0x593C],
+  ["8A40",0x593D],
+  ["8A41",0x593E],
+  ["8A42",0x593F],
+  ["8A43",0x5940],
+  ["DEC6",0x5941],
+  ["DBBC",0x5942],
+  ["8A44",0x5943],
+  ["D1D9",0x5944],
+  ["8A45",0x5945],
+  ["8A46",0x5946],
+  ["C6E6",0x5947],
+  ["C4CE",0x5948],
+  ["B7EE",0x5949],
+  ["8A47",0x594A],
+  ["B7DC",0x594B],
+  ["8A48",0x594C],
+  ["8A49",0x594D],
+  ["BFFC",0x594E],
+  ["D7E0",0x594F],
+  ["8A4A",0x5950],
+  ["C6F5",0x5951],
+  ["8A4B",0x5952],
+  ["8A4C",0x5953],
+  ["B1BC",0x5954],
+  ["DEC8",0x5955],
+  ["BDB1",0x5956],
+  ["CCD7",0x5957],
+  ["DECA",0x5958],
+  ["8A4D",0x5959],
+  ["DEC9",0x595A],
+  ["8A4E",0x595B],
+  ["8A4F",0x595C],
+  ["8A50",0x595D],
+  ["8A51",0x595E],
+  ["8A52",0x595F],
+  ["B5EC",0x5960],
+  ["8A53",0x5961],
+  ["C9DD",0x5962],
+  ["8A54",0x5963],
+  ["8A55",0x5964],
+  ["B0C2",0x5965],
+  ["8A56",0x5966],
+  ["8A57",0x5967],
+  ["8A58",0x5968],
+  ["8A59",0x5969],
+  ["8A5A",0x596A],
+  ["8A5B",0x596B],
+  ["8A5C",0x596C],
+  ["8A5D",0x596D],
+  ["8A5E",0x596E],
+  ["8A5F",0x596F],
+  ["8A60",0x5970],
+  ["8A61",0x5971],
+  ["8A62",0x5972],
+  ["C5AE",0x5973],
+  ["C5AB",0x5974],
+  ["8A63",0x5975],
+  ["C4CC",0x5976],
+  ["8A64",0x5977],
+  ["BCE9",0x5978],
+  ["CBFD",0x5979],
+  ["8A65",0x597A],
+  ["8A66",0x597B],
+  ["8A67",0x597C],
+  ["BAC3",0x597D],
+  ["8A68",0x597E],
+  ["8A69",0x597F],
+  ["8A6A",0x5980],
+  ["E5F9",0x5981],
+  ["C8E7",0x5982],
+  ["E5FA",0x5983],
+  ["CDFD",0x5984],
+  ["8A6B",0x5985],
+  ["D7B1",0x5986],
+  ["B8BE",0x5987],
+  ["C2E8",0x5988],
+  ["8A6C",0x5989],
+  ["C8D1",0x598A],
+  ["8A6D",0x598B],
+  ["8A6E",0x598C],
+  ["E5FB",0x598D],
+  ["8A6F",0x598E],
+  ["8A70",0x598F],
+  ["8A71",0x5990],
+  ["8A72",0x5991],
+  ["B6CA",0x5992],
+  ["BCCB",0x5993],
+  ["8A73",0x5994],
+  ["8A74",0x5995],
+  ["D1FD",0x5996],
+  ["E6A1",0x5997],
+  ["8A75",0x5998],
+  ["C3EE",0x5999],
+  ["8A76",0x599A],
+  ["8A77",0x599B],
+  ["8A78",0x599C],
+  ["8A79",0x599D],
+  ["E6A4",0x599E],
+  ["8A7A",0x599F],
+  ["8A7B",0x59A0],
+  ["8A7C",0x59A1],
+  ["8A7D",0x59A2],
+  ["E5FE",0x59A3],
+  ["E6A5",0x59A4],
+  ["CDD7",0x59A5],
+  ["8A7E",0x59A6],
+  ["8A80",0x59A7],
+  ["B7C1",0x59A8],
+  ["E5FC",0x59A9],
+  ["E5FD",0x59AA],
+  ["E6A3",0x59AB],
+  ["8A81",0x59AC],
+  ["8A82",0x59AD],
+  ["C4DD",0x59AE],
+  ["E6A8",0x59AF],
+  ["8A83",0x59B0],
+  ["8A84",0x59B1],
+  ["E6A7",0x59B2],
+  ["8A85",0x59B3],
+  ["8A86",0x59B4],
+  ["8A87",0x59B5],
+  ["8A88",0x59B6],
+  ["8A89",0x59B7],
+  ["8A8A",0x59B8],
+  ["C3C3",0x59B9],
+  ["8A8B",0x59BA],
+  ["C6DE",0x59BB],
+  ["8A8C",0x59BC],
+  ["8A8D",0x59BD],
+  ["E6AA",0x59BE],
+  ["8A8E",0x59BF],
+  ["8A8F",0x59C0],
+  ["8A90",0x59C1],
+  ["8A91",0x59C2],
+  ["8A92",0x59C3],
+  ["8A93",0x59C4],
+  ["8A94",0x59C5],
+  ["C4B7",0x59C6],
+  ["8A95",0x59C7],
+  ["8A96",0x59C8],
+  ["8A97",0x59C9],
+  ["E6A2",0x59CA],
+  ["CABC",0x59CB],
+  ["8A98",0x59CC],
+  ["8A99",0x59CD],
+  ["8A9A",0x59CE],
+  ["8A9B",0x59CF],
+  ["BDE3",0x59D0],
+  ["B9C3",0x59D1],
+  ["E6A6",0x59D2],
+  ["D0D5",0x59D3],
+  ["CEAF",0x59D4],
+  ["8A9C",0x59D5],
+  ["8A9D",0x59D6],
+  ["E6A9",0x59D7],
+  ["E6B0",0x59D8],
+  ["8A9E",0x59D9],
+  ["D2A6",0x59DA],
+  ["8A9F",0x59DB],
+  ["BDAA",0x59DC],
+  ["E6AD",0x59DD],
+  ["8AA0",0x59DE],
+  ["8AA1",0x59DF],
+  ["8AA2",0x59E0],
+  ["8AA3",0x59E1],
+  ["8AA4",0x59E2],
+  ["E6AF",0x59E3],
+  ["8AA5",0x59E4],
+  ["C0D1",0x59E5],
+  ["8AA6",0x59E6],
+  ["8AA7",0x59E7],
+  ["D2CC",0x59E8],
+  ["8AA8",0x59E9],
+  ["8AA9",0x59EA],
+  ["8AAA",0x59EB],
+  ["BCA7",0x59EC],
+  ["8AAB",0x59ED],
+  ["8AAC",0x59EE],
+  ["8AAD",0x59EF],
+  ["8AAE",0x59F0],
+  ["8AAF",0x59F1],
+  ["8AB0",0x59F2],
+  ["8AB1",0x59F3],
+  ["8AB2",0x59F4],
+  ["8AB3",0x59F5],
+  ["8AB4",0x59F6],
+  ["8AB5",0x59F7],
+  ["8AB6",0x59F8],
+  ["E6B1",0x59F9],
+  ["8AB7",0x59FA],
+  ["D2F6",0x59FB],
+  ["8AB8",0x59FC],
+  ["8AB9",0x59FD],
+  ["8ABA",0x59FE],
+  ["D7CB",0x59FF],
+  ["8ABB",0x5A00],
+  ["CDFE",0x5A01],
+  ["8ABC",0x5A02],
+  ["CDDE",0x5A03],
+  ["C2A6",0x5A04],
+  ["E6AB",0x5A05],
+  ["E6AC",0x5A06],
+  ["BDBF",0x5A07],
+  ["E6AE",0x5A08],
+  ["E6B3",0x5A09],
+  ["8ABD",0x5A0A],
+  ["8ABE",0x5A0B],
+  ["E6B2",0x5A0C],
+  ["8ABF",0x5A0D],
+  ["8AC0",0x5A0E],
+  ["8AC1",0x5A0F],
+  ["8AC2",0x5A10],
+  ["E6B6",0x5A11],
+  ["8AC3",0x5A12],
+  ["E6B8",0x5A13],
+  ["8AC4",0x5A14],
+  ["8AC5",0x5A15],
+  ["8AC6",0x5A16],
+  ["8AC7",0x5A17],
+  ["C4EF",0x5A18],
+  ["8AC8",0x5A19],
+  ["8AC9",0x5A1A],
+  ["8ACA",0x5A1B],
+  ["C4C8",0x5A1C],
+  ["8ACB",0x5A1D],
+  ["8ACC",0x5A1E],
+  ["BEEA",0x5A1F],
+  ["C9EF",0x5A20],
+  ["8ACD",0x5A21],
+  ["8ACE",0x5A22],
+  ["E6B7",0x5A23],
+  ["8ACF",0x5A24],
+  ["B6F0",0x5A25],
+  ["8AD0",0x5A26],
+  ["8AD1",0x5A27],
+  ["8AD2",0x5A28],
+  ["C3E4",0x5A29],
+  ["8AD3",0x5A2A],
+  ["8AD4",0x5A2B],
+  ["8AD5",0x5A2C],
+  ["8AD6",0x5A2D],
+  ["8AD7",0x5A2E],
+  ["8AD8",0x5A2F],
+  ["8AD9",0x5A30],
+  ["D3E9",0x5A31],
+  ["E6B4",0x5A32],
+  ["8ADA",0x5A33],
+  ["E6B5",0x5A34],
+  ["8ADB",0x5A35],
+  ["C8A2",0x5A36],
+  ["8ADC",0x5A37],
+  ["8ADD",0x5A38],
+  ["8ADE",0x5A39],
+  ["8ADF",0x5A3A],
+  ["8AE0",0x5A3B],
+  ["E6BD",0x5A3C],
+  ["8AE1",0x5A3D],
+  ["8AE2",0x5A3E],
+  ["8AE3",0x5A3F],
+  ["E6B9",0x5A40],
+  ["8AE4",0x5A41],
+  ["8AE5",0x5A42],
+  ["8AE6",0x5A43],
+  ["8AE7",0x5A44],
+  ["8AE8",0x5A45],
+  ["C6C5",0x5A46],
+  ["8AE9",0x5A47],
+  ["8AEA",0x5A48],
+  ["CDF1",0x5A49],
+  ["E6BB",0x5A4A],
+  ["8AEB",0x5A4B],
+  ["8AEC",0x5A4C],
+  ["8AED",0x5A4D],
+  ["8AEE",0x5A4E],
+  ["8AEF",0x5A4F],
+  ["8AF0",0x5A50],
+  ["8AF1",0x5A51],
+  ["8AF2",0x5A52],
+  ["8AF3",0x5A53],
+  ["8AF4",0x5A54],
+  ["E6BC",0x5A55],
+  ["8AF5",0x5A56],
+  ["8AF6",0x5A57],
+  ["8AF7",0x5A58],
+  ["8AF8",0x5A59],
+  ["BBE9",0x5A5A],
+  ["8AF9",0x5A5B],
+  ["8AFA",0x5A5C],
+  ["8AFB",0x5A5D],
+  ["8AFC",0x5A5E],
+  ["8AFD",0x5A5F],
+  ["8AFE",0x5A60],
+  ["8B40",0x5A61],
+  ["E6BE",0x5A62],
+  ["8B41",0x5A63],
+  ["8B42",0x5A64],
+  ["8B43",0x5A65],
+  ["8B44",0x5A66],
+  ["E6BA",0x5A67],
+  ["8B45",0x5A68],
+  ["8B46",0x5A69],
+  ["C0B7",0x5A6A],
+  ["8B47",0x5A6B],
+  ["8B48",0x5A6C],
+  ["8B49",0x5A6D],
+  ["8B4A",0x5A6E],
+  ["8B4B",0x5A6F],
+  ["8B4C",0x5A70],
+  ["8B4D",0x5A71],
+  ["8B4E",0x5A72],
+  ["8B4F",0x5A73],
+  ["D3A4",0x5A74],
+  ["E6BF",0x5A75],
+  ["C9F4",0x5A76],
+  ["E6C3",0x5A77],
+  ["8B50",0x5A78],
+  ["8B51",0x5A79],
+  ["E6C4",0x5A7A],
+  ["8B52",0x5A7B],
+  ["8B53",0x5A7C],
+  ["8B54",0x5A7D],
+  ["8B55",0x5A7E],
+  ["D0F6",0x5A7F],
+  ["8B56",0x5A80],
+  ["8B57",0x5A81],
+  ["8B58",0x5A82],
+  ["8B59",0x5A83],
+  ["8B5A",0x5A84],
+  ["8B5B",0x5A85],
+  ["8B5C",0x5A86],
+  ["8B5D",0x5A87],
+  ["8B5E",0x5A88],
+  ["8B5F",0x5A89],
+  ["8B60",0x5A8A],
+  ["8B61",0x5A8B],
+  ["8B62",0x5A8C],
+  ["8B63",0x5A8D],
+  ["8B64",0x5A8E],
+  ["8B65",0x5A8F],
+  ["8B66",0x5A90],
+  ["8B67",0x5A91],
+  ["C3BD",0x5A92],
+  ["8B68",0x5A93],
+  ["8B69",0x5A94],
+  ["8B6A",0x5A95],
+  ["8B6B",0x5A96],
+  ["8B6C",0x5A97],
+  ["8B6D",0x5A98],
+  ["8B6E",0x5A99],
+  ["C3C4",0x5A9A],
+  ["E6C2",0x5A9B],
+  ["8B6F",0x5A9C],
+  ["8B70",0x5A9D],
+  ["8B71",0x5A9E],
+  ["8B72",0x5A9F],
+  ["8B73",0x5AA0],
+  ["8B74",0x5AA1],
+  ["8B75",0x5AA2],
+  ["8B76",0x5AA3],
+  ["8B77",0x5AA4],
+  ["8B78",0x5AA5],
+  ["8B79",0x5AA6],
+  ["8B7A",0x5AA7],
+  ["8B7B",0x5AA8],
+  ["8B7C",0x5AA9],
+  ["E6C1",0x5AAA],
+  ["8B7D",0x5AAB],
+  ["8B7E",0x5AAC],
+  ["8B80",0x5AAD],
+  ["8B81",0x5AAE],
+  ["8B82",0x5AAF],
+  ["8B83",0x5AB0],
+  ["8B84",0x5AB1],
+  ["E6C7",0x5AB2],
+  ["CFB1",0x5AB3],
+  ["8B85",0x5AB4],
+  ["EBF4",0x5AB5],
+  ["8B86",0x5AB6],
+  ["8B87",0x5AB7],
+  ["E6CA",0x5AB8],
+  ["8B88",0x5AB9],
+  ["8B89",0x5ABA],
+  ["8B8A",0x5ABB],
+  ["8B8B",0x5ABC],
+  ["8B8C",0x5ABD],
+  ["E6C5",0x5ABE],
+  ["8B8D",0x5ABF],
+  ["8B8E",0x5AC0],
+  ["BCDE",0x5AC1],
+  ["C9A9",0x5AC2],
+  ["8B8F",0x5AC3],
+  ["8B90",0x5AC4],
+  ["8B91",0x5AC5],
+  ["8B92",0x5AC6],
+  ["8B93",0x5AC7],
+  ["8B94",0x5AC8],
+  ["BCB5",0x5AC9],
+  ["8B95",0x5ACA],
+  ["8B96",0x5ACB],
+  ["CFD3",0x5ACC],
+  ["8B97",0x5ACD],
+  ["8B98",0x5ACE],
+  ["8B99",0x5ACF],
+  ["8B9A",0x5AD0],
+  ["8B9B",0x5AD1],
+  ["E6C8",0x5AD2],
+  ["8B9C",0x5AD3],
+  ["E6C9",0x5AD4],
+  ["8B9D",0x5AD5],
+  ["E6CE",0x5AD6],
+  ["8B9E",0x5AD7],
+  ["E6D0",0x5AD8],
+  ["8B9F",0x5AD9],
+  ["8BA0",0x5ADA],
+  ["8BA1",0x5ADB],
+  ["E6D1",0x5ADC],
+  ["8BA2",0x5ADD],
+  ["8BA3",0x5ADE],
+  ["8BA4",0x5ADF],
+  ["E6CB",0x5AE0],
+  ["B5D5",0x5AE1],
+  ["8BA5",0x5AE2],
+  ["E6CC",0x5AE3],
+  ["8BA6",0x5AE4],
+  ["8BA7",0x5AE5],
+  ["E6CF",0x5AE6],
+  ["8BA8",0x5AE7],
+  ["8BA9",0x5AE8],
+  ["C4DB",0x5AE9],
+  ["8BAA",0x5AEA],
+  ["E6C6",0x5AEB],
+  ["8BAB",0x5AEC],
+  ["8BAC",0x5AED],
+  ["8BAD",0x5AEE],
+  ["8BAE",0x5AEF],
+  ["8BAF",0x5AF0],
+  ["E6CD",0x5AF1],
+  ["8BB0",0x5AF2],
+  ["8BB1",0x5AF3],
+  ["8BB2",0x5AF4],
+  ["8BB3",0x5AF5],
+  ["8BB4",0x5AF6],
+  ["8BB5",0x5AF7],
+  ["8BB6",0x5AF8],
+  ["8BB7",0x5AF9],
+  ["8BB8",0x5AFA],
+  ["8BB9",0x5AFB],
+  ["8BBA",0x5AFC],
+  ["8BBB",0x5AFD],
+  ["8BBC",0x5AFE],
+  ["8BBD",0x5AFF],
+  ["8BBE",0x5B00],
+  ["8BBF",0x5B01],
+  ["8BC0",0x5B02],
+  ["8BC1",0x5B03],
+  ["8BC2",0x5B04],
+  ["8BC3",0x5B05],
+  ["8BC4",0x5B06],
+  ["8BC5",0x5B07],
+  ["8BC6",0x5B08],
+  ["E6D2",0x5B09],
+  ["8BC7",0x5B0A],
+  ["8BC8",0x5B0B],
+  ["8BC9",0x5B0C],
+  ["8BCA",0x5B0D],
+  ["8BCB",0x5B0E],
+  ["8BCC",0x5B0F],
+  ["8BCD",0x5B10],
+  ["8BCE",0x5B11],
+  ["8BCF",0x5B12],
+  ["8BD0",0x5B13],
+  ["8BD1",0x5B14],
+  ["8BD2",0x5B15],
+  ["E6D4",0x5B16],
+  ["E6D3",0x5B17],
+  ["8BD3",0x5B18],
+  ["8BD4",0x5B19],
+  ["8BD5",0x5B1A],
+  ["8BD6",0x5B1B],
+  ["8BD7",0x5B1C],
+  ["8BD8",0x5B1D],
+  ["8BD9",0x5B1E],
+  ["8BDA",0x5B1F],
+  ["8BDB",0x5B20],
+  ["8BDC",0x5B21],
+  ["8BDD",0x5B22],
+  ["8BDE",0x5B23],
+  ["8BDF",0x5B24],
+  ["8BE0",0x5B25],
+  ["8BE1",0x5B26],
+  ["8BE2",0x5B27],
+  ["8BE3",0x5B28],
+  ["8BE4",0x5B29],
+  ["8BE5",0x5B2A],
+  ["8BE6",0x5B2B],
+  ["8BE7",0x5B2C],
+  ["8BE8",0x5B2D],
+  ["8BE9",0x5B2E],
+  ["8BEA",0x5B2F],
+  ["8BEB",0x5B30],
+  ["8BEC",0x5B31],
+  ["E6D5",0x5B32],
+  ["8BED",0x5B33],
+  ["D9F8",0x5B34],
+  ["8BEE",0x5B35],
+  ["8BEF",0x5B36],
+  ["E6D6",0x5B37],
+  ["8BF0",0x5B38],
+  ["8BF1",0x5B39],
+  ["8BF2",0x5B3A],
+  ["8BF3",0x5B3B],
+  ["8BF4",0x5B3C],
+  ["8BF5",0x5B3D],
+  ["8BF6",0x5B3E],
+  ["8BF7",0x5B3F],
+  ["E6D7",0x5B40],
+  ["8BF8",0x5B41],
+  ["8BF9",0x5B42],
+  ["8BFA",0x5B43],
+  ["8BFB",0x5B44],
+  ["8BFC",0x5B45],
+  ["8BFD",0x5B46],
+  ["8BFE",0x5B47],
+  ["8C40",0x5B48],
+  ["8C41",0x5B49],
+  ["8C42",0x5B4A],
+  ["8C43",0x5B4B],
+  ["8C44",0x5B4C],
+  ["8C45",0x5B4D],
+  ["8C46",0x5B4E],
+  ["8C47",0x5B4F],
+  ["D7D3",0x5B50],
+  ["E6DD",0x5B51],
+  ["8C48",0x5B52],
+  ["E6DE",0x5B53],
+  ["BFD7",0x5B54],
+  ["D4D0",0x5B55],
+  ["8C49",0x5B56],
+  ["D7D6",0x5B57],
+  ["B4E6",0x5B58],
+  ["CBEF",0x5B59],
+  ["E6DA",0x5B5A],
+  ["D8C3",0x5B5B],
+  ["D7CE",0x5B5C],
+  ["D0A2",0x5B5D],
+  ["8C4A",0x5B5E],
+  ["C3CF",0x5B5F],
+  ["8C4B",0x5B60],
+  ["8C4C",0x5B61],
+  ["E6DF",0x5B62],
+  ["BCBE",0x5B63],
+  ["B9C2",0x5B64],
+  ["E6DB",0x5B65],
+  ["D1A7",0x5B66],
+  ["8C4D",0x5B67],
+  ["8C4E",0x5B68],
+  ["BAA2",0x5B69],
+  ["C2CF",0x5B6A],
+  ["8C4F",0x5B6B],
+  ["D8AB",0x5B6C],
+  ["8C50",0x5B6D],
+  ["8C51",0x5B6E],
+  ["8C52",0x5B6F],
+  ["CAEB",0x5B70],
+  ["E5EE",0x5B71],
+  ["8C53",0x5B72],
+  ["E6DC",0x5B73],
+  ["8C54",0x5B74],
+  ["B7F5",0x5B75],
+  ["8C55",0x5B76],
+  ["8C56",0x5B77],
+  ["8C57",0x5B78],
+  ["8C58",0x5B79],
+  ["C8E6",0x5B7A],
+  ["8C59",0x5B7B],
+  ["8C5A",0x5B7C],
+  ["C4F5",0x5B7D],
+  ["8C5B",0x5B7E],
+  ["8C5C",0x5B7F],
+  ["E5B2",0x5B80],
+  ["C4FE",0x5B81],
+  ["8C5D",0x5B82],
+  ["CBFC",0x5B83],
+  ["E5B3",0x5B84],
+  ["D5AC",0x5B85],
+  ["8C5E",0x5B86],
+  ["D3EE",0x5B87],
+  ["CAD8",0x5B88],
+  ["B0B2",0x5B89],
+  ["8C5F",0x5B8A],
+  ["CBCE",0x5B8B],
+  ["CDEA",0x5B8C],
+  ["8C60",0x5B8D],
+  ["8C61",0x5B8E],
+  ["BAEA",0x5B8F],
+  ["8C62",0x5B90],
+  ["8C63",0x5B91],
+  ["8C64",0x5B92],
+  ["E5B5",0x5B93],
+  ["8C65",0x5B94],
+  ["E5B4",0x5B95],
+  ["8C66",0x5B96],
+  ["D7DA",0x5B97],
+  ["B9D9",0x5B98],
+  ["D6E6",0x5B99],
+  ["B6A8",0x5B9A],
+  ["CDF0",0x5B9B],
+  ["D2CB",0x5B9C],
+  ["B1A6",0x5B9D],
+  ["CAB5",0x5B9E],
+  ["8C67",0x5B9F],
+  ["B3E8",0x5BA0],
+  ["C9F3",0x5BA1],
+  ["BFCD",0x5BA2],
+  ["D0FB",0x5BA3],
+  ["CAD2",0x5BA4],
+  ["E5B6",0x5BA5],
+  ["BBC2",0x5BA6],
+  ["8C68",0x5BA7],
+  ["8C69",0x5BA8],
+  ["8C6A",0x5BA9],
+  ["CFDC",0x5BAA],
+  ["B9AC",0x5BAB],
+  ["8C6B",0x5BAC],
+  ["8C6C",0x5BAD],
+  ["8C6D",0x5BAE],
+  ["8C6E",0x5BAF],
+  ["D4D7",0x5BB0],
+  ["8C6F",0x5BB1],
+  ["8C70",0x5BB2],
+  ["BAA6",0x5BB3],
+  ["D1E7",0x5BB4],
+  ["CFFC",0x5BB5],
+  ["BCD2",0x5BB6],
+  ["8C71",0x5BB7],
+  ["E5B7",0x5BB8],
+  ["C8DD",0x5BB9],
+  ["8C72",0x5BBA],
+  ["8C73",0x5BBB],
+  ["8C74",0x5BBC],
+  ["BFED",0x5BBD],
+  ["B1F6",0x5BBE],
+  ["CBDE",0x5BBF],
+  ["8C75",0x5BC0],
+  ["8C76",0x5BC1],
+  ["BCC5",0x5BC2],
+  ["8C77",0x5BC3],
+  ["BCC4",0x5BC4],
+  ["D2FA",0x5BC5],
+  ["C3DC",0x5BC6],
+  ["BFDC",0x5BC7],
+  ["8C78",0x5BC8],
+  ["8C79",0x5BC9],
+  ["8C7A",0x5BCA],
+  ["8C7B",0x5BCB],
+  ["B8BB",0x5BCC],
+  ["8C7C",0x5BCD],
+  ["8C7D",0x5BCE],
+  ["8C7E",0x5BCF],
+  ["C3C2",0x5BD0],
+  ["8C80",0x5BD1],
+  ["BAAE",0x5BD2],
+  ["D4A2",0x5BD3],
+  ["8C81",0x5BD4],
+  ["8C82",0x5BD5],
+  ["8C83",0x5BD6],
+  ["8C84",0x5BD7],
+  ["8C85",0x5BD8],
+  ["8C86",0x5BD9],
+  ["8C87",0x5BDA],
+  ["8C88",0x5BDB],
+  ["8C89",0x5BDC],
+  ["C7DE",0x5BDD],
+  ["C4AF",0x5BDE],
+  ["B2EC",0x5BDF],
+  ["8C8A",0x5BE0],
+  ["B9D1",0x5BE1],
+  ["8C8B",0x5BE2],
+  ["8C8C",0x5BE3],
+  ["E5BB",0x5BE4],
+  ["C1C8",0x5BE5],
+  ["8C8D",0x5BE6],
+  ["8C8E",0x5BE7],
+  ["D5AF",0x5BE8],
+  ["8C8F",0x5BE9],
+  ["8C90",0x5BEA],
+  ["8C91",0x5BEB],
+  ["8C92",0x5BEC],
+  ["8C93",0x5BED],
+  ["E5BC",0x5BEE],
+  ["8C94",0x5BEF],
+  ["E5BE",0x5BF0],
+  ["8C95",0x5BF1],
+  ["8C96",0x5BF2],
+  ["8C97",0x5BF3],
+  ["8C98",0x5BF4],
+  ["8C99",0x5BF5],
+  ["8C9A",0x5BF6],
+  ["8C9B",0x5BF7],
+  ["B4E7",0x5BF8],
+  ["B6D4",0x5BF9],
+  ["CBC2",0x5BFA],
+  ["D1B0",0x5BFB],
+  ["B5BC",0x5BFC],
+  ["8C9C",0x5BFD],
+  ["8C9D",0x5BFE],
+  ["CAD9",0x5BFF],
+  ["8C9E",0x5C00],
+  ["B7E2",0x5C01],
+  ["8C9F",0x5C02],
+  ["8CA0",0x5C03],
+  ["C9E4",0x5C04],
+  ["8CA1",0x5C05],
+  ["BDAB",0x5C06],
+  ["8CA2",0x5C07],
+  ["8CA3",0x5C08],
+  ["CEBE",0x5C09],
+  ["D7F0",0x5C0A],
+  ["8CA4",0x5C0B],
+  ["8CA5",0x5C0C],
+  ["8CA6",0x5C0D],
+  ["8CA7",0x5C0E],
+  ["D0A1",0x5C0F],
+  ["8CA8",0x5C10],
+  ["C9D9",0x5C11],
+  ["8CA9",0x5C12],
+  ["8CAA",0x5C13],
+  ["B6FB",0x5C14],
+  ["E6D8",0x5C15],
+  ["BCE2",0x5C16],
+  ["8CAB",0x5C17],
+  ["B3BE",0x5C18],
+  ["8CAC",0x5C19],
+  ["C9D0",0x5C1A],
+  ["8CAD",0x5C1B],
+  ["E6D9",0x5C1C],
+  ["B3A2",0x5C1D],
+  ["8CAE",0x5C1E],
+  ["8CAF",0x5C1F],
+  ["8CB0",0x5C20],
+  ["8CB1",0x5C21],
+  ["DECC",0x5C22],
+  ["8CB2",0x5C23],
+  ["D3C8",0x5C24],
+  ["DECD",0x5C25],
+  ["8CB3",0x5C26],
+  ["D2A2",0x5C27],
+  ["8CB4",0x5C28],
+  ["8CB5",0x5C29],
+  ["8CB6",0x5C2A],
+  ["8CB7",0x5C2B],
+  ["DECE",0x5C2C],
+  ["8CB8",0x5C2D],
+  ["8CB9",0x5C2E],
+  ["8CBA",0x5C2F],
+  ["8CBB",0x5C30],
+  ["BECD",0x5C31],
+  ["8CBC",0x5C32],
+  ["8CBD",0x5C33],
+  ["DECF",0x5C34],
+  ["8CBE",0x5C35],
+  ["8CBF",0x5C36],
+  ["8CC0",0x5C37],
+  ["CAAC",0x5C38],
+  ["D2FC",0x5C39],
+  ["B3DF",0x5C3A],
+  ["E5EA",0x5C3B],
+  ["C4E1",0x5C3C],
+  ["BEA1",0x5C3D],
+  ["CEB2",0x5C3E],
+  ["C4F2",0x5C3F],
+  ["BED6",0x5C40],
+  ["C6A8",0x5C41],
+  ["B2E3",0x5C42],
+  ["8CC1",0x5C43],
+  ["8CC2",0x5C44],
+  ["BED3",0x5C45],
+  ["8CC3",0x5C46],
+  ["8CC4",0x5C47],
+  ["C7FC",0x5C48],
+  ["CCEB",0x5C49],
+  ["BDEC",0x5C4A],
+  ["CEDD",0x5C4B],
+  ["8CC5",0x5C4C],
+  ["8CC6",0x5C4D],
+  ["CABA",0x5C4E],
+  ["C6C1",0x5C4F],
+  ["E5EC",0x5C50],
+  ["D0BC",0x5C51],
+  ["8CC7",0x5C52],
+  ["8CC8",0x5C53],
+  ["8CC9",0x5C54],
+  ["D5B9",0x5C55],
+  ["8CCA",0x5C56],
+  ["8CCB",0x5C57],
+  ["8CCC",0x5C58],
+  ["E5ED",0x5C59],
+  ["8CCD",0x5C5A],
+  ["8CCE",0x5C5B],
+  ["8CCF",0x5C5C],
+  ["8CD0",0x5C5D],
+  ["CAF4",0x5C5E],
+  ["8CD1",0x5C5F],
+  ["CDC0",0x5C60],
+  ["C2C5",0x5C61],
+  ["8CD2",0x5C62],
+  ["E5EF",0x5C63],
+  ["8CD3",0x5C64],
+  ["C2C4",0x5C65],
+  ["E5F0",0x5C66],
+  ["8CD4",0x5C67],
+  ["8CD5",0x5C68],
+  ["8CD6",0x5C69],
+  ["8CD7",0x5C6A],
+  ["8CD8",0x5C6B],
+  ["8CD9",0x5C6C],
+  ["8CDA",0x5C6D],
+  ["E5F8",0x5C6E],
+  ["CDCD",0x5C6F],
+  ["8CDB",0x5C70],
+  ["C9BD",0x5C71],
+  ["8CDC",0x5C72],
+  ["8CDD",0x5C73],
+  ["8CDE",0x5C74],
+  ["8CDF",0x5C75],
+  ["8CE0",0x5C76],
+  ["8CE1",0x5C77],
+  ["8CE2",0x5C78],
+  ["D2D9",0x5C79],
+  ["E1A8",0x5C7A],
+  ["8CE3",0x5C7B],
+  ["8CE4",0x5C7C],
+  ["8CE5",0x5C7D],
+  ["8CE6",0x5C7E],
+  ["D3EC",0x5C7F],
+  ["8CE7",0x5C80],
+  ["CBEA",0x5C81],
+  ["C6F1",0x5C82],
+  ["8CE8",0x5C83],
+  ["8CE9",0x5C84],
+  ["8CEA",0x5C85],
+  ["8CEB",0x5C86],
+  ["8CEC",0x5C87],
+  ["E1AC",0x5C88],
+  ["8CED",0x5C89],
+  ["8CEE",0x5C8A],
+  ["8CEF",0x5C8B],
+  ["E1A7",0x5C8C],
+  ["E1A9",0x5C8D],
+  ["8CF0",0x5C8E],
+  ["8CF1",0x5C8F],
+  ["E1AA",0x5C90],
+  ["E1AF",0x5C91],
+  ["8CF2",0x5C92],
+  ["8CF3",0x5C93],
+  ["B2ED",0x5C94],
+  ["8CF4",0x5C95],
+  ["E1AB",0x5C96],
+  ["B8DA",0x5C97],
+  ["E1AD",0x5C98],
+  ["E1AE",0x5C99],
+  ["E1B0",0x5C9A],
+  ["B5BA",0x5C9B],
+  ["E1B1",0x5C9C],
+  ["8CF5",0x5C9D],
+  ["8CF6",0x5C9E],
+  ["8CF7",0x5C9F],
+  ["8CF8",0x5CA0],
+  ["8CF9",0x5CA1],
+  ["E1B3",0x5CA2],
+  ["E1B8",0x5CA3],
+  ["8CFA",0x5CA4],
+  ["8CFB",0x5CA5],
+  ["8CFC",0x5CA6],
+  ["8CFD",0x5CA7],
+  ["8CFE",0x5CA8],
+  ["D1D2",0x5CA9],
+  ["8D40",0x5CAA],
+  ["E1B6",0x5CAB],
+  ["E1B5",0x5CAC],
+  ["C1EB",0x5CAD],
+  ["8D41",0x5CAE],
+  ["8D42",0x5CAF],
+  ["8D43",0x5CB0],
+  ["E1B7",0x5CB1],
+  ["8D44",0x5CB2],
+  ["D4C0",0x5CB3],
+  ["8D45",0x5CB4],
+  ["E1B2",0x5CB5],
+  ["8D46",0x5CB6],
+  ["E1BA",0x5CB7],
+  ["B0B6",0x5CB8],
+  ["8D47",0x5CB9],
+  ["8D48",0x5CBA],
+  ["8D49",0x5CBB],
+  ["8D4A",0x5CBC],
+  ["E1B4",0x5CBD],
+  ["8D4B",0x5CBE],
+  ["BFF9",0x5CBF],
+  ["8D4C",0x5CC0],
+  ["E1B9",0x5CC1],
+  ["8D4D",0x5CC2],
+  ["8D4E",0x5CC3],
+  ["E1BB",0x5CC4],
+  ["8D4F",0x5CC5],
+  ["8D50",0x5CC6],
+  ["8D51",0x5CC7],
+  ["8D52",0x5CC8],
+  ["8D53",0x5CC9],
+  ["8D54",0x5CCA],
+  ["E1BE",0x5CCB],
+  ["8D55",0x5CCC],
+  ["8D56",0x5CCD],
+  ["8D57",0x5CCE],
+  ["8D58",0x5CCF],
+  ["8D59",0x5CD0],
+  ["8D5A",0x5CD1],
+  ["E1BC",0x5CD2],
+  ["8D5B",0x5CD3],
+  ["8D5C",0x5CD4],
+  ["8D5D",0x5CD5],
+  ["8D5E",0x5CD6],
+  ["8D5F",0x5CD7],
+  ["8D60",0x5CD8],
+  ["D6C5",0x5CD9],
+  ["8D61",0x5CDA],
+  ["8D62",0x5CDB],
+  ["8D63",0x5CDC],
+  ["8D64",0x5CDD],
+  ["8D65",0x5CDE],
+  ["8D66",0x5CDF],
+  ["8D67",0x5CE0],
+  ["CFBF",0x5CE1],
+  ["8D68",0x5CE2],
+  ["8D69",0x5CE3],
+  ["E1BD",0x5CE4],
+  ["E1BF",0x5CE5],
+  ["C2CD",0x5CE6],
+  ["8D6A",0x5CE7],
+  ["B6EB",0x5CE8],
+  ["8D6B",0x5CE9],
+  ["D3F8",0x5CEA],
+  ["8D6C",0x5CEB],
+  ["8D6D",0x5CEC],
+  ["C7CD",0x5CED],
+  ["8D6E",0x5CEE],
+  ["8D6F",0x5CEF],
+  ["B7E5",0x5CF0],
+  ["8D70",0x5CF1],
+  ["8D71",0x5CF2],
+  ["8D72",0x5CF3],
+  ["8D73",0x5CF4],
+  ["8D74",0x5CF5],
+  ["8D75",0x5CF6],
+  ["8D76",0x5CF7],
+  ["8D77",0x5CF8],
+  ["8D78",0x5CF9],
+  ["8D79",0x5CFA],
+  ["BEFE",0x5CFB],
+  ["8D7A",0x5CFC],
+  ["8D7B",0x5CFD],
+  ["8D7C",0x5CFE],
+  ["8D7D",0x5CFF],
+  ["8D7E",0x5D00],
+  ["8D80",0x5D01],
+  ["E1C0",0x5D02],
+  ["E1C1",0x5D03],
+  ["8D81",0x5D04],
+  ["8D82",0x5D05],
+  ["E1C7",0x5D06],
+  ["B3E7",0x5D07],
+  ["8D83",0x5D08],
+  ["8D84",0x5D09],
+  ["8D85",0x5D0A],
+  ["8D86",0x5D0B],
+  ["8D87",0x5D0C],
+  ["8D88",0x5D0D],
+  ["C6E9",0x5D0E],
+  ["8D89",0x5D0F],
+  ["8D8A",0x5D10],
+  ["8D8B",0x5D11],
+  ["8D8C",0x5D12],
+  ["8D8D",0x5D13],
+  ["B4DE",0x5D14],
+  ["8D8E",0x5D15],
+  ["D1C2",0x5D16],
+  ["8D8F",0x5D17],
+  ["8D90",0x5D18],
+  ["8D91",0x5D19],
+  ["8D92",0x5D1A],
+  ["E1C8",0x5D1B],
+  ["8D93",0x5D1C],
+  ["8D94",0x5D1D],
+  ["E1C6",0x5D1E],
+  ["8D95",0x5D1F],
+  ["8D96",0x5D20],
+  ["8D97",0x5D21],
+  ["8D98",0x5D22],
+  ["8D99",0x5D23],
+  ["E1C5",0x5D24],
+  ["8D9A",0x5D25],
+  ["E1C3",0x5D26],
+  ["E1C2",0x5D27],
+  ["8D9B",0x5D28],
+  ["B1C0",0x5D29],
+  ["8D9C",0x5D2A],
+  ["8D9D",0x5D2B],
+  ["8D9E",0x5D2C],
+  ["D5B8",0x5D2D],
+  ["E1C4",0x5D2E],
+  ["8D9F",0x5D2F],
+  ["8DA0",0x5D30],
+  ["8DA1",0x5D31],
+  ["8DA2",0x5D32],
+  ["8DA3",0x5D33],
+  ["E1CB",0x5D34],
+  ["8DA4",0x5D35],
+  ["8DA5",0x5D36],
+  ["8DA6",0x5D37],
+  ["8DA7",0x5D38],
+  ["8DA8",0x5D39],
+  ["8DA9",0x5D3A],
+  ["8DAA",0x5D3B],
+  ["8DAB",0x5D3C],
+  ["E1CC",0x5D3D],
+  ["E1CA",0x5D3E],
+  ["8DAC",0x5D3F],
+  ["8DAD",0x5D40],
+  ["8DAE",0x5D41],
+  ["8DAF",0x5D42],
+  ["8DB0",0x5D43],
+  ["8DB1",0x5D44],
+  ["8DB2",0x5D45],
+  ["8DB3",0x5D46],
+  ["EFFA",0x5D47],
+  ["8DB4",0x5D48],
+  ["8DB5",0x5D49],
+  ["E1D3",0x5D4A],
+  ["E1D2",0x5D4B],
+  ["C7B6",0x5D4C],
+  ["8DB6",0x5D4D],
+  ["8DB7",0x5D4E],
+  ["8DB8",0x5D4F],
+  ["8DB9",0x5D50],
+  ["8DBA",0x5D51],
+  ["8DBB",0x5D52],
+  ["8DBC",0x5D53],
+  ["8DBD",0x5D54],
+  ["8DBE",0x5D55],
+  ["8DBF",0x5D56],
+  ["8DC0",0x5D57],
+  ["E1C9",0x5D58],
+  ["8DC1",0x5D59],
+  ["8DC2",0x5D5A],
+  ["E1CE",0x5D5B],
+  ["8DC3",0x5D5C],
+  ["E1D0",0x5D5D],
+  ["8DC4",0x5D5E],
+  ["8DC5",0x5D5F],
+  ["8DC6",0x5D60],
+  ["8DC7",0x5D61],
+  ["8DC8",0x5D62],
+  ["8DC9",0x5D63],
+  ["8DCA",0x5D64],
+  ["8DCB",0x5D65],
+  ["8DCC",0x5D66],
+  ["8DCD",0x5D67],
+  ["8DCE",0x5D68],
+  ["E1D4",0x5D69],
+  ["8DCF",0x5D6A],
+  ["E1D1",0x5D6B],
+  ["E1CD",0x5D6C],
+  ["8DD0",0x5D6D],
+  ["8DD1",0x5D6E],
+  ["E1CF",0x5D6F],
+  ["8DD2",0x5D70],
+  ["8DD3",0x5D71],
+  ["8DD4",0x5D72],
+  ["8DD5",0x5D73],
+  ["E1D5",0x5D74],
+  ["8DD6",0x5D75],
+  ["8DD7",0x5D76],
+  ["8DD8",0x5D77],
+  ["8DD9",0x5D78],
+  ["8DDA",0x5D79],
+  ["8DDB",0x5D7A],
+  ["8DDC",0x5D7B],
+  ["8DDD",0x5D7C],
+  ["8DDE",0x5D7D],
+  ["8DDF",0x5D7E],
+  ["8DE0",0x5D7F],
+  ["8DE1",0x5D80],
+  ["8DE2",0x5D81],
+  ["E1D6",0x5D82],
+  ["8DE3",0x5D83],
+  ["8DE4",0x5D84],
+  ["8DE5",0x5D85],
+  ["8DE6",0x5D86],
+  ["8DE7",0x5D87],
+  ["8DE8",0x5D88],
+  ["8DE9",0x5D89],
+  ["8DEA",0x5D8A],
+  ["8DEB",0x5D8B],
+  ["8DEC",0x5D8C],
+  ["8DED",0x5D8D],
+  ["8DEE",0x5D8E],
+  ["8DEF",0x5D8F],
+  ["8DF0",0x5D90],
+  ["8DF1",0x5D91],
+  ["8DF2",0x5D92],
+  ["8DF3",0x5D93],
+  ["8DF4",0x5D94],
+  ["8DF5",0x5D95],
+  ["8DF6",0x5D96],
+  ["8DF7",0x5D97],
+  ["8DF8",0x5D98],
+  ["E1D7",0x5D99],
+  ["8DF9",0x5D9A],
+  ["8DFA",0x5D9B],
+  ["8DFB",0x5D9C],
+  ["E1D8",0x5D9D],
+  ["8DFC",0x5D9E],
+  ["8DFD",0x5D9F],
+  ["8DFE",0x5DA0],
+  ["8E40",0x5DA1],
+  ["8E41",0x5DA2],
+  ["8E42",0x5DA3],
+  ["8E43",0x5DA4],
+  ["8E44",0x5DA5],
+  ["8E45",0x5DA6],
+  ["8E46",0x5DA7],
+  ["8E47",0x5DA8],
+  ["8E48",0x5DA9],
+  ["8E49",0x5DAA],
+  ["8E4A",0x5DAB],
+  ["8E4B",0x5DAC],
+  ["8E4C",0x5DAD],
+  ["8E4D",0x5DAE],
+  ["8E4E",0x5DAF],
+  ["8E4F",0x5DB0],
+  ["8E50",0x5DB1],
+  ["8E51",0x5DB2],
+  ["8E52",0x5DB3],
+  ["8E53",0x5DB4],
+  ["8E54",0x5DB5],
+  ["8E55",0x5DB6],
+  ["E1DA",0x5DB7],
+  ["8E56",0x5DB8],
+  ["8E57",0x5DB9],
+  ["8E58",0x5DBA],
+  ["8E59",0x5DBB],
+  ["8E5A",0x5DBC],
+  ["8E5B",0x5DBD],
+  ["8E5C",0x5DBE],
+  ["8E5D",0x5DBF],
+  ["8E5E",0x5DC0],
+  ["8E5F",0x5DC1],
+  ["8E60",0x5DC2],
+  ["8E61",0x5DC3],
+  ["8E62",0x5DC4],
+  ["E1DB",0x5DC5],
+  ["8E63",0x5DC6],
+  ["8E64",0x5DC7],
+  ["8E65",0x5DC8],
+  ["8E66",0x5DC9],
+  ["8E67",0x5DCA],
+  ["8E68",0x5DCB],
+  ["8E69",0x5DCC],
+  ["CEA1",0x5DCD],
+  ["8E6A",0x5DCE],
+  ["8E6B",0x5DCF],
+  ["8E6C",0x5DD0],
+  ["8E6D",0x5DD1],
+  ["8E6E",0x5DD2],
+  ["8E6F",0x5DD3],
+  ["8E70",0x5DD4],
+  ["8E71",0x5DD5],
+  ["8E72",0x5DD6],
+  ["8E73",0x5DD7],
+  ["8E74",0x5DD8],
+  ["8E75",0x5DD9],
+  ["8E76",0x5DDA],
+  ["E7DD",0x5DDB],
+  ["8E77",0x5DDC],
+  ["B4A8",0x5DDD],
+  ["D6DD",0x5DDE],
+  ["8E78",0x5DDF],
+  ["8E79",0x5DE0],
+  ["D1B2",0x5DE1],
+  ["B3B2",0x5DE2],
+  ["8E7A",0x5DE3],
+  ["8E7B",0x5DE4],
+  ["B9A4",0x5DE5],
+  ["D7F3",0x5DE6],
+  ["C7C9",0x5DE7],
+  ["BEDE",0x5DE8],
+  ["B9AE",0x5DE9],
+  ["8E7C",0x5DEA],
+  ["CED7",0x5DEB],
+  ["8E7D",0x5DEC],
+  ["8E7E",0x5DED],
+  ["B2EE",0x5DEE],
+  ["DBCF",0x5DEF],
+  ["8E80",0x5DF0],
+  ["BCBA",0x5DF1],
+  ["D2D1",0x5DF2],
+  ["CBC8",0x5DF3],
+  ["B0CD",0x5DF4],
+  ["8E81",0x5DF5],
+  ["8E82",0x5DF6],
+  ["CFEF",0x5DF7],
+  ["8E83",0x5DF8],
+  ["8E84",0x5DF9],
+  ["8E85",0x5DFA],
+  ["8E86",0x5DFB],
+  ["8E87",0x5DFC],
+  ["D9E3",0x5DFD],
+  ["BDED",0x5DFE],
+  ["8E88",0x5DFF],
+  ["8E89",0x5E00],
+  ["B1D2",0x5E01],
+  ["CAD0",0x5E02],
+  ["B2BC",0x5E03],
+  ["8E8A",0x5E04],
+  ["CBA7",0x5E05],
+  ["B7AB",0x5E06],
+  ["8E8B",0x5E07],
+  ["CAA6",0x5E08],
+  ["8E8C",0x5E09],
+  ["8E8D",0x5E0A],
+  ["8E8E",0x5E0B],
+  ["CFA3",0x5E0C],
+  ["8E8F",0x5E0D],
+  ["8E90",0x5E0E],
+  ["E0F8",0x5E0F],
+  ["D5CA",0x5E10],
+  ["E0FB",0x5E11],
+  ["8E91",0x5E12],
+  ["8E92",0x5E13],
+  ["E0FA",0x5E14],
+  ["C5C1",0x5E15],
+  ["CCFB",0x5E16],
+  ["8E93",0x5E17],
+  ["C1B1",0x5E18],
+  ["E0F9",0x5E19],
+  ["D6E3",0x5E1A],
+  ["B2AF",0x5E1B],
+  ["D6C4",0x5E1C],
+  ["B5DB",0x5E1D],
+  ["8E94",0x5E1E],
+  ["8E95",0x5E1F],
+  ["8E96",0x5E20],
+  ["8E97",0x5E21],
+  ["8E98",0x5E22],
+  ["8E99",0x5E23],
+  ["8E9A",0x5E24],
+  ["8E9B",0x5E25],
+  ["B4F8",0x5E26],
+  ["D6A1",0x5E27],
+  ["8E9C",0x5E28],
+  ["8E9D",0x5E29],
+  ["8E9E",0x5E2A],
+  ["8E9F",0x5E2B],
+  ["8EA0",0x5E2C],
+  ["CFAF",0x5E2D],
+  ["B0EF",0x5E2E],
+  ["8EA1",0x5E2F],
+  ["8EA2",0x5E30],
+  ["E0FC",0x5E31],
+  ["8EA3",0x5E32],
+  ["8EA4",0x5E33],
+  ["8EA5",0x5E34],
+  ["8EA6",0x5E35],
+  ["8EA7",0x5E36],
+  ["E1A1",0x5E37],
+  ["B3A3",0x5E38],
+  ["8EA8",0x5E39],
+  ["8EA9",0x5E3A],
+  ["E0FD",0x5E3B],
+  ["E0FE",0x5E3C],
+  ["C3B1",0x5E3D],
+  ["8EAA",0x5E3E],
+  ["8EAB",0x5E3F],
+  ["8EAC",0x5E40],
+  ["8EAD",0x5E41],
+  ["C3DD",0x5E42],
+  ["8EAE",0x5E43],
+  ["E1A2",0x5E44],
+  ["B7F9",0x5E45],
+  ["8EAF",0x5E46],
+  ["8EB0",0x5E47],
+  ["8EB1",0x5E48],
+  ["8EB2",0x5E49],
+  ["8EB3",0x5E4A],
+  ["8EB4",0x5E4B],
+  ["BBCF",0x5E4C],
+  ["8EB5",0x5E4D],
+  ["8EB6",0x5E4E],
+  ["8EB7",0x5E4F],
+  ["8EB8",0x5E50],
+  ["8EB9",0x5E51],
+  ["8EBA",0x5E52],
+  ["8EBB",0x5E53],
+  ["E1A3",0x5E54],
+  ["C4BB",0x5E55],
+  ["8EBC",0x5E56],
+  ["8EBD",0x5E57],
+  ["8EBE",0x5E58],
+  ["8EBF",0x5E59],
+  ["8EC0",0x5E5A],
+  ["E1A4",0x5E5B],
+  ["8EC1",0x5E5C],
+  ["8EC2",0x5E5D],
+  ["E1A5",0x5E5E],
+  ["8EC3",0x5E5F],
+  ["8EC4",0x5E60],
+  ["E1A6",0x5E61],
+  ["B4B1",0x5E62],
+  ["8EC5",0x5E63],
+  ["8EC6",0x5E64],
+  ["8EC7",0x5E65],
+  ["8EC8",0x5E66],
+  ["8EC9",0x5E67],
+  ["8ECA",0x5E68],
+  ["8ECB",0x5E69],
+  ["8ECC",0x5E6A],
+  ["8ECD",0x5E6B],
+  ["8ECE",0x5E6C],
+  ["8ECF",0x5E6D],
+  ["8ED0",0x5E6E],
+  ["8ED1",0x5E6F],
+  ["8ED2",0x5E70],
+  ["8ED3",0x5E71],
+  ["B8C9",0x5E72],
+  ["C6BD",0x5E73],
+  ["C4EA",0x5E74],
+  ["8ED4",0x5E75],
+  ["B2A2",0x5E76],
+  ["8ED5",0x5E77],
+  ["D0D2",0x5E78],
+  ["8ED6",0x5E79],
+  ["E7DB",0x5E7A],
+  ["BBC3",0x5E7B],
+  ["D3D7",0x5E7C],
+  ["D3C4",0x5E7D],
+  ["8ED7",0x5E7E],
+  ["B9E3",0x5E7F],
+  ["E2CF",0x5E80],
+  ["8ED8",0x5E81],
+  ["8ED9",0x5E82],
+  ["8EDA",0x5E83],
+  ["D7AF",0x5E84],
+  ["8EDB",0x5E85],
+  ["C7EC",0x5E86],
+  ["B1D3",0x5E87],
+  ["8EDC",0x5E88],
+  ["8EDD",0x5E89],
+  ["B4B2",0x5E8A],
+  ["E2D1",0x5E8B],
+  ["8EDE",0x5E8C],
+  ["8EDF",0x5E8D],
+  ["8EE0",0x5E8E],
+  ["D0F2",0x5E8F],
+  ["C2AE",0x5E90],
+  ["E2D0",0x5E91],
+  ["8EE1",0x5E92],
+  ["BFE2",0x5E93],
+  ["D3A6",0x5E94],
+  ["B5D7",0x5E95],
+  ["E2D2",0x5E96],
+  ["B5EA",0x5E97],
+  ["8EE2",0x5E98],
+  ["C3ED",0x5E99],
+  ["B8FD",0x5E9A],
+  ["8EE3",0x5E9B],
+  ["B8AE",0x5E9C],
+  ["8EE4",0x5E9D],
+  ["C5D3",0x5E9E],
+  ["B7CF",0x5E9F],
+  ["E2D4",0x5EA0],
+  ["8EE5",0x5EA1],
+  ["8EE6",0x5EA2],
+  ["8EE7",0x5EA3],
+  ["8EE8",0x5EA4],
+  ["E2D3",0x5EA5],
+  ["B6C8",0x5EA6],
+  ["D7F9",0x5EA7],
+  ["8EE9",0x5EA8],
+  ["8EEA",0x5EA9],
+  ["8EEB",0x5EAA],
+  ["8EEC",0x5EAB],
+  ["8EED",0x5EAC],
+  ["CDA5",0x5EAD],
+  ["8EEE",0x5EAE],
+  ["8EEF",0x5EAF],
+  ["8EF0",0x5EB0],
+  ["8EF1",0x5EB1],
+  ["8EF2",0x5EB2],
+  ["E2D8",0x5EB3],
+  ["8EF3",0x5EB4],
+  ["E2D6",0x5EB5],
+  ["CAFC",0x5EB6],
+  ["BFB5",0x5EB7],
+  ["D3B9",0x5EB8],
+  ["E2D5",0x5EB9],
+  ["8EF4",0x5EBA],
+  ["8EF5",0x5EBB],
+  ["8EF6",0x5EBC],
+  ["8EF7",0x5EBD],
+  ["E2D7",0x5EBE],
+  ["8EF8",0x5EBF],
+  ["8EF9",0x5EC0],
+  ["8EFA",0x5EC1],
+  ["8EFB",0x5EC2],
+  ["8EFC",0x5EC3],
+  ["8EFD",0x5EC4],
+  ["8EFE",0x5EC5],
+  ["8F40",0x5EC6],
+  ["8F41",0x5EC7],
+  ["8F42",0x5EC8],
+  ["C1AE",0x5EC9],
+  ["C0C8",0x5ECA],
+  ["8F43",0x5ECB],
+  ["8F44",0x5ECC],
+  ["8F45",0x5ECD],
+  ["8F46",0x5ECE],
+  ["8F47",0x5ECF],
+  ["8F48",0x5ED0],
+  ["E2DB",0x5ED1],
+  ["E2DA",0x5ED2],
+  ["C0AA",0x5ED3],
+  ["8F49",0x5ED4],
+  ["8F4A",0x5ED5],
+  ["C1CE",0x5ED6],
+  ["8F4B",0x5ED7],
+  ["8F4C",0x5ED8],
+  ["8F4D",0x5ED9],
+  ["8F4E",0x5EDA],
+  ["E2DC",0x5EDB],
+  ["8F4F",0x5EDC],
+  ["8F50",0x5EDD],
+  ["8F51",0x5EDE],
+  ["8F52",0x5EDF],
+  ["8F53",0x5EE0],
+  ["8F54",0x5EE1],
+  ["8F55",0x5EE2],
+  ["8F56",0x5EE3],
+  ["8F57",0x5EE4],
+  ["8F58",0x5EE5],
+  ["8F59",0x5EE6],
+  ["8F5A",0x5EE7],
+  ["E2DD",0x5EE8],
+  ["8F5B",0x5EE9],
+  ["E2DE",0x5EEA],
+  ["8F5C",0x5EEB],
+  ["8F5D",0x5EEC],
+  ["8F5E",0x5EED],
+  ["8F5F",0x5EEE],
+  ["8F60",0x5EEF],
+  ["8F61",0x5EF0],
+  ["8F62",0x5EF1],
+  ["8F63",0x5EF2],
+  ["8F64",0x5EF3],
+  ["DBC8",0x5EF4],
+  ["8F65",0x5EF5],
+  ["D1D3",0x5EF6],
+  ["CDA2",0x5EF7],
+  ["8F66",0x5EF8],
+  ["8F67",0x5EF9],
+  ["BDA8",0x5EFA],
+  ["8F68",0x5EFB],
+  ["8F69",0x5EFC],
+  ["8F6A",0x5EFD],
+  ["DEC3",0x5EFE],
+  ["D8A5",0x5EFF],
+  ["BFAA",0x5F00],
+  ["DBCD",0x5F01],
+  ["D2EC",0x5F02],
+  ["C6FA",0x5F03],
+  ["C5AA",0x5F04],
+  ["8F6B",0x5F05],
+  ["8F6C",0x5F06],
+  ["8F6D",0x5F07],
+  ["DEC4",0x5F08],
+  ["8F6E",0x5F09],
+  ["B1D7",0x5F0A],
+  ["DFAE",0x5F0B],
+  ["8F6F",0x5F0C],
+  ["8F70",0x5F0D],
+  ["8F71",0x5F0E],
+  ["CABD",0x5F0F],
+  ["8F72",0x5F10],
+  ["DFB1",0x5F11],
+  ["8F73",0x5F12],
+  ["B9AD",0x5F13],
+  ["8F74",0x5F14],
+  ["D2FD",0x5F15],
+  ["8F75",0x5F16],
+  ["B8A5",0x5F17],
+  ["BAEB",0x5F18],
+  ["8F76",0x5F19],
+  ["8F77",0x5F1A],
+  ["B3DA",0x5F1B],
+  ["8F78",0x5F1C],
+  ["8F79",0x5F1D],
+  ["8F7A",0x5F1E],
+  ["B5DC",0x5F1F],
+  ["D5C5",0x5F20],
+  ["8F7B",0x5F21],
+  ["8F7C",0x5F22],
+  ["8F7D",0x5F23],
+  ["8F7E",0x5F24],
+  ["C3D6",0x5F25],
+  ["CFD2",0x5F26],
+  ["BBA1",0x5F27],
+  ["8F80",0x5F28],
+  ["E5F3",0x5F29],
+  ["E5F2",0x5F2A],
+  ["8F81",0x5F2B],
+  ["8F82",0x5F2C],
+  ["E5F4",0x5F2D],
+  ["8F83",0x5F2E],
+  ["CDE4",0x5F2F],
+  ["8F84",0x5F30],
+  ["C8F5",0x5F31],
+  ["8F85",0x5F32],
+  ["8F86",0x5F33],
+  ["8F87",0x5F34],
+  ["8F88",0x5F35],
+  ["8F89",0x5F36],
+  ["8F8A",0x5F37],
+  ["8F8B",0x5F38],
+  ["B5AF",0x5F39],
+  ["C7BF",0x5F3A],
+  ["8F8C",0x5F3B],
+  ["E5F6",0x5F3C],
+  ["8F8D",0x5F3D],
+  ["8F8E",0x5F3E],
+  ["8F8F",0x5F3F],
+  ["ECB0",0x5F40],
+  ["8F90",0x5F41],
+  ["8F91",0x5F42],
+  ["8F92",0x5F43],
+  ["8F93",0x5F44],
+  ["8F94",0x5F45],
+  ["8F95",0x5F46],
+  ["8F96",0x5F47],
+  ["8F97",0x5F48],
+  ["8F98",0x5F49],
+  ["8F99",0x5F4A],
+  ["8F9A",0x5F4B],
+  ["8F9B",0x5F4C],
+  ["8F9C",0x5F4D],
+  ["8F9D",0x5F4E],
+  ["8F9E",0x5F4F],
+  ["E5E6",0x5F50],
+  ["8F9F",0x5F51],
+  ["B9E9",0x5F52],
+  ["B5B1",0x5F53],
+  ["8FA0",0x5F54],
+  ["C2BC",0x5F55],
+  ["E5E8",0x5F56],
+  ["E5E7",0x5F57],
+  ["E5E9",0x5F58],
+  ["8FA1",0x5F59],
+  ["8FA2",0x5F5A],
+  ["8FA3",0x5F5B],
+  ["8FA4",0x5F5C],
+  ["D2CD",0x5F5D],
+  ["8FA5",0x5F5E],
+  ["8FA6",0x5F5F],
+  ["8FA7",0x5F60],
+  ["E1EA",0x5F61],
+  ["D0CE",0x5F62],
+  ["8FA8",0x5F63],
+  ["CDAE",0x5F64],
+  ["8FA9",0x5F65],
+  ["D1E5",0x5F66],
+  ["8FAA",0x5F67],
+  ["8FAB",0x5F68],
+  ["B2CA",0x5F69],
+  ["B1EB",0x5F6A],
+  ["8FAC",0x5F6B],
+  ["B1F2",0x5F6C],
+  ["C5ED",0x5F6D],
+  ["8FAD",0x5F6E],
+  ["8FAE",0x5F6F],
+  ["D5C3",0x5F70],
+  ["D3B0",0x5F71],
+  ["8FAF",0x5F72],
+  ["E1DC",0x5F73],
+  ["8FB0",0x5F74],
+  ["8FB1",0x5F75],
+  ["8FB2",0x5F76],
+  ["E1DD",0x5F77],
+  ["8FB3",0x5F78],
+  ["D2DB",0x5F79],
+  ["8FB4",0x5F7A],
+  ["B3B9",0x5F7B],
+  ["B1CB",0x5F7C],
+  ["8FB5",0x5F7D],
+  ["8FB6",0x5F7E],
+  ["8FB7",0x5F7F],
+  ["CDF9",0x5F80],
+  ["D5F7",0x5F81],
+  ["E1DE",0x5F82],
+  ["8FB8",0x5F83],
+  ["BEB6",0x5F84],
+  ["B4FD",0x5F85],
+  ["8FB9",0x5F86],
+  ["E1DF",0x5F87],
+  ["BADC",0x5F88],
+  ["E1E0",0x5F89],
+  ["BBB2",0x5F8A],
+  ["C2C9",0x5F8B],
+  ["E1E1",0x5F8C],
+  ["8FBA",0x5F8D],
+  ["8FBB",0x5F8E],
+  ["8FBC",0x5F8F],
+  ["D0EC",0x5F90],
+  ["8FBD",0x5F91],
+  ["CDBD",0x5F92],
+  ["8FBE",0x5F93],
+  ["8FBF",0x5F94],
+  ["E1E2",0x5F95],
+  ["8FC0",0x5F96],
+  ["B5C3",0x5F97],
+  ["C5C7",0x5F98],
+  ["E1E3",0x5F99],
+  ["8FC1",0x5F9A],
+  ["8FC2",0x5F9B],
+  ["E1E4",0x5F9C],
+  ["8FC3",0x5F9D],
+  ["8FC4",0x5F9E],
+  ["8FC5",0x5F9F],
+  ["8FC6",0x5FA0],
+  ["D3F9",0x5FA1],
+  ["8FC7",0x5FA2],
+  ["8FC8",0x5FA3],
+  ["8FC9",0x5FA4],
+  ["8FCA",0x5FA5],
+  ["8FCB",0x5FA6],
+  ["8FCC",0x5FA7],
+  ["E1E5",0x5FA8],
+  ["8FCD",0x5FA9],
+  ["D1AD",0x5FAA],
+  ["8FCE",0x5FAB],
+  ["8FCF",0x5FAC],
+  ["E1E6",0x5FAD],
+  ["CEA2",0x5FAE],
+  ["8FD0",0x5FAF],
+  ["8FD1",0x5FB0],
+  ["8FD2",0x5FB1],
+  ["8FD3",0x5FB2],
+  ["8FD4",0x5FB3],
+  ["8FD5",0x5FB4],
+  ["E1E7",0x5FB5],
+  ["8FD6",0x5FB6],
+  ["B5C2",0x5FB7],
+  ["8FD7",0x5FB8],
+  ["8FD8",0x5FB9],
+  ["8FD9",0x5FBA],
+  ["8FDA",0x5FBB],
+  ["E1E8",0x5FBC],
+  ["BBD5",0x5FBD],
+  ["8FDB",0x5FBE],
+  ["8FDC",0x5FBF],
+  ["8FDD",0x5FC0],
+  ["8FDE",0x5FC1],
+  ["8FDF",0x5FC2],
+  ["D0C4",0x5FC3],
+  ["E2E0",0x5FC4],
+  ["B1D8",0x5FC5],
+  ["D2E4",0x5FC6],
+  ["8FE0",0x5FC7],
+  ["8FE1",0x5FC8],
+  ["E2E1",0x5FC9],
+  ["8FE2",0x5FCA],
+  ["8FE3",0x5FCB],
+  ["BCC9",0x5FCC],
+  ["C8CC",0x5FCD],
+  ["8FE4",0x5FCE],
+  ["E2E3",0x5FCF],
+  ["ECFE",0x5FD0],
+  ["ECFD",0x5FD1],
+  ["DFAF",0x5FD2],
+  ["8FE5",0x5FD3],
+  ["8FE6",0x5FD4],
+  ["8FE7",0x5FD5],
+  ["E2E2",0x5FD6],
+  ["D6BE",0x5FD7],
+  ["CDFC",0x5FD8],
+  ["C3A6",0x5FD9],
+  ["8FE8",0x5FDA],
+  ["8FE9",0x5FDB],
+  ["8FEA",0x5FDC],
+  ["E3C3",0x5FDD],
+  ["8FEB",0x5FDE],
+  ["8FEC",0x5FDF],
+  ["D6D2",0x5FE0],
+  ["E2E7",0x5FE1],
+  ["8FED",0x5FE2],
+  ["8FEE",0x5FE3],
+  ["E2E8",0x5FE4],
+  ["8FEF",0x5FE5],
+  ["8FF0",0x5FE6],
+  ["D3C7",0x5FE7],
+  ["8FF1",0x5FE8],
+  ["8FF2",0x5FE9],
+  ["E2EC",0x5FEA],
+  ["BFEC",0x5FEB],
+  ["8FF3",0x5FEC],
+  ["E2ED",0x5FED],
+  ["E2E5",0x5FEE],
+  ["8FF4",0x5FEF],
+  ["8FF5",0x5FF0],
+  ["B3C0",0x5FF1],
+  ["8FF6",0x5FF2],
+  ["8FF7",0x5FF3],
+  ["8FF8",0x5FF4],
+  ["C4EE",0x5FF5],
+  ["8FF9",0x5FF6],
+  ["8FFA",0x5FF7],
+  ["E2EE",0x5FF8],
+  ["8FFB",0x5FF9],
+  ["8FFC",0x5FFA],
+  ["D0C3",0x5FFB],
+  ["8FFD",0x5FFC],
+  ["BAF6",0x5FFD],
+  ["E2E9",0x5FFE],
+  ["B7DE",0x5FFF],
+  ["BBB3",0x6000],
+  ["CCAC",0x6001],
+  ["CBCB",0x6002],
+  ["E2E4",0x6003],
+  ["E2E6",0x6004],
+  ["E2EA",0x6005],
+  ["E2EB",0x6006],
+  ["8FFE",0x6007],
+  ["9040",0x6008],
+  ["9041",0x6009],
+  ["E2F7",0x600A],
+  ["9042",0x600B],
+  ["9043",0x600C],
+  ["E2F4",0x600D],
+  ["D4F5",0x600E],
+  ["E2F3",0x600F],
+  ["9044",0x6010],
+  ["9045",0x6011],
+  ["C5AD",0x6012],
+  ["9046",0x6013],
+  ["D5FA",0x6014],
+  ["C5C2",0x6015],
+  ["B2C0",0x6016],
+  ["9047",0x6017],
+  ["9048",0x6018],
+  ["E2EF",0x6019],
+  ["9049",0x601A],
+  ["E2F2",0x601B],
+  ["C1AF",0x601C],
+  ["CBBC",0x601D],
+  ["904A",0x601E],
+  ["904B",0x601F],
+  ["B5A1",0x6020],
+  ["E2F9",0x6021],
+  ["904C",0x6022],
+  ["904D",0x6023],
+  ["904E",0x6024],
+  ["BCB1",0x6025],
+  ["E2F1",0x6026],
+  ["D0D4",0x6027],
+  ["D4B9",0x6028],
+  ["E2F5",0x6029],
+  ["B9D6",0x602A],
+  ["E2F6",0x602B],
+  ["904F",0x602C],
+  ["9050",0x602D],
+  ["9051",0x602E],
+  ["C7D3",0x602F],
+  ["9052",0x6030],
+  ["9053",0x6031],
+  ["9054",0x6032],
+  ["9055",0x6033],
+  ["9056",0x6034],
+  ["E2F0",0x6035],
+  ["9057",0x6036],
+  ["9058",0x6037],
+  ["9059",0x6038],
+  ["905A",0x6039],
+  ["905B",0x603A],
+  ["D7DC",0x603B],
+  ["EDA1",0x603C],
+  ["905C",0x603D],
+  ["905D",0x603E],
+  ["E2F8",0x603F],
+  ["905E",0x6040],
+  ["EDA5",0x6041],
+  ["E2FE",0x6042],
+  ["CAD1",0x6043],
+  ["905F",0x6044],
+  ["9060",0x6045],
+  ["9061",0x6046],
+  ["9062",0x6047],
+  ["9063",0x6048],
+  ["9064",0x6049],
+  ["9065",0x604A],
+  ["C1B5",0x604B],
+  ["9066",0x604C],
+  ["BBD0",0x604D],
+  ["9067",0x604E],
+  ["9068",0x604F],
+  ["BFD6",0x6050],
+  ["9069",0x6051],
+  ["BAE3",0x6052],
+  ["906A",0x6053],
+  ["906B",0x6054],
+  ["CBA1",0x6055],
+  ["906C",0x6056],
+  ["906D",0x6057],
+  ["906E",0x6058],
+  ["EDA6",0x6059],
+  ["EDA3",0x605A],
+  ["906F",0x605B],
+  ["9070",0x605C],
+  ["EDA2",0x605D],
+  ["9071",0x605E],
+  ["9072",0x605F],
+  ["9073",0x6060],
+  ["9074",0x6061],
+  ["BBD6",0x6062],
+  ["EDA7",0x6063],
+  ["D0F4",0x6064],
+  ["9075",0x6065],
+  ["9076",0x6066],
+  ["EDA4",0x6067],
+  ["BADE",0x6068],
+  ["B6F7",0x6069],
+  ["E3A1",0x606A],
+  ["B6B2",0x606B],
+  ["CCF1",0x606C],
+  ["B9A7",0x606D],
+  ["9077",0x606E],
+  ["CFA2",0x606F],
+  ["C7A1",0x6070],
+  ["9078",0x6071],
+  ["9079",0x6072],
+  ["BFD2",0x6073],
+  ["907A",0x6074],
+  ["907B",0x6075],
+  ["B6F1",0x6076],
+  ["907C",0x6077],
+  ["E2FA",0x6078],
+  ["E2FB",0x6079],
+  ["E2FD",0x607A],
+  ["E2FC",0x607B],
+  ["C4D5",0x607C],
+  ["E3A2",0x607D],
+  ["907D",0x607E],
+  ["D3C1",0x607F],
+  ["907E",0x6080],
+  ["9080",0x6081],
+  ["9081",0x6082],
+  ["E3A7",0x6083],
+  ["C7C4",0x6084],
+  ["9082",0x6085],
+  ["9083",0x6086],
+  ["9084",0x6087],
+  ["9085",0x6088],
+  ["CFA4",0x6089],
+  ["9086",0x608A],
+  ["9087",0x608B],
+  ["E3A9",0x608C],
+  ["BAB7",0x608D],
+  ["9088",0x608E],
+  ["9089",0x608F],
+  ["908A",0x6090],
+  ["908B",0x6091],
+  ["E3A8",0x6092],
+  ["908C",0x6093],
+  ["BBDA",0x6094],
+  ["908D",0x6095],
+  ["E3A3",0x6096],
+  ["908E",0x6097],
+  ["908F",0x6098],
+  ["9090",0x6099],
+  ["E3A4",0x609A],
+  ["E3AA",0x609B],
+  ["9091",0x609C],
+  ["E3A6",0x609D],
+  ["9092",0x609E],
+  ["CEF2",0x609F],
+  ["D3C6",0x60A0],
+  ["9093",0x60A1],
+  ["9094",0x60A2],
+  ["BBBC",0x60A3],
+  ["9095",0x60A4],
+  ["9096",0x60A5],
+  ["D4C3",0x60A6],
+  ["9097",0x60A7],
+  ["C4FA",0x60A8],
+  ["9098",0x60A9],
+  ["9099",0x60AA],
+  ["EDA8",0x60AB],
+  ["D0FC",0x60AC],
+  ["E3A5",0x60AD],
+  ["909A",0x60AE],
+  ["C3F5",0x60AF],
+  ["909B",0x60B0],
+  ["E3AD",0x60B1],
+  ["B1AF",0x60B2],
+  ["909C",0x60B3],
+  ["E3B2",0x60B4],
+  ["909D",0x60B5],
+  ["909E",0x60B6],
+  ["909F",0x60B7],
+  ["BCC2",0x60B8],
+  ["90A0",0x60B9],
+  ["90A1",0x60BA],
+  ["E3AC",0x60BB],
+  ["B5BF",0x60BC],
+  ["90A2",0x60BD],
+  ["90A3",0x60BE],
+  ["90A4",0x60BF],
+  ["90A5",0x60C0],
+  ["90A6",0x60C1],
+  ["90A7",0x60C2],
+  ["90A8",0x60C3],
+  ["90A9",0x60C4],
+  ["C7E9",0x60C5],
+  ["E3B0",0x60C6],
+  ["90AA",0x60C7],
+  ["90AB",0x60C8],
+  ["90AC",0x60C9],
+  ["BEAA",0x60CA],
+  ["CDEF",0x60CB],
+  ["90AD",0x60CC],
+  ["90AE",0x60CD],
+  ["90AF",0x60CE],
+  ["90B0",0x60CF],
+  ["90B1",0x60D0],
+  ["BBF3",0x60D1],
+  ["90B2",0x60D2],
+  ["90B3",0x60D3],
+  ["90B4",0x60D4],
+  ["CCE8",0x60D5],
+  ["90B5",0x60D6],
+  ["90B6",0x60D7],
+  ["E3AF",0x60D8],
+  ["90B7",0x60D9],
+  ["E3B1",0x60DA],
+  ["90B8",0x60DB],
+  ["CFA7",0x60DC],
+  ["E3AE",0x60DD],
+  ["90B9",0x60DE],
+  ["CEA9",0x60DF],
+  ["BBDD",0x60E0],
+  ["90BA",0x60E1],
+  ["90BB",0x60E2],
+  ["90BC",0x60E3],
+  ["90BD",0x60E4],
+  ["90BE",0x60E5],
+  ["B5EB",0x60E6],
+  ["BEE5",0x60E7],
+  ["B2D2",0x60E8],
+  ["B3CD",0x60E9],
+  ["90BF",0x60EA],
+  ["B1B9",0x60EB],
+  ["E3AB",0x60EC],
+  ["B2D1",0x60ED],
+  ["B5AC",0x60EE],
+  ["B9DF",0x60EF],
+  ["B6E8",0x60F0],
+  ["90C0",0x60F1],
+  ["90C1",0x60F2],
+  ["CFEB",0x60F3],
+  ["E3B7",0x60F4],
+  ["90C2",0x60F5],
+  ["BBCC",0x60F6],
+  ["90C3",0x60F7],
+  ["90C4",0x60F8],
+  ["C8C7",0x60F9],
+  ["D0CA",0x60FA],
+  ["90C5",0x60FB],
+  ["90C6",0x60FC],
+  ["90C7",0x60FD],
+  ["90C8",0x60FE],
+  ["90C9",0x60FF],
+  ["E3B8",0x6100],
+  ["B3EE",0x6101],
+  ["90CA",0x6102],
+  ["90CB",0x6103],
+  ["90CC",0x6104],
+  ["90CD",0x6105],
+  ["EDA9",0x6106],
+  ["90CE",0x6107],
+  ["D3FA",0x6108],
+  ["D3E4",0x6109],
+  ["90CF",0x610A],
+  ["90D0",0x610B],
+  ["90D1",0x610C],
+  ["EDAA",0x610D],
+  ["E3B9",0x610E],
+  ["D2E2",0x610F],
+  ["90D2",0x6110],
+  ["90D3",0x6111],
+  ["90D4",0x6112],
+  ["90D5",0x6113],
+  ["90D6",0x6114],
+  ["E3B5",0x6115],
+  ["90D7",0x6116],
+  ["90D8",0x6117],
+  ["90D9",0x6118],
+  ["90DA",0x6119],
+  ["D3DE",0x611A],
+  ["90DB",0x611B],
+  ["90DC",0x611C],
+  ["90DD",0x611D],
+  ["90DE",0x611E],
+  ["B8D0",0x611F],
+  ["E3B3",0x6120],
+  ["90DF",0x6121],
+  ["90E0",0x6122],
+  ["E3B6",0x6123],
+  ["B7DF",0x6124],
+  ["90E1",0x6125],
+  ["E3B4",0x6126],
+  ["C0A2",0x6127],
+  ["90E2",0x6128],
+  ["90E3",0x6129],
+  ["90E4",0x612A],
+  ["E3BA",0x612B],
+  ["90E5",0x612C],
+  ["90E6",0x612D],
+  ["90E7",0x612E],
+  ["90E8",0x612F],
+  ["90E9",0x6130],
+  ["90EA",0x6131],
+  ["90EB",0x6132],
+  ["90EC",0x6133],
+  ["90ED",0x6134],
+  ["90EE",0x6135],
+  ["90EF",0x6136],
+  ["90F0",0x6137],
+  ["90F1",0x6138],
+  ["90F2",0x6139],
+  ["90F3",0x613A],
+  ["90F4",0x613B],
+  ["90F5",0x613C],
+  ["90F6",0x613D],
+  ["90F7",0x613E],
+  ["D4B8",0x613F],
+  ["90F8",0x6140],
+  ["90F9",0x6141],
+  ["90FA",0x6142],
+  ["90FB",0x6143],
+  ["90FC",0x6144],
+  ["90FD",0x6145],
+  ["90FE",0x6146],
+  ["9140",0x6147],
+  ["B4C8",0x6148],
+  ["9141",0x6149],
+  ["E3BB",0x614A],
+  ["9142",0x614B],
+  ["BBC5",0x614C],
+  ["9143",0x614D],
+  ["C9F7",0x614E],
+  ["9144",0x614F],
+  ["9145",0x6150],
+  ["C9E5",0x6151],
+  ["9146",0x6152],
+  ["9147",0x6153],
+  ["9148",0x6154],
+  ["C4BD",0x6155],
+  ["9149",0x6156],
+  ["914A",0x6157],
+  ["914B",0x6158],
+  ["914C",0x6159],
+  ["914D",0x615A],
+  ["914E",0x615B],
+  ["914F",0x615C],
+  ["EDAB",0x615D],
+  ["9150",0x615E],
+  ["9151",0x615F],
+  ["9152",0x6160],
+  ["9153",0x6161],
+  ["C2FD",0x6162],
+  ["9154",0x6163],
+  ["9155",0x6164],
+  ["9156",0x6165],
+  ["9157",0x6166],
+  ["BBDB",0x6167],
+  ["BFAE",0x6168],
+  ["9158",0x6169],
+  ["9159",0x616A],
+  ["915A",0x616B],
+  ["915B",0x616C],
+  ["915C",0x616D],
+  ["915D",0x616E],
+  ["915E",0x616F],
+  ["CEBF",0x6170],
+  ["915F",0x6171],
+  ["9160",0x6172],
+  ["9161",0x6173],
+  ["9162",0x6174],
+  ["E3BC",0x6175],
+  ["9163",0x6176],
+  ["BFB6",0x6177],
+  ["9164",0x6178],
+  ["9165",0x6179],
+  ["9166",0x617A],
+  ["9167",0x617B],
+  ["9168",0x617C],
+  ["9169",0x617D],
+  ["916A",0x617E],
+  ["916B",0x617F],
+  ["916C",0x6180],
+  ["916D",0x6181],
+  ["916E",0x6182],
+  ["916F",0x6183],
+  ["9170",0x6184],
+  ["9171",0x6185],
+  ["9172",0x6186],
+  ["9173",0x6187],
+  ["9174",0x6188],
+  ["9175",0x6189],
+  ["9176",0x618A],
+  ["B1EF",0x618B],
+  ["9177",0x618C],
+  ["9178",0x618D],
+  ["D4F7",0x618E],
+  ["9179",0x618F],
+  ["917A",0x6190],
+  ["917B",0x6191],
+  ["917C",0x6192],
+  ["917D",0x6193],
+  ["E3BE",0x6194],
+  ["917E",0x6195],
+  ["9180",0x6196],
+  ["9181",0x6197],
+  ["9182",0x6198],
+  ["9183",0x6199],
+  ["9184",0x619A],
+  ["9185",0x619B],
+  ["9186",0x619C],
+  ["EDAD",0x619D],
+  ["9187",0x619E],
+  ["9188",0x619F],
+  ["9189",0x61A0],
+  ["918A",0x61A1],
+  ["918B",0x61A2],
+  ["918C",0x61A3],
+  ["918D",0x61A4],
+  ["918E",0x61A5],
+  ["918F",0x61A6],
+  ["E3BF",0x61A7],
+  ["BAA9",0x61A8],
+  ["EDAC",0x61A9],
+  ["9190",0x61AA],
+  ["9191",0x61AB],
+  ["E3BD",0x61AC],
+  ["9192",0x61AD],
+  ["9193",0x61AE],
+  ["9194",0x61AF],
+  ["9195",0x61B0],
+  ["9196",0x61B1],
+  ["9197",0x61B2],
+  ["9198",0x61B3],
+  ["9199",0x61B4],
+  ["919A",0x61B5],
+  ["919B",0x61B6],
+  ["E3C0",0x61B7],
+  ["919C",0x61B8],
+  ["919D",0x61B9],
+  ["919E",0x61BA],
+  ["919F",0x61BB],
+  ["91A0",0x61BC],
+  ["91A1",0x61BD],
+  ["BAB6",0x61BE],
+  ["91A2",0x61BF],
+  ["91A3",0x61C0],
+  ["91A4",0x61C1],
+  ["B6AE",0x61C2],
+  ["91A5",0x61C3],
+  ["91A6",0x61C4],
+  ["91A7",0x61C5],
+  ["91A8",0x61C6],
+  ["91A9",0x61C7],
+  ["D0B8",0x61C8],
+  ["91AA",0x61C9],
+  ["B0C3",0x61CA],
+  ["EDAE",0x61CB],
+  ["91AB",0x61CC],
+  ["91AC",0x61CD],
+  ["91AD",0x61CE],
+  ["91AE",0x61CF],
+  ["91AF",0x61D0],
+  ["EDAF",0x61D1],
+  ["C0C1",0x61D2],
+  ["91B0",0x61D3],
+  ["E3C1",0x61D4],
+  ["91B1",0x61D5],
+  ["91B2",0x61D6],
+  ["91B3",0x61D7],
+  ["91B4",0x61D8],
+  ["91B5",0x61D9],
+  ["91B6",0x61DA],
+  ["91B7",0x61DB],
+  ["91B8",0x61DC],
+  ["91B9",0x61DD],
+  ["91BA",0x61DE],
+  ["91BB",0x61DF],
+  ["91BC",0x61E0],
+  ["91BD",0x61E1],
+  ["91BE",0x61E2],
+  ["91BF",0x61E3],
+  ["91C0",0x61E4],
+  ["91C1",0x61E5],
+  ["C5B3",0x61E6],
+  ["91C2",0x61E7],
+  ["91C3",0x61E8],
+  ["91C4",0x61E9],
+  ["91C5",0x61EA],
+  ["91C6",0x61EB],
+  ["91C7",0x61EC],
+  ["91C8",0x61ED],
+  ["91C9",0x61EE],
+  ["91CA",0x61EF],
+  ["91CB",0x61F0],
+  ["91CC",0x61F1],
+  ["91CD",0x61F2],
+  ["91CE",0x61F3],
+  ["91CF",0x61F4],
+  ["E3C2",0x61F5],
+  ["91D0",0x61F6],
+  ["91D1",0x61F7],
+  ["91D2",0x61F8],
+  ["91D3",0x61F9],
+  ["91D4",0x61FA],
+  ["91D5",0x61FB],
+  ["91D6",0x61FC],
+  ["91D7",0x61FD],
+  ["91D8",0x61FE],
+  ["DCB2",0x61FF],
+  ["91D9",0x6200],
+  ["91DA",0x6201],
+  ["91DB",0x6202],
+  ["91DC",0x6203],
+  ["91DD",0x6204],
+  ["91DE",0x6205],
+  ["EDB0",0x6206],
+  ["91DF",0x6207],
+  ["B8EA",0x6208],
+  ["91E0",0x6209],
+  ["CEEC",0x620A],
+  ["EAA7",0x620B],
+  ["D0E7",0x620C],
+  ["CAF9",0x620D],
+  ["C8D6",0x620E],
+  ["CFB7",0x620F],
+  ["B3C9",0x6210],
+  ["CED2",0x6211],
+  ["BDE4",0x6212],
+  ["91E1",0x6213],
+  ["91E2",0x6214],
+  ["E3DE",0x6215],
+  ["BBF2",0x6216],
+  ["EAA8",0x6217],
+  ["D5BD",0x6218],
+  ["91E3",0x6219],
+  ["C6DD",0x621A],
+  ["EAA9",0x621B],
+  ["91E4",0x621C],
+  ["91E5",0x621D],
+  ["91E6",0x621E],
+  ["EAAA",0x621F],
+  ["91E7",0x6220],
+  ["EAAC",0x6221],
+  ["EAAB",0x6222],
+  ["91E8",0x6223],
+  ["EAAE",0x6224],
+  ["EAAD",0x6225],
+  ["91E9",0x6226],
+  ["91EA",0x6227],
+  ["91EB",0x6228],
+  ["91EC",0x6229],
+  ["BDD8",0x622A],
+  ["91ED",0x622B],
+  ["EAAF",0x622C],
+  ["91EE",0x622D],
+  ["C2BE",0x622E],
+  ["91EF",0x622F],
+  ["91F0",0x6230],
+  ["91F1",0x6231],
+  ["91F2",0x6232],
+  ["B4C1",0x6233],
+  ["B4F7",0x6234],
+  ["91F3",0x6235],
+  ["91F4",0x6236],
+  ["BBA7",0x6237],
+  ["91F5",0x6238],
+  ["91F6",0x6239],
+  ["91F7",0x623A],
+  ["91F8",0x623B],
+  ["91F9",0x623C],
+  ["ECE6",0x623D],
+  ["ECE5",0x623E],
+  ["B7BF",0x623F],
+  ["CBF9",0x6240],
+  ["B1E2",0x6241],
+  ["91FA",0x6242],
+  ["ECE7",0x6243],
+  ["91FB",0x6244],
+  ["91FC",0x6245],
+  ["91FD",0x6246],
+  ["C9C8",0x6247],
+  ["ECE8",0x6248],
+  ["ECE9",0x6249],
+  ["91FE",0x624A],
+  ["CAD6",0x624B],
+  ["DED0",0x624C],
+  ["B2C5",0x624D],
+  ["D4FA",0x624E],
+  ["9240",0x624F],
+  ["9241",0x6250],
+  ["C6CB",0x6251],
+  ["B0C7",0x6252],
+  ["B4F2",0x6253],
+  ["C8D3",0x6254],
+  ["9242",0x6255],
+  ["9243",0x6256],
+  ["9244",0x6257],
+  ["CDD0",0x6258],
+  ["9245",0x6259],
+  ["9246",0x625A],
+  ["BFB8",0x625B],
+  ["9247",0x625C],
+  ["9248",0x625D],
+  ["9249",0x625E],
+  ["924A",0x625F],
+  ["924B",0x6260],
+  ["924C",0x6261],
+  ["924D",0x6262],
+  ["BFDB",0x6263],
+  ["924E",0x6264],
+  ["924F",0x6265],
+  ["C7A4",0x6266],
+  ["D6B4",0x6267],
+  ["9250",0x6268],
+  ["C0A9",0x6269],
+  ["DED1",0x626A],
+  ["C9A8",0x626B],
+  ["D1EF",0x626C],
+  ["C5A4",0x626D],
+  ["B0E7",0x626E],
+  ["B3B6",0x626F],
+  ["C8C5",0x6270],
+  ["9251",0x6271],
+  ["9252",0x6272],
+  ["B0E2",0x6273],
+  ["9253",0x6274],
+  ["9254",0x6275],
+  ["B7F6",0x6276],
+  ["9255",0x6277],
+  ["9256",0x6278],
+  ["C5FA",0x6279],
+  ["9257",0x627A],
+  ["9258",0x627B],
+  ["B6F3",0x627C],
+  ["9259",0x627D],
+  ["D5D2",0x627E],
+  ["B3D0",0x627F],
+  ["BCBC",0x6280],
+  ["925A",0x6281],
+  ["925B",0x6282],
+  ["925C",0x6283],
+  ["B3AD",0x6284],
+  ["925D",0x6285],
+  ["925E",0x6286],
+  ["925F",0x6287],
+  ["9260",0x6288],
+  ["BEF1",0x6289],
+  ["B0D1",0x628A],
+  ["9261",0x628B],
+  ["9262",0x628C],
+  ["9263",0x628D],
+  ["9264",0x628E],
+  ["9265",0x628F],
+  ["9266",0x6290],
+  ["D2D6",0x6291],
+  ["CAE3",0x6292],
+  ["D7A5",0x6293],
+  ["9267",0x6294],
+  ["CDB6",0x6295],
+  ["B6B6",0x6296],
+  ["BFB9",0x6297],
+  ["D5DB",0x6298],
+  ["9268",0x6299],
+  ["B8A7",0x629A],
+  ["C5D7",0x629B],
+  ["9269",0x629C],
+  ["926A",0x629D],
+  ["926B",0x629E],
+  ["DED2",0x629F],
+  ["BFD9",0x62A0],
+  ["C2D5",0x62A1],
+  ["C7C0",0x62A2],
+  ["926C",0x62A3],
+  ["BBA4",0x62A4],
+  ["B1A8",0x62A5],
+  ["926D",0x62A6],
+  ["926E",0x62A7],
+  ["C5EA",0x62A8],
+  ["926F",0x62A9],
+  ["9270",0x62AA],
+  ["C5FB",0x62AB],
+  ["CCA7",0x62AC],
+  ["9271",0x62AD],
+  ["9272",0x62AE],
+  ["9273",0x62AF],
+  ["9274",0x62B0],
+  ["B1A7",0x62B1],
+  ["9275",0x62B2],
+  ["9276",0x62B3],
+  ["9277",0x62B4],
+  ["B5D6",0x62B5],
+  ["9278",0x62B6],
+  ["9279",0x62B7],
+  ["927A",0x62B8],
+  ["C4A8",0x62B9],
+  ["927B",0x62BA],
+  ["DED3",0x62BB],
+  ["D1BA",0x62BC],
+  ["B3E9",0x62BD],
+  ["927C",0x62BE],
+  ["C3F2",0x62BF],
+  ["927D",0x62C0],
+  ["927E",0x62C1],
+  ["B7F7",0x62C2],
+  ["9280",0x62C3],
+  ["D6F4",0x62C4],
+  ["B5A3",0x62C5],
+  ["B2F0",0x62C6],
+  ["C4B4",0x62C7],
+  ["C4E9",0x62C8],
+  ["C0AD",0x62C9],
+  ["DED4",0x62CA],
+  ["9281",0x62CB],
+  ["B0E8",0x62CC],
+  ["C5C4",0x62CD],
+  ["C1E0",0x62CE],
+  ["9282",0x62CF],
+  ["B9D5",0x62D0],
+  ["9283",0x62D1],
+  ["BEDC",0x62D2],
+  ["CDD8",0x62D3],
+  ["B0CE",0x62D4],
+  ["9284",0x62D5],
+  ["CDCF",0x62D6],
+  ["DED6",0x62D7],
+  ["BED0",0x62D8],
+  ["D7BE",0x62D9],
+  ["DED5",0x62DA],
+  ["D5D0",0x62DB],
+  ["B0DD",0x62DC],
+  ["9285",0x62DD],
+  ["9286",0x62DE],
+  ["C4E2",0x62DF],
+  ["9287",0x62E0],
+  ["9288",0x62E1],
+  ["C2A3",0x62E2],
+  ["BCF0",0x62E3],
+  ["9289",0x62E4],
+  ["D3B5",0x62E5],
+  ["C0B9",0x62E6],
+  ["C5A1",0x62E7],
+  ["B2A6",0x62E8],
+  ["D4F1",0x62E9],
+  ["928A",0x62EA],
+  ["928B",0x62EB],
+  ["C0A8",0x62EC],
+  ["CAC3",0x62ED],
+  ["DED7",0x62EE],
+  ["D5FC",0x62EF],
+  ["928C",0x62F0],
+  ["B9B0",0x62F1],
+  ["928D",0x62F2],
+  ["C8AD",0x62F3],
+  ["CBA9",0x62F4],
+  ["928E",0x62F5],
+  ["DED9",0x62F6],
+  ["BFBD",0x62F7],
+  ["928F",0x62F8],
+  ["9290",0x62F9],
+  ["9291",0x62FA],
+  ["9292",0x62FB],
+  ["C6B4",0x62FC],
+  ["D7A7",0x62FD],
+  ["CAB0",0x62FE],
+  ["C4C3",0x62FF],
+  ["9293",0x6300],
+  ["B3D6",0x6301],
+  ["B9D2",0x6302],
+  ["9294",0x6303],
+  ["9295",0x6304],
+  ["9296",0x6305],
+  ["9297",0x6306],
+  ["D6B8",0x6307],
+  ["EAFC",0x6308],
+  ["B0B4",0x6309],
+  ["9298",0x630A],
+  ["9299",0x630B],
+  ["929A",0x630C],
+  ["929B",0x630D],
+  ["BFE6",0x630E],
+  ["929C",0x630F],
+  ["929D",0x6310],
+  ["CCF4",0x6311],
+  ["929E",0x6312],
+  ["929F",0x6313],
+  ["92A0",0x6314],
+  ["92A1",0x6315],
+  ["CDDA",0x6316],
+  ["92A2",0x6317],
+  ["92A3",0x6318],
+  ["92A4",0x6319],
+  ["D6BF",0x631A],
+  ["C2CE",0x631B],
+  ["92A5",0x631C],
+  ["CECE",0x631D],
+  ["CCA2",0x631E],
+  ["D0AE",0x631F],
+  ["C4D3",0x6320],
+  ["B5B2",0x6321],
+  ["DED8",0x6322],
+  ["D5F5",0x6323],
+  ["BCB7",0x6324],
+  ["BBD3",0x6325],
+  ["92A6",0x6326],
+  ["92A7",0x6327],
+  ["B0A4",0x6328],
+  ["92A8",0x6329],
+  ["C5B2",0x632A],
+  ["B4EC",0x632B],
+  ["92A9",0x632C],
+  ["92AA",0x632D],
+  ["92AB",0x632E],
+  ["D5F1",0x632F],
+  ["92AC",0x6330],
+  ["92AD",0x6331],
+  ["EAFD",0x6332],
+  ["92AE",0x6333],
+  ["92AF",0x6334],
+  ["92B0",0x6335],
+  ["92B1",0x6336],
+  ["92B2",0x6337],
+  ["92B3",0x6338],
+  ["DEDA",0x6339],
+  ["CDA6",0x633A],
+  ["92B4",0x633B],
+  ["92B5",0x633C],
+  ["CDEC",0x633D],
+  ["92B6",0x633E],
+  ["92B7",0x633F],
+  ["92B8",0x6340],
+  ["92B9",0x6341],
+  ["CEE6",0x6342],
+  ["DEDC",0x6343],
+  ["92BA",0x6344],
+  ["CDB1",0x6345],
+  ["C0A6",0x6346],
+  ["92BB",0x6347],
+  ["92BC",0x6348],
+  ["D7BD",0x6349],
+  ["92BD",0x634A],
+  ["DEDB",0x634B],
+  ["B0C6",0x634C],
+  ["BAB4",0x634D],
+  ["C9D3",0x634E],
+  ["C4F3",0x634F],
+  ["BEE8",0x6350],
+  ["92BE",0x6351],
+  ["92BF",0x6352],
+  ["92C0",0x6353],
+  ["92C1",0x6354],
+  ["B2B6",0x6355],
+  ["92C2",0x6356],
+  ["92C3",0x6357],
+  ["92C4",0x6358],
+  ["92C5",0x6359],
+  ["92C6",0x635A],
+  ["92C7",0x635B],
+  ["92C8",0x635C],
+  ["92C9",0x635D],
+  ["C0CC",0x635E],
+  ["CBF0",0x635F],
+  ["92CA",0x6360],
+  ["BCF1",0x6361],
+  ["BBBB",0x6362],
+  ["B5B7",0x6363],
+  ["92CB",0x6364],
+  ["92CC",0x6365],
+  ["92CD",0x6366],
+  ["C5F5",0x6367],
+  ["92CE",0x6368],
+  ["DEE6",0x6369],
+  ["92CF",0x636A],
+  ["92D0",0x636B],
+  ["92D1",0x636C],
+  ["DEE3",0x636D],
+  ["BEDD",0x636E],
+  ["92D2",0x636F],
+  ["92D3",0x6370],
+  ["DEDF",0x6371],
+  ["92D4",0x6372],
+  ["92D5",0x6373],
+  ["92D6",0x6374],
+  ["92D7",0x6375],
+  ["B4B7",0x6376],
+  ["BDDD",0x6377],
+  ["92D8",0x6378],
+  ["92D9",0x6379],
+  ["DEE0",0x637A],
+  ["C4ED",0x637B],
+  ["92DA",0x637C],
+  ["92DB",0x637D],
+  ["92DC",0x637E],
+  ["92DD",0x637F],
+  ["CFC6",0x6380],
+  ["92DE",0x6381],
+  ["B5E0",0x6382],
+  ["92DF",0x6383],
+  ["92E0",0x6384],
+  ["92E1",0x6385],
+  ["92E2",0x6386],
+  ["B6DE",0x6387],
+  ["CADA",0x6388],
+  ["B5F4",0x6389],
+  ["DEE5",0x638A],
+  ["92E3",0x638B],
+  ["D5C6",0x638C],
+  ["92E4",0x638D],
+  ["DEE1",0x638E],
+  ["CCCD",0x638F],
+  ["C6FE",0x6390],
+  ["92E5",0x6391],
+  ["C5C5",0x6392],
+  ["92E6",0x6393],
+  ["92E7",0x6394],
+  ["92E8",0x6395],
+  ["D2B4",0x6396],
+  ["92E9",0x6397],
+  ["BEF2",0x6398],
+  ["92EA",0x6399],
+  ["92EB",0x639A],
+  ["92EC",0x639B],
+  ["92ED",0x639C],
+  ["92EE",0x639D],
+  ["92EF",0x639E],
+  ["92F0",0x639F],
+  ["C2D3",0x63A0],
+  ["92F1",0x63A1],
+  ["CCBD",0x63A2],
+  ["B3B8",0x63A3],
+  ["92F2",0x63A4],
+  ["BDD3",0x63A5],
+  ["92F3",0x63A6],
+  ["BFD8",0x63A7],
+  ["CDC6",0x63A8],
+  ["D1DA",0x63A9],
+  ["B4EB",0x63AA],
+  ["92F4",0x63AB],
+  ["DEE4",0x63AC],
+  ["DEDD",0x63AD],
+  ["DEE7",0x63AE],
+  ["92F5",0x63AF],
+  ["EAFE",0x63B0],
+  ["92F6",0x63B1],
+  ["92F7",0x63B2],
+  ["C2B0",0x63B3],
+  ["DEE2",0x63B4],
+  ["92F8",0x63B5],
+  ["92F9",0x63B6],
+  ["D6C0",0x63B7],
+  ["B5A7",0x63B8],
+  ["92FA",0x63B9],
+  ["B2F4",0x63BA],
+  ["92FB",0x63BB],
+  ["DEE8",0x63BC],
+  ["92FC",0x63BD],
+  ["DEF2",0x63BE],
+  ["92FD",0x63BF],
+  ["92FE",0x63C0],
+  ["9340",0x63C1],
+  ["9341",0x63C2],
+  ["9342",0x63C3],
+  ["DEED",0x63C4],
+  ["9343",0x63C5],
+  ["DEF1",0x63C6],
+  ["9344",0x63C7],
+  ["9345",0x63C8],
+  ["C8E0",0x63C9],
+  ["9346",0x63CA],
+  ["9347",0x63CB],
+  ["9348",0x63CC],
+  ["D7E1",0x63CD],
+  ["DEEF",0x63CE],
+  ["C3E8",0x63CF],
+  ["CCE1",0x63D0],
+  ["9349",0x63D1],
+  ["B2E5",0x63D2],
+  ["934A",0x63D3],
+  ["934B",0x63D4],
+  ["934C",0x63D5],
+  ["D2BE",0x63D6],
+  ["934D",0x63D7],
+  ["934E",0x63D8],
+  ["934F",0x63D9],
+  ["9350",0x63DA],
+  ["9351",0x63DB],
+  ["9352",0x63DC],
+  ["9353",0x63DD],
+  ["DEEE",0x63DE],
+  ["9354",0x63DF],
+  ["DEEB",0x63E0],
+  ["CED5",0x63E1],
+  ["9355",0x63E2],
+  ["B4A7",0x63E3],
+  ["9356",0x63E4],
+  ["9357",0x63E5],
+  ["9358",0x63E6],
+  ["9359",0x63E7],
+  ["935A",0x63E8],
+  ["BFAB",0x63E9],
+  ["BEBE",0x63EA],
+  ["935B",0x63EB],
+  ["935C",0x63EC],
+  ["BDD2",0x63ED],
+  ["935D",0x63EE],
+  ["935E",0x63EF],
+  ["935F",0x63F0],
+  ["9360",0x63F1],
+  ["DEE9",0x63F2],
+  ["9361",0x63F3],
+  ["D4AE",0x63F4],
+  ["9362",0x63F5],
+  ["DEDE",0x63F6],
+  ["9363",0x63F7],
+  ["DEEA",0x63F8],
+  ["9364",0x63F9],
+  ["9365",0x63FA],
+  ["9366",0x63FB],
+  ["9367",0x63FC],
+  ["C0BF",0x63FD],
+  ["9368",0x63FE],
+  ["DEEC",0x63FF],
+  ["B2F3",0x6400],
+  ["B8E9",0x6401],
+  ["C2A7",0x6402],
+  ["9369",0x6403],
+  ["936A",0x6404],
+  ["BDC1",0x6405],
+  ["936B",0x6406],
+  ["936C",0x6407],
+  ["936D",0x6408],
+  ["936E",0x6409],
+  ["936F",0x640A],
+  ["DEF5",0x640B],
+  ["DEF8",0x640C],
+  ["9370",0x640D],
+  ["9371",0x640E],
+  ["B2AB",0x640F],
+  ["B4A4",0x6410],
+  ["9372",0x6411],
+  ["9373",0x6412],
+  ["B4EA",0x6413],
+  ["C9A6",0x6414],
+  ["9374",0x6415],
+  ["9375",0x6416],
+  ["9376",0x6417],
+  ["9377",0x6418],
+  ["9378",0x6419],
+  ["9379",0x641A],
+  ["DEF6",0x641B],
+  ["CBD1",0x641C],
+  ["937A",0x641D],
+  ["B8E3",0x641E],
+  ["937B",0x641F],
+  ["DEF7",0x6420],
+  ["DEFA",0x6421],
+  ["937C",0x6422],
+  ["937D",0x6423],
+  ["937E",0x6424],
+  ["9380",0x6425],
+  ["DEF9",0x6426],
+  ["9381",0x6427],
+  ["9382",0x6428],
+  ["9383",0x6429],
+  ["CCC2",0x642A],
+  ["9384",0x642B],
+  ["B0E1",0x642C],
+  ["B4EE",0x642D],
+  ["9385",0x642E],
+  ["9386",0x642F],
+  ["9387",0x6430],
+  ["9388",0x6431],
+  ["9389",0x6432],
+  ["938A",0x6433],
+  ["E5BA",0x6434],
+  ["938B",0x6435],
+  ["938C",0x6436],
+  ["938D",0x6437],
+  ["938E",0x6438],
+  ["938F",0x6439],
+  ["D0AF",0x643A],
+  ["9390",0x643B],
+  ["9391",0x643C],
+  ["B2EB",0x643D],
+  ["9392",0x643E],
+  ["EBA1",0x643F],
+  ["9393",0x6440],
+  ["DEF4",0x6441],
+  ["9394",0x6442],
+  ["9395",0x6443],
+  ["C9E3",0x6444],
+  ["DEF3",0x6445],
+  ["B0DA",0x6446],
+  ["D2A1",0x6447],
+  ["B1F7",0x6448],
+  ["9396",0x6449],
+  ["CCAF",0x644A],
+  ["9397",0x644B],
+  ["9398",0x644C],
+  ["9399",0x644D],
+  ["939A",0x644E],
+  ["939B",0x644F],
+  ["939C",0x6450],
+  ["939D",0x6451],
+  ["DEF0",0x6452],
+  ["939E",0x6453],
+  ["CBA4",0x6454],
+  ["939F",0x6455],
+  ["93A0",0x6456],
+  ["93A1",0x6457],
+  ["D5AA",0x6458],
+  ["93A2",0x6459],
+  ["93A3",0x645A],
+  ["93A4",0x645B],
+  ["93A5",0x645C],
+  ["93A6",0x645D],
+  ["DEFB",0x645E],
+  ["93A7",0x645F],
+  ["93A8",0x6460],
+  ["93A9",0x6461],
+  ["93AA",0x6462],
+  ["93AB",0x6463],
+  ["93AC",0x6464],
+  ["93AD",0x6465],
+  ["93AE",0x6466],
+  ["B4DD",0x6467],
+  ["93AF",0x6468],
+  ["C4A6",0x6469],
+  ["93B0",0x646A],
+  ["93B1",0x646B],
+  ["93B2",0x646C],
+  ["DEFD",0x646D],
+  ["93B3",0x646E],
+  ["93B4",0x646F],
+  ["93B5",0x6470],
+  ["93B6",0x6471],
+  ["93B7",0x6472],
+  ["93B8",0x6473],
+  ["93B9",0x6474],
+  ["93BA",0x6475],
+  ["93BB",0x6476],
+  ["93BC",0x6477],
+  ["C3FE",0x6478],
+  ["C4A1",0x6479],
+  ["DFA1",0x647A],
+  ["93BD",0x647B],
+  ["93BE",0x647C],
+  ["93BF",0x647D],
+  ["93C0",0x647E],
+  ["93C1",0x647F],
+  ["93C2",0x6480],
+  ["93C3",0x6481],
+  ["C1CC",0x6482],
+  ["93C4",0x6483],
+  ["DEFC",0x6484],
+  ["BEEF",0x6485],
+  ["93C5",0x6486],
+  ["C6B2",0x6487],
+  ["93C6",0x6488],
+  ["93C7",0x6489],
+  ["93C8",0x648A],
+  ["93C9",0x648B],
+  ["93CA",0x648C],
+  ["93CB",0x648D],
+  ["93CC",0x648E],
+  ["93CD",0x648F],
+  ["93CE",0x6490],
+  ["B3C5",0x6491],
+  ["C8F6",0x6492],
+  ["93CF",0x6493],
+  ["93D0",0x6494],
+  ["CBBA",0x6495],
+  ["DEFE",0x6496],
+  ["93D1",0x6497],
+  ["93D2",0x6498],
+  ["DFA4",0x6499],
+  ["93D3",0x649A],
+  ["93D4",0x649B],
+  ["93D5",0x649C],
+  ["93D6",0x649D],
+  ["D7B2",0x649E],
+  ["93D7",0x649F],
+  ["93D8",0x64A0],
+  ["93D9",0x64A1],
+  ["93DA",0x64A2],
+  ["93DB",0x64A3],
+  ["B3B7",0x64A4],
+  ["93DC",0x64A5],
+  ["93DD",0x64A6],
+  ["93DE",0x64A7],
+  ["93DF",0x64A8],
+  ["C1C3",0x64A9],
+  ["93E0",0x64AA],
+  ["93E1",0x64AB],
+  ["C7CB",0x64AC],
+  ["B2A5",0x64AD],
+  ["B4E9",0x64AE],
+  ["93E2",0x64AF],
+  ["D7AB",0x64B0],
+  ["93E3",0x64B1],
+  ["93E4",0x64B2],
+  ["93E5",0x64B3],
+  ["93E6",0x64B4],
+  ["C4EC",0x64B5],
+  ["93E7",0x64B6],
+  ["DFA2",0x64B7],
+  ["DFA3",0x64B8],
+  ["93E8",0x64B9],
+  ["DFA5",0x64BA],
+  ["93E9",0x64BB],
+  ["BAB3",0x64BC],
+  ["93EA",0x64BD],
+  ["93EB",0x64BE],
+  ["93EC",0x64BF],
+  ["DFA6",0x64C0],
+  ["93ED",0x64C1],
+  ["C0DE",0x64C2],
+  ["93EE",0x64C3],
+  ["93EF",0x64C4],
+  ["C9C3",0x64C5],
+  ["93F0",0x64C6],
+  ["93F1",0x64C7],
+  ["93F2",0x64C8],
+  ["93F3",0x64C9],
+  ["93F4",0x64CA],
+  ["93F5",0x64CB],
+  ["93F6",0x64CC],
+  ["B2D9",0x64CD],
+  ["C7E6",0x64CE],
+  ["93F7",0x64CF],
+  ["DFA7",0x64D0],
+  ["93F8",0x64D1],
+  ["C7DC",0x64D2],
+  ["93F9",0x64D3],
+  ["93FA",0x64D4],
+  ["93FB",0x64D5],
+  ["93FC",0x64D6],
+  ["DFA8",0x64D7],
+  ["EBA2",0x64D8],
+  ["93FD",0x64D9],
+  ["93FE",0x64DA],
+  ["9440",0x64DB],
+  ["9441",0x64DC],
+  ["9442",0x64DD],
+  ["CBD3",0x64DE],
+  ["9443",0x64DF],
+  ["9444",0x64E0],
+  ["9445",0x64E1],
+  ["DFAA",0x64E2],
+  ["9446",0x64E3],
+  ["DFA9",0x64E4],
+  ["9447",0x64E5],
+  ["B2C1",0x64E6],
+  ["9448",0x64E7],
+  ["9449",0x64E8],
+  ["944A",0x64E9],
+  ["944B",0x64EA],
+  ["944C",0x64EB],
+  ["944D",0x64EC],
+  ["944E",0x64ED],
+  ["944F",0x64EE],
+  ["9450",0x64EF],
+  ["9451",0x64F0],
+  ["9452",0x64F1],
+  ["9453",0x64F2],
+  ["9454",0x64F3],
+  ["9455",0x64F4],
+  ["9456",0x64F5],
+  ["9457",0x64F6],
+  ["9458",0x64F7],
+  ["9459",0x64F8],
+  ["945A",0x64F9],
+  ["945B",0x64FA],
+  ["945C",0x64FB],
+  ["945D",0x64FC],
+  ["945E",0x64FD],
+  ["945F",0x64FE],
+  ["9460",0x64FF],
+  ["C5CA",0x6500],
+  ["9461",0x6501],
+  ["9462",0x6502],
+  ["9463",0x6503],
+  ["9464",0x6504],
+  ["9465",0x6505],
+  ["9466",0x6506],
+  ["9467",0x6507],
+  ["9468",0x6508],
+  ["DFAB",0x6509],
+  ["9469",0x650A],
+  ["946A",0x650B],
+  ["946B",0x650C],
+  ["946C",0x650D],
+  ["946D",0x650E],
+  ["946E",0x650F],
+  ["946F",0x6510],
+  ["9470",0x6511],
+  ["D4DC",0x6512],
+  ["9471",0x6513],
+  ["9472",0x6514],
+  ["9473",0x6515],
+  ["9474",0x6516],
+  ["9475",0x6517],
+  ["C8C1",0x6518],
+  ["9476",0x6519],
+  ["9477",0x651A],
+  ["9478",0x651B],
+  ["9479",0x651C],
+  ["947A",0x651D],
+  ["947B",0x651E],
+  ["947C",0x651F],
+  ["947D",0x6520],
+  ["947E",0x6521],
+  ["9480",0x6522],
+  ["9481",0x6523],
+  ["9482",0x6524],
+  ["DFAC",0x6525],
+  ["9483",0x6526],
+  ["9484",0x6527],
+  ["9485",0x6528],
+  ["9486",0x6529],
+  ["9487",0x652A],
+  ["BEF0",0x652B],
+  ["9488",0x652C],
+  ["9489",0x652D],
+  ["DFAD",0x652E],
+  ["D6A7",0x652F],
+  ["948A",0x6530],
+  ["948B",0x6531],
+  ["948C",0x6532],
+  ["948D",0x6533],
+  ["EAB7",0x6534],
+  ["EBB6",0x6535],
+  ["CAD5",0x6536],
+  ["948E",0x6537],
+  ["D8FC",0x6538],
+  ["B8C4",0x6539],
+  ["948F",0x653A],
+  ["B9A5",0x653B],
+  ["9490",0x653C],
+  ["9491",0x653D],
+  ["B7C5",0x653E],
+  ["D5FE",0x653F],
+  ["9492",0x6540],
+  ["9493",0x6541],
+  ["9494",0x6542],
+  ["9495",0x6543],
+  ["9496",0x6544],
+  ["B9CA",0x6545],
+  ["9497",0x6546],
+  ["9498",0x6547],
+  ["D0A7",0x6548],
+  ["F4CD",0x6549],
+  ["9499",0x654A],
+  ["949A",0x654B],
+  ["B5D0",0x654C],
+  ["949B",0x654D],
+  ["949C",0x654E],
+  ["C3F4",0x654F],
+  ["949D",0x6550],
+  ["BEC8",0x6551],
+  ["949E",0x6552],
+  ["949F",0x6553],
+  ["94A0",0x6554],
+  ["EBB7",0x6555],
+  ["B0BD",0x6556],
+  ["94A1",0x6557],
+  ["94A2",0x6558],
+  ["BDCC",0x6559],
+  ["94A3",0x655A],
+  ["C1B2",0x655B],
+  ["94A4",0x655C],
+  ["B1D6",0x655D],
+  ["B3A8",0x655E],
+  ["94A5",0x655F],
+  ["94A6",0x6560],
+  ["94A7",0x6561],
+  ["B8D2",0x6562],
+  ["C9A2",0x6563],
+  ["94A8",0x6564],
+  ["94A9",0x6565],
+  ["B6D8",0x6566],
+  ["94AA",0x6567],
+  ["94AB",0x6568],
+  ["94AC",0x6569],
+  ["94AD",0x656A],
+  ["EBB8",0x656B],
+  ["BEB4",0x656C],
+  ["94AE",0x656D],
+  ["94AF",0x656E],
+  ["94B0",0x656F],
+  ["CAFD",0x6570],
+  ["94B1",0x6571],
+  ["C7C3",0x6572],
+  ["94B2",0x6573],
+  ["D5FB",0x6574],
+  ["94B3",0x6575],
+  ["94B4",0x6576],
+  ["B7F3",0x6577],
+  ["94B5",0x6578],
+  ["94B6",0x6579],
+  ["94B7",0x657A],
+  ["94B8",0x657B],
+  ["94B9",0x657C],
+  ["94BA",0x657D],
+  ["94BB",0x657E],
+  ["94BC",0x657F],
+  ["94BD",0x6580],
+  ["94BE",0x6581],
+  ["94BF",0x6582],
+  ["94C0",0x6583],
+  ["94C1",0x6584],
+  ["94C2",0x6585],
+  ["94C3",0x6586],
+  ["CEC4",0x6587],
+  ["94C4",0x6588],
+  ["94C5",0x6589],
+  ["94C6",0x658A],
+  ["D5AB",0x658B],
+  ["B1F3",0x658C],
+  ["94C7",0x658D],
+  ["94C8",0x658E],
+  ["94C9",0x658F],
+  ["ECB3",0x6590],
+  ["B0DF",0x6591],
+  ["94CA",0x6592],
+  ["ECB5",0x6593],
+  ["94CB",0x6594],
+  ["94CC",0x6595],
+  ["94CD",0x6596],
+  ["B6B7",0x6597],
+  ["94CE",0x6598],
+  ["C1CF",0x6599],
+  ["94CF",0x659A],
+  ["F5FA",0x659B],
+  ["D0B1",0x659C],
+  ["94D0",0x659D],
+  ["94D1",0x659E],
+  ["D5E5",0x659F],
+  ["94D2",0x65A0],
+  ["CED3",0x65A1],
+  ["94D3",0x65A2],
+  ["94D4",0x65A3],
+  ["BDEF",0x65A4],
+  ["B3E2",0x65A5],
+  ["94D5",0x65A6],
+  ["B8AB",0x65A7],
+  ["94D6",0x65A8],
+  ["D5B6",0x65A9],
+  ["94D7",0x65AA],
+  ["EDBD",0x65AB],
+  ["94D8",0x65AC],
+  ["B6CF",0x65AD],
+  ["94D9",0x65AE],
+  ["CBB9",0x65AF],
+  ["D0C2",0x65B0],
+  ["94DA",0x65B1],
+  ["94DB",0x65B2],
+  ["94DC",0x65B3],
+  ["94DD",0x65B4],
+  ["94DE",0x65B5],
+  ["94DF",0x65B6],
+  ["94E0",0x65B7],
+  ["94E1",0x65B8],
+  ["B7BD",0x65B9],
+  ["94E2",0x65BA],
+  ["94E3",0x65BB],
+  ["ECB6",0x65BC],
+  ["CAA9",0x65BD],
+  ["94E4",0x65BE],
+  ["94E5",0x65BF],
+  ["94E6",0x65C0],
+  ["C5D4",0x65C1],
+  ["94E7",0x65C2],
+  ["ECB9",0x65C3],
+  ["ECB8",0x65C4],
+  ["C2C3",0x65C5],
+  ["ECB7",0x65C6],
+  ["94E8",0x65C7],
+  ["94E9",0x65C8],
+  ["94EA",0x65C9],
+  ["94EB",0x65CA],
+  ["D0FD",0x65CB],
+  ["ECBA",0x65CC],
+  ["94EC",0x65CD],
+  ["ECBB",0x65CE],
+  ["D7E5",0x65CF],
+  ["94ED",0x65D0],
+  ["94EE",0x65D1],
+  ["ECBC",0x65D2],
+  ["94EF",0x65D3],
+  ["94F0",0x65D4],
+  ["94F1",0x65D5],
+  ["ECBD",0x65D6],
+  ["C6EC",0x65D7],
+  ["94F2",0x65D8],
+  ["94F3",0x65D9],
+  ["94F4",0x65DA],
+  ["94F5",0x65DB],
+  ["94F6",0x65DC],
+  ["94F7",0x65DD],
+  ["94F8",0x65DE],
+  ["94F9",0x65DF],
+  ["CEDE",0x65E0],
+  ["94FA",0x65E1],
+  ["BCC8",0x65E2],
+  ["94FB",0x65E3],
+  ["94FC",0x65E4],
+  ["C8D5",0x65E5],
+  ["B5A9",0x65E6],
+  ["BEC9",0x65E7],
+  ["D6BC",0x65E8],
+  ["D4E7",0x65E9],
+  ["94FD",0x65EA],
+  ["94FE",0x65EB],
+  ["D1AE",0x65EC],
+  ["D0F1",0x65ED],
+  ["EAB8",0x65EE],
+  ["EAB9",0x65EF],
+  ["EABA",0x65F0],
+  ["BAB5",0x65F1],
+  ["9540",0x65F2],
+  ["9541",0x65F3],
+  ["9542",0x65F4],
+  ["9543",0x65F5],
+  ["CAB1",0x65F6],
+  ["BFF5",0x65F7],
+  ["9544",0x65F8],
+  ["9545",0x65F9],
+  ["CDFA",0x65FA],
+  ["9546",0x65FB],
+  ["9547",0x65FC],
+  ["9548",0x65FD],
+  ["9549",0x65FE],
+  ["954A",0x65FF],
+  ["EAC0",0x6600],
+  ["954B",0x6601],
+  ["B0BA",0x6602],
+  ["EABE",0x6603],
+  ["954C",0x6604],
+  ["954D",0x6605],
+  ["C0A5",0x6606],
+  ["954E",0x6607],
+  ["954F",0x6608],
+  ["9550",0x6609],
+  ["EABB",0x660A],
+  ["9551",0x660B],
+  ["B2FD",0x660C],
+  ["9552",0x660D],
+  ["C3F7",0x660E],
+  ["BBE8",0x660F],
+  ["9553",0x6610],
+  ["9554",0x6611],
+  ["9555",0x6612],
+  ["D2D7",0x6613],
+  ["CEF4",0x6614],
+  ["EABF",0x6615],
+  ["9556",0x6616],
+  ["9557",0x6617],
+  ["9558",0x6618],
+  ["EABC",0x6619],
+  ["9559",0x661A],
+  ["955A",0x661B],
+  ["955B",0x661C],
+  ["EAC3",0x661D],
+  ["955C",0x661E],
+  ["D0C7",0x661F],
+  ["D3B3",0x6620],
+  ["955D",0x6621],
+  ["955E",0x6622],
+  ["955F",0x6623],
+  ["9560",0x6624],
+  ["B4BA",0x6625],
+  ["9561",0x6626],
+  ["C3C1",0x6627],
+  ["D7F2",0x6628],
+  ["9562",0x6629],
+  ["9563",0x662A],
+  ["9564",0x662B],
+  ["9565",0x662C],
+  ["D5D1",0x662D],
+  ["9566",0x662E],
+  ["CAC7",0x662F],
+  ["9567",0x6630],
+  ["EAC5",0x6631],
+  ["9568",0x6632],
+  ["9569",0x6633],
+  ["EAC4",0x6634],
+  ["EAC7",0x6635],
+  ["EAC6",0x6636],
+  ["956A",0x6637],
+  ["956B",0x6638],
+  ["956C",0x6639],
+  ["956D",0x663A],
+  ["956E",0x663B],
+  ["D6E7",0x663C],
+  ["956F",0x663D],
+  ["CFD4",0x663E],
+  ["9570",0x663F],
+  ["9571",0x6640],
+  ["EACB",0x6641],
+  ["9572",0x6642],
+  ["BBCE",0x6643],
+  ["9573",0x6644],
+  ["9574",0x6645],
+  ["9575",0x6646],
+  ["9576",0x6647],
+  ["9577",0x6648],
+  ["9578",0x6649],
+  ["9579",0x664A],
+  ["BDFA",0x664B],
+  ["C9CE",0x664C],
+  ["957A",0x664D],
+  ["957B",0x664E],
+  ["EACC",0x664F],
+  ["957C",0x6650],
+  ["957D",0x6651],
+  ["C9B9",0x6652],
+  ["CFFE",0x6653],
+  ["EACA",0x6654],
+  ["D4CE",0x6655],
+  ["EACD",0x6656],
+  ["EACF",0x6657],
+  ["957E",0x6658],
+  ["9580",0x6659],
+  ["CDED",0x665A],
+  ["9581",0x665B],
+  ["9582",0x665C],
+  ["9583",0x665D],
+  ["9584",0x665E],
+  ["EAC9",0x665F],
+  ["9585",0x6660],
+  ["EACE",0x6661],
+  ["9586",0x6662],
+  ["9587",0x6663],
+  ["CEEE",0x6664],
+  ["9588",0x6665],
+  ["BBDE",0x6666],
+  ["9589",0x6667],
+  ["B3BF",0x6668],
+  ["958A",0x6669],
+  ["958B",0x666A],
+  ["958C",0x666B],
+  ["958D",0x666C],
+  ["958E",0x666D],
+  ["C6D5",0x666E],
+  ["BEB0",0x666F],
+  ["CEFA",0x6670],
+  ["958F",0x6671],
+  ["9590",0x6672],
+  ["9591",0x6673],
+  ["C7E7",0x6674],
+  ["9592",0x6675],
+  ["BEA7",0x6676],
+  ["EAD0",0x6677],
+  ["9593",0x6678],
+  ["9594",0x6679],
+  ["D6C7",0x667A],
+  ["9595",0x667B],
+  ["9596",0x667C],
+  ["9597",0x667D],
+  ["C1C0",0x667E],
+  ["9598",0x667F],
+  ["9599",0x6680],
+  ["959A",0x6681],
+  ["D4DD",0x6682],
+  ["959B",0x6683],
+  ["EAD1",0x6684],
+  ["959C",0x6685],
+  ["959D",0x6686],
+  ["CFBE",0x6687],
+  ["959E",0x6688],
+  ["959F",0x6689],
+  ["95A0",0x668A],
+  ["95A1",0x668B],
+  ["EAD2",0x668C],
+  ["95A2",0x668D],
+  ["95A3",0x668E],
+  ["95A4",0x668F],
+  ["95A5",0x6690],
+  ["CAEE",0x6691],
+  ["95A6",0x6692],
+  ["95A7",0x6693],
+  ["95A8",0x6694],
+  ["95A9",0x6695],
+  ["C5AF",0x6696],
+  ["B0B5",0x6697],
+  ["95AA",0x6698],
+  ["95AB",0x6699],
+  ["95AC",0x669A],
+  ["95AD",0x669B],
+  ["95AE",0x669C],
+  ["EAD4",0x669D],
+  ["95AF",0x669E],
+  ["95B0",0x669F],
+  ["95B1",0x66A0],
+  ["95B2",0x66A1],
+  ["95B3",0x66A2],
+  ["95B4",0x66A3],
+  ["95B5",0x66A4],
+  ["95B6",0x66A5],
+  ["95B7",0x66A6],
+  ["EAD3",0x66A7],
+  ["F4DF",0x66A8],
+  ["95B8",0x66A9],
+  ["95B9",0x66AA],
+  ["95BA",0x66AB],
+  ["95BB",0x66AC],
+  ["95BC",0x66AD],
+  ["C4BA",0x66AE],
+  ["95BD",0x66AF],
+  ["95BE",0x66B0],
+  ["95BF",0x66B1],
+  ["95C0",0x66B2],
+  ["95C1",0x66B3],
+  ["B1A9",0x66B4],
+  ["95C2",0x66B5],
+  ["95C3",0x66B6],
+  ["95C4",0x66B7],
+  ["95C5",0x66B8],
+  ["E5DF",0x66B9],
+  ["95C6",0x66BA],
+  ["95C7",0x66BB],
+  ["95C8",0x66BC],
+  ["95C9",0x66BD],
+  ["EAD5",0x66BE],
+  ["95CA",0x66BF],
+  ["95CB",0x66C0],
+  ["95CC",0x66C1],
+  ["95CD",0x66C2],
+  ["95CE",0x66C3],
+  ["95CF",0x66C4],
+  ["95D0",0x66C5],
+  ["95D1",0x66C6],
+  ["95D2",0x66C7],
+  ["95D3",0x66C8],
+  ["95D4",0x66C9],
+  ["95D5",0x66CA],
+  ["95D6",0x66CB],
+  ["95D7",0x66CC],
+  ["95D8",0x66CD],
+  ["95D9",0x66CE],
+  ["95DA",0x66CF],
+  ["95DB",0x66D0],
+  ["95DC",0x66D1],
+  ["95DD",0x66D2],
+  ["95DE",0x66D3],
+  ["95DF",0x66D4],
+  ["95E0",0x66D5],
+  ["95E1",0x66D6],
+  ["95E2",0x66D7],
+  ["95E3",0x66D8],
+  ["CAEF",0x66D9],
+  ["95E4",0x66DA],
+  ["EAD6",0x66DB],
+  ["EAD7",0x66DC],
+  ["C6D8",0x66DD],
+  ["95E5",0x66DE],
+  ["95E6",0x66DF],
+  ["95E7",0x66E0],
+  ["95E8",0x66E1],
+  ["95E9",0x66E2],
+  ["95EA",0x66E3],
+  ["95EB",0x66E4],
+  ["95EC",0x66E5],
+  ["EAD8",0x66E6],
+  ["95ED",0x66E7],
+  ["95EE",0x66E8],
+  ["EAD9",0x66E9],
+  ["95EF",0x66EA],
+  ["95F0",0x66EB],
+  ["95F1",0x66EC],
+  ["95F2",0x66ED],
+  ["95F3",0x66EE],
+  ["95F4",0x66EF],
+  ["D4BB",0x66F0],
+  ["95F5",0x66F1],
+  ["C7FA",0x66F2],
+  ["D2B7",0x66F3],
+  ["B8FC",0x66F4],
+  ["95F6",0x66F5],
+  ["95F7",0x66F6],
+  ["EAC2",0x66F7],
+  ["95F8",0x66F8],
+  ["B2DC",0x66F9],
+  ["95F9",0x66FA],
+  ["95FA",0x66FB],
+  ["C2FC",0x66FC],
+  ["95FB",0x66FD],
+  ["D4F8",0x66FE],
+  ["CCE6",0x66FF],
+  ["D7EE",0x6700],
+  ["95FC",0x6701],
+  ["95FD",0x6702],
+  ["95FE",0x6703],
+  ["9640",0x6704],
+  ["9641",0x6705],
+  ["9642",0x6706],
+  ["9643",0x6707],
+  ["D4C2",0x6708],
+  ["D3D0",0x6709],
+  ["EBC3",0x670A],
+  ["C5F3",0x670B],
+  ["9644",0x670C],
+  ["B7FE",0x670D],
+  ["9645",0x670E],
+  ["9646",0x670F],
+  ["EBD4",0x6710],
+  ["9647",0x6711],
+  ["9648",0x6712],
+  ["9649",0x6713],
+  ["CBB7",0x6714],
+  ["EBDE",0x6715],
+  ["964A",0x6716],
+  ["C0CA",0x6717],
+  ["964B",0x6718],
+  ["964C",0x6719],
+  ["964D",0x671A],
+  ["CDFB",0x671B],
+  ["964E",0x671C],
+  ["B3AF",0x671D],
+  ["964F",0x671E],
+  ["C6DA",0x671F],
+  ["9650",0x6720],
+  ["9651",0x6721],
+  ["9652",0x6722],
+  ["9653",0x6723],
+  ["9654",0x6724],
+  ["9655",0x6725],
+  ["EBFC",0x6726],
+  ["9656",0x6727],
+  ["C4BE",0x6728],
+  ["9657",0x6729],
+  ["CEB4",0x672A],
+  ["C4A9",0x672B],
+  ["B1BE",0x672C],
+  ["D4FD",0x672D],
+  ["9658",0x672E],
+  ["CAF5",0x672F],
+  ["9659",0x6730],
+  ["D6EC",0x6731],
+  ["965A",0x6732],
+  ["965B",0x6733],
+  ["C6D3",0x6734],
+  ["B6E4",0x6735],
+  ["965C",0x6736],
+  ["965D",0x6737],
+  ["965E",0x6738],
+  ["965F",0x6739],
+  ["BBFA",0x673A],
+  ["9660",0x673B],
+  ["9661",0x673C],
+  ["D0E0",0x673D],
+  ["9662",0x673E],
+  ["9663",0x673F],
+  ["C9B1",0x6740],
+  ["9664",0x6741],
+  ["D4D3",0x6742],
+  ["C8A8",0x6743],
+  ["9665",0x6744],
+  ["9666",0x6745],
+  ["B8CB",0x6746],
+  ["9667",0x6747],
+  ["E8BE",0x6748],
+  ["C9BC",0x6749],
+  ["9668",0x674A],
+  ["9669",0x674B],
+  ["E8BB",0x674C],
+  ["966A",0x674D],
+  ["C0EE",0x674E],
+  ["D0D3",0x674F],
+  ["B2C4",0x6750],
+  ["B4E5",0x6751],
+  ["966B",0x6752],
+  ["E8BC",0x6753],
+  ["966C",0x6754],
+  ["966D",0x6755],
+  ["D5C8",0x6756],
+  ["966E",0x6757],
+  ["966F",0x6758],
+  ["9670",0x6759],
+  ["9671",0x675A],
+  ["9672",0x675B],
+  ["B6C5",0x675C],
+  ["9673",0x675D],
+  ["E8BD",0x675E],
+  ["CAF8",0x675F],
+  ["B8DC",0x6760],
+  ["CCF5",0x6761],
+  ["9674",0x6762],
+  ["9675",0x6763],
+  ["9676",0x6764],
+  ["C0B4",0x6765],
+  ["9677",0x6766],
+  ["9678",0x6767],
+  ["D1EE",0x6768],
+  ["E8BF",0x6769],
+  ["E8C2",0x676A],
+  ["9679",0x676B],
+  ["967A",0x676C],
+  ["BABC",0x676D],
+  ["967B",0x676E],
+  ["B1AD",0x676F],
+  ["BDDC",0x6770],
+  ["967C",0x6771],
+  ["EABD",0x6772],
+  ["E8C3",0x6773],
+  ["967D",0x6774],
+  ["E8C6",0x6775],
+  ["967E",0x6776],
+  ["E8CB",0x6777],
+  ["9680",0x6778],
+  ["9681",0x6779],
+  ["9682",0x677A],
+  ["9683",0x677B],
+  ["E8CC",0x677C],
+  ["9684",0x677D],
+  ["CBC9",0x677E],
+  ["B0E5",0x677F],
+  ["9685",0x6780],
+  ["BCAB",0x6781],
+  ["9686",0x6782],
+  ["9687",0x6783],
+  ["B9B9",0x6784],
+  ["9688",0x6785],
+  ["9689",0x6786],
+  ["E8C1",0x6787],
+  ["968A",0x6788],
+  ["CDF7",0x6789],
+  ["968B",0x678A],
+  ["E8CA",0x678B],
+  ["968C",0x678C],
+  ["968D",0x678D],
+  ["968E",0x678E],
+  ["968F",0x678F],
+  ["CEF6",0x6790],
+  ["9690",0x6791],
+  ["9691",0x6792],
+  ["9692",0x6793],
+  ["9693",0x6794],
+  ["D5ED",0x6795],
+  ["9694",0x6796],
+  ["C1D6",0x6797],
+  ["E8C4",0x6798],
+  ["9695",0x6799],
+  ["C3B6",0x679A],
+  ["9696",0x679B],
+  ["B9FB",0x679C],
+  ["D6A6",0x679D],
+  ["E8C8",0x679E],
+  ["9697",0x679F],
+  ["9698",0x67A0],
+  ["9699",0x67A1],
+  ["CAE0",0x67A2],
+  ["D4E6",0x67A3],
+  ["969A",0x67A4],
+  ["E8C0",0x67A5],
+  ["969B",0x67A6],
+  ["E8C5",0x67A7],
+  ["E8C7",0x67A8],
+  ["969C",0x67A9],
+  ["C7B9",0x67AA],
+  ["B7E3",0x67AB],
+  ["969D",0x67AC],
+  ["E8C9",0x67AD],
+  ["969E",0x67AE],
+  ["BFDD",0x67AF],
+  ["E8D2",0x67B0],
+  ["969F",0x67B1],
+  ["96A0",0x67B2],
+  ["E8D7",0x67B3],
+  ["96A1",0x67B4],
+  ["E8D5",0x67B5],
+  ["BCDC",0x67B6],
+  ["BCCF",0x67B7],
+  ["E8DB",0x67B8],
+  ["96A2",0x67B9],
+  ["96A3",0x67BA],
+  ["96A4",0x67BB],
+  ["96A5",0x67BC],
+  ["96A6",0x67BD],
+  ["96A7",0x67BE],
+  ["96A8",0x67BF],
+  ["96A9",0x67C0],
+  ["E8DE",0x67C1],
+  ["96AA",0x67C2],
+  ["E8DA",0x67C3],
+  ["B1FA",0x67C4],
+  ["96AB",0x67C5],
+  ["96AC",0x67C6],
+  ["96AD",0x67C7],
+  ["96AE",0x67C8],
+  ["96AF",0x67C9],
+  ["96B0",0x67CA],
+  ["96B1",0x67CB],
+  ["96B2",0x67CC],
+  ["96B3",0x67CD],
+  ["96B4",0x67CE],
+  ["B0D8",0x67CF],
+  ["C4B3",0x67D0],
+  ["B8CC",0x67D1],
+  ["C6E2",0x67D2],
+  ["C8BE",0x67D3],
+  ["C8E1",0x67D4],
+  ["96B5",0x67D5],
+  ["96B6",0x67D6],
+  ["96B7",0x67D7],
+  ["E8CF",0x67D8],
+  ["E8D4",0x67D9],
+  ["E8D6",0x67DA],
+  ["96B8",0x67DB],
+  ["B9F1",0x67DC],
+  ["E8D8",0x67DD],
+  ["D7F5",0x67DE],
+  ["96B9",0x67DF],
+  ["C4FB",0x67E0],
+  ["96BA",0x67E1],
+  ["E8DC",0x67E2],
+  ["96BB",0x67E3],
+  ["96BC",0x67E4],
+  ["B2E9",0x67E5],
+  ["96BD",0x67E6],
+  ["96BE",0x67E7],
+  ["96BF",0x67E8],
+  ["E8D1",0x67E9],
+  ["96C0",0x67EA],
+  ["96C1",0x67EB],
+  ["BCED",0x67EC],
+  ["96C2",0x67ED],
+  ["96C3",0x67EE],
+  ["BFC2",0x67EF],
+  ["E8CD",0x67F0],
+  ["D6F9",0x67F1],
+  ["96C4",0x67F2],
+  ["C1F8",0x67F3],
+  ["B2F1",0x67F4],
+  ["96C5",0x67F5],
+  ["96C6",0x67F6],
+  ["96C7",0x67F7],
+  ["96C8",0x67F8],
+  ["96C9",0x67F9],
+  ["96CA",0x67FA],
+  ["96CB",0x67FB],
+  ["96CC",0x67FC],
+  ["E8DF",0x67FD],
+  ["96CD",0x67FE],
+  ["CAC1",0x67FF],
+  ["E8D9",0x6800],
+  ["96CE",0x6801],
+  ["96CF",0x6802],
+  ["96D0",0x6803],
+  ["96D1",0x6804],
+  ["D5A4",0x6805],
+  ["96D2",0x6806],
+  ["B1EA",0x6807],
+  ["D5BB",0x6808],
+  ["E8CE",0x6809],
+  ["E8D0",0x680A],
+  ["B6B0",0x680B],
+  ["E8D3",0x680C],
+  ["96D3",0x680D],
+  ["E8DD",0x680E],
+  ["C0B8",0x680F],
+  ["96D4",0x6810],
+  ["CAF7",0x6811],
+  ["96D5",0x6812],
+  ["CBA8",0x6813],
+  ["96D6",0x6814],
+  ["96D7",0x6815],
+  ["C6DC",0x6816],
+  ["C0F5",0x6817],
+  ["96D8",0x6818],
+  ["96D9",0x6819],
+  ["96DA",0x681A],
+  ["96DB",0x681B],
+  ["96DC",0x681C],
+  ["E8E9",0x681D],
+  ["96DD",0x681E],
+  ["96DE",0x681F],
+  ["96DF",0x6820],
+  ["D0A3",0x6821],
+  ["96E0",0x6822],
+  ["96E1",0x6823],
+  ["96E2",0x6824],
+  ["96E3",0x6825],
+  ["96E4",0x6826],
+  ["96E5",0x6827],
+  ["96E6",0x6828],
+  ["E8F2",0x6829],
+  ["D6EA",0x682A],
+  ["96E7",0x682B],
+  ["96E8",0x682C],
+  ["96E9",0x682D],
+  ["96EA",0x682E],
+  ["96EB",0x682F],
+  ["96EC",0x6830],
+  ["96ED",0x6831],
+  ["E8E0",0x6832],
+  ["E8E1",0x6833],
+  ["96EE",0x6834],
+  ["96EF",0x6835],
+  ["96F0",0x6836],
+  ["D1F9",0x6837],
+  ["BACB",0x6838],
+  ["B8F9",0x6839],
+  ["96F1",0x683A],
+  ["96F2",0x683B],
+  ["B8F1",0x683C],
+  ["D4D4",0x683D],
+  ["E8EF",0x683E],
+  ["96F3",0x683F],
+  ["E8EE",0x6840],
+  ["E8EC",0x6841],
+  ["B9F0",0x6842],
+  ["CCD2",0x6843],
+  ["E8E6",0x6844],
+  ["CEA6",0x6845],
+  ["BFF2",0x6846],
+  ["96F4",0x6847],
+  ["B0B8",0x6848],
+  ["E8F1",0x6849],
+  ["E8F0",0x684A],
+  ["96F5",0x684B],
+  ["D7C0",0x684C],
+  ["96F6",0x684D],
+  ["E8E4",0x684E],
+  ["96F7",0x684F],
+  ["CDA9",0x6850],
+  ["C9A3",0x6851],
+  ["96F8",0x6852],
+  ["BBB8",0x6853],
+  ["BDDB",0x6854],
+  ["E8EA",0x6855],
+  ["96F9",0x6856],
+  ["96FA",0x6857],
+  ["96FB",0x6858],
+  ["96FC",0x6859],
+  ["96FD",0x685A],
+  ["96FE",0x685B],
+  ["9740",0x685C],
+  ["9741",0x685D],
+  ["9742",0x685E],
+  ["9743",0x685F],
+  ["E8E2",0x6860],
+  ["E8E3",0x6861],
+  ["E8E5",0x6862],
+  ["B5B5",0x6863],
+  ["E8E7",0x6864],
+  ["C7C5",0x6865],
+  ["E8EB",0x6866],
+  ["E8ED",0x6867],
+  ["BDB0",0x6868],
+  ["D7AE",0x6869],
+  ["9744",0x686A],
+  ["E8F8",0x686B],
+  ["9745",0x686C],
+  ["9746",0x686D],
+  ["9747",0x686E],
+  ["9748",0x686F],
+  ["9749",0x6870],
+  ["974A",0x6871],
+  ["974B",0x6872],
+  ["974C",0x6873],
+  ["E8F5",0x6874],
+  ["974D",0x6875],
+  ["CDB0",0x6876],
+  ["E8F6",0x6877],
+  ["974E",0x6878],
+  ["974F",0x6879],
+  ["9750",0x687A],
+  ["9751",0x687B],
+  ["9752",0x687C],
+  ["9753",0x687D],
+  ["9754",0x687E],
+  ["9755",0x687F],
+  ["9756",0x6880],
+  ["C1BA",0x6881],
+  ["9757",0x6882],
+  ["E8E8",0x6883],
+  ["9758",0x6884],
+  ["C3B7",0x6885],
+  ["B0F0",0x6886],
+  ["9759",0x6887],
+  ["975A",0x6888],
+  ["975B",0x6889],
+  ["975C",0x688A],
+  ["975D",0x688B],
+  ["975E",0x688C],
+  ["975F",0x688D],
+  ["9760",0x688E],
+  ["E8F4",0x688F],
+  ["9761",0x6890],
+  ["9762",0x6891],
+  ["9763",0x6892],
+  ["E8F7",0x6893],
+  ["9764",0x6894],
+  ["9765",0x6895],
+  ["9766",0x6896],
+  ["B9A3",0x6897],
+  ["9767",0x6898],
+  ["9768",0x6899],
+  ["9769",0x689A],
+  ["976A",0x689B],
+  ["976B",0x689C],
+  ["976C",0x689D],
+  ["976D",0x689E],
+  ["976E",0x689F],
+  ["976F",0x68A0],
+  ["9770",0x68A1],
+  ["C9D2",0x68A2],
+  ["9771",0x68A3],
+  ["9772",0x68A4],
+  ["9773",0x68A5],
+  ["C3CE",0x68A6],
+  ["CEE0",0x68A7],
+  ["C0E6",0x68A8],
+  ["9774",0x68A9],
+  ["9775",0x68AA],
+  ["9776",0x68AB],
+  ["9777",0x68AC],
+  ["CBF3",0x68AD],
+  ["9778",0x68AE],
+  ["CCDD",0x68AF],
+  ["D0B5",0x68B0],
+  ["9779",0x68B1],
+  ["977A",0x68B2],
+  ["CAE1",0x68B3],
+  ["977B",0x68B4],
+  ["E8F3",0x68B5],
+  ["977C",0x68B6],
+  ["977D",0x68B7],
+  ["977E",0x68B8],
+  ["9780",0x68B9],
+  ["9781",0x68BA],
+  ["9782",0x68BB],
+  ["9783",0x68BC],
+  ["9784",0x68BD],
+  ["9785",0x68BE],
+  ["9786",0x68BF],
+  ["BCEC",0x68C0],
+  ["9787",0x68C1],
+  ["E8F9",0x68C2],
+  ["9788",0x68C3],
+  ["9789",0x68C4],
+  ["978A",0x68C5],
+  ["978B",0x68C6],
+  ["978C",0x68C7],
+  ["978D",0x68C8],
+  ["C3DE",0x68C9],
+  ["978E",0x68CA],
+  ["C6E5",0x68CB],
+  ["978F",0x68CC],
+  ["B9F7",0x68CD],
+  ["9790",0x68CE],
+  ["9791",0x68CF],
+  ["9792",0x68D0],
+  ["9793",0x68D1],
+  ["B0F4",0x68D2],
+  ["9794",0x68D3],
+  ["9795",0x68D4],
+  ["D7D8",0x68D5],
+  ["9796",0x68D6],
+  ["9797",0x68D7],
+  ["BCAC",0x68D8],
+  ["9798",0x68D9],
+  ["C5EF",0x68DA],
+  ["9799",0x68DB],
+  ["979A",0x68DC],
+  ["979B",0x68DD],
+  ["979C",0x68DE],
+  ["979D",0x68DF],
+  ["CCC4",0x68E0],
+  ["979E",0x68E1],
+  ["979F",0x68E2],
+  ["E9A6",0x68E3],
+  ["97A0",0x68E4],
+  ["97A1",0x68E5],
+  ["97A2",0x68E6],
+  ["97A3",0x68E7],
+  ["97A4",0x68E8],
+  ["97A5",0x68E9],
+  ["97A6",0x68EA],
+  ["97A7",0x68EB],
+  ["97A8",0x68EC],
+  ["97A9",0x68ED],
+  ["C9AD",0x68EE],
+  ["97AA",0x68EF],
+  ["E9A2",0x68F0],
+  ["C0E2",0x68F1],
+  ["97AB",0x68F2],
+  ["97AC",0x68F3],
+  ["97AD",0x68F4],
+  ["BFC3",0x68F5],
+  ["97AE",0x68F6],
+  ["97AF",0x68F7],
+  ["97B0",0x68F8],
+  ["E8FE",0x68F9],
+  ["B9D7",0x68FA],
+  ["97B1",0x68FB],
+  ["E8FB",0x68FC],
+  ["97B2",0x68FD],
+  ["97B3",0x68FE],
+  ["97B4",0x68FF],
+  ["97B5",0x6900],
+  ["E9A4",0x6901],
+  ["97B6",0x6902],
+  ["97B7",0x6903],
+  ["97B8",0x6904],
+  ["D2CE",0x6905],
+  ["97B9",0x6906],
+  ["97BA",0x6907],
+  ["97BB",0x6908],
+  ["97BC",0x6909],
+  ["97BD",0x690A],
+  ["E9A3",0x690B],
+  ["97BE",0x690C],
+  ["D6B2",0x690D],
+  ["D7B5",0x690E],
+  ["97BF",0x690F],
+  ["E9A7",0x6910],
+  ["97C0",0x6911],
+  ["BDB7",0x6912],
+  ["97C1",0x6913],
+  ["97C2",0x6914],
+  ["97C3",0x6915],
+  ["97C4",0x6916],
+  ["97C5",0x6917],
+  ["97C6",0x6918],
+  ["97C7",0x6919],
+  ["97C8",0x691A],
+  ["97C9",0x691B],
+  ["97CA",0x691C],
+  ["97CB",0x691D],
+  ["97CC",0x691E],
+  ["E8FC",0x691F],
+  ["E8FD",0x6920],
+  ["97CD",0x6921],
+  ["97CE",0x6922],
+  ["97CF",0x6923],
+  ["E9A1",0x6924],
+  ["97D0",0x6925],
+  ["97D1",0x6926],
+  ["97D2",0x6927],
+  ["97D3",0x6928],
+  ["97D4",0x6929],
+  ["97D5",0x692A],
+  ["97D6",0x692B],
+  ["97D7",0x692C],
+  ["CDD6",0x692D],
+  ["97D8",0x692E],
+  ["97D9",0x692F],
+  ["D2AC",0x6930],
+  ["97DA",0x6931],
+  ["97DB",0x6932],
+  ["97DC",0x6933],
+  ["E9B2",0x6934],
+  ["97DD",0x6935],
+  ["97DE",0x6936],
+  ["97DF",0x6937],
+  ["97E0",0x6938],
+  ["E9A9",0x6939],
+  ["97E1",0x693A],
+  ["97E2",0x693B],
+  ["97E3",0x693C],
+  ["B4AA",0x693D],
+  ["97E4",0x693E],
+  ["B4BB",0x693F],
+  ["97E5",0x6940],
+  ["97E6",0x6941],
+  ["E9AB",0x6942],
+  ["97E7",0x6943],
+  ["97E8",0x6944],
+  ["97E9",0x6945],
+  ["97EA",0x6946],
+  ["97EB",0x6947],
+  ["97EC",0x6948],
+  ["97ED",0x6949],
+  ["97EE",0x694A],
+  ["97EF",0x694B],
+  ["97F0",0x694C],
+  ["97F1",0x694D],
+  ["97F2",0x694E],
+  ["97F3",0x694F],
+  ["97F4",0x6950],
+  ["97F5",0x6951],
+  ["97F6",0x6952],
+  ["97F7",0x6953],
+  ["D0A8",0x6954],
+  ["97F8",0x6955],
+  ["97F9",0x6956],
+  ["E9A5",0x6957],
+  ["97FA",0x6958],
+  ["97FB",0x6959],
+  ["B3FE",0x695A],
+  ["97FC",0x695B],
+  ["97FD",0x695C],
+  ["E9AC",0x695D],
+  ["C0E3",0x695E],
+  ["97FE",0x695F],
+  ["E9AA",0x6960],
+  ["9840",0x6961],
+  ["9841",0x6962],
+  ["E9B9",0x6963],
+  ["9842",0x6964],
+  ["9843",0x6965],
+  ["E9B8",0x6966],
+  ["9844",0x6967],
+  ["9845",0x6968],
+  ["9846",0x6969],
+  ["9847",0x696A],
+  ["E9AE",0x696B],
+  ["9848",0x696C],
+  ["9849",0x696D],
+  ["E8FA",0x696E],
+  ["984A",0x696F],
+  ["984B",0x6970],
+  ["E9A8",0x6971],
+  ["984C",0x6972],
+  ["984D",0x6973],
+  ["984E",0x6974],
+  ["984F",0x6975],
+  ["9850",0x6976],
+  ["BFAC",0x6977],
+  ["E9B1",0x6978],
+  ["E9BA",0x6979],
+  ["9851",0x697A],
+  ["9852",0x697B],
+  ["C2A5",0x697C],
+  ["9853",0x697D],
+  ["9854",0x697E],
+  ["9855",0x697F],
+  ["E9AF",0x6980],
+  ["9856",0x6981],
+  ["B8C5",0x6982],
+  ["9857",0x6983],
+  ["E9AD",0x6984],
+  ["9858",0x6985],
+  ["D3DC",0x6986],
+  ["E9B4",0x6987],
+  ["E9B5",0x6988],
+  ["E9B7",0x6989],
+  ["9859",0x698A],
+  ["985A",0x698B],
+  ["985B",0x698C],
+  ["E9C7",0x698D],
+  ["985C",0x698E],
+  ["985D",0x698F],
+  ["985E",0x6990],
+  ["985F",0x6991],
+  ["9860",0x6992],
+  ["9861",0x6993],
+  ["C0C6",0x6994],
+  ["E9C5",0x6995],
+  ["9862",0x6996],
+  ["9863",0x6997],
+  ["E9B0",0x6998],
+  ["9864",0x6999],
+  ["9865",0x699A],
+  ["E9BB",0x699B],
+  ["B0F1",0x699C],
+  ["9866",0x699D],
+  ["9867",0x699E],
+  ["9868",0x699F],
+  ["9869",0x69A0],
+  ["986A",0x69A1],
+  ["986B",0x69A2],
+  ["986C",0x69A3],
+  ["986D",0x69A4],
+  ["986E",0x69A5],
+  ["986F",0x69A6],
+  ["E9BC",0x69A7],
+  ["D5A5",0x69A8],
+  ["9870",0x69A9],
+  ["9871",0x69AA],
+  ["E9BE",0x69AB],
+  ["9872",0x69AC],
+  ["E9BF",0x69AD],
+  ["9873",0x69AE],
+  ["9874",0x69AF],
+  ["9875",0x69B0],
+  ["E9C1",0x69B1],
+  ["9876",0x69B2],
+  ["9877",0x69B3],
+  ["C1F1",0x69B4],
+  ["9878",0x69B5],
+  ["9879",0x69B6],
+  ["C8B6",0x69B7],
+  ["987A",0x69B8],
+  ["987B",0x69B9],
+  ["987C",0x69BA],
+  ["E9BD",0x69BB],
+  ["987D",0x69BC],
+  ["987E",0x69BD],
+  ["9880",0x69BE],
+  ["9881",0x69BF],
+  ["9882",0x69C0],
+  ["E9C2",0x69C1],
+  ["9883",0x69C2],
+  ["9884",0x69C3],
+  ["9885",0x69C4],
+  ["9886",0x69C5],
+  ["9887",0x69C6],
+  ["9888",0x69C7],
+  ["9889",0x69C8],
+  ["988A",0x69C9],
+  ["E9C3",0x69CA],
+  ["988B",0x69CB],
+  ["E9B3",0x69CC],
+  ["988C",0x69CD],
+  ["E9B6",0x69CE],
+  ["988D",0x69CF],
+  ["BBB1",0x69D0],
+  ["988E",0x69D1],
+  ["988F",0x69D2],
+  ["9890",0x69D3],
+  ["E9C0",0x69D4],
+  ["9891",0x69D5],
+  ["9892",0x69D6],
+  ["9893",0x69D7],
+  ["9894",0x69D8],
+  ["9895",0x69D9],
+  ["9896",0x69DA],
+  ["BCF7",0x69DB],
+  ["9897",0x69DC],
+  ["9898",0x69DD],
+  ["9899",0x69DE],
+  ["E9C4",0x69DF],
+  ["E9C6",0x69E0],
+  ["989A",0x69E1],
+  ["989B",0x69E2],
+  ["989C",0x69E3],
+  ["989D",0x69E4],
+  ["989E",0x69E5],
+  ["989F",0x69E6],
+  ["98A0",0x69E7],
+  ["98A1",0x69E8],
+  ["98A2",0x69E9],
+  ["98A3",0x69EA],
+  ["98A4",0x69EB],
+  ["98A5",0x69EC],
+  ["E9CA",0x69ED],
+  ["98A6",0x69EE],
+  ["98A7",0x69EF],
+  ["98A8",0x69F0],
+  ["98A9",0x69F1],
+  ["E9CE",0x69F2],
+  ["98AA",0x69F3],
+  ["98AB",0x69F4],
+  ["98AC",0x69F5],
+  ["98AD",0x69F6],
+  ["98AE",0x69F7],
+  ["98AF",0x69F8],
+  ["98B0",0x69F9],
+  ["98B1",0x69FA],
+  ["98B2",0x69FB],
+  ["98B3",0x69FC],
+  ["B2DB",0x69FD],
+  ["98B4",0x69FE],
+  ["E9C8",0x69FF],
+  ["98B5",0x6A00],
+  ["98B6",0x6A01],
+  ["98B7",0x6A02],
+  ["98B8",0x6A03],
+  ["98B9",0x6A04],
+  ["98BA",0x6A05],
+  ["98BB",0x6A06],
+  ["98BC",0x6A07],
+  ["98BD",0x6A08],
+  ["98BE",0x6A09],
+  ["B7AE",0x6A0A],
+  ["98BF",0x6A0B],
+  ["98C0",0x6A0C],
+  ["98C1",0x6A0D],
+  ["98C2",0x6A0E],
+  ["98C3",0x6A0F],
+  ["98C4",0x6A10],
+  ["98C5",0x6A11],
+  ["98C6",0x6A12],
+  ["98C7",0x6A13],
+  ["98C8",0x6A14],
+  ["98C9",0x6A15],
+  ["98CA",0x6A16],
+  ["E9CB",0x6A17],
+  ["E9CC",0x6A18],
+  ["98CB",0x6A19],
+  ["98CC",0x6A1A],
+  ["98CD",0x6A1B],
+  ["98CE",0x6A1C],
+  ["98CF",0x6A1D],
+  ["98D0",0x6A1E],
+  ["D5C1",0x6A1F],
+  ["98D1",0x6A20],
+  ["C4A3",0x6A21],
+  ["98D2",0x6A22],
+  ["98D3",0x6A23],
+  ["98D4",0x6A24],
+  ["98D5",0x6A25],
+  ["98D6",0x6A26],
+  ["98D7",0x6A27],
+  ["E9D8",0x6A28],
+  ["98D8",0x6A29],
+  ["BAE1",0x6A2A],
+  ["98D9",0x6A2B],
+  ["98DA",0x6A2C],
+  ["98DB",0x6A2D],
+  ["98DC",0x6A2E],
+  ["E9C9",0x6A2F],
+  ["98DD",0x6A30],
+  ["D3A3",0x6A31],
+  ["98DE",0x6A32],
+  ["98DF",0x6A33],
+  ["98E0",0x6A34],
+  ["E9D4",0x6A35],
+  ["98E1",0x6A36],
+  ["98E2",0x6A37],
+  ["98E3",0x6A38],
+  ["98E4",0x6A39],
+  ["98E5",0x6A3A],
+  ["98E6",0x6A3B],
+  ["98E7",0x6A3C],
+  ["E9D7",0x6A3D],
+  ["E9D0",0x6A3E],
+  ["98E8",0x6A3F],
+  ["98E9",0x6A40],
+  ["98EA",0x6A41],
+  ["98EB",0x6A42],
+  ["98EC",0x6A43],
+  ["E9CF",0x6A44],
+  ["98ED",0x6A45],
+  ["98EE",0x6A46],
+  ["C7C1",0x6A47],
+  ["98EF",0x6A48],
+  ["98F0",0x6A49],
+  ["98F1",0x6A4A],
+  ["98F2",0x6A4B],
+  ["98F3",0x6A4C],
+  ["98F4",0x6A4D],
+  ["98F5",0x6A4E],
+  ["98F6",0x6A4F],
+  ["E9D2",0x6A50],
+  ["98F7",0x6A51],
+  ["98F8",0x6A52],
+  ["98F9",0x6A53],
+  ["98FA",0x6A54],
+  ["98FB",0x6A55],
+  ["98FC",0x6A56],
+  ["98FD",0x6A57],
+  ["E9D9",0x6A58],
+  ["B3C8",0x6A59],
+  ["98FE",0x6A5A],
+  ["E9D3",0x6A5B],
+  ["9940",0x6A5C],
+  ["9941",0x6A5D],
+  ["9942",0x6A5E],
+  ["9943",0x6A5F],
+  ["9944",0x6A60],
+  ["CFF0",0x6A61],
+  ["9945",0x6A62],
+  ["9946",0x6A63],
+  ["9947",0x6A64],
+  ["E9CD",0x6A65],
+  ["9948",0x6A66],
+  ["9949",0x6A67],
+  ["994A",0x6A68],
+  ["994B",0x6A69],
+  ["994C",0x6A6A],
+  ["994D",0x6A6B],
+  ["994E",0x6A6C],
+  ["994F",0x6A6D],
+  ["9950",0x6A6E],
+  ["9951",0x6A6F],
+  ["9952",0x6A70],
+  ["B3F7",0x6A71],
+  ["9953",0x6A72],
+  ["9954",0x6A73],
+  ["9955",0x6A74],
+  ["9956",0x6A75],
+  ["9957",0x6A76],
+  ["9958",0x6A77],
+  ["9959",0x6A78],
+  ["E9D6",0x6A79],
+  ["995A",0x6A7A],
+  ["995B",0x6A7B],
+  ["E9DA",0x6A7C],
+  ["995C",0x6A7D],
+  ["995D",0x6A7E],
+  ["995E",0x6A7F],
+  ["CCB4",0x6A80],
+  ["995F",0x6A81],
+  ["9960",0x6A82],
+  ["9961",0x6A83],
+  ["CFAD",0x6A84],
+  ["9962",0x6A85],
+  ["9963",0x6A86],
+  ["9964",0x6A87],
+  ["9965",0x6A88],
+  ["9966",0x6A89],
+  ["9967",0x6A8A],
+  ["9968",0x6A8B],
+  ["9969",0x6A8C],
+  ["996A",0x6A8D],
+  ["E9D5",0x6A8E],
+  ["996B",0x6A8F],
+  ["E9DC",0x6A90],
+  ["E9DB",0x6A91],
+  ["996C",0x6A92],
+  ["996D",0x6A93],
+  ["996E",0x6A94],
+  ["996F",0x6A95],
+  ["9970",0x6A96],
+  ["E9DE",0x6A97],
+  ["9971",0x6A98],
+  ["9972",0x6A99],
+  ["9973",0x6A9A],
+  ["9974",0x6A9B],
+  ["9975",0x6A9C],
+  ["9976",0x6A9D],
+  ["9977",0x6A9E],
+  ["9978",0x6A9F],
+  ["E9D1",0x6AA0],
+  ["9979",0x6AA1],
+  ["997A",0x6AA2],
+  ["997B",0x6AA3],
+  ["997C",0x6AA4],
+  ["997D",0x6AA5],
+  ["997E",0x6AA6],
+  ["9980",0x6AA7],
+  ["9981",0x6AA8],
+  ["E9DD",0x6AA9],
+  ["9982",0x6AAA],
+  ["E9DF",0x6AAB],
+  ["C3CA",0x6AAC],
+  ["9983",0x6AAD],
+  ["9984",0x6AAE],
+  ["9985",0x6AAF],
+  ["9986",0x6AB0],
+  ["9987",0x6AB1],
+  ["9988",0x6AB2],
+  ["9989",0x6AB3],
+  ["998A",0x6AB4],
+  ["998B",0x6AB5],
+  ["998C",0x6AB6],
+  ["998D",0x6AB7],
+  ["998E",0x6AB8],
+  ["998F",0x6AB9],
+  ["9990",0x6ABA],
+  ["9991",0x6ABB],
+  ["9992",0x6ABC],
+  ["9993",0x6ABD],
+  ["9994",0x6ABE],
+  ["9995",0x6ABF],
+  ["9996",0x6AC0],
+  ["9997",0x6AC1],
+  ["9998",0x6AC2],
+  ["9999",0x6AC3],
+  ["999A",0x6AC4],
+  ["999B",0x6AC5],
+  ["999C",0x6AC6],
+  ["999D",0x6AC7],
+  ["999E",0x6AC8],
+  ["999F",0x6AC9],
+  ["99A0",0x6ACA],
+  ["99A1",0x6ACB],
+  ["99A2",0x6ACC],
+  ["99A3",0x6ACD],
+  ["99A4",0x6ACE],
+  ["99A5",0x6ACF],
+  ["99A6",0x6AD0],
+  ["99A7",0x6AD1],
+  ["99A8",0x6AD2],
+  ["99A9",0x6AD3],
+  ["99AA",0x6AD4],
+  ["99AB",0x6AD5],
+  ["99AC",0x6AD6],
+  ["99AD",0x6AD7],
+  ["99AE",0x6AD8],
+  ["99AF",0x6AD9],
+  ["99B0",0x6ADA],
+  ["99B1",0x6ADB],
+  ["99B2",0x6ADC],
+  ["99B3",0x6ADD],
+  ["99B4",0x6ADE],
+  ["99B5",0x6ADF],
+  ["99B6",0x6AE0],
+  ["99B7",0x6AE1],
+  ["99B8",0x6AE2],
+  ["99B9",0x6AE3],
+  ["99BA",0x6AE4],
+  ["99BB",0x6AE5],
+  ["99BC",0x6AE6],
+  ["99BD",0x6AE7],
+  ["99BE",0x6AE8],
+  ["99BF",0x6AE9],
+  ["99C0",0x6AEA],
+  ["99C1",0x6AEB],
+  ["99C2",0x6AEC],
+  ["99C3",0x6AED],
+  ["99C4",0x6AEE],
+  ["99C5",0x6AEF],
+  ["99C6",0x6AF0],
+  ["99C7",0x6AF1],
+  ["99C8",0x6AF2],
+  ["99C9",0x6AF3],
+  ["99CA",0x6AF4],
+  ["99CB",0x6AF5],
+  ["99CC",0x6AF6],
+  ["99CD",0x6AF7],
+  ["99CE",0x6AF8],
+  ["99CF",0x6AF9],
+  ["99D0",0x6AFA],
+  ["99D1",0x6AFB],
+  ["99D2",0x6AFC],
+  ["99D3",0x6AFD],
+  ["99D4",0x6AFE],
+  ["99D5",0x6AFF],
+  ["99D6",0x6B00],
+  ["99D7",0x6B01],
+  ["99D8",0x6B02],
+  ["99D9",0x6B03],
+  ["99DA",0x6B04],
+  ["99DB",0x6B05],
+  ["99DC",0x6B06],
+  ["99DD",0x6B07],
+  ["99DE",0x6B08],
+  ["99DF",0x6B09],
+  ["99E0",0x6B0A],
+  ["99E1",0x6B0B],
+  ["99E2",0x6B0C],
+  ["99E3",0x6B0D],
+  ["99E4",0x6B0E],
+  ["99E5",0x6B0F],
+  ["99E6",0x6B10],
+  ["99E7",0x6B11],
+  ["99E8",0x6B12],
+  ["99E9",0x6B13],
+  ["99EA",0x6B14],
+  ["99EB",0x6B15],
+  ["99EC",0x6B16],
+  ["99ED",0x6B17],
+  ["99EE",0x6B18],
+  ["99EF",0x6B19],
+  ["99F0",0x6B1A],
+  ["99F1",0x6B1B],
+  ["99F2",0x6B1C],
+  ["99F3",0x6B1D],
+  ["99F4",0x6B1E],
+  ["99F5",0x6B1F],
+  ["C7B7",0x6B20],
+  ["B4CE",0x6B21],
+  ["BBB6",0x6B22],
+  ["D0C0",0x6B23],
+  ["ECA3",0x6B24],
+  ["99F6",0x6B25],
+  ["99F7",0x6B26],
+  ["C5B7",0x6B27],
+  ["99F8",0x6B28],
+  ["99F9",0x6B29],
+  ["99FA",0x6B2A],
+  ["99FB",0x6B2B],
+  ["99FC",0x6B2C],
+  ["99FD",0x6B2D],
+  ["99FE",0x6B2E],
+  ["9A40",0x6B2F],
+  ["9A41",0x6B30],
+  ["9A42",0x6B31],
+  ["D3FB",0x6B32],
+  ["9A43",0x6B33],
+  ["9A44",0x6B34],
+  ["9A45",0x6B35],
+  ["9A46",0x6B36],
+  ["ECA4",0x6B37],
+  ["9A47",0x6B38],
+  ["ECA5",0x6B39],
+  ["C6DB",0x6B3A],
+  ["9A48",0x6B3B],
+  ["9A49",0x6B3C],
+  ["9A4A",0x6B3D],
+  ["BFEE",0x6B3E],
+  ["9A4B",0x6B3F],
+  ["9A4C",0x6B40],
+  ["9A4D",0x6B41],
+  ["9A4E",0x6B42],
+  ["ECA6",0x6B43],
+  ["9A4F",0x6B44],
+  ["9A50",0x6B45],
+  ["ECA7",0x6B46],
+  ["D0AA",0x6B47],
+  ["9A51",0x6B48],
+  ["C7B8",0x6B49],
+  ["9A52",0x6B4A],
+  ["9A53",0x6B4B],
+  ["B8E8",0x6B4C],
+  ["9A54",0x6B4D],
+  ["9A55",0x6B4E],
+  ["9A56",0x6B4F],
+  ["9A57",0x6B50],
+  ["9A58",0x6B51],
+  ["9A59",0x6B52],
+  ["9A5A",0x6B53],
+  ["9A5B",0x6B54],
+  ["9A5C",0x6B55],
+  ["9A5D",0x6B56],
+  ["9A5E",0x6B57],
+  ["9A5F",0x6B58],
+  ["ECA8",0x6B59],
+  ["9A60",0x6B5A],
+  ["9A61",0x6B5B],
+  ["9A62",0x6B5C],
+  ["9A63",0x6B5D],
+  ["9A64",0x6B5E],
+  ["9A65",0x6B5F],
+  ["9A66",0x6B60],
+  ["9A67",0x6B61],
+  ["D6B9",0x6B62],
+  ["D5FD",0x6B63],
+  ["B4CB",0x6B64],
+  ["B2BD",0x6B65],
+  ["CEE4",0x6B66],
+  ["C6E7",0x6B67],
+  ["9A68",0x6B68],
+  ["9A69",0x6B69],
+  ["CDE1",0x6B6A],
+  ["9A6A",0x6B6B],
+  ["9A6B",0x6B6C],
+  ["9A6C",0x6B6D],
+  ["9A6D",0x6B6E],
+  ["9A6E",0x6B6F],
+  ["9A6F",0x6B70],
+  ["9A70",0x6B71],
+  ["9A71",0x6B72],
+  ["9A72",0x6B73],
+  ["9A73",0x6B74],
+  ["9A74",0x6B75],
+  ["9A75",0x6B76],
+  ["9A76",0x6B77],
+  ["9A77",0x6B78],
+  ["B4F5",0x6B79],
+  ["9A78",0x6B7A],
+  ["CBC0",0x6B7B],
+  ["BCDF",0x6B7C],
+  ["9A79",0x6B7D],
+  ["9A7A",0x6B7E],
+  ["9A7B",0x6B7F],
+  ["9A7C",0x6B80],
+  ["E9E2",0x6B81],
+  ["E9E3",0x6B82],
+  ["D1EA",0x6B83],
+  ["E9E5",0x6B84],
+  ["9A7D",0x6B85],
+  ["B4F9",0x6B86],
+  ["E9E4",0x6B87],
+  ["9A7E",0x6B88],
+  ["D1B3",0x6B89],
+  ["CAE2",0x6B8A],
+  ["B2D0",0x6B8B],
+  ["9A80",0x6B8C],
+  ["E9E8",0x6B8D],
+  ["9A81",0x6B8E],
+  ["9A82",0x6B8F],
+  ["9A83",0x6B90],
+  ["9A84",0x6B91],
+  ["E9E6",0x6B92],
+  ["E9E7",0x6B93],
+  ["9A85",0x6B94],
+  ["9A86",0x6B95],
+  ["D6B3",0x6B96],
+  ["9A87",0x6B97],
+  ["9A88",0x6B98],
+  ["9A89",0x6B99],
+  ["E9E9",0x6B9A],
+  ["E9EA",0x6B9B],
+  ["9A8A",0x6B9C],
+  ["9A8B",0x6B9D],
+  ["9A8C",0x6B9E],
+  ["9A8D",0x6B9F],
+  ["9A8E",0x6BA0],
+  ["E9EB",0x6BA1],
+  ["9A8F",0x6BA2],
+  ["9A90",0x6BA3],
+  ["9A91",0x6BA4],
+  ["9A92",0x6BA5],
+  ["9A93",0x6BA6],
+  ["9A94",0x6BA7],
+  ["9A95",0x6BA8],
+  ["9A96",0x6BA9],
+  ["E9EC",0x6BAA],
+  ["9A97",0x6BAB],
+  ["9A98",0x6BAC],
+  ["9A99",0x6BAD],
+  ["9A9A",0x6BAE],
+  ["9A9B",0x6BAF],
+  ["9A9C",0x6BB0],
+  ["9A9D",0x6BB1],
+  ["9A9E",0x6BB2],
+  ["ECAF",0x6BB3],
+  ["C5B9",0x6BB4],
+  ["B6CE",0x6BB5],
+  ["9A9F",0x6BB6],
+  ["D2F3",0x6BB7],
+  ["9AA0",0x6BB8],
+  ["9AA1",0x6BB9],
+  ["9AA2",0x6BBA],
+  ["9AA3",0x6BBB],
+  ["9AA4",0x6BBC],
+  ["9AA5",0x6BBD],
+  ["9AA6",0x6BBE],
+  ["B5EE",0x6BBF],
+  ["9AA7",0x6BC0],
+  ["BBD9",0x6BC1],
+  ["ECB1",0x6BC2],
+  ["9AA8",0x6BC3],
+  ["9AA9",0x6BC4],
+  ["D2E3",0x6BC5],
+  ["9AAA",0x6BC6],
+  ["9AAB",0x6BC7],
+  ["9AAC",0x6BC8],
+  ["9AAD",0x6BC9],
+  ["9AAE",0x6BCA],
+  ["CEE3",0x6BCB],
+  ["9AAF",0x6BCC],
+  ["C4B8",0x6BCD],
+  ["9AB0",0x6BCE],
+  ["C3BF",0x6BCF],
+  ["9AB1",0x6BD0],
+  ["9AB2",0x6BD1],
+  ["B6BE",0x6BD2],
+  ["D8B9",0x6BD3],
+  ["B1C8",0x6BD4],
+  ["B1CF",0x6BD5],
+  ["B1D1",0x6BD6],
+  ["C5FE",0x6BD7],
+  ["9AB3",0x6BD8],
+  ["B1D0",0x6BD9],
+  ["9AB4",0x6BDA],
+  ["C3AB",0x6BDB],
+  ["9AB5",0x6BDC],
+  ["9AB6",0x6BDD],
+  ["9AB7",0x6BDE],
+  ["9AB8",0x6BDF],
+  ["9AB9",0x6BE0],
+  ["D5B1",0x6BE1],
+  ["9ABA",0x6BE2],
+  ["9ABB",0x6BE3],
+  ["9ABC",0x6BE4],
+  ["9ABD",0x6BE5],
+  ["9ABE",0x6BE6],
+  ["9ABF",0x6BE7],
+  ["9AC0",0x6BE8],
+  ["9AC1",0x6BE9],
+  ["EBA4",0x6BEA],
+  ["BAC1",0x6BEB],
+  ["9AC2",0x6BEC],
+  ["9AC3",0x6BED],
+  ["9AC4",0x6BEE],
+  ["CCBA",0x6BEF],
+  ["9AC5",0x6BF0],
+  ["9AC6",0x6BF1],
+  ["9AC7",0x6BF2],
+  ["EBA5",0x6BF3],
+  ["9AC8",0x6BF4],
+  ["EBA7",0x6BF5],
+  ["9AC9",0x6BF6],
+  ["9ACA",0x6BF7],
+  ["9ACB",0x6BF8],
+  ["EBA8",0x6BF9],
+  ["9ACC",0x6BFA],
+  ["9ACD",0x6BFB],
+  ["9ACE",0x6BFC],
+  ["EBA6",0x6BFD],
+  ["9ACF",0x6BFE],
+  ["9AD0",0x6BFF],
+  ["9AD1",0x6C00],
+  ["9AD2",0x6C01],
+  ["9AD3",0x6C02],
+  ["9AD4",0x6C03],
+  ["9AD5",0x6C04],
+  ["EBA9",0x6C05],
+  ["EBAB",0x6C06],
+  ["EBAA",0x6C07],
+  ["9AD6",0x6C08],
+  ["9AD7",0x6C09],
+  ["9AD8",0x6C0A],
+  ["9AD9",0x6C0B],
+  ["9ADA",0x6C0C],
+  ["EBAC",0x6C0D],
+  ["9ADB",0x6C0E],
+  ["CACF",0x6C0F],
+  ["D8B5",0x6C10],
+  ["C3F1",0x6C11],
+  ["9ADC",0x6C12],
+  ["C3A5",0x6C13],
+  ["C6F8",0x6C14],
+  ["EBAD",0x6C15],
+  ["C4CA",0x6C16],
+  ["9ADD",0x6C17],
+  ["EBAE",0x6C18],
+  ["EBAF",0x6C19],
+  ["EBB0",0x6C1A],
+  ["B7D5",0x6C1B],
+  ["9ADE",0x6C1C],
+  ["9ADF",0x6C1D],
+  ["9AE0",0x6C1E],
+  ["B7FA",0x6C1F],
+  ["9AE1",0x6C20],
+  ["EBB1",0x6C21],
+  ["C7E2",0x6C22],
+  ["9AE2",0x6C23],
+  ["EBB3",0x6C24],
+  ["9AE3",0x6C25],
+  ["BAA4",0x6C26],
+  ["D1F5",0x6C27],
+  ["B0B1",0x6C28],
+  ["EBB2",0x6C29],
+  ["EBB4",0x6C2A],
+  ["9AE4",0x6C2B],
+  ["9AE5",0x6C2C],
+  ["9AE6",0x6C2D],
+  ["B5AA",0x6C2E],
+  ["C2C8",0x6C2F],
+  ["C7E8",0x6C30],
+  ["9AE7",0x6C31],
+  ["EBB5",0x6C32],
+  ["9AE8",0x6C33],
+  ["CBAE",0x6C34],
+  ["E3DF",0x6C35],
+  ["9AE9",0x6C36],
+  ["9AEA",0x6C37],
+  ["D3C0",0x6C38],
+  ["9AEB",0x6C39],
+  ["9AEC",0x6C3A],
+  ["9AED",0x6C3B],
+  ["9AEE",0x6C3C],
+  ["D9DB",0x6C3D],
+  ["9AEF",0x6C3E],
+  ["9AF0",0x6C3F],
+  ["CDA1",0x6C40],
+  ["D6AD",0x6C41],
+  ["C7F3",0x6C42],
+  ["9AF1",0x6C43],
+  ["9AF2",0x6C44],
+  ["9AF3",0x6C45],
+  ["D9E0",0x6C46],
+  ["BBE3",0x6C47],
+  ["9AF4",0x6C48],
+  ["BABA",0x6C49],
+  ["E3E2",0x6C4A],
+  ["9AF5",0x6C4B],
+  ["9AF6",0x6C4C],
+  ["9AF7",0x6C4D],
+  ["9AF8",0x6C4E],
+  ["9AF9",0x6C4F],
+  ["CFAB",0x6C50],
+  ["9AFA",0x6C51],
+  ["9AFB",0x6C52],
+  ["9AFC",0x6C53],
+  ["E3E0",0x6C54],
+  ["C9C7",0x6C55],
+  ["9AFD",0x6C56],
+  ["BAB9",0x6C57],
+  ["9AFE",0x6C58],
+  ["9B40",0x6C59],
+  ["9B41",0x6C5A],
+  ["D1B4",0x6C5B],
+  ["E3E1",0x6C5C],
+  ["C8EA",0x6C5D],
+  ["B9AF",0x6C5E],
+  ["BDAD",0x6C5F],
+  ["B3D8",0x6C60],
+  ["CEDB",0x6C61],
+  ["9B42",0x6C62],
+  ["9B43",0x6C63],
+  ["CCC0",0x6C64],
+  ["9B44",0x6C65],
+  ["9B45",0x6C66],
+  ["9B46",0x6C67],
+  ["E3E8",0x6C68],
+  ["E3E9",0x6C69],
+  ["CDF4",0x6C6A],
+  ["9B47",0x6C6B],
+  ["9B48",0x6C6C],
+  ["9B49",0x6C6D],
+  ["9B4A",0x6C6E],
+  ["9B4B",0x6C6F],
+  ["CCAD",0x6C70],
+  ["9B4C",0x6C71],
+  ["BCB3",0x6C72],
+  ["9B4D",0x6C73],
+  ["E3EA",0x6C74],
+  ["9B4E",0x6C75],
+  ["E3EB",0x6C76],
+  ["9B4F",0x6C77],
+  ["9B50",0x6C78],
+  ["D0DA",0x6C79],
+  ["9B51",0x6C7A],
+  ["9B52",0x6C7B],
+  ["9B53",0x6C7C],
+  ["C6FB",0x6C7D],
+  ["B7DA",0x6C7E],
+  ["9B54",0x6C7F],
+  ["9B55",0x6C80],
+  ["C7DF",0x6C81],
+  ["D2CA",0x6C82],
+  ["CED6",0x6C83],
+  ["9B56",0x6C84],
+  ["E3E4",0x6C85],
+  ["E3EC",0x6C86],
+  ["9B57",0x6C87],
+  ["C9F2",0x6C88],
+  ["B3C1",0x6C89],
+  ["9B58",0x6C8A],
+  ["9B59",0x6C8B],
+  ["E3E7",0x6C8C],
+  ["9B5A",0x6C8D],
+  ["9B5B",0x6C8E],
+  ["C6E3",0x6C8F],
+  ["E3E5",0x6C90],
+  ["9B5C",0x6C91],
+  ["9B5D",0x6C92],
+  ["EDB3",0x6C93],
+  ["E3E6",0x6C94],
+  ["9B5E",0x6C95],
+  ["9B5F",0x6C96],
+  ["9B60",0x6C97],
+  ["9B61",0x6C98],
+  ["C9B3",0x6C99],
+  ["9B62",0x6C9A],
+  ["C5E6",0x6C9B],
+  ["9B63",0x6C9C],
+  ["9B64",0x6C9D],
+  ["9B65",0x6C9E],
+  ["B9B5",0x6C9F],
+  ["9B66",0x6CA0],
+  ["C3BB",0x6CA1],
+  ["9B67",0x6CA2],
+  ["E3E3",0x6CA3],
+  ["C5BD",0x6CA4],
+  ["C1A4",0x6CA5],
+  ["C2D9",0x6CA6],
+  ["B2D7",0x6CA7],
+  ["9B68",0x6CA8],
+  ["E3ED",0x6CA9],
+  ["BBA6",0x6CAA],
+  ["C4AD",0x6CAB],
+  ["9B69",0x6CAC],
+  ["E3F0",0x6CAD],
+  ["BEDA",0x6CAE],
+  ["9B6A",0x6CAF],
+  ["9B6B",0x6CB0],
+  ["E3FB",0x6CB1],
+  ["E3F5",0x6CB2],
+  ["BAD3",0x6CB3],
+  ["9B6C",0x6CB4],
+  ["9B6D",0x6CB5],
+  ["9B6E",0x6CB6],
+  ["9B6F",0x6CB7],
+  ["B7D0",0x6CB8],
+  ["D3CD",0x6CB9],
+  ["9B70",0x6CBA],
+  ["D6CE",0x6CBB],
+  ["D5D3",0x6CBC],
+  ["B9C1",0x6CBD],
+  ["D5B4",0x6CBE],
+  ["D1D8",0x6CBF],
+  ["9B71",0x6CC0],
+  ["9B72",0x6CC1],
+  ["9B73",0x6CC2],
+  ["9B74",0x6CC3],
+  ["D0B9",0x6CC4],
+  ["C7F6",0x6CC5],
+  ["9B75",0x6CC6],
+  ["9B76",0x6CC7],
+  ["9B77",0x6CC8],
+  ["C8AA",0x6CC9],
+  ["B2B4",0x6CCA],
+  ["9B78",0x6CCB],
+  ["C3DA",0x6CCC],
+  ["9B79",0x6CCD],
+  ["9B7A",0x6CCE],
+  ["9B7B",0x6CCF],
+  ["E3EE",0x6CD0],
+  ["9B7C",0x6CD1],
+  ["9B7D",0x6CD2],
+  ["E3FC",0x6CD3],
+  ["E3EF",0x6CD4],
+  ["B7A8",0x6CD5],
+  ["E3F7",0x6CD6],
+  ["E3F4",0x6CD7],
+  ["9B7E",0x6CD8],
+  ["9B80",0x6CD9],
+  ["9B81",0x6CDA],
+  ["B7BA",0x6CDB],
+  ["9B82",0x6CDC],
+  ["9B83",0x6CDD],
+  ["C5A2",0x6CDE],
+  ["9B84",0x6CDF],
+  ["E3F6",0x6CE0],
+  ["C5DD",0x6CE1],
+  ["B2A8",0x6CE2],
+  ["C6FC",0x6CE3],
+  ["9B85",0x6CE4],
+  ["C4E0",0x6CE5],
+  ["9B86",0x6CE6],
+  ["9B87",0x6CE7],
+  ["D7A2",0x6CE8],
+  ["9B88",0x6CE9],
+  ["C0E1",0x6CEA],
+  ["E3F9",0x6CEB],
+  ["9B89",0x6CEC],
+  ["9B8A",0x6CED],
+  ["E3FA",0x6CEE],
+  ["E3FD",0x6CEF],
+  ["CCA9",0x6CF0],
+  ["E3F3",0x6CF1],
+  ["9B8B",0x6CF2],
+  ["D3BE",0x6CF3],
+  ["9B8C",0x6CF4],
+  ["B1C3",0x6CF5],
+  ["EDB4",0x6CF6],
+  ["E3F1",0x6CF7],
+  ["E3F2",0x6CF8],
+  ["9B8D",0x6CF9],
+  ["E3F8",0x6CFA],
+  ["D0BA",0x6CFB],
+  ["C6C3",0x6CFC],
+  ["D4F3",0x6CFD],
+  ["E3FE",0x6CFE],
+  ["9B8E",0x6CFF],
+  ["9B8F",0x6D00],
+  ["BDE0",0x6D01],
+  ["9B90",0x6D02],
+  ["9B91",0x6D03],
+  ["E4A7",0x6D04],
+  ["9B92",0x6D05],
+  ["9B93",0x6D06],
+  ["E4A6",0x6D07],
+  ["9B94",0x6D08],
+  ["9B95",0x6D09],
+  ["9B96",0x6D0A],
+  ["D1F3",0x6D0B],
+  ["E4A3",0x6D0C],
+  ["9B97",0x6D0D],
+  ["E4A9",0x6D0E],
+  ["9B98",0x6D0F],
+  ["9B99",0x6D10],
+  ["9B9A",0x6D11],
+  ["C8F7",0x6D12],
+  ["9B9B",0x6D13],
+  ["9B9C",0x6D14],
+  ["9B9D",0x6D15],
+  ["9B9E",0x6D16],
+  ["CFB4",0x6D17],
+  ["9B9F",0x6D18],
+  ["E4A8",0x6D19],
+  ["E4AE",0x6D1A],
+  ["C2E5",0x6D1B],
+  ["9BA0",0x6D1C],
+  ["9BA1",0x6D1D],
+  ["B6B4",0x6D1E],
+  ["9BA2",0x6D1F],
+  ["9BA3",0x6D20],
+  ["9BA4",0x6D21],
+  ["9BA5",0x6D22],
+  ["9BA6",0x6D23],
+  ["9BA7",0x6D24],
+  ["BDF2",0x6D25],
+  ["9BA8",0x6D26],
+  ["E4A2",0x6D27],
+  ["9BA9",0x6D28],
+  ["9BAA",0x6D29],
+  ["BAE9",0x6D2A],
+  ["E4AA",0x6D2B],
+  ["9BAB",0x6D2C],
+  ["9BAC",0x6D2D],
+  ["E4AC",0x6D2E],
+  ["9BAD",0x6D2F],
+  ["9BAE",0x6D30],
+  ["B6FD",0x6D31],
+  ["D6DE",0x6D32],
+  ["E4B2",0x6D33],
+  ["9BAF",0x6D34],
+  ["E4AD",0x6D35],
+  ["9BB0",0x6D36],
+  ["9BB1",0x6D37],
+  ["9BB2",0x6D38],
+  ["E4A1",0x6D39],
+  ["9BB3",0x6D3A],
+  ["BBEE",0x6D3B],
+  ["CDDD",0x6D3C],
+  ["C7A2",0x6D3D],
+  ["C5C9",0x6D3E],
+  ["9BB4",0x6D3F],
+  ["9BB5",0x6D40],
+  ["C1F7",0x6D41],
+  ["9BB6",0x6D42],
+  ["E4A4",0x6D43],
+  ["9BB7",0x6D44],
+  ["C7B3",0x6D45],
+  ["BDAC",0x6D46],
+  ["BDBD",0x6D47],
+  ["E4A5",0x6D48],
+  ["9BB8",0x6D49],
+  ["D7C7",0x6D4A],
+  ["B2E2",0x6D4B],
+  ["9BB9",0x6D4C],
+  ["E4AB",0x6D4D],
+  ["BCC3",0x6D4E],
+  ["E4AF",0x6D4F],
+  ["9BBA",0x6D50],
+  ["BBEB",0x6D51],
+  ["E4B0",0x6D52],
+  ["C5A8",0x6D53],
+  ["E4B1",0x6D54],
+  ["9BBB",0x6D55],
+  ["9BBC",0x6D56],
+  ["9BBD",0x6D57],
+  ["9BBE",0x6D58],
+  ["D5E3",0x6D59],
+  ["BFA3",0x6D5A],
+  ["9BBF",0x6D5B],
+  ["E4BA",0x6D5C],
+  ["9BC0",0x6D5D],
+  ["E4B7",0x6D5E],
+  ["9BC1",0x6D5F],
+  ["E4BB",0x6D60],
+  ["9BC2",0x6D61],
+  ["9BC3",0x6D62],
+  ["E4BD",0x6D63],
+  ["9BC4",0x6D64],
+  ["9BC5",0x6D65],
+  ["C6D6",0x6D66],
+  ["9BC6",0x6D67],
+  ["9BC7",0x6D68],
+  ["BAC6",0x6D69],
+  ["C0CB",0x6D6A],
+  ["9BC8",0x6D6B],
+  ["9BC9",0x6D6C],
+  ["9BCA",0x6D6D],
+  ["B8A1",0x6D6E],
+  ["E4B4",0x6D6F],
+  ["9BCB",0x6D70],
+  ["9BCC",0x6D71],
+  ["9BCD",0x6D72],
+  ["9BCE",0x6D73],
+  ["D4A1",0x6D74],
+  ["9BCF",0x6D75],
+  ["9BD0",0x6D76],
+  ["BAA3",0x6D77],
+  ["BDFE",0x6D78],
+  ["9BD1",0x6D79],
+  ["9BD2",0x6D7A],
+  ["9BD3",0x6D7B],
+  ["E4BC",0x6D7C],
+  ["9BD4",0x6D7D],
+  ["9BD5",0x6D7E],
+  ["9BD6",0x6D7F],
+  ["9BD7",0x6D80],
+  ["9BD8",0x6D81],
+  ["CDBF",0x6D82],
+  ["9BD9",0x6D83],
+  ["9BDA",0x6D84],
+  ["C4F9",0x6D85],
+  ["9BDB",0x6D86],
+  ["9BDC",0x6D87],
+  ["CFFB",0x6D88],
+  ["C9E6",0x6D89],
+  ["9BDD",0x6D8A],
+  ["9BDE",0x6D8B],
+  ["D3BF",0x6D8C],
+  ["9BDF",0x6D8D],
+  ["CFD1",0x6D8E],
+  ["9BE0",0x6D8F],
+  ["9BE1",0x6D90],
+  ["E4B3",0x6D91],
+  ["9BE2",0x6D92],
+  ["E4B8",0x6D93],
+  ["E4B9",0x6D94],
+  ["CCE9",0x6D95],
+  ["9BE3",0x6D96],
+  ["9BE4",0x6D97],
+  ["9BE5",0x6D98],
+  ["9BE6",0x6D99],
+  ["9BE7",0x6D9A],
+  ["CCCE",0x6D9B],
+  ["9BE8",0x6D9C],
+  ["C0D4",0x6D9D],
+  ["E4B5",0x6D9E],
+  ["C1B0",0x6D9F],
+  ["E4B6",0x6DA0],
+  ["CED0",0x6DA1],
+  ["9BE9",0x6DA2],
+  ["BBC1",0x6DA3],
+  ["B5D3",0x6DA4],
+  ["9BEA",0x6DA5],
+  ["C8F3",0x6DA6],
+  ["BDA7",0x6DA7],
+  ["D5C7",0x6DA8],
+  ["C9AC",0x6DA9],
+  ["B8A2",0x6DAA],
+  ["E4CA",0x6DAB],
+  ["9BEB",0x6DAC],
+  ["9BEC",0x6DAD],
+  ["E4CC",0x6DAE],
+  ["D1C4",0x6DAF],
+  ["9BED",0x6DB0],
+  ["9BEE",0x6DB1],
+  ["D2BA",0x6DB2],
+  ["9BEF",0x6DB3],
+  ["9BF0",0x6DB4],
+  ["BAAD",0x6DB5],
+  ["9BF1",0x6DB6],
+  ["9BF2",0x6DB7],
+  ["BAD4",0x6DB8],
+  ["9BF3",0x6DB9],
+  ["9BF4",0x6DBA],
+  ["9BF5",0x6DBB],
+  ["9BF6",0x6DBC],
+  ["9BF7",0x6DBD],
+  ["9BF8",0x6DBE],
+  ["E4C3",0x6DBF],
+  ["B5ED",0x6DC0],
+  ["9BF9",0x6DC1],
+  ["9BFA",0x6DC2],
+  ["9BFB",0x6DC3],
+  ["D7CD",0x6DC4],
+  ["E4C0",0x6DC5],
+  ["CFFD",0x6DC6],
+  ["E4BF",0x6DC7],
+  ["9BFC",0x6DC8],
+  ["9BFD",0x6DC9],
+  ["9BFE",0x6DCA],
+  ["C1DC",0x6DCB],
+  ["CCCA",0x6DCC],
+  ["9C40",0x6DCD],
+  ["9C41",0x6DCE],
+  ["9C42",0x6DCF],
+  ["9C43",0x6DD0],
+  ["CAE7",0x6DD1],
+  ["9C44",0x6DD2],
+  ["9C45",0x6DD3],
+  ["9C46",0x6DD4],
+  ["9C47",0x6DD5],
+  ["C4D7",0x6DD6],
+  ["9C48",0x6DD7],
+  ["CCD4",0x6DD8],
+  ["E4C8",0x6DD9],
+  ["9C49",0x6DDA],
+  ["9C4A",0x6DDB],
+  ["9C4B",0x6DDC],
+  ["E4C7",0x6DDD],
+  ["E4C1",0x6DDE],
+  ["9C4C",0x6DDF],
+  ["E4C4",0x6DE0],
+  ["B5AD",0x6DE1],
+  ["9C4D",0x6DE2],
+  ["9C4E",0x6DE3],
+  ["D3D9",0x6DE4],
+  ["9C4F",0x6DE5],
+  ["E4C6",0x6DE6],
+  ["9C50",0x6DE7],
+  ["9C51",0x6DE8],
+  ["9C52",0x6DE9],
+  ["9C53",0x6DEA],
+  ["D2F9",0x6DEB],
+  ["B4E3",0x6DEC],
+  ["9C54",0x6DED],
+  ["BBB4",0x6DEE],
+  ["9C55",0x6DEF],
+  ["9C56",0x6DF0],
+  ["C9EE",0x6DF1],
+  ["9C57",0x6DF2],
+  ["B4BE",0x6DF3],
+  ["9C58",0x6DF4],
+  ["9C59",0x6DF5],
+  ["9C5A",0x6DF6],
+  ["BBEC",0x6DF7],
+  ["9C5B",0x6DF8],
+  ["D1CD",0x6DF9],
+  ["9C5C",0x6DFA],
+  ["CCED",0x6DFB],
+  ["EDB5",0x6DFC],
+  ["9C5D",0x6DFD],
+  ["9C5E",0x6DFE],
+  ["9C5F",0x6DFF],
+  ["9C60",0x6E00],
+  ["9C61",0x6E01],
+  ["9C62",0x6E02],
+  ["9C63",0x6E03],
+  ["9C64",0x6E04],
+  ["C7E5",0x6E05],
+  ["9C65",0x6E06],
+  ["9C66",0x6E07],
+  ["9C67",0x6E08],
+  ["9C68",0x6E09],
+  ["D4A8",0x6E0A],
+  ["9C69",0x6E0B],
+  ["E4CB",0x6E0C],
+  ["D7D5",0x6E0D],
+  ["E4C2",0x6E0E],
+  ["9C6A",0x6E0F],
+  ["BDA5",0x6E10],
+  ["E4C5",0x6E11],
+  ["9C6B",0x6E12],
+  ["9C6C",0x6E13],
+  ["D3E6",0x6E14],
+  ["9C6D",0x6E15],
+  ["E4C9",0x6E16],
+  ["C9F8",0x6E17],
+  ["9C6E",0x6E18],
+  ["9C6F",0x6E19],
+  ["E4BE",0x6E1A],
+  ["9C70",0x6E1B],
+  ["9C71",0x6E1C],
+  ["D3E5",0x6E1D],
+  ["9C72",0x6E1E],
+  ["9C73",0x6E1F],
+  ["C7FE",0x6E20],
+  ["B6C9",0x6E21],
+  ["9C74",0x6E22],
+  ["D4FC",0x6E23],
+  ["B2B3",0x6E24],
+  ["E4D7",0x6E25],
+  ["9C75",0x6E26],
+  ["9C76",0x6E27],
+  ["9C77",0x6E28],
+  ["CEC2",0x6E29],
+  ["9C78",0x6E2A],
+  ["E4CD",0x6E2B],
+  ["9C79",0x6E2C],
+  ["CEBC",0x6E2D],
+  ["9C7A",0x6E2E],
+  ["B8DB",0x6E2F],
+  ["9C7B",0x6E30],
+  ["9C7C",0x6E31],
+  ["E4D6",0x6E32],
+  ["9C7D",0x6E33],
+  ["BFCA",0x6E34],
+  ["9C7E",0x6E35],
+  ["9C80",0x6E36],
+  ["9C81",0x6E37],
+  ["D3CE",0x6E38],
+  ["9C82",0x6E39],
+  ["C3EC",0x6E3A],
+  ["9C83",0x6E3B],
+  ["9C84",0x6E3C],
+  ["9C85",0x6E3D],
+  ["9C86",0x6E3E],
+  ["9C87",0x6E3F],
+  ["9C88",0x6E40],
+  ["9C89",0x6E41],
+  ["9C8A",0x6E42],
+  ["C5C8",0x6E43],
+  ["E4D8",0x6E44],
+  ["9C8B",0x6E45],
+  ["9C8C",0x6E46],
+  ["9C8D",0x6E47],
+  ["9C8E",0x6E48],
+  ["9C8F",0x6E49],
+  ["9C90",0x6E4A],
+  ["9C91",0x6E4B],
+  ["9C92",0x6E4C],
+  ["CDC4",0x6E4D],
+  ["E4CF",0x6E4E],
+  ["9C93",0x6E4F],
+  ["9C94",0x6E50],
+  ["9C95",0x6E51],
+  ["9C96",0x6E52],
+  ["E4D4",0x6E53],
+  ["E4D5",0x6E54],
+  ["9C97",0x6E55],
+  ["BAFE",0x6E56],
+  ["9C98",0x6E57],
+  ["CFE6",0x6E58],
+  ["9C99",0x6E59],
+  ["9C9A",0x6E5A],
+  ["D5BF",0x6E5B],
+  ["9C9B",0x6E5C],
+  ["9C9C",0x6E5D],
+  ["9C9D",0x6E5E],
+  ["E4D2",0x6E5F],
+  ["9C9E",0x6E60],
+  ["9C9F",0x6E61],
+  ["9CA0",0x6E62],
+  ["9CA1",0x6E63],
+  ["9CA2",0x6E64],
+  ["9CA3",0x6E65],
+  ["9CA4",0x6E66],
+  ["9CA5",0x6E67],
+  ["9CA6",0x6E68],
+  ["9CA7",0x6E69],
+  ["9CA8",0x6E6A],
+  ["E4D0",0x6E6B],
+  ["9CA9",0x6E6C],
+  ["9CAA",0x6E6D],
+  ["E4CE",0x6E6E],
+  ["9CAB",0x6E6F],
+  ["9CAC",0x6E70],
+  ["9CAD",0x6E71],
+  ["9CAE",0x6E72],
+  ["9CAF",0x6E73],
+  ["9CB0",0x6E74],
+  ["9CB1",0x6E75],
+  ["9CB2",0x6E76],
+  ["9CB3",0x6E77],
+  ["9CB4",0x6E78],
+  ["9CB5",0x6E79],
+  ["9CB6",0x6E7A],
+  ["9CB7",0x6E7B],
+  ["9CB8",0x6E7C],
+  ["9CB9",0x6E7D],
+  ["CDE5",0x6E7E],
+  ["CAAA",0x6E7F],
+  ["9CBA",0x6E80],
+  ["9CBB",0x6E81],
+  ["9CBC",0x6E82],
+  ["C0A3",0x6E83],
+  ["9CBD",0x6E84],
+  ["BDA6",0x6E85],
+  ["E4D3",0x6E86],
+  ["9CBE",0x6E87],
+  ["9CBF",0x6E88],
+  ["B8C8",0x6E89],
+  ["9CC0",0x6E8A],
+  ["9CC1",0x6E8B],
+  ["9CC2",0x6E8C],
+  ["9CC3",0x6E8D],
+  ["9CC4",0x6E8E],
+  ["E4E7",0x6E8F],
+  ["D4B4",0x6E90],
+  ["9CC5",0x6E91],
+  ["9CC6",0x6E92],
+  ["9CC7",0x6E93],
+  ["9CC8",0x6E94],
+  ["9CC9",0x6E95],
+  ["9CCA",0x6E96],
+  ["9CCB",0x6E97],
+  ["E4DB",0x6E98],
+  ["9CCC",0x6E99],
+  ["9CCD",0x6E9A],
+  ["9CCE",0x6E9B],
+  ["C1EF",0x6E9C],
+  ["9CCF",0x6E9D],
+  ["9CD0",0x6E9E],
+  ["E4E9",0x6E9F],
+  ["9CD1",0x6EA0],
+  ["9CD2",0x6EA1],
+  ["D2E7",0x6EA2],
+  ["9CD3",0x6EA3],
+  ["9CD4",0x6EA4],
+  ["E4DF",0x6EA5],
+  ["9CD5",0x6EA6],
+  ["E4E0",0x6EA7],
+  ["9CD6",0x6EA8],
+  ["9CD7",0x6EA9],
+  ["CFAA",0x6EAA],
+  ["9CD8",0x6EAB],
+  ["9CD9",0x6EAC],
+  ["9CDA",0x6EAD],
+  ["9CDB",0x6EAE],
+  ["CBDD",0x6EAF],
+  ["9CDC",0x6EB0],
+  ["E4DA",0x6EB1],
+  ["E4D1",0x6EB2],
+  ["9CDD",0x6EB3],
+  ["E4E5",0x6EB4],
+  ["9CDE",0x6EB5],
+  ["C8DC",0x6EB6],
+  ["E4E3",0x6EB7],
+  ["9CDF",0x6EB8],
+  ["9CE0",0x6EB9],
+  ["C4E7",0x6EBA],
+  ["E4E2",0x6EBB],
+  ["9CE1",0x6EBC],
+  ["E4E1",0x6EBD],
+  ["9CE2",0x6EBE],
+  ["9CE3",0x6EBF],
+  ["9CE4",0x6EC0],
+  ["B3FC",0x6EC1],
+  ["E4E8",0x6EC2],
+  ["9CE5",0x6EC3],
+  ["9CE6",0x6EC4],
+  ["9CE7",0x6EC5],
+  ["9CE8",0x6EC6],
+  ["B5E1",0x6EC7],
+  ["9CE9",0x6EC8],
+  ["9CEA",0x6EC9],
+  ["9CEB",0x6ECA],
+  ["D7CC",0x6ECB],
+  ["9CEC",0x6ECC],
+  ["9CED",0x6ECD],
+  ["9CEE",0x6ECE],
+  ["E4E6",0x6ECF],
+  ["9CEF",0x6ED0],
+  ["BBAC",0x6ED1],
+  ["9CF0",0x6ED2],
+  ["D7D2",0x6ED3],
+  ["CCCF",0x6ED4],
+  ["EBF8",0x6ED5],
+  ["9CF1",0x6ED6],
+  ["E4E4",0x6ED7],
+  ["9CF2",0x6ED8],
+  ["9CF3",0x6ED9],
+  ["B9F6",0x6EDA],
+  ["9CF4",0x6EDB],
+  ["9CF5",0x6EDC],
+  ["9CF6",0x6EDD],
+  ["D6CD",0x6EDE],
+  ["E4D9",0x6EDF],
+  ["E4DC",0x6EE0],
+  ["C2FA",0x6EE1],
+  ["E4DE",0x6EE2],
+  ["9CF7",0x6EE3],
+  ["C2CB",0x6EE4],
+  ["C0C4",0x6EE5],
+  ["C2D0",0x6EE6],
+  ["9CF8",0x6EE7],
+  ["B1F5",0x6EE8],
+  ["CCB2",0x6EE9],
+  ["9CF9",0x6EEA],
+  ["9CFA",0x6EEB],
+  ["9CFB",0x6EEC],
+  ["9CFC",0x6EED],
+  ["9CFD",0x6EEE],
+  ["9CFE",0x6EEF],
+  ["9D40",0x6EF0],
+  ["9D41",0x6EF1],
+  ["9D42",0x6EF2],
+  ["9D43",0x6EF3],
+  ["B5CE",0x6EF4],
+  ["9D44",0x6EF5],
+  ["9D45",0x6EF6],
+  ["9D46",0x6EF7],
+  ["9D47",0x6EF8],
+  ["E4EF",0x6EF9],
+  ["9D48",0x6EFA],
+  ["9D49",0x6EFB],
+  ["9D4A",0x6EFC],
+  ["9D4B",0x6EFD],
+  ["9D4C",0x6EFE],
+  ["9D4D",0x6EFF],
+  ["9D4E",0x6F00],
+  ["9D4F",0x6F01],
+  ["C6AF",0x6F02],
+  ["9D50",0x6F03],
+  ["9D51",0x6F04],
+  ["9D52",0x6F05],
+  ["C6E1",0x6F06],
+  ["9D53",0x6F07],
+  ["9D54",0x6F08],
+  ["E4F5",0x6F09],
+  ["9D55",0x6F0A],
+  ["9D56",0x6F0B],
+  ["9D57",0x6F0C],
+  ["9D58",0x6F0D],
+  ["9D59",0x6F0E],
+  ["C2A9",0x6F0F],
+  ["9D5A",0x6F10],
+  ["9D5B",0x6F11],
+  ["9D5C",0x6F12],
+  ["C0EC",0x6F13],
+  ["D1DD",0x6F14],
+  ["E4EE",0x6F15],
+  ["9D5D",0x6F16],
+  ["9D5E",0x6F17],
+  ["9D5F",0x6F18],
+  ["9D60",0x6F19],
+  ["9D61",0x6F1A],
+  ["9D62",0x6F1B],
+  ["9D63",0x6F1C],
+  ["9D64",0x6F1D],
+  ["9D65",0x6F1E],
+  ["9D66",0x6F1F],
+  ["C4AE",0x6F20],
+  ["9D67",0x6F21],
+  ["9D68",0x6F22],
+  ["9D69",0x6F23],
+  ["E4ED",0x6F24],
+  ["9D6A",0x6F25],
+  ["9D6B",0x6F26],
+  ["9D6C",0x6F27],
+  ["9D6D",0x6F28],
+  ["E4F6",0x6F29],
+  ["E4F4",0x6F2A],
+  ["C2FE",0x6F2B],
+  ["9D6E",0x6F2C],
+  ["E4DD",0x6F2D],
+  ["9D6F",0x6F2E],
+  ["E4F0",0x6F2F],
+  ["9D70",0x6F30],
+  ["CAFE",0x6F31],
+  ["9D71",0x6F32],
+  ["D5C4",0x6F33],
+  ["9D72",0x6F34],
+  ["9D73",0x6F35],
+  ["E4F1",0x6F36],
+  ["9D74",0x6F37],
+  ["9D75",0x6F38],
+  ["9D76",0x6F39],
+  ["9D77",0x6F3A],
+  ["9D78",0x6F3B],
+  ["9D79",0x6F3C],
+  ["9D7A",0x6F3D],
+  ["D1FA",0x6F3E],
+  ["9D7B",0x6F3F],
+  ["9D7C",0x6F40],
+  ["9D7D",0x6F41],
+  ["9D7E",0x6F42],
+  ["9D80",0x6F43],
+  ["9D81",0x6F44],
+  ["9D82",0x6F45],
+  ["E4EB",0x6F46],
+  ["E4EC",0x6F47],
+  ["9D83",0x6F48],
+  ["9D84",0x6F49],
+  ["9D85",0x6F4A],
+  ["E4F2",0x6F4B],
+  ["9D86",0x6F4C],
+  ["CEAB",0x6F4D],
+  ["9D87",0x6F4E],
+  ["9D88",0x6F4F],
+  ["9D89",0x6F50],
+  ["9D8A",0x6F51],
+  ["9D8B",0x6F52],
+  ["9D8C",0x6F53],
+  ["9D8D",0x6F54],
+  ["9D8E",0x6F55],
+  ["9D8F",0x6F56],
+  ["9D90",0x6F57],
+  ["C5CB",0x6F58],
+  ["9D91",0x6F59],
+  ["9D92",0x6F5A],
+  ["9D93",0x6F5B],
+  ["C7B1",0x6F5C],
+  ["9D94",0x6F5D],
+  ["C2BA",0x6F5E],
+  ["9D95",0x6F5F],
+  ["9D96",0x6F60],
+  ["9D97",0x6F61],
+  ["E4EA",0x6F62],
+  ["9D98",0x6F63],
+  ["9D99",0x6F64],
+  ["9D9A",0x6F65],
+  ["C1CA",0x6F66],
+  ["9D9B",0x6F67],
+  ["9D9C",0x6F68],
+  ["9D9D",0x6F69],
+  ["9D9E",0x6F6A],
+  ["9D9F",0x6F6B],
+  ["9DA0",0x6F6C],
+  ["CCB6",0x6F6D],
+  ["B3B1",0x6F6E],
+  ["9DA1",0x6F6F],
+  ["9DA2",0x6F70],
+  ["9DA3",0x6F71],
+  ["E4FB",0x6F72],
+  ["9DA4",0x6F73],
+  ["E4F3",0x6F74],
+  ["9DA5",0x6F75],
+  ["9DA6",0x6F76],
+  ["9DA7",0x6F77],
+  ["E4FA",0x6F78],
+  ["9DA8",0x6F79],
+  ["E4FD",0x6F7A],
+  ["9DA9",0x6F7B],
+  ["E4FC",0x6F7C],
+  ["9DAA",0x6F7D],
+  ["9DAB",0x6F7E],
+  ["9DAC",0x6F7F],
+  ["9DAD",0x6F80],
+  ["9DAE",0x6F81],
+  ["9DAF",0x6F82],
+  ["9DB0",0x6F83],
+  ["B3CE",0x6F84],
+  ["9DB1",0x6F85],
+  ["9DB2",0x6F86],
+  ["9DB3",0x6F87],
+  ["B3BA",0x6F88],
+  ["E4F7",0x6F89],
+  ["9DB4",0x6F8A],
+  ["9DB5",0x6F8B],
+  ["E4F9",0x6F8C],
+  ["E4F8",0x6F8D],
+  ["C5EC",0x6F8E],
+  ["9DB6",0x6F8F],
+  ["9DB7",0x6F90],
+  ["9DB8",0x6F91],
+  ["9DB9",0x6F92],
+  ["9DBA",0x6F93],
+  ["9DBB",0x6F94],
+  ["9DBC",0x6F95],
+  ["9DBD",0x6F96],
+  ["9DBE",0x6F97],
+  ["9DBF",0x6F98],
+  ["9DC0",0x6F99],
+  ["9DC1",0x6F9A],
+  ["9DC2",0x6F9B],
+  ["C0BD",0x6F9C],
+  ["9DC3",0x6F9D],
+  ["9DC4",0x6F9E],
+  ["9DC5",0x6F9F],
+  ["9DC6",0x6FA0],
+  ["D4E8",0x6FA1],
+  ["9DC7",0x6FA2],
+  ["9DC8",0x6FA3],
+  ["9DC9",0x6FA4],
+  ["9DCA",0x6FA5],
+  ["9DCB",0x6FA6],
+  ["E5A2",0x6FA7],
+  ["9DCC",0x6FA8],
+  ["9DCD",0x6FA9],
+  ["9DCE",0x6FAA],
+  ["9DCF",0x6FAB],
+  ["9DD0",0x6FAC],
+  ["9DD1",0x6FAD],
+  ["9DD2",0x6FAE],
+  ["9DD3",0x6FAF],
+  ["9DD4",0x6FB0],
+  ["9DD5",0x6FB1],
+  ["9DD6",0x6FB2],
+  ["B0C4",0x6FB3],
+  ["9DD7",0x6FB4],
+  ["9DD8",0x6FB5],
+  ["E5A4",0x6FB6],
+  ["9DD9",0x6FB7],
+  ["9DDA",0x6FB8],
+  ["E5A3",0x6FB9],
+  ["9DDB",0x6FBA],
+  ["9DDC",0x6FBB],
+  ["9DDD",0x6FBC],
+  ["9DDE",0x6FBD],
+  ["9DDF",0x6FBE],
+  ["9DE0",0x6FBF],
+  ["BCA4",0x6FC0],
+  ["9DE1",0x6FC1],
+  ["E5A5",0x6FC2],
+  ["9DE2",0x6FC3],
+  ["9DE3",0x6FC4],
+  ["9DE4",0x6FC5],
+  ["9DE5",0x6FC6],
+  ["9DE6",0x6FC7],
+  ["9DE7",0x6FC8],
+  ["E5A1",0x6FC9],
+  ["9DE8",0x6FCA],
+  ["9DE9",0x6FCB],
+  ["9DEA",0x6FCC],
+  ["9DEB",0x6FCD],
+  ["9DEC",0x6FCE],
+  ["9DED",0x6FCF],
+  ["9DEE",0x6FD0],
+  ["E4FE",0x6FD1],
+  ["B1F4",0x6FD2],
+  ["9DEF",0x6FD3],
+  ["9DF0",0x6FD4],
+  ["9DF1",0x6FD5],
+  ["9DF2",0x6FD6],
+  ["9DF3",0x6FD7],
+  ["9DF4",0x6FD8],
+  ["9DF5",0x6FD9],
+  ["9DF6",0x6FDA],
+  ["9DF7",0x6FDB],
+  ["9DF8",0x6FDC],
+  ["9DF9",0x6FDD],
+  ["E5A8",0x6FDE],
+  ["9DFA",0x6FDF],
+  ["E5A9",0x6FE0],
+  ["E5A6",0x6FE1],
+  ["9DFB",0x6FE2],
+  ["9DFC",0x6FE3],
+  ["9DFD",0x6FE4],
+  ["9DFE",0x6FE5],
+  ["9E40",0x6FE6],
+  ["9E41",0x6FE7],
+  ["9E42",0x6FE8],
+  ["9E43",0x6FE9],
+  ["9E44",0x6FEA],
+  ["9E45",0x6FEB],
+  ["9E46",0x6FEC],
+  ["9E47",0x6FED],
+  ["E5A7",0x6FEE],
+  ["E5AA",0x6FEF],
+  ["9E48",0x6FF0],
+  ["9E49",0x6FF1],
+  ["9E4A",0x6FF2],
+  ["9E4B",0x6FF3],
+  ["9E4C",0x6FF4],
+  ["9E4D",0x6FF5],
+  ["9E4E",0x6FF6],
+  ["9E4F",0x6FF7],
+  ["9E50",0x6FF8],
+  ["9E51",0x6FF9],
+  ["9E52",0x6FFA],
+  ["9E53",0x6FFB],
+  ["9E54",0x6FFC],
+  ["9E55",0x6FFD],
+  ["9E56",0x6FFE],
+  ["9E57",0x6FFF],
+  ["9E58",0x7000],
+  ["9E59",0x7001],
+  ["9E5A",0x7002],
+  ["9E5B",0x7003],
+  ["9E5C",0x7004],
+  ["9E5D",0x7005],
+  ["9E5E",0x7006],
+  ["9E5F",0x7007],
+  ["9E60",0x7008],
+  ["9E61",0x7009],
+  ["9E62",0x700A],
+  ["9E63",0x700B],
+  ["9E64",0x700C],
+  ["9E65",0x700D],
+  ["9E66",0x700E],
+  ["9E67",0x700F],
+  ["9E68",0x7010],
+  ["C6D9",0x7011],
+  ["9E69",0x7012],
+  ["9E6A",0x7013],
+  ["9E6B",0x7014],
+  ["9E6C",0x7015],
+  ["9E6D",0x7016],
+  ["9E6E",0x7017],
+  ["9E6F",0x7018],
+  ["9E70",0x7019],
+  ["E5AB",0x701A],
+  ["E5AD",0x701B],
+  ["9E71",0x701C],
+  ["9E72",0x701D],
+  ["9E73",0x701E],
+  ["9E74",0x701F],
+  ["9E75",0x7020],
+  ["9E76",0x7021],
+  ["9E77",0x7022],
+  ["E5AC",0x7023],
+  ["9E78",0x7024],
+  ["9E79",0x7025],
+  ["9E7A",0x7026],
+  ["9E7B",0x7027],
+  ["9E7C",0x7028],
+  ["9E7D",0x7029],
+  ["9E7E",0x702A],
+  ["9E80",0x702B],
+  ["9E81",0x702C],
+  ["9E82",0x702D],
+  ["9E83",0x702E],
+  ["9E84",0x702F],
+  ["9E85",0x7030],
+  ["9E86",0x7031],
+  ["9E87",0x7032],
+  ["9E88",0x7033],
+  ["9E89",0x7034],
+  ["E5AF",0x7035],
+  ["9E8A",0x7036],
+  ["9E8B",0x7037],
+  ["9E8C",0x7038],
+  ["E5AE",0x7039],
+  ["9E8D",0x703A],
+  ["9E8E",0x703B],
+  ["9E8F",0x703C],
+  ["9E90",0x703D],
+  ["9E91",0x703E],
+  ["9E92",0x703F],
+  ["9E93",0x7040],
+  ["9E94",0x7041],
+  ["9E95",0x7042],
+  ["9E96",0x7043],
+  ["9E97",0x7044],
+  ["9E98",0x7045],
+  ["9E99",0x7046],
+  ["9E9A",0x7047],
+  ["9E9B",0x7048],
+  ["9E9C",0x7049],
+  ["9E9D",0x704A],
+  ["9E9E",0x704B],
+  ["B9E0",0x704C],
+  ["9E9F",0x704D],
+  ["9EA0",0x704E],
+  ["E5B0",0x704F],
+  ["9EA1",0x7050],
+  ["9EA2",0x7051],
+  ["9EA3",0x7052],
+  ["9EA4",0x7053],
+  ["9EA5",0x7054],
+  ["9EA6",0x7055],
+  ["9EA7",0x7056],
+  ["9EA8",0x7057],
+  ["9EA9",0x7058],
+  ["9EAA",0x7059],
+  ["9EAB",0x705A],
+  ["9EAC",0x705B],
+  ["9EAD",0x705C],
+  ["9EAE",0x705D],
+  ["E5B1",0x705E],
+  ["9EAF",0x705F],
+  ["9EB0",0x7060],
+  ["9EB1",0x7061],
+  ["9EB2",0x7062],
+  ["9EB3",0x7063],
+  ["9EB4",0x7064],
+  ["9EB5",0x7065],
+  ["9EB6",0x7066],
+  ["9EB7",0x7067],
+  ["9EB8",0x7068],
+  ["9EB9",0x7069],
+  ["9EBA",0x706A],
+  ["BBF0",0x706B],
+  ["ECE1",0x706C],
+  ["C3F0",0x706D],
+  ["9EBB",0x706E],
+  ["B5C6",0x706F],
+  ["BBD2",0x7070],
+  ["9EBC",0x7071],
+  ["9EBD",0x7072],
+  ["9EBE",0x7073],
+  ["9EBF",0x7074],
+  ["C1E9",0x7075],
+  ["D4EE",0x7076],
+  ["9EC0",0x7077],
+  ["BEC4",0x7078],
+  ["9EC1",0x7079],
+  ["9EC2",0x707A],
+  ["9EC3",0x707B],
+  ["D7C6",0x707C],
+  ["9EC4",0x707D],
+  ["D4D6",0x707E],
+  ["B2D3",0x707F],
+  ["ECBE",0x7080],
+  ["9EC5",0x7081],
+  ["9EC6",0x7082],
+  ["9EC7",0x7083],
+  ["9EC8",0x7084],
+  ["EAC1",0x7085],
+  ["9EC9",0x7086],
+  ["9ECA",0x7087],
+  ["9ECB",0x7088],
+  ["C2AF",0x7089],
+  ["B4B6",0x708A],
+  ["9ECC",0x708B],
+  ["9ECD",0x708C],
+  ["9ECE",0x708D],
+  ["D1D7",0x708E],
+  ["9ECF",0x708F],
+  ["9ED0",0x7090],
+  ["9ED1",0x7091],
+  ["B3B4",0x7092],
+  ["9ED2",0x7093],
+  ["C8B2",0x7094],
+  ["BFBB",0x7095],
+  ["ECC0",0x7096],
+  ["9ED3",0x7097],
+  ["9ED4",0x7098],
+  ["D6CB",0x7099],
+  ["9ED5",0x709A],
+  ["9ED6",0x709B],
+  ["ECBF",0x709C],
+  ["ECC1",0x709D],
+  ["9ED7",0x709E],
+  ["9ED8",0x709F],
+  ["9ED9",0x70A0],
+  ["9EDA",0x70A1],
+  ["9EDB",0x70A2],
+  ["9EDC",0x70A3],
+  ["9EDD",0x70A4],
+  ["9EDE",0x70A5],
+  ["9EDF",0x70A6],
+  ["9EE0",0x70A7],
+  ["9EE1",0x70A8],
+  ["9EE2",0x70A9],
+  ["9EE3",0x70AA],
+  ["ECC5",0x70AB],
+  ["BEE6",0x70AC],
+  ["CCBF",0x70AD],
+  ["C5DA",0x70AE],
+  ["BEBC",0x70AF],
+  ["9EE4",0x70B0],
+  ["ECC6",0x70B1],
+  ["9EE5",0x70B2],
+  ["B1FE",0x70B3],
+  ["9EE6",0x70B4],
+  ["9EE7",0x70B5],
+  ["9EE8",0x70B6],
+  ["ECC4",0x70B7],
+  ["D5A8",0x70B8],
+  ["B5E3",0x70B9],
+  ["9EE9",0x70BA],
+  ["ECC2",0x70BB],
+  ["C1B6",0x70BC],
+  ["B3E3",0x70BD],
+  ["9EEA",0x70BE],
+  ["9EEB",0x70BF],
+  ["ECC3",0x70C0],
+  ["CBB8",0x70C1],
+  ["C0C3",0x70C2],
+  ["CCFE",0x70C3],
+  ["9EEC",0x70C4],
+  ["9EED",0x70C5],
+  ["9EEE",0x70C6],
+  ["9EEF",0x70C7],
+  ["C1D2",0x70C8],
+  ["9EF0",0x70C9],
+  ["ECC8",0x70CA],
+  ["9EF1",0x70CB],
+  ["9EF2",0x70CC],
+  ["9EF3",0x70CD],
+  ["9EF4",0x70CE],
+  ["9EF5",0x70CF],
+  ["9EF6",0x70D0],
+  ["9EF7",0x70D1],
+  ["9EF8",0x70D2],
+  ["9EF9",0x70D3],
+  ["9EFA",0x70D4],
+  ["9EFB",0x70D5],
+  ["9EFC",0x70D6],
+  ["9EFD",0x70D7],
+  ["BAE6",0x70D8],
+  ["C0D3",0x70D9],
+  ["9EFE",0x70DA],
+  ["D6F2",0x70DB],
+  ["9F40",0x70DC],
+  ["9F41",0x70DD],
+  ["9F42",0x70DE],
+  ["D1CC",0x70DF],
+  ["9F43",0x70E0],
+  ["9F44",0x70E1],
+  ["9F45",0x70E2],
+  ["9F46",0x70E3],
+  ["BFBE",0x70E4],
+  ["9F47",0x70E5],
+  ["B7B3",0x70E6],
+  ["C9D5",0x70E7],
+  ["ECC7",0x70E8],
+  ["BBE2",0x70E9],
+  ["9F48",0x70EA],
+  ["CCCC",0x70EB],
+  ["BDFD",0x70EC],
+  ["C8C8",0x70ED],
+  ["9F49",0x70EE],
+  ["CFA9",0x70EF],
+  ["9F4A",0x70F0],
+  ["9F4B",0x70F1],
+  ["9F4C",0x70F2],
+  ["9F4D",0x70F3],
+  ["9F4E",0x70F4],
+  ["9F4F",0x70F5],
+  ["9F50",0x70F6],
+  ["CDE9",0x70F7],
+  ["9F51",0x70F8],
+  ["C5EB",0x70F9],
+  ["9F52",0x70FA],
+  ["9F53",0x70FB],
+  ["9F54",0x70FC],
+  ["B7E9",0x70FD],
+  ["9F55",0x70FE],
+  ["9F56",0x70FF],
+  ["9F57",0x7100],
+  ["9F58",0x7101],
+  ["9F59",0x7102],
+  ["9F5A",0x7103],
+  ["9F5B",0x7104],
+  ["9F5C",0x7105],
+  ["9F5D",0x7106],
+  ["9F5E",0x7107],
+  ["9F5F",0x7108],
+  ["D1C9",0x7109],
+  ["BAB8",0x710A],
+  ["9F60",0x710B],
+  ["9F61",0x710C],
+  ["9F62",0x710D],
+  ["9F63",0x710E],
+  ["9F64",0x710F],
+  ["ECC9",0x7110],
+  ["9F65",0x7111],
+  ["9F66",0x7112],
+  ["ECCA",0x7113],
+  ["9F67",0x7114],
+  ["BBC0",0x7115],
+  ["ECCB",0x7116],
+  ["9F68",0x7117],
+  ["ECE2",0x7118],
+  ["B1BA",0x7119],
+  ["B7D9",0x711A],
+  ["9F69",0x711B],
+  ["9F6A",0x711C],
+  ["9F6B",0x711D],
+  ["9F6C",0x711E],
+  ["9F6D",0x711F],
+  ["9F6E",0x7120],
+  ["9F6F",0x7121],
+  ["9F70",0x7122],
+  ["9F71",0x7123],
+  ["9F72",0x7124],
+  ["9F73",0x7125],
+  ["BDB9",0x7126],
+  ["9F74",0x7127],
+  ["9F75",0x7128],
+  ["9F76",0x7129],
+  ["9F77",0x712A],
+  ["9F78",0x712B],
+  ["9F79",0x712C],
+  ["9F7A",0x712D],
+  ["9F7B",0x712E],
+  ["ECCC",0x712F],
+  ["D1E6",0x7130],
+  ["ECCD",0x7131],
+  ["9F7C",0x7132],
+  ["9F7D",0x7133],
+  ["9F7E",0x7134],
+  ["9F80",0x7135],
+  ["C8BB",0x7136],
+  ["9F81",0x7137],
+  ["9F82",0x7138],
+  ["9F83",0x7139],
+  ["9F84",0x713A],
+  ["9F85",0x713B],
+  ["9F86",0x713C],
+  ["9F87",0x713D],
+  ["9F88",0x713E],
+  ["9F89",0x713F],
+  ["9F8A",0x7140],
+  ["9F8B",0x7141],
+  ["9F8C",0x7142],
+  ["9F8D",0x7143],
+  ["9F8E",0x7144],
+  ["ECD1",0x7145],
+  ["9F8F",0x7146],
+  ["9F90",0x7147],
+  ["9F91",0x7148],
+  ["9F92",0x7149],
+  ["ECD3",0x714A],
+  ["9F93",0x714B],
+  ["BBCD",0x714C],
+  ["9F94",0x714D],
+  ["BCE5",0x714E],
+  ["9F95",0x714F],
+  ["9F96",0x7150],
+  ["9F97",0x7151],
+  ["9F98",0x7152],
+  ["9F99",0x7153],
+  ["9F9A",0x7154],
+  ["9F9B",0x7155],
+  ["9F9C",0x7156],
+  ["9F9D",0x7157],
+  ["9F9E",0x7158],
+  ["9F9F",0x7159],
+  ["9FA0",0x715A],
+  ["9FA1",0x715B],
+  ["ECCF",0x715C],
+  ["9FA2",0x715D],
+  ["C9B7",0x715E],
+  ["9FA3",0x715F],
+  ["9FA4",0x7160],
+  ["9FA5",0x7161],
+  ["9FA6",0x7162],
+  ["9FA7",0x7163],
+  ["C3BA",0x7164],
+  ["9FA8",0x7165],
+  ["ECE3",0x7166],
+  ["D5D5",0x7167],
+  ["ECD0",0x7168],
+  ["9FA9",0x7169],
+  ["9FAA",0x716A],
+  ["9FAB",0x716B],
+  ["9FAC",0x716C],
+  ["9FAD",0x716D],
+  ["D6F3",0x716E],
+  ["9FAE",0x716F],
+  ["9FAF",0x7170],
+  ["9FB0",0x7171],
+  ["ECD2",0x7172],
+  ["ECCE",0x7173],
+  ["9FB1",0x7174],
+  ["9FB2",0x7175],
+  ["9FB3",0x7176],
+  ["9FB4",0x7177],
+  ["ECD4",0x7178],
+  ["9FB5",0x7179],
+  ["ECD5",0x717A],
+  ["9FB6",0x717B],
+  ["9FB7",0x717C],
+  ["C9BF",0x717D],
+  ["9FB8",0x717E],
+  ["9FB9",0x717F],
+  ["9FBA",0x7180],
+  ["9FBB",0x7181],
+  ["9FBC",0x7182],
+  ["9FBD",0x7183],
+  ["CFA8",0x7184],
+  ["9FBE",0x7185],
+  ["9FBF",0x7186],
+  ["9FC0",0x7187],
+  ["9FC1",0x7188],
+  ["9FC2",0x7189],
+  ["D0DC",0x718A],
+  ["9FC3",0x718B],
+  ["9FC4",0x718C],
+  ["9FC5",0x718D],
+  ["9FC6",0x718E],
+  ["D1AC",0x718F],
+  ["9FC7",0x7190],
+  ["9FC8",0x7191],
+  ["9FC9",0x7192],
+  ["9FCA",0x7193],
+  ["C8DB",0x7194],
+  ["9FCB",0x7195],
+  ["9FCC",0x7196],
+  ["9FCD",0x7197],
+  ["ECD6",0x7198],
+  ["CEF5",0x7199],
+  ["9FCE",0x719A],
+  ["9FCF",0x719B],
+  ["9FD0",0x719C],
+  ["9FD1",0x719D],
+  ["9FD2",0x719E],
+  ["CAEC",0x719F],
+  ["ECDA",0x71A0],
+  ["9FD3",0x71A1],
+  ["9FD4",0x71A2],
+  ["9FD5",0x71A3],
+  ["9FD6",0x71A4],
+  ["9FD7",0x71A5],
+  ["9FD8",0x71A6],
+  ["9FD9",0x71A7],
+  ["ECD9",0x71A8],
+  ["9FDA",0x71A9],
+  ["9FDB",0x71AA],
+  ["9FDC",0x71AB],
+  ["B0BE",0x71AC],
+  ["9FDD",0x71AD],
+  ["9FDE",0x71AE],
+  ["9FDF",0x71AF],
+  ["9FE0",0x71B0],
+  ["9FE1",0x71B1],
+  ["9FE2",0x71B2],
+  ["ECD7",0x71B3],
+  ["9FE3",0x71B4],
+  ["ECD8",0x71B5],
+  ["9FE4",0x71B6],
+  ["9FE5",0x71B7],
+  ["9FE6",0x71B8],
+  ["ECE4",0x71B9],
+  ["9FE7",0x71BA],
+  ["9FE8",0x71BB],
+  ["9FE9",0x71BC],
+  ["9FEA",0x71BD],
+  ["9FEB",0x71BE],
+  ["9FEC",0x71BF],
+  ["9FED",0x71C0],
+  ["9FEE",0x71C1],
+  ["9FEF",0x71C2],
+  ["C8BC",0x71C3],
+  ["9FF0",0x71C4],
+  ["9FF1",0x71C5],
+  ["9FF2",0x71C6],
+  ["9FF3",0x71C7],
+  ["9FF4",0x71C8],
+  ["9FF5",0x71C9],
+  ["9FF6",0x71CA],
+  ["9FF7",0x71CB],
+  ["9FF8",0x71CC],
+  ["9FF9",0x71CD],
+  ["C1C7",0x71CE],
+  ["9FFA",0x71CF],
+  ["9FFB",0x71D0],
+  ["9FFC",0x71D1],
+  ["9FFD",0x71D2],
+  ["9FFE",0x71D3],
+  ["ECDC",0x71D4],
+  ["D1E0",0x71D5],
+  ["A040",0x71D6],
+  ["A041",0x71D7],
+  ["A042",0x71D8],
+  ["A043",0x71D9],
+  ["A044",0x71DA],
+  ["A045",0x71DB],
+  ["A046",0x71DC],
+  ["A047",0x71DD],
+  ["A048",0x71DE],
+  ["A049",0x71DF],
+  ["ECDB",0x71E0],
+  ["A04A",0x71E1],
+  ["A04B",0x71E2],
+  ["A04C",0x71E3],
+  ["A04D",0x71E4],
+  ["D4EF",0x71E5],
+  ["A04E",0x71E6],
+  ["ECDD",0x71E7],
+  ["A04F",0x71E8],
+  ["A050",0x71E9],
+  ["A051",0x71EA],
+  ["A052",0x71EB],
+  ["A053",0x71EC],
+  ["A054",0x71ED],
+  ["DBC6",0x71EE],
+  ["A055",0x71EF],
+  ["A056",0x71F0],
+  ["A057",0x71F1],
+  ["A058",0x71F2],
+  ["A059",0x71F3],
+  ["A05A",0x71F4],
+  ["A05B",0x71F5],
+  ["A05C",0x71F6],
+  ["A05D",0x71F7],
+  ["A05E",0x71F8],
+  ["ECDE",0x71F9],
+  ["A05F",0x71FA],
+  ["A060",0x71FB],
+  ["A061",0x71FC],
+  ["A062",0x71FD],
+  ["A063",0x71FE],
+  ["A064",0x71FF],
+  ["A065",0x7200],
+  ["A066",0x7201],
+  ["A067",0x7202],
+  ["A068",0x7203],
+  ["A069",0x7204],
+  ["A06A",0x7205],
+  ["B1AC",0x7206],
+  ["A06B",0x7207],
+  ["A06C",0x7208],
+  ["A06D",0x7209],
+  ["A06E",0x720A],
+  ["A06F",0x720B],
+  ["A070",0x720C],
+  ["A071",0x720D],
+  ["A072",0x720E],
+  ["A073",0x720F],
+  ["A074",0x7210],
+  ["A075",0x7211],
+  ["A076",0x7212],
+  ["A077",0x7213],
+  ["A078",0x7214],
+  ["A079",0x7215],
+  ["A07A",0x7216],
+  ["A07B",0x7217],
+  ["A07C",0x7218],
+  ["A07D",0x7219],
+  ["A07E",0x721A],
+  ["A080",0x721B],
+  ["A081",0x721C],
+  ["ECDF",0x721D],
+  ["A082",0x721E],
+  ["A083",0x721F],
+  ["A084",0x7220],
+  ["A085",0x7221],
+  ["A086",0x7222],
+  ["A087",0x7223],
+  ["A088",0x7224],
+  ["A089",0x7225],
+  ["A08A",0x7226],
+  ["A08B",0x7227],
+  ["ECE0",0x7228],
+  ["A08C",0x7229],
+  ["D7A6",0x722A],
+  ["A08D",0x722B],
+  ["C5C0",0x722C],
+  ["A08E",0x722D],
+  ["A08F",0x722E],
+  ["A090",0x722F],
+  ["EBBC",0x7230],
+  ["B0AE",0x7231],
+  ["A091",0x7232],
+  ["A092",0x7233],
+  ["A093",0x7234],
+  ["BEF4",0x7235],
+  ["B8B8",0x7236],
+  ["D2AF",0x7237],
+  ["B0D6",0x7238],
+  ["B5F9",0x7239],
+  ["A094",0x723A],
+  ["D8B3",0x723B],
+  ["A095",0x723C],
+  ["CBAC",0x723D],
+  ["A096",0x723E],
+  ["E3DD",0x723F],
+  ["A097",0x7240],
+  ["A098",0x7241],
+  ["A099",0x7242],
+  ["A09A",0x7243],
+  ["A09B",0x7244],
+  ["A09C",0x7245],
+  ["A09D",0x7246],
+  ["C6AC",0x7247],
+  ["B0E6",0x7248],
+  ["A09E",0x7249],
+  ["A09F",0x724A],
+  ["A0A0",0x724B],
+  ["C5C6",0x724C],
+  ["EBB9",0x724D],
+  ["A0A1",0x724E],
+  ["A0A2",0x724F],
+  ["A0A3",0x7250],
+  ["A0A4",0x7251],
+  ["EBBA",0x7252],
+  ["A0A5",0x7253],
+  ["A0A6",0x7254],
+  ["A0A7",0x7255],
+  ["EBBB",0x7256],
+  ["A0A8",0x7257],
+  ["A0A9",0x7258],
+  ["D1C0",0x7259],
+  ["A0AA",0x725A],
+  ["C5A3",0x725B],
+  ["A0AB",0x725C],
+  ["EAF2",0x725D],
+  ["A0AC",0x725E],
+  ["C4B2",0x725F],
+  ["A0AD",0x7260],
+  ["C4B5",0x7261],
+  ["C0CE",0x7262],
+  ["A0AE",0x7263],
+  ["A0AF",0x7264],
+  ["A0B0",0x7265],
+  ["EAF3",0x7266],
+  ["C4C1",0x7267],
+  ["A0B1",0x7268],
+  ["CEEF",0x7269],
+  ["A0B2",0x726A],
+  ["A0B3",0x726B],
+  ["A0B4",0x726C],
+  ["A0B5",0x726D],
+  ["EAF0",0x726E],
+  ["EAF4",0x726F],
+  ["A0B6",0x7270],
+  ["A0B7",0x7271],
+  ["C9FC",0x7272],
+  ["A0B8",0x7273],
+  ["A0B9",0x7274],
+  ["C7A3",0x7275],
+  ["A0BA",0x7276],
+  ["A0BB",0x7277],
+  ["A0BC",0x7278],
+  ["CCD8",0x7279],
+  ["CEFE",0x727A],
+  ["A0BD",0x727B],
+  ["A0BE",0x727C],
+  ["A0BF",0x727D],
+  ["EAF5",0x727E],
+  ["EAF6",0x727F],
+  ["CFAC",0x7280],
+  ["C0E7",0x7281],
+  ["A0C0",0x7282],
+  ["A0C1",0x7283],
+  ["EAF7",0x7284],
+  ["A0C2",0x7285],
+  ["A0C3",0x7286],
+  ["A0C4",0x7287],
+  ["A0C5",0x7288],
+  ["A0C6",0x7289],
+  ["B6BF",0x728A],
+  ["EAF8",0x728B],
+  ["A0C7",0x728C],
+  ["EAF9",0x728D],
+  ["A0C8",0x728E],
+  ["EAFA",0x728F],
+  ["A0C9",0x7290],
+  ["A0CA",0x7291],
+  ["EAFB",0x7292],
+  ["A0CB",0x7293],
+  ["A0CC",0x7294],
+  ["A0CD",0x7295],
+  ["A0CE",0x7296],
+  ["A0CF",0x7297],
+  ["A0D0",0x7298],
+  ["A0D1",0x7299],
+  ["A0D2",0x729A],
+  ["A0D3",0x729B],
+  ["A0D4",0x729C],
+  ["A0D5",0x729D],
+  ["A0D6",0x729E],
+  ["EAF1",0x729F],
+  ["A0D7",0x72A0],
+  ["A0D8",0x72A1],
+  ["A0D9",0x72A2],
+  ["A0DA",0x72A3],
+  ["A0DB",0x72A4],
+  ["A0DC",0x72A5],
+  ["A0DD",0x72A6],
+  ["A0DE",0x72A7],
+  ["A0DF",0x72A8],
+  ["A0E0",0x72A9],
+  ["A0E1",0x72AA],
+  ["A0E2",0x72AB],
+  ["C8AE",0x72AC],
+  ["E1EB",0x72AD],
+  ["A0E3",0x72AE],
+  ["B7B8",0x72AF],
+  ["E1EC",0x72B0],
+  ["A0E4",0x72B1],
+  ["A0E5",0x72B2],
+  ["A0E6",0x72B3],
+  ["E1ED",0x72B4],
+  ["A0E7",0x72B5],
+  ["D7B4",0x72B6],
+  ["E1EE",0x72B7],
+  ["E1EF",0x72B8],
+  ["D3CC",0x72B9],
+  ["A0E8",0x72BA],
+  ["A0E9",0x72BB],
+  ["A0EA",0x72BC],
+  ["A0EB",0x72BD],
+  ["A0EC",0x72BE],
+  ["A0ED",0x72BF],
+  ["A0EE",0x72C0],
+  ["E1F1",0x72C1],
+  ["BFF1",0x72C2],
+  ["E1F0",0x72C3],
+  ["B5D2",0x72C4],
+  ["A0EF",0x72C5],
+  ["A0F0",0x72C6],
+  ["A0F1",0x72C7],
+  ["B1B7",0x72C8],
+  ["A0F2",0x72C9],
+  ["A0F3",0x72CA],
+  ["A0F4",0x72CB],
+  ["A0F5",0x72CC],
+  ["E1F3",0x72CD],
+  ["E1F2",0x72CE],
+  ["A0F6",0x72CF],
+  ["BAFC",0x72D0],
+  ["A0F7",0x72D1],
+  ["E1F4",0x72D2],
+  ["A0F8",0x72D3],
+  ["A0F9",0x72D4],
+  ["A0FA",0x72D5],
+  ["A0FB",0x72D6],
+  ["B9B7",0x72D7],
+  ["A0FC",0x72D8],
+  ["BED1",0x72D9],
+  ["A0FD",0x72DA],
+  ["A0FE",0x72DB],
+  ["AA40",0x72DC],
+  ["AA41",0x72DD],
+  ["C4FC",0x72DE],
+  ["AA42",0x72DF],
+  ["BADD",0x72E0],
+  ["BDC6",0x72E1],
+  ["AA43",0x72E2],
+  ["AA44",0x72E3],
+  ["AA45",0x72E4],
+  ["AA46",0x72E5],
+  ["AA47",0x72E6],
+  ["AA48",0x72E7],
+  ["E1F5",0x72E8],
+  ["E1F7",0x72E9],
+  ["AA49",0x72EA],
+  ["AA4A",0x72EB],
+  ["B6C0",0x72EC],
+  ["CFC1",0x72ED],
+  ["CAA8",0x72EE],
+  ["E1F6",0x72EF],
+  ["D5F8",0x72F0],
+  ["D3FC",0x72F1],
+  ["E1F8",0x72F2],
+  ["E1FC",0x72F3],
+  ["E1F9",0x72F4],
+  ["AA4B",0x72F5],
+  ["AA4C",0x72F6],
+  ["E1FA",0x72F7],
+  ["C0EA",0x72F8],
+  ["AA4D",0x72F9],
+  ["E1FE",0x72FA],
+  ["E2A1",0x72FB],
+  ["C0C7",0x72FC],
+  ["AA4E",0x72FD],
+  ["AA4F",0x72FE],
+  ["AA50",0x72FF],
+  ["AA51",0x7300],
+  ["E1FB",0x7301],
+  ["AA52",0x7302],
+  ["E1FD",0x7303],
+  ["AA53",0x7304],
+  ["AA54",0x7305],
+  ["AA55",0x7306],
+  ["AA56",0x7307],
+  ["AA57",0x7308],
+  ["AA58",0x7309],
+  ["E2A5",0x730A],
+  ["AA59",0x730B],
+  ["AA5A",0x730C],
+  ["AA5B",0x730D],
+  ["C1D4",0x730E],
+  ["AA5C",0x730F],
+  ["AA5D",0x7310],
+  ["AA5E",0x7311],
+  ["AA5F",0x7312],
+  ["E2A3",0x7313],
+  ["AA60",0x7314],
+  ["E2A8",0x7315],
+  ["B2FE",0x7316],
+  ["E2A2",0x7317],
+  ["AA61",0x7318],
+  ["AA62",0x7319],
+  ["AA63",0x731A],
+  ["C3CD",0x731B],
+  ["B2C2",0x731C],
+  ["E2A7",0x731D],
+  ["E2A6",0x731E],
+  ["AA64",0x731F],
+  ["AA65",0x7320],
+  ["E2A4",0x7321],
+  ["E2A9",0x7322],
+  ["AA66",0x7323],
+  ["AA67",0x7324],
+  ["E2AB",0x7325],
+  ["AA68",0x7326],
+  ["AA69",0x7327],
+  ["AA6A",0x7328],
+  ["D0C9",0x7329],
+  ["D6ED",0x732A],
+  ["C3A8",0x732B],
+  ["E2AC",0x732C],
+  ["AA6B",0x732D],
+  ["CFD7",0x732E],
+  ["AA6C",0x732F],
+  ["AA6D",0x7330],
+  ["E2AE",0x7331],
+  ["AA6E",0x7332],
+  ["AA6F",0x7333],
+  ["BAEF",0x7334],
+  ["AA70",0x7335],
+  ["AA71",0x7336],
+  ["E9E0",0x7337],
+  ["E2AD",0x7338],
+  ["E2AA",0x7339],
+  ["AA72",0x733A],
+  ["AA73",0x733B],
+  ["AA74",0x733C],
+  ["AA75",0x733D],
+  ["BBAB",0x733E],
+  ["D4B3",0x733F],
+  ["AA76",0x7340],
+  ["AA77",0x7341],
+  ["AA78",0x7342],
+  ["AA79",0x7343],
+  ["AA7A",0x7344],
+  ["AA7B",0x7345],
+  ["AA7C",0x7346],
+  ["AA7D",0x7347],
+  ["AA7E",0x7348],
+  ["AA80",0x7349],
+  ["AA81",0x734A],
+  ["AA82",0x734B],
+  ["AA83",0x734C],
+  ["E2B0",0x734D],
+  ["AA84",0x734E],
+  ["AA85",0x734F],
+  ["E2AF",0x7350],
+  ["AA86",0x7351],
+  ["E9E1",0x7352],
+  ["AA87",0x7353],
+  ["AA88",0x7354],
+  ["AA89",0x7355],
+  ["AA8A",0x7356],
+  ["E2B1",0x7357],
+  ["AA8B",0x7358],
+  ["AA8C",0x7359],
+  ["AA8D",0x735A],
+  ["AA8E",0x735B],
+  ["AA8F",0x735C],
+  ["AA90",0x735D],
+  ["AA91",0x735E],
+  ["AA92",0x735F],
+  ["E2B2",0x7360],
+  ["AA93",0x7361],
+  ["AA94",0x7362],
+  ["AA95",0x7363],
+  ["AA96",0x7364],
+  ["AA97",0x7365],
+  ["AA98",0x7366],
+  ["AA99",0x7367],
+  ["AA9A",0x7368],
+  ["AA9B",0x7369],
+  ["AA9C",0x736A],
+  ["AA9D",0x736B],
+  ["E2B3",0x736C],
+  ["CCA1",0x736D],
+  ["AA9E",0x736E],
+  ["E2B4",0x736F],
+  ["AA9F",0x7370],
+  ["AAA0",0x7371],
+  ["AB40",0x7372],
+  ["AB41",0x7373],
+  ["AB42",0x7374],
+  ["AB43",0x7375],
+  ["AB44",0x7376],
+  ["AB45",0x7377],
+  ["AB46",0x7378],
+  ["AB47",0x7379],
+  ["AB48",0x737A],
+  ["AB49",0x737B],
+  ["AB4A",0x737C],
+  ["AB4B",0x737D],
+  ["E2B5",0x737E],
+  ["AB4C",0x737F],
+  ["AB4D",0x7380],
+  ["AB4E",0x7381],
+  ["AB4F",0x7382],
+  ["AB50",0x7383],
+  ["D0FE",0x7384],
+  ["AB51",0x7385],
+  ["AB52",0x7386],
+  ["C2CA",0x7387],
+  ["AB53",0x7388],
+  ["D3F1",0x7389],
+  ["AB54",0x738A],
+  ["CDF5",0x738B],
+  ["AB55",0x738C],
+  ["AB56",0x738D],
+  ["E7E0",0x738E],
+  ["AB57",0x738F],
+  ["AB58",0x7390],
+  ["E7E1",0x7391],
+  ["AB59",0x7392],
+  ["AB5A",0x7393],
+  ["AB5B",0x7394],
+  ["AB5C",0x7395],
+  ["BEC1",0x7396],
+  ["AB5D",0x7397],
+  ["AB5E",0x7398],
+  ["AB5F",0x7399],
+  ["AB60",0x739A],
+  ["C2EA",0x739B],
+  ["AB61",0x739C],
+  ["AB62",0x739D],
+  ["AB63",0x739E],
+  ["E7E4",0x739F],
+  ["AB64",0x73A0],
+  ["AB65",0x73A1],
+  ["E7E3",0x73A2],
+  ["AB66",0x73A3],
+  ["AB67",0x73A4],
+  ["AB68",0x73A5],
+  ["AB69",0x73A6],
+  ["AB6A",0x73A7],
+  ["AB6B",0x73A8],
+  ["CDE6",0x73A9],
+  ["AB6C",0x73AA],
+  ["C3B5",0x73AB],
+  ["AB6D",0x73AC],
+  ["AB6E",0x73AD],
+  ["E7E2",0x73AE],
+  ["BBB7",0x73AF],
+  ["CFD6",0x73B0],
+  ["AB6F",0x73B1],
+  ["C1E1",0x73B2],
+  ["E7E9",0x73B3],
+  ["AB70",0x73B4],
+  ["AB71",0x73B5],
+  ["AB72",0x73B6],
+  ["E7E8",0x73B7],
+  ["AB73",0x73B8],
+  ["AB74",0x73B9],
+  ["E7F4",0x73BA],
+  ["B2A3",0x73BB],
+  ["AB75",0x73BC],
+  ["AB76",0x73BD],
+  ["AB77",0x73BE],
+  ["AB78",0x73BF],
+  ["E7EA",0x73C0],
+  ["AB79",0x73C1],
+  ["E7E6",0x73C2],
+  ["AB7A",0x73C3],
+  ["AB7B",0x73C4],
+  ["AB7C",0x73C5],
+  ["AB7D",0x73C6],
+  ["AB7E",0x73C7],
+  ["E7EC",0x73C8],
+  ["E7EB",0x73C9],
+  ["C9BA",0x73CA],
+  ["AB80",0x73CB],
+  ["AB81",0x73CC],
+  ["D5E4",0x73CD],
+  ["AB82",0x73CE],
+  ["E7E5",0x73CF],
+  ["B7A9",0x73D0],
+  ["E7E7",0x73D1],
+  ["AB83",0x73D2],
+  ["AB84",0x73D3],
+  ["AB85",0x73D4],
+  ["AB86",0x73D5],
+  ["AB87",0x73D6],
+  ["AB88",0x73D7],
+  ["AB89",0x73D8],
+  ["E7EE",0x73D9],
+  ["AB8A",0x73DA],
+  ["AB8B",0x73DB],
+  ["AB8C",0x73DC],
+  ["AB8D",0x73DD],
+  ["E7F3",0x73DE],
+  ["AB8E",0x73DF],
+  ["D6E9",0x73E0],
+  ["AB8F",0x73E1],
+  ["AB90",0x73E2],
+  ["AB91",0x73E3],
+  ["AB92",0x73E4],
+  ["E7ED",0x73E5],
+  ["AB93",0x73E6],
+  ["E7F2",0x73E7],
+  ["AB94",0x73E8],
+  ["E7F1",0x73E9],
+  ["AB95",0x73EA],
+  ["AB96",0x73EB],
+  ["AB97",0x73EC],
+  ["B0E0",0x73ED],
+  ["AB98",0x73EE],
+  ["AB99",0x73EF],
+  ["AB9A",0x73F0],
+  ["AB9B",0x73F1],
+  ["E7F5",0x73F2],
+  ["AB9C",0x73F3],
+  ["AB9D",0x73F4],
+  ["AB9E",0x73F5],
+  ["AB9F",0x73F6],
+  ["ABA0",0x73F7],
+  ["AC40",0x73F8],
+  ["AC41",0x73F9],
+  ["AC42",0x73FA],
+  ["AC43",0x73FB],
+  ["AC44",0x73FC],
+  ["AC45",0x73FD],
+  ["AC46",0x73FE],
+  ["AC47",0x73FF],
+  ["AC48",0x7400],
+  ["AC49",0x7401],
+  ["AC4A",0x7402],
+  ["C7F2",0x7403],
+  ["AC4B",0x7404],
+  ["C0C5",0x7405],
+  ["C0ED",0x7406],
+  ["AC4C",0x7407],
+  ["AC4D",0x7408],
+  ["C1F0",0x7409],
+  ["E7F0",0x740A],
+  ["AC4E",0x740B],
+  ["AC4F",0x740C],
+  ["AC50",0x740D],
+  ["AC51",0x740E],
+  ["E7F6",0x740F],
+  ["CBF6",0x7410],
+  ["AC52",0x7411],
+  ["AC53",0x7412],
+  ["AC54",0x7413],
+  ["AC55",0x7414],
+  ["AC56",0x7415],
+  ["AC57",0x7416],
+  ["AC58",0x7417],
+  ["AC59",0x7418],
+  ["AC5A",0x7419],
+  ["E8A2",0x741A],
+  ["E8A1",0x741B],
+  ["AC5B",0x741C],
+  ["AC5C",0x741D],
+  ["AC5D",0x741E],
+  ["AC5E",0x741F],
+  ["AC5F",0x7420],
+  ["AC60",0x7421],
+  ["D7C1",0x7422],
+  ["AC61",0x7423],
+  ["AC62",0x7424],
+  ["E7FA",0x7425],
+  ["E7F9",0x7426],
+  ["AC63",0x7427],
+  ["E7FB",0x7428],
+  ["AC64",0x7429],
+  ["E7F7",0x742A],
+  ["AC65",0x742B],
+  ["E7FE",0x742C],
+  ["AC66",0x742D],
+  ["E7FD",0x742E],
+  ["AC67",0x742F],
+  ["E7FC",0x7430],
+  ["AC68",0x7431],
+  ["AC69",0x7432],
+  ["C1D5",0x7433],
+  ["C7D9",0x7434],
+  ["C5FD",0x7435],
+  ["C5C3",0x7436],
+  ["AC6A",0x7437],
+  ["AC6B",0x7438],
+  ["AC6C",0x7439],
+  ["AC6D",0x743A],
+  ["AC6E",0x743B],
+  ["C7ED",0x743C],
+  ["AC6F",0x743D],
+  ["AC70",0x743E],
+  ["AC71",0x743F],
+  ["AC72",0x7440],
+  ["E8A3",0x7441],
+  ["AC73",0x7442],
+  ["AC74",0x7443],
+  ["AC75",0x7444],
+  ["AC76",0x7445],
+  ["AC77",0x7446],
+  ["AC78",0x7447],
+  ["AC79",0x7448],
+  ["AC7A",0x7449],
+  ["AC7B",0x744A],
+  ["AC7C",0x744B],
+  ["AC7D",0x744C],
+  ["AC7E",0x744D],
+  ["AC80",0x744E],
+  ["AC81",0x744F],
+  ["AC82",0x7450],
+  ["AC83",0x7451],
+  ["AC84",0x7452],
+  ["AC85",0x7453],
+  ["AC86",0x7454],
+  ["E8A6",0x7455],
+  ["AC87",0x7456],
+  ["E8A5",0x7457],
+  ["AC88",0x7458],
+  ["E8A7",0x7459],
+  ["BAF7",0x745A],
+  ["E7F8",0x745B],
+  ["E8A4",0x745C],
+  ["AC89",0x745D],
+  ["C8F0",0x745E],
+  ["C9AA",0x745F],
+  ["AC8A",0x7460],
+  ["AC8B",0x7461],
+  ["AC8C",0x7462],
+  ["AC8D",0x7463],
+  ["AC8E",0x7464],
+  ["AC8F",0x7465],
+  ["AC90",0x7466],
+  ["AC91",0x7467],
+  ["AC92",0x7468],
+  ["AC93",0x7469],
+  ["AC94",0x746A],
+  ["AC95",0x746B],
+  ["AC96",0x746C],
+  ["E8A9",0x746D],
+  ["AC97",0x746E],
+  ["AC98",0x746F],
+  ["B9E5",0x7470],
+  ["AC99",0x7471],
+  ["AC9A",0x7472],
+  ["AC9B",0x7473],
+  ["AC9C",0x7474],
+  ["AC9D",0x7475],
+  ["D1FE",0x7476],
+  ["E8A8",0x7477],
+  ["AC9E",0x7478],
+  ["AC9F",0x7479],
+  ["ACA0",0x747A],
+  ["AD40",0x747B],
+  ["AD41",0x747C],
+  ["AD42",0x747D],
+  ["E8AA",0x747E],
+  ["AD43",0x747F],
+  ["E8AD",0x7480],
+  ["E8AE",0x7481],
+  ["AD44",0x7482],
+  ["C1A7",0x7483],
+  ["AD45",0x7484],
+  ["AD46",0x7485],
+  ["AD47",0x7486],
+  ["E8AF",0x7487],
+  ["AD48",0x7488],
+  ["AD49",0x7489],
+  ["AD4A",0x748A],
+  ["E8B0",0x748B],
+  ["AD4B",0x748C],
+  ["AD4C",0x748D],
+  ["E8AC",0x748E],
+  ["AD4D",0x748F],
+  ["E8B4",0x7490],
+  ["AD4E",0x7491],
+  ["AD4F",0x7492],
+  ["AD50",0x7493],
+  ["AD51",0x7494],
+  ["AD52",0x7495],
+  ["AD53",0x7496],
+  ["AD54",0x7497],
+  ["AD55",0x7498],
+  ["AD56",0x7499],
+  ["AD57",0x749A],
+  ["AD58",0x749B],
+  ["E8AB",0x749C],
+  ["AD59",0x749D],
+  ["E8B1",0x749E],
+  ["AD5A",0x749F],
+  ["AD5B",0x74A0],
+  ["AD5C",0x74A1],
+  ["AD5D",0x74A2],
+  ["AD5E",0x74A3],
+  ["AD5F",0x74A4],
+  ["AD60",0x74A5],
+  ["AD61",0x74A6],
+  ["E8B5",0x74A7],
+  ["E8B2",0x74A8],
+  ["E8B3",0x74A9],
+  ["AD62",0x74AA],
+  ["AD63",0x74AB],
+  ["AD64",0x74AC],
+  ["AD65",0x74AD],
+  ["AD66",0x74AE],
+  ["AD67",0x74AF],
+  ["AD68",0x74B0],
+  ["AD69",0x74B1],
+  ["AD6A",0x74B2],
+  ["AD6B",0x74B3],
+  ["AD6C",0x74B4],
+  ["AD6D",0x74B5],
+  ["AD6E",0x74B6],
+  ["AD6F",0x74B7],
+  ["AD70",0x74B8],
+  ["AD71",0x74B9],
+  ["E8B7",0x74BA],
+  ["AD72",0x74BB],
+  ["AD73",0x74BC],
+  ["AD74",0x74BD],
+  ["AD75",0x74BE],
+  ["AD76",0x74BF],
+  ["AD77",0x74C0],
+  ["AD78",0x74C1],
+  ["AD79",0x74C2],
+  ["AD7A",0x74C3],
+  ["AD7B",0x74C4],
+  ["AD7C",0x74C5],
+  ["AD7D",0x74C6],
+  ["AD7E",0x74C7],
+  ["AD80",0x74C8],
+  ["AD81",0x74C9],
+  ["AD82",0x74CA],
+  ["AD83",0x74CB],
+  ["AD84",0x74CC],
+  ["AD85",0x74CD],
+  ["AD86",0x74CE],
+  ["AD87",0x74CF],
+  ["AD88",0x74D0],
+  ["AD89",0x74D1],
+  ["E8B6",0x74D2],
+  ["AD8A",0x74D3],
+  ["AD8B",0x74D4],
+  ["AD8C",0x74D5],
+  ["AD8D",0x74D6],
+  ["AD8E",0x74D7],
+  ["AD8F",0x74D8],
+  ["AD90",0x74D9],
+  ["AD91",0x74DA],
+  ["AD92",0x74DB],
+  ["B9CF",0x74DC],
+  ["AD93",0x74DD],
+  ["F0AC",0x74DE],
+  ["AD94",0x74DF],
+  ["F0AD",0x74E0],
+  ["AD95",0x74E1],
+  ["C6B0",0x74E2],
+  ["B0EA",0x74E3],
+  ["C8BF",0x74E4],
+  ["AD96",0x74E5],
+  ["CDDF",0x74E6],
+  ["AD97",0x74E7],
+  ["AD98",0x74E8],
+  ["AD99",0x74E9],
+  ["AD9A",0x74EA],
+  ["AD9B",0x74EB],
+  ["AD9C",0x74EC],
+  ["AD9D",0x74ED],
+  ["CECD",0x74EE],
+  ["EAB1",0x74EF],
+  ["AD9E",0x74F0],
+  ["AD9F",0x74F1],
+  ["ADA0",0x74F2],
+  ["AE40",0x74F3],
+  ["EAB2",0x74F4],
+  ["AE41",0x74F5],
+  ["C6BF",0x74F6],
+  ["B4C9",0x74F7],
+  ["AE42",0x74F8],
+  ["AE43",0x74F9],
+  ["AE44",0x74FA],
+  ["AE45",0x74FB],
+  ["AE46",0x74FC],
+  ["AE47",0x74FD],
+  ["AE48",0x74FE],
+  ["EAB3",0x74FF],
+  ["AE49",0x7500],
+  ["AE4A",0x7501],
+  ["AE4B",0x7502],
+  ["AE4C",0x7503],
+  ["D5E7",0x7504],
+  ["AE4D",0x7505],
+  ["AE4E",0x7506],
+  ["AE4F",0x7507],
+  ["AE50",0x7508],
+  ["AE51",0x7509],
+  ["AE52",0x750A],
+  ["AE53",0x750B],
+  ["AE54",0x750C],
+  ["DDF9",0x750D],
+  ["AE55",0x750E],
+  ["EAB4",0x750F],
+  ["AE56",0x7510],
+  ["EAB5",0x7511],
+  ["AE57",0x7512],
+  ["EAB6",0x7513],
+  ["AE58",0x7514],
+  ["AE59",0x7515],
+  ["AE5A",0x7516],
+  ["AE5B",0x7517],
+  ["B8CA",0x7518],
+  ["DFB0",0x7519],
+  ["C9F5",0x751A],
+  ["AE5C",0x751B],
+  ["CCF0",0x751C],
+  ["AE5D",0x751D],
+  ["AE5E",0x751E],
+  ["C9FA",0x751F],
+  ["AE5F",0x7520],
+  ["AE60",0x7521],
+  ["AE61",0x7522],
+  ["AE62",0x7523],
+  ["AE63",0x7524],
+  ["C9FB",0x7525],
+  ["AE64",0x7526],
+  ["AE65",0x7527],
+  ["D3C3",0x7528],
+  ["CBA6",0x7529],
+  ["AE66",0x752A],
+  ["B8A6",0x752B],
+  ["F0AE",0x752C],
+  ["B1C2",0x752D],
+  ["AE67",0x752E],
+  ["E5B8",0x752F],
+  ["CCEF",0x7530],
+  ["D3C9",0x7531],
+  ["BCD7",0x7532],
+  ["C9EA",0x7533],
+  ["AE68",0x7534],
+  ["B5E7",0x7535],
+  ["AE69",0x7536],
+  ["C4D0",0x7537],
+  ["B5E9",0x7538],
+  ["AE6A",0x7539],
+  ["EEAE",0x753A],
+  ["BBAD",0x753B],
+  ["AE6B",0x753C],
+  ["AE6C",0x753D],
+  ["E7DE",0x753E],
+  ["AE6D",0x753F],
+  ["EEAF",0x7540],
+  ["AE6E",0x7541],
+  ["AE6F",0x7542],
+  ["AE70",0x7543],
+  ["AE71",0x7544],
+  ["B3A9",0x7545],
+  ["AE72",0x7546],
+  ["AE73",0x7547],
+  ["EEB2",0x7548],
+  ["AE74",0x7549],
+  ["AE75",0x754A],
+  ["EEB1",0x754B],
+  ["BDE7",0x754C],
+  ["AE76",0x754D],
+  ["EEB0",0x754E],
+  ["CEB7",0x754F],
+  ["AE77",0x7550],
+  ["AE78",0x7551],
+  ["AE79",0x7552],
+  ["AE7A",0x7553],
+  ["C5CF",0x7554],
+  ["AE7B",0x7555],
+  ["AE7C",0x7556],
+  ["AE7D",0x7557],
+  ["AE7E",0x7558],
+  ["C1F4",0x7559],
+  ["DBCE",0x755A],
+  ["EEB3",0x755B],
+  ["D0F3",0x755C],
+  ["AE80",0x755D],
+  ["AE81",0x755E],
+  ["AE82",0x755F],
+  ["AE83",0x7560],
+  ["AE84",0x7561],
+  ["AE85",0x7562],
+  ["AE86",0x7563],
+  ["AE87",0x7564],
+  ["C2D4",0x7565],
+  ["C6E8",0x7566],
+  ["AE88",0x7567],
+  ["AE89",0x7568],
+  ["AE8A",0x7569],
+  ["B7AC",0x756A],
+  ["AE8B",0x756B],
+  ["AE8C",0x756C],
+  ["AE8D",0x756D],
+  ["AE8E",0x756E],
+  ["AE8F",0x756F],
+  ["AE90",0x7570],
+  ["AE91",0x7571],
+  ["EEB4",0x7572],
+  ["AE92",0x7573],
+  ["B3EB",0x7574],
+  ["AE93",0x7575],
+  ["AE94",0x7576],
+  ["AE95",0x7577],
+  ["BBFB",0x7578],
+  ["EEB5",0x7579],
+  ["AE96",0x757A],
+  ["AE97",0x757B],
+  ["AE98",0x757C],
+  ["AE99",0x757D],
+  ["AE9A",0x757E],
+  ["E7DC",0x757F],
+  ["AE9B",0x7580],
+  ["AE9C",0x7581],
+  ["AE9D",0x7582],
+  ["EEB6",0x7583],
+  ["AE9E",0x7584],
+  ["AE9F",0x7585],
+  ["BDAE",0x7586],
+  ["AEA0",0x7587],
+  ["AF40",0x7588],
+  ["AF41",0x7589],
+  ["AF42",0x758A],
+  ["F1E2",0x758B],
+  ["AF43",0x758C],
+  ["AF44",0x758D],
+  ["AF45",0x758E],
+  ["CAE8",0x758F],
+  ["AF46",0x7590],
+  ["D2C9",0x7591],
+  ["F0DA",0x7592],
+  ["AF47",0x7593],
+  ["F0DB",0x7594],
+  ["AF48",0x7595],
+  ["F0DC",0x7596],
+  ["C1C6",0x7597],
+  ["AF49",0x7598],
+  ["B8ED",0x7599],
+  ["BECE",0x759A],
+  ["AF4A",0x759B],
+  ["AF4B",0x759C],
+  ["F0DE",0x759D],
+  ["AF4C",0x759E],
+  ["C5B1",0x759F],
+  ["F0DD",0x75A0],
+  ["D1F1",0x75A1],
+  ["AF4D",0x75A2],
+  ["F0E0",0x75A3],
+  ["B0CC",0x75A4],
+  ["BDEA",0x75A5],
+  ["AF4E",0x75A6],
+  ["AF4F",0x75A7],
+  ["AF50",0x75A8],
+  ["AF51",0x75A9],
+  ["AF52",0x75AA],
+  ["D2DF",0x75AB],
+  ["F0DF",0x75AC],
+  ["AF53",0x75AD],
+  ["B4AF",0x75AE],
+  ["B7E8",0x75AF],
+  ["F0E6",0x75B0],
+  ["F0E5",0x75B1],
+  ["C6A3",0x75B2],
+  ["F0E1",0x75B3],
+  ["F0E2",0x75B4],
+  ["B4C3",0x75B5],
+  ["AF54",0x75B6],
+  ["AF55",0x75B7],
+  ["F0E3",0x75B8],
+  ["D5EE",0x75B9],
+  ["AF56",0x75BA],
+  ["AF57",0x75BB],
+  ["CCDB",0x75BC],
+  ["BED2",0x75BD],
+  ["BCB2",0x75BE],
+  ["AF58",0x75BF],
+  ["AF59",0x75C0],
+  ["AF5A",0x75C1],
+  ["F0E8",0x75C2],
+  ["F0E7",0x75C3],
+  ["F0E4",0x75C4],
+  ["B2A1",0x75C5],
+  ["AF5B",0x75C6],
+  ["D6A2",0x75C7],
+  ["D3B8",0x75C8],
+  ["BEB7",0x75C9],
+  ["C8AC",0x75CA],
+  ["AF5C",0x75CB],
+  ["AF5D",0x75CC],
+  ["F0EA",0x75CD],
+  ["AF5E",0x75CE],
+  ["AF5F",0x75CF],
+  ["AF60",0x75D0],
+  ["AF61",0x75D1],
+  ["D1F7",0x75D2],
+  ["AF62",0x75D3],
+  ["D6CC",0x75D4],
+  ["BADB",0x75D5],
+  ["F0E9",0x75D6],
+  ["AF63",0x75D7],
+  ["B6BB",0x75D8],
+  ["AF64",0x75D9],
+  ["AF65",0x75DA],
+  ["CDB4",0x75DB],
+  ["AF66",0x75DC],
+  ["AF67",0x75DD],
+  ["C6A6",0x75DE],
+  ["AF68",0x75DF],
+  ["AF69",0x75E0],
+  ["AF6A",0x75E1],
+  ["C1A1",0x75E2],
+  ["F0EB",0x75E3],
+  ["F0EE",0x75E4],
+  ["AF6B",0x75E5],
+  ["F0ED",0x75E6],
+  ["F0F0",0x75E7],
+  ["F0EC",0x75E8],
+  ["AF6C",0x75E9],
+  ["BBBE",0x75EA],
+  ["F0EF",0x75EB],
+  ["AF6D",0x75EC],
+  ["AF6E",0x75ED],
+  ["AF6F",0x75EE],
+  ["AF70",0x75EF],
+  ["CCB5",0x75F0],
+  ["F0F2",0x75F1],
+  ["AF71",0x75F2],
+  ["AF72",0x75F3],
+  ["B3D5",0x75F4],
+  ["AF73",0x75F5],
+  ["AF74",0x75F6],
+  ["AF75",0x75F7],
+  ["AF76",0x75F8],
+  ["B1D4",0x75F9],
+  ["AF77",0x75FA],
+  ["AF78",0x75FB],
+  ["F0F3",0x75FC],
+  ["AF79",0x75FD],
+  ["AF7A",0x75FE],
+  ["F0F4",0x75FF],
+  ["F0F6",0x7600],
+  ["B4E1",0x7601],
+  ["AF7B",0x7602],
+  ["F0F1",0x7603],
+  ["AF7C",0x7604],
+  ["F0F7",0x7605],
+  ["AF7D",0x7606],
+  ["AF7E",0x7607],
+  ["AF80",0x7608],
+  ["AF81",0x7609],
+  ["F0FA",0x760A],
+  ["AF82",0x760B],
+  ["F0F8",0x760C],
+  ["AF83",0x760D],
+  ["AF84",0x760E],
+  ["AF85",0x760F],
+  ["F0F5",0x7610],
+  ["AF86",0x7611],
+  ["AF87",0x7612],
+  ["AF88",0x7613],
+  ["AF89",0x7614],
+  ["F0FD",0x7615],
+  ["AF8A",0x7616],
+  ["F0F9",0x7617],
+  ["F0FC",0x7618],
+  ["F0FE",0x7619],
+  ["AF8B",0x761A],
+  ["F1A1",0x761B],
+  ["AF8C",0x761C],
+  ["AF8D",0x761D],
+  ["AF8E",0x761E],
+  ["CEC1",0x761F],
+  ["F1A4",0x7620],
+  ["AF8F",0x7621],
+  ["F1A3",0x7622],
+  ["AF90",0x7623],
+  ["C1F6",0x7624],
+  ["F0FB",0x7625],
+  ["CADD",0x7626],
+  ["AF91",0x7627],
+  ["AF92",0x7628],
+  ["B4F1",0x7629],
+  ["B1F1",0x762A],
+  ["CCB1",0x762B],
+  ["AF93",0x762C],
+  ["F1A6",0x762D],
+  ["AF94",0x762E],
+  ["AF95",0x762F],
+  ["F1A7",0x7630],
+  ["AF96",0x7631],
+  ["AF97",0x7632],
+  ["F1AC",0x7633],
+  ["D5CE",0x7634],
+  ["F1A9",0x7635],
+  ["AF98",0x7636],
+  ["AF99",0x7637],
+  ["C8B3",0x7638],
+  ["AF9A",0x7639],
+  ["AF9B",0x763A],
+  ["AF9C",0x763B],
+  ["F1A2",0x763C],
+  ["AF9D",0x763D],
+  ["F1AB",0x763E],
+  ["F1A8",0x763F],
+  ["F1A5",0x7640],
+  ["AF9E",0x7641],
+  ["AF9F",0x7642],
+  ["F1AA",0x7643],
+  ["AFA0",0x7644],
+  ["B040",0x7645],
+  ["B041",0x7646],
+  ["B042",0x7647],
+  ["B043",0x7648],
+  ["B044",0x7649],
+  ["B045",0x764A],
+  ["B046",0x764B],
+  ["B0A9",0x764C],
+  ["F1AD",0x764D],
+  ["B047",0x764E],
+  ["B048",0x764F],
+  ["B049",0x7650],
+  ["B04A",0x7651],
+  ["B04B",0x7652],
+  ["B04C",0x7653],
+  ["F1AF",0x7654],
+  ["B04D",0x7655],
+  ["F1B1",0x7656],
+  ["B04E",0x7657],
+  ["B04F",0x7658],
+  ["B050",0x7659],
+  ["B051",0x765A],
+  ["B052",0x765B],
+  ["F1B0",0x765C],
+  ["B053",0x765D],
+  ["F1AE",0x765E],
+  ["B054",0x765F],
+  ["B055",0x7660],
+  ["B056",0x7661],
+  ["B057",0x7662],
+  ["D1A2",0x7663],
+  ["B058",0x7664],
+  ["B059",0x7665],
+  ["B05A",0x7666],
+  ["B05B",0x7667],
+  ["B05C",0x7668],
+  ["B05D",0x7669],
+  ["B05E",0x766A],
+  ["F1B2",0x766B],
+  ["B05F",0x766C],
+  ["B060",0x766D],
+  ["B061",0x766E],
+  ["F1B3",0x766F],
+  ["B062",0x7670],
+  ["B063",0x7671],
+  ["B064",0x7672],
+  ["B065",0x7673],
+  ["B066",0x7674],
+  ["B067",0x7675],
+  ["B068",0x7676],
+  ["B069",0x7677],
+  ["B9EF",0x7678],
+  ["B06A",0x7679],
+  ["B06B",0x767A],
+  ["B5C7",0x767B],
+  ["B06C",0x767C],
+  ["B0D7",0x767D],
+  ["B0D9",0x767E],
+  ["B06D",0x767F],
+  ["B06E",0x7680],
+  ["B06F",0x7681],
+  ["D4ED",0x7682],
+  ["B070",0x7683],
+  ["B5C4",0x7684],
+  ["B071",0x7685],
+  ["BDD4",0x7686],
+  ["BBCA",0x7687],
+  ["F0A7",0x7688],
+  ["B072",0x7689],
+  ["B073",0x768A],
+  ["B8DE",0x768B],
+  ["B074",0x768C],
+  ["B075",0x768D],
+  ["F0A8",0x768E],
+  ["B076",0x768F],
+  ["B077",0x7690],
+  ["B0A8",0x7691],
+  ["B078",0x7692],
+  ["F0A9",0x7693],
+  ["B079",0x7694],
+  ["B07A",0x7695],
+  ["CDEE",0x7696],
+  ["B07B",0x7697],
+  ["B07C",0x7698],
+  ["F0AA",0x7699],
+  ["B07D",0x769A],
+  ["B07E",0x769B],
+  ["B080",0x769C],
+  ["B081",0x769D],
+  ["B082",0x769E],
+  ["B083",0x769F],
+  ["B084",0x76A0],
+  ["B085",0x76A1],
+  ["B086",0x76A2],
+  ["B087",0x76A3],
+  ["F0AB",0x76A4],
+  ["B088",0x76A5],
+  ["B089",0x76A6],
+  ["B08A",0x76A7],
+  ["B08B",0x76A8],
+  ["B08C",0x76A9],
+  ["B08D",0x76AA],
+  ["B08E",0x76AB],
+  ["B08F",0x76AC],
+  ["B090",0x76AD],
+  ["C6A4",0x76AE],
+  ["B091",0x76AF],
+  ["B092",0x76B0],
+  ["D6E5",0x76B1],
+  ["F1E4",0x76B2],
+  ["B093",0x76B3],
+  ["F1E5",0x76B4],
+  ["B094",0x76B5],
+  ["B095",0x76B6],
+  ["B096",0x76B7],
+  ["B097",0x76B8],
+  ["B098",0x76B9],
+  ["B099",0x76BA],
+  ["B09A",0x76BB],
+  ["B09B",0x76BC],
+  ["B09C",0x76BD],
+  ["B09D",0x76BE],
+  ["C3F3",0x76BF],
+  ["B09E",0x76C0],
+  ["B09F",0x76C1],
+  ["D3DB",0x76C2],
+  ["B0A0",0x76C3],
+  ["B140",0x76C4],
+  ["D6D1",0x76C5],
+  ["C5E8",0x76C6],
+  ["B141",0x76C7],
+  ["D3AF",0x76C8],
+  ["B142",0x76C9],
+  ["D2E6",0x76CA],
+  ["B143",0x76CB],
+  ["B144",0x76CC],
+  ["EEC1",0x76CD],
+  ["B0BB",0x76CE],
+  ["D5B5",0x76CF],
+  ["D1CE",0x76D0],
+  ["BCE0",0x76D1],
+  ["BAD0",0x76D2],
+  ["B145",0x76D3],
+  ["BFF8",0x76D4],
+  ["B146",0x76D5],
+  ["B8C7",0x76D6],
+  ["B5C1",0x76D7],
+  ["C5CC",0x76D8],
+  ["B147",0x76D9],
+  ["B148",0x76DA],
+  ["CAA2",0x76DB],
+  ["B149",0x76DC],
+  ["B14A",0x76DD],
+  ["B14B",0x76DE],
+  ["C3CB",0x76DF],
+  ["B14C",0x76E0],
+  ["B14D",0x76E1],
+  ["B14E",0x76E2],
+  ["B14F",0x76E3],
+  ["B150",0x76E4],
+  ["EEC2",0x76E5],
+  ["B151",0x76E6],
+  ["B152",0x76E7],
+  ["B153",0x76E8],
+  ["B154",0x76E9],
+  ["B155",0x76EA],
+  ["B156",0x76EB],
+  ["B157",0x76EC],
+  ["B158",0x76ED],
+  ["C4BF",0x76EE],
+  ["B6A2",0x76EF],
+  ["B159",0x76F0],
+  ["EDEC",0x76F1],
+  ["C3A4",0x76F2],
+  ["B15A",0x76F3],
+  ["D6B1",0x76F4],
+  ["B15B",0x76F5],
+  ["B15C",0x76F6],
+  ["B15D",0x76F7],
+  ["CFE0",0x76F8],
+  ["EDEF",0x76F9],
+  ["B15E",0x76FA],
+  ["B15F",0x76FB],
+  ["C5CE",0x76FC],
+  ["B160",0x76FD],
+  ["B6DC",0x76FE],
+  ["B161",0x76FF],
+  ["B162",0x7700],
+  ["CAA1",0x7701],
+  ["B163",0x7702],
+  ["B164",0x7703],
+  ["EDED",0x7704],
+  ["B165",0x7705],
+  ["B166",0x7706],
+  ["EDF0",0x7707],
+  ["EDF1",0x7708],
+  ["C3BC",0x7709],
+  ["B167",0x770A],
+  ["BFB4",0x770B],
+  ["B168",0x770C],
+  ["EDEE",0x770D],
+  ["B169",0x770E],
+  ["B16A",0x770F],
+  ["B16B",0x7710],
+  ["B16C",0x7711],
+  ["B16D",0x7712],
+  ["B16E",0x7713],
+  ["B16F",0x7714],
+  ["B170",0x7715],
+  ["B171",0x7716],
+  ["B172",0x7717],
+  ["B173",0x7718],
+  ["EDF4",0x7719],
+  ["EDF2",0x771A],
+  ["B174",0x771B],
+  ["B175",0x771C],
+  ["B176",0x771D],
+  ["B177",0x771E],
+  ["D5E6",0x771F],
+  ["C3DF",0x7720],
+  ["B178",0x7721],
+  ["EDF3",0x7722],
+  ["B179",0x7723],
+  ["B17A",0x7724],
+  ["B17B",0x7725],
+  ["EDF6",0x7726],
+  ["B17C",0x7727],
+  ["D5A3",0x7728],
+  ["D1A3",0x7729],
+  ["B17D",0x772A],
+  ["B17E",0x772B],
+  ["B180",0x772C],
+  ["EDF5",0x772D],
+  ["B181",0x772E],
+  ["C3D0",0x772F],
+  ["B182",0x7730],
+  ["B183",0x7731],
+  ["B184",0x7732],
+  ["B185",0x7733],
+  ["B186",0x7734],
+  ["EDF7",0x7735],
+  ["BFF4",0x7736],
+  ["BEEC",0x7737],
+  ["EDF8",0x7738],
+  ["B187",0x7739],
+  ["CCF7",0x773A],
+  ["B188",0x773B],
+  ["D1DB",0x773C],
+  ["B189",0x773D],
+  ["B18A",0x773E],
+  ["B18B",0x773F],
+  ["D7C5",0x7740],
+  ["D5F6",0x7741],
+  ["B18C",0x7742],
+  ["EDFC",0x7743],
+  ["B18D",0x7744],
+  ["B18E",0x7745],
+  ["B18F",0x7746],
+  ["EDFB",0x7747],
+  ["B190",0x7748],
+  ["B191",0x7749],
+  ["B192",0x774A],
+  ["B193",0x774B],
+  ["B194",0x774C],
+  ["B195",0x774D],
+  ["B196",0x774E],
+  ["B197",0x774F],
+  ["EDF9",0x7750],
+  ["EDFA",0x7751],
+  ["B198",0x7752],
+  ["B199",0x7753],
+  ["B19A",0x7754],
+  ["B19B",0x7755],
+  ["B19C",0x7756],
+  ["B19D",0x7757],
+  ["B19E",0x7758],
+  ["B19F",0x7759],
+  ["EDFD",0x775A],
+  ["BEA6",0x775B],
+  ["B1A0",0x775C],
+  ["B240",0x775D],
+  ["B241",0x775E],
+  ["B242",0x775F],
+  ["B243",0x7760],
+  ["CBAF",0x7761],
+  ["EEA1",0x7762],
+  ["B6BD",0x7763],
+  ["B244",0x7764],
+  ["EEA2",0x7765],
+  ["C4C0",0x7766],
+  ["B245",0x7767],
+  ["EDFE",0x7768],
+  ["B246",0x7769],
+  ["B247",0x776A],
+  ["BDDE",0x776B],
+  ["B2C7",0x776C],
+  ["B248",0x776D],
+  ["B249",0x776E],
+  ["B24A",0x776F],
+  ["B24B",0x7770],
+  ["B24C",0x7771],
+  ["B24D",0x7772],
+  ["B24E",0x7773],
+  ["B24F",0x7774],
+  ["B250",0x7775],
+  ["B251",0x7776],
+  ["B252",0x7777],
+  ["B253",0x7778],
+  ["B6C3",0x7779],
+  ["B254",0x777A],
+  ["B255",0x777B],
+  ["B256",0x777C],
+  ["EEA5",0x777D],
+  ["D8BA",0x777E],
+  ["EEA3",0x777F],
+  ["EEA6",0x7780],
+  ["B257",0x7781],
+  ["B258",0x7782],
+  ["B259",0x7783],
+  ["C3E9",0x7784],
+  ["B3F2",0x7785],
+  ["B25A",0x7786],
+  ["B25B",0x7787],
+  ["B25C",0x7788],
+  ["B25D",0x7789],
+  ["B25E",0x778A],
+  ["B25F",0x778B],
+  ["EEA7",0x778C],
+  ["EEA4",0x778D],
+  ["CFB9",0x778E],
+  ["B260",0x778F],
+  ["B261",0x7790],
+  ["EEA8",0x7791],
+  ["C2F7",0x7792],
+  ["B262",0x7793],
+  ["B263",0x7794],
+  ["B264",0x7795],
+  ["B265",0x7796],
+  ["B266",0x7797],
+  ["B267",0x7798],
+  ["B268",0x7799],
+  ["B269",0x779A],
+  ["B26A",0x779B],
+  ["B26B",0x779C],
+  ["B26C",0x779D],
+  ["B26D",0x779E],
+  ["EEA9",0x779F],
+  ["EEAA",0x77A0],
+  ["B26E",0x77A1],
+  ["DEAB",0x77A2],
+  ["B26F",0x77A3],
+  ["B270",0x77A4],
+  ["C6B3",0x77A5],
+  ["B271",0x77A6],
+  ["C7C6",0x77A7],
+  ["B272",0x77A8],
+  ["D6F5",0x77A9],
+  ["B5C9",0x77AA],
+  ["B273",0x77AB],
+  ["CBB2",0x77AC],
+  ["B274",0x77AD],
+  ["B275",0x77AE],
+  ["B276",0x77AF],
+  ["EEAB",0x77B0],
+  ["B277",0x77B1],
+  ["B278",0x77B2],
+  ["CDAB",0x77B3],
+  ["B279",0x77B4],
+  ["EEAC",0x77B5],
+  ["B27A",0x77B6],
+  ["B27B",0x77B7],
+  ["B27C",0x77B8],
+  ["B27D",0x77B9],
+  ["B27E",0x77BA],
+  ["D5B0",0x77BB],
+  ["B280",0x77BC],
+  ["EEAD",0x77BD],
+  ["B281",0x77BE],
+  ["F6C4",0x77BF],
+  ["B282",0x77C0],
+  ["B283",0x77C1],
+  ["B284",0x77C2],
+  ["B285",0x77C3],
+  ["B286",0x77C4],
+  ["B287",0x77C5],
+  ["B288",0x77C6],
+  ["B289",0x77C7],
+  ["B28A",0x77C8],
+  ["B28B",0x77C9],
+  ["B28C",0x77CA],
+  ["B28D",0x77CB],
+  ["B28E",0x77CC],
+  ["DBC7",0x77CD],
+  ["B28F",0x77CE],
+  ["B290",0x77CF],
+  ["B291",0x77D0],
+  ["B292",0x77D1],
+  ["B293",0x77D2],
+  ["B294",0x77D3],
+  ["B295",0x77D4],
+  ["B296",0x77D5],
+  ["B297",0x77D6],
+  ["B4A3",0x77D7],
+  ["B298",0x77D8],
+  ["B299",0x77D9],
+  ["B29A",0x77DA],
+  ["C3AC",0x77DB],
+  ["F1E6",0x77DC],
+  ["B29B",0x77DD],
+  ["B29C",0x77DE],
+  ["B29D",0x77DF],
+  ["B29E",0x77E0],
+  ["B29F",0x77E1],
+  ["CAB8",0x77E2],
+  ["D2D3",0x77E3],
+  ["B2A0",0x77E4],
+  ["D6AA",0x77E5],
+  ["B340",0x77E6],
+  ["EFF2",0x77E7],
+  ["B341",0x77E8],
+  ["BED8",0x77E9],
+  ["B342",0x77EA],
+  ["BDC3",0x77EB],
+  ["EFF3",0x77EC],
+  ["B6CC",0x77ED],
+  ["B0AB",0x77EE],
+  ["B343",0x77EF],
+  ["B344",0x77F0],
+  ["B345",0x77F1],
+  ["B346",0x77F2],
+  ["CAAF",0x77F3],
+  ["B347",0x77F4],
+  ["B348",0x77F5],
+  ["EDB6",0x77F6],
+  ["B349",0x77F7],
+  ["EDB7",0x77F8],
+  ["B34A",0x77F9],
+  ["B34B",0x77FA],
+  ["B34C",0x77FB],
+  ["B34D",0x77FC],
+  ["CEF9",0x77FD],
+  ["B7AF",0x77FE],
+  ["BFF3",0x77FF],
+  ["EDB8",0x7800],
+  ["C2EB",0x7801],
+  ["C9B0",0x7802],
+  ["B34E",0x7803],
+  ["B34F",0x7804],
+  ["B350",0x7805],
+  ["B351",0x7806],
+  ["B352",0x7807],
+  ["B353",0x7808],
+  ["EDB9",0x7809],
+  ["B354",0x780A],
+  ["B355",0x780B],
+  ["C6F6",0x780C],
+  ["BFB3",0x780D],
+  ["B356",0x780E],
+  ["B357",0x780F],
+  ["B358",0x7810],
+  ["EDBC",0x7811],
+  ["C5F8",0x7812],
+  ["B359",0x7813],
+  ["D1D0",0x7814],
+  ["B35A",0x7815],
+  ["D7A9",0x7816],
+  ["EDBA",0x7817],
+  ["EDBB",0x7818],
+  ["B35B",0x7819],
+  ["D1E2",0x781A],
+  ["B35C",0x781B],
+  ["EDBF",0x781C],
+  ["EDC0",0x781D],
+  ["B35D",0x781E],
+  ["EDC4",0x781F],
+  ["B35E",0x7820],
+  ["B35F",0x7821],
+  ["B360",0x7822],
+  ["EDC8",0x7823],
+  ["B361",0x7824],
+  ["EDC6",0x7825],
+  ["EDCE",0x7826],
+  ["D5E8",0x7827],
+  ["B362",0x7828],
+  ["EDC9",0x7829],
+  ["B363",0x782A],
+  ["B364",0x782B],
+  ["EDC7",0x782C],
+  ["EDBE",0x782D],
+  ["B365",0x782E],
+  ["B366",0x782F],
+  ["C5E9",0x7830],
+  ["B367",0x7831],
+  ["B368",0x7832],
+  ["B369",0x7833],
+  ["C6C6",0x7834],
+  ["B36A",0x7835],
+  ["B36B",0x7836],
+  ["C9E9",0x7837],
+  ["D4D2",0x7838],
+  ["EDC1",0x7839],
+  ["EDC2",0x783A],
+  ["EDC3",0x783B],
+  ["EDC5",0x783C],
+  ["B36C",0x783D],
+  ["C0F9",0x783E],
+  ["B36D",0x783F],
+  ["B4A1",0x7840],
+  ["B36E",0x7841],
+  ["B36F",0x7842],
+  ["B370",0x7843],
+  ["B371",0x7844],
+  ["B9E8",0x7845],
+  ["B372",0x7846],
+  ["EDD0",0x7847],
+  ["B373",0x7848],
+  ["B374",0x7849],
+  ["B375",0x784A],
+  ["B376",0x784B],
+  ["EDD1",0x784C],
+  ["B377",0x784D],
+  ["EDCA",0x784E],
+  ["B378",0x784F],
+  ["EDCF",0x7850],
+  ["B379",0x7851],
+  ["CEF8",0x7852],
+  ["B37A",0x7853],
+  ["B37B",0x7854],
+  ["CBB6",0x7855],
+  ["EDCC",0x7856],
+  ["EDCD",0x7857],
+  ["B37C",0x7858],
+  ["B37D",0x7859],
+  ["B37E",0x785A],
+  ["B380",0x785B],
+  ["B381",0x785C],
+  ["CFF5",0x785D],
+  ["B382",0x785E],
+  ["B383",0x785F],
+  ["B384",0x7860],
+  ["B385",0x7861],
+  ["B386",0x7862],
+  ["B387",0x7863],
+  ["B388",0x7864],
+  ["B389",0x7865],
+  ["B38A",0x7866],
+  ["B38B",0x7867],
+  ["B38C",0x7868],
+  ["B38D",0x7869],
+  ["EDD2",0x786A],
+  ["C1F2",0x786B],
+  ["D3B2",0x786C],
+  ["EDCB",0x786D],
+  ["C8B7",0x786E],
+  ["B38E",0x786F],
+  ["B38F",0x7870],
+  ["B390",0x7871],
+  ["B391",0x7872],
+  ["B392",0x7873],
+  ["B393",0x7874],
+  ["B394",0x7875],
+  ["B395",0x7876],
+  ["BCEF",0x7877],
+  ["B396",0x7878],
+  ["B397",0x7879],
+  ["B398",0x787A],
+  ["B399",0x787B],
+  ["C5F0",0x787C],
+  ["B39A",0x787D],
+  ["B39B",0x787E],
+  ["B39C",0x787F],
+  ["B39D",0x7880],
+  ["B39E",0x7881],
+  ["B39F",0x7882],
+  ["B3A0",0x7883],
+  ["B440",0x7884],
+  ["B441",0x7885],
+  ["B442",0x7886],
+  ["EDD6",0x7887],
+  ["B443",0x7888],
+  ["B5EF",0x7889],
+  ["B444",0x788A],
+  ["B445",0x788B],
+  ["C2B5",0x788C],
+  ["B0AD",0x788D],
+  ["CBE9",0x788E],
+  ["B446",0x788F],
+  ["B447",0x7890],
+  ["B1AE",0x7891],
+  ["B448",0x7892],
+  ["EDD4",0x7893],
+  ["B449",0x7894],
+  ["B44A",0x7895],
+  ["B44B",0x7896],
+  ["CDEB",0x7897],
+  ["B5E2",0x7898],
+  ["B44C",0x7899],
+  ["EDD5",0x789A],
+  ["EDD3",0x789B],
+  ["EDD7",0x789C],
+  ["B44D",0x789D],
+  ["B44E",0x789E],
+  ["B5FA",0x789F],
+  ["B44F",0x78A0],
+  ["EDD8",0x78A1],
+  ["B450",0x78A2],
+  ["EDD9",0x78A3],
+  ["B451",0x78A4],
+  ["EDDC",0x78A5],
+  ["B452",0x78A6],
+  ["B1CC",0x78A7],
+  ["B453",0x78A8],
+  ["B454",0x78A9],
+  ["B455",0x78AA],
+  ["B456",0x78AB],
+  ["B457",0x78AC],
+  ["B458",0x78AD],
+  ["B459",0x78AE],
+  ["B45A",0x78AF],
+  ["C5F6",0x78B0],
+  ["BCEE",0x78B1],
+  ["EDDA",0x78B2],
+  ["CCBC",0x78B3],
+  ["B2EA",0x78B4],
+  ["B45B",0x78B5],
+  ["B45C",0x78B6],
+  ["B45D",0x78B7],
+  ["B45E",0x78B8],
+  ["EDDB",0x78B9],
+  ["B45F",0x78BA],
+  ["B460",0x78BB],
+  ["B461",0x78BC],
+  ["B462",0x78BD],
+  ["C4EB",0x78BE],
+  ["B463",0x78BF],
+  ["B464",0x78C0],
+  ["B4C5",0x78C1],
+  ["B465",0x78C2],
+  ["B466",0x78C3],
+  ["B467",0x78C4],
+  ["B0F5",0x78C5],
+  ["B468",0x78C6],
+  ["B469",0x78C7],
+  ["B46A",0x78C8],
+  ["EDDF",0x78C9],
+  ["C0DA",0x78CA],
+  ["B4E8",0x78CB],
+  ["B46B",0x78CC],
+  ["B46C",0x78CD],
+  ["B46D",0x78CE],
+  ["B46E",0x78CF],
+  ["C5CD",0x78D0],
+  ["B46F",0x78D1],
+  ["B470",0x78D2],
+  ["B471",0x78D3],
+  ["EDDD",0x78D4],
+  ["BFC4",0x78D5],
+  ["B472",0x78D6],
+  ["B473",0x78D7],
+  ["B474",0x78D8],
+  ["EDDE",0x78D9],
+  ["B475",0x78DA],
+  ["B476",0x78DB],
+  ["B477",0x78DC],
+  ["B478",0x78DD],
+  ["B479",0x78DE],
+  ["B47A",0x78DF],
+  ["B47B",0x78E0],
+  ["B47C",0x78E1],
+  ["B47D",0x78E2],
+  ["B47E",0x78E3],
+  ["B480",0x78E4],
+  ["B481",0x78E5],
+  ["B482",0x78E6],
+  ["B483",0x78E7],
+  ["C4A5",0x78E8],
+  ["B484",0x78E9],
+  ["B485",0x78EA],
+  ["B486",0x78EB],
+  ["EDE0",0x78EC],
+  ["B487",0x78ED],
+  ["B488",0x78EE],
+  ["B489",0x78EF],
+  ["B48A",0x78F0],
+  ["B48B",0x78F1],
+  ["EDE1",0x78F2],
+  ["B48C",0x78F3],
+  ["EDE3",0x78F4],
+  ["B48D",0x78F5],
+  ["B48E",0x78F6],
+  ["C1D7",0x78F7],
+  ["B48F",0x78F8],
+  ["B490",0x78F9],
+  ["BBC7",0x78FA],
+  ["B491",0x78FB],
+  ["B492",0x78FC],
+  ["B493",0x78FD],
+  ["B494",0x78FE],
+  ["B495",0x78FF],
+  ["B496",0x7900],
+  ["BDB8",0x7901],
+  ["B497",0x7902],
+  ["B498",0x7903],
+  ["B499",0x7904],
+  ["EDE2",0x7905],
+  ["B49A",0x7906],
+  ["B49B",0x7907],
+  ["B49C",0x7908],
+  ["B49D",0x7909],
+  ["B49E",0x790A],
+  ["B49F",0x790B],
+  ["B4A0",0x790C],
+  ["B540",0x790D],
+  ["B541",0x790E],
+  ["B542",0x790F],
+  ["B543",0x7910],
+  ["B544",0x7911],
+  ["B545",0x7912],
+  ["EDE4",0x7913],
+  ["B546",0x7914],
+  ["B547",0x7915],
+  ["B548",0x7916],
+  ["B549",0x7917],
+  ["B54A",0x7918],
+  ["B54B",0x7919],
+  ["B54C",0x791A],
+  ["B54D",0x791B],
+  ["B54E",0x791C],
+  ["B54F",0x791D],
+  ["EDE6",0x791E],
+  ["B550",0x791F],
+  ["B551",0x7920],
+  ["B552",0x7921],
+  ["B553",0x7922],
+  ["B554",0x7923],
+  ["EDE5",0x7924],
+  ["B555",0x7925],
+  ["B556",0x7926],
+  ["B557",0x7927],
+  ["B558",0x7928],
+  ["B559",0x7929],
+  ["B55A",0x792A],
+  ["B55B",0x792B],
+  ["B55C",0x792C],
+  ["B55D",0x792D],
+  ["B55E",0x792E],
+  ["B55F",0x792F],
+  ["B560",0x7930],
+  ["B561",0x7931],
+  ["B562",0x7932],
+  ["B563",0x7933],
+  ["EDE7",0x7934],
+  ["B564",0x7935],
+  ["B565",0x7936],
+  ["B566",0x7937],
+  ["B567",0x7938],
+  ["B568",0x7939],
+  ["CABE",0x793A],
+  ["ECEA",0x793B],
+  ["C0F1",0x793C],
+  ["B569",0x793D],
+  ["C9E7",0x793E],
+  ["B56A",0x793F],
+  ["ECEB",0x7940],
+  ["C6EE",0x7941],
+  ["B56B",0x7942],
+  ["B56C",0x7943],
+  ["B56D",0x7944],
+  ["B56E",0x7945],
+  ["ECEC",0x7946],
+  ["B56F",0x7947],
+  ["C6ED",0x7948],
+  ["ECED",0x7949],
+  ["B570",0x794A],
+  ["B571",0x794B],
+  ["B572",0x794C],
+  ["B573",0x794D],
+  ["B574",0x794E],
+  ["B575",0x794F],
+  ["B576",0x7950],
+  ["B577",0x7951],
+  ["B578",0x7952],
+  ["ECF0",0x7953],
+  ["B579",0x7954],
+  ["B57A",0x7955],
+  ["D7E6",0x7956],
+  ["ECF3",0x7957],
+  ["B57B",0x7958],
+  ["B57C",0x7959],
+  ["ECF1",0x795A],
+  ["ECEE",0x795B],
+  ["ECEF",0x795C],
+  ["D7A3",0x795D],
+  ["C9F1",0x795E],
+  ["CBEE",0x795F],
+  ["ECF4",0x7960],
+  ["B57D",0x7961],
+  ["ECF2",0x7962],
+  ["B57E",0x7963],
+  ["B580",0x7964],
+  ["CFE9",0x7965],
+  ["B581",0x7966],
+  ["ECF6",0x7967],
+  ["C6B1",0x7968],
+  ["B582",0x7969],
+  ["B583",0x796A],
+  ["B584",0x796B],
+  ["B585",0x796C],
+  ["BCC0",0x796D],
+  ["B586",0x796E],
+  ["ECF5",0x796F],
+  ["B587",0x7970],
+  ["B588",0x7971],
+  ["B589",0x7972],
+  ["B58A",0x7973],
+  ["B58B",0x7974],
+  ["B58C",0x7975],
+  ["B58D",0x7976],
+  ["B5BB",0x7977],
+  ["BBF6",0x7978],
+  ["B58E",0x7979],
+  ["ECF7",0x797A],
+  ["B58F",0x797B],
+  ["B590",0x797C],
+  ["B591",0x797D],
+  ["B592",0x797E],
+  ["B593",0x797F],
+  ["D9F7",0x7980],
+  ["BDFB",0x7981],
+  ["B594",0x7982],
+  ["B595",0x7983],
+  ["C2BB",0x7984],
+  ["ECF8",0x7985],
+  ["B596",0x7986],
+  ["B597",0x7987],
+  ["B598",0x7988],
+  ["B599",0x7989],
+  ["ECF9",0x798A],
+  ["B59A",0x798B],
+  ["B59B",0x798C],
+  ["B59C",0x798D],
+  ["B59D",0x798E],
+  ["B8A3",0x798F],
+  ["B59E",0x7990],
+  ["B59F",0x7991],
+  ["B5A0",0x7992],
+  ["B640",0x7993],
+  ["B641",0x7994],
+  ["B642",0x7995],
+  ["B643",0x7996],
+  ["B644",0x7997],
+  ["B645",0x7998],
+  ["B646",0x7999],
+  ["ECFA",0x799A],
+  ["B647",0x799B],
+  ["B648",0x799C],
+  ["B649",0x799D],
+  ["B64A",0x799E],
+  ["B64B",0x799F],
+  ["B64C",0x79A0],
+  ["B64D",0x79A1],
+  ["B64E",0x79A2],
+  ["B64F",0x79A3],
+  ["B650",0x79A4],
+  ["B651",0x79A5],
+  ["B652",0x79A6],
+  ["ECFB",0x79A7],
+  ["B653",0x79A8],
+  ["B654",0x79A9],
+  ["B655",0x79AA],
+  ["B656",0x79AB],
+  ["B657",0x79AC],
+  ["B658",0x79AD],
+  ["B659",0x79AE],
+  ["B65A",0x79AF],
+  ["B65B",0x79B0],
+  ["B65C",0x79B1],
+  ["B65D",0x79B2],
+  ["ECFC",0x79B3],
+  ["B65E",0x79B4],
+  ["B65F",0x79B5],
+  ["B660",0x79B6],
+  ["B661",0x79B7],
+  ["B662",0x79B8],
+  ["D3ED",0x79B9],
+  ["D8AE",0x79BA],
+  ["C0EB",0x79BB],
+  ["B663",0x79BC],
+  ["C7DD",0x79BD],
+  ["BACC",0x79BE],
+  ["B664",0x79BF],
+  ["D0E3",0x79C0],
+  ["CBBD",0x79C1],
+  ["B665",0x79C2],
+  ["CDBA",0x79C3],
+  ["B666",0x79C4],
+  ["B667",0x79C5],
+  ["B8D1",0x79C6],
+  ["B668",0x79C7],
+  ["B669",0x79C8],
+  ["B1FC",0x79C9],
+  ["B66A",0x79CA],
+  ["C7EF",0x79CB],
+  ["B66B",0x79CC],
+  ["D6D6",0x79CD],
+  ["B66C",0x79CE],
+  ["B66D",0x79CF],
+  ["B66E",0x79D0],
+  ["BFC6",0x79D1],
+  ["C3EB",0x79D2],
+  ["B66F",0x79D3],
+  ["B670",0x79D4],
+  ["EFF5",0x79D5],
+  ["B671",0x79D6],
+  ["B672",0x79D7],
+  ["C3D8",0x79D8],
+  ["B673",0x79D9],
+  ["B674",0x79DA],
+  ["B675",0x79DB],
+  ["B676",0x79DC],
+  ["B677",0x79DD],
+  ["B678",0x79DE],
+  ["D7E2",0x79DF],
+  ["B679",0x79E0],
+  ["B67A",0x79E1],
+  ["B67B",0x79E2],
+  ["EFF7",0x79E3],
+  ["B3D3",0x79E4],
+  ["B67C",0x79E5],
+  ["C7D8",0x79E6],
+  ["D1ED",0x79E7],
+  ["B67D",0x79E8],
+  ["D6C8",0x79E9],
+  ["B67E",0x79EA],
+  ["EFF8",0x79EB],
+  ["B680",0x79EC],
+  ["EFF6",0x79ED],
+  ["B681",0x79EE],
+  ["BBFD",0x79EF],
+  ["B3C6",0x79F0],
+  ["B682",0x79F1],
+  ["B683",0x79F2],
+  ["B684",0x79F3],
+  ["B685",0x79F4],
+  ["B686",0x79F5],
+  ["B687",0x79F6],
+  ["B688",0x79F7],
+  ["BDD5",0x79F8],
+  ["B689",0x79F9],
+  ["B68A",0x79FA],
+  ["D2C6",0x79FB],
+  ["B68B",0x79FC],
+  ["BBE0",0x79FD],
+  ["B68C",0x79FE],
+  ["B68D",0x79FF],
+  ["CFA1",0x7A00],
+  ["B68E",0x7A01],
+  ["EFFC",0x7A02],
+  ["EFFB",0x7A03],
+  ["B68F",0x7A04],
+  ["B690",0x7A05],
+  ["EFF9",0x7A06],
+  ["B691",0x7A07],
+  ["B692",0x7A08],
+  ["B693",0x7A09],
+  ["B694",0x7A0A],
+  ["B3CC",0x7A0B],
+  ["B695",0x7A0C],
+  ["C9D4",0x7A0D],
+  ["CBB0",0x7A0E],
+  ["B696",0x7A0F],
+  ["B697",0x7A10],
+  ["B698",0x7A11],
+  ["B699",0x7A12],
+  ["B69A",0x7A13],
+  ["EFFE",0x7A14],
+  ["B69B",0x7A15],
+  ["B69C",0x7A16],
+  ["B0DE",0x7A17],
+  ["B69D",0x7A18],
+  ["B69E",0x7A19],
+  ["D6C9",0x7A1A],
+  ["B69F",0x7A1B],
+  ["B6A0",0x7A1C],
+  ["B740",0x7A1D],
+  ["EFFD",0x7A1E],
+  ["B741",0x7A1F],
+  ["B3ED",0x7A20],
+  ["B742",0x7A21],
+  ["B743",0x7A22],
+  ["F6D5",0x7A23],
+  ["B744",0x7A24],
+  ["B745",0x7A25],
+  ["B746",0x7A26],
+  ["B747",0x7A27],
+  ["B748",0x7A28],
+  ["B749",0x7A29],
+  ["B74A",0x7A2A],
+  ["B74B",0x7A2B],
+  ["B74C",0x7A2C],
+  ["B74D",0x7A2D],
+  ["B74E",0x7A2E],
+  ["B74F",0x7A2F],
+  ["B750",0x7A30],
+  ["B751",0x7A31],
+  ["B752",0x7A32],
+  ["CEC8",0x7A33],
+  ["B753",0x7A34],
+  ["B754",0x7A35],
+  ["B755",0x7A36],
+  ["F0A2",0x7A37],
+  ["B756",0x7A38],
+  ["F0A1",0x7A39],
+  ["B757",0x7A3A],
+  ["B5BE",0x7A3B],
+  ["BCDA",0x7A3C],
+  ["BBFC",0x7A3D],
+  ["B758",0x7A3E],
+  ["B8E5",0x7A3F],
+  ["B759",0x7A40],
+  ["B75A",0x7A41],
+  ["B75B",0x7A42],
+  ["B75C",0x7A43],
+  ["B75D",0x7A44],
+  ["B75E",0x7A45],
+  ["C4C2",0x7A46],
+  ["B75F",0x7A47],
+  ["B760",0x7A48],
+  ["B761",0x7A49],
+  ["B762",0x7A4A],
+  ["B763",0x7A4B],
+  ["B764",0x7A4C],
+  ["B765",0x7A4D],
+  ["B766",0x7A4E],
+  ["B767",0x7A4F],
+  ["B768",0x7A50],
+  ["F0A3",0x7A51],
+  ["B769",0x7A52],
+  ["B76A",0x7A53],
+  ["B76B",0x7A54],
+  ["B76C",0x7A55],
+  ["B76D",0x7A56],
+  ["CBEB",0x7A57],
+  ["B76E",0x7A58],
+  ["B76F",0x7A59],
+  ["B770",0x7A5A],
+  ["B771",0x7A5B],
+  ["B772",0x7A5C],
+  ["B773",0x7A5D],
+  ["B774",0x7A5E],
+  ["B775",0x7A5F],
+  ["B776",0x7A60],
+  ["B777",0x7A61],
+  ["B778",0x7A62],
+  ["B779",0x7A63],
+  ["B77A",0x7A64],
+  ["B77B",0x7A65],
+  ["B77C",0x7A66],
+  ["B77D",0x7A67],
+  ["B77E",0x7A68],
+  ["B780",0x7A69],
+  ["B781",0x7A6A],
+  ["B782",0x7A6B],
+  ["B783",0x7A6C],
+  ["B784",0x7A6D],
+  ["B785",0x7A6E],
+  ["B786",0x7A6F],
+  ["F0A6",0x7A70],
+  ["B787",0x7A71],
+  ["B788",0x7A72],
+  ["B789",0x7A73],
+  ["D1A8",0x7A74],
+  ["B78A",0x7A75],
+  ["BEBF",0x7A76],
+  ["C7EE",0x7A77],
+  ["F1B6",0x7A78],
+  ["F1B7",0x7A79],
+  ["BFD5",0x7A7A],
+  ["B78B",0x7A7B],
+  ["B78C",0x7A7C],
+  ["B78D",0x7A7D],
+  ["B78E",0x7A7E],
+  ["B4A9",0x7A7F],
+  ["F1B8",0x7A80],
+  ["CDBB",0x7A81],
+  ["B78F",0x7A82],
+  ["C7D4",0x7A83],
+  ["D5AD",0x7A84],
+  ["B790",0x7A85],
+  ["F1B9",0x7A86],
+  ["B791",0x7A87],
+  ["F1BA",0x7A88],
+  ["B792",0x7A89],
+  ["B793",0x7A8A],
+  ["B794",0x7A8B],
+  ["B795",0x7A8C],
+  ["C7CF",0x7A8D],
+  ["B796",0x7A8E],
+  ["B797",0x7A8F],
+  ["B798",0x7A90],
+  ["D2A4",0x7A91],
+  ["D6CF",0x7A92],
+  ["B799",0x7A93],
+  ["B79A",0x7A94],
+  ["F1BB",0x7A95],
+  ["BDD1",0x7A96],
+  ["B4B0",0x7A97],
+  ["BEBD",0x7A98],
+  ["B79B",0x7A99],
+  ["B79C",0x7A9A],
+  ["B79D",0x7A9B],
+  ["B4DC",0x7A9C],
+  ["CED1",0x7A9D],
+  ["B79E",0x7A9E],
+  ["BFDF",0x7A9F],
+  ["F1BD",0x7AA0],
+  ["B79F",0x7AA1],
+  ["B7A0",0x7AA2],
+  ["B840",0x7AA3],
+  ["B841",0x7AA4],
+  ["BFFA",0x7AA5],
+  ["F1BC",0x7AA6],
+  ["B842",0x7AA7],
+  ["F1BF",0x7AA8],
+  ["B843",0x7AA9],
+  ["B844",0x7AAA],
+  ["B845",0x7AAB],
+  ["F1BE",0x7AAC],
+  ["F1C0",0x7AAD],
+  ["B846",0x7AAE],
+  ["B847",0x7AAF],
+  ["B848",0x7AB0],
+  ["B849",0x7AB1],
+  ["B84A",0x7AB2],
+  ["F1C1",0x7AB3],
+  ["B84B",0x7AB4],
+  ["B84C",0x7AB5],
+  ["B84D",0x7AB6],
+  ["B84E",0x7AB7],
+  ["B84F",0x7AB8],
+  ["B850",0x7AB9],
+  ["B851",0x7ABA],
+  ["B852",0x7ABB],
+  ["B853",0x7ABC],
+  ["B854",0x7ABD],
+  ["B855",0x7ABE],
+  ["C1FE",0x7ABF],
+  ["B856",0x7AC0],
+  ["B857",0x7AC1],
+  ["B858",0x7AC2],
+  ["B859",0x7AC3],
+  ["B85A",0x7AC4],
+  ["B85B",0x7AC5],
+  ["B85C",0x7AC6],
+  ["B85D",0x7AC7],
+  ["B85E",0x7AC8],
+  ["B85F",0x7AC9],
+  ["B860",0x7ACA],
+  ["C1A2",0x7ACB],
+  ["B861",0x7ACC],
+  ["B862",0x7ACD],
+  ["B863",0x7ACE],
+  ["B864",0x7ACF],
+  ["B865",0x7AD0],
+  ["B866",0x7AD1],
+  ["B867",0x7AD2],
+  ["B868",0x7AD3],
+  ["B869",0x7AD4],
+  ["B86A",0x7AD5],
+  ["CAFA",0x7AD6],
+  ["B86B",0x7AD7],
+  ["B86C",0x7AD8],
+  ["D5BE",0x7AD9],
+  ["B86D",0x7ADA],
+  ["B86E",0x7ADB],
+  ["B86F",0x7ADC],
+  ["B870",0x7ADD],
+  ["BEBA",0x7ADE],
+  ["BEB9",0x7ADF],
+  ["D5C2",0x7AE0],
+  ["B871",0x7AE1],
+  ["B872",0x7AE2],
+  ["BFA2",0x7AE3],
+  ["B873",0x7AE4],
+  ["CDAF",0x7AE5],
+  ["F1B5",0x7AE6],
+  ["B874",0x7AE7],
+  ["B875",0x7AE8],
+  ["B876",0x7AE9],
+  ["B877",0x7AEA],
+  ["B878",0x7AEB],
+  ["B879",0x7AEC],
+  ["BDDF",0x7AED],
+  ["B87A",0x7AEE],
+  ["B6CB",0x7AEF],
+  ["B87B",0x7AF0],
+  ["B87C",0x7AF1],
+  ["B87D",0x7AF2],
+  ["B87E",0x7AF3],
+  ["B880",0x7AF4],
+  ["B881",0x7AF5],
+  ["B882",0x7AF6],
+  ["B883",0x7AF7],
+  ["B884",0x7AF8],
+  ["D6F1",0x7AF9],
+  ["F3C3",0x7AFA],
+  ["B885",0x7AFB],
+  ["B886",0x7AFC],
+  ["F3C4",0x7AFD],
+  ["B887",0x7AFE],
+  ["B8CD",0x7AFF],
+  ["B888",0x7B00],
+  ["B889",0x7B01],
+  ["B88A",0x7B02],
+  ["F3C6",0x7B03],
+  ["F3C7",0x7B04],
+  ["B88B",0x7B05],
+  ["B0CA",0x7B06],
+  ["B88C",0x7B07],
+  ["F3C5",0x7B08],
+  ["B88D",0x7B09],
+  ["F3C9",0x7B0A],
+  ["CBF1",0x7B0B],
+  ["B88E",0x7B0C],
+  ["B88F",0x7B0D],
+  ["B890",0x7B0E],
+  ["F3CB",0x7B0F],
+  ["B891",0x7B10],
+  ["D0A6",0x7B11],
+  ["B892",0x7B12],
+  ["B893",0x7B13],
+  ["B1CA",0x7B14],
+  ["F3C8",0x7B15],
+  ["B894",0x7B16],
+  ["B895",0x7B17],
+  ["B896",0x7B18],
+  ["F3CF",0x7B19],
+  ["B897",0x7B1A],
+  ["B5D1",0x7B1B],
+  ["B898",0x7B1C],
+  ["B899",0x7B1D],
+  ["F3D7",0x7B1E],
+  ["B89A",0x7B1F],
+  ["F3D2",0x7B20],
+  ["B89B",0x7B21],
+  ["B89C",0x7B22],
+  ["B89D",0x7B23],
+  ["F3D4",0x7B24],
+  ["F3D3",0x7B25],
+  ["B7FB",0x7B26],
+  ["B89E",0x7B27],
+  ["B1BF",0x7B28],
+  ["B89F",0x7B29],
+  ["F3CE",0x7B2A],
+  ["F3CA",0x7B2B],
+  ["B5DA",0x7B2C],
+  ["B8A0",0x7B2D],
+  ["F3D0",0x7B2E],
+  ["B940",0x7B2F],
+  ["B941",0x7B30],
+  ["F3D1",0x7B31],
+  ["B942",0x7B32],
+  ["F3D5",0x7B33],
+  ["B943",0x7B34],
+  ["B944",0x7B35],
+  ["B945",0x7B36],
+  ["B946",0x7B37],
+  ["F3CD",0x7B38],
+  ["B947",0x7B39],
+  ["BCE3",0x7B3A],
+  ["B948",0x7B3B],
+  ["C1FD",0x7B3C],
+  ["B949",0x7B3D],
+  ["F3D6",0x7B3E],
+  ["B94A",0x7B3F],
+  ["B94B",0x7B40],
+  ["B94C",0x7B41],
+  ["B94D",0x7B42],
+  ["B94E",0x7B43],
+  ["B94F",0x7B44],
+  ["F3DA",0x7B45],
+  ["B950",0x7B46],
+  ["F3CC",0x7B47],
+  ["B951",0x7B48],
+  ["B5C8",0x7B49],
+  ["B952",0x7B4A],
+  ["BDEE",0x7B4B],
+  ["F3DC",0x7B4C],
+  ["B953",0x7B4D],
+  ["B954",0x7B4E],
+  ["B7A4",0x7B4F],
+  ["BFF0",0x7B50],
+  ["D6FE",0x7B51],
+  ["CDB2",0x7B52],
+  ["B955",0x7B53],
+  ["B4F0",0x7B54],
+  ["B956",0x7B55],
+  ["B2DF",0x7B56],
+  ["B957",0x7B57],
+  ["F3D8",0x7B58],
+  ["B958",0x7B59],
+  ["F3D9",0x7B5A],
+  ["C9B8",0x7B5B],
+  ["B959",0x7B5C],
+  ["F3DD",0x7B5D],
+  ["B95A",0x7B5E],
+  ["B95B",0x7B5F],
+  ["F3DE",0x7B60],
+  ["B95C",0x7B61],
+  ["F3E1",0x7B62],
+  ["B95D",0x7B63],
+  ["B95E",0x7B64],
+  ["B95F",0x7B65],
+  ["B960",0x7B66],
+  ["B961",0x7B67],
+  ["B962",0x7B68],
+  ["B963",0x7B69],
+  ["B964",0x7B6A],
+  ["B965",0x7B6B],
+  ["B966",0x7B6C],
+  ["B967",0x7B6D],
+  ["F3DF",0x7B6E],
+  ["B968",0x7B6F],
+  ["B969",0x7B70],
+  ["F3E3",0x7B71],
+  ["F3E2",0x7B72],
+  ["B96A",0x7B73],
+  ["B96B",0x7B74],
+  ["F3DB",0x7B75],
+  ["B96C",0x7B76],
+  ["BFEA",0x7B77],
+  ["B96D",0x7B78],
+  ["B3EF",0x7B79],
+  ["B96E",0x7B7A],
+  ["F3E0",0x7B7B],
+  ["B96F",0x7B7C],
+  ["B970",0x7B7D],
+  ["C7A9",0x7B7E],
+  ["B971",0x7B7F],
+  ["BCF2",0x7B80],
+  ["B972",0x7B81],
+  ["B973",0x7B82],
+  ["B974",0x7B83],
+  ["B975",0x7B84],
+  ["F3EB",0x7B85],
+  ["B976",0x7B86],
+  ["B977",0x7B87],
+  ["B978",0x7B88],
+  ["B979",0x7B89],
+  ["B97A",0x7B8A],
+  ["B97B",0x7B8B],
+  ["B97C",0x7B8C],
+  ["B9BF",0x7B8D],
+  ["B97D",0x7B8E],
+  ["B97E",0x7B8F],
+  ["F3E4",0x7B90],
+  ["B980",0x7B91],
+  ["B981",0x7B92],
+  ["B982",0x7B93],
+  ["B2AD",0x7B94],
+  ["BBFE",0x7B95],
+  ["B983",0x7B96],
+  ["CBE3",0x7B97],
+  ["B984",0x7B98],
+  ["B985",0x7B99],
+  ["B986",0x7B9A],
+  ["B987",0x7B9B],
+  ["F3ED",0x7B9C],
+  ["F3E9",0x7B9D],
+  ["B988",0x7B9E],
+  ["B989",0x7B9F],
+  ["B98A",0x7BA0],
+  ["B9DC",0x7BA1],
+  ["F3EE",0x7BA2],
+  ["B98B",0x7BA3],
+  ["B98C",0x7BA4],
+  ["B98D",0x7BA5],
+  ["F3E5",0x7BA6],
+  ["F3E6",0x7BA7],
+  ["F3EA",0x7BA8],
+  ["C2E1",0x7BA9],
+  ["F3EC",0x7BAA],
+  ["F3EF",0x7BAB],
+  ["F3E8",0x7BAC],
+  ["BCFD",0x7BAD],
+  ["B98E",0x7BAE],
+  ["B98F",0x7BAF],
+  ["B990",0x7BB0],
+  ["CFE4",0x7BB1],
+  ["B991",0x7BB2],
+  ["B992",0x7BB3],
+  ["F3F0",0x7BB4],
+  ["B993",0x7BB5],
+  ["B994",0x7BB6],
+  ["B995",0x7BB7],
+  ["F3E7",0x7BB8],
+  ["B996",0x7BB9],
+  ["B997",0x7BBA],
+  ["B998",0x7BBB],
+  ["B999",0x7BBC],
+  ["B99A",0x7BBD],
+  ["B99B",0x7BBE],
+  ["B99C",0x7BBF],
+  ["B99D",0x7BC0],
+  ["F3F2",0x7BC1],
+  ["B99E",0x7BC2],
+  ["B99F",0x7BC3],
+  ["B9A0",0x7BC4],
+  ["BA40",0x7BC5],
+  ["D7AD",0x7BC6],
+  ["C6AA",0x7BC7],
+  ["BA41",0x7BC8],
+  ["BA42",0x7BC9],
+  ["BA43",0x7BCA],
+  ["BA44",0x7BCB],
+  ["F3F3",0x7BCC],
+  ["BA45",0x7BCD],
+  ["BA46",0x7BCE],
+  ["BA47",0x7BCF],
+  ["BA48",0x7BD0],
+  ["F3F1",0x7BD1],
+  ["BA49",0x7BD2],
+  ["C2A8",0x7BD3],
+  ["BA4A",0x7BD4],
+  ["BA4B",0x7BD5],
+  ["BA4C",0x7BD6],
+  ["BA4D",0x7BD7],
+  ["BA4E",0x7BD8],
+  ["B8DD",0x7BD9],
+  ["F3F5",0x7BDA],
+  ["BA4F",0x7BDB],
+  ["BA50",0x7BDC],
+  ["F3F4",0x7BDD],
+  ["BA51",0x7BDE],
+  ["BA52",0x7BDF],
+  ["BA53",0x7BE0],
+  ["B4DB",0x7BE1],
+  ["BA54",0x7BE2],
+  ["BA55",0x7BE3],
+  ["BA56",0x7BE4],
+  ["F3F6",0x7BE5],
+  ["F3F7",0x7BE6],
+  ["BA57",0x7BE7],
+  ["BA58",0x7BE8],
+  ["BA59",0x7BE9],
+  ["F3F8",0x7BEA],
+  ["BA5A",0x7BEB],
+  ["BA5B",0x7BEC],
+  ["BA5C",0x7BED],
+  ["C0BA",0x7BEE],
+  ["BA5D",0x7BEF],
+  ["BA5E",0x7BF0],
+  ["C0E9",0x7BF1],
+  ["BA5F",0x7BF2],
+  ["BA60",0x7BF3],
+  ["BA61",0x7BF4],
+  ["BA62",0x7BF5],
+  ["BA63",0x7BF6],
+  ["C5F1",0x7BF7],
+  ["BA64",0x7BF8],
+  ["BA65",0x7BF9],
+  ["BA66",0x7BFA],
+  ["BA67",0x7BFB],
+  ["F3FB",0x7BFC],
+  ["BA68",0x7BFD],
+  ["F3FA",0x7BFE],
+  ["BA69",0x7BFF],
+  ["BA6A",0x7C00],
+  ["BA6B",0x7C01],
+  ["BA6C",0x7C02],
+  ["BA6D",0x7C03],
+  ["BA6E",0x7C04],
+  ["BA6F",0x7C05],
+  ["BA70",0x7C06],
+  ["B4D8",0x7C07],
+  ["BA71",0x7C08],
+  ["BA72",0x7C09],
+  ["BA73",0x7C0A],
+  ["F3FE",0x7C0B],
+  ["F3F9",0x7C0C],
+  ["BA74",0x7C0D],
+  ["BA75",0x7C0E],
+  ["F3FC",0x7C0F],
+  ["BA76",0x7C10],
+  ["BA77",0x7C11],
+  ["BA78",0x7C12],
+  ["BA79",0x7C13],
+  ["BA7A",0x7C14],
+  ["BA7B",0x7C15],
+  ["F3FD",0x7C16],
+  ["BA7C",0x7C17],
+  ["BA7D",0x7C18],
+  ["BA7E",0x7C19],
+  ["BA80",0x7C1A],
+  ["BA81",0x7C1B],
+  ["BA82",0x7C1C],
+  ["BA83",0x7C1D],
+  ["BA84",0x7C1E],
+  ["F4A1",0x7C1F],
+  ["BA85",0x7C20],
+  ["BA86",0x7C21],
+  ["BA87",0x7C22],
+  ["BA88",0x7C23],
+  ["BA89",0x7C24],
+  ["BA8A",0x7C25],
+  ["F4A3",0x7C26],
+  ["BBC9",0x7C27],
+  ["BA8B",0x7C28],
+  ["BA8C",0x7C29],
+  ["F4A2",0x7C2A],
+  ["BA8D",0x7C2B],
+  ["BA8E",0x7C2C],
+  ["BA8F",0x7C2D],
+  ["BA90",0x7C2E],
+  ["BA91",0x7C2F],
+  ["BA92",0x7C30],
+  ["BA93",0x7C31],
+  ["BA94",0x7C32],
+  ["BA95",0x7C33],
+  ["BA96",0x7C34],
+  ["BA97",0x7C35],
+  ["BA98",0x7C36],
+  ["BA99",0x7C37],
+  ["F4A4",0x7C38],
+  ["BA9A",0x7C39],
+  ["BA9B",0x7C3A],
+  ["BA9C",0x7C3B],
+  ["BA9D",0x7C3C],
+  ["BA9E",0x7C3D],
+  ["BA9F",0x7C3E],
+  ["B2BE",0x7C3F],
+  ["F4A6",0x7C40],
+  ["F4A5",0x7C41],
+  ["BAA0",0x7C42],
+  ["BB40",0x7C43],
+  ["BB41",0x7C44],
+  ["BB42",0x7C45],
+  ["BB43",0x7C46],
+  ["BB44",0x7C47],
+  ["BB45",0x7C48],
+  ["BB46",0x7C49],
+  ["BB47",0x7C4A],
+  ["BB48",0x7C4B],
+  ["BB49",0x7C4C],
+  ["BCAE",0x7C4D],
+  ["BB4A",0x7C4E],
+  ["BB4B",0x7C4F],
+  ["BB4C",0x7C50],
+  ["BB4D",0x7C51],
+  ["BB4E",0x7C52],
+  ["BB4F",0x7C53],
+  ["BB50",0x7C54],
+  ["BB51",0x7C55],
+  ["BB52",0x7C56],
+  ["BB53",0x7C57],
+  ["BB54",0x7C58],
+  ["BB55",0x7C59],
+  ["BB56",0x7C5A],
+  ["BB57",0x7C5B],
+  ["BB58",0x7C5C],
+  ["BB59",0x7C5D],
+  ["BB5A",0x7C5E],
+  ["BB5B",0x7C5F],
+  ["BB5C",0x7C60],
+  ["BB5D",0x7C61],
+  ["BB5E",0x7C62],
+  ["BB5F",0x7C63],
+  ["BB60",0x7C64],
+  ["BB61",0x7C65],
+  ["BB62",0x7C66],
+  ["BB63",0x7C67],
+  ["BB64",0x7C68],
+  ["BB65",0x7C69],
+  ["BB66",0x7C6A],
+  ["BB67",0x7C6B],
+  ["BB68",0x7C6C],
+  ["BB69",0x7C6D],
+  ["BB6A",0x7C6E],
+  ["BB6B",0x7C6F],
+  ["BB6C",0x7C70],
+  ["BB6D",0x7C71],
+  ["BB6E",0x7C72],
+  ["C3D7",0x7C73],
+  ["D9E1",0x7C74],
+  ["BB6F",0x7C75],
+  ["BB70",0x7C76],
+  ["BB71",0x7C77],
+  ["BB72",0x7C78],
+  ["BB73",0x7C79],
+  ["BB74",0x7C7A],
+  ["C0E0",0x7C7B],
+  ["F4CC",0x7C7C],
+  ["D7D1",0x7C7D],
+  ["BB75",0x7C7E],
+  ["BB76",0x7C7F],
+  ["BB77",0x7C80],
+  ["BB78",0x7C81],
+  ["BB79",0x7C82],
+  ["BB7A",0x7C83],
+  ["BB7B",0x7C84],
+  ["BB7C",0x7C85],
+  ["BB7D",0x7C86],
+  ["BB7E",0x7C87],
+  ["BB80",0x7C88],
+  ["B7DB",0x7C89],
+  ["BB81",0x7C8A],
+  ["BB82",0x7C8B],
+  ["BB83",0x7C8C],
+  ["BB84",0x7C8D],
+  ["BB85",0x7C8E],
+  ["BB86",0x7C8F],
+  ["BB87",0x7C90],
+  ["F4CE",0x7C91],
+  ["C1A3",0x7C92],
+  ["BB88",0x7C93],
+  ["BB89",0x7C94],
+  ["C6C9",0x7C95],
+  ["BB8A",0x7C96],
+  ["B4D6",0x7C97],
+  ["D5B3",0x7C98],
+  ["BB8B",0x7C99],
+  ["BB8C",0x7C9A],
+  ["BB8D",0x7C9B],
+  ["F4D0",0x7C9C],
+  ["F4CF",0x7C9D],
+  ["F4D1",0x7C9E],
+  ["CBDA",0x7C9F],
+  ["BB8E",0x7CA0],
+  ["BB8F",0x7CA1],
+  ["F4D2",0x7CA2],
+  ["BB90",0x7CA3],
+  ["D4C1",0x7CA4],
+  ["D6E0",0x7CA5],
+  ["BB91",0x7CA6],
+  ["BB92",0x7CA7],
+  ["BB93",0x7CA8],
+  ["BB94",0x7CA9],
+  ["B7E0",0x7CAA],
+  ["BB95",0x7CAB],
+  ["BB96",0x7CAC],
+  ["BB97",0x7CAD],
+  ["C1B8",0x7CAE],
+  ["BB98",0x7CAF],
+  ["BB99",0x7CB0],
+  ["C1BB",0x7CB1],
+  ["F4D3",0x7CB2],
+  ["BEAC",0x7CB3],
+  ["BB9A",0x7CB4],
+  ["BB9B",0x7CB5],
+  ["BB9C",0x7CB6],
+  ["BB9D",0x7CB7],
+  ["BB9E",0x7CB8],
+  ["B4E2",0x7CB9],
+  ["BB9F",0x7CBA],
+  ["BBA0",0x7CBB],
+  ["F4D4",0x7CBC],
+  ["F4D5",0x7CBD],
+  ["BEAB",0x7CBE],
+  ["BC40",0x7CBF],
+  ["BC41",0x7CC0],
+  ["F4D6",0x7CC1],
+  ["BC42",0x7CC2],
+  ["BC43",0x7CC3],
+  ["BC44",0x7CC4],
+  ["F4DB",0x7CC5],
+  ["BC45",0x7CC6],
+  ["F4D7",0x7CC7],
+  ["F4DA",0x7CC8],
+  ["BC46",0x7CC9],
+  ["BAFD",0x7CCA],
+  ["BC47",0x7CCB],
+  ["F4D8",0x7CCC],
+  ["F4D9",0x7CCD],
+  ["BC48",0x7CCE],
+  ["BC49",0x7CCF],
+  ["BC4A",0x7CD0],
+  ["BC4B",0x7CD1],
+  ["BC4C",0x7CD2],
+  ["BC4D",0x7CD3],
+  ["BC4E",0x7CD4],
+  ["B8E2",0x7CD5],
+  ["CCC7",0x7CD6],
+  ["F4DC",0x7CD7],
+  ["BC4F",0x7CD8],
+  ["B2DA",0x7CD9],
+  ["BC50",0x7CDA],
+  ["BC51",0x7CDB],
+  ["C3D3",0x7CDC],
+  ["BC52",0x7CDD],
+  ["BC53",0x7CDE],
+  ["D4E3",0x7CDF],
+  ["BFB7",0x7CE0],
+  ["BC54",0x7CE1],
+  ["BC55",0x7CE2],
+  ["BC56",0x7CE3],
+  ["BC57",0x7CE4],
+  ["BC58",0x7CE5],
+  ["BC59",0x7CE6],
+  ["BC5A",0x7CE7],
+  ["F4DD",0x7CE8],
+  ["BC5B",0x7CE9],
+  ["BC5C",0x7CEA],
+  ["BC5D",0x7CEB],
+  ["BC5E",0x7CEC],
+  ["BC5F",0x7CED],
+  ["BC60",0x7CEE],
+  ["C5B4",0x7CEF],
+  ["BC61",0x7CF0],
+  ["BC62",0x7CF1],
+  ["BC63",0x7CF2],
+  ["BC64",0x7CF3],
+  ["BC65",0x7CF4],
+  ["BC66",0x7CF5],
+  ["BC67",0x7CF6],
+  ["BC68",0x7CF7],
+  ["F4E9",0x7CF8],
+  ["BC69",0x7CF9],
+  ["BC6A",0x7CFA],
+  ["CFB5",0x7CFB],
+  ["BC6B",0x7CFC],
+  ["BC6C",0x7CFD],
+  ["BC6D",0x7CFE],
+  ["BC6E",0x7CFF],
+  ["BC6F",0x7D00],
+  ["BC70",0x7D01],
+  ["BC71",0x7D02],
+  ["BC72",0x7D03],
+  ["BC73",0x7D04],
+  ["BC74",0x7D05],
+  ["BC75",0x7D06],
+  ["BC76",0x7D07],
+  ["BC77",0x7D08],
+  ["BC78",0x7D09],
+  ["CEC9",0x7D0A],
+  ["BC79",0x7D0B],
+  ["BC7A",0x7D0C],
+  ["BC7B",0x7D0D],
+  ["BC7C",0x7D0E],
+  ["BC7D",0x7D0F],
+  ["BC7E",0x7D10],
+  ["BC80",0x7D11],
+  ["BC81",0x7D12],
+  ["BC82",0x7D13],
+  ["BC83",0x7D14],
+  ["BC84",0x7D15],
+  ["BC85",0x7D16],
+  ["BC86",0x7D17],
+  ["BC87",0x7D18],
+  ["BC88",0x7D19],
+  ["BC89",0x7D1A],
+  ["BC8A",0x7D1B],
+  ["BC8B",0x7D1C],
+  ["BC8C",0x7D1D],
+  ["BC8D",0x7D1E],
+  ["BC8E",0x7D1F],
+  ["CBD8",0x7D20],
+  ["BC8F",0x7D21],
+  ["CBF7",0x7D22],
+  ["BC90",0x7D23],
+  ["BC91",0x7D24],
+  ["BC92",0x7D25],
+  ["BC93",0x7D26],
+  ["BDF4",0x7D27],
+  ["BC94",0x7D28],
+  ["BC95",0x7D29],
+  ["BC96",0x7D2A],
+  ["D7CF",0x7D2B],
+  ["BC97",0x7D2C],
+  ["BC98",0x7D2D],
+  ["BC99",0x7D2E],
+  ["C0DB",0x7D2F],
+  ["BC9A",0x7D30],
+  ["BC9B",0x7D31],
+  ["BC9C",0x7D32],
+  ["BC9D",0x7D33],
+  ["BC9E",0x7D34],
+  ["BC9F",0x7D35],
+  ["BCA0",0x7D36],
+  ["BD40",0x7D37],
+  ["BD41",0x7D38],
+  ["BD42",0x7D39],
+  ["BD43",0x7D3A],
+  ["BD44",0x7D3B],
+  ["BD45",0x7D3C],
+  ["BD46",0x7D3D],
+  ["BD47",0x7D3E],
+  ["BD48",0x7D3F],
+  ["BD49",0x7D40],
+  ["BD4A",0x7D41],
+  ["BD4B",0x7D42],
+  ["BD4C",0x7D43],
+  ["BD4D",0x7D44],
+  ["BD4E",0x7D45],
+  ["BD4F",0x7D46],
+  ["BD50",0x7D47],
+  ["BD51",0x7D48],
+  ["BD52",0x7D49],
+  ["BD53",0x7D4A],
+  ["BD54",0x7D4B],
+  ["BD55",0x7D4C],
+  ["BD56",0x7D4D],
+  ["BD57",0x7D4E],
+  ["BD58",0x7D4F],
+  ["BD59",0x7D50],
+  ["BD5A",0x7D51],
+  ["BD5B",0x7D52],
+  ["BD5C",0x7D53],
+  ["BD5D",0x7D54],
+  ["BD5E",0x7D55],
+  ["BD5F",0x7D56],
+  ["BD60",0x7D57],
+  ["BD61",0x7D58],
+  ["BD62",0x7D59],
+  ["BD63",0x7D5A],
+  ["BD64",0x7D5B],
+  ["BD65",0x7D5C],
+  ["BD66",0x7D5D],
+  ["BD67",0x7D5E],
+  ["BD68",0x7D5F],
+  ["BD69",0x7D60],
+  ["BD6A",0x7D61],
+  ["BD6B",0x7D62],
+  ["BD6C",0x7D63],
+  ["BD6D",0x7D64],
+  ["BD6E",0x7D65],
+  ["BD6F",0x7D66],
+  ["BD70",0x7D67],
+  ["BD71",0x7D68],
+  ["BD72",0x7D69],
+  ["BD73",0x7D6A],
+  ["BD74",0x7D6B],
+  ["BD75",0x7D6C],
+  ["BD76",0x7D6D],
+  ["D0F5",0x7D6E],
+  ["BD77",0x7D6F],
+  ["BD78",0x7D70],
+  ["BD79",0x7D71],
+  ["BD7A",0x7D72],
+  ["BD7B",0x7D73],
+  ["BD7C",0x7D74],
+  ["BD7D",0x7D75],
+  ["BD7E",0x7D76],
+  ["F4EA",0x7D77],
+  ["BD80",0x7D78],
+  ["BD81",0x7D79],
+  ["BD82",0x7D7A],
+  ["BD83",0x7D7B],
+  ["BD84",0x7D7C],
+  ["BD85",0x7D7D],
+  ["BD86",0x7D7E],
+  ["BD87",0x7D7F],
+  ["BD88",0x7D80],
+  ["BD89",0x7D81],
+  ["BD8A",0x7D82],
+  ["BD8B",0x7D83],
+  ["BD8C",0x7D84],
+  ["BD8D",0x7D85],
+  ["BD8E",0x7D86],
+  ["BD8F",0x7D87],
+  ["BD90",0x7D88],
+  ["BD91",0x7D89],
+  ["BD92",0x7D8A],
+  ["BD93",0x7D8B],
+  ["BD94",0x7D8C],
+  ["BD95",0x7D8D],
+  ["BD96",0x7D8E],
+  ["BD97",0x7D8F],
+  ["BD98",0x7D90],
+  ["BD99",0x7D91],
+  ["BD9A",0x7D92],
+  ["BD9B",0x7D93],
+  ["BD9C",0x7D94],
+  ["BD9D",0x7D95],
+  ["BD9E",0x7D96],
+  ["BD9F",0x7D97],
+  ["BDA0",0x7D98],
+  ["BE40",0x7D99],
+  ["BE41",0x7D9A],
+  ["BE42",0x7D9B],
+  ["BE43",0x7D9C],
+  ["BE44",0x7D9D],
+  ["BE45",0x7D9E],
+  ["BE46",0x7D9F],
+  ["BE47",0x7DA0],
+  ["BE48",0x7DA1],
+  ["BE49",0x7DA2],
+  ["BE4A",0x7DA3],
+  ["BE4B",0x7DA4],
+  ["BE4C",0x7DA5],
+  ["F4EB",0x7DA6],
+  ["BE4D",0x7DA7],
+  ["BE4E",0x7DA8],
+  ["BE4F",0x7DA9],
+  ["BE50",0x7DAA],
+  ["BE51",0x7DAB],
+  ["BE52",0x7DAC],
+  ["BE53",0x7DAD],
+  ["F4EC",0x7DAE],
+  ["BE54",0x7DAF],
+  ["BE55",0x7DB0],
+  ["BE56",0x7DB1],
+  ["BE57",0x7DB2],
+  ["BE58",0x7DB3],
+  ["BE59",0x7DB4],
+  ["BE5A",0x7DB5],
+  ["BE5B",0x7DB6],
+  ["BE5C",0x7DB7],
+  ["BE5D",0x7DB8],
+  ["BE5E",0x7DB9],
+  ["BE5F",0x7DBA],
+  ["BE60",0x7DBB],
+  ["BE61",0x7DBC],
+  ["BE62",0x7DBD],
+  ["BE63",0x7DBE],
+  ["BE64",0x7DBF],
+  ["BE65",0x7DC0],
+  ["BE66",0x7DC1],
+  ["BE67",0x7DC2],
+  ["BE68",0x7DC3],
+  ["BE69",0x7DC4],
+  ["BE6A",0x7DC5],
+  ["BE6B",0x7DC6],
+  ["BE6C",0x7DC7],
+  ["BE6D",0x7DC8],
+  ["BE6E",0x7DC9],
+  ["BE6F",0x7DCA],
+  ["BE70",0x7DCB],
+  ["BE71",0x7DCC],
+  ["BE72",0x7DCD],
+  ["BE73",0x7DCE],
+  ["BE74",0x7DCF],
+  ["BE75",0x7DD0],
+  ["BE76",0x7DD1],
+  ["BE77",0x7DD2],
+  ["BE78",0x7DD3],
+  ["BE79",0x7DD4],
+  ["BE7A",0x7DD5],
+  ["BE7B",0x7DD6],
+  ["BE7C",0x7DD7],
+  ["BE7D",0x7DD8],
+  ["BE7E",0x7DD9],
+  ["BE80",0x7DDA],
+  ["BE81",0x7DDB],
+  ["BE82",0x7DDC],
+  ["BE83",0x7DDD],
+  ["BE84",0x7DDE],
+  ["BE85",0x7DDF],
+  ["BE86",0x7DE0],
+  ["BE87",0x7DE1],
+  ["BE88",0x7DE2],
+  ["BE89",0x7DE3],
+  ["BE8A",0x7DE4],
+  ["BE8B",0x7DE5],
+  ["BE8C",0x7DE6],
+  ["BE8D",0x7DE7],
+  ["BE8E",0x7DE8],
+  ["BE8F",0x7DE9],
+  ["BE90",0x7DEA],
+  ["BE91",0x7DEB],
+  ["BE92",0x7DEC],
+  ["BE93",0x7DED],
+  ["BE94",0x7DEE],
+  ["BE95",0x7DEF],
+  ["BE96",0x7DF0],
+  ["BE97",0x7DF1],
+  ["BE98",0x7DF2],
+  ["BE99",0x7DF3],
+  ["BE9A",0x7DF4],
+  ["BE9B",0x7DF5],
+  ["BE9C",0x7DF6],
+  ["BE9D",0x7DF7],
+  ["BE9E",0x7DF8],
+  ["BE9F",0x7DF9],
+  ["BEA0",0x7DFA],
+  ["BF40",0x7DFB],
+  ["BF41",0x7DFC],
+  ["BF42",0x7DFD],
+  ["BF43",0x7DFE],
+  ["BF44",0x7DFF],
+  ["BF45",0x7E00],
+  ["BF46",0x7E01],
+  ["BF47",0x7E02],
+  ["BF48",0x7E03],
+  ["BF49",0x7E04],
+  ["BF4A",0x7E05],
+  ["BF4B",0x7E06],
+  ["BF4C",0x7E07],
+  ["BF4D",0x7E08],
+  ["BF4E",0x7E09],
+  ["BF4F",0x7E0A],
+  ["BF50",0x7E0B],
+  ["BF51",0x7E0C],
+  ["BF52",0x7E0D],
+  ["BF53",0x7E0E],
+  ["BF54",0x7E0F],
+  ["BF55",0x7E10],
+  ["BF56",0x7E11],
+  ["BF57",0x7E12],
+  ["BF58",0x7E13],
+  ["BF59",0x7E14],
+  ["BF5A",0x7E15],
+  ["BF5B",0x7E16],
+  ["BF5C",0x7E17],
+  ["BF5D",0x7E18],
+  ["BF5E",0x7E19],
+  ["BF5F",0x7E1A],
+  ["BF60",0x7E1B],
+  ["BF61",0x7E1C],
+  ["BF62",0x7E1D],
+  ["BF63",0x7E1E],
+  ["BF64",0x7E1F],
+  ["BF65",0x7E20],
+  ["BF66",0x7E21],
+  ["BF67",0x7E22],
+  ["BF68",0x7E23],
+  ["BF69",0x7E24],
+  ["BF6A",0x7E25],
+  ["BF6B",0x7E26],
+  ["BF6C",0x7E27],
+  ["BF6D",0x7E28],
+  ["BF6E",0x7E29],
+  ["BF6F",0x7E2A],
+  ["BF70",0x7E2B],
+  ["BF71",0x7E2C],
+  ["BF72",0x7E2D],
+  ["BF73",0x7E2E],
+  ["BF74",0x7E2F],
+  ["BF75",0x7E30],
+  ["BF76",0x7E31],
+  ["BF77",0x7E32],
+  ["BF78",0x7E33],
+  ["BF79",0x7E34],
+  ["BF7A",0x7E35],
+  ["BF7B",0x7E36],
+  ["BF7C",0x7E37],
+  ["BF7D",0x7E38],
+  ["BF7E",0x7E39],
+  ["BF80",0x7E3A],
+  ["F7E3",0x7E3B],
+  ["BF81",0x7E3C],
+  ["BF82",0x7E3D],
+  ["BF83",0x7E3E],
+  ["BF84",0x7E3F],
+  ["BF85",0x7E40],
+  ["B7B1",0x7E41],
+  ["BF86",0x7E42],
+  ["BF87",0x7E43],
+  ["BF88",0x7E44],
+  ["BF89",0x7E45],
+  ["BF8A",0x7E46],
+  ["F4ED",0x7E47],
+  ["BF8B",0x7E48],
+  ["BF8C",0x7E49],
+  ["BF8D",0x7E4A],
+  ["BF8E",0x7E4B],
+  ["BF8F",0x7E4C],
+  ["BF90",0x7E4D],
+  ["BF91",0x7E4E],
+  ["BF92",0x7E4F],
+  ["BF93",0x7E50],
+  ["BF94",0x7E51],
+  ["BF95",0x7E52],
+  ["BF96",0x7E53],
+  ["BF97",0x7E54],
+  ["BF98",0x7E55],
+  ["BF99",0x7E56],
+  ["BF9A",0x7E57],
+  ["BF9B",0x7E58],
+  ["BF9C",0x7E59],
+  ["BF9D",0x7E5A],
+  ["BF9E",0x7E5B],
+  ["BF9F",0x7E5C],
+  ["BFA0",0x7E5D],
+  ["C040",0x7E5E],
+  ["C041",0x7E5F],
+  ["C042",0x7E60],
+  ["C043",0x7E61],
+  ["C044",0x7E62],
+  ["C045",0x7E63],
+  ["C046",0x7E64],
+  ["C047",0x7E65],
+  ["C048",0x7E66],
+  ["C049",0x7E67],
+  ["C04A",0x7E68],
+  ["C04B",0x7E69],
+  ["C04C",0x7E6A],
+  ["C04D",0x7E6B],
+  ["C04E",0x7E6C],
+  ["C04F",0x7E6D],
+  ["C050",0x7E6E],
+  ["C051",0x7E6F],
+  ["C052",0x7E70],
+  ["C053",0x7E71],
+  ["C054",0x7E72],
+  ["C055",0x7E73],
+  ["C056",0x7E74],
+  ["C057",0x7E75],
+  ["C058",0x7E76],
+  ["C059",0x7E77],
+  ["C05A",0x7E78],
+  ["C05B",0x7E79],
+  ["C05C",0x7E7A],
+  ["C05D",0x7E7B],
+  ["C05E",0x7E7C],
+  ["C05F",0x7E7D],
+  ["C060",0x7E7E],
+  ["C061",0x7E7F],
+  ["C062",0x7E80],
+  ["C063",0x7E81],
+  ["D7EB",0x7E82],
+  ["C064",0x7E83],
+  ["C065",0x7E84],
+  ["C066",0x7E85],
+  ["C067",0x7E86],
+  ["C068",0x7E87],
+  ["C069",0x7E88],
+  ["C06A",0x7E89],
+  ["C06B",0x7E8A],
+  ["C06C",0x7E8B],
+  ["C06D",0x7E8C],
+  ["C06E",0x7E8D],
+  ["C06F",0x7E8E],
+  ["C070",0x7E8F],
+  ["C071",0x7E90],
+  ["C072",0x7E91],
+  ["C073",0x7E92],
+  ["C074",0x7E93],
+  ["C075",0x7E94],
+  ["C076",0x7E95],
+  ["C077",0x7E96],
+  ["C078",0x7E97],
+  ["C079",0x7E98],
+  ["C07A",0x7E99],
+  ["C07B",0x7E9A],
+  ["F4EE",0x7E9B],
+  ["C07C",0x7E9C],
+  ["C07D",0x7E9D],
+  ["C07E",0x7E9E],
+  ["E6F9",0x7E9F],
+  ["BEC0",0x7EA0],
+  ["E6FA",0x7EA1],
+  ["BAEC",0x7EA2],
+  ["E6FB",0x7EA3],
+  ["CFCB",0x7EA4],
+  ["E6FC",0x7EA5],
+  ["D4BC",0x7EA6],
+  ["BCB6",0x7EA7],
+  ["E6FD",0x7EA8],
+  ["E6FE",0x7EA9],
+  ["BCCD",0x7EAA],
+  ["C8D2",0x7EAB],
+  ["CEB3",0x7EAC],
+  ["E7A1",0x7EAD],
+  ["C080",0x7EAE],
+  ["B4BF",0x7EAF],
+  ["E7A2",0x7EB0],
+  ["C9B4",0x7EB1],
+  ["B8D9",0x7EB2],
+  ["C4C9",0x7EB3],
+  ["C081",0x7EB4],
+  ["D7DD",0x7EB5],
+  ["C2DA",0x7EB6],
+  ["B7D7",0x7EB7],
+  ["D6BD",0x7EB8],
+  ["CEC6",0x7EB9],
+  ["B7C4",0x7EBA],
+  ["C082",0x7EBB],
+  ["C083",0x7EBC],
+  ["C5A6",0x7EBD],
+  ["E7A3",0x7EBE],
+  ["CFDF",0x7EBF],
+  ["E7A4",0x7EC0],
+  ["E7A5",0x7EC1],
+  ["E7A6",0x7EC2],
+  ["C1B7",0x7EC3],
+  ["D7E9",0x7EC4],
+  ["C9F0",0x7EC5],
+  ["CFB8",0x7EC6],
+  ["D6AF",0x7EC7],
+  ["D6D5",0x7EC8],
+  ["E7A7",0x7EC9],
+  ["B0ED",0x7ECA],
+  ["E7A8",0x7ECB],
+  ["E7A9",0x7ECC],
+  ["C9DC",0x7ECD],
+  ["D2EF",0x7ECE],
+  ["BEAD",0x7ECF],
+  ["E7AA",0x7ED0],
+  ["B0F3",0x7ED1],
+  ["C8DE",0x7ED2],
+  ["BDE1",0x7ED3],
+  ["E7AB",0x7ED4],
+  ["C8C6",0x7ED5],
+  ["C084",0x7ED6],
+  ["E7AC",0x7ED7],
+  ["BBE6",0x7ED8],
+  ["B8F8",0x7ED9],
+  ["D1A4",0x7EDA],
+  ["E7AD",0x7EDB],
+  ["C2E7",0x7EDC],
+  ["BEF8",0x7EDD],
+  ["BDCA",0x7EDE],
+  ["CDB3",0x7EDF],
+  ["E7AE",0x7EE0],
+  ["E7AF",0x7EE1],
+  ["BEEE",0x7EE2],
+  ["D0E5",0x7EE3],
+  ["C085",0x7EE4],
+  ["CBE7",0x7EE5],
+  ["CCD0",0x7EE6],
+  ["BCCC",0x7EE7],
+  ["E7B0",0x7EE8],
+  ["BCA8",0x7EE9],
+  ["D0F7",0x7EEA],
+  ["E7B1",0x7EEB],
+  ["C086",0x7EEC],
+  ["D0F8",0x7EED],
+  ["E7B2",0x7EEE],
+  ["E7B3",0x7EEF],
+  ["B4C2",0x7EF0],
+  ["E7B4",0x7EF1],
+  ["E7B5",0x7EF2],
+  ["C9FE",0x7EF3],
+  ["CEAC",0x7EF4],
+  ["C3E0",0x7EF5],
+  ["E7B7",0x7EF6],
+  ["B1C1",0x7EF7],
+  ["B3F1",0x7EF8],
+  ["C087",0x7EF9],
+  ["E7B8",0x7EFA],
+  ["E7B9",0x7EFB],
+  ["D7DB",0x7EFC],
+  ["D5C0",0x7EFD],
+  ["E7BA",0x7EFE],
+  ["C2CC",0x7EFF],
+  ["D7BA",0x7F00],
+  ["E7BB",0x7F01],
+  ["E7BC",0x7F02],
+  ["E7BD",0x7F03],
+  ["BCEA",0x7F04],
+  ["C3E5",0x7F05],
+  ["C0C2",0x7F06],
+  ["E7BE",0x7F07],
+  ["E7BF",0x7F08],
+  ["BCA9",0x7F09],
+  ["C088",0x7F0A],
+  ["E7C0",0x7F0B],
+  ["E7C1",0x7F0C],
+  ["E7B6",0x7F0D],
+  ["B6D0",0x7F0E],
+  ["E7C2",0x7F0F],
+  ["C089",0x7F10],
+  ["E7C3",0x7F11],
+  ["E7C4",0x7F12],
+  ["BBBA",0x7F13],
+  ["B5DE",0x7F14],
+  ["C2C6",0x7F15],
+  ["B1E0",0x7F16],
+  ["E7C5",0x7F17],
+  ["D4B5",0x7F18],
+  ["E7C6",0x7F19],
+  ["B8BF",0x7F1A],
+  ["E7C8",0x7F1B],
+  ["E7C7",0x7F1C],
+  ["B7EC",0x7F1D],
+  ["C08A",0x7F1E],
+  ["E7C9",0x7F1F],
+  ["B2F8",0x7F20],
+  ["E7CA",0x7F21],
+  ["E7CB",0x7F22],
+  ["E7CC",0x7F23],
+  ["E7CD",0x7F24],
+  ["E7CE",0x7F25],
+  ["E7CF",0x7F26],
+  ["E7D0",0x7F27],
+  ["D3A7",0x7F28],
+  ["CBF5",0x7F29],
+  ["E7D1",0x7F2A],
+  ["E7D2",0x7F2B],
+  ["E7D3",0x7F2C],
+  ["E7D4",0x7F2D],
+  ["C9C9",0x7F2E],
+  ["E7D5",0x7F2F],
+  ["E7D6",0x7F30],
+  ["E7D7",0x7F31],
+  ["E7D8",0x7F32],
+  ["E7D9",0x7F33],
+  ["BDC9",0x7F34],
+  ["E7DA",0x7F35],
+  ["F3BE",0x7F36],
+  ["C08B",0x7F37],
+  ["B8D7",0x7F38],
+  ["C08C",0x7F39],
+  ["C8B1",0x7F3A],
+  ["C08D",0x7F3B],
+  ["C08E",0x7F3C],
+  ["C08F",0x7F3D],
+  ["C090",0x7F3E],
+  ["C091",0x7F3F],
+  ["C092",0x7F40],
+  ["C093",0x7F41],
+  ["F3BF",0x7F42],
+  ["C094",0x7F43],
+  ["F3C0",0x7F44],
+  ["F3C1",0x7F45],
+  ["C095",0x7F46],
+  ["C096",0x7F47],
+  ["C097",0x7F48],
+  ["C098",0x7F49],
+  ["C099",0x7F4A],
+  ["C09A",0x7F4B],
+  ["C09B",0x7F4C],
+  ["C09C",0x7F4D],
+  ["C09D",0x7F4E],
+  ["C09E",0x7F4F],
+  ["B9DE",0x7F50],
+  ["CDF8",0x7F51],
+  ["C09F",0x7F52],
+  ["C0A0",0x7F53],
+  ["D8E8",0x7F54],
+  ["BAB1",0x7F55],
+  ["C140",0x7F56],
+  ["C2DE",0x7F57],
+  ["EEB7",0x7F58],
+  ["C141",0x7F59],
+  ["B7A3",0x7F5A],
+  ["C142",0x7F5B],
+  ["C143",0x7F5C],
+  ["C144",0x7F5D],
+  ["C145",0x7F5E],
+  ["EEB9",0x7F5F],
+  ["C146",0x7F60],
+  ["EEB8",0x7F61],
+  ["B0D5",0x7F62],
+  ["C147",0x7F63],
+  ["C148",0x7F64],
+  ["C149",0x7F65],
+  ["C14A",0x7F66],
+  ["C14B",0x7F67],
+  ["EEBB",0x7F68],
+  ["D5D6",0x7F69],
+  ["D7EF",0x7F6A],
+  ["C14C",0x7F6B],
+  ["C14D",0x7F6C],
+  ["C14E",0x7F6D],
+  ["D6C3",0x7F6E],
+  ["C14F",0x7F6F],
+  ["C150",0x7F70],
+  ["EEBD",0x7F71],
+  ["CAF0",0x7F72],
+  ["C151",0x7F73],
+  ["EEBC",0x7F74],
+  ["C152",0x7F75],
+  ["C153",0x7F76],
+  ["C154",0x7F77],
+  ["C155",0x7F78],
+  ["EEBE",0x7F79],
+  ["C156",0x7F7A],
+  ["C157",0x7F7B],
+  ["C158",0x7F7C],
+  ["C159",0x7F7D],
+  ["EEC0",0x7F7E],
+  ["C15A",0x7F7F],
+  ["C15B",0x7F80],
+  ["EEBF",0x7F81],
+  ["C15C",0x7F82],
+  ["C15D",0x7F83],
+  ["C15E",0x7F84],
+  ["C15F",0x7F85],
+  ["C160",0x7F86],
+  ["C161",0x7F87],
+  ["C162",0x7F88],
+  ["C163",0x7F89],
+  ["D1F2",0x7F8A],
+  ["C164",0x7F8B],
+  ["C7BC",0x7F8C],
+  ["C165",0x7F8D],
+  ["C3C0",0x7F8E],
+  ["C166",0x7F8F],
+  ["C167",0x7F90],
+  ["C168",0x7F91],
+  ["C169",0x7F92],
+  ["C16A",0x7F93],
+  ["B8E1",0x7F94],
+  ["C16B",0x7F95],
+  ["C16C",0x7F96],
+  ["C16D",0x7F97],
+  ["C16E",0x7F98],
+  ["C16F",0x7F99],
+  ["C1E7",0x7F9A],
+  ["C170",0x7F9B],
+  ["C171",0x7F9C],
+  ["F4C6",0x7F9D],
+  ["D0DF",0x7F9E],
+  ["F4C7",0x7F9F],
+  ["C172",0x7FA0],
+  ["CFDB",0x7FA1],
+  ["C173",0x7FA2],
+  ["C174",0x7FA3],
+  ["C8BA",0x7FA4],
+  ["C175",0x7FA5],
+  ["C176",0x7FA6],
+  ["F4C8",0x7FA7],
+  ["C177",0x7FA8],
+  ["C178",0x7FA9],
+  ["C179",0x7FAA],
+  ["C17A",0x7FAB],
+  ["C17B",0x7FAC],
+  ["C17C",0x7FAD],
+  ["C17D",0x7FAE],
+  ["F4C9",0x7FAF],
+  ["F4CA",0x7FB0],
+  ["C17E",0x7FB1],
+  ["F4CB",0x7FB2],
+  ["C180",0x7FB3],
+  ["C181",0x7FB4],
+  ["C182",0x7FB5],
+  ["C183",0x7FB6],
+  ["C184",0x7FB7],
+  ["D9FA",0x7FB8],
+  ["B8FE",0x7FB9],
+  ["C185",0x7FBA],
+  ["C186",0x7FBB],
+  ["E5F1",0x7FBC],
+  ["D3F0",0x7FBD],
+  ["C187",0x7FBE],
+  ["F4E0",0x7FBF],
+  ["C188",0x7FC0],
+  ["CECC",0x7FC1],
+  ["C189",0x7FC2],
+  ["C18A",0x7FC3],
+  ["C18B",0x7FC4],
+  ["B3E1",0x7FC5],
+  ["C18C",0x7FC6],
+  ["C18D",0x7FC7],
+  ["C18E",0x7FC8],
+  ["C18F",0x7FC9],
+  ["F1B4",0x7FCA],
+  ["C190",0x7FCB],
+  ["D2EE",0x7FCC],
+  ["C191",0x7FCD],
+  ["F4E1",0x7FCE],
+  ["C192",0x7FCF],
+  ["C193",0x7FD0],
+  ["C194",0x7FD1],
+  ["C195",0x7FD2],
+  ["C196",0x7FD3],
+  ["CFE8",0x7FD4],
+  ["F4E2",0x7FD5],
+  ["C197",0x7FD6],
+  ["C198",0x7FD7],
+  ["C7CC",0x7FD8],
+  ["C199",0x7FD9],
+  ["C19A",0x7FDA],
+  ["C19B",0x7FDB],
+  ["C19C",0x7FDC],
+  ["C19D",0x7FDD],
+  ["C19E",0x7FDE],
+  ["B5D4",0x7FDF],
+  ["B4E4",0x7FE0],
+  ["F4E4",0x7FE1],
+  ["C19F",0x7FE2],
+  ["C1A0",0x7FE3],
+  ["C240",0x7FE4],
+  ["F4E3",0x7FE5],
+  ["F4E5",0x7FE6],
+  ["C241",0x7FE7],
+  ["C242",0x7FE8],
+  ["F4E6",0x7FE9],
+  ["C243",0x7FEA],
+  ["C244",0x7FEB],
+  ["C245",0x7FEC],
+  ["C246",0x7FED],
+  ["F4E7",0x7FEE],
+  ["C247",0x7FEF],
+  ["BAB2",0x7FF0],
+  ["B0BF",0x7FF1],
+  ["C248",0x7FF2],
+  ["F4E8",0x7FF3],
+  ["C249",0x7FF4],
+  ["C24A",0x7FF5],
+  ["C24B",0x7FF6],
+  ["C24C",0x7FF7],
+  ["C24D",0x7FF8],
+  ["C24E",0x7FF9],
+  ["C24F",0x7FFA],
+  ["B7AD",0x7FFB],
+  ["D2ED",0x7FFC],
+  ["C250",0x7FFD],
+  ["C251",0x7FFE],
+  ["C252",0x7FFF],
+  ["D2AB",0x8000],
+  ["C0CF",0x8001],
+  ["C253",0x8002],
+  ["BFBC",0x8003],
+  ["EBA3",0x8004],
+  ["D5DF",0x8005],
+  ["EAC8",0x8006],
+  ["C254",0x8007],
+  ["C255",0x8008],
+  ["C256",0x8009],
+  ["C257",0x800A],
+  ["F1F3",0x800B],
+  ["B6F8",0x800C],
+  ["CBA3",0x800D],
+  ["C258",0x800E],
+  ["C259",0x800F],
+  ["C4CD",0x8010],
+  ["C25A",0x8011],
+  ["F1E7",0x8012],
+  ["C25B",0x8013],
+  ["F1E8",0x8014],
+  ["B8FB",0x8015],
+  ["F1E9",0x8016],
+  ["BAC4",0x8017],
+  ["D4C5",0x8018],
+  ["B0D2",0x8019],
+  ["C25C",0x801A],
+  ["C25D",0x801B],
+  ["F1EA",0x801C],
+  ["C25E",0x801D],
+  ["C25F",0x801E],
+  ["C260",0x801F],
+  ["F1EB",0x8020],
+  ["C261",0x8021],
+  ["F1EC",0x8022],
+  ["C262",0x8023],
+  ["C263",0x8024],
+  ["F1ED",0x8025],
+  ["F1EE",0x8026],
+  ["F1EF",0x8027],
+  ["F1F1",0x8028],
+  ["F1F0",0x8029],
+  ["C5D5",0x802A],
+  ["C264",0x802B],
+  ["C265",0x802C],
+  ["C266",0x802D],
+  ["C267",0x802E],
+  ["C268",0x802F],
+  ["C269",0x8030],
+  ["F1F2",0x8031],
+  ["C26A",0x8032],
+  ["B6FA",0x8033],
+  ["C26B",0x8034],
+  ["F1F4",0x8035],
+  ["D2AE",0x8036],
+  ["DEC7",0x8037],
+  ["CBCA",0x8038],
+  ["C26C",0x8039],
+  ["C26D",0x803A],
+  ["B3DC",0x803B],
+  ["C26E",0x803C],
+  ["B5A2",0x803D],
+  ["C26F",0x803E],
+  ["B9A2",0x803F],
+  ["C270",0x8040],
+  ["C271",0x8041],
+  ["C4F4",0x8042],
+  ["F1F5",0x8043],
+  ["C272",0x8044],
+  ["C273",0x8045],
+  ["F1F6",0x8046],
+  ["C274",0x8047],
+  ["C275",0x8048],
+  ["C276",0x8049],
+  ["C1C4",0x804A],
+  ["C1FB",0x804B],
+  ["D6B0",0x804C],
+  ["F1F7",0x804D],
+  ["C277",0x804E],
+  ["C278",0x804F],
+  ["C279",0x8050],
+  ["C27A",0x8051],
+  ["F1F8",0x8052],
+  ["C27B",0x8053],
+  ["C1AA",0x8054],
+  ["C27C",0x8055],
+  ["C27D",0x8056],
+  ["C27E",0x8057],
+  ["C6B8",0x8058],
+  ["C280",0x8059],
+  ["BEDB",0x805A],
+  ["C281",0x805B],
+  ["C282",0x805C],
+  ["C283",0x805D],
+  ["C284",0x805E],
+  ["C285",0x805F],
+  ["C286",0x8060],
+  ["C287",0x8061],
+  ["C288",0x8062],
+  ["C289",0x8063],
+  ["C28A",0x8064],
+  ["C28B",0x8065],
+  ["C28C",0x8066],
+  ["C28D",0x8067],
+  ["C28E",0x8068],
+  ["F1F9",0x8069],
+  ["B4CF",0x806A],
+  ["C28F",0x806B],
+  ["C290",0x806C],
+  ["C291",0x806D],
+  ["C292",0x806E],
+  ["C293",0x806F],
+  ["C294",0x8070],
+  ["F1FA",0x8071],
+  ["C295",0x8072],
+  ["C296",0x8073],
+  ["C297",0x8074],
+  ["C298",0x8075],
+  ["C299",0x8076],
+  ["C29A",0x8077],
+  ["C29B",0x8078],
+  ["C29C",0x8079],
+  ["C29D",0x807A],
+  ["C29E",0x807B],
+  ["C29F",0x807C],
+  ["C2A0",0x807D],
+  ["C340",0x807E],
+  ["EDB2",0x807F],
+  ["EDB1",0x8080],
+  ["C341",0x8081],
+  ["C342",0x8082],
+  ["CBE0",0x8083],
+  ["D2DE",0x8084],
+  ["C343",0x8085],
+  ["CBC1",0x8086],
+  ["D5D8",0x8087],
+  ["C344",0x8088],
+  ["C8E2",0x8089],
+  ["C345",0x808A],
+  ["C0DF",0x808B],
+  ["BCA1",0x808C],
+  ["C346",0x808D],
+  ["C347",0x808E],
+  ["C348",0x808F],
+  ["C349",0x8090],
+  ["C34A",0x8091],
+  ["C34B",0x8092],
+  ["EBC1",0x8093],
+  ["C34C",0x8094],
+  ["C34D",0x8095],
+  ["D0A4",0x8096],
+  ["C34E",0x8097],
+  ["D6E2",0x8098],
+  ["C34F",0x8099],
+  ["B6C7",0x809A],
+  ["B8D8",0x809B],
+  ["EBC0",0x809C],
+  ["B8CE",0x809D],
+  ["C350",0x809E],
+  ["EBBF",0x809F],
+  ["B3A6",0x80A0],
+  ["B9C9",0x80A1],
+  ["D6AB",0x80A2],
+  ["C351",0x80A3],
+  ["B7F4",0x80A4],
+  ["B7CA",0x80A5],
+  ["C352",0x80A6],
+  ["C353",0x80A7],
+  ["C354",0x80A8],
+  ["BCE7",0x80A9],
+  ["B7BE",0x80AA],
+  ["EBC6",0x80AB],
+  ["C355",0x80AC],
+  ["EBC7",0x80AD],
+  ["B0B9",0x80AE],
+  ["BFCF",0x80AF],
+  ["C356",0x80B0],
+  ["EBC5",0x80B1],
+  ["D3FD",0x80B2],
+  ["C357",0x80B3],
+  ["EBC8",0x80B4],
+  ["C358",0x80B5],
+  ["C359",0x80B6],
+  ["EBC9",0x80B7],
+  ["C35A",0x80B8],
+  ["C35B",0x80B9],
+  ["B7CE",0x80BA],
+  ["C35C",0x80BB],
+  ["EBC2",0x80BC],
+  ["EBC4",0x80BD],
+  ["C9F6",0x80BE],
+  ["D6D7",0x80BF],
+  ["D5CD",0x80C0],
+  ["D0B2",0x80C1],
+  ["EBCF",0x80C2],
+  ["CEB8",0x80C3],
+  ["EBD0",0x80C4],
+  ["C35D",0x80C5],
+  ["B5A8",0x80C6],
+  ["C35E",0x80C7],
+  ["C35F",0x80C8],
+  ["C360",0x80C9],
+  ["C361",0x80CA],
+  ["C362",0x80CB],
+  ["B1B3",0x80CC],
+  ["EBD2",0x80CD],
+  ["CCA5",0x80CE],
+  ["C363",0x80CF],
+  ["C364",0x80D0],
+  ["C365",0x80D1],
+  ["C366",0x80D2],
+  ["C367",0x80D3],
+  ["C368",0x80D4],
+  ["C369",0x80D5],
+  ["C5D6",0x80D6],
+  ["EBD3",0x80D7],
+  ["C36A",0x80D8],
+  ["EBD1",0x80D9],
+  ["C5DF",0x80DA],
+  ["EBCE",0x80DB],
+  ["CAA4",0x80DC],
+  ["EBD5",0x80DD],
+  ["B0FB",0x80DE],
+  ["C36B",0x80DF],
+  ["C36C",0x80E0],
+  ["BAFA",0x80E1],
+  ["C36D",0x80E2],
+  ["C36E",0x80E3],
+  ["D8B7",0x80E4],
+  ["F1E3",0x80E5],
+  ["C36F",0x80E6],
+  ["EBCA",0x80E7],
+  ["EBCB",0x80E8],
+  ["EBCC",0x80E9],
+  ["EBCD",0x80EA],
+  ["EBD6",0x80EB],
+  ["E6C0",0x80EC],
+  ["EBD9",0x80ED],
+  ["C370",0x80EE],
+  ["BFE8",0x80EF],
+  ["D2C8",0x80F0],
+  ["EBD7",0x80F1],
+  ["EBDC",0x80F2],
+  ["B8EC",0x80F3],
+  ["EBD8",0x80F4],
+  ["C371",0x80F5],
+  ["BDBA",0x80F6],
+  ["C372",0x80F7],
+  ["D0D8",0x80F8],
+  ["C373",0x80F9],
+  ["B0B7",0x80FA],
+  ["C374",0x80FB],
+  ["EBDD",0x80FC],
+  ["C4DC",0x80FD],
+  ["C375",0x80FE],
+  ["C376",0x80FF],
+  ["C377",0x8100],
+  ["C378",0x8101],
+  ["D6AC",0x8102],
+  ["C379",0x8103],
+  ["C37A",0x8104],
+  ["C37B",0x8105],
+  ["B4E0",0x8106],
+  ["C37C",0x8107],
+  ["C37D",0x8108],
+  ["C2F6",0x8109],
+  ["BCB9",0x810A],
+  ["C37E",0x810B],
+  ["C380",0x810C],
+  ["EBDA",0x810D],
+  ["EBDB",0x810E],
+  ["D4E0",0x810F],
+  ["C6EA",0x8110],
+  ["C4D4",0x8111],
+  ["EBDF",0x8112],
+  ["C5A7",0x8113],
+  ["D9F5",0x8114],
+  ["C381",0x8115],
+  ["B2B1",0x8116],
+  ["C382",0x8117],
+  ["EBE4",0x8118],
+  ["C383",0x8119],
+  ["BDC5",0x811A],
+  ["C384",0x811B],
+  ["C385",0x811C],
+  ["C386",0x811D],
+  ["EBE2",0x811E],
+  ["C387",0x811F],
+  ["C388",0x8120],
+  ["C389",0x8121],
+  ["C38A",0x8122],
+  ["C38B",0x8123],
+  ["C38C",0x8124],
+  ["C38D",0x8125],
+  ["C38E",0x8126],
+  ["C38F",0x8127],
+  ["C390",0x8128],
+  ["C391",0x8129],
+  ["C392",0x812A],
+  ["C393",0x812B],
+  ["EBE3",0x812C],
+  ["C394",0x812D],
+  ["C395",0x812E],
+  ["B8AC",0x812F],
+  ["C396",0x8130],
+  ["CDD1",0x8131],
+  ["EBE5",0x8132],
+  ["C397",0x8133],
+  ["C398",0x8134],
+  ["C399",0x8135],
+  ["EBE1",0x8136],
+  ["C39A",0x8137],
+  ["C1B3",0x8138],
+  ["C39B",0x8139],
+  ["C39C",0x813A],
+  ["C39D",0x813B],
+  ["C39E",0x813C],
+  ["C39F",0x813D],
+  ["C6A2",0x813E],
+  ["C3A0",0x813F],
+  ["C440",0x8140],
+  ["C441",0x8141],
+  ["C442",0x8142],
+  ["C443",0x8143],
+  ["C444",0x8144],
+  ["C445",0x8145],
+  ["CCF3",0x8146],
+  ["C446",0x8147],
+  ["EBE6",0x8148],
+  ["C447",0x8149],
+  ["C0B0",0x814A],
+  ["D2B8",0x814B],
+  ["EBE7",0x814C],
+  ["C448",0x814D],
+  ["C449",0x814E],
+  ["C44A",0x814F],
+  ["B8AF",0x8150],
+  ["B8AD",0x8151],
+  ["C44B",0x8152],
+  ["EBE8",0x8153],
+  ["C7BB",0x8154],
+  ["CDF3",0x8155],
+  ["C44C",0x8156],
+  ["C44D",0x8157],
+  ["C44E",0x8158],
+  ["EBEA",0x8159],
+  ["EBEB",0x815A],
+  ["C44F",0x815B],
+  ["C450",0x815C],
+  ["C451",0x815D],
+  ["C452",0x815E],
+  ["C453",0x815F],
+  ["EBED",0x8160],
+  ["C454",0x8161],
+  ["C455",0x8162],
+  ["C456",0x8163],
+  ["C457",0x8164],
+  ["D0C8",0x8165],
+  ["C458",0x8166],
+  ["EBF2",0x8167],
+  ["C459",0x8168],
+  ["EBEE",0x8169],
+  ["C45A",0x816A],
+  ["C45B",0x816B],
+  ["C45C",0x816C],
+  ["EBF1",0x816D],
+  ["C8F9",0x816E],
+  ["C45D",0x816F],
+  ["D1FC",0x8170],
+  ["EBEC",0x8171],
+  ["C45E",0x8172],
+  ["C45F",0x8173],
+  ["EBE9",0x8174],
+  ["C460",0x8175],
+  ["C461",0x8176],
+  ["C462",0x8177],
+  ["C463",0x8178],
+  ["B8B9",0x8179],
+  ["CFD9",0x817A],
+  ["C4E5",0x817B],
+  ["EBEF",0x817C],
+  ["EBF0",0x817D],
+  ["CCDA",0x817E],
+  ["CDC8",0x817F],
+  ["B0F2",0x8180],
+  ["C464",0x8181],
+  ["EBF6",0x8182],
+  ["C465",0x8183],
+  ["C466",0x8184],
+  ["C467",0x8185],
+  ["C468",0x8186],
+  ["C469",0x8187],
+  ["EBF5",0x8188],
+  ["C46A",0x8189],
+  ["B2B2",0x818A],
+  ["C46B",0x818B],
+  ["C46C",0x818C],
+  ["C46D",0x818D],
+  ["C46E",0x818E],
+  ["B8E0",0x818F],
+  ["C46F",0x8190],
+  ["EBF7",0x8191],
+  ["C470",0x8192],
+  ["C471",0x8193],
+  ["C472",0x8194],
+  ["C473",0x8195],
+  ["C474",0x8196],
+  ["C475",0x8197],
+  ["B1EC",0x8198],
+  ["C476",0x8199],
+  ["C477",0x819A],
+  ["CCC5",0x819B],
+  ["C4A4",0x819C],
+  ["CFA5",0x819D],
+  ["C478",0x819E],
+  ["C479",0x819F],
+  ["C47A",0x81A0],
+  ["C47B",0x81A1],
+  ["C47C",0x81A2],
+  ["EBF9",0x81A3],
+  ["C47D",0x81A4],
+  ["C47E",0x81A5],
+  ["ECA2",0x81A6],
+  ["C480",0x81A7],
+  ["C5F2",0x81A8],
+  ["C481",0x81A9],
+  ["EBFA",0x81AA],
+  ["C482",0x81AB],
+  ["C483",0x81AC],
+  ["C484",0x81AD],
+  ["C485",0x81AE],
+  ["C486",0x81AF],
+  ["C487",0x81B0],
+  ["C488",0x81B1],
+  ["C489",0x81B2],
+  ["C9C5",0x81B3],
+  ["C48A",0x81B4],
+  ["C48B",0x81B5],
+  ["C48C",0x81B6],
+  ["C48D",0x81B7],
+  ["C48E",0x81B8],
+  ["C48F",0x81B9],
+  ["E2DF",0x81BA],
+  ["EBFE",0x81BB],
+  ["C490",0x81BC],
+  ["C491",0x81BD],
+  ["C492",0x81BE],
+  ["C493",0x81BF],
+  ["CDCE",0x81C0],
+  ["ECA1",0x81C1],
+  ["B1DB",0x81C2],
+  ["D3B7",0x81C3],
+  ["C494",0x81C4],
+  ["C495",0x81C5],
+  ["D2DC",0x81C6],
+  ["C496",0x81C7],
+  ["C497",0x81C8],
+  ["C498",0x81C9],
+  ["EBFD",0x81CA],
+  ["C499",0x81CB],
+  ["EBFB",0x81CC],
+  ["C49A",0x81CD],
+  ["C49B",0x81CE],
+  ["C49C",0x81CF],
+  ["C49D",0x81D0],
+  ["C49E",0x81D1],
+  ["C49F",0x81D2],
+  ["C4A0",0x81D3],
+  ["C540",0x81D4],
+  ["C541",0x81D5],
+  ["C542",0x81D6],
+  ["C543",0x81D7],
+  ["C544",0x81D8],
+  ["C545",0x81D9],
+  ["C546",0x81DA],
+  ["C547",0x81DB],
+  ["C548",0x81DC],
+  ["C549",0x81DD],
+  ["C54A",0x81DE],
+  ["C54B",0x81DF],
+  ["C54C",0x81E0],
+  ["C54D",0x81E1],
+  ["C54E",0x81E2],
+  ["B3BC",0x81E3],
+  ["C54F",0x81E4],
+  ["C550",0x81E5],
+  ["C551",0x81E6],
+  ["EAB0",0x81E7],
+  ["C552",0x81E8],
+  ["C553",0x81E9],
+  ["D7D4",0x81EA],
+  ["C554",0x81EB],
+  ["F4AB",0x81EC],
+  ["B3F4",0x81ED],
+  ["C555",0x81EE],
+  ["C556",0x81EF],
+  ["C557",0x81F0],
+  ["C558",0x81F1],
+  ["C559",0x81F2],
+  ["D6C1",0x81F3],
+  ["D6C2",0x81F4],
+  ["C55A",0x81F5],
+  ["C55B",0x81F6],
+  ["C55C",0x81F7],
+  ["C55D",0x81F8],
+  ["C55E",0x81F9],
+  ["C55F",0x81FA],
+  ["D5E9",0x81FB],
+  ["BECA",0x81FC],
+  ["C560",0x81FD],
+  ["F4A7",0x81FE],
+  ["C561",0x81FF],
+  ["D2A8",0x8200],
+  ["F4A8",0x8201],
+  ["F4A9",0x8202],
+  ["C562",0x8203],
+  ["F4AA",0x8204],
+  ["BECB",0x8205],
+  ["D3DF",0x8206],
+  ["C563",0x8207],
+  ["C564",0x8208],
+  ["C565",0x8209],
+  ["C566",0x820A],
+  ["C567",0x820B],
+  ["C9E0",0x820C],
+  ["C9E1",0x820D],
+  ["C568",0x820E],
+  ["C569",0x820F],
+  ["F3C2",0x8210],
+  ["C56A",0x8211],
+  ["CAE6",0x8212],
+  ["C56B",0x8213],
+  ["CCF2",0x8214],
+  ["C56C",0x8215],
+  ["C56D",0x8216],
+  ["C56E",0x8217],
+  ["C56F",0x8218],
+  ["C570",0x8219],
+  ["C571",0x821A],
+  ["E2B6",0x821B],
+  ["CBB4",0x821C],
+  ["C572",0x821D],
+  ["CEE8",0x821E],
+  ["D6DB",0x821F],
+  ["C573",0x8220],
+  ["F4AD",0x8221],
+  ["F4AE",0x8222],
+  ["F4AF",0x8223],
+  ["C574",0x8224],
+  ["C575",0x8225],
+  ["C576",0x8226],
+  ["C577",0x8227],
+  ["F4B2",0x8228],
+  ["C578",0x8229],
+  ["BABD",0x822A],
+  ["F4B3",0x822B],
+  ["B0E3",0x822C],
+  ["F4B0",0x822D],
+  ["C579",0x822E],
+  ["F4B1",0x822F],
+  ["BDA2",0x8230],
+  ["B2D5",0x8231],
+  ["C57A",0x8232],
+  ["F4B6",0x8233],
+  ["F4B7",0x8234],
+  ["B6E6",0x8235],
+  ["B2B0",0x8236],
+  ["CFCF",0x8237],
+  ["F4B4",0x8238],
+  ["B4AC",0x8239],
+  ["C57B",0x823A],
+  ["F4B5",0x823B],
+  ["C57C",0x823C],
+  ["C57D",0x823D],
+  ["F4B8",0x823E],
+  ["C57E",0x823F],
+  ["C580",0x8240],
+  ["C581",0x8241],
+  ["C582",0x8242],
+  ["C583",0x8243],
+  ["F4B9",0x8244],
+  ["C584",0x8245],
+  ["C585",0x8246],
+  ["CDA7",0x8247],
+  ["C586",0x8248],
+  ["F4BA",0x8249],
+  ["C587",0x824A],
+  ["F4BB",0x824B],
+  ["C588",0x824C],
+  ["C589",0x824D],
+  ["C58A",0x824E],
+  ["F4BC",0x824F],
+  ["C58B",0x8250],
+  ["C58C",0x8251],
+  ["C58D",0x8252],
+  ["C58E",0x8253],
+  ["C58F",0x8254],
+  ["C590",0x8255],
+  ["C591",0x8256],
+  ["C592",0x8257],
+  ["CBD2",0x8258],
+  ["C593",0x8259],
+  ["F4BD",0x825A],
+  ["C594",0x825B],
+  ["C595",0x825C],
+  ["C596",0x825D],
+  ["C597",0x825E],
+  ["F4BE",0x825F],
+  ["C598",0x8260],
+  ["C599",0x8261],
+  ["C59A",0x8262],
+  ["C59B",0x8263],
+  ["C59C",0x8264],
+  ["C59D",0x8265],
+  ["C59E",0x8266],
+  ["C59F",0x8267],
+  ["F4BF",0x8268],
+  ["C5A0",0x8269],
+  ["C640",0x826A],
+  ["C641",0x826B],
+  ["C642",0x826C],
+  ["C643",0x826D],
+  ["F4DE",0x826E],
+  ["C1BC",0x826F],
+  ["BCE8",0x8270],
+  ["C644",0x8271],
+  ["C9AB",0x8272],
+  ["D1DE",0x8273],
+  ["E5F5",0x8274],
+  ["C645",0x8275],
+  ["C646",0x8276],
+  ["C647",0x8277],
+  ["C648",0x8278],
+  ["DCB3",0x8279],
+  ["D2D5",0x827A],
+  ["C649",0x827B],
+  ["C64A",0x827C],
+  ["DCB4",0x827D],
+  ["B0AC",0x827E],
+  ["DCB5",0x827F],
+  ["C64B",0x8280],
+  ["C64C",0x8281],
+  ["BDDA",0x8282],
+  ["C64D",0x8283],
+  ["DCB9",0x8284],
+  ["C64E",0x8285],
+  ["C64F",0x8286],
+  ["C650",0x8287],
+  ["D8C2",0x8288],
+  ["C651",0x8289],
+  ["DCB7",0x828A],
+  ["D3F3",0x828B],
+  ["C652",0x828C],
+  ["C9D6",0x828D],
+  ["DCBA",0x828E],
+  ["DCB6",0x828F],
+  ["C653",0x8290],
+  ["DCBB",0x8291],
+  ["C3A2",0x8292],
+  ["C654",0x8293],
+  ["C655",0x8294],
+  ["C656",0x8295],
+  ["C657",0x8296],
+  ["DCBC",0x8297],
+  ["DCC5",0x8298],
+  ["DCBD",0x8299],
+  ["C658",0x829A],
+  ["C659",0x829B],
+  ["CEDF",0x829C],
+  ["D6A5",0x829D],
+  ["C65A",0x829E],
+  ["DCCF",0x829F],
+  ["C65B",0x82A0],
+  ["DCCD",0x82A1],
+  ["C65C",0x82A2],
+  ["C65D",0x82A3],
+  ["DCD2",0x82A4],
+  ["BDE6",0x82A5],
+  ["C2AB",0x82A6],
+  ["C65E",0x82A7],
+  ["DCB8",0x82A8],
+  ["DCCB",0x82A9],
+  ["DCCE",0x82AA],
+  ["DCBE",0x82AB],
+  ["B7D2",0x82AC],
+  ["B0C5",0x82AD],
+  ["DCC7",0x82AE],
+  ["D0BE",0x82AF],
+  ["DCC1",0x82B0],
+  ["BBA8",0x82B1],
+  ["C65F",0x82B2],
+  ["B7BC",0x82B3],
+  ["DCCC",0x82B4],
+  ["C660",0x82B5],
+  ["C661",0x82B6],
+  ["DCC6",0x82B7],
+  ["DCBF",0x82B8],
+  ["C7DB",0x82B9],
+  ["C662",0x82BA],
+  ["C663",0x82BB],
+  ["C664",0x82BC],
+  ["D1BF",0x82BD],
+  ["DCC0",0x82BE],
+  ["C665",0x82BF],
+  ["C666",0x82C0],
+  ["DCCA",0x82C1],
+  ["C667",0x82C2],
+  ["C668",0x82C3],
+  ["DCD0",0x82C4],
+  ["C669",0x82C5],
+  ["C66A",0x82C6],
+  ["CEAD",0x82C7],
+  ["DCC2",0x82C8],
+  ["C66B",0x82C9],
+  ["DCC3",0x82CA],
+  ["DCC8",0x82CB],
+  ["DCC9",0x82CC],
+  ["B2D4",0x82CD],
+  ["DCD1",0x82CE],
+  ["CBD5",0x82CF],
+  ["C66C",0x82D0],
+  ["D4B7",0x82D1],
+  ["DCDB",0x82D2],
+  ["DCDF",0x82D3],
+  ["CCA6",0x82D4],
+  ["DCE6",0x82D5],
+  ["C66D",0x82D6],
+  ["C3E7",0x82D7],
+  ["DCDC",0x82D8],
+  ["C66E",0x82D9],
+  ["C66F",0x82DA],
+  ["BFC1",0x82DB],
+  ["DCD9",0x82DC],
+  ["C670",0x82DD],
+  ["B0FA",0x82DE],
+  ["B9B6",0x82DF],
+  ["DCE5",0x82E0],
+  ["DCD3",0x82E1],
+  ["C671",0x82E2],
+  ["DCC4",0x82E3],
+  ["DCD6",0x82E4],
+  ["C8F4",0x82E5],
+  ["BFE0",0x82E6],
+  ["C672",0x82E7],
+  ["C673",0x82E8],
+  ["C674",0x82E9],
+  ["C675",0x82EA],
+  ["C9BB",0x82EB],
+  ["C676",0x82EC],
+  ["C677",0x82ED],
+  ["C678",0x82EE],
+  ["B1BD",0x82EF],
+  ["C679",0x82F0],
+  ["D3A2",0x82F1],
+  ["C67A",0x82F2],
+  ["C67B",0x82F3],
+  ["DCDA",0x82F4],
+  ["C67C",0x82F5],
+  ["C67D",0x82F6],
+  ["DCD5",0x82F7],
+  ["C67E",0x82F8],
+  ["C6BB",0x82F9],
+  ["C680",0x82FA],
+  ["DCDE",0x82FB],
+  ["C681",0x82FC],
+  ["C682",0x82FD],
+  ["C683",0x82FE],
+  ["C684",0x82FF],
+  ["C685",0x8300],
+  ["D7C2",0x8301],
+  ["C3AF",0x8302],
+  ["B7B6",0x8303],
+  ["C7D1",0x8304],
+  ["C3A9",0x8305],
+  ["DCE2",0x8306],
+  ["DCD8",0x8307],
+  ["DCEB",0x8308],
+  ["DCD4",0x8309],
+  ["C686",0x830A],
+  ["C687",0x830B],
+  ["DCDD",0x830C],
+  ["C688",0x830D],
+  ["BEA5",0x830E],
+  ["DCD7",0x830F],
+  ["C689",0x8310],
+  ["DCE0",0x8311],
+  ["C68A",0x8312],
+  ["C68B",0x8313],
+  ["DCE3",0x8314],
+  ["DCE4",0x8315],
+  ["C68C",0x8316],
+  ["DCF8",0x8317],
+  ["C68D",0x8318],
+  ["C68E",0x8319],
+  ["DCE1",0x831A],
+  ["DDA2",0x831B],
+  ["DCE7",0x831C],
+  ["C68F",0x831D],
+  ["C690",0x831E],
+  ["C691",0x831F],
+  ["C692",0x8320],
+  ["C693",0x8321],
+  ["C694",0x8322],
+  ["C695",0x8323],
+  ["C696",0x8324],
+  ["C697",0x8325],
+  ["C698",0x8326],
+  ["BCEB",0x8327],
+  ["B4C4",0x8328],
+  ["C699",0x8329],
+  ["C69A",0x832A],
+  ["C3A3",0x832B],
+  ["B2E7",0x832C],
+  ["DCFA",0x832D],
+  ["C69B",0x832E],
+  ["DCF2",0x832F],
+  ["C69C",0x8330],
+  ["DCEF",0x8331],
+  ["C69D",0x8332],
+  ["DCFC",0x8333],
+  ["DCEE",0x8334],
+  ["D2F0",0x8335],
+  ["B2E8",0x8336],
+  ["C69E",0x8337],
+  ["C8D7",0x8338],
+  ["C8E3",0x8339],
+  ["DCFB",0x833A],
+  ["C69F",0x833B],
+  ["DCED",0x833C],
+  ["C6A0",0x833D],
+  ["C740",0x833E],
+  ["C741",0x833F],
+  ["DCF7",0x8340],
+  ["C742",0x8341],
+  ["C743",0x8342],
+  ["DCF5",0x8343],
+  ["C744",0x8344],
+  ["C745",0x8345],
+  ["BEA3",0x8346],
+  ["DCF4",0x8347],
+  ["C746",0x8348],
+  ["B2DD",0x8349],
+  ["C747",0x834A],
+  ["C748",0x834B],
+  ["C749",0x834C],
+  ["C74A",0x834D],
+  ["C74B",0x834E],
+  ["DCF3",0x834F],
+  ["BCF6",0x8350],
+  ["DCE8",0x8351],
+  ["BBC4",0x8352],
+  ["C74C",0x8353],
+  ["C0F3",0x8354],
+  ["C74D",0x8355],
+  ["C74E",0x8356],
+  ["C74F",0x8357],
+  ["C750",0x8358],
+  ["C751",0x8359],
+  ["BCD4",0x835A],
+  ["DCE9",0x835B],
+  ["DCEA",0x835C],
+  ["C752",0x835D],
+  ["DCF1",0x835E],
+  ["DCF6",0x835F],
+  ["DCF9",0x8360],
+  ["B5B4",0x8361],
+  ["C753",0x8362],
+  ["C8D9",0x8363],
+  ["BBE7",0x8364],
+  ["DCFE",0x8365],
+  ["DCFD",0x8366],
+  ["D3AB",0x8367],
+  ["DDA1",0x8368],
+  ["DDA3",0x8369],
+  ["DDA5",0x836A],
+  ["D2F1",0x836B],
+  ["DDA4",0x836C],
+  ["DDA6",0x836D],
+  ["DDA7",0x836E],
+  ["D2A9",0x836F],
+  ["C754",0x8370],
+  ["C755",0x8371],
+  ["C756",0x8372],
+  ["C757",0x8373],
+  ["C758",0x8374],
+  ["C759",0x8375],
+  ["C75A",0x8376],
+  ["BAC9",0x8377],
+  ["DDA9",0x8378],
+  ["C75B",0x8379],
+  ["C75C",0x837A],
+  ["DDB6",0x837B],
+  ["DDB1",0x837C],
+  ["DDB4",0x837D],
+  ["C75D",0x837E],
+  ["C75E",0x837F],
+  ["C75F",0x8380],
+  ["C760",0x8381],
+  ["C761",0x8382],
+  ["C762",0x8383],
+  ["C763",0x8384],
+  ["DDB0",0x8385],
+  ["C6CE",0x8386],
+  ["C764",0x8387],
+  ["C765",0x8388],
+  ["C0F2",0x8389],
+  ["C766",0x838A],
+  ["C767",0x838B],
+  ["C768",0x838C],
+  ["C769",0x838D],
+  ["C9AF",0x838E],
+  ["C76A",0x838F],
+  ["C76B",0x8390],
+  ["C76C",0x8391],
+  ["DCEC",0x8392],
+  ["DDAE",0x8393],
+  ["C76D",0x8394],
+  ["C76E",0x8395],
+  ["C76F",0x8396],
+  ["C770",0x8397],
+  ["DDB7",0x8398],
+  ["C771",0x8399],
+  ["C772",0x839A],
+  ["DCF0",0x839B],
+  ["DDAF",0x839C],
+  ["C773",0x839D],
+  ["DDB8",0x839E],
+  ["C774",0x839F],
+  ["DDAC",0x83A0],
+  ["C775",0x83A1],
+  ["C776",0x83A2],
+  ["C777",0x83A3],
+  ["C778",0x83A4],
+  ["C779",0x83A5],
+  ["C77A",0x83A6],
+  ["C77B",0x83A7],
+  ["DDB9",0x83A8],
+  ["DDB3",0x83A9],
+  ["DDAD",0x83AA],
+  ["C4AA",0x83AB],
+  ["C77C",0x83AC],
+  ["C77D",0x83AD],
+  ["C77E",0x83AE],
+  ["C780",0x83AF],
+  ["DDA8",0x83B0],
+  ["C0B3",0x83B1],
+  ["C1AB",0x83B2],
+  ["DDAA",0x83B3],
+  ["DDAB",0x83B4],
+  ["C781",0x83B5],
+  ["DDB2",0x83B6],
+  ["BBF1",0x83B7],
+  ["DDB5",0x83B8],
+  ["D3A8",0x83B9],
+  ["DDBA",0x83BA],
+  ["C782",0x83BB],
+  ["DDBB",0x83BC],
+  ["C3A7",0x83BD],
+  ["C783",0x83BE],
+  ["C784",0x83BF],
+  ["DDD2",0x83C0],
+  ["DDBC",0x83C1],
+  ["C785",0x83C2],
+  ["C786",0x83C3],
+  ["C787",0x83C4],
+  ["DDD1",0x83C5],
+  ["C788",0x83C6],
+  ["B9BD",0x83C7],
+  ["C789",0x83C8],
+  ["C78A",0x83C9],
+  ["BED5",0x83CA],
+  ["C78B",0x83CB],
+  ["BEFA",0x83CC],
+  ["C78C",0x83CD],
+  ["C78D",0x83CE],
+  ["BACA",0x83CF],
+  ["C78E",0x83D0],
+  ["C78F",0x83D1],
+  ["C790",0x83D2],
+  ["C791",0x83D3],
+  ["DDCA",0x83D4],
+  ["C792",0x83D5],
+  ["DDC5",0x83D6],
+  ["C793",0x83D7],
+  ["DDBF",0x83D8],
+  ["C794",0x83D9],
+  ["C795",0x83DA],
+  ["C796",0x83DB],
+  ["B2CB",0x83DC],
+  ["DDC3",0x83DD],
+  ["C797",0x83DE],
+  ["DDCB",0x83DF],
+  ["B2A4",0x83E0],
+  ["DDD5",0x83E1],
+  ["C798",0x83E2],
+  ["C799",0x83E3],
+  ["C79A",0x83E4],
+  ["DDBE",0x83E5],
+  ["C79B",0x83E6],
+  ["C79C",0x83E7],
+  ["C79D",0x83E8],
+  ["C6D0",0x83E9],
+  ["DDD0",0x83EA],
+  ["C79E",0x83EB],
+  ["C79F",0x83EC],
+  ["C7A0",0x83ED],
+  ["C840",0x83EE],
+  ["C841",0x83EF],
+  ["DDD4",0x83F0],
+  ["C1E2",0x83F1],
+  ["B7C6",0x83F2],
+  ["C842",0x83F3],
+  ["C843",0x83F4],
+  ["C844",0x83F5],
+  ["C845",0x83F6],
+  ["C846",0x83F7],
+  ["DDCE",0x83F8],
+  ["DDCF",0x83F9],
+  ["C847",0x83FA],
+  ["C848",0x83FB],
+  ["C849",0x83FC],
+  ["DDC4",0x83FD],
+  ["C84A",0x83FE],
+  ["C84B",0x83FF],
+  ["C84C",0x8400],
+  ["DDBD",0x8401],
+  ["C84D",0x8402],
+  ["DDCD",0x8403],
+  ["CCD1",0x8404],
+  ["C84E",0x8405],
+  ["DDC9",0x8406],
+  ["C84F",0x8407],
+  ["C850",0x8408],
+  ["C851",0x8409],
+  ["C852",0x840A],
+  ["DDC2",0x840B],
+  ["C3C8",0x840C],
+  ["C6BC",0x840D],
+  ["CEAE",0x840E],
+  ["DDCC",0x840F],
+  ["C853",0x8410],
+  ["DDC8",0x8411],
+  ["C854",0x8412],
+  ["C855",0x8413],
+  ["C856",0x8414],
+  ["C857",0x8415],
+  ["C858",0x8416],
+  ["C859",0x8417],
+  ["DDC1",0x8418],
+  ["C85A",0x8419],
+  ["C85B",0x841A],
+  ["C85C",0x841B],
+  ["DDC6",0x841C],
+  ["C2DC",0x841D],
+  ["C85D",0x841E],
+  ["C85E",0x841F],
+  ["C85F",0x8420],
+  ["C860",0x8421],
+  ["C861",0x8422],
+  ["C862",0x8423],
+  ["D3A9",0x8424],
+  ["D3AA",0x8425],
+  ["DDD3",0x8426],
+  ["CFF4",0x8427],
+  ["C8F8",0x8428],
+  ["C863",0x8429],
+  ["C864",0x842A],
+  ["C865",0x842B],
+  ["C866",0x842C],
+  ["C867",0x842D],
+  ["C868",0x842E],
+  ["C869",0x842F],
+  ["C86A",0x8430],
+  ["DDE6",0x8431],
+  ["C86B",0x8432],
+  ["C86C",0x8433],
+  ["C86D",0x8434],
+  ["C86E",0x8435],
+  ["C86F",0x8436],
+  ["C870",0x8437],
+  ["DDC7",0x8438],
+  ["C871",0x8439],
+  ["C872",0x843A],
+  ["C873",0x843B],
+  ["DDE0",0x843C],
+  ["C2E4",0x843D],
+  ["C874",0x843E],
+  ["C875",0x843F],
+  ["C876",0x8440],
+  ["C877",0x8441],
+  ["C878",0x8442],
+  ["C879",0x8443],
+  ["C87A",0x8444],
+  ["C87B",0x8445],
+  ["DDE1",0x8446],
+  ["C87C",0x8447],
+  ["C87D",0x8448],
+  ["C87E",0x8449],
+  ["C880",0x844A],
+  ["C881",0x844B],
+  ["C882",0x844C],
+  ["C883",0x844D],
+  ["C884",0x844E],
+  ["C885",0x844F],
+  ["C886",0x8450],
+  ["DDD7",0x8451],
+  ["C887",0x8452],
+  ["C888",0x8453],
+  ["C889",0x8454],
+  ["C88A",0x8455],
+  ["C88B",0x8456],
+  ["D6F8",0x8457],
+  ["C88C",0x8458],
+  ["DDD9",0x8459],
+  ["DDD8",0x845A],
+  ["B8F0",0x845B],
+  ["DDD6",0x845C],
+  ["C88D",0x845D],
+  ["C88E",0x845E],
+  ["C88F",0x845F],
+  ["C890",0x8460],
+  ["C6CF",0x8461],
+  ["C891",0x8462],
+  ["B6AD",0x8463],
+  ["C892",0x8464],
+  ["C893",0x8465],
+  ["C894",0x8466],
+  ["C895",0x8467],
+  ["C896",0x8468],
+  ["DDE2",0x8469],
+  ["C897",0x846A],
+  ["BAF9",0x846B],
+  ["D4E1",0x846C],
+  ["DDE7",0x846D],
+  ["C898",0x846E],
+  ["C899",0x846F],
+  ["C89A",0x8470],
+  ["B4D0",0x8471],
+  ["C89B",0x8472],
+  ["DDDA",0x8473],
+  ["C89C",0x8474],
+  ["BFFB",0x8475],
+  ["DDE3",0x8476],
+  ["C89D",0x8477],
+  ["DDDF",0x8478],
+  ["C89E",0x8479],
+  ["DDDD",0x847A],
+  ["C89F",0x847B],
+  ["C8A0",0x847C],
+  ["C940",0x847D],
+  ["C941",0x847E],
+  ["C942",0x847F],
+  ["C943",0x8480],
+  ["C944",0x8481],
+  ["B5D9",0x8482],
+  ["C945",0x8483],
+  ["C946",0x8484],
+  ["C947",0x8485],
+  ["C948",0x8486],
+  ["DDDB",0x8487],
+  ["DDDC",0x8488],
+  ["DDDE",0x8489],
+  ["C949",0x848A],
+  ["BDAF",0x848B],
+  ["DDE4",0x848C],
+  ["C94A",0x848D],
+  ["DDE5",0x848E],
+  ["C94B",0x848F],
+  ["C94C",0x8490],
+  ["C94D",0x8491],
+  ["C94E",0x8492],
+  ["C94F",0x8493],
+  ["C950",0x8494],
+  ["C951",0x8495],
+  ["C952",0x8496],
+  ["DDF5",0x8497],
+  ["C953",0x8498],
+  ["C3C9",0x8499],
+  ["C954",0x849A],
+  ["C955",0x849B],
+  ["CBE2",0x849C],
+  ["C956",0x849D],
+  ["C957",0x849E],
+  ["C958",0x849F],
+  ["C959",0x84A0],
+  ["DDF2",0x84A1],
+  ["C95A",0x84A2],
+  ["C95B",0x84A3],
+  ["C95C",0x84A4],
+  ["C95D",0x84A5],
+  ["C95E",0x84A6],
+  ["C95F",0x84A7],
+  ["C960",0x84A8],
+  ["C961",0x84A9],
+  ["C962",0x84AA],
+  ["C963",0x84AB],
+  ["C964",0x84AC],
+  ["C965",0x84AD],
+  ["C966",0x84AE],
+  ["D8E1",0x84AF],
+  ["C967",0x84B0],
+  ["C968",0x84B1],
+  ["C6D1",0x84B2],
+  ["C969",0x84B3],
+  ["DDF4",0x84B4],
+  ["C96A",0x84B5],
+  ["C96B",0x84B6],
+  ["C96C",0x84B7],
+  ["D5F4",0x84B8],
+  ["DDF3",0x84B9],
+  ["DDF0",0x84BA],
+  ["C96D",0x84BB],
+  ["C96E",0x84BC],
+  ["DDEC",0x84BD],
+  ["C96F",0x84BE],
+  ["DDEF",0x84BF],
+  ["C970",0x84C0],
+  ["DDE8",0x84C1],
+  ["C971",0x84C2],
+  ["C972",0x84C3],
+  ["D0EE",0x84C4],
+  ["C973",0x84C5],
+  ["C974",0x84C6],
+  ["C975",0x84C7],
+  ["C976",0x84C8],
+  ["C8D8",0x84C9],
+  ["DDEE",0x84CA],
+  ["C977",0x84CB],
+  ["C978",0x84CC],
+  ["DDE9",0x84CD],
+  ["C979",0x84CE],
+  ["C97A",0x84CF],
+  ["DDEA",0x84D0],
+  ["CBF2",0x84D1],
+  ["C97B",0x84D2],
+  ["DDED",0x84D3],
+  ["C97C",0x84D4],
+  ["C97D",0x84D5],
+  ["B1CD",0x84D6],
+  ["C97E",0x84D7],
+  ["C980",0x84D8],
+  ["C981",0x84D9],
+  ["C982",0x84DA],
+  ["C983",0x84DB],
+  ["C984",0x84DC],
+  ["C0B6",0x84DD],
+  ["C985",0x84DE],
+  ["BCBB",0x84DF],
+  ["DDF1",0x84E0],
+  ["C986",0x84E1],
+  ["C987",0x84E2],
+  ["DDF7",0x84E3],
+  ["C988",0x84E4],
+  ["DDF6",0x84E5],
+  ["DDEB",0x84E6],
+  ["C989",0x84E7],
+  ["C98A",0x84E8],
+  ["C98B",0x84E9],
+  ["C98C",0x84EA],
+  ["C98D",0x84EB],
+  ["C5EE",0x84EC],
+  ["C98E",0x84ED],
+  ["C98F",0x84EE],
+  ["C990",0x84EF],
+  ["DDFB",0x84F0],
+  ["C991",0x84F1],
+  ["C992",0x84F2],
+  ["C993",0x84F3],
+  ["C994",0x84F4],
+  ["C995",0x84F5],
+  ["C996",0x84F6],
+  ["C997",0x84F7],
+  ["C998",0x84F8],
+  ["C999",0x84F9],
+  ["C99A",0x84FA],
+  ["C99B",0x84FB],
+  ["DEA4",0x84FC],
+  ["C99C",0x84FD],
+  ["C99D",0x84FE],
+  ["DEA3",0x84FF],
+  ["C99E",0x8500],
+  ["C99F",0x8501],
+  ["C9A0",0x8502],
+  ["CA40",0x8503],
+  ["CA41",0x8504],
+  ["CA42",0x8505],
+  ["CA43",0x8506],
+  ["CA44",0x8507],
+  ["CA45",0x8508],
+  ["CA46",0x8509],
+  ["CA47",0x850A],
+  ["CA48",0x850B],
+  ["DDF8",0x850C],
+  ["CA49",0x850D],
+  ["CA4A",0x850E],
+  ["CA4B",0x850F],
+  ["CA4C",0x8510],
+  ["C3EF",0x8511],
+  ["CA4D",0x8512],
+  ["C2FB",0x8513],
+  ["CA4E",0x8514],
+  ["CA4F",0x8515],
+  ["CA50",0x8516],
+  ["D5E1",0x8517],
+  ["CA51",0x8518],
+  ["CA52",0x8519],
+  ["CEB5",0x851A],
+  ["CA53",0x851B],
+  ["CA54",0x851C],
+  ["CA55",0x851D],
+  ["CA56",0x851E],
+  ["DDFD",0x851F],
+  ["CA57",0x8520],
+  ["B2CC",0x8521],
+  ["CA58",0x8522],
+  ["CA59",0x8523],
+  ["CA5A",0x8524],
+  ["CA5B",0x8525],
+  ["CA5C",0x8526],
+  ["CA5D",0x8527],
+  ["CA5E",0x8528],
+  ["CA5F",0x8529],
+  ["CA60",0x852A],
+  ["C4E8",0x852B],
+  ["CADF",0x852C],
+  ["CA61",0x852D],
+  ["CA62",0x852E],
+  ["CA63",0x852F],
+  ["CA64",0x8530],
+  ["CA65",0x8531],
+  ["CA66",0x8532],
+  ["CA67",0x8533],
+  ["CA68",0x8534],
+  ["CA69",0x8535],
+  ["CA6A",0x8536],
+  ["C7BE",0x8537],
+  ["DDFA",0x8538],
+  ["DDFC",0x8539],
+  ["DDFE",0x853A],
+  ["DEA2",0x853B],
+  ["B0AA",0x853C],
+  ["B1CE",0x853D],
+  ["CA6B",0x853E],
+  ["CA6C",0x853F],
+  ["CA6D",0x8540],
+  ["CA6E",0x8541],
+  ["CA6F",0x8542],
+  ["DEAC",0x8543],
+  ["CA70",0x8544],
+  ["CA71",0x8545],
+  ["CA72",0x8546],
+  ["CA73",0x8547],
+  ["DEA6",0x8548],
+  ["BDB6",0x8549],
+  ["C8EF",0x854A],
+  ["CA74",0x854B],
+  ["CA75",0x854C],
+  ["CA76",0x854D],
+  ["CA77",0x854E],
+  ["CA78",0x854F],
+  ["CA79",0x8550],
+  ["CA7A",0x8551],
+  ["CA7B",0x8552],
+  ["CA7C",0x8553],
+  ["CA7D",0x8554],
+  ["CA7E",0x8555],
+  ["DEA1",0x8556],
+  ["CA80",0x8557],
+  ["CA81",0x8558],
+  ["DEA5",0x8559],
+  ["CA82",0x855A],
+  ["CA83",0x855B],
+  ["CA84",0x855C],
+  ["CA85",0x855D],
+  ["DEA9",0x855E],
+  ["CA86",0x855F],
+  ["CA87",0x8560],
+  ["CA88",0x8561],
+  ["CA89",0x8562],
+  ["CA8A",0x8563],
+  ["DEA8",0x8564],
+  ["CA8B",0x8565],
+  ["CA8C",0x8566],
+  ["CA8D",0x8567],
+  ["DEA7",0x8568],
+  ["CA8E",0x8569],
+  ["CA8F",0x856A],
+  ["CA90",0x856B],
+  ["CA91",0x856C],
+  ["CA92",0x856D],
+  ["CA93",0x856E],
+  ["CA94",0x856F],
+  ["CA95",0x8570],
+  ["CA96",0x8571],
+  ["DEAD",0x8572],
+  ["CA97",0x8573],
+  ["D4CC",0x8574],
+  ["CA98",0x8575],
+  ["CA99",0x8576],
+  ["CA9A",0x8577],
+  ["CA9B",0x8578],
+  ["DEB3",0x8579],
+  ["DEAA",0x857A],
+  ["DEAE",0x857B],
+  ["CA9C",0x857C],
+  ["CA9D",0x857D],
+  ["C0D9",0x857E],
+  ["CA9E",0x857F],
+  ["CA9F",0x8580],
+  ["CAA0",0x8581],
+  ["CB40",0x8582],
+  ["CB41",0x8583],
+  ["B1A1",0x8584],
+  ["DEB6",0x8585],
+  ["CB42",0x8586],
+  ["DEB1",0x8587],
+  ["CB43",0x8588],
+  ["CB44",0x8589],
+  ["CB45",0x858A],
+  ["CB46",0x858B],
+  ["CB47",0x858C],
+  ["CB48",0x858D],
+  ["CB49",0x858E],
+  ["DEB2",0x858F],
+  ["CB4A",0x8590],
+  ["CB4B",0x8591],
+  ["CB4C",0x8592],
+  ["CB4D",0x8593],
+  ["CB4E",0x8594],
+  ["CB4F",0x8595],
+  ["CB50",0x8596],
+  ["CB51",0x8597],
+  ["CB52",0x8598],
+  ["CB53",0x8599],
+  ["CB54",0x859A],
+  ["D1A6",0x859B],
+  ["DEB5",0x859C],
+  ["CB55",0x859D],
+  ["CB56",0x859E],
+  ["CB57",0x859F],
+  ["CB58",0x85A0],
+  ["CB59",0x85A1],
+  ["CB5A",0x85A2],
+  ["CB5B",0x85A3],
+  ["DEAF",0x85A4],
+  ["CB5C",0x85A5],
+  ["CB5D",0x85A6],
+  ["CB5E",0x85A7],
+  ["DEB0",0x85A8],
+  ["CB5F",0x85A9],
+  ["D0BD",0x85AA],
+  ["CB60",0x85AB],
+  ["CB61",0x85AC],
+  ["CB62",0x85AD],
+  ["DEB4",0x85AE],
+  ["CAED",0x85AF],
+  ["DEB9",0x85B0],
+  ["CB63",0x85B1],
+  ["CB64",0x85B2],
+  ["CB65",0x85B3],
+  ["CB66",0x85B4],
+  ["CB67",0x85B5],
+  ["CB68",0x85B6],
+  ["DEB8",0x85B7],
+  ["CB69",0x85B8],
+  ["DEB7",0x85B9],
+  ["CB6A",0x85BA],
+  ["CB6B",0x85BB],
+  ["CB6C",0x85BC],
+  ["CB6D",0x85BD],
+  ["CB6E",0x85BE],
+  ["CB6F",0x85BF],
+  ["CB70",0x85C0],
+  ["DEBB",0x85C1],
+  ["CB71",0x85C2],
+  ["CB72",0x85C3],
+  ["CB73",0x85C4],
+  ["CB74",0x85C5],
+  ["CB75",0x85C6],
+  ["CB76",0x85C7],
+  ["CB77",0x85C8],
+  ["BDE5",0x85C9],
+  ["CB78",0x85CA],
+  ["CB79",0x85CB],
+  ["CB7A",0x85CC],
+  ["CB7B",0x85CD],
+  ["CB7C",0x85CE],
+  ["B2D8",0x85CF],
+  ["C3EA",0x85D0],
+  ["CB7D",0x85D1],
+  ["CB7E",0x85D2],
+  ["DEBA",0x85D3],
+  ["CB80",0x85D4],
+  ["C5BA",0x85D5],
+  ["CB81",0x85D6],
+  ["CB82",0x85D7],
+  ["CB83",0x85D8],
+  ["CB84",0x85D9],
+  ["CB85",0x85DA],
+  ["CB86",0x85DB],
+  ["DEBC",0x85DC],
+  ["CB87",0x85DD],
+  ["CB88",0x85DE],
+  ["CB89",0x85DF],
+  ["CB8A",0x85E0],
+  ["CB8B",0x85E1],
+  ["CB8C",0x85E2],
+  ["CB8D",0x85E3],
+  ["CCD9",0x85E4],
+  ["CB8E",0x85E5],
+  ["CB8F",0x85E6],
+  ["CB90",0x85E7],
+  ["CB91",0x85E8],
+  ["B7AA",0x85E9],
+  ["CB92",0x85EA],
+  ["CB93",0x85EB],
+  ["CB94",0x85EC],
+  ["CB95",0x85ED],
+  ["CB96",0x85EE],
+  ["CB97",0x85EF],
+  ["CB98",0x85F0],
+  ["CB99",0x85F1],
+  ["CB9A",0x85F2],
+  ["CB9B",0x85F3],
+  ["CB9C",0x85F4],
+  ["CB9D",0x85F5],
+  ["CB9E",0x85F6],
+  ["CB9F",0x85F7],
+  ["CBA0",0x85F8],
+  ["CC40",0x85F9],
+  ["CC41",0x85FA],
+  ["D4E5",0x85FB],
+  ["CC42",0x85FC],
+  ["CC43",0x85FD],
+  ["CC44",0x85FE],
+  ["DEBD",0x85FF],
+  ["CC45",0x8600],
+  ["CC46",0x8601],
+  ["CC47",0x8602],
+  ["CC48",0x8603],
+  ["CC49",0x8604],
+  ["DEBF",0x8605],
+  ["CC4A",0x8606],
+  ["CC4B",0x8607],
+  ["CC4C",0x8608],
+  ["CC4D",0x8609],
+  ["CC4E",0x860A],
+  ["CC4F",0x860B],
+  ["CC50",0x860C],
+  ["CC51",0x860D],
+  ["CC52",0x860E],
+  ["CC53",0x860F],
+  ["CC54",0x8610],
+  ["C4A2",0x8611],
+  ["CC55",0x8612],
+  ["CC56",0x8613],
+  ["CC57",0x8614],
+  ["CC58",0x8615],
+  ["DEC1",0x8616],
+  ["CC59",0x8617],
+  ["CC5A",0x8618],
+  ["CC5B",0x8619],
+  ["CC5C",0x861A],
+  ["CC5D",0x861B],
+  ["CC5E",0x861C],
+  ["CC5F",0x861D],
+  ["CC60",0x861E],
+  ["CC61",0x861F],
+  ["CC62",0x8620],
+  ["CC63",0x8621],
+  ["CC64",0x8622],
+  ["CC65",0x8623],
+  ["CC66",0x8624],
+  ["CC67",0x8625],
+  ["CC68",0x8626],
+  ["DEBE",0x8627],
+  ["CC69",0x8628],
+  ["DEC0",0x8629],
+  ["CC6A",0x862A],
+  ["CC6B",0x862B],
+  ["CC6C",0x862C],
+  ["CC6D",0x862D],
+  ["CC6E",0x862E],
+  ["CC6F",0x862F],
+  ["CC70",0x8630],
+  ["CC71",0x8631],
+  ["CC72",0x8632],
+  ["CC73",0x8633],
+  ["CC74",0x8634],
+  ["CC75",0x8635],
+  ["CC76",0x8636],
+  ["CC77",0x8637],
+  ["D5BA",0x8638],
+  ["CC78",0x8639],
+  ["CC79",0x863A],
+  ["CC7A",0x863B],
+  ["DEC2",0x863C],
+  ["CC7B",0x863D],
+  ["CC7C",0x863E],
+  ["CC7D",0x863F],
+  ["CC7E",0x8640],
+  ["CC80",0x8641],
+  ["CC81",0x8642],
+  ["CC82",0x8643],
+  ["CC83",0x8644],
+  ["CC84",0x8645],
+  ["CC85",0x8646],
+  ["CC86",0x8647],
+  ["CC87",0x8648],
+  ["CC88",0x8649],
+  ["CC89",0x864A],
+  ["CC8A",0x864B],
+  ["CC8B",0x864C],
+  ["F2AE",0x864D],
+  ["BBA2",0x864E],
+  ["C2B2",0x864F],
+  ["C5B0",0x8650],
+  ["C2C7",0x8651],
+  ["CC8C",0x8652],
+  ["CC8D",0x8653],
+  ["F2AF",0x8654],
+  ["CC8E",0x8655],
+  ["CC8F",0x8656],
+  ["CC90",0x8657],
+  ["CC91",0x8658],
+  ["CC92",0x8659],
+  ["D0E9",0x865A],
+  ["CC93",0x865B],
+  ["CC94",0x865C],
+  ["CC95",0x865D],
+  ["D3DD",0x865E],
+  ["CC96",0x865F],
+  ["CC97",0x8660],
+  ["CC98",0x8661],
+  ["EBBD",0x8662],
+  ["CC99",0x8663],
+  ["CC9A",0x8664],
+  ["CC9B",0x8665],
+  ["CC9C",0x8666],
+  ["CC9D",0x8667],
+  ["CC9E",0x8668],
+  ["CC9F",0x8669],
+  ["CCA0",0x866A],
+  ["B3E6",0x866B],
+  ["F2B0",0x866C],
+  ["CD40",0x866D],
+  ["F2B1",0x866E],
+  ["CD41",0x866F],
+  ["CD42",0x8670],
+  ["CAAD",0x8671],
+  ["CD43",0x8672],
+  ["CD44",0x8673],
+  ["CD45",0x8674],
+  ["CD46",0x8675],
+  ["CD47",0x8676],
+  ["CD48",0x8677],
+  ["CD49",0x8678],
+  ["BAE7",0x8679],
+  ["F2B3",0x867A],
+  ["F2B5",0x867B],
+  ["F2B4",0x867C],
+  ["CBE4",0x867D],
+  ["CFBA",0x867E],
+  ["F2B2",0x867F],
+  ["CAB4",0x8680],
+  ["D2CF",0x8681],
+  ["C2EC",0x8682],
+  ["CD4A",0x8683],
+  ["CD4B",0x8684],
+  ["CD4C",0x8685],
+  ["CD4D",0x8686],
+  ["CD4E",0x8687],
+  ["CD4F",0x8688],
+  ["CD50",0x8689],
+  ["CEC3",0x868A],
+  ["F2B8",0x868B],
+  ["B0F6",0x868C],
+  ["F2B7",0x868D],
+  ["CD51",0x868E],
+  ["CD52",0x868F],
+  ["CD53",0x8690],
+  ["CD54",0x8691],
+  ["CD55",0x8692],
+  ["F2BE",0x8693],
+  ["CD56",0x8694],
+  ["B2CF",0x8695],
+  ["CD57",0x8696],
+  ["CD58",0x8697],
+  ["CD59",0x8698],
+  ["CD5A",0x8699],
+  ["CD5B",0x869A],
+  ["CD5C",0x869B],
+  ["D1C1",0x869C],
+  ["F2BA",0x869D],
+  ["CD5D",0x869E],
+  ["CD5E",0x869F],
+  ["CD5F",0x86A0],
+  ["CD60",0x86A1],
+  ["CD61",0x86A2],
+  ["F2BC",0x86A3],
+  ["D4E9",0x86A4],
+  ["CD62",0x86A5],
+  ["CD63",0x86A6],
+  ["F2BB",0x86A7],
+  ["F2B6",0x86A8],
+  ["F2BF",0x86A9],
+  ["F2BD",0x86AA],
+  ["CD64",0x86AB],
+  ["F2B9",0x86AC],
+  ["CD65",0x86AD],
+  ["CD66",0x86AE],
+  ["F2C7",0x86AF],
+  ["F2C4",0x86B0],
+  ["F2C6",0x86B1],
+  ["CD67",0x86B2],
+  ["CD68",0x86B3],
+  ["F2CA",0x86B4],
+  ["F2C2",0x86B5],
+  ["F2C0",0x86B6],
+  ["CD69",0x86B7],
+  ["CD6A",0x86B8],
+  ["CD6B",0x86B9],
+  ["F2C5",0x86BA],
+  ["CD6C",0x86BB],
+  ["CD6D",0x86BC],
+  ["CD6E",0x86BD],
+  ["CD6F",0x86BE],
+  ["CD70",0x86BF],
+  ["D6FB",0x86C0],
+  ["CD71",0x86C1],
+  ["CD72",0x86C2],
+  ["CD73",0x86C3],
+  ["F2C1",0x86C4],
+  ["CD74",0x86C5],
+  ["C7F9",0x86C6],
+  ["C9DF",0x86C7],
+  ["CD75",0x86C8],
+  ["F2C8",0x86C9],
+  ["B9C6",0x86CA],
+  ["B5B0",0x86CB],
+  ["CD76",0x86CC],
+  ["CD77",0x86CD],
+  ["F2C3",0x86CE],
+  ["F2C9",0x86CF],
+  ["F2D0",0x86D0],
+  ["F2D6",0x86D1],
+  ["CD78",0x86D2],
+  ["CD79",0x86D3],
+  ["BBD7",0x86D4],
+  ["CD7A",0x86D5],
+  ["CD7B",0x86D6],
+  ["CD7C",0x86D7],
+  ["F2D5",0x86D8],
+  ["CDDC",0x86D9],
+  ["CD7D",0x86DA],
+  ["D6EB",0x86DB],
+  ["CD7E",0x86DC],
+  ["CD80",0x86DD],
+  ["F2D2",0x86DE],
+  ["F2D4",0x86DF],
+  ["CD81",0x86E0],
+  ["CD82",0x86E1],
+  ["CD83",0x86E2],
+  ["CD84",0x86E3],
+  ["B8F2",0x86E4],
+  ["CD85",0x86E5],
+  ["CD86",0x86E6],
+  ["CD87",0x86E7],
+  ["CD88",0x86E8],
+  ["F2CB",0x86E9],
+  ["CD89",0x86EA],
+  ["CD8A",0x86EB],
+  ["CD8B",0x86EC],
+  ["F2CE",0x86ED],
+  ["C2F9",0x86EE],
+  ["CD8C",0x86EF],
+  ["D5DD",0x86F0],
+  ["F2CC",0x86F1],
+  ["F2CD",0x86F2],
+  ["F2CF",0x86F3],
+  ["F2D3",0x86F4],
+  ["CD8D",0x86F5],
+  ["CD8E",0x86F6],
+  ["CD8F",0x86F7],
+  ["F2D9",0x86F8],
+  ["D3BC",0x86F9],
+  ["CD90",0x86FA],
+  ["CD91",0x86FB],
+  ["CD92",0x86FC],
+  ["CD93",0x86FD],
+  ["B6EA",0x86FE],
+  ["CD94",0x86FF],
+  ["CAF1",0x8700],
+  ["CD95",0x8701],
+  ["B7E4",0x8702],
+  ["F2D7",0x8703],
+  ["CD96",0x8704],
+  ["CD97",0x8705],
+  ["CD98",0x8706],
+  ["F2D8",0x8707],
+  ["F2DA",0x8708],
+  ["F2DD",0x8709],
+  ["F2DB",0x870A],
+  ["CD99",0x870B],
+  ["CD9A",0x870C],
+  ["F2DC",0x870D],
+  ["CD9B",0x870E],
+  ["CD9C",0x870F],
+  ["CD9D",0x8710],
+  ["CD9E",0x8711],
+  ["D1D1",0x8712],
+  ["F2D1",0x8713],
+  ["CD9F",0x8714],
+  ["CDC9",0x8715],
+  ["CDA0",0x8716],
+  ["CECF",0x8717],
+  ["D6A9",0x8718],
+  ["CE40",0x8719],
+  ["F2E3",0x871A],
+  ["CE41",0x871B],
+  ["C3DB",0x871C],
+  ["CE42",0x871D],
+  ["F2E0",0x871E],
+  ["CE43",0x871F],
+  ["CE44",0x8720],
+  ["C0AF",0x8721],
+  ["F2EC",0x8722],
+  ["F2DE",0x8723],
+  ["CE45",0x8724],
+  ["F2E1",0x8725],
+  ["CE46",0x8726],
+  ["CE47",0x8727],
+  ["CE48",0x8728],
+  ["F2E8",0x8729],
+  ["CE49",0x872A],
+  ["CE4A",0x872B],
+  ["CE4B",0x872C],
+  ["CE4C",0x872D],
+  ["F2E2",0x872E],
+  ["CE4D",0x872F],
+  ["CE4E",0x8730],
+  ["F2E7",0x8731],
+  ["CE4F",0x8732],
+  ["CE50",0x8733],
+  ["F2E6",0x8734],
+  ["CE51",0x8735],
+  ["CE52",0x8736],
+  ["F2E9",0x8737],
+  ["CE53",0x8738],
+  ["CE54",0x8739],
+  ["CE55",0x873A],
+  ["F2DF",0x873B],
+  ["CE56",0x873C],
+  ["CE57",0x873D],
+  ["F2E4",0x873E],
+  ["F2EA",0x873F],
+  ["CE58",0x8740],
+  ["CE59",0x8741],
+  ["CE5A",0x8742],
+  ["CE5B",0x8743],
+  ["CE5C",0x8744],
+  ["CE5D",0x8745],
+  ["CE5E",0x8746],
+  ["D3AC",0x8747],
+  ["F2E5",0x8748],
+  ["B2F5",0x8749],
+  ["CE5F",0x874A],
+  ["CE60",0x874B],
+  ["F2F2",0x874C],
+  ["CE61",0x874D],
+  ["D0AB",0x874E],
+  ["CE62",0x874F],
+  ["CE63",0x8750],
+  ["CE64",0x8751],
+  ["CE65",0x8752],
+  ["F2F5",0x8753],
+  ["CE66",0x8754],
+  ["CE67",0x8755],
+  ["CE68",0x8756],
+  ["BBC8",0x8757],
+  ["CE69",0x8758],
+  ["F2F9",0x8759],
+  ["CE6A",0x875A],
+  ["CE6B",0x875B],
+  ["CE6C",0x875C],
+  ["CE6D",0x875D],
+  ["CE6E",0x875E],
+  ["CE6F",0x875F],
+  ["F2F0",0x8760],
+  ["CE70",0x8761],
+  ["CE71",0x8762],
+  ["F2F6",0x8763],
+  ["F2F8",0x8764],
+  ["F2FA",0x8765],
+  ["CE72",0x8766],
+  ["CE73",0x8767],
+  ["CE74",0x8768],
+  ["CE75",0x8769],
+  ["CE76",0x876A],
+  ["CE77",0x876B],
+  ["CE78",0x876C],
+  ["CE79",0x876D],
+  ["F2F3",0x876E],
+  ["CE7A",0x876F],
+  ["F2F1",0x8770],
+  ["CE7B",0x8771],
+  ["CE7C",0x8772],
+  ["CE7D",0x8773],
+  ["BAFB",0x8774],
+  ["CE7E",0x8775],
+  ["B5FB",0x8776],
+  ["CE80",0x8777],
+  ["CE81",0x8778],
+  ["CE82",0x8779],
+  ["CE83",0x877A],
+  ["F2EF",0x877B],
+  ["F2F7",0x877C],
+  ["F2ED",0x877D],
+  ["F2EE",0x877E],
+  ["CE84",0x877F],
+  ["CE85",0x8780],
+  ["CE86",0x8781],
+  ["F2EB",0x8782],
+  ["F3A6",0x8783],
+  ["CE87",0x8784],
+  ["F3A3",0x8785],
+  ["CE88",0x8786],
+  ["CE89",0x8787],
+  ["F3A2",0x8788],
+  ["CE8A",0x8789],
+  ["CE8B",0x878A],
+  ["F2F4",0x878B],
+  ["CE8C",0x878C],
+  ["C8DA",0x878D],
+  ["CE8D",0x878E],
+  ["CE8E",0x878F],
+  ["CE8F",0x8790],
+  ["CE90",0x8791],
+  ["CE91",0x8792],
+  ["F2FB",0x8793],
+  ["CE92",0x8794],
+  ["CE93",0x8795],
+  ["CE94",0x8796],
+  ["F3A5",0x8797],
+  ["CE95",0x8798],
+  ["CE96",0x8799],
+  ["CE97",0x879A],
+  ["CE98",0x879B],
+  ["CE99",0x879C],
+  ["CE9A",0x879D],
+  ["CE9B",0x879E],
+  ["C3F8",0x879F],
+  ["CE9C",0x87A0],
+  ["CE9D",0x87A1],
+  ["CE9E",0x87A2],
+  ["CE9F",0x87A3],
+  ["CEA0",0x87A4],
+  ["CF40",0x87A5],
+  ["CF41",0x87A6],
+  ["CF42",0x87A7],
+  ["F2FD",0x87A8],
+  ["CF43",0x87A9],
+  ["CF44",0x87AA],
+  ["F3A7",0x87AB],
+  ["F3A9",0x87AC],
+  ["F3A4",0x87AD],
+  ["CF45",0x87AE],
+  ["F2FC",0x87AF],
+  ["CF46",0x87B0],
+  ["CF47",0x87B1],
+  ["CF48",0x87B2],
+  ["F3AB",0x87B3],
+  ["CF49",0x87B4],
+  ["F3AA",0x87B5],
+  ["CF4A",0x87B6],
+  ["CF4B",0x87B7],
+  ["CF4C",0x87B8],
+  ["CF4D",0x87B9],
+  ["C2DD",0x87BA],
+  ["CF4E",0x87BB],
+  ["CF4F",0x87BC],
+  ["F3AE",0x87BD],
+  ["CF50",0x87BE],
+  ["CF51",0x87BF],
+  ["F3B0",0x87C0],
+  ["CF52",0x87C1],
+  ["CF53",0x87C2],
+  ["CF54",0x87C3],
+  ["CF55",0x87C4],
+  ["CF56",0x87C5],
+  ["F3A1",0x87C6],
+  ["CF57",0x87C7],
+  ["CF58",0x87C8],
+  ["CF59",0x87C9],
+  ["F3B1",0x87CA],
+  ["F3AC",0x87CB],
+  ["CF5A",0x87CC],
+  ["CF5B",0x87CD],
+  ["CF5C",0x87CE],
+  ["CF5D",0x87CF],
+  ["CF5E",0x87D0],
+  ["F3AF",0x87D1],
+  ["F2FE",0x87D2],
+  ["F3AD",0x87D3],
+  ["CF5F",0x87D4],
+  ["CF60",0x87D5],
+  ["CF61",0x87D6],
+  ["CF62",0x87D7],
+  ["CF63",0x87D8],
+  ["CF64",0x87D9],
+  ["CF65",0x87DA],
+  ["F3B2",0x87DB],
+  ["CF66",0x87DC],
+  ["CF67",0x87DD],
+  ["CF68",0x87DE],
+  ["CF69",0x87DF],
+  ["F3B4",0x87E0],
+  ["CF6A",0x87E1],
+  ["CF6B",0x87E2],
+  ["CF6C",0x87E3],
+  ["CF6D",0x87E4],
+  ["F3A8",0x87E5],
+  ["CF6E",0x87E6],
+  ["CF6F",0x87E7],
+  ["CF70",0x87E8],
+  ["CF71",0x87E9],
+  ["F3B3",0x87EA],
+  ["CF72",0x87EB],
+  ["CF73",0x87EC],
+  ["CF74",0x87ED],
+  ["F3B5",0x87EE],
+  ["CF75",0x87EF],
+  ["CF76",0x87F0],
+  ["CF77",0x87F1],
+  ["CF78",0x87F2],
+  ["CF79",0x87F3],
+  ["CF7A",0x87F4],
+  ["CF7B",0x87F5],
+  ["CF7C",0x87F6],
+  ["CF7D",0x87F7],
+  ["CF7E",0x87F8],
+  ["D0B7",0x87F9],
+  ["CF80",0x87FA],
+  ["CF81",0x87FB],
+  ["CF82",0x87FC],
+  ["CF83",0x87FD],
+  ["F3B8",0x87FE],
+  ["CF84",0x87FF],
+  ["CF85",0x8800],
+  ["CF86",0x8801],
+  ["CF87",0x8802],
+  ["D9F9",0x8803],
+  ["CF88",0x8804],
+  ["CF89",0x8805],
+  ["CF8A",0x8806],
+  ["CF8B",0x8807],
+  ["CF8C",0x8808],
+  ["CF8D",0x8809],
+  ["F3B9",0x880A],
+  ["CF8E",0x880B],
+  ["CF8F",0x880C],
+  ["CF90",0x880D],
+  ["CF91",0x880E],
+  ["CF92",0x880F],
+  ["CF93",0x8810],
+  ["CF94",0x8811],
+  ["CF95",0x8812],
+  ["F3B7",0x8813],
+  ["CF96",0x8814],
+  ["C8E4",0x8815],
+  ["F3B6",0x8816],
+  ["CF97",0x8817],
+  ["CF98",0x8818],
+  ["CF99",0x8819],
+  ["CF9A",0x881A],
+  ["F3BA",0x881B],
+  ["CF9B",0x881C],
+  ["CF9C",0x881D],
+  ["CF9D",0x881E],
+  ["CF9E",0x881F],
+  ["CF9F",0x8820],
+  ["F3BB",0x8821],
+  ["B4C0",0x8822],
+  ["CFA0",0x8823],
+  ["D040",0x8824],
+  ["D041",0x8825],
+  ["D042",0x8826],
+  ["D043",0x8827],
+  ["D044",0x8828],
+  ["D045",0x8829],
+  ["D046",0x882A],
+  ["D047",0x882B],
+  ["D048",0x882C],
+  ["D049",0x882D],
+  ["D04A",0x882E],
+  ["D04B",0x882F],
+  ["D04C",0x8830],
+  ["D04D",0x8831],
+  ["EEC3",0x8832],
+  ["D04E",0x8833],
+  ["D04F",0x8834],
+  ["D050",0x8835],
+  ["D051",0x8836],
+  ["D052",0x8837],
+  ["D053",0x8838],
+  ["F3BC",0x8839],
+  ["D054",0x883A],
+  ["D055",0x883B],
+  ["F3BD",0x883C],
+  ["D056",0x883D],
+  ["D057",0x883E],
+  ["D058",0x883F],
+  ["D1AA",0x8840],
+  ["D059",0x8841],
+  ["D05A",0x8842],
+  ["D05B",0x8843],
+  ["F4AC",0x8844],
+  ["D0C6",0x8845],
+  ["D05C",0x8846],
+  ["D05D",0x8847],
+  ["D05E",0x8848],
+  ["D05F",0x8849],
+  ["D060",0x884A],
+  ["D061",0x884B],
+  ["D0D0",0x884C],
+  ["D1DC",0x884D],
+  ["D062",0x884E],
+  ["D063",0x884F],
+  ["D064",0x8850],
+  ["D065",0x8851],
+  ["D066",0x8852],
+  ["D067",0x8853],
+  ["CFCE",0x8854],
+  ["D068",0x8855],
+  ["D069",0x8856],
+  ["BDD6",0x8857],
+  ["D06A",0x8858],
+  ["D1C3",0x8859],
+  ["D06B",0x885A],
+  ["D06C",0x885B],
+  ["D06D",0x885C],
+  ["D06E",0x885D],
+  ["D06F",0x885E],
+  ["D070",0x885F],
+  ["D071",0x8860],
+  ["BAE2",0x8861],
+  ["E1E9",0x8862],
+  ["D2C2",0x8863],
+  ["F1C2",0x8864],
+  ["B2B9",0x8865],
+  ["D072",0x8866],
+  ["D073",0x8867],
+  ["B1ED",0x8868],
+  ["F1C3",0x8869],
+  ["D074",0x886A],
+  ["C9C0",0x886B],
+  ["B3C4",0x886C],
+  ["D075",0x886D],
+  ["D9F2",0x886E],
+  ["D076",0x886F],
+  ["CBA5",0x8870],
+  ["D077",0x8871],
+  ["F1C4",0x8872],
+  ["D078",0x8873],
+  ["D079",0x8874],
+  ["D07A",0x8875],
+  ["D07B",0x8876],
+  ["D6D4",0x8877],
+  ["D07C",0x8878],
+  ["D07D",0x8879],
+  ["D07E",0x887A],
+  ["D080",0x887B],
+  ["D081",0x887C],
+  ["F1C5",0x887D],
+  ["F4C0",0x887E],
+  ["F1C6",0x887F],
+  ["D082",0x8880],
+  ["D4AC",0x8881],
+  ["F1C7",0x8882],
+  ["D083",0x8883],
+  ["B0C0",0x8884],
+  ["F4C1",0x8885],
+  ["D084",0x8886],
+  ["D085",0x8887],
+  ["F4C2",0x8888],
+  ["D086",0x8889],
+  ["D087",0x888A],
+  ["B4FC",0x888B],
+  ["D088",0x888C],
+  ["C5DB",0x888D],
+  ["D089",0x888E],
+  ["D08A",0x888F],
+  ["D08B",0x8890],
+  ["D08C",0x8891],
+  ["CCBB",0x8892],
+  ["D08D",0x8893],
+  ["D08E",0x8894],
+  ["D08F",0x8895],
+  ["D0E4",0x8896],
+  ["D090",0x8897],
+  ["D091",0x8898],
+  ["D092",0x8899],
+  ["D093",0x889A],
+  ["D094",0x889B],
+  ["CDE0",0x889C],
+  ["D095",0x889D],
+  ["D096",0x889E],
+  ["D097",0x889F],
+  ["D098",0x88A0],
+  ["D099",0x88A1],
+  ["F1C8",0x88A2],
+  ["D09A",0x88A3],
+  ["D9F3",0x88A4],
+  ["D09B",0x88A5],
+  ["D09C",0x88A6],
+  ["D09D",0x88A7],
+  ["D09E",0x88A8],
+  ["D09F",0x88A9],
+  ["D0A0",0x88AA],
+  ["B1BB",0x88AB],
+  ["D140",0x88AC],
+  ["CFAE",0x88AD],
+  ["D141",0x88AE],
+  ["D142",0x88AF],
+  ["D143",0x88B0],
+  ["B8A4",0x88B1],
+  ["D144",0x88B2],
+  ["D145",0x88B3],
+  ["D146",0x88B4],
+  ["D147",0x88B5],
+  ["D148",0x88B6],
+  ["F1CA",0x88B7],
+  ["D149",0x88B8],
+  ["D14A",0x88B9],
+  ["D14B",0x88BA],
+  ["D14C",0x88BB],
+  ["F1CB",0x88BC],
+  ["D14D",0x88BD],
+  ["D14E",0x88BE],
+  ["D14F",0x88BF],
+  ["D150",0x88C0],
+  ["B2C3",0x88C1],
+  ["C1D1",0x88C2],
+  ["D151",0x88C3],
+  ["D152",0x88C4],
+  ["D7B0",0x88C5],
+  ["F1C9",0x88C6],
+  ["D153",0x88C7],
+  ["D154",0x88C8],
+  ["F1CC",0x88C9],
+  ["D155",0x88CA],
+  ["D156",0x88CB],
+  ["D157",0x88CC],
+  ["D158",0x88CD],
+  ["F1CE",0x88CE],
+  ["D159",0x88CF],
+  ["D15A",0x88D0],
+  ["D15B",0x88D1],
+  ["D9F6",0x88D2],
+  ["D15C",0x88D3],
+  ["D2E1",0x88D4],
+  ["D4A3",0x88D5],
+  ["D15D",0x88D6],
+  ["D15E",0x88D7],
+  ["F4C3",0x88D8],
+  ["C8B9",0x88D9],
+  ["D15F",0x88DA],
+  ["D160",0x88DB],
+  ["D161",0x88DC],
+  ["D162",0x88DD],
+  ["D163",0x88DE],
+  ["F4C4",0x88DF],
+  ["D164",0x88E0],
+  ["D165",0x88E1],
+  ["F1CD",0x88E2],
+  ["F1CF",0x88E3],
+  ["BFE3",0x88E4],
+  ["F1D0",0x88E5],
+  ["D166",0x88E6],
+  ["D167",0x88E7],
+  ["F1D4",0x88E8],
+  ["D168",0x88E9],
+  ["D169",0x88EA],
+  ["D16A",0x88EB],
+  ["D16B",0x88EC],
+  ["D16C",0x88ED],
+  ["D16D",0x88EE],
+  ["D16E",0x88EF],
+  ["F1D6",0x88F0],
+  ["F1D1",0x88F1],
+  ["D16F",0x88F2],
+  ["C9D1",0x88F3],
+  ["C5E1",0x88F4],
+  ["D170",0x88F5],
+  ["D171",0x88F6],
+  ["D172",0x88F7],
+  ["C2E3",0x88F8],
+  ["B9FC",0x88F9],
+  ["D173",0x88FA],
+  ["D174",0x88FB],
+  ["F1D3",0x88FC],
+  ["D175",0x88FD],
+  ["F1D5",0x88FE],
+  ["D176",0x88FF],
+  ["D177",0x8900],
+  ["D178",0x8901],
+  ["B9D3",0x8902],
+  ["D179",0x8903],
+  ["D17A",0x8904],
+  ["D17B",0x8905],
+  ["D17C",0x8906],
+  ["D17D",0x8907],
+  ["D17E",0x8908],
+  ["D180",0x8909],
+  ["F1DB",0x890A],
+  ["D181",0x890B],
+  ["D182",0x890C],
+  ["D183",0x890D],
+  ["D184",0x890E],
+  ["D185",0x890F],
+  ["BAD6",0x8910],
+  ["D186",0x8911],
+  ["B0FD",0x8912],
+  ["F1D9",0x8913],
+  ["D187",0x8914],
+  ["D188",0x8915],
+  ["D189",0x8916],
+  ["D18A",0x8917],
+  ["D18B",0x8918],
+  ["F1D8",0x8919],
+  ["F1D2",0x891A],
+  ["F1DA",0x891B],
+  ["D18C",0x891C],
+  ["D18D",0x891D],
+  ["D18E",0x891E],
+  ["D18F",0x891F],
+  ["D190",0x8920],
+  ["F1D7",0x8921],
+  ["D191",0x8922],
+  ["D192",0x8923],
+  ["D193",0x8924],
+  ["C8EC",0x8925],
+  ["D194",0x8926],
+  ["D195",0x8927],
+  ["D196",0x8928],
+  ["D197",0x8929],
+  ["CDCA",0x892A],
+  ["F1DD",0x892B],
+  ["D198",0x892C],
+  ["D199",0x892D],
+  ["D19A",0x892E],
+  ["D19B",0x892F],
+  ["E5BD",0x8930],
+  ["D19C",0x8931],
+  ["D19D",0x8932],
+  ["D19E",0x8933],
+  ["F1DC",0x8934],
+  ["D19F",0x8935],
+  ["F1DE",0x8936],
+  ["D1A0",0x8937],
+  ["D240",0x8938],
+  ["D241",0x8939],
+  ["D242",0x893A],
+  ["D243",0x893B],
+  ["D244",0x893C],
+  ["D245",0x893D],
+  ["D246",0x893E],
+  ["D247",0x893F],
+  ["D248",0x8940],
+  ["F1DF",0x8941],
+  ["D249",0x8942],
+  ["D24A",0x8943],
+  ["CFE5",0x8944],
+  ["D24B",0x8945],
+  ["D24C",0x8946],
+  ["D24D",0x8947],
+  ["D24E",0x8948],
+  ["D24F",0x8949],
+  ["D250",0x894A],
+  ["D251",0x894B],
+  ["D252",0x894C],
+  ["D253",0x894D],
+  ["D254",0x894E],
+  ["D255",0x894F],
+  ["D256",0x8950],
+  ["D257",0x8951],
+  ["D258",0x8952],
+  ["D259",0x8953],
+  ["D25A",0x8954],
+  ["D25B",0x8955],
+  ["D25C",0x8956],
+  ["D25D",0x8957],
+  ["D25E",0x8958],
+  ["D25F",0x8959],
+  ["D260",0x895A],
+  ["D261",0x895B],
+  ["D262",0x895C],
+  ["D263",0x895D],
+  ["F4C5",0x895E],
+  ["BDF3",0x895F],
+  ["D264",0x8960],
+  ["D265",0x8961],
+  ["D266",0x8962],
+  ["D267",0x8963],
+  ["D268",0x8964],
+  ["D269",0x8965],
+  ["F1E0",0x8966],
+  ["D26A",0x8967],
+  ["D26B",0x8968],
+  ["D26C",0x8969],
+  ["D26D",0x896A],
+  ["D26E",0x896B],
+  ["D26F",0x896C],
+  ["D270",0x896D],
+  ["D271",0x896E],
+  ["D272",0x896F],
+  ["D273",0x8970],
+  ["D274",0x8971],
+  ["D275",0x8972],
+  ["D276",0x8973],
+  ["D277",0x8974],
+  ["D278",0x8975],
+  ["D279",0x8976],
+  ["D27A",0x8977],
+  ["D27B",0x8978],
+  ["D27C",0x8979],
+  ["D27D",0x897A],
+  ["F1E1",0x897B],
+  ["D27E",0x897C],
+  ["D280",0x897D],
+  ["D281",0x897E],
+  ["CEF7",0x897F],
+  ["D282",0x8980],
+  ["D2AA",0x8981],
+  ["D283",0x8982],
+  ["F1FB",0x8983],
+  ["D284",0x8984],
+  ["D285",0x8985],
+  ["B8B2",0x8986],
+  ["D286",0x8987],
+  ["D287",0x8988],
+  ["D288",0x8989],
+  ["D289",0x898A],
+  ["D28A",0x898B],
+  ["D28B",0x898C],
+  ["D28C",0x898D],
+  ["D28D",0x898E],
+  ["D28E",0x898F],
+  ["D28F",0x8990],
+  ["D290",0x8991],
+  ["D291",0x8992],
+  ["D292",0x8993],
+  ["D293",0x8994],
+  ["D294",0x8995],
+  ["D295",0x8996],
+  ["D296",0x8997],
+  ["D297",0x8998],
+  ["D298",0x8999],
+  ["D299",0x899A],
+  ["D29A",0x899B],
+  ["D29B",0x899C],
+  ["D29C",0x899D],
+  ["D29D",0x899E],
+  ["D29E",0x899F],
+  ["D29F",0x89A0],
+  ["D2A0",0x89A1],
+  ["D340",0x89A2],
+  ["D341",0x89A3],
+  ["D342",0x89A4],
+  ["D343",0x89A5],
+  ["D344",0x89A6],
+  ["D345",0x89A7],
+  ["D346",0x89A8],
+  ["D347",0x89A9],
+  ["D348",0x89AA],
+  ["D349",0x89AB],
+  ["D34A",0x89AC],
+  ["D34B",0x89AD],
+  ["D34C",0x89AE],
+  ["D34D",0x89AF],
+  ["D34E",0x89B0],
+  ["D34F",0x89B1],
+  ["D350",0x89B2],
+  ["D351",0x89B3],
+  ["D352",0x89B4],
+  ["D353",0x89B5],
+  ["D354",0x89B6],
+  ["D355",0x89B7],
+  ["D356",0x89B8],
+  ["D357",0x89B9],
+  ["D358",0x89BA],
+  ["D359",0x89BB],
+  ["D35A",0x89BC],
+  ["D35B",0x89BD],
+  ["D35C",0x89BE],
+  ["D35D",0x89BF],
+  ["D35E",0x89C0],
+  ["BCFB",0x89C1],
+  ["B9DB",0x89C2],
+  ["D35F",0x89C3],
+  ["B9E6",0x89C4],
+  ["C3D9",0x89C5],
+  ["CAD3",0x89C6],
+  ["EAE8",0x89C7],
+  ["C0C0",0x89C8],
+  ["BEF5",0x89C9],
+  ["EAE9",0x89CA],
+  ["EAEA",0x89CB],
+  ["EAEB",0x89CC],
+  ["D360",0x89CD],
+  ["EAEC",0x89CE],
+  ["EAED",0x89CF],
+  ["EAEE",0x89D0],
+  ["EAEF",0x89D1],
+  ["BDC7",0x89D2],
+  ["D361",0x89D3],
+  ["D362",0x89D4],
+  ["D363",0x89D5],
+  ["F5FB",0x89D6],
+  ["D364",0x89D7],
+  ["D365",0x89D8],
+  ["D366",0x89D9],
+  ["F5FD",0x89DA],
+  ["D367",0x89DB],
+  ["F5FE",0x89DC],
+  ["D368",0x89DD],
+  ["F5FC",0x89DE],
+  ["D369",0x89DF],
+  ["D36A",0x89E0],
+  ["D36B",0x89E1],
+  ["D36C",0x89E2],
+  ["BDE2",0x89E3],
+  ["D36D",0x89E4],
+  ["F6A1",0x89E5],
+  ["B4A5",0x89E6],
+  ["D36E",0x89E7],
+  ["D36F",0x89E8],
+  ["D370",0x89E9],
+  ["D371",0x89EA],
+  ["F6A2",0x89EB],
+  ["D372",0x89EC],
+  ["D373",0x89ED],
+  ["D374",0x89EE],
+  ["F6A3",0x89EF],
+  ["D375",0x89F0],
+  ["D376",0x89F1],
+  ["D377",0x89F2],
+  ["ECB2",0x89F3],
+  ["D378",0x89F4],
+  ["D379",0x89F5],
+  ["D37A",0x89F6],
+  ["D37B",0x89F7],
+  ["D37C",0x89F8],
+  ["D37D",0x89F9],
+  ["D37E",0x89FA],
+  ["D380",0x89FB],
+  ["D381",0x89FC],
+  ["D382",0x89FD],
+  ["D383",0x89FE],
+  ["D384",0x89FF],
+  ["D1D4",0x8A00],
+  ["D385",0x8A01],
+  ["D386",0x8A02],
+  ["D387",0x8A03],
+  ["D388",0x8A04],
+  ["D389",0x8A05],
+  ["D38A",0x8A06],
+  ["D9EA",0x8A07],
+  ["D38B",0x8A08],
+  ["D38C",0x8A09],
+  ["D38D",0x8A0A],
+  ["D38E",0x8A0B],
+  ["D38F",0x8A0C],
+  ["D390",0x8A0D],
+  ["D391",0x8A0E],
+  ["D392",0x8A0F],
+  ["D393",0x8A10],
+  ["D394",0x8A11],
+  ["D395",0x8A12],
+  ["D396",0x8A13],
+  ["D397",0x8A14],
+  ["D398",0x8A15],
+  ["D399",0x8A16],
+  ["D39A",0x8A17],
+  ["D39B",0x8A18],
+  ["D39C",0x8A19],
+  ["D39D",0x8A1A],
+  ["D39E",0x8A1B],
+  ["D39F",0x8A1C],
+  ["D3A0",0x8A1D],
+  ["D440",0x8A1E],
+  ["D441",0x8A1F],
+  ["D442",0x8A20],
+  ["D443",0x8A21],
+  ["D444",0x8A22],
+  ["D445",0x8A23],
+  ["D446",0x8A24],
+  ["D447",0x8A25],
+  ["D448",0x8A26],
+  ["D449",0x8A27],
+  ["D44A",0x8A28],
+  ["D44B",0x8A29],
+  ["D44C",0x8A2A],
+  ["D44D",0x8A2B],
+  ["D44E",0x8A2C],
+  ["D44F",0x8A2D],
+  ["D450",0x8A2E],
+  ["D451",0x8A2F],
+  ["D452",0x8A30],
+  ["D453",0x8A31],
+  ["D454",0x8A32],
+  ["D455",0x8A33],
+  ["D456",0x8A34],
+  ["D457",0x8A35],
+  ["D458",0x8A36],
+  ["D459",0x8A37],
+  ["D45A",0x8A38],
+  ["D45B",0x8A39],
+  ["D45C",0x8A3A],
+  ["D45D",0x8A3B],
+  ["D45E",0x8A3C],
+  ["D45F",0x8A3D],
+  ["F6A4",0x8A3E],
+  ["D460",0x8A3F],
+  ["D461",0x8A40],
+  ["D462",0x8A41],
+  ["D463",0x8A42],
+  ["D464",0x8A43],
+  ["D465",0x8A44],
+  ["D466",0x8A45],
+  ["D467",0x8A46],
+  ["D468",0x8A47],
+  ["EEBA",0x8A48],
+  ["D469",0x8A49],
+  ["D46A",0x8A4A],
+  ["D46B",0x8A4B],
+  ["D46C",0x8A4C],
+  ["D46D",0x8A4D],
+  ["D46E",0x8A4E],
+  ["D46F",0x8A4F],
+  ["D470",0x8A50],
+  ["D471",0x8A51],
+  ["D472",0x8A52],
+  ["D473",0x8A53],
+  ["D474",0x8A54],
+  ["D475",0x8A55],
+  ["D476",0x8A56],
+  ["D477",0x8A57],
+  ["D478",0x8A58],
+  ["D479",0x8A59],
+  ["D47A",0x8A5A],
+  ["D47B",0x8A5B],
+  ["D47C",0x8A5C],
+  ["D47D",0x8A5D],
+  ["D47E",0x8A5E],
+  ["D480",0x8A5F],
+  ["D481",0x8A60],
+  ["D482",0x8A61],
+  ["D483",0x8A62],
+  ["D484",0x8A63],
+  ["D485",0x8A64],
+  ["D486",0x8A65],
+  ["D487",0x8A66],
+  ["D488",0x8A67],
+  ["D489",0x8A68],
+  ["D48A",0x8A69],
+  ["D48B",0x8A6A],
+  ["D48C",0x8A6B],
+  ["D48D",0x8A6C],
+  ["D48E",0x8A6D],
+  ["D48F",0x8A6E],
+  ["D490",0x8A6F],
+  ["D491",0x8A70],
+  ["D492",0x8A71],
+  ["D493",0x8A72],
+  ["D494",0x8A73],
+  ["D495",0x8A74],
+  ["D496",0x8A75],
+  ["D497",0x8A76],
+  ["D498",0x8A77],
+  ["D499",0x8A78],
+  ["D5B2",0x8A79],
+  ["D49A",0x8A7A],
+  ["D49B",0x8A7B],
+  ["D49C",0x8A7C],
+  ["D49D",0x8A7D],
+  ["D49E",0x8A7E],
+  ["D49F",0x8A7F],
+  ["D4A0",0x8A80],
+  ["D540",0x8A81],
+  ["D541",0x8A82],
+  ["D542",0x8A83],
+  ["D543",0x8A84],
+  ["D544",0x8A85],
+  ["D545",0x8A86],
+  ["D546",0x8A87],
+  ["D547",0x8A88],
+  ["D3FE",0x8A89],
+  ["CCDC",0x8A8A],
+  ["D548",0x8A8B],
+  ["D549",0x8A8C],
+  ["D54A",0x8A8D],
+  ["D54B",0x8A8E],
+  ["D54C",0x8A8F],
+  ["D54D",0x8A90],
+  ["D54E",0x8A91],
+  ["D54F",0x8A92],
+  ["CAC4",0x8A93],
+  ["D550",0x8A94],
+  ["D551",0x8A95],
+  ["D552",0x8A96],
+  ["D553",0x8A97],
+  ["D554",0x8A98],
+  ["D555",0x8A99],
+  ["D556",0x8A9A],
+  ["D557",0x8A9B],
+  ["D558",0x8A9C],
+  ["D559",0x8A9D],
+  ["D55A",0x8A9E],
+  ["D55B",0x8A9F],
+  ["D55C",0x8AA0],
+  ["D55D",0x8AA1],
+  ["D55E",0x8AA2],
+  ["D55F",0x8AA3],
+  ["D560",0x8AA4],
+  ["D561",0x8AA5],
+  ["D562",0x8AA6],
+  ["D563",0x8AA7],
+  ["D564",0x8AA8],
+  ["D565",0x8AA9],
+  ["D566",0x8AAA],
+  ["D567",0x8AAB],
+  ["D568",0x8AAC],
+  ["D569",0x8AAD],
+  ["D56A",0x8AAE],
+  ["D56B",0x8AAF],
+  ["D56C",0x8AB0],
+  ["D56D",0x8AB1],
+  ["D56E",0x8AB2],
+  ["D56F",0x8AB3],
+  ["D570",0x8AB4],
+  ["D571",0x8AB5],
+  ["D572",0x8AB6],
+  ["D573",0x8AB7],
+  ["D574",0x8AB8],
+  ["D575",0x8AB9],
+  ["D576",0x8ABA],
+  ["D577",0x8ABB],
+  ["D578",0x8ABC],
+  ["D579",0x8ABD],
+  ["D57A",0x8ABE],
+  ["D57B",0x8ABF],
+  ["D57C",0x8AC0],
+  ["D57D",0x8AC1],
+  ["D57E",0x8AC2],
+  ["D580",0x8AC3],
+  ["D581",0x8AC4],
+  ["D582",0x8AC5],
+  ["D583",0x8AC6],
+  ["D584",0x8AC7],
+  ["D585",0x8AC8],
+  ["D586",0x8AC9],
+  ["D587",0x8ACA],
+  ["D588",0x8ACB],
+  ["D589",0x8ACC],
+  ["D58A",0x8ACD],
+  ["D58B",0x8ACE],
+  ["D58C",0x8ACF],
+  ["D58D",0x8AD0],
+  ["D58E",0x8AD1],
+  ["D58F",0x8AD2],
+  ["D590",0x8AD3],
+  ["D591",0x8AD4],
+  ["D592",0x8AD5],
+  ["D593",0x8AD6],
+  ["D594",0x8AD7],
+  ["D595",0x8AD8],
+  ["D596",0x8AD9],
+  ["D597",0x8ADA],
+  ["D598",0x8ADB],
+  ["D599",0x8ADC],
+  ["D59A",0x8ADD],
+  ["D59B",0x8ADE],
+  ["D59C",0x8ADF],
+  ["D59D",0x8AE0],
+  ["D59E",0x8AE1],
+  ["D59F",0x8AE2],
+  ["D5A0",0x8AE3],
+  ["D640",0x8AE4],
+  ["D641",0x8AE5],
+  ["D642",0x8AE6],
+  ["D643",0x8AE7],
+  ["D644",0x8AE8],
+  ["D645",0x8AE9],
+  ["D646",0x8AEA],
+  ["D647",0x8AEB],
+  ["D648",0x8AEC],
+  ["D649",0x8AED],
+  ["D64A",0x8AEE],
+  ["D64B",0x8AEF],
+  ["D64C",0x8AF0],
+  ["D64D",0x8AF1],
+  ["D64E",0x8AF2],
+  ["D64F",0x8AF3],
+  ["D650",0x8AF4],
+  ["D651",0x8AF5],
+  ["D652",0x8AF6],
+  ["D653",0x8AF7],
+  ["D654",0x8AF8],
+  ["D655",0x8AF9],
+  ["D656",0x8AFA],
+  ["D657",0x8AFB],
+  ["D658",0x8AFC],
+  ["D659",0x8AFD],
+  ["D65A",0x8AFE],
+  ["D65B",0x8AFF],
+  ["D65C",0x8B00],
+  ["D65D",0x8B01],
+  ["D65E",0x8B02],
+  ["D65F",0x8B03],
+  ["D660",0x8B04],
+  ["D661",0x8B05],
+  ["D662",0x8B06],
+  ["E5C0",0x8B07],
+  ["D663",0x8B08],
+  ["D664",0x8B09],
+  ["D665",0x8B0A],
+  ["D666",0x8B0B],
+  ["D667",0x8B0C],
+  ["D668",0x8B0D],
+  ["D669",0x8B0E],
+  ["D66A",0x8B0F],
+  ["D66B",0x8B10],
+  ["D66C",0x8B11],
+  ["D66D",0x8B12],
+  ["D66E",0x8B13],
+  ["D66F",0x8B14],
+  ["D670",0x8B15],
+  ["D671",0x8B16],
+  ["D672",0x8B17],
+  ["D673",0x8B18],
+  ["D674",0x8B19],
+  ["D675",0x8B1A],
+  ["D676",0x8B1B],
+  ["D677",0x8B1C],
+  ["D678",0x8B1D],
+  ["D679",0x8B1E],
+  ["D67A",0x8B1F],
+  ["D67B",0x8B20],
+  ["D67C",0x8B21],
+  ["D67D",0x8B22],
+  ["D67E",0x8B23],
+  ["D680",0x8B24],
+  ["D681",0x8B25],
+  ["F6A5",0x8B26],
+  ["D682",0x8B27],
+  ["D683",0x8B28],
+  ["D684",0x8B29],
+  ["D685",0x8B2A],
+  ["D686",0x8B2B],
+  ["D687",0x8B2C],
+  ["D688",0x8B2D],
+  ["D689",0x8B2E],
+  ["D68A",0x8B2F],
+  ["D68B",0x8B30],
+  ["D68C",0x8B31],
+  ["D68D",0x8B32],
+  ["D68E",0x8B33],
+  ["D68F",0x8B34],
+  ["D690",0x8B35],
+  ["D691",0x8B36],
+  ["D692",0x8B37],
+  ["D693",0x8B38],
+  ["D694",0x8B39],
+  ["D695",0x8B3A],
+  ["D696",0x8B3B],
+  ["D697",0x8B3C],
+  ["D698",0x8B3D],
+  ["D699",0x8B3E],
+  ["D69A",0x8B3F],
+  ["D69B",0x8B40],
+  ["D69C",0x8B41],
+  ["D69D",0x8B42],
+  ["D69E",0x8B43],
+  ["D69F",0x8B44],
+  ["D6A0",0x8B45],
+  ["D740",0x8B46],
+  ["D741",0x8B47],
+  ["D742",0x8B48],
+  ["D743",0x8B49],
+  ["D744",0x8B4A],
+  ["D745",0x8B4B],
+  ["D746",0x8B4C],
+  ["D747",0x8B4D],
+  ["D748",0x8B4E],
+  ["D749",0x8B4F],
+  ["D74A",0x8B50],
+  ["D74B",0x8B51],
+  ["D74C",0x8B52],
+  ["D74D",0x8B53],
+  ["D74E",0x8B54],
+  ["D74F",0x8B55],
+  ["D750",0x8B56],
+  ["D751",0x8B57],
+  ["D752",0x8B58],
+  ["D753",0x8B59],
+  ["D754",0x8B5A],
+  ["D755",0x8B5B],
+  ["D756",0x8B5C],
+  ["D757",0x8B5D],
+  ["D758",0x8B5E],
+  ["D759",0x8B5F],
+  ["D75A",0x8B60],
+  ["D75B",0x8B61],
+  ["D75C",0x8B62],
+  ["D75D",0x8B63],
+  ["D75E",0x8B64],
+  ["D75F",0x8B65],
+  ["BEAF",0x8B66],
+  ["D760",0x8B67],
+  ["D761",0x8B68],
+  ["D762",0x8B69],
+  ["D763",0x8B6A],
+  ["D764",0x8B6B],
+  ["C6A9",0x8B6C],
+  ["D765",0x8B6D],
+  ["D766",0x8B6E],
+  ["D767",0x8B6F],
+  ["D768",0x8B70],
+  ["D769",0x8B71],
+  ["D76A",0x8B72],
+  ["D76B",0x8B73],
+  ["D76C",0x8B74],
+  ["D76D",0x8B75],
+  ["D76E",0x8B76],
+  ["D76F",0x8B77],
+  ["D770",0x8B78],
+  ["D771",0x8B79],
+  ["D772",0x8B7A],
+  ["D773",0x8B7B],
+  ["D774",0x8B7C],
+  ["D775",0x8B7D],
+  ["D776",0x8B7E],
+  ["D777",0x8B7F],
+  ["D778",0x8B80],
+  ["D779",0x8B81],
+  ["D77A",0x8B82],
+  ["D77B",0x8B83],
+  ["D77C",0x8B84],
+  ["D77D",0x8B85],
+  ["D77E",0x8B86],
+  ["D780",0x8B87],
+  ["D781",0x8B88],
+  ["D782",0x8B89],
+  ["D783",0x8B8A],
+  ["D784",0x8B8B],
+  ["D785",0x8B8C],
+  ["D786",0x8B8D],
+  ["D787",0x8B8E],
+  ["D788",0x8B8F],
+  ["D789",0x8B90],
+  ["D78A",0x8B91],
+  ["D78B",0x8B92],
+  ["D78C",0x8B93],
+  ["D78D",0x8B94],
+  ["D78E",0x8B95],
+  ["D78F",0x8B96],
+  ["D790",0x8B97],
+  ["D791",0x8B98],
+  ["D792",0x8B99],
+  ["D793",0x8B9A],
+  ["D794",0x8B9B],
+  ["D795",0x8B9C],
+  ["D796",0x8B9D],
+  ["D797",0x8B9E],
+  ["D798",0x8B9F],
+  ["DAA5",0x8BA0],
+  ["BCC6",0x8BA1],
+  ["B6A9",0x8BA2],
+  ["B8BC",0x8BA3],
+  ["C8CF",0x8BA4],
+  ["BCA5",0x8BA5],
+  ["DAA6",0x8BA6],
+  ["DAA7",0x8BA7],
+  ["CCD6",0x8BA8],
+  ["C8C3",0x8BA9],
+  ["DAA8",0x8BAA],
+  ["C6FD",0x8BAB],
+  ["D799",0x8BAC],
+  ["D1B5",0x8BAD],
+  ["D2E9",0x8BAE],
+  ["D1B6",0x8BAF],
+  ["BCC7",0x8BB0],
+  ["D79A",0x8BB1],
+  ["BDB2",0x8BB2],
+  ["BBE4",0x8BB3],
+  ["DAA9",0x8BB4],
+  ["DAAA",0x8BB5],
+  ["D1C8",0x8BB6],
+  ["DAAB",0x8BB7],
+  ["D0ED",0x8BB8],
+  ["B6EF",0x8BB9],
+  ["C2DB",0x8BBA],
+  ["D79B",0x8BBB],
+  ["CBCF",0x8BBC],
+  ["B7ED",0x8BBD],
+  ["C9E8",0x8BBE],
+  ["B7C3",0x8BBF],
+  ["BEF7",0x8BC0],
+  ["D6A4",0x8BC1],
+  ["DAAC",0x8BC2],
+  ["DAAD",0x8BC3],
+  ["C6C0",0x8BC4],
+  ["D7E7",0x8BC5],
+  ["CAB6",0x8BC6],
+  ["D79C",0x8BC7],
+  ["D5A9",0x8BC8],
+  ["CBDF",0x8BC9],
+  ["D5EF",0x8BCA],
+  ["DAAE",0x8BCB],
+  ["D6DF",0x8BCC],
+  ["B4CA",0x8BCD],
+  ["DAB0",0x8BCE],
+  ["DAAF",0x8BCF],
+  ["D79D",0x8BD0],
+  ["D2EB",0x8BD1],
+  ["DAB1",0x8BD2],
+  ["DAB2",0x8BD3],
+  ["DAB3",0x8BD4],
+  ["CAD4",0x8BD5],
+  ["DAB4",0x8BD6],
+  ["CAAB",0x8BD7],
+  ["DAB5",0x8BD8],
+  ["DAB6",0x8BD9],
+  ["B3CF",0x8BDA],
+  ["D6EF",0x8BDB],
+  ["DAB7",0x8BDC],
+  ["BBB0",0x8BDD],
+  ["B5AE",0x8BDE],
+  ["DAB8",0x8BDF],
+  ["DAB9",0x8BE0],
+  ["B9EE",0x8BE1],
+  ["D1AF",0x8BE2],
+  ["D2E8",0x8BE3],
+  ["DABA",0x8BE4],
+  ["B8C3",0x8BE5],
+  ["CFEA",0x8BE6],
+  ["B2EF",0x8BE7],
+  ["DABB",0x8BE8],
+  ["DABC",0x8BE9],
+  ["D79E",0x8BEA],
+  ["BDEB",0x8BEB],
+  ["CEDC",0x8BEC],
+  ["D3EF",0x8BED],
+  ["DABD",0x8BEE],
+  ["CEF3",0x8BEF],
+  ["DABE",0x8BF0],
+  ["D3D5",0x8BF1],
+  ["BBE5",0x8BF2],
+  ["DABF",0x8BF3],
+  ["CBB5",0x8BF4],
+  ["CBD0",0x8BF5],
+  ["DAC0",0x8BF6],
+  ["C7EB",0x8BF7],
+  ["D6EE",0x8BF8],
+  ["DAC1",0x8BF9],
+  ["C5B5",0x8BFA],
+  ["B6C1",0x8BFB],
+  ["DAC2",0x8BFC],
+  ["B7CC",0x8BFD],
+  ["BFCE",0x8BFE],
+  ["DAC3",0x8BFF],
+  ["DAC4",0x8C00],
+  ["CBAD",0x8C01],
+  ["DAC5",0x8C02],
+  ["B5F7",0x8C03],
+  ["DAC6",0x8C04],
+  ["C1C2",0x8C05],
+  ["D7BB",0x8C06],
+  ["DAC7",0x8C07],
+  ["CCB8",0x8C08],
+  ["D79F",0x8C09],
+  ["D2EA",0x8C0A],
+  ["C4B1",0x8C0B],
+  ["DAC8",0x8C0C],
+  ["B5FD",0x8C0D],
+  ["BBD1",0x8C0E],
+  ["DAC9",0x8C0F],
+  ["D0B3",0x8C10],
+  ["DACA",0x8C11],
+  ["DACB",0x8C12],
+  ["CEBD",0x8C13],
+  ["DACC",0x8C14],
+  ["DACD",0x8C15],
+  ["DACE",0x8C16],
+  ["B2F7",0x8C17],
+  ["DAD1",0x8C18],
+  ["DACF",0x8C19],
+  ["D1E8",0x8C1A],
+  ["DAD0",0x8C1B],
+  ["C3D5",0x8C1C],
+  ["DAD2",0x8C1D],
+  ["D7A0",0x8C1E],
+  ["DAD3",0x8C1F],
+  ["DAD4",0x8C20],
+  ["DAD5",0x8C21],
+  ["D0BB",0x8C22],
+  ["D2A5",0x8C23],
+  ["B0F9",0x8C24],
+  ["DAD6",0x8C25],
+  ["C7AB",0x8C26],
+  ["DAD7",0x8C27],
+  ["BDF7",0x8C28],
+  ["C3A1",0x8C29],
+  ["DAD8",0x8C2A],
+  ["DAD9",0x8C2B],
+  ["C3FD",0x8C2C],
+  ["CCB7",0x8C2D],
+  ["DADA",0x8C2E],
+  ["DADB",0x8C2F],
+  ["C0BE",0x8C30],
+  ["C6D7",0x8C31],
+  ["DADC",0x8C32],
+  ["DADD",0x8C33],
+  ["C7B4",0x8C34],
+  ["DADE",0x8C35],
+  ["DADF",0x8C36],
+  ["B9C8",0x8C37],
+  ["D840",0x8C38],
+  ["D841",0x8C39],
+  ["D842",0x8C3A],
+  ["D843",0x8C3B],
+  ["D844",0x8C3C],
+  ["D845",0x8C3D],
+  ["D846",0x8C3E],
+  ["D847",0x8C3F],
+  ["D848",0x8C40],
+  ["BBED",0x8C41],
+  ["D849",0x8C42],
+  ["D84A",0x8C43],
+  ["D84B",0x8C44],
+  ["D84C",0x8C45],
+  ["B6B9",0x8C46],
+  ["F4F8",0x8C47],
+  ["D84D",0x8C48],
+  ["F4F9",0x8C49],
+  ["D84E",0x8C4A],
+  ["D84F",0x8C4B],
+  ["CDE3",0x8C4C],
+  ["D850",0x8C4D],
+  ["D851",0x8C4E],
+  ["D852",0x8C4F],
+  ["D853",0x8C50],
+  ["D854",0x8C51],
+  ["D855",0x8C52],
+  ["D856",0x8C53],
+  ["D857",0x8C54],
+  ["F5B9",0x8C55],
+  ["D858",0x8C56],
+  ["D859",0x8C57],
+  ["D85A",0x8C58],
+  ["D85B",0x8C59],
+  ["EBE0",0x8C5A],
+  ["D85C",0x8C5B],
+  ["D85D",0x8C5C],
+  ["D85E",0x8C5D],
+  ["D85F",0x8C5E],
+  ["D860",0x8C5F],
+  ["D861",0x8C60],
+  ["CFF3",0x8C61],
+  ["BBBF",0x8C62],
+  ["D862",0x8C63],
+  ["D863",0x8C64],
+  ["D864",0x8C65],
+  ["D865",0x8C66],
+  ["D866",0x8C67],
+  ["D867",0x8C68],
+  ["D868",0x8C69],
+  ["BAC0",0x8C6A],
+  ["D4A5",0x8C6B],
+  ["D869",0x8C6C],
+  ["D86A",0x8C6D],
+  ["D86B",0x8C6E],
+  ["D86C",0x8C6F],
+  ["D86D",0x8C70],
+  ["D86E",0x8C71],
+  ["D86F",0x8C72],
+  ["E1D9",0x8C73],
+  ["D870",0x8C74],
+  ["D871",0x8C75],
+  ["D872",0x8C76],
+  ["D873",0x8C77],
+  ["F5F4",0x8C78],
+  ["B1AA",0x8C79],
+  ["B2F2",0x8C7A],
+  ["D874",0x8C7B],
+  ["D875",0x8C7C],
+  ["D876",0x8C7D],
+  ["D877",0x8C7E],
+  ["D878",0x8C7F],
+  ["D879",0x8C80],
+  ["D87A",0x8C81],
+  ["F5F5",0x8C82],
+  ["D87B",0x8C83],
+  ["D87C",0x8C84],
+  ["F5F7",0x8C85],
+  ["D87D",0x8C86],
+  ["D87E",0x8C87],
+  ["D880",0x8C88],
+  ["BAD1",0x8C89],
+  ["F5F6",0x8C8A],
+  ["D881",0x8C8B],
+  ["C3B2",0x8C8C],
+  ["D882",0x8C8D],
+  ["D883",0x8C8E],
+  ["D884",0x8C8F],
+  ["D885",0x8C90],
+  ["D886",0x8C91],
+  ["D887",0x8C92],
+  ["D888",0x8C93],
+  ["F5F9",0x8C94],
+  ["D889",0x8C95],
+  ["D88A",0x8C96],
+  ["D88B",0x8C97],
+  ["F5F8",0x8C98],
+  ["D88C",0x8C99],
+  ["D88D",0x8C9A],
+  ["D88E",0x8C9B],
+  ["D88F",0x8C9C],
+  ["D890",0x8C9D],
+  ["D891",0x8C9E],
+  ["D892",0x8C9F],
+  ["D893",0x8CA0],
+  ["D894",0x8CA1],
+  ["D895",0x8CA2],
+  ["D896",0x8CA3],
+  ["D897",0x8CA4],
+  ["D898",0x8CA5],
+  ["D899",0x8CA6],
+  ["D89A",0x8CA7],
+  ["D89B",0x8CA8],
+  ["D89C",0x8CA9],
+  ["D89D",0x8CAA],
+  ["D89E",0x8CAB],
+  ["D89F",0x8CAC],
+  ["D8A0",0x8CAD],
+  ["D940",0x8CAE],
+  ["D941",0x8CAF],
+  ["D942",0x8CB0],
+  ["D943",0x8CB1],
+  ["D944",0x8CB2],
+  ["D945",0x8CB3],
+  ["D946",0x8CB4],
+  ["D947",0x8CB5],
+  ["D948",0x8CB6],
+  ["D949",0x8CB7],
+  ["D94A",0x8CB8],
+  ["D94B",0x8CB9],
+  ["D94C",0x8CBA],
+  ["D94D",0x8CBB],
+  ["D94E",0x8CBC],
+  ["D94F",0x8CBD],
+  ["D950",0x8CBE],
+  ["D951",0x8CBF],
+  ["D952",0x8CC0],
+  ["D953",0x8CC1],
+  ["D954",0x8CC2],
+  ["D955",0x8CC3],
+  ["D956",0x8CC4],
+  ["D957",0x8CC5],
+  ["D958",0x8CC6],
+  ["D959",0x8CC7],
+  ["D95A",0x8CC8],
+  ["D95B",0x8CC9],
+  ["D95C",0x8CCA],
+  ["D95D",0x8CCB],
+  ["D95E",0x8CCC],
+  ["D95F",0x8CCD],
+  ["D960",0x8CCE],
+  ["D961",0x8CCF],
+  ["D962",0x8CD0],
+  ["D963",0x8CD1],
+  ["D964",0x8CD2],
+  ["D965",0x8CD3],
+  ["D966",0x8CD4],
+  ["D967",0x8CD5],
+  ["D968",0x8CD6],
+  ["D969",0x8CD7],
+  ["D96A",0x8CD8],
+  ["D96B",0x8CD9],
+  ["D96C",0x8CDA],
+  ["D96D",0x8CDB],
+  ["D96E",0x8CDC],
+  ["D96F",0x8CDD],
+  ["D970",0x8CDE],
+  ["D971",0x8CDF],
+  ["D972",0x8CE0],
+  ["D973",0x8CE1],
+  ["D974",0x8CE2],
+  ["D975",0x8CE3],
+  ["D976",0x8CE4],
+  ["D977",0x8CE5],
+  ["D978",0x8CE6],
+  ["D979",0x8CE7],
+  ["D97A",0x8CE8],
+  ["D97B",0x8CE9],
+  ["D97C",0x8CEA],
+  ["D97D",0x8CEB],
+  ["D97E",0x8CEC],
+  ["D980",0x8CED],
+  ["D981",0x8CEE],
+  ["D982",0x8CEF],
+  ["D983",0x8CF0],
+  ["D984",0x8CF1],
+  ["D985",0x8CF2],
+  ["D986",0x8CF3],
+  ["D987",0x8CF4],
+  ["D988",0x8CF5],
+  ["D989",0x8CF6],
+  ["D98A",0x8CF7],
+  ["D98B",0x8CF8],
+  ["D98C",0x8CF9],
+  ["D98D",0x8CFA],
+  ["D98E",0x8CFB],
+  ["D98F",0x8CFC],
+  ["D990",0x8CFD],
+  ["D991",0x8CFE],
+  ["D992",0x8CFF],
+  ["D993",0x8D00],
+  ["D994",0x8D01],
+  ["D995",0x8D02],
+  ["D996",0x8D03],
+  ["D997",0x8D04],
+  ["D998",0x8D05],
+  ["D999",0x8D06],
+  ["D99A",0x8D07],
+  ["D99B",0x8D08],
+  ["D99C",0x8D09],
+  ["D99D",0x8D0A],
+  ["D99E",0x8D0B],
+  ["D99F",0x8D0C],
+  ["D9A0",0x8D0D],
+  ["DA40",0x8D0E],
+  ["DA41",0x8D0F],
+  ["DA42",0x8D10],
+  ["DA43",0x8D11],
+  ["DA44",0x8D12],
+  ["DA45",0x8D13],
+  ["DA46",0x8D14],
+  ["DA47",0x8D15],
+  ["DA48",0x8D16],
+  ["DA49",0x8D17],
+  ["DA4A",0x8D18],
+  ["DA4B",0x8D19],
+  ["DA4C",0x8D1A],
+  ["DA4D",0x8D1B],
+  ["DA4E",0x8D1C],
+  ["B1B4",0x8D1D],
+  ["D5EA",0x8D1E],
+  ["B8BA",0x8D1F],
+  ["DA4F",0x8D20],
+  ["B9B1",0x8D21],
+  ["B2C6",0x8D22],
+  ["D4F0",0x8D23],
+  ["CFCD",0x8D24],
+  ["B0DC",0x8D25],
+  ["D5CB",0x8D26],
+  ["BBF5",0x8D27],
+  ["D6CA",0x8D28],
+  ["B7B7",0x8D29],
+  ["CCB0",0x8D2A],
+  ["C6B6",0x8D2B],
+  ["B1E1",0x8D2C],
+  ["B9BA",0x8D2D],
+  ["D6FC",0x8D2E],
+  ["B9E1",0x8D2F],
+  ["B7A1",0x8D30],
+  ["BCFA",0x8D31],
+  ["EADA",0x8D32],
+  ["EADB",0x8D33],
+  ["CCF9",0x8D34],
+  ["B9F3",0x8D35],
+  ["EADC",0x8D36],
+  ["B4FB",0x8D37],
+  ["C3B3",0x8D38],
+  ["B7D1",0x8D39],
+  ["BAD8",0x8D3A],
+  ["EADD",0x8D3B],
+  ["D4F4",0x8D3C],
+  ["EADE",0x8D3D],
+  ["BCD6",0x8D3E],
+  ["BBDF",0x8D3F],
+  ["EADF",0x8D40],
+  ["C1DE",0x8D41],
+  ["C2B8",0x8D42],
+  ["D4DF",0x8D43],
+  ["D7CA",0x8D44],
+  ["EAE0",0x8D45],
+  ["EAE1",0x8D46],
+  ["EAE4",0x8D47],
+  ["EAE2",0x8D48],
+  ["EAE3",0x8D49],
+  ["C9DE",0x8D4A],
+  ["B8B3",0x8D4B],
+  ["B6C4",0x8D4C],
+  ["EAE5",0x8D4D],
+  ["CAEA",0x8D4E],
+  ["C9CD",0x8D4F],
+  ["B4CD",0x8D50],
+  ["DA50",0x8D51],
+  ["DA51",0x8D52],
+  ["E2D9",0x8D53],
+  ["C5E2",0x8D54],
+  ["EAE6",0x8D55],
+  ["C0B5",0x8D56],
+  ["DA52",0x8D57],
+  ["D7B8",0x8D58],
+  ["EAE7",0x8D59],
+  ["D7AC",0x8D5A],
+  ["C8FC",0x8D5B],
+  ["D8D3",0x8D5C],
+  ["D8CD",0x8D5D],
+  ["D4DE",0x8D5E],
+  ["DA53",0x8D5F],
+  ["D4F9",0x8D60],
+  ["C9C4",0x8D61],
+  ["D3AE",0x8D62],
+  ["B8D3",0x8D63],
+  ["B3E0",0x8D64],
+  ["DA54",0x8D65],
+  ["C9E2",0x8D66],
+  ["F4F6",0x8D67],
+  ["DA55",0x8D68],
+  ["DA56",0x8D69],
+  ["DA57",0x8D6A],
+  ["BAD5",0x8D6B],
+  ["DA58",0x8D6C],
+  ["F4F7",0x8D6D],
+  ["DA59",0x8D6E],
+  ["DA5A",0x8D6F],
+  ["D7DF",0x8D70],
+  ["DA5B",0x8D71],
+  ["DA5C",0x8D72],
+  ["F4F1",0x8D73],
+  ["B8B0",0x8D74],
+  ["D5D4",0x8D75],
+  ["B8CF",0x8D76],
+  ["C6F0",0x8D77],
+  ["DA5D",0x8D78],
+  ["DA5E",0x8D79],
+  ["DA5F",0x8D7A],
+  ["DA60",0x8D7B],
+  ["DA61",0x8D7C],
+  ["DA62",0x8D7D],
+  ["DA63",0x8D7E],
+  ["DA64",0x8D7F],
+  ["DA65",0x8D80],
+  ["B3C3",0x8D81],
+  ["DA66",0x8D82],
+  ["DA67",0x8D83],
+  ["F4F2",0x8D84],
+  ["B3AC",0x8D85],
+  ["DA68",0x8D86],
+  ["DA69",0x8D87],
+  ["DA6A",0x8D88],
+  ["DA6B",0x8D89],
+  ["D4BD",0x8D8A],
+  ["C7F7",0x8D8B],
+  ["DA6C",0x8D8C],
+  ["DA6D",0x8D8D],
+  ["DA6E",0x8D8E],
+  ["DA6F",0x8D8F],
+  ["DA70",0x8D90],
+  ["F4F4",0x8D91],
+  ["DA71",0x8D92],
+  ["DA72",0x8D93],
+  ["F4F3",0x8D94],
+  ["DA73",0x8D95],
+  ["DA74",0x8D96],
+  ["DA75",0x8D97],
+  ["DA76",0x8D98],
+  ["DA77",0x8D99],
+  ["DA78",0x8D9A],
+  ["DA79",0x8D9B],
+  ["DA7A",0x8D9C],
+  ["DA7B",0x8D9D],
+  ["DA7C",0x8D9E],
+  ["CCCB",0x8D9F],
+  ["DA7D",0x8DA0],
+  ["DA7E",0x8DA1],
+  ["DA80",0x8DA2],
+  ["C8A4",0x8DA3],
+  ["DA81",0x8DA4],
+  ["DA82",0x8DA5],
+  ["DA83",0x8DA6],
+  ["DA84",0x8DA7],
+  ["DA85",0x8DA8],
+  ["DA86",0x8DA9],
+  ["DA87",0x8DAA],
+  ["DA88",0x8DAB],
+  ["DA89",0x8DAC],
+  ["DA8A",0x8DAD],
+  ["DA8B",0x8DAE],
+  ["DA8C",0x8DAF],
+  ["DA8D",0x8DB0],
+  ["F4F5",0x8DB1],
+  ["DA8E",0x8DB2],
+  ["D7E3",0x8DB3],
+  ["C5BF",0x8DB4],
+  ["F5C0",0x8DB5],
+  ["DA8F",0x8DB6],
+  ["DA90",0x8DB7],
+  ["F5BB",0x8DB8],
+  ["DA91",0x8DB9],
+  ["F5C3",0x8DBA],
+  ["DA92",0x8DBB],
+  ["F5C2",0x8DBC],
+  ["DA93",0x8DBD],
+  ["D6BA",0x8DBE],
+  ["F5C1",0x8DBF],
+  ["DA94",0x8DC0],
+  ["DA95",0x8DC1],
+  ["DA96",0x8DC2],
+  ["D4BE",0x8DC3],
+  ["F5C4",0x8DC4],
+  ["DA97",0x8DC5],
+  ["F5CC",0x8DC6],
+  ["DA98",0x8DC7],
+  ["DA99",0x8DC8],
+  ["DA9A",0x8DC9],
+  ["DA9B",0x8DCA],
+  ["B0CF",0x8DCB],
+  ["B5F8",0x8DCC],
+  ["DA9C",0x8DCD],
+  ["F5C9",0x8DCE],
+  ["F5CA",0x8DCF],
+  ["DA9D",0x8DD0],
+  ["C5DC",0x8DD1],
+  ["DA9E",0x8DD2],
+  ["DA9F",0x8DD3],
+  ["DAA0",0x8DD4],
+  ["DB40",0x8DD5],
+  ["F5C5",0x8DD6],
+  ["F5C6",0x8DD7],
+  ["DB41",0x8DD8],
+  ["DB42",0x8DD9],
+  ["F5C7",0x8DDA],
+  ["F5CB",0x8DDB],
+  ["DB43",0x8DDC],
+  ["BEE0",0x8DDD],
+  ["F5C8",0x8DDE],
+  ["B8FA",0x8DDF],
+  ["DB44",0x8DE0],
+  ["DB45",0x8DE1],
+  ["DB46",0x8DE2],
+  ["F5D0",0x8DE3],
+  ["F5D3",0x8DE4],
+  ["DB47",0x8DE5],
+  ["DB48",0x8DE6],
+  ["DB49",0x8DE7],
+  ["BFE7",0x8DE8],
+  ["DB4A",0x8DE9],
+  ["B9F2",0x8DEA],
+  ["F5BC",0x8DEB],
+  ["F5CD",0x8DEC],
+  ["DB4B",0x8DED],
+  ["DB4C",0x8DEE],
+  ["C2B7",0x8DEF],
+  ["DB4D",0x8DF0],
+  ["DB4E",0x8DF1],
+  ["DB4F",0x8DF2],
+  ["CCF8",0x8DF3],
+  ["DB50",0x8DF4],
+  ["BCF9",0x8DF5],
+  ["DB51",0x8DF6],
+  ["F5CE",0x8DF7],
+  ["F5CF",0x8DF8],
+  ["F5D1",0x8DF9],
+  ["B6E5",0x8DFA],
+  ["F5D2",0x8DFB],
+  ["DB52",0x8DFC],
+  ["F5D5",0x8DFD],
+  ["DB53",0x8DFE],
+  ["DB54",0x8DFF],
+  ["DB55",0x8E00],
+  ["DB56",0x8E01],
+  ["DB57",0x8E02],
+  ["DB58",0x8E03],
+  ["DB59",0x8E04],
+  ["F5BD",0x8E05],
+  ["DB5A",0x8E06],
+  ["DB5B",0x8E07],
+  ["DB5C",0x8E08],
+  ["F5D4",0x8E09],
+  ["D3BB",0x8E0A],
+  ["DB5D",0x8E0B],
+  ["B3EC",0x8E0C],
+  ["DB5E",0x8E0D],
+  ["DB5F",0x8E0E],
+  ["CCA4",0x8E0F],
+  ["DB60",0x8E10],
+  ["DB61",0x8E11],
+  ["DB62",0x8E12],
+  ["DB63",0x8E13],
+  ["F5D6",0x8E14],
+  ["DB64",0x8E15],
+  ["DB65",0x8E16],
+  ["DB66",0x8E17],
+  ["DB67",0x8E18],
+  ["DB68",0x8E19],
+  ["DB69",0x8E1A],
+  ["DB6A",0x8E1B],
+  ["DB6B",0x8E1C],
+  ["F5D7",0x8E1D],
+  ["BEE1",0x8E1E],
+  ["F5D8",0x8E1F],
+  ["DB6C",0x8E20],
+  ["DB6D",0x8E21],
+  ["CCDF",0x8E22],
+  ["F5DB",0x8E23],
+  ["DB6E",0x8E24],
+  ["DB6F",0x8E25],
+  ["DB70",0x8E26],
+  ["DB71",0x8E27],
+  ["DB72",0x8E28],
+  ["B2C8",0x8E29],
+  ["D7D9",0x8E2A],
+  ["DB73",0x8E2B],
+  ["F5D9",0x8E2C],
+  ["DB74",0x8E2D],
+  ["F5DA",0x8E2E],
+  ["F5DC",0x8E2F],
+  ["DB75",0x8E30],
+  ["F5E2",0x8E31],
+  ["DB76",0x8E32],
+  ["DB77",0x8E33],
+  ["DB78",0x8E34],
+  ["F5E0",0x8E35],
+  ["DB79",0x8E36],
+  ["DB7A",0x8E37],
+  ["DB7B",0x8E38],
+  ["F5DF",0x8E39],
+  ["F5DD",0x8E3A],
+  ["DB7C",0x8E3B],
+  ["DB7D",0x8E3C],
+  ["F5E1",0x8E3D],
+  ["DB7E",0x8E3E],
+  ["DB80",0x8E3F],
+  ["F5DE",0x8E40],
+  ["F5E4",0x8E41],
+  ["F5E5",0x8E42],
+  ["DB81",0x8E43],
+  ["CCE3",0x8E44],
+  ["DB82",0x8E45],
+  ["DB83",0x8E46],
+  ["E5BF",0x8E47],
+  ["B5B8",0x8E48],
+  ["F5E3",0x8E49],
+  ["F5E8",0x8E4A],
+  ["CCA3",0x8E4B],
+  ["DB84",0x8E4C],
+  ["DB85",0x8E4D],
+  ["DB86",0x8E4E],
+  ["DB87",0x8E4F],
+  ["DB88",0x8E50],
+  ["F5E6",0x8E51],
+  ["F5E7",0x8E52],
+  ["DB89",0x8E53],
+  ["DB8A",0x8E54],
+  ["DB8B",0x8E55],
+  ["DB8C",0x8E56],
+  ["DB8D",0x8E57],
+  ["DB8E",0x8E58],
+  ["F5BE",0x8E59],
+  ["DB8F",0x8E5A],
+  ["DB90",0x8E5B],
+  ["DB91",0x8E5C],
+  ["DB92",0x8E5D],
+  ["DB93",0x8E5E],
+  ["DB94",0x8E5F],
+  ["DB95",0x8E60],
+  ["DB96",0x8E61],
+  ["DB97",0x8E62],
+  ["DB98",0x8E63],
+  ["DB99",0x8E64],
+  ["DB9A",0x8E65],
+  ["B1C4",0x8E66],
+  ["DB9B",0x8E67],
+  ["DB9C",0x8E68],
+  ["F5BF",0x8E69],
+  ["DB9D",0x8E6A],
+  ["DB9E",0x8E6B],
+  ["B5C5",0x8E6C],
+  ["B2E4",0x8E6D],
+  ["DB9F",0x8E6E],
+  ["F5EC",0x8E6F],
+  ["F5E9",0x8E70],
+  ["DBA0",0x8E71],
+  ["B6D7",0x8E72],
+  ["DC40",0x8E73],
+  ["F5ED",0x8E74],
+  ["DC41",0x8E75],
+  ["F5EA",0x8E76],
+  ["DC42",0x8E77],
+  ["DC43",0x8E78],
+  ["DC44",0x8E79],
+  ["DC45",0x8E7A],
+  ["DC46",0x8E7B],
+  ["F5EB",0x8E7C],
+  ["DC47",0x8E7D],
+  ["DC48",0x8E7E],
+  ["B4DA",0x8E7F],
+  ["DC49",0x8E80],
+  ["D4EA",0x8E81],
+  ["DC4A",0x8E82],
+  ["DC4B",0x8E83],
+  ["DC4C",0x8E84],
+  ["F5EE",0x8E85],
+  ["DC4D",0x8E86],
+  ["B3F9",0x8E87],
+  ["DC4E",0x8E88],
+  ["DC4F",0x8E89],
+  ["DC50",0x8E8A],
+  ["DC51",0x8E8B],
+  ["DC52",0x8E8C],
+  ["DC53",0x8E8D],
+  ["DC54",0x8E8E],
+  ["F5EF",0x8E8F],
+  ["F5F1",0x8E90],
+  ["DC55",0x8E91],
+  ["DC56",0x8E92],
+  ["DC57",0x8E93],
+  ["F5F0",0x8E94],
+  ["DC58",0x8E95],
+  ["DC59",0x8E96],
+  ["DC5A",0x8E97],
+  ["DC5B",0x8E98],
+  ["DC5C",0x8E99],
+  ["DC5D",0x8E9A],
+  ["DC5E",0x8E9B],
+  ["F5F2",0x8E9C],
+  ["DC5F",0x8E9D],
+  ["F5F3",0x8E9E],
+  ["DC60",0x8E9F],
+  ["DC61",0x8EA0],
+  ["DC62",0x8EA1],
+  ["DC63",0x8EA2],
+  ["DC64",0x8EA3],
+  ["DC65",0x8EA4],
+  ["DC66",0x8EA5],
+  ["DC67",0x8EA6],
+  ["DC68",0x8EA7],
+  ["DC69",0x8EA8],
+  ["DC6A",0x8EA9],
+  ["DC6B",0x8EAA],
+  ["C9ED",0x8EAB],
+  ["B9AA",0x8EAC],
+  ["DC6C",0x8EAD],
+  ["DC6D",0x8EAE],
+  ["C7FB",0x8EAF],
+  ["DC6E",0x8EB0],
+  ["DC6F",0x8EB1],
+  ["B6E3",0x8EB2],
+  ["DC70",0x8EB3],
+  ["DC71",0x8EB4],
+  ["DC72",0x8EB5],
+  ["DC73",0x8EB6],
+  ["DC74",0x8EB7],
+  ["DC75",0x8EB8],
+  ["DC76",0x8EB9],
+  ["CCC9",0x8EBA],
+  ["DC77",0x8EBB],
+  ["DC78",0x8EBC],
+  ["DC79",0x8EBD],
+  ["DC7A",0x8EBE],
+  ["DC7B",0x8EBF],
+  ["DC7C",0x8EC0],
+  ["DC7D",0x8EC1],
+  ["DC7E",0x8EC2],
+  ["DC80",0x8EC3],
+  ["DC81",0x8EC4],
+  ["DC82",0x8EC5],
+  ["DC83",0x8EC6],
+  ["DC84",0x8EC7],
+  ["DC85",0x8EC8],
+  ["DC86",0x8EC9],
+  ["DC87",0x8ECA],
+  ["DC88",0x8ECB],
+  ["DC89",0x8ECC],
+  ["DC8A",0x8ECD],
+  ["EAA6",0x8ECE],
+  ["DC8B",0x8ECF],
+  ["DC8C",0x8ED0],
+  ["DC8D",0x8ED1],
+  ["DC8E",0x8ED2],
+  ["DC8F",0x8ED3],
+  ["DC90",0x8ED4],
+  ["DC91",0x8ED5],
+  ["DC92",0x8ED6],
+  ["DC93",0x8ED7],
+  ["DC94",0x8ED8],
+  ["DC95",0x8ED9],
+  ["DC96",0x8EDA],
+  ["DC97",0x8EDB],
+  ["DC98",0x8EDC],
+  ["DC99",0x8EDD],
+  ["DC9A",0x8EDE],
+  ["DC9B",0x8EDF],
+  ["DC9C",0x8EE0],
+  ["DC9D",0x8EE1],
+  ["DC9E",0x8EE2],
+  ["DC9F",0x8EE3],
+  ["DCA0",0x8EE4],
+  ["DD40",0x8EE5],
+  ["DD41",0x8EE6],
+  ["DD42",0x8EE7],
+  ["DD43",0x8EE8],
+  ["DD44",0x8EE9],
+  ["DD45",0x8EEA],
+  ["DD46",0x8EEB],
+  ["DD47",0x8EEC],
+  ["DD48",0x8EED],
+  ["DD49",0x8EEE],
+  ["DD4A",0x8EEF],
+  ["DD4B",0x8EF0],
+  ["DD4C",0x8EF1],
+  ["DD4D",0x8EF2],
+  ["DD4E",0x8EF3],
+  ["DD4F",0x8EF4],
+  ["DD50",0x8EF5],
+  ["DD51",0x8EF6],
+  ["DD52",0x8EF7],
+  ["DD53",0x8EF8],
+  ["DD54",0x8EF9],
+  ["DD55",0x8EFA],
+  ["DD56",0x8EFB],
+  ["DD57",0x8EFC],
+  ["DD58",0x8EFD],
+  ["DD59",0x8EFE],
+  ["DD5A",0x8EFF],
+  ["DD5B",0x8F00],
+  ["DD5C",0x8F01],
+  ["DD5D",0x8F02],
+  ["DD5E",0x8F03],
+  ["DD5F",0x8F04],
+  ["DD60",0x8F05],
+  ["DD61",0x8F06],
+  ["DD62",0x8F07],
+  ["DD63",0x8F08],
+  ["DD64",0x8F09],
+  ["DD65",0x8F0A],
+  ["DD66",0x8F0B],
+  ["DD67",0x8F0C],
+  ["DD68",0x8F0D],
+  ["DD69",0x8F0E],
+  ["DD6A",0x8F0F],
+  ["DD6B",0x8F10],
+  ["DD6C",0x8F11],
+  ["DD6D",0x8F12],
+  ["DD6E",0x8F13],
+  ["DD6F",0x8F14],
+  ["DD70",0x8F15],
+  ["DD71",0x8F16],
+  ["DD72",0x8F17],
+  ["DD73",0x8F18],
+  ["DD74",0x8F19],
+  ["DD75",0x8F1A],
+  ["DD76",0x8F1B],
+  ["DD77",0x8F1C],
+  ["DD78",0x8F1D],
+  ["DD79",0x8F1E],
+  ["DD7A",0x8F1F],
+  ["DD7B",0x8F20],
+  ["DD7C",0x8F21],
+  ["DD7D",0x8F22],
+  ["DD7E",0x8F23],
+  ["DD80",0x8F24],
+  ["DD81",0x8F25],
+  ["DD82",0x8F26],
+  ["DD83",0x8F27],
+  ["DD84",0x8F28],
+  ["DD85",0x8F29],
+  ["DD86",0x8F2A],
+  ["DD87",0x8F2B],
+  ["DD88",0x8F2C],
+  ["DD89",0x8F2D],
+  ["DD8A",0x8F2E],
+  ["DD8B",0x8F2F],
+  ["DD8C",0x8F30],
+  ["DD8D",0x8F31],
+  ["DD8E",0x8F32],
+  ["DD8F",0x8F33],
+  ["DD90",0x8F34],
+  ["DD91",0x8F35],
+  ["DD92",0x8F36],
+  ["DD93",0x8F37],
+  ["DD94",0x8F38],
+  ["DD95",0x8F39],
+  ["DD96",0x8F3A],
+  ["DD97",0x8F3B],
+  ["DD98",0x8F3C],
+  ["DD99",0x8F3D],
+  ["DD9A",0x8F3E],
+  ["DD9B",0x8F3F],
+  ["DD9C",0x8F40],
+  ["DD9D",0x8F41],
+  ["DD9E",0x8F42],
+  ["DD9F",0x8F43],
+  ["DDA0",0x8F44],
+  ["DE40",0x8F45],
+  ["DE41",0x8F46],
+  ["DE42",0x8F47],
+  ["DE43",0x8F48],
+  ["DE44",0x8F49],
+  ["DE45",0x8F4A],
+  ["DE46",0x8F4B],
+  ["DE47",0x8F4C],
+  ["DE48",0x8F4D],
+  ["DE49",0x8F4E],
+  ["DE4A",0x8F4F],
+  ["DE4B",0x8F50],
+  ["DE4C",0x8F51],
+  ["DE4D",0x8F52],
+  ["DE4E",0x8F53],
+  ["DE4F",0x8F54],
+  ["DE50",0x8F55],
+  ["DE51",0x8F56],
+  ["DE52",0x8F57],
+  ["DE53",0x8F58],
+  ["DE54",0x8F59],
+  ["DE55",0x8F5A],
+  ["DE56",0x8F5B],
+  ["DE57",0x8F5C],
+  ["DE58",0x8F5D],
+  ["DE59",0x8F5E],
+  ["DE5A",0x8F5F],
+  ["DE5B",0x8F60],
+  ["DE5C",0x8F61],
+  ["DE5D",0x8F62],
+  ["DE5E",0x8F63],
+  ["DE5F",0x8F64],
+  ["DE60",0x8F65],
+  ["B3B5",0x8F66],
+  ["D4FE",0x8F67],
+  ["B9EC",0x8F68],
+  ["D0F9",0x8F69],
+  ["DE61",0x8F6A],
+  ["E9ED",0x8F6B],
+  ["D7AA",0x8F6C],
+  ["E9EE",0x8F6D],
+  ["C2D6",0x8F6E],
+  ["C8ED",0x8F6F],
+  ["BAE4",0x8F70],
+  ["E9EF",0x8F71],
+  ["E9F0",0x8F72],
+  ["E9F1",0x8F73],
+  ["D6E1",0x8F74],
+  ["E9F2",0x8F75],
+  ["E9F3",0x8F76],
+  ["E9F5",0x8F77],
+  ["E9F4",0x8F78],
+  ["E9F6",0x8F79],
+  ["E9F7",0x8F7A],
+  ["C7E1",0x8F7B],
+  ["E9F8",0x8F7C],
+  ["D4D8",0x8F7D],
+  ["E9F9",0x8F7E],
+  ["BDCE",0x8F7F],
+  ["DE62",0x8F80],
+  ["E9FA",0x8F81],
+  ["E9FB",0x8F82],
+  ["BDCF",0x8F83],
+  ["E9FC",0x8F84],
+  ["B8A8",0x8F85],
+  ["C1BE",0x8F86],
+  ["E9FD",0x8F87],
+  ["B1B2",0x8F88],
+  ["BBD4",0x8F89],
+  ["B9F5",0x8F8A],
+  ["E9FE",0x8F8B],
+  ["DE63",0x8F8C],
+  ["EAA1",0x8F8D],
+  ["EAA2",0x8F8E],
+  ["EAA3",0x8F8F],
+  ["B7F8",0x8F90],
+  ["BCAD",0x8F91],
+  ["DE64",0x8F92],
+  ["CAE4",0x8F93],
+  ["E0CE",0x8F94],
+  ["D4AF",0x8F95],
+  ["CFBD",0x8F96],
+  ["D5B7",0x8F97],
+  ["EAA4",0x8F98],
+  ["D5DE",0x8F99],
+  ["EAA5",0x8F9A],
+  ["D0C1",0x8F9B],
+  ["B9BC",0x8F9C],
+  ["DE65",0x8F9D],
+  ["B4C7",0x8F9E],
+  ["B1D9",0x8F9F],
+  ["DE66",0x8FA0],
+  ["DE67",0x8FA1],
+  ["DE68",0x8FA2],
+  ["C0B1",0x8FA3],
+  ["DE69",0x8FA4],
+  ["DE6A",0x8FA5],
+  ["DE6B",0x8FA6],
+  ["DE6C",0x8FA7],
+  ["B1E6",0x8FA8],
+  ["B1E7",0x8FA9],
+  ["DE6D",0x8FAA],
+  ["B1E8",0x8FAB],
+  ["DE6E",0x8FAC],
+  ["DE6F",0x8FAD],
+  ["DE70",0x8FAE],
+  ["DE71",0x8FAF],
+  ["B3BD",0x8FB0],
+  ["C8E8",0x8FB1],
+  ["DE72",0x8FB2],
+  ["DE73",0x8FB3],
+  ["DE74",0x8FB4],
+  ["DE75",0x8FB5],
+  ["E5C1",0x8FB6],
+  ["DE76",0x8FB7],
+  ["DE77",0x8FB8],
+  ["B1DF",0x8FB9],
+  ["DE78",0x8FBA],
+  ["DE79",0x8FBB],
+  ["DE7A",0x8FBC],
+  ["C1C9",0x8FBD],
+  ["B4EF",0x8FBE],
+  ["DE7B",0x8FBF],
+  ["DE7C",0x8FC0],
+  ["C7A8",0x8FC1],
+  ["D3D8",0x8FC2],
+  ["DE7D",0x8FC3],
+  ["C6F9",0x8FC4],
+  ["D1B8",0x8FC5],
+  ["DE7E",0x8FC6],
+  ["B9FD",0x8FC7],
+  ["C2F5",0x8FC8],
+  ["DE80",0x8FC9],
+  ["DE81",0x8FCA],
+  ["DE82",0x8FCB],
+  ["DE83",0x8FCC],
+  ["DE84",0x8FCD],
+  ["D3AD",0x8FCE],
+  ["DE85",0x8FCF],
+  ["D4CB",0x8FD0],
+  ["BDFC",0x8FD1],
+  ["DE86",0x8FD2],
+  ["E5C2",0x8FD3],
+  ["B7B5",0x8FD4],
+  ["E5C3",0x8FD5],
+  ["DE87",0x8FD6],
+  ["DE88",0x8FD7],
+  ["BBB9",0x8FD8],
+  ["D5E2",0x8FD9],
+  ["DE89",0x8FDA],
+  ["BDF8",0x8FDB],
+  ["D4B6",0x8FDC],
+  ["CEA5",0x8FDD],
+  ["C1AC",0x8FDE],
+  ["B3D9",0x8FDF],
+  ["DE8A",0x8FE0],
+  ["DE8B",0x8FE1],
+  ["CCF6",0x8FE2],
+  ["DE8C",0x8FE3],
+  ["E5C6",0x8FE4],
+  ["E5C4",0x8FE5],
+  ["E5C8",0x8FE6],
+  ["DE8D",0x8FE7],
+  ["E5CA",0x8FE8],
+  ["E5C7",0x8FE9],
+  ["B5CF",0x8FEA],
+  ["C6C8",0x8FEB],
+  ["DE8E",0x8FEC],
+  ["B5FC",0x8FED],
+  ["E5C5",0x8FEE],
+  ["DE8F",0x8FEF],
+  ["CAF6",0x8FF0],
+  ["DE90",0x8FF1],
+  ["DE91",0x8FF2],
+  ["E5C9",0x8FF3],
+  ["DE92",0x8FF4],
+  ["DE93",0x8FF5],
+  ["DE94",0x8FF6],
+  ["C3D4",0x8FF7],
+  ["B1C5",0x8FF8],
+  ["BCA3",0x8FF9],
+  ["DE95",0x8FFA],
+  ["DE96",0x8FFB],
+  ["DE97",0x8FFC],
+  ["D7B7",0x8FFD],
+  ["DE98",0x8FFE],
+  ["DE99",0x8FFF],
+  ["CDCB",0x9000],
+  ["CBCD",0x9001],
+  ["CACA",0x9002],
+  ["CCD3",0x9003],
+  ["E5CC",0x9004],
+  ["E5CB",0x9005],
+  ["C4E6",0x9006],
+  ["DE9A",0x9007],
+  ["DE9B",0x9008],
+  ["D1A1",0x9009],
+  ["D1B7",0x900A],
+  ["E5CD",0x900B],
+  ["DE9C",0x900C],
+  ["E5D0",0x900D],
+  ["DE9D",0x900E],
+  ["CDB8",0x900F],
+  ["D6F0",0x9010],
+  ["E5CF",0x9011],
+  ["B5DD",0x9012],
+  ["DE9E",0x9013],
+  ["CDBE",0x9014],
+  ["DE9F",0x9015],
+  ["E5D1",0x9016],
+  ["B6BA",0x9017],
+  ["DEA0",0x9018],
+  ["DF40",0x9019],
+  ["CDA8",0x901A],
+  ["B9E4",0x901B],
+  ["DF41",0x901C],
+  ["CAC5",0x901D],
+  ["B3D1",0x901E],
+  ["CBD9",0x901F],
+  ["D4EC",0x9020],
+  ["E5D2",0x9021],
+  ["B7EA",0x9022],
+  ["DF42",0x9023],
+  ["DF43",0x9024],
+  ["DF44",0x9025],
+  ["E5CE",0x9026],
+  ["DF45",0x9027],
+  ["DF46",0x9028],
+  ["DF47",0x9029],
+  ["DF48",0x902A],
+  ["DF49",0x902B],
+  ["DF4A",0x902C],
+  ["E5D5",0x902D],
+  ["B4FE",0x902E],
+  ["E5D6",0x902F],
+  ["DF4B",0x9030],
+  ["DF4C",0x9031],
+  ["DF4D",0x9032],
+  ["DF4E",0x9033],
+  ["DF4F",0x9034],
+  ["E5D3",0x9035],
+  ["E5D4",0x9036],
+  ["DF50",0x9037],
+  ["D2DD",0x9038],
+  ["DF51",0x9039],
+  ["DF52",0x903A],
+  ["C2DF",0x903B],
+  ["B1C6",0x903C],
+  ["DF53",0x903D],
+  ["D3E2",0x903E],
+  ["DF54",0x903F],
+  ["DF55",0x9040],
+  ["B6DD",0x9041],
+  ["CBEC",0x9042],
+  ["DF56",0x9043],
+  ["E5D7",0x9044],
+  ["DF57",0x9045],
+  ["DF58",0x9046],
+  ["D3F6",0x9047],
+  ["DF59",0x9048],
+  ["DF5A",0x9049],
+  ["DF5B",0x904A],
+  ["DF5C",0x904B],
+  ["DF5D",0x904C],
+  ["B1E9",0x904D],
+  ["DF5E",0x904E],
+  ["B6F4",0x904F],
+  ["E5DA",0x9050],
+  ["E5D8",0x9051],
+  ["E5D9",0x9052],
+  ["B5C0",0x9053],
+  ["DF5F",0x9054],
+  ["DF60",0x9055],
+  ["DF61",0x9056],
+  ["D2C5",0x9057],
+  ["E5DC",0x9058],
+  ["DF62",0x9059],
+  ["DF63",0x905A],
+  ["E5DE",0x905B],
+  ["DF64",0x905C],
+  ["DF65",0x905D],
+  ["DF66",0x905E],
+  ["DF67",0x905F],
+  ["DF68",0x9060],
+  ["DF69",0x9061],
+  ["E5DD",0x9062],
+  ["C7B2",0x9063],
+  ["DF6A",0x9064],
+  ["D2A3",0x9065],
+  ["DF6B",0x9066],
+  ["DF6C",0x9067],
+  ["E5DB",0x9068],
+  ["DF6D",0x9069],
+  ["DF6E",0x906A],
+  ["DF6F",0x906B],
+  ["DF70",0x906C],
+  ["D4E2",0x906D],
+  ["D5DA",0x906E],
+  ["DF71",0x906F],
+  ["DF72",0x9070],
+  ["DF73",0x9071],
+  ["DF74",0x9072],
+  ["DF75",0x9073],
+  ["E5E0",0x9074],
+  ["D7F1",0x9075],
+  ["DF76",0x9076],
+  ["DF77",0x9077],
+  ["DF78",0x9078],
+  ["DF79",0x9079],
+  ["DF7A",0x907A],
+  ["DF7B",0x907B],
+  ["DF7C",0x907C],
+  ["E5E1",0x907D],
+  ["DF7D",0x907E],
+  ["B1DC",0x907F],
+  ["D1FB",0x9080],
+  ["DF7E",0x9081],
+  ["E5E2",0x9082],
+  ["E5E4",0x9083],
+  ["DF80",0x9084],
+  ["DF81",0x9085],
+  ["DF82",0x9086],
+  ["DF83",0x9087],
+  ["E5E3",0x9088],
+  ["DF84",0x9089],
+  ["DF85",0x908A],
+  ["E5E5",0x908B],
+  ["DF86",0x908C],
+  ["DF87",0x908D],
+  ["DF88",0x908E],
+  ["DF89",0x908F],
+  ["DF8A",0x9090],
+  ["D2D8",0x9091],
+  ["DF8B",0x9092],
+  ["B5CB",0x9093],
+  ["DF8C",0x9094],
+  ["E7DF",0x9095],
+  ["DF8D",0x9096],
+  ["DAF5",0x9097],
+  ["DF8E",0x9098],
+  ["DAF8",0x9099],
+  ["DF8F",0x909A],
+  ["DAF6",0x909B],
+  ["DF90",0x909C],
+  ["DAF7",0x909D],
+  ["DF91",0x909E],
+  ["DF92",0x909F],
+  ["DF93",0x90A0],
+  ["DAFA",0x90A1],
+  ["D0CF",0x90A2],
+  ["C4C7",0x90A3],
+  ["DF94",0x90A4],
+  ["DF95",0x90A5],
+  ["B0EE",0x90A6],
+  ["DF96",0x90A7],
+  ["DF97",0x90A8],
+  ["DF98",0x90A9],
+  ["D0B0",0x90AA],
+  ["DF99",0x90AB],
+  ["DAF9",0x90AC],
+  ["DF9A",0x90AD],
+  ["D3CA",0x90AE],
+  ["BAAA",0x90AF],
+  ["DBA2",0x90B0],
+  ["C7F1",0x90B1],
+  ["DF9B",0x90B2],
+  ["DAFC",0x90B3],
+  ["DAFB",0x90B4],
+  ["C9DB",0x90B5],
+  ["DAFD",0x90B6],
+  ["DF9C",0x90B7],
+  ["DBA1",0x90B8],
+  ["D7DE",0x90B9],
+  ["DAFE",0x90BA],
+  ["C1DA",0x90BB],
+  ["DF9D",0x90BC],
+  ["DF9E",0x90BD],
+  ["DBA5",0x90BE],
+  ["DF9F",0x90BF],
+  ["DFA0",0x90C0],
+  ["D3F4",0x90C1],
+  ["E040",0x90C2],
+  ["E041",0x90C3],
+  ["DBA7",0x90C4],
+  ["DBA4",0x90C5],
+  ["E042",0x90C6],
+  ["DBA8",0x90C7],
+  ["E043",0x90C8],
+  ["E044",0x90C9],
+  ["BDBC",0x90CA],
+  ["E045",0x90CB],
+  ["E046",0x90CC],
+  ["E047",0x90CD],
+  ["C0C9",0x90CE],
+  ["DBA3",0x90CF],
+  ["DBA6",0x90D0],
+  ["D6A3",0x90D1],
+  ["E048",0x90D2],
+  ["DBA9",0x90D3],
+  ["E049",0x90D4],
+  ["E04A",0x90D5],
+  ["E04B",0x90D6],
+  ["DBAD",0x90D7],
+  ["E04C",0x90D8],
+  ["E04D",0x90D9],
+  ["E04E",0x90DA],
+  ["DBAE",0x90DB],
+  ["DBAC",0x90DC],
+  ["BAC2",0x90DD],
+  ["E04F",0x90DE],
+  ["E050",0x90DF],
+  ["E051",0x90E0],
+  ["BFA4",0x90E1],
+  ["DBAB",0x90E2],
+  ["E052",0x90E3],
+  ["E053",0x90E4],
+  ["E054",0x90E5],
+  ["DBAA",0x90E6],
+  ["D4C7",0x90E7],
+  ["B2BF",0x90E8],
+  ["E055",0x90E9],
+  ["E056",0x90EA],
+  ["DBAF",0x90EB],
+  ["E057",0x90EC],
+  ["B9F9",0x90ED],
+  ["E058",0x90EE],
+  ["DBB0",0x90EF],
+  ["E059",0x90F0],
+  ["E05A",0x90F1],
+  ["E05B",0x90F2],
+  ["E05C",0x90F3],
+  ["B3BB",0x90F4],
+  ["E05D",0x90F5],
+  ["E05E",0x90F6],
+  ["E05F",0x90F7],
+  ["B5A6",0x90F8],
+  ["E060",0x90F9],
+  ["E061",0x90FA],
+  ["E062",0x90FB],
+  ["E063",0x90FC],
+  ["B6BC",0x90FD],
+  ["DBB1",0x90FE],
+  ["E064",0x90FF],
+  ["E065",0x9100],
+  ["E066",0x9101],
+  ["B6F5",0x9102],
+  ["E067",0x9103],
+  ["DBB2",0x9104],
+  ["E068",0x9105],
+  ["E069",0x9106],
+  ["E06A",0x9107],
+  ["E06B",0x9108],
+  ["E06C",0x9109],
+  ["E06D",0x910A],
+  ["E06E",0x910B],
+  ["E06F",0x910C],
+  ["E070",0x910D],
+  ["E071",0x910E],
+  ["E072",0x910F],
+  ["E073",0x9110],
+  ["E074",0x9111],
+  ["E075",0x9112],
+  ["E076",0x9113],
+  ["E077",0x9114],
+  ["E078",0x9115],
+  ["E079",0x9116],
+  ["E07A",0x9117],
+  ["E07B",0x9118],
+  ["B1C9",0x9119],
+  ["E07C",0x911A],
+  ["E07D",0x911B],
+  ["E07E",0x911C],
+  ["E080",0x911D],
+  ["DBB4",0x911E],
+  ["E081",0x911F],
+  ["E082",0x9120],
+  ["E083",0x9121],
+  ["DBB3",0x9122],
+  ["DBB5",0x9123],
+  ["E084",0x9124],
+  ["E085",0x9125],
+  ["E086",0x9126],
+  ["E087",0x9127],
+  ["E088",0x9128],
+  ["E089",0x9129],
+  ["E08A",0x912A],
+  ["E08B",0x912B],
+  ["E08C",0x912C],
+  ["E08D",0x912D],
+  ["E08E",0x912E],
+  ["DBB7",0x912F],
+  ["E08F",0x9130],
+  ["DBB6",0x9131],
+  ["E090",0x9132],
+  ["E091",0x9133],
+  ["E092",0x9134],
+  ["E093",0x9135],
+  ["E094",0x9136],
+  ["E095",0x9137],
+  ["E096",0x9138],
+  ["DBB8",0x9139],
+  ["E097",0x913A],
+  ["E098",0x913B],
+  ["E099",0x913C],
+  ["E09A",0x913D],
+  ["E09B",0x913E],
+  ["E09C",0x913F],
+  ["E09D",0x9140],
+  ["E09E",0x9141],
+  ["E09F",0x9142],
+  ["DBB9",0x9143],
+  ["E0A0",0x9144],
+  ["E140",0x9145],
+  ["DBBA",0x9146],
+  ["E141",0x9147],
+  ["E142",0x9148],
+  ["D3CF",0x9149],
+  ["F4FA",0x914A],
+  ["C7F5",0x914B],
+  ["D7C3",0x914C],
+  ["C5E4",0x914D],
+  ["F4FC",0x914E],
+  ["F4FD",0x914F],
+  ["F4FB",0x9150],
+  ["E143",0x9151],
+  ["BEC6",0x9152],
+  ["E144",0x9153],
+  ["E145",0x9154],
+  ["E146",0x9155],
+  ["E147",0x9156],
+  ["D0EF",0x9157],
+  ["E148",0x9158],
+  ["E149",0x9159],
+  ["B7D3",0x915A],
+  ["E14A",0x915B],
+  ["E14B",0x915C],
+  ["D4CD",0x915D],
+  ["CCAA",0x915E],
+  ["E14C",0x915F],
+  ["E14D",0x9160],
+  ["F5A2",0x9161],
+  ["F5A1",0x9162],
+  ["BAA8",0x9163],
+  ["F4FE",0x9164],
+  ["CBD6",0x9165],
+  ["E14E",0x9166],
+  ["E14F",0x9167],
+  ["E150",0x9168],
+  ["F5A4",0x9169],
+  ["C0D2",0x916A],
+  ["E151",0x916B],
+  ["B3EA",0x916C],
+  ["E152",0x916D],
+  ["CDAA",0x916E],
+  ["F5A5",0x916F],
+  ["F5A3",0x9170],
+  ["BDB4",0x9171],
+  ["F5A8",0x9172],
+  ["E153",0x9173],
+  ["F5A9",0x9174],
+  ["BDCD",0x9175],
+  ["C3B8",0x9176],
+  ["BFE1",0x9177],
+  ["CBE1",0x9178],
+  ["F5AA",0x9179],
+  ["E154",0x917A],
+  ["E155",0x917B],
+  ["E156",0x917C],
+  ["F5A6",0x917D],
+  ["F5A7",0x917E],
+  ["C4F0",0x917F],
+  ["E157",0x9180],
+  ["E158",0x9181],
+  ["E159",0x9182],
+  ["E15A",0x9183],
+  ["E15B",0x9184],
+  ["F5AC",0x9185],
+  ["E15C",0x9186],
+  ["B4BC",0x9187],
+  ["E15D",0x9188],
+  ["D7ED",0x9189],
+  ["E15E",0x918A],
+  ["B4D7",0x918B],
+  ["F5AB",0x918C],
+  ["F5AE",0x918D],
+  ["E15F",0x918E],
+  ["E160",0x918F],
+  ["F5AD",0x9190],
+  ["F5AF",0x9191],
+  ["D0D1",0x9192],
+  ["E161",0x9193],
+  ["E162",0x9194],
+  ["E163",0x9195],
+  ["E164",0x9196],
+  ["E165",0x9197],
+  ["E166",0x9198],
+  ["E167",0x9199],
+  ["C3D1",0x919A],
+  ["C8A9",0x919B],
+  ["E168",0x919C],
+  ["E169",0x919D],
+  ["E16A",0x919E],
+  ["E16B",0x919F],
+  ["E16C",0x91A0],
+  ["E16D",0x91A1],
+  ["F5B0",0x91A2],
+  ["F5B1",0x91A3],
+  ["E16E",0x91A4],
+  ["E16F",0x91A5],
+  ["E170",0x91A6],
+  ["E171",0x91A7],
+  ["E172",0x91A8],
+  ["E173",0x91A9],
+  ["F5B2",0x91AA],
+  ["E174",0x91AB],
+  ["E175",0x91AC],
+  ["F5B3",0x91AD],
+  ["F5B4",0x91AE],
+  ["F5B5",0x91AF],
+  ["E176",0x91B0],
+  ["E177",0x91B1],
+  ["E178",0x91B2],
+  ["E179",0x91B3],
+  ["F5B7",0x91B4],
+  ["F5B6",0x91B5],
+  ["E17A",0x91B6],
+  ["E17B",0x91B7],
+  ["E17C",0x91B8],
+  ["E17D",0x91B9],
+  ["F5B8",0x91BA],
+  ["E17E",0x91BB],
+  ["E180",0x91BC],
+  ["E181",0x91BD],
+  ["E182",0x91BE],
+  ["E183",0x91BF],
+  ["E184",0x91C0],
+  ["E185",0x91C1],
+  ["E186",0x91C2],
+  ["E187",0x91C3],
+  ["E188",0x91C4],
+  ["E189",0x91C5],
+  ["E18A",0x91C6],
+  ["B2C9",0x91C7],
+  ["E18B",0x91C8],
+  ["D3D4",0x91C9],
+  ["CACD",0x91CA],
+  ["E18C",0x91CB],
+  ["C0EF",0x91CC],
+  ["D6D8",0x91CD],
+  ["D2B0",0x91CE],
+  ["C1BF",0x91CF],
+  ["E18D",0x91D0],
+  ["BDF0",0x91D1],
+  ["E18E",0x91D2],
+  ["E18F",0x91D3],
+  ["E190",0x91D4],
+  ["E191",0x91D5],
+  ["E192",0x91D6],
+  ["E193",0x91D7],
+  ["E194",0x91D8],
+  ["E195",0x91D9],
+  ["E196",0x91DA],
+  ["E197",0x91DB],
+  ["B8AA",0x91DC],
+  ["E198",0x91DD],
+  ["E199",0x91DE],
+  ["E19A",0x91DF],
+  ["E19B",0x91E0],
+  ["E19C",0x91E1],
+  ["E19D",0x91E2],
+  ["E19E",0x91E3],
+  ["E19F",0x91E4],
+  ["E1A0",0x91E5],
+  ["E240",0x91E6],
+  ["E241",0x91E7],
+  ["E242",0x91E8],
+  ["E243",0x91E9],
+  ["E244",0x91EA],
+  ["E245",0x91EB],
+  ["E246",0x91EC],
+  ["E247",0x91ED],
+  ["E248",0x91EE],
+  ["E249",0x91EF],
+  ["E24A",0x91F0],
+  ["E24B",0x91F1],
+  ["E24C",0x91F2],
+  ["E24D",0x91F3],
+  ["E24E",0x91F4],
+  ["E24F",0x91F5],
+  ["E250",0x91F6],
+  ["E251",0x91F7],
+  ["E252",0x91F8],
+  ["E253",0x91F9],
+  ["E254",0x91FA],
+  ["E255",0x91FB],
+  ["E256",0x91FC],
+  ["E257",0x91FD],
+  ["E258",0x91FE],
+  ["E259",0x91FF],
+  ["E25A",0x9200],
+  ["E25B",0x9201],
+  ["E25C",0x9202],
+  ["E25D",0x9203],
+  ["E25E",0x9204],
+  ["E25F",0x9205],
+  ["E260",0x9206],
+  ["E261",0x9207],
+  ["E262",0x9208],
+  ["E263",0x9209],
+  ["E264",0x920A],
+  ["E265",0x920B],
+  ["E266",0x920C],
+  ["E267",0x920D],
+  ["E268",0x920E],
+  ["E269",0x920F],
+  ["E26A",0x9210],
+  ["E26B",0x9211],
+  ["E26C",0x9212],
+  ["E26D",0x9213],
+  ["E26E",0x9214],
+  ["E26F",0x9215],
+  ["E270",0x9216],
+  ["E271",0x9217],
+  ["E272",0x9218],
+  ["E273",0x9219],
+  ["E274",0x921A],
+  ["E275",0x921B],
+  ["E276",0x921C],
+  ["E277",0x921D],
+  ["E278",0x921E],
+  ["E279",0x921F],
+  ["E27A",0x9220],
+  ["E27B",0x9221],
+  ["E27C",0x9222],
+  ["E27D",0x9223],
+  ["E27E",0x9224],
+  ["E280",0x9225],
+  ["E281",0x9226],
+  ["E282",0x9227],
+  ["E283",0x9228],
+  ["E284",0x9229],
+  ["E285",0x922A],
+  ["E286",0x922B],
+  ["E287",0x922C],
+  ["E288",0x922D],
+  ["E289",0x922E],
+  ["E28A",0x922F],
+  ["E28B",0x9230],
+  ["E28C",0x9231],
+  ["E28D",0x9232],
+  ["E28E",0x9233],
+  ["E28F",0x9234],
+  ["E290",0x9235],
+  ["E291",0x9236],
+  ["E292",0x9237],
+  ["E293",0x9238],
+  ["E294",0x9239],
+  ["E295",0x923A],
+  ["E296",0x923B],
+  ["E297",0x923C],
+  ["E298",0x923D],
+  ["E299",0x923E],
+  ["E29A",0x923F],
+  ["E29B",0x9240],
+  ["E29C",0x9241],
+  ["E29D",0x9242],
+  ["E29E",0x9243],
+  ["E29F",0x9244],
+  ["E2A0",0x9245],
+  ["E340",0x9246],
+  ["E341",0x9247],
+  ["E342",0x9248],
+  ["E343",0x9249],
+  ["E344",0x924A],
+  ["E345",0x924B],
+  ["E346",0x924C],
+  ["E347",0x924D],
+  ["E348",0x924E],
+  ["E349",0x924F],
+  ["E34A",0x9250],
+  ["E34B",0x9251],
+  ["E34C",0x9252],
+  ["E34D",0x9253],
+  ["E34E",0x9254],
+  ["E34F",0x9255],
+  ["E350",0x9256],
+  ["E351",0x9257],
+  ["E352",0x9258],
+  ["E353",0x9259],
+  ["E354",0x925A],
+  ["E355",0x925B],
+  ["E356",0x925C],
+  ["E357",0x925D],
+  ["E358",0x925E],
+  ["E359",0x925F],
+  ["E35A",0x9260],
+  ["E35B",0x9261],
+  ["E35C",0x9262],
+  ["E35D",0x9263],
+  ["E35E",0x9264],
+  ["E35F",0x9265],
+  ["E360",0x9266],
+  ["E361",0x9267],
+  ["E362",0x9268],
+  ["E363",0x9269],
+  ["E364",0x926A],
+  ["E365",0x926B],
+  ["E366",0x926C],
+  ["E367",0x926D],
+  ["E368",0x926E],
+  ["E369",0x926F],
+  ["E36A",0x9270],
+  ["E36B",0x9271],
+  ["E36C",0x9272],
+  ["E36D",0x9273],
+  ["BCF8",0x9274],
+  ["E36E",0x9275],
+  ["E36F",0x9276],
+  ["E370",0x9277],
+  ["E371",0x9278],
+  ["E372",0x9279],
+  ["E373",0x927A],
+  ["E374",0x927B],
+  ["E375",0x927C],
+  ["E376",0x927D],
+  ["E377",0x927E],
+  ["E378",0x927F],
+  ["E379",0x9280],
+  ["E37A",0x9281],
+  ["E37B",0x9282],
+  ["E37C",0x9283],
+  ["E37D",0x9284],
+  ["E37E",0x9285],
+  ["E380",0x9286],
+  ["E381",0x9287],
+  ["E382",0x9288],
+  ["E383",0x9289],
+  ["E384",0x928A],
+  ["E385",0x928B],
+  ["E386",0x928C],
+  ["E387",0x928D],
+  ["F6C6",0x928E],
+  ["E388",0x928F],
+  ["E389",0x9290],
+  ["E38A",0x9291],
+  ["E38B",0x9292],
+  ["E38C",0x9293],
+  ["E38D",0x9294],
+  ["E38E",0x9295],
+  ["E38F",0x9296],
+  ["E390",0x9297],
+  ["E391",0x9298],
+  ["E392",0x9299],
+  ["E393",0x929A],
+  ["E394",0x929B],
+  ["E395",0x929C],
+  ["E396",0x929D],
+  ["E397",0x929E],
+  ["E398",0x929F],
+  ["E399",0x92A0],
+  ["E39A",0x92A1],
+  ["E39B",0x92A2],
+  ["E39C",0x92A3],
+  ["E39D",0x92A4],
+  ["E39E",0x92A5],
+  ["E39F",0x92A6],
+  ["E3A0",0x92A7],
+  ["E440",0x92A8],
+  ["E441",0x92A9],
+  ["E442",0x92AA],
+  ["E443",0x92AB],
+  ["E444",0x92AC],
+  ["E445",0x92AD],
+  ["F6C7",0x92AE],
+  ["E446",0x92AF],
+  ["E447",0x92B0],
+  ["E448",0x92B1],
+  ["E449",0x92B2],
+  ["E44A",0x92B3],
+  ["E44B",0x92B4],
+  ["E44C",0x92B5],
+  ["E44D",0x92B6],
+  ["E44E",0x92B7],
+  ["E44F",0x92B8],
+  ["E450",0x92B9],
+  ["E451",0x92BA],
+  ["E452",0x92BB],
+  ["E453",0x92BC],
+  ["E454",0x92BD],
+  ["E455",0x92BE],
+  ["E456",0x92BF],
+  ["E457",0x92C0],
+  ["E458",0x92C1],
+  ["E459",0x92C2],
+  ["E45A",0x92C3],
+  ["E45B",0x92C4],
+  ["E45C",0x92C5],
+  ["E45D",0x92C6],
+  ["E45E",0x92C7],
+  ["F6C8",0x92C8],
+  ["E45F",0x92C9],
+  ["E460",0x92CA],
+  ["E461",0x92CB],
+  ["E462",0x92CC],
+  ["E463",0x92CD],
+  ["E464",0x92CE],
+  ["E465",0x92CF],
+  ["E466",0x92D0],
+  ["E467",0x92D1],
+  ["E468",0x92D2],
+  ["E469",0x92D3],
+  ["E46A",0x92D4],
+  ["E46B",0x92D5],
+  ["E46C",0x92D6],
+  ["E46D",0x92D7],
+  ["E46E",0x92D8],
+  ["E46F",0x92D9],
+  ["E470",0x92DA],
+  ["E471",0x92DB],
+  ["E472",0x92DC],
+  ["E473",0x92DD],
+  ["E474",0x92DE],
+  ["E475",0x92DF],
+  ["E476",0x92E0],
+  ["E477",0x92E1],
+  ["E478",0x92E2],
+  ["E479",0x92E3],
+  ["E47A",0x92E4],
+  ["E47B",0x92E5],
+  ["E47C",0x92E6],
+  ["E47D",0x92E7],
+  ["E47E",0x92E8],
+  ["E480",0x92E9],
+  ["E481",0x92EA],
+  ["E482",0x92EB],
+  ["E483",0x92EC],
+  ["E484",0x92ED],
+  ["E485",0x92EE],
+  ["E486",0x92EF],
+  ["E487",0x92F0],
+  ["E488",0x92F1],
+  ["E489",0x92F2],
+  ["E48A",0x92F3],
+  ["E48B",0x92F4],
+  ["E48C",0x92F5],
+  ["E48D",0x92F6],
+  ["E48E",0x92F7],
+  ["E48F",0x92F8],
+  ["E490",0x92F9],
+  ["E491",0x92FA],
+  ["E492",0x92FB],
+  ["E493",0x92FC],
+  ["E494",0x92FD],
+  ["E495",0x92FE],
+  ["E496",0x92FF],
+  ["E497",0x9300],
+  ["E498",0x9301],
+  ["E499",0x9302],
+  ["E49A",0x9303],
+  ["E49B",0x9304],
+  ["E49C",0x9305],
+  ["E49D",0x9306],
+  ["E49E",0x9307],
+  ["E49F",0x9308],
+  ["E4A0",0x9309],
+  ["E540",0x930A],
+  ["E541",0x930B],
+  ["E542",0x930C],
+  ["E543",0x930D],
+  ["E544",0x930E],
+  ["E545",0x930F],
+  ["E546",0x9310],
+  ["E547",0x9311],
+  ["E548",0x9312],
+  ["E549",0x9313],
+  ["E54A",0x9314],
+  ["E54B",0x9315],
+  ["E54C",0x9316],
+  ["E54D",0x9317],
+  ["E54E",0x9318],
+  ["E54F",0x9319],
+  ["E550",0x931A],
+  ["E551",0x931B],
+  ["E552",0x931C],
+  ["E553",0x931D],
+  ["E554",0x931E],
+  ["E555",0x931F],
+  ["E556",0x9320],
+  ["E557",0x9321],
+  ["E558",0x9322],
+  ["E559",0x9323],
+  ["E55A",0x9324],
+  ["E55B",0x9325],
+  ["E55C",0x9326],
+  ["E55D",0x9327],
+  ["E55E",0x9328],
+  ["E55F",0x9329],
+  ["E560",0x932A],
+  ["E561",0x932B],
+  ["E562",0x932C],
+  ["E563",0x932D],
+  ["E564",0x932E],
+  ["E565",0x932F],
+  ["E566",0x9330],
+  ["E567",0x9331],
+  ["E568",0x9332],
+  ["E569",0x9333],
+  ["E56A",0x9334],
+  ["E56B",0x9335],
+  ["E56C",0x9336],
+  ["E56D",0x9337],
+  ["E56E",0x9338],
+  ["E56F",0x9339],
+  ["E570",0x933A],
+  ["E571",0x933B],
+  ["E572",0x933C],
+  ["E573",0x933D],
+  ["F6C9",0x933E],
+  ["E574",0x933F],
+  ["E575",0x9340],
+  ["E576",0x9341],
+  ["E577",0x9342],
+  ["E578",0x9343],
+  ["E579",0x9344],
+  ["E57A",0x9345],
+  ["E57B",0x9346],
+  ["E57C",0x9347],
+  ["E57D",0x9348],
+  ["E57E",0x9349],
+  ["E580",0x934A],
+  ["E581",0x934B],
+  ["E582",0x934C],
+  ["E583",0x934D],
+  ["E584",0x934E],
+  ["E585",0x934F],
+  ["E586",0x9350],
+  ["E587",0x9351],
+  ["E588",0x9352],
+  ["E589",0x9353],
+  ["E58A",0x9354],
+  ["E58B",0x9355],
+  ["E58C",0x9356],
+  ["E58D",0x9357],
+  ["E58E",0x9358],
+  ["E58F",0x9359],
+  ["E590",0x935A],
+  ["E591",0x935B],
+  ["E592",0x935C],
+  ["E593",0x935D],
+  ["E594",0x935E],
+  ["E595",0x935F],
+  ["E596",0x9360],
+  ["E597",0x9361],
+  ["E598",0x9362],
+  ["E599",0x9363],
+  ["E59A",0x9364],
+  ["E59B",0x9365],
+  ["E59C",0x9366],
+  ["E59D",0x9367],
+  ["E59E",0x9368],
+  ["E59F",0x9369],
+  ["F6CA",0x936A],
+  ["E5A0",0x936B],
+  ["E640",0x936C],
+  ["E641",0x936D],
+  ["E642",0x936E],
+  ["E643",0x936F],
+  ["E644",0x9370],
+  ["E645",0x9371],
+  ["E646",0x9372],
+  ["E647",0x9373],
+  ["E648",0x9374],
+  ["E649",0x9375],
+  ["E64A",0x9376],
+  ["E64B",0x9377],
+  ["E64C",0x9378],
+  ["E64D",0x9379],
+  ["E64E",0x937A],
+  ["E64F",0x937B],
+  ["E650",0x937C],
+  ["E651",0x937D],
+  ["E652",0x937E],
+  ["E653",0x937F],
+  ["E654",0x9380],
+  ["E655",0x9381],
+  ["E656",0x9382],
+  ["E657",0x9383],
+  ["E658",0x9384],
+  ["E659",0x9385],
+  ["E65A",0x9386],
+  ["E65B",0x9387],
+  ["E65C",0x9388],
+  ["E65D",0x9389],
+  ["E65E",0x938A],
+  ["E65F",0x938B],
+  ["E660",0x938C],
+  ["E661",0x938D],
+  ["E662",0x938E],
+  ["F6CC",0x938F],
+  ["E663",0x9390],
+  ["E664",0x9391],
+  ["E665",0x9392],
+  ["E666",0x9393],
+  ["E667",0x9394],
+  ["E668",0x9395],
+  ["E669",0x9396],
+  ["E66A",0x9397],
+  ["E66B",0x9398],
+  ["E66C",0x9399],
+  ["E66D",0x939A],
+  ["E66E",0x939B],
+  ["E66F",0x939C],
+  ["E670",0x939D],
+  ["E671",0x939E],
+  ["E672",0x939F],
+  ["E673",0x93A0],
+  ["E674",0x93A1],
+  ["E675",0x93A2],
+  ["E676",0x93A3],
+  ["E677",0x93A4],
+  ["E678",0x93A5],
+  ["E679",0x93A6],
+  ["E67A",0x93A7],
+  ["E67B",0x93A8],
+  ["E67C",0x93A9],
+  ["E67D",0x93AA],
+  ["E67E",0x93AB],
+  ["E680",0x93AC],
+  ["E681",0x93AD],
+  ["E682",0x93AE],
+  ["E683",0x93AF],
+  ["E684",0x93B0],
+  ["E685",0x93B1],
+  ["E686",0x93B2],
+  ["E687",0x93B3],
+  ["E688",0x93B4],
+  ["E689",0x93B5],
+  ["E68A",0x93B6],
+  ["E68B",0x93B7],
+  ["E68C",0x93B8],
+  ["E68D",0x93B9],
+  ["E68E",0x93BA],
+  ["E68F",0x93BB],
+  ["E690",0x93BC],
+  ["E691",0x93BD],
+  ["E692",0x93BE],
+  ["E693",0x93BF],
+  ["E694",0x93C0],
+  ["E695",0x93C1],
+  ["E696",0x93C2],
+  ["E697",0x93C3],
+  ["E698",0x93C4],
+  ["E699",0x93C5],
+  ["E69A",0x93C6],
+  ["E69B",0x93C7],
+  ["E69C",0x93C8],
+  ["E69D",0x93C9],
+  ["F6CB",0x93CA],
+  ["E69E",0x93CB],
+  ["E69F",0x93CC],
+  ["E6A0",0x93CD],
+  ["E740",0x93CE],
+  ["E741",0x93CF],
+  ["E742",0x93D0],
+  ["E743",0x93D1],
+  ["E744",0x93D2],
+  ["E745",0x93D3],
+  ["E746",0x93D4],
+  ["E747",0x93D5],
+  ["F7E9",0x93D6],
+  ["E748",0x93D7],
+  ["E749",0x93D8],
+  ["E74A",0x93D9],
+  ["E74B",0x93DA],
+  ["E74C",0x93DB],
+  ["E74D",0x93DC],
+  ["E74E",0x93DD],
+  ["E74F",0x93DE],
+  ["E750",0x93DF],
+  ["E751",0x93E0],
+  ["E752",0x93E1],
+  ["E753",0x93E2],
+  ["E754",0x93E3],
+  ["E755",0x93E4],
+  ["E756",0x93E5],
+  ["E757",0x93E6],
+  ["E758",0x93E7],
+  ["E759",0x93E8],
+  ["E75A",0x93E9],
+  ["E75B",0x93EA],
+  ["E75C",0x93EB],
+  ["E75D",0x93EC],
+  ["E75E",0x93ED],
+  ["E75F",0x93EE],
+  ["E760",0x93EF],
+  ["E761",0x93F0],
+  ["E762",0x93F1],
+  ["E763",0x93F2],
+  ["E764",0x93F3],
+  ["E765",0x93F4],
+  ["E766",0x93F5],
+  ["E767",0x93F6],
+  ["E768",0x93F7],
+  ["E769",0x93F8],
+  ["E76A",0x93F9],
+  ["E76B",0x93FA],
+  ["E76C",0x93FB],
+  ["E76D",0x93FC],
+  ["E76E",0x93FD],
+  ["E76F",0x93FE],
+  ["E770",0x93FF],
+  ["E771",0x9400],
+  ["E772",0x9401],
+  ["E773",0x9402],
+  ["E774",0x9403],
+  ["E775",0x9404],
+  ["E776",0x9405],
+  ["E777",0x9406],
+  ["E778",0x9407],
+  ["E779",0x9408],
+  ["E77A",0x9409],
+  ["E77B",0x940A],
+  ["E77C",0x940B],
+  ["E77D",0x940C],
+  ["E77E",0x940D],
+  ["E780",0x940E],
+  ["E781",0x940F],
+  ["E782",0x9410],
+  ["E783",0x9411],
+  ["E784",0x9412],
+  ["E785",0x9413],
+  ["E786",0x9414],
+  ["E787",0x9415],
+  ["E788",0x9416],
+  ["E789",0x9417],
+  ["E78A",0x9418],
+  ["E78B",0x9419],
+  ["E78C",0x941A],
+  ["E78D",0x941B],
+  ["E78E",0x941C],
+  ["E78F",0x941D],
+  ["E790",0x941E],
+  ["E791",0x941F],
+  ["E792",0x9420],
+  ["E793",0x9421],
+  ["E794",0x9422],
+  ["E795",0x9423],
+  ["E796",0x9424],
+  ["E797",0x9425],
+  ["E798",0x9426],
+  ["E799",0x9427],
+  ["E79A",0x9428],
+  ["E79B",0x9429],
+  ["E79C",0x942A],
+  ["E79D",0x942B],
+  ["E79E",0x942C],
+  ["E79F",0x942D],
+  ["E7A0",0x942E],
+  ["E840",0x942F],
+  ["E841",0x9430],
+  ["E842",0x9431],
+  ["E843",0x9432],
+  ["E844",0x9433],
+  ["E845",0x9434],
+  ["E846",0x9435],
+  ["E847",0x9436],
+  ["E848",0x9437],
+  ["E849",0x9438],
+  ["E84A",0x9439],
+  ["E84B",0x943A],
+  ["E84C",0x943B],
+  ["E84D",0x943C],
+  ["E84E",0x943D],
+  ["F6CD",0x943E],
+  ["E84F",0x943F],
+  ["E850",0x9440],
+  ["E851",0x9441],
+  ["E852",0x9442],
+  ["E853",0x9443],
+  ["E854",0x9444],
+  ["E855",0x9445],
+  ["E856",0x9446],
+  ["E857",0x9447],
+  ["E858",0x9448],
+  ["E859",0x9449],
+  ["E85A",0x944A],
+  ["E85B",0x944B],
+  ["E85C",0x944C],
+  ["E85D",0x944D],
+  ["E85E",0x944E],
+  ["E85F",0x944F],
+  ["E860",0x9450],
+  ["E861",0x9451],
+  ["E862",0x9452],
+  ["E863",0x9453],
+  ["E864",0x9454],
+  ["E865",0x9455],
+  ["E866",0x9456],
+  ["E867",0x9457],
+  ["E868",0x9458],
+  ["E869",0x9459],
+  ["E86A",0x945A],
+  ["E86B",0x945B],
+  ["E86C",0x945C],
+  ["E86D",0x945D],
+  ["E86E",0x945E],
+  ["E86F",0x945F],
+  ["E870",0x9460],
+  ["E871",0x9461],
+  ["E872",0x9462],
+  ["E873",0x9463],
+  ["E874",0x9464],
+  ["E875",0x9465],
+  ["E876",0x9466],
+  ["E877",0x9467],
+  ["E878",0x9468],
+  ["E879",0x9469],
+  ["E87A",0x946A],
+  ["F6CE",0x946B],
+  ["E87B",0x946C],
+  ["E87C",0x946D],
+  ["E87D",0x946E],
+  ["E87E",0x946F],
+  ["E880",0x9470],
+  ["E881",0x9471],
+  ["E882",0x9472],
+  ["E883",0x9473],
+  ["E884",0x9474],
+  ["E885",0x9475],
+  ["E886",0x9476],
+  ["E887",0x9477],
+  ["E888",0x9478],
+  ["E889",0x9479],
+  ["E88A",0x947A],
+  ["E88B",0x947B],
+  ["E88C",0x947C],
+  ["E88D",0x947D],
+  ["E88E",0x947E],
+  ["E88F",0x947F],
+  ["E890",0x9480],
+  ["E891",0x9481],
+  ["E892",0x9482],
+  ["E893",0x9483],
+  ["E894",0x9484],
+  ["EEC4",0x9485],
+  ["EEC5",0x9486],
+  ["EEC6",0x9487],
+  ["D5EB",0x9488],
+  ["B6A4",0x9489],
+  ["EEC8",0x948A],
+  ["EEC7",0x948B],
+  ["EEC9",0x948C],
+  ["EECA",0x948D],
+  ["C7A5",0x948E],
+  ["EECB",0x948F],
+  ["EECC",0x9490],
+  ["E895",0x9491],
+  ["B7B0",0x9492],
+  ["B5F6",0x9493],
+  ["EECD",0x9494],
+  ["EECF",0x9495],
+  ["E896",0x9496],
+  ["EECE",0x9497],
+  ["E897",0x9498],
+  ["B8C6",0x9499],
+  ["EED0",0x949A],
+  ["EED1",0x949B],
+  ["EED2",0x949C],
+  ["B6DB",0x949D],
+  ["B3AE",0x949E],
+  ["D6D3",0x949F],
+  ["C4C6",0x94A0],
+  ["B1B5",0x94A1],
+  ["B8D6",0x94A2],
+  ["EED3",0x94A3],
+  ["EED4",0x94A4],
+  ["D4BF",0x94A5],
+  ["C7D5",0x94A6],
+  ["BEFB",0x94A7],
+  ["CED9",0x94A8],
+  ["B9B3",0x94A9],
+  ["EED6",0x94AA],
+  ["EED5",0x94AB],
+  ["EED8",0x94AC],
+  ["EED7",0x94AD],
+  ["C5A5",0x94AE],
+  ["EED9",0x94AF],
+  ["EEDA",0x94B0],
+  ["C7AE",0x94B1],
+  ["EEDB",0x94B2],
+  ["C7AF",0x94B3],
+  ["EEDC",0x94B4],
+  ["B2A7",0x94B5],
+  ["EEDD",0x94B6],
+  ["EEDE",0x94B7],
+  ["EEDF",0x94B8],
+  ["EEE0",0x94B9],
+  ["EEE1",0x94BA],
+  ["D7EA",0x94BB],
+  ["EEE2",0x94BC],
+  ["EEE3",0x94BD],
+  ["BCD8",0x94BE],
+  ["EEE4",0x94BF],
+  ["D3CB",0x94C0],
+  ["CCFA",0x94C1],
+  ["B2AC",0x94C2],
+  ["C1E5",0x94C3],
+  ["EEE5",0x94C4],
+  ["C7A6",0x94C5],
+  ["C3AD",0x94C6],
+  ["E898",0x94C7],
+  ["EEE6",0x94C8],
+  ["EEE7",0x94C9],
+  ["EEE8",0x94CA],
+  ["EEE9",0x94CB],
+  ["EEEA",0x94CC],
+  ["EEEB",0x94CD],
+  ["EEEC",0x94CE],
+  ["E899",0x94CF],
+  ["EEED",0x94D0],
+  ["EEEE",0x94D1],
+  ["EEEF",0x94D2],
+  ["E89A",0x94D3],
+  ["E89B",0x94D4],
+  ["EEF0",0x94D5],
+  ["EEF1",0x94D6],
+  ["EEF2",0x94D7],
+  ["EEF4",0x94D8],
+  ["EEF3",0x94D9],
+  ["E89C",0x94DA],
+  ["EEF5",0x94DB],
+  ["CDAD",0x94DC],
+  ["C2C1",0x94DD],
+  ["EEF6",0x94DE],
+  ["EEF7",0x94DF],
+  ["EEF8",0x94E0],
+  ["D5A1",0x94E1],
+  ["EEF9",0x94E2],
+  ["CFB3",0x94E3],
+  ["EEFA",0x94E4],
+  ["EEFB",0x94E5],
+  ["E89D",0x94E6],
+  ["EEFC",0x94E7],
+  ["EEFD",0x94E8],
+  ["EFA1",0x94E9],
+  ["EEFE",0x94EA],
+  ["EFA2",0x94EB],
+  ["B8F5",0x94EC],
+  ["C3FA",0x94ED],
+  ["EFA3",0x94EE],
+  ["EFA4",0x94EF],
+  ["BDC2",0x94F0],
+  ["D2BF",0x94F1],
+  ["B2F9",0x94F2],
+  ["EFA5",0x94F3],
+  ["EFA6",0x94F4],
+  ["EFA7",0x94F5],
+  ["D2F8",0x94F6],
+  ["EFA8",0x94F7],
+  ["D6FD",0x94F8],
+  ["EFA9",0x94F9],
+  ["C6CC",0x94FA],
+  ["E89E",0x94FB],
+  ["EFAA",0x94FC],
+  ["EFAB",0x94FD],
+  ["C1B4",0x94FE],
+  ["EFAC",0x94FF],
+  ["CFFA",0x9500],
+  ["CBF8",0x9501],
+  ["EFAE",0x9502],
+  ["EFAD",0x9503],
+  ["B3FA",0x9504],
+  ["B9F8",0x9505],
+  ["EFAF",0x9506],
+  ["EFB0",0x9507],
+  ["D0E2",0x9508],
+  ["EFB1",0x9509],
+  ["EFB2",0x950A],
+  ["B7E6",0x950B],
+  ["D0BF",0x950C],
+  ["EFB3",0x950D],
+  ["EFB4",0x950E],
+  ["EFB5",0x950F],
+  ["C8F1",0x9510],
+  ["CCE0",0x9511],
+  ["EFB6",0x9512],
+  ["EFB7",0x9513],
+  ["EFB8",0x9514],
+  ["EFB9",0x9515],
+  ["EFBA",0x9516],
+  ["D5E0",0x9517],
+  ["EFBB",0x9518],
+  ["B4ED",0x9519],
+  ["C3AA",0x951A],
+  ["EFBC",0x951B],
+  ["E89F",0x951C],
+  ["EFBD",0x951D],
+  ["EFBE",0x951E],
+  ["EFBF",0x951F],
+  ["E8A0",0x9520],
+  ["CEFD",0x9521],
+  ["EFC0",0x9522],
+  ["C2E0",0x9523],
+  ["B4B8",0x9524],
+  ["D7B6",0x9525],
+  ["BDF5",0x9526],
+  ["E940",0x9527],
+  ["CFC7",0x9528],
+  ["EFC3",0x9529],
+  ["EFC1",0x952A],
+  ["EFC2",0x952B],
+  ["EFC4",0x952C],
+  ["B6A7",0x952D],
+  ["BCFC",0x952E],
+  ["BEE2",0x952F],
+  ["C3CC",0x9530],
+  ["EFC5",0x9531],
+  ["EFC6",0x9532],
+  ["E941",0x9533],
+  ["EFC7",0x9534],
+  ["EFCF",0x9535],
+  ["EFC8",0x9536],
+  ["EFC9",0x9537],
+  ["EFCA",0x9538],
+  ["C7C2",0x9539],
+  ["EFF1",0x953A],
+  ["B6CD",0x953B],
+  ["EFCB",0x953C],
+  ["E942",0x953D],
+  ["EFCC",0x953E],
+  ["EFCD",0x953F],
+  ["B6C6",0x9540],
+  ["C3BE",0x9541],
+  ["EFCE",0x9542],
+  ["E943",0x9543],
+  ["EFD0",0x9544],
+  ["EFD1",0x9545],
+  ["EFD2",0x9546],
+  ["D5F2",0x9547],
+  ["E944",0x9548],
+  ["EFD3",0x9549],
+  ["C4F7",0x954A],
+  ["E945",0x954B],
+  ["EFD4",0x954C],
+  ["C4F8",0x954D],
+  ["EFD5",0x954E],
+  ["EFD6",0x954F],
+  ["B8E4",0x9550],
+  ["B0F7",0x9551],
+  ["EFD7",0x9552],
+  ["EFD8",0x9553],
+  ["EFD9",0x9554],
+  ["E946",0x9555],
+  ["EFDA",0x9556],
+  ["EFDB",0x9557],
+  ["EFDC",0x9558],
+  ["EFDD",0x9559],
+  ["E947",0x955A],
+  ["EFDE",0x955B],
+  ["BEB5",0x955C],
+  ["EFE1",0x955D],
+  ["EFDF",0x955E],
+  ["EFE0",0x955F],
+  ["E948",0x9560],
+  ["EFE2",0x9561],
+  ["EFE3",0x9562],
+  ["C1CD",0x9563],
+  ["EFE4",0x9564],
+  ["EFE5",0x9565],
+  ["EFE6",0x9566],
+  ["EFE7",0x9567],
+  ["EFE8",0x9568],
+  ["EFE9",0x9569],
+  ["EFEA",0x956A],
+  ["EFEB",0x956B],
+  ["EFEC",0x956C],
+  ["C0D8",0x956D],
+  ["E949",0x956E],
+  ["EFED",0x956F],
+  ["C1AD",0x9570],
+  ["EFEE",0x9571],
+  ["EFEF",0x9572],
+  ["EFF0",0x9573],
+  ["E94A",0x9574],
+  ["E94B",0x9575],
+  ["CFE2",0x9576],
+  ["E94C",0x9577],
+  ["E94D",0x9578],
+  ["E94E",0x9579],
+  ["E94F",0x957A],
+  ["E950",0x957B],
+  ["E951",0x957C],
+  ["E952",0x957D],
+  ["E953",0x957E],
+  ["B3A4",0x957F],
+  ["E954",0x9580],
+  ["E955",0x9581],
+  ["E956",0x9582],
+  ["E957",0x9583],
+  ["E958",0x9584],
+  ["E959",0x9585],
+  ["E95A",0x9586],
+  ["E95B",0x9587],
+  ["E95C",0x9588],
+  ["E95D",0x9589],
+  ["E95E",0x958A],
+  ["E95F",0x958B],
+  ["E960",0x958C],
+  ["E961",0x958D],
+  ["E962",0x958E],
+  ["E963",0x958F],
+  ["E964",0x9590],
+  ["E965",0x9591],
+  ["E966",0x9592],
+  ["E967",0x9593],
+  ["E968",0x9594],
+  ["E969",0x9595],
+  ["E96A",0x9596],
+  ["E96B",0x9597],
+  ["E96C",0x9598],
+  ["E96D",0x9599],
+  ["E96E",0x959A],
+  ["E96F",0x959B],
+  ["E970",0x959C],
+  ["E971",0x959D],
+  ["E972",0x959E],
+  ["E973",0x959F],
+  ["E974",0x95A0],
+  ["E975",0x95A1],
+  ["E976",0x95A2],
+  ["E977",0x95A3],
+  ["E978",0x95A4],
+  ["E979",0x95A5],
+  ["E97A",0x95A6],
+  ["E97B",0x95A7],
+  ["E97C",0x95A8],
+  ["E97D",0x95A9],
+  ["E97E",0x95AA],
+  ["E980",0x95AB],
+  ["E981",0x95AC],
+  ["E982",0x95AD],
+  ["E983",0x95AE],
+  ["E984",0x95AF],
+  ["E985",0x95B0],
+  ["E986",0x95B1],
+  ["E987",0x95B2],
+  ["E988",0x95B3],
+  ["E989",0x95B4],
+  ["E98A",0x95B5],
+  ["E98B",0x95B6],
+  ["E98C",0x95B7],
+  ["E98D",0x95B8],
+  ["E98E",0x95B9],
+  ["E98F",0x95BA],
+  ["E990",0x95BB],
+  ["E991",0x95BC],
+  ["E992",0x95BD],
+  ["E993",0x95BE],
+  ["E994",0x95BF],
+  ["E995",0x95C0],
+  ["E996",0x95C1],
+  ["E997",0x95C2],
+  ["E998",0x95C3],
+  ["E999",0x95C4],
+  ["E99A",0x95C5],
+  ["E99B",0x95C6],
+  ["E99C",0x95C7],
+  ["E99D",0x95C8],
+  ["E99E",0x95C9],
+  ["E99F",0x95CA],
+  ["E9A0",0x95CB],
+  ["EA40",0x95CC],
+  ["EA41",0x95CD],
+  ["EA42",0x95CE],
+  ["EA43",0x95CF],
+  ["EA44",0x95D0],
+  ["EA45",0x95D1],
+  ["EA46",0x95D2],
+  ["EA47",0x95D3],
+  ["EA48",0x95D4],
+  ["EA49",0x95D5],
+  ["EA4A",0x95D6],
+  ["EA4B",0x95D7],
+  ["EA4C",0x95D8],
+  ["EA4D",0x95D9],
+  ["EA4E",0x95DA],
+  ["EA4F",0x95DB],
+  ["EA50",0x95DC],
+  ["EA51",0x95DD],
+  ["EA52",0x95DE],
+  ["EA53",0x95DF],
+  ["EA54",0x95E0],
+  ["EA55",0x95E1],
+  ["EA56",0x95E2],
+  ["EA57",0x95E3],
+  ["EA58",0x95E4],
+  ["EA59",0x95E5],
+  ["EA5A",0x95E6],
+  ["EA5B",0x95E7],
+  ["C3C5",0x95E8],
+  ["E3C5",0x95E9],
+  ["C9C1",0x95EA],
+  ["E3C6",0x95EB],
+  ["EA5C",0x95EC],
+  ["B1D5",0x95ED],
+  ["CECA",0x95EE],
+  ["B4B3",0x95EF],
+  ["C8F2",0x95F0],
+  ["E3C7",0x95F1],
+  ["CFD0",0x95F2],
+  ["E3C8",0x95F3],
+  ["BCE4",0x95F4],
+  ["E3C9",0x95F5],
+  ["E3CA",0x95F6],
+  ["C3C6",0x95F7],
+  ["D5A2",0x95F8],
+  ["C4D6",0x95F9],
+  ["B9EB",0x95FA],
+  ["CEC5",0x95FB],
+  ["E3CB",0x95FC],
+  ["C3F6",0x95FD],
+  ["E3CC",0x95FE],
+  ["EA5D",0x95FF],
+  ["B7A7",0x9600],
+  ["B8F3",0x9601],
+  ["BAD2",0x9602],
+  ["E3CD",0x9603],
+  ["E3CE",0x9604],
+  ["D4C4",0x9605],
+  ["E3CF",0x9606],
+  ["EA5E",0x9607],
+  ["E3D0",0x9608],
+  ["D1CB",0x9609],
+  ["E3D1",0x960A],
+  ["E3D2",0x960B],
+  ["E3D3",0x960C],
+  ["E3D4",0x960D],
+  ["D1D6",0x960E],
+  ["E3D5",0x960F],
+  ["B2FB",0x9610],
+  ["C0BB",0x9611],
+  ["E3D6",0x9612],
+  ["EA5F",0x9613],
+  ["C0AB",0x9614],
+  ["E3D7",0x9615],
+  ["E3D8",0x9616],
+  ["E3D9",0x9617],
+  ["EA60",0x9618],
+  ["E3DA",0x9619],
+  ["E3DB",0x961A],
+  ["EA61",0x961B],
+  ["B8B7",0x961C],
+  ["DAE2",0x961D],
+  ["EA62",0x961E],
+  ["B6D3",0x961F],
+  ["EA63",0x9620],
+  ["DAE4",0x9621],
+  ["DAE3",0x9622],
+  ["EA64",0x9623],
+  ["EA65",0x9624],
+  ["EA66",0x9625],
+  ["EA67",0x9626],
+  ["EA68",0x9627],
+  ["EA69",0x9628],
+  ["EA6A",0x9629],
+  ["DAE6",0x962A],
+  ["EA6B",0x962B],
+  ["EA6C",0x962C],
+  ["EA6D",0x962D],
+  ["C8EE",0x962E],
+  ["EA6E",0x962F],
+  ["EA6F",0x9630],
+  ["DAE5",0x9631],
+  ["B7C0",0x9632],
+  ["D1F4",0x9633],
+  ["D2F5",0x9634],
+  ["D5F3",0x9635],
+  ["BDD7",0x9636],
+  ["EA70",0x9637],
+  ["EA71",0x9638],
+  ["EA72",0x9639],
+  ["EA73",0x963A],
+  ["D7E8",0x963B],
+  ["DAE8",0x963C],
+  ["DAE7",0x963D],
+  ["EA74",0x963E],
+  ["B0A2",0x963F],
+  ["CDD3",0x9640],
+  ["EA75",0x9641],
+  ["DAE9",0x9642],
+  ["EA76",0x9643],
+  ["B8BD",0x9644],
+  ["BCCA",0x9645],
+  ["C2BD",0x9646],
+  ["C2A4",0x9647],
+  ["B3C2",0x9648],
+  ["DAEA",0x9649],
+  ["EA77",0x964A],
+  ["C2AA",0x964B],
+  ["C4B0",0x964C],
+  ["BDB5",0x964D],
+  ["EA78",0x964E],
+  ["EA79",0x964F],
+  ["CFDE",0x9650],
+  ["EA7A",0x9651],
+  ["EA7B",0x9652],
+  ["EA7C",0x9653],
+  ["DAEB",0x9654],
+  ["C9C2",0x9655],
+  ["EA7D",0x9656],
+  ["EA7E",0x9657],
+  ["EA80",0x9658],
+  ["EA81",0x9659],
+  ["EA82",0x965A],
+  ["B1DD",0x965B],
+  ["EA83",0x965C],
+  ["EA84",0x965D],
+  ["EA85",0x965E],
+  ["DAEC",0x965F],
+  ["EA86",0x9660],
+  ["B6B8",0x9661],
+  ["D4BA",0x9662],
+  ["EA87",0x9663],
+  ["B3FD",0x9664],
+  ["EA88",0x9665],
+  ["EA89",0x9666],
+  ["DAED",0x9667],
+  ["D4C9",0x9668],
+  ["CFD5",0x9669],
+  ["C5E3",0x966A],
+  ["EA8A",0x966B],
+  ["DAEE",0x966C],
+  ["EA8B",0x966D],
+  ["EA8C",0x966E],
+  ["EA8D",0x966F],
+  ["EA8E",0x9670],
+  ["EA8F",0x9671],
+  ["DAEF",0x9672],
+  ["EA90",0x9673],
+  ["DAF0",0x9674],
+  ["C1EA",0x9675],
+  ["CCD5",0x9676],
+  ["CFDD",0x9677],
+  ["EA91",0x9678],
+  ["EA92",0x9679],
+  ["EA93",0x967A],
+  ["EA94",0x967B],
+  ["EA95",0x967C],
+  ["EA96",0x967D],
+  ["EA97",0x967E],
+  ["EA98",0x967F],
+  ["EA99",0x9680],
+  ["EA9A",0x9681],
+  ["EA9B",0x9682],
+  ["EA9C",0x9683],
+  ["EA9D",0x9684],
+  ["D3E7",0x9685],
+  ["C2A1",0x9686],
+  ["EA9E",0x9687],
+  ["DAF1",0x9688],
+  ["EA9F",0x9689],
+  ["EAA0",0x968A],
+  ["CBE5",0x968B],
+  ["EB40",0x968C],
+  ["DAF2",0x968D],
+  ["EB41",0x968E],
+  ["CBE6",0x968F],
+  ["D2FE",0x9690],
+  ["EB42",0x9691],
+  ["EB43",0x9692],
+  ["EB44",0x9693],
+  ["B8F4",0x9694],
+  ["EB45",0x9695],
+  ["EB46",0x9696],
+  ["DAF3",0x9697],
+  ["B0AF",0x9698],
+  ["CFB6",0x9699],
+  ["EB47",0x969A],
+  ["EB48",0x969B],
+  ["D5CF",0x969C],
+  ["EB49",0x969D],
+  ["EB4A",0x969E],
+  ["EB4B",0x969F],
+  ["EB4C",0x96A0],
+  ["EB4D",0x96A1],
+  ["EB4E",0x96A2],
+  ["EB4F",0x96A3],
+  ["EB50",0x96A4],
+  ["EB51",0x96A5],
+  ["EB52",0x96A6],
+  ["CBED",0x96A7],
+  ["EB53",0x96A8],
+  ["EB54",0x96A9],
+  ["EB55",0x96AA],
+  ["EB56",0x96AB],
+  ["EB57",0x96AC],
+  ["EB58",0x96AD],
+  ["EB59",0x96AE],
+  ["EB5A",0x96AF],
+  ["DAF4",0x96B0],
+  ["EB5B",0x96B1],
+  ["EB5C",0x96B2],
+  ["E3C4",0x96B3],
+  ["EB5D",0x96B4],
+  ["EB5E",0x96B5],
+  ["C1A5",0x96B6],
+  ["EB5F",0x96B7],
+  ["EB60",0x96B8],
+  ["F6BF",0x96B9],
+  ["EB61",0x96BA],
+  ["EB62",0x96BB],
+  ["F6C0",0x96BC],
+  ["F6C1",0x96BD],
+  ["C4D1",0x96BE],
+  ["EB63",0x96BF],
+  ["C8B8",0x96C0],
+  ["D1E3",0x96C1],
+  ["EB64",0x96C2],
+  ["EB65",0x96C3],
+  ["D0DB",0x96C4],
+  ["D1C5",0x96C5],
+  ["BCAF",0x96C6],
+  ["B9CD",0x96C7],
+  ["EB66",0x96C8],
+  ["EFF4",0x96C9],
+  ["EB67",0x96CA],
+  ["EB68",0x96CB],
+  ["B4C6",0x96CC],
+  ["D3BA",0x96CD],
+  ["F6C2",0x96CE],
+  ["B3FB",0x96CF],
+  ["EB69",0x96D0],
+  ["EB6A",0x96D1],
+  ["F6C3",0x96D2],
+  ["EB6B",0x96D3],
+  ["EB6C",0x96D4],
+  ["B5F1",0x96D5],
+  ["EB6D",0x96D6],
+  ["EB6E",0x96D7],
+  ["EB6F",0x96D8],
+  ["EB70",0x96D9],
+  ["EB71",0x96DA],
+  ["EB72",0x96DB],
+  ["EB73",0x96DC],
+  ["EB74",0x96DD],
+  ["EB75",0x96DE],
+  ["EB76",0x96DF],
+  ["F6C5",0x96E0],
+  ["EB77",0x96E1],
+  ["EB78",0x96E2],
+  ["EB79",0x96E3],
+  ["EB7A",0x96E4],
+  ["EB7B",0x96E5],
+  ["EB7C",0x96E6],
+  ["EB7D",0x96E7],
+  ["D3EA",0x96E8],
+  ["F6A7",0x96E9],
+  ["D1A9",0x96EA],
+  ["EB7E",0x96EB],
+  ["EB80",0x96EC],
+  ["EB81",0x96ED],
+  ["EB82",0x96EE],
+  ["F6A9",0x96EF],
+  ["EB83",0x96F0],
+  ["EB84",0x96F1],
+  ["EB85",0x96F2],
+  ["F6A8",0x96F3],
+  ["EB86",0x96F4],
+  ["EB87",0x96F5],
+  ["C1E3",0x96F6],
+  ["C0D7",0x96F7],
+  ["EB88",0x96F8],
+  ["B1A2",0x96F9],
+  ["EB89",0x96FA],
+  ["EB8A",0x96FB],
+  ["EB8B",0x96FC],
+  ["EB8C",0x96FD],
+  ["CEED",0x96FE],
+  ["EB8D",0x96FF],
+  ["D0E8",0x9700],
+  ["F6AB",0x9701],
+  ["EB8E",0x9702],
+  ["EB8F",0x9703],
+  ["CFF6",0x9704],
+  ["EB90",0x9705],
+  ["F6AA",0x9706],
+  ["D5F0",0x9707],
+  ["F6AC",0x9708],
+  ["C3B9",0x9709],
+  ["EB91",0x970A],
+  ["EB92",0x970B],
+  ["EB93",0x970C],
+  ["BBF4",0x970D],
+  ["F6AE",0x970E],
+  ["F6AD",0x970F],
+  ["EB94",0x9710],
+  ["EB95",0x9711],
+  ["EB96",0x9712],
+  ["C4DE",0x9713],
+  ["EB97",0x9714],
+  ["EB98",0x9715],
+  ["C1D8",0x9716],
+  ["EB99",0x9717],
+  ["EB9A",0x9718],
+  ["EB9B",0x9719],
+  ["EB9C",0x971A],
+  ["EB9D",0x971B],
+  ["CBAA",0x971C],
+  ["EB9E",0x971D],
+  ["CFBC",0x971E],
+  ["EB9F",0x971F],
+  ["EBA0",0x9720],
+  ["EC40",0x9721],
+  ["EC41",0x9722],
+  ["EC42",0x9723],
+  ["EC43",0x9724],
+  ["EC44",0x9725],
+  ["EC45",0x9726],
+  ["EC46",0x9727],
+  ["EC47",0x9728],
+  ["EC48",0x9729],
+  ["F6AF",0x972A],
+  ["EC49",0x972B],
+  ["EC4A",0x972C],
+  ["F6B0",0x972D],
+  ["EC4B",0x972E],
+  ["EC4C",0x972F],
+  ["F6B1",0x9730],
+  ["EC4D",0x9731],
+  ["C2B6",0x9732],
+  ["EC4E",0x9733],
+  ["EC4F",0x9734],
+  ["EC50",0x9735],
+  ["EC51",0x9736],
+  ["EC52",0x9737],
+  ["B0D4",0x9738],
+  ["C5F9",0x9739],
+  ["EC53",0x973A],
+  ["EC54",0x973B],
+  ["EC55",0x973C],
+  ["EC56",0x973D],
+  ["F6B2",0x973E],
+  ["EC57",0x973F],
+  ["EC58",0x9740],
+  ["EC59",0x9741],
+  ["EC5A",0x9742],
+  ["EC5B",0x9743],
+  ["EC5C",0x9744],
+  ["EC5D",0x9745],
+  ["EC5E",0x9746],
+  ["EC5F",0x9747],
+  ["EC60",0x9748],
+  ["EC61",0x9749],
+  ["EC62",0x974A],
+  ["EC63",0x974B],
+  ["EC64",0x974C],
+  ["EC65",0x974D],
+  ["EC66",0x974E],
+  ["EC67",0x974F],
+  ["EC68",0x9750],
+  ["EC69",0x9751],
+  ["C7E0",0x9752],
+  ["F6A6",0x9753],
+  ["EC6A",0x9754],
+  ["EC6B",0x9755],
+  ["BEB8",0x9756],
+  ["EC6C",0x9757],
+  ["EC6D",0x9758],
+  ["BEB2",0x9759],
+  ["EC6E",0x975A],
+  ["B5E5",0x975B],
+  ["EC6F",0x975C],
+  ["EC70",0x975D],
+  ["B7C7",0x975E],
+  ["EC71",0x975F],
+  ["BFBF",0x9760],
+  ["C3D2",0x9761],
+  ["C3E6",0x9762],
+  ["EC72",0x9763],
+  ["EC73",0x9764],
+  ["D8CC",0x9765],
+  ["EC74",0x9766],
+  ["EC75",0x9767],
+  ["EC76",0x9768],
+  ["B8EF",0x9769],
+  ["EC77",0x976A],
+  ["EC78",0x976B],
+  ["EC79",0x976C],
+  ["EC7A",0x976D],
+  ["EC7B",0x976E],
+  ["EC7C",0x976F],
+  ["EC7D",0x9770],
+  ["EC7E",0x9771],
+  ["EC80",0x9772],
+  ["BDF9",0x9773],
+  ["D1A5",0x9774],
+  ["EC81",0x9775],
+  ["B0D0",0x9776],
+  ["EC82",0x9777],
+  ["EC83",0x9778],
+  ["EC84",0x9779],
+  ["EC85",0x977A],
+  ["EC86",0x977B],
+  ["F7B0",0x977C],
+  ["EC87",0x977D],
+  ["EC88",0x977E],
+  ["EC89",0x977F],
+  ["EC8A",0x9780],
+  ["EC8B",0x9781],
+  ["EC8C",0x9782],
+  ["EC8D",0x9783],
+  ["EC8E",0x9784],
+  ["F7B1",0x9785],
+  ["EC8F",0x9786],
+  ["EC90",0x9787],
+  ["EC91",0x9788],
+  ["EC92",0x9789],
+  ["EC93",0x978A],
+  ["D0AC",0x978B],
+  ["EC94",0x978C],
+  ["B0B0",0x978D],
+  ["EC95",0x978E],
+  ["EC96",0x978F],
+  ["EC97",0x9790],
+  ["F7B2",0x9791],
+  ["F7B3",0x9792],
+  ["EC98",0x9793],
+  ["F7B4",0x9794],
+  ["EC99",0x9795],
+  ["EC9A",0x9796],
+  ["EC9B",0x9797],
+  ["C7CA",0x9798],
+  ["EC9C",0x9799],
+  ["EC9D",0x979A],
+  ["EC9E",0x979B],
+  ["EC9F",0x979C],
+  ["ECA0",0x979D],
+  ["ED40",0x979E],
+  ["ED41",0x979F],
+  ["BECF",0x97A0],
+  ["ED42",0x97A1],
+  ["ED43",0x97A2],
+  ["F7B7",0x97A3],
+  ["ED44",0x97A4],
+  ["ED45",0x97A5],
+  ["ED46",0x97A6],
+  ["ED47",0x97A7],
+  ["ED48",0x97A8],
+  ["ED49",0x97A9],
+  ["ED4A",0x97AA],
+  ["F7B6",0x97AB],
+  ["ED4B",0x97AC],
+  ["B1DE",0x97AD],
+  ["ED4C",0x97AE],
+  ["F7B5",0x97AF],
+  ["ED4D",0x97B0],
+  ["ED4E",0x97B1],
+  ["F7B8",0x97B2],
+  ["ED4F",0x97B3],
+  ["F7B9",0x97B4],
+  ["ED50",0x97B5],
+  ["ED51",0x97B6],
+  ["ED52",0x97B7],
+  ["ED53",0x97B8],
+  ["ED54",0x97B9],
+  ["ED55",0x97BA],
+  ["ED56",0x97BB],
+  ["ED57",0x97BC],
+  ["ED58",0x97BD],
+  ["ED59",0x97BE],
+  ["ED5A",0x97BF],
+  ["ED5B",0x97C0],
+  ["ED5C",0x97C1],
+  ["ED5D",0x97C2],
+  ["ED5E",0x97C3],
+  ["ED5F",0x97C4],
+  ["ED60",0x97C5],
+  ["ED61",0x97C6],
+  ["ED62",0x97C7],
+  ["ED63",0x97C8],
+  ["ED64",0x97C9],
+  ["ED65",0x97CA],
+  ["ED66",0x97CB],
+  ["ED67",0x97CC],
+  ["ED68",0x97CD],
+  ["ED69",0x97CE],
+  ["ED6A",0x97CF],
+  ["ED6B",0x97D0],
+  ["ED6C",0x97D1],
+  ["ED6D",0x97D2],
+  ["ED6E",0x97D3],
+  ["ED6F",0x97D4],
+  ["ED70",0x97D5],
+  ["ED71",0x97D6],
+  ["ED72",0x97D7],
+  ["ED73",0x97D8],
+  ["ED74",0x97D9],
+  ["ED75",0x97DA],
+  ["ED76",0x97DB],
+  ["ED77",0x97DC],
+  ["ED78",0x97DD],
+  ["ED79",0x97DE],
+  ["ED7A",0x97DF],
+  ["ED7B",0x97E0],
+  ["ED7C",0x97E1],
+  ["ED7D",0x97E2],
+  ["ED7E",0x97E3],
+  ["ED80",0x97E4],
+  ["ED81",0x97E5],
+  ["CEA4",0x97E6],
+  ["C8CD",0x97E7],
+  ["ED82",0x97E8],
+  ["BAAB",0x97E9],
+  ["E8B8",0x97EA],
+  ["E8B9",0x97EB],
+  ["E8BA",0x97EC],
+  ["BEC2",0x97ED],
+  ["ED83",0x97EE],
+  ["ED84",0x97EF],
+  ["ED85",0x97F0],
+  ["ED86",0x97F1],
+  ["ED87",0x97F2],
+  ["D2F4",0x97F3],
+  ["ED88",0x97F4],
+  ["D4CF",0x97F5],
+  ["C9D8",0x97F6],
+  ["ED89",0x97F7],
+  ["ED8A",0x97F8],
+  ["ED8B",0x97F9],
+  ["ED8C",0x97FA],
+  ["ED8D",0x97FB],
+  ["ED8E",0x97FC],
+  ["ED8F",0x97FD],
+  ["ED90",0x97FE],
+  ["ED91",0x97FF],
+  ["ED92",0x9800],
+  ["ED93",0x9801],
+  ["ED94",0x9802],
+  ["ED95",0x9803],
+  ["ED96",0x9804],
+  ["ED97",0x9805],
+  ["ED98",0x9806],
+  ["ED99",0x9807],
+  ["ED9A",0x9808],
+  ["ED9B",0x9809],
+  ["ED9C",0x980A],
+  ["ED9D",0x980B],
+  ["ED9E",0x980C],
+  ["ED9F",0x980D],
+  ["EDA0",0x980E],
+  ["EE40",0x980F],
+  ["EE41",0x9810],
+  ["EE42",0x9811],
+  ["EE43",0x9812],
+  ["EE44",0x9813],
+  ["EE45",0x9814],
+  ["EE46",0x9815],
+  ["EE47",0x9816],
+  ["EE48",0x9817],
+  ["EE49",0x9818],
+  ["EE4A",0x9819],
+  ["EE4B",0x981A],
+  ["EE4C",0x981B],
+  ["EE4D",0x981C],
+  ["EE4E",0x981D],
+  ["EE4F",0x981E],
+  ["EE50",0x981F],
+  ["EE51",0x9820],
+  ["EE52",0x9821],
+  ["EE53",0x9822],
+  ["EE54",0x9823],
+  ["EE55",0x9824],
+  ["EE56",0x9825],
+  ["EE57",0x9826],
+  ["EE58",0x9827],
+  ["EE59",0x9828],
+  ["EE5A",0x9829],
+  ["EE5B",0x982A],
+  ["EE5C",0x982B],
+  ["EE5D",0x982C],
+  ["EE5E",0x982D],
+  ["EE5F",0x982E],
+  ["EE60",0x982F],
+  ["EE61",0x9830],
+  ["EE62",0x9831],
+  ["EE63",0x9832],
+  ["EE64",0x9833],
+  ["EE65",0x9834],
+  ["EE66",0x9835],
+  ["EE67",0x9836],
+  ["EE68",0x9837],
+  ["EE69",0x9838],
+  ["EE6A",0x9839],
+  ["EE6B",0x983A],
+  ["EE6C",0x983B],
+  ["EE6D",0x983C],
+  ["EE6E",0x983D],
+  ["EE6F",0x983E],
+  ["EE70",0x983F],
+  ["EE71",0x9840],
+  ["EE72",0x9841],
+  ["EE73",0x9842],
+  ["EE74",0x9843],
+  ["EE75",0x9844],
+  ["EE76",0x9845],
+  ["EE77",0x9846],
+  ["EE78",0x9847],
+  ["EE79",0x9848],
+  ["EE7A",0x9849],
+  ["EE7B",0x984A],
+  ["EE7C",0x984B],
+  ["EE7D",0x984C],
+  ["EE7E",0x984D],
+  ["EE80",0x984E],
+  ["EE81",0x984F],
+  ["EE82",0x9850],
+  ["EE83",0x9851],
+  ["EE84",0x9852],
+  ["EE85",0x9853],
+  ["EE86",0x9854],
+  ["EE87",0x9855],
+  ["EE88",0x9856],
+  ["EE89",0x9857],
+  ["EE8A",0x9858],
+  ["EE8B",0x9859],
+  ["EE8C",0x985A],
+  ["EE8D",0x985B],
+  ["EE8E",0x985C],
+  ["EE8F",0x985D],
+  ["EE90",0x985E],
+  ["EE91",0x985F],
+  ["EE92",0x9860],
+  ["EE93",0x9861],
+  ["EE94",0x9862],
+  ["EE95",0x9863],
+  ["EE96",0x9864],
+  ["EE97",0x9865],
+  ["EE98",0x9866],
+  ["EE99",0x9867],
+  ["EE9A",0x9868],
+  ["EE9B",0x9869],
+  ["EE9C",0x986A],
+  ["EE9D",0x986B],
+  ["EE9E",0x986C],
+  ["EE9F",0x986D],
+  ["EEA0",0x986E],
+  ["EF40",0x986F],
+  ["EF41",0x9870],
+  ["EF42",0x9871],
+  ["EF43",0x9872],
+  ["EF44",0x9873],
+  ["EF45",0x9874],
+  ["D2B3",0x9875],
+  ["B6A5",0x9876],
+  ["C7EA",0x9877],
+  ["F1FC",0x9878],
+  ["CFEE",0x9879],
+  ["CBB3",0x987A],
+  ["D0EB",0x987B],
+  ["E7EF",0x987C],
+  ["CDE7",0x987D],
+  ["B9CB",0x987E],
+  ["B6D9",0x987F],
+  ["F1FD",0x9880],
+  ["B0E4",0x9881],
+  ["CBCC",0x9882],
+  ["F1FE",0x9883],
+  ["D4A4",0x9884],
+  ["C2AD",0x9885],
+  ["C1EC",0x9886],
+  ["C6C4",0x9887],
+  ["BEB1",0x9888],
+  ["F2A1",0x9889],
+  ["BCD5",0x988A],
+  ["EF46",0x988B],
+  ["F2A2",0x988C],
+  ["F2A3",0x988D],
+  ["EF47",0x988E],
+  ["F2A4",0x988F],
+  ["D2C3",0x9890],
+  ["C6B5",0x9891],
+  ["EF48",0x9892],
+  ["CDC7",0x9893],
+  ["F2A5",0x9894],
+  ["EF49",0x9895],
+  ["D3B1",0x9896],
+  ["BFC5",0x9897],
+  ["CCE2",0x9898],
+  ["EF4A",0x9899],
+  ["F2A6",0x989A],
+  ["F2A7",0x989B],
+  ["D1D5",0x989C],
+  ["B6EE",0x989D],
+  ["F2A8",0x989E],
+  ["F2A9",0x989F],
+  ["B5DF",0x98A0],
+  ["F2AA",0x98A1],
+  ["F2AB",0x98A2],
+  ["EF4B",0x98A3],
+  ["B2FC",0x98A4],
+  ["F2AC",0x98A5],
+  ["F2AD",0x98A6],
+  ["C8A7",0x98A7],
+  ["EF4C",0x98A8],
+  ["EF4D",0x98A9],
+  ["EF4E",0x98AA],
+  ["EF4F",0x98AB],
+  ["EF50",0x98AC],
+  ["EF51",0x98AD],
+  ["EF52",0x98AE],
+  ["EF53",0x98AF],
+  ["EF54",0x98B0],
+  ["EF55",0x98B1],
+  ["EF56",0x98B2],
+  ["EF57",0x98B3],
+  ["EF58",0x98B4],
+  ["EF59",0x98B5],
+  ["EF5A",0x98B6],
+  ["EF5B",0x98B7],
+  ["EF5C",0x98B8],
+  ["EF5D",0x98B9],
+  ["EF5E",0x98BA],
+  ["EF5F",0x98BB],
+  ["EF60",0x98BC],
+  ["EF61",0x98BD],
+  ["EF62",0x98BE],
+  ["EF63",0x98BF],
+  ["EF64",0x98C0],
+  ["EF65",0x98C1],
+  ["EF66",0x98C2],
+  ["EF67",0x98C3],
+  ["EF68",0x98C4],
+  ["EF69",0x98C5],
+  ["EF6A",0x98C6],
+  ["EF6B",0x98C7],
+  ["EF6C",0x98C8],
+  ["EF6D",0x98C9],
+  ["EF6E",0x98CA],
+  ["EF6F",0x98CB],
+  ["EF70",0x98CC],
+  ["EF71",0x98CD],
+  ["B7E7",0x98CE],
+  ["EF72",0x98CF],
+  ["EF73",0x98D0],
+  ["ECA9",0x98D1],
+  ["ECAA",0x98D2],
+  ["ECAB",0x98D3],
+  ["EF74",0x98D4],
+  ["ECAC",0x98D5],
+  ["EF75",0x98D6],
+  ["EF76",0x98D7],
+  ["C6AE",0x98D8],
+  ["ECAD",0x98D9],
+  ["ECAE",0x98DA],
+  ["EF77",0x98DB],
+  ["EF78",0x98DC],
+  ["EF79",0x98DD],
+  ["B7C9",0x98DE],
+  ["CAB3",0x98DF],
+  ["EF7A",0x98E0],
+  ["EF7B",0x98E1],
+  ["EF7C",0x98E2],
+  ["EF7D",0x98E3],
+  ["EF7E",0x98E4],
+  ["EF80",0x98E5],
+  ["EF81",0x98E6],
+  ["E2B8",0x98E7],
+  ["F7CF",0x98E8],
+  ["EF82",0x98E9],
+  ["EF83",0x98EA],
+  ["EF84",0x98EB],
+  ["EF85",0x98EC],
+  ["EF86",0x98ED],
+  ["EF87",0x98EE],
+  ["EF88",0x98EF],
+  ["EF89",0x98F0],
+  ["EF8A",0x98F1],
+  ["EF8B",0x98F2],
+  ["EF8C",0x98F3],
+  ["EF8D",0x98F4],
+  ["EF8E",0x98F5],
+  ["EF8F",0x98F6],
+  ["EF90",0x98F7],
+  ["EF91",0x98F8],
+  ["EF92",0x98F9],
+  ["EF93",0x98FA],
+  ["EF94",0x98FB],
+  ["EF95",0x98FC],
+  ["EF96",0x98FD],
+  ["EF97",0x98FE],
+  ["EF98",0x98FF],
+  ["EF99",0x9900],
+  ["EF9A",0x9901],
+  ["EF9B",0x9902],
+  ["EF9C",0x9903],
+  ["EF9D",0x9904],
+  ["EF9E",0x9905],
+  ["EF9F",0x9906],
+  ["EFA0",0x9907],
+  ["F040",0x9908],
+  ["F041",0x9909],
+  ["F042",0x990A],
+  ["F043",0x990B],
+  ["F044",0x990C],
+  ["F7D0",0x990D],
+  ["F045",0x990E],
+  ["F046",0x990F],
+  ["B2CD",0x9910],
+  ["F047",0x9911],
+  ["F048",0x9912],
+  ["F049",0x9913],
+  ["F04A",0x9914],
+  ["F04B",0x9915],
+  ["F04C",0x9916],
+  ["F04D",0x9917],
+  ["F04E",0x9918],
+  ["F04F",0x9919],
+  ["F050",0x991A],
+  ["F051",0x991B],
+  ["F052",0x991C],
+  ["F053",0x991D],
+  ["F054",0x991E],
+  ["F055",0x991F],
+  ["F056",0x9920],
+  ["F057",0x9921],
+  ["F058",0x9922],
+  ["F059",0x9923],
+  ["F05A",0x9924],
+  ["F05B",0x9925],
+  ["F05C",0x9926],
+  ["F05D",0x9927],
+  ["F05E",0x9928],
+  ["F05F",0x9929],
+  ["F060",0x992A],
+  ["F061",0x992B],
+  ["F062",0x992C],
+  ["F063",0x992D],
+  ["F7D1",0x992E],
+  ["F064",0x992F],
+  ["F065",0x9930],
+  ["F066",0x9931],
+  ["F067",0x9932],
+  ["F068",0x9933],
+  ["F069",0x9934],
+  ["F06A",0x9935],
+  ["F06B",0x9936],
+  ["F06C",0x9937],
+  ["F06D",0x9938],
+  ["F06E",0x9939],
+  ["F06F",0x993A],
+  ["F070",0x993B],
+  ["F071",0x993C],
+  ["F072",0x993D],
+  ["F073",0x993E],
+  ["F074",0x993F],
+  ["F075",0x9940],
+  ["F076",0x9941],
+  ["F077",0x9942],
+  ["F078",0x9943],
+  ["F079",0x9944],
+  ["F07A",0x9945],
+  ["F07B",0x9946],
+  ["F07C",0x9947],
+  ["F07D",0x9948],
+  ["F07E",0x9949],
+  ["F080",0x994A],
+  ["F081",0x994B],
+  ["F082",0x994C],
+  ["F083",0x994D],
+  ["F084",0x994E],
+  ["F085",0x994F],
+  ["F086",0x9950],
+  ["F087",0x9951],
+  ["F088",0x9952],
+  ["F089",0x9953],
+  ["F7D3",0x9954],
+  ["F7D2",0x9955],
+  ["F08A",0x9956],
+  ["F08B",0x9957],
+  ["F08C",0x9958],
+  ["F08D",0x9959],
+  ["F08E",0x995A],
+  ["F08F",0x995B],
+  ["F090",0x995C],
+  ["F091",0x995D],
+  ["F092",0x995E],
+  ["F093",0x995F],
+  ["F094",0x9960],
+  ["F095",0x9961],
+  ["F096",0x9962],
+  ["E2BB",0x9963],
+  ["F097",0x9964],
+  ["BCA2",0x9965],
+  ["F098",0x9966],
+  ["E2BC",0x9967],
+  ["E2BD",0x9968],
+  ["E2BE",0x9969],
+  ["E2BF",0x996A],
+  ["E2C0",0x996B],
+  ["E2C1",0x996C],
+  ["B7B9",0x996D],
+  ["D2FB",0x996E],
+  ["BDA4",0x996F],
+  ["CACE",0x9970],
+  ["B1A5",0x9971],
+  ["CBC7",0x9972],
+  ["F099",0x9973],
+  ["E2C2",0x9974],
+  ["B6FC",0x9975],
+  ["C8C4",0x9976],
+  ["E2C3",0x9977],
+  ["F09A",0x9978],
+  ["F09B",0x9979],
+  ["BDC8",0x997A],
+  ["F09C",0x997B],
+  ["B1FD",0x997C],
+  ["E2C4",0x997D],
+  ["F09D",0x997E],
+  ["B6F6",0x997F],
+  ["E2C5",0x9980],
+  ["C4D9",0x9981],
+  ["F09E",0x9982],
+  ["F09F",0x9983],
+  ["E2C6",0x9984],
+  ["CFDA",0x9985],
+  ["B9DD",0x9986],
+  ["E2C7",0x9987],
+  ["C0A1",0x9988],
+  ["F0A0",0x9989],
+  ["E2C8",0x998A],
+  ["B2F6",0x998B],
+  ["F140",0x998C],
+  ["E2C9",0x998D],
+  ["F141",0x998E],
+  ["C1F3",0x998F],
+  ["E2CA",0x9990],
+  ["E2CB",0x9991],
+  ["C2F8",0x9992],
+  ["E2CC",0x9993],
+  ["E2CD",0x9994],
+  ["E2CE",0x9995],
+  ["CAD7",0x9996],
+  ["D8B8",0x9997],
+  ["D9E5",0x9998],
+  ["CFE3",0x9999],
+  ["F142",0x999A],
+  ["F143",0x999B],
+  ["F144",0x999C],
+  ["F145",0x999D],
+  ["F146",0x999E],
+  ["F147",0x999F],
+  ["F148",0x99A0],
+  ["F149",0x99A1],
+  ["F14A",0x99A2],
+  ["F14B",0x99A3],
+  ["F14C",0x99A4],
+  ["F0A5",0x99A5],
+  ["F14D",0x99A6],
+  ["F14E",0x99A7],
+  ["DCB0",0x99A8],
+  ["F14F",0x99A9],
+  ["F150",0x99AA],
+  ["F151",0x99AB],
+  ["F152",0x99AC],
+  ["F153",0x99AD],
+  ["F154",0x99AE],
+  ["F155",0x99AF],
+  ["F156",0x99B0],
+  ["F157",0x99B1],
+  ["F158",0x99B2],
+  ["F159",0x99B3],
+  ["F15A",0x99B4],
+  ["F15B",0x99B5],
+  ["F15C",0x99B6],
+  ["F15D",0x99B7],
+  ["F15E",0x99B8],
+  ["F15F",0x99B9],
+  ["F160",0x99BA],
+  ["F161",0x99BB],
+  ["F162",0x99BC],
+  ["F163",0x99BD],
+  ["F164",0x99BE],
+  ["F165",0x99BF],
+  ["F166",0x99C0],
+  ["F167",0x99C1],
+  ["F168",0x99C2],
+  ["F169",0x99C3],
+  ["F16A",0x99C4],
+  ["F16B",0x99C5],
+  ["F16C",0x99C6],
+  ["F16D",0x99C7],
+  ["F16E",0x99C8],
+  ["F16F",0x99C9],
+  ["F170",0x99CA],
+  ["F171",0x99CB],
+  ["F172",0x99CC],
+  ["F173",0x99CD],
+  ["F174",0x99CE],
+  ["F175",0x99CF],
+  ["F176",0x99D0],
+  ["F177",0x99D1],
+  ["F178",0x99D2],
+  ["F179",0x99D3],
+  ["F17A",0x99D4],
+  ["F17B",0x99D5],
+  ["F17C",0x99D6],
+  ["F17D",0x99D7],
+  ["F17E",0x99D8],
+  ["F180",0x99D9],
+  ["F181",0x99DA],
+  ["F182",0x99DB],
+  ["F183",0x99DC],
+  ["F184",0x99DD],
+  ["F185",0x99DE],
+  ["F186",0x99DF],
+  ["F187",0x99E0],
+  ["F188",0x99E1],
+  ["F189",0x99E2],
+  ["F18A",0x99E3],
+  ["F18B",0x99E4],
+  ["F18C",0x99E5],
+  ["F18D",0x99E6],
+  ["F18E",0x99E7],
+  ["F18F",0x99E8],
+  ["F190",0x99E9],
+  ["F191",0x99EA],
+  ["F192",0x99EB],
+  ["F193",0x99EC],
+  ["F194",0x99ED],
+  ["F195",0x99EE],
+  ["F196",0x99EF],
+  ["F197",0x99F0],
+  ["F198",0x99F1],
+  ["F199",0x99F2],
+  ["F19A",0x99F3],
+  ["F19B",0x99F4],
+  ["F19C",0x99F5],
+  ["F19D",0x99F6],
+  ["F19E",0x99F7],
+  ["F19F",0x99F8],
+  ["F1A0",0x99F9],
+  ["F240",0x99FA],
+  ["F241",0x99FB],
+  ["F242",0x99FC],
+  ["F243",0x99FD],
+  ["F244",0x99FE],
+  ["F245",0x99FF],
+  ["F246",0x9A00],
+  ["F247",0x9A01],
+  ["F248",0x9A02],
+  ["F249",0x9A03],
+  ["F24A",0x9A04],
+  ["F24B",0x9A05],
+  ["F24C",0x9A06],
+  ["F24D",0x9A07],
+  ["F24E",0x9A08],
+  ["F24F",0x9A09],
+  ["F250",0x9A0A],
+  ["F251",0x9A0B],
+  ["F252",0x9A0C],
+  ["F253",0x9A0D],
+  ["F254",0x9A0E],
+  ["F255",0x9A0F],
+  ["F256",0x9A10],
+  ["F257",0x9A11],
+  ["F258",0x9A12],
+  ["F259",0x9A13],
+  ["F25A",0x9A14],
+  ["F25B",0x9A15],
+  ["F25C",0x9A16],
+  ["F25D",0x9A17],
+  ["F25E",0x9A18],
+  ["F25F",0x9A19],
+  ["F260",0x9A1A],
+  ["F261",0x9A1B],
+  ["F262",0x9A1C],
+  ["F263",0x9A1D],
+  ["F264",0x9A1E],
+  ["F265",0x9A1F],
+  ["F266",0x9A20],
+  ["F267",0x9A21],
+  ["F268",0x9A22],
+  ["F269",0x9A23],
+  ["F26A",0x9A24],
+  ["F26B",0x9A25],
+  ["F26C",0x9A26],
+  ["F26D",0x9A27],
+  ["F26E",0x9A28],
+  ["F26F",0x9A29],
+  ["F270",0x9A2A],
+  ["F271",0x9A2B],
+  ["F272",0x9A2C],
+  ["F273",0x9A2D],
+  ["F274",0x9A2E],
+  ["F275",0x9A2F],
+  ["F276",0x9A30],
+  ["F277",0x9A31],
+  ["F278",0x9A32],
+  ["F279",0x9A33],
+  ["F27A",0x9A34],
+  ["F27B",0x9A35],
+  ["F27C",0x9A36],
+  ["F27D",0x9A37],
+  ["F27E",0x9A38],
+  ["F280",0x9A39],
+  ["F281",0x9A3A],
+  ["F282",0x9A3B],
+  ["F283",0x9A3C],
+  ["F284",0x9A3D],
+  ["F285",0x9A3E],
+  ["F286",0x9A3F],
+  ["F287",0x9A40],
+  ["F288",0x9A41],
+  ["F289",0x9A42],
+  ["F28A",0x9A43],
+  ["F28B",0x9A44],
+  ["F28C",0x9A45],
+  ["F28D",0x9A46],
+  ["F28E",0x9A47],
+  ["F28F",0x9A48],
+  ["F290",0x9A49],
+  ["F291",0x9A4A],
+  ["F292",0x9A4B],
+  ["F293",0x9A4C],
+  ["F294",0x9A4D],
+  ["F295",0x9A4E],
+  ["F296",0x9A4F],
+  ["F297",0x9A50],
+  ["F298",0x9A51],
+  ["F299",0x9A52],
+  ["F29A",0x9A53],
+  ["F29B",0x9A54],
+  ["F29C",0x9A55],
+  ["F29D",0x9A56],
+  ["F29E",0x9A57],
+  ["F29F",0x9A58],
+  ["F2A0",0x9A59],
+  ["F340",0x9A5A],
+  ["F341",0x9A5B],
+  ["F342",0x9A5C],
+  ["F343",0x9A5D],
+  ["F344",0x9A5E],
+  ["F345",0x9A5F],
+  ["F346",0x9A60],
+  ["F347",0x9A61],
+  ["F348",0x9A62],
+  ["F349",0x9A63],
+  ["F34A",0x9A64],
+  ["F34B",0x9A65],
+  ["F34C",0x9A66],
+  ["F34D",0x9A67],
+  ["F34E",0x9A68],
+  ["F34F",0x9A69],
+  ["F350",0x9A6A],
+  ["F351",0x9A6B],
+  ["C2ED",0x9A6C],
+  ["D4A6",0x9A6D],
+  ["CDD4",0x9A6E],
+  ["D1B1",0x9A6F],
+  ["B3DB",0x9A70],
+  ["C7FD",0x9A71],
+  ["F352",0x9A72],
+  ["B2B5",0x9A73],
+  ["C2BF",0x9A74],
+  ["E6E0",0x9A75],
+  ["CABB",0x9A76],
+  ["E6E1",0x9A77],
+  ["E6E2",0x9A78],
+  ["BED4",0x9A79],
+  ["E6E3",0x9A7A],
+  ["D7A4",0x9A7B],
+  ["CDD5",0x9A7C],
+  ["E6E5",0x9A7D],
+  ["BCDD",0x9A7E],
+  ["E6E4",0x9A7F],
+  ["E6E6",0x9A80],
+  ["E6E7",0x9A81],
+  ["C2EE",0x9A82],
+  ["F353",0x9A83],
+  ["BDBE",0x9A84],
+  ["E6E8",0x9A85],
+  ["C2E6",0x9A86],
+  ["BAA7",0x9A87],
+  ["E6E9",0x9A88],
+  ["F354",0x9A89],
+  ["E6EA",0x9A8A],
+  ["B3D2",0x9A8B],
+  ["D1E9",0x9A8C],
+  ["F355",0x9A8D],
+  ["F356",0x9A8E],
+  ["BFA5",0x9A8F],
+  ["E6EB",0x9A90],
+  ["C6EF",0x9A91],
+  ["E6EC",0x9A92],
+  ["E6ED",0x9A93],
+  ["F357",0x9A94],
+  ["F358",0x9A95],
+  ["E6EE",0x9A96],
+  ["C6AD",0x9A97],
+  ["E6EF",0x9A98],
+  ["F359",0x9A99],
+  ["C9A7",0x9A9A],
+  ["E6F0",0x9A9B],
+  ["E6F1",0x9A9C],
+  ["E6F2",0x9A9D],
+  ["E5B9",0x9A9E],
+  ["E6F3",0x9A9F],
+  ["E6F4",0x9AA0],
+  ["C2E2",0x9AA1],
+  ["E6F5",0x9AA2],
+  ["E6F6",0x9AA3],
+  ["D6E8",0x9AA4],
+  ["E6F7",0x9AA5],
+  ["F35A",0x9AA6],
+  ["E6F8",0x9AA7],
+  ["B9C7",0x9AA8],
+  ["F35B",0x9AA9],
+  ["F35C",0x9AAA],
+  ["F35D",0x9AAB],
+  ["F35E",0x9AAC],
+  ["F35F",0x9AAD],
+  ["F360",0x9AAE],
+  ["F361",0x9AAF],
+  ["F7BB",0x9AB0],
+  ["F7BA",0x9AB1],
+  ["F362",0x9AB2],
+  ["F363",0x9AB3],
+  ["F364",0x9AB4],
+  ["F365",0x9AB5],
+  ["F7BE",0x9AB6],
+  ["F7BC",0x9AB7],
+  ["BAA1",0x9AB8],
+  ["F366",0x9AB9],
+  ["F7BF",0x9ABA],
+  ["F367",0x9ABB],
+  ["F7C0",0x9ABC],
+  ["F368",0x9ABD],
+  ["F369",0x9ABE],
+  ["F36A",0x9ABF],
+  ["F7C2",0x9AC0],
+  ["F7C1",0x9AC1],
+  ["F7C4",0x9AC2],
+  ["F36B",0x9AC3],
+  ["F36C",0x9AC4],
+  ["F7C3",0x9AC5],
+  ["F36D",0x9AC6],
+  ["F36E",0x9AC7],
+  ["F36F",0x9AC8],
+  ["F370",0x9AC9],
+  ["F371",0x9ACA],
+  ["F7C5",0x9ACB],
+  ["F7C6",0x9ACC],
+  ["F372",0x9ACD],
+  ["F373",0x9ACE],
+  ["F374",0x9ACF],
+  ["F375",0x9AD0],
+  ["F7C7",0x9AD1],
+  ["F376",0x9AD2],
+  ["CBE8",0x9AD3],
+  ["F377",0x9AD4],
+  ["F378",0x9AD5],
+  ["F379",0x9AD6],
+  ["F37A",0x9AD7],
+  ["B8DF",0x9AD8],
+  ["F37B",0x9AD9],
+  ["F37C",0x9ADA],
+  ["F37D",0x9ADB],
+  ["F37E",0x9ADC],
+  ["F380",0x9ADD],
+  ["F381",0x9ADE],
+  ["F7D4",0x9ADF],
+  ["F382",0x9AE0],
+  ["F7D5",0x9AE1],
+  ["F383",0x9AE2],
+  ["F384",0x9AE3],
+  ["F385",0x9AE4],
+  ["F386",0x9AE5],
+  ["F7D6",0x9AE6],
+  ["F387",0x9AE7],
+  ["F388",0x9AE8],
+  ["F389",0x9AE9],
+  ["F38A",0x9AEA],
+  ["F7D8",0x9AEB],
+  ["F38B",0x9AEC],
+  ["F7DA",0x9AED],
+  ["F38C",0x9AEE],
+  ["F7D7",0x9AEF],
+  ["F38D",0x9AF0],
+  ["F38E",0x9AF1],
+  ["F38F",0x9AF2],
+  ["F390",0x9AF3],
+  ["F391",0x9AF4],
+  ["F392",0x9AF5],
+  ["F393",0x9AF6],
+  ["F394",0x9AF7],
+  ["F395",0x9AF8],
+  ["F7DB",0x9AF9],
+  ["F396",0x9AFA],
+  ["F7D9",0x9AFB],
+  ["F397",0x9AFC],
+  ["F398",0x9AFD],
+  ["F399",0x9AFE],
+  ["F39A",0x9AFF],
+  ["F39B",0x9B00],
+  ["F39C",0x9B01],
+  ["F39D",0x9B02],
+  ["D7D7",0x9B03],
+  ["F39E",0x9B04],
+  ["F39F",0x9B05],
+  ["F3A0",0x9B06],
+  ["F440",0x9B07],
+  ["F7DC",0x9B08],
+  ["F441",0x9B09],
+  ["F442",0x9B0A],
+  ["F443",0x9B0B],
+  ["F444",0x9B0C],
+  ["F445",0x9B0D],
+  ["F446",0x9B0E],
+  ["F7DD",0x9B0F],
+  ["F447",0x9B10],
+  ["F448",0x9B11],
+  ["F449",0x9B12],
+  ["F7DE",0x9B13],
+  ["F44A",0x9B14],
+  ["F44B",0x9B15],
+  ["F44C",0x9B16],
+  ["F44D",0x9B17],
+  ["F44E",0x9B18],
+  ["F44F",0x9B19],
+  ["F450",0x9B1A],
+  ["F451",0x9B1B],
+  ["F452",0x9B1C],
+  ["F453",0x9B1D],
+  ["F454",0x9B1E],
+  ["F7DF",0x9B1F],
+  ["F455",0x9B20],
+  ["F456",0x9B21],
+  ["F457",0x9B22],
+  ["F7E0",0x9B23],
+  ["F458",0x9B24],
+  ["F459",0x9B25],
+  ["F45A",0x9B26],
+  ["F45B",0x9B27],
+  ["F45C",0x9B28],
+  ["F45D",0x9B29],
+  ["F45E",0x9B2A],
+  ["F45F",0x9B2B],
+  ["F460",0x9B2C],
+  ["F461",0x9B2D],
+  ["F462",0x9B2E],
+  ["DBCB",0x9B2F],
+  ["F463",0x9B30],
+  ["F464",0x9B31],
+  ["D8AA",0x9B32],
+  ["F465",0x9B33],
+  ["F466",0x9B34],
+  ["F467",0x9B35],
+  ["F468",0x9B36],
+  ["F469",0x9B37],
+  ["F46A",0x9B38],
+  ["F46B",0x9B39],
+  ["F46C",0x9B3A],
+  ["E5F7",0x9B3B],
+  ["B9ED",0x9B3C],
+  ["F46D",0x9B3D],
+  ["F46E",0x9B3E],
+  ["F46F",0x9B3F],
+  ["F470",0x9B40],
+  ["BFFD",0x9B41],
+  ["BBEA",0x9B42],
+  ["F7C9",0x9B43],
+  ["C6C7",0x9B44],
+  ["F7C8",0x9B45],
+  ["F471",0x9B46],
+  ["F7CA",0x9B47],
+  ["F7CC",0x9B48],
+  ["F7CB",0x9B49],
+  ["F472",0x9B4A],
+  ["F473",0x9B4B],
+  ["F474",0x9B4C],
+  ["F7CD",0x9B4D],
+  ["F475",0x9B4E],
+  ["CEBA",0x9B4F],
+  ["F476",0x9B50],
+  ["F7CE",0x9B51],
+  ["F477",0x9B52],
+  ["F478",0x9B53],
+  ["C4A7",0x9B54],
+  ["F479",0x9B55],
+  ["F47A",0x9B56],
+  ["F47B",0x9B57],
+  ["F47C",0x9B58],
+  ["F47D",0x9B59],
+  ["F47E",0x9B5A],
+  ["F480",0x9B5B],
+  ["F481",0x9B5C],
+  ["F482",0x9B5D],
+  ["F483",0x9B5E],
+  ["F484",0x9B5F],
+  ["F485",0x9B60],
+  ["F486",0x9B61],
+  ["F487",0x9B62],
+  ["F488",0x9B63],
+  ["F489",0x9B64],
+  ["F48A",0x9B65],
+  ["F48B",0x9B66],
+  ["F48C",0x9B67],
+  ["F48D",0x9B68],
+  ["F48E",0x9B69],
+  ["F48F",0x9B6A],
+  ["F490",0x9B6B],
+  ["F491",0x9B6C],
+  ["F492",0x9B6D],
+  ["F493",0x9B6E],
+  ["F494",0x9B6F],
+  ["F495",0x9B70],
+  ["F496",0x9B71],
+  ["F497",0x9B72],
+  ["F498",0x9B73],
+  ["F499",0x9B74],
+  ["F49A",0x9B75],
+  ["F49B",0x9B76],
+  ["F49C",0x9B77],
+  ["F49D",0x9B78],
+  ["F49E",0x9B79],
+  ["F49F",0x9B7A],
+  ["F4A0",0x9B7B],
+  ["F540",0x9B7C],
+  ["F541",0x9B7D],
+  ["F542",0x9B7E],
+  ["F543",0x9B7F],
+  ["F544",0x9B80],
+  ["F545",0x9B81],
+  ["F546",0x9B82],
+  ["F547",0x9B83],
+  ["F548",0x9B84],
+  ["F549",0x9B85],
+  ["F54A",0x9B86],
+  ["F54B",0x9B87],
+  ["F54C",0x9B88],
+  ["F54D",0x9B89],
+  ["F54E",0x9B8A],
+  ["F54F",0x9B8B],
+  ["F550",0x9B8C],
+  ["F551",0x9B8D],
+  ["F552",0x9B8E],
+  ["F553",0x9B8F],
+  ["F554",0x9B90],
+  ["F555",0x9B91],
+  ["F556",0x9B92],
+  ["F557",0x9B93],
+  ["F558",0x9B94],
+  ["F559",0x9B95],
+  ["F55A",0x9B96],
+  ["F55B",0x9B97],
+  ["F55C",0x9B98],
+  ["F55D",0x9B99],
+  ["F55E",0x9B9A],
+  ["F55F",0x9B9B],
+  ["F560",0x9B9C],
+  ["F561",0x9B9D],
+  ["F562",0x9B9E],
+  ["F563",0x9B9F],
+  ["F564",0x9BA0],
+  ["F565",0x9BA1],
+  ["F566",0x9BA2],
+  ["F567",0x9BA3],
+  ["F568",0x9BA4],
+  ["F569",0x9BA5],
+  ["F56A",0x9BA6],
+  ["F56B",0x9BA7],
+  ["F56C",0x9BA8],
+  ["F56D",0x9BA9],
+  ["F56E",0x9BAA],
+  ["F56F",0x9BAB],
+  ["F570",0x9BAC],
+  ["F571",0x9BAD],
+  ["F572",0x9BAE],
+  ["F573",0x9BAF],
+  ["F574",0x9BB0],
+  ["F575",0x9BB1],
+  ["F576",0x9BB2],
+  ["F577",0x9BB3],
+  ["F578",0x9BB4],
+  ["F579",0x9BB5],
+  ["F57A",0x9BB6],
+  ["F57B",0x9BB7],
+  ["F57C",0x9BB8],
+  ["F57D",0x9BB9],
+  ["F57E",0x9BBA],
+  ["F580",0x9BBB],
+  ["F581",0x9BBC],
+  ["F582",0x9BBD],
+  ["F583",0x9BBE],
+  ["F584",0x9BBF],
+  ["F585",0x9BC0],
+  ["F586",0x9BC1],
+  ["F587",0x9BC2],
+  ["F588",0x9BC3],
+  ["F589",0x9BC4],
+  ["F58A",0x9BC5],
+  ["F58B",0x9BC6],
+  ["F58C",0x9BC7],
+  ["F58D",0x9BC8],
+  ["F58E",0x9BC9],
+  ["F58F",0x9BCA],
+  ["F590",0x9BCB],
+  ["F591",0x9BCC],
+  ["F592",0x9BCD],
+  ["F593",0x9BCE],
+  ["F594",0x9BCF],
+  ["F595",0x9BD0],
+  ["F596",0x9BD1],
+  ["F597",0x9BD2],
+  ["F598",0x9BD3],
+  ["F599",0x9BD4],
+  ["F59A",0x9BD5],
+  ["F59B",0x9BD6],
+  ["F59C",0x9BD7],
+  ["F59D",0x9BD8],
+  ["F59E",0x9BD9],
+  ["F59F",0x9BDA],
+  ["F5A0",0x9BDB],
+  ["F640",0x9BDC],
+  ["F641",0x9BDD],
+  ["F642",0x9BDE],
+  ["F643",0x9BDF],
+  ["F644",0x9BE0],
+  ["F645",0x9BE1],
+  ["F646",0x9BE2],
+  ["F647",0x9BE3],
+  ["F648",0x9BE4],
+  ["F649",0x9BE5],
+  ["F64A",0x9BE6],
+  ["F64B",0x9BE7],
+  ["F64C",0x9BE8],
+  ["F64D",0x9BE9],
+  ["F64E",0x9BEA],
+  ["F64F",0x9BEB],
+  ["F650",0x9BEC],
+  ["F651",0x9BED],
+  ["F652",0x9BEE],
+  ["F653",0x9BEF],
+  ["F654",0x9BF0],
+  ["F655",0x9BF1],
+  ["F656",0x9BF2],
+  ["F657",0x9BF3],
+  ["F658",0x9BF4],
+  ["F659",0x9BF5],
+  ["F65A",0x9BF6],
+  ["F65B",0x9BF7],
+  ["F65C",0x9BF8],
+  ["F65D",0x9BF9],
+  ["F65E",0x9BFA],
+  ["F65F",0x9BFB],
+  ["F660",0x9BFC],
+  ["F661",0x9BFD],
+  ["F662",0x9BFE],
+  ["F663",0x9BFF],
+  ["F664",0x9C00],
+  ["F665",0x9C01],
+  ["F666",0x9C02],
+  ["F667",0x9C03],
+  ["F668",0x9C04],
+  ["F669",0x9C05],
+  ["F66A",0x9C06],
+  ["F66B",0x9C07],
+  ["F66C",0x9C08],
+  ["F66D",0x9C09],
+  ["F66E",0x9C0A],
+  ["F66F",0x9C0B],
+  ["F670",0x9C0C],
+  ["F671",0x9C0D],
+  ["F672",0x9C0E],
+  ["F673",0x9C0F],
+  ["F674",0x9C10],
+  ["F675",0x9C11],
+  ["F676",0x9C12],
+  ["F677",0x9C13],
+  ["F678",0x9C14],
+  ["F679",0x9C15],
+  ["F67A",0x9C16],
+  ["F67B",0x9C17],
+  ["F67C",0x9C18],
+  ["F67D",0x9C19],
+  ["F67E",0x9C1A],
+  ["F680",0x9C1B],
+  ["F681",0x9C1C],
+  ["F682",0x9C1D],
+  ["F683",0x9C1E],
+  ["F684",0x9C1F],
+  ["F685",0x9C20],
+  ["F686",0x9C21],
+  ["F687",0x9C22],
+  ["F688",0x9C23],
+  ["F689",0x9C24],
+  ["F68A",0x9C25],
+  ["F68B",0x9C26],
+  ["F68C",0x9C27],
+  ["F68D",0x9C28],
+  ["F68E",0x9C29],
+  ["F68F",0x9C2A],
+  ["F690",0x9C2B],
+  ["F691",0x9C2C],
+  ["F692",0x9C2D],
+  ["F693",0x9C2E],
+  ["F694",0x9C2F],
+  ["F695",0x9C30],
+  ["F696",0x9C31],
+  ["F697",0x9C32],
+  ["F698",0x9C33],
+  ["F699",0x9C34],
+  ["F69A",0x9C35],
+  ["F69B",0x9C36],
+  ["F69C",0x9C37],
+  ["F69D",0x9C38],
+  ["F69E",0x9C39],
+  ["F69F",0x9C3A],
+  ["F6A0",0x9C3B],
+  ["F740",0x9C3C],
+  ["F741",0x9C3D],
+  ["F742",0x9C3E],
+  ["F743",0x9C3F],
+  ["F744",0x9C40],
+  ["F745",0x9C41],
+  ["F746",0x9C42],
+  ["F747",0x9C43],
+  ["F748",0x9C44],
+  ["F749",0x9C45],
+  ["F74A",0x9C46],
+  ["F74B",0x9C47],
+  ["F74C",0x9C48],
+  ["F74D",0x9C49],
+  ["F74E",0x9C4A],
+  ["F74F",0x9C4B],
+  ["F750",0x9C4C],
+  ["F751",0x9C4D],
+  ["F752",0x9C4E],
+  ["F753",0x9C4F],
+  ["F754",0x9C50],
+  ["F755",0x9C51],
+  ["F756",0x9C52],
+  ["F757",0x9C53],
+  ["F758",0x9C54],
+  ["F759",0x9C55],
+  ["F75A",0x9C56],
+  ["F75B",0x9C57],
+  ["F75C",0x9C58],
+  ["F75D",0x9C59],
+  ["F75E",0x9C5A],
+  ["F75F",0x9C5B],
+  ["F760",0x9C5C],
+  ["F761",0x9C5D],
+  ["F762",0x9C5E],
+  ["F763",0x9C5F],
+  ["F764",0x9C60],
+  ["F765",0x9C61],
+  ["F766",0x9C62],
+  ["F767",0x9C63],
+  ["F768",0x9C64],
+  ["F769",0x9C65],
+  ["F76A",0x9C66],
+  ["F76B",0x9C67],
+  ["F76C",0x9C68],
+  ["F76D",0x9C69],
+  ["F76E",0x9C6A],
+  ["F76F",0x9C6B],
+  ["F770",0x9C6C],
+  ["F771",0x9C6D],
+  ["F772",0x9C6E],
+  ["F773",0x9C6F],
+  ["F774",0x9C70],
+  ["F775",0x9C71],
+  ["F776",0x9C72],
+  ["F777",0x9C73],
+  ["F778",0x9C74],
+  ["F779",0x9C75],
+  ["F77A",0x9C76],
+  ["F77B",0x9C77],
+  ["F77C",0x9C78],
+  ["F77D",0x9C79],
+  ["F77E",0x9C7A],
+  ["F780",0x9C7B],
+  ["D3E3",0x9C7C],
+  ["F781",0x9C7D],
+  ["F782",0x9C7E],
+  ["F6CF",0x9C7F],
+  ["F783",0x9C80],
+  ["C2B3",0x9C81],
+  ["F6D0",0x9C82],
+  ["F784",0x9C83],
+  ["F785",0x9C84],
+  ["F6D1",0x9C85],
+  ["F6D2",0x9C86],
+  ["F6D3",0x9C87],
+  ["F6D4",0x9C88],
+  ["F786",0x9C89],
+  ["F787",0x9C8A],
+  ["F6D6",0x9C8B],
+  ["F788",0x9C8C],
+  ["B1AB",0x9C8D],
+  ["F6D7",0x9C8E],
+  ["F789",0x9C8F],
+  ["F6D8",0x9C90],
+  ["F6D9",0x9C91],
+  ["F6DA",0x9C92],
+  ["F78A",0x9C93],
+  ["F6DB",0x9C94],
+  ["F6DC",0x9C95],
+  ["F78B",0x9C96],
+  ["F78C",0x9C97],
+  ["F78D",0x9C98],
+  ["F78E",0x9C99],
+  ["F6DD",0x9C9A],
+  ["F6DE",0x9C9B],
+  ["CFCA",0x9C9C],
+  ["F78F",0x9C9D],
+  ["F6DF",0x9C9E],
+  ["F6E0",0x9C9F],
+  ["F6E1",0x9CA0],
+  ["F6E2",0x9CA1],
+  ["F6E3",0x9CA2],
+  ["F6E4",0x9CA3],
+  ["C0F0",0x9CA4],
+  ["F6E5",0x9CA5],
+  ["F6E6",0x9CA6],
+  ["F6E7",0x9CA7],
+  ["F6E8",0x9CA8],
+  ["F6E9",0x9CA9],
+  ["F790",0x9CAA],
+  ["F6EA",0x9CAB],
+  ["F791",0x9CAC],
+  ["F6EB",0x9CAD],
+  ["F6EC",0x9CAE],
+  ["F792",0x9CAF],
+  ["F6ED",0x9CB0],
+  ["F6EE",0x9CB1],
+  ["F6EF",0x9CB2],
+  ["F6F0",0x9CB3],
+  ["F6F1",0x9CB4],
+  ["F6F2",0x9CB5],
+  ["F6F3",0x9CB6],
+  ["F6F4",0x9CB7],
+  ["BEA8",0x9CB8],
+  ["F793",0x9CB9],
+  ["F6F5",0x9CBA],
+  ["F6F6",0x9CBB],
+  ["F6F7",0x9CBC],
+  ["F6F8",0x9CBD],
+  ["F794",0x9CBE],
+  ["F795",0x9CBF],
+  ["F796",0x9CC0],
+  ["F797",0x9CC1],
+  ["F798",0x9CC2],
+  ["C8FA",0x9CC3],
+  ["F6F9",0x9CC4],
+  ["F6FA",0x9CC5],
+  ["F6FB",0x9CC6],
+  ["F6FC",0x9CC7],
+  ["F799",0x9CC8],
+  ["F79A",0x9CC9],
+  ["F6FD",0x9CCA],
+  ["F6FE",0x9CCB],
+  ["F7A1",0x9CCC],
+  ["F7A2",0x9CCD],
+  ["F7A3",0x9CCE],
+  ["F7A4",0x9CCF],
+  ["F7A5",0x9CD0],
+  ["F79B",0x9CD1],
+  ["F79C",0x9CD2],
+  ["F7A6",0x9CD3],
+  ["F7A7",0x9CD4],
+  ["F7A8",0x9CD5],
+  ["B1EE",0x9CD6],
+  ["F7A9",0x9CD7],
+  ["F7AA",0x9CD8],
+  ["F7AB",0x9CD9],
+  ["F79D",0x9CDA],
+  ["F79E",0x9CDB],
+  ["F7AC",0x9CDC],
+  ["F7AD",0x9CDD],
+  ["C1DB",0x9CDE],
+  ["F7AE",0x9CDF],
+  ["F79F",0x9CE0],
+  ["F7A0",0x9CE1],
+  ["F7AF",0x9CE2],
+  ["F840",0x9CE3],
+  ["F841",0x9CE4],
+  ["F842",0x9CE5],
+  ["F843",0x9CE6],
+  ["F844",0x9CE7],
+  ["F845",0x9CE8],
+  ["F846",0x9CE9],
+  ["F847",0x9CEA],
+  ["F848",0x9CEB],
+  ["F849",0x9CEC],
+  ["F84A",0x9CED],
+  ["F84B",0x9CEE],
+  ["F84C",0x9CEF],
+  ["F84D",0x9CF0],
+  ["F84E",0x9CF1],
+  ["F84F",0x9CF2],
+  ["F850",0x9CF3],
+  ["F851",0x9CF4],
+  ["F852",0x9CF5],
+  ["F853",0x9CF6],
+  ["F854",0x9CF7],
+  ["F855",0x9CF8],
+  ["F856",0x9CF9],
+  ["F857",0x9CFA],
+  ["F858",0x9CFB],
+  ["F859",0x9CFC],
+  ["F85A",0x9CFD],
+  ["F85B",0x9CFE],
+  ["F85C",0x9CFF],
+  ["F85D",0x9D00],
+  ["F85E",0x9D01],
+  ["F85F",0x9D02],
+  ["F860",0x9D03],
+  ["F861",0x9D04],
+  ["F862",0x9D05],
+  ["F863",0x9D06],
+  ["F864",0x9D07],
+  ["F865",0x9D08],
+  ["F866",0x9D09],
+  ["F867",0x9D0A],
+  ["F868",0x9D0B],
+  ["F869",0x9D0C],
+  ["F86A",0x9D0D],
+  ["F86B",0x9D0E],
+  ["F86C",0x9D0F],
+  ["F86D",0x9D10],
+  ["F86E",0x9D11],
+  ["F86F",0x9D12],
+  ["F870",0x9D13],
+  ["F871",0x9D14],
+  ["F872",0x9D15],
+  ["F873",0x9D16],
+  ["F874",0x9D17],
+  ["F875",0x9D18],
+  ["F876",0x9D19],
+  ["F877",0x9D1A],
+  ["F878",0x9D1B],
+  ["F879",0x9D1C],
+  ["F87A",0x9D1D],
+  ["F87B",0x9D1E],
+  ["F87C",0x9D1F],
+  ["F87D",0x9D20],
+  ["F87E",0x9D21],
+  ["F880",0x9D22],
+  ["F881",0x9D23],
+  ["F882",0x9D24],
+  ["F883",0x9D25],
+  ["F884",0x9D26],
+  ["F885",0x9D27],
+  ["F886",0x9D28],
+  ["F887",0x9D29],
+  ["F888",0x9D2A],
+  ["F889",0x9D2B],
+  ["F88A",0x9D2C],
+  ["F88B",0x9D2D],
+  ["F88C",0x9D2E],
+  ["F88D",0x9D2F],
+  ["F88E",0x9D30],
+  ["F88F",0x9D31],
+  ["F890",0x9D32],
+  ["F891",0x9D33],
+  ["F892",0x9D34],
+  ["F893",0x9D35],
+  ["F894",0x9D36],
+  ["F895",0x9D37],
+  ["F896",0x9D38],
+  ["F897",0x9D39],
+  ["F898",0x9D3A],
+  ["F899",0x9D3B],
+  ["F89A",0x9D3C],
+  ["F89B",0x9D3D],
+  ["F89C",0x9D3E],
+  ["F89D",0x9D3F],
+  ["F89E",0x9D40],
+  ["F89F",0x9D41],
+  ["F8A0",0x9D42],
+  ["F940",0x9D43],
+  ["F941",0x9D44],
+  ["F942",0x9D45],
+  ["F943",0x9D46],
+  ["F944",0x9D47],
+  ["F945",0x9D48],
+  ["F946",0x9D49],
+  ["F947",0x9D4A],
+  ["F948",0x9D4B],
+  ["F949",0x9D4C],
+  ["F94A",0x9D4D],
+  ["F94B",0x9D4E],
+  ["F94C",0x9D4F],
+  ["F94D",0x9D50],
+  ["F94E",0x9D51],
+  ["F94F",0x9D52],
+  ["F950",0x9D53],
+  ["F951",0x9D54],
+  ["F952",0x9D55],
+  ["F953",0x9D56],
+  ["F954",0x9D57],
+  ["F955",0x9D58],
+  ["F956",0x9D59],
+  ["F957",0x9D5A],
+  ["F958",0x9D5B],
+  ["F959",0x9D5C],
+  ["F95A",0x9D5D],
+  ["F95B",0x9D5E],
+  ["F95C",0x9D5F],
+  ["F95D",0x9D60],
+  ["F95E",0x9D61],
+  ["F95F",0x9D62],
+  ["F960",0x9D63],
+  ["F961",0x9D64],
+  ["F962",0x9D65],
+  ["F963",0x9D66],
+  ["F964",0x9D67],
+  ["F965",0x9D68],
+  ["F966",0x9D69],
+  ["F967",0x9D6A],
+  ["F968",0x9D6B],
+  ["F969",0x9D6C],
+  ["F96A",0x9D6D],
+  ["F96B",0x9D6E],
+  ["F96C",0x9D6F],
+  ["F96D",0x9D70],
+  ["F96E",0x9D71],
+  ["F96F",0x9D72],
+  ["F970",0x9D73],
+  ["F971",0x9D74],
+  ["F972",0x9D75],
+  ["F973",0x9D76],
+  ["F974",0x9D77],
+  ["F975",0x9D78],
+  ["F976",0x9D79],
+  ["F977",0x9D7A],
+  ["F978",0x9D7B],
+  ["F979",0x9D7C],
+  ["F97A",0x9D7D],
+  ["F97B",0x9D7E],
+  ["F97C",0x9D7F],
+  ["F97D",0x9D80],
+  ["F97E",0x9D81],
+  ["F980",0x9D82],
+  ["F981",0x9D83],
+  ["F982",0x9D84],
+  ["F983",0x9D85],
+  ["F984",0x9D86],
+  ["F985",0x9D87],
+  ["F986",0x9D88],
+  ["F987",0x9D89],
+  ["F988",0x9D8A],
+  ["F989",0x9D8B],
+  ["F98A",0x9D8C],
+  ["F98B",0x9D8D],
+  ["F98C",0x9D8E],
+  ["F98D",0x9D8F],
+  ["F98E",0x9D90],
+  ["F98F",0x9D91],
+  ["F990",0x9D92],
+  ["F991",0x9D93],
+  ["F992",0x9D94],
+  ["F993",0x9D95],
+  ["F994",0x9D96],
+  ["F995",0x9D97],
+  ["F996",0x9D98],
+  ["F997",0x9D99],
+  ["F998",0x9D9A],
+  ["F999",0x9D9B],
+  ["F99A",0x9D9C],
+  ["F99B",0x9D9D],
+  ["F99C",0x9D9E],
+  ["F99D",0x9D9F],
+  ["F99E",0x9DA0],
+  ["F99F",0x9DA1],
+  ["F9A0",0x9DA2],
+  ["FA40",0x9DA3],
+  ["FA41",0x9DA4],
+  ["FA42",0x9DA5],
+  ["FA43",0x9DA6],
+  ["FA44",0x9DA7],
+  ["FA45",0x9DA8],
+  ["FA46",0x9DA9],
+  ["FA47",0x9DAA],
+  ["FA48",0x9DAB],
+  ["FA49",0x9DAC],
+  ["FA4A",0x9DAD],
+  ["FA4B",0x9DAE],
+  ["FA4C",0x9DAF],
+  ["FA4D",0x9DB0],
+  ["FA4E",0x9DB1],
+  ["FA4F",0x9DB2],
+  ["FA50",0x9DB3],
+  ["FA51",0x9DB4],
+  ["FA52",0x9DB5],
+  ["FA53",0x9DB6],
+  ["FA54",0x9DB7],
+  ["FA55",0x9DB8],
+  ["FA56",0x9DB9],
+  ["FA57",0x9DBA],
+  ["FA58",0x9DBB],
+  ["FA59",0x9DBC],
+  ["FA5A",0x9DBD],
+  ["FA5B",0x9DBE],
+  ["FA5C",0x9DBF],
+  ["FA5D",0x9DC0],
+  ["FA5E",0x9DC1],
+  ["FA5F",0x9DC2],
+  ["FA60",0x9DC3],
+  ["FA61",0x9DC4],
+  ["FA62",0x9DC5],
+  ["FA63",0x9DC6],
+  ["FA64",0x9DC7],
+  ["FA65",0x9DC8],
+  ["FA66",0x9DC9],
+  ["FA67",0x9DCA],
+  ["FA68",0x9DCB],
+  ["FA69",0x9DCC],
+  ["FA6A",0x9DCD],
+  ["FA6B",0x9DCE],
+  ["FA6C",0x9DCF],
+  ["FA6D",0x9DD0],
+  ["FA6E",0x9DD1],
+  ["FA6F",0x9DD2],
+  ["FA70",0x9DD3],
+  ["FA71",0x9DD4],
+  ["FA72",0x9DD5],
+  ["FA73",0x9DD6],
+  ["FA74",0x9DD7],
+  ["FA75",0x9DD8],
+  ["FA76",0x9DD9],
+  ["FA77",0x9DDA],
+  ["FA78",0x9DDB],
+  ["FA79",0x9DDC],
+  ["FA7A",0x9DDD],
+  ["FA7B",0x9DDE],
+  ["FA7C",0x9DDF],
+  ["FA7D",0x9DE0],
+  ["FA7E",0x9DE1],
+  ["FA80",0x9DE2],
+  ["FA81",0x9DE3],
+  ["FA82",0x9DE4],
+  ["FA83",0x9DE5],
+  ["FA84",0x9DE6],
+  ["FA85",0x9DE7],
+  ["FA86",0x9DE8],
+  ["FA87",0x9DE9],
+  ["FA88",0x9DEA],
+  ["FA89",0x9DEB],
+  ["FA8A",0x9DEC],
+  ["FA8B",0x9DED],
+  ["FA8C",0x9DEE],
+  ["FA8D",0x9DEF],
+  ["FA8E",0x9DF0],
+  ["FA8F",0x9DF1],
+  ["FA90",0x9DF2],
+  ["FA91",0x9DF3],
+  ["FA92",0x9DF4],
+  ["FA93",0x9DF5],
+  ["FA94",0x9DF6],
+  ["FA95",0x9DF7],
+  ["FA96",0x9DF8],
+  ["FA97",0x9DF9],
+  ["FA98",0x9DFA],
+  ["FA99",0x9DFB],
+  ["FA9A",0x9DFC],
+  ["FA9B",0x9DFD],
+  ["FA9C",0x9DFE],
+  ["FA9D",0x9DFF],
+  ["FA9E",0x9E00],
+  ["FA9F",0x9E01],
+  ["FAA0",0x9E02],
+  ["FB40",0x9E03],
+  ["FB41",0x9E04],
+  ["FB42",0x9E05],
+  ["FB43",0x9E06],
+  ["FB44",0x9E07],
+  ["FB45",0x9E08],
+  ["FB46",0x9E09],
+  ["FB47",0x9E0A],
+  ["FB48",0x9E0B],
+  ["FB49",0x9E0C],
+  ["FB4A",0x9E0D],
+  ["FB4B",0x9E0E],
+  ["FB4C",0x9E0F],
+  ["FB4D",0x9E10],
+  ["FB4E",0x9E11],
+  ["FB4F",0x9E12],
+  ["FB50",0x9E13],
+  ["FB51",0x9E14],
+  ["FB52",0x9E15],
+  ["FB53",0x9E16],
+  ["FB54",0x9E17],
+  ["FB55",0x9E18],
+  ["FB56",0x9E19],
+  ["FB57",0x9E1A],
+  ["FB58",0x9E1B],
+  ["FB59",0x9E1C],
+  ["FB5A",0x9E1D],
+  ["FB5B",0x9E1E],
+  ["C4F1",0x9E1F],
+  ["F0AF",0x9E20],
+  ["BCA6",0x9E21],
+  ["F0B0",0x9E22],
+  ["C3F9",0x9E23],
+  ["FB5C",0x9E24],
+  ["C5B8",0x9E25],
+  ["D1BB",0x9E26],
+  ["FB5D",0x9E27],
+  ["F0B1",0x9E28],
+  ["F0B2",0x9E29],
+  ["F0B3",0x9E2A],
+  ["F0B4",0x9E2B],
+  ["F0B5",0x9E2C],
+  ["D1BC",0x9E2D],
+  ["FB5E",0x9E2E],
+  ["D1EC",0x9E2F],
+  ["FB5F",0x9E30],
+  ["F0B7",0x9E31],
+  ["F0B6",0x9E32],
+  ["D4A7",0x9E33],
+  ["FB60",0x9E34],
+  ["CDD2",0x9E35],
+  ["F0B8",0x9E36],
+  ["F0BA",0x9E37],
+  ["F0B9",0x9E38],
+  ["F0BB",0x9E39],
+  ["F0BC",0x9E3A],
+  ["FB61",0x9E3B],
+  ["FB62",0x9E3C],
+  ["B8EB",0x9E3D],
+  ["F0BD",0x9E3E],
+  ["BAE8",0x9E3F],
+  ["FB63",0x9E40],
+  ["F0BE",0x9E41],
+  ["F0BF",0x9E42],
+  ["BEE9",0x9E43],
+  ["F0C0",0x9E44],
+  ["B6EC",0x9E45],
+  ["F0C1",0x9E46],
+  ["F0C2",0x9E47],
+  ["F0C3",0x9E48],
+  ["F0C4",0x9E49],
+  ["C8B5",0x9E4A],
+  ["F0C5",0x9E4B],
+  ["F0C6",0x9E4C],
+  ["FB64",0x9E4D],
+  ["F0C7",0x9E4E],
+  ["C5F4",0x9E4F],
+  ["FB65",0x9E50],
+  ["F0C8",0x9E51],
+  ["FB66",0x9E52],
+  ["FB67",0x9E53],
+  ["FB68",0x9E54],
+  ["F0C9",0x9E55],
+  ["FB69",0x9E56],
+  ["F0CA",0x9E57],
+  ["F7BD",0x9E58],
+  ["FB6A",0x9E59],
+  ["F0CB",0x9E5A],
+  ["F0CC",0x9E5B],
+  ["F0CD",0x9E5C],
+  ["FB6B",0x9E5D],
+  ["F0CE",0x9E5E],
+  ["FB6C",0x9E5F],
+  ["FB6D",0x9E60],
+  ["FB6E",0x9E61],
+  ["FB6F",0x9E62],
+  ["F0CF",0x9E63],
+  ["BAD7",0x9E64],
+  ["FB70",0x9E65],
+  ["F0D0",0x9E66],
+  ["F0D1",0x9E67],
+  ["F0D2",0x9E68],
+  ["F0D3",0x9E69],
+  ["F0D4",0x9E6A],
+  ["F0D5",0x9E6B],
+  ["F0D6",0x9E6C],
+  ["F0D8",0x9E6D],
+  ["FB71",0x9E6E],
+  ["FB72",0x9E6F],
+  ["D3A5",0x9E70],
+  ["F0D7",0x9E71],
+  ["FB73",0x9E72],
+  ["F0D9",0x9E73],
+  ["FB74",0x9E74],
+  ["FB75",0x9E75],
+  ["FB76",0x9E76],
+  ["FB77",0x9E77],
+  ["FB78",0x9E78],
+  ["FB79",0x9E79],
+  ["FB7A",0x9E7A],
+  ["FB7B",0x9E7B],
+  ["FB7C",0x9E7C],
+  ["FB7D",0x9E7D],
+  ["F5BA",0x9E7E],
+  ["C2B9",0x9E7F],
+  ["FB7E",0x9E80],
+  ["FB80",0x9E81],
+  ["F7E4",0x9E82],
+  ["FB81",0x9E83],
+  ["FB82",0x9E84],
+  ["FB83",0x9E85],
+  ["FB84",0x9E86],
+  ["F7E5",0x9E87],
+  ["F7E6",0x9E88],
+  ["FB85",0x9E89],
+  ["FB86",0x9E8A],
+  ["F7E7",0x9E8B],
+  ["FB87",0x9E8C],
+  ["FB88",0x9E8D],
+  ["FB89",0x9E8E],
+  ["FB8A",0x9E8F],
+  ["FB8B",0x9E90],
+  ["FB8C",0x9E91],
+  ["F7E8",0x9E92],
+  ["C2B4",0x9E93],
+  ["FB8D",0x9E94],
+  ["FB8E",0x9E95],
+  ["FB8F",0x9E96],
+  ["FB90",0x9E97],
+  ["FB91",0x9E98],
+  ["FB92",0x9E99],
+  ["FB93",0x9E9A],
+  ["FB94",0x9E9B],
+  ["FB95",0x9E9C],
+  ["F7EA",0x9E9D],
+  ["FB96",0x9E9E],
+  ["F7EB",0x9E9F],
+  ["FB97",0x9EA0],
+  ["FB98",0x9EA1],
+  ["FB99",0x9EA2],
+  ["FB9A",0x9EA3],
+  ["FB9B",0x9EA4],
+  ["FB9C",0x9EA5],
+  ["C2F3",0x9EA6],
+  ["FB9D",0x9EA7],
+  ["FB9E",0x9EA8],
+  ["FB9F",0x9EA9],
+  ["FBA0",0x9EAA],
+  ["FC40",0x9EAB],
+  ["FC41",0x9EAC],
+  ["FC42",0x9EAD],
+  ["FC43",0x9EAE],
+  ["FC44",0x9EAF],
+  ["FC45",0x9EB0],
+  ["FC46",0x9EB1],
+  ["FC47",0x9EB2],
+  ["FC48",0x9EB3],
+  ["F4F0",0x9EB4],
+  ["FC49",0x9EB5],
+  ["FC4A",0x9EB6],
+  ["FC4B",0x9EB7],
+  ["F4EF",0x9EB8],
+  ["FC4C",0x9EB9],
+  ["FC4D",0x9EBA],
+  ["C2E9",0x9EBB],
+  ["FC4E",0x9EBC],
+  ["F7E1",0x9EBD],
+  ["F7E2",0x9EBE],
+  ["FC4F",0x9EBF],
+  ["FC50",0x9EC0],
+  ["FC51",0x9EC1],
+  ["FC52",0x9EC2],
+  ["FC53",0x9EC3],
+  ["BBC6",0x9EC4],
+  ["FC54",0x9EC5],
+  ["FC55",0x9EC6],
+  ["FC56",0x9EC7],
+  ["FC57",0x9EC8],
+  ["D9E4",0x9EC9],
+  ["FC58",0x9ECA],
+  ["FC59",0x9ECB],
+  ["FC5A",0x9ECC],
+  ["CAF2",0x9ECD],
+  ["C0E8",0x9ECE],
+  ["F0A4",0x9ECF],
+  ["FC5B",0x9ED0],
+  ["BADA",0x9ED1],
+  ["FC5C",0x9ED2],
+  ["FC5D",0x9ED3],
+  ["C7AD",0x9ED4],
+  ["FC5E",0x9ED5],
+  ["FC5F",0x9ED6],
+  ["FC60",0x9ED7],
+  ["C4AC",0x9ED8],
+  ["FC61",0x9ED9],
+  ["FC62",0x9EDA],
+  ["F7EC",0x9EDB],
+  ["F7ED",0x9EDC],
+  ["F7EE",0x9EDD],
+  ["FC63",0x9EDE],
+  ["F7F0",0x9EDF],
+  ["F7EF",0x9EE0],
+  ["FC64",0x9EE1],
+  ["F7F1",0x9EE2],
+  ["FC65",0x9EE3],
+  ["FC66",0x9EE4],
+  ["F7F4",0x9EE5],
+  ["FC67",0x9EE6],
+  ["F7F3",0x9EE7],
+  ["FC68",0x9EE8],
+  ["F7F2",0x9EE9],
+  ["F7F5",0x9EEA],
+  ["FC69",0x9EEB],
+  ["FC6A",0x9EEC],
+  ["FC6B",0x9EED],
+  ["FC6C",0x9EEE],
+  ["F7F6",0x9EEF],
+  ["FC6D",0x9EF0],
+  ["FC6E",0x9EF1],
+  ["FC6F",0x9EF2],
+  ["FC70",0x9EF3],
+  ["FC71",0x9EF4],
+  ["FC72",0x9EF5],
+  ["FC73",0x9EF6],
+  ["FC74",0x9EF7],
+  ["FC75",0x9EF8],
+  ["EDE9",0x9EF9],
+  ["FC76",0x9EFA],
+  ["EDEA",0x9EFB],
+  ["EDEB",0x9EFC],
+  ["FC77",0x9EFD],
+  ["F6BC",0x9EFE],
+  ["FC78",0x9EFF],
+  ["FC79",0x9F00],
+  ["FC7A",0x9F01],
+  ["FC7B",0x9F02],
+  ["FC7C",0x9F03],
+  ["FC7D",0x9F04],
+  ["FC7E",0x9F05],
+  ["FC80",0x9F06],
+  ["FC81",0x9F07],
+  ["FC82",0x9F08],
+  ["FC83",0x9F09],
+  ["FC84",0x9F0A],
+  ["F6BD",0x9F0B],
+  ["FC85",0x9F0C],
+  ["F6BE",0x9F0D],
+  ["B6A6",0x9F0E],
+  ["FC86",0x9F0F],
+  ["D8BE",0x9F10],
+  ["FC87",0x9F11],
+  ["FC88",0x9F12],
+  ["B9C4",0x9F13],
+  ["FC89",0x9F14],
+  ["FC8A",0x9F15],
+  ["FC8B",0x9F16],
+  ["D8BB",0x9F17],
+  ["FC8C",0x9F18],
+  ["DCB1",0x9F19],
+  ["FC8D",0x9F1A],
+  ["FC8E",0x9F1B],
+  ["FC8F",0x9F1C],
+  ["FC90",0x9F1D],
+  ["FC91",0x9F1E],
+  ["FC92",0x9F1F],
+  ["CAF3",0x9F20],
+  ["FC93",0x9F21],
+  ["F7F7",0x9F22],
+  ["FC94",0x9F23],
+  ["FC95",0x9F24],
+  ["FC96",0x9F25],
+  ["FC97",0x9F26],
+  ["FC98",0x9F27],
+  ["FC99",0x9F28],
+  ["FC9A",0x9F29],
+  ["FC9B",0x9F2A],
+  ["FC9C",0x9F2B],
+  ["F7F8",0x9F2C],
+  ["FC9D",0x9F2D],
+  ["FC9E",0x9F2E],
+  ["F7F9",0x9F2F],
+  ["FC9F",0x9F30],
+  ["FCA0",0x9F31],
+  ["FD40",0x9F32],
+  ["FD41",0x9F33],
+  ["FD42",0x9F34],
+  ["FD43",0x9F35],
+  ["FD44",0x9F36],
+  ["F7FB",0x9F37],
+  ["FD45",0x9F38],
+  ["F7FA",0x9F39],
+  ["FD46",0x9F3A],
+  ["B1C7",0x9F3B],
+  ["FD47",0x9F3C],
+  ["F7FC",0x9F3D],
+  ["F7FD",0x9F3E],
+  ["FD48",0x9F3F],
+  ["FD49",0x9F40],
+  ["FD4A",0x9F41],
+  ["FD4B",0x9F42],
+  ["FD4C",0x9F43],
+  ["F7FE",0x9F44],
+  ["FD4D",0x9F45],
+  ["FD4E",0x9F46],
+  ["FD4F",0x9F47],
+  ["FD50",0x9F48],
+  ["FD51",0x9F49],
+  ["FD52",0x9F4A],
+  ["FD53",0x9F4B],
+  ["FD54",0x9F4C],
+  ["FD55",0x9F4D],
+  ["FD56",0x9F4E],
+  ["FD57",0x9F4F],
+  ["C6EB",0x9F50],
+  ["ECB4",0x9F51],
+  ["FD58",0x9F52],
+  ["FD59",0x9F53],
+  ["FD5A",0x9F54],
+  ["FD5B",0x9F55],
+  ["FD5C",0x9F56],
+  ["FD5D",0x9F57],
+  ["FD5E",0x9F58],
+  ["FD5F",0x9F59],
+  ["FD60",0x9F5A],
+  ["FD61",0x9F5B],
+  ["FD62",0x9F5C],
+  ["FD63",0x9F5D],
+  ["FD64",0x9F5E],
+  ["FD65",0x9F5F],
+  ["FD66",0x9F60],
+  ["FD67",0x9F61],
+  ["FD68",0x9F62],
+  ["FD69",0x9F63],
+  ["FD6A",0x9F64],
+  ["FD6B",0x9F65],
+  ["FD6C",0x9F66],
+  ["FD6D",0x9F67],
+  ["FD6E",0x9F68],
+  ["FD6F",0x9F69],
+  ["FD70",0x9F6A],
+  ["FD71",0x9F6B],
+  ["FD72",0x9F6C],
+  ["FD73",0x9F6D],
+  ["FD74",0x9F6E],
+  ["FD75",0x9F6F],
+  ["FD76",0x9F70],
+  ["FD77",0x9F71],
+  ["FD78",0x9F72],
+  ["FD79",0x9F73],
+  ["FD7A",0x9F74],
+  ["FD7B",0x9F75],
+  ["FD7C",0x9F76],
+  ["FD7D",0x9F77],
+  ["FD7E",0x9F78],
+  ["FD80",0x9F79],
+  ["FD81",0x9F7A],
+  ["FD82",0x9F7B],
+  ["FD83",0x9F7C],
+  ["FD84",0x9F7D],
+  ["FD85",0x9F7E],
+  ["B3DD",0x9F7F],
+  ["F6B3",0x9F80],
+  ["FD86",0x9F81],
+  ["FD87",0x9F82],
+  ["F6B4",0x9F83],
+  ["C1E4",0x9F84],
+  ["F6B5",0x9F85],
+  ["F6B6",0x9F86],
+  ["F6B7",0x9F87],
+  ["F6B8",0x9F88],
+  ["F6B9",0x9F89],
+  ["F6BA",0x9F8A],
+  ["C8A3",0x9F8B],
+  ["F6BB",0x9F8C],
+  ["FD88",0x9F8D],
+  ["FD89",0x9F8E],
+  ["FD8A",0x9F8F],
+  ["FD8B",0x9F90],
+  ["FD8C",0x9F91],
+  ["FD8D",0x9F92],
+  ["FD8E",0x9F93],
+  ["FD8F",0x9F94],
+  ["FD90",0x9F95],
+  ["FD91",0x9F96],
+  ["FD92",0x9F97],
+  ["FD93",0x9F98],
+  ["C1FA",0x9F99],
+  ["B9A8",0x9F9A],
+  ["EDE8",0x9F9B],
+  ["FD94",0x9F9C],
+  ["FD95",0x9F9D],
+  ["FD96",0x9F9E],
+  ["B9EA",0x9F9F],
+  ["D9DF",0x9FA0],
+  ["FD97",0x9FA1],
+  ["FD98",0x9FA2],
+  ["FD99",0x9FA3],
+  ["FD9A",0x9FA4],
+  ["FD9B",0x9FA5],
+  ["FD9C",0xF92C],
+  ["FD9D",0xF979],
+  ["FD9E",0xF995],
+  ["FD9F",0xF9E7],
+  ["FDA0",0xF9F1],
+  ["FE40",0xFA0C],
+  ["FE41",0xFA0D],
+  ["FE42",0xFA0E],
+  ["FE43",0xFA0F],
+  ["FE44",0xFA11],
+  ["FE45",0xFA13],
+  ["FE46",0xFA14],
+  ["FE47",0xFA18],
+  ["FE48",0xFA1F],
+  ["FE49",0xFA20],
+  ["FE4A",0xFA21],
+  ["FE4B",0xFA23],
+  ["FE4C",0xFA24],
+  ["FE4D",0xFA27],
+  ["FE4E",0xFA28],
+  ["FE4F",0xFA29],
+  ["A955",0xFE30],
+  ["A6F2",0xFE31],
+  ["A6F4",0xFE33],
+  ["A6F5",0xFE34],
+  ["A6E0",0xFE35],
+  ["A6E1",0xFE36],
+  ["A6F0",0xFE37],
+  ["A6F1",0xFE38],
+  ["A6E2",0xFE39],
+  ["A6E3",0xFE3A],
+  ["A6EE",0xFE3B],
+  ["A6EF",0xFE3C],
+  ["A6E6",0xFE3D],
+  ["A6E7",0xFE3E],
+  ["A6E4",0xFE3F],
+  ["A6E5",0xFE40],
+  ["A6E8",0xFE41],
+  ["A6E9",0xFE42],
+  ["A6EA",0xFE43],
+  ["A6EB",0xFE44],
+  ["A968",0xFE49],
+  ["A969",0xFE4A],
+  ["A96A",0xFE4B],
+  ["A96B",0xFE4C],
+  ["A96C",0xFE4D],
+  ["A96D",0xFE4E],
+  ["A96E",0xFE4F],
+  ["A96F",0xFE50],
+  ["A970",0xFE51],
+  ["A971",0xFE52],
+  ["A972",0xFE54],
+  ["A973",0xFE55],
+  ["A974",0xFE56],
+  ["A975",0xFE57],
+  ["A976",0xFE59],
+  ["A977",0xFE5A],
+  ["A978",0xFE5B],
+  ["A979",0xFE5C],
+  ["A97A",0xFE5D],
+  ["A97B",0xFE5E],
+  ["A97C",0xFE5F],
+  ["A97D",0xFE60],
+  ["A97E",0xFE61],
+  ["A980",0xFE62],
+  ["A981",0xFE63],
+  ["A982",0xFE64],
+  ["A983",0xFE65],
+  ["A984",0xFE66],
+  ["A985",0xFE68],
+  ["A986",0xFE69],
+  ["A987",0xFE6A],
+  ["A988",0xFE6B],
+  ["A3A1",0xFF01],
+  ["A3A2",0xFF02],
+  ["A3A3",0xFF03],
+  ["A1E7",0xFF04],
+  ["A3A5",0xFF05],
+  ["A3A6",0xFF06],
+  ["A3A7",0xFF07],
+  ["A3A8",0xFF08],
+  ["A3A9",0xFF09],
+  ["A3AA",0xFF0A],
+  ["A3AB",0xFF0B],
+  ["A3AC",0xFF0C],
+  ["A3AD",0xFF0D],
+  ["A3AE",0xFF0E],
+  ["A3AF",0xFF0F],
+  ["A3B0",0xFF10],
+  ["A3B1",0xFF11],
+  ["A3B2",0xFF12],
+  ["A3B3",0xFF13],
+  ["A3B4",0xFF14],
+  ["A3B5",0xFF15],
+  ["A3B6",0xFF16],
+  ["A3B7",0xFF17],
+  ["A3B8",0xFF18],
+  ["A3B9",0xFF19],
+  ["A3BA",0xFF1A],
+  ["A3BB",0xFF1B],
+  ["A3BC",0xFF1C],
+  ["A3BD",0xFF1D],
+  ["A3BE",0xFF1E],
+  ["A3BF",0xFF1F],
+  ["A3C0",0xFF20],
+  ["A3C1",0xFF21],
+  ["A3C2",0xFF22],
+  ["A3C3",0xFF23],
+  ["A3C4",0xFF24],
+  ["A3C5",0xFF25],
+  ["A3C6",0xFF26],
+  ["A3C7",0xFF27],
+  ["A3C8",0xFF28],
+  ["A3C9",0xFF29],
+  ["A3CA",0xFF2A],
+  ["A3CB",0xFF2B],
+  ["A3CC",0xFF2C],
+  ["A3CD",0xFF2D],
+  ["A3CE",0xFF2E],
+  ["A3CF",0xFF2F],
+  ["A3D0",0xFF30],
+  ["A3D1",0xFF31],
+  ["A3D2",0xFF32],
+  ["A3D3",0xFF33],
+  ["A3D4",0xFF34],
+  ["A3D5",0xFF35],
+  ["A3D6",0xFF36],
+  ["A3D7",0xFF37],
+  ["A3D8",0xFF38],
+  ["A3D9",0xFF39],
+  ["A3DA",0xFF3A],
+  ["A3DB",0xFF3B],
+  ["A3DC",0xFF3C],
+  ["A3DD",0xFF3D],
+  ["A3DE",0xFF3E],
+  ["A3DF",0xFF3F],
+  ["A3E0",0xFF40],
+  ["A3E1",0xFF41],
+  ["A3E2",0xFF42],
+  ["A3E3",0xFF43],
+  ["A3E4",0xFF44],
+  ["A3E5",0xFF45],
+  ["A3E6",0xFF46],
+  ["A3E7",0xFF47],
+  ["A3E8",0xFF48],
+  ["A3E9",0xFF49],
+  ["A3EA",0xFF4A],
+  ["A3EB",0xFF4B],
+  ["A3EC",0xFF4C],
+  ["A3ED",0xFF4D],
+  ["A3EE",0xFF4E],
+  ["A3EF",0xFF4F],
+  ["A3F0",0xFF50],
+  ["A3F1",0xFF51],
+  ["A3F2",0xFF52],
+  ["A3F3",0xFF53],
+  ["A3F4",0xFF54],
+  ["A3F5",0xFF55],
+  ["A3F6",0xFF56],
+  ["A3F7",0xFF57],
+  ["A3F8",0xFF58],
+  ["A3F9",0xFF59],
+  ["A3FA",0xFF5A],
+  ["A3FB",0xFF5B],
+  ["A3FC",0xFF5C],
+  ["A3FD",0xFF5D],
+  ["A1AB",0xFF5E],
+  ["A1E9",0xFFE0],
+  ["A1EA",0xFFE1],
+  ["A956",0xFFE2],
+  ["A3FE",0xFFE3],
+  ["A957",0xFFE4],
+  ["A3A4",0xFFE5],
+]
+\ No newline at end of file
diff --git a/enc/trans/gbk.trans b/enc/trans/gbk.trans
new file mode 100644
index 0000000000..0df148198e
--- /dev/null
+++ b/enc/trans/gbk.trans
@@ -0,0 +1,16 @@
+#include "transcode_data.h"
+
+<%
+  require "gbk-tbl"
+
+  transcode_tblgen "GBK", "UTF-8", [["{00-7f}", :nomap], *GBK_TO_UCS_TBL]
+  transcode_tblgen "UTF-8", "GBK", [["{00-7f}", :nomap], *GBK_TO_UCS_TBL.map {|a,b| [b,a] }]
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_gbk(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/ibm437-tbl.rb b/enc/trans/ibm437-tbl.rb
new file mode 100644
index 0000000000..5ae64d621e
--- /dev/null
+++ b/enc/trans/ibm437-tbl.rb
@@ -0,0 +1,130 @@
+IBM437_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["AD",0xA1],
+  ["9B",0xA2],
+  ["9C",0xA3],
+  ["9D",0xA5],
+  ["A6",0xAA],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["E6",0xB5],
+  ["FA",0xB7],
+  ["A7",0xBA],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["A8",0xBF],
+  ["8E",0xC4],
+  ["8F",0xC5],
+  ["92",0xC6],
+  ["80",0xC7],
+  ["90",0xC9],
+  ["A5",0xD1],
+  ["99",0xD6],
+  ["9A",0xDC],
+  ["E1",0xDF],
+  ["85",0xE0],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["84",0xE4],
+  ["86",0xE5],
+  ["91",0xE6],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["89",0xEB],
+  ["8D",0xEC],
+  ["A1",0xED],
+  ["8C",0xEE],
+  ["8B",0xEF],
+  ["A4",0xF1],
+  ["95",0xF2],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["97",0xF9],
+  ["A3",0xFA],
+  ["96",0xFB],
+  ["81",0xFC],
+  ["98",0xFF],
+  ["9F",0x192],
+  ["E2",0x393],
+  ["E9",0x398],
+  ["E4",0x3A3],
+  ["E8",0x3A6],
+  ["EA",0x3A9],
+  ["E0",0x3B1],
+  ["EB",0x3B4],
+  ["EE",0x3B5],
+  ["E3",0x3C0],
+  ["E5",0x3C3],
+  ["E7",0x3C4],
+  ["ED",0x3C6],
+  ["FC",0x207F],
+  ["9E",0x20A7],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["EC",0x221E],
+  ["EF",0x2229],
+  ["F7",0x2248],
+  ["F0",0x2261],
+  ["F3",0x2264],
+  ["F2",0x2265],
+  ["A9",0x2310],
+  ["F4",0x2320],
+  ["F5",0x2321],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm775-tbl.rb b/enc/trans/ibm775-tbl.rb
new file mode 100644
index 0000000000..f55679f409
--- /dev/null
+++ b/enc/trans/ibm775-tbl.rb
@@ -0,0 +1,130 @@
+IBM775_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["96",0xA2],
+  ["9C",0xA3],
+  ["9F",0xA4],
+  ["A7",0xA6],
+  ["F5",0xA7],
+  ["A8",0xA9],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F0",0xAD],
+  ["A9",0xAE],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["FC",0xB3],
+  ["E6",0xB5],
+  ["F4",0xB6],
+  ["FA",0xB7],
+  ["FB",0xB9],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["F3",0xBE],
+  ["8E",0xC4],
+  ["8F",0xC5],
+  ["92",0xC6],
+  ["90",0xC9],
+  ["E0",0xD3],
+  ["E5",0xD5],
+  ["99",0xD6],
+  ["9E",0xD7],
+  ["9D",0xD8],
+  ["9A",0xDC],
+  ["E1",0xDF],
+  ["84",0xE4],
+  ["86",0xE5],
+  ["91",0xE6],
+  ["82",0xE9],
+  ["A2",0xF3],
+  ["E4",0xF5],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["9B",0xF8],
+  ["81",0xFC],
+  ["A0",0x100],
+  ["83",0x101],
+  ["B5",0x104],
+  ["D0",0x105],
+  ["80",0x106],
+  ["87",0x107],
+  ["B6",0x10C],
+  ["D1",0x10D],
+  ["ED",0x112],
+  ["89",0x113],
+  ["B8",0x116],
+  ["D3",0x117],
+  ["B7",0x118],
+  ["D2",0x119],
+  ["95",0x122],
+  ["85",0x123],
+  ["A1",0x12A],
+  ["8C",0x12B],
+  ["BD",0x12E],
+  ["D4",0x12F],
+  ["E8",0x136],
+  ["E9",0x137],
+  ["EA",0x13B],
+  ["EB",0x13C],
+  ["AD",0x141],
+  ["88",0x142],
+  ["E3",0x143],
+  ["E7",0x144],
+  ["EE",0x145],
+  ["EC",0x146],
+  ["E2",0x14C],
+  ["93",0x14D],
+  ["8A",0x156],
+  ["8B",0x157],
+  ["97",0x15A],
+  ["98",0x15B],
+  ["BE",0x160],
+  ["D5",0x161],
+  ["C7",0x16A],
+  ["D7",0x16B],
+  ["C6",0x172],
+  ["D6",0x173],
+  ["8D",0x179],
+  ["A5",0x17A],
+  ["A3",0x17B],
+  ["A4",0x17C],
+  ["CF",0x17D],
+  ["D8",0x17E],
+  ["EF",0x2019],
+  ["F2",0x201C],
+  ["A6",0x201D],
+  ["F7",0x201E],
+  ["F9",0x2219],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm852-tbl.rb b/enc/trans/ibm852-tbl.rb
new file mode 100644
index 0000000000..6cec51cf80
--- /dev/null
+++ b/enc/trans/ibm852-tbl.rb
@@ -0,0 +1,130 @@
+IBM852_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["CF",0xA4],
+  ["F5",0xA7],
+  ["F9",0xA8],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F0",0xAD],
+  ["F8",0xB0],
+  ["EF",0xB4],
+  ["F7",0xB8],
+  ["AF",0xBB],
+  ["B5",0xC1],
+  ["B6",0xC2],
+  ["8E",0xC4],
+  ["80",0xC7],
+  ["90",0xC9],
+  ["D3",0xCB],
+  ["D6",0xCD],
+  ["D7",0xCE],
+  ["E0",0xD3],
+  ["E2",0xD4],
+  ["99",0xD6],
+  ["9E",0xD7],
+  ["E9",0xDA],
+  ["9A",0xDC],
+  ["ED",0xDD],
+  ["E1",0xDF],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["84",0xE4],
+  ["87",0xE7],
+  ["82",0xE9],
+  ["89",0xEB],
+  ["A1",0xED],
+  ["8C",0xEE],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["A3",0xFA],
+  ["81",0xFC],
+  ["EC",0xFD],
+  ["C6",0x102],
+  ["C7",0x103],
+  ["A4",0x104],
+  ["A5",0x105],
+  ["8F",0x106],
+  ["86",0x107],
+  ["AC",0x10C],
+  ["9F",0x10D],
+  ["D2",0x10E],
+  ["D4",0x10F],
+  ["D1",0x110],
+  ["D0",0x111],
+  ["A8",0x118],
+  ["A9",0x119],
+  ["B7",0x11A],
+  ["D8",0x11B],
+  ["91",0x139],
+  ["92",0x13A],
+  ["95",0x13D],
+  ["96",0x13E],
+  ["9D",0x141],
+  ["88",0x142],
+  ["E3",0x143],
+  ["E4",0x144],
+  ["D5",0x147],
+  ["E5",0x148],
+  ["8A",0x150],
+  ["8B",0x151],
+  ["E8",0x154],
+  ["EA",0x155],
+  ["FC",0x158],
+  ["FD",0x159],
+  ["97",0x15A],
+  ["98",0x15B],
+  ["B8",0x15E],
+  ["AD",0x15F],
+  ["E6",0x160],
+  ["E7",0x161],
+  ["DD",0x162],
+  ["EE",0x163],
+  ["9B",0x164],
+  ["9C",0x165],
+  ["DE",0x16E],
+  ["85",0x16F],
+  ["EB",0x170],
+  ["FB",0x171],
+  ["8D",0x179],
+  ["AB",0x17A],
+  ["BD",0x17B],
+  ["BE",0x17C],
+  ["A6",0x17D],
+  ["A7",0x17E],
+  ["F3",0x2C7],
+  ["F4",0x2D8],
+  ["FA",0x2D9],
+  ["F2",0x2DB],
+  ["F1",0x2DD],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm855-tbl.rb b/enc/trans/ibm855-tbl.rb
new file mode 100644
index 0000000000..7e0cc5014f
--- /dev/null
+++ b/enc/trans/ibm855-tbl.rb
@@ -0,0 +1,130 @@
+IBM855_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["CF",0xA4],
+  ["FD",0xA7],
+  ["AE",0xAB],
+  ["F0",0xAD],
+  ["AF",0xBB],
+  ["85",0x401],
+  ["81",0x402],
+  ["83",0x403],
+  ["87",0x404],
+  ["89",0x405],
+  ["8B",0x406],
+  ["8D",0x407],
+  ["8F",0x408],
+  ["91",0x409],
+  ["93",0x40A],
+  ["95",0x40B],
+  ["97",0x40C],
+  ["99",0x40E],
+  ["9B",0x40F],
+  ["A1",0x410],
+  ["A3",0x411],
+  ["EC",0x412],
+  ["AD",0x413],
+  ["A7",0x414],
+  ["A9",0x415],
+  ["EA",0x416],
+  ["F4",0x417],
+  ["B8",0x418],
+  ["BE",0x419],
+  ["C7",0x41A],
+  ["D1",0x41B],
+  ["D3",0x41C],
+  ["D5",0x41D],
+  ["D7",0x41E],
+  ["DD",0x41F],
+  ["E2",0x420],
+  ["E4",0x421],
+  ["E6",0x422],
+  ["E8",0x423],
+  ["AB",0x424],
+  ["B6",0x425],
+  ["A5",0x426],
+  ["FC",0x427],
+  ["F6",0x428],
+  ["FA",0x429],
+  ["9F",0x42A],
+  ["F2",0x42B],
+  ["EE",0x42C],
+  ["F8",0x42D],
+  ["9D",0x42E],
+  ["E0",0x42F],
+  ["A0",0x430],
+  ["A2",0x431],
+  ["EB",0x432],
+  ["AC",0x433],
+  ["A6",0x434],
+  ["A8",0x435],
+  ["E9",0x436],
+  ["F3",0x437],
+  ["B7",0x438],
+  ["BD",0x439],
+  ["C6",0x43A],
+  ["D0",0x43B],
+  ["D2",0x43C],
+  ["D4",0x43D],
+  ["D6",0x43E],
+  ["D8",0x43F],
+  ["E1",0x440],
+  ["E3",0x441],
+  ["E5",0x442],
+  ["E7",0x443],
+  ["AA",0x444],
+  ["B5",0x445],
+  ["A4",0x446],
+  ["FB",0x447],
+  ["F5",0x448],
+  ["F9",0x449],
+  ["9E",0x44A],
+  ["F1",0x44B],
+  ["ED",0x44C],
+  ["F7",0x44D],
+  ["9C",0x44E],
+  ["DE",0x44F],
+  ["84",0x451],
+  ["80",0x452],
+  ["82",0x453],
+  ["86",0x454],
+  ["88",0x455],
+  ["8A",0x456],
+  ["8C",0x457],
+  ["8E",0x458],
+  ["90",0x459],
+  ["92",0x45A],
+  ["94",0x45B],
+  ["96",0x45C],
+  ["98",0x45E],
+  ["9A",0x45F],
+  ["EF",0x2116],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm857-tbl.rb b/enc/trans/ibm857-tbl.rb
new file mode 100644
index 0000000000..5b20d389d3
--- /dev/null
+++ b/enc/trans/ibm857-tbl.rb
@@ -0,0 +1,127 @@
+IBM857_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["AD",0xA1],
+  ["BD",0xA2],
+  ["9C",0xA3],
+  ["CF",0xA4],
+  ["BE",0xA5],
+  ["DD",0xA6],
+  ["F5",0xA7],
+  ["F9",0xA8],
+  ["B8",0xA9],
+  ["D1",0xAA],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F0",0xAD],
+  ["A9",0xAE],
+  ["EE",0xAF],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["FC",0xB3],
+  ["EF",0xB4],
+  ["E6",0xB5],
+  ["F4",0xB6],
+  ["FA",0xB7],
+  ["F7",0xB8],
+  ["FB",0xB9],
+  ["D0",0xBA],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["F3",0xBE],
+  ["A8",0xBF],
+  ["B7",0xC0],
+  ["B5",0xC1],
+  ["B6",0xC2],
+  ["C7",0xC3],
+  ["8E",0xC4],
+  ["8F",0xC5],
+  ["92",0xC6],
+  ["80",0xC7],
+  ["D4",0xC8],
+  ["90",0xC9],
+  ["D2",0xCA],
+  ["D3",0xCB],
+  ["DE",0xCC],
+  ["D6",0xCD],
+  ["D7",0xCE],
+  ["D8",0xCF],
+  ["A5",0xD1],
+  ["E3",0xD2],
+  ["E0",0xD3],
+  ["E2",0xD4],
+  ["E5",0xD5],
+  ["99",0xD6],
+  ["E8",0xD7],
+  ["9D",0xD8],
+  ["EB",0xD9],
+  ["E9",0xDA],
+  ["EA",0xDB],
+  ["9A",0xDC],
+  ["E1",0xDF],
+  ["85",0xE0],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["C6",0xE3],
+  ["84",0xE4],
+  ["86",0xE5],
+  ["91",0xE6],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["89",0xEB],
+  ["EC",0xEC],
+  ["A1",0xED],
+  ["8C",0xEE],
+  ["8B",0xEF],
+  ["A4",0xF1],
+  ["95",0xF2],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["E4",0xF5],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["9B",0xF8],
+  ["97",0xF9],
+  ["A3",0xFA],
+  ["96",0xFB],
+  ["81",0xFC],
+  ["ED",0xFF],
+  ["A6",0x11E],
+  ["A7",0x11F],
+  ["98",0x130],
+  ["8D",0x131],
+  ["9E",0x15E],
+  ["9F",0x15F],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm860-tbl.rb b/enc/trans/ibm860-tbl.rb
new file mode 100644
index 0000000000..ae218a129f
--- /dev/null
+++ b/enc/trans/ibm860-tbl.rb
@@ -0,0 +1,130 @@
+IBM860_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["AD",0xA1],
+  ["9B",0xA2],
+  ["9C",0xA3],
+  ["A6",0xAA],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["E6",0xB5],
+  ["FA",0xB7],
+  ["A7",0xBA],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["A8",0xBF],
+  ["91",0xC0],
+  ["86",0xC1],
+  ["8F",0xC2],
+  ["8E",0xC3],
+  ["80",0xC7],
+  ["92",0xC8],
+  ["90",0xC9],
+  ["89",0xCA],
+  ["98",0xCC],
+  ["8B",0xCD],
+  ["A5",0xD1],
+  ["A9",0xD2],
+  ["9F",0xD3],
+  ["8C",0xD4],
+  ["99",0xD5],
+  ["9D",0xD9],
+  ["96",0xDA],
+  ["9A",0xDC],
+  ["E1",0xDF],
+  ["85",0xE0],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["84",0xE3],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["8D",0xEC],
+  ["A1",0xED],
+  ["A4",0xF1],
+  ["95",0xF2],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["94",0xF5],
+  ["F6",0xF7],
+  ["97",0xF9],
+  ["A3",0xFA],
+  ["81",0xFC],
+  ["E2",0x393],
+  ["E9",0x398],
+  ["E4",0x3A3],
+  ["E8",0x3A6],
+  ["EA",0x3A9],
+  ["E0",0x3B1],
+  ["EB",0x3B4],
+  ["EE",0x3B5],
+  ["E3",0x3C0],
+  ["E5",0x3C3],
+  ["E7",0x3C4],
+  ["ED",0x3C6],
+  ["FC",0x207F],
+  ["9E",0x20A7],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["EC",0x221E],
+  ["EF",0x2229],
+  ["F7",0x2248],
+  ["F0",0x2261],
+  ["F3",0x2264],
+  ["F2",0x2265],
+  ["F4",0x2320],
+  ["F5",0x2321],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm861-tbl.rb b/enc/trans/ibm861-tbl.rb
new file mode 100644
index 0000000000..c24042a76c
--- /dev/null
+++ b/enc/trans/ibm861-tbl.rb
@@ -0,0 +1,130 @@
+IBM861_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["AD",0xA1],
+  ["9C",0xA3],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["E6",0xB5],
+  ["FA",0xB7],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["A8",0xBF],
+  ["A4",0xC1],
+  ["8E",0xC4],
+  ["8F",0xC5],
+  ["92",0xC6],
+  ["80",0xC7],
+  ["90",0xC9],
+  ["A5",0xCD],
+  ["8B",0xD0],
+  ["A6",0xD3],
+  ["99",0xD6],
+  ["9D",0xD8],
+  ["A7",0xDA],
+  ["9A",0xDC],
+  ["97",0xDD],
+  ["8D",0xDE],
+  ["E1",0xDF],
+  ["85",0xE0],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["84",0xE4],
+  ["86",0xE5],
+  ["91",0xE6],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["89",0xEB],
+  ["A1",0xED],
+  ["8C",0xF0],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["9B",0xF8],
+  ["A3",0xFA],
+  ["96",0xFB],
+  ["81",0xFC],
+  ["98",0xFD],
+  ["95",0xFE],
+  ["9F",0x192],
+  ["E2",0x393],
+  ["E9",0x398],
+  ["E4",0x3A3],
+  ["E8",0x3A6],
+  ["EA",0x3A9],
+  ["E0",0x3B1],
+  ["EB",0x3B4],
+  ["EE",0x3B5],
+  ["E3",0x3C0],
+  ["E5",0x3C3],
+  ["E7",0x3C4],
+  ["ED",0x3C6],
+  ["FC",0x207F],
+  ["9E",0x20A7],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["EC",0x221E],
+  ["EF",0x2229],
+  ["F7",0x2248],
+  ["F0",0x2261],
+  ["F3",0x2264],
+  ["F2",0x2265],
+  ["A9",0x2310],
+  ["F4",0x2320],
+  ["F5",0x2321],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm862-tbl.rb b/enc/trans/ibm862-tbl.rb
new file mode 100644
index 0000000000..31d6fb0243
--- /dev/null
+++ b/enc/trans/ibm862-tbl.rb
@@ -0,0 +1,130 @@
+IBM862_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["AD",0xA1],
+  ["9B",0xA2],
+  ["9C",0xA3],
+  ["9D",0xA5],
+  ["A6",0xAA],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["E6",0xB5],
+  ["FA",0xB7],
+  ["A7",0xBA],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["A8",0xBF],
+  ["A5",0xD1],
+  ["E1",0xDF],
+  ["A0",0xE1],
+  ["A1",0xED],
+  ["A4",0xF1],
+  ["A2",0xF3],
+  ["F6",0xF7],
+  ["A3",0xFA],
+  ["9F",0x192],
+  ["E2",0x393],
+  ["E9",0x398],
+  ["E4",0x3A3],
+  ["E8",0x3A6],
+  ["EA",0x3A9],
+  ["E0",0x3B1],
+  ["EB",0x3B4],
+  ["EE",0x3B5],
+  ["E3",0x3C0],
+  ["E5",0x3C3],
+  ["E7",0x3C4],
+  ["ED",0x3C6],
+  ["80",0x5D0],
+  ["81",0x5D1],
+  ["82",0x5D2],
+  ["83",0x5D3],
+  ["84",0x5D4],
+  ["85",0x5D5],
+  ["86",0x5D6],
+  ["87",0x5D7],
+  ["88",0x5D8],
+  ["89",0x5D9],
+  ["8A",0x5DA],
+  ["8B",0x5DB],
+  ["8C",0x5DC],
+  ["8D",0x5DD],
+  ["8E",0x5DE],
+  ["8F",0x5DF],
+  ["90",0x5E0],
+  ["91",0x5E1],
+  ["92",0x5E2],
+  ["93",0x5E3],
+  ["94",0x5E4],
+  ["95",0x5E5],
+  ["96",0x5E6],
+  ["97",0x5E7],
+  ["98",0x5E8],
+  ["99",0x5E9],
+  ["9A",0x5EA],
+  ["FC",0x207F],
+  ["9E",0x20A7],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["EC",0x221E],
+  ["EF",0x2229],
+  ["F7",0x2248],
+  ["F0",0x2261],
+  ["F3",0x2264],
+  ["F2",0x2265],
+  ["A9",0x2310],
+  ["F4",0x2320],
+  ["F5",0x2321],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm863-tbl.rb b/enc/trans/ibm863-tbl.rb
new file mode 100644
index 0000000000..db110cf38c
--- /dev/null
+++ b/enc/trans/ibm863-tbl.rb
@@ -0,0 +1,130 @@
+IBM863_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["9B",0xA2],
+  ["9C",0xA3],
+  ["98",0xA4],
+  ["A0",0xA6],
+  ["8F",0xA7],
+  ["A4",0xA8],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["A7",0xAF],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["A6",0xB3],
+  ["A1",0xB4],
+  ["E6",0xB5],
+  ["86",0xB6],
+  ["FA",0xB7],
+  ["A5",0xB8],
+  ["AF",0xBB],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["AD",0xBE],
+  ["8E",0xC0],
+  ["84",0xC2],
+  ["80",0xC7],
+  ["91",0xC8],
+  ["90",0xC9],
+  ["92",0xCA],
+  ["94",0xCB],
+  ["A8",0xCE],
+  ["95",0xCF],
+  ["99",0xD4],
+  ["9D",0xD9],
+  ["9E",0xDB],
+  ["9A",0xDC],
+  ["E1",0xDF],
+  ["85",0xE0],
+  ["83",0xE2],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["89",0xEB],
+  ["8C",0xEE],
+  ["8B",0xEF],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["F6",0xF7],
+  ["97",0xF9],
+  ["A3",0xFA],
+  ["96",0xFB],
+  ["81",0xFC],
+  ["9F",0x192],
+  ["E2",0x393],
+  ["E9",0x398],
+  ["E4",0x3A3],
+  ["E8",0x3A6],
+  ["EA",0x3A9],
+  ["E0",0x3B1],
+  ["EB",0x3B4],
+  ["EE",0x3B5],
+  ["E3",0x3C0],
+  ["E5",0x3C3],
+  ["E7",0x3C4],
+  ["ED",0x3C6],
+  ["8D",0x2017],
+  ["FC",0x207F],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["EC",0x221E],
+  ["EF",0x2229],
+  ["F7",0x2248],
+  ["F0",0x2261],
+  ["F3",0x2264],
+  ["F2",0x2265],
+  ["A9",0x2310],
+  ["F4",0x2320],
+  ["F5",0x2321],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm865-tbl.rb b/enc/trans/ibm865-tbl.rb
new file mode 100644
index 0000000000..22e322fb31
--- /dev/null
+++ b/enc/trans/ibm865-tbl.rb
@@ -0,0 +1,130 @@
+IBM865_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["AD",0xA1],
+  ["9C",0xA3],
+  ["AF",0xA4],
+  ["A6",0xAA],
+  ["AE",0xAB],
+  ["AA",0xAC],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["FD",0xB2],
+  ["E6",0xB5],
+  ["FA",0xB7],
+  ["A7",0xBA],
+  ["AC",0xBC],
+  ["AB",0xBD],
+  ["A8",0xBF],
+  ["8E",0xC4],
+  ["8F",0xC5],
+  ["92",0xC6],
+  ["80",0xC7],
+  ["90",0xC9],
+  ["A5",0xD1],
+  ["99",0xD6],
+  ["9D",0xD8],
+  ["9A",0xDC],
+  ["E1",0xDF],
+  ["85",0xE0],
+  ["A0",0xE1],
+  ["83",0xE2],
+  ["84",0xE4],
+  ["86",0xE5],
+  ["91",0xE6],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["89",0xEB],
+  ["8D",0xEC],
+  ["A1",0xED],
+  ["8C",0xEE],
+  ["8B",0xEF],
+  ["A4",0xF1],
+  ["95",0xF2],
+  ["A2",0xF3],
+  ["93",0xF4],
+  ["94",0xF6],
+  ["F6",0xF7],
+  ["9B",0xF8],
+  ["97",0xF9],
+  ["A3",0xFA],
+  ["96",0xFB],
+  ["81",0xFC],
+  ["98",0xFF],
+  ["9F",0x192],
+  ["E2",0x393],
+  ["E9",0x398],
+  ["E4",0x3A3],
+  ["E8",0x3A6],
+  ["EA",0x3A9],
+  ["E0",0x3B1],
+  ["EB",0x3B4],
+  ["EE",0x3B5],
+  ["E3",0x3C0],
+  ["E5",0x3C3],
+  ["E7",0x3C4],
+  ["ED",0x3C6],
+  ["FC",0x207F],
+  ["9E",0x20A7],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["EC",0x221E],
+  ["EF",0x2229],
+  ["F7",0x2248],
+  ["F0",0x2261],
+  ["F3",0x2264],
+  ["F2",0x2265],
+  ["A9",0x2310],
+  ["F4",0x2320],
+  ["F5",0x2321],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm866-tbl.rb b/enc/trans/ibm866-tbl.rb
new file mode 100644
index 0000000000..95b9ee7534
--- /dev/null
+++ b/enc/trans/ibm866-tbl.rb
@@ -0,0 +1,130 @@
+IBM866_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["FD",0xA4],
+  ["F8",0xB0],
+  ["FA",0xB7],
+  ["F0",0x401],
+  ["F2",0x404],
+  ["F4",0x407],
+  ["F6",0x40E],
+  ["80",0x410],
+  ["81",0x411],
+  ["82",0x412],
+  ["83",0x413],
+  ["84",0x414],
+  ["85",0x415],
+  ["86",0x416],
+  ["87",0x417],
+  ["88",0x418],
+  ["89",0x419],
+  ["8A",0x41A],
+  ["8B",0x41B],
+  ["8C",0x41C],
+  ["8D",0x41D],
+  ["8E",0x41E],
+  ["8F",0x41F],
+  ["90",0x420],
+  ["91",0x421],
+  ["92",0x422],
+  ["93",0x423],
+  ["94",0x424],
+  ["95",0x425],
+  ["96",0x426],
+  ["97",0x427],
+  ["98",0x428],
+  ["99",0x429],
+  ["9A",0x42A],
+  ["9B",0x42B],
+  ["9C",0x42C],
+  ["9D",0x42D],
+  ["9E",0x42E],
+  ["9F",0x42F],
+  ["A0",0x430],
+  ["A1",0x431],
+  ["A2",0x432],
+  ["A3",0x433],
+  ["A4",0x434],
+  ["A5",0x435],
+  ["A6",0x436],
+  ["A7",0x437],
+  ["A8",0x438],
+  ["A9",0x439],
+  ["AA",0x43A],
+  ["AB",0x43B],
+  ["AC",0x43C],
+  ["AD",0x43D],
+  ["AE",0x43E],
+  ["AF",0x43F],
+  ["E0",0x440],
+  ["E1",0x441],
+  ["E2",0x442],
+  ["E3",0x443],
+  ["E4",0x444],
+  ["E5",0x445],
+  ["E6",0x446],
+  ["E7",0x447],
+  ["E8",0x448],
+  ["E9",0x449],
+  ["EA",0x44A],
+  ["EB",0x44B],
+  ["EC",0x44C],
+  ["ED",0x44D],
+  ["EE",0x44E],
+  ["EF",0x44F],
+  ["F1",0x451],
+  ["F3",0x454],
+  ["F5",0x457],
+  ["F7",0x45E],
+  ["FC",0x2116],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/ibm869-tbl.rb b/enc/trans/ibm869-tbl.rb
new file mode 100644
index 0000000000..437e41ad98
--- /dev/null
+++ b/enc/trans/ibm869-tbl.rb
@@ -0,0 +1,121 @@
+IBM869_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["9C",0xA3],
+  ["8A",0xA6],
+  ["F5",0xA7],
+  ["F9",0xA8],
+  ["97",0xA9],
+  ["AE",0xAB],
+  ["89",0xAC],
+  ["F0",0xAD],
+  ["F8",0xB0],
+  ["F1",0xB1],
+  ["99",0xB2],
+  ["9A",0xB3],
+  ["88",0xB7],
+  ["AF",0xBB],
+  ["AB",0xBD],
+  ["EF",0x384],
+  ["F7",0x385],
+  ["86",0x386],
+  ["8D",0x388],
+  ["8F",0x389],
+  ["90",0x38A],
+  ["92",0x38C],
+  ["95",0x38E],
+  ["98",0x38F],
+  ["A1",0x390],
+  ["A4",0x391],
+  ["A5",0x392],
+  ["A6",0x393],
+  ["A7",0x394],
+  ["A8",0x395],
+  ["A9",0x396],
+  ["AA",0x397],
+  ["AC",0x398],
+  ["AD",0x399],
+  ["B5",0x39A],
+  ["B6",0x39B],
+  ["B7",0x39C],
+  ["B8",0x39D],
+  ["BD",0x39E],
+  ["BE",0x39F],
+  ["C6",0x3A0],
+  ["C7",0x3A1],
+  ["CF",0x3A3],
+  ["D0",0x3A4],
+  ["D1",0x3A5],
+  ["D2",0x3A6],
+  ["D3",0x3A7],
+  ["D4",0x3A8],
+  ["D5",0x3A9],
+  ["91",0x3AA],
+  ["96",0x3AB],
+  ["9B",0x3AC],
+  ["9D",0x3AD],
+  ["9E",0x3AE],
+  ["9F",0x3AF],
+  ["FC",0x3B0],
+  ["D6",0x3B1],
+  ["D7",0x3B2],
+  ["D8",0x3B3],
+  ["DD",0x3B4],
+  ["DE",0x3B5],
+  ["E0",0x3B6],
+  ["E1",0x3B7],
+  ["E2",0x3B8],
+  ["E3",0x3B9],
+  ["E4",0x3BA],
+  ["E5",0x3BB],
+  ["E6",0x3BC],
+  ["E7",0x3BD],
+  ["E8",0x3BE],
+  ["E9",0x3BF],
+  ["EA",0x3C0],
+  ["EB",0x3C1],
+  ["ED",0x3C2],
+  ["EC",0x3C3],
+  ["EE",0x3C4],
+  ["F2",0x3C5],
+  ["F3",0x3C6],
+  ["F4",0x3C7],
+  ["F6",0x3C8],
+  ["FA",0x3C9],
+  ["A0",0x3CA],
+  ["FB",0x3CB],
+  ["A2",0x3CC],
+  ["A3",0x3CD],
+  ["FD",0x3CE],
+  ["8E",0x2015],
+  ["8B",0x2018],
+  ["8C",0x2019],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["C9",0x2554],
+  ["BB",0x2557],
+  ["C8",0x255A],
+  ["BC",0x255D],
+  ["CC",0x2560],
+  ["B9",0x2563],
+  ["CB",0x2566],
+  ["CA",0x2569],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/iso-8859-1-tbl.rb b/enc/trans/iso-8859-1-tbl.rb
new file mode 100644
index 0000000000..05397e6417
--- /dev/null
+++ b/enc/trans/iso-8859-1-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_1_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AA",0xAA],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0xB9],
+  ["BA",0xBA],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["BF",0xBF],
+  ["C0",0xC0],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0xC7],
+  ["C8",0xC8],
+  ["C9",0xC9],
+  ["CA",0xCA],
+  ["CB",0xCB],
+  ["CC",0xCC],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D0",0xD0],
+  ["D1",0xD1],
+  ["D2",0xD2],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0xD8],
+  ["D9",0xD9],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0xDD],
+  ["DE",0xDE],
+  ["DF",0xDF],
+  ["E0",0xE0],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EC",0xEC],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F0",0xF0],
+  ["F1",0xF1],
+  ["F2",0xF2],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0xF8],
+  ["F9",0xF9],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0xFD],
+  ["FE",0xFE],
+  ["FF",0xFF],
+]
diff --git a/enc/trans/iso-8859-10-tbl.rb b/enc/trans/iso-8859-10-tbl.rb
new file mode 100644
index 0000000000..8104f526cc
--- /dev/null
+++ b/enc/trans/iso-8859-10-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_10_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x104],
+  ["A2",0x112],
+  ["A3",0x122],
+  ["A4",0x12A],
+  ["A5",0x128],
+  ["A6",0x136],
+  ["A7",0xA7],
+  ["A8",0x13B],
+  ["A9",0x110],
+  ["AA",0x160],
+  ["AB",0x166],
+  ["AC",0x17D],
+  ["AD",0xAD],
+  ["AE",0x16A],
+  ["AF",0x14A],
+  ["B0",0xB0],
+  ["B1",0x105],
+  ["B2",0x113],
+  ["B3",0x123],
+  ["B4",0x12B],
+  ["B5",0x129],
+  ["B6",0x137],
+  ["B7",0xB7],
+  ["B8",0x13C],
+  ["B9",0x111],
+  ["BA",0x161],
+  ["BB",0x167],
+  ["BC",0x17E],
+  ["BD",0x2015],
+  ["BE",0x16B],
+  ["BF",0x14B],
+  ["C0",0x100],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0x12E],
+  ["C8",0x10C],
+  ["C9",0xC9],
+  ["CA",0x118],
+  ["CB",0xCB],
+  ["CC",0x116],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D0",0xD0],
+  ["D1",0x145],
+  ["D2",0x14C],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0x168],
+  ["D8",0xD8],
+  ["D9",0x172],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0xDD],
+  ["DE",0xDE],
+  ["DF",0xDF],
+  ["E0",0x101],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0x12F],
+  ["E8",0x10D],
+  ["E9",0xE9],
+  ["EA",0x119],
+  ["EB",0xEB],
+  ["EC",0x117],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F0",0xF0],
+  ["F1",0x146],
+  ["F2",0x14D],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0x169],
+  ["F8",0xF8],
+  ["F9",0x173],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0xFD],
+  ["FE",0xFE],
+  ["FF",0x138],
+]
diff --git a/enc/trans/iso-8859-11-tbl.rb b/enc/trans/iso-8859-11-tbl.rb
new file mode 100644
index 0000000000..686631c294
--- /dev/null
+++ b/enc/trans/iso-8859-11-tbl.rb
@@ -0,0 +1,90 @@
+ISO_8859_11_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xE01],
+  ["A2",0xE02],
+  ["A3",0xE03],
+  ["A4",0xE04],
+  ["A5",0xE05],
+  ["A6",0xE06],
+  ["A7",0xE07],
+  ["A8",0xE08],
+  ["A9",0xE09],
+  ["AA",0xE0A],
+  ["AB",0xE0B],
+  ["AC",0xE0C],
+  ["AD",0xE0D],
+  ["AE",0xE0E],
+  ["AF",0xE0F],
+  ["B0",0xE10],
+  ["B1",0xE11],
+  ["B2",0xE12],
+  ["B3",0xE13],
+  ["B4",0xE14],
+  ["B5",0xE15],
+  ["B6",0xE16],
+  ["B7",0xE17],
+  ["B8",0xE18],
+  ["B9",0xE19],
+  ["BA",0xE1A],
+  ["BB",0xE1B],
+  ["BC",0xE1C],
+  ["BD",0xE1D],
+  ["BE",0xE1E],
+  ["BF",0xE1F],
+  ["C0",0xE20],
+  ["C1",0xE21],
+  ["C2",0xE22],
+  ["C3",0xE23],
+  ["C4",0xE24],
+  ["C5",0xE25],
+  ["C6",0xE26],
+  ["C7",0xE27],
+  ["C8",0xE28],
+  ["C9",0xE29],
+  ["CA",0xE2A],
+  ["CB",0xE2B],
+  ["CC",0xE2C],
+  ["CD",0xE2D],
+  ["CE",0xE2E],
+  ["CF",0xE2F],
+  ["D0",0xE30],
+  ["D1",0xE31],
+  ["D2",0xE32],
+  ["D3",0xE33],
+  ["D4",0xE34],
+  ["D5",0xE35],
+  ["D6",0xE36],
+  ["D7",0xE37],
+  ["D8",0xE38],
+  ["D9",0xE39],
+  ["DA",0xE3A],
+  ["DF",0xE3F],
+  ["E0",0xE40],
+  ["E1",0xE41],
+  ["E2",0xE42],
+  ["E3",0xE43],
+  ["E4",0xE44],
+  ["E5",0xE45],
+  ["E6",0xE46],
+  ["E7",0xE47],
+  ["E8",0xE48],
+  ["E9",0xE49],
+  ["EA",0xE4A],
+  ["EB",0xE4B],
+  ["EC",0xE4C],
+  ["ED",0xE4D],
+  ["EE",0xE4E],
+  ["EF",0xE4F],
+  ["F0",0xE50],
+  ["F1",0xE51],
+  ["F2",0xE52],
+  ["F3",0xE53],
+  ["F4",0xE54],
+  ["F5",0xE55],
+  ["F6",0xE56],
+  ["F7",0xE57],
+  ["F8",0xE58],
+  ["F9",0xE59],
+  ["FA",0xE5A],
+  ["FB",0xE5B],
+]
diff --git a/enc/trans/iso-8859-13-tbl.rb b/enc/trans/iso-8859-13-tbl.rb
new file mode 100644
index 0000000000..832d012c96
--- /dev/null
+++ b/enc/trans/iso-8859-13-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_13_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x201D],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0x201E],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xD8],
+  ["A9",0xA9],
+  ["AA",0x156],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xC6],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0x201C],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xF8],
+  ["B9",0xB9],
+  ["BA",0x157],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["BF",0xE6],
+  ["C0",0x104],
+  ["C1",0x12E],
+  ["C2",0x100],
+  ["C3",0x106],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0x118],
+  ["C7",0x112],
+  ["C8",0x10C],
+  ["C9",0xC9],
+  ["CA",0x179],
+  ["CB",0x116],
+  ["CC",0x122],
+  ["CD",0x136],
+  ["CE",0x12A],
+  ["CF",0x13B],
+  ["D0",0x160],
+  ["D1",0x143],
+  ["D2",0x145],
+  ["D3",0xD3],
+  ["D4",0x14C],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0x172],
+  ["D9",0x141],
+  ["DA",0x15A],
+  ["DB",0x16A],
+  ["DC",0xDC],
+  ["DD",0x17B],
+  ["DE",0x17D],
+  ["DF",0xDF],
+  ["E0",0x105],
+  ["E1",0x12F],
+  ["E2",0x101],
+  ["E3",0x107],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0x119],
+  ["E7",0x113],
+  ["E8",0x10D],
+  ["E9",0xE9],
+  ["EA",0x17A],
+  ["EB",0x117],
+  ["EC",0x123],
+  ["ED",0x137],
+  ["EE",0x12B],
+  ["EF",0x13C],
+  ["F0",0x161],
+  ["F1",0x144],
+  ["F2",0x146],
+  ["F3",0xF3],
+  ["F4",0x14D],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0x173],
+  ["F9",0x142],
+  ["FA",0x15B],
+  ["FB",0x16B],
+  ["FC",0xFC],
+  ["FD",0x17C],
+  ["FE",0x17E],
+  ["FF",0x2019],
+]
diff --git a/enc/trans/iso-8859-14-tbl.rb b/enc/trans/iso-8859-14-tbl.rb
new file mode 100644
index 0000000000..db5c13996a
--- /dev/null
+++ b/enc/trans/iso-8859-14-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_14_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x1E02],
+  ["A2",0x1E03],
+  ["A3",0xA3],
+  ["A4",0x10A],
+  ["A5",0x10B],
+  ["A6",0x1E0A],
+  ["A7",0xA7],
+  ["A8",0x1E80],
+  ["A9",0xA9],
+  ["AA",0x1E82],
+  ["AB",0x1E0B],
+  ["AC",0x1EF2],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0x178],
+  ["B0",0x1E1E],
+  ["B1",0x1E1F],
+  ["B2",0x120],
+  ["B3",0x121],
+  ["B4",0x1E40],
+  ["B5",0x1E41],
+  ["B6",0xB6],
+  ["B7",0x1E56],
+  ["B8",0x1E81],
+  ["B9",0x1E57],
+  ["BA",0x1E83],
+  ["BB",0x1E60],
+  ["BC",0x1EF3],
+  ["BD",0x1E84],
+  ["BE",0x1E85],
+  ["BF",0x1E61],
+  ["C0",0xC0],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0xC7],
+  ["C8",0xC8],
+  ["C9",0xC9],
+  ["CA",0xCA],
+  ["CB",0xCB],
+  ["CC",0xCC],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D0",0x174],
+  ["D1",0xD1],
+  ["D2",0xD2],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0x1E6A],
+  ["D8",0xD8],
+  ["D9",0xD9],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0xDD],
+  ["DE",0x176],
+  ["DF",0xDF],
+  ["E0",0xE0],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EC",0xEC],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F0",0x175],
+  ["F1",0xF1],
+  ["F2",0xF2],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0x1E6B],
+  ["F8",0xF8],
+  ["F9",0xF9],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0xFD],
+  ["FE",0x177],
+  ["FF",0xFF],
+]
diff --git a/enc/trans/iso-8859-15-tbl.rb b/enc/trans/iso-8859-15-tbl.rb
new file mode 100644
index 0000000000..54d952a25f
--- /dev/null
+++ b/enc/trans/iso-8859-15-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_15_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0x20AC],
+  ["A5",0xA5],
+  ["A6",0x160],
+  ["A7",0xA7],
+  ["A8",0x161],
+  ["A9",0xA9],
+  ["AA",0xAA],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0x17D],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0x17E],
+  ["B9",0xB9],
+  ["BA",0xBA],
+  ["BB",0xBB],
+  ["BC",0x152],
+  ["BD",0x153],
+  ["BE",0x178],
+  ["BF",0xBF],
+  ["C0",0xC0],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0xC7],
+  ["C8",0xC8],
+  ["C9",0xC9],
+  ["CA",0xCA],
+  ["CB",0xCB],
+  ["CC",0xCC],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D0",0xD0],
+  ["D1",0xD1],
+  ["D2",0xD2],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0xD8],
+  ["D9",0xD9],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0xDD],
+  ["DE",0xDE],
+  ["DF",0xDF],
+  ["E0",0xE0],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EC",0xEC],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F0",0xF0],
+  ["F1",0xF1],
+  ["F2",0xF2],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0xF8],
+  ["F9",0xF9],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0xFD],
+  ["FE",0xFE],
+  ["FF",0xFF],
+]
diff --git a/enc/trans/iso-8859-2-tbl.rb b/enc/trans/iso-8859-2-tbl.rb
new file mode 100644
index 0000000000..adf2bb1182
--- /dev/null
+++ b/enc/trans/iso-8859-2-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_2_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x104],
+  ["A2",0x2D8],
+  ["A3",0x141],
+  ["A4",0xA4],
+  ["A5",0x13D],
+  ["A6",0x15A],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0x160],
+  ["AA",0x15E],
+  ["AB",0x164],
+  ["AC",0x179],
+  ["AD",0xAD],
+  ["AE",0x17D],
+  ["AF",0x17B],
+  ["B0",0xB0],
+  ["B1",0x105],
+  ["B2",0x2DB],
+  ["B3",0x142],
+  ["B4",0xB4],
+  ["B5",0x13E],
+  ["B6",0x15B],
+  ["B7",0x2C7],
+  ["B8",0xB8],
+  ["B9",0x161],
+  ["BA",0x15F],
+  ["BB",0x165],
+  ["BC",0x17A],
+  ["BD",0x2DD],
+  ["BE",0x17E],
+  ["BF",0x17C],
+  ["C0",0x154],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0x102],
+  ["C4",0xC4],
+  ["C5",0x139],
+  ["C6",0x106],
+  ["C7",0xC7],
+  ["C8",0x10C],
+  ["C9",0xC9],
+  ["CA",0x118],
+  ["CB",0xCB],
+  ["CC",0x11A],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0x10E],
+  ["D0",0x110],
+  ["D1",0x143],
+  ["D2",0x147],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0x150],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0x158],
+  ["D9",0x16E],
+  ["DA",0xDA],
+  ["DB",0x170],
+  ["DC",0xDC],
+  ["DD",0xDD],
+  ["DE",0x162],
+  ["DF",0xDF],
+  ["E0",0x155],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0x103],
+  ["E4",0xE4],
+  ["E5",0x13A],
+  ["E6",0x107],
+  ["E7",0xE7],
+  ["E8",0x10D],
+  ["E9",0xE9],
+  ["EA",0x119],
+  ["EB",0xEB],
+  ["EC",0x11B],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0x10F],
+  ["F0",0x111],
+  ["F1",0x144],
+  ["F2",0x148],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0x151],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0x159],
+  ["F9",0x16F],
+  ["FA",0xFA],
+  ["FB",0x171],
+  ["FC",0xFC],
+  ["FD",0xFD],
+  ["FE",0x163],
+  ["FF",0x2D9],
+]
diff --git a/enc/trans/iso-8859-3-tbl.rb b/enc/trans/iso-8859-3-tbl.rb
new file mode 100644
index 0000000000..4751ee0c0a
--- /dev/null
+++ b/enc/trans/iso-8859-3-tbl.rb
@@ -0,0 +1,91 @@
+ISO_8859_3_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x126],
+  ["A2",0x2D8],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A6",0x124],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0x130],
+  ["AA",0x15E],
+  ["AB",0x11E],
+  ["AC",0x134],
+  ["AD",0xAD],
+  ["AF",0x17B],
+  ["B0",0xB0],
+  ["B1",0x127],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0x125],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0x131],
+  ["BA",0x15F],
+  ["BB",0x11F],
+  ["BC",0x135],
+  ["BD",0xBD],
+  ["BF",0x17C],
+  ["C0",0xC0],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C4",0xC4],
+  ["C5",0x10A],
+  ["C6",0x108],
+  ["C7",0xC7],
+  ["C8",0xC8],
+  ["C9",0xC9],
+  ["CA",0xCA],
+  ["CB",0xCB],
+  ["CC",0xCC],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D1",0xD1],
+  ["D2",0xD2],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0x120],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0x11C],
+  ["D9",0xD9],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0x16C],
+  ["DE",0x15C],
+  ["DF",0xDF],
+  ["E0",0xE0],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E4",0xE4],
+  ["E5",0x10B],
+  ["E6",0x109],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EC",0xEC],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F1",0xF1],
+  ["F2",0xF2],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0x121],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0x11D],
+  ["F9",0xF9],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0x16D],
+  ["FE",0x15D],
+  ["FF",0x2D9],
+]
diff --git a/enc/trans/iso-8859-4-tbl.rb b/enc/trans/iso-8859-4-tbl.rb
new file mode 100644
index 0000000000..ff13883321
--- /dev/null
+++ b/enc/trans/iso-8859-4-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_4_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x104],
+  ["A2",0x138],
+  ["A3",0x156],
+  ["A4",0xA4],
+  ["A5",0x128],
+  ["A6",0x13B],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0x160],
+  ["AA",0x112],
+  ["AB",0x122],
+  ["AC",0x166],
+  ["AD",0xAD],
+  ["AE",0x17D],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0x105],
+  ["B2",0x2DB],
+  ["B3",0x157],
+  ["B4",0xB4],
+  ["B5",0x129],
+  ["B6",0x13C],
+  ["B7",0x2C7],
+  ["B8",0xB8],
+  ["B9",0x161],
+  ["BA",0x113],
+  ["BB",0x123],
+  ["BC",0x167],
+  ["BD",0x14A],
+  ["BE",0x17E],
+  ["BF",0x14B],
+  ["C0",0x100],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0x12E],
+  ["C8",0x10C],
+  ["C9",0xC9],
+  ["CA",0x118],
+  ["CB",0xCB],
+  ["CC",0x116],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0x12A],
+  ["D0",0x110],
+  ["D1",0x145],
+  ["D2",0x14C],
+  ["D3",0x136],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0xD8],
+  ["D9",0x172],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0x168],
+  ["DE",0x16A],
+  ["DF",0xDF],
+  ["E0",0x101],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0x12F],
+  ["E8",0x10D],
+  ["E9",0xE9],
+  ["EA",0x119],
+  ["EB",0xEB],
+  ["EC",0x117],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0x12B],
+  ["F0",0x111],
+  ["F1",0x146],
+  ["F2",0x14D],
+  ["F3",0x137],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0xF8],
+  ["F9",0x173],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0x169],
+  ["FE",0x16B],
+  ["FF",0x2D9],
+]
diff --git a/enc/trans/iso-8859-5-tbl.rb b/enc/trans/iso-8859-5-tbl.rb
new file mode 100644
index 0000000000..b0ef366a27
--- /dev/null
+++ b/enc/trans/iso-8859-5-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_5_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x401],
+  ["A2",0x402],
+  ["A3",0x403],
+  ["A4",0x404],
+  ["A5",0x405],
+  ["A6",0x406],
+  ["A7",0x407],
+  ["A8",0x408],
+  ["A9",0x409],
+  ["AA",0x40A],
+  ["AB",0x40B],
+  ["AC",0x40C],
+  ["AD",0xAD],
+  ["AE",0x40E],
+  ["AF",0x40F],
+  ["B0",0x410],
+  ["B1",0x411],
+  ["B2",0x412],
+  ["B3",0x413],
+  ["B4",0x414],
+  ["B5",0x415],
+  ["B6",0x416],
+  ["B7",0x417],
+  ["B8",0x418],
+  ["B9",0x419],
+  ["BA",0x41A],
+  ["BB",0x41B],
+  ["BC",0x41C],
+  ["BD",0x41D],
+  ["BE",0x41E],
+  ["BF",0x41F],
+  ["C0",0x420],
+  ["C1",0x421],
+  ["C2",0x422],
+  ["C3",0x423],
+  ["C4",0x424],
+  ["C5",0x425],
+  ["C6",0x426],
+  ["C7",0x427],
+  ["C8",0x428],
+  ["C9",0x429],
+  ["CA",0x42A],
+  ["CB",0x42B],
+  ["CC",0x42C],
+  ["CD",0x42D],
+  ["CE",0x42E],
+  ["CF",0x42F],
+  ["D0",0x430],
+  ["D1",0x431],
+  ["D2",0x432],
+  ["D3",0x433],
+  ["D4",0x434],
+  ["D5",0x435],
+  ["D6",0x436],
+  ["D7",0x437],
+  ["D8",0x438],
+  ["D9",0x439],
+  ["DA",0x43A],
+  ["DB",0x43B],
+  ["DC",0x43C],
+  ["DD",0x43D],
+  ["DE",0x43E],
+  ["DF",0x43F],
+  ["E0",0x440],
+  ["E1",0x441],
+  ["E2",0x442],
+  ["E3",0x443],
+  ["E4",0x444],
+  ["E5",0x445],
+  ["E6",0x446],
+  ["E7",0x447],
+  ["E8",0x448],
+  ["E9",0x449],
+  ["EA",0x44A],
+  ["EB",0x44B],
+  ["EC",0x44C],
+  ["ED",0x44D],
+  ["EE",0x44E],
+  ["EF",0x44F],
+  ["F0",0x2116],
+  ["F1",0x451],
+  ["F2",0x452],
+  ["F3",0x453],
+  ["F4",0x454],
+  ["F5",0x455],
+  ["F6",0x456],
+  ["F7",0x457],
+  ["F8",0x458],
+  ["F9",0x459],
+  ["FA",0x45A],
+  ["FB",0x45B],
+  ["FC",0x45C],
+  ["FD",0xA7],
+  ["FE",0x45E],
+  ["FF",0x45F],
+]
diff --git a/enc/trans/iso-8859-6-tbl.rb b/enc/trans/iso-8859-6-tbl.rb
new file mode 100644
index 0000000000..d387372b98
--- /dev/null
+++ b/enc/trans/iso-8859-6-tbl.rb
@@ -0,0 +1,53 @@
+ISO_8859_6_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A4",0xA4],
+  ["AC",0x60C],
+  ["AD",0xAD],
+  ["BB",0x61B],
+  ["BF",0x61F],
+  ["C1",0x621],
+  ["C2",0x622],
+  ["C3",0x623],
+  ["C4",0x624],
+  ["C5",0x625],
+  ["C6",0x626],
+  ["C7",0x627],
+  ["C8",0x628],
+  ["C9",0x629],
+  ["CA",0x62A],
+  ["CB",0x62B],
+  ["CC",0x62C],
+  ["CD",0x62D],
+  ["CE",0x62E],
+  ["CF",0x62F],
+  ["D0",0x630],
+  ["D1",0x631],
+  ["D2",0x632],
+  ["D3",0x633],
+  ["D4",0x634],
+  ["D5",0x635],
+  ["D6",0x636],
+  ["D7",0x637],
+  ["D8",0x638],
+  ["D9",0x639],
+  ["DA",0x63A],
+  ["E0",0x640],
+  ["E1",0x641],
+  ["E2",0x642],
+  ["E3",0x643],
+  ["E4",0x644],
+  ["E5",0x645],
+  ["E6",0x646],
+  ["E7",0x647],
+  ["E8",0x648],
+  ["E9",0x649],
+  ["EA",0x64A],
+  ["EB",0x64B],
+  ["EC",0x64C],
+  ["ED",0x64D],
+  ["EE",0x64E],
+  ["EF",0x64F],
+  ["F0",0x650],
+  ["F1",0x651],
+  ["F2",0x652],
+]
diff --git a/enc/trans/iso-8859-7-tbl.rb b/enc/trans/iso-8859-7-tbl.rb
new file mode 100644
index 0000000000..4ebce5c1f1
--- /dev/null
+++ b/enc/trans/iso-8859-7-tbl.rb
@@ -0,0 +1,95 @@
+ISO_8859_7_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0x2018],
+  ["A2",0x2019],
+  ["A3",0xA3],
+  ["A4",0x20AC],
+  ["A5",0x20AF],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AA",0x37A],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AF",0x2015],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0x384],
+  ["B5",0x385],
+  ["B6",0x386],
+  ["B7",0xB7],
+  ["B8",0x388],
+  ["B9",0x389],
+  ["BA",0x38A],
+  ["BB",0xBB],
+  ["BC",0x38C],
+  ["BD",0xBD],
+  ["BE",0x38E],
+  ["BF",0x38F],
+  ["C0",0x390],
+  ["C1",0x391],
+  ["C2",0x392],
+  ["C3",0x393],
+  ["C4",0x394],
+  ["C5",0x395],
+  ["C6",0x396],
+  ["C7",0x397],
+  ["C8",0x398],
+  ["C9",0x399],
+  ["CA",0x39A],
+  ["CB",0x39B],
+  ["CC",0x39C],
+  ["CD",0x39D],
+  ["CE",0x39E],
+  ["CF",0x39F],
+  ["D0",0x3A0],
+  ["D1",0x3A1],
+  ["D3",0x3A3],
+  ["D4",0x3A4],
+  ["D5",0x3A5],
+  ["D6",0x3A6],
+  ["D7",0x3A7],
+  ["D8",0x3A8],
+  ["D9",0x3A9],
+  ["DA",0x3AA],
+  ["DB",0x3AB],
+  ["DC",0x3AC],
+  ["DD",0x3AD],
+  ["DE",0x3AE],
+  ["DF",0x3AF],
+  ["E0",0x3B0],
+  ["E1",0x3B1],
+  ["E2",0x3B2],
+  ["E3",0x3B3],
+  ["E4",0x3B4],
+  ["E5",0x3B5],
+  ["E6",0x3B6],
+  ["E7",0x3B7],
+  ["E8",0x3B8],
+  ["E9",0x3B9],
+  ["EA",0x3BA],
+  ["EB",0x3BB],
+  ["EC",0x3BC],
+  ["ED",0x3BD],
+  ["EE",0x3BE],
+  ["EF",0x3BF],
+  ["F0",0x3C0],
+  ["F1",0x3C1],
+  ["F2",0x3C2],
+  ["F3",0x3C3],
+  ["F4",0x3C4],
+  ["F5",0x3C5],
+  ["F6",0x3C6],
+  ["F7",0x3C7],
+  ["F8",0x3C8],
+  ["F9",0x3C9],
+  ["FA",0x3CA],
+  ["FB",0x3CB],
+  ["FC",0x3CC],
+  ["FD",0x3CD],
+  ["FE",0x3CE],
+]
diff --git a/enc/trans/iso-8859-8-tbl.rb b/enc/trans/iso-8859-8-tbl.rb
new file mode 100644
index 0000000000..d0806f4524
--- /dev/null
+++ b/enc/trans/iso-8859-8-tbl.rb
@@ -0,0 +1,62 @@
+ISO_8859_8_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AA",0xD7],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0xB9],
+  ["BA",0xF7],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["DF",0x2017],
+  ["E0",0x5D0],
+  ["E1",0x5D1],
+  ["E2",0x5D2],
+  ["E3",0x5D3],
+  ["E4",0x5D4],
+  ["E5",0x5D5],
+  ["E6",0x5D6],
+  ["E7",0x5D7],
+  ["E8",0x5D8],
+  ["E9",0x5D9],
+  ["EA",0x5DA],
+  ["EB",0x5DB],
+  ["EC",0x5DC],
+  ["ED",0x5DD],
+  ["EE",0x5DE],
+  ["EF",0x5DF],
+  ["F0",0x5E0],
+  ["F1",0x5E1],
+  ["F2",0x5E2],
+  ["F3",0x5E3],
+  ["F4",0x5E4],
+  ["F5",0x5E5],
+  ["F6",0x5E6],
+  ["F7",0x5E7],
+  ["F8",0x5E8],
+  ["F9",0x5E9],
+  ["FA",0x5EA],
+  ["FD",0x200E],
+  ["FE",0x200F],
+]
diff --git a/enc/trans/iso-8859-9-tbl.rb b/enc/trans/iso-8859-9-tbl.rb
new file mode 100644
index 0000000000..0cd92d61e9
--- /dev/null
+++ b/enc/trans/iso-8859-9-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_9_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AA",0xAA],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0xB9],
+  ["BA",0xBA],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["BF",0xBF],
+  ["C0",0xC0],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0xC7],
+  ["C8",0xC8],
+  ["C9",0xC9],
+  ["CA",0xCA],
+  ["CB",0xCB],
+  ["CC",0xCC],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D0",0x11E],
+  ["D1",0xD1],
+  ["D2",0xD2],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0xD8],
+  ["D9",0xD9],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0x130],
+  ["DE",0x15E],
+  ["DF",0xDF],
+  ["E0",0xE0],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EC",0xEC],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F0",0x11F],
+  ["F1",0xF1],
+  ["F2",0xF2],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0xF8],
+  ["F9",0xF9],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0x131],
+  ["FE",0x15F],
+  ["FF",0xFF],
+]
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
new file mode 100644
index 0000000000..3f40cce3c8
--- /dev/null
+++ b/enc/trans/iso2022.trans
@@ -0,0 +1,568 @@
+#include "transcode_data.h"
+
+<%
+  map = {
+    "1b2842" => :func_so,       # designate US-ASCII to G0.             "ESC ( B"
+    "1b284a" => :func_so,       # designate JIS X 0201 latin to G0.     "ESC ( J"
+    "1b2440" => :func_so,       # designate JIS X 0208 1978 to G0.      "ESC $ @"
+    "1b2442" => :func_so,       # designate JIS X 0208 1983 to G0.      "ESC $ B"
+    "{00-0d,10-1a,1c-7f}" => :func_si,
+  }
+  transcode_generate_node(ActionMap.parse(map), "iso2022jp_decoder")
+
+  map_jisx0208_rest = {
+    "{21-7e}" => :func_so
+  }
+  transcode_generate_node(ActionMap.parse(map_jisx0208_rest), "iso2022jp_decoder_jisx0208_rest")
+
+  map = {
+    "{00-0d,10-1a,1c-7f}" => :func_so,
+    "90{a1-fe}{a1-fe}" => :func_so,
+    "92{a1-fe}{a1-fe}" => :func_so,
+  }
+  transcode_generate_node(ActionMap.parse(map), "iso2022jp_encoder")
+
+  map = {
+    "{00-0d,10-1a,1c-7f}" => :nomap,
+    "90{a1-fe}{a1-fe}" => :func_so,
+    "92{a1-fe}{a1-fe}" => :func_so,
+  }
+  transcode_generate_node(ActionMap.parse(map), "stateless_iso2022jp_to_eucjp")
+
+  map = {
+    "{0e,0f,1b}" => :undef,
+    "{00-0d,10-1a,1c-7f}" => :nomap,
+    "{a1-fe}{a1-fe}" => :func_so,
+    "8e{a1-fe}" => :undef,
+    "8f{a1-fe}{a1-fe}" => :undef,
+  }
+  transcode_generate_node(ActionMap.parse(map), "eucjp_to_stateless_iso2022jp")
+
+  map = {
+    "1b2842" => :func_so,       # designate US-ASCII to G0.             "ESC ( B"
+    "1b2849" => :func_so,       # designate JIS X 0201 katakana to G0.  "ESC ( I"
+    "1b284a" => :func_so,       # designate JIS X 0201 latin to G0.     "ESC ( J"
+    "1b2440" => :func_so,       # designate JIS X 0208 1978 to G0.      "ESC $ @"
+    "1b2442" => :func_so,       # designate JIS X 0208 1983 to G0.      "ESC $ B"
+    "0e"     => :func_so,       # designate JIS X 0201 katakana to G0.  "SO"
+    "0f"     => :func_so,       # designate US-ASCII to G0.             "SI"
+    "{00-0d,10-1a,1c-92,a1-df}" => :func_si,
+  }
+  transcode_generate_node(ActionMap.parse(map), "cp50221_decoder")
+
+  map = {
+    "{0e,0f,1b}" => :undef,
+    "{00-0d,10-1a,1c-7f}" => :func_so,
+    "{a1-fe}{a1-fe}" => :func_so,
+    "8e{a1-fe}" => :func_so,
+  }
+  transcode_generate_node(ActionMap.parse(map), "cp50221_encoder")
+
+%>
+
+<%= transcode_generated_code %>
+
+#define G0_ASCII 0
+/* ignore JIS X 0201 latin */
+#define G0_JISX0208_1978 1
+#define G0_JISX0208_1983 2
+#define G0_JISX0201_KATAKANA 3
+
+#define EMACS_MULE_LEADING_CODE_JISX0208_1978   0220
+#define EMACS_MULE_LEADING_CODE_JISX0208_1983   0222
+
+static int
+iso2022jp_init(void *statep)
+{
+    unsigned char *sp = statep;
+    *sp = G0_ASCII;
+    return 0;
+}
+
+static VALUE
+fun_si_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l)
+{
+    unsigned char *sp = statep;
+    if (*sp == G0_ASCII)
+        return (VALUE)NOMAP;
+    else if (0x21 <= s[0] && s[0] <= 0x7e)
+        return (VALUE)iso2022jp_decoder_jisx0208_rest;
+    else
+        return (VALUE)INVALID;
+}
+
+static ssize_t
+fun_so_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l, unsigned char* o, size_t osize)
+{
+    unsigned char *sp = statep;
+    if (s[0] == 0x1b) {
+        if (s[1] == '(') {
+            switch (s[l-1]) {
+              case 'B':
+              case 'J':
+                *sp = G0_ASCII;
+                break;
+            }
+        }
+        else {
+            switch (s[l-1]) {
+              case '@':
+                *sp = G0_JISX0208_1978;
+                break;
+
+              case 'B':
+                *sp = G0_JISX0208_1983;
+                break;
+            }
+        }
+        return 0;
+    }
+    else {
+        if (*sp == G0_JISX0208_1978)
+            o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1978;
+        else
+            o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1983;
+        o[1] = s[0] | 0x80;
+        o[2] = s[1] | 0x80;
+        return 3;
+    }
+}
+
+static const rb_transcoder
+rb_iso2022jp_decoder = {
+    "ISO-2022-JP", "stateless-ISO-2022-JP", iso2022jp_decoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    3, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
+    NULL, fun_si_iso2022jp_decoder, NULL, fun_so_iso2022jp_decoder
+};
+
+static ssize_t
+fun_so_iso2022jp_encoder(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    unsigned char *output0 = o;
+    int newstate;
+
+    if (l == 1)
+        newstate = G0_ASCII;
+    else if (s[0] == EMACS_MULE_LEADING_CODE_JISX0208_1978)
+        newstate = G0_JISX0208_1978;
+    else
+        newstate = G0_JISX0208_1983;
+
+    if (*sp != newstate) {
+        if (newstate == G0_ASCII) {
+            *o++ = 0x1b;
+            *o++ = '(';
+            *o++ = 'B';
+        }
+        else if (newstate == G0_JISX0208_1978) {
+            *o++ = 0x1b;
+            *o++ = '$';
+            *o++ = '@';
+        }
+        else {
+            *o++ = 0x1b;
+            *o++ = '$';
+            *o++ = 'B';
+        }
+        *sp = newstate;
+    }
+
+    if (l == 1) {
+        *o++ = s[0] & 0x7f;
+    }
+    else {
+        *o++ = s[1] & 0x7f;
+        *o++ = s[2] & 0x7f;
+    }
+
+    return o - output0;
+}
+
+static ssize_t
+iso2022jp_encoder_reset_sequence_size(void *statep)
+{
+    unsigned char *sp = statep;
+    if (*sp != G0_ASCII)
+        return 3;
+    return 0;
+}
+
+static ssize_t
+finish_iso2022jp_encoder(void *statep, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    unsigned char *output0 = o;
+
+    if (*sp == G0_ASCII)
+        return 0;
+
+    *o++ = 0x1b;
+    *o++ = '(';
+    *o++ = 'B';
+    *sp = G0_ASCII;
+
+    return o - output0;
+}
+
+static const rb_transcoder
+rb_iso2022jp_encoder = {
+    "stateless-ISO-2022-JP", "ISO-2022-JP", iso2022jp_encoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    5, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_iso2022jp_encoder,
+    finish_iso2022jp_encoder,
+    iso2022jp_encoder_reset_sequence_size, finish_iso2022jp_encoder
+};
+
+static ssize_t
+fun_so_stateless_iso2022jp_to_eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    o[0] = s[1];
+    o[1] = s[2];
+    return 2;
+}
+
+static const rb_transcoder
+rb_stateless_iso2022jp_to_eucjp = {
+    "stateless-ISO-2022-JP", "EUC-JP", stateless_iso2022jp_to_eucjp,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    2, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_stateless_iso2022jp_to_eucjp,
+};
+
+static ssize_t
+fun_so_eucjp_to_stateless_iso2022jp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1983;
+    o[1] = s[0];
+    o[2] = s[1];
+    return 3;
+}
+
+static const rb_transcoder
+rb_eucjp_to_stateless_iso2022jp = {
+    "EUC-JP", "stateless-ISO-2022-JP", eucjp_to_stateless_iso2022jp,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    3, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_eucjp_to_stateless_iso2022jp,
+};
+
+static VALUE
+fun_si_cp50221_decoder(void *statep, const unsigned char *s, size_t l)
+{
+    unsigned char *sp = statep;
+    int c;
+    switch (*sp) {
+      case G0_ASCII:
+        if (0xA1 <= s[0] && s[0] <= 0xDF)
+            return (VALUE)FUNso;
+        return (VALUE)NOMAP;
+      case G0_JISX0201_KATAKANA:
+        c = s[0] & 0x7F;
+        if (0x21 <= c && c <= 0x5f)
+            return (VALUE)FUNso;
+        break;
+      case G0_JISX0208_1978:
+        if ((0x21 <= s[0] && s[0] <= 0x28) || (0x30 <= s[0] && s[0] <= 0x74))
+            return (VALUE)iso2022jp_decoder_jisx0208_rest;
+        break;
+      case G0_JISX0208_1983:
+        if ((0x21 <= s[0] && s[0] <= 0x28) ||
+                s[0] == 0x2D ||
+                (0x30 <= s[0] && s[0] <= 0x74) ||
+                (0x79 <= s[0] && s[0] <= 0x7C))
+                /* 0x7F <= s[0] && s[0] <= 0x92) */
+            return (VALUE)iso2022jp_decoder_jisx0208_rest;
+        break;
+    }
+    return (VALUE)INVALID;
+}
+
+static ssize_t
+fun_so_cp50221_decoder(void *statep, const unsigned char *s, size_t l, unsigned char* o, size_t osize)
+{
+    unsigned char *sp = statep;
+    switch (s[0]) {
+      case 0x1b:
+        if (s[1] == '(') {
+            switch (s[l-1]) {
+              case 'B':
+              case 'J':
+                *sp = G0_ASCII;
+                break;
+              case 'I':
+                *sp = G0_JISX0201_KATAKANA;
+                break;
+            }
+        }
+        else {
+            switch (s[l-1]) {
+              case '@':
+                *sp = G0_JISX0208_1978;
+                break;
+              case 'B':
+                *sp = G0_JISX0208_1983;
+                break;
+            }
+        }
+        return 0;
+      case 0x0E:
+        *sp = G0_JISX0201_KATAKANA;
+        return 0;
+      case 0x0F:
+        *sp = G0_ASCII;
+        return 0;
+      default:
+        if (*sp == G0_JISX0201_KATAKANA ||
+            (0xA1 <= s[0] && s[0] <= 0xDF && *sp == G0_ASCII)) {
+            o[0] = 0x8E;
+            o[1] = s[0] | 0x80;
+        }
+        /* else if (0x7F == s[0] && s[0] <= 0x88) { */
+            /* User Defined Characters */
+            /* o[n++] = s[0] | 0xE0; */
+            /* o[n++] = s[1] | 0x80; */
+        /* else if (0x89 <= s[0] && s[0] <= 0x92) { */
+            /* User Defined Characters 2 */
+            /* o[n++] = 0x8f; */
+            /* o[n++] = s[0] + 0x6C; */
+            /* o[n++] = s[1] | 0x80; */
+        /* } */
+        else {
+            /* JIS X 0208 */
+            /* NEC Special Characters */
+            /* NEC-selected IBM extended Characters */
+            o[0] = s[0] | 0x80;
+            o[1] = s[1] | 0x80;
+        }
+        return 2;
+    }
+}
+
+static const rb_transcoder
+rb_cp50220_decoder = {
+    "CP50220", "cp51932", cp50221_decoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    3, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
+    NULL, fun_si_cp50221_decoder, NULL, fun_so_cp50221_decoder
+};
+
+static const rb_transcoder
+rb_cp50221_decoder = {
+    "CP50221", "cp51932", cp50221_decoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    3, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
+    NULL, fun_si_cp50221_decoder, NULL, fun_so_cp50221_decoder
+};
+
+static ssize_t
+fun_so_cp5022x_encoder(void *statep, const unsigned char *s, size_t l,
+        unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    unsigned char *output0 = o;
+    int newstate;
+
+    if (l == 1)
+        newstate = G0_ASCII;
+    else if (s[0] == 0x8E) {
+        s++;
+        l = 1;
+        newstate = G0_JISX0201_KATAKANA;
+    }
+    else
+        newstate = G0_JISX0208_1983;
+
+    if (*sp != newstate) {
+        if (newstate == G0_ASCII) {
+            *o++ = 0x1b;
+            *o++ = '(';
+            *o++ = 'B';
+        }
+        else if (newstate == G0_JISX0201_KATAKANA) {
+            *o++ = 0x1b;
+            *o++ = '(';
+            *o++ = 'I';
+        }
+        else {
+            *o++ = 0x1b;
+            *o++ = '$';
+            *o++ = 'B';
+        }
+        *sp = newstate;
+    }
+
+    if (l == 1) {
+        *o++ = s[0] & 0x7f;
+    }
+    else {
+        *o++ = s[0] & 0x7f;
+        *o++ = s[1] & 0x7f;
+    }
+
+    return o - output0;
+}
+
+static const rb_transcoder
+rb_cp50221_encoder = {
+    "CP51932", "CP50221", cp50221_encoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    5, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_cp5022x_encoder,
+    finish_iso2022jp_encoder,
+    iso2022jp_encoder_reset_sequence_size, finish_iso2022jp_encoder
+};
+
+static const char *tbl0208 =
+    "\x21\x23\x21\x56\x21\x57\x21\x22\x21\x26\x25\x72\x25\x21\x25\x23" \
+    "\x25\x25\x25\x27\x25\x29\x25\x63\x25\x65\x25\x67\x25\x43\x21\x3C" \
+    "\x25\x22\x25\x24\x25\x26\x25\x28\x25\x2A\x25\x2B\x25\x2D\x25\x2F" \
+    "\x25\x31\x25\x33\x25\x35\x25\x37\x25\x39\x25\x3B\x25\x3D\x25\x3F" \
+    "\x25\x41\x25\x44\x25\x46\x25\x48\x25\x4A\x25\x4B\x25\x4C\x25\x4D" \
+    "\x25\x4E\x25\x4F\x25\x52\x25\x55\x25\x58\x25\x5B\x25\x5E\x25\x5F" \
+    "\x25\x60\x25\x61\x25\x62\x25\x64\x25\x66\x25\x68\x25\x69\x25\x6A" \
+    "\x25\x6B\x25\x6C\x25\x6D\x25\x6F\x25\x73\x21\x2B\x21\x2C";
+
+static ssize_t
+fun_so_cp50220_encoder(void *statep, const unsigned char *s, size_t l,
+                unsigned char *o, size_t osize)
+{
+    unsigned char *output0 = o;
+    unsigned char *sp = statep;
+
+    if (sp[0] == G0_JISX0201_KATAKANA) {
+        int c = sp[2] & 0x7F;
+        const char *p = tbl0208 + (c - 0x21) * 2;
+        if (sp[1] != G0_JISX0208_1983) {
+            *o++ = 0x1b;
+            *o++ = '$';
+            *o++ = 'B';
+        }
+        sp[0] = G0_JISX0208_1983;
+        *o++ = *p++;
+        if (l == 2 && s[0] == 0x8E) {
+            if (s[1] == 0xDE) {
+                *o++ = *p + 1;
+                return o - output0;
+            }
+            else if (s[1] == 0xDF && (0x4A <= c && c <= 0x4E)) {
+                *o++ = *p + 2;
+                return o - output0;
+            }
+        }
+        *o++ = *p;
+    }
+
+    if (l == 2 && s[0] == 0x8E) {
+        const char *p = tbl0208 + (s[1] - 0xA1) * 2;
+        if ((0xA1 <= s[1] && s[1] <= 0xB5) ||
+            (0xC5 <= s[1] && s[1] <= 0xC9) ||
+            (0xCF <= s[1] && s[1] <= 0xDF)) {
+            if (*sp != G0_JISX0208_1983) {
+                *o++ = 0x1b;
+                *o++ = '$';
+                *o++ = 'B';
+                *sp = G0_JISX0208_1983;
+            }
+            *o++ = *p++;
+            *o++ = *p;
+            return o - output0;
+        }
+
+        sp[2] = s[1];
+        sp[1] = sp[0];
+        sp[0] = G0_JISX0201_KATAKANA;
+        return o - output0;
+    }
+
+    o += fun_so_cp5022x_encoder(statep, s, l, o, osize);
+    return o - output0;
+}
+
+static ssize_t
+finish_cp50220_encoder(void *statep, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    unsigned char *output0 = o;
+
+    if (*sp == G0_ASCII)
+        return 0;
+
+    if (sp[0] == G0_JISX0201_KATAKANA) {
+        int c = sp[2] & 0x7F;
+        const char *p = tbl0208 + (c - 0x21) * 2;
+        if (sp[1] != G0_JISX0208_1983) {
+            *o++ = 0x1b;
+            *o++ = '$';
+            *o++ = 'B';
+        }
+        sp[0] = G0_JISX0208_1983;
+        *o++ = *p++;
+        *o++ = *p;
+    }
+
+    *o++ = 0x1b;
+    *o++ = '(';
+    *o++ = 'B';
+    *sp = G0_ASCII;
+
+    return o - output0;
+}
+
+static const rb_transcoder
+rb_cp50220_encoder = {
+    "CP51932", "CP50220", cp50221_encoder,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    5, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    3, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_cp50220_encoder,
+    finish_cp50220_encoder,
+    iso2022jp_encoder_reset_sequence_size, finish_cp50220_encoder
+};
+
+void
+Init_iso2022(void)
+{
+    rb_register_transcoder(&rb_iso2022jp_decoder);
+    rb_register_transcoder(&rb_iso2022jp_encoder);
+    rb_register_transcoder(&rb_stateless_iso2022jp_to_eucjp);
+    rb_register_transcoder(&rb_eucjp_to_stateless_iso2022jp);
+    rb_register_transcoder(&rb_cp50220_decoder);
+    rb_register_transcoder(&rb_cp50221_decoder);
+    rb_register_transcoder(&rb_cp50220_encoder);
+    rb_register_transcoder(&rb_cp50221_encoder);
+}
+
diff --git a/enc/trans/japanese.trans b/enc/trans/japanese.trans
new file mode 100644
index 0000000000..ce5d0bb70f
--- /dev/null
+++ b/enc/trans/japanese.trans
@@ -0,0 +1,98 @@
+#include "transcode_data.h"
+
+<%
+  map = {}
+  map["{00-7f}"] = :nomap
+  map["{a1-fe}{a1-fe}"] = :func_so
+  map["8e{a1-df}"] = :func_so
+  map["8e{e0-fe}"] = :undef
+  map["8f{a1-fe}{a1-fe}"] = :undef
+  transcode_generate_node(ActionMap.parse(map), "eucjp2sjis")
+
+  map = {}
+  map["{00-7f}"] = :nomap
+  map["{81-9f,e0-ef}{40-7e,80-fc}"] = :func_so
+  map["{f0-fc}{40-7e,80-fc}"] = :undef
+  map["{a1-df}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "sjis2eucjp")
+%>
+
+<%= transcode_generated_code %>
+
+static ssize_t
+fun_so_eucjp2sjis(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (s[0] == 0x8e) {
+        o[0] = s[1];
+        return 1;
+    }
+    else {
+        int h, m, l;
+        m = s[0] & 1;
+        h = (s[0]+m) >> 1;
+        h += s[0] < 0xdf ? 0x30 : 0x70;
+        l = s[1] - m * 94 - 3;
+        if (0x7f <= l)
+            l++;
+        o[0] = h;
+        o[1] = l;
+        return 2;
+    }
+}
+
+static ssize_t
+fun_so_sjis2eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (l == 1) {
+        o[0] = '\x8e';
+        o[1] = s[0];
+        return 2;
+    }
+    else {
+        int h, l;
+        h = s[0];
+        l = s[1];
+        if (0xe0 <= h)
+            h -= 64;
+        l += l < 0x80 ? 0x61 : 0x60;
+        h = h * 2 - 0x61;
+        if (0xfe < l) {
+            l -= 94;
+            h += 1;
+        }
+        o[0] = h;
+        o[1] = l;
+        return 2;
+    }
+}
+
+static const rb_transcoder
+rb_eucjp2sjis = {
+    "EUC-JP", "Shift_JIS", eucjp2sjis,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    3, /* max_input */
+    2, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_eucjp2sjis
+};
+
+static const rb_transcoder
+rb_sjis2eucjp = {
+    "Shift_JIS", "EUC-JP", sjis2eucjp,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    2, /* max_input */
+    2, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_sjis2eucjp
+};
+
+void
+Init_japanese(void)
+{
+    rb_register_transcoder(&rb_eucjp2sjis);
+    rb_register_transcoder(&rb_sjis2eucjp);
+}
diff --git a/enc/trans/japanese_euc.trans b/enc/trans/japanese_euc.trans
new file mode 100644
index 0000000000..a976fe57d3
--- /dev/null
+++ b/enc/trans/japanese_euc.trans
@@ -0,0 +1,46 @@
+#include "transcode_data.h"
+
+<%
+  transcode_tblgen "EUC-JP", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "JISX0208:1990/UCS") +
+  citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") +
+  citrus_decode_mapsrc("euc", 0x8000, "JISX0212/UCS")
+
+  transcode_tblgen "eucJP-ms", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,JISX0208UDC/UCS,JISX0208:MS/UCS") +
+  citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") +
+  citrus_decode_mapsrc("euc", 0x8000, "JISX0212VDC:IBM/UCS,JISX0212UDC/UCS,JISX0212:MS/UCS")
+
+  transcode_tblgen "CP51932", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,JISX0208:MS/UCS") +
+  citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS")
+
+
+  transcode_tblgen "UTF-8", "EUC-JP",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:1990") +
+  citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") +
+  citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212")
+
+  transcode_tblgen "UTF-8", "eucJP-ms",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/JISX0208UDC") +
+  citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") +
+  citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212VDC:IBM,UCS/JISX0212UDC,UCS/JISX0212:MS")
+
+  transcode_tblgen "UTF-8", "CP51932",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/CP932VDC:NEC_IBM") +
+  citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA")
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_japanese_euc(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/japanese_sjis.trans b/enc/trans/japanese_sjis.trans
new file mode 100644
index 0000000000..00eace27a3
--- /dev/null
+++ b/enc/trans/japanese_sjis.trans
@@ -0,0 +1,34 @@
+#include "transcode_data.h"
+
+<%
+  transcode_tblgen "Shift_JIS", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") +
+  citrus_decode_mapsrc("mskanji", 2, "JISX0208:1990/UCS")
+
+  transcode_tblgen "Windows-31J", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") +
+  citrus_decode_mapsrc("mskanji", 2,
+    "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,CP932VDC:IBM/UCS,CP932UDA/UCS,JISX0208:MS/UCS")
+
+
+  transcode_tblgen "UTF-8", "Shift_JIS",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") +
+  citrus_decode_mapsrc("mskanji", 2, "UCS/JISX0208:1990")
+
+  transcode_tblgen "UTF-8", "Windows-31J",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") +
+  citrus_decode_mapsrc("mskanji", 2,
+    "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/CP932VDC:IBM,UCS/CP932VDC:NEC_IBM,UCS/CP932UDA")
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_japanese_sjis(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/koi8-r-tbl.rb b/enc/trans/koi8-r-tbl.rb
new file mode 100644
index 0000000000..a1f55ff2e3
--- /dev/null
+++ b/enc/trans/koi8-r-tbl.rb
@@ -0,0 +1,130 @@
+KOI8_R_TO_UCS_TBL = [
+  ["9A",0xA0],
+  ["BF",0xA9],
+  ["9C",0xB0],
+  ["9D",0xB2],
+  ["9E",0xB7],
+  ["9F",0xF7],
+  ["B3",0x401],
+  ["E1",0x410],
+  ["E2",0x411],
+  ["F7",0x412],
+  ["E7",0x413],
+  ["E4",0x414],
+  ["E5",0x415],
+  ["F6",0x416],
+  ["FA",0x417],
+  ["E9",0x418],
+  ["EA",0x419],
+  ["EB",0x41A],
+  ["EC",0x41B],
+  ["ED",0x41C],
+  ["EE",0x41D],
+  ["EF",0x41E],
+  ["F0",0x41F],
+  ["F2",0x420],
+  ["F3",0x421],
+  ["F4",0x422],
+  ["F5",0x423],
+  ["E6",0x424],
+  ["E8",0x425],
+  ["E3",0x426],
+  ["FE",0x427],
+  ["FB",0x428],
+  ["FD",0x429],
+  ["FF",0x42A],
+  ["F9",0x42B],
+  ["F8",0x42C],
+  ["FC",0x42D],
+  ["E0",0x42E],
+  ["F1",0x42F],
+  ["C1",0x430],
+  ["C2",0x431],
+  ["D7",0x432],
+  ["C7",0x433],
+  ["C4",0x434],
+  ["C5",0x435],
+  ["D6",0x436],
+  ["DA",0x437],
+  ["C9",0x438],
+  ["CA",0x439],
+  ["CB",0x43A],
+  ["CC",0x43B],
+  ["CD",0x43C],
+  ["CE",0x43D],
+  ["CF",0x43E],
+  ["D0",0x43F],
+  ["D2",0x440],
+  ["D3",0x441],
+  ["D4",0x442],
+  ["D5",0x443],
+  ["C6",0x444],
+  ["C8",0x445],
+  ["C3",0x446],
+  ["DE",0x447],
+  ["DB",0x448],
+  ["DD",0x449],
+  ["DF",0x44A],
+  ["D9",0x44B],
+  ["D8",0x44C],
+  ["DC",0x44D],
+  ["C0",0x44E],
+  ["D1",0x44F],
+  ["A3",0x451],
+  ["95",0x2219],
+  ["96",0x221A],
+  ["97",0x2248],
+  ["98",0x2264],
+  ["99",0x2265],
+  ["93",0x2320],
+  ["9B",0x2321],
+  ["80",0x2500],
+  ["81",0x2502],
+  ["82",0x250C],
+  ["83",0x2510],
+  ["84",0x2514],
+  ["85",0x2518],
+  ["86",0x251C],
+  ["87",0x2524],
+  ["88",0x252C],
+  ["89",0x2534],
+  ["8A",0x253C],
+  ["A0",0x2550],
+  ["A1",0x2551],
+  ["A2",0x2552],
+  ["A4",0x2553],
+  ["A5",0x2554],
+  ["A6",0x2555],
+  ["A7",0x2556],
+  ["A8",0x2557],
+  ["A9",0x2558],
+  ["AA",0x2559],
+  ["AB",0x255A],
+  ["AC",0x255B],
+  ["AD",0x255C],
+  ["AE",0x255D],
+  ["AF",0x255E],
+  ["B0",0x255F],
+  ["B1",0x2560],
+  ["B2",0x2561],
+  ["B4",0x2562],
+  ["B5",0x2563],
+  ["B6",0x2564],
+  ["B7",0x2565],
+  ["B8",0x2566],
+  ["B9",0x2567],
+  ["BA",0x2568],
+  ["BB",0x2569],
+  ["BC",0x256A],
+  ["BD",0x256B],
+  ["BE",0x256C],
+  ["8B",0x2580],
+  ["8C",0x2584],
+  ["8D",0x2588],
+  ["8E",0x258C],
+  ["8F",0x2590],
+  ["90",0x2591],
+  ["91",0x2592],
+  ["92",0x2593],
+  ["94",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/koi8-u-tbl.rb b/enc/trans/koi8-u-tbl.rb
new file mode 100644
index 0000000000..e87aa1aa3f
--- /dev/null
+++ b/enc/trans/koi8-u-tbl.rb
@@ -0,0 +1,130 @@
+KOI8_U_TO_UCS_TBL = [
+  ["9A",0xA0],
+  ["BF",0xA9],
+  ["9C",0xB0],
+  ["9D",0xB2],
+  ["9E",0xB7],
+  ["9F",0xF7],
+  ["B3",0x401],
+  ["B4",0x404],
+  ["B6",0x406],
+  ["B7",0x407],
+  ["E1",0x410],
+  ["E2",0x411],
+  ["F7",0x412],
+  ["E7",0x413],
+  ["E4",0x414],
+  ["E5",0x415],
+  ["F6",0x416],
+  ["FA",0x417],
+  ["E9",0x418],
+  ["EA",0x419],
+  ["EB",0x41A],
+  ["EC",0x41B],
+  ["ED",0x41C],
+  ["EE",0x41D],
+  ["EF",0x41E],
+  ["F0",0x41F],
+  ["F2",0x420],
+  ["F3",0x421],
+  ["F4",0x422],
+  ["F5",0x423],
+  ["E6",0x424],
+  ["E8",0x425],
+  ["E3",0x426],
+  ["FE",0x427],
+  ["FB",0x428],
+  ["FD",0x429],
+  ["FF",0x42A],
+  ["F9",0x42B],
+  ["F8",0x42C],
+  ["FC",0x42D],
+  ["E0",0x42E],
+  ["F1",0x42F],
+  ["C1",0x430],
+  ["C2",0x431],
+  ["D7",0x432],
+  ["C7",0x433],
+  ["C4",0x434],
+  ["C5",0x435],
+  ["D6",0x436],
+  ["DA",0x437],
+  ["C9",0x438],
+  ["CA",0x439],
+  ["CB",0x43A],
+  ["CC",0x43B],
+  ["CD",0x43C],
+  ["CE",0x43D],
+  ["CF",0x43E],
+  ["D0",0x43F],
+  ["D2",0x440],
+  ["D3",0x441],
+  ["D4",0x442],
+  ["D5",0x443],
+  ["C6",0x444],
+  ["C8",0x445],
+  ["C3",0x446],
+  ["DE",0x447],
+  ["DB",0x448],
+  ["DD",0x449],
+  ["DF",0x44A],
+  ["D9",0x44B],
+  ["D8",0x44C],
+  ["DC",0x44D],
+  ["C0",0x44E],
+  ["D1",0x44F],
+  ["A3",0x451],
+  ["A4",0x454],
+  ["A6",0x456],
+  ["A7",0x457],
+  ["BD",0x490],
+  ["AD",0x491],
+  ["95",0x2219],
+  ["96",0x221A],
+  ["97",0x2248],
+  ["98",0x2264],
+  ["99",0x2265],
+  ["93",0x2320],
+  ["9B",0x2321],
+  ["80",0x2500],
+  ["81",0x2502],
+  ["82",0x250C],
+  ["83",0x2510],
+  ["84",0x2514],
+  ["85",0x2518],
+  ["86",0x251C],
+  ["87",0x2524],
+  ["88",0x252C],
+  ["89",0x2534],
+  ["8A",0x253C],
+  ["A0",0x2550],
+  ["A1",0x2551],
+  ["A2",0x2552],
+  ["A5",0x2554],
+  ["A8",0x2557],
+  ["A9",0x2558],
+  ["AA",0x2559],
+  ["AB",0x255A],
+  ["AC",0x255B],
+  ["AE",0x255D],
+  ["AF",0x255E],
+  ["B0",0x255F],
+  ["B1",0x2560],
+  ["B2",0x2561],
+  ["B5",0x2563],
+  ["B8",0x2566],
+  ["B9",0x2567],
+  ["BA",0x2568],
+  ["BB",0x2569],
+  ["BC",0x256A],
+  ["BE",0x256C],
+  ["8B",0x2580],
+  ["8C",0x2584],
+  ["8D",0x2588],
+  ["8E",0x258C],
+  ["8F",0x2590],
+  ["90",0x2591],
+  ["91",0x2592],
+  ["92",0x2593],
+  ["94",0x25A0],
+]
+\ No newline at end of file
diff --git a/enc/trans/korean.trans b/enc/trans/korean.trans
new file mode 100644
index 0000000000..ef1cdfcb8e
--- /dev/null
+++ b/enc/trans/korean.trans
@@ -0,0 +1,19 @@
+#include "transcode_data.h"
+
+<%
+  require "euckr-tbl"
+  require "cp949-tbl"
+
+  transcode_tblgen "UTF-8", "EUC-KR", [["{00-7f}", :nomap], *UCS_TO_EUCKR_TBL]
+  transcode_tblgen "EUC-KR", "UTF-8", [["{00-7f}", :nomap], *EUCKR_TO_UCS_TBL]
+  transcode_tblgen "UTF-8", "CP949", [["{00-7f}", :nomap], *UCS_TO_CP949_TBL]
+  transcode_tblgen "CP949", "UTF-8", [["{00-7f}", :nomap], *CP949_TO_UCS_TBL]
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_korean(void)
+{
+<%= transcode_register_code %>
+}
diff --git a/enc/trans/maccroatian-tbl.rb b/enc/trans/maccroatian-tbl.rb
new file mode 100644
index 0000000000..359878ec1f
--- /dev/null
+++ b/enc/trans/maccroatian-tbl.rb
@@ -0,0 +1,129 @@
+MACCROATIAN_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["C1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["DB",0xA4],
+  ["A4",0xA7],
+  ["AC",0xA8],
+  ["D9",0xA9],
+  ["BB",0xAA],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["A8",0xAE],
+  ["F8",0xAF],
+  ["A1",0xB0],
+  ["B1",0xB1],
+  ["AB",0xB4],
+  ["B5",0xB5],
+  ["A6",0xB6],
+  ["E1",0xB7],
+  ["FC",0xB8],
+  ["BC",0xBA],
+  ["DF",0xBB],
+  ["C0",0xBF],
+  ["CB",0xC0],
+  ["E7",0xC1],
+  ["E5",0xC2],
+  ["CC",0xC3],
+  ["80",0xC4],
+  ["81",0xC5],
+  ["DE",0xC6],
+  ["82",0xC7],
+  ["E9",0xC8],
+  ["83",0xC9],
+  ["FD",0xCA],
+  ["FA",0xCB],
+  ["ED",0xCC],
+  ["EA",0xCD],
+  ["EB",0xCE],
+  ["EC",0xCF],
+  ["84",0xD1],
+  ["F1",0xD2],
+  ["EE",0xD3],
+  ["EF",0xD4],
+  ["CD",0xD5],
+  ["85",0xD6],
+  ["AF",0xD8],
+  ["F4",0xD9],
+  ["F2",0xDA],
+  ["F3",0xDB],
+  ["86",0xDC],
+  ["A7",0xDF],
+  ["88",0xE0],
+  ["87",0xE1],
+  ["89",0xE2],
+  ["8B",0xE3],
+  ["8A",0xE4],
+  ["8C",0xE5],
+  ["FE",0xE6],
+  ["8D",0xE7],
+  ["8F",0xE8],
+  ["8E",0xE9],
+  ["90",0xEA],
+  ["91",0xEB],
+  ["93",0xEC],
+  ["92",0xED],
+  ["94",0xEE],
+  ["95",0xEF],
+  ["96",0xF1],
+  ["98",0xF2],
+  ["97",0xF3],
+  ["99",0xF4],
+  ["9B",0xF5],
+  ["9A",0xF6],
+  ["D6",0xF7],
+  ["BF",0xF8],
+  ["9D",0xF9],
+  ["9C",0xFA],
+  ["9E",0xFB],
+  ["9F",0xFC],
+  ["C6",0x106],
+  ["E6",0x107],
+  ["C8",0x10C],
+  ["E8",0x10D],
+  ["D0",0x110],
+  ["F0",0x111],
+  ["F5",0x131],
+  ["CE",0x152],
+  ["CF",0x153],
+  ["A9",0x160],
+  ["B9",0x161],
+  ["AE",0x17D],
+  ["BE",0x17E],
+  ["C4",0x192],
+  ["F6",0x2C6],
+  ["FF",0x2C7],
+  ["FB",0x2DA],
+  ["F7",0x2DC],
+  ["F9",0x3C0],
+  ["E0",0x2013],
+  ["D1",0x2014],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["E2",0x201A],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["E3",0x201E],
+  ["A0",0x2020],
+  ["A5",0x2022],
+  ["C9",0x2026],
+  ["E4",0x2030],
+  ["DC",0x2039],
+  ["DD",0x203A],
+  ["DA",0x2044],
+  ["AA",0x2122],
+  ["BD",0x2126],
+  ["B6",0x2202],
+  ["B4",0x2206],
+  ["B8",0x220F],
+  ["B7",0x2211],
+  ["C3",0x221A],
+  ["B0",0x221E],
+  ["BA",0x222B],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+  ["D7",0x25CA],
+]
+\ No newline at end of file
diff --git a/enc/trans/maccyrillic-tbl.rb b/enc/trans/maccyrillic-tbl.rb
new file mode 100644
index 0000000000..378aa8c3bc
--- /dev/null
+++ b/enc/trans/maccyrillic-tbl.rb
@@ -0,0 +1,130 @@
+MACCYRILLIC_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["FF",0xA4],
+  ["A4",0xA7],
+  ["A9",0xA9],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["A8",0xAE],
+  ["A1",0xB0],
+  ["B1",0xB1],
+  ["B5",0xB5],
+  ["A6",0xB6],
+  ["C8",0xBB],
+  ["D6",0xF7],
+  ["C4",0x192],
+  ["DD",0x401],
+  ["AB",0x402],
+  ["AE",0x403],
+  ["B8",0x404],
+  ["C1",0x405],
+  ["A7",0x406],
+  ["BA",0x407],
+  ["B7",0x408],
+  ["BC",0x409],
+  ["BE",0x40A],
+  ["CB",0x40B],
+  ["CD",0x40C],
+  ["D8",0x40E],
+  ["DA",0x40F],
+  ["80",0x410],
+  ["81",0x411],
+  ["82",0x412],
+  ["83",0x413],
+  ["84",0x414],
+  ["85",0x415],
+  ["86",0x416],
+  ["87",0x417],
+  ["88",0x418],
+  ["89",0x419],
+  ["8A",0x41A],
+  ["8B",0x41B],
+  ["8C",0x41C],
+  ["8D",0x41D],
+  ["8E",0x41E],
+  ["8F",0x41F],
+  ["90",0x420],
+  ["91",0x421],
+  ["92",0x422],
+  ["93",0x423],
+  ["94",0x424],
+  ["95",0x425],
+  ["96",0x426],
+  ["97",0x427],
+  ["98",0x428],
+  ["99",0x429],
+  ["9A",0x42A],
+  ["9B",0x42B],
+  ["9C",0x42C],
+  ["9D",0x42D],
+  ["9E",0x42E],
+  ["9F",0x42F],
+  ["E0",0x430],
+  ["E1",0x431],
+  ["E2",0x432],
+  ["E3",0x433],
+  ["E4",0x434],
+  ["E5",0x435],
+  ["E6",0x436],
+  ["E7",0x437],
+  ["E8",0x438],
+  ["E9",0x439],
+  ["EA",0x43A],
+  ["EB",0x43B],
+  ["EC",0x43C],
+  ["ED",0x43D],
+  ["EE",0x43E],
+  ["EF",0x43F],
+  ["F0",0x440],
+  ["F1",0x441],
+  ["F2",0x442],
+  ["F3",0x443],
+  ["F4",0x444],
+  ["F5",0x445],
+  ["F6",0x446],
+  ["F7",0x447],
+  ["F8",0x448],
+  ["F9",0x449],
+  ["FA",0x44A],
+  ["FB",0x44B],
+  ["FC",0x44C],
+  ["FD",0x44D],
+  ["FE",0x44E],
+  ["DF",0x44F],
+  ["DE",0x451],
+  ["AC",0x452],
+  ["AF",0x453],
+  ["B9",0x454],
+  ["CF",0x455],
+  ["B4",0x456],
+  ["BB",0x457],
+  ["C0",0x458],
+  ["BD",0x459],
+  ["BF",0x45A],
+  ["CC",0x45B],
+  ["CE",0x45C],
+  ["D9",0x45E],
+  ["DB",0x45F],
+  ["D0",0x2013],
+  ["D1",0x2014],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["D7",0x201E],
+  ["A0",0x2020],
+  ["A5",0x2022],
+  ["C9",0x2026],
+  ["DC",0x2116],
+  ["AA",0x2122],
+  ["B6",0x2202],
+  ["C6",0x2206],
+  ["C3",0x221A],
+  ["B0",0x221E],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+]
+\ No newline at end of file
diff --git a/enc/trans/macgreek-tbl.rb b/enc/trans/macgreek-tbl.rb
new file mode 100644
index 0000000000..7f75fde6d2
--- /dev/null
+++ b/enc/trans/macgreek-tbl.rb
@@ -0,0 +1,129 @@
+MACGREEK_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["92",0xA3],
+  ["B4",0xA5],
+  ["9B",0xA6],
+  ["AC",0xA7],
+  ["8C",0xA8],
+  ["A9",0xA9],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["9C",0xAD],
+  ["A8",0xAE],
+  ["AE",0xB0],
+  ["B1",0xB1],
+  ["82",0xB2],
+  ["84",0xB3],
+  ["81",0xB9],
+  ["C8",0xBB],
+  ["97",0xBD],
+  ["80",0xC4],
+  ["83",0xC9],
+  ["85",0xD6],
+  ["86",0xDC],
+  ["A7",0xDF],
+  ["88",0xE0],
+  ["89",0xE2],
+  ["8A",0xE4],
+  ["8D",0xE7],
+  ["8F",0xE8],
+  ["8E",0xE9],
+  ["90",0xEA],
+  ["91",0xEB],
+  ["94",0xEE],
+  ["95",0xEF],
+  ["99",0xF4],
+  ["9A",0xF6],
+  ["D6",0xF7],
+  ["9D",0xF9],
+  ["9E",0xFB],
+  ["9F",0xFC],
+  ["CF",0x153],
+  ["8B",0x384],
+  ["87",0x385],
+  ["CD",0x386],
+  ["AF",0x387],
+  ["CE",0x388],
+  ["D7",0x389],
+  ["D8",0x38A],
+  ["D9",0x38C],
+  ["DA",0x38E],
+  ["DF",0x38F],
+  ["FD",0x390],
+  ["B0",0x391],
+  ["B5",0x392],
+  ["A1",0x393],
+  ["A2",0x394],
+  ["B6",0x395],
+  ["B7",0x396],
+  ["B8",0x397],
+  ["A3",0x398],
+  ["B9",0x399],
+  ["BA",0x39A],
+  ["A4",0x39B],
+  ["BB",0x39C],
+  ["C1",0x39D],
+  ["A5",0x39E],
+  ["C3",0x39F],
+  ["A6",0x3A0],
+  ["C4",0x3A1],
+  ["AA",0x3A3],
+  ["C6",0x3A4],
+  ["CB",0x3A5],
+  ["BC",0x3A6],
+  ["CC",0x3A7],
+  ["BE",0x3A8],
+  ["BF",0x3A9],
+  ["AB",0x3AA],
+  ["BD",0x3AB],
+  ["C0",0x3AC],
+  ["DB",0x3AD],
+  ["DC",0x3AE],
+  ["DD",0x3AF],
+  ["FE",0x3B0],
+  ["E1",0x3B1],
+  ["E2",0x3B2],
+  ["E7",0x3B3],
+  ["E4",0x3B4],
+  ["E5",0x3B5],
+  ["FA",0x3B6],
+  ["E8",0x3B7],
+  ["F5",0x3B8],
+  ["E9",0x3B9],
+  ["EB",0x3BA],
+  ["EC",0x3BB],
+  ["ED",0x3BC],
+  ["EE",0x3BD],
+  ["EA",0x3BE],
+  ["EF",0x3BF],
+  ["F0",0x3C0],
+  ["F2",0x3C1],
+  ["F7",0x3C2],
+  ["F3",0x3C3],
+  ["F4",0x3C4],
+  ["F9",0x3C5],
+  ["E6",0x3C6],
+  ["F8",0x3C7],
+  ["E3",0x3C8],
+  ["F6",0x3C9],
+  ["FB",0x3CA],
+  ["FC",0x3CB],
+  ["DE",0x3CC],
+  ["E0",0x3CD],
+  ["F1",0x3CE],
+  ["D0",0x2013],
+  ["D1",0x2015],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["A0",0x2020],
+  ["96",0x2022],
+  ["C9",0x2026],
+  ["98",0x2030],
+  ["93",0x2122],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+]
+\ No newline at end of file
diff --git a/enc/trans/maciceland-tbl.rb b/enc/trans/maciceland-tbl.rb
new file mode 100644
index 0000000000..818d992274
--- /dev/null
+++ b/enc/trans/maciceland-tbl.rb
@@ -0,0 +1,129 @@
+MACICELAND_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["C1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["DB",0xA4],
+  ["B4",0xA5],
+  ["A4",0xA7],
+  ["AC",0xA8],
+  ["A9",0xA9],
+  ["BB",0xAA],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["A8",0xAE],
+  ["F8",0xAF],
+  ["A1",0xB0],
+  ["B1",0xB1],
+  ["AB",0xB4],
+  ["B5",0xB5],
+  ["A6",0xB6],
+  ["E1",0xB7],
+  ["FC",0xB8],
+  ["BC",0xBA],
+  ["C8",0xBB],
+  ["C0",0xBF],
+  ["CB",0xC0],
+  ["E7",0xC1],
+  ["E5",0xC2],
+  ["CC",0xC3],
+  ["80",0xC4],
+  ["81",0xC5],
+  ["AE",0xC6],
+  ["82",0xC7],
+  ["E9",0xC8],
+  ["83",0xC9],
+  ["E6",0xCA],
+  ["E8",0xCB],
+  ["ED",0xCC],
+  ["EA",0xCD],
+  ["EB",0xCE],
+  ["EC",0xCF],
+  ["DC",0xD0],
+  ["84",0xD1],
+  ["F1",0xD2],
+  ["EE",0xD3],
+  ["EF",0xD4],
+  ["CD",0xD5],
+  ["85",0xD6],
+  ["AF",0xD8],
+  ["F4",0xD9],
+  ["F2",0xDA],
+  ["F3",0xDB],
+  ["86",0xDC],
+  ["A0",0xDD],
+  ["DE",0xDE],
+  ["A7",0xDF],
+  ["88",0xE0],
+  ["87",0xE1],
+  ["89",0xE2],
+  ["8B",0xE3],
+  ["8A",0xE4],
+  ["8C",0xE5],
+  ["BE",0xE6],
+  ["8D",0xE7],
+  ["8F",0xE8],
+  ["8E",0xE9],
+  ["90",0xEA],
+  ["91",0xEB],
+  ["93",0xEC],
+  ["92",0xED],
+  ["94",0xEE],
+  ["95",0xEF],
+  ["DD",0xF0],
+  ["96",0xF1],
+  ["98",0xF2],
+  ["97",0xF3],
+  ["99",0xF4],
+  ["9B",0xF5],
+  ["9A",0xF6],
+  ["D6",0xF7],
+  ["BF",0xF8],
+  ["9D",0xF9],
+  ["9C",0xFA],
+  ["9E",0xFB],
+  ["9F",0xFC],
+  ["E0",0xFD],
+  ["DF",0xFE],
+  ["D8",0xFF],
+  ["F5",0x131],
+  ["CE",0x152],
+  ["CF",0x153],
+  ["D9",0x178],
+  ["C4",0x192],
+  ["F6",0x2C6],
+  ["FF",0x2C7],
+  ["F9",0x2D8],
+  ["FA",0x2D9],
+  ["FB",0x2DA],
+  ["FE",0x2DB],
+  ["F7",0x2DC],
+  ["FD",0x2DD],
+  ["B9",0x3C0],
+  ["D0",0x2013],
+  ["D1",0x2014],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["E2",0x201A],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["E3",0x201E],
+  ["A5",0x2022],
+  ["C9",0x2026],
+  ["E4",0x2030],
+  ["DA",0x2044],
+  ["AA",0x2122],
+  ["BD",0x2126],
+  ["B6",0x2202],
+  ["C6",0x2206],
+  ["B8",0x220F],
+  ["B7",0x2211],
+  ["C3",0x221A],
+  ["B0",0x221E],
+  ["BA",0x222B],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+  ["D7",0x25CA],
+]
+\ No newline at end of file
diff --git a/enc/trans/macroman-tbl.rb b/enc/trans/macroman-tbl.rb
new file mode 100644
index 0000000000..8f74eea27f
--- /dev/null
+++ b/enc/trans/macroman-tbl.rb
@@ -0,0 +1,129 @@
+MACROMAN_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["C1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["DB",0xA4],
+  ["B4",0xA5],
+  ["A4",0xA7],
+  ["AC",0xA8],
+  ["A9",0xA9],
+  ["BB",0xAA],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["A8",0xAE],
+  ["F8",0xAF],
+  ["A1",0xB0],
+  ["B1",0xB1],
+  ["AB",0xB4],
+  ["B5",0xB5],
+  ["A6",0xB6],
+  ["E1",0xB7],
+  ["FC",0xB8],
+  ["BC",0xBA],
+  ["C8",0xBB],
+  ["C0",0xBF],
+  ["CB",0xC0],
+  ["E7",0xC1],
+  ["E5",0xC2],
+  ["CC",0xC3],
+  ["80",0xC4],
+  ["81",0xC5],
+  ["AE",0xC6],
+  ["82",0xC7],
+  ["E9",0xC8],
+  ["83",0xC9],
+  ["E6",0xCA],
+  ["E8",0xCB],
+  ["ED",0xCC],
+  ["EA",0xCD],
+  ["EB",0xCE],
+  ["EC",0xCF],
+  ["84",0xD1],
+  ["F1",0xD2],
+  ["EE",0xD3],
+  ["EF",0xD4],
+  ["CD",0xD5],
+  ["85",0xD6],
+  ["AF",0xD8],
+  ["F4",0xD9],
+  ["F2",0xDA],
+  ["F3",0xDB],
+  ["86",0xDC],
+  ["A7",0xDF],
+  ["88",0xE0],
+  ["87",0xE1],
+  ["89",0xE2],
+  ["8B",0xE3],
+  ["8A",0xE4],
+  ["8C",0xE5],
+  ["BE",0xE6],
+  ["8D",0xE7],
+  ["8F",0xE8],
+  ["8E",0xE9],
+  ["90",0xEA],
+  ["91",0xEB],
+  ["93",0xEC],
+  ["92",0xED],
+  ["94",0xEE],
+  ["95",0xEF],
+  ["96",0xF1],
+  ["98",0xF2],
+  ["97",0xF3],
+  ["99",0xF4],
+  ["9B",0xF5],
+  ["9A",0xF6],
+  ["D6",0xF7],
+  ["BF",0xF8],
+  ["9D",0xF9],
+  ["9C",0xFA],
+  ["9E",0xFB],
+  ["9F",0xFC],
+  ["D8",0xFF],
+  ["F5",0x131],
+  ["CE",0x152],
+  ["CF",0x153],
+  ["D9",0x178],
+  ["C4",0x192],
+  ["F6",0x2C6],
+  ["FF",0x2C7],
+  ["F9",0x2D8],
+  ["FA",0x2D9],
+  ["FB",0x2DA],
+  ["FE",0x2DB],
+  ["F7",0x2DC],
+  ["FD",0x2DD],
+  ["B9",0x3C0],
+  ["D0",0x2013],
+  ["D1",0x2014],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["E2",0x201A],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["E3",0x201E],
+  ["A0",0x2020],
+  ["E0",0x2021],
+  ["A5",0x2022],
+  ["C9",0x2026],
+  ["E4",0x2030],
+  ["DC",0x2039],
+  ["DD",0x203A],
+  ["DA",0x2044],
+  ["AA",0x2122],
+  ["BD",0x2126],
+  ["B6",0x2202],
+  ["C6",0x2206],
+  ["B8",0x220F],
+  ["B7",0x2211],
+  ["C3",0x221A],
+  ["B0",0x221E],
+  ["BA",0x222B],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+  ["D7",0x25CA],
+  ["DE",0xFB01],
+  ["DF",0xFB02],
+]
+\ No newline at end of file
diff --git a/enc/trans/macromania-tbl.rb b/enc/trans/macromania-tbl.rb
new file mode 100644
index 0000000000..ff95c5e957
--- /dev/null
+++ b/enc/trans/macromania-tbl.rb
@@ -0,0 +1,129 @@
+MACROMANIA_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["C1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["DB",0xA4],
+  ["B4",0xA5],
+  ["A4",0xA7],
+  ["AC",0xA8],
+  ["A9",0xA9],
+  ["BB",0xAA],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["A8",0xAE],
+  ["F8",0xAF],
+  ["A1",0xB0],
+  ["B1",0xB1],
+  ["AB",0xB4],
+  ["B5",0xB5],
+  ["A6",0xB6],
+  ["E1",0xB7],
+  ["FC",0xB8],
+  ["BC",0xBA],
+  ["C8",0xBB],
+  ["C0",0xBF],
+  ["CB",0xC0],
+  ["E7",0xC1],
+  ["E5",0xC2],
+  ["CC",0xC3],
+  ["80",0xC4],
+  ["81",0xC5],
+  ["82",0xC7],
+  ["E9",0xC8],
+  ["83",0xC9],
+  ["E6",0xCA],
+  ["E8",0xCB],
+  ["ED",0xCC],
+  ["EA",0xCD],
+  ["EB",0xCE],
+  ["EC",0xCF],
+  ["84",0xD1],
+  ["F1",0xD2],
+  ["EE",0xD3],
+  ["EF",0xD4],
+  ["CD",0xD5],
+  ["85",0xD6],
+  ["F4",0xD9],
+  ["F2",0xDA],
+  ["F3",0xDB],
+  ["86",0xDC],
+  ["A7",0xDF],
+  ["88",0xE0],
+  ["87",0xE1],
+  ["89",0xE2],
+  ["8B",0xE3],
+  ["8A",0xE4],
+  ["8C",0xE5],
+  ["8D",0xE7],
+  ["8F",0xE8],
+  ["8E",0xE9],
+  ["90",0xEA],
+  ["91",0xEB],
+  ["93",0xEC],
+  ["92",0xED],
+  ["94",0xEE],
+  ["95",0xEF],
+  ["96",0xF1],
+  ["98",0xF2],
+  ["97",0xF3],
+  ["99",0xF4],
+  ["9B",0xF5],
+  ["9A",0xF6],
+  ["D6",0xF7],
+  ["9D",0xF9],
+  ["9C",0xFA],
+  ["9E",0xFB],
+  ["9F",0xFC],
+  ["D8",0xFF],
+  ["AE",0x102],
+  ["BE",0x103],
+  ["F5",0x131],
+  ["CE",0x152],
+  ["CF",0x153],
+  ["AF",0x15E],
+  ["BF",0x15F],
+  ["DE",0x162],
+  ["DF",0x163],
+  ["D9",0x178],
+  ["C4",0x192],
+  ["F6",0x2C6],
+  ["FF",0x2C7],
+  ["F9",0x2D8],
+  ["FA",0x2D9],
+  ["FB",0x2DA],
+  ["FE",0x2DB],
+  ["F7",0x2DC],
+  ["FD",0x2DD],
+  ["B9",0x3C0],
+  ["D0",0x2013],
+  ["D1",0x2014],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["E2",0x201A],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["E3",0x201E],
+  ["A0",0x2020],
+  ["E0",0x2021],
+  ["A5",0x2022],
+  ["C9",0x2026],
+  ["E4",0x2030],
+  ["DC",0x2039],
+  ["DD",0x203A],
+  ["DA",0x2044],
+  ["AA",0x2122],
+  ["BD",0x2126],
+  ["B6",0x2202],
+  ["C6",0x2206],
+  ["B8",0x220F],
+  ["B7",0x2211],
+  ["C3",0x221A],
+  ["B0",0x221E],
+  ["BA",0x222B],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+  ["D7",0x25CA],
+]
+\ No newline at end of file
diff --git a/enc/trans/macturkish-tbl.rb b/enc/trans/macturkish-tbl.rb
new file mode 100644
index 0000000000..2358672ed6
--- /dev/null
+++ b/enc/trans/macturkish-tbl.rb
@@ -0,0 +1,128 @@
+MACTURKISH_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["C1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["B4",0xA5],
+  ["A4",0xA7],
+  ["AC",0xA8],
+  ["A9",0xA9],
+  ["BB",0xAA],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["A8",0xAE],
+  ["F8",0xAF],
+  ["A1",0xB0],
+  ["B1",0xB1],
+  ["AB",0xB4],
+  ["B5",0xB5],
+  ["A6",0xB6],
+  ["E1",0xB7],
+  ["FC",0xB8],
+  ["BC",0xBA],
+  ["C8",0xBB],
+  ["C0",0xBF],
+  ["CB",0xC0],
+  ["E7",0xC1],
+  ["E5",0xC2],
+  ["CC",0xC3],
+  ["80",0xC4],
+  ["81",0xC5],
+  ["AE",0xC6],
+  ["82",0xC7],
+  ["E9",0xC8],
+  ["83",0xC9],
+  ["E6",0xCA],
+  ["E8",0xCB],
+  ["ED",0xCC],
+  ["EA",0xCD],
+  ["EB",0xCE],
+  ["EC",0xCF],
+  ["84",0xD1],
+  ["F1",0xD2],
+  ["EE",0xD3],
+  ["EF",0xD4],
+  ["CD",0xD5],
+  ["85",0xD6],
+  ["AF",0xD8],
+  ["F4",0xD9],
+  ["F2",0xDA],
+  ["F3",0xDB],
+  ["86",0xDC],
+  ["A7",0xDF],
+  ["88",0xE0],
+  ["87",0xE1],
+  ["89",0xE2],
+  ["8B",0xE3],
+  ["8A",0xE4],
+  ["8C",0xE5],
+  ["BE",0xE6],
+  ["8D",0xE7],
+  ["8F",0xE8],
+  ["8E",0xE9],
+  ["90",0xEA],
+  ["91",0xEB],
+  ["93",0xEC],
+  ["92",0xED],
+  ["94",0xEE],
+  ["95",0xEF],
+  ["96",0xF1],
+  ["98",0xF2],
+  ["97",0xF3],
+  ["99",0xF4],
+  ["9B",0xF5],
+  ["9A",0xF6],
+  ["D6",0xF7],
+  ["BF",0xF8],
+  ["9D",0xF9],
+  ["9C",0xFA],
+  ["9E",0xFB],
+  ["9F",0xFC],
+  ["D8",0xFF],
+  ["DA",0x11E],
+  ["DB",0x11F],
+  ["DC",0x130],
+  ["DD",0x131],
+  ["CE",0x152],
+  ["CF",0x153],
+  ["DE",0x15E],
+  ["DF",0x15F],
+  ["D9",0x178],
+  ["C4",0x192],
+  ["F6",0x2C6],
+  ["FF",0x2C7],
+  ["F9",0x2D8],
+  ["FA",0x2D9],
+  ["FB",0x2DA],
+  ["FE",0x2DB],
+  ["F7",0x2DC],
+  ["FD",0x2DD],
+  ["B9",0x3C0],
+  ["D0",0x2013],
+  ["D1",0x2014],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["E2",0x201A],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["E3",0x201E],
+  ["A0",0x2020],
+  ["E0",0x2021],
+  ["A5",0x2022],
+  ["C9",0x2026],
+  ["E4",0x2030],
+  ["AA",0x2122],
+  ["BD",0x2126],
+  ["B6",0x2202],
+  ["C6",0x2206],
+  ["B8",0x220F],
+  ["B7",0x2211],
+  ["C3",0x221A],
+  ["B0",0x221E],
+  ["BA",0x222B],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+  ["D7",0x25CA],
+]
+\ No newline at end of file
diff --git a/enc/trans/macukraine-tbl.rb b/enc/trans/macukraine-tbl.rb
new file mode 100644
index 0000000000..6941af654d
--- /dev/null
+++ b/enc/trans/macukraine-tbl.rb
@@ -0,0 +1,130 @@
+MACUKRAINE_TO_UCS_TBL = [
+  ["CA",0xA0],
+  ["A3",0xA3],
+  ["FF",0xA4],
+  ["A4",0xA7],
+  ["A9",0xA9],
+  ["C7",0xAB],
+  ["C2",0xAC],
+  ["A8",0xAE],
+  ["A1",0xB0],
+  ["B1",0xB1],
+  ["B5",0xB5],
+  ["A6",0xB6],
+  ["C8",0xBB],
+  ["D6",0xF7],
+  ["C4",0x192],
+  ["DD",0x401],
+  ["AB",0x402],
+  ["AE",0x403],
+  ["B8",0x404],
+  ["C1",0x405],
+  ["A7",0x406],
+  ["BA",0x407],
+  ["B7",0x408],
+  ["BC",0x409],
+  ["BE",0x40A],
+  ["CB",0x40B],
+  ["CD",0x40C],
+  ["D8",0x40E],
+  ["DA",0x40F],
+  ["80",0x410],
+  ["81",0x411],
+  ["82",0x412],
+  ["83",0x413],
+  ["84",0x414],
+  ["85",0x415],
+  ["86",0x416],
+  ["87",0x417],
+  ["88",0x418],
+  ["89",0x419],
+  ["8A",0x41A],
+  ["8B",0x41B],
+  ["8C",0x41C],
+  ["8D",0x41D],
+  ["8E",0x41E],
+  ["8F",0x41F],
+  ["90",0x420],
+  ["91",0x421],
+  ["92",0x422],
+  ["93",0x423],
+  ["94",0x424],
+  ["95",0x425],
+  ["96",0x426],
+  ["97",0x427],
+  ["98",0x428],
+  ["99",0x429],
+  ["9A",0x42A],
+  ["9B",0x42B],
+  ["9C",0x42C],
+  ["9D",0x42D],
+  ["9E",0x42E],
+  ["9F",0x42F],
+  ["E0",0x430],
+  ["E1",0x431],
+  ["E2",0x432],
+  ["E3",0x433],
+  ["E4",0x434],
+  ["E5",0x435],
+  ["E6",0x436],
+  ["E7",0x437],
+  ["E8",0x438],
+  ["E9",0x439],
+  ["EA",0x43A],
+  ["EB",0x43B],
+  ["EC",0x43C],
+  ["ED",0x43D],
+  ["EE",0x43E],
+  ["EF",0x43F],
+  ["F0",0x440],
+  ["F1",0x441],
+  ["F2",0x442],
+  ["F3",0x443],
+  ["F4",0x444],
+  ["F5",0x445],
+  ["F6",0x446],
+  ["F7",0x447],
+  ["F8",0x448],
+  ["F9",0x449],
+  ["FA",0x44A],
+  ["FB",0x44B],
+  ["FC",0x44C],
+  ["FD",0x44D],
+  ["FE",0x44E],
+  ["DF",0x44F],
+  ["DE",0x451],
+  ["AC",0x452],
+  ["AF",0x453],
+  ["B9",0x454],
+  ["CF",0x455],
+  ["B4",0x456],
+  ["BB",0x457],
+  ["C0",0x458],
+  ["BD",0x459],
+  ["BF",0x45A],
+  ["CC",0x45B],
+  ["CE",0x45C],
+  ["D9",0x45E],
+  ["DB",0x45F],
+  ["A2",0x490],
+  ["B6",0x491],
+  ["D0",0x2013],
+  ["D1",0x2014],
+  ["D4",0x2018],
+  ["D5",0x2019],
+  ["D2",0x201C],
+  ["D3",0x201D],
+  ["D7",0x201E],
+  ["A0",0x2020],
+  ["A5",0x2022],
+  ["C9",0x2026],
+  ["DC",0x2116],
+  ["AA",0x2122],
+  ["C6",0x2206],
+  ["C3",0x221A],
+  ["B0",0x221E],
+  ["C5",0x2248],
+  ["AD",0x2260],
+  ["B2",0x2264],
+  ["B3",0x2265],
+]
+\ No newline at end of file
diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans
new file mode 100644
index 0000000000..a200ec00a7
--- /dev/null
+++ b/enc/trans/newline.trans
@@ -0,0 +1,135 @@
+#include "transcode_data.h"
+
+<%
+  map_normalize = {}
+  map_normalize["{00-ff}"] = :func_so
+
+  transcode_generate_node(ActionMap.parse(map_normalize), "universal_newline")
+
+  map_crlf = {}
+  map_crlf["{00-09,0b-ff}"] = :nomap
+  map_crlf["0a"] = "0d0a"
+
+  transcode_generate_node(ActionMap.parse(map_crlf), "crlf_newline")
+
+  map_cr = {}
+  map_cr["{00-09,0b-ff}"] = :nomap
+  map_cr["0a"] = "0d"
+
+  transcode_generate_node(ActionMap.parse(map_cr), "cr_newline")
+%>
+
+<%= transcode_generated_code %>
+
+#define STATE (sp[0])
+#define NORMAL 0
+#define JUST_AFTER_CR 1
+
+/* no way to access this information, yet. */
+#define NEWLINES_MET (sp[1])
+#define MET_LF          0x01
+#define MET_CRLF        0x02
+#define MET_CR          0x04
+
+static int
+universal_newline_init(void *statep)
+{
+    unsigned char *sp = statep;
+    STATE = NORMAL;
+    NEWLINES_MET = 0;
+    return 0;
+}
+
+static ssize_t
+fun_so_universal_newline(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    int len;
+    if (s[0] == '\n') {
+        if (STATE == NORMAL) {
+            NEWLINES_MET |= MET_LF;
+        }
+        else { /* JUST_AFTER_CR */
+            NEWLINES_MET |= MET_CRLF;
+        }
+        o[0] = '\n';
+        len = 1;
+        STATE = NORMAL;
+    }
+    else {
+        len = 0;
+        if (STATE == JUST_AFTER_CR) {
+            o[0] = '\n';
+            len = 1;
+            NEWLINES_MET |= MET_CR;
+        }
+        if (s[0] == '\r') {
+            STATE = JUST_AFTER_CR;
+        }
+        else {
+            o[len++] = s[0];
+            STATE = NORMAL;
+        }
+    }
+
+    return len;
+}
+
+static ssize_t
+universal_newline_finish(void *statep, unsigned char *o, size_t osize)
+{
+    unsigned char *sp = statep;
+    int len = 0;
+    if (STATE == JUST_AFTER_CR) {
+        o[0] = '\n';
+        len = 1;
+        NEWLINES_MET |= MET_CR;
+    }
+    STATE = NORMAL;
+    return len;
+}
+
+static const rb_transcoder
+rb_universal_newline = {
+    "", "universal_newline", universal_newline,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    1, /* max_input */
+    2, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    2, universal_newline_init, universal_newline_init, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_universal_newline,
+    universal_newline_finish
+};
+
+static const rb_transcoder
+rb_crlf_newline = {
+    "", "crlf_newline", crlf_newline,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    1, /* max_input */
+    2, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, NULL
+};
+
+static const rb_transcoder
+rb_cr_newline = {
+    "", "cr_newline", cr_newline,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    1, /* max_input */
+    1, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, NULL
+};
+
+void
+Init_newline(void)
+{
+    rb_register_transcoder(&rb_universal_newline);
+    rb_register_transcoder(&rb_crlf_newline);
+    rb_register_transcoder(&rb_cr_newline);
+}
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
new file mode 100644
index 0000000000..55d8430932
--- /dev/null
+++ b/enc/trans/single_byte.trans
@@ -0,0 +1,90 @@
+#include "transcode_data.h"
+
+<%
+  us_ascii_map = [["{00-7f}", :nomap]]
+
+  transcode_tblgen "US-ASCII", "UTF-8", us_ascii_map
+  transcode_tblgen "UTF-8", "US-ASCII", us_ascii_map
+  transcode_tblgen "ASCII-8BIT", "UTF-8", us_ascii_map
+  transcode_tblgen "UTF-8", "ASCII-8BIT", us_ascii_map
+
+  CONTROL1_TO_UCS_TBL = (0x80..0x9f).map {|c| ["%02X" % c, c] }
+
+  # Generate transcoding tables for single byte encoding from
+  # encoding name using table file.
+  #
+  # Conventions:
+  #   name: encoding name as string, UPPER case, hyphens (e.g. 'ISO-8859-3')
+  #   file name: lower case, hyphens, -tbl.rb suffix (e.g. iso-8859-3-tbl.rb)
+  #   variable name: UPPER case, underscores, _TO_UCS_TBL suffix (e.g. ISO_8859_3_TO_UCS_TBL)
+  # If the name starts with "ISO-8859", the C1 control code area is added automatically.
+  def transcode_tblgen_singlebyte (name)
+    require(name.downcase + "-tbl")
+    control1_if_needed = (name =~ /^ISO-8859/) ? CONTROL1_TO_UCS_TBL : []
+    tbl_to_ucs = control1_if_needed + eval(name.gsub(/-/, '_') + "_TO_UCS_TBL")
+    code = ''
+    code << transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs.reject {|a, b| a.length != 2 }], '{00-ff}')
+    code << "\n"
+    code << transcode_tblgen("UTF-8", name, [["{00-7f}", :nomap], *tbl_to_ucs.map {|a,b| [b,a] }])
+    code
+  end
+
+  transcode_tblgen_singlebyte "ISO-8859-1"
+  transcode_tblgen_singlebyte "ISO-8859-2"
+  transcode_tblgen_singlebyte "ISO-8859-3"
+  transcode_tblgen_singlebyte "ISO-8859-4"
+  transcode_tblgen_singlebyte "ISO-8859-5"
+  transcode_tblgen_singlebyte "ISO-8859-6"
+  transcode_tblgen_singlebyte "ISO-8859-7"
+  transcode_tblgen_singlebyte "ISO-8859-8"
+  transcode_tblgen_singlebyte "ISO-8859-9"
+  transcode_tblgen_singlebyte "ISO-8859-10"
+  transcode_tblgen_singlebyte "ISO-8859-11"
+  transcode_tblgen_singlebyte "ISO-8859-13"
+  transcode_tblgen_singlebyte "ISO-8859-14"
+  transcode_tblgen_singlebyte "ISO-8859-15"
+  transcode_tblgen_singlebyte "WINDOWS-874"
+  transcode_tblgen_singlebyte "WINDOWS-1250"
+  transcode_tblgen_singlebyte "WINDOWS-1251"
+  transcode_tblgen_singlebyte "WINDOWS-1252"
+  transcode_tblgen_singlebyte "WINDOWS-1253"
+  transcode_tblgen_singlebyte "WINDOWS-1254"
+  transcode_tblgen_singlebyte "WINDOWS-1255"
+  transcode_tblgen_singlebyte "WINDOWS-1256"
+  transcode_tblgen_singlebyte "WINDOWS-1257"
+  transcode_tblgen_singlebyte "IBM437"
+  transcode_tblgen_singlebyte "IBM775"
+  transcode_tblgen_singlebyte "IBM852"
+  transcode_tblgen_singlebyte "IBM855"
+  transcode_tblgen_singlebyte "IBM857"
+  transcode_tblgen_singlebyte "IBM860"
+  transcode_tblgen_singlebyte "IBM861"
+  transcode_tblgen_singlebyte "IBM862"
+  transcode_tblgen_singlebyte "IBM863"
+  transcode_tblgen_singlebyte "IBM865"
+  transcode_tblgen_singlebyte "IBM866"
+  transcode_tblgen_singlebyte "IBM869"
+  transcode_tblgen_singlebyte "MACCROATIAN"
+  transcode_tblgen_singlebyte "MACCYRILLIC"
+  transcode_tblgen_singlebyte "MACGREEK"
+  transcode_tblgen_singlebyte "MACICELAND"
+  transcode_tblgen_singlebyte "MACROMAN"
+  transcode_tblgen_singlebyte "MACROMANIA"
+  transcode_tblgen_singlebyte "MACTURKISH"
+  transcode_tblgen_singlebyte "MACUKRAINE"
+  transcode_tblgen_singlebyte "KOI8-U"
+  transcode_tblgen_singlebyte "KOI8-R"
+  transcode_tblgen_singlebyte "TIS-620"
+  transcode_tblgen_singlebyte "CP850"
+  transcode_tblgen_singlebyte "CP852"
+  transcode_tblgen_singlebyte "CP855"
+%>
+
+<%= transcode_generated_code %>
+
+void
+Init_single_byte(void)
+{
+<%= transcode_register_code %>
+}
+
diff --git a/enc/trans/tis-620-tbl.rb b/enc/trans/tis-620-tbl.rb
new file mode 100644
index 0000000000..a2f605730a
--- /dev/null
+++ b/enc/trans/tis-620-tbl.rb
@@ -0,0 +1,89 @@
+TIS_620_TO_UCS_TBL = [
+  ["A1",0xE01],
+  ["A2",0xE02],
+  ["A3",0xE03],
+  ["A4",0xE04],
+  ["A5",0xE05],
+  ["A6",0xE06],
+  ["A7",0xE07],
+  ["A8",0xE08],
+  ["A9",0xE09],
+  ["AA",0xE0A],
+  ["AB",0xE0B],
+  ["AC",0xE0C],
+  ["AD",0xE0D],
+  ["AE",0xE0E],
+  ["AF",0xE0F],
+  ["B0",0xE10],
+  ["B1",0xE11],
+  ["B2",0xE12],
+  ["B3",0xE13],
+  ["B4",0xE14],
+  ["B5",0xE15],
+  ["B6",0xE16],
+  ["B7",0xE17],
+  ["B8",0xE18],
+  ["B9",0xE19],
+  ["BA",0xE1A],
+  ["BB",0xE1B],
+  ["BC",0xE1C],
+  ["BD",0xE1D],
+  ["BE",0xE1E],
+  ["BF",0xE1F],
+  ["C0",0xE20],
+  ["C1",0xE21],
+  ["C2",0xE22],
+  ["C3",0xE23],
+  ["C4",0xE24],
+  ["C5",0xE25],
+  ["C6",0xE26],
+  ["C7",0xE27],
+  ["C8",0xE28],
+  ["C9",0xE29],
+  ["CA",0xE2A],
+  ["CB",0xE2B],
+  ["CC",0xE2C],
+  ["CD",0xE2D],
+  ["CE",0xE2E],
+  ["CF",0xE2F],
+  ["D0",0xE30],
+  ["D1",0xE31],
+  ["D2",0xE32],
+  ["D3",0xE33],
+  ["D4",0xE34],
+  ["D5",0xE35],
+  ["D6",0xE36],
+  ["D7",0xE37],
+  ["D8",0xE38],
+  ["D9",0xE39],
+  ["DA",0xE3A],
+  ["DF",0xE3F],
+  ["E0",0xE40],
+  ["E1",0xE41],
+  ["E2",0xE42],
+  ["E3",0xE43],
+  ["E4",0xE44],
+  ["E5",0xE45],
+  ["E6",0xE46],
+  ["E7",0xE47],
+  ["E8",0xE48],
+  ["E9",0xE49],
+  ["EA",0xE4A],
+  ["EB",0xE4B],
+  ["EC",0xE4C],
+  ["ED",0xE4D],
+  ["EE",0xE4E],
+  ["EF",0xE4F],
+  ["F0",0xE50],
+  ["F1",0xE51],
+  ["F2",0xE52],
+  ["F3",0xE53],
+  ["F4",0xE54],
+  ["F5",0xE55],
+  ["F6",0xE56],
+  ["F7",0xE57],
+  ["F8",0xE58],
+  ["F9",0xE59],
+  ["FA",0xE5A],
+  ["FB",0xE5B],
+]
diff --git a/enc/trans/transdb.c b/enc/trans/transdb.c
new file mode 100644
index 0000000000..d6ac41e967
--- /dev/null
+++ b/enc/trans/transdb.c
@@ -0,0 +1,18 @@
+/**********************************************************************
+
+  enc/trans/transdb.c -
+
+  $Author$
+  created at: Mon Apr  7 15:51:31 2008
+
+  Copyright (C) 2008 Yukihiro Matsumoto
+
+**********************************************************************/
+
+void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib);
+
+void
+Init_transdb(void)
+{
+#include "transdb.h"
+}
diff --git a/enc/trans/utf8_mac-tbl.rb b/enc/trans/utf8_mac-tbl.rb
new file mode 100644
index 0000000000..f43478bd3e
--- /dev/null
+++ b/enc/trans/utf8_mac-tbl.rb
@@ -0,0 +1,945 @@
+# http://developer.apple.com/technotes/tn/tn1150table.html
+MAC_DECOMPOSE_TBL = [
+  ["c380", "41cc80"],
+  ["c381", "41cc81"],
+  ["c382", "41cc82"],
+  ["c383", "41cc83"],
+  ["c384", "41cc88"],
+  ["c385", "41cc8a"],
+  ["c387", "43cca7"],
+  ["c388", "45cc80"],
+  ["c389", "45cc81"],
+  ["c38a", "45cc82"],
+  ["c38b", "45cc88"],
+  ["c38c", "49cc80"],
+  ["c38d", "49cc81"],
+  ["c38e", "49cc82"],
+  ["c38f", "49cc88"],
+  ["c391", "4ecc83"],
+  ["c392", "4fcc80"],
+  ["c393", "4fcc81"],
+  ["c394", "4fcc82"],
+  ["c395", "4fcc83"],
+  ["c396", "4fcc88"],
+  ["c399", "55cc80"],
+  ["c39a", "55cc81"],
+  ["c39b", "55cc82"],
+  ["c39c", "55cc88"],
+  ["c39d", "59cc81"],
+  ["c3a0", "61cc80"],
+  ["c3a1", "61cc81"],
+  ["c3a2", "61cc82"],
+  ["c3a3", "61cc83"],
+  ["c3a4", "61cc88"],
+  ["c3a5", "61cc8a"],
+  ["c3a7", "63cca7"],
+  ["c3a8", "65cc80"],
+  ["c3a9", "65cc81"],
+  ["c3aa", "65cc82"],
+  ["c3ab", "65cc88"],
+  ["c3ac", "69cc80"],
+  ["c3ad", "69cc81"],
+  ["c3ae", "69cc82"],
+  ["c3af", "69cc88"],
+  ["c3b1", "6ecc83"],
+  ["c3b2", "6fcc80"],
+  ["c3b3", "6fcc81"],
+  ["c3b4", "6fcc82"],
+  ["c3b5", "6fcc83"],
+  ["c3b6", "6fcc88"],
+  ["c3b9", "75cc80"],
+  ["c3ba", "75cc81"],
+  ["c3bb", "75cc82"],
+  ["c3bc", "75cc88"],
+  ["c3bd", "79cc81"],
+  ["c3bf", "79cc88"],
+  ["c480", "41cc84"],
+  ["c481", "61cc84"],
+  ["c482", "41cc86"],
+  ["c483", "61cc86"],
+  ["c484", "41cca8"],
+  ["c485", "61cca8"],
+  ["c486", "43cc81"],
+  ["c487", "63cc81"],
+  ["c488", "43cc82"],
+  ["c489", "63cc82"],
+  ["c48a", "43cc87"],
+  ["c48b", "63cc87"],
+  ["c48c", "43cc8c"],
+  ["c48d", "63cc8c"],
+  ["c48e", "44cc8c"],
+  ["c48f", "64cc8c"],
+  ["c492", "45cc84"],
+  ["c493", "65cc84"],
+  ["c494", "45cc86"],
+  ["c495", "65cc86"],
+  ["c496", "45cc87"],
+  ["c497", "65cc87"],
+  ["c498", "45cca8"],
+  ["c499", "65cca8"],
+  ["c49a", "45cc8c"],
+  ["c49b", "65cc8c"],
+  ["c49c", "47cc82"],
+  ["c49d", "67cc82"],
+  ["c49e", "47cc86"],
+  ["c49f", "67cc86"],
+  ["c4a0", "47cc87"],
+  ["c4a1", "67cc87"],
+  ["c4a2", "47cca7"],
+  ["c4a3", "67cca7"],
+  ["c4a4", "48cc82"],
+  ["c4a5", "68cc82"],
+  ["c4a8", "49cc83"],
+  ["c4a9", "69cc83"],
+  ["c4aa", "49cc84"],
+  ["c4ab", "69cc84"],
+  ["c4ac", "49cc86"],
+  ["c4ad", "69cc86"],
+  ["c4ae", "49cca8"],
+  ["c4af", "69cca8"],
+  ["c4b0", "49cc87"],
+  ["c4b4", "4acc82"],
+  ["c4b5", "6acc82"],
+  ["c4b6", "4bcca7"],
+  ["c4b7", "6bcca7"],
+  ["c4b9", "4ccc81"],
+  ["c4ba", "6ccc81"],
+  ["c4bb", "4ccca7"],
+  ["c4bc", "6ccca7"],
+  ["c4bd", "4ccc8c"],
+  ["c4be", "6ccc8c"],
+  ["c583", "4ecc81"],
+  ["c584", "6ecc81"],
+  ["c585", "4ecca7"],
+  ["c586", "6ecca7"],
+  ["c587", "4ecc8c"],
+  ["c588", "6ecc8c"],
+  ["c58c", "4fcc84"],
+  ["c58d", "6fcc84"],
+  ["c58e", "4fcc86"],
+  ["c58f", "6fcc86"],
+  ["c590", "4fcc8b"],
+  ["c591", "6fcc8b"],
+  ["c594", "52cc81"],
+  ["c595", "72cc81"],
+  ["c596", "52cca7"],
+  ["c597", "72cca7"],
+  ["c598", "52cc8c"],
+  ["c599", "72cc8c"],
+  ["c59a", "53cc81"],
+  ["c59b", "73cc81"],
+  ["c59c", "53cc82"],
+  ["c59d", "73cc82"],
+  ["c59e", "53cca7"],
+  ["c59f", "73cca7"],
+  ["c5a0", "53cc8c"],
+  ["c5a1", "73cc8c"],
+  ["c5a2", "54cca7"],
+  ["c5a3", "74cca7"],
+  ["c5a4", "54cc8c"],
+  ["c5a5", "74cc8c"],
+  ["c5a8", "55cc83"],
+  ["c5a9", "75cc83"],
+  ["c5aa", "55cc84"],
+  ["c5ab", "75cc84"],
+  ["c5ac", "55cc86"],
+  ["c5ad", "75cc86"],
+  ["c5ae", "55cc8a"],
+  ["c5af", "75cc8a"],
+  ["c5b0", "55cc8b"],
+  ["c5b1", "75cc8b"],
+  ["c5b2", "55cca8"],
+  ["c5b3", "75cca8"],
+  ["c5b4", "57cc82"],
+  ["c5b5", "77cc82"],
+  ["c5b6", "59cc82"],
+  ["c5b7", "79cc82"],
+  ["c5b8", "59cc88"],
+  ["c5b9", "5acc81"],
+  ["c5ba", "7acc81"],
+  ["c5bb", "5acc87"],
+  ["c5bc", "7acc87"],
+  ["c5bd", "5acc8c"],
+  ["c5be", "7acc8c"],
+  ["c6a0", "4fcc9b"],
+  ["c6a1", "6fcc9b"],
+  ["c6af", "55cc9b"],
+  ["c6b0", "75cc9b"],
+  ["c78d", "41cc8c"],
+  ["c78e", "61cc8c"],
+  ["c78f", "49cc8c"],
+  ["c790", "69cc8c"],
+  ["c791", "4fcc8c"],
+  ["c792", "6fcc8c"],
+  ["c793", "55cc8c"],
+  ["c794", "75cc8c"],
+  ["c795", "55cc88cc84"],
+  ["c796", "75cc88cc84"],
+  ["c797", "55cc88cc81"],
+  ["c798", "75cc88cc81"],
+  ["c799", "55cc88cc8c"],
+  ["c79a", "75cc88cc8c"],
+  ["c79b", "55cc88cc80"],
+  ["c79c", "75cc88cc80"],
+  ["c79e", "41cc88cc84"],
+  ["c79f", "61cc88cc84"],
+  ["c7a0", "41cc87cc84"],
+  ["c7a1", "61cc87cc84"],
+  ["c7a2", "c386cc84"],
+  ["c7a3", "c3a6cc84"],
+  ["c7a6", "47cc8c"],
+  ["c7a7", "67cc8c"],
+  ["c7a8", "4bcc8c"],
+  ["c7a9", "6bcc8c"],
+  ["c7aa", "4fcca8"],
+  ["c7ab", "6fcca8"],
+  ["c7ac", "4fcca8cc84"],
+  ["c7ad", "6fcca8cc84"],
+  ["c7ae", "c6b7cc8c"],
+  ["c7af", "ca92cc8c"],
+  ["c7b0", "6acc8c"],
+  ["c7b4", "47cc81"],
+  ["c7b5", "67cc81"],
+  ["c7ba", "41cc8acc81"],
+  ["c7bb", "61cc8acc81"],
+  ["c7bc", "c386cc81"],
+  ["c7bd", "c3a6cc81"],
+  ["c7be", "c398cc81"],
+  ["c7bf", "c3b8cc81"],
+  ["c880", "41cc8f"],
+  ["c881", "61cc8f"],
+  ["c882", "41cc91"],
+  ["c883", "61cc91"],
+  ["c884", "45cc8f"],
+  ["c885", "65cc8f"],
+  ["c886", "45cc91"],
+  ["c887", "65cc91"],
+  ["c888", "49cc8f"],
+  ["c889", "69cc8f"],
+  ["c88a", "49cc91"],
+  ["c88b", "69cc91"],
+  ["c88c", "4fcc8f"],
+  ["c88d", "6fcc8f"],
+  ["c88e", "4fcc91"],
+  ["c88f", "6fcc91"],
+  ["c890", "52cc8f"],
+  ["c891", "72cc8f"],
+  ["c892", "52cc91"],
+  ["c893", "72cc91"],
+  ["c894", "55cc8f"],
+  ["c895", "75cc8f"],
+  ["c896", "55cc91"],
+  ["c897", "75cc91"],
+  ["cc90", "cc86cc87"],
+  ["cd80", "cc80"],
+  ["cd81", "cc81"],
+  ["cd83", "cc93"],
+  ["cd84", "cc88cc8d"],
+  ["cdb4", "cab9"],
+  ["cdbe", "3b"],
+  ["ce85", "c2a8cc8d"],
+  ["ce86", "ce91cc8d"],
+  ["ce87", "c2b7"],
+  ["ce88", "ce95cc8d"],
+  ["ce89", "ce97cc8d"],
+  ["ce8a", "ce99cc8d"],
+  ["ce8c", "ce9fcc8d"],
+  ["ce8e", "cea5cc8d"],
+  ["ce8f", "cea9cc8d"],
+  ["ce90", "ceb9cc88cc8d"],
+  ["ceaa", "ce99cc88"],
+  ["ceab", "cea5cc88"],
+  ["ceac", "ceb1cc8d"],
+  ["cead", "ceb5cc8d"],
+  ["ceae", "ceb7cc8d"],
+  ["ceaf", "ceb9cc8d"],
+  ["ceb0", "cf85cc88cc8d"],
+  ["cf8a", "ceb9cc88"],
+  ["cf8b", "cf85cc88"],
+  ["cf8c", "cebfcc8d"],
+  ["cf8d", "cf85cc8d"],
+  ["cf8e", "cf89cc8d"],
+  ["cf93", "cf92cc8d"],
+  ["cf94", "cf92cc88"],
+  ["d081", "d095cc88"],
+  ["d083", "d093cc81"],
+  ["d087", "d086cc88"],
+  ["d08c", "d09acc81"],
+  ["d08e", "d0a3cc86"],
+  ["d099", "d098cc86"],
+  ["d0b9", "d0b8cc86"],
+  ["d191", "d0b5cc88"],
+  ["d193", "d0b3cc81"],
+  ["d197", "d196cc88"],
+  ["d19c", "d0bacc81"],
+  ["d19e", "d183cc86"],
+  ["d1b6", "d1b4cc8f"],
+  ["d1b7", "d1b5cc8f"],
+  ["d381", "d096cc86"],
+  ["d382", "d0b6cc86"],
+  ["d390", "d090cc86"],
+  ["d391", "d0b0cc86"],
+  ["d392", "d090cc88"],
+  ["d393", "d0b0cc88"],
+  ["d394", "c386"],
+  ["d395", "c3a6"],
+  ["d396", "d095cc86"],
+  ["d397", "d0b5cc86"],
+  ["d398", "c68f"],
+  ["d399", "c999"],
+  ["d39a", "c68fcc88"],
+  ["d39b", "c999cc88"],
+  ["d39c", "d096cc88"],
+  ["d39d", "d0b6cc88"],
+  ["d39e", "d097cc88"],
+  ["d39f", "d0b7cc88"],
+  ["d3a0", "c6b7"],
+  ["d3a1", "ca92"],
+  ["d3a2", "d098cc84"],
+  ["d3a3", "d0b8cc84"],
+  ["d3a4", "d098cc88"],
+  ["d3a5", "d0b8cc88"],
+  ["d3a6", "d09ecc88"],
+  ["d3a7", "d0becc88"],
+  ["d3a8", "c69f"],
+  ["d3a9", "c9b5"],
+  ["d3aa", "c69fcc88"],
+  ["d3ab", "c9b5cc88"],
+  ["d3ae", "d0a3cc84"],
+  ["d3af", "d183cc84"],
+  ["d3b0", "d0a3cc88"],
+  ["d3b1", "d183cc88"],
+  ["d3b2", "d0a3cc8b"],
+  ["d3b3", "d183cc8b"],
+  ["d3b4", "d0a7cc88"],
+  ["d3b5", "d187cc88"],
+  ["d3b8", "d0abcc88"],
+  ["d3b9", "d18bcc88"],
+  ["e0a4a9", "e0a4a8e0a4bc"],
+  ["e0a4b1", "e0a4b0e0a4bc"],
+  ["e0a4b4", "e0a4b3e0a4bc"],
+  ["e0a598", "e0a495e0a4bc"],
+  ["e0a599", "e0a496e0a4bc"],
+  ["e0a59a", "e0a497e0a4bc"],
+  ["e0a59b", "e0a49ce0a4bc"],
+  ["e0a59c", "e0a4a1e0a4bc"],
+  ["e0a59d", "e0a4a2e0a4bc"],
+  ["e0a59e", "e0a4abe0a4bc"],
+  ["e0a59f", "e0a4afe0a4bc"],
+  ["e0a6b0", "e0a6ace0a6bc"],
+  ["e0a78b", "e0a787e0a6be"],
+  ["e0a78c", "e0a787e0a797"],
+  ["e0a79c", "e0a6a1e0a6bc"],
+  ["e0a79d", "e0a6a2e0a6bc"],
+  ["e0a79f", "e0a6afe0a6bc"],
+  ["e0a999", "e0a896e0a8bc"],
+  ["e0a99a", "e0a897e0a8bc"],
+  ["e0a99b", "e0a89ce0a8bc"],
+  ["e0a99c", "e0a8a1e0a8bc"],
+  ["e0a99e", "e0a8abe0a8bc"],
+  ["e0ad88", "e0ad87e0ad96"],
+  ["e0ad8b", "e0ad87e0acbe"],
+  ["e0ad8c", "e0ad87e0ad97"],
+  ["e0ad9c", "e0aca1e0acbc"],
+  ["e0ad9d", "e0aca2e0acbc"],
+  ["e0ad9f", "e0acafe0acbc"],
+  ["e0ae94", "e0ae92e0af97"],
+  ["e0af8a", "e0af86e0aebe"],
+  ["e0af8b", "e0af87e0aebe"],
+  ["e0af8c", "e0af86e0af97"],
+  ["e0b188", "e0b186e0b196"],
+  ["e0b380", "e0b2bfe0b395"],
+  ["e0b387", "e0b386e0b395"],
+  ["e0b388", "e0b386e0b396"],
+  ["e0b38a", "e0b386e0b382"],
+  ["e0b38b", "e0b386e0b382e0b395"],
+  ["e0b58a", "e0b586e0b4be"],
+  ["e0b58b", "e0b587e0b4be"],
+  ["e0b58c", "e0b586e0b597"],
+  ["e0b8b3", "e0b98de0b8b2"],
+  ["e0bab3", "e0bb8de0bab2"],
+  ["e0bd83", "e0bd82e0beb7"],
+  ["e0bd8d", "e0bd8ce0beb7"],
+  ["e0bd92", "e0bd91e0beb7"],
+  ["e0bd97", "e0bd96e0beb7"],
+  ["e0bd9c", "e0bd9be0beb7"],
+  ["e0bda9", "e0bd80e0beb5"],
+  ["e0bdb3", "e0bdb2e0bdb1"],
+  ["e0bdb5", "e0bdb4e0bdb1"],
+  ["e0bdb6", "e0beb2e0be80"],
+  ["e0bdb7", "e0beb2e0be80e0bdb1"],
+  ["e0bdb8", "e0beb3e0be80"],
+  ["e0bdb9", "e0beb3e0be80e0bdb1"],
+  ["e0be81", "e0be80e0bdb1"],
+  ["e0be93", "e0be92e0beb7"],
+  ["e0be9d", "e0be9ce0beb7"],
+  ["e0bea2", "e0bea1e0beb7"],
+  ["e0bea7", "e0bea6e0beb7"],
+  ["e0beac", "e0beabe0beb7"],
+  ["e0beb9", "e0be90e0beb5"],
+  ["e1b880", "41cca5"],
+  ["e1b881", "61cca5"],
+  ["e1b882", "42cc87"],
+  ["e1b883", "62cc87"],
+  ["e1b884", "42cca3"],
+  ["e1b885", "62cca3"],
+  ["e1b886", "42ccb1"],
+  ["e1b887", "62ccb1"],
+  ["e1b888", "43cca7cc81"],
+  ["e1b889", "63cca7cc81"],
+  ["e1b88a", "44cc87"],
+  ["e1b88b", "64cc87"],
+  ["e1b88c", "44cca3"],
+  ["e1b88d", "64cca3"],
+  ["e1b88e", "44ccb1"],
+  ["e1b88f", "64ccb1"],
+  ["e1b890", "44cca7"],
+  ["e1b891", "64cca7"],
+  ["e1b892", "44ccad"],
+  ["e1b893", "64ccad"],
+  ["e1b894", "45cc84cc80"],
+  ["e1b895", "65cc84cc80"],
+  ["e1b896", "45cc84cc81"],
+  ["e1b897", "65cc84cc81"],
+  ["e1b898", "45ccad"],
+  ["e1b899", "65ccad"],
+  ["e1b89a", "45ccb0"],
+  ["e1b89b", "65ccb0"],
+  ["e1b89c", "45cca7cc86"],
+  ["e1b89d", "65cca7cc86"],
+  ["e1b89e", "46cc87"],
+  ["e1b89f", "66cc87"],
+  ["e1b8a0", "47cc84"],
+  ["e1b8a1", "67cc84"],
+  ["e1b8a2", "48cc87"],
+  ["e1b8a3", "68cc87"],
+  ["e1b8a4", "48cca3"],
+  ["e1b8a5", "68cca3"],
+  ["e1b8a6", "48cc88"],
+  ["e1b8a7", "68cc88"],
+  ["e1b8a8", "48cca7"],
+  ["e1b8a9", "68cca7"],
+  ["e1b8aa", "48ccae"],
+  ["e1b8ab", "68ccae"],
+  ["e1b8ac", "49ccb0"],
+  ["e1b8ad", "69ccb0"],
+  ["e1b8ae", "49cc88cc81"],
+  ["e1b8af", "69cc88cc81"],
+  ["e1b8b0", "4bcc81"],
+  ["e1b8b1", "6bcc81"],
+  ["e1b8b2", "4bcca3"],
+  ["e1b8b3", "6bcca3"],
+  ["e1b8b4", "4bccb1"],
+  ["e1b8b5", "6bccb1"],
+  ["e1b8b6", "4ccca3"],
+  ["e1b8b7", "6ccca3"],
+  ["e1b8b8", "4ccca3cc84"],
+  ["e1b8b9", "6ccca3cc84"],
+  ["e1b8ba", "4cccb1"],
+  ["e1b8bb", "6cccb1"],
+  ["e1b8bc", "4cccad"],
+  ["e1b8bd", "6cccad"],
+  ["e1b8be", "4dcc81"],
+  ["e1b8bf", "6dcc81"],
+  ["e1b980", "4dcc87"],
+  ["e1b981", "6dcc87"],
+  ["e1b982", "4dcca3"],
+  ["e1b983", "6dcca3"],
+  ["e1b984", "4ecc87"],
+  ["e1b985", "6ecc87"],
+  ["e1b986", "4ecca3"],
+  ["e1b987", "6ecca3"],
+  ["e1b988", "4eccb1"],
+  ["e1b989", "6eccb1"],
+  ["e1b98a", "4eccad"],
+  ["e1b98b", "6eccad"],
+  ["e1b98c", "4fcc83cc81"],
+  ["e1b98d", "6fcc83cc81"],
+  ["e1b98e", "4fcc83cc88"],
+  ["e1b98f", "6fcc83cc88"],
+  ["e1b990", "4fcc84cc80"],
+  ["e1b991", "6fcc84cc80"],
+  ["e1b992", "4fcc84cc81"],
+  ["e1b993", "6fcc84cc81"],
+  ["e1b994", "50cc81"],
+  ["e1b995", "70cc81"],
+  ["e1b996", "50cc87"],
+  ["e1b997", "70cc87"],
+  ["e1b998", "52cc87"],
+  ["e1b999", "72cc87"],
+  ["e1b99a", "52cca3"],
+  ["e1b99b", "72cca3"],
+  ["e1b99c", "52cca3cc84"],
+  ["e1b99d", "72cca3cc84"],
+  ["e1b99e", "52ccb1"],
+  ["e1b99f", "72ccb1"],
+  ["e1b9a0", "53cc87"],
+  ["e1b9a1", "73cc87"],
+  ["e1b9a2", "53cca3"],
+  ["e1b9a3", "73cca3"],
+  ["e1b9a4", "53cc81cc87"],
+  ["e1b9a5", "73cc81cc87"],
+  ["e1b9a6", "53cc8ccc87"],
+  ["e1b9a7", "73cc8ccc87"],
+  ["e1b9a8", "53cca3cc87"],
+  ["e1b9a9", "73cca3cc87"],
+  ["e1b9aa", "54cc87"],
+  ["e1b9ab", "74cc87"],
+  ["e1b9ac", "54cca3"],
+  ["e1b9ad", "74cca3"],
+  ["e1b9ae", "54ccb1"],
+  ["e1b9af", "74ccb1"],
+  ["e1b9b0", "54ccad"],
+  ["e1b9b1", "74ccad"],
+  ["e1b9b2", "55cca4"],
+  ["e1b9b3", "75cca4"],
+  ["e1b9b4", "55ccb0"],
+  ["e1b9b5", "75ccb0"],
+  ["e1b9b6", "55ccad"],
+  ["e1b9b7", "75ccad"],
+  ["e1b9b8", "55cc83cc81"],
+  ["e1b9b9", "75cc83cc81"],
+  ["e1b9ba", "55cc84cc88"],
+  ["e1b9bb", "75cc84cc88"],
+  ["e1b9bc", "56cc83"],
+  ["e1b9bd", "76cc83"],
+  ["e1b9be", "56cca3"],
+  ["e1b9bf", "76cca3"],
+  ["e1ba80", "57cc80"],
+  ["e1ba81", "77cc80"],
+  ["e1ba82", "57cc81"],
+  ["e1ba83", "77cc81"],
+  ["e1ba84", "57cc88"],
+  ["e1ba85", "77cc88"],
+  ["e1ba86", "57cc87"],
+  ["e1ba87", "77cc87"],
+  ["e1ba88", "57cca3"],
+  ["e1ba89", "77cca3"],
+  ["e1ba8a", "58cc87"],
+  ["e1ba8b", "78cc87"],
+  ["e1ba8c", "58cc88"],
+  ["e1ba8d", "78cc88"],
+  ["e1ba8e", "59cc87"],
+  ["e1ba8f", "79cc87"],
+  ["e1ba90", "5acc82"],
+  ["e1ba91", "7acc82"],
+  ["e1ba92", "5acca3"],
+  ["e1ba93", "7acca3"],
+  ["e1ba94", "5accb1"],
+  ["e1ba95", "7accb1"],
+  ["e1ba96", "68ccb1"],
+  ["e1ba97", "74cc88"],
+  ["e1ba98", "77cc8a"],
+  ["e1ba99", "79cc8a"],
+  ["e1ba9b", "c5bfcc87"],
+  ["e1baa0", "41cca3"],
+  ["e1baa1", "61cca3"],
+  ["e1baa2", "41cc89"],
+  ["e1baa3", "61cc89"],
+  ["e1baa4", "41cc82cc81"],
+  ["e1baa5", "61cc82cc81"],
+  ["e1baa6", "41cc82cc80"],
+  ["e1baa7", "61cc82cc80"],
+  ["e1baa8", "41cc82cc89"],
+  ["e1baa9", "61cc82cc89"],
+  ["e1baaa", "41cc82cc83"],
+  ["e1baab", "61cc82cc83"],
+  ["e1baac", "41cca3cc82"],
+  ["e1baad", "61cca3cc82"],
+  ["e1baae", "41cc86cc81"],
+  ["e1baaf", "61cc86cc81"],
+  ["e1bab0", "41cc86cc80"],
+  ["e1bab1", "61cc86cc80"],
+  ["e1bab2", "41cc86cc89"],
+  ["e1bab3", "61cc86cc89"],
+  ["e1bab4", "41cc86cc83"],
+  ["e1bab5", "61cc86cc83"],
+  ["e1bab6", "41cca3cc86"],
+  ["e1bab7", "61cca3cc86"],
+  ["e1bab8", "45cca3"],
+  ["e1bab9", "65cca3"],
+  ["e1baba", "45cc89"],
+  ["e1babb", "65cc89"],
+  ["e1babc", "45cc83"],
+  ["e1babd", "65cc83"],
+  ["e1babe", "45cc82cc81"],
+  ["e1babf", "65cc82cc81"],
+  ["e1bb80", "45cc82cc80"],
+  ["e1bb81", "65cc82cc80"],
+  ["e1bb82", "45cc82cc89"],
+  ["e1bb83", "65cc82cc89"],
+  ["e1bb84", "45cc82cc83"],
+  ["e1bb85", "65cc82cc83"],
+  ["e1bb86", "45cca3cc82"],
+  ["e1bb87", "65cca3cc82"],
+  ["e1bb88", "49cc89"],
+  ["e1bb89", "69cc89"],
+  ["e1bb8a", "49cca3"],
+  ["e1bb8b", "69cca3"],
+  ["e1bb8c", "4fcca3"],
+  ["e1bb8d", "6fcca3"],
+  ["e1bb8e", "4fcc89"],
+  ["e1bb8f", "6fcc89"],
+  ["e1bb90", "4fcc82cc81"],
+  ["e1bb91", "6fcc82cc81"],
+  ["e1bb92", "4fcc82cc80"],
+  ["e1bb93", "6fcc82cc80"],
+  ["e1bb94", "4fcc82cc89"],
+  ["e1bb95", "6fcc82cc89"],
+  ["e1bb96", "4fcc82cc83"],
+  ["e1bb97", "6fcc82cc83"],
+  ["e1bb98", "4fcca3cc82"],
+  ["e1bb99", "6fcca3cc82"],
+  ["e1bb9a", "4fcc9bcc81"],
+  ["e1bb9b", "6fcc9bcc81"],
+  ["e1bb9c", "4fcc9bcc80"],
+  ["e1bb9d", "6fcc9bcc80"],
+  ["e1bb9e", "4fcc9bcc89"],
+  ["e1bb9f", "6fcc9bcc89"],
+  ["e1bba0", "4fcc9bcc83"],
+  ["e1bba1", "6fcc9bcc83"],
+  ["e1bba2", "4fcc9bcca3"],
+  ["e1bba3", "6fcc9bcca3"],
+  ["e1bba4", "55cca3"],
+  ["e1bba5", "75cca3"],
+  ["e1bba6", "55cc89"],
+  ["e1bba7", "75cc89"],
+  ["e1bba8", "55cc9bcc81"],
+  ["e1bba9", "75cc9bcc81"],
+  ["e1bbaa", "55cc9bcc80"],
+  ["e1bbab", "75cc9bcc80"],
+  ["e1bbac", "55cc9bcc89"],
+  ["e1bbad", "75cc9bcc89"],
+  ["e1bbae", "55cc9bcc83"],
+  ["e1bbaf", "75cc9bcc83"],
+  ["e1bbb0", "55cc9bcca3"],
+  ["e1bbb1", "75cc9bcca3"],
+  ["e1bbb2", "59cc80"],
+  ["e1bbb3", "79cc80"],
+  ["e1bbb4", "59cca3"],
+  ["e1bbb5", "79cca3"],
+  ["e1bbb6", "59cc89"],
+  ["e1bbb7", "79cc89"],
+  ["e1bbb8", "59cc83"],
+  ["e1bbb9", "79cc83"],
+  ["e1bc80", "ceb1cc93"],
+  ["e1bc81", "ceb1cc94"],
+  ["e1bc82", "ceb1cc93cc80"],
+  ["e1bc83", "ceb1cc94cc80"],
+  ["e1bc84", "ceb1cc93cc81"],
+  ["e1bc85", "ceb1cc94cc81"],
+  ["e1bc86", "ceb1cc93cd82"],
+  ["e1bc87", "ceb1cc94cd82"],
+  ["e1bc88", "ce91cc93"],
+  ["e1bc89", "ce91cc94"],
+  ["e1bc8a", "ce91cc93cc80"],
+  ["e1bc8b", "ce91cc94cc80"],
+  ["e1bc8c", "ce91cc93cc81"],
+  ["e1bc8d", "ce91cc94cc81"],
+  ["e1bc8e", "ce91cc93cd82"],
+  ["e1bc8f", "ce91cc94cd82"],
+  ["e1bc90", "ceb5cc93"],
+  ["e1bc91", "ceb5cc94"],
+  ["e1bc92", "ceb5cc93cc80"],
+  ["e1bc93", "ceb5cc94cc80"],
+  ["e1bc94", "ceb5cc93cc81"],
+  ["e1bc95", "ceb5cc94cc81"],
+  ["e1bc98", "ce95cc93"],
+  ["e1bc99", "ce95cc94"],
+  ["e1bc9a", "ce95cc93cc80"],
+  ["e1bc9b", "ce95cc94cc80"],
+  ["e1bc9c", "ce95cc93cc81"],
+  ["e1bc9d", "ce95cc94cc81"],
+  ["e1bca0", "ceb7cc93"],
+  ["e1bca1", "ceb7cc94"],
+  ["e1bca2", "ceb7cc93cc80"],
+  ["e1bca3", "ceb7cc94cc80"],
+  ["e1bca4", "ceb7cc93cc81"],
+  ["e1bca5", "ceb7cc94cc81"],
+  ["e1bca6", "ceb7cc93cd82"],
+  ["e1bca7", "ceb7cc94cd82"],
+  ["e1bca8", "ce97cc93"],
+  ["e1bca9", "ce97cc94"],
+  ["e1bcaa", "ce97cc93cc80"],
+  ["e1bcab", "ce97cc94cc80"],
+  ["e1bcac", "ce97cc93cc81"],
+  ["e1bcad", "ce97cc94cc81"],
+  ["e1bcae", "ce97cc93cd82"],
+  ["e1bcaf", "ce97cc94cd82"],
+  ["e1bcb0", "ceb9cc93"],
+  ["e1bcb1", "ceb9cc94"],
+  ["e1bcb2", "ceb9cc93cc80"],
+  ["e1bcb3", "ceb9cc94cc80"],
+  ["e1bcb4", "ceb9cc93cc81"],
+  ["e1bcb5", "ceb9cc94cc81"],
+  ["e1bcb6", "ceb9cc93cd82"],
+  ["e1bcb7", "ceb9cc94cd82"],
+  ["e1bcb8", "ce99cc93"],
+  ["e1bcb9", "ce99cc94"],
+  ["e1bcba", "ce99cc93cc80"],
+  ["e1bcbb", "ce99cc94cc80"],
+  ["e1bcbc", "ce99cc93cc81"],
+  ["e1bcbd", "ce99cc94cc81"],
+  ["e1bcbe", "ce99cc93cd82"],
+  ["e1bcbf", "ce99cc94cd82"],
+  ["e1bd80", "cebfcc93"],
+  ["e1bd81", "cebfcc94"],
+  ["e1bd82", "cebfcc93cc80"],
+  ["e1bd83", "cebfcc94cc80"],
+  ["e1bd84", "cebfcc93cc81"],
+  ["e1bd85", "cebfcc94cc81"],
+  ["e1bd88", "ce9fcc93"],
+  ["e1bd89", "ce9fcc94"],
+  ["e1bd8a", "ce9fcc93cc80"],
+  ["e1bd8b", "ce9fcc94cc80"],
+  ["e1bd8c", "ce9fcc93cc81"],
+  ["e1bd8d", "ce9fcc94cc81"],
+  ["e1bd90", "cf85cc93"],
+  ["e1bd91", "cf85cc94"],
+  ["e1bd92", "cf85cc93cc80"],
+  ["e1bd93", "cf85cc94cc80"],
+  ["e1bd94", "cf85cc93cc81"],
+  ["e1bd95", "cf85cc94cc81"],
+  ["e1bd96", "cf85cc93cd82"],
+  ["e1bd97", "cf85cc94cd82"],
+  ["e1bd99", "cea5cc94"],
+  ["e1bd9b", "cea5cc94cc80"],
+  ["e1bd9d", "cea5cc94cc81"],
+  ["e1bd9f", "cea5cc94cd82"],
+  ["e1bda0", "cf89cc93"],
+  ["e1bda1", "cf89cc94"],
+  ["e1bda2", "cf89cc93cc80"],
+  ["e1bda3", "cf89cc94cc80"],
+  ["e1bda4", "cf89cc93cc81"],
+  ["e1bda5", "cf89cc94cc81"],
+  ["e1bda6", "cf89cc93cd82"],
+  ["e1bda7", "cf89cc94cd82"],
+  ["e1bda8", "cea9cc93"],
+  ["e1bda9", "cea9cc94"],
+  ["e1bdaa", "cea9cc93cc80"],
+  ["e1bdab", "cea9cc94cc80"],
+  ["e1bdac", "cea9cc93cc81"],
+  ["e1bdad", "cea9cc94cc81"],
+  ["e1bdae", "cea9cc93cd82"],
+  ["e1bdaf", "cea9cc94cd82"],
+  ["e1bdb0", "ceb1cc80"],
+  ["e1bdb1", "ceb1cc81"],
+  ["e1bdb2", "ceb5cc80"],
+  ["e1bdb3", "ceb5cc81"],
+  ["e1bdb4", "ceb7cc80"],
+  ["e1bdb5", "ceb7cc81"],
+  ["e1bdb6", "ceb9cc80"],
+  ["e1bdb7", "ceb9cc81"],
+  ["e1bdb8", "cebfcc80"],
+  ["e1bdb9", "cebfcc81"],
+  ["e1bdba", "cf85cc80"],
+  ["e1bdbb", "cf85cc81"],
+  ["e1bdbc", "cf89cc80"],
+  ["e1bdbd", "cf89cc81"],
+  ["e1be80", "ceb1cd85cc93"],
+  ["e1be81", "ceb1cd85cc94"],
+  ["e1be82", "ceb1cd85cc93cc80"],
+  ["e1be83", "ceb1cd85cc94cc80"],
+  ["e1be84", "ceb1cd85cc93cc81"],
+  ["e1be85", "ceb1cd85cc94cc81"],
+  ["e1be86", "ceb1cd85cc93cd82"],
+  ["e1be87", "ceb1cd85cc94cd82"],
+  ["e1be88", "ce91cd85cc93"],
+  ["e1be89", "ce91cd85cc94"],
+  ["e1be8a", "ce91cd85cc93cc80"],
+  ["e1be8b", "ce91cd85cc94cc80"],
+  ["e1be8c", "ce91cd85cc93cc81"],
+  ["e1be8d", "ce91cd85cc94cc81"],
+  ["e1be8e", "ce91cd85cc93cd82"],
+  ["e1be8f", "ce91cd85cc94cd82"],
+  ["e1be90", "ceb7cd85cc93"],
+  ["e1be91", "ceb7cd85cc94"],
+  ["e1be92", "ceb7cd85cc93cc80"],
+  ["e1be93", "ceb7cd85cc94cc80"],
+  ["e1be94", "ceb7cd85cc93cc81"],
+  ["e1be95", "ceb7cd85cc94cc81"],
+  ["e1be96", "ceb7cd85cc93cd82"],
+  ["e1be97", "ceb7cd85cc94cd82"],
+  ["e1be98", "ce97cd85cc93"],
+  ["e1be99", "ce97cd85cc94"],
+  ["e1be9a", "ce97cd85cc93cc80"],
+  ["e1be9b", "ce97cd85cc94cc80"],
+  ["e1be9c", "ce97cd85cc93cc81"],
+  ["e1be9d", "ce97cd85cc94cc81"],
+  ["e1be9e", "ce97cd85cc93cd82"],
+  ["e1be9f", "ce97cd85cc94cd82"],
+  ["e1bea0", "cf89cd85cc93"],
+  ["e1bea1", "cf89cd85cc94"],
+  ["e1bea2", "cf89cd85cc93cc80"],
+  ["e1bea3", "cf89cd85cc94cc80"],
+  ["e1bea4", "cf89cd85cc93cc81"],
+  ["e1bea5", "cf89cd85cc94cc81"],
+  ["e1bea6", "cf89cd85cc93cd82"],
+  ["e1bea7", "cf89cd85cc94cd82"],
+  ["e1bea8", "cea9cd85cc93"],
+  ["e1bea9", "cea9cd85cc94"],
+  ["e1beaa", "cea9cd85cc93cc80"],
+  ["e1beab", "cea9cd85cc94cc80"],
+  ["e1beac", "cea9cd85cc93cc81"],
+  ["e1bead", "cea9cd85cc94cc81"],
+  ["e1beae", "cea9cd85cc93cd82"],
+  ["e1beaf", "cea9cd85cc94cd82"],
+  ["e1beb0", "ceb1cc86"],
+  ["e1beb1", "ceb1cc84"],
+  ["e1beb2", "ceb1cd85cc80"],
+  ["e1beb3", "ceb1cd85"],
+  ["e1beb4", "ceb1cd85cc81"],
+  ["e1beb6", "ceb1cd82"],
+  ["e1beb7", "ceb1cd85cd82"],
+  ["e1beb8", "ce91cc86"],
+  ["e1beb9", "ce91cc84"],
+  ["e1beba", "ce91cc80"],
+  ["e1bebb", "ce91cc81"],
+  ["e1bebc", "ce91cd85"],
+  ["e1bebe", "ceb9"],
+  ["e1bf81", "c2a8cd82"],
+  ["e1bf82", "ceb7cd85cc80"],
+  ["e1bf83", "ceb7cd85"],
+  ["e1bf84", "ceb7cd85cc81"],
+  ["e1bf86", "ceb7cd82"],
+  ["e1bf87", "ceb7cd85cd82"],
+  ["e1bf88", "ce95cc80"],
+  ["e1bf89", "ce95cc81"],
+  ["e1bf8a", "ce97cc80"],
+  ["e1bf8b", "ce97cc81"],
+  ["e1bf8c", "ce97cd85"],
+  ["e1bf8d", "e1bebfcc80"],
+  ["e1bf8e", "e1bebfcc81"],
+  ["e1bf8f", "e1bebfcd82"],
+  ["e1bf90", "ceb9cc86"],
+  ["e1bf91", "ceb9cc84"],
+  ["e1bf92", "ceb9cc88cc80"],
+  ["e1bf93", "ceb9cc88cc81"],
+  ["e1bf96", "ceb9cd82"],
+  ["e1bf97", "ceb9cc88cd82"],
+  ["e1bf98", "ce99cc86"],
+  ["e1bf99", "ce99cc84"],
+  ["e1bf9a", "ce99cc80"],
+  ["e1bf9b", "ce99cc81"],
+  ["e1bf9d", "e1bfbecc80"],
+  ["e1bf9e", "e1bfbecc81"],
+  ["e1bf9f", "e1bfbecd82"],
+  ["e1bfa0", "cf85cc86"],
+  ["e1bfa1", "cf85cc84"],
+  ["e1bfa2", "cf85cc88cc80"],
+  ["e1bfa3", "cf85cc88cc81"],
+  ["e1bfa4", "cf81cc93"],
+  ["e1bfa5", "cf81cc94"],
+  ["e1bfa6", "cf85cd82"],
+  ["e1bfa7", "cf85cc88cd82"],
+  ["e1bfa8", "cea5cc86"],
+  ["e1bfa9", "cea5cc84"],
+  ["e1bfaa", "cea5cc80"],
+  ["e1bfab", "cea5cc81"],
+  ["e1bfac", "cea1cc94"],
+  ["e1bfad", "c2a8cc80"],
+  ["e1bfae", "c2a8cc81"],
+  ["e1bfaf", "60"],
+  ["e1bfb2", "cf89cd85cc80"],
+  ["e1bfb3", "cf89cd85"],
+  ["e1bfb4", "cebfcd85cc81"],
+  ["e1bfb6", "cf89cd82"],
+  ["e1bfb7", "cf89cd85cd82"],
+  ["e1bfb8", "ce9fcc80"],
+  ["e1bfb9", "ce9fcc81"],
+  ["e1bfba", "cea9cc80"],
+  ["e1bfbb", "cea9cc81"],
+  ["e1bfbc", "cea9cd85"],
+  ["e1bfbd", "c2b4"],
+  ["e3818c", "e3818be38299"],
+  ["e3818e", "e3818de38299"],
+  ["e38190", "e3818fe38299"],
+  ["e38192", "e38191e38299"],
+  ["e38194", "e38193e38299"],
+  ["e38196", "e38195e38299"],
+  ["e38198", "e38197e38299"],
+  ["e3819a", "e38199e38299"],
+  ["e3819c", "e3819be38299"],
+  ["e3819e", "e3819de38299"],
+  ["e381a0", "e3819fe38299"],
+  ["e381a2", "e381a1e38299"],
+  ["e381a5", "e381a4e38299"],
+  ["e381a7", "e381a6e38299"],
+  ["e381a9", "e381a8e38299"],
+  ["e381b0", "e381afe38299"],
+  ["e381b1", "e381afe3829a"],
+  ["e381b3", "e381b2e38299"],
+  ["e381b4", "e381b2e3829a"],
+  ["e381b6", "e381b5e38299"],
+  ["e381b7", "e381b5e3829a"],
+  ["e381b9", "e381b8e38299"],
+  ["e381ba", "e381b8e3829a"],
+  ["e381bc", "e381bbe38299"],
+  ["e381bd", "e381bbe3829a"],
+  ["e38294", "e38186e38299"],
+  ["e3829e", "e3829de38299"],
+  ["e382ac", "e382abe38299"],
+  ["e382ae", "e382ade38299"],
+  ["e382b0", "e382afe38299"],
+  ["e382b2", "e382b1e38299"],
+  ["e382b4", "e382b3e38299"],
+  ["e382b6", "e382b5e38299"],
+  ["e382b8", "e382b7e38299"],
+  ["e382ba", "e382b9e38299"],
+  ["e382bc", "e382bbe38299"],
+  ["e382be", "e382bde38299"],
+  ["e38380", "e382bfe38299"],
+  ["e38382", "e38381e38299"],
+  ["e38385", "e38384e38299"],
+  ["e38387", "e38386e38299"],
+  ["e38389", "e38388e38299"],
+  ["e38390", "e3838fe38299"],
+  ["e38391", "e3838fe3829a"],
+  ["e38393", "e38392e38299"],
+  ["e38394", "e38392e3829a"],
+  ["e38396", "e38395e38299"],
+  ["e38397", "e38395e3829a"],
+  ["e38399", "e38398e38299"],
+  ["e3839a", "e38398e3829a"],
+  ["e3839c", "e3839be38299"],
+  ["e3839d", "e3839be3829a"],
+  ["e383b4", "e382a6e38299"],
+  ["e383b7", "e383afe38299"],
+  ["e383b8", "e383b0e38299"],
+  ["e383b9", "e383b1e38299"],
+  ["e383ba", "e383b2e38299"],
+  ["e383be", "e383bde38299"],
+  ["efac9f", "d7b2d6b7"],
+  ["efacaa", "d7a9d781"],
+  ["efacab", "d7a9d782"],
+  ["efacac", "d7a9d6bcd781"],
+  ["efacad", "d7a9d6bcd782"],
+  ["efacae", "d790d6b7"],
+  ["efacaf", "d790d6b8"],
+  ["efacb0", "d790d6bc"],
+  ["efacb1", "d791d6bc"],
+  ["efacb2", "d792d6bc"],
+  ["efacb3", "d793d6bc"],
+  ["efacb4", "d794d6bc"],
+  ["efacb5", "d795d6bc"],
+  ["efacb6", "d796d6bc"],
+  ["efacb8", "d798d6bc"],
+  ["efacb9", "d799d6bc"],
+  ["efacba", "d79ad6bc"],
+  ["efacbb", "d79bd6bc"],
+  ["efacbc", "d79cd6bc"],
+  ["efacbe", "d79ed6bc"],
+  ["efad80", "d7a0d6bc"],
+  ["efad81", "d7a1d6bc"],
+  ["efad83", "d7a3d6bc"],
+  ["efad84", "d7a4d6bc"],
+  ["efad86", "d7a6d6bc"],
+  ["efad87", "d7a7d6bc"],
+  ["efad88", "d7a8d6bc"],
+  ["efad89", "d7a9d6bc"],
+  ["efad8a", "d7aad6bc"],
+  ["efad8b", "d795d6b9"],
+  ["efad8c", "d791d6bf"],
+  ["efad8d", "d79bd6bf"],
+  ["efad8e", "d7a4d6bf"],
+]
diff --git a/enc/trans/utf8_mac.trans b/enc/trans/utf8_mac.trans
new file mode 100644
index 0000000000..0d69dba46a
--- /dev/null
+++ b/enc/trans/utf8_mac.trans
@@ -0,0 +1,242 @@
+#include "transcode_data.h"
+
+<%
+  require 'utf8_mac-tbl'
+
+  transcode_tblgen("UTF-8", "UTF8-MAC",
+    MAC_DECOMPOSE_TBL + [
+    ["{00-7F}", :nomap],
+    ["{c2-df}{80-bf}", :nomap0],
+    ["e0{a0-bf}{80-bf}", :nomap0],
+    ["{e1-ec}{80-bf}{80-bf}", :nomap0],
+    ["ed{80-9f}{80-bf}", :nomap0],
+    ["{ee-ef}{80-bf}{80-bf}", :nomap0],
+    ["f0{90-bf}{80-bf}{80-bf}", :nomap0],
+    ["{f1-f3}{80-bf}{80-bf}{80-bf}", :nomap0],
+  ])
+
+  map = {}
+  map["{00-7f}"] = :func_so
+  map["{c2-df}{80-bf}"] = :func_so
+  map["e0{a0-bf}{80-bf}"] = :func_so
+  map["{e1-ec}{80-bf}{80-bf}"] = :func_so
+  map["ed{80-9f}{80-bf}"] = :func_so
+  map["{ee-ef}{80-bf}{80-bf}"] = :func_so
+  map["f0{90-bf}{80-bf}{80-bf}"] = :func_so
+  map["{f1-f3}{80-bf}{80-bf}{80-bf}"] = :func_so
+  map["f4{80-8f}{80-bf}{80-bf}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF8_MAC")
+
+  ary = MAC_DECOMPOSE_TBL.select{|k,v|v.scan(/[0-7C-F].(?:[89AB].)*/i).length == 3}
+  transcode_generate_node(ActionMap.parse(ary.map{|k,v|[v,k]}), "from_utf8_mac_nfc3")
+
+  ary = MAC_DECOMPOSE_TBL.select{|k,v|v.scan(/[0-7C-F].(?:[89AB].)*/i).length == 2}
+  transcode_generate_node(ActionMap.parse(ary.map{|k,v|[v,k]}), "from_utf8_mac_nfc2")
+%>
+
+<%= transcode_generated_code %>
+
+#define BYTE_ADDR(index) (<%= OUTPUT_PREFIX %>byte_array + (index))
+#define WORD_ADDR(index) (<%= OUTPUT_PREFIX %>word_array + INFO2WORDINDEX(index))
+#define BL_BASE BYTE_ADDR(BYTE_LOOKUP_BASE(WORD_ADDR(next_info)))
+#define BL_INFO WORD_ADDR(BYTE_LOOKUP_INFO(WORD_ADDR(next_info)))
+#define BL_MIN_BYTE     (BL_BASE[0])
+#define BL_MAX_BYTE     (BL_BASE[1])
+#define BL_OFFSET(byte) (BL_BASE[2+(byte)-BL_MIN_BYTE])
+#define BL_ACTION(byte) (BL_INFO[BL_OFFSET((byte))])
+
+#define STATUS_BUF_SIZE 16
+struct from_utf8_mac_status {
+    unsigned char buf[STATUS_BUF_SIZE];
+    int beg;
+    int end;
+    int len;
+};
+#define buf_length(sp) (sp->len)
+
+int
+buf_bytesize(struct from_utf8_mac_status *sp)
+{
+    int size = sp->end - sp->beg + STATUS_BUF_SIZE;
+    size %= STATUS_BUF_SIZE;
+    return size;
+}
+
+void
+buf_push(struct from_utf8_mac_status *sp, const unsigned char *p, ssize_t l)
+{
+    const unsigned char *pend = p + l;
+    while (p < pend) {
+        sp->buf[sp->end++] = *p++;
+        sp->end %= STATUS_BUF_SIZE;
+    }
+    sp->len++;
+}
+
+unsigned char
+buf_shift(struct from_utf8_mac_status *sp)
+{
+    unsigned char c = sp->buf[sp->beg++];
+    sp->beg %= STATUS_BUF_SIZE;
+    if ((c & 0xC0) != 0x80) sp->len--;
+    return c;
+}
+
+void
+buf_shift_char(struct from_utf8_mac_status *sp)
+{
+    if (sp->beg == sp->end) return;
+    do {
+        buf_shift(sp);
+    } while (sp->beg != sp->end && (sp->buf[sp->beg] & 0xC0) == 0x80);
+}
+
+void
+buf_clear(struct from_utf8_mac_status *sp)
+{
+    sp->beg = sp->end = sp->len = 0;
+}
+
+unsigned char
+buf_at(struct from_utf8_mac_status *sp, int pos)
+{
+    pos += sp->beg;
+    pos %= STATUS_BUF_SIZE;
+    return sp->buf[pos];
+}
+
+int
+buf_output_char(struct from_utf8_mac_status *sp, unsigned char *o)
+{
+    int n = 0;
+    while (sp->beg != sp->end) {
+        o[n++] = buf_shift(sp);
+        if ((sp->buf[sp->beg] & 0xC0) != 0x80) break;
+    }
+    return n;
+}
+
+int
+buf_output_all(struct from_utf8_mac_status *sp, unsigned char *o)
+{
+    int n = 0;
+    while (sp->beg != sp->end) {
+        o[n++] = buf_shift(sp);
+    }
+    return n;
+}
+
+VALUE
+get_info(VALUE next_info, struct from_utf8_mac_status *sp) {
+    int pos = 0;
+    while (pos < buf_bytesize(sp)) {
+        unsigned char next_byte = buf_at(sp, pos++);
+        if (next_byte < BL_MIN_BYTE || BL_MAX_BYTE < next_byte)
+            next_info = INVALID;
+        else {
+            next_info = (VALUE)BL_ACTION(next_byte);
+        }
+        if ((next_info & 3) == 0) continue;
+        break;
+    }
+    return next_info;
+}
+
+int
+buf_apply(int mode, struct from_utf8_mac_status *sp, unsigned char *o)
+{
+    int n = 0;
+    VALUE next_info = mode == 3 ? from_utf8_mac_nfc3 : from_utf8_mac_nfc2;
+    next_info = get_info(next_info, sp);
+    switch (next_info & 0x1F) {
+      case THREEbt:
+      case TWObt:
+        o[n++] = getBT1(next_info);
+        o[n++] = getBT2(next_info);
+        if (THREEbt == (next_info & 0x1F)) o[n++] = getBT3(next_info);
+        if (mode == 3) {
+            buf_clear(sp);
+        }
+        else {
+            buf_shift_char(sp);
+            buf_shift_char(sp);
+        }
+        break;
+      default:
+        return 0;
+    }
+    return n;
+}
+
+static int
+from_utf8_mac_init(void *statep)
+{
+    struct from_utf8_mac_status *sp = statep;
+    buf_clear(sp);
+    return 0;
+}
+
+static ssize_t
+from_utf8_mac_finish(void *statep,
+        unsigned char *o, size_t osize)
+{
+    struct from_utf8_mac_status *sp = statep;
+    int n;
+    if (buf_length(sp) == 0) return 0;
+    n = buf_apply(2, sp, o) + buf_output_all(sp, o);
+    return n;
+}
+
+static ssize_t
+fun_so_from_utf8_mac(void *statep,
+        const unsigned char *s, size_t l,
+        unsigned char *o, size_t osize)
+{
+    struct from_utf8_mac_status *sp = statep;
+    ssize_t n = 0;
+
+    switch (l) {
+      case 1:
+        n = from_utf8_mac_finish(sp, o, osize);
+        break;
+      case 4:
+        n = from_utf8_mac_finish(sp, o, osize);
+        o[n++] = *s++;
+        o[n++] = *s++;
+        o[n++] = *s++;
+        o[n++] = *s++;
+        return n;
+    }
+
+    buf_push(sp, s, l);
+    if (buf_length(sp) < 3) return n;
+
+    n = buf_apply(3, sp, o);
+    if (n > 0) return n;
+
+    n = buf_apply(2, sp, o);
+    if (n > 0) return n;
+
+    return buf_output_char(sp, o);
+}
+
+static const rb_transcoder
+rb_from_UTF8_MAC = {
+    "UTF8-MAC", "UTF-8", from_UTF8_MAC,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    10, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    sizeof(struct from_utf8_mac_status), from_utf8_mac_init, from_utf8_mac_init,
+    NULL, NULL, NULL, fun_so_from_utf8_mac,
+    from_utf8_mac_finish
+};
+
+void
+Init_utf8_mac(void)
+{
+<%= transcode_register_code %>
+    rb_register_transcoder(&rb_from_UTF8_MAC);
+}
+
diff --git a/enc/trans/utf_16_32.trans b/enc/trans/utf_16_32.trans
new file mode 100644
index 0000000000..1bf6ed0975
--- /dev/null
+++ b/enc/trans/utf_16_32.trans
@@ -0,0 +1,369 @@
+#include "transcode_data.h"
+
+<%
+  map = {}
+  map["{00-ff}{00-d7,e0-ff}"] = :func_so
+  map["{00-ff}{d8-db}{00-ff}{dc-df}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF_16LE")
+
+  map = {}
+  map["{00-ff}{00-d7,e0-ff}0000"] = :func_so
+  map["{00-ff}{00-ff}{01-10}00"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF_32LE")
+
+  map = {}
+  map["{00-d7,e0-ff}{00-ff}"] = :func_so
+  map["{d8-db}{00-ff}{dc-df}{00-ff}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF_16BE")
+
+  map = {}
+  map["0000{00-d7,e0-ff}{00-ff}"] = :func_so
+  map["00{01-10}{00-ff}{00-ff}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF_32BE")
+
+  map = {}
+  map["{00-7f}"] = :func_so
+  map["{c2-df}{80-bf}"] = :func_so
+  map["e0{a0-bf}{80-bf}"] = :func_so
+  map["{e1-ec}{80-bf}{80-bf}"] = :func_so
+  map["ed{80-9f}{80-bf}"] = :func_so
+  map["{ee-ef}{80-bf}{80-bf}"] = :func_so
+  map["f0{90-bf}{80-bf}{80-bf}"] = :func_so
+  map["{f1-f3}{80-bf}{80-bf}{80-bf}"] = :func_so
+  map["f4{80-8f}{80-bf}{80-bf}"] = :func_so
+  am = ActionMap.parse(map)
+  transcode_generate_node(am, "from_UTF_8")
+%>
+
+<%= transcode_generated_code %>
+
+static ssize_t
+fun_so_from_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (!s[0] && s[1]<0x80) {
+        o[0] = s[1];
+        return 1;
+    }
+    else if (s[0]<0x08) {
+        o[0] = 0xC0 | (s[0]<<2) | (s[1]>>6);
+        o[1] = 0x80 | (s[1]&0x3F);
+        return 2;
+    }
+    else if ((s[0]&0xF8)!=0xD8) {
+        o[0] = 0xE0 | (s[0]>>4);
+        o[1] = 0x80 | ((s[0]&0x0F)<<2) | (s[1]>>6);
+        o[2] = 0x80 | (s[1]&0x3F);
+        return 3;
+    }
+    else {
+        unsigned int u = (((s[0]&0x03)<<2)|(s[1]>>6)) + 1;
+        o[0] = 0xF0 | (u>>2);
+        o[1] = 0x80 | ((u&0x03)<<4) | ((s[1]>>2)&0x0F);
+        o[2] = 0x80 | ((s[1]&0x03)<<4) | ((s[2]&0x03)<<2) | (s[3]>>6);
+        o[3] = 0x80 | (s[3]&0x3F);
+        return 4;
+    }
+}
+
+static ssize_t
+fun_so_to_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (!(s[0]&0x80)) {
+        o[0] = 0x00;
+        o[1] = s[0];
+        return 2;
+    }
+    else if ((s[0]&0xE0)==0xC0) {
+        o[0] = (s[0]>>2)&0x07;
+        o[1] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
+        return 2;
+    }
+    else if ((s[0]&0xF0)==0xE0) {
+        o[0] = (s[0]<<4) | ((s[1]>>2)^0x20);
+        o[1] = (s[1]<<6) | (s[2]^0x80);
+        return 2;
+    }
+    else {
+        int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1;
+        o[0] = 0xD8 | (w>>2);
+        o[1] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8);
+        o[2] = 0xDC | ((s[2]>>2)&0x03);
+        o[3] = (s[2]<<6) | (s[3]&~0x80);
+        return 4;
+    }
+}
+
+static ssize_t
+fun_so_from_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (!s[1] && s[0]<0x80) {
+        o[0] = s[0];
+        return 1;
+    }
+    else if (s[1]<0x08) {
+        o[0] = 0xC0 | (s[1]<<2) | (s[0]>>6);
+        o[1] = 0x80 | (s[0]&0x3F);
+        return 2;
+    }
+    else if ((s[1]&0xF8)!=0xD8) {
+        o[0] = 0xE0 | (s[1]>>4);
+        o[1] = 0x80 | ((s[1]&0x0F)<<2) | (s[0]>>6);
+        o[2] = 0x80 | (s[0]&0x3F);
+        return 3;
+    }
+    else {
+        unsigned int u = (((s[1]&0x03)<<2)|(s[0]>>6)) + 1;
+        o[0] = 0xF0 | u>>2;
+        o[1] = 0x80 | ((u&0x03)<<4) | ((s[0]>>2)&0x0F);
+        o[2] = 0x80 | ((s[0]&0x03)<<4) | ((s[3]&0x03)<<2) | (s[2]>>6);
+        o[3] = 0x80 | (s[2]&0x3F);
+        return 4;
+    }
+}
+
+static ssize_t
+fun_so_to_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (!(s[0]&0x80)) {
+        o[1] = 0x00;
+        o[0] = s[0];
+        return 2;
+    }
+    else if ((s[0]&0xE0)==0xC0) {
+        o[1] = (s[0]>>2)&0x07;
+        o[0] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
+        return 2;
+    }
+    else if ((s[0]&0xF0)==0xE0) {
+        o[1] = (s[0]<<4) | ((s[1]>>2)^0x20);
+        o[0] = (s[1]<<6) | (s[2]^0x80);
+        return 2;
+    }
+    else {
+        int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1;
+        o[1] = 0xD8 | (w>>2);
+        o[0] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8);
+        o[3] = 0xDC | ((s[2]>>2)&0x03);
+        o[2] = (s[2]<<6) | (s[3]&~0x80);
+        return 4;
+    }
+}
+
+static ssize_t
+fun_so_from_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (!s[1]) {
+        if (s[2]==0 && s[3]<0x80) {
+            o[0] = s[3];
+            return 1;
+        }
+        else if (s[2]<0x08) {
+            o[0] = 0xC0 | (s[2]<<2) | (s[3]>>6);
+            o[1] = 0x80 | (s[3]&0x3F);
+            return 2;
+        }
+        else {
+            o[0] = 0xE0 | (s[2]>>4);
+            o[1] = 0x80 | ((s[2]&0x0F)<<2) | (s[3]>>6);
+            o[2] = 0x80 | (s[3]&0x3F);
+            return 3;
+        }
+    }
+    else {
+        o[0] = 0xF0 | (s[1]>>2);
+        o[1] = 0x80 | ((s[1]&0x03)<<4) | (s[2]>>4);
+        o[2] = 0x80 | ((s[2]&0x0F)<<2) | (s[3]>>6);
+        o[3] = 0x80 | (s[3]&0x3F);
+        return 4;
+    }
+}
+
+static ssize_t
+fun_so_to_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    o[0] = 0;
+    if (!(s[0]&0x80)) {
+        o[1] = o[2] = 0x00;
+        o[3] = s[0];
+    }
+    else if ((s[0]&0xE0)==0xC0) {
+        o[1] = 0x00;
+        o[2] = (s[0]>>2)&0x07;
+        o[3] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
+    }
+    else if ((s[0]&0xF0)==0xE0) {
+        o[1] = 0x00;
+        o[2] = (s[0]<<4) | ((s[1]>>2)^0x20);
+        o[3] = (s[1]<<6) | (s[2]^0x80);
+    }
+    else {
+        o[1] = ((s[0]&0x07)<<2) | ((s[1]>>4)&0x03);
+        o[2] = ((s[1]&0x0F)<<4) | ((s[2]>>2)&0x0F);
+        o[3] = ((s[2]&0x03)<<6) | (s[3]&0x3F);
+    }
+    return 4;
+}
+
+static ssize_t
+fun_so_from_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    if (!s[2]) {
+        if (s[1]==0 && s[0]<0x80) {
+            o[0] = s[0];
+            return 1;
+        }
+        else if (s[1]<0x08) {
+            o[0] = 0xC0 | (s[1]<<2) | (s[0]>>6);
+            o[1] = 0x80 | (s[0]&0x3F);
+            return 2;
+        }
+        else {
+            o[0] = 0xE0 | (s[1]>>4);
+            o[1] = 0x80 | ((s[1]&0x0F)<<2) | (s[0]>>6);
+            o[2] = 0x80 | (s[0]&0x3F);
+            return 3;
+        }
+    }
+    else {
+        o[0] = 0xF0 | (s[2]>>2);
+        o[1] = 0x80 | ((s[2]&0x03)<<4) | (s[1]>>4);
+        o[2] = 0x80 | ((s[1]&0x0F)<<2) | (s[0]>>6);
+        o[3] = 0x80 | (s[0]&0x3F);
+        return 4;
+    }
+}
+
+static ssize_t
+fun_so_to_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    o[3] = 0;
+    if (!(s[0]&0x80)) {
+        o[2] = o[1] = 0x00;
+        o[0] = s[0];
+    }
+    else if ((s[0]&0xE0)==0xC0) {
+        o[2] = 0x00;
+        o[1] = (s[0]>>2)&0x07;
+        o[0] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
+    }
+    else if ((s[0]&0xF0)==0xE0) {
+        o[2] = 0x00;
+        o[1] = (s[0]<<4) | ((s[1]>>2)^0x20);
+        o[0] = (s[1]<<6) | (s[2]^0x80);
+    }
+    else {
+        o[2] = ((s[0]&0x07)<<2) | ((s[1]>>4)&0x03);
+        o[1] = ((s[1]&0x0F)<<4) | ((s[2]>>2)&0x0F);
+        o[0] = ((s[2]&0x03)<<6) | (s[3]&0x3F);
+    }
+    return 4;
+}
+
+static const rb_transcoder
+rb_from_UTF_16BE = {
+    "UTF-16BE", "UTF-8", from_UTF_16BE,
+    TRANSCODE_TABLE_INFO,
+    2, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_from_utf_16be
+};
+
+static const rb_transcoder
+rb_to_UTF_16BE = {
+    "UTF-8", "UTF-16BE", from_UTF_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_to_utf_16be
+};
+
+static const rb_transcoder
+rb_from_UTF_16LE = {
+    "UTF-16LE", "UTF-8", from_UTF_16LE,
+    TRANSCODE_TABLE_INFO,
+    2, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_from_utf_16le
+};
+
+static const rb_transcoder
+rb_to_UTF_16LE = {
+    "UTF-8", "UTF-16LE", from_UTF_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_to_utf_16le
+};
+
+static const rb_transcoder
+rb_from_UTF_32BE = {
+    "UTF-32BE", "UTF-8", from_UTF_32BE,
+    TRANSCODE_TABLE_INFO,
+    4, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_from_utf_32be
+};
+
+static const rb_transcoder
+rb_to_UTF_32BE = {
+    "UTF-8", "UTF-32BE", from_UTF_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_to_utf_32be
+};
+
+static const rb_transcoder
+rb_from_UTF_32LE = {
+    "UTF-32LE", "UTF-8", from_UTF_32LE,
+    TRANSCODE_TABLE_INFO,
+    4, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_from_utf_32le
+};
+
+static const rb_transcoder
+rb_to_UTF_32LE = {
+    "UTF-8", "UTF-32LE", from_UTF_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    4, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_to_utf_32le
+};
+
+void
+Init_utf_16_32(void)
+{
+    rb_register_transcoder(&rb_from_UTF_16BE);
+    rb_register_transcoder(&rb_to_UTF_16BE);
+    rb_register_transcoder(&rb_from_UTF_16LE);
+    rb_register_transcoder(&rb_to_UTF_16LE);
+    rb_register_transcoder(&rb_from_UTF_32BE);
+    rb_register_transcoder(&rb_to_UTF_32BE);
+    rb_register_transcoder(&rb_from_UTF_32LE);
+    rb_register_transcoder(&rb_to_UTF_32LE);
+}
diff --git a/enc/trans/windows-1250-tbl.rb b/enc/trans/windows-1250-tbl.rb
new file mode 100644
index 0000000000..52063e17b1
--- /dev/null
+++ b/enc/trans/windows-1250-tbl.rb
@@ -0,0 +1,125 @@
+WINDOWS_1250_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A4",0xA4],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["BB",0xBB],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C4",0xC4],
+  ["C7",0xC7],
+  ["C9",0xC9],
+  ["CB",0xCB],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["DA",0xDA],
+  ["DC",0xDC],
+  ["DD",0xDD],
+  ["DF",0xDF],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E4",0xE4],
+  ["E7",0xE7],
+  ["E9",0xE9],
+  ["EB",0xEB],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["FA",0xFA],
+  ["FC",0xFC],
+  ["FD",0xFD],
+  ["C3",0x102],
+  ["E3",0x103],
+  ["A5",0x104],
+  ["B9",0x105],
+  ["C6",0x106],
+  ["E6",0x107],
+  ["C8",0x10C],
+  ["E8",0x10D],
+  ["CF",0x10E],
+  ["EF",0x10F],
+  ["D0",0x110],
+  ["F0",0x111],
+  ["CA",0x118],
+  ["EA",0x119],
+  ["CC",0x11A],
+  ["EC",0x11B],
+  ["C5",0x139],
+  ["E5",0x13A],
+  ["BC",0x13D],
+  ["BE",0x13E],
+  ["A3",0x141],
+  ["B3",0x142],
+  ["D1",0x143],
+  ["F1",0x144],
+  ["D2",0x147],
+  ["F2",0x148],
+  ["D5",0x150],
+  ["F5",0x151],
+  ["C0",0x154],
+  ["E0",0x155],
+  ["D8",0x158],
+  ["F8",0x159],
+  ["8C",0x15A],
+  ["9C",0x15B],
+  ["AA",0x15E],
+  ["BA",0x15F],
+  ["8A",0x160],
+  ["9A",0x161],
+  ["DE",0x162],
+  ["FE",0x163],
+  ["8D",0x164],
+  ["9D",0x165],
+  ["D9",0x16E],
+  ["F9",0x16F],
+  ["DB",0x170],
+  ["FB",0x171],
+  ["8F",0x179],
+  ["9F",0x17A],
+  ["AF",0x17B],
+  ["BF",0x17C],
+  ["8E",0x17D],
+  ["9E",0x17E],
+  ["A1",0x2C7],
+  ["A2",0x2D8],
+  ["FF",0x2D9],
+  ["B2",0x2DB],
+  ["BD",0x2DD],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["80",0x20AC],
+  ["99",0x2122],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-1251-tbl.rb b/enc/trans/windows-1251-tbl.rb
new file mode 100644
index 0000000000..870c718b72
--- /dev/null
+++ b/enc/trans/windows-1251-tbl.rb
@@ -0,0 +1,129 @@
+WINDOWS_1251_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A4",0xA4],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A9",0xA9],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["BB",0xBB],
+  ["A8",0x401],
+  ["80",0x402],
+  ["81",0x403],
+  ["AA",0x404],
+  ["BD",0x405],
+  ["B2",0x406],
+  ["AF",0x407],
+  ["A3",0x408],
+  ["8A",0x409],
+  ["8C",0x40A],
+  ["8E",0x40B],
+  ["8D",0x40C],
+  ["A1",0x40E],
+  ["8F",0x40F],
+  ["C0",0x410],
+  ["C1",0x411],
+  ["C2",0x412],
+  ["C3",0x413],
+  ["C4",0x414],
+  ["C5",0x415],
+  ["C6",0x416],
+  ["C7",0x417],
+  ["C8",0x418],
+  ["C9",0x419],
+  ["CA",0x41A],
+  ["CB",0x41B],
+  ["CC",0x41C],
+  ["CD",0x41D],
+  ["CE",0x41E],
+  ["CF",0x41F],
+  ["D0",0x420],
+  ["D1",0x421],
+  ["D2",0x422],
+  ["D3",0x423],
+  ["D4",0x424],
+  ["D5",0x425],
+  ["D6",0x426],
+  ["D7",0x427],
+  ["D8",0x428],
+  ["D9",0x429],
+  ["DA",0x42A],
+  ["DB",0x42B],
+  ["DC",0x42C],
+  ["DD",0x42D],
+  ["DE",0x42E],
+  ["DF",0x42F],
+  ["E0",0x430],
+  ["E1",0x431],
+  ["E2",0x432],
+  ["E3",0x433],
+  ["E4",0x434],
+  ["E5",0x435],
+  ["E6",0x436],
+  ["E7",0x437],
+  ["E8",0x438],
+  ["E9",0x439],
+  ["EA",0x43A],
+  ["EB",0x43B],
+  ["EC",0x43C],
+  ["ED",0x43D],
+  ["EE",0x43E],
+  ["EF",0x43F],
+  ["F0",0x440],
+  ["F1",0x441],
+  ["F2",0x442],
+  ["F3",0x443],
+  ["F4",0x444],
+  ["F5",0x445],
+  ["F6",0x446],
+  ["F7",0x447],
+  ["F8",0x448],
+  ["F9",0x449],
+  ["FA",0x44A],
+  ["FB",0x44B],
+  ["FC",0x44C],
+  ["FD",0x44D],
+  ["FE",0x44E],
+  ["FF",0x44F],
+  ["B8",0x451],
+  ["90",0x452],
+  ["83",0x453],
+  ["BA",0x454],
+  ["BE",0x455],
+  ["B3",0x456],
+  ["BF",0x457],
+  ["BC",0x458],
+  ["9A",0x459],
+  ["9C",0x45A],
+  ["9E",0x45B],
+  ["9D",0x45C],
+  ["A2",0x45E],
+  ["9F",0x45F],
+  ["A5",0x490],
+  ["B4",0x491],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["88",0x20AC],
+  ["B9",0x2116],
+  ["99",0x2122],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-1252-tbl.rb b/enc/trans/windows-1252-tbl.rb
new file mode 100644
index 0000000000..cefc72dff2
--- /dev/null
+++ b/enc/trans/windows-1252-tbl.rb
@@ -0,0 +1,125 @@
+WINDOWS_1252_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AA",0xAA],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0xB9],
+  ["BA",0xBA],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["BF",0xBF],
+  ["C0",0xC0],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0xC7],
+  ["C8",0xC8],
+  ["C9",0xC9],
+  ["CA",0xCA],
+  ["CB",0xCB],
+  ["CC",0xCC],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D0",0xD0],
+  ["D1",0xD1],
+  ["D2",0xD2],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0xD8],
+  ["D9",0xD9],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DD",0xDD],
+  ["DE",0xDE],
+  ["DF",0xDF],
+  ["E0",0xE0],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EC",0xEC],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F0",0xF0],
+  ["F1",0xF1],
+  ["F2",0xF2],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0xF8],
+  ["F9",0xF9],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FD",0xFD],
+  ["FE",0xFE],
+  ["FF",0xFF],
+  ["8C",0x152],
+  ["9C",0x153],
+  ["8A",0x160],
+  ["9A",0x161],
+  ["9F",0x178],
+  ["8E",0x17D],
+  ["9E",0x17E],
+  ["83",0x192],
+  ["88",0x2C6],
+  ["98",0x2DC],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["80",0x20AC],
+  ["99",0x2122],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-1253-tbl.rb b/enc/trans/windows-1253-tbl.rb
new file mode 100644
index 0000000000..132edb60ba
--- /dev/null
+++ b/enc/trans/windows-1253-tbl.rb
@@ -0,0 +1,113 @@
+WINDOWS_1253_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["BB",0xBB],
+  ["BD",0xBD],
+  ["83",0x192],
+  ["B4",0x384],
+  ["A1",0x385],
+  ["A2",0x386],
+  ["B8",0x388],
+  ["B9",0x389],
+  ["BA",0x38A],
+  ["BC",0x38C],
+  ["BE",0x38E],
+  ["BF",0x38F],
+  ["C0",0x390],
+  ["C1",0x391],
+  ["C2",0x392],
+  ["C3",0x393],
+  ["C4",0x394],
+  ["C5",0x395],
+  ["C6",0x396],
+  ["C7",0x397],
+  ["C8",0x398],
+  ["C9",0x399],
+  ["CA",0x39A],
+  ["CB",0x39B],
+  ["CC",0x39C],
+  ["CD",0x39D],
+  ["CE",0x39E],
+  ["CF",0x39F],
+  ["D0",0x3A0],
+  ["D1",0x3A1],
+  ["D3",0x3A3],
+  ["D4",0x3A4],
+  ["D5",0x3A5],
+  ["D6",0x3A6],
+  ["D7",0x3A7],
+  ["D8",0x3A8],
+  ["D9",0x3A9],
+  ["DA",0x3AA],
+  ["DB",0x3AB],
+  ["DC",0x3AC],
+  ["DD",0x3AD],
+  ["DE",0x3AE],
+  ["DF",0x3AF],
+  ["E0",0x3B0],
+  ["E1",0x3B1],
+  ["E2",0x3B2],
+  ["E3",0x3B3],
+  ["E4",0x3B4],
+  ["E5",0x3B5],
+  ["E6",0x3B6],
+  ["E7",0x3B7],
+  ["E8",0x3B8],
+  ["E9",0x3B9],
+  ["EA",0x3BA],
+  ["EB",0x3BB],
+  ["EC",0x3BC],
+  ["ED",0x3BD],
+  ["EE",0x3BE],
+  ["EF",0x3BF],
+  ["F0",0x3C0],
+  ["F1",0x3C1],
+  ["F2",0x3C2],
+  ["F3",0x3C3],
+  ["F4",0x3C4],
+  ["F5",0x3C5],
+  ["F6",0x3C6],
+  ["F7",0x3C7],
+  ["F8",0x3C8],
+  ["F9",0x3C9],
+  ["FA",0x3CA],
+  ["FB",0x3CB],
+  ["FC",0x3CC],
+  ["FD",0x3CD],
+  ["FE",0x3CE],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["AF",0x2015],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["80",0x20AC],
+  ["99",0x2122],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-1254-tbl.rb b/enc/trans/windows-1254-tbl.rb
new file mode 100644
index 0000000000..81a747afaa
--- /dev/null
+++ b/enc/trans/windows-1254-tbl.rb
@@ -0,0 +1,123 @@
+WINDOWS_1254_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AA",0xAA],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0xB9],
+  ["BA",0xBA],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["BF",0xBF],
+  ["C0",0xC0],
+  ["C1",0xC1],
+  ["C2",0xC2],
+  ["C3",0xC3],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["C6",0xC6],
+  ["C7",0xC7],
+  ["C8",0xC8],
+  ["C9",0xC9],
+  ["CA",0xCA],
+  ["CB",0xCB],
+  ["CC",0xCC],
+  ["CD",0xCD],
+  ["CE",0xCE],
+  ["CF",0xCF],
+  ["D1",0xD1],
+  ["D2",0xD2],
+  ["D3",0xD3],
+  ["D4",0xD4],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["D8",0xD8],
+  ["D9",0xD9],
+  ["DA",0xDA],
+  ["DB",0xDB],
+  ["DC",0xDC],
+  ["DF",0xDF],
+  ["E0",0xE0],
+  ["E1",0xE1],
+  ["E2",0xE2],
+  ["E3",0xE3],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["E6",0xE6],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EC",0xEC],
+  ["ED",0xED],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F1",0xF1],
+  ["F2",0xF2],
+  ["F3",0xF3],
+  ["F4",0xF4],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["F8",0xF8],
+  ["F9",0xF9],
+  ["FA",0xFA],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["FF",0xFF],
+  ["D0",0x11E],
+  ["F0",0x11F],
+  ["DD",0x130],
+  ["FD",0x131],
+  ["8C",0x152],
+  ["9C",0x153],
+  ["DE",0x15E],
+  ["FE",0x15F],
+  ["8A",0x160],
+  ["9A",0x161],
+  ["9F",0x178],
+  ["83",0x192],
+  ["88",0x2C6],
+  ["98",0x2DC],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["80",0x20AC],
+  ["99",0x2122],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-1255-tbl.rb b/enc/trans/windows-1255-tbl.rb
new file mode 100644
index 0000000000..9084a56a10
--- /dev/null
+++ b/enc/trans/windows-1255-tbl.rb
@@ -0,0 +1,141 @@
+WINDOWS_1255_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xA1],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0xB9],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["BF",0xBF],
+  ["AA",0xD7],
+  ["BA",0xF7],
+  ["83",0x192],
+  ["88",0x2C6],
+  ["98",0x2DC],
+  ["C0",0x5B0],
+  ["C1",0x5B1],
+  ["C2",0x5B2],
+  ["C3",0x5B3],
+  ["C4",0x5B4],
+  ["C5",0x5B5],
+  ["C6",0x5B6],
+  ["C7",0x5B7],
+  ["C8",0x5B8],
+  ["C9",0x5B9],
+  ["CB",0x5BB],
+  ["CC",0x5BC],
+  ["CD",0x5BD],
+  ["CE",0x5BE],
+  ["CF",0x5BF],
+  ["D0",0x5C0],
+  ["D1",0x5C1],
+  ["D2",0x5C2],
+  ["D3",0x5C3],
+  ["E0",0x5D0],
+  ["E1",0x5D1],
+  ["E2",0x5D2],
+  ["E3",0x5D3],
+  ["E4",0x5D4],
+  ["E5",0x5D5],
+  ["E6",0x5D6],
+  ["E7",0x5D7],
+  ["E8",0x5D8],
+  ["E9",0x5D9],
+  ["EA",0x5DA],
+  ["EB",0x5DB],
+  ["EC",0x5DC],
+  ["ED",0x5DD],
+  ["EE",0x5DE],
+  ["EF",0x5DF],
+  ["F0",0x5E0],
+  ["F1",0x5E1],
+  ["F2",0x5E2],
+  ["F3",0x5E3],
+  ["F4",0x5E4],
+  ["F5",0x5E5],
+  ["F6",0x5E6],
+  ["F7",0x5E7],
+  ["F8",0x5E8],
+  ["F9",0x5E9],
+  ["FA",0x5EA],
+  ["D4",0x5F0],
+  ["D5",0x5F1],
+  ["D6",0x5F2],
+  ["D7",0x5F3],
+  ["D8",0x5F4],
+  ["FD",0x200E],
+  ["FE",0x200F],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["A4",0x20AA],
+  ["80",0x20AC],
+  ["99",0x2122],
+  ["E9C4",0xFB1D],
+  ["D6C7",0xFB1F],
+  ["F9D1",0xFB2A],
+  ["F9D2",0xFB2B],
+  ["F9CCD1",0xFB2C],
+  ["F9CCD2",0xFB2D],
+  ["E0C7",0xFB2E],
+  ["E0C8",0xFB2F],
+  ["E0CC",0xFB30],
+  ["E1CC",0xFB31],
+  ["E2CC",0xFB32],
+  ["E3CC",0xFB33],
+  ["E4CC",0xFB34],
+  ["E5CC",0xFB35],
+  ["E6CC",0xFB36],
+  ["E8CC",0xFB38],
+  ["E9CC",0xFB39],
+  ["EACC",0xFB3A],
+  ["EBCC",0xFB3B],
+  ["ECCC",0xFB3C],
+  ["EECC",0xFB3E],
+  ["F0CC",0xFB40],
+  ["F1CC",0xFB41],
+  ["F3CC",0xFB43],
+  ["F4CC",0xFB44],
+  ["F6CC",0xFB46],
+  ["F7CC",0xFB47],
+  ["F8CC",0xFB48],
+  ["F9CC",0xFB49],
+  ["FACC",0xFB4A],
+  ["E5C9",0xFB4B],
+  ["E1CF",0xFB4C],
+  ["EBCF",0xFB4D],
+  ["F4CF",0xFB4E],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-1256-tbl.rb b/enc/trans/windows-1256-tbl.rb
new file mode 100644
index 0000000000..25c5874fb0
--- /dev/null
+++ b/enc/trans/windows-1256-tbl.rb
@@ -0,0 +1,130 @@
+WINDOWS_1256_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A5",0xA5],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["A8",0xA8],
+  ["A9",0xA9],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["AF",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["B8",0xB8],
+  ["B9",0xB9],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["D7",0xD7],
+  ["E0",0xE0],
+  ["E2",0xE2],
+  ["E7",0xE7],
+  ["E8",0xE8],
+  ["E9",0xE9],
+  ["EA",0xEA],
+  ["EB",0xEB],
+  ["EE",0xEE],
+  ["EF",0xEF],
+  ["F4",0xF4],
+  ["F7",0xF7],
+  ["F9",0xF9],
+  ["FB",0xFB],
+  ["FC",0xFC],
+  ["8C",0x152],
+  ["9C",0x153],
+  ["83",0x192],
+  ["88",0x2C6],
+  ["A1",0x60C],
+  ["BA",0x61B],
+  ["BF",0x61F],
+  ["C1",0x621],
+  ["C2",0x622],
+  ["C3",0x623],
+  ["C4",0x624],
+  ["C5",0x625],
+  ["C6",0x626],
+  ["C7",0x627],
+  ["C8",0x628],
+  ["C9",0x629],
+  ["CA",0x62A],
+  ["CB",0x62B],
+  ["CC",0x62C],
+  ["CD",0x62D],
+  ["CE",0x62E],
+  ["CF",0x62F],
+  ["D0",0x630],
+  ["D1",0x631],
+  ["D2",0x632],
+  ["D3",0x633],
+  ["D4",0x634],
+  ["D5",0x635],
+  ["D6",0x636],
+  ["D8",0x637],
+  ["D9",0x638],
+  ["DA",0x639],
+  ["DB",0x63A],
+  ["DC",0x640],
+  ["DD",0x641],
+  ["DE",0x642],
+  ["DF",0x643],
+  ["E1",0x644],
+  ["E3",0x645],
+  ["E4",0x646],
+  ["E5",0x647],
+  ["E6",0x648],
+  ["EC",0x649],
+  ["ED",0x64A],
+  ["F0",0x64B],
+  ["F1",0x64C],
+  ["F2",0x64D],
+  ["F3",0x64E],
+  ["F5",0x64F],
+  ["F6",0x650],
+  ["F8",0x651],
+  ["FA",0x652],
+  ["8A",0x679],
+  ["81",0x67E],
+  ["8D",0x686],
+  ["8F",0x688],
+  ["9A",0x691],
+  ["8E",0x698],
+  ["98",0x6A9],
+  ["90",0x6AF],
+  ["9F",0x6BA],
+  ["AA",0x6BE],
+  ["C0",0x6C1],
+  ["FF",0x6D2],
+  ["9D",0x200C],
+  ["9E",0x200D],
+  ["FD",0x200E],
+  ["FE",0x200F],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["80",0x20AC],
+  ["99",0x2122],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-1257-tbl.rb b/enc/trans/windows-1257-tbl.rb
new file mode 100644
index 0000000000..9e89b2b0b5
--- /dev/null
+++ b/enc/trans/windows-1257-tbl.rb
@@ -0,0 +1,118 @@
+WINDOWS_1257_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A2",0xA2],
+  ["A3",0xA3],
+  ["A4",0xA4],
+  ["A6",0xA6],
+  ["A7",0xA7],
+  ["8D",0xA8],
+  ["A9",0xA9],
+  ["AB",0xAB],
+  ["AC",0xAC],
+  ["AD",0xAD],
+  ["AE",0xAE],
+  ["9D",0xAF],
+  ["B0",0xB0],
+  ["B1",0xB1],
+  ["B2",0xB2],
+  ["B3",0xB3],
+  ["B4",0xB4],
+  ["B5",0xB5],
+  ["B6",0xB6],
+  ["B7",0xB7],
+  ["8F",0xB8],
+  ["B9",0xB9],
+  ["BB",0xBB],
+  ["BC",0xBC],
+  ["BD",0xBD],
+  ["BE",0xBE],
+  ["C4",0xC4],
+  ["C5",0xC5],
+  ["AF",0xC6],
+  ["C9",0xC9],
+  ["D3",0xD3],
+  ["D5",0xD5],
+  ["D6",0xD6],
+  ["D7",0xD7],
+  ["A8",0xD8],
+  ["DC",0xDC],
+  ["DF",0xDF],
+  ["E4",0xE4],
+  ["E5",0xE5],
+  ["BF",0xE6],
+  ["E9",0xE9],
+  ["F3",0xF3],
+  ["F5",0xF5],
+  ["F6",0xF6],
+  ["F7",0xF7],
+  ["B8",0xF8],
+  ["FC",0xFC],
+  ["C2",0x100],
+  ["E2",0x101],
+  ["C0",0x104],
+  ["E0",0x105],
+  ["C3",0x106],
+  ["E3",0x107],
+  ["C8",0x10C],
+  ["E8",0x10D],
+  ["C7",0x112],
+  ["E7",0x113],
+  ["CB",0x116],
+  ["EB",0x117],
+  ["C6",0x118],
+  ["E6",0x119],
+  ["CC",0x122],
+  ["EC",0x123],
+  ["CE",0x12A],
+  ["EE",0x12B],
+  ["C1",0x12E],
+  ["E1",0x12F],
+  ["CD",0x136],
+  ["ED",0x137],
+  ["CF",0x13B],
+  ["EF",0x13C],
+  ["D9",0x141],
+  ["F9",0x142],
+  ["D1",0x143],
+  ["F1",0x144],
+  ["D2",0x145],
+  ["F2",0x146],
+  ["D4",0x14C],
+  ["F4",0x14D],
+  ["AA",0x156],
+  ["BA",0x157],
+  ["DA",0x15A],
+  ["FA",0x15B],
+  ["D0",0x160],
+  ["F0",0x161],
+  ["DB",0x16A],
+  ["FB",0x16B],
+  ["D8",0x172],
+  ["F8",0x173],
+  ["CA",0x179],
+  ["EA",0x17A],
+  ["DD",0x17B],
+  ["FD",0x17C],
+  ["DE",0x17D],
+  ["FE",0x17E],
+  ["8E",0x2C7],
+  ["FF",0x2D9],
+  ["9E",0x2DB],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["82",0x201A],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["84",0x201E],
+  ["86",0x2020],
+  ["87",0x2021],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["89",0x2030],
+  ["8B",0x2039],
+  ["9B",0x203A],
+  ["80",0x20AC],
+  ["99",0x2122],
+]
+\ No newline at end of file
diff --git a/enc/trans/windows-874-tbl.rb b/enc/trans/windows-874-tbl.rb
new file mode 100644
index 0000000000..0552df3d28
--- /dev/null
+++ b/enc/trans/windows-874-tbl.rb
@@ -0,0 +1,99 @@
+WINDOWS_874_TO_UCS_TBL = [
+  ["A0",0xA0],
+  ["A1",0xE01],
+  ["A2",0xE02],
+  ["A3",0xE03],
+  ["A4",0xE04],
+  ["A5",0xE05],
+  ["A6",0xE06],
+  ["A7",0xE07],
+  ["A8",0xE08],
+  ["A9",0xE09],
+  ["AA",0xE0A],
+  ["AB",0xE0B],
+  ["AC",0xE0C],
+  ["AD",0xE0D],
+  ["AE",0xE0E],
+  ["AF",0xE0F],
+  ["B0",0xE10],
+  ["B1",0xE11],
+  ["B2",0xE12],
+  ["B3",0xE13],
+  ["B4",0xE14],
+  ["B5",0xE15],
+  ["B6",0xE16],
+  ["B7",0xE17],
+  ["B8",0xE18],
+  ["B9",0xE19],
+  ["BA",0xE1A],
+  ["BB",0xE1B],
+  ["BC",0xE1C],
+  ["BD",0xE1D],
+  ["BE",0xE1E],
+  ["BF",0xE1F],
+  ["C0",0xE20],
+  ["C1",0xE21],
+  ["C2",0xE22],
+  ["C3",0xE23],
+  ["C4",0xE24],
+  ["C5",0xE25],
+  ["C6",0xE26],
+  ["C7",0xE27],
+  ["C8",0xE28],
+  ["C9",0xE29],
+  ["CA",0xE2A],
+  ["CB",0xE2B],
+  ["CC",0xE2C],
+  ["CD",0xE2D],
+  ["CE",0xE2E],
+  ["CF",0xE2F],
+  ["D0",0xE30],
+  ["D1",0xE31],
+  ["D2",0xE32],
+  ["D3",0xE33],
+  ["D4",0xE34],
+  ["D5",0xE35],
+  ["D6",0xE36],
+  ["D7",0xE37],
+  ["D8",0xE38],
+  ["D9",0xE39],
+  ["DA",0xE3A],
+  ["DF",0xE3F],
+  ["E0",0xE40],
+  ["E1",0xE41],
+  ["E2",0xE42],
+  ["E3",0xE43],
+  ["E4",0xE44],
+  ["E5",0xE45],
+  ["E6",0xE46],
+  ["E7",0xE47],
+  ["E8",0xE48],
+  ["E9",0xE49],
+  ["EA",0xE4A],
+  ["EB",0xE4B],
+  ["EC",0xE4C],
+  ["ED",0xE4D],
+  ["EE",0xE4E],
+  ["EF",0xE4F],
+  ["F0",0xE50],
+  ["F1",0xE51],
+  ["F2",0xE52],
+  ["F3",0xE53],
+  ["F4",0xE54],
+  ["F5",0xE55],
+  ["F6",0xE56],
+  ["F7",0xE57],
+  ["F8",0xE58],
+  ["F9",0xE59],
+  ["FA",0xE5A],
+  ["FB",0xE5B],
+  ["96",0x2013],
+  ["97",0x2014],
+  ["91",0x2018],
+  ["92",0x2019],
+  ["93",0x201C],
+  ["94",0x201D],
+  ["95",0x2022],
+  ["85",0x2026],
+  ["80",0x20AC],
+]
+\ No newline at end of file
diff --git a/enc/unicode.c b/enc/unicode.c
new file mode 100644
index 0000000000..e3a314b6f3
--- /dev/null
+++ b/enc/unicode.c
@@ -0,0 +1,2610 @@
+/**********************************************************************
+  unicode.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regint.h"
+
+#define ONIGENC_IS_UNICODE_ISO_8859_1_CTYPE(code,ctype) \
+  ((EncUNICODE_ISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+#if 0
+#define ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(code,cbit) \
+  ((EncUNICODE_ISO_8859_1_CtypeTable[code] & (cbit)) != 0)
+#endif
+
+static const unsigned short EncUNICODE_ISO_8859_1_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x428c, 0x4289, 0x4288, 0x4288, 0x4288, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0288, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x00a8, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
+  0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+#include "enc/unicode/name2ctype.h"
+
+typedef struct {
+  int n;
+  OnigCodePoint code[3];
+} CodePointList3;
+
+typedef struct {
+  OnigCodePoint  from;
+  CodePointList3 to;
+} CaseFold_11_Type;
+
+typedef struct {
+  OnigCodePoint  from;
+  CodePointList3 to;
+} CaseUnfold_11_Type;
+
+typedef struct {
+  int n;
+  OnigCodePoint code[2];
+} CodePointList2;
+
+typedef struct {
+  OnigCodePoint  from[2];
+  CodePointList2 to;
+} CaseUnfold_12_Type;
+
+typedef struct {
+  OnigCodePoint  from[3];
+  CodePointList2 to;
+} CaseUnfold_13_Type;
+
+static const CaseFold_11_Type CaseFold[] = {
+ { 0x0041, {1, {0x0061}}},
+ { 0x0042, {1, {0x0062}}},
+ { 0x0043, {1, {0x0063}}},
+ { 0x0044, {1, {0x0064}}},
+ { 0x0045, {1, {0x0065}}},
+ { 0x0046, {1, {0x0066}}},
+ { 0x0047, {1, {0x0067}}},
+ { 0x0048, {1, {0x0068}}},
+ { 0x004a, {1, {0x006a}}},
+ { 0x004b, {1, {0x006b}}},
+ { 0x004c, {1, {0x006c}}},
+ { 0x004d, {1, {0x006d}}},
+ { 0x004e, {1, {0x006e}}},
+ { 0x004f, {1, {0x006f}}},
+ { 0x0050, {1, {0x0070}}},
+ { 0x0051, {1, {0x0071}}},
+ { 0x0052, {1, {0x0072}}},
+ { 0x0053, {1, {0x0073}}},
+ { 0x0054, {1, {0x0074}}},
+ { 0x0055, {1, {0x0075}}},
+ { 0x0056, {1, {0x0076}}},
+ { 0x0057, {1, {0x0077}}},
+ { 0x0058, {1, {0x0078}}},
+ { 0x0059, {1, {0x0079}}},
+ { 0x005a, {1, {0x007a}}},
+ { 0x00b5, {1, {0x03bc}}},
+ { 0x00c0, {1, {0x00e0}}},
+ { 0x00c1, {1, {0x00e1}}},
+ { 0x00c2, {1, {0x00e2}}},
+ { 0x00c3, {1, {0x00e3}}},
+ { 0x00c4, {1, {0x00e4}}},
+ { 0x00c5, {1, {0x00e5}}},
+ { 0x00c6, {1, {0x00e6}}},
+ { 0x00c7, {1, {0x00e7}}},
+ { 0x00c8, {1, {0x00e8}}},
+ { 0x00c9, {1, {0x00e9}}},
+ { 0x00ca, {1, {0x00ea}}},
+ { 0x00cb, {1, {0x00eb}}},
+ { 0x00cc, {1, {0x00ec}}},
+ { 0x00cd, {1, {0x00ed}}},
+ { 0x00ce, {1, {0x00ee}}},
+ { 0x00cf, {1, {0x00ef}}},
+ { 0x00d0, {1, {0x00f0}}},
+ { 0x00d1, {1, {0x00f1}}},
+ { 0x00d2, {1, {0x00f2}}},
+ { 0x00d3, {1, {0x00f3}}},
+ { 0x00d4, {1, {0x00f4}}},
+ { 0x00d5, {1, {0x00f5}}},
+ { 0x00d6, {1, {0x00f6}}},
+ { 0x00d8, {1, {0x00f8}}},
+ { 0x00d9, {1, {0x00f9}}},
+ { 0x00da, {1, {0x00fa}}},
+ { 0x00db, {1, {0x00fb}}},
+ { 0x00dc, {1, {0x00fc}}},
+ { 0x00dd, {1, {0x00fd}}},
+ { 0x00de, {1, {0x00fe}}},
+ { 0x00df, {2, {0x0073, 0x0073}}},
+ { 0x0100, {1, {0x0101}}},
+ { 0x0102, {1, {0x0103}}},
+ { 0x0104, {1, {0x0105}}},
+ { 0x0106, {1, {0x0107}}},
+ { 0x0108, {1, {0x0109}}},
+ { 0x010a, {1, {0x010b}}},
+ { 0x010c, {1, {0x010d}}},
+ { 0x010e, {1, {0x010f}}},
+ { 0x0110, {1, {0x0111}}},
+ { 0x0112, {1, {0x0113}}},
+ { 0x0114, {1, {0x0115}}},
+ { 0x0116, {1, {0x0117}}},
+ { 0x0118, {1, {0x0119}}},
+ { 0x011a, {1, {0x011b}}},
+ { 0x011c, {1, {0x011d}}},
+ { 0x011e, {1, {0x011f}}},
+ { 0x0120, {1, {0x0121}}},
+ { 0x0122, {1, {0x0123}}},
+ { 0x0124, {1, {0x0125}}},
+ { 0x0126, {1, {0x0127}}},
+ { 0x0128, {1, {0x0129}}},
+ { 0x012a, {1, {0x012b}}},
+ { 0x012c, {1, {0x012d}}},
+ { 0x012e, {1, {0x012f}}},
+ { 0x0132, {1, {0x0133}}},
+ { 0x0134, {1, {0x0135}}},
+ { 0x0136, {1, {0x0137}}},
+ { 0x0139, {1, {0x013a}}},
+ { 0x013b, {1, {0x013c}}},
+ { 0x013d, {1, {0x013e}}},
+ { 0x013f, {1, {0x0140}}},
+ { 0x0141, {1, {0x0142}}},
+ { 0x0143, {1, {0x0144}}},
+ { 0x0145, {1, {0x0146}}},
+ { 0x0147, {1, {0x0148}}},
+ { 0x0149, {2, {0x02bc, 0x006e}}},
+ { 0x014a, {1, {0x014b}}},
+ { 0x014c, {1, {0x014d}}},
+ { 0x014e, {1, {0x014f}}},
+ { 0x0150, {1, {0x0151}}},
+ { 0x0152, {1, {0x0153}}},
+ { 0x0154, {1, {0x0155}}},
+ { 0x0156, {1, {0x0157}}},
+ { 0x0158, {1, {0x0159}}},
+ { 0x015a, {1, {0x015b}}},
+ { 0x015c, {1, {0x015d}}},
+ { 0x015e, {1, {0x015f}}},
+ { 0x0160, {1, {0x0161}}},
+ { 0x0162, {1, {0x0163}}},
+ { 0x0164, {1, {0x0165}}},
+ { 0x0166, {1, {0x0167}}},
+ { 0x0168, {1, {0x0169}}},
+ { 0x016a, {1, {0x016b}}},
+ { 0x016c, {1, {0x016d}}},
+ { 0x016e, {1, {0x016f}}},
+ { 0x0170, {1, {0x0171}}},
+ { 0x0172, {1, {0x0173}}},
+ { 0x0174, {1, {0x0175}}},
+ { 0x0176, {1, {0x0177}}},
+ { 0x0178, {1, {0x00ff}}},
+ { 0x0179, {1, {0x017a}}},
+ { 0x017b, {1, {0x017c}}},
+ { 0x017d, {1, {0x017e}}},
+ { 0x017f, {1, {0x0073}}},
+ { 0x0181, {1, {0x0253}}},
+ { 0x0182, {1, {0x0183}}},
+ { 0x0184, {1, {0x0185}}},
+ { 0x0186, {1, {0x0254}}},
+ { 0x0187, {1, {0x0188}}},
+ { 0x0189, {1, {0x0256}}},
+ { 0x018a, {1, {0x0257}}},
+ { 0x018b, {1, {0x018c}}},
+ { 0x018e, {1, {0x01dd}}},
+ { 0x018f, {1, {0x0259}}},
+ { 0x0190, {1, {0x025b}}},
+ { 0x0191, {1, {0x0192}}},
+ { 0x0193, {1, {0x0260}}},
+ { 0x0194, {1, {0x0263}}},
+ { 0x0196, {1, {0x0269}}},
+ { 0x0197, {1, {0x0268}}},
+ { 0x0198, {1, {0x0199}}},
+ { 0x019c, {1, {0x026f}}},
+ { 0x019d, {1, {0x0272}}},
+ { 0x019f, {1, {0x0275}}},
+ { 0x01a0, {1, {0x01a1}}},
+ { 0x01a2, {1, {0x01a3}}},
+ { 0x01a4, {1, {0x01a5}}},
+ { 0x01a6, {1, {0x0280}}},
+ { 0x01a7, {1, {0x01a8}}},
+ { 0x01a9, {1, {0x0283}}},
+ { 0x01ac, {1, {0x01ad}}},
+ { 0x01ae, {1, {0x0288}}},
+ { 0x01af, {1, {0x01b0}}},
+ { 0x01b1, {1, {0x028a}}},
+ { 0x01b2, {1, {0x028b}}},
+ { 0x01b3, {1, {0x01b4}}},
+ { 0x01b5, {1, {0x01b6}}},
+ { 0x01b7, {1, {0x0292}}},
+ { 0x01b8, {1, {0x01b9}}},
+ { 0x01bc, {1, {0x01bd}}},
+ { 0x01c4, {1, {0x01c6}}},
+ { 0x01c5, {1, {0x01c6}}},
+ { 0x01c7, {1, {0x01c9}}},
+ { 0x01c8, {1, {0x01c9}}},
+ { 0x01ca, {1, {0x01cc}}},
+ { 0x01cb, {1, {0x01cc}}},
+ { 0x01cd, {1, {0x01ce}}},
+ { 0x01cf, {1, {0x01d0}}},
+ { 0x01d1, {1, {0x01d2}}},
+ { 0x01d3, {1, {0x01d4}}},
+ { 0x01d5, {1, {0x01d6}}},
+ { 0x01d7, {1, {0x01d8}}},
+ { 0x01d9, {1, {0x01da}}},
+ { 0x01db, {1, {0x01dc}}},
+ { 0x01de, {1, {0x01df}}},
+ { 0x01e0, {1, {0x01e1}}},
+ { 0x01e2, {1, {0x01e3}}},
+ { 0x01e4, {1, {0x01e5}}},
+ { 0x01e6, {1, {0x01e7}}},
+ { 0x01e8, {1, {0x01e9}}},
+ { 0x01ea, {1, {0x01eb}}},
+ { 0x01ec, {1, {0x01ed}}},
+ { 0x01ee, {1, {0x01ef}}},
+ { 0x01f0, {2, {0x006a, 0x030c}}},
+ { 0x01f1, {1, {0x01f3}}},
+ { 0x01f2, {1, {0x01f3}}},
+ { 0x01f4, {1, {0x01f5}}},
+ { 0x01f6, {1, {0x0195}}},
+ { 0x01f7, {1, {0x01bf}}},
+ { 0x01f8, {1, {0x01f9}}},
+ { 0x01fa, {1, {0x01fb}}},
+ { 0x01fc, {1, {0x01fd}}},
+ { 0x01fe, {1, {0x01ff}}},
+ { 0x0200, {1, {0x0201}}},
+ { 0x0202, {1, {0x0203}}},
+ { 0x0204, {1, {0x0205}}},
+ { 0x0206, {1, {0x0207}}},
+ { 0x0208, {1, {0x0209}}},
+ { 0x020a, {1, {0x020b}}},
+ { 0x020c, {1, {0x020d}}},
+ { 0x020e, {1, {0x020f}}},
+ { 0x0210, {1, {0x0211}}},
+ { 0x0212, {1, {0x0213}}},
+ { 0x0214, {1, {0x0215}}},
+ { 0x0216, {1, {0x0217}}},
+ { 0x0218, {1, {0x0219}}},
+ { 0x021a, {1, {0x021b}}},
+ { 0x021c, {1, {0x021d}}},
+ { 0x021e, {1, {0x021f}}},
+ { 0x0220, {1, {0x019e}}},
+ { 0x0222, {1, {0x0223}}},
+ { 0x0224, {1, {0x0225}}},
+ { 0x0226, {1, {0x0227}}},
+ { 0x0228, {1, {0x0229}}},
+ { 0x022a, {1, {0x022b}}},
+ { 0x022c, {1, {0x022d}}},
+ { 0x022e, {1, {0x022f}}},
+ { 0x0230, {1, {0x0231}}},
+ { 0x0232, {1, {0x0233}}},
+ { 0x023b, {1, {0x023c}}},
+ { 0x023d, {1, {0x019a}}},
+ { 0x0241, {1, {0x0294}}},
+ { 0x0345, {1, {0x03b9}}},
+ { 0x0386, {1, {0x03ac}}},
+ { 0x0388, {1, {0x03ad}}},
+ { 0x0389, {1, {0x03ae}}},
+ { 0x038a, {1, {0x03af}}},
+ { 0x038c, {1, {0x03cc}}},
+ { 0x038e, {1, {0x03cd}}},
+ { 0x038f, {1, {0x03ce}}},
+ { 0x0390, {3, {0x03b9, 0x0308, 0x0301}}},
+ { 0x0391, {1, {0x03b1}}},
+ { 0x0392, {1, {0x03b2}}},
+ { 0x0393, {1, {0x03b3}}},
+ { 0x0394, {1, {0x03b4}}},
+ { 0x0395, {1, {0x03b5}}},
+ { 0x0396, {1, {0x03b6}}},
+ { 0x0397, {1, {0x03b7}}},
+ { 0x0398, {1, {0x03b8}}},
+ { 0x0399, {1, {0x03b9}}},
+ { 0x039a, {1, {0x03ba}}},
+ { 0x039b, {1, {0x03bb}}},
+ { 0x039c, {1, {0x03bc}}},
+ { 0x039d, {1, {0x03bd}}},
+ { 0x039e, {1, {0x03be}}},
+ { 0x039f, {1, {0x03bf}}},
+ { 0x03a0, {1, {0x03c0}}},
+ { 0x03a1, {1, {0x03c1}}},
+ { 0x03a3, {1, {0x03c3}}},
+ { 0x03a4, {1, {0x03c4}}},
+ { 0x03a5, {1, {0x03c5}}},
+ { 0x03a6, {1, {0x03c6}}},
+ { 0x03a7, {1, {0x03c7}}},
+ { 0x03a8, {1, {0x03c8}}},
+ { 0x03a9, {1, {0x03c9}}},
+ { 0x03aa, {1, {0x03ca}}},
+ { 0x03ab, {1, {0x03cb}}},
+ { 0x03b0, {3, {0x03c5, 0x0308, 0x0301}}},
+ { 0x03c2, {1, {0x03c3}}},
+ { 0x03d0, {1, {0x03b2}}},
+ { 0x03d1, {1, {0x03b8}}},
+ { 0x03d5, {1, {0x03c6}}},
+ { 0x03d6, {1, {0x03c0}}},
+ { 0x03d8, {1, {0x03d9}}},
+ { 0x03da, {1, {0x03db}}},
+ { 0x03dc, {1, {0x03dd}}},
+ { 0x03de, {1, {0x03df}}},
+ { 0x03e0, {1, {0x03e1}}},
+ { 0x03e2, {1, {0x03e3}}},
+ { 0x03e4, {1, {0x03e5}}},
+ { 0x03e6, {1, {0x03e7}}},
+ { 0x03e8, {1, {0x03e9}}},
+ { 0x03ea, {1, {0x03eb}}},
+ { 0x03ec, {1, {0x03ed}}},
+ { 0x03ee, {1, {0x03ef}}},
+ { 0x03f0, {1, {0x03ba}}},
+ { 0x03f1, {1, {0x03c1}}},
+ { 0x03f4, {1, {0x03b8}}},
+ { 0x03f5, {1, {0x03b5}}},
+ { 0x03f7, {1, {0x03f8}}},
+ { 0x03f9, {1, {0x03f2}}},
+ { 0x03fa, {1, {0x03fb}}},
+ { 0x0400, {1, {0x0450}}},
+ { 0x0401, {1, {0x0451}}},
+ { 0x0402, {1, {0x0452}}},
+ { 0x0403, {1, {0x0453}}},
+ { 0x0404, {1, {0x0454}}},
+ { 0x0405, {1, {0x0455}}},
+ { 0x0406, {1, {0x0456}}},
+ { 0x0407, {1, {0x0457}}},
+ { 0x0408, {1, {0x0458}}},
+ { 0x0409, {1, {0x0459}}},
+ { 0x040a, {1, {0x045a}}},
+ { 0x040b, {1, {0x045b}}},
+ { 0x040c, {1, {0x045c}}},
+ { 0x040d, {1, {0x045d}}},
+ { 0x040e, {1, {0x045e}}},
+ { 0x040f, {1, {0x045f}}},
+ { 0x0410, {1, {0x0430}}},
+ { 0x0411, {1, {0x0431}}},
+ { 0x0412, {1, {0x0432}}},
+ { 0x0413, {1, {0x0433}}},
+ { 0x0414, {1, {0x0434}}},
+ { 0x0415, {1, {0x0435}}},
+ { 0x0416, {1, {0x0436}}},
+ { 0x0417, {1, {0x0437}}},
+ { 0x0418, {1, {0x0438}}},
+ { 0x0419, {1, {0x0439}}},
+ { 0x041a, {1, {0x043a}}},
+ { 0x041b, {1, {0x043b}}},
+ { 0x041c, {1, {0x043c}}},
+ { 0x041d, {1, {0x043d}}},
+ { 0x041e, {1, {0x043e}}},
+ { 0x041f, {1, {0x043f}}},
+ { 0x0420, {1, {0x0440}}},
+ { 0x0421, {1, {0x0441}}},
+ { 0x0422, {1, {0x0442}}},
+ { 0x0423, {1, {0x0443}}},
+ { 0x0424, {1, {0x0444}}},
+ { 0x0425, {1, {0x0445}}},
+ { 0x0426, {1, {0x0446}}},
+ { 0x0427, {1, {0x0447}}},
+ { 0x0428, {1, {0x0448}}},
+ { 0x0429, {1, {0x0449}}},
+ { 0x042a, {1, {0x044a}}},
+ { 0x042b, {1, {0x044b}}},
+ { 0x042c, {1, {0x044c}}},
+ { 0x042d, {1, {0x044d}}},
+ { 0x042e, {1, {0x044e}}},
+ { 0x042f, {1, {0x044f}}},
+ { 0x0460, {1, {0x0461}}},
+ { 0x0462, {1, {0x0463}}},
+ { 0x0464, {1, {0x0465}}},
+ { 0x0466, {1, {0x0467}}},
+ { 0x0468, {1, {0x0469}}},
+ { 0x046a, {1, {0x046b}}},
+ { 0x046c, {1, {0x046d}}},
+ { 0x046e, {1, {0x046f}}},
+ { 0x0470, {1, {0x0471}}},
+ { 0x0472, {1, {0x0473}}},
+ { 0x0474, {1, {0x0475}}},
+ { 0x0476, {1, {0x0477}}},
+ { 0x0478, {1, {0x0479}}},
+ { 0x047a, {1, {0x047b}}},
+ { 0x047c, {1, {0x047d}}},
+ { 0x047e, {1, {0x047f}}},
+ { 0x0480, {1, {0x0481}}},
+ { 0x048a, {1, {0x048b}}},
+ { 0x048c, {1, {0x048d}}},
+ { 0x048e, {1, {0x048f}}},
+ { 0x0490, {1, {0x0491}}},
+ { 0x0492, {1, {0x0493}}},
+ { 0x0494, {1, {0x0495}}},
+ { 0x0496, {1, {0x0497}}},
+ { 0x0498, {1, {0x0499}}},
+ { 0x049a, {1, {0x049b}}},
+ { 0x049c, {1, {0x049d}}},
+ { 0x049e, {1, {0x049f}}},
+ { 0x04a0, {1, {0x04a1}}},
+ { 0x04a2, {1, {0x04a3}}},
+ { 0x04a4, {1, {0x04a5}}},
+ { 0x04a6, {1, {0x04a7}}},
+ { 0x04a8, {1, {0x04a9}}},
+ { 0x04aa, {1, {0x04ab}}},
+ { 0x04ac, {1, {0x04ad}}},
+ { 0x04ae, {1, {0x04af}}},
+ { 0x04b0, {1, {0x04b1}}},
+ { 0x04b2, {1, {0x04b3}}},
+ { 0x04b4, {1, {0x04b5}}},
+ { 0x04b6, {1, {0x04b7}}},
+ { 0x04b8, {1, {0x04b9}}},
+ { 0x04ba, {1, {0x04bb}}},
+ { 0x04bc, {1, {0x04bd}}},
+ { 0x04be, {1, {0x04bf}}},
+ { 0x04c1, {1, {0x04c2}}},
+ { 0x04c3, {1, {0x04c4}}},
+ { 0x04c5, {1, {0x04c6}}},
+ { 0x04c7, {1, {0x04c8}}},
+ { 0x04c9, {1, {0x04ca}}},
+ { 0x04cb, {1, {0x04cc}}},
+ { 0x04cd, {1, {0x04ce}}},
+ { 0x04d0, {1, {0x04d1}}},
+ { 0x04d2, {1, {0x04d3}}},
+ { 0x04d4, {1, {0x04d5}}},
+ { 0x04d6, {1, {0x04d7}}},
+ { 0x04d8, {1, {0x04d9}}},
+ { 0x04da, {1, {0x04db}}},
+ { 0x04dc, {1, {0x04dd}}},
+ { 0x04de, {1, {0x04df}}},
+ { 0x04e0, {1, {0x04e1}}},
+ { 0x04e2, {1, {0x04e3}}},
+ { 0x04e4, {1, {0x04e5}}},
+ { 0x04e6, {1, {0x04e7}}},
+ { 0x04e8, {1, {0x04e9}}},
+ { 0x04ea, {1, {0x04eb}}},
+ { 0x04ec, {1, {0x04ed}}},
+ { 0x04ee, {1, {0x04ef}}},
+ { 0x04f0, {1, {0x04f1}}},
+ { 0x04f2, {1, {0x04f3}}},
+ { 0x04f4, {1, {0x04f5}}},
+ { 0x04f6, {1, {0x04f7}}},
+ { 0x04f8, {1, {0x04f9}}},
+ { 0x0500, {1, {0x0501}}},
+ { 0x0502, {1, {0x0503}}},
+ { 0x0504, {1, {0x0505}}},
+ { 0x0506, {1, {0x0507}}},
+ { 0x0508, {1, {0x0509}}},
+ { 0x050a, {1, {0x050b}}},
+ { 0x050c, {1, {0x050d}}},
+ { 0x050e, {1, {0x050f}}},
+ { 0x0531, {1, {0x0561}}},
+ { 0x0532, {1, {0x0562}}},
+ { 0x0533, {1, {0x0563}}},
+ { 0x0534, {1, {0x0564}}},
+ { 0x0535, {1, {0x0565}}},
+ { 0x0536, {1, {0x0566}}},
+ { 0x0537, {1, {0x0567}}},
+ { 0x0538, {1, {0x0568}}},
+ { 0x0539, {1, {0x0569}}},
+ { 0x053a, {1, {0x056a}}},
+ { 0x053b, {1, {0x056b}}},
+ { 0x053c, {1, {0x056c}}},
+ { 0x053d, {1, {0x056d}}},
+ { 0x053e, {1, {0x056e}}},
+ { 0x053f, {1, {0x056f}}},
+ { 0x0540, {1, {0x0570}}},
+ { 0x0541, {1, {0x0571}}},
+ { 0x0542, {1, {0x0572}}},
+ { 0x0543, {1, {0x0573}}},
+ { 0x0544, {1, {0x0574}}},
+ { 0x0545, {1, {0x0575}}},
+ { 0x0546, {1, {0x0576}}},
+ { 0x0547, {1, {0x0577}}},
+ { 0x0548, {1, {0x0578}}},
+ { 0x0549, {1, {0x0579}}},
+ { 0x054a, {1, {0x057a}}},
+ { 0x054b, {1, {0x057b}}},
+ { 0x054c, {1, {0x057c}}},
+ { 0x054d, {1, {0x057d}}},
+ { 0x054e, {1, {0x057e}}},
+ { 0x054f, {1, {0x057f}}},
+ { 0x0550, {1, {0x0580}}},
+ { 0x0551, {1, {0x0581}}},
+ { 0x0552, {1, {0x0582}}},
+ { 0x0553, {1, {0x0583}}},
+ { 0x0554, {1, {0x0584}}},
+ { 0x0555, {1, {0x0585}}},
+ { 0x0556, {1, {0x0586}}},
+ { 0x0587, {2, {0x0565, 0x0582}}},
+ { 0x10a0, {1, {0x2d00}}},
+ { 0x10a1, {1, {0x2d01}}},
+ { 0x10a2, {1, {0x2d02}}},
+ { 0x10a3, {1, {0x2d03}}},
+ { 0x10a4, {1, {0x2d04}}},
+ { 0x10a5, {1, {0x2d05}}},
+ { 0x10a6, {1, {0x2d06}}},
+ { 0x10a7, {1, {0x2d07}}},
+ { 0x10a8, {1, {0x2d08}}},
+ { 0x10a9, {1, {0x2d09}}},
+ { 0x10aa, {1, {0x2d0a}}},
+ { 0x10ab, {1, {0x2d0b}}},
+ { 0x10ac, {1, {0x2d0c}}},
+ { 0x10ad, {1, {0x2d0d}}},
+ { 0x10ae, {1, {0x2d0e}}},
+ { 0x10af, {1, {0x2d0f}}},
+ { 0x10b0, {1, {0x2d10}}},
+ { 0x10b1, {1, {0x2d11}}},
+ { 0x10b2, {1, {0x2d12}}},
+ { 0x10b3, {1, {0x2d13}}},
+ { 0x10b4, {1, {0x2d14}}},
+ { 0x10b5, {1, {0x2d15}}},
+ { 0x10b6, {1, {0x2d16}}},
+ { 0x10b7, {1, {0x2d17}}},
+ { 0x10b8, {1, {0x2d18}}},
+ { 0x10b9, {1, {0x2d19}}},
+ { 0x10ba, {1, {0x2d1a}}},
+ { 0x10bb, {1, {0x2d1b}}},
+ { 0x10bc, {1, {0x2d1c}}},
+ { 0x10bd, {1, {0x2d1d}}},
+ { 0x10be, {1, {0x2d1e}}},
+ { 0x10bf, {1, {0x2d1f}}},
+ { 0x10c0, {1, {0x2d20}}},
+ { 0x10c1, {1, {0x2d21}}},
+ { 0x10c2, {1, {0x2d22}}},
+ { 0x10c3, {1, {0x2d23}}},
+ { 0x10c4, {1, {0x2d24}}},
+ { 0x10c5, {1, {0x2d25}}},
+ { 0x1e00, {1, {0x1e01}}},
+ { 0x1e02, {1, {0x1e03}}},
+ { 0x1e04, {1, {0x1e05}}},
+ { 0x1e06, {1, {0x1e07}}},
+ { 0x1e08, {1, {0x1e09}}},
+ { 0x1e0a, {1, {0x1e0b}}},
+ { 0x1e0c, {1, {0x1e0d}}},
+ { 0x1e0e, {1, {0x1e0f}}},
+ { 0x1e10, {1, {0x1e11}}},
+ { 0x1e12, {1, {0x1e13}}},
+ { 0x1e14, {1, {0x1e15}}},
+ { 0x1e16, {1, {0x1e17}}},
+ { 0x1e18, {1, {0x1e19}}},
+ { 0x1e1a, {1, {0x1e1b}}},
+ { 0x1e1c, {1, {0x1e1d}}},
+ { 0x1e1e, {1, {0x1e1f}}},
+ { 0x1e20, {1, {0x1e21}}},
+ { 0x1e22, {1, {0x1e23}}},
+ { 0x1e24, {1, {0x1e25}}},
+ { 0x1e26, {1, {0x1e27}}},
+ { 0x1e28, {1, {0x1e29}}},
+ { 0x1e2a, {1, {0x1e2b}}},
+ { 0x1e2c, {1, {0x1e2d}}},
+ { 0x1e2e, {1, {0x1e2f}}},
+ { 0x1e30, {1, {0x1e31}}},
+ { 0x1e32, {1, {0x1e33}}},
+ { 0x1e34, {1, {0x1e35}}},
+ { 0x1e36, {1, {0x1e37}}},
+ { 0x1e38, {1, {0x1e39}}},
+ { 0x1e3a, {1, {0x1e3b}}},
+ { 0x1e3c, {1, {0x1e3d}}},
+ { 0x1e3e, {1, {0x1e3f}}},
+ { 0x1e40, {1, {0x1e41}}},
+ { 0x1e42, {1, {0x1e43}}},
+ { 0x1e44, {1, {0x1e45}}},
+ { 0x1e46, {1, {0x1e47}}},
+ { 0x1e48, {1, {0x1e49}}},
+ { 0x1e4a, {1, {0x1e4b}}},
+ { 0x1e4c, {1, {0x1e4d}}},
+ { 0x1e4e, {1, {0x1e4f}}},
+ { 0x1e50, {1, {0x1e51}}},
+ { 0x1e52, {1, {0x1e53}}},
+ { 0x1e54, {1, {0x1e55}}},
+ { 0x1e56, {1, {0x1e57}}},
+ { 0x1e58, {1, {0x1e59}}},
+ { 0x1e5a, {1, {0x1e5b}}},
+ { 0x1e5c, {1, {0x1e5d}}},
+ { 0x1e5e, {1, {0x1e5f}}},
+ { 0x1e60, {1, {0x1e61}}},
+ { 0x1e62, {1, {0x1e63}}},
+ { 0x1e64, {1, {0x1e65}}},
+ { 0x1e66, {1, {0x1e67}}},
+ { 0x1e68, {1, {0x1e69}}},
+ { 0x1e6a, {1, {0x1e6b}}},
+ { 0x1e6c, {1, {0x1e6d}}},
+ { 0x1e6e, {1, {0x1e6f}}},
+ { 0x1e70, {1, {0x1e71}}},
+ { 0x1e72, {1, {0x1e73}}},
+ { 0x1e74, {1, {0x1e75}}},
+ { 0x1e76, {1, {0x1e77}}},
+ { 0x1e78, {1, {0x1e79}}},
+ { 0x1e7a, {1, {0x1e7b}}},
+ { 0x1e7c, {1, {0x1e7d}}},
+ { 0x1e7e, {1, {0x1e7f}}},
+ { 0x1e80, {1, {0x1e81}}},
+ { 0x1e82, {1, {0x1e83}}},
+ { 0x1e84, {1, {0x1e85}}},
+ { 0x1e86, {1, {0x1e87}}},
+ { 0x1e88, {1, {0x1e89}}},
+ { 0x1e8a, {1, {0x1e8b}}},
+ { 0x1e8c, {1, {0x1e8d}}},
+ { 0x1e8e, {1, {0x1e8f}}},
+ { 0x1e90, {1, {0x1e91}}},
+ { 0x1e92, {1, {0x1e93}}},
+ { 0x1e94, {1, {0x1e95}}},
+ { 0x1e96, {2, {0x0068, 0x0331}}},
+ { 0x1e97, {2, {0x0074, 0x0308}}},
+ { 0x1e98, {2, {0x0077, 0x030a}}},
+ { 0x1e99, {2, {0x0079, 0x030a}}},
+ { 0x1e9a, {2, {0x0061, 0x02be}}},
+ { 0x1e9b, {1, {0x1e61}}},
+ { 0x1ea0, {1, {0x1ea1}}},
+ { 0x1ea2, {1, {0x1ea3}}},
+ { 0x1ea4, {1, {0x1ea5}}},
+ { 0x1ea6, {1, {0x1ea7}}},
+ { 0x1ea8, {1, {0x1ea9}}},
+ { 0x1eaa, {1, {0x1eab}}},
+ { 0x1eac, {1, {0x1ead}}},
+ { 0x1eae, {1, {0x1eaf}}},
+ { 0x1eb0, {1, {0x1eb1}}},
+ { 0x1eb2, {1, {0x1eb3}}},
+ { 0x1eb4, {1, {0x1eb5}}},
+ { 0x1eb6, {1, {0x1eb7}}},
+ { 0x1eb8, {1, {0x1eb9}}},
+ { 0x1eba, {1, {0x1ebb}}},
+ { 0x1ebc, {1, {0x1ebd}}},
+ { 0x1ebe, {1, {0x1ebf}}},
+ { 0x1ec0, {1, {0x1ec1}}},
+ { 0x1ec2, {1, {0x1ec3}}},
+ { 0x1ec4, {1, {0x1ec5}}},
+ { 0x1ec6, {1, {0x1ec7}}},
+ { 0x1ec8, {1, {0x1ec9}}},
+ { 0x1eca, {1, {0x1ecb}}},
+ { 0x1ecc, {1, {0x1ecd}}},
+ { 0x1ece, {1, {0x1ecf}}},
+ { 0x1ed0, {1, {0x1ed1}}},
+ { 0x1ed2, {1, {0x1ed3}}},
+ { 0x1ed4, {1, {0x1ed5}}},
+ { 0x1ed6, {1, {0x1ed7}}},
+ { 0x1ed8, {1, {0x1ed9}}},
+ { 0x1eda, {1, {0x1edb}}},
+ { 0x1edc, {1, {0x1edd}}},
+ { 0x1ede, {1, {0x1edf}}},
+ { 0x1ee0, {1, {0x1ee1}}},
+ { 0x1ee2, {1, {0x1ee3}}},
+ { 0x1ee4, {1, {0x1ee5}}},
+ { 0x1ee6, {1, {0x1ee7}}},
+ { 0x1ee8, {1, {0x1ee9}}},
+ { 0x1eea, {1, {0x1eeb}}},
+ { 0x1eec, {1, {0x1eed}}},
+ { 0x1eee, {1, {0x1eef}}},
+ { 0x1ef0, {1, {0x1ef1}}},
+ { 0x1ef2, {1, {0x1ef3}}},
+ { 0x1ef4, {1, {0x1ef5}}},
+ { 0x1ef6, {1, {0x1ef7}}},
+ { 0x1ef8, {1, {0x1ef9}}},
+ { 0x1f08, {1, {0x1f00}}},
+ { 0x1f09, {1, {0x1f01}}},
+ { 0x1f0a, {1, {0x1f02}}},
+ { 0x1f0b, {1, {0x1f03}}},
+ { 0x1f0c, {1, {0x1f04}}},
+ { 0x1f0d, {1, {0x1f05}}},
+ { 0x1f0e, {1, {0x1f06}}},
+ { 0x1f0f, {1, {0x1f07}}},
+ { 0x1f18, {1, {0x1f10}}},
+ { 0x1f19, {1, {0x1f11}}},
+ { 0x1f1a, {1, {0x1f12}}},
+ { 0x1f1b, {1, {0x1f13}}},
+ { 0x1f1c, {1, {0x1f14}}},
+ { 0x1f1d, {1, {0x1f15}}},
+ { 0x1f28, {1, {0x1f20}}},
+ { 0x1f29, {1, {0x1f21}}},
+ { 0x1f2a, {1, {0x1f22}}},
+ { 0x1f2b, {1, {0x1f23}}},
+ { 0x1f2c, {1, {0x1f24}}},
+ { 0x1f2d, {1, {0x1f25}}},
+ { 0x1f2e, {1, {0x1f26}}},
+ { 0x1f2f, {1, {0x1f27}}},
+ { 0x1f38, {1, {0x1f30}}},
+ { 0x1f39, {1, {0x1f31}}},
+ { 0x1f3a, {1, {0x1f32}}},
+ { 0x1f3b, {1, {0x1f33}}},
+ { 0x1f3c, {1, {0x1f34}}},
+ { 0x1f3d, {1, {0x1f35}}},
+ { 0x1f3e, {1, {0x1f36}}},
+ { 0x1f3f, {1, {0x1f37}}},
+ { 0x1f48, {1, {0x1f40}}},
+ { 0x1f49, {1, {0x1f41}}},
+ { 0x1f4a, {1, {0x1f42}}},
+ { 0x1f4b, {1, {0x1f43}}},
+ { 0x1f4c, {1, {0x1f44}}},
+ { 0x1f4d, {1, {0x1f45}}},
+ { 0x1f50, {2, {0x03c5, 0x0313}}},
+ { 0x1f52, {3, {0x03c5, 0x0313, 0x0300}}},
+ { 0x1f54, {3, {0x03c5, 0x0313, 0x0301}}},
+ { 0x1f56, {3, {0x03c5, 0x0313, 0x0342}}},
+ { 0x1f59, {1, {0x1f51}}},
+ { 0x1f5b, {1, {0x1f53}}},
+ { 0x1f5d, {1, {0x1f55}}},
+ { 0x1f5f, {1, {0x1f57}}},
+ { 0x1f68, {1, {0x1f60}}},
+ { 0x1f69, {1, {0x1f61}}},
+ { 0x1f6a, {1, {0x1f62}}},
+ { 0x1f6b, {1, {0x1f63}}},
+ { 0x1f6c, {1, {0x1f64}}},
+ { 0x1f6d, {1, {0x1f65}}},
+ { 0x1f6e, {1, {0x1f66}}},
+ { 0x1f6f, {1, {0x1f67}}},
+ { 0x1f80, {2, {0x1f00, 0x03b9}}},
+ { 0x1f81, {2, {0x1f01, 0x03b9}}},
+ { 0x1f82, {2, {0x1f02, 0x03b9}}},
+ { 0x1f83, {2, {0x1f03, 0x03b9}}},
+ { 0x1f84, {2, {0x1f04, 0x03b9}}},
+ { 0x1f85, {2, {0x1f05, 0x03b9}}},
+ { 0x1f86, {2, {0x1f06, 0x03b9}}},
+ { 0x1f87, {2, {0x1f07, 0x03b9}}},
+ { 0x1f88, {2, {0x1f00, 0x03b9}}},
+ { 0x1f89, {2, {0x1f01, 0x03b9}}},
+ { 0x1f8a, {2, {0x1f02, 0x03b9}}},
+ { 0x1f8b, {2, {0x1f03, 0x03b9}}},
+ { 0x1f8c, {2, {0x1f04, 0x03b9}}},
+ { 0x1f8d, {2, {0x1f05, 0x03b9}}},
+ { 0x1f8e, {2, {0x1f06, 0x03b9}}},
+ { 0x1f8f, {2, {0x1f07, 0x03b9}}},
+ { 0x1f90, {2, {0x1f20, 0x03b9}}},
+ { 0x1f91, {2, {0x1f21, 0x03b9}}},
+ { 0x1f92, {2, {0x1f22, 0x03b9}}},
+ { 0x1f93, {2, {0x1f23, 0x03b9}}},
+ { 0x1f94, {2, {0x1f24, 0x03b9}}},
+ { 0x1f95, {2, {0x1f25, 0x03b9}}},
+ { 0x1f96, {2, {0x1f26, 0x03b9}}},
+ { 0x1f97, {2, {0x1f27, 0x03b9}}},
+ { 0x1f98, {2, {0x1f20, 0x03b9}}},
+ { 0x1f99, {2, {0x1f21, 0x03b9}}},
+ { 0x1f9a, {2, {0x1f22, 0x03b9}}},
+ { 0x1f9b, {2, {0x1f23, 0x03b9}}},
+ { 0x1f9c, {2, {0x1f24, 0x03b9}}},
+ { 0x1f9d, {2, {0x1f25, 0x03b9}}},
+ { 0x1f9e, {2, {0x1f26, 0x03b9}}},
+ { 0x1f9f, {2, {0x1f27, 0x03b9}}},
+ { 0x1fa0, {2, {0x1f60, 0x03b9}}},
+ { 0x1fa1, {2, {0x1f61, 0x03b9}}},
+ { 0x1fa2, {2, {0x1f62, 0x03b9}}},
+ { 0x1fa3, {2, {0x1f63, 0x03b9}}},
+ { 0x1fa4, {2, {0x1f64, 0x03b9}}},
+ { 0x1fa5, {2, {0x1f65, 0x03b9}}},
+ { 0x1fa6, {2, {0x1f66, 0x03b9}}},
+ { 0x1fa7, {2, {0x1f67, 0x03b9}}},
+ { 0x1fa8, {2, {0x1f60, 0x03b9}}},
+ { 0x1fa9, {2, {0x1f61, 0x03b9}}},
+ { 0x1faa, {2, {0x1f62, 0x03b9}}},
+ { 0x1fab, {2, {0x1f63, 0x03b9}}},
+ { 0x1fac, {2, {0x1f64, 0x03b9}}},
+ { 0x1fad, {2, {0x1f65, 0x03b9}}},
+ { 0x1fae, {2, {0x1f66, 0x03b9}}},
+ { 0x1faf, {2, {0x1f67, 0x03b9}}},
+ { 0x1fb2, {2, {0x1f70, 0x03b9}}},
+ { 0x1fb3, {2, {0x03b1, 0x03b9}}},
+ { 0x1fb4, {2, {0x03ac, 0x03b9}}},
+ { 0x1fb6, {2, {0x03b1, 0x0342}}},
+ { 0x1fb7, {3, {0x03b1, 0x0342, 0x03b9}}},
+ { 0x1fb8, {1, {0x1fb0}}},
+ { 0x1fb9, {1, {0x1fb1}}},
+ { 0x1fba, {1, {0x1f70}}},
+ { 0x1fbb, {1, {0x1f71}}},
+ { 0x1fbc, {2, {0x03b1, 0x03b9}}},
+ { 0x1fbe, {1, {0x03b9}}},
+ { 0x1fc2, {2, {0x1f74, 0x03b9}}},
+ { 0x1fc3, {2, {0x03b7, 0x03b9}}},
+ { 0x1fc4, {2, {0x03ae, 0x03b9}}},
+ { 0x1fc6, {2, {0x03b7, 0x0342}}},
+ { 0x1fc7, {3, {0x03b7, 0x0342, 0x03b9}}},
+ { 0x1fc8, {1, {0x1f72}}},
+ { 0x1fc9, {1, {0x1f73}}},
+ { 0x1fca, {1, {0x1f74}}},
+ { 0x1fcb, {1, {0x1f75}}},
+ { 0x1fcc, {2, {0x03b7, 0x03b9}}},
+ { 0x1fd2, {3, {0x03b9, 0x0308, 0x0300}}},
+ { 0x1fd3, {3, {0x03b9, 0x0308, 0x0301}}},
+ { 0x1fd6, {2, {0x03b9, 0x0342}}},
+ { 0x1fd7, {3, {0x03b9, 0x0308, 0x0342}}},
+ { 0x1fd8, {1, {0x1fd0}}},
+ { 0x1fd9, {1, {0x1fd1}}},
+ { 0x1fda, {1, {0x1f76}}},
+ { 0x1fdb, {1, {0x1f77}}},
+ { 0x1fe2, {3, {0x03c5, 0x0308, 0x0300}}},
+ { 0x1fe3, {3, {0x03c5, 0x0308, 0x0301}}},
+ { 0x1fe4, {2, {0x03c1, 0x0313}}},
+ { 0x1fe6, {2, {0x03c5, 0x0342}}},
+ { 0x1fe7, {3, {0x03c5, 0x0308, 0x0342}}},
+ { 0x1fe8, {1, {0x1fe0}}},
+ { 0x1fe9, {1, {0x1fe1}}},
+ { 0x1fea, {1, {0x1f7a}}},
+ { 0x1feb, {1, {0x1f7b}}},
+ { 0x1fec, {1, {0x1fe5}}},
+ { 0x1ff2, {2, {0x1f7c, 0x03b9}}},
+ { 0x1ff3, {2, {0x03c9, 0x03b9}}},
+ { 0x1ff4, {2, {0x03ce, 0x03b9}}},
+ { 0x1ff6, {2, {0x03c9, 0x0342}}},
+ { 0x1ff7, {3, {0x03c9, 0x0342, 0x03b9}}},
+ { 0x1ff8, {1, {0x1f78}}},
+ { 0x1ff9, {1, {0x1f79}}},
+ { 0x1ffa, {1, {0x1f7c}}},
+ { 0x1ffb, {1, {0x1f7d}}},
+ { 0x1ffc, {2, {0x03c9, 0x03b9}}},
+ { 0x2126, {1, {0x03c9}}},
+ { 0x212a, {1, {0x006b}}},
+ { 0x212b, {1, {0x00e5}}},
+ { 0x2160, {1, {0x2170}}},
+ { 0x2161, {1, {0x2171}}},
+ { 0x2162, {1, {0x2172}}},
+ { 0x2163, {1, {0x2173}}},
+ { 0x2164, {1, {0x2174}}},
+ { 0x2165, {1, {0x2175}}},
+ { 0x2166, {1, {0x2176}}},
+ { 0x2167, {1, {0x2177}}},
+ { 0x2168, {1, {0x2178}}},
+ { 0x2169, {1, {0x2179}}},
+ { 0x216a, {1, {0x217a}}},
+ { 0x216b, {1, {0x217b}}},
+ { 0x216c, {1, {0x217c}}},
+ { 0x216d, {1, {0x217d}}},
+ { 0x216e, {1, {0x217e}}},
+ { 0x216f, {1, {0x217f}}},
+ { 0x24b6, {1, {0x24d0}}},
+ { 0x24b7, {1, {0x24d1}}},
+ { 0x24b8, {1, {0x24d2}}},
+ { 0x24b9, {1, {0x24d3}}},
+ { 0x24ba, {1, {0x24d4}}},
+ { 0x24bb, {1, {0x24d5}}},
+ { 0x24bc, {1, {0x24d6}}},
+ { 0x24bd, {1, {0x24d7}}},
+ { 0x24be, {1, {0x24d8}}},
+ { 0x24bf, {1, {0x24d9}}},
+ { 0x24c0, {1, {0x24da}}},
+ { 0x24c1, {1, {0x24db}}},
+ { 0x24c2, {1, {0x24dc}}},
+ { 0x24c3, {1, {0x24dd}}},
+ { 0x24c4, {1, {0x24de}}},
+ { 0x24c5, {1, {0x24df}}},
+ { 0x24c6, {1, {0x24e0}}},
+ { 0x24c7, {1, {0x24e1}}},
+ { 0x24c8, {1, {0x24e2}}},
+ { 0x24c9, {1, {0x24e3}}},
+ { 0x24ca, {1, {0x24e4}}},
+ { 0x24cb, {1, {0x24e5}}},
+ { 0x24cc, {1, {0x24e6}}},
+ { 0x24cd, {1, {0x24e7}}},
+ { 0x24ce, {1, {0x24e8}}},
+ { 0x24cf, {1, {0x24e9}}},
+ { 0x2c00, {1, {0x2c30}}},
+ { 0x2c01, {1, {0x2c31}}},
+ { 0x2c02, {1, {0x2c32}}},
+ { 0x2c03, {1, {0x2c33}}},
+ { 0x2c04, {1, {0x2c34}}},
+ { 0x2c05, {1, {0x2c35}}},
+ { 0x2c06, {1, {0x2c36}}},
+ { 0x2c07, {1, {0x2c37}}},
+ { 0x2c08, {1, {0x2c38}}},
+ { 0x2c09, {1, {0x2c39}}},
+ { 0x2c0a, {1, {0x2c3a}}},
+ { 0x2c0b, {1, {0x2c3b}}},
+ { 0x2c0c, {1, {0x2c3c}}},
+ { 0x2c0d, {1, {0x2c3d}}},
+ { 0x2c0e, {1, {0x2c3e}}},
+ { 0x2c0f, {1, {0x2c3f}}},
+ { 0x2c10, {1, {0x2c40}}},
+ { 0x2c11, {1, {0x2c41}}},
+ { 0x2c12, {1, {0x2c42}}},
+ { 0x2c13, {1, {0x2c43}}},
+ { 0x2c14, {1, {0x2c44}}},
+ { 0x2c15, {1, {0x2c45}}},
+ { 0x2c16, {1, {0x2c46}}},
+ { 0x2c17, {1, {0x2c47}}},
+ { 0x2c18, {1, {0x2c48}}},
+ { 0x2c19, {1, {0x2c49}}},
+ { 0x2c1a, {1, {0x2c4a}}},
+ { 0x2c1b, {1, {0x2c4b}}},
+ { 0x2c1c, {1, {0x2c4c}}},
+ { 0x2c1d, {1, {0x2c4d}}},
+ { 0x2c1e, {1, {0x2c4e}}},
+ { 0x2c1f, {1, {0x2c4f}}},
+ { 0x2c20, {1, {0x2c50}}},
+ { 0x2c21, {1, {0x2c51}}},
+ { 0x2c22, {1, {0x2c52}}},
+ { 0x2c23, {1, {0x2c53}}},
+ { 0x2c24, {1, {0x2c54}}},
+ { 0x2c25, {1, {0x2c55}}},
+ { 0x2c26, {1, {0x2c56}}},
+ { 0x2c27, {1, {0x2c57}}},
+ { 0x2c28, {1, {0x2c58}}},
+ { 0x2c29, {1, {0x2c59}}},
+ { 0x2c2a, {1, {0x2c5a}}},
+ { 0x2c2b, {1, {0x2c5b}}},
+ { 0x2c2c, {1, {0x2c5c}}},
+ { 0x2c2d, {1, {0x2c5d}}},
+ { 0x2c2e, {1, {0x2c5e}}},
+ { 0x2c80, {1, {0x2c81}}},
+ { 0x2c82, {1, {0x2c83}}},
+ { 0x2c84, {1, {0x2c85}}},
+ { 0x2c86, {1, {0x2c87}}},
+ { 0x2c88, {1, {0x2c89}}},
+ { 0x2c8a, {1, {0x2c8b}}},
+ { 0x2c8c, {1, {0x2c8d}}},
+ { 0x2c8e, {1, {0x2c8f}}},
+ { 0x2c90, {1, {0x2c91}}},
+ { 0x2c92, {1, {0x2c93}}},
+ { 0x2c94, {1, {0x2c95}}},
+ { 0x2c96, {1, {0x2c97}}},
+ { 0x2c98, {1, {0x2c99}}},
+ { 0x2c9a, {1, {0x2c9b}}},
+ { 0x2c9c, {1, {0x2c9d}}},
+ { 0x2c9e, {1, {0x2c9f}}},
+ { 0x2ca0, {1, {0x2ca1}}},
+ { 0x2ca2, {1, {0x2ca3}}},
+ { 0x2ca4, {1, {0x2ca5}}},
+ { 0x2ca6, {1, {0x2ca7}}},
+ { 0x2ca8, {1, {0x2ca9}}},
+ { 0x2caa, {1, {0x2cab}}},
+ { 0x2cac, {1, {0x2cad}}},
+ { 0x2cae, {1, {0x2caf}}},
+ { 0x2cb0, {1, {0x2cb1}}},
+ { 0x2cb2, {1, {0x2cb3}}},
+ { 0x2cb4, {1, {0x2cb5}}},
+ { 0x2cb6, {1, {0x2cb7}}},
+ { 0x2cb8, {1, {0x2cb9}}},
+ { 0x2cba, {1, {0x2cbb}}},
+ { 0x2cbc, {1, {0x2cbd}}},
+ { 0x2cbe, {1, {0x2cbf}}},
+ { 0x2cc0, {1, {0x2cc1}}},
+ { 0x2cc2, {1, {0x2cc3}}},
+ { 0x2cc4, {1, {0x2cc5}}},
+ { 0x2cc6, {1, {0x2cc7}}},
+ { 0x2cc8, {1, {0x2cc9}}},
+ { 0x2cca, {1, {0x2ccb}}},
+ { 0x2ccc, {1, {0x2ccd}}},
+ { 0x2cce, {1, {0x2ccf}}},
+ { 0x2cd0, {1, {0x2cd1}}},
+ { 0x2cd2, {1, {0x2cd3}}},
+ { 0x2cd4, {1, {0x2cd5}}},
+ { 0x2cd6, {1, {0x2cd7}}},
+ { 0x2cd8, {1, {0x2cd9}}},
+ { 0x2cda, {1, {0x2cdb}}},
+ { 0x2cdc, {1, {0x2cdd}}},
+ { 0x2cde, {1, {0x2cdf}}},
+ { 0x2ce0, {1, {0x2ce1}}},
+ { 0x2ce2, {1, {0x2ce3}}},
+ { 0xfb00, {2, {0x0066, 0x0066}}},
+ { 0xfb01, {2, {0x0066, 0x0069}}},
+ { 0xfb02, {2, {0x0066, 0x006c}}},
+ { 0xfb03, {3, {0x0066, 0x0066, 0x0069}}},
+ { 0xfb04, {3, {0x0066, 0x0066, 0x006c}}},
+ { 0xfb05, {2, {0x0073, 0x0074}}},
+ { 0xfb06, {2, {0x0073, 0x0074}}},
+ { 0xfb13, {2, {0x0574, 0x0576}}},
+ { 0xfb14, {2, {0x0574, 0x0565}}},
+ { 0xfb15, {2, {0x0574, 0x056b}}},
+ { 0xfb16, {2, {0x057e, 0x0576}}},
+ { 0xfb17, {2, {0x0574, 0x056d}}},
+ { 0xff21, {1, {0xff41}}},
+ { 0xff22, {1, {0xff42}}},
+ { 0xff23, {1, {0xff43}}},
+ { 0xff24, {1, {0xff44}}},
+ { 0xff25, {1, {0xff45}}},
+ { 0xff26, {1, {0xff46}}},
+ { 0xff27, {1, {0xff47}}},
+ { 0xff28, {1, {0xff48}}},
+ { 0xff29, {1, {0xff49}}},
+ { 0xff2a, {1, {0xff4a}}},
+ { 0xff2b, {1, {0xff4b}}},
+ { 0xff2c, {1, {0xff4c}}},
+ { 0xff2d, {1, {0xff4d}}},
+ { 0xff2e, {1, {0xff4e}}},
+ { 0xff2f, {1, {0xff4f}}},
+ { 0xff30, {1, {0xff50}}},
+ { 0xff31, {1, {0xff51}}},
+ { 0xff32, {1, {0xff52}}},
+ { 0xff33, {1, {0xff53}}},
+ { 0xff34, {1, {0xff54}}},
+ { 0xff35, {1, {0xff55}}},
+ { 0xff36, {1, {0xff56}}},
+ { 0xff37, {1, {0xff57}}},
+ { 0xff38, {1, {0xff58}}},
+ { 0xff39, {1, {0xff59}}},
+ { 0xff3a, {1, {0xff5a}}},
+ { 0x10400, {1, {0x10428}}},
+ { 0x10401, {1, {0x10429}}},
+ { 0x10402, {1, {0x1042a}}},
+ { 0x10403, {1, {0x1042b}}},
+ { 0x10404, {1, {0x1042c}}},
+ { 0x10405, {1, {0x1042d}}},
+ { 0x10406, {1, {0x1042e}}},
+ { 0x10407, {1, {0x1042f}}},
+ { 0x10408, {1, {0x10430}}},
+ { 0x10409, {1, {0x10431}}},
+ { 0x1040a, {1, {0x10432}}},
+ { 0x1040b, {1, {0x10433}}},
+ { 0x1040c, {1, {0x10434}}},
+ { 0x1040d, {1, {0x10435}}},
+ { 0x1040e, {1, {0x10436}}},
+ { 0x1040f, {1, {0x10437}}},
+ { 0x10410, {1, {0x10438}}},
+ { 0x10411, {1, {0x10439}}},
+ { 0x10412, {1, {0x1043a}}},
+ { 0x10413, {1, {0x1043b}}},
+ { 0x10414, {1, {0x1043c}}},
+ { 0x10415, {1, {0x1043d}}},
+ { 0x10416, {1, {0x1043e}}},
+ { 0x10417, {1, {0x1043f}}},
+ { 0x10418, {1, {0x10440}}},
+ { 0x10419, {1, {0x10441}}},
+ { 0x1041a, {1, {0x10442}}},
+ { 0x1041b, {1, {0x10443}}},
+ { 0x1041c, {1, {0x10444}}},
+ { 0x1041d, {1, {0x10445}}},
+ { 0x1041e, {1, {0x10446}}},
+ { 0x1041f, {1, {0x10447}}},
+ { 0x10420, {1, {0x10448}}},
+ { 0x10421, {1, {0x10449}}},
+ { 0x10422, {1, {0x1044a}}},
+ { 0x10423, {1, {0x1044b}}},
+ { 0x10424, {1, {0x1044c}}},
+ { 0x10425, {1, {0x1044d}}},
+ { 0x10426, {1, {0x1044e}}},
+ { 0x10427, {1, {0x1044f}}}
+};
+
+static const CaseFold_11_Type CaseFold_Locale[] = {
+ { 0x0049, {1, {0x0069}}},
+ { 0x0130, {2, {0x0069, 0x0307}}}
+};
+
+static const CaseUnfold_11_Type CaseUnfold_11[] = {
+ { 0x0061, {1, {0x0041 }}},
+ { 0x0062, {1, {0x0042 }}},
+ { 0x0063, {1, {0x0043 }}},
+ { 0x0064, {1, {0x0044 }}},
+ { 0x0065, {1, {0x0045 }}},
+ { 0x0066, {1, {0x0046 }}},
+ { 0x0067, {1, {0x0047 }}},
+ { 0x0068, {1, {0x0048 }}},
+ { 0x006a, {1, {0x004a }}},
+ { 0x006b, {2, {0x212a, 0x004b }}},
+ { 0x006c, {1, {0x004c }}},
+ { 0x006d, {1, {0x004d }}},
+ { 0x006e, {1, {0x004e }}},
+ { 0x006f, {1, {0x004f }}},
+ { 0x0070, {1, {0x0050 }}},
+ { 0x0071, {1, {0x0051 }}},
+ { 0x0072, {1, {0x0052 }}},
+ { 0x0073, {2, {0x0053, 0x017f }}},
+ { 0x0074, {1, {0x0054 }}},
+ { 0x0075, {1, {0x0055 }}},
+ { 0x0076, {1, {0x0056 }}},
+ { 0x0077, {1, {0x0057 }}},
+ { 0x0078, {1, {0x0058 }}},
+ { 0x0079, {1, {0x0059 }}},
+ { 0x007a, {1, {0x005a }}},
+ { 0x00e0, {1, {0x00c0 }}},
+ { 0x00e1, {1, {0x00c1 }}},
+ { 0x00e2, {1, {0x00c2 }}},
+ { 0x00e3, {1, {0x00c3 }}},
+ { 0x00e4, {1, {0x00c4 }}},
+ { 0x00e5, {2, {0x212b, 0x00c5 }}},
+ { 0x00e6, {1, {0x00c6 }}},
+ { 0x00e7, {1, {0x00c7 }}},
+ { 0x00e8, {1, {0x00c8 }}},
+ { 0x00e9, {1, {0x00c9 }}},
+ { 0x00ea, {1, {0x00ca }}},
+ { 0x00eb, {1, {0x00cb }}},
+ { 0x00ec, {1, {0x00cc }}},
+ { 0x00ed, {1, {0x00cd }}},
+ { 0x00ee, {1, {0x00ce }}},
+ { 0x00ef, {1, {0x00cf }}},
+ { 0x00f0, {1, {0x00d0 }}},
+ { 0x00f1, {1, {0x00d1 }}},
+ { 0x00f2, {1, {0x00d2 }}},
+ { 0x00f3, {1, {0x00d3 }}},
+ { 0x00f4, {1, {0x00d4 }}},
+ { 0x00f5, {1, {0x00d5 }}},
+ { 0x00f6, {1, {0x00d6 }}},
+ { 0x00f8, {1, {0x00d8 }}},
+ { 0x00f9, {1, {0x00d9 }}},
+ { 0x00fa, {1, {0x00da }}},
+ { 0x00fb, {1, {0x00db }}},
+ { 0x00fc, {1, {0x00dc }}},
+ { 0x00fd, {1, {0x00dd }}},
+ { 0x00fe, {1, {0x00de }}},
+ { 0x00ff, {1, {0x0178 }}},
+ { 0x0101, {1, {0x0100 }}},
+ { 0x0103, {1, {0x0102 }}},
+ { 0x0105, {1, {0x0104 }}},
+ { 0x0107, {1, {0x0106 }}},
+ { 0x0109, {1, {0x0108 }}},
+ { 0x010b, {1, {0x010a }}},
+ { 0x010d, {1, {0x010c }}},
+ { 0x010f, {1, {0x010e }}},
+ { 0x0111, {1, {0x0110 }}},
+ { 0x0113, {1, {0x0112 }}},
+ { 0x0115, {1, {0x0114 }}},
+ { 0x0117, {1, {0x0116 }}},
+ { 0x0119, {1, {0x0118 }}},
+ { 0x011b, {1, {0x011a }}},
+ { 0x011d, {1, {0x011c }}},
+ { 0x011f, {1, {0x011e }}},
+ { 0x0121, {1, {0x0120 }}},
+ { 0x0123, {1, {0x0122 }}},
+ { 0x0125, {1, {0x0124 }}},
+ { 0x0127, {1, {0x0126 }}},
+ { 0x0129, {1, {0x0128 }}},
+ { 0x012b, {1, {0x012a }}},
+ { 0x012d, {1, {0x012c }}},
+ { 0x012f, {1, {0x012e }}},
+ { 0x0133, {1, {0x0132 }}},
+ { 0x0135, {1, {0x0134 }}},
+ { 0x0137, {1, {0x0136 }}},
+ { 0x013a, {1, {0x0139 }}},
+ { 0x013c, {1, {0x013b }}},
+ { 0x013e, {1, {0x013d }}},
+ { 0x0140, {1, {0x013f }}},
+ { 0x0142, {1, {0x0141 }}},
+ { 0x0144, {1, {0x0143 }}},
+ { 0x0146, {1, {0x0145 }}},
+ { 0x0148, {1, {0x0147 }}},
+ { 0x014b, {1, {0x014a }}},
+ { 0x014d, {1, {0x014c }}},
+ { 0x014f, {1, {0x014e }}},
+ { 0x0151, {1, {0x0150 }}},
+ { 0x0153, {1, {0x0152 }}},
+ { 0x0155, {1, {0x0154 }}},
+ { 0x0157, {1, {0x0156 }}},
+ { 0x0159, {1, {0x0158 }}},
+ { 0x015b, {1, {0x015a }}},
+ { 0x015d, {1, {0x015c }}},
+ { 0x015f, {1, {0x015e }}},
+ { 0x0161, {1, {0x0160 }}},
+ { 0x0163, {1, {0x0162 }}},
+ { 0x0165, {1, {0x0164 }}},
+ { 0x0167, {1, {0x0166 }}},
+ { 0x0169, {1, {0x0168 }}},
+ { 0x016b, {1, {0x016a }}},
+ { 0x016d, {1, {0x016c }}},
+ { 0x016f, {1, {0x016e }}},
+ { 0x0171, {1, {0x0170 }}},
+ { 0x0173, {1, {0x0172 }}},
+ { 0x0175, {1, {0x0174 }}},
+ { 0x0177, {1, {0x0176 }}},
+ { 0x017a, {1, {0x0179 }}},
+ { 0x017c, {1, {0x017b }}},
+ { 0x017e, {1, {0x017d }}},
+ { 0x0183, {1, {0x0182 }}},
+ { 0x0185, {1, {0x0184 }}},
+ { 0x0188, {1, {0x0187 }}},
+ { 0x018c, {1, {0x018b }}},
+ { 0x0192, {1, {0x0191 }}},
+ { 0x0195, {1, {0x01f6 }}},
+ { 0x0199, {1, {0x0198 }}},
+ { 0x019a, {1, {0x023d }}},
+ { 0x019e, {1, {0x0220 }}},
+ { 0x01a1, {1, {0x01a0 }}},
+ { 0x01a3, {1, {0x01a2 }}},
+ { 0x01a5, {1, {0x01a4 }}},
+ { 0x01a8, {1, {0x01a7 }}},
+ { 0x01ad, {1, {0x01ac }}},
+ { 0x01b0, {1, {0x01af }}},
+ { 0x01b4, {1, {0x01b3 }}},
+ { 0x01b6, {1, {0x01b5 }}},
+ { 0x01b9, {1, {0x01b8 }}},
+ { 0x01bd, {1, {0x01bc }}},
+ { 0x01bf, {1, {0x01f7 }}},
+ { 0x01c6, {2, {0x01c4, 0x01c5 }}},
+ { 0x01c9, {2, {0x01c7, 0x01c8 }}},
+ { 0x01cc, {2, {0x01ca, 0x01cb }}},
+ { 0x01ce, {1, {0x01cd }}},
+ { 0x01d0, {1, {0x01cf }}},
+ { 0x01d2, {1, {0x01d1 }}},
+ { 0x01d4, {1, {0x01d3 }}},
+ { 0x01d6, {1, {0x01d5 }}},
+ { 0x01d8, {1, {0x01d7 }}},
+ { 0x01da, {1, {0x01d9 }}},
+ { 0x01dc, {1, {0x01db }}},
+ { 0x01dd, {1, {0x018e }}},
+ { 0x01df, {1, {0x01de }}},
+ { 0x01e1, {1, {0x01e0 }}},
+ { 0x01e3, {1, {0x01e2 }}},
+ { 0x01e5, {1, {0x01e4 }}},
+ { 0x01e7, {1, {0x01e6 }}},
+ { 0x01e9, {1, {0x01e8 }}},
+ { 0x01eb, {1, {0x01ea }}},
+ { 0x01ed, {1, {0x01ec }}},
+ { 0x01ef, {1, {0x01ee }}},
+ { 0x01f3, {2, {0x01f1, 0x01f2 }}},
+ { 0x01f5, {1, {0x01f4 }}},
+ { 0x01f9, {1, {0x01f8 }}},
+ { 0x01fb, {1, {0x01fa }}},
+ { 0x01fd, {1, {0x01fc }}},
+ { 0x01ff, {1, {0x01fe }}},
+ { 0x0201, {1, {0x0200 }}},
+ { 0x0203, {1, {0x0202 }}},
+ { 0x0205, {1, {0x0204 }}},
+ { 0x0207, {1, {0x0206 }}},
+ { 0x0209, {1, {0x0208 }}},
+ { 0x020b, {1, {0x020a }}},
+ { 0x020d, {1, {0x020c }}},
+ { 0x020f, {1, {0x020e }}},
+ { 0x0211, {1, {0x0210 }}},
+ { 0x0213, {1, {0x0212 }}},
+ { 0x0215, {1, {0x0214 }}},
+ { 0x0217, {1, {0x0216 }}},
+ { 0x0219, {1, {0x0218 }}},
+ { 0x021b, {1, {0x021a }}},
+ { 0x021d, {1, {0x021c }}},
+ { 0x021f, {1, {0x021e }}},
+ { 0x0223, {1, {0x0222 }}},
+ { 0x0225, {1, {0x0224 }}},
+ { 0x0227, {1, {0x0226 }}},
+ { 0x0229, {1, {0x0228 }}},
+ { 0x022b, {1, {0x022a }}},
+ { 0x022d, {1, {0x022c }}},
+ { 0x022f, {1, {0x022e }}},
+ { 0x0231, {1, {0x0230 }}},
+ { 0x0233, {1, {0x0232 }}},
+ { 0x023c, {1, {0x023b }}},
+ { 0x0253, {1, {0x0181 }}},
+ { 0x0254, {1, {0x0186 }}},
+ { 0x0256, {1, {0x0189 }}},
+ { 0x0257, {1, {0x018a }}},
+ { 0x0259, {1, {0x018f }}},
+ { 0x025b, {1, {0x0190 }}},
+ { 0x0260, {1, {0x0193 }}},
+ { 0x0263, {1, {0x0194 }}},
+ { 0x0268, {1, {0x0197 }}},
+ { 0x0269, {1, {0x0196 }}},
+ { 0x026f, {1, {0x019c }}},
+ { 0x0272, {1, {0x019d }}},
+ { 0x0275, {1, {0x019f }}},
+ { 0x0280, {1, {0x01a6 }}},
+ { 0x0283, {1, {0x01a9 }}},
+ { 0x0288, {1, {0x01ae }}},
+ { 0x028a, {1, {0x01b1 }}},
+ { 0x028b, {1, {0x01b2 }}},
+ { 0x0292, {1, {0x01b7 }}},
+ { 0x0294, {1, {0x0241 }}},
+ { 0x03ac, {1, {0x0386 }}},
+ { 0x03ad, {1, {0x0388 }}},
+ { 0x03ae, {1, {0x0389 }}},
+ { 0x03af, {1, {0x038a }}},
+ { 0x03b1, {1, {0x0391 }}},
+ { 0x03b2, {2, {0x0392, 0x03d0 }}},
+ { 0x03b3, {1, {0x0393 }}},
+ { 0x03b4, {1, {0x0394 }}},
+ { 0x03b5, {2, {0x03f5, 0x0395 }}},
+ { 0x03b6, {1, {0x0396 }}},
+ { 0x03b7, {1, {0x0397 }}},
+ { 0x03b8, {3, {0x03f4, 0x0398, 0x03d1 }}},
+ { 0x03b9, {3, {0x1fbe, 0x0399, 0x0345 }}},
+ { 0x03ba, {2, {0x03f0, 0x039a }}},
+ { 0x03bb, {1, {0x039b }}},
+ { 0x03bc, {2, {0x00b5, 0x039c }}},
+ { 0x03bd, {1, {0x039d }}},
+ { 0x03be, {1, {0x039e }}},
+ { 0x03bf, {1, {0x039f }}},
+ { 0x03c0, {2, {0x03a0, 0x03d6 }}},
+ { 0x03c1, {2, {0x03f1, 0x03a1 }}},
+ { 0x03c3, {2, {0x03a3, 0x03c2 }}},
+ { 0x03c4, {1, {0x03a4 }}},
+ { 0x03c5, {1, {0x03a5 }}},
+ { 0x03c6, {2, {0x03a6, 0x03d5 }}},
+ { 0x03c7, {1, {0x03a7 }}},
+ { 0x03c8, {1, {0x03a8 }}},
+ { 0x03c9, {2, {0x03a9, 0x2126 }}},
+ { 0x03ca, {1, {0x03aa }}},
+ { 0x03cb, {1, {0x03ab }}},
+ { 0x03cc, {1, {0x038c }}},
+ { 0x03cd, {1, {0x038e }}},
+ { 0x03ce, {1, {0x038f }}},
+ { 0x03d9, {1, {0x03d8 }}},
+ { 0x03db, {1, {0x03da }}},
+ { 0x03dd, {1, {0x03dc }}},
+ { 0x03df, {1, {0x03de }}},
+ { 0x03e1, {1, {0x03e0 }}},
+ { 0x03e3, {1, {0x03e2 }}},
+ { 0x03e5, {1, {0x03e4 }}},
+ { 0x03e7, {1, {0x03e6 }}},
+ { 0x03e9, {1, {0x03e8 }}},
+ { 0x03eb, {1, {0x03ea }}},
+ { 0x03ed, {1, {0x03ec }}},
+ { 0x03ef, {1, {0x03ee }}},
+ { 0x03f2, {1, {0x03f9 }}},
+ { 0x03f8, {1, {0x03f7 }}},
+ { 0x03fb, {1, {0x03fa }}},
+ { 0x0430, {1, {0x0410 }}},
+ { 0x0431, {1, {0x0411 }}},
+ { 0x0432, {1, {0x0412 }}},
+ { 0x0433, {1, {0x0413 }}},
+ { 0x0434, {1, {0x0414 }}},
+ { 0x0435, {1, {0x0415 }}},
+ { 0x0436, {1, {0x0416 }}},
+ { 0x0437, {1, {0x0417 }}},
+ { 0x0438, {1, {0x0418 }}},
+ { 0x0439, {1, {0x0419 }}},
+ { 0x043a, {1, {0x041a }}},
+ { 0x043b, {1, {0x041b }}},
+ { 0x043c, {1, {0x041c }}},
+ { 0x043d, {1, {0x041d }}},
+ { 0x043e, {1, {0x041e }}},
+ { 0x043f, {1, {0x041f }}},
+ { 0x0440, {1, {0x0420 }}},
+ { 0x0441, {1, {0x0421 }}},
+ { 0x0442, {1, {0x0422 }}},
+ { 0x0443, {1, {0x0423 }}},
+ { 0x0444, {1, {0x0424 }}},
+ { 0x0445, {1, {0x0425 }}},
+ { 0x0446, {1, {0x0426 }}},
+ { 0x0447, {1, {0x0427 }}},
+ { 0x0448, {1, {0x0428 }}},
+ { 0x0449, {1, {0x0429 }}},
+ { 0x044a, {1, {0x042a }}},
+ { 0x044b, {1, {0x042b }}},
+ { 0x044c, {1, {0x042c }}},
+ { 0x044d, {1, {0x042d }}},
+ { 0x044e, {1, {0x042e }}},
+ { 0x044f, {1, {0x042f }}},
+ { 0x0450, {1, {0x0400 }}},
+ { 0x0451, {1, {0x0401 }}},
+ { 0x0452, {1, {0x0402 }}},
+ { 0x0453, {1, {0x0403 }}},
+ { 0x0454, {1, {0x0404 }}},
+ { 0x0455, {1, {0x0405 }}},
+ { 0x0456, {1, {0x0406 }}},
+ { 0x0457, {1, {0x0407 }}},
+ { 0x0458, {1, {0x0408 }}},
+ { 0x0459, {1, {0x0409 }}},
+ { 0x045a, {1, {0x040a }}},
+ { 0x045b, {1, {0x040b }}},
+ { 0x045c, {1, {0x040c }}},
+ { 0x045d, {1, {0x040d }}},
+ { 0x045e, {1, {0x040e }}},
+ { 0x045f, {1, {0x040f }}},
+ { 0x0461, {1, {0x0460 }}},
+ { 0x0463, {1, {0x0462 }}},
+ { 0x0465, {1, {0x0464 }}},
+ { 0x0467, {1, {0x0466 }}},
+ { 0x0469, {1, {0x0468 }}},
+ { 0x046b, {1, {0x046a }}},
+ { 0x046d, {1, {0x046c }}},
+ { 0x046f, {1, {0x046e }}},
+ { 0x0471, {1, {0x0470 }}},
+ { 0x0473, {1, {0x0472 }}},
+ { 0x0475, {1, {0x0474 }}},
+ { 0x0477, {1, {0x0476 }}},
+ { 0x0479, {1, {0x0478 }}},
+ { 0x047b, {1, {0x047a }}},
+ { 0x047d, {1, {0x047c }}},
+ { 0x047f, {1, {0x047e }}},
+ { 0x0481, {1, {0x0480 }}},
+ { 0x048b, {1, {0x048a }}},
+ { 0x048d, {1, {0x048c }}},
+ { 0x048f, {1, {0x048e }}},
+ { 0x0491, {1, {0x0490 }}},
+ { 0x0493, {1, {0x0492 }}},
+ { 0x0495, {1, {0x0494 }}},
+ { 0x0497, {1, {0x0496 }}},
+ { 0x0499, {1, {0x0498 }}},
+ { 0x049b, {1, {0x049a }}},
+ { 0x049d, {1, {0x049c }}},
+ { 0x049f, {1, {0x049e }}},
+ { 0x04a1, {1, {0x04a0 }}},
+ { 0x04a3, {1, {0x04a2 }}},
+ { 0x04a5, {1, {0x04a4 }}},
+ { 0x04a7, {1, {0x04a6 }}},
+ { 0x04a9, {1, {0x04a8 }}},
+ { 0x04ab, {1, {0x04aa }}},
+ { 0x04ad, {1, {0x04ac }}},
+ { 0x04af, {1, {0x04ae }}},
+ { 0x04b1, {1, {0x04b0 }}},
+ { 0x04b3, {1, {0x04b2 }}},
+ { 0x04b5, {1, {0x04b4 }}},
+ { 0x04b7, {1, {0x04b6 }}},
+ { 0x04b9, {1, {0x04b8 }}},
+ { 0x04bb, {1, {0x04ba }}},
+ { 0x04bd, {1, {0x04bc }}},
+ { 0x04bf, {1, {0x04be }}},
+ { 0x04c2, {1, {0x04c1 }}},
+ { 0x04c4, {1, {0x04c3 }}},
+ { 0x04c6, {1, {0x04c5 }}},
+ { 0x04c8, {1, {0x04c7 }}},
+ { 0x04ca, {1, {0x04c9 }}},
+ { 0x04cc, {1, {0x04cb }}},
+ { 0x04ce, {1, {0x04cd }}},
+ { 0x04d1, {1, {0x04d0 }}},
+ { 0x04d3, {1, {0x04d2 }}},
+ { 0x04d5, {1, {0x04d4 }}},
+ { 0x04d7, {1, {0x04d6 }}},
+ { 0x04d9, {1, {0x04d8 }}},
+ { 0x04db, {1, {0x04da }}},
+ { 0x04dd, {1, {0x04dc }}},
+ { 0x04df, {1, {0x04de }}},
+ { 0x04e1, {1, {0x04e0 }}},
+ { 0x04e3, {1, {0x04e2 }}},
+ { 0x04e5, {1, {0x04e4 }}},
+ { 0x04e7, {1, {0x04e6 }}},
+ { 0x04e9, {1, {0x04e8 }}},
+ { 0x04eb, {1, {0x04ea }}},
+ { 0x04ed, {1, {0x04ec }}},
+ { 0x04ef, {1, {0x04ee }}},
+ { 0x04f1, {1, {0x04f0 }}},
+ { 0x04f3, {1, {0x04f2 }}},
+ { 0x04f5, {1, {0x04f4 }}},
+ { 0x04f7, {1, {0x04f6 }}},
+ { 0x04f9, {1, {0x04f8 }}},
+ { 0x0501, {1, {0x0500 }}},
+ { 0x0503, {1, {0x0502 }}},
+ { 0x0505, {1, {0x0504 }}},
+ { 0x0507, {1, {0x0506 }}},
+ { 0x0509, {1, {0x0508 }}},
+ { 0x050b, {1, {0x050a }}},
+ { 0x050d, {1, {0x050c }}},
+ { 0x050f, {1, {0x050e }}},
+ { 0x0561, {1, {0x0531 }}},
+ { 0x0562, {1, {0x0532 }}},
+ { 0x0563, {1, {0x0533 }}},
+ { 0x0564, {1, {0x0534 }}},
+ { 0x0565, {1, {0x0535 }}},
+ { 0x0566, {1, {0x0536 }}},
+ { 0x0567, {1, {0x0537 }}},
+ { 0x0568, {1, {0x0538 }}},
+ { 0x0569, {1, {0x0539 }}},
+ { 0x056a, {1, {0x053a }}},
+ { 0x056b, {1, {0x053b }}},
+ { 0x056c, {1, {0x053c }}},
+ { 0x056d, {1, {0x053d }}},
+ { 0x056e, {1, {0x053e }}},
+ { 0x056f, {1, {0x053f }}},
+ { 0x0570, {1, {0x0540 }}},
+ { 0x0571, {1, {0x0541 }}},
+ { 0x0572, {1, {0x0542 }}},
+ { 0x0573, {1, {0x0543 }}},
+ { 0x0574, {1, {0x0544 }}},
+ { 0x0575, {1, {0x0545 }}},
+ { 0x0576, {1, {0x0546 }}},
+ { 0x0577, {1, {0x0547 }}},
+ { 0x0578, {1, {0x0548 }}},
+ { 0x0579, {1, {0x0549 }}},
+ { 0x057a, {1, {0x054a }}},
+ { 0x057b, {1, {0x054b }}},
+ { 0x057c, {1, {0x054c }}},
+ { 0x057d, {1, {0x054d }}},
+ { 0x057e, {1, {0x054e }}},
+ { 0x057f, {1, {0x054f }}},
+ { 0x0580, {1, {0x0550 }}},
+ { 0x0581, {1, {0x0551 }}},
+ { 0x0582, {1, {0x0552 }}},
+ { 0x0583, {1, {0x0553 }}},
+ { 0x0584, {1, {0x0554 }}},
+ { 0x0585, {1, {0x0555 }}},
+ { 0x0586, {1, {0x0556 }}},
+ { 0x1e01, {1, {0x1e00 }}},
+ { 0x1e03, {1, {0x1e02 }}},
+ { 0x1e05, {1, {0x1e04 }}},
+ { 0x1e07, {1, {0x1e06 }}},
+ { 0x1e09, {1, {0x1e08 }}},
+ { 0x1e0b, {1, {0x1e0a }}},
+ { 0x1e0d, {1, {0x1e0c }}},
+ { 0x1e0f, {1, {0x1e0e }}},
+ { 0x1e11, {1, {0x1e10 }}},
+ { 0x1e13, {1, {0x1e12 }}},
+ { 0x1e15, {1, {0x1e14 }}},
+ { 0x1e17, {1, {0x1e16 }}},
+ { 0x1e19, {1, {0x1e18 }}},
+ { 0x1e1b, {1, {0x1e1a }}},
+ { 0x1e1d, {1, {0x1e1c }}},
+ { 0x1e1f, {1, {0x1e1e }}},
+ { 0x1e21, {1, {0x1e20 }}},
+ { 0x1e23, {1, {0x1e22 }}},
+ { 0x1e25, {1, {0x1e24 }}},
+ { 0x1e27, {1, {0x1e26 }}},
+ { 0x1e29, {1, {0x1e28 }}},
+ { 0x1e2b, {1, {0x1e2a }}},
+ { 0x1e2d, {1, {0x1e2c }}},
+ { 0x1e2f, {1, {0x1e2e }}},
+ { 0x1e31, {1, {0x1e30 }}},
+ { 0x1e33, {1, {0x1e32 }}},
+ { 0x1e35, {1, {0x1e34 }}},
+ { 0x1e37, {1, {0x1e36 }}},
+ { 0x1e39, {1, {0x1e38 }}},
+ { 0x1e3b, {1, {0x1e3a }}},
+ { 0x1e3d, {1, {0x1e3c }}},
+ { 0x1e3f, {1, {0x1e3e }}},
+ { 0x1e41, {1, {0x1e40 }}},
+ { 0x1e43, {1, {0x1e42 }}},
+ { 0x1e45, {1, {0x1e44 }}},
+ { 0x1e47, {1, {0x1e46 }}},
+ { 0x1e49, {1, {0x1e48 }}},
+ { 0x1e4b, {1, {0x1e4a }}},
+ { 0x1e4d, {1, {0x1e4c }}},
+ { 0x1e4f, {1, {0x1e4e }}},
+ { 0x1e51, {1, {0x1e50 }}},
+ { 0x1e53, {1, {0x1e52 }}},
+ { 0x1e55, {1, {0x1e54 }}},
+ { 0x1e57, {1, {0x1e56 }}},
+ { 0x1e59, {1, {0x1e58 }}},
+ { 0x1e5b, {1, {0x1e5a }}},
+ { 0x1e5d, {1, {0x1e5c }}},
+ { 0x1e5f, {1, {0x1e5e }}},
+ { 0x1e61, {2, {0x1e9b, 0x1e60 }}},
+ { 0x1e63, {1, {0x1e62 }}},
+ { 0x1e65, {1, {0x1e64 }}},
+ { 0x1e67, {1, {0x1e66 }}},
+ { 0x1e69, {1, {0x1e68 }}},
+ { 0x1e6b, {1, {0x1e6a }}},
+ { 0x1e6d, {1, {0x1e6c }}},
+ { 0x1e6f, {1, {0x1e6e }}},
+ { 0x1e71, {1, {0x1e70 }}},
+ { 0x1e73, {1, {0x1e72 }}},
+ { 0x1e75, {1, {0x1e74 }}},
+ { 0x1e77, {1, {0x1e76 }}},
+ { 0x1e79, {1, {0x1e78 }}},
+ { 0x1e7b, {1, {0x1e7a }}},
+ { 0x1e7d, {1, {0x1e7c }}},
+ { 0x1e7f, {1, {0x1e7e }}},
+ { 0x1e81, {1, {0x1e80 }}},
+ { 0x1e83, {1, {0x1e82 }}},
+ { 0x1e85, {1, {0x1e84 }}},
+ { 0x1e87, {1, {0x1e86 }}},
+ { 0x1e89, {1, {0x1e88 }}},
+ { 0x1e8b, {1, {0x1e8a }}},
+ { 0x1e8d, {1, {0x1e8c }}},
+ { 0x1e8f, {1, {0x1e8e }}},
+ { 0x1e91, {1, {0x1e90 }}},
+ { 0x1e93, {1, {0x1e92 }}},
+ { 0x1e95, {1, {0x1e94 }}},
+ { 0x1ea1, {1, {0x1ea0 }}},
+ { 0x1ea3, {1, {0x1ea2 }}},
+ { 0x1ea5, {1, {0x1ea4 }}},
+ { 0x1ea7, {1, {0x1ea6 }}},
+ { 0x1ea9, {1, {0x1ea8 }}},
+ { 0x1eab, {1, {0x1eaa }}},
+ { 0x1ead, {1, {0x1eac }}},
+ { 0x1eaf, {1, {0x1eae }}},
+ { 0x1eb1, {1, {0x1eb0 }}},
+ { 0x1eb3, {1, {0x1eb2 }}},
+ { 0x1eb5, {1, {0x1eb4 }}},
+ { 0x1eb7, {1, {0x1eb6 }}},
+ { 0x1eb9, {1, {0x1eb8 }}},
+ { 0x1ebb, {1, {0x1eba }}},
+ { 0x1ebd, {1, {0x1ebc }}},
+ { 0x1ebf, {1, {0x1ebe }}},
+ { 0x1ec1, {1, {0x1ec0 }}},
+ { 0x1ec3, {1, {0x1ec2 }}},
+ { 0x1ec5, {1, {0x1ec4 }}},
+ { 0x1ec7, {1, {0x1ec6 }}},
+ { 0x1ec9, {1, {0x1ec8 }}},
+ { 0x1ecb, {1, {0x1eca }}},
+ { 0x1ecd, {1, {0x1ecc }}},
+ { 0x1ecf, {1, {0x1ece }}},
+ { 0x1ed1, {1, {0x1ed0 }}},
+ { 0x1ed3, {1, {0x1ed2 }}},
+ { 0x1ed5, {1, {0x1ed4 }}},
+ { 0x1ed7, {1, {0x1ed6 }}},
+ { 0x1ed9, {1, {0x1ed8 }}},
+ { 0x1edb, {1, {0x1eda }}},
+ { 0x1edd, {1, {0x1edc }}},
+ { 0x1edf, {1, {0x1ede }}},
+ { 0x1ee1, {1, {0x1ee0 }}},
+ { 0x1ee3, {1, {0x1ee2 }}},
+ { 0x1ee5, {1, {0x1ee4 }}},
+ { 0x1ee7, {1, {0x1ee6 }}},
+ { 0x1ee9, {1, {0x1ee8 }}},
+ { 0x1eeb, {1, {0x1eea }}},
+ { 0x1eed, {1, {0x1eec }}},
+ { 0x1eef, {1, {0x1eee }}},
+ { 0x1ef1, {1, {0x1ef0 }}},
+ { 0x1ef3, {1, {0x1ef2 }}},
+ { 0x1ef5, {1, {0x1ef4 }}},
+ { 0x1ef7, {1, {0x1ef6 }}},
+ { 0x1ef9, {1, {0x1ef8 }}},
+ { 0x1f00, {1, {0x1f08 }}},
+ { 0x1f01, {1, {0x1f09 }}},
+ { 0x1f02, {1, {0x1f0a }}},
+ { 0x1f03, {1, {0x1f0b }}},
+ { 0x1f04, {1, {0x1f0c }}},
+ { 0x1f05, {1, {0x1f0d }}},
+ { 0x1f06, {1, {0x1f0e }}},
+ { 0x1f07, {1, {0x1f0f }}},
+ { 0x1f10, {1, {0x1f18 }}},
+ { 0x1f11, {1, {0x1f19 }}},
+ { 0x1f12, {1, {0x1f1a }}},
+ { 0x1f13, {1, {0x1f1b }}},
+ { 0x1f14, {1, {0x1f1c }}},
+ { 0x1f15, {1, {0x1f1d }}},
+ { 0x1f20, {1, {0x1f28 }}},
+ { 0x1f21, {1, {0x1f29 }}},
+ { 0x1f22, {1, {0x1f2a }}},
+ { 0x1f23, {1, {0x1f2b }}},
+ { 0x1f24, {1, {0x1f2c }}},
+ { 0x1f25, {1, {0x1f2d }}},
+ { 0x1f26, {1, {0x1f2e }}},
+ { 0x1f27, {1, {0x1f2f }}},
+ { 0x1f30, {1, {0x1f38 }}},
+ { 0x1f31, {1, {0x1f39 }}},
+ { 0x1f32, {1, {0x1f3a }}},
+ { 0x1f33, {1, {0x1f3b }}},
+ { 0x1f34, {1, {0x1f3c }}},
+ { 0x1f35, {1, {0x1f3d }}},
+ { 0x1f36, {1, {0x1f3e }}},
+ { 0x1f37, {1, {0x1f3f }}},
+ { 0x1f40, {1, {0x1f48 }}},
+ { 0x1f41, {1, {0x1f49 }}},
+ { 0x1f42, {1, {0x1f4a }}},
+ { 0x1f43, {1, {0x1f4b }}},
+ { 0x1f44, {1, {0x1f4c }}},
+ { 0x1f45, {1, {0x1f4d }}},
+ { 0x1f51, {1, {0x1f59 }}},
+ { 0x1f53, {1, {0x1f5b }}},
+ { 0x1f55, {1, {0x1f5d }}},
+ { 0x1f57, {1, {0x1f5f }}},
+ { 0x1f60, {1, {0x1f68 }}},
+ { 0x1f61, {1, {0x1f69 }}},
+ { 0x1f62, {1, {0x1f6a }}},
+ { 0x1f63, {1, {0x1f6b }}},
+ { 0x1f64, {1, {0x1f6c }}},
+ { 0x1f65, {1, {0x1f6d }}},
+ { 0x1f66, {1, {0x1f6e }}},
+ { 0x1f67, {1, {0x1f6f }}},
+ { 0x1f70, {1, {0x1fba }}},
+ { 0x1f71, {1, {0x1fbb }}},
+ { 0x1f72, {1, {0x1fc8 }}},
+ { 0x1f73, {1, {0x1fc9 }}},
+ { 0x1f74, {1, {0x1fca }}},
+ { 0x1f75, {1, {0x1fcb }}},
+ { 0x1f76, {1, {0x1fda }}},
+ { 0x1f77, {1, {0x1fdb }}},
+ { 0x1f78, {1, {0x1ff8 }}},
+ { 0x1f79, {1, {0x1ff9 }}},
+ { 0x1f7a, {1, {0x1fea }}},
+ { 0x1f7b, {1, {0x1feb }}},
+ { 0x1f7c, {1, {0x1ffa }}},
+ { 0x1f7d, {1, {0x1ffb }}},
+ { 0x1fb0, {1, {0x1fb8 }}},
+ { 0x1fb1, {1, {0x1fb9 }}},
+ { 0x1fd0, {1, {0x1fd8 }}},
+ { 0x1fd1, {1, {0x1fd9 }}},
+ { 0x1fe0, {1, {0x1fe8 }}},
+ { 0x1fe1, {1, {0x1fe9 }}},
+ { 0x1fe5, {1, {0x1fec }}},
+ { 0x2170, {1, {0x2160 }}},
+ { 0x2171, {1, {0x2161 }}},
+ { 0x2172, {1, {0x2162 }}},
+ { 0x2173, {1, {0x2163 }}},
+ { 0x2174, {1, {0x2164 }}},
+ { 0x2175, {1, {0x2165 }}},
+ { 0x2176, {1, {0x2166 }}},
+ { 0x2177, {1, {0x2167 }}},
+ { 0x2178, {1, {0x2168 }}},
+ { 0x2179, {1, {0x2169 }}},
+ { 0x217a, {1, {0x216a }}},
+ { 0x217b, {1, {0x216b }}},
+ { 0x217c, {1, {0x216c }}},
+ { 0x217d, {1, {0x216d }}},
+ { 0x217e, {1, {0x216e }}},
+ { 0x217f, {1, {0x216f }}},
+ { 0x24d0, {1, {0x24b6 }}},
+ { 0x24d1, {1, {0x24b7 }}},
+ { 0x24d2, {1, {0x24b8 }}},
+ { 0x24d3, {1, {0x24b9 }}},
+ { 0x24d4, {1, {0x24ba }}},
+ { 0x24d5, {1, {0x24bb }}},
+ { 0x24d6, {1, {0x24bc }}},
+ { 0x24d7, {1, {0x24bd }}},
+ { 0x24d8, {1, {0x24be }}},
+ { 0x24d9, {1, {0x24bf }}},
+ { 0x24da, {1, {0x24c0 }}},
+ { 0x24db, {1, {0x24c1 }}},
+ { 0x24dc, {1, {0x24c2 }}},
+ { 0x24dd, {1, {0x24c3 }}},
+ { 0x24de, {1, {0x24c4 }}},
+ { 0x24df, {1, {0x24c5 }}},
+ { 0x24e0, {1, {0x24c6 }}},
+ { 0x24e1, {1, {0x24c7 }}},
+ { 0x24e2, {1, {0x24c8 }}},
+ { 0x24e3, {1, {0x24c9 }}},
+ { 0x24e4, {1, {0x24ca }}},
+ { 0x24e5, {1, {0x24cb }}},
+ { 0x24e6, {1, {0x24cc }}},
+ { 0x24e7, {1, {0x24cd }}},
+ { 0x24e8, {1, {0x24ce }}},
+ { 0x24e9, {1, {0x24cf }}},
+ { 0x2c30, {1, {0x2c00 }}},
+ { 0x2c31, {1, {0x2c01 }}},
+ { 0x2c32, {1, {0x2c02 }}},
+ { 0x2c33, {1, {0x2c03 }}},
+ { 0x2c34, {1, {0x2c04 }}},
+ { 0x2c35, {1, {0x2c05 }}},
+ { 0x2c36, {1, {0x2c06 }}},
+ { 0x2c37, {1, {0x2c07 }}},
+ { 0x2c38, {1, {0x2c08 }}},
+ { 0x2c39, {1, {0x2c09 }}},
+ { 0x2c3a, {1, {0x2c0a }}},
+ { 0x2c3b, {1, {0x2c0b }}},
+ { 0x2c3c, {1, {0x2c0c }}},
+ { 0x2c3d, {1, {0x2c0d }}},
+ { 0x2c3e, {1, {0x2c0e }}},
+ { 0x2c3f, {1, {0x2c0f }}},
+ { 0x2c40, {1, {0x2c10 }}},
+ { 0x2c41, {1, {0x2c11 }}},
+ { 0x2c42, {1, {0x2c12 }}},
+ { 0x2c43, {1, {0x2c13 }}},
+ { 0x2c44, {1, {0x2c14 }}},
+ { 0x2c45, {1, {0x2c15 }}},
+ { 0x2c46, {1, {0x2c16 }}},
+ { 0x2c47, {1, {0x2c17 }}},
+ { 0x2c48, {1, {0x2c18 }}},
+ { 0x2c49, {1, {0x2c19 }}},
+ { 0x2c4a, {1, {0x2c1a }}},
+ { 0x2c4b, {1, {0x2c1b }}},
+ { 0x2c4c, {1, {0x2c1c }}},
+ { 0x2c4d, {1, {0x2c1d }}},
+ { 0x2c4e, {1, {0x2c1e }}},
+ { 0x2c4f, {1, {0x2c1f }}},
+ { 0x2c50, {1, {0x2c20 }}},
+ { 0x2c51, {1, {0x2c21 }}},
+ { 0x2c52, {1, {0x2c22 }}},
+ { 0x2c53, {1, {0x2c23 }}},
+ { 0x2c54, {1, {0x2c24 }}},
+ { 0x2c55, {1, {0x2c25 }}},
+ { 0x2c56, {1, {0x2c26 }}},
+ { 0x2c57, {1, {0x2c27 }}},
+ { 0x2c58, {1, {0x2c28 }}},
+ { 0x2c59, {1, {0x2c29 }}},
+ { 0x2c5a, {1, {0x2c2a }}},
+ { 0x2c5b, {1, {0x2c2b }}},
+ { 0x2c5c, {1, {0x2c2c }}},
+ { 0x2c5d, {1, {0x2c2d }}},
+ { 0x2c5e, {1, {0x2c2e }}},
+ { 0x2c81, {1, {0x2c80 }}},
+ { 0x2c83, {1, {0x2c82 }}},
+ { 0x2c85, {1, {0x2c84 }}},
+ { 0x2c87, {1, {0x2c86 }}},
+ { 0x2c89, {1, {0x2c88 }}},
+ { 0x2c8b, {1, {0x2c8a }}},
+ { 0x2c8d, {1, {0x2c8c }}},
+ { 0x2c8f, {1, {0x2c8e }}},
+ { 0x2c91, {1, {0x2c90 }}},
+ { 0x2c93, {1, {0x2c92 }}},
+ { 0x2c95, {1, {0x2c94 }}},
+ { 0x2c97, {1, {0x2c96 }}},
+ { 0x2c99, {1, {0x2c98 }}},
+ { 0x2c9b, {1, {0x2c9a }}},
+ { 0x2c9d, {1, {0x2c9c }}},
+ { 0x2c9f, {1, {0x2c9e }}},
+ { 0x2ca1, {1, {0x2ca0 }}},
+ { 0x2ca3, {1, {0x2ca2 }}},
+ { 0x2ca5, {1, {0x2ca4 }}},
+ { 0x2ca7, {1, {0x2ca6 }}},
+ { 0x2ca9, {1, {0x2ca8 }}},
+ { 0x2cab, {1, {0x2caa }}},
+ { 0x2cad, {1, {0x2cac }}},
+ { 0x2caf, {1, {0x2cae }}},
+ { 0x2cb1, {1, {0x2cb0 }}},
+ { 0x2cb3, {1, {0x2cb2 }}},
+ { 0x2cb5, {1, {0x2cb4 }}},
+ { 0x2cb7, {1, {0x2cb6 }}},
+ { 0x2cb9, {1, {0x2cb8 }}},
+ { 0x2cbb, {1, {0x2cba }}},
+ { 0x2cbd, {1, {0x2cbc }}},
+ { 0x2cbf, {1, {0x2cbe }}},
+ { 0x2cc1, {1, {0x2cc0 }}},
+ { 0x2cc3, {1, {0x2cc2 }}},
+ { 0x2cc5, {1, {0x2cc4 }}},
+ { 0x2cc7, {1, {0x2cc6 }}},
+ { 0x2cc9, {1, {0x2cc8 }}},
+ { 0x2ccb, {1, {0x2cca }}},
+ { 0x2ccd, {1, {0x2ccc }}},
+ { 0x2ccf, {1, {0x2cce }}},
+ { 0x2cd1, {1, {0x2cd0 }}},
+ { 0x2cd3, {1, {0x2cd2 }}},
+ { 0x2cd5, {1, {0x2cd4 }}},
+ { 0x2cd7, {1, {0x2cd6 }}},
+ { 0x2cd9, {1, {0x2cd8 }}},
+ { 0x2cdb, {1, {0x2cda }}},
+ { 0x2cdd, {1, {0x2cdc }}},
+ { 0x2cdf, {1, {0x2cde }}},
+ { 0x2ce1, {1, {0x2ce0 }}},
+ { 0x2ce3, {1, {0x2ce2 }}},
+ { 0x2d00, {1, {0x10a0 }}},
+ { 0x2d01, {1, {0x10a1 }}},
+ { 0x2d02, {1, {0x10a2 }}},
+ { 0x2d03, {1, {0x10a3 }}},
+ { 0x2d04, {1, {0x10a4 }}},
+ { 0x2d05, {1, {0x10a5 }}},
+ { 0x2d06, {1, {0x10a6 }}},
+ { 0x2d07, {1, {0x10a7 }}},
+ { 0x2d08, {1, {0x10a8 }}},
+ { 0x2d09, {1, {0x10a9 }}},
+ { 0x2d0a, {1, {0x10aa }}},
+ { 0x2d0b, {1, {0x10ab }}},
+ { 0x2d0c, {1, {0x10ac }}},
+ { 0x2d0d, {1, {0x10ad }}},
+ { 0x2d0e, {1, {0x10ae }}},
+ { 0x2d0f, {1, {0x10af }}},
+ { 0x2d10, {1, {0x10b0 }}},
+ { 0x2d11, {1, {0x10b1 }}},
+ { 0x2d12, {1, {0x10b2 }}},
+ { 0x2d13, {1, {0x10b3 }}},
+ { 0x2d14, {1, {0x10b4 }}},
+ { 0x2d15, {1, {0x10b5 }}},
+ { 0x2d16, {1, {0x10b6 }}},
+ { 0x2d17, {1, {0x10b7 }}},
+ { 0x2d18, {1, {0x10b8 }}},
+ { 0x2d19, {1, {0x10b9 }}},
+ { 0x2d1a, {1, {0x10ba }}},
+ { 0x2d1b, {1, {0x10bb }}},
+ { 0x2d1c, {1, {0x10bc }}},
+ { 0x2d1d, {1, {0x10bd }}},
+ { 0x2d1e, {1, {0x10be }}},
+ { 0x2d1f, {1, {0x10bf }}},
+ { 0x2d20, {1, {0x10c0 }}},
+ { 0x2d21, {1, {0x10c1 }}},
+ { 0x2d22, {1, {0x10c2 }}},
+ { 0x2d23, {1, {0x10c3 }}},
+ { 0x2d24, {1, {0x10c4 }}},
+ { 0x2d25, {1, {0x10c5 }}},
+ { 0xff41, {1, {0xff21 }}},
+ { 0xff42, {1, {0xff22 }}},
+ { 0xff43, {1, {0xff23 }}},
+ { 0xff44, {1, {0xff24 }}},
+ { 0xff45, {1, {0xff25 }}},
+ { 0xff46, {1, {0xff26 }}},
+ { 0xff47, {1, {0xff27 }}},
+ { 0xff48, {1, {0xff28 }}},
+ { 0xff49, {1, {0xff29 }}},
+ { 0xff4a, {1, {0xff2a }}},
+ { 0xff4b, {1, {0xff2b }}},
+ { 0xff4c, {1, {0xff2c }}},
+ { 0xff4d, {1, {0xff2d }}},
+ { 0xff4e, {1, {0xff2e }}},
+ { 0xff4f, {1, {0xff2f }}},
+ { 0xff50, {1, {0xff30 }}},
+ { 0xff51, {1, {0xff31 }}},
+ { 0xff52, {1, {0xff32 }}},
+ { 0xff53, {1, {0xff33 }}},
+ { 0xff54, {1, {0xff34 }}},
+ { 0xff55, {1, {0xff35 }}},
+ { 0xff56, {1, {0xff36 }}},
+ { 0xff57, {1, {0xff37 }}},
+ { 0xff58, {1, {0xff38 }}},
+ { 0xff59, {1, {0xff39 }}},
+ { 0xff5a, {1, {0xff3a }}},
+ { 0x10428, {1, {0x10400 }}},
+ { 0x10429, {1, {0x10401 }}},
+ { 0x1042a, {1, {0x10402 }}},
+ { 0x1042b, {1, {0x10403 }}},
+ { 0x1042c, {1, {0x10404 }}},
+ { 0x1042d, {1, {0x10405 }}},
+ { 0x1042e, {1, {0x10406 }}},
+ { 0x1042f, {1, {0x10407 }}},
+ { 0x10430, {1, {0x10408 }}},
+ { 0x10431, {1, {0x10409 }}},
+ { 0x10432, {1, {0x1040a }}},
+ { 0x10433, {1, {0x1040b }}},
+ { 0x10434, {1, {0x1040c }}},
+ { 0x10435, {1, {0x1040d }}},
+ { 0x10436, {1, {0x1040e }}},
+ { 0x10437, {1, {0x1040f }}},
+ { 0x10438, {1, {0x10410 }}},
+ { 0x10439, {1, {0x10411 }}},
+ { 0x1043a, {1, {0x10412 }}},
+ { 0x1043b, {1, {0x10413 }}},
+ { 0x1043c, {1, {0x10414 }}},
+ { 0x1043d, {1, {0x10415 }}},
+ { 0x1043e, {1, {0x10416 }}},
+ { 0x1043f, {1, {0x10417 }}},
+ { 0x10440, {1, {0x10418 }}},
+ { 0x10441, {1, {0x10419 }}},
+ { 0x10442, {1, {0x1041a }}},
+ { 0x10443, {1, {0x1041b }}},
+ { 0x10444, {1, {0x1041c }}},
+ { 0x10445, {1, {0x1041d }}},
+ { 0x10446, {1, {0x1041e }}},
+ { 0x10447, {1, {0x1041f }}},
+ { 0x10448, {1, {0x10420 }}},
+ { 0x10449, {1, {0x10421 }}},
+ { 0x1044a, {1, {0x10422 }}},
+ { 0x1044b, {1, {0x10423 }}},
+ { 0x1044c, {1, {0x10424 }}},
+ { 0x1044d, {1, {0x10425 }}},
+ { 0x1044e, {1, {0x10426 }}},
+ { 0x1044f, {1, {0x10427 }}}
+};
+
+static const CaseUnfold_11_Type CaseUnfold_11_Locale[] = {
+ { 0x0069, {1, {0x0049 }}}
+};
+
+static const CaseUnfold_12_Type CaseUnfold_12[] = {
+ { {0x0061, 0x02be}, {1, {0x1e9a }}},
+ { {0x0066, 0x0066}, {1, {0xfb00 }}},
+ { {0x0066, 0x0069}, {1, {0xfb01 }}},
+ { {0x0066, 0x006c}, {1, {0xfb02 }}},
+ { {0x0068, 0x0331}, {1, {0x1e96 }}},
+ { {0x006a, 0x030c}, {1, {0x01f0 }}},
+ { {0x0073, 0x0073}, {1, {0x00df }}},
+ { {0x0073, 0x0074}, {2, {0xfb05, 0xfb06 }}},
+ { {0x0074, 0x0308}, {1, {0x1e97 }}},
+ { {0x0077, 0x030a}, {1, {0x1e98 }}},
+ { {0x0079, 0x030a}, {1, {0x1e99 }}},
+ { {0x02bc, 0x006e}, {1, {0x0149 }}},
+ { {0x03ac, 0x03b9}, {1, {0x1fb4 }}},
+ { {0x03ae, 0x03b9}, {1, {0x1fc4 }}},
+ { {0x03b1, 0x0342}, {1, {0x1fb6 }}},
+ { {0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc }}},
+ { {0x03b7, 0x0342}, {1, {0x1fc6 }}},
+ { {0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc }}},
+ { {0x03b9, 0x0342}, {1, {0x1fd6 }}},
+ { {0x03c1, 0x0313}, {1, {0x1fe4 }}},
+ { {0x03c5, 0x0313}, {1, {0x1f50 }}},
+ { {0x03c5, 0x0342}, {1, {0x1fe6 }}},
+ { {0x03c9, 0x0342}, {1, {0x1ff6 }}},
+ { {0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc }}},
+ { {0x03ce, 0x03b9}, {1, {0x1ff4 }}},
+ { {0x0565, 0x0582}, {1, {0x0587 }}},
+ { {0x0574, 0x0565}, {1, {0xfb14 }}},
+ { {0x0574, 0x056b}, {1, {0xfb15 }}},
+ { {0x0574, 0x056d}, {1, {0xfb17 }}},
+ { {0x0574, 0x0576}, {1, {0xfb13 }}},
+ { {0x057e, 0x0576}, {1, {0xfb16 }}},
+ { {0x1f00, 0x03b9}, {2, {0x1f88, 0x1f80 }}},
+ { {0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89 }}},
+ { {0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a }}},
+ { {0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b }}},
+ { {0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c }}},
+ { {0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d }}},
+ { {0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e }}},
+ { {0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f }}},
+ { {0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98 }}},
+ { {0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99 }}},
+ { {0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a }}},
+ { {0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b }}},
+ { {0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c }}},
+ { {0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d }}},
+ { {0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e }}},
+ { {0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f }}},
+ { {0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8 }}},
+ { {0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9 }}},
+ { {0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa }}},
+ { {0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab }}},
+ { {0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac }}},
+ { {0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad }}},
+ { {0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae }}},
+ { {0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf }}},
+ { {0x1f70, 0x03b9}, {1, {0x1fb2 }}},
+ { {0x1f74, 0x03b9}, {1, {0x1fc2 }}},
+ { {0x1f7c, 0x03b9}, {1, {0x1ff2 }}}
+};
+
+static const CaseUnfold_12_Type CaseUnfold_12_Locale[] = {
+ { {0x0069, 0x0307}, {1, {0x0130 }}}
+};
+
+static const CaseUnfold_13_Type CaseUnfold_13[] = {
+ { {0x0066, 0x0066, 0x0069}, {1, {0xfb03 }}},
+ { {0x0066, 0x0066, 0x006c}, {1, {0xfb04 }}},
+ { {0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7 }}},
+ { {0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7 }}},
+ { {0x03b9, 0x0308, 0x0300}, {1, {0x1fd2 }}},
+ { {0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3 }}},
+ { {0x03b9, 0x0308, 0x0342}, {1, {0x1fd7 }}},
+ { {0x03c5, 0x0308, 0x0300}, {1, {0x1fe2 }}},
+ { {0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3 }}},
+ { {0x03c5, 0x0308, 0x0342}, {1, {0x1fe7 }}},
+ { {0x03c5, 0x0313, 0x0300}, {1, {0x1f52 }}},
+ { {0x03c5, 0x0313, 0x0301}, {1, {0x1f54 }}},
+ { {0x03c5, 0x0313, 0x0342}, {1, {0x1f56 }}},
+ { {0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7 }}}
+};
+
+#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#define CODE_RANGES_NUM numberof(CodeRanges)
+
+extern int
+onigenc_unicode_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (
+#ifdef USE_UNICODE_PROPERTIES
+      ctype <= ONIGENC_MAX_STD_CTYPE &&
+#endif
+      code < 256) {
+    return ONIGENC_IS_UNICODE_ISO_8859_1_CTYPE(code, ctype);
+  }
+
+  if (ctype >= CODE_RANGES_NUM) {
+    return ONIGERR_TYPE_BUG;
+  }
+
+  return onig_is_in_code_range((UChar* )CodeRanges[ctype], code);
+}
+
+
+extern int
+onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[])
+{
+  if (ctype >= CODE_RANGES_NUM) {
+    return ONIGERR_TYPE_BUG;
+  }
+
+  *ranges = CodeRanges[ctype];
+
+  return 0;
+}
+
+extern int
+onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
+                                      const OnigCodePoint* ranges[],
+				      struct OnigEncodingTypeST* enc ARG_UNUSED)
+{
+  *sb_out = 0x00;
+  return onigenc_unicode_ctype_code_range(ctype, ranges);
+}
+
+#include "ruby/st.h"
+
+#define PROPERTY_NAME_MAX_SIZE    MAX_WORD_LENGTH
+
+extern int
+onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end)
+{
+  int len;
+  int ctype;
+  UChar buf[PROPERTY_NAME_MAX_SIZE];
+  UChar *p;
+  OnigCodePoint code;
+
+  p = name;
+  len = 0;
+  for (p = name; p < end; p += enclen(enc, p, end)) {
+    code = ONIGENC_MBC_TO_CODE(enc, p, end);
+    if (code == ' ' || code == '-' || code == '_')
+      continue;
+    if (code >= 0x80)
+      return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
+
+    buf[len++] = (UChar )TOLOWER((unsigned char)code);
+    if (len >= PROPERTY_NAME_MAX_SIZE)
+      return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
+  }
+
+  buf[len] = 0;
+
+  if ((ctype = uniname2ctype(buf, len)) < 0) {
+    return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
+  }
+
+  return ctype;
+}
+
+
+static int
+code2_cmp(OnigCodePoint* x, OnigCodePoint* y)
+{
+  if (x[0] == y[0] && x[1] == y[1]) return 0;
+  return 1;
+}
+
+static st_index_t
+code2_hash(OnigCodePoint* x)
+{
+  return (st_index_t )(x[0] + x[1]);
+}
+
+static const struct st_hash_type type_code2_hash = {
+  code2_cmp,
+  code2_hash,
+};
+
+static int
+code3_cmp(OnigCodePoint* x, OnigCodePoint* y)
+{
+  if (x[0] == y[0] && x[1] == y[1] && x[2] == y[2]) return 0;
+  return 1;
+}
+
+static st_index_t
+code3_hash(OnigCodePoint* x)
+{
+  return (st_index_t )(x[0] + x[1] + x[2]);
+}
+
+static const struct st_hash_type type_code3_hash = {
+  code3_cmp,
+  code3_hash,
+};
+
+
+static st_table* FoldTable;    /* fold-1, fold-2, fold-3 */
+static st_table* Unfold1Table;
+static st_table* Unfold2Table;
+static st_table* Unfold3Table;
+static int CaseFoldInited = 0;
+
+static int init_case_fold_table(void)
+{
+  const CaseFold_11_Type   *p;
+  const CaseUnfold_11_Type *p1;
+  const CaseUnfold_12_Type *p2;
+  const CaseUnfold_13_Type *p3;
+  int i;
+
+  THREAD_ATOMIC_START;
+
+  FoldTable = st_init_numtable_with_size(1200);
+  if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;
+  for (i = 0; i < numberof(CaseFold); i++) {
+    p = &CaseFold[i];
+    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
+  }
+  for (i = 0; i < numberof(CaseFold_Locale); i++) {
+    p = &CaseFold_Locale[i];
+    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
+  }
+
+  Unfold1Table = st_init_numtable_with_size(1000);
+  if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY;
+
+  for (i = 0; i < numberof(CaseUnfold_11); i++) {
+    p1 = &CaseUnfold_11[i];
+    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
+  }
+  for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
+    p1 = &CaseUnfold_11_Locale[i];
+    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
+  }
+
+  Unfold2Table = st_init_table_with_size(&type_code2_hash, 200);
+  if (ONIG_IS_NULL(Unfold2Table)) return ONIGERR_MEMORY;
+
+  for (i = 0; i < numberof(CaseUnfold_12); i++) {
+    p2 = &CaseUnfold_12[i];
+    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
+  }
+  for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
+    p2 = &CaseUnfold_12_Locale[i];
+    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
+  }
+
+  Unfold3Table = st_init_table_with_size(&type_code3_hash, 30);
+  if (ONIG_IS_NULL(Unfold3Table)) return ONIGERR_MEMORY;
+
+  for (i = 0; i < numberof(CaseUnfold_13); i++) {
+    p3 = &CaseUnfold_13[i];
+    st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));
+  }
+
+  CaseFoldInited = 1;
+  THREAD_ATOMIC_END;
+  return 0;
+}
+
+extern int
+onigenc_unicode_mbc_case_fold(OnigEncoding enc,
+    OnigCaseFoldType flag ARG_UNUSED, const UChar** pp, const UChar* end,
+    UChar* fold)
+{
+  CodePointList3 *to;
+  OnigCodePoint code;
+  int i, len, rlen;
+  const UChar *p = *pp;
+
+  if (CaseFoldInited == 0) init_case_fold_table();
+
+  code = ONIGENC_MBC_TO_CODE(enc, p, end);
+  len = enclen(enc, p, end);
+  *pp += len;
+
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+  if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+    if (code == 0x0049) {
+      return ONIGENC_CODE_TO_MBC(enc, 0x0131, fold);
+    }
+    else if (code == 0x0130) {
+      return ONIGENC_CODE_TO_MBC(enc, 0x0069, fold);
+    }
+  }
+#endif
+
+  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
+    if (to->n == 1) {
+      return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold);      
+    }
+#if 0
+    /* NO NEEDS TO CHECK */
+    else if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0)
+#else
+    else
+#endif
+    {
+      rlen = 0;
+      for (i = 0; i < to->n; i++) {
+	len = ONIGENC_CODE_TO_MBC(enc, to->code[i], fold);
+	fold += len;
+	rlen += len;
+      }
+      return rlen;
+    }
+  }
+
+  for (i = 0; i < len; i++) {
+    *fold++ = *p++;
+  }
+  return len;
+}
+
+extern int
+onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
+				    OnigApplyAllCaseFoldFunc f, void* arg,
+				    OnigEncoding enc ARG_UNUSED)
+{
+  const CaseUnfold_11_Type* p11;
+  OnigCodePoint code;
+  int i, j, k, r;
+
+  /* if (CaseFoldInited == 0) init_case_fold_table(); */
+
+  for (i = 0; i < numberof(CaseUnfold_11); i++) {
+    p11 = &CaseUnfold_11[i];
+    for (j = 0; j < p11->to.n; j++) {
+      code = p11->from;
+      r = (*f)(p11->to.code[j], &code, 1, arg);
+      if (r != 0) return r;
+
+      code = p11->to.code[j];
+      r = (*f)(p11->from, &code, 1, arg);
+      if (r != 0) return r;
+
+      for (k = 0; k < j; k++) {
+	r = (*f)(p11->to.code[j], (OnigCodePoint* )(&p11->to.code[k]), 1, arg);
+	if (r != 0) return r;
+
+	r = (*f)(p11->to.code[k], (OnigCodePoint* )(&p11->to.code[j]), 1, arg);
+	if (r != 0) return r;
+      }
+    }
+  }
+
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+  if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+    code = 0x0131;
+    r = (*f)(0x0049, &code, 1, arg);
+    if (r != 0) return r;
+    code = 0x0049;
+    r = (*f)(0x0131, &code, 1, arg);
+    if (r != 0) return r;
+
+    code = 0x0130;
+    r = (*f)(0x0069, &code, 1, arg);
+    if (r != 0) return r;
+    code = 0x0069;
+    r = (*f)(0x0130, &code, 1, arg);
+    if (r != 0) return r;
+  }
+  else {
+#endif
+    for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
+      p11 = &CaseUnfold_11_Locale[i];
+      for (j = 0; j < p11->to.n; j++) {
+	code = p11->from;
+	r = (*f)(p11->to.code[j], &code, 1, arg);
+	if (r != 0) return r;
+
+	code = p11->to.code[j];
+	r = (*f)(p11->from, &code, 1, arg);
+	if (r != 0) return r;
+
+	for (k = 0; k < j; k++) {
+	  r = (*f)(p11->to.code[j], (OnigCodePoint* )(&p11->to.code[k]),
+		   1, arg);
+	  if (r != 0) return r;
+
+	  r = (*f)(p11->to.code[k], (OnigCodePoint* )(&p11->to.code[j]),
+		   1, arg);
+	  if (r != 0) return r;
+	}
+      }
+    }
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+  }
+#endif
+
+  if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    for (i = 0; i < numberof(CaseUnfold_12); i++) {
+      for (j = 0; j < CaseUnfold_12[i].to.n; j++) {
+	r = (*f)(CaseUnfold_12[i].to.code[j],
+		 (OnigCodePoint* )CaseUnfold_12[i].from, 2, arg);
+	if (r != 0) return r;	
+
+	for (k = 0; k < CaseUnfold_12[i].to.n; k++) {
+	  if (k == j) continue;
+
+	  r = (*f)(CaseUnfold_12[i].to.code[j],
+		   (OnigCodePoint* )(&CaseUnfold_12[i].to.code[k]), 1, arg);
+	  if (r != 0) return r;
+	}
+      }
+    }
+
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) == 0) {
+#endif
+      for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
+	for (j = 0; j < CaseUnfold_12_Locale[i].to.n; j++) {
+	  r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
+		   (OnigCodePoint* )CaseUnfold_12_Locale[i].from, 2, arg);
+	  if (r != 0) return r;	
+
+	  for (k = 0; k < CaseUnfold_12_Locale[i].to.n; k++) {
+	    if (k == j) continue;
+
+	    r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
+		     (OnigCodePoint* )(&CaseUnfold_12_Locale[i].to.code[k]),
+		     1, arg);
+	    if (r != 0) return r;
+	  }
+	}
+      }
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    }
+#endif
+
+    for (i = 0; i < numberof(CaseUnfold_13); i++) {
+      for (j = 0; j < CaseUnfold_13[i].to.n; j++) {
+	r = (*f)(CaseUnfold_13[i].to.code[j],
+		 (OnigCodePoint* )CaseUnfold_13[i].from, 3, arg);
+	if (r != 0) return r;	
+
+	for (k = 0; k < CaseUnfold_13[i].to.n; k++) {
+	  if (k == j) continue;
+
+	  r = (*f)(CaseUnfold_13[i].to.code[j],
+		   (OnigCodePoint* )(&CaseUnfold_13[i].to.code[k]), 1, arg);
+	  if (r != 0) return r;
+	}
+      }
+    }
+  }
+
+  return 0;
+}
+
+extern int
+onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
+    OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end,
+    OnigCaseFoldCodeItem items[])
+{
+  int n, i, j, k, len;
+  OnigCodePoint code, codes[3];
+  CodePointList3 *to, *z3;
+  CodePointList2 *z2;
+
+  if (CaseFoldInited == 0) init_case_fold_table();
+
+  n = 0;
+
+  code = ONIGENC_MBC_TO_CODE(enc, p, end);
+  len = enclen(enc, p, end);
+
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+  if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+    if (code == 0x0049) {
+      items[0].byte_len = len;
+      items[0].code_len = 1;
+      items[0].code[0]  = 0x0131;
+      return 1;
+    }
+    else if (code == 0x0130) {
+      items[0].byte_len = len;
+      items[0].code_len = 1;
+      items[0].code[0]  = 0x0069;
+      return 1;
+    }
+    else if (code == 0x0131) {
+      items[0].byte_len = len;
+      items[0].code_len = 1;
+      items[0].code[0]  = 0x0049;
+      return 1;
+    }
+    else if (code == 0x0069) {
+      items[0].byte_len = len;
+      items[0].code_len = 1;
+      items[0].code[0]  = 0x0130;
+      return 1;
+    }
+  }
+#endif
+
+  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
+    if (to->n == 1) {
+      OnigCodePoint orig_code = code;
+
+      items[0].byte_len = len;
+      items[0].code_len = 1;
+      items[0].code[0]  = to->code[0];
+      n++;
+
+      code = to->code[0];
+      if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
+	for (i = 0; i < to->n; i++) {
+	  if (to->code[i] != orig_code) {
+	    items[n].byte_len = len;
+	    items[n].code_len = 1;
+	    items[n].code[0]  = to->code[i];
+	    n++;
+	  }
+	}
+      }
+    }
+    else if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+      OnigCodePoint cs[3][4];
+      int fn, ncs[3];
+
+      for (fn = 0; fn < to->n; fn++) {
+	cs[fn][0] = to->code[fn];
+	if (onig_st_lookup(Unfold1Table, (st_data_t )cs[fn][0],
+			   (void* )&z3) != 0) {
+	  for (i = 0; i < z3->n; i++) {
+	    cs[fn][i+1] = z3->code[i];
+	  }
+	  ncs[fn] = z3->n + 1;
+	}
+	else
+	  ncs[fn] = 1;
+      }
+
+      if (fn == 2) {
+	for (i = 0; i < ncs[0]; i++) {
+	  for (j = 0; j < ncs[1]; j++) {
+	    items[n].byte_len = len;
+	    items[n].code_len = 2;
+	    items[n].code[0]  = cs[0][i];
+	    items[n].code[1]  = cs[1][j];
+	    n++;
+	  }
+	}
+
+	if (onig_st_lookup(Unfold2Table, (st_data_t )to->code,
+			   (void* )&z2) != 0) {
+	  for (i = 0; i < z2->n; i++) {
+	    if (z2->code[i] == code) continue;
+
+	    items[n].byte_len = len;
+	    items[n].code_len = 1;
+	    items[n].code[0]  = z2->code[i];
+	    n++;
+	  }
+	}
+      }
+      else {
+	for (i = 0; i < ncs[0]; i++) {
+	  for (j = 0; j < ncs[1]; j++) {
+	    for (k = 0; k < ncs[2]; k++) {
+	      items[n].byte_len = len;
+	      items[n].code_len = 3;
+	      items[n].code[0]  = cs[0][i];
+	      items[n].code[1]  = cs[1][j];
+	      items[n].code[2]  = cs[2][k];
+	      n++;
+	    }
+	  }
+	}
+
+	if (onig_st_lookup(Unfold3Table, (st_data_t )to->code,
+			   (void* )&z2) != 0) {
+	  for (i = 0; i < z2->n; i++) {
+	    if (z2->code[i] == code) continue;
+
+	    items[n].byte_len = len;
+	    items[n].code_len = 1;
+	    items[n].code[0]  = z2->code[i];
+	    n++;
+	  }
+	}
+      }
+
+      /* multi char folded code is not head of another folded multi char */
+      flag = 0; /* DISABLE_CASE_FOLD_MULTI_CHAR(flag); */
+    }
+  }
+  else {
+    if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
+      for (i = 0; i < to->n; i++) {
+	items[n].byte_len = len;
+	items[n].code_len = 1;
+	items[n].code[0]  = to->code[i];
+	n++;
+      }
+    }
+  }
+
+
+  if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    p += len;
+    if (p < end) {
+      int clen;
+
+      codes[0] = code;
+      code = ONIGENC_MBC_TO_CODE(enc, p, end);
+      if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
+	  && to->n == 1) {
+	codes[1] = to->code[0];
+      }
+      else
+	codes[1] = code;
+
+      clen = enclen(enc, p, end);
+      len += clen;
+      if (onig_st_lookup(Unfold2Table, (st_data_t )codes, (void* )&z2) != 0) {
+	for (i = 0; i < z2->n; i++) {
+	  items[n].byte_len = len;
+	  items[n].code_len = 1;
+	  items[n].code[0]  = z2->code[i];
+	  n++;
+	}
+      }
+
+      p += clen;
+      if (p < end) {
+	code = ONIGENC_MBC_TO_CODE(enc, p, end);
+	if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
+	    && to->n == 1) {
+	  codes[2] = to->code[0];
+	}
+	else
+	  codes[2] = code;
+
+	clen = enclen(enc, p, end);
+	len += clen;
+	if (onig_st_lookup(Unfold3Table, (st_data_t )codes,
+			   (void* )&z2) != 0) {
+	  for (i = 0; i < z2->n; i++) {
+	    items[n].byte_len = len;
+	    items[n].code_len = 1;
+	    items[n].code[0]  = z2->code[i];
+	    n++;
+	  }
+	}
+      }
+    }
+  }
+
+  return n;
+}
diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h
new file mode 100644
index 0000000000..2248b8f7cb
--- /dev/null
+++ b/enc/unicode/name2ctype.h
@@ -0,0 +1,17985 @@
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p  */
+#ifndef USE_UNICODE_PROPERTIES
+/* Computed positions: -k'1,3' */
+#else /* USE_UNICODE_PROPERTIES */
+/* Computed positions: -k'1-3,6,12,16,$' */
+#endif /* USE_UNICODE_PROPERTIES */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+
+
+#ifdef USE_UNICODE_PROPERTIES
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	485,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	20,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xd800, 0xf8ff,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xf0000, 0xffffd,
+	0x100000, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+static const OnigCodePoint CR_Cc[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cc */
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	485,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0526, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0604, 0x0605,
+	0x061c, 0x061d,
+	0x0620, 0x0620,
+	0x065f, 0x065f,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x08ff,
+	0x093a, 0x093b,
+	0x094f, 0x094f,
+	0x0956, 0x0957,
+	0x0973, 0x0978,
+	0x0980, 0x0980,
+	0x0984, 0x0984,
+	0x098d, 0x098e,
+	0x0991, 0x0992,
+	0x09a9, 0x09a9,
+	0x09b1, 0x09b1,
+	0x09b3, 0x09b5,
+	0x09ba, 0x09bb,
+	0x09c5, 0x09c6,
+	0x09c9, 0x09ca,
+	0x09cf, 0x09d6,
+	0x09d8, 0x09db,
+	0x09de, 0x09de,
+	0x09e4, 0x09e5,
+	0x09fc, 0x0a00,
+	0x0a04, 0x0a04,
+	0x0a0b, 0x0a0e,
+	0x0a11, 0x0a12,
+	0x0a29, 0x0a29,
+	0x0a31, 0x0a31,
+	0x0a34, 0x0a34,
+	0x0a37, 0x0a37,
+	0x0a3a, 0x0a3b,
+	0x0a3d, 0x0a3d,
+	0x0a43, 0x0a46,
+	0x0a49, 0x0a4a,
+	0x0a4e, 0x0a50,
+	0x0a52, 0x0a58,
+	0x0a5d, 0x0a5d,
+	0x0a5f, 0x0a65,
+	0x0a76, 0x0a80,
+	0x0a84, 0x0a84,
+	0x0a8e, 0x0a8e,
+	0x0a92, 0x0a92,
+	0x0aa9, 0x0aa9,
+	0x0ab1, 0x0ab1,
+	0x0ab4, 0x0ab4,
+	0x0aba, 0x0abb,
+	0x0ac6, 0x0ac6,
+	0x0aca, 0x0aca,
+	0x0ace, 0x0acf,
+	0x0ad1, 0x0adf,
+	0x0ae4, 0x0ae5,
+	0x0af0, 0x0af0,
+	0x0af2, 0x0b00,
+	0x0b04, 0x0b04,
+	0x0b0d, 0x0b0e,
+	0x0b11, 0x0b12,
+	0x0b29, 0x0b29,
+	0x0b31, 0x0b31,
+	0x0b34, 0x0b34,
+	0x0b3a, 0x0b3b,
+	0x0b45, 0x0b46,
+	0x0b49, 0x0b4a,
+	0x0b4e, 0x0b55,
+	0x0b58, 0x0b5b,
+	0x0b5e, 0x0b5e,
+	0x0b64, 0x0b65,
+	0x0b72, 0x0b81,
+	0x0b84, 0x0b84,
+	0x0b8b, 0x0b8d,
+	0x0b91, 0x0b91,
+	0x0b96, 0x0b98,
+	0x0b9b, 0x0b9b,
+	0x0b9d, 0x0b9d,
+	0x0ba0, 0x0ba2,
+	0x0ba5, 0x0ba7,
+	0x0bab, 0x0bad,
+	0x0bba, 0x0bbd,
+	0x0bc3, 0x0bc5,
+	0x0bc9, 0x0bc9,
+	0x0bce, 0x0bcf,
+	0x0bd1, 0x0bd6,
+	0x0bd8, 0x0be5,
+	0x0bfb, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c34, 0x0c34,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5a, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c77,
+	0x0c80, 0x0c81,
+	0x0c84, 0x0c84,
+	0x0c8d, 0x0c8d,
+	0x0c91, 0x0c91,
+	0x0ca9, 0x0ca9,
+	0x0cb4, 0x0cb4,
+	0x0cba, 0x0cbb,
+	0x0cc5, 0x0cc5,
+	0x0cc9, 0x0cc9,
+	0x0cce, 0x0cd4,
+	0x0cd7, 0x0cdd,
+	0x0cdf, 0x0cdf,
+	0x0ce4, 0x0ce5,
+	0x0cf0, 0x0cf0,
+	0x0cf3, 0x0d01,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d29, 0x0d29,
+	0x0d3a, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4e, 0x0d56,
+	0x0d58, 0x0d5f,
+	0x0d64, 0x0d65,
+	0x0d76, 0x0d78,
+	0x0d80, 0x0d81,
+	0x0d84, 0x0d84,
+	0x0d97, 0x0d99,
+	0x0db2, 0x0db2,
+	0x0dbc, 0x0dbc,
+	0x0dbe, 0x0dbf,
+	0x0dc7, 0x0dc9,
+	0x0dcb, 0x0dce,
+	0x0dd5, 0x0dd5,
+	0x0dd7, 0x0dd7,
+	0x0de0, 0x0df1,
+	0x0df5, 0x0e00,
+	0x0e3b, 0x0e3e,
+	0x0e5c, 0x0e80,
+	0x0e83, 0x0e83,
+	0x0e85, 0x0e86,
+	0x0e89, 0x0e89,
+	0x0e8b, 0x0e8c,
+	0x0e8e, 0x0e93,
+	0x0e98, 0x0e98,
+	0x0ea0, 0x0ea0,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	0x0ea8, 0x0ea9,
+	0x0eac, 0x0eac,
+	0x0eba, 0x0eba,
+	0x0ebe, 0x0ebf,
+	0x0ec5, 0x0ec5,
+	0x0ec7, 0x0ec7,
+	0x0ece, 0x0ecf,
+	0x0eda, 0x0edb,
+	0x0ede, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f8c, 0x0f8f,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fd9, 0x0fff,
+	0x10c6, 0x10cf,
+	0x10fd, 0x10ff,
+	0x1249, 0x1249,
+	0x124e, 0x124f,
+	0x1257, 0x1257,
+	0x1259, 0x1259,
+	0x125e, 0x125f,
+	0x1289, 0x1289,
+	0x128e, 0x128f,
+	0x12b1, 0x12b1,
+	0x12b6, 0x12b7,
+	0x12bf, 0x12bf,
+	0x12c1, 0x12c1,
+	0x12c6, 0x12c7,
+	0x12d7, 0x12d7,
+	0x1311, 0x1311,
+	0x1316, 0x1317,
+	0x135b, 0x135e,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f5, 0x13ff,
+	0x169d, 0x169f,
+	0x16f1, 0x16ff,
+	0x170d, 0x170d,
+	0x1715, 0x171f,
+	0x1737, 0x173f,
+	0x1754, 0x175f,
+	0x176d, 0x176d,
+	0x1771, 0x1771,
+	0x1774, 0x177f,
+	0x17de, 0x17df,
+	0x17ea, 0x17ef,
+	0x17fa, 0x17ff,
+	0x180f, 0x180f,
+	0x181a, 0x181f,
+	0x1878, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191d, 0x191f,
+	0x192c, 0x192f,
+	0x193c, 0x193f,
+	0x1941, 0x1943,
+	0x196e, 0x196f,
+	0x1975, 0x197f,
+	0x19ac, 0x19af,
+	0x19ca, 0x19cf,
+	0x19db, 0x19dd,
+	0x1a1c, 0x1a1d,
+	0x1a5f, 0x1a5f,
+	0x1a7d, 0x1a7e,
+	0x1a8a, 0x1a8f,
+	0x1a9a, 0x1a9f,
+	0x1aae, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bab, 0x1bad,
+	0x1bba, 0x1bff,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1ccf,
+	0x1cf3, 0x1cff,
+	0x1de7, 0x1dfc,
+	0x1f16, 0x1f17,
+	0x1f1e, 0x1f1f,
+	0x1f46, 0x1f47,
+	0x1f4e, 0x1f4f,
+	0x1f58, 0x1f58,
+	0x1f5a, 0x1f5a,
+	0x1f5c, 0x1f5c,
+	0x1f5e, 0x1f5e,
+	0x1f7e, 0x1f7f,
+	0x1fb5, 0x1fb5,
+	0x1fc5, 0x1fc5,
+	0x1fd4, 0x1fd5,
+	0x1fdc, 0x1fdc,
+	0x1ff0, 0x1ff1,
+	0x1ff5, 0x1ff5,
+	0x1fff, 0x1fff,
+	0x2065, 0x2069,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x2095, 0x209f,
+	0x20b9, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23e9, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x26ce, 0x26ce,
+	0x26e2, 0x26e2,
+	0x26e4, 0x26e7,
+	0x2700, 0x2700,
+	0x2705, 0x2705,
+	0x270a, 0x270b,
+	0x2728, 0x2728,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x275f, 0x2760,
+	0x2795, 0x2797,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x27cb, 0x27cb,
+	0x27cd, 0x27cf,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf2, 0x2cf8,
+	0x2d26, 0x2d2f,
+	0x2d66, 0x2d6e,
+	0x2d70, 0x2d7f,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e32, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31b8, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcc, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa660, 0xa661,
+	0xa674, 0xa67b,
+	0xa698, 0xa69f,
+	0xa6f8, 0xa6ff,
+	0xa78d, 0xa7fa,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c5, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa8fc, 0xa8ff,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9e0, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaa7c, 0xaa7f,
+	0xaac3, 0xaada,
+	0xaae0, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa2e, 0xfa2f,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbb2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe27, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xfefe,
+	0xff00, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfff8,
+	0xfffe, 0xffff,
+	0x1000c, 0x1000c,
+	0x10027, 0x10027,
+	0x1003b, 0x1003b,
+	0x1003e, 0x1003e,
+	0x1004e, 0x1004f,
+	0x1005e, 0x1007f,
+	0x100fb, 0x100ff,
+	0x10103, 0x10106,
+	0x10134, 0x10136,
+	0x1018b, 0x1018f,
+	0x1019c, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102ff,
+	0x1031f, 0x1031f,
+	0x10324, 0x1032f,
+	0x1034b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x10860, 0x108ff,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x109ff,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a34, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a48, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10a80, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b80, 0x10bff,
+	0x10c49, 0x10e5f,
+	0x10e7f, 0x1107f,
+	0x110c2, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1de, 0x1d1ff,
+	0x1d246, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d372, 0x1d3ff,
+	0x1d455, 0x1d455,
+	0x1d49d, 0x1d49d,
+	0x1d4a0, 0x1d4a1,
+	0x1d4a3, 0x1d4a4,
+	0x1d4a7, 0x1d4a8,
+	0x1d4ad, 0x1d4ad,
+	0x1d4ba, 0x1d4ba,
+	0x1d4bc, 0x1d4bc,
+	0x1d4c4, 0x1d4c4,
+	0x1d506, 0x1d506,
+	0x1d50b, 0x1d50c,
+	0x1d515, 0x1d515,
+	0x1d51d, 0x1d51d,
+	0x1d53a, 0x1d53a,
+	0x1d53f, 0x1d53f,
+	0x1d545, 0x1d545,
+	0x1d547, 0x1d549,
+	0x1d551, 0x1d551,
+	0x1d6a6, 0x1d6a7,
+	0x1d7cc, 0x1d7cd,
+	0x1d800, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f130,
+	0x1f132, 0x1f13c,
+	0x1f13e, 0x1f13e,
+	0x1f140, 0x1f141,
+	0x1f143, 0x1f145,
+	0x1f147, 0x1f149,
+	0x1f14f, 0x1f156,
+	0x1f158, 0x1f15e,
+	0x1f160, 0x1f178,
+	0x1f17a, 0x1f17a,
+	0x1f17d, 0x1f17e,
+	0x1f180, 0x1f189,
+	0x1f18e, 0x1f18f,
+	0x1f191, 0x1f1ff,
+	0x1f201, 0x1f20f,
+	0x1f232, 0x1f23f,
+	0x1f249, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Cn */
+
+/* 'Co': General Category */
+static const OnigCodePoint CR_Co[] = {
+	3,
+	0xe000, 0xf8ff,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Co */
+
+/* 'Cs': General Category */
+static const OnigCodePoint CR_Cs[] = {
+	1,
+	0xd800, 0xdfff,
+}; /* CR_Cs */
+
+/* 'L': Major Category */
+static const OnigCodePoint CR_L[] = {
+	422,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3006,
+	0x3031, 0x3035,
+	0x303b, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	599,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02af,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d62, 0x1d77,
+	0x1d79, 0x1d9a,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2184, 0x2184,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7c,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa771, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Ll */
+
+/* 'Lm': General Category */
+static const OnigCodePoint CR_Lm[] = {
+	49,
+	0x02b0, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0374, 0x0374,
+	0x037a, 0x037a,
+	0x0559, 0x0559,
+	0x0640, 0x0640,
+	0x06e5, 0x06e6,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0971, 0x0971,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x10fc, 0x10fc,
+	0x17d7, 0x17d7,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c78, 0x1c7d,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2c7d, 0x2c7d,
+	0x2d6f, 0x2d6f,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa67f, 0xa67f,
+	0xa717, 0xa71f,
+	0xa770, 0xa770,
+	0xa788, 0xa788,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	311,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x0800, 0x0815,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e45,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17dc, 0x17dc,
+	0x1820, 0x1842,
+	0x1844, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x2135, 0x2138,
+	0x2d30, 0x2d65,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3006, 0x3006,
+	0x303c, 0x303c,
+	0x3041, 0x3096,
+	0x309f, 0x309f,
+	0x30a1, 0x30fa,
+	0x30ff, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa014,
+	0xa016, 0xa48c,
+	0xa4d0, 0xa4f7,
+	0xa500, 0xa60b,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa66e, 0xa66e,
+	0xa6a0, 0xa6e5,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa6f,
+	0xaa71, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadc,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10450, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Lo */
+
+/* 'Lt': General Category */
+static const OnigCodePoint CR_Lt[] = {
+	10,
+	0x01c5, 0x01c5,
+	0x01c8, 0x01c8,
+	0x01cb, 0x01cb,
+	0x01f2, 0x01f2,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fbc, 0x1fbc,
+	0x1fcc, 0x1fcc,
+	0x1ffc, 0x1ffc,
+}; /* CR_Lt */
+
+/* 'Lu': General Category */
+static const OnigCodePoint CR_Lu[] = {
+	594,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2183, 0x2183,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Lu */
+
+/* 'M': Major Category */
+static const OnigCodePoint CR_M[] = {
+	188,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0903,
+	0x093c, 0x093c,
+	0x093e, 0x094e,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abc, 0x0abc,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbc, 0x0cbc,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b04,
+	0x1b34, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1baa,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf2,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa953,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9c0,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11082,
+	0x110b0, 0x110ba,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	106,
+	0x0903, 0x0903,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0982, 0x0983,
+	0x09be, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x0a03, 0x0a03,
+	0x0a3e, 0x0a40,
+	0x0a83, 0x0a83,
+	0x0abe, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0b02, 0x0b03,
+	0x0b3e, 0x0b3e,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c41, 0x0c44,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cbe,
+	0x0cc0, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cd5, 0x0cd6,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd1,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0f3e, 0x0f3f,
+	0x0f7f, 0x0f7f,
+	0x102b, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x1056, 0x1057,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108f, 0x108f,
+	0x109a, 0x109c,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a19, 0x1a1b,
+	0x1a55, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1b04, 0x1b04,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b44,
+	0x1b82, 0x1b82,
+	0x1ba1, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf2,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9c0,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa4d, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	5,
+	0x0488, 0x0489,
+	0x06de, 0x06de,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	194,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	81,
+	0x0030, 0x0039,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x09f4, 0x09f9,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bf2,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7e,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d75,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f33,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x1369, 0x137c,
+	0x16ee, 0x16f0,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x2182,
+	0x2185, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa620, 0xa629,
+	0xa6e6, 0xa6ef,
+	0xa830, 0xa835,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x10107, 0x10133,
+	0x10140, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x104a0, 0x104a9,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x12400, 0x12462,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1f100, 0x1f10a,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+static const OnigCodePoint CR_Nd[] = {
+	37,
+	0x0030, 0x0039,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bef,
+	0x0c66, 0x0c6f,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d6f,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f29,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0xa620, 0xa629,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x104a0, 0x104a9,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
+
+/* 'Nl': General Category */
+static const OnigCodePoint CR_Nl[] = {
+	12,
+	0x16ee, 0x16f0,
+	0x2160, 0x2182,
+	0x2185, 0x2188,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0xa6e6, 0xa6ef,
+	0x10140, 0x10174,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x12400, 0x12462,
+}; /* CR_Nl */
+
+/* 'No': General Category */
+static const OnigCodePoint CR_No[] = {
+	38,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa830, 0xa835,
+	0x10107, 0x10133,
+	0x10175, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x1d360, 0x1d371,
+	0x1f100, 0x1f10a,
+}; /* CR_No */
+
+/* 'P': Major Category */
+static const OnigCodePoint CR_P[] = {
+	129,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00ab, 0x00ab,
+	0x00b7, 0x00b7,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2010, 0x2027,
+	0x2030, 0x2043,
+	0x2045, 0x2051,
+	0x2053, 0x205e,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x2329, 0x232a,
+	0x2768, 0x2775,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x3008, 0x3011,
+	0x3014, 0x301f,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfd3e, 0xfd3f,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff0a,
+	0xff0c, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3b, 0xff3d,
+	0xff3f, 0xff3f,
+	0xff5b, 0xff5b,
+	0xff5d, 0xff5d,
+	0xff5f, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_P */
+
+/* 'Pc': General Category */
+static const OnigCodePoint CR_Pc[] = {
+	6,
+	0x005f, 0x005f,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xff3f, 0xff3f,
+}; /* CR_Pc */
+
+/* 'Pd': General Category */
+static const OnigCodePoint CR_Pd[] = {
+	15,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Pd */
+
+/* 'Pe': General Category */
+static const OnigCodePoint CR_Pe[] = {
+	70,
+	0x0029, 0x0029,
+	0x005d, 0x005d,
+	0x007d, 0x007d,
+	0x0f3b, 0x0f3b,
+	0x0f3d, 0x0f3d,
+	0x169c, 0x169c,
+	0x2046, 0x2046,
+	0x207e, 0x207e,
+	0x208e, 0x208e,
+	0x232a, 0x232a,
+	0x2769, 0x2769,
+	0x276b, 0x276b,
+	0x276d, 0x276d,
+	0x276f, 0x276f,
+	0x2771, 0x2771,
+	0x2773, 0x2773,
+	0x2775, 0x2775,
+	0x27c6, 0x27c6,
+	0x27e7, 0x27e7,
+	0x27e9, 0x27e9,
+	0x27eb, 0x27eb,
+	0x27ed, 0x27ed,
+	0x27ef, 0x27ef,
+	0x2984, 0x2984,
+	0x2986, 0x2986,
+	0x2988, 0x2988,
+	0x298a, 0x298a,
+	0x298c, 0x298c,
+	0x298e, 0x298e,
+	0x2990, 0x2990,
+	0x2992, 0x2992,
+	0x2994, 0x2994,
+	0x2996, 0x2996,
+	0x2998, 0x2998,
+	0x29d9, 0x29d9,
+	0x29db, 0x29db,
+	0x29fd, 0x29fd,
+	0x2e23, 0x2e23,
+	0x2e25, 0x2e25,
+	0x2e27, 0x2e27,
+	0x2e29, 0x2e29,
+	0x3009, 0x3009,
+	0x300b, 0x300b,
+	0x300d, 0x300d,
+	0x300f, 0x300f,
+	0x3011, 0x3011,
+	0x3015, 0x3015,
+	0x3017, 0x3017,
+	0x3019, 0x3019,
+	0x301b, 0x301b,
+	0x301e, 0x301f,
+	0xfd3f, 0xfd3f,
+	0xfe18, 0xfe18,
+	0xfe36, 0xfe36,
+	0xfe38, 0xfe38,
+	0xfe3a, 0xfe3a,
+	0xfe3c, 0xfe3c,
+	0xfe3e, 0xfe3e,
+	0xfe40, 0xfe40,
+	0xfe42, 0xfe42,
+	0xfe44, 0xfe44,
+	0xfe48, 0xfe48,
+	0xfe5a, 0xfe5a,
+	0xfe5c, 0xfe5c,
+	0xfe5e, 0xfe5e,
+	0xff09, 0xff09,
+	0xff3d, 0xff3d,
+	0xff5d, 0xff5d,
+	0xff60, 0xff60,
+	0xff63, 0xff63,
+}; /* CR_Pe */
+
+/* 'Pf': General Category */
+static const OnigCodePoint CR_Pf[] = {
+	10,
+	0x00bb, 0x00bb,
+	0x2019, 0x2019,
+	0x201d, 0x201d,
+	0x203a, 0x203a,
+	0x2e03, 0x2e03,
+	0x2e05, 0x2e05,
+	0x2e0a, 0x2e0a,
+	0x2e0d, 0x2e0d,
+	0x2e1d, 0x2e1d,
+	0x2e21, 0x2e21,
+}; /* CR_Pf */
+
+/* 'Pi': General Category */
+static const OnigCodePoint CR_Pi[] = {
+	11,
+	0x00ab, 0x00ab,
+	0x2018, 0x2018,
+	0x201b, 0x201c,
+	0x201f, 0x201f,
+	0x2039, 0x2039,
+	0x2e02, 0x2e02,
+	0x2e04, 0x2e04,
+	0x2e09, 0x2e09,
+	0x2e0c, 0x2e0c,
+	0x2e1c, 0x2e1c,
+	0x2e20, 0x2e20,
+}; /* CR_Pi */
+
+/* 'Po': General Category */
+static const OnigCodePoint CR_Po[] = {
+	124,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00b7, 0x00b7,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x0589,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x303d, 0x303d,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe10, 0xfe16,
+	0xfe19, 0xfe19,
+	0xfe30, 0xfe30,
+	0xfe45, 0xfe46,
+	0xfe49, 0xfe4c,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xfe5f, 0xfe61,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff07,
+	0xff0a, 0xff0a,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3c, 0xff3c,
+	0xff61, 0xff61,
+	0xff64, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Po */
+
+/* 'Ps': General Category */
+static const OnigCodePoint CR_Ps[] = {
+	72,
+	0x0028, 0x0028,
+	0x005b, 0x005b,
+	0x007b, 0x007b,
+	0x0f3a, 0x0f3a,
+	0x0f3c, 0x0f3c,
+	0x169b, 0x169b,
+	0x201a, 0x201a,
+	0x201e, 0x201e,
+	0x2045, 0x2045,
+	0x207d, 0x207d,
+	0x208d, 0x208d,
+	0x2329, 0x2329,
+	0x2768, 0x2768,
+	0x276a, 0x276a,
+	0x276c, 0x276c,
+	0x276e, 0x276e,
+	0x2770, 0x2770,
+	0x2772, 0x2772,
+	0x2774, 0x2774,
+	0x27c5, 0x27c5,
+	0x27e6, 0x27e6,
+	0x27e8, 0x27e8,
+	0x27ea, 0x27ea,
+	0x27ec, 0x27ec,
+	0x27ee, 0x27ee,
+	0x2983, 0x2983,
+	0x2985, 0x2985,
+	0x2987, 0x2987,
+	0x2989, 0x2989,
+	0x298b, 0x298b,
+	0x298d, 0x298d,
+	0x298f, 0x298f,
+	0x2991, 0x2991,
+	0x2993, 0x2993,
+	0x2995, 0x2995,
+	0x2997, 0x2997,
+	0x29d8, 0x29d8,
+	0x29da, 0x29da,
+	0x29fc, 0x29fc,
+	0x2e22, 0x2e22,
+	0x2e24, 0x2e24,
+	0x2e26, 0x2e26,
+	0x2e28, 0x2e28,
+	0x3008, 0x3008,
+	0x300a, 0x300a,
+	0x300c, 0x300c,
+	0x300e, 0x300e,
+	0x3010, 0x3010,
+	0x3014, 0x3014,
+	0x3016, 0x3016,
+	0x3018, 0x3018,
+	0x301a, 0x301a,
+	0x301d, 0x301d,
+	0xfd3e, 0xfd3e,
+	0xfe17, 0xfe17,
+	0xfe35, 0xfe35,
+	0xfe37, 0xfe37,
+	0xfe39, 0xfe39,
+	0xfe3b, 0xfe3b,
+	0xfe3d, 0xfe3d,
+	0xfe3f, 0xfe3f,
+	0xfe41, 0xfe41,
+	0xfe43, 0xfe43,
+	0xfe47, 0xfe47,
+	0xfe59, 0xfe59,
+	0xfe5b, 0xfe5b,
+	0xfe5d, 0xfe5d,
+	0xff08, 0xff08,
+	0xff3b, 0xff3b,
+	0xff5b, 0xff5b,
+	0xff5f, 0xff5f,
+	0xff62, 0xff62,
+}; /* CR_Ps */
+
+/* 'S': Major Category */
+static const OnigCodePoint CR_S[] = {
+	198,
+	0x0024, 0x0024,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00a2, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b6, 0x00b6,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x20a0, 0x20b8,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x2140, 0x2144,
+	0x214a, 0x214d,
+	0x214f, 0x214f,
+	0x2190, 0x2328,
+	0x232b, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x309b, 0x309c,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xa828, 0xa82b,
+	0xa836, 0xa839,
+	0xaa77, 0xaa79,
+	0xfb29, 0xfb29,
+	0xfdfc, 0xfdfd,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	16,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20b8,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	26,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x309b, 0x309c,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xffe3, 0xffe3,
+}; /* CR_Sk */
+
+/* 'Sm': General Category */
+static const OnigCodePoint CR_Sm[] = {
+	65,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03f6, 0x03f6,
+	0x0606, 0x0608,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x2140, 0x2144,
+	0x214b, 0x214b,
+	0x2190, 0x2194,
+	0x219a, 0x219b,
+	0x21a0, 0x21a0,
+	0x21a3, 0x21a3,
+	0x21a6, 0x21a6,
+	0x21ae, 0x21ae,
+	0x21ce, 0x21cf,
+	0x21d2, 0x21d2,
+	0x21d4, 0x21d4,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b3,
+	0x23dc, 0x23e1,
+	0x25b7, 0x25b7,
+	0x25c1, 0x25c1,
+	0x25f8, 0x25ff,
+	0x266f, 0x266f,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x27ff,
+	0x2900, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	154,
+	0x00a6, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x00b6, 0x00b6,
+	0x0482, 0x0482,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x214a, 0x214a,
+	0x214c, 0x214d,
+	0x214f, 0x214f,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21ad,
+	0x21af, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21f3,
+	0x2300, 0x2307,
+	0x230c, 0x231f,
+	0x2322, 0x2328,
+	0x232b, 0x237b,
+	0x237d, 0x239a,
+	0x23b4, 0x23db,
+	0x23e2, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2b00, 0x2b2f,
+	0x2b45, 0x2b46,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa828, 0xa82b,
+	0xa836, 0xa837,
+	0xa839, 0xa839,
+	0xaa77, 0xaa79,
+	0xfdfd, 0xfdfd,
+	0xffe4, 0xffe4,
+	0xffe8, 0xffe8,
+	0xffed, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_So */
+
+/* 'Z': Major Category */
+static const OnigCodePoint CR_Z[] = {
+	9,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Z */
+
+/* 'Zl': General Category */
+static const OnigCodePoint CR_Zl[] = {
+	1,
+	0x2028, 0x2028,
+}; /* CR_Zl */
+
+/* 'Zp': General Category */
+static const OnigCodePoint CR_Zp[] = {
+	1,
+	0x2029, 0x2029,
+}; /* CR_Zp */
+
+/* 'Zs': General Category */
+static const OnigCodePoint CR_Zs[] = {
+	8,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Zs */
+
+/* 'Math': Derived Property */
+static const OnigCodePoint CR_Math[] = {
+	105,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f6,
+	0x0606, 0x0608,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x2061, 0x2064,
+	0x207a, 0x207e,
+	0x208a, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x2149,
+	0x214b, 0x214b,
+	0x2190, 0x21a7,
+	0x21a9, 0x21ae,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23dc, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b7,
+	0x25bc, 0x25c1,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x25f8, 0x25ff,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266f,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe61, 0xfe66,
+	0xfe68, 0xfe68,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+static const OnigCodePoint CR_Alphabetic[] = {
+	474,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09f0, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a70, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
+
+/* 'Lowercase': Derived Property */
+static const OnigCodePoint CR_Lowercase[] = {
+	602,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037a, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1dbf,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x2090, 0x2094,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7d,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Lowercase */
+
+/* 'Uppercase': Derived Property */
+static const OnigCodePoint CR_Uppercase[] = {
+	596,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Uppercase */
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	110,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+}; /* CR_Cased */
+
+/* 'Case_Ignorable': Derived Property */
+static const OnigCodePoint CR_Case_Ignorable[] = {
+	266,
+	0x0027, 0x0027,
+	0x002e, 0x002e,
+	0x003a, 0x003a,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00ad, 0x00ad,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0387, 0x0387,
+	0x0483, 0x0489,
+	0x0559, 0x0559,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05f4, 0x05f4,
+	0x0600, 0x0603,
+	0x0610, 0x061a,
+	0x0640, 0x0640,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0971, 0x0971,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e46, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x10fc, 0x10fc,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1843, 0x1843,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x200b, 0x200f,
+	0x2018, 0x2019,
+	0x2024, 0x2024,
+	0x2027, 0x2027,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2c7d, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302f,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xa9cf, 0xa9cf,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa70, 0xaa70,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaadd, 0xaadd,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe13, 0xfe13,
+	0xfe20, 0xfe26,
+	0xfe52, 0xfe52,
+	0xfe55, 0xfe55,
+	0xfeff, 0xfeff,
+	0xff07, 0xff07,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0xfff9, 0xfffb,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x1d167, 0x1d169,
+	0x1d173, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	557,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fb8, 0x1fbc,
+	0x1fc8, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	573,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c5, 0x01c6,
+	0x01c8, 0x01c9,
+	0x01cb, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f2, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbc, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fcc, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x1ffc, 0x1ffc,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	574,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x01c4,
+	0x01c6, 0x01c7,
+	0x01c9, 0x01ca,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f1,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	568,
+	0x0041, 0x005a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00df,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x0149, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x017f, 0x017f,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0345, 0x0345,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03c2, 0x03c2,
+	0x03cf, 0x03d1,
+	0x03d5, 0x03d6,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9a, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f80, 0x1faf,
+	0x1fb2, 0x1fb4,
+	0x1fb7, 0x1fbc,
+	0x1fc2, 0x1fc4,
+	0x1fc7, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff7, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	97,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x0137,
+	0x0139, 0x018c,
+	0x018e, 0x019a,
+	0x019c, 0x01a9,
+	0x01ac, 0x01b9,
+	0x01bc, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x0220,
+	0x0222, 0x0233,
+	0x023a, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03d1,
+	0x03d5, 0x03f2,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03fb,
+	0x03fd, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e00, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c70,
+	0x2c72, 0x2c73,
+	0x2c75, 0x2c76,
+	0x2c7e, 0x2ce3,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	424,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309b, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	431,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e32,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb2,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	513,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_XID_Continue */
+
+/* 'Default_Ignorable_Code_Point': Derived Property */
+static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x180b, 0x180d,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x3164, 0x3164,
+	0xfe00, 0xfe0f,
+	0xfeff, 0xfeff,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe0fff,
+}; /* CR_Default_Ignorable_Code_Point */
+
+/* 'Grapheme_Extend': Derived Property */
+static const OnigCodePoint CR_Grapheme_Extend[] = {
+	206,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09be, 0x09be,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bbe,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d3e, 0x0d3e,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dcf,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0ddf, 0x0ddf,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d165, 0x1d165,
+	0x1d167, 0x1d169,
+	0x1d16e, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	567,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06e9, 0x06e9,
+	0x06ee, 0x070d,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0830, 0x083e,
+	0x0903, 0x0939,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0972,
+	0x0979, 0x097f,
+	0x0982, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09bf, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09e6, 0x09fb,
+	0x0a03, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a40,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a6f,
+	0x0a72, 0x0a74,
+	0x0a83, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b02, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbf, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c41, 0x0c44,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbe,
+	0x0cc0, 0x0cc1,
+	0x0cc3, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dd0, 0x0dd1,
+	0x0dd8, 0x0dde,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e3f, 0x0e46,
+	0x0e4f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8b,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1360, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1735, 0x1736,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x17d4, 0x17dc,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180a,
+	0x180e, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a16,
+	0x1a19, 0x1a1b,
+	0x1a1e, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b04, 0x1b33,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b4b,
+	0x1b50, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1b82, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x200a,
+	0x2010, 0x2027,
+	0x202f, 0x205f,
+	0x2070, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa824,
+	0xa827, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c3,
+	0xa8ce, 0xa8d9,
+	0xa8f2, 0xa8fb,
+	0xa900, 0xa925,
+	0xa92e, 0xa946,
+	0xa952, 0xa953,
+	0xa95f, 0xa97c,
+	0xa983, 0xa9b2,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa28,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa4d, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff01, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a40, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d166, 0x1d166,
+	0x1d16a, 0x1d16d,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	26,
+	0x094d, 0x094d,
+	0x09cd, 0x09cd,
+	0x0a4d, 0x0a4d,
+	0x0acd, 0x0acd,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e3a, 0x0e3a,
+	0x0f84, 0x0f84,
+	0x1039, 0x103a,
+	0x1714, 0x1714,
+	0x1734, 0x1734,
+	0x17d2, 0x17d2,
+	0x1a60, 0x1a60,
+	0x1b44, 0x1b44,
+	0x1baa, 0x1baa,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x110b9, 0x110b9,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	159,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x0600, 0x0603,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0cf1, 0x0cf2,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x206a, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20b8,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2e00, 0x2e31,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3004,
+	0x3006, 0x3006,
+	0x3008, 0x3020,
+	0x3030, 0x3037,
+	0x303c, 0x303f,
+	0x309b, 0x309c,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fc,
+	0x3190, 0x319f,
+	0x31c0, 0x31e3,
+	0x3220, 0x325f,
+	0x327f, 0x32cf,
+	0x3358, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	0xa830, 0xa839,
+	0xfd3e, 0xfd3f,
+	0xfdfd, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfeff, 0xfeff,
+	0xff01, 0xff20,
+	0xff3b, 0xff40,
+	0xff5b, 0xff65,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d166,
+	0x1d16a, 0x1d17a,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	28,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02b8,
+	0x02e0, 0x02e4,
+	0x1d00, 0x1d25,
+	0x1d2c, 0x1d5c,
+	0x1d62, 0x1d65,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1dbe,
+	0x1e00, 0x1eff,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa7ff,
+	0xfb00, 0xfb06,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+}; /* CR_Latin */
+
+/* 'Greek': Script */
+static const OnigCodePoint CR_Greek[] = {
+	33,
+	0x0370, 0x0373,
+	0x0375, 0x0377,
+	0x037a, 0x037d,
+	0x0384, 0x0384,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03e1,
+	0x03f0, 0x03ff,
+	0x1d26, 0x1d2a,
+	0x1d5d, 0x1d61,
+	0x1d66, 0x1d6a,
+	0x1dbf, 0x1dbf,
+	0x1f00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2126, 0x2126,
+	0x10140, 0x1018a,
+	0x1d200, 0x1d245,
+}; /* CR_Greek */
+
+/* 'Cyrillic': Script */
+static const OnigCodePoint CR_Cyrillic[] = {
+	8,
+	0x0400, 0x0484,
+	0x0487, 0x0525,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	5,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0xfb13, 0xfb17,
+}; /* CR_Armenian */
+
+/* 'Hebrew': Script */
+static const OnigCodePoint CR_Hebrew[] = {
+	9,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfb4f,
+}; /* CR_Hebrew */
+
+/* 'Arabic': Script */
+static const OnigCodePoint CR_Arabic[] = {
+	18,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065e,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0xfb50, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfc,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+}; /* CR_Arabic */
+
+/* 'Syriac': Script */
+static const OnigCodePoint CR_Syriac[] = {
+	3,
+	0x0700, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+}; /* CR_Syriac */
+
+/* 'Thaana': Script */
+static const OnigCodePoint CR_Thaana[] = {
+	1,
+	0x0780, 0x07b1,
+}; /* CR_Thaana */
+
+/* 'Devanagari': Script */
+static const OnigCodePoint CR_Devanagari[] = {
+	9,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0950,
+	0x0953, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0xa8e0, 0xa8fb,
+}; /* CR_Devanagari */
+
+/* 'Bengali': Script */
+static const OnigCodePoint CR_Bengali[] = {
+	14,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+}; /* CR_Bengali */
+
+/* 'Gurmukhi': Script */
+static const OnigCodePoint CR_Gurmukhi[] = {
+	16,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+}; /* CR_Gurmukhi */
+
+/* 'Gujarati': Script */
+static const OnigCodePoint CR_Gujarati[] = {
+	14,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+}; /* CR_Gujarati */
+
+/* 'Oriya': Script */
+static const OnigCodePoint CR_Oriya[] = {
+	14,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+}; /* CR_Oriya */
+
+/* 'Tamil': Script */
+static const OnigCodePoint CR_Tamil[] = {
+	16,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+}; /* CR_Tamil */
+
+/* 'Telugu': Script */
+static const OnigCodePoint CR_Telugu[] = {
+	14,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+}; /* CR_Telugu */
+
+/* 'Kannada': Script */
+static const OnigCodePoint CR_Kannada[] = {
+	13,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	12,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+}; /* CR_Malayalam */
+
+/* 'Sinhala': Script */
+static const OnigCodePoint CR_Sinhala[] = {
+	11,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+}; /* CR_Sinhala */
+
+/* 'Thai': Script */
+static const OnigCodePoint CR_Thai[] = {
+	2,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e5b,
+}; /* CR_Thai */
+
+/* 'Lao': Script */
+static const OnigCodePoint CR_Lao[] = {
+	18,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	2,
+	0x1000, 0x109f,
+	0xaa60, 0xaa7b,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	4,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x2d00, 0x2d25,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	13,
+	0x1100, 0x11ff,
+	0x3131, 0x318e,
+	0x3200, 0x321e,
+	0x3260, 0x327e,
+	0xa960, 0xa97c,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+}; /* CR_Hangul */
+
+/* 'Ethiopic': Script */
+static const OnigCodePoint CR_Ethiopic[] = {
+	27,
+	0x1200, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+}; /* CR_Ethiopic */
+
+/* 'Cherokee': Script */
+static const OnigCodePoint CR_Cherokee[] = {
+	1,
+	0x13a0, 0x13f4,
+}; /* CR_Cherokee */
+
+/* 'Canadian_Aboriginal': Script */
+static const OnigCodePoint CR_Canadian_Aboriginal[] = {
+	2,
+	0x1400, 0x167f,
+	0x18b0, 0x18f5,
+}; /* CR_Canadian_Aboriginal */
+
+/* 'Ogham': Script */
+static const OnigCodePoint CR_Ogham[] = {
+	1,
+	0x1680, 0x169c,
+}; /* CR_Ogham */
+
+/* 'Runic': Script */
+static const OnigCodePoint CR_Runic[] = {
+	2,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+}; /* CR_Runic */
+
+/* 'Khmer': Script */
+static const OnigCodePoint CR_Khmer[] = {
+	4,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x19e0, 0x19ff,
+}; /* CR_Khmer */
+
+/* 'Mongolian': Script */
+static const OnigCodePoint CR_Mongolian[] = {
+	6,
+	0x1800, 0x1801,
+	0x1804, 0x1804,
+	0x1806, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+}; /* CR_Mongolian */
+
+/* 'Hiragana': Script */
+static const OnigCodePoint CR_Hiragana[] = {
+	3,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	7,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	2,
+	0x3105, 0x312d,
+	0x31a0, 0x31b7,
+}; /* CR_Bopomofo */
+
+/* 'Han': Script */
+static const OnigCodePoint CR_Han[] = {
+	15,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x3005, 0x3005,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303b,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Han */
+
+/* 'Yi': Script */
+static const OnigCodePoint CR_Yi[] = {
+	2,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+}; /* CR_Yi */
+
+/* 'Old_Italic': Script */
+static const OnigCodePoint CR_Old_Italic[] = {
+	2,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+}; /* CR_Old_Italic */
+
+/* 'Gothic': Script */
+static const OnigCodePoint CR_Gothic[] = {
+	1,
+	0x10330, 0x1034a,
+}; /* CR_Gothic */
+
+/* 'Deseret': Script */
+static const OnigCodePoint CR_Deseret[] = {
+	1,
+	0x10400, 0x1044f,
+}; /* CR_Deseret */
+
+/* 'Inherited': Script */
+static const OnigCodePoint CR_Inherited[] = {
+	23,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0xe0100, 0xe01ef,
+}; /* CR_Inherited */
+
+/* 'Tagalog': Script */
+static const OnigCodePoint CR_Tagalog[] = {
+	2,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+}; /* CR_Tagalog */
+
+/* 'Hanunoo': Script */
+static const OnigCodePoint CR_Hanunoo[] = {
+	1,
+	0x1720, 0x1734,
+}; /* CR_Hanunoo */
+
+/* 'Buhid': Script */
+static const OnigCodePoint CR_Buhid[] = {
+	1,
+	0x1740, 0x1753,
+}; /* CR_Buhid */
+
+/* 'Tagbanwa': Script */
+static const OnigCodePoint CR_Tagbanwa[] = {
+	3,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+}; /* CR_Tagbanwa */
+
+/* 'Limbu': Script */
+static const OnigCodePoint CR_Limbu[] = {
+	5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x194f,
+}; /* CR_Limbu */
+
+/* 'Tai_Le': Script */
+static const OnigCodePoint CR_Tai_Le[] = {
+	2,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+}; /* CR_Tai_Le */
+
+/* 'Linear_B': Script */
+static const OnigCodePoint CR_Linear_B[] = {
+	7,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+}; /* CR_Linear_B */
+
+/* 'Ugaritic': Script */
+static const OnigCodePoint CR_Ugaritic[] = {
+	2,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+}; /* CR_Ugaritic */
+
+/* 'Shavian': Script */
+static const OnigCodePoint CR_Shavian[] = {
+	1,
+	0x10450, 0x1047f,
+}; /* CR_Shavian */
+
+/* 'Osmanya': Script */
+static const OnigCodePoint CR_Osmanya[] = {
+	2,
+	0x10480, 0x1049d,
+	0x104a0, 0x104a9,
+}; /* CR_Osmanya */
+
+/* 'Cypriot': Script */
+static const OnigCodePoint CR_Cypriot[] = {
+	6,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+}; /* CR_Cypriot */
+
+/* 'Braille': Script */
+static const OnigCodePoint CR_Braille[] = {
+	1,
+	0x2800, 0x28ff,
+}; /* CR_Braille */
+
+/* 'Buginese': Script */
+static const OnigCodePoint CR_Buginese[] = {
+	2,
+	0x1a00, 0x1a1b,
+	0x1a1e, 0x1a1f,
+}; /* CR_Buginese */
+
+/* 'Coptic': Script */
+static const OnigCodePoint CR_Coptic[] = {
+	3,
+	0x03e2, 0x03ef,
+	0x2c80, 0x2cf1,
+	0x2cf9, 0x2cff,
+}; /* CR_Coptic */
+
+/* 'New_Tai_Lue': Script */
+static const OnigCodePoint CR_New_Tai_Lue[] = {
+	4,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x19df,
+}; /* CR_New_Tai_Lue */
+
+/* 'Glagolitic': Script */
+static const OnigCodePoint CR_Glagolitic[] = {
+	2,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+}; /* CR_Glagolitic */
+
+/* 'Tifinagh': Script */
+static const OnigCodePoint CR_Tifinagh[] = {
+	2,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+}; /* CR_Tifinagh */
+
+/* 'Syloti_Nagri': Script */
+static const OnigCodePoint CR_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82b,
+}; /* CR_Syloti_Nagri */
+
+/* 'Old_Persian': Script */
+static const OnigCodePoint CR_Old_Persian[] = {
+	2,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103d5,
+}; /* CR_Old_Persian */
+
+/* 'Kharoshthi': Script */
+static const OnigCodePoint CR_Kharoshthi[] = {
+	8,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+}; /* CR_Kharoshthi */
+
+/* 'Balinese': Script */
+static const OnigCodePoint CR_Balinese[] = {
+	2,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+}; /* CR_Balinese */
+
+/* 'Cuneiform': Script */
+static const OnigCodePoint CR_Cuneiform[] = {
+	3,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+}; /* CR_Cuneiform */
+
+/* 'Phoenician': Script */
+static const OnigCodePoint CR_Phoenician[] = {
+	2,
+	0x10900, 0x1091b,
+	0x1091f, 0x1091f,
+}; /* CR_Phoenician */
+
+/* 'Phags_Pa': Script */
+static const OnigCodePoint CR_Phags_Pa[] = {
+	1,
+	0xa840, 0xa877,
+}; /* CR_Phags_Pa */
+
+/* 'Nko': Script */
+static const OnigCodePoint CR_Nko[] = {
+	1,
+	0x07c0, 0x07fa,
+}; /* CR_Nko */
+
+/* 'Sundanese': Script */
+static const OnigCodePoint CR_Sundanese[] = {
+	2,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+}; /* CR_Sundanese */
+
+/* 'Lepcha': Script */
+static const OnigCodePoint CR_Lepcha[] = {
+	3,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c4f,
+}; /* CR_Lepcha */
+
+/* 'Ol_Chiki': Script */
+static const OnigCodePoint CR_Ol_Chiki[] = {
+	1,
+	0x1c50, 0x1c7f,
+}; /* CR_Ol_Chiki */
+
+/* 'Vai': Script */
+static const OnigCodePoint CR_Vai[] = {
+	1,
+	0xa500, 0xa62b,
+}; /* CR_Vai */
+
+/* 'Saurashtra': Script */
+static const OnigCodePoint CR_Saurashtra[] = {
+	2,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+}; /* CR_Saurashtra */
+
+/* 'Kayah_Li': Script */
+static const OnigCodePoint CR_Kayah_Li[] = {
+	1,
+	0xa900, 0xa92f,
+}; /* CR_Kayah_Li */
+
+/* 'Rejang': Script */
+static const OnigCodePoint CR_Rejang[] = {
+	2,
+	0xa930, 0xa953,
+	0xa95f, 0xa95f,
+}; /* CR_Rejang */
+
+/* 'Lycian': Script */
+static const OnigCodePoint CR_Lycian[] = {
+	1,
+	0x10280, 0x1029c,
+}; /* CR_Lycian */
+
+/* 'Carian': Script */
+static const OnigCodePoint CR_Carian[] = {
+	1,
+	0x102a0, 0x102d0,
+}; /* CR_Carian */
+
+/* 'Lydian': Script */
+static const OnigCodePoint CR_Lydian[] = {
+	2,
+	0x10920, 0x10939,
+	0x1093f, 0x1093f,
+}; /* CR_Lydian */
+
+/* 'Cham': Script */
+static const OnigCodePoint CR_Cham[] = {
+	4,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+}; /* CR_Cham */
+
+/* 'Tai_Tham': Script */
+static const OnigCodePoint CR_Tai_Tham[] = {
+	5,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+}; /* CR_Tai_Tham */
+
+/* 'Tai_Viet': Script */
+static const OnigCodePoint CR_Tai_Viet[] = {
+	2,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+}; /* CR_Tai_Viet */
+
+/* 'Avestan': Script */
+static const OnigCodePoint CR_Avestan[] = {
+	2,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b3f,
+}; /* CR_Avestan */
+
+/* 'Egyptian_Hieroglyphs': Script */
+static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342e,
+}; /* CR_Egyptian_Hieroglyphs */
+
+/* 'Samaritan': Script */
+static const OnigCodePoint CR_Samaritan[] = {
+	2,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+}; /* CR_Samaritan */
+
+/* 'Lisu': Script */
+static const OnigCodePoint CR_Lisu[] = {
+	1,
+	0xa4d0, 0xa4ff,
+}; /* CR_Lisu */
+
+/* 'Bamum': Script */
+static const OnigCodePoint CR_Bamum[] = {
+	1,
+	0xa6a0, 0xa6f7,
+}; /* CR_Bamum */
+
+/* 'Javanese': Script */
+static const OnigCodePoint CR_Javanese[] = {
+	3,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+}; /* CR_Javanese */
+
+/* 'Meetei_Mayek': Script */
+static const OnigCodePoint CR_Meetei_Mayek[] = {
+	2,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+}; /* CR_Meetei_Mayek */
+
+/* 'Imperial_Aramaic': Script */
+static const OnigCodePoint CR_Imperial_Aramaic[] = {
+	2,
+	0x10840, 0x10855,
+	0x10857, 0x1085f,
+}; /* CR_Imperial_Aramaic */
+
+/* 'Old_South_Arabian': Script */
+static const OnigCodePoint CR_Old_South_Arabian[] = {
+	1,
+	0x10a60, 0x10a7f,
+}; /* CR_Old_South_Arabian */
+
+/* 'Inscriptional_Parthian': Script */
+static const OnigCodePoint CR_Inscriptional_Parthian[] = {
+	2,
+	0x10b40, 0x10b55,
+	0x10b58, 0x10b5f,
+}; /* CR_Inscriptional_Parthian */
+
+/* 'Inscriptional_Pahlavi': Script */
+static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
+	2,
+	0x10b60, 0x10b72,
+	0x10b78, 0x10b7f,
+}; /* CR_Inscriptional_Pahlavi */
+
+/* 'Old_Turkic': Script */
+static const OnigCodePoint CR_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c48,
+}; /* CR_Old_Turkic */
+
+/* 'Kaithi': Script */
+static const OnigCodePoint CR_Kaithi[] = {
+	1,
+	0x11080, 0x110c1,
+}; /* CR_Kaithi */
+
+/* 'White_Space': Binary Property */
+static const OnigCodePoint CR_White_Space[] = {
+	11,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_White_Space */
+
+/* 'Bidi_Control': Binary Property */
+static const OnigCodePoint CR_Bidi_Control[] = {
+	2,
+	0x200e, 0x200f,
+	0x202a, 0x202e,
+}; /* CR_Bidi_Control */
+
+/* 'Join_Control': Binary Property */
+static const OnigCodePoint CR_Join_Control[] = {
+	1,
+	0x200c, 0x200d,
+}; /* CR_Join_Control */
+
+/* 'Dash': Binary Property */
+static const OnigCodePoint CR_Dash[] = {
+	19,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Dash */
+
+/* 'Hyphen': Binary Property */
+static const OnigCodePoint CR_Hyphen[] = {
+	10,
+	0x002d, 0x002d,
+	0x00ad, 0x00ad,
+	0x058a, 0x058a,
+	0x1806, 0x1806,
+	0x2010, 0x2011,
+	0x2e17, 0x2e17,
+	0x30fb, 0x30fb,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+	0xff65, 0xff65,
+}; /* CR_Hyphen */
+
+/* 'Quotation_Mark': Binary Property */
+static const OnigCodePoint CR_Quotation_Mark[] = {
+	12,
+	0x0022, 0x0022,
+	0x0027, 0x0027,
+	0x00ab, 0x00ab,
+	0x00bb, 0x00bb,
+	0x2018, 0x201f,
+	0x2039, 0x203a,
+	0x300c, 0x300f,
+	0x301d, 0x301f,
+	0xfe41, 0xfe44,
+	0xff02, 0xff02,
+	0xff07, 0xff07,
+	0xff62, 0xff63,
+}; /* CR_Quotation_Mark */
+
+/* 'Terminal_Punctuation': Binary Property */
+static const OnigCodePoint CR_Terminal_Punctuation[] = {
+	65,
+	0x0021, 0x0021,
+	0x002c, 0x002c,
+	0x002e, 0x002e,
+	0x003a, 0x003b,
+	0x003f, 0x003f,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x05c3, 0x05c3,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x070a,
+	0x070c, 0x070c,
+	0x07f8, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0e5a, 0x0e5b,
+	0x0f08, 0x0f08,
+	0x0f0d, 0x0f12,
+	0x104a, 0x104b,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x17d4, 0x17d6,
+	0x17da, 0x17da,
+	0x1802, 0x1805,
+	0x1808, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	0x1b5a, 0x1b5b,
+	0x1b5d, 0x1b5f,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3001, 0x3002,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa6f3, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c7, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaadf, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xff01, 0xff01,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0xff64, 0xff64,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x10b3a, 0x10b3f,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	99,
+	0x005e, 0x005e,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2061, 0x2064,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21a7,
+	0x21a9, 0x21ad,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x23b4, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23e2, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b6,
+	0x25bc, 0x25c0,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266e,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0xfe61, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Other_Math */
+
+/* 'Hex_Digit': Binary Property */
+static const OnigCodePoint CR_Hex_Digit[] = {
+	6,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+	0xff10, 0xff19,
+	0xff21, 0xff26,
+	0xff41, 0xff46,
+}; /* CR_Hex_Digit */
+
+/* 'ASCII_Hex_Digit': Binary Property */
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	141,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x0900, 0x0903,
+	0x093e, 0x094c,
+	0x094e, 0x094e,
+	0x0955, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e4d, 0x0e4d,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ecd, 0x0ecd,
+	0x0f71, 0x0f81,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x102b, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1062,
+	0x1067, 0x1068,
+	0x1071, 0x1074,
+	0x1082, 0x1086,
+	0x109c, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1713,
+	0x1732, 0x1733,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17c8,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1b00, 0x1b04,
+	0x1b35, 0x1b43,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1ba9,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf2,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	117,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x034e,
+	0x0350, 0x0357,
+	0x035d, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0483, 0x0487,
+	0x0559, 0x0559,
+	0x0591, 0x05a1,
+	0x05a3, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c4,
+	0x064b, 0x0652,
+	0x0657, 0x0658,
+	0x06df, 0x06e0,
+	0x06e5, 0x06e6,
+	0x06ea, 0x06ec,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x0818, 0x0819,
+	0x093c, 0x093c,
+	0x094d, 0x094d,
+	0x0951, 0x0954,
+	0x0971, 0x0971,
+	0x09bc, 0x09bc,
+	0x09cd, 0x09cd,
+	0x0a3c, 0x0a3c,
+	0x0a4d, 0x0a4d,
+	0x0abc, 0x0abc,
+	0x0acd, 0x0acd,
+	0x0b3c, 0x0b3c,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0cbc, 0x0cbc,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e47, 0x0e4c,
+	0x0e4e, 0x0e4e,
+	0x0ec8, 0x0ecc,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f82, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0fc6, 0x0fc6,
+	0x1037, 0x1037,
+	0x1039, 0x103a,
+	0x1087, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109b,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x1939, 0x193b,
+	0x1a75, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b34, 0x1b34,
+	0x1b44, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1baa, 0x1baa,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d6a,
+	0x1dc4, 0x1dcf,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2cef, 0x2cf1,
+	0x2e2f, 0x2e2f,
+	0x302a, 0x302f,
+	0x3099, 0x309c,
+	0x30fc, 0x30fc,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa717, 0xa721,
+	0xa788, 0xa788,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xaa7b, 0xaa7b,
+	0xaabf, 0xaac2,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe26,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	20,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c36, 0x1c36,
+	0x1c7b, 0x1c7b,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa60c, 0xa60c,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	13,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2090, 0x2094,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7d, 0x2c7d,
+	0xa770, 0xa770,
+}; /* CR_Other_Lowercase */
+
+/* 'Other_Uppercase': Binary Property */
+static const OnigCodePoint CR_Other_Uppercase[] = {
+	2,
+	0x2160, 0x216f,
+	0x24b6, 0x24cf,
+}; /* CR_Other_Uppercase */
+
+/* 'Noncharacter_Code_Point': Binary Property */
+static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
+	18,
+	0xfdd0, 0xfdef,
+	0xfffe, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Noncharacter_Code_Point */
+
+/* 'Other_Grapheme_Extend': Binary Property */
+static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
+	16,
+	0x09be, 0x09be,
+	0x09d7, 0x09d7,
+	0x0b3e, 0x0b3e,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbe,
+	0x0bd7, 0x0bd7,
+	0x0cc2, 0x0cc2,
+	0x0cd5, 0x0cd6,
+	0x0d3e, 0x0d3e,
+	0x0d57, 0x0d57,
+	0x0dcf, 0x0dcf,
+	0x0ddf, 0x0ddf,
+	0x200c, 0x200d,
+	0xff9e, 0xff9f,
+	0x1d165, 0x1d165,
+	0x1d16e, 0x1d172,
+}; /* CR_Other_Grapheme_Extend */
+
+/* 'IDS_Binary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Binary_Operator[] = {
+	2,
+	0x2ff0, 0x2ff1,
+	0x2ff4, 0x2ffb,
+}; /* CR_IDS_Binary_Operator */
+
+/* 'IDS_Trinary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
+	1,
+	0x2ff2, 0x2ff3,
+}; /* CR_IDS_Trinary_Operator */
+
+/* 'Radical': Binary Property */
+static const OnigCodePoint CR_Radical[] = {
+	3,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+}; /* CR_Radical */
+
+/* 'Unified_Ideograph': Binary Property */
+static const OnigCodePoint CR_Unified_Ideograph[] = {
+	11,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	10,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x2065, 0x2069,
+	0x3164, 0x3164,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0xe0000, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xe0fff,
+}; /* CR_Other_Default_Ignorable_Code_Point */
+
+/* 'Deprecated': Binary Property */
+static const OnigCodePoint CR_Deprecated[] = {
+	8,
+	0x0149, 0x0149,
+	0x0f77, 0x0f77,
+	0x0f79, 0x0f79,
+	0x17a3, 0x17a4,
+	0x206a, 0x206f,
+	0x2329, 0x232a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Deprecated */
+
+/* 'Soft_Dotted': Binary Property */
+static const OnigCodePoint CR_Soft_Dotted[] = {
+	31,
+	0x0069, 0x006a,
+	0x012f, 0x012f,
+	0x0249, 0x0249,
+	0x0268, 0x0268,
+	0x029d, 0x029d,
+	0x02b2, 0x02b2,
+	0x03f3, 0x03f3,
+	0x0456, 0x0456,
+	0x0458, 0x0458,
+	0x1d62, 0x1d62,
+	0x1d96, 0x1d96,
+	0x1da4, 0x1da4,
+	0x1da8, 0x1da8,
+	0x1e2d, 0x1e2d,
+	0x1ecb, 0x1ecb,
+	0x2071, 0x2071,
+	0x2148, 0x2149,
+	0x2c7c, 0x2c7c,
+	0x1d422, 0x1d423,
+	0x1d456, 0x1d457,
+	0x1d48a, 0x1d48b,
+	0x1d4be, 0x1d4bf,
+	0x1d4f2, 0x1d4f3,
+	0x1d526, 0x1d527,
+	0x1d55a, 0x1d55b,
+	0x1d58e, 0x1d58f,
+	0x1d5c2, 0x1d5c3,
+	0x1d5f6, 0x1d5f7,
+	0x1d62a, 0x1d62b,
+	0x1d65e, 0x1d65f,
+	0x1d692, 0x1d693,
+}; /* CR_Soft_Dotted */
+
+/* 'Logical_Order_Exception': Binary Property */
+static const OnigCodePoint CR_Logical_Order_Exception[] = {
+	5,
+	0x0e40, 0x0e44,
+	0x0ec0, 0x0ec4,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaab9,
+	0xaabb, 0xaabc,
+}; /* CR_Logical_Order_Exception */
+
+/* 'Other_ID_Start': Binary Property */
+static const OnigCodePoint CR_Other_ID_Start[] = {
+	3,
+	0x2118, 0x2118,
+	0x212e, 0x212e,
+	0x309b, 0x309c,
+}; /* CR_Other_ID_Start */
+
+/* 'Other_ID_Continue': Binary Property */
+static const OnigCodePoint CR_Other_ID_Continue[] = {
+	3,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	43,
+	0x0021, 0x0021,
+	0x002e, 0x002e,
+	0x003f, 0x003f,
+	0x055c, 0x055c,
+	0x055e, 0x055e,
+	0x0589, 0x0589,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x0702,
+	0x07f9, 0x07f9,
+	0x0964, 0x0965,
+	0x104a, 0x104b,
+	0x1362, 0x1362,
+	0x1367, 0x1368,
+	0x166e, 0x166e,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1b5a, 0x1b5b,
+	0x1b5e, 0x1b5f,
+	0x1c3b, 0x1c3c,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3002, 0x3002,
+	0xa4ff, 0xa4ff,
+	0xa60e, 0xa60f,
+	0xa6f3, 0xa6f3,
+	0xa6f7, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c8, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x110be, 0x110c1,
+}; /* CR_STerm */
+
+/* 'Variation_Selector': Binary Property */
+static const OnigCodePoint CR_Variation_Selector[] = {
+	3,
+	0x180b, 0x180d,
+	0xfe00, 0xfe0f,
+	0xe0100, 0xe01ef,
+}; /* CR_Variation_Selector */
+
+/* 'Pattern_White_Space': Binary Property */
+static const OnigCodePoint CR_Pattern_White_Space[] = {
+	5,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x200e, 0x200f,
+	0x2028, 0x2029,
+}; /* CR_Pattern_White_Space */
+
+/* 'Pattern_Syntax': Binary Property */
+static const OnigCodePoint CR_Pattern_Syntax[] = {
+	28,
+	0x0021, 0x002f,
+	0x003a, 0x0040,
+	0x005b, 0x005e,
+	0x0060, 0x0060,
+	0x007b, 0x007e,
+	0x00a1, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ab, 0x00ac,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b1,
+	0x00b6, 0x00b6,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x2010, 0x2027,
+	0x2030, 0x203e,
+	0x2041, 0x2053,
+	0x2055, 0x205e,
+	0x2190, 0x245f,
+	0x2500, 0x2775,
+	0x2794, 0x2bff,
+	0x2e00, 0x2e7f,
+	0x3001, 0x3003,
+	0x3008, 0x3020,
+	0x3030, 0x3030,
+	0xfd3e, 0xfd3f,
+	0xfe45, 0xfe46,
+}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
+#endif /* USE_UNICODE_PROPERTIES */
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
+
+/* 'Blank': [[:Blank:]] */
+static const OnigCodePoint CR_Blank[] = {
+	9,
+	0x0009, 0x0009,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Blank */
+
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
+
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	490,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x167f,
+	0x1681, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x200b, 0x2027,
+	0x202a, 0x202e,
+	0x2030, 0x205e,
+	0x2060, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	487,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2027,
+	0x202a, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06de, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	497,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+static const OnigCodePoint* const CodeRanges[] = {
+  CR_NEWLINE,
+  CR_Alpha,
+  CR_Blank,
+  CR_Cntrl,
+  CR_Digit,
+  CR_Graph,
+  CR_Lower,
+  CR_Print,
+  CR_Punct,
+  CR_Space,
+  CR_Upper,
+  CR_XDigit,
+  CR_Word,
+  CR_Alnum,
+  CR_ASCII,
+#ifdef USE_UNICODE_PROPERTIES
+#ifdef USE_UNICODE_PROPERTIES
+  CR_Any,
+  CR_Assigned,
+  CR_C,
+  CR_Cc,
+  CR_Cf,
+  CR_Cn,
+  CR_Co,
+  CR_Cs,
+  CR_L,
+  CR_Ll,
+  CR_Lm,
+  CR_Lo,
+  CR_Lt,
+  CR_Lu,
+  CR_M,
+  CR_Mc,
+  CR_Me,
+  CR_Mn,
+  CR_N,
+  CR_Nd,
+  CR_Nl,
+  CR_No,
+  CR_P,
+  CR_Pc,
+  CR_Pd,
+  CR_Pe,
+  CR_Pf,
+  CR_Pi,
+  CR_Po,
+  CR_Ps,
+  CR_S,
+  CR_Sc,
+  CR_Sk,
+  CR_Sm,
+  CR_So,
+  CR_Z,
+  CR_Zl,
+  CR_Zp,
+  CR_Zs,
+  CR_Math,
+  CR_Alphabetic,
+  CR_Lowercase,
+  CR_Uppercase,
+  CR_Cased,
+  CR_Case_Ignorable,
+  CR_Changes_When_Lowercased,
+  CR_Changes_When_Uppercased,
+  CR_Changes_When_Titlecased,
+  CR_Changes_When_Casefolded,
+  CR_Changes_When_Casemapped,
+  CR_ID_Start,
+  CR_ID_Continue,
+  CR_XID_Start,
+  CR_XID_Continue,
+  CR_Default_Ignorable_Code_Point,
+  CR_Grapheme_Extend,
+  CR_Grapheme_Base,
+  CR_Grapheme_Link,
+  CR_Common,
+  CR_Latin,
+  CR_Greek,
+  CR_Cyrillic,
+  CR_Armenian,
+  CR_Hebrew,
+  CR_Arabic,
+  CR_Syriac,
+  CR_Thaana,
+  CR_Devanagari,
+  CR_Bengali,
+  CR_Gurmukhi,
+  CR_Gujarati,
+  CR_Oriya,
+  CR_Tamil,
+  CR_Telugu,
+  CR_Kannada,
+  CR_Malayalam,
+  CR_Sinhala,
+  CR_Thai,
+  CR_Lao,
+  CR_Tibetan,
+  CR_Myanmar,
+  CR_Georgian,
+  CR_Hangul,
+  CR_Ethiopic,
+  CR_Cherokee,
+  CR_Canadian_Aboriginal,
+  CR_Ogham,
+  CR_Runic,
+  CR_Khmer,
+  CR_Mongolian,
+  CR_Hiragana,
+  CR_Katakana,
+  CR_Bopomofo,
+  CR_Han,
+  CR_Yi,
+  CR_Old_Italic,
+  CR_Gothic,
+  CR_Deseret,
+  CR_Inherited,
+  CR_Tagalog,
+  CR_Hanunoo,
+  CR_Buhid,
+  CR_Tagbanwa,
+  CR_Limbu,
+  CR_Tai_Le,
+  CR_Linear_B,
+  CR_Ugaritic,
+  CR_Shavian,
+  CR_Osmanya,
+  CR_Cypriot,
+  CR_Braille,
+  CR_Buginese,
+  CR_Coptic,
+  CR_New_Tai_Lue,
+  CR_Glagolitic,
+  CR_Tifinagh,
+  CR_Syloti_Nagri,
+  CR_Old_Persian,
+  CR_Kharoshthi,
+  CR_Balinese,
+  CR_Cuneiform,
+  CR_Phoenician,
+  CR_Phags_Pa,
+  CR_Nko,
+  CR_Sundanese,
+  CR_Lepcha,
+  CR_Ol_Chiki,
+  CR_Vai,
+  CR_Saurashtra,
+  CR_Kayah_Li,
+  CR_Rejang,
+  CR_Lycian,
+  CR_Carian,
+  CR_Lydian,
+  CR_Cham,
+  CR_Tai_Tham,
+  CR_Tai_Viet,
+  CR_Avestan,
+  CR_Egyptian_Hieroglyphs,
+  CR_Samaritan,
+  CR_Lisu,
+  CR_Bamum,
+  CR_Javanese,
+  CR_Meetei_Mayek,
+  CR_Imperial_Aramaic,
+  CR_Old_South_Arabian,
+  CR_Inscriptional_Parthian,
+  CR_Inscriptional_Pahlavi,
+  CR_Old_Turkic,
+  CR_Kaithi,
+  CR_White_Space,
+  CR_Bidi_Control,
+  CR_Join_Control,
+  CR_Dash,
+  CR_Hyphen,
+  CR_Quotation_Mark,
+  CR_Terminal_Punctuation,
+  CR_Other_Math,
+  CR_Hex_Digit,
+  CR_ASCII_Hex_Digit,
+  CR_Other_Alphabetic,
+  CR_Ideographic,
+  CR_Diacritic,
+  CR_Extender,
+  CR_Other_Lowercase,
+  CR_Other_Uppercase,
+  CR_Noncharacter_Code_Point,
+  CR_Other_Grapheme_Extend,
+  CR_IDS_Binary_Operator,
+  CR_IDS_Trinary_Operator,
+  CR_Radical,
+  CR_Unified_Ideograph,
+  CR_Other_Default_Ignorable_Code_Point,
+  CR_Deprecated,
+  CR_Soft_Dotted,
+  CR_Logical_Order_Exception,
+  CR_Other_ID_Start,
+  CR_Other_ID_Continue,
+  CR_STerm,
+  CR_Variation_Selector,
+  CR_Pattern_White_Space,
+  CR_Pattern_Syntax,
+#endif /* USE_UNICODE_PROPERTIES */
+#endif /* USE_UNICODE_PROPERTIES */
+};
+struct uniname2ctype_struct {
+  int name, ctype;
+};
+
+static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
+
+#ifndef USE_UNICODE_PROPERTIES
+#define TOTAL_KEYWORDS 15
+#define MIN_WORD_LENGTH 4
+#define MAX_WORD_LENGTH 7
+#define MIN_HASH_VALUE 7
+#define MAX_HASH_VALUE 21
+/* maximum key range = 15, duplicates = 0 */
+#else /* USE_UNICODE_PROPERTIES */
+#define TOTAL_KEYWORDS 367
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 30
+#define MIN_HASH_VALUE 3
+#define MAX_HASH_VALUE 1751
+/* maximum key range = 1749, duplicates = 0 */
+#endif /* USE_UNICODE_PROPERTIES */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+uniname2ctype_hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+#ifndef USE_UNICODE_PROPERTIES
+  static const unsigned char asso_values[] =
+#else /* USE_UNICODE_PROPERTIES */
+  static const unsigned short asso_values[] =
+#endif /* USE_UNICODE_PROPERTIES */
+    {
+#ifndef USE_UNICODE_PROPERTIES
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22,  3, 13,  6,
+       4, 22, 22, 11, 22,  1, 22, 22, 10, 22,
+       2, 22,  1, 22, 10,  8,  4,  7, 22,  3,
+       4, 22, 22, 22, 22, 22, 22, 22
+#else /* USE_UNICODE_PROPERTIES */
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752,    7,  419,    1,
+       128,   38,  100,  186,   46,   11,  226,  463,    4,  317,
+         6,    2,  265,    5,   18,  112,   30,  289,  164,  384,
+       368,  579,   10, 1752, 1752, 1752, 1752, 1752
+#endif /* USE_UNICODE_PROPERTIES */
+    };
+#ifndef USE_UNICODE_PROPERTIES
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+#else /* USE_UNICODE_PROPERTIES */
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[15]];
+      /*FALLTHROUGH*/
+      case 15:
+      case 14:
+      case 13:
+      case 12:
+        hval += asso_values[(unsigned char)str[11]];
+      /*FALLTHROUGH*/
+      case 11:
+      case 10:
+      case 9:
+      case 8:
+      case 7:
+      case 6:
+        hval += asso_values[(unsigned char)str[5]];
+      /*FALLTHROUGH*/
+      case 5:
+      case 4:
+      case 3:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+        hval += asso_values[(unsigned char)str[1]];
+      /*FALLTHROUGH*/
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval + asso_values[(unsigned char)str[len - 1]];
+#endif /* USE_UNICODE_PROPERTIES */
+}
+
+struct uniname2ctype_pool_t
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    char uniname2ctype_pool_str7[sizeof("print")];
+    char uniname2ctype_pool_str8[sizeof("punct")];
+    char uniname2ctype_pool_str9[sizeof("alpha")];
+    char uniname2ctype_pool_str10[sizeof("alnum")];
+    char uniname2ctype_pool_str11[sizeof("xdigit")];
+    char uniname2ctype_pool_str12[sizeof("newline")];
+    char uniname2ctype_pool_str13[sizeof("upper")];
+    char uniname2ctype_pool_str14[sizeof("ascii")];
+    char uniname2ctype_pool_str15[sizeof("cntrl")];
+    char uniname2ctype_pool_str16[sizeof("space")];
+    char uniname2ctype_pool_str17[sizeof("word")];
+    char uniname2ctype_pool_str18[sizeof("lower")];
+    char uniname2ctype_pool_str19[sizeof("graph")];
+    char uniname2ctype_pool_str20[sizeof("digit")];
+    char uniname2ctype_pool_str21[sizeof("blank")];
+#else /* USE_UNICODE_PROPERTIES */
+    char uniname2ctype_pool_str3[sizeof("c")];
+    char uniname2ctype_pool_str5[sizeof("cc")];
+    char uniname2ctype_pool_str7[sizeof("co")];
+    char uniname2ctype_pool_str9[sizeof("l")];
+    char uniname2ctype_pool_str10[sizeof("lo")];
+    char uniname2ctype_pool_str12[sizeof("no")];
+    char uniname2ctype_pool_str13[sizeof("n")];
+    char uniname2ctype_pool_str14[sizeof("ll")];
+    char uniname2ctype_pool_str15[sizeof("cn")];
+    char uniname2ctype_pool_str16[sizeof("nl")];
+    char uniname2ctype_pool_str18[sizeof("lao")];
+    char uniname2ctype_pool_str19[sizeof("laoo")];
+    char uniname2ctype_pool_str20[sizeof("zl")];
+    char uniname2ctype_pool_str21[sizeof("z")];
+    char uniname2ctype_pool_str22[sizeof("control")];
+    char uniname2ctype_pool_str24[sizeof("qaac")];
+    char uniname2ctype_pool_str25[sizeof("ci")];
+    char uniname2ctype_pool_str28[sizeof("lana")];
+    char uniname2ctype_pool_str33[sizeof("oalpha")];
+    char uniname2ctype_pool_str34[sizeof("qaai")];
+    char uniname2ctype_pool_str40[sizeof("arabic")];
+    char uniname2ctype_pool_str41[sizeof("cari")];
+    char uniname2ctype_pool_str43[sizeof("oriya")];
+    char uniname2ctype_pool_str44[sizeof("carian")];
+    char uniname2ctype_pool_str46[sizeof("cntrl")];
+    char uniname2ctype_pool_str49[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str50[sizeof("olower")];
+    char uniname2ctype_pool_str51[sizeof("latn")];
+    char uniname2ctype_pool_str52[sizeof("latin")];
+    char uniname2ctype_pool_str56[sizeof("ital")];
+    char uniname2ctype_pool_str65[sizeof("hano")];
+    char uniname2ctype_pool_str66[sizeof("lt")];
+    char uniname2ctype_pool_str68[sizeof("han")];
+    char uniname2ctype_pool_str70[sizeof("hanunoo")];
+    char uniname2ctype_pool_str71[sizeof("canadianaboriginal")];
+    char uniname2ctype_pool_str73[sizeof("hangul")];
+    char uniname2ctype_pool_str74[sizeof("hani")];
+    char uniname2ctype_pool_str76[sizeof("nchar")];
+    char uniname2ctype_pool_str77[sizeof("zinh")];
+    char uniname2ctype_pool_str83[sizeof("tale")];
+    char uniname2ctype_pool_str85[sizeof("loe")];
+    char uniname2ctype_pool_str86[sizeof("hira")];
+    char uniname2ctype_pool_str91[sizeof("taile")];
+    char uniname2ctype_pool_str92[sizeof("lineseparator")];
+    char uniname2ctype_pool_str94[sizeof("thaa")];
+    char uniname2ctype_pool_str97[sizeof("hiragana")];
+    char uniname2ctype_pool_str98[sizeof("thai")];
+    char uniname2ctype_pool_str100[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str101[sizeof("other")];
+    char uniname2ctype_pool_str103[sizeof("thaana")];
+    char uniname2ctype_pool_str107[sizeof("cher")];
+    char uniname2ctype_pool_str111[sizeof("otherletter")];
+    char uniname2ctype_pool_str113[sizeof("othernumber")];
+    char uniname2ctype_pool_str114[sizeof("letter")];
+    char uniname2ctype_pool_str116[sizeof("sc")];
+    char uniname2ctype_pool_str118[sizeof("so")];
+    char uniname2ctype_pool_str123[sizeof("taiviet")];
+    char uniname2ctype_pool_str128[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str129[sizeof("ethi")];
+    char uniname2ctype_pool_str130[sizeof("cans")];
+    char uniname2ctype_pool_str135[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str136[sizeof("ascii")];
+    char uniname2ctype_pool_str138[sizeof("letternumber")];
+    char uniname2ctype_pool_str139[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str141[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str144[sizeof("idc")];
+    char uniname2ctype_pool_str146[sizeof("oidc")];
+    char uniname2ctype_pool_str147[sizeof("sinhala")];
+    char uniname2ctype_pool_str148[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str151[sizeof("olditalic")];
+    char uniname2ctype_pool_str152[sizeof("di")];
+    char uniname2ctype_pool_str153[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str155[sizeof("odi")];
+    char uniname2ctype_pool_str156[sizeof("dia")];
+    char uniname2ctype_pool_str161[sizeof("otheridstart")];
+    char uniname2ctype_pool_str162[sizeof("oldturkic")];
+    char uniname2ctype_pool_str167[sizeof("diacritic")];
+    char uniname2ctype_pool_str168[sizeof("oldpersian")];
+    char uniname2ctype_pool_str171[sizeof("radical")];
+    char uniname2ctype_pool_str179[sizeof("sinh")];
+    char uniname2ctype_pool_str183[sizeof("ideo")];
+    char uniname2ctype_pool_str185[sizeof("shavian")];
+    char uniname2ctype_pool_str186[sizeof("format")];
+    char uniname2ctype_pool_str192[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str196[sizeof("vai")];
+    char uniname2ctype_pool_str197[sizeof("vaii")];
+    char uniname2ctype_pool_str202[sizeof("tifinagh")];
+    char uniname2ctype_pool_str203[sizeof("cf")];
+    char uniname2ctype_pool_str205[sizeof("othersymbol")];
+    char uniname2ctype_pool_str207[sizeof("ideographic")];
+    char uniname2ctype_pool_str211[sizeof("inherited")];
+    char uniname2ctype_pool_str212[sizeof("glagolitic")];
+    char uniname2ctype_pool_str218[sizeof("idcontinue")];
+    char uniname2ctype_pool_str220[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str224[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str225[sizeof("s")];
+    char uniname2ctype_pool_str226[sizeof("gothic")];
+    char uniname2ctype_pool_str227[sizeof("cs")];
+    char uniname2ctype_pool_str229[sizeof("avestan")];
+    char uniname2ctype_pool_str235[sizeof("tavt")];
+    char uniname2ctype_pool_str236[sizeof("zs")];
+    char uniname2ctype_pool_str243[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str244[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str245[sizeof("joinc")];
+    char uniname2ctype_pool_str248[sizeof("geor")];
+    char uniname2ctype_pool_str249[sizeof("hang")];
+    char uniname2ctype_pool_str251[sizeof("georgian")];
+    char uniname2ctype_pool_str253[sizeof("cased")];
+    char uniname2ctype_pool_str256[sizeof("joincontrol")];
+    char uniname2ctype_pool_str257[sizeof("oids")];
+    char uniname2ctype_pool_str260[sizeof("variationselector")];
+    char uniname2ctype_pool_str262[sizeof("graph")];
+    char uniname2ctype_pool_str263[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str264[sizeof("nd")];
+    char uniname2ctype_pool_str268[sizeof("goth")];
+    char uniname2ctype_pool_str269[sizeof("pc")];
+    char uniname2ctype_pool_str271[sizeof("po")];
+    char uniname2ctype_pool_str272[sizeof("ogrext")];
+    char uniname2ctype_pool_str276[sizeof("coptic")];
+    char uniname2ctype_pool_str277[sizeof("grext")];
+    char uniname2ctype_pool_str282[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str285[sizeof("idst")];
+    char uniname2ctype_pool_str288[sizeof("alpha")];
+    char uniname2ctype_pool_str289[sizeof("pi")];
+    char uniname2ctype_pool_str292[sizeof("dsrt")];
+    char uniname2ctype_pool_str297[sizeof("dash")];
+    char uniname2ctype_pool_str298[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str302[sizeof("copt")];
+    char uniname2ctype_pool_str306[sizeof("idstart")];
+    char uniname2ctype_pool_str307[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str309[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str312[sizeof("lepc")];
+    char uniname2ctype_pool_str317[sizeof("avst")];
+    char uniname2ctype_pool_str318[sizeof("cprt")];
+    char uniname2ctype_pool_str319[sizeof("runic")];
+    char uniname2ctype_pool_str320[sizeof("patsyn")];
+    char uniname2ctype_pool_str321[sizeof("mc")];
+    char uniname2ctype_pool_str326[sizeof("tfng")];
+    char uniname2ctype_pool_str327[sizeof("lepcha")];
+    char uniname2ctype_pool_str328[sizeof("prti")];
+    char uniname2ctype_pool_str329[sizeof("print")];
+    char uniname2ctype_pool_str330[sizeof("phli")];
+    char uniname2ctype_pool_str331[sizeof("mn")];
+    char uniname2ctype_pool_str332[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str334[sizeof("talu")];
+    char uniname2ctype_pool_str335[sizeof("runr")];
+    char uniname2ctype_pool_str337[sizeof("graphemebase")];
+    char uniname2ctype_pool_str338[sizeof("common")];
+    char uniname2ctype_pool_str339[sizeof("alnum")];
+    char uniname2ctype_pool_str340[sizeof("phoenician")];
+    char uniname2ctype_pool_str341[sizeof("deva")];
+    char uniname2ctype_pool_str342[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str343[sizeof("pe")];
+    char uniname2ctype_pool_str344[sizeof("mongolian")];
+    char uniname2ctype_pool_str352[sizeof("armn")];
+    char uniname2ctype_pool_str353[sizeof("deseret")];
+    char uniname2ctype_pool_str354[sizeof("softdotted")];
+    char uniname2ctype_pool_str357[sizeof("armi")];
+    char uniname2ctype_pool_str358[sizeof("devanagari")];
+    char uniname2ctype_pool_str360[sizeof("digit")];
+    char uniname2ctype_pool_str361[sizeof("caseignorable")];
+    char uniname2ctype_pool_str362[sizeof("taml")];
+    char uniname2ctype_pool_str363[sizeof("tamil")];
+    char uniname2ctype_pool_str365[sizeof("telu")];
+    char uniname2ctype_pool_str366[sizeof("ids")];
+    char uniname2ctype_pool_str367[sizeof("armenian")];
+    char uniname2ctype_pool_str370[sizeof("sd")];
+    char uniname2ctype_pool_str372[sizeof("privateuse")];
+    char uniname2ctype_pool_str373[sizeof("assigned")];
+    char uniname2ctype_pool_str375[sizeof("cham")];
+    char uniname2ctype_pool_str377[sizeof("omath")];
+    char uniname2ctype_pool_str378[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str379[sizeof("taitham")];
+    char uniname2ctype_pool_str381[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str387[sizeof("glag")];
+    char uniname2ctype_pool_str388[sizeof("ethiopic")];
+    char uniname2ctype_pool_str390[sizeof("vs")];
+    char uniname2ctype_pool_str395[sizeof("me")];
+    char uniname2ctype_pool_str396[sizeof("cwl")];
+    char uniname2ctype_pool_str400[sizeof("mtei")];
+    char uniname2ctype_pool_str404[sizeof("math")];
+    char uniname2ctype_pool_str407[sizeof("term")];
+    char uniname2ctype_pool_str408[sizeof("java")];
+    char uniname2ctype_pool_str410[sizeof("tglg")];
+    char uniname2ctype_pool_str413[sizeof("lower")];
+    char uniname2ctype_pool_str414[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str417[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str418[sizeof("tagalog")];
+    char uniname2ctype_pool_str419[sizeof("patws")];
+    char uniname2ctype_pool_str420[sizeof("lisu")];
+    char uniname2ctype_pool_str426[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str427[sizeof("space")];
+    char uniname2ctype_pool_str429[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str430[sizeof("saur")];
+    char uniname2ctype_pool_str435[sizeof("uideo")];
+    char uniname2ctype_pool_str438[sizeof("lowercase")];
+    char uniname2ctype_pool_str440[sizeof("rjng")];
+    char uniname2ctype_pool_str442[sizeof("osma")];
+    char uniname2ctype_pool_str444[sizeof("linb")];
+    char uniname2ctype_pool_str445[sizeof("bali")];
+    char uniname2ctype_pool_str448[sizeof("cwt")];
+    char uniname2ctype_pool_str449[sizeof("separator")];
+    char uniname2ctype_pool_str450[sizeof("othermath")];
+    char uniname2ctype_pool_str451[sizeof("unassigned")];
+    char uniname2ctype_pool_str454[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str455[sizeof("arab")];
+    char uniname2ctype_pool_str458[sizeof("samr")];
+    char uniname2ctype_pool_str459[sizeof("brai")];
+    char uniname2ctype_pool_str460[sizeof("sundanese")];
+    char uniname2ctype_pool_str462[sizeof("samaritan")];
+    char uniname2ctype_pool_str463[sizeof("ahex")];
+    char uniname2ctype_pool_str465[sizeof("linearb")];
+    char uniname2ctype_pool_str467[sizeof("pf")];
+    char uniname2ctype_pool_str469[sizeof("ext")];
+    char uniname2ctype_pool_str474[sizeof("olck")];
+    char uniname2ctype_pool_str476[sizeof("nko")];
+    char uniname2ctype_pool_str477[sizeof("nkoo")];
+    char uniname2ctype_pool_str479[sizeof("newline")];
+    char uniname2ctype_pool_str480[sizeof("tibetan")];
+    char uniname2ctype_pool_str481[sizeof("javanese")];
+    char uniname2ctype_pool_str485[sizeof("bengali")];
+    char uniname2ctype_pool_str486[sizeof("newtailue")];
+    char uniname2ctype_pool_str487[sizeof("kana")];
+    char uniname2ctype_pool_str488[sizeof("olchiki")];
+    char uniname2ctype_pool_str489[sizeof("kali")];
+    char uniname2ctype_pool_str490[sizeof("cwcf")];
+    char uniname2ctype_pool_str491[sizeof("ps")];
+    char uniname2ctype_pool_str493[sizeof("braille")];
+    char uniname2ctype_pool_str494[sizeof("tibt")];
+    char uniname2ctype_pool_str502[sizeof("sterm")];
+    char uniname2ctype_pool_str504[sizeof("ugar")];
+    char uniname2ctype_pool_str505[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str508[sizeof("phag")];
+    char uniname2ctype_pool_str509[sizeof("kaithi")];
+    char uniname2ctype_pool_str512[sizeof("xidc")];
+    char uniname2ctype_pool_str514[sizeof("balinese")];
+    char uniname2ctype_pool_str515[sizeof("mong")];
+    char uniname2ctype_pool_str516[sizeof("ogam")];
+    char uniname2ctype_pool_str520[sizeof("modifierletter")];
+    char uniname2ctype_pool_str521[sizeof("ugaritic")];
+    char uniname2ctype_pool_str522[sizeof("katakana")];
+    char uniname2ctype_pool_str523[sizeof("pd")];
+    char uniname2ctype_pool_str525[sizeof("hebr")];
+    char uniname2ctype_pool_str531[sizeof("p")];
+    char uniname2ctype_pool_str533[sizeof("orkh")];
+    char uniname2ctype_pool_str536[sizeof("word")];
+    char uniname2ctype_pool_str537[sizeof("saurashtra")];
+    char uniname2ctype_pool_str538[sizeof("khar")];
+    char uniname2ctype_pool_str539[sizeof("sund")];
+    char uniname2ctype_pool_str542[sizeof("zp")];
+    char uniname2ctype_pool_str548[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str552[sizeof("xidstart")];
+    char uniname2ctype_pool_str553[sizeof("shaw")];
+    char uniname2ctype_pool_str554[sizeof("kthi")];
+    char uniname2ctype_pool_str556[sizeof("ogham")];
+    char uniname2ctype_pool_str558[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str559[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str560[sizeof("sarb")];
+    char uniname2ctype_pool_str562[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str564[sizeof("bidic")];
+    char uniname2ctype_pool_str570[sizeof("deprecated")];
+    char uniname2ctype_pool_str573[sizeof("xdigit")];
+    char uniname2ctype_pool_str575[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str584[sizeof("lu")];
+    char uniname2ctype_pool_str587[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str590[sizeof("extender")];
+    char uniname2ctype_pool_str593[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str594[sizeof("cherokee")];
+    char uniname2ctype_pool_str595[sizeof("punct")];
+    char uniname2ctype_pool_str597[sizeof("phagspa")];
+    char uniname2ctype_pool_str598[sizeof("oupper")];
+    char uniname2ctype_pool_str599[sizeof("lyci")];
+    char uniname2ctype_pool_str601[sizeof("whitespace")];
+    char uniname2ctype_pool_str602[sizeof("lycian")];
+    char uniname2ctype_pool_str603[sizeof("yi")];
+    char uniname2ctype_pool_str606[sizeof("cyrl")];
+    char uniname2ctype_pool_str608[sizeof("knda")];
+    char uniname2ctype_pool_str610[sizeof("orya")];
+    char uniname2ctype_pool_str611[sizeof("cyrillic")];
+    char uniname2ctype_pool_str616[sizeof("yiii")];
+    char uniname2ctype_pool_str618[sizeof("kannada")];
+    char uniname2ctype_pool_str623[sizeof("xids")];
+    char uniname2ctype_pool_str626[sizeof("limbu")];
+    char uniname2ctype_pool_str635[sizeof("m")];
+    char uniname2ctype_pool_str638[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str639[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str640[sizeof("lm")];
+    char uniname2ctype_pool_str645[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str646[sizeof("tagb")];
+    char uniname2ctype_pool_str649[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str651[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str652[sizeof("surrogate")];
+    char uniname2ctype_pool_str653[sizeof("beng")];
+    char uniname2ctype_pool_str654[sizeof("number")];
+    char uniname2ctype_pool_str656[sizeof("telugu")];
+    char uniname2ctype_pool_str660[sizeof("rejang")];
+    char uniname2ctype_pool_str661[sizeof("malayalam")];
+    char uniname2ctype_pool_str674[sizeof("idsb")];
+    char uniname2ctype_pool_str676[sizeof("hexdigit")];
+    char uniname2ctype_pool_str677[sizeof("xpeo")];
+    char uniname2ctype_pool_str689[sizeof("phnx")];
+    char uniname2ctype_pool_str692[sizeof("bopo")];
+    char uniname2ctype_pool_str698[sizeof("bopomofo")];
+    char uniname2ctype_pool_str699[sizeof("dep")];
+    char uniname2ctype_pool_str701[sizeof("sylo")];
+    char uniname2ctype_pool_str705[sizeof("grbase")];
+    char uniname2ctype_pool_str706[sizeof("alphabetic")];
+    char uniname2ctype_pool_str707[sizeof("cwcm")];
+    char uniname2ctype_pool_str708[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str709[sizeof("grek")];
+    char uniname2ctype_pool_str710[sizeof("greek")];
+    char uniname2ctype_pool_str714[sizeof("syrc")];
+    char uniname2ctype_pool_str717[sizeof("syriac")];
+    char uniname2ctype_pool_str722[sizeof("cuneiform")];
+    char uniname2ctype_pool_str723[sizeof("gujr")];
+    char uniname2ctype_pool_str726[sizeof("lydi")];
+    char uniname2ctype_pool_str727[sizeof("gujarati")];
+    char uniname2ctype_pool_str728[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str729[sizeof("lydian")];
+    char uniname2ctype_pool_str748[sizeof("sm")];
+    char uniname2ctype_pool_str751[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str755[sizeof("limb")];
+    char uniname2ctype_pool_str758[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str786[sizeof("guru")];
+    char uniname2ctype_pool_str797[sizeof("qmark")];
+    char uniname2ctype_pool_str809[sizeof("mark")];
+    char uniname2ctype_pool_str820[sizeof("quotationmark")];
+    char uniname2ctype_pool_str823[sizeof("hex")];
+    char uniname2ctype_pool_str842[sizeof("upper")];
+    char uniname2ctype_pool_str843[sizeof("wspace")];
+    char uniname2ctype_pool_str848[sizeof("khmr")];
+    char uniname2ctype_pool_str849[sizeof("khmer")];
+    char uniname2ctype_pool_str863[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str864[sizeof("spacingmark")];
+    char uniname2ctype_pool_str866[sizeof("punctuation")];
+    char uniname2ctype_pool_str867[sizeof("uppercase")];
+    char uniname2ctype_pool_str878[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str883[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str884[sizeof("cypriot")];
+    char uniname2ctype_pool_str886[sizeof("buhd")];
+    char uniname2ctype_pool_str887[sizeof("buhid")];
+    char uniname2ctype_pool_str895[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str898[sizeof("blank")];
+    char uniname2ctype_pool_str908[sizeof("hyphen")];
+    char uniname2ctype_pool_str909[sizeof("bugi")];
+    char uniname2ctype_pool_str935[sizeof("myanmar")];
+    char uniname2ctype_pool_str937[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str947[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str966[sizeof("cwu")];
+    char uniname2ctype_pool_str975[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str978[sizeof("buginese")];
+    char uniname2ctype_pool_str1022[sizeof("symbol")];
+    char uniname2ctype_pool_str1024[sizeof("osmanya")];
+    char uniname2ctype_pool_str1036[sizeof("bamu")];
+    char uniname2ctype_pool_str1040[sizeof("sk")];
+    char uniname2ctype_pool_str1065[sizeof("bamum")];
+    char uniname2ctype_pool_str1071[sizeof("kayahli")];
+    char uniname2ctype_pool_str1072[sizeof("egyp")];
+    char uniname2ctype_pool_str1140[sizeof("grlink")];
+    char uniname2ctype_pool_str1141[sizeof("xsux")];
+    char uniname2ctype_pool_str1174[sizeof("any")];
+    char uniname2ctype_pool_str1187[sizeof("graphemelink")];
+    char uniname2ctype_pool_str1221[sizeof("mlym")];
+    char uniname2ctype_pool_str1235[sizeof("mymr")];
+    char uniname2ctype_pool_str1277[sizeof("hebrew")];
+    char uniname2ctype_pool_str1542[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str1751[sizeof("zyyy")];
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    "print",
+    "punct",
+#else /* USE_UNICODE_PROPERTIES */
+    "c",
+    "cc",
+    "co",
+    "l",
+    "lo",
+    "no",
+    "n",
+    "ll",
+    "cn",
+    "nl",
+    "lao",
+    "laoo",
+    "zl",
+    "z",
+    "control",
+    "qaac",
+    "ci",
+    "lana",
+    "oalpha",
+    "qaai",
+    "arabic",
+    "cari",
+    "oriya",
+    "carian",
+    "cntrl",
+    "connectorpunctuation",
+    "olower",
+    "latn",
+    "latin",
+    "ital",
+    "hano",
+    "lt",
+    "han",
+    "hanunoo",
+    "canadianaboriginal",
+    "hangul",
+    "hani",
+    "nchar",
+    "zinh",
+    "tale",
+    "loe",
+    "hira",
+    "taile",
+    "lineseparator",
+    "thaa",
+    "hiragana",
+    "thai",
+    "initialpunctuation",
+    "other",
+    "thaana",
+    "cher",
+    "otherletter",
+    "othernumber",
+    "letter",
+    "sc",
+    "so",
+    "taiviet",
+    "noncharactercodepoint",
+    "ethi",
+    "cans",
+    "titlecaseletter",
+    "ascii",
+    "letternumber",
+    "otheralphabetic",
+    "otherlowercase",
+    "idc",
+    "oidc",
+    "sinhala",
+    "terminalpunctuation",
+    "olditalic",
+    "di",
+    "otheridcontinue",
+    "odi",
+    "dia",
+    "otheridstart",
+    "oldturkic",
+    "diacritic",
+    "oldpersian",
+    "radical",
+    "sinh",
+    "ideo",
+    "shavian",
+    "format",
+    "inscriptionalparthian",
+    "vai",
+    "vaii",
+    "tifinagh",
+    "cf",
+    "othersymbol",
+    "ideographic",
+    "inherited",
+    "glagolitic",
+    "idcontinue",
+    "asciihexdigit",
+    "inscriptionalpahlavi",
+    "s",
+    "gothic",
+    "cs",
+    "avestan",
+    "tavt",
+    "zs",
+    "decimalnumber",
+    "tagbanwa",
+    "joinc",
+    "geor",
+    "hang",
+    "georgian",
+    "cased",
+    "joincontrol",
+    "oids",
+    "variationselector",
+    "graph",
+    "changeswhenlowercased",
+    "nd",
+    "goth",
+    "pc",
+    "po",
+    "ogrext",
+    "coptic",
+    "grext",
+    "logicalorderexception",
+    "idst",
+#endif /* USE_UNICODE_PROPERTIES */
+    "alpha",
+#ifdef USE_UNICODE_PROPERTIES
+    "pi",
+    "dsrt",
+    "dash",
+    "otherdefaultignorablecodepoint",
+    "copt",
+    "idstart",
+    "closepunctuation",
+    "changeswhentitlecased",
+    "lepc",
+    "avst",
+    "cprt",
+    "runic",
+    "patsyn",
+    "mc",
+    "tfng",
+    "lepcha",
+    "prti",
+    "print",
+    "phli",
+    "mn",
+    "idsbinaryoperator",
+    "talu",
+    "runr",
+    "graphemebase",
+    "common",
+#endif /* USE_UNICODE_PROPERTIES */
+    "alnum",
+#ifndef USE_UNICODE_PROPERTIES
+    "xdigit",
+    "newline",
+    "upper",
+    "ascii",
+    "cntrl",
+#else /* USE_UNICODE_PROPERTIES */
+    "phoenician",
+    "deva",
+    "changeswhencasefolded",
+    "pe",
+    "mongolian",
+    "armn",
+    "deseret",
+    "softdotted",
+    "armi",
+    "devanagari",
+    "digit",
+    "caseignorable",
+    "taml",
+    "tamil",
+    "telu",
+    "ids",
+    "armenian",
+    "sd",
+    "privateuse",
+    "assigned",
+    "cham",
+    "omath",
+    "otherpunctuation",
+    "taitham",
+    "defaultignorablecodepoint",
+    "glag",
+    "ethiopic",
+    "vs",
+    "me",
+    "cwl",
+    "mtei",
+    "math",
+    "term",
+    "java",
+    "tglg",
+    "lower",
+    "patternwhitespace",
+    "finalpunctuation",
+    "tagalog",
+    "patws",
+    "lisu",
+    "otheruppercase",
+#endif /* USE_UNICODE_PROPERTIES */
+    "space",
+#ifdef USE_UNICODE_PROPERTIES
+    "graphemeextend",
+    "saur",
+    "uideo",
+    "lowercase",
+    "rjng",
+    "osma",
+    "linb",
+    "bali",
+    "cwt",
+    "separator",
+    "othermath",
+    "unassigned",
+    "lowercaseletter",
+    "arab",
+    "samr",
+    "brai",
+    "sundanese",
+    "samaritan",
+    "ahex",
+    "linearb",
+    "pf",
+    "ext",
+    "olck",
+    "nko",
+    "nkoo",
+    "newline",
+    "tibetan",
+    "javanese",
+    "bengali",
+    "newtailue",
+    "kana",
+    "olchiki",
+    "kali",
+    "cwcf",
+    "ps",
+    "braille",
+    "tibt",
+    "sterm",
+    "ugar",
+    "nonspacingmark",
+    "phag",
+    "kaithi",
+    "xidc",
+    "balinese",
+    "mong",
+    "ogam",
+    "modifierletter",
+    "ugaritic",
+    "katakana",
+    "pd",
+    "hebr",
+    "p",
+    "orkh",
+#endif /* USE_UNICODE_PROPERTIES */
+    "word",
+#ifndef USE_UNICODE_PROPERTIES
+    "lower",
+    "graph",
+    "digit",
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "saurashtra",
+    "khar",
+    "sund",
+    "zp",
+    "changeswhenuppercased",
+    "xidstart",
+    "shaw",
+    "kthi",
+    "ogham",
+    "spaceseparator",
+    "changeswhencasemapped",
+    "sarb",
+    "xidcontinue",
+    "bidic",
+    "deprecated",
+    "xdigit",
+    "bidicontrol",
+    "lu",
+    "dashpunctuation",
+    "extender",
+    "idstrinaryoperator",
+    "cherokee",
+    "punct",
+    "phagspa",
+    "oupper",
+    "lyci",
+    "whitespace",
+    "lycian",
+    "yi",
+    "cyrl",
+    "knda",
+    "orya",
+    "cyrillic",
+    "yiii",
+    "kannada",
+    "xids",
+    "limbu",
+    "m",
+    "unifiedideograph",
+    "paragraphseparator",
+    "lm",
+    "openpunctuation",
+    "tagb",
+    "kharoshthi",
+    "enclosingmark",
+    "surrogate",
+    "beng",
+    "number",
+    "telugu",
+    "rejang",
+    "malayalam",
+    "idsb",
+    "hexdigit",
+    "xpeo",
+    "phnx",
+    "bopo",
+    "bopomofo",
+    "dep",
+    "sylo",
+    "grbase",
+    "alphabetic",
+    "cwcm",
+    "patternsyntax",
+    "grek",
+    "greek",
+    "syrc",
+    "syriac",
+    "cuneiform",
+    "gujr",
+    "lydi",
+    "gujarati",
+    "sylotinagri",
+    "lydian",
+    "sm",
+    "currencysymbol",
+    "limb",
+    "othergraphemeextend",
+    "guru",
+    "qmark",
+    "mark",
+    "quotationmark",
+    "hex",
+    "upper",
+    "wspace",
+    "khmr",
+    "khmer",
+    "oldsoutharabian",
+    "spacingmark",
+    "punctuation",
+    "uppercase",
+    "meeteimayek",
+    "uppercaseletter",
+    "cypriot",
+    "buhd",
+    "buhid",
+    "modifiersymbol",
+    "blank",
+    "hyphen",
+    "bugi",
+    "myanmar",
+    "imperialaramaic",
+    "mathsymbol",
+    "cwu",
+    "gurmukhi",
+    "buginese",
+    "symbol",
+    "osmanya",
+    "bamu",
+    "sk",
+    "bamum",
+    "kayahli",
+    "egyp",
+    "grlink",
+    "xsux",
+    "any",
+    "graphemelink",
+    "mlym",
+    "mymr",
+    "hebrew",
+    "egyptianhieroglyphs",
+    "zyyy"
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct uniname2ctype_struct *
+uniname2ctype_p (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const struct uniname2ctype_struct wordlist[] =
+    {
+#ifdef USE_UNICODE_PROPERTIES
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3,                                        17},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5,                                       18},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                       21},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                        23},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                       26},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                       36},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                        33},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                       24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                       20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                       35},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                      93},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     93},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       51},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                        50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22,                                  18},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24,                                    127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25,                                       59},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28,                                    150},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33,                                  175},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                                    113},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40,                                   79},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41,                                    147},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43,                                    86},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44,                                  147},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                     3},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49,                     38},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50,                                  179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                     74},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52,                                    74},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                    110},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65,                                    115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66,                                       27},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68,                                     108},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                 115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                      100},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                   97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                    108},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                   181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77,                                    113},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83,                                    119},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85,                                     190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86,                                    105},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                                   119},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                            51},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94,                                     81},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97,                                105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                     92},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                       42},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                                    17},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                   81},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107,                                     99},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111,                              26},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113,                              36},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                                   23},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                                       46},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118,                                       49},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                 151},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                   181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129,                                     98},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130,                                    100},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                          27},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                    14},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138,                             35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139,                         175},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                          179},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                      66},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146,                                    192},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                                  91},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                     171},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                               110},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                       69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                         192},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155,                                     187},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156,                                     177},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                            191},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162,                               163},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167,                               177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str168,                              132},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                                 185},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179,                                     91},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                                    176},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185,                                 122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186,                                   19},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192,                   161},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str196,                                     142},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                                    142},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                130},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                       19},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205,                              49},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                             176},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str211,                               113},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                              129},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                               66},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                           174},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224,                    162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225,                                        45},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226,                                  111},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                       22},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229,                                 152},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235,                                    151},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236,                                       53},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                            34},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244,                                117},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                   167},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248,                                     96},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str249,                                     97},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                                 96},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253,                                    58},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                             167},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257,                                    191},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260,                       194},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                    60},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264,                                       34},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                                    111},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                       38},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                       43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272,                                  182},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276,                                  127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str277,                                    70},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str282,                   190},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                    184},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str289,                                       42},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    112},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297,                                    168},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298,          187},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                    127},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306,                                  65},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                         40},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                    62},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str312,                                    140},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                    152},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318,                                    124},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319,                                   102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                                  196},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                       30},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326,                                    130},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                                  140},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328,                                    161},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                                     7},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                    162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331,                                       32},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332,                       183},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334,                                    128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                    102},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                             71},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str338,                                   73},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339,                                    13},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                              136},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                     82},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                    63},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                                       40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                               104},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352,                                     77},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                                 112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354,                              189},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357,                                    159},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,                               82},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                                     4},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                            59},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                     87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                    87},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365,                                     88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                      65},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                 77},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370,                                      189},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                               21},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373,                                 16},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                    149},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str377,                                   172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378,                         43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                                 150},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381,                69},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387,                                    129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                 98},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                      194},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                                       31},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396,                                      60},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400,                                    158},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str404,                                     54},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407,                                    171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                                    157},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410,                                    114},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                                     6},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                       195},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str417,                         41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418,                                 114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                   195},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420,                                    155},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426,                          180},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                     9},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429,                           70},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                    143},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str435,                                   186},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438,                                56},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str440,                                    145},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    123},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str444,                                    120},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                    134},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str448,                                      62},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449,                                50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450,                               172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451,                               20},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454,                          24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455,                                     79},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                    154},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459,                                    125},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                               139},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                               154},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463,                                    174},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                                 120},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467,                                       41},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,                                     178},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    141},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476,                                     138},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477,                                    138},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479,                                   0},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                                  94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481,                                157},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,                                  83},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486,                               128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                                    106},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488,                                 141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    144},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490,                                     63},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491,                                       44},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                                 125},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494,                                     94},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                   193},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                                    121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str505,                           32},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                    137},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                  164},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512,                                     68},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514,                                134},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515,                                    104},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    101},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                           25},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                                121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                                106},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                       39},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str525,                                     78},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531,                                        37},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533,                                    163},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                                     12},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537,                              143},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                    133},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str539,                                    139},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542,                                       52},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548,                    61},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str552,                                 67},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553,                                    122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,                                    164},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556,                                   101},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558,                           53},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str559,                    64},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560,                                    160},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                              68},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564,                                   166},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570,                              188},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                   11},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575,                             166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                       28},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                          39},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str590,                                178},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                      184},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                                 99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str595,                                     8},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                                 137},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                  180},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                    146},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                              165},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602,                                  146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603,                                      109},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str606,                                     76},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                     89},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str610,                                     86},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611,                                 76},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616,                                    109},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                                  89},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                     67},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                   118},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str635,                                        29},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638,                        186},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639,                       52},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                       25},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str645,                          44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                    117},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649,                              133},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651,                            31},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str652,                                22},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653,                                     83},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654,                                   33},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                   88},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                  145},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str661,                                90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str674,                                    183},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676,                                173},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677,                                    132},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str689,                                    136},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    107},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698,                                107},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699,                                     188},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                    131},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                   71},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706,                               55},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707,                                     64},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                           196},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709,                                     75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                                    75},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str714,                                     80},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str717,                                   80},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                               135},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str723,                                     85},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str726,                                    148},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                                 85},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728,                             131},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                                  148},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748,                                       48},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str751,                           46},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str755,                                    118},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758,                     182},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str786,                                     84},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                                   170},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str809,                                     29},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                           170},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823,                                     173},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str842,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str843,                                  165},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str848,                                    103},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849,                                   103},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str863,                         160},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864,                              30},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,                              37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867,                                57},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878,                             158},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str883,                          28},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884,                                 124},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str886,                                    116},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str887,                                   116},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str895,                           47},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                                     2},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str908,                                  169},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909,                                    126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str935,                                  95},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937,                         159},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                               48},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966,                                      61},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str975,                                 84},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str978,                                126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#endif /* USE_UNICODE_PROPERTIES */
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#ifndef USE_UNICODE_PROPERTIES
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                     7},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                     8},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                    13},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                   11},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                   0},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     3},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     9},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     12},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     6},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                     4},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                     2}
+#else /* USE_UNICODE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1022,                                   45},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1024,                                 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036,                                    156},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040,                                       47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                                   156},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071,                                 144},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                    153},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                                   72},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141,                                    135},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1174,                                      15},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187,                             72},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1221,                                     90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235,                                     95},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1277,                                   78},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1542,                     153},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1751,                                     73}
+#endif /* USE_UNICODE_PROPERTIES */
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = uniname2ctype_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + uniname2ctype_pool;
+
+              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+
+static int
+uniname2ctype(const UChar *name, unsigned int len)
+{
+  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
+  if (p) return p->ctype;
+  return -1;
+}
diff --git a/enc/unicode/name2ctype.h.blt b/enc/unicode/name2ctype.h.blt
new file mode 100644
index 0000000000..2248b8f7cb
--- /dev/null
+++ b/enc/unicode/name2ctype.h.blt
@@ -0,0 +1,17985 @@
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p  */
+#ifndef USE_UNICODE_PROPERTIES
+/* Computed positions: -k'1,3' */
+#else /* USE_UNICODE_PROPERTIES */
+/* Computed positions: -k'1-3,6,12,16,$' */
+#endif /* USE_UNICODE_PROPERTIES */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+
+
+#ifdef USE_UNICODE_PROPERTIES
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	485,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	20,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xd800, 0xf8ff,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xf0000, 0xffffd,
+	0x100000, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+static const OnigCodePoint CR_Cc[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cc */
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	485,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0526, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0604, 0x0605,
+	0x061c, 0x061d,
+	0x0620, 0x0620,
+	0x065f, 0x065f,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x08ff,
+	0x093a, 0x093b,
+	0x094f, 0x094f,
+	0x0956, 0x0957,
+	0x0973, 0x0978,
+	0x0980, 0x0980,
+	0x0984, 0x0984,
+	0x098d, 0x098e,
+	0x0991, 0x0992,
+	0x09a9, 0x09a9,
+	0x09b1, 0x09b1,
+	0x09b3, 0x09b5,
+	0x09ba, 0x09bb,
+	0x09c5, 0x09c6,
+	0x09c9, 0x09ca,
+	0x09cf, 0x09d6,
+	0x09d8, 0x09db,
+	0x09de, 0x09de,
+	0x09e4, 0x09e5,
+	0x09fc, 0x0a00,
+	0x0a04, 0x0a04,
+	0x0a0b, 0x0a0e,
+	0x0a11, 0x0a12,
+	0x0a29, 0x0a29,
+	0x0a31, 0x0a31,
+	0x0a34, 0x0a34,
+	0x0a37, 0x0a37,
+	0x0a3a, 0x0a3b,
+	0x0a3d, 0x0a3d,
+	0x0a43, 0x0a46,
+	0x0a49, 0x0a4a,
+	0x0a4e, 0x0a50,
+	0x0a52, 0x0a58,
+	0x0a5d, 0x0a5d,
+	0x0a5f, 0x0a65,
+	0x0a76, 0x0a80,
+	0x0a84, 0x0a84,
+	0x0a8e, 0x0a8e,
+	0x0a92, 0x0a92,
+	0x0aa9, 0x0aa9,
+	0x0ab1, 0x0ab1,
+	0x0ab4, 0x0ab4,
+	0x0aba, 0x0abb,
+	0x0ac6, 0x0ac6,
+	0x0aca, 0x0aca,
+	0x0ace, 0x0acf,
+	0x0ad1, 0x0adf,
+	0x0ae4, 0x0ae5,
+	0x0af0, 0x0af0,
+	0x0af2, 0x0b00,
+	0x0b04, 0x0b04,
+	0x0b0d, 0x0b0e,
+	0x0b11, 0x0b12,
+	0x0b29, 0x0b29,
+	0x0b31, 0x0b31,
+	0x0b34, 0x0b34,
+	0x0b3a, 0x0b3b,
+	0x0b45, 0x0b46,
+	0x0b49, 0x0b4a,
+	0x0b4e, 0x0b55,
+	0x0b58, 0x0b5b,
+	0x0b5e, 0x0b5e,
+	0x0b64, 0x0b65,
+	0x0b72, 0x0b81,
+	0x0b84, 0x0b84,
+	0x0b8b, 0x0b8d,
+	0x0b91, 0x0b91,
+	0x0b96, 0x0b98,
+	0x0b9b, 0x0b9b,
+	0x0b9d, 0x0b9d,
+	0x0ba0, 0x0ba2,
+	0x0ba5, 0x0ba7,
+	0x0bab, 0x0bad,
+	0x0bba, 0x0bbd,
+	0x0bc3, 0x0bc5,
+	0x0bc9, 0x0bc9,
+	0x0bce, 0x0bcf,
+	0x0bd1, 0x0bd6,
+	0x0bd8, 0x0be5,
+	0x0bfb, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c34, 0x0c34,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5a, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c77,
+	0x0c80, 0x0c81,
+	0x0c84, 0x0c84,
+	0x0c8d, 0x0c8d,
+	0x0c91, 0x0c91,
+	0x0ca9, 0x0ca9,
+	0x0cb4, 0x0cb4,
+	0x0cba, 0x0cbb,
+	0x0cc5, 0x0cc5,
+	0x0cc9, 0x0cc9,
+	0x0cce, 0x0cd4,
+	0x0cd7, 0x0cdd,
+	0x0cdf, 0x0cdf,
+	0x0ce4, 0x0ce5,
+	0x0cf0, 0x0cf0,
+	0x0cf3, 0x0d01,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d29, 0x0d29,
+	0x0d3a, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4e, 0x0d56,
+	0x0d58, 0x0d5f,
+	0x0d64, 0x0d65,
+	0x0d76, 0x0d78,
+	0x0d80, 0x0d81,
+	0x0d84, 0x0d84,
+	0x0d97, 0x0d99,
+	0x0db2, 0x0db2,
+	0x0dbc, 0x0dbc,
+	0x0dbe, 0x0dbf,
+	0x0dc7, 0x0dc9,
+	0x0dcb, 0x0dce,
+	0x0dd5, 0x0dd5,
+	0x0dd7, 0x0dd7,
+	0x0de0, 0x0df1,
+	0x0df5, 0x0e00,
+	0x0e3b, 0x0e3e,
+	0x0e5c, 0x0e80,
+	0x0e83, 0x0e83,
+	0x0e85, 0x0e86,
+	0x0e89, 0x0e89,
+	0x0e8b, 0x0e8c,
+	0x0e8e, 0x0e93,
+	0x0e98, 0x0e98,
+	0x0ea0, 0x0ea0,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	0x0ea8, 0x0ea9,
+	0x0eac, 0x0eac,
+	0x0eba, 0x0eba,
+	0x0ebe, 0x0ebf,
+	0x0ec5, 0x0ec5,
+	0x0ec7, 0x0ec7,
+	0x0ece, 0x0ecf,
+	0x0eda, 0x0edb,
+	0x0ede, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f8c, 0x0f8f,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fd9, 0x0fff,
+	0x10c6, 0x10cf,
+	0x10fd, 0x10ff,
+	0x1249, 0x1249,
+	0x124e, 0x124f,
+	0x1257, 0x1257,
+	0x1259, 0x1259,
+	0x125e, 0x125f,
+	0x1289, 0x1289,
+	0x128e, 0x128f,
+	0x12b1, 0x12b1,
+	0x12b6, 0x12b7,
+	0x12bf, 0x12bf,
+	0x12c1, 0x12c1,
+	0x12c6, 0x12c7,
+	0x12d7, 0x12d7,
+	0x1311, 0x1311,
+	0x1316, 0x1317,
+	0x135b, 0x135e,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f5, 0x13ff,
+	0x169d, 0x169f,
+	0x16f1, 0x16ff,
+	0x170d, 0x170d,
+	0x1715, 0x171f,
+	0x1737, 0x173f,
+	0x1754, 0x175f,
+	0x176d, 0x176d,
+	0x1771, 0x1771,
+	0x1774, 0x177f,
+	0x17de, 0x17df,
+	0x17ea, 0x17ef,
+	0x17fa, 0x17ff,
+	0x180f, 0x180f,
+	0x181a, 0x181f,
+	0x1878, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191d, 0x191f,
+	0x192c, 0x192f,
+	0x193c, 0x193f,
+	0x1941, 0x1943,
+	0x196e, 0x196f,
+	0x1975, 0x197f,
+	0x19ac, 0x19af,
+	0x19ca, 0x19cf,
+	0x19db, 0x19dd,
+	0x1a1c, 0x1a1d,
+	0x1a5f, 0x1a5f,
+	0x1a7d, 0x1a7e,
+	0x1a8a, 0x1a8f,
+	0x1a9a, 0x1a9f,
+	0x1aae, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bab, 0x1bad,
+	0x1bba, 0x1bff,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1ccf,
+	0x1cf3, 0x1cff,
+	0x1de7, 0x1dfc,
+	0x1f16, 0x1f17,
+	0x1f1e, 0x1f1f,
+	0x1f46, 0x1f47,
+	0x1f4e, 0x1f4f,
+	0x1f58, 0x1f58,
+	0x1f5a, 0x1f5a,
+	0x1f5c, 0x1f5c,
+	0x1f5e, 0x1f5e,
+	0x1f7e, 0x1f7f,
+	0x1fb5, 0x1fb5,
+	0x1fc5, 0x1fc5,
+	0x1fd4, 0x1fd5,
+	0x1fdc, 0x1fdc,
+	0x1ff0, 0x1ff1,
+	0x1ff5, 0x1ff5,
+	0x1fff, 0x1fff,
+	0x2065, 0x2069,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x2095, 0x209f,
+	0x20b9, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23e9, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x26ce, 0x26ce,
+	0x26e2, 0x26e2,
+	0x26e4, 0x26e7,
+	0x2700, 0x2700,
+	0x2705, 0x2705,
+	0x270a, 0x270b,
+	0x2728, 0x2728,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x275f, 0x2760,
+	0x2795, 0x2797,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x27cb, 0x27cb,
+	0x27cd, 0x27cf,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf2, 0x2cf8,
+	0x2d26, 0x2d2f,
+	0x2d66, 0x2d6e,
+	0x2d70, 0x2d7f,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e32, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31b8, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcc, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa660, 0xa661,
+	0xa674, 0xa67b,
+	0xa698, 0xa69f,
+	0xa6f8, 0xa6ff,
+	0xa78d, 0xa7fa,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c5, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa8fc, 0xa8ff,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9e0, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaa7c, 0xaa7f,
+	0xaac3, 0xaada,
+	0xaae0, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa2e, 0xfa2f,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbb2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe27, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xfefe,
+	0xff00, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfff8,
+	0xfffe, 0xffff,
+	0x1000c, 0x1000c,
+	0x10027, 0x10027,
+	0x1003b, 0x1003b,
+	0x1003e, 0x1003e,
+	0x1004e, 0x1004f,
+	0x1005e, 0x1007f,
+	0x100fb, 0x100ff,
+	0x10103, 0x10106,
+	0x10134, 0x10136,
+	0x1018b, 0x1018f,
+	0x1019c, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102ff,
+	0x1031f, 0x1031f,
+	0x10324, 0x1032f,
+	0x1034b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x10860, 0x108ff,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x109ff,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a34, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a48, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10a80, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b80, 0x10bff,
+	0x10c49, 0x10e5f,
+	0x10e7f, 0x1107f,
+	0x110c2, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1de, 0x1d1ff,
+	0x1d246, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d372, 0x1d3ff,
+	0x1d455, 0x1d455,
+	0x1d49d, 0x1d49d,
+	0x1d4a0, 0x1d4a1,
+	0x1d4a3, 0x1d4a4,
+	0x1d4a7, 0x1d4a8,
+	0x1d4ad, 0x1d4ad,
+	0x1d4ba, 0x1d4ba,
+	0x1d4bc, 0x1d4bc,
+	0x1d4c4, 0x1d4c4,
+	0x1d506, 0x1d506,
+	0x1d50b, 0x1d50c,
+	0x1d515, 0x1d515,
+	0x1d51d, 0x1d51d,
+	0x1d53a, 0x1d53a,
+	0x1d53f, 0x1d53f,
+	0x1d545, 0x1d545,
+	0x1d547, 0x1d549,
+	0x1d551, 0x1d551,
+	0x1d6a6, 0x1d6a7,
+	0x1d7cc, 0x1d7cd,
+	0x1d800, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f130,
+	0x1f132, 0x1f13c,
+	0x1f13e, 0x1f13e,
+	0x1f140, 0x1f141,
+	0x1f143, 0x1f145,
+	0x1f147, 0x1f149,
+	0x1f14f, 0x1f156,
+	0x1f158, 0x1f15e,
+	0x1f160, 0x1f178,
+	0x1f17a, 0x1f17a,
+	0x1f17d, 0x1f17e,
+	0x1f180, 0x1f189,
+	0x1f18e, 0x1f18f,
+	0x1f191, 0x1f1ff,
+	0x1f201, 0x1f20f,
+	0x1f232, 0x1f23f,
+	0x1f249, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Cn */
+
+/* 'Co': General Category */
+static const OnigCodePoint CR_Co[] = {
+	3,
+	0xe000, 0xf8ff,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Co */
+
+/* 'Cs': General Category */
+static const OnigCodePoint CR_Cs[] = {
+	1,
+	0xd800, 0xdfff,
+}; /* CR_Cs */
+
+/* 'L': Major Category */
+static const OnigCodePoint CR_L[] = {
+	422,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3006,
+	0x3031, 0x3035,
+	0x303b, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	599,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02af,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d62, 0x1d77,
+	0x1d79, 0x1d9a,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2184, 0x2184,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7c,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa771, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Ll */
+
+/* 'Lm': General Category */
+static const OnigCodePoint CR_Lm[] = {
+	49,
+	0x02b0, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0374, 0x0374,
+	0x037a, 0x037a,
+	0x0559, 0x0559,
+	0x0640, 0x0640,
+	0x06e5, 0x06e6,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0971, 0x0971,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x10fc, 0x10fc,
+	0x17d7, 0x17d7,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c78, 0x1c7d,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2c7d, 0x2c7d,
+	0x2d6f, 0x2d6f,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa67f, 0xa67f,
+	0xa717, 0xa71f,
+	0xa770, 0xa770,
+	0xa788, 0xa788,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	311,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x0800, 0x0815,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e45,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17dc, 0x17dc,
+	0x1820, 0x1842,
+	0x1844, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x2135, 0x2138,
+	0x2d30, 0x2d65,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3006, 0x3006,
+	0x303c, 0x303c,
+	0x3041, 0x3096,
+	0x309f, 0x309f,
+	0x30a1, 0x30fa,
+	0x30ff, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa014,
+	0xa016, 0xa48c,
+	0xa4d0, 0xa4f7,
+	0xa500, 0xa60b,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa66e, 0xa66e,
+	0xa6a0, 0xa6e5,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa6f,
+	0xaa71, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadc,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10450, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Lo */
+
+/* 'Lt': General Category */
+static const OnigCodePoint CR_Lt[] = {
+	10,
+	0x01c5, 0x01c5,
+	0x01c8, 0x01c8,
+	0x01cb, 0x01cb,
+	0x01f2, 0x01f2,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fbc, 0x1fbc,
+	0x1fcc, 0x1fcc,
+	0x1ffc, 0x1ffc,
+}; /* CR_Lt */
+
+/* 'Lu': General Category */
+static const OnigCodePoint CR_Lu[] = {
+	594,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2183, 0x2183,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Lu */
+
+/* 'M': Major Category */
+static const OnigCodePoint CR_M[] = {
+	188,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0903,
+	0x093c, 0x093c,
+	0x093e, 0x094e,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abc, 0x0abc,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbc, 0x0cbc,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b04,
+	0x1b34, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1baa,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf2,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa953,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9c0,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11082,
+	0x110b0, 0x110ba,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	106,
+	0x0903, 0x0903,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0982, 0x0983,
+	0x09be, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x0a03, 0x0a03,
+	0x0a3e, 0x0a40,
+	0x0a83, 0x0a83,
+	0x0abe, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0b02, 0x0b03,
+	0x0b3e, 0x0b3e,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c41, 0x0c44,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cbe,
+	0x0cc0, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cd5, 0x0cd6,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd1,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0f3e, 0x0f3f,
+	0x0f7f, 0x0f7f,
+	0x102b, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x1056, 0x1057,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108f, 0x108f,
+	0x109a, 0x109c,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a19, 0x1a1b,
+	0x1a55, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1b04, 0x1b04,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b44,
+	0x1b82, 0x1b82,
+	0x1ba1, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf2,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9c0,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa4d, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	5,
+	0x0488, 0x0489,
+	0x06de, 0x06de,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	194,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	81,
+	0x0030, 0x0039,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x09f4, 0x09f9,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bf2,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7e,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d75,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f33,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x1369, 0x137c,
+	0x16ee, 0x16f0,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x2182,
+	0x2185, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa620, 0xa629,
+	0xa6e6, 0xa6ef,
+	0xa830, 0xa835,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x10107, 0x10133,
+	0x10140, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x104a0, 0x104a9,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x12400, 0x12462,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1f100, 0x1f10a,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+static const OnigCodePoint CR_Nd[] = {
+	37,
+	0x0030, 0x0039,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bef,
+	0x0c66, 0x0c6f,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d6f,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f29,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0xa620, 0xa629,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x104a0, 0x104a9,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
+
+/* 'Nl': General Category */
+static const OnigCodePoint CR_Nl[] = {
+	12,
+	0x16ee, 0x16f0,
+	0x2160, 0x2182,
+	0x2185, 0x2188,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0xa6e6, 0xa6ef,
+	0x10140, 0x10174,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x12400, 0x12462,
+}; /* CR_Nl */
+
+/* 'No': General Category */
+static const OnigCodePoint CR_No[] = {
+	38,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa830, 0xa835,
+	0x10107, 0x10133,
+	0x10175, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x1d360, 0x1d371,
+	0x1f100, 0x1f10a,
+}; /* CR_No */
+
+/* 'P': Major Category */
+static const OnigCodePoint CR_P[] = {
+	129,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00ab, 0x00ab,
+	0x00b7, 0x00b7,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2010, 0x2027,
+	0x2030, 0x2043,
+	0x2045, 0x2051,
+	0x2053, 0x205e,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x2329, 0x232a,
+	0x2768, 0x2775,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x3008, 0x3011,
+	0x3014, 0x301f,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfd3e, 0xfd3f,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff0a,
+	0xff0c, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3b, 0xff3d,
+	0xff3f, 0xff3f,
+	0xff5b, 0xff5b,
+	0xff5d, 0xff5d,
+	0xff5f, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_P */
+
+/* 'Pc': General Category */
+static const OnigCodePoint CR_Pc[] = {
+	6,
+	0x005f, 0x005f,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xff3f, 0xff3f,
+}; /* CR_Pc */
+
+/* 'Pd': General Category */
+static const OnigCodePoint CR_Pd[] = {
+	15,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Pd */
+
+/* 'Pe': General Category */
+static const OnigCodePoint CR_Pe[] = {
+	70,
+	0x0029, 0x0029,
+	0x005d, 0x005d,
+	0x007d, 0x007d,
+	0x0f3b, 0x0f3b,
+	0x0f3d, 0x0f3d,
+	0x169c, 0x169c,
+	0x2046, 0x2046,
+	0x207e, 0x207e,
+	0x208e, 0x208e,
+	0x232a, 0x232a,
+	0x2769, 0x2769,
+	0x276b, 0x276b,
+	0x276d, 0x276d,
+	0x276f, 0x276f,
+	0x2771, 0x2771,
+	0x2773, 0x2773,
+	0x2775, 0x2775,
+	0x27c6, 0x27c6,
+	0x27e7, 0x27e7,
+	0x27e9, 0x27e9,
+	0x27eb, 0x27eb,
+	0x27ed, 0x27ed,
+	0x27ef, 0x27ef,
+	0x2984, 0x2984,
+	0x2986, 0x2986,
+	0x2988, 0x2988,
+	0x298a, 0x298a,
+	0x298c, 0x298c,
+	0x298e, 0x298e,
+	0x2990, 0x2990,
+	0x2992, 0x2992,
+	0x2994, 0x2994,
+	0x2996, 0x2996,
+	0x2998, 0x2998,
+	0x29d9, 0x29d9,
+	0x29db, 0x29db,
+	0x29fd, 0x29fd,
+	0x2e23, 0x2e23,
+	0x2e25, 0x2e25,
+	0x2e27, 0x2e27,
+	0x2e29, 0x2e29,
+	0x3009, 0x3009,
+	0x300b, 0x300b,
+	0x300d, 0x300d,
+	0x300f, 0x300f,
+	0x3011, 0x3011,
+	0x3015, 0x3015,
+	0x3017, 0x3017,
+	0x3019, 0x3019,
+	0x301b, 0x301b,
+	0x301e, 0x301f,
+	0xfd3f, 0xfd3f,
+	0xfe18, 0xfe18,
+	0xfe36, 0xfe36,
+	0xfe38, 0xfe38,
+	0xfe3a, 0xfe3a,
+	0xfe3c, 0xfe3c,
+	0xfe3e, 0xfe3e,
+	0xfe40, 0xfe40,
+	0xfe42, 0xfe42,
+	0xfe44, 0xfe44,
+	0xfe48, 0xfe48,
+	0xfe5a, 0xfe5a,
+	0xfe5c, 0xfe5c,
+	0xfe5e, 0xfe5e,
+	0xff09, 0xff09,
+	0xff3d, 0xff3d,
+	0xff5d, 0xff5d,
+	0xff60, 0xff60,
+	0xff63, 0xff63,
+}; /* CR_Pe */
+
+/* 'Pf': General Category */
+static const OnigCodePoint CR_Pf[] = {
+	10,
+	0x00bb, 0x00bb,
+	0x2019, 0x2019,
+	0x201d, 0x201d,
+	0x203a, 0x203a,
+	0x2e03, 0x2e03,
+	0x2e05, 0x2e05,
+	0x2e0a, 0x2e0a,
+	0x2e0d, 0x2e0d,
+	0x2e1d, 0x2e1d,
+	0x2e21, 0x2e21,
+}; /* CR_Pf */
+
+/* 'Pi': General Category */
+static const OnigCodePoint CR_Pi[] = {
+	11,
+	0x00ab, 0x00ab,
+	0x2018, 0x2018,
+	0x201b, 0x201c,
+	0x201f, 0x201f,
+	0x2039, 0x2039,
+	0x2e02, 0x2e02,
+	0x2e04, 0x2e04,
+	0x2e09, 0x2e09,
+	0x2e0c, 0x2e0c,
+	0x2e1c, 0x2e1c,
+	0x2e20, 0x2e20,
+}; /* CR_Pi */
+
+/* 'Po': General Category */
+static const OnigCodePoint CR_Po[] = {
+	124,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00b7, 0x00b7,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x0589,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x303d, 0x303d,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe10, 0xfe16,
+	0xfe19, 0xfe19,
+	0xfe30, 0xfe30,
+	0xfe45, 0xfe46,
+	0xfe49, 0xfe4c,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xfe5f, 0xfe61,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff07,
+	0xff0a, 0xff0a,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3c, 0xff3c,
+	0xff61, 0xff61,
+	0xff64, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Po */
+
+/* 'Ps': General Category */
+static const OnigCodePoint CR_Ps[] = {
+	72,
+	0x0028, 0x0028,
+	0x005b, 0x005b,
+	0x007b, 0x007b,
+	0x0f3a, 0x0f3a,
+	0x0f3c, 0x0f3c,
+	0x169b, 0x169b,
+	0x201a, 0x201a,
+	0x201e, 0x201e,
+	0x2045, 0x2045,
+	0x207d, 0x207d,
+	0x208d, 0x208d,
+	0x2329, 0x2329,
+	0x2768, 0x2768,
+	0x276a, 0x276a,
+	0x276c, 0x276c,
+	0x276e, 0x276e,
+	0x2770, 0x2770,
+	0x2772, 0x2772,
+	0x2774, 0x2774,
+	0x27c5, 0x27c5,
+	0x27e6, 0x27e6,
+	0x27e8, 0x27e8,
+	0x27ea, 0x27ea,
+	0x27ec, 0x27ec,
+	0x27ee, 0x27ee,
+	0x2983, 0x2983,
+	0x2985, 0x2985,
+	0x2987, 0x2987,
+	0x2989, 0x2989,
+	0x298b, 0x298b,
+	0x298d, 0x298d,
+	0x298f, 0x298f,
+	0x2991, 0x2991,
+	0x2993, 0x2993,
+	0x2995, 0x2995,
+	0x2997, 0x2997,
+	0x29d8, 0x29d8,
+	0x29da, 0x29da,
+	0x29fc, 0x29fc,
+	0x2e22, 0x2e22,
+	0x2e24, 0x2e24,
+	0x2e26, 0x2e26,
+	0x2e28, 0x2e28,
+	0x3008, 0x3008,
+	0x300a, 0x300a,
+	0x300c, 0x300c,
+	0x300e, 0x300e,
+	0x3010, 0x3010,
+	0x3014, 0x3014,
+	0x3016, 0x3016,
+	0x3018, 0x3018,
+	0x301a, 0x301a,
+	0x301d, 0x301d,
+	0xfd3e, 0xfd3e,
+	0xfe17, 0xfe17,
+	0xfe35, 0xfe35,
+	0xfe37, 0xfe37,
+	0xfe39, 0xfe39,
+	0xfe3b, 0xfe3b,
+	0xfe3d, 0xfe3d,
+	0xfe3f, 0xfe3f,
+	0xfe41, 0xfe41,
+	0xfe43, 0xfe43,
+	0xfe47, 0xfe47,
+	0xfe59, 0xfe59,
+	0xfe5b, 0xfe5b,
+	0xfe5d, 0xfe5d,
+	0xff08, 0xff08,
+	0xff3b, 0xff3b,
+	0xff5b, 0xff5b,
+	0xff5f, 0xff5f,
+	0xff62, 0xff62,
+}; /* CR_Ps */
+
+/* 'S': Major Category */
+static const OnigCodePoint CR_S[] = {
+	198,
+	0x0024, 0x0024,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00a2, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b6, 0x00b6,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x20a0, 0x20b8,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x2140, 0x2144,
+	0x214a, 0x214d,
+	0x214f, 0x214f,
+	0x2190, 0x2328,
+	0x232b, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x309b, 0x309c,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xa828, 0xa82b,
+	0xa836, 0xa839,
+	0xaa77, 0xaa79,
+	0xfb29, 0xfb29,
+	0xfdfc, 0xfdfd,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	16,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20b8,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	26,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x309b, 0x309c,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xffe3, 0xffe3,
+}; /* CR_Sk */
+
+/* 'Sm': General Category */
+static const OnigCodePoint CR_Sm[] = {
+	65,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03f6, 0x03f6,
+	0x0606, 0x0608,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x2140, 0x2144,
+	0x214b, 0x214b,
+	0x2190, 0x2194,
+	0x219a, 0x219b,
+	0x21a0, 0x21a0,
+	0x21a3, 0x21a3,
+	0x21a6, 0x21a6,
+	0x21ae, 0x21ae,
+	0x21ce, 0x21cf,
+	0x21d2, 0x21d2,
+	0x21d4, 0x21d4,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b3,
+	0x23dc, 0x23e1,
+	0x25b7, 0x25b7,
+	0x25c1, 0x25c1,
+	0x25f8, 0x25ff,
+	0x266f, 0x266f,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x27ff,
+	0x2900, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	154,
+	0x00a6, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x00b6, 0x00b6,
+	0x0482, 0x0482,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x214a, 0x214a,
+	0x214c, 0x214d,
+	0x214f, 0x214f,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21ad,
+	0x21af, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21f3,
+	0x2300, 0x2307,
+	0x230c, 0x231f,
+	0x2322, 0x2328,
+	0x232b, 0x237b,
+	0x237d, 0x239a,
+	0x23b4, 0x23db,
+	0x23e2, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2b00, 0x2b2f,
+	0x2b45, 0x2b46,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa828, 0xa82b,
+	0xa836, 0xa837,
+	0xa839, 0xa839,
+	0xaa77, 0xaa79,
+	0xfdfd, 0xfdfd,
+	0xffe4, 0xffe4,
+	0xffe8, 0xffe8,
+	0xffed, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_So */
+
+/* 'Z': Major Category */
+static const OnigCodePoint CR_Z[] = {
+	9,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Z */
+
+/* 'Zl': General Category */
+static const OnigCodePoint CR_Zl[] = {
+	1,
+	0x2028, 0x2028,
+}; /* CR_Zl */
+
+/* 'Zp': General Category */
+static const OnigCodePoint CR_Zp[] = {
+	1,
+	0x2029, 0x2029,
+}; /* CR_Zp */
+
+/* 'Zs': General Category */
+static const OnigCodePoint CR_Zs[] = {
+	8,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Zs */
+
+/* 'Math': Derived Property */
+static const OnigCodePoint CR_Math[] = {
+	105,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f6,
+	0x0606, 0x0608,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x2061, 0x2064,
+	0x207a, 0x207e,
+	0x208a, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x2149,
+	0x214b, 0x214b,
+	0x2190, 0x21a7,
+	0x21a9, 0x21ae,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23dc, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b7,
+	0x25bc, 0x25c1,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x25f8, 0x25ff,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266f,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe61, 0xfe66,
+	0xfe68, 0xfe68,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+static const OnigCodePoint CR_Alphabetic[] = {
+	474,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09f0, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a70, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
+
+/* 'Lowercase': Derived Property */
+static const OnigCodePoint CR_Lowercase[] = {
+	602,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037a, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1dbf,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x2090, 0x2094,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7d,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Lowercase */
+
+/* 'Uppercase': Derived Property */
+static const OnigCodePoint CR_Uppercase[] = {
+	596,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Uppercase */
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	110,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+}; /* CR_Cased */
+
+/* 'Case_Ignorable': Derived Property */
+static const OnigCodePoint CR_Case_Ignorable[] = {
+	266,
+	0x0027, 0x0027,
+	0x002e, 0x002e,
+	0x003a, 0x003a,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00ad, 0x00ad,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0387, 0x0387,
+	0x0483, 0x0489,
+	0x0559, 0x0559,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05f4, 0x05f4,
+	0x0600, 0x0603,
+	0x0610, 0x061a,
+	0x0640, 0x0640,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0971, 0x0971,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e46, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x10fc, 0x10fc,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1843, 0x1843,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x200b, 0x200f,
+	0x2018, 0x2019,
+	0x2024, 0x2024,
+	0x2027, 0x2027,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2c7d, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302f,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xa9cf, 0xa9cf,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa70, 0xaa70,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaadd, 0xaadd,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe13, 0xfe13,
+	0xfe20, 0xfe26,
+	0xfe52, 0xfe52,
+	0xfe55, 0xfe55,
+	0xfeff, 0xfeff,
+	0xff07, 0xff07,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0xfff9, 0xfffb,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x1d167, 0x1d169,
+	0x1d173, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	557,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fb8, 0x1fbc,
+	0x1fc8, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	573,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c5, 0x01c6,
+	0x01c8, 0x01c9,
+	0x01cb, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f2, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbc, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fcc, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x1ffc, 0x1ffc,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	574,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x01c4,
+	0x01c6, 0x01c7,
+	0x01c9, 0x01ca,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f1,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	568,
+	0x0041, 0x005a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00df,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x0149, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x017f, 0x017f,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0345, 0x0345,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03c2, 0x03c2,
+	0x03cf, 0x03d1,
+	0x03d5, 0x03d6,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9a, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f80, 0x1faf,
+	0x1fb2, 0x1fb4,
+	0x1fb7, 0x1fbc,
+	0x1fc2, 0x1fc4,
+	0x1fc7, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff7, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	97,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x0137,
+	0x0139, 0x018c,
+	0x018e, 0x019a,
+	0x019c, 0x01a9,
+	0x01ac, 0x01b9,
+	0x01bc, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x0220,
+	0x0222, 0x0233,
+	0x023a, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03d1,
+	0x03d5, 0x03f2,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03fb,
+	0x03fd, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e00, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c70,
+	0x2c72, 0x2c73,
+	0x2c75, 0x2c76,
+	0x2c7e, 0x2ce3,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	424,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309b, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	431,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e32,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb2,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	513,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_XID_Continue */
+
+/* 'Default_Ignorable_Code_Point': Derived Property */
+static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x180b, 0x180d,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x3164, 0x3164,
+	0xfe00, 0xfe0f,
+	0xfeff, 0xfeff,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe0fff,
+}; /* CR_Default_Ignorable_Code_Point */
+
+/* 'Grapheme_Extend': Derived Property */
+static const OnigCodePoint CR_Grapheme_Extend[] = {
+	206,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09be, 0x09be,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bbe,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d3e, 0x0d3e,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dcf,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0ddf, 0x0ddf,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d165, 0x1d165,
+	0x1d167, 0x1d169,
+	0x1d16e, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	567,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06e9, 0x06e9,
+	0x06ee, 0x070d,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0830, 0x083e,
+	0x0903, 0x0939,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0972,
+	0x0979, 0x097f,
+	0x0982, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09bf, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09e6, 0x09fb,
+	0x0a03, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a40,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a6f,
+	0x0a72, 0x0a74,
+	0x0a83, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b02, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbf, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c41, 0x0c44,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbe,
+	0x0cc0, 0x0cc1,
+	0x0cc3, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dd0, 0x0dd1,
+	0x0dd8, 0x0dde,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e3f, 0x0e46,
+	0x0e4f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8b,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1360, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1735, 0x1736,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x17d4, 0x17dc,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180a,
+	0x180e, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a16,
+	0x1a19, 0x1a1b,
+	0x1a1e, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b04, 0x1b33,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b4b,
+	0x1b50, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1b82, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x200a,
+	0x2010, 0x2027,
+	0x202f, 0x205f,
+	0x2070, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa824,
+	0xa827, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c3,
+	0xa8ce, 0xa8d9,
+	0xa8f2, 0xa8fb,
+	0xa900, 0xa925,
+	0xa92e, 0xa946,
+	0xa952, 0xa953,
+	0xa95f, 0xa97c,
+	0xa983, 0xa9b2,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa28,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa4d, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff01, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a40, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d166, 0x1d166,
+	0x1d16a, 0x1d16d,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	26,
+	0x094d, 0x094d,
+	0x09cd, 0x09cd,
+	0x0a4d, 0x0a4d,
+	0x0acd, 0x0acd,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e3a, 0x0e3a,
+	0x0f84, 0x0f84,
+	0x1039, 0x103a,
+	0x1714, 0x1714,
+	0x1734, 0x1734,
+	0x17d2, 0x17d2,
+	0x1a60, 0x1a60,
+	0x1b44, 0x1b44,
+	0x1baa, 0x1baa,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x110b9, 0x110b9,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	159,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x0600, 0x0603,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0cf1, 0x0cf2,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x206a, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20b8,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2e00, 0x2e31,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3004,
+	0x3006, 0x3006,
+	0x3008, 0x3020,
+	0x3030, 0x3037,
+	0x303c, 0x303f,
+	0x309b, 0x309c,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fc,
+	0x3190, 0x319f,
+	0x31c0, 0x31e3,
+	0x3220, 0x325f,
+	0x327f, 0x32cf,
+	0x3358, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	0xa830, 0xa839,
+	0xfd3e, 0xfd3f,
+	0xfdfd, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfeff, 0xfeff,
+	0xff01, 0xff20,
+	0xff3b, 0xff40,
+	0xff5b, 0xff65,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d166,
+	0x1d16a, 0x1d17a,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	28,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02b8,
+	0x02e0, 0x02e4,
+	0x1d00, 0x1d25,
+	0x1d2c, 0x1d5c,
+	0x1d62, 0x1d65,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1dbe,
+	0x1e00, 0x1eff,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa7ff,
+	0xfb00, 0xfb06,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+}; /* CR_Latin */
+
+/* 'Greek': Script */
+static const OnigCodePoint CR_Greek[] = {
+	33,
+	0x0370, 0x0373,
+	0x0375, 0x0377,
+	0x037a, 0x037d,
+	0x0384, 0x0384,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03e1,
+	0x03f0, 0x03ff,
+	0x1d26, 0x1d2a,
+	0x1d5d, 0x1d61,
+	0x1d66, 0x1d6a,
+	0x1dbf, 0x1dbf,
+	0x1f00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2126, 0x2126,
+	0x10140, 0x1018a,
+	0x1d200, 0x1d245,
+}; /* CR_Greek */
+
+/* 'Cyrillic': Script */
+static const OnigCodePoint CR_Cyrillic[] = {
+	8,
+	0x0400, 0x0484,
+	0x0487, 0x0525,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	5,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0xfb13, 0xfb17,
+}; /* CR_Armenian */
+
+/* 'Hebrew': Script */
+static const OnigCodePoint CR_Hebrew[] = {
+	9,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfb4f,
+}; /* CR_Hebrew */
+
+/* 'Arabic': Script */
+static const OnigCodePoint CR_Arabic[] = {
+	18,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065e,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0xfb50, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfc,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+}; /* CR_Arabic */
+
+/* 'Syriac': Script */
+static const OnigCodePoint CR_Syriac[] = {
+	3,
+	0x0700, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+}; /* CR_Syriac */
+
+/* 'Thaana': Script */
+static const OnigCodePoint CR_Thaana[] = {
+	1,
+	0x0780, 0x07b1,
+}; /* CR_Thaana */
+
+/* 'Devanagari': Script */
+static const OnigCodePoint CR_Devanagari[] = {
+	9,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0950,
+	0x0953, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0xa8e0, 0xa8fb,
+}; /* CR_Devanagari */
+
+/* 'Bengali': Script */
+static const OnigCodePoint CR_Bengali[] = {
+	14,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+}; /* CR_Bengali */
+
+/* 'Gurmukhi': Script */
+static const OnigCodePoint CR_Gurmukhi[] = {
+	16,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+}; /* CR_Gurmukhi */
+
+/* 'Gujarati': Script */
+static const OnigCodePoint CR_Gujarati[] = {
+	14,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+}; /* CR_Gujarati */
+
+/* 'Oriya': Script */
+static const OnigCodePoint CR_Oriya[] = {
+	14,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+}; /* CR_Oriya */
+
+/* 'Tamil': Script */
+static const OnigCodePoint CR_Tamil[] = {
+	16,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+}; /* CR_Tamil */
+
+/* 'Telugu': Script */
+static const OnigCodePoint CR_Telugu[] = {
+	14,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+}; /* CR_Telugu */
+
+/* 'Kannada': Script */
+static const OnigCodePoint CR_Kannada[] = {
+	13,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	12,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+}; /* CR_Malayalam */
+
+/* 'Sinhala': Script */
+static const OnigCodePoint CR_Sinhala[] = {
+	11,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+}; /* CR_Sinhala */
+
+/* 'Thai': Script */
+static const OnigCodePoint CR_Thai[] = {
+	2,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e5b,
+}; /* CR_Thai */
+
+/* 'Lao': Script */
+static const OnigCodePoint CR_Lao[] = {
+	18,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	2,
+	0x1000, 0x109f,
+	0xaa60, 0xaa7b,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	4,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x2d00, 0x2d25,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	13,
+	0x1100, 0x11ff,
+	0x3131, 0x318e,
+	0x3200, 0x321e,
+	0x3260, 0x327e,
+	0xa960, 0xa97c,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+}; /* CR_Hangul */
+
+/* 'Ethiopic': Script */
+static const OnigCodePoint CR_Ethiopic[] = {
+	27,
+	0x1200, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+}; /* CR_Ethiopic */
+
+/* 'Cherokee': Script */
+static const OnigCodePoint CR_Cherokee[] = {
+	1,
+	0x13a0, 0x13f4,
+}; /* CR_Cherokee */
+
+/* 'Canadian_Aboriginal': Script */
+static const OnigCodePoint CR_Canadian_Aboriginal[] = {
+	2,
+	0x1400, 0x167f,
+	0x18b0, 0x18f5,
+}; /* CR_Canadian_Aboriginal */
+
+/* 'Ogham': Script */
+static const OnigCodePoint CR_Ogham[] = {
+	1,
+	0x1680, 0x169c,
+}; /* CR_Ogham */
+
+/* 'Runic': Script */
+static const OnigCodePoint CR_Runic[] = {
+	2,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+}; /* CR_Runic */
+
+/* 'Khmer': Script */
+static const OnigCodePoint CR_Khmer[] = {
+	4,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x19e0, 0x19ff,
+}; /* CR_Khmer */
+
+/* 'Mongolian': Script */
+static const OnigCodePoint CR_Mongolian[] = {
+	6,
+	0x1800, 0x1801,
+	0x1804, 0x1804,
+	0x1806, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+}; /* CR_Mongolian */
+
+/* 'Hiragana': Script */
+static const OnigCodePoint CR_Hiragana[] = {
+	3,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	7,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	2,
+	0x3105, 0x312d,
+	0x31a0, 0x31b7,
+}; /* CR_Bopomofo */
+
+/* 'Han': Script */
+static const OnigCodePoint CR_Han[] = {
+	15,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x3005, 0x3005,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303b,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Han */
+
+/* 'Yi': Script */
+static const OnigCodePoint CR_Yi[] = {
+	2,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+}; /* CR_Yi */
+
+/* 'Old_Italic': Script */
+static const OnigCodePoint CR_Old_Italic[] = {
+	2,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+}; /* CR_Old_Italic */
+
+/* 'Gothic': Script */
+static const OnigCodePoint CR_Gothic[] = {
+	1,
+	0x10330, 0x1034a,
+}; /* CR_Gothic */
+
+/* 'Deseret': Script */
+static const OnigCodePoint CR_Deseret[] = {
+	1,
+	0x10400, 0x1044f,
+}; /* CR_Deseret */
+
+/* 'Inherited': Script */
+static const OnigCodePoint CR_Inherited[] = {
+	23,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0xe0100, 0xe01ef,
+}; /* CR_Inherited */
+
+/* 'Tagalog': Script */
+static const OnigCodePoint CR_Tagalog[] = {
+	2,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+}; /* CR_Tagalog */
+
+/* 'Hanunoo': Script */
+static const OnigCodePoint CR_Hanunoo[] = {
+	1,
+	0x1720, 0x1734,
+}; /* CR_Hanunoo */
+
+/* 'Buhid': Script */
+static const OnigCodePoint CR_Buhid[] = {
+	1,
+	0x1740, 0x1753,
+}; /* CR_Buhid */
+
+/* 'Tagbanwa': Script */
+static const OnigCodePoint CR_Tagbanwa[] = {
+	3,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+}; /* CR_Tagbanwa */
+
+/* 'Limbu': Script */
+static const OnigCodePoint CR_Limbu[] = {
+	5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x194f,
+}; /* CR_Limbu */
+
+/* 'Tai_Le': Script */
+static const OnigCodePoint CR_Tai_Le[] = {
+	2,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+}; /* CR_Tai_Le */
+
+/* 'Linear_B': Script */
+static const OnigCodePoint CR_Linear_B[] = {
+	7,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+}; /* CR_Linear_B */
+
+/* 'Ugaritic': Script */
+static const OnigCodePoint CR_Ugaritic[] = {
+	2,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+}; /* CR_Ugaritic */
+
+/* 'Shavian': Script */
+static const OnigCodePoint CR_Shavian[] = {
+	1,
+	0x10450, 0x1047f,
+}; /* CR_Shavian */
+
+/* 'Osmanya': Script */
+static const OnigCodePoint CR_Osmanya[] = {
+	2,
+	0x10480, 0x1049d,
+	0x104a0, 0x104a9,
+}; /* CR_Osmanya */
+
+/* 'Cypriot': Script */
+static const OnigCodePoint CR_Cypriot[] = {
+	6,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+}; /* CR_Cypriot */
+
+/* 'Braille': Script */
+static const OnigCodePoint CR_Braille[] = {
+	1,
+	0x2800, 0x28ff,
+}; /* CR_Braille */
+
+/* 'Buginese': Script */
+static const OnigCodePoint CR_Buginese[] = {
+	2,
+	0x1a00, 0x1a1b,
+	0x1a1e, 0x1a1f,
+}; /* CR_Buginese */
+
+/* 'Coptic': Script */
+static const OnigCodePoint CR_Coptic[] = {
+	3,
+	0x03e2, 0x03ef,
+	0x2c80, 0x2cf1,
+	0x2cf9, 0x2cff,
+}; /* CR_Coptic */
+
+/* 'New_Tai_Lue': Script */
+static const OnigCodePoint CR_New_Tai_Lue[] = {
+	4,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x19df,
+}; /* CR_New_Tai_Lue */
+
+/* 'Glagolitic': Script */
+static const OnigCodePoint CR_Glagolitic[] = {
+	2,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+}; /* CR_Glagolitic */
+
+/* 'Tifinagh': Script */
+static const OnigCodePoint CR_Tifinagh[] = {
+	2,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+}; /* CR_Tifinagh */
+
+/* 'Syloti_Nagri': Script */
+static const OnigCodePoint CR_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82b,
+}; /* CR_Syloti_Nagri */
+
+/* 'Old_Persian': Script */
+static const OnigCodePoint CR_Old_Persian[] = {
+	2,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103d5,
+}; /* CR_Old_Persian */
+
+/* 'Kharoshthi': Script */
+static const OnigCodePoint CR_Kharoshthi[] = {
+	8,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+}; /* CR_Kharoshthi */
+
+/* 'Balinese': Script */
+static const OnigCodePoint CR_Balinese[] = {
+	2,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+}; /* CR_Balinese */
+
+/* 'Cuneiform': Script */
+static const OnigCodePoint CR_Cuneiform[] = {
+	3,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+}; /* CR_Cuneiform */
+
+/* 'Phoenician': Script */
+static const OnigCodePoint CR_Phoenician[] = {
+	2,
+	0x10900, 0x1091b,
+	0x1091f, 0x1091f,
+}; /* CR_Phoenician */
+
+/* 'Phags_Pa': Script */
+static const OnigCodePoint CR_Phags_Pa[] = {
+	1,
+	0xa840, 0xa877,
+}; /* CR_Phags_Pa */
+
+/* 'Nko': Script */
+static const OnigCodePoint CR_Nko[] = {
+	1,
+	0x07c0, 0x07fa,
+}; /* CR_Nko */
+
+/* 'Sundanese': Script */
+static const OnigCodePoint CR_Sundanese[] = {
+	2,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+}; /* CR_Sundanese */
+
+/* 'Lepcha': Script */
+static const OnigCodePoint CR_Lepcha[] = {
+	3,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c4f,
+}; /* CR_Lepcha */
+
+/* 'Ol_Chiki': Script */
+static const OnigCodePoint CR_Ol_Chiki[] = {
+	1,
+	0x1c50, 0x1c7f,
+}; /* CR_Ol_Chiki */
+
+/* 'Vai': Script */
+static const OnigCodePoint CR_Vai[] = {
+	1,
+	0xa500, 0xa62b,
+}; /* CR_Vai */
+
+/* 'Saurashtra': Script */
+static const OnigCodePoint CR_Saurashtra[] = {
+	2,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+}; /* CR_Saurashtra */
+
+/* 'Kayah_Li': Script */
+static const OnigCodePoint CR_Kayah_Li[] = {
+	1,
+	0xa900, 0xa92f,
+}; /* CR_Kayah_Li */
+
+/* 'Rejang': Script */
+static const OnigCodePoint CR_Rejang[] = {
+	2,
+	0xa930, 0xa953,
+	0xa95f, 0xa95f,
+}; /* CR_Rejang */
+
+/* 'Lycian': Script */
+static const OnigCodePoint CR_Lycian[] = {
+	1,
+	0x10280, 0x1029c,
+}; /* CR_Lycian */
+
+/* 'Carian': Script */
+static const OnigCodePoint CR_Carian[] = {
+	1,
+	0x102a0, 0x102d0,
+}; /* CR_Carian */
+
+/* 'Lydian': Script */
+static const OnigCodePoint CR_Lydian[] = {
+	2,
+	0x10920, 0x10939,
+	0x1093f, 0x1093f,
+}; /* CR_Lydian */
+
+/* 'Cham': Script */
+static const OnigCodePoint CR_Cham[] = {
+	4,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+}; /* CR_Cham */
+
+/* 'Tai_Tham': Script */
+static const OnigCodePoint CR_Tai_Tham[] = {
+	5,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+}; /* CR_Tai_Tham */
+
+/* 'Tai_Viet': Script */
+static const OnigCodePoint CR_Tai_Viet[] = {
+	2,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+}; /* CR_Tai_Viet */
+
+/* 'Avestan': Script */
+static const OnigCodePoint CR_Avestan[] = {
+	2,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b3f,
+}; /* CR_Avestan */
+
+/* 'Egyptian_Hieroglyphs': Script */
+static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342e,
+}; /* CR_Egyptian_Hieroglyphs */
+
+/* 'Samaritan': Script */
+static const OnigCodePoint CR_Samaritan[] = {
+	2,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+}; /* CR_Samaritan */
+
+/* 'Lisu': Script */
+static const OnigCodePoint CR_Lisu[] = {
+	1,
+	0xa4d0, 0xa4ff,
+}; /* CR_Lisu */
+
+/* 'Bamum': Script */
+static const OnigCodePoint CR_Bamum[] = {
+	1,
+	0xa6a0, 0xa6f7,
+}; /* CR_Bamum */
+
+/* 'Javanese': Script */
+static const OnigCodePoint CR_Javanese[] = {
+	3,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+}; /* CR_Javanese */
+
+/* 'Meetei_Mayek': Script */
+static const OnigCodePoint CR_Meetei_Mayek[] = {
+	2,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+}; /* CR_Meetei_Mayek */
+
+/* 'Imperial_Aramaic': Script */
+static const OnigCodePoint CR_Imperial_Aramaic[] = {
+	2,
+	0x10840, 0x10855,
+	0x10857, 0x1085f,
+}; /* CR_Imperial_Aramaic */
+
+/* 'Old_South_Arabian': Script */
+static const OnigCodePoint CR_Old_South_Arabian[] = {
+	1,
+	0x10a60, 0x10a7f,
+}; /* CR_Old_South_Arabian */
+
+/* 'Inscriptional_Parthian': Script */
+static const OnigCodePoint CR_Inscriptional_Parthian[] = {
+	2,
+	0x10b40, 0x10b55,
+	0x10b58, 0x10b5f,
+}; /* CR_Inscriptional_Parthian */
+
+/* 'Inscriptional_Pahlavi': Script */
+static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
+	2,
+	0x10b60, 0x10b72,
+	0x10b78, 0x10b7f,
+}; /* CR_Inscriptional_Pahlavi */
+
+/* 'Old_Turkic': Script */
+static const OnigCodePoint CR_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c48,
+}; /* CR_Old_Turkic */
+
+/* 'Kaithi': Script */
+static const OnigCodePoint CR_Kaithi[] = {
+	1,
+	0x11080, 0x110c1,
+}; /* CR_Kaithi */
+
+/* 'White_Space': Binary Property */
+static const OnigCodePoint CR_White_Space[] = {
+	11,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_White_Space */
+
+/* 'Bidi_Control': Binary Property */
+static const OnigCodePoint CR_Bidi_Control[] = {
+	2,
+	0x200e, 0x200f,
+	0x202a, 0x202e,
+}; /* CR_Bidi_Control */
+
+/* 'Join_Control': Binary Property */
+static const OnigCodePoint CR_Join_Control[] = {
+	1,
+	0x200c, 0x200d,
+}; /* CR_Join_Control */
+
+/* 'Dash': Binary Property */
+static const OnigCodePoint CR_Dash[] = {
+	19,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Dash */
+
+/* 'Hyphen': Binary Property */
+static const OnigCodePoint CR_Hyphen[] = {
+	10,
+	0x002d, 0x002d,
+	0x00ad, 0x00ad,
+	0x058a, 0x058a,
+	0x1806, 0x1806,
+	0x2010, 0x2011,
+	0x2e17, 0x2e17,
+	0x30fb, 0x30fb,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+	0xff65, 0xff65,
+}; /* CR_Hyphen */
+
+/* 'Quotation_Mark': Binary Property */
+static const OnigCodePoint CR_Quotation_Mark[] = {
+	12,
+	0x0022, 0x0022,
+	0x0027, 0x0027,
+	0x00ab, 0x00ab,
+	0x00bb, 0x00bb,
+	0x2018, 0x201f,
+	0x2039, 0x203a,
+	0x300c, 0x300f,
+	0x301d, 0x301f,
+	0xfe41, 0xfe44,
+	0xff02, 0xff02,
+	0xff07, 0xff07,
+	0xff62, 0xff63,
+}; /* CR_Quotation_Mark */
+
+/* 'Terminal_Punctuation': Binary Property */
+static const OnigCodePoint CR_Terminal_Punctuation[] = {
+	65,
+	0x0021, 0x0021,
+	0x002c, 0x002c,
+	0x002e, 0x002e,
+	0x003a, 0x003b,
+	0x003f, 0x003f,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x05c3, 0x05c3,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x070a,
+	0x070c, 0x070c,
+	0x07f8, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0e5a, 0x0e5b,
+	0x0f08, 0x0f08,
+	0x0f0d, 0x0f12,
+	0x104a, 0x104b,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x17d4, 0x17d6,
+	0x17da, 0x17da,
+	0x1802, 0x1805,
+	0x1808, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	0x1b5a, 0x1b5b,
+	0x1b5d, 0x1b5f,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3001, 0x3002,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa6f3, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c7, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaadf, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xff01, 0xff01,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0xff64, 0xff64,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x10b3a, 0x10b3f,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	99,
+	0x005e, 0x005e,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2061, 0x2064,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21a7,
+	0x21a9, 0x21ad,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x23b4, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23e2, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b6,
+	0x25bc, 0x25c0,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266e,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0xfe61, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Other_Math */
+
+/* 'Hex_Digit': Binary Property */
+static const OnigCodePoint CR_Hex_Digit[] = {
+	6,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+	0xff10, 0xff19,
+	0xff21, 0xff26,
+	0xff41, 0xff46,
+}; /* CR_Hex_Digit */
+
+/* 'ASCII_Hex_Digit': Binary Property */
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	141,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x0900, 0x0903,
+	0x093e, 0x094c,
+	0x094e, 0x094e,
+	0x0955, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e4d, 0x0e4d,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ecd, 0x0ecd,
+	0x0f71, 0x0f81,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x102b, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1062,
+	0x1067, 0x1068,
+	0x1071, 0x1074,
+	0x1082, 0x1086,
+	0x109c, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1713,
+	0x1732, 0x1733,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17c8,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1b00, 0x1b04,
+	0x1b35, 0x1b43,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1ba9,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf2,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	117,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x034e,
+	0x0350, 0x0357,
+	0x035d, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0483, 0x0487,
+	0x0559, 0x0559,
+	0x0591, 0x05a1,
+	0x05a3, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c4,
+	0x064b, 0x0652,
+	0x0657, 0x0658,
+	0x06df, 0x06e0,
+	0x06e5, 0x06e6,
+	0x06ea, 0x06ec,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x0818, 0x0819,
+	0x093c, 0x093c,
+	0x094d, 0x094d,
+	0x0951, 0x0954,
+	0x0971, 0x0971,
+	0x09bc, 0x09bc,
+	0x09cd, 0x09cd,
+	0x0a3c, 0x0a3c,
+	0x0a4d, 0x0a4d,
+	0x0abc, 0x0abc,
+	0x0acd, 0x0acd,
+	0x0b3c, 0x0b3c,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0cbc, 0x0cbc,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e47, 0x0e4c,
+	0x0e4e, 0x0e4e,
+	0x0ec8, 0x0ecc,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f82, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0fc6, 0x0fc6,
+	0x1037, 0x1037,
+	0x1039, 0x103a,
+	0x1087, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109b,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x1939, 0x193b,
+	0x1a75, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b34, 0x1b34,
+	0x1b44, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1baa, 0x1baa,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d6a,
+	0x1dc4, 0x1dcf,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2cef, 0x2cf1,
+	0x2e2f, 0x2e2f,
+	0x302a, 0x302f,
+	0x3099, 0x309c,
+	0x30fc, 0x30fc,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa717, 0xa721,
+	0xa788, 0xa788,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xaa7b, 0xaa7b,
+	0xaabf, 0xaac2,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe26,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	20,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c36, 0x1c36,
+	0x1c7b, 0x1c7b,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa60c, 0xa60c,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	13,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2090, 0x2094,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7d, 0x2c7d,
+	0xa770, 0xa770,
+}; /* CR_Other_Lowercase */
+
+/* 'Other_Uppercase': Binary Property */
+static const OnigCodePoint CR_Other_Uppercase[] = {
+	2,
+	0x2160, 0x216f,
+	0x24b6, 0x24cf,
+}; /* CR_Other_Uppercase */
+
+/* 'Noncharacter_Code_Point': Binary Property */
+static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
+	18,
+	0xfdd0, 0xfdef,
+	0xfffe, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Noncharacter_Code_Point */
+
+/* 'Other_Grapheme_Extend': Binary Property */
+static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
+	16,
+	0x09be, 0x09be,
+	0x09d7, 0x09d7,
+	0x0b3e, 0x0b3e,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbe,
+	0x0bd7, 0x0bd7,
+	0x0cc2, 0x0cc2,
+	0x0cd5, 0x0cd6,
+	0x0d3e, 0x0d3e,
+	0x0d57, 0x0d57,
+	0x0dcf, 0x0dcf,
+	0x0ddf, 0x0ddf,
+	0x200c, 0x200d,
+	0xff9e, 0xff9f,
+	0x1d165, 0x1d165,
+	0x1d16e, 0x1d172,
+}; /* CR_Other_Grapheme_Extend */
+
+/* 'IDS_Binary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Binary_Operator[] = {
+	2,
+	0x2ff0, 0x2ff1,
+	0x2ff4, 0x2ffb,
+}; /* CR_IDS_Binary_Operator */
+
+/* 'IDS_Trinary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
+	1,
+	0x2ff2, 0x2ff3,
+}; /* CR_IDS_Trinary_Operator */
+
+/* 'Radical': Binary Property */
+static const OnigCodePoint CR_Radical[] = {
+	3,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+}; /* CR_Radical */
+
+/* 'Unified_Ideograph': Binary Property */
+static const OnigCodePoint CR_Unified_Ideograph[] = {
+	11,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	10,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x2065, 0x2069,
+	0x3164, 0x3164,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0xe0000, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xe0fff,
+}; /* CR_Other_Default_Ignorable_Code_Point */
+
+/* 'Deprecated': Binary Property */
+static const OnigCodePoint CR_Deprecated[] = {
+	8,
+	0x0149, 0x0149,
+	0x0f77, 0x0f77,
+	0x0f79, 0x0f79,
+	0x17a3, 0x17a4,
+	0x206a, 0x206f,
+	0x2329, 0x232a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Deprecated */
+
+/* 'Soft_Dotted': Binary Property */
+static const OnigCodePoint CR_Soft_Dotted[] = {
+	31,
+	0x0069, 0x006a,
+	0x012f, 0x012f,
+	0x0249, 0x0249,
+	0x0268, 0x0268,
+	0x029d, 0x029d,
+	0x02b2, 0x02b2,
+	0x03f3, 0x03f3,
+	0x0456, 0x0456,
+	0x0458, 0x0458,
+	0x1d62, 0x1d62,
+	0x1d96, 0x1d96,
+	0x1da4, 0x1da4,
+	0x1da8, 0x1da8,
+	0x1e2d, 0x1e2d,
+	0x1ecb, 0x1ecb,
+	0x2071, 0x2071,
+	0x2148, 0x2149,
+	0x2c7c, 0x2c7c,
+	0x1d422, 0x1d423,
+	0x1d456, 0x1d457,
+	0x1d48a, 0x1d48b,
+	0x1d4be, 0x1d4bf,
+	0x1d4f2, 0x1d4f3,
+	0x1d526, 0x1d527,
+	0x1d55a, 0x1d55b,
+	0x1d58e, 0x1d58f,
+	0x1d5c2, 0x1d5c3,
+	0x1d5f6, 0x1d5f7,
+	0x1d62a, 0x1d62b,
+	0x1d65e, 0x1d65f,
+	0x1d692, 0x1d693,
+}; /* CR_Soft_Dotted */
+
+/* 'Logical_Order_Exception': Binary Property */
+static const OnigCodePoint CR_Logical_Order_Exception[] = {
+	5,
+	0x0e40, 0x0e44,
+	0x0ec0, 0x0ec4,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaab9,
+	0xaabb, 0xaabc,
+}; /* CR_Logical_Order_Exception */
+
+/* 'Other_ID_Start': Binary Property */
+static const OnigCodePoint CR_Other_ID_Start[] = {
+	3,
+	0x2118, 0x2118,
+	0x212e, 0x212e,
+	0x309b, 0x309c,
+}; /* CR_Other_ID_Start */
+
+/* 'Other_ID_Continue': Binary Property */
+static const OnigCodePoint CR_Other_ID_Continue[] = {
+	3,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	43,
+	0x0021, 0x0021,
+	0x002e, 0x002e,
+	0x003f, 0x003f,
+	0x055c, 0x055c,
+	0x055e, 0x055e,
+	0x0589, 0x0589,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x0702,
+	0x07f9, 0x07f9,
+	0x0964, 0x0965,
+	0x104a, 0x104b,
+	0x1362, 0x1362,
+	0x1367, 0x1368,
+	0x166e, 0x166e,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1b5a, 0x1b5b,
+	0x1b5e, 0x1b5f,
+	0x1c3b, 0x1c3c,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3002, 0x3002,
+	0xa4ff, 0xa4ff,
+	0xa60e, 0xa60f,
+	0xa6f3, 0xa6f3,
+	0xa6f7, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c8, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x110be, 0x110c1,
+}; /* CR_STerm */
+
+/* 'Variation_Selector': Binary Property */
+static const OnigCodePoint CR_Variation_Selector[] = {
+	3,
+	0x180b, 0x180d,
+	0xfe00, 0xfe0f,
+	0xe0100, 0xe01ef,
+}; /* CR_Variation_Selector */
+
+/* 'Pattern_White_Space': Binary Property */
+static const OnigCodePoint CR_Pattern_White_Space[] = {
+	5,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x200e, 0x200f,
+	0x2028, 0x2029,
+}; /* CR_Pattern_White_Space */
+
+/* 'Pattern_Syntax': Binary Property */
+static const OnigCodePoint CR_Pattern_Syntax[] = {
+	28,
+	0x0021, 0x002f,
+	0x003a, 0x0040,
+	0x005b, 0x005e,
+	0x0060, 0x0060,
+	0x007b, 0x007e,
+	0x00a1, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ab, 0x00ac,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b1,
+	0x00b6, 0x00b6,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x2010, 0x2027,
+	0x2030, 0x203e,
+	0x2041, 0x2053,
+	0x2055, 0x205e,
+	0x2190, 0x245f,
+	0x2500, 0x2775,
+	0x2794, 0x2bff,
+	0x2e00, 0x2e7f,
+	0x3001, 0x3003,
+	0x3008, 0x3020,
+	0x3030, 0x3030,
+	0xfd3e, 0xfd3f,
+	0xfe45, 0xfe46,
+}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
+#endif /* USE_UNICODE_PROPERTIES */
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
+
+/* 'Blank': [[:Blank:]] */
+static const OnigCodePoint CR_Blank[] = {
+	9,
+	0x0009, 0x0009,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Blank */
+
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
+
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	490,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x167f,
+	0x1681, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x200b, 0x2027,
+	0x202a, 0x202e,
+	0x2030, 0x205e,
+	0x2060, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	487,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2027,
+	0x202a, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06de, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	497,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+static const OnigCodePoint* const CodeRanges[] = {
+  CR_NEWLINE,
+  CR_Alpha,
+  CR_Blank,
+  CR_Cntrl,
+  CR_Digit,
+  CR_Graph,
+  CR_Lower,
+  CR_Print,
+  CR_Punct,
+  CR_Space,
+  CR_Upper,
+  CR_XDigit,
+  CR_Word,
+  CR_Alnum,
+  CR_ASCII,
+#ifdef USE_UNICODE_PROPERTIES
+#ifdef USE_UNICODE_PROPERTIES
+  CR_Any,
+  CR_Assigned,
+  CR_C,
+  CR_Cc,
+  CR_Cf,
+  CR_Cn,
+  CR_Co,
+  CR_Cs,
+  CR_L,
+  CR_Ll,
+  CR_Lm,
+  CR_Lo,
+  CR_Lt,
+  CR_Lu,
+  CR_M,
+  CR_Mc,
+  CR_Me,
+  CR_Mn,
+  CR_N,
+  CR_Nd,
+  CR_Nl,
+  CR_No,
+  CR_P,
+  CR_Pc,
+  CR_Pd,
+  CR_Pe,
+  CR_Pf,
+  CR_Pi,
+  CR_Po,
+  CR_Ps,
+  CR_S,
+  CR_Sc,
+  CR_Sk,
+  CR_Sm,
+  CR_So,
+  CR_Z,
+  CR_Zl,
+  CR_Zp,
+  CR_Zs,
+  CR_Math,
+  CR_Alphabetic,
+  CR_Lowercase,
+  CR_Uppercase,
+  CR_Cased,
+  CR_Case_Ignorable,
+  CR_Changes_When_Lowercased,
+  CR_Changes_When_Uppercased,
+  CR_Changes_When_Titlecased,
+  CR_Changes_When_Casefolded,
+  CR_Changes_When_Casemapped,
+  CR_ID_Start,
+  CR_ID_Continue,
+  CR_XID_Start,
+  CR_XID_Continue,
+  CR_Default_Ignorable_Code_Point,
+  CR_Grapheme_Extend,
+  CR_Grapheme_Base,
+  CR_Grapheme_Link,
+  CR_Common,
+  CR_Latin,
+  CR_Greek,
+  CR_Cyrillic,
+  CR_Armenian,
+  CR_Hebrew,
+  CR_Arabic,
+  CR_Syriac,
+  CR_Thaana,
+  CR_Devanagari,
+  CR_Bengali,
+  CR_Gurmukhi,
+  CR_Gujarati,
+  CR_Oriya,
+  CR_Tamil,
+  CR_Telugu,
+  CR_Kannada,
+  CR_Malayalam,
+  CR_Sinhala,
+  CR_Thai,
+  CR_Lao,
+  CR_Tibetan,
+  CR_Myanmar,
+  CR_Georgian,
+  CR_Hangul,
+  CR_Ethiopic,
+  CR_Cherokee,
+  CR_Canadian_Aboriginal,
+  CR_Ogham,
+  CR_Runic,
+  CR_Khmer,
+  CR_Mongolian,
+  CR_Hiragana,
+  CR_Katakana,
+  CR_Bopomofo,
+  CR_Han,
+  CR_Yi,
+  CR_Old_Italic,
+  CR_Gothic,
+  CR_Deseret,
+  CR_Inherited,
+  CR_Tagalog,
+  CR_Hanunoo,
+  CR_Buhid,
+  CR_Tagbanwa,
+  CR_Limbu,
+  CR_Tai_Le,
+  CR_Linear_B,
+  CR_Ugaritic,
+  CR_Shavian,
+  CR_Osmanya,
+  CR_Cypriot,
+  CR_Braille,
+  CR_Buginese,
+  CR_Coptic,
+  CR_New_Tai_Lue,
+  CR_Glagolitic,
+  CR_Tifinagh,
+  CR_Syloti_Nagri,
+  CR_Old_Persian,
+  CR_Kharoshthi,
+  CR_Balinese,
+  CR_Cuneiform,
+  CR_Phoenician,
+  CR_Phags_Pa,
+  CR_Nko,
+  CR_Sundanese,
+  CR_Lepcha,
+  CR_Ol_Chiki,
+  CR_Vai,
+  CR_Saurashtra,
+  CR_Kayah_Li,
+  CR_Rejang,
+  CR_Lycian,
+  CR_Carian,
+  CR_Lydian,
+  CR_Cham,
+  CR_Tai_Tham,
+  CR_Tai_Viet,
+  CR_Avestan,
+  CR_Egyptian_Hieroglyphs,
+  CR_Samaritan,
+  CR_Lisu,
+  CR_Bamum,
+  CR_Javanese,
+  CR_Meetei_Mayek,
+  CR_Imperial_Aramaic,
+  CR_Old_South_Arabian,
+  CR_Inscriptional_Parthian,
+  CR_Inscriptional_Pahlavi,
+  CR_Old_Turkic,
+  CR_Kaithi,
+  CR_White_Space,
+  CR_Bidi_Control,
+  CR_Join_Control,
+  CR_Dash,
+  CR_Hyphen,
+  CR_Quotation_Mark,
+  CR_Terminal_Punctuation,
+  CR_Other_Math,
+  CR_Hex_Digit,
+  CR_ASCII_Hex_Digit,
+  CR_Other_Alphabetic,
+  CR_Ideographic,
+  CR_Diacritic,
+  CR_Extender,
+  CR_Other_Lowercase,
+  CR_Other_Uppercase,
+  CR_Noncharacter_Code_Point,
+  CR_Other_Grapheme_Extend,
+  CR_IDS_Binary_Operator,
+  CR_IDS_Trinary_Operator,
+  CR_Radical,
+  CR_Unified_Ideograph,
+  CR_Other_Default_Ignorable_Code_Point,
+  CR_Deprecated,
+  CR_Soft_Dotted,
+  CR_Logical_Order_Exception,
+  CR_Other_ID_Start,
+  CR_Other_ID_Continue,
+  CR_STerm,
+  CR_Variation_Selector,
+  CR_Pattern_White_Space,
+  CR_Pattern_Syntax,
+#endif /* USE_UNICODE_PROPERTIES */
+#endif /* USE_UNICODE_PROPERTIES */
+};
+struct uniname2ctype_struct {
+  int name, ctype;
+};
+
+static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
+
+#ifndef USE_UNICODE_PROPERTIES
+#define TOTAL_KEYWORDS 15
+#define MIN_WORD_LENGTH 4
+#define MAX_WORD_LENGTH 7
+#define MIN_HASH_VALUE 7
+#define MAX_HASH_VALUE 21
+/* maximum key range = 15, duplicates = 0 */
+#else /* USE_UNICODE_PROPERTIES */
+#define TOTAL_KEYWORDS 367
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 30
+#define MIN_HASH_VALUE 3
+#define MAX_HASH_VALUE 1751
+/* maximum key range = 1749, duplicates = 0 */
+#endif /* USE_UNICODE_PROPERTIES */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+uniname2ctype_hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+#ifndef USE_UNICODE_PROPERTIES
+  static const unsigned char asso_values[] =
+#else /* USE_UNICODE_PROPERTIES */
+  static const unsigned short asso_values[] =
+#endif /* USE_UNICODE_PROPERTIES */
+    {
+#ifndef USE_UNICODE_PROPERTIES
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+      22, 22, 22, 22, 22, 22, 22,  3, 13,  6,
+       4, 22, 22, 11, 22,  1, 22, 22, 10, 22,
+       2, 22,  1, 22, 10,  8,  4,  7, 22,  3,
+       4, 22, 22, 22, 22, 22, 22, 22
+#else /* USE_UNICODE_PROPERTIES */
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+      1752, 1752, 1752, 1752, 1752, 1752, 1752,    7,  419,    1,
+       128,   38,  100,  186,   46,   11,  226,  463,    4,  317,
+         6,    2,  265,    5,   18,  112,   30,  289,  164,  384,
+       368,  579,   10, 1752, 1752, 1752, 1752, 1752
+#endif /* USE_UNICODE_PROPERTIES */
+    };
+#ifndef USE_UNICODE_PROPERTIES
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+#else /* USE_UNICODE_PROPERTIES */
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[15]];
+      /*FALLTHROUGH*/
+      case 15:
+      case 14:
+      case 13:
+      case 12:
+        hval += asso_values[(unsigned char)str[11]];
+      /*FALLTHROUGH*/
+      case 11:
+      case 10:
+      case 9:
+      case 8:
+      case 7:
+      case 6:
+        hval += asso_values[(unsigned char)str[5]];
+      /*FALLTHROUGH*/
+      case 5:
+      case 4:
+      case 3:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+        hval += asso_values[(unsigned char)str[1]];
+      /*FALLTHROUGH*/
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval + asso_values[(unsigned char)str[len - 1]];
+#endif /* USE_UNICODE_PROPERTIES */
+}
+
+struct uniname2ctype_pool_t
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    char uniname2ctype_pool_str7[sizeof("print")];
+    char uniname2ctype_pool_str8[sizeof("punct")];
+    char uniname2ctype_pool_str9[sizeof("alpha")];
+    char uniname2ctype_pool_str10[sizeof("alnum")];
+    char uniname2ctype_pool_str11[sizeof("xdigit")];
+    char uniname2ctype_pool_str12[sizeof("newline")];
+    char uniname2ctype_pool_str13[sizeof("upper")];
+    char uniname2ctype_pool_str14[sizeof("ascii")];
+    char uniname2ctype_pool_str15[sizeof("cntrl")];
+    char uniname2ctype_pool_str16[sizeof("space")];
+    char uniname2ctype_pool_str17[sizeof("word")];
+    char uniname2ctype_pool_str18[sizeof("lower")];
+    char uniname2ctype_pool_str19[sizeof("graph")];
+    char uniname2ctype_pool_str20[sizeof("digit")];
+    char uniname2ctype_pool_str21[sizeof("blank")];
+#else /* USE_UNICODE_PROPERTIES */
+    char uniname2ctype_pool_str3[sizeof("c")];
+    char uniname2ctype_pool_str5[sizeof("cc")];
+    char uniname2ctype_pool_str7[sizeof("co")];
+    char uniname2ctype_pool_str9[sizeof("l")];
+    char uniname2ctype_pool_str10[sizeof("lo")];
+    char uniname2ctype_pool_str12[sizeof("no")];
+    char uniname2ctype_pool_str13[sizeof("n")];
+    char uniname2ctype_pool_str14[sizeof("ll")];
+    char uniname2ctype_pool_str15[sizeof("cn")];
+    char uniname2ctype_pool_str16[sizeof("nl")];
+    char uniname2ctype_pool_str18[sizeof("lao")];
+    char uniname2ctype_pool_str19[sizeof("laoo")];
+    char uniname2ctype_pool_str20[sizeof("zl")];
+    char uniname2ctype_pool_str21[sizeof("z")];
+    char uniname2ctype_pool_str22[sizeof("control")];
+    char uniname2ctype_pool_str24[sizeof("qaac")];
+    char uniname2ctype_pool_str25[sizeof("ci")];
+    char uniname2ctype_pool_str28[sizeof("lana")];
+    char uniname2ctype_pool_str33[sizeof("oalpha")];
+    char uniname2ctype_pool_str34[sizeof("qaai")];
+    char uniname2ctype_pool_str40[sizeof("arabic")];
+    char uniname2ctype_pool_str41[sizeof("cari")];
+    char uniname2ctype_pool_str43[sizeof("oriya")];
+    char uniname2ctype_pool_str44[sizeof("carian")];
+    char uniname2ctype_pool_str46[sizeof("cntrl")];
+    char uniname2ctype_pool_str49[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str50[sizeof("olower")];
+    char uniname2ctype_pool_str51[sizeof("latn")];
+    char uniname2ctype_pool_str52[sizeof("latin")];
+    char uniname2ctype_pool_str56[sizeof("ital")];
+    char uniname2ctype_pool_str65[sizeof("hano")];
+    char uniname2ctype_pool_str66[sizeof("lt")];
+    char uniname2ctype_pool_str68[sizeof("han")];
+    char uniname2ctype_pool_str70[sizeof("hanunoo")];
+    char uniname2ctype_pool_str71[sizeof("canadianaboriginal")];
+    char uniname2ctype_pool_str73[sizeof("hangul")];
+    char uniname2ctype_pool_str74[sizeof("hani")];
+    char uniname2ctype_pool_str76[sizeof("nchar")];
+    char uniname2ctype_pool_str77[sizeof("zinh")];
+    char uniname2ctype_pool_str83[sizeof("tale")];
+    char uniname2ctype_pool_str85[sizeof("loe")];
+    char uniname2ctype_pool_str86[sizeof("hira")];
+    char uniname2ctype_pool_str91[sizeof("taile")];
+    char uniname2ctype_pool_str92[sizeof("lineseparator")];
+    char uniname2ctype_pool_str94[sizeof("thaa")];
+    char uniname2ctype_pool_str97[sizeof("hiragana")];
+    char uniname2ctype_pool_str98[sizeof("thai")];
+    char uniname2ctype_pool_str100[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str101[sizeof("other")];
+    char uniname2ctype_pool_str103[sizeof("thaana")];
+    char uniname2ctype_pool_str107[sizeof("cher")];
+    char uniname2ctype_pool_str111[sizeof("otherletter")];
+    char uniname2ctype_pool_str113[sizeof("othernumber")];
+    char uniname2ctype_pool_str114[sizeof("letter")];
+    char uniname2ctype_pool_str116[sizeof("sc")];
+    char uniname2ctype_pool_str118[sizeof("so")];
+    char uniname2ctype_pool_str123[sizeof("taiviet")];
+    char uniname2ctype_pool_str128[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str129[sizeof("ethi")];
+    char uniname2ctype_pool_str130[sizeof("cans")];
+    char uniname2ctype_pool_str135[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str136[sizeof("ascii")];
+    char uniname2ctype_pool_str138[sizeof("letternumber")];
+    char uniname2ctype_pool_str139[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str141[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str144[sizeof("idc")];
+    char uniname2ctype_pool_str146[sizeof("oidc")];
+    char uniname2ctype_pool_str147[sizeof("sinhala")];
+    char uniname2ctype_pool_str148[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str151[sizeof("olditalic")];
+    char uniname2ctype_pool_str152[sizeof("di")];
+    char uniname2ctype_pool_str153[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str155[sizeof("odi")];
+    char uniname2ctype_pool_str156[sizeof("dia")];
+    char uniname2ctype_pool_str161[sizeof("otheridstart")];
+    char uniname2ctype_pool_str162[sizeof("oldturkic")];
+    char uniname2ctype_pool_str167[sizeof("diacritic")];
+    char uniname2ctype_pool_str168[sizeof("oldpersian")];
+    char uniname2ctype_pool_str171[sizeof("radical")];
+    char uniname2ctype_pool_str179[sizeof("sinh")];
+    char uniname2ctype_pool_str183[sizeof("ideo")];
+    char uniname2ctype_pool_str185[sizeof("shavian")];
+    char uniname2ctype_pool_str186[sizeof("format")];
+    char uniname2ctype_pool_str192[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str196[sizeof("vai")];
+    char uniname2ctype_pool_str197[sizeof("vaii")];
+    char uniname2ctype_pool_str202[sizeof("tifinagh")];
+    char uniname2ctype_pool_str203[sizeof("cf")];
+    char uniname2ctype_pool_str205[sizeof("othersymbol")];
+    char uniname2ctype_pool_str207[sizeof("ideographic")];
+    char uniname2ctype_pool_str211[sizeof("inherited")];
+    char uniname2ctype_pool_str212[sizeof("glagolitic")];
+    char uniname2ctype_pool_str218[sizeof("idcontinue")];
+    char uniname2ctype_pool_str220[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str224[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str225[sizeof("s")];
+    char uniname2ctype_pool_str226[sizeof("gothic")];
+    char uniname2ctype_pool_str227[sizeof("cs")];
+    char uniname2ctype_pool_str229[sizeof("avestan")];
+    char uniname2ctype_pool_str235[sizeof("tavt")];
+    char uniname2ctype_pool_str236[sizeof("zs")];
+    char uniname2ctype_pool_str243[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str244[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str245[sizeof("joinc")];
+    char uniname2ctype_pool_str248[sizeof("geor")];
+    char uniname2ctype_pool_str249[sizeof("hang")];
+    char uniname2ctype_pool_str251[sizeof("georgian")];
+    char uniname2ctype_pool_str253[sizeof("cased")];
+    char uniname2ctype_pool_str256[sizeof("joincontrol")];
+    char uniname2ctype_pool_str257[sizeof("oids")];
+    char uniname2ctype_pool_str260[sizeof("variationselector")];
+    char uniname2ctype_pool_str262[sizeof("graph")];
+    char uniname2ctype_pool_str263[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str264[sizeof("nd")];
+    char uniname2ctype_pool_str268[sizeof("goth")];
+    char uniname2ctype_pool_str269[sizeof("pc")];
+    char uniname2ctype_pool_str271[sizeof("po")];
+    char uniname2ctype_pool_str272[sizeof("ogrext")];
+    char uniname2ctype_pool_str276[sizeof("coptic")];
+    char uniname2ctype_pool_str277[sizeof("grext")];
+    char uniname2ctype_pool_str282[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str285[sizeof("idst")];
+    char uniname2ctype_pool_str288[sizeof("alpha")];
+    char uniname2ctype_pool_str289[sizeof("pi")];
+    char uniname2ctype_pool_str292[sizeof("dsrt")];
+    char uniname2ctype_pool_str297[sizeof("dash")];
+    char uniname2ctype_pool_str298[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str302[sizeof("copt")];
+    char uniname2ctype_pool_str306[sizeof("idstart")];
+    char uniname2ctype_pool_str307[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str309[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str312[sizeof("lepc")];
+    char uniname2ctype_pool_str317[sizeof("avst")];
+    char uniname2ctype_pool_str318[sizeof("cprt")];
+    char uniname2ctype_pool_str319[sizeof("runic")];
+    char uniname2ctype_pool_str320[sizeof("patsyn")];
+    char uniname2ctype_pool_str321[sizeof("mc")];
+    char uniname2ctype_pool_str326[sizeof("tfng")];
+    char uniname2ctype_pool_str327[sizeof("lepcha")];
+    char uniname2ctype_pool_str328[sizeof("prti")];
+    char uniname2ctype_pool_str329[sizeof("print")];
+    char uniname2ctype_pool_str330[sizeof("phli")];
+    char uniname2ctype_pool_str331[sizeof("mn")];
+    char uniname2ctype_pool_str332[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str334[sizeof("talu")];
+    char uniname2ctype_pool_str335[sizeof("runr")];
+    char uniname2ctype_pool_str337[sizeof("graphemebase")];
+    char uniname2ctype_pool_str338[sizeof("common")];
+    char uniname2ctype_pool_str339[sizeof("alnum")];
+    char uniname2ctype_pool_str340[sizeof("phoenician")];
+    char uniname2ctype_pool_str341[sizeof("deva")];
+    char uniname2ctype_pool_str342[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str343[sizeof("pe")];
+    char uniname2ctype_pool_str344[sizeof("mongolian")];
+    char uniname2ctype_pool_str352[sizeof("armn")];
+    char uniname2ctype_pool_str353[sizeof("deseret")];
+    char uniname2ctype_pool_str354[sizeof("softdotted")];
+    char uniname2ctype_pool_str357[sizeof("armi")];
+    char uniname2ctype_pool_str358[sizeof("devanagari")];
+    char uniname2ctype_pool_str360[sizeof("digit")];
+    char uniname2ctype_pool_str361[sizeof("caseignorable")];
+    char uniname2ctype_pool_str362[sizeof("taml")];
+    char uniname2ctype_pool_str363[sizeof("tamil")];
+    char uniname2ctype_pool_str365[sizeof("telu")];
+    char uniname2ctype_pool_str366[sizeof("ids")];
+    char uniname2ctype_pool_str367[sizeof("armenian")];
+    char uniname2ctype_pool_str370[sizeof("sd")];
+    char uniname2ctype_pool_str372[sizeof("privateuse")];
+    char uniname2ctype_pool_str373[sizeof("assigned")];
+    char uniname2ctype_pool_str375[sizeof("cham")];
+    char uniname2ctype_pool_str377[sizeof("omath")];
+    char uniname2ctype_pool_str378[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str379[sizeof("taitham")];
+    char uniname2ctype_pool_str381[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str387[sizeof("glag")];
+    char uniname2ctype_pool_str388[sizeof("ethiopic")];
+    char uniname2ctype_pool_str390[sizeof("vs")];
+    char uniname2ctype_pool_str395[sizeof("me")];
+    char uniname2ctype_pool_str396[sizeof("cwl")];
+    char uniname2ctype_pool_str400[sizeof("mtei")];
+    char uniname2ctype_pool_str404[sizeof("math")];
+    char uniname2ctype_pool_str407[sizeof("term")];
+    char uniname2ctype_pool_str408[sizeof("java")];
+    char uniname2ctype_pool_str410[sizeof("tglg")];
+    char uniname2ctype_pool_str413[sizeof("lower")];
+    char uniname2ctype_pool_str414[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str417[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str418[sizeof("tagalog")];
+    char uniname2ctype_pool_str419[sizeof("patws")];
+    char uniname2ctype_pool_str420[sizeof("lisu")];
+    char uniname2ctype_pool_str426[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str427[sizeof("space")];
+    char uniname2ctype_pool_str429[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str430[sizeof("saur")];
+    char uniname2ctype_pool_str435[sizeof("uideo")];
+    char uniname2ctype_pool_str438[sizeof("lowercase")];
+    char uniname2ctype_pool_str440[sizeof("rjng")];
+    char uniname2ctype_pool_str442[sizeof("osma")];
+    char uniname2ctype_pool_str444[sizeof("linb")];
+    char uniname2ctype_pool_str445[sizeof("bali")];
+    char uniname2ctype_pool_str448[sizeof("cwt")];
+    char uniname2ctype_pool_str449[sizeof("separator")];
+    char uniname2ctype_pool_str450[sizeof("othermath")];
+    char uniname2ctype_pool_str451[sizeof("unassigned")];
+    char uniname2ctype_pool_str454[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str455[sizeof("arab")];
+    char uniname2ctype_pool_str458[sizeof("samr")];
+    char uniname2ctype_pool_str459[sizeof("brai")];
+    char uniname2ctype_pool_str460[sizeof("sundanese")];
+    char uniname2ctype_pool_str462[sizeof("samaritan")];
+    char uniname2ctype_pool_str463[sizeof("ahex")];
+    char uniname2ctype_pool_str465[sizeof("linearb")];
+    char uniname2ctype_pool_str467[sizeof("pf")];
+    char uniname2ctype_pool_str469[sizeof("ext")];
+    char uniname2ctype_pool_str474[sizeof("olck")];
+    char uniname2ctype_pool_str476[sizeof("nko")];
+    char uniname2ctype_pool_str477[sizeof("nkoo")];
+    char uniname2ctype_pool_str479[sizeof("newline")];
+    char uniname2ctype_pool_str480[sizeof("tibetan")];
+    char uniname2ctype_pool_str481[sizeof("javanese")];
+    char uniname2ctype_pool_str485[sizeof("bengali")];
+    char uniname2ctype_pool_str486[sizeof("newtailue")];
+    char uniname2ctype_pool_str487[sizeof("kana")];
+    char uniname2ctype_pool_str488[sizeof("olchiki")];
+    char uniname2ctype_pool_str489[sizeof("kali")];
+    char uniname2ctype_pool_str490[sizeof("cwcf")];
+    char uniname2ctype_pool_str491[sizeof("ps")];
+    char uniname2ctype_pool_str493[sizeof("braille")];
+    char uniname2ctype_pool_str494[sizeof("tibt")];
+    char uniname2ctype_pool_str502[sizeof("sterm")];
+    char uniname2ctype_pool_str504[sizeof("ugar")];
+    char uniname2ctype_pool_str505[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str508[sizeof("phag")];
+    char uniname2ctype_pool_str509[sizeof("kaithi")];
+    char uniname2ctype_pool_str512[sizeof("xidc")];
+    char uniname2ctype_pool_str514[sizeof("balinese")];
+    char uniname2ctype_pool_str515[sizeof("mong")];
+    char uniname2ctype_pool_str516[sizeof("ogam")];
+    char uniname2ctype_pool_str520[sizeof("modifierletter")];
+    char uniname2ctype_pool_str521[sizeof("ugaritic")];
+    char uniname2ctype_pool_str522[sizeof("katakana")];
+    char uniname2ctype_pool_str523[sizeof("pd")];
+    char uniname2ctype_pool_str525[sizeof("hebr")];
+    char uniname2ctype_pool_str531[sizeof("p")];
+    char uniname2ctype_pool_str533[sizeof("orkh")];
+    char uniname2ctype_pool_str536[sizeof("word")];
+    char uniname2ctype_pool_str537[sizeof("saurashtra")];
+    char uniname2ctype_pool_str538[sizeof("khar")];
+    char uniname2ctype_pool_str539[sizeof("sund")];
+    char uniname2ctype_pool_str542[sizeof("zp")];
+    char uniname2ctype_pool_str548[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str552[sizeof("xidstart")];
+    char uniname2ctype_pool_str553[sizeof("shaw")];
+    char uniname2ctype_pool_str554[sizeof("kthi")];
+    char uniname2ctype_pool_str556[sizeof("ogham")];
+    char uniname2ctype_pool_str558[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str559[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str560[sizeof("sarb")];
+    char uniname2ctype_pool_str562[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str564[sizeof("bidic")];
+    char uniname2ctype_pool_str570[sizeof("deprecated")];
+    char uniname2ctype_pool_str573[sizeof("xdigit")];
+    char uniname2ctype_pool_str575[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str584[sizeof("lu")];
+    char uniname2ctype_pool_str587[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str590[sizeof("extender")];
+    char uniname2ctype_pool_str593[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str594[sizeof("cherokee")];
+    char uniname2ctype_pool_str595[sizeof("punct")];
+    char uniname2ctype_pool_str597[sizeof("phagspa")];
+    char uniname2ctype_pool_str598[sizeof("oupper")];
+    char uniname2ctype_pool_str599[sizeof("lyci")];
+    char uniname2ctype_pool_str601[sizeof("whitespace")];
+    char uniname2ctype_pool_str602[sizeof("lycian")];
+    char uniname2ctype_pool_str603[sizeof("yi")];
+    char uniname2ctype_pool_str606[sizeof("cyrl")];
+    char uniname2ctype_pool_str608[sizeof("knda")];
+    char uniname2ctype_pool_str610[sizeof("orya")];
+    char uniname2ctype_pool_str611[sizeof("cyrillic")];
+    char uniname2ctype_pool_str616[sizeof("yiii")];
+    char uniname2ctype_pool_str618[sizeof("kannada")];
+    char uniname2ctype_pool_str623[sizeof("xids")];
+    char uniname2ctype_pool_str626[sizeof("limbu")];
+    char uniname2ctype_pool_str635[sizeof("m")];
+    char uniname2ctype_pool_str638[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str639[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str640[sizeof("lm")];
+    char uniname2ctype_pool_str645[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str646[sizeof("tagb")];
+    char uniname2ctype_pool_str649[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str651[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str652[sizeof("surrogate")];
+    char uniname2ctype_pool_str653[sizeof("beng")];
+    char uniname2ctype_pool_str654[sizeof("number")];
+    char uniname2ctype_pool_str656[sizeof("telugu")];
+    char uniname2ctype_pool_str660[sizeof("rejang")];
+    char uniname2ctype_pool_str661[sizeof("malayalam")];
+    char uniname2ctype_pool_str674[sizeof("idsb")];
+    char uniname2ctype_pool_str676[sizeof("hexdigit")];
+    char uniname2ctype_pool_str677[sizeof("xpeo")];
+    char uniname2ctype_pool_str689[sizeof("phnx")];
+    char uniname2ctype_pool_str692[sizeof("bopo")];
+    char uniname2ctype_pool_str698[sizeof("bopomofo")];
+    char uniname2ctype_pool_str699[sizeof("dep")];
+    char uniname2ctype_pool_str701[sizeof("sylo")];
+    char uniname2ctype_pool_str705[sizeof("grbase")];
+    char uniname2ctype_pool_str706[sizeof("alphabetic")];
+    char uniname2ctype_pool_str707[sizeof("cwcm")];
+    char uniname2ctype_pool_str708[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str709[sizeof("grek")];
+    char uniname2ctype_pool_str710[sizeof("greek")];
+    char uniname2ctype_pool_str714[sizeof("syrc")];
+    char uniname2ctype_pool_str717[sizeof("syriac")];
+    char uniname2ctype_pool_str722[sizeof("cuneiform")];
+    char uniname2ctype_pool_str723[sizeof("gujr")];
+    char uniname2ctype_pool_str726[sizeof("lydi")];
+    char uniname2ctype_pool_str727[sizeof("gujarati")];
+    char uniname2ctype_pool_str728[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str729[sizeof("lydian")];
+    char uniname2ctype_pool_str748[sizeof("sm")];
+    char uniname2ctype_pool_str751[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str755[sizeof("limb")];
+    char uniname2ctype_pool_str758[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str786[sizeof("guru")];
+    char uniname2ctype_pool_str797[sizeof("qmark")];
+    char uniname2ctype_pool_str809[sizeof("mark")];
+    char uniname2ctype_pool_str820[sizeof("quotationmark")];
+    char uniname2ctype_pool_str823[sizeof("hex")];
+    char uniname2ctype_pool_str842[sizeof("upper")];
+    char uniname2ctype_pool_str843[sizeof("wspace")];
+    char uniname2ctype_pool_str848[sizeof("khmr")];
+    char uniname2ctype_pool_str849[sizeof("khmer")];
+    char uniname2ctype_pool_str863[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str864[sizeof("spacingmark")];
+    char uniname2ctype_pool_str866[sizeof("punctuation")];
+    char uniname2ctype_pool_str867[sizeof("uppercase")];
+    char uniname2ctype_pool_str878[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str883[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str884[sizeof("cypriot")];
+    char uniname2ctype_pool_str886[sizeof("buhd")];
+    char uniname2ctype_pool_str887[sizeof("buhid")];
+    char uniname2ctype_pool_str895[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str898[sizeof("blank")];
+    char uniname2ctype_pool_str908[sizeof("hyphen")];
+    char uniname2ctype_pool_str909[sizeof("bugi")];
+    char uniname2ctype_pool_str935[sizeof("myanmar")];
+    char uniname2ctype_pool_str937[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str947[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str966[sizeof("cwu")];
+    char uniname2ctype_pool_str975[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str978[sizeof("buginese")];
+    char uniname2ctype_pool_str1022[sizeof("symbol")];
+    char uniname2ctype_pool_str1024[sizeof("osmanya")];
+    char uniname2ctype_pool_str1036[sizeof("bamu")];
+    char uniname2ctype_pool_str1040[sizeof("sk")];
+    char uniname2ctype_pool_str1065[sizeof("bamum")];
+    char uniname2ctype_pool_str1071[sizeof("kayahli")];
+    char uniname2ctype_pool_str1072[sizeof("egyp")];
+    char uniname2ctype_pool_str1140[sizeof("grlink")];
+    char uniname2ctype_pool_str1141[sizeof("xsux")];
+    char uniname2ctype_pool_str1174[sizeof("any")];
+    char uniname2ctype_pool_str1187[sizeof("graphemelink")];
+    char uniname2ctype_pool_str1221[sizeof("mlym")];
+    char uniname2ctype_pool_str1235[sizeof("mymr")];
+    char uniname2ctype_pool_str1277[sizeof("hebrew")];
+    char uniname2ctype_pool_str1542[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str1751[sizeof("zyyy")];
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    "print",
+    "punct",
+#else /* USE_UNICODE_PROPERTIES */
+    "c",
+    "cc",
+    "co",
+    "l",
+    "lo",
+    "no",
+    "n",
+    "ll",
+    "cn",
+    "nl",
+    "lao",
+    "laoo",
+    "zl",
+    "z",
+    "control",
+    "qaac",
+    "ci",
+    "lana",
+    "oalpha",
+    "qaai",
+    "arabic",
+    "cari",
+    "oriya",
+    "carian",
+    "cntrl",
+    "connectorpunctuation",
+    "olower",
+    "latn",
+    "latin",
+    "ital",
+    "hano",
+    "lt",
+    "han",
+    "hanunoo",
+    "canadianaboriginal",
+    "hangul",
+    "hani",
+    "nchar",
+    "zinh",
+    "tale",
+    "loe",
+    "hira",
+    "taile",
+    "lineseparator",
+    "thaa",
+    "hiragana",
+    "thai",
+    "initialpunctuation",
+    "other",
+    "thaana",
+    "cher",
+    "otherletter",
+    "othernumber",
+    "letter",
+    "sc",
+    "so",
+    "taiviet",
+    "noncharactercodepoint",
+    "ethi",
+    "cans",
+    "titlecaseletter",
+    "ascii",
+    "letternumber",
+    "otheralphabetic",
+    "otherlowercase",
+    "idc",
+    "oidc",
+    "sinhala",
+    "terminalpunctuation",
+    "olditalic",
+    "di",
+    "otheridcontinue",
+    "odi",
+    "dia",
+    "otheridstart",
+    "oldturkic",
+    "diacritic",
+    "oldpersian",
+    "radical",
+    "sinh",
+    "ideo",
+    "shavian",
+    "format",
+    "inscriptionalparthian",
+    "vai",
+    "vaii",
+    "tifinagh",
+    "cf",
+    "othersymbol",
+    "ideographic",
+    "inherited",
+    "glagolitic",
+    "idcontinue",
+    "asciihexdigit",
+    "inscriptionalpahlavi",
+    "s",
+    "gothic",
+    "cs",
+    "avestan",
+    "tavt",
+    "zs",
+    "decimalnumber",
+    "tagbanwa",
+    "joinc",
+    "geor",
+    "hang",
+    "georgian",
+    "cased",
+    "joincontrol",
+    "oids",
+    "variationselector",
+    "graph",
+    "changeswhenlowercased",
+    "nd",
+    "goth",
+    "pc",
+    "po",
+    "ogrext",
+    "coptic",
+    "grext",
+    "logicalorderexception",
+    "idst",
+#endif /* USE_UNICODE_PROPERTIES */
+    "alpha",
+#ifdef USE_UNICODE_PROPERTIES
+    "pi",
+    "dsrt",
+    "dash",
+    "otherdefaultignorablecodepoint",
+    "copt",
+    "idstart",
+    "closepunctuation",
+    "changeswhentitlecased",
+    "lepc",
+    "avst",
+    "cprt",
+    "runic",
+    "patsyn",
+    "mc",
+    "tfng",
+    "lepcha",
+    "prti",
+    "print",
+    "phli",
+    "mn",
+    "idsbinaryoperator",
+    "talu",
+    "runr",
+    "graphemebase",
+    "common",
+#endif /* USE_UNICODE_PROPERTIES */
+    "alnum",
+#ifndef USE_UNICODE_PROPERTIES
+    "xdigit",
+    "newline",
+    "upper",
+    "ascii",
+    "cntrl",
+#else /* USE_UNICODE_PROPERTIES */
+    "phoenician",
+    "deva",
+    "changeswhencasefolded",
+    "pe",
+    "mongolian",
+    "armn",
+    "deseret",
+    "softdotted",
+    "armi",
+    "devanagari",
+    "digit",
+    "caseignorable",
+    "taml",
+    "tamil",
+    "telu",
+    "ids",
+    "armenian",
+    "sd",
+    "privateuse",
+    "assigned",
+    "cham",
+    "omath",
+    "otherpunctuation",
+    "taitham",
+    "defaultignorablecodepoint",
+    "glag",
+    "ethiopic",
+    "vs",
+    "me",
+    "cwl",
+    "mtei",
+    "math",
+    "term",
+    "java",
+    "tglg",
+    "lower",
+    "patternwhitespace",
+    "finalpunctuation",
+    "tagalog",
+    "patws",
+    "lisu",
+    "otheruppercase",
+#endif /* USE_UNICODE_PROPERTIES */
+    "space",
+#ifdef USE_UNICODE_PROPERTIES
+    "graphemeextend",
+    "saur",
+    "uideo",
+    "lowercase",
+    "rjng",
+    "osma",
+    "linb",
+    "bali",
+    "cwt",
+    "separator",
+    "othermath",
+    "unassigned",
+    "lowercaseletter",
+    "arab",
+    "samr",
+    "brai",
+    "sundanese",
+    "samaritan",
+    "ahex",
+    "linearb",
+    "pf",
+    "ext",
+    "olck",
+    "nko",
+    "nkoo",
+    "newline",
+    "tibetan",
+    "javanese",
+    "bengali",
+    "newtailue",
+    "kana",
+    "olchiki",
+    "kali",
+    "cwcf",
+    "ps",
+    "braille",
+    "tibt",
+    "sterm",
+    "ugar",
+    "nonspacingmark",
+    "phag",
+    "kaithi",
+    "xidc",
+    "balinese",
+    "mong",
+    "ogam",
+    "modifierletter",
+    "ugaritic",
+    "katakana",
+    "pd",
+    "hebr",
+    "p",
+    "orkh",
+#endif /* USE_UNICODE_PROPERTIES */
+    "word",
+#ifndef USE_UNICODE_PROPERTIES
+    "lower",
+    "graph",
+    "digit",
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "saurashtra",
+    "khar",
+    "sund",
+    "zp",
+    "changeswhenuppercased",
+    "xidstart",
+    "shaw",
+    "kthi",
+    "ogham",
+    "spaceseparator",
+    "changeswhencasemapped",
+    "sarb",
+    "xidcontinue",
+    "bidic",
+    "deprecated",
+    "xdigit",
+    "bidicontrol",
+    "lu",
+    "dashpunctuation",
+    "extender",
+    "idstrinaryoperator",
+    "cherokee",
+    "punct",
+    "phagspa",
+    "oupper",
+    "lyci",
+    "whitespace",
+    "lycian",
+    "yi",
+    "cyrl",
+    "knda",
+    "orya",
+    "cyrillic",
+    "yiii",
+    "kannada",
+    "xids",
+    "limbu",
+    "m",
+    "unifiedideograph",
+    "paragraphseparator",
+    "lm",
+    "openpunctuation",
+    "tagb",
+    "kharoshthi",
+    "enclosingmark",
+    "surrogate",
+    "beng",
+    "number",
+    "telugu",
+    "rejang",
+    "malayalam",
+    "idsb",
+    "hexdigit",
+    "xpeo",
+    "phnx",
+    "bopo",
+    "bopomofo",
+    "dep",
+    "sylo",
+    "grbase",
+    "alphabetic",
+    "cwcm",
+    "patternsyntax",
+    "grek",
+    "greek",
+    "syrc",
+    "syriac",
+    "cuneiform",
+    "gujr",
+    "lydi",
+    "gujarati",
+    "sylotinagri",
+    "lydian",
+    "sm",
+    "currencysymbol",
+    "limb",
+    "othergraphemeextend",
+    "guru",
+    "qmark",
+    "mark",
+    "quotationmark",
+    "hex",
+    "upper",
+    "wspace",
+    "khmr",
+    "khmer",
+    "oldsoutharabian",
+    "spacingmark",
+    "punctuation",
+    "uppercase",
+    "meeteimayek",
+    "uppercaseletter",
+    "cypriot",
+    "buhd",
+    "buhid",
+    "modifiersymbol",
+    "blank",
+    "hyphen",
+    "bugi",
+    "myanmar",
+    "imperialaramaic",
+    "mathsymbol",
+    "cwu",
+    "gurmukhi",
+    "buginese",
+    "symbol",
+    "osmanya",
+    "bamu",
+    "sk",
+    "bamum",
+    "kayahli",
+    "egyp",
+    "grlink",
+    "xsux",
+    "any",
+    "graphemelink",
+    "mlym",
+    "mymr",
+    "hebrew",
+    "egyptianhieroglyphs",
+    "zyyy"
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct uniname2ctype_struct *
+uniname2ctype_p (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const struct uniname2ctype_struct wordlist[] =
+    {
+#ifdef USE_UNICODE_PROPERTIES
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3,                                        17},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5,                                       18},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                       21},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                        23},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                       26},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                       36},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                        33},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                       24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                       20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                       35},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                      93},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     93},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       51},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                        50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22,                                  18},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24,                                    127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25,                                       59},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28,                                    150},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33,                                  175},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                                    113},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40,                                   79},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41,                                    147},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43,                                    86},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44,                                  147},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                     3},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49,                     38},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50,                                  179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                     74},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52,                                    74},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                    110},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65,                                    115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66,                                       27},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68,                                     108},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                 115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                      100},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                   97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                    108},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                   181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77,                                    113},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83,                                    119},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85,                                     190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86,                                    105},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                                   119},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                            51},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94,                                     81},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97,                                105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                     92},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                       42},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                                    17},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                   81},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107,                                     99},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111,                              26},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113,                              36},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                                   23},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                                       46},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118,                                       49},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                 151},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                   181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129,                                     98},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130,                                    100},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                          27},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                    14},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138,                             35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139,                         175},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                          179},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                      66},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146,                                    192},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                                  91},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                     171},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                               110},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                       69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                         192},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155,                                     187},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156,                                     177},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                            191},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162,                               163},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167,                               177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str168,                              132},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                                 185},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179,                                     91},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                                    176},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185,                                 122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186,                                   19},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192,                   161},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str196,                                     142},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                                    142},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                130},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                       19},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205,                              49},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                             176},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str211,                               113},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                              129},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                               66},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                           174},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224,                    162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225,                                        45},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226,                                  111},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                       22},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229,                                 152},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235,                                    151},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236,                                       53},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                            34},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244,                                117},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                   167},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248,                                     96},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str249,                                     97},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                                 96},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253,                                    58},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                             167},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257,                                    191},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260,                       194},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                    60},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264,                                       34},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                                    111},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                       38},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                       43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272,                                  182},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276,                                  127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str277,                                    70},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str282,                   190},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                    184},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str289,                                       42},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    112},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297,                                    168},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298,          187},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                    127},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306,                                  65},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                         40},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                    62},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str312,                                    140},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                    152},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318,                                    124},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319,                                   102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                                  196},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                       30},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326,                                    130},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                                  140},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328,                                    161},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                                     7},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                    162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331,                                       32},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332,                       183},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334,                                    128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                    102},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                             71},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str338,                                   73},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339,                                    13},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                              136},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                     82},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                    63},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                                       40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                               104},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352,                                     77},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                                 112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354,                              189},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357,                                    159},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,                               82},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                                     4},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                            59},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                     87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                    87},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365,                                     88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                      65},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                 77},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370,                                      189},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                               21},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373,                                 16},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                    149},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str377,                                   172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378,                         43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                                 150},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381,                69},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387,                                    129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                 98},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                      194},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                                       31},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396,                                      60},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400,                                    158},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str404,                                     54},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407,                                    171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                                    157},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410,                                    114},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                                     6},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                       195},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str417,                         41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418,                                 114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                   195},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420,                                    155},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426,                          180},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                     9},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429,                           70},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                    143},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str435,                                   186},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438,                                56},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str440,                                    145},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    123},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str444,                                    120},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                    134},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str448,                                      62},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449,                                50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450,                               172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451,                               20},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454,                          24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455,                                     79},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                    154},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459,                                    125},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                               139},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                               154},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463,                                    174},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                                 120},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467,                                       41},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,                                     178},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    141},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476,                                     138},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477,                                    138},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479,                                   0},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                                  94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481,                                157},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,                                  83},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486,                               128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                                    106},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488,                                 141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    144},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490,                                     63},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491,                                       44},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                                 125},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494,                                     94},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                   193},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                                    121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str505,                           32},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                    137},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                  164},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512,                                     68},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514,                                134},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515,                                    104},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    101},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                           25},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                                121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                                106},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                       39},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str525,                                     78},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531,                                        37},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533,                                    163},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                                     12},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537,                              143},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                    133},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str539,                                    139},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542,                                       52},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548,                    61},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str552,                                 67},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553,                                    122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,                                    164},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556,                                   101},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558,                           53},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str559,                    64},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560,                                    160},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                              68},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564,                                   166},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570,                              188},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                   11},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575,                             166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                       28},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                          39},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str590,                                178},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                      184},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                                 99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str595,                                     8},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                                 137},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                  180},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                    146},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                              165},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602,                                  146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603,                                      109},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str606,                                     76},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                     89},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str610,                                     86},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611,                                 76},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616,                                    109},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                                  89},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                     67},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                   118},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str635,                                        29},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638,                        186},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639,                       52},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                       25},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str645,                          44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                    117},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649,                              133},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651,                            31},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str652,                                22},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653,                                     83},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654,                                   33},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                   88},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                  145},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str661,                                90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str674,                                    183},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676,                                173},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677,                                    132},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str689,                                    136},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    107},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698,                                107},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699,                                     188},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                    131},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                   71},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706,                               55},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707,                                     64},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                           196},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709,                                     75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                                    75},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str714,                                     80},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str717,                                   80},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                               135},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str723,                                     85},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str726,                                    148},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                                 85},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728,                             131},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                                  148},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748,                                       48},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str751,                           46},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str755,                                    118},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758,                     182},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str786,                                     84},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                                   170},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str809,                                     29},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                           170},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823,                                     173},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str842,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str843,                                  165},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str848,                                    103},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849,                                   103},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str863,                         160},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864,                              30},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,                              37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867,                                57},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878,                             158},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str883,                          28},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884,                                 124},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str886,                                    116},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str887,                                   116},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str895,                           47},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                                     2},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str908,                                  169},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909,                                    126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str935,                                  95},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937,                         159},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                               48},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966,                                      61},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str975,                                 84},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str978,                                126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#endif /* USE_UNICODE_PROPERTIES */
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#ifndef USE_UNICODE_PROPERTIES
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                     7},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                     8},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                    13},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                   11},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                   0},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     3},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     9},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     12},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     6},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                     4},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                     2}
+#else /* USE_UNICODE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1022,                                   45},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1024,                                 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036,                                    156},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040,                                       47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                                   156},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071,                                 144},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                    153},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                                   72},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141,                                    135},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1174,                                      15},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187,                             72},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1221,                                     90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235,                                     95},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1277,                                   78},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1542,                     153},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1751,                                     73}
+#endif /* USE_UNICODE_PROPERTIES */
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = uniname2ctype_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + uniname2ctype_pool;
+
+              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+
+static int
+uniname2ctype(const UChar *name, unsigned int len)
+{
+  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
+  if (p) return p->ctype;
+  return -1;
+}
diff --git a/enc/unicode/name2ctype.kwd b/enc/unicode/name2ctype.kwd
new file mode 100644
index 0000000000..ff136177ca
--- /dev/null
+++ b/enc/unicode/name2ctype.kwd
@@ -0,0 +1,16711 @@
+%{
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	485,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	20,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xd800, 0xf8ff,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xf0000, 0xffffd,
+	0x100000, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+static const OnigCodePoint CR_Cc[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cc */
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	485,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0526, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0604, 0x0605,
+	0x061c, 0x061d,
+	0x0620, 0x0620,
+	0x065f, 0x065f,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x08ff,
+	0x093a, 0x093b,
+	0x094f, 0x094f,
+	0x0956, 0x0957,
+	0x0973, 0x0978,
+	0x0980, 0x0980,
+	0x0984, 0x0984,
+	0x098d, 0x098e,
+	0x0991, 0x0992,
+	0x09a9, 0x09a9,
+	0x09b1, 0x09b1,
+	0x09b3, 0x09b5,
+	0x09ba, 0x09bb,
+	0x09c5, 0x09c6,
+	0x09c9, 0x09ca,
+	0x09cf, 0x09d6,
+	0x09d8, 0x09db,
+	0x09de, 0x09de,
+	0x09e4, 0x09e5,
+	0x09fc, 0x0a00,
+	0x0a04, 0x0a04,
+	0x0a0b, 0x0a0e,
+	0x0a11, 0x0a12,
+	0x0a29, 0x0a29,
+	0x0a31, 0x0a31,
+	0x0a34, 0x0a34,
+	0x0a37, 0x0a37,
+	0x0a3a, 0x0a3b,
+	0x0a3d, 0x0a3d,
+	0x0a43, 0x0a46,
+	0x0a49, 0x0a4a,
+	0x0a4e, 0x0a50,
+	0x0a52, 0x0a58,
+	0x0a5d, 0x0a5d,
+	0x0a5f, 0x0a65,
+	0x0a76, 0x0a80,
+	0x0a84, 0x0a84,
+	0x0a8e, 0x0a8e,
+	0x0a92, 0x0a92,
+	0x0aa9, 0x0aa9,
+	0x0ab1, 0x0ab1,
+	0x0ab4, 0x0ab4,
+	0x0aba, 0x0abb,
+	0x0ac6, 0x0ac6,
+	0x0aca, 0x0aca,
+	0x0ace, 0x0acf,
+	0x0ad1, 0x0adf,
+	0x0ae4, 0x0ae5,
+	0x0af0, 0x0af0,
+	0x0af2, 0x0b00,
+	0x0b04, 0x0b04,
+	0x0b0d, 0x0b0e,
+	0x0b11, 0x0b12,
+	0x0b29, 0x0b29,
+	0x0b31, 0x0b31,
+	0x0b34, 0x0b34,
+	0x0b3a, 0x0b3b,
+	0x0b45, 0x0b46,
+	0x0b49, 0x0b4a,
+	0x0b4e, 0x0b55,
+	0x0b58, 0x0b5b,
+	0x0b5e, 0x0b5e,
+	0x0b64, 0x0b65,
+	0x0b72, 0x0b81,
+	0x0b84, 0x0b84,
+	0x0b8b, 0x0b8d,
+	0x0b91, 0x0b91,
+	0x0b96, 0x0b98,
+	0x0b9b, 0x0b9b,
+	0x0b9d, 0x0b9d,
+	0x0ba0, 0x0ba2,
+	0x0ba5, 0x0ba7,
+	0x0bab, 0x0bad,
+	0x0bba, 0x0bbd,
+	0x0bc3, 0x0bc5,
+	0x0bc9, 0x0bc9,
+	0x0bce, 0x0bcf,
+	0x0bd1, 0x0bd6,
+	0x0bd8, 0x0be5,
+	0x0bfb, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c34, 0x0c34,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5a, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c77,
+	0x0c80, 0x0c81,
+	0x0c84, 0x0c84,
+	0x0c8d, 0x0c8d,
+	0x0c91, 0x0c91,
+	0x0ca9, 0x0ca9,
+	0x0cb4, 0x0cb4,
+	0x0cba, 0x0cbb,
+	0x0cc5, 0x0cc5,
+	0x0cc9, 0x0cc9,
+	0x0cce, 0x0cd4,
+	0x0cd7, 0x0cdd,
+	0x0cdf, 0x0cdf,
+	0x0ce4, 0x0ce5,
+	0x0cf0, 0x0cf0,
+	0x0cf3, 0x0d01,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d29, 0x0d29,
+	0x0d3a, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4e, 0x0d56,
+	0x0d58, 0x0d5f,
+	0x0d64, 0x0d65,
+	0x0d76, 0x0d78,
+	0x0d80, 0x0d81,
+	0x0d84, 0x0d84,
+	0x0d97, 0x0d99,
+	0x0db2, 0x0db2,
+	0x0dbc, 0x0dbc,
+	0x0dbe, 0x0dbf,
+	0x0dc7, 0x0dc9,
+	0x0dcb, 0x0dce,
+	0x0dd5, 0x0dd5,
+	0x0dd7, 0x0dd7,
+	0x0de0, 0x0df1,
+	0x0df5, 0x0e00,
+	0x0e3b, 0x0e3e,
+	0x0e5c, 0x0e80,
+	0x0e83, 0x0e83,
+	0x0e85, 0x0e86,
+	0x0e89, 0x0e89,
+	0x0e8b, 0x0e8c,
+	0x0e8e, 0x0e93,
+	0x0e98, 0x0e98,
+	0x0ea0, 0x0ea0,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	0x0ea8, 0x0ea9,
+	0x0eac, 0x0eac,
+	0x0eba, 0x0eba,
+	0x0ebe, 0x0ebf,
+	0x0ec5, 0x0ec5,
+	0x0ec7, 0x0ec7,
+	0x0ece, 0x0ecf,
+	0x0eda, 0x0edb,
+	0x0ede, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f8c, 0x0f8f,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fd9, 0x0fff,
+	0x10c6, 0x10cf,
+	0x10fd, 0x10ff,
+	0x1249, 0x1249,
+	0x124e, 0x124f,
+	0x1257, 0x1257,
+	0x1259, 0x1259,
+	0x125e, 0x125f,
+	0x1289, 0x1289,
+	0x128e, 0x128f,
+	0x12b1, 0x12b1,
+	0x12b6, 0x12b7,
+	0x12bf, 0x12bf,
+	0x12c1, 0x12c1,
+	0x12c6, 0x12c7,
+	0x12d7, 0x12d7,
+	0x1311, 0x1311,
+	0x1316, 0x1317,
+	0x135b, 0x135e,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f5, 0x13ff,
+	0x169d, 0x169f,
+	0x16f1, 0x16ff,
+	0x170d, 0x170d,
+	0x1715, 0x171f,
+	0x1737, 0x173f,
+	0x1754, 0x175f,
+	0x176d, 0x176d,
+	0x1771, 0x1771,
+	0x1774, 0x177f,
+	0x17de, 0x17df,
+	0x17ea, 0x17ef,
+	0x17fa, 0x17ff,
+	0x180f, 0x180f,
+	0x181a, 0x181f,
+	0x1878, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191d, 0x191f,
+	0x192c, 0x192f,
+	0x193c, 0x193f,
+	0x1941, 0x1943,
+	0x196e, 0x196f,
+	0x1975, 0x197f,
+	0x19ac, 0x19af,
+	0x19ca, 0x19cf,
+	0x19db, 0x19dd,
+	0x1a1c, 0x1a1d,
+	0x1a5f, 0x1a5f,
+	0x1a7d, 0x1a7e,
+	0x1a8a, 0x1a8f,
+	0x1a9a, 0x1a9f,
+	0x1aae, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bab, 0x1bad,
+	0x1bba, 0x1bff,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1ccf,
+	0x1cf3, 0x1cff,
+	0x1de7, 0x1dfc,
+	0x1f16, 0x1f17,
+	0x1f1e, 0x1f1f,
+	0x1f46, 0x1f47,
+	0x1f4e, 0x1f4f,
+	0x1f58, 0x1f58,
+	0x1f5a, 0x1f5a,
+	0x1f5c, 0x1f5c,
+	0x1f5e, 0x1f5e,
+	0x1f7e, 0x1f7f,
+	0x1fb5, 0x1fb5,
+	0x1fc5, 0x1fc5,
+	0x1fd4, 0x1fd5,
+	0x1fdc, 0x1fdc,
+	0x1ff0, 0x1ff1,
+	0x1ff5, 0x1ff5,
+	0x1fff, 0x1fff,
+	0x2065, 0x2069,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x2095, 0x209f,
+	0x20b9, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23e9, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x26ce, 0x26ce,
+	0x26e2, 0x26e2,
+	0x26e4, 0x26e7,
+	0x2700, 0x2700,
+	0x2705, 0x2705,
+	0x270a, 0x270b,
+	0x2728, 0x2728,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x275f, 0x2760,
+	0x2795, 0x2797,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x27cb, 0x27cb,
+	0x27cd, 0x27cf,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf2, 0x2cf8,
+	0x2d26, 0x2d2f,
+	0x2d66, 0x2d6e,
+	0x2d70, 0x2d7f,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e32, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31b8, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcc, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa660, 0xa661,
+	0xa674, 0xa67b,
+	0xa698, 0xa69f,
+	0xa6f8, 0xa6ff,
+	0xa78d, 0xa7fa,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c5, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa8fc, 0xa8ff,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9e0, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaa7c, 0xaa7f,
+	0xaac3, 0xaada,
+	0xaae0, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa2e, 0xfa2f,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbb2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe27, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xfefe,
+	0xff00, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfff8,
+	0xfffe, 0xffff,
+	0x1000c, 0x1000c,
+	0x10027, 0x10027,
+	0x1003b, 0x1003b,
+	0x1003e, 0x1003e,
+	0x1004e, 0x1004f,
+	0x1005e, 0x1007f,
+	0x100fb, 0x100ff,
+	0x10103, 0x10106,
+	0x10134, 0x10136,
+	0x1018b, 0x1018f,
+	0x1019c, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102ff,
+	0x1031f, 0x1031f,
+	0x10324, 0x1032f,
+	0x1034b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x10860, 0x108ff,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x109ff,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a34, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a48, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10a80, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b80, 0x10bff,
+	0x10c49, 0x10e5f,
+	0x10e7f, 0x1107f,
+	0x110c2, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1de, 0x1d1ff,
+	0x1d246, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d372, 0x1d3ff,
+	0x1d455, 0x1d455,
+	0x1d49d, 0x1d49d,
+	0x1d4a0, 0x1d4a1,
+	0x1d4a3, 0x1d4a4,
+	0x1d4a7, 0x1d4a8,
+	0x1d4ad, 0x1d4ad,
+	0x1d4ba, 0x1d4ba,
+	0x1d4bc, 0x1d4bc,
+	0x1d4c4, 0x1d4c4,
+	0x1d506, 0x1d506,
+	0x1d50b, 0x1d50c,
+	0x1d515, 0x1d515,
+	0x1d51d, 0x1d51d,
+	0x1d53a, 0x1d53a,
+	0x1d53f, 0x1d53f,
+	0x1d545, 0x1d545,
+	0x1d547, 0x1d549,
+	0x1d551, 0x1d551,
+	0x1d6a6, 0x1d6a7,
+	0x1d7cc, 0x1d7cd,
+	0x1d800, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f130,
+	0x1f132, 0x1f13c,
+	0x1f13e, 0x1f13e,
+	0x1f140, 0x1f141,
+	0x1f143, 0x1f145,
+	0x1f147, 0x1f149,
+	0x1f14f, 0x1f156,
+	0x1f158, 0x1f15e,
+	0x1f160, 0x1f178,
+	0x1f17a, 0x1f17a,
+	0x1f17d, 0x1f17e,
+	0x1f180, 0x1f189,
+	0x1f18e, 0x1f18f,
+	0x1f191, 0x1f1ff,
+	0x1f201, 0x1f20f,
+	0x1f232, 0x1f23f,
+	0x1f249, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Cn */
+
+/* 'Co': General Category */
+static const OnigCodePoint CR_Co[] = {
+	3,
+	0xe000, 0xf8ff,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Co */
+
+/* 'Cs': General Category */
+static const OnigCodePoint CR_Cs[] = {
+	1,
+	0xd800, 0xdfff,
+}; /* CR_Cs */
+
+/* 'L': Major Category */
+static const OnigCodePoint CR_L[] = {
+	422,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3006,
+	0x3031, 0x3035,
+	0x303b, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	599,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02af,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d62, 0x1d77,
+	0x1d79, 0x1d9a,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2184, 0x2184,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7c,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa771, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Ll */
+
+/* 'Lm': General Category */
+static const OnigCodePoint CR_Lm[] = {
+	49,
+	0x02b0, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0374, 0x0374,
+	0x037a, 0x037a,
+	0x0559, 0x0559,
+	0x0640, 0x0640,
+	0x06e5, 0x06e6,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0971, 0x0971,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x10fc, 0x10fc,
+	0x17d7, 0x17d7,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c78, 0x1c7d,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2c7d, 0x2c7d,
+	0x2d6f, 0x2d6f,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa67f, 0xa67f,
+	0xa717, 0xa71f,
+	0xa770, 0xa770,
+	0xa788, 0xa788,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	311,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x0800, 0x0815,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e45,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17dc, 0x17dc,
+	0x1820, 0x1842,
+	0x1844, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x2135, 0x2138,
+	0x2d30, 0x2d65,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3006, 0x3006,
+	0x303c, 0x303c,
+	0x3041, 0x3096,
+	0x309f, 0x309f,
+	0x30a1, 0x30fa,
+	0x30ff, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa014,
+	0xa016, 0xa48c,
+	0xa4d0, 0xa4f7,
+	0xa500, 0xa60b,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa66e, 0xa66e,
+	0xa6a0, 0xa6e5,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa6f,
+	0xaa71, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadc,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10450, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Lo */
+
+/* 'Lt': General Category */
+static const OnigCodePoint CR_Lt[] = {
+	10,
+	0x01c5, 0x01c5,
+	0x01c8, 0x01c8,
+	0x01cb, 0x01cb,
+	0x01f2, 0x01f2,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fbc, 0x1fbc,
+	0x1fcc, 0x1fcc,
+	0x1ffc, 0x1ffc,
+}; /* CR_Lt */
+
+/* 'Lu': General Category */
+static const OnigCodePoint CR_Lu[] = {
+	594,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2183, 0x2183,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Lu */
+
+/* 'M': Major Category */
+static const OnigCodePoint CR_M[] = {
+	188,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0903,
+	0x093c, 0x093c,
+	0x093e, 0x094e,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abc, 0x0abc,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbc, 0x0cbc,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b04,
+	0x1b34, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1baa,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf2,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa953,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9c0,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11082,
+	0x110b0, 0x110ba,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	106,
+	0x0903, 0x0903,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0982, 0x0983,
+	0x09be, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x0a03, 0x0a03,
+	0x0a3e, 0x0a40,
+	0x0a83, 0x0a83,
+	0x0abe, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0b02, 0x0b03,
+	0x0b3e, 0x0b3e,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c41, 0x0c44,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cbe,
+	0x0cc0, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cd5, 0x0cd6,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd1,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0f3e, 0x0f3f,
+	0x0f7f, 0x0f7f,
+	0x102b, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x1056, 0x1057,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108f, 0x108f,
+	0x109a, 0x109c,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a19, 0x1a1b,
+	0x1a55, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1b04, 0x1b04,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b44,
+	0x1b82, 0x1b82,
+	0x1ba1, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf2,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9c0,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa4d, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	5,
+	0x0488, 0x0489,
+	0x06de, 0x06de,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	194,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	81,
+	0x0030, 0x0039,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x09f4, 0x09f9,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bf2,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7e,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d75,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f33,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x1369, 0x137c,
+	0x16ee, 0x16f0,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x2182,
+	0x2185, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa620, 0xa629,
+	0xa6e6, 0xa6ef,
+	0xa830, 0xa835,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x10107, 0x10133,
+	0x10140, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x104a0, 0x104a9,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x12400, 0x12462,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1f100, 0x1f10a,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+static const OnigCodePoint CR_Nd[] = {
+	37,
+	0x0030, 0x0039,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bef,
+	0x0c66, 0x0c6f,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d6f,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f29,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0xa620, 0xa629,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x104a0, 0x104a9,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
+
+/* 'Nl': General Category */
+static const OnigCodePoint CR_Nl[] = {
+	12,
+	0x16ee, 0x16f0,
+	0x2160, 0x2182,
+	0x2185, 0x2188,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0xa6e6, 0xa6ef,
+	0x10140, 0x10174,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x12400, 0x12462,
+}; /* CR_Nl */
+
+/* 'No': General Category */
+static const OnigCodePoint CR_No[] = {
+	38,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa830, 0xa835,
+	0x10107, 0x10133,
+	0x10175, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x1d360, 0x1d371,
+	0x1f100, 0x1f10a,
+}; /* CR_No */
+
+/* 'P': Major Category */
+static const OnigCodePoint CR_P[] = {
+	129,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00ab, 0x00ab,
+	0x00b7, 0x00b7,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2010, 0x2027,
+	0x2030, 0x2043,
+	0x2045, 0x2051,
+	0x2053, 0x205e,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x2329, 0x232a,
+	0x2768, 0x2775,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x3008, 0x3011,
+	0x3014, 0x301f,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfd3e, 0xfd3f,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff0a,
+	0xff0c, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3b, 0xff3d,
+	0xff3f, 0xff3f,
+	0xff5b, 0xff5b,
+	0xff5d, 0xff5d,
+	0xff5f, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_P */
+
+/* 'Pc': General Category */
+static const OnigCodePoint CR_Pc[] = {
+	6,
+	0x005f, 0x005f,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xff3f, 0xff3f,
+}; /* CR_Pc */
+
+/* 'Pd': General Category */
+static const OnigCodePoint CR_Pd[] = {
+	15,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Pd */
+
+/* 'Pe': General Category */
+static const OnigCodePoint CR_Pe[] = {
+	70,
+	0x0029, 0x0029,
+	0x005d, 0x005d,
+	0x007d, 0x007d,
+	0x0f3b, 0x0f3b,
+	0x0f3d, 0x0f3d,
+	0x169c, 0x169c,
+	0x2046, 0x2046,
+	0x207e, 0x207e,
+	0x208e, 0x208e,
+	0x232a, 0x232a,
+	0x2769, 0x2769,
+	0x276b, 0x276b,
+	0x276d, 0x276d,
+	0x276f, 0x276f,
+	0x2771, 0x2771,
+	0x2773, 0x2773,
+	0x2775, 0x2775,
+	0x27c6, 0x27c6,
+	0x27e7, 0x27e7,
+	0x27e9, 0x27e9,
+	0x27eb, 0x27eb,
+	0x27ed, 0x27ed,
+	0x27ef, 0x27ef,
+	0x2984, 0x2984,
+	0x2986, 0x2986,
+	0x2988, 0x2988,
+	0x298a, 0x298a,
+	0x298c, 0x298c,
+	0x298e, 0x298e,
+	0x2990, 0x2990,
+	0x2992, 0x2992,
+	0x2994, 0x2994,
+	0x2996, 0x2996,
+	0x2998, 0x2998,
+	0x29d9, 0x29d9,
+	0x29db, 0x29db,
+	0x29fd, 0x29fd,
+	0x2e23, 0x2e23,
+	0x2e25, 0x2e25,
+	0x2e27, 0x2e27,
+	0x2e29, 0x2e29,
+	0x3009, 0x3009,
+	0x300b, 0x300b,
+	0x300d, 0x300d,
+	0x300f, 0x300f,
+	0x3011, 0x3011,
+	0x3015, 0x3015,
+	0x3017, 0x3017,
+	0x3019, 0x3019,
+	0x301b, 0x301b,
+	0x301e, 0x301f,
+	0xfd3f, 0xfd3f,
+	0xfe18, 0xfe18,
+	0xfe36, 0xfe36,
+	0xfe38, 0xfe38,
+	0xfe3a, 0xfe3a,
+	0xfe3c, 0xfe3c,
+	0xfe3e, 0xfe3e,
+	0xfe40, 0xfe40,
+	0xfe42, 0xfe42,
+	0xfe44, 0xfe44,
+	0xfe48, 0xfe48,
+	0xfe5a, 0xfe5a,
+	0xfe5c, 0xfe5c,
+	0xfe5e, 0xfe5e,
+	0xff09, 0xff09,
+	0xff3d, 0xff3d,
+	0xff5d, 0xff5d,
+	0xff60, 0xff60,
+	0xff63, 0xff63,
+}; /* CR_Pe */
+
+/* 'Pf': General Category */
+static const OnigCodePoint CR_Pf[] = {
+	10,
+	0x00bb, 0x00bb,
+	0x2019, 0x2019,
+	0x201d, 0x201d,
+	0x203a, 0x203a,
+	0x2e03, 0x2e03,
+	0x2e05, 0x2e05,
+	0x2e0a, 0x2e0a,
+	0x2e0d, 0x2e0d,
+	0x2e1d, 0x2e1d,
+	0x2e21, 0x2e21,
+}; /* CR_Pf */
+
+/* 'Pi': General Category */
+static const OnigCodePoint CR_Pi[] = {
+	11,
+	0x00ab, 0x00ab,
+	0x2018, 0x2018,
+	0x201b, 0x201c,
+	0x201f, 0x201f,
+	0x2039, 0x2039,
+	0x2e02, 0x2e02,
+	0x2e04, 0x2e04,
+	0x2e09, 0x2e09,
+	0x2e0c, 0x2e0c,
+	0x2e1c, 0x2e1c,
+	0x2e20, 0x2e20,
+}; /* CR_Pi */
+
+/* 'Po': General Category */
+static const OnigCodePoint CR_Po[] = {
+	124,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00b7, 0x00b7,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x0589,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x303d, 0x303d,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe10, 0xfe16,
+	0xfe19, 0xfe19,
+	0xfe30, 0xfe30,
+	0xfe45, 0xfe46,
+	0xfe49, 0xfe4c,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xfe5f, 0xfe61,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff07,
+	0xff0a, 0xff0a,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3c, 0xff3c,
+	0xff61, 0xff61,
+	0xff64, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Po */
+
+/* 'Ps': General Category */
+static const OnigCodePoint CR_Ps[] = {
+	72,
+	0x0028, 0x0028,
+	0x005b, 0x005b,
+	0x007b, 0x007b,
+	0x0f3a, 0x0f3a,
+	0x0f3c, 0x0f3c,
+	0x169b, 0x169b,
+	0x201a, 0x201a,
+	0x201e, 0x201e,
+	0x2045, 0x2045,
+	0x207d, 0x207d,
+	0x208d, 0x208d,
+	0x2329, 0x2329,
+	0x2768, 0x2768,
+	0x276a, 0x276a,
+	0x276c, 0x276c,
+	0x276e, 0x276e,
+	0x2770, 0x2770,
+	0x2772, 0x2772,
+	0x2774, 0x2774,
+	0x27c5, 0x27c5,
+	0x27e6, 0x27e6,
+	0x27e8, 0x27e8,
+	0x27ea, 0x27ea,
+	0x27ec, 0x27ec,
+	0x27ee, 0x27ee,
+	0x2983, 0x2983,
+	0x2985, 0x2985,
+	0x2987, 0x2987,
+	0x2989, 0x2989,
+	0x298b, 0x298b,
+	0x298d, 0x298d,
+	0x298f, 0x298f,
+	0x2991, 0x2991,
+	0x2993, 0x2993,
+	0x2995, 0x2995,
+	0x2997, 0x2997,
+	0x29d8, 0x29d8,
+	0x29da, 0x29da,
+	0x29fc, 0x29fc,
+	0x2e22, 0x2e22,
+	0x2e24, 0x2e24,
+	0x2e26, 0x2e26,
+	0x2e28, 0x2e28,
+	0x3008, 0x3008,
+	0x300a, 0x300a,
+	0x300c, 0x300c,
+	0x300e, 0x300e,
+	0x3010, 0x3010,
+	0x3014, 0x3014,
+	0x3016, 0x3016,
+	0x3018, 0x3018,
+	0x301a, 0x301a,
+	0x301d, 0x301d,
+	0xfd3e, 0xfd3e,
+	0xfe17, 0xfe17,
+	0xfe35, 0xfe35,
+	0xfe37, 0xfe37,
+	0xfe39, 0xfe39,
+	0xfe3b, 0xfe3b,
+	0xfe3d, 0xfe3d,
+	0xfe3f, 0xfe3f,
+	0xfe41, 0xfe41,
+	0xfe43, 0xfe43,
+	0xfe47, 0xfe47,
+	0xfe59, 0xfe59,
+	0xfe5b, 0xfe5b,
+	0xfe5d, 0xfe5d,
+	0xff08, 0xff08,
+	0xff3b, 0xff3b,
+	0xff5b, 0xff5b,
+	0xff5f, 0xff5f,
+	0xff62, 0xff62,
+}; /* CR_Ps */
+
+/* 'S': Major Category */
+static const OnigCodePoint CR_S[] = {
+	198,
+	0x0024, 0x0024,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00a2, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b6, 0x00b6,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x20a0, 0x20b8,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x2140, 0x2144,
+	0x214a, 0x214d,
+	0x214f, 0x214f,
+	0x2190, 0x2328,
+	0x232b, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x309b, 0x309c,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xa828, 0xa82b,
+	0xa836, 0xa839,
+	0xaa77, 0xaa79,
+	0xfb29, 0xfb29,
+	0xfdfc, 0xfdfd,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	16,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20b8,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	26,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x309b, 0x309c,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xffe3, 0xffe3,
+}; /* CR_Sk */
+
+/* 'Sm': General Category */
+static const OnigCodePoint CR_Sm[] = {
+	65,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03f6, 0x03f6,
+	0x0606, 0x0608,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x2140, 0x2144,
+	0x214b, 0x214b,
+	0x2190, 0x2194,
+	0x219a, 0x219b,
+	0x21a0, 0x21a0,
+	0x21a3, 0x21a3,
+	0x21a6, 0x21a6,
+	0x21ae, 0x21ae,
+	0x21ce, 0x21cf,
+	0x21d2, 0x21d2,
+	0x21d4, 0x21d4,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b3,
+	0x23dc, 0x23e1,
+	0x25b7, 0x25b7,
+	0x25c1, 0x25c1,
+	0x25f8, 0x25ff,
+	0x266f, 0x266f,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x27ff,
+	0x2900, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	154,
+	0x00a6, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x00b6, 0x00b6,
+	0x0482, 0x0482,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x214a, 0x214a,
+	0x214c, 0x214d,
+	0x214f, 0x214f,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21ad,
+	0x21af, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21f3,
+	0x2300, 0x2307,
+	0x230c, 0x231f,
+	0x2322, 0x2328,
+	0x232b, 0x237b,
+	0x237d, 0x239a,
+	0x23b4, 0x23db,
+	0x23e2, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2b00, 0x2b2f,
+	0x2b45, 0x2b46,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa828, 0xa82b,
+	0xa836, 0xa837,
+	0xa839, 0xa839,
+	0xaa77, 0xaa79,
+	0xfdfd, 0xfdfd,
+	0xffe4, 0xffe4,
+	0xffe8, 0xffe8,
+	0xffed, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_So */
+
+/* 'Z': Major Category */
+static const OnigCodePoint CR_Z[] = {
+	9,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Z */
+
+/* 'Zl': General Category */
+static const OnigCodePoint CR_Zl[] = {
+	1,
+	0x2028, 0x2028,
+}; /* CR_Zl */
+
+/* 'Zp': General Category */
+static const OnigCodePoint CR_Zp[] = {
+	1,
+	0x2029, 0x2029,
+}; /* CR_Zp */
+
+/* 'Zs': General Category */
+static const OnigCodePoint CR_Zs[] = {
+	8,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Zs */
+
+/* 'Math': Derived Property */
+static const OnigCodePoint CR_Math[] = {
+	105,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f6,
+	0x0606, 0x0608,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x2061, 0x2064,
+	0x207a, 0x207e,
+	0x208a, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x2149,
+	0x214b, 0x214b,
+	0x2190, 0x21a7,
+	0x21a9, 0x21ae,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23dc, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b7,
+	0x25bc, 0x25c1,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x25f8, 0x25ff,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266f,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe61, 0xfe66,
+	0xfe68, 0xfe68,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+static const OnigCodePoint CR_Alphabetic[] = {
+	474,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09f0, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a70, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
+
+/* 'Lowercase': Derived Property */
+static const OnigCodePoint CR_Lowercase[] = {
+	602,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037a, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1dbf,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x2090, 0x2094,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7d,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Lowercase */
+
+/* 'Uppercase': Derived Property */
+static const OnigCodePoint CR_Uppercase[] = {
+	596,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Uppercase */
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	110,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+}; /* CR_Cased */
+
+/* 'Case_Ignorable': Derived Property */
+static const OnigCodePoint CR_Case_Ignorable[] = {
+	266,
+	0x0027, 0x0027,
+	0x002e, 0x002e,
+	0x003a, 0x003a,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00ad, 0x00ad,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0387, 0x0387,
+	0x0483, 0x0489,
+	0x0559, 0x0559,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05f4, 0x05f4,
+	0x0600, 0x0603,
+	0x0610, 0x061a,
+	0x0640, 0x0640,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0971, 0x0971,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e46, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x10fc, 0x10fc,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1843, 0x1843,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x200b, 0x200f,
+	0x2018, 0x2019,
+	0x2024, 0x2024,
+	0x2027, 0x2027,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2c7d, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302f,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xa9cf, 0xa9cf,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa70, 0xaa70,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaadd, 0xaadd,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe13, 0xfe13,
+	0xfe20, 0xfe26,
+	0xfe52, 0xfe52,
+	0xfe55, 0xfe55,
+	0xfeff, 0xfeff,
+	0xff07, 0xff07,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0xfff9, 0xfffb,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x1d167, 0x1d169,
+	0x1d173, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	557,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fb8, 0x1fbc,
+	0x1fc8, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	573,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c5, 0x01c6,
+	0x01c8, 0x01c9,
+	0x01cb, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f2, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbc, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fcc, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x1ffc, 0x1ffc,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	574,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x01c4,
+	0x01c6, 0x01c7,
+	0x01c9, 0x01ca,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f1,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	568,
+	0x0041, 0x005a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00df,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x0149, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x017f, 0x017f,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0345, 0x0345,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03c2, 0x03c2,
+	0x03cf, 0x03d1,
+	0x03d5, 0x03d6,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9a, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f80, 0x1faf,
+	0x1fb2, 0x1fb4,
+	0x1fb7, 0x1fbc,
+	0x1fc2, 0x1fc4,
+	0x1fc7, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff7, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	97,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x0137,
+	0x0139, 0x018c,
+	0x018e, 0x019a,
+	0x019c, 0x01a9,
+	0x01ac, 0x01b9,
+	0x01bc, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x0220,
+	0x0222, 0x0233,
+	0x023a, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03d1,
+	0x03d5, 0x03f2,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03fb,
+	0x03fd, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e00, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c70,
+	0x2c72, 0x2c73,
+	0x2c75, 0x2c76,
+	0x2c7e, 0x2ce3,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	424,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309b, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	431,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e32,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb2,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	513,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_XID_Continue */
+
+/* 'Default_Ignorable_Code_Point': Derived Property */
+static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x180b, 0x180d,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x3164, 0x3164,
+	0xfe00, 0xfe0f,
+	0xfeff, 0xfeff,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe0fff,
+}; /* CR_Default_Ignorable_Code_Point */
+
+/* 'Grapheme_Extend': Derived Property */
+static const OnigCodePoint CR_Grapheme_Extend[] = {
+	206,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09be, 0x09be,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bbe,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d3e, 0x0d3e,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dcf,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0ddf, 0x0ddf,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d165, 0x1d165,
+	0x1d167, 0x1d169,
+	0x1d16e, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	567,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06e9, 0x06e9,
+	0x06ee, 0x070d,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0830, 0x083e,
+	0x0903, 0x0939,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0972,
+	0x0979, 0x097f,
+	0x0982, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09bf, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09e6, 0x09fb,
+	0x0a03, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a40,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a6f,
+	0x0a72, 0x0a74,
+	0x0a83, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b02, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbf, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c41, 0x0c44,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbe,
+	0x0cc0, 0x0cc1,
+	0x0cc3, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dd0, 0x0dd1,
+	0x0dd8, 0x0dde,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e3f, 0x0e46,
+	0x0e4f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8b,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1360, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1735, 0x1736,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x17d4, 0x17dc,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180a,
+	0x180e, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a16,
+	0x1a19, 0x1a1b,
+	0x1a1e, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b04, 0x1b33,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b4b,
+	0x1b50, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1b82, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x200a,
+	0x2010, 0x2027,
+	0x202f, 0x205f,
+	0x2070, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa824,
+	0xa827, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c3,
+	0xa8ce, 0xa8d9,
+	0xa8f2, 0xa8fb,
+	0xa900, 0xa925,
+	0xa92e, 0xa946,
+	0xa952, 0xa953,
+	0xa95f, 0xa97c,
+	0xa983, 0xa9b2,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa28,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa4d, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff01, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a40, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d166, 0x1d166,
+	0x1d16a, 0x1d16d,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	26,
+	0x094d, 0x094d,
+	0x09cd, 0x09cd,
+	0x0a4d, 0x0a4d,
+	0x0acd, 0x0acd,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e3a, 0x0e3a,
+	0x0f84, 0x0f84,
+	0x1039, 0x103a,
+	0x1714, 0x1714,
+	0x1734, 0x1734,
+	0x17d2, 0x17d2,
+	0x1a60, 0x1a60,
+	0x1b44, 0x1b44,
+	0x1baa, 0x1baa,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x110b9, 0x110b9,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	159,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x0600, 0x0603,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0cf1, 0x0cf2,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x206a, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20b8,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2e00, 0x2e31,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3004,
+	0x3006, 0x3006,
+	0x3008, 0x3020,
+	0x3030, 0x3037,
+	0x303c, 0x303f,
+	0x309b, 0x309c,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fc,
+	0x3190, 0x319f,
+	0x31c0, 0x31e3,
+	0x3220, 0x325f,
+	0x327f, 0x32cf,
+	0x3358, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	0xa830, 0xa839,
+	0xfd3e, 0xfd3f,
+	0xfdfd, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfeff, 0xfeff,
+	0xff01, 0xff20,
+	0xff3b, 0xff40,
+	0xff5b, 0xff65,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d166,
+	0x1d16a, 0x1d17a,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	28,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02b8,
+	0x02e0, 0x02e4,
+	0x1d00, 0x1d25,
+	0x1d2c, 0x1d5c,
+	0x1d62, 0x1d65,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1dbe,
+	0x1e00, 0x1eff,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa7ff,
+	0xfb00, 0xfb06,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+}; /* CR_Latin */
+
+/* 'Greek': Script */
+static const OnigCodePoint CR_Greek[] = {
+	33,
+	0x0370, 0x0373,
+	0x0375, 0x0377,
+	0x037a, 0x037d,
+	0x0384, 0x0384,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03e1,
+	0x03f0, 0x03ff,
+	0x1d26, 0x1d2a,
+	0x1d5d, 0x1d61,
+	0x1d66, 0x1d6a,
+	0x1dbf, 0x1dbf,
+	0x1f00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2126, 0x2126,
+	0x10140, 0x1018a,
+	0x1d200, 0x1d245,
+}; /* CR_Greek */
+
+/* 'Cyrillic': Script */
+static const OnigCodePoint CR_Cyrillic[] = {
+	8,
+	0x0400, 0x0484,
+	0x0487, 0x0525,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	5,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0xfb13, 0xfb17,
+}; /* CR_Armenian */
+
+/* 'Hebrew': Script */
+static const OnigCodePoint CR_Hebrew[] = {
+	9,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfb4f,
+}; /* CR_Hebrew */
+
+/* 'Arabic': Script */
+static const OnigCodePoint CR_Arabic[] = {
+	18,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065e,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0xfb50, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfc,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+}; /* CR_Arabic */
+
+/* 'Syriac': Script */
+static const OnigCodePoint CR_Syriac[] = {
+	3,
+	0x0700, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+}; /* CR_Syriac */
+
+/* 'Thaana': Script */
+static const OnigCodePoint CR_Thaana[] = {
+	1,
+	0x0780, 0x07b1,
+}; /* CR_Thaana */
+
+/* 'Devanagari': Script */
+static const OnigCodePoint CR_Devanagari[] = {
+	9,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0950,
+	0x0953, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0xa8e0, 0xa8fb,
+}; /* CR_Devanagari */
+
+/* 'Bengali': Script */
+static const OnigCodePoint CR_Bengali[] = {
+	14,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+}; /* CR_Bengali */
+
+/* 'Gurmukhi': Script */
+static const OnigCodePoint CR_Gurmukhi[] = {
+	16,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+}; /* CR_Gurmukhi */
+
+/* 'Gujarati': Script */
+static const OnigCodePoint CR_Gujarati[] = {
+	14,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+}; /* CR_Gujarati */
+
+/* 'Oriya': Script */
+static const OnigCodePoint CR_Oriya[] = {
+	14,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+}; /* CR_Oriya */
+
+/* 'Tamil': Script */
+static const OnigCodePoint CR_Tamil[] = {
+	16,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+}; /* CR_Tamil */
+
+/* 'Telugu': Script */
+static const OnigCodePoint CR_Telugu[] = {
+	14,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+}; /* CR_Telugu */
+
+/* 'Kannada': Script */
+static const OnigCodePoint CR_Kannada[] = {
+	13,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	12,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+}; /* CR_Malayalam */
+
+/* 'Sinhala': Script */
+static const OnigCodePoint CR_Sinhala[] = {
+	11,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+}; /* CR_Sinhala */
+
+/* 'Thai': Script */
+static const OnigCodePoint CR_Thai[] = {
+	2,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e5b,
+}; /* CR_Thai */
+
+/* 'Lao': Script */
+static const OnigCodePoint CR_Lao[] = {
+	18,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	2,
+	0x1000, 0x109f,
+	0xaa60, 0xaa7b,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	4,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x2d00, 0x2d25,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	13,
+	0x1100, 0x11ff,
+	0x3131, 0x318e,
+	0x3200, 0x321e,
+	0x3260, 0x327e,
+	0xa960, 0xa97c,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+}; /* CR_Hangul */
+
+/* 'Ethiopic': Script */
+static const OnigCodePoint CR_Ethiopic[] = {
+	27,
+	0x1200, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+}; /* CR_Ethiopic */
+
+/* 'Cherokee': Script */
+static const OnigCodePoint CR_Cherokee[] = {
+	1,
+	0x13a0, 0x13f4,
+}; /* CR_Cherokee */
+
+/* 'Canadian_Aboriginal': Script */
+static const OnigCodePoint CR_Canadian_Aboriginal[] = {
+	2,
+	0x1400, 0x167f,
+	0x18b0, 0x18f5,
+}; /* CR_Canadian_Aboriginal */
+
+/* 'Ogham': Script */
+static const OnigCodePoint CR_Ogham[] = {
+	1,
+	0x1680, 0x169c,
+}; /* CR_Ogham */
+
+/* 'Runic': Script */
+static const OnigCodePoint CR_Runic[] = {
+	2,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+}; /* CR_Runic */
+
+/* 'Khmer': Script */
+static const OnigCodePoint CR_Khmer[] = {
+	4,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x19e0, 0x19ff,
+}; /* CR_Khmer */
+
+/* 'Mongolian': Script */
+static const OnigCodePoint CR_Mongolian[] = {
+	6,
+	0x1800, 0x1801,
+	0x1804, 0x1804,
+	0x1806, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+}; /* CR_Mongolian */
+
+/* 'Hiragana': Script */
+static const OnigCodePoint CR_Hiragana[] = {
+	3,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	7,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	2,
+	0x3105, 0x312d,
+	0x31a0, 0x31b7,
+}; /* CR_Bopomofo */
+
+/* 'Han': Script */
+static const OnigCodePoint CR_Han[] = {
+	15,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x3005, 0x3005,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303b,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Han */
+
+/* 'Yi': Script */
+static const OnigCodePoint CR_Yi[] = {
+	2,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+}; /* CR_Yi */
+
+/* 'Old_Italic': Script */
+static const OnigCodePoint CR_Old_Italic[] = {
+	2,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+}; /* CR_Old_Italic */
+
+/* 'Gothic': Script */
+static const OnigCodePoint CR_Gothic[] = {
+	1,
+	0x10330, 0x1034a,
+}; /* CR_Gothic */
+
+/* 'Deseret': Script */
+static const OnigCodePoint CR_Deseret[] = {
+	1,
+	0x10400, 0x1044f,
+}; /* CR_Deseret */
+
+/* 'Inherited': Script */
+static const OnigCodePoint CR_Inherited[] = {
+	23,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0xe0100, 0xe01ef,
+}; /* CR_Inherited */
+
+/* 'Tagalog': Script */
+static const OnigCodePoint CR_Tagalog[] = {
+	2,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+}; /* CR_Tagalog */
+
+/* 'Hanunoo': Script */
+static const OnigCodePoint CR_Hanunoo[] = {
+	1,
+	0x1720, 0x1734,
+}; /* CR_Hanunoo */
+
+/* 'Buhid': Script */
+static const OnigCodePoint CR_Buhid[] = {
+	1,
+	0x1740, 0x1753,
+}; /* CR_Buhid */
+
+/* 'Tagbanwa': Script */
+static const OnigCodePoint CR_Tagbanwa[] = {
+	3,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+}; /* CR_Tagbanwa */
+
+/* 'Limbu': Script */
+static const OnigCodePoint CR_Limbu[] = {
+	5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x194f,
+}; /* CR_Limbu */
+
+/* 'Tai_Le': Script */
+static const OnigCodePoint CR_Tai_Le[] = {
+	2,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+}; /* CR_Tai_Le */
+
+/* 'Linear_B': Script */
+static const OnigCodePoint CR_Linear_B[] = {
+	7,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+}; /* CR_Linear_B */
+
+/* 'Ugaritic': Script */
+static const OnigCodePoint CR_Ugaritic[] = {
+	2,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+}; /* CR_Ugaritic */
+
+/* 'Shavian': Script */
+static const OnigCodePoint CR_Shavian[] = {
+	1,
+	0x10450, 0x1047f,
+}; /* CR_Shavian */
+
+/* 'Osmanya': Script */
+static const OnigCodePoint CR_Osmanya[] = {
+	2,
+	0x10480, 0x1049d,
+	0x104a0, 0x104a9,
+}; /* CR_Osmanya */
+
+/* 'Cypriot': Script */
+static const OnigCodePoint CR_Cypriot[] = {
+	6,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+}; /* CR_Cypriot */
+
+/* 'Braille': Script */
+static const OnigCodePoint CR_Braille[] = {
+	1,
+	0x2800, 0x28ff,
+}; /* CR_Braille */
+
+/* 'Buginese': Script */
+static const OnigCodePoint CR_Buginese[] = {
+	2,
+	0x1a00, 0x1a1b,
+	0x1a1e, 0x1a1f,
+}; /* CR_Buginese */
+
+/* 'Coptic': Script */
+static const OnigCodePoint CR_Coptic[] = {
+	3,
+	0x03e2, 0x03ef,
+	0x2c80, 0x2cf1,
+	0x2cf9, 0x2cff,
+}; /* CR_Coptic */
+
+/* 'New_Tai_Lue': Script */
+static const OnigCodePoint CR_New_Tai_Lue[] = {
+	4,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x19df,
+}; /* CR_New_Tai_Lue */
+
+/* 'Glagolitic': Script */
+static const OnigCodePoint CR_Glagolitic[] = {
+	2,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+}; /* CR_Glagolitic */
+
+/* 'Tifinagh': Script */
+static const OnigCodePoint CR_Tifinagh[] = {
+	2,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+}; /* CR_Tifinagh */
+
+/* 'Syloti_Nagri': Script */
+static const OnigCodePoint CR_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82b,
+}; /* CR_Syloti_Nagri */
+
+/* 'Old_Persian': Script */
+static const OnigCodePoint CR_Old_Persian[] = {
+	2,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103d5,
+}; /* CR_Old_Persian */
+
+/* 'Kharoshthi': Script */
+static const OnigCodePoint CR_Kharoshthi[] = {
+	8,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+}; /* CR_Kharoshthi */
+
+/* 'Balinese': Script */
+static const OnigCodePoint CR_Balinese[] = {
+	2,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+}; /* CR_Balinese */
+
+/* 'Cuneiform': Script */
+static const OnigCodePoint CR_Cuneiform[] = {
+	3,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+}; /* CR_Cuneiform */
+
+/* 'Phoenician': Script */
+static const OnigCodePoint CR_Phoenician[] = {
+	2,
+	0x10900, 0x1091b,
+	0x1091f, 0x1091f,
+}; /* CR_Phoenician */
+
+/* 'Phags_Pa': Script */
+static const OnigCodePoint CR_Phags_Pa[] = {
+	1,
+	0xa840, 0xa877,
+}; /* CR_Phags_Pa */
+
+/* 'Nko': Script */
+static const OnigCodePoint CR_Nko[] = {
+	1,
+	0x07c0, 0x07fa,
+}; /* CR_Nko */
+
+/* 'Sundanese': Script */
+static const OnigCodePoint CR_Sundanese[] = {
+	2,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+}; /* CR_Sundanese */
+
+/* 'Lepcha': Script */
+static const OnigCodePoint CR_Lepcha[] = {
+	3,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c4f,
+}; /* CR_Lepcha */
+
+/* 'Ol_Chiki': Script */
+static const OnigCodePoint CR_Ol_Chiki[] = {
+	1,
+	0x1c50, 0x1c7f,
+}; /* CR_Ol_Chiki */
+
+/* 'Vai': Script */
+static const OnigCodePoint CR_Vai[] = {
+	1,
+	0xa500, 0xa62b,
+}; /* CR_Vai */
+
+/* 'Saurashtra': Script */
+static const OnigCodePoint CR_Saurashtra[] = {
+	2,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+}; /* CR_Saurashtra */
+
+/* 'Kayah_Li': Script */
+static const OnigCodePoint CR_Kayah_Li[] = {
+	1,
+	0xa900, 0xa92f,
+}; /* CR_Kayah_Li */
+
+/* 'Rejang': Script */
+static const OnigCodePoint CR_Rejang[] = {
+	2,
+	0xa930, 0xa953,
+	0xa95f, 0xa95f,
+}; /* CR_Rejang */
+
+/* 'Lycian': Script */
+static const OnigCodePoint CR_Lycian[] = {
+	1,
+	0x10280, 0x1029c,
+}; /* CR_Lycian */
+
+/* 'Carian': Script */
+static const OnigCodePoint CR_Carian[] = {
+	1,
+	0x102a0, 0x102d0,
+}; /* CR_Carian */
+
+/* 'Lydian': Script */
+static const OnigCodePoint CR_Lydian[] = {
+	2,
+	0x10920, 0x10939,
+	0x1093f, 0x1093f,
+}; /* CR_Lydian */
+
+/* 'Cham': Script */
+static const OnigCodePoint CR_Cham[] = {
+	4,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+}; /* CR_Cham */
+
+/* 'Tai_Tham': Script */
+static const OnigCodePoint CR_Tai_Tham[] = {
+	5,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+}; /* CR_Tai_Tham */
+
+/* 'Tai_Viet': Script */
+static const OnigCodePoint CR_Tai_Viet[] = {
+	2,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+}; /* CR_Tai_Viet */
+
+/* 'Avestan': Script */
+static const OnigCodePoint CR_Avestan[] = {
+	2,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b3f,
+}; /* CR_Avestan */
+
+/* 'Egyptian_Hieroglyphs': Script */
+static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342e,
+}; /* CR_Egyptian_Hieroglyphs */
+
+/* 'Samaritan': Script */
+static const OnigCodePoint CR_Samaritan[] = {
+	2,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+}; /* CR_Samaritan */
+
+/* 'Lisu': Script */
+static const OnigCodePoint CR_Lisu[] = {
+	1,
+	0xa4d0, 0xa4ff,
+}; /* CR_Lisu */
+
+/* 'Bamum': Script */
+static const OnigCodePoint CR_Bamum[] = {
+	1,
+	0xa6a0, 0xa6f7,
+}; /* CR_Bamum */
+
+/* 'Javanese': Script */
+static const OnigCodePoint CR_Javanese[] = {
+	3,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+}; /* CR_Javanese */
+
+/* 'Meetei_Mayek': Script */
+static const OnigCodePoint CR_Meetei_Mayek[] = {
+	2,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+}; /* CR_Meetei_Mayek */
+
+/* 'Imperial_Aramaic': Script */
+static const OnigCodePoint CR_Imperial_Aramaic[] = {
+	2,
+	0x10840, 0x10855,
+	0x10857, 0x1085f,
+}; /* CR_Imperial_Aramaic */
+
+/* 'Old_South_Arabian': Script */
+static const OnigCodePoint CR_Old_South_Arabian[] = {
+	1,
+	0x10a60, 0x10a7f,
+}; /* CR_Old_South_Arabian */
+
+/* 'Inscriptional_Parthian': Script */
+static const OnigCodePoint CR_Inscriptional_Parthian[] = {
+	2,
+	0x10b40, 0x10b55,
+	0x10b58, 0x10b5f,
+}; /* CR_Inscriptional_Parthian */
+
+/* 'Inscriptional_Pahlavi': Script */
+static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
+	2,
+	0x10b60, 0x10b72,
+	0x10b78, 0x10b7f,
+}; /* CR_Inscriptional_Pahlavi */
+
+/* 'Old_Turkic': Script */
+static const OnigCodePoint CR_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c48,
+}; /* CR_Old_Turkic */
+
+/* 'Kaithi': Script */
+static const OnigCodePoint CR_Kaithi[] = {
+	1,
+	0x11080, 0x110c1,
+}; /* CR_Kaithi */
+
+/* 'White_Space': Binary Property */
+static const OnigCodePoint CR_White_Space[] = {
+	11,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_White_Space */
+
+/* 'Bidi_Control': Binary Property */
+static const OnigCodePoint CR_Bidi_Control[] = {
+	2,
+	0x200e, 0x200f,
+	0x202a, 0x202e,
+}; /* CR_Bidi_Control */
+
+/* 'Join_Control': Binary Property */
+static const OnigCodePoint CR_Join_Control[] = {
+	1,
+	0x200c, 0x200d,
+}; /* CR_Join_Control */
+
+/* 'Dash': Binary Property */
+static const OnigCodePoint CR_Dash[] = {
+	19,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Dash */
+
+/* 'Hyphen': Binary Property */
+static const OnigCodePoint CR_Hyphen[] = {
+	10,
+	0x002d, 0x002d,
+	0x00ad, 0x00ad,
+	0x058a, 0x058a,
+	0x1806, 0x1806,
+	0x2010, 0x2011,
+	0x2e17, 0x2e17,
+	0x30fb, 0x30fb,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+	0xff65, 0xff65,
+}; /* CR_Hyphen */
+
+/* 'Quotation_Mark': Binary Property */
+static const OnigCodePoint CR_Quotation_Mark[] = {
+	12,
+	0x0022, 0x0022,
+	0x0027, 0x0027,
+	0x00ab, 0x00ab,
+	0x00bb, 0x00bb,
+	0x2018, 0x201f,
+	0x2039, 0x203a,
+	0x300c, 0x300f,
+	0x301d, 0x301f,
+	0xfe41, 0xfe44,
+	0xff02, 0xff02,
+	0xff07, 0xff07,
+	0xff62, 0xff63,
+}; /* CR_Quotation_Mark */
+
+/* 'Terminal_Punctuation': Binary Property */
+static const OnigCodePoint CR_Terminal_Punctuation[] = {
+	65,
+	0x0021, 0x0021,
+	0x002c, 0x002c,
+	0x002e, 0x002e,
+	0x003a, 0x003b,
+	0x003f, 0x003f,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x05c3, 0x05c3,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x070a,
+	0x070c, 0x070c,
+	0x07f8, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0e5a, 0x0e5b,
+	0x0f08, 0x0f08,
+	0x0f0d, 0x0f12,
+	0x104a, 0x104b,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x17d4, 0x17d6,
+	0x17da, 0x17da,
+	0x1802, 0x1805,
+	0x1808, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	0x1b5a, 0x1b5b,
+	0x1b5d, 0x1b5f,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3001, 0x3002,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa6f3, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c7, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaadf, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xff01, 0xff01,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0xff64, 0xff64,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x10b3a, 0x10b3f,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	99,
+	0x005e, 0x005e,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2061, 0x2064,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21a7,
+	0x21a9, 0x21ad,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x23b4, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23e2, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b6,
+	0x25bc, 0x25c0,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266e,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0xfe61, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Other_Math */
+
+/* 'Hex_Digit': Binary Property */
+static const OnigCodePoint CR_Hex_Digit[] = {
+	6,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+	0xff10, 0xff19,
+	0xff21, 0xff26,
+	0xff41, 0xff46,
+}; /* CR_Hex_Digit */
+
+/* 'ASCII_Hex_Digit': Binary Property */
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	141,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x0900, 0x0903,
+	0x093e, 0x094c,
+	0x094e, 0x094e,
+	0x0955, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e4d, 0x0e4d,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ecd, 0x0ecd,
+	0x0f71, 0x0f81,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x102b, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1062,
+	0x1067, 0x1068,
+	0x1071, 0x1074,
+	0x1082, 0x1086,
+	0x109c, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1713,
+	0x1732, 0x1733,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17c8,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1b00, 0x1b04,
+	0x1b35, 0x1b43,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1ba9,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf2,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	117,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x034e,
+	0x0350, 0x0357,
+	0x035d, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0483, 0x0487,
+	0x0559, 0x0559,
+	0x0591, 0x05a1,
+	0x05a3, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c4,
+	0x064b, 0x0652,
+	0x0657, 0x0658,
+	0x06df, 0x06e0,
+	0x06e5, 0x06e6,
+	0x06ea, 0x06ec,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x0818, 0x0819,
+	0x093c, 0x093c,
+	0x094d, 0x094d,
+	0x0951, 0x0954,
+	0x0971, 0x0971,
+	0x09bc, 0x09bc,
+	0x09cd, 0x09cd,
+	0x0a3c, 0x0a3c,
+	0x0a4d, 0x0a4d,
+	0x0abc, 0x0abc,
+	0x0acd, 0x0acd,
+	0x0b3c, 0x0b3c,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0cbc, 0x0cbc,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e47, 0x0e4c,
+	0x0e4e, 0x0e4e,
+	0x0ec8, 0x0ecc,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f82, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0fc6, 0x0fc6,
+	0x1037, 0x1037,
+	0x1039, 0x103a,
+	0x1087, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109b,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x1939, 0x193b,
+	0x1a75, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b34, 0x1b34,
+	0x1b44, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1baa, 0x1baa,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d6a,
+	0x1dc4, 0x1dcf,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2cef, 0x2cf1,
+	0x2e2f, 0x2e2f,
+	0x302a, 0x302f,
+	0x3099, 0x309c,
+	0x30fc, 0x30fc,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa717, 0xa721,
+	0xa788, 0xa788,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xaa7b, 0xaa7b,
+	0xaabf, 0xaac2,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe26,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	20,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c36, 0x1c36,
+	0x1c7b, 0x1c7b,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa60c, 0xa60c,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	13,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2090, 0x2094,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7d, 0x2c7d,
+	0xa770, 0xa770,
+}; /* CR_Other_Lowercase */
+
+/* 'Other_Uppercase': Binary Property */
+static const OnigCodePoint CR_Other_Uppercase[] = {
+	2,
+	0x2160, 0x216f,
+	0x24b6, 0x24cf,
+}; /* CR_Other_Uppercase */
+
+/* 'Noncharacter_Code_Point': Binary Property */
+static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
+	18,
+	0xfdd0, 0xfdef,
+	0xfffe, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Noncharacter_Code_Point */
+
+/* 'Other_Grapheme_Extend': Binary Property */
+static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
+	16,
+	0x09be, 0x09be,
+	0x09d7, 0x09d7,
+	0x0b3e, 0x0b3e,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbe,
+	0x0bd7, 0x0bd7,
+	0x0cc2, 0x0cc2,
+	0x0cd5, 0x0cd6,
+	0x0d3e, 0x0d3e,
+	0x0d57, 0x0d57,
+	0x0dcf, 0x0dcf,
+	0x0ddf, 0x0ddf,
+	0x200c, 0x200d,
+	0xff9e, 0xff9f,
+	0x1d165, 0x1d165,
+	0x1d16e, 0x1d172,
+}; /* CR_Other_Grapheme_Extend */
+
+/* 'IDS_Binary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Binary_Operator[] = {
+	2,
+	0x2ff0, 0x2ff1,
+	0x2ff4, 0x2ffb,
+}; /* CR_IDS_Binary_Operator */
+
+/* 'IDS_Trinary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
+	1,
+	0x2ff2, 0x2ff3,
+}; /* CR_IDS_Trinary_Operator */
+
+/* 'Radical': Binary Property */
+static const OnigCodePoint CR_Radical[] = {
+	3,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+}; /* CR_Radical */
+
+/* 'Unified_Ideograph': Binary Property */
+static const OnigCodePoint CR_Unified_Ideograph[] = {
+	11,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	10,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x2065, 0x2069,
+	0x3164, 0x3164,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0xe0000, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xe0fff,
+}; /* CR_Other_Default_Ignorable_Code_Point */
+
+/* 'Deprecated': Binary Property */
+static const OnigCodePoint CR_Deprecated[] = {
+	8,
+	0x0149, 0x0149,
+	0x0f77, 0x0f77,
+	0x0f79, 0x0f79,
+	0x17a3, 0x17a4,
+	0x206a, 0x206f,
+	0x2329, 0x232a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Deprecated */
+
+/* 'Soft_Dotted': Binary Property */
+static const OnigCodePoint CR_Soft_Dotted[] = {
+	31,
+	0x0069, 0x006a,
+	0x012f, 0x012f,
+	0x0249, 0x0249,
+	0x0268, 0x0268,
+	0x029d, 0x029d,
+	0x02b2, 0x02b2,
+	0x03f3, 0x03f3,
+	0x0456, 0x0456,
+	0x0458, 0x0458,
+	0x1d62, 0x1d62,
+	0x1d96, 0x1d96,
+	0x1da4, 0x1da4,
+	0x1da8, 0x1da8,
+	0x1e2d, 0x1e2d,
+	0x1ecb, 0x1ecb,
+	0x2071, 0x2071,
+	0x2148, 0x2149,
+	0x2c7c, 0x2c7c,
+	0x1d422, 0x1d423,
+	0x1d456, 0x1d457,
+	0x1d48a, 0x1d48b,
+	0x1d4be, 0x1d4bf,
+	0x1d4f2, 0x1d4f3,
+	0x1d526, 0x1d527,
+	0x1d55a, 0x1d55b,
+	0x1d58e, 0x1d58f,
+	0x1d5c2, 0x1d5c3,
+	0x1d5f6, 0x1d5f7,
+	0x1d62a, 0x1d62b,
+	0x1d65e, 0x1d65f,
+	0x1d692, 0x1d693,
+}; /* CR_Soft_Dotted */
+
+/* 'Logical_Order_Exception': Binary Property */
+static const OnigCodePoint CR_Logical_Order_Exception[] = {
+	5,
+	0x0e40, 0x0e44,
+	0x0ec0, 0x0ec4,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaab9,
+	0xaabb, 0xaabc,
+}; /* CR_Logical_Order_Exception */
+
+/* 'Other_ID_Start': Binary Property */
+static const OnigCodePoint CR_Other_ID_Start[] = {
+	3,
+	0x2118, 0x2118,
+	0x212e, 0x212e,
+	0x309b, 0x309c,
+}; /* CR_Other_ID_Start */
+
+/* 'Other_ID_Continue': Binary Property */
+static const OnigCodePoint CR_Other_ID_Continue[] = {
+	3,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	43,
+	0x0021, 0x0021,
+	0x002e, 0x002e,
+	0x003f, 0x003f,
+	0x055c, 0x055c,
+	0x055e, 0x055e,
+	0x0589, 0x0589,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x0702,
+	0x07f9, 0x07f9,
+	0x0964, 0x0965,
+	0x104a, 0x104b,
+	0x1362, 0x1362,
+	0x1367, 0x1368,
+	0x166e, 0x166e,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1b5a, 0x1b5b,
+	0x1b5e, 0x1b5f,
+	0x1c3b, 0x1c3c,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3002, 0x3002,
+	0xa4ff, 0xa4ff,
+	0xa60e, 0xa60f,
+	0xa6f3, 0xa6f3,
+	0xa6f7, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c8, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x110be, 0x110c1,
+}; /* CR_STerm */
+
+/* 'Variation_Selector': Binary Property */
+static const OnigCodePoint CR_Variation_Selector[] = {
+	3,
+	0x180b, 0x180d,
+	0xfe00, 0xfe0f,
+	0xe0100, 0xe01ef,
+}; /* CR_Variation_Selector */
+
+/* 'Pattern_White_Space': Binary Property */
+static const OnigCodePoint CR_Pattern_White_Space[] = {
+	5,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x200e, 0x200f,
+	0x2028, 0x2029,
+}; /* CR_Pattern_White_Space */
+
+/* 'Pattern_Syntax': Binary Property */
+static const OnigCodePoint CR_Pattern_Syntax[] = {
+	28,
+	0x0021, 0x002f,
+	0x003a, 0x0040,
+	0x005b, 0x005e,
+	0x0060, 0x0060,
+	0x007b, 0x007e,
+	0x00a1, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ab, 0x00ac,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b1,
+	0x00b6, 0x00b6,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x2010, 0x2027,
+	0x2030, 0x203e,
+	0x2041, 0x2053,
+	0x2055, 0x205e,
+	0x2190, 0x245f,
+	0x2500, 0x2775,
+	0x2794, 0x2bff,
+	0x2e00, 0x2e7f,
+	0x3001, 0x3003,
+	0x3008, 0x3020,
+	0x3030, 0x3030,
+	0xfd3e, 0xfd3f,
+	0xfe45, 0xfe46,
+}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
+
+/* 'Blank': [[:Blank:]] */
+static const OnigCodePoint CR_Blank[] = {
+	9,
+	0x0009, 0x0009,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Blank */
+
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
+
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	490,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x167f,
+	0x1681, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x200b, 0x2027,
+	0x202a, 0x202e,
+	0x2030, 0x205e,
+	0x2060, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	487,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2027,
+	0x202a, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06de, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	497,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+static const OnigCodePoint* const CodeRanges[] = {
+  CR_NEWLINE,
+  CR_Alpha,
+  CR_Blank,
+  CR_Cntrl,
+  CR_Digit,
+  CR_Graph,
+  CR_Lower,
+  CR_Print,
+  CR_Punct,
+  CR_Space,
+  CR_Upper,
+  CR_XDigit,
+  CR_Word,
+  CR_Alnum,
+  CR_ASCII,
+#ifdef USE_UNICODE_PROPERTIES
+  CR_Any,
+  CR_Assigned,
+  CR_C,
+  CR_Cc,
+  CR_Cf,
+  CR_Cn,
+  CR_Co,
+  CR_Cs,
+  CR_L,
+  CR_Ll,
+  CR_Lm,
+  CR_Lo,
+  CR_Lt,
+  CR_Lu,
+  CR_M,
+  CR_Mc,
+  CR_Me,
+  CR_Mn,
+  CR_N,
+  CR_Nd,
+  CR_Nl,
+  CR_No,
+  CR_P,
+  CR_Pc,
+  CR_Pd,
+  CR_Pe,
+  CR_Pf,
+  CR_Pi,
+  CR_Po,
+  CR_Ps,
+  CR_S,
+  CR_Sc,
+  CR_Sk,
+  CR_Sm,
+  CR_So,
+  CR_Z,
+  CR_Zl,
+  CR_Zp,
+  CR_Zs,
+  CR_Math,
+  CR_Alphabetic,
+  CR_Lowercase,
+  CR_Uppercase,
+  CR_Cased,
+  CR_Case_Ignorable,
+  CR_Changes_When_Lowercased,
+  CR_Changes_When_Uppercased,
+  CR_Changes_When_Titlecased,
+  CR_Changes_When_Casefolded,
+  CR_Changes_When_Casemapped,
+  CR_ID_Start,
+  CR_ID_Continue,
+  CR_XID_Start,
+  CR_XID_Continue,
+  CR_Default_Ignorable_Code_Point,
+  CR_Grapheme_Extend,
+  CR_Grapheme_Base,
+  CR_Grapheme_Link,
+  CR_Common,
+  CR_Latin,
+  CR_Greek,
+  CR_Cyrillic,
+  CR_Armenian,
+  CR_Hebrew,
+  CR_Arabic,
+  CR_Syriac,
+  CR_Thaana,
+  CR_Devanagari,
+  CR_Bengali,
+  CR_Gurmukhi,
+  CR_Gujarati,
+  CR_Oriya,
+  CR_Tamil,
+  CR_Telugu,
+  CR_Kannada,
+  CR_Malayalam,
+  CR_Sinhala,
+  CR_Thai,
+  CR_Lao,
+  CR_Tibetan,
+  CR_Myanmar,
+  CR_Georgian,
+  CR_Hangul,
+  CR_Ethiopic,
+  CR_Cherokee,
+  CR_Canadian_Aboriginal,
+  CR_Ogham,
+  CR_Runic,
+  CR_Khmer,
+  CR_Mongolian,
+  CR_Hiragana,
+  CR_Katakana,
+  CR_Bopomofo,
+  CR_Han,
+  CR_Yi,
+  CR_Old_Italic,
+  CR_Gothic,
+  CR_Deseret,
+  CR_Inherited,
+  CR_Tagalog,
+  CR_Hanunoo,
+  CR_Buhid,
+  CR_Tagbanwa,
+  CR_Limbu,
+  CR_Tai_Le,
+  CR_Linear_B,
+  CR_Ugaritic,
+  CR_Shavian,
+  CR_Osmanya,
+  CR_Cypriot,
+  CR_Braille,
+  CR_Buginese,
+  CR_Coptic,
+  CR_New_Tai_Lue,
+  CR_Glagolitic,
+  CR_Tifinagh,
+  CR_Syloti_Nagri,
+  CR_Old_Persian,
+  CR_Kharoshthi,
+  CR_Balinese,
+  CR_Cuneiform,
+  CR_Phoenician,
+  CR_Phags_Pa,
+  CR_Nko,
+  CR_Sundanese,
+  CR_Lepcha,
+  CR_Ol_Chiki,
+  CR_Vai,
+  CR_Saurashtra,
+  CR_Kayah_Li,
+  CR_Rejang,
+  CR_Lycian,
+  CR_Carian,
+  CR_Lydian,
+  CR_Cham,
+  CR_Tai_Tham,
+  CR_Tai_Viet,
+  CR_Avestan,
+  CR_Egyptian_Hieroglyphs,
+  CR_Samaritan,
+  CR_Lisu,
+  CR_Bamum,
+  CR_Javanese,
+  CR_Meetei_Mayek,
+  CR_Imperial_Aramaic,
+  CR_Old_South_Arabian,
+  CR_Inscriptional_Parthian,
+  CR_Inscriptional_Pahlavi,
+  CR_Old_Turkic,
+  CR_Kaithi,
+  CR_White_Space,
+  CR_Bidi_Control,
+  CR_Join_Control,
+  CR_Dash,
+  CR_Hyphen,
+  CR_Quotation_Mark,
+  CR_Terminal_Punctuation,
+  CR_Other_Math,
+  CR_Hex_Digit,
+  CR_ASCII_Hex_Digit,
+  CR_Other_Alphabetic,
+  CR_Ideographic,
+  CR_Diacritic,
+  CR_Extender,
+  CR_Other_Lowercase,
+  CR_Other_Uppercase,
+  CR_Noncharacter_Code_Point,
+  CR_Other_Grapheme_Extend,
+  CR_IDS_Binary_Operator,
+  CR_IDS_Trinary_Operator,
+  CR_Radical,
+  CR_Unified_Ideograph,
+  CR_Other_Default_Ignorable_Code_Point,
+  CR_Deprecated,
+  CR_Soft_Dotted,
+  CR_Logical_Order_Exception,
+  CR_Other_ID_Start,
+  CR_Other_ID_Continue,
+  CR_STerm,
+  CR_Variation_Selector,
+  CR_Pattern_White_Space,
+  CR_Pattern_Syntax,
+#endif /* USE_UNICODE_PROPERTIES */
+};
+struct uniname2ctype_struct {
+  int name, ctype;
+};
+
+static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
+%}
+struct uniname2ctype_struct;
+%%
+newline,                                   0
+alpha,                                     1
+blank,                                     2
+cntrl,                                     3
+digit,                                     4
+graph,                                     5
+lower,                                     6
+print,                                     7
+punct,                                     8
+space,                                     9
+upper,                                    10
+xdigit,                                   11
+word,                                     12
+alnum,                                    13
+ascii,                                    14
+#ifdef USE_UNICODE_PROPERTIES
+any,                                      15
+assigned,                                 16
+c,                                        17
+cc,                                       18
+cf,                                       19
+cn,                                       20
+co,                                       21
+cs,                                       22
+l,                                        23
+ll,                                       24
+lm,                                       25
+lo,                                       26
+lt,                                       27
+lu,                                       28
+m,                                        29
+mc,                                       30
+me,                                       31
+mn,                                       32
+n,                                        33
+nd,                                       34
+nl,                                       35
+no,                                       36
+p,                                        37
+pc,                                       38
+pd,                                       39
+pe,                                       40
+pf,                                       41
+pi,                                       42
+po,                                       43
+ps,                                       44
+s,                                        45
+sc,                                       46
+sk,                                       47
+sm,                                       48
+so,                                       49
+z,                                        50
+zl,                                       51
+zp,                                       52
+zs,                                       53
+math,                                     54
+alphabetic,                               55
+lowercase,                                56
+uppercase,                                57
+cased,                                    58
+caseignorable,                            59
+changeswhenlowercased,                    60
+changeswhenuppercased,                    61
+changeswhentitlecased,                    62
+changeswhencasefolded,                    63
+changeswhencasemapped,                    64
+idstart,                                  65
+idcontinue,                               66
+xidstart,                                 67
+xidcontinue,                              68
+defaultignorablecodepoint,                69
+graphemeextend,                           70
+graphemebase,                             71
+graphemelink,                             72
+common,                                   73
+latin,                                    74
+greek,                                    75
+cyrillic,                                 76
+armenian,                                 77
+hebrew,                                   78
+arabic,                                   79
+syriac,                                   80
+thaana,                                   81
+devanagari,                               82
+bengali,                                  83
+gurmukhi,                                 84
+gujarati,                                 85
+oriya,                                    86
+tamil,                                    87
+telugu,                                   88
+kannada,                                  89
+malayalam,                                90
+sinhala,                                  91
+thai,                                     92
+lao,                                      93
+tibetan,                                  94
+myanmar,                                  95
+georgian,                                 96
+hangul,                                   97
+ethiopic,                                 98
+cherokee,                                 99
+canadianaboriginal,                      100
+ogham,                                   101
+runic,                                   102
+khmer,                                   103
+mongolian,                               104
+hiragana,                                105
+katakana,                                106
+bopomofo,                                107
+han,                                     108
+yi,                                      109
+olditalic,                               110
+gothic,                                  111
+deseret,                                 112
+inherited,                               113
+tagalog,                                 114
+hanunoo,                                 115
+buhid,                                   116
+tagbanwa,                                117
+limbu,                                   118
+taile,                                   119
+linearb,                                 120
+ugaritic,                                121
+shavian,                                 122
+osmanya,                                 123
+cypriot,                                 124
+braille,                                 125
+buginese,                                126
+coptic,                                  127
+newtailue,                               128
+glagolitic,                              129
+tifinagh,                                130
+sylotinagri,                             131
+oldpersian,                              132
+kharoshthi,                              133
+balinese,                                134
+cuneiform,                               135
+phoenician,                              136
+phagspa,                                 137
+nko,                                     138
+sundanese,                               139
+lepcha,                                  140
+olchiki,                                 141
+vai,                                     142
+saurashtra,                              143
+kayahli,                                 144
+rejang,                                  145
+lycian,                                  146
+carian,                                  147
+lydian,                                  148
+cham,                                    149
+taitham,                                 150
+taiviet,                                 151
+avestan,                                 152
+egyptianhieroglyphs,                     153
+samaritan,                               154
+lisu,                                    155
+bamum,                                   156
+javanese,                                157
+meeteimayek,                             158
+imperialaramaic,                         159
+oldsoutharabian,                         160
+inscriptionalparthian,                   161
+inscriptionalpahlavi,                    162
+oldturkic,                               163
+kaithi,                                  164
+whitespace,                              165
+bidicontrol,                             166
+joincontrol,                             167
+dash,                                    168
+hyphen,                                  169
+quotationmark,                           170
+terminalpunctuation,                     171
+othermath,                               172
+hexdigit,                                173
+asciihexdigit,                           174
+otheralphabetic,                         175
+ideographic,                             176
+diacritic,                               177
+extender,                                178
+otherlowercase,                          179
+otheruppercase,                          180
+noncharactercodepoint,                   181
+othergraphemeextend,                     182
+idsbinaryoperator,                       183
+idstrinaryoperator,                      184
+radical,                                 185
+unifiedideograph,                        186
+otherdefaultignorablecodepoint,          187
+deprecated,                              188
+softdotted,                              189
+logicalorderexception,                   190
+otheridstart,                            191
+otheridcontinue,                         192
+sterm,                                   193
+variationselector,                       194
+patternwhitespace,                       195
+patternsyntax,                           196
+ahex,                                    174
+bidic,                                   166
+ci,                                       59
+cwcf,                                     63
+cwcm,                                     64
+cwl,                                      60
+cwt,                                      62
+cwu,                                      61
+dep,                                     188
+di,                                       69
+dia,                                     177
+ext,                                     178
+grbase,                                   71
+grext,                                    70
+grlink,                                   72
+hex,                                     173
+idc,                                      66
+ideo,                                    176
+ids,                                      65
+idsb,                                    183
+idst,                                    184
+joinc,                                   167
+loe,                                     190
+nchar,                                   181
+oalpha,                                  175
+odi,                                     187
+ogrext,                                  182
+oidc,                                    192
+oids,                                    191
+olower,                                  179
+omath,                                   172
+oupper,                                  180
+patsyn,                                  196
+patws,                                   195
+qmark,                                   170
+sd,                                      189
+term,                                    171
+uideo,                                   186
+vs,                                      194
+wspace,                                  165
+xidc,                                     68
+xids,                                     67
+other,                                    17
+control,                                  18
+format,                                   19
+unassigned,                               20
+privateuse,                               21
+surrogate,                                22
+letter,                                   23
+lowercaseletter,                          24
+modifierletter,                           25
+otherletter,                              26
+titlecaseletter,                          27
+uppercaseletter,                          28
+mark,                                     29
+spacingmark,                              30
+enclosingmark,                            31
+nonspacingmark,                           32
+number,                                   33
+decimalnumber,                            34
+letternumber,                             35
+othernumber,                              36
+punctuation,                              37
+connectorpunctuation,                     38
+dashpunctuation,                          39
+closepunctuation,                         40
+finalpunctuation,                         41
+initialpunctuation,                       42
+otherpunctuation,                         43
+openpunctuation,                          44
+symbol,                                   45
+currencysymbol,                           46
+modifiersymbol,                           47
+mathsymbol,                               48
+othersymbol,                              49
+separator,                                50
+lineseparator,                            51
+paragraphseparator,                       52
+spaceseparator,                           53
+arab,                                     79
+armi,                                    159
+armn,                                     77
+avst,                                    152
+bali,                                    134
+bamu,                                    156
+beng,                                     83
+bopo,                                    107
+brai,                                    125
+bugi,                                    126
+buhd,                                    116
+cans,                                    100
+cari,                                    147
+cher,                                     99
+copt,                                    127
+qaac,                                    127
+cprt,                                    124
+cyrl,                                     76
+deva,                                     82
+dsrt,                                    112
+egyp,                                    153
+ethi,                                     98
+geor,                                     96
+glag,                                    129
+goth,                                    111
+grek,                                     75
+gujr,                                     85
+guru,                                     84
+hang,                                     97
+hani,                                    108
+hano,                                    115
+hebr,                                     78
+hira,                                    105
+ital,                                    110
+java,                                    157
+kali,                                    144
+kana,                                    106
+khar,                                    133
+khmr,                                    103
+knda,                                     89
+kthi,                                    164
+lana,                                    150
+laoo,                                     93
+latn,                                     74
+lepc,                                    140
+limb,                                    118
+linb,                                    120
+lyci,                                    146
+lydi,                                    148
+mlym,                                     90
+mong,                                    104
+mtei,                                    158
+mymr,                                     95
+nkoo,                                    138
+ogam,                                    101
+olck,                                    141
+orkh,                                    163
+orya,                                     86
+osma,                                    123
+phag,                                    137
+phli,                                    162
+phnx,                                    136
+prti,                                    161
+rjng,                                    145
+runr,                                    102
+samr,                                    154
+sarb,                                    160
+saur,                                    143
+shaw,                                    122
+sinh,                                     91
+sund,                                    139
+sylo,                                    131
+syrc,                                     80
+tagb,                                    117
+tale,                                    119
+talu,                                    128
+taml,                                     87
+tavt,                                    151
+telu,                                     88
+tfng,                                    130
+tglg,                                    114
+thaa,                                     81
+tibt,                                     94
+ugar,                                    121
+vaii,                                    142
+xpeo,                                    132
+xsux,                                    135
+yiii,                                    109
+zinh,                                    113
+qaai,                                    113
+zyyy,                                     73
+#endif /* USE_UNICODE_PROPERTIES */
+%%
+static int
+uniname2ctype(const UChar *name, unsigned int len)
+{
+  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
+  if (p) return p->ctype;
+  return -1;
+}
diff --git a/enc/unicode/name2ctype.src b/enc/unicode/name2ctype.src
new file mode 100644
index 0000000000..ff136177ca
--- /dev/null
+++ b/enc/unicode/name2ctype.src
@@ -0,0 +1,16711 @@
+%{
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	485,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	20,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xd800, 0xf8ff,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xf0000, 0xffffd,
+	0x100000, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+static const OnigCodePoint CR_Cc[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cc */
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x0600, 0x0603,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x17b4, 0x17b5,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	485,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0526, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0604, 0x0605,
+	0x061c, 0x061d,
+	0x0620, 0x0620,
+	0x065f, 0x065f,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x08ff,
+	0x093a, 0x093b,
+	0x094f, 0x094f,
+	0x0956, 0x0957,
+	0x0973, 0x0978,
+	0x0980, 0x0980,
+	0x0984, 0x0984,
+	0x098d, 0x098e,
+	0x0991, 0x0992,
+	0x09a9, 0x09a9,
+	0x09b1, 0x09b1,
+	0x09b3, 0x09b5,
+	0x09ba, 0x09bb,
+	0x09c5, 0x09c6,
+	0x09c9, 0x09ca,
+	0x09cf, 0x09d6,
+	0x09d8, 0x09db,
+	0x09de, 0x09de,
+	0x09e4, 0x09e5,
+	0x09fc, 0x0a00,
+	0x0a04, 0x0a04,
+	0x0a0b, 0x0a0e,
+	0x0a11, 0x0a12,
+	0x0a29, 0x0a29,
+	0x0a31, 0x0a31,
+	0x0a34, 0x0a34,
+	0x0a37, 0x0a37,
+	0x0a3a, 0x0a3b,
+	0x0a3d, 0x0a3d,
+	0x0a43, 0x0a46,
+	0x0a49, 0x0a4a,
+	0x0a4e, 0x0a50,
+	0x0a52, 0x0a58,
+	0x0a5d, 0x0a5d,
+	0x0a5f, 0x0a65,
+	0x0a76, 0x0a80,
+	0x0a84, 0x0a84,
+	0x0a8e, 0x0a8e,
+	0x0a92, 0x0a92,
+	0x0aa9, 0x0aa9,
+	0x0ab1, 0x0ab1,
+	0x0ab4, 0x0ab4,
+	0x0aba, 0x0abb,
+	0x0ac6, 0x0ac6,
+	0x0aca, 0x0aca,
+	0x0ace, 0x0acf,
+	0x0ad1, 0x0adf,
+	0x0ae4, 0x0ae5,
+	0x0af0, 0x0af0,
+	0x0af2, 0x0b00,
+	0x0b04, 0x0b04,
+	0x0b0d, 0x0b0e,
+	0x0b11, 0x0b12,
+	0x0b29, 0x0b29,
+	0x0b31, 0x0b31,
+	0x0b34, 0x0b34,
+	0x0b3a, 0x0b3b,
+	0x0b45, 0x0b46,
+	0x0b49, 0x0b4a,
+	0x0b4e, 0x0b55,
+	0x0b58, 0x0b5b,
+	0x0b5e, 0x0b5e,
+	0x0b64, 0x0b65,
+	0x0b72, 0x0b81,
+	0x0b84, 0x0b84,
+	0x0b8b, 0x0b8d,
+	0x0b91, 0x0b91,
+	0x0b96, 0x0b98,
+	0x0b9b, 0x0b9b,
+	0x0b9d, 0x0b9d,
+	0x0ba0, 0x0ba2,
+	0x0ba5, 0x0ba7,
+	0x0bab, 0x0bad,
+	0x0bba, 0x0bbd,
+	0x0bc3, 0x0bc5,
+	0x0bc9, 0x0bc9,
+	0x0bce, 0x0bcf,
+	0x0bd1, 0x0bd6,
+	0x0bd8, 0x0be5,
+	0x0bfb, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c34, 0x0c34,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5a, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c77,
+	0x0c80, 0x0c81,
+	0x0c84, 0x0c84,
+	0x0c8d, 0x0c8d,
+	0x0c91, 0x0c91,
+	0x0ca9, 0x0ca9,
+	0x0cb4, 0x0cb4,
+	0x0cba, 0x0cbb,
+	0x0cc5, 0x0cc5,
+	0x0cc9, 0x0cc9,
+	0x0cce, 0x0cd4,
+	0x0cd7, 0x0cdd,
+	0x0cdf, 0x0cdf,
+	0x0ce4, 0x0ce5,
+	0x0cf0, 0x0cf0,
+	0x0cf3, 0x0d01,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d29, 0x0d29,
+	0x0d3a, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4e, 0x0d56,
+	0x0d58, 0x0d5f,
+	0x0d64, 0x0d65,
+	0x0d76, 0x0d78,
+	0x0d80, 0x0d81,
+	0x0d84, 0x0d84,
+	0x0d97, 0x0d99,
+	0x0db2, 0x0db2,
+	0x0dbc, 0x0dbc,
+	0x0dbe, 0x0dbf,
+	0x0dc7, 0x0dc9,
+	0x0dcb, 0x0dce,
+	0x0dd5, 0x0dd5,
+	0x0dd7, 0x0dd7,
+	0x0de0, 0x0df1,
+	0x0df5, 0x0e00,
+	0x0e3b, 0x0e3e,
+	0x0e5c, 0x0e80,
+	0x0e83, 0x0e83,
+	0x0e85, 0x0e86,
+	0x0e89, 0x0e89,
+	0x0e8b, 0x0e8c,
+	0x0e8e, 0x0e93,
+	0x0e98, 0x0e98,
+	0x0ea0, 0x0ea0,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	0x0ea8, 0x0ea9,
+	0x0eac, 0x0eac,
+	0x0eba, 0x0eba,
+	0x0ebe, 0x0ebf,
+	0x0ec5, 0x0ec5,
+	0x0ec7, 0x0ec7,
+	0x0ece, 0x0ecf,
+	0x0eda, 0x0edb,
+	0x0ede, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f8c, 0x0f8f,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fd9, 0x0fff,
+	0x10c6, 0x10cf,
+	0x10fd, 0x10ff,
+	0x1249, 0x1249,
+	0x124e, 0x124f,
+	0x1257, 0x1257,
+	0x1259, 0x1259,
+	0x125e, 0x125f,
+	0x1289, 0x1289,
+	0x128e, 0x128f,
+	0x12b1, 0x12b1,
+	0x12b6, 0x12b7,
+	0x12bf, 0x12bf,
+	0x12c1, 0x12c1,
+	0x12c6, 0x12c7,
+	0x12d7, 0x12d7,
+	0x1311, 0x1311,
+	0x1316, 0x1317,
+	0x135b, 0x135e,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f5, 0x13ff,
+	0x169d, 0x169f,
+	0x16f1, 0x16ff,
+	0x170d, 0x170d,
+	0x1715, 0x171f,
+	0x1737, 0x173f,
+	0x1754, 0x175f,
+	0x176d, 0x176d,
+	0x1771, 0x1771,
+	0x1774, 0x177f,
+	0x17de, 0x17df,
+	0x17ea, 0x17ef,
+	0x17fa, 0x17ff,
+	0x180f, 0x180f,
+	0x181a, 0x181f,
+	0x1878, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191d, 0x191f,
+	0x192c, 0x192f,
+	0x193c, 0x193f,
+	0x1941, 0x1943,
+	0x196e, 0x196f,
+	0x1975, 0x197f,
+	0x19ac, 0x19af,
+	0x19ca, 0x19cf,
+	0x19db, 0x19dd,
+	0x1a1c, 0x1a1d,
+	0x1a5f, 0x1a5f,
+	0x1a7d, 0x1a7e,
+	0x1a8a, 0x1a8f,
+	0x1a9a, 0x1a9f,
+	0x1aae, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bab, 0x1bad,
+	0x1bba, 0x1bff,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1ccf,
+	0x1cf3, 0x1cff,
+	0x1de7, 0x1dfc,
+	0x1f16, 0x1f17,
+	0x1f1e, 0x1f1f,
+	0x1f46, 0x1f47,
+	0x1f4e, 0x1f4f,
+	0x1f58, 0x1f58,
+	0x1f5a, 0x1f5a,
+	0x1f5c, 0x1f5c,
+	0x1f5e, 0x1f5e,
+	0x1f7e, 0x1f7f,
+	0x1fb5, 0x1fb5,
+	0x1fc5, 0x1fc5,
+	0x1fd4, 0x1fd5,
+	0x1fdc, 0x1fdc,
+	0x1ff0, 0x1ff1,
+	0x1ff5, 0x1ff5,
+	0x1fff, 0x1fff,
+	0x2065, 0x2069,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x2095, 0x209f,
+	0x20b9, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23e9, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x26ce, 0x26ce,
+	0x26e2, 0x26e2,
+	0x26e4, 0x26e7,
+	0x2700, 0x2700,
+	0x2705, 0x2705,
+	0x270a, 0x270b,
+	0x2728, 0x2728,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x275f, 0x2760,
+	0x2795, 0x2797,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x27cb, 0x27cb,
+	0x27cd, 0x27cf,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf2, 0x2cf8,
+	0x2d26, 0x2d2f,
+	0x2d66, 0x2d6e,
+	0x2d70, 0x2d7f,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e32, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31b8, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcc, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa660, 0xa661,
+	0xa674, 0xa67b,
+	0xa698, 0xa69f,
+	0xa6f8, 0xa6ff,
+	0xa78d, 0xa7fa,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c5, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa8fc, 0xa8ff,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9e0, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaa7c, 0xaa7f,
+	0xaac3, 0xaada,
+	0xaae0, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa2e, 0xfa2f,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbb2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe27, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xfefe,
+	0xff00, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfff8,
+	0xfffe, 0xffff,
+	0x1000c, 0x1000c,
+	0x10027, 0x10027,
+	0x1003b, 0x1003b,
+	0x1003e, 0x1003e,
+	0x1004e, 0x1004f,
+	0x1005e, 0x1007f,
+	0x100fb, 0x100ff,
+	0x10103, 0x10106,
+	0x10134, 0x10136,
+	0x1018b, 0x1018f,
+	0x1019c, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102ff,
+	0x1031f, 0x1031f,
+	0x10324, 0x1032f,
+	0x1034b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x10860, 0x108ff,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x109ff,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a34, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a48, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10a80, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b80, 0x10bff,
+	0x10c49, 0x10e5f,
+	0x10e7f, 0x1107f,
+	0x110c2, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1de, 0x1d1ff,
+	0x1d246, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d372, 0x1d3ff,
+	0x1d455, 0x1d455,
+	0x1d49d, 0x1d49d,
+	0x1d4a0, 0x1d4a1,
+	0x1d4a3, 0x1d4a4,
+	0x1d4a7, 0x1d4a8,
+	0x1d4ad, 0x1d4ad,
+	0x1d4ba, 0x1d4ba,
+	0x1d4bc, 0x1d4bc,
+	0x1d4c4, 0x1d4c4,
+	0x1d506, 0x1d506,
+	0x1d50b, 0x1d50c,
+	0x1d515, 0x1d515,
+	0x1d51d, 0x1d51d,
+	0x1d53a, 0x1d53a,
+	0x1d53f, 0x1d53f,
+	0x1d545, 0x1d545,
+	0x1d547, 0x1d549,
+	0x1d551, 0x1d551,
+	0x1d6a6, 0x1d6a7,
+	0x1d7cc, 0x1d7cd,
+	0x1d800, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f130,
+	0x1f132, 0x1f13c,
+	0x1f13e, 0x1f13e,
+	0x1f140, 0x1f141,
+	0x1f143, 0x1f145,
+	0x1f147, 0x1f149,
+	0x1f14f, 0x1f156,
+	0x1f158, 0x1f15e,
+	0x1f160, 0x1f178,
+	0x1f17a, 0x1f17a,
+	0x1f17d, 0x1f17e,
+	0x1f180, 0x1f189,
+	0x1f18e, 0x1f18f,
+	0x1f191, 0x1f1ff,
+	0x1f201, 0x1f20f,
+	0x1f232, 0x1f23f,
+	0x1f249, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Cn */
+
+/* 'Co': General Category */
+static const OnigCodePoint CR_Co[] = {
+	3,
+	0xe000, 0xf8ff,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Co */
+
+/* 'Cs': General Category */
+static const OnigCodePoint CR_Cs[] = {
+	1,
+	0xd800, 0xdfff,
+}; /* CR_Cs */
+
+/* 'L': Major Category */
+static const OnigCodePoint CR_L[] = {
+	422,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3006,
+	0x3031, 0x3035,
+	0x303b, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	599,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02af,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d62, 0x1d77,
+	0x1d79, 0x1d9a,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2184, 0x2184,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7c,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa771, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Ll */
+
+/* 'Lm': General Category */
+static const OnigCodePoint CR_Lm[] = {
+	49,
+	0x02b0, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0374, 0x0374,
+	0x037a, 0x037a,
+	0x0559, 0x0559,
+	0x0640, 0x0640,
+	0x06e5, 0x06e6,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0971, 0x0971,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x10fc, 0x10fc,
+	0x17d7, 0x17d7,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c78, 0x1c7d,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2c7d, 0x2c7d,
+	0x2d6f, 0x2d6f,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa67f, 0xa67f,
+	0xa717, 0xa71f,
+	0xa770, 0xa770,
+	0xa788, 0xa788,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	311,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x0800, 0x0815,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e45,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17dc, 0x17dc,
+	0x1820, 0x1842,
+	0x1844, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x2135, 0x2138,
+	0x2d30, 0x2d65,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3006, 0x3006,
+	0x303c, 0x303c,
+	0x3041, 0x3096,
+	0x309f, 0x309f,
+	0x30a1, 0x30fa,
+	0x30ff, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa014,
+	0xa016, 0xa48c,
+	0xa4d0, 0xa4f7,
+	0xa500, 0xa60b,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa66e, 0xa66e,
+	0xa6a0, 0xa6e5,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa6f,
+	0xaa71, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadc,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10450, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Lo */
+
+/* 'Lt': General Category */
+static const OnigCodePoint CR_Lt[] = {
+	10,
+	0x01c5, 0x01c5,
+	0x01c8, 0x01c8,
+	0x01cb, 0x01cb,
+	0x01f2, 0x01f2,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fbc, 0x1fbc,
+	0x1fcc, 0x1fcc,
+	0x1ffc, 0x1ffc,
+}; /* CR_Lt */
+
+/* 'Lu': General Category */
+static const OnigCodePoint CR_Lu[] = {
+	594,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2183, 0x2183,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Lu */
+
+/* 'M': Major Category */
+static const OnigCodePoint CR_M[] = {
+	188,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0903,
+	0x093c, 0x093c,
+	0x093e, 0x094e,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abc, 0x0abc,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbc, 0x0cbc,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b04,
+	0x1b34, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1baa,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf2,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa953,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9c0,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11082,
+	0x110b0, 0x110ba,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	106,
+	0x0903, 0x0903,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0982, 0x0983,
+	0x09be, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x0a03, 0x0a03,
+	0x0a3e, 0x0a40,
+	0x0a83, 0x0a83,
+	0x0abe, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0b02, 0x0b03,
+	0x0b3e, 0x0b3e,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c41, 0x0c44,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cbe,
+	0x0cc0, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cd5, 0x0cd6,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd1,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0f3e, 0x0f3f,
+	0x0f7f, 0x0f7f,
+	0x102b, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x1056, 0x1057,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108f, 0x108f,
+	0x109a, 0x109c,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a19, 0x1a1b,
+	0x1a55, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1b04, 0x1b04,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b44,
+	0x1b82, 0x1b82,
+	0x1ba1, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf2,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9c0,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa4d, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	5,
+	0x0488, 0x0489,
+	0x06de, 0x06de,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	194,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	81,
+	0x0030, 0x0039,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x09f4, 0x09f9,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bf2,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7e,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d75,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f33,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x1369, 0x137c,
+	0x16ee, 0x16f0,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x2182,
+	0x2185, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa620, 0xa629,
+	0xa6e6, 0xa6ef,
+	0xa830, 0xa835,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x10107, 0x10133,
+	0x10140, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x104a0, 0x104a9,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x12400, 0x12462,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1f100, 0x1f10a,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+static const OnigCodePoint CR_Nd[] = {
+	37,
+	0x0030, 0x0039,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bef,
+	0x0c66, 0x0c6f,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d6f,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f29,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0xa620, 0xa629,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x104a0, 0x104a9,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
+
+/* 'Nl': General Category */
+static const OnigCodePoint CR_Nl[] = {
+	12,
+	0x16ee, 0x16f0,
+	0x2160, 0x2182,
+	0x2185, 0x2188,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0xa6e6, 0xa6ef,
+	0x10140, 0x10174,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x12400, 0x12462,
+}; /* CR_Nl */
+
+/* 'No': General Category */
+static const OnigCodePoint CR_No[] = {
+	38,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa830, 0xa835,
+	0x10107, 0x10133,
+	0x10175, 0x10178,
+	0x1018a, 0x1018a,
+	0x10320, 0x10323,
+	0x10858, 0x1085f,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10e60, 0x10e7e,
+	0x1d360, 0x1d371,
+	0x1f100, 0x1f10a,
+}; /* CR_No */
+
+/* 'P': Major Category */
+static const OnigCodePoint CR_P[] = {
+	129,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00ab, 0x00ab,
+	0x00b7, 0x00b7,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2010, 0x2027,
+	0x2030, 0x2043,
+	0x2045, 0x2051,
+	0x2053, 0x205e,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x2329, 0x232a,
+	0x2768, 0x2775,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x3008, 0x3011,
+	0x3014, 0x301f,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfd3e, 0xfd3f,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff0a,
+	0xff0c, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3b, 0xff3d,
+	0xff3f, 0xff3f,
+	0xff5b, 0xff5b,
+	0xff5d, 0xff5d,
+	0xff5f, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_P */
+
+/* 'Pc': General Category */
+static const OnigCodePoint CR_Pc[] = {
+	6,
+	0x005f, 0x005f,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xff3f, 0xff3f,
+}; /* CR_Pc */
+
+/* 'Pd': General Category */
+static const OnigCodePoint CR_Pd[] = {
+	15,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Pd */
+
+/* 'Pe': General Category */
+static const OnigCodePoint CR_Pe[] = {
+	70,
+	0x0029, 0x0029,
+	0x005d, 0x005d,
+	0x007d, 0x007d,
+	0x0f3b, 0x0f3b,
+	0x0f3d, 0x0f3d,
+	0x169c, 0x169c,
+	0x2046, 0x2046,
+	0x207e, 0x207e,
+	0x208e, 0x208e,
+	0x232a, 0x232a,
+	0x2769, 0x2769,
+	0x276b, 0x276b,
+	0x276d, 0x276d,
+	0x276f, 0x276f,
+	0x2771, 0x2771,
+	0x2773, 0x2773,
+	0x2775, 0x2775,
+	0x27c6, 0x27c6,
+	0x27e7, 0x27e7,
+	0x27e9, 0x27e9,
+	0x27eb, 0x27eb,
+	0x27ed, 0x27ed,
+	0x27ef, 0x27ef,
+	0x2984, 0x2984,
+	0x2986, 0x2986,
+	0x2988, 0x2988,
+	0x298a, 0x298a,
+	0x298c, 0x298c,
+	0x298e, 0x298e,
+	0x2990, 0x2990,
+	0x2992, 0x2992,
+	0x2994, 0x2994,
+	0x2996, 0x2996,
+	0x2998, 0x2998,
+	0x29d9, 0x29d9,
+	0x29db, 0x29db,
+	0x29fd, 0x29fd,
+	0x2e23, 0x2e23,
+	0x2e25, 0x2e25,
+	0x2e27, 0x2e27,
+	0x2e29, 0x2e29,
+	0x3009, 0x3009,
+	0x300b, 0x300b,
+	0x300d, 0x300d,
+	0x300f, 0x300f,
+	0x3011, 0x3011,
+	0x3015, 0x3015,
+	0x3017, 0x3017,
+	0x3019, 0x3019,
+	0x301b, 0x301b,
+	0x301e, 0x301f,
+	0xfd3f, 0xfd3f,
+	0xfe18, 0xfe18,
+	0xfe36, 0xfe36,
+	0xfe38, 0xfe38,
+	0xfe3a, 0xfe3a,
+	0xfe3c, 0xfe3c,
+	0xfe3e, 0xfe3e,
+	0xfe40, 0xfe40,
+	0xfe42, 0xfe42,
+	0xfe44, 0xfe44,
+	0xfe48, 0xfe48,
+	0xfe5a, 0xfe5a,
+	0xfe5c, 0xfe5c,
+	0xfe5e, 0xfe5e,
+	0xff09, 0xff09,
+	0xff3d, 0xff3d,
+	0xff5d, 0xff5d,
+	0xff60, 0xff60,
+	0xff63, 0xff63,
+}; /* CR_Pe */
+
+/* 'Pf': General Category */
+static const OnigCodePoint CR_Pf[] = {
+	10,
+	0x00bb, 0x00bb,
+	0x2019, 0x2019,
+	0x201d, 0x201d,
+	0x203a, 0x203a,
+	0x2e03, 0x2e03,
+	0x2e05, 0x2e05,
+	0x2e0a, 0x2e0a,
+	0x2e0d, 0x2e0d,
+	0x2e1d, 0x2e1d,
+	0x2e21, 0x2e21,
+}; /* CR_Pf */
+
+/* 'Pi': General Category */
+static const OnigCodePoint CR_Pi[] = {
+	11,
+	0x00ab, 0x00ab,
+	0x2018, 0x2018,
+	0x201b, 0x201c,
+	0x201f, 0x201f,
+	0x2039, 0x2039,
+	0x2e02, 0x2e02,
+	0x2e04, 0x2e04,
+	0x2e09, 0x2e09,
+	0x2e0c, 0x2e0c,
+	0x2e1c, 0x2e1c,
+	0x2e20, 0x2e20,
+}; /* CR_Pi */
+
+/* 'Po': General Category */
+static const OnigCodePoint CR_Po[] = {
+	124,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00b7, 0x00b7,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x0589,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x19de, 0x19df,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e31,
+	0x3001, 0x3003,
+	0x303d, 0x303d,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe10, 0xfe16,
+	0xfe19, 0xfe19,
+	0xfe30, 0xfe30,
+	0xfe45, 0xfe46,
+	0xfe49, 0xfe4c,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xfe5f, 0xfe61,
+	0xfe68, 0xfe68,
+	0xfe6a, 0xfe6b,
+	0xff01, 0xff03,
+	0xff05, 0xff07,
+	0xff0a, 0xff0a,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0f,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff20,
+	0xff3c, 0xff3c,
+	0xff61, 0xff61,
+	0xff64, 0xff65,
+	0x10100, 0x10101,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Po */
+
+/* 'Ps': General Category */
+static const OnigCodePoint CR_Ps[] = {
+	72,
+	0x0028, 0x0028,
+	0x005b, 0x005b,
+	0x007b, 0x007b,
+	0x0f3a, 0x0f3a,
+	0x0f3c, 0x0f3c,
+	0x169b, 0x169b,
+	0x201a, 0x201a,
+	0x201e, 0x201e,
+	0x2045, 0x2045,
+	0x207d, 0x207d,
+	0x208d, 0x208d,
+	0x2329, 0x2329,
+	0x2768, 0x2768,
+	0x276a, 0x276a,
+	0x276c, 0x276c,
+	0x276e, 0x276e,
+	0x2770, 0x2770,
+	0x2772, 0x2772,
+	0x2774, 0x2774,
+	0x27c5, 0x27c5,
+	0x27e6, 0x27e6,
+	0x27e8, 0x27e8,
+	0x27ea, 0x27ea,
+	0x27ec, 0x27ec,
+	0x27ee, 0x27ee,
+	0x2983, 0x2983,
+	0x2985, 0x2985,
+	0x2987, 0x2987,
+	0x2989, 0x2989,
+	0x298b, 0x298b,
+	0x298d, 0x298d,
+	0x298f, 0x298f,
+	0x2991, 0x2991,
+	0x2993, 0x2993,
+	0x2995, 0x2995,
+	0x2997, 0x2997,
+	0x29d8, 0x29d8,
+	0x29da, 0x29da,
+	0x29fc, 0x29fc,
+	0x2e22, 0x2e22,
+	0x2e24, 0x2e24,
+	0x2e26, 0x2e26,
+	0x2e28, 0x2e28,
+	0x3008, 0x3008,
+	0x300a, 0x300a,
+	0x300c, 0x300c,
+	0x300e, 0x300e,
+	0x3010, 0x3010,
+	0x3014, 0x3014,
+	0x3016, 0x3016,
+	0x3018, 0x3018,
+	0x301a, 0x301a,
+	0x301d, 0x301d,
+	0xfd3e, 0xfd3e,
+	0xfe17, 0xfe17,
+	0xfe35, 0xfe35,
+	0xfe37, 0xfe37,
+	0xfe39, 0xfe39,
+	0xfe3b, 0xfe3b,
+	0xfe3d, 0xfe3d,
+	0xfe3f, 0xfe3f,
+	0xfe41, 0xfe41,
+	0xfe43, 0xfe43,
+	0xfe47, 0xfe47,
+	0xfe59, 0xfe59,
+	0xfe5b, 0xfe5b,
+	0xfe5d, 0xfe5d,
+	0xff08, 0xff08,
+	0xff3b, 0xff3b,
+	0xff5b, 0xff5b,
+	0xff5f, 0xff5f,
+	0xff62, 0xff62,
+}; /* CR_Ps */
+
+/* 'S': Major Category */
+static const OnigCodePoint CR_S[] = {
+	198,
+	0x0024, 0x0024,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00a2, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b6, 0x00b6,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x20a0, 0x20b8,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x2140, 0x2144,
+	0x214a, 0x214d,
+	0x214f, 0x214f,
+	0x2190, 0x2328,
+	0x232b, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x309b, 0x309c,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xa828, 0xa82b,
+	0xa836, 0xa839,
+	0xaa77, 0xaa79,
+	0xfb29, 0xfb29,
+	0xfdfc, 0xfdfd,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	16,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20b8,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	26,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x309b, 0x309c,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xffe3, 0xffe3,
+}; /* CR_Sk */
+
+/* 'Sm': General Category */
+static const OnigCodePoint CR_Sm[] = {
+	65,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03f6, 0x03f6,
+	0x0606, 0x0608,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x2140, 0x2144,
+	0x214b, 0x214b,
+	0x2190, 0x2194,
+	0x219a, 0x219b,
+	0x21a0, 0x21a0,
+	0x21a3, 0x21a3,
+	0x21a6, 0x21a6,
+	0x21ae, 0x21ae,
+	0x21ce, 0x21cf,
+	0x21d2, 0x21d2,
+	0x21d4, 0x21d4,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b3,
+	0x23dc, 0x23e1,
+	0x25b7, 0x25b7,
+	0x25c1, 0x25c1,
+	0x25f8, 0x25ff,
+	0x266f, 0x266f,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27e5,
+	0x27f0, 0x27ff,
+	0x2900, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe62, 0xfe62,
+	0xfe64, 0xfe66,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	154,
+	0x00a6, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x00b6, 0x00b6,
+	0x0482, 0x0482,
+	0x060e, 0x060f,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0cf1, 0x0cf2,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1360, 0x1360,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19e0, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x214a, 0x214a,
+	0x214c, 0x214d,
+	0x214f, 0x214f,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21ad,
+	0x21af, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21f3,
+	0x2300, 0x2307,
+	0x230c, 0x231f,
+	0x2322, 0x2328,
+	0x232b, 0x237b,
+	0x237d, 0x239a,
+	0x23b4, 0x23db,
+	0x23e2, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2767,
+	0x2794, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2b00, 0x2b2f,
+	0x2b45, 0x2b46,
+	0x2b50, 0x2b59,
+	0x2ce5, 0x2cea,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3004, 0x3004,
+	0x3012, 0x3013,
+	0x3020, 0x3020,
+	0x3036, 0x3037,
+	0x303e, 0x303f,
+	0x3190, 0x3191,
+	0x3196, 0x319f,
+	0x31c0, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x32fe,
+	0x3300, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa828, 0xa82b,
+	0xa836, 0xa837,
+	0xa839, 0xa839,
+	0xaa77, 0xaa79,
+	0xfdfd, 0xfdfd,
+	0xffe4, 0xffe4,
+	0xffe8, 0xffe8,
+	0xffed, 0xffee,
+	0xfffc, 0xfffd,
+	0x10102, 0x10102,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+}; /* CR_So */
+
+/* 'Z': Major Category */
+static const OnigCodePoint CR_Z[] = {
+	9,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Z */
+
+/* 'Zl': General Category */
+static const OnigCodePoint CR_Zl[] = {
+	1,
+	0x2028, 0x2028,
+}; /* CR_Zl */
+
+/* 'Zp': General Category */
+static const OnigCodePoint CR_Zp[] = {
+	1,
+	0x2029, 0x2029,
+}; /* CR_Zp */
+
+/* 'Zs': General Category */
+static const OnigCodePoint CR_Zs[] = {
+	8,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Zs */
+
+/* 'Math': Derived Property */
+static const OnigCodePoint CR_Math[] = {
+	105,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f6,
+	0x0606, 0x0608,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x2061, 0x2064,
+	0x207a, 0x207e,
+	0x208a, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x2149,
+	0x214b, 0x214b,
+	0x2190, 0x21a7,
+	0x21a9, 0x21ae,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23dc, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b7,
+	0x25bc, 0x25c1,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x25f8, 0x25ff,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266f,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe61, 0xfe66,
+	0xfe68, 0xfe68,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+static const OnigCodePoint CR_Alphabetic[] = {
+	474,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09f0, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a70, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
+
+/* 'Lowercase': Derived Property */
+static const OnigCodePoint CR_Lowercase[] = {
+	602,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0138,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018d,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019b,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01aa, 0x01ab,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01ba,
+	0x01bd, 0x01bf,
+	0x01c6, 0x01c6,
+	0x01c9, 0x01c9,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0221, 0x0221,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0239,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037a, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f3,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fc,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d00, 0x1dbf,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x2090, 0x2094,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7d,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce4,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x1d41a, 0x1d433,
+	0x1d44e, 0x1d454,
+	0x1d456, 0x1d467,
+	0x1d482, 0x1d49b,
+	0x1d4b6, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d4cf,
+	0x1d4ea, 0x1d503,
+	0x1d51e, 0x1d537,
+	0x1d552, 0x1d56b,
+	0x1d586, 0x1d59f,
+	0x1d5ba, 0x1d5d3,
+	0x1d5ee, 0x1d607,
+	0x1d622, 0x1d63b,
+	0x1d656, 0x1d66f,
+	0x1d68a, 0x1d6a5,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6e1,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d71b,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d755,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d78f,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7c9,
+	0x1d7cb, 0x1d7cb,
+}; /* CR_Lowercase */
+
+/* 'Uppercase': Derived Property */
+static const OnigCodePoint CR_Uppercase[] = {
+	596,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c4,
+	0x01c7, 0x01c7,
+	0x01ca, 0x01ca,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f1,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d2, 0x03d4,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1fb8, 0x1fbb,
+	0x1fc8, 0x1fcb,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffb,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210b, 0x210d,
+	0x2110, 0x2112,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x2130, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x1d400, 0x1d419,
+	0x1d434, 0x1d44d,
+	0x1d468, 0x1d481,
+	0x1d49c, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b5,
+	0x1d4d0, 0x1d4e9,
+	0x1d504, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d538, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d56c, 0x1d585,
+	0x1d5a0, 0x1d5b9,
+	0x1d5d4, 0x1d5ed,
+	0x1d608, 0x1d621,
+	0x1d63c, 0x1d655,
+	0x1d670, 0x1d689,
+	0x1d6a8, 0x1d6c0,
+	0x1d6e2, 0x1d6fa,
+	0x1d71c, 0x1d734,
+	0x1d756, 0x1d76e,
+	0x1d790, 0x1d7a8,
+	0x1d7ca, 0x1d7ca,
+}; /* CR_Uppercase */
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	110,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+}; /* CR_Cased */
+
+/* 'Case_Ignorable': Derived Property */
+static const OnigCodePoint CR_Case_Ignorable[] = {
+	266,
+	0x0027, 0x0027,
+	0x002e, 0x002e,
+	0x003a, 0x003a,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00ad, 0x00ad,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0387, 0x0387,
+	0x0483, 0x0489,
+	0x0559, 0x0559,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05f4, 0x05f4,
+	0x0600, 0x0603,
+	0x0610, 0x061a,
+	0x0640, 0x0640,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0971, 0x0971,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e46, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x10fc, 0x10fc,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1843, 0x1843,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x200b, 0x200f,
+	0x2018, 0x2019,
+	0x2024, 0x2024,
+	0x2027, 0x2027,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x206a, 0x206f,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2c7d, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302f,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xa9cf, 0xa9cf,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa70, 0xaa70,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaadd, 0xaadd,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe13, 0xfe13,
+	0xfe20, 0xfe26,
+	0xfe52, 0xfe52,
+	0xfe55, 0xfe55,
+	0xfeff, 0xfeff,
+	0xff07, 0xff07,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0xfff9, 0xfffb,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x1d167, 0x1d169,
+	0x1d173, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	557,
+	0x0041, 0x005a,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00de,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x014a, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f4, 0x03f4,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fb8, 0x1fbc,
+	0x1fc8, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	573,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c5, 0x01c6,
+	0x01c8, 0x01c9,
+	0x01cb, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f0,
+	0x01f2, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbc, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fcc, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x1ffc, 0x1ffc,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	574,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00df, 0x00f6,
+	0x00f8, 0x00ff,
+	0x0101, 0x0101,
+	0x0103, 0x0103,
+	0x0105, 0x0105,
+	0x0107, 0x0107,
+	0x0109, 0x0109,
+	0x010b, 0x010b,
+	0x010d, 0x010d,
+	0x010f, 0x010f,
+	0x0111, 0x0111,
+	0x0113, 0x0113,
+	0x0115, 0x0115,
+	0x0117, 0x0117,
+	0x0119, 0x0119,
+	0x011b, 0x011b,
+	0x011d, 0x011d,
+	0x011f, 0x011f,
+	0x0121, 0x0121,
+	0x0123, 0x0123,
+	0x0125, 0x0125,
+	0x0127, 0x0127,
+	0x0129, 0x0129,
+	0x012b, 0x012b,
+	0x012d, 0x012d,
+	0x012f, 0x012f,
+	0x0131, 0x0131,
+	0x0133, 0x0133,
+	0x0135, 0x0135,
+	0x0137, 0x0137,
+	0x013a, 0x013a,
+	0x013c, 0x013c,
+	0x013e, 0x013e,
+	0x0140, 0x0140,
+	0x0142, 0x0142,
+	0x0144, 0x0144,
+	0x0146, 0x0146,
+	0x0148, 0x0149,
+	0x014b, 0x014b,
+	0x014d, 0x014d,
+	0x014f, 0x014f,
+	0x0151, 0x0151,
+	0x0153, 0x0153,
+	0x0155, 0x0155,
+	0x0157, 0x0157,
+	0x0159, 0x0159,
+	0x015b, 0x015b,
+	0x015d, 0x015d,
+	0x015f, 0x015f,
+	0x0161, 0x0161,
+	0x0163, 0x0163,
+	0x0165, 0x0165,
+	0x0167, 0x0167,
+	0x0169, 0x0169,
+	0x016b, 0x016b,
+	0x016d, 0x016d,
+	0x016f, 0x016f,
+	0x0171, 0x0171,
+	0x0173, 0x0173,
+	0x0175, 0x0175,
+	0x0177, 0x0177,
+	0x017a, 0x017a,
+	0x017c, 0x017c,
+	0x017e, 0x0180,
+	0x0183, 0x0183,
+	0x0185, 0x0185,
+	0x0188, 0x0188,
+	0x018c, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x01c4,
+	0x01c6, 0x01c7,
+	0x01c9, 0x01ca,
+	0x01cc, 0x01cc,
+	0x01ce, 0x01ce,
+	0x01d0, 0x01d0,
+	0x01d2, 0x01d2,
+	0x01d4, 0x01d4,
+	0x01d6, 0x01d6,
+	0x01d8, 0x01d8,
+	0x01da, 0x01da,
+	0x01dc, 0x01dd,
+	0x01df, 0x01df,
+	0x01e1, 0x01e1,
+	0x01e3, 0x01e3,
+	0x01e5, 0x01e5,
+	0x01e7, 0x01e7,
+	0x01e9, 0x01e9,
+	0x01eb, 0x01eb,
+	0x01ed, 0x01ed,
+	0x01ef, 0x01f1,
+	0x01f3, 0x01f3,
+	0x01f5, 0x01f5,
+	0x01f9, 0x01f9,
+	0x01fb, 0x01fb,
+	0x01fd, 0x01fd,
+	0x01ff, 0x01ff,
+	0x0201, 0x0201,
+	0x0203, 0x0203,
+	0x0205, 0x0205,
+	0x0207, 0x0207,
+	0x0209, 0x0209,
+	0x020b, 0x020b,
+	0x020d, 0x020d,
+	0x020f, 0x020f,
+	0x0211, 0x0211,
+	0x0213, 0x0213,
+	0x0215, 0x0215,
+	0x0217, 0x0217,
+	0x0219, 0x0219,
+	0x021b, 0x021b,
+	0x021d, 0x021d,
+	0x021f, 0x021f,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	0x0390, 0x0390,
+	0x03ac, 0x03ce,
+	0x03d0, 0x03d1,
+	0x03d5, 0x03d7,
+	0x03d9, 0x03d9,
+	0x03db, 0x03db,
+	0x03dd, 0x03dd,
+	0x03df, 0x03df,
+	0x03e1, 0x03e1,
+	0x03e3, 0x03e3,
+	0x03e5, 0x03e5,
+	0x03e7, 0x03e7,
+	0x03e9, 0x03e9,
+	0x03eb, 0x03eb,
+	0x03ed, 0x03ed,
+	0x03ef, 0x03f2,
+	0x03f5, 0x03f5,
+	0x03f8, 0x03f8,
+	0x03fb, 0x03fb,
+	0x0430, 0x045f,
+	0x0461, 0x0461,
+	0x0463, 0x0463,
+	0x0465, 0x0465,
+	0x0467, 0x0467,
+	0x0469, 0x0469,
+	0x046b, 0x046b,
+	0x046d, 0x046d,
+	0x046f, 0x046f,
+	0x0471, 0x0471,
+	0x0473, 0x0473,
+	0x0475, 0x0475,
+	0x0477, 0x0477,
+	0x0479, 0x0479,
+	0x047b, 0x047b,
+	0x047d, 0x047d,
+	0x047f, 0x047f,
+	0x0481, 0x0481,
+	0x048b, 0x048b,
+	0x048d, 0x048d,
+	0x048f, 0x048f,
+	0x0491, 0x0491,
+	0x0493, 0x0493,
+	0x0495, 0x0495,
+	0x0497, 0x0497,
+	0x0499, 0x0499,
+	0x049b, 0x049b,
+	0x049d, 0x049d,
+	0x049f, 0x049f,
+	0x04a1, 0x04a1,
+	0x04a3, 0x04a3,
+	0x04a5, 0x04a5,
+	0x04a7, 0x04a7,
+	0x04a9, 0x04a9,
+	0x04ab, 0x04ab,
+	0x04ad, 0x04ad,
+	0x04af, 0x04af,
+	0x04b1, 0x04b1,
+	0x04b3, 0x04b3,
+	0x04b5, 0x04b5,
+	0x04b7, 0x04b7,
+	0x04b9, 0x04b9,
+	0x04bb, 0x04bb,
+	0x04bd, 0x04bd,
+	0x04bf, 0x04bf,
+	0x04c2, 0x04c2,
+	0x04c4, 0x04c4,
+	0x04c6, 0x04c6,
+	0x04c8, 0x04c8,
+	0x04ca, 0x04ca,
+	0x04cc, 0x04cc,
+	0x04ce, 0x04cf,
+	0x04d1, 0x04d1,
+	0x04d3, 0x04d3,
+	0x04d5, 0x04d5,
+	0x04d7, 0x04d7,
+	0x04d9, 0x04d9,
+	0x04db, 0x04db,
+	0x04dd, 0x04dd,
+	0x04df, 0x04df,
+	0x04e1, 0x04e1,
+	0x04e3, 0x04e3,
+	0x04e5, 0x04e5,
+	0x04e7, 0x04e7,
+	0x04e9, 0x04e9,
+	0x04eb, 0x04eb,
+	0x04ed, 0x04ed,
+	0x04ef, 0x04ef,
+	0x04f1, 0x04f1,
+	0x04f3, 0x04f3,
+	0x04f5, 0x04f5,
+	0x04f7, 0x04f7,
+	0x04f9, 0x04f9,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0561, 0x0587,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e01, 0x1e01,
+	0x1e03, 0x1e03,
+	0x1e05, 0x1e05,
+	0x1e07, 0x1e07,
+	0x1e09, 0x1e09,
+	0x1e0b, 0x1e0b,
+	0x1e0d, 0x1e0d,
+	0x1e0f, 0x1e0f,
+	0x1e11, 0x1e11,
+	0x1e13, 0x1e13,
+	0x1e15, 0x1e15,
+	0x1e17, 0x1e17,
+	0x1e19, 0x1e19,
+	0x1e1b, 0x1e1b,
+	0x1e1d, 0x1e1d,
+	0x1e1f, 0x1e1f,
+	0x1e21, 0x1e21,
+	0x1e23, 0x1e23,
+	0x1e25, 0x1e25,
+	0x1e27, 0x1e27,
+	0x1e29, 0x1e29,
+	0x1e2b, 0x1e2b,
+	0x1e2d, 0x1e2d,
+	0x1e2f, 0x1e2f,
+	0x1e31, 0x1e31,
+	0x1e33, 0x1e33,
+	0x1e35, 0x1e35,
+	0x1e37, 0x1e37,
+	0x1e39, 0x1e39,
+	0x1e3b, 0x1e3b,
+	0x1e3d, 0x1e3d,
+	0x1e3f, 0x1e3f,
+	0x1e41, 0x1e41,
+	0x1e43, 0x1e43,
+	0x1e45, 0x1e45,
+	0x1e47, 0x1e47,
+	0x1e49, 0x1e49,
+	0x1e4b, 0x1e4b,
+	0x1e4d, 0x1e4d,
+	0x1e4f, 0x1e4f,
+	0x1e51, 0x1e51,
+	0x1e53, 0x1e53,
+	0x1e55, 0x1e55,
+	0x1e57, 0x1e57,
+	0x1e59, 0x1e59,
+	0x1e5b, 0x1e5b,
+	0x1e5d, 0x1e5d,
+	0x1e5f, 0x1e5f,
+	0x1e61, 0x1e61,
+	0x1e63, 0x1e63,
+	0x1e65, 0x1e65,
+	0x1e67, 0x1e67,
+	0x1e69, 0x1e69,
+	0x1e6b, 0x1e6b,
+	0x1e6d, 0x1e6d,
+	0x1e6f, 0x1e6f,
+	0x1e71, 0x1e71,
+	0x1e73, 0x1e73,
+	0x1e75, 0x1e75,
+	0x1e77, 0x1e77,
+	0x1e79, 0x1e79,
+	0x1e7b, 0x1e7b,
+	0x1e7d, 0x1e7d,
+	0x1e7f, 0x1e7f,
+	0x1e81, 0x1e81,
+	0x1e83, 0x1e83,
+	0x1e85, 0x1e85,
+	0x1e87, 0x1e87,
+	0x1e89, 0x1e89,
+	0x1e8b, 0x1e8b,
+	0x1e8d, 0x1e8d,
+	0x1e8f, 0x1e8f,
+	0x1e91, 0x1e91,
+	0x1e93, 0x1e93,
+	0x1e95, 0x1e9b,
+	0x1ea1, 0x1ea1,
+	0x1ea3, 0x1ea3,
+	0x1ea5, 0x1ea5,
+	0x1ea7, 0x1ea7,
+	0x1ea9, 0x1ea9,
+	0x1eab, 0x1eab,
+	0x1ead, 0x1ead,
+	0x1eaf, 0x1eaf,
+	0x1eb1, 0x1eb1,
+	0x1eb3, 0x1eb3,
+	0x1eb5, 0x1eb5,
+	0x1eb7, 0x1eb7,
+	0x1eb9, 0x1eb9,
+	0x1ebb, 0x1ebb,
+	0x1ebd, 0x1ebd,
+	0x1ebf, 0x1ebf,
+	0x1ec1, 0x1ec1,
+	0x1ec3, 0x1ec3,
+	0x1ec5, 0x1ec5,
+	0x1ec7, 0x1ec7,
+	0x1ec9, 0x1ec9,
+	0x1ecb, 0x1ecb,
+	0x1ecd, 0x1ecd,
+	0x1ecf, 0x1ecf,
+	0x1ed1, 0x1ed1,
+	0x1ed3, 0x1ed3,
+	0x1ed5, 0x1ed5,
+	0x1ed7, 0x1ed7,
+	0x1ed9, 0x1ed9,
+	0x1edb, 0x1edb,
+	0x1edd, 0x1edd,
+	0x1edf, 0x1edf,
+	0x1ee1, 0x1ee1,
+	0x1ee3, 0x1ee3,
+	0x1ee5, 0x1ee5,
+	0x1ee7, 0x1ee7,
+	0x1ee9, 0x1ee9,
+	0x1eeb, 0x1eeb,
+	0x1eed, 0x1eed,
+	0x1eef, 0x1eef,
+	0x1ef1, 0x1ef1,
+	0x1ef3, 0x1ef3,
+	0x1ef5, 0x1ef5,
+	0x1ef7, 0x1ef7,
+	0x1ef9, 0x1ef9,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1f87,
+	0x1f90, 0x1f97,
+	0x1fa0, 0x1fa7,
+	0x1fb0, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	0x2c81, 0x2c81,
+	0x2c83, 0x2c83,
+	0x2c85, 0x2c85,
+	0x2c87, 0x2c87,
+	0x2c89, 0x2c89,
+	0x2c8b, 0x2c8b,
+	0x2c8d, 0x2c8d,
+	0x2c8f, 0x2c8f,
+	0x2c91, 0x2c91,
+	0x2c93, 0x2c93,
+	0x2c95, 0x2c95,
+	0x2c97, 0x2c97,
+	0x2c99, 0x2c99,
+	0x2c9b, 0x2c9b,
+	0x2c9d, 0x2c9d,
+	0x2c9f, 0x2c9f,
+	0x2ca1, 0x2ca1,
+	0x2ca3, 0x2ca3,
+	0x2ca5, 0x2ca5,
+	0x2ca7, 0x2ca7,
+	0x2ca9, 0x2ca9,
+	0x2cab, 0x2cab,
+	0x2cad, 0x2cad,
+	0x2caf, 0x2caf,
+	0x2cb1, 0x2cb1,
+	0x2cb3, 0x2cb3,
+	0x2cb5, 0x2cb5,
+	0x2cb7, 0x2cb7,
+	0x2cb9, 0x2cb9,
+	0x2cbb, 0x2cbb,
+	0x2cbd, 0x2cbd,
+	0x2cbf, 0x2cbf,
+	0x2cc1, 0x2cc1,
+	0x2cc3, 0x2cc3,
+	0x2cc5, 0x2cc5,
+	0x2cc7, 0x2cc7,
+	0x2cc9, 0x2cc9,
+	0x2ccb, 0x2ccb,
+	0x2ccd, 0x2ccd,
+	0x2ccf, 0x2ccf,
+	0x2cd1, 0x2cd1,
+	0x2cd3, 0x2cd3,
+	0x2cd5, 0x2cd5,
+	0x2cd7, 0x2cd7,
+	0x2cd9, 0x2cd9,
+	0x2cdb, 0x2cdb,
+	0x2cdd, 0x2cdd,
+	0x2cdf, 0x2cdf,
+	0x2ce1, 0x2ce1,
+	0x2ce3, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	568,
+	0x0041, 0x005a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00df,
+	0x0100, 0x0100,
+	0x0102, 0x0102,
+	0x0104, 0x0104,
+	0x0106, 0x0106,
+	0x0108, 0x0108,
+	0x010a, 0x010a,
+	0x010c, 0x010c,
+	0x010e, 0x010e,
+	0x0110, 0x0110,
+	0x0112, 0x0112,
+	0x0114, 0x0114,
+	0x0116, 0x0116,
+	0x0118, 0x0118,
+	0x011a, 0x011a,
+	0x011c, 0x011c,
+	0x011e, 0x011e,
+	0x0120, 0x0120,
+	0x0122, 0x0122,
+	0x0124, 0x0124,
+	0x0126, 0x0126,
+	0x0128, 0x0128,
+	0x012a, 0x012a,
+	0x012c, 0x012c,
+	0x012e, 0x012e,
+	0x0130, 0x0130,
+	0x0132, 0x0132,
+	0x0134, 0x0134,
+	0x0136, 0x0136,
+	0x0139, 0x0139,
+	0x013b, 0x013b,
+	0x013d, 0x013d,
+	0x013f, 0x013f,
+	0x0141, 0x0141,
+	0x0143, 0x0143,
+	0x0145, 0x0145,
+	0x0147, 0x0147,
+	0x0149, 0x014a,
+	0x014c, 0x014c,
+	0x014e, 0x014e,
+	0x0150, 0x0150,
+	0x0152, 0x0152,
+	0x0154, 0x0154,
+	0x0156, 0x0156,
+	0x0158, 0x0158,
+	0x015a, 0x015a,
+	0x015c, 0x015c,
+	0x015e, 0x015e,
+	0x0160, 0x0160,
+	0x0162, 0x0162,
+	0x0164, 0x0164,
+	0x0166, 0x0166,
+	0x0168, 0x0168,
+	0x016a, 0x016a,
+	0x016c, 0x016c,
+	0x016e, 0x016e,
+	0x0170, 0x0170,
+	0x0172, 0x0172,
+	0x0174, 0x0174,
+	0x0176, 0x0176,
+	0x0178, 0x0179,
+	0x017b, 0x017b,
+	0x017d, 0x017d,
+	0x017f, 0x017f,
+	0x0181, 0x0182,
+	0x0184, 0x0184,
+	0x0186, 0x0187,
+	0x0189, 0x018b,
+	0x018e, 0x0191,
+	0x0193, 0x0194,
+	0x0196, 0x0198,
+	0x019c, 0x019d,
+	0x019f, 0x01a0,
+	0x01a2, 0x01a2,
+	0x01a4, 0x01a4,
+	0x01a6, 0x01a7,
+	0x01a9, 0x01a9,
+	0x01ac, 0x01ac,
+	0x01ae, 0x01af,
+	0x01b1, 0x01b3,
+	0x01b5, 0x01b5,
+	0x01b7, 0x01b8,
+	0x01bc, 0x01bc,
+	0x01c4, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	0x01cd, 0x01cd,
+	0x01cf, 0x01cf,
+	0x01d1, 0x01d1,
+	0x01d3, 0x01d3,
+	0x01d5, 0x01d5,
+	0x01d7, 0x01d7,
+	0x01d9, 0x01d9,
+	0x01db, 0x01db,
+	0x01de, 0x01de,
+	0x01e0, 0x01e0,
+	0x01e2, 0x01e2,
+	0x01e4, 0x01e4,
+	0x01e6, 0x01e6,
+	0x01e8, 0x01e8,
+	0x01ea, 0x01ea,
+	0x01ec, 0x01ec,
+	0x01ee, 0x01ee,
+	0x01f1, 0x01f2,
+	0x01f4, 0x01f4,
+	0x01f6, 0x01f8,
+	0x01fa, 0x01fa,
+	0x01fc, 0x01fc,
+	0x01fe, 0x01fe,
+	0x0200, 0x0200,
+	0x0202, 0x0202,
+	0x0204, 0x0204,
+	0x0206, 0x0206,
+	0x0208, 0x0208,
+	0x020a, 0x020a,
+	0x020c, 0x020c,
+	0x020e, 0x020e,
+	0x0210, 0x0210,
+	0x0212, 0x0212,
+	0x0214, 0x0214,
+	0x0216, 0x0216,
+	0x0218, 0x0218,
+	0x021a, 0x021a,
+	0x021c, 0x021c,
+	0x021e, 0x021e,
+	0x0220, 0x0220,
+	0x0222, 0x0222,
+	0x0224, 0x0224,
+	0x0226, 0x0226,
+	0x0228, 0x0228,
+	0x022a, 0x022a,
+	0x022c, 0x022c,
+	0x022e, 0x022e,
+	0x0230, 0x0230,
+	0x0232, 0x0232,
+	0x023a, 0x023b,
+	0x023d, 0x023e,
+	0x0241, 0x0241,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0345, 0x0345,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03c2, 0x03c2,
+	0x03cf, 0x03d1,
+	0x03d5, 0x03d6,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03f7,
+	0x03f9, 0x03fa,
+	0x03fd, 0x042f,
+	0x0460, 0x0460,
+	0x0462, 0x0462,
+	0x0464, 0x0464,
+	0x0466, 0x0466,
+	0x0468, 0x0468,
+	0x046a, 0x046a,
+	0x046c, 0x046c,
+	0x046e, 0x046e,
+	0x0470, 0x0470,
+	0x0472, 0x0472,
+	0x0474, 0x0474,
+	0x0476, 0x0476,
+	0x0478, 0x0478,
+	0x047a, 0x047a,
+	0x047c, 0x047c,
+	0x047e, 0x047e,
+	0x0480, 0x0480,
+	0x048a, 0x048a,
+	0x048c, 0x048c,
+	0x048e, 0x048e,
+	0x0490, 0x0490,
+	0x0492, 0x0492,
+	0x0494, 0x0494,
+	0x0496, 0x0496,
+	0x0498, 0x0498,
+	0x049a, 0x049a,
+	0x049c, 0x049c,
+	0x049e, 0x049e,
+	0x04a0, 0x04a0,
+	0x04a2, 0x04a2,
+	0x04a4, 0x04a4,
+	0x04a6, 0x04a6,
+	0x04a8, 0x04a8,
+	0x04aa, 0x04aa,
+	0x04ac, 0x04ac,
+	0x04ae, 0x04ae,
+	0x04b0, 0x04b0,
+	0x04b2, 0x04b2,
+	0x04b4, 0x04b4,
+	0x04b6, 0x04b6,
+	0x04b8, 0x04b8,
+	0x04ba, 0x04ba,
+	0x04bc, 0x04bc,
+	0x04be, 0x04be,
+	0x04c0, 0x04c1,
+	0x04c3, 0x04c3,
+	0x04c5, 0x04c5,
+	0x04c7, 0x04c7,
+	0x04c9, 0x04c9,
+	0x04cb, 0x04cb,
+	0x04cd, 0x04cd,
+	0x04d0, 0x04d0,
+	0x04d2, 0x04d2,
+	0x04d4, 0x04d4,
+	0x04d6, 0x04d6,
+	0x04d8, 0x04d8,
+	0x04da, 0x04da,
+	0x04dc, 0x04dc,
+	0x04de, 0x04de,
+	0x04e0, 0x04e0,
+	0x04e2, 0x04e2,
+	0x04e4, 0x04e4,
+	0x04e6, 0x04e6,
+	0x04e8, 0x04e8,
+	0x04ea, 0x04ea,
+	0x04ec, 0x04ec,
+	0x04ee, 0x04ee,
+	0x04f0, 0x04f0,
+	0x04f2, 0x04f2,
+	0x04f4, 0x04f4,
+	0x04f6, 0x04f6,
+	0x04f8, 0x04f8,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x1e00, 0x1e00,
+	0x1e02, 0x1e02,
+	0x1e04, 0x1e04,
+	0x1e06, 0x1e06,
+	0x1e08, 0x1e08,
+	0x1e0a, 0x1e0a,
+	0x1e0c, 0x1e0c,
+	0x1e0e, 0x1e0e,
+	0x1e10, 0x1e10,
+	0x1e12, 0x1e12,
+	0x1e14, 0x1e14,
+	0x1e16, 0x1e16,
+	0x1e18, 0x1e18,
+	0x1e1a, 0x1e1a,
+	0x1e1c, 0x1e1c,
+	0x1e1e, 0x1e1e,
+	0x1e20, 0x1e20,
+	0x1e22, 0x1e22,
+	0x1e24, 0x1e24,
+	0x1e26, 0x1e26,
+	0x1e28, 0x1e28,
+	0x1e2a, 0x1e2a,
+	0x1e2c, 0x1e2c,
+	0x1e2e, 0x1e2e,
+	0x1e30, 0x1e30,
+	0x1e32, 0x1e32,
+	0x1e34, 0x1e34,
+	0x1e36, 0x1e36,
+	0x1e38, 0x1e38,
+	0x1e3a, 0x1e3a,
+	0x1e3c, 0x1e3c,
+	0x1e3e, 0x1e3e,
+	0x1e40, 0x1e40,
+	0x1e42, 0x1e42,
+	0x1e44, 0x1e44,
+	0x1e46, 0x1e46,
+	0x1e48, 0x1e48,
+	0x1e4a, 0x1e4a,
+	0x1e4c, 0x1e4c,
+	0x1e4e, 0x1e4e,
+	0x1e50, 0x1e50,
+	0x1e52, 0x1e52,
+	0x1e54, 0x1e54,
+	0x1e56, 0x1e56,
+	0x1e58, 0x1e58,
+	0x1e5a, 0x1e5a,
+	0x1e5c, 0x1e5c,
+	0x1e5e, 0x1e5e,
+	0x1e60, 0x1e60,
+	0x1e62, 0x1e62,
+	0x1e64, 0x1e64,
+	0x1e66, 0x1e66,
+	0x1e68, 0x1e68,
+	0x1e6a, 0x1e6a,
+	0x1e6c, 0x1e6c,
+	0x1e6e, 0x1e6e,
+	0x1e70, 0x1e70,
+	0x1e72, 0x1e72,
+	0x1e74, 0x1e74,
+	0x1e76, 0x1e76,
+	0x1e78, 0x1e78,
+	0x1e7a, 0x1e7a,
+	0x1e7c, 0x1e7c,
+	0x1e7e, 0x1e7e,
+	0x1e80, 0x1e80,
+	0x1e82, 0x1e82,
+	0x1e84, 0x1e84,
+	0x1e86, 0x1e86,
+	0x1e88, 0x1e88,
+	0x1e8a, 0x1e8a,
+	0x1e8c, 0x1e8c,
+	0x1e8e, 0x1e8e,
+	0x1e90, 0x1e90,
+	0x1e92, 0x1e92,
+	0x1e94, 0x1e94,
+	0x1e9a, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1ea0,
+	0x1ea2, 0x1ea2,
+	0x1ea4, 0x1ea4,
+	0x1ea6, 0x1ea6,
+	0x1ea8, 0x1ea8,
+	0x1eaa, 0x1eaa,
+	0x1eac, 0x1eac,
+	0x1eae, 0x1eae,
+	0x1eb0, 0x1eb0,
+	0x1eb2, 0x1eb2,
+	0x1eb4, 0x1eb4,
+	0x1eb6, 0x1eb6,
+	0x1eb8, 0x1eb8,
+	0x1eba, 0x1eba,
+	0x1ebc, 0x1ebc,
+	0x1ebe, 0x1ebe,
+	0x1ec0, 0x1ec0,
+	0x1ec2, 0x1ec2,
+	0x1ec4, 0x1ec4,
+	0x1ec6, 0x1ec6,
+	0x1ec8, 0x1ec8,
+	0x1eca, 0x1eca,
+	0x1ecc, 0x1ecc,
+	0x1ece, 0x1ece,
+	0x1ed0, 0x1ed0,
+	0x1ed2, 0x1ed2,
+	0x1ed4, 0x1ed4,
+	0x1ed6, 0x1ed6,
+	0x1ed8, 0x1ed8,
+	0x1eda, 0x1eda,
+	0x1edc, 0x1edc,
+	0x1ede, 0x1ede,
+	0x1ee0, 0x1ee0,
+	0x1ee2, 0x1ee2,
+	0x1ee4, 0x1ee4,
+	0x1ee6, 0x1ee6,
+	0x1ee8, 0x1ee8,
+	0x1eea, 0x1eea,
+	0x1eec, 0x1eec,
+	0x1eee, 0x1eee,
+	0x1ef0, 0x1ef0,
+	0x1ef2, 0x1ef2,
+	0x1ef4, 0x1ef4,
+	0x1ef6, 0x1ef6,
+	0x1ef8, 0x1ef8,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f80, 0x1faf,
+	0x1fb2, 0x1fb4,
+	0x1fb7, 0x1fbc,
+	0x1fc2, 0x1fc4,
+	0x1fc7, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff7, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 0x2c80,
+	0x2c82, 0x2c82,
+	0x2c84, 0x2c84,
+	0x2c86, 0x2c86,
+	0x2c88, 0x2c88,
+	0x2c8a, 0x2c8a,
+	0x2c8c, 0x2c8c,
+	0x2c8e, 0x2c8e,
+	0x2c90, 0x2c90,
+	0x2c92, 0x2c92,
+	0x2c94, 0x2c94,
+	0x2c96, 0x2c96,
+	0x2c98, 0x2c98,
+	0x2c9a, 0x2c9a,
+	0x2c9c, 0x2c9c,
+	0x2c9e, 0x2c9e,
+	0x2ca0, 0x2ca0,
+	0x2ca2, 0x2ca2,
+	0x2ca4, 0x2ca4,
+	0x2ca6, 0x2ca6,
+	0x2ca8, 0x2ca8,
+	0x2caa, 0x2caa,
+	0x2cac, 0x2cac,
+	0x2cae, 0x2cae,
+	0x2cb0, 0x2cb0,
+	0x2cb2, 0x2cb2,
+	0x2cb4, 0x2cb4,
+	0x2cb6, 0x2cb6,
+	0x2cb8, 0x2cb8,
+	0x2cba, 0x2cba,
+	0x2cbc, 0x2cbc,
+	0x2cbe, 0x2cbe,
+	0x2cc0, 0x2cc0,
+	0x2cc2, 0x2cc2,
+	0x2cc4, 0x2cc4,
+	0x2cc6, 0x2cc6,
+	0x2cc8, 0x2cc8,
+	0x2cca, 0x2cca,
+	0x2ccc, 0x2ccc,
+	0x2cce, 0x2cce,
+	0x2cd0, 0x2cd0,
+	0x2cd2, 0x2cd2,
+	0x2cd4, 0x2cd4,
+	0x2cd6, 0x2cd6,
+	0x2cd8, 0x2cd8,
+	0x2cda, 0x2cda,
+	0x2cdc, 0x2cdc,
+	0x2cde, 0x2cde,
+	0x2ce0, 0x2ce0,
+	0x2ce2, 0x2ce2,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	97,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x0137,
+	0x0139, 0x018c,
+	0x018e, 0x019a,
+	0x019c, 0x01a9,
+	0x01ac, 0x01b9,
+	0x01bc, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x0220,
+	0x0222, 0x0233,
+	0x023a, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025b,
+	0x0260, 0x0260,
+	0x0263, 0x0263,
+	0x0268, 0x0269,
+	0x026b, 0x026b,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0288, 0x028c,
+	0x0292, 0x0292,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03d1,
+	0x03d5, 0x03f2,
+	0x03f4, 0x03f5,
+	0x03f7, 0x03fb,
+	0x03fd, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1e00, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c70,
+	0x2c72, 0x2c73,
+	0x2c75, 0x2c76,
+	0x2c7e, 0x2ce3,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0xa640, 0xa65f,
+	0xa662, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78c,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	424,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309b, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	431,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0621, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a72, 0x0a74,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0abd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b71, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d60, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e32,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb2,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8b,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11083, 0x110af,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	513,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_XID_Continue */
+
+/* 'Default_Ignorable_Code_Point': Derived Property */
+static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
+	15,
+	0x00ad, 0x00ad,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x180b, 0x180d,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x3164, 0x3164,
+	0xfe00, 0xfe0f,
+	0xfeff, 0xfeff,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe0fff,
+}; /* CR_Default_Ignorable_Code_Point */
+
+/* 'Grapheme_Extend': Derived Property */
+static const OnigCodePoint CR_Grapheme_Extend[] = {
+	206,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06de, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0900, 0x0902,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09be, 0x09be,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bbe,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d3e, 0x0d3e,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dcf,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0ddf, 0x0ddf,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa67c, 0xa67d,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bc,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x1d165, 0x1d165,
+	0x1d167, 0x1d169,
+	0x1d16e, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	567,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06e9, 0x06e9,
+	0x06ee, 0x070d,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0830, 0x083e,
+	0x0903, 0x0939,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0972,
+	0x0979, 0x097f,
+	0x0982, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09bf, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09e6, 0x09fb,
+	0x0a03, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a40,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a6f,
+	0x0a72, 0x0a74,
+	0x0a83, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b02, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbf, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c41, 0x0c44,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbe,
+	0x0cc0, 0x0cc1,
+	0x0cc3, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dd0, 0x0dd1,
+	0x0dd8, 0x0dde,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e3f, 0x0e46,
+	0x0e4f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8b,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1360, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1735, 0x1736,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x17d4, 0x17dc,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180a,
+	0x180e, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a16,
+	0x1a19, 0x1a1b,
+	0x1a1e, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b04, 0x1b33,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b4b,
+	0x1b50, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1b82, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x200a,
+	0x2010, 0x2027,
+	0x202f, 0x205f,
+	0x2070, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa824,
+	0xa827, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c3,
+	0xa8ce, 0xa8d9,
+	0xa8f2, 0xa8fb,
+	0xa900, 0xa925,
+	0xa92e, 0xa946,
+	0xa952, 0xa953,
+	0xa95f, 0xa97c,
+	0xa983, 0xa9b2,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9bd, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa28,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa4d, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff01, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a40, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d166, 0x1d166,
+	0x1d16a, 0x1d16d,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	26,
+	0x094d, 0x094d,
+	0x09cd, 0x09cd,
+	0x0a4d, 0x0a4d,
+	0x0acd, 0x0acd,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e3a, 0x0e3a,
+	0x0f84, 0x0f84,
+	0x1039, 0x103a,
+	0x1714, 0x1714,
+	0x1734, 0x1734,
+	0x17d2, 0x17d2,
+	0x1a60, 0x1a60,
+	0x1b44, 0x1b44,
+	0x1baa, 0x1baa,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x110b9, 0x110b9,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	159,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x0600, 0x0603,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0cf1, 0x0cf2,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x206a, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20b8,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x27ff,
+	0x2900, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2e00, 0x2e31,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3004,
+	0x3006, 0x3006,
+	0x3008, 0x3020,
+	0x3030, 0x3037,
+	0x303c, 0x303f,
+	0x309b, 0x309c,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fc,
+	0x3190, 0x319f,
+	0x31c0, 0x31e3,
+	0x3220, 0x325f,
+	0x327f, 0x32cf,
+	0x3358, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	0xa830, 0xa839,
+	0xfd3e, 0xfd3f,
+	0xfdfd, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfeff, 0xfeff,
+	0xff01, 0xff20,
+	0xff3b, 0xff40,
+	0xff5b, 0xff65,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d166,
+	0x1d16a, 0x1d17a,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	28,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02b8,
+	0x02e0, 0x02e4,
+	0x1d00, 0x1d25,
+	0x1d2c, 0x1d5c,
+	0x1d62, 0x1d65,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1dbe,
+	0x1e00, 0x1eff,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa7ff,
+	0xfb00, 0xfb06,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+}; /* CR_Latin */
+
+/* 'Greek': Script */
+static const OnigCodePoint CR_Greek[] = {
+	33,
+	0x0370, 0x0373,
+	0x0375, 0x0377,
+	0x037a, 0x037d,
+	0x0384, 0x0384,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03e1,
+	0x03f0, 0x03ff,
+	0x1d26, 0x1d2a,
+	0x1d5d, 0x1d61,
+	0x1d66, 0x1d6a,
+	0x1dbf, 0x1dbf,
+	0x1f00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2126, 0x2126,
+	0x10140, 0x1018a,
+	0x1d200, 0x1d245,
+}; /* CR_Greek */
+
+/* 'Cyrillic': Script */
+static const OnigCodePoint CR_Cyrillic[] = {
+	8,
+	0x0400, 0x0484,
+	0x0487, 0x0525,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	5,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0xfb13, 0xfb17,
+}; /* CR_Armenian */
+
+/* 'Hebrew': Script */
+static const OnigCodePoint CR_Hebrew[] = {
+	9,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfb4f,
+}; /* CR_Hebrew */
+
+/* 'Arabic': Script */
+static const OnigCodePoint CR_Arabic[] = {
+	18,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0621, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065e,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0xfb50, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfc,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+}; /* CR_Arabic */
+
+/* 'Syriac': Script */
+static const OnigCodePoint CR_Syriac[] = {
+	3,
+	0x0700, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+}; /* CR_Syriac */
+
+/* 'Thaana': Script */
+static const OnigCodePoint CR_Thaana[] = {
+	1,
+	0x0780, 0x07b1,
+}; /* CR_Thaana */
+
+/* 'Devanagari': Script */
+static const OnigCodePoint CR_Devanagari[] = {
+	9,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0950,
+	0x0953, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0xa8e0, 0xa8fb,
+}; /* CR_Devanagari */
+
+/* 'Bengali': Script */
+static const OnigCodePoint CR_Bengali[] = {
+	14,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+}; /* CR_Bengali */
+
+/* 'Gurmukhi': Script */
+static const OnigCodePoint CR_Gurmukhi[] = {
+	16,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+}; /* CR_Gurmukhi */
+
+/* 'Gujarati': Script */
+static const OnigCodePoint CR_Gujarati[] = {
+	14,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+}; /* CR_Gujarati */
+
+/* 'Oriya': Script */
+static const OnigCodePoint CR_Oriya[] = {
+	14,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+}; /* CR_Oriya */
+
+/* 'Tamil': Script */
+static const OnigCodePoint CR_Tamil[] = {
+	16,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+}; /* CR_Tamil */
+
+/* 'Telugu': Script */
+static const OnigCodePoint CR_Telugu[] = {
+	14,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+}; /* CR_Telugu */
+
+/* 'Kannada': Script */
+static const OnigCodePoint CR_Kannada[] = {
+	13,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	12,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+}; /* CR_Malayalam */
+
+/* 'Sinhala': Script */
+static const OnigCodePoint CR_Sinhala[] = {
+	11,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+}; /* CR_Sinhala */
+
+/* 'Thai': Script */
+static const OnigCodePoint CR_Thai[] = {
+	2,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e5b,
+}; /* CR_Thai */
+
+/* 'Lao': Script */
+static const OnigCodePoint CR_Lao[] = {
+	18,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	2,
+	0x1000, 0x109f,
+	0xaa60, 0xaa7b,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	4,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x2d00, 0x2d25,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	13,
+	0x1100, 0x11ff,
+	0x3131, 0x318e,
+	0x3200, 0x321e,
+	0x3260, 0x327e,
+	0xa960, 0xa97c,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+}; /* CR_Hangul */
+
+/* 'Ethiopic': Script */
+static const OnigCodePoint CR_Ethiopic[] = {
+	27,
+	0x1200, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+}; /* CR_Ethiopic */
+
+/* 'Cherokee': Script */
+static const OnigCodePoint CR_Cherokee[] = {
+	1,
+	0x13a0, 0x13f4,
+}; /* CR_Cherokee */
+
+/* 'Canadian_Aboriginal': Script */
+static const OnigCodePoint CR_Canadian_Aboriginal[] = {
+	2,
+	0x1400, 0x167f,
+	0x18b0, 0x18f5,
+}; /* CR_Canadian_Aboriginal */
+
+/* 'Ogham': Script */
+static const OnigCodePoint CR_Ogham[] = {
+	1,
+	0x1680, 0x169c,
+}; /* CR_Ogham */
+
+/* 'Runic': Script */
+static const OnigCodePoint CR_Runic[] = {
+	2,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+}; /* CR_Runic */
+
+/* 'Khmer': Script */
+static const OnigCodePoint CR_Khmer[] = {
+	4,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x19e0, 0x19ff,
+}; /* CR_Khmer */
+
+/* 'Mongolian': Script */
+static const OnigCodePoint CR_Mongolian[] = {
+	6,
+	0x1800, 0x1801,
+	0x1804, 0x1804,
+	0x1806, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+}; /* CR_Mongolian */
+
+/* 'Hiragana': Script */
+static const OnigCodePoint CR_Hiragana[] = {
+	3,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	7,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	2,
+	0x3105, 0x312d,
+	0x31a0, 0x31b7,
+}; /* CR_Bopomofo */
+
+/* 'Han': Script */
+static const OnigCodePoint CR_Han[] = {
+	15,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x3005, 0x3005,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303b,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Han */
+
+/* 'Yi': Script */
+static const OnigCodePoint CR_Yi[] = {
+	2,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+}; /* CR_Yi */
+
+/* 'Old_Italic': Script */
+static const OnigCodePoint CR_Old_Italic[] = {
+	2,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+}; /* CR_Old_Italic */
+
+/* 'Gothic': Script */
+static const OnigCodePoint CR_Gothic[] = {
+	1,
+	0x10330, 0x1034a,
+}; /* CR_Gothic */
+
+/* 'Deseret': Script */
+static const OnigCodePoint CR_Deseret[] = {
+	1,
+	0x10400, 0x1044f,
+}; /* CR_Deseret */
+
+/* 'Inherited': Script */
+static const OnigCodePoint CR_Inherited[] = {
+	23,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1dc0, 0x1de6,
+	0x1dfd, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0xe0100, 0xe01ef,
+}; /* CR_Inherited */
+
+/* 'Tagalog': Script */
+static const OnigCodePoint CR_Tagalog[] = {
+	2,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+}; /* CR_Tagalog */
+
+/* 'Hanunoo': Script */
+static const OnigCodePoint CR_Hanunoo[] = {
+	1,
+	0x1720, 0x1734,
+}; /* CR_Hanunoo */
+
+/* 'Buhid': Script */
+static const OnigCodePoint CR_Buhid[] = {
+	1,
+	0x1740, 0x1753,
+}; /* CR_Buhid */
+
+/* 'Tagbanwa': Script */
+static const OnigCodePoint CR_Tagbanwa[] = {
+	3,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+}; /* CR_Tagbanwa */
+
+/* 'Limbu': Script */
+static const OnigCodePoint CR_Limbu[] = {
+	5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x194f,
+}; /* CR_Limbu */
+
+/* 'Tai_Le': Script */
+static const OnigCodePoint CR_Tai_Le[] = {
+	2,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+}; /* CR_Tai_Le */
+
+/* 'Linear_B': Script */
+static const OnigCodePoint CR_Linear_B[] = {
+	7,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+}; /* CR_Linear_B */
+
+/* 'Ugaritic': Script */
+static const OnigCodePoint CR_Ugaritic[] = {
+	2,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+}; /* CR_Ugaritic */
+
+/* 'Shavian': Script */
+static const OnigCodePoint CR_Shavian[] = {
+	1,
+	0x10450, 0x1047f,
+}; /* CR_Shavian */
+
+/* 'Osmanya': Script */
+static const OnigCodePoint CR_Osmanya[] = {
+	2,
+	0x10480, 0x1049d,
+	0x104a0, 0x104a9,
+}; /* CR_Osmanya */
+
+/* 'Cypriot': Script */
+static const OnigCodePoint CR_Cypriot[] = {
+	6,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+}; /* CR_Cypriot */
+
+/* 'Braille': Script */
+static const OnigCodePoint CR_Braille[] = {
+	1,
+	0x2800, 0x28ff,
+}; /* CR_Braille */
+
+/* 'Buginese': Script */
+static const OnigCodePoint CR_Buginese[] = {
+	2,
+	0x1a00, 0x1a1b,
+	0x1a1e, 0x1a1f,
+}; /* CR_Buginese */
+
+/* 'Coptic': Script */
+static const OnigCodePoint CR_Coptic[] = {
+	3,
+	0x03e2, 0x03ef,
+	0x2c80, 0x2cf1,
+	0x2cf9, 0x2cff,
+}; /* CR_Coptic */
+
+/* 'New_Tai_Lue': Script */
+static const OnigCodePoint CR_New_Tai_Lue[] = {
+	4,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x19df,
+}; /* CR_New_Tai_Lue */
+
+/* 'Glagolitic': Script */
+static const OnigCodePoint CR_Glagolitic[] = {
+	2,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+}; /* CR_Glagolitic */
+
+/* 'Tifinagh': Script */
+static const OnigCodePoint CR_Tifinagh[] = {
+	2,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+}; /* CR_Tifinagh */
+
+/* 'Syloti_Nagri': Script */
+static const OnigCodePoint CR_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82b,
+}; /* CR_Syloti_Nagri */
+
+/* 'Old_Persian': Script */
+static const OnigCodePoint CR_Old_Persian[] = {
+	2,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103d5,
+}; /* CR_Old_Persian */
+
+/* 'Kharoshthi': Script */
+static const OnigCodePoint CR_Kharoshthi[] = {
+	8,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+}; /* CR_Kharoshthi */
+
+/* 'Balinese': Script */
+static const OnigCodePoint CR_Balinese[] = {
+	2,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+}; /* CR_Balinese */
+
+/* 'Cuneiform': Script */
+static const OnigCodePoint CR_Cuneiform[] = {
+	3,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+}; /* CR_Cuneiform */
+
+/* 'Phoenician': Script */
+static const OnigCodePoint CR_Phoenician[] = {
+	2,
+	0x10900, 0x1091b,
+	0x1091f, 0x1091f,
+}; /* CR_Phoenician */
+
+/* 'Phags_Pa': Script */
+static const OnigCodePoint CR_Phags_Pa[] = {
+	1,
+	0xa840, 0xa877,
+}; /* CR_Phags_Pa */
+
+/* 'Nko': Script */
+static const OnigCodePoint CR_Nko[] = {
+	1,
+	0x07c0, 0x07fa,
+}; /* CR_Nko */
+
+/* 'Sundanese': Script */
+static const OnigCodePoint CR_Sundanese[] = {
+	2,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+}; /* CR_Sundanese */
+
+/* 'Lepcha': Script */
+static const OnigCodePoint CR_Lepcha[] = {
+	3,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c4f,
+}; /* CR_Lepcha */
+
+/* 'Ol_Chiki': Script */
+static const OnigCodePoint CR_Ol_Chiki[] = {
+	1,
+	0x1c50, 0x1c7f,
+}; /* CR_Ol_Chiki */
+
+/* 'Vai': Script */
+static const OnigCodePoint CR_Vai[] = {
+	1,
+	0xa500, 0xa62b,
+}; /* CR_Vai */
+
+/* 'Saurashtra': Script */
+static const OnigCodePoint CR_Saurashtra[] = {
+	2,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+}; /* CR_Saurashtra */
+
+/* 'Kayah_Li': Script */
+static const OnigCodePoint CR_Kayah_Li[] = {
+	1,
+	0xa900, 0xa92f,
+}; /* CR_Kayah_Li */
+
+/* 'Rejang': Script */
+static const OnigCodePoint CR_Rejang[] = {
+	2,
+	0xa930, 0xa953,
+	0xa95f, 0xa95f,
+}; /* CR_Rejang */
+
+/* 'Lycian': Script */
+static const OnigCodePoint CR_Lycian[] = {
+	1,
+	0x10280, 0x1029c,
+}; /* CR_Lycian */
+
+/* 'Carian': Script */
+static const OnigCodePoint CR_Carian[] = {
+	1,
+	0x102a0, 0x102d0,
+}; /* CR_Carian */
+
+/* 'Lydian': Script */
+static const OnigCodePoint CR_Lydian[] = {
+	2,
+	0x10920, 0x10939,
+	0x1093f, 0x1093f,
+}; /* CR_Lydian */
+
+/* 'Cham': Script */
+static const OnigCodePoint CR_Cham[] = {
+	4,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+}; /* CR_Cham */
+
+/* 'Tai_Tham': Script */
+static const OnigCodePoint CR_Tai_Tham[] = {
+	5,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+}; /* CR_Tai_Tham */
+
+/* 'Tai_Viet': Script */
+static const OnigCodePoint CR_Tai_Viet[] = {
+	2,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+}; /* CR_Tai_Viet */
+
+/* 'Avestan': Script */
+static const OnigCodePoint CR_Avestan[] = {
+	2,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b3f,
+}; /* CR_Avestan */
+
+/* 'Egyptian_Hieroglyphs': Script */
+static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342e,
+}; /* CR_Egyptian_Hieroglyphs */
+
+/* 'Samaritan': Script */
+static const OnigCodePoint CR_Samaritan[] = {
+	2,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+}; /* CR_Samaritan */
+
+/* 'Lisu': Script */
+static const OnigCodePoint CR_Lisu[] = {
+	1,
+	0xa4d0, 0xa4ff,
+}; /* CR_Lisu */
+
+/* 'Bamum': Script */
+static const OnigCodePoint CR_Bamum[] = {
+	1,
+	0xa6a0, 0xa6f7,
+}; /* CR_Bamum */
+
+/* 'Javanese': Script */
+static const OnigCodePoint CR_Javanese[] = {
+	3,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+}; /* CR_Javanese */
+
+/* 'Meetei_Mayek': Script */
+static const OnigCodePoint CR_Meetei_Mayek[] = {
+	2,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+}; /* CR_Meetei_Mayek */
+
+/* 'Imperial_Aramaic': Script */
+static const OnigCodePoint CR_Imperial_Aramaic[] = {
+	2,
+	0x10840, 0x10855,
+	0x10857, 0x1085f,
+}; /* CR_Imperial_Aramaic */
+
+/* 'Old_South_Arabian': Script */
+static const OnigCodePoint CR_Old_South_Arabian[] = {
+	1,
+	0x10a60, 0x10a7f,
+}; /* CR_Old_South_Arabian */
+
+/* 'Inscriptional_Parthian': Script */
+static const OnigCodePoint CR_Inscriptional_Parthian[] = {
+	2,
+	0x10b40, 0x10b55,
+	0x10b58, 0x10b5f,
+}; /* CR_Inscriptional_Parthian */
+
+/* 'Inscriptional_Pahlavi': Script */
+static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
+	2,
+	0x10b60, 0x10b72,
+	0x10b78, 0x10b7f,
+}; /* CR_Inscriptional_Pahlavi */
+
+/* 'Old_Turkic': Script */
+static const OnigCodePoint CR_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c48,
+}; /* CR_Old_Turkic */
+
+/* 'Kaithi': Script */
+static const OnigCodePoint CR_Kaithi[] = {
+	1,
+	0x11080, 0x110c1,
+}; /* CR_Kaithi */
+
+/* 'White_Space': Binary Property */
+static const OnigCodePoint CR_White_Space[] = {
+	11,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_White_Space */
+
+/* 'Bidi_Control': Binary Property */
+static const OnigCodePoint CR_Bidi_Control[] = {
+	2,
+	0x200e, 0x200f,
+	0x202a, 0x202e,
+}; /* CR_Bidi_Control */
+
+/* 'Join_Control': Binary Property */
+static const OnigCodePoint CR_Join_Control[] = {
+	1,
+	0x200c, 0x200d,
+}; /* CR_Join_Control */
+
+/* 'Dash': Binary Property */
+static const OnigCodePoint CR_Dash[] = {
+	19,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Dash */
+
+/* 'Hyphen': Binary Property */
+static const OnigCodePoint CR_Hyphen[] = {
+	10,
+	0x002d, 0x002d,
+	0x00ad, 0x00ad,
+	0x058a, 0x058a,
+	0x1806, 0x1806,
+	0x2010, 0x2011,
+	0x2e17, 0x2e17,
+	0x30fb, 0x30fb,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+	0xff65, 0xff65,
+}; /* CR_Hyphen */
+
+/* 'Quotation_Mark': Binary Property */
+static const OnigCodePoint CR_Quotation_Mark[] = {
+	12,
+	0x0022, 0x0022,
+	0x0027, 0x0027,
+	0x00ab, 0x00ab,
+	0x00bb, 0x00bb,
+	0x2018, 0x201f,
+	0x2039, 0x203a,
+	0x300c, 0x300f,
+	0x301d, 0x301f,
+	0xfe41, 0xfe44,
+	0xff02, 0xff02,
+	0xff07, 0xff07,
+	0xff62, 0xff63,
+}; /* CR_Quotation_Mark */
+
+/* 'Terminal_Punctuation': Binary Property */
+static const OnigCodePoint CR_Terminal_Punctuation[] = {
+	65,
+	0x0021, 0x0021,
+	0x002c, 0x002c,
+	0x002e, 0x002e,
+	0x003a, 0x003b,
+	0x003f, 0x003f,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x05c3, 0x05c3,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x070a,
+	0x070c, 0x070c,
+	0x07f8, 0x07f9,
+	0x0830, 0x083e,
+	0x0964, 0x0965,
+	0x0e5a, 0x0e5b,
+	0x0f08, 0x0f08,
+	0x0f0d, 0x0f12,
+	0x104a, 0x104b,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x17d4, 0x17d6,
+	0x17da, 0x17da,
+	0x1802, 0x1805,
+	0x1808, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	0x1b5a, 0x1b5b,
+	0x1b5d, 0x1b5f,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3001, 0x3002,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa6f3, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c7, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaadf, 0xaadf,
+	0xabeb, 0xabeb,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xff01, 0xff01,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0xff64, 0xff64,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x10b3a, 0x10b3f,
+	0x110be, 0x110c1,
+	0x12470, 0x12473,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	99,
+	0x005e, 0x005e,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2061, 0x2064,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21a7,
+	0x21a9, 0x21ad,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x23b4, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23e2, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b6,
+	0x25bc, 0x25c0,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266e,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0xfe61, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Other_Math */
+
+/* 'Hex_Digit': Binary Property */
+static const OnigCodePoint CR_Hex_Digit[] = {
+	6,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+	0xff10, 0xff19,
+	0xff21, 0xff26,
+	0xff41, 0xff46,
+}; /* CR_Hex_Digit */
+
+/* 'ASCII_Hex_Digit': Binary Property */
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	141,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065e,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x0900, 0x0903,
+	0x093e, 0x094c,
+	0x094e, 0x094e,
+	0x0955, 0x0955,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ae2, 0x0ae3,
+	0x0b01, 0x0b03,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c01, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d02, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e4d, 0x0e4d,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ecd, 0x0ecd,
+	0x0f71, 0x0f81,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x102b, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1062,
+	0x1067, 0x1068,
+	0x1071, 0x1074,
+	0x1082, 0x1086,
+	0x109c, 0x109d,
+	0x135f, 0x135f,
+	0x1712, 0x1713,
+	0x1732, 0x1733,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17c8,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1b00, 0x1b04,
+	0x1b35, 0x1b43,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1ba9,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf2,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	117,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x034e,
+	0x0350, 0x0357,
+	0x035d, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0483, 0x0487,
+	0x0559, 0x0559,
+	0x0591, 0x05a1,
+	0x05a3, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c4,
+	0x064b, 0x0652,
+	0x0657, 0x0658,
+	0x06df, 0x06e0,
+	0x06e5, 0x06e6,
+	0x06ea, 0x06ec,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x0818, 0x0819,
+	0x093c, 0x093c,
+	0x094d, 0x094d,
+	0x0951, 0x0954,
+	0x0971, 0x0971,
+	0x09bc, 0x09bc,
+	0x09cd, 0x09cd,
+	0x0a3c, 0x0a3c,
+	0x0a4d, 0x0a4d,
+	0x0abc, 0x0abc,
+	0x0acd, 0x0acd,
+	0x0b3c, 0x0b3c,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0cbc, 0x0cbc,
+	0x0ccd, 0x0ccd,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e47, 0x0e4c,
+	0x0e4e, 0x0e4e,
+	0x0ec8, 0x0ecc,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f82, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0fc6, 0x0fc6,
+	0x1037, 0x1037,
+	0x1039, 0x103a,
+	0x1087, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109b,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x1939, 0x193b,
+	0x1a75, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1b34, 0x1b34,
+	0x1b44, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1baa, 0x1baa,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1d2c, 0x1d6a,
+	0x1dc4, 0x1dcf,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2cef, 0x2cf1,
+	0x2e2f, 0x2e2f,
+	0x302a, 0x302f,
+	0x3099, 0x309c,
+	0x30fc, 0x30fc,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa6f0, 0xa6f1,
+	0xa717, 0xa721,
+	0xa788, 0xa788,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xaa7b, 0xaa7b,
+	0xaabf, 0xaac2,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe26,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x110b9, 0x110ba,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	20,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c36, 0x1c36,
+	0x1c7b, 0x1c7b,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa60c, 0xa60c,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xff70, 0xff70,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	13,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d61,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2090, 0x2094,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7d, 0x2c7d,
+	0xa770, 0xa770,
+}; /* CR_Other_Lowercase */
+
+/* 'Other_Uppercase': Binary Property */
+static const OnigCodePoint CR_Other_Uppercase[] = {
+	2,
+	0x2160, 0x216f,
+	0x24b6, 0x24cf,
+}; /* CR_Other_Uppercase */
+
+/* 'Noncharacter_Code_Point': Binary Property */
+static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
+	18,
+	0xfdd0, 0xfdef,
+	0xfffe, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Noncharacter_Code_Point */
+
+/* 'Other_Grapheme_Extend': Binary Property */
+static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
+	16,
+	0x09be, 0x09be,
+	0x09d7, 0x09d7,
+	0x0b3e, 0x0b3e,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbe,
+	0x0bd7, 0x0bd7,
+	0x0cc2, 0x0cc2,
+	0x0cd5, 0x0cd6,
+	0x0d3e, 0x0d3e,
+	0x0d57, 0x0d57,
+	0x0dcf, 0x0dcf,
+	0x0ddf, 0x0ddf,
+	0x200c, 0x200d,
+	0xff9e, 0xff9f,
+	0x1d165, 0x1d165,
+	0x1d16e, 0x1d172,
+}; /* CR_Other_Grapheme_Extend */
+
+/* 'IDS_Binary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Binary_Operator[] = {
+	2,
+	0x2ff0, 0x2ff1,
+	0x2ff4, 0x2ffb,
+}; /* CR_IDS_Binary_Operator */
+
+/* 'IDS_Trinary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
+	1,
+	0x2ff2, 0x2ff3,
+}; /* CR_IDS_Trinary_Operator */
+
+/* 'Radical': Binary Property */
+static const OnigCodePoint CR_Radical[] = {
+	3,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+}; /* CR_Radical */
+
+/* 'Unified_Ideograph': Binary Property */
+static const OnigCodePoint CR_Unified_Ideograph[] = {
+	11,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	10,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x2065, 0x2069,
+	0x3164, 0x3164,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0xe0000, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xe0fff,
+}; /* CR_Other_Default_Ignorable_Code_Point */
+
+/* 'Deprecated': Binary Property */
+static const OnigCodePoint CR_Deprecated[] = {
+	8,
+	0x0149, 0x0149,
+	0x0f77, 0x0f77,
+	0x0f79, 0x0f79,
+	0x17a3, 0x17a4,
+	0x206a, 0x206f,
+	0x2329, 0x232a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Deprecated */
+
+/* 'Soft_Dotted': Binary Property */
+static const OnigCodePoint CR_Soft_Dotted[] = {
+	31,
+	0x0069, 0x006a,
+	0x012f, 0x012f,
+	0x0249, 0x0249,
+	0x0268, 0x0268,
+	0x029d, 0x029d,
+	0x02b2, 0x02b2,
+	0x03f3, 0x03f3,
+	0x0456, 0x0456,
+	0x0458, 0x0458,
+	0x1d62, 0x1d62,
+	0x1d96, 0x1d96,
+	0x1da4, 0x1da4,
+	0x1da8, 0x1da8,
+	0x1e2d, 0x1e2d,
+	0x1ecb, 0x1ecb,
+	0x2071, 0x2071,
+	0x2148, 0x2149,
+	0x2c7c, 0x2c7c,
+	0x1d422, 0x1d423,
+	0x1d456, 0x1d457,
+	0x1d48a, 0x1d48b,
+	0x1d4be, 0x1d4bf,
+	0x1d4f2, 0x1d4f3,
+	0x1d526, 0x1d527,
+	0x1d55a, 0x1d55b,
+	0x1d58e, 0x1d58f,
+	0x1d5c2, 0x1d5c3,
+	0x1d5f6, 0x1d5f7,
+	0x1d62a, 0x1d62b,
+	0x1d65e, 0x1d65f,
+	0x1d692, 0x1d693,
+}; /* CR_Soft_Dotted */
+
+/* 'Logical_Order_Exception': Binary Property */
+static const OnigCodePoint CR_Logical_Order_Exception[] = {
+	5,
+	0x0e40, 0x0e44,
+	0x0ec0, 0x0ec4,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaab9,
+	0xaabb, 0xaabc,
+}; /* CR_Logical_Order_Exception */
+
+/* 'Other_ID_Start': Binary Property */
+static const OnigCodePoint CR_Other_ID_Start[] = {
+	3,
+	0x2118, 0x2118,
+	0x212e, 0x212e,
+	0x309b, 0x309c,
+}; /* CR_Other_ID_Start */
+
+/* 'Other_ID_Continue': Binary Property */
+static const OnigCodePoint CR_Other_ID_Continue[] = {
+	3,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	43,
+	0x0021, 0x0021,
+	0x002e, 0x002e,
+	0x003f, 0x003f,
+	0x055c, 0x055c,
+	0x055e, 0x055e,
+	0x0589, 0x0589,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x0702,
+	0x07f9, 0x07f9,
+	0x0964, 0x0965,
+	0x104a, 0x104b,
+	0x1362, 0x1362,
+	0x1367, 0x1368,
+	0x166e, 0x166e,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1b5a, 0x1b5b,
+	0x1b5e, 0x1b5f,
+	0x1c3b, 0x1c3c,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x3002, 0x3002,
+	0xa4ff, 0xa4ff,
+	0xa60e, 0xa60f,
+	0xa6f3, 0xa6f3,
+	0xa6f7, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c8, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x110be, 0x110c1,
+}; /* CR_STerm */
+
+/* 'Variation_Selector': Binary Property */
+static const OnigCodePoint CR_Variation_Selector[] = {
+	3,
+	0x180b, 0x180d,
+	0xfe00, 0xfe0f,
+	0xe0100, 0xe01ef,
+}; /* CR_Variation_Selector */
+
+/* 'Pattern_White_Space': Binary Property */
+static const OnigCodePoint CR_Pattern_White_Space[] = {
+	5,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x200e, 0x200f,
+	0x2028, 0x2029,
+}; /* CR_Pattern_White_Space */
+
+/* 'Pattern_Syntax': Binary Property */
+static const OnigCodePoint CR_Pattern_Syntax[] = {
+	28,
+	0x0021, 0x002f,
+	0x003a, 0x0040,
+	0x005b, 0x005e,
+	0x0060, 0x0060,
+	0x007b, 0x007e,
+	0x00a1, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ab, 0x00ac,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b1,
+	0x00b6, 0x00b6,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x2010, 0x2027,
+	0x2030, 0x203e,
+	0x2041, 0x2053,
+	0x2055, 0x205e,
+	0x2190, 0x245f,
+	0x2500, 0x2775,
+	0x2794, 0x2bff,
+	0x2e00, 0x2e7f,
+	0x3001, 0x3003,
+	0x3008, 0x3020,
+	0x3030, 0x3030,
+	0xfd3e, 0xfd3f,
+	0xfe45, 0xfe46,
+}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
+
+/* 'Blank': [[:Blank:]] */
+static const OnigCodePoint CR_Blank[] = {
+	9,
+	0x0009, 0x0009,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x180e, 0x180e,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Blank */
+
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
+
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	490,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x167f,
+	0x1681, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x200b, 0x2027,
+	0x202a, 0x202e,
+	0x2030, 0x205e,
+	0x2060, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	487,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2027,
+	0x202a, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	506,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06de, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x203f, 0x2040,
+	0x2054, 0x2054,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x20d0, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf1,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa672,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff3f, 0xff3f,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11080, 0x110ba,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	497,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0621, 0x0657,
+	0x0659, 0x065e,
+	0x0660, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0900, 0x0939,
+	0x093d, 0x094c,
+	0x094e, 0x094e,
+	0x0950, 0x0950,
+	0x0955, 0x0955,
+	0x0958, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0972,
+	0x0979, 0x097f,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b6f,
+	0x0b71, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10fc,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135f, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf2,
+	0x1d00, 0x1dbf,
+	0x1e00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fe0, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffc,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x2094,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2d00, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x31a0, 0x31b7,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78c,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff10, 0xff19,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031e,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11082, 0x110b8,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d6c0,
+	0x1d6c2, 0x1d6da,
+	0x1d6dc, 0x1d6fa,
+	0x1d6fc, 0x1d714,
+	0x1d716, 0x1d734,
+	0x1d736, 0x1d74e,
+	0x1d750, 0x1d76e,
+	0x1d770, 0x1d788,
+	0x1d78a, 0x1d7a8,
+	0x1d7aa, 0x1d7c2,
+	0x1d7c4, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+static const OnigCodePoint* const CodeRanges[] = {
+  CR_NEWLINE,
+  CR_Alpha,
+  CR_Blank,
+  CR_Cntrl,
+  CR_Digit,
+  CR_Graph,
+  CR_Lower,
+  CR_Print,
+  CR_Punct,
+  CR_Space,
+  CR_Upper,
+  CR_XDigit,
+  CR_Word,
+  CR_Alnum,
+  CR_ASCII,
+#ifdef USE_UNICODE_PROPERTIES
+  CR_Any,
+  CR_Assigned,
+  CR_C,
+  CR_Cc,
+  CR_Cf,
+  CR_Cn,
+  CR_Co,
+  CR_Cs,
+  CR_L,
+  CR_Ll,
+  CR_Lm,
+  CR_Lo,
+  CR_Lt,
+  CR_Lu,
+  CR_M,
+  CR_Mc,
+  CR_Me,
+  CR_Mn,
+  CR_N,
+  CR_Nd,
+  CR_Nl,
+  CR_No,
+  CR_P,
+  CR_Pc,
+  CR_Pd,
+  CR_Pe,
+  CR_Pf,
+  CR_Pi,
+  CR_Po,
+  CR_Ps,
+  CR_S,
+  CR_Sc,
+  CR_Sk,
+  CR_Sm,
+  CR_So,
+  CR_Z,
+  CR_Zl,
+  CR_Zp,
+  CR_Zs,
+  CR_Math,
+  CR_Alphabetic,
+  CR_Lowercase,
+  CR_Uppercase,
+  CR_Cased,
+  CR_Case_Ignorable,
+  CR_Changes_When_Lowercased,
+  CR_Changes_When_Uppercased,
+  CR_Changes_When_Titlecased,
+  CR_Changes_When_Casefolded,
+  CR_Changes_When_Casemapped,
+  CR_ID_Start,
+  CR_ID_Continue,
+  CR_XID_Start,
+  CR_XID_Continue,
+  CR_Default_Ignorable_Code_Point,
+  CR_Grapheme_Extend,
+  CR_Grapheme_Base,
+  CR_Grapheme_Link,
+  CR_Common,
+  CR_Latin,
+  CR_Greek,
+  CR_Cyrillic,
+  CR_Armenian,
+  CR_Hebrew,
+  CR_Arabic,
+  CR_Syriac,
+  CR_Thaana,
+  CR_Devanagari,
+  CR_Bengali,
+  CR_Gurmukhi,
+  CR_Gujarati,
+  CR_Oriya,
+  CR_Tamil,
+  CR_Telugu,
+  CR_Kannada,
+  CR_Malayalam,
+  CR_Sinhala,
+  CR_Thai,
+  CR_Lao,
+  CR_Tibetan,
+  CR_Myanmar,
+  CR_Georgian,
+  CR_Hangul,
+  CR_Ethiopic,
+  CR_Cherokee,
+  CR_Canadian_Aboriginal,
+  CR_Ogham,
+  CR_Runic,
+  CR_Khmer,
+  CR_Mongolian,
+  CR_Hiragana,
+  CR_Katakana,
+  CR_Bopomofo,
+  CR_Han,
+  CR_Yi,
+  CR_Old_Italic,
+  CR_Gothic,
+  CR_Deseret,
+  CR_Inherited,
+  CR_Tagalog,
+  CR_Hanunoo,
+  CR_Buhid,
+  CR_Tagbanwa,
+  CR_Limbu,
+  CR_Tai_Le,
+  CR_Linear_B,
+  CR_Ugaritic,
+  CR_Shavian,
+  CR_Osmanya,
+  CR_Cypriot,
+  CR_Braille,
+  CR_Buginese,
+  CR_Coptic,
+  CR_New_Tai_Lue,
+  CR_Glagolitic,
+  CR_Tifinagh,
+  CR_Syloti_Nagri,
+  CR_Old_Persian,
+  CR_Kharoshthi,
+  CR_Balinese,
+  CR_Cuneiform,
+  CR_Phoenician,
+  CR_Phags_Pa,
+  CR_Nko,
+  CR_Sundanese,
+  CR_Lepcha,
+  CR_Ol_Chiki,
+  CR_Vai,
+  CR_Saurashtra,
+  CR_Kayah_Li,
+  CR_Rejang,
+  CR_Lycian,
+  CR_Carian,
+  CR_Lydian,
+  CR_Cham,
+  CR_Tai_Tham,
+  CR_Tai_Viet,
+  CR_Avestan,
+  CR_Egyptian_Hieroglyphs,
+  CR_Samaritan,
+  CR_Lisu,
+  CR_Bamum,
+  CR_Javanese,
+  CR_Meetei_Mayek,
+  CR_Imperial_Aramaic,
+  CR_Old_South_Arabian,
+  CR_Inscriptional_Parthian,
+  CR_Inscriptional_Pahlavi,
+  CR_Old_Turkic,
+  CR_Kaithi,
+  CR_White_Space,
+  CR_Bidi_Control,
+  CR_Join_Control,
+  CR_Dash,
+  CR_Hyphen,
+  CR_Quotation_Mark,
+  CR_Terminal_Punctuation,
+  CR_Other_Math,
+  CR_Hex_Digit,
+  CR_ASCII_Hex_Digit,
+  CR_Other_Alphabetic,
+  CR_Ideographic,
+  CR_Diacritic,
+  CR_Extender,
+  CR_Other_Lowercase,
+  CR_Other_Uppercase,
+  CR_Noncharacter_Code_Point,
+  CR_Other_Grapheme_Extend,
+  CR_IDS_Binary_Operator,
+  CR_IDS_Trinary_Operator,
+  CR_Radical,
+  CR_Unified_Ideograph,
+  CR_Other_Default_Ignorable_Code_Point,
+  CR_Deprecated,
+  CR_Soft_Dotted,
+  CR_Logical_Order_Exception,
+  CR_Other_ID_Start,
+  CR_Other_ID_Continue,
+  CR_STerm,
+  CR_Variation_Selector,
+  CR_Pattern_White_Space,
+  CR_Pattern_Syntax,
+#endif /* USE_UNICODE_PROPERTIES */
+};
+struct uniname2ctype_struct {
+  int name, ctype;
+};
+
+static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
+%}
+struct uniname2ctype_struct;
+%%
+newline,                                   0
+alpha,                                     1
+blank,                                     2
+cntrl,                                     3
+digit,                                     4
+graph,                                     5
+lower,                                     6
+print,                                     7
+punct,                                     8
+space,                                     9
+upper,                                    10
+xdigit,                                   11
+word,                                     12
+alnum,                                    13
+ascii,                                    14
+#ifdef USE_UNICODE_PROPERTIES
+any,                                      15
+assigned,                                 16
+c,                                        17
+cc,                                       18
+cf,                                       19
+cn,                                       20
+co,                                       21
+cs,                                       22
+l,                                        23
+ll,                                       24
+lm,                                       25
+lo,                                       26
+lt,                                       27
+lu,                                       28
+m,                                        29
+mc,                                       30
+me,                                       31
+mn,                                       32
+n,                                        33
+nd,                                       34
+nl,                                       35
+no,                                       36
+p,                                        37
+pc,                                       38
+pd,                                       39
+pe,                                       40
+pf,                                       41
+pi,                                       42
+po,                                       43
+ps,                                       44
+s,                                        45
+sc,                                       46
+sk,                                       47
+sm,                                       48
+so,                                       49
+z,                                        50
+zl,                                       51
+zp,                                       52
+zs,                                       53
+math,                                     54
+alphabetic,                               55
+lowercase,                                56
+uppercase,                                57
+cased,                                    58
+caseignorable,                            59
+changeswhenlowercased,                    60
+changeswhenuppercased,                    61
+changeswhentitlecased,                    62
+changeswhencasefolded,                    63
+changeswhencasemapped,                    64
+idstart,                                  65
+idcontinue,                               66
+xidstart,                                 67
+xidcontinue,                              68
+defaultignorablecodepoint,                69
+graphemeextend,                           70
+graphemebase,                             71
+graphemelink,                             72
+common,                                   73
+latin,                                    74
+greek,                                    75
+cyrillic,                                 76
+armenian,                                 77
+hebrew,                                   78
+arabic,                                   79
+syriac,                                   80
+thaana,                                   81
+devanagari,                               82
+bengali,                                  83
+gurmukhi,                                 84
+gujarati,                                 85
+oriya,                                    86
+tamil,                                    87
+telugu,                                   88
+kannada,                                  89
+malayalam,                                90
+sinhala,                                  91
+thai,                                     92
+lao,                                      93
+tibetan,                                  94
+myanmar,                                  95
+georgian,                                 96
+hangul,                                   97
+ethiopic,                                 98
+cherokee,                                 99
+canadianaboriginal,                      100
+ogham,                                   101
+runic,                                   102
+khmer,                                   103
+mongolian,                               104
+hiragana,                                105
+katakana,                                106
+bopomofo,                                107
+han,                                     108
+yi,                                      109
+olditalic,                               110
+gothic,                                  111
+deseret,                                 112
+inherited,                               113
+tagalog,                                 114
+hanunoo,                                 115
+buhid,                                   116
+tagbanwa,                                117
+limbu,                                   118
+taile,                                   119
+linearb,                                 120
+ugaritic,                                121
+shavian,                                 122
+osmanya,                                 123
+cypriot,                                 124
+braille,                                 125
+buginese,                                126
+coptic,                                  127
+newtailue,                               128
+glagolitic,                              129
+tifinagh,                                130
+sylotinagri,                             131
+oldpersian,                              132
+kharoshthi,                              133
+balinese,                                134
+cuneiform,                               135
+phoenician,                              136
+phagspa,                                 137
+nko,                                     138
+sundanese,                               139
+lepcha,                                  140
+olchiki,                                 141
+vai,                                     142
+saurashtra,                              143
+kayahli,                                 144
+rejang,                                  145
+lycian,                                  146
+carian,                                  147
+lydian,                                  148
+cham,                                    149
+taitham,                                 150
+taiviet,                                 151
+avestan,                                 152
+egyptianhieroglyphs,                     153
+samaritan,                               154
+lisu,                                    155
+bamum,                                   156
+javanese,                                157
+meeteimayek,                             158
+imperialaramaic,                         159
+oldsoutharabian,                         160
+inscriptionalparthian,                   161
+inscriptionalpahlavi,                    162
+oldturkic,                               163
+kaithi,                                  164
+whitespace,                              165
+bidicontrol,                             166
+joincontrol,                             167
+dash,                                    168
+hyphen,                                  169
+quotationmark,                           170
+terminalpunctuation,                     171
+othermath,                               172
+hexdigit,                                173
+asciihexdigit,                           174
+otheralphabetic,                         175
+ideographic,                             176
+diacritic,                               177
+extender,                                178
+otherlowercase,                          179
+otheruppercase,                          180
+noncharactercodepoint,                   181
+othergraphemeextend,                     182
+idsbinaryoperator,                       183
+idstrinaryoperator,                      184
+radical,                                 185
+unifiedideograph,                        186
+otherdefaultignorablecodepoint,          187
+deprecated,                              188
+softdotted,                              189
+logicalorderexception,                   190
+otheridstart,                            191
+otheridcontinue,                         192
+sterm,                                   193
+variationselector,                       194
+patternwhitespace,                       195
+patternsyntax,                           196
+ahex,                                    174
+bidic,                                   166
+ci,                                       59
+cwcf,                                     63
+cwcm,                                     64
+cwl,                                      60
+cwt,                                      62
+cwu,                                      61
+dep,                                     188
+di,                                       69
+dia,                                     177
+ext,                                     178
+grbase,                                   71
+grext,                                    70
+grlink,                                   72
+hex,                                     173
+idc,                                      66
+ideo,                                    176
+ids,                                      65
+idsb,                                    183
+idst,                                    184
+joinc,                                   167
+loe,                                     190
+nchar,                                   181
+oalpha,                                  175
+odi,                                     187
+ogrext,                                  182
+oidc,                                    192
+oids,                                    191
+olower,                                  179
+omath,                                   172
+oupper,                                  180
+patsyn,                                  196
+patws,                                   195
+qmark,                                   170
+sd,                                      189
+term,                                    171
+uideo,                                   186
+vs,                                      194
+wspace,                                  165
+xidc,                                     68
+xids,                                     67
+other,                                    17
+control,                                  18
+format,                                   19
+unassigned,                               20
+privateuse,                               21
+surrogate,                                22
+letter,                                   23
+lowercaseletter,                          24
+modifierletter,                           25
+otherletter,                              26
+titlecaseletter,                          27
+uppercaseletter,                          28
+mark,                                     29
+spacingmark,                              30
+enclosingmark,                            31
+nonspacingmark,                           32
+number,                                   33
+decimalnumber,                            34
+letternumber,                             35
+othernumber,                              36
+punctuation,                              37
+connectorpunctuation,                     38
+dashpunctuation,                          39
+closepunctuation,                         40
+finalpunctuation,                         41
+initialpunctuation,                       42
+otherpunctuation,                         43
+openpunctuation,                          44
+symbol,                                   45
+currencysymbol,                           46
+modifiersymbol,                           47
+mathsymbol,                               48
+othersymbol,                              49
+separator,                                50
+lineseparator,                            51
+paragraphseparator,                       52
+spaceseparator,                           53
+arab,                                     79
+armi,                                    159
+armn,                                     77
+avst,                                    152
+bali,                                    134
+bamu,                                    156
+beng,                                     83
+bopo,                                    107
+brai,                                    125
+bugi,                                    126
+buhd,                                    116
+cans,                                    100
+cari,                                    147
+cher,                                     99
+copt,                                    127
+qaac,                                    127
+cprt,                                    124
+cyrl,                                     76
+deva,                                     82
+dsrt,                                    112
+egyp,                                    153
+ethi,                                     98
+geor,                                     96
+glag,                                    129
+goth,                                    111
+grek,                                     75
+gujr,                                     85
+guru,                                     84
+hang,                                     97
+hani,                                    108
+hano,                                    115
+hebr,                                     78
+hira,                                    105
+ital,                                    110
+java,                                    157
+kali,                                    144
+kana,                                    106
+khar,                                    133
+khmr,                                    103
+knda,                                     89
+kthi,                                    164
+lana,                                    150
+laoo,                                     93
+latn,                                     74
+lepc,                                    140
+limb,                                    118
+linb,                                    120
+lyci,                                    146
+lydi,                                    148
+mlym,                                     90
+mong,                                    104
+mtei,                                    158
+mymr,                                     95
+nkoo,                                    138
+ogam,                                    101
+olck,                                    141
+orkh,                                    163
+orya,                                     86
+osma,                                    123
+phag,                                    137
+phli,                                    162
+phnx,                                    136
+prti,                                    161
+rjng,                                    145
+runr,                                    102
+samr,                                    154
+sarb,                                    160
+saur,                                    143
+shaw,                                    122
+sinh,                                     91
+sund,                                    139
+sylo,                                    131
+syrc,                                     80
+tagb,                                    117
+tale,                                    119
+talu,                                    128
+taml,                                     87
+tavt,                                    151
+telu,                                     88
+tfng,                                    130
+tglg,                                    114
+thaa,                                     81
+tibt,                                     94
+ugar,                                    121
+vaii,                                    142
+xpeo,                                    132
+xsux,                                    135
+yiii,                                    109
+zinh,                                    113
+qaai,                                    113
+zyyy,                                     73
+#endif /* USE_UNICODE_PROPERTIES */
+%%
+static int
+uniname2ctype(const UChar *name, unsigned int len)
+{
+  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
+  if (p) return p->ctype;
+  return -1;
+}
diff --git a/enc/us_ascii.c b/enc/us_ascii.c
new file mode 100644
index 0000000000..2e96dd3846
--- /dev/null
+++ b/enc/us_ascii.c
@@ -0,0 +1,31 @@
+#include "regenc.h"
+
+static int
+us_ascii_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc)
+{
+    if (*p & 0x80)
+        return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
+}
+
+OnigEncodingDefine(us_ascii, US_ASCII) = {
+  us_ascii_mbc_enc_len,
+  "US-ASCII",/* name */
+  1,           /* max byte length */
+  1,           /* min byte length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  onigenc_ascii_mbc_case_fold,
+  onigenc_ascii_apply_all_case_fold,
+  onigenc_ascii_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  onigenc_ascii_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("ASCII", "US-ASCII")
+ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII")
+ENC_ALIAS("646", "US-ASCII")
diff --git a/enc/utf_16be.c b/enc/utf_16be.c
new file mode 100644
index 0000000000..1e33c2ec7d
--- /dev/null
+++ b/enc/utf_16be.c
@@ -0,0 +1,257 @@
+/**********************************************************************
+  utf_16be.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define UTF16_IS_SURROGATE_FIRST(c)    (((c) & 0xfc) == 0xd8)
+#define UTF16_IS_SURROGATE_SECOND(c)   (((c) & 0xfc) == 0xdc)
+#define UTF16_IS_SURROGATE(c)          (((c) & 0xf8) == 0xd8)
+
+static const int EncLen_UTF16[] = {
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+};
+
+static int
+utf16be_mbc_enc_len(const UChar* p, const OnigUChar* e ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  int byte = p[0];
+  if (!UTF16_IS_SURROGATE(byte)) {
+    if (2 <= e-p)
+      return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2);
+    else
+      return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
+  }
+  if (UTF16_IS_SURROGATE_FIRST(byte)) {
+    switch (e-p) {
+      case 1: return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(3);
+      case 2: return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2);
+      case 3:
+        if (UTF16_IS_SURROGATE_SECOND(p[2]))
+          return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
+        break;
+      default:
+        if (UTF16_IS_SURROGATE_SECOND(p[2]))
+          return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
+        break;
+    }
+  }
+  return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static int
+utf16be_is_mbc_newline(const UChar* p, const UChar* end,
+		       OnigEncoding enc)
+{
+  if (p + 1 < end) {
+    if (*(p+1) == 0x0a && *p == 0x00)
+      return 1;
+#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
+    if ((
+#ifndef USE_CRNL_AS_LINE_TERMINATOR
+	 *(p+1) == 0x0d ||
+#endif
+	 *(p+1) == 0x85) && *p == 0x00)
+      return 1;
+    if (*p == 0x20 && (*(p+1) == 0x29 || *(p+1) == 0x28))
+      return 1;
+#endif
+  }
+  return 0;
+}
+
+static OnigCodePoint
+utf16be_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
+		    OnigEncoding enc)
+{
+  OnigCodePoint code;
+
+  if (UTF16_IS_SURROGATE_FIRST(*p)) {
+    code = ((((p[0] << 8) + p[1]) & 0x03ff) << 10)
+         + (((p[2] << 8) + p[3]) & 0x03ff) + 0x10000;
+  }
+  else {
+    code = p[0] * 256 + p[1];
+  }
+  return code;
+}
+
+static int
+utf16be_code_to_mbclen(OnigCodePoint code,
+		       OnigEncoding enc)
+{
+  return (code > 0xffff ? 4 : 2);
+}
+
+static int
+utf16be_code_to_mbc(OnigCodePoint code, UChar *buf,
+		    OnigEncoding enc)
+{
+  UChar* p = buf;
+
+  if (code > 0xffff) {
+    unsigned int high = (code >> 10) + 0xD7C0;
+    unsigned int low = (code & 0x3FF) + 0xDC00;
+    *p++ = (high >> 8) & 0xFF;
+    *p++ = high & 0xFF;
+    *p++ = (low >> 8) & 0xFF;
+    *p++ = low & 0xFF;
+    return 4;
+  }
+  else {
+    *p++ = (UChar )((code & 0xff00) >> 8);
+    *p++ = (UChar )(code & 0xff);
+    return 2;
+  }
+}
+
+static int
+utf16be_mbc_case_fold(OnigCaseFoldType flag,
+		      const UChar** pp, const UChar* end, UChar* fold,
+		      OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_ASCII_CODE(*(p+1)) && *p == 0) {
+    p++;
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+      if (*p == 0x49) {
+	*fold++ = 0x01;
+	*fold   = 0x31;
+	(*pp) += 2;
+	return 2;
+      }
+    }
+#endif
+
+    *fold++ = 0;
+    *fold   = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    *pp += 2;
+    return 2;
+  }
+  else
+    return onigenc_unicode_mbc_case_fold(enc, flag,
+					 pp, end, fold);
+}
+
+#if 0
+static int
+utf16be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  const UChar* p = *pp;
+
+  (*pp) += EncLen_UTF16[*p];
+
+  if (*p == 0) {
+    int c, v;
+
+    p++;
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+      return TRUE;
+    }
+
+    c = *p;
+    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
+		(BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+
+    if ((v | BIT_CTYPE_LOWER) != 0) {
+      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
+      if (c >= 0xaa && c <= 0xba)
+	return FALSE;
+      else
+	return TRUE;
+    }
+    return (v != 0 ? TRUE : FALSE);
+  }
+
+  return FALSE;
+}
+#endif
+
+static UChar*
+utf16be_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
+			      OnigEncoding enc ARG_UNUSED)
+{
+  if (s <= start) return (UChar* )s;
+
+  if ((s - start) % 2 == 1) {
+    s--;
+  }
+
+  if (UTF16_IS_SURROGATE_SECOND(*s) && s > start + 1)
+    s -= 2;
+
+  return (UChar* )s;
+}
+
+static int
+utf16be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				   const OnigUChar* p, const OnigUChar* end,
+				   OnigCaseFoldCodeItem items[],
+				   OnigEncoding enc)
+{
+  return onigenc_unicode_get_case_fold_codes_by_str(enc,
+						    flag, p, end, items);
+}
+
+OnigEncodingDefine(utf_16be, UTF_16BE) = {
+  utf16be_mbc_enc_len,
+  "UTF-16BE",   /* name */
+  4,            /* max byte length */
+  2,            /* min byte length */
+  utf16be_is_mbc_newline,
+  utf16be_mbc_to_code,
+  utf16be_code_to_mbclen,
+  utf16be_code_to_mbc,
+  utf16be_mbc_case_fold,
+  onigenc_unicode_apply_all_case_fold,
+  utf16be_get_case_fold_codes_by_str,
+  onigenc_unicode_property_name_to_ctype,
+  onigenc_unicode_is_code_ctype,
+  onigenc_utf16_32_get_ctype_code_range,
+  utf16be_left_adjust_char_head,
+  onigenc_always_false_is_allowed_reverse_match
+};
+ENC_ALIAS("UCS-2BE", "UTF-16BE")
diff --git a/enc/utf_16le.c b/enc/utf_16le.c
new file mode 100644
index 0000000000..bec3d22388
--- /dev/null
+++ b/enc/utf_16le.c
@@ -0,0 +1,248 @@
+/**********************************************************************
+  utf_16le.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define UTF16_IS_SURROGATE_FIRST(c)    (((c) & 0xfc) == 0xd8)
+#define UTF16_IS_SURROGATE_SECOND(c)   (((c) & 0xfc) == 0xdc)
+#define UTF16_IS_SURROGATE(c)          (((c) & 0xf8) == 0xd8)
+
+static const int EncLen_UTF16[] = {
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+};
+
+static int
+utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  int len = e-p, byte;
+  if (len < 2)
+    return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
+  byte = p[1];
+  if (!UTF16_IS_SURROGATE(byte)) {
+    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2);
+  }
+  if (UTF16_IS_SURROGATE_FIRST(byte)) {
+    if (len < 4)
+      return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-len);
+    if (UTF16_IS_SURROGATE_SECOND(p[3]))
+      return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
+  }
+  return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static int
+utf16le_is_mbc_newline(const UChar* p, const UChar* end,
+		       OnigEncoding enc ARG_UNUSED)
+{
+  if (p + 1 < end) {
+    if (*p == 0x0a && *(p+1) == 0x00)
+      return 1;
+#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
+    if ((
+#ifndef USE_CRNL_AS_LINE_TERMINATOR
+	 *p == 0x0d ||
+#endif
+	 *p == 0x85) && *(p+1) == 0x00)
+      return 1;
+    if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28))
+      return 1;
+#endif
+  }
+  return 0;
+}
+
+static OnigCodePoint
+utf16le_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  OnigCodePoint code;
+  UChar c0 = *p;
+  UChar c1 = *(p+1);
+
+  if (UTF16_IS_SURROGATE_FIRST(c1)) {
+    code = ((((c1 << 8) + c0) & 0x03ff) << 10)
+         + (((p[3] << 8) + p[2]) & 0x03ff) + 0x10000;
+  }
+  else {
+    code = c1 * 256 + p[0];
+  }
+  return code;
+}
+
+static int
+utf16le_code_to_mbclen(OnigCodePoint code,
+		       OnigEncoding enc ARG_UNUSED)
+{
+  return (code > 0xffff ? 4 : 2);
+}
+
+static int
+utf16le_code_to_mbc(OnigCodePoint code, UChar *buf,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  UChar* p = buf;
+
+  if (code > 0xffff) {
+    unsigned int high = (code >> 10) + 0xD7C0;
+    unsigned int low = (code & 0x3FF) + 0xDC00;
+    *p++ = high & 0xFF;
+    *p++ = (high >> 8) & 0xFF;
+    *p++ = low & 0xFF;
+    *p++ = (low >> 8) & 0xFF;
+    return 4;
+  }
+  else {
+    *p++ = (UChar )(code & 0xff);
+    *p++ = (UChar )((code & 0xff00) >> 8);
+    return 2;
+  }
+}
+
+static int
+utf16le_mbc_case_fold(OnigCaseFoldType flag,
+		      const UChar** pp, const UChar* end, UChar* fold,
+		      OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_ASCII_CODE(*p) && *(p+1) == 0) {
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+      if (*p == 0x49) {
+	*fold++ = 0x31;
+	*fold   = 0x01;
+	(*pp) += 2;
+	return 2;
+      }
+    }
+#endif
+
+    *fold++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    *fold   = 0;
+    *pp += 2;
+    return 2;
+  }
+  else
+    return onigenc_unicode_mbc_case_fold(enc, flag, pp,
+					 end, fold);
+}
+
+#if 0
+static int
+utf16le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
+			 const UChar* end)
+{
+  const UChar* p = *pp;
+
+  (*pp) += EncLen_UTF16[*(p+1)];
+
+  if (*(p+1) == 0) {
+    int c, v;
+
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+      return TRUE;
+    }
+
+    c = *p;
+    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
+                       (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+    if ((v | BIT_CTYPE_LOWER) != 0) {
+      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
+      if (c >= 0xaa && c <= 0xba)
+	return FALSE;
+      else
+	return TRUE;
+    }
+    return (v != 0 ? TRUE : FALSE);
+  }
+
+  return FALSE;
+}
+#endif
+
+static UChar*
+utf16le_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
+			      OnigEncoding enc ARG_UNUSED)
+{
+  if (s <= start) return (UChar* )s;
+
+  if ((s - start) % 2 == 1) {
+    s--;
+  }
+
+  if (UTF16_IS_SURROGATE_SECOND(*(s+1)) && s > start + 1)
+    s -= 2;
+
+  return (UChar* )s;
+}
+
+static int
+utf16le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				   const OnigUChar* p, const OnigUChar* end,
+				   OnigCaseFoldCodeItem items[],
+				   OnigEncoding enc)
+{
+  return onigenc_unicode_get_case_fold_codes_by_str(enc,
+						    flag, p, end, items);
+}
+
+OnigEncodingDefine(utf_16le, UTF_16LE) = {
+  utf16le_mbc_enc_len,
+  "UTF-16LE",   /* name */
+  4,            /* max byte length */
+  2,            /* min byte length */
+  utf16le_is_mbc_newline,
+  utf16le_mbc_to_code,
+  utf16le_code_to_mbclen,
+  utf16le_code_to_mbc,
+  utf16le_mbc_case_fold,
+  onigenc_unicode_apply_all_case_fold,
+  utf16le_get_case_fold_codes_by_str,
+  onigenc_unicode_property_name_to_ctype,
+  onigenc_unicode_is_code_ctype,
+  onigenc_utf16_32_get_ctype_code_range,
+  utf16le_left_adjust_char_head,
+  onigenc_always_false_is_allowed_reverse_match
+};
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
new file mode 100644
index 0000000000..61e7d0f1b5
--- /dev/null
+++ b/enc/utf_32be.c
@@ -0,0 +1,195 @@
+/**********************************************************************
+  utf_32be.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static int
+utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return 4;
+}
+
+static int
+utf32be_is_mbc_newline(const UChar* p, const UChar* end,
+		       OnigEncoding enc ARG_UNUSED)
+{
+  if (p + 3 < end) {
+    if (*(p+3) == 0x0a && *(p+2) == 0 && *(p+1) == 0 && *p == 0)
+      return 1;
+#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
+    if ((
+#ifndef USE_CRNL_AS_LINE_TERMINATOR
+	 *(p+3) == 0x0d ||
+#endif
+	 *(p+3) == 0x85)
+	&& *(p+2) == 0 && *(p+1) == 0 && *p == 0x00)
+      return 1;
+    if (*(p+2) == 0x20 && (*(p+3) == 0x29 || *(p+3) == 0x28)
+	&& *(p+1) == 0 && *p == 0)
+      return 1;
+#endif
+  }
+  return 0;
+}
+
+static OnigCodePoint
+utf32be_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return (OnigCodePoint )(((p[0] * 256 + p[1]) * 256 + p[2]) * 256 + p[3]);
+}
+
+static int
+utf32be_code_to_mbclen(OnigCodePoint code ARG_UNUSED,
+		       OnigEncoding enc ARG_UNUSED)
+{
+  return 4;
+}
+
+static int
+utf32be_code_to_mbc(OnigCodePoint code, UChar *buf,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  UChar* p = buf;
+
+  *p++ = (UChar )((code & 0xff000000) >>24);
+  *p++ = (UChar )((code & 0xff0000)   >>16);
+  *p++ = (UChar )((code & 0xff00)     >> 8);
+  *p++ = (UChar ) (code & 0xff);
+  return 4;
+}
+
+static int
+utf32be_mbc_case_fold(OnigCaseFoldType flag,
+		      const UChar** pp, const UChar* end, UChar* fold,
+		      OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_ASCII_CODE(*(p+3)) && *(p+2) == 0 && *(p+1) == 0 && *p == 0) {
+    *fold++ = 0;
+    *fold++ = 0;
+
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+      if (*(p+3) == 0x49) {
+	*fold++ = 0x01;
+	*fold   = 0x31;
+	(*pp) += 4;
+	return 4;
+      }
+    }
+#endif
+
+    *fold++ = 0;
+    *fold   = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*(p+3));
+    *pp += 4;
+    return 4;
+  }
+  else
+    return onigenc_unicode_mbc_case_fold(enc, flag, pp,
+					 end, fold);
+}
+
+#if 0
+static int
+utf32be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  const UChar* p = *pp;
+
+  (*pp) += 4;
+
+  if (*(p+2) == 0 && *(p+1) == 0 && *p == 0) {
+    int c, v;
+
+    p += 3;
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+      return TRUE;
+    }
+
+    c = *p;
+    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
+                       (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+    if ((v | BIT_CTYPE_LOWER) != 0) {
+      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
+      if (c >= 0xaa && c <= 0xba)
+	return FALSE;
+      else
+	return TRUE;
+    }
+    return (v != 0 ? TRUE : FALSE);
+  }
+
+  return FALSE;
+}
+#endif
+
+static UChar*
+utf32be_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
+			      OnigEncoding enc ARG_UNUSED)
+{
+  int rem;
+
+  if (s <= start) return (UChar* )s;
+
+  rem = (s - start) % 4;
+  return (UChar* )(s - rem);
+}
+
+static int
+utf32be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				   const OnigUChar* p, const OnigUChar* end,
+				   OnigCaseFoldCodeItem items[],
+				   OnigEncoding enc)
+{
+  return onigenc_unicode_get_case_fold_codes_by_str(enc,
+						    flag, p, end, items);
+}
+
+OnigEncodingDefine(utf_32be, UTF_32BE) = {
+  utf32be_mbc_enc_len,
+  "UTF-32BE",   /* name */
+  4,            /* max byte length */
+  4,            /* min byte length */
+  utf32be_is_mbc_newline,
+  utf32be_mbc_to_code,
+  utf32be_code_to_mbclen,
+  utf32be_code_to_mbc,
+  utf32be_mbc_case_fold,
+  onigenc_unicode_apply_all_case_fold,
+  utf32be_get_case_fold_codes_by_str,
+  onigenc_unicode_property_name_to_ctype,
+  onigenc_unicode_is_code_ctype,
+  onigenc_utf16_32_get_ctype_code_range,
+  utf32be_left_adjust_char_head,
+  onigenc_always_false_is_allowed_reverse_match
+};
+ENC_ALIAS("UCS-4BE", "UTF-32BE")
+
diff --git a/enc/utf_32le.c b/enc/utf_32le.c
new file mode 100644
index 0000000000..3a0a41bba7
--- /dev/null
+++ b/enc/utf_32le.c
@@ -0,0 +1,194 @@
+/**********************************************************************
+  utf_32le.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static int
+utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return 4;
+}
+
+static int
+utf32le_is_mbc_newline(const UChar* p, const UChar* end,
+		       OnigEncoding enc ARG_UNUSED)
+{
+  if (p + 3 < end) {
+    if (*p == 0x0a && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0)
+      return 1;
+#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
+    if ((
+#ifndef USE_CRNL_AS_LINE_TERMINATOR
+	 *p == 0x0d ||
+#endif
+	 *p == 0x85)
+	&& *(p+1) == 0x00 && (p+2) == 0x00 && *(p+3) == 0x00)
+      return 1;
+    if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28)
+	&& *(p+2) == 0x00 && *(p+3) == 0x00)
+      return 1;
+#endif
+  }
+  return 0;
+}
+
+static OnigCodePoint
+utf32le_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  return (OnigCodePoint )(((p[3] * 256 + p[2]) * 256 + p[1]) * 256 + p[0]);
+}
+
+static int
+utf32le_code_to_mbclen(OnigCodePoint code ARG_UNUSED,
+		       OnigEncoding enc ARG_UNUSED)
+{
+  return 4;
+}
+
+static int
+utf32le_code_to_mbc(OnigCodePoint code, UChar *buf,
+		    OnigEncoding enc ARG_UNUSED)
+{
+  UChar* p = buf;
+
+  *p++ = (UChar ) (code & 0xff);
+  *p++ = (UChar )((code & 0xff00)     >> 8);
+  *p++ = (UChar )((code & 0xff0000)   >>16);
+  *p++ = (UChar )((code & 0xff000000) >>24);
+  return 4;
+}
+
+static int
+utf32le_mbc_case_fold(OnigCaseFoldType flag,
+		      const UChar** pp, const UChar* end, UChar* fold,
+		      OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_ASCII_CODE(*p) && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0) {
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+      if (*p == 0x49) {
+	*fold++ = 0x31;
+	*fold++ = 0x01;
+      }
+    }
+    else {
+#endif
+      *fold++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+      *fold++ = 0;
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    }
+#endif
+
+    *fold++ = 0;
+    *fold   = 0;
+    *pp += 4;
+    return 4;
+  }
+  else
+    return onigenc_unicode_mbc_case_fold(enc, flag, pp,
+					 end, fold);
+}
+
+#if 0
+static int
+utf32le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
+{
+  const UChar* p = *pp;
+
+  (*pp) += 4;
+
+  if (*(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0) {
+    int c, v;
+
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+      return TRUE;
+    }
+
+    c = *p;
+    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
+                       (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
+    if ((v | BIT_CTYPE_LOWER) != 0) {
+      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
+      if (c >= 0xaa && c <= 0xba)
+	return FALSE;
+      else
+	return TRUE;
+    }
+    return (v != 0 ? TRUE : FALSE);
+  }
+
+  return FALSE;
+}
+#endif
+
+static UChar*
+utf32le_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
+			      OnigEncoding enc ARG_UNUSED)
+{
+  int rem;
+
+  if (s <= start) return (UChar* )s;
+
+  rem = (s - start) % 4;
+  return (UChar* )(s - rem);
+}
+
+static int
+utf32le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
+				   const OnigUChar* p, const OnigUChar* end,
+				   OnigCaseFoldCodeItem items[],
+				   OnigEncoding enc)
+{
+  return onigenc_unicode_get_case_fold_codes_by_str(enc,
+						    flag, p, end, items);
+}
+
+OnigEncodingDefine(utf_32le, UTF_32LE) = {
+  utf32le_mbc_enc_len,
+  "UTF-32LE",   /* name */
+  4,            /* max byte length */
+  4,            /* min byte length */
+  utf32le_is_mbc_newline,
+  utf32le_mbc_to_code,
+  utf32le_code_to_mbclen,
+  utf32le_code_to_mbc,
+  utf32le_mbc_case_fold,
+  onigenc_unicode_apply_all_case_fold,
+  utf32le_get_case_fold_codes_by_str,
+  onigenc_unicode_property_name_to_ctype,
+  onigenc_unicode_is_code_ctype,
+  onigenc_utf16_32_get_ctype_code_range,
+  utf32le_left_adjust_char_head,
+  onigenc_always_false_is_allowed_reverse_match
+};
+ENC_ALIAS("UCS-4LE", "UTF-32LE")
diff --git a/enc/utf_7.h b/enc/utf_7.h
new file mode 100644
index 0000000000..fa9f06b1b3
--- /dev/null
+++ b/enc/utf_7.h
@@ -0,0 +1,5 @@
+#include "regenc.h"
+/* dummy for unsupported, statefull encoding */
+ENC_DUMMY("UTF-7");
+ENC_ALIAS("CP65000", "UTF-7");
+
diff --git a/enc/utf_8.c b/enc/utf_8.c
new file mode 100644
index 0000000000..0c44a3efeb
--- /dev/null
+++ b/enc/utf_8.c
@@ -0,0 +1,457 @@
+/**********************************************************************
+  utf_8.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define USE_INVALID_CODE_SCHEME
+
+#ifdef USE_INVALID_CODE_SCHEME
+/* virtual codepoint values for invalid encoding byte 0xfe and 0xff */
+#define INVALID_CODE_FE   0xfffffffe
+#define INVALID_CODE_FF   0xffffffff
+#define VALID_CODE_LIMIT  0x7fffffff
+#endif
+
+#define utf8_islead(c)     ((UChar )((c) & 0xc0) != 0x80)
+
+static const int EncLen_UTF8[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+};
+
+typedef enum {
+  FAILURE = -2,
+  ACCEPT,
+  S0, S1, S2, S3,
+  S4, S5, S6, S7
+} state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3,
+    /* f */ 5, 6, 6, 6, 7, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S4   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S5   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S6   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+  { /* S7   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
+  },
+};
+#undef A
+#undef F
+
+static int
+mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s;
+  s = trans[0][firstbyte];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-1);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-2);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-3);
+  s = trans[s][*p++];
+  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4) :
+                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static int
+is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  if (p < end) {
+    if (*p == 0x0a) return 1;
+
+#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
+#ifndef USE_CRNL_AS_LINE_TERMINATOR
+    if (*p == 0x0d) return 1;
+#endif
+    if (p + 1 < end) {
+      if (*(p+1) == 0x85 && *p == 0xc2) /* U+0085 */
+	return 1;
+      if (p + 2 < end) {
+	if ((*(p+2) == 0xa8 || *(p+2) == 0xa9)
+	    && *(p+1) == 0x80 && *p == 0xe2)  /* U+2028, U+2029 */
+	  return 1;
+      }
+    }
+#endif
+  }
+
+  return 0;
+}
+
+static OnigCodePoint
+mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int c, len;
+  OnigCodePoint n;
+
+  len = enclen(enc, p, end);
+  c = *p++;
+  if (len > 1) {
+    len--;
+    n = c & ((1 << (6 - len)) - 1);
+    while (len--) {
+      c = *p++;
+      n = (n << 6) | (c & ((1 << 6) - 1));
+    }
+    return n;
+  }
+  else {
+#ifdef USE_INVALID_CODE_SCHEME
+    if (c > 0xfd) {
+      return ((c == 0xfe) ? INVALID_CODE_FE : INVALID_CODE_FF);
+    }
+#endif
+    return (OnigCodePoint )c;
+  }
+}
+
+static int
+code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
+{
+  if      ((code & 0xffffff80) == 0) return 1;
+  else if ((code & 0xfffff800) == 0) return 2;
+  else if ((code & 0xffff0000) == 0) return 3;
+  else if ((code & 0xffe00000) == 0) return 4;
+  else if ((code & 0xfc000000) == 0) return 5;
+  else if ((code & 0x80000000) == 0) return 6;
+#ifdef USE_INVALID_CODE_SCHEME
+  else if (code == INVALID_CODE_FE) return 1;
+  else if (code == INVALID_CODE_FF) return 1;
+#endif
+  else
+    return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+}
+
+static int
+code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
+{
+#define UTF8_TRAILS(code, shift) (UChar )((((code) >> (shift)) & 0x3f) | 0x80)
+#define UTF8_TRAIL0(code)        (UChar )(((code) & 0x3f) | 0x80)
+
+  if ((code & 0xffffff80) == 0) {
+    *buf = (UChar )code;
+    return 1;
+  }
+  else {
+    UChar *p = buf;
+
+    if ((code & 0xfffff800) == 0) {
+      *p++ = (UChar )(((code>>6)& 0x1f) | 0xc0);
+    }
+    else if ((code & 0xffff0000) == 0) {
+      *p++ = (UChar )(((code>>12) & 0x0f) | 0xe0);
+      *p++ = UTF8_TRAILS(code, 6);
+    }
+    else if ((code & 0xffe00000) == 0) {
+      *p++ = (UChar )(((code>>18) & 0x07) | 0xf0);
+      *p++ = UTF8_TRAILS(code, 12);
+      *p++ = UTF8_TRAILS(code,  6);
+    }
+    else if ((code & 0xfc000000) == 0) {
+      *p++ = (UChar )(((code>>24) & 0x03) | 0xf8);
+      *p++ = UTF8_TRAILS(code, 18);
+      *p++ = UTF8_TRAILS(code, 12);
+      *p++ = UTF8_TRAILS(code,  6);
+    }
+    else if ((code & 0x80000000) == 0) {
+      *p++ = (UChar )(((code>>30) & 0x01) | 0xfc);
+      *p++ = UTF8_TRAILS(code, 24);
+      *p++ = UTF8_TRAILS(code, 18);
+      *p++ = UTF8_TRAILS(code, 12);
+      *p++ = UTF8_TRAILS(code,  6);
+    }
+#ifdef USE_INVALID_CODE_SCHEME
+    else if (code == INVALID_CODE_FE) {
+      *p = 0xfe;
+      return 1;
+    }
+    else if (code == INVALID_CODE_FF) {
+      *p = 0xff;
+      return 1;
+    }
+#endif
+    else {
+      return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+    }
+
+    *p++ = UTF8_TRAIL0(code);
+    return (int)(p - buf);
+  }
+}
+
+static int
+mbc_case_fold(OnigCaseFoldType flag, const UChar** pp,
+		   const UChar* end, UChar* fold, OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_MBC_ASCII(p)) {
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+      if (*p == 0x49) {
+	*fold++ = 0xc4;
+	*fold   = 0xb1;
+	(*pp)++;
+	return 2;
+      }
+    }
+#endif
+
+    *fold = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    (*pp)++;
+    return 1; /* return byte length of converted char to lower */
+  }
+  else {
+    return onigenc_unicode_mbc_case_fold(enc, flag, pp, end, fold);
+  }
+}
+
+
+static int
+get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out,
+			  const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
+{
+  *sb_out = 0x80;
+  return onigenc_unicode_ctype_code_range(ctype, ranges);
+}
+
+
+static UChar*
+left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar *p;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  while (!utf8_islead(*p) && p > start) p--;
+  return (UChar* )p;
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+    const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[],
+    OnigEncoding enc)
+{
+  return onigenc_unicode_get_case_fold_codes_by_str(enc, flag, p, end, items);
+}
+
+OnigEncodingDefine(utf_8, UTF_8) = {
+  mbc_enc_len,
+  "UTF-8",     /* name */
+  6,           /* max byte length */
+  1,           /* min byte length */
+  is_mbc_newline,
+  mbc_to_code,
+  code_to_mbclen,
+  code_to_mbc,
+  mbc_case_fold,
+  onigenc_unicode_apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_unicode_property_name_to_ctype,
+  onigenc_unicode_is_code_ctype,
+  get_ctype_code_range,
+  left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+ENC_ALIAS("CP65001", "UTF-8")
+
+/*
+ * Name: UTF8-MAC
+ * Link: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/BPFileSystem.html
+ * Link: http://developer.apple.com/qa/qa2001/qa1235.html
+ * Link: http://developer.apple.com/jp/qa/qa2001/qa1235.html
+ * Link: http://www.gnu.org/software/emacs/NEWS.23.2
+ */
+ENC_REPLICATE("UTF8-MAC", "UTF-8")
+ENC_ALIAS("UTF-8-MAC", "UTF8-MAC")
+ENC_ALIAS("UTF-8-HFS", "UTF8-MAC") /* Emacs 23.2 */
+
diff --git a/enc/windows_1251.c b/enc/windows_1251.c
new file mode 100644
index 0000000000..1cb4da4960
--- /dev/null
+++ b/enc/windows_1251.c
@@ -0,0 +1,208 @@
+/**********************************************************************
+  cp1251.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2006-2007  Byte      <byte AT mail DOT kna DOT ru>
+ *                          K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+#define ENC_CP1251_TO_LOWER_CASE(c) EncCP1251_ToLowerCaseTable[c]
+#define ENC_IS_CP1251_CTYPE(code,ctype) \
+  ((EncCP1251_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncCP1251_ToLowerCaseTable[256] = {
+  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+  '\220', '\203', '\202', '\203', '\204', '\205', '\206', '\207',
+  '\210', '\211', '\232', '\213', '\234', '\235', '\236', '\237',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+  '\240', '\242', '\242', '\274', '\244', '\264', '\246', '\247',
+  '\270', '\251', '\272', '\253', '\254', '\255', '\256', '\277',
+  '\260', '\261', '\263', '\263', '\264', '\265', '\266', '\267',
+  '\270', '\271', '\272', '\273', '\274', '\276', '\276', '\277',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+static const unsigned short EncCP1251_CtypeTable[256] = {
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x428c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+  0x34a2, 0x34a2, 0x01a0, 0x30e2, 0x01a0, 0x01a0, 0x01a0, 0x01a0,
+  0x0000, 0x01a0, 0x34a2, 0x01a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x30e2, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0,
+  0x0008, 0x0000, 0x30e2, 0x01a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x0280, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x01a0,
+  0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x34a2,
+  0x01a0, 0x01a0, 0x34a2, 0x30e2, 0x30e2, 0x31e2, 0x01a0, 0x01a0,
+  0x30e2, 0x0000, 0x30e2, 0x01a0, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
+};
+
+static int
+cp1251_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
+             const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar* p = *pp;
+
+  *lower = ENC_CP1251_TO_LOWER_CASE(*p);
+  (*pp)++;
+  return 1;
+}
+
+static int
+cp1251_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256)
+    return ENC_IS_CP1251_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  { 0xb8, 0xa8 },
+
+  { 0xe0, 0xc0 },
+  { 0xe1, 0xc1 },
+  { 0xe2, 0xc2 },
+  { 0xe3, 0xc3 },
+  { 0xe4, 0xc4 },
+  { 0xe5, 0xc5 },
+  { 0xe6, 0xc6 },
+  { 0xe7, 0xc7 },
+  { 0xe8, 0xc8 },
+  { 0xe9, 0xc9 },
+  { 0xea, 0xca },
+  { 0xeb, 0xcb },
+  { 0xec, 0xcc },
+  { 0xed, 0xcd },
+  { 0xee, 0xce },
+  { 0xef, 0xcf },
+
+  { 0xf0, 0xd0 },
+  { 0xf1, 0xd1 },
+  { 0xf2, 0xd2 },
+  { 0xf3, 0xd3 },
+  { 0xf4, 0xd4 },
+  { 0xf5, 0xd5 },
+  { 0xf6, 0xd6 },
+  { 0xf7, 0xd7 },
+  { 0xf8, 0xd8 },
+  { 0xf9, 0xd9 },
+  { 0xfa, 0xda },
+  { 0xfb, 0xdb },
+  { 0xfc, 0xdc },
+  { 0xfd, 0xdd },
+  { 0xfe, 0xde },
+  { 0xff, 0xdf }
+};
+
+static int
+cp1251_apply_all_case_fold(OnigCaseFoldType flag,
+			       OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_apply_all_case_fold_with_map(
+             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             flag, f, arg);
+}
+
+static int
+cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
+    const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
+{
+  return onigenc_get_case_fold_codes_by_str_with_map(
+	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     flag, p, end, items);
+}
+
+OnigEncodingDefine(windows_1251, Windows_1251) = {
+  onigenc_single_byte_mbc_enc_len,
+  "Windows-1251",      /* name */
+  1,             /* max enc length */
+  1,             /* min enc length */
+  onigenc_is_mbc_newline_0x0a,
+  onigenc_single_byte_mbc_to_code,
+  onigenc_single_byte_code_to_mbclen,
+  onigenc_single_byte_code_to_mbc,
+  cp1251_mbc_case_fold,
+  cp1251_apply_all_case_fold,
+  cp1251_get_case_fold_codes_by_str,
+  onigenc_minimum_property_name_to_ctype,
+  cp1251_is_code_ctype,
+  onigenc_not_support_get_ctype_code_range,
+  onigenc_single_byte_left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match
+};
+/*
+ * Name: windows-1251
+ * MIBenum: 2251
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1251.mspx
+ * Link: http://en.wikipedia.org/wiki/Windows-1251
+ */
+ENC_ALIAS("CP1251", "Windows-1251")
diff --git a/enc/x_emoji.h b/enc/x_emoji.h
new file mode 100644
index 0000000000..92c9bccafd
--- /dev/null
+++ b/enc/x_emoji.h
@@ -0,0 +1,26 @@
+#include "regint.h"
+
+/*
+ * Name: UTF8-DoCoMo, SJIS-DoCoMo
+ * Link: http://www.nttdocomo.co.jp/english/service/imode/make/content/pictograph/basic/index.html
+ * Link: http://www.nttdocomo.co.jp/english/service/imode/make/content/pictograph/extention/index.html
+ */
+ENC_REPLICATE("UTF8-DoCoMo", "UTF-8")
+ENC_REPLICATE("SJIS-DoCoMo", "Windows-31J")
+
+/*
+ * Name: UTF8-KDDI, SJIS-KDDI, ISO-2022-JP-KDDI
+ * Link: http://www.au.kddi.com/ezfactory/tec/spec/img/typeD.pdf
+ */
+ENC_REPLICATE("UTF8-KDDI", "UTF-8")
+ENC_REPLICATE("SJIS-KDDI", "Windows-31J")
+ENC_REPLICATE("ISO-2022-JP-KDDI", "ISO-2022-JP")
+ENC_REPLICATE("stateless-ISO-2022-JP-KDDI", "stateless-ISO-2022-JP")
+
+/*
+ * Name: UTF8-SoftBank, SJIS-SoftBank
+ * Link: http://creation.mb.softbank.jp/web/web_pic_about.html
+ * Link: http://www2.developers.softbankmobile.co.jp/dp/tool_dl/download.php?docid=120&companyid=
+ */
+ENC_REPLICATE("UTF8-SoftBank", "UTF-8")
+ENC_REPLICATE("SJIS-SoftBank", "Windows-31J")
diff --git a/encoding.c b/encoding.c
new file mode 100644
index 0000000000..a7950a8251
--- /dev/null
+++ b/encoding.c
@@ -0,0 +1,1569 @@
+/**********************************************************************
+
+  encoding.c -
+
+  $Author$
+  created at: Thu May 24 17:23:27 JST 2007
+
+  Copyright (C) 2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+#include "regenc.h"
+#include <ctype.h>
+#ifndef NO_LOCALE_CHARMAP
+#ifdef __CYGWIN__
+#include <windows.h>
+#endif
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+#endif
+#include "ruby/util.h"
+
+static ID id_encoding;
+VALUE rb_cEncoding;
+static VALUE rb_encoding_list;
+
+struct rb_encoding_entry {
+    const char *name;
+    rb_encoding *enc;
+    rb_encoding *base;
+};
+
+static struct {
+    struct rb_encoding_entry *list;
+    int count;
+    int size;
+    st_table *names;
+} enc_table;
+
+void rb_enc_init(void);
+
+#define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
+#define UNSPECIFIED_ENCODING INT_MAX
+
+#define ENCODING_NAMELEN_MAX 63
+#define valid_encoding_name_p(name) ((name) && strlen(name) <= ENCODING_NAMELEN_MAX)
+
+#define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
+
+static int load_encoding(const char *name);
+
+static size_t
+enc_memsize(const void *p)
+{
+    return 0;
+}
+
+static const rb_data_type_t encoding_data_type = {
+    "encoding", 0, 0, enc_memsize,
+};
+
+#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)
+
+static VALUE
+enc_new(rb_encoding *encoding)
+{
+    return TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, encoding);
+}
+
+static VALUE
+rb_enc_from_encoding_index(int idx)
+{
+    VALUE list, enc;
+
+    if (!(list = rb_encoding_list)) {
+	rb_bug("rb_enc_from_encoding_index(%d): no rb_encoding_list", idx);
+    }
+    enc = rb_ary_entry(list, idx);
+    if (NIL_P(enc)) {
+	rb_bug("rb_enc_from_encoding_index(%d): not created yet", idx);
+    }
+    return enc;
+}
+
+VALUE
+rb_enc_from_encoding(rb_encoding *encoding)
+{
+    int idx;
+    if (!encoding) return Qnil;
+    idx = ENC_TO_ENCINDEX(encoding);
+    return rb_enc_from_encoding_index(idx);
+}
+
+static int enc_autoload(rb_encoding *);
+
+static int
+check_encoding(rb_encoding *enc)
+{
+    int index = rb_enc_to_index(enc);
+    if (rb_enc_from_index(index) != enc)
+	return -1;
+    if (enc_autoload_p(enc)) {
+	index = enc_autoload(enc);
+    }
+    return index;
+}
+
+static int
+enc_check_encoding(VALUE obj)
+{
+    if (SPECIAL_CONST_P(obj) || !rb_typeddata_is_kind_of(obj, &encoding_data_type)) {
+	return -1;
+    }
+    return check_encoding(RDATA(obj)->data);
+}
+
+static int
+must_encoding(VALUE enc)
+{
+    int index = enc_check_encoding(enc);
+    if (index < 0) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected Encoding)",
+		 rb_obj_classname(enc));
+    }
+    return index;
+}
+
+int
+rb_to_encoding_index(VALUE enc)
+{
+    int idx;
+
+    idx = enc_check_encoding(enc);
+    if (idx >= 0) {
+	return idx;
+    }
+    else if (NIL_P(enc = rb_check_string_type(enc))) {
+	return -1;
+    }
+    if (!rb_enc_asciicompat(rb_enc_get(enc))) {
+	return -1;
+    }
+    return rb_enc_find_index(StringValueCStr(enc));
+}
+
+static rb_encoding *
+to_encoding(VALUE enc)
+{
+    int idx;
+
+    StringValue(enc);
+    if (!rb_enc_asciicompat(rb_enc_get(enc))) {
+	rb_raise(rb_eArgError, "invalid name encoding (non ASCII)");
+    }
+    idx = rb_enc_find_index(StringValueCStr(enc));
+    if (idx < 0) {
+	rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
+    }
+    return rb_enc_from_index(idx);
+}
+
+rb_encoding *
+rb_to_encoding(VALUE enc)
+{
+    if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data;
+    return to_encoding(enc);
+}
+
+void
+rb_gc_mark_encodings(void)
+{
+}
+
+static int
+enc_table_expand(int newsize)
+{
+    struct rb_encoding_entry *ent;
+    int count = newsize;
+
+    if (enc_table.size >= newsize) return newsize;
+    newsize = (newsize + 7) / 8 * 8;
+    ent = realloc(enc_table.list, sizeof(*enc_table.list) * newsize);
+    if (!ent) return -1;
+    memset(ent + enc_table.size, 0, sizeof(*ent)*(newsize - enc_table.size));
+    enc_table.list = ent;
+    enc_table.size = newsize;
+    return count;
+}
+
+static int
+enc_register_at(int index, const char *name, rb_encoding *encoding)
+{
+    struct rb_encoding_entry *ent = &enc_table.list[index];
+    VALUE list;
+
+    if (!valid_encoding_name_p(name)) return -1;
+    if (!ent->name) {
+	ent->name = name = strdup(name);
+    }
+    else if (STRCASECMP(name, ent->name)) {
+	return -1;
+    }
+    if (!ent->enc) {
+	ent->enc = xmalloc(sizeof(rb_encoding));
+    }
+    if (encoding) {
+	*ent->enc = *encoding;
+    }
+    else {
+	memset(ent->enc, 0, sizeof(*ent->enc));
+    }
+    encoding = ent->enc;
+    encoding->name = name;
+    encoding->ruby_encoding_index = index;
+    st_insert(enc_table.names, (st_data_t)name, (st_data_t)index);
+    list = rb_encoding_list;
+    if (list && NIL_P(rb_ary_entry(list, index))) {
+	/* initialize encoding data */
+	rb_ary_store(list, index, enc_new(encoding));
+    }
+    return index;
+}
+
+static int
+enc_register(const char *name, rb_encoding *encoding)
+{
+    int index = enc_table.count;
+
+    if ((index = enc_table_expand(index + 1)) < 0) return -1;
+    enc_table.count = index;
+    return enc_register_at(index - 1, name, encoding);
+}
+
+static void set_encoding_const(const char *, rb_encoding *);
+int rb_enc_registered(const char *name);
+
+int
+rb_enc_register(const char *name, rb_encoding *encoding)
+{
+    int index = rb_enc_registered(name);
+
+    if (index >= 0) {
+	rb_encoding *oldenc = rb_enc_from_index(index);
+	if (STRCASECMP(name, rb_enc_name(oldenc))) {
+	    index = enc_register(name, encoding);
+	}
+	else if (enc_autoload_p(oldenc) || !ENC_DUMMY_P(oldenc)) {
+	    enc_register_at(index, name, encoding);
+	}
+	else {
+	    rb_raise(rb_eArgError, "encoding %s is already registered", name);
+	}
+    }
+    else {
+	index = enc_register(name, encoding);
+	set_encoding_const(name, rb_enc_from_index(index));
+    }
+    return index;
+}
+
+void
+rb_encdb_declare(const char *name)
+{
+    int idx = rb_enc_registered(name);
+    if (idx < 0) {
+	idx = enc_register(name, 0);
+    }
+    set_encoding_const(name, rb_enc_from_index(idx));
+}
+
+static void
+enc_check_duplication(const char *name)
+{
+    if (rb_enc_registered(name) >= 0) {
+	rb_raise(rb_eArgError, "encoding %s is already registered", name);
+    }
+}
+
+static rb_encoding*
+set_base_encoding(int index, rb_encoding *base)
+{
+    rb_encoding *enc = enc_table.list[index].enc;
+
+    enc_table.list[index].base = base;
+    if (rb_enc_dummy_p(base)) ENC_SET_DUMMY(enc);
+    return enc;
+}
+
+/* for encdb.h
+ * Set base encoding for encodings which are not replicas
+ * but not in their own files.
+ */
+void
+rb_enc_set_base(const char *name, const char *orig)
+{
+    int idx = rb_enc_registered(name);
+    int origidx = rb_enc_registered(orig);
+    set_base_encoding(idx, rb_enc_from_index(origidx));
+}
+
+int
+rb_enc_replicate(const char *name, rb_encoding *encoding)
+{
+    int idx;
+
+    enc_check_duplication(name);
+    idx = enc_register(name, encoding);
+    set_base_encoding(idx, encoding);
+    set_encoding_const(name, rb_enc_from_index(idx));
+    return idx;
+}
+
+/*
+ * call-seq:
+ *   enc.replicate(name) -> encoding
+ *
+ * Returns a replicated encoding of _enc_ whose name is _name_.
+ * The new encoding should have the same byte structure of _enc_.
+ * If _name_ is used by another encoding, raise ArgumentError.
+ *
+ */
+static VALUE
+enc_replicate(VALUE encoding, VALUE name)
+{
+    return rb_enc_from_encoding_index(
+	rb_enc_replicate(StringValueCStr(name),
+			 rb_to_encoding(encoding)));
+}
+
+static int
+enc_replicate_with_index(const char *name, rb_encoding *origenc, int idx)
+{
+    if (idx < 0) {
+	idx = enc_register(name, origenc);
+    }
+    else {
+	idx = enc_register_at(idx, name, origenc);
+    }
+    if (idx >= 0) {
+	set_base_encoding(idx, origenc);
+	set_encoding_const(name, rb_enc_from_index(idx));
+    }
+    return idx;
+}
+
+int
+rb_encdb_replicate(const char *name, const char *orig)
+{
+    int origidx = rb_enc_registered(orig);
+    int idx = rb_enc_registered(name);
+
+    if (origidx < 0) {
+	origidx = enc_register(orig, 0);
+    }
+    return enc_replicate_with_index(name, rb_enc_from_index(origidx), idx);
+}
+
+int
+rb_define_dummy_encoding(const char *name)
+{
+    int index = rb_enc_replicate(name, rb_ascii8bit_encoding());
+    rb_encoding *enc = enc_table.list[index].enc;
+
+    ENC_SET_DUMMY(enc);
+    return index;
+}
+
+int
+rb_encdb_dummy(const char *name)
+{
+    int index = enc_replicate_with_index(name, rb_ascii8bit_encoding(),
+					 rb_enc_registered(name));
+    rb_encoding *enc = enc_table.list[index].enc;
+
+    ENC_SET_DUMMY(enc);
+    return index;
+}
+
+/*
+ * call-seq:
+ *   enc.dummy? -> true or false
+ *
+ * Returns true for dummy encodings.
+ * A dummy encoding is an encoding for which character handling is not properly
+ * implemented.
+ * It is used for stateful encodings.
+ *
+ *   Encoding::ISO_2022_JP.dummy?       #=> true
+ *   Encoding::UTF_8.dummy?             #=> false
+ *
+ */
+static VALUE
+enc_dummy_p(VALUE enc)
+{
+    return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   enc.ascii_compatible? -> true or false
+ *
+ * Returns whether ASCII-compatible or not.
+ *
+ *   Encoding::UTF_8.ascii_compatible?     #=> true
+ *   Encoding::UTF_16BE.ascii_compatible?  #=> false
+ *
+ */
+static VALUE
+enc_ascii_compatible_p(VALUE enc)
+{
+    return rb_enc_asciicompat(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
+}
+
+/*
+ * Returns 1 when the encoding is Unicode series other than UTF-7 else 0.
+ */
+int
+rb_enc_unicode_p(rb_encoding *enc)
+{
+    const char *name = rb_enc_name(enc);
+    return name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7';
+}
+
+static const char *
+enc_alias_internal(const char *alias, int idx)
+{
+    alias = strdup(alias);
+    st_insert(enc_table.names, (st_data_t)alias, (st_data_t)idx);
+    return alias;
+}
+
+static int
+enc_alias(const char *alias, int idx)
+{
+    if (!valid_encoding_name_p(alias)) return -1;
+    alias = enc_alias_internal(alias, idx);
+    set_encoding_const(alias, rb_enc_from_index(idx));
+    return idx;
+}
+
+int
+rb_enc_alias(const char *alias, const char *orig)
+{
+    int idx;
+
+    enc_check_duplication(alias);
+    if (!enc_table.list) {
+	rb_enc_init();
+    }
+    if ((idx = rb_enc_find_index(orig)) < 0) {
+	return -1;
+    }
+    return enc_alias(alias, idx);
+}
+
+int
+rb_encdb_alias(const char *alias, const char *orig)
+{
+    int idx = rb_enc_registered(orig);
+
+    if (idx < 0) {
+	idx = enc_register(orig, 0);
+    }
+    return enc_alias(alias, idx);
+}
+
+enum {
+    ENCINDEX_ASCII,
+    ENCINDEX_UTF_8,
+    ENCINDEX_US_ASCII,
+    ENCINDEX_BUILTIN_MAX
+};
+
+extern rb_encoding OnigEncodingUTF_8;
+extern rb_encoding OnigEncodingUS_ASCII;
+
+void
+rb_enc_init(void)
+{
+    enc_table_expand(ENCODING_COUNT + 1);
+    if (!enc_table.names) {
+	enc_table.names = st_init_strcasetable();
+    }
+#define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc)
+    ENC_REGISTER(ASCII);
+    ENC_REGISTER(UTF_8);
+    ENC_REGISTER(US_ASCII);
+#undef ENC_REGISTER
+    enc_table.count = ENCINDEX_BUILTIN_MAX;
+}
+
+rb_encoding *
+rb_enc_from_index(int index)
+{
+    if (!enc_table.list) {
+	rb_enc_init();
+    }
+    if (index < 0 || enc_table.count <= index) {
+	return 0;
+    }
+    return enc_table.list[index].enc;
+}
+
+int
+rb_enc_registered(const char *name)
+{
+    st_data_t idx = 0;
+
+    if (!name) return -1;
+    if (!enc_table.list) return -1;
+    if (st_lookup(enc_table.names, (st_data_t)name, &idx)) {
+	return (int)idx;
+    }
+    return -1;
+}
+
+static VALUE
+require_enc(VALUE enclib)
+{
+    return rb_require_safe(enclib, rb_safe_level());
+}
+
+static int
+load_encoding(const char *name)
+{
+    VALUE enclib = rb_sprintf("enc/%s.so", name);
+    VALUE verbose = ruby_verbose;
+    VALUE debug = ruby_debug;
+    VALUE loaded;
+    char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3;
+    int idx;
+
+    while (s < e) {
+	if (!ISALNUM(*s)) *s = '_';
+	else if (ISUPPER(*s)) *s = TOLOWER(*s);
+	++s;
+    }
+    OBJ_FREEZE(enclib);
+    ruby_verbose = Qfalse;
+    ruby_debug = Qfalse;
+    loaded = rb_protect(require_enc, enclib, 0);
+    ruby_verbose = verbose;
+    ruby_debug = debug;
+    rb_set_errinfo(Qnil);
+    if (NIL_P(loaded)) return -1;
+    if ((idx = rb_enc_registered(name)) < 0) return -1;
+    if (enc_autoload_p(enc_table.list[idx].enc)) return -1;
+    return idx;
+}
+
+static int
+enc_autoload(rb_encoding *enc)
+{
+    int i;
+    rb_encoding *base = enc_table.list[ENC_TO_ENCINDEX(enc)].base;
+
+    if (base) {
+	i = 0;
+	do {
+	    if (i >= enc_table.count) return -1;
+	} while (enc_table.list[i].enc != base && (++i, 1));
+	if (enc_autoload_p(base)) {
+	    if (enc_autoload(base) < 0) return -1;
+	}
+	i = ENC_TO_ENCINDEX(enc);
+	enc_register_at(i, rb_enc_name(enc), base);
+    }
+    else {
+	i = load_encoding(rb_enc_name(enc));
+    }
+    return i;
+}
+
+int
+rb_enc_find_index(const char *name)
+{
+    int i = rb_enc_registered(name);
+    rb_encoding *enc;
+
+    if (i < 0) {
+	i = load_encoding(name);
+    }
+    else if (!(enc = rb_enc_from_index(i))) {
+	if (i != UNSPECIFIED_ENCODING) {
+	    rb_raise(rb_eArgError, "encoding %s is not registered", name);
+	}
+    }
+    else if (enc_autoload_p(enc)) {
+	if (enc_autoload(enc) < 0) {
+	    rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
+		    name);
+	    return 0;
+	}
+    }
+    return i;
+}
+
+rb_encoding *
+rb_enc_find(const char *name)
+{
+    int idx = rb_enc_find_index(name);
+    if (idx < 0) idx = 0;
+    return rb_enc_from_index(idx);
+}
+
+static inline int
+enc_capable(VALUE obj)
+{
+    if (SPECIAL_CONST_P(obj)) return SYMBOL_P(obj);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_STRING:
+      case T_REGEXP:
+      case T_FILE:
+	return TRUE;
+      case T_DATA:
+	if (is_data_encoding(obj)) return TRUE;
+      default:
+	return FALSE;
+    }
+}
+
+ID
+rb_id_encoding(void)
+{
+    CONST_ID(id_encoding, "encoding");
+    return id_encoding;
+}
+
+int
+rb_enc_get_index(VALUE obj)
+{
+    int i = -1;
+    VALUE tmp;
+
+    if (SPECIAL_CONST_P(obj)) {
+	if (!SYMBOL_P(obj)) return -1;
+	obj = rb_id2str(SYM2ID(obj));
+    }
+    switch (BUILTIN_TYPE(obj)) {
+      as_default:
+      default:
+      case T_STRING:
+      case T_REGEXP:
+	i = ENCODING_GET_INLINED(obj);
+	if (i == ENCODING_INLINE_MAX) {
+	    VALUE iv;
+
+	    iv = rb_ivar_get(obj, rb_id_encoding());
+	    i = NUM2INT(iv);
+	}
+	break;
+      case T_FILE:
+	tmp = rb_funcall(obj, rb_intern("internal_encoding"), 0, 0);
+	if (NIL_P(tmp)) obj = rb_funcall(obj, rb_intern("external_encoding"), 0, 0);
+	else obj = tmp;
+	if (NIL_P(obj)) break;
+      case T_DATA:
+	if (is_data_encoding(obj)) {
+	    i = enc_check_encoding(obj);
+	}
+	else {
+	    goto as_default;
+	}
+	break;
+    }
+    return i;
+}
+
+void
+rb_enc_set_index(VALUE obj, int idx)
+{
+    if (idx < ENCODING_INLINE_MAX) {
+	ENCODING_SET_INLINED(obj, idx);
+	return;
+    }
+    ENCODING_SET_INLINED(obj, ENCODING_INLINE_MAX);
+    rb_ivar_set(obj, rb_id_encoding(), INT2NUM(idx));
+    return;
+}
+
+VALUE
+rb_enc_associate_index(VALUE obj, int idx)
+{
+/*    enc_check_capable(obj);*/
+    if (rb_enc_get_index(obj) == idx)
+	return obj;
+    if (SPECIAL_CONST_P(obj)) {
+	rb_raise(rb_eArgError, "cannot set encoding");
+    }
+    if (!ENC_CODERANGE_ASCIIONLY(obj) ||
+	!rb_enc_asciicompat(rb_enc_from_index(idx))) {
+	ENC_CODERANGE_CLEAR(obj);
+    }
+    rb_enc_set_index(obj, idx);
+    return obj;
+}
+
+VALUE
+rb_enc_associate(VALUE obj, rb_encoding *enc)
+{
+    return rb_enc_associate_index(obj, rb_enc_to_index(enc));
+}
+
+rb_encoding*
+rb_enc_get(VALUE obj)
+{
+    return rb_enc_from_index(rb_enc_get_index(obj));
+}
+
+rb_encoding*
+rb_enc_check(VALUE str1, VALUE str2)
+{
+    rb_encoding *enc = rb_enc_compatible(str1, str2);
+    if (!enc)
+	rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
+		 rb_enc_name(rb_enc_get(str1)),
+		 rb_enc_name(rb_enc_get(str2)));
+    return enc;
+}
+
+rb_encoding*
+rb_enc_compatible(VALUE str1, VALUE str2)
+{
+    int idx1, idx2;
+    rb_encoding *enc1, *enc2;
+
+    idx1 = rb_enc_get_index(str1);
+    idx2 = rb_enc_get_index(str2);
+
+    if (idx1 < 0 || idx2 < 0)
+        return 0;
+
+    if (idx1 == idx2) {
+	return rb_enc_from_index(idx1);
+    }
+    enc1 = rb_enc_from_index(idx1);
+    enc2 = rb_enc_from_index(idx2);
+
+    if (TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0)
+	return (idx1 == ENCINDEX_US_ASCII && rb_enc_asciicompat(enc2)) ? enc2 : enc1;
+    if (TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0)
+	return (idx2 == ENCINDEX_US_ASCII && rb_enc_asciicompat(enc1)) ? enc1 : enc2;
+    if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
+	return 0;
+    }
+
+    /* objects whose encoding is the same of contents */
+    if (BUILTIN_TYPE(str2) != T_STRING && idx2 == ENCINDEX_US_ASCII)
+	return enc1;
+    if (BUILTIN_TYPE(str1) != T_STRING && idx1 == ENCINDEX_US_ASCII)
+	return enc2;
+
+    if (BUILTIN_TYPE(str1) != T_STRING) {
+	VALUE tmp = str1;
+	int idx0 = idx1;
+	str1 = str2;
+	str2 = tmp;
+	idx1 = idx2;
+	idx2 = idx0;
+    }
+    if (BUILTIN_TYPE(str1) == T_STRING) {
+	int cr1, cr2;
+
+	cr1 = rb_enc_str_coderange(str1);
+	if (BUILTIN_TYPE(str2) == T_STRING) {
+	    cr2 = rb_enc_str_coderange(str2);
+	    if (cr1 != cr2) {
+		/* may need to handle ENC_CODERANGE_BROKEN */
+		if (cr1 == ENC_CODERANGE_7BIT) return enc2;
+		if (cr2 == ENC_CODERANGE_7BIT) return enc1;
+	    }
+	    if (cr2 == ENC_CODERANGE_7BIT) {
+		if (idx1 == ENCINDEX_ASCII) return enc2;
+		return enc1;
+	    }
+	}
+	if (cr1 == ENC_CODERANGE_7BIT)
+	    return enc2;
+    }
+    return 0;
+}
+
+void
+rb_enc_copy(VALUE obj1, VALUE obj2)
+{
+    rb_enc_associate_index(obj1, rb_enc_get_index(obj2));
+}
+
+
+/*
+ *  call-seq:
+ *     obj.encoding   -> encoding
+ *
+ *  Returns the Encoding object that represents the encoding of obj.
+ */
+
+VALUE
+rb_obj_encoding(VALUE obj)
+{
+    rb_encoding *enc = rb_enc_get(obj);
+    if (!enc) {
+	rb_raise(rb_eTypeError, "unknown encoding");
+    }
+    return rb_enc_from_encoding(enc);
+}
+
+int
+rb_enc_fast_mbclen(const char *p, const char *e, rb_encoding *enc)
+{
+    return ONIGENC_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
+}
+
+int
+rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc)
+{
+    int n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
+    if (MBCLEN_CHARFOUND_P(n) && MBCLEN_CHARFOUND_LEN(n) <= e-p)
+        return MBCLEN_CHARFOUND_LEN(n);
+    else {
+        int min = rb_enc_mbminlen(enc);
+        return min <= e-p ? min : (int)(e-p);
+    }
+}
+
+int
+rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc)
+{
+    int n;
+    if (e <= p)
+        return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
+    n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
+    if (e-p < n)
+        return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n-(int)(e-p));
+    return n;
+}
+
+int
+rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
+{
+    unsigned int c, l;
+    if (e <= p)
+        return -1;
+    if (rb_enc_asciicompat(enc)) {
+        c = (unsigned char)*p;
+        if (!ISASCII(c))
+            return -1;
+        if (len) *len = 1;
+        return c;
+    }
+    l = rb_enc_precise_mbclen(p, e, enc);
+    if (!MBCLEN_CHARFOUND_P(l))
+        return -1;
+    c = rb_enc_mbc_to_codepoint(p, e, enc);
+    if (!rb_enc_isascii(c, enc))
+        return -1;
+    if (len) *len = l;
+    return c;
+}
+
+unsigned int
+rb_enc_codepoint_len(const char *p, const char *e, int *len_p, rb_encoding *enc)
+{
+    int r;
+    if (e <= p)
+        rb_raise(rb_eArgError, "empty string");
+    r = rb_enc_precise_mbclen(p, e, enc);
+    if (MBCLEN_CHARFOUND_P(r)) {
+	if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r);
+        return rb_enc_mbc_to_codepoint(p, e, enc);
+    }
+    else
+	rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+}
+
+#undef rb_enc_codepoint
+unsigned int
+rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc)
+{
+    return rb_enc_codepoint_len(p, e, 0, enc);
+}
+
+int
+rb_enc_codelen(int c, rb_encoding *enc)
+{
+    int n = ONIGENC_CODE_TO_MBCLEN(enc,c);
+    if (n == 0) {
+	rb_raise(rb_eArgError, "invalid codepoint 0x%x in %s", c, rb_enc_name(enc));
+    }
+    return n;
+}
+
+int
+rb_enc_toupper(int c, rb_encoding *enc)
+{
+    return (ONIGENC_IS_ASCII_CODE(c)?ONIGENC_ASCII_CODE_TO_UPPER_CASE(c):(c));
+}
+
+int
+rb_enc_tolower(int c, rb_encoding *enc)
+{
+    return (ONIGENC_IS_ASCII_CODE(c)?ONIGENC_ASCII_CODE_TO_LOWER_CASE(c):(c));
+}
+
+/*
+ * call-seq:
+ *   enc.inspect -> string
+ *
+ * Returns a string which represents the encoding for programmers.
+ *
+ *   Encoding::UTF_8.inspect       #=> "#<Encoding:UTF-8>"
+ *   Encoding::ISO_2022_JP.inspect #=> "#<Encoding:ISO-2022-JP (dummy)>"
+ */
+static VALUE
+enc_inspect(VALUE self)
+{
+    VALUE str = rb_sprintf("#<%s:%s%s>", rb_obj_classname(self),
+		      rb_enc_name((rb_encoding*)DATA_PTR(self)),
+		      (enc_dummy_p(self) ? " (dummy)" : ""));
+    ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT);
+    return str;
+}
+
+/*
+ * call-seq:
+ *   enc.name -> string
+ *
+ * Returns the name of the encoding.
+ *
+ *   Encoding::UTF_8.name      #=> "UTF-8"
+ */
+static VALUE
+enc_name(VALUE self)
+{
+    return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self)));
+}
+
+static int
+enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
+{
+    VALUE *arg = (VALUE *)args;
+
+    if ((int)idx == (int)arg[0]) {
+	VALUE str = rb_usascii_str_new2((char *)name);
+	OBJ_FREEZE(str);
+	rb_ary_push(arg[1], str);
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ * call-seq:
+ *   enc.names -> array
+ *
+ * Returns the list of name and aliases of the encoding.
+ *
+ *   Encoding::WINDOWS_31J.names  #=> ["Windows-31J", "CP932", "csWindows31J"]
+ */
+static VALUE
+enc_names(VALUE self)
+{
+    VALUE args[2];
+
+    args[0] = (VALUE)rb_to_encoding_index(self);
+    args[1] = rb_ary_new2(0);
+    st_foreach(enc_table.names, enc_names_i, (st_data_t)args);
+    return args[1];
+}
+
+/*
+ * call-seq:
+ *   Encoding.list -> [enc1, enc2, ...]
+ *
+ * Returns the list of loaded encodings.
+ *
+ *   Encoding.list
+ *   #=> [#<Encoding:ASCII-8BIT>, #<Encoding:UTF-8>,
+ *         #<Encoding:ISO-2022-JP (dummy)>]
+ *
+ *   Encoding.find("US-ASCII")
+ *   #=> #<Encoding:US-ASCII>
+ *
+ *   Encoding.list
+ *   #=> [#<Encoding:ASCII-8BIT>, #<Encoding:UTF-8>,
+ *         #<Encoding:US-ASCII>, #<Encoding:ISO-2022-JP (dummy)>]
+ *
+ */
+static VALUE
+enc_list(VALUE klass)
+{
+    VALUE ary = rb_ary_new2(0);
+    rb_ary_replace(ary, rb_encoding_list);
+    return ary;
+}
+
+/*
+ * call-seq:
+ *   Encoding.find(string) -> enc
+ *   Encoding.find(symbol) -> enc
+ *
+ * Search the encoding with specified <i>name</i>.
+ * <i>name</i> should be a string or symbol.
+ *
+ *   Encoding.find("US-ASCII")  #=> #<Encoding:US-ASCII>
+ *   Encoding.find(:Shift_JIS)  #=> #<Encoding:Shift_JIS>
+ *
+ * Names which this method accept are encoding names and aliases
+ * including following special aliases
+ *
+ * "external"::   default external encoding
+ * "internal"::   default internal encoding
+ * "locale"::     locale encoding
+ * "filesystem":: filesystem encoding
+ *
+ * An ArgumentError is raised when no encoding with <i>name</i>.
+ * Only <code>Encoding.find("internal")</code> however returns nil
+ * when no encoding named "internal", in other words, when Ruby has no
+ * default internal encoding.
+ */
+static VALUE
+enc_find(VALUE klass, VALUE enc)
+{
+    return rb_enc_from_encoding(to_encoding(enc));
+}
+
+/*
+ * call-seq:
+ *   Encoding.compatible?(str1, str2) -> enc or nil
+ *
+ * Checks the compatibility of two strings.
+ * If they are compatible, means concatenatable,
+ * returns an encoding which the concatenated string will be.
+ * If they are not compatible, nil is returned.
+ *
+ *   Encoding.compatible?("\xa1".force_encoding("iso-8859-1"), "b")
+ *   #=> #<Encoding:ISO-8859-1>
+ *
+ *   Encoding.compatible?(
+ *     "\xa1".force_encoding("iso-8859-1"),
+ *     "\xa1\xa1".force_encoding("euc-jp"))
+ *   #=> nil
+ *
+ */
+static VALUE
+enc_compatible_p(VALUE klass, VALUE str1, VALUE str2)
+{
+    rb_encoding *enc;
+
+    if (!enc_capable(str1)) return Qnil;
+    if (!enc_capable(str2)) return Qnil;
+    enc = rb_enc_compatible(str1, str2);
+    if (!enc) return Qnil;
+    return rb_enc_from_encoding(enc);
+}
+
+/* :nodoc: */
+static VALUE
+enc_dump(int argc, VALUE *argv, VALUE self)
+{
+    rb_scan_args(argc, argv, "01", 0);
+    return enc_name(self);
+}
+
+/* :nodoc: */
+static VALUE
+enc_load(VALUE klass, VALUE str)
+{
+    return enc_find(klass, str);
+}
+
+rb_encoding *
+rb_ascii8bit_encoding(void)
+{
+    if (!enc_table.list) {
+	rb_enc_init();
+    }
+    return enc_table.list[ENCINDEX_ASCII].enc;
+}
+
+int
+rb_ascii8bit_encindex(void)
+{
+    return ENCINDEX_ASCII;
+}
+
+rb_encoding *
+rb_utf8_encoding(void)
+{
+    if (!enc_table.list) {
+	rb_enc_init();
+    }
+    return enc_table.list[ENCINDEX_UTF_8].enc;
+}
+
+int
+rb_utf8_encindex(void)
+{
+    return ENCINDEX_UTF_8;
+}
+
+rb_encoding *
+rb_usascii_encoding(void)
+{
+    if (!enc_table.list) {
+	rb_enc_init();
+    }
+    return enc_table.list[ENCINDEX_US_ASCII].enc;
+}
+
+int
+rb_usascii_encindex(void)
+{
+    return ENCINDEX_US_ASCII;
+}
+
+int
+rb_locale_encindex(void)
+{
+    VALUE charmap = rb_locale_charmap(rb_cEncoding);
+    int idx;
+
+    if (NIL_P(charmap))
+        idx = rb_usascii_encindex();
+    else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0)
+        idx = rb_ascii8bit_encindex();
+
+    if (rb_enc_registered("locale") < 0) enc_alias_internal("locale", idx);
+
+    return idx;
+}
+
+rb_encoding *
+rb_locale_encoding(void)
+{
+    return rb_enc_from_index(rb_locale_encindex());
+}
+
+static int
+enc_set_filesystem_encoding(void)
+{
+    int idx;
+#if defined NO_LOCALE_CHARMAP
+    idx = rb_enc_to_index(rb_default_external_encoding());
+#elif defined _WIN32 || defined __CYGWIN__
+    char cp[sizeof(int) * 8 / 3 + 4];
+    snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
+    idx = rb_enc_find_index(cp);
+    if (idx < 0) idx = rb_ascii8bit_encindex();
+#else
+    idx = rb_enc_to_index(rb_default_external_encoding());
+#endif
+
+    enc_alias_internal("filesystem", idx);
+    return idx;
+}
+
+int
+rb_filesystem_encindex(void)
+{
+    int idx = rb_enc_registered("filesystem");
+    if (idx < 0)
+	idx = rb_ascii8bit_encindex();
+    return idx;
+}
+
+rb_encoding *
+rb_filesystem_encoding(void)
+{
+    return rb_enc_from_index(rb_filesystem_encindex());
+}
+
+struct default_encoding {
+    int index;			/* -2 => not yet set, -1 => nil */
+    rb_encoding *enc;
+};
+
+static struct default_encoding default_external = {0};
+
+static int
+enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const char *name)
+{
+    int overridden = FALSE;
+
+    if (def->index != -2)
+	/* Already set */
+	overridden = TRUE;
+
+    if (NIL_P(encoding)) {
+	def->index = -1;
+	def->enc = 0;
+	st_insert(enc_table.names, (st_data_t)strdup(name),
+		  (st_data_t)UNSPECIFIED_ENCODING);
+    }
+    else {
+	def->index = rb_enc_to_index(rb_to_encoding(encoding));
+	def->enc = 0;
+	enc_alias_internal(name, def->index);
+    }
+
+    if (def == &default_external)
+	enc_set_filesystem_encoding();
+
+    return overridden;
+}
+
+rb_encoding *
+rb_default_external_encoding(void)
+{
+    if (default_external.enc) return default_external.enc;
+
+    if (default_external.index >= 0) {
+        default_external.enc = rb_enc_from_index(default_external.index);
+        return default_external.enc;
+    }
+    else {
+        return rb_locale_encoding();
+    }
+}
+
+VALUE
+rb_enc_default_external(void)
+{
+    return rb_enc_from_encoding(rb_default_external_encoding());
+}
+
+/*
+ * call-seq:
+ *   Encoding.default_external -> enc
+ *
+ * Returns default external encoding.
+ *
+ * It is initialized by the locale or -E option.
+ */
+static VALUE
+get_default_external(VALUE klass)
+{
+    return rb_enc_default_external();
+}
+
+void
+rb_enc_set_default_external(VALUE encoding)
+{
+    if (NIL_P(encoding)) {
+        rb_raise(rb_eArgError, "default external can not be nil");
+    }
+    enc_set_default_encoding(&default_external, encoding,
+                            "external");
+}
+
+/*
+ * call-seq:
+ *   Encoding.default_external = enc
+ *
+ * Sets default external encoding.
+ */
+static VALUE
+set_default_external(VALUE klass, VALUE encoding)
+{
+    rb_warning("setting Encoding.default_external");
+    rb_enc_set_default_external(encoding);
+    return encoding;
+}
+
+static struct default_encoding default_internal = {-2};
+
+rb_encoding *
+rb_default_internal_encoding(void)
+{
+    if (!default_internal.enc && default_internal.index >= 0) {
+        default_internal.enc = rb_enc_from_index(default_internal.index);
+    }
+    return default_internal.enc; /* can be NULL */
+}
+
+VALUE
+rb_enc_default_internal(void)
+{
+    /* Note: These functions cope with default_internal not being set */
+    return rb_enc_from_encoding(rb_default_internal_encoding());
+}
+
+/*
+ * call-seq:
+ *   Encoding.default_internal -> enc
+ *
+ * Returns default internal encoding.
+ *
+ * It is initialized by the source internal_encoding or -E option.
+ */
+static VALUE
+get_default_internal(VALUE klass)
+{
+    return rb_enc_default_internal();
+}
+
+void
+rb_enc_set_default_internal(VALUE encoding)
+{
+    enc_set_default_encoding(&default_internal, encoding,
+                            "internal");
+}
+
+/*
+ * call-seq:
+ *   Encoding.default_internal = enc or nil
+ *
+ * Sets default internal encoding.
+ * Or removes default internal encoding when passed nil.
+ */
+static VALUE
+set_default_internal(VALUE klass, VALUE encoding)
+{
+    rb_warning("setting Encoding.default_internal");
+    rb_enc_set_default_internal(encoding);
+    return encoding;
+}
+
+/*
+ * call-seq:
+ *   Encoding.locale_charmap -> string
+ *
+ * Returns the locale charmap name.
+ *
+ *   Debian GNU/Linux
+ *     LANG=C
+ *       Encoding.locale_charmap  #=> "ANSI_X3.4-1968"
+ *     LANG=ja_JP.EUC-JP
+ *       Encoding.locale_charmap  #=> "EUC-JP"
+ *
+ *   SunOS 5
+ *     LANG=C
+ *       Encoding.locale_charmap  #=> "646"
+ *     LANG=ja
+ *       Encoding.locale_charmap  #=> "eucJP"
+ *
+ * The result is highly platform dependent.
+ * So Encoding.find(Encoding.locale_charmap) may cause an error.
+ * If you need some encoding object even for unknown locale,
+ * Encoding.find("locale") can be used.
+ *
+ */
+VALUE
+rb_locale_charmap(VALUE klass)
+{
+#if defined NO_LOCALE_CHARMAP
+    return rb_usascii_str_new2("ASCII-8BIT");
+#elif defined _WIN32 || defined __CYGWIN__
+    const char *nl_langinfo_codeset(void);
+    const char *codeset = nl_langinfo_codeset();
+    char cp[sizeof(int) * 3 + 4];
+    if (!codeset) {
+	snprintf(cp, sizeof(cp), "CP%d", GetConsoleCP());
+	codeset = cp;
+    }
+    return rb_usascii_str_new2(codeset);
+#elif defined HAVE_LANGINFO_H
+    char *codeset;
+    codeset = nl_langinfo(CODESET);
+    return rb_usascii_str_new2(codeset);
+#else
+    return Qnil;
+#endif
+}
+
+static void
+set_encoding_const(const char *name, rb_encoding *enc)
+{
+    VALUE encoding = rb_enc_from_encoding(enc);
+    char *s = (char *)name;
+    int haslower = 0, hasupper = 0, valid = 0;
+
+    if (ISDIGIT(*s)) return;
+    if (ISUPPER(*s)) {
+	hasupper = 1;
+	while (*++s && (ISALNUM(*s) || *s == '_')) {
+	    if (ISLOWER(*s)) haslower = 1;
+	}
+    }
+    if (!*s) {
+	if (s - name > ENCODING_NAMELEN_MAX) return;
+	valid = 1;
+	rb_define_const(rb_cEncoding, name, encoding);
+    }
+    if (!valid || haslower) {
+	size_t len = s - name;
+	if (len > ENCODING_NAMELEN_MAX) return;
+	if (!haslower || !hasupper) {
+	    do {
+		if (ISLOWER(*s)) haslower = 1;
+		if (ISUPPER(*s)) hasupper = 1;
+	    } while (*++s && (!haslower || !hasupper));
+	    len = s - name;
+	}
+	len += strlen(s);
+	if (len++ > ENCODING_NAMELEN_MAX) return;
+	MEMCPY(s = ALLOCA_N(char, len), name, char, len);
+	name = s;
+	if (!valid) {
+	    if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
+	    for (; *s; ++s) {
+		if (!ISALNUM(*s)) *s = '_';
+	    }
+	    if (hasupper) {
+		rb_define_const(rb_cEncoding, name, encoding);
+	    }
+	}
+	if (haslower) {
+	    for (s = (char *)name; *s; ++s) {
+		if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
+	    }
+	    rb_define_const(rb_cEncoding, name, encoding);
+	}
+    }
+}
+
+static int
+rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg)
+{
+    VALUE ary = (VALUE)arg;
+    VALUE str = rb_usascii_str_new2((char *)name);
+    OBJ_FREEZE(str);
+    rb_ary_push(ary, str);
+    return ST_CONTINUE;
+}
+
+/*
+ * call-seq:
+ *   Encoding.name_list -> ["enc1", "enc2", ...]
+ *
+ * Returns the list of available encoding names.
+ *
+ *   Encoding.name_list
+ *   #=> ["US-ASCII", "ASCII-8BIT", "UTF-8",
+ *         "ISO-8859-1", "Shift_JIS", "EUC-JP",
+ *         "Windows-31J",
+ *         "BINARY", "CP932", "eucJP"]
+ *
+ */
+
+static VALUE
+rb_enc_name_list(VALUE klass)
+{
+    VALUE ary = rb_ary_new2(enc_table.names->num_entries);
+    st_foreach(enc_table.names, rb_enc_name_list_i, (st_data_t)ary);
+    return ary;
+}
+
+static int
+rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
+{
+    VALUE *p = (VALUE *)arg;
+    VALUE aliases = p[0], ary = p[1];
+    int idx = (int)orig;
+    VALUE key, str = rb_ary_entry(ary, idx);
+
+    if (NIL_P(str)) {
+	rb_encoding *enc = rb_enc_from_index(idx);
+
+	if (!enc) return ST_CONTINUE;
+	if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
+	    return ST_CONTINUE;
+	}
+	str = rb_usascii_str_new2(rb_enc_name(enc));
+	OBJ_FREEZE(str);
+	rb_ary_store(ary, idx, str);
+    }
+    key = rb_usascii_str_new2((char *)name);
+    OBJ_FREEZE(key);
+    rb_hash_aset(aliases, key, str);
+    return ST_CONTINUE;
+}
+
+/*
+ * call-seq:
+ *   Encoding.aliases -> {"alias1" => "orig1", "alias2" => "orig2", ...}
+ *
+ * Returns the hash of available encoding alias and original encoding name.
+ *
+ *   Encoding.aliases
+ *   #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1986"=>"US-ASCII",
+ *         "SJIS"=>"Shift_JIS", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"}
+ *
+ */
+
+static VALUE
+rb_enc_aliases(VALUE klass)
+{
+    VALUE aliases[2];
+    aliases[0] = rb_hash_new();
+    aliases[1] = rb_ary_new();
+    st_foreach(enc_table.names, rb_enc_aliases_enc_i, (st_data_t)aliases);
+    return aliases[0];
+}
+
+void
+Init_Encoding(void)
+{
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+    VALUE list;
+    int i;
+
+    rb_cEncoding = rb_define_class("Encoding", rb_cObject);
+    rb_undef_alloc_func(rb_cEncoding);
+    rb_undef_method(CLASS_OF(rb_cEncoding), "new");
+    rb_define_method(rb_cEncoding, "to_s", enc_name, 0);
+    rb_define_method(rb_cEncoding, "inspect", enc_inspect, 0);
+    rb_define_method(rb_cEncoding, "name", enc_name, 0);
+    rb_define_method(rb_cEncoding, "names", enc_names, 0);
+    rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0);
+    rb_define_method(rb_cEncoding, "ascii_compatible?", enc_ascii_compatible_p, 0);
+    rb_define_method(rb_cEncoding, "replicate", enc_replicate, 1);
+    rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0);
+    rb_define_singleton_method(rb_cEncoding, "name_list", rb_enc_name_list, 0);
+    rb_define_singleton_method(rb_cEncoding, "aliases", rb_enc_aliases, 0);
+    rb_define_singleton_method(rb_cEncoding, "find", enc_find, 1);
+    rb_define_singleton_method(rb_cEncoding, "compatible?", enc_compatible_p, 2);
+
+    rb_define_method(rb_cEncoding, "_dump", enc_dump, -1);
+    rb_define_singleton_method(rb_cEncoding, "_load", enc_load, 1);
+
+    rb_define_singleton_method(rb_cEncoding, "default_external", get_default_external, 0);
+    rb_define_singleton_method(rb_cEncoding, "default_external=", set_default_external, 1);
+    rb_define_singleton_method(rb_cEncoding, "default_internal", get_default_internal, 0);
+    rb_define_singleton_method(rb_cEncoding, "default_internal=", set_default_internal, 1);
+    rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0);
+
+    list = rb_ary_new2(enc_table.count);
+    RBASIC(list)->klass = 0;
+    rb_encoding_list = list;
+    rb_gc_register_mark_object(list);
+
+    for (i = 0; i < enc_table.count; ++i) {
+	rb_ary_push(list, enc_new(enc_table.list[i].enc));
+    }
+}
+
+/* locale insensitive functions */
+
+#define ctype_test(c, ctype) \
+    (rb_isascii(c) && ONIGENC_IS_ASCII_CODE_CTYPE((c), ctype))
+
+int rb_isalnum(int c) { return ctype_test(c, ONIGENC_CTYPE_ALNUM); }
+int rb_isalpha(int c) { return ctype_test(c, ONIGENC_CTYPE_ALPHA); }
+int rb_isblank(int c) { return ctype_test(c, ONIGENC_CTYPE_BLANK); }
+int rb_iscntrl(int c) { return ctype_test(c, ONIGENC_CTYPE_CNTRL); }
+int rb_isdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_DIGIT); }
+int rb_isgraph(int c) { return ctype_test(c, ONIGENC_CTYPE_GRAPH); }
+int rb_islower(int c) { return ctype_test(c, ONIGENC_CTYPE_LOWER); }
+int rb_isprint(int c) { return ctype_test(c, ONIGENC_CTYPE_PRINT); }
+int rb_ispunct(int c) { return ctype_test(c, ONIGENC_CTYPE_PUNCT); }
+int rb_isspace(int c) { return ctype_test(c, ONIGENC_CTYPE_SPACE); }
+int rb_isupper(int c) { return ctype_test(c, ONIGENC_CTYPE_UPPER); }
+int rb_isxdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_XDIGIT); }
+
+int
+rb_tolower(int c)
+{
+    return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_LOWER_CASE(c) : c;
+}
+
+int
+rb_toupper(int c)
+{
+    return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_UPPER_CASE(c) : c;
+}
+
diff --git a/enum.c b/enum.c
index 2a29272ae9..8d4692ae6d 100644
--- a/enum.c
+++ b/enum.c
@@ -3,31 +3,39 @@
   enum.c -
 
   $Author$
-  $Date$
   created at: Fri Oct  1 15:15:19 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
+#include "ruby/util.h"
 #include "node.h"
-#include "util.h"
 
 VALUE rb_mEnumerable;
-static ID id_each, id_eqq, id_cmp;
+static ID id_each, id_eqq, id_cmp, id_next, id_size;
 
-VALUE
-rb_each(obj)
-    VALUE obj;
+static VALUE
+enum_values_pack(int argc, VALUE *argv)
 {
-    return rb_funcall(obj, id_each, 0, 0);
+    if (argc == 0) return Qnil;
+    if (argc == 1) return argv[0];
+    return rb_ary_new4(argc, argv);
 }
 
+#define ENUM_WANT_SVALUE() do { \
+    i = enum_values_pack(argc, argv); \
+} while (0)
+
+#define enum_yield rb_yield_values2
+
 static VALUE
-grep_i(i, arg)
-    VALUE i, *arg;
+grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
 {
+    VALUE *arg = (VALUE *)args;
+    ENUM_WANT_SVALUE();
+
     if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
 	rb_ary_push(arg[1], i);
     }
@@ -35,9 +43,11 @@ grep_i(i, arg)
 }
 
 static VALUE
-grep_iter_i(i, arg)
-    VALUE i, *arg;
+grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
 {
+    VALUE *arg = (VALUE *)args;
+    ENUM_WANT_SVALUE();
+
     if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
 	rb_ary_push(arg[1], rb_yield(i));
     }
@@ -46,25 +56,24 @@ grep_iter_i(i, arg)
 
 /*
  *  call-seq:
- *     enum.grep(pattern)                   => array
- *     enum.grep(pattern) {| obj | block }  => array
- *  
+ *     enum.grep(pattern)                   -> array
+ *     enum.grep(pattern) {| obj | block }  -> array
+ *
  *  Returns an array of every element in <i>enum</i> for which
  *  <code>Pattern === element</code>. If the optional <em>block</em> is
  *  supplied, each matching element is passed to it, and the block's
  *  result is stored in the output array.
- *     
+ *
  *     (1..100).grep 38..44   #=> [38, 39, 40, 41, 42, 43, 44]
  *     c = IO.constants
- *     c.grep(/SEEK/)         #=> ["SEEK_END", "SEEK_SET", "SEEK_CUR"]
+ *     c.grep(/SEEK/)         #=> [:SEEK_SET, :SEEK_CUR, :SEEK_END]
  *     res = c.grep(/SEEK/) {|v| IO.const_get(v) }
- *     res                    #=> [2, 0, 1]
- *     
+ *     res                    #=> [0, 1, 2]
+ *
  */
 
 static VALUE
-enum_grep(obj, pat)
-    VALUE obj, pat;
+enum_grep(VALUE obj, VALUE pat)
 {
     VALUE ary = rb_ary_new();
     VALUE arg[2];
@@ -72,16 +81,95 @@ enum_grep(obj, pat)
     arg[0] = pat;
     arg[1] = ary;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
-    
+    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
+
     return ary;
 }
 
 static VALUE
-find_i(i, memo)
-    VALUE i;
-    VALUE *memo;
+count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+{
+    VALUE *memo = (VALUE*)memop;
+
+    ENUM_WANT_SVALUE();
+
+    if (rb_equal(i, memo[1])) {
+	memo[0]++;
+    }
+    return Qnil;
+}
+
+static VALUE
+count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+{
+    VALUE *memo = (VALUE*)memop;
+
+    if (RTEST(enum_yield(argc, argv))) {
+	memo[0]++;
+    }
+    return Qnil;
+}
+
+static VALUE
+count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+{
+    VALUE *memo = (VALUE*)memop;
+
+    memo[0]++;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.count                   -> int
+ *     enum.count(item)             -> int
+ *     enum.count {| obj | block }  -> int
+ *
+ *  Returns the number of items in <i>enum</i>, where #size is called
+ *  if it responds to it, otherwise the items are counted through
+ *  enumeration.  If an argument is given, counts the number of items
+ *  in <i>enum</i>, for which equals to <i>item</i>.  If a block is
+ *  given, counts the number of elements yielding a true value.
+ *
+ *     ary = [1, 2, 4, 2]
+ *     ary.count             #=> 4
+ *     ary.count(2)          #=> 2
+ *     ary.count{|x|x%2==0}  #=> 3
+ *
+ */
+
+static VALUE
+enum_count(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE memo[2];	/* [count, condition value] */
+    rb_block_call_func *func;
+
+    if (argc == 0) {
+	if (rb_block_given_p()) {
+	    func = count_iter_i;
+	}
+	else {
+	    func = count_all_i;
+	}
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &memo[1]);
+	if (rb_block_given_p()) {
+	    rb_warn("given block not used");
+	}
+        func = count_i;
+    }
+
+    memo[0] = 0;
+    rb_block_call(obj, id_each, 0, 0, func, (VALUE)&memo);
+    return INT2NUM(memo[0]);
+}
+
+static VALUE
+find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
 {
+    ENUM_WANT_SVALUE();
+
     if (RTEST(rb_yield(i))) {
 	*memo = i;
 	rb_iter_break();
@@ -91,30 +179,32 @@ find_i(i, memo)
 
 /*
  *  call-seq:
- *     enum.detect(ifnone = nil) {| obj | block }  => obj or nil
- *     enum.find(ifnone = nil)   {| obj | block }  => obj or nil
- *  
+ *     enum.detect(ifnone = nil) {| obj | block }  -> obj or nil
+ *     enum.find(ifnone = nil)   {| obj | block }  -> obj or nil
+ *     enum.detect(ifnone = nil)                   -> an_enumerator
+ *     enum.find(ifnone = nil)                     -> an_enumerator
+ *
  *  Passes each entry in <i>enum</i> to <em>block</em>. Returns the
- *  first for which <em>block</em> is not <code>false</code>.  If no
+ *  first for which <em>block</em> is not false.  If no
  *  object matches, calls <i>ifnone</i> and returns its result when it
- *  is specified, or returns <code>nil</code>
- *     
+ *  is specified, or returns <code>nil</code> otherwise.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     (1..10).detect  {|i| i % 5 == 0 and i % 7 == 0 }   #=> nil
  *     (1..100).detect {|i| i % 5 == 0 and i % 7 == 0 }   #=> 35
- *     
+ *
  */
 
 static VALUE
-enum_find(argc, argv, obj)
-    int argc;
-    VALUE* argv;
-    VALUE obj;
+enum_find(int argc, VALUE *argv, VALUE obj)
 {
     VALUE memo = Qundef;
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
-    rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
+    RETURN_ENUMERATOR(obj, argc, argv);
+    rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)&memo);
     if (memo != Qundef) {
 	return memo;
     }
@@ -125,9 +215,81 @@ enum_find(argc, argv, obj)
 }
 
 static VALUE
-find_all_i(i, ary)
-    VALUE i, ary;
+find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+{
+    VALUE *memo = (VALUE*)memop;
+
+    ENUM_WANT_SVALUE();
+
+    if (rb_equal(i, memo[2])) {
+	memo[0] = UINT2NUM(memo[1]);
+	rb_iter_break();
+    }
+    memo[1]++;
+    return Qnil;
+}
+
+static VALUE
+find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+{
+    VALUE *memo = (VALUE*)memop;
+
+    if (RTEST(enum_yield(argc, argv))) {
+	memo[0] = UINT2NUM(memo[1]);
+	rb_iter_break();
+    }
+    memo[1]++;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.find_index(value)            -> int or nil
+ *     enum.find_index {| obj | block }  -> int or nil
+ *     enum.find_index                   -> an_enumerator
+ *
+ *  Compares each entry in <i>enum</i> with <em>value</em> or passes
+ *  to <em>block</em>.  Returns the index for the first for which the
+ *  evaluated value is non-false.  If no object matches, returns
+ *  <code>nil</code>
+ *
+ *  If neither block nor argument is given, an enumerator is returned instead.
+ *
+ *     (1..10).find_index  {|i| i % 5 == 0 and i % 7 == 0 }   #=> nil
+ *     (1..100).find_index {|i| i % 5 == 0 and i % 7 == 0 }   #=> 34
+ *     (1..100).find_index(50)                                #=> 49
+ *
+ */
+
+static VALUE
+enum_find_index(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE memo[3];	/* [return value, current index, condition value] */
+    rb_block_call_func *func;
+
+    if (argc == 0) {
+        RETURN_ENUMERATOR(obj, 0, 0);
+        func = find_index_iter_i;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &memo[2]);
+	if (rb_block_given_p()) {
+	    rb_warn("given block not used");
+	}
+        func = find_index_i;
+    }
+
+    memo[0] = Qnil;
+    memo[1] = 0;
+    rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
+    return memo[0];
+}
+
+static VALUE
+find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
 {
+    ENUM_WANT_SVALUE();
+
     if (RTEST(rb_yield(i))) {
 	rb_ary_push(ary, i);
     }
@@ -136,32 +298,40 @@ find_all_i(i, ary)
 
 /*
  *  call-seq:
- *     enum.find_all {| obj | block }  => array
- *     enum.select   {| obj | block }  => array
- *  
+ *     enum.find_all {| obj | block }  -> array
+ *     enum.select   {| obj | block }  -> array
+ *     enum.find_all                   -> an_enumerator
+ *     enum.select                     -> an_enumerator
+ *
  *  Returns an array containing all elements of <i>enum</i> for which
  *  <em>block</em> is not <code>false</code> (see also
  *  <code>Enumerable#reject</code>).
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *
  *     (1..10).find_all {|i|  i % 3 == 0 }   #=> [3, 6, 9]
- *     
+ *
  */
 
 static VALUE
-enum_find_all(obj)
-    VALUE obj;
+enum_find_all(VALUE obj)
 {
-    VALUE ary = rb_ary_new();
-    
-    rb_iterate(rb_each, obj, find_all_i, ary);
+    VALUE ary;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    ary = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, find_all_i, ary);
 
     return ary;
 }
 
 static VALUE
-reject_i(i, ary)
-    VALUE i, ary;
+reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
 {
+    ENUM_WANT_SVALUE();
+
     if (!RTEST(rb_yield(i))) {
 	rb_ary_push(ary, i);
     }
@@ -170,152 +340,258 @@ reject_i(i, ary)
 
 /*
  *  call-seq:
- *     enum.reject {| obj | block }  => array
- *  
+ *     enum.reject {| obj | block }  -> array
+ *     enum.reject                   -> an_enumerator
+ *
  *  Returns an array for all elements of <i>enum</i> for which
  *  <em>block</em> is false (see also <code>Enumerable#find_all</code>).
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     (1..10).reject {|i|  i % 3 == 0 }   #=> [1, 2, 4, 5, 7, 8, 10]
- *     
+ *
  */
 
 static VALUE
-enum_reject(obj)
-    VALUE obj;
+enum_reject(VALUE obj)
 {
-    VALUE ary = rb_ary_new();
-    
-    rb_iterate(rb_each, obj, reject_i, ary);
+    VALUE ary;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    ary = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, reject_i, ary);
 
     return ary;
 }
 
 static VALUE
-collect_i(i, ary)
-    VALUE i, ary;
+collect_i(VALUE i, VALUE ary, int argc, VALUE *argv)
 {
-    rb_ary_push(ary, rb_yield(i));
+    rb_ary_push(ary, enum_yield(argc, argv));
 
     return Qnil;
 }
 
 static VALUE
-collect_all(i, ary)
-    VALUE i, ary;
+collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
 {
-    rb_ary_push(ary, i);
+    rb_thread_check_ints();
+    rb_ary_push(ary, enum_values_pack(argc, argv));
 
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.collect {| obj | block }  => array
- *     enum.map     {| obj | block }  => array
- *  
+ *     enum.collect {| obj | block }  -> array
+ *     enum.map     {| obj | block }  -> array
+ *     enum.collect                   -> an_enumerator
+ *     enum.map                       -> an_enumerator
+ *
  *  Returns a new array with the results of running <em>block</em> once
  *  for every element in <i>enum</i>.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     (1..4).collect {|i| i*i }   #=> [1, 4, 9, 16]
  *     (1..4).collect { "cat"  }   #=> ["cat", "cat", "cat", "cat"]
- *     
+ *
  */
 
 static VALUE
-enum_collect(obj)
-    VALUE obj;
+enum_collect(VALUE obj)
 {
-    VALUE ary = rb_ary_new();
+    VALUE ary;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    ary = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, collect_i, ary);
 
     return ary;
 }
 
+static VALUE
+flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+{
+    VALUE tmp;
+
+    i = enum_yield(argc, argv);
+    tmp = rb_check_array_type(i);
+
+    if (NIL_P(tmp)) {
+	rb_ary_push(ary, i);
+    }
+    else {
+	rb_ary_concat(ary, tmp);
+    }
+    return Qnil;
+}
+
 /*
  *  call-seq:
- *     enum.to_a      =>    array
- *     enum.entries   =>    array
- *  
+ *     enum.flat_map       {| obj | block }  -> array
+ *     enum.collect_concat {| obj | block }  -> array
+ *     enum.flat_map                         -> an_enumerator
+ *     enum.collect_concat                   -> an_enumerator
+ *
+ *  Returns a new array with the concatenated results of running
+ *  <em>block</em> once for every element in <i>enum</i>.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     [[1,2],[3,4]].flat_map {|i| i }   #=> [1, 2, 3, 4]
+ *
+ */
+
+static VALUE
+enum_flat_map(VALUE obj)
+{
+    VALUE ary;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    ary = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, flat_map_i, ary);
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     enum.to_a      ->    array
+ *     enum.entries   ->    array
+ *
  *  Returns an array containing the items in <i>enum</i>.
- *     
+ *
  *     (1..7).to_a                       #=> [1, 2, 3, 4, 5, 6, 7]
  *     { 'a'=>1, 'b'=>2, 'c'=>3 }.to_a   #=> [["a", 1], ["b", 2], ["c", 3]]
  */
 static VALUE
-enum_to_a(obj)
-    VALUE obj;
+enum_to_a(int argc, VALUE *argv, VALUE obj)
 {
     VALUE ary = rb_ary_new();
 
-    rb_iterate(rb_each, obj, collect_all, ary);
+    rb_block_call(obj, id_each, argc, argv, collect_all, ary);
+    OBJ_INFECT(ary, obj);
 
     return ary;
 }
 
 static VALUE
-inject_i(i, memo)
-    VALUE i;
-    VALUE *memo;
+inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
 {
-    if (*memo == Qundef) {
-        *memo = i;
+    VALUE *memo = (VALUE *)p;
+
+    ENUM_WANT_SVALUE();
+
+    if (memo[0] == Qundef) {
+	memo[0] = i;
     }
     else {
-        *memo = rb_yield_values(2, *memo, i);
+	memo[0] = rb_yield_values(2, memo[0], i);
+    }
+    return Qnil;
+}
+
+static VALUE
+inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
+{
+    VALUE *memo = (VALUE *)p;
+
+    ENUM_WANT_SVALUE();
+
+    if (memo[0] == Qundef) {
+	memo[0] = i;
+    }
+    else {
+	memo[0] = rb_funcall(memo[0], (ID)memo[1], 1, i);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.inject(initial) {| memo, obj | block }  => obj
- *     enum.inject          {| memo, obj | block }  => obj
- *  
- *  Combines the elements of <i>enum</i> by applying the block to an
- *  accumulator value (<i>memo</i>) and each element in turn. At each
- *  step, <i>memo</i> is set to the value returned by the block. The
- *  first form lets you supply an initial value for <i>memo</i>. The
- *  second form uses the first element of the collection as a the
- *  initial value (and skips that element while iterating).
- *     
+ *     enum.inject(initial, sym) -> obj
+ *     enum.inject(sym)          -> obj
+ *     enum.inject(initial) {| memo, obj | block }  -> obj
+ *     enum.inject          {| memo, obj | block }  -> obj
+ *
+ *     enum.reduce(initial, sym) -> obj
+ *     enum.reduce(sym)          -> obj
+ *     enum.reduce(initial) {| memo, obj | block }  -> obj
+ *     enum.reduce          {| memo, obj | block }  -> obj
+ *
+ *  Combines all elements of <i>enum</i> by applying a binary
+ *  operation, specified by a block or a symbol that names a
+ *  method or operator.
+ *
+ *  If you specify a block, then for each element in <i>enum</i>
+ *  the block is passed an accumulator value (<i>memo</i>) and the element.
+ *  If you specify a symbol instead, then each element in the collection
+ *  will be passed to the named method of <i>memo</i>.
+ *  In either case, the result becomes the new value for <i>memo</i>.
+ *  At the end of the iteration, the final value of <i>memo</i> is the
+ *  return value fo the method.
+ *
+ *  If you do not explicitly specify an <i>initial</i> value for <i>memo</i>,
+ *  then uses the first element of collection is used as the initial value
+ *  of <i>memo</i>.
+ *
+ *  Examples:
+ *
  *     # Sum some numbers
- *     (5..10).inject {|sum, n| sum + n }              #=> 45
+ *     (5..10).reduce(:+)                            #=> 45
+ *     # Same using a block and inject
+ *     (5..10).inject {|sum, n| sum + n }            #=> 45
  *     # Multiply some numbers
- *     (5..10).inject(1) {|product, n| product * n }   #=> 151200
- *     
+ *     (5..10).reduce(1, :*)                         #=> 151200
+ *     # Same using a block
+ *     (5..10).inject(1) {|product, n| product * n } #=> 151200
  *     # find the longest word
  *     longest = %w{ cat sheep bear }.inject do |memo,word|
  *        memo.length > word.length ? memo : word
  *     end
- *     longest                                         #=> "sheep"
- *     
- *     # find the length of the longest word
- *     longest = %w{ cat sheep bear }.inject(0) do |memo,word|
- *        memo >= word.length ? memo : word.length
- *     end
- *     longest                                         #=> 5
- *     
+ *     longest                                       #=> "sheep"
+ *
  */
-
 static VALUE
-enum_inject(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+enum_inject(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo = Qundef;
-
-    if (rb_scan_args(argc, argv, "01", &memo) == 0)
-	memo = Qundef;
-    rb_iterate(rb_each, obj, inject_i, (VALUE)&memo);
-    if (memo == Qundef) return Qnil;
-    return memo;
+    VALUE memo[2];
+    VALUE (*iter)(VALUE, VALUE, int, VALUE*) = inject_i;
+
+    switch (rb_scan_args(argc, argv, "02", &memo[0], &memo[1])) {
+      case 0:
+	memo[0] = Qundef;
+	break;
+      case 1:
+	if (rb_block_given_p()) {
+	    break;
+	}
+	memo[1] = (VALUE)rb_to_id(memo[0]);
+	memo[0] = Qundef;
+	iter = inject_op_i;
+	break;
+      case 2:
+	if (rb_block_given_p()) {
+	    rb_warning("given block not used");
+	}
+	memo[1] = (VALUE)rb_to_id(memo[1]);
+	iter = inject_op_i;
+	break;
+    }
+    rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo);
+    if (memo[0] == Qundef) return Qnil;
+    return memo[0];
 }
 
 static VALUE
-partition_i(i, ary)
-    VALUE i, *ary;
+partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
 {
+    ENUM_WANT_SVALUE();
+
     if (RTEST(rb_yield(i))) {
 	rb_ary_push(ary[0], i);
     }
@@ -327,129 +603,245 @@ partition_i(i, ary)
 
 /*
  *  call-seq:
- *     enum.partition {| obj | block }  => [ true_array, false_array ]
- *  
+ *     enum.partition {| obj | block }  -> [ true_array, false_array ]
+ *     enum.partition                   -> an_enumerator
+ *
  *  Returns two arrays, the first containing the elements of
  *  <i>enum</i> for which the block evaluates to true, the second
  *  containing the rest.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     (1..6).partition {|i| (i&1).zero?}   #=> [[2, 4, 6], [1, 3, 5]]
- *     
+ *
  */
 
 static VALUE
-enum_partition(obj)
-    VALUE obj;
+enum_partition(VALUE obj)
 {
     VALUE ary[2];
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     ary[0] = rb_ary_new();
     ary[1] = rb_ary_new();
-    rb_iterate(rb_each, obj, partition_i, (VALUE)ary);
+    rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)ary);
 
     return rb_assoc_new(ary[0], ary[1]);
 }
 
+static VALUE
+group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
+{
+    VALUE group;
+    VALUE values;
+
+    ENUM_WANT_SVALUE();
+
+    group = rb_yield(i);
+    values = rb_hash_aref(hash, group);
+    if (NIL_P(values)) {
+	values = rb_ary_new3(1, i);
+	rb_hash_aset(hash, group, values);
+    }
+    else {
+	rb_ary_push(values, i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.group_by {| obj | block }  -> a_hash
+ *     enum.group_by                   -> an_enumerator
+ *
+ *  Returns a hash, which keys are evaluated result from the
+ *  block, and values are arrays of elements in <i>enum</i>
+ *  corresponding to the key.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     (1..6).group_by {|i| i%3}   #=> {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
+ *
+ */
+
+static VALUE
+enum_group_by(VALUE obj)
+{
+    VALUE hash;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    hash = rb_hash_new();
+    rb_block_call(obj, id_each, 0, 0, group_by_i, hash);
+    OBJ_INFECT(hash, obj);
+
+    return hash;
+}
+
+static VALUE
+first_i(VALUE i, VALUE *params, int argc, VALUE *argv)
+{
+    ENUM_WANT_SVALUE();
+
+    if (NIL_P(params[1])) {
+	params[1] = i;
+	rb_iter_break();
+    }
+    else {
+	long n = params[0];
+
+	rb_ary_push(params[1], i);
+	n--;
+	if (n <= 0) {
+	    rb_iter_break();
+	}
+	params[0] = n;
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.first       ->  obj or nil
+ *     enum.first(n)    ->  an_array
+ *
+ *  Returns the first element, or the first +n+ elements, of the enumerable.
+ *  If the enumerable is empty, the first form returns <code>nil</code>, and the
+ *  second form returns an empty array.
+ *
+ */
+
+static VALUE
+enum_first(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE n, params[2];
+
+    if (argc == 0) {
+	params[0] = params[1] = Qnil;
+    }
+    else {
+	long len;
+
+	rb_scan_args(argc, argv, "01", &n);
+	len = NUM2LONG(n);
+	if (len == 0) return rb_ary_new2(0);
+	if (len < 0) {
+	    rb_raise(rb_eArgError, "negative length");
+	}
+	params[0] = len;
+	params[1] = rb_ary_new2(len);
+    }
+    rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)params);
+
+    return params[1];
+}
+
+
 /*
  *  call-seq:
- *     enum.sort                     => array
- *     enum.sort {| a, b | block }   => array
- *  
+ *     enum.sort                     -> array
+ *     enum.sort {| a, b | block }   -> array
+ *
  *  Returns an array containing the items in <i>enum</i> sorted,
  *  either according to their own <code><=></code> method, or by using
  *  the results of the supplied block. The block should return -1, 0, or
  *  +1 depending on the comparison between <i>a</i> and <i>b</i>. As of
  *  Ruby 1.8, the method <code>Enumerable#sort_by</code> implements a
  *  built-in Schwartzian Transform, useful when key computation or
- *  comparison is expensive..
- *     
+ *  comparison is expensive.
+ *
  *     %w(rhea kea flea).sort         #=> ["flea", "kea", "rhea"]
  *     (1..10).sort {|a,b| b <=> a}   #=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
  */
 
 static VALUE
-enum_sort(obj)
-    VALUE obj;
+enum_sort(VALUE obj)
 {
-    return rb_ary_sort(enum_to_a(obj));
+    return rb_ary_sort(enum_to_a(0, 0, obj));
 }
 
 static VALUE
-sort_by_i(i, ary)
-    VALUE i, ary;
+sort_by_i(VALUE i, VALUE ary, int argc, VALUE *argv)
 {
-    VALUE v;
     NODE *memo;
 
-    v = rb_yield(i);
+    ENUM_WANT_SVALUE();
+
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
-    memo = rb_node_newnode(NODE_MEMO, v, i, 0);
+    /* use NODE_DOT2 as memo(v, v, -) */
+    memo = rb_node_newnode(NODE_DOT2, rb_yield(i), i, 0);
     rb_ary_push(ary, (VALUE)memo);
     return Qnil;
 }
 
 static int
-sort_by_cmp(aa, bb)
-    NODE **aa, **bb;
+sort_by_cmp(const void *ap, const void *bp, void *data)
 {
-    VALUE a = aa[0]->u1.value;
-    VALUE b = bb[0]->u1.value;
+    VALUE a = (*(NODE *const *)ap)->u1.value;
+    VALUE b = (*(NODE *const *)bp)->u1.value;
+    VALUE ary = (VALUE)data;
 
+    if (RBASIC(ary)->klass) {
+	rb_raise(rb_eRuntimeError, "sort_by reentered");
+    }
     return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
 }
 
 /*
  *  call-seq:
- *     enum.sort_by {| obj | block }    => array
- *  
+ *     enum.sort_by {| obj | block }    -> array
+ *     enum.sort_by                     -> an_enumerator
+ *
  *  Sorts <i>enum</i> using a set of keys generated by mapping the
  *  values in <i>enum</i> through the given block.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     %w{ apple pear fig }.sort_by {|word| word.length}
-                    #=> ["fig", "pear", "apple"]
- *     
+ *                   #=> ["fig", "pear", "apple"]
+ *
  *  The current implementation of <code>sort_by</code> generates an
  *  array of tuples containing the original collection element and the
  *  mapped value. This makes <code>sort_by</code> fairly expensive when
  *  the keysets are simple
- *     
+ *
  *     require 'benchmark'
- *     include Benchmark
- *     
+ *
  *     a = (1..100000).map {rand(100000)}
- *     
- *     bm(10) do |b|
+ *
+ *     Benchmark.bm(10) do |b|
  *       b.report("Sort")    { a.sort }
  *       b.report("Sort by") { a.sort_by {|a| a} }
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     user     system      total        real
  *     Sort        0.180000   0.000000   0.180000 (  0.175469)
  *     Sort by     1.980000   0.040000   2.020000 (  2.013586)
- *     
+ *
  *  However, consider the case where comparing the keys is a non-trivial
  *  operation. The following code sorts some files on modification time
  *  using the basic <code>sort</code> method.
- *     
+ *
  *     files = Dir["*"]
  *     sorted = files.sort {|a,b| File.new(a).mtime <=> File.new(b).mtime}
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
- *     
+ *
  *  This sort is inefficient: it generates two new <code>File</code>
  *  objects during every comparison. A slightly better technique is to
  *  use the <code>Kernel#test</code> method to generate the modification
  *  times directly.
- *     
+ *
  *     files = Dir["*"]
  *     sorted = files.sort { |a,b|
  *       test(?M, a) <=> test(?M, b)
  *     }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
- *     
+ *
  *  This still generates many unnecessary <code>Time</code> objects. A
  *  more efficient technique is to cache the sort keys (modification
  *  times in this case) before the sort. Perl users often call this
@@ -457,64 +849,73 @@ sort_by_cmp(aa, bb)
  *  construct a temporary array, where each element is an array
  *  containing our sort key along with the filename. We sort this array,
  *  and then extract the filename from the result.
- *     
+ *
  *     sorted = Dir["*"].collect { |f|
  *        [test(?M, f), f]
  *     }.sort.collect { |f| f[1] }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
- *     
+ *
  *  This is exactly what <code>sort_by</code> does internally.
- *     
+ *
  *     sorted = Dir["*"].sort_by {|f| test(?M, f)}
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
  */
 
 static VALUE
-enum_sort_by(obj)
-    VALUE obj;
+enum_sort_by(VALUE obj)
 {
     VALUE ary;
     long i;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     if (TYPE(obj) == T_ARRAY) {
-	ary  = rb_ary_new2(RARRAY(obj)->len);
+	ary  = rb_ary_new2(RARRAY_LEN(obj));
     }
     else {
 	ary = rb_ary_new();
     }
     RBASIC(ary)->klass = 0;
-    rb_iterate(rb_each, obj, sort_by_i, ary);
-    if (RARRAY(ary)->len > 1) {
-	qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp, 0);
+    rb_block_call(obj, id_each, 0, 0, sort_by_i, ary);
+    if (RARRAY_LEN(ary) > 1) {
+	ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary), sizeof(VALUE),
+		   sort_by_cmp, (void *)ary);
     }
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	RARRAY_PTR(ary)[i] = RNODE(RARRAY_PTR(ary)[i])->u2.value;
     }
     RBASIC(ary)->klass = rb_cArray;
-    return ary;
-}
+    OBJ_INFECT(ary, obj);
 
-static VALUE
-all_iter_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    if (!RTEST(rb_yield(i))) {
-	*memo = Qfalse;
-	rb_iter_break();
-    }
-    return Qnil;
+    return ary;
 }
 
-static VALUE
-all_i(i, memo)
-    VALUE i;
-    VALUE *memo;
+#define ENUMFUNC(name) rb_block_given_p() ? name##_iter_i : name##_i
+
+#define DEFINE_ENUMFUNCS(name) \
+static VALUE enum_##name##_func(VALUE result, VALUE *memo); \
+\
+static VALUE \
+name##_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
+{ \
+    return enum_##name##_func(enum_values_pack(argc, argv), memo); \
+} \
+\
+static VALUE \
+name##_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
+{ \
+    return enum_##name##_func(enum_yield(argc, argv), memo); \
+} \
+\
+static VALUE \
+enum_##name##_func(VALUE result, VALUE *memo)
+
+DEFINE_ENUMFUNCS(all)
 {
-    if (!RTEST(i)) {
+    if (!RTEST(result)) {
 	*memo = Qfalse;
 	rb_iter_break();
     }
@@ -523,49 +924,33 @@ all_i(i, memo)
 
 /*
  *  call-seq:
- *     enum.all? [{|obj| block } ]   => true or false
- *  
+ *     enum.all? [{|obj| block } ]   -> true or false
+ *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block never returns
  *  <code>false</code> or <code>nil</code>. If the block is not given,
  *  Ruby adds an implicit block of <code>{|obj| obj}</code> (that is
  *  <code>all?</code> will return <code>true</code> only if none of the
  *  collection members are <code>false</code> or <code>nil</code>.)
- *     
- *     %w{ ant bear cat}.all? {|word| word.length >= 3}   #=> true
- *     %w{ ant bear cat}.all? {|word| word.length >= 4}   #=> false
- *     [ nil, true, 99 ].all?                             #=> false
- *     
+ *
+ *     %w{ant bear cat}.all? {|word| word.length >= 3}   #=> true
+ *     %w{ant bear cat}.all? {|word| word.length >= 4}   #=> false
+ *     [ nil, true, 99 ].all?                            #=> false
+ *
  */
 
 static VALUE
-enum_all(obj)
-    VALUE obj;
+enum_all(VALUE obj)
 {
     VALUE result = Qtrue;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)&result);
     return result;
 }
 
-static VALUE
-any_iter_i(i, memo)
-    VALUE i;
-    VALUE *memo;
+DEFINE_ENUMFUNCS(any)
 {
-    if (RTEST(rb_yield(i))) {
-	*memo = Qtrue;
-	rb_iter_break();
-    }
-    return Qnil;
-}
-
-static VALUE
-any_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    if (RTEST(i)) {
+    if (RTEST(result)) {
 	*memo = Qtrue;
 	rb_iter_break();
     }
@@ -574,8 +959,8 @@ any_i(i, memo)
 
 /*
  *  call-seq:
- *     enum.any? [{|obj| block } ]   => true or false
- *  
+ *     enum.any? [{|obj| block } ]   -> true or false
+ *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block ever returns a value other
  *  than <code>false</code> or <code>nil</code>. If the block is not
@@ -583,30 +968,104 @@ any_i(i, memo)
  *  is <code>any?</code> will return <code>true</code> if at least one
  *  of the collection members is not <code>false</code> or
  *  <code>nil</code>.
- *     
- *     %w{ ant bear cat}.any? {|word| word.length >= 3}   #=> true
- *     %w{ ant bear cat}.any? {|word| word.length >= 4}   #=> true
- *     [ nil, true, 99 ].any?                             #=> true
- *     
+ *
+ *     %w{ant bear cat}.any? {|word| word.length >= 3}   #=> true
+ *     %w{ant bear cat}.any? {|word| word.length >= 4}   #=> true
+ *     [ nil, true, 99 ].any?                            #=> true
+ *
  */
 
 static VALUE
-enum_any(obj)
-    VALUE obj;
+enum_any(VALUE obj)
 {
     VALUE result = Qfalse;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)&result);
+    return result;
+}
+
+DEFINE_ENUMFUNCS(one)
+{
+    if (RTEST(result)) {
+	if (*memo == Qundef) {
+	    *memo = Qtrue;
+	}
+	else if (*memo == Qtrue) {
+	    *memo = Qfalse;
+	    rb_iter_break();
+	}
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.one? [{|obj| block }]   -> true or false
+ *
+ *  Passes each element of the collection to the given block. The method
+ *  returns <code>true</code> if the block returns <code>true</code>
+ *  exactly once. If the block is not given, <code>one?</code> will return
+ *  <code>true</code> only if exactly one of the collection members is
+ *  true.
+ *
+ *     %w{ant bear cat}.one? {|word| word.length == 4}   #=> true
+ *     %w{ant bear cat}.one? {|word| word.length > 4}    #=> false
+ *     %w{ant bear cat}.one? {|word| word.length < 4}    #=> false
+ *     [ nil, true, 99 ].one?                            #=> false
+ *     [ nil, true, false ].one?                         #=> true
+ *
+ */
+
+static VALUE
+enum_one(VALUE obj)
+{
+    VALUE result = Qundef;
+
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)&result);
+    if (result == Qundef) return Qfalse;
     return result;
 }
 
+DEFINE_ENUMFUNCS(none)
+{
+    if (RTEST(result)) {
+	*memo = Qfalse;
+	rb_iter_break();
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.none? [{|obj| block }]   -> true or false
+ *
+ *  Passes each element of the collection to the given block. The method
+ *  returns <code>true</code> if the block never returns <code>true</code>
+ *  for all elements. If the block is not given, <code>none?</code> will return
+ *  <code>true</code> only if none of the collection members is true.
+ *
+ *     %w{ant bear cat}.none? {|word| word.length == 5}  #=> true
+ *     %w{ant bear cat}.none? {|word| word.length >= 4}  #=> false
+ *     [].none?                                          #=> true
+ *     [nil].none?                                       #=> true
+ *     [nil,false].none?                                 #=> true
+ */
 static VALUE
-min_i(i, memo)
-    VALUE i;
-    VALUE *memo;
+enum_none(VALUE obj)
+{
+    VALUE result = Qtrue;
+
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)&result);
+    return result;
+}
+
+static VALUE
+min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
 {
     VALUE cmp;
 
+    ENUM_WANT_SVALUE();
+
     if (*memo == Qundef) {
 	*memo = i;
     }
@@ -620,12 +1079,12 @@ min_i(i, memo)
 }
 
 static VALUE
-min_ii(i, memo)
-    VALUE i;
-    VALUE *memo;
+min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
 {
     VALUE cmp;
 
+    ENUM_WANT_SVALUE();
+
     if (*memo == Qundef) {
 	*memo = i;
     }
@@ -641,50 +1100,40 @@ min_ii(i, memo)
 
 /*
  *  call-seq:
- *     enum.min                    => obj
- *     enum.min {| a,b | block }   => obj
- *  
+ *     enum.min                    -> obj
+ *     enum.min {| a,b | block }   -> obj
+ *
  *  Returns the object in <i>enum</i> with the minimum value. The
  *  first form assumes all objects implement <code>Comparable</code>;
  *  the second uses the block to return <em>a <=> b</em>.
- *     
+ *
  *     a = %w(albatross dog horse)
  *     a.min                                  #=> "albatross"
  *     a.min {|a,b| a.length <=> b.length }   #=> "dog"
  */
 
 static VALUE
-enum_min(obj)
-    VALUE obj;
+enum_min(VALUE obj)
 {
     VALUE result = Qundef;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
+    if (rb_block_given_p()) {
+	rb_block_call(obj, id_each, 0, 0, min_ii, (VALUE)&result);
+    }
+    else {
+	rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)&result);
+    }
     if (result == Qundef) return Qnil;
     return result;
 }
 
-/*
- *  call-seq:
- *     enum.max                    => obj
- *     enum.max {| a,b | block }   => obj
- *  
- *  Returns the object in <i>enum</i> with the maximum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
- *  the second uses the block to return <em>a <=> b</em>.
- *     
- *     a = %w(albatross dog horse)
- *     a.max                                  #=> "horse"
- *     a.max {|a,b| a.length <=> b.length }   #=> "albatross"
- */
-
 static VALUE
-max_i(i, memo)
-    VALUE i;
-    VALUE *memo;
+max_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
 {
     VALUE cmp;
 
+    ENUM_WANT_SVALUE();
+
     if (*memo == Qundef) {
 	*memo = i;
     }
@@ -698,12 +1147,12 @@ max_i(i, memo)
 }
 
 static VALUE
-max_ii(i, memo)
-    VALUE i;
-    VALUE *memo;
+max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
 {
     VALUE cmp;
 
+    ENUM_WANT_SVALUE();
+
     if (*memo == Qundef) {
 	*memo = i;
     }
@@ -718,35 +1167,383 @@ max_ii(i, memo)
 
 /*
  *  call-seq:
- *     enum.max                   => obj
- *     enum.max {|a,b| block }    => obj
- *  
+ *     enum.max                   -> obj
+ *     enum.max {|a,b| block }    -> obj
+ *
  *  Returns the object in _enum_ with the maximum value. The
  *  first form assumes all objects implement <code>Comparable</code>;
  *  the second uses the block to return <em>a <=> b</em>.
- *     
+ *
  *     a = %w(albatross dog horse)
  *     a.max                                  #=> "horse"
  *     a.max {|a,b| a.length <=> b.length }   #=> "albatross"
- */  
+ */
 
 static VALUE
-enum_max(obj)
-    VALUE obj;
+enum_max(VALUE obj)
 {
     VALUE result = Qundef;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
+    if (rb_block_given_p()) {
+	rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)&result);
+    }
+    else {
+	rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)&result);
+    }
     if (result == Qundef) return Qnil;
     return result;
 }
 
+struct minmax_t {
+    VALUE min;
+    VALUE max;
+    VALUE last;
+};
+
+static void
+minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
+{
+    int n;
+
+    if (memo->min == Qundef) {
+	memo->min = i;
+	memo->max = j;
+    }
+    else {
+	n = rb_cmpint(rb_funcall(i, id_cmp, 1, memo->min), i, memo->min);
+	if (n < 0) {
+	    memo->min = i;
+	}
+	n = rb_cmpint(rb_funcall(j, id_cmp, 1, memo->max), j, memo->max);
+	if (n > 0) {
+	    memo->max = j;
+	}
+    }
+}
+
 static VALUE
-member_i(item, memo)
-    VALUE item;
-    VALUE *memo;
+minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
 {
-    if (rb_equal(item, memo[0])) {
+    struct minmax_t *memo = (struct minmax_t *)_memo;
+    int n;
+    VALUE j;
+
+    ENUM_WANT_SVALUE();
+
+    if (memo->last == Qundef) {
+        memo->last = i;
+        return Qnil;
+    }
+    j = memo->last;
+    memo->last = Qundef;
+
+    n = rb_cmpint(rb_funcall(j, id_cmp, 1, i), j, i);
+    if (n == 0)
+        i = j;
+    else if (n < 0) {
+        VALUE tmp;
+        tmp = i;
+        i = j;
+        j = tmp;
+    }
+
+    minmax_i_update(i, j, memo);
+
+    return Qnil;
+}
+
+static void
+minmax_ii_update(VALUE i, VALUE j, struct minmax_t *memo)
+{
+    int n;
+
+    if (memo->min == Qundef) {
+	memo->min = i;
+	memo->max = j;
+    }
+    else {
+	n = rb_cmpint(rb_yield_values(2, i, memo->min), i, memo->min);
+	if (n < 0) {
+	    memo->min = i;
+	}
+	n = rb_cmpint(rb_yield_values(2, j, memo->max), j, memo->max);
+	if (n > 0) {
+	    memo->max = j;
+	}
+    }
+}
+
+static VALUE
+minmax_ii(VALUE i, VALUE _memo, int argc, VALUE *argv)
+{
+    struct minmax_t *memo = (struct minmax_t *)_memo;
+    int n;
+    VALUE j;
+
+    ENUM_WANT_SVALUE();
+
+    if (memo->last == Qundef) {
+        memo->last = i;
+        return Qnil;
+    }
+    j = memo->last;
+    memo->last = Qundef;
+
+    n = rb_cmpint(rb_yield_values(2, j, i), j, i);
+    if (n == 0)
+        i = j;
+    else if (n < 0) {
+        VALUE tmp;
+        tmp = i;
+        i = j;
+        j = tmp;
+    }
+
+    minmax_ii_update(i, j, memo);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.minmax                   -> [min,max]
+ *     enum.minmax {|a,b| block }    -> [min,max]
+ *
+ *  Returns two elements array which contains the minimum and the
+ *  maximum value in the enumerable.  The first form assumes all
+ *  objects implement <code>Comparable</code>; the second uses the
+ *  block to return <em>a <=> b</em>.
+ *
+ *     a = %w(albatross dog horse)
+ *     a.minmax                                  #=> ["albatross", "horse"]
+ *     a.minmax {|a,b| a.length <=> b.length }   #=> ["dog", "albatross"]
+ */
+
+static VALUE
+enum_minmax(VALUE obj)
+{
+    struct minmax_t memo;
+    VALUE ary = rb_ary_new3(2, Qnil, Qnil);
+
+    memo.min = Qundef;
+    memo.last = Qundef;
+    if (rb_block_given_p()) {
+	rb_block_call(obj, id_each, 0, 0, minmax_ii, (VALUE)&memo);
+        if (memo.last != Qundef)
+            minmax_ii_update(memo.last, memo.last, &memo);
+    }
+    else {
+	rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)&memo);
+        if (memo.last != Qundef)
+            minmax_i_update(memo.last, memo.last, &memo);
+    }
+    if (memo.min != Qundef) {
+        rb_ary_store(ary, 0, memo.min);
+        rb_ary_store(ary, 1, memo.max);
+    }
+    return ary;
+}
+
+static VALUE
+min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+{
+    VALUE v;
+
+    ENUM_WANT_SVALUE();
+
+    v = rb_yield(i);
+    if (memo[0] == Qundef) {
+	memo[0] = v;
+	memo[1] = i;
+    }
+    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) < 0) {
+	memo[0] = v;
+	memo[1] = i;
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.min_by {|obj| block }   -> obj
+ *     enum.min_by                  -> an_enumerator
+ *
+ *  Returns the object in <i>enum</i> that gives the minimum
+ *  value from the given block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = %w(albatross dog horse)
+ *     a.min_by {|x| x.length }   #=> "dog"
+ */
+
+static VALUE
+enum_min_by(VALUE obj)
+{
+    VALUE memo[2];
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    memo[0] = Qundef;
+    memo[1] = Qnil;
+    rb_block_call(obj, id_each, 0, 0, min_by_i, (VALUE)memo);
+    return memo[1];
+}
+
+static VALUE
+max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+{
+    VALUE v;
+
+    ENUM_WANT_SVALUE();
+
+    v = rb_yield(i);
+    if (memo[0] == Qundef) {
+	memo[0] = v;
+	memo[1] = i;
+    }
+    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) > 0) {
+	memo[0] = v;
+	memo[1] = i;
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.max_by {|obj| block }   -> obj
+ *     enum.max_by                  -> an_enumerator
+ *
+ *  Returns the object in <i>enum</i> that gives the maximum
+ *  value from the given block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = %w(albatross dog horse)
+ *     a.max_by {|x| x.length }   #=> "albatross"
+ */
+
+static VALUE
+enum_max_by(VALUE obj)
+{
+    VALUE memo[2];
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    memo[0] = Qundef;
+    memo[1] = Qnil;
+    rb_block_call(obj, id_each, 0, 0, max_by_i, (VALUE)memo);
+    return memo[1];
+}
+
+struct minmax_by_t {
+    VALUE min_bv;
+    VALUE max_bv;
+    VALUE min;
+    VALUE max;
+    VALUE last_bv;
+    VALUE last;
+};
+
+static void
+minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *memo)
+{
+    if (memo->min_bv == Qundef) {
+	memo->min_bv = v1;
+	memo->max_bv = v2;
+	memo->min = i1;
+	memo->max = i2;
+    }
+    else {
+	if (rb_cmpint(rb_funcall(v1, id_cmp, 1, memo->min_bv), v1, memo->min_bv) < 0) {
+	    memo->min_bv = v1;
+	    memo->min = i1;
+	}
+	if (rb_cmpint(rb_funcall(v2, id_cmp, 1, memo->max_bv), v2, memo->max_bv) > 0) {
+	    memo->max_bv = v2;
+	    memo->max = i2;
+	}
+    }
+}
+
+static VALUE
+minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
+{
+    struct minmax_by_t *memo = (struct minmax_by_t *)_memo;
+    VALUE vi, vj, j;
+    int n;
+
+    ENUM_WANT_SVALUE();
+
+    vi = rb_yield(i);
+
+    if (memo->last_bv == Qundef) {
+        memo->last_bv = vi;
+        memo->last = i;
+        return Qnil;
+    }
+    vj = memo->last_bv;
+    j = memo->last;
+    memo->last_bv = Qundef;
+
+    n = rb_cmpint(rb_funcall(vj, id_cmp, 1, vi), vj, vi);
+    if (n == 0) {
+        i = j;
+        vi = vj;
+    }
+    else if (n < 0) {
+        VALUE tmp;
+        tmp = i;
+        i = j;
+        j = tmp;
+        tmp = vi;
+        vi = vj;
+        vj = tmp;
+    }
+
+    minmax_by_i_update(vi, vj, i, j, memo);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.minmax_by {|obj| block }   -> [min, max]
+ *     enum.minmax_by                  -> an_enumerator
+ *
+ *  Returns two elements array array containing the objects in
+ *  <i>enum</i> that gives the minimum and maximum values respectively
+ *  from the given block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = %w(albatross dog horse)
+ *     a.minmax_by {|x| x.length }   #=> ["dog", "albatross"]
+ */
+
+static VALUE
+enum_minmax_by(VALUE obj)
+{
+    struct minmax_by_t memo;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    memo.min_bv = Qundef;
+    memo.max_bv = Qundef;
+    memo.min = Qnil;
+    memo.max = Qnil;
+    memo.last_bv = Qundef;
+    memo.last = Qundef;
+    rb_block_call(obj, id_each, 0, 0, minmax_by_i, (VALUE)&memo);
+    if (memo.last_bv != Qundef)
+        minmax_by_i_update(memo.last_bv, memo.last_bv, memo.last, memo.last, &memo);
+    return rb_assoc_new(memo.min, memo.max);
+}
+
+static VALUE
+member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
+{
+    if (rb_equal(enum_values_pack(argc, argv), memo[0])) {
 	memo[1] = Qtrue;
 	rb_iter_break();
     }
@@ -755,82 +1552,348 @@ member_i(item, memo)
 
 /*
  *  call-seq:
- *     enum.include?(obj)     => true or false
- *     enum.member?(obj)      => true or false
- *  
+ *     enum.include?(obj)     -> true or false
+ *     enum.member?(obj)      -> true or false
+ *
  *  Returns <code>true</code> if any member of <i>enum</i> equals
  *  <i>obj</i>. Equality is tested using <code>==</code>.
- *     
- *     IO.constants.include? "SEEK_SET"          #=> true
- *     IO.constants.include? "SEEK_NO_FURTHER"   #=> false
- *     
+ *
+ *     IO.constants.include? :SEEK_SET          #=> true
+ *     IO.constants.include? :SEEK_NO_FURTHER   #=> false
+ *
  */
 
 static VALUE
-enum_member(obj, val)
-    VALUE obj, val;
+enum_member(VALUE obj, VALUE val)
 {
     VALUE memo[2];
 
     memo[0] = val;
     memo[1] = Qfalse;
-    rb_iterate(rb_each, obj, member_i, (VALUE)memo);
+    rb_block_call(obj, id_each, 0, 0, member_i, (VALUE)memo);
     return memo[1];
 }
 
 static VALUE
-each_with_index_i(val, memo)
-    VALUE val;
-    VALUE *memo;
+each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
 {
-    rb_yield_values(2, val, INT2FIX(*memo));
-    ++*memo;
-    return Qnil;
+    long n = (*(VALUE *)memo)++;
+
+    return rb_yield_values(2, enum_values_pack(argc, argv), INT2NUM(n));
 }
 
 /*
  *  call-seq:
- *     enum.each_with_index {|obj, i| block }  -> enum
- *  
- *  Calls <em>block</em> with two arguments, the item and its index, for
- *  each item in <i>enum</i>.
- *     
+ *     enum.each_with_index(*args) {|obj, i| block }   ->  enum
+ *     enum.each_with_index(*args)                     ->  an_enumerator
+ *
+ *  Calls <em>block</em> with two arguments, the item and its index,
+ *  for each item in <i>enum</i>.  Given arguments are passed through
+ *  to #each().
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     hash = Hash.new
  *     %w(cat dog wombat).each_with_index {|item, index|
  *       hash[item] = index
  *     }
- *     hash   #=> {"cat"=>0, "wombat"=>2, "dog"=>1}
- *     
+ *     hash   #=> {"cat"=>0, "dog"=>1, "wombat"=>2}
+ *
  */
 
 static VALUE
-enum_each_with_index(obj)
-    VALUE obj;
+enum_each_with_index(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo = 0;
+    long memo;
+
+    RETURN_ENUMERATOR(obj, argc, argv);
 
-    rb_need_block();
-    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
+    memo = 0;
+    rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)&memo);
     return obj;
 }
 
+
+/*
+ *  call-seq:
+ *     enum.reverse_each(*args) {|item| block }   ->  enum
+ *     enum.reverse_each(*args)                   ->  an_enumerator
+ *
+ *  Builds a temporary array and traverses that array in reverse order.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ */
+
 static VALUE
-zip_i(val, memo)
-    VALUE val;
-    VALUE *memo;
+enum_reverse_each(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE result = memo[0];
-    VALUE args = memo[1];
-    int idx = memo[2]++;
-    VALUE tmp;
+    VALUE ary;
+    long i;
+
+    RETURN_ENUMERATOR(obj, argc, argv);
+
+    ary = enum_to_a(argc, argv, obj);
+
+    for (i = RARRAY_LEN(ary); --i >= 0; ) {
+	rb_yield(RARRAY_PTR(ary)[i]);
+    }
+
+    return obj;
+}
+
+
+static VALUE
+each_val_i(VALUE i, VALUE p, int argc, VALUE *argv)
+{
+    ENUM_WANT_SVALUE();
+    rb_yield(i);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.each_entry {|obj| block}  -> enum
+ *     enum.each_entry                -> an_enumerator
+ *
+ *  Calls <i>block</i> once for each element in +self+, passing that
+ *  element as a parameter, converting multiple values from yield to an
+ *  array.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     class Foo
+ *       include Enumerable
+ *       def each
+ *         yield 1
+ *         yield 1,2
+ *       end
+ *     end
+ *     Foo.new.each_entry{|o| print o, " -- "}
+ *
+ *  produces:
+ *
+ *     1 -- [1, 2] --
+ */
+
+static VALUE
+enum_each_entry(int argc, VALUE *argv, VALUE obj)
+{
+    RETURN_ENUMERATOR(obj, argc, argv);
+    rb_block_call(obj, id_each, argc, argv, each_val_i, 0);
+    return obj;
+}
+
+static VALUE
+each_slice_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+{
+    VALUE ary = memo[0];
+    VALUE v = Qnil;
+    long size = (long)memo[1];
+    ENUM_WANT_SVALUE();
+
+    rb_ary_push(ary, i);
+
+    if (RARRAY_LEN(ary) == size) {
+	v = rb_yield(ary);
+	memo[0] = rb_ary_new2(size);
+    }
+
+    return v;
+}
+
+/*
+ *  call-seq:
+ *    enum.each_slice(n) {...}  ->  nil
+ *    enum.each_slice(n)        ->  an_enumerator
+ *
+ *  Iterates the given block for each slice of <n> elements.  If no
+ *  block is given, returns an enumerator.
+ *
+ *  e.g.:
+ *      (1..10).each_slice(3) {|a| p a}
+ *      # outputs below
+ *      [1, 2, 3]
+ *      [4, 5, 6]
+ *      [7, 8, 9]
+ *      [10]
+ *
+ */
+static VALUE
+enum_each_slice(VALUE obj, VALUE n)
+{
+    long size = NUM2LONG(n);
+    VALUE args[2], ary;
+
+    if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
+    RETURN_ENUMERATOR(obj, 1, &n);
+    args[0] = rb_ary_new2(size);
+    args[1] = (VALUE)size;
+
+    rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)args);
+
+    ary = args[0];
+    if (RARRAY_LEN(ary) > 0) rb_yield(ary);
+
+    return Qnil;
+}
+
+static VALUE
+each_cons_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+{
+    VALUE ary = memo[0];
+    VALUE v = Qnil;
+    long size = (long)memo[1];
+    ENUM_WANT_SVALUE();
+
+    if (RARRAY_LEN(ary) == size) {
+	rb_ary_shift(ary);
+    }
+    rb_ary_push(ary, i);
+    if (RARRAY_LEN(ary) == size) {
+	v = rb_yield(rb_ary_dup(ary));
+    }
+    return v;
+}
+
+/*
+ *  call-seq:
+ *    enum.each_cons(n) {...}   ->  nil
+ *    enum.each_cons(n)         ->  an_enumerator
+ *
+ *  Iterates the given block for each array of consecutive <n>
+ *  elements.  If no block is given, returns an enumerator.
+ *
+ *  e.g.:
+ *      (1..10).each_cons(3) {|a| p a}
+ *      # outputs below
+ *      [1, 2, 3]
+ *      [2, 3, 4]
+ *      [3, 4, 5]
+ *      [4, 5, 6]
+ *      [5, 6, 7]
+ *      [6, 7, 8]
+ *      [7, 8, 9]
+ *      [8, 9, 10]
+ *
+ */
+static VALUE
+enum_each_cons(VALUE obj, VALUE n)
+{
+    long size = NUM2LONG(n);
+    VALUE args[2];
+
+    if (size <= 0) rb_raise(rb_eArgError, "invalid size");
+    RETURN_ENUMERATOR(obj, 1, &n);
+    args[0] = rb_ary_new2(size);
+    args[1] = (VALUE)size;
+
+    rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)args);
+
+    return Qnil;
+}
+
+static VALUE
+each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv)
+{
+    ENUM_WANT_SVALUE();
+    return rb_yield_values(2, i, memo);
+}
+
+/*
+ *  call-seq:
+ *    enum.each_with_object(obj) {|(*args), memo_obj| ... }  ->  obj
+ *    enum.each_with_object(obj)                             ->  an_enumerator
+ *
+ *  Iterates the given block for each element with an arbitrary
+ *  object given, and returns the initially given object.
+ *
+ *  If no block is given, returns an enumerator.
+ *
+ *  e.g.:
+ *      evens = (1..10).each_with_object([]) {|i, a| a << i*2 }
+ *      #=> [2, 4, 6, 8, 10, 12, 14, 16, 18, 20]
+ *
+ */
+static VALUE
+enum_each_with_object(VALUE obj, VALUE memo)
+{
+    RETURN_ENUMERATOR(obj, 1, &memo);
+
+    rb_block_call(obj, id_each, 0, 0, each_with_object_i, memo);
+
+    return memo;
+}
+
+static VALUE
+zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv)
+{
+    volatile VALUE result = memo->u1.value;
+    volatile VALUE args = memo->u2.value;
+    long n = memo->u3.cnt++;
+    volatile VALUE tmp;
     int i;
 
-    tmp = rb_ary_new2(RARRAY(args)->len + 1);
-    rb_ary_store(tmp, 0, val);
-    for (i=0; i<RARRAY(args)->len; i++) {
-	rb_ary_push(tmp, rb_ary_entry(RARRAY(args)->ptr[i], idx));
+    tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
+    rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
+    for (i=0; i<RARRAY_LEN(args); i++) {
+	VALUE e = RARRAY_PTR(args)[i];
+
+	if (RARRAY_LEN(e) <= n) {
+	    rb_ary_push(tmp, Qnil);
+	}
+	else {
+	    rb_ary_push(tmp, RARRAY_PTR(e)[n]);
+	}
     }
-    if (rb_block_given_p()) {
+    if (NIL_P(result)) {
+	rb_yield(tmp);
+    }
+    else {
+	rb_ary_push(result, tmp);
+    }
+    return Qnil;
+}
+
+static VALUE
+call_next(VALUE *v)
+{
+    return v[0] = rb_funcall(v[1], id_next, 0, 0);
+}
+
+static VALUE
+call_stop(VALUE *v)
+{
+    return v[0] = Qundef;
+}
+
+static VALUE
+zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
+{
+    volatile VALUE result = memo->u1.value;
+    volatile VALUE args = memo->u2.value;
+    volatile VALUE tmp;
+    int i;
+
+    tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
+    rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
+    for (i=0; i<RARRAY_LEN(args); i++) {
+	if (NIL_P(RARRAY_PTR(args)[i])) {
+	    rb_ary_push(tmp, Qnil);
+	}
+	else {
+	    VALUE v[2];
+
+	    v[1] = RARRAY_PTR(args)[i];
+	    rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, 0);
+	    if (v[0] == Qundef) {
+		RARRAY_PTR(args)[i] = Qnil;
+		v[0] = Qnil;
+	    }
+	    rb_ary_push(tmp, v[0]);
+	}
+    }
+    if (NIL_P(result)) {
 	rb_yield(tmp);
     }
     else {
@@ -841,49 +1904,693 @@ zip_i(val, memo)
 
 /*
  *  call-seq:
- *     enum.zip(arg, ...)                   => array
- *     enum.zip(arg, ...) {|arr| block }    => nil
- *  
- *  Converts any arguments to arrays, then merges elements of
- *  <i>enum</i> with corresponding elements from each argument. This
- *  generates a sequence of <code>enum#size</code> <em>n</em>-element
- *  arrays, where <em>n</em> is one more that the count of arguments. If
- *  the size of any argument is less than <code>enum#size</code>,
- *  <code>nil</code> values are supplied. If a block given, it is
- *  invoked for each output array, otherwise an array of arrays is
- *  returned.
- *     
+ *     enum.zip(arg, ...)                   -> an_array_of_array
+ *     enum.zip(arg, ...) {|arr| block }    -> nil
+ *
+ *  Takes one element from <i>enum</i> and merges corresponding
+ *  elements from each <i>args</i>.  This generates a sequence of
+ *  <em>n</em>-element arrays, where <em>n</em> is one more than the
+ *  count of arguments.  The length of the resulting sequence will be
+ *  <code>enum#size</code>.  If the size of any argument is less than
+ *  <code>enum#size</code>, <code>nil</code> values are supplied. If
+ *  a block is given, it is invoked for each output array, otherwise
+ *  an array of arrays is returned.
+ *
  *     a = [ 4, 5, 6 ]
  *     b = [ 7, 8, 9 ]
- *     
- *     (1..3).zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- *     "cat\ndog".zip([1])   #=> [["cat\n", 1], ["dog", nil]]
- *     (1..3).zip            #=> [[1], [2], [3]]
- *     
+ *
+ *     [1,2,3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
+ *     [1,2].zip(a,b)         #=> [[1, 4, 7], [2, 5, 8]]
+ *     a.zip([1,2],[8])       #=> [[4, 1, 8], [5, 2, nil], [6, nil, nil]]
+ *
  */
 
 static VALUE
-enum_zip(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+enum_zip(int argc, VALUE *argv, VALUE obj)
 {
     int i;
-    VALUE result;
-    VALUE memo[3];
+    ID conv;
+    NODE *memo;
+    VALUE result = Qnil;
+    VALUE args = rb_ary_new4(argc, argv);
+    int allary = TRUE;
 
+    argv = RARRAY_PTR(args);
     for (i=0; i<argc; i++) {
-	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
+	VALUE ary = rb_check_array_type(argv[i]);
+	if (NIL_P(ary)) {
+	    allary = FALSE;
+	    break;
+	}
+	argv[i] = ary;
+    }
+    if (!allary) {
+	CONST_ID(conv, "to_enum");
+	for (i=0; i<argc; i++) {
+	    argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
+	}
+    }
+    if (!rb_block_given_p()) {
+	result = rb_ary_new();
     }
-    result = rb_block_given_p() ? Qnil : rb_ary_new();
-    memo[0] = result;
-    memo[1] = rb_ary_new4(argc, argv);
-    memo[2] = 0;
-    rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
+    /* use NODE_DOT2 as memo(v, v, -) */
+    memo = rb_node_newnode(NODE_DOT2, result, args, 0);
+    rb_block_call(obj, id_each, 0, 0, allary ? zip_ary : zip_i, (VALUE)memo);
 
     return result;
 }
 
+static VALUE
+take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+{
+    rb_ary_push(arg[0], enum_values_pack(argc, argv));
+    if (--arg[1] == 0) rb_iter_break();
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.take(n)               -> array
+ *
+ *  Returns first n elements from <i>enum</i>.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.take(3)             #=> [1, 2, 3]
+ *
+ */
+
+static VALUE
+enum_take(VALUE obj, VALUE n)
+{
+    VALUE args[2];
+    long len = NUM2LONG(n);
+
+    if (len < 0) {
+	rb_raise(rb_eArgError, "attempt to take negative size");
+    }
+
+    if (len == 0) return rb_ary_new2(0);
+    args[0] = rb_ary_new();
+    args[1] = len;
+    rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)args);
+    return args[0];
+}
+
+
+static VALUE
+take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+{
+    if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
+    rb_ary_push(*ary, enum_values_pack(argc, argv));
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.take_while {|arr| block }   -> array
+ *     enum.take_while                  -> an_enumerator
+ *
+ *  Passes elements to the block until the block returns +nil+ or +false+,
+ *  then stops iterating and returns an array of all prior elements.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.take_while {|i| i < 3 }   #=> [1, 2]
+ *
+ */
+
+static VALUE
+enum_take_while(VALUE obj)
+{
+    VALUE ary;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+    ary = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, take_while_i, (VALUE)&ary);
+    return ary;
+}
+
+static VALUE
+drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+{
+    if (arg[1] == 0) {
+	rb_ary_push(arg[0], enum_values_pack(argc, argv));
+    }
+    else {
+	arg[1]--;
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.drop(n)               -> array
+ *
+ *  Drops first n elements from <i>enum</i>, and returns rest elements
+ *  in an array.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.drop(3)             #=> [4, 5, 0]
+ *
+ */
+
+static VALUE
+enum_drop(VALUE obj, VALUE n)
+{
+    VALUE args[2];
+    long len = NUM2LONG(n);
+
+    if (len < 0) {
+	rb_raise(rb_eArgError, "attempt to drop negative size");
+    }
+
+    args[1] = len;
+    args[0] = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, drop_i, (VALUE)args);
+    return args[0];
+}
+
+
+static VALUE
+drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
+{
+    ENUM_WANT_SVALUE();
+
+    if (!args[1] && !RTEST(rb_yield(i))) {
+	args[1] = Qtrue;
+    }
+    if (args[1]) {
+	rb_ary_push(args[0], i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.drop_while {|arr| block }   -> array
+ *     enum.drop_while                  -> an_enumerator
+ *
+ *  Drops elements up to, but not including, the first element for
+ *  which the block returns +nil+ or +false+ and returns an array
+ *  containing the remaining elements.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = [1, 2, 3, 4, 5, 0]
+ *     a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
+ *
+ */
+
+static VALUE
+enum_drop_while(VALUE obj)
+{
+    VALUE args[2];
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+    args[0] = rb_ary_new();
+    args[1] = Qfalse;
+    rb_block_call(obj, id_each, 0, 0, drop_while_i, (VALUE)args);
+    return args[0];
+}
+
+static VALUE
+cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+{
+    ENUM_WANT_SVALUE();
+
+    rb_ary_push(ary, i);
+    rb_yield(i);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.cycle(n=nil) {|obj| block }   ->  nil
+ *     enum.cycle(n=nil)                  ->  an_enumerator
+ *
+ *  Calls <i>block</i> for each element of <i>enum</i> repeatedly _n_
+ *  times or forever if none or +nil+ is given.  If a non-positive
+ *  number is given or the collection is empty, does nothing.  Returns
+ *  +nil+ if the loop has finished without getting interrupted.
+ *
+ *  Enumerable#cycle saves elements in an internal array so changes
+ *  to <i>enum</i> after the first pass have no effect.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = ["a", "b", "c"]
+ *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
+ *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
+ *
+ */
+
+static VALUE
+enum_cycle(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE ary;
+    VALUE nv = Qnil;
+    long n, i, len;
+
+    rb_scan_args(argc, argv, "01", &nv);
+
+    RETURN_ENUMERATOR(obj, argc, argv);
+    if (NIL_P(nv)) {
+        n = -1;
+    }
+    else {
+        n = NUM2LONG(nv);
+        if (n <= 0) return Qnil;
+    }
+    ary = rb_ary_new();
+    RBASIC(ary)->klass = 0;
+    rb_block_call(obj, id_each, 0, 0, cycle_i, ary);
+    len = RARRAY_LEN(ary);
+    if (len == 0) return Qnil;
+    while (n < 0 || 0 < --n) {
+        for (i=0; i<len; i++) {
+            rb_yield(RARRAY_PTR(ary)[i]);
+        }
+    }
+    return Qnil;
+}
+
+struct chunk_arg {
+    VALUE categorize;
+    VALUE state;
+    VALUE prev_value;
+    VALUE prev_elts;
+    VALUE yielder;
+};
+
+static VALUE
+chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
+{
+    struct chunk_arg *argp = (struct chunk_arg *)_argp;
+    VALUE v;
+    VALUE alone = ID2SYM(rb_intern("_alone"));
+    VALUE separator = ID2SYM(rb_intern("_separator"));
+
+    ENUM_WANT_SVALUE();
+
+    if (NIL_P(argp->state))
+        v = rb_funcall(argp->categorize, rb_intern("call"), 1, i);
+    else
+        v = rb_funcall(argp->categorize, rb_intern("call"), 2, i, argp->state);
+
+    if (v == alone) {
+        if (!NIL_P(argp->prev_value)) {
+            rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+            argp->prev_value = argp->prev_elts = Qnil;
+        }
+        rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(v, rb_ary_new3(1, i)));
+    }
+    else if (NIL_P(v) || v == separator) {
+        if (!NIL_P(argp->prev_value)) {
+            rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+            argp->prev_value = argp->prev_elts = Qnil;
+        }
+    }
+    else if (SYMBOL_P(v) && rb_id2name(SYM2ID(v))[0] == '_') {
+	rb_raise(rb_eRuntimeError, "symbol begins with an underscore is reserved");
+    }
+    else {
+        if (NIL_P(argp->prev_value)) {
+            argp->prev_value = v;
+            argp->prev_elts = rb_ary_new3(1, i);
+        }
+        else {
+            if (rb_equal(argp->prev_value, v)) {
+                rb_ary_push(argp->prev_elts, i);
+            }
+            else {
+                rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+                argp->prev_value = v;
+                argp->prev_elts = rb_ary_new3(1, i);
+            }
+        }
+    }
+    return Qnil;
+}
+
+static VALUE
+chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
+{
+    VALUE enumerable;
+    struct chunk_arg arg;
+
+    enumerable = rb_ivar_get(enumerator, rb_intern("chunk_enumerable"));
+    arg.categorize = rb_ivar_get(enumerator, rb_intern("chunk_categorize"));
+    arg.state = rb_ivar_get(enumerator, rb_intern("chunk_initial_state"));
+    arg.prev_value = Qnil;
+    arg.prev_elts = Qnil;
+    arg.yielder = yielder;
+
+    if (!NIL_P(arg.state))
+        arg.state = rb_obj_dup(arg.state);
+
+    rb_block_call(enumerable, id_each, 0, 0, chunk_ii, (VALUE)&arg);
+    if (!NIL_P(arg.prev_elts))
+        rb_funcall(arg.yielder, rb_intern("<<"), 1, rb_assoc_new(arg.prev_value, arg.prev_elts));
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.chunk {|elt| ... }                       -> an_enumerator
+ *     enum.chunk(initial_state) {|elt, state| ... } -> an_enumerator
+ *
+ *  Creates an enumerator for each chunked elements.
+ *  The consecutive elements which have same block value are chunked.
+ *
+ *  The result enumerator yields the block value and an array of chunked elements.
+ *  So "each" method can be called as follows.
+ *
+ *    enum.chunk {|elt| key }.each {|key, ary| ... }
+ *    enum.chunk(initial_state) {|elt, state| key }.each {|key, ary| ... }
+ *
+ *  For example, consecutive even numbers and odd numbers can be
+ *  splitted as follows.
+ *
+ *    [3,1,4,1,5,9,2,6,5,3,5].chunk {|n|
+ *      n.even?
+ *    }.each {|even, ary|
+ *      p [even, ary]
+ *    }
+ *    #=> [false, [3, 1]]
+ *    #   [true, [4]]
+ *    #   [false, [1, 5, 9]]
+ *    #   [true, [2, 6]]
+ *    #   [false, [5, 3, 5]]
+ *
+ *  This method is especially useful for sorted series of elements.
+ *  The following example counts words for each initial letter.
+ *
+ *    open("/usr/share/dict/words", "r:iso-8859-1") {|f|
+ *      f.chunk {|line| line.ord }.each {|ch, lines| p [ch.chr, lines.length] }
+ *    }
+ *    #=> ["\n", 1]
+ *    #   ["A", 1327]
+ *    #   ["B", 1372]
+ *    #   ["C", 1507]
+ *    #   ["D", 791]
+ *    #   ...
+ *
+ *  The following key values has special meaning:
+ *  - nil and :_separator specifies that the elements are dropped.
+ *  - :_alone specifies that the element should be chunked as a singleton.
+ *  Other symbols which begins an underscore are reserved.
+ *
+ *  nil and :_separator can be used to ignore some elements.
+ *  For example, the sequence of hyphens in svn log can be eliminated as follows.
+ *
+ *    sep = "-"*72 + "\n"
+ *    IO.popen("svn log README") {|f|
+ *      f.chunk {|line|
+ *        line != sep || nil
+ *      }.each {|_, lines|
+ *        pp lines
+ *      }
+ *    }
+ *    #=> ["r20018 | knu | 2008-10-29 13:20:42 +0900 (Wed, 29 Oct 2008) | 2 lines\n",
+ *    #    "\n",
+ *    #    "* README, README.ja: Update the portability section.\n",
+ *    #    "\n"]
+ *    #   ["r16725 | knu | 2008-05-31 23:34:23 +0900 (Sat, 31 May 2008) | 2 lines\n",
+ *    #    "\n",
+ *    #    "* README, README.ja: Add a note about default C flags.\n",
+ *    #    "\n"]
+ *    #   ...
+ *
+ *  paragraphs separated by empty lines can be parsed as follows.
+ *
+ *    File.foreach("README").chunk {|line|
+ *      /\A\s*\z/ !~ line || nil
+ *    }.each {|_, lines|
+ *      pp lines
+ *    }
+ *
+ *  :_alone can be used to pass through bunch of elements.
+ *  For example, sort consecutive lines formed as Foo#bar and
+ *  pass other lines, chunk can be used as follows.
+ *
+ *    pat = /\A[A-Z][A-Za-z0-9_]+\#/
+ *    open(filename) {|f|
+ *      f.chunk {|line| pat =~ line ? $& : :_alone }.each {|key, lines|
+ *        if key != :_alone
+ *          print lines.sort.join('')
+ *        else
+ *          print lines.join('')
+ *        end
+ *      }
+ *    }
+ *
+ *  If the block needs to maintain state over multiple elements,
+ *  _initial_state_ argument can be used.
+ *  If non-nil value is given,
+ *  it is duplicated for each "each" method invocation of the enumerator.
+ *  The duplicated object is passed to 2nd argument of the block for "chunk" method.
+ *
+ */
+static VALUE
+enum_chunk(int argc, VALUE *argv, VALUE enumerable)
+{
+    VALUE initial_state;
+    VALUE enumerator;
+
+    if(!rb_block_given_p())
+	rb_raise(rb_eArgError, "no block given");
+    rb_scan_args(argc, argv, "01", &initial_state);
+
+    enumerator = rb_obj_alloc(rb_cEnumerator);
+    rb_ivar_set(enumerator, rb_intern("chunk_enumerable"), enumerable);
+    rb_ivar_set(enumerator, rb_intern("chunk_categorize"), rb_block_proc());
+    rb_ivar_set(enumerator, rb_intern("chunk_initial_state"), initial_state);
+    rb_block_call(enumerator, rb_intern("initialize"), 0, 0, chunk_i, enumerator);
+    return enumerator;
+}
+
+
+struct slicebefore_arg {
+    VALUE sep_pred;
+    VALUE sep_pat;
+    VALUE state;
+    VALUE prev_elts;
+    VALUE yielder;
+};
+
+static VALUE
+slicebefore_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
+{
+    struct slicebefore_arg *argp = (struct slicebefore_arg *)_argp;
+    VALUE header_p;
+
+    ENUM_WANT_SVALUE();
+
+    if (!NIL_P(argp->sep_pat))
+        header_p = rb_funcall(argp->sep_pat, id_eqq, 1, i);
+    else if (NIL_P(argp->state))
+        header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 1, i);
+    else
+        header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 2, i, argp->state);
+    if (RTEST(header_p)) {
+        if (!NIL_P(argp->prev_elts))
+            rb_funcall(argp->yielder, rb_intern("<<"), 1, argp->prev_elts);
+        argp->prev_elts = rb_ary_new3(1, i);
+    }
+    else {
+        if (NIL_P(argp->prev_elts))
+            argp->prev_elts = rb_ary_new3(1, i);
+        else
+            rb_ary_push(argp->prev_elts, i);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
+{
+    VALUE enumerable;
+    struct slicebefore_arg arg;
+
+    enumerable = rb_ivar_get(enumerator, rb_intern("slicebefore_enumerable"));
+    arg.sep_pred = rb_attr_get(enumerator, rb_intern("slicebefore_sep_pred"));
+    arg.sep_pat = NIL_P(arg.sep_pred) ? rb_ivar_get(enumerator, rb_intern("slicebefore_sep_pat")) : Qnil;
+    arg.state = rb_ivar_get(enumerator, rb_intern("slicebefore_initial_state"));
+    arg.prev_elts = Qnil;
+    arg.yielder = yielder;
+
+    if (!NIL_P(arg.state))
+        arg.state = rb_obj_dup(arg.state);
+
+    rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, (VALUE)&arg);
+    if (!NIL_P(arg.prev_elts))
+        rb_funcall(arg.yielder, rb_intern("<<"), 1, arg.prev_elts);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.slice_before(pattern)                            -> an_enumerator
+ *     enum.slice_before {|elt| bool }                       -> an_enumerator
+ *     enum.slice_before(initial_state) {|elt, state| bool } -> an_enumerator
+ *
+ *  Creates an enumerator for each chunked elements.
+ *  The beginnings of chunks are defined by _pattern_ and the block.
+ *  If _pattern_ === _elt_ returns true or
+ *  the block returns true for the element,
+ *  the element is beginning of a chunk.
+ *
+ *  The === and block is called from the first element to the last element
+ *  of _enum_.
+ *  The result for the first element is ignored.
+ *
+ *  The result enumerator yields the chunked elements as an array for +each+
+ *  method.
+ *  +each+ method can be called as follows.
+ *
+ *    enum.slice_before(pattern).each {|ary| ... }
+ *    enum.slice_before {|elt| bool }.each {|ary| ... }
+ *    enum.slice_before(initial_state) {|elt, state| bool }.each {|ary| ... }
+ *
+ *  Other methods of Enumerator class and Enumerable module,
+ *  such as map, etc., are also usable.
+ *
+ *  For example, iteration over ChangeLog entries can be implemented as
+ *  follows.
+ *
+ *    # iterate over ChangeLog entries.
+ *    open("ChangeLog") {|f|
+ *      f.slice_before(/\A\S/).each {|e| pp e}
+ *    }
+ *
+ *    # same as above.  block is used instead of pattern argument.
+ *    open("ChangeLog") {|f|
+ *      f.slice_before {|line| /\A\S/ === line }.each {|e| pp e}
+ *    }
+ *
+ * "svn proplist -R" produces multiline output for each file.
+ * They can be chunked as follows:
+ *
+ *    IO.popen([{"LC_ALL"=>"C"}, "svn", "proplist", "-R"]) {|f|
+ *      f.lines.slice_before(/\AProp/).each {|lines| p lines }
+ *    }
+ *    #=> ["Properties on '.':\n", "  svn:ignore\n", "  svk:merge\n"]
+ *    #   ["Properties on 'goruby.c':\n", "  svn:eol-style\n"]
+ *    #   ["Properties on 'complex.c':\n", "  svn:mime-type\n", "  svn:eol-style\n"]
+ *    #   ["Properties on 'regparse.c':\n", "  svn:eol-style\n"]
+ *    #   ...
+ *
+ *  If the block needs to maintain state over multiple elements,
+ *  local variables can be used.
+ *  For example, three or more consecutive increasing numbers can be squashed
+ *  as follows:
+ *
+ *    a = [0,2,3,4,6,7,9]
+ *    prev = a[0]
+ *    p a.slice_before {|e|
+ *      prev, prev2 = e, prev
+ *      prev2 + 1 != e
+ *    }.map {|es|
+ *      es.length <= 2 ? es.join(",") : "#{es.first}-#{es.last}"
+ *    }.join(",")
+ *    #=> "0,2-4,6,7,9"
+ *
+ *  However local variables are not appropriate to maintain state
+ *  if the result enumerator is used twice or more.
+ *  In such case, the last state of the 1st +each+ is used in 2nd +each+.
+ *  _initial_state_ argument can be used to avoid this problem.
+ *  If non-nil value is given as _initial_state_,
+ *  it is duplicated for each "each" method invocation of the enumerator.
+ *  The duplicated object is passed to 2nd argument of the block for
+ *  +slice_before+ method.
+ *
+ *    # word wrapping.
+ *    # this assumes all characters have same width.
+ *    def wordwrap(words, maxwidth)
+ *      # if cols is a local variable, 2nd "each" may start with non-zero cols.
+ *      words.slice_before(cols: 0) {|w, h|
+ *        h[:cols] += 1 if h[:cols] != 0
+ *        h[:cols] += w.length
+ *        if maxwidth < h[:cols]
+ *          h[:cols] = w.length
+ *          true
+ *        else
+ *          false
+ *        end
+ *      }
+ *    end
+ *    text = (1..20).to_a.join(" ")
+ *    enum = wordwrap(text.split(/\s+/), 10)
+ *    puts "-"*10
+ *    enum.each {|ws| puts ws.join(" ") }
+ *    puts "-"*10
+ *    #=> ----------
+ *    #   1 2 3 4 5
+ *    #   6 7 8 9 10
+ *    #   11 12 13
+ *    #   14 15 16
+ *    #   17 18 19
+ *    #   20
+ *    #   ----------
+ *
+ * mbox contains series of mails which start with Unix From line.
+ * So each mail can be extracted by slice before Unix From line.
+ *
+ *    # parse mbox
+ *    open("mbox") {|f|
+ *      f.slice_before {|line|
+ *        line.start_with? "From "
+ *      }.each {|mail|
+ *        unix_from = mail.shift
+ *        i = mail.index("\n")
+ *        header = mail[0...i]
+ *        body = mail[(i+1)..-1]
+ *        body.pop if body.last == "\n"
+ *        fields = header.slice_before {|line| !" \t".include?(line[0]) }.to_a
+ *        p unix_from
+ *        pp fields
+ *        pp body
+ *      }
+ *    }
+ *
+ *    # split mails in mbox (slice before Unix From line after an empty line)
+ *    open("mbox") {|f|
+ *      f.slice_before(emp: true) {|line,h|
+ *        prevemp = h[:emp]
+ *        h[:emp] = line == "\n"
+ *        prevemp && line.start_with?("From ")
+ *      }.each {|mail|
+ *        mail.pop if mail.last == "\n"
+ *        pp mail
+ *      }
+ *    }
+ *
+ */
+static VALUE
+enum_slice_before(int argc, VALUE *argv, VALUE enumerable)
+{
+    VALUE enumerator;
+
+    if (rb_block_given_p()) {
+        VALUE initial_state;
+        rb_scan_args(argc, argv, "01", &initial_state);
+        enumerator = rb_obj_alloc(rb_cEnumerator);
+        rb_ivar_set(enumerator, rb_intern("slicebefore_sep_pred"), rb_block_proc());
+        rb_ivar_set(enumerator, rb_intern("slicebefore_initial_state"), initial_state);
+    }
+    else {
+        VALUE sep_pat;
+        rb_scan_args(argc, argv, "1", &sep_pat);
+        enumerator = rb_obj_alloc(rb_cEnumerator);
+        rb_ivar_set(enumerator, rb_intern("slicebefore_sep_pat"), sep_pat);
+    }
+    rb_ivar_set(enumerator, rb_intern("slicebefore_enumerable"), enumerable);
+    rb_block_call(enumerator, rb_intern("initialize"), 0, 0, slicebefore_i, enumerator);
+    return enumerator;
+}
+
 /*
  *  The <code>Enumerable</code> mixin provides collection classes with
  *  several traversal and searching methods, and with the ability to
@@ -896,36 +2603,66 @@ enum_zip(argc, argv, obj)
  */
 
 void
-Init_Enumerable()
+Init_Enumerable(void)
 {
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
     rb_mEnumerable = rb_define_module("Enumerable");
 
-    rb_define_method(rb_mEnumerable,"to_a", enum_to_a, 0);
-    rb_define_method(rb_mEnumerable,"entries", enum_to_a, 0);
-
-    rb_define_method(rb_mEnumerable,"sort", enum_sort, 0);
-    rb_define_method(rb_mEnumerable,"sort_by", enum_sort_by, 0);
-    rb_define_method(rb_mEnumerable,"grep", enum_grep, 1);
-    rb_define_method(rb_mEnumerable,"find", enum_find, -1);
-    rb_define_method(rb_mEnumerable,"detect", enum_find, -1);
-    rb_define_method(rb_mEnumerable,"find_all", enum_find_all, 0);
-    rb_define_method(rb_mEnumerable,"select", enum_find_all, 0);
-    rb_define_method(rb_mEnumerable,"reject", enum_reject, 0);
-    rb_define_method(rb_mEnumerable,"collect", enum_collect, 0);
-    rb_define_method(rb_mEnumerable,"map", enum_collect, 0);
-    rb_define_method(rb_mEnumerable,"inject", enum_inject, -1);
-    rb_define_method(rb_mEnumerable,"partition", enum_partition, 0);
-    rb_define_method(rb_mEnumerable,"all?", enum_all, 0);
-    rb_define_method(rb_mEnumerable,"any?", enum_any, 0);
-    rb_define_method(rb_mEnumerable,"min", enum_min, 0);
-    rb_define_method(rb_mEnumerable,"max", enum_max, 0);
-    rb_define_method(rb_mEnumerable,"member?", enum_member, 1);
-    rb_define_method(rb_mEnumerable,"include?", enum_member, 1);
-    rb_define_method(rb_mEnumerable,"each_with_index", enum_each_with_index, 0);
+    rb_define_method(rb_mEnumerable, "to_a", enum_to_a, -1);
+    rb_define_method(rb_mEnumerable, "entries", enum_to_a, -1);
+
+    rb_define_method(rb_mEnumerable, "sort", enum_sort, 0);
+    rb_define_method(rb_mEnumerable, "sort_by", enum_sort_by, 0);
+    rb_define_method(rb_mEnumerable, "grep", enum_grep, 1);
+    rb_define_method(rb_mEnumerable, "count", enum_count, -1);
+    rb_define_method(rb_mEnumerable, "find", enum_find, -1);
+    rb_define_method(rb_mEnumerable, "detect", enum_find, -1);
+    rb_define_method(rb_mEnumerable, "find_index", enum_find_index, -1);
+    rb_define_method(rb_mEnumerable, "find_all", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable, "select", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable, "reject", enum_reject, 0);
+    rb_define_method(rb_mEnumerable, "collect", enum_collect, 0);
+    rb_define_method(rb_mEnumerable, "map", enum_collect, 0);
+    rb_define_method(rb_mEnumerable, "flat_map", enum_flat_map, 0);
+    rb_define_method(rb_mEnumerable, "collect_concat", enum_flat_map, 0);
+    rb_define_method(rb_mEnumerable, "inject", enum_inject, -1);
+    rb_define_method(rb_mEnumerable, "reduce", enum_inject, -1);
+    rb_define_method(rb_mEnumerable, "partition", enum_partition, 0);
+    rb_define_method(rb_mEnumerable, "group_by", enum_group_by, 0);
+    rb_define_method(rb_mEnumerable, "first", enum_first, -1);
+    rb_define_method(rb_mEnumerable, "all?", enum_all, 0);
+    rb_define_method(rb_mEnumerable, "any?", enum_any, 0);
+    rb_define_method(rb_mEnumerable, "one?", enum_one, 0);
+    rb_define_method(rb_mEnumerable, "none?", enum_none, 0);
+    rb_define_method(rb_mEnumerable, "min", enum_min, 0);
+    rb_define_method(rb_mEnumerable, "max", enum_max, 0);
+    rb_define_method(rb_mEnumerable, "minmax", enum_minmax, 0);
+    rb_define_method(rb_mEnumerable, "min_by", enum_min_by, 0);
+    rb_define_method(rb_mEnumerable, "max_by", enum_max_by, 0);
+    rb_define_method(rb_mEnumerable, "minmax_by", enum_minmax_by, 0);
+    rb_define_method(rb_mEnumerable, "member?", enum_member, 1);
+    rb_define_method(rb_mEnumerable, "include?", enum_member, 1);
+    rb_define_method(rb_mEnumerable, "each_with_index", enum_each_with_index, -1);
+    rb_define_method(rb_mEnumerable, "reverse_each", enum_reverse_each, -1);
+    rb_define_method(rb_mEnumerable, "each_entry", enum_each_entry, -1);
+    rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
+    rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
+    rb_define_method(rb_mEnumerable, "each_with_object", enum_each_with_object, 1);
     rb_define_method(rb_mEnumerable, "zip", enum_zip, -1);
+    rb_define_method(rb_mEnumerable, "take", enum_take, 1);
+    rb_define_method(rb_mEnumerable, "take_while", enum_take_while, 0);
+    rb_define_method(rb_mEnumerable, "drop", enum_drop, 1);
+    rb_define_method(rb_mEnumerable, "drop_while", enum_drop_while, 0);
+    rb_define_method(rb_mEnumerable, "cycle", enum_cycle, -1);
+    rb_define_method(rb_mEnumerable, "chunk", enum_chunk, -1);
+    rb_define_method(rb_mEnumerable, "slice_before", enum_slice_before, -1);
 
     id_eqq  = rb_intern("===");
     id_each = rb_intern("each");
     id_cmp  = rb_intern("<=>");
+    id_next = rb_intern("next");
+    id_size = rb_intern("size");
 }
 
diff --git a/enumerator.c b/enumerator.c
new file mode 100644
index 0000000000..bdf3bb80d2
--- /dev/null
+++ b/enumerator.c
@@ -0,0 +1,1120 @@
+/************************************************
+
+  enumerator.c - provides Enumerator class
+
+  $Author$
+
+  Copyright (C) 2001-2003 Akinori MUSHA
+
+  $Idaemons: /home/cvs/rb/enumerator/enumerator.c,v 1.1.1.1 2001/07/15 10:12:48 knu Exp $
+  $RoughId: enumerator.c,v 1.6 2003/07/27 11:03:24 nobu Exp $
+  $Id$
+
+************************************************/
+
+#include "ruby/ruby.h"
+
+/*
+ * Document-class: Enumerator
+ *
+ * A class which provides a method `each' to be used as an Enumerable
+ * object.
+ *
+ * An enumerator can be created by following methods.
+ * - Kernel#to_enum
+ * - Kernel#enum_for
+ * - Enumerator.new
+ *
+ * Also, most iteration methods without a block returns an enumerator.
+ * For example, Array#map returns an enumerator if a block is not given.
+ * The enumerator has the with_index method.
+ * So ary.map.with_index works as follows.
+ *
+ *   p %w[foo bar baz].map.with_index {|w,i| "#{i}:#{w}" }
+ *   #=> ["0:foo", "1:bar", "2:baz"]
+ *
+ * An enumerator object can be used as an external iterator.
+ * I.e.  Enumerator#next returns the next value of the iterator.
+ * Enumerator#next raises StopIteration at end.
+ *
+ *   e = [1,2,3].each   # returns an enumerator object.
+ *   p e.next   #=> 1
+ *   p e.next   #=> 2
+ *   p e.next   #=> 3
+ *   p e.next   #raises StopIteration
+ *
+ * An external iterator can be used to implement an internal iterator as follows.
+ *
+ *   def ext_each(e)
+ *     while true
+ *       begin
+ *         vs = e.next_values
+ *       rescue StopIteration
+ *         return $!.result
+ *       end
+ *       y = yield(*vs)
+ *       e.feed y
+ *     end
+ *   end
+ *
+ *   o = Object.new
+ *   def o.each
+ *     p yield
+ *     p yield(1)
+ *     p yield(1, 2)
+ *     3
+ *   end
+ *
+ *   # use o.each as an internal iterator directly.
+ *   p o.each {|*x| p x; [:b, *x] }
+ *   #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
+ *
+ *   # convert o.each to an external iterator for
+ *   # implementing an internal iterator.
+ *   p ext_each(o.to_enum) {|*x| p x; [:b, *x] }
+ *   #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
+ *
+ */
+VALUE rb_cEnumerator;
+static ID id_rewind, id_each;
+static VALUE sym_each;
+
+VALUE rb_eStopIteration;
+
+struct enumerator {
+    VALUE obj;
+    ID    meth;
+    VALUE args;
+    VALUE fib;
+    VALUE dst;
+    VALUE lookahead;
+    VALUE feedvalue;
+    VALUE stop_exc;
+};
+
+static VALUE rb_cGenerator, rb_cYielder;
+
+struct generator {
+    VALUE proc;
+};
+
+struct yielder {
+    VALUE proc;
+};
+
+static VALUE generator_allocate(VALUE klass);
+static VALUE generator_init(VALUE obj, VALUE proc);
+
+/*
+ * Enumerator
+ */
+static void
+enumerator_mark(void *p)
+{
+    struct enumerator *ptr = p;
+    rb_gc_mark(ptr->obj);
+    rb_gc_mark(ptr->args);
+    rb_gc_mark(ptr->fib);
+    rb_gc_mark(ptr->dst);
+    rb_gc_mark(ptr->lookahead);
+    rb_gc_mark(ptr->feedvalue);
+    rb_gc_mark(ptr->stop_exc);
+}
+
+#define enumerator_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+enumerator_memsize(const void *p)
+{
+    return p ? sizeof(struct enumerator) : 0;
+}
+
+static const rb_data_type_t enumerator_data_type = {
+    "enumerator",
+    enumerator_mark,
+    enumerator_free,
+    enumerator_memsize,
+};
+
+static struct enumerator *
+enumerator_ptr(VALUE obj)
+{
+    struct enumerator *ptr;
+
+    TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, ptr);
+    if (!ptr || ptr->obj == Qundef) {
+	rb_raise(rb_eArgError, "uninitialized enumerator");
+    }
+    return ptr;
+}
+
+/*
+ *  call-seq:
+ *    obj.to_enum(method = :each, *args)
+ *    obj.enum_for(method = :each, *args)
+ *
+ *  Returns Enumerator.new(self, method, *args).
+ *
+ *  e.g.:
+ *
+ *     str = "xyz"
+ *
+ *     enum = str.enum_for(:each_byte)
+ *     a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
+ *
+ *     # protects an array from being modified
+ *     a = [1, 2, 3]
+ *     some_method(a.to_enum)
+ *
+ */
+static VALUE
+obj_to_enum(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE meth = sym_each;
+
+    if (argc > 0) {
+	--argc;
+	meth = *argv++;
+    }
+    return rb_enumeratorize(obj, meth, argc, argv);
+}
+
+static VALUE
+enumerator_allocate(VALUE klass)
+{
+    struct enumerator *ptr;
+    VALUE enum_obj;
+
+    enum_obj = TypedData_Make_Struct(klass, struct enumerator, &enumerator_data_type, ptr);
+    ptr->obj = Qundef;
+
+    return enum_obj;
+}
+
+static VALUE
+enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
+{
+    struct enumerator *ptr;
+
+    TypedData_Get_Struct(enum_obj, struct enumerator, &enumerator_data_type, ptr);
+
+    if (!ptr) {
+	rb_raise(rb_eArgError, "unallocated enumerator");
+    }
+
+    ptr->obj  = obj;
+    ptr->meth = rb_to_id(meth);
+    if (argc) ptr->args = rb_ary_new4(argc, argv);
+    ptr->fib = 0;
+    ptr->dst = Qnil;
+    ptr->lookahead = Qundef;
+    ptr->feedvalue = Qundef;
+    ptr->stop_exc = Qfalse;
+
+    return enum_obj;
+}
+
+/*
+ *  call-seq:
+ *    Enumerator.new(obj, method = :each, *args)
+ *    Enumerator.new { |y| ... }
+ *
+ *  Creates a new Enumerator object, which is to be used as an
+ *  Enumerable object iterating in a given way.
+ *
+ *  In the first form, a generated Enumerator iterates over the given
+ *  object using the given method with the given arguments passed.
+ *  Use of this form is discouraged.  Use Kernel#enum_for(), alias
+ *  to_enum, instead.
+ *
+ *    e = Enumerator.new(ObjectSpace, :each_object)
+ *        #-> ObjectSpace.enum_for(:each_object)
+ *
+ *    e.select { |obj| obj.is_a?(Class) }  #=> array of all classes
+ *
+ *  In the second form, iteration is defined by the given block, in
+ *  which a "yielder" object given as block parameter can be used to
+ *  yield a value by calling the +yield+ method, alias +<<+.
+ *
+ *    fib = Enumerator.new { |y|
+ *      a = b = 1
+ *      loop {
+ *        y << a
+ *        a, b = b, a + b
+ *      }
+ *    }
+ *
+ *    p fib.take(10) #=> [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
+ */
+static VALUE
+enumerator_initialize(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE recv, meth = sym_each;
+
+    if (argc == 0) {
+	if (!rb_block_given_p())
+	    rb_raise(rb_eArgError, "wrong number of argument (0 for 1+)");
+
+	recv = generator_init(generator_allocate(rb_cGenerator), rb_block_proc());
+    }
+    else {
+	recv = *argv++;
+	if (--argc) {
+	    meth = *argv++;
+	    --argc;
+	}
+    }
+
+    return enumerator_init(obj, recv, meth, argc, argv);
+}
+
+/* :nodoc: */
+static VALUE
+enumerator_init_copy(VALUE obj, VALUE orig)
+{
+    struct enumerator *ptr0, *ptr1;
+
+    ptr0 = enumerator_ptr(orig);
+    if (ptr0->fib) {
+	/* Fibers cannot be copied */
+	rb_raise(rb_eTypeError, "can't copy execution context");
+    }
+
+    TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, ptr1);
+
+    if (!ptr1) {
+	rb_raise(rb_eArgError, "unallocated enumerator");
+    }
+
+    ptr1->obj  = ptr0->obj;
+    ptr1->meth = ptr0->meth;
+    ptr1->args = ptr0->args;
+    ptr1->fib  = 0;
+    ptr1->lookahead  = Qundef;
+    ptr1->feedvalue  = Qundef;
+
+    return obj;
+}
+
+VALUE
+rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
+{
+    return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv);
+}
+
+static VALUE
+enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg)
+{
+    int argc = 0;
+    VALUE *argv = 0;
+    const struct enumerator *e = enumerator_ptr(obj);
+    ID meth = e->meth;
+
+    if (e->args) {
+	argc = RARRAY_LENINT(e->args);
+	argv = RARRAY_PTR(e->args);
+    }
+    return rb_block_call(e->obj, meth, argc, argv, func, arg);
+}
+
+/*
+ *  call-seq:
+ *    enum.each {...}
+ *
+ *  Iterates the given block using the object and the method specified
+ *  in the first place.  If no block is given, returns self.
+ *
+ */
+static VALUE
+enumerator_each(VALUE obj)
+{
+    if (!rb_block_given_p()) return obj;
+    return enumerator_block_call(obj, 0, obj);
+}
+
+static VALUE
+enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv)
+{
+    VALUE idx;
+    VALUE *memo = (VALUE *)m;
+
+    idx = INT2FIX(*memo);
+    ++*memo;
+
+    if (argc <= 1)
+	return rb_yield_values(2, val, idx);
+
+    return rb_yield_values(2, rb_ary_new4(argc, argv), idx);
+}
+
+/*
+ *  call-seq:
+ *    e.with_index(offset = 0) {|(*args), idx| ... }
+ *    e.with_index(offset = 0)
+ *
+ *  Iterates the given block for each element with an index, which
+ *  starts from +offset+.  If no block is given, returns an enumerator.
+ *
+ */
+static VALUE
+enumerator_with_index(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE memo;
+
+    rb_scan_args(argc, argv, "01", &memo);
+    RETURN_ENUMERATOR(obj, argc, argv);
+    memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo);
+    return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo);
+}
+
+/*
+ *  call-seq:
+ *    e.each_with_index {|(*args), idx| ... }
+ *    e.each_with_index
+ *
+ *  Same as Enumerator#with_index, except each_with_index does not
+ *  receive an offset argument.
+ *
+ */
+static VALUE
+enumerator_each_with_index(VALUE obj)
+{
+    return enumerator_with_index(0, NULL, obj);
+}
+
+static VALUE
+enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv)
+{
+    if (argc <= 1)
+	return rb_yield_values(2, val, memo);
+
+    return rb_yield_values(2, rb_ary_new4(argc, argv), memo);
+}
+
+/*
+ *  call-seq:
+ *    e.with_object(obj) {|(*args), memo_obj| ... }
+ *    e.with_object(obj)
+ *
+ *  Iterates the given block for each element with an arbitrary
+ *  object given, and returns the initially given object.
+ *
+ *  If no block is given, returns an enumerator.
+ *
+ */
+static VALUE
+enumerator_with_object(VALUE obj, VALUE memo)
+{
+    RETURN_ENUMERATOR(obj, 1, &memo);
+    enumerator_block_call(obj, enumerator_with_object_i, memo);
+
+    return memo;
+}
+
+static VALUE
+next_ii(VALUE i, VALUE obj, int argc, VALUE *argv)
+{
+    struct enumerator *e = enumerator_ptr(obj);
+    VALUE feedvalue = Qnil;
+    VALUE args = rb_ary_new4(argc, argv);
+    rb_fiber_yield(1, &args);
+    if (e->feedvalue != Qundef) {
+        feedvalue = e->feedvalue;
+        e->feedvalue = Qundef;
+    }
+    return feedvalue;
+}
+
+static VALUE
+next_i(VALUE curr, VALUE obj)
+{
+    struct enumerator *e = enumerator_ptr(obj);
+    VALUE nil = Qnil;
+    VALUE result;
+
+    result = rb_block_call(obj, id_each, 0, 0, next_ii, obj);
+    e->stop_exc = rb_exc_new2(rb_eStopIteration, "iteration reached an end");
+    rb_ivar_set(e->stop_exc, rb_intern("result"), result);
+    return rb_fiber_yield(1, &nil);
+}
+
+static void
+next_init(VALUE obj, struct enumerator *e)
+{
+    VALUE curr = rb_fiber_current();
+    e->dst = curr;
+    e->fib = rb_fiber_new(next_i, obj);
+    e->lookahead = Qundef;
+}
+
+static VALUE
+get_next_values(VALUE obj, struct enumerator *e)
+{
+    VALUE curr, vs;
+
+    if (e->stop_exc)
+	rb_exc_raise(e->stop_exc);
+
+    curr = rb_fiber_current();
+
+    if (!e->fib || !rb_fiber_alive_p(e->fib)) {
+	next_init(obj, e);
+    }
+
+    vs = rb_fiber_resume(e->fib, 1, &curr);
+    if (e->stop_exc) {
+	e->fib = 0;
+	e->dst = Qnil;
+	e->lookahead = Qundef;
+	e->feedvalue = Qundef;
+	rb_exc_raise(e->stop_exc);
+    }
+    return vs;
+}
+
+/*
+ * call-seq:
+ *   e.next_values   -> array
+ *
+ * Returns the next object as an array in the enumerator,
+ * and move the internal position forward.
+ * When the position reached at the end, StopIteration is raised.
+ *
+ * This method can be used to distinguish <code>yield</code> and <code>yield nil</code>.
+ *
+ *   o = Object.new
+ *   def o.each
+ *     yield
+ *     yield 1
+ *     yield 1, 2
+ *     yield nil
+ *     yield [1, 2]
+ *   end
+ *   e = o.to_enum
+ *   p e.next_values
+ *   p e.next_values
+ *   p e.next_values
+ *   p e.next_values
+ *   p e.next_values
+ *   e = o.to_enum
+ *   p e.next
+ *   p e.next
+ *   p e.next
+ *   p e.next
+ *   p e.next
+ *
+ *   ## yield args       next_values      next
+ *   #  yield            []               nil
+ *   #  yield 1          [1]              1
+ *   #  yield 1, 2       [1, 2]           [1, 2]
+ *   #  yield nil        [nil]            nil
+ *   #  yield [1, 2]     [[1, 2]]         [1, 2]
+ *
+ * Note that enumeration sequence by next_values method does not affect other
+ * non-external enumeration methods, unless underlying iteration
+ * methods itself has side-effect, e.g. IO#each_line.
+ *
+ */
+
+static VALUE
+enumerator_next_values(VALUE obj)
+{
+    struct enumerator *e = enumerator_ptr(obj);
+    VALUE vs;
+
+    if (e->lookahead != Qundef) {
+        vs = e->lookahead;
+        e->lookahead = Qundef;
+        return vs;
+    }
+
+    return get_next_values(obj, e);
+}
+
+static VALUE
+ary2sv(VALUE args, int dup)
+{
+    if (TYPE(args) != T_ARRAY)
+        return args;
+
+    switch (RARRAY_LEN(args)) {
+      case 0:
+        return Qnil;
+
+      case 1:
+        return RARRAY_PTR(args)[0];
+
+      default:
+        if (dup)
+            return rb_ary_dup(args);
+        return args;
+    }
+}
+
+/*
+ * call-seq:
+ *   e.next   -> object
+ *
+ * Returns the next object in the enumerator, and move the internal
+ * position forward.  When the position reached at the end, StopIteration
+ * is raised.
+ *
+ *   a = [1,2,3]
+ *   e = a.to_enum
+ *   p e.next   #=> 1
+ *   p e.next   #=> 2
+ *   p e.next   #=> 3
+ *   p e.next   #raises StopIteration
+ *
+ * Note that enumeration sequence by next method does not affect other
+ * non-external enumeration methods, unless underlying iteration
+ * methods itself has side-effect, e.g. IO#each_line.
+ *
+ */
+
+static VALUE
+enumerator_next(VALUE obj)
+{
+    VALUE vs = enumerator_next_values(obj);
+    return ary2sv(vs, 0);
+}
+
+static VALUE
+enumerator_peek_values(VALUE obj)
+{
+    struct enumerator *e = enumerator_ptr(obj);
+
+    if (e->lookahead == Qundef) {
+        e->lookahead = get_next_values(obj, e);
+    }
+    return e->lookahead;
+}
+
+/*
+ * call-seq:
+ *   e.peek_values   -> array
+ *
+ * Returns the next object as an array in the enumerator,
+ * but don't move the internal position forward.
+ * When the position reached at the end, StopIteration is raised.
+ *
+ *   o = Object.new
+ *   def o.each
+ *     yield
+ *     yield 1
+ *     yield 1, 2
+ *   end
+ *   e = o.to_enum
+ *   p e.peek_values    #=> []
+ *   e.next
+ *   p e.peek_values    #=> [1]
+ *   p e.peek_values    #=> [1]
+ *   e.next
+ *   p e.peek_values    #=> [1, 2]
+ *   e.next
+ *   p e.peek_values    # raises StopIteration
+ *
+ */
+
+static VALUE
+enumerator_peek_values_m(VALUE obj)
+{
+    return rb_ary_dup(enumerator_peek_values(obj));
+}
+
+/*
+ * call-seq:
+ *   e.peek   -> object
+ *
+ * Returns the next object in the enumerator, but don't move the internal
+ * position forward.  When the position reached at the end, StopIteration
+ * is raised.
+ *
+ *   a = [1,2,3]
+ *   e = a.to_enum
+ *   p e.next   #=> 1
+ *   p e.peek   #=> 2
+ *   p e.peek   #=> 2
+ *   p e.peek   #=> 2
+ *   p e.next   #=> 2
+ *   p e.next   #=> 3
+ *   p e.next   #raises StopIteration
+ *
+ */
+
+static VALUE
+enumerator_peek(VALUE obj)
+{
+    VALUE vs = enumerator_peek_values(obj);
+    return ary2sv(vs, 1);
+}
+
+/*
+ * call-seq:
+ *   e.feed obj   -> nil
+ *
+ * Set the value for the next yield in the enumerator returns.
+ *
+ * If the value is not set, the yield returns nil.
+ *
+ * This value is cleared after used.
+ *
+ *   o = Object.new
+ *   def o.each
+ *     # (2)
+ *     x = yield
+ *     p x          #=> "foo"
+ *     # (5)
+ *     x = yield
+ *     p x          #=> nil
+ *     # (7)
+ *     x = yield
+ *     # not reached
+ *     p x
+ *   end
+ *   e = o.to_enum
+ *   # (1)
+ *   e.next
+ *   # (3)
+ *   e.feed "foo"
+ *   # (4)
+ *   e.next
+ *   # (6)
+ *   e.next
+ *   # (8)
+ *
+ */
+
+static VALUE
+enumerator_feed(VALUE obj, VALUE v)
+{
+    struct enumerator *e = enumerator_ptr(obj);
+
+    if (e->feedvalue != Qundef) {
+	rb_raise(rb_eTypeError, "feed value already set");
+    }
+    e->feedvalue = v;
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   e.rewind   -> e
+ *
+ * Rewinds the enumeration sequence by the next method.
+ *
+ * If the enclosed object responds to a "rewind" method, it is called.
+ */
+
+static VALUE
+enumerator_rewind(VALUE obj)
+{
+    struct enumerator *e = enumerator_ptr(obj);
+
+    rb_check_funcall(e->obj, id_rewind, 0, 0);
+
+    e->fib = 0;
+    e->dst = Qnil;
+    e->lookahead = Qundef;
+    e->feedvalue = Qundef;
+    e->stop_exc = Qfalse;
+    return obj;
+}
+
+static VALUE
+inspect_enumerator(VALUE obj, VALUE dummy, int recur)
+{
+    struct enumerator *e;
+    const char *cname;
+    VALUE eobj, str;
+    int tainted, untrusted;
+
+    TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, e);
+
+    cname = rb_obj_classname(obj);
+
+    if (!e || e->obj == Qundef) {
+	return rb_sprintf("#<%s: uninitialized>", cname);
+    }
+
+    if (recur) {
+	str = rb_sprintf("#<%s: ...>", cname);
+	OBJ_TAINT(str);
+	return str;
+    }
+
+    eobj = e->obj;
+
+    tainted   = OBJ_TAINTED(eobj);
+    untrusted = OBJ_UNTRUSTED(eobj);
+
+    /* (1..100).each_cons(2) => "#<Enumerator: 1..100:each_cons(2)>" */
+    str = rb_sprintf("#<%s: ", cname);
+    rb_str_concat(str, rb_inspect(eobj));
+    rb_str_buf_cat2(str, ":");
+    rb_str_buf_cat2(str, rb_id2name(e->meth));
+
+    if (e->args) {
+	long   argc = RARRAY_LEN(e->args);
+	VALUE *argv = RARRAY_PTR(e->args);
+
+	rb_str_buf_cat2(str, "(");
+
+	while (argc--) {
+	    VALUE arg = *argv++;
+
+	    rb_str_concat(str, rb_inspect(arg));
+	    rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
+
+	    if (OBJ_TAINTED(arg)) tainted = TRUE;
+	    if (OBJ_UNTRUSTED(arg)) untrusted = TRUE;
+	}
+    }
+
+    rb_str_buf_cat2(str, ">");
+
+    if (tainted) OBJ_TAINT(str);
+    if (untrusted) OBJ_UNTRUST(str);
+    return str;
+}
+
+/*
+ * call-seq:
+ *   e.inspect  -> string
+ *
+ *  Create a printable version of <i>e</i>.
+ */
+
+static VALUE
+enumerator_inspect(VALUE obj)
+{
+    return rb_exec_recursive(inspect_enumerator, obj, 0);
+}
+
+/*
+ * Yielder
+ */
+static void
+yielder_mark(void *p)
+{
+    struct yielder *ptr = p;
+    rb_gc_mark(ptr->proc);
+}
+
+#define yielder_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+yielder_memsize(const void *p)
+{
+    return p ? sizeof(struct yielder) : 0;
+}
+
+static const rb_data_type_t yielder_data_type = {
+    "yielder",
+    yielder_mark,
+    yielder_free,
+    yielder_memsize,
+};
+
+static struct yielder *
+yielder_ptr(VALUE obj)
+{
+    struct yielder *ptr;
+
+    TypedData_Get_Struct(obj, struct yielder, &yielder_data_type, ptr);
+    if (!ptr || ptr->proc == Qundef) {
+	rb_raise(rb_eArgError, "uninitialized yielder");
+    }
+    return ptr;
+}
+
+/* :nodoc: */
+static VALUE
+yielder_allocate(VALUE klass)
+{
+    struct yielder *ptr;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct yielder, &yielder_data_type, ptr);
+    ptr->proc = Qundef;
+
+    return obj;
+}
+
+static VALUE
+yielder_init(VALUE obj, VALUE proc)
+{
+    struct yielder *ptr;
+
+    TypedData_Get_Struct(obj, struct yielder, &yielder_data_type, ptr);
+
+    if (!ptr) {
+	rb_raise(rb_eArgError, "unallocated yielder");
+    }
+
+    ptr->proc = proc;
+
+    return obj;
+}
+
+/* :nodoc: */
+static VALUE
+yielder_initialize(VALUE obj)
+{
+    rb_need_block();
+
+    return yielder_init(obj, rb_block_proc());
+}
+
+/* :nodoc: */
+static VALUE
+yielder_yield(VALUE obj, VALUE args)
+{
+    struct yielder *ptr = yielder_ptr(obj);
+
+    return rb_proc_call(ptr->proc, args);
+}
+
+/* :nodoc: */
+static VALUE yielder_yield_push(VALUE obj, VALUE args)
+{
+    yielder_yield(obj, args);
+    return obj;
+}
+
+static VALUE
+yielder_yield_i(VALUE obj, VALUE memo, int argc, VALUE *argv)
+{
+    return rb_yield_values2(argc, argv);
+}
+
+static VALUE
+yielder_new(void)
+{
+    return yielder_init(yielder_allocate(rb_cYielder), rb_proc_new(yielder_yield_i, 0));
+}
+
+/*
+ * Generator
+ */
+static void
+generator_mark(void *p)
+{
+    struct generator *ptr = p;
+    rb_gc_mark(ptr->proc);
+}
+
+#define generator_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+generator_memsize(const void *p)
+{
+    return p ? sizeof(struct generator) : 0;
+}
+
+static const rb_data_type_t generator_data_type = {
+    "generator",
+    generator_mark,
+    generator_free,
+    generator_memsize,
+};
+
+static struct generator *
+generator_ptr(VALUE obj)
+{
+    struct generator *ptr;
+
+    TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr);
+    if (!ptr || ptr->proc == Qundef) {
+	rb_raise(rb_eArgError, "uninitialized generator");
+    }
+    return ptr;
+}
+
+/* :nodoc: */
+static VALUE
+generator_allocate(VALUE klass)
+{
+    struct generator *ptr;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct generator, &generator_data_type, ptr);
+    ptr->proc = Qundef;
+
+    return obj;
+}
+
+static VALUE
+generator_init(VALUE obj, VALUE proc)
+{
+    struct generator *ptr;
+
+    TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr);
+
+    if (!ptr) {
+	rb_raise(rb_eArgError, "unallocated generator");
+    }
+
+    ptr->proc = proc;
+
+    return obj;
+}
+
+VALUE rb_obj_is_proc(VALUE proc);
+
+/* :nodoc: */
+static VALUE
+generator_initialize(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE proc;
+
+    if (argc == 0) {
+	rb_need_block();
+
+	proc = rb_block_proc();
+    } else {
+	rb_scan_args(argc, argv, "1", &proc);
+
+	if (!rb_obj_is_proc(proc))
+	    rb_raise(rb_eTypeError,
+		     "wrong argument type %s (expected Proc)",
+		     rb_obj_classname(proc));
+
+	if (rb_block_given_p()) {
+	    rb_warn("given block not used");
+	}
+    }
+
+    return generator_init(obj, proc);
+}
+
+/* :nodoc: */
+static VALUE
+generator_init_copy(VALUE obj, VALUE orig)
+{
+    struct generator *ptr0, *ptr1;
+
+    ptr0 = generator_ptr(orig);
+
+    TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr1);
+
+    if (!ptr1) {
+	rb_raise(rb_eArgError, "unallocated generator");
+    }
+
+    ptr1->proc = ptr0->proc;
+
+    return obj;
+}
+
+/* :nodoc: */
+static VALUE
+generator_each(VALUE obj)
+{
+    struct generator *ptr = generator_ptr(obj);
+    VALUE yielder;
+
+    yielder = yielder_new();
+
+    return rb_proc_call(ptr->proc, rb_ary_new3(1, yielder));
+}
+
+/*
+ *  Document-class: StopIteration
+ *
+ *  Raised to stop the iteration, in particular by Enumerator#next. It is
+ *  rescued by Kernel#loop.
+ *
+ *     loop do
+ *       puts "Hello"
+ *       raise StopIteration
+ *       puts "World"
+ *     end
+ *     puts "Done!"
+ *
+ *  <em>produces:</em>
+ *
+ *     Hello
+ *     Done!
+ */
+
+/*
+ * call-seq:
+ *   stopiteration.result       -> value
+ *
+ * Returns the return value of the iterator.
+ *
+ *   o = Object.new
+ *   def o.each
+ *     yield 1
+ *     yield 2
+ *     yield 3
+ *     100
+ *   end
+ *   e = o.to_enum
+ *   p e.next                   #=> 1
+ *   p e.next                   #=> 2
+ *   p e.next                   #=> 3
+ *   begin
+ *     e.next
+ *   rescue StopIteration
+ *     p $!.result              #=> 100
+ *   end
+ *
+ */
+static VALUE
+stop_result(VALUE self)
+{
+    return rb_attr_get(self, rb_intern("result"));
+}
+
+void
+Init_Enumerator(void)
+{
+    rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
+    rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
+
+    rb_cEnumerator = rb_define_class("Enumerator", rb_cObject);
+    rb_include_module(rb_cEnumerator, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cEnumerator, enumerator_allocate);
+    rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
+    rb_define_method(rb_cEnumerator, "initialize_copy", enumerator_init_copy, 1);
+    rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
+    rb_define_method(rb_cEnumerator, "each_with_index", enumerator_each_with_index, 0);
+    rb_define_method(rb_cEnumerator, "each_with_object", enumerator_with_object, 1);
+    rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, -1);
+    rb_define_method(rb_cEnumerator, "with_object", enumerator_with_object, 1);
+    rb_define_method(rb_cEnumerator, "next_values", enumerator_next_values, 0);
+    rb_define_method(rb_cEnumerator, "peek_values", enumerator_peek_values_m, 0);
+    rb_define_method(rb_cEnumerator, "next", enumerator_next, 0);
+    rb_define_method(rb_cEnumerator, "peek", enumerator_peek, 0);
+    rb_define_method(rb_cEnumerator, "feed", enumerator_feed, 1);
+    rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);
+    rb_define_method(rb_cEnumerator, "inspect", enumerator_inspect, 0);
+
+    rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
+    rb_define_method(rb_eStopIteration, "result", stop_result, 0);
+
+    /* Generator */
+    rb_cGenerator = rb_define_class_under(rb_cEnumerator, "Generator", rb_cObject);
+    rb_include_module(rb_cGenerator, rb_mEnumerable);
+    rb_define_alloc_func(rb_cGenerator, generator_allocate);
+    rb_define_method(rb_cGenerator, "initialize", generator_initialize, -1);
+    rb_define_method(rb_cGenerator, "initialize_copy", generator_init_copy, 1);
+    rb_define_method(rb_cGenerator, "each", generator_each, 0);
+
+    /* Yielder */
+    rb_cYielder = rb_define_class_under(rb_cEnumerator, "Yielder", rb_cObject);
+    rb_define_alloc_func(rb_cYielder, yielder_allocate);
+    rb_define_method(rb_cYielder, "initialize", yielder_initialize, 0);
+    rb_define_method(rb_cYielder, "yield", yielder_yield, -2);
+    rb_define_method(rb_cYielder, "<<", yielder_yield_push, -2);
+
+    id_rewind = rb_intern("rewind");
+    id_each = rb_intern("each");
+    sym_each = ID2SYM(id_each);
+
+    rb_provide("enumerator.so");	/* for backward compatibility */
+}
diff --git a/env.h b/env.h
deleted file mode 100644
index c50103f71e..0000000000
--- a/env.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**********************************************************************
-
-  env.h -
-
-  $Author$
-  $Date$
-  created at: Mon Jul 11 11:53:03 JST 1994
-
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef ENV_H
-#define ENV_H
-
-extern struct FRAME {
-    VALUE self;
-    int argc;
-    ID last_func;
-    ID orig_func;
-    VALUE last_class;
-    struct FRAME *prev;
-    struct FRAME *tmp;
-    struct RNode *node;
-    int iter;
-    int flags;
-    unsigned long uniq;
-} *ruby_frame;
-
-void rb_gc_mark_frame _((struct FRAME *));
-
-#define FRAME_DMETH  1
-#define FRAME_FUNC   2
-
-extern struct SCOPE {
-    struct RBasic super;
-    ID *local_tbl;
-    VALUE *local_vars;
-    int flags;
-} *ruby_scope;
-
-#define SCOPE_ALLOCA  0
-#define SCOPE_MALLOC  1
-#define SCOPE_NOSTACK 2
-#define SCOPE_DONT_RECYCLE 4
-#define SCOPE_CLONE   8
-
-extern int ruby_in_eval;
-
-extern VALUE ruby_class;
-
-struct RVarmap {
-    struct RBasic super;
-    ID id;
-    VALUE val;
-    struct RVarmap *next;
-};
-extern struct RVarmap *ruby_dyna_vars;
-
-#endif /* ENV_H */
diff --git a/error.c b/error.c
index 608d1fa558..459b964df0 100644
--- a/error.c
+++ b/error.c
@@ -3,59 +3,63 @@
   error.c -
 
   $Author$
-  $Date$
   created at: Mon Aug  9 16:11:34 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "env.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
+#include "ruby/encoding.h"
+#include "vm_core.h"
 
 #include <stdio.h>
-#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#include <errno.h>
+
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS 0
 #endif
 
-extern const char ruby_version[], ruby_release_date[], ruby_platform[];
+extern const char ruby_description[];
 
-int ruby_nerrs;
+static const char *
+rb_strerrno(int err)
+{
+#define defined_error(name, num) if (err == num) return name;
+#define undefined_error(name)
+#include "known_errors.inc"
+#undef defined_error
+#undef undefined_error
+    return NULL;
+}
 
 static int
-err_position(buf, len)
-    char *buf;
-    long len;
+err_position_0(char *buf, long len, const char *file, int line)
 {
-    ruby_set_current_source();
-    if (!ruby_sourcefile) {
+    if (!file) {
 	return 0;
     }
-    else if (ruby_sourceline == 0) {
-	return snprintf(buf, len, "%s: ", ruby_sourcefile);
+    else if (line == 0) {
+	return snprintf(buf, len, "%s: ", file);
     }
     else {
-	return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
+	return snprintf(buf, len, "%s:%d: ", file, line);
     }
 }
 
+static int
+err_position(char *buf, long len)
+{
+    return err_position_0(buf, len, rb_sourcefile(), rb_sourceline());
+}
+
 static void
-err_snprintf(buf, len, fmt, args)
-    char *buf;
-    long len;
-    const char *fmt;
-    va_list args;
+err_snprintf(char *buf, long len, const char *fmt, va_list args)
 {
     long n;
 
@@ -65,75 +69,100 @@ err_snprintf(buf, len, fmt, args)
     }
 }
 
-static void err_append _((const char*));
 static void
-err_print(fmt, args)
-    const char *fmt;
-    va_list args;
+compile_snprintf(char *buf, long len, const char *file, int line, const char *fmt, va_list args)
 {
-    char buf[BUFSIZ];
+    long n;
 
-    err_snprintf(buf, BUFSIZ, fmt, args);
-    err_append(buf);
+    n = err_position_0(buf, len, file, line);
+    if (len > n) {
+	vsnprintf((char*)buf+n, len-n, fmt, args);
+    }
 }
 
+static void err_append(const char*);
+
 void
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_compile_error(const char *fmt, ...)
-#else
-rb_compile_error(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
+rb_compile_error(const char *file, int line, const char *fmt, ...)
 {
     va_list args;
+    char buf[BUFSIZ];
 
-    va_init_list(args, fmt);
-    err_print(fmt, args);
+    va_start(args, fmt);
+    compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
     va_end(args);
-    ruby_nerrs++;
+    err_append(buf);
 }
 
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_compile_error_append(const char *fmt, ...)
-#else
-rb_compile_error_append(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
 {
     va_list args;
     char buf[BUFSIZ];
 
-    va_init_list(args, fmt);
+    va_start(args, fmt);
     vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
     err_append(buf);
 }
 
 static void
-warn_print(fmt, args)
-    const char *fmt;
+compile_warn_print(const char *file, int line, const char *fmt, va_list args)
+{
+    char buf[BUFSIZ];
+    int len;
+
+    compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
+    len = (int)strlen(buf);
+    buf[len++] = '\n';
+    rb_write_error2(buf, len);
+}
+
+void
+rb_compile_warn(const char *file, int line, const char *fmt, ...)
+{
+    char buf[BUFSIZ];
     va_list args;
+
+    if (NIL_P(ruby_verbose)) return;
+
+    snprintf(buf, BUFSIZ, "warning: %s", fmt);
+
+    va_start(args, fmt);
+    compile_warn_print(file, line, buf, args);
+    va_end(args);
+}
+
+/* rb_compile_warning() reports only in verbose mode */
+void
+rb_compile_warning(const char *file, int line, const char *fmt, ...)
+{
+    char buf[BUFSIZ];
+    va_list args;
+
+    if (!RTEST(ruby_verbose)) return;
+
+    snprintf(buf, BUFSIZ, "warning: %s", fmt);
+
+    va_start(args, fmt);
+    compile_warn_print(file, line, buf, args);
+    va_end(args);
+}
+
+static void
+warn_print(const char *fmt, va_list args)
 {
     char buf[BUFSIZ];
     int len;
 
     err_snprintf(buf, BUFSIZ, fmt, args);
-    len = strlen(buf);
+    len = (int)strlen(buf);
     buf[len++] = '\n';
     rb_write_error2(buf, len);
 }
 
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_warn(const char *fmt, ...)
-#else
-rb_warn(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
 {
     char buf[BUFSIZ];
     va_list args;
@@ -142,20 +171,14 @@ rb_warn(fmt, va_alist)
 
     snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
-    va_init_list(args, fmt);
+    va_start(args, fmt);
     warn_print(buf, args);
     va_end(args);
 }
 
 /* rb_warning() reports only in verbose mode */
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_warning(const char *fmt, ...)
-#else
-rb_warning(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
 {
     char buf[BUFSIZ];
     va_list args;
@@ -164,22 +187,21 @@ rb_warning(fmt, va_alist)
 
     snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
-    va_init_list(args, fmt);
+    va_start(args, fmt);
     warn_print(buf, args);
     va_end(args);
 }
 
 /*
  * call-seq:
- *    warn(msg)   => nil
+ *    warn(msg)   -> nil
  *
  * Display the given message (followed by a newline) on STDERR unless
  * warnings are disabled (for example with the <code>-W0</code> flag).
  */
 
 static VALUE
-rb_warn_m(self, mesg)
-    VALUE self, mesg;
+rb_warn_m(VALUE self, VALUE mesg)
 {
     if (!NIL_P(ruby_verbose)) {
 	rb_io_write(rb_stderr, mesg);
@@ -188,33 +210,76 @@ rb_warn_m(self, mesg)
     return Qnil;
 }
 
-void
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_bug(const char *fmt, ...)
-#else
-rb_bug(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
+void rb_vm_bugreport(void);
+
+static void
+report_bug(const char *file, int line, const char *fmt, va_list args)
 {
     char buf[BUFSIZ];
-    va_list args;
     FILE *out = stderr;
-    int len = err_position(buf, BUFSIZ);
+    int len = err_position_0(buf, BUFSIZ, file, line);
+
+    if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len ||
+	(ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) {
 
-    if (fwrite(buf, 1, len, out) == len ||
-	fwrite(buf, 1, len, (out = stdout)) == len) {
 	fputs("[BUG] ", out);
-	va_init_list(args, fmt);
 	vfprintf(out, fmt, args);
-	va_end(args);
-	fprintf(out, "\nruby %s (%s) [%s]\n\n",
-		ruby_version, ruby_release_date, ruby_platform);
+	fprintf(out, "\n%s\n\n", ruby_description);
+
+	rb_vm_bugreport();
+
+	fprintf(out,
+		"[NOTE]\n"
+		"You may have encountered a bug in the Ruby interpreter"
+		" or extension libraries.\n"
+		"Bug reports are welcome.\n"
+		"For details: http://www.ruby-lang.org/bugreport.html\n\n");
     }
+}
+
+void
+rb_bug(const char *fmt, ...)
+{
+    va_list args;
+
+    va_start(args, fmt);
+    report_bug(rb_sourcefile(), rb_sourceline(), fmt, args);
+    va_end(args);
+
+#if defined(_WIN32) && defined(RT_VER) && RT_VER >= 80
+    _set_abort_behavior( 0, _CALL_REPORTFAULT);
+#endif
+
     abort();
 }
 
-static struct types {
+void
+rb_bug_errno(const char *mesg, int errno_arg)
+{
+    if (errno_arg == 0)
+        rb_bug("%s: errno == 0 (NOERROR)", mesg);
+    else {
+        const char *errno_str = rb_strerrno(errno_arg);
+        if (errno_str)
+            rb_bug("%s: %s (%s)", mesg, strerror(errno_arg), errno_str);
+        else
+            rb_bug("%s: %s (%d)", mesg, strerror(errno_arg), errno_arg);
+    }
+}
+
+void
+rb_compile_bug(const char *file, int line, const char *fmt, ...)
+{
+    va_list args;
+
+    va_start(args, fmt);
+    report_bug(file, line, fmt, args);
+    va_end(args);
+
+    abort();
+}
+
+static const struct types {
     int type;
     const char *name;
 } builtin_types[] = {
@@ -232,33 +297,34 @@ static struct types {
     {T_STRUCT,	"Struct"},
     {T_BIGNUM,	"Bignum"},
     {T_FILE,	"File"},
+    {T_RATIONAL,"Rational"},
+    {T_COMPLEX, "Complex"},
     {T_TRUE,	"true"},
     {T_FALSE,	"false"},
     {T_SYMBOL,	"Symbol"},	/* :symbol */
     {T_DATA,	"Data"},	/* internal use: wrapped C pointers */
     {T_MATCH,	"MatchData"},	/* data of $~ */
-    {T_VARMAP,	"Varmap"},	/* internal use: dynamic variables */
-    {T_SCOPE,	"Scope"},	/* internal use: variable scope */
     {T_NODE,	"Node"},	/* internal use: syntax tree node */
     {T_UNDEF,	"undef"},	/* internal use: #undef; should not happen */
-    {-1,	0}
 };
 
 void
-rb_check_type(x, t)
-    VALUE x;
-    int t;
+rb_check_type(VALUE x, int t)
 {
-    struct types *type = builtin_types;
+    const struct types *type = builtin_types;
+    const struct types *const typeend = builtin_types +
+	sizeof(builtin_types) / sizeof(builtin_types[0]);
+    int xt;
 
     if (x == Qundef) {
 	rb_bug("undef leaked to the Ruby space");
     }
 
-    if (TYPE(x) != t) {
-	while (type->type >= 0) {
+    xt = TYPE(x);
+    if (xt != t || (xt == T_DATA && RTYPEDDATA_P(x))) {
+	while (type < typeend) {
 	    if (type->type == t) {
-		char *etype;
+		const char *etype;
 
 		if (NIL_P(x)) {
 		    etype = "nil";
@@ -270,7 +336,8 @@ rb_check_type(x, t)
 		    etype = "Symbol";
 		}
 		else if (rb_special_const_p(x)) {
-		    etype = RSTRING(rb_obj_as_string(x))->ptr;
+		    x = rb_obj_as_string(x);
+		    etype = StringValuePtr(x);
 		}
 		else {
 		    etype = rb_obj_classname(x);
@@ -280,13 +347,41 @@ rb_check_type(x, t)
 	    }
 	    type++;
 	}
-	rb_bug("unknown type 0x%x", t);
+	rb_bug("unknown type 0x%x (0x%x given)", t, TYPE(x));
     }
 }
 
-/* exception classes */
-#include <errno.h>
+int
+rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type)
+{
+    if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA ||
+	!RTYPEDDATA_P(obj) || RTYPEDDATA_TYPE(obj) != data_type) {
+	return 0;
+    }
+    return 1;
+}
+
+void *
+rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type)
+{
+    const char *etype;
+    static const char mesg[] = "wrong argument type %s (expected %s)";
 
+    if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA) {
+	Check_Type(obj, T_DATA);
+    }
+    if (!RTYPEDDATA_P(obj)) {
+	etype = rb_obj_classname(obj);
+	rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
+    }
+    else if (RTYPEDDATA_TYPE(obj) != data_type) {
+	etype = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
+	rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
+    }
+    return DATA_PTR(obj);
+}
+
+/* exception classes */
 VALUE rb_eException;
 VALUE rb_eSystemExit;
 VALUE rb_eInterrupt;
@@ -297,8 +392,11 @@ VALUE rb_eRuntimeError;
 VALUE rb_eTypeError;
 VALUE rb_eArgError;
 VALUE rb_eIndexError;
+VALUE rb_eKeyError;
 VALUE rb_eRangeError;
 VALUE rb_eNameError;
+VALUE rb_eEncodingError;
+VALUE rb_eEncCompatError;
 VALUE rb_eNoMethodError;
 VALUE rb_eSecurityError;
 VALUE rb_eNotImpError;
@@ -311,45 +409,39 @@ VALUE rb_eLoadError;
 
 VALUE rb_eSystemCallError;
 VALUE rb_mErrno;
+static VALUE rb_eNOERROR;
+
+#undef rb_exc_new2
 
 VALUE
-rb_exc_new(etype, ptr, len)
-    VALUE etype;
-    const char *ptr;
-    long len;
+rb_exc_new(VALUE etype, const char *ptr, long len)
 {
     return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
 }
 
 VALUE
-rb_exc_new2(etype, s)
-    VALUE etype;
-    const char *s;
+rb_exc_new2(VALUE etype, const char *s)
 {
     return rb_exc_new(etype, s, strlen(s));
 }
 
 VALUE
-rb_exc_new3(etype, str)
-    VALUE etype, str;
+rb_exc_new3(VALUE etype, VALUE str)
 {
     StringValue(str);
-    return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
+    return rb_funcall(etype, rb_intern("new"), 1, str);
 }
 
 /*
  * call-seq:
- *    Exception.new(msg = nil)   =>  exception
+ *    Exception.new(msg = nil)   ->  exception
  *
- *  Construct a new Exception object, optionally passing in 
+ *  Construct a new Exception object, optionally passing in
  *  a message.
  */
 
 static VALUE
-exc_initialize(argc, argv, exc)
-    int argc;
-    VALUE *argv;
-    VALUE exc;
+exc_initialize(int argc, VALUE *argv, VALUE exc)
 {
     VALUE arg;
 
@@ -364,20 +456,17 @@ exc_initialize(argc, argv, exc)
  *  Document-method: exception
  *
  *  call-seq:
- *     exc.exception(string) -> an_exception or exc
- *  
+ *     exc.exception(string)  ->  an_exception or exc
+ *
  *  With no argument, or if the argument is the same as the receiver,
  *  return the receiver. Otherwise, create a new
  *  exception object of the same class as the receiver, but with a
  *  message equal to <code>string.to_str</code>.
- *     
+ *
  */
 
 static VALUE
-exc_exception(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+exc_exception(int argc, VALUE *argv, VALUE self)
 {
     VALUE exc;
 
@@ -391,15 +480,14 @@ exc_exception(argc, argv, self)
 
 /*
  * call-seq:
- *   exception.to_s   =>  string
+ *   exception.to_s   ->  string
  *
  * Returns exception's message (or the name of the exception if
  * no message is set).
  */
 
 static VALUE
-exc_to_s(exc)
-    VALUE exc;
+exc_to_s(VALUE exc)
 {
     VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
 
@@ -410,8 +498,7 @@ exc_to_s(exc)
 
 /*
  * call-seq:
- *   exception.message   =>  string
- *   exception.to_str    =>  string
+ *   exception.message   ->  string
  *
  * Returns the result of invoking <code>exception.to_s</code>.
  * Normally this returns the exception's message or name. By
@@ -420,28 +507,26 @@ exc_to_s(exc)
  */
 
 static VALUE
-exc_to_str(exc)
-    VALUE exc;
+exc_message(VALUE exc)
 {
     return rb_funcall(exc, rb_intern("to_s"), 0, 0);
 }
 
 /*
  * call-seq:
- *   exception.inspect   => string
+ *   exception.inspect   -> string
  *
  * Return this exception's class name an message
  */
 
 static VALUE
-exc_inspect(exc)
-    VALUE exc;
+exc_inspect(VALUE exc)
 {
     VALUE str, klass;
 
     klass = CLASS_OF(exc);
     exc = rb_obj_as_string(exc);
-    if (RSTRING(exc)->len == 0) {
+    if (RSTRING_LEN(exc) == 0) {
 	return rb_str_dup(rb_class_name(klass));
     }
 
@@ -457,49 +542,47 @@ exc_inspect(exc)
 
 /*
  *  call-seq:
- *     exception.backtrace    => array
- *  
+ *     exception.backtrace    -> array
+ *
  *  Returns any backtrace associated with the exception. The backtrace
  *  is an array of strings, each containing either ``filename:lineNo: in
  *  `method''' or ``filename:lineNo.''
- *     
+ *
  *     def a
  *       raise "boom"
  *     end
- *     
+ *
  *     def b
  *       a()
  *     end
- *     
+ *
  *     begin
  *       b()
  *     rescue => detail
  *       print detail.backtrace.join("\n")
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     prog.rb:2:in `a'
  *     prog.rb:6:in `b'
  *     prog.rb:10
 */
 
 static VALUE
-exc_backtrace(exc)
-    VALUE exc;
+exc_backtrace(VALUE exc)
 {
-    static ID bt;
+    ID bt;
 
-    if (!bt) bt = rb_intern("bt");
+    CONST_ID(bt, "bt");
     return rb_attr_get(exc, bt);
 }
 
 VALUE
-rb_check_backtrace(bt)
-    VALUE bt;
+rb_check_backtrace(VALUE bt)
 {
     long i;
-    static char *err = "backtrace must be Array of String";
+    static const char err[] = "backtrace must be Array of String";
 
     if (!NIL_P(bt)) {
 	int t = TYPE(bt);
@@ -508,8 +591,8 @@ rb_check_backtrace(bt)
 	if (t != T_ARRAY) {
 	    rb_raise(rb_eTypeError, err);
 	}
-	for (i=0;i<RARRAY(bt)->len;i++) {
-	    if (TYPE(RARRAY(bt)->ptr[i]) != T_STRING) {
+	for (i=0;i<RARRAY_LEN(bt);i++) {
+	    if (TYPE(RARRAY_PTR(bt)[i]) != T_STRING) {
 		rb_raise(rb_eTypeError, err);
 	    }
 	}
@@ -519,34 +602,69 @@ rb_check_backtrace(bt)
 
 /*
  *  call-seq:
- *     exc.set_backtrace(array)   =>  array
- *  
+ *     exc.set_backtrace(array)   ->  array
+ *
  *  Sets the backtrace information associated with <i>exc</i>. The
  *  argument must be an array of <code>String</code> objects in the
  *  format described in <code>Exception#backtrace</code>.
- *     
+ *
  */
 
 static VALUE
-exc_set_backtrace(exc, bt)
-    VALUE exc;
-    VALUE bt;
+exc_set_backtrace(VALUE exc, VALUE bt)
 {
     return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
 }
 
 /*
+ *  call-seq:
+ *     exc == obj   -> true or false
+ *
+ *  Equality---If <i>obj</i> is not an <code>Exception</code>, returns
+ *  <code>false</code>. Otherwise, returns <code>true</code> if <i>exc</i> and
+ *  <i>obj</i> share same class, messages, and backtrace.
+ */
+
+static VALUE
+exc_equal(VALUE exc, VALUE obj)
+{
+    VALUE mesg, backtrace;
+    ID id_mesg;
+
+    if (exc == obj) return Qtrue;
+    CONST_ID(id_mesg, "mesg");
+
+    if (rb_obj_class(exc) != rb_obj_class(obj)) {
+	ID id_message, id_backtrace;
+	CONST_ID(id_message, "message");
+	CONST_ID(id_backtrace, "backtrace");
+
+	mesg = rb_check_funcall(obj, id_message, 0, 0);
+	if (mesg == Qundef) return Qfalse;
+	backtrace = rb_check_funcall(obj, id_backtrace, 0, 0);
+	if (backtrace == Qundef) return Qfalse;
+    }
+    else {
+	mesg = rb_attr_get(obj, id_mesg);
+	backtrace = exc_backtrace(obj);
+    }
+
+    if (!rb_equal(rb_attr_get(exc, id_mesg), mesg))
+	return Qfalse;
+    if (!rb_equal(exc_backtrace(exc), backtrace))
+	return Qfalse;
+    return Qtrue;
+}
+
+/*
  * call-seq:
- *   SystemExit.new(status=0)   => system_exit
+ *   SystemExit.new(status=0)   -> system_exit
  *
  * Create a new +SystemExit+ exception with the given status.
  */
 
 static VALUE
-exit_initialize(argc, argv, exc)
-    int argc;
-    VALUE *argv;
-    VALUE exc;
+exit_initialize(int argc, VALUE *argv, VALUE exc)
 {
     VALUE status = INT2FIX(EXIT_SUCCESS);
     if (argc > 0 && FIXNUM_P(argv[0])) {
@@ -561,14 +679,13 @@ exit_initialize(argc, argv, exc)
 
 /*
  * call-seq:
- *   system_exit.status   => fixnum
+ *   system_exit.status   -> fixnum
  *
  * Return the status value associated with this system exit.
  */
 
 static VALUE
-exit_status(exc)
-    VALUE exc;
+exit_status(VALUE exc)
 {
     return rb_attr_get(exc, rb_intern("status"));
 }
@@ -576,14 +693,13 @@ exit_status(exc)
 
 /*
  * call-seq:
- *   system_exit.success?  => true or false
+ *   system_exit.success?  -> true or false
  *
  * Returns +true+ if exiting successful, +false+ if not.
  */
 
 static VALUE
-exit_success_p(exc)
-    VALUE exc;
+exit_success_p(VALUE exc)
 {
     VALUE status = rb_attr_get(exc, rb_intern("status"));
     if (NIL_P(status)) return Qtrue;
@@ -592,24 +708,15 @@ exit_success_p(exc)
 }
 
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_name_error(ID id, const char *fmt, ...)
-#else
-rb_name_error(id, fmt, va_alist)
-    ID id;
-    const char *fmt;
-    va_dcl
-#endif
 {
     VALUE exc, argv[2];
     va_list args;
-    char buf[BUFSIZ];
 
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_start(args, fmt);
+    argv[0] = rb_vsprintf(fmt, args);
     va_end(args);
 
-    argv[0] = rb_str_new2(buf);
     argv[1] = ID2SYM(id);
     exc = rb_class_new_instance(2, argv, rb_eNameError);
     rb_exc_raise(exc);
@@ -617,7 +724,7 @@ rb_name_error(id, fmt, va_alist)
 
 /*
  * call-seq:
- *   NameError.new(msg [, name])  => name_error
+ *   NameError.new(msg [, name])  -> name_error
  *
  * Construct a new NameError exception. If given the <i>name</i>
  * parameter may subsequently be examined using the <code>NameError.name</code>
@@ -625,10 +732,7 @@ rb_name_error(id, fmt, va_alist)
  */
 
 static VALUE
-name_err_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+name_err_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE name;
 
@@ -640,30 +744,29 @@ name_err_initialize(argc, argv, self)
 
 /*
  *  call-seq:
- *    name_error.name    =>  string or nil
+ *    name_error.name    ->  string or nil
  *
  *  Return the name associated with this NameError exception.
  */
 
 static VALUE
-name_err_name(self)
-    VALUE self;
+name_err_name(VALUE self)
 {
     return rb_attr_get(self, rb_intern("name"));
 }
 
 /*
  * call-seq:
- *  name_error.to_s   => string
+ *  name_error.to_s   -> string
  *
- * Produce a nicely-formated string representing the +NameError+.
+ * Produce a nicely-formatted string representing the +NameError+.
  */
 
 static VALUE
-name_err_to_s(exc)
-    VALUE exc;
+name_err_to_s(VALUE exc)
 {
-    VALUE mesg = rb_attr_get(exc, rb_intern("mesg")), str = mesg;
+    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
+    VALUE str = mesg;
 
     if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
     StringValue(str);
@@ -676,7 +779,7 @@ name_err_to_s(exc)
 
 /*
  * call-seq:
- *   NoMethodError.new(msg, name [, args])  => no_method_error
+ *   NoMethodError.new(msg, name [, args])  -> no_method_error
  *
  * Construct a NoMethodError exception for a method of the given name
  * called with the given arguments. The name may be accessed using
@@ -685,10 +788,7 @@ name_err_to_s(exc)
  */
 
 static VALUE
-nometh_err_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+nometh_err_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE args = (argc > 2) ? argv[--argc] : Qnil;
     name_err_initialize(argc, argv, self);
@@ -697,39 +797,79 @@ nometh_err_initialize(argc, argv, self)
 }
 
 /* :nodoc: */
+#define NAME_ERR_MESG_COUNT 3
+
 static void
-name_err_mesg_mark(ptr)
-    VALUE *ptr;
+name_err_mesg_mark(void *p)
 {
-    rb_gc_mark_locations(ptr, ptr+3);
+    VALUE *ptr = p;
+    rb_gc_mark_locations(ptr, ptr+NAME_ERR_MESG_COUNT);
 }
 
+#define name_err_mesg_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+name_err_mesg_memsize(const void *p)
+{
+    return p ? (NAME_ERR_MESG_COUNT * sizeof(VALUE)) : 0;
+}
+
+static const rb_data_type_t name_err_mesg_data_type = {
+    "name_err_mesg",
+    name_err_mesg_mark,
+    name_err_mesg_free,
+    name_err_mesg_memsize,
+};
+
 /* :nodoc: */
-static VALUE
-name_err_mesg_new(obj, mesg, recv, method)
-    VALUE obj, mesg, recv, method;
+VALUE
+rb_name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
 {
-    VALUE *ptr = ALLOC_N(VALUE, 3);
+    VALUE *ptr = ALLOC_N(VALUE, NAME_ERR_MESG_COUNT);
+    VALUE result;
 
     ptr[0] = mesg;
     ptr[1] = recv;
     ptr[2] = method;
-    return Data_Wrap_Struct(rb_cNameErrorMesg, name_err_mesg_mark, -1, ptr);
+    result = TypedData_Wrap_Struct(rb_cNameErrorMesg, &name_err_mesg_data_type, ptr);
+    RB_GC_GUARD(mesg);
+    RB_GC_GUARD(recv);
+    RB_GC_GUARD(method);
+    return result;
+}
+
+/* :nodoc: */
+static VALUE
+name_err_mesg_equal(VALUE obj1, VALUE obj2)
+{
+    VALUE *ptr1, *ptr2;
+    int i;
+
+    if (obj1 == obj2) return Qtrue;
+    if (rb_obj_class(obj2) != rb_cNameErrorMesg)
+	return Qfalse;
+
+    TypedData_Get_Struct(obj1, VALUE, &name_err_mesg_data_type, ptr1);
+    TypedData_Get_Struct(obj2, VALUE, &name_err_mesg_data_type, ptr2);
+    for (i=0; i<NAME_ERR_MESG_COUNT; i++) {
+	if (!rb_equal(ptr1[i], ptr2[i]))
+	    return Qfalse;
+    }
+    return Qtrue;
 }
 
 /* :nodoc: */
 static VALUE
-name_err_mesg_to_str(obj)
-    VALUE obj;
+name_err_mesg_to_str(VALUE obj)
 {
     VALUE *ptr, mesg;
-    Data_Get_Struct(obj, VALUE, ptr);
+    TypedData_Get_Struct(obj, VALUE, &name_err_mesg_data_type, ptr);
 
     mesg = ptr[0];
     if (NIL_P(mesg)) return Qnil;
     else {
-	char *desc = 0;
-	VALUE d = 0, args[3];
+	const char *desc = 0;
+	VALUE d = 0, args[NAME_ERR_MESG_COUNT];
 
 	obj = ptr[1];
 	switch (TYPE(obj)) {
@@ -744,21 +884,21 @@ name_err_mesg_to_str(obj)
 	    break;
 	  default:
 	    d = rb_protect(rb_inspect, obj, 0);
-	    if (NIL_P(d) || RSTRING(d)->len > 65) {
+	    if (NIL_P(d) || RSTRING_LEN(d) > 65) {
 		d = rb_any_to_s(obj);
 	    }
-	    desc = RSTRING(d)->ptr;
+	    desc = RSTRING_PTR(d);
 	    break;
 	}
 	if (desc && desc[0] != '#') {
-	    d = rb_str_new2(desc);
+	    d = d ? rb_str_dup(d) : rb_str_new2(desc);
 	    rb_str_cat2(d, ":");
 	    rb_str_cat2(d, rb_obj_classname(obj));
 	}
 	args[0] = mesg;
 	args[1] = ptr[2];
 	args[2] = d;
-	mesg = rb_f_sprintf(3, args);
+	mesg = rb_f_sprintf(NAME_ERR_MESG_COUNT, args);
     }
     if (OBJ_TAINTED(obj)) OBJ_TAINT(mesg);
     return mesg;
@@ -766,37 +906,34 @@ name_err_mesg_to_str(obj)
 
 /* :nodoc: */
 static VALUE
-name_err_mesg_load(klass, str)
-    VALUE klass, str;
+name_err_mesg_load(VALUE klass, VALUE str)
 {
     return str;
 }
 
 /*
  * call-seq:
- *   no_method_error.args  => obj
+ *   no_method_error.args  -> obj
  *
  * Return the arguments passed in as the third parameter to
  * the constructor.
  */
 
 static VALUE
-nometh_err_args(self)
-    VALUE self;
+nometh_err_args(VALUE self)
 {
     return rb_attr_get(self, rb_intern("args"));
 }
 
 void
-rb_invalid_str(str, type)
-    const char *str, *type;
+rb_invalid_str(const char *str, const char *type)
 {
-    VALUE s = rb_str_inspect(rb_str_new2(str));
+    volatile VALUE s = rb_str_inspect(rb_str_new2(str));
 
-    rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING(s)->ptr);
+    rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING_PTR(s));
 }
 
-/* 
+/*
  *  Document-module: Errno
  *
  *  Ruby exception objects are subclasses of <code>Exception</code>.
@@ -806,33 +943,31 @@ rb_invalid_str(str, type)
  *  number generating its own subclass of <code>SystemCallError</code>.
  *  As the subclass is created in module <code>Errno</code>, its name
  *  will start <code>Errno::</code>.
- *     
+ *
  *  The names of the <code>Errno::</code> classes depend on
  *  the environment in which Ruby runs. On a typical Unix or Windows
  *  platform, there are <code>Errno</code> classes such as
  *  <code>Errno::EACCES</code>, <code>Errno::EAGAIN</code>,
  *  <code>Errno::EINTR</code>, and so on.
- *     
+ *
  *  The integer operating system error number corresponding to a
  *  particular error is available as the class constant
  *  <code>Errno::</code><em>error</em><code>::Errno</code>.
- *     
+ *
  *     Errno::EACCES::Errno   #=> 13
  *     Errno::EAGAIN::Errno   #=> 11
  *     Errno::EINTR::Errno    #=> 4
- *     
+ *
  *  The full list of operating system errors on your particular platform
  *  are available as the constants of <code>Errno</code>.
  *
- *     Errno.constants   #=> E2BIG, EACCES, EADDRINUSE, EADDRNOTAVAIL, ...
+ *     Errno.constants   #=> :E2BIG, :EACCES, :EADDRINUSE, :EADDRNOTAVAIL, ...
  */
 
 static st_table *syserr_tbl;
 
 static VALUE
-set_syserr(n, name)
-    int n;
-    const char *name;
+set_syserr(int n, const char *name)
 {
     VALUE error;
 
@@ -848,8 +983,7 @@ set_syserr(n, name)
 }
 
 static VALUE
-get_syserr(n)
-    int n;
+get_syserr(int n)
 {
     VALUE error;
 
@@ -864,7 +998,7 @@ get_syserr(n)
 
 /*
  * call-seq:
- *   SystemCallError.new(msg, errno)  => system_call_error_subclass
+ *   SystemCallError.new(msg, errno)  -> system_call_error_subclass
  *
  * If _errno_ corresponds to a known system error code, constructs
  * the appropriate <code>Errno</code> class for that error, otherwise
@@ -874,15 +1008,12 @@ get_syserr(n)
  */
 
 static VALUE
-syserr_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syserr_initialize(int argc, VALUE *argv, VALUE self)
 {
-#if !defined(_WIN32) && !defined(__VMS)
+#if !defined(_WIN32)
     char *strerror();
 #endif
-    char *err;
+    const char *err;
     VALUE mesg, error;
     VALUE klass = rb_obj_class(self);
 
@@ -903,22 +1034,19 @@ syserr_initialize(argc, argv, self)
 	rb_scan_args(argc, argv, "01", &mesg);
 	error = rb_const_get(klass, rb_intern("Errno"));
     }
-    if (!NIL_P(error)) err = strerror(NUM2LONG(error));
+    if (!NIL_P(error)) err = strerror(NUM2INT(error));
     else err = "unknown error";
     if (!NIL_P(mesg)) {
 	VALUE str = mesg;
-	size_t len;
 
 	StringValue(str);
-	len = strlen(err)+RSTRING(str)->len+3;
-	mesg = rb_str_new(0, len);
-	snprintf(RSTRING(mesg)->ptr, len+1, "%s - %.*s", err,
-		(int)RSTRING(str)->len, RSTRING(str)->ptr);
-	rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
+	mesg = rb_sprintf("%s - %.*s", err,
+			  (int)RSTRING_LEN(str), RSTRING_PTR(str));
     }
     else {
 	mesg = rb_str_new2(err);
     }
+    rb_enc_associate(mesg, rb_locale_encoding());
     rb_call_super(1, &mesg);
     rb_iv_set(self, "errno", error);
     return self;
@@ -926,44 +1054,41 @@ syserr_initialize(argc, argv, self)
 
 /*
  * call-seq:
- *   system_call_error.errno   => fixnum
+ *   system_call_error.errno   -> fixnum
  *
  * Return this SystemCallError's error number.
  */
 
 static VALUE
-syserr_errno(self)
-    VALUE self;
+syserr_errno(VALUE self)
 {
     return rb_attr_get(self, rb_intern("errno"));
 }
 
 /*
  * call-seq:
- *   system_call_error === other  => true or false
+ *   system_call_error === other  -> true or false
  *
  * Return +true+ if the receiver is a generic +SystemCallError+, or
- * if the error numbers _self_ and _other_ are the same.
+ * if the error numbers +self+ and _other_ are the same.
  */
 
-
 static VALUE
-syserr_eqq(self, exc)
-    VALUE self, exc;
+syserr_eqq(VALUE self, VALUE exc)
 {
     VALUE num, e;
+    ID en;
 
-    if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) return Qfalse;
-    if (self == rb_eSystemCallError) return Qtrue;
+    CONST_ID(en, "errno");
+
+    if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) {
+	if (!rb_respond_to(exc, en)) return Qfalse;
+    }
+    else if (self == rb_eSystemCallError) return Qtrue;
 
     num = rb_attr_get(exc, rb_intern("errno"));
     if (NIL_P(num)) {
-	VALUE klass = CLASS_OF(exc);
-
-	while (TYPE(klass) == T_ICLASS || FL_TEST(klass, FL_SINGLETON)) {
-	    klass = (VALUE)RCLASS(klass)->super;
-	}
-	num = rb_const_get(klass, rb_intern("Errno"));
+	num = rb_funcall(exc, en, 0, 0);
     }
     e = rb_const_get(self, rb_intern("Errno"));
     if (FIXNUM_P(num) ? num == e : rb_equal(num, e))
@@ -971,26 +1096,316 @@ syserr_eqq(self, exc)
     return Qfalse;
 }
 
+
+/*
+ *  Document-class: StandardError
+ *
+ *  The most standard error types are subclasses of StandardError. A
+ *  rescue clause without an explicit Exception class will rescue all
+ *  StandardErrors (and only those).
+ *
+ *     def foo
+ *       raise "Oups"
+ *     end
+ *     foo rescue "Hello"   #=> "Hello"
+ *
+ *  On the other hand:
+ *
+ *     require 'does/not/exist' rescue "Hi"
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     LoadError: no such file to load -- does/not/exist
+ *
+ */
+
+/*
+ *  Document-class: SystemExit
+ *
+ *  Raised by +exit+ to initiate the termination of the script.
+ */
+
+/*
+ *  Document-class: SignalException
+ *
+ *  Raised when a signal is received.
+ *
+ *     begin
+ *       Process.kill('HUP',Process.pid)
+ *     rescue SignalException => e
+ *       puts "received Exception #{e}"
+ *     end
+ *
+ *  <em>produces:</em>
+ *
+ *     received Exception SIGHUP
+ */
+
+/*
+ *  Document-class: Interrupt
+ *
+ *  Raised with the interrupt signal is received, typically because the
+ *  user pressed on Control-C (on most posix platforms). As such, it is a
+ *  subclass of +SignalException+.
+ *
+ *     begin
+ *       puts "Press ctrl-C when you get bored"
+ *       loop {}
+ *     rescue Interrupt => e
+ *       puts "Note: You will typically use Signal.trap instead."
+ *     end
+ *
+ *  <em>produces:</em>
+ *
+ *     Press ctrl-C when you get bored
+ *
+ *  <em>then waits until it is interrupted with Control-C and then prints:</em>
+ *
+ *     Note: You will typically use Signal.trap instead.
+ */
+
+/*
+ *  Document-class: TypeError
+ *
+ *  Raised when encountering an object that is not of the expected type.
+ *
+ *     [1, 2, 3].first("two")
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     TypeError: can't convert String into Integer
+ *
+ */
+
+/*
+ *  Document-class: ArgumentError
+ *
+ *  Raised when the arguments are wrong and there isn't a more specific
+ *  Exception class.
+ *
+ *  Ex: passing the wrong number of arguments
+ *
+ *     [1, 2, 3].first(4, 5)
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     ArgumentError: wrong number of arguments (2 for 1)
+ *
+ *  Ex: passing an argument that is not acceptable:
+ *
+ *     [1, 2, 3].first(-4)
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     ArgumentError: negative array size
+ */
+
+/*
+ *  Document-class: IndexError
+ *
+ *  Raised when the given index is invalid.
+ *
+ *     a = [:foo, :bar]
+ *     a.fetch(0)   #=> :foo
+ *     a[4]         #=> nil
+ *     a.fetch(4)   #=> IndexError: index 4 outside of array bounds: -2...2
+ *
+ */
+
+/*
+ *  Document-class: KeyError
+ *
+ *  Raised when the specified key is not found. It is a subclass of
+ *  IndexError.
+ *
+ *     h = {"foo" => :bar}
+ *     h.fetch("foo") #=> :bar
+ *     h.fetch("baz") #=> KeyError: key not found: "baz"
+ *
+ */
+
+/*
+ *  Document-class: RangeError
+ *
+ *  Raised when a given numerical value is out of range.
+ *
+ *     [1, 2, 3].drop(1 << 100)
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     RangeError: bignum too big to convert into `long'
+ */
+
+/*
+ *  Document-class: ScriptError
+ *
+ *  ScriptError is the superclass for errors raised when a script
+ *  can not be executed because of a +LoadError+,
+ *  +NotImplementedError+ or a +SyntaxError+. Note these type of
+ *  +ScriptErrors+ are not +StandardError+ and will not be
+ *  rescued unless it is specified explicitly (or its ancestor
+ *  +Exception+).
+ */
+
+/*
+ *  Document-class: SyntaxError
+ *
+ *  Raised when encountering Ruby code with an invalid syntax.
+ *
+ *     eval("1+1=2")
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     SyntaxError: (eval):1: syntax error, unexpected '=', expecting $end
+ */
+
+/*
+ *  Document-class: LoadError
+ *
+ *  Raised when a file required (a Ruby script, extension library, ...)
+ *  fails to load.
+ *
+ *     require 'this/file/does/not/exist'
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     LoadError: no such file to load -- this/file/does/not/exist
+ */
+
+/*
+ *  Document-class: NotImplementedError
+ *
+ *  Raised when a feature is not implemented on the current platform. For
+ *  example, methods depending on the +fsync+ or +fork+ system calls may
+ *  raise this exception if the underlying operating system or Ruby
+ *  runtime does not support them.
+ *
+ *  Note that if +fork+ raises a +NotImplementedError+, then
+ *  <code>respond_to?(:fork)</code> returns +false+.
+ */
+
+/*
+ *  Document-class: NameError
+ *
+ *  Raised when a given name is invalid or undefined.
+ *
+ *     puts foo
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     NameError: undefined local variable or method `foo' for main:Object
+ *
+ *  Since constant names must start with a capital:
+ *
+ *     Fixnum.const_set :answer, 42
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     NameError: wrong constant name answer
+ */
+
 /*
- *  Descendents of class <code>Exception</code> are used to communicate
+ *  Document-class: NoMethodError
+ *
+ *  Raised when a method is called on a receiver which doesn't have it
+ *  defined and also fails to respond with +method_missing+.
+ *
+ *     "hello".to_ary
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     NoMethodError: undefined method `to_ary' for "hello":String
+ */
+
+/*
+ *  Document-class: RuntimeError
+ *
+ *  A generic error class raised when an invalid operation is attempted.
+ *
+ *     [1, 2, 3].freeze << 4
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     RuntimeError: can't modify frozen array
+ *
+ *  Kernel.raise will raise a RuntimeError if no Exception class is
+ *  specified.
+ *
+ *     raise "ouch"
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     RuntimeError: ouch
+ */
+
+/*
+ *  Document-class: SecurityError
+ *
+ *  Raised when attempting a potential unsafe operation, typically when
+ *  the $SAFE level is raised above 0.
+ *
+ *     foo = "bar"
+ *     proc = Proc.new do
+ *       $SAFE = 4
+ *       foo.gsub! "a", "*"
+ *     end
+ *     proc.call
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     SecurityError: Insecure: can't modify string
+ */
+
+/*
+ *  Document-class: NoMemoryError
+ *
+ *  Raised when memory allocation fails.
+ */
+
+/*
+ *  Document-class: SystemCallError
+ *
+ *  SystemCallError is the base class for all low-level
+ *  platform-dependent errors.
+ *
+ *  The errors available on the current platform are subclasses of
+ *  SystemCallError and are defined in the Errno module.
+ *
+ *     File.open("does/not/exist")
+ *
+ *  <em>raises the exception:</em>
+ *
+ *     Errno::ENOENT: No such file or directory - does/not/exist
+ */
+
+/*
+ *  Document-class: Encoding::CompatibilityError
+ *
+ *  Raised by Encoding and String methods when the source encoding is
+ *  incompatible with the target encoding.
+ */
+
+/*
+ *  Descendants of class <code>Exception</code> are used to communicate
  *  between <code>raise</code> methods and <code>rescue</code>
  *  statements in <code>begin/end</code> blocks. <code>Exception</code>
  *  objects carry information about the exception---its type (the
  *  exception's class name), an optional descriptive string, and
- *  optional traceback information. Programs may subclass 
- *  <code>Exception</code> to add additional information.
+ *  optional traceback information. Programs may subclass
+ *  <code>Exception</code>, or more typically <code>StandardError</code>
+ *  to provide custom classes and add additional information.
  */
 
 void
-Init_Exception()
+Init_Exception(void)
 {
     rb_eException   = rb_define_class("Exception", rb_cObject);
     rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1);
     rb_define_method(rb_eException, "exception", exc_exception, -1);
     rb_define_method(rb_eException, "initialize", exc_initialize, -1);
+    rb_define_method(rb_eException, "==", exc_equal, 1);
     rb_define_method(rb_eException, "to_s", exc_to_s, 0);
-    rb_define_method(rb_eException, "to_str", exc_to_str, 0);
-    rb_define_method(rb_eException, "message", exc_to_str, 0);
+    rb_define_method(rb_eException, "message", exc_message, 0);
     rb_define_method(rb_eException, "inspect", exc_inspect, 0);
     rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
     rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
@@ -1008,13 +1423,21 @@ Init_Exception()
     rb_eTypeError     = rb_define_class("TypeError", rb_eStandardError);
     rb_eArgError      = rb_define_class("ArgumentError", rb_eStandardError);
     rb_eIndexError    = rb_define_class("IndexError", rb_eStandardError);
+    rb_eKeyError      = rb_define_class("KeyError", rb_eIndexError);
     rb_eRangeError    = rb_define_class("RangeError", rb_eStandardError);
+
+    rb_eScriptError = rb_define_class("ScriptError", rb_eException);
+    rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
+    rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
+    rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
+
     rb_eNameError     = rb_define_class("NameError", rb_eStandardError);
     rb_define_method(rb_eNameError, "initialize", name_err_initialize, -1);
     rb_define_method(rb_eNameError, "name", name_err_name, 0);
     rb_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
     rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cData);
-    rb_define_singleton_method(rb_cNameErrorMesg, "!", name_err_mesg_new, 3);
+    rb_define_singleton_method(rb_cNameErrorMesg, "!", rb_name_err_mesg_new, NAME_ERR_MESG_COUNT);
+    rb_define_method(rb_cNameErrorMesg, "==", name_err_mesg_equal, 1);
     rb_define_method(rb_cNameErrorMesg, "to_str", name_err_mesg_to_str, 0);
     rb_define_method(rb_cNameErrorMesg, "_dump", name_err_mesg_to_str, 1);
     rb_define_singleton_method(rb_cNameErrorMesg, "_load", name_err_mesg_load, 1);
@@ -1022,14 +1445,11 @@ Init_Exception()
     rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
     rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
 
-    rb_eScriptError = rb_define_class("ScriptError", rb_eException);
-    rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
-    rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
-    rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
-
     rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
-    rb_eSecurityError = rb_define_class("SecurityError", rb_eStandardError);
+    rb_eSecurityError = rb_define_class("SecurityError", rb_eException);
     rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
+    rb_eEncodingError = rb_define_class("EncodingError", rb_eStandardError);
+    rb_eEncCompatError = rb_define_class_under(rb_cEncoding, "CompatibilityError", rb_eEncodingError);
 
     syserr_tbl = st_init_numtable();
     rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
@@ -1043,73 +1463,52 @@ Init_Exception()
 }
 
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_raise(VALUE exc, const char *fmt, ...)
-#else
-rb_raise(exc, fmt, va_alist)
-    VALUE exc;
-    const char *fmt;
-    va_dcl
-#endif
 {
     va_list args;
-    char buf[BUFSIZ];
+    VALUE mesg;
 
-    va_init_list(args,fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_start(args, fmt);
+    mesg = rb_vsprintf(fmt, args);
     va_end(args);
-    rb_exc_raise(rb_exc_new2(exc, buf));
+    rb_exc_raise(rb_exc_new3(exc, mesg));
 }
 
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_loaderror(const char *fmt, ...)
-#else
-rb_loaderror(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
 {
     va_list args;
-    char buf[BUFSIZ];
+    VALUE mesg;
 
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_start(args, fmt);
+    mesg = rb_enc_vsprintf(rb_locale_encoding(), fmt, args);
     va_end(args);
-    rb_exc_raise(rb_exc_new2(rb_eLoadError, buf));
+    rb_exc_raise(rb_exc_new3(rb_eLoadError, mesg));
 }
 
 void
-rb_notimplement()
+rb_notimplement(void)
 {
     rb_raise(rb_eNotImpError,
 	     "%s() function is unimplemented on this machine",
-	     rb_id2name(ruby_frame->last_func));
+	     rb_id2name(rb_frame_this_func()));
 }
 
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_fatal(const char *fmt, ...)
-#else
-rb_fatal(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
 {
     va_list args;
-    char buf[BUFSIZ];
+    VALUE mesg;
 
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_start(args, fmt);
+    mesg = rb_vsprintf(fmt, args);
     va_end(args);
 
-    ruby_in_eval = 0;
-    rb_exc_fatal(rb_exc_new2(rb_eFatal, buf));
+    rb_exc_fatal(rb_exc_new3(rb_eFatal, mesg));
 }
 
-void
-rb_sys_fail(mesg)
-    const char *mesg;
+static VALUE
+make_errno_exc(const char *mesg)
 {
     int n = errno;
     VALUE arg;
@@ -1120,446 +1519,96 @@ rb_sys_fail(mesg)
     }
 
     arg = mesg ? rb_str_new2(mesg) : Qnil;
-    rb_exc_raise(rb_class_new_instance(1, &arg, get_syserr(n)));
+    return rb_class_new_instance(1, &arg, get_syserr(n));
+}
+
+void
+rb_sys_fail(const char *mesg)
+{
+    rb_exc_raise(make_errno_exc(mesg));
+}
+
+void
+rb_mod_sys_fail(VALUE mod, const char *mesg)
+{
+    VALUE exc = make_errno_exc(mesg);
+    rb_extend_object(exc, mod);
+    rb_exc_raise(exc);
 }
 
 void
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_sys_warning(const char *fmt, ...)
-#else
-rb_sys_warning(fmt, va_alist)
-     const char *fmt;
-     va_dcl
-#endif
 {
-     char buf[BUFSIZ];
-     va_list args;
-     int errno_save;
-     
-     errno_save = errno;
+    char buf[BUFSIZ];
+    va_list args;
+    int errno_save;
 
-     if (!RTEST(ruby_verbose)) return;
+    errno_save = errno;
 
-     snprintf(buf, BUFSIZ, "warning: %s", fmt);
-     snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
-     
-     va_init_list(args, fmt);
-     warn_print(buf, args);
-     va_end(args);
-     errno = errno_save;
+    if (!RTEST(ruby_verbose)) return;
+
+    snprintf(buf, BUFSIZ, "warning: %s", fmt);
+    snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
+
+    va_start(args, fmt);
+    warn_print(buf, args);
+    va_end(args);
+    errno = errno_save;
 }
 
 void
-rb_load_fail(path)
-    const char *path;
+rb_load_fail(const char *path)
 {
     rb_loaderror("%s -- %s", strerror(errno), path);
 }
 
 void
-rb_error_frozen(what)
-    const char *what;
+rb_error_frozen(const char *what)
 {
-    rb_raise(rb_eTypeError, "can't modify frozen %s", what);
+    rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
 }
 
 void
-rb_check_frozen(obj)
-    VALUE obj;
+rb_check_frozen(VALUE obj)
 {
     if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
 }
 
 void
-Init_syserr()
+Init_syserr(void)
 {
-#ifdef EPERM
-    set_syserr(EPERM, "EPERM");
-#endif
-#ifdef ENOENT
-    set_syserr(ENOENT, "ENOENT");
-#endif
-#ifdef ESRCH
-    set_syserr(ESRCH, "ESRCH");
-#endif
-#ifdef EINTR
-    set_syserr(EINTR, "EINTR");
-#endif
-#ifdef EIO
-    set_syserr(EIO, "EIO");
-#endif
-#ifdef ENXIO
-    set_syserr(ENXIO, "ENXIO");
-#endif
-#ifdef E2BIG
-    set_syserr(E2BIG, "E2BIG");
-#endif
-#ifdef ENOEXEC
-    set_syserr(ENOEXEC, "ENOEXEC");
-#endif
-#ifdef EBADF
-    set_syserr(EBADF, "EBADF");
-#endif
-#ifdef ECHILD
-    set_syserr(ECHILD, "ECHILD");
-#endif
-#ifdef EAGAIN
-    set_syserr(EAGAIN, "EAGAIN");
-#endif
-#ifdef ENOMEM
-    set_syserr(ENOMEM, "ENOMEM");
-#endif
-#ifdef EACCES
-    set_syserr(EACCES, "EACCES");
-#endif
-#ifdef EFAULT
-    set_syserr(EFAULT, "EFAULT");
-#endif
-#ifdef ENOTBLK
-    set_syserr(ENOTBLK, "ENOTBLK");
-#endif
-#ifdef EBUSY
-    set_syserr(EBUSY, "EBUSY");
-#endif
-#ifdef EEXIST
-    set_syserr(EEXIST, "EEXIST");
-#endif
-#ifdef EXDEV
-    set_syserr(EXDEV, "EXDEV");
-#endif
-#ifdef ENODEV
-    set_syserr(ENODEV, "ENODEV");
-#endif
-#ifdef ENOTDIR
-    set_syserr(ENOTDIR, "ENOTDIR");
-#endif
-#ifdef EISDIR
-    set_syserr(EISDIR, "EISDIR");
-#endif
-#ifdef EINVAL
-    set_syserr(EINVAL, "EINVAL");
-#endif
-#ifdef ENFILE
-    set_syserr(ENFILE, "ENFILE");
-#endif
-#ifdef EMFILE
-    set_syserr(EMFILE, "EMFILE");
-#endif
-#ifdef ENOTTY
-    set_syserr(ENOTTY, "ENOTTY");
-#endif
-#ifdef ETXTBSY
-    set_syserr(ETXTBSY, "ETXTBSY");
-#endif
-#ifdef EFBIG
-    set_syserr(EFBIG, "EFBIG");
-#endif
-#ifdef ENOSPC
-    set_syserr(ENOSPC, "ENOSPC");
-#endif
-#ifdef ESPIPE
-    set_syserr(ESPIPE, "ESPIPE");
-#endif
-#ifdef EROFS
-    set_syserr(EROFS, "EROFS");
-#endif
-#ifdef EMLINK
-    set_syserr(EMLINK, "EMLINK");
-#endif
-#ifdef EPIPE
-    set_syserr(EPIPE, "EPIPE");
-#endif
-#ifdef EDOM
-    set_syserr(EDOM, "EDOM");
-#endif
-#ifdef ERANGE
-    set_syserr(ERANGE, "ERANGE");
-#endif
-#ifdef EDEADLK
-    set_syserr(EDEADLK, "EDEADLK");
-#endif
-#ifdef ENAMETOOLONG
-    set_syserr(ENAMETOOLONG, "ENAMETOOLONG");
-#endif
-#ifdef ENOLCK
-    set_syserr(ENOLCK, "ENOLCK");
-#endif
-#ifdef ENOSYS
-    set_syserr(ENOSYS, "ENOSYS");
-#endif
-#ifdef ENOTEMPTY
-    set_syserr(ENOTEMPTY, "ENOTEMPTY");
-#endif
-#ifdef ELOOP
-    set_syserr(ELOOP, "ELOOP");
-#endif
-#ifdef EWOULDBLOCK
-    set_syserr(EWOULDBLOCK, "EWOULDBLOCK");
-#endif
-#ifdef ENOMSG
-    set_syserr(ENOMSG, "ENOMSG");
-#endif
-#ifdef EIDRM
-    set_syserr(EIDRM, "EIDRM");
-#endif
-#ifdef ECHRNG
-    set_syserr(ECHRNG, "ECHRNG");
-#endif
-#ifdef EL2NSYNC
-    set_syserr(EL2NSYNC, "EL2NSYNC");
-#endif
-#ifdef EL3HLT
-    set_syserr(EL3HLT, "EL3HLT");
-#endif
-#ifdef EL3RST
-    set_syserr(EL3RST, "EL3RST");
-#endif
-#ifdef ELNRNG
-    set_syserr(ELNRNG, "ELNRNG");
-#endif
-#ifdef EUNATCH
-    set_syserr(EUNATCH, "EUNATCH");
-#endif
-#ifdef ENOCSI
-    set_syserr(ENOCSI, "ENOCSI");
-#endif
-#ifdef EL2HLT
-    set_syserr(EL2HLT, "EL2HLT");
-#endif
-#ifdef EBADE
-    set_syserr(EBADE, "EBADE");
-#endif
-#ifdef EBADR
-    set_syserr(EBADR, "EBADR");
-#endif
-#ifdef EXFULL
-    set_syserr(EXFULL, "EXFULL");
-#endif
-#ifdef ENOANO
-    set_syserr(ENOANO, "ENOANO");
-#endif
-#ifdef EBADRQC
-    set_syserr(EBADRQC, "EBADRQC");
-#endif
-#ifdef EBADSLT
-    set_syserr(EBADSLT, "EBADSLT");
-#endif
-#ifdef EDEADLOCK
-    set_syserr(EDEADLOCK, "EDEADLOCK");
-#endif
-#ifdef EBFONT
-    set_syserr(EBFONT, "EBFONT");
-#endif
-#ifdef ENOSTR
-    set_syserr(ENOSTR, "ENOSTR");
-#endif
-#ifdef ENODATA
-    set_syserr(ENODATA, "ENODATA");
-#endif
-#ifdef ETIME
-    set_syserr(ETIME, "ETIME");
-#endif
-#ifdef ENOSR
-    set_syserr(ENOSR, "ENOSR");
-#endif
-#ifdef ENONET
-    set_syserr(ENONET, "ENONET");
-#endif
-#ifdef ENOPKG
-    set_syserr(ENOPKG, "ENOPKG");
-#endif
-#ifdef EREMOTE
-    set_syserr(EREMOTE, "EREMOTE");
-#endif
-#ifdef ENOLINK
-    set_syserr(ENOLINK, "ENOLINK");
-#endif
-#ifdef EADV
-    set_syserr(EADV, "EADV");
-#endif
-#ifdef ESRMNT
-    set_syserr(ESRMNT, "ESRMNT");
-#endif
-#ifdef ECOMM
-    set_syserr(ECOMM, "ECOMM");
-#endif
-#ifdef EPROTO
-    set_syserr(EPROTO, "EPROTO");
-#endif
-#ifdef EMULTIHOP
-    set_syserr(EMULTIHOP, "EMULTIHOP");
-#endif
-#ifdef EDOTDOT
-    set_syserr(EDOTDOT, "EDOTDOT");
-#endif
-#ifdef EBADMSG
-    set_syserr(EBADMSG, "EBADMSG");
-#endif
-#ifdef EOVERFLOW
-    set_syserr(EOVERFLOW, "EOVERFLOW");
-#endif
-#ifdef ENOTUNIQ
-    set_syserr(ENOTUNIQ, "ENOTUNIQ");
-#endif
-#ifdef EBADFD
-    set_syserr(EBADFD, "EBADFD");
-#endif
-#ifdef EREMCHG
-    set_syserr(EREMCHG, "EREMCHG");
-#endif
-#ifdef ELIBACC
-    set_syserr(ELIBACC, "ELIBACC");
-#endif
-#ifdef ELIBBAD
-    set_syserr(ELIBBAD, "ELIBBAD");
-#endif
-#ifdef ELIBSCN
-    set_syserr(ELIBSCN, "ELIBSCN");
-#endif
-#ifdef ELIBMAX
-    set_syserr(ELIBMAX, "ELIBMAX");
-#endif
-#ifdef ELIBEXEC
-    set_syserr(ELIBEXEC, "ELIBEXEC");
-#endif
-#ifdef EILSEQ
-    set_syserr(EILSEQ, "EILSEQ");
-#endif
-#ifdef ERESTART
-    set_syserr(ERESTART, "ERESTART");
-#endif
-#ifdef ESTRPIPE
-    set_syserr(ESTRPIPE, "ESTRPIPE");
-#endif
-#ifdef EUSERS
-    set_syserr(EUSERS, "EUSERS");
-#endif
-#ifdef ENOTSOCK
-    set_syserr(ENOTSOCK, "ENOTSOCK");
-#endif
-#ifdef EDESTADDRREQ
-    set_syserr(EDESTADDRREQ, "EDESTADDRREQ");
-#endif
-#ifdef EMSGSIZE
-    set_syserr(EMSGSIZE, "EMSGSIZE");
-#endif
-#ifdef EPROTOTYPE
-    set_syserr(EPROTOTYPE, "EPROTOTYPE");
-#endif
-#ifdef ENOPROTOOPT
-    set_syserr(ENOPROTOOPT, "ENOPROTOOPT");
-#endif
-#ifdef EPROTONOSUPPORT
-    set_syserr(EPROTONOSUPPORT, "EPROTONOSUPPORT");
-#endif
-#ifdef ESOCKTNOSUPPORT
-    set_syserr(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT");
-#endif
-#ifdef EOPNOTSUPP
-    set_syserr(EOPNOTSUPP, "EOPNOTSUPP");
-#endif
-#ifdef EPFNOSUPPORT
-    set_syserr(EPFNOSUPPORT, "EPFNOSUPPORT");
-#endif
-#ifdef EAFNOSUPPORT
-    set_syserr(EAFNOSUPPORT, "EAFNOSUPPORT");
-#endif
-#ifdef EADDRINUSE
-    set_syserr(EADDRINUSE, "EADDRINUSE");
-#endif
-#ifdef EADDRNOTAVAIL
-    set_syserr(EADDRNOTAVAIL, "EADDRNOTAVAIL");
-#endif
-#ifdef ENETDOWN
-    set_syserr(ENETDOWN, "ENETDOWN");
-#endif
-#ifdef ENETUNREACH
-    set_syserr(ENETUNREACH, "ENETUNREACH");
-#endif
-#ifdef ENETRESET
-    set_syserr(ENETRESET, "ENETRESET");
-#endif
-#ifdef ECONNABORTED
-    set_syserr(ECONNABORTED, "ECONNABORTED");
-#endif
-#ifdef ECONNRESET
-    set_syserr(ECONNRESET, "ECONNRESET");
-#endif
-#ifdef ENOBUFS
-    set_syserr(ENOBUFS, "ENOBUFS");
-#endif
-#ifdef EISCONN
-    set_syserr(EISCONN, "EISCONN");
-#endif
-#ifdef ENOTCONN
-    set_syserr(ENOTCONN, "ENOTCONN");
-#endif
-#ifdef ESHUTDOWN
-    set_syserr(ESHUTDOWN, "ESHUTDOWN");
-#endif
-#ifdef ETOOMANYREFS
-    set_syserr(ETOOMANYREFS, "ETOOMANYREFS");
-#endif
-#ifdef ETIMEDOUT
-    set_syserr(ETIMEDOUT, "ETIMEDOUT");
-#endif
-#ifdef ECONNREFUSED
-    set_syserr(ECONNREFUSED, "ECONNREFUSED");
-#endif
-#ifdef EHOSTDOWN
-    set_syserr(EHOSTDOWN, "EHOSTDOWN");
-#endif
-#ifdef EHOSTUNREACH
-    set_syserr(EHOSTUNREACH, "EHOSTUNREACH");
-#endif
-#ifdef EALREADY
-    set_syserr(EALREADY, "EALREADY");
-#endif
-#ifdef EINPROGRESS
-    set_syserr(EINPROGRESS, "EINPROGRESS");
-#endif
-#ifdef ESTALE
-    set_syserr(ESTALE, "ESTALE");
-#endif
-#ifdef EUCLEAN
-    set_syserr(EUCLEAN, "EUCLEAN");
-#endif
-#ifdef ENOTNAM
-    set_syserr(ENOTNAM, "ENOTNAM");
-#endif
-#ifdef ENAVAIL
-    set_syserr(ENAVAIL, "ENAVAIL");
-#endif
-#ifdef EISNAM
-    set_syserr(EISNAM, "EISNAM");
-#endif
-#ifdef EREMOTEIO
-    set_syserr(EREMOTEIO, "EREMOTEIO");
-#endif
-#ifdef EDQUOT
-    set_syserr(EDQUOT, "EDQUOT");
-#endif
+    rb_eNOERROR = set_syserr(0, "NOERROR");
+#define defined_error(name, num) set_syserr(num, name);
+#define undefined_error(name) set_syserr(0, name);
+#include "known_errors.inc"
+#undef defined_error
+#undef undefined_error
 }
 
 static void
-err_append(s)
-    const char *s;
+err_append(const char *s)
 {
-    extern VALUE ruby_errinfo;
+    rb_thread_t *th = GET_THREAD();
+    VALUE err = th->errinfo;
 
-    if (ruby_in_eval) {
-	if (NIL_P(ruby_errinfo)) {
-	    ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s);
+    if (th->mild_compile_error) {
+	if (!RTEST(err)) {
+	    err = rb_exc_new2(rb_eSyntaxError, s);
+	    th->errinfo = err;
 	}
 	else {
-	    VALUE str = rb_obj_as_string(ruby_errinfo);
+	    VALUE str = rb_obj_as_string(err);
 
 	    rb_str_cat2(str, "\n");
 	    rb_str_cat2(str, s);
-	    ruby_errinfo = rb_exc_new3(rb_eSyntaxError, str);
+	    th->errinfo = rb_exc_new3(rb_eSyntaxError, str);
 	}
     }
     else {
+	if (!RTEST(err)) {
+	    err = rb_exc_new2(rb_eSyntaxError, "compile error");
+	    th->errinfo = err;
+	}
 	rb_write_error(s);
 	rb_write_error("\n");
     }
diff --git a/eval.c b/eval.c
index 28384488ad..a2516f9ec9 100644
--- a/eval.c
+++ b/eval.c
@@ -3,1616 +3,188 @@
   eval.c -
 
   $Author$
-  $Date$
   created at: Thu Jun 10 14:22:17 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "node.h"
-#include "env.h"
-#include "util.h"
-#include "rubysig.h"
+#include "eval_intern.h"
+#include "iseq.h"
+#include "gc.h"
+#include "ruby/vm.h"
+#include "ruby/encoding.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-#include <stdio.h>
-
-#include "st.h"
-#include "dln.h"
-
-#ifdef __APPLE__
-#include <crt_externs.h>
-#endif
-
-/* Make alloca work the best possible way.  */
-#ifdef __GNUC__
-# ifndef atarist
-#  ifndef alloca
-#   define alloca __builtin_alloca
-#  endif
-# endif /* atarist */
-#else
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifndef _AIX
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca ();
-#   endif
-#  endif /* AIX */
-# endif /* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
-
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-
-#ifndef HAVE_STRING_H
-char *strrchr _((const char*,const char));
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef __BEOS__
-#include <net/socket.h>
-#endif
-
-#ifdef __MACOS__
-#include "macruby_private.h"
-#endif
+#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
 
-#ifdef __VMS
-#include "vmsruby_private.h"
-#endif
-
-#ifdef USE_CONTEXT
-
-NORETURN(static void rb_jump_context(rb_jmpbuf_t, int));
-static inline void
-rb_jump_context(env, val)
-    rb_jmpbuf_t env;
-    int val;
-{
-    env->status = val;
-    setcontext(&env->context);
-    abort();			/* ensure noreturn */
-}
-/*
- * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc,
- * IA64 register stack and SPARC register window combination problem.
- *
- * Assume following code sequence.
- * 
- * 1. set a register in the register stack/window such as r32/l0.
- * 2. call getcontext.
- * 3. use the register.
- * 4. update the register for other use.
- * 5. call setcontext indirectly (or directly).
- *
- * This code should be run as 1->2->3->4->5->3->4.
- * But after second getcontext return (second 3),
- * the register is broken (updated).
- * It's because getcontext/setcontext doesn't preserve the content of the
- * register stack/window.
- *
- * setjmp also doesn't preserve the content of the register stack/window.
- * But it has not the problem because gcc knows setjmp may return twice.
- * gcc detects setjmp and generates setjmp safe code.
- *
- * So setjmp calls before and after the getcontext call makes the code
- * somewhat safe.
- * It fix the problem on IA64.
- * It is not required that setjmp is called at run time, since the problem is
- * register usage.
- *
- * Since the magic setjmp is not enough for SPARC,
- * inline asm is used to prohibit registers in register windows.
- *
- * Since the problem is fixed at gcc 4.0.3, the magic is applied only for
- * prior versions of gcc.
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21957
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127
- */
-#  define GCC_VERSION_BEFORE(major, minor, patchlevel) \
-    (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
-     ((__GNUC__ < (major)) ||  \
-      (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
-      (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
-#  if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__))
-#    ifdef __pic__
-/*
- * %l7 is excluded for PIC because it is PIC register.
- * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
- */
-#      define PRE_GETCONTEXT \
-	 ({ __asm__ volatile ("" : : :  \
-	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
-	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \
-	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-#    else
-#      define PRE_GETCONTEXT \
-	 ({ __asm__ volatile ("" : : :  \
-	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
-	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
-	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-#    endif
-#    define POST_GETCONTEXT PRE_GETCONTEXT
-#  elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64)
-static jmp_buf function_call_may_return_twice_jmp_buf;
-int function_call_may_return_twice_false_1 = 0;
-int function_call_may_return_twice_false_2 = 0;
-#    define PRE_GETCONTEXT \
-       (function_call_may_return_twice_false_1 ? \
-        setjmp(function_call_may_return_twice_jmp_buf) : \
-        0)
-#    define POST_GETCONTEXT \
-       (function_call_may_return_twice_false_2 ? \
-        setjmp(function_call_may_return_twice_jmp_buf) : \
-        0)
-#  elif defined(__FreeBSD__) && __FreeBSD__ < 7
-/*
- * workaround for FreeBSD/i386 getcontext/setcontext bug.
- * clear the carry flag by (0 ? ... : ...).
- * FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110
- * [ruby-dev:28263]
- */
-static int volatile freebsd_clear_carry_flag = 0;
-#    define PRE_GETCONTEXT \
-       (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0)
-#  endif
-#  ifndef PRE_GETCONTEXT
-#    define PRE_GETCONTEXT 0
-#  endif
-#  ifndef POST_GETCONTEXT
-#    define POST_GETCONTEXT 0
-#  endif
-#  define ruby_longjmp(env, val) rb_jump_context(env, val)
-#  define ruby_setjmp(just_before_setjmp, j) ((j)->status = 0, \
-     (just_before_setjmp), \
-     PRE_GETCONTEXT, \
-     getcontext(&(j)->context), \
-     POST_GETCONTEXT, \
-     (j)->status)
-#else
-#  if !defined(setjmp) && defined(HAVE__SETJMP)
-#    define ruby_setjmp(just_before_setjmp, env) \
-       ((just_before_setjmp), _setjmp(env))
-#    define ruby_longjmp(env,val) _longjmp(env,val)
-#  else
-#    define ruby_setjmp(just_before_setjmp, env) \
-       ((just_before_setjmp), setjmp(env))
-#    define ruby_longjmp(env,val) longjmp(env,val)
-#  endif
-#endif
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#if defined(__VMS)
-#pragma nostandard
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#include <sys/stat.h>
-
-VALUE rb_cProc;
-VALUE rb_cBinding;
-static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
-static VALUE rb_f_binding _((VALUE));
-static void rb_f_END _((void));
-static VALUE rb_f_block_given_p _((void));
-static VALUE block_pass _((VALUE,NODE*));
-
-VALUE rb_cMethod;
-static VALUE method_call _((int, VALUE*, VALUE));
-VALUE rb_cUnboundMethod;
-static VALUE umethod_bind _((VALUE, VALUE));
-static VALUE rb_mod_define_method _((int, VALUE*, VALUE));
-NORETURN(static void rb_raise_jump _((VALUE)));
-static VALUE rb_make_exception _((int argc, VALUE *argv));
-
-static int scope_vmode;
-#define SCOPE_PUBLIC    0
-#define SCOPE_PRIVATE   1
-#define SCOPE_PROTECTED 2
-#define SCOPE_MODFUNC   5
-#define SCOPE_MASK      7
-#define SCOPE_SET(f)  (scope_vmode=(f))
-#define SCOPE_TEST(f) (scope_vmode&(f))
-
-VALUE (*ruby_sandbox_save)_((rb_thread_t));
-VALUE (*ruby_sandbox_restore)_((rb_thread_t));
-NODE* ruby_current_node;
-int ruby_safe_level = 0;
-/* safe-level:
-   0 - strings from streams/environment/ARGV are tainted (default)
-   1 - no dangerous operation by tainted value
-   2 - process/file operations prohibited
-   3 - all generated objects are tainted
-   4 - no global (non-tainted) variable modification/no direct output
-*/
-
-static VALUE safe_getter _((void));
-static void safe_setter _((VALUE val));
-
-void
-rb_secure(level)
-    int level;
-{
-    if (level <= ruby_safe_level) {
-	if (ruby_frame->last_func) {
-	    rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
-		     rb_id2name(ruby_frame->last_func), ruby_safe_level);
-	}
-	else {
-	    rb_raise(rb_eSecurityError, "Insecure operation at level %d", ruby_safe_level);
-	}
-    }
-}
-
-void
-rb_secure_update(obj)
-    VALUE obj;
-{
-    if (!OBJ_TAINTED(obj)) rb_secure(4);
-}
-
-void
-rb_check_safe_obj(x)
-    VALUE x;
-{
-    if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
-	if (ruby_frame->last_func) {
-	    rb_raise(rb_eSecurityError, "Insecure operation - %s",
-		     rb_id2name(ruby_frame->last_func));
-	}
-	else {
-	    rb_raise(rb_eSecurityError, "Insecure operation: -r");
-	}
-    }
-    rb_secure(4);
-}
-
-void
-rb_check_safe_str(x)
-    VALUE x;
-{
-    rb_check_safe_obj(x);
-    if (TYPE(x)!= T_STRING) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
-		 rb_obj_classname(x));
-    }
-}
-
-NORETURN(static void print_undef _((VALUE, ID)));
-static void
-print_undef(klass, id)
-    VALUE klass;
-    ID id;
-{
-    rb_name_error(id, "undefined method `%s' for %s `%s'",
-		  rb_id2name(id),
-		  (TYPE(klass) == T_MODULE) ? "module" : "class",
-		  rb_class2name(klass));
-}
-
-static ID removed, singleton_removed, undefined, singleton_undefined;
-
-#define CACHE_SIZE 0x800
-#define CACHE_MASK 0x7ff
-#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK)
-
-struct cache_entry {		/* method hash table. */
-    ID mid;			/* method's id */
-    ID mid0;			/* method's original id */
-    VALUE klass;		/* receiver's class */
-    VALUE origin;		/* where method defined  */
-    NODE *method;
-    int noex;
-};
-
-static struct cache_entry cache[CACHE_SIZE];
-static int ruby_running = 0;
-
-void
-rb_clear_cache()
-{
-   struct cache_entry *ent, *end;
-
-    if (!ruby_running) return;
-    ent = cache; end = ent + CACHE_SIZE;
-    while (ent < end) {
-	ent->mid = 0;
-	ent++;
-    }
-}
-
-static void
-rb_clear_cache_for_undef(klass, id)
-    VALUE klass;
-    ID id;
-{
-    struct cache_entry *ent, *end;
-
-    if (!ruby_running) return;
-    ent = cache; end = ent + CACHE_SIZE;
-    while (ent < end) {
-	if (ent->mid == id &&
-	    RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
-	    ent->mid = 0;
-	}
-	ent++;
-    }
-}
-
-static void
-rb_clear_cache_by_id(id)
-    ID id;
-{
-    struct cache_entry *ent, *end;
-
-    if (!ruby_running) return;
-    ent = cache; end = ent + CACHE_SIZE;
-    while (ent < end) {
-	if (ent->mid == id) {
-	    ent->mid = 0;
-	}
-	ent++;
-    }
-}
-
-void
-rb_clear_cache_by_class(klass)
-    VALUE klass;
-{
-    struct cache_entry *ent, *end;
-
-    if (!ruby_running) return;
-    ent = cache; end = ent + CACHE_SIZE;
-    while (ent < end) {
-	if (ent->klass == klass || ent->origin == klass) {
-	    ent->mid = 0;
-	}
-	ent++;
-    }
-}
-
-static ID init, eqq, each, aref, aset, match, missing;
-static ID added, singleton_added;
-static ID __id__, __send__, respond_to;
-
-#define NOEX_TAINTED 8
-#define NOEX_SAFE(n) ((n) >> 4)
-#define NOEX_WITH(n, v) ((n) | (v) << 4)
-#define NOEX_WITH_SAFE(n) NOEX_WITH(n, ruby_safe_level)
-
-void
-rb_add_method(klass, mid, node, noex)
-    VALUE klass;
-    ID mid;
-    NODE *node;
-    int noex;
-{
-    NODE *body;
-
-    if (NIL_P(klass)) klass = rb_cObject;
-    if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) {
-	rb_raise(rb_eSecurityError, "Insecure: can't define method");
-    }
-    if (!FL_TEST(klass, FL_SINGLETON) &&
-	node && nd_type(node) != NODE_ZSUPER &&
-	(mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) {
-	noex = NOEX_PRIVATE | noex;
-    }
-    else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
-	     mid == rb_intern("allocate")) {
-	rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
-		rb_class2name(rb_iv_get(klass, "__attached__")));
-	mid = ID_ALLOCATOR;
-    }
-    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
-    rb_clear_cache_by_id(mid);
-    body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
-    st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
-    if (node && mid != ID_ALLOCATOR && ruby_running) {
-	if (FL_TEST(klass, FL_SINGLETON)) {
-	    rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
-	}
-	else {
-	    rb_funcall(klass, added, 1, ID2SYM(mid));
-	}
-    }
-}
-
-void
-rb_define_alloc_func(klass, func)
-    VALUE klass;
-    VALUE (*func) _((VALUE));
-{
-    Check_Type(klass, T_CLASS);
-    rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0),
-		  NOEX_PRIVATE);
-}
-
-void
-rb_undef_alloc_func(klass)
-    VALUE klass;
-{
-    Check_Type(klass, T_CLASS);
-    rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
-}
-
-static NODE*
-search_method(klass, id, origin)
-    VALUE klass, *origin;
-    ID id;
-{
-    NODE *body;
-
-    if (!klass) return 0;
-    while (!st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *)&body)) {
-	klass = RCLASS(klass)->super;
-	if (!klass) return 0;
-    }
-
-    if (origin) *origin = klass;
-    return body;
-}
-
-static NODE*
-rb_get_method_body(klassp, idp, noexp)
-    VALUE *klassp;
-    ID *idp;
-    int *noexp;
-{
-    ID id = *idp;
-    VALUE klass = *klassp;
-    VALUE origin;
-    NODE * volatile body;
-    struct cache_entry *ent;
-
-    if ((body = search_method(klass, id, &origin)) == 0 || !body->nd_body) {
-	/* store empty info in cache */
-	ent = cache + EXPR1(klass, id);
-	ent->klass  = klass;
-	ent->origin = klass;
-	ent->mid = ent->mid0 = id;
-	ent->noex   = 0;
-	ent->method = 0;
-
-	return 0;
-    }
-
-    if (ruby_running) {
-	/* store in cache */
-	ent = cache + EXPR1(klass, id);
-	ent->klass  = klass;
-	ent->noex   = body->nd_noex;
-	if (noexp) *noexp = body->nd_noex;
-	body = body->nd_body;
-	if (nd_type(body) == NODE_FBODY) {
-	    ent->mid = id;
-	    *klassp = body->nd_orig;
-	    ent->origin = body->nd_orig;
-	    *idp = ent->mid0 = body->nd_mid;
-	    body = ent->method = body->nd_head;
-	}
-	else {
-	    *klassp = origin;
-	    ent->origin = origin;
-	    ent->mid = ent->mid0 = id;
-	    ent->method = body;
-	}
-    }
-    else {
-	if (noexp) *noexp = body->nd_noex;
-	body = body->nd_body;
-	if (nd_type(body) == NODE_FBODY) {
-	    *klassp = body->nd_orig;
-	    *idp = body->nd_mid;
-	    body = body->nd_head;
-	}
-	else {
-	    *klassp = origin;
-	}
-    }
-
-    return body;
-}
-
-NODE*
-rb_method_node(klass, id)
-    VALUE klass;
-    ID id;
-{
-    int noex;
-
-    return rb_get_method_body(&klass, &id, &noex);
-}
-
-static void
-remove_method(klass, mid)
-    VALUE klass;
-    ID mid;
-{
-    NODE *body;
-
-    if (klass == rb_cObject) {
-	rb_secure(4);
-    }
-    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't remove method");
-    }
-    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
-    if (mid == __id__ || mid == __send__ || mid == init) {
-	rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
-    }
-    if (st_lookup(RCLASS(klass)->m_tbl, mid, (st_data_t *)&body)) {
-	if (!body || !body->nd_body) body = 0;
-	else {
-	    st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body);
-	}
-    }
-    if (!body) {
-	rb_name_error(mid, "method `%s' not defined in %s",
-		      rb_id2name(mid), rb_class2name(klass));
-    }
-    rb_clear_cache_for_undef(klass, mid);
-    if (FL_TEST(klass, FL_SINGLETON)) {
-	rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid));
-    }
-    else {
-	rb_funcall(klass, removed, 1, ID2SYM(mid));
-    }
-}
-
-void
-rb_remove_method(klass, name)
-    VALUE klass;
-    const char *name;
-{
-    remove_method(klass, rb_intern(name));
-}
-
-/*
- *  call-seq:
- *     remove_method(symbol)   => self
- *  
- *  Removes the method identified by _symbol_ from the current
- *  class. For an example, see <code>Module.undef_method</code>.
- */
-
-static VALUE
-rb_mod_remove_method(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    int i;
-
-    for (i=0; i<argc; i++) {
-	remove_method(mod, rb_to_id(argv[i]));
-    }
-    return mod;
-}
-
-#undef rb_disable_super
-#undef rb_enable_super
-
-void
-rb_disable_super(klass, name)
-    VALUE klass;
-    const char *name;
-{
-    /* obsolete - no use */
-}
-
-void
-rb_enable_super(klass, name)
-    VALUE klass;
-    const char *name;
-{
-    rb_warn("rb_enable_super() is obsolete");
-}
-
-static void
-rb_export_method(klass, name, noex)
-    VALUE klass;
-    ID name;
-    ID noex;
-{
-    NODE *body;
-    VALUE origin;
-
-    if (klass == rb_cObject) {
-	rb_secure(4);
-    }
-    body = search_method(klass, name, &origin);
-    if (!body && TYPE(klass) == T_MODULE) {
-	body = search_method(rb_cObject, name, &origin);
-    }
-    if (!body || !body->nd_body) {
-	print_undef(klass, name);
-    }
-    if (body->nd_noex != noex) {
-	if (klass == origin) {
-	    body->nd_noex = noex;
-	}
-	else {
-	    rb_add_method(klass, name, NEW_ZSUPER(), noex);
-	}
-    }
-}
-
-int
-rb_method_boundp(klass, id, ex)
-    VALUE klass;
-    ID id;
-    int ex;
-{
-    struct cache_entry *ent;
-    int noex;
-
-    /* is it in the method cache? */
-    ent = cache + EXPR1(klass, id);
-    if (ent->mid == id && ent->klass == klass) {
-	if (ex && (ent->noex & NOEX_PRIVATE))
-	    return Qfalse;
-	if (!ent->method) return Qfalse;
-	return Qtrue;
-    }
-    if (rb_get_method_body(&klass, &id, &noex)) {
-	if (ex && (noex & NOEX_PRIVATE))
-	    return Qfalse;
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-void
-rb_attr(klass, id, read, write, ex)
-    VALUE klass;
-    ID id;
-    int read, write, ex;
-{
-    const char *name;
-    char *buf;
-    ID attriv;
-    int noex;
-    size_t len;
-
-    if (!ex) noex = NOEX_PUBLIC;
-    else {
-	if (SCOPE_TEST(SCOPE_PRIVATE)) {
-	    noex = NOEX_PRIVATE;
-	    rb_warning((scope_vmode == SCOPE_MODFUNC) ?
-		       "attribute accessor as module_function" :
-		       "private attribute?");
-	}
-	else if (SCOPE_TEST(SCOPE_PROTECTED)) {
-	    noex = NOEX_PROTECTED;
-	}
-	else {
-	    noex = NOEX_PUBLIC;
-	}
-    }
-
-    if (!rb_is_local_id(id) && !rb_is_const_id(id)) {
-	rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id));
-    }
-    name = rb_id2name(id);
-    if (!name) {
-	rb_raise(rb_eArgError, "argument needs to be symbol or string");
-    }
-    len = strlen(name)+2;
-    buf = ALLOCA_N(char,len);
-    snprintf(buf, len, "@%s", name);
-    attriv = rb_intern(buf);
-    if (read) {
-	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
-    }
-    if (write) {
-	rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
-    }
-}
-
-extern int ruby_in_compile;
-
-VALUE ruby_errinfo = Qnil;
-extern NODE *ruby_eval_tree_begin;
-extern NODE *ruby_eval_tree;
-extern int ruby_nerrs;
+VALUE proc_invoke(VALUE, VALUE, VALUE, VALUE);
+VALUE rb_binding_new(void);
+NORETURN(void rb_raise_jump(VALUE));
 
+ID rb_frame_callee(void);
 VALUE rb_eLocalJumpError;
 VALUE rb_eSysStackError;
 
-extern VALUE ruby_top_self;
-
-struct FRAME *ruby_frame;
-struct SCOPE *ruby_scope;
-static struct FRAME *top_frame;
-static struct SCOPE *top_scope;
-
-static unsigned long frame_unique = 0;
-
-#define PUSH_FRAME() do {		\
-    struct FRAME _frame;		\
-    _frame.prev = ruby_frame;		\
-    _frame.tmp  = 0;			\
-    _frame.node = ruby_current_node;	\
-    _frame.iter = ruby_iter->iter;	\
-    _frame.argc = 0;			\
-    _frame.flags = 0;			\
-    _frame.uniq = frame_unique++;	\
-    ruby_frame = &_frame
-
-#define POP_FRAME()  			\
-    ruby_current_node = _frame.node;	\
-    ruby_frame = _frame.prev;		\
-} while (0)
-
-struct BLOCK {
-    NODE *var;
-    NODE *body;
-    VALUE self;
-    struct FRAME frame;
-    struct SCOPE *scope;
-    VALUE klass;
-    NODE *cref;
-    int iter;
-    int vmode;
-    int flags;
-    int uniq;
-    struct RVarmap *dyna_vars;
-    VALUE orig_thread;
-    VALUE wrapper;
-    VALUE block_obj;
-    struct BLOCK *outer;
-    struct BLOCK *prev;
-};
-
-#define BLOCK_D_SCOPE 1
-#define BLOCK_LAMBDA  2
-
-static struct BLOCK *ruby_block;
-static unsigned long block_unique = 1;
-
-#define PUSH_BLOCK(v,b) do {		\
-    struct BLOCK _block;		\
-    _block.var = (v);			\
-    _block.body = (b);			\
-    _block.self = self;			\
-    _block.frame = *ruby_frame;		\
-    _block.klass = ruby_class;		\
-    _block.cref = ruby_cref;		\
-    _block.frame.node = ruby_current_node;\
-    _block.scope = ruby_scope;		\
-    _block.prev = ruby_block;		\
-    _block.outer = ruby_block;		\
-    _block.iter = ruby_iter->iter;	\
-    _block.vmode = scope_vmode;		\
-    _block.flags = BLOCK_D_SCOPE;	\
-    _block.dyna_vars = ruby_dyna_vars;	\
-    _block.wrapper = ruby_wrapper;	\
-    _block.block_obj = 0;		\
-    _block.uniq = (b)?block_unique++:0; \
-    if (b) {				\
-	prot_tag->blkid = _block.uniq;  \
-    }                                   \
-    ruby_block = &_block
-
-#define POP_BLOCK() \
-   ruby_block = _block.prev; \
-} while (0)
-
-struct RVarmap *ruby_dyna_vars;
-#define PUSH_VARS() do { \
-    struct RVarmap * volatile _old; \
-    _old = ruby_dyna_vars; \
-    ruby_dyna_vars = 0
-
-#define POP_VARS() \
-    if (_old && (ruby_scope->flags & SCOPE_DONT_RECYCLE)) {\
-	if (RBASIC(_old)->flags) /* unless it's already recycled */ \
-	    FL_SET(_old, DVAR_DONT_RECYCLE); \
-    }\
-    ruby_dyna_vars = _old; \
-} while (0)
-
-#define DVAR_DONT_RECYCLE FL_USER2
-
-#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH)
-
-static struct RVarmap*
-new_dvar(id, value, prev)
-    ID id;
-    VALUE value;
-    struct RVarmap *prev;
-{
-    NEWOBJ(vars, struct RVarmap);
-    OBJSETUP(vars, 0, T_VARMAP);
-    vars->id = id;
-    vars->val = value;
-    vars->next = prev;
-
-    return vars;
-}
-
-VALUE
-rb_dvar_defined(id)
-    ID id;
-{
-    struct RVarmap *vars = ruby_dyna_vars;
-
-    while (vars) {
-	if (vars->id == id) return Qtrue;
-	vars = vars->next;
-    }
-    return Qfalse;
-}
+#define exception_error GET_VM()->special_exceptions[ruby_error_reenter]
 
-VALUE
-rb_dvar_curr(id)
-    ID id;
-{
-    struct RVarmap *vars = ruby_dyna_vars;
+#include "eval_error.c"
+#include "eval_jump.c"
 
-    while (vars) {
-	if (vars->id == 0) break;
-	if (vars->id == id) return Qtrue;
-	vars = vars->next;
-    }
-    return Qfalse;
-}
+/* initialize ruby */
 
-VALUE
-rb_dvar_ref(id)
-    ID id;
-{
-    struct RVarmap *vars = ruby_dyna_vars;
+void rb_clear_trace_func(void);
+void rb_thread_stop_timer_thread(void);
 
-    while (vars) {
-	if (vars->id == id) {
-	    return vars->val;
-	}
-	vars = vars->next;
-    }
-    return Qnil;
-}
+void rb_call_inits(void);
+void Init_heap(void);
+void Init_BareVM(void);
 
 void
-rb_dvar_push(id, value)
-    ID id;
-    VALUE value;
-{
-    ruby_dyna_vars = new_dvar(id, value, ruby_dyna_vars);
-}
-
-static void
-dvar_asgn_internal(id, value, curr)
-    ID id;
-    VALUE value;
-    int curr;
-{
-    int n = 0;
-    struct RVarmap *vars = ruby_dyna_vars;
-
-    while (vars) {
-	if (curr && vars->id == 0) {
-	    /* first null is a dvar header */
-	    n++;
-	    if (n == 2) break;
-	}
-	if (vars->id == id) {
-	    vars->val = value;
-	    return;
-	}
-	vars = vars->next;
-    }
-    if (!ruby_dyna_vars) {
-	ruby_dyna_vars = new_dvar(id, value, 0);
-    }
-    else {
-	vars = new_dvar(id, value, ruby_dyna_vars->next);
-	ruby_dyna_vars->next = vars;
-    }
-}
-
-static inline void
-dvar_asgn(id, value)
-    ID id;
-    VALUE value;
-{
-    dvar_asgn_internal(id, value, 0);
-}
-
-static inline void
-dvar_asgn_curr(id, value)
-    ID id;
-    VALUE value;
-{
-    dvar_asgn_internal(id, value, 1);
-}
-
-VALUE *
-rb_svar(cnt)
-    int cnt;
-{
-    struct RVarmap *vars = ruby_dyna_vars;
-    ID id;
-
-    if (!ruby_scope->local_tbl) return NULL;
-    if (cnt >= ruby_scope->local_tbl[0]) return NULL;
-    id = ruby_scope->local_tbl[cnt+1];
-    while (vars) {
-	if (vars->id == id) return &vars->val;
-	vars = vars->next;
-    }
-    if (ruby_scope->local_vars == 0) return NULL;
-    return &ruby_scope->local_vars[cnt];
-}
-
-struct iter {
-    int iter;
-    struct iter *prev;
-};
-static struct iter *ruby_iter;
-
-#define ITER_NOT 0
-#define ITER_PRE 1
-#define ITER_CUR 2
-#define ITER_PAS 3
-
-#define PUSH_ITER(i) do {		\
-    struct iter _iter;			\
-    _iter.prev = ruby_iter;		\
-    _iter.iter = (i);			\
-    ruby_iter = &_iter
-
-#define POP_ITER()			\
-    ruby_iter = _iter.prev;		\
-} while (0)
-
-struct tag {
-    rb_jmpbuf_t buf;
-    struct FRAME *frame;
-    struct iter *iter;
-    VALUE tag;
-    VALUE retval;
-    struct SCOPE *scope;
-    VALUE dst;
-    struct tag *prev;
-    int blkid;
-};
-static struct tag *prot_tag;
-
-#define PUSH_TAG(ptag) do {		\
-    struct tag _tag;			\
-    _tag.retval = Qnil;			\
-    _tag.frame = ruby_frame;		\
-    _tag.iter = ruby_iter;		\
-    _tag.prev = prot_tag;		\
-    _tag.scope = ruby_scope;		\
-    _tag.tag = ptag;			\
-    _tag.dst = 0;			\
-    _tag.blkid = 0;			\
-    prot_tag = &_tag
-
-#define PROT_NONE   Qfalse	/* 0 */
-#define PROT_THREAD Qtrue	/* 2 */
-#define PROT_FUNC   INT2FIX(0)	/* 1 */
-#define PROT_LOOP   INT2FIX(1)	/* 3 */
-#define PROT_LAMBDA INT2FIX(2)	/* 5 */
-#define PROT_YIELD  INT2FIX(3)	/* 7 */
-
-#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, ruby_setjmp(((void)0), prot_tag->buf))
-
-#define JUMP_TAG(st) do {		\
-    ruby_frame = prot_tag->frame;	\
-    ruby_iter = prot_tag->iter;		\
-    ruby_longjmp(prot_tag->buf,(st));	\
-} while (0)
-
-#define POP_TAG()			\
-    prot_tag = _tag.prev;		\
-} while (0)
-
-#define TAG_DST() (_tag.dst == (VALUE)ruby_frame->uniq)
-
-#define TAG_RETURN	0x1
-#define TAG_BREAK	0x2
-#define TAG_NEXT	0x3
-#define TAG_RETRY	0x4
-#define TAG_REDO	0x5
-#define TAG_RAISE	0x6
-#define TAG_THROW	0x7
-#define TAG_FATAL	0x8
-#define TAG_MASK	0xf
-
-VALUE ruby_class;
-static VALUE ruby_wrapper;	/* security wrapper */
-
-#define PUSH_CLASS(c) do {		\
-    VALUE _class = ruby_class;		\
-    ruby_class = (c)
-
-#define POP_CLASS() ruby_class = _class; \
-} while (0)
-
-NODE *ruby_cref = 0;
-NODE *ruby_top_cref;
-#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref)
-#define POP_CREF() ruby_cref = ruby_cref->nd_next
-
-#define PUSH_SCOPE() do {		\
-    volatile int _vmode = scope_vmode;	\
-    struct SCOPE * volatile _old;	\
-    NEWOBJ(_scope, struct SCOPE);	\
-    OBJSETUP(_scope, 0, T_SCOPE);	\
-    _scope->local_tbl = 0;		\
-    _scope->local_vars = 0;		\
-    _scope->flags = 0;			\
-    _old = ruby_scope;			\
-    ruby_scope = _scope;		\
-    scope_vmode = SCOPE_PUBLIC
-
-rb_thread_t rb_curr_thread;
-rb_thread_t rb_main_thread;
-#define main_thread rb_main_thread
-#define curr_thread rb_curr_thread
-
-static void scope_dup _((struct SCOPE *));
-
-#define POP_SCOPE() 			\
-    if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
-	if (_old) scope_dup(_old);	\
-    }					\
-    if (!(ruby_scope->flags & SCOPE_MALLOC)) {\
-	ruby_scope->local_vars = 0;	\
-	ruby_scope->local_tbl  = 0;	\
-	if (!(ruby_scope->flags & SCOPE_DONT_RECYCLE) && \
-	    ruby_scope != top_scope) {	\
-	    rb_gc_force_recycle((VALUE)ruby_scope);\
-	}				\
-    }					\
-    ruby_scope->flags |= SCOPE_NOSTACK;	\
-    ruby_scope = _old;			\
-    scope_vmode = _vmode;		\
-} while (0)
-
-static VALUE rb_eval _((VALUE,NODE*));
-static VALUE eval _((VALUE,VALUE,VALUE,char*,int));
-static NODE *compile _((VALUE, char*, int));
-
-static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int));
-
-#define YIELD_LAMBDA_CALL 1
-#define YIELD_PROC_CALL   2
-#define YIELD_PUBLIC_DEF  4
-#define YIELD_FUNC_AVALUE 1
-#define YIELD_FUNC_SVALUE 2
-
-static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int,VALUE));
-static VALUE module_setup _((VALUE,NODE*));
-
-static VALUE massign _((VALUE,NODE*,VALUE,int));
-static void assign _((VALUE,NODE*,VALUE,int));
-
-typedef struct event_hook {
-    rb_event_hook_func_t func;
-    rb_event_t events;
-    struct event_hook *next;
-} rb_event_hook_t;
-
-static rb_event_hook_t *event_hooks;
-
-#define EXEC_EVENT_HOOK(event, node, self, id, klass) \
-    do { \
-	rb_event_hook_t *hook = event_hooks; \
-        rb_event_hook_func_t hook_func; \
-        rb_event_t events; \
-	\
-	while (hook) { \
-            hook_func = hook->func; \
-            events = hook->events; \
-            hook = hook->next; \
-	    if (events & event) \
-		(*hook_func)(event, node, self, id, klass); \
-	} \
-    } while (0)
-
-static VALUE trace_func = 0;
-static int tracing = 0;
-static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));
-
-#if 0
-#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
-			      ruby_sourceline = nd_line(ruby_current_node))
-#else
-#define SET_CURRENT_SOURCE() ((void)0)
-#endif
-
-void
-ruby_set_current_source()
-{
-    if (ruby_current_node) {
-	ruby_sourcefile = ruby_current_node->nd_file;
-	ruby_sourceline = nd_line(ruby_current_node);
-    }
-}
-
-static void
-#ifdef HAVE_STDARG_PROTOTYPES
-warn_printf(const char *fmt, ...)
-#else
-warn_printf(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
-{
-    char buf[BUFSIZ];
-    va_list args;
-
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    va_end(args);
-    rb_write_error(buf);
-}
-
-#define warn_print(x) rb_write_error(x)
-#define warn_print2(x,l) rb_write_error2(x,l)
-
-static void
-error_pos()
-{
-    ruby_set_current_source();
-    if (ruby_sourcefile) {
-	if (ruby_frame->last_func) {
-	    warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
-			rb_id2name(ruby_frame->orig_func));
-	}
-	else if (ruby_sourceline == 0) {
-	    warn_printf("%s", ruby_sourcefile);
-	}
-	else {
-	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
-	}
-    }
-}
-
-VALUE rb_check_backtrace(VALUE);
-
-static VALUE
-get_backtrace(info)
-    VALUE info;
-{
-    if (NIL_P(info)) return Qnil;
-    info = rb_funcall(info, rb_intern("backtrace"), 0);
-    if (NIL_P(info)) return Qnil;
-    return rb_check_backtrace(info);
-}
-
-static void
-set_backtrace(info, bt)
-    VALUE info, bt;
-{
-    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
-}
-
-static void
-error_print()
-{
-    VALUE errat = Qnil;		/* OK */
-    volatile VALUE eclass, e;
-    char *einfo;
-    long elen;
-
-    if (NIL_P(ruby_errinfo)) return;
-
-    PUSH_TAG(PROT_NONE);
-    if (EXEC_TAG() == 0) {
-	errat = get_backtrace(ruby_errinfo);
-    }
-    else {
-	errat = Qnil;
-    }
-    if (EXEC_TAG()) goto error;
-    if (NIL_P(errat)){
-	ruby_set_current_source();
-	if (ruby_sourcefile)
-	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
-	else
-	    warn_printf("%d", ruby_sourceline);
-    }
-    else if (RARRAY(errat)->len == 0) {
-	error_pos();
-    }
-    else {
-	VALUE mesg = RARRAY(errat)->ptr[0];
-
-	if (NIL_P(mesg)) error_pos();
-	else {
-	    warn_print2(RSTRING(mesg)->ptr, RSTRING(mesg)->len);
-	}
-    }
-
-    eclass = CLASS_OF(ruby_errinfo);
-    if (EXEC_TAG() == 0) {
-  	e = rb_funcall(ruby_errinfo, rb_intern("message"), 0, 0);
- 	StringValue(e);
-	einfo = RSTRING(e)->ptr;
-	elen = RSTRING(e)->len;
-    }
-    else {
-	einfo = "";
-	elen = 0;
-    }
-    if (EXEC_TAG()) goto error;
-    if (eclass == rb_eRuntimeError && elen == 0) {
-	warn_print(": unhandled exception\n");
-    }
-    else {
-	VALUE epath;
-
-	epath = rb_class_name(eclass);
-	if (elen == 0) {
-	    warn_print(": ");
-	    warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
-	    warn_print("\n");
-	}
-	else {
-	    char *tail  = 0;
-	    long len = elen;
-
-	    if (RSTRING(epath)->ptr[0] == '#') epath = 0;
-	    if (tail = memchr(einfo, '\n', elen)) {
-		len = tail - einfo;
-		tail++;		/* skip newline */
-	    }
-	    warn_print(": ");
-	    warn_print2(einfo, len);
-	    if (epath) {
-		warn_print(" (");
-		warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
-		warn_print(")\n");
-	    }
-	    if (tail && elen>len+1) {
-		warn_print2(tail, elen-len-1);
-		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
-	    }
-	}
-    }
-
-    if (!NIL_P(errat)) {
-	long i;
-	struct RArray *ep = RARRAY(errat);
-
-#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
-#define TRACE_HEAD 8
-#define TRACE_TAIL 5
-
-	ep = RARRAY(errat);
-	for (i=1; i<ep->len; i++) {
-	    if (TYPE(ep->ptr[i]) == T_STRING) {
-		warn_printf("\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
-	    }
-	    if (i == TRACE_HEAD && ep->len > TRACE_MAX) {
-		warn_printf("\t ... %ld levels...\n",
-			ep->len - TRACE_HEAD - TRACE_TAIL);
-		i = ep->len - TRACE_TAIL;
-	    }
-	}
-    }
-  error:
-    POP_TAG();
-}
-
-#if defined(__APPLE__)
-#define environ (*_NSGetEnviron())
-#elif !defined(_WIN32) && !defined(__MACOS__) || defined(_WIN32_WCE)
-extern char **environ;
-#endif
-char **rb_origenviron;
-
-void rb_call_inits _((void));
-void Init_stack _((VALUE*));
-void Init_heap _((void));
-void Init_ext _((void));
-
-#ifdef HAVE_NATIVETHREAD
-static rb_nativethread_t ruby_thid;
-int 
-is_ruby_native_thread() {
-    return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT());
-}
-
-# ifdef HAVE_NATIVETHREAD_KILL
-void
-ruby_native_thread_kill(sig)
-    int sig;
-{
-    NATIVETHREAD_KILL(ruby_thid, sig);
-}
-# endif
-#endif
-
-void
-ruby_init()
+ruby_init(void)
 {
     static int initialized = 0;
-    static struct FRAME frame;
-    static struct iter iter;
     int state;
 
     if (initialized)
 	return;
     initialized = 1;
-#ifdef HAVE_NATIVETHREAD
-    ruby_thid = NATIVETHREAD_CURRENT();
-#endif
 
-    ruby_frame = top_frame = &frame;
-    ruby_iter = &iter;
-
-#ifdef __MACOS__
-    rb_origenviron = 0;
-#else
-    rb_origenviron = environ;
-#endif
-
-    Init_stack((void*)&state);
+    ruby_init_stack((void *)&state);
+    Init_BareVM();
     Init_heap();
-    PUSH_SCOPE();
-    ruby_scope->local_vars = 0;
-    ruby_scope->local_tbl  = 0;
-    top_scope = ruby_scope;
-    /* default visibility is private at toplevel */
-    SCOPE_SET(SCOPE_PRIVATE);
-
-    PUSH_TAG(PROT_NONE);
+
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
 	rb_call_inits();
-	ruby_class = rb_cObject;
-	ruby_frame->self = ruby_top_self;
-	ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
-	ruby_cref = ruby_top_cref;
-	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
-#ifdef __MACOS__
-	_macruby_init();
-#elif defined(__VMS)
-	_vmsruby_init();
-#endif
 	ruby_prog_init();
-	ALLOW_INTS;
     }
     POP_TAG();
+
     if (state) {
 	error_print();
 	exit(EXIT_FAILURE);
     }
-    POP_SCOPE();
-    ruby_scope = top_scope;
-    top_scope->flags &= ~SCOPE_NOSTACK;
-    ruby_running = 1;
-}
-
-static VALUE
-eval_node(self, node)
-    VALUE self;
-    NODE *node;
-{
-    NODE *beg_tree = ruby_eval_tree_begin;
-
-    ruby_eval_tree_begin = 0;
-    if (beg_tree) {
-	rb_eval(self, beg_tree);
-    }
-
-    if (!node) return Qnil;
-    return rb_eval(self, node);
-}
-
-int ruby_in_eval;
-
-static void rb_thread_cleanup _((void));
-static void rb_thread_wait_other_threads _((void));
-
-static int thread_set_raised();
-static int thread_reset_raised();
-
-static int thread_no_ensure _((void));
-
-static VALUE exception_error;
-static VALUE sysstack_error;
-
-static int
-sysexit_status(err)
-    VALUE err;
-{
-    VALUE st = rb_iv_get(err, "status");
-    return NUM2INT(st);
+    GET_VM()->running = 1;
 }
 
-static int
-error_handle(ex)
-    int ex;
-{
-    int status = EXIT_FAILURE;
-
-    if (thread_set_raised()) return EXIT_FAILURE;
-    switch (ex & TAG_MASK) {
-      case 0:
-	status = EXIT_SUCCESS;
-	break;
-
-      case TAG_RETURN:
-	error_pos();
-	warn_print(": unexpected return\n");
-	break;
-      case TAG_NEXT:
-	error_pos();
-	warn_print(": unexpected next\n");
-	break;
-      case TAG_BREAK:
-	error_pos();
-	warn_print(": unexpected break\n");
-	break;
-      case TAG_REDO:
-	error_pos();
-	warn_print(": unexpected redo\n");
-	break;
-      case TAG_RETRY:
-	error_pos();
-	warn_print(": retry outside of rescue clause\n");
-	break;
-      case TAG_THROW:
-	if (prot_tag && prot_tag->frame && prot_tag->frame->node) {
-	    NODE *tag = prot_tag->frame->node;
-	    warn_printf("%s:%d: uncaught throw\n",
-		    tag->nd_file, nd_line(tag));
-	}
-	else {
-	    error_pos();
-	    warn_printf(": unexpected throw\n");
-	}
-	break;
-      case TAG_RAISE:
-      case TAG_FATAL:
-	if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    status = sysexit_status(ruby_errinfo);
-	}
-	else if (rb_obj_is_instance_of(ruby_errinfo, rb_eSignal)) {
-	    /* no message when exiting by signal */
-	}
-	else {
-	    error_print();
-	}
-	break;
-      default:
-	rb_bug("Unknown longjmp status %d", ex);
-	break;
-    }
-    thread_reset_raised();
-    return status;
-}
+extern void rb_clear_trace_func(void);
 
-void
-ruby_options(argc, argv)
-    int argc;
-    char **argv;
+void *
+ruby_options(int argc, char **argv)
 {
     int state;
+    void *volatile iseq = 0;
 
-    Init_stack((void*)&state);
-    PUSH_TAG(PROT_NONE);
+    ruby_init_stack((void *)&iseq);
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
-	ruby_process_options(argc, argv);
+	SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
     }
     else {
-	trace_func = 0;
-	tracing = 0;
-	exit(error_handle(state));
+	rb_clear_trace_func();
+	state = error_handle(state);
+	iseq = (void *)INT2FIX(state);
     }
     POP_TAG();
+    return iseq;
 }
 
-void rb_exec_end_proc _((void));
-
 static void
-ruby_finalize_0()
+ruby_finalize_0(void)
 {
-    PUSH_TAG(PROT_NONE);
+    PUSH_TAG();
     if (EXEC_TAG() == 0) {
 	rb_trap_exit();
     }
     POP_TAG();
     rb_exec_end_proc();
+    rb_clear_trace_func();
 }
 
 static void
-ruby_finalize_1()
+ruby_finalize_1(void)
 {
-    signal(SIGINT, SIG_DFL);
-    ruby_errinfo = 0;
+    ruby_sig_finalize();
+    GET_THREAD()->errinfo = Qnil;
     rb_gc_call_finalizer_at_exit();
-    trace_func = 0;
-    tracing = 0;
 }
 
 void
-ruby_finalize()
+ruby_finalize(void)
 {
     ruby_finalize_0();
     ruby_finalize_1();
 }
 
+void rb_thread_stop_timer_thread(void);
+
 int
-ruby_cleanup(ex)
-    int ex;
+ruby_cleanup(volatile int ex)
 {
     int state;
     volatile VALUE errs[2];
+    rb_thread_t *th = GET_THREAD();
     int nerr;
+    void rb_threadptr_interrupt(rb_thread_t *th);
+    void rb_threadptr_check_signal(rb_thread_t *mth);
 
-    errs[1] = ruby_errinfo;
-    ruby_safe_level = 0;
-    Init_stack((void *)&state);
-    ruby_finalize_0();
-    errs[0] = ruby_errinfo;
-    PUSH_TAG(PROT_NONE);
-    PUSH_ITER(ITER_NOT);
+    rb_threadptr_interrupt(th);
+    rb_threadptr_check_signal(th);
+    PUSH_TAG();
+    if ((state = EXEC_TAG()) == 0) {
+	SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(); });
+    }
+    POP_TAG();
+
+    errs[1] = th->errinfo;
+    th->safe_level = 0;
+    ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]);
+
+    PUSH_TAG();
+    if ((state = EXEC_TAG()) == 0) {
+	SAVE_ROOT_JMPBUF(th, ruby_finalize_0());
+    }
+    POP_TAG();
+
+    errs[0] = th->errinfo;
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
-	rb_thread_cleanup();
-	rb_thread_wait_other_threads();
+	SAVE_ROOT_JMPBUF(th, rb_thread_terminate_all());
     }
     else if (ex == 0) {
 	ex = state;
     }
-    POP_ITER();
-    ruby_errinfo = errs[1];
+    th->errinfo = errs[1];
     ex = error_handle(ex);
     ruby_finalize_1();
     POP_TAG();
+    rb_thread_stop_timer_thread();
 
-    for (nerr = 0; nerr < sizeof(errs) / sizeof(errs[0]); ++nerr) {
+    state = 0;
+    for (nerr = 0; nerr < numberof(errs); ++nerr) {
 	VALUE err = errs[nerr];
 
 	if (!RTEST(err)) continue;
 
+	/* th->errinfo contains a NODE while break'ing */
+	if (TYPE(err) == T_NODE) continue;
+
 	if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
 	    return sysexit_status(err);
 	}
 	else if (rb_obj_is_kind_of(err, rb_eSignal)) {
 	    VALUE sig = rb_iv_get(err, "signo");
-	    ruby_default_signal(NUM2INT(sig));
+	    state = NUM2INT(sig);
+	    break;
 	}
 	else if (ex == 0) {
 	    ex = 1;
 	}
     }
+    ruby_vm_destruct(GET_VM());
+    if (state) ruby_default_signal(state);
 
 #if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
     switch (ex) {
@@ -1629,346 +201,72 @@ ruby_cleanup(ex)
 }
 
 static int
-ruby_exec_internal()
+ruby_exec_internal(void *n)
 {
-    int state;
+    volatile int state;
+    VALUE iseq = (VALUE)n;
+    rb_thread_t *th = GET_THREAD();
+
+    if (!n) return 0;
 
-    PUSH_TAG(PROT_NONE);
-    PUSH_ITER(ITER_NOT);
-    /* default visibility is private at toplevel */
-    SCOPE_SET(SCOPE_PRIVATE);
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
-	eval_node(ruby_top_self, ruby_eval_tree);
+	SAVE_ROOT_JMPBUF(th, {
+	    th->base_block = 0;
+	    rb_iseq_eval_main(iseq);
+	});
     }
-    POP_ITER();
     POP_TAG();
     return state;
 }
 
 void
-ruby_stop(ex)
-    int ex;
+ruby_stop(int ex)
 {
     exit(ruby_cleanup(ex));
 }
 
 int
-ruby_exec()
-{
-    volatile NODE *tmp;
-
-    Init_stack((void*)&tmp);
-    return ruby_exec_internal();
-}
-
-void
-ruby_run()
-{
-    int state;
-    static int ex;
-
-    if (ruby_nerrs > 0) exit(EXIT_FAILURE);
-    state = ruby_exec();
-    if (state && !ex) ex = state;
-    ruby_stop(ex);
-}
-
-static void
-compile_error(at)
-    const char *at;
-{
-    VALUE str;
-
-    ruby_nerrs = 0;
-    str = rb_str_buf_new2("compile error");
-    if (at) {
-	rb_str_buf_cat2(str, " in ");
-	rb_str_buf_cat2(str, at);
-    }
-    rb_str_buf_cat(str, "\n", 1);
-    if (!NIL_P(ruby_errinfo)) {
-	rb_str_append(str, rb_obj_as_string(ruby_errinfo));
-    }
-    rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str));
-}
-
-VALUE
-rb_eval_string(str)
-    const char *str;
-{
-    VALUE v;
-    NODE *oldsrc = ruby_current_node;
-
-    ruby_current_node = 0;
-    ruby_sourcefile = rb_source_filename("(eval)");
-    v = eval(ruby_top_self, rb_str_new2(str), Qnil, 0, 0);
-    ruby_current_node = oldsrc;
-
-    return v;
-}
-
-VALUE
-rb_eval_string_protect(str, state)
-    const char *str;
-    int *state;
-{
-    return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
-}
-
-VALUE
-rb_eval_string_wrap(str, state)
-    const char *str;
-    int *state;
-{
-    int status;
-    VALUE self = ruby_top_self;
-    VALUE wrapper = ruby_wrapper;
-    VALUE val;
-
-    PUSH_CLASS(ruby_wrapper = rb_module_new());
-    ruby_top_self = rb_obj_clone(ruby_top_self);
-    rb_extend_object(ruby_top_self, ruby_wrapper);
-    PUSH_FRAME();
-    ruby_frame->last_func = 0;
-    ruby_frame->last_class = 0;
-    ruby_frame->self = self;
-    PUSH_CREF(ruby_wrapper);
-    PUSH_SCOPE();
-
-    val = rb_eval_string_protect(str, &status);
-    ruby_top_self = self;
-
-    POP_SCOPE();
-    POP_FRAME();
-    POP_CLASS();
-    ruby_wrapper = wrapper;
-    if (state) {
-	*state = status;
-    }
-    else if (status) {
-	JUMP_TAG(status);
-    }
-    return val;
-}
-
-NORETURN(static void localjump_error(const char*, VALUE, int));
-static void
-localjump_error(mesg, value, reason)
-    const char *mesg;
-    VALUE value;
-    int reason;
-{
-    VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg);
-    ID id;
-
-    rb_iv_set(exc, "@exit_value", value);
-    switch (reason) {
-      case TAG_BREAK:
-	id = rb_intern("break"); break;
-      case TAG_REDO:
-	id = rb_intern("redo"); break;
-      case TAG_RETRY:
-	id = rb_intern("retry"); break;
-      case TAG_NEXT:
-	id = rb_intern("next"); break;
-      case TAG_RETURN:
-	id = rb_intern("return"); break;
-      default:
-	id = rb_intern("noreason"); break;
-    }
-    rb_iv_set(exc, "@reason", ID2SYM(id));
-    rb_exc_raise(exc);
-}
-
-/*
- * call_seq:
- *   local_jump_error.exit_value  => obj
- *
- * Returns the exit value associated with this +LocalJumpError+.
- */
-static VALUE
-localjump_xvalue(exc)
-    VALUE exc;
-{
-    return rb_iv_get(exc, "@exit_value");
-}
-
-/*
- * call-seq:
- *    local_jump_error.reason   => symbol
- *
- * The reason this block was terminated:
- * :break, :redo, :retry, :next, :return, or :noreason.
- */
-
-static VALUE
-localjump_reason(exc)
-    VALUE exc;
-{
-    return rb_iv_get(exc, "@reason");
-}
-
-NORETURN(static void jump_tag_but_local_jump _((int,VALUE)));
-static void
-jump_tag_but_local_jump(state, val)
-    int state;
-    VALUE val;
+ruby_executable_node(void *n, int *status)
 {
+    VALUE v = (VALUE)n;
+    int s;
 
-    if (val == Qundef) val = prot_tag->retval;
-    switch (state) {
-      case 0:
-	break;
-      case TAG_RETURN:
-	localjump_error("unexpected return", val, state);
-	break;
-      case TAG_BREAK:
-	localjump_error("unexpected break", val, state);
-	break;
-      case TAG_NEXT:
-	localjump_error("unexpected next", val, state);
-	break;
-      case TAG_REDO:
-	localjump_error("unexpected redo", Qnil, state);
-	break;
-      case TAG_RETRY:
-	localjump_error("retry outside of rescue clause", Qnil, state);
-	break;
+    switch (v) {
+      case Qtrue:  s = EXIT_SUCCESS; break;
+      case Qfalse: s = EXIT_FAILURE; break;
       default:
-	break;
-    }
-    JUMP_TAG(state);
-}
-
-VALUE
-rb_eval_cmd(cmd, arg, level)
-    VALUE cmd, arg;
-    int level;
-{
-    int state;
-    VALUE val = Qnil;		/* OK */
-    struct SCOPE *saved_scope;
-    volatile int safe = ruby_safe_level;
-
-    if (OBJ_TAINTED(cmd)) {
-	level = 4;
-    }
-    if (TYPE(cmd) != T_STRING) {
-	PUSH_ITER(ITER_NOT);
-	PUSH_TAG(PROT_NONE);
-	ruby_safe_level = level;
-	if ((state = EXEC_TAG()) == 0) {
-	    val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
-	}
-	ruby_safe_level = safe;
-	POP_TAG();
-	POP_ITER();
-	if (state) JUMP_TAG(state);
-	return val;
-    }
-
-    saved_scope = ruby_scope;
-    ruby_scope = top_scope;
-    PUSH_FRAME();
-    ruby_frame->last_func = 0;
-    ruby_frame->last_class = 0;
-    ruby_frame->self = ruby_top_self;
-    PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
-
-    ruby_safe_level = level;
-
-    PUSH_TAG(PROT_NONE);
-    if ((state = EXEC_TAG()) == 0) {
-	val = eval(ruby_top_self, cmd, Qnil, 0, 0);
-    }
-    if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
-	scope_dup(saved_scope);
-    ruby_scope = saved_scope;
-    ruby_safe_level = safe;
-    POP_TAG();
-    POP_FRAME();
-
-    if (state) jump_tag_but_local_jump(state, val);
-    return val;
-}
-
-#define ruby_cbase (ruby_cref->nd_clss)
-
-static VALUE
-ev_const_defined(cref, id, self)
-    NODE *cref;
-    ID id;
-    VALUE self;
-{
-    NODE *cbase = cref;
-    VALUE result;
-
-    while (cbase && cbase->nd_next) {
-	struct RClass *klass = RCLASS(cbase->nd_clss);
-
-	if (!NIL_P(klass)) {
-	    if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
-		if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
-		    return Qfalse;
-		}
-		return Qtrue;
-	    }
-	}
-	cbase = cbase->nd_next;
+	if (!FIXNUM_P(v)) return TRUE;
+	s = FIX2INT(v);
     }
-    return rb_const_defined(cref->nd_clss, id);
+    if (status) *status = s;
+    return FALSE;
 }
 
-static VALUE
-ev_const_get(cref, id, self)
-    NODE *cref;
-    ID id;
-    VALUE self;
+int
+ruby_run_node(void *n)
 {
-    NODE *cbase = cref;
-    VALUE result;
-
-    while (cbase && cbase->nd_next) {
-	VALUE klass = cbase->nd_clss;
-
-	if (!NIL_P(klass)) {
-	    while (RCLASS(klass)->iv_tbl &&
-		   st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
-		if (result == Qundef) {
-		    if (!RTEST(rb_autoload_load(klass, id))) break;
-		    continue;
-		}
-		return result;
-	    }
-	}
-	cbase = cbase->nd_next;
+    int status;
+    if (!ruby_executable_node(n, &status)) {
+	ruby_cleanup(0);
+	return status;
     }
-    return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+    return ruby_cleanup(ruby_exec_node(n));
 }
 
-static VALUE
-cvar_cbase()
+int
+ruby_exec_node(void *n)
 {
-    NODE *cref = ruby_cref;
-
-    while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) {
-	cref = cref->nd_next;
-	if (!cref->nd_next) {
-	    rb_warn("class variable access from toplevel singleton method");
-	}
-    }
-    if (NIL_P(cref->nd_clss)) {
-	rb_raise(rb_eTypeError, "no class variables available");
-    }
-    return cref->nd_clss;
+    ruby_init_stack((void *)&n);
+    return ruby_exec_internal(n);
 }
 
 /*
  *  call-seq:
- *     Module.nesting    => array
- *  
+ *     Module.nesting    -> array
+ *
  *  Returns the list of +Modules+ nested at the point of call.
- *     
+ *
  *     module M1
  *       module M2
  *         $a = Module.nesting
@@ -1979,59 +277,69 @@ cvar_cbase()
  */
 
 static VALUE
-rb_mod_nesting()
+rb_mod_nesting(void)
 {
-    NODE *cbase = ruby_cref;
     VALUE ary = rb_ary_new();
+    const NODE *cref = rb_vm_cref();
 
-    while (cbase && cbase->nd_next) {
-	if (!NIL_P(cbase->nd_clss)) rb_ary_push(ary, cbase->nd_clss);
-	cbase = cbase->nd_next;
-    }
-    if (ruby_wrapper && RARRAY(ary)->len == 0) {
-	rb_ary_push(ary, ruby_wrapper);
+    while (cref && cref->nd_next) {
+	VALUE klass = cref->nd_clss;
+	if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) &&
+	    !NIL_P(klass)) {
+	    rb_ary_push(ary, klass);
+	}
+	cref = cref->nd_next;
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     Module.constants   => array
- *  
+ *     Module.constants   -> array
+ *
  *  Returns an array of the names of all constants defined in the
  *  system. This list includes the names of all modules and classes.
- *     
+ *
  *     p Module.constants.sort[1..5]
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
  */
 
 static VALUE
-rb_mod_s_constants()
+rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
 {
-    NODE *cbase = ruby_cref;
+    const NODE *cref = rb_vm_cref();
+    VALUE klass;
+    VALUE cbase = 0;
     void *data = 0;
 
-    while (cbase) {
-	if (!NIL_P(cbase->nd_clss)) {
-	    data = rb_mod_const_at(cbase->nd_clss, data);
+    if (argc > 0) {
+	return rb_mod_constants(argc, argv, rb_cModule);
+    }
+
+    while (cref) {
+	klass = cref->nd_clss;
+	if (!NIL_P(klass)) {
+	    data = rb_mod_const_at(cref->nd_clss, data);
+	    if (!cbase) {
+		cbase = klass;
+	    }
 	}
-	cbase = cbase->nd_next;
+	cref = cref->nd_next;
     }
 
-    if (!NIL_P(ruby_cbase)) {
-	data = rb_mod_const_of(ruby_cbase, data);
+    if (cbase) {
+	data = rb_mod_const_of(cbase, data);
     }
     return rb_const_list(data);
 }
 
 void
-rb_frozen_class_p(klass)
-    VALUE klass;
+rb_frozen_class_p(VALUE klass)
 {
-    char *desc = "something(?!)";
+    const char *desc = "something(?!)";
 
     if (OBJ_FROZEN(klass)) {
 	if (FL_TEST(klass, FL_SINGLETON))
@@ -2040,2606 +348,139 @@ rb_frozen_class_p(klass)
 	    switch (TYPE(klass)) {
 	      case T_MODULE:
 	      case T_ICLASS:
-		desc = "module"; break;
-	      case T_CLASS:
-		desc = "class"; break;
-	    }
-	}
-	rb_error_frozen(desc);
-    }
-}
-
-void
-rb_undef(klass, id)
-    VALUE klass;
-    ID id;
-{
-    VALUE origin;
-    NODE *body;
-
-    if (ruby_cbase == rb_cObject && klass == rb_cObject) {
-	rb_secure(4);
-    }
-    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id));
-    }
-    rb_frozen_class_p(klass);
-    if (id == __id__ || id == __send__ || id == init) {
-	rb_warn("undefining `%s' may cause serious problem", rb_id2name(id));
-    }
-    body = search_method(klass, id, &origin);
-    if (!body || !body->nd_body) {
-	char *s0 = " class";
-	VALUE c = klass;
-
-	if (FL_TEST(c, FL_SINGLETON)) {
-	    VALUE obj = rb_iv_get(klass, "__attached__");
-
-	    switch (TYPE(obj)) {
-	      case T_MODULE:
-	      case T_CLASS:
-		c = obj;
-		s0 = "";
-	    }
-	}
-	else if (TYPE(c) == T_MODULE) {
-	    s0 = " module";
-	}
-	rb_name_error(id, "undefined method `%s' for%s `%s'",
-		      rb_id2name(id),s0,rb_class2name(c));
-    }
-    rb_add_method(klass, id, 0, NOEX_PUBLIC);
-    if (FL_TEST(klass, FL_SINGLETON)) {
-	rb_funcall(rb_iv_get(klass, "__attached__"),
-		   singleton_undefined, 1, ID2SYM(id));
-    }
-    else {
-	rb_funcall(klass, undefined, 1, ID2SYM(id));
-    }
-}
-
-/*
- *  call-seq:
- *     undef_method(symbol)    => self
- *  
- *  Prevents the current class from responding to calls to the named
- *  method. Contrast this with <code>remove_method</code>, which deletes
- *  the method from the particular class; Ruby will still search
- *  superclasses and mixed-in modules for a possible receiver.
- *     
- *     class Parent
- *       def hello
- *         puts "In parent"
- *       end
- *     end
- *     class Child < Parent
- *       def hello
- *         puts "In child"
- *       end
- *     end
- *     
- *     
- *     c = Child.new
- *     c.hello
- *     
- *     
- *     class Child
- *       remove_method :hello  # remove from child, still in parent
- *     end
- *     c.hello
- *     
- *     
- *     class Child
- *       undef_method :hello   # prevent any calls to 'hello'
- *     end
- *     c.hello
- *     
- *  <em>produces:</em>
- *     
- *     In child
- *     In parent
- *     prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError)
- */
-
-static VALUE
-rb_mod_undef_method(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    int i;
-
-    for (i=0; i<argc; i++) {
-	rb_undef(mod, rb_to_id(argv[i]));
-    }
-    return mod;
-}
-
-void
-rb_alias(klass, name, def)
-    VALUE klass;
-    ID name, def;
-{
-    VALUE origin;
-    NODE *orig, *body, *node;
-    VALUE singleton = 0;
-
-    rb_frozen_class_p(klass);
-    if (name == def) return;
-    if (klass == rb_cObject) {
-	rb_secure(4);
-    }
-    orig = search_method(klass, def, &origin);
-    if (!orig || !orig->nd_body) {
-	if (TYPE(klass) == T_MODULE) {
-	    orig = search_method(rb_cObject, def, &origin);
-	}
-    }
-    if (!orig || !orig->nd_body) {
-	print_undef(klass, def);
-    }
-    if (FL_TEST(klass, FL_SINGLETON)) {
-	singleton = rb_iv_get(klass, "__attached__");
-    }
-    body = orig->nd_body;
-    orig->nd_cnt++;
-    if (nd_type(body) == NODE_FBODY) { /* was alias */
-	def = body->nd_mid;
-	origin = body->nd_orig;
-	body = body->nd_head;
-    }
-
-    rb_clear_cache_by_id(name);
-    if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *)&node)) {
-	if (node->nd_cnt == 0 && node->nd_body) {
-	    rb_warning("discarding old %s", rb_id2name(name));
-	}
-    }
-    st_insert(RCLASS(klass)->m_tbl, name,
-	      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
-				    NOEX_WITH_SAFE(orig->nd_noex)));
-
-    if (!ruby_running) return;
-
-    if (singleton) {
-	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
-    }
-    else {
-	rb_funcall(klass, added, 1, ID2SYM(name));
-    }
-}
-
-/*
- *  call-seq:
- *     alias_method(new_name, old_name)   => self
- *  
- *  Makes <i>new_name</i> a new copy of the method <i>old_name</i>. This can
- *  be used to retain access to methods that are overridden.
- *     
- *     module Mod
- *       alias_method :orig_exit, :exit
- *       def exit(code=0)
- *         puts "Exiting with code #{code}"
- *         orig_exit(code)
- *       end
- *     end
- *     include Mod
- *     exit(99)
- *     
- *  <em>produces:</em>
- *     
- *     Exiting with code 99
- */
-
-static VALUE
-rb_mod_alias_method(mod, newname, oldname)
-    VALUE mod, newname, oldname;
-{
-    rb_alias(mod, rb_to_id(newname), rb_to_id(oldname));
-    return mod;
-}
-
-static NODE*
-copy_node_scope(node, rval)
-    NODE *node;
-    NODE *rval;
-{
-    NODE *copy = NEW_NODE(NODE_SCOPE,0,rval,node->nd_next);
-
-    if (node->nd_tbl) {
-	copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1);
-	MEMCPY(copy->nd_tbl, node->nd_tbl, ID, node->nd_tbl[0]+1);
-    }
-    else {
-	copy->nd_tbl = 0;
-    }
-    return copy;
-}
-
-#ifdef C_ALLOCA
-# define TMP_PROTECT NODE * volatile tmp__protect_tmp=0
-# define TMP_ALLOC(n)							\
-    (tmp__protect_tmp = NEW_NODE(NODE_ALLOCA,				\
-				 ALLOC_N(VALUE,n),tmp__protect_tmp,n),	\
-     (void*)tmp__protect_tmp->nd_head)
-#else
-# define TMP_PROTECT typedef int foobazzz
-# define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
-#endif
-
-#define SETUP_ARGS0(anode,extra) do {\
-    NODE *n = anode;\
-    if (!n) {\
-	argc = 0;\
-	argv = 0;\
-    }\
-    else if (nd_type(n) == NODE_ARRAY) {\
-	argc=anode->nd_alen;\
-	if (argc > 0) {\
-	    int i;\
-	    n = anode;\
-	    argv = TMP_ALLOC(argc+extra);\
-	    for (i=0;i<argc;i++) {\
-		argv[i] = rb_eval(self,n->nd_head);\
-		n=n->nd_next;\
-	    }\
-	}\
-	else {\
-	    argc = 0;\
-	    argv = 0;\
-	}\
-    }\
-    else {\
-	VALUE args = rb_eval(self,n);\
-	if (TYPE(args) != T_ARRAY)\
-	    args = rb_ary_to_ary(args);\
-	argc = RARRAY(args)->len;\
-	argv = TMP_ALLOC(argc+extra);\
-	MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
-    }\
-} while (0)
-
-#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
-
-#define BEGIN_CALLARGS do {\
-    struct BLOCK *tmp_block = ruby_block;\
-    int tmp_iter = ruby_iter->iter;\
-    switch (tmp_iter) {\
-      case ITER_PRE:\
-	if (ruby_block) ruby_block = ruby_block->outer;\
-      case ITER_PAS:\
-	tmp_iter = ITER_NOT;\
-    }\
-    PUSH_ITER(tmp_iter)
-
-#define END_CALLARGS \
-    ruby_block = tmp_block;\
-    POP_ITER();\
-} while (0)
-
-#define MATCH_DATA *rb_svar(node->nd_cnt)
-
-static char* is_defined _((VALUE, NODE*, char*));
-
-static char*
-arg_defined(self, node, buf, type)
-    VALUE self;
-    NODE *node;
-    char *buf;
-    char *type;
-{
-    int argc;
-    int i;
-
-    if (!node) return type;	/* no args */
-    if (nd_type(node) == NODE_ARRAY) {
-	argc=node->nd_alen;
-	if (argc > 0) {
-	    for (i=0;i<argc;i++) {
-		if (!is_defined(self, node->nd_head, buf))
-		    return 0;
-		node = node->nd_next;
-	    }
-	}
-    }
-    else if (!is_defined(self, node, buf)) {
-	return 0;
-    }
-    return type;
-}
-
-static char*
-is_defined(self, node, buf)
-    VALUE self;
-    NODE *node;			/* OK */
-    char *buf;
-{
-    VALUE val;			/* OK */
-    int state;
-
-  again:
-    if (!node) return "expression";
-    switch (nd_type(node)) {
-      case NODE_SUPER:
-      case NODE_ZSUPER:
-	if (ruby_frame->last_func == 0) return 0;
-	else if (ruby_frame->last_class == 0) return 0;
-	val = ruby_frame->last_class;
-	if (rb_method_boundp(RCLASS(val)->super, ruby_frame->orig_func, 0)) {
-	    if (nd_type(node) == NODE_SUPER) {
-		return arg_defined(self, node->nd_args, buf, "super");
-	    }
-	    return "super";
-	}
-	break;
-
-      case NODE_VCALL:
-      case NODE_FCALL:
-	val = self;
-	goto check_bound;
-
-      case NODE_ATTRASGN:
-	val = self;
-	if (node->nd_recv == (NODE *)1) goto check_bound;
-      case NODE_CALL:
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    val = rb_eval(self, node->nd_recv);
-	}
-	POP_TAG();
-	if (state) {
-	    ruby_errinfo = Qnil;
-	    return 0;
-	}
-      check_bound:
-	{
-	    int call = nd_type(node)==NODE_CALL;
-
-	    val = CLASS_OF(val);
-	    if (call) {
-		int noex;
-		ID id = node->nd_mid;
-
-		if (!rb_get_method_body(&val, &id, &noex))
-		    break;
-		if ((noex & NOEX_PRIVATE))
-		    break;
-		if ((noex & NOEX_PROTECTED) &&
-		    !rb_obj_is_kind_of(self, rb_class_real(val)))
-		    break;
-	    }
-	    else if (!rb_method_boundp(val, node->nd_mid, call))
+		desc = "module";
 		break;
-	    return arg_defined(self, node->nd_args, buf,
-			       nd_type(node) == NODE_ATTRASGN ?
-			       "assignment" : "method");
-	}
-	break;
-
-      case NODE_MATCH2:
-      case NODE_MATCH3:
-	return "method";
-
-      case NODE_YIELD:
-	if (rb_block_given_p()) {
-	    return "yield";
-	}
-	break;
-
-      case NODE_SELF:
-	return "self";
-
-      case NODE_NIL:
-	return "nil";
-
-      case NODE_TRUE:
-	return "true";
-
-      case NODE_FALSE:
-	return "false";
-
-      case NODE_ATTRSET:
-      case NODE_OP_ASGN1:
-      case NODE_OP_ASGN2:
-      case NODE_MASGN:
-      case NODE_LASGN:
-      case NODE_DASGN:
-      case NODE_DASGN_CURR:
-      case NODE_GASGN:
-      case NODE_IASGN:
-      case NODE_CDECL:
-      case NODE_CVDECL:
-      case NODE_CVASGN:
-	return "assignment";
-
-      case NODE_LVAR:
-	return "local-variable";
-      case NODE_DVAR:
-	return "local-variable(in-block)";
-
-      case NODE_GVAR:
-	if (rb_gvar_defined(node->nd_entry)) {
-	    return "global-variable";
-	}
-	break;
-
-      case NODE_IVAR:
-	if (rb_ivar_defined(self, node->nd_vid)) {
-	    return "instance-variable";
-	}
-	break;
-
-      case NODE_CONST:
-	if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
-	    return "constant";
-	}
-	break;
-
-      case NODE_CVAR:
-	if (rb_cvar_defined(cvar_cbase(), node->nd_vid)) {
-	    return "class variable";
-	}
-	break;
-
-      case NODE_COLON2:
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    val = rb_eval(self, node->nd_head);
-	}
-	POP_TAG();
-	if (state) {
-	    ruby_errinfo = Qnil;
-	    return 0;
-	}
-	else {
-	    switch (TYPE(val)) {
 	      case T_CLASS:
-	      case T_MODULE:
-		if (rb_const_defined_from(val, node->nd_mid))
-		    return "constant";
+		desc = "class";
 		break;
-	      default:
-		if (rb_method_boundp(CLASS_OF(val), node->nd_mid, 1)) {
-		    return "method";
-		}
-	    }
-	}
-	break;
-
-      case NODE_COLON3:
-	if (rb_const_defined_from(rb_cObject, node->nd_mid)) {
-	    return "constant";
-	}
-	break;
-
-      case NODE_NTH_REF:
-	if (RTEST(rb_reg_nth_defined(node->nd_nth, MATCH_DATA))) {
-	    sprintf(buf, "$%d", (int)node->nd_nth);
-	    return buf;
-	}
-	break;
-
-      case NODE_BACK_REF:
-	if (RTEST(rb_reg_nth_defined(0, MATCH_DATA))) {
-	    sprintf(buf, "$%c", (char)node->nd_nth);
-	    return buf;
-	}
-	break;
-
-      case NODE_NEWLINE:
-	node = node->nd_next;
-	goto again;
-
-      default:
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    rb_eval(self, node);
-	}
-	POP_TAG();
-	if (!state) {
-	    return "expression";
-	}
-	ruby_errinfo = Qnil;
-	break;
-    }
-    return 0;
-}
-
-static int handle_rescue _((VALUE,NODE*));
-
-static void blk_free();
-
-static VALUE
-rb_obj_is_proc(proc)
-    VALUE proc;
-{
-    if (TYPE(proc) == T_DATA && RDATA(proc)->dfree == (RUBY_DATA_FUNC)blk_free) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-void
-rb_add_event_hook(func, events)
-    rb_event_hook_func_t func;
-    rb_event_t events;
-{
-    rb_event_hook_t *hook;
-
-    hook = ALLOC(rb_event_hook_t);
-    hook->func = func;
-    hook->events = events;
-    hook->next = event_hooks;
-    event_hooks = hook;
-}
-
-int
-rb_remove_event_hook(func)
-    rb_event_hook_func_t func;
-{
-    rb_event_hook_t *prev, *hook;
-
-    prev = NULL;
-    hook = event_hooks;
-    while (hook) {
-	if (hook->func == func) {
-	    if (prev) {
-		prev->next = hook->next;
-	    }
-	    else {
-		event_hooks = hook->next;
 	    }
-	    xfree(hook);
-	    return 0;
 	}
-	prev = hook;
-	hook = hook->next;
-    }
-    return -1;
-}
-
-/*
- *  call-seq:
- *     set_trace_func(proc)    => proc
- *     set_trace_func(nil)     => nil
- *  
- *  Establishes _proc_ as the handler for tracing, or disables
- *  tracing if the parameter is +nil+. _proc_ takes up
- *  to six parameters: an event name, a filename, a line number, an
- *  object id, a binding, and the name of a class. _proc_ is
- *  invoked whenever an event occurs. Events are: <code>c-call</code>
- *  (call a C-language routine), <code>c-return</code> (return from a
- *  C-language routine), <code>call</code> (call a Ruby method),
- *  <code>class</code> (start a class or module definition),
- *  <code>end</code> (finish a class or module definition),
- *  <code>line</code> (execute code on a new line), <code>raise</code>
- *  (raise an exception), and <code>return</code> (return from a Ruby
- *  method). Tracing is disabled within the context of _proc_.
- *
- *      class Test
- *	def test
- *	  a = 1
- *	  b = 2
- *	end
- *      end
- *
- *      set_trace_func proc { |event, file, line, id, binding, classname|
- *	   printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
- *      }
- *      t = Test.new
- *      t.test
- *
- *	  line prog.rb:11               false
- *      c-call prog.rb:11        new    Class
- *      c-call prog.rb:11 initialize   Object
- *    c-return prog.rb:11 initialize   Object
- *    c-return prog.rb:11        new    Class
- *	  line prog.rb:12               false
- *  	  call prog.rb:2        test     Test
- *	  line prog.rb:3        test     Test
- *	  line prog.rb:4        test     Test
- *      return prog.rb:4        test     Test
- */
-
-
-static VALUE
-set_trace_func(obj, trace)
-    VALUE obj, trace;
-{
-    rb_event_hook_t *hook;
-
-    rb_secure(4);
-    if (NIL_P(trace)) {
-	trace_func = 0;
-	rb_remove_event_hook(call_trace_func);
-	return Qnil;
-    }
-    if (!rb_obj_is_proc(trace)) {
-	rb_raise(rb_eTypeError, "trace_func needs to be Proc");
-    }
-    trace_func = trace;
-    for (hook = event_hooks; hook; hook = hook->next) {
-	if (hook->func == call_trace_func)
-	    return trace;
+	rb_error_frozen(desc);
     }
-    rb_add_event_hook(call_trace_func, RUBY_EVENT_ALL);
-    return trace;
 }
 
-static char *
-get_event_name(rb_event_t event)
-{
-    switch (event) {
-    case RUBY_EVENT_LINE:
-	return "line";
-    case RUBY_EVENT_CLASS:
-	return "class";
-    case RUBY_EVENT_END:
-	return "end";
-    case RUBY_EVENT_CALL:
-	return "call";
-    case RUBY_EVENT_RETURN:
-	return "return";
-    case RUBY_EVENT_C_CALL:
-	return "c-call";
-    case RUBY_EVENT_C_RETURN:
-	return "c-return";
-    case RUBY_EVENT_RAISE:
-	return "raise";
-    default:
-	return "unknown";
-    }
-}
+NORETURN(static void rb_longjmp(int, volatile VALUE));
 
 static void
-call_trace_func(event, node, self, id, klass)
-    rb_event_t event;
-    NODE *node;
-    VALUE self;
-    ID id;
-    VALUE klass;		/* OK */
-{
-    int state, raised;
-    struct FRAME *prev;
-    NODE *node_save;
-    VALUE srcfile;
-    char *event_name;
-
-    if (!trace_func) return;
-    if (tracing) return;
-    if (ruby_in_compile) return;
-    if (id == ID_ALLOCATOR) return;
-
-    if (!(node_save = ruby_current_node)) {
-	node_save = NEW_NEWLINE(0);
-    }
-    tracing = 1;
-    prev = ruby_frame;
-    PUSH_FRAME();
-    *ruby_frame = *prev;
-    ruby_frame->prev = prev;
-    ruby_frame->iter = 0;	/* blocks not available anyway */
-
-    if (node) {
-	ruby_current_node = node;
-	ruby_frame->node = node;
-	ruby_sourcefile = node->nd_file;
-	ruby_sourceline = nd_line(node);
-    }
-    if (klass) {
-	if (TYPE(klass) == T_ICLASS) {
-	    klass = RBASIC(klass)->klass;
-	}
-	else if (FL_TEST(klass, FL_SINGLETON)) {
-	    klass = rb_iv_get(klass, "__attached__");
-	}
-    }
-    PUSH_TAG(PROT_NONE);
-    raised = thread_reset_raised();
-    if ((state = EXEC_TAG()) == 0) {
-	srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)");
-	event_name = get_event_name(event);
-	proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name),
-					    srcfile,
-					    INT2FIX(ruby_sourceline),
-					    id?ID2SYM(id):Qnil,
-					    self?rb_f_binding(self):Qnil,
-					    klass),
-		    Qundef, 0);
-    }
-    if (raised) thread_set_raised();
-    POP_TAG();
-    POP_FRAME();
-
-    tracing = 0;
-    ruby_current_node = node_save;
-    SET_CURRENT_SOURCE();
-    if (state) JUMP_TAG(state);
-}
-
-static VALUE
-avalue_to_svalue(v)
-    VALUE v;
+setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)
 {
-    VALUE tmp, top;
-
-    tmp = rb_check_array_type(v);
-    if (NIL_P(tmp)) {
-	return v;
-    }
-    if (RARRAY(tmp)->len == 0) {
-	return Qundef;
-    }
-    if (RARRAY(tmp)->len == 1) {
-	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
-	if (NIL_P(top)) {
-	    return RARRAY(tmp)->ptr[0];
-	}
-	if (RARRAY(top)->len > 1) {
-	    return v;
-	}
-	return top;
-    }
-    return tmp;
-}
-
-static VALUE
-svalue_to_avalue(v)
-    VALUE v;
-{
-    VALUE tmp, top;
-
-    if (v == Qundef) return rb_ary_new2(0);
-    tmp = rb_check_array_type(v);
-    if (NIL_P(tmp)) {
-	return rb_ary_new3(1, v);
-    }
-    if (RARRAY(tmp)->len == 1) {
-	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
-	if (!NIL_P(top) && RARRAY(top)->len > 1) {
-	    return tmp;
-	}
-	return rb_ary_new3(1, v);
-    }
-    return tmp;
-}
-
-static VALUE
-svalue_to_mrhs(v, lhs)
-    VALUE v;
-    NODE *lhs;
-{
-    VALUE tmp;
-
-    if (v == Qundef) return rb_ary_new2(0);
-    tmp = rb_check_array_type(v);
-    if (NIL_P(tmp)) {
-	return rb_ary_new3(1, v);
-    }
-    /* no lhs means splat lhs only */
-    if (!lhs) {
-	return rb_ary_new3(1, v);
-    }
-    return tmp;
-}
-
-static VALUE
-avalue_splat(v)
-    VALUE v;
-{
-    if (RARRAY(v)->len == 0) {
-	return Qundef;
-    }
-    if (RARRAY(v)->len == 1) {
-	return RARRAY(v)->ptr[0];
-    }
-    return v;
-}
-
-#if 1
-VALUE
-rb_Array(val)
-    VALUE val;
-{
-    VALUE tmp = rb_check_array_type(val);
-
-    if (NIL_P(tmp)) {
-	/* hack to avoid invoke Object#to_a */
-	VALUE origin;
-	ID id = rb_intern("to_a");
-
-	if (search_method(CLASS_OF(val), id, &origin) &&
-	    RCLASS(origin)->m_tbl != RCLASS(rb_mKernel)->m_tbl) { /* exclude Kernel#to_a */
-	    val = rb_funcall(val, id, 0);
-	    if (TYPE(val) != T_ARRAY) {
-		rb_raise(rb_eTypeError, "`to_a' did not return Array");
-	    }
-	    return val;
-	}
-	else {
-	    return rb_ary_new3(1, val);
-	}
-    }
-    return tmp;
-}
-#endif
-
-static VALUE
-splat_value(v)
-    VALUE v;
-{
-    if (NIL_P(v)) return rb_ary_new3(1, Qnil);
-    return rb_Array(v);
-}
-
-static VALUE
-class_prefix(self, cpath)
-    VALUE self;
-    NODE *cpath;
-{
-    if (!cpath) {
-	rb_bug("class path missing");
-    }
-    if (cpath->nd_head) {
-	VALUE c = rb_eval(self, cpath->nd_head);
-	switch (TYPE(c)) {
-	  case T_CLASS:
-	  case T_MODULE:
-	    break;
-	  default:
-	    rb_raise(rb_eTypeError, "%s is not a class/module",
-		     RSTRING(rb_obj_as_string(c))->ptr);
-	}
-	return c;
-    }
-    else if (nd_type(cpath) == NODE_COLON2) {
-	return ruby_cbase;
-    }
-    else if (ruby_wrapper) {
-	return ruby_wrapper;
-    }
-    else {
-	return rb_cObject;
-    }
-}
-
-#define return_value(v) do {\
-  if ((prot_tag->retval = (v)) == Qundef) {\
-    prot_tag->retval = Qnil;\
-  }\
-} while (0)
-
-NORETURN(static void return_jump _((VALUE)));
-NORETURN(static void break_jump _((VALUE)));
-NORETURN(static void next_jump _((VALUE)));
-NORETURN(static void unknown_node _((NODE * volatile)));
+    VALUE at;
+    VALUE e;
+    const char *file;
+    volatile int line = 0;
 
-static void
-unknown_node(node)
-    NODE *volatile node;
-{
-    ruby_current_node = 0;
-    if (node->flags == 0) {
-        rb_bug("terminated node (0x%lx)", node);
-    }
-    else if (BUILTIN_TYPE(node) != T_NODE) {
-        rb_bug("not a node 0x%02lx (0x%lx)", BUILTIN_TYPE(node), node);
-    }
-    else {
-        rb_bug("unknown node type %d (0x%lx)", nd_type(node), node);
+    if (NIL_P(mesg))
+	mesg = th->errinfo;
+    if (NIL_P(mesg)) {
+	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
     }
-}
-
-static VALUE
-rb_eval(self, n)
-    VALUE self;
-    NODE *n;
-{
-    NODE * volatile contnode = 0;
-    NODE * volatile node = n;
-    int state;
-    volatile VALUE result = Qnil;
-
-#define RETURN(v) do { \
-    result = (v); \
-    goto finish; \
-} while (0)
-
-  again:
-    if (!node) RETURN(Qnil);
-
-    ruby_current_node = node;
-    switch (nd_type(node)) {
-      case NODE_BLOCK:
-	if (contnode) {
-	    result = rb_eval(self, node);
-	    break;
-	}
-	contnode = node->nd_next;
-	node = node->nd_head;
-	goto again;
-
-      case NODE_POSTEXE:
-	rb_f_END();
-	nd_set_type(node, NODE_NIL); /* exec just once */
-	result = Qnil;
-	break;
-
-	/* begin .. end without clauses */
-      case NODE_BEGIN:
-	node = node->nd_body;
-	goto again;
-
-	/* nodes for speed-up(default match) */
-      case NODE_MATCH:
-	result = rb_reg_match2(node->nd_lit);
-	break;
-
-	/* nodes for speed-up(literal match) */
-      case NODE_MATCH2:
-	{
-	    VALUE l = rb_eval(self,node->nd_recv);
-	    VALUE r = rb_eval(self,node->nd_value);
-	    result = rb_reg_match(l, r);
-	}
-	break;
-
-	/* nodes for speed-up(literal match) */
-      case NODE_MATCH3:
-	{
-	    VALUE r = rb_eval(self,node->nd_recv);
-	    VALUE l = rb_eval(self,node->nd_value);
-	    if (TYPE(l) == T_STRING) {
-		result = rb_reg_match(r, l);
-	    }
-	    else {
-		result = rb_funcall(l, match, 1, r);
-	    }
-	}
-	break;
-
-	/* node for speed-up(top-level loop for -n/-p) */
-      case NODE_OPT_N:
-	PUSH_TAG(PROT_LOOP);
-	switch (state = EXEC_TAG()) {
-	  case 0:
-	  opt_n_next:
-	    while (!NIL_P(rb_gets())) {
-	      opt_n_redo:
-		rb_eval(self, node->nd_body);
-	    }
-	    break;
-
-	  case TAG_REDO:
-	    state = 0;
-	    goto opt_n_redo;
-	  case TAG_NEXT:
-	    state = 0;
-	    goto opt_n_next;
-	  case TAG_BREAK:
-	    state = 0;
-	  default:
-	    break;
-	}
-	POP_TAG();
-	if (state) JUMP_TAG(state);
-	RETURN(Qnil);
-
-      case NODE_SELF:
-	RETURN(self);
-
-      case NODE_NIL:
-	RETURN(Qnil);
-
-      case NODE_TRUE:
-	RETURN(Qtrue);
 
-      case NODE_FALSE:
-	RETURN(Qfalse);
-
-      case NODE_IF:
-	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
-			ruby_frame->last_func,
-			ruby_frame->last_class);
-	if (RTEST(rb_eval(self, node->nd_cond))) {
-	    node = node->nd_body;
+    file = rb_sourcefile();
+    if (file) line = rb_sourceline();
+    if (file && !NIL_P(mesg)) {
+	if (mesg == sysstack_error) {
+	    at = rb_enc_sprintf(rb_usascii_encoding(), "%s:%d", file, line);
+	    at = rb_ary_new3(1, at);
+	    rb_iv_set(mesg, "bt", at);
 	}
 	else {
-	    node = node->nd_else;
-	}
-	goto again;
-
-      case NODE_WHEN:
-	while (node) {
-	    NODE *tag;
-
-	    if (nd_type(node) != NODE_WHEN) goto again;
-	    tag = node->nd_head;
-	    while (tag) {
-		EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
-				ruby_frame->last_func,
-				ruby_frame->last_class);
-		if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
-		    VALUE v = rb_eval(self, tag->nd_head->nd_head);
-		    long i;
-
-		    if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
-		    for (i=0; i<RARRAY(v)->len; i++) {
-			if (RTEST(RARRAY(v)->ptr[i])) {
-			    node = node->nd_body;
-			    goto again;
-			}
-		    }
-		    tag = tag->nd_next;
-		    continue;
-		}
-		if (RTEST(rb_eval(self, tag->nd_head))) {
-		    node = node->nd_body;
-		    goto again;
-		}
-		tag = tag->nd_next;
-	    }
-	    node = node->nd_next;
-	}
-	RETURN(Qnil);
-
-      case NODE_CASE:
-	{
-	    VALUE val;
-
-	    val = rb_eval(self, node->nd_head);
-	    node = node->nd_body;
-	    while (node) {
-		NODE *tag;
-
-		if (nd_type(node) != NODE_WHEN) {
-		    goto again;
-		}
-		tag = node->nd_head;
-		while (tag) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
-				    ruby_frame->last_func,
-				    ruby_frame->last_class);
-		    if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
-			VALUE v = rb_eval(self, tag->nd_head->nd_head);
-			long i;
-
-			if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
-			for (i=0; i<RARRAY(v)->len; i++) {
-			    if (RTEST(rb_funcall2(RARRAY(v)->ptr[i], eqq, 1, &val))){
-				node = node->nd_body;
-				goto again;
-			    }
-			}
-			tag = tag->nd_next;
-			continue;
-		    }
-		    if (RTEST(rb_funcall2(rb_eval(self, tag->nd_head), eqq, 1, &val))) {
-			node = node->nd_body;
-			goto again;
-		    }
-		    tag = tag->nd_next;
-		}
-		node = node->nd_next;
-	    }
-	}
-	RETURN(Qnil);
-
-      case NODE_WHILE:
-	PUSH_TAG(PROT_LOOP);
-	result = Qnil;
-	switch (state = EXEC_TAG()) {
-	  case 0:
-	    if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond)))
-		goto while_out;
-	    do {
-	      while_redo:
-		rb_eval(self, node->nd_body);
-	      while_next:
-		;
-	    } while (RTEST(rb_eval(self, node->nd_cond)));
-	    break;
-
-	  case TAG_REDO:
-	    state = 0;
-	    goto while_redo;
-	  case TAG_NEXT:
-	    state = 0;
-	    goto while_next;
-	  case TAG_BREAK:
-	    if (TAG_DST()) {
-		state = 0;
-		result = prot_tag->retval;
-	    }
-	    /* fall through */
-	  default:
-	    break;
-	}
-      while_out:
-	POP_TAG();
-	if (state) JUMP_TAG(state);
-	RETURN(result);
-
-      case NODE_UNTIL:
-	PUSH_TAG(PROT_LOOP);
-	result = Qnil;
-	switch (state = EXEC_TAG()) {
-	  case 0:
-	    if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
-		goto until_out;
-	    do {
-	      until_redo:
-		rb_eval(self, node->nd_body);
-	      until_next:
-		;
-	    } while (!RTEST(rb_eval(self, node->nd_cond)));
-	    break;
-
-	  case TAG_REDO:
-	    state = 0;
-	    goto until_redo;
-	  case TAG_NEXT:
-	    state = 0;
-	    goto until_next;
-	  case TAG_BREAK:
-	    if (TAG_DST()) {
-		state = 0;
-		result = prot_tag->retval;
-	    }
-	    /* fall through */
-	  default:
-	    break;
-	}
-      until_out:
-	POP_TAG();
-	if (state) JUMP_TAG(state);
-	RETURN(result);
-
-      case NODE_BLOCK_PASS:
-	result = block_pass(self, node);
-	break;
-
-      case NODE_ITER:
-      case NODE_FOR:
-	{
-	    PUSH_TAG(PROT_LOOP);
-	    PUSH_BLOCK(node->nd_var, node->nd_body);
-
-	    state = EXEC_TAG();
-	    if (state == 0) {
-	      iter_retry:
-		PUSH_ITER(ITER_PRE);
-		if (nd_type(node) == NODE_ITER) {
-		    result = rb_eval(self, node->nd_iter);
-		}
-		else {
-		    VALUE recv;
-
-		    _block.flags &= ~BLOCK_D_SCOPE;
-		    BEGIN_CALLARGS;
-		    recv = rb_eval(self, node->nd_iter);
-		    END_CALLARGS;
-		    ruby_current_node = node;
-		    SET_CURRENT_SOURCE();
-		    result = rb_call(CLASS_OF(recv),recv,each,0,0,0,self);
+	    at = get_backtrace(mesg);
+	    if (NIL_P(at)) {
+		at = rb_make_backtrace();
+		if (OBJ_FROZEN(mesg)) {
+		    mesg = rb_obj_dup(mesg);
 		}
-		POP_ITER();
-	    }
-	    else if (state == TAG_BREAK && TAG_DST()) {
-		result = prot_tag->retval;
-		state = 0;
-	    }
-	    else if (state == TAG_RETRY) {
-		state = 0;
-		goto iter_retry;
-	    }
-	    POP_BLOCK();
-	    POP_TAG();
-	    switch (state) {
-	      case 0:
-		break;
-	      default:
-		JUMP_TAG(state);
+		set_backtrace(mesg, at);
 	    }
 	}
-	break;
-
-      case NODE_BREAK:
-	break_jump(rb_eval(self, node->nd_stts));
-	break;
-
-      case NODE_NEXT:
-	CHECK_INTS;
-	next_jump(rb_eval(self, node->nd_stts));
-	break;
-
-      case NODE_REDO:
-	CHECK_INTS;
-	JUMP_TAG(TAG_REDO);
-	break;
-
-      case NODE_RETRY:
-	CHECK_INTS;
-	JUMP_TAG(TAG_RETRY);
-	break;
-
-      case NODE_SPLAT:
-	result = splat_value(rb_eval(self, node->nd_head));
-	break;
-
-      case NODE_TO_ARY:
-	result = rb_ary_to_ary(rb_eval(self, node->nd_head));
-	break;
-
-      case NODE_SVALUE:
-	result = avalue_splat(rb_eval(self, node->nd_head));
-	if (result == Qundef) result = Qnil;
-	break;
-
-      case NODE_YIELD:
-	if (node->nd_head) {
-	    result = rb_eval(self, node->nd_head);
-	    ruby_current_node = node;
-	}
-	else {
-	    result = Qundef;	/* no arg */
-	}
-	SET_CURRENT_SOURCE();
-	result = rb_yield_0(result, 0, 0, 0, node->nd_state);
-	break;
+    }
+    if (!NIL_P(mesg)) {
+	th->errinfo = mesg;
+    }
 
-      case NODE_RESCUE:
-	{
-	    volatile VALUE e_info = ruby_errinfo;
-	    volatile int rescuing = 0;
+    if (RTEST(ruby_debug) && !NIL_P(e = th->errinfo) &&
+	!rb_obj_is_kind_of(e, rb_eSystemExit)) {
+	int status;
 
-	    PUSH_TAG(PROT_NONE);
-	    if ((state = EXEC_TAG()) == 0) {
-	      retry_entry:
-		result = rb_eval(self, node->nd_head);
-	    }
-	    else if (rescuing) {
-		if (rescuing < 0) {
-		    /* in rescue argument, just reraise */
-		}
-		else if (state == TAG_RETRY) {
-		    rescuing = state = 0;
-		    ruby_errinfo = e_info;
-		    goto retry_entry;
-		}
-		else if (state != TAG_RAISE) {
-		    result = prot_tag->retval;
-		}
+	PUSH_TAG();
+	if ((status = EXEC_TAG()) == 0) {
+	    RB_GC_GUARD(e) = rb_obj_as_string(e);
+	    if (file && line) {
+		warn_printf("Exception `%s' at %s:%d - %s\n",
+			    rb_obj_classname(th->errinfo),
+			    file, line, RSTRING_PTR(e));
 	    }
-	    else if (state == TAG_RAISE) {
-		NODE *resq = node->nd_resq;
-
-		rescuing = -1;
-		while (resq) {
-		    ruby_current_node = resq;
-		    if (handle_rescue(self, resq)) {
-			state = 0;
-			rescuing = 1;
-			result = rb_eval(self, resq->nd_body);
-			break;
-		    }
-		    resq = resq->nd_head; /* next rescue */
-		}
+	    else if (file) {
+		warn_printf("Exception `%s' at %s - %s\n",
+			    rb_obj_classname(th->errinfo),
+			    file, RSTRING_PTR(e));
 	    }
 	    else {
-		result = prot_tag->retval;
-	    }
-	    POP_TAG();
-	    if (state != TAG_RAISE) ruby_errinfo = e_info;
-	    if (state) {
-		JUMP_TAG(state);
-	    }
-	    /* no exception raised */
-	    if (!rescuing && (node = node->nd_else)) { /* else clause given */
-		goto again;
+		warn_printf("Exception `%s' - %s\n",
+			    rb_obj_classname(th->errinfo),
+			    RSTRING_PTR(e));
 	    }
 	}
-	break;
-
-      case NODE_ENSURE:
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    result = rb_eval(self, node->nd_head);
-	}
 	POP_TAG();
-	if (node->nd_ensr && !thread_no_ensure()) {
-	    VALUE retval = prot_tag->retval; /* save retval */
-	    VALUE errinfo = ruby_errinfo;
-
-	    rb_eval(self, node->nd_ensr);
-	    return_value(retval);
-	    ruby_errinfo = errinfo;
-	}
-	if (state) JUMP_TAG(state);
-	break;
-
-      case NODE_AND:
-	result = rb_eval(self, node->nd_1st);
-	if (!RTEST(result)) break;
-	node = node->nd_2nd;
-	goto again;
-
-      case NODE_OR:
-	result = rb_eval(self, node->nd_1st);
-	if (RTEST(result)) break;
-	node = node->nd_2nd;
-	goto again;
-
-      case NODE_NOT:
-	if (RTEST(rb_eval(self, node->nd_body))) result = Qfalse;
-	else result = Qtrue;
-	break;
-
-      case NODE_DOT2:
-      case NODE_DOT3:
-        {
-	    VALUE beg = rb_eval(self, node->nd_beg);
-	    VALUE end = rb_eval(self, node->nd_end);
-	    result = rb_range_new(beg, end, nd_type(node) == NODE_DOT3);
-	}	
-	break;
-
-      case NODE_FLIP2:		/* like AWK */
-	{
-	    VALUE *flip = rb_svar(node->nd_cnt);
-	    if (!flip) rb_bug("unexpected local variable");
-	    if (!RTEST(*flip)) {
-		if (RTEST(rb_eval(self, node->nd_beg))) {
-		    *flip = RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
-		    result = Qtrue;
-		}
-		else {
-		    result = Qfalse;
-		}
-	    }
-	    else {
-		if (RTEST(rb_eval(self, node->nd_end))) {
-		    *flip = Qfalse;
-		}
-		result = Qtrue;
-	    }
-	}
-	break;
-
-      case NODE_FLIP3:		/* like SED */
-	{
-	    VALUE *flip = rb_svar(node->nd_cnt);
-	    if (!flip) rb_bug("unexpected local variable");
-	    if (!RTEST(*flip)) {
-		result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse;
-		*flip = result;
-	    }
-	    else {
-		if (RTEST(rb_eval(self, node->nd_end))) {
-		    *flip = Qfalse;
-		}
-		result = Qtrue;
-	    }
-	}
-	break;
-
-      case NODE_RETURN:
-	return_jump(rb_eval(self, node->nd_stts));
-	break;
-
-      case NODE_ARGSCAT:
-	{
-	    VALUE args = rb_eval(self, node->nd_head);
-	    result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body)));
-	}
-	break;
-
-      case NODE_ARGSPUSH:
-	{
-	    VALUE args = rb_ary_dup(rb_eval(self, node->nd_head));
-	    result = rb_ary_push(args, rb_eval(self, node->nd_body));
-	}
-	break;
-
-      case NODE_ATTRASGN:
-	{
-	    VALUE recv;
-	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    int scope;
-	    TMP_PROTECT;
-
-	    BEGIN_CALLARGS;
-	    if (node->nd_recv == (NODE *)1) {
-		recv = self;
-		scope = 1;
-	    }
-	    else {
-		recv = rb_eval(self, node->nd_recv);
-		scope = 0;
-	    }
-	    SETUP_ARGS(node->nd_args);
-	    END_CALLARGS;
-
-	    ruby_current_node = node;
-	    SET_CURRENT_SOURCE();
-	    rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope,self);
-	    result = argv[argc-1];
-	}
-	break;
-
-      case NODE_CALL:
-	{
-	    VALUE recv;
-	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    TMP_PROTECT;
-
-	    BEGIN_CALLARGS;
-	    recv = rb_eval(self, node->nd_recv);
-	    SETUP_ARGS(node->nd_args);
-	    END_CALLARGS;
-
-	    ruby_current_node = node;
-	    SET_CURRENT_SOURCE();
-	    result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0,self);
-	}
-	break;
-
-      case NODE_FCALL:
-	{
-	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    TMP_PROTECT;
-
-	    BEGIN_CALLARGS;
-	    SETUP_ARGS(node->nd_args);
-	    END_CALLARGS;
-
-	    ruby_current_node = node;
-	    SET_CURRENT_SOURCE();
-	    result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1,self);
-	}
-	break;
-
-      case NODE_VCALL:
-	SET_CURRENT_SOURCE();
-	result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2,self);
-	break;
-
-      case NODE_SUPER:
-      case NODE_ZSUPER:
-	{
-	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    TMP_PROTECT;
-
-	    if (ruby_frame->last_class == 0) {
-		if (ruby_frame->last_func) {
-		    rb_name_error(ruby_frame->last_func,
-				  "superclass method `%s' disabled",
-				  rb_id2name(ruby_frame->orig_func));
-		}
-		else {
-		    rb_raise(rb_eNoMethodError, "super called outside of method");
-		}
-	    }
-	    if (nd_type(node) == NODE_ZSUPER) {
-		argc = ruby_frame->argc;
-		if (argc && DMETHOD_P()) {
-		    if (TYPE(RBASIC(ruby_scope)->klass) != T_ARRAY ||
-			RARRAY(RBASIC(ruby_scope)->klass)->len != argc) {
-			rb_raise(rb_eRuntimeError, 
-				 "super: specify arguments explicitly");
-		    }
-		    argv = RARRAY(RBASIC(ruby_scope)->klass)->ptr;
-		}
-		else if (!ruby_scope->local_vars) {
-		    argc = 0;
-		    argv = 0;
-		}
-		else {
-		    argv = ruby_scope->local_vars + 2;
-		}
-	    }
-	    else {
-		BEGIN_CALLARGS;
-		SETUP_ARGS(node->nd_args);
-		END_CALLARGS;
-		ruby_current_node = node;
-	    }
-
-	    SET_CURRENT_SOURCE();
-	    result = rb_call_super(argc, argv);
-	}
-	break;
-
-      case NODE_SCOPE:
-	{
-	    struct FRAME frame;
-	    NODE *saved_cref = 0;
-
-	    frame = *ruby_frame;
-	    frame.tmp = ruby_frame;
-	    ruby_frame = &frame;
-
-	    PUSH_SCOPE();
-	    PUSH_TAG(PROT_NONE);
-	    if (node->nd_rval) {
-		saved_cref = ruby_cref;
-		ruby_cref = (NODE*)node->nd_rval;
-	    }
-	    if (node->nd_tbl) {
-		VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
-		*vars++ = (VALUE)node;
-		ruby_scope->local_vars = vars;
-		rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
-		ruby_scope->local_tbl = node->nd_tbl;
-	    }
-	    else {
-		ruby_scope->local_vars = 0;
-		ruby_scope->local_tbl  = 0;
-	    }
-	    if ((state = EXEC_TAG()) == 0) {
-		result = rb_eval(self, node->nd_next);
-	    }
-	    POP_TAG();
-	    POP_SCOPE();
-	    ruby_frame = frame.tmp;
-	    if (saved_cref)
-		ruby_cref = saved_cref;
-	    if (state) JUMP_TAG(state);
-	}
-	break;
-
-      case NODE_OP_ASGN1:
-	{
-	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    VALUE recv, val, tmp;
-	    NODE *rval;
-	    TMP_PROTECT;
-
-	    recv = rb_eval(self, node->nd_recv);
-	    rval = node->nd_args->nd_head;
-	    SETUP_ARGS0(node->nd_args->nd_body, 1);
-	    val = rb_funcall3(recv, aref, argc, argv);
-	    switch (node->nd_mid) {
-	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, rval);
-	      break;
-	    case 1: /* AND */
-	      if (!RTEST(val)) RETURN(val);
-	      val = rb_eval(self, rval);
-	      break;
-	    default:
-	      tmp = rb_eval(self, rval);
-	      val = rb_funcall3(val, node->nd_mid, 1, &tmp);
-	    }
-	    argv[argc] = val;
-	    rb_funcall2(recv, aset, argc+1, argv);
-	    result = val;
-	}
-	break;
-
-      case NODE_OP_ASGN2:
-	{
-	    ID id = node->nd_next->nd_vid;
-	    VALUE recv, val, tmp;
-
-	    recv = rb_eval(self, node->nd_recv);
-	    val = rb_funcall3(recv, id, 0, 0);
-	    switch (node->nd_next->nd_mid) {
-	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, node->nd_value);
-	      break;
-	    case 1: /* AND */
-	      if (!RTEST(val)) RETURN(val);
-	      val = rb_eval(self, node->nd_value);
-	      break;
-	    default:
-	      tmp = rb_eval(self, node->nd_value);
-	      val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp);
-	    }
-
-	    rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
-	    result = val;
-	}
-	break;
-
-      case NODE_OP_ASGN_AND:
-	result = rb_eval(self, node->nd_head);
-	if (!RTEST(result)) break;
-	node = node->nd_value;
-	goto again;
-
-      case NODE_OP_ASGN_OR:
-	if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) ||
-	    !RTEST(result = rb_eval(self, node->nd_head))) {
-	    node = node->nd_value;
-	    goto again;
-	}
-	break;
-
-      case NODE_MASGN:
-	result = massign(self, node, rb_eval(self, node->nd_value), 0);
-	break;
-
-      case NODE_LASGN:
-	if (ruby_scope->local_vars == 0)
-	    rb_bug("unexpected local variable assignment");
-	result = rb_eval(self, node->nd_value);
-	ruby_scope->local_vars[node->nd_cnt] = result;
-	break;
-
-      case NODE_DASGN:
-	result = rb_eval(self, node->nd_value);
-	dvar_asgn(node->nd_vid, result);
-	break;
-
-      case NODE_DASGN_CURR:
-	result = rb_eval(self, node->nd_value);
-	dvar_asgn_curr(node->nd_vid, result);
-	break;
-
-      case NODE_GASGN:
-	result = rb_eval(self, node->nd_value);
-	rb_gvar_set(node->nd_entry, result);
-	break;
-
-      case NODE_IASGN:
-	result = rb_eval(self, node->nd_value);
-	rb_ivar_set(self, node->nd_vid, result);
-	break;
-
-      case NODE_CDECL:
-	result = rb_eval(self, node->nd_value);
-	if (node->nd_vid == 0) {
-	    rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
-	}
-	else {
-	    rb_const_set(ruby_cbase, node->nd_vid, result);
-	}
-	break;
-
-      case NODE_CVDECL:
-	if (NIL_P(ruby_cbase)) {
-	    rb_raise(rb_eTypeError, "no class/module to define class variable");
-	}
-	result = rb_eval(self, node->nd_value);
-	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qtrue);
-	break;
-
-      case NODE_CVASGN:
-	result = rb_eval(self, node->nd_value);
-	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qfalse);
-	break;
-
-      case NODE_LVAR:
-	if (ruby_scope->local_vars == 0) {
-	    rb_bug("unexpected local variable");
-	}
-	result = ruby_scope->local_vars[node->nd_cnt];
-	break;
-
-      case NODE_DVAR:
-	result = rb_dvar_ref(node->nd_vid);
-	break;
-
-      case NODE_GVAR:
-	result = rb_gvar_get(node->nd_entry);
-	break;
-
-      case NODE_IVAR:
-	result = rb_ivar_get(self, node->nd_vid);
-	break;
-
-      case NODE_CONST:
-	result = ev_const_get(ruby_cref, node->nd_vid, self);
-	break;
-
-      case NODE_CVAR:
-	result = rb_cvar_get(cvar_cbase(), node->nd_vid);
-	break;
-
-      case NODE_BLOCK_ARG:
-	if (ruby_scope->local_vars == 0)
-	    rb_bug("unexpected block argument");
-	if (rb_block_given_p()) {
-	    result = rb_block_proc();
-	    ruby_scope->local_vars[node->nd_cnt] = result;
-	}
-	else {
-	    result = Qnil;
-	}
-	break;
-
-      case NODE_COLON2:
-	{
-	    VALUE klass;
-
-	    klass = rb_eval(self, node->nd_head);
-	    if (rb_is_const_id(node->nd_mid)) {
-		switch (TYPE(klass)) {
-		  case T_CLASS:
-		  case T_MODULE:
-		    result = rb_const_get_from(klass, node->nd_mid);
-		    break;
-		  default:
-		    rb_raise(rb_eTypeError, "%s is not a class/module",
-			     RSTRING(rb_obj_as_string(klass))->ptr);
-		    break;
-		}
-	    }
-	    else {
-		result = rb_funcall(klass, node->nd_mid, 0, 0);
-	    }
-	}
-	break;
-
-      case NODE_COLON3:
-	result = rb_const_get_from(rb_cObject, node->nd_mid);
-	break;
-
-      case NODE_NTH_REF:
-	result = rb_reg_nth_match(node->nd_nth, MATCH_DATA);
-	break;
-
-      case NODE_BACK_REF:
-	switch (node->nd_nth) {
-	  case '&':
-	    result = rb_reg_last_match(MATCH_DATA);
-	    break;
-	  case '`':
-	    result = rb_reg_match_pre(MATCH_DATA);
-	    break;
-	  case '\'':
-	    result = rb_reg_match_post(MATCH_DATA);
-	    break;
-	  case '+':
-	    result = rb_reg_match_last(MATCH_DATA);
-	    break;
-	  default:
-	    rb_bug("unexpected back-ref");
-	}
-	break;
-
-      case NODE_HASH:
-	{
-	    NODE *list;
-	    VALUE hash = rb_hash_new();
-	    VALUE key, val;
-
-	    list = node->nd_head;
-	    while (list) {
-		key = rb_eval(self, list->nd_head);
-		list = list->nd_next;
-		if (list == 0)
-		    rb_bug("odd number list for Hash");
-		val = rb_eval(self, list->nd_head);
-		list = list->nd_next;
-		rb_hash_aset(hash, key, val);
-	    }
-	    result = hash;
-	}
-	break;
-
-      case NODE_ZARRAY:		/* zero length list */
-	result = rb_ary_new();
-	break;
-
-      case NODE_ARRAY:
-	{
-	    VALUE ary;
-	    long i;
-
-	    i = node->nd_alen;
-	    ary = rb_ary_new2(i);
-	    for (i=0;node;node=node->nd_next) {
-		RARRAY(ary)->ptr[i++] = rb_eval(self, node->nd_head);
-		RARRAY(ary)->len = i;
-	    }
-
-	    result = ary;
-	}
-	break;
-
-      case NODE_STR:
-	result = rb_str_new3(node->nd_lit);
-	break;
-
-      case NODE_EVSTR:
-	result = rb_obj_as_string(rb_eval(self, node->nd_body));
-	break;
-
-      case NODE_DSTR:
-      case NODE_DXSTR:
-      case NODE_DREGX:
-      case NODE_DREGX_ONCE:
-      case NODE_DSYM:
-	{
-	    VALUE str, str2;
-	    NODE *list = node->nd_next;
-
-	    str = rb_str_new3(node->nd_lit);
-	    while (list) {
-		if (list->nd_head) {
-		    switch (nd_type(list->nd_head)) {
-		      case NODE_STR:
-			str2 = list->nd_head->nd_lit;
-			break;
-		      default:
-			str2 = rb_eval(self, list->nd_head);
-			break;
-		    }
-		    rb_str_append(str, str2);
-		    OBJ_INFECT(str, str2);
-		}
-		list = list->nd_next;
-	    }
-	    switch (nd_type(node)) {
-	      case NODE_DREGX:
-		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
-				    node->nd_cflag);
-		break;
-	      case NODE_DREGX_ONCE:	/* regexp expand once */
-		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
-				    node->nd_cflag);
-		nd_set_type(node, NODE_LIT);
-		node->nd_lit = result;
-		break;
-	      case NODE_LIT:
-		/* other thread may replace NODE_DREGX_ONCE to NODE_LIT */
-		goto again;
-	      case NODE_DXSTR:
-		result = rb_funcall(self, '`', 1, str);
-		break;
-	      case NODE_DSYM:
-		result = rb_str_intern(str);
-		break;
-	      default:
-		result = str;
-		break;
-	    }
-	}
-	break;
-
-      case NODE_XSTR:
-	result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit));
-	break;
-
-      case NODE_LIT:
-	result = node->nd_lit;
-	break;
-
-      case NODE_DEFN:
-	if (node->nd_defn) {
-	    NODE *body,  *defn;
-	    VALUE origin;
-	    int noex;
-
-	    if (NIL_P(ruby_class)) {
-		rb_raise(rb_eTypeError, "no class/module to add method");
-	    }
-	    if (ruby_class == rb_cObject && node->nd_mid == init) {
-		rb_warn("redefining Object#initialize may cause infinite loop");
-	    }
-	    if (node->nd_mid == __id__ || node->nd_mid == __send__) {
-		rb_warn("redefining `%s' may cause serious problem",
-			rb_id2name(node->nd_mid));
-	    }
-	    rb_frozen_class_p(ruby_class);
-	    body = search_method(ruby_class, node->nd_mid, &origin);
-	    if (body){
-		if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0 && body->nd_body) {
-		    rb_warning("method redefined; discarding old %s", rb_id2name(node->nd_mid));
-		}
-	    }
-
-	    if (SCOPE_TEST(SCOPE_PRIVATE) || node->nd_mid == init) {
-		noex = NOEX_PRIVATE;
-	    }
-	    else if (SCOPE_TEST(SCOPE_PROTECTED)) {
-		noex = NOEX_PROTECTED;
-	    }
-	    else {
-		noex = NOEX_PUBLIC;
-	    }
-	    if (body && origin == ruby_class && body->nd_body == 0) {
-		noex |= NOEX_NOSUPER;
-	    }
-
-	    defn = copy_node_scope(node->nd_defn, ruby_cref);
-	    rb_add_method(ruby_class, node->nd_mid, defn, noex);
-	    if (scope_vmode == SCOPE_MODFUNC) {
-		rb_add_method(rb_singleton_class(ruby_class),
-			      node->nd_mid, defn, NOEX_PUBLIC);
-	    }
-	    result = Qnil;
-	}
-	break;
-
-      case NODE_DEFS:
-	if (node->nd_defn) {
-	    VALUE recv = rb_eval(self, node->nd_recv);
-	    VALUE klass;
-	    NODE *body = 0, *defn;
-
-	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(recv)) {
-		rb_raise(rb_eSecurityError, "Insecure: can't define singleton method");
-	    }
-	    if (FIXNUM_P(recv) || SYMBOL_P(recv)) {
-		rb_raise(rb_eTypeError,
-			 "can't define singleton method \"%s\" for %s",
-			 rb_id2name(node->nd_mid),
-			 rb_obj_classname(recv));
-	    }
-
-	    if (OBJ_FROZEN(recv)) rb_error_frozen("object");
-	    klass = rb_singleton_class(recv);
-	    if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, (st_data_t *)&body)) {
-		if (ruby_safe_level >= 4) {
-		    rb_raise(rb_eSecurityError, "redefining method prohibited");
-		}
-		if (RTEST(ruby_verbose)) {
-		    rb_warning("redefine %s", rb_id2name(node->nd_mid));
-		}
-	    }
-	    defn = copy_node_scope(node->nd_defn, ruby_cref);
-	    rb_add_method(klass, node->nd_mid, defn,
-			  NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
-	    result = Qnil;
-	}
-	break;
-
-      case NODE_UNDEF:
-	if (NIL_P(ruby_class)) {
-	    rb_raise(rb_eTypeError, "no class to undef method");
+	if (status == TAG_FATAL && th->errinfo == exception_error) {
+	    th->errinfo = mesg;
 	}
-	rb_undef(ruby_class, rb_to_id(rb_eval(self, node->u2.node)));
-	result = Qnil;
-	break;
-
-      case NODE_ALIAS:
-	if (NIL_P(ruby_class)) {
-	    rb_raise(rb_eTypeError, "no class to make alias");
-	}
-	rb_alias(ruby_class, rb_to_id(rb_eval(self, node->u1.node)),
-		             rb_to_id(rb_eval(self, node->u2.node)));
-	result = Qnil;
-	break;
-
-      case NODE_VALIAS:
-	rb_alias_variable(node->u1.id, node->u2.id);
-	result = Qnil;
-	break;
-
-      case NODE_CLASS:
-	{
-	    VALUE super, klass, tmp, cbase;
-	    ID cname;
-	    int gen = Qfalse;
-
-	    cbase = class_prefix(self, node->nd_cpath);
-	    cname = node->nd_cpath->nd_mid;
-
-	    if (NIL_P(ruby_cbase)) {
-		rb_raise(rb_eTypeError, "no outer class/module");
-	    }
-	    if (node->nd_super) {
-	       super = rb_eval(self, node->nd_super);
-	       rb_check_inheritable(super);
-	    }
-	    else {
-		super = 0;
-	    }
-
-	    if (rb_const_defined_at(cbase, cname)) {
-		klass = rb_const_get_at(cbase, cname);
-		if (TYPE(klass) != T_CLASS) {
-		    rb_raise(rb_eTypeError, "%s is not a class",
-			     rb_id2name(cname));
-		}
-		if (super) {
-		    tmp = rb_class_real(RCLASS(klass)->super);
-		    if (tmp != super) {
-			rb_raise(rb_eTypeError, "superclass mismatch for class %s",
-				 rb_id2name(cname));
-		    }
-		    super = 0;
-		}
-		if (ruby_safe_level >= 4) {
-		    rb_raise(rb_eSecurityError, "extending class prohibited");
-		}
-	    }
-	    else {
-		if (!super) super = rb_cObject;
-		klass = rb_define_class_id(cname, super);
-		rb_set_class_path(klass, cbase, rb_id2name(cname));
-		rb_const_set(cbase, cname, klass);
-		gen = Qtrue;
-	    }
-	    if (ruby_wrapper) {
-		rb_extend_object(klass, ruby_wrapper);
-		rb_include_module(klass, ruby_wrapper);
-	    }
-	    if (super && gen) {
-		rb_class_inherited(super, klass);
-	    }
-	    result = module_setup(klass, node);
-	}
-	break;
-
-      case NODE_MODULE:
-	{
-	    VALUE module, cbase;
-	    ID cname;
-
-	    if (NIL_P(ruby_cbase)) {
-		rb_raise(rb_eTypeError, "no outer class/module");
-	    }
-	    cbase = class_prefix(self, node->nd_cpath);
-	    cname = node->nd_cpath->nd_mid;
-	    if (rb_const_defined_at(cbase, cname)) {
-		module = rb_const_get_at(cbase, cname);
-		if (TYPE(module) != T_MODULE) {
-		    rb_raise(rb_eTypeError, "%s is not a module",
-			     rb_id2name(cname));
-		}
-		if (ruby_safe_level >= 4) {
-		    rb_raise(rb_eSecurityError, "extending module prohibited");
-		}
-	    }
-	    else {
-		module = rb_define_module_id(cname);
-		rb_set_class_path(module, cbase, rb_id2name(cname));
-		rb_const_set(cbase, cname, module);
-	    }
-	    if (ruby_wrapper) {
-		rb_extend_object(module, ruby_wrapper);
-		rb_include_module(module, ruby_wrapper);
-	    }
-
-	    result = module_setup(module, node);
-	}
-	break;
-
-      case NODE_SCLASS:
-	{
-	    VALUE klass;
-
-	    result = rb_eval(self, node->nd_recv);
-	    if (FIXNUM_P(result) || SYMBOL_P(result)) {
-		rb_raise(rb_eTypeError, "no virtual class for %s",
-			 rb_obj_classname(result));
-	    }
-	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(result))
-		rb_raise(rb_eSecurityError, "Insecure: can't extend object");
-	    klass = rb_singleton_class(result);
-
-	    if (ruby_wrapper) {
-		rb_extend_object(klass, ruby_wrapper);
-		rb_include_module(klass, ruby_wrapper);
-	    }
-
-	    result = module_setup(klass, node);
-	}
-	break;
-
-      case NODE_DEFINED:
-	{
-	    char buf[20];
-	    char *desc = is_defined(self, node->nd_head, buf);
-
-	    if (desc) result = rb_str_new2(desc);
-	    else result = Qnil;
+	else if (status) {
+	    rb_threadptr_reset_raised(th);
+	    JUMP_TAG(status);
 	}
-	break;
-
-      case NODE_NEWLINE:
-	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, 
-			ruby_frame->last_func,
-			ruby_frame->last_class);
-	node = node->nd_next;
-	goto again;
-
-      default:
-	unknown_node(node);
-    }
-  finish:
-    CHECK_INTS;
-    if (contnode) {
-	node = contnode;
-	contnode = 0;
-	goto again;
-    }
-    return result;
-}
-
-static VALUE
-module_setup(module, n)
-    VALUE module;
-    NODE *n;
-{
-    NODE * volatile node = n->nd_body;
-    int state;
-    struct FRAME frame;
-    VALUE result = Qnil;	/* OK */
-    TMP_PROTECT;
-
-    frame = *ruby_frame;
-    frame.tmp = ruby_frame;
-    ruby_frame = &frame;
-
-    PUSH_CLASS(module);
-    PUSH_SCOPE();
-    PUSH_VARS();
-
-    if (node->nd_tbl) {
-	VALUE *vars = TMP_ALLOC(node->nd_tbl[0]+1);
-	*vars++ = (VALUE)node;
-	ruby_scope->local_vars = vars;
-	rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
-	ruby_scope->local_tbl = node->nd_tbl;
-    }
-    else {
-	ruby_scope->local_vars = 0;
-	ruby_scope->local_tbl  = 0;
-    }
-
-    PUSH_CREF(module);
-    PUSH_TAG(PROT_NONE);
-    if ((state = EXEC_TAG()) == 0) {
-	EXEC_EVENT_HOOK(RUBY_EVENT_CLASS, n, ruby_cbase,
-			ruby_frame->last_func, ruby_frame->last_class);
-	result = rb_eval(ruby_cbase, node->nd_next);
-    }
-    POP_TAG();
-    POP_CREF();
-    POP_VARS();
-    POP_SCOPE();
-    POP_CLASS();
-
-    ruby_frame = frame.tmp;
-    EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0,
-		    ruby_frame->last_func, ruby_frame->last_class);
-    if (state) JUMP_TAG(state);
-
-    return result;
-}
-
-static NODE *basic_respond_to = 0;
-
-int
-rb_obj_respond_to(obj, id, priv)
-    VALUE obj;
-    ID id;
-    int priv;
-{
-    VALUE klass = CLASS_OF(obj);
-
-    if (rb_method_node(klass, respond_to) == basic_respond_to) {
-	return rb_method_boundp(klass, id, !priv);
-    }
-    else {
-	VALUE args[2];
-	int n = 0;
-	args[n++] = ID2SYM(id);
-	if (priv) args[n++] = Qtrue;
-	return rb_funcall2(obj, respond_to, n, args);
-    }
-}
-
-int
-rb_respond_to(obj, id)
-    VALUE obj;
-    ID id;
-{
-    return rb_obj_respond_to(obj, id, Qfalse);
-}
-
-/*
- *  call-seq:
- *     obj.respond_to?(symbol, include_private=false) => true or false
- *  
- *  Returns +true+> if _obj_ responds to the given
- *  method. Private methods are included in the search only if the
- *  optional second parameter evaluates to +true+.
- */
-
-static VALUE
-obj_respond_to(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE mid, priv;
-    ID id;
-
-    rb_scan_args(argc, argv, "11", &mid, &priv);
-    id = rb_to_id(mid);
-    if (rb_method_boundp(CLASS_OF(obj), id, !RTEST(priv))) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-/*
- *  call-seq:
- *     mod.method_defined?(symbol)    => true or false
- *  
- *  Returns +true+ if the named method is defined by
- *  _mod_ (or its included modules and, if _mod_ is a class,
- *  its ancestors). Public and protected methods are matched.
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1    #=> true
- *     C.method_defined? "method1"   #=> true
- *     C.method_defined? "method2"   #=> true
- *     C.method_defined? "method3"   #=> true
- *     C.method_defined? "method4"   #=> false
- */
-
-static VALUE
-rb_mod_method_defined(mod, mid)
-    VALUE mod, mid;
-{
-    return rb_method_boundp(mod, rb_to_id(mid), 1);
-}
-
-#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
-
-/*
- *  call-seq:
- *     mod.public_method_defined?(symbol)   => true or false
- *  
- *  Returns +true+ if the named public method is defined by
- *  _mod_ (or its included modules and, if _mod_ is a class,
- *  its ancestors).
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       protected
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1           #=> true
- *     C.public_method_defined? "method1"   #=> true
- *     C.public_method_defined? "method2"   #=> false
- *     C.method_defined? "method2"          #=> true
- */
-
-static VALUE
-rb_mod_public_method_defined(mod, mid)
-    VALUE mod, mid;
-{
-    ID id = rb_to_id(mid);
-    int noex;
-
-    if (rb_get_method_body(&mod, &id, &noex)) {
-	if (VISI_CHECK(noex, NOEX_PUBLIC))
-	    return Qtrue;
     }
-    return Qfalse;
-}
-
-/*
- *  call-seq:
- *     mod.private_method_defined?(symbol)    => true or false
- *  
- *  Returns +true+ if the named private method is defined by
- *  _ mod_ (or its included modules and, if _mod_ is a class,
- *  its ancestors).
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       private
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1            #=> true
- *     C.private_method_defined? "method1"   #=> false
- *     C.private_method_defined? "method2"   #=> true
- *     C.method_defined? "method2"           #=> false
- */
 
-static VALUE
-rb_mod_private_method_defined(mod, mid)
-    VALUE mod, mid;
-{
-    ID id = rb_to_id(mid);
-    int noex;
-
-    if (rb_get_method_body(&mod, &id, &noex)) {
-	if (VISI_CHECK(noex, NOEX_PRIVATE))
-	    return Qtrue;
-    }
-    return Qfalse;
-}
-
-/*
- *  call-seq:
- *     mod.protected_method_defined?(symbol)   => true or false
- *  
- *  Returns +true+ if the named protected method is defined
- *  by _mod_ (or its included modules and, if _mod_ is a
- *  class, its ancestors).
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       protected
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1              #=> true
- *     C.protected_method_defined? "method1"   #=> false
- *     C.protected_method_defined? "method2"   #=> true
- *     C.method_defined? "method2"             #=> true
- */
-
-static VALUE
-rb_mod_protected_method_defined(mod, mid)
-    VALUE mod, mid;
-{
-    ID id = rb_to_id(mid);
-    int noex;
-
-    if (rb_get_method_body(&mod, &id, &noex)) {
-	if (VISI_CHECK(noex, NOEX_PROTECTED))
-	    return Qtrue;
+    if (rb_threadptr_set_raised(th)) {
+	th->errinfo = exception_error;
+	rb_threadptr_reset_raised(th);
+	JUMP_TAG(TAG_FATAL);
     }
-    return Qfalse;
-}
 
-NORETURN(static VALUE terminate_process _((int, VALUE)));
-static VALUE
-terminate_process(status, mesg)
-    int status;
-    VALUE mesg;
-{
-    VALUE args[2];
-    args[0] = INT2NUM(status);
-    args[1] = mesg;
-
-    rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
-}
+    rb_trap_restore_mask();
 
-void
-rb_exit(status)
-    int status;
-{
-    if (prot_tag) {
-	terminate_process(status, rb_str_new("exit", 4));
+    if (tag != TAG_FATAL) {
+	EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0);
     }
-    ruby_finalize();
-    exit(status);
 }
 
-
-/*
- *  call-seq:
- *     exit(integer=0)
- *     Kernel::exit(integer=0)
- *     Process::exit(integer=0)
- *  
- *  Initiates the termination of the Ruby script by raising the
- *  <code>SystemExit</code> exception. This exception may be caught. The
- *  optional parameter is used to return a status code to the invoking
- *  environment.
- *     
- *     begin
- *       exit
- *       puts "never get here"
- *     rescue SystemExit
- *       puts "rescued a SystemExit exception"
- *     end
- *     puts "after begin block"
- *     
- *  <em>produces:</em>
- *     
- *     rescued a SystemExit exception
- *     after begin block
- *     
- *  Just prior to termination, Ruby executes any <code>at_exit</code> functions
- *  (see Kernel::at_exit) and runs any object finalizers (see
- *  ObjectSpace::define_finalizer).
- *     
- *     at_exit { puts "at_exit function" }
- *     ObjectSpace.define_finalizer("string",  proc { puts "in finalizer" })
- *     exit
- *     
- *  <em>produces:</em>
- *     
- *     at_exit function
- *     in finalizer
- */
-
-VALUE
-rb_f_exit(argc, argv)
-    int argc;
-    VALUE *argv;
+static void
+rb_longjmp(int tag, volatile VALUE mesg)
 {
-    VALUE status;
-    int istatus;
-
-    rb_secure(4);
-    if (rb_scan_args(argc, argv, "01", &status) == 1) {
-	switch (status) {
-	  case Qtrue:
-	    istatus = EXIT_SUCCESS;
-	    break;
-	  case Qfalse:
-	    istatus = EXIT_FAILURE;
-	    break;
-	  default:
-	    istatus = NUM2INT(status);
-#if EXIT_SUCCESS != 0
-	    if (istatus == 0) istatus = EXIT_SUCCESS;
-#endif
-	    break;
-	}
-    }
-    else {
-	istatus = EXIT_SUCCESS;
-    }
-    rb_exit(istatus);
-    return Qnil;		/* not reached */
+    rb_thread_t *th = GET_THREAD();
+    setup_exception(th, tag, mesg);
+    rb_thread_raised_clear(th);
+    JUMP_TAG(tag);
 }
 
-
-/*
- *  call-seq:
- *     abort
- *     Kernel::abort
- *     Process::abort
- *  
- *  Terminate execution immediately, effectively by calling
- *  <code>Kernel.exit(1)</code>. If _msg_ is given, it is written
- *  to STDERR prior to terminating.
- */
-
-VALUE
-rb_f_abort(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    rb_secure(4);
-    if (argc == 0) {
-	if (!NIL_P(ruby_errinfo)) {
-	    error_print();
-	}
-	rb_exit(EXIT_FAILURE);
-    }
-    else {
-	VALUE mesg;
-
-	rb_scan_args(argc, argv, "1", &mesg);
-	StringValue(mesg);
-	rb_io_puts(1, &mesg, rb_stderr);
-	terminate_process(EXIT_FAILURE, mesg);
-    }
-    return Qnil;		/* not reached */
-}
+static VALUE make_exception(int argc, VALUE *argv, int isstr);
 
 void
-rb_iter_break()
-{
-    break_jump(Qnil);
-}
-
-NORETURN(static void rb_longjmp _((int, VALUE)));
-static VALUE make_backtrace _((void));
-
-static void
-rb_longjmp(tag, mesg)
-    int tag;
-    VALUE mesg;
+rb_exc_raise(VALUE mesg)
 {
-    VALUE at;
-
-    if (thread_set_raised()) {
-	ruby_errinfo = exception_error;
-	JUMP_TAG(TAG_FATAL);
-    }
-    if (NIL_P(mesg)) mesg = ruby_errinfo;
-    if (NIL_P(mesg)) {
-	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
-    }
-
-    ruby_set_current_source();
-    if (ruby_sourcefile && !NIL_P(mesg)) {
-	at = get_backtrace(mesg);
-	if (NIL_P(at)) {
-	    at = make_backtrace();
-	    set_backtrace(mesg, at);
-	}
-    }
     if (!NIL_P(mesg)) {
-	ruby_errinfo = mesg;
-    }
-
-    if (RTEST(ruby_debug) && !NIL_P(ruby_errinfo)
-	&& !rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	VALUE e = ruby_errinfo;
-	int status;
-
-	PUSH_TAG(PROT_NONE);
-	if ((status = EXEC_TAG()) == 0) {
-	    StringValue(e);
-	    warn_printf("Exception `%s' at %s:%d - %s\n",
-			rb_obj_classname(ruby_errinfo),
-			ruby_sourcefile, ruby_sourceline,
-			RSTRING(e)->ptr);
-	}
-	POP_TAG();
-	if (status == TAG_FATAL && ruby_errinfo == exception_error) {
-	    ruby_errinfo = mesg;
-	}
-	else if (status) {
-	    thread_reset_raised();
-	    JUMP_TAG(status);
-	}
-    }
-
-    rb_trap_restore_mask();
-    if (tag != TAG_FATAL) {
-	EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
-			ruby_frame->self,
-			ruby_frame->last_func,
-			ruby_frame->last_class);
-    }
-    if (!prot_tag) {
-	error_print();
+	mesg = make_exception(1, &mesg, FALSE);
     }
-    thread_reset_raised();
-    JUMP_TAG(tag);
-}
-
-void
-rb_exc_raise(mesg)
-    VALUE mesg;
-{
     rb_longjmp(TAG_RAISE, mesg);
 }
 
 void
-rb_exc_fatal(mesg)
-    VALUE mesg;
+rb_exc_fatal(VALUE mesg)
 {
+    if (!NIL_P(mesg)) {
+	mesg = make_exception(1, &mesg, FALSE);
+    }
     rb_longjmp(TAG_FATAL, mesg);
 }
 
 void
-rb_interrupt()
+rb_interrupt(void)
 {
-    rb_raise(rb_eInterrupt, "");
+    rb_raise(rb_eInterrupt, "%s", "");
 }
 
+static VALUE get_errinfo(void);
+
 /*
  *  call-seq:
  *     raise
@@ -4648,7 +489,7 @@ rb_interrupt()
  *     fail
  *     fail(string)
  *     fail(exception [, string [, array]])
- *  
+ *
  *  With no arguments, raises the exception in <code>$!</code> or raises
  *  a <code>RuntimeError</code> if <code>$!</code> is +nil+.
  *  With a single +String+ argument, raises a
@@ -4659,24 +500,28 @@ rb_interrupt()
  *  message associated with the exception, and the third parameter is an
  *  array of callback information. Exceptions are caught by the
  *  +rescue+ clause of <code>begin...end</code> blocks.
- *     
+ *
  *     raise "Failed to create socket"
  *     raise ArgumentError, "No parameters", caller
  */
 
 static VALUE
-rb_f_raise(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_raise(int argc, VALUE *argv)
 {
+    VALUE err;
+    if (argc == 0) {
+	err = get_errinfo();
+	if (!NIL_P(err)) {
+	    argc = 1;
+	    argv = &err;
+	}
+    }
     rb_raise_jump(rb_make_exception(argc, argv));
     return Qnil;		/* not reached */
 }
 
 static VALUE
-rb_make_exception(argc, argv)
-    int argc;
-    VALUE *argv;
+make_exception(int argc, VALUE *argv, int isstr)
 {
     VALUE mesg;
     ID exception;
@@ -4685,13 +530,16 @@ rb_make_exception(argc, argv)
     mesg = Qnil;
     switch (argc) {
       case 0:
-	mesg = Qnil;
 	break;
       case 1:
-	if (NIL_P(argv[0])) break;
-	if (TYPE(argv[0]) == T_STRING) {
-	    mesg = rb_exc_new3(rb_eRuntimeError, argv[0]);
+	if (NIL_P(argv[0]))
 	    break;
+	if (isstr) {
+	    mesg = rb_check_string_type(argv[0]);
+	    if (!NIL_P(mesg)) {
+		mesg = rb_exc_new3(rb_eRuntimeError, mesg);
+		break;
+	    }
 	}
 	n = 0;
 	goto exception_call;
@@ -4700,2885 +548,287 @@ rb_make_exception(argc, argv)
       case 3:
 	n = 1;
       exception_call:
-	exception = rb_intern("exception");
-	if (!rb_respond_to(argv[0], exception)) {
+	if (argv[0] == sysstack_error) return argv[0];
+	CONST_ID(exception, "exception");
+	mesg = rb_check_funcall(argv[0], exception, n, argv+1);
+	if (mesg == Qundef) {
 	    rb_raise(rb_eTypeError, "exception class/object expected");
 	}
-	mesg = rb_funcall(argv[0], exception, n, argv[1]);
 	break;
       default:
-	rb_raise(rb_eArgError, "wrong number of arguments");
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..3)", argc);
 	break;
     }
     if (argc > 0) {
 	if (!rb_obj_is_kind_of(mesg, rb_eException))
 	    rb_raise(rb_eTypeError, "exception object expected");
-	if (argc>2)
+	if (argc > 2)
 	    set_backtrace(mesg, argv[2]);
     }
 
     return mesg;
 }
 
-static void
-rb_raise_jump(mesg)
-    VALUE mesg;
+VALUE
+rb_make_exception(int argc, VALUE *argv)
 {
-    if (ruby_frame != top_frame) {
-	PUSH_FRAME();		/* fake frame */
-	*ruby_frame = *_frame.prev->prev;
-	rb_longjmp(TAG_RAISE, mesg);
-	POP_FRAME();
-    }
-    rb_longjmp(TAG_RAISE, mesg);
+    return make_exception(argc, argv, TRUE);
 }
 
 void
-rb_jump_tag(tag)
-    int tag;
-{
-    JUMP_TAG(tag);
-}
-
-int
-rb_block_given_p()
-{
-    if (ruby_frame->iter == ITER_CUR && ruby_block)
-	return Qtrue;
-    return Qfalse;
-}
-
-int
-rb_iterator_p()
-{
-    return rb_block_given_p();
-}
-
-/*
- *  call-seq:
- *     block_given?   => true or false
- *     iterator?      => true or false
- *  
- *  Returns <code>true</code> if <code>yield</code> would execute a
- *  block in the current context. The <code>iterator?</code> form
- *  is mildly deprecated.
- *     
- *     def try
- *       if block_given?
- *         yield
- *       else
- *         "no block"
- *       end
- *     end
- *     try                  #=> "no block"
- *     try { "hello" }      #=> "hello"
- *     try do "hello" end   #=> "hello"
- */
-
-
-static VALUE
-rb_f_block_given_p()
-{
-    if (ruby_frame->prev && ruby_frame->prev->iter == ITER_CUR && ruby_block)
-	return Qtrue;
-    return Qfalse;
-}
-
-VALUE rb_eThreadError;
-
-NORETURN(static void proc_jump_error(int, VALUE));
-static void
-proc_jump_error(state, result)
-    int state;
-    VALUE result;
+rb_raise_jump(VALUE mesg)
 {
-    char mesg[32];
-    char *statement;
-
-    switch (state) {
-      case TAG_BREAK:
-	statement = "break"; break;
-      case TAG_RETURN:
-	statement = "return"; break;
-      case TAG_RETRY:
-	statement = "retry"; break;
-      default:
-	statement = "local-jump"; break; /* should not happen */
-    }
-    snprintf(mesg, sizeof mesg, "%s from proc-closure", statement);
-    localjump_error(mesg, result, state);
-}
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
+    VALUE klass = cfp->me->klass;
+    VALUE self = cfp->self;
+    ID mid = cfp->me->called_id;
 
-static void
-return_jump(retval)
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-    int yield = Qfalse;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	if (tt->tag == PROT_YIELD) {
-	    yield = Qtrue;
-	    tt = tt->prev;
-	}
-	if (tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) {
-	    tt->dst = (VALUE)ruby_frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_RETURN);
-	}
-	if (tt->tag == PROT_LAMBDA && !yield) {
-	    tt->dst = (VALUE)tt->frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_RETURN);
-	}
-	if (tt->tag == PROT_THREAD) {
-	    rb_raise(rb_eThreadError, "return can't jump across threads");
-	}
-	tt = tt->prev;
-    }
-    localjump_error("unexpected return", retval, TAG_RETURN);
-}
+    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
 
-static void
-break_jump(retval)
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	switch (tt->tag) {
-	  case PROT_THREAD:
-	  case PROT_YIELD:
-	  case PROT_LOOP:
-	  case PROT_LAMBDA:
-	    tt->dst = (VALUE)tt->frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_BREAK);
-	    break;
-	  case PROT_FUNC:
-	    tt = 0;
-	    continue;
-	  default:
-	    break;
-	}
-	tt = tt->prev;
-    }
-    localjump_error("unexpected break", retval, TAG_BREAK);
-}
+    setup_exception(th, TAG_RAISE, mesg);
 
-static void
-next_jump(retval)
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	switch (tt->tag) {
-	  case PROT_THREAD:
-	  case PROT_YIELD:
-	  case PROT_LOOP:
-	  case PROT_LAMBDA:
-	  case PROT_FUNC:
-	    tt->dst = (VALUE)tt->frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_NEXT);
-	    break;
-	  default:
-	    break;
-	}
-	tt = tt->prev;
-    }
-    localjump_error("unexpected next", retval, TAG_NEXT);
+    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass);
+    rb_thread_raised_clear(th);
+    JUMP_TAG(TAG_RAISE);
 }
 
 void
-rb_need_block()
+rb_jump_tag(int tag)
 {
-    if (!rb_block_given_p()) {
-	localjump_error("no block given", Qnil, 0);
-    }
+    JUMP_TAG(tag);
 }
 
-static VALUE
-rb_yield_0(val, self, klass, flags, avalue)
-    VALUE val, self, klass;	/* OK */
-    int flags, avalue;
+int
+rb_block_given_p(void)
 {
-    NODE *node;
-    volatile VALUE result = Qnil;
-    volatile VALUE old_cref;
-    volatile VALUE old_wrapper;
-    struct BLOCK * volatile block;
-    struct SCOPE * volatile old_scope;
-    int old_vmode;
-    struct FRAME frame;
-    NODE *cnode = ruby_current_node;
-    int lambda = flags & YIELD_LAMBDA_CALL;
-    int state;
-
-    rb_need_block();
-
-    PUSH_VARS();
-    block = ruby_block;
-    frame = block->frame;
-    frame.prev = ruby_frame;
-    frame.node = cnode;
-    ruby_frame = &(frame);
-    old_cref = (VALUE)ruby_cref;
-    ruby_cref = block->cref;
-    old_wrapper = ruby_wrapper;
-    ruby_wrapper = block->wrapper;
-    old_scope = ruby_scope;
-    ruby_scope = block->scope;
-    old_vmode = scope_vmode;
-    scope_vmode = (flags & YIELD_PUBLIC_DEF) ? SCOPE_PUBLIC : block->vmode;
-    ruby_block = block->prev;
-    if (block->flags & BLOCK_D_SCOPE) {
-	/* put place holder for dynamic (in-block) local variables */
-	ruby_dyna_vars = new_dvar(0, 0, block->dyna_vars);
-    }
-    else {
-	/* FOR does not introduce new scope */
-	ruby_dyna_vars = block->dyna_vars;
-    }
-    PUSH_CLASS(klass ? klass : block->klass);
-    if (!klass) {
-	self = block->self;
-    }
-    node = block->body;
-
-    if (block->var) {
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    if (block->var == (NODE*)1) { /* no parameter || */
-		if (lambda && RARRAY(val)->len != 0) {
-		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
-			     RARRAY(val)->len);
-		}
-	    }
-	    else if (block->var == (NODE*)2) {
-		if (TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
-		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
-			     RARRAY(val)->len);
-		}
-	    }
-	    else if (nd_type(block->var) == NODE_MASGN) {
-		if (!avalue) {
-		    val = svalue_to_mrhs(val, block->var->nd_head);
-		}
-		massign(self, block->var, val, lambda);
-	    }
-	    else {
-		int len = 0;
-		if (avalue) {
-		    len = RARRAY(val)->len;
-		    if (len == 0) {
-			goto zero_arg;
-		    }
-		    if (len == 1) {
-			val = RARRAY(val)->ptr[0];
-		    }
-		    else {
-			goto multi_values;
-		    }
-		}
-		else if (val == Qundef) {
-		  zero_arg:
-		    val = Qnil;
-		  multi_values:
-		    {
-			ruby_current_node = block->var;
-			rb_warn("multiple values for a block parameter (%d for 1)\n\tfrom %s:%d",
-				len, cnode->nd_file, nd_line(cnode));
-			ruby_current_node = cnode;
-		    }
-		}
-		assign(self, block->var, val, lambda);
-	    }
-	}
-	POP_TAG();
-	if (state) goto pop_state;
-    }
-    if (!node) {
-	state = 0;
-	goto pop_state;
-    }
-    ruby_current_node = node;
+    rb_thread_t *th = GET_THREAD();
 
-    PUSH_ITER(block->iter);
-    PUSH_TAG(lambda ? PROT_NONE : PROT_YIELD);
-    if ((state = EXEC_TAG()) == 0) {
-      redo:
-	if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
-	    if (node->nd_state == YIELD_FUNC_AVALUE) {
-		if (!avalue) {
-		    val = svalue_to_avalue(val);
-		}
-	    }
-	    else {
-		if (avalue) {
-		    val = avalue_to_svalue(val);
-		}
-		if (val == Qundef && node->nd_state != YIELD_FUNC_SVALUE)
-		    val = Qnil;
-	    }
-	    result = (*node->nd_cfnc)(val, node->nd_tval, self);
-	}
-	else {
-	    result = rb_eval(self, node);
-	}
+    if ((th->cfp->lfp[0] & 0x02) == 0 &&
+	GC_GUARDED_PTR_REF(th->cfp->lfp[0])) {
+	return TRUE;
     }
     else {
-	switch (state) {
-	  case TAG_REDO:
-	    state = 0;
-	    CHECK_INTS;
-	    goto redo;
-	  case TAG_NEXT:
-	    if (!lambda) {
-		state = 0;
-		result = prot_tag->retval;
-	    }
-	    break;
-	  case TAG_BREAK:
-	    if (TAG_DST()) {
-		result = prot_tag->retval;
-	    }
-	    else {
-		lambda = Qtrue;	/* just pass TAG_BREAK */
-	    }
-	    break;
-	  default:
-	    break;
-	}
-    }
-    POP_TAG();
-    POP_ITER();
-  pop_state:
-    POP_CLASS();
-    if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
-	!FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) {
-	struct RVarmap *vars = ruby_dyna_vars;
-
-	if (ruby_dyna_vars->id == 0) {
-	    vars = ruby_dyna_vars->next;
-	    rb_gc_force_recycle((VALUE)ruby_dyna_vars);
-	    while (vars && vars->id != 0 && vars != block->dyna_vars) {
-		struct RVarmap *tmp = vars->next;
-		rb_gc_force_recycle((VALUE)vars);
-		vars = tmp;
-	    }
-	}
-    }
-    POP_VARS();
-    ruby_block = block;
-    ruby_frame = ruby_frame->prev;
-    ruby_cref = (NODE*)old_cref;
-    ruby_wrapper = old_wrapper;
-    if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
-	scope_dup(old_scope);
-    ruby_scope = old_scope;
-    scope_vmode = old_vmode;
-    switch (state) {
-      case 0:
-	break;
-      case TAG_BREAK:
-	if (!lambda) {
-	    struct tag *tt = prot_tag;
-
-	    while (tt) {
-		if (tt->tag == PROT_LOOP && tt->blkid == ruby_block->uniq) {
-		    tt->dst = (VALUE)tt->frame->uniq;
-		    tt->retval = result;
-		    JUMP_TAG(TAG_BREAK);
-		}
-		tt = tt->prev;
-	    }
-	    proc_jump_error(TAG_BREAK, result);
-	}
-	/* fall through */
-      default:
-	JUMP_TAG(state);
-	break;
-    }
-    ruby_current_node = cnode;
-    return result;
-}
-
-VALUE
-rb_yield(val)
-    VALUE val;
-{
-    return rb_yield_0(val, 0, 0, 0, Qfalse);
-}
-
-VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_yield_values(int n, ...)
-#else
-rb_yield_values(n, va_alist)
-    int n;
-    va_dcl
-#endif
-{
-    va_list args;
-    VALUE ary;
-
-    if (n == 0) {
-	return rb_yield_0(Qundef, 0, 0, 0, Qfalse);
-    }
-    ary = rb_ary_new2(n);
-    va_init_list(args, n);
-    while (n--) {
-	rb_ary_push(ary, va_arg(args, VALUE));
-    }
-    va_end(args);
-    return rb_yield_0(ary, 0, 0, 0, Qtrue);
-}
-
-VALUE
-rb_yield_splat(values)
-    VALUE values;
-{
-    int avalue = Qfalse;
-
-    if (TYPE(values) == T_ARRAY) {
-	if (RARRAY(values)->len == 0) {
-	    values = Qundef;
-	}
-	else {
-	    avalue = Qtrue;
-	}
+	return FALSE;
     }
-    return rb_yield_0(values, 0, 0, 0, avalue);
 }
 
-/*
- *  call-seq:
- *     loop {|| block } 
- *  
- *  Repeatedly executes the block.
- *     
- *     loop do
- *       print "Input: "
- *       line = gets
- *       break if !line or line =~ /^qQ/
- *       # ...
- *     end
- */
-
-static VALUE
-rb_f_loop()
-{
-    for (;;) {
-	rb_yield_0(Qundef, 0, 0, 0, Qfalse);
-	CHECK_INTS;
-    }
-    return Qnil;		/* dummy */
-}
-
-static VALUE
-massign(self, node, val, pcall)
-    VALUE self;
-    NODE *node;
-    VALUE val;
-    int pcall;
-{
-    NODE *list;
-    long i = 0, len;
-
-    len = RARRAY(val)->len;
-    list = node->nd_head;
-    for (; list && i<len; i++) {
-	assign(self, list->nd_head, RARRAY(val)->ptr[i], pcall);
-	list = list->nd_next;
-    }
-    if (pcall && list) goto arg_error;
-    if (node->nd_args) {
-	if ((long)(node->nd_args) == -1) {
-	    /* no check for mere `*' */
-	}
-	else if (!list && i<len) {
-	    assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), pcall);
-	}
-	else {
-	    assign(self, node->nd_args, rb_ary_new2(0), pcall);
-	}
-    }
-    else if (pcall && i < len) {
-	goto arg_error;
-    }
-
-    while (list) {
-	i++;
-	assign(self, list->nd_head, Qnil, pcall);
-	list = list->nd_next;
-    }
-    return val;
-
-  arg_error:
-    while (list) {
-	i++;
-	list = list->nd_next;
-    }
-    rb_raise(rb_eArgError, "wrong number of arguments (%ld for %ld)", len, i);
-}
-
-static void
-assign(self, lhs, val, pcall)
-    VALUE self;
-    NODE *lhs;
-    VALUE val;
-    int pcall;
+int
+rb_iterator_p(void)
 {
-    ruby_current_node = lhs;
-    if (val == Qundef) {
-	rb_warning("assigning void value");
-	val = Qnil;
-    }
-    switch (nd_type(lhs)) {
-      case NODE_GASGN:
-	rb_gvar_set(lhs->nd_entry, val);
-	break;
-
-      case NODE_IASGN:
-	rb_ivar_set(self, lhs->nd_vid, val);
-	break;
-
-      case NODE_LASGN:
-	if (ruby_scope->local_vars == 0)
-	    rb_bug("unexpected local variable assignment");
-	ruby_scope->local_vars[lhs->nd_cnt] = val;
-	break;
-
-      case NODE_DASGN:
-	dvar_asgn(lhs->nd_vid, val);
-	break;
-
-      case NODE_DASGN_CURR:
-	dvar_asgn_curr(lhs->nd_vid, val);
-	break;
-
-      case NODE_CDECL:
-	if (lhs->nd_vid == 0) {
-	    rb_const_set(class_prefix(self, lhs->nd_else), lhs->nd_else->nd_mid, val);
-	}
-	else {
-	    rb_const_set(ruby_cbase, lhs->nd_vid, val);
-	}
-	break;
-
-      case NODE_CVDECL:
-	if (RTEST(ruby_verbose) && FL_TEST(ruby_cbase, FL_SINGLETON)) {
-	    rb_warn("declaring singleton class variable");
-	}
-	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qtrue);
-	break;
-
-      case NODE_CVASGN:
-	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qfalse);
-	break;
-
-      case NODE_MASGN:
-	massign(self, lhs, svalue_to_mrhs(val, lhs->nd_head), pcall);
-	break;
-
-      case NODE_CALL:
-      case NODE_ATTRASGN:
-	{
-	    VALUE recv;
-	    int scope;
-	    if (lhs->nd_recv == (NODE *)1) {
-		recv = self;
-		scope = 1;
-	    }
-	    else {
-		recv = rb_eval(self, lhs->nd_recv);
-		scope = 0;
-	    }
-	    if (!lhs->nd_args) {
-		/* attr set */
-		ruby_current_node = lhs;
-		SET_CURRENT_SOURCE();
-		rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope, self);
-	    }
-	    else {
-		/* array set */
-		VALUE args;
-
-		args = rb_eval(self, lhs->nd_args);
-		rb_ary_push(args, val);
-		ruby_current_node = lhs;
-		SET_CURRENT_SOURCE();
-		rb_call(CLASS_OF(recv), recv, lhs->nd_mid,
-			RARRAY(args)->len, RARRAY(args)->ptr, scope, self);
-	    }
-	}
-	break;
-
-      default:
-	rb_bug("bug in variable assignment");
-	break;
-    }
+    return rb_block_given_p();
 }
 
-VALUE
-rb_iterate(it_proc, data1, bl_proc, data2)
-    VALUE (*it_proc) _((VALUE)), (*bl_proc)(ANYARGS);
-    VALUE data1, data2;
-{
-    int state;
-    volatile VALUE retval = Qnil;
-    NODE *node = NEW_IFUNC(bl_proc, data2);
-    VALUE self = ruby_top_self;
-
-    PUSH_TAG(PROT_LOOP);
-    PUSH_BLOCK(0, node);
-    PUSH_ITER(ITER_PRE);
-    state = EXEC_TAG();
-    if (state == 0) {
-  iter_retry:
-	retval = (*it_proc)(data1);
-    }
-    else if (state == TAG_BREAK && TAG_DST()) {
-	retval = prot_tag->retval;
-	state = 0;
-    }
-    else if (state == TAG_RETRY) {
-	state = 0;
-	goto iter_retry;
-    }
-    POP_ITER();
-    POP_BLOCK();
-    POP_TAG();
-
-    switch (state) {
-      case 0:
-	break;
-      default:
-	JUMP_TAG(state);
-    }
-    return retval;
-}
+VALUE rb_eThreadError;
 
-static int
-handle_rescue(self, node)
-    VALUE self;
-    NODE *node;
+void
+rb_need_block(void)
 {
-    int argc; VALUE *argv; /* used in SETUP_ARGS */
-    TMP_PROTECT;
-
-    if (!node->nd_args) {
-	return rb_obj_is_kind_of(ruby_errinfo, rb_eStandardError);
-    }
-
-    BEGIN_CALLARGS;
-    SETUP_ARGS(node->nd_args);
-    END_CALLARGS;
-
-    while (argc--) {
-	if (!rb_obj_is_kind_of(argv[0], rb_cModule)) {
-	    rb_raise(rb_eTypeError, "class or module required for rescue clause");
-	}
-	if (RTEST(rb_funcall(*argv, eqq, 1, ruby_errinfo))) return 1;
-	argv++;
+    if (!rb_block_given_p()) {
+	rb_vm_localjump_error("no block given", Qnil, 0);
     }
-    return 0;
 }
 
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2, ...)
-#else
-rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
-    VALUE (*b_proc)(ANYARGS), (*r_proc)(ANYARGS);
-    VALUE data1, data2;
-    va_dcl
-#endif
+rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
+	   VALUE (* r_proc) (ANYARGS), VALUE data2, ...)
 {
     int state;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
     volatile VALUE result;
-    volatile VALUE e_info = ruby_errinfo;
-    volatile int handle = Qfalse;
-    VALUE eclass;
+    volatile VALUE e_info = th->errinfo;
     va_list args;
 
-    PUSH_TAG(PROT_NONE);
-    switch (state = EXEC_TAG()) {
-      case TAG_RETRY:
-	if (!handle) break;
-	handle = Qfalse;
-	state = 0;
-	ruby_errinfo = Qnil;
-      case 0:
-	result = (*b_proc)(data1);
-	break;
-      case TAG_RAISE:
-	if (handle) break;
-	handle = Qfalse;
-	va_init_list(args, data2);
-	while (eclass = va_arg(args, VALUE)) {
-	    if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
-		handle = Qtrue;
-		break;
-	    }
-	}
-	va_end(args);
-
-	if (handle) {
-	    state = 0;
-	    if (r_proc) {
-		result = (*r_proc)(data2, ruby_errinfo);
-	    }
-	    else {
-		result = Qnil;
-	    }
-	    ruby_errinfo = e_info;
-	}
-    }
-    POP_TAG();
-    if (state) JUMP_TAG(state);
-
-    return result;
-}
-
-VALUE
-rb_rescue(b_proc, data1, r_proc, data2)
-    VALUE (*b_proc)(), (*r_proc)();
-    VALUE data1, data2;
-{
-    return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
-}
-
-static VALUE cont_protect;
-
-VALUE
-rb_protect(proc, data, state)
-    VALUE (*proc) _((VALUE));
-    VALUE data;
-    int *state;
-{
-    VALUE result = Qnil;	/* OK */
-    int status;
-
-    PUSH_TAG(PROT_NONE);
-    cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0);
-    if ((status = EXEC_TAG()) == 0) {
-	result = (*proc)(data);
-    }
-    cont_protect = ((NODE *)cont_protect)->u1.value;
-    POP_TAG();
-    if (state) {
-	*state = status;
-    }
-    if (status != 0) {
-	return Qnil;
-    }
-
-    return result;
-}
-
-VALUE
-rb_ensure(b_proc, data1, e_proc, data2)
-    VALUE (*b_proc)();
-    VALUE data1;
-    VALUE (*e_proc)();
-    VALUE data2;
-{
-    int state;
-    volatile VALUE result = Qnil;
-    VALUE retval;
-
-    PUSH_TAG(PROT_NONE);
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
-	result = (*b_proc)(data1);
-    }
-    POP_TAG();
-    retval = prot_tag ? prot_tag->retval : Qnil;	/* save retval */
-    if (!thread_no_ensure()) {
-    (*e_proc)(data2);
-    }
-    if (prot_tag) return_value(retval);
-    if (state) JUMP_TAG(state);
-    return result;
-}
-
-VALUE
-rb_with_disable_interrupt(proc, data)
-    VALUE (*proc)();
-    VALUE data;
-{
-    VALUE result = Qnil;	/* OK */
-    int status;
-
-    DEFER_INTS;
-    {
-	int thr_critical = rb_thread_critical;
-
-	rb_thread_critical = Qtrue;
-	PUSH_TAG(PROT_NONE);
-	if ((status = EXEC_TAG()) == 0) {
-	    result = (*proc)(data);
-	}
-	POP_TAG();
-	rb_thread_critical = thr_critical;
-    }
-    ENABLE_INTS;
-    if (status) JUMP_TAG(status);
-
-    return result;
-}
-
-static void
-stack_check()
-{
-    static int overflowing = 0;
-
-    if (!overflowing && ruby_stack_check()) {
-	int state;
-	overflowing = 1;
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    rb_exc_raise(sysstack_error);
-	}
-	POP_TAG();
-	overflowing = 0;
-	JUMP_TAG(state);
-    }
-}
-
-static int last_call_status;
-
-#define CSTAT_PRIV  1
-#define CSTAT_PROT  2
-#define CSTAT_VCALL 4
-#define CSTAT_SUPER 8
-
-/*
- *  call-seq:
- *     obj.method_missing(symbol [, *args] )   => result
- *  
- *  Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
- *  <i>symbol</i> is the symbol for the method called, and <i>args</i>
- *  are any arguments that were passed to it. By default, the interpreter
- *  raises an error when this method is called. However, it is possible
- *  to override the method to provide more dynamic behavior.
- *  The example below creates
- *  a class <code>Roman</code>, which responds to methods with names
- *  consisting of roman numerals, returning the corresponding integer
- *  values.
- *     
- *     class Roman
- *       def romanToInt(str)
- *         # ...
- *       end
- *       def method_missing(methId)
- *         str = methId.id2name
- *         romanToInt(str)
- *       end
- *     end
- *     
- *     r = Roman.new
- *     r.iv      #=> 4
- *     r.xxiii   #=> 23
- *     r.mm      #=> 2000
- */
-
-static VALUE
-rb_method_missing(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    ID id;
-    VALUE exc = rb_eNoMethodError;
-    char *format = 0;
-    NODE *cnode = ruby_current_node;
-
-    if (argc == 0 || !SYMBOL_P(argv[0])) {
-	rb_raise(rb_eArgError, "no id given");
-    }
-
-    stack_check();
-
-    id = SYM2ID(argv[0]);
-
-    if (last_call_status & CSTAT_PRIV) {
-	format = "private method `%s' called for %s";
-    }
-    else if (last_call_status & CSTAT_PROT) {
-	format = "protected method `%s' called for %s";
-    }
-    else if (last_call_status & CSTAT_VCALL) {
-	format = "undefined local variable or method `%s' for %s";
-	exc = rb_eNameError;
-    }
-    else if (last_call_status & CSTAT_SUPER) {
-	format = "super: no superclass method `%s'";
-    }
-    if (!format) {
-	format = "undefined method `%s' for %s";
-    }
-
-    ruby_current_node = cnode;
-    {
-	int n = 0;
-	VALUE args[3];
-
-	args[n++] = rb_funcall(rb_const_get(exc, rb_intern("message")), '!',
-			       3, rb_str_new2(format), obj, argv[0]);
-	args[n++] = argv[0];
-	if (exc == rb_eNoMethodError) {
-	    args[n++] = rb_ary_new4(argc-1, argv+1);
-	}
-	exc = rb_class_new_instance(n, args, exc);
-	ruby_frame = ruby_frame->prev; /* pop frame for "method_missing" */
-	rb_exc_raise(exc);
-    }
-
-    return Qnil;		/* not reached */
-}
-
-static VALUE
-method_missing(obj, id, argc, argv, call_status)
-    VALUE obj;
-    ID    id;
-    int   argc;
-    const VALUE *argv;
-    int   call_status;
-{
-    VALUE *nargv;
-
-    last_call_status = call_status;
-
-    if (id == missing) {
-	PUSH_FRAME();
-	rb_method_missing(argc, argv, obj);
-	POP_FRAME();
-    }
-    else if (id == ID_ALLOCATOR) {
-	rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj));
-    }
-    if (argc < 0) {
-	VALUE tmp;
-
-	argc = -argc-1;
-	tmp = splat_value(argv[argc]);
-	nargv = ALLOCA_N(VALUE, argc + RARRAY(tmp)->len + 1);
-	MEMCPY(nargv+1, argv, VALUE, argc);
-	MEMCPY(nargv+1+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
-	argc += RARRAY(tmp)->len;
+      retry_entry:
+	result = (*b_proc) (data1);
     }
     else {
-	nargv = ALLOCA_N(VALUE, argc+1);
-	MEMCPY(nargv+1, argv, VALUE, argc);
-    }
-    nargv[0] = ID2SYM(id);
-    return rb_funcall2(obj, missing, argc+1, nargv);
-}
-
-static inline VALUE
-call_cfunc(func, recv, len, argc, argv)
-    VALUE (*func)();
-    VALUE recv;
-    int len, argc;
-    VALUE *argv;
-{
-    if (len >= 0 && argc != len) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
-		 argc, len);
-    }
-
-    switch (len) {
-      case -2:
-	return (*func)(recv, rb_ary_new4(argc, argv));
-	break;
-      case -1:
-	return (*func)(argc, argv, recv);
-	break;
-      case 0:
-	return (*func)(recv);
-	break;
-      case 1:
-	return (*func)(recv, argv[0]);
-	break;
-      case 2:
-	return (*func)(recv, argv[0], argv[1]);
-	break;
-      case 3:
-	return (*func)(recv, argv[0], argv[1], argv[2]);
-	break;
-      case 4:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3]);
-	break;
-      case 5:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4]);
-	break;
-      case 6:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5]);
-	break;
-      case 7:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6]);
-	break;
-      case 8:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7]);
-	break;
-      case 9:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7], argv[8]);
-	break;
-      case 10:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7], argv[8], argv[9]);
-	break;
-      case 11:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
-	break;
-      case 12:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7], argv[8], argv[9],
-		       argv[10], argv[11]);
-	break;
-      case 13:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-		       argv[11], argv[12]);
-	break;
-      case 14:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-		       argv[11], argv[12], argv[13]);
-	break;
-      case 15:
-	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
-		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-		       argv[11], argv[12], argv[13], argv[14]);
-	break;
-      default:
-	rb_raise(rb_eArgError, "too many arguments (%d)", len);
-	break;
-    }
-    return Qnil;		/* not reached */
-}
+	th->cfp = cfp; /* restore */
 
-static VALUE
-rb_call0(klass, recv, id, oid, argc, argv, body, flags)
-    VALUE klass, recv;
-    ID    id;
-    ID    oid;
-    int argc;			/* OK */
-    VALUE *argv;		/* OK */
-    NODE * volatile body;
-    int flags;
-{
-    NODE *b2;		/* OK */
-    volatile VALUE result = Qnil;
-    int itr;
-    static int tick;
-    TMP_PROTECT;
-    volatile int safe = -1;
-
-    if (NOEX_SAFE(flags) > ruby_safe_level &&
-	ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
-	rb_raise(rb_eSecurityError, "calling insecure method: %s",
-		 rb_id2name(id));
-    }
-    switch (ruby_iter->iter) {
-      case ITER_PRE:
-      case ITER_PAS:
-	itr = ITER_CUR;
-	break;
-      case ITER_CUR:
-      default:
-	itr = ITER_NOT;
-	break;
-    }
+	if (state == TAG_RAISE) {
+	    int handle = FALSE;
+	    VALUE eclass;
 
-    if ((++tick & 0xff) == 0) {
-	CHECK_INTS;		/* better than nothing */
-	stack_check();
-	rb_gc_finalize_deferred();
-    }
-    if (argc < 0) {
-	VALUE tmp;
-	VALUE *nargv;
-
-	argc = -argc-1;
-	tmp = splat_value(argv[argc]);
-	nargv = TMP_ALLOC(argc + RARRAY(tmp)->len);
-	MEMCPY(nargv, argv, VALUE, argc);
-	MEMCPY(nargv+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
-	argc += RARRAY(tmp)->len;
-	argv = nargv;
-    }
-    PUSH_ITER(itr);
-    PUSH_FRAME();
-
-    ruby_frame->last_func = id;
-    ruby_frame->orig_func = oid;
-    ruby_frame->last_class = (flags & NOEX_NOSUPER)?0:klass;
-    ruby_frame->self = recv;
-    ruby_frame->argc = argc;
-    ruby_frame->flags = 0;
-
-    switch (nd_type(body)) {
-      case NODE_CFUNC:
-	{
-	    int len = body->nd_argc;
-
-	    if (len < -2) {
-		rb_bug("bad argc (%d) specified for `%s(%s)'",
-		       len, rb_class2name(klass), rb_id2name(id));
-	    }
-	    if (event_hooks) {
-		int state;
-
-		EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node,
-				recv, id, klass);
-		PUSH_TAG(PROT_FUNC);
-		if ((state = EXEC_TAG()) == 0) {
-		    result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
+	    va_init_list(args, data2);
+	    while ((eclass = va_arg(args, VALUE)) != 0) {
+		if (rb_obj_is_kind_of(th->errinfo, eclass)) {
+		    handle = TRUE;
+		    break;
 		}
-		POP_TAG();
-		ruby_current_node = ruby_frame->node;
-		EXEC_EVENT_HOOK(RUBY_EVENT_C_RETURN, ruby_current_node,
-				recv, id, klass);
-		if (state) JUMP_TAG(state);
-	    }
-	    else {
-		result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
 	    }
-	}
-	break;
-
-	/* for attr get/set */
-      case NODE_IVAR:
-	if (argc != 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
-	}
-	result = rb_attr_get(recv, body->nd_vid);
-	break;
-
-      case NODE_ATTRSET:
-	if (argc != 1)
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
-	result = rb_ivar_set(recv, body->nd_vid, argv[0]);
-	break;
-
-      case NODE_ZSUPER:
-	result = rb_call_super(argc, argv);
-	break;
-
-      case NODE_DMETHOD:
-	result = method_call(argc, argv, umethod_bind(body->nd_cval, recv));
-	break;
+	    va_end(args);
 
-      case NODE_BMETHOD:
-	ruby_frame->flags |= FRAME_DMETH;
-	if (event_hooks) {
-	    struct BLOCK *data;
-	    Data_Get_Struct(body->nd_cval, struct BLOCK, data);
-	    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, data->body, recv, id, klass);
-	}
-	result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass);
-	if (event_hooks) {
-	    EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
-	}
-	break;
-
-      case NODE_SCOPE:
-	{
-	    int state;
-	    VALUE *local_vars;	/* OK */
-	    NODE *saved_cref = 0;
-
-	    PUSH_SCOPE();
-	    if (body->nd_rval) {
-		saved_cref = ruby_cref;
-		ruby_cref = (NODE*)body->nd_rval;
-	    }
-	    PUSH_CLASS(ruby_cbase);
-	    if (body->nd_tbl) {
-		local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
-		*local_vars++ = (VALUE)body;
-		rb_mem_clear(local_vars, body->nd_tbl[0]);
-		ruby_scope->local_tbl = body->nd_tbl;
-		ruby_scope->local_vars = local_vars;
-	    }
-	    else {
-		local_vars = ruby_scope->local_vars = 0;
-		ruby_scope->local_tbl  = 0;
-	    }
-	    b2 = body = body->nd_next;
-
-	    if (NOEX_SAFE(flags) > ruby_safe_level) {
-		safe = ruby_safe_level;
-		ruby_safe_level = NOEX_SAFE(flags);
-	    }
-	    PUSH_VARS();
-	    PUSH_TAG(PROT_FUNC);
-	    if ((state = EXEC_TAG()) == 0) {
-		NODE *node = 0;
-		int i, nopt = 0;
-
-		if (nd_type(body) == NODE_ARGS) {
-		    node = body;
-		    body = 0;
-		}
-		else if (nd_type(body) == NODE_BLOCK) {
-		    node = body->nd_head;
-		    body = body->nd_next;
-		}
-		if (node) {
-		    if (nd_type(node) != NODE_ARGS) {
-			rb_bug("no argument-node");
-		    }
-
-		    i = node->nd_cnt;
-		    if (i > argc) {
-			rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
-				 argc, i);
-		    }
-		    if (!node->nd_rest) {
-			NODE *optnode = node->nd_opt;
-
-			nopt = i;
-			while (optnode) {
-			    nopt++;
-			    optnode = optnode->nd_next;
-			}
-			if (nopt < argc) {
-			    rb_raise(rb_eArgError,
-				     "wrong number of arguments (%d for %d)",
-				     argc, nopt);
-			}
-		    }
-		    if (local_vars) {
-			if (i > 0) {
-			    /* +2 for $_ and $~ */
-			    MEMCPY(local_vars+2, argv, VALUE, i);
-			}
+	    if (handle) {
+		if (r_proc) {
+		    PUSH_TAG();
+		    if ((state = EXEC_TAG()) == 0) {
+			result = (*r_proc) (data2, th->errinfo);
 		    }
-		    argv += i; argc -= i;
-		    if (node->nd_opt) {
-			NODE *opt = node->nd_opt;
-
-			while (opt && argc) {
-			    assign(recv, opt->nd_head, *argv, 1);
-			    argv++; argc--;
-			    ++i;
-			    opt = opt->nd_next;
-			}
-			if (opt) {
-			    rb_eval(recv, opt);
-			    while (opt) {
-				opt = opt->nd_next;
-				++i;
-			    }
-			}
-		    }
-		    if (!node->nd_rest) {
-			i = nopt;
-		    }
-		    else {
-			VALUE v;
-			
-			if (argc > 0) {
-			    v = rb_ary_new4(argc,argv);
-			    i = -i - 1;
-			}
-			else {
-			    v = rb_ary_new2(0);
-			}
-			assign(recv, node->nd_rest, v, 1);
+		    POP_TAG();
+		    if (state == TAG_RETRY) {
+			state = 0;
+			th->errinfo = Qnil;
+			goto retry_entry;
 		    }
-		    ruby_frame->argc = i;
 		}
-		if (event_hooks) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+		else {
+		    result = Qnil;
+		    state = 0;
+		}
+		if (state == 0) {
+		    th->errinfo = e_info;
 		}
-		result = rb_eval(recv, body);
-	    }
-	    else if (state == TAG_RETURN && TAG_DST()) {
-		result = prot_tag->retval;
-		state = 0;
-	    }
-	    POP_TAG();
-	    if (event_hooks) {
-		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
-	    }
-	    POP_VARS();
-	    POP_CLASS();
-	    POP_SCOPE();
-	    ruby_cref = saved_cref;
-	    if (safe >= 0) ruby_safe_level = safe;
-	    switch (state) {
-	      case 0:
-		break;
-
-	      case TAG_BREAK:
-	      case TAG_RETURN:
-		JUMP_TAG(state);
-		break;
-
-	      case TAG_RETRY:
-		if (rb_block_given_p()) JUMP_TAG(state);
-		/* fall through */
-	      default:
-		jump_tag_but_local_jump(state, result);
-		break;
-	    }
-	}
-	break;
-
-      default:
-	unknown_node(body);
-	break;
-    }
-    POP_FRAME();
-    POP_ITER();
-    return result;
-}
-
-static VALUE
-rb_call(klass, recv, mid, argc, argv, scope, self)
-    VALUE klass, recv;
-    ID    mid;
-    int argc;			/* OK */
-    const VALUE *argv;		/* OK */
-    int scope;
-    VALUE self;
-{
-    NODE  *body;		/* OK */
-    int    noex;
-    ID     id = mid;
-    struct cache_entry *ent;
-
-    if (!klass) {
-	rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%lx)",
-		 rb_id2name(mid), recv);
-    }
-    /* is it in the method cache? */
-    ent = cache + EXPR1(klass, mid);
-    if (ent->mid == mid && ent->klass == klass) {
-	if (!ent->method)
-	    return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
-	klass = ent->origin;
-	id    = ent->mid0;
-	noex  = ent->noex;
-	body  = ent->method;
-    }
-    else if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
-	if (scope == 3) {
-	    return method_missing(recv, mid, argc, argv, CSTAT_SUPER);
-	}
-	return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
-    }
-
-    if (mid != missing && scope == 0) {
-	/* receiver specified form for private method */
-	if (noex & NOEX_PRIVATE)
-	    return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
-
-	/* self must be kind of a specified form for protected method */
-	if (noex & NOEX_PROTECTED) {
-	    VALUE defined_class = klass;
-
-	    if (self == Qundef) self = ruby_frame->self;
-	    if (TYPE(defined_class) == T_ICLASS) {
-		defined_class = RBASIC(defined_class)->klass;
 	    }
-	    if (!rb_obj_is_kind_of(self, rb_class_real(defined_class)))
-		return method_missing(recv, mid, argc, argv, CSTAT_PROT);
-	}
-    }
-
-    return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
-}
-
-VALUE
-rb_apply(recv, mid, args)
-    VALUE recv;
-    ID mid;
-    VALUE args;
-{
-    int argc;
-    VALUE *argv;
-
-    argc = RARRAY(args)->len; /* Assigns LONG, but argc is INT */
-    argv = ALLOCA_N(VALUE, argc);
-    MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);
-    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
-}
-
-/*
- *  call-seq:
- *     obj.send(symbol [, args...])        => obj
- *     obj.__send__(symbol [, args...])    => obj
- *  
- *  Invokes the method identified by _symbol_, passing it any
- *  arguments specified. You can use <code>\_\_send__</code> if the name
- *  +send+ clashes with an existing method in _obj_.
- *     
- *     class Klass
- *       def hello(*args)
- *         "Hello " + args.join(' ')
- *       end
- *     end
- *     k = Klass.new
- *     k.send :hello, "gentle", "readers"   #=> "Hello gentle readers"
- */
-
-static VALUE
-rb_f_send(argc, argv, recv)
-    int argc;
-    VALUE *argv;
-    VALUE recv;
-{
-    VALUE vid;
-
-    if (argc == 0) rb_raise(rb_eArgError, "no method name given");
-
-    vid = *argv++; argc--;
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
-    vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1, Qundef);
-    POP_ITER();
-
-    return vid;
-}
-
-static VALUE
-vafuncall(recv, mid, n, ar)
-    VALUE recv;
-    ID mid;
-    int n;
-    va_list *ar;
-{
-    VALUE *argv;
-
-    if (n > 0) {
-	long i;
-
-	argv = ALLOCA_N(VALUE, n);
-
-	for (i=0;i<n;i++) {
-	    argv[i] = va_arg(*ar, VALUE);
 	}
-	va_end(*ar);
-    }
-    else {
-	argv = 0;
     }
+    POP_TAG();
+    if (state)
+	JUMP_TAG(state);
 
-    return rb_call(CLASS_OF(recv), recv, mid, n, argv, 1, Qundef);
+    return result;
 }
 
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall(VALUE recv, ID mid, int n, ...)
-#else
-rb_funcall(recv, mid, n, va_alist)
-    VALUE recv;
-    ID mid;
-    int n;
-    va_dcl
-#endif
+rb_rescue(VALUE (* b_proc)(ANYARGS), VALUE data1,
+	  VALUE (* r_proc)(ANYARGS), VALUE data2)
 {
-    va_list ar;
-    va_init_list(ar, n);
-
-    return vafuncall(recv, mid, n, &ar);
+    return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError,
+		      (VALUE)0);
 }
 
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall_rescue(VALUE recv, ID mid, int n, ...)
-#else
-rb_funcall_rescue(recv, mid, n, va_alist)
-    VALUE recv;
-    ID mid;
-    int n;
-    va_dcl
-#endif
+rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
 {
-    VALUE result = Qnil;	/* OK */
+    volatile VALUE result = Qnil;
     int status;
-    va_list ar;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
+    struct rb_vm_protect_tag protect_tag;
+    rb_jmpbuf_t org_jmpbuf;
 
-    va_init_list(ar, n);
+    protect_tag.prev = th->protect_tag;
 
-    PUSH_TAG(PROT_NONE);
+    PUSH_TAG();
+    th->protect_tag = &protect_tag;
+    MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
     if ((status = EXEC_TAG()) == 0) {
-	result = vafuncall(recv, mid, n, &ar);
+	SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
     }
+    MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
+    th->protect_tag = protect_tag.prev;
     POP_TAG();
-    switch (status) {
-      case 0:
-	return result;
-      case TAG_RAISE:
-	return Qundef;
-      default:
-	JUMP_TAG(status);
-    }
-}
-
-VALUE
-rb_funcall2(recv, mid, argc, argv)
-    VALUE recv;
-    ID mid;
-    int argc;
-    const VALUE *argv;
-{
-    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
-}
-
-VALUE
-rb_funcall3(recv, mid, argc, argv)
-    VALUE recv;
-    ID mid;
-    int argc;
-    const VALUE *argv;
-{
-    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0, Qundef);
-}
-
-VALUE
-rb_call_super(argc, argv)
-    int argc;
-    const VALUE *argv;
-{
-    VALUE result, self, klass;
 
-    if (ruby_frame->last_class == 0) {
-	rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
-		      rb_id2name(ruby_frame->orig_func));
+    if (state) {
+	*state = status;
     }
-
-    self = ruby_frame->self;
-    klass = ruby_frame->last_class;
-    if (RCLASS(klass)->super == 0) {
-	return method_missing(self, ruby_frame->orig_func, argc, argv, CSTAT_SUPER);
+    if (status != 0) {
+	th->cfp = cfp;
+	return Qnil;
     }
 
-    PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
-    result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3, Qundef);
-    POP_ITER();
-
     return result;
 }
 
-static VALUE
-backtrace(lev)
-    int lev;
-{
-    struct FRAME *frame = ruby_frame;
-    char buf[BUFSIZ];
-    VALUE ary;
-    NODE *n;
-
-    ary = rb_ary_new();
-    if (frame->last_func == ID_ALLOCATOR) {
-	frame = frame->prev;
-    }
-    if (lev < 0) {
-	ruby_set_current_source();
-	if (frame->last_func) {
-	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
-		     ruby_sourcefile, ruby_sourceline,
-		     rb_id2name(frame->last_func));
-	}
-	else if (ruby_sourceline == 0) {
-	    snprintf(buf, BUFSIZ, "%s", ruby_sourcefile);
-	}
-	else {
-	    snprintf(buf, BUFSIZ, "%s:%d", ruby_sourcefile, ruby_sourceline);
-	}
-	rb_ary_push(ary, rb_str_new2(buf));
-	if (lev < -1) return ary;
-    }
-    else {
-	while (lev-- > 0) {
-	    frame = frame->prev;
-	    if (!frame) {
-		ary = Qnil;
-		break;
-	    }
-	}
-    }
-    for (; frame && (n = frame->node); frame = frame->prev) {
-	if (frame->prev && frame->prev->last_func) {
-	    if (frame->prev->node == n) {
-		if (frame->prev->last_func == frame->last_func) continue;
-	    }
-	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
-		     n->nd_file, nd_line(n),
-		     rb_id2name(frame->prev->last_func));
-	}
-	else {
-	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
-	}
-	rb_ary_push(ary, rb_str_new2(buf));
-    }
-
-    return ary;
-}
-
-/*
- *  call-seq:
- *     caller(start=1)    => array
- *  
- *  Returns the current execution stack---an array containing strings in
- *  the form ``<em>file:line</em>'' or ``<em>file:line: in
- *  `method'</em>''. The optional _start_ parameter
- *  determines the number of initial stack entries to omit from the
- *  result.
- *     
- *     def a(skip)
- *       caller(skip)
- *     end
- *     def b(skip)
- *       a(skip)
- *     end
- *     def c(skip)
- *       b(skip)
- *     end
- *     c(0)   #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
- *     c(1)   #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
- *     c(2)   #=> ["prog:8:in `c'", "prog:12"]
- *     c(3)   #=> ["prog:13"]
- */
-
-static VALUE
-rb_f_caller(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE level;
-    int lev;
-
-    rb_scan_args(argc, argv, "01", &level);
-
-    if (NIL_P(level)) lev = 1;
-    else lev = NUM2INT(level);
-    if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
-
-    return backtrace(lev);
-}
-
-void
-rb_backtrace()
-{
-    long i;
-    VALUE ary;
-
-    ary = backtrace(-1);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	printf("\tfrom %s\n", RSTRING(RARRAY(ary)->ptr[i])->ptr);
-    }
-}
-
-static VALUE
-make_backtrace()
-{
-    return backtrace(-1);
-}
-
-ID
-rb_frame_last_func()
-{
-    return ruby_frame->last_func;
-}
-
-static NODE*
-compile(src, file, line)
-    VALUE src;
-    char *file;
-    int line;
-{
-    NODE *node;
-    int critical;
-
-    ruby_nerrs = 0;
-    StringValue(src);
-    critical = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-    node = rb_compile_string(file, src, line);
-    rb_thread_critical = critical;
-
-    if (ruby_nerrs == 0) return node;
-    return 0;
-}
-
-static VALUE
-eval(self, src, scope, file, line)
-    VALUE self, src, scope;
-    char *file;
-    int line;
+VALUE
+rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE data2)
 {
-    struct BLOCK *data = NULL;
-    volatile VALUE result = Qnil;
-    struct SCOPE * volatile old_scope;
-    struct BLOCK * volatile old_block;
-    struct RVarmap * volatile old_dyna_vars;
-    VALUE volatile old_cref;
-    int volatile old_vmode;
-    volatile VALUE old_wrapper;
-    struct FRAME frame;
-    NODE *nodesave = ruby_current_node;
-    volatile int iter = ruby_frame->iter;
-    volatile int safe = ruby_safe_level;
     int state;
+    volatile VALUE result = Qnil;
 
-    if (!NIL_P(scope)) {
-	if (!rb_obj_is_proc(scope)) {
-	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Binding)",
-		     rb_obj_classname(scope));
-	}
-
-	Data_Get_Struct(scope, struct BLOCK, data);
-	/* PUSH BLOCK from data */
-	frame = data->frame;
-	frame.tmp = ruby_frame;	/* gc protection */
-	ruby_frame = &(frame);
-	old_scope = ruby_scope;
-	ruby_scope = data->scope;
-	old_block = ruby_block;
-	ruby_block = data->prev;
-	old_dyna_vars = ruby_dyna_vars;
-	ruby_dyna_vars = data->dyna_vars;
-	old_vmode = scope_vmode;
-	scope_vmode = data->vmode;
-	old_cref = (VALUE)ruby_cref;
-	ruby_cref = data->cref;
-	old_wrapper = ruby_wrapper;
-	ruby_wrapper = data->wrapper;
-	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
-	    file = data->frame.node->nd_file;
-	    if (!file) file = "__builtin__";
-	    line = nd_line(data->frame.node);
-	}
-
-	self = data->self;
-	ruby_frame->iter = data->iter;
-    }
-    else {
-	if (ruby_frame->prev) {
-	    ruby_frame->iter = ruby_frame->prev->iter;
-	}
-    }
-    if (file == 0) {
-	ruby_set_current_source();
-	file = ruby_sourcefile;
-	line = ruby_sourceline;
-    }
-    PUSH_CLASS(data ? data->klass : ruby_class);
-    ruby_in_eval++;
-    if (TYPE(ruby_class) == T_ICLASS) {
-	ruby_class = RBASIC(ruby_class)->klass;
-    }
-    PUSH_TAG(PROT_NONE);
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
-	NODE *node;
-
-	ruby_safe_level = 0;
-	result = ruby_errinfo;
-	ruby_errinfo = Qnil;
-	node = compile(src, file, line);
-	ruby_safe_level = safe;
-	if (ruby_nerrs > 0) {
-	    compile_error(0);
-	}
-	if (!NIL_P(result)) ruby_errinfo = result;
-	result = eval_node(self, node);
+	result = (*b_proc) (data1);
     }
     POP_TAG();
-    POP_CLASS();
-    ruby_in_eval--;
-    if (!NIL_P(scope)) {
-	int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
-
-	ruby_wrapper = old_wrapper;
-	ruby_cref  = (NODE*)old_cref;
-	ruby_frame = frame.tmp;
-	ruby_scope = old_scope;
-	ruby_block = old_block;
-	ruby_dyna_vars = old_dyna_vars;
-	data->vmode = scope_vmode; /* write back visibility mode */
-	scope_vmode = old_vmode;
-	if (dont_recycle) {
-	    struct tag *tag;
-	    struct RVarmap *vars;
-
-	    scope_dup(ruby_scope);
-	    for (tag=prot_tag; tag; tag=tag->prev) {
-		scope_dup(tag->scope);
-	    }
-	    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
-		FL_SET(vars, DVAR_DONT_RECYCLE);
-	    }
-	}
-    }
-    else {
-	ruby_frame->iter = iter;
-    }
-    ruby_current_node = nodesave;
-    ruby_set_current_source();
-    if (state) {
-	if (state == TAG_RAISE) {
-	    if (strcmp(file, "(eval)") == 0) {
-		VALUE mesg, errat, bt2;
-
-		errat = get_backtrace(ruby_errinfo);
-		mesg = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
-		if (!NIL_P(errat) && TYPE(errat) == T_ARRAY &&
-		    (bt2 = backtrace(-2), RARRAY(bt2)->len > 0)) {
-		    if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
-			rb_str_update(mesg, 0, 0, rb_str_new2(": "));
-			rb_str_update(mesg, 0, 0, RARRAY(errat)->ptr[0]);
-		    }
-		    RARRAY(errat)->ptr[0] = RARRAY(bt2)->ptr[0];
-		}
-	    }
-	    rb_exc_raise(ruby_errinfo);
-	}
+    /* TODO: fix me */
+    /* retval = prot_tag ? prot_tag->retval : Qnil; */     /* save retval */
+    (*e_proc) (data2);
+    if (state)
 	JUMP_TAG(state);
-    }
-
     return result;
 }
 
-/*
- *  call-seq:
- *     eval(string [, binding [, filename [,lineno]]])  => obj
- *  
- *  Evaluates the Ruby expression(s) in <em>string</em>. If
- *  <em>binding</em> is given, the evaluation is performed in its
- *  context. The binding may be a <code>Binding</code> object or a
- *  <code>Proc</code> object. If the optional <em>filename</em> and
- *  <em>lineno</em> parameters are present, they will be used when
- *  reporting syntax errors.
- *     
- *     def getBinding(str)
- *       return binding
- *     end
- *     str = "hello"
- *     eval "str + ' Fred'"                      #=> "hello Fred"
- *     eval "str + ' Fred'", getBinding("bye")   #=> "bye Fred"
- */
-
-static VALUE
-rb_f_eval(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE src, scope, vfile, vline;
-    char *file = "(eval)";
-    int line = 1;
-
-    rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
-    if (ruby_safe_level >= 4) {
-	StringValue(src);
-	if (!NIL_P(scope) && !OBJ_TAINTED(scope)) {
-	    rb_raise(rb_eSecurityError, "Insecure: can't modify trusted binding");
-	}
-    }
-    else {
-	SafeStringValue(src);
-    }
-    if (argc >= 3) {
-	StringValue(vfile);
-    }
-    if (argc >= 4) {
-	line = NUM2INT(vline);
-    }
-
-    if (!NIL_P(vfile)) file = RSTRING(vfile)->ptr;
-    if (NIL_P(scope) && ruby_frame->prev) {
-	struct FRAME *prev;
-	VALUE val;
-
-	prev = ruby_frame;
-	PUSH_FRAME();
-	*ruby_frame = *prev->prev;
-	ruby_frame->prev = prev;
-	val = eval(self, src, scope, file, line);
-	POP_FRAME();
-
-	return val;
-    }
-    return eval(self, src, scope, file, line);
-}
-
-/* function to call func under the specified class/module context */
-static VALUE
-exec_under(func, under, cbase, args)
-    VALUE (*func)();
-    VALUE under, cbase;
-    void *args;
-{
-    VALUE val = Qnil;		/* OK */
-    int state;
-    int mode;
-    struct FRAME *f = ruby_frame;
-
-    PUSH_CLASS(under);
-    PUSH_FRAME();
-    ruby_frame->self = f->self;
-    ruby_frame->last_func = f->last_func;
-    ruby_frame->orig_func = f->orig_func;
-    ruby_frame->last_class = f->last_class;
-    ruby_frame->argc = f->argc;
-    if (cbase) {
-	PUSH_CREF(cbase);
-    }
-
-    mode = scope_vmode;
-    SCOPE_SET(SCOPE_PUBLIC);
-    PUSH_TAG(PROT_NONE);
-    if ((state = EXEC_TAG()) == 0) {
-	val = (*func)(args);
-    }
-    POP_TAG();
-    if (cbase) POP_CREF();
-    SCOPE_SET(mode);
-    POP_FRAME();
-    POP_CLASS();
-    if (state) JUMP_TAG(state);
-
-    return val;
-}
-
-static VALUE
-eval_under_i(args)
-    VALUE *args;
-{
-    struct FRAME *f = ruby_frame;
-
-    if (f && (f = f->prev) && (f = f->prev)) {
-	ruby_frame = f;
-    }
-    return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]);
-}
-
-/* string eval under the class/module context */
-static VALUE
-eval_under(under, self, src, file, line)
-    VALUE under, self, src;
-    const char *file;
-    int line;
-{
-    VALUE args[4];
-
-    if (ruby_safe_level >= 4) {
-	StringValue(src);
-    }
-    else {
-	SafeStringValue(src);
-    }
-    args[0] = self;
-    args[1] = src;
-    args[2] = (VALUE)file;
-    args[3] = (VALUE)line;
-    return exec_under(eval_under_i, under, under, args);
-}
-
-static VALUE
-yield_under_i(self)
-    VALUE self;
-{
-    return rb_yield_0(self, self, ruby_class, YIELD_PUBLIC_DEF, Qfalse);
-}
-
-/* block eval under the class/module context */
-static VALUE
-yield_under(under, self)
-    VALUE under, self;
-{
-    return exec_under(yield_under_i, under, 0, self);
-}
-
-static VALUE
-specific_eval(argc, argv, klass, self)
-    int argc;
-    VALUE *argv;
-    VALUE klass, self;
-{
-    if (rb_block_given_p()) {
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
-	}
-	return yield_under(klass, self);
-    }
-    else {
-	char *file = "(eval)";
-	int   line = 1;
-
-	if (argc == 0) {
-	    rb_raise(rb_eArgError, "block not supplied");
-	}
-	else {
-	    if (ruby_safe_level >= 4) {
-		StringValue(argv[0]);
-	    }
-	    else {
-		SafeStringValue(argv[0]);
-	    }
-	    if (argc > 3) {
-		rb_raise(rb_eArgError, "wrong number of arguments: %s(src) or %s{..}",
-			 rb_id2name(ruby_frame->last_func),
-			 rb_id2name(ruby_frame->last_func));
-	    }
-	    if (argc > 2) line = NUM2INT(argv[2]);
-	    if (argc > 1) {
-		file = StringValuePtr(argv[1]);
-	    }
-	}
-	return eval_under(klass, self, argv[0], file, line);
-    }
-}
-
-/*
- *  call-seq:
- *     obj.instance_eval(string [, filename [, lineno]] )   => obj
- *     obj.instance_eval {| | block }                       => obj
- *  
- *  Evaluates a string containing Ruby source code, or the given block,
- *  within the context of the receiver (_obj_). In order to set the
- *  context, the variable +self+ is set to _obj_ while
- *  the code is executing, giving the code access to _obj_'s
- *  instance variables. In the version of <code>instance_eval</code>
- *  that takes a +String+, the optional second and third
- *  parameters supply a filename and starting line number that are used
- *  when reporting compilation errors.
- *     
- *     class Klass
- *       def initialize
- *         @secret = 99
- *       end
- *     end
- *     k = Klass.new
- *     k.instance_eval { @secret }   #=> 99
- */
-
-VALUE
-rb_obj_instance_eval(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+static const rb_method_entry_t *
+method_entry_of_iseq(rb_control_frame_t *cfp, rb_iseq_t *iseq)
 {
-    VALUE klass;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp_limit;
 
-    if (SPECIAL_CONST_P(self)) {
-	klass = Qnil;
+    cfp_limit = (rb_control_frame_t *)(th->stack + th->stack_size);
+    while (cfp_limit > cfp) {
+	if (cfp->iseq == iseq)
+	    return cfp->me;
+	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
-    else {
-	klass = rb_singleton_class(self);
-    }
-    return specific_eval(argc, argv, klass, self);
-}
-
-/*
- *  call-seq:
- *     mod.class_eval(string [, filename [, lineno]])  => obj
- *     mod.module_eval {|| block }                     => obj
- *  
- *  Evaluates the string or block in the context of _mod_. This can
- *  be used to add methods to a class. <code>module_eval</code> returns
- *  the result of evaluating its argument. The optional _filename_
- *  and _lineno_ parameters set the text for error messages.
- *     
- *     class Thing
- *     end
- *     a = %q{def hello() "Hello there!" end}
- *     Thing.module_eval(a)
- *     puts Thing.new.hello()
- *     Thing.module_eval("invalid code", "dummy", 123)
- *     
- *  <em>produces:</em>
- *     
- *     Hello there!
- *     dummy:123:in `module_eval': undefined local variable
- *         or method `code' for Thing:Class
- */
-
-VALUE
-rb_mod_module_eval(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    return specific_eval(argc, argv, mod, mod);
-}
-
-VALUE rb_load_path;
-
-NORETURN(static void load_failed _((VALUE)));
-
-void
-rb_load(fname, wrap)
-    VALUE fname;
-    int wrap;
-{
-    VALUE tmp;
-    int state;
-    volatile int prohibit_int = rb_prohibit_interrupt;
-    volatile ID last_func;
-    volatile VALUE wrapper = ruby_wrapper;
-    volatile VALUE self = ruby_top_self;
-    NODE *volatile last_node;
-    NODE *saved_cref = ruby_cref;
-
-    if (wrap && ruby_safe_level >= 4) {
-	StringValue(fname);
-    }
-    else {
-	SafeStringValue(fname);
-    }
-    fname = rb_str_new4(fname);
-    tmp = rb_find_file(fname);
-    if (!tmp) {
-	load_failed(fname);
-    }
-    fname = tmp;
-
-    ruby_errinfo = Qnil;	/* ensure */
-    PUSH_VARS();
-    PUSH_CLASS(ruby_wrapper);
-    ruby_cref = ruby_top_cref;
-    if (!wrap) {
-	rb_secure(4);		/* should alter global state */
-	ruby_class = rb_cObject;
-	ruby_wrapper = 0;
-    }
-    else {
-	/* load in anonymous module as toplevel */
-	ruby_class = ruby_wrapper = rb_module_new();
-	self = rb_obj_clone(ruby_top_self);
-	rb_extend_object(self, ruby_wrapper);
-	PUSH_CREF(ruby_wrapper);
-    }
-    PUSH_ITER(ITER_NOT);
-    PUSH_FRAME();
-    ruby_frame->last_func = 0;
-    ruby_frame->last_class = 0;
-    ruby_frame->self = self;
-    PUSH_SCOPE();
-    /* default visibility is private at loading toplevel */
-    SCOPE_SET(SCOPE_PRIVATE);
-    PUSH_TAG(PROT_NONE);
-    state = EXEC_TAG();
-    last_func = ruby_frame->last_func;
-    last_node = ruby_current_node;
-    if (!ruby_current_node && ruby_sourcefile) {
-	last_node = NEW_NEWLINE(0);
-    }
-    ruby_current_node = 0;
-    if (state == 0) {
-	NODE *node;
-	volatile int critical;
-
-	DEFER_INTS;
-	ruby_in_eval++;
-	critical = rb_thread_critical;
-	rb_thread_critical = Qtrue;
-	rb_load_file(RSTRING(fname)->ptr);
-	ruby_in_eval--;
-	node = ruby_eval_tree;
-	rb_thread_critical = critical;
-	ALLOW_INTS;
-	if (ruby_nerrs == 0) {
-	    eval_node(self, node);
-	}
-    }
-    ruby_frame->last_func = last_func;
-    ruby_current_node = last_node;
-    ruby_sourcefile = 0;
-    ruby_set_current_source();
-    if (ruby_scope->flags == SCOPE_ALLOCA && ruby_class == rb_cObject) {
-	if (ruby_scope->local_tbl) /* toplevel was empty */
-	    free(ruby_scope->local_tbl);
-    }
-    POP_TAG();
-    rb_prohibit_interrupt = prohibit_int;
-    ruby_cref = saved_cref;
-    POP_SCOPE();
-    POP_FRAME();
-    POP_ITER();
-    POP_CLASS();
-    POP_VARS();
-    ruby_wrapper = wrapper;
-    if (ruby_nerrs > 0) {
-	ruby_nerrs = 0;
-	rb_exc_raise(ruby_errinfo);
-    }
-    if (state) jump_tag_but_local_jump(state, Qundef);
-    if (!NIL_P(ruby_errinfo))	/* exception during load */
-	rb_exc_raise(ruby_errinfo);
-}
-
-void
-rb_load_protect(fname, wrap, state)
-    VALUE fname;
-    int wrap;
-    int *state;
-{
-    int status;
-
-    PUSH_TAG(PROT_NONE);
-    if ((status = EXEC_TAG()) == 0) {
-	rb_load(fname, wrap);
-    }
-    POP_TAG();
-    if (state) *state = status;
-}
-
-/*
- *  call-seq:
- *     load(filename, wrap=false)   => true
- *  
- *  Loads and executes the Ruby
- *  program in the file _filename_. If the filename does not
- *  resolve to an absolute path, the file is searched for in the library
- *  directories listed in <code>$:</code>. If the optional _wrap_
- *  parameter is +true+, the loaded script will be executed
- *  under an anonymous module, protecting the calling program's global
- *  namespace. In no circumstance will any local variables in the loaded
- *  file be propagated to the loading environment.
- */
-
-
-static VALUE
-rb_f_load(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE fname, wrap;
-
-    rb_scan_args(argc, argv, "11", &fname, &wrap);
-    rb_load(fname, RTEST(wrap));
-    return Qtrue;
+    return 0;
 }
 
-VALUE ruby_dln_librefs;
-static VALUE rb_features;
-static st_table *loading_tbl;
-
-#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0)
-#ifdef DLEXT2
-#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0)
-#else
-#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0)
-#endif
-
-
-static const char *const loadable_ext[] = {
-    ".rb", DLEXT,
-#ifdef DLEXT2
-    DLEXT2,
-#endif
-    0
-};
-
-static int rb_feature_p _((const char *, const char *, int));
-static int search_required _((VALUE, VALUE *, VALUE *));
-
-static int
-rb_feature_p(feature, ext, rb)
-    const char *feature, *ext;
-    int rb;
+static ID
+frame_func_id(rb_control_frame_t *cfp)
 {
-    VALUE v;
-    const char *f, *e;
-    long i, len, elen;
-
-    if (ext) {
-	len = ext - feature;
-	elen = strlen(ext);
-    }
-    else {
-	len = strlen(feature);
-	elen = 0;
-    }
-    for (i = 0; i < RARRAY_LEN(rb_features); ++i) {
-	v = RARRAY_PTR(rb_features)[i];
-	f = StringValuePtr(v);
-	if (RSTRING_LEN(v) < len || strncmp(f, feature, len) != 0)
-	    continue;
-	if (!*(e = f + len)) {
-	    if (ext) continue;
-	    return 'u';
-	}
-	if (*e != '.') continue;
-	if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
-	    return 's';
-	}
-	if ((rb || !ext) && (strcmp(e, ".rb") == 0)) {
-	    return 'r';
-	}
+    const rb_method_entry_t *me_local;
+    rb_iseq_t *iseq = cfp->iseq;
+    if (cfp->me) {
+	return cfp->me->def->original_id;
     }
-    if (loading_tbl) {
-	if (st_lookup(loading_tbl, (st_data_t)feature, 0)) {
-	    if (!ext) return 'u';
-	    return strcmp(ext, ".rb") ? 's' : 'r';
-	}
-	else {
-	    char *buf;
-
-	    if (ext && *ext) return 0;
-	    buf = ALLOCA_N(char, len + DLEXT_MAXLEN + 1);
-	    MEMCPY(buf, feature, char, len);
-	    for (i = 0; (e = loadable_ext[i]) != 0; i++) {
-		strncpy(buf + len, e, DLEXT_MAXLEN + 1);
-		if (st_lookup(loading_tbl, (st_data_t)buf, 0)) {
-		    return i ? 's' : 'r';
-		}
-	    }
+    while (iseq) {
+	if (RUBY_VM_IFUNC_P(iseq)) {
+	    return rb_intern("<ifunc>");
 	}
-    }
-    return 0;
-}
-
-int
-rb_provided(feature)
-    const char *feature;
-{
-    const char *ext = strrchr(feature, '.');
-
-    if (ext && !strchr(ext, '/')) {
-	if (strcmp(".rb", ext) == 0) {
-	    if (rb_feature_p(feature, ext, Qtrue)) return Qtrue;
-	    return Qfalse;
+	me_local = method_entry_of_iseq(cfp, iseq);
+	if (me_local) {
+	    cfp->me = me_local;
+	    return me_local->def->original_id;
 	}
-	else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
-	    if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
-	    return Qfalse;
+	if (iseq->defined_method_id) {
+	    return iseq->defined_method_id;
 	}
-    }
-    if (rb_feature_p(feature, feature + strlen(feature), Qtrue))
-	return Qtrue;
-
-    return Qfalse;
-}
-
-static void
-rb_provide_feature(feature)
-    VALUE feature;
-{
-    rb_ary_push(rb_features, feature);
-}
-
-void
-rb_provide(feature)
-    const char *feature;
-{
-    rb_provide_feature(rb_str_new2(feature));
-}
-
-static char *
-load_lock(ftptr)
-    const char *ftptr;
-{
-    st_data_t th;
-
-    if (!loading_tbl ||
-	!st_lookup(loading_tbl, (st_data_t)ftptr, &th))
-    {
-	/* loading ruby library should be serialized. */
-	if (!loading_tbl) {
-	    loading_tbl = st_init_strtable();
+	if (iseq->local_iseq == iseq) {
+	    break;
 	}
-	/* partial state */
-	ftptr = ruby_strdup(ftptr);
-	st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
-	return (char *)ftptr;
+	iseq = iseq->parent_iseq;
     }
-    do {
-	if ((rb_thread_t)th == curr_thread) return 0;
-	CHECK_INTS;
-    } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
     return 0;
 }
 
-static void
-load_unlock(const char *ftptr)
-{
-    if (ftptr) {
-	st_data_t key = (st_data_t)ftptr;
-	
-	if (st_delete(loading_tbl, &key, 0)) {
-	    free((char *)key);
-	}
-    }
-}
-
-/*
- *  call-seq:
- *     require(string)    => true or false
- *  
- *  Ruby tries to load the library named _string_, returning
- *  +true+ if successful. If the filename does not resolve to
- *  an absolute path, it will be searched for in the directories listed
- *  in <code>$:</code>. If the file has the extension ``.rb'', it is
- *  loaded as a source file; if the extension is ``.so'', ``.o'', or
- *  ``.dll'', or whatever the default shared library extension is on
- *  the current platform, Ruby loads the shared library as a Ruby
- *  extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on
- *  to the name. The name of the loaded feature is added to the array in
- *  <code>$"</code>. A feature will not be loaded if it's name already
- *  appears in <code>$"</code>. However, the file name is not converted
- *  to an absolute path, so that ``<code>require 'a';require
- *  './a'</code>'' will load <code>a.rb</code> twice.
- *     
- *     require "my-library.rb"
- *     require "db-driver"
- */
-
-VALUE
-rb_f_require(obj, fname)
-    VALUE obj, fname;
-{
-    return rb_require_safe(fname, ruby_safe_level);
-}
-
-static int
-search_required(fname, featurep, path)
-    VALUE fname, *featurep, *path;
+ID
+rb_frame_this_func(void)
 {
-    VALUE tmp;
-    char *ext, *ftptr;
-    int type;
-
-    *featurep = fname;
-    *path = 0;
-    ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
-    if (ext && !strchr(ext, '/')) {
-	if (strcmp(".rb", ext) == 0) {
-	    if (rb_feature_p(ftptr, ext, Qtrue)) return 'r';
-	    if ((*path = rb_find_file(fname)) != 0) return 'r';
-	    return 0;
-	}
-	else if (IS_SOEXT(ext)) {
-	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
-	    tmp = rb_str_new(RSTRING_PTR(fname), ext-RSTRING_PTR(fname));
-	    *featurep = tmp;
-#ifdef DLEXT2
-	    OBJ_FREEZE(tmp);
-	    if (rb_find_file_ext(&tmp, loadable_ext+1)) {
-		*featurep = tmp;
-		*path = rb_find_file(tmp);
-		return 's';
-	    }
-#else
-	    rb_str_cat2(tmp, DLEXT);
-	    OBJ_FREEZE(tmp);
-	    if (*path = rb_find_file(tmp)) {
-		return 's';
-	    }
-#endif
-	}
-	else if (IS_DLEXT(ext)) {
-	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
-	    if ((*path = rb_find_file(fname)) != 0) return 's';
-	}
-    }
-    tmp = fname;
-    type = rb_find_file_ext(&tmp, loadable_ext);
-    *featurep = tmp;
-    switch (type) {
-      case 0:
-	ftptr = RSTRING_PTR(tmp);
-	return rb_feature_p(ftptr, 0, Qfalse);
-
-      default:
-	ext = strrchr(ftptr = RSTRING(tmp)->ptr, '.');
-	if (rb_feature_p(ftptr, ext, !--type)) break;
-	*path = rb_find_file(tmp);
-    }
-    return type ? 's' : 'r';
+    return frame_func_id(GET_THREAD()->cfp);
 }
 
-static void
-load_failed(fname)
-    VALUE fname;
+ID
+rb_frame_callee(void)
 {
-    rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
+    return frame_func_id(GET_THREAD()->cfp);
 }
 
-VALUE
-rb_require_safe(fname, safe)
-    VALUE fname;
-    int safe;
+static ID
+rb_frame_caller(void)
 {
-    VALUE result = Qnil;
-    volatile VALUE errinfo = ruby_errinfo;
-    int state;
-    struct {
-	NODE *node;
-	ID func;
-	int vmode, safe;
-    } volatile saved;
-    char *volatile ftptr = 0;
-
-    if (OBJ_TAINTED(fname)) {
-	rb_check_safe_obj(fname);
-    }
-    StringValue(fname);
-    fname = rb_str_new4(fname);
-    saved.vmode = scope_vmode;
-    saved.node = ruby_current_node;
-    saved.func = ruby_frame->last_func;
-    saved.safe = ruby_safe_level;
-    PUSH_TAG(PROT_NONE);
-    if ((state = EXEC_TAG()) == 0) {
-	VALUE feature, path;
-	long handle;
-	int found;
-
-	ruby_safe_level = safe;
-	found = search_required(fname, &feature, &path);
-	if (found) {
-	    if (!path || !(ftptr = load_lock(RSTRING_PTR(feature)))) {
-		result = Qfalse;
-	    }
-	    else {
-		ruby_safe_level = 0;
-		switch (found) {
-		  case 'r':
-		    rb_load(path, 0);
-		    break;
-
-		  case 's':
-		    ruby_current_node = 0;
-		    ruby_sourcefile = rb_source_filename(RSTRING(path)->ptr);
-		    ruby_sourceline = 0;
-		    ruby_frame->last_func = 0;
-		    SCOPE_SET(SCOPE_PUBLIC);
-		    handle = (long)dln_load(RSTRING(path)->ptr);
-		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
-		    break;
-		}
-		rb_provide_feature(feature);
-		result = Qtrue;
-	    }
-	}
-    }
-    POP_TAG();
-    ruby_current_node = saved.node;
-    ruby_set_current_source();
-    ruby_frame->last_func = saved.func;
-    SCOPE_SET(saved.vmode);
-    ruby_safe_level = saved.safe;
-    load_unlock(ftptr);
-    if (state) JUMP_TAG(state);
-    if (NIL_P(result)) {
-	load_failed(fname);
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+    /* check if prev_cfp can be accessible */
+    if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
+        return 0;
     }
-    ruby_errinfo = errinfo;
-
-    return result;
-}
-
-VALUE
-rb_require(fname)
-    const char *fname;
-{
-    VALUE fn = rb_str_new2(fname);
-    OBJ_FREEZE(fn);
-    return rb_require_safe(fn, ruby_safe_level);
+    return frame_func_id(prev_cfp);
 }
 
 void
-ruby_init_ext(name, init)
-    const char *name;
-    void (*init) _((void));
-{
-    ruby_current_node = 0;
-    ruby_sourcefile = rb_source_filename(name);
-    ruby_sourceline = 0;
-    ruby_frame->last_func = 0;
-    ruby_frame->orig_func = 0;
-    SCOPE_SET(SCOPE_PUBLIC);
-    if (load_lock(name)) {
-	(*init)();
-	rb_provide(name);
-	load_unlock(name);
-    }
-}
-
-static void
-secure_visibility(self)
-    VALUE self;
-{
-    if (ruby_safe_level >= 4 && !OBJ_TAINTED(self)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't change method visibility");
-    }
-}
-
-static void
-set_method_visibility(self, argc, argv, ex)
-    VALUE self;
-    int argc;
-    VALUE *argv;
-    ID ex;
-{
-    int i;
-
-    secure_visibility(self);
-    for (i=0; i<argc; i++) {
-	rb_export_method(self, rb_to_id(argv[i]), ex);
-    }
-    rb_clear_cache_by_class(self);
-}
-
-/*
- *  call-seq:
- *     public                 => self
- *     public(symbol, ...)    => self
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to public. With arguments, sets the named methods to
- *  have public visibility.
- */
-
-static VALUE
-rb_mod_public(argc, argv, module)
-    int argc;
-    VALUE *argv;
-    VALUE module;
-{
-    secure_visibility(module);
-    if (argc == 0) {
-	SCOPE_SET(SCOPE_PUBLIC);
-    }
-    else {
-	set_method_visibility(module, argc, argv, NOEX_PUBLIC);
-    }
-    return module;
-}
-
-/*
- *  call-seq:
- *     protected                => self
- *     protected(symbol, ...)   => self
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to protected. With arguments, sets the named methods
- *  to have protected visibility.
- */
-
-static VALUE
-rb_mod_protected(argc, argv, module)
-    int argc;
-    VALUE *argv;
-    VALUE module;
-{
-    secure_visibility(module);
-    if (argc == 0) {
-	SCOPE_SET(SCOPE_PROTECTED);
-    }
-    else {
-	set_method_visibility(module, argc, argv, NOEX_PROTECTED);
-    }
-    return module;
-}
-
-/*
- *  call-seq:
- *     private                 => self
- *     private(symbol, ...)    => self
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to private. With arguments, sets the named methods
- *  to have private visibility.
- *     
- *     module Mod
- *       def a()  end
- *       def b()  end
- *       private
- *       def c()  end
- *       private :a
- *     end
- *     Mod.private_instance_methods   #=> ["a", "c"]
- */
-
-static VALUE
-rb_mod_private(argc, argv, module)
-    int argc;
-    VALUE *argv;
-    VALUE module;
-{
-    secure_visibility(module);
-    if (argc == 0) {
-	SCOPE_SET(SCOPE_PRIVATE);
-    }
-    else {
-	set_method_visibility(module, argc, argv, NOEX_PRIVATE);
-    }
-    return module;
-}
-
-/*
- *  call-seq:
- *     mod.public_class_method(symbol, ...)    => mod
- *  
- *  Makes a list of existing class methods public.
- */
-
-static VALUE
-rb_mod_public_method(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PUBLIC);
-    return obj;
-}
-
-/*
- *  call-seq:
- *     mod.private_class_method(symbol, ...)   => mod
- *  
- *  Makes existing class methods private. Often used to hide the default
- *  constructor <code>new</code>.
- *     
- *     class SimpleSingleton  # Not thread safe
- *       private_class_method :new
- *       def SimpleSingleton.create(*args, &block)
- *         @me = new(*args, &block) if ! @me
- *         @me
- *       end
- *     end
- */
-
-static VALUE
-rb_mod_private_method(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PRIVATE);
-    return obj;
-}
-
-/*
- *  call-seq:
- *     public
- *     public(symbol, ...)
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to public. With arguments, sets the named methods to
- *  have public visibility.
- */
-
-static VALUE
-top_public(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    return rb_mod_public(argc, argv, rb_cObject);
-}
-
-static VALUE
-top_private(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_frame_pop(void)
 {
-    return rb_mod_private(argc, argv, rb_cObject);
+    rb_thread_t *th = GET_THREAD();
+    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
 }
 
 /*
  *  call-seq:
- *     module_function(symbol, ...)    => self
- *  
- *  Creates module functions for the named methods. These functions may
- *  be called with the module as a receiver, and also become available
- *  as instance methods to classes that mix in the module. Module
- *  functions are copies of the original, and so may be changed
- *  independently. The instance-method versions are made private. If
- *  used with no arguments, subsequently defined methods become module
- *  functions.
- *     
- *     module Mod
- *       def one
- *         "This is one"
- *       end
- *       module_function :one
- *     end
- *     class Cls
- *       include Mod
- *       def callOne
- *         one
- *       end
- *     end
- *     Mod.one     #=> "This is one"
- *     c = Cls.new
- *     c.callOne   #=> "This is one"
- *     module Mod
- *       def one
- *         "This is the new one"
- *       end
- *     end
- *     Mod.one     #=> "This is one"
- *     c.callOne   #=> "This is the new one"
- */
-
-static VALUE
-rb_mod_modfunc(argc, argv, module)
-    int argc;
-    VALUE *argv;
-    VALUE module;
-{
-    int i;
-    ID id;
-    NODE *body;
-
-    if (TYPE(module) != T_MODULE) {
-	rb_raise(rb_eTypeError, "module_function must be called for modules");
-    }
-
-    secure_visibility(module);
-    if (argc == 0) {
-	SCOPE_SET(SCOPE_MODFUNC);
-	return module;
-    }
-
-    set_method_visibility(module, argc, argv, NOEX_PRIVATE);
-    for (i=0; i<argc; i++) {
-	VALUE m = module;
-
-	id = rb_to_id(argv[i]);
-	for (;;) {
-	    body = search_method(m, id, &m);
-	    if (body == 0) {
-		body = search_method(rb_cObject, id, &m);
-	    }
-	    if (body == 0 || body->nd_body == 0) {
-		rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
-	    }
-	    if (nd_type(body->nd_body) != NODE_ZSUPER) {
-		break;		/* normal case: need not to follow 'super' link */
-	    }
-	    m = RCLASS(m)->super;
-	    if (!m) break;
-	}
-	rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC);
-    }
-    return module;
-}
-
-/*
- *  call-seq:
- *     append_features(mod)   => mod
- *  
+ *     append_features(mod)   -> mod
+ *
  *  When this module is included in another, Ruby calls
  *  <code>append_features</code> in this module, passing it the
  *  receiving module in _mod_. Ruby's default implementation is
@@ -7588,8 +838,7 @@ rb_mod_modfunc(argc, argv, module)
  */
 
 static VALUE
-rb_mod_append_features(module, include)
-    VALUE module, include;
+rb_mod_append_features(VALUE module, VALUE include)
 {
     switch (TYPE(include)) {
       case T_CLASS:
@@ -7606,20 +855,18 @@ rb_mod_append_features(module, include)
 
 /*
  *  call-seq:
- *     include(module, ...)    => self
- *  
- *  Invokes <code>Module.append_features</code> on each parameter in turn.
+ *     include(module, ...)    -> self
+ *
+ *  Invokes <code>Module.append_features</code> on each parameter in reverse order.
  */
 
 static VALUE
-rb_mod_include(argc, argv, module)
-    int argc;
-    VALUE *argv;
-    VALUE module;
+rb_mod_include(int argc, VALUE *argv, VALUE module)
 {
     int i;
 
-    for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
+    for (i = 0; i < argc; i++)
+	Check_Type(argv[i], T_MODULE);
     while (argc--) {
 	rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
 	rb_funcall(argv[argc], rb_intern("included"), 1, module);
@@ -7628,31 +875,26 @@ rb_mod_include(argc, argv, module)
 }
 
 void
-rb_obj_call_init(obj, argc, argv)
-    VALUE obj;
-    int argc;
-    VALUE *argv;
+rb_obj_call_init(VALUE obj, int argc, VALUE *argv)
 {
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
-    rb_funcall2(obj, init, argc, argv);
-    POP_ITER();
+    PASS_PASSED_BLOCK();
+    rb_funcall2(obj, idInitialize, argc, argv);
 }
 
 void
-rb_extend_object(obj, module)
-    VALUE obj, module;
+rb_extend_object(VALUE obj, VALUE module)
 {
     rb_include_module(rb_singleton_class(obj), module);
 }
 
 /*
  *  call-seq:
- *     extend_object(obj)    => obj
- *  
+ *     extend_object(obj)    -> obj
+ *
  *  Extends the specified object by adding this module's constants and
  *  methods (which are added as singleton methods). This is the callback
  *  method used by <code>Object#extend</code>.
- *     
+ *
  *     module Picky
  *       def Picky.extend_object(o)
  *         if String === o
@@ -7665,16 +907,15 @@ rb_extend_object(obj, module)
  *     end
  *     (s = Array.new).extend Picky  # Call Object.extend
  *     (s = "quick brown fox").extend Picky
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Picky added to Array
  *     Can't add Picky to a String
  */
 
 static VALUE
-rb_mod_extend_object(mod, obj)
-    VALUE mod, obj;
+rb_mod_extend_object(VALUE mod, VALUE obj)
 {
     rb_extend_object(obj, mod);
     return obj;
@@ -7682,23 +923,23 @@ rb_mod_extend_object(mod, obj)
 
 /*
  *  call-seq:
- *     obj.extend(module, ...)    => obj
- *  
+ *     obj.extend(module, ...)    -> obj
+ *
  *  Adds to _obj_ the instance methods from each module given as a
  *  parameter.
- *     
+ *
  *     module Mod
  *       def hello
  *         "Hello from Mod.\n"
  *       end
  *     end
- *     
+ *
  *     class Klass
  *       def hello
  *         "Hello from Klass.\n"
  *       end
  *     end
- *     
+ *
  *     k = Klass.new
  *     k.hello         #=> "Hello from Klass.\n"
  *     k.extend(Mod)   #=> #<Klass:0x401b3bc8>
@@ -7706,17 +947,15 @@ rb_mod_extend_object(mod, obj)
  */
 
 static VALUE
-rb_obj_extend(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_obj_extend(int argc, VALUE *argv, VALUE obj)
 {
     int i;
 
     if (argc == 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
     }
-    for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
+    for (i = 0; i < argc; i++)
+	Check_Type(argv[i], T_MODULE);
     while (argc--) {
 	rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
 	rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
@@ -7726,23 +965,23 @@ rb_obj_extend(argc, argv, obj)
 
 /*
  *  call-seq:
- *     include(module, ...)   => self
- *  
+ *     include(module, ...)   -> self
+ *
  *  Invokes <code>Module.append_features</code>
  *  on each parameter in turn. Effectively adds the methods and constants
  *  in each module to the receiver.
  */
 
 static VALUE
-top_include(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+top_include(int argc, VALUE *argv, VALUE self)
 {
+    rb_thread_t *th = GET_THREAD();
+
     rb_secure(4);
-    if (ruby_wrapper) {
-	rb_warning("main#include in the wrapped load is effective only in wrapper module");
-	return rb_mod_include(argc, argv, ruby_wrapper);
+    if (th->top_wrapper) {
+	rb_warning
+	    ("main#include in the wrapped load is effective only in wrapper module");
+	return rb_mod_include(argc, argv, th->top_wrapper);
     }
     return rb_mod_include(argc, argv, rb_cObject);
 }
@@ -7750,5504 +989,177 @@ top_include(argc, argv, self)
 VALUE rb_f_trace_var();
 VALUE rb_f_untrace_var();
 
-static void
-errinfo_setter(val, id, var)
-    VALUE val;
-    ID id;
-    VALUE *var;
-{
-    if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
-	rb_raise(rb_eTypeError, "assigning non-exception to $!");
-    }
-    *var = val;
-}
-
-static VALUE
-errat_getter(id)
-    ID id;
-{
-    return get_backtrace(ruby_errinfo);
-}
-
-static void
-errat_setter(val, id, var)
-    VALUE val;
-    ID id;
-    VALUE *var;
-{
-    if (NIL_P(ruby_errinfo)) {
-	rb_raise(rb_eArgError, "$! not set");
-    }
-    set_backtrace(ruby_errinfo, val);
-}
-
-/*
- *  call-seq:
- *     local_variables    => array
- *  
- *  Returns the names of the current local variables.
- *     
- *     fred = 1
- *     for i in 1..10
- *        # ...
- *     end
- *     local_variables   #=> ["fred", "i"]
- */
-
-static VALUE
-rb_f_local_variables()
-{
-    ID *tbl;
-    int n, i;
-    VALUE ary = rb_ary_new();
-    struct RVarmap *vars;
-
-    tbl = ruby_scope->local_tbl;
-    if (tbl) {
-	n = *tbl++;
-	for (i=2; i<n; i++) {	/* skip first 2 ($_ and $~) */
-	    if (!rb_is_local_id(tbl[i])) continue; /* skip flip states */
-	    rb_ary_push(ary, rb_str_new2(rb_id2name(tbl[i])));
-	}
-    }
-
-    vars = ruby_dyna_vars;
-    while (vars) {
-	if (vars->id && rb_is_local_id(vars->id)) { /* skip $_, $~ and flip states */
-	    rb_ary_push(ary, rb_str_new2(rb_id2name(vars->id)));
-	}
-	vars = vars->next;
-    }
-
-    return ary;
-}
-
-static VALUE rb_f_catch _((VALUE,VALUE));
-NORETURN(static VALUE rb_f_throw _((int,VALUE*)));
-
-struct end_proc_data {
-    void (*func)();
-    VALUE data;
-    int safe;
-    struct end_proc_data *next;
-};
-
-static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs;
-
-void
-rb_set_end_proc(func, data)
-    void (*func) _((VALUE));
-    VALUE data;
-{
-    struct end_proc_data *link = ALLOC(struct end_proc_data);
-    struct end_proc_data **list;
-
-    if (ruby_wrapper) list = &ephemeral_end_procs;
-    else              list = &end_procs;
-    link->next = *list;
-    link->func = func;
-    link->data = data;
-    link->safe = ruby_safe_level;
-    *list = link;
-}
-
-void
-rb_mark_end_proc()
-{
-    struct end_proc_data *link;
-
-    link = end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-    link = ephemeral_end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-    link = tmp_end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-}
-
-static void call_end_proc _((VALUE data));
-
-static void
-call_end_proc(data)
-    VALUE data;
-{
-    PUSH_ITER(ITER_NOT);
-    PUSH_FRAME();
-    ruby_frame->self = ruby_frame->prev->self;
-    ruby_frame->node = 0;
-    ruby_frame->last_func = 0;
-    ruby_frame->last_class = 0;
-    proc_invoke(data, rb_ary_new2(0), Qundef, 0);
-    POP_FRAME();
-    POP_ITER();
-}
-
-static void
-rb_f_END()
-{
-    PUSH_FRAME();
-    ruby_frame->argc = 0;
-    ruby_frame->iter = ITER_CUR;
-    rb_set_end_proc(call_end_proc, rb_block_proc());
-    POP_FRAME();
-}
-
-/*
- *  call-seq:
- *     at_exit { block } -> proc
- *  
- *  Converts _block_ to a +Proc+ object (and therefore
- *  binds it at the point of call) and registers it for execution when
- *  the program exits. If multiple handlers are registered, they are
- *  executed in reverse order of registration.
- *     
- *     def do_at_exit(str1)
- *       at_exit { print str1 }
- *     end
- *     at_exit { puts "cruel world" }
- *     do_at_exit("goodbye ")
- *     exit
- *     
- *  <em>produces:</em>
- *     
- *     goodbye cruel world
- */
-
-static VALUE
-rb_f_at_exit()
+static VALUE *
+errinfo_place(rb_thread_t *th)
 {
-    VALUE proc;
-
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "called without a block");
-    }
-    proc = rb_block_proc();
-    rb_set_end_proc(call_end_proc, proc);
-    return proc;
-}
+    rb_control_frame_t *cfp = th->cfp;
+    rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
 
-void
-rb_exec_end_proc()
-{
-    struct end_proc_data *link, *tmp;
-    int status;
-    volatile int safe = ruby_safe_level;
-
-    while (ephemeral_end_procs) {
-	tmp_end_procs = link = ephemeral_end_procs;
-	ephemeral_end_procs = 0;
-	while (link) {
-	    PUSH_TAG(PROT_NONE);
-	    if ((status = EXEC_TAG()) == 0) {
-		ruby_safe_level = link->safe;
-		(*link->func)(link->data);
-	    }
-	    POP_TAG();
-	    if (status) {
-		error_handle(status);
+    while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
+	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
+	    if (cfp->iseq->type == ISEQ_TYPE_RESCUE) {
+		return &cfp->dfp[-2];
 	    }
-	    tmp = link;
-	    tmp_end_procs = link = link->next;
-	    free(tmp);
-	}
-    }
-    while (end_procs) {
-	tmp_end_procs = link = end_procs;
-	end_procs = 0;
-	while (link) {
-	    PUSH_TAG(PROT_NONE);
-	    if ((status = EXEC_TAG()) == 0) {
-		ruby_safe_level = link->safe;
-		(*link->func)(link->data);
+	    else if (cfp->iseq->type == ISEQ_TYPE_ENSURE &&
+		     TYPE(cfp->dfp[-2]) != T_NODE &&
+		     !FIXNUM_P(cfp->dfp[-2])) {
+		return &cfp->dfp[-2];
 	    }
-	    POP_TAG();
-	    if (status) {
-		error_handle(status);
-	    }
-	    tmp = link;
-	    tmp_end_procs = link = link->next;
-	    free(tmp);
-	}
-    }
-    ruby_safe_level = safe;
-}
-
-void
-Init_eval()
-{
-    init = rb_intern("initialize");
-    eqq = rb_intern("===");
-    each = rb_intern("each");
-
-    aref = rb_intern("[]");
-    aset = rb_intern("[]=");
-    match = rb_intern("=~");
-    missing = rb_intern("method_missing");
-    added = rb_intern("method_added");
-    singleton_added = rb_intern("singleton_method_added");
-    removed = rb_intern("method_removed");
-    singleton_removed = rb_intern("singleton_method_removed");
-    undefined = rb_intern("method_undefined");
-    singleton_undefined = rb_intern("singleton_method_undefined");
-
-    __id__ = rb_intern("__id__");
-    __send__ = rb_intern("__send__");
-
-    rb_global_variable((VALUE*)&top_scope);
-    rb_global_variable((VALUE*)&ruby_eval_tree_begin);
-
-    rb_global_variable((VALUE*)&ruby_eval_tree);
-    rb_global_variable((VALUE*)&ruby_dyna_vars);
-
-    rb_define_virtual_variable("$@", errat_getter, errat_setter);
-    rb_define_hooked_variable("$!", &ruby_errinfo, 0, errinfo_setter);
-
-    rb_define_global_function("eval", rb_f_eval, -1);
-    rb_define_global_function("iterator?", rb_f_block_given_p, 0);
-    rb_define_global_function("block_given?", rb_f_block_given_p, 0);
-    rb_define_global_function("method_missing", rb_method_missing, -1);
-    rb_define_global_function("loop", rb_f_loop, 0);
-
-    rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1);
-    respond_to   = rb_intern("respond_to?");
-    rb_global_variable((VALUE*)&basic_respond_to);
-    basic_respond_to = rb_method_node(rb_cObject, respond_to);
-    
-    rb_define_global_function("raise", rb_f_raise, -1);
-    rb_define_global_function("fail", rb_f_raise, -1);
-
-    rb_define_global_function("caller", rb_f_caller, -1);
-
-    rb_define_global_function("exit", rb_f_exit, -1);
-    rb_define_global_function("abort", rb_f_abort, -1);
-
-    rb_define_global_function("at_exit", rb_f_at_exit, 0);
-
-    rb_define_global_function("catch", rb_f_catch, 1);
-    rb_define_global_function("throw", rb_f_throw, -1);
-    rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */
-    rb_define_global_function("local_variables", rb_f_local_variables, 0);
-
-    rb_define_method(rb_mKernel, "send", rb_f_send, -1);
-    rb_define_method(rb_mKernel, "__send__", rb_f_send, -1);
-    rb_define_method(rb_mKernel, "instance_eval", rb_obj_instance_eval, -1);
-
-    rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
-    rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
-    rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
-    rb_define_private_method(rb_cModule, "public", rb_mod_public, -1);
-    rb_define_private_method(rb_cModule, "protected", rb_mod_protected, -1);
-    rb_define_private_method(rb_cModule, "private", rb_mod_private, -1);
-    rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1);
-    rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1);
-    rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1);
-    rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1);
-    rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1);
-    rb_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1);
-    rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);
-    rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
-    rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
-
-    rb_undef_method(rb_cClass, "module_function");
-
-    rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1);
-    rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1);
-    rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2);
-    rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
-
-    rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
-    rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, 0);
-
-    rb_define_singleton_method(ruby_top_self, "include", top_include, -1);
-    rb_define_singleton_method(ruby_top_self, "public", top_public, -1);
-    rb_define_singleton_method(ruby_top_self, "private", top_private, -1);
-
-    rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
-
-    rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */
-    rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */
-
-    rb_define_global_function("set_trace_func", set_trace_func, 1);
-    rb_global_variable(&trace_func);
-
-    rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
-}
-
-/*
- *  call-seq:
- *     mod.autoload(name, filename)   => nil
- *
- *  Registers _filename_ to be loaded (using <code>Kernel::require</code>) 
- *  the first time that _name_ (which may be a <code>String</code> or
- *  a symbol) is accessed in the namespace of _mod_.
- *
- *     module A
- *     end
- *     A.autoload(:B, "b")
- *     A::B.doit            # autoloads "b"
- */
-
-static VALUE
-rb_mod_autoload(mod, sym, file)
-    VALUE mod;
-    VALUE sym;
-    VALUE file;
-{
-    ID id = rb_to_id(sym);
-
-    Check_SafeStr(file);
-    rb_autoload(mod, id, RSTRING(file)->ptr);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     mod.autoload?(name)   => String or nil
- *
- *  Returns _filename_ to be loaded if _name_ is registered as
- *  +autoload+ in the namespace of _mod_.
- *
- *     module A
- *     end
- *     A.autoload(:B, "b")
- *     A.autoload?(:B)            # => "b"
- */
-
-static VALUE
-rb_mod_autoload_p(mod, sym)
-    VALUE mod, sym;
-{
-    return rb_autoload_p(mod, rb_to_id(sym));
-}
-
-/*
- *  call-seq:
- *     autoload(module, filename)   => nil
- *  
- *  Registers _filename_ to be loaded (using <code>Kernel::require</code>) 
- *  the first time that _module_ (which may be a <code>String</code> or
- *  a symbol) is accessed.
- *     
- *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
- */
-
-static VALUE
-rb_f_autoload(obj, sym, file)
-    VALUE obj;
-    VALUE sym;
-    VALUE file;
-{
-    if (NIL_P(ruby_cbase)) {
-	rb_raise(rb_eTypeError, "no class/module for autoload target");
-    }
-    return rb_mod_autoload(ruby_cbase, sym, file);
-}
-
-/*
- *  call-seq:
- *     autoload(module, filename)   => nil
- *
- *  Registers _filename_ to be loaded (using <code>Kernel::require</code>)
- *  the first time that _module_ (which may be a <code>String</code> or
- *  a symbol) is accessed.
- *
- *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
- */
-
-static VALUE
-rb_f_autoload_p(obj, sym)
-    VALUE obj;
-    VALUE sym;
-{
-    /* use ruby_cbase as same as rb_f_autoload. */
-    if (NIL_P(ruby_cbase)) {
-	return Qfalse;
-    }
-    return rb_mod_autoload_p(ruby_cbase, sym);
-}
-
-void
-Init_load()
-{
-    rb_define_readonly_variable("$:", &rb_load_path);
-    rb_define_readonly_variable("$-I", &rb_load_path);
-    rb_define_readonly_variable("$LOAD_PATH", &rb_load_path);
-    rb_load_path = rb_ary_new();
-
-    rb_define_readonly_variable("$\"", &rb_features);
-    rb_define_readonly_variable("$LOADED_FEATURES", &rb_features);
-    rb_features = rb_ary_new();
-
-    rb_define_global_function("load", rb_f_load, -1);
-    rb_define_global_function("require", rb_f_require, 1);
-    rb_define_method(rb_cModule, "autoload",  rb_mod_autoload,   2);
-    rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1);
-    rb_define_global_function("autoload",  rb_f_autoload,   2);
-    rb_define_global_function("autoload?", rb_f_autoload_p, 1);
-    rb_global_variable(&ruby_wrapper);
-
-    rb_global_variable(&ruby_dln_librefs);
-    ruby_dln_librefs = rb_ary_new();
-}
-
-static void
-scope_dup(scope)
-    struct SCOPE *scope;
-{
-    ID *tbl;
-    VALUE *vars;
-
-    scope->flags |= SCOPE_DONT_RECYCLE;
-    if (scope->flags & SCOPE_MALLOC) return;
-
-    if (scope->local_tbl) {
-	tbl = scope->local_tbl;
-	vars = ALLOC_N(VALUE, tbl[0]+1);
-	*vars++ = scope->local_vars[-1];
-	MEMCPY(vars, scope->local_vars, VALUE, tbl[0]);
-	scope->local_vars = vars;
-	scope->flags |= SCOPE_MALLOC;
-    }
-}
-
-static void
-blk_mark(data)
-    struct BLOCK *data;
-{
-    while (data) {
-	rb_gc_mark_frame(&data->frame);
-	rb_gc_mark((VALUE)data->scope);
-	rb_gc_mark((VALUE)data->var);
-	rb_gc_mark((VALUE)data->body);
-	rb_gc_mark((VALUE)data->self);
-	rb_gc_mark((VALUE)data->dyna_vars);
-	rb_gc_mark((VALUE)data->cref);
-	rb_gc_mark(data->wrapper);
-	rb_gc_mark(data->block_obj);
-	data = data->prev;
-    }
-}
-
-static void
-frame_free(frame)
-    struct FRAME *frame;
-{
-    struct FRAME *tmp;
-
-    frame = frame->prev;
-    while (frame) {
-	tmp = frame;
-	frame = frame->prev;
-	free(tmp);
-    }
-}
-
-static void
-blk_free(data)
-    struct BLOCK *data;
-{
-    void *tmp;
-
-    while (data) {
-	frame_free(&data->frame);
-	tmp = data;
-	data = data->prev;
-	free(tmp);
-    }
-}
-
-static void
-frame_dup(frame)
-    struct FRAME *frame;
-{
-    struct FRAME *tmp;
-
-    for (;;) {
-	frame->tmp = 0;		/* should not preserve tmp */
-	if (!frame->prev) break;
-	tmp = ALLOC(struct FRAME);
-	*tmp = *frame->prev;
-	frame->prev = tmp;
-	frame = tmp;
-    }
-}
-
-
-static void
-blk_copy_prev(block)
-    struct BLOCK *block;
-{
-    struct BLOCK *tmp;
-    struct RVarmap* vars;
-
-    while (block->prev) {
-	tmp = ALLOC_N(struct BLOCK, 1);
-	MEMCPY(tmp, block->prev, struct BLOCK, 1);
-	scope_dup(tmp->scope);
-	frame_dup(&tmp->frame);
-
-	for (vars = tmp->dyna_vars; vars; vars = vars->next) {
-	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	    FL_SET(vars, DVAR_DONT_RECYCLE);
-	}
-
-	block->prev = tmp;
-	block = tmp;
-    }
-}
-
-
-static void
-blk_dup(dup, orig)
-    struct BLOCK *dup, *orig;
-{
-    MEMCPY(dup, orig, struct BLOCK, 1);
-    frame_dup(&dup->frame);
-
-    if (dup->iter) {
-	blk_copy_prev(dup);
-    }
-    else {
-	dup->prev = 0;
-    }
-}
-
-/*
- * MISSING: documentation
- */
-
-static VALUE
-proc_clone(self)
-    VALUE self;
-{
-    struct BLOCK *orig, *data;
-    VALUE bind;
-
-    Data_Get_Struct(self, struct BLOCK, orig);
-    bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
-    CLONESETUP(bind, self);
-    blk_dup(data, orig);
-
-    return bind;
-}
-
-/*
- * MISSING: documentation
- */
-
-static VALUE
-proc_dup(self)
-    VALUE self;
-{
-    struct BLOCK *orig, *data;
-    VALUE bind;
-
-    Data_Get_Struct(self, struct BLOCK, orig);
-    bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
-    blk_dup(data, orig);
-
-    return bind;
-}
-
-/*
- *  call-seq:
- *     binding -> a_binding
- *  
- *  Returns a +Binding+ object, describing the variable and
- *  method bindings at the point of call. This object can be used when
- *  calling +eval+ to execute the evaluated command in this
- *  environment. Also see the description of class +Binding+.
- *     
- *     def getBinding(param)
- *       return binding
- *     end
- *     b = getBinding("hello")
- *     eval("param", b)   #=> "hello"
- */
-
-static VALUE
-rb_f_binding(self)
-    VALUE self;
-{
-    struct BLOCK *data, *p;
-    struct RVarmap *vars;
-    VALUE bind;
-
-    PUSH_BLOCK(0,0);
-    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
-    *data = *ruby_block;
-
-    data->orig_thread = rb_thread_current();
-    data->wrapper = ruby_wrapper;
-    data->iter = rb_f_block_given_p();
-    frame_dup(&data->frame);
-    if (ruby_frame->prev) {
-	data->frame.last_func = ruby_frame->prev->last_func;
-	data->frame.last_class = ruby_frame->prev->last_class;
-	data->frame.orig_func = ruby_frame->prev->orig_func;
-    }
-
-    if (data->iter) {
-	blk_copy_prev(data);
-    }
-    else {
-	data->prev = 0;
-    }
-
-    for (p = data; p; p = p->prev) {
-	for (vars = p->dyna_vars; vars; vars = vars->next) {
-	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	    FL_SET(vars, DVAR_DONT_RECYCLE);
 	}
-    }
-    scope_dup(data->scope);
-    POP_BLOCK();
-
-    return bind;
-}
-
-#define PROC_TSHIFT (FL_USHIFT+1)
-#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
-#define PROC_TMAX   (PROC_TMASK >> PROC_TSHIFT)
-
-#define SAFE_LEVEL_MAX PROC_TMASK
-
-static void
-proc_save_safe_level(data)
-    VALUE data;
-{
-    int safe = ruby_safe_level;
-    if (safe > PROC_TMAX) safe = PROC_TMAX;
-    FL_SET(data, (safe << PROC_TSHIFT) & PROC_TMASK);
-}
-
-static int
-proc_get_safe_level(data)
-    VALUE data;
-{
-    return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT;
-}
-
-static void
-proc_set_safe_level(data)
-    VALUE data;
-{
-    ruby_safe_level = proc_get_safe_level(data);
-}
-
-static VALUE
-proc_alloc(klass, proc)
-    VALUE klass;
-    int proc;
-{
-    volatile VALUE block;
-    struct BLOCK *data, *p;
-    struct RVarmap *vars;
-
-    if (!rb_block_given_p() && !rb_f_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to create Proc object without a block");
-    }
-    if (proc && !rb_block_given_p()) {
-	rb_warn("tried to create Proc object without a block");
-    }
-
-    if (!proc && ruby_block->block_obj && CLASS_OF(ruby_block->block_obj) == klass) {
-	return ruby_block->block_obj;
-    }
-    block = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data);
-    *data = *ruby_block;
-
-    data->orig_thread = rb_thread_current();
-    data->wrapper = ruby_wrapper;
-    data->iter = data->prev?Qtrue:Qfalse;
-    data->block_obj = block;
-    frame_dup(&data->frame);
-    if (data->iter) {
-	blk_copy_prev(data);
-    }
-    else {
-	data->prev = 0;
-    }
-
-    for (p = data; p; p = p->prev) {
-	for (vars = p->dyna_vars; vars; vars = vars->next) {
-	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	    FL_SET(vars, DVAR_DONT_RECYCLE);
-	}
-    }
-    scope_dup(data->scope);
-    proc_save_safe_level(block);
-    if (proc) {
-	data->flags |= BLOCK_LAMBDA;
-    }
-    else {
-	ruby_block->block_obj = block;
-    }
-
-    return block;
-}
-
-/*
- *  call-seq:
- *     Proc.new {|...| block } => a_proc 
- *     Proc.new                => a_proc 
- *  
- *  Creates a new <code>Proc</code> object, bound to the current
- *  context. <code>Proc::new</code> may be called without a block only
- *  within a method with an attached block, in which case that block is
- *  converted to the <code>Proc</code> object.
- *     
- *     def proc_from
- *       Proc.new
- *     end
- *     proc = proc_from { "hello" }
- *     proc.call   #=> "hello"
- */
-
-static VALUE
-proc_s_new(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE block = proc_alloc(klass, Qfalse);
-
-    rb_obj_call_init(block, argc, argv);
-    return block;
-}
-
-VALUE
-rb_block_proc()
-{
-    return proc_alloc(rb_cProc, Qfalse);
-}
-
-VALUE
-rb_f_lambda()
-{
-    rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead");
-    return proc_alloc(rb_cProc, Qtrue);
-}
-
-/*
- * call-seq:
- *   proc   { |...| block }  => a_proc
- *   lambda { |...| block }  => a_proc
- *
- * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
- * check the number of parameters passed when called.
- */
-
-static VALUE
-proc_lambda()
-{
-    return proc_alloc(rb_cProc, Qtrue);
-}
-
-static int
-block_orphan(data)
-    struct BLOCK *data;
-{
-    if (data->scope->flags & SCOPE_NOSTACK) {
-	return 1;
-    }
-    if (data->orig_thread != rb_thread_current()) {
-	return 1;
+	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
     return 0;
 }
 
 static VALUE
-proc_invoke(proc, args, self, klass)
-    VALUE proc, args;		/* OK */
-    VALUE self, klass;
-{
-    struct BLOCK * volatile old_block;
-    struct BLOCK _block;
-    struct BLOCK *data;
-    volatile VALUE result = Qundef;
-    int state;
-    volatile int safe = ruby_safe_level;
-    volatile VALUE old_wrapper = ruby_wrapper;
-    volatile int pcall, avalue = Qtrue;
-    volatile VALUE tmp = args;
-
-    if (rb_block_given_p() && ruby_frame->last_func) {
-	if (klass != ruby_frame->last_class)
-	    klass = rb_obj_class(proc);
-	rb_warning("block for %s#%s is useless",
-		   rb_class2name(klass),
-		   rb_id2name(ruby_frame->last_func));
-    }
-
-    Data_Get_Struct(proc, struct BLOCK, data);
-    pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0;
-    if (!pcall && RARRAY(args)->len == 1) {
-	avalue = Qfalse;
-	args = RARRAY(args)->ptr[0];
-    }
-
-    PUSH_VARS();
-    ruby_wrapper = data->wrapper;
-    ruby_dyna_vars = data->dyna_vars;
-    /* PUSH BLOCK from data */
-    old_block = ruby_block;
-    _block = *data;
-    if (self != Qundef) _block.frame.self = self;
-    if (klass) _block.frame.last_class = klass;
-    _block.frame.argc = RARRAY(tmp)->len;
-    _block.frame.flags = ruby_frame->flags;
-    if (_block.frame.argc && DMETHOD_P()) {
-        NEWOBJ(scope, struct SCOPE);
-        OBJSETUP(scope, tmp, T_SCOPE);
-        scope->local_tbl = _block.scope->local_tbl;
-        scope->local_vars = _block.scope->local_vars;
-        scope->flags |= SCOPE_CLONE;
-        _block.scope = scope;
-    }
-    /* modify current frame */
-    ruby_block = &_block;
-    PUSH_ITER(ITER_CUR);
-    ruby_frame->iter = ITER_CUR;
-    PUSH_TAG(pcall ? PROT_LAMBDA : PROT_NONE);
-    state = EXEC_TAG();
-    if (state == 0) {
-	proc_set_safe_level(proc);
-	result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0, pcall, avalue);
-    }
-    else if (TAG_DST()) {
-	result = prot_tag->retval;
-    }
-    POP_TAG();
-    POP_ITER();
-    ruby_block = old_block;
-    ruby_wrapper = old_wrapper;
-    POP_VARS();
-    ruby_safe_level = safe;
-
-    switch (state) {
-      case 0:
-	break;
-      case TAG_RETRY:
-	proc_jump_error(TAG_RETRY, Qnil); /* xxx */
-	JUMP_TAG(state);
-	break;
-      case TAG_NEXT:
-      case TAG_BREAK:
-	if (!pcall && result != Qundef) {
-	    proc_jump_error(state, result);
-	}
-      case TAG_RETURN:
-	if (result != Qundef) {
-	    if (pcall) break;
-	    return_jump(result);
-	}
-      default:
-	JUMP_TAG(state);
-    }
-    return result;
-}
-
-/* CHECKME: are the argument checking semantics correct? */
-
-/*
- *  call-seq:
- *     prc.call(params,...)   => obj
- *     prc[params,...]        => obj
- *  
- *  Invokes the block, setting the block's parameters to the values in
- *  <i>params</i> using something close to method calling semantics.
- *  Generates a warning if multiple values are passed to a proc that
- *  expects just one (previously this silently converted the parameters
- *  to an array). 
- *
- *  For procs created using <code>Kernel.proc</code>, generates an 
- *  error if the wrong number of parameters
- *  are passed to a proc with multiple parameters. For procs created using
- *  <code>Proc.new</code>, extra parameters are silently discarded.
- *
- *  Returns the value of the last expression evaluated in the block. See
- *  also <code>Proc#yield</code>.
- *     
- *     a_proc = Proc.new {|a, *b| b.collect {|i| i*a }}
- *     a_proc.call(9, 1, 2, 3)   #=> [9, 18, 27]
- *     a_proc[9, 1, 2, 3]        #=> [9, 18, 27]
- *     a_proc = Proc.new {|a,b| a}
- *     a_proc.call(1,2,3)
- *     
- *  <em>produces:</em>
- *     
- *     prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError)
- *     	from prog.rb:4:in `call'
- *     	from prog.rb:5
- */
-
-static VALUE
-proc_call(proc, args)
-    VALUE proc, args;		/* OK */
-{
-    return proc_invoke(proc, args, Qundef, 0);
-}
-
-static VALUE bmcall _((VALUE, VALUE));
-static VALUE method_arity _((VALUE));
-
-/*
- *  call-seq:
- *     prc.arity -> fixnum
- *  
- *  Returns the number of arguments that would not be ignored. If the block
- *  is declared to take no arguments, returns 0. If the block is known
- *  to take exactly n arguments, returns n. If the block has optional
- *  arguments, return -n-1, where n is the number of mandatory
- *  arguments. A <code>proc</code> with no argument declarations
- *  is the same a block declaring <code>||</code> as its arguments.
- *     
- *     Proc.new {}.arity          #=>  0
- *     Proc.new {||}.arity        #=>  0
- *     Proc.new {|a|}.arity       #=>  1
- *     Proc.new {|a,b|}.arity     #=>  2
- *     Proc.new {|a,b,c|}.arity   #=>  3
- *     Proc.new {|*a|}.arity      #=> -1
- *     Proc.new {|a,*b|}.arity    #=> -2
- */
-
-static VALUE
-proc_arity(proc)
-    VALUE proc;
+get_thread_errinfo(rb_thread_t *th)
 {
-    struct BLOCK *data;
-    NODE *list;
-    int n;
-
-    Data_Get_Struct(proc, struct BLOCK, data);
-    if (data->var == 0) {
-	if (data->body && nd_type(data->body) == NODE_IFUNC &&
-	    data->body->nd_cfnc == bmcall) {
-	    return method_arity(data->body->nd_tval);
-	}
-	return INT2FIX(-1);
-    }
-    if (data->var == (NODE*)1) return INT2FIX(0);
-    if (data->var == (NODE*)2) return INT2FIX(0);
-    switch (nd_type(data->var)) {
-      default:
-	return INT2FIX(1);
-      case NODE_MASGN:
-	list = data->var->nd_head;
-	n = 0;
-	while (list) {
-	    n++;
-	    list = list->nd_next;
-	}
-	if (data->var->nd_args) return INT2FIX(-n-1);
-	return INT2FIX(n);
-    }
-}
-
-/*
- * call-seq:
- *   prc == other_proc   =>  true or false
- *
- * Return <code>true</code> if <i>prc</i> is the same object as
- * <i>other_proc</i>, or if they are both procs with the same body.
- */
-
-static VALUE
-proc_eq(self, other)
-    VALUE self, other;
-{
-    struct BLOCK *data, *data2;
-
-    if (self == other) return Qtrue;
-    if (TYPE(other) != T_DATA) return Qfalse;
-    if (RDATA(other)->dmark != (RUBY_DATA_FUNC)blk_mark) return Qfalse;
-    if (CLASS_OF(self) != CLASS_OF(other)) return Qfalse;
-    Data_Get_Struct(self, struct BLOCK, data);
-    Data_Get_Struct(other, struct BLOCK, data2);
-    if (data->body != data2->body) return Qfalse;
-    if (data->var != data2->var) return Qfalse;
-    if (data->scope != data2->scope) return Qfalse;
-    if (data->dyna_vars != data2->dyna_vars) return Qfalse;
-    if (data->flags != data2->flags) return Qfalse;
-
-    return Qtrue;
-}
-
-/*
- * call-seq:
- *   prc.to_s   => string
- *
- * Shows the unique identifier for this proc, along with
- * an indication of where the proc was defined.
- */
-
-static VALUE
-proc_to_s(self)
-    VALUE self;
-{
-    struct BLOCK *data;
-    NODE *node;
-    char *cname = rb_obj_classname(self);
-    const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
-    long len = strlen(cname)+6+w; /* 6:tags 16:addr */
-    VALUE str;
-
-    Data_Get_Struct(self, struct BLOCK, data);
-    if ((node = data->frame.node) || (node = data->body)) {
-	len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3;
-	str = rb_str_new(0, len);
-	snprintf(RSTRING(str)->ptr, len+1,
-		 "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
-		 node->nd_file, nd_line(node));
-    }
-    else {
-	str = rb_str_new(0, len);
-	snprintf(RSTRING(str)->ptr, len+1,
-		 "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
-    }
-    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
-    if (OBJ_TAINTED(self)) OBJ_TAINT(str);
-
-    return str;
-}
-
-/*
- *  call-seq:
- *     prc.to_proc -> prc
- *  
- *  Part of the protocol for converting objects to <code>Proc</code>
- *  objects. Instances of class <code>Proc</code> simply return
- *  themselves.
- */
-
-static VALUE
-proc_to_self(self)
-    VALUE self;
-{
-    return self;
-}
-
-/*
- *  call-seq:
- *     prc.binding    => binding
- *  
- *  Returns the binding associated with <i>prc</i>. Note that
- *  <code>Kernel#eval</code> accepts either a <code>Proc</code> or a
- *  <code>Binding</code> object as its second parameter.
- *     
- *     def fred(param)
- *       proc {}
- *     end
- *     
- *     b = fred(99)
- *     eval("param", b.binding)   #=> 99
- *     eval("param", b)           #=> 99
- */
-
-static VALUE
-proc_binding(proc)
-    VALUE proc;
-{
-    struct BLOCK *orig, *data;
-    VALUE bind;
-
-    Data_Get_Struct(proc, struct BLOCK, orig);
-    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
-    MEMCPY(data, orig, struct BLOCK, 1);
-    frame_dup(&data->frame);
-
-    if (data->iter) {
-	blk_copy_prev(data);
+    VALUE *ptr = errinfo_place(th);
+    if (ptr) {
+	return *ptr;
     }
     else {
-	data->prev = 0;
-    }
-
-    return bind;
-}
-
-static VALUE
-block_pass(self, node)
-    VALUE self;
-    NODE *node;
-{
-    VALUE proc = rb_eval(self, node->nd_body);	/* OK */
-    VALUE b;
-    struct BLOCK * volatile old_block;
-    struct BLOCK _block;
-    struct BLOCK *data;
-    volatile VALUE result = Qnil;
-    int state;
-    volatile int orphan;
-    volatile int safe = ruby_safe_level;
-
-    if (NIL_P(proc)) {
-	PUSH_ITER(ITER_NOT);
-	result = rb_eval(self, node->nd_iter);
-	POP_ITER();
-	return result;
-    }
-    if (!rb_obj_is_proc(proc)) {
-	b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
-	if (!rb_obj_is_proc(b)) {
-	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
-		     rb_obj_classname(proc));
-	}
-	proc = b;
-    }
-
-    if (ruby_safe_level >= 1 && OBJ_TAINTED(proc) &&
-	ruby_safe_level > proc_get_safe_level(proc)) {
-	rb_raise(rb_eSecurityError, "Insecure: tainted block value");
-    }
-
-    if (ruby_block && ruby_block->block_obj == proc) {
-	PUSH_ITER(ITER_PAS);
-	result = rb_eval(self, node->nd_iter);
-	POP_ITER();
-	return result;
-    }
-
-    Data_Get_Struct(proc, struct BLOCK, data);
-    orphan = block_orphan(data);
-
-    /* PUSH BLOCK from data */
-    old_block = ruby_block;
-    _block = *data;
-    _block.outer = ruby_block;
-    if (orphan) _block.uniq = block_unique++;
-    ruby_block = &_block;
-    PUSH_ITER(ITER_PRE);
-    if (ruby_frame->iter == ITER_NOT)
-	ruby_frame->iter = ITER_PRE;
-
-    PUSH_TAG(PROT_LOOP);
-    state = EXEC_TAG();
-    if (state == 0) {
-      retry:
-	proc_set_safe_level(proc);
-	if (safe > ruby_safe_level)
-	    ruby_safe_level = safe;
-	result = rb_eval(self, node->nd_iter);
-    }
-    else if (state == TAG_BREAK && TAG_DST()) {
-	result = prot_tag->retval;
-	state = 0;
-    }
-    else if (state == TAG_RETRY) {
-	state = 0;
-	goto retry;
-    }
-    POP_TAG();
-    POP_ITER();
-    ruby_block = old_block;
-    ruby_safe_level = safe;
-
-    switch (state) {/* escape from orphan block */
-      case 0:
-	break;
-      case TAG_RETURN:
-	if (orphan) {
-	    proc_jump_error(state, prot_tag->retval);
-	}
-      default:
-	JUMP_TAG(state);
-    }
-
-    return result;
-}
-
-struct METHOD {
-    VALUE klass, rklass;
-    VALUE recv;
-    ID id, oid;
-    int safe_level;
-    NODE *body;
-};
-
-static void
-bm_mark(data)
-    struct METHOD *data;
-{
-    rb_gc_mark(data->rklass);
-    rb_gc_mark(data->klass);
-    rb_gc_mark(data->recv);
-    rb_gc_mark((VALUE)data->body);
-}
-
-static VALUE
-mnew(klass, obj, id, mklass)
-    VALUE klass, obj, mklass;
-    ID id;
-{
-    VALUE method;
-    NODE *body;
-    int noex;
-    struct METHOD *data;
-    VALUE rklass = klass;
-    ID oid = id;
-
-  again:
-    if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
-	print_undef(rklass, oid);
-    }
-
-    if (nd_type(body) == NODE_ZSUPER) {
-	klass = RCLASS(klass)->super;
-	goto again;
+	return th->errinfo;
     }
-
-    while (rklass != klass &&
-	   (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
-	rklass = RCLASS(rklass)->super;
-    }
-    method = Data_Make_Struct(mklass, struct METHOD, bm_mark, free, data);
-    data->klass = klass;
-    data->recv = obj;
-    data->id = id;
-    data->body = body;
-    data->rklass = rklass;
-    data->oid = oid;
-    data->safe_level = NOEX_WITH_SAFE(noex);
-    OBJ_INFECT(method, klass);
-
-    return method;
-}
-
-
-/**********************************************************************
- *
- * Document-class : Method
- *
- *  Method objects are created by <code>Object#method</code>, and are
- *  associated with a particular object (not just with a class). They
- *  may be used to invoke the method within the object, and as a block
- *  associated with an iterator. They may also be unbound from one
- *  object (creating an <code>UnboundMethod</code>) and bound to
- *  another.
- *     
- *     class Thing
- *       def square(n)
- *         n*n
- *       end
- *     end
- *     thing = Thing.new
- *     meth  = thing.method(:square)
- *     
- *     meth.call(9)                 #=> 81
- *     [ 1, 2, 3 ].collect(&meth)   #=> [1, 4, 9]
- *     
- */
-
-/*
- * call-seq:
- *   meth == other_meth  => true or false
- *
- * Two method objects are equal if that are bound to the same
- * object and contain the same body.
- */
-
-
-static VALUE
-method_eq(method, other)
-    VALUE method, other;
-{
-    struct METHOD *m1, *m2;
-
-    if (TYPE(other) != T_DATA || RDATA(other)->dmark != (RUBY_DATA_FUNC)bm_mark)
-	return Qfalse;
-    if (CLASS_OF(method) != CLASS_OF(other))
-	return Qfalse;
-
-    Data_Get_Struct(method, struct METHOD, m1);
-    Data_Get_Struct(other, struct METHOD, m2);
-
-    if (m1->klass != m2->klass || m1->rklass != m2->rklass ||
-	m1->recv != m2->recv || m1->body != m2->body)
-	return Qfalse;
-
-    return Qtrue;
-}
-
-/*
- *  call-seq:
- *     meth.unbind    => unbound_method
- *  
- *  Dissociates <i>meth</i> from it's current receiver. The resulting
- *  <code>UnboundMethod</code> can subsequently be bound to a new object
- *  of the same class (see <code>UnboundMethod</code>).
- */
-
-static VALUE
-method_unbind(obj)
-    VALUE obj;
-{
-    VALUE method;
-    struct METHOD *orig, *data;
-
-    Data_Get_Struct(obj, struct METHOD, orig);
-    method = Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, data);
-    data->klass = orig->klass;
-    data->recv = Qundef;
-    data->id = orig->id;
-    data->body = orig->body;
-    data->rklass = orig->rklass;
-    data->oid = orig->oid;
-    OBJ_INFECT(method, obj);
-
-    return method;
-}
-
-/*
- *  call-seq:
- *     obj.method(sym)    => method
- *  
- *  Looks up the named method as a receiver in <i>obj</i>, returning a
- *  <code>Method</code> object (or raising <code>NameError</code>). The
- *  <code>Method</code> object acts as a closure in <i>obj</i>'s object
- *  instance, so instance variables and the value of <code>self</code>
- *  remain available.
- *     
- *     class Demo
- *       def initialize(n)
- *         @iv = n
- *       end
- *       def hello()
- *         "Hello, @iv = #{@iv}"
- *       end
- *     end
- *     
- *     k = Demo.new(99)
- *     m = k.method(:hello)
- *     m.call   #=> "Hello, @iv = 99"
- *     
- *     l = Demo.new('Fred')
- *     m = l.method("hello")
- *     m.call   #=> "Hello, @iv = Fred"
- */
-
-static VALUE
-rb_obj_method(obj, vid)
-    VALUE obj;
-    VALUE vid;
-{
-    return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod);
 }
 
-/*
- *  call-seq:
- *     mod.instance_method(symbol)   => unbound_method
- *  
- *  Returns an +UnboundMethod+ representing the given
- *  instance method in _mod_.
- *     
- *     class Interpreter
- *       def do_a() print "there, "; end
- *       def do_d() print "Hello ";  end
- *       def do_e() print "!\n";     end
- *       def do_v() print "Dave";    end
- *       Dispatcher = {
- *        ?a => instance_method(:do_a),
- *        ?d => instance_method(:do_d),
- *        ?e => instance_method(:do_e),
- *        ?v => instance_method(:do_v)
- *       }
- *       def interpret(string)
- *         string.each_byte {|b| Dispatcher[b].bind(self).call }
- *       end
- *     end
- *     
- *     
- *     interpreter = Interpreter.new
- *     interpreter.interpret('dave')
- *     
- *  <em>produces:</em>
- *     
- *     Hello there, Dave!
- */
-
 static VALUE
-rb_mod_method(mod, vid)
-    VALUE mod;
-    VALUE vid;
+get_errinfo(void)
 {
-    return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
+    return get_thread_errinfo(GET_THREAD());
 }
 
-/*
- * MISSING: documentation
- */
-
 static VALUE
-method_clone(self)
-    VALUE self;
-{
-    VALUE clone;
-    struct METHOD *orig, *data;
-
-    Data_Get_Struct(self, struct METHOD, orig);
-    clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
-    CLONESETUP(clone, self);
-    *data = *orig;
-
-    return clone;
-}
-
-/*
- *  call-seq:
- *     meth.call(args, ...)    => obj
- *     meth[args, ...]         => obj
- *  
- *  Invokes the <i>meth</i> with the specified arguments, returning the
- *  method's return value.
- *     
- *     m = 12.method("+")
- *     m.call(3)    #=> 15
- *     m.call(20)   #=> 32
- */
-
-static VALUE
-method_call(argc, argv, method)
-    int argc;
-    VALUE *argv;
-    VALUE method;
-{
-    VALUE result = Qnil;	/* OK */
-    struct METHOD *data;
-    int safe;
-
-    Data_Get_Struct(method, struct METHOD, data);
-    if (data->recv == Qundef) {
-	rb_raise(rb_eTypeError, "can't call unbound method; bind first");
-    }
-    if (OBJ_TAINTED(method)) {
-        safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
-    }
-    else {
-	safe = data->safe_level;
-    }
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
-    result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,safe);
-    POP_ITER();
-    return result;
-}
-
-/**********************************************************************
- *
- * Document-class: UnboundMethod
- *
- *  Ruby supports two forms of objectified methods. Class
- *  <code>Method</code> is used to represent methods that are associated
- *  with a particular object: these method objects are bound to that
- *  object. Bound method objects for an object can be created using
- *  <code>Object#method</code>.
- *     
- *  Ruby also supports unbound methods; methods objects that are not
- *  associated with a particular object. These can be created either by
- *  calling <code>Module#instance_method</code> or by calling
- *  <code>unbind</code> on a bound method object. The result of both of
- *  these is an <code>UnboundMethod</code> object.
- *     
- *  Unbound methods can only be called after they are bound to an
- *  object. That object must be be a kind_of? the method's original
- *  class.
- *     
- *     class Square
- *       def area
- *         @side * @side
- *       end
- *       def initialize(side)
- *         @side = side
- *       end
- *     end
- *     
- *     area_un = Square.instance_method(:area)
- *     
- *     s = Square.new(12)
- *     area = area_un.bind(s)
- *     area.call   #=> 144
- *     
- *  Unbound methods are a reference to the method at the time it was
- *  objectified: subsequent changes to the underlying class will not
- *  affect the unbound method.
- *     
- *     class Test
- *       def test
- *         :original
- *       end
- *     end
- *     um = Test.instance_method(:test)
- *     class Test
- *       def test
- *         :modified
- *       end
- *     end
- *     t = Test.new
- *     t.test            #=> :modified
- *     um.bind(t).call   #=> :original
- *     
- */
-
-/*
- *  call-seq:
- *     umeth.bind(obj) -> method
- *  
- *  Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class
- *  from which <i>umeth</i> was obtained,
- *  <code>obj.kind_of?(Klass)</code> must be true.
- *     
- *     class A
- *       def test
- *         puts "In test, class = #{self.class}"
- *       end
- *     end
- *     class B < A
- *     end
- *     class C < B
- *     end
- *     
- *     
- *     um = B.instance_method(:test)
- *     bm = um.bind(C.new)
- *     bm.call
- *     bm = um.bind(B.new)
- *     bm.call
- *     bm = um.bind(A.new)
- *     bm.call
- *     
- *  <em>produces:</em>
- *     
- *     In test, class = C
- *     In test, class = B
- *     prog.rb:16:in `bind': bind argument must be an instance of B (TypeError)
- *     	from prog.rb:16
- */
-
-static VALUE
-umethod_bind(method, recv)
-    VALUE method, recv;
-{
-    struct METHOD *data, *bound;
-    VALUE rklass = CLASS_OF(recv);
-
-    Data_Get_Struct(method, struct METHOD, data);
-    if (data->rklass != rklass) {
-	if (FL_TEST(data->rklass, FL_SINGLETON)) {
-	    rb_raise(rb_eTypeError, "singleton method bound for a different object");
-	}
-	if (TYPE(data->rklass) == T_MODULE) {
-	    st_table *m_tbl = RCLASS(data->rklass)->m_tbl;
-	    while (RCLASS(rklass)->m_tbl != m_tbl) {
-		rklass = RCLASS(rklass)->super;
-		if (!rklass) goto not_instace;
-	    }
-	}
-	else if (!rb_obj_is_kind_of(recv, data->rklass)) {
-	  not_instace:
-	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
-		     rb_class2name(data->rklass));
-	}
-    }
-
-    method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
-    *bound = *data;
-    bound->recv = recv;
-    bound->rklass = rklass;
-
-    return method;
-}
-
-/*
- *  call-seq:
- *     meth.arity    => fixnum
- *  
- *  Returns an indication of the number of arguments accepted by a
- *  method. Returns a nonnegative integer for methods that take a fixed
- *  number of arguments. For Ruby methods that take a variable number of
- *  arguments, returns -n-1, where n is the number of required
- *  arguments. For methods written in C, returns -1 if the call takes a
- *  variable number of arguments.
- *     
- *     class C
- *       def one;    end
- *       def two(a); end
- *       def three(*a);  end
- *       def four(a, b); end
- *       def five(a, b, *c);    end
- *       def six(a, b, *c, &d); end
- *     end
- *     c = C.new
- *     c.method(:one).arity     #=> 0
- *     c.method(:two).arity     #=> 1
- *     c.method(:three).arity   #=> -1
- *     c.method(:four).arity    #=> 2
- *     c.method(:five).arity    #=> -3
- *     c.method(:six).arity     #=> -3
- *     
- *     "cat".method(:size).arity      #=> 0
- *     "cat".method(:replace).arity   #=> 1
- *     "cat".method(:squeeze).arity   #=> -1
- *     "cat".method(:count).arity     #=> -1
- */
-
-static VALUE
-method_arity(method)
-    VALUE method;
-{
-    struct METHOD *data;
-    NODE *body;
-    int n;
-
-    Data_Get_Struct(method, struct METHOD, data);
-
-    body = data->body;
-    switch (nd_type(body)) {
-      case NODE_CFUNC:
-	if (body->nd_argc < 0) return INT2FIX(-1);
-	return INT2FIX(body->nd_argc);
-      case NODE_ZSUPER:
-	return INT2FIX(-1);
-      case NODE_ATTRSET:
-	return INT2FIX(1);
-      case NODE_IVAR:
-	return INT2FIX(0);
-      case NODE_BMETHOD:
-	return proc_arity(body->nd_cval);
-      case NODE_DMETHOD:
-	return method_arity(body->nd_cval);
-      case NODE_SCOPE:
-	body = body->nd_next;	/* skip NODE_SCOPE */
-	if (nd_type(body) == NODE_BLOCK)
-	    body = body->nd_head;
-	if (!body) return INT2FIX(0);
-	n = body->nd_cnt;
-	if (body->nd_opt || body->nd_rest)
-	    n = -n-1;
-	return INT2FIX(n);
-      default:
-	rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body));
-   }
-}
-
-/*
- *  call-seq:
- *   meth.to_s      =>  string
- *   meth.inspect   =>  string
- *
- *  Show the name of the underlying method.
- *
- *    "cat".method(:count).inspect   #=> "#<Method: String#count>"
- */
-
-static VALUE
-method_inspect(method)
-    VALUE method;
-{
-    struct METHOD *data;
-    VALUE str;
-    const char *s;
-    char *sharp = "#";
-
-    Data_Get_Struct(method, struct METHOD, data);
-    str = rb_str_buf_new2("#<");
-    s = rb_obj_classname(method);
-    rb_str_buf_cat2(str, s);
-    rb_str_buf_cat2(str, ": ");
-
-    if (FL_TEST(data->klass, FL_SINGLETON)) {
-	VALUE v = rb_iv_get(data->klass, "__attached__");
-
-	if (data->recv == Qundef) {
-	    rb_str_buf_append(str, rb_inspect(data->klass));
-	}
-	else if (data->recv == v) {
-	    rb_str_buf_append(str, rb_inspect(v));
-	    sharp = ".";
-	}
-	else {
-	    rb_str_buf_append(str, rb_inspect(data->recv));
-	    rb_str_buf_cat2(str, "(");
-	    rb_str_buf_append(str, rb_inspect(v));
-	    rb_str_buf_cat2(str, ")");
-	    sharp = ".";
-	}
-    }
-    else {
-	rb_str_buf_cat2(str, rb_class2name(data->rklass));
-	if (data->rklass != data->klass) {
-	    VALUE klass = data -> klass;
-	    if (TYPE(klass) == T_ICLASS) {
-		klass = RBASIC(klass)->klass;
-	    }
-	    rb_str_buf_cat2(str, "(");
-	    rb_str_buf_cat2(str, rb_class2name(klass));
-	    rb_str_buf_cat2(str, ")");
-	}
-    }
-    rb_str_buf_cat2(str, sharp);
-    rb_str_buf_cat2(str, rb_id2name(data->oid));
-    rb_str_buf_cat2(str, ">");
-
-    return str;
-}
-
-static VALUE
-mproc(method)
-    VALUE method;
-{
-    VALUE proc;
-
-    /* emulate ruby's method call */
-    PUSH_ITER(ITER_CUR);
-    PUSH_FRAME();
-    proc = rb_block_proc();
-    POP_FRAME();
-    POP_ITER();
-
-    return proc;
-}
-
-static VALUE
-bmcall(args, method)
-    VALUE args, method;
-{
-    volatile VALUE a;
-    VALUE ret;
-
-    a = svalue_to_avalue(args);
-    ret = method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
-    a = Qnil; /* prevent tail call */
-    return ret;
-}
-
-VALUE
-rb_proc_new(func, val)
-    VALUE (*func)(ANYARGS);	/* VALUE yieldarg[, VALUE procarg] */
-    VALUE val;
-{
-    struct BLOCK *data;
-    VALUE proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
-
-    Data_Get_Struct(proc, struct BLOCK, data);
-    data->body->nd_state = YIELD_FUNC_AVALUE;
-    return proc;
-}
-
-/*
- *  call-seq:
- *     meth.to_proc    => prc
- *  
- *  Returns a <code>Proc</code> object corresponding to this method.
- */
-
-static VALUE
-method_proc(method)
-    VALUE method;
-{
-    VALUE proc;
-    struct METHOD *mdata;
-    struct BLOCK *bdata;
-
-    proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, bmcall, method);
-    Data_Get_Struct(method, struct METHOD, mdata);
-    Data_Get_Struct(proc, struct BLOCK, bdata);
-    bdata->body->nd_file = mdata->body->nd_file;
-    nd_set_line(bdata->body, nd_line(mdata->body));
-    bdata->body->nd_state = YIELD_FUNC_SVALUE;
-
-    return proc;
-}
-
-static VALUE
-rb_obj_is_method(m)
-    VALUE m;
-{
-    if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-/*
- *  call-seq:
- *     define_method(symbol, method)     => new_method
- *     define_method(symbol) { block }   => proc
- *  
- *  Defines an instance method in the receiver. The _method_
- *  parameter can be a +Proc+ or +Method+ object.
- *  If a block is specified, it is used as the method body. This block
- *  is evaluated using <code>instance_eval</code>, a point that is
- *  tricky to demonstrate because <code>define_method</code> is private.
- *  (This is why we resort to the +send+ hack in this example.)
- *     
- *     class A
- *       def fred
- *         puts "In Fred"
- *       end
- *       def create_method(name, &block)
- *         self.class.send(:define_method, name, &block)
- *       end
- *       define_method(:wilma) { puts "Charge it!" }
- *     end
- *     class B < A
- *       define_method(:barney, instance_method(:fred))
- *     end
- *     a = B.new
- *     a.barney
- *     a.wilma
- *     a.create_method(:betty) { p self }
- *     a.betty
- *     
- *  <em>produces:</em>
- *     
- *     In Fred
- *     Charge it!
- *     #<B:0x401b39e8>
- */
-
-static VALUE
-rb_mod_define_method(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    ID id;
-    VALUE body;
-    NODE *node;
-    int noex;
-
-    if (argc == 1) {
-	id = rb_to_id(argv[0]);
-	body = proc_lambda();
-    }
-    else if (argc == 2) {
-	id = rb_to_id(argv[0]);
-	body = argv[1];
-	if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
-	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)",
-		     rb_obj_classname(body));
-	}
-    }
-    else {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
-    }
-    if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
-	node = NEW_DMETHOD(method_unbind(body));
-    }
-    else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) {
-	struct BLOCK *block;
-
-	body = proc_clone(body);
-	Data_Get_Struct(body, struct BLOCK, block);
-	block->frame.last_func = id;
-	block->frame.orig_func = id;
-	block->frame.last_class = mod;
-	node = NEW_BMETHOD(body);
-    }
-    else {
-	/* type error */
-	rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)");
-    }
-
-    noex = NOEX_PUBLIC;
-    if (ruby_cbase == mod) {
-	if (SCOPE_TEST(SCOPE_PRIVATE)) {
-	    noex = NOEX_PRIVATE;
-	}
-	else if (SCOPE_TEST(SCOPE_PROTECTED)) {
-	    noex = NOEX_PROTECTED;
-	}
-    }
-    rb_add_method(mod, id, node, noex);
-    return body;
-}
-
-/*
- *  <code>Proc</code> objects are blocks of code that have been bound to
- *  a set of local variables. Once bound, the code may be called in
- *  different contexts and still access those variables.
- *     
- *     def gen_times(factor)
- *       return Proc.new {|n| n*factor }
- *     end
- *     
- *     times3 = gen_times(3)
- *     times5 = gen_times(5)
- *     
- *     times3.call(12)               #=> 36
- *     times5.call(5)                #=> 25
- *     times3.call(times5.call(4))   #=> 60
- *     
- */
-
-void
-Init_Proc()
-{
-    rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError);
-    rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0);
-    rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
-
-    rb_global_variable(&exception_error);
-    exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
-
-    rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
-    rb_global_variable(&sysstack_error);
-    sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
-    OBJ_TAINT(sysstack_error);
-
-    rb_cProc = rb_define_class("Proc", rb_cObject);
-    rb_undef_alloc_func(rb_cProc);
-    rb_define_singleton_method(rb_cProc, "new", proc_s_new, -1);
-
-    rb_define_method(rb_cProc, "clone", proc_clone, 0);
-    rb_define_method(rb_cProc, "dup", proc_dup, 0);
-    rb_define_method(rb_cProc, "call", proc_call, -2);
-    rb_define_method(rb_cProc, "arity", proc_arity, 0);
-    rb_define_method(rb_cProc, "[]", proc_call, -2);
-    rb_define_method(rb_cProc, "==", proc_eq, 1);
-    rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
-    rb_define_method(rb_cProc, "to_proc", proc_to_self, 0);
-    rb_define_method(rb_cProc, "binding", proc_binding, 0);
-
-    rb_define_global_function("proc", proc_lambda, 0);
-    rb_define_global_function("lambda", proc_lambda, 0);
-
-    rb_cMethod = rb_define_class("Method", rb_cObject);
-    rb_undef_alloc_func(rb_cMethod);
-    rb_undef_method(CLASS_OF(rb_cMethod), "new");
-    rb_define_method(rb_cMethod, "==", method_eq, 1);
-    rb_define_method(rb_cMethod, "clone", method_clone, 0);
-    rb_define_method(rb_cMethod, "call", method_call, -1);
-    rb_define_method(rb_cMethod, "[]", method_call, -1);
-    rb_define_method(rb_cMethod, "arity", method_arity, 0);
-    rb_define_method(rb_cMethod, "inspect", method_inspect, 0);
-    rb_define_method(rb_cMethod, "to_s", method_inspect, 0);
-    rb_define_method(rb_cMethod, "to_proc", method_proc, 0);
-    rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
-    rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
-
-    rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
-    rb_undef_alloc_func(rb_cUnboundMethod);
-    rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new");
-    rb_define_method(rb_cUnboundMethod, "==", method_eq, 1);
-    rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
-    rb_define_method(rb_cUnboundMethod, "arity", method_arity, 0);
-    rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
-    rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
-    rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
-    rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
-}
-
-/*
- *  Objects of class <code>Binding</code> encapsulate the execution
- *  context at some particular place in the code and retain this context 
- *  for future use. The variables, methods, value of <code>self</code>,
- *  and possibly an iterator block that can be accessed in this context
- *  are all retained. Binding objects can be created using
- *  <code>Kernel#binding</code>, and are made available to the callback
- *  of <code>Kernel#set_trace_func</code>.
- *     
- *  These binding objects can be passed as the second argument of the
- *  <code>Kernel#eval</code> method, establishing an environment for the
- *  evaluation.
- *     
- *     class Demo
- *       def initialize(n)
- *         @secret = n
- *       end
- *       def getBinding
- *         return binding()
- *       end
- *     end
- *     
- *     k1 = Demo.new(99)
- *     b1 = k1.getBinding
- *     k2 = Demo.new(-3)
- *     b2 = k2.getBinding
- *     
- *     eval("@secret", b1)   #=> 99
- *     eval("@secret", b2)   #=> -3
- *     eval("@secret")       #=> nil
- *     
- *  Binding objects have no class-specific methods.
- *     
- */
-
-void 
-Init_Binding() 
-{
-    rb_cBinding = rb_define_class("Binding", rb_cObject);
-    rb_undef_alloc_func(rb_cBinding);
-    rb_undef_method(CLASS_OF(rb_cBinding), "new");
-    rb_define_method(rb_cBinding, "clone", proc_clone, 0);
-    rb_define_method(rb_cBinding, "dup", proc_dup, 0);
-    rb_define_global_function("binding", rb_f_binding, 0);
-}
-
-/* Windows SEH refers data on the stack. */
-#undef SAVE_WIN32_EXCEPTION_LIST
-#if defined _WIN32 || defined __CYGWIN__
-#if defined __CYGWIN__
-typedef unsigned long DWORD;
-#endif
-
-static inline DWORD
-win32_get_exception_list()
-{
-    DWORD p;
-# if defined _MSC_VER
-#   ifdef _M_IX86
-#   define SAVE_WIN32_EXCEPTION_LIST
-#   if _MSC_VER >= 1310
-      /* warning: unsafe assignment to fs:0 ... this is ok */
-#     pragma warning(disable: 4733)
-#   endif
-    __asm mov eax, fs:[0];
-    __asm mov p, eax;
-#   endif
-# elif defined __GNUC__
-#   ifdef __i386__
-#   define SAVE_WIN32_EXCEPTION_LIST
-    __asm__("movl %%fs:0,%0" : "=r"(p));
-#   endif
-# elif defined __BORLANDC__
-#   define SAVE_WIN32_EXCEPTION_LIST
-    __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */
-    p = _EAX;
-# endif
-    return p;
-}
-
-static inline void
-win32_set_exception_list(p)
-    DWORD p;
-{
-# if defined _MSC_VER
-#   ifdef _M_IX86
-    __asm mov eax, p;
-    __asm mov fs:[0], eax;
-#   endif
-# elif defined __GNUC__
-#   ifdef __i386__
-    __asm__("movl %0,%%fs:0" :: "r"(p));
-#   endif
-# elif defined __BORLANDC__
-    _EAX = p;
-    __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */
-# endif
-}
-
-#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE
-# error unsupported platform
-#endif
-#endif
-
-int rb_thread_pending = 0;
-
-VALUE rb_cThread;
-
-extern VALUE rb_last_status;
-
-#define WAIT_FD		(1<<0)
-#define WAIT_SELECT	(1<<1)
-#define WAIT_TIME	(1<<2)
-#define WAIT_JOIN	(1<<3)
-#define WAIT_PID	(1<<4)
-
-/* +infty, for this purpose */
-#define DELAY_INFTY 1E30
-
-#if !defined HAVE_PAUSE
-# if defined _WIN32 && !defined __CYGWIN__
-#  define pause() Sleep(INFINITE)
-# else
-#  define pause() sleep(0x7fffffff)
-# endif
-#endif
-
-#define THREAD_RAISED 0x200	 /* temporary flag */
-#define THREAD_TERMINATING 0x400 /* persistent flag */
-#define THREAD_NO_ENSURE 0x800   /* persistent flag */
-#define THREAD_FLAGS_MASK  0xc00 /* mask for persistent flags */
-
-#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
-#define END_FOREACH_FROM(f,x) } while (x != f)
-
-#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x)
-#define END_FOREACH(x)    END_FOREACH_FROM(curr_thread,x)
-
-struct thread_status_t {
-    NODE *node;
-
-    int tracing;
-    VALUE errinfo;
-    VALUE last_status;
-    VALUE last_line;
-    VALUE last_match;
-
-    int safe;
-
-    enum rb_thread_status status;
-    int wait_for;
-    int fd;
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-    int select_value;
-    double delay;
-    rb_thread_t join;
-};
-
-#define THREAD_COPY_STATUS(src, dst) (void)(	\
-    (dst)->node = (src)->node,			\
-						\
-    (dst)->tracing = (src)->tracing,		\
-    (dst)->errinfo = (src)->errinfo,		\
-    (dst)->last_status = (src)->last_status,	\
-    (dst)->last_line = (src)->last_line,	\
-    (dst)->last_match = (src)->last_match,	\
-						\
-    (dst)->safe = (src)->safe,			\
-						\
-    (dst)->status = (src)->status,		\
-    (dst)->wait_for = (src)->wait_for,		\
-    (dst)->fd = (src)->fd,			\
-    (dst)->readfds = (src)->readfds,		\
-    (dst)->writefds = (src)->writefds,		\
-    (dst)->exceptfds = (src)->exceptfds,	\
-    (dst)->select_value = (src)->select_value,	\
-    (dst)->delay = (src)->delay,		\
-    (dst)->join = (src)->join,			\
-    0)
-
-static int
-thread_set_raised()
-{
-    if (curr_thread->flags & THREAD_RAISED) return 1;
-    curr_thread->flags |= THREAD_RAISED;
-    return 0;
-}
-
-static int
-thread_reset_raised()
-{
-    if (!(curr_thread->flags & THREAD_RAISED)) return 0;
-    curr_thread->flags &= ~THREAD_RAISED;
-    return 1;
-}
-
-static int
-thread_no_ensure()
-{
-    return ((curr_thread->flags & THREAD_NO_ENSURE) == THREAD_NO_ENSURE);
-}
-
-static void rb_thread_ready _((rb_thread_t));
-
-static VALUE run_trap_eval _((VALUE));
-static VALUE
-run_trap_eval(arg)
-    VALUE arg;
-{
-    VALUE *p = (VALUE *)arg;
-    return rb_eval_cmd(p[0], p[1], (int)p[2]);
-}
-
-static VALUE
-rb_trap_eval(cmd, sig, safe)
-    VALUE cmd;
-    int sig, safe;
-{
-    int state;
-    VALUE val = Qnil;		/* OK */
-    volatile struct thread_status_t save;
-    VALUE arg[3];
-
-    arg[0] = cmd;
-    arg[1] = rb_ary_new3(1, INT2FIX(sig));
-    arg[2] = (VALUE)safe;
-    THREAD_COPY_STATUS(curr_thread, &save);
-    rb_thread_ready(curr_thread);
-    PUSH_ITER(ITER_NOT);
-    val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
-    POP_ITER();
-    THREAD_COPY_STATUS(&save, curr_thread);
-
-    if (state) {
-	rb_trap_immediate = 0;
-	rb_thread_ready(curr_thread);
-	JUMP_TAG(state);
-    }
-
-    if (curr_thread->status == THREAD_STOPPED) {
-	rb_thread_schedule();
-    }
-    errno = EINTR;
-
-    return val;
-}
-
-static const char *
-thread_status_name(status)
-    enum rb_thread_status status;
-{
-    switch (status) {
-      case THREAD_RUNNABLE:
-	return "run";
-      case THREAD_STOPPED:
-	return "sleep";
-      case THREAD_TO_KILL:
-	return "aborting";
-      case THREAD_KILLED:
-	return "dead";
-      default:
-	return "unknown";
-    }
-}
-
-/* $SAFE accessor */
-void
-rb_set_safe_level(level)
-    int level;
-{
-    if (level > ruby_safe_level) {
-	if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
-	ruby_safe_level = level;
-	curr_thread->safe = level;
-    }
-}
-
-static VALUE
-safe_getter()
-{
-    return INT2NUM(ruby_safe_level);
-}
-
-static void
-safe_setter(val)
-    VALUE val;
-{
-    int level = NUM2INT(val);
-
-    if (level < ruby_safe_level) {
-	rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
-		 ruby_safe_level, level);
-    }
-    if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
-    ruby_safe_level = level;
-    curr_thread->safe = level;
-}
-
-/* Return the current time as a floating-point number */
-static double
-timeofday()
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
-}
-
-#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
-#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
-static void
-thread_mark(th)
-    rb_thread_t th;
-{
-    struct FRAME *frame;
-    struct BLOCK *block;
-
-    rb_gc_mark(th->result);
-    rb_gc_mark(th->thread);
-    if (th->join) rb_gc_mark(th->join->thread);
-
-    rb_gc_mark(th->klass);
-    rb_gc_mark(th->wrapper);
-    rb_gc_mark((VALUE)th->cref);
-
-    rb_gc_mark((VALUE)th->scope);
-    rb_gc_mark((VALUE)th->dyna_vars);
-    rb_gc_mark(th->errinfo);
-    rb_gc_mark(th->last_status);
-    rb_gc_mark(th->last_line);
-    rb_gc_mark(th->last_match);
-    rb_mark_tbl(th->locals);
-    rb_gc_mark(th->thgroup);
-    rb_gc_mark_maybe(th->sandbox);
-
-    /* mark data in copied stack */
-    if (th == curr_thread) return;
-    if (th->status == THREAD_KILLED) return;
-    if (th->stk_len == 0) return;  /* stack not active, no need to mark. */
-    if (th->stk_ptr) {
-	rb_gc_mark_locations(th->stk_ptr, th->stk_ptr+th->stk_len);
-#if defined(THINK_C) || defined(__human68k__)
-	rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
-#endif
-#ifdef __ia64
-	if (th->bstr_ptr) {
-            rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
-	}
-#endif
-    }
-    frame = th->frame;
-    while (frame && frame != top_frame) {
-	frame = ADJ(frame);
-	rb_gc_mark_frame(frame);
-	if (frame->tmp) {
-	    struct FRAME *tmp = frame->tmp;
-
-	    while (tmp && tmp != top_frame) {
-		tmp = ADJ(tmp);
-		rb_gc_mark_frame(tmp);
-		tmp = tmp->prev;
-	    }
-	}
-	frame = frame->prev;
-    }
-    block = th->block;
-    while (block) {
-	block = ADJ(block);
-	rb_gc_mark_frame(&block->frame);
-	block = block->prev;
-    }
-}
-
-static int
-mark_loading_thread(key, value, lev)
-    ID key;
-    VALUE value;
-    int lev;
-{
-    rb_gc_mark(((rb_thread_t)value)->thread);
-    return ST_CONTINUE;
-}
-
-void
-rb_gc_mark_threads()
-{
-    rb_thread_t th;
-
-    /* static global mark */
-    rb_gc_mark((VALUE)ruby_cref);
-
-    if (!curr_thread) return;
-    rb_gc_mark(main_thread->thread);
-    rb_gc_mark(curr_thread->thread);
-    FOREACH_THREAD_FROM(main_thread, th) {
-	switch (th->status) {
-	  case THREAD_TO_KILL:
-	  case THREAD_RUNNABLE:
-	    break;
-	  case THREAD_STOPPED:
-	    if (th->wait_for) break;
-	  default:
-	    continue;
-	}
-	rb_gc_mark(th->thread);
-    } END_FOREACH_FROM(main_thread, th);
-    if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0);
-}
-
-void
-rb_gc_abort_threads()
-{
-    rb_thread_t th;
-
-    if (!main_thread)
-        return;
-
-    FOREACH_THREAD_FROM(main_thread, th) {
-	if (FL_TEST(th->thread, FL_MARK)) continue;
-	if (th->status == THREAD_STOPPED) {
-	    th->status = THREAD_TO_KILL;
-	    rb_gc_mark(th->thread);
-	}
-    } END_FOREACH_FROM(main_thread, th);
-}
-
-static void
-thread_free(th)
-    rb_thread_t th;
+errinfo_getter(ID id)
 {
-    if (th->stk_ptr) free(th->stk_ptr);
-    th->stk_ptr = 0;
-#ifdef __ia64
-    if (th->bstr_ptr) free(th->bstr_ptr);
-    th->bstr_ptr = 0;
-#endif
-    if (th->locals) st_free_table(th->locals);
-    if (th->status != THREAD_KILLED) {
-	if (th->prev) th->prev->next = th->next;
-	if (th->next) th->next->prev = th->prev;
-    }
-    if (th != main_thread) free(th);
+    return get_errinfo();
 }
 
-static rb_thread_t
-rb_thread_check(data)
-    VALUE data;
-{
-    if (TYPE(data) != T_DATA || RDATA(data)->dmark != (RUBY_DATA_FUNC)thread_mark) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
-		 rb_obj_classname(data));
-    }
-    return (rb_thread_t)RDATA(data)->data;
-}
-
-static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
-
-static VALUE th_raise_exception;
-static NODE *th_raise_node;
-static VALUE th_cmd;
-static int   th_sig, th_safe;
-
-#define RESTORE_NORMAL		1
-#define RESTORE_FATAL		2
-#define RESTORE_INTERRUPT	3
-#define RESTORE_TRAP		4
-#define RESTORE_RAISE		5
-#define RESTORE_SIGNAL		6
-#define RESTORE_EXIT		7
-
-extern VALUE *rb_gc_stack_start;
-#ifdef __ia64
-extern VALUE *rb_gc_register_stack_start;
-#endif
-
-static void
-rb_thread_save_context(th)
-    rb_thread_t th;
-{
-    VALUE *pos;
-    int len;
-    static VALUE tval;
-
-    len = ruby_stack_length(&pos);
-    th->stk_len = 0;
-    th->stk_pos = pos;
-    if (len > th->stk_max) {
-	VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
-	if (!ptr) rb_memerror();
-	th->stk_ptr = ptr;
-	th->stk_max = len;
-    }
-    th->stk_len = len;
-    FLUSH_REGISTER_WINDOWS;
-    MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len);
-#ifdef __ia64
-    th->bstr_pos = rb_gc_register_stack_start;
-    len = (VALUE*)rb_ia64_bsp() - th->bstr_pos;
-    th->bstr_len = 0;
-    if (len > th->bstr_max) {
-        VALUE *ptr = realloc(th->bstr_ptr, sizeof(VALUE) * len);
-        if (!ptr) rb_memerror();
-        th->bstr_ptr = ptr;
-        th->bstr_max = len;
-    }
-    th->bstr_len = len;
-    rb_ia64_flushrs();
-    MEMCPY(th->bstr_ptr, th->bstr_pos, VALUE, th->bstr_len);
-#endif
-#ifdef SAVE_WIN32_EXCEPTION_LIST
-    th->win32_exception_list = win32_get_exception_list();
-#endif
-
-    th->frame = ruby_frame;
-    th->scope = ruby_scope;
-    ruby_scope->flags |= SCOPE_DONT_RECYCLE;
-    th->klass = ruby_class;
-    th->wrapper = ruby_wrapper;
-    th->cref = ruby_cref;
-    th->dyna_vars = ruby_dyna_vars;
-    th->block = ruby_block;
-    th->flags &= THREAD_FLAGS_MASK;
-    th->flags |= (rb_trap_immediate<<8) | scope_vmode;
-    th->iter = ruby_iter;
-    th->tag = prot_tag;
-    th->tracing = tracing;
-    th->errinfo = ruby_errinfo;
-    th->last_status = rb_last_status;
-    tval = rb_lastline_get();
-    rb_lastline_set(th->last_line);
-    th->last_line = tval;
-    tval = rb_backref_get();
-    rb_backref_set(th->last_match);
-    th->last_match = tval;
-    th->safe = ruby_safe_level;
-
-    th->node = ruby_current_node;
-    if (ruby_sandbox_save != NULL)
-    {
-      ruby_sandbox_save(th);
-    }
-}
-
-static int
-rb_thread_switch(n)
-    int n;
-{
-    rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
-    switch (n) {
-      case 0:
-	return 0;
-      case RESTORE_FATAL:
-	JUMP_TAG(TAG_FATAL);
-	break;
-      case RESTORE_INTERRUPT:
-	rb_interrupt();
-	break;
-      case RESTORE_TRAP:
-	rb_trap_eval(th_cmd, th_sig, th_safe);
-	break;
-      case RESTORE_RAISE:
-	ruby_frame->last_func = 0;
-	ruby_current_node = th_raise_node;
-	rb_raise_jump(th_raise_exception);
-	break;
-      case RESTORE_SIGNAL:
-	rb_thread_signal_raise(th_sig);
-	break;
-      case RESTORE_EXIT:
-	ruby_errinfo = th_raise_exception;
-	ruby_current_node = th_raise_node;
-	if (!rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    terminate_process(EXIT_FAILURE, ruby_errinfo);
-	}
-	rb_exc_raise(th_raise_exception);
-	break;
-      case RESTORE_NORMAL:
-      default:
-	break;
-    }
-    return 1;
-}
-
-#define THREAD_SAVE_CONTEXT(th) \
-    (rb_thread_switch((FLUSH_REGISTER_WINDOWS, ruby_setjmp(rb_thread_save_context(th), (th)->context))))
-
-NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
-NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int,void*)));
-NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int, VALUE *)));
-
-static void
-rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
-{
-    static rb_thread_t tmp;
-    static int ex;
-    static VALUE tval;
-
-    rb_trap_immediate = 0;	/* inhibit interrupts from here */
-    if (ruby_sandbox_restore != NULL)
-    {
-      ruby_sandbox_restore(th);
-    }
-    ruby_frame = th->frame;
-    ruby_scope = th->scope;
-    ruby_class = th->klass;
-    ruby_wrapper = th->wrapper;
-    ruby_cref = th->cref;
-    ruby_dyna_vars = th->dyna_vars;
-    ruby_block = th->block;
-    scope_vmode = th->flags&SCOPE_MASK;
-    ruby_iter = th->iter;
-    prot_tag = th->tag;
-    tracing = th->tracing;
-    ruby_errinfo = th->errinfo;
-    rb_last_status = th->last_status;
-    ruby_safe_level = th->safe;
-
-    ruby_current_node = th->node;
-
-#ifdef SAVE_WIN32_EXCEPTION_LIST
-    win32_set_exception_list(th->win32_exception_list);
-#endif
-    tmp = th;
-    ex = exit;
-    FLUSH_REGISTER_WINDOWS;
-    MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len);
-#ifdef __ia64
-    MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len);
-#endif
-
-    tval = rb_lastline_get();
-    rb_lastline_set(tmp->last_line);
-    tmp->last_line = tval;
-    tval = rb_backref_get();
-    rb_backref_set(tmp->last_match);
-    tmp->last_match = tval;
-
-    ruby_longjmp(tmp->context, ex);
-}
-
-#ifdef __ia64
-#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
-#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
-static volatile int C(a), C(b), C(c), C(d), C(e);
-static volatile int C(f), C(g), C(h), C(i), C(j);
-static volatile int C(k), C(l), C(m), C(n), C(o);
-static volatile int C(p), C(q), C(r), C(s), C(t);
-int rb_dummy_false = 0;
-NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, void *, VALUE *)));
-static void
-register_stack_extend(rb_thread_t th, int exit, void *vp, VALUE *curr_bsp)
-{
-    if (rb_dummy_false) {
-        /* use registers as much as possible */
-        E(a) = E(b) = E(c) = E(d) = E(e) =
-        E(f) = E(g) = E(h) = E(i) = E(j) =
-        E(k) = E(l) = E(m) = E(n) = E(o) =
-        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
-        E(a) = E(b) = E(c) = E(d) = E(e) =
-        E(f) = E(g) = E(h) = E(i) = E(j) =
-        E(k) = E(l) = E(m) = E(n) = E(o) =
-        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
-    }
-    if (curr_bsp < th->bstr_pos+th->bstr_len) {
-        register_stack_extend(th, exit, &exit, (VALUE*)rb_ia64_bsp());
-    }
-    rb_thread_restore_context_0(th, exit, &exit);
-}
-#undef C
-#undef E
-#endif
-
-# if defined(_MSC_VER) && _MSC_VER >= 1300
-__declspec(noinline) static void stack_extend(rb_thread_t, int, VALUE*);
-# endif
+#if 0
 static void
-stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame)
+errinfo_setter(VALUE val, ID id, VALUE *var)
 {
-#define STACK_PAD_SIZE 1024
-    VALUE space[STACK_PAD_SIZE];
-
-#if STACK_GROW_DIRECTION < 0
-    if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
-#elif STACK_GROW_DIRECTION > 0
-    if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
-#else
-    if (addr_in_prev_frame < rb_gc_stack_start) {
-        /* Stack grows downward */
-        if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
+    if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
+	rb_raise(rb_eTypeError, "assigning non-exception to $!");
     }
     else {
-        /* Stack grows upward */
-        if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
-    }
-#endif
-#ifdef __ia64
-    register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp());
-#else
-    rb_thread_restore_context_0(th, exit, space);
-#endif
-}
-
-static void
-rb_thread_restore_context(th, exit)
-    rb_thread_t th;
-    int exit;
-{
-    VALUE v;
-    if (!th->stk_ptr) rb_bug("unsaved context");
-    stack_extend(th, exit, &v);
-}
-
-static void
-rb_thread_ready(th)
-    rb_thread_t th;
-{
-    th->wait_for = 0;
-    if (th->status != THREAD_TO_KILL) {
-	th->status = THREAD_RUNNABLE;
-    }
-}
-
-static void
-rb_thread_die(th)
-    rb_thread_t th;
-{
-    th->thgroup = 0;
-    th->status = THREAD_KILLED;
-    if (th->stk_ptr) free(th->stk_ptr);
-    th->stk_ptr = 0;
-}
-
-static void
-rb_thread_remove(th)
-    rb_thread_t th;
-{
-    if (th->status == THREAD_KILLED) return;
-
-    rb_thread_ready(th);
-    rb_thread_die(th);
-    th->prev->next = th->next;
-    th->next->prev = th->prev;
-}
-
-static int
-rb_thread_dead(th)
-    rb_thread_t th;
-{
-    return th->status == THREAD_KILLED;
-}
-
-void
-rb_thread_fd_close(fd)
-    int fd;
-{
-    rb_thread_t th;
-
-    FOREACH_THREAD(th) {
-	if (((th->wait_for & WAIT_FD) && fd == th->fd) ||
-	    ((th->wait_for & WAIT_SELECT) && (fd < th->fd) &&
-	     (FD_ISSET(fd, &th->readfds) ||
-	      FD_ISSET(fd, &th->writefds) ||
-	      FD_ISSET(fd, &th->exceptfds)))) {
-	    VALUE exc = rb_exc_new2(rb_eIOError, "stream closed");
-	    rb_thread_raise(1, &exc, th);
-	}
-    }
-    END_FOREACH(th);
-}
-
-NORETURN(static void rb_thread_main_jump _((VALUE, int)));
-static void
-rb_thread_main_jump(err, tag)
-    VALUE err;
-    int tag;
-{
-    curr_thread = main_thread;
-    th_raise_exception = err;
-    th_raise_node = ruby_current_node;
-    rb_thread_restore_context(main_thread, tag);
-}
-
-NORETURN(static void rb_thread_deadlock _((void)));
-static void
-rb_thread_deadlock()
-{
-    char msg[21+SIZEOF_LONG*2];
-    VALUE e;
-
-    sprintf(msg, "Thread(0x%lx): deadlock", curr_thread->thread);
-    e = rb_exc_new2(rb_eFatal, msg);
-    if (curr_thread == main_thread) {
-	rb_exc_raise(e);
-    }
-    rb_thread_main_jump(e, RESTORE_RAISE);
-}
-
-static void
-copy_fds(dst, src, max)
-    fd_set *dst, *src;
-    int max;
-{
-    int n = 0;
-    int i;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, src)) {
-	    n = i;
-	    FD_SET(i, dst);
-	}
-    }
-}
-
-static int
-match_fds(dst, src, max)
-    fd_set *dst, *src;
-    int max;
-{
-    int i;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, src) && FD_ISSET(i, dst)) {
-	    return Qtrue;
-	}
-    }
-    return Qfalse;
-}
-
-static int
-intersect_fds(src, dst, max)
-    fd_set *src, *dst;
-    int max;
-{
-    int i, n = 0;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, dst)) {
-	    if (FD_ISSET(i, src)) {
-		/* Wake up only one thread per fd. */
-		FD_CLR(i, src);
-		n++;
-	    }
-	    else {
-		FD_CLR(i, dst);
-	    }
-	}
-    }
-    return n;
-}
-
-static int
-find_bad_fds(dst, src, max)
-    fd_set *dst, *src;
-    int max;
-{
-    int i, test = Qfalse;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, src) && !FD_ISSET(i, dst)) {
-	    FD_CLR(i, src);
-	    test = Qtrue;
-	}
-    }
-    return test;
-}
-
-void
-rb_thread_schedule()
-{
-    rb_thread_t next;		/* OK */
-    rb_thread_t th;
-    rb_thread_t curr;
-    int found = 0;
-
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-    struct timeval delay_tv, *delay_ptr;
-    double delay, now;	/* OK */
-    int n, max;
-    int need_select = 0;
-    int select_timeout = 0;
-
-#ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
-	rb_bug("cross-thread violation on rb_thread_schedule()");
-    }
-#endif
-    rb_thread_pending = 0;
-    if (curr_thread == curr_thread->next
-	&& curr_thread->status == THREAD_RUNNABLE)
-	return;
-
-    next = 0;
-    curr = curr_thread;		/* starting thread */
-
-    while (curr->status == THREAD_KILLED) {
-	curr = curr->prev;
-    }
-
-  again:
-    max = -1;
-    FD_ZERO(&readfds);
-    FD_ZERO(&writefds);
-    FD_ZERO(&exceptfds);
-    delay = DELAY_INFTY;
-    now = -1.0;
-
-    FOREACH_THREAD_FROM(curr, th) {
-	if (!found && th->status <= THREAD_RUNNABLE) {
-	    found = 1;
-	}
-	if (th->status != THREAD_STOPPED) continue;
-	if (th->wait_for & WAIT_JOIN) {
-	    if (rb_thread_dead(th->join)) {
-		th->status = THREAD_RUNNABLE;
-		found = 1;
-	    }
-	}
-	if (th->wait_for & WAIT_FD) {
-	    FD_SET(th->fd, &readfds);
-	    if (max < th->fd) max = th->fd;
-	    need_select = 1;
-	}
-	if (th->wait_for & WAIT_SELECT) {
-	    copy_fds(&readfds, &th->readfds, th->fd);
-	    copy_fds(&writefds, &th->writefds, th->fd);
-	    copy_fds(&exceptfds, &th->exceptfds, th->fd);
-	    if (max < th->fd) max = th->fd;
-	    need_select = 1;
-	    if (th->wait_for & WAIT_TIME) {
-		select_timeout = 1;
-	    }
-	    th->select_value = 0;
-	}
-	if (th->wait_for & WAIT_TIME) {
-	    double th_delay;
-
-	    if (now < 0.0) now = timeofday();
-	    th_delay = th->delay - now;
-	    if (th_delay <= 0.0) {
-		th->status = THREAD_RUNNABLE;
-		found = 1;
-	    }
-	    else if (th_delay < delay) {
-		delay = th_delay;
-		need_select = 1;
-	    }
-	    else if (th->delay == DELAY_INFTY) {
-		need_select = 1;
-	    }
-	}
-    }
-    END_FOREACH_FROM(curr, th);
-
-    /* Do the select if needed */
-    if (need_select) {
-	/* Convert delay to a timeval */
-	/* If a thread is runnable, just poll */
-	if (found) {
-	    delay_tv.tv_sec = 0;
-	    delay_tv.tv_usec = 0;
-	    delay_ptr = &delay_tv;
-	}
-	else if (delay == DELAY_INFTY) {
-	    delay_ptr = 0;
+	VALUE *ptr = errinfo_place(GET_THREAD());
+	if (ptr) {
+	    *ptr = val;
 	}
 	else {
-	    delay_tv.tv_sec = delay;
-	    delay_tv.tv_usec = (delay - (double)delay_tv.tv_sec)*1e6;
-	    delay_ptr = &delay_tv;
-	}
-
-	n = select(max+1, &readfds, &writefds, &exceptfds, delay_ptr);
-	if (n < 0) {
-	    int e = errno;
-
-	    if (rb_trap_pending) rb_trap_exec();
-	    if (e == EINTR) goto again;
-#ifdef ERESTART
-	    if (e == ERESTART) goto again;
-#endif
-	    FOREACH_THREAD_FROM(curr, th) {
-		if (th->wait_for & WAIT_SELECT) {
-		    int v = 0;
-
-		    v |= find_bad_fds(&readfds, &th->readfds, th->fd);
-		    v |= find_bad_fds(&writefds, &th->writefds, th->fd);
-		    v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd);
-		    if (v) {
-			th->select_value = n;
-			n = max;
-		    }
-		}
-	    }
-	    END_FOREACH_FROM(curr, th);
-	}
- 	if (select_timeout && n == 0) {
- 	    if (now < 0.0) now = timeofday();
- 	    FOREACH_THREAD_FROM(curr, th) {
- 		if (((th->wait_for&(WAIT_SELECT|WAIT_TIME)) == (WAIT_SELECT|WAIT_TIME)) &&
-		    th->delay <= now) {
- 		    th->status = THREAD_RUNNABLE;
- 		    th->wait_for = 0;
- 		    th->select_value = 0;
- 		    found = 1;
-		    intersect_fds(&readfds, &th->readfds, max);
-		    intersect_fds(&writefds, &th->writefds, max);
-		    intersect_fds(&exceptfds, &th->exceptfds, max);
-		}
-	    }
-	    END_FOREACH_FROM(curr, th);
-	}
-	if (n > 0) {
-	    now = -1.0;
-	    /* Some descriptors are ready.
-	       Make the corresponding threads runnable. */
-	    FOREACH_THREAD_FROM(curr, th) {
-		if ((th->wait_for&WAIT_FD) && FD_ISSET(th->fd, &readfds)) {
-		    /* Wake up only one thread per fd. */
-		    FD_CLR(th->fd, &readfds);
-		    th->status = THREAD_RUNNABLE;
-		    th->fd = 0;
-		    th->wait_for = 0;
-		    found = 1;
-		}
-		if ((th->wait_for&WAIT_SELECT) &&
-		    (match_fds(&readfds, &th->readfds, max) ||
-		     match_fds(&writefds, &th->writefds, max) ||
-		     match_fds(&exceptfds, &th->exceptfds, max))) {
-		    /* Wake up only one thread per fd. */
-		    th->status = THREAD_RUNNABLE;
-		    th->wait_for = 0;
-		    n = intersect_fds(&readfds, &th->readfds, max) +
-			intersect_fds(&writefds, &th->writefds, max) +
-			intersect_fds(&exceptfds, &th->exceptfds, max);
-		    th->select_value = n;
-		    found = 1;
-		}
-	    }
-	    END_FOREACH_FROM(curr, th);
-	}
-	/* The delays for some of the threads should have expired.
-	   Go through the loop once more, to check the delays. */
-	if (!found && delay != DELAY_INFTY)
-	    goto again;
-    }
-
-    FOREACH_THREAD_FROM(curr, th) {
-	if (th->status == THREAD_TO_KILL) {
-	    next = th;
-	    break;
-	}
-	if (th->status == THREAD_RUNNABLE && th->stk_ptr) {
-	    if (!next || next->priority < th->priority)
-	       next = th;
-	}
-    }
-    END_FOREACH_FROM(curr, th);
-
-    if (!next) {
-	/* raise fatal error to main thread */
-	curr_thread->node = ruby_current_node;
-	if (curr->next == curr) {
-	    TRAP_BEG;
-	    pause();
-	    TRAP_END;
-	}
-	FOREACH_THREAD_FROM(curr, th) {
-	    warn_printf("deadlock 0x%lx: %s:",
-			th->thread, thread_status_name(th->status));
-	    if (th->wait_for & WAIT_FD) warn_printf("F(%d)", th->fd);
-	    if (th->wait_for & WAIT_SELECT) warn_printf("S");
-	    if (th->wait_for & WAIT_TIME) warn_printf("T(%f)", th->delay);
-	    if (th->wait_for & WAIT_JOIN)
-		warn_printf("J(0x%lx)", th->join ? th->join->thread : 0);
-	    if (th->wait_for & WAIT_PID) warn_printf("P");
-	    if (!th->wait_for) warn_printf("-");
-	    warn_printf(" %s - %s:%d\n",
-			th==main_thread ? "(main)" : "",
-			th->node->nd_file, nd_line(th->node));
-	}
-	END_FOREACH_FROM(curr, th);
-	next = main_thread;
-	rb_thread_ready(next);
-	next->status = THREAD_TO_KILL;
-	if (!rb_thread_dead(curr_thread)) {
-	    rb_thread_save_context(curr_thread);
-	}
-	rb_thread_deadlock();
-    }
-    next->wait_for = 0;
-    if (next->status == THREAD_RUNNABLE && next == curr_thread) {
-	return;
-    }
-
-    /* context switch */
-    if (curr == curr_thread) {
-	if (THREAD_SAVE_CONTEXT(curr)) {
-	    return;
-	}
-    }
-
-    curr_thread = next;
-    if (next->status == THREAD_TO_KILL) {
-	if (!(next->flags & THREAD_TERMINATING)) {
-	    next->flags |= THREAD_TERMINATING;
-	    /* terminate; execute ensure-clause if any */
-	    rb_thread_restore_context(next, RESTORE_FATAL);
+	    rb_raise(rb_eRuntimeError, "errinfo_setter: not in rescue clause.");
 	}
     }
-    rb_thread_restore_context(next, RESTORE_NORMAL);
 }
-
-void
-rb_thread_wait_fd(fd)
-    int fd;
-{
-    if (rb_thread_critical) return;
-    if (ruby_in_compile) return;
-    if (curr_thread == curr_thread->next) return;
-    if (curr_thread->status == THREAD_TO_KILL) return;
-
-    curr_thread->status = THREAD_STOPPED;
-    curr_thread->fd = fd;
-    curr_thread->wait_for = WAIT_FD;
-    rb_thread_schedule();
-}
-
-int
-rb_thread_fd_writable(fd)
-    int fd;
-{
-    if (rb_thread_critical) return Qtrue;
-    if (curr_thread == curr_thread->next) return Qtrue;
-    if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
-    if (curr_thread->status == THREAD_KILLED) return Qtrue;
-
-    curr_thread->status = THREAD_STOPPED;
-    FD_ZERO(&curr_thread->readfds);
-    FD_ZERO(&curr_thread->writefds);
-    FD_SET(fd, &curr_thread->writefds);
-    FD_ZERO(&curr_thread->exceptfds);
-    curr_thread->fd = fd+1;
-    curr_thread->wait_for = WAIT_SELECT;
-    rb_thread_schedule();
-    return Qfalse;
-}
-
-void
-rb_thread_wait_for(time)
-    struct timeval time;
-{
-    double date;
-
-    if (rb_thread_critical ||
-	curr_thread == curr_thread->next ||
-	curr_thread->status == THREAD_TO_KILL) {
-	int n;
-	int thr_critical = rb_thread_critical;
-#ifndef linux
-	double d, limit;
-	limit = timeofday()+(double)time.tv_sec+(double)time.tv_usec*1e-6;
-#endif
-	for (;;) {
-	    rb_thread_critical = Qtrue;
-	    TRAP_BEG;
-	    n = select(0, 0, 0, 0, &time);
-	    rb_thread_critical = thr_critical;
-	    TRAP_END;
-	    if (n == 0) return;
-	    if (n < 0) {
-		switch (errno) {
-		  case EINTR:
-#ifdef ERESTART
-		  case ERESTART:
-#endif
-		    break;
-		  default:
-		    rb_sys_fail("sleep");
-		}
-	    }
-#ifndef linux
-	    d = limit - timeofday();
-
-	    time.tv_sec = (int)d;
-	    time.tv_usec = (int)((d - (int)d)*1e6);
-	    if (time.tv_usec < 0) {
-		time.tv_usec += (long)1e6;
-		time.tv_sec -= 1;
-	    }
-	    if (time.tv_sec < 0) return;
-#endif
-	}
-    }
-
-    date = timeofday() + (double)time.tv_sec + (double)time.tv_usec*1e-6;
-    curr_thread->status = THREAD_STOPPED;
-    curr_thread->delay = date;
-    curr_thread->wait_for = WAIT_TIME;
-    rb_thread_schedule();
-}
-
-void rb_thread_sleep_forever _((void));
-
-int
-rb_thread_alone()
-{
-    return curr_thread == curr_thread->next;
-}
-
-int
-rb_thread_select(max, read, write, except, timeout)
-    int max;
-    fd_set *read, *write, *except;
-    struct timeval *timeout;
-{
-#ifndef linux
-    double limit;
-#endif
-    int n;
-
-    if (!read && !write && !except) {
-	if (!timeout) {
-	    rb_thread_sleep_forever();
-	    return 0;
-	}
-	rb_thread_wait_for(*timeout);
-	return 0;
-    }
-
-#ifndef linux
-    if (timeout) {
-	limit = timeofday()+
-	    (double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
-    }
-#endif
-
-    if (rb_thread_critical ||
-	curr_thread == curr_thread->next ||
-	curr_thread->status == THREAD_TO_KILL) {
-#ifndef linux
-	struct timeval tv, *tvp = timeout;
-
-	if (timeout) {
-	    tv = *timeout;
-	    tvp = &tv;
-	}
-#else
-	struct timeval *const tvp = timeout;
-#endif
-	for (;;) {
-	    TRAP_BEG;
-	    n = select(max, read, write, except, tvp);
-	    TRAP_END;
-	    if (n < 0) {
-		switch (errno) {
-		  case EINTR:
-#ifdef ERESTART
-		  case ERESTART:
-#endif
-#ifndef linux
-		    if (timeout) {
-			double d = limit - timeofday();
-
-			tv.tv_sec = (unsigned int)d;
-			tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
-			if (tv.tv_sec < 0)  tv.tv_sec = 0;
-			if (tv.tv_usec < 0) tv.tv_usec = 0;
-		    }
 #endif
-		    continue;
-		  default:
-		    break;
-		}
-	    }
-	    return n;
-	}
-    }
-
-    curr_thread->status = THREAD_STOPPED;
-    if (read) curr_thread->readfds = *read;
-    else FD_ZERO(&curr_thread->readfds);
-    if (write) curr_thread->writefds = *write;
-    else FD_ZERO(&curr_thread->writefds);
-    if (except) curr_thread->exceptfds = *except;
-    else FD_ZERO(&curr_thread->exceptfds);
-    curr_thread->fd = max;
-    curr_thread->wait_for = WAIT_SELECT;
-    if (timeout) {
-	curr_thread->delay = timeofday() +
-	    (double)timeout->tv_sec + (double)timeout->tv_usec*1e-6;
-	curr_thread->wait_for |= WAIT_TIME;
-    }
-    rb_thread_schedule();
-    if (read) *read = curr_thread->readfds;
-    if (write) *write = curr_thread->writefds;
-    if (except) *except = curr_thread->exceptfds;
-    return curr_thread->select_value;
-}
-
-static int rb_thread_join _((rb_thread_t, double));
-
-static int
-rb_thread_join(th, limit)
-    rb_thread_t th;
-    double limit;
-{
-    enum rb_thread_status last_status = THREAD_RUNNABLE;
-
-    if (rb_thread_critical) rb_thread_deadlock();
-    if (!rb_thread_dead(th)) {
-	if (th == curr_thread)
-	    rb_raise(rb_eThreadError, "thread 0x%lx tried to join itself",
-		     th->thread);
-	if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
-	    rb_raise(rb_eThreadError, "Thread#join: deadlock 0x%lx - mutual join(0x%lx)",
-		     curr_thread->thread, th->thread);
-	if (curr_thread->status == THREAD_TO_KILL)
-	    last_status = THREAD_TO_KILL;
-	if (limit == 0) return Qfalse;
-	curr_thread->status = THREAD_STOPPED;
-	curr_thread->join = th;
-	curr_thread->wait_for = WAIT_JOIN;
-	curr_thread->delay = timeofday() + limit;
-	if (limit < DELAY_INFTY) curr_thread->wait_for |= WAIT_TIME;
-	rb_thread_schedule();
-	curr_thread->status = last_status;
-	if (!rb_thread_dead(th)) return Qfalse;
-    }
-
-    if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) {
-	VALUE oldbt = get_backtrace(th->errinfo);
-	VALUE errat = make_backtrace();
-	VALUE errinfo = rb_obj_dup(th->errinfo);
-
-	if (TYPE(oldbt) == T_ARRAY && RARRAY(oldbt)->len > 0) {
-	    rb_ary_unshift(errat, rb_ary_entry(oldbt, 0));
-	}
-	set_backtrace(errinfo, errat);
-	rb_exc_raise(errinfo);
-    }
-
-    return Qtrue;
-}
-
-
-/*
- *  call-seq:
- *     thr.join          => thr
- *     thr.join(limit)   => thr
- *  
- *  The calling thread will suspend execution and run <i>thr</i>. Does not
- *  return until <i>thr</i> exits or until <i>limit</i> seconds have passed. If
- *  the time limit expires, <code>nil</code> will be returned, otherwise
- *  <i>thr</i> is returned.
- *     
- *  Any threads not joined will be killed when the main program exits.  If
- *  <i>thr</i> had previously raised an exception and the
- *  <code>abort_on_exception</code> and <code>$DEBUG</code> flags are not set
- *  (so the exception has not yet been processed) it will be processed at this
- *  time.
- *     
- *     a = Thread.new { print "a"; sleep(10); print "b"; print "c" }
- *     x = Thread.new { print "x"; Thread.pass; print "y"; print "z" }
- *     x.join # Let x thread finish, a will be killed on exit.
- *     
- *  <em>produces:</em>
- *     
- *     axyz
- *     
- *  The following example illustrates the <i>limit</i> parameter.
- *     
- *     y = Thread.new { 4.times { sleep 0.1; puts 'tick... ' }}
- *     puts "Waiting" until y.join(0.15)
- *     
- *  <em>produces:</em>
- *     
- *     tick...
- *     Waiting
- *     tick...
- *     Waitingtick...
- *     
- *     
- *     tick...
- */
-
-static VALUE
-rb_thread_join_m(argc, argv, thread)
-    int argc;
-    VALUE *argv;
-    VALUE thread;
-{
-    VALUE limit;
-    double delay = DELAY_INFTY;
-    rb_thread_t th = rb_thread_check(thread);
-
-    rb_scan_args(argc, argv, "01", &limit);
-    if (!NIL_P(limit)) delay = rb_num2dbl(limit);
-    if (!rb_thread_join(th, delay))
-	return Qnil;
-    return thread;
-}
-
-
-/*
- *  call-seq:
- *     Thread.current   => thread
- *  
- *  Returns the currently executing thread.
- *     
- *     Thread.current   #=> #<Thread:0x401bdf4c run>
- */
-
-VALUE
-rb_thread_current()
-{
-    return curr_thread->thread;
-}
-
-
-/*
- *  call-seq:
- *     Thread.main   => thread
- *  
- *  Returns the main thread for the process.
- *     
- *     Thread.main   #=> #<Thread:0x401bdf4c run>
- */
-
-VALUE
-rb_thread_main()
-{
-    return main_thread->thread;
-}
-
-
-/*
- *  call-seq:
- *     Thread.list   => array
- *  
- *  Returns an array of <code>Thread</code> objects for all threads that are
- *  either runnable or stopped.
- *     
- *     Thread.new { sleep(200) }
- *     Thread.new { 1000000.times {|i| i*i } }
- *     Thread.new { Thread.stop }
- *     Thread.list.each {|t| p t}
- *     
- *  <em>produces:</em>
- *     
- *     #<Thread:0x401b3e84 sleep>
- *     #<Thread:0x401b3f38 run>
- *     #<Thread:0x401b3fb0 sleep>
- *     #<Thread:0x401bdf4c run>
- */
-
-VALUE
-rb_thread_list()
-{
-    rb_thread_t th;
-    VALUE ary = rb_ary_new();
-
-    FOREACH_THREAD(th) {
-	switch (th->status) {
-	  case THREAD_RUNNABLE:
-	  case THREAD_STOPPED:
-	  case THREAD_TO_KILL:
-	    rb_ary_push(ary, th->thread);
-	  default:
-	    break;
-	}
-    }
-    END_FOREACH(th);
-
-    return ary;
-}
-
-
-/*
- *  call-seq:
- *     thr.wakeup   => thr
- *  
- *  Marks <i>thr</i> as eligible for scheduling (it may still remain blocked on
- *  I/O, however). Does not invoke the scheduler (see <code>Thread#run</code>).
- *     
- *     c = Thread.new { Thread.stop; puts "hey!" }
- *     c.wakeup
- *     
- *  <em>produces:</em>
- *     
- *     hey!
- */
-
-VALUE
-rb_thread_wakeup(thread)
-    VALUE thread;
-{
-    if (!RTEST(rb_thread_wakeup_alive(thread)))
-	rb_raise(rb_eThreadError, "killed thread");
-    return thread;
-}
-
-VALUE
-rb_thread_wakeup_alive(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (th->status == THREAD_KILLED)
-	return Qnil;
-    rb_thread_ready(th);
-
-    return thread;
-}
-
-
-/*
- *  call-seq:
- *     thr.run   => thr
- *  
- *  Wakes up <i>thr</i>, making it eligible for scheduling. If not in a critical
- *  section, then invokes the scheduler.
- *     
- *     a = Thread.new { puts "a"; Thread.stop; puts "c" }
- *     Thread.pass
- *     puts "Got here"
- *     a.run
- *     a.join
- *     
- *  <em>produces:</em>
- *     
- *     a
- *     Got here
- *     c
- */
-
-VALUE
-rb_thread_run(thread)
-    VALUE thread;
-{
-    rb_thread_wakeup(thread);
-    if (!rb_thread_critical) rb_thread_schedule();
-
-    return thread;
-}
-
-
-static void
-rb_kill_thread(th, flags)
-    rb_thread_t th;
-    int flags;
-{
-    if (th != curr_thread && th->safe < 4) {
-	rb_secure(4);
-    }
-    if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED)
-	return;
-    if (th == th->next || th == main_thread) rb_exit(EXIT_SUCCESS);
-
-    rb_thread_ready(th);
-    th->flags |= flags;
-    th->status = THREAD_TO_KILL;
-    if (!rb_thread_critical) rb_thread_schedule();
-}
-
-
-/*
- *  call-seq:
- *     thr.exit        => thr
- *     thr.kill        => thr
- *     thr.terminate   => thr
- *  
- *  Terminates <i>thr</i> and schedules another thread to be run, returning
- *  the terminated <code>Thread</code>.  If this is the main thread, or the
- *  last thread, exits the process.
- */
-
-VALUE
-rb_thread_kill(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    rb_kill_thread(th, 0);
-    return thread;
-}
-
-
-/*
- *  call-seq:
- *     thr.exit!        => thr
- *     thr.kill!        => thr
- *     thr.terminate!   => thr
- *  
- *  Terminates <i>thr</i> without calling ensure clauses and schedules
- *  another thread to be run, returning the terminated <code>Thread</code>.
- *  If this is the main thread, or the last thread, exits the process.
- *
- *  See <code>Thread#exit</code> for the safer version.
- */
-
-static VALUE
-rb_thread_kill_bang(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-    rb_kill_thread(th, THREAD_NO_ENSURE);
-    return thread;
-}
-
-/*
- *  call-seq:
- *     Thread.kill(thread)   => thread
- *  
- *  Causes the given <em>thread</em> to exit (see <code>Thread::exit</code>).
- *     
- *     count = 0
- *     a = Thread.new { loop { count += 1 } }
- *     sleep(0.1)       #=> 0
- *     Thread.kill(a)   #=> #<Thread:0x401b3d30 dead>
- *     count            #=> 93947
- *     a.alive?         #=> false
- */
-
-static VALUE
-rb_thread_s_kill(obj, th)
-    VALUE obj, th;
-{
-    return rb_thread_kill(th);
-}
-
-
-/*
- *  call-seq:
- *     Thread.exit   => thread
- *  
- *  Terminates the currently running thread and schedules another thread to be
- *  run. If this thread is already marked to be killed, <code>exit</code>
- *  returns the <code>Thread</code>. If this is the main thread, or the last
- *  thread, exit the process.
- */
-
-static VALUE
-rb_thread_exit()
-{
-    return rb_thread_kill(curr_thread->thread);
-}
-
-
-/*
- *  call-seq:
- *     Thread.pass   => nil
- *  
- *  Invokes the thread scheduler to pass execution to another thread.
- *     
- *     a = Thread.new { print "a"; Thread.pass;
- *                      print "b"; Thread.pass;
- *                      print "c" }
- *     b = Thread.new { print "x"; Thread.pass;
- *                      print "y"; Thread.pass;
- *                      print "z" }
- *     a.join
- *     b.join
- *     
- *  <em>produces:</em>
- *     
- *     axbycz
- */
-
-static VALUE
-rb_thread_pass()
-{
-    rb_thread_schedule();
-    return Qnil;
-}
-
-
-/*
- *  call-seq:
- *     Thread.stop   => nil
- *  
- *  Stops execution of the current thread, putting it into a ``sleep'' state,
- *  and schedules execution of another thread. Resets the ``critical'' condition
- *  to <code>false</code>.
- *     
- *     a = Thread.new { print "a"; Thread.stop; print "c" }
- *     Thread.pass
- *     print "b"
- *     a.run
- *     a.join
- *     
- *  <em>produces:</em>
- *     
- *     abc
- */
-
-VALUE
-rb_thread_stop()
-{
-    enum rb_thread_status last_status = THREAD_RUNNABLE;
-
-    rb_thread_critical = 0;
-    if (curr_thread == curr_thread->next) {
-	rb_raise(rb_eThreadError, "stopping only thread\n\tnote: use sleep to stop forever");
-    }
-    if (curr_thread->status == THREAD_TO_KILL)
-	last_status = THREAD_TO_KILL;
-    curr_thread->status = THREAD_STOPPED;
-    rb_thread_schedule();
-    curr_thread->status = last_status;
-
-    return Qnil;
-}
-
-struct timeval rb_time_timeval();
-
-void
-rb_thread_polling()
-{
-    if (curr_thread != curr_thread->next) {
-	curr_thread->status = THREAD_STOPPED;
-	curr_thread->delay = timeofday() + (double)0.06;
-	curr_thread->wait_for = WAIT_TIME;
-	rb_thread_schedule();
-    }
-}
-
-void
-rb_thread_sleep(sec)
-    int sec;
-{
-    if (curr_thread == curr_thread->next) {
-	TRAP_BEG;
-	sleep(sec);
-	TRAP_END;
-	return;
-    }
-    rb_thread_wait_for(rb_time_timeval(INT2FIX(sec)));
-}
-
-void
-rb_thread_sleep_forever()
-{
-    int thr_critical = rb_thread_critical;
-    if (curr_thread == curr_thread->next ||
-	curr_thread->status == THREAD_TO_KILL) {
-	rb_thread_critical = Qtrue;
-	TRAP_BEG;
-	pause();
-	rb_thread_critical = thr_critical;
-	TRAP_END;
-	return;
-    }
-
-    curr_thread->delay = DELAY_INFTY;
-    curr_thread->wait_for = WAIT_TIME;
-    curr_thread->status = THREAD_STOPPED;
-    rb_thread_schedule();
-}
-
-
-/*
- *  call-seq:
- *     thr.priority   => integer
- *
- *  Returns the priority of <i>thr</i>. Default is inherited from the
- *  current thread which creating the new thread, or zero for the
- *  initial main thread; higher-priority threads will run before
- *  lower-priority threads.
- *
- *     Thread.current.priority   #=> 0
- */
-
-static VALUE
-rb_thread_priority(thread)
-    VALUE thread;
-{
-    return INT2NUM(rb_thread_check(thread)->priority);
-}
-
-
-/*
- *  call-seq:
- *     thr.priority= integer   => thr
- *
- *  Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads
- *  will run before lower-priority threads.
- *
- *     count1 = count2 = 0
- *     a = Thread.new do
- *           loop { count1 += 1 }
- *         end
- *     a.priority = -1
- *     
- *     b = Thread.new do
- *           loop { count2 += 1 }
- *         end
- *     b.priority = -2
- *     sleep 1   #=> 1
- *     Thread.critical = 1
- *     count1    #=> 622504
- *     count2    #=> 5832
- */
-
-static VALUE
-rb_thread_priority_set(thread, prio)
-    VALUE thread, prio;
-{
-    rb_thread_t th;
-
-    rb_secure(4);
-    th = rb_thread_check(thread);
-
-    th->priority = NUM2INT(prio);
-    rb_thread_schedule();
-    return prio;
-}
-
-
-/*
- *  call-seq:
- *     thr.safe_level   => integer
- *  
- *  Returns the safe level in effect for <i>thr</i>. Setting thread-local safe
- *  levels can help when implementing sandboxes which run insecure code.
- *     
- *     thr = Thread.new { $SAFE = 3; sleep }
- *     Thread.current.safe_level   #=> 0
- *     thr.safe_level              #=> 3
- */
-
-static VALUE
-rb_thread_safe_level(thread)
-    VALUE thread;
-{
-    rb_thread_t th;
-
-    th = rb_thread_check(thread);
-    if (th == curr_thread) {
-	return INT2NUM(ruby_safe_level);
-    }
-    return INT2NUM(th->safe);
-}
-
-static int ruby_thread_abort;
-static VALUE thgroup_default;
-
-
-/*
- *  call-seq:
- *     Thread.abort_on_exception   => true or false
- *  
- *  Returns the status of the global ``abort on exception'' condition.  The
- *  default is <code>false</code>. When set to <code>true</code>, or if the
- *  global <code>$DEBUG</code> flag is <code>true</code> (perhaps because the
- *  command line option <code>-d</code> was specified) all threads will abort
- *  (the process will <code>exit(0)</code>) if an exception is raised in any
- *  thread. See also <code>Thread::abort_on_exception=</code>.
- */
-
-static VALUE
-rb_thread_s_abort_exc()
-{
-    return ruby_thread_abort?Qtrue:Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     Thread.abort_on_exception= boolean   => true or false
- *  
- *  When set to <code>true</code>, all threads will abort if an exception is
- *  raised. Returns the new state.
- *     
- *     Thread.abort_on_exception = true
- *     t1 = Thread.new do
- *       puts  "In new thread"
- *       raise "Exception from thread"
- *     end
- *     sleep(1)
- *     puts "not reached"
- *     
- *  <em>produces:</em>
- *     
- *     In new thread
- *     prog.rb:4: Exception from thread (RuntimeError)
- *     	from prog.rb:2:in `initialize'
- *     	from prog.rb:2:in `new'
- *     	from prog.rb:2
- */
-
-static VALUE
-rb_thread_s_abort_exc_set(self, val)
-    VALUE self, val;
-{
-    rb_secure(4);
-    ruby_thread_abort = RTEST(val);
-    return val;
-}
-
-
-/*
- *  call-seq:
- *     thr.abort_on_exception   => true or false
- *  
- *  Returns the status of the thread-local ``abort on exception'' condition for
- *  <i>thr</i>. The default is <code>false</code>. See also
- *  <code>Thread::abort_on_exception=</code>.
- */
-
-static VALUE
-rb_thread_abort_exc(thread)
-    VALUE thread;
-{
-    return rb_thread_check(thread)->abort?Qtrue:Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     thr.abort_on_exception= boolean   => true or false
- *  
- *  When set to <code>true</code>, causes all threads (including the main
- *  program) to abort if an exception is raised in <i>thr</i>. The process will
- *  effectively <code>exit(0)</code>.
- */
-
-static VALUE
-rb_thread_abort_exc_set(thread, val)
-    VALUE thread, val;
-{
-    rb_secure(4);
-    rb_thread_check(thread)->abort = RTEST(val);
-    return val;
-}
-
-
-enum rb_thread_status
-rb_thread_status(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-    return th->status;
-}
-
-
-/*
- *  call-seq:
- *     thr.group   => thgrp or nil
- *  
- *  Returns the <code>ThreadGroup</code> which contains <i>thr</i>, or nil if
- *  the thread is not a member of any group.
- *     
- *     Thread.main.group   #=> #<ThreadGroup:0x4029d914>
- */
 
 VALUE
-rb_thread_group(thread)
-    VALUE thread;
-{
-    VALUE group = rb_thread_check(thread)->thgroup;
-    if (!group) {
-	group = Qnil;
-    }
-    return group;
-}
-
-#ifdef __ia64
-# define IA64_INIT(x) x
-#else
-# define IA64_INIT(x)
-#endif
-
-#define THREAD_ALLOC(th) do {\
-    th = ALLOC(struct rb_thread);\
-\
-    th->next = 0;\
-    th->prev = 0;\
-\
-    th->status = THREAD_RUNNABLE;\
-    th->result = 0;\
-    th->flags = 0;\
-\
-    th->stk_ptr = 0;\
-    th->stk_len = 0;\
-    th->stk_max = 0;\
-    th->wait_for = 0;\
-    IA64_INIT(th->bstr_ptr = 0);\
-    IA64_INIT(th->bstr_len = 0);\
-    IA64_INIT(th->bstr_max = 0);\
-    FD_ZERO(&th->readfds);\
-    FD_ZERO(&th->writefds);\
-    FD_ZERO(&th->exceptfds);\
-    th->delay = 0.0;\
-    th->join = 0;\
-\
-    th->frame = 0;\
-    th->scope = 0;\
-    th->klass = 0;\
-    th->wrapper = 0;\
-    th->cref = ruby_cref;\
-    th->dyna_vars = ruby_dyna_vars;\
-    th->block = 0;\
-    th->iter = 0;\
-    th->tag = 0;\
-    th->tracing = 0;\
-    th->errinfo = Qnil;\
-    th->last_status = 0;\
-    th->last_line = 0;\
-    th->last_match = Qnil;\
-    th->abort = 0;\
-    th->priority = 0;\
-    th->thgroup = thgroup_default;\
-    th->locals = 0;\
-    th->thread = 0;\
-    if (curr_thread == 0) {\
-      th->sandbox = Qnil;\
-    } else {\
-      th->sandbox = curr_thread->sandbox;\
-    }\
-} while (0)
-
-static rb_thread_t
-rb_thread_alloc(klass)
-    VALUE klass;
-{
-    rb_thread_t th;
-    struct RVarmap *vars;
-
-    THREAD_ALLOC(th);
-    th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th);
-
-    for (vars = th->dyna_vars; vars; vars = vars->next) {
-	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	FL_SET(vars, DVAR_DONT_RECYCLE);
-    }
-    return th;
-}
-
-static int thread_init = 0;
-
-#if defined(_THREAD_SAFE)
-static void
-catch_timer(sig)
-    int sig;
-{
-#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
-    signal(sig, catch_timer);
-#endif
-    /* cause EINTR */
-}
-
-static int time_thread_alive_p = 0;
-static pthread_t time_thread;
-
-static void*
-thread_timer(dummy)
-    void *dummy;
-{
-#ifdef _THREAD_SAFE
-#define test_cancel() pthread_testcancel()
-#else
-#define test_cancel() /* void */
-#endif
-
-    sigset_t all_signals;
-
-    sigfillset(&all_signals);
-    pthread_sigmask(SIG_BLOCK, &all_signals, 0);
-
-    for (;;) {
-#ifdef HAVE_NANOSLEEP
-	struct timespec req, rem;
-
-	test_cancel();
-	req.tv_sec = 0;
-	req.tv_nsec = 10000000;
-	nanosleep(&req, &rem);
-#else
-	struct timeval tv;
-
-	test_cancel();
-	tv.tv_sec = 0;
-	tv.tv_usec = 10000;
-	select(0, NULL, NULL, NULL, &tv);
-#endif
-	if (!rb_thread_critical) {
-	    rb_thread_pending = 1;
-	    if (rb_trap_immediate) {
-		pthread_kill(ruby_thid, SIGVTALRM);
-	    }
-	}
-    }
-#undef test_cancel
-}
-
-void
-rb_thread_start_timer()
-{
-}
-
-void
-rb_thread_stop_timer()
+rb_errinfo(void)
 {
+    rb_thread_t *th = GET_THREAD();
+    return th->errinfo;
 }
 
 void
-rb_child_atfork()
+rb_set_errinfo(VALUE err)
 {
-    time_thread_alive_p = 0;
-}
-
-void
-rb_thread_cancel_timer()
-{
-#ifdef _THREAD_SAFE
-    if( time_thread_alive_p )
-    {
-	pthread_cancel( time_thread );
-	pthread_join( time_thread, NULL );
-	time_thread_alive_p = 0;
-    }
-    thread_init = 0;
-#endif
-}
-#elif defined(HAVE_SETITIMER)
-static void
-catch_timer(sig)
-    int sig;
-{
-#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
-    signal(sig, catch_timer);
-#endif
-    if (!rb_thread_critical) {
-	rb_thread_pending = 1;
-    }
-    /* cause EINTR */
-}
-
-void
-rb_thread_start_timer()
-{
-    struct itimerval tval;
-
-    if (!thread_init) return;
-    tval.it_interval.tv_sec = 0;
-    tval.it_interval.tv_usec = 10000;
-    tval.it_value = tval.it_interval;
-    setitimer(ITIMER_VIRTUAL, &tval, NULL);
-}
-
-void
-rb_thread_stop_timer()
-{
-    struct itimerval tval;
-
-    if (!thread_init) return;
-    tval.it_interval.tv_sec = 0;
-    tval.it_interval.tv_usec = 0;
-    tval.it_value = tval.it_interval;
-    setitimer(ITIMER_VIRTUAL, &tval, NULL);
-}
-
-void
-rb_thread_cancel_timer()
-{
-}
-
-#else  /* !(_THREAD_SAFE || HAVE_SETITIMER) */
-int rb_thread_tick = THREAD_TICK;
-
-void
-rb_thread_cancel_timer()
-{
-}
-#endif
-
-static VALUE
-rb_thread_start_0(fn, arg, th)
-    VALUE (*fn)();
-    void *arg;
-    rb_thread_t th;
-{
-    volatile rb_thread_t th_save = th;
-    volatile VALUE thread = th->thread;
-    struct BLOCK *volatile saved_block = 0;
-    enum rb_thread_status status;
-    int state;
-
-    if (OBJ_FROZEN(curr_thread->thgroup)) {
-	rb_raise(rb_eThreadError,
-		 "can't start a new thread (frozen ThreadGroup)");
-    }
-
-    if (!thread_init) {
-	thread_init = 1;
-#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
-#if defined(POSIX_SIGNAL)
-	posix_signal(SIGVTALRM, catch_timer);
-#else
-	signal(SIGVTALRM, catch_timer);
-#endif
-
-#ifdef _THREAD_SAFE
-	pthread_create(&time_thread, 0, thread_timer, 0);
-        time_thread_alive_p = 1;
-        pthread_atfork(0, 0, rb_child_atfork);
-#else
-	rb_thread_start_timer();
-#endif
-#endif
-    }
-
-    if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	return thread;
-    }
-
-    if (ruby_block) {		/* should nail down higher blocks */
-	struct BLOCK dummy;
-
-	dummy.prev = ruby_block;
-	blk_copy_prev(&dummy);
-	saved_block = ruby_block = dummy.prev;
-    }
-    scope_dup(ruby_scope);
-
-    if (!th->next) {
-	/* merge in thread list */
-	th->prev = curr_thread;
-	curr_thread->next->prev = th;
-	th->next = curr_thread->next;
-	curr_thread->next = th;
-	th->priority = curr_thread->priority;
-	th->thgroup = curr_thread->thgroup;
-    }
-
-    PUSH_TAG(PROT_THREAD);
-    if ((state = EXEC_TAG()) == 0) {
-	if (THREAD_SAVE_CONTEXT(th) == 0) {
-	    curr_thread = th;
-	    th->result = (*fn)(arg, th);
-	}
-	th = th_save;
-    }
-    else if (TAG_DST()) {
-	th = th_save;
-	th->result = prot_tag->retval;
-    }
-    POP_TAG();
-    status = th->status;
-
-    if (th == main_thread) ruby_stop(state);
-    rb_thread_remove(th);
-
-    if (saved_block) {
-	blk_free(saved_block);
-    }
-
-    if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) {
-	th->flags |= THREAD_RAISED;
-	if (state == TAG_FATAL) {
-	    /* fatal error within this thread, need to stop whole script */
-	    main_thread->errinfo = ruby_errinfo;
-	    rb_thread_cleanup();
-	}
-	else if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    if (th->safe >= 4) {
-		char buf[32];
-
-		sprintf(buf, "Insecure exit at level %d", th->safe);
-		th->errinfo = rb_exc_new2(rb_eSecurityError, buf);
-	    }
-	    else {
-		/* delegate exception to main_thread */
-		rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE);
-	    }
-	}
-	else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
-	    /* exit on main_thread */
-	    error_print();
-	    rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
-	}
-	else {
-	    th->errinfo = ruby_errinfo;
-	}
+    if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) {
+	rb_raise(rb_eTypeError, "assigning non-exception to $!");
     }
-    rb_thread_schedule();
-    ruby_stop(0);		/* last thread termination */
-    return 0;			/* not reached */
+    GET_THREAD()->errinfo = err;
 }
 
 VALUE
-rb_thread_create(fn, arg)
-    VALUE (*fn)();
-    void *arg;
-{
-    Init_stack((VALUE*)&arg);
-    return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread));
-}
-
-static VALUE
-rb_thread_yield(arg, th)
-    VALUE arg;
-    rb_thread_t th;
+rb_rubylevel_errinfo(void)
 {
-    const ID *tbl;
-
-    scope_dup(ruby_block->scope);
-
-    tbl = ruby_scope->local_tbl;
-    if (tbl) {
-	int n = *tbl++;
-	for (tbl += 2, n -= 2; n > 0; --n) { /* skip first 2 ($_ and $~) */
-	    ID id = *tbl++;
-	    if (id != 0 && !rb_is_local_id(id))  /* push flip states */
-		rb_dvar_push(id, Qfalse);
-	}
-    }
-    rb_dvar_push('_', Qnil);
-    rb_dvar_push('~', Qnil);
-    ruby_block->dyna_vars = ruby_dyna_vars;
-
-    return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue);
+    return get_errinfo();
 }
 
-/*
- *  call-seq:
- *     Thread.new([arg]*) {|args| block }   => thread
- *  
- *  Creates and runs a new thread to execute the instructions given in
- *  <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
- *  into the block.
- *     
- *     x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
- *     a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
- *     x.join # Let the threads finish before
- *     a.join # main thread exits...
- *     
- *  <em>produces:</em>
- *     
- *     abxyzc
- */
-
 static VALUE
-rb_thread_s_new(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+errat_getter(ID id)
 {
-    rb_thread_t th = rb_thread_alloc(klass);
-    volatile VALUE *pos;
-
-    pos = th->stk_pos;
-    rb_obj_call_init(th->thread, argc, argv);
-    if (th->stk_pos == 0) {
-	rb_raise(rb_eThreadError, "uninitialized thread - check `%s#initialize'",
-		 rb_class2name(klass));
+    VALUE err = get_errinfo();
+    if (!NIL_P(err)) {
+	return get_backtrace(err);
     }
-
-    return th->thread;
-}
-
-
-/*
- *  call-seq:
- *     Thread.new([arg]*) {|args| block }   => thread
- *  
- *  Creates and runs a new thread to execute the instructions given in
- *  <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
- *  into the block.
- *     
- *     x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
- *     a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
- *     x.join # Let the threads finish before
- *     a.join # main thread exits...
- *     
- *  <em>produces:</em>
- *     
- *     abxyzc
- */
-
-static VALUE
-rb_thread_initialize(thread, args)
-    VALUE thread, args;
-{
-    rb_thread_t th;
-
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eThreadError, "must be called with a block");
-    }
-    th = rb_thread_check(thread);
-    if (th->stk_max) {
-	NODE *node = th->node;
-	if (!node) {
-	    rb_raise(rb_eThreadError, "already initialized thread");
-	}
-	rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
-		 node->nd_file, nd_line(node));
-    }
-    return rb_thread_start_0(rb_thread_yield, args, th);
-}
-
-
-/*
- *  call-seq:
- *     Thread.start([args]*) {|args| block }   => thread
- *     Thread.fork([args]*) {|args| block }    => thread
- *  
- *  Basically the same as <code>Thread::new</code>. However, if class
- *  <code>Thread</code> is subclassed, then calling <code>start</code> in that
- *  subclass will not invoke the subclass's <code>initialize</code> method.
- */
-
-static VALUE
-rb_thread_start(klass, args)
-    VALUE klass, args;
-{
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eThreadError, "must be called with a block");
-    }
-    return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass));
-}
-
-
-/*
- *  call-seq:
- *     thr.value   => obj
- *  
- *  Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns
- *  its value.
- *     
- *     a = Thread.new { 2 + 2 }
- *     a.value   #=> 4
- */
-
-static VALUE
-rb_thread_value(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    while (!rb_thread_join(th, DELAY_INFTY));
-
-    return th->result;
-}
-
-
-/*
- *  call-seq:
- *     thr.status   => string, false or nil
- *  
- *  Returns the status of <i>thr</i>: ``<code>sleep</code>'' if <i>thr</i> is
- *  sleeping or waiting on I/O, ``<code>run</code>'' if <i>thr</i> is executing,
- *  ``<code>aborting</code>'' if <i>thr</i> is aborting, <code>false</code> if
- *  <i>thr</i> terminated normally, and <code>nil</code> if <i>thr</i>
- *  terminated with an exception.
- *     
- *     a = Thread.new { raise("die now") }
- *     b = Thread.new { Thread.stop }
- *     c = Thread.new { Thread.exit }
- *     d = Thread.new { sleep }
- *     Thread.critical = true
- *     d.kill                  #=> #<Thread:0x401b3678 aborting>
- *     a.status                #=> nil
- *     b.status                #=> "sleep"
- *     c.status                #=> false
- *     d.status                #=> "aborting"
- *     Thread.current.status   #=> "run"
- */
-
-static VALUE
-rb_thread_status_name(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (rb_thread_dead(th)) {
-	if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
-	    return Qnil;
-	return Qfalse;
-    }
-
-    return rb_str_new2(thread_status_name(th->status));
-}
-
-
-/*
- *  call-seq:
- *     thr.alive?   => true or false
- *  
- *  Returns <code>true</code> if <i>thr</i> is running or sleeping.
- *     
- *     thr = Thread.new { }
- *     thr.join                #=> #<Thread:0x401b3fb0 dead>
- *     Thread.current.alive?   #=> true
- *     thr.alive?              #=> false
- */
-
-VALUE
-rb_thread_alive_p(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (rb_thread_dead(th)) return Qfalse;
-    return Qtrue;
-}
-
-
-/*
- *  call-seq:
- *     thr.stop?   => true or false
- *  
- *  Returns <code>true</code> if <i>thr</i> is dead or sleeping.
- *     
- *     a = Thread.new { Thread.stop }
- *     b = Thread.current
- *     a.stop?   #=> true
- *     b.stop?   #=> false
- */
-
-static VALUE
-rb_thread_stop_p(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (rb_thread_dead(th)) return Qtrue;
-    if (th->status == THREAD_STOPPED) return Qtrue;
-    return Qfalse;
-}
-
-static void
-rb_thread_wait_other_threads()
-{
-    rb_thread_t th;
-    int found;
-
-    /* wait other threads to terminate */
-    while (curr_thread != curr_thread->next) {
-	found = 0;
-	FOREACH_THREAD(th) {
-	    if (th != curr_thread && th->status != THREAD_STOPPED) {
-		found = 1;
-		break;
-	    }
-	}
-	END_FOREACH(th);
-	if (!found) return;
-	rb_thread_schedule();
+    else {
+	return Qnil;
     }
 }
 
 static void
-rb_thread_cleanup()
-{
-    rb_thread_t curr, th;
-
-    curr = curr_thread;
-    while (curr->status == THREAD_KILLED) {
-	curr = curr->prev;
-    }
-
-    FOREACH_THREAD_FROM(curr, th) {
-	if (th->status != THREAD_KILLED) {
-	    rb_thread_ready(th);
-	    if (th != main_thread) {
-		th->thgroup = 0;
-		th->priority = 0;
-		th->status = THREAD_TO_KILL;
-		RDATA(th->thread)->dfree = NULL;
-	    }
-	}
-    }
-    END_FOREACH_FROM(curr, th);
-}
-
-int rb_thread_critical;
-
-
-/*
- *  call-seq:
- *     Thread.critical   => true or false
- *  
- *  Returns the status of the global ``thread critical'' condition.
- */
-
-static VALUE
-rb_thread_critical_get()
-{
-    return rb_thread_critical?Qtrue:Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     Thread.critical= boolean   => true or false
- *  
- *  Sets the status of the global ``thread critical'' condition and returns
- *  it. When set to <code>true</code>, prohibits scheduling of any existing
- *  thread. Does not block new threads from being created and run. Certain
- *  thread operations (such as stopping or killing a thread, sleeping in the
- *  current thread, and raising an exception) may cause a thread to be scheduled
- *  even when in a critical section.  <code>Thread::critical</code> is not
- *  intended for daily use: it is primarily there to support folks writing
- *  threading libraries.
- */
-
-static VALUE
-rb_thread_critical_set(obj, val)
-    VALUE obj, val;
-{
-    rb_thread_critical = RTEST(val);
-    return val;
-}
-
-void
-rb_thread_interrupt()
-{
-    rb_thread_critical = 0;
-    rb_thread_ready(main_thread);
-    if (curr_thread == main_thread) {
-	rb_interrupt();
-    }
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
-    }
-    curr_thread = main_thread;
-    rb_thread_restore_context(curr_thread, RESTORE_INTERRUPT);
-}
-
-void
-rb_thread_signal_raise(sig)
-    int sig;
-{
-    rb_thread_critical = 0;
-    if (curr_thread == main_thread) {
-	VALUE argv[1];
-
-	rb_thread_ready(curr_thread);
-	argv[0] = INT2FIX(sig);
-	rb_exc_raise(rb_class_new_instance(1, argv, rb_eSignal));
-    }
-    rb_thread_ready(main_thread);
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
-    }
-    th_sig = sig;
-    curr_thread = main_thread;
-    rb_thread_restore_context(curr_thread, RESTORE_SIGNAL);
-}
-
-void
-rb_thread_trap_eval(cmd, sig, safe)
-    VALUE cmd;
-    int sig, safe;
-{
-    rb_thread_critical = 0;
-    if (curr_thread == main_thread) {
-	rb_trap_eval(cmd, sig, safe);
-	return;
-    }
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
-    }
-    th_cmd = cmd;
-    th_sig = sig;
-    th_safe = safe;
-    curr_thread = main_thread;
-    rb_thread_restore_context(curr_thread, RESTORE_TRAP);
-}
-
-void
-rb_thread_signal_exit()
-{
-    VALUE args[2];
-
-    rb_thread_critical = 0;
-    if (curr_thread == main_thread) {
-	rb_thread_ready(curr_thread);
-	rb_exit(EXIT_SUCCESS);
-    }
-    args[0] = INT2NUM(EXIT_SUCCESS);
-    args[1] = rb_str_new2("exit");
-    rb_thread_ready(main_thread);
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
-    }
-    rb_thread_main_jump(rb_class_new_instance(2, args, rb_eSystemExit), 
-			RESTORE_EXIT);
-}
-
-static VALUE
-rb_thread_raise(argc, argv, th)
-    int argc;
-    VALUE *argv;
-    rb_thread_t th;
+errat_setter(VALUE val, ID id, VALUE *var)
 {
-    volatile rb_thread_t th_save = th;
-    VALUE exc;
-
-    if (!th->next) {
-	rb_raise(rb_eArgError, "unstarted thread");
-    }
-    if (rb_thread_dead(th)) return Qnil;
-    exc = rb_make_exception(argc, argv);
-    if (curr_thread == th) {
-	rb_raise_jump(exc);
-    }
-
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return th_save->thread;
-	}
-    }
-
-    rb_thread_ready(th);
-    curr_thread = th;
-
-    th_raise_exception = exc;
-    th_raise_node = ruby_current_node;
-    rb_thread_restore_context(curr_thread, RESTORE_RAISE);
-    return Qnil;		/* not reached */
-}
-
-
-/*
- *  call-seq:
- *     thr.raise(exception)
- *  
- *  Raises an exception (see <code>Kernel::raise</code>) from <i>thr</i>. The
- *  caller does not have to be <i>thr</i>.
- *     
- *     Thread.abort_on_exception = true
- *     a = Thread.new { sleep(200) }
- *     a.raise("Gotcha")
- *     
- *  <em>produces:</em>
- *     
- *     prog.rb:3: Gotcha (RuntimeError)
- *     	from prog.rb:2:in `initialize'
- *     	from prog.rb:2:in `new'
- *     	from prog.rb:2
- */
-
-static VALUE
-rb_thread_raise_m(argc, argv, thread)
-    int argc;
-    VALUE *argv;
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (ruby_safe_level > th->safe) {
-	rb_secure(4);
-    }
-    rb_thread_raise(argc, argv, th);
-    return Qnil;		/* not reached */
-}
-
-VALUE
-rb_thread_local_aref(thread, id)
-    VALUE thread;
-    ID id;
-{
-    rb_thread_t th;
-    VALUE val;
-
-    th = rb_thread_check(thread);
-    if (ruby_safe_level >= 4 && th != curr_thread) {
-	rb_raise(rb_eSecurityError, "Insecure: thread locals");
-    }
-    if (!th->locals) return Qnil;
-    if (st_lookup(th->locals, id, &val)) {
-	return val;
-    }
-    return Qnil;
-}
-
-
-/*
- *  call-seq:
- *      thr[sym]   => obj or nil
- *  
- *  Attribute Reference---Returns the value of a thread-local variable, using
- *  either a symbol or a string name. If the specified variable does not exist,
- *  returns <code>nil</code>.
- *     
- *     a = Thread.new { Thread.current["name"] = "A"; Thread.stop }
- *     b = Thread.new { Thread.current[:name]  = "B"; Thread.stop }
- *     c = Thread.new { Thread.current["name"] = "C"; Thread.stop }
- *     Thread.list.each {|x| puts "#{x.inspect}: #{x[:name]}" }
- *     
- *  <em>produces:</em>
- *     
- *     #<Thread:0x401b3b3c sleep>: C
- *     #<Thread:0x401b3bc8 sleep>: B
- *     #<Thread:0x401b3c68 sleep>: A
- *     #<Thread:0x401bdf4c run>:
- */
-
-static VALUE
-rb_thread_aref(thread, id)
-    VALUE thread, id;
-{
-    return rb_thread_local_aref(thread, rb_to_id(id));
-}
-
-VALUE
-rb_thread_local_aset(thread, id, val)
-    VALUE thread;
-    ID id;
-    VALUE val;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (ruby_safe_level >= 4 && th != curr_thread) {
-	rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals");
-    }
-    if (OBJ_FROZEN(thread)) rb_error_frozen("thread locals");
-
-    if (!th->locals) {
-	th->locals = st_init_numtable();
-    }
-    if (NIL_P(val)) {
-	st_delete(th->locals, (st_data_t*)&id, 0);
-	return Qnil;
+    VALUE err = get_errinfo();
+    if (NIL_P(err)) {
+	rb_raise(rb_eArgError, "$! not set");
     }
-    st_insert(th->locals, id, val);
-
-    return val;
-}
-
-
-/*
- *  call-seq:
- *      thr[sym] = obj   => obj
- *  
- *  Attribute Assignment---Sets or creates the value of a thread-local variable,
- *  using either a symbol or a string. See also <code>Thread#[]</code>.
- */
-
-static VALUE
-rb_thread_aset(thread, id, val)
-    VALUE thread, id, val;
-{
-    return rb_thread_local_aset(thread, rb_to_id(id), val);
-}
-
-
-/*
- *  call-seq:
- *     thr.key?(sym)   => true or false
- *  
- *  Returns <code>true</code> if the given string (or symbol) exists as a
- *  thread-local variable.
- *     
- *     me = Thread.current
- *     me[:oliver] = "a"
- *     me.key?(:oliver)    #=> true
- *     me.key?(:stanley)   #=> false
- */
-
-static VALUE
-rb_thread_key_p(thread, id)
-    VALUE thread, id;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (!th->locals) return Qfalse;
-    if (st_lookup(th->locals, rb_to_id(id), 0))
-	return Qtrue;
-    return Qfalse;
-}
-
-static int
-thread_keys_i(key, value, ary)
-    ID key;
-    VALUE value, ary;
-{
-    rb_ary_push(ary, ID2SYM(key));
-    return ST_CONTINUE;
+    set_backtrace(err, val);
 }
 
-
 /*
  *  call-seq:
- *     thr.keys   => array
- *  
- *  Returns an an array of the names of the thread-local variables (as Symbols).
- *     
- *     thr = Thread.new do
- *       Thread.current[:cat] = 'meow'
- *       Thread.current["dog"] = 'woof'
- *     end
- *     thr.join   #=> #<Thread:0x401b3f10 dead>
- *     thr.keys   #=> [:dog, :cat]
- */
-
-static VALUE
-rb_thread_keys(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-    VALUE ary = rb_ary_new();
-
-    if (th->locals) {
-	st_foreach(th->locals, thread_keys_i, ary);
-    }
-    return ary;
-}
-
-/*
- * call-seq:
- *   thr.inspect   => string
+ *     __method__         -> symbol
+ *     __callee__         -> symbol
  *
- * Dump the name, id, and status of _thr_ to a string.
- */
-
-static VALUE
-rb_thread_inspect(thread)
-    VALUE thread;
-{
-    char *cname = rb_obj_classname(thread);
-    rb_thread_t th = rb_thread_check(thread);
-    const char *status = thread_status_name(th->status);
-    VALUE str;
-    size_t len = strlen(cname)+7+16+9+1;
-
-    str = rb_str_new(0, len); /* 7:tags 16:addr 9:status 1:nul */
-    snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx %s>", cname, thread, status);
-    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
-    OBJ_INFECT(str, thread);
-
-    return str;
-}
-
-void
-rb_thread_atfork()
-{
-    rb_thread_t th;
-
-    if (rb_thread_alone()) return;
-    FOREACH_THREAD(th) {
-	if (th != curr_thread) {
-	    rb_thread_die(th);
-	}
-    }
-    END_FOREACH(th);
-    main_thread = curr_thread;
-    curr_thread->next = curr_thread;
-    curr_thread->prev = curr_thread;
-}
-
-
-/*
- *  Document-class: Continuation
+ *  Returns the name of the current method as a Symbol.
+ *  If called outside of a method, it returns <code>nil</code>.
  *
- *  Continuation objects are generated by
- *  <code>Kernel#callcc</code>. They hold a return address and execution
- *  context, allowing a nonlocal return to the end of the
- *  <code>callcc</code> block from anywhere within a program.
- *  Continuations are somewhat analogous to a structured version of C's
- *  <code>setjmp/longjmp</code> (although they contain more state, so
- *  you might consider them closer to threads).
- *     
- *  For instance:
- *     
- *     arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
- *     callcc{|$cc|}
- *     puts(message = arr.shift)
- *     $cc.call unless message =~ /Max/
- *     
- *  <em>produces:</em>
- *     
- *     Freddie
- *     Herbie
- *     Ron
- *     Max
- *     
- *  This (somewhat contrived) example allows the inner loop to abandon
- *  processing early:
- *     
- *     callcc {|cont|
- *       for i in 0..4
- *         print "\n#{i}: "
- *         for j in i*5...(i+1)*5
- *           cont.call() if j == 17
- *           printf "%3d", j
- *         end
- *       end
- *     }
- *     print "\n"
- *     
- *  <em>produces:</em>
- *     
- *     0:   0  1  2  3  4
- *     1:   5  6  7  8  9
- *     2:  10 11 12 13 14
- *     3:  15 16
- */
-
-VALUE rb_cCont;
-
-/*
- *  call-seq:
- *     callcc {|cont| block }   =>  obj
- *  
- *  Generates a <code>Continuation</code> object, which it passes to the
- *  associated block. Performing a <em>cont</em><code>.call</code> will
- *  cause the <code>callcc</code> to return (as will falling through the
- *  end of the block). The value returned by the <code>callcc</code> is
- *  the value of the block, or the value passed to
- *  <em>cont</em><code>.call</code>. See class <code>Continuation</code> 
- *  for more details. Also see <code>Kernel::throw</code> for
- *  an alternative mechanism for unwinding a call stack.
  */
 
 static VALUE
-rb_callcc(self)
-    VALUE self;
+rb_f_method_name(void)
 {
-    volatile VALUE cont;
-    rb_thread_t th;
-    volatile rb_thread_t th_save;
-    struct tag *tag;
-    struct RVarmap *vars;
-
-    THREAD_ALLOC(th);
-    cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);
-
-    scope_dup(ruby_scope);
-    for (tag=prot_tag; tag; tag=tag->prev) {
-	scope_dup(tag->scope);
-    }
-    th->thread = curr_thread->thread;
-    th->thgroup = cont_protect;
+    ID fname = rb_frame_caller(); /* need *caller* ID */
 
-    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
-	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	FL_SET(vars, DVAR_DONT_RECYCLE);
-    }
-    th_save = th;
-    if (THREAD_SAVE_CONTEXT(th)) {
-	return th_save->result;
+    if (fname) {
+	return ID2SYM(fname);
     }
     else {
-	return rb_yield(cont);
-    }
-}
-
-/*
- *  call-seq:
- *     cont.call(args, ...) 
- *     cont[args, ...]
- *  
- *  Invokes the continuation. The program continues from the end of the
- *  <code>callcc</code> block. If no arguments are given, the original
- *  <code>callcc</code> returns <code>nil</code>. If one argument is
- *  given, <code>callcc</code> returns it. Otherwise, an array
- *  containing <i>args</i> is returned.
- *     
- *     callcc {|cont|  cont.call }           #=> nil
- *     callcc {|cont|  cont.call 1 }         #=> 1
- *     callcc {|cont|  cont.call 1, 2, 3 }   #=> [1, 2, 3]
- */
-
-static VALUE
-rb_cont_call(argc, argv, cont)
-    int argc;
-    VALUE *argv;
-    VALUE cont;
-{
-    rb_thread_t th = rb_thread_check(cont);
-
-    if (th->thread != curr_thread->thread) {
-	rb_raise(rb_eRuntimeError, "continuation called across threads");
-    }
-    if (th->thgroup != cont_protect) {
-	rb_raise(rb_eRuntimeError, "continuation called across trap");
-    }
-    switch (argc) {
-      case 0:
-	th->result = Qnil;
-	break;
-      case 1:
-	th->result = argv[0];
-	break;
-      default:
-	th->result = rb_ary_new4(argc, argv);
-	break;
-    }
-
-    rb_thread_restore_context(th, RESTORE_NORMAL);
-    return Qnil;
-}
-
-struct thgroup {
-    int enclosed;
-    VALUE group;
-};
-
-
-/*
- * Document-class: ThreadGroup
- *
- *  <code>ThreadGroup</code> provides a means of keeping track of a number of
- *  threads as a group. A <code>Thread</code> can belong to only one
- *  <code>ThreadGroup</code> at a time; adding a thread to a new group will
- *  remove it from any previous group.
- *     
- *  Newly created threads belong to the same group as the thread from which they
- *  were created.
- */
-
-static VALUE thgroup_s_alloc _((VALUE));
-static VALUE
-thgroup_s_alloc(klass)
-    VALUE klass;
-{
-    VALUE group;
-    struct thgroup *data;
-
-    group = Data_Make_Struct(klass, struct thgroup, 0, free, data);
-    data->enclosed = 0;
-    data->group = group;
-
-    return group;
-}
-
-
-/*
- *  call-seq:
- *     thgrp.list   => array
- *  
- *  Returns an array of all existing <code>Thread</code> objects that belong to
- *  this group.
- *     
- *     ThreadGroup::Default.list   #=> [#<Thread:0x401bdf4c run>]
- */
-
-static VALUE
-thgroup_list(group)
-    VALUE group;
-{
-    struct thgroup *data;
-    rb_thread_t th;
-    VALUE ary;
-
-    Data_Get_Struct(group, struct thgroup, data);
-    ary = rb_ary_new();
-
-    FOREACH_THREAD(th) {
-	if (th->thgroup == data->group) {
-	    rb_ary_push(ary, th->thread);
-	}
-    }
-    END_FOREACH(th);
-
-    return ary;
-}
-
-
-/*
- *  call-seq:
- *     thgrp.enclose   => thgrp
- *  
- *  Prevents threads from being added to or removed from the receiving
- *  <code>ThreadGroup</code>. New threads can still be started in an enclosed
- *  <code>ThreadGroup</code>.
- *     
- *     ThreadGroup::Default.enclose        #=> #<ThreadGroup:0x4029d914>
- *     thr = Thread::new { Thread.stop }   #=> #<Thread:0x402a7210 sleep>
- *     tg = ThreadGroup::new               #=> #<ThreadGroup:0x402752d4>
- *     tg.add thr
- *
- *  <em>produces:</em>
- *
- *     ThreadError: can't move from the enclosed thread group
- */
-
-static VALUE
-thgroup_enclose(group)
-    VALUE group;
-{
-    struct thgroup *data;
-
-    Data_Get_Struct(group, struct thgroup, data);
-    data->enclosed = 1;
-
-    return group;
-}
-
-
-/*
- *  call-seq:
- *     thgrp.enclosed?   => true or false
- *  
- *  Returns <code>true</code> if <em>thgrp</em> is enclosed. See also
- *  ThreadGroup#enclose.
- */
-
-static VALUE
-thgroup_enclosed_p(group)
-    VALUE group;
-{
-    struct thgroup *data;
-
-    Data_Get_Struct(group, struct thgroup, data);
-    if (data->enclosed) return Qtrue;
-    return Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     thgrp.add(thread)   => thgrp
- *  
- *  Adds the given <em>thread</em> to this group, removing it from any other
- *  group to which it may have previously belonged.
- *     
- *     puts "Initial group is #{ThreadGroup::Default.list}"
- *     tg = ThreadGroup.new
- *     t1 = Thread.new { sleep }
- *     t2 = Thread.new { sleep }
- *     puts "t1 is #{t1}"
- *     puts "t2 is #{t2}"
- *     tg.add(t1)
- *     puts "Initial group now #{ThreadGroup::Default.list}"
- *     puts "tg group now #{tg.list}"
- *     
- *  <em>produces:</em>
- *     
- *     Initial group is #<Thread:0x401bdf4c>
- *     t1 is #<Thread:0x401b3c90>
- *     t2 is #<Thread:0x401b3c18>
- *     Initial group now #<Thread:0x401b3c18>#<Thread:0x401bdf4c>
- *     tg group now #<Thread:0x401b3c90>
- */
-
-static VALUE
-thgroup_add(group, thread)
-    VALUE group, thread;
-{
-    rb_thread_t th;
-    struct thgroup *data;
-
-    rb_secure(4);
-    th = rb_thread_check(thread);
-    if (!th->next || !th->prev) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
-		 rb_obj_classname(thread));
-    }
-
-    if (OBJ_FROZEN(group)) {
-      rb_raise(rb_eThreadError, "can't move to the frozen thread group");
-    }
-    Data_Get_Struct(group, struct thgroup, data);
-    if (data->enclosed) {
-	rb_raise(rb_eThreadError, "can't move to the enclosed thread group");
-    }
-
-    if (!th->thgroup) {
 	return Qnil;
     }
-    if (OBJ_FROZEN(th->thgroup)) {
-	rb_raise(rb_eThreadError, "can't move from the frozen thread group");
-    }
-    Data_Get_Struct(th->thgroup, struct thgroup, data);
-    if (data->enclosed) {
-	rb_raise(rb_eThreadError, "can't move from the enclosed thread group");
-    }
-
-    th->thgroup = group;
-    return group;
 }
 
-
-/*
- *  +Thread+ encapsulates the behavior of a thread of
- *  execution, including the main thread of the Ruby script.
- *     
- *  In the descriptions of the methods in this class, the parameter _sym_
- *  refers to a symbol, which is either a quoted string or a 
- *  +Symbol+ (such as <code>:name</code>).
- */
-
 void
-Init_Thread()
+Init_eval(void)
 {
-    VALUE cThGroup;
-
-    rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
-    rb_cThread = rb_define_class("Thread", rb_cObject);
-    rb_undef_alloc_func(rb_cThread);
-
-    rb_define_singleton_method(rb_cThread, "new", rb_thread_s_new, -1);
-    rb_define_method(rb_cThread, "initialize", rb_thread_initialize, -2);
-    rb_define_singleton_method(rb_cThread, "start", rb_thread_start, -2);
-    rb_define_singleton_method(rb_cThread, "fork", rb_thread_start, -2);
-
-    rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0);
-    rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
-    rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
-    rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
-    rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
-    rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
-    rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0);
-
-    rb_define_singleton_method(rb_cThread, "critical", rb_thread_critical_get, 0);
-    rb_define_singleton_method(rb_cThread, "critical=", rb_thread_critical_set, 1);
-
-    rb_define_singleton_method(rb_cThread, "abort_on_exception", rb_thread_s_abort_exc, 0);
-    rb_define_singleton_method(rb_cThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1);
-
-    rb_define_method(rb_cThread, "run", rb_thread_run, 0);
-    rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0);
-    rb_define_method(rb_cThread, "kill", rb_thread_kill, 0);
-    rb_define_method(rb_cThread, "terminate", rb_thread_kill, 0);
-    rb_define_method(rb_cThread, "exit", rb_thread_kill, 0);
-    rb_define_method(rb_cThread, "kill!", rb_thread_kill_bang, 0);
-    rb_define_method(rb_cThread, "terminate!", rb_thread_kill_bang, 0);
-    rb_define_method(rb_cThread, "exit!", rb_thread_kill_bang, 0);
-    rb_define_method(rb_cThread, "value", rb_thread_value, 0);
-    rb_define_method(rb_cThread, "status", rb_thread_status_name, 0);
-    rb_define_method(rb_cThread, "join", rb_thread_join_m, -1);
-    rb_define_method(rb_cThread, "alive?", rb_thread_alive_p, 0);
-    rb_define_method(rb_cThread, "stop?", rb_thread_stop_p, 0);
-    rb_define_method(rb_cThread, "raise", rb_thread_raise_m, -1);
-
-    rb_define_method(rb_cThread, "abort_on_exception", rb_thread_abort_exc, 0);
-    rb_define_method(rb_cThread, "abort_on_exception=", rb_thread_abort_exc_set, 1);
-
-    rb_define_method(rb_cThread, "priority", rb_thread_priority, 0);
-    rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1);
-    rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0);
-    rb_define_method(rb_cThread, "group", rb_thread_group, 0);
-
-    rb_define_method(rb_cThread, "[]", rb_thread_aref, 1);
-    rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2);
-    rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1);
-    rb_define_method(rb_cThread, "keys", rb_thread_keys, 0);
-
-    rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
-
-    rb_cCont = rb_define_class("Continuation", rb_cObject);
-    rb_undef_alloc_func(rb_cCont);
-    rb_undef_method(CLASS_OF(rb_cCont), "new");
-    rb_define_method(rb_cCont, "call", rb_cont_call, -1);
-    rb_define_method(rb_cCont, "[]", rb_cont_call, -1);
-    rb_define_global_function("callcc", rb_callcc, 0);
-    rb_global_variable(&cont_protect);
-
-    cThGroup = rb_define_class("ThreadGroup", rb_cObject);
-    rb_define_alloc_func(cThGroup, thgroup_s_alloc);
-    rb_define_method(cThGroup, "list", thgroup_list, 0);
-    rb_define_method(cThGroup, "enclose", thgroup_enclose, 0);
-    rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0);
-    rb_define_method(cThGroup, "add", thgroup_add, 1);
-    rb_global_variable(&thgroup_default);
-    thgroup_default = rb_obj_alloc(cThGroup);
-    rb_define_const(cThGroup, "Default", thgroup_default);
-
-    /* allocate main thread */
-    main_thread = rb_thread_alloc(rb_cThread);
-    curr_thread = main_thread->prev = main_thread->next = main_thread;
-}
-
-/*
- *  call-seq:
- *     catch(symbol) {| | block }  > obj
- *  
- *  +catch+ executes its block. If a +throw+ is
- *  executed, Ruby searches up its stack for a +catch+ block
- *  with a tag corresponding to the +throw+'s
- *  _symbol_. If found, that block is terminated, and
- *  +catch+ returns the value given to +throw+. If
- *  +throw+ is not called, the block terminates normally, and
- *  the value of +catch+ is the value of the last expression
- *  evaluated. +catch+ expressions may be nested, and the
- *  +throw+ call need not be in lexical scope.
- *     
- *     def routine(n)
- *       puts n
- *       throw :done if n <= 0
- *       routine(n-1)
- *     end
- *     
- *     
- *     catch(:done) { routine(3) }
- *     
- *  <em>produces:</em>
- *     
- *     3
- *     2
- *     1
- *     0
- */
+    rb_define_virtual_variable("$@", errat_getter, errat_setter);
+    rb_define_virtual_variable("$!", errinfo_getter, 0);
 
-static VALUE
-rb_f_catch(dmy, tag)
-    VALUE dmy, tag;
-{
-    int state;
-    VALUE val = Qnil;		/* OK */
+    rb_define_global_function("raise", rb_f_raise, -1);
+    rb_define_global_function("fail", rb_f_raise, -1);
 
-    tag = ID2SYM(rb_to_id(tag));
-    PUSH_TAG(tag);
-    if ((state = EXEC_TAG()) == 0) {
-	val = rb_yield_0(tag, 0, 0, 0, Qfalse);
-    }
-    else if (state == TAG_THROW && tag == prot_tag->dst) {
-	val = prot_tag->retval;
-	state = 0;
-    }
-    POP_TAG();
-    if (state) JUMP_TAG(state);
+    rb_define_global_function("global_variables", rb_f_global_variables, 0);	/* in variable.c */
 
-    return val;
-}
+    rb_define_global_function("__method__", rb_f_method_name, 0);
+    rb_define_global_function("__callee__", rb_f_method_name, 0);
 
-static VALUE
-catch_i(tag)
-    VALUE tag;
-{
-    return rb_funcall(Qnil, rb_intern("catch"), 1, tag);
-}
+    rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
+    rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
+    rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
 
-VALUE
-rb_catch(tag, func, data)
-    const char *tag;
-    VALUE (*func)();
-    VALUE data;
-{
-    return rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, data);
-}
+    rb_undef_method(rb_cClass, "module_function");
 
-/*
- *  call-seq:
- *     throw(symbol [, obj])
- *  
- *  Transfers control to the end of the active +catch+ block
- *  waiting for _symbol_. Raises +NameError+ if there
- *  is no +catch+ block for the symbol. The optional second
- *  parameter supplies a return value for the +catch+ block,
- *  which otherwise defaults to +nil+. For examples, see
- *  <code>Kernel::catch</code>.
- */
+    {
+	extern void Init_vm_eval(void);
+	extern void Init_eval_method(void);
+	Init_vm_eval();
+	Init_eval_method();
+    }
 
-static VALUE
-rb_f_throw(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE tag, value;
-    struct tag *tt = prot_tag;
+    rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
+    rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1);
 
-    rb_scan_args(argc, argv, "11", &tag, &value);
-    tag = ID2SYM(rb_to_id(tag));
+    rb_define_singleton_method(rb_vm_top_self(), "include", top_include, -1);
 
-    while (tt) {
-	if (tt->tag == tag) {
-	    tt->dst = tag;
-	    tt->retval = value;
-	    break;
-	}
-	if (tt->tag == PROT_THREAD) {
-	    rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%lx",
-		     rb_id2name(SYM2ID(tag)),
-		     curr_thread);
-	}
-	tt = tt->prev;
-    }
-    if (!tt) {
-	rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag)));
-    }
-    rb_trap_restore_mask();
-    JUMP_TAG(TAG_THROW);
-#ifndef __GNUC__
-    return Qnil; 		/* not reached */
-#endif
-}
+    rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
 
-void
-rb_throw(tag, val)
-    const char *tag;
-    VALUE val;
-{
-    VALUE argv[2];
+    rb_define_global_function("trace_var", rb_f_trace_var, -1);	/* in variable.c */
+    rb_define_global_function("untrace_var", rb_f_untrace_var, -1);	/* in variable.c */
 
-    argv[0] = ID2SYM(rb_intern(tag));
-    argv[1] = val;
-    rb_f_throw(2, argv);
+    exception_error = rb_exc_new3(rb_eFatal,
+				  rb_obj_freeze(rb_str_new2("exception reentered")));
+    OBJ_TAINT(exception_error);
+    OBJ_FREEZE(exception_error);
 }
diff --git a/eval_error.c b/eval_error.c
new file mode 100644
index 0000000000..41fcbb0abb
--- /dev/null
+++ b/eval_error.c
@@ -0,0 +1,278 @@
+/* -*-c-*- */
+/*
+ * included by eval.c
+ */
+
+static void
+warn_printf(const char *fmt, ...)
+{
+    char buf[BUFSIZ];
+    va_list args;
+
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+    rb_write_error(buf);
+}
+
+#define warn_print(x) rb_write_error(x)
+#define warn_print2(x,l) rb_write_error2(x,l)
+
+static void
+error_pos(void)
+{
+    const char *sourcefile = rb_sourcefile();
+    int sourceline = rb_sourceline();
+
+    if (sourcefile) {
+	if (sourceline == 0) {
+	    warn_printf("%s", sourcefile);
+	}
+	else if (rb_frame_callee()) {
+	    warn_printf("%s:%d:in `%s'", sourcefile, sourceline,
+			rb_id2name(rb_frame_callee()));
+	}
+	else {
+	    warn_printf("%s:%d", sourcefile, sourceline);
+	}
+    }
+}
+
+VALUE rb_check_backtrace(VALUE);
+
+static VALUE
+get_backtrace(VALUE info)
+{
+    if (NIL_P(info))
+	return Qnil;
+    info = rb_funcall(info, rb_intern("backtrace"), 0);
+    if (NIL_P(info))
+	return Qnil;
+    return rb_check_backtrace(info);
+}
+
+VALUE
+rb_get_backtrace(VALUE info)
+{
+    return get_backtrace(info);
+}
+
+static void
+set_backtrace(VALUE info, VALUE bt)
+{
+    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
+}
+
+static void
+error_print(void)
+{
+    volatile VALUE errat = Qnil;		/* OK */
+    rb_thread_t *th = GET_THREAD();
+    VALUE errinfo = th->errinfo;
+    int raised_flag = th->raised_flag;
+    volatile VALUE eclass, e;
+    const char *volatile einfo;
+    volatile long elen;
+
+    if (NIL_P(errinfo))
+	return;
+    rb_thread_raised_clear(th);
+
+    PUSH_TAG();
+    if (EXEC_TAG() == 0) {
+	errat = get_backtrace(errinfo);
+    }
+    else {
+	errat = Qnil;
+    }
+    if (EXEC_TAG())
+	goto error;
+    if (NIL_P(errat)) {
+	const char *file = rb_sourcefile();
+	int line = rb_sourceline();
+	if (!file)
+	    warn_printf("%d", line);
+	else if (!line)
+	    warn_printf("%s", file);
+	else
+	    warn_printf("%s:%d", file, line);
+    }
+    else if (RARRAY_LEN(errat) == 0) {
+	error_pos();
+    }
+    else {
+	VALUE mesg = RARRAY_PTR(errat)[0];
+
+	if (NIL_P(mesg))
+	    error_pos();
+	else {
+	    warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg));
+	}
+    }
+
+    eclass = CLASS_OF(errinfo);
+    if (EXEC_TAG() == 0) {
+	e = rb_funcall(errinfo, rb_intern("message"), 0, 0);
+	StringValue(e);
+	einfo = RSTRING_PTR(e);
+	elen = RSTRING_LEN(e);
+    }
+    else {
+	einfo = "";
+	elen = 0;
+    }
+    if (EXEC_TAG())
+	goto error;
+    if (eclass == rb_eRuntimeError && elen == 0) {
+	warn_print(": unhandled exception\n");
+    }
+    else {
+	VALUE epath;
+
+	epath = rb_class_name(eclass);
+	if (elen == 0) {
+	    warn_print(": ");
+	    warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
+	    warn_print("\n");
+	}
+	else {
+	    char *tail = 0;
+	    long len = elen;
+
+	    if (RSTRING_PTR(epath)[0] == '#')
+		epath = 0;
+	    if ((tail = memchr(einfo, '\n', elen)) != 0) {
+		len = tail - einfo;
+		tail++;		/* skip newline */
+	    }
+	    warn_print(": ");
+	    warn_print2(einfo, len);
+	    if (epath) {
+		warn_print(" (");
+		warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
+		warn_print(")\n");
+	    }
+	    if (tail) {
+		warn_print2(tail, elen - len - 1);
+		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
+	    }
+	}
+    }
+
+    if (!NIL_P(errat)) {
+	long i;
+	long len = RARRAY_LEN(errat);
+	VALUE *ptr = RARRAY_PTR(errat);
+        int skip = eclass == rb_eSysStackError;
+
+#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
+#define TRACE_HEAD 8
+#define TRACE_TAIL 5
+
+	for (i = 1; i < len; i++) {
+	    if (TYPE(ptr[i]) == T_STRING) {
+		warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i]));
+	    }
+	    if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
+		warn_printf("\t ... %ld levels...\n",
+			    len - TRACE_HEAD - TRACE_TAIL);
+		i = len - TRACE_TAIL;
+	    }
+	}
+    }
+  error:
+    POP_TAG();
+    rb_thread_raised_set(th, raised_flag);
+}
+
+void
+ruby_error_print(void)
+{
+    error_print();
+}
+
+void
+rb_print_undef(VALUE klass, ID id, int scope)
+{
+    const char *v;
+
+    switch (scope) {
+      default:
+      case NOEX_PUBLIC: v = ""; break;
+      case NOEX_PRIVATE: v = " private"; break;
+      case NOEX_PROTECTED: v = " protected"; break;
+    }
+    rb_name_error(id, "undefined%s method `%s' for %s `%s'", v,
+		  rb_id2name(id),
+		  (TYPE(klass) == T_MODULE) ? "module" : "class",
+		  rb_class2name(klass));
+}
+
+static int
+sysexit_status(VALUE err)
+{
+    VALUE st = rb_iv_get(err, "status");
+    return NUM2INT(st);
+}
+
+static int
+error_handle(int ex)
+{
+    int status = EXIT_FAILURE;
+    rb_thread_t *th = GET_THREAD();
+
+    if (rb_threadptr_set_raised(th))
+	return EXIT_FAILURE;
+    switch (ex & TAG_MASK) {
+      case 0:
+	status = EXIT_SUCCESS;
+	break;
+
+      case TAG_RETURN:
+	error_pos();
+	warn_print(": unexpected return\n");
+	break;
+      case TAG_NEXT:
+	error_pos();
+	warn_print(": unexpected next\n");
+	break;
+      case TAG_BREAK:
+	error_pos();
+	warn_print(": unexpected break\n");
+	break;
+      case TAG_REDO:
+	error_pos();
+	warn_print(": unexpected redo\n");
+	break;
+      case TAG_RETRY:
+	error_pos();
+	warn_print(": retry outside of rescue clause\n");
+	break;
+      case TAG_THROW:
+	/* TODO: fix me */
+	error_pos();
+	warn_printf(": unexpected throw\n");
+	break;
+      case TAG_RAISE: {
+	VALUE errinfo = GET_THREAD()->errinfo;
+	if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
+	    status = sysexit_status(errinfo);
+	}
+	else if (rb_obj_is_instance_of(errinfo, rb_eSignal)) {
+	    /* no message when exiting by signal */
+	}
+	else {
+	    error_print();
+	}
+	break;
+      }
+      case TAG_FATAL:
+	error_print();
+	break;
+      default:
+	rb_bug("Unknown longjmp status %d", ex);
+	break;
+    }
+    rb_threadptr_reset_raised(th);
+    return status;
+}
diff --git a/eval_intern.h b/eval_intern.h
new file mode 100644
index 0000000000..3e1996c345
--- /dev/null
+++ b/eval_intern.h
@@ -0,0 +1,232 @@
+#ifndef RUBY_EVAL_INTERN_H
+#define RUBY_EVAL_INTERN_H
+
+#include "ruby/ruby.h"
+#include "vm_core.h"
+
+#define PASS_PASSED_BLOCK_TH(th) do { \
+    (th)->passed_block = GC_GUARDED_PTR_REF((rb_block_t *)(th)->cfp->lfp[0]); \
+    (th)->cfp->flag |= VM_FRAME_FLAG_PASSED; \
+} while (0)
+
+#define PASS_PASSED_BLOCK() do { \
+    rb_thread_t * const __th__ = GET_THREAD(); \
+    PASS_PASSED_BLOCK_TH(__th__); \
+} while (0)
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+#include <stdio.h>
+#include <setjmp.h>
+
+#ifdef __APPLE__
+#include <crt_externs.h>
+#endif
+
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef atarist
+#  ifndef alloca
+#   define alloca __builtin_alloca
+#  endif
+# endif	/* atarist */
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifndef alloca		/* predefined by HP cc +Olibcalls */
+void *alloca();
+#   endif
+#  endif /* AIX */
+# endif	/* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifndef HAVE_STRING_H
+char *strrchr(const char *, const char);
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_NET_SOCKET_H
+#include <net/socket.h>
+#endif
+
+#define ruby_setjmp(env) RUBY_SETJMP(env)
+#define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
+#ifdef __CYGWIN__
+# ifndef _setjmp
+int _setjmp(jmp_buf);
+# endif
+# ifndef _longjmp
+NORETURN(void _longjmp(jmp_buf, int));
+# endif
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+/*
+  Solaris sys/select.h switches select to select_large_fdset to support larger
+  file descriptors if FD_SETSIZE is larger than 1024 on 32bit environment.
+  But Ruby doesn't change FD_SETSIZE because fd_set is allocated dynamically.
+  So following definition is required to use select_large_fdset.
+*/
+#ifdef HAVE_SELECT_LARGE_FDSET
+#define select(n, r, w, e, t) select_large_fdset(n, r, w, e, t)
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#include <sys/stat.h>
+
+#define SAVE_ROOT_JMPBUF(th, stmt) do \
+  if (ruby_setjmp((th)->root_jmpbuf) == 0) { \
+      stmt; \
+  } \
+  else { \
+      rb_fiber_start(); \
+  } while (0)
+
+#define TH_PUSH_TAG(th) do { \
+  rb_thread_t * const _th = th; \
+  struct rb_vm_tag _tag; \
+  _tag.tag = 0; \
+  _tag.prev = _th->tag; \
+  _th->tag = &_tag;
+
+#define TH_POP_TAG() \
+  _th->tag = _tag.prev; \
+} while (0)
+
+#define TH_POP_TAG2() \
+  _th->tag = _tag.prev
+
+#define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
+#define POP_TAG()      TH_POP_TAG()
+
+#define TH_EXEC_TAG() ruby_setjmp(_th->tag->buf)
+
+#define EXEC_TAG() \
+  TH_EXEC_TAG()
+
+#define TH_JUMP_TAG(th, st) do { \
+  ruby_longjmp(th->tag->buf,(st)); \
+} while (0)
+
+#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), st)
+
+enum ruby_tag_type {
+    RUBY_TAG_RETURN	= 0x1,
+    RUBY_TAG_BREAK	= 0x2,
+    RUBY_TAG_NEXT	= 0x3,
+    RUBY_TAG_RETRY	= 0x4,
+    RUBY_TAG_REDO	= 0x5,
+    RUBY_TAG_RAISE	= 0x6,
+    RUBY_TAG_THROW	= 0x7,
+    RUBY_TAG_FATAL	= 0x8,
+    RUBY_TAG_MASK	= 0xf
+};
+#define TAG_RETURN	RUBY_TAG_RETURN
+#define TAG_BREAK	RUBY_TAG_BREAK
+#define TAG_NEXT	RUBY_TAG_NEXT
+#define TAG_RETRY	RUBY_TAG_RETRY
+#define TAG_REDO	RUBY_TAG_REDO
+#define TAG_RAISE	RUBY_TAG_RAISE
+#define TAG_THROW	RUBY_TAG_THROW
+#define TAG_FATAL	RUBY_TAG_FATAL
+#define TAG_MASK	RUBY_TAG_MASK
+
+#define NEW_THROW_OBJECT(val, pt, st) \
+  ((VALUE)rb_node_newnode(NODE_LIT, (VALUE)(val), (VALUE)(pt), (VALUE)(st)))
+#define SET_THROWOBJ_CATCH_POINT(obj, val) \
+  (RNODE((obj))->u2.value = (val))
+#define SET_THROWOBJ_STATE(obj, val) \
+  (RNODE((obj))->u3.value = (val))
+
+#define GET_THROWOBJ_VAL(obj)         ((VALUE)RNODE((obj))->u1.value)
+#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value)
+#define GET_THROWOBJ_STATE(obj)       ((int)RNODE((obj))->u3.value)
+
+#define SCOPE_TEST(f)  (rb_vm_cref()->nd_visi & (f))
+#define SCOPE_CHECK(f) (rb_vm_cref()->nd_visi == (f))
+#define SCOPE_SET(f)   (rb_vm_cref()->nd_visi = (f))
+
+#define CHECK_STACK_OVERFLOW(cfp, margin) do \
+  if ((VALUE *)((char *)(((VALUE *)(cfp)->sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)cfp)) { \
+      rb_exc_raise(sysstack_error); \
+  } \
+while (0)
+
+void rb_thread_cleanup(void);
+void rb_thread_wait_other_threads(void);
+
+enum {
+    RAISED_EXCEPTION = 1,
+    RAISED_STACKOVERFLOW = 2,
+    RAISED_NOMEMORY = 4
+};
+int rb_threadptr_set_raised(rb_thread_t *th);
+int rb_threadptr_reset_raised(rb_thread_t *th);
+#define rb_thread_raised_set(th, f)   ((th)->raised_flag |= (f))
+#define rb_thread_raised_reset(th, f) ((th)->raised_flag &= ~(f))
+#define rb_thread_raised_p(th, f)     (((th)->raised_flag & (f)) != 0)
+#define rb_thread_raised_clear(th)    ((th)->raised_flag = 0)
+
+VALUE rb_f_eval(int argc, VALUE *argv, VALUE self);
+VALUE rb_make_exception(int argc, VALUE *argv);
+
+NORETURN(void rb_fiber_start(void));
+
+NORETURN(void rb_print_undef(VALUE, ID, int));
+NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
+NORETURN(void rb_vm_jump_tag_but_local_jump(int, VALUE));
+NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, VALUE *argv,
+				      VALUE obj, int call_status));
+
+VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
+NODE *rb_vm_cref(void);
+VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename, VALUE filepath);
+void rb_vm_set_progname(VALUE filename);
+void rb_thread_terminate_all(void);
+VALUE rb_vm_top_self();
+VALUE rb_vm_cbase(void);
+int rb_vm_get_sourceline(const rb_control_frame_t *);
+void rb_trap_restore_mask(void);
+
+#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
+#define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
+#endif
+
+#if defined DOSISH || defined __CYGWIN__
+static inline void
+translit_char(char *p, int from, int to)
+{
+    while (*p) {
+	if ((unsigned char)*p == from)
+	    *p = to;
+	p = CharNext(p);
+    }
+}
+#endif
+
+#endif /* RUBY_EVAL_INTERN_H */
diff --git a/eval_jump.c b/eval_jump.c
new file mode 100644
index 0000000000..18b6835c9c
--- /dev/null
+++ b/eval_jump.c
@@ -0,0 +1,152 @@
+/* -*-c-*- */
+/*
+ * from eval.c
+ */
+
+#include "eval_intern.h"
+
+/* exit */
+
+void
+rb_call_end_proc(VALUE data)
+{
+    rb_proc_call(data, rb_ary_new());
+}
+
+/*
+ *  call-seq:
+ *     at_exit { block } -> proc
+ *
+ *  Converts _block_ to a +Proc+ object (and therefore
+ *  binds it at the point of call) and registers it for execution when
+ *  the program exits. If multiple handlers are registered, they are
+ *  executed in reverse order of registration.
+ *
+ *     def do_at_exit(str1)
+ *       at_exit { print str1 }
+ *     end
+ *     at_exit { puts "cruel world" }
+ *     do_at_exit("goodbye ")
+ *     exit
+ *
+ *  <em>produces:</em>
+ *
+ *     goodbye cruel world
+ */
+
+static VALUE
+rb_f_at_exit(void)
+{
+    VALUE proc;
+
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "called without a block");
+    }
+    proc = rb_block_proc();
+    rb_set_end_proc(rb_call_end_proc, proc);
+    return proc;
+}
+
+struct end_proc_data {
+    void (*func) ();
+    VALUE data;
+    int safe;
+    struct end_proc_data *next;
+};
+
+static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs;
+
+void
+rb_set_end_proc(void (*func)(VALUE), VALUE data)
+{
+    struct end_proc_data *link = ALLOC(struct end_proc_data);
+    struct end_proc_data **list;
+    rb_thread_t *th = GET_THREAD();
+
+    if (th->top_wrapper) {
+	list = &ephemeral_end_procs;
+    }
+    else {
+	list = &end_procs;
+    }
+    link->next = *list;
+    link->func = func;
+    link->data = data;
+    link->safe = rb_safe_level();
+    *list = link;
+}
+
+void
+rb_mark_end_proc(void)
+{
+    struct end_proc_data *link;
+
+    link = end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+    link = ephemeral_end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+    link = tmp_end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+}
+
+void
+rb_exec_end_proc(void)
+{
+    struct end_proc_data *volatile link;
+    struct end_proc_data *tmp;
+    int status;
+    volatile int safe = rb_safe_level();
+
+    while (ephemeral_end_procs) {
+	tmp_end_procs = link = ephemeral_end_procs;
+	ephemeral_end_procs = 0;
+	while (link) {
+	    PUSH_TAG();
+	    if ((status = EXEC_TAG()) == 0) {
+		rb_set_safe_level_force(link->safe);
+		(*link->func) (link->data);
+	    }
+	    POP_TAG();
+	    if (status) {
+		error_handle(status);
+	    }
+	    tmp = link;
+	    tmp_end_procs = link = link->next;
+	    xfree(tmp);
+	}
+    }
+    while (end_procs) {
+	tmp_end_procs = link = end_procs;
+	end_procs = 0;
+	while (link) {
+	    PUSH_TAG();
+	    if ((status = EXEC_TAG()) == 0) {
+		rb_set_safe_level_force(link->safe);
+		(*link->func) (link->data);
+	    }
+	    POP_TAG();
+	    if (status) {
+		error_handle(status);
+	    }
+	    tmp = link;
+	    tmp_end_procs = link = link->next;
+	    xfree(tmp);
+	}
+    }
+    rb_set_safe_level_force(safe);
+}
+
+void
+Init_jump(void)
+{
+    rb_define_global_function("at_exit", rb_f_at_exit, 0);
+}
diff --git a/ext/-test-/bug-3662/bug.c b/ext/-test-/bug-3662/bug.c
new file mode 100644
index 0000000000..9375dace10
--- /dev/null
+++ b/ext/-test-/bug-3662/bug.c
@@ -0,0 +1,16 @@
+#include <ruby.h>
+
+static VALUE
+bug_funcall(int argc, VALUE *argv, VALUE self)
+{
+    if (argc < 1) rb_raise(rb_eArgError, "not enough argument");
+    return rb_funcall2(self, rb_to_id(*argv), argc-1, argv+1);
+}
+
+void
+Init_bug(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    rb_define_module_function(mBug, "funcall", bug_funcall, -1);
+    rb_define_module_function(mBug, "notimplement", rb_f_notimplement, -1);
+}
diff --git a/ext/-test-/bug-3662/extconf.rb b/ext/-test-/bug-3662/extconf.rb
new file mode 100644
index 0000000000..7a1b73023c
--- /dev/null
+++ b/ext/-test-/bug-3662/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/bug-3662/bug")
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
new file mode 100644
index 0000000000..d4ff360575
--- /dev/null
+++ b/ext/-test-/string/cstr.c
@@ -0,0 +1,20 @@
+#include "ruby.h"
+
+static VALUE
+bug_str_cstr_term(VALUE str)
+{
+    long len;
+    char *s;
+    rb_str_modify(str);
+    len = RSTRING_LEN(str);
+    RSTRING_PTR(str)[len] = 'x';
+    s = StringValueCStr(str);
+    rb_gc();
+    return INT2NUM(s[len]);
+}
+
+void
+Init_cstr(VALUE klass)
+{
+    rb_define_method(klass, "cstr_term", bug_str_cstr_term, 0);
+}
diff --git a/ext/-test-/string/extconf.rb b/ext/-test-/string/extconf.rb
new file mode 100644
index 0000000000..42c10b994b
--- /dev/null
+++ b/ext/-test-/string/extconf.rb
@@ -0,0 +1,6 @@
+$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
+inits = $srcs.map {|s| File.basename(s, ".*")}
+inits.delete("init")
+inits.map! {|s|"X(#{s})"}
+$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
+create_makefile("-test-/string/string")
diff --git a/ext/-test-/string/init.c b/ext/-test-/string/init.c
new file mode 100644
index 0000000000..793181d148
--- /dev/null
+++ b/ext/-test-/string/init.c
@@ -0,0 +1,19 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+VALUE
+bug_str_modify(VALUE str)
+{
+    rb_str_modify(str);
+    return str;
+}
+
+void
+Init_string(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "String", rb_cString);
+    rb_define_method(klass, "modify!", bug_str_modify, 0);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/string/set_len.c b/ext/-test-/string/set_len.c
new file mode 100644
index 0000000000..3c7d19d778
--- /dev/null
+++ b/ext/-test-/string/set_len.c
@@ -0,0 +1,14 @@
+#include "ruby.h"
+
+static VALUE
+bug_str_set_len(VALUE str, VALUE len)
+{
+    rb_str_set_len(str, NUM2LONG(len));
+    return str;
+}
+
+void
+Init_set_len(VALUE klass)
+{
+    rb_define_method(klass, "set_len", bug_str_set_len, 1);
+}
diff --git a/ext/.document b/ext/.document
index ba8182593e..3e767d20a8 100644
--- a/ext/.document
+++ b/ext/.document
@@ -1,10 +1,58 @@
 # Add files to this as they become documented
 
-enumerator/enumerator.c
+bigdecimal/bigdecimal.c
+bigdecimal/lib
+coverage/coverage.c
+digest/digest.c
+etc/etc.c
+fcntl/fcntl.c
+gdbm/gdbm.c
 iconv/iconv.c
+io/wait/wait.c
+io/wait/lib
+json/ext/generator/generator.c
+json/ext/parser/parser.c
+json/lib
 nkf/lib/kconv.rb
 nkf/nkf.c
-socket/socket.c
+objspace/objspace.c
+openssl/ossl.c
+openssl/ossl_asn1.c
+openssl/ossl_bn.c
+openssl/ossl_cipher.c
+openssl/ossl_config.c
+openssl/ossl_digest.c
+openssl/ossl_engine.c
+openssl/ossl_hmac.c
+openssl/ossl_ns_spki.c
+openssl/ossl_ocsp.c
+openssl/ossl_pkcs5.c
+openssl/ossl_pkcs7.c
+openssl/ossl_pkcs12.c
+openssl/ossl_pkey.c
+openssl/ossl_pkey_dh.c
+openssl/ossl_pkey_dsa.c
+openssl/ossl_pkey_ec.c
+openssl/ossl_pkey_rsa.c
+openssl/ossl_rand.c
+openssl/ossl_ssl.c
+openssl/ossl_ssl_session.c
+openssl/ossl_x509.c
+openssl/ossl_x509attr.c
+openssl/ossl_x509cert.c
+openssl/ossl_x509crl.c
+openssl/ossl_x509ext.c
+openssl/ossl_x509name.c
+openssl/ossl_x509req.c
+openssl/ossl_x509revoked.c
+openssl/ossl_x509store.c
+openssl/lib/openssl/buffering.rb
+pty/pty.c
+pty/lib
+readline/readline.c
+ripper/ripper.c
+ripper/lib
+socket
 stringio/stringio.c
 strscan/strscan.c
 win32ole
diff --git a/ext/Setup b/ext/Setup
index d0d6317a5e..b0f29b9f7b 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -10,25 +10,23 @@
 #digest/sha1
 #digest/sha2
 #dl
-#enumerator
 #etc
 #fcntl
 #gdbm
 #iconv
 #io/wait
 #nkf
-#pty
 #openssl
+#pty
 #racc/cparse
 #readline
+#ripper
 #sdbm
 #socket
 #stringio
 #strscan
 #syck
 #syslog
-#tcltklib
-#thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index 6bda3a4cfb..6e0b8ae5a6 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -17,18 +17,17 @@ gdbm
 iconv
 io/wait
 nkf
-pty
 #openssl
+pty
 racc/parse
 readline
+ripper
 sdbm
 socket
 stringio
 strscan
 syck
 syslog
-#tcltklib
-thread
 #tk
 #win32ole
 zlib
diff --git a/ext/Setup.dj b/ext/Setup.dj
deleted file mode 100644
index 4f94788886..0000000000
--- a/ext/Setup.dj
+++ /dev/null
@@ -1,34 +0,0 @@
-option nodynamic
-
-#Win32API
-bigdecimal
-curses
-dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
-etc
-enumerator
-fcntl
-gdbm
-#iconv
-#io/wait
-nkf
-#pty
-#openssl
-racc/cparse
-readline
-sdbm
-#socket
-stringio
-strscan
-syck
-#syslog
-#tcltklib
-thread
-#tk
-#win32ole
-zlib
diff --git a/ext/Setup.emx b/ext/Setup.emx
index afc5923577..fade917e92 100644
--- a/ext/Setup.emx
+++ b/ext/Setup.emx
@@ -17,18 +17,17 @@ fcntl
 #iconv
 #io/wait
 nkf
-#pty
 #openssl
+#pty
 racc/cparse
 #readline
+#ripper
 #sdbm
 socket
 stringio
 strscan
 #syck
 #syslog
-#tcltklib
-thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index 9f8abf9b8d..c8574ba70a 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -17,18 +17,17 @@ fcntl
 #iconv
 #io/wait
 nkf
-#pty
 #openssl
+#pty
 racc/cparse
 #readline
+#ripper
 sdbm
 socket
 stringio
 strscan
 syck
 #syslog
-#tcltklib
-thread
 #tk
 win32ole
 #zlib
diff --git a/ext/Setup.x68 b/ext/Setup.x68
deleted file mode 100644
index 0966e737e9..0000000000
--- a/ext/Setup.x68
+++ /dev/null
@@ -1,34 +0,0 @@
-option nodynamic
-
-#Win32API
-bigdecimal
-#curses
-dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
-#etc
-enumerator
-fcntl
-#gdbm
-#iconv
-#io/wait
-nkf
-#pty
-#openssl
-racc/cparse
-#readline
-#sdbm
-#socket
-stringio
-strscan
-#syck
-#syslog
-#tcltklib
-thread
-#tk
-#win32ole
-#zlib
diff --git a/ext/Win32API/.cvsignore b/ext/Win32API/.cvsignore
deleted file mode 100644
index 90c83ed9b1..0000000000
--- a/ext/Win32API/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.log
-*.def
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
deleted file mode 100644
index a4fd0396f0..0000000000
--- a/ext/Win32API/Win32API.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-  Win32API - Ruby Win32 API Import Facility
-*/
-
-#if !defined _MSC_VER && !defined _WIN32
-#define  WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdio.h>
-#endif
-
-#define _T_VOID     0
-#define _T_NUMBER   1
-#define _T_POINTER  2
-#define _T_INTEGER  3
-
-#include "ruby.h"
-
-typedef struct {
-    HANDLE dll;
-    HANDLE proc;
-    VALUE dllname;
-    VALUE import;
-    VALUE export;
-} Win32API;
-
-static void
-Win32API_FreeLibrary(hdll)
-    HINSTANCE hdll;
-{
-    FreeLibrary(hdll);
-}
-
-static VALUE
-Win32API_initialize(self, dllname, proc, import, export)
-    VALUE self;
-    VALUE dllname;
-    VALUE proc;
-    VALUE import;
-    VALUE export;
-{
-    HANDLE hproc;
-    HINSTANCE hdll;
-    VALUE str;
-    VALUE a_import;
-    VALUE *ptr;
-    char *s;
-    int i;
-    int len;
-    int ex = _T_VOID;
-
-    SafeStringValue(dllname);
-    SafeStringValue(proc);
-    hdll = LoadLibrary(RSTRING(dllname)->ptr);
-    if (!hdll)
-	rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
-    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, (void*)hdll));
-    hproc = (HANDLE)GetProcAddress(hdll, RSTRING(proc)->ptr);
-    if (!hproc) {
-	str = rb_str_new3(proc);
-	str = rb_str_cat(str, "A", 1);
-	hproc = (HANDLE)GetProcAddress(hdll, RSTRING(str)->ptr);
-	if (!hproc)
-	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
-		RSTRING(proc)->ptr, RSTRING(str)->ptr);
-    }
-    rb_iv_set(self, "__dll__", UINT2NUM((unsigned long)hdll));
-    rb_iv_set(self, "__dllname__", dllname);
-    rb_iv_set(self, "__proc__", UINT2NUM((unsigned long)hproc));
-
-    a_import = rb_ary_new();
-    switch (TYPE(import)) {
-    case T_NIL:
-	break;
-    case T_ARRAY:
-	ptr = RARRAY(import)->ptr;
-	for (i = 0, len = RARRAY(import)->len; i < len; i++) {
-	    SafeStringValue(ptr[i]);
-	    switch (*(char *)RSTRING(ptr[i])->ptr) {
-	    case 'N': case 'n': case 'L': case 'l':
-		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
-		break;
-	    case 'P': case 'p':
-		rb_ary_push(a_import, INT2FIX(_T_POINTER));
-		break;
-	    case 'I': case 'i':
-		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
-		break;
-	    }
-	}
-        break;
-    default:
-	SafeStringValue(import);
-	s = RSTRING(import)->ptr;
-	for (i = 0, len = RSTRING(import)->len; i < len; i++) {
-	    switch (*s++) {
-	    case 'N': case 'n': case 'L': case 'l':
-		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
-		break;
-	    case 'P': case 'p':
-		rb_ary_push(a_import, INT2FIX(_T_POINTER));
-		break;
-	    case 'I': case 'i':
-		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
-		break;
-	    }
-	}
-        break;
-    }
-
-    if (16 < RARRAY(a_import)->len) {
-	rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len);
-    }
-
-    rb_iv_set(self, "__import__", a_import);
-
-    if (NIL_P(export)) {
-	ex = _T_VOID;
-    } else {
-	SafeStringValue(export);
-	switch (*RSTRING(export)->ptr) {
-        case 'V': case 'v':
-	    ex = _T_VOID;
-	    break;
-	case 'N': case 'n': case 'L': case 'l':
-	    ex = _T_NUMBER;
-	    break;
-	case 'P': case 'p':
-	    ex = _T_POINTER;
-	    break;
-	case 'I': case 'i':
-	    ex = _T_INTEGER;
-	    break;
-	}
-    }
-    rb_iv_set(self, "__export__", INT2FIX(ex));
-
-    return Qnil;
-}
-
-#ifdef _MSC_VER
-#pragma optimize("g", off)
-#endif
-static VALUE
-Win32API_Call(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE args;
-    unsigned long ret;
-    int i;
-    struct {
-	unsigned long params[16];
-    } param;
-#define params param.params
-
-    VALUE obj_proc = rb_iv_get(obj, "__proc__");
-    VALUE obj_import = rb_iv_get(obj, "__import__");
-    VALUE obj_export = rb_iv_get(obj, "__export__");
-    FARPROC ApiFunction = (FARPROC)NUM2ULONG(obj_proc);
-    int items = rb_scan_args(argc, argv, "0*", &args);
-    int nimport = RARRAY(obj_import)->len;
-
-
-    if (items != nimport)
-	rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
-	    nimport, items);
-
-    for (i = 0; i < nimport; i++) {
-	unsigned long lParam = 0;
-	switch (FIX2INT(rb_ary_entry(obj_import, i))) {
-	    VALUE str;
-	case _T_NUMBER:
-	case _T_INTEGER:
-	default:
-	    lParam = NUM2ULONG(rb_ary_entry(args, i));
-	    break;
-	case _T_POINTER:
-	    str = rb_ary_entry(args, i);
-	    if (NIL_P(str)) {
-		lParam = 0;
-	    } else if (FIXNUM_P(str)) {
-		lParam = NUM2ULONG(str);
-	    } else {
-		StringValue(str);
-		rb_str_modify(str);
-		lParam = (unsigned long)StringValuePtr(str);
-	    }
-	    break;
-	}
-	params[i] = lParam;
-    }
-
-    ret = ApiFunction(param);
-
-    switch (FIX2INT(obj_export)) {
-    case _T_NUMBER:
-    case _T_INTEGER:
-	return INT2NUM(ret);
-    case _T_POINTER:
-	return rb_str_new2((char *)ret);
-    case _T_VOID:
-    default:
-	return INT2NUM(0);
-    }
-}
-
-void
-Init_Win32API()
-{
-    VALUE cWin32API = rb_define_class("Win32API", rb_cObject);
-    rb_define_method(cWin32API, "initialize", Win32API_initialize, 4);
-    rb_define_method(cWin32API, "call", Win32API_Call, -1);
-    rb_define_alias(cWin32API,  "Call", "call");
-}
diff --git a/ext/Win32API/depend b/ext/Win32API/depend
deleted file mode 100644
index b224bb66c9..0000000000
--- a/ext/Win32API/depend
+++ /dev/null
@@ -1 +0,0 @@
-Win32API.o : Win32API.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
deleted file mode 100644
index 865788556f..0000000000
--- a/ext/Win32API/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'mkmf'
-
-dir_config("win32")
-if have_header("windows.h") and have_library("kernel32")
-  create_makefile("Win32API")
-end
diff --git a/ext/Win32API/getch.rb b/ext/Win32API/getch.rb
deleted file mode 100644
index c015bbe9bc..0000000000
--- a/ext/Win32API/getch.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'Win32API'
-
-getch = Win32API.new("crtdll", "_getch", [], 'L')
-
-puts getch.Call.chr
diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb
deleted file mode 100644
index 9a2f3827b7..0000000000
--- a/ext/Win32API/lib/win32/registry.rb
+++ /dev/null
@@ -1,831 +0,0 @@
-=begin
-= Win32 Registry I/F
-win32/registry is registry accessor library for Win32 platform.
-It uses Win32API to call Win32 Registry APIs.
-
-== example
-  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
-    value = reg['foo']                               # read a value
-    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
-    type, value = reg.read('foo')                    # read a value
-    reg['foo'] = 'bar'                               # write a value
-    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
-    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
-    
-    reg.each_value { |name, type, data| ... }        # Enumerate values
-    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
-    
-    reg.delete_value(name)                         # Delete a value
-    reg.delete_key(name)                           # Delete a subkey
-    reg.delete_key(name, true)                     # Delete a subkey recursively
-  end
-
-= Reference
-
-== Win32::Registry class
-
-=== including modules
-
-* Enumerable
-* Registry::Constants
-
-=== class methods
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
-    Open the registry key ((|subkey|)) under ((|key|)).
-    ((|key|)) is Win32::Registry object of parent key.
-    You can use predefined key HKEY_* (see ((<constants>)))
-    
-    ((|desired|)) and ((|opt|)) is access mask and key option.
-    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
-    
-    If block is given, the key is closed automatically.
-
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
-    Create or open the registry key ((|subkey|)) under ((|key|)).
-    You can use predefined key HKEY_* (see ((<constants>)))
-    
-    If subkey is already exists, key is opened and Registry#((<created?>))
-    method will return false.
-    
-    If block is given, the key is closed automatically.
-
---- Registry.expand_environ(str)
-    Replace (({%\w+%})) into the environment value of ((|str|)).
-    This method is used for REG_EXPAND_SZ.
-    
-    For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
-
---- Registry.type2name(type)
-    Convert registry type value to readable string.
-
---- Registry.wtime2time(wtime)
-    Convert 64-bit FILETIME integer into Time object.
-
---- Registry.time2wtime(time)
-    Convert Time object or Integer object into 64-bit FILETIME.
-
-=== instance methods
---- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-    Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
-
---- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-    Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
-
---- close
-    Close key.
-    
-    After closed, most method raises error.
-
---- read(name, *rtype)
-    Read a registry value named ((|name|)) and return array of
-    [ ((|type|)), ((|data|)) ].
-    When name is nil, the `default' value is read.
-    
-    ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
-    ((|data|)) is value data, its class is:
-    :REG_SZ, REG_EXPAND_SZ
-       String
-    :REG_MULTI_SZ
-       Array of String
-    :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
-       Integer
-    :REG_BINARY
-       String (contains binary data)
-    
-    When ((|rtype|)) is specified, the value type must be included by
-    ((|rtype|)) array, or TypeError is raised.
-
---- self[name, *rtype]
-    Read a registry value named ((|name|)) and return its value data.
-    The class of value is same as ((<read>)) method returns.
-    
-    If the value type is REG_EXPAND_SZ, returns value data whose environment
-    variables are replaced.
-    If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
-    REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
-    
-    The meaning of ((|rtype|)) is same as ((<read>)) method.
-
---- read_s(name)
---- read_i(name)
---- read_bin(name)
-    Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    registry value named ((|name|)).
-    
-    If the values type does not match, TypeError is raised.
-
---- read_s_expand(name)
-    Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
-    
-    If the value type is REG_EXPAND_SZ, environment variables are replaced.
-    Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
-
---- write(name, type, data)
-    Write ((|data|)) to a registry value named ((|name|)).
-    When name is nil, write to the `default' value.
-    
-    ((|type|)) is type value. (see ((<Registry::Constants module>)))
-    Class of ((|data|)) must be same as which ((<read>))
-    method returns.
-
---- self[name, wtype = nil] = value
-    Write ((|value|)) to a registry value named ((|name|)).
-    
-    If ((|wtype|)) is specified, the value type is it.
-    Otherwise, the value type is depend on class of ((|value|)):
-    :Integer
-      REG_DWORD
-    :String
-      REG_SZ
-    :Array
-      REG_MULTI_SZ
-
---- write_s(name, value)
---- write_i(name, value)
---- write_bin(name, value)
-    Write ((|value|)) to a registry value named ((|name|)).
-    
-    The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    REG_BINARY(write_bin).
-
---- each { |name, type, value| ... }
---- each_value { |name, type, value| ... }
-    Enumerate values.
-
---- each_key { |subkey, wtime| ... }
-    Enumerate subkeys.
-    
-    ((|subkey|)) is String which contains name of subkey.
-    ((|wtime|)) is last write time as FILETIME (64-bit integer).
-    (see ((<Registry.wtime2time>)))
-
---- delete(name)
---- delete_value(name)
-    Delete a registry value named ((|name|)).
-    We can not delete the `default' value.
-
---- delete_key(name, recursive = false)
-    Delete a subkey named ((|name|)) and all its values.
-    
-    If ((|recursive|)) is false, the subkey must not have subkeys.
-    Otherwise, this method deletes all subkeys and values recursively.
-
---- flush
-    Write all the attributes into the registry file.
-
---- created?
-    Returns if key is created ((*newly*)).
-    (see ((<Registry.create>)))
-
---- open?
-    Returns if key is not closed.
-
---- hkey
-    Returns key handle value.
-
---- parent
-    Win32::Registry object of parent key, or nil if predefeined key.
-
---- keyname
-    Same as ((|subkey|)) value of ((<Registry.open>)) or
-    ((<Registry.create>)) method.
-
---- disposition
-    Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
-
---- name
---- to_s
-    Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
-
---- info
-    Returns key information as Array of:
-    :num_keys
-      The number of subkeys.
-    :max_key_length
-      Maximum length of name of subkeys.
-    :num_values
-      The number of values.
-    :max_value_name_length
-      Maximum length of name of values.
-    :max_value_length
-      Maximum length of value of values.
-    :descriptor_length
-      Length of security descriptor.
-    :wtime
-      Last write time as FILETIME(64-bit integer)
-    
-    For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
-
---- num_keys
---- max_key_length
---- num_values
---- max_value_name_length
---- max_value_length
---- descriptor_length
---- wtime
-    Returns an item of key information.
-
-=== constants
---- HKEY_CLASSES_ROOT
---- HKEY_CURRENT_USER
---- HKEY_LOCAL_MACHINE
---- HKEY_PERFORMANCE_DATA
---- HKEY_CURRENT_CONFIG
---- HKEY_DYN_DATA
-    Win32::Registry object whose key is predefined key.
-    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
-
-== Win32::Registry::Constants module
-
-For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
-
---- HKEY_*
-    Predefined key ((*handle*)).
-    These are Integer, not Win32::Registry.
-
---- REG_*
-    Registry value type.
-
---- KEY_*
-    Security access mask.
-
---- KEY_OPTIONS_*
-    Key options.
-
---- REG_CREATED_NEW_KEY
---- REG_OPENED_EXISTING_KEY
-    If the key is created newly or opened existing key.
-    See also Registry#((<disposition>)) method.
-
-=end
-
-require 'Win32API'
-
-module Win32
-  class Registry
-    module Constants
-      HKEY_CLASSES_ROOT = 0x80000000
-      HKEY_CURRENT_USER = 0x80000001
-      HKEY_LOCAL_MACHINE = 0x80000002
-      HKEY_USERS = 0x80000003
-      HKEY_PERFORMANCE_DATA = 0x80000004
-      HKEY_PERFORMANCE_TEXT = 0x80000050
-      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
-      HKEY_CURRENT_CONFIG = 0x80000005
-      HKEY_DYN_DATA = 0x80000006
-      
-      REG_NONE = 0
-      REG_SZ = 1
-      REG_EXPAND_SZ = 2
-      REG_BINARY = 3
-      REG_DWORD = 4
-      REG_DWORD_LITTLE_ENDIAN = 4
-      REG_DWORD_BIG_ENDIAN = 5
-      REG_LINK = 6
-      REG_MULTI_SZ = 7
-      REG_RESOURCE_LIST = 8
-      REG_FULL_RESOURCE_DESCRIPTOR = 9
-      REG_RESOURCE_REQUIREMENTS_LIST = 10
-      REG_QWORD = 11
-      REG_QWORD_LITTLE_ENDIAN = 11
-      
-      STANDARD_RIGHTS_READ = 0x00020000
-      STANDARD_RIGHTS_WRITE = 0x00020000
-      KEY_QUERY_VALUE = 0x0001
-      KEY_SET_VALUE = 0x0002
-      KEY_CREATE_SUB_KEY = 0x0004
-      KEY_ENUMERATE_SUB_KEYS = 0x0008
-      KEY_NOTIFY = 0x0010
-      KEY_CREATE_LINK = 0x0020
-      KEY_READ = STANDARD_RIGHTS_READ |
-        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
-      KEY_WRITE = STANDARD_RIGHTS_WRITE |
-        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
-      KEY_EXECUTE = KEY_READ
-      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-      
-      REG_OPTION_RESERVED = 0x0000
-      REG_OPTION_NON_VOLATILE = 0x0000
-      REG_OPTION_VOLATILE = 0x0001
-      REG_OPTION_CREATE_LINK = 0x0002
-      REG_OPTION_BACKUP_RESTORE = 0x0004
-      REG_OPTION_OPEN_LINK = 0x0008
-      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
-        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
-        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
-      
-      REG_CREATED_NEW_KEY = 1
-      REG_OPENED_EXISTING_KEY = 2
-      
-      REG_WHOLE_HIVE_VOLATILE = 0x0001
-      REG_REFRESH_HIVE = 0x0002
-      REG_NO_LAZY_FLUSH = 0x0004
-      REG_FORCE_RESTORE = 0x0008
-      
-      MAX_KEY_LENGTH = 514
-      MAX_VALUE_LENGTH = 32768
-    end
-    include Constants
-    include Enumerable
-    
-    #
-    # Error
-    #
-    class Error < ::StandardError
-      FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
-      def initialize(code)
-        @code = code
-        msg = "\0" * 1024
-        len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
-        super msg[0, len].tr("\r", '').chomp
-      end
-      attr_reader :code
-    end
-    
-    #
-    # Predefined Keys
-    #
-    class PredefinedKey < Registry
-      def initialize(hkey, keyname)
-        @hkey = hkey
-        @parent = nil
-        @keyname = keyname
-        @disposition = REG_OPENED_EXISTING_KEY
-      end
-      
-      # Predefined keys cannot be closed
-      def close
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-      
-      # Fake class for Registry#open, Registry#create
-      def class
-        Registry
-      end
-      
-      # Make all
-      Constants.constants.grep(/^HKEY_/) do |c|
-        Registry.const_set c, new(Constants.const_get(c), c)
-      end
-    end
-    
-    #
-    # Win32 APIs
-    #
-    module API
-      [
-        %w/RegOpenKeyExA    LPLLP        L/,
-        %w/RegCreateKeyExA  LPLLLLPPP    L/,
-        %w/RegEnumValueA    LLPPPPPP     L/,
-        %w/RegEnumKeyExA    LLPPLLLP     L/,
-        %w/RegQueryValueExA LPLPPP       L/,
-        %w/RegSetValueExA   LPLLPL       L/,
-        %w/RegDeleteValue   LP           L/,
-        %w/RegDeleteKey     LP           L/,
-        %w/RegFlushKey      L            L/,
-        %w/RegCloseKey      L            L/,
-        %w/RegQueryInfoKey  LPPPPPPPPPPP L/,
-      ].each do |fn|
-        const_set fn[0].intern, Win32API.new('advapi32.dll', *fn)
-      end
-      
-      module_function
-      
-      def check(result)
-        raise Error, result, caller(2) if result != 0
-      end
-      
-      def packdw(dw)
-        [dw].pack('V')
-      end
-      
-      def unpackdw(dw)
-        dw += [0].pack('V')
-        dw.unpack('V')[0]
-      end
-      
-      def packqw(qw)
-        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
-      end
-      
-      def unpackqw(qw)
-        qw = qw.unpack('VV')
-        (qw[1] << 32) | qw[0]
-      end
-      
-      def OpenKey(hkey, name, opt, desired)
-        result = packdw(0)
-        check RegOpenKeyExA.call(hkey, name, opt, desired, result)
-        unpackdw(result)
-      end
-      
-      def CreateKey(hkey, name, opt, desired)
-        result = packdw(0)
-        disp = packdw(0)
-        check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
-                                   0, result, disp)
-        [ unpackdw(result), unpackdw(disp) ]
-      end
-      
-      def EnumValue(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
-        name[0, unpackdw(size)]
-      end
-      
-      def EnumKey(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        wtime = ' ' * 8
-        check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
-        [ name[0, unpackdw(size)], unpackqw(wtime) ]
-      end
-      
-      def QueryValue(hkey, name)
-        type = packdw(0)
-        size = packdw(0)
-        check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
-        data = ' ' * unpackdw(size)
-        check RegQueryValueExA.call(hkey, name, 0, type, data, size)
-        [ unpackdw(type), data[0, unpackdw(size)] ]
-      end
-      
-      def SetValue(hkey, name, type, data, size)
-        check RegSetValueExA.call(hkey, name, 0, type, data, size)
-      end
-      
-      def DeleteValue(hkey, name)
-        check RegDeleteValue.call(hkey, name)
-      end
-      
-      def DeleteKey(hkey, name)
-        check RegDeleteKey.call(hkey, name)
-      end
-      
-      def FlushKey(hkey)
-        check RegFlushKey.call(hkey)
-      end
-      
-      def CloseKey(hkey)
-        check RegCloseKey.call(hkey)
-      end
-      
-      def QueryInfoKey(hkey)
-        subkeys = packdw(0)
-        maxsubkeylen = packdw(0)
-        values = packdw(0)
-        maxvaluenamelen = packdw(0)
-        maxvaluelen = packdw(0)
-        secdescs = packdw(0)
-        wtime = ' ' * 8
-        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
-          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
-        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
-          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
-          unpackdw(secdescs), unpackqw(wtime) ]
-      end
-    end
-    
-    #
-    # utility functions
-    #
-    def self.expand_environ(str)
-      str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
-    end
-    
-    @@type2name = { }
-    %w[
-      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
-      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
-      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
-      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
-    ].each do |type|
-      @@type2name[Constants.const_get(type)] = type
-    end
-    
-    def self.type2name(type)
-      @@type2name[type] || type.to_s
-    end
-    
-    def self.wtime2time(wtime)
-      Time.at((wtime - 116444736000000000) / 10000000)
-    end
-    
-    def self.time2wtime(time)
-      time.to_i * 10000000 + 116444736000000000
-    end
-    
-    #
-    # constructors
-    #
-    private_class_method :new
-    
-    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-      subkey = subkey.chomp('\\')
-      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-    
-    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, disp)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-    
-    #
-    # finalizer
-    #
-    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
-    
-    #
-    # initialize
-    #
-    def initialize(hkey, parent, keyname, disposition)
-      @hkey = hkey
-      @parent = parent
-      @keyname = keyname
-      @disposition = disposition
-      @hkeyfinal = [ hkey ]
-      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
-    end
-    attr_reader :hkey, :parent, :keyname, :disposition
-    
-    #
-    # attributes
-    #
-    def created?
-      @disposition == REG_CREATED_NEW_KEY
-    end
-    
-    def open?
-      !@hkey.nil?
-    end
-    
-    def name
-      parent = self
-      name = @keyname
-      while parent = parent.parent
-        name = parent.keyname + '\\' + name
-      end
-      name
-    end
-    
-    def inspect
-      "\#<Win32::Registry key=#{name.inspect}>"
-    end
-    
-    #
-    # marshalling
-    #
-    def _dump(depth)
-      raise TypeError, "can't dump Win32::Registry"
-    end
-    
-    #
-    # open/close
-    #
-    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
-      self.class.open(self, subkey, desired, opt, &blk)
-    end
-    
-    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
-      self.class.create(self, subkey, desired, opt, &blk)
-    end
-    
-    def close
-      API.CloseKey(@hkey)
-      @hkey = @parent = @keyname = nil
-      @hkeyfinal[0] = nil
-    end
-    
-    #
-    # iterator
-    #
-    def each_value
-      index = 0
-      while true
-        begin
-          subkey = API.EnumValue(@hkey, index)
-        rescue Error
-          break
-        end
-        begin
-          type, data = read(subkey)
-        rescue Error
-          next
-        end
-        yield subkey, type, data
-        index += 1
-      end
-      index
-    end
-    alias each each_value
-    
-    def each_key
-      index = 0
-      while true
-        begin
-          subkey, wtime = API.EnumKey(@hkey, index)
-        rescue Error
-          break
-        end
-        yield subkey, wtime
-        index += 1
-      end
-      index
-    end
-    
-    def keys
-      keys_ary = []
-      each_key { |key,| keys_ary << key }
-      keys_ary
-    end
-    
-    #
-    # reader
-    #
-    def read(name, *rtype)
-      type, data = API.QueryValue(@hkey, name)
-      unless rtype.empty? or rtype.include?(type)
-        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
-      end
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        [ type, data.chop ]
-      when REG_MULTI_SZ
-        [ type, data.split(/\0/) ]
-      when REG_BINARY
-        [ type, data ]
-      when REG_DWORD
-        [ type, API.unpackdw(data) ]
-      when REG_DWORD_BIG_ENDIAN
-        [ type, data.unpack('N')[0] ]
-      when REG_QWORD
-        [ type, API.unpackqw(data) ]
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-    
-    def [](name, *rtype)
-      type, data = read(name, *rtype)
-      case type
-      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
-        data
-      when REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-    
-    def read_s(name)
-      read(name, REG_SZ)[1]
-    end
-    
-    def read_s_expand(name)
-      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
-      if type == REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        data
-      end
-    end
-    
-    def read_i(name)
-      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
-    end
-    
-    def read_bin(name)
-      read(name, REG_BINARY)[1]
-    end
-    
-    #
-    # writer
-    #
-    def write(name, type, data)
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        data = data.to_s + "\0"
-      when REG_MULTI_SZ
-        data = data.to_a.join("\0") + "\0\0"
-      when REG_BINARY
-        data = data.to_s
-      when REG_DWORD
-        data = API.packdw(data.to_i)
-      when REG_DWORD_BIG_ENDIAN
-        data = [data.to_i].pack('N')
-      when REG_QWORD
-        data = API.packqw(data.to_i)
-      else
-        raise TypeError, "Unsupported type #{type}"
-      end
-      API.SetValue(@hkey, name, type, data, data.length)
-    end
-    
-    def []=(name, rtype, value = nil)
-      if value
-        write name, rtype, value
-      else
-        case value = rtype
-        when Integer
-          write name, REG_DWORD, value
-        when String
-          write name, REG_SZ, value
-        when Array
-          write name, REG_MULTI_SZ, value
-        else
-          raise TypeError, "Unexpected type #{value.class}"
-        end
-      end
-      value
-    end
-    
-    def write_s(name, value)
-      write name, REG_SZ, value.to_s
-    end
-    
-    def write_i(name, value)
-      write name, REG_DWORD, value.to_i
-    end
-    
-    def write_bin(name, value)
-      write name, REG_BINARY, value.to_s
-    end
-    
-    #
-    # delete
-    #
-    def delete_value(name)
-      API.DeleteValue(@hkey, name)
-    end
-    alias delete delete_value
-    
-    def delete_key(name, recursive = false)
-      if recursive
-        open(name, KEY_ALL_ACCESS) do |reg|
-          reg.keys.each do |key|
-            begin
-              reg.delete_key(key, true)
-            rescue Error
-              #
-            end
-          end
-        end
-        API.DeleteKey(@hkey, name)
-      else
-        begin
-          API.EnumKey @hkey, 0
-        rescue Error
-          return API.DeleteKey(@hkey, name)
-        end
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-    end
-    
-    #
-    # flush
-    #
-    def flush
-      API.FlushKey @hkey
-    end
-    
-    #
-    # key information
-    #
-    def info
-      API.QueryInfoKey(@hkey)
-    end
-    %w[
-      num_keys max_key_length
-      num_values max_value_name_length max_value_length
-      descriptor_length wtime
-    ].each_with_index do |s, i|
-      eval <<-__END__
-        def #{s}
-          info[#{i}]
-        end
-      __END__
-    end
-  end
-end
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
deleted file mode 100644
index 92336fac28..0000000000
--- a/ext/Win32API/lib/win32/resolv.rb
+++ /dev/null
@@ -1,366 +0,0 @@
-=begin
-= Win32 DNS and DHCP I/F
-
-=end
-
-require 'win32/registry'
-
-module Win32
-  module Resolv
-    API = Registry::API
-    
-    def self.get_hosts_path
-      path = get_hosts_dir
-      path = File.expand_path('hosts', path)
-      File.exist?(path) ? path : nil
-    end
-    
-    def self.get_resolv_info
-      search, nameserver = get_info
-      if search.empty?
-        search = nil
-      else
-        search.delete("")
-        search.uniq!
-      end
-      if nameserver.empty?
-        nameserver = nil
-      else
-        nameserver.delete("")
-        nameserver.delete("0.0.0.0")
-        nameserver.uniq!
-      end
-      [ search, nameserver ]
-    end
-
-getv = Win32API.new('kernel32.dll', 'GetVersionExA', 'P', 'L')
-info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
-getv.call(info)
-if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
-#====================================================================
-# Windows NT
-#====================================================================
-  module_eval <<-'__EOS__', __FILE__, __LINE__+1
-    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
-    
-    class << self
-      private
-      def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          reg.read_s_expand('DataBasePath')
-        end
-      end
-      
-      def get_info
-        search = nil
-        nameserver = []
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          begin
-            slist = reg.read_s('SearchList')
-            search = slist.split(/,\s*/) unless slist.empty?
-          rescue Registry::Error
-          end
-          
-          if add_search = search.nil?
-            search = []
-            begin
-              nvdom = reg.read_s('NV Domain')
-              unless nvdom.empty?
-                @search = [ nvdom ]
-                if reg.read_i('UseDomainNameDevolution') != 0
-                  if /^[\w\d]+\./ =~ nvdom
-                    devo = $'
-                  end
-                end
-              end
-            rescue Registry::Error
-            end
-          end
-          
-          reg.open('Interfaces') do |reg|
-            reg.each_key do |iface,|
-              reg.open(iface) do |regif|
-                begin
-                  [ 'NameServer', 'DhcpNameServer' ].each do |key|
-                    ns = regif.read_s(key)
-                    unless ns.empty?
-                      nameserver.concat(ns.split(/[,\s]\s*/))
-                      break
-                    end
-                  end
-                rescue Registry::Error
-                end
-                
-                if add_search
-                  begin
-                    [ 'Domain', 'DhcpDomain' ].each do |key|
-                      dom = regif.read_s(key)
-                      unless dom.empty?
-                        search.concat(dom.split(/,\s*/))
-                        break
-                      end
-                    end
-                  rescue Registry::Error
-                  end
-                end
-              end
-            end
-          end
-          search << devo if add_search and devo
-        end
-        [ search.uniq, nameserver.uniq ]
-      end
-    end
-  __EOS__
-else
-#====================================================================
-# Windows 9x
-#====================================================================
-  module_eval <<-'__EOS__', __FILE__, __LINE__+1
-    TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
-    DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
-    WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
-    
-    class << self
-   #   private
-      
-      def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
-          reg.read_s_expand('SystemRoot')
-        end
-      end
-      
-      def get_info
-        search = []
-        nameserver = []
-        begin
-          Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
-            if reg.read_s("EnableDNS") == "1"
-              domain = reg.read_s("Domain")
-              ns = reg.read_s("NameServer")
-              slist = reg.read_s("SearchList")
-              search << domain unless domain.empty?
-              search.concat(slist.split(/,\s*/))
-              nameserver.concat(ns.split(/[,\s]\s*/))
-            end
-          end
-        rescue Registry::Error
-        end
-        
-        dhcpinfo = get_dhcpinfo
-        search.concat(dhcpinfo[0])
-        nameserver.concat(dhcpinfo[1])
-        [ search, nameserver ]
-      end
-      
-      def get_dhcpinfo
-        macaddrs = {}
-        ipaddrs = {}
-        WsControl.get_iflist.each do |index, macaddr, *ipaddr|
-          macaddrs[macaddr] = 1
-          ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
-        end
-        iflist = [ macaddrs, ipaddrs ]
-        
-        search = []
-        nameserver = []
-        version = -1
-        Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
-          begin
-            version = API.unpackdw(reg.read_bin("Version"))
-          rescue Registry::Error
-          end
-          
-          reg.each_key do |key,|
-            catch(:not_used) do
-              reg.open(key) do |regdi|
-                dom, ns = get_dhcpinfo_key(version, regdi, iflist)
-                search << dom if dom
-                nameserver.concat(ns) if ns
-              end
-            end
-          end
-        end
-        [ search, nameserver ]
-      end
-      
-      def get_dhcpinfo_95(reg)
-        dhcp = reg.read_bin("DhcpInfo")
-        [
-          API.unpackdw(dhcp[4..7]),
-          API.unpackdw(dhcp[8..11]),
-          1,
-          dhcp[45..50],
-          reg.read_bin("OptionInfo"),
-        ]
-      end
-      
-      def get_dhcpinfo_98(reg)
-        [
-          API.unpackdw(reg.read_bin("DhcpIPAddress")),
-          API.unpackdw(reg.read_bin("DhcpSubnetMask")),
-          API.unpackdw(reg.read_bin("HardwareType")),
-          reg.read_bin("HardwareAddress"),
-          reg.read_bin("OptionInfo"),
-        ]
-      end
-      
-      def get_dhcpinfo_key(version, reg, iflist)
-        info = case version
-               when 1
-                 get_dhcpinfo_95(reg)
-               when 2
-                 get_dhcpinfo_98(reg)
-               else
-                 begin
-                   get_dhcpinfo_98(reg)
-                 rescue Registry::Error
-                   get_dhcpinfo_95(reg)
-                 end
-               end
-        ipaddr, netmask, hwtype, macaddr, opt = info
-        throw :not_used unless
-          ipaddr and ipaddr != 0 and
-          netmask and netmask != 0 and
-          macaddr and macaddr.size == 6 and
-          hwtype == 1 and
-          iflist[0][macaddr] and iflist[1][ipaddr]
-        
-        size = opt.size
-        idx = 0
-        while idx <= size
-          opttype = opt[idx]
-          optsize = opt[idx + 1]
-          optval  = opt[idx + 2, optsize]
-          case opttype
-          when 0xFF    ## term
-            break
-          when 0x0F    ## domain
-            domain = optval.chomp("\0")
-          when 0x06    ## dns
-            nameserver = optval.scan(/..../).collect { |addr|
-              "%d.%d.%d.%d" % addr.unpack('C4')
-            }
-          end
-          idx += optsize + 2
-        end
-        [ domain, nameserver ]
-      rescue Registry::Error
-        throw :not_used
-      end
-    end
-    
-    module WsControl
-      WsControl = Win32API.new('wsock32.dll', 'WsControl', 'LLPPPP', 'L')
-      WSAGetLastError = Win32API.new('wsock32.dll', 'WSAGetLastError', 'V', 'L')
-      
-      MAX_TDI_ENTITIES = 512
-      IPPROTO_TCP = 6
-      WSCTL_TCP_QUERY_INFORMATION = 0
-      INFO_CLASS_GENERIC = 0x100
-      INFO_CLASS_PROTOCOL = 0x200
-      INFO_TYPE_PROVIDER = 0x100
-      ENTITY_LIST_ID = 0
-      GENERIC_ENTITY = 0
-      CL_NL_ENTITY = 0x301
-      IF_ENTITY = 0x200
-      ENTITY_TYPE_ID = 1
-      CL_NL_IP = 0x303
-      IF_MIB = 0x202
-      IF_MIB_STATS_ID = 1
-      IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
-      
-      def self.wsctl(tei_entity, tei_instance,
-                     toi_class, toi_type, toi_id,
-                     buffsize)
-        reqinfo = [
-                  ## TDIEntityID
-                    tei_entity, tei_instance,
-                  ## TDIObjectID
-                    toi_class, toi_type, toi_id,
-                  ## TCP_REQUEST_INFORMATION_EX
-                    ""
-                  ].pack('VVVVVa16')
-        reqsize = API.packdw(reqinfo.size)
-        buff = "\0" * buffsize
-        buffsize = API.packdw(buffsize)
-        result = WsControl.call(
-                   IPPROTO_TCP,
-                   WSCTL_TCP_QUERY_INFORMATION,
-                   reqinfo, reqsize,
-                   buff, buffsize)
-        if result != 0
-          raise RuntimeError, "WsControl failed.(#{result})"
-        end
-        [ buff, API.unpackdw(buffsize) ]
-      end
-      private_class_method :wsctl
-      
-      def self.get_iflist
-        # Get TDI Entity List
-        entities, size =
-          wsctl(GENERIC_ENTITY, 0,
-                INFO_CLASS_GENERIC,
-                INFO_TYPE_PROVIDER,
-                ENTITY_LIST_ID,
-                MAX_TDI_ENTITIES * 8)  # sizeof(TDIEntityID)
-        entities = entities[0, size].
-                     scan(/.{8}/).
-                     collect { |e| e.unpack('VV') }
-
-        # Get MIB Interface List
-        iflist = []
-        ifcount = 0
-        entities.each do |entity, instance|
-          if( (entity & IF_ENTITY)>0 )
-            ifcount += 1
-            etype, = wsctl(entity, instance,
-                           INFO_CLASS_GENERIC,
-                           INFO_TYPE_PROVIDER,
-                           ENTITY_TYPE_ID,
-                           4)
-            if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
-              ifentry, = wsctl(entity, instance,
-                               INFO_CLASS_PROTOCOL,
-                               INFO_TYPE_PROVIDER,
-                               IF_MIB_STATS_ID,
-                               21 * 4 + 8 + 130)  # sizeof(IFEntry)
-              iflist << [
-                API.unpackdw(ifentry[0,4]),
-                ifentry[20, 6]
-              ]
-            end
-          end
-        end
-        
-        # Get IP Addresses
-        entities.each do |entity, instance|
-          if entity == CL_NL_ENTITY
-            etype, = wsctl(entity, instance,
-                           INFO_CLASS_GENERIC,
-                           INFO_TYPE_PROVIDER,
-                           ENTITY_TYPE_ID,
-                           4)
-            if API.unpackdw(etype) == CL_NL_IP
-              ipentries, = wsctl(entity, instance,
-                                 INFO_CLASS_PROTOCOL,
-                                 INFO_TYPE_PROVIDER,
-                                 IP_MIB_ADDRTABLE_ENTRY_ID,
-                                 24 * (ifcount+1))  # sizeof(IPAddrEntry)
-              ipentries.scan(/.{24}/) do |ipentry|
-                ipaddr, index = ipentry.unpack('VV')
-                if ifitem = iflist.assoc(index)
-                  ifitem << ipaddr
-                end
-              end
-            end
-          end
-        end
-        iflist
-      end
-    end
-  __EOS__
-end
-#====================================================================
-  end
-end
diff --git a/ext/Win32API/point.rb b/ext/Win32API/point.rb
deleted file mode 100644
index 60e265f3ee..0000000000
--- a/ext/Win32API/point.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'Win32API'
-
-getCursorPos = Win32API.new("user32", "GetCursorPos", ['P'], 'V')
-
-lpPoint = " " * 8 # store two LONGs
-getCursorPos.Call(lpPoint)
-x, y = lpPoint.unpack("LL") # get the actual values
-
-print "x: ", x, "\n"
-print "y: ", y, "\n"
-
-ods = Win32API.new("kernel32", "OutputDebugString", ['P'], 'V')
-ods.Call("Hello, World\n");
-
-GetDesktopWindow = Win32API.new("user32", "GetDesktopWindow", [], 'L')
-GetActiveWindow = Win32API.new("user32", "GetActiveWindow", [], 'L')
-SendMessage = Win32API.new("user32", "SendMessage", ['L'] * 4, 'L')
-SendMessage.Call GetDesktopWindow.Call, 274, 0xf140, 0
diff --git a/ext/bigdecimal/.cvsignore b/ext/bigdecimal/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/bigdecimal/.cvsignore
+++ b/ext/bigdecimal/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 636c0907d6..1a712e9cb9 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -8,12 +8,12 @@
  * License or the Artistic License, as specified in the README file
  * of this BigDecimal distribution.
  *
- *  NOTE: Change log in this source removed to reduce source code size. 
+ *  NOTE: Change log in this source removed to reduce source code size.
  *        See rev. 1.25 if needed.
  *
  */
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,8 +22,11 @@
 #include <float.h>
 #include <math.h>
 #include "math.h"
-#include "version.h"
- 
+
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
 /* #define ENABLE_NUMERIC_STRING */
 
 VALUE rb_cBigDecimal;
@@ -32,126 +35,32 @@ VALUE rb_cBigDecimal;
 
 /* MACRO's to guard objects from GC by keeping them in stack */
 #define ENTER(n) volatile VALUE vStack[n];int iStack=0
-#define PUSH(x)  vStack[iStack++] = (unsigned long)(x);
+#define PUSH(x)  vStack[iStack++] = (VALUE)(x);
 #define SAVE(p)  PUSH(p->obj);
 #define GUARD_OBJ(p,y) {p=y;SAVE(p);}
 
+#ifndef BASE_FIG
+static U_LONG BASE_FIG = 4;     /* =log10(BASE)  */
+static U_LONG BASE = 10000L;    /* Base value(value must be 10**BASE_FIG) */
+                /* The value of BASE**2 + BASE must be represented */
+                /* within one U_LONG. */
+static U_LONG HALF_BASE = 5000L;/* =BASE/2  */
+static U_LONG BASE1 = 1000L;    /* =BASE/10  */
+#else
+#ifndef BASE
+#error BASE_FIG is defined but BASE is not
+#endif
+#define HALF_BASE (BASE/2)
+#define BASE1 (BASE/10)
+#endif
+#ifndef DBLE_FIG
+#define DBLE_FIG (DBL_DIG+1)    /* figure of double */
+#endif
+
 /*
  * ================== Ruby Interface part ==========================
  */
-#define DoSomeOne(x,y) rb_num_coerce_bin(x,y)
-
-#if 0
-/* BigDecimal provides arbitrary-precision floating point decimal arithmetic.
- *
- * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
- * You may distribute under the terms of either the GNU General Public
- * License or the Artistic License, as specified in the README file
- * of the BigDecimal distribution.
- *
- * Documented by mathew <meta@pobox.com>.
- *
- * = Introduction
- *
- * Ruby provides built-in support for arbitrary precision integer arithmetic.
- * For example:
- *
- * 42**13   ->   1265437718438866624512
- *
- * BigDecimal provides similar support for very large or very accurate floating
- * point numbers.
- *
- * Decimal arithmetic is also useful for general calculation, because it
- * provides the correct answers people expect--whereas normal binary floating
- * point arithmetic often introduces subtle errors because of the conversion
- * between base 10 and base 2. For example, try:
- *
- *   sum = 0
- *   for i in (1..10000)
- *     sum = sum + 0.0001
- *   end
- *   print sum
- *
- * and contrast with the output from:
- *
- *   require 'bigdecimal'
- *
- *   sum = BigDecimal.new("0")
- *   for i in (1..10000)
- *     sum = sum + BigDecimal.new("0.0001")
- *   end
- *   print sum
- *
- * Similarly:
- *
- * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
- *
- * (1.2 - 1.0) == 0.2 -> false
- *
- * = Special features of accurate decimal arithmetic
- *
- * Because BigDecimal is more accurate than normal binary floating point
- * arithmetic, it requires some special values.
- *
- * == Infinity
- *
- * BigDecimal sometimes needs to return infinity, for example if you divide
- * a value by zero.
- *
- * BigDecimal.new("1.0") / BigDecimal.new("0.0")  -> infinity
- *
- * BigDecimal.new("-1.0") / BigDecimal.new("0.0")  -> -infinity
- *
- * You can represent infinite numbers to BigDecimal using the strings
- * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
- *
- * == Not a Number
- *
- * When a computation results in an undefined value, the special value NaN
- * (for 'not a number') is returned.
- *
- * Example:
- *
- * BigDecimal.new("0.0") / BigDecimal.new("0.0") -> NaN
- *
- * You can also create undefined values.  NaN is never considered to be the
- * same as any other value, even NaN itself:
- *
- * n = BigDecimal.new('NaN')
- *
- * n == 0.0 -> nil
- *
- * n == n -> nil
- *
- * == Positive and negative zero
- *
- * If a computation results in a value which is too small to be represented as
- * a BigDecimal within the currently specified limits of precision, zero must
- * be returned.
- *
- * If the value which is too small to be represented is negative, a BigDecimal
- * value of negative zero is returned. If the value is positive, a value of
- * positive zero is returned.
- *
- * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") -> -0.0
- *
- * BigDecimal.new("1.0") / BigDecimal.new("Infinity") -> 0.0
- *
- * (See BigDecimal.mode for how to specify limits of precision.)
- *
- * Note that -0.0 and 0.0 are considered to be the same for the purposes of
- * comparison.
- *
- * Note also that in mathematics, there is no particular concept of negative 
- * or positive zero; true mathematical zero has no sign.
- */
-void
-Init_BigDecimal()
-{
-    /* This is a #if-ed out function to fool Rdoc into documenting the class. */
-    /* The real init function is Init_bigdecimal() further down. */
-}
-#endif
+#define DoSomeOne(x,y,f) rb_num_coerce_bin(x,y,f)
 
 /*
  * Returns the BigDecimal version number.
@@ -170,11 +79,11 @@ BigDecimal_version(VALUE self)
 }
 
 /*
- *   VP routines used in BigDecimal part 
+ *   VP routines used in BigDecimal part
  */
 static unsigned short VpGetException(void);
 static void  VpSetException(unsigned short f);
-static void  VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v);
+static void  VpInternalRound(Real *c,U_LONG ixDigit,U_LONG vPrev,U_LONG v);
 static int   VpLimitRound(Real *c,U_LONG ixDigit);
 
 /*
@@ -182,11 +91,23 @@ static int   VpLimitRound(Real *c,U_LONG ixDigit);
  */
 
 static void
-BigDecimal_delete(Real *pv)
+BigDecimal_delete(void *pv)
 {
     VpFree(pv);
 }
 
+static size_t
+BigDecimal_memsize(const void *ptr)
+{
+    const Real *pv = ptr;
+    return pv ? (sizeof(*pv) + pv->MaxPrec * sizeof(U_LONG)) : 0;
+}
+
+static const rb_data_type_t BigDecimal_data_type = {
+    "BigDecimal",
+    0, BigDecimal_delete, BigDecimal_memsize,
+};
+
 static VALUE
 ToValue(Real *p)
 {
@@ -206,12 +127,27 @@ GetVpValue(VALUE v, int must)
     Real *pv;
     VALUE bg;
     char szD[128];
+    VALUE orig = Qundef;
+    int util_loaded = 0;
 
+again:
     switch(TYPE(v))
     {
+    case T_RATIONAL:
+        if(orig == Qundef ? (orig = v, 1) : orig != v) {
+            if(!util_loaded) {
+                rb_require("bigdecimal/util");
+                util_loaded = 1;
+            }
+            v = rb_funcall2(v, rb_intern("to_d"), 0, 0);
+            goto again;
+        }
+        v = orig;
+        goto SomeOneMayDoIt;
+
     case T_DATA:
-        if(RDATA(v)->dfree ==(void *) BigDecimal_delete) {
-            Data_Get_Struct(v, Real, pv);
+        if(rb_typeddata_is_kind_of(v, &BigDecimal_data_type)) {
+            pv = DATA_PTR(v);
             return pv;
         } else {
             goto SomeOneMayDoIt;
@@ -265,7 +201,7 @@ BigDecimal_double_fig(VALUE self)
  *
  * Returns an Array of two Integer values.
  *
- * The first value is the current number of significant digits in the 
+ * The first value is the current number of significant digits in the
  * BigDecimal. The second value is the maximum number of significant digits
  * for the BigDecimal.
  */
@@ -306,17 +242,19 @@ static VALUE
 BigDecimal_dump(int argc, VALUE *argv, VALUE self)
 {
     ENTER(5);
-    char sz[50];
     Real *vp;
     char *psz;
     VALUE dummy;
+    volatile VALUE dump;
+
     rb_scan_args(argc, argv, "01", &dummy);
     GUARD_OBJ(vp,GetVpValue(self,1));
-    sprintf(sz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
-    psz = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E")+strlen(sz));
-    sprintf(psz,"%s",sz);
+    dump = rb_str_new(0,VpNumOfChars(vp,"E")+50);
+    psz = RSTRING_PTR(dump);
+    sprintf(psz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
     VpToString(vp, psz+strlen(psz), 0, 0);
-    return rb_str_new2(psz);
+    rb_str_resize(dump, strlen(psz));
+    return dump;
 }
 
 /*
@@ -363,8 +301,8 @@ BigDecimal_load(VALUE self, VALUE str)
   * BigDecimal::EXCEPTION_ZERODIVIDE
   * BigDecimal::EXCEPTION_ALL
   *
-  * For each mode parameter above, if the value set is false, computation 
-  * continues after an arithmetic exception of the appropriate type. 
+  * For each mode parameter above, if the value set is false, computation
+  * continues after an arithmetic exception of the appropriate type.
   * When computation continues, results are as follows:
   *
   * EXCEPTION_NaN:: NaN
@@ -391,7 +329,7 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
     VALUE which;
     VALUE val;
     unsigned long f,fo;
- 
+
     if(rb_scan_args(argc,argv,"11",&which,&val)==1) val = Qnil;
 
     Check_Type(which, T_FIXNUM);
@@ -409,11 +347,22 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
             VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_INFINITY):
                            (fo&(~VP_EXCEPTION_INFINITY))));
         }
+        fo = VpGetException();
         if(f&VP_EXCEPTION_NaN) {
             VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_NaN):
                            (fo&(~VP_EXCEPTION_NaN))));
         }
         fo = VpGetException();
+        if(f&VP_EXCEPTION_UNDERFLOW) {
+            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_UNDERFLOW):
+                           (fo&(~VP_EXCEPTION_UNDERFLOW))));
+        }
+        fo = VpGetException();
+        if(f&VP_EXCEPTION_ZERODIVIDE) {
+            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_ZERODIVIDE):
+                           (fo&(~VP_EXCEPTION_ZERODIVIDE))));
+        }
+        fo = VpGetException();
         return INT2FIX(fo);
     }
     if(VP_ROUND_MODE==f) {
@@ -469,7 +418,7 @@ VP_EXPORT Real *
 VpNewRbClass(U_LONG mx, char *str, VALUE klass)
 {
     Real *pv = VpAlloc(mx,str);
-    pv->obj = (VALUE)Data_Wrap_Struct(klass, 0, BigDecimal_delete, pv);
+    pv->obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, pv);
     return pv;
 }
 
@@ -477,7 +426,7 @@ VP_EXPORT Real *
 VpCreateRbObject(U_LONG mx, const char *str)
 {
     Real *pv = VpAlloc(mx,str);
-    pv->obj = (VALUE)Data_Wrap_Struct(rb_cBigDecimal, 0, BigDecimal_delete, pv);
+    pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
     return pv;
 }
 
@@ -490,7 +439,9 @@ BigDecimal_IsNaN(VALUE self)
     return Qfalse;
 }
 
-/* Returns True if the value is infinite */
+/* Returns nil, -1, or +1 depending on whether the value is finite,
+ * -infinity, or +infinity.
+ */
 static VALUE
 BigDecimal_IsInfinite(VALUE self)
 {
@@ -510,32 +461,33 @@ BigDecimal_IsFinite(VALUE self)
     return Qtrue;
 }
 
+static void
+BigDecimal_check_num(Real *p)
+{
+    if(VpIsNaN(p)) {
+       VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",1);
+    } else if(VpIsPosInf(p)) {
+       VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",1);
+    } else if(VpIsNegInf(p)) {
+       VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",1);
+    }
+}
+
+static VALUE BigDecimal_split(VALUE self);
+
 /* Returns the value as an integer (Fixnum or Bignum).
  *
- * If the BigNumber is infinity or NaN, returns nil.
+ * If the BigNumber is infinity or NaN, raises FloatDomainError.
  */
 static VALUE
 BigDecimal_to_i(VALUE self)
 {
     ENTER(5);
-    int e,n,i,nf;
-    U_LONG v,b,j;
-    char *psz,*pch;
+    S_LONG e,nf;
     Real *p;
 
     GUARD_OBJ(p,GetVpValue(self,1));
-
-    /* Infinity or NaN not converted. */
-    if(VpIsNaN(p)) {
-       VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
-       return Qnil;
-    } else if(VpIsPosInf(p)) {
-       VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
-       return Qnil;
-    } else if(VpIsNegInf(p)) {
-       VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
-       return Qnil;
-    }
+    BigDecimal_check_num(p);
 
     e = VpExponent10(p);
     if(e<=0) return INT2FIX(0);
@@ -544,37 +496,24 @@ BigDecimal_to_i(VALUE self)
         e = VpGetSign(p)*p->frac[0];
         return INT2FIX(e);
     }
-    psz = ALLOCA_N(char,(unsigned int)(e+nf+2));
-
-    n = (e+nf-1)/nf;
-    pch = psz;
-    if(VpGetSign(p)<0) *pch++ = '-';
-    for(i=0;i<n;++i) {
-        b = VpBaseVal()/10;
-        if(i>=(int)p->Prec) {
-            while(b) {
-                *pch++ = '0';
-                b /= 10;
-            }
-            continue;
-        }
-        v = p->frac[i];
-        while(b) {
-            j = v/b;
-            *pch++ = (char)(j + '0');
-            v -= j*b;
-            b /= 10;
-        }
+    else {
+	VALUE a = BigDecimal_split(self);
+	VALUE digits = RARRAY_PTR(a)[1];
+	VALUE numerator = rb_funcall(digits, rb_intern("to_i"), 0);
+	S_LONG dpower = e - RSTRING_LEN(digits);
+
+	if (VpGetSign(p) < 0) {
+	    numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
+	}
+	if (dpower < 0) {
+	    return rb_funcall(numerator, rb_intern("div"), 1,
+			      rb_funcall(INT2FIX(10), rb_intern("**"), 1,
+					 INT2FIX(-dpower)));
+	}
+        return rb_funcall(numerator, '*', 1,
+			  rb_funcall(INT2FIX(10), rb_intern("**"), 1,
+				     INT2FIX(dpower)));
     }
-    *pch++ = 0;
-    return rb_cstr2inum(psz,10);
-}
-
-static VALUE
-BigDecimal_induced_from(VALUE self, VALUE x)
-{
-    Real *p = GetVpValue(x,1);
-    return p->obj;
 }
 
 /* Returns a new Float object having approximately the same value as the
@@ -589,25 +528,64 @@ BigDecimal_to_f(VALUE self)
     double d;
     S_LONG e;
     char *buf;
+    volatile VALUE str;
 
     GUARD_OBJ(p,GetVpValue(self,1));
-    if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
-    buf = ALLOCA_N(char,(unsigned int)VpNumOfChars(p,"E"));
+    if (VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
+    if (e > DBL_MAX_10_EXP+BASE_FIG) goto erange;
+    str = rb_str_new(0, VpNumOfChars(p,"E"));
+    buf = RSTRING_PTR(str);
     VpToString(p, buf, 0, 0);
     errno = 0;
     d = strtod(buf, 0);
     if(errno == ERANGE) {
+      erange:
        VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
-       if(d>0.0) return rb_float_new(DBL_MAX);
-       else      return rb_float_new(-DBL_MAX);
+       if(d>0.0) d = VpGetDoublePosInf();
+       else      d = VpGetDoubleNegInf();
     }
     return rb_float_new(d);
 }
 
+
+/* Converts a BigDecimal to a Rational.
+ */
+static VALUE
+BigDecimal_to_r(VALUE self)
+{
+    Real *p;
+    S_LONG sign, power, denomi_power;
+    VALUE a, digits, numerator;
+
+    p = GetVpValue(self,1);
+    BigDecimal_check_num(p);
+
+    sign = VpGetSign(p);
+    power = VpExponent10(p);
+    a = BigDecimal_split(self);
+    digits = RARRAY_PTR(a)[1];
+    denomi_power = power - RSTRING_LEN(digits);
+    numerator = rb_funcall(digits, rb_intern("to_i"), 0);
+
+    if (sign < 0) {
+	numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
+    }
+    if (denomi_power < 0) {
+	return rb_Rational(numerator,
+			   rb_funcall(INT2FIX(10), rb_intern("**"), 1,
+				      INT2FIX(-denomi_power)));
+    }
+    else {
+        return rb_Rational1(rb_funcall(numerator, '*', 1,
+				       rb_funcall(INT2FIX(10), rb_intern("**"), 1,
+						  INT2FIX(denomi_power))));
+    }
+}
+
 /* The coerce method provides support for Ruby type coercion. It is not
  * enabled by default.
- * 
- * This means that binary operations like + * / or - can often be performed 
+ *
+ * This means that binary operations like + * / or - can often be performed
  * on a BigDecimal and an object of another type, if the other object can
  * be coerced into a BigDecimal value.
  *
@@ -624,11 +602,11 @@ BigDecimal_coerce(VALUE self, VALUE other)
     ENTER(2);
     VALUE obj;
     Real *b;
-    if(TYPE(other) == T_FLOAT) {
-       obj = rb_assoc_new(other, BigDecimal_to_f(self));
+    if (TYPE(other) == T_FLOAT) {
+	obj = rb_assoc_new(other, BigDecimal_to_f(self));
     } else {
-       GUARD_OBJ(b,GetVpValue(other,1));
-       obj = rb_assoc_new(b->obj, self);
+	GUARD_OBJ(b,GetVpValue(other,1));
+	obj = rb_assoc_new(b->obj, self);
     }
     return obj;
 }
@@ -642,7 +620,7 @@ BigDecimal_uplus(VALUE self)
  /* call-seq:
   * add(value, digits)
   *
-  * Add the specified value. 
+  * Add the specified value.
   *
   * e.g.
   *   c = a.add(b,n)
@@ -658,12 +636,12 @@ BigDecimal_add(VALUE self, VALUE r)
     U_LONG mx;
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
+    if(!b) return DoSomeOne(self,r,'+');
     SAVE(b);
     if(VpIsNaN(b)) return b->obj;
     if(VpIsNaN(a)) return a->obj;
     mx = GetAddSubPrec(a,b);
-    if(mx==(-1L)) {
+    if(mx==(U_LONG)-1L) {
         GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
         VpAddSub(c, a, b, 1);
     } else {
@@ -680,7 +658,7 @@ BigDecimal_add(VALUE self, VALUE r)
  /* call-seq:
   * sub(value, digits)
   *
-  * Subtract the specified value. 
+  * Subtract the specified value.
   *
   * e.g.
   *   c = a.sub(b,n)
@@ -697,14 +675,14 @@ BigDecimal_sub(VALUE self, VALUE r)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
+    if(!b) return DoSomeOne(self,r,'-');
     SAVE(b);
 
     if(VpIsNaN(b)) return b->obj;
     if(VpIsNaN(a)) return a->obj;
 
     mx = GetAddSubPrec(a,b);
-    if(mx==(-1L)) {
+    if(mx==(U_LONG)-1L) {
         GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
         VpAddSub(c, a, b, -1);
     } else {
@@ -726,15 +704,26 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
     Real *a, *b;
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return rb_num_coerce_cmp(self,r);
+    if(!b) {
+	ID f = 0;
+
+	switch(op)
+	{
+	  case '*': return rb_num_coerce_cmp(self,r,rb_intern("<=>"));
+	  case '=': return RTEST(rb_num_coerce_cmp(self,r,rb_intern("=="))) ? Qtrue : Qfalse;
+	  case 'G': f = rb_intern(">="); break;
+	  case 'L': f = rb_intern("<="); break;
+	  case '>': case '<': f = (ID)op; break;
+	}
+	return rb_num_coerce_relop(self,r,f);
+    }
     SAVE(b);
     e = VpComp(a, b);
-    if(e==999) return Qnil;
+    if(e==999) return (op == '*') ? Qnil : Qfalse;
     switch(op)
     {
     case '*': return   INT2FIX(e); /* any op */
     case '=': if(e==0) return Qtrue ; return Qfalse;
-    case '!': if(e!=0) return Qtrue ; return Qfalse;
     case 'G': if(e>=0) return Qtrue ; return Qfalse;
     case '>': if(e> 0) return Qtrue ; return Qfalse;
     case 'L': if(e<=0) return Qtrue ; return Qfalse;
@@ -751,7 +740,7 @@ BigDecimal_zero(VALUE self)
     return VpIsZero(a) ? Qtrue : Qfalse;
 }
 
-/* Returns True if the value is non-zero. */
+/* Returns self if the value is non-zero, nil otherwise. */
 static VALUE
 BigDecimal_nonzero(VALUE self)
 {
@@ -771,7 +760,7 @@ BigDecimal_comp(VALUE self, VALUE r)
 /*
  * Tests for value equality; returns true if the values are equal.
  *
- * The == and === operators and the eql? method have the same implementation 
+ * The == and === operators and the eql? method have the same implementation
  * for BigDecimal.
  *
  * Values may be coerced to perform the comparison:
@@ -799,7 +788,7 @@ BigDecimal_lt(VALUE self, VALUE r)
 /* call-seq:
  * a <= b
  *
- * Returns true if a is less than or equal to b. Values may be coerced to 
+ * Returns true if a is less than or equal to b. Values may be coerced to
  * perform the comparison (see ==, coerce).
  */
 static VALUE
@@ -811,7 +800,7 @@ BigDecimal_le(VALUE self, VALUE r)
 /* call-seq:
  * a > b
  *
- * Returns true if a is greater than b.  Values may be coerced to 
+ * Returns true if a is greater than b.  Values may be coerced to
  * perform the comparison (see ==, coerce).
  */
 static VALUE
@@ -823,7 +812,7 @@ BigDecimal_gt(VALUE self, VALUE r)
 /* call-seq:
  * a >= b
  *
- * Returns true if a is greater than or equal to b. Values may be coerced to 
+ * Returns true if a is greater than or equal to b. Values may be coerced to
  * perform the comparison (see ==, coerce)
  */
 static VALUE
@@ -846,7 +835,7 @@ BigDecimal_neg(VALUE self)
  /* call-seq:
   * mult(value, digits)
   *
-  * Multiply by the specified value. 
+  * Multiply by the specified value.
   *
   * e.g.
   *   c = a.mult(b,n)
@@ -863,7 +852,7 @@ BigDecimal_mult(VALUE self, VALUE r)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
+    if(!b) return DoSomeOne(self,r,'*');
     SAVE(b);
 
     mx = a->Prec + b->Prec;
@@ -882,10 +871,12 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
+    if(!b) return DoSomeOne(self,r,'/');
     SAVE(b);
     *div = b;
-    mx =(a->MaxPrec + b->MaxPrec + 1) * VpBaseFig();
+    mx = a->Prec+abs(a->exponent);
+    if(mx<b->Prec+abs(b->exponent)) mx = b->Prec+abs(b->exponent);
+    mx =(mx + 1) * VpBaseFig();
     GUARD_OBJ((*c),VpCreateRbObject(mx, "#0"));
     GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
     VpDivd(*c, *res, a, b);
@@ -896,13 +887,13 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
   * div(value, digits)
   * quo(value)
   *
-  * Divide by the specified value. 
+  * Divide by the specified value.
   *
   * e.g.
   *   c = a.div(b,n)
   *
   * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  * 
+  *
   * If digits is 0, the result is the same as the / operator. If not, the
   * result is an integer BigDecimal, by analogy with Float#div.
   *
@@ -924,7 +915,7 @@ BigDecimal_div(VALUE self, VALUE r)
      */
     /* Round */
     if(VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
-       VpInternalRound(c,0,c->frac[c->Prec-1],(VpBaseVal()*res->frac[0])/div->frac[0]);
+	VpInternalRound(c,0,c->frac[c->Prec-1],(VpBaseVal()*res->frac[0])/div->frac[0]);
     }
     return ToValue(c);
 }
@@ -943,22 +934,38 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
+    if(!b) return Qfalse;
     SAVE(b);
 
     if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
-    if(VpIsInf(a) || VpIsInf(b)) goto NaN;
-    if(VpIsZero(b))              goto NaN;
+    if(VpIsInf(a) && VpIsInf(b)) goto NaN;
+    if(VpIsZero(b)) {
+	rb_raise(rb_eZeroDivError, "divided by 0");
+    }
+    if(VpIsInf(a)) {
+       GUARD_OBJ(d,VpCreateRbObject(1, "0"));
+       VpSetInf(d,(S_INT)(VpGetSign(a) == VpGetSign(b) ? 1 : -1));
+       GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
+       *div = d;
+       *mod = c;
+       return Qtrue;
+    }
+    if(VpIsInf(b)) {
+       GUARD_OBJ(d,VpCreateRbObject(1, "0"));
+       *div = d;
+       *mod = a;
+       return Qtrue;
+    }
     if(VpIsZero(a)) {
        GUARD_OBJ(c,VpCreateRbObject(1, "0"));
        GUARD_OBJ(d,VpCreateRbObject(1, "0"));
        *div = d;
        *mod = c;
-       return (VALUE)0;
+       return Qtrue;
     }
 
-    mx = a->Prec;
-    if(mx<b->Prec) mx = b->Prec;
+    mx = a->Prec+abs(a->exponent);
+    if(mx<b->Prec+abs(b->exponent)) mx = b->Prec+abs(b->exponent);
     mx =(mx + 1) * VpBaseFig();
     GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
     GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
@@ -970,6 +977,7 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
     VpAddSub(c,a,res,-1);
     if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) {
         VpAddSub(res,d,VpOne(),-1);
+	GUARD_OBJ(d,VpCreateRbObject(GetAddSubPrec(c, b)*(VpBaseFig() + 1), "0"));
         VpAddSub(d  ,c,b,       1);
         *div = res;
         *mod = d;
@@ -977,14 +985,14 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
         *div = d;
         *mod = c;
     }
-    return (VALUE)0;
+    return Qtrue;
 
 NaN:
     GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
     GUARD_OBJ(d,VpCreateRbObject(1, "NaN"));
     *div = d;
     *mod = c;
-    return (VALUE)0;
+    return Qtrue;
 }
 
 /* call-seq:
@@ -997,13 +1005,13 @@ static VALUE
 BigDecimal_mod(VALUE self, VALUE r) /* %: a%b = a - (a.to_f/b).floor * b */
 {
     ENTER(3);
-    VALUE obj;
     Real *div=NULL, *mod=NULL;
 
-    obj = BigDecimal_DoDivmod(self,r,&div,&mod);
-    if(obj!=(VALUE)0) return obj;
-    SAVE(div);SAVE(mod);
-    return ToValue(mod);
+    if(BigDecimal_DoDivmod(self,r,&div,&mod)) {
+	SAVE(div); SAVE(mod);
+	return ToValue(mod);
+    }
+    return DoSomeOne(self,r,'%');
 }
 
 static VALUE
@@ -1016,7 +1024,7 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
+    if(!b) return DoSomeOne(self,r,rb_intern("remainder"));
     SAVE(b);
 
     mx  =(a->MaxPrec + b->MaxPrec) *VpBaseFig();
@@ -1045,10 +1053,7 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
 
 /* Returns the remainder from dividing by the value.
  *
- * If the values divided are of the same sign, the remainder is the same as
- * the modulus (see divmod).
- *
- * Otherwise, the remainder is the modulus minus the value divided by.
+ * x.remainder(y) means x-y*(x/y).truncate
  */
 static VALUE
 BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
@@ -1076,21 +1081,20 @@ BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
  *
  * a == c  -> true
  *
- * The quotient q is (a/b).floor, and the modulus is the amount that must be 
+ * The quotient q is (a/b).floor, and the modulus is the amount that must be
  * added to q * b to get a.
  */
 static VALUE
 BigDecimal_divmod(VALUE self, VALUE r)
 {
     ENTER(5);
-    VALUE obj;
     Real *div=NULL, *mod=NULL;
 
-    obj = BigDecimal_DoDivmod(self,r,&div,&mod);
-    if(obj!=(VALUE)0) return obj;
-    SAVE(div);SAVE(mod);
-    obj = rb_assoc_new(ToValue(div), ToValue(mod));
-    return obj;
+    if(BigDecimal_DoDivmod(self,r,&div,&mod)) {
+	SAVE(div); SAVE(mod);
+	return rb_assoc_new(ToValue(div), ToValue(mod));
+    }
+    return DoSomeOne(self,r,rb_intern("divmod"));
 }
 
 static VALUE
@@ -1100,14 +1104,14 @@ BigDecimal_div2(int argc, VALUE *argv, VALUE self)
     VALUE b,n;
     int na = rb_scan_args(argc,argv,"11",&b,&n);
     if(na==1) { /* div in Float sense */
-       VALUE obj;
        Real *div=NULL;
        Real *mod;
-       obj = BigDecimal_DoDivmod(self,b,&div,&mod);
-       if(obj!=(VALUE)0) return obj;
-       return ToValue(div);
+       if(BigDecimal_DoDivmod(self,b,&div,&mod)) {
+	  return BigDecimal_to_i(ToValue(div));
+       }
+       return DoSomeOne(self,b,rb_intern("div"));
     } else {    /* div in BigDecimal sense */
-       U_LONG ix = (U_LONG)GetPositiveInt(n);
+       S_INT ix = GetPositiveInt(n);
        if(ix==0) return BigDecimal_div(self,b);
        else {
           Real *res=NULL;
@@ -1123,7 +1127,7 @@ BigDecimal_div2(int argc, VALUE *argv, VALUE self)
           GUARD_OBJ(res,VpCreateRbObject((mx * 2  + 2)*VpBaseFig(), "#0"));
           VpDivd(cv,res,av,bv);
           VpSetPrecLimit(pl);
-          VpLeftRound(cv,VpGetRoundMode(),ix);
+          VpLeftRound(cv,(int)VpGetRoundMode(),ix);
           return ToValue(cv);
        }
     }
@@ -1134,14 +1138,14 @@ BigDecimal_add2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real   *cv;
-    U_LONG mx = (U_LONG)GetPositiveInt(n);
+    S_INT mx = GetPositiveInt(n);
     if(mx==0) return BigDecimal_add(self,b);
     else {
        U_LONG pl = VpSetPrecLimit(0);
        VALUE   c = BigDecimal_add(self,b);
        VpSetPrecLimit(pl);
        GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
+       VpLeftRound(cv,(int)VpGetRoundMode(),mx);
        return ToValue(cv);
     }
 }
@@ -1151,14 +1155,14 @@ BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    U_LONG mx = (U_LONG)GetPositiveInt(n);
+    S_INT mx = GetPositiveInt(n);
     if(mx==0) return BigDecimal_sub(self,b);
     else {
        U_LONG pl = VpSetPrecLimit(0);
        VALUE   c = BigDecimal_sub(self,b);
        VpSetPrecLimit(pl);
        GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
+       VpLeftRound(cv,(int)VpGetRoundMode(),mx);
        return ToValue(cv);
     }
 }
@@ -1168,14 +1172,14 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    U_LONG mx = (U_LONG)GetPositiveInt(n);
+    S_INT mx = GetPositiveInt(n);
     if(mx==0) return BigDecimal_mult(self,b);
     else {
        U_LONG pl = VpSetPrecLimit(0);
        VALUE   c = BigDecimal_mult(self,b);
        VpSetPrecLimit(pl);
        GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
+       VpLeftRound(cv,(int)VpGetRoundMode(),mx);
        return ToValue(cv);
     }
 }
@@ -1213,7 +1217,7 @@ BigDecimal_sqrt(VALUE self, VALUE nFig)
 {
     ENTER(5);
     Real *c, *a;
-    S_INT mx, n;
+    U_LONG mx, n;
 
     GUARD_OBJ(a,GetVpValue(self,1));
     mx = a->Prec *(VpBaseFig() + 1);
@@ -1251,7 +1255,7 @@ BigDecimal_fix(VALUE self)
  * BigDecimal('8.7').round -> 9
  *
  * If n is specified and positive, the fractional part of the result has no
- * more than that many digits. 
+ * more than that many digits.
  *
  * If n is specified and negative, at least that many digits to the left of the
  * decimal point will be 0 in the result.
@@ -1260,7 +1264,7 @@ BigDecimal_fix(VALUE self)
  *
  * BigDecimal('13345.234').round(-2) -> 13300.0
  *
- * The value of the optional mode argument can be used to determine how 
+ * The value of the optional mode argument can be used to determine how
  * rounding is performed; see BigDecimal.mode.
  */
 static VALUE
@@ -1274,7 +1278,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     VALUE  vRound;
     U_LONG pl;
 
-    int    sw = VpGetRoundMode();
+    int    sw = (int)VpGetRoundMode();
 
     int na = rb_scan_args(argc,argv,"02",&vLoc,&vRound);
     switch(na) {
@@ -1303,6 +1307,9 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
     VpActiveRound(c,a,sw,iLoc);
+    if (argc == 0) {
+	return BigDecimal_to_i(ToValue(c));
+    }
     return ToValue(c);
 }
 
@@ -1316,7 +1323,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
  * BigDecimal('8.7').truncate -> 8
  *
  * If n is specified and positive, the fractional part of the result has no
- * more than that many digits. 
+ * more than that many digits.
  *
  * If n is specified and negative, at least that many digits to the left of the
  * decimal point will be 0 in the result.
@@ -1347,6 +1354,9 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
     GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
     VpActiveRound(c,a,VP_ROUND_DOWN,iLoc); /* 0: truncate */
+    if (argc == 0) {
+	return BigDecimal_to_i(ToValue(c));
+    }
     return ToValue(c);
 }
 
@@ -1376,7 +1386,7 @@ BigDecimal_frac(VALUE self)
  * BigDecimal('-9.1').floor -> -10
  *
  * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.  
+ * more than that many digits.
  *
  * If n is specified and negative, at least that
  * many digits to the left of the decimal point will be 0 in the result.
@@ -1407,6 +1417,9 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
     GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
     VpActiveRound(c,a,VP_ROUND_FLOOR,iLoc);
+    if (argc == 0) {
+	return BigDecimal_to_i(ToValue(c));
+    }
     return ToValue(c);
 }
 
@@ -1420,7 +1433,7 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
  * BigDecimal('-9.1').ceil -> -9
  *
  * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.  
+ * more than that many digits.
  *
  * If n is specified and negative, at least that
  * many digits to the left of the decimal point will be 0 in the result.
@@ -1451,6 +1464,9 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
     GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
     VpActiveRound(c,a,VP_ROUND_CEIL,iLoc);
+    if (argc == 0) {
+	return BigDecimal_to_i(ToValue(c));
+    }
     return ToValue(c);
 }
 
@@ -1469,7 +1485,7 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
  *
  * A space at the start of s returns positive values with a leading space.
  *
- * If s contains a number, a space is inserted after each group of that many 
+ * If s contains a number, a space is inserted after each group of that many
  * fractional digits.
  *
  * If s ends with an 'E', engineering notation (0.xxxxEnn) is used.
@@ -1491,6 +1507,7 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
     int   fmt=0;   /* 0:E format */
     int   fPlus=0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
     Real  *vp;
+    volatile VALUE str;
     char  *psz;
     char   ch;
     U_LONG nc;
@@ -1498,7 +1515,7 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
     VALUE  f;
 
     GUARD_OBJ(vp,GetVpValue(self,1));
-    
+
     if(rb_scan_args(argc,argv,"01",&f)==1) {
         if(TYPE(f)==T_STRING) {
             SafeStringValue(f);
@@ -1527,14 +1544,16 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
     }
     if(mc>0) nc += (nc + mc - 1) / mc + 1;
 
-    psz = ALLOCA_N(char,(unsigned int)nc);
+    str = rb_str_new(0, nc);
+    psz = RSTRING_PTR(str);
 
     if(fmt) {
         VpToFString(vp, psz, mc, fPlus);
     } else {
         VpToString (vp, psz, mc, fPlus);
     }
-    return rb_str_new2(psz);
+    rb_str_resize(str, strlen(psz));
+    return str;
 }
 
 /* Splits a BigDecimal number into four parts, returned as an array of values.
@@ -1550,7 +1569,7 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
  *
  * The fourth value is an Integer exponent.
  *
- * If the BigDecimal can be represented as 0.xxxxxx*10**n, then xxxxxx is the 
+ * If the BigDecimal can be represented as 0.xxxxxx*10**n, then xxxxxx is the
  * string of significant digits with no leading zeros, and n is the exponent.
  *
  * From these values, you can translate a BigDecimal to a float as follows:
@@ -1558,7 +1577,7 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
  *   sign, significant_digits, base, exponent = a.split
  *   f = sign * "0.#{significant_digits}".to_f * (base ** exponent)
  *
- * (Note that the to_f method is provided as a more convenient way to translate 
+ * (Note that the to_f method is provided as a more convenient way to translate
  * a BigDecimal to a Float.)
  */
 static VALUE
@@ -1566,24 +1585,29 @@ BigDecimal_split(VALUE self)
 {
     ENTER(5);
     Real *vp;
-    VALUE obj,obj1;
+    VALUE obj,str;
     S_LONG e;
     S_LONG s;
     char *psz1;
 
     GUARD_OBJ(vp,GetVpValue(self,1));
-    psz1 = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E"));
+    str = rb_str_new(0, VpNumOfChars(vp,"E"));
+    psz1 = RSTRING_PTR(str);
     VpSzMantissa(vp,psz1);
     s = 1;
     if(psz1[0]=='-') {
-        s = -1; ++psz1;
+	size_t len = strlen(psz1+1);
+
+	memmove(psz1, psz1+1, len);
+	psz1[len] = '\0';
+        s = -1;
     }
     if(psz1[0]=='N') s=0; /* NaN */
     e = VpExponent10(vp);
-    obj1 = rb_str_new2(psz1);
     obj  = rb_ary_new2(4);
     rb_ary_push(obj, INT2FIX(s));
-    rb_ary_push(obj, obj1);
+    rb_ary_push(obj, str);
+    rb_str_resize(str, strlen(psz1));
     rb_ary_push(obj, INT2FIX(10));
     rb_ary_push(obj, INT2NUM(e));
     return obj;
@@ -1616,20 +1640,22 @@ BigDecimal_inspect(VALUE self)
 {
     ENTER(5);
     Real *vp;
-    VALUE obj;
-    unsigned int nc;
-    char *psz1;
-    char *pszAll;
+    volatile VALUE obj;
+    U_LONG nc;
+    char *psz, *tmp;
 
     GUARD_OBJ(vp,GetVpValue(self,1));
     nc = VpNumOfChars(vp,"E");
     nc +=(nc + 9) / 10;
 
-    psz1   = ALLOCA_N(char,nc);
-    pszAll = ALLOCA_N(char,nc+256);
-    VpToString(vp, psz1, 10, 0);
-    sprintf(pszAll,"#<BigDecimal:%lx,'%s',%lu(%lu)>",self,psz1,VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
-    obj = rb_str_new2(pszAll);
+    obj = rb_str_new(0, nc+256);
+    psz = RSTRING_PTR(obj);
+    sprintf(psz,"#<BigDecimal:%lx,'",self);
+    tmp = psz + strlen(psz);
+    VpToString(vp, tmp, 10, 0);
+    tmp += strlen(tmp);
+    sprintf(tmp,"',%lu(%lu)>",VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
+    rb_str_resize(obj, strlen(psz));
     return obj;
 }
 
@@ -1645,7 +1671,8 @@ BigDecimal_power(VALUE self, VALUE p)
 {
     ENTER(5);
     Real *x, *y;
-    S_LONG mp, ma, n;
+    S_LONG mp, ma;
+    S_INT n;
 
     Check_Type(p, T_FIXNUM);
     n = FIX2INT(p);
@@ -1717,13 +1744,13 @@ BigDecimal_new(int argc, VALUE *argv, VALUE self)
  /* call-seq:
   * BigDecimal.limit(digits)
   *
-  * Limit the number of significant digits in newly created BigDecimal 
-  * numbers to the specified value. Rounding is performed as necessary, 
+  * Limit the number of significant digits in newly created BigDecimal
+  * numbers to the specified value. Rounding is performed as necessary,
   * as specified by BigDecimal.mode.
   *
   * A limit of 0, the default, means no upper limit.
   *
-  * The limit specified by this method takes priority over any limit 
+  * The limit specified by this method takes less priority over any limit
   * specified to instance methods such as ceil, floor, truncate, or round.
   */
 static VALUE
@@ -1747,10 +1774,10 @@ BigDecimal_limit(int argc, VALUE *argv, VALUE self)
 
 /* Returns the sign of the value.
  *
- * Returns a positive value if > 0, a negative value if < 0, and a 
+ * Returns a positive value if > 0, a negative value if < 0, and a
  * zero if == 0.
  *
- * The specific value returned indicates the type and sign of the BigDecimal, 
+ * The specific value returned indicates the type and sign of the BigDecimal,
  * as follows:
  *
  * BigDecimal::SIGN_NaN:: value is Not a Number
@@ -1768,6 +1795,110 @@ BigDecimal_sign(VALUE self)
     return INT2FIX(s);
 }
 
+/* Document-class: BigDecimal
+ * BigDecimal provides arbitrary-precision floating point decimal arithmetic.
+ *
+ * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Artistic License, as specified in the README file
+ * of the BigDecimal distribution.
+ *
+ * Documented by mathew <meta@pobox.com>.
+ *
+ * = Introduction
+ *
+ * Ruby provides built-in support for arbitrary precision integer arithmetic.
+ * For example:
+ *
+ * 42**13   ->   1265437718438866624512
+ *
+ * BigDecimal provides similar support for very large or very accurate floating
+ * point numbers.
+ *
+ * Decimal arithmetic is also useful for general calculation, because it
+ * provides the correct answers people expect--whereas normal binary floating
+ * point arithmetic often introduces subtle errors because of the conversion
+ * between base 10 and base 2. For example, try:
+ *
+ *   sum = 0
+ *   for i in (1..10000)
+ *     sum = sum + 0.0001
+ *   end
+ *   print sum
+ *
+ * and contrast with the output from:
+ *
+ *   require 'bigdecimal'
+ *
+ *   sum = BigDecimal.new("0")
+ *   for i in (1..10000)
+ *     sum = sum + BigDecimal.new("0.0001")
+ *   end
+ *   print sum
+ *
+ * Similarly:
+ *
+ * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
+ *
+ * (1.2 - 1.0) == 0.2 -> false
+ *
+ * = Special features of accurate decimal arithmetic
+ *
+ * Because BigDecimal is more accurate than normal binary floating point
+ * arithmetic, it requires some special values.
+ *
+ * == Infinity
+ *
+ * BigDecimal sometimes needs to return infinity, for example if you divide
+ * a value by zero.
+ *
+ * BigDecimal.new("1.0") / BigDecimal.new("0.0")  -> infinity
+ *
+ * BigDecimal.new("-1.0") / BigDecimal.new("0.0")  -> -infinity
+ *
+ * You can represent infinite numbers to BigDecimal using the strings
+ * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
+ *
+ * == Not a Number
+ *
+ * When a computation results in an undefined value, the special value NaN
+ * (for 'not a number') is returned.
+ *
+ * Example:
+ *
+ * BigDecimal.new("0.0") / BigDecimal.new("0.0") -> NaN
+ *
+ * You can also create undefined values.  NaN is never considered to be the
+ * same as any other value, even NaN itself:
+ *
+ * n = BigDecimal.new('NaN')
+ *
+ * n == 0.0 -> nil
+ *
+ * n == n -> nil
+ *
+ * == Positive and negative zero
+ *
+ * If a computation results in a value which is too small to be represented as
+ * a BigDecimal within the currently specified limits of precision, zero must
+ * be returned.
+ *
+ * If the value which is too small to be represented is negative, a BigDecimal
+ * value of negative zero is returned. If the value is positive, a value of
+ * positive zero is returned.
+ *
+ * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") -> -0.0
+ *
+ * BigDecimal.new("1.0") / BigDecimal.new("Infinity") -> 0.0
+ *
+ * (See BigDecimal.mode for how to specify limits of precision.)
+ *
+ * Note that -0.0 and 0.0 are considered to be the same for the purposes of
+ * comparison.
+ *
+ * Note also that in mathematics, there is no particular concept of negative
+ * or positive zero; true mathematical zero has no sign.
+ */
 void
 Init_bigdecimal(void)
 {
@@ -1785,60 +1916,59 @@ Init_bigdecimal(void)
     rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
     rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
     rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
-    rb_define_singleton_method(rb_cBigDecimal, "induced_from",BigDecimal_induced_from, 1);
     rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
     rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
 
     /* Constants definition */
 
-    /* 
-     * Base value used in internal calculations.  On a 32 bit system, BASE 
-     * is 10000, indicating that calculation is done in groups of 4 digits.  
+    /*
+     * Base value used in internal calculations.  On a 32 bit system, BASE
+     * is 10000, indicating that calculation is done in groups of 4 digits.
      * (If it were larger, BASE**2 wouldn't fit in 32 bits, so you couldn't
-     * guarantee that two groups could always be multiplied together without 
-     * overflow.) 
+     * guarantee that two groups could always be multiplied together without
+     * overflow.)
      */
     rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((S_INT)VpBaseVal()));
 
     /* Exceptions */
 
     /*
-     * 0xff: Determines whether overflow, underflow or zero divide result in 
+     * 0xff: Determines whether overflow, underflow or zero divide result in
      * an exception being thrown. See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL",INT2FIX(VP_EXCEPTION_ALL));
 
-    /* 
-     * 0x02: Determines what happens when the result of a computation is not a 
-     * number (NaN). See BigDecimal.mode. 
+    /*
+     * 0x02: Determines what happens when the result of a computation is not a
+     * number (NaN). See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN",INT2FIX(VP_EXCEPTION_NaN));
 
-    /* 
+    /*
      * 0x01: Determines what happens when the result of a computation is
      * infinity.  See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY",INT2FIX(VP_EXCEPTION_INFINITY));
 
-    /* 
+    /*
      * 0x04: Determines what happens when the result of a computation is an
      * underflow (a result too small to be represented). See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW",INT2FIX(VP_EXCEPTION_UNDERFLOW));
 
-    /* 
+    /*
      * 0x01: Determines what happens when the result of a computation is an
-     * underflow (a result too large to be represented). See BigDecimal.mode.
+     * overflow (a result too large to be represented). See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
 
-    /* 
+    /*
      * 0x01: Determines what happens when a division by zero is performed.
      * See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE",INT2FIX(VP_EXCEPTION_ZERODIVIDE));
 
-    /* 
+    /*
      * 0x100: Determines what happens when a result must be rounded in order to
      * fit in the appropriate number of significant digits. See
      * BigDecimal.mode.
@@ -1899,11 +2029,12 @@ Init_bigdecimal(void)
     rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
     rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
     rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
-    rb_define_method(rb_cBigDecimal, "div",BigDecimal_div2, -1);
+    rb_define_method(rb_cBigDecimal, "div", BigDecimal_div2, -1);
     rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
     rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
     rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
     rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
+    rb_define_method(rb_cBigDecimal, "to_r", BigDecimal_to_r, 0);
     rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
     rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
     rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);
@@ -1957,32 +2088,16 @@ Init_bigdecimal(void)
  *  ============================================================================
  *
  */
-#ifdef _DEBUG
-/*static int gfDebug = 1;*/         /* Debug switch */
+#ifdef BIGDECIMAL_DEBUG
+static int gfDebug = 1;         /* Debug switch */
+#if 0
 static int gfCheckVal = 1;      /* Value checking flag in VpNmlz()  */
-#endif /* _DEBUG */
+#endif
+#endif /* BIGDECIMAL_DEBUG */
 
 static U_LONG gnPrecLimit = 0;  /* Global upper limit of the precision newly allocated */
 static U_LONG gfRoundMode = VP_ROUND_HALF_UP; /* Mode for general rounding operation   */
 
-#ifndef BASE_FIG
-static U_LONG BASE_FIG = 4;     /* =log10(BASE)  */
-static U_LONG BASE = 10000L;    /* Base value(value must be 10**BASE_FIG) */
-                /* The value of BASE**2 + BASE must be represented */
-                /* within one U_LONG. */
-static U_LONG HALF_BASE = 5000L;/* =BASE/2  */
-static U_LONG BASE1 = 1000L;    /* =BASE/10  */
-#else
-#ifndef BASE
-#error BASE_FIG is defined but BASE is not
-#endif
-#define HALF_BASE (BASE/2)
-#define BASE1 (BASE/10)
-#endif
-#ifndef DBLE_FIG
-#define DBLE_FIG (DBL_DIG+1)    /* figure of double */
-#endif
-
 static Real *VpConstOne;    /* constant 1.0 */
 static Real *VpPt5;        /* constant 0.5 */
 #define maxnr 100UL    /* Maximum iterations for calcurating sqrt. */
@@ -2001,9 +2116,9 @@ static int VpNmlz(Real *a);
 static void VpFormatSt(char *psz,S_INT fFmt);
 static int VpRdup(Real *m,U_LONG ind_m);
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
 static int gnAlloc=0; /* Memory allocation counter */
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
 VP_EXPORT void *
 VpMemAlloc(U_LONG mb)
@@ -2013,9 +2128,9 @@ VpMemAlloc(U_LONG mb)
         VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1);
     }
     memset(p,0,mb);
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     gnAlloc++; /* Count allocation call */
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return p;
 }
 
@@ -2024,7 +2139,7 @@ VpFree(Real *pv)
 {
     if(pv != NULL) {
         xfree(pv);
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
         gnAlloc--; /* Decrement allocation count */
         if(gnAlloc==0) {
             printf(" *************** All memories allocated freed ****************");
@@ -2034,7 +2149,7 @@ VpFree(Real *pv)
             printf(" ??????????? Too many memory free calls(%d) ?????????????\n",gnAlloc);
             getchar();
         }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     }
 }
 
@@ -2079,9 +2194,9 @@ VpGetRoundMode(void)
 VP_EXPORT int
 VpIsRoundMode(unsigned long n)
 {
-    if(n==VP_ROUND_UP      || n!=VP_ROUND_DOWN      ||
-       n==VP_ROUND_HALF_UP || n!=VP_ROUND_HALF_DOWN ||
-       n==VP_ROUND_CEIL    || n!=VP_ROUND_FLOOR     ||
+    if(n==VP_ROUND_UP      || n==VP_ROUND_DOWN      ||
+       n==VP_ROUND_HALF_UP || n==VP_ROUND_HALF_DOWN ||
+       n==VP_ROUND_CEIL    || n==VP_ROUND_FLOOR     ||
        n==VP_ROUND_HALF_EVEN
       ) return 1;
     return 0;
@@ -2180,12 +2295,14 @@ VpGetDoubleNegZero(void) /* Returns the value of -0 */
     return nzero;
 }
 
+#if 0  /* unused */
 VP_EXPORT int
 VpIsNegDoubleZero(double v)
 {
     double z = VpGetDoubleNegZero();
     return MemCmp(&v,&z,sizeof(v))==0;
 }
+#endif
 
 VP_EXPORT int
 VpException(unsigned short f, const char *str,int always)
@@ -2199,18 +2316,12 @@ VpException(unsigned short f, const char *str,int always)
         switch(f)
         {
         /*
-        case VP_EXCEPTION_ZERODIVIDE:
         case VP_EXCEPTION_OVERFLOW:
         */
+        case VP_EXCEPTION_ZERODIVIDE:
         case VP_EXCEPTION_INFINITY:
-             exc = rb_eFloatDomainError;
-             goto raise;
         case VP_EXCEPTION_NaN:
-             exc = rb_eFloatDomainError;
-             goto raise;
         case VP_EXCEPTION_UNDERFLOW:
-             exc = rb_eFloatDomainError;
-             goto raise;
         case VP_EXCEPTION_OP:
              exc = rb_eFloatDomainError;
              goto raise;
@@ -2406,20 +2517,20 @@ VpInit(U_LONG BaseVal)
     VpConstOne = VpAlloc((U_LONG)1, "1");
     VpPt5 = VpAlloc((U_LONG)1, ".5");
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     gnAlloc = 0;
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         printf("VpInit: BaseVal   = %lu\n", BaseVal);
         printf("  BASE   = %lu\n", BASE);
         printf("  HALF_BASE = %lu\n", HALF_BASE);
         printf("  BASE1  = %lu\n", BASE1);
-        printf("  BASE_FIG  = %lu\n", BASE_FIG);
-        printf("  DBLE_FIG  = %lu\n", DBLE_FIG);
+        printf("  BASE_FIG  = %d\n", BASE_FIG);
+        printf("  DBLE_FIG  = %d\n", DBLE_FIG);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
     return DBLE_FIG;
 }
@@ -2482,6 +2593,7 @@ VpAlloc(U_LONG mx, const char *szVal)
     int  sign=1;
     Real *vp = NULL;
     U_LONG mf = VpGetPrecLimit();
+    VALUE buf;
 
     mx = (mx + BASE_FIG - 1) / BASE_FIG + 1;    /* Determine allocation unit. */
     if(szVal) {
@@ -2509,7 +2621,8 @@ VpAlloc(U_LONG mx, const char *szVal)
 
     /* Skip all '_' after digit: 2006-6-30 */
     ni = 0;
-    psz = ALLOCA_N(char,strlen(szVal)+1);
+    buf = rb_str_tmp_new(strlen(szVal)+1);
+    psz = RSTRING_PTR(buf);
     i   = 0;
     ipn = 0;
     while((psz[i]=szVal[ipn])!=0) {
@@ -2607,6 +2720,7 @@ VpAlloc(U_LONG mx, const char *szVal)
     vp->MaxPrec = mx;        /* set max precision */
     VpSetZero(vp,sign);
     VpCtoV(vp, &(szVal[ipn]), ni, &(szVal[ipf]), nf, &(szVal[ipe]), ne);
+    rb_str_resize(buf, 0);
     return vp;
 }
 
@@ -2622,7 +2736,7 @@ VpAlloc(U_LONG mx, const char *szVal)
  * [Output]
  *  c  ... LHSV
  */
-VP_EXPORT int
+VP_EXPORT U_LONG
 VpAsgn(Real *c, Real *a, int isw)
 {
     U_LONG n;
@@ -2646,9 +2760,9 @@ VpAsgn(Real *c, Real *a, int isw)
         if(isw!=10) {
             /* Not in ActiveRound */
             if(c->Prec < a->Prec) {
-               VpInternalRound(c,n,(n>0)?a->frac[n-1]:0,a->frac[n]);
+		VpInternalRound(c,n,(n>0)?a->frac[n-1]:0,a->frac[n]);
             } else {
-               VpLimitRound(c,0);
+		VpLimitRound(c,0);
             }
         }
     } else {
@@ -2664,7 +2778,7 @@ VpAsgn(Real *c, Real *a, int isw)
  *  = a - b  when operation = -1 or -2.
  *   Returns number of significant digits of c
  */
-VP_EXPORT int
+VP_EXPORT U_LONG
 VpAddSub(Real *c, Real *a, Real *b, int operation)
 {
     S_INT sw, isw;
@@ -2672,13 +2786,13 @@ VpAddSub(Real *c, Real *a, Real *b, int operation)
     U_LONG n, na, nb, i;
     U_LONG mrv;
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpAddSub(enter) a=% \n", a);
         VPrint(stdout, "     b=% \n", b);
         printf(" operation=%d\n", operation);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
     if(!VpIsDefOP(c,a,b,(operation>0)?1:2)) return 0; /* No significant digits */
 
@@ -2776,14 +2890,14 @@ end_if:
     }
     VpInternalRound(c,0,(c->Prec>0)?c->frac[c->Prec-1]:0,mrv);
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpAddSub(result) c=% \n", c);
         VPrint(stdout, "     a=% \n", a);
         VPrint(stdout, "     b=% \n", b);
         printf(" operation=%d\n", operation);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return c->Prec*BASE_FIG;
 }
 
@@ -2805,19 +2919,19 @@ VpAddAbs(Real *a, Real *b, Real *c)
     U_LONG c_pos;
     U_LONG av, bv, mrv;
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpAddAbs called: a = %\n", a);
         VPrint(stdout, "     b = %\n", b);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
     word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
     a_pos = ap;
     b_pos = bp;
     c_pos = cp;
-    if(word_shift==-1L) return 0; /* Overflow */
-    if(b_pos == -1L) goto Assign_a;
+    if(word_shift==(U_LONG)-1L) return 0; /* Overflow */
+    if(b_pos == (U_LONG)-1L) goto Assign_a;
 
     mrv = av + bv; /* Most right val. Used for round. */
 
@@ -2873,11 +2987,11 @@ Assign_a:
 
 Exit:
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpAddAbs exit: c=% \n", c);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return mrv;
 }
 
@@ -2898,19 +3012,19 @@ VpSubAbs(Real *a, Real *b, Real *c)
     U_LONG c_pos;
     U_LONG av, bv;
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpSubAbs called: a = %\n", a);
         VPrint(stdout, "     b = %\n", b);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
     word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
     a_pos = ap;
     b_pos = bp;
     c_pos = cp;
-    if(word_shift==-1L) return 0; /* Overflow */
-    if(b_pos == -1L) goto Assign_a;
+    if(word_shift==(U_LONG)-1L) return 0; /* Overflow */
+    if(b_pos == (U_LONG)-1L) goto Assign_a;
 
     if(av >= bv) {
         mrv = av - bv;
@@ -2976,11 +3090,11 @@ Assign_a:
     mrv = 0;
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpSubAbs exit: c=% \n", c);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return mrv;
 }
 
@@ -3074,7 +3188,7 @@ VpSetPTR(Real *a, Real *b, Real *c, U_LONG *a_pos, U_LONG *b_pos, U_LONG *c_pos,
     }
     c->Prec = *c_pos;
     c->exponent = a->exponent;
-    if(!AddExponent(c,(S_LONG)1)) return (-1L);
+    if(!AddExponent(c,1)) return (U_LONG)-1L;
     return word_shift;
 }
 
@@ -3093,7 +3207,7 @@ VpSetPTR(Real *a, Real *b, Real *c, U_LONG *a_pos, U_LONG *b_pos, U_LONG *c_pos,
  *     nc      <---|
  *     MaxAB |--------------------|
  */
-VP_EXPORT int
+VP_EXPORT U_LONG
 VpMult(Real *c, Real *a, Real *b)
 {
     U_LONG MxIndA, MxIndB, MxIndAB, MxIndC;
@@ -3102,12 +3216,12 @@ VpMult(Real *c, Real *a, Real *b)
     U_LONG Carry, s;
     Real *w;
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpMult(Enter): a=% \n", a);
         VPrint(stdout, "      b=% \n", b);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
     if(!VpIsDefOP(c,a,b,3)) return 0; /* No significant digit */
 
@@ -3146,7 +3260,10 @@ VpMult(Real *c, Real *a, Real *b)
     /* set LHSV c info */
 
     c->exponent = a->exponent;    /* set exponent */
-    if(!AddExponent(c,b->exponent)) return 0;
+    if(!AddExponent(c,b->exponent)) {
+	if(w) VpFree(c);
+	return 0;
+    }
     VpSetSign(c,VpGetSign(a)*VpGetSign(b));    /* set sign  */
     Carry = 0;
     nc = ind_c = MxIndAB;
@@ -3182,7 +3299,7 @@ VpMult(Real *c, Real *a, Real *b)
             }
             if(Carry) {
                 ii = ind_c;
-                while((--ii) >= 0) {
+                while(ii-- > 0) {
                     c->frac[ii] += Carry;
                     if(c->frac[ii] >= BASE) {
                         Carry = c->frac[ii] / BASE;
@@ -3204,20 +3321,20 @@ VpMult(Real *c, Real *a, Real *b)
     }
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpMult(c=a*b): c=% \n", c);
         VPrint(stdout, "      a=% \n", a);
         VPrint(stdout, "      b=% \n", b);
     }
-#endif /*_DEBUG */
+#endif /*BIGDECIMAL_DEBUG */
     return c->Prec*BASE_FIG;
 }
 
 /*
  *   c = a / b,  remainder = r
  */
-VP_EXPORT int
+VP_EXPORT U_LONG
 VpDivd(Real *c, Real *r, Real *a, Real *b)
 {
     U_LONG word_a, word_b, word_c, word_r;
@@ -3226,12 +3343,12 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
     U_LONG q, b1, b1p1, b1b2, b1b2p1, r1r2;
     U_LONG borrow, borrow1, borrow2, qb;
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, " VpDivd(c=a/b)  a=% \n", a);
         VPrint(stdout, "    b=% \n", b);
     }
-#endif /*_DEBUG */
+#endif /*BIGDECIMAL_DEBUG */
 
     VpSetNaN(r);
     if(!VpIsDefOP(c,a,b,4)) goto Exit;
@@ -3389,20 +3506,20 @@ carry:
 out_side:
     c->Prec = word_c;
     c->exponent = a->exponent;
-    if(!AddExponent(c,(S_LONG)2))   return 0;
+    if(!AddExponent(c,2))   return 0;
     if(!AddExponent(c,-(b->exponent))) return 0;
 
     VpSetSign(c,VpGetSign(a)*VpGetSign(b));
     VpNmlz(c);            /* normalize c */
     r->Prec = word_r;
     r->exponent = a->exponent;
-    if(!AddExponent(r,(S_LONG)1)) return 0;
+    if(!AddExponent(r,1)) return 0;
     VpSetSign(r,VpGetSign(a));
     VpNmlz(r);            /* normalize r(remainder) */
     goto Exit;
 
 space_error:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         printf("   word_a=%lu\n", word_a);
         printf("   word_b=%lu\n", word_b);
@@ -3410,16 +3527,16 @@ space_error:
         printf("   word_r=%lu\n", word_r);
         printf("   ind_r =%lu\n", ind_r);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     rb_bug("ERROR(VpDivd): space for remainder too small.");
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, " VpDivd(c=a/b), c=% \n", c);
         VPrint(stdout, "    r=% \n", r);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return c->Prec*BASE_FIG;
 }
 
@@ -3540,17 +3657,17 @@ Exit:
     if  (val> 1) val =  1;
     else if(val<-1) val = -1;
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, " VpComp a=%\n", a);
         VPrint(stdout, "  b=%\n", b);
         printf("  ans=%d\n", val);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return (int)val;
 }
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
 /*
  *    cntl_chr ... ASCIIZ Character, print control characters
  *     Available control codes:
@@ -3562,7 +3679,7 @@ Exit:
  *    a  ... VP variable to be printed
  */
 VP_EXPORT int
-VPrint(FILE *fp, char *cntl_chr, Real *a)
+VPrint(FILE *fp, const char *cntl_chr, Real *a)
 {
     U_LONG i, j, nc, nd, ZeroSup;
     U_LONG n, m, e, nn;
@@ -3601,12 +3718,12 @@ VPrint(FILE *fp, char *cntl_chr, Real *a)
                 nc += fprintf(fp, "0.");
                 n = a->Prec;
                 for(i=0;i < n;++i) {
-                 m = BASE1;
+		    m = BASE1;
                     e = a->frac[i];
                     while(m) {
                         nn = e / m;
                         if((!ZeroSup) || nn) {
-                            nc += fprintf(fp, "%lu", nn);    /* The reading zero(s) */
+                            nc += fprintf(fp, "%lu", nn);    /* The leading zero(s) */
                             /* as 0.00xx will not */
                             /* be printed. */
                             ++nd;
@@ -3653,7 +3770,7 @@ VPrint(FILE *fp, char *cntl_chr, Real *a)
     }
     return (int)nc;
 }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
 
 static void
 VpFormatSt(char *psz,S_INT fFmt)
@@ -3728,7 +3845,7 @@ VpSzMantissa(Real *a,char *psz)
             while(m) {
                 nn = e / m;
                 if((!ZeroSup) || nn) {
-                    sprintf(psz, "%lu", nn);    /* The reading zero(s) */
+                    sprintf(psz, "%lu", nn);    /* The leading zero(s) */
                     psz += strlen(psz);
                     /* as 0.00xx will be ignored. */
                     ZeroSup = 0;    /* Set to print succeeding zeros */
@@ -3894,14 +4011,15 @@ VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, con
 {
     U_LONG i, j, ind_a, ma, mi, me;
     U_LONG loc;
-    S_INT  e,es, eb, ef;
-    S_INT  sign, signe;
+    S_LONG  e,es, eb, ef;
+    S_INT  sign, signe, exponent_overflow;
     /* get exponent part */
     e = 0;
     ma = a->MaxPrec;
     mi = ni;
     me = ne;
     signe = 1;
+    exponent_overflow = 0;
     memset(a->frac, 0, ma * sizeof(U_LONG));
     if(ne > 0) {
         i = 0;
@@ -3916,8 +4034,10 @@ VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, con
         while(i < me) {
             es = e*((S_INT)BASE_FIG);
             e = e * 10 + exp_chr[i] - '0';
-            if(es>e*((S_INT)BASE_FIG)) {
-                return VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
+            if(es > (S_INT)(e*BASE_FIG)) {
+		exponent_overflow = 1;
+		e = es; /* keep sign */
+		break;
             }
             ++i;
         }
@@ -3926,7 +4046,7 @@ VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, con
     /* get integer part */
     i = 0;
     sign = 1;
-    if(ni >= 0) {
+    if(1 /*ni >= 0*/) {
         if(int_chr[0] == '-') {
             sign = -1;
             ++i;
@@ -3959,6 +4079,18 @@ VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, con
 
     eb = e / ((S_INT)BASE_FIG);
 
+    if(exponent_overflow) {
+	int zero = 1;
+	for(     ; i < mi && zero; i++) zero = int_chr[i] == '0';
+	for(i = 0; i < nf && zero; i++) zero = frac[i] == '0';
+	if(!zero && signe > 0) {
+	    VpSetInf(a, sign);
+	    VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
+	}
+	else VpSetZero(a, sign);
+	return 1;
+    }
+
     ind_a = 0;
     while(i < mi) {
         a->frac[ind_a] = 0;
@@ -4002,7 +4134,7 @@ Final:
         ++j;
     }
     a->Prec = ind_a + 1;
-    a->exponent = eb;
+    a->exponent = (S_INT)eb;
     VpSetSign(a,sign);
     VpNmlz(a);
     return 1;
@@ -4074,13 +4206,13 @@ VpVtoD(double *d, S_LONG *e, Real *m)
     *d *= VpGetSign(m);
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, " VpVtoD: m=%\n", m);
         printf("   d=%e * 10 **%ld\n", *d, *e);
-        printf("   DBLE_FIG = %ld\n", DBLE_FIG);
+        printf("   DBLE_FIG = %d\n", DBLE_FIG);
     }
-#endif /*_DEBUG */
+#endif /*BIGDECIMAL_DEBUG */
     return f;
 }
 
@@ -4091,7 +4223,7 @@ VP_EXPORT void
 VpDtoV(Real *m, double d)
 {
     U_LONG i, ind_m, mm;
-    U_LONG ne;
+    S_INT ne;
     double  val, val2;
 
     if(isnan(d)) {
@@ -4145,18 +4277,19 @@ VpDtoV(Real *m, double d)
                       (U_LONG)(val*((double)((S_INT)BASE))));
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         printf("VpDtoV d=%30.30e\n", d);
         VPrint(stdout, "  m=%\n", m);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return;
 }
 
 /*
  *  m <- ival
  */
+#if 0  /* unused */
 VP_EXPORT void
 VpItoV(Real *m, S_INT ival)
 {
@@ -4206,14 +4339,15 @@ VpItoV(Real *m, S_INT ival)
     VpNmlz(m);
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         printf(" VpItoV i=%d\n", ival);
         VPrint(stdout, "  m=%\n", m);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return;
 }
+#endif
 
 /*
  * y = SQRT(x),  y*y - x =>0
@@ -4275,7 +4409,7 @@ VpSqrt(Real *y, Real *x)
         n =(e + 1) / 2;
     }
     VpDtoV(y, sqrt(val));    /* y <- sqrt(val) */
-    y->exponent += n;
+    y->exponent += (S_INT)n;
     n = (DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
     y->MaxPrec = (U_LONG)Min(n , y_prec);
     f->MaxPrec = y->MaxPrec + 1;
@@ -4294,17 +4428,17 @@ VpSqrt(Real *y, Real *x)
         if(f->exponent <= prec) goto converge;
     } while(++nr < n);
     /* */
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         printf("ERROR(VpSqrt): did not converge within %ld iterations.\n",
             nr);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     y->MaxPrec = y_prec;
 
 converge:
     VpChangeSign(y,(S_INT)1);
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VpMult(r, y, y);
         VpAddSub(f, x, r, -1);
@@ -4313,7 +4447,7 @@ converge:
         VPrint(stdout, "  x =% \n", x);
         VPrint(stdout, "  x-y*y = % \n", f);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     y->MaxPrec = y_prec;
 
 Exit:
@@ -4324,12 +4458,11 @@ Exit:
 
 /*
  *
- * f = 0: Round off/Truncate, 1: round up, 2:ceil, 3: floor, 4: Banker's rounding
  * nf: digit position for operation.
  *
  */
 VP_EXPORT int
-VpMidRound(Real *y, int f, int nf)
+VpMidRound(Real *y, int f, S_LONG nf)
 /*
  * Round reletively from the decimal point.
  *    f: rounding mode
@@ -4338,22 +4471,30 @@ VpMidRound(Real *y, int f, int nf)
 {
     /* fracf: any positive digit under rounding position? */
     /* exptoadd: number of digits needed to compensate negative nf */
-    int n,i,ix,ioffset,fracf,exptoadd;
+    int fracf;
+    S_LONG n,i,ix,ioffset,exptoadd;
     U_LONG v,shifter;
     U_LONG div;
 
     nf += y->exponent*((int)BASE_FIG);
     exptoadd=0;
     if (nf < 0) {
+	/* rounding position too left(large). */
+	if((f!=VP_ROUND_CEIL) && (f!=VP_ROUND_FLOOR)) {
+	    VpSetZero(y,VpGetSign(y)); /* truncate everything */
+	    return 0;
+	}
         exptoadd = -nf;
         nf = 0;
     }
+
     /* ix: x->fraq[ix] contains round position */
     ix = nf/(int)BASE_FIG;
-    if(((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
+    if(((U_LONG)ix)>=y->Prec) return 0;  /* rounding position too right(small). */
     ioffset = nf - ix*((int)BASE_FIG);
 
     v = y->frac[ix];
+
     /* drop digits after pointed digit */
     n = BASE_FIG - ioffset - 1;
     for(shifter=1,i=0;i<n;++i) shifter *= 10;
@@ -4362,7 +4503,7 @@ VpMidRound(Real *y, int f, int nf)
     div = v/10;
     v = v - div*10;
     if (fracf == 0) {
-        for(i=ix+1;i<y->Prec;i++) {
+        for(i=ix+1;(U_LONG)i<y->Prec;i++) {
             if (y->frac[i]%BASE) {
                 fracf = 1;
                 break;
@@ -4416,7 +4557,7 @@ VpMidRound(Real *y, int f, int nf)
         VpNmlz(y);
     }
     if (exptoadd > 0) {
-        y->exponent += exptoadd/BASE_FIG;
+        y->exponent += (S_INT)(exptoadd/BASE_FIG);
         exptoadd %= BASE_FIG;
         for(i=0;i<exptoadd;i++) {
             y->frac[0] *= 10;
@@ -4430,7 +4571,7 @@ VpMidRound(Real *y, int f, int nf)
 }
 
 VP_EXPORT int
-VpLeftRound(Real *y, int f, int nf)
+VpLeftRound(Real *y, int f, S_LONG nf)
 /*
  * Round from the left hand side of the digits.
  */
@@ -4444,8 +4585,8 @@ VpLeftRound(Real *y, int f, int nf)
     return VpMidRound(y,f,nf);
 }
 
-VP_EXPORT int 
-VpActiveRound(Real *y, Real *x, int f, int nf)
+VP_EXPORT int
+VpActiveRound(Real *y, Real *x, int f, S_LONG nf)
 {
     /* First,assign whole value in truncation mode */
     if(VpAsgn(y, x, 10)<=1) return 0; /* Zero,NaN,or Infinity */
@@ -4460,11 +4601,11 @@ VpLimitRound(Real *c,U_LONG ixDigit)
     if(!ix)           return 0;
     if(!ixDigit) ixDigit = c->Prec-1;
     if((ix+BASE_FIG-1)/BASE_FIG > ixDigit+1) return 0;
-    return VpLeftRound(c,VpGetRoundMode(),ix);
+    return VpLeftRound(c,(int)VpGetRoundMode(),(S_LONG)ix);
 }
 
-static void 
-VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v)
+static void
+VpInternalRound(Real *c,U_LONG ixDigit,U_LONG vPrev,U_LONG v)
 {
     int f = 0;
 
@@ -4518,7 +4659,7 @@ VpRdup(Real *m,U_LONG ind_m)
         else                       carry = 0;
     }
     if(carry > 0) {        /* Overflow,count exponent and set fraction part be 1  */
-        if(!AddExponent(m,(S_LONG)1)) return 0;
+        if(!AddExponent(m,1)) return 0;
         m->Prec = m->frac[0] = 1;
     } else {
         VpNmlz(m);
@@ -4562,12 +4703,12 @@ VpFrac(Real *y, Real *x)
     VpNmlz(y);
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpFrac y=%\n", y);
         VPrint(stdout, "    x=%\n", x);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     return;
 }
 
@@ -4598,8 +4739,20 @@ VpPower(Real *y, Real *x, S_INT n)
         }
         goto Exit;
     }
-    if(!VpIsDef(x)) {
-        VpSetNaN(y); /* Not sure !!! */
+    if(VpIsNaN(x)) {
+        VpSetNaN(y);
+        goto Exit;
+    }
+    if(VpIsInf(x)) {
+        if(n==0) {
+            VpSetOne(y);
+            goto Exit;
+        }
+        if(n>0) {
+            VpSetInf(y, (n%2==0 || VpIsPosInf(x)) ? 1 : -1);
+            goto Exit;
+        }
+        VpSetZero(y, (n%2==0 || VpIsPosInf(x)) ? 1 : -1);
         goto Exit;
     }
 
@@ -4632,14 +4785,11 @@ VpPower(Real *y, Real *x, S_INT n)
     while(n > 0) {
         VpAsgn(w1, x, 1);
         s = 1;
-loop1:  ss = s;
-        s += s;
-        if(s >(U_LONG) n) goto out_loop1;
-        VpMult(w2, w1, w1);
-        VpAsgn(w1, w2, 1);
-        goto loop1;
-out_loop1:
-        n -= ss;
+	while (ss = s, (s += s) <= (U_LONG)n) {
+	    VpMult(w2, w1, w1);
+	    VpAsgn(w1, w2, 1);
+	}
+        n -= (S_INT)ss;
         VpMult(w2, y, w1);
         VpAsgn(y, w2, 1);
     }
@@ -4649,19 +4799,19 @@ out_loop1:
     }
 
 Exit:
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
     if(gfDebug) {
         VPrint(stdout, "VpPower y=%\n", y);
         VPrint(stdout, "VpPower x=%\n", x);
         printf("  n=%d\n", n);
     }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
     VpFree(w2);
     VpFree(w1);
     return 1;
 }
 
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
 int
 VpVarCheck(Real * v)
 /*
@@ -4697,4 +4847,4 @@ VpVarCheck(Real * v)
     }
     return 0;
 }
-#endif /* _DEBUG */
+#endif /* BIGDECIMAL_DEBUG */
diff --git a/ext/bigdecimal/bigdecimal.def b/ext/bigdecimal/bigdecimal.def
deleted file mode 100644
index 8450e164e6..0000000000
--- a/ext/bigdecimal/bigdecimal.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORTS
-Init_bigdecimal
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index 4f77feab00..af18a9a874 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -1,12 +1,12 @@
 /*
  *
- * Ruby BigDecimal(Variable decimal precision) extension library. 
+ * Ruby BigDecimal(Variable decimal precision) extension library.
  *
- * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp) 
+ * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
  *
- * You may distribute under the terms of either the GNU General Public 
- * License or the Artistic License, as specified in the README file 
- * of this BigDecimal distribution. 
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Artistic License, as specified in the README file
+ * of this BigDecimal distribution.
  *
  * NOTES:
  *   2003-03-28 V1.0 checked in.
@@ -29,10 +29,10 @@ extern "C" {
 #define SZ_NINF "-Infinity"
 
 /*
- *   #define VP_EXPORT other than static to let VP_ routines 
+ *   #define VP_EXPORT other than static to let VP_ routines
  *   be called from outside of this module.
  */
-#define VP_EXPORT static 
+#define VP_EXPORT static
 
 #define U_LONG unsigned long
 #define S_LONG long
@@ -45,7 +45,7 @@ extern "C" {
 #define VP_EXCEPTION_NaN        ((unsigned short)0x0002)
 #define VP_EXCEPTION_UNDERFLOW  ((unsigned short)0x0004)
 #define VP_EXCEPTION_OVERFLOW   ((unsigned short)0x0001) /* 0x0008) */
-#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0001) /* 0x0010) */
+#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0010)
 
 /* Following 2 exceptions cann't controlled by user */
 #define VP_EXCEPTION_OP         ((unsigned short)0x0020)
@@ -96,7 +96,7 @@ typedef struct {
     U_LONG frac[1]; /* Pointer to array of fraction part.       */
 } Real;
 
-/*  
+/*
  *  ------------------
  *   EXPORTables.
  *  ------------------
@@ -127,16 +127,18 @@ VP_EXPORT unsigned long VpGetRoundMode(void);
 VP_EXPORT unsigned long VpSetRoundMode(unsigned long n);
 
 VP_EXPORT int VpException(unsigned short f,const char *str,int always);
+#if 0  /* unused */
 VP_EXPORT int VpIsNegDoubleZero(double v);
+#endif
 VP_EXPORT U_LONG VpNumOfChars(Real *vp,const char *pszFmt);
 VP_EXPORT U_LONG VpInit(U_LONG BaseVal);
 VP_EXPORT void *VpMemAlloc(U_LONG mb);
 VP_EXPORT void VpFree(Real *pv);
 VP_EXPORT Real *VpAlloc(U_LONG mx, const char *szVal);
-VP_EXPORT int VpAsgn(Real *c,Real *a,int isw);
-VP_EXPORT int VpAddSub(Real *c,Real *a,Real *b,int operation);
-VP_EXPORT int VpMult(Real *c,Real *a,Real *b);
-VP_EXPORT int VpDivd(Real *c,Real *r,Real *a,Real *b);
+VP_EXPORT U_LONG VpAsgn(Real *c,Real *a,int isw);
+VP_EXPORT U_LONG VpAddSub(Real *c,Real *a,Real *b,int operation);
+VP_EXPORT U_LONG VpMult(Real *c,Real *a,Real *b);
+VP_EXPORT U_LONG VpDivd(Real *c,Real *r,Real *a,Real *b);
 VP_EXPORT int VpComp(Real *a,Real *b);
 VP_EXPORT S_LONG VpExponent10(Real *a);
 VP_EXPORT void VpSzMantissa(Real *a,char *psz);
@@ -146,18 +148,20 @@ VP_EXPORT void VpToFString(Real *a,char *psz,int fFmt,int fPlus);
 VP_EXPORT int VpCtoV(Real *a,const char *int_chr,U_LONG ni,const char *frac,U_LONG nf,const char *exp_chr,U_LONG ne);
 VP_EXPORT int VpVtoD(double *d,S_LONG *e,Real *m);
 VP_EXPORT void VpDtoV(Real *m,double d);
+#if 0  /* unused */
 VP_EXPORT void VpItoV(Real *m,S_INT ival);
+#endif
 VP_EXPORT int VpSqrt(Real *y,Real *x);
-VP_EXPORT int VpActiveRound(Real *y,Real *x,int f,int il);
-VP_EXPORT int VpMidRound(Real *y, int f, int nf);
-VP_EXPORT int VpLeftRound(Real *y, int f, int nf);
+VP_EXPORT int VpActiveRound(Real *y,Real *x,int f,S_LONG il);
+VP_EXPORT int VpMidRound(Real *y, int f, S_LONG nf);
+VP_EXPORT int VpLeftRound(Real *y, int f, S_LONG nf);
 VP_EXPORT void VpFrac(Real *y,Real *x);
 VP_EXPORT int VpPower(Real *y,Real *x,S_INT n);
 
 /* VP constants */
 VP_EXPORT Real *VpOne(void);
 
-/*  
+/*
  *  ------------------
  *  MACRO definitions.
  *  ------------------
@@ -180,7 +184,7 @@ VP_EXPORT Real *VpOne(void);
 #define VpSetSign(a,s)    {if((s)>0) (a)->sign=(short)VP_SIGN_POSITIVE_FINITE;else (a)->sign=(short)VP_SIGN_NEGATIVE_FINITE;}
 
 /* 1 */
-#define VpSetOne(a)       {(a)->frac[0]=(a)->exponent=(a)->Prec=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
+#define VpSetOne(a)       {(a)->frac[0]=(a)->Prec=(a)->exponent=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
 
 /* ZEROs */
 #define VpIsPosZero(a)  ((a)->sign==VP_SIGN_POSITIVE_ZERO)
@@ -205,10 +209,10 @@ VP_EXPORT Real *VpOne(void);
 #define VpHasVal(a)     (a->frac[0])
 #define VpIsOne(a)      ((a->Prec==1)&&(a->frac[0]==1)&&(a->exponent==1))
 #define VpExponent(a)   (a->exponent)
-#ifdef _DEBUG
+#ifdef BIGDECIMAL_DEBUG
 int VpVarCheck(Real * v);
-VP_EXPORT int VPrint(FILE *fp,char *cntl_chr,Real *a);
-#endif /* _DEBUG */
+VP_EXPORT int VPrint(FILE *fp,const char *cntl_chr,Real *a);
+#endif /* BIGDECIMAL_DEBUG */
 
 #if defined(__cplusplus)
 }  /* extern "C" { */
diff --git a/ext/bigdecimal/bigdecimal_en.html b/ext/bigdecimal/bigdecimal_en.html
index c2b86faef6..82acd2a2a5 100644
--- a/ext/bigdecimal/bigdecimal_en.html
+++ b/ext/bigdecimal/bigdecimal_en.html
@@ -1,4 +1,3 @@
-<!-- saved from url=(0022)http://internet.e-mail -->
 <HTML>
 <HEAD>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html">
@@ -43,7 +42,7 @@ For the details about Ruby see:<BR>
 NOTE:<BR>
  This software is provided "AS IS" and without any express or
  implied warranties,including,without limitation,the implied
- warranties of merchantibility and fitness for a particular
+ warranties of merchantability and fitness for a particular
  purpose. For the details,see COPYING and README included in this
  distribution.
 <BR>
@@ -115,7 +114,7 @@ s: Initial value string. Spaces will be ignored. Any unrecognizable character fo
 representing initial value terminates the string.<BR>
 n: Maximum number of significant digits of a. n must be a Fixnum object.
 If n is omitted or is equal to 0,then the maximum number of significant digits of a is determined from the length of s.
-Actual number of digits handled in computations are usually gretaer than n.<BR>
+Actual number of digits handled in computations are usually greater than n.<BR>
 n is useful when performing divisions like
 <CODE><PRE>
 BigDecimal("1")    / BigDecimal("3")    # => 0.3333333333 33E0
@@ -141,11 +140,11 @@ f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
 f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
 </BLOCKQUOTE>
 EXCEPTION_NaN controls the execution when computation results to NaN.<BR>
-EXCEPTION_INFINITY controls the execution when computation results to Infinity(�}Infinity).<BR>
+EXCEPTION_INFINITY controls the execution when computation results to Infinity.<BR>
 EXCEPTION_UNDERFLOW controls the execution when computation underflows.<BR>
 EXCEPTION_OVERFLOW controls the execution when computation overflows.<BR>
-EXCEPTION_ZERODIVIDE controls the execution when zero-division occures.<BR>
-EXCEPTION_ALL controls the execution for any exception defined occures.<BR>
+EXCEPTION_ZERODIVIDE controls the execution when zero-division occurs.<BR>
+EXCEPTION_ALL controls the execution when any defined exception occurs.<BR>
 If the flag is true,then the relating exception is thrown.<BR>
 No exception is thrown when the flag is false(default) and computation 
 continues with the result:<BR>
@@ -181,7 +180,7 @@ where flag must be one of:
 </TABLE>
 New rounding mode is returned. If nil is specified for the second argument,then current setting is returned.<BR>
 The digit location for rounding operation can not be specified by this mode method,
-use truncate/round/ceil/floor/add/sub/mult/div mthods for each instance instead.
+use truncate/round/ceil/floor/add/sub/mult/div methods for each instance instead.
 </BLOCKQUOTE>
 
 <LI><B>limit[(n)]</B></LI><BLOCKQUOTE>
@@ -321,7 +320,7 @@ If n<0,then the n-th digit counted from the decimal point in integer part is pro
 </BLOCKQUOTE>
 <LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
 c = a.round<BR>
-round a to the nearest 1(default)�D<BR>
+round a to the nearest 1(default)ÅD<BR>
 <CODE><PRE>
  c = BigDecimal("1.23456").round  #  ==> 1
  c = BigDecimal("-1.23456").round #  ==> -1
@@ -346,7 +345,7 @@ c = BigDecimal::new("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.2
 </BLOCKQUOTE>
 <LI><B>truncate[(n)]</B></LI><BLOCKQUOTE>
 c = a.truncate<BR>
-truncate a to the nearest 1�D<BR>
+truncate a to the nearest 1ÅD<BR>
 As shown in the following example,an optional integer argument (n) specifying the position 
 of the target digit can be given.<BR>
 If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
@@ -409,7 +408,7 @@ means a = 0.xxxxxxx*10**n.
 
 <LI><B>precs</B></LI><BLOCKQUOTE>
 n,m = a.precs <BR>
-prec returns number of significant digits (n) and maximum number of 
+precs returns number of significant digits (n) and maximum number of 
 significant digits (m) of a.
 </BLOCKQUOTE>
 
@@ -439,11 +438,11 @@ a.nan? returns True when a is NaN.
 
 </BLOCKQUOTE>
 <LI><B>infinite?</B></LI><BLOCKQUOTE>
-a.infinite? returns 1 when a is +��,-1 when a is -��, nil otherwise.
+a.infinite? returns 1 when a is Infinity, -1 when a is -Infinity, nil otherwise.
 
 </BLOCKQUOTE>
 <LI><B>finite?</B></LI><BLOCKQUOTE>
-a.finite? returns true when a is neither �� nor NaN.
+a.finite? returns true when a is neither Infinity nor NaN.
 </BLOCKQUOTE>
 
 <LI><B>zero?</B></LI><BLOCKQUOTE>
@@ -526,9 +525,9 @@ same as ==,used in case statement.
 <DT> 1.Both A and B are BigDecimal objects</DT>
 <DD> A op B is normally performed.</DD>
 <DT> 2.A is the BigDecimal object but B is other than BigDecimal object</DT>
-<DD> Operation is performed,after B is translated to correcponding BigDecimal object(because BigDecimal supports coerce method).</DD>
+<DD> Operation is performed,after B is translated to corresponding BigDecimal object(because BigDecimal supports coerce method).</DD>
 <DT> 3.A is not the BigDecimal object but B is BigDecimal object</DT>
-<DD>If A has coerce mthod,then B will translate A to corresponding 
+<DD>If A has coerce method,then B will translate A to corresponding 
 BigDecimal object and the operation is performed,otherwise an error occures.</DD>
 </DL>
 
@@ -573,7 +572,7 @@ Zero has two different variations as +0.0 and -0.0.
 But,still, +0.0==-0.0 is true.
 <BR><BR>
 Computation results including Infinity,NaN,+0.0 or -0.0 become complicated.
-Run following program and comfirm the results.
+Run following program and confirm the results.
 Send me any incorrect result if you find.
 
 <CODE><PRE>
@@ -603,12 +602,9 @@ where 'x' is any digit representing mantissa(kept in the array frac[]),
 BASE is base value(=10000 in 32 bit integer system),
 and n is the exponent value.<BR>
 Larger BASE value enables smaller size of the array frac[],and increases computation speed.
-The value of BASE is defined ind VpInit(). In 32 bit integer system,this value is 
-10000. In 64 bit integer system,the value becomes larger.
-BigDecimal has not yet been compiled and tested on 64 bit integer system.
-It will be very nice if anyone try to run BigDecimal on 64 bit system and
- inform me the results.
-When BASE is 10000,an element of the array frac[] can have vale of from 0 to 9999.
+The value of BASE is defined ind VpInit(). In 32 bit integer system, this value is 
+10000. In 64 bit integer system, the value is 1000000000.
+When BASE is 10000,an element of the array frac[] can have value of from 0 to 9999.
 (up to 4 digits).<BR>
 The structure Real is defined in bigdecimal.h as:<BR>
 <CODE><PRE>
@@ -626,7 +622,7 @@ The structure Real is defined in bigdecimal.h as:<BR>
                             /*   -3 : -Infinity         */
      unsigned short flag;   /* Control flag             */
      int      exponent;     /* Exponent value(0.xxxx*BASE**exponent) */
-     unsigned long frac[1]; /* An araay holding mantissa(Variable)   */
+     unsigned long frac[1]; /* An array holding mantissa(Variable)   */
   } Real;
 </CODE></PRE>
 The decimal value 1234.56784321 is represented as(BASE=10000):<BR>
@@ -668,7 +664,7 @@ For example, 0.1 can not exactly be represented in binary.<BR>
 where b1=0,b2=0,b3=0,b4=1...<BR>
 bn(n=1,2,3,...) is infinite series of digit with value of 0 or 1,
 and rounding operation is necessary but where we should round the series ?
-Of cource,exact "0.1" is printed if the rouding operation is properly done,
+Of course, exact "0.1" is printed if the rounding operation is properly done,
 <DT>Significant digit we can have is automatically determined
 <DD>In binary representation,0.1 can not be represented in finite series of digit.
 
@@ -678,12 +674,12 @@ structure.
 </DL>
 
 <H3>Disadvantage of decimal representation</H3>
-Because most computers have no internal decimal representaion.
+Because most computers have no internal decimal representation.
 Once you use BigDecimal,you need to keep using it without
 considering computation cost if exact computation is required.
 
 <H4>Which is the first input?</H4>
-Because most people uses decimal notatin for numeric data representation,
+Because most people uses decimal notation for numeric data representation,
 BigDecimal can handle numeric data without loss of translation error.
 <hr>
 
@@ -701,11 +697,11 @@ significant digits of both side of the operator. For / ,resulting number of sign
 maximum significant digits of both side of the operator.<BR>
 1.2 For + and -,resulting number of significant digits is determined so that
  no round operation is needed. <br>
-For example, c has more than 100 siginificant digits if c is computed as:<BR>
+For example, c has more than 100 significant digits if c is computed as:<BR>
 c = 0.1+0.1*10**(-100)<br>
 <BR>
 As +,-,and * are always exact(no round operation is performed unless BigDecimal.limit is specified),
-which means more momories are required to keep computation results.
+which means more memory is required to keep computation results.
 But,the division such as c=1.0/3.0 will always be rounded.<BR>
 
 <H3>2. add,sub,mult,div</H3>
@@ -729,7 +725,7 @@ decimal point.
 
 <H3>4. Example</H3>
 Following example compute the ratio of the circumference of a circle to 
-its dirmeter(pi=3.14159265358979....) using J.Machin's formula.
+its diameter(pi=3.14159265358979....) using J.Machin's formula.
 <BR><BR>
 <CODE><PRE>
 #!/usr/local/bin/ruby
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
index 864aaad862..0c8b98e4a3 100644
--- a/ext/bigdecimal/extconf.rb
+++ b/ext/bigdecimal/extconf.rb
@@ -1,9 +1,7 @@
 require 'mkmf'
 
 base_fig = 0
-src = ("(BASE > 0) && "
-       "(BASE * (BASE+1)) > BASE && "
-       "(BASE * (BASE+1)) / BASE == (BASE+1)")
+src = "(BASE * (BASE+1)) / BASE == (BASE+1)"
 while try_static_assert(src, nil, "-DBASE=10#{'0'*base_fig}UL")
   base_fig += 1
 end
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index d80eeab901..e4420df158 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -21,18 +21,20 @@
 # fx is f.values(x).
 #
 module Jacobian
+  module_function
+
   #--
   def isEqual(a,b,zero=0.0,e=1.0e-8)
     aa = a.abs
     bb = b.abs
     if aa == zero &&  bb == zero then
-          true
+      true
     else
-          if ((a-b)/(aa+bb)).abs < e then
-             true
-          else
-             false
-          end
+      if ((a-b)/(aa+bb)).abs < e then
+        true
+      else
+        false
+      end
     end
   end
   #++
@@ -52,17 +54,17 @@ module Jacobian
       s = f.zero
       deriv = []
       if(nRetry>100) then
-         raize "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
+        raise "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
       end
       dx = dx*f.two
       x[i] += dx
       fxNew = f.values(x)
       for j in 0...n do
         if !isEqual(fxNew[j],fx[j],f.zero,f.eps) then
-           ok += 1
-           deriv <<= (fxNew[j]-fx[j])/dx
+          ok += 1
+          deriv <<= (fxNew[j]-fx[j])/dx
         else
-           deriv <<= f.zero
+          deriv <<= f.zero
         end
       end
       x[i] = xSave
@@ -77,7 +79,7 @@ module Jacobian
     for i in 0...n do
       df = dfdxi(f,fx,x,i)
       for j in 0...n do
-         dfdx[j*n+i] = df[j]
+        dfdx[j*n+i] = df[j]
       end
     end
     dfdx
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
index 8f4888725e..6cbe29b6da 100644
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
@@ -1,7 +1,11 @@
+require 'bigdecimal'
+
 #
 # Solves a*x = b for x, using LU decomposition.
 #
 module LUSolve
+  module_function
+
   # Performs LU decomposition of the n by n matrix a.
   def ludecomp(a,n,zero=0,one=1)
     prec = BigDecimal.limit(nil)
@@ -12,24 +16,24 @@ module LUSolve
       nrmrow  = zero
       ixn = i*n
       for j in 0...n do
-         biggst = a[ixn+j].abs
-         nrmrow = biggst if biggst>nrmrow
+        biggst = a[ixn+j].abs
+        nrmrow = biggst if biggst>nrmrow
       end
       if nrmrow>zero then
-         scales <<= one.div(nrmrow,prec)
-      else 
-         raise "Singular matrix"
+        scales <<= one.div(nrmrow,prec)
+      else
+        raise "Singular matrix"
       end
     end
     n1          = n - 1
     for k in 0...n1 do # Gaussian elimination with partial pivoting.
       biggst  = zero;
       for i in k...n do
-         size = a[ps[i]*n+k].abs*scales[ps[i]]
-         if size>biggst then
-            biggst = size
-            pividx  = i
-         end
+        size = a[ps[i]*n+k].abs*scales[ps[i]]
+        if size>biggst then
+          biggst = size
+          pividx  = i
+        end
       end
       raise "Singular matrix" if biggst<=zero
       if pividx!=k then
@@ -42,10 +46,10 @@ module LUSolve
         psin = ps[i]*n
         a[psin+k] = mult = a[psin+k].div(pivot,prec)
         if mult!=zero then
-           pskn = ps[k]*n
-           for j in (k+1)...n do
-             a[psin+j] -= mult.mult(a[pskn+j],prec)
-           end
+          pskn = ps[k]*n
+          for j in (k+1)...n do
+            a[psin+j] -= mult.mult(a[pskn+j],prec)
+          end
         end
       end
     end
@@ -72,12 +76,12 @@ module LUSolve
       x <<= b[ps[i]] - dot
     end
     (n-1).downto(0) do |i|
-       dot = zero
-       psin = ps[i]*n
-       for j in (i+1)...n do
-         dot = a[psin+j].mult(x[j],prec) + dot
-       end
-       x[i]  = (x[i]-dot).div(a[psin+i],prec)
+      dot = zero
+      psin = ps[i]*n
+      for j in (i+1)...n do
+        dot = a[psin+j].mult(x[j],prec) + dot
+      end
+      x[i]  = (x[i]-dot).div(a[psin+i],prec)
     end
     x
   end
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index f3248a3c5c..41fc69f66c 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 #
 #--
 # Contents:
@@ -29,11 +31,12 @@
 #   puts sin(a,100) # -> 0.10000000000000000000......E1
 #
 module BigMath
+  module_function
 
-  # Computes the square root of x to the specified number of digits of 
+  # Computes the square root of x to the specified number of digits of
   # precision.
   #
-  # BigDecimal.new('2').sqrt(16).to_s 
+  # BigDecimal.new('2').sqrt(16).to_s
   #  -> "0.14142135623730950488016887242096975E1"
   #
   def sqrt(x,prec)
@@ -49,6 +52,14 @@ module BigMath
     n    = prec + BigDecimal.double_fig
     one  = BigDecimal("1")
     two  = BigDecimal("2")
+    x = -x if neg = x < 0
+    if x > (twopi = two * BigMath.PI(prec))
+      if x > 30
+        x %= twopi
+      else
+        x -= twopi while x > twopi
+      end
+    end
     x1   = x
     x2   = x.mult(x,n)
     sign = 1
@@ -65,7 +76,7 @@ module BigMath
       d   = sign * x1.div(z,m)
       y  += d
     end
-    y
+    neg ? -y : y
   end
 
   # Computes the cosine of x to the specified number of digits of precision.
@@ -77,6 +88,14 @@ module BigMath
     n    = prec + BigDecimal.double_fig
     one  = BigDecimal("1")
     two  = BigDecimal("2")
+    x = -x if x < 0
+    if x > (twopi = two * BigMath.PI(prec))
+      if x > 30
+        x %= twopi
+      else
+        x -= twopi while x > twopi
+      end
+    end
     x1 = one
     x2 = x.mult(x,n)
     sign = 1
@@ -98,12 +117,16 @@ module BigMath
 
   # Computes the arctangent of x to the specified number of digits of precision.
   #
-  # If x is infinite or NaN, returns NaN.
-  # Raises an argument error if x > 1.
+  # If x is NaN, returns NaN.
   def atan(x, prec)
     raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
-    return BigDecimal("NaN") if x.infinite? || x.nan?
-    raise ArgumentError, "x.abs must be less than 1.0" if x.abs>=1
+    return BigDecimal("NaN") if x.nan?
+    pi = PI(prec)
+    x = -x if neg = x < 0
+    return pi.div(neg ? -2 : 2, prec) if x.infinite?
+    return pi / (neg ? -4 : 4) if x.round(prec) == 1
+    x = BigDecimal("1").div(x, prec) if inv = x > 1
+    x = (-1 + sqrt(1 + x**2, prec))/x if dbl = x > 0.5
     n    = prec + BigDecimal.double_fig
     y = x
     d = y
@@ -117,10 +140,13 @@ module BigMath
       y += d
       r += 2
     end
+    y *= 2 if dbl
+    y = pi / 2 - y if inv
+    y = -y if neg
     y
   end
 
-  # Computes the value of e (the base of natural logarithms) raised to the 
+  # Computes the value of e (the base of natural logarithms) raised to the
   # power of x, to the specified number of digits of precision.
   #
   # If x is infinite or NaN, returns NaN.
@@ -132,6 +158,7 @@ module BigMath
     return BigDecimal("NaN") if x.infinite? || x.nan?
     n    = prec + BigDecimal.double_fig
     one  = BigDecimal("1")
+    x = -x if neg = x < 0
     x1 = one
     y  = one
     d  = y
@@ -145,10 +172,14 @@ module BigMath
       d  = x1.div(z,m)
       y += d
     end
-    y
+    if neg
+      one.div(y, prec)
+    else
+      y.round(prec - y.exponent)
+    end
   end
 
-  # Computes the natural logarithm of x to the specified number of digits 
+  # Computes the natural logarithm of x to the specified number of digits
   # of precision.
   #
   # Returns x if x is infinite or NaN.
@@ -159,6 +190,11 @@ module BigMath
     one = BigDecimal("1")
     two = BigDecimal("2")
     n  = prec + BigDecimal.double_fig
+    if (expo = x.exponent) < 0 || expo >= 3
+      x = x.mult(BigDecimal("1E#{-expo}"), n)
+    else
+      expo = nil
+    end
     x  = (x - one).div(x + one,n)
     x2 = x.mult(x,n)
     y  = x
@@ -171,7 +207,11 @@ module BigMath
       d  = x.div(i,m)
       y += d
     end
-    y*two
+    y *= two
+    if expo
+      y += log(BigDecimal("10"),prec) * BigDecimal(expo.to_s)
+    end
+    y
   end
 
   # Computes the value of pi to the specified number of digits of precision.
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index 59ac0f7f04..96defc3c06 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -1,5 +1,8 @@
+require "bigdecimal/ludcmp"
+require "bigdecimal/jacobian"
+
 #
-# newton.rb 
+# newton.rb
 #
 # Solves the nonlinear algebraic equation system f = 0 by Newton's method.
 # This program is not dependent on BigDecimal.
@@ -22,13 +25,11 @@
 #
 # On exit, x is the solution vector.
 #
-require "bigdecimal/ludcmp"
-require "bigdecimal/jacobian"
-
 module Newton
   include LUSolve
   include Jacobian
-  
+  module_function
+
   def norm(fv,zero=0.0)
     s = zero
     n = fv.size
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index 09e926acd5..474266476f 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -31,35 +31,23 @@ class BigDecimal < Numeric
   # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
   # This method is deprecated; use BigDecimal#to_s("F") instead.
   def to_digits
-     if self.nan? || self.infinite? || self.zero?
-        self.to_s
-     else
-       i       = self.to_i.to_s
-       s,f,y,z = self.frac.split
-       i + "." + ("0"*(-z)) + f
-     end
-  end
-
-  # Converts a BigDecimal to a Rational.
-  def to_r 
-     sign,digits,base,power = self.split
-     numerator = sign*digits.to_i
-     denomi_power = power - digits.size # base is always 10
-     if denomi_power < 0
-        Rational(numerator,base ** (-denomi_power))
-     else
-        Rational(numerator * (base ** denomi_power),1)
-     end
+    if self.nan? || self.infinite? || self.zero?
+      self.to_s
+    else
+      i       = self.to_i.to_s
+      s,f,y,z = self.frac.split
+      i + "." + ("0"*(-z)) + f
+    end
   end
 end
 
 class Rational < Numeric
   # Converts a Rational to a BigDecimal
   def to_d(nFig=0)
-     num = self.numerator.to_s
-     if nFig<=0
-        nFig = BigDecimal.double_fig*2+1
-     end
-     BigDecimal.new(num).div(self.denominator,nFig)
+    num = self.numerator.to_s
+    if nFig<=0
+      nFig = BigDecimal.double_fig*2+1
+    end
+    BigDecimal.new(num).div(self.denominator,nFig)
   end
 end
diff --git a/ext/continuation/continuation.c b/ext/continuation/continuation.c
new file mode 100644
index 0000000000..ae69b66cd8
--- /dev/null
+++ b/ext/continuation/continuation.c
@@ -0,0 +1,8 @@
+
+void ruby_Init_Continuation_body(void);
+
+void
+Init_continuation(void)
+{
+    ruby_Init_Continuation_body();
+}
diff --git a/ext/continuation/extconf.rb b/ext/continuation/extconf.rb
new file mode 100644
index 0000000000..17e2d056db
--- /dev/null
+++ b/ext/continuation/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+create_makefile('continuation')
+
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
new file mode 100644
index 0000000000..145be1834d
--- /dev/null
+++ b/ext/coverage/coverage.c
@@ -0,0 +1,101 @@
+/************************************************
+
+  coverage.c -
+
+  $Author: $
+
+  Copyright (c) 2008 Yusuke Endoh
+
+************************************************/
+
+#include "ruby.h"
+
+extern VALUE rb_get_coverages(void);
+extern void rb_set_coverages(VALUE);
+extern void rb_reset_coverages(void);
+
+/*
+ * call-seq:
+ *    Coverage.start  => nil
+ *
+ * Enables coverage measurement.
+ */
+static VALUE
+rb_coverage_start(VALUE klass)
+{
+    if (!RTEST(rb_get_coverages())) {
+	VALUE coverages = rb_hash_new();
+	RBASIC(coverages)->klass = 0;
+	rb_set_coverages(coverages);
+    }
+    return Qnil;
+}
+
+static int
+coverage_result_i(st_data_t key, st_data_t val, st_data_t dummy)
+{
+    VALUE coverage = (VALUE)val;
+    RBASIC(coverage)->klass = rb_cArray;
+    rb_ary_freeze(coverage);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     Coverage.result  => hash
+ *
+ * Returns a hash that contains filename as key and coverage array as value
+ * and disables coverage measurement.
+ */
+static VALUE
+rb_coverage_result(VALUE klass)
+{
+    VALUE coverages = rb_get_coverages();
+    if (!RTEST(coverages)) {
+	rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
+    }
+    RBASIC(coverages)->klass = rb_cHash;
+    st_foreach(RHASH_TBL(coverages), coverage_result_i, 0);
+    rb_hash_freeze(coverages);
+    rb_reset_coverages();
+    return coverages;
+}
+
+/* Coverage provides coverage measurement feature for Ruby.
+ * This feature is experimental, so these APIs may be changed in future.
+ *
+ * = Usage
+ *
+ * (1) require "coverage.so"
+ * (2) do Coverage.start
+ * (3) require or load Ruby source file
+ * (4) Coverage.result will return a hash that contains filename as key and
+ *     coverage array as value.
+ *
+ * = Example
+ *
+ *   [foo.rb]
+ *   s = 0
+ *   10.times do |x|
+ *     s += x
+ *   end
+ *
+ *   if s == 45
+ *     p :ok
+ *   else
+ *     p :ng
+ *   end
+ *   [EOF]
+ *
+ *   require "coverage.so"
+ *   Coverage.start
+ *   require "foo.rb"
+ *   p Coverage.result  #=> {"foo.rb"=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil]}
+ */
+void
+Init_coverage(void)
+{
+    VALUE rb_mCoverage = rb_define_module("Coverage");
+    rb_define_module_function(rb_mCoverage, "start", rb_coverage_start, 0);
+    rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, 0);
+}
diff --git a/ext/coverage/extconf.rb b/ext/coverage/extconf.rb
new file mode 100644
index 0000000000..3ebced54a6
--- /dev/null
+++ b/ext/coverage/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('coverage')
diff --git a/ext/curses/.cvsignore b/ext/curses/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/curses/.cvsignore
+++ b/ext/curses/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 9c51a2127f..7f68b2186a 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -2,7 +2,7 @@
  * $Id$
  *
  * ext/curses/curses.c
- * 
+ *
  * by MAEDA Shugo (ender@pic-internet.or.jp)
  * modified by Yukihiro Matsumoto (matz@netlab.co.jp),
  *         Toki Yoshinori,
@@ -14,7 +14,7 @@
  */
 
 #include "ruby.h"
-#include "rubyio.h"
+#include "ruby/io.h"
 
 #if defined(HAVE_NCURSES_H)
 # include <ncurses.h>
@@ -54,8 +54,8 @@
 # define USE_MOUSE 1
 #endif
 
-#define NUM2CH NUM2LONG
-#define CH2FIX LONG2FIX
+#define NUM2CH NUM2CHR
+#define CH2FIX CHR2FIX
 
 static VALUE mCurses;
 static VALUE mKey;
@@ -72,12 +72,12 @@ struct windata {
 
 #define CHECK(c) c
 
-static VALUE window_attroff();
-static VALUE window_attron();
-static VALUE window_attrset();
+static VALUE window_attroff(VALUE obj, VALUE attrs);
+static VALUE window_attron(VALUE obj, VALUE attrs);
+static VALUE window_attrset(VALUE obj, VALUE attrs);
 
 static void
-no_window()
+no_window(void)
 {
     rb_raise(rb_eRuntimeError, "already closed window");
 }
@@ -90,18 +90,15 @@ no_window()
 } while (0)
 
 static void
-free_window(winp)
-    struct windata *winp;
+free_window(struct windata *winp)
 {
     if (winp->window && winp->window != stdscr) delwin(winp->window);
     winp->window = 0;
-    free(winp);
+    xfree(winp);
 }
 
 static VALUE
-prep_window(class, window)
-    VALUE class;
-    WINDOW *window;
+prep_window(VALUE class, WINDOW *window)
 {
     VALUE obj;
     struct windata *winp;
@@ -113,15 +110,15 @@ prep_window(class, window)
     obj = rb_obj_alloc(class);
     Data_Get_Struct(obj, struct windata, winp);
     winp->window = window;
-    
-    return obj;    
+
+    return obj;
 }
 
 /*-------------------------- module Curses --------------------------*/
 
 /* def init_screen */
 static VALUE
-curses_init_screen()
+curses_init_screen(void)
 {
     rb_secure(4);
     if (rb_stdscr) return rb_stdscr;
@@ -139,8 +136,9 @@ curses_init_screen()
 
 /* def close_screen */
 static VALUE
-curses_close_screen()
+curses_close_screen(void)
 {
+    curses_stdscr();
 #ifdef HAVE_ISENDWIN
     if (!isendwin())
 #endif
@@ -162,24 +160,24 @@ curses_finalize(VALUE dummy)
     rb_gc_unregister_address(&rb_stdscr);
 }
 
+#ifdef HAVE_ISENDWIN
 /* def closed? */
 static VALUE
-curses_closed()
+curses_closed(void)
 {
-#ifdef HAVE_ISENDWIN
+    curses_stdscr();
     if (isendwin()) {
 	return Qtrue;
     }
     return Qfalse;
+}
 #else
-    rb_notimplement();
+#define curses_closed rb_f_notimplement
 #endif
-}
 
 /* def clear */
 static VALUE
-curses_clear(obj)
-    VALUE obj;
+curses_clear(VALUE obj)
 {
     curses_stdscr();
     wclear(stdscr);
@@ -188,7 +186,7 @@ curses_clear(obj)
 
 /* def clrtoeol */
 static VALUE
-curses_clrtoeol()
+curses_clrtoeol(void)
 {
     curses_stdscr();
     clrtoeol();
@@ -197,8 +195,7 @@ curses_clrtoeol()
 
 /* def refresh */
 static VALUE
-curses_refresh(obj)
-    VALUE obj;
+curses_refresh(VALUE obj)
 {
     curses_stdscr();
     refresh();
@@ -207,8 +204,7 @@ curses_refresh(obj)
 
 /* def doupdate */
 static VALUE
-curses_doupdate(obj)
-    VALUE obj;
+curses_doupdate(VALUE obj)
 {
     curses_stdscr();
 #ifdef HAVE_DOUPDATE
@@ -221,8 +217,7 @@ curses_doupdate(obj)
 
 /* def echo */
 static VALUE
-curses_echo(obj)
-    VALUE obj;
+curses_echo(VALUE obj)
 {
     curses_stdscr();
     echo();
@@ -231,8 +226,7 @@ curses_echo(obj)
 
 /* def noecho */
 static VALUE
-curses_noecho(obj)
-    VALUE obj;
+curses_noecho(VALUE obj)
 {
     curses_stdscr();
     noecho();
@@ -241,8 +235,7 @@ curses_noecho(obj)
 
 /* def raw */
 static VALUE
-curses_raw(obj)
-    VALUE obj;
+curses_raw(VALUE obj)
 {
     curses_stdscr();
     raw();
@@ -251,8 +244,7 @@ curses_raw(obj)
 
 /* def noraw */
 static VALUE
-curses_noraw(obj)
-    VALUE obj;
+curses_noraw(VALUE obj)
 {
     curses_stdscr();
     noraw();
@@ -261,8 +253,7 @@ curses_noraw(obj)
 
 /* def cbreak */
 static VALUE
-curses_cbreak(obj)
-    VALUE obj;
+curses_cbreak(VALUE obj)
 {
     curses_stdscr();
     cbreak();
@@ -271,8 +262,7 @@ curses_cbreak(obj)
 
 /* def nocbreak */
 static VALUE
-curses_nocbreak(obj)
-    VALUE obj;
+curses_nocbreak(VALUE obj)
 {
     curses_stdscr();
     nocbreak();
@@ -281,8 +271,7 @@ curses_nocbreak(obj)
 
 /* def nl */
 static VALUE
-curses_nl(obj)
-    VALUE obj;
+curses_nl(VALUE obj)
 {
     curses_stdscr();
     nl();
@@ -291,8 +280,7 @@ curses_nl(obj)
 
 /* def nonl */
 static VALUE
-curses_nonl(obj)
-    VALUE obj;
+curses_nonl(VALUE obj)
 {
     curses_stdscr();
     nonl();
@@ -301,8 +289,7 @@ curses_nonl(obj)
 
 /* def beep */
 static VALUE
-curses_beep(obj)
-    VALUE obj;
+curses_beep(VALUE obj)
 {
 #ifdef HAVE_BEEP
     curses_stdscr();
@@ -313,8 +300,7 @@ curses_beep(obj)
 
 /* def flash */
 static VALUE
-curses_flash(obj)
-    VALUE obj;
+curses_flash(VALUE obj)
 {
 #ifdef HAVE_FLASH
     curses_stdscr();
@@ -323,27 +309,44 @@ curses_flash(obj)
     return Qnil;
 }
 
+static int
+curses_char(VALUE c)
+{
+    if (FIXNUM_P(c)) {
+	return NUM2INT(c);
+    }
+    else {
+	int cc;
+
+	StringValue(c);
+	if (RSTRING_LEN(c) == 0 || RSTRING_LEN(c) > 1) {
+	    rb_raise(rb_eArgError, "string not corresponding a character");
+	}
+	cc = RSTRING_PTR(c)[0];
+	if (cc > 0x7f) {
+	    rb_raise(rb_eArgError, "no multibyte string supported (yet)");
+	}
+	return cc;
+    }
+}
+
+#ifdef HAVE_UNGETCH
 /* def ungetch */
 static VALUE
-curses_ungetch(obj, ch)
-    VALUE obj;
-    VALUE ch;
+curses_ungetch(VALUE obj, VALUE ch)
 {
-#ifdef HAVE_UNGETCH
+    int c = curses_char(ch);
     curses_stdscr();
-    ungetch(NUM2INT(ch));
-#else
-    rb_notimplement();
-#endif
+    ungetch(c);
     return Qnil;
 }
+#else
+#define curses_ungetch rb_f_notimplement
+#endif
 
 /* def setpos(y, x) */
 static VALUE
-curses_setpos(obj, y, x)
-    VALUE obj;
-    VALUE y;
-    VALUE x;
+curses_setpos(VALUE obj, VALUE y, VALUE x)
 {
     curses_stdscr();
     move(NUM2INT(y), NUM2INT(x));
@@ -352,26 +355,25 @@ curses_setpos(obj, y, x)
 
 /* def standout */
 static VALUE
-curses_standout(obj)
-    VALUE obj;
+curses_standout(VALUE obj)
 {
+    curses_stdscr();
     standout();
     return Qnil;
 }
 
 /* def standend */
 static VALUE
-curses_standend(obj)
-    VALUE obj;
+curses_standend(VALUE obj)
 {
+    curses_stdscr();
     standend();
     return Qnil;
 }
 
 /* def inch */
 static VALUE
-curses_inch(obj)
-    VALUE obj;
+curses_inch(VALUE obj)
 {
     curses_stdscr();
     return CH2FIX(inch());
@@ -379,9 +381,7 @@ curses_inch(obj)
 
 /* def addch(ch) */
 static VALUE
-curses_addch(obj, ch)
-    VALUE obj;
-    VALUE ch;
+curses_addch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
     addch(NUM2CH(ch));
@@ -390,9 +390,7 @@ curses_addch(obj, ch)
 
 /* def insch(ch) */
 static VALUE
-curses_insch(obj, ch)
-    VALUE obj;
-    VALUE ch;
+curses_insch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
     insch(NUM2CH(ch));
@@ -401,57 +399,82 @@ curses_insch(obj, ch)
 
 /* def addstr(str) */
 static VALUE
-curses_addstr(obj, str)
-    VALUE obj;
-    VALUE str;
+curses_addstr(VALUE obj, VALUE str)
 {
+    StringValue(str);
+    str = rb_str_export_locale(str);
     curses_stdscr();
     if (!NIL_P(str)) {
-	addstr(STR2CSTR(str));
+	addstr(StringValueCStr(str));
     }
     return Qnil;
 }
 
+static VALUE
+getch_func(void *arg)
+{
+    int *ip = (int *)arg;
+    *ip = getch();
+    return Qnil;
+}
+
 /* def getch */
 static VALUE
-curses_getch(obj)
-    VALUE obj;
+curses_getch(VALUE obj)
 {
-    rb_read_check(stdin);
+    int c;
+
     curses_stdscr();
-    return UINT2NUM(getch());
+    rb_thread_blocking_region(getch_func, (void *)&c, RUBY_UBF_IO, 0);
+    if (c == EOF) return Qnil;
+    if (rb_isprint(c)) {
+	char ch = (char)c;
+
+	return rb_locale_str_new(&ch, 1);
+    }
+    return UINT2NUM(c);
 }
 
-/* def getstr */
+/* This should be big enough.. I hope */
+#define GETSTR_BUF_SIZE 1024
+
 static VALUE
-curses_getstr(obj)
-    VALUE obj;
+getstr_func(void *arg)
 {
-    char rtn[1024]; /* This should be big enough.. I hope */
-
-    rb_read_check(stdin);
+    char *rtn = (char *)arg;
 #if defined(HAVE_GETNSTR)
-    getnstr(rtn,1023);
+    getnstr(rtn,GETSTR_BUF_SIZE-1);
 #else
     getstr(rtn);
 #endif
-    return rb_tainted_str_new2(rtn);
+    return Qnil;
+}
+
+/* def getstr */
+static VALUE
+curses_getstr(VALUE obj)
+{
+    char rtn[GETSTR_BUF_SIZE];
+
+    curses_stdscr();
+    rb_thread_blocking_region(getstr_func, (void *)rtn, RUBY_UBF_IO, 0);
+    return rb_locale_str_new_cstr(rtn);
 }
 
 /* def delch */
 static VALUE
-curses_delch(obj)
-    VALUE obj;
+curses_delch(VALUE obj)
 {
+    curses_stdscr();
     delch();
     return Qnil;
 }
 
 /* def delelteln */
 static VALUE
-curses_deleteln(obj)
-    VALUE obj;
+curses_deleteln(VALUE obj)
 {
+    curses_stdscr();
 #if defined(HAVE_DELETELN) || defined(deleteln)
     deleteln();
 #endif
@@ -460,9 +483,9 @@ curses_deleteln(obj)
 
 /* def insertln */
 static VALUE
-curses_insertln(obj)
-    VALUE obj;
+curses_insertln(VALUE obj)
 {
+    curses_stdscr();
 #if defined(HAVE_INSERTLN) || defined(insertln)
     insertln();
 #endif
@@ -471,116 +494,186 @@ curses_insertln(obj)
 
 /* def keyname */
 static VALUE
-curses_keyname(obj, c)
-    VALUE obj;
-    VALUE c;
+curses_keyname(VALUE obj, VALUE c)
 {
 #ifdef HAVE_KEYNAME
-  const char *name;
+    int cc = curses_char(c);
+    const char *name;
 
-  name = keyname(NUM2INT(c));
-  if (name) {
-    return rb_str_new2(name);
-  } else {
-    return Qnil;
-  }
+    curses_stdscr();
+    name = keyname(cc);
+    if (name) {
+	return rb_str_new_cstr(name);
+    }
+    else {
+	return Qnil;
+    }
 #else
-  return Qnil;
+    return Qnil;
 #endif
 }
 
 static VALUE
-curses_lines()
+curses_lines(void)
 {
     return INT2FIX(LINES);
 }
 
 static VALUE
-curses_cols()
+curses_cols(void)
 {
     return INT2FIX(COLS);
 }
 
+/**
+ * Sets Cursor Visibility.
+ * 0: invisible
+ * 1: visible
+ * 2: very visible
+ */
 static VALUE
 curses_curs_set(VALUE obj, VALUE visibility)
 {
 #ifdef HAVE_CURS_SET
-  int n;
-  return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
+    int n;
+    curses_stdscr();
+    return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
 #else
-  return Qnil;
+    return Qnil;
 #endif
 }
 
 static VALUE
 curses_scrl(VALUE obj, VALUE n)
 {
-  /* may have to raise exception on ERR */
+    /* may have to raise exception on ERR */
 #ifdef HAVE_SCRL
-  return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
+    curses_stdscr();
+    return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
 #else
-  return Qfalse;
+    return Qfalse;
 #endif
 }
 
 static VALUE
 curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 {
-  /* may have to raise exception on ERR */
+    /* may have to raise exception on ERR */
 #ifdef HAVE_SETSCRREG
-  return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
+    curses_stdscr();
+    return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
 #else
-  return Qfalse;
+    return Qfalse;
 #endif
 }
 
 static VALUE
 curses_attroff(VALUE obj, VALUE attrs)
 {
-  return window_attroff(rb_stdscr,attrs);  
-  /* return INT2FIX(attroff(NUM2INT(attrs))); */
+    curses_stdscr();
+    return window_attroff(rb_stdscr,attrs);
+    /* return INT2FIX(attroff(NUM2INT(attrs))); */
 }
 
 static VALUE
 curses_attron(VALUE obj, VALUE attrs)
 {
-  return window_attron(rb_stdscr,attrs);
-  /* return INT2FIX(attroff(NUM2INT(attrs))); */
+    curses_stdscr();
+    return window_attron(rb_stdscr,attrs);
+    /* return INT2FIX(attroff(NUM2INT(attrs))); */
 }
 
 static VALUE
 curses_attrset(VALUE obj, VALUE attrs)
 {
-  return window_attrset(rb_stdscr,attrs);
-  /* return INT2FIX(attroff(NUM2INT(attrs))); */
+    curses_stdscr();
+    return window_attrset(rb_stdscr,attrs);
+    /* return INT2FIX(attroff(NUM2INT(attrs))); */
 }
 
 static VALUE
 curses_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGDSET
-  bkgdset(NUM2CH(ch));
+    curses_stdscr();
+    bkgdset(NUM2CH(ch));
 #endif
-  return Qnil;
+    return Qnil;
 }
 
 static VALUE
 curses_bkgd(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGD
-  return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+    curses_stdscr();
+    return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+#else
+    return Qfalse;
+#endif
+}
+
+#if defined(HAVE_USE_DEFAULT_COLORS)
+static VALUE
+curses_use_default_colors(VALUE obj)
+{
+    curses_stdscr();
+    use_default_colors();
+    return Qnil;
+}
+#else
+#define curses_use_default_colors rb_f_notimplement
+#endif
+
+#if defined(HAVE_TABSIZE)
+static VALUE
+curses_tabsize_set(VALUE obj, VALUE val)
+{
+    TABSIZE = NUM2INT(val);
+    return INT2NUM(TABSIZE);
+}
+#else
+#define curses_tabsize_set rb_f_notimplement
+#endif
+
+#if defined(HAVE_TABSIZE)
+static VALUE
+curses_tabsize_get(VALUE ojb)
+{
+    return INT2NUM(TABSIZE);
+}
+#else
+#define curses_tabsize_get rb_f_notimplement
+#endif
+
+#if defined(HAVE_ESCDELAY)
+static VALUE
+curses_escdelay_set(VALUE obj, VALUE val)
+{
+    ESCDELAY = NUM2INT(val);
+    return INT2NUM(ESCDELAY);
+}
 #else
-  return Qfalse;
+#define curses_escdelay_set rb_f_notimplement
 #endif
+
+#if defined(HAVE_ESCDELAY)
+static VALUE
+curses_escdelay_get(VALUE obj)
+{
+    return INT2NUM(ESCDELAY);
 }
+#else
+#define curses_escdelay_get rb_f_notimplement
+#endif
 
 static VALUE
 curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
 {
 #if defined(HAVE_RESIZETERM)
-  return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
+    curses_stdscr();
+    return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
 #else
-  return Qnil;
+    return Qnil;
 #endif
 }
 
@@ -588,77 +681,106 @@ curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
 static VALUE
 curses_start_color(VALUE obj)
 {
-  /* may have to raise exception on ERR */
-  return (start_color() == OK) ? Qtrue : Qfalse;
+    /* may have to raise exception on ERR */
+    curses_stdscr();
+    return (start_color() == OK) ? Qtrue : Qfalse;
 }
 
 static VALUE
 curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
 {
-  /* may have to raise exception on ERR */
-  return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+    /* may have to raise exception on ERR */
+    curses_stdscr();
+    return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
 }
 
 static VALUE
 curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
 {
-  /* may have to raise exception on ERR */
-  return (init_color(NUM2INT(color),NUM2INT(r),
-		     NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+    /* may have to raise exception on ERR */
+    curses_stdscr();
+    return (init_color(NUM2INT(color),NUM2INT(r),
+		       NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
 }
 
 static VALUE
 curses_has_colors(VALUE obj)
 {
-  return has_colors() ? Qtrue : Qfalse;
+    curses_stdscr();
+    return has_colors() ? Qtrue : Qfalse;
 }
 
 static VALUE
 curses_can_change_color(VALUE obj)
 {
-  return can_change_color() ? Qtrue : Qfalse;
+    curses_stdscr();
+    return can_change_color() ? Qtrue : Qfalse;
+}
+
+#if defined(HAVE_COLORS)
+static VALUE
+curses_colors(VALUE obj)
+{
+    return INT2FIX(COLORS);
 }
+#else
+#define curses_colors rb_f_notimplement
+#endif
 
 static VALUE
 curses_color_content(VALUE obj, VALUE color)
 {
-  short r,g,b;
+    short r,g,b;
 
-  color_content(NUM2INT(color),&r,&g,&b);
-  return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
+    curses_stdscr();
+    color_content(NUM2INT(color),&r,&g,&b);
+    return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
 }
 
+
+#if defined(HAVE_COLOR_PAIRS)
+static VALUE
+curses_color_pairs(VALUE obj)
+{
+    return INT2FIX(COLOR_PAIRS);
+}
+#else
+#define curses_color_pairs rb_f_notimplement
+#endif
+
 static VALUE
 curses_pair_content(VALUE obj, VALUE pair)
 {
-  short f,b;
+    short f,b;
 
-  pair_content(NUM2INT(pair),&f,&b);
-  return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
+    curses_stdscr();
+    pair_content(NUM2INT(pair),&f,&b);
+    return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
 }
 
 static VALUE
 curses_color_pair(VALUE obj, VALUE attrs)
 {
-  return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
+    return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
 }
 
 static VALUE
 curses_pair_number(VALUE obj, VALUE attrs)
 {
-  return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
+    curses_stdscr();
+    return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
 }
 #endif /* USE_COLOR */
 
 #ifdef USE_MOUSE
 struct mousedata {
-  MEVENT *mevent;
+    MEVENT *mevent;
 };
 
 static void
-no_mevent()
+no_mevent(void)
 {
-  rb_raise(rb_eRuntimeError, "no such mouse event");
+    rb_raise(rb_eRuntimeError, "no such mouse event");
 }
 
 #define GetMOUSE(obj, data) do {\
@@ -671,49 +793,53 @@ no_mevent()
 static void
 curses_mousedata_free(struct mousedata *mdata)
 {
-  if (mdata->mevent)
-    free(mdata->mevent);
+    if (mdata->mevent)
+	xfree(mdata->mevent);
 }
 
 static VALUE
 curses_getmouse(VALUE obj)
 {
-  struct mousedata *mdata;
-  VALUE val;
+    struct mousedata *mdata;
+    VALUE val;
 
-  val = Data_Make_Struct(cMouseEvent,struct mousedata,
-			 0,curses_mousedata_free,mdata);
-  mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
-  return (getmouse(mdata->mevent) == OK) ? val : Qnil;
+    curses_stdscr();
+    val = Data_Make_Struct(cMouseEvent,struct mousedata,
+			   0,curses_mousedata_free,mdata);
+    mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
+    return (getmouse(mdata->mevent) == OK) ? val : Qnil;
 }
 
 static VALUE
 curses_ungetmouse(VALUE obj, VALUE mevent)
 {
-  struct mousedata *mdata;
+    struct mousedata *mdata;
 
-  GetMOUSE(mevent,mdata);
-  return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
+    curses_stdscr();
+    GetMOUSE(mevent,mdata);
+    return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
 }
 
 static VALUE
 curses_mouseinterval(VALUE obj, VALUE interval)
 {
-  return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
+    curses_stdscr();
+    return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
 }
 
 static VALUE
 curses_mousemask(VALUE obj, VALUE mask)
 {
-  return INT2NUM(mousemask(NUM2UINT(mask),NULL));
+    curses_stdscr();
+    return INT2NUM(mousemask(NUM2UINT(mask),NULL));
 }
 
 #define DEFINE_MOUSE_GET_MEMBER(func_name,mem) \
 static VALUE func_name (VALUE mouse) \
 { \
-  struct mousedata *mdata; \
-  GetMOUSE(mouse, mdata); \
-  return (UINT2NUM(mdata->mevent -> mem)); \
+    struct mousedata *mdata; \
+    GetMOUSE(mouse, mdata); \
+    return (UINT2NUM(mdata->mevent -> mem)); \
 }
 
 DEFINE_MOUSE_GET_MEMBER(curs_mouse_id, id)
@@ -724,36 +850,39 @@ DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
 #undef define_curs_mouse_member
 #endif /* USE_MOUSE */
 
+#ifdef HAVE_TIMEOUT
 static VALUE
 curses_timeout(VALUE obj, VALUE delay)
 {
-#ifdef HAVE_TIMEOUT
-  timeout(NUM2INT(delay));
-  return Qnil;
+    curses_stdscr();
+    timeout(NUM2INT(delay));
+    return Qnil;
+}
 #else
-    rb_notimplement();
+#define curses_timeout rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_DEF_PROG_MODE
 static VALUE
 curses_def_prog_mode(VALUE obj)
 {
-#ifdef HAVE_DEF_PROG_MODE
-  return def_prog_mode() == OK ? Qtrue : Qfalse;
+    curses_stdscr();
+    return def_prog_mode() == OK ? Qtrue : Qfalse;
+}
 #else
-    rb_notimplement();
+#define curses_def_prog_mode rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_RESET_PROG_MODE
 static VALUE
 curses_reset_prog_mode(VALUE obj)
 {
-#ifdef HAVE_RESET_PROG_MODE
-  return reset_prog_mode() == OK ? Qtrue : Qfalse;
+    curses_stdscr();
+    return reset_prog_mode() == OK ? Qtrue : Qfalse;
+}
 #else
-    rb_notimplement();
+#define curses_reset_prog_mode rb_f_notimplement
 #endif
-}
 
 /*-------------------------- class Window --------------------------*/
 
@@ -768,12 +897,7 @@ window_s_allocate(VALUE class)
 
 /* def initialize(h, w, top, left) */
 static VALUE
-window_initialize(obj, h, w, top, left)
-    VALUE obj;
-    VALUE h;
-    VALUE w;
-    VALUE top;
-    VALUE left;
+window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
 {
     struct windata *winp;
     WINDOW *window;
@@ -791,12 +915,7 @@ window_initialize(obj, h, w, top, left)
 
 /* def subwin(height, width, top, left) */
 static VALUE
-window_subwin(obj, height, width, top, left)
-    VALUE obj;
-    VALUE height;
-    VALUE width;
-    VALUE top;
-    VALUE left;
+window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
 {
     struct windata *winp;
     WINDOW *window;
@@ -816,11 +935,10 @@ window_subwin(obj, height, width, top, left)
 
 /* def close */
 static VALUE
-window_close(obj)
-    VALUE obj;
+window_close(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     delwin(winp->window);
     winp->window = 0;
@@ -830,47 +948,43 @@ window_close(obj)
 
 /* def clear */
 static VALUE
-window_clear(obj)
-    VALUE obj;
+window_clear(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wclear(winp->window);
-    
+
     return Qnil;
 }
 
 /* def clrtoeol */
 static VALUE
-window_clrtoeol(obj)
-    VALUE obj;
+window_clrtoeol(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wclrtoeol(winp->window);
-    
+
     return Qnil;
 }
 
 /* def refresh */
 static VALUE
-window_refresh(obj)
-    VALUE obj;
+window_refresh(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wrefresh(winp->window);
-    
+
     return Qnil;
 }
 
 /* def noutrefresh */
 static VALUE
-window_noutrefresh(obj)
-    VALUE obj;
+window_noutrefresh(VALUE obj)
 {
     struct windata *winp;
 
@@ -886,13 +1000,10 @@ window_noutrefresh(obj)
 
 /* def move(y, x) */
 static VALUE
-window_move(obj, y, x)
-    VALUE obj;
-    VALUE y;
-    VALUE x;
+window_move(VALUE obj, VALUE y, VALUE x)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     mvwin(winp->window, NUM2INT(y), NUM2INT(x));
 
@@ -901,13 +1012,10 @@ window_move(obj, y, x)
 
 /* def setpos(y, x) */
 static VALUE
-window_setpos(obj, y, x)
-    VALUE obj;
-    VALUE y;
-    VALUE x;
+window_setpos(VALUE obj, VALUE y, VALUE x)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wmove(winp->window, NUM2INT(y), NUM2INT(x));
     return Qnil;
@@ -915,8 +1023,7 @@ window_setpos(obj, y, x)
 
 /* def cury */
 static VALUE
-window_cury(obj)
-    VALUE obj;
+window_cury(VALUE obj)
 {
     struct windata *winp;
     int x, y;
@@ -928,8 +1035,7 @@ window_cury(obj)
 
 /* def curx */
 static VALUE
-window_curx(obj)
-    VALUE obj;
+window_curx(VALUE obj)
 {
     struct windata *winp;
     int x, y;
@@ -941,8 +1047,7 @@ window_curx(obj)
 
 /* def maxy */
 static VALUE
-window_maxy(obj)
-    VALUE obj;
+window_maxy(VALUE obj)
 {
     struct windata *winp;
 
@@ -962,8 +1067,7 @@ window_maxy(obj)
 
 /* def maxx */
 static VALUE
-window_maxx(obj)
-    VALUE obj;
+window_maxx(VALUE obj)
 {
     struct windata *winp;
 
@@ -983,8 +1087,7 @@ window_maxx(obj)
 
 /* def begy */
 static VALUE
-window_begy(obj)
-    VALUE obj;
+window_begy(VALUE obj)
 {
     struct windata *winp;
     int x, y;
@@ -1000,8 +1103,7 @@ window_begy(obj)
 
 /* def begx */
 static VALUE
-window_begx(obj)
-    VALUE obj;
+window_begx(VALUE obj)
 {
     struct windata *winp;
     int x, y;
@@ -1017,11 +1119,9 @@ window_begx(obj)
 
 /* def box(vert, hor) */
 static VALUE
-window_box(argc, argv, self)
-    int argc;
-    VALUE argv[], self;
+window_box(int argc, VALUE *argv, VALUE self)
 {
-    struct windata *winp; 
+    struct windata *winp;
     VALUE vert, hor, corn;
 
     rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
@@ -1030,34 +1130,33 @@ window_box(argc, argv, self)
     box(winp->window, NUM2CH(vert), NUM2CH(hor));
 
     if (!NIL_P(corn)) {
-      int cur_x, cur_y, x, y;
-      chtype c;
-
-      c = NUM2CH(corn);
-      getyx(winp->window, cur_y, cur_x);
-      x = NUM2INT(window_maxx(self)) - 1;
-      y = NUM2INT(window_maxy(self)) - 1;
-      wmove(winp->window, 0, 0);
-      waddch(winp->window, c);
-      wmove(winp->window, y, 0);
-      waddch(winp->window, c);
-      wmove(winp->window, y, x);
-      waddch(winp->window, c);
-      wmove(winp->window, 0, x);
-      waddch(winp->window, c);
-      wmove(winp->window, cur_y, cur_x);
+	int cur_x, cur_y, x, y;
+	chtype c;
+
+	c = NUM2CH(corn);
+	getyx(winp->window, cur_y, cur_x);
+	x = NUM2INT(window_maxx(self)) - 1;
+	y = NUM2INT(window_maxy(self)) - 1;
+	wmove(winp->window, 0, 0);
+	waddch(winp->window, c);
+	wmove(winp->window, y, 0);
+	waddch(winp->window, c);
+	wmove(winp->window, y, x);
+	waddch(winp->window, c);
+	wmove(winp->window, 0, x);
+	waddch(winp->window, c);
+	wmove(winp->window, cur_y, cur_x);
     }
-    
+
     return Qnil;
 }
 
 /* def standout */
 static VALUE
-window_standout(obj)
-    VALUE obj;
+window_standout(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wstandout(winp->window);
     return Qnil;
@@ -1065,11 +1164,10 @@ window_standout(obj)
 
 /* def standend */
 static VALUE
-window_standend(obj)
-    VALUE obj;
+window_standend(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wstandend(winp->window);
     return Qnil;
@@ -1077,105 +1175,131 @@ window_standend(obj)
 
 /* def inch */
 static VALUE
-window_inch(obj)
-    VALUE obj;
+window_inch(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     return CH2FIX(winch(winp->window));
 }
 
 /* def addch(ch) */
 static VALUE
-window_addch(obj, ch)
-    VALUE obj;
-    VALUE ch;
+window_addch(VALUE obj, VALUE ch)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     waddch(winp->window, NUM2CH(ch));
-    
+
     return Qnil;
 }
 
 /* def insch(ch) */
 static VALUE
-window_insch(obj, ch)
-    VALUE obj;
-    VALUE ch;
+window_insch(VALUE obj, VALUE ch)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     winsch(winp->window, NUM2CH(ch));
-    
+
     return Qnil;
 }
 
 /* def addstr(str) */
 static VALUE
-window_addstr(obj, str)
-    VALUE obj;
-    VALUE str;
+window_addstr(VALUE obj, VALUE str)
 {
     if (!NIL_P(str)) {
 	struct windata *winp;
 
+	StringValue(str);
+	str = rb_str_export_locale(str);
 	GetWINDOW(obj, winp);
-	waddstr(winp->window, STR2CSTR(str));
+	waddstr(winp->window, StringValueCStr(str));
     }
     return Qnil;
 }
 
 /* def <<(str) */
 static VALUE
-window_addstr2(obj, str)
-    VALUE obj;
-    VALUE str;
+window_addstr2(VALUE obj, VALUE str)
 {
     window_addstr(obj, str);
     return obj;
 }
 
+struct wgetch_arg {
+    WINDOW *win;
+    int c;
+};
+
+static VALUE
+wgetch_func(void *_arg)
+{
+    struct wgetch_arg *arg = (struct wgetch_arg *)_arg;
+    arg->c = wgetch(arg->win);
+    return Qnil;
+}
+
 /* def getch */
 static VALUE
-window_getch(obj)
-    VALUE obj;
+window_getch(VALUE obj)
 {
     struct windata *winp;
-    
-    rb_read_check(stdin);
+    struct wgetch_arg arg;
+    int c;
+
     GetWINDOW(obj, winp);
-    return UINT2NUM(wgetch(winp->window));
+    arg.win = winp->window;
+    rb_thread_blocking_region(wgetch_func, (void *)&arg, RUBY_UBF_IO, 0);
+    c = arg.c;
+    if (c == EOF) return Qnil;
+    if (rb_isprint(c)) {
+	char ch = (char)c;
+
+	return rb_locale_str_new(&ch, 1);
+    }
+    return UINT2NUM(c);
 }
 
-/* def getstr */
+struct wgetstr_arg {
+    WINDOW *win;
+    char rtn[GETSTR_BUF_SIZE];
+};
+
 static VALUE
-window_getstr(obj)
-    VALUE obj;
+wgetstr_func(void *_arg)
 {
-    struct windata *winp;
-    char rtn[1024]; /* This should be big enough.. I hope */
-    
-    GetWINDOW(obj, winp);
-    rb_read_check(stdin);
+    struct wgetstr_arg *arg = (struct wgetstr_arg *)_arg;
 #if defined(HAVE_WGETNSTR)
-    wgetnstr(winp->window, rtn, 1023);
+    wgetnstr(arg->win, arg->rtn, GETSTR_BUF_SIZE-1);
 #else
-    wgetstr(winp->window, rtn);
+    wgetstr(arg->win, arg->rtn);
 #endif
-    return rb_tainted_str_new2(rtn);
+    return Qnil;
+}
+
+/* def getstr */
+static VALUE
+window_getstr(VALUE obj)
+{
+    struct windata *winp;
+    struct wgetstr_arg arg;
+
+    GetWINDOW(obj, winp);
+    arg.win = winp->window;
+    rb_thread_blocking_region(wgetstr_func, (void *)&arg, RUBY_UBF_IO, 0);
+    return rb_locale_str_new_cstr(arg.rtn);
 }
 
 /* def delch */
 static VALUE
-window_delch(obj)
-    VALUE obj;
+window_delch(VALUE obj)
 {
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wdelch(winp->window);
     return Qnil;
@@ -1183,12 +1307,11 @@ window_delch(obj)
 
 /* def delelteln */
 static VALUE
-window_deleteln(obj)
-    VALUE obj;
+window_deleteln(VALUE obj)
 {
 #if defined(HAVE_WDELETELN) || defined(wdeleteln)
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     wdeleteln(winp->window);
 #endif
@@ -1197,12 +1320,11 @@ window_deleteln(obj)
 
 /* def insertln */
 static VALUE
-window_insertln(obj)
-    VALUE obj;
+window_insertln(VALUE obj)
 {
 #if defined(HAVE_WINSERTLN) || defined(winsertln)
     struct windata *winp;
-    
+
     GetWINDOW(obj, winp);
     winsertln(winp->window);
 #endif
@@ -1212,73 +1334,73 @@ window_insertln(obj)
 static VALUE
 window_scrollok(VALUE obj, VALUE bf)
 {
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj, winp);
-  scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
-  return Qnil;
+    GetWINDOW(obj, winp);
+    scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
+    return Qnil;
 }
 
 static VALUE
 window_idlok(VALUE obj, VALUE bf)
 {
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj, winp);
-  idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
-  return Qnil;
+    GetWINDOW(obj, winp);
+    idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
+    return Qnil;
 }
 
 static VALUE
 window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 {
 #ifdef HAVE_WSETSCRREG
-  struct windata *winp;
-  int res;
+    struct windata *winp;
+    int res;
 
-  GetWINDOW(obj, winp);
-  res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
-  /* may have to raise exception on ERR */
-  return (res == OK) ? Qtrue : Qfalse;
+    GetWINDOW(obj, winp);
+    res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
+    /* may have to raise exception on ERR */
+    return (res == OK) ? Qtrue : Qfalse;
 #else
-  return Qfalse;
+    return Qfalse;
 #endif
 }
 
 #if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
 static VALUE
-window_color_set(VALUE obj, VALUE col) 
+window_color_set(VALUE obj, VALUE col)
 {
-  struct windata *winp;
-  int res;
+    struct windata *winp;
+    int res;
 
-  GetWINDOW(obj, winp);
-  res = wcolor_set(winp->window, NUM2INT(col), NULL);
-  return (res == OK) ? Qtrue : Qfalse;
+    GetWINDOW(obj, winp);
+    res = wcolor_set(winp->window, NUM2INT(col), NULL);
+    return (res == OK) ? Qtrue : Qfalse;
 }
-#endif /* USE_COLOR */
+#endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */
 
 static VALUE
 window_scroll(VALUE obj)
 {
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj, winp);
-  /* may have to raise exception on ERR */
-  return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
+    GetWINDOW(obj, winp);
+    /* may have to raise exception on ERR */
+    return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
 }
 
 static VALUE
 window_scrl(VALUE obj, VALUE n)
 {
 #ifdef HAVE_WSCRL
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj, winp);
-  /* may have to raise exception on ERR */
-  return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
+    GetWINDOW(obj, winp);
+    /* may have to raise exception on ERR */
+    return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
 #else
-  return Qfalse;
+    return Qfalse;
 #endif
 }
 
@@ -1286,12 +1408,12 @@ static VALUE
 window_attroff(VALUE obj, VALUE attrs)
 {
 #ifdef HAVE_WATTROFF
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj,winp);
-  return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
+    GetWINDOW(obj,winp);
+    return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
 #else
-  return Qtrue;
+    return Qtrue;
 #endif
 }
 
@@ -1299,21 +1421,21 @@ static VALUE
 window_attron(VALUE obj, VALUE attrs)
 {
 #ifdef HAVE_WATTRON
-  struct windata *winp;
-  VALUE val;
-
-  GetWINDOW(obj,winp);
-  val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
-  if( rb_block_given_p() ){
-    rb_yield(val);
-    wattroff(winp->window,NUM2INT(attrs));
-    return val;
-  }
-  else{
-    return val;
-  }
+    struct windata *winp;
+    VALUE val;
+
+    GetWINDOW(obj,winp);
+    val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
+    if (rb_block_given_p()) {
+	rb_yield(val);
+	wattroff(winp->window,NUM2INT(attrs));
+	return val;
+    }
+    else{
+	return val;
+    }
 #else
-  return Qtrue;
+    return Qtrue;
 #endif
 }
 
@@ -1321,12 +1443,12 @@ static VALUE
 window_attrset(VALUE obj, VALUE attrs)
 {
 #ifdef HAVE_WATTRSET
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj,winp);
-  return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
+    GetWINDOW(obj,winp);
+    return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
 #else
-  return Qtrue;
+    return Qtrue;
 #endif
 }
 
@@ -1334,24 +1456,24 @@ static VALUE
 window_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_WBKGDSET
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj,winp);
-  wbkgdset(winp->window, NUM2CH(ch));
+    GetWINDOW(obj,winp);
+    wbkgdset(winp->window, NUM2CH(ch));
 #endif
-  return Qnil;
+    return Qnil;
 }
 
 static VALUE
 window_bkgd(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_WBKGD
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj,winp);
-  return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+    GetWINDOW(obj,winp);
+    return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
 #else
-  return Qfalse;
+    return Qfalse;
 #endif
 }
 
@@ -1359,13 +1481,13 @@ static VALUE
 window_getbkgd(VALUE obj)
 {
 #ifdef HAVE_WGETBKGD
-  chtype c;
-  struct windata *winp;
+    chtype c;
+    struct windata *winp;
 
-  GetWINDOW(obj,winp);
-  return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
+    GetWINDOW(obj,winp);
+    return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
 #else
-  return Qnil;
+    return Qnil;
 #endif
 }
 
@@ -1373,73 +1495,73 @@ static VALUE
 window_resize(VALUE obj, VALUE lin, VALUE col)
 {
 #if defined(HAVE_WRESIZE)
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj,winp);
-  return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
+    GetWINDOW(obj,winp);
+    return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
 #else
-  return Qnil;
+    return Qnil;
 #endif
 }
 
 
+#ifdef HAVE_KEYPAD
 static VALUE
 window_keypad(VALUE obj, VALUE val)
 {
-#ifdef HAVE_KEYPAD
-  struct windata *winp;
+    struct windata *winp;
 
-  GetWINDOW(obj,winp);
-  /* keypad() of NetBSD's libcurses returns no value */
+    GetWINDOW(obj,winp);
+    /* keypad() of NetBSD's libcurses returns no value */
 #if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-  keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
-  return Qnil;
+    keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
+    return Qnil;
 #else
-  /* may have to raise exception on ERR */
-  return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
-    Qtrue : Qfalse;
+    /* may have to raise exception on ERR */
+    return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
+	Qtrue : Qfalse;
 #endif
-#else
-    rb_notimplement();
-#endif /* HAVE_KEYPAD */
 }
+#else
+#define window_keypad rb_f_notimplement
+#endif
 
+#ifdef HAVE_NODELAY
 static VALUE
 window_nodelay(VALUE obj, VALUE val)
 {
-#ifdef HAVE_NODELAY
-  struct windata *winp;
-  GetWINDOW(obj,winp);
+    struct windata *winp;
+    GetWINDOW(obj,winp);
 
-  /* nodelay() of NetBSD's libcurses returns no value */
+    /* nodelay() of NetBSD's libcurses returns no value */
 #if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-  nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
-  return Qnil;
+    nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
+    return Qnil;
 #else
-  return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
+    return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
 #endif
+}
 #else
-    rb_notimplement();
+#define window_nodelay rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_WTIMEOUT
 static VALUE
 window_timeout(VALUE obj, VALUE delay)
 {
-#ifdef HAVE_WTIMEOUT
-  struct windata *winp;
-  GetWINDOW(obj,winp);
+    struct windata *winp;
+    GetWINDOW(obj,winp);
 
-  wtimeout(winp->window,NUM2INT(delay));
-  return Qnil;
+    wtimeout(winp->window,NUM2INT(delay));
+    return Qnil;
+}
 #else
-    rb_notimplement();
+#define window_timeout rb_f_notimplement
 #endif
-}
 
 /*------------------------- Initialization -------------------------*/
 void
-Init_curses()
+Init_curses(void)
 {
     mCurses    = rb_define_module("Curses");
     mKey       = rb_define_module_under(mCurses, "Key");
@@ -1456,6 +1578,12 @@ Init_curses()
     rb_define_method(cMouseEvent, "bstate", curs_mouse_bstate, 0);
 #endif /* USE_MOUSE */
 
+    rb_define_module_function(mCurses, "ESCDELAY=", curses_escdelay_set, 1);
+    rb_define_module_function(mCurses, "ESCDELAY", curses_escdelay_get, 0);
+    rb_define_module_function(mCurses, "TABSIZE", curses_tabsize_get, 0);
+    rb_define_module_function(mCurses, "TABSIZE=", curses_tabsize_set, 1);
+
+    rb_define_module_function(mCurses, "use_default_colors", curses_use_default_colors, 0);
     rb_define_module_function(mCurses, "init_screen", curses_init_screen, 0);
     rb_define_module_function(mCurses, "close_screen", curses_close_screen, 0);
     rb_define_module_function(mCurses, "closed?", curses_closed, 0);
@@ -1470,8 +1598,8 @@ Init_curses()
     rb_define_module_function(mCurses, "noraw", curses_noraw, 0);
     rb_define_module_function(mCurses, "cbreak", curses_cbreak, 0);
     rb_define_module_function(mCurses, "nocbreak", curses_nocbreak, 0);
-    rb_define_alias(mCurses, "crmode", "cbreak");
-    rb_define_alias(mCurses, "nocrmode", "nocbreak");
+    rb_define_module_function(mCurses, "crmode", curses_nocbreak, 0);
+    rb_define_module_function(mCurses, "nocrmode", curses_nocbreak, 0);
     rb_define_module_function(mCurses, "nl", curses_nl, 0);
     rb_define_module_function(mCurses, "nonl", curses_nonl, 0);
     rb_define_module_function(mCurses, "beep", curses_beep, 0);
@@ -1509,7 +1637,9 @@ Init_curses()
     rb_define_module_function(mCurses, "has_colors?", curses_has_colors, 0);
     rb_define_module_function(mCurses, "can_change_color?",
 			      curses_can_change_color, 0);
+    rb_define_module_function(mCurses, "colors", curses_colors, 0);
     rb_define_module_function(mCurses, "color_content", curses_color_content, 1);
+    rb_define_module_function(mCurses, "color_pairs", curses_color_pairs, 0);
     rb_define_module_function(mCurses, "pair_content", curses_pair_content, 1);
     rb_define_module_function(mCurses, "color_pair", curses_color_pair, 1);
     rb_define_module_function(mCurses, "pair_number", curses_pair_number, 1);
@@ -1745,14 +1875,14 @@ Init_curses()
 #ifdef KEY_F
     /* KEY_F(n) : 0 <= n <= 63 */
     {
-      int i;
-      char c[8];
-      for( i=0; i<64; i++ ){
-	sprintf(c, "KEY_F%d", i);
-	rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
-	sprintf(c, "F%d", i);
-	rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
-      }
+	int i;
+	char c[8];
+	for (i=0; i<64; i++) {
+	    sprintf(c, "KEY_F%d", i);
+	    rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
+	    sprintf(c, "F%d", i);
+	    rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
+	}
     }
 #endif
 #ifdef KEY_DL
@@ -2088,12 +2218,12 @@ Init_curses()
     rb_define_const(mKey, "MAX", INT2NUM(KEY_MAX));
 #endif
     {
-      int c;
-      char name[] = "KEY_CTRL_x";
-      for( c = 'A'; c <= 'Z'; c++ ){
-	sprintf(name, "KEY_CTRL_%c", c);
-	rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
-      }
+	int c;
+	char name[] = "KEY_CTRL_x";
+	for (c = 'A'; c <= 'Z'; c++) {
+	    name[sizeof(name) - 2] = c;
+	    rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
+	}
     }
 #undef rb_curses_define_const
 
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 0124bbbf4a..4172c8a6b6 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -5,9 +5,11 @@ dir_config('ncurses')
 dir_config('termcap')
 
 make=false
+headers = []
+
 have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
 have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
-if have_header(*curses=%w"ncurses.h") and have_library("ncurses", "initscr")
+if have_header(*curses=%w"ncurses.h") and (have_library("ncursesw", "initscr") or have_library("ncurses", "initscr"))
   make=true
 elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
   make=true
@@ -19,13 +21,16 @@ elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
 end
 
 if make
-  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set)
+  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set use_default_colors)
     have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
   end
   flag = "-D_XOPEN_SOURCE_EXTENDED"
-  src = "int test_var[(sizeof(char*)>sizeof(int))*2-1];"
-  if try_compile(cpp_include(%w[stdio.h stdlib.h]+curses)+src , flag)
+  if try_static_assert("sizeof(char*)>sizeof(int)", %w[stdio.h stdlib.h]+curses , flag)
     $defs << flag
   end
+  have_var("ESCDELAY", curses)
+  have_var("TABSIZE", curses)
+  have_var("COLORS", curses)
+  have_var("COLOR_PAIRS", curses)
   create_makefile("curses")
 end
diff --git a/ext/curses/view.rb b/ext/curses/view.rb
index d9a82a57db..e033fd8ae2 100644
--- a/ext/curses/view.rb
+++ b/ext/curses/view.rb
@@ -48,7 +48,7 @@ while TRUE
   explicit = FALSE
   n = 0
   while TRUE
-    c = getch.chr
+    c = getch
     if c =~ /[0-9]/
       n = 10 * n + c.to_i
     else
@@ -67,10 +67,10 @@ while TRUE
       else
 	break
       end
-      i += 1 
+      i += 1
     end
     #wscrl(i)
-      
+
   when "p"  #when KEY_UP
     i = 0
     while i < n
@@ -79,8 +79,8 @@ while TRUE
       else
 	break
       end
-      i += 1 
-    end    
+      i += 1
+    end
     #wscrl(-i)
 
   when "q"
diff --git a/ext/curses/view2.rb b/ext/curses/view2.rb
index 18d9619216..037771a226 100644
--- a/ext/curses/view2.rb
+++ b/ext/curses/view2.rb
@@ -2,114 +2,148 @@
 
 require "curses"
 
-if ARGV.size != 1 then
-  printf("usage: view file\n");
-  exit
-end
-begin
-  fp = open(ARGV[0], "r")
-rescue
-  raise "cannot open file: #{ARGV[1]}"
-end
 
-# signal(SIGINT, finish)
-
-Curses.init_screen
-Curses.nonl
-Curses.cbreak
-Curses.noecho
-
-$screen = Curses.stdscr
-
-$screen.scrollok(true)
-#$screen.keypad(true)
-
-# slurp the file
-$data_lines = []
-fp.each_line { |l|
-  $data_lines.push(l.chop)
-}
-fp.close
-
-$top = 0
-$data_lines[0..$screen.maxy-1].each_with_index{|line, idx|
-  $screen.setpos(idx, 0)
-  $screen.addstr(line)
-}
-$screen.setpos(0,0)
-$screen.refresh
-
-def scroll_up
-  if( $top > 0 )
-    $screen.scrl(-1)
-    $top -= 1
-    str = $data_lines[$top]
-    if( str )
-      $screen.setpos(0, 0)
-      $screen.addstr(str)
-    end
-    return true
-  else
-    return false
+# A curses based file viewer
+class FileViewer
+
+  # Create a new fileviewer, and view the file.
+  def initialize(filename)
+    @data_lines = []
+    @screen = nil
+    @top = nil
+    init_curses
+    load_file(filename)
+    interact
   end
-end
 
-def scroll_down
-  if( $top + $screen.maxy < $data_lines.length )
-    $screen.scrl(1)
-    $top += 1
-    str = $data_lines[$top + $screen.maxy - 1]
-    if( str )
-      $screen.setpos($screen.maxy - 1, 0)
-      $screen.addstr(str)
+  # Perform the curses setup
+  def init_curses
+    # signal(SIGINT, finish)
+
+    Curses.init_screen
+    Curses.nonl
+    Curses.cbreak
+    Curses.noecho
+
+    @screen = Curses.stdscr
+
+    @screen.scrollok(true)
+    #$screen.keypad(true)
+  end
+
+  # Load the file into memory, and put
+  # the first part on the curses display.
+  def load_file(filename)
+    fp = open(filename, "r") do |fp|
+    # slurp the file
+    fp.each_line { |l|
+      @data_lines.push(l.chop)
+    }
     end
-    return true
-  else
-    return false
+    @top = 0
+    @data_lines[0..@screen.maxy-1].each_with_index{|line, idx|
+      @screen.setpos(idx, 0)
+      @screen.addstr(line)
+    }
+    @screen.setpos(0,0)
+    @screen.refresh
+  rescue
+    raise "cannot open file '#{filename}' for reading"
   end
-end
 
-while true
-  result = true
-  c = Curses.getch
-  case c
-  when Curses::KEY_DOWN, Curses::KEY_CTRL_N
-    result = scroll_down
-  when Curses::KEY_UP, Curses::KEY_CTRL_P
-    result = scroll_up
-  when Curses::KEY_NPAGE, ?\s  # white space
-    for i in 0..($screen.maxy - 2)
-      if( ! scroll_down )
-	if( i == 0 )
-	  result = false
-	end
-	break
+
+  # Scroll the display up by one line
+  def scroll_up
+    if( @top > 0 )
+      @screen.scrl(-1)
+      @top -= 1
+      str = @data_lines[@top]
+      if( str )
+        @screen.setpos(0, 0)
+        @screen.addstr(str)
       end
+      return true
+    else
+      return false
     end
-  when Curses::KEY_PPAGE
-    for i in 0..($screen.maxy - 2)
-      if( ! scroll_up )
-	if( i == 0 )
-	  result = false
-	end
-	break
+  end
+
+  # Scroll the display down by one line
+  def scroll_down
+    if( @top + @screen.maxy < @data_lines.length )
+      @screen.scrl(1)
+      @top += 1
+      str = @data_lines[@top + @screen.maxy - 1]
+      if( str )
+        @screen.setpos(@screen.maxy - 1, 0)
+        @screen.addstr(str)
       end
+      return true
+    else
+      return false
     end
-  when Curses::KEY_LEFT, Curses::KEY_CTRL_T
-    while( scroll_up )
-    end
-  when Curses::KEY_RIGHT, Curses::KEY_CTRL_B
-    while( scroll_down )
+  end
+
+  # Allow the user to interact with the display.
+  # This uses EMACS-like keybindings, and also
+  # vi-like keybindings as well, except that left
+  # and right move to the beginning and end of the
+  # file, respectively.
+  def interact
+    while true
+      result = true
+      c = Curses.getch
+      case c
+      when Curses::KEY_DOWN, Curses::KEY_CTRL_N, ?j
+        result = scroll_down
+      when Curses::KEY_UP, Curses::KEY_CTRL_P, ?k
+        result = scroll_up
+      when Curses::KEY_NPAGE, ?\s  # white space
+        for i in 0..(@screen.maxy - 2)
+          if( ! scroll_down )
+            if( i == 0 )
+              result = false
+            end
+            break
+          end
+        end
+      when Curses::KEY_PPAGE
+        for i in 0..(@screen.maxy - 2)
+          if( ! scroll_up )
+            if( i == 0 )
+              result = false
+            end
+            break
+          end
+        end
+      when Curses::KEY_LEFT, Curses::KEY_CTRL_T, ?h
+        while( scroll_up )
+        end
+      when Curses::KEY_RIGHT, Curses::KEY_CTRL_B, ?l
+        while( scroll_down )
+        end
+      when ?q
+        break
+      else
+        @screen.setpos(0,0)
+        @screen.addstr("[unknown key `#{Curses.keyname(c)}'=#{c}] ")
+      end
+      if( !result )
+        Curses.beep
+      end
+      @screen.setpos(0,0)
     end
-  when ?q
-    break
-  else
-    $screen.setpos(0,0)
-    $screen.addstr("[unknown key `#{Curses.keyname(c)}'=#{c}] ")
+    Curses.close_screen
   end
-  if( !result )
-    Curses.beep
+end
+
+
+# If we are being run as a main program...
+if __FILE__ == $0
+  if ARGV.size != 1 then
+    printf("usage: #{$0} file\n");
+    exit
   end
-  $screen.setpos(0,0)
+
+  viewer = FileViewer.new(ARGV[0])
 end
-Curses.close_screen
diff --git a/ext/dbm/.cvsignore b/ext/dbm/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/dbm/.cvsignore
+++ b/ext/dbm/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 69b7a6e7a7..893146d582 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -3,7 +3,6 @@
   dbm.c -
 
   $Author$
-  $Date$
   created at: Mon Jan 24 15:59:52 JST 1994
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -32,7 +31,7 @@ struct dbmdata {
 };
 
 static void
-closed_dbm()
+closed_dbm(void)
 {
     rb_raise(rb_eDBMError, "closed DBM file");
 }
@@ -49,18 +48,16 @@ closed_dbm()
 }
 
 static void
-free_dbm(dbmp)
-    struct dbmdata *dbmp;
+free_dbm(struct dbmdata *dbmp)
 {
     if (dbmp) {
 	if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
-	free(dbmp);
+	xfree(dbmp);
     }
 }
 
 static VALUE
-fdbm_close(obj)
-    VALUE obj;
+fdbm_close(VALUE obj)
 {
     struct dbmdata *dbmp;
 
@@ -72,8 +69,7 @@ fdbm_close(obj)
 }
 
 static VALUE
-fdbm_closed(obj)
-    VALUE obj;
+fdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
@@ -86,21 +82,17 @@ fdbm_closed(obj)
     return Qfalse;
 }
 
-static VALUE fdbm_alloc _((VALUE));
 static VALUE
-fdbm_alloc(klass)
-    VALUE klass;
+fdbm_alloc(VALUE klass)
 {
     return Data_Wrap_Struct(klass, 0, free_dbm, 0);
 }
 
 static VALUE
-fdbm_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE file, vmode, vflags;
+    volatile VALUE file;
+    VALUE vmode, vflags;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode, flags = 0;
@@ -118,28 +110,28 @@ fdbm_initialize(argc, argv, obj)
     if (!NIL_P(vflags))
         flags = NUM2INT(vflags);
 
-    SafeStringValue(file);
+    FilePathValue(file);
 
     if (flags & RUBY_DBM_RW_BIT) {
         flags &= ~RUBY_DBM_RW_BIT;
-        dbm = dbm_open(RSTRING(file)->ptr, flags, mode);
+        dbm = dbm_open(RSTRING_PTR(file), flags, mode);
     }
     else {
         dbm = 0;
         if (mode >= 0) {
-            dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
+            dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
         }
         if (!dbm) {
-            dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
+            dbm = dbm_open(RSTRING_PTR(file), O_RDWR, 0);
         }
         if (!dbm) {
-            dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
+            dbm = dbm_open(RSTRING_PTR(file), O_RDONLY, 0);
         }
     }
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
-	rb_sys_fail(RSTRING(file)->ptr);
+	rb_sys_fail(RSTRING_PTR(file));
     }
 
     dbmp = ALLOC(struct dbmdata);
@@ -151,10 +143,7 @@ fdbm_initialize(argc, argv, obj)
 }
 
 static VALUE
-fdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+fdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
     VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
 
@@ -170,16 +159,15 @@ fdbm_s_open(argc, argv, klass)
 }
 
 static VALUE
-fdbm_fetch(obj, keystr, ifnone)
-    VALUE obj, keystr, ifnone;
+fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
 {
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    ExportStringValue(keystr);
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
     value = dbm_fetch(dbm, key);
@@ -192,17 +180,13 @@ fdbm_fetch(obj, keystr, ifnone)
 }
 
 static VALUE
-fdbm_aref(obj, keystr)
-    VALUE obj, keystr;
+fdbm_aref(VALUE obj, VALUE keystr)
 {
     return fdbm_fetch(obj, keystr, Qnil);
 }
 
 static VALUE
-fdbm_fetch_m(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
 {
     VALUE keystr, valstr, ifnone;
 
@@ -215,22 +199,21 @@ fdbm_fetch_m(argc, argv, obj)
 }
 
 static VALUE
-fdbm_index(obj, valstr)
-    VALUE obj, valstr;
+fdbm_key(VALUE obj, VALUE valstr)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(valstr);
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
+    ExportStringValue(valstr);
+    val.dptr = RSTRING_PTR(valstr);
+    val.dsize = RSTRING_LEN(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	if (val.dsize == RSTRING(valstr)->len &&
-	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0) {
+	if (val.dsize == RSTRING_LEN(valstr) &&
+	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
 	    return rb_tainted_str_new(key.dptr, key.dsize);
 	}
     }
@@ -238,68 +221,38 @@ fdbm_index(obj, valstr)
 }
 
 static VALUE
-fdbm_indexes(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fdbm_index(VALUE hash, VALUE value)
 {
-    VALUE new;
-    int i;
-
-    new = rb_ary_new2(argc);
-    for (i=0; i<argc; i++) {
-	rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
-    }
-
-    return new;
+    rb_warn("DBM#index is deprecated; use DBM#key");
+    return fdbm_key(hash, value);
 }
 
 static VALUE
-fdbm_select(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fdbm_select(VALUE obj)
 {
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    if (rb_block_given_p()) {
-        datum key, val;
-        DBM *dbm;
-        struct dbmdata *dbmp;
+    VALUE new = rb_ary_new();
+    datum key, val;
+    DBM *dbm;
+    struct dbmdata *dbmp;
 
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-	}
-        GetDBM2(obj, dbmp, dbm);
-        for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-            VALUE assoc, v;
-            val = dbm_fetch(dbm, key);
-            assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-                                 rb_tainted_str_new(val.dptr, val.dsize));
-	    v = rb_yield(assoc);
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
+    GetDBM2(obj, dbmp, dbm);
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	VALUE assoc, v;
+	val = dbm_fetch(dbm, key);
+	assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+			     rb_tainted_str_new(val.dptr, val.dsize));
+	v = rb_yield(assoc);
+	if (RTEST(v)) {
+	    rb_ary_push(new, assoc);
 	}
-    }
-    else {
-	rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
-
-        for (i=0; i<argc; i++) {
-            rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
-        }
+	GetDBM2(obj, dbmp, dbm);
     }
 
     return new;
 }
 
 static VALUE
-fdbm_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fdbm_values_at(int argc, VALUE *argv, VALUE obj)
 {
     VALUE new = rb_ary_new2(argc);
     int i;
@@ -312,16 +265,14 @@ fdbm_values_at(argc, argv, obj)
 }
 
 static void
-fdbm_modify(obj)
-    VALUE obj;
+fdbm_modify(VALUE obj)
 {
     rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
 }
 
 static VALUE
-fdbm_delete(obj, keystr)
-    VALUE obj, keystr;
+fdbm_delete(VALUE obj, VALUE keystr)
 {
     datum key, value;
     struct dbmdata *dbmp;
@@ -329,11 +280,12 @@ fdbm_delete(obj, keystr)
     VALUE valstr;
 
     fdbm_modify(obj);
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    ExportStringValue(keystr);
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
+
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (rb_block_given_p()) return rb_yield(keystr);
@@ -354,8 +306,7 @@ fdbm_delete(obj, keystr)
 }
 
 static VALUE
-fdbm_shift(obj)
-    VALUE obj;
+fdbm_shift(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -366,7 +317,7 @@ fdbm_shift(obj)
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
 
-    key = dbm_firstkey(dbm); 
+    key = dbm_firstkey(dbm);
     if (!key.dptr) return Qnil;
     val = dbm_fetch(dbm, key);
     keystr = rb_tainted_str_new(key.dptr, key.dsize);
@@ -377,8 +328,7 @@ fdbm_shift(obj)
 }
 
 static VALUE
-fdbm_delete_if(obj)
-    VALUE obj;
+fdbm_delete_if(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -402,24 +352,23 @@ fdbm_delete_if(obj)
 	GetDBM2(obj, dbmp, dbm);
     }
 
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	keystr = RARRAY(ary)->ptr[i];
-	StringValue(keystr);
-	key.dptr = RSTRING(keystr)->ptr;
-	key.dsize = RSTRING(keystr)->len;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	keystr = RARRAY_PTR(ary)[i];
+	ExportStringValue(keystr);
+	key.dptr = RSTRING_PTR(keystr);
+	key.dsize = RSTRING_LEN(keystr);
 	if (dbm_delete(dbm, key)) {
 	    rb_raise(rb_eDBMError, "dbm_delete failed");
 	}
     }
     if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
+    if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
 
     return obj;
 }
 
 static VALUE
-fdbm_clear(obj)
-    VALUE obj;
+fdbm_clear(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -439,8 +388,7 @@ fdbm_clear(obj)
 }
 
 static VALUE
-fdbm_invert(obj)
-    VALUE obj;
+fdbm_invert(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -458,49 +406,36 @@ fdbm_invert(obj)
     return hash;
 }
 
-static VALUE each_pair _((VALUE));
+static VALUE fdbm_store(VALUE,VALUE,VALUE);
 
 static VALUE
-each_pair(obj)
-    VALUE obj;
-{
-    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
-}
-
-static VALUE fdbm_store _((VALUE,VALUE,VALUE));
-
-static VALUE
-update_i(pair, dbm)
-    VALUE pair, dbm;
+update_i(VALUE pair, VALUE dbm)
 {
     Check_Type(pair, T_ARRAY);
-    if (RARRAY(pair)->len < 2) {
+    if (RARRAY_LEN(pair) < 2) {
 	rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    fdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
+    fdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
     return Qnil;
 }
 
 static VALUE
-fdbm_update(obj, other)
-    VALUE obj, other;
+fdbm_update(VALUE obj, VALUE other)
 {
-    rb_iterate(each_pair, other, update_i, obj);
+    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
     return obj;
 }
 
 static VALUE
-fdbm_replace(obj, other)
-    VALUE obj, other;
+fdbm_replace(VALUE obj, VALUE other)
 {
     fdbm_clear(obj);
-    rb_iterate(each_pair, other, update_i, obj);
+    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
     return obj;
 }
 
 static VALUE
-fdbm_store(obj, keystr, valstr)
-    VALUE obj, keystr, valstr;
+fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -510,11 +445,11 @@ fdbm_store(obj, keystr, valstr)
     keystr = rb_obj_as_string(keystr);
     valstr = rb_obj_as_string(valstr);
 
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
+    val.dptr = RSTRING_PTR(valstr);
+    val.dsize = RSTRING_LEN(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
@@ -530,8 +465,7 @@ fdbm_store(obj, keystr, valstr)
 }
 
 static VALUE
-fdbm_length(obj)
-    VALUE obj;
+fdbm_length(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -550,8 +484,7 @@ fdbm_length(obj)
 }
 
 static VALUE
-fdbm_empty_p(obj)
-    VALUE obj;
+fdbm_empty_p(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -574,13 +507,14 @@ fdbm_empty_p(obj)
 }
 
 static VALUE
-fdbm_each_value(obj)
-    VALUE obj;
+fdbm_each_value(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
@@ -591,13 +525,14 @@ fdbm_each_value(obj)
 }
 
 static VALUE
-fdbm_each_key(obj)
-    VALUE obj;
+fdbm_each_key(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
     DBM *dbm;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
@@ -607,14 +542,15 @@ fdbm_each_key(obj)
 }
 
 static VALUE
-fdbm_each_pair(obj)
-    VALUE obj;
+fdbm_each_pair(VALUE obj)
 {
     datum key, val;
     DBM *dbm;
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
@@ -629,8 +565,7 @@ fdbm_each_pair(obj)
 }
 
 static VALUE
-fdbm_keys(obj)
-    VALUE obj;
+fdbm_keys(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -648,8 +583,7 @@ fdbm_keys(obj)
 }
 
 static VALUE
-fdbm_values(obj)
-    VALUE obj;
+fdbm_values(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -667,16 +601,15 @@ fdbm_values(obj)
 }
 
 static VALUE
-fdbm_has_key(obj, keystr)
-    VALUE obj, keystr;
+fdbm_has_key(VALUE obj, VALUE keystr)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    ExportStringValue(keystr);
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
     val = dbm_fetch(dbm, key);
@@ -685,30 +618,28 @@ fdbm_has_key(obj, keystr)
 }
 
 static VALUE
-fdbm_has_value(obj, valstr)
-    VALUE obj, valstr;
+fdbm_has_value(VALUE obj, VALUE valstr)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(valstr);
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
+    ExportStringValue(valstr);
+    val.dptr = RSTRING_PTR(valstr);
+    val.dsize = RSTRING_LEN(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	if (val.dsize == RSTRING(valstr)->len &&
-	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
+	if (val.dsize == RSTRING_LEN(valstr) &&
+	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
 	    return Qtrue;
     }
     return Qfalse;
 }
 
 static VALUE
-fdbm_to_a(obj)
-    VALUE obj;
+fdbm_to_a(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -727,8 +658,7 @@ fdbm_to_a(obj)
 }
 
 static VALUE
-fdbm_to_hash(obj)
-    VALUE obj;
+fdbm_to_hash(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -747,14 +677,13 @@ fdbm_to_hash(obj)
 }
 
 static VALUE
-fdbm_reject(obj)
-    VALUE obj;
+fdbm_reject(VALUE obj)
 {
     return rb_hash_delete_if(fdbm_to_hash(obj));
 }
 
 void
-Init_dbm()
+Init_dbm(void)
 {
     rb_cDBM = rb_define_class("DBM", rb_cObject);
     rb_eDBMError = rb_define_class("DBMError", rb_eStandardError);
@@ -771,9 +700,8 @@ Init_dbm()
     rb_define_method(rb_cDBM, "[]=", fdbm_store, 2);
     rb_define_method(rb_cDBM, "store", fdbm_store, 2);
     rb_define_method(rb_cDBM, "index",  fdbm_index, 1);
-    rb_define_method(rb_cDBM, "indexes",  fdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "indices",  fdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "select",  fdbm_select, -1);
+    rb_define_method(rb_cDBM, "key",  fdbm_key, 1);
+    rb_define_method(rb_cDBM, "select",  fdbm_select, 0);
     rb_define_method(rb_cDBM, "values_at", fdbm_values_at, -1);
     rb_define_method(rb_cDBM, "length", fdbm_length, 0);
     rb_define_method(rb_cDBM, "size", fdbm_length, 0);
@@ -812,5 +740,7 @@ Init_dbm()
 
 #ifdef DB_VERSION_STRING
     rb_define_const(rb_cDBM, "VERSION",  rb_str_new2(DB_VERSION_STRING));
+#else
+    rb_define_const(rb_cDBM, "VERSION",  rb_str_new2("unknown"));
 #endif
 }
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 0074ab605b..4d12264063 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -36,7 +36,7 @@ def headers.db_check(db)
   db_prefix ||= ""
 
   if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
-      hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", hdr, hsearch)}
+      hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)}
     have_func(db_prefix+"dbm_clearerr") unless have_gdbm
     $defs << hsearch if hsearch
     $defs << '-DDBM_HDR="<'+hdr+'>"'
diff --git a/ext/digest/.cvsignore b/ext/digest/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/digest/.cvsignore
+++ b/ext/digest/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/digest/bubblebabble/.cvsignore b/ext/digest/bubblebabble/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/digest/bubblebabble/.cvsignore
+++ b/ext/digest/bubblebabble/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c
index 3a03ceced0..e4e3173074 100644
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ b/ext/digest/bubblebabble/bubblebabble.c
@@ -12,7 +12,7 @@
 ************************************************/
 
 #include "ruby.h"
-#include "digest.h"
+#include "../digest.h"
 
 static ID id_digest;
 
@@ -23,7 +23,7 @@ bubblebabble_str_new(VALUE str_digest)
     size_t digest_len;
     VALUE str;
     char *p;
-    int i, j, seed = 1;
+    size_t i, j, seed = 1;
     static const char vowels[] = {
         'a', 'e', 'i', 'o', 'u', 'y'
     };
@@ -54,7 +54,7 @@ bubblebabble_str_new(VALUE str_digest)
             p[j++] = consonants[16];
             p[j++] = vowels[seed / 6];
             break;
-        } 
+        }
 
         byte1 = digest[i++];
         p[j++] = vowels[(((byte1 >> 6) & 3) + seed) % 6];
diff --git a/ext/digest/bubblebabble/extconf.rb b/ext/digest/bubblebabble/extconf.rb
index 53cb83934a..1214add293 100644
--- a/ext/digest/bubblebabble/extconf.rb
+++ b/ext/digest/bubblebabble/extconf.rb
@@ -1,6 +1,5 @@
 require 'mkmf'
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
 
 create_makefile('digest/bubblebabble')
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index b9a3470e65..77a134f364 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -16,18 +16,4 @@
 # define __END_DECLS
 #endif
 
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif !defined __CYGWIN__ || !defined __uint8_t_defined
-  typedef unsigned char uint8_t;
-  typedef unsigned int  uint32_t;
-# if SIZEOF_LONG == 8
-  typedef unsigned long uint64_t;
-# elif SIZEOF_LONG_LONG == 8
-  typedef unsigned LONG_LONG uint64_t;
-# else
-#  define NO_UINT64_T
-# endif
-#endif
-
 #endif /* DEFS_H */
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 0b910e8c47..29ac36fc99 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -36,7 +36,7 @@ hexencode_str_new(VALUE str_digest)
 {
     char *digest;
     size_t digest_len;
-    int i;
+    size_t i;
     VALUE str;
     char *p;
     static const char hex[] = {
@@ -76,6 +76,8 @@ rb_digest_s_hexencode(VALUE klass, VALUE str)
     return hexencode_str_new(str);
 }
 
+NORETURN(static void rb_digest_instance_method_unimpl(VALUE self, const char *method));
+
 /*
  * Document-module: Digest::Instance
  *
@@ -83,6 +85,13 @@ rb_digest_s_hexencode(VALUE klass, VALUE str)
  * object to calculate message digest values.
  */
 
+static void
+rb_digest_instance_method_unimpl(VALUE self, const char *method)
+{
+    rb_raise(rb_eRuntimeError, "%s does not implement %s()",
+	     rb_obj_classname(self), method);
+}
+
 /*
  * call-seq:
  *     digest_obj.update(string) -> digest_obj
@@ -97,7 +106,7 @@ rb_digest_s_hexencode(VALUE klass, VALUE str)
 static VALUE
 rb_digest_instance_update(VALUE self, VALUE str)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement update()", RSTRING_PTR(rb_inspect(self)));
+    rb_digest_instance_method_unimpl(self, "update");
 }
 
 /*
@@ -115,7 +124,7 @@ rb_digest_instance_update(VALUE self, VALUE str)
 static VALUE
 rb_digest_instance_finish(VALUE self)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement finish()", RSTRING_PTR(rb_inspect(self)));
+    rb_digest_instance_method_unimpl(self, "finish");
 }
 
 /*
@@ -129,7 +138,7 @@ rb_digest_instance_finish(VALUE self)
 static VALUE
 rb_digest_instance_reset(VALUE self)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement reset()", RSTRING_PTR(rb_inspect(self)));
+    rb_digest_instance_method_unimpl(self, "reset");
 }
 
 /*
@@ -170,10 +179,7 @@ rb_digest_instance_digest(int argc, VALUE *argv, VALUE self)
         value = rb_funcall(self, id_finish, 0);
         rb_funcall(self, id_reset, 0);
     } else {
-        VALUE clone = rb_obj_clone(self);
-
-        value = rb_funcall(clone, id_finish, 0);
-        rb_funcall(clone, id_reset, 0);
+        value = rb_funcall(rb_obj_clone(self), id_finish, 0);
     }
 
     return value;
@@ -218,10 +224,7 @@ rb_digest_instance_hexdigest(int argc, VALUE *argv, VALUE self)
         value = rb_funcall(self, id_finish, 0);
         rb_funcall(self, id_reset, 0);
     } else {
-        VALUE clone = rb_obj_clone(self);
-
-        value = rb_funcall(clone, id_finish, 0);
-        rb_funcall(clone, id_reset, 0);
+        value = rb_funcall(rb_obj_clone(self), id_finish, 0);
     }
 
     return hexencode_str_new(value);
@@ -231,8 +234,8 @@ rb_digest_instance_hexdigest(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *     digest_obj.hexdigest! -> string
  *
- * Returns the resulting hash value and resets the digest to the
- * initial state.
+ * Returns the resulting hash value in a hex-encoded form and resets
+ * the digest to the initial state.
  */
 static VALUE
 rb_digest_instance_hexdigest_bang(VALUE self)
@@ -266,7 +269,7 @@ rb_digest_instance_inspect(VALUE self)
 {
     VALUE str;
     size_t digest_len = 32;	/* about this size at least */
-    char *cname;
+    const char *cname;
 
     cname = rb_obj_classname(self);
 
@@ -358,7 +361,7 @@ rb_digest_instance_length(VALUE self)
 static VALUE
 rb_digest_instance_block_length(VALUE self)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement block_length()", RSTRING_PTR(rb_inspect(self)));
+    rb_digest_instance_method_unimpl(self, "block_length");
 }
 
 /*
@@ -426,7 +429,7 @@ get_digest_base_metadata(VALUE klass)
     VALUE obj;
     rb_digest_metadata_t *algo;
 
-    for (p = klass; p; p = RCLASS(p)->super) {
+    for (p = klass; p; p = RCLASS_SUPER(p)) {
         if (rb_ivar_defined(p, id_metadata)) {
             obj = rb_ivar_get(p, id_metadata);
             break;
@@ -469,7 +472,7 @@ rb_digest_base_alloc(VALUE klass)
     pctx = xmalloc(algo->ctx_size);
     algo->init_func(pctx);
 
-    obj = Data_Wrap_Struct(klass, 0, free, pctx);
+    obj = Data_Wrap_Struct(klass, 0, xfree, pctx);
 
     return obj;
 }
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
index cf9127ecc0..a20ca8d68f 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -4,7 +4,7 @@
 require "mkmf"
 
 $INSTALLFILES = {
-  "digest.h" => "$(RUBYARCHDIR)"
+  "digest.h" => "$(HDRDIR)"
 }
 
 create_makefile("digest")
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index 0c4ee3c2cc..857501722e 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -22,12 +22,19 @@ module Digest
 
   class ::Digest::Class
     # creates a digest object and reads a given file, _name_.
-    # 
+    #
     #  p Digest::SHA256.file("X11R6.8.2-src.tar.bz2").hexdigest
     #  # => "f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534"
     def self.file(name)
       new.file(name)
     end
+
+    # Returns the base64 encoded hash value of a given _string_.  The
+    # return value is properly padded with '=' and contains no line
+    # feeds.
+    def self.base64digest(str, *args)
+      [digest(str, *args)].pack('m0')
+    end
   end
 
   module Instance
@@ -42,6 +49,25 @@ module Digest
       }
       self
     end
+
+    # If none is given, returns the resulting hash value of the digest
+    # in a base64 encoded form, keeping the digest's state.
+    #
+    # If a _string_ is given, returns the hash value for the given
+    # _string_ in a base64 encoded form, resetting the digest to the
+    # initial state before and after the process.
+    #
+    # In either case, the return value is properly padded with '=' and
+    # contains no line feeds.
+    def base64digest(str = nil)
+      [str ? digest(str) : digest].pack('m0')
+    end
+
+    # Returns the resulting hash value and resets the digest to the
+    # initial state.
+    def base64digest!
+      [digest!].pack('m0')
+    end
   end
 end
 
diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb
new file mode 100644
index 0000000000..98f98a69cf
--- /dev/null
+++ b/ext/digest/lib/digest/hmac.rb
@@ -0,0 +1,281 @@
+# = digest/hmac.rb
+#
+# An implementation of HMAC keyed-hashing algorithm
+#
+# == Overview
+#
+# CAUTION: Use of this library is discouraged, because this
+# implementation was meant to be experimental but somehow got into the
+# 1.9 series without being noticed.  Please use OpenSSL::HMAC in the
+# "openssl" library instead.
+#
+# This library adds a method named hmac() to Digest classes, which
+# creates a Digest class for calculating HMAC digests.
+#
+# == Examples
+#
+#   require 'digest/hmac'
+#
+#   # one-liner example
+#   puts Digest::HMAC.hexdigest("data", "hash key", Digest::SHA1)
+#
+#   # rather longer one
+#   hmac = Digest::HMAC.new("foo", Digest::RMD160)
+#
+#   buf = ""
+#   while stream.read(16384, buf)
+#     hmac.update(buf)
+#   end
+#
+#   puts hmac.bubblebabble
+#
+# == License
+#
+# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
+#
+# Documentation by Akinori MUSHA
+#
+# All rights reserved.  You can redistribute and/or modify it under
+# the same terms as Ruby.
+#
+#   $Id$
+#
+
+warn "use of the experimetal library 'digest/hmac' is discouraged; require 'openssl' and use OpenSSL::HMAC instead." if $VERBOSE
+
+require 'digest'
+
+module Digest
+  class HMAC < Digest::Class
+    def initialize(key, digester)
+      @md = digester.new
+
+      block_len = @md.block_length
+
+      if key.bytesize > block_len
+        key = @md.digest(key)
+      end
+
+      ipad = Array.new(block_len, 0x36)
+      opad = Array.new(block_len, 0x5c)
+
+      key.bytes.each_with_index { |c, i|
+        ipad[i] ^= c
+        opad[i] ^= c
+      }
+
+      @key = key.freeze
+      @ipad = ipad.pack('C*').freeze
+      @opad = opad.pack('C*').freeze
+      @md.update(@ipad)
+    end
+
+    def initialize_copy(other)
+      @md = other.instance_eval { @md.clone }
+    end
+
+    def update(text)
+      @md.update(text)
+      self
+    end
+    alias << update
+
+    def reset
+      @md.reset
+      @md.update(@ipad)
+      self
+    end
+
+    def finish
+      d = @md.digest!
+      @md.update(@opad)
+      @md.update(d)
+      @md.digest!
+    end
+    private :finish
+
+    def digest_length
+      @md.digest_length
+    end
+
+    def block_length
+      @md.block_length
+    end
+
+    def inspect
+      sprintf('#<%s: key=%s, digest=%s>', self.class.name, @key.inspect, @md.inspect.sub(/^\#<(.*)>$/) { $1 });
+    end
+  end
+end
+
+if $0 == __FILE__
+  eval DATA.gets(nil), nil, $0, DATA.lineno
+end
+
+__END__
+
+require 'test/unit'
+
+module TM_HMAC
+  def test_s_hexdigest
+    cases.each { |h|
+      digesters.each { |d|
+        assert_equal(h[:hexdigest], Digest::HMAC.hexdigest(h[:data], h[:key], d))
+      }
+    }
+  end
+
+  def test_hexdigest
+    cases.each { |h|
+      digesters.each { |d|
+        hmac = Digest::HMAC.new(h[:key], d)
+
+        hmac.update(h[:data])
+
+        assert_equal(h[:hexdigest], hmac.hexdigest)
+      }
+    }
+  end
+
+  def test_reset
+    cases.each { |h|
+      digesters.each { |d|
+        hmac = Digest::HMAC.new(h[:key], d)
+        hmac.update("test")
+        hmac.reset
+        hmac.update(h[:data])
+
+        assert_equal(h[:hexdigest], hmac.hexdigest)
+      }
+    }
+  end
+end
+
+class TC_HMAC_MD5 < Test::Unit::TestCase
+  include TM_HMAC
+
+  def digesters
+    [Digest::MD5, Digest::MD5.new]
+  end
+
+  # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
+  def cases
+    [
+     {
+       :key		=> "\x0b" * 16,
+       :data		=> "Hi There",
+       :hexdigest	=> "9294727a3638bb1c13f48ef8158bfc9d",
+     }, {
+       :key		=> "Jefe",
+       :data		=> "what do ya want for nothing?",
+       :hexdigest	=> "750c783e6ab0b503eaa86e310a5db738",
+     }, {
+       :key		=> "\xaa" * 16,
+       :data		=> "\xdd" * 50,
+       :hexdigest	=> "56be34521d144c88dbb8c733f0e8b3f6",
+     }, {
+       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
+       :data		=> "\xcd" * 50,
+       :hexdigest	=> "697eaf0aca3a3aea3a75164746ffaa79",
+     }, {
+       :key		=> "\x0c" * 16,
+       :data		=> "Test With Truncation",
+       :hexdigest	=> "56461ef2342edc00f9bab995690efd4c",
+     }, {
+       :key		=> "\xaa" * 80,
+       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
+       :hexdigest	=> "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd",
+     }, {
+       :key		=> "\xaa" * 80,
+       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
+       :hexdigest	=> "6f630fad67cda0ee1fb1f562db3aa53e",
+     }
+    ]
+  end
+end
+
+class TC_HMAC_SHA1 < Test::Unit::TestCase
+  include TM_HMAC
+
+  def digesters
+    [Digest::SHA1, Digest::SHA1.new]
+  end
+
+  # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
+  def cases
+    [
+     {
+       :key		=> "\x0b" * 20,
+       :data		=> "Hi There",
+       :hexdigest	=> "b617318655057264e28bc0b6fb378c8ef146be00",
+     }, {
+       :key		=> "Jefe",
+       :data		=> "what do ya want for nothing?",
+       :hexdigest	=> "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
+     }, {
+       :key		=> "\xaa" * 20,
+       :data		=> "\xdd" * 50,
+       :hexdigest	=> "125d7342b9ac11cd91a39af48aa17b4f63f175d3",
+     }, {
+       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
+       :data		=> "\xcd" * 50,
+       :hexdigest	=> "4c9007f4026250c6bc8414f9bf50c86c2d7235da",
+     }, {
+       :key		=> "\x0c" * 20,
+       :data		=> "Test With Truncation",
+       :hexdigest	=> "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
+     }, {
+       :key		=> "\xaa" * 80,
+       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
+       :hexdigest	=> "aa4ae5e15272d00e95705637ce8a3b55ed402112",
+     }, {
+       :key		=> "\xaa" * 80,
+       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
+       :hexdigest	=> "e8e99d0f45237d786d6bbaa7965c7808bbff1a91",
+     }
+    ]
+  end
+end
+
+class TC_HMAC_RMD160 < Test::Unit::TestCase
+  include TM_HMAC
+
+  def digesters
+    [Digest::RMD160, Digest::RMD160.new]
+  end
+
+  # Taken from RFC 2286: Test Cases for HMAC-RIPEMD160 and HMAC-RIPEMD128
+  def cases
+    [
+     {
+       :key		=> "\x0b" * 20,
+       :data		=> "Hi There",
+       :hexdigest	=> "24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668",
+     }, {
+       :key		=> "Jefe",
+       :data		=> "what do ya want for nothing?",
+       :hexdigest	=> "dda6c0213a485a9e24f4742064a7f033b43c4069",
+     }, {
+       :key		=> "\xaa" * 20,
+       :data		=> "\xdd" * 50,
+       :hexdigest	=> "b0b105360de759960ab4f35298e116e295d8e7c1",
+     }, {
+       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
+       :data		=> "\xcd" * 50,
+       :hexdigest	=> "d5ca862f4d21d5e610e18b4cf1beb97a4365ecf4",
+     }, {
+       :key		=> "\x0c" * 20,
+       :data		=> "Test With Truncation",
+       :hexdigest	=> "7619693978f91d90539ae786500ff3d8e0518e39",
+     }, {
+       :key		=> "\xaa" * 80,
+       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
+       :hexdigest	=> "6466ca07ac5eac29e1bd523e5ada7605b791fd8b",
+     }, {
+       :key		=> "\xaa" * 80,
+       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
+       :hexdigest	=> "69ea60798d71616cce5fd0871e23754cd75d5a0a",
+     }
+    ]
+  end
+end
diff --git a/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
deleted file mode 100644
index c399f2de1d..0000000000
--- a/ext/digest/lib/md5.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# just for compatibility; requiring "md5" is obsoleted
-#
-# $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require 'digest/md5'
-
-class MD5 < Digest::MD5
-  class << self
-    alias orig_new new
-    def new(str = nil)
-      if str
-        orig_new.update(str)
-      else
-        orig_new
-      end
-    end
-
-    def md5(*args)
-      new(*args)
-    end
-  end
-end
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
deleted file mode 100644
index 4446e12e8d..0000000000
--- a/ext/digest/lib/sha1.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# just for compatibility; requiring "sha1" is obsoleted
-#
-# $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require 'digest/sha1'
-
-class SHA1 < Digest::SHA1
-  class << self
-    alias orig_new new
-    def new(str = nil)
-      if str
-        orig_new.update(str)
-      else
-        orig_new
-      end
-    end
-
-    def sha1(*args)
-      new(*args)
-    end
-  end
-end
diff --git a/ext/digest/md5/.cvsignore b/ext/digest/md5/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/digest/md5/.cvsignore
+++ b/ext/digest/md5/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index 018f8ccb02..43a663ca2e 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -4,7 +4,6 @@
 require "mkmf"
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "md5init.#{$OBJEXT}" ]
 
@@ -20,10 +19,6 @@ end
 
 have_header("sys/cdefs.h")
 
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
 $preload = %w[digest]
 
 create_makefile("digest/md5")
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
index 993bc47a06..518f8239ed 100644
--- a/ext/digest/md5/md5.c
+++ b/ext/digest/md5/md5.c
@@ -60,6 +60,7 @@
  * A.5 of RFC 1321, reproduced below.
  */
 #include <string.h>
+int
 main()
 {
     static const char *const test[7*2] = {
@@ -100,6 +101,7 @@ main()
  */
 #ifdef COMPUTE_T_VALUES
 #include <math.h>
+int
 main()
 {
     int i;
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
index f4580ef5e7..91118a8adf 100644
--- a/ext/digest/md5/md5.h
+++ b/ext/digest/md5/md5.h
@@ -46,7 +46,7 @@
 #ifndef MD5_INCLUDED
 #  define MD5_INCLUDED
 
-#include "defs.h"
+#include "../defs.h"
 
 /*
  * This code has some adaptations for the Ghostscript environment, but it
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 17658f4fce..190d7d049f 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -1,14 +1,14 @@
 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
+#include "../digest.h"
 #if defined(HAVE_OPENSSL_MD5_H)
 #include "md5ossl.h"
 #else
 #include "md5.h"
 #endif
 
-static rb_digest_metadata_t md5 = {
+static const rb_digest_metadata_t md5 = {
     RUBY_DIGEST_API_VERSION,
     MD5_DIGEST_LENGTH,
     MD5_BLOCK_LENGTH,
@@ -36,5 +36,5 @@ Init_md5()
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
 
     rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, &md5));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&md5));
 }
diff --git a/ext/digest/rmd160/.cvsignore b/ext/digest/rmd160/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/digest/rmd160/.cvsignore
+++ b/ext/digest/rmd160/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index 09359944f2..4af4f156c3 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -4,7 +4,6 @@
 require "mkmf"
 
 $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
@@ -19,10 +18,6 @@ end
 
 have_header("sys/cdefs.h")
 
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
 $preload = %w[digest]
 
 create_makefile("digest/rmd160")
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index 54d1ca9140..cbfd0ab998 100644
--- a/ext/digest/rmd160/rmd160.h
+++ b/ext/digest/rmd160/rmd160.h
@@ -7,7 +7,7 @@
  *      FILE:     rmd160.h
  *
  *      CONTENTS: Header file for a sample C-implementation of the
- *                RIPEMD-160 hash-function. 
+ *                RIPEMD-160 hash-function.
  *      TARGET:   any computer with an ANSI C compiler
  *
  *      AUTHOR:   Antoon Bosselaers, ESAT-COSIC
@@ -26,7 +26,7 @@
 #ifndef _RMD160_H_
 #define _RMD160_H_
 
-#include "defs.h"
+#include "../defs.h"
 
 typedef struct {
 	uint32_t	state[5];	/* state (ABCDE) */
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 763867df86..c02be3dd0e 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -1,14 +1,14 @@
 /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
+#include "../digest.h"
 #if defined(HAVE_OPENSSL_RIPEMD_H)
 #include "rmd160ossl.h"
 #else
 #include "rmd160.h"
 #endif
 
-static rb_digest_metadata_t rmd160 = {
+static const rb_digest_metadata_t rmd160 = {
     RUBY_DIGEST_API_VERSION,
     RMD160_DIGEST_LENGTH,
     RMD160_BLOCK_LENGTH,
@@ -36,5 +36,5 @@ Init_rmd160()
     cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
 
     rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&rmd160));
 }
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
index f24e63e3d8..bbfff8bbe2 100644
--- a/ext/digest/rmd160/rmd160ossl.c
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#include "defs.h"
+#include "../defs.h"
 #include "rmd160ossl.h"
 
 void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
diff --git a/ext/digest/sha1/.cvsignore b/ext/digest/sha1/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/digest/sha1/.cvsignore
+++ b/ext/digest/sha1/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index 87b74c34af..810f1515b5 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -4,7 +4,6 @@
 require "mkmf"
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
@@ -19,10 +18,6 @@ end
 
 have_header("sys/cdefs.h")
 
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
 $preload = %w[digest]
 
 create_makefile("digest/sha1")
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
index 60e3b01fe2..c196a3d9fe 100644
--- a/ext/digest/sha1/sha1.h
+++ b/ext/digest/sha1/sha1.h
@@ -11,11 +11,11 @@
 #ifndef _SYS_SHA1_H_
 #define	_SYS_SHA1_H_
 
-#include "defs.h"
+#include "../defs.h"
 
 typedef struct {
 	uint32_t state[5];
-	uint32_t count[2];  
+	uint32_t count[2];
 	uint8_t buffer[64];
 } SHA1_CTX;
 
@@ -35,5 +35,5 @@ void	SHA1_Finish _((SHA1_CTX *context, uint8_t digest[20]));
 #define SHA1_BLOCK_LENGTH		64
 #define SHA1_DIGEST_LENGTH		20
 #define SHA1_DIGEST_STRING_LENGTH	(SHA1_DIGEST_LENGTH * 2 + 1)
-  
+
 #endif /* _SYS_SHA1_H_ */
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index b2146f05a9..4c3f26b9e8 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -1,14 +1,14 @@
 /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
+#include "../digest.h"
 #if defined(HAVE_OPENSSL_SHA_H)
 #include "sha1ossl.h"
 #else
 #include "sha1.h"
 #endif
 
-static rb_digest_metadata_t sha1 = {
+static const rb_digest_metadata_t sha1 = {
     RUBY_DIGEST_API_VERSION,
     SHA1_DIGEST_LENGTH,
     SHA1_BLOCK_LENGTH,
@@ -27,14 +27,14 @@ void
 Init_sha1()
 {
     VALUE mDigest, cDigest_Base, cDigest_SHA1;
- 
+
     rb_require("digest");
- 
+
     mDigest = rb_path2class("Digest");
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
 
     rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, &sha1));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha1));
 }
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
index 452cf35084..0fcb2d6b1e 100644
--- a/ext/digest/sha1/sha1ossl.c
+++ b/ext/digest/sha1/sha1ossl.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#include "defs.h"
+#include "../defs.h"
 #include "sha1ossl.h"
 
 void
diff --git a/ext/digest/sha2/.cvsignore b/ext/digest/sha2/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/digest/sha2/.cvsignore
+++ b/ext/digest/sha2/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 225d6ad52b..00e18e158d 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -3,3 +3,4 @@ sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
 sha2init.o: sha2init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
   $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
   sha2.h $(srcdir)/../defs.h
+sha2ossl.o: sha2ossl.h $(srcdir)/../defs.h
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index c084a51a64..503880f13c 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -4,21 +4,24 @@
 require "mkmf"
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
 
-$objs = [
-  "sha2.#{$OBJEXT}",
-  "sha2init.#{$OBJEXT}",
-]
+$objs = [ "sha2init.#{$OBJEXT}" ]
 
-have_header("sys/cdefs.h")
+dir_config("openssl")
 
-have_header("inttypes.h")
+if !with_config("bundled-sha2") &&
+    have_library("crypto") &&
+    %w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")} &&
+    %w[SHA256 SHA512].all? {|d| have_type("#{d}_CTX", "openssl/sha.h")}
+  $objs << "sha2ossl.#{$OBJEXT}"
+  $defs << "-DSHA2_USE_OPENSSL"
+else
+  have_type("u_int8_t")
+  $objs << "sha2.#{$OBJEXT}"
+end
 
-have_header("unistd.h")
+have_header("sys/cdefs.h")
 
 $preload = %w[digest]
 
-if have_type("uint64_t", "defs.h", $defs.join(' '))
-  create_makefile("digest/sha2")
-end
+create_makefile("digest/sha2")
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index 52dd639f9b..b8e4609478 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -10,6 +10,7 @@
 #   $Id$
 
 require 'digest'
+require 'digest/sha2.so'
 
 module Digest
   #
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
index aca9ee926f..650442d72d 100644
--- a/ext/digest/sha2/sha2.c
+++ b/ext/digest/sha2/sha2.c
@@ -1,11 +1,9 @@
 /*
- * sha2.c
+ * FILE:	sha2.c
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
  *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford.  All rights reserved.
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -18,11 +16,11 @@
  * 3. Neither the name of the copyright holder nor the names of contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -31,15 +29,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $OrigId: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
+ * $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $
+ * $Id$
  */
 
-/* $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $ */
-/* $Id$ */
-
-#include "sha2.h"
-#include <stdio.h>
+#include "../defs.h"
 #include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
 #include <assert.h>	/* assert() */
+#include "sha2.h"
 
 /*
  * ASSERT NOTE:
@@ -63,15 +61,64 @@
 
 
 /*** SHA-256/384/512 Machine Architecture Definitions *****************/
+/*
+ * BYTE_ORDER NOTE:
+ *
+ * Please make sure that your system defines BYTE_ORDER.  If your
+ * architecture is little-endian, make sure it also defines
+ * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
+ * equivilent.
+ *
+ * If your system does not define the above, then you can do so by
+ * hand like this:
+ *
+ *   #define LITTLE_ENDIAN 1234
+ *   #define BIG_ENDIAN    4321
+ *
+ * And for little-endian machines, add:
+ *
+ *   #define BYTE_ORDER LITTLE_ENDIAN
+ *
+ * Or for big-endian machines:
+ *
+ *   #define BYTE_ORDER BIG_ENDIAN
+ *
+ * The FreeBSD machine this was written on defines BYTE_ORDER
+ * appropriately by including <sys/types.h> (which in turn includes
+ * <machine/endian.h> where the appropriate definitions are actually
+ * made).
+ */
+#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
+#error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
+#endif
+
+/*
+ * Define the followingsha2_* types to types of the correct length on
+ * the native archtecture.   Most BSD systems and Linux define u_intXX_t
+ * types.  Machines with very recent ANSI C headers, can use the
+ * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H
+ * during compile or in the sha.h header file.
+ *
+ * Machines that support neither u_intXX_t nor inttypes.h's uintXX_t
+ * will need to define these three typedefs below (and the appropriate
+ * ones in sha.h too) by hand according to their system architecture.
+ *
+ * Thank you, Jun-ichiro itojun Hagino, for suggesting using u_intXX_t
+ * types and pointing out recent ANSI C support for uintXX_t in inttypes.h.
+ */
+#ifdef SHA2_USE_INTTYPES_H
+
 typedef uint8_t  sha2_byte;	/* Exactly 1 byte */
 typedef uint32_t sha2_word32;	/* Exactly 4 bytes */
 typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
 
-#if defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
-#define ULL(number)	number##ULL
-#else
-#define ULL(number)	(uint64_t)(number)
-#endif
+#else /* SHA2_USE_INTTYPES_H */
+
+typedef u_int8_t  sha2_byte;	/* Exactly 1 byte */
+typedef u_int32_t sha2_word32;	/* Exactly 4 bytes */
+typedef u_int64_t sha2_word64;	/* Exactly 8 bytes */
+
+#endif /* SHA2_USE_INTTYPES_H */
 
 
 /*** SHA-256/384/512 Various Length Definitions ***********************/
@@ -81,8 +128,13 @@ typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
 #define SHA512_SHORT_BLOCK_LENGTH	(SHA512_BLOCK_LENGTH - 16)
 
 
+#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
+#define ULL(number)	number##ULL
+#else
+#define ULL(number)	(uint64_t)(number)
+#endif
 /*** ENDIAN REVERSAL MACROS *******************************************/
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 #define REVERSE32(w,x)	{ \
 	sha2_word32 tmp = (w); \
 	tmp = (tmp >> 16) | (tmp << 16); \
@@ -96,7 +148,7 @@ typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
 	(x) = ((tmp & ULL(0xffff0000ffff0000)) >> 16) | \
 	      ((tmp & ULL(0x0000ffff0000ffff)) << 16); \
 }
-#endif
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
 
 /*
  * Macro for incrementally adding the unsigned 64-bit integer n to the
@@ -182,7 +234,7 @@ void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
 
 /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
 /* Hash constant words K for SHA-256: */
-const static sha2_word32 K256[64] = {
+static const sha2_word32 K256[64] = {
 	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
 	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
 	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
@@ -202,7 +254,7 @@ const static sha2_word32 K256[64] = {
 };
 
 /* Initial hash value H for SHA-256: */
-const static sha2_word32 sha256_initial_hash_value[8] = {
+static const sha2_word32 sha256_initial_hash_value[8] = {
 	0x6a09e667UL,
 	0xbb67ae85UL,
 	0x3c6ef372UL,
@@ -214,7 +266,7 @@ const static sha2_word32 sha256_initial_hash_value[8] = {
 };
 
 /* Hash constant words K for SHA-384 and SHA-512: */
-const static sha2_word64 K512[80] = {
+static const sha2_word64 K512[80] = {
 	ULL(0x428a2f98d728ae22), ULL(0x7137449123ef65cd),
 	ULL(0xb5c0fbcfec4d3b2f), ULL(0xe9b5dba58189dbbc),
 	ULL(0x3956c25bf348b538), ULL(0x59f111f1b605d019),
@@ -258,7 +310,7 @@ const static sha2_word64 K512[80] = {
 };
 
 /* Initial hash value H for SHA-384 */
-const static sha2_word64 sha384_initial_hash_value[8] = {
+static const sha2_word64 sha384_initial_hash_value[8] = {
 	ULL(0xcbbb9d5dc1059ed8),
 	ULL(0x629a292a367cd507),
 	ULL(0x9159015a3070dd17),
@@ -270,7 +322,7 @@ const static sha2_word64 sha384_initial_hash_value[8] = {
 };
 
 /* Initial hash value H for SHA-512 */
-const static sha2_word64 sha512_initial_hash_value[8] = {
+static const sha2_word64 sha512_initial_hash_value[8] = {
 	ULL(0x6a09e667f3bcc908),
 	ULL(0xbb67ae8584caa73b),
 	ULL(0x3c6ef372fe94f82b),
@@ -281,6 +333,12 @@ const static sha2_word64 sha512_initial_hash_value[8] = {
 	ULL(0x5be0cd19137e2179)
 };
 
+/*
+ * Constant used by SHA256/384/512_End() functions for converting the
+ * digest to a readable hexadecimal character string:
+ */
+static const char *sha2_hex_digits = "0123456789abcdef";
+
 
 /*** SHA-256: *********************************************************/
 void SHA256_Init(SHA256_CTX* context) {
@@ -296,7 +354,7 @@ void SHA256_Init(SHA256_CTX* context) {
 
 /* Unrolled SHA-256 round macros: */
 
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 
 #define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
 	REVERSE32(*data++, W256[j]); \
@@ -307,7 +365,7 @@ void SHA256_Init(SHA256_CTX* context) {
 	j++
 
 
-#else
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
 
 #define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
 	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
@@ -316,7 +374,7 @@ void SHA256_Init(SHA256_CTX* context) {
 	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
 	j++
 
-#endif
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
 
 #define ROUND256(a,b,c,d,e,f,g,h)	\
 	s0 = W256[(j+1)&0x0f]; \
@@ -406,15 +464,15 @@ void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
 
 	j = 0;
 	do {
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 		/* Copy data while converting to host byte order */
 		REVERSE32(*data++,W256[j]);
 		/* Apply the SHA-256 compression function to update a..h */
 		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
-#else
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
 		/* Apply the SHA-256 compression function to update a..h with copy */
 		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
-#endif
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
 		T2 = Sigma0_256(a) + Maj(a, b, c);
 		h = g;
 		g = f;
@@ -432,11 +490,11 @@ void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
 		/* Part of the message block expansion: */
 		s0 = W256[(j+1)&0x0f];
 		s0 = sigma0_256(s0);
-		s1 = W256[(j+14)&0x0f];	
+		s1 = W256[(j+14)&0x0f];
 		s1 = sigma1_256(s1);
 
 		/* Apply the SHA-256 compression function to update a..h */
-		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + 
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] +
 		     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
 		T2 = Sigma0_256(a) + Maj(a, b, c);
 		h = g;
@@ -476,9 +534,9 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	}
 
 	/* Sanity check: */
-	assert(context != NULL && data != NULL);
+	assert(context != (SHA256_CTX*)0 && data != (sha2_byte*)0);
 
-	usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
+	usedspace = (unsigned int)((context->bitcount >> 3) % SHA256_BLOCK_LENGTH);
 	if (usedspace > 0) {
 		/* Calculate how much free space is available in the buffer */
 		freespace = SHA256_BLOCK_LENGTH - usedspace;
@@ -501,7 +559,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	}
 	while (len >= SHA256_BLOCK_LENGTH) {
 		/* Process as many complete blocks as we can */
-		SHA256_Transform(context, (const sha2_word32*)data);
+		SHA256_Transform(context, (sha2_word32*)data);
 		context->bitcount += SHA256_BLOCK_LENGTH << 3;
 		len -= SHA256_BLOCK_LENGTH;
 		data += SHA256_BLOCK_LENGTH;
@@ -515,17 +573,17 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
+void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 	sha2_word32	*d = (sha2_word32*)digest;
 	unsigned int	usedspace;
 
 	/* Sanity check: */
-	assert(context != NULL);
+	assert(context != (SHA256_CTX*)0);
 
 	/* If no digest buffer is passed, we don't bother doing this: */
 	if (digest != (sha2_byte*)0) {
-		usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-#ifndef WORDS_BIGENDIAN
+		usedspace = (unsigned int)((context->bitcount >> 3) % SHA256_BLOCK_LENGTH);
+#if BYTE_ORDER == LITTLE_ENDIAN
 		/* Convert FROM host byte order */
 		REVERSE64(context->bitcount,context->bitcount);
 #endif
@@ -559,7 +617,7 @@ void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
 		/* Final transform: */
 		SHA256_Transform(context, (sha2_word32*)context->buffer);
 
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 		{
 			/* Convert TO host byte order */
 			int	j;
@@ -574,10 +632,41 @@ void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
 	}
 
 	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(SHA256_CTX));
+	MEMSET_BZERO(context, sizeof(context));
 	usedspace = 0;
 }
 
+char *SHA256_End(SHA256_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA256_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA256_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA256_Final(digest, context);
+		for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(context));
+	}
+	MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
+	SHA256_CTX	context;
+
+	SHA256_Init(&context);
+	SHA256_Update(&context, data, len);
+	return SHA256_End(&context, digest);
+}
+
+
 /*** SHA-512: *********************************************************/
 void SHA512_Init(SHA512_CTX* context) {
 	if (context == (SHA512_CTX*)0) {
@@ -591,7 +680,7 @@ void SHA512_Init(SHA512_CTX* context) {
 #ifdef SHA2_UNROLL_TRANSFORM
 
 /* Unrolled SHA-512 round macros: */
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 
 #define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
 	REVERSE64(*data++, W512[j]); \
@@ -602,7 +691,7 @@ void SHA512_Init(SHA512_CTX* context) {
 	j++
 
 
-#else
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
 
 #define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
 	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
@@ -611,7 +700,7 @@ void SHA512_Init(SHA512_CTX* context) {
 	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
 	j++
 
-#endif
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
 
 #define ROUND512(a,b,c,d,e,f,g,h)	\
 	s0 = W512[(j+1)&0x0f]; \
@@ -696,15 +785,15 @@ void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
 
 	j = 0;
 	do {
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 		/* Convert TO host byte order */
 		REVERSE64(*data++, W512[j]);
 		/* Apply the SHA-512 compression function to update a..h */
 		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
-#else
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
 		/* Apply the SHA-512 compression function to update a..h with copy */
 		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
-#endif
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
 		T2 = Sigma0_512(a) + Maj(a, b, c);
 		h = g;
 		g = f;
@@ -766,9 +855,9 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
 	}
 
 	/* Sanity check: */
-	assert(context != NULL && data != NULL);
+	assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0);
 
-	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
+	usedspace = (unsigned int)((context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH);
 	if (usedspace > 0) {
 		/* Calculate how much free space is available in the buffer */
 		freespace = SHA512_BLOCK_LENGTH - usedspace;
@@ -779,7 +868,7 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
 			ADDINC128(context->bitcount, freespace << 3);
 			len -= freespace;
 			data += freespace;
-			SHA512_Transform(context, (const sha2_word64*)context->buffer);
+			SHA512_Transform(context, (sha2_word64*)context->buffer);
 		} else {
 			/* The buffer is not yet full */
 			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
@@ -791,7 +880,7 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
 	}
 	while (len >= SHA512_BLOCK_LENGTH) {
 		/* Process as many complete blocks as we can */
-		SHA512_Transform(context, (const sha2_word64*)data);
+		SHA512_Transform(context, (sha2_word64*)data);
 		ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
 		len -= SHA512_BLOCK_LENGTH;
 		data += SHA512_BLOCK_LENGTH;
@@ -808,8 +897,8 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
 void SHA512_Last(SHA512_CTX* context) {
 	unsigned int	usedspace;
 
-	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-#ifndef WORDS_BIGENDIAN
+	usedspace = (unsigned int)((context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH);
+#if BYTE_ORDER == LITTLE_ENDIAN
 	/* Convert FROM host byte order */
 	REVERSE64(context->bitcount[0],context->bitcount[0]);
 	REVERSE64(context->bitcount[1],context->bitcount[1]);
@@ -826,7 +915,7 @@ void SHA512_Last(SHA512_CTX* context) {
 				MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
 			}
 			/* Do second-to-last transform: */
-			SHA512_Transform(context, (const sha2_word64*)context->buffer);
+			SHA512_Transform(context, (sha2_word64*)context->buffer);
 
 			/* And set-up for the last transform: */
 			MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
@@ -843,21 +932,21 @@ void SHA512_Last(SHA512_CTX* context) {
 	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
 
 	/* Final transform: */
-	SHA512_Transform(context, (const sha2_word64*)context->buffer);
+	SHA512_Transform(context, (sha2_word64*)context->buffer);
 }
 
-void SHA512_Finish(SHA512_CTX* context, sha2_byte digest[]) {
+void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
-	assert(context != NULL);
+	assert(context != (SHA512_CTX*)0);
 
 	/* If no digest buffer is passed, we don't bother doing this: */
 	if (digest != (sha2_byte*)0) {
 		SHA512_Last(context);
 
 		/* Save the hash data for output: */
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 		{
 			/* Convert TO host byte order */
 			int	j;
@@ -872,9 +961,40 @@ void SHA512_Finish(SHA512_CTX* context, sha2_byte digest[]) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(SHA512_CTX));
+	MEMSET_BZERO(context, sizeof(context));
 }
 
+char *SHA512_End(SHA512_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA512_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA512_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA512_Final(digest, context);
+		for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(context));
+	}
+	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
+	SHA512_CTX	context;
+
+	SHA512_Init(&context);
+	SHA512_Update(&context, data, len);
+	return SHA512_End(&context, digest);
+}
+
+
 /*** SHA-384: *********************************************************/
 void SHA384_Init(SHA384_CTX* context) {
 	if (context == (SHA384_CTX*)0) {
@@ -889,18 +1009,18 @@ void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
 	SHA512_Update((SHA512_CTX*)context, data, len);
 }
 
-void SHA384_Finish(SHA384_CTX* context, sha2_byte digest[]) {
+void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
-	assert(context != NULL);
+	assert(context != (SHA384_CTX*)0);
 
 	/* If no digest buffer is passed, we don't bother doing this: */
 	if (digest != (sha2_byte*)0) {
 		SHA512_Last((SHA512_CTX*)context);
 
 		/* Save the hash data for output: */
-#ifndef WORDS_BIGENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 		{
 			/* Convert TO host byte order */
 			int	j;
@@ -915,5 +1035,36 @@ void SHA384_Finish(SHA384_CTX* context, sha2_byte digest[]) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(SHA384_CTX));
+	MEMSET_BZERO(context, sizeof(context));
 }
+
+char *SHA384_End(SHA384_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA384_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA384_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA384_Final(digest, context);
+		for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(context));
+	}
+	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
+	SHA384_CTX	context;
+
+	SHA384_Init(&context);
+	SHA384_Update(&context, data, len);
+	return SHA384_End(&context, digest);
+}
+
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
index 917d415b73..465398ee19 100644
--- a/ext/digest/sha2/sha2.h
+++ b/ext/digest/sha2/sha2.h
@@ -1,11 +1,9 @@
 /*
- * sha2.h
+ * FILE:	sha2.h
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
  *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford.  All rights reserved.
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -18,11 +16,11 @@
  * 3. Neither the name of the copyright holder nor the names of contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -31,11 +29,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $OrigId: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
+ * $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $
+ * $Id$
  */
 
-/* $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
-/* $Id$ */
-
 #ifndef __SHA2_H__
 #define __SHA2_H__
 
@@ -43,7 +41,37 @@
 extern "C" {
 #endif
 
-#include "defs.h"
+
+/*
+ * Import u_intXX_t size_t type definitions from system headers.  You
+ * may need to change this, or define these things yourself in this
+ * file.
+ */
+#include <sys/types.h>
+
+#ifdef RUBY
+# ifdef HAVE_PROTOTYPES
+#  undef NOPROTO
+# else
+#  define NOPROTO
+# endif /* HAVE_PROTOTYPES */
+# ifndef BYTE_ORDER
+#  define LITTLE_ENDIAN	1234
+#  define BIG_ENDIAN	4321
+#  ifdef WORDS_BIGENDIAN
+#   define BYTE_ORDER	BIG_ENDIAN
+#  else
+#   define BYTE_ORDER	LITTLE_ENDIAN
+#  endif
+# endif /* BYTE_ORDER */
+# define SHA2_USE_INTTYPES_H
+#else /* RUBY */
+#ifdef SHA2_USE_INTTYPES_H
+
+#include <inttypes.h>
+
+#endif /* SHA2_USE_INTTYPES_H */
+#endif /* RUBY */
 
 
 /*** SHA-256/384/512 Various Length Definitions ***********************/
@@ -59,7 +87,38 @@ extern "C" {
 
 
 /*** SHA-256/384/512 Context Structures *******************************/
+/* NOTE: If your architecture does not define either u_intXX_t types or
+ * uintXX_t (from inttypes.h), you may need to define things by hand
+ * for your system:
+ */
+#ifndef SHA2_USE_INTTYPES_H
+# ifdef HAVE_U_INT8_T
+typedef u_int8_t uint8_t;		/* 1-byte  (8-bits)  */
+typedef u_int32_t uint32_t;		/* 4-bytes (32-bits) */
+typedef u_int64_t uint64_t;		/* 8-bytes (64-bits) */
+# else
+typedef unsigned char uint8_t;		/* 1-byte  (8-bits)  */
+typedef unsigned int uint32_t;		/* 4-bytes (32-bits) */
+typedef unsigned long long uint64_t;	/* 8-bytes (64-bits) */
+# endif
+#endif
 
+/*
+ * Most BSD systems already define u_intXX_t types, as does Linux.
+ * Some systems, however, like Compaq's Tru64 Unix instead can use
+ * uintXX_t types defined by very recent ANSI C standards and included
+ * in the file:
+ *
+ *   #include <inttypes.h>
+ *
+ * If you choose to use <inttypes.h> then please define:
+ *
+ *   #define SHA2_USE_INTTYPES_H
+ *
+ * Or on the command line during compile:
+ *
+ *   cc -DSHA2_USE_INTTYPES_H ...
+ */
 typedef struct _SHA256_CTX {
 	uint32_t	state[8];
 	uint64_t	bitcount;
@@ -74,32 +133,89 @@ typedef struct _SHA512_CTX {
 typedef SHA512_CTX SHA384_CTX;
 
 
+/*** SHA-256/384/512 Function Prototypes ******************************/
 #ifdef RUBY
 #define SHA256_Init		rb_Digest_SHA256_Init
 #define SHA256_Update		rb_Digest_SHA256_Update
 #define SHA256_Finish		rb_Digest_SHA256_Finish
+#define SHA256_Data		rb_Digest_SHA256_Data
+#define SHA256_End		rb_Digest_SHA256_End
+#define SHA256_Last		rb_Digest_SHA256_Last
+#define SHA256_Transform	rb_Digest_SHA256_Transform
+#define SHA256_Final(d, c)	SHA256_Finish(c, d)
 
 #define SHA384_Init		rb_Digest_SHA384_Init
 #define SHA384_Update		rb_Digest_SHA384_Update
 #define SHA384_Finish		rb_Digest_SHA384_Finish
+#define SHA384_Data		rb_Digest_SHA384_Data
+#define SHA384_End		rb_Digest_SHA384_End
+#define SHA384_Last		rb_Digest_SHA384_Last
+#define SHA384_Transform	rb_Digest_SHA384_Transform
+#define SHA384_Final(d, c)	SHA384_Finish(c, d)
 
 #define SHA512_Init		rb_Digest_SHA512_Init
 #define SHA512_Update		rb_Digest_SHA512_Update
 #define SHA512_Finish		rb_Digest_SHA512_Finish
-#endif
-
-/*** SHA-256/384/512 Function Prototypes ******************************/
-void SHA256_Init _((SHA256_CTX *));
-void SHA256_Update _((SHA256_CTX*, const uint8_t*, size_t));
-void SHA256_Finish _((SHA256_CTX*, uint8_t[SHA256_DIGEST_LENGTH]));
-
-void SHA384_Init _((SHA384_CTX*));
-void SHA384_Update _((SHA384_CTX*, const uint8_t*, size_t));
-void SHA384_Finish _((SHA384_CTX*, uint8_t[SHA384_DIGEST_LENGTH]));
-
-void SHA512_Init _((SHA512_CTX*));
-void SHA512_Update _((SHA512_CTX*, const uint8_t*, size_t));
-void SHA512_Finish _((SHA512_CTX*, uint8_t[SHA512_DIGEST_LENGTH]));
+#define SHA512_Data		rb_Digest_SHA512_Data
+#define SHA512_End		rb_Digest_SHA512_End
+#define SHA512_Last		rb_Digest_SHA512_Last
+#define SHA512_Transform	rb_Digest_SHA512_Transform
+#define SHA512_Final(d, c)	SHA512_Finish(c, d)
+#endif /* RUBY */
+
+#ifndef NOPROTO
+
+void SHA256_Init(SHA256_CTX *);
+void SHA256_Update(SHA256_CTX*, const uint8_t*, size_t);
+void SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
+char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
+char* SHA256_Data(const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
+
+void SHA384_Init(SHA384_CTX*);
+void SHA384_Update(SHA384_CTX*, const uint8_t*, size_t);
+void SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+char* SHA384_Data(const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+
+void SHA512_Init(SHA512_CTX*);
+void SHA512_Update(SHA512_CTX*, const uint8_t*, size_t);
+void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+char* SHA512_Data(const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
+
+#else /* NOPROTO */
+
+void SHA256_Init();
+void SHA256_Update();
+#ifdef RUBY
+void SHA256_Finish();
+#else
+void SHA256_Final();
+#endif /* RUBY */
+char* SHA256_End();
+char* SHA256_Data();
+
+void SHA384_Init();
+void SHA384_Update();
+#ifdef RUBY
+void SHA384_Finish();
+#else
+void SHA384_Final();
+#endif /* RUBY */
+char* SHA384_End();
+char* SHA384_Data();
+
+void SHA512_Init();
+void SHA512_Update();
+#ifdef RUBY
+void SHA512_Finish();
+#else
+void SHA512_Final();
+#endif /* RUBY */
+char* SHA512_End();
+char* SHA512_Data();
+
+#endif /* NOPROTO */
 
 #ifdef	__cplusplus
 }
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index c83a29316a..2e6a61a09f 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -1,13 +1,17 @@
 /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
+#include "../digest.h"
+#if defined(SHA2_USE_OPENSSL)
+#include "sha2ossl.h"
+#else
 #include "sha2.h"
+#endif
 
 #define FOREACH_BITLEN(func)	func(256) func(384) func(512)
 
 #define DEFINE_ALGO_METADATA(bitlen) \
-static rb_digest_metadata_t sha##bitlen = { \
+static const rb_digest_metadata_t sha##bitlen = { \
     RUBY_DIGEST_API_VERSION, \
     SHA##bitlen##_DIGEST_LENGTH, \
     SHA##bitlen##_BLOCK_LENGTH, \
@@ -46,7 +50,7 @@ Init_sha2()
     cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
 \
     rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
-      Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha##bitlen));
 
     FOREACH_BITLEN(DEFINE_ALGO_CLASS)
 }
diff --git a/ext/digest/sha2/sha2ossl.c b/ext/digest/sha2/sha2ossl.c
new file mode 100644
index 0000000000..1316d93759
--- /dev/null
+++ b/ext/digest/sha2/sha2ossl.c
@@ -0,0 +1,11 @@
+#include "../defs.h"
+#include "sha2ossl.h"
+
+#define SHA_Finish(bit) \
+    void SHA##bit##_Finish(SHA##bit##_CTX *ctx, char *buf) \
+    { SHA##bit##_Final((unsigned char *)buf, ctx);}
+#define SHA384_Final SHA512_Final
+
+SHA_Finish(256)
+SHA_Finish(384)
+SHA_Finish(512)
diff --git a/ext/digest/sha2/sha2ossl.h b/ext/digest/sha2/sha2ossl.h
new file mode 100644
index 0000000000..4229d14cf9
--- /dev/null
+++ b/ext/digest/sha2/sha2ossl.h
@@ -0,0 +1,17 @@
+#ifndef SHA2OSSL_H_INCLUDED
+#define SHA2OSSL_H_INCLUDED
+
+#include <stddef.h>
+#include <openssl/sha.h>
+
+#define SHA256_BLOCK_LENGTH	SHA256_CBLOCK
+#define SHA384_BLOCK_LENGTH	SHA512_CBLOCK
+#define SHA512_BLOCK_LENGTH	SHA512_CBLOCK
+
+typedef SHA512_CTX SHA384_CTX;
+
+void SHA256_Finish(SHA256_CTX *ctx, char *buf);
+void SHA384_Finish(SHA384_CTX *ctx, char *buf);
+void SHA512_Finish(SHA512_CTX *ctx, char *buf);
+
+#endif
diff --git a/ext/dl/.cvsignore b/ext/dl/.cvsignore
index 6d884b6cec..6c0b25a1c5 100644
--- a/ext/dl/.cvsignore
+++ b/ext/dl/.cvsignore
@@ -2,7 +2,9 @@ Makefile
 mkmf.log
 dlconfig.h
 dlconfig.rb
+callback.h
 *.func
 *.o
 *~
 *.def
+extconf.h
diff --git a/ext/dl/callback/depend b/ext/dl/callback/depend
new file mode 100644
index 0000000000..7a1dc1ee62
--- /dev/null
+++ b/ext/dl/callback/depend
@@ -0,0 +1,15 @@
+src: callback.c \
+     callback-0.c callback-1.c callback-2.c \
+     callback-3.c callback-4.c callback-5.c \
+     callback-6.c callback-7.c callback-8.c
+
+$(OBJS): $(hdrdir)/ruby.h
+
+callback-0.c callback-1.c callback-2.c \
+callback-3.c callback-4.c callback-5.c \
+callback-6.c callback-7.c callback-8.c \
+	: callback.c
+
+callback.c: $(srcdir)/mkcallback.rb $(srcdir)/../dl.h
+	@echo "generating callback.c"
+	@$(RUBY) $(srcdir)/mkcallback.rb -output=callback $(srcdir)/../dl.h
diff --git a/ext/dl/callback/extconf.rb b/ext/dl/callback/extconf.rb
new file mode 100644
index 0000000000..6c3387670d
--- /dev/null
+++ b/ext/dl/callback/extconf.rb
@@ -0,0 +1,14 @@
+require 'mkmf'
+
+if compiled?("dl")
+  callbacks = (0..8).map{|i| "callback-#{i}"}.unshift("callback")
+  callback_srcs = callbacks.map{|basename| "#{basename}.c"}
+  callback_objs = callbacks.map{|basename| "#{basename}.o"}
+
+  $distcleanfiles << '$(SRCS)'
+  $srcs = callback_srcs
+  $objs = callback_objs
+  $INCFLAGS << " -I$(srcdir)/.."
+
+  create_makefile("dl/callback")
+end
diff --git a/ext/dl/callback/mkcallback.rb b/ext/dl/callback/mkcallback.rb
new file mode 100644
index 0000000000..d2f9e3f2e1
--- /dev/null
+++ b/ext/dl/callback/mkcallback.rb
@@ -0,0 +1,238 @@
+#!ruby -s
+$output ||= "callback"
+$out = open("#{$output}.c", "w")
+
+$dl_h = ARGV[0] || "dl.h"
+
+# import DLSTACK_SIZE, DLSTACK_ARGS and so on
+File.open($dl_h){|f|
+  pre = ""
+  f.each{|line|
+    line.chop!
+    if( line[-1] == ?\\ )
+      line.chop!
+      line.concat(" ")
+      pre += line
+      next
+    end
+    if( pre.size > 0 )
+      line = pre + line
+      pre  = ""
+    end
+    case line
+    when /#define\s+DLSTACK_SIZE\s+\(?(\d+)\)?/
+      DLSTACK_SIZE = $1.to_i
+    when /#define\s+DLSTACK_ARGS\s+(.+)/
+      DLSTACK_ARGS = $1.to_i
+    when /#define\s+DLTYPE_([A-Z_]+)\s+\(?(\d+)\)?/
+      eval("#{$1} = #{$2}")
+    when /#define\s+MAX_DLTYPE\s+\(?(\d+)\)?/
+      MAX_DLTYPE  = $1.to_i
+    when /#define\s+MAX_CALLBACK\s+\(?(\d+)\)?/
+      MAX_CALLBACK = $1.to_i
+    end
+  }
+}
+
+CDECL = "cdecl"
+STDCALL = "stdcall"
+
+CALLTYPES = [CDECL, STDCALL]
+
+DLTYPE = {
+  VOID => {
+    :name => 'void',
+    :type => 'void',
+    :conv => nil,
+  },
+  CHAR => {
+    :name => 'char',
+    :type => 'char',
+    :conv => 'NUM2CHR(%s)'
+  },
+  SHORT => {
+    :name => 'short',
+    :type => 'short',
+    :conv => 'NUM2INT(%s)',
+  },
+  INT => {
+    :name => 'int',
+    :type => 'int',
+    :conv => 'NUM2INT(%s)',
+  },
+  LONG  => {
+    :name => 'long',
+    :type => 'long',
+    :conv => 'NUM2LONG(%s)',
+  },
+  LONG_LONG => {
+    :name => 'long_long',
+    :type => 'LONG_LONG',
+    :conv => 'NUM2LL(%s)',
+  },
+  FLOAT => {
+    :name => 'float',
+    :type => 'float',
+    :conv => '(float)RFLOAT_VALUE(%s)',
+  },
+  DOUBLE => {
+    :name => 'double',
+    :type => 'double',
+    :conv => 'RFLOAT_VALUE(%s)',
+  },
+  VOIDP => {
+    :name => 'ptr',
+    :type => 'void *',
+    :conv => 'NUM2PTR(%s)',
+  },
+}
+
+
+def func_name(ty, argc, n, calltype)
+  "rb_dl_callback_#{DLTYPE[ty][:name]}_#{argc}_#{n}_#{calltype}"
+end
+
+$out << (<<EOS)
+#include "ruby.h"
+
+VALUE rb_DLCdeclCallbackAddrs, rb_DLCdeclCallbackProcs;
+#ifdef FUNC_STDCALL
+VALUE rb_DLStdcallCallbackAddrs, rb_DLStdcallCallbackProcs;
+#endif
+/*static void *cdecl_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
+#ifdef FUNC_STDCALL
+/*static void *stdcall_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
+#endif
+ID   rb_dl_cb_call;
+EOS
+
+def foreach_proc_entry
+  for calltype in CALLTYPES
+    case calltype
+    when CDECL
+      proc_entry = "rb_DLCdeclCallbackProcs"
+    when STDCALL
+      proc_entry = "rb_DLStdcallCallbackProcs"
+    else
+      raise "unknown calltype: #{calltype}"
+    end
+    yield calltype, proc_entry
+  end
+end
+
+def gencallback(ty, calltype, proc_entry, argc, n)
+  <<-EOS
+#{calltype == STDCALL ? "\n#ifdef FUNC_STDCALL" : ""}
+static #{DLTYPE[ty][:type]}
+FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack" + i.to_s}.join(", ")})
+{
+    VALUE ret, cb#{argc > 0 ? ", args[#{argc}]" : ""};
+#{
+      (0...argc).collect{|i|
+	"    args[%d] = LONG2NUM(stack%d);" % [i,i]
+      }.join("\n")
+}
+    cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc});
+    ret = rb_funcall2(cb, rb_dl_cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'});
+    return #{DLTYPE[ty][:conv] ? DLTYPE[ty][:conv] % "ret" : ""};
+}
+#{calltype == STDCALL ? "#endif\n" : ""}
+  EOS
+end
+
+def gen_push_proc_ary(ty, aryname)
+  sprintf("    rb_ary_push(#{aryname}, rb_ary_new3(%d,%s));",
+          MAX_CALLBACK * DLSTACK_SIZE,
+          (0...MAX_CALLBACK).collect{
+            (0...DLSTACK_SIZE).collect{ "Qnil" }.join(",")
+          }.join(","))
+end
+
+def gen_push_addr_ary(ty, aryname, calltype)
+  sprintf("    rb_ary_push(#{aryname}, rb_ary_new3(%d,%s));",
+          MAX_CALLBACK * DLSTACK_SIZE,
+          (0...MAX_CALLBACK).collect{|i|
+            (0...DLSTACK_SIZE).collect{|argc|
+              "PTR2NUM(%s)" % func_name(ty,argc,i,calltype)
+            }.join(",")
+          }.join(","))
+end
+
+def gen_callback_file(ty)
+  filename = "#{$output}-#{ty}.c"
+  initname = "rb_dl_init_callbacks_#{ty}"
+  body = <<-EOS
+#include "dl.h"
+
+extern VALUE rb_DLCdeclCallbackAddrs, rb_DLCdeclCallbackProcs;
+#ifdef FUNC_STDCALL
+extern VALUE rb_DLStdcallCallbackAddrs, rb_DLStdcallCallbackProcs;
+#endif
+extern ID   rb_dl_cb_call;
+    EOS
+  yield body
+  body << <<-EOS
+void
+#{initname}()
+{
+#{gen_push_proc_ary(ty, "rb_DLCdeclCallbackProcs")}
+#{gen_push_addr_ary(ty, "rb_DLCdeclCallbackAddrs", CDECL)}
+#ifdef FUNC_STDCALL
+#{gen_push_proc_ary(ty, "rb_DLStdcallCallbackProcs")}
+#{gen_push_addr_ary(ty, "rb_DLStdcallCallbackAddrs", STDCALL)}
+#endif
+}
+    EOS
+  [filename, initname, body]
+end
+
+callbacks = []
+for ty in 0...MAX_DLTYPE
+  filename, initname, body = gen_callback_file(ty) {|f|
+    foreach_proc_entry do |calltype, proc_entry|
+      for argc in 0...DLSTACK_SIZE
+        for n in 0...MAX_CALLBACK
+          f << gencallback(ty, calltype, proc_entry, argc, n)
+        end
+      end
+    end
+  }
+  $out << "void #{initname}();\n"
+  callbacks << [filename, body]
+end
+
+$out << (<<EOS)
+void
+Init_callback(void)
+{
+    VALUE tmp;
+    VALUE rb_mDL = rb_path2class("DL");
+
+    rb_dl_cb_call = rb_intern("call");
+
+    tmp = rb_DLCdeclCallbackProcs = rb_ary_new();
+    rb_define_const(rb_mDL, "CdeclCallbackProcs", tmp);
+
+    tmp = rb_DLCdeclCallbackAddrs = rb_ary_new();
+    rb_define_const(rb_mDL, "CdeclCallbackAddrs", tmp);
+
+#ifdef FUNC_STDCALL
+    tmp = rb_DLStdcallCallbackProcs = rb_ary_new();
+    rb_define_const(rb_mDL, "StdcallCallbackProcs", tmp);
+
+    tmp = rb_DLStdcallCallbackAddrs = rb_ary_new();
+    rb_define_const(rb_mDL, "StdcallCallbackAddrs", tmp);
+#endif
+
+#{
+    (0...MAX_DLTYPE).collect{|ty|
+      "    rb_dl_init_callbacks_#{ty}();"
+    }.join("\n")
+}
+}
+EOS
+$out.close
+
+for filename, body in callbacks
+  open(filename, "wb") {|f| f.puts body}
+end
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
new file mode 100644
index 0000000000..6a42dcd79e
--- /dev/null
+++ b/ext/dl/cfunc.c
@@ -0,0 +1,632 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <errno.h>
+#include "dl.h"
+
+VALUE rb_big2ulong_pack(VALUE x);
+
+VALUE rb_cDLCFunc;
+
+static ID id_last_error;
+
+static VALUE
+rb_dl_get_last_error(VALUE self)
+{
+    return rb_thread_local_aref(rb_thread_current(), id_last_error);
+}
+
+static VALUE
+rb_dl_set_last_error(VALUE self, VALUE val)
+{
+    rb_thread_local_aset(rb_thread_current(), id_last_error, val);
+    return Qnil;
+}
+
+#if defined(_WIN32)
+#include <windows.h>
+static ID id_win32_last_error;
+
+static VALUE
+rb_dl_get_win32_last_error(VALUE self)
+{
+    return rb_thread_local_aref(rb_thread_current(), id_win32_last_error);
+}
+
+static VALUE
+rb_dl_set_win32_last_error(VALUE self, VALUE val)
+{
+    rb_thread_local_aset(rb_thread_current(), id_win32_last_error, val);
+    return Qnil;
+}
+#endif
+
+
+static void
+dlcfunc_free(void *ptr)
+{
+    struct cfunc_data *data = ptr;
+    if( data->name ){
+	xfree(data->name);
+    }
+    xfree(data);
+}
+
+static size_t
+dlcfunc_memsize(const void *ptr)
+{
+    const struct cfunc_data *data = ptr;
+    size_t size = 0;
+    if( data ){
+	size += sizeof(*data);
+	if( data->name ){
+	    size += strlen(data->name) + 1;
+	}
+    }
+    return size;
+}
+
+const rb_data_type_t dlcfunc_data_type = {
+    "dl/cfunc",
+    0, dlcfunc_free, dlcfunc_memsize,
+};
+
+VALUE
+rb_dlcfunc_new(void (*func)(), int type, const char *name, ID calltype)
+{
+    VALUE val;
+    struct cfunc_data *data;
+
+    rb_secure(4);
+    if( func ){
+	val = TypedData_Make_Struct(rb_cDLCFunc, struct cfunc_data, &dlcfunc_data_type, data);
+	data->ptr  = (void *)(VALUE)func;
+	data->name = name ? strdup(name) : NULL;
+	data->type = type;
+	data->calltype = calltype;
+    }
+    else{
+	val = Qnil;
+    }
+
+    return val;
+}
+
+void *
+rb_dlcfunc2ptr(VALUE val)
+{
+    struct cfunc_data *data;
+    void * func;
+
+    if( rb_typeddata_is_kind_of(val, &dlcfunc_data_type) ){
+	data = DATA_PTR(val);
+	func = data->ptr;
+    }
+    else if( val == Qnil ){
+	func = NULL;
+    }
+    else{
+	rb_raise(rb_eTypeError, "DL::CFunc was expected");
+    }
+
+    return func;
+}
+
+static VALUE
+rb_dlcfunc_s_allocate(VALUE klass)
+{
+    VALUE obj;
+    struct cfunc_data *data;
+
+    obj = TypedData_Make_Struct(klass, struct cfunc_data, &dlcfunc_data_type, data);
+    data->ptr  = 0;
+    data->name = 0;
+    data->type = 0;
+    data->calltype = CFUNC_CDECL;
+
+    return obj;
+}
+
+int
+rb_dlcfunc_kind_p(VALUE func)
+{
+    return rb_typeddata_is_kind_of(func, &dlcfunc_data_type);
+}
+
+/*
+ * call-seq:
+ *    DL::CFunc.new(address, type=DL::TYPE_VOID, name=nil, calltype=:cdecl)
+ *
+ * Create a new function that points to +address+ with an optional return type
+ * of +type+, a name of +name+ and a calltype of +calltype+.
+ */
+static VALUE
+rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
+{
+    VALUE addr, name, type, calltype;
+    struct cfunc_data *data;
+    void *saddr;
+    const char *sname;
+
+    rb_scan_args(argc, argv, "13", &addr, &type, &name, &calltype);
+
+    saddr = (void*)(NUM2PTR(rb_Integer(addr)));
+    sname = NIL_P(name) ? NULL : StringValuePtr(name);
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, data);
+    if( data->name ) xfree(data->name);
+    data->ptr  = saddr;
+    data->name = sname ? strdup(sname) : 0;
+    data->type = NIL_P(type) ? DLTYPE_VOID : NUM2INT(type);
+    data->calltype = NIL_P(calltype) ? CFUNC_CDECL : SYM2ID(calltype);
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *    name  => str
+ *
+ * Get the name of this function
+ */
+static VALUE
+rb_dlcfunc_name(VALUE self)
+{
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+    return cfunc->name ? rb_tainted_str_new2(cfunc->name) : Qnil;
+}
+
+/*
+ * call-seq:
+ *    cfunc.ctype   => num
+ *
+ * Get the C function return value type.  See DL for a list of constants
+ * corresponding to this method's return value.
+ */
+static VALUE
+rb_dlcfunc_ctype(VALUE self)
+{
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+    return INT2NUM(cfunc->type);
+}
+
+/*
+ * call-seq:
+ *    cfunc.ctype = type
+ *
+ * Set the C function return value type to +type+.
+ */
+static VALUE
+rb_dlcfunc_set_ctype(VALUE self, VALUE ctype)
+{
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+    cfunc->type = NUM2INT(ctype);
+    return ctype;
+}
+
+/*
+ * call-seq:
+ *    cfunc.calltype    => symbol
+ *
+ * Get the call type of this function.
+ */
+static VALUE
+rb_dlcfunc_calltype(VALUE self)
+{
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+    return ID2SYM(cfunc->calltype);
+}
+
+/*
+ * call-seq:
+ *    cfunc.calltype = symbol
+ *
+ * Set the call type for this function.
+ */
+static VALUE
+rb_dlcfunc_set_calltype(VALUE self, VALUE sym)
+{
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+    cfunc->calltype = SYM2ID(sym);
+    return sym;
+}
+
+/*
+ * call-seq:
+ *    cfunc.ptr
+ *
+ * Get the underlying function pointer as a DL::CPtr object.
+ */
+static VALUE
+rb_dlcfunc_ptr(VALUE self)
+{
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+    return PTR2NUM(cfunc->ptr);
+}
+
+/*
+ * call-seq:
+ *    cfunc.ptr = pointer
+ *
+ * Set the underlying function pointer to a DL::CPtr named +pointer+.
+ */
+static VALUE
+rb_dlcfunc_set_ptr(VALUE self, VALUE addr)
+{
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+    cfunc->ptr = NUM2PTR(addr);
+
+    return Qnil;
+}
+
+/*
+ * call-seq: inspect
+ *
+ * Returns a string formatted with an easily readable representation of the
+ * internal state of the DL::CFunc
+ */
+static VALUE
+rb_dlcfunc_inspect(VALUE self)
+{
+    VALUE val;
+    struct cfunc_data *cfunc;
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+
+    val = rb_sprintf("#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
+	     cfunc,
+	     cfunc->ptr,
+	     cfunc->type,
+	     cfunc->name ? cfunc->name : "");
+    OBJ_TAINT(val);
+    return val;
+}
+
+
+# define DECL_FUNC_CDECL(f,ret,args,val) \
+    ret (FUNC_CDECL(*f))(args) = (ret (FUNC_CDECL(*))(args))(VALUE)(val)
+#ifdef FUNC_STDCALL
+# define DECL_FUNC_STDCALL(f,ret,args,val) \
+    ret (FUNC_STDCALL(*f))(args) = (ret (FUNC_STDCALL(*))(args))(VALUE)(val)
+#endif
+
+#define CALL_CASE switch( RARRAY_LEN(ary) ){ \
+  CASE(0); break; \
+  CASE(1); break; CASE(2); break; CASE(3); break; CASE(4); break; CASE(5); break; \
+  CASE(6); break; CASE(7); break; CASE(8); break; CASE(9); break; CASE(10);break; \
+  CASE(11);break; CASE(12);break; CASE(13);break; CASE(14);break; CASE(15);break; \
+  CASE(16);break; CASE(17);break; CASE(18);break; CASE(19);break; CASE(20);break; \
+  default: rb_raise(rb_eArgError, "too many arguments"); \
+}
+
+
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
+# pragma optimize("", off)
+#endif
+/*
+ * call-seq:
+ *    dlcfunc.call(ary)   => some_value
+ *    dlcfunc[ary]        => some_value
+ *
+ * Calls the function pointer passing in +ary+ as values to the underlying
+ * C function.  The return value depends on the ctype.
+ */
+static VALUE
+rb_dlcfunc_call(VALUE self, VALUE ary)
+{
+    struct cfunc_data *cfunc;
+    int i;
+    DLSTACK_TYPE stack[DLSTACK_SIZE];
+    VALUE result = Qnil;
+
+    rb_secure_update(self);
+
+    memset(stack, 0, sizeof(DLSTACK_TYPE) * DLSTACK_SIZE);
+    Check_Type(ary, T_ARRAY);
+
+    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+
+    if( cfunc->ptr == 0 ){
+	rb_raise(rb_eDLError, "can't call null-function");
+	return Qnil;
+    }
+
+    for( i = 0; i < RARRAY_LEN(ary); i++ ){
+	VALUE arg;
+	if( i >= DLSTACK_SIZE ){
+	    rb_raise(rb_eDLError, "too many arguments (stack overflow)");
+	}
+	arg = rb_to_int(RARRAY_PTR(ary)[i]);
+	rb_check_safe_obj(arg);
+	if (FIXNUM_P(arg)) {
+	    stack[i] = (DLSTACK_TYPE)FIX2LONG(arg);
+	}
+	else if (RB_TYPE_P(arg, T_BIGNUM)) {
+	    stack[i] = (DLSTACK_TYPE)rb_big2ulong_pack(arg);
+	}
+	else {
+	    Check_Type(arg, T_FIXNUM);
+	}
+    }
+
+    /* calltype == CFUNC_CDECL */
+    if( cfunc->calltype == CFUNC_CDECL
+#ifndef FUNC_STDCALL
+	|| cfunc->calltype == CFUNC_STDCALL
+#endif
+	){
+	switch( cfunc->type ){
+	case DLTYPE_VOID:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,void,DLSTACK_PROTO##n,cfunc->ptr); \
+	    f(DLSTACK_ARGS##n(stack)); \
+	    result = Qnil; \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_VOIDP:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,void*,DLSTACK_PROTO##n,cfunc->ptr); \
+	    void * ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = PTR2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_CHAR:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,char,DLSTACK_PROTO##n,cfunc->ptr); \
+	    char ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = CHR2FIX(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_SHORT:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,short,DLSTACK_PROTO##n,cfunc->ptr); \
+	    short ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = INT2NUM((int)ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_INT:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,int,DLSTACK_PROTO##n,cfunc->ptr); \
+	    int ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = INT2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_LONG:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,long,DLSTACK_PROTO##n,cfunc->ptr); \
+	    long ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = LONG2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+#if HAVE_LONG_LONG  /* used in ruby.h */
+	case DLTYPE_LONG_LONG:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,LONG_LONG,DLSTACK_PROTO##n,cfunc->ptr); \
+	    LONG_LONG ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = LL2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+#endif
+	case DLTYPE_FLOAT:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,float,DLSTACK_PROTO##n,cfunc->ptr); \
+	    float ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = rb_float_new(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_DOUBLE:
+#define CASE(n) case n: { \
+	    DECL_FUNC_CDECL(f,double,DLSTACK_PROTO##n,cfunc->ptr); \
+	    double ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = rb_float_new(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	default:
+	    rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
+	}
+    }
+#ifdef FUNC_STDCALL
+    else if( cfunc->calltype == CFUNC_STDCALL ){
+	/* calltype == CFUNC_STDCALL */
+	switch( cfunc->type ){
+	case DLTYPE_VOID:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,void,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    f(DLSTACK_ARGS##n(stack)); \
+	    result = Qnil; \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_VOIDP:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,void*,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    void * ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = PTR2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_CHAR:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,char,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    char ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = CHR2FIX(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_SHORT:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,short,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    short ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = INT2NUM((int)ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_INT:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,int,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    int ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = INT2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_LONG:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,long,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    long ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = LONG2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+#if HAVE_LONG_LONG  /* used in ruby.h */
+	case DLTYPE_LONG_LONG:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,LONG_LONG,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    LONG_LONG ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = LL2NUM(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+#endif
+	case DLTYPE_FLOAT:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,float,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    float ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = rb_float_new(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	case DLTYPE_DOUBLE:
+#define CASE(n) case n: { \
+	    DECL_FUNC_STDCALL(f,double,DLSTACK_PROTO##n##_,cfunc->ptr); \
+	    double ret; \
+	    ret = f(DLSTACK_ARGS##n(stack)); \
+	    result = rb_float_new(ret); \
+}
+	    CALL_CASE;
+#undef CASE
+	    break;
+	default:
+	    rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
+	}
+    }
+#endif
+    else{
+	rb_raise(rb_eDLError,
+#ifndef LONG_LONG_VALUE
+		 "unsupported call type: %lx",
+#else
+		 "unsupported call type: %llx",
+#endif
+		 cfunc->calltype);
+    }
+
+    rb_dl_set_last_error(self, INT2NUM(errno));
+#if defined(_WIN32)
+    rb_dl_set_win32_last_error(self, INT2NUM(GetLastError()));
+#endif
+
+    return result;
+}
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
+# pragma optimize("", on)
+#endif
+
+/*
+ * call-seq:
+ *    dlfunc.to_i   => integer
+ *
+ * Returns the memory location of this function pointer as an integer.
+ */
+static VALUE
+rb_dlcfunc_to_i(VALUE self)
+{
+  struct cfunc_data *cfunc;
+
+  TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
+  return PTR2NUM(cfunc->ptr);
+}
+
+void
+Init_dlcfunc(void)
+{
+    id_last_error = rb_intern("__DL2_LAST_ERROR__");
+#if defined(_WIN32)
+    id_win32_last_error = rb_intern("__DL2_WIN32_LAST_ERROR__");
+#endif
+    rb_cDLCFunc = rb_define_class_under(rb_mDL, "CFunc", rb_cObject);
+    rb_define_alloc_func(rb_cDLCFunc, rb_dlcfunc_s_allocate);
+    rb_define_module_function(rb_cDLCFunc, "last_error", rb_dl_get_last_error, 0);
+#if defined(_WIN32)
+    rb_define_module_function(rb_cDLCFunc, "win32_last_error", rb_dl_get_win32_last_error, 0);
+#endif
+    rb_define_method(rb_cDLCFunc, "initialize", rb_dlcfunc_initialize, -1);
+    rb_define_method(rb_cDLCFunc, "call", rb_dlcfunc_call, 1);
+    rb_define_method(rb_cDLCFunc, "[]",   rb_dlcfunc_call, 1);
+    rb_define_method(rb_cDLCFunc, "name", rb_dlcfunc_name, 0);
+    rb_define_method(rb_cDLCFunc, "ctype", rb_dlcfunc_ctype, 0);
+    rb_define_method(rb_cDLCFunc, "ctype=", rb_dlcfunc_set_ctype, 1);
+    rb_define_method(rb_cDLCFunc, "calltype", rb_dlcfunc_calltype, 0);
+    rb_define_method(rb_cDLCFunc, "calltype=", rb_dlcfunc_set_calltype, 1);
+    rb_define_method(rb_cDLCFunc, "ptr",  rb_dlcfunc_ptr, 0);
+    rb_define_method(rb_cDLCFunc, "ptr=", rb_dlcfunc_set_ptr, 1);
+    rb_define_method(rb_cDLCFunc, "inspect", rb_dlcfunc_inspect, 0);
+    rb_define_method(rb_cDLCFunc, "to_s", rb_dlcfunc_inspect, 0);
+    rb_define_method(rb_cDLCFunc, "to_i", rb_dlcfunc_to_i, 0);
+}
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
new file mode 100644
index 0000000000..bafbc48be6
--- /dev/null
+++ b/ext/dl/cptr.c
@@ -0,0 +1,650 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby/ruby.h>
+#include <ruby/io.h>
+#include <ctype.h>
+#include "dl.h"
+
+VALUE rb_cDLCPtr;
+
+static inline freefunc_t
+get_freefunc(VALUE func)
+{
+    if (NIL_P(func)) {
+	return NULL;
+    }
+    if (rb_dlcfunc_kind_p(func)) {
+	return (freefunc_t)(VALUE)RCFUNC_DATA(func)->ptr;
+    }
+    return (freefunc_t)(VALUE)NUM2PTR(rb_Integer(func));
+}
+
+static ID id_to_ptr;
+
+static void
+dlptr_free(void *ptr)
+{
+    struct ptr_data *data = ptr;
+    if (data->ptr) {
+	if (data->free) {
+	    (*(data->free))(data->ptr);
+	}
+    }
+}
+
+static size_t
+dlptr_memsize(const void *ptr)
+{
+    const struct ptr_data *data = ptr;
+    return data ? sizeof(*data) + data->size : 0;
+}
+
+static const rb_data_type_t dlptr_data_type = {
+    "dl/ptr",
+    0, dlptr_free, dlptr_memsize,
+};
+
+void
+dlptr_init(VALUE val)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(val, struct ptr_data, &dlptr_data_type, data);
+    OBJ_TAINT(val);
+}
+
+VALUE
+rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
+{
+    struct ptr_data *data;
+    VALUE val;
+
+    rb_secure(4);
+    val = TypedData_Make_Struct(klass, struct ptr_data, &dlptr_data_type, data);
+    data->ptr = ptr;
+    data->free = func;
+    data->size = size;
+    dlptr_init(val);
+
+    return val;
+}
+
+VALUE
+rb_dlptr_new(void *ptr, long size, freefunc_t func)
+{
+    return rb_dlptr_new2(rb_cDLCPtr, ptr, size, func);
+}
+
+VALUE
+rb_dlptr_malloc(long size, freefunc_t func)
+{
+    void *ptr;
+
+    rb_secure(4);
+    ptr = ruby_xmalloc((size_t)size);
+    memset(ptr,0,(size_t)size);
+    return rb_dlptr_new(ptr, size, func);
+}
+
+void *
+rb_dlptr2cptr(VALUE val)
+{
+    struct ptr_data *data;
+    void *ptr;
+
+    if (rb_obj_is_kind_of(val, rb_cDLCPtr)) {
+	TypedData_Get_Struct(val, struct ptr_data, &dlptr_data_type, data);
+	ptr = data->ptr;
+    }
+    else if (val == Qnil) {
+	ptr = NULL;
+    }
+    else{
+	rb_raise(rb_eTypeError, "DL::PtrData was expected");
+    }
+
+    return ptr;
+}
+
+static VALUE
+rb_dlptr_s_allocate(VALUE klass)
+{
+    VALUE obj;
+    struct ptr_data *data;
+
+    rb_secure(4);
+    obj = TypedData_Make_Struct(klass, struct ptr_data, &dlptr_data_type, data);
+    data->ptr = 0;
+    data->size = 0;
+    data->free = 0;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *    DL::CPtr.new(address)                   => dl_cptr
+ *    DL::CPtr.new(address, size)             => dl_cptr
+ *    DL::CPtr.new(address, size, freefunc)   => dl_cptr
+ *
+ * Create a new pointer to +address+ with an optional +size+ and +freefunc+.
+ * +freefunc+ will be called when the instance is garbage collected.
+ */
+static VALUE
+rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
+{
+    VALUE ptr, sym, size;
+    struct ptr_data *data;
+    void *p = NULL;
+    freefunc_t f = NULL;
+    long s = 0;
+
+    switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
+      case 1:
+	p = (void*)(NUM2PTR(rb_Integer(ptr)));
+	break;
+      case 2:
+	p = (void*)(NUM2PTR(rb_Integer(ptr)));
+	s = NUM2LONG(size);
+	break;
+      case 3:
+	p = (void*)(NUM2PTR(rb_Integer(ptr)));
+	s = NUM2LONG(size);
+	f = get_freefunc(sym);
+	break;
+      default:
+	rb_bug("rb_dlptr_initialize");
+    }
+
+    if (p) {
+	TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+	if (data->ptr && data->free) {
+	    /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
+	    (*(data->free))(data->ptr);
+	}
+	data->ptr  = p;
+	data->size = s;
+	data->free = f;
+    }
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *
+ *    DL::CPtr.malloc(size, freefunc = nil)  => dl cptr instance
+ *
+ * Allocate +size+ bytes of memory and associate it with an optional
+ * +freefunc+ that will be called when the pointer is garbage collected.
+ * +freefunc+ must be an address pointing to a function or an instance of
+ * DL::CFunc
+ */
+static VALUE
+rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
+{
+    VALUE size, sym, obj;
+    long s;
+    freefunc_t f;
+
+    switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
+      case 1:
+	s = NUM2LONG(size);
+	f = NULL;
+	break;
+      case 2:
+	s = NUM2LONG(size);
+	f = get_freefunc(sym);
+	break;
+      default:
+	rb_bug("rb_dlptr_s_malloc");
+    }
+
+    obj = rb_dlptr_malloc(s,f);
+
+    return obj;
+}
+
+/*
+ * call-seq: to_i
+ *
+ * Returns the integer memory location of this DL::CPtr.
+ */
+static VALUE
+rb_dlptr_to_i(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    return PTR2NUM(data->ptr);
+}
+
+/*
+ * call-seq: to_value
+ *
+ * Cast this CPtr to a ruby object.
+ */
+static VALUE
+rb_dlptr_to_value(VALUE self)
+{
+    struct ptr_data *data;
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    return (VALUE)(data->ptr);
+}
+
+/*
+ * call-seq: ptr
+ *
+ * Returns a DL::CPtr that is a dereferenced pointer for this DL::CPtr.
+ * Analogous to the star operator in C.
+ */
+VALUE
+rb_dlptr_ptr(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    return rb_dlptr_new(*((void**)(data->ptr)),0,0);
+}
+
+/*
+ * call-seq: ref
+ *
+ * Returns a DL::CPtr that is a reference pointer for this DL::CPtr.
+ * Analogous to the ampersand operator in C.
+ */
+VALUE
+rb_dlptr_ref(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    return rb_dlptr_new(&(data->ptr),0,0);
+}
+
+/*
+ * call-seq: null?
+ *
+ * Returns true if this is a null pointer.
+ */
+VALUE
+rb_dlptr_null_p(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    return data->ptr ? Qfalse : Qtrue;
+}
+
+/*
+ * call-seq: free=(function)
+ *
+ * Set the free function for this pointer to the DL::CFunc in +function+.
+ */
+static VALUE
+rb_dlptr_free_set(VALUE self, VALUE val)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    data->free = get_freefunc(val);
+
+    return Qnil;
+}
+
+/*
+ * call-seq: free
+ *
+ * Get the free function for this pointer.  Returns  DL::CFunc or nil.
+ */
+static VALUE
+rb_dlptr_free_get(VALUE self)
+{
+    struct ptr_data *pdata;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, pdata);
+
+    return rb_dlcfunc_new(pdata->free, DLTYPE_VOID, "free<anonymous>", CFUNC_CDECL);
+}
+
+/*
+ * call-seq:
+ *
+ *    ptr.to_s        => string
+ *    ptr.to_s(len)   => string
+ *
+ * Returns the pointer contents as a string.  When called with no arguments,
+ * this method will return the contents until the first NULL byte.  When
+ * called with +len+, a string of +len+ bytes will be returned.
+ */
+static VALUE
+rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
+{
+    struct ptr_data *data;
+    VALUE arg1, val;
+    int len;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    switch (rb_scan_args(argc, argv, "01", &arg1)) {
+      case 0:
+	val = rb_tainted_str_new2((char*)(data->ptr));
+	break;
+      case 1:
+	len = NUM2INT(arg1);
+	val = rb_tainted_str_new((char*)(data->ptr), len);
+	break;
+      default:
+	rb_bug("rb_dlptr_to_s");
+    }
+
+    return val;
+}
+
+/*
+ * call-seq:
+ *
+ *    ptr.to_str        => string
+ *    ptr.to_str(len)   => string
+ *
+ * Returns the pointer contents as a string.  When called with no arguments,
+ * this method will return the contents with the length of this pointer's
+ * +size+. When called with +len+, a string of +len+ bytes will be returned.
+ */
+static VALUE
+rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
+{
+    struct ptr_data *data;
+    VALUE arg1, val;
+    int len;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    switch (rb_scan_args(argc, argv, "01", &arg1)) {
+      case 0:
+	val = rb_tainted_str_new((char*)(data->ptr),data->size);
+	break;
+      case 1:
+	len = NUM2INT(arg1);
+	val = rb_tainted_str_new((char*)(data->ptr), len);
+	break;
+      default:
+	rb_bug("rb_dlptr_to_str");
+    }
+
+    return val;
+}
+
+/*
+ * call-seq: inspect
+ *
+ * Returns a string formatted with an easily readable representation of the
+ * internal state of the DL::CPtr
+ */
+static VALUE
+rb_dlptr_inspect(VALUE self)
+{
+    struct ptr_data *data;
+    char str[1024];
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    snprintf(str, 1023, "#<%s:%p ptr=%p size=%ld free=%p>",
+	     rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free);
+    return rb_str_new2(str);
+}
+
+/*
+ *  call-seq:
+ *    ptr == other    => true or false
+ *    ptr.eql?(other) => true or false
+ *
+ * Returns true if +other+ wraps the same pointer, otherwise returns
+ * false.
+ */
+VALUE
+rb_dlptr_eql(VALUE self, VALUE other)
+{
+    void *ptr1, *ptr2;
+
+    if(!rb_obj_is_kind_of(other, rb_cDLCPtr)) return Qfalse;
+
+    ptr1 = rb_dlptr2cptr(self);
+    ptr2 = rb_dlptr2cptr(other);
+
+    return ptr1 == ptr2 ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *    ptr <=> other   => -1, 0, 1, or nil
+ *
+ * Returns -1 if less than, 0 if equal to, 1 if greater than +other+.  Returns
+ * nil if +ptr+ cannot be compared to +other+.
+ */
+static VALUE
+rb_dlptr_cmp(VALUE self, VALUE other)
+{
+    void *ptr1, *ptr2;
+    SIGNED_VALUE diff;
+
+    if(!rb_obj_is_kind_of(other, rb_cDLCPtr)) return Qnil;
+
+    ptr1 = rb_dlptr2cptr(self);
+    ptr2 = rb_dlptr2cptr(other);
+    diff = (SIGNED_VALUE)ptr1 - (SIGNED_VALUE)ptr2;
+    if (!diff) return INT2FIX(0);
+    return diff > 0 ? INT2NUM(1) : INT2NUM(-1);
+}
+
+/*
+ * call-seq:
+ *    ptr + n   => new cptr
+ *
+ * Returns a new DL::CPtr that has been advanced +n+ bytes.
+ */
+static VALUE
+rb_dlptr_plus(VALUE self, VALUE other)
+{
+    void *ptr;
+    long num, size;
+
+    ptr = rb_dlptr2cptr(self);
+    size = RPTR_DATA(self)->size;
+    num = NUM2LONG(other);
+    return rb_dlptr_new((char *)ptr + num, size - num, 0);
+}
+
+/*
+ * call-seq:
+ *    ptr - n   => new cptr
+ *
+ * Returns a new DL::CPtr that has been moved back +n+ bytes.
+ */
+static VALUE
+rb_dlptr_minus(VALUE self, VALUE other)
+{
+    void *ptr;
+    long num, size;
+
+    ptr = rb_dlptr2cptr(self);
+    size = RPTR_DATA(self)->size;
+    num = NUM2LONG(other);
+    return rb_dlptr_new((char *)ptr - num, size + num, 0);
+}
+
+/*
+ *  call-seq:
+ *     ptr[index]                -> an_integer
+ *     ptr[start, length]        -> a_string
+ *
+ * Returns integer stored at _index_.  If _start_ and _length_ are given,
+ * a string containing the bytes from _start_ of length _length_ will be
+ * returned.
+ */
+VALUE
+rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
+{
+    VALUE arg0, arg1;
+    VALUE retval = Qnil;
+    size_t offset, len;
+
+    switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
+      case 1:
+	offset = NUM2ULONG(arg0);
+	retval = INT2NUM(*((char*)RPTR_DATA(self)->ptr + offset));
+	break;
+      case 2:
+	offset = NUM2ULONG(arg0);
+	len    = NUM2ULONG(arg1);
+	retval = rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len);
+	break;
+      default:
+	rb_bug("rb_dlptr_aref()");
+    }
+    return retval;
+}
+
+/*
+ *  call-seq:
+ *     ptr[index]         = int                    ->  int
+ *     ptr[start, length] = string or cptr or addr ->  string or dl_cptr or addr
+ *
+ * Set the value at +index+ to +int+.  Or, set the memory at +start+ until
+ * +length+ with the contents of +string+, the memory from +dl_cptr+, or the
+ * memory pointed at by the memory address +addr+.
+ */
+VALUE
+rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
+{
+    VALUE arg0, arg1, arg2;
+    VALUE retval = Qnil;
+    size_t offset, len;
+    void *mem;
+
+    switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
+      case 2:
+	offset = NUM2ULONG(arg0);
+	((char*)RPTR_DATA(self)->ptr)[offset] = NUM2UINT(arg1);
+	retval = arg1;
+	break;
+      case 3:
+	offset = NUM2ULONG(arg0);
+	len    = NUM2ULONG(arg1);
+	if( TYPE(arg2) == T_STRING ){
+	    mem = StringValuePtr(arg2);
+	}
+	else if( rb_obj_is_kind_of(arg2, rb_cDLCPtr) ){
+	    mem = rb_dlptr2cptr(arg2);
+	}
+	else{
+	    mem    = NUM2PTR(arg2);
+	}
+	memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len);
+	retval = arg2;
+	break;
+      default:
+	rb_bug("rb_dlptr_aset()");
+    }
+    return retval;
+}
+
+/*
+ * call-seq: size=(size)
+ *
+ * Set the size of this pointer to +size+
+ */
+static VALUE
+rb_dlptr_size_set(VALUE self, VALUE size)
+{
+    RPTR_DATA(self)->size = NUM2LONG(size);
+    return size;
+}
+
+/*
+ * call-seq: size
+ *
+ * Get the size of this pointer.
+ */
+static VALUE
+rb_dlptr_size_get(VALUE self)
+{
+    return LONG2NUM(RPTR_DATA(self)->size);
+}
+
+/*
+ * call-seq:
+ *    DL::CPtr.to_ptr(val)  => cptr
+ *    DL::CPtr[val]         => cptr
+ *
+ * Get the underlying pointer for ruby object +val+ and return it as a
+ * DL::CPtr object.
+ */
+static VALUE
+rb_dlptr_s_to_ptr(VALUE self, VALUE val)
+{
+    VALUE ptr;
+
+    if (RTEST(rb_obj_is_kind_of(val, rb_cIO))){
+	rb_io_t *fptr;
+	FILE *fp;
+	GetOpenFile(val, fptr);
+	fp = rb_io_stdio_file(fptr);
+	ptr = rb_dlptr_new(fp, 0, NULL);
+    }
+    else if (RTEST(rb_obj_is_kind_of(val, rb_cString))){
+	char *str = StringValuePtr(val);
+	ptr = rb_dlptr_new(str, RSTRING_LEN(val), NULL);
+    }
+    else if (rb_respond_to(val, id_to_ptr)){
+	VALUE vptr = rb_funcall(val, id_to_ptr, 0);
+	if (rb_obj_is_kind_of(vptr, rb_cDLCPtr)){
+	    ptr = vptr;
+	}
+	else{
+	    rb_raise(rb_eDLError, "to_ptr should return a CPtr object");
+	}
+    }
+    else{
+	ptr = rb_dlptr_new(NUM2PTR(rb_Integer(val)), 0, NULL);
+    }
+    OBJ_INFECT(ptr, val);
+    rb_iv_set(ptr, "wrapping", val);
+    return ptr;
+}
+
+void
+Init_dlptr(void)
+{
+    id_to_ptr = rb_intern("to_ptr");
+
+    rb_cDLCPtr = rb_define_class_under(rb_mDL, "CPtr", rb_cObject);
+    rb_define_alloc_func(rb_cDLCPtr, rb_dlptr_s_allocate);
+    rb_define_singleton_method(rb_cDLCPtr, "malloc", rb_dlptr_s_malloc, -1);
+    rb_define_singleton_method(rb_cDLCPtr, "to_ptr", rb_dlptr_s_to_ptr, 1);
+    rb_define_singleton_method(rb_cDLCPtr, "[]", rb_dlptr_s_to_ptr, 1);
+    rb_define_method(rb_cDLCPtr, "initialize", rb_dlptr_initialize, -1);
+    rb_define_method(rb_cDLCPtr, "free=", rb_dlptr_free_set, 1);
+    rb_define_method(rb_cDLCPtr, "free",  rb_dlptr_free_get, 0);
+    rb_define_method(rb_cDLCPtr, "to_i",  rb_dlptr_to_i, 0);
+    rb_define_method(rb_cDLCPtr, "to_int",  rb_dlptr_to_i, 0);
+    rb_define_method(rb_cDLCPtr, "to_value",  rb_dlptr_to_value, 0);
+    rb_define_method(rb_cDLCPtr, "ptr",   rb_dlptr_ptr, 0);
+    rb_define_method(rb_cDLCPtr, "+@", rb_dlptr_ptr, 0);
+    rb_define_method(rb_cDLCPtr, "ref",   rb_dlptr_ref, 0);
+    rb_define_method(rb_cDLCPtr, "-@", rb_dlptr_ref, 0);
+    rb_define_method(rb_cDLCPtr, "null?", rb_dlptr_null_p, 0);
+    rb_define_method(rb_cDLCPtr, "to_s", rb_dlptr_to_s, -1);
+    rb_define_method(rb_cDLCPtr, "to_str", rb_dlptr_to_str, -1);
+    rb_define_method(rb_cDLCPtr, "inspect", rb_dlptr_inspect, 0);
+    rb_define_method(rb_cDLCPtr, "<=>", rb_dlptr_cmp, 1);
+    rb_define_method(rb_cDLCPtr, "==", rb_dlptr_eql, 1);
+    rb_define_method(rb_cDLCPtr, "eql?", rb_dlptr_eql, 1);
+    rb_define_method(rb_cDLCPtr, "+", rb_dlptr_plus, 1);
+    rb_define_method(rb_cDLCPtr, "-", rb_dlptr_minus, 1);
+    rb_define_method(rb_cDLCPtr, "[]", rb_dlptr_aref, -1);
+    rb_define_method(rb_cDLCPtr, "[]=", rb_dlptr_aset, -1);
+    rb_define_method(rb_cDLCPtr, "size", rb_dlptr_size_get, 0);
+    rb_define_method(rb_cDLCPtr, "size=", rb_dlptr_size_set, 1);
+
+    rb_define_const(rb_mDL, "NULL", rb_dlptr_new(0, 0, 0));
+}
diff --git a/ext/dl/depend b/ext/dl/depend
index fba3df7a3d..992c17c1b8 100644
--- a/ext/dl/depend
+++ b/ext/dl/depend
@@ -1,46 +1,7 @@
-LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
+cfunc.o: cfunc.c dl.h $(hdrdir)/ruby.h
 
-libtest.so: test/libtest.so
+cptr.o: cptr.c dl.h $(hdrdir)/ruby.h $(hdrdir)/io.h
 
-test/libtest.so: test/test.o $(srcdir)/test/libtest.def
-	$(RUBY) -rftools -e 'ARGV.each do|d|File.mkpath(File.dirname(d))end' $@
-	$(LDSHARED_TEST:dl.def=test/libtest.def)
+handle.o: handle.c dl.h $(hdrdir)/ruby.h
 
-test/test.o: $(srcdir)/test/test.c
-	@$(RUBY) -rftools -e 'File.mkpath(*ARGV)' test
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/test/test.c -o $@
-
-test:: dl.so libtest.so force
-	$(RUBY) -I. -I$(srcdir)/lib $(srcdir)/test/test.rb
-
-force:
-
-.PHONY: force test
-
-allclean: distclean
-	@rm -f $(CLEANFILES) $(DISTCLEANFILES)
-
-$(OBJS): ./dlconfig.h
-
-sym.o: dl.h call.func
-
-dl.o: dl.h callback.func cbtable.func
-
-ptr.o: dl.h
-
-handle.o: dl.h
-
-call.func: $(srcdir)/mkcall.rb ./dlconfig.rb
-	@echo "Generating call.func"
-	@$(RUBY) $(srcdir)/mkcall.rb > $@
-
-callback.func: $(srcdir)/mkcallback.rb ./dlconfig.rb
-	@echo "Generating callback.func"
-	@$(RUBY) $(srcdir)/mkcallback.rb > $@
-
-cbtable.func: $(srcdir)/mkcbtable.rb ./dlconfig.rb
-	@echo "Generating cbtable.func"
-	@$(RUBY) $(srcdir)/mkcbtable.rb > $@
-
-debug:
-	$(MAKE) CPPFLAGS="$(CPPFLAGS) -DDEBUG"
+dl.o: dl.c dl.h $(hdrdir)/ruby.h $(hdrdir)/io.h
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index 5ba3646ea3..9635794883 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -1,9 +1,5 @@
-/*
- * $Id$
- */
-
-#include <ruby.h>
-#include <rubyio.h>
+#include <ruby/ruby.h>
+#include <ruby/io.h>
 #include <ctype.h>
 #include "dl.h"
 
@@ -11,718 +7,159 @@ VALUE rb_mDL;
 VALUE rb_eDLError;
 VALUE rb_eDLTypeError;
 
-static VALUE DLFuncTable;
-static void *rb_dl_callback_table[CALLBACK_TYPES][MAX_CALLBACK];
-static ID id_call;
-
-static int
-rb_dl_scan_callback_args(long stack[], const char *proto,
-			 int *argc, VALUE argv[])
-{
-  int i;
-  long *sp;
-  VALUE val;
-
-  sp = stack;
-  for (i=1; proto[i]; i++) {
-    switch (proto[i]) {
-    case 'C':
-      {
-	char v;
-	v = (char)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'H':
-      {
-	short v;
-	v = (short)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'I':
-      {
-	int v;
-	v = (int)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'L':
-      {
-	long v;
-	v = (long)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'F':
-      {
-	float v;
-	memcpy(&v, sp, sizeof(float));
-	sp += sizeof(float)/sizeof(long);
-	val = rb_float_new(v);
-      }
-      break;
-    case 'D':
-      {
-	double v;
-	memcpy(&v, sp, sizeof(double));
-	sp += sizeof(double)/sizeof(long);
-	val = rb_float_new(v);
-      }
-      break;
-    case 'P':
-      {
-	void *v;
-	memcpy(&v, sp, sizeof(void*));
-	sp++;
-	val = rb_dlptr_new(v, 0, 0);
-      }
-      break;
-    case 'S':
-      {
-	char *v;
-	memcpy(&v, sp, sizeof(void*));
-	sp++;
-	val = rb_tainted_str_new2(v);
-      }
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unsupported type `%c'", proto[i]);
-      break;
-    }
-    argv[i-1] = val;
-  }
-  *argc = (i - 1);
-
-  return (*argc);
-}
-
-#include "callback.func"
-
-static void
-init_dl_func_table(){
-#include "cbtable.func"
-}
-
-void *
-dlmalloc(size_t size)
-{
-  DEBUG_CODE2({
-    void *ptr;
-
-    printf("dlmalloc(%d)",size);
-    ptr = xmalloc(size);
-    printf(":0x%x\n",ptr);
-    return ptr;
-  },
-  {
-    return xmalloc(size);
-  });
-}
-
-void *
-dlrealloc(void *ptr, size_t size)
-{
-  DEBUG_CODE({
-    printf("dlrealloc(0x%x,%d)\n",ptr,size);
-  });
-  return xrealloc(ptr, size);
-}
-
-void
-dlfree(void *ptr)
-{
-  DEBUG_CODE({
-    printf("dlfree(0x%x)\n",ptr);
-  });
-  xfree(ptr);
-}
-
-char*
-dlstrdup(const char *str)
-{
-  char *newstr;
-
-  newstr = (char*)dlmalloc(strlen(str)+1);
-  strcpy(newstr,str);
-
-  return newstr;
-}
-
-size_t
-dlsizeof(const char *cstr)
-{
-  size_t size;
-  int i, len, n, dlen;
-  char *d;
-
-  len  = strlen(cstr);
-  size = 0;
-  for (i=0; i<len; i++) {
-    n = 1;
-    if (isdigit(cstr[i+1])) {
-      dlen = 1;
-      while (isdigit(cstr[i+dlen])) { dlen ++; };
-      dlen --;
-      d = ALLOCA_N(char, dlen + 1);
-      strncpy(d, cstr + i + 1, dlen);
-      d[dlen] = '\0';
-      n = atoi(d);
-    }
-    else{
-      dlen = 0;
-    }
-
-    switch (cstr[i]) {
-    case 'I':
-      DLALIGN(0,size,INT_ALIGN);
-    case 'i':
-      size += sizeof(int) * n;
-      break;
-    case 'L':
-      DLALIGN(0,size,LONG_ALIGN);
-    case 'l':
-      size += sizeof(long) * n;
-      break;
-    case 'F':
-      DLALIGN(0,size,FLOAT_ALIGN);
-    case 'f':
-      size += sizeof(float) * n;
-      break;
-    case 'D':
-      DLALIGN(0,size,DOUBLE_ALIGN);
-    case 'd':
-      size += sizeof(double) * n;
-      break;
-    case 'C':
-    case 'c':
-      size += sizeof(char) * n;
-      break;
-    case 'H':
-      DLALIGN(0,size,SHORT_ALIGN);
-    case 'h':
-      size += sizeof(short) * n;
-      break;
-    case 'P':
-    case 'S':
-      DLALIGN(0,size,VOIDP_ALIGN);
-    case 'p':
-    case 's':
-      size += sizeof(void*) * n;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type '%c'", cstr[i]);
-      break;
-    }
-    i += dlen;
-  }
-
-  return size;
-}
-
-static float *
-c_farray(VALUE v, long *size)
-{
-  int i, len;
-  float *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(float) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FLOAT:
-      ary[i] = (float)(RFLOAT(e)->value);
-      break;
-    case T_NIL:
-      ary[i] = 0.0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static double *
-c_darray(VALUE v, long *size)
-{
-  int i, len;
-  double *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(double) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FLOAT:
-      ary[i] = (double)(RFLOAT(e)->value);
-      break;
-    case T_NIL:
-      ary[i] = 0.0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static long *
-c_larray(VALUE v, long *size)
-{
-  int i, len;
-  long *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(long) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (long)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static int *
-c_iarray(VALUE v, long *size)
-{
-  int i, len;
-  int *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(int) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (int)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static short *
-c_harray(VALUE v, long *size)
-{
-  int i, len;
-  short *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(short) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (short)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static char *
-c_carray(VALUE v, long *size)
-{
-  int i, len;
-  char *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(char) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (char)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static void *
-c_parray(VALUE v, long *size)
-{
-  int i, len;
-  void **ary;
-  VALUE e, tmp;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(void*) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    default:
-      tmp = rb_check_string_type(e);
-      if (NIL_P(tmp)) {
-	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      }
-      e = tmp;
-      /* fall through */
-    case T_STRING:
-      rb_check_safe_str(e);
-      {
-	char *str, *src;
-	src = RSTRING(e)->ptr;
-	str = dlstrdup(src);
-	ary[i] = (void*)str;
-      }
-      break;
-    case T_NIL:
-      ary[i] = NULL;
-      break;
-    case T_DATA:
-      if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
-	struct ptr_data *pdata;
-	Data_Get_Struct(e, struct ptr_data, pdata);
-	ary[i] = (void*)(pdata->ptr);
-      }
-      else{
-        e = rb_funcall(e, rb_intern("to_ptr"), 0);
-        if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
-	  struct ptr_data *pdata;
-	  Data_Get_Struct(e, struct ptr_data, pdata);
-	  ary[i] = (void*)(pdata->ptr);
-	}
-	else{
-	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-	}
-      }
-      break;
-    }
-  }
-
-  return ary;
-}
-
-void *
-rb_ary2cary(char t, VALUE v, long *size)
-{
-  int len;
-  VALUE val0;
-
-  val0 = rb_check_array_type(v);
-  if(NIL_P(val0)) {
-    rb_raise(rb_eDLTypeError, "an array is expected.");
-  }
-  v = val0;
-
-  len = RARRAY(v)->len;
-  if (len == 0) {
-    return NULL;
-  }
-
-  if (!size) {
-    size = ALLOCA_N(long,1);
-  }
-
-  val0 = rb_ary_entry(v,0);
-  switch (TYPE(val0)) {
-  case T_FIXNUM:
-  case T_BIGNUM:
-    switch (t) {
-    case 'C': case 'c':
-      return (void*)c_carray(v,size);
-    case 'H': case 'h':
-      return (void*)c_harray(v,size);
-    case 'I': case 'i':
-      return (void*)c_iarray(v,size);
-    case 'L': case 'l': case 0:
-      return (void*)c_larray(v,size);
-    default:
-      rb_raise(rb_eDLTypeError, "type mismatch");
-    }
-  case T_STRING:
-    return (void*)c_parray(v,size);
-  case T_FLOAT:
-    switch (t) {
-    case 'F': case 'f':
-      return (void*)c_farray(v,size);
-    case 'D': case 'd': case 0:
-      return (void*)c_darray(v,size);
-    }
-    rb_raise(rb_eDLTypeError, "type mismatch");
-  case T_DATA:
-    if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
-      return (void*)c_parray(v,size);
-    }
-    else{
-      val0 = rb_funcall(val0, rb_intern("to_ptr"), 0);
-      if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
-        return (void*)c_parray(v,size);
-      }
-    }
-    rb_raise(rb_eDLTypeError, "type mismatch");
-  case T_NIL:
-    return (void*)c_parray(v, size);
-  default:
-    rb_raise(rb_eDLTypeError, "unsupported type");
-  }
-}
+ID rbdl_id_cdecl;
+ID rbdl_id_stdcall;
 
 VALUE
-rb_str_to_ptr(VALUE self)
+rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
 {
-  char *ptr;
-  int  len;
-
-  len = RSTRING(self)->len;
-  ptr = (char*)dlmalloc(len + 1);
-  memcpy(ptr, RSTRING(self)->ptr, len);
-  ptr[len] = '\0';
-  return rb_dlptr_new((void*)ptr,len,dlfree);
+    return rb_class_new_instance(argc, argv, rb_cDLHandle);
 }
 
+/*
+ * call-seq: DL.malloc
+ *
+ * Allocate +size+ bytes of memory and return the integer memory address
+ * for the allocated memory.
+ */
 VALUE
-rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
+rb_dl_malloc(VALUE self, VALUE size)
 {
-  void *ptr;
-  VALUE t;
-  long size;
+    void *ptr;
 
-  switch (rb_scan_args(argc, argv, "01", &t)) {
-  case 1:
-    ptr = rb_ary2cary(StringValuePtr(t)[0], self, &size);
-    break;
-  case 0:
-    ptr = rb_ary2cary(0, self, &size);
-    break;
-  }
-  return ptr ? rb_dlptr_new(ptr, size, dlfree) : Qnil;
+    rb_secure(4);
+    ptr = (void*)ruby_xmalloc(NUM2INT(size));
+    return PTR2NUM(ptr);
 }
 
+/*
+ * call-seq: DL.realloc(addr, size)
+ *
+ * Change the size of the memory allocated at the memory location +addr+ to
+ * +size+ bytes.  Returns the memory address of the reallocated memory, which
+ * may be different than the address passed in.
+ */
 VALUE
-rb_io_to_ptr(VALUE self)
+rb_dl_realloc(VALUE self, VALUE addr, VALUE size)
 {
-  OpenFile *fptr;
-  FILE     *fp;
-
-  GetOpenFile(self, fptr);
-  fp = fptr->f;
+    void *ptr = NUM2PTR(addr);
 
-  return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
+    rb_secure(4);
+    ptr = (void*)ruby_xrealloc(ptr, NUM2INT(size));
+    return PTR2NUM(ptr);
 }
 
+/*
+ * call-seq: DL.free(addr)
+ *
+ * Free the memory at address +addr+
+ */
 VALUE
-rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
+rb_dl_free(VALUE self, VALUE addr)
 {
-  rb_secure(4);
-  return rb_class_new_instance(argc, argv, rb_cDLHandle);
-}
+    void *ptr = NUM2PTR(addr);
 
-VALUE
-rb_dl_malloc(VALUE self, VALUE size)
-{
-  rb_secure(4);
-  return rb_dlptr_malloc(DLNUM2LONG(size), dlfree);
+    rb_secure(4);
+    ruby_xfree(ptr);
+    return Qnil;
 }
 
 VALUE
-rb_dl_strdup(VALUE self, VALUE str)
+rb_dl_ptr2value(VALUE self, VALUE addr)
 {
-  SafeStringValue(str);
-  return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
+    rb_secure(4);
+    return (VALUE)NUM2PTR(addr);
 }
 
-static VALUE
-rb_dl_sizeof(VALUE self, VALUE str)
-{
-  return INT2NUM(dlsizeof(StringValuePtr(str)));
-}
-
-static VALUE
-rb_dl_callback(int argc, VALUE argv[], VALUE self)
+VALUE
+rb_dl_value2ptr(VALUE self, VALUE val)
 {
-  VALUE type, proc;
-  int rettype, entry, i;
-  char fname[127];
-
-  rb_secure(4);
-  proc = Qnil;
-  switch (rb_scan_args(argc, argv, "11", &type, &proc)) {
-  case 1:
-    if (rb_block_given_p()) {
-      proc = rb_block_proc();
-    }
-    else{
-      proc = Qnil;
-    }
-  default:
-    break;
-  }
-
-  StringValue(type);
-  switch (RSTRING(type)->ptr[0]) {
-  case '0':
-    rettype = 0x00;
-    break;
-  case 'C':
-    rettype = 0x01;
-    break;
-  case 'H':
-    rettype = 0x02;
-    break;
-  case 'I':
-    rettype = 0x03;
-    break;
-  case 'L':
-    rettype = 0x04;
-    break;
-  case 'F':
-    rettype = 0x05;
-    break;
-  case 'D':
-    rettype = 0x06;
-    break;
-  case 'P':
-    rettype = 0x07;
-    break;
-  default:
-    rb_raise(rb_eDLTypeError, "unsupported type `%c'", RSTRING(type)->ptr[0]);
-  }
-
-  entry = -1;
-  for (i=0; i < MAX_CALLBACK; i++) {
-    if (rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(rettype), INT2NUM(i))) == Qnil) {
-      entry = i;
-      break;
-    }
-  }
-  if (entry < 0) {
-    rb_raise(rb_eDLError, "too many callbacks are defined.");
-  }
-
-  rb_hash_aset(DLFuncTable,
-	       rb_assoc_new(INT2NUM(rettype),INT2NUM(entry)),
-	       rb_assoc_new(type,proc));
-  sprintf(fname, "rb_dl_callback_func_%d_%d", rettype, entry);
-  return rb_dlsym_new((void (*)())rb_dl_callback_table[rettype][entry],
-		      fname, RSTRING(type)->ptr);
+    return PTR2NUM((void*)val);
 }
 
-static VALUE
-rb_dl_remove_callback(VALUE mod, VALUE sym)
+static void
+rb_dl_init_callbacks(VALUE dl)
 {
-  freefunc_t f;
-  int i, j;
+    static const char cb[] = "dl/callback.so";
 
-  rb_secure(4);
-  f = rb_dlsym2csym(sym);
-  for (i=0; i < CALLBACK_TYPES; i++) {
-    for (j=0; j < MAX_CALLBACK; j++) {
-      if (rb_dl_callback_table[i][j] == f) {
-	rb_hash_aset(DLFuncTable, rb_assoc_new(INT2NUM(i),INT2NUM(j)),Qnil);
-	break;
-      }
-    }
-  }
-  return Qnil;
+    rb_autoload(dl, rb_intern_const("CdeclCallbackAddrs"), cb);
+    rb_autoload(dl, rb_intern_const("CdeclCallbackProcs"), cb);
+#ifdef FUNC_STDCALL
+    rb_autoload(dl, rb_intern_const("StdcallCallbackAddrs"), cb);
+    rb_autoload(dl, rb_intern_const("StdcallCallbackProcs"), cb);
+#endif
 }
 
 void
-Init_dl()
-{
-  void Init_dlptr();
-  void Init_dlsym();
-  void Init_dlhandle();
-
-  id_call = rb_intern("call");
-
-  rb_mDL = rb_define_module("DL");
-
-  rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
-  rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
-
-  DLFuncTable = rb_hash_new();
-  init_dl_func_table();
-  rb_define_const(rb_mDL, "FuncTable", DLFuncTable);
-
-  rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
-  rb_define_const(rb_mDL, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
-  rb_define_const(rb_mDL, "RTLD_NOW",    INT2NUM(RTLD_NOW));
-
-  rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
-  rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
-  rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
-  rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
-  rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
-  rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-
-  rb_define_const(rb_mDL, "MAX_ARG", INT2NUM(MAX_ARG));
-  rb_define_const(rb_mDL, "DLSTACK", rb_tainted_str_new2(DLSTACK_METHOD));
-
-  rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
-  rb_define_module_function(rb_mDL, "callback", rb_dl_callback, -1);
-  rb_define_module_function(rb_mDL, "define_callback", rb_dl_callback, -1);
-  rb_define_module_function(rb_mDL, "remove_callback", rb_dl_remove_callback, 1);
-  rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
-  rb_define_module_function(rb_mDL, "strdup", rb_dl_strdup, 1);
-  rb_define_module_function(rb_mDL, "sizeof", rb_dl_sizeof, 1);
-
-  Init_dlptr();
-  Init_dlsym();
-  Init_dlhandle();
-
-  rb_define_const(rb_mDL, "FREE", rb_dlsym_new(dlfree, "free", "0P"));
-
-  rb_define_method(rb_cString, "to_ptr", rb_str_to_ptr, 0);
-  rb_define_method(rb_cArray, "to_ptr", rb_ary_to_ptr, -1);
-  rb_define_method(rb_cIO, "to_ptr", rb_io_to_ptr, 0);
+Init_dl(void)
+{
+    void Init_dlhandle(void);
+    void Init_dlcfunc(void);
+    void Init_dlptr(void);
+
+    rbdl_id_cdecl = rb_intern_const("cdecl");
+    rbdl_id_stdcall = rb_intern_const("stdcall");
+
+    rb_mDL = rb_define_module("DL");
+    rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
+    rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
+
+    rb_define_const(rb_mDL, "MAX_CALLBACK", INT2NUM(MAX_CALLBACK));
+    rb_define_const(rb_mDL, "DLSTACK_SIZE", INT2NUM(DLSTACK_SIZE));
+
+    rb_dl_init_callbacks(rb_mDL);
+
+    rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
+    rb_define_const(rb_mDL, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
+    rb_define_const(rb_mDL, "RTLD_NOW",    INT2NUM(RTLD_NOW));
+
+    rb_define_const(rb_mDL, "TYPE_VOID",  INT2NUM(DLTYPE_VOID));
+    rb_define_const(rb_mDL, "TYPE_VOIDP",  INT2NUM(DLTYPE_VOIDP));
+    rb_define_const(rb_mDL, "TYPE_CHAR",  INT2NUM(DLTYPE_CHAR));
+    rb_define_const(rb_mDL, "TYPE_SHORT",  INT2NUM(DLTYPE_SHORT));
+    rb_define_const(rb_mDL, "TYPE_INT",  INT2NUM(DLTYPE_INT));
+    rb_define_const(rb_mDL, "TYPE_LONG",  INT2NUM(DLTYPE_LONG));
+#if HAVE_LONG_LONG
+    rb_define_const(rb_mDL, "TYPE_LONG_LONG",  INT2NUM(DLTYPE_LONG_LONG));
+#endif
+    rb_define_const(rb_mDL, "TYPE_FLOAT",  INT2NUM(DLTYPE_FLOAT));
+    rb_define_const(rb_mDL, "TYPE_DOUBLE",  INT2NUM(DLTYPE_DOUBLE));
+
+    rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
+    rb_define_const(rb_mDL, "ALIGN_CHAR",  INT2NUM(ALIGN_CHAR));
+    rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
+    rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
+    rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
+#if HAVE_LONG_LONG
+    rb_define_const(rb_mDL, "ALIGN_LONG_LONG",  INT2NUM(ALIGN_LONG_LONG));
+#endif
+    rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
+    rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
+
+    rb_define_const(rb_mDL, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
+    rb_define_const(rb_mDL, "SIZEOF_CHAR",  INT2NUM(sizeof(char)));
+    rb_define_const(rb_mDL, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
+    rb_define_const(rb_mDL, "SIZEOF_INT",   INT2NUM(sizeof(int)));
+    rb_define_const(rb_mDL, "SIZEOF_LONG",  INT2NUM(sizeof(long)));
+#if HAVE_LONG_LONG
+    rb_define_const(rb_mDL, "SIZEOF_LONG_LONG",  INT2NUM(sizeof(LONG_LONG)));
+#endif
+    rb_define_const(rb_mDL, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
+    rb_define_const(rb_mDL, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
+
+    rb_define_module_function(rb_mDL, "dlwrap", rb_dl_value2ptr, 1);
+    rb_define_module_function(rb_mDL, "dlunwrap", rb_dl_ptr2value, 1);
+
+    rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
+    rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
+    rb_define_module_function(rb_mDL, "realloc", rb_dl_realloc, 2);
+    rb_define_module_function(rb_mDL, "free", rb_dl_free, 1);
+
+    rb_define_const(rb_mDL, "RUBY_FREE", PTR2NUM(ruby_xfree));
+    rb_define_const(rb_mDL, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
+    rb_define_const(rb_mDL, "BUILD_RUBY_VERSION",  rb_str_new2(RUBY_VERSION));
+
+    Init_dlhandle();
+    Init_dlcfunc();
+    Init_dlptr();
 }
diff --git a/ext/dl/dl.def b/ext/dl/dl.def
deleted file mode 100644
index cdab4af90d..0000000000
--- a/ext/dl/dl.def
+++ /dev/null
@@ -1,59 +0,0 @@
-EXPORTS
-Init_dl
-dlfree
-dlmalloc
-dlrealloc
-dlstrdup
-rb_ary_to_ptr
-rb_dl_dlopen
-rb_dl_malloc
-rb_dl_strdup
-rb_eDLError
-rb_eDLTypeError
-rb_io_to_ptr
-rb_mDL
-rb_str_to_ptr
-Init_dlhandle
-rb_cDLHandle
-rb_dlhandle_close
-rb_dlhandle_disable_close
-rb_dlhandle_enable_close
-rb_dlhandle_sym
-Init_dlptr
-rb_cDLPtrData
-rb_dlmem_each
-rb_dlptr2cptr
-rb_dlptr_malloc
-rb_dlptr_aref
-rb_dlptr_aset
-rb_dlptr_cmp
-rb_dlptr_define_data_type
-rb_dlptr_define_struct
-rb_dlptr_define_union
-rb_dlptr_eql
-rb_dlptr_free_get
-rb_dlptr_free_set
-rb_dlptr_get_data_type
-rb_dlptr_inspect
-rb_dlptr_minus
-rb_dlptr_new
-rb_dlptr_new2
-rb_dlptr_null_p
-rb_dlptr_plus
-rb_dlptr_ptr
-rb_dlptr_ref
-rb_dlptr_to_array
-rb_dlptr_to_i
-rb_dlptr_to_s
-rb_dlptr_to_str
-rb_mDLMemorySpace
-Init_dlsym
-rb_cDLSymbol
-rb_dlsym2csym
-rb_dlsym_call
-rb_dlsym_cproto
-rb_dlsym_inspect
-rb_dlsym_name
-rb_dlsym_new
-rb_dlsym_proto
-rb_dlsym_to_ptr
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index 1faa316cf1..2b3b1f827e 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -1,12 +1,11 @@
-/* -*- C -*-
- * $Id$
- */
-
 #ifndef RUBY_DL_H
 #define RUBY_DL_H
 
 #include <ruby.h>
-#include <dlconfig.h>
+
+#if !defined(FUNC_CDECL)
+#  define FUNC_CDECL(x) x
+#endif
 
 #if defined(HAVE_DLFCN_H)
 # include <dlfcn.h>
@@ -21,11 +20,10 @@
 #define RTLD_NOW 0
 #endif
 #else
-# if defined(HAVE_WINDOWS_H)
+# if defined(_WIN32)
 #   include <windows.h>
-#   define dlclose(ptr) FreeLibrary((HINSTANCE)ptr)
 #   define dlopen(name,flag) ((void*)LoadLibrary(name))
-#   define dlerror()    "unknown error"
+#   define dlerror() strerror(rb_w32_map_errno(GetLastError()))
 #   define dlsym(handle,name) ((void*)GetProcAddress(handle,name))
 #   define RTLD_LAZY -1
 #   define RTLD_NOW  -1
@@ -33,281 +31,194 @@
 # endif
 #endif
 
-#if !defined(StringValue)
-# define StringValue(v) if(TYPE(v) != T_STRING) v = rb_str_to_str(v)
-#endif
-#if !defined(StringValuePtr)
-# define StringValuePtr(v) RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr
-#endif
-
-#ifdef DEBUG
-#define DEBUG_CODE(b) {printf("DEBUG:%d\n",__LINE__);b;}
-#define DEBUG_CODE2(b1,b2) {printf("DEBUG:%d\n",__LINE__);b1;}
-#else
-#define DEBUG_CODE(b)
-#define DEBUG_CODE2(b1,b2) b2
-#endif
-
-#define VOID_DLTYPE   0x00
-#define CHAR_DLTYPE   0x01
-#define SHORT_DLTYPE  0x02
-#define INT_DLTYPE    0x03
-#define LONG_DLTYPE   0x04
-#define FLOAT_DLTYPE  0x05
-#define DOUBLE_DLTYPE 0x06
-#define VOIDP_DLTYPE  0x07
-
-#define ARG_TYPE(x,i) (((x) & (0x07 << ((i)*3))) >> ((i)*3))
-#define PUSH_ARG(x,t) do{x <<= 3; x |= t;}while(0)
-#define PUSH_0(x) PUSH_ARG(x,VOID_DLTYPE)
-
-#if SIZEOF_INT == SIZEOF_LONG
-# define PUSH_I(x) PUSH_ARG(x,LONG_DLTYPE)
-# define ANY2I(x)  x.l
-# define DLINT(x)  (long)x
-#else
-# define PUSH_I(x) PUSH_ARG(x,INT_DLTYPE)
-# define ANY2I(x)  x.i
-# define DLINT(x)  (int)x
-#endif
-#define PUSH_L(x) PUSH_ARG(x,LONG_DLTYPE)
-#define ANY2L(x)  x.l
-#define DLLONG(x) (long)x
-
-#if defined(WITH_TYPE_FLOAT)
-# if SIZEOF_FLOAT == SIZEOF_DOUBLE
-#   define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-#   define ANY2F(x)  (x.d)
-#   define DLFLOAT(x) ((double)x)
-# else
-#   define PUSH_F(x) PUSH_ARG(x,FLOAT_DLTYPE)
-#   define ANY2F(x)  (x.f)
-#   define DLFLOAT(x) ((float)x)
-# endif
-#else
-# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-# define ANY2F(x)  (x.d)
-# define DLFLOAT(x) ((double)x)
-#endif
-#define PUSH_D(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-#define ANY2D(x)  (x.d)
-#define DLDOUBLE(x) ((double)x)
-
-#if SIZEOF_INT == SIZEOF_VOIDP && SIZEOF_INT != SIZEOF_LONG
-# define PUSH_P(x) PUSH_ARG(x,INT_DLTYPE)
-# define ANY2P(x)  (x.i)
-# define DLVOIDP(x) ((int)x)
-#elif SIZEOF_LONG == SIZEOF_VOIDP
-# define PUSH_P(x) PUSH_ARG(x,LONG_DLTYPE)
-# define ANY2P(x)  (x.l)
-# define DLVOIDP(x) ((long)x)
-#else
-# define PUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
-# define ANY2P(x)  (x.p)
-# define DLVOIDP(x) ((void*)p)
-#endif
+#define MAX_CALLBACK 5
+#define DLSTACK_TYPE SIGNED_VALUE
+#define DLSTACK_SIZE (20)
+#define DLSTACK_PROTO \
+    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
+    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
+    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
+    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE
+#define DLSTACK_ARGS(stack) \
+    stack[0],stack[1],stack[2],stack[3],stack[4],\
+    stack[5],stack[6],stack[7],stack[8],stack[9],\
+    stack[10],stack[11],stack[12],stack[13],stack[14],\
+    stack[15],stack[16],stack[17],stack[18],stack[19]
+
+#define DLSTACK_PROTO0_ void
+#define DLSTACK_PROTO1_ DLSTACK_TYPE
+#define DLSTACK_PROTO2_ DLSTACK_PROTO1_, DLSTACK_TYPE
+#define DLSTACK_PROTO3_ DLSTACK_PROTO2_, DLSTACK_TYPE
+#define DLSTACK_PROTO4_ DLSTACK_PROTO3_, DLSTACK_TYPE
+#define DLSTACK_PROTO4_ DLSTACK_PROTO3_, DLSTACK_TYPE
+#define DLSTACK_PROTO5_ DLSTACK_PROTO4_, DLSTACK_TYPE
+#define DLSTACK_PROTO6_ DLSTACK_PROTO5_, DLSTACK_TYPE
+#define DLSTACK_PROTO7_ DLSTACK_PROTO6_, DLSTACK_TYPE
+#define DLSTACK_PROTO8_ DLSTACK_PROTO7_, DLSTACK_TYPE
+#define DLSTACK_PROTO9_ DLSTACK_PROTO8_, DLSTACK_TYPE
+#define DLSTACK_PROTO10_ DLSTACK_PROTO9_, DLSTACK_TYPE
+#define DLSTACK_PROTO11_ DLSTACK_PROTO10_, DLSTACK_TYPE
+#define DLSTACK_PROTO12_ DLSTACK_PROTO11_, DLSTACK_TYPE
+#define DLSTACK_PROTO13_ DLSTACK_PROTO12_, DLSTACK_TYPE
+#define DLSTACK_PROTO14_ DLSTACK_PROTO13_, DLSTACK_TYPE
+#define DLSTACK_PROTO14_ DLSTACK_PROTO13_, DLSTACK_TYPE
+#define DLSTACK_PROTO15_ DLSTACK_PROTO14_, DLSTACK_TYPE
+#define DLSTACK_PROTO16_ DLSTACK_PROTO15_, DLSTACK_TYPE
+#define DLSTACK_PROTO17_ DLSTACK_PROTO16_, DLSTACK_TYPE
+#define DLSTACK_PROTO18_ DLSTACK_PROTO17_, DLSTACK_TYPE
+#define DLSTACK_PROTO19_ DLSTACK_PROTO18_, DLSTACK_TYPE
+#define DLSTACK_PROTO20_ DLSTACK_PROTO19_, DLSTACK_TYPE
 
-#if defined(WITH_TYPE_CHAR)
-# define PUSH_C(x) PUSH_ARG(x,CHAR_DLTYPE)
-# define ANY2C(x)  (x.c)
-# define DLCHAR(x) ((char)x)
-#else
-# define PUSH_C(x) PUSH_I(x)
-# define ANY2C(x)  ANY2I(x)
-# define DLCHAR(x) DLINT(x)
-#endif
-
-#if defined(WITH_TYPE_SHORT)
-# define PUSH_H(x) PUSH_ARG(x,SHORT_DLTYPE)
-# define ANY2H(x)  (x.h)
-# define DLSHORT(x) ((short)x)
-#else
-# define PUSH_H(x) PUSH_I(x)
-# define ANY2H(x)  ANY2I(x)
-# define DLSHORT(x) DLINT(x)
-#endif
-
-#define PUSH_S(x) PUSH_P(x)
-#define ANY2S(x) ANY2P(x)
-#define DLSTR(x) DLVOIDP(x)
-
-#define CBPUSH_0(x) PUSH_0(x)
-#define CBPUSH_C(x) PUSH_C(x)
-#define CBPUSH_H(x) PUSH_H(x)
-#define CBPUSH_I(x) PUSH_I(x)
-#define CBPUSH_L(x) PUSH_L(x)
-#define CBPUSH_F(x) PUSH_F(x)
-#define CBPUSH_D(x) PUSH_D(x)
-#if defined(WITH_CBTYPE_VOIDP)
-# define CBPUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
-#else
-# define CBPUSH_P(x) PUSH_P(x)
-#endif
-
-
-#if defined(USE_INLINE_ASM)
-# if defined(__i386__) && defined(__GNUC__)
-#   define DLSTACK
-#   define DLSTACK_METHOD "asm"
-#   define DLSTACK_REVERSE
-#   define DLSTACK_PROTO
-#   define DLSTACK_ARGS
-#   define DLSTACK_START(sym)
-#   define DLSTACK_END(sym)
-#   define DLSTACK_PUSH_C(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_H(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_I(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_L(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_P(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_F(x) asm volatile ("flds %0"::"g"(x));\
-                             asm volatile ("subl $4,%esp");\
-                             asm volatile ("fstps (%esp)");
-#   define DLSTACK_PUSH_D(x) asm volatile ("fldl %0"::"g"(x));\
-                             asm volatile ("subl $8,%esp");\
-                             asm volatile ("fstpl (%esp)")
-# else
-# error --with-asm is not supported on this machine
-# endif
-#elif defined(USE_DLSTACK)
-# define DLSTACK
-# define DLSTACK_GUARD
-# define DLSTACK_METHOD "dl"
-# define DLSTACK_PROTO long,long,long,long,long,\
-                       long,long,long,long,long,\
-                       long,long,long,long,long
-# define DLSTACK_ARGS  stack[0],stack[1],stack[2],stack[3],stack[4],\
-                       stack[5],stack[6],stack[7],stack[8],stack[9],\
-                       stack[10],stack[11],stack[12],stack[13],stack[14]
-# define DLSTACK_SIZE  (sizeof(long)*15)
-# define DLSTACK_START(sym)
-# define DLSTACK_END(sym)
-# define DLSTACK_PUSH_C(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_H(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_I(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_L(x)  memcpy(sp,&x,sizeof(long)); sp++;
-# define DLSTACK_PUSH_P(x)  memcpy(sp,&x,sizeof(void*)); sp++;
-# define DLSTACK_PUSH_F(x)  memcpy(sp,&x,sizeof(float)); sp+=sizeof(float)/sizeof(long);
-# define DLSTACK_PUSH_D(x)  memcpy(sp,&x,sizeof(double)); sp+=sizeof(double)/sizeof(long);
-#else
-# define DLSTACK_METHOD "none"
-#endif
+/*
+ * Add ",..." as the last argument.
+ * This is required for variable argument functions such
+ * as fprintf() on x86_64-linux.
+ *
+ * http://refspecs.linuxfoundation.org/elf/x86_64-abi-0.95.pdf
+ * page 19:
+ *
+ *   For calls that may call functions that use varargs or stdargs
+ *   (prototype-less calls or calls to functions containing ellipsis
+ *   (...) in the declaration) %al is used as hidden argument to
+ *   specify the number of SSE registers used.
+ */
+#define DLSTACK_PROTO0 void
+#define DLSTACK_PROTO1 DLSTACK_PROTO1_, ...
+#define DLSTACK_PROTO2 DLSTACK_PROTO2_, ...
+#define DLSTACK_PROTO3 DLSTACK_PROTO3_, ...
+#define DLSTACK_PROTO4 DLSTACK_PROTO4_, ...
+#define DLSTACK_PROTO4 DLSTACK_PROTO4_, ...
+#define DLSTACK_PROTO5 DLSTACK_PROTO5_, ...
+#define DLSTACK_PROTO6 DLSTACK_PROTO6_, ...
+#define DLSTACK_PROTO7 DLSTACK_PROTO7_, ...
+#define DLSTACK_PROTO8 DLSTACK_PROTO8_, ...
+#define DLSTACK_PROTO9 DLSTACK_PROTO9_, ...
+#define DLSTACK_PROTO10 DLSTACK_PROTO10_, ...
+#define DLSTACK_PROTO11 DLSTACK_PROTO11_, ...
+#define DLSTACK_PROTO12 DLSTACK_PROTO12_, ...
+#define DLSTACK_PROTO13 DLSTACK_PROTO13_, ...
+#define DLSTACK_PROTO14 DLSTACK_PROTO14_, ...
+#define DLSTACK_PROTO14 DLSTACK_PROTO14_, ...
+#define DLSTACK_PROTO15 DLSTACK_PROTO15_, ...
+#define DLSTACK_PROTO16 DLSTACK_PROTO16_, ...
+#define DLSTACK_PROTO17 DLSTACK_PROTO17_, ...
+#define DLSTACK_PROTO18 DLSTACK_PROTO18_, ...
+#define DLSTACK_PROTO19 DLSTACK_PROTO19_, ...
+#define DLSTACK_PROTO20 DLSTACK_PROTO20_, ...
+
+#define DLSTACK_ARGS0(stack)
+#define DLSTACK_ARGS1(stack) stack[0]
+#define DLSTACK_ARGS2(stack) DLSTACK_ARGS1(stack), stack[1]
+#define DLSTACK_ARGS3(stack) DLSTACK_ARGS2(stack), stack[2]
+#define DLSTACK_ARGS4(stack) DLSTACK_ARGS3(stack), stack[3]
+#define DLSTACK_ARGS5(stack) DLSTACK_ARGS4(stack), stack[4]
+#define DLSTACK_ARGS6(stack) DLSTACK_ARGS5(stack), stack[5]
+#define DLSTACK_ARGS7(stack) DLSTACK_ARGS6(stack), stack[6]
+#define DLSTACK_ARGS8(stack) DLSTACK_ARGS7(stack), stack[7]
+#define DLSTACK_ARGS9(stack) DLSTACK_ARGS8(stack), stack[8]
+#define DLSTACK_ARGS10(stack) DLSTACK_ARGS9(stack), stack[9]
+#define DLSTACK_ARGS11(stack) DLSTACK_ARGS10(stack), stack[10]
+#define DLSTACK_ARGS12(stack) DLSTACK_ARGS11(stack), stack[11]
+#define DLSTACK_ARGS13(stack) DLSTACK_ARGS12(stack), stack[12]
+#define DLSTACK_ARGS14(stack) DLSTACK_ARGS13(stack), stack[13]
+#define DLSTACK_ARGS15(stack) DLSTACK_ARGS14(stack), stack[14]
+#define DLSTACK_ARGS16(stack) DLSTACK_ARGS15(stack), stack[15]
+#define DLSTACK_ARGS17(stack) DLSTACK_ARGS16(stack), stack[16]
+#define DLSTACK_ARGS18(stack) DLSTACK_ARGS17(stack), stack[17]
+#define DLSTACK_ARGS19(stack) DLSTACK_ARGS18(stack), stack[18]
+#define DLSTACK_ARGS20(stack) DLSTACK_ARGS19(stack), stack[19]
 
 extern VALUE rb_mDL;
-extern VALUE rb_mDLMemorySpace;
 extern VALUE rb_cDLHandle;
 extern VALUE rb_cDLSymbol;
-extern VALUE rb_cDLPtrData;
-extern VALUE rb_cDLStructData;
-
 extern VALUE rb_eDLError;
 extern VALUE rb_eDLTypeError;
 
-#if defined(LONG2NUM) && (SIZEOF_LONG == SIZEOF_VOIDP)
-# define DLLONG2NUM(x) LONG2NUM((long)x)
-# define DLNUM2LONG(x) (long)(NUM2LONG(x))
-#else
-# define DLLONG2NUM(x) INT2NUM((long)x)
-# define DLNUM2LONG(x) (long)(NUM2INT(x))
-#endif
-
 typedef struct { char c; void *x; } s_voidp;
 typedef struct { char c; short x; } s_short;
 typedef struct { char c; int x; } s_int;
 typedef struct { char c; long x; } s_long;
 typedef struct { char c; float x; } s_float;
 typedef struct { char c; double x; } s_double;
+#if HAVE_LONG_LONG
+typedef struct { char c; LONG_LONG x; } s_long_long;
+#endif
 
 #define ALIGN_VOIDP  (sizeof(s_voidp) - sizeof(void *))
 #define ALIGN_SHORT  (sizeof(s_short) - sizeof(short))
+#define ALIGN_CHAR   (1)
 #define ALIGN_INT    (sizeof(s_int) - sizeof(int))
 #define ALIGN_LONG   (sizeof(s_long) - sizeof(long))
+#if HAVE_LONG_LONG
+#define ALIGN_LONG_LONG (sizeof(s_long_long) - sizeof(LONG_LONG))
+#endif
 #define ALIGN_FLOAT  (sizeof(s_float) - sizeof(float))
 #define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
 
-/* for compatibility */
-#define VOIDP_ALIGN  ALIGN_VOIDP
-#define SHORT_ALIGN  ALIGN_SHORT
-#define INT_ALIGN    ALIGN_INT
-#define LONG_ALIGN   ALIGN_LONG
-#define FLOAT_ALIGN  ALIGN_FLOAT
-#define DOUBLE_ALIGN ALIGN_DOUBLE
-
 #define DLALIGN(ptr,offset,align) {\
   while( (((unsigned long)((char *)ptr + offset)) % align) != 0 ) offset++;\
 }
 
-typedef void (*freefunc_t)(void *);
-#define DLFREEFUNC(func) ((freefunc_t)(func))
 
-typedef union {
-  void*  p;
-  char   c;
-  short  h;
-  int    i;
-  long   l;
-  float  f;
-  double d;
-  char  *s;
-} ANY_TYPE;
+#define DLTYPE_VOID  0
+#define DLTYPE_VOIDP 1
+#define DLTYPE_CHAR  2
+#define DLTYPE_SHORT 3
+#define DLTYPE_INT   4
+#define DLTYPE_LONG  5
+#if HAVE_LONG_LONG
+#define DLTYPE_LONG_LONG 6
+#endif
+#define DLTYPE_FLOAT 7
+#define DLTYPE_DOUBLE 8
+#define MAX_DLTYPE 9
+
+#if SIZEOF_VOIDP == SIZEOF_LONG
+# define PTR2NUM(x)   (ULONG2NUM((unsigned long)(x)))
+# define NUM2PTR(x)   ((void*)(NUM2ULONG(x)))
+#else
+/* # error --->> Ruby/DL2 requires sizeof(void*) == sizeof(long) to be compiled. <<--- */
+# define PTR2NUM(x)   (ULL2NUM((unsigned long long)(x)))
+# define NUM2PTR(x)   ((void*)(NUM2ULL(x)))
+#endif
+
+#define BOOL2INT(x)  ((x == Qtrue)?1:0)
+#define INT2BOOL(x)  (x?Qtrue:Qfalse)
+
+typedef void (*freefunc_t)(void*);
 
 struct dl_handle {
-  void *ptr;
-  int  open;
-  int  enable_close;
+    void *ptr;
+    int  open;
+    int  enable_close;
 };
 
-struct sym_data {
-  void *func;
-  char *name;
-  char *type;
-  int  len;
-};
 
-enum DLPTR_CTYPE {
-  DLPTR_CTYPE_UNKNOWN,
-  DLPTR_CTYPE_STRUCT,
-  DLPTR_CTYPE_UNION
+struct cfunc_data {
+    void *ptr;
+    char *name;
+    int  type;
+    ID   calltype;
 };
+extern ID rbdl_id_cdecl;
+extern ID rbdl_id_stdcall;
+#define CFUNC_CDECL   (rbdl_id_cdecl)
+#define CFUNC_STDCALL (rbdl_id_stdcall)
 
 struct ptr_data {
-  void *ptr;       /* a pointer to the data */
-  freefunc_t free; /* free() */
-  char *stype;      /* array of type specifiers */
-  int  *ssize;      /* size[i] = sizeof(type[i]) > 0 */
-  int  slen;   /* the number of type specifiers */
-  ID   *ids;
-  int  ids_num;
-  int  ctype; /* DLPTR_CTYPE_UNKNOWN, DLPTR_CTYPE_STRUCT, DLPTR_CTYPE_UNION */
-  long size;
+    void *ptr;
+    long size;
+    freefunc_t free;
 };
 
-#define RDLPTR(obj)  ((struct ptr_data *)(DATA_PTR(obj)))
-#define RDLSYM(obj)  ((struct sym_data *)(DATA_PTR(obj)))
-
-void dlfree(void*);
-void *dlmalloc(size_t);
-void *dlrealloc(void*,size_t);
-char *dlstrdup(const char *);
-size_t dlsizeof(const char *);
-
-void *rb_ary2cary(char t, VALUE ary, long *size);
-
-/*
-void rb_dlmem_delete(void *ptr);
-void rb_dlmem_aset(void *ptr, VALUE obj);
-VALUE rb_dlmem_aref(void *ptr);
-*/
-
-void dlptr_free(struct ptr_data *data);
-void dlptr_init(VALUE val);
+#define RDL_HANDLE(obj) ((struct dl_handle *)(DATA_PTR(obj)))
+#define RCFUNC_DATA(obj) ((struct cfunc_data *)(DATA_PTR(obj)))
+#define RPTR_DATA(obj) ((struct ptr_data *)(DATA_PTR(obj)))
 
+VALUE rb_dlcfunc_new(void (*func)(), int dltype, const char * name, ID calltype);
+int rb_dlcfunc_kind_p(VALUE func);
 VALUE rb_dlptr_new(void *ptr, long size, freefunc_t func);
 VALUE rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func);
 VALUE rb_dlptr_malloc(long size, freefunc_t func);
-void *rb_dlptr2cptr(VALUE val);
 
-VALUE rb_dlsym_new(void (*func)(), const char *name, const char *type);
-freefunc_t rb_dlsym2csym(VALUE val);
-
-
-#endif /* RUBY_DL_H */
+#endif
diff --git a/ext/dl/doc/dl.txt b/ext/dl/doc/dl.txt
deleted file mode 100644
index 893bd21d79..0000000000
--- a/ext/dl/doc/dl.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-=begin
-
-= Ruby/DL
-
-Ruby/DL provides an interface to the dynamic linker such as dlopen() on UNIX
-and LoadLibrary() on Windows.
-
-= Building and Installing
-
-  $ ruby extconf.rb    # to create the Makefile
-  $ make               # to build the library 'dl.so'
-  $ make libtest.so    # to build the C library 'libtest.so' for the test script
-  $ make test          # to run the test script
-  $ make install       # to install the library
-  $ make clean         # to remove the created files without Makefile
-  $ make distclean     # to remove the all created files
-
-= Using Ruby/DL
-
-We should usually use DL::Importable module provided by "dl/import.rb".
-It has high-level functions to access library functions. We use
-DL::Importable module to extend a module as follows:
-
-  require "dl/import"
-  module LIBC
-    extend DL::Importable
-  end
-
-Now we can use methods dlload and extern in this module. We load the
-libraries using dlload, and define wrapper methods to library functions
-using extern respectively as follows:
-
-  module LIBC
-    extend DL::Importable
-    dlload "libc.so.6","libm.so.6"
-    extern "int strlen(char*)"
-  end
-  # Note that we should not include the module LIBC from some reason.
-
-We can call the library function strlen() using LIBC.strlen. If the first
-character of given function name is an uppercase, the first character of the
-defined method name becomes lowercase.
-We can also construct memory images of structures and unions using functions
-struct and union which are defined in "dl/struct.rb" as follows:
-
-  require "dl/import"
-  require "dl/struct"
-  module LIBC
-    extend DL::Importable
-    Timeval = struct [       # define timeval structure.
-      "long tv_sec",
-      "long tv_uses",
-    ]
-  end
-  val = LIBC::Timeval.malloc # allocate memory.
-
-Notice that the above example takes LIBC::Timeval.malloc to allocate memory,
-rather than LIBC::Timeval.new. It is because DL::Timeval.new is for wrapping
-an object, PtrData, which has already been created.
-
-We can define a callback using the module function "callback" as follows:
-
-  module Foo
-    extend DL::Importable
-    def my_comp(str1,str2)
-      str1 <=> str2
-    end
-    COMPARE = callback "int my_comp(char*,char*)"
-  end
-
-where Foo::COMPARE is a Symbol object which invokes the method "my_comp".
-
-DL::Importable module is very useful. However, we sometimes encounter a case
-that we must directly use low-level functions such as dlsym(). In such case,
-we would use DL module functions. They are described in next section.
-
-= DL module
-
-Module DL consists of three classes, a few module functions and constants.
-The class Symbol represents the symbol we can call. The class PtrData
-indicates a memory block such as a pointer in C. An object instantiated from
-the class Handle keeps a handle to opened library.
-
-== Constants
-
-* VERSION
-* MAJOR_VERSION
-* MINOR_VERSION
-* PATCH_VERSION
-* RTLD_GLOBAL
-* RTLD_LAZY
-* RTLD_NOW
-* MAX_ARG
-* MAX_CBARG
-* MAX_CBENT
-
-== Functions
-
-* handle = dlopen(lib){|handle| ... }
-  * is quite equal to `Handle.new(lib)'
-
-* sym = set_callback(cbtype, entry){|args| ... }
-* sym = set_callback(cbtype, entry, proc)
-  * makes entry-th pre-defined function to call the proc or given block. the 
-    entry-th pre-defined function is specified by cbtype and entry. cbtype is a
-    prototype of the callback. see also the section `Type specifiers' about 
-    cbtype.
-
-* sym = get_callback(cbtype, entry)
-  * returns the Proc object which is given by the above function
-   `set_callback'.
-
-* ptr = malloc(size, [free = nil])
-  * allocates the size bytes, and returns the pointer as a PtrData object ptr.
-
-* ptr = strdup(str)
-  * returns a PtrData object ptr which represents the pointer to a new string
-    which is a duplicate of the string str.
-
-* size = sizeof(type)
-  * returns the size of type. `sizeof("C") + sizeof("L")' is not equal to
-    `sizeof("CL")'. the latter is assumed to returns the enough size of the
-    structure `struct foo { char c; long l; }', but the size may not equal to
-    `sizeof(foo)' of C.
-
-== Handle class
-
-* handle = Handle.new(lib){|handle| ... }
-  * opens a library lib and returns a Handle object handle. if a block is
-    given, the handle is automatically closed as the block ends.
-
-* Handle#close
-  * closes the handle opened by the above Handle.new(lib).
-
-* sym = Handle#sym(func, prototype = "0"),
-  sym = Handle#[func, prototype = nil]
-
-  * obtains the pointer to a function called func and returns a Symbol object
-    or a DataPtr object. prototype is a string which consists of type
-    specifiers, it indicates the function's prototype. see also the section
-    `Type specifiers'.
-
-== Symbol class
-
-* sym = Symbol.new(addr, type = nil, name = nil)
-  * creates the Symbol object sym with the type type if type is not nil. addr
-    is the address where the function is allocated. If type is nil, it returns
-    a DataPtr object.
-
-* Symbol::char2type(char)
-  * takes a character char that represents a type and returns the type
-    specifier of the C language.
-
-* str = Symbol#proto()
-  * returns the function prototype.
-
-* str = Symbol#name()
-  * Returns the function name.
-
-* str = Symbol#cproto(),
-  str = Symbol#to_s()
-  * returns the prototype of the C language.
-
-* str = Symbol#inspect()
-  * returns the inspectable string.
-
-* r,rs = Symbol#call(arg1,arg2,...,argN),
-  r,rs = Symbol#[](arg1,arg2,...,argN)
-  * calls the function with parameters arg1, arg2, ..., argN. and the result
-    consists of the return value r and parameters rs. rs is an array.
-
-* ptr = Symbol#to_ptr
-  * returns the corresponding PtrData object ptr.
-
-== PtrData class
-
-* ptr = PtrData.new(addr, [size = 0, free = nil])
-  * returns the PtrData object representing the pointer which indicates the
-    address addr. GC frees the memory using the free function.
-
-* PtrData#free=(sym)
-  * If you specify a symbol object sym, GC frees the memory using the function
-    represented by sym.
-
-* sym = PtrData#free
-  * returns a symbol object sym which is used when GC frees the memory. it
-    usually configured by `PtrData#free=' or `PtrData.new'.
-
-* size = PtrData#size, PtrData#size=(size)
-  * gets and sets allocated size of the memory.
-
-* ary = PtrData#to_a(type, [size])
-  * returns an array of the type which specified with type. type must be one of
-    'S','P','I','L','D' and 'F'.
-
-* str = PtrData#to_s([len])
-  * returns a string which length is len. if len is omitted, the end of the
-    string is '\0'.
-
-* ptr = PtrData#ptr,+@
-  * returns the pointed value as a PtrData object ptr.
-
-* ptr = PtrData#ref,-@
-  * returns the reference as a PtrData object ptr.
-
-* ptr = PtrData#+
-  * returns the PtrData object
-
-* ptr = PtrData#-
-  * returns the PtrData object
-
-* PtrData#struct!(type, *members)
-  * defines the data type to get access to a structure member with a symbol.
-    (see also PtrData#[])
-
-* PtrData#union!(type, *members)
-  * defines the data type to get access to a union member with a symbol. (see
-    also PtrData#[])
-
-* val = PtrData#[key], PtrData#[key, num = 0]
-  * if the key is a string or symbol, this method returns the value of the
-    structure/union member which has the type defined by PtrData#
-    {struct!,union!}. if the key is a integer value and this object represents
-    the pointer ptr, it returns the value of `(ptr + key).to_s(num)'
-
-* PtrData#[key,num]=val, PtrData#[key]=val
-  * if the key is a string or symbol, this method substitute the value of the
-    structure/union member with val. if the key is a integer value and val is a
-    string, this method copies num bytes of val to the memory area ptr using
-    memcpy(3).
-
-== Type specifiers
-
-the prototype consists of the following type specifiers, first element of 
-prototype represents the type of return value, and remaining elements represent
-the type of each argument.
-
-    C : char
-    c : char *
-    H : short
-    h : short *
-    I : int
-    i : int *
-    L : long
-    l : long *
-    F : float
-    f : float *
-    D : double
-    d : double *
-    S : const char *
-    s : char *
-    A : const type[]
-    a : type[] (allocates new memory space)
-    P : void * (same as 'p')
-    p : void * (same as 'P')
-    0 : void function (this must be a first character of the prototype)
-
-the cbtype consists of type specifiers 0, C, I, H, L, F, D, S and P.
-for example:
-
-    DL.callback('IPP'){|ptr1,ptr2|
-      str1 = ptr1.ptr.to_s
-      str2 = ptr2.ptr.to_s
-      str1 <=> str2
-    }
-=end
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
index beb15ab04c..8317ac35ad 100644
--- a/ext/dl/extconf.rb
+++ b/ext/dl/extconf.rb
@@ -1,193 +1,29 @@
 require 'mkmf'
 
-begin # for the exception SystemExit
-
-$:.unshift File.dirname(__FILE__)
-require 'type'
-
-if( ARGV.include?("--help") )
-  print <<EOF
-  --help             print this messages
-  --with-type-char   strictly use type 'char'
-  --with-type-short  strictly use type 'short'
-  --with-type-float  strictly use type 'float'
-  --with-args=<max_arg>
-  --with-callback=<max_callback>
-  --enable-asm       use the embedded assembler for passing arguments.
-                     (this option is available for i386 machine now.)
-  --enable-dlstack   use a stack emulation for constructing function call.
-EOF
-  exit(0)
-end
-
-($CPPFLAGS || $CFLAGS) << " -I."
-
-if (Config::CONFIG['CC'] =~ /gcc/)  # from Win32API
+if RbConfig::CONFIG['GCC'] == 'yes'
   $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
 end
 
-$with_dlstack ||= true
-$with_asm = ! $with_dlstack
-
-$with_type_int = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_INT == SIZEOF_LONG
-#error int not needed
-#endif
-EOF
-
-$with_type_float = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_FLOAT == SIZEOF_DOUBLE
-#error float not needed
-#endif
-EOF
-
-$with_type_voidp = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_VOIDP == SIZEOF_INT || SIZEOF_VOIDP == SIZEOF_LONG
-#error void* not needed
-#endif
-EOF
-
-$with_type_char  = DLTYPE[CHAR][:sym]
-$with_type_short = DLTYPE[SHORT][:sym]
-$with_type_long  = DLTYPE[LONG][:sym]
-$with_type_double= DLTYPE[DOUBLE][:sym]
-$with_type_int   &= DLTYPE[INT][:sym]
-$with_type_float &= DLTYPE[FLOAT][:sym]
-$with_type_voidp &= DLTYPE[VOIDP][:sym]
-
-$with_type_char  = enable_config("type-char", $with_type_char)
-$with_type_short = enable_config("type-short", $with_type_short)
-$with_type_float = enable_config("type-float", $with_type_float)
-
-$with_asm        = enable_config("asm", $with_asm)
-$with_dlstack    = enable_config("dlstack", $with_dlstack)
-
-args = with_config("args")
-max_arg = nil
-if( $with_asm || $with_dlstack )
-  $with_type_char = true
-  $with_type_short = true
-  $with_type_float = true
-  max_arg = 0
-end
-if( args )
-  max_arg = args.to_i
-  if( !max_arg )
-    print("--with-args=<max_arg>\n")
-    exit(1)
-  end
-end
-max_arg   ||= 6
-
-max_callback = with_config("callback","10").to_i
-callback_types = DLTYPE.keys.length
-
-
-$dlconfig_h = <<EOF
-#define MAX_ARG           #{max_arg}
-EOF
-
-def dlc_define(const)
-  $dlconfig_h << "#if !defined(#{const})\n" +
-                 "# define #{const}\n" +
-                 "#endif\n"
-end
-
-$dlconfig_h << "#define MAX_CALLBACK #{max_callback}\n"
-$dlconfig_h << "#define CALLBACK_TYPES #{callback_types}\n"
-if( $with_dlstack )
-  $dlconfig_h << "#define USE_DLSTACK\n"
-else
-  if( $with_asm )
-    $dlconfig_h << "#define USE_INLINE_ASM\n"
-  end
-end
-if( $with_type_char )
-  $dlconfig_h << "#define WITH_TYPE_CHAR\n"
-end
-if( $with_type_short )
-  $dlconfig_h << "#define WITH_TYPE_SHORT\n"
-end
-if( $with_type_long )
-  $dlconfig_h << "#define WITH_TYPE_LONG\n"
-end
-if( $with_type_double )
-  $dlconfig_h << "#define WITH_TYPE_DOUBLE\n"
-end
-if( $with_type_float )
-  $dlconfig_h << "#define WITH_TYPE_FLOAT\n"
-end
-if( $with_type_int )
-  $dlconfig_h << "#define WITH_TYPE_INT\n"
-end
-if( $with_type_voidp )
-  $dlconfig_h << "#define WITH_TYPE_VOIDP\n"
-end
-
-if( have_header("windows.h") )
-  have_library("kernel32")
-  have_func("GetLastError", "windows.h")
-  dlc_define("HAVE_WINDOWS_H")
-  have_windows_h = true
-end
+$INSTALLFILES = [
+  ["dl.h", "$(HDRDIR)"],
+]
 
+check = true
 if( have_header("dlfcn.h") )
-  dlc_define("HAVE_DLFCN_H")
   have_library("dl")
-  have_func("dlopen")
-  have_func("dlclose")
-  have_func("dlsym")
-  if( have_func("dlerror") )
-    dlc_define("HAVE_DLERROR")
-  end
-elsif ( have_windows_h )
-  have_func("LoadLibrary")
-  have_func("FreeLibrary")
-  have_func("GetProcAddress")
+  check &&= have_func("dlopen")
+  check &&= have_func("dlclose")
+  check &&= have_func("dlsym")
+  have_func("dlerror")
+elsif( have_header("windows.h") )
+  check &&= have_func("LoadLibrary")
+  check &&= have_func("FreeLibrary")
+  check &&= have_func("GetProcAddress")
 else
-  exit(0)
-end
-
-def File.update(file, str)
-  begin
-    open(file){|f|f.read} == str
-  rescue Errno::ENOENT
-    false
-  end or open(file, "w"){|f|f.print(str)}
+  check = false
 end
 
-File.update("dlconfig.h", <<EOF)
-#ifndef DLCONFIG_H
-#define DLCONFIG_H
-#{$dlconfig_h}
-#endif /* DLCONFIG_H */
-EOF
-
-File.update("dlconfig.rb", <<EOF)
-MAX_ARG = #{max_arg}
-MAX_CALLBACK = #{max_callback}
-CALLBACK_TYPES = #{callback_types}
-DLTYPE[CHAR][:sym]  = #{$with_type_char}
-DLTYPE[SHORT][:sym] = #{$with_type_short}
-DLTYPE[INT][:sym]   = #{$with_type_int}
-DLTYPE[LONG][:sym]  = #{$with_type_long}
-DLTYPE[FLOAT][:sym] = #{$with_type_float}
-DLTYPE[DOUBLE][:sym]= #{$with_type_double}
-DLTYPE[VOIDP][:sym] = #{$with_type_voidp}
-EOF
-
-$INSTALLFILES = [
-  ["./dlconfig.h", "$(archdir)$(target_prefix)", "."],
-  ["dl.h", "$(archdir)$(target_prefix)", ""],
-]
-$cleanfiles = %w[test/test.o]
-$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb
-./dlconfig.h test/libtest.so test/*~ *~ mkmf.log]
-
-create_makefile('dl')
-rescue SystemExit
-  # do nothing
+if check
+  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
+  create_makefile("dl")
 end
diff --git a/ext/dl/h2rb b/ext/dl/h2rb
deleted file mode 100644
index 00fbd60c82..0000000000
--- a/ext/dl/h2rb
+++ /dev/null
@@ -1,500 +0,0 @@
-#!/usr/bin/env ruby
-# -*- ruby -*-
-# $Id$
-
-require 'mkmf'
-require 'ftools'
-
-$recursive = false
-$force     = false
-$conly     = true
-$inc_path  = []
-$infilename= nil
-$insert_require = true
-
-def valid_ruby_code?(code)
-  begin
-    eval("BEGIN {return true}; #{code}")
-  rescue SyntaxError
-    return false
-  end
-  return false
-end
-
-def print_usage
-  print <<EOF
-h2rb [-r] [-I <path>] [-d] [<filename>]
-EOF
-end
-
-while( ARGV[0] )
-  case( ARGV[0] )
-  when "-r"
-    ARGV.shift
-    $recursive = true
-  when "-R"
-    ARGV.shift
-    $recursive = false
-  when "-l"
-    ARGV.shift
-    $insert_require = true
-  when "-L"
-    ARGV.shift
-    $insert_require = false
-  when "-c"
-    ARGV.shift
-    $conly = true
-  when "-C"
-    ARGV.shift
-    $conly = false
-  when "-f"
-    ARGV.shift
-    $force = true
-  when "-F"
-    ARGV.shift
-    $force = false
-  when "-I"
-    ARGV.shift
-    $inc_path << ARGV.shift
-  when "-d"
-    ARGV.shift
-    $DEBUG = true
-  when "-h","--help"
-    print_usage()
-    exit 0
-  when /-.*/
-    $stderr.print("unknown option '#{ARGV[0]}'.\n")
-    print_usage()
-    exit 0
-  else
-    $infilename = ARGV.shift
-  end
-end
-
-$inc_dir = File.join(CONFIG["prefix"], "lib", "ruby",
-		     CONFIG["MAJOR"] + "." + CONFIG["MINOR"],
-		     "dl")
-
-class H2RBError < StandardError; end
-
-
-class H2RB
-  def initialize(inc_dir = nil, inc_path = nil, insert_require = nil)
-    @inc_path = inc_path || []
-    @inc_dir  = inc_dir  || '.'
-    @indent = 0
-    @parsed_files = []
-    @insert_require = insert_require || false
-  end
-
-  def find_path(file)
-    if( ! file )
-      return nil
-    end
-    if( File.exist?(file) )
-      if( file[0] == ?/ )
-	return file
-      else
-	return file
-      end
-    end
-    @inc_path.each{|path|
-    full = File.join(path, file)
-      if( File.exist?(full) )
-	return full
-      end
-    }
-    return nil
-  end
-
-  def strip_comment(line)
-    if( @commented )
-      if( e = line.index("*/") )
-	line[0..(e+1)] = ""
-	@commented = false
-      else
-	line = ""
-      end
-    else
-      if( s = line.index("/*") )
-	if( e = line.index("*/") )
-	  line[s..(e+1)] = ""
-	else
-	  line[s..-1] = ""
-	  @commented = true
-	end
-      elsif( s = line.index("//") )
-	line[s..(-1)] = ""
-      end
-    end
-      
-    line.gsub!(/\s+$/,"")
-    return line
-  end
-  
-  def up_indent
-    @indent += 1
-  end
-  
-  def down_indent
-    @indent -= 1
-    if( @indent < 0 )
-      raise
-    end
-  end
-  
-  def indent
-    "  " * @indent
-  end
-
-  def rescue_begin
-    line = "#{indent}begin"
-    up_indent
-    return line
-  end
-
-  def rescue_nameerror
-    down_indent
-    line = [
-      "#{indent}rescue NameError => e",
-      "#{indent}  raise e if( $DEBUG )",
-      "#{indent}end"].join($/)
-    return line
-  end
-
-  def parse_enum(line)
-    if( line =~ /enum\s+(\S+\s+)?\{(.+)\}/ )
-      enum_name  = $1
-      enum_block = $2
-      if( enum_name )
-	line = "#{indent}# -- enum #{enum_name}\n"
-      else
-	line = "#{indent}# -- enum\n"
-      end
-      enums = enum_block.split(/,/).collect{|e| e.strip}
-      i = 0
-      enums.each{|elem|
-	var,val = elem.split(/=/).collect{|e| e.strip}
-	if( val )
-	  i = val.to_i
-	end
-	line += "#{indent}#{var} = #{i.to_s}\n"
-	i += 1
-      }
-      line += "#{indent}# -- end of enum"
-      return line
-    else
-      return nil
-    end
-  end
-
-  def parse_define(line)
-    case line
-    when /^#\s*define\s+(\S+)\(\)/
-      line = nil
-    when /^#\s*define\s+(\S+)\((.+)\)\s+(.+)$/
-      if( @conly )
-	line = nil
-      else
-	defname = $1
-	defargs = $2
-	defval  = $3
-	if( !valid_ruby_code?(defval) )
-	  defval = "nil # #{defval}"
-	end
-	if( defname[0,1] =~ /^[A-Z]$/ )
-	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
-	else
-	  line = [
-	    "#{indent}def #{defname}(#{defargs})",
-	    "#{indent}  #{defval}",
-	    "#{indent}end"
-	  ].join("\n")
-	end
-      end
-    when /^#\s*define\s+(\S+)\((.+)\)$/
-      if( @conly )
-	line = nil
-      else
-	defname = $1
-	defargs = $2
-	defval  = nil
-	if( !valid_ruby_code?(defval) )
-	  defval = "nil # #{defval}"
-	end
-	if( defname[0,1] =~ /^[A-Z]$/ )
-	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
-	else
-	  line = [
-	    "#{indent}def #{defname}(#{defargs})",
-	    "#{indent}  #{defval}",
-	    "#{indent}end"
-	  ].join("\n")
-	end
-      end
-    when /^#\s*define\s+(\S+)\s+(.+)$/
-      defname = $1
-      defval  = $2
-      if( !valid_ruby_code?(defval) )
-	defval = "nil # #{defval}"
-      end
-      line = [rescue_begin, "#{indent}#{defname} = #{defval}", rescue_nameerror].join($/)
-    when /^#\s*define\s+(\S+)$/
-      defname = $1
-      line = "#{indent}#{defname} = nil"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_undef(line)
-    case line
-    when /^#\s*undef\s+([A-Z]\S+)$/
-      defname = $1
-      line = "#{indent}remove_const(:#{defname})"
-    when /^#\s*undef\s+(\S+)$/
-      defname = $1
-      line = "#{indent}#{defname} = nil"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_ifdef(line)
-    case line
-    when /^#\s*ifdef\s+(\S+)$/
-      defname = $1
-      line = [
-	rescue_begin,
-	"#{indent}if( defined?(#{defname}) && ! #{defname}.nil? )"].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_ifndef(line)
-    case line
-    when /^#\s*ifndef\s+(\S+)$/
-      defname = $1
-      line = [
-	rescue_begin,
-	"#{indent}if( ! defined?(#{defname}) || #{defname}.nil? )"].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_if(line)
-    case line
-    when /^#\s*if\s+(.+)$/
-      cond = $1
-      cond.gsub!(/defined(.+)/){ "defined?(#{$1}) && ! #{$1}.nil?" }
-      if( valid_ruby_code?(cond) )
-	line = "#{indent}if( #{cond} )"
-      else
-	line = "#{indent}if( false ) # #{cond}"
-      end
-      line = [rescue_begin, line].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_elif(line)
-    case line
-    when /^#\s*elif\s+(.+)$/
-      cond = $1
-      cond.gsub!("defined","defined?")
-      line = "#{indent}elsif( #{cond} )"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_else(line)
-    case line
-    when /^#\s*else\s*/
-      line = "#{indent}else"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_endif(line)
-    case line
-    when /^#\s*endif\s*$/
-      line = ["#{indent}end", rescue_nameerror].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_include(line)
-    if( ! @insert_require )
-      return nil
-    end
-
-    file = nil
-    case line
-    when /^#\s*include "(.+)"$/
-      file = $1
-      line = "#{indent}require '#{file}'"
-    when /^#\s*include \<(.+)\>$/
-      file = $1
-      line = "#{indent}require '#{file}'"
-    else
-      line = nil
-    end
-    if( @recursive && file && (!@parsed_files.include?(file)) )
-      parse(file, @recursive, @force, @conly)
-    end
-    return line
-  end
-
-
-  def open_files(infilename)
-    if( ! infilename )
-      return [$stdin, $stdout]
-    end
-
-    old_infilename = infilename
-    infilename = find_path(infilename)
-    if( ! infilename )
-      $stderr.print("'#{old_infilename}' was not found.\n")
-      return [nil,nil]
-    end
-
-    if( infilename )
-      if( infilename[0,1] == '/' )
-	outfilename = File.join(@inc_dir, infilename[1..-1] + ".rb")
-      else
-	outfilename = infilename + ".rb"
-      end
-      File.mkpath(File.dirname(outfilename))
-    else
-      outfilename = nil
-    end
-    
-    if( infilename )
-      fin    = File.open(infilename,"r")
-    else
-      fin    = $stdin
-    end
-    if( outfilename )
-      if( File.exist?(outfilename) && (!@force) )
-	$stderr.print("'#{outfilename}' have already existed.\n")
-	return [fin, nil]
-      end
-      fout   = File.open(outfilename,"w")
-    else
-      fout   = $stdout
-    end
-
-    $stderr.print("#{infilename} -> #{outfilename}\n")
-    if( fout )
-      dir = File.dirname(outfilename)
-      if( dir[0,1] != "." && dir != "" )
-	fout.print("if( ! $LOAD_PATH.include?('#{dir}') )\n",
-		   "  $LOAD_PATH.push('#{dir}')\n",
-		   "end\n")
-      end
-    end
-    return [fin,fout]
-  end
-
-  def parse(infilename = nil, recursive = false, force = false, conly = false)
-    @commented = false
-    @recursive = recursive
-    @force     = force
-    @conly     = conly
-    @parsed_files << infilename
-
-    fin,fout = open_files(infilename)
-    if( !fin )
-      return
-    end
-
-    begin
-      line_number = 0
-      pre_line    = nil
-      fin.each_line{|line|
-	line_number += 1
-	line.chop!
-	if( $DEBUG )
-	  $stderr.print("#{line_number}:(#{@indent}):", line, "\n")
-	end
-	
-	if( pre_line )
-	  line = pre_line + line
-	  pre_line = nil
-	end
-
-	if( line[-1,1] == "\\" )
-	  pre_line = line[0..-2]
-	  next
-	end
-
-	if( eidx = line.index("enum ") )
-	  pre_line = line[eidx .. -1]
-	  if( i = line.index("{") && j = line.index("}") )
-	    line = line[0..j]
-	    pre_line = nil
-	  else
-	    next
-	  end
-	end
-
-	line = strip_comment(line)
-	case line
-	when /^enum\s/
-	  line = parse_enum(line)
-	when /^#\s*define\s/
-	  line = parse_define(line)
-	when /^#\s*undef\s/
-	  line = parse_undef(line)
-	when /^#\s*ifdef\s/
-	  line = parse_ifdef(line)
-	  up_indent
-	when /^#\s*ifndef\s/
-	  line = parse_ifndef(line)
-	  up_indent
-	when /^#\s*if\s/
-	  line = parse_if(line)
-	  up_indent
-	when /^#\s*elif\s/
-	  down_indent
-	  line = parse_elif(line)
-	  up_indent
-	when /^#\s*else/
-	  down_indent
-	  line = parse_else(line)
-	  up_indent
-	when /^#\s*endif/
-	  down_indent
-	  line = parse_endif(line)
-	when /^#\s*include\s/
-	  line = parse_include(line)
-	else
-	  line = nil
-	end
-	if( line && fout )
-	  fout.print(line, "     # #{line_number}",$/)
-	end
-      }
-    ensure
-      fin.close if fin
-      fout.close if fout
-    end
-  end
-end
-
-h2rb = H2RB.new($inc_dir, $inc_path, $insert_require)
-h2rb.parse($infilename, $recursive, $force, $conly)
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 69d47caac0..d567a4f48c 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -7,209 +7,371 @@
 
 VALUE rb_cDLHandle;
 
-void
-dlhandle_free(struct dl_handle *dlhandle)
+#ifdef _WIN32
+# ifndef _WIN32_WCE
+static void *
+w32_coredll(void)
+{
+    MEMORY_BASIC_INFORMATION m;
+    memset(&m, 0, sizeof(m));
+    if( !VirtualQuery(_errno, &m, sizeof(m)) ) return NULL;
+    return m.AllocationBase;
+}
+# endif
+
+static int
+w32_dlclose(void *ptr)
+{
+# ifndef _WIN32_WCE
+    if( ptr == w32_coredll() ) return 0;
+# endif
+    if( FreeLibrary((HMODULE)ptr) ) return 0;
+    return errno = rb_w32_map_errno(GetLastError());
+}
+#define dlclose(ptr) w32_dlclose(ptr)
+#endif
+
+static void
+dlhandle_free(void *ptr)
 {
-  if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
-    dlclose(dlhandle->ptr);
-  }
+    struct dl_handle *dlhandle = ptr;
+    if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
+	dlclose(dlhandle->ptr);
+    }
+}
+
+static size_t
+dlhandle_memsize(const void *ptr)
+{
+    return ptr ? sizeof(struct dl_handle) : 0;
 }
 
+static const rb_data_type_t dlhandle_data_type = {
+    "dl/handle",
+    0, dlhandle_free, dlhandle_memsize,
+};
+
+/*
+ * call-seq: close
+ *
+ * Close this DL::Handle.  Calling close more than once will raise a
+ * DL::DLError exception.
+ */
 VALUE
 rb_dlhandle_close(VALUE self)
 {
-  struct dl_handle *dlhandle;
+    struct dl_handle *dlhandle;
 
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  dlhandle->open = 0;
-  return INT2NUM(dlclose(dlhandle->ptr));
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+    if(dlhandle->open) {
+	int ret = dlclose(dlhandle->ptr);
+	dlhandle->open = 0;
+
+	/* Check dlclose for successful return value */
+	if(ret) {
+#if defined(HAVE_DLERROR)
+	    rb_raise(rb_eDLError, "%s", dlerror());
+#else
+	    rb_raise(rb_eDLError, "could not close handle");
+#endif
+	}
+	return INT2NUM(ret);
+    }
+    rb_raise(rb_eDLError, "dlclose() called too many times");
 }
 
 VALUE
 rb_dlhandle_s_allocate(VALUE klass)
 {
-  VALUE obj;
-  struct dl_handle *dlhandle;
+    VALUE obj;
+    struct dl_handle *dlhandle;
+
+    obj = TypedData_Make_Struct(rb_cDLHandle, struct dl_handle, &dlhandle_data_type, dlhandle);
+    dlhandle->ptr  = 0;
+    dlhandle->open = 0;
+    dlhandle->enable_close = 0;
 
-  obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
-			 dlhandle_free, dlhandle);
-  dlhandle->ptr  = 0;
-  dlhandle->open = 0;
-  dlhandle->enable_close = 0;
+    return obj;
+}
+
+static VALUE
+predefined_dlhandle(void *handle)
+{
+    VALUE obj = rb_dlhandle_s_allocate(rb_cDLHandle);
+    struct dl_handle *dlhandle = DATA_PTR(obj);
 
-  return obj;
+    dlhandle->ptr = handle;
+    dlhandle->open = 1;
+    OBJ_FREEZE(obj);
+    return obj;
 }
 
+/*
+ * call-seq:
+ *    initialize(lib = nil, flags = DL::RTLD_LAZY | DL::RTLD_GLOBAL)
+ *
+ * Create a new handler that opens library named +lib+ with +flags+.  If no
+ * library is specified, RTLD_DEFAULT is used.
+ */
 VALUE
 rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
 {
-  void *ptr;
-  struct dl_handle *dlhandle;
-  VALUE lib, flag;
-  char  *clib;
-  int   cflag;
-  const char *err;
-
-  switch (rb_scan_args(argc, argv, "11", &lib, &flag)) {
-  case 1:
-    clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
-    cflag = RTLD_LAZY | RTLD_GLOBAL;
-    break;
-  case 2:
-    clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
-    cflag = NUM2INT(flag);
-    break;
-  default:
-    rb_bug("rb_dlhandle_new");
-  }
-
-  ptr = dlopen(clib, cflag);
+    void *ptr;
+    struct dl_handle *dlhandle;
+    VALUE lib, flag;
+    char  *clib;
+    int   cflag;
+    const char *err;
+
+    switch( rb_scan_args(argc, argv, "02", &lib, &flag) ){
+      case 0:
+	clib = NULL;
+	cflag = RTLD_LAZY | RTLD_GLOBAL;
+	break;
+      case 1:
+	clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+	cflag = RTLD_LAZY | RTLD_GLOBAL;
+	break;
+      case 2:
+	clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+	cflag = NUM2INT(flag);
+	break;
+      default:
+	rb_bug("rb_dlhandle_new");
+    }
+
+    rb_secure(2);
+
+#if defined(_WIN32)
+    if( !clib ){
+	HANDLE rb_libruby_handle(void);
+	ptr = rb_libruby_handle();
+    }
+    else if( STRCASECMP(clib, "libc") == 0
+# ifdef RUBY_COREDLL
+	     || STRCASECMP(clib, RUBY_COREDLL) == 0
+	     || STRCASECMP(clib, RUBY_COREDLL".dll") == 0
+# endif
+	){
+# ifdef _WIN32_WCE
+	ptr = dlopen("coredll.dll", cflag);
+# else
+	ptr = w32_coredll();
+# endif
+    }
+    else
+#endif
+	ptr = dlopen(clib, cflag);
 #if defined(HAVE_DLERROR)
-  if (!ptr && (err = dlerror())) {
-    rb_raise(rb_eRuntimeError, "%s", err);
-  }
+    if( !ptr && (err = dlerror()) ){
+	rb_raise(rb_eDLError, "%s", err);
+    }
 #else
-  if (!ptr) {
-    err = dlerror();
-    rb_raise(rb_eRuntimeError, "%s", err);
-  }
+    if( !ptr ){
+	err = dlerror();
+	rb_raise(rb_eDLError, "%s", err);
+    }
 #endif
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
-    dlclose(dlhandle->ptr);
-  }
-  dlhandle->ptr = ptr;
-  dlhandle->open = 1;
-  dlhandle->enable_close = 0;
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+    if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
+	dlclose(dlhandle->ptr);
+    }
+    dlhandle->ptr = ptr;
+    dlhandle->open = 1;
+    dlhandle->enable_close = 0;
 
-  if (rb_block_given_p()) {
-    rb_ensure(rb_yield, self, rb_dlhandle_close, self);
-  }
+    if( rb_block_given_p() ){
+	rb_ensure(rb_yield, self, rb_dlhandle_close, self);
+    }
 
-  return Qnil;
+    return Qnil;
 }
 
+/*
+ * call-seq: enable_close
+ *
+ * Enable a call to dlclose() when this DL::Handle is garbage collected.
+ */
 VALUE
 rb_dlhandle_enable_close(VALUE self)
 {
-  struct dl_handle *dlhandle;
+    struct dl_handle *dlhandle;
 
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  dlhandle->enable_close = 1;
-  return Qnil;
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+    dlhandle->enable_close = 1;
+    return Qnil;
 }
 
+/*
+ * call-seq: disable_close
+ *
+ * Disable a call to dlclose() when this DL::Handle is garbage collected.
+ */
 VALUE
 rb_dlhandle_disable_close(VALUE self)
 {
-  struct dl_handle *dlhandle;
+    struct dl_handle *dlhandle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+    dlhandle->enable_close = 0;
+    return Qnil;
+}
+
+/*
+ * call-seq: close_enabled?
+ *
+ * Returns +true+ if dlclose() will be called when this DL::Handle is
+ * garbage collected.
+ */
+static VALUE
+rb_dlhandle_close_enabled_p(VALUE self)
+{
+    struct dl_handle *dlhandle;
 
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  dlhandle->enable_close = 0;
-  return Qnil;
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+
+    if(dlhandle->enable_close) return Qtrue;
+    return Qfalse;
 }
 
+/*
+ * call-seq: to_i
+ *
+ * Returns the memory address for this handle.
+ */
 VALUE
 rb_dlhandle_to_i(VALUE self)
 {
-  struct dl_handle *dlhandle;
+    struct dl_handle *dlhandle;
 
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  return DLLONG2NUM(dlhandle);
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+    return PTR2NUM(dlhandle);
 }
 
+static VALUE dlhandle_sym(void *handle, const char *symbol);
+
+/*
+ * Document-method: sym
+ * Document-method: []
+ *
+ * call-seq: sym(name)
+ *
+ * Get the address as an Integer for the function named +name+.
+ */
 VALUE
-rb_dlhandle_to_ptr(VALUE self)
+rb_dlhandle_sym(VALUE self, VALUE sym)
 {
-  struct dl_handle *dlhandle;
+    struct dl_handle *dlhandle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+    if( ! dlhandle->open ){
+	rb_raise(rb_eDLError, "closed handle");
+    }
 
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  return rb_dlptr_new(dlhandle, sizeof(dlhandle), 0);
+    return dlhandle_sym(dlhandle->ptr, StringValueCStr(sym));
 }
 
-VALUE
-rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
-{
-  VALUE sym, type;
-  void (*func)();
-  VALUE val;
-  struct dl_handle *dlhandle;
-  void *handle;
-  const char *name, *stype;
-  const char *err;
-
-  rb_secure(2);
-  if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
-    SafeStringValue(type);
-    stype = StringValuePtr(type);
-  }
-  else{
-    stype = NULL;
-  }
-
-  if (sym == Qnil) {
-#if defined(RTLD_NEXT)
-    name = RTLD_NEXT;
-#else
-    name = NULL;
+#ifndef RTLD_NEXT
+#define RTLD_NEXT NULL
 #endif
-  }
-  else{
-    SafeStringValue(sym);
-    name = StringValuePtr(sym);
-  }
-
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  if (!dlhandle->open) {
-    rb_raise(rb_eRuntimeError, "closed handle");
-  }
-  handle = dlhandle->ptr;
-
-  func = dlsym(handle, name);
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT NULL
+#endif
+
+/*
+ * Document-method: sym
+ * Document-method: []
+ *
+ * call-seq: sym(name)
+ *
+ * Get the address as an Integer for the function named +name+.  The function
+ * is searched via dlsym on RTLD_NEXT.  See man(3) dlsym() for more info.
+ */
+VALUE
+rb_dlhandle_s_sym(VALUE self, VALUE sym)
+{
+    return dlhandle_sym(RTLD_NEXT, StringValueCStr(sym));
+}
+
+static VALUE
+dlhandle_sym(void *handle, const char *name)
+{
 #if defined(HAVE_DLERROR)
-  if (!func && (err = dlerror()))
+    const char *err;
+# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
 #else
-  if (!func)
+# define CHECK_DLERROR
 #endif
-  {
-#if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
-    {
-      int  len = strlen(name);
-      char *name_a = (char*)dlmalloc(len+2);
-      strcpy(name_a, name);
-      name_a[len]   = 'A';
-      name_a[len+1] = '\0';
-      func = dlsym(handle, name_a);
-      dlfree(name_a);
-#if defined(HAVE_DLERROR)
-      if (!func && (err = dlerror()))
+    void (*func)();
+
+    rb_secure(2);
+    func = (void (*)())(VALUE)dlsym(handle, name);
+    CHECK_DLERROR;
+#if defined(FUNC_STDCALL)
+    if( !func ){
+	int  i;
+	int  len = strlen(name);
+	char *name_n;
+#if defined(__CYGWIN__) || defined(_WIN32) || defined(__MINGW32__)
+	{
+	    char *name_a = (char*)xmalloc(len+2);
+	    strcpy(name_a, name);
+	    name_n = name_a;
+	    name_a[len]   = 'A';
+	    name_a[len+1] = '\0';
+	    func = dlsym(handle, name_a);
+	    CHECK_DLERROR;
+	    if( func ) goto found;
+	    name_n = xrealloc(name_a, len+6);
+	}
 #else
-      if (!func)
+	name_n = (char*)xmalloc(len+6);
 #endif
-      {
-	rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
-      }
+	memcpy(name_n, name, len);
+	name_n[len++] = '@';
+	for( i = 0; i < 256; i += 4 ){
+	    sprintf(name_n + len, "%d", i);
+	    func = dlsym(handle, name_n);
+	    CHECK_DLERROR;
+	    if( func ) break;
+	}
+	if( func ) goto found;
+	name_n[len-1] = 'A';
+	name_n[len++] = '@';
+	for( i = 0; i < 256; i += 4 ){
+	    sprintf(name_n + len, "%d", i);
+	    func = dlsym(handle, name_n);
+	    CHECK_DLERROR;
+	    if( func ) break;
+	}
+      found:
+	xfree(name_n);
     }
-#else
-    rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
 #endif
-  }
-  val = rb_dlsym_new(func, name, stype);
+    if( !func ){
+	rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
+    }
 
-  return val;
+    return PTR2NUM(func);
 }
 
 void
-Init_dlhandle()
-{
-  rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
-  rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
-  rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
-  rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
-  rb_define_method(rb_cDLHandle, "to_ptr", rb_dlhandle_to_ptr, 0);
-  rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
-  rb_define_method(rb_cDLHandle, "sym",  rb_dlhandle_sym, -1);
-  rb_define_method(rb_cDLHandle, "[]",  rb_dlhandle_sym, -1);
-  rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
-  rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
+Init_dlhandle(void)
+{
+    rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
+    rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
+    rb_define_singleton_method(rb_cDLHandle, "sym", rb_dlhandle_s_sym, 1);
+    rb_define_singleton_method(rb_cDLHandle, "[]", rb_dlhandle_s_sym,  1);
+    rb_define_const(rb_cDLHandle, "NEXT", predefined_dlhandle(RTLD_NEXT));
+    rb_define_const(rb_cDLHandle, "DEFAULT", predefined_dlhandle(RTLD_DEFAULT));
+    rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
+    rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
+    rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
+    rb_define_method(rb_cDLHandle, "sym",  rb_dlhandle_sym, 1);
+    rb_define_method(rb_cDLHandle, "[]",  rb_dlhandle_sym,  1);
+    rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
+    rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
+    rb_define_method(rb_cDLHandle, "close_enabled?", rb_dlhandle_close_enabled_p, 0);
 }
+
+/* mode: c; tab-with=8; sw=4; ts=8; noexpandtab: */
diff --git a/ext/dl/install.rb b/ext/dl/install.rb
deleted file mode 100644
index 69b1834301..0000000000
--- a/ext/dl/install.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'mkmf'
-require 'ftools'
-
-SO_LIBS = ["dl.so"]
-
-$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR']
-$prefix = CONFIG['prefix']
-$libdir = File.join($prefix,'lib')
-$rubylibdir = File.join($libdir, 'ruby', $ruby_version)
-$arch = CONFIG['arch']
-$archdir = File.join($rubylibdir, $arch)
-
-def find(dir, match = /./)
-  Dir.chdir(dir)
-  files = []
-  Dir.new(".").each{|file|
-    if( file != "." && file != ".." )
-      case File.ftype(file)
-      when "file"
-	if( file =~ match )
-	  files.push(File.join(dir,file))
-	end
-      when "directory"
-	files += find(file, match).collect{|f| File.join(dir,f)}
-      end
-    end
-  }
-  Dir.chdir("..")
-  return files
-end
-
-def install()
-  rb_files = find(File.join(".","lib"), /.rb$/)
-
-  SO_LIBS.each{|f|
-    File.makedirs($rubylibdir, "#{$archdir}")
-    File.install(f, File.join($archdir,f), 0555, true)
-  }
-
-  rb_files.each{|f|
-    origfile = f
-    instfile = File.join($rubylibdir, origfile.sub("./lib/",""))
-    instdir  = File.dirname(instfile)
-    File.makedirs(instdir)
-    File.install(origfile, instfile, 0644, true)
-  }
-end
-
-install()
diff --git a/ext/dl/lib/dl.rb b/ext/dl/lib/dl.rb
new file mode 100644
index 0000000000..80d46b685a
--- /dev/null
+++ b/ext/dl/lib/dl.rb
@@ -0,0 +1,12 @@
+require 'dl.so'
+
+begin
+  require 'fiddle' unless Object.const_defined?(:Fiddle)
+rescue LoadError
+end
+
+module DL
+  def self.fiddle?
+    Object.const_defined?(:Fiddle)
+  end
+end
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
new file mode 100644
index 0000000000..0863c70d4d
--- /dev/null
+++ b/ext/dl/lib/dl/callback.rb
@@ -0,0 +1,96 @@
+require 'dl'
+require 'thread'
+
+module DL
+  SEM = Mutex.new
+
+  if DL.fiddle?
+    CdeclCallbackProcs = {}
+    CdeclCallbackAddrs = {}
+    StdcallCallbackProcs = {}
+    StdcallCallbackAddrs = {}
+  end
+
+  def set_callback_internal(proc_entry, addr_entry, argc, ty, abi = nil, &cbp)
+    if( argc < 0 )
+      raise(ArgumentError, "arity should not be less than 0.")
+    end
+    addr = nil
+
+    if DL.fiddle?
+      abi ||= Fiddle::Function::DEFAULT
+      closure = Fiddle::Closure::BlockCaller.new(ty, [TYPE_VOIDP] * argc, abi, &cbp)
+      proc_entry[closure.to_i] = closure
+      addr = closure.to_i
+    else
+      SEM.synchronize{
+        ary = proc_entry[ty]
+        (0...MAX_CALLBACK).each{|n|
+          idx = (n * DLSTACK_SIZE) + argc
+          if( ary[idx].nil? )
+            ary[idx] = cbp
+            addr = addr_entry[ty][idx]
+            break
+          end
+        }
+      }
+    end
+
+    addr
+  end
+
+  def set_cdecl_callback(ty, argc, &cbp)
+    set_callback_internal(CdeclCallbackProcs, CdeclCallbackAddrs, argc, ty, &cbp)
+  end
+
+  def set_stdcall_callback(ty, argc, &cbp)
+    if DL.fiddle?
+      set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, Fiddle::Function::STDCALL, &cbp)
+    else
+      set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, &cbp)
+    end
+  end
+
+  def remove_callback_internal(proc_entry, addr_entry, addr, ctype = nil)
+    if DL.fiddle?
+      addr = addr.to_i
+      return false unless proc_entry.key?(addr)
+      proc_entry.delete(addr)
+      true
+    else
+      index = nil
+      if( ctype )
+        addr_entry[ctype].each_with_index{|xaddr, idx|
+          if( xaddr == addr )
+            index = idx
+          end
+        }
+      else
+        addr_entry.each{|ty,entry|
+          entry.each_with_index{|xaddr, idx|
+            if( xaddr == addr )
+              index = idx
+            end
+          }
+        }
+      end
+      if( index and proc_entry[ctype][index] )
+        proc_entry[ctype][index] = nil
+        return true
+      else
+        return false
+      end
+    end
+  end
+
+  def remove_cdecl_callback(addr, ctype = nil)
+    remove_callback_internal(CdeclCallbackProcs, CdeclCallbackAddrs, addr, ctype)
+  end
+
+  def remove_stdcall_callback(addr, ctype = nil)
+    remove_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, addr, ctype)
+  end
+
+  alias set_callback set_cdecl_callback
+  alias remove_callback remove_cdecl_callback
+end
diff --git a/ext/dl/lib/dl/cparser.rb b/ext/dl/lib/dl/cparser.rb
new file mode 100644
index 0000000000..210f953471
--- /dev/null
+++ b/ext/dl/lib/dl/cparser.rb
@@ -0,0 +1,109 @@
+module DL
+  module CParser
+    def parse_struct_signature(signature, tymap=nil)
+      if( signature.is_a?(String) )
+        signature = signature.split(/\s*,\s*/)
+      end
+      mems = []
+      tys  = []
+      signature.each{|msig|
+        tks = msig.split(/\s+(\*)?/)
+        ty = tks[0..-2].join(" ")
+        member = tks[-1]
+
+        case ty
+        when /\[(\d+)\]/
+          n = $1.to_i
+          ty.gsub!(/\s*\[\d+\]/,"")
+          ty = [ty, n]
+        when /\[\]/
+          ty.gsub!(/\s*\[\]/, "*")
+        end
+
+        case member
+        when /\[(\d+)\]/
+          ty = [ty, $1.to_i]
+          member.gsub!(/\s*\[\d+\]/,"")
+        when /\[\]/
+          ty = ty + "*"
+          member.gsub!(/\s*\[\]/, "")
+        end
+
+        mems.push(member)
+        tys.push(parse_ctype(ty,tymap))
+      }
+      return tys, mems
+    end
+
+    def parse_signature(signature, tymap=nil)
+      tymap ||= {}
+      signature = signature.gsub(/\s+/, " ").strip
+      case signature
+      when /^([\w@\*\s]+)\(([\w\*\s\,\[\]]*)\)$/
+        ret = $1
+        (args = $2).strip!
+        ret = ret.split(/\s+/)
+        args = args.split(/\s*,\s*/)
+        func = ret.pop
+        if( func =~ /^\*/ )
+          func.gsub!(/^\*+/,"")
+          ret.push("*")
+        end
+        ret  = ret.join(" ")
+        return [func, parse_ctype(ret, tymap), args.collect{|arg| parse_ctype(arg, tymap)}]
+      else
+        raise(RuntimeError,"can't parse the function prototype: #{signature}")
+      end
+    end
+
+    def parse_ctype(ty, tymap=nil)
+      tymap ||= {}
+      case ty
+      when Array
+        return [parse_ctype(ty[0], tymap), ty[1]]
+      when "void"
+        return TYPE_VOID
+      when "char"
+        return TYPE_CHAR
+      when "unsigned char"
+        return  -TYPE_CHAR
+      when "short"
+        return TYPE_SHORT
+      when "unsigned short"
+        return -TYPE_SHORT
+      when "int"
+        return TYPE_INT
+      when "unsigned int", 'uint'
+        return -TYPE_INT
+      when "long"
+        return TYPE_LONG
+      when "unsigned long"
+        return -TYPE_LONG
+      when "long long"
+        if( defined?(TYPE_LONG_LONG) )
+          return TYPE_LONG_LONG
+        else
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+      when "unsigned long long"
+        if( defined?(TYPE_LONG_LONG) )
+          return -TYPE_LONG_LONG
+        else
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+      when "float"
+        return TYPE_FLOAT
+      when "double"
+        return TYPE_DOUBLE
+      when /\*/, /\[\s*\]/
+        return TYPE_VOIDP
+      else
+        if( tymap[ty] )
+          return parse_ctype(tymap[ty], tymap)
+        else
+          raise(DLError, "unknown type: #{ty}")
+        end
+      end
+    end
+  end
+end
diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb
new file mode 100644
index 0000000000..3c2245f413
--- /dev/null
+++ b/ext/dl/lib/dl/func.rb
@@ -0,0 +1,187 @@
+require 'dl'
+require 'dl/callback'
+require 'dl/stack'
+require 'dl/value'
+require 'thread'
+
+module DL
+  parent = DL.fiddle? ? Fiddle::Function : Object
+
+  class Function < parent
+    include DL
+    include ValueUtil
+
+    def initialize cfunc, argtypes, abi = nil, &block
+      if DL.fiddle?
+        abi ||= Fiddle::Function::DEFAULT
+        if block_given?
+          @cfunc = Class.new(Fiddle::Closure) {
+            define_method(:call, block)
+          }.new(cfunc.ctype, argtypes)
+        else
+          @cfunc  = cfunc
+        end
+
+        @args   = argtypes
+        super(@cfunc, @args.reject { |x| x == TYPE_VOID }, cfunc.ctype, abi)
+      else
+        @cfunc = cfunc
+        @stack = Stack.new(argtypes.collect{|ty| ty.abs})
+        if( @cfunc.ctype < 0 )
+          @cfunc.ctype = @cfunc.ctype.abs
+          @unsigned = true
+        else
+          @unsigned = false
+        end
+        if block_given?
+          bind(&block)
+        end
+      end
+    end
+
+    def to_i()
+      @cfunc.to_i
+    end
+
+    def name
+      @cfunc.name
+    end
+
+    def call(*args, &block)
+      if DL.fiddle?
+        if block_given?
+          args.find { |a| DL::Function === a }.bind_at_call(&block)
+        end
+        super
+      else
+        funcs = []
+        _args = wrap_args(args, @stack.types, funcs, &block)
+        r = @cfunc.call(@stack.pack(_args))
+        funcs.each{|f| f.unbind_at_call()}
+        return wrap_result(r)
+      end
+    end
+
+    def wrap_result(r)
+      case @cfunc.ctype
+      when TYPE_VOIDP
+        r = CPtr.new(r)
+      else
+        if( @unsigned )
+          r = unsigned_value(r, @cfunc.ctype)
+        end
+      end
+      r
+    end
+
+    def bind(&block)
+      if DL.fiddle?
+        @cfunc = Class.new(Fiddle::Closure) {
+          def initialize ctype, args, block
+            super(ctype, args)
+            @block = block
+          end
+
+          def call *args
+            @block.call(*args)
+          end
+        }.new(@cfunc.ctype, @args, block)
+      else
+        if( !block )
+          raise(RuntimeError, "block must be given.")
+        end
+        if( @cfunc.ptr == 0 )
+          cb = Proc.new{|*args|
+            ary = @stack.unpack(args)
+            @stack.types.each_with_index{|ty, idx|
+              case ty
+              when TYPE_VOIDP
+                ary[idx] = CPtr.new(ary[idx])
+              end
+            }
+            r = block.call(*ary)
+            wrap_arg(r, @cfunc.ctype, [])
+          }
+          case @cfunc.calltype
+          when :cdecl
+            @cfunc.ptr = set_cdecl_callback(@cfunc.ctype, @stack.size, &cb)
+          when :stdcall
+            @cfunc.ptr = set_stdcall_callback(@cfunc.ctype, @stack.size, &cb)
+          else
+            raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
+          end
+          if( @cfunc.ptr == 0 )
+            raise(RuntimeException, "can't bind C function.")
+          end
+        end
+      end
+    end
+
+    def unbind()
+      if( @cfunc.ptr != 0 )
+        case @cfunc.calltype
+        when :cdecl
+          remove_cdecl_callback(@cfunc.ptr, @cfunc.ctype)
+        when :stdcall
+          remove_stdcall_callback(@cfunc.ptr, @cfunc.ctype)
+        else
+          raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
+        end
+        @cfunc.ptr = 0
+      end
+    end
+
+    def bound?()
+      @cfunc.ptr != 0
+    end
+
+    def bind_at_call(&block)
+      bind(&block)
+    end
+
+    def unbind_at_call()
+    end
+  end
+
+  class TempFunction < Function
+    def bind_at_call(&block)
+      bind(&block)
+    end
+
+    def unbind_at_call()
+      unbind()
+    end
+  end
+
+  class CarriedFunction < Function
+    def initialize(cfunc, argtypes, n)
+      super(cfunc, argtypes)
+      @carrier = []
+      @index = n
+      @mutex = Mutex.new
+    end
+
+    def create_carrier(data)
+      ary = []
+      userdata = [ary, data]
+      @mutex.lock()
+      @carrier.push(userdata)
+      return dlwrap(userdata)
+    end
+
+    def bind_at_call(&block)
+      userdata = @carrier[-1]
+      userdata[0].push(block)
+      bind{|*args|
+        ptr = args[@index]
+        if( !ptr )
+          raise(RuntimeError, "The index of userdata should be lower than #{args.size}.")
+        end
+        userdata = dlunwrap(Integer(ptr))
+        args[@index] = userdata[1]
+        userdata[0][0].call(*args)
+      }
+      @mutex.unlock()
+    end
+  end
+end
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index 01ee2490e8..fd23bc9676 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -1,225 +1,235 @@
-# -*- ruby -*-
-
 require 'dl'
-require 'dl/types'
+require 'dl/func.rb'
+require 'dl/struct.rb'
+require 'dl/cparser.rb'
 
 module DL
-  module Importable
-    LIB_MAP = {}
-
-    module Internal
-      def init_types()
-	@types ||= ::DL::Types.new
+  class CompositeHandler
+    def initialize(handlers)
+      @handlers = handlers
+    end
+
+    def handlers()
+      @handlers
+    end
+
+    def sym(symbol)
+      @handlers.each{|handle|
+        if( handle )
+          begin
+            addr = handle.sym(symbol)
+            return addr
+          rescue DLError
+          end
+        end
+      }
+      return nil
+    end
+
+    def [](symbol)
+      sym(symbol)
+    end
+  end
+
+  module Importer
+    include DL
+    include CParser
+    extend Importer
+
+    def dlload(*libs)
+      handles = libs.collect{|lib|
+        case lib
+        when nil
+          nil
+        when Handle
+          lib
+        when Importer
+          lib.handlers
+        else
+          begin
+            DL.dlopen(lib)
+          rescue DLError
+            raise(DLError, "can't load #{lib}")
+          end
+        end
+      }.flatten()
+      @handler = CompositeHandler.new(handles)
+      @func_map = {}
+      @type_alias = {}
+    end
+
+    def typealias(alias_type, orig_type)
+      @type_alias[alias_type] = orig_type
+    end
+
+    def sizeof(ty)
+      case ty
+      when String
+        ty = parse_ctype(ty, @type_alias).abs()
+        case ty
+        when TYPE_CHAR
+          return SIZEOF_CHAR
+        when TYPE_SHORT
+          return SIZEOF_SHORT
+        when TYPE_INT
+          return SIZEOF_INT
+        when TYPE_LONG
+          return SIZEOF_LONG
+        when TYPE_LONG_LONG
+          return SIZEOF_LONG_LON
+        when TYPE_FLOAT
+          return SIZEOF_FLOAT
+        when TYPE_DOUBLE
+          return SIZEOF_DOUBLE
+        when TYPE_VOIDP
+          return SIZEOF_VOIDP
+        else
+          raise(DLError, "unknown type: #{ty}")
+        end
+      when Class
+        if( ty.instance_methods().include?(:to_ptr) )
+          return ty.size()
+        end
       end
-
-      def init_sym()
-	@SYM ||= {}
+      return CPtr[ty].size()
+    end
+
+    def parse_bind_options(opts)
+      h = {}
+      prekey = nil
+      while( opt = opts.shift() )
+        case opt
+        when :stdcall, :cdecl
+          h[:call_type] = opt
+        when :carried, :temp, :temporal, :bind
+          h[:callback_type] = opt
+          h[:carrier] = opts.shift()
+        else
+          h[opt] = true
+        end
       end
-
-      def [](name)
-	return @SYM[name.to_s][0]
+      h
+    end
+    private :parse_bind_options
+
+    def extern(signature, *opts)
+      symname, ctype, argtype = parse_signature(signature, @type_alias)
+      opt = parse_bind_options(opts)
+      f = import_function(symname, ctype, argtype, opt[:call_type])
+      name = symname.gsub(/@.+/,'')
+      @func_map[name] = f
+      # define_method(name){|*args,&block| f.call(*args,&block)}
+      begin
+        /^(.+?):(\d+)/ =~ caller.first
+        file, line = $1, $2.to_i
+      rescue
+        file, line = __FILE__, __LINE__+3
       end
-
-      def dlload(*libnames)
-	if( !defined?(@LIBS) )
-	  @LIBS = []
-	end
-	libnames.each{|libname|
-	  if( !LIB_MAP[libname] )
-	    LIB_MAP[libname] = DL.dlopen(libname)
-	  end
-	  @LIBS.push(LIB_MAP[libname])
-	}
+      module_eval(<<-EOS, file, line)
+        def #{name}(*args, &block)
+          @func_map['#{name}'].call(*args,&block)
+        end
+      EOS
+      module_function(name)
+      f
+    end
+
+    def bind(signature, *opts, &blk)
+      name, ctype, argtype = parse_signature(signature, @type_alias)
+      h = parse_bind_options(opts)
+      case h[:callback_type]
+      when :bind, nil
+        f = bind_function(name, ctype, argtype, h[:call_type], &blk)
+      when :temp, :temporal
+        f = create_temp_function(name, ctype, argtype, h[:call_type])
+      when :carried
+        f = create_carried_function(name, ctype, argtype, h[:call_type], h[:carrier])
+      else
+        raise(RuntimeError, "unknown callback type: #{h[:callback_type]}")
       end
-      alias dllink :dlload
-
-      def parse_cproto(proto)
-	proto = proto.gsub(/\s+/, " ").strip
-	case proto
-	when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
-	  ret = $1
-	  args = $2.strip()
-	  ret = ret.split(/\s+/)
-	  args = args.split(/\s*,\s*/)
-	  func = ret.pop()
-	  if( func =~ /^\*/ )
-	    func.gsub!(/^\*+/,"")
-	    ret.push("*")
-	  end
-	  ret  = ret.join(" ")
-	  return [func, ret, args]
-	else
-	  raise(RuntimeError,"can't parse the function prototype: #{proto}")
-	end
+      @func_map[name] = f
+      #define_method(name){|*args,&block| f.call(*args,&block)}
+      begin
+        /^(.+?):(\d+)/ =~ caller.first
+        file, line = $1, $2.to_i
+      rescue
+        file, line = __FILE__, __LINE__+3
       end
-
-      # example:
-      #   extern "int strlen(char*)"
-      #
-      def extern(proto)
-	func,ret,args = parse_cproto(proto)
-	return import(func, ret, args)
-      end
-
-      # example:
-      #   callback "int method_name(int, char*)"
-      #
-      def callback(proto)
-	func,ret,args = parse_cproto(proto)
-
-	init_types()
-	init_sym()
-
-	rty,renc,rdec = @types.encode_return_type(ret)
-        if( !rty )
-          raise(TypeError, "unsupported type: #{ret}")
+      module_eval(<<-EOS, file, line)
+        def #{name}(*args,&block)
+          @func_map['#{name}'].call(*args,&block)
         end
-	ty,enc,dec = encode_argument_types(args)
-	symty = rty + ty
-
-	module_eval("module_function :#{func}")
-	sym = module_eval([
-	  "DL::callback(\"#{symty}\"){|*args|",
-	  "  sym,rdec,enc,dec  = @SYM['#{func}']",
-	  "  args = enc.call(args) if enc",
-	  "  r,rs = #{func}(*args)",
-	  "  r  = renc.call(r) if rdec",
-	  "  rs = dec.call(rs) if (dec && rs)",
-	  "  @retval = r",
-	  "  @args   = rs",
-	  "  r",
-	  "}",
-	].join("\n"))
-
-	@SYM[func] = [sym,rdec,enc,dec]
-
-	return sym
+      EOS
+      module_function(name)
+      f
+    end
+
+    def struct(signature)
+      tys, mems = parse_struct_signature(signature, @type_alias)
+      DL::CStructBuilder.create(CStruct, tys, mems)
+    end
+
+    def union(signature)
+      tys, mems = parse_struct_signature(signature, @type_alias)
+      DL::CStructBuilder.create(CUnion, tys, mems)
+    end
+
+    def [](name)
+      @func_map[name]
+    end
+
+    def create_value(ty, val=nil)
+      s = struct([ty + " value"])
+      ptr = s.malloc()
+      if( val )
+        ptr.value = val
       end
-
-      # example:
-      #  typealias("uint", "unsigned int")
-      #
-      def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
-	init_types()
-	@types.typealias(alias_type, ty1, enc1, dec1,
-                                     ty2||ty1, enc2, dec2)
+      return ptr
+    end
+    alias value create_value
+
+    def import_value(ty, addr)
+      s = struct([ty + " value"])
+      ptr = s.new(addr)
+      return ptr
+    end
+
+    def import_symbol(name)
+      addr = @handler.sym(name)
+      if( !addr )
+        raise(DLError, "cannot find the symbol: #{name}")
       end
+      CPtr.new(addr)
+    end
 
-      # example:
-      #  symbol "foo_value"
-      #  symbol "foo_func", "IIP"
-      #
-      def symbol(name, ty = nil)
-	sym = nil
-	@LIBS.each{|lib|
-	  begin
-	    if( ty )
-	      sym = lib[name, ty]
-	    else
-	      sym = lib[name]
-	    end
-	  rescue
-	    next
-	  end
-	}
-	if( !sym )
-	  raise(RuntimeError, "can't find the symbol `#{name}'")
-	end
-	return sym
+    def import_function(name, ctype, argtype, call_type = nil)
+      addr = @handler.sym(name)
+      if( !addr )
+        raise(DLError, "cannot find the function: #{name}()")
       end
-
-      # example:
-      #   import("get_length", "int", ["void*", "int"])
-      #
-      def import(name, rettype, argtypes = nil)
-	init_types()
-	init_sym()
-
-	rty,_,rdec = @types.encode_return_type(rettype)
-        if( !rty )
-          raise(TypeError, "unsupported type: #{rettype}")
-        end
-	ty,enc,dec = encode_argument_types(argtypes)
-	symty = rty + ty
-
-	sym = symbol(name, symty)
-
-	mname = name.dup
-	if( ?A <= mname[0] && mname[0] <= ?Z )
-	  mname[0,1] = mname[0,1].downcase
-	end
-	@SYM[mname] = [sym,rdec,enc,dec]
-	
-	module_eval [
-	  "def #{mname}(*args)",
-	  "  sym,rdec,enc,dec  = @SYM['#{mname}']",
-	  "  args = enc.call(args) if enc",
-	  if( $DEBUG )
-	    "  p \"[DL] call #{mname} with \#{args.inspect}\""
-	  else
-	    ""
-	  end,
-	  "  r,rs = sym.call(*args)",
-	  if( $DEBUG )
-	    "  p \"[DL] retval=\#{r.inspect} args=\#{rs.inspect}\""
-	  else
-	    ""
-	  end,
-	  "  r  = rdec.call(r) if rdec",
-	  "  rs = dec.call(rs) if dec",
-	  "  @retval = r",
-	  "  @args   = rs",
-	  "  return r",
-	  "end",
-	  "module_function :#{mname}",
-	].join("\n")
-
-	return sym
-      end
-
-      def _args_
-	return @args
+      Function.new(CFunc.new(addr, ctype, name, call_type || :cdecl), argtype)
+    end
+
+    def bind_function(name, ctype, argtype, call_type = nil, &block)
+      if DL.fiddle?
+        closure = Class.new(Fiddle::Closure) {
+          define_method(:call, block)
+        }.new(ctype, argtype)
+
+        Function.new(closure, argtype)
+      else
+        f = Function.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
+        f.bind(&block)
+        f
       end
+    end
 
-      def _retval_
-	return @retval
-      end
+    def create_temp_function(name, ctype, argtype, call_type = nil)
+      TempFunction.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
+    end
 
-      def encode_argument_types(tys)
-	init_types()
-	encty = []
-	enc = nil
-	dec = nil
-	tys.each_with_index{|ty,idx|
-	  ty,c1,c2 = @types.encode_argument_type(ty)
-          if( !ty )
-            raise(TypeError, "unsupported type: #{ty}")
-          end
-	  encty.push(ty)
-	  if( enc )
-	    if( c1 )
-	      conv1 = enc
-	      enc = proc{|v| v = conv1.call(v); v[idx] = c1.call(v[idx]); v}
-	    end
-	  else
-	    if( c1 )
-	      enc = proc{|v| v[idx] = c1.call(v[idx]); v}
-	    end
-	  end
-	  if( dec )
-	    if( c2 )
-	      conv2 = dec
-	      dec = proc{|v| v = conv2.call(v); v[idx] = c2.call(v[idx]); v}
-	    end
-	  else
-	    if( c2 )
-	      dec = proc{|v| v[idx] = c2.call(v[idx]); v}
-	    end
-	  end
-	}
-	return [encty.join, enc, dec]
-      end
-    end # end of Internal
-    include Internal
-  end # end of Importable
+    def create_carried_function(name, ctype, argtype, call_type = nil, n = 0)
+      CarriedFunction.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype, n)
+    end
+  end
 end
diff --git a/ext/dl/lib/dl/pack.rb b/ext/dl/lib/dl/pack.rb
new file mode 100644
index 0000000000..7fbc802b0f
--- /dev/null
+++ b/ext/dl/lib/dl/pack.rb
@@ -0,0 +1,128 @@
+require 'dl'
+
+module DL
+  module PackInfo
+    ALIGN_MAP = {
+      TYPE_VOIDP => ALIGN_VOIDP,
+      TYPE_CHAR  => ALIGN_CHAR,
+      TYPE_SHORT => ALIGN_SHORT,
+      TYPE_INT   => ALIGN_INT,
+      TYPE_LONG  => ALIGN_LONG,
+      TYPE_FLOAT => ALIGN_FLOAT,
+      TYPE_DOUBLE => ALIGN_DOUBLE,
+      -TYPE_CHAR  => ALIGN_CHAR,
+      -TYPE_SHORT => ALIGN_SHORT,
+      -TYPE_INT   => ALIGN_INT,
+      -TYPE_LONG  => ALIGN_LONG,
+    }
+
+    PACK_MAP = {
+      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG) ? "q" : "l!"),
+      TYPE_CHAR  => "c",
+      TYPE_SHORT => "s!",
+      TYPE_INT   => "i!",
+      TYPE_LONG  => "l!",
+      TYPE_FLOAT => "f",
+      TYPE_DOUBLE => "d",
+      -TYPE_CHAR  => "c",
+      -TYPE_SHORT => "s!",
+      -TYPE_INT   => "i!",
+      -TYPE_LONG  => "l!",
+    }
+
+    SIZE_MAP = {
+      TYPE_VOIDP => SIZEOF_VOIDP,
+      TYPE_CHAR  => SIZEOF_CHAR,
+      TYPE_SHORT => SIZEOF_SHORT,
+      TYPE_INT   => SIZEOF_INT,
+      TYPE_LONG  => SIZEOF_LONG,
+      TYPE_FLOAT => SIZEOF_FLOAT,
+      TYPE_DOUBLE => SIZEOF_DOUBLE,
+      -TYPE_CHAR  => SIZEOF_CHAR,
+      -TYPE_SHORT => SIZEOF_SHORT,
+      -TYPE_INT   => SIZEOF_INT,
+      -TYPE_LONG  => SIZEOF_LONG,
+    }
+    if defined?(TYPE_LONG_LONG)
+      ALIGN_MAP[TYPE_LONG_LONG] = ALIGN_MAP[-TYPE_LONG_LONG] = ALIGN_LONG_LONG
+      PACK_MAP[TYPE_LONG_LONG] = PACK_MAP[-TYPE_LONG_LONG] = "q"
+      SIZE_MAP[TYPE_LONG_LONG] = SIZE_MAP[-TYPE_LONG_LONG] = SIZEOF_LONG_LONG
+    end
+
+    def align(addr, align)
+      d = addr % align
+      if( d == 0 )
+        addr
+      else
+        addr + (align - d)
+      end
+    end
+    module_function :align
+  end
+
+  class Packer
+    include PackInfo
+
+    def self.[](*types)
+      new(types)
+    end
+
+    def initialize(types)
+      parse_types(types)
+    end
+
+    def size()
+      @size
+    end
+
+    def pack(ary)
+      case SIZEOF_VOIDP
+      when SIZEOF_LONG
+        ary.pack(@template)
+      when SIZEOF_LONG_LONG
+        ary.pack(@template)
+      else
+        raise(RuntimeError, "sizeof(void*)?")
+      end
+    end
+
+    def unpack(ary)
+      case SIZEOF_VOIDP
+      when SIZEOF_LONG
+        ary.join().unpack(@template)
+      when SIZEOF_LONG_LONG
+        ary.join().unpack(@template)
+      else
+        raise(RuntimeError, "sizeof(void*)?")
+      end
+    end
+
+    private
+
+    def parse_types(types)
+      @template = ""
+      addr     = 0
+      types.each{|t|
+        orig_addr = addr
+        if( t.is_a?(Array) )
+          addr = align(orig_addr, ALIGN_MAP[TYPE_VOIDP])
+        else
+          addr = align(orig_addr, ALIGN_MAP[t])
+        end
+        d = addr - orig_addr
+        if( d > 0 )
+          @template << "x#{d}"
+        end
+        if( t.is_a?(Array) )
+          @template << (PACK_MAP[t[0]] * t[1])
+          addr += (SIZE_MAP[t[0]] * t[1])
+        else
+          @template << PACK_MAP[t]
+          addr += SIZE_MAP[t]
+        end
+      }
+      addr = align(addr, ALIGN_MAP[TYPE_VOIDP])
+      @size = addr
+    end
+  end
+end
diff --git a/ext/dl/lib/dl/stack.rb b/ext/dl/lib/dl/stack.rb
new file mode 100644
index 0000000000..dc22378fcb
--- /dev/null
+++ b/ext/dl/lib/dl/stack.rb
@@ -0,0 +1,116 @@
+require 'dl'
+
+module DL
+  class Stack
+    def self.[](*types)
+      new(types)
+    end
+
+    def initialize(types)
+      parse_types(types)
+    end
+
+    def size()
+      @size
+    end
+
+    def types()
+      @types
+    end
+
+    def pack(ary)
+      case SIZEOF_VOIDP
+      when SIZEOF_LONG
+        ary.pack(@template).unpack('l!*')
+      when SIZEOF_LONG_LONG
+        ary.pack(@template).unpack('q*')
+      else
+        raise(RuntimeError, "sizeof(void*)?")
+      end
+    end
+
+    def unpack(ary)
+      case SIZEOF_VOIDP
+      when SIZEOF_LONG
+        ary.pack('l!*').unpack(@template)
+      when SIZEOF_LONG_LONG
+        ary.pack('q*').unpack(@template)
+      else
+        raise(RuntimeError, "sizeof(void*)?")
+      end
+    end
+
+    private
+
+    def align(addr, align)
+      d = addr % align
+      if( d == 0 )
+        addr
+      else
+        addr + (align - d)
+      end
+    end
+
+    ALIGN_MAP = {
+      TYPE_VOIDP => ALIGN_VOIDP,
+      TYPE_CHAR  => ALIGN_VOIDP,
+      TYPE_SHORT => ALIGN_VOIDP,
+      TYPE_INT   => ALIGN_VOIDP,
+      TYPE_LONG  => ALIGN_VOIDP,
+      TYPE_FLOAT => ALIGN_FLOAT,
+      TYPE_DOUBLE => ALIGN_DOUBLE,
+    }
+
+    PACK_MAP = {
+      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG)? "q" : "l!"),
+      TYPE_CHAR  => "c",
+      TYPE_SHORT => "s!",
+      TYPE_INT   => "i!",
+      TYPE_LONG  => "l!",
+      TYPE_FLOAT => "f",
+      TYPE_DOUBLE => "d",
+    }
+
+    SIZE_MAP = {
+      TYPE_VOIDP => SIZEOF_VOIDP,
+      TYPE_CHAR  => SIZEOF_CHAR,
+      TYPE_SHORT => SIZEOF_SHORT,
+      TYPE_INT   => SIZEOF_INT,
+      TYPE_LONG  => SIZEOF_LONG,
+      TYPE_FLOAT => SIZEOF_FLOAT,
+      TYPE_DOUBLE => SIZEOF_DOUBLE,
+    }
+    if defined?(TYPE_LONG_LONG)
+      ALIGN_MAP[TYPE_LONG_LONG] = ALIGN_LONG_LONG
+      PACK_MAP[TYPE_LONG_LONG] = "q"
+      SIZE_MAP[TYPE_LONG_LONG] = SIZEOF_LONG_LONG
+    end
+
+    def parse_types(types)
+      @types = types
+      @template = ""
+      addr      = 0
+      types.each{|t|
+        addr = add_padding(addr, ALIGN_MAP[t])
+        @template << PACK_MAP[t]
+        addr += SIZE_MAP[t]
+      }
+      addr = add_padding(addr, ALIGN_MAP[SIZEOF_VOIDP])
+      if( addr % SIZEOF_VOIDP == 0 )
+        @size = addr / SIZEOF_VOIDP
+      else
+        @size = (addr / SIZEOF_VOIDP) + 1
+      end
+    end
+
+    def add_padding(addr, align)
+      orig_addr = addr
+      addr = align(orig_addr, align)
+      d = addr - orig_addr
+      if( d > 0 )
+        @template << "x#{d}"
+      end
+      addr
+    end
+  end
+end
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index 33f303fe22..dc116f3be5 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -1,149 +1,213 @@
-# -*- ruby -*-
-
 require 'dl'
-require 'dl/import'
+require 'dl/pack.rb'
 
 module DL
-  module Importable
-    module Internal
-      def define_struct(contents)
-	init_types()
-	Struct.new(@types, contents)
-      end
-      alias struct define_struct
+  class CStruct
+    def CStruct.entity_class()
+      CStructEntity
+    end
+  end
+
+  class CUnion
+    def CUnion.entity_class()
+      CUnionEntity
+    end
+  end
+
+  module CStructBuilder
+    def create(klass, types, members)
+      new_class = Class.new(klass){
+        define_method(:initialize){|addr|
+          @entity = klass.entity_class.new(addr, types)
+          @entity.assign_names(members)
+        }
+        define_method(:to_ptr){ @entity }
+        define_method(:to_i){ @entity.to_i }
+        members.each{|name|
+          define_method(name){ @entity[name] }
+          define_method(name + "="){|val| @entity[name] = val }
+        }
+      }
+      size = klass.entity_class.size(types)
+      new_class.module_eval(<<-EOS, __FILE__, __LINE__+1)
+        def new_class.size()
+          #{size}
+        end
+        def new_class.malloc()
+          addr = DL.malloc(#{size})
+          new(addr)
+        end
+      EOS
+      return new_class
+    end
+    module_function :create
+  end
+
+  class CStructEntity < CPtr
+    include PackInfo
+    include ValueUtil
+
+    def CStructEntity.malloc(types, func = nil)
+      addr = DL.malloc(CStructEntity.size(types))
+      CStructEntity.new(addr, types, func)
+    end
+
+    def CStructEntity.size(types)
+      offset = 0
+      max_align = 0
+      types.each_with_index{|t,i|
+        orig_offset = offset
+        if( t.is_a?(Array) )
+          align = PackInfo::ALIGN_MAP[t[0]]
+          offset = PackInfo.align(orig_offset, align)
+          size = offset - orig_offset
+          offset += (PackInfo::SIZE_MAP[t[0]] * t[1])
+        else
+          align = PackInfo::ALIGN_MAP[t]
+          offset = PackInfo.align(orig_offset, align)
+          size = offset - orig_offset
+          offset += PackInfo::SIZE_MAP[t]
+        end
+        if (max_align < align)
+          max_align = align
+        end
+      }
+      offset = PackInfo.align(offset, max_align)
+      offset
+    end
+
+    def initialize(addr, types, func = nil)
+      set_ctypes(types)
+      super(addr, @size, func)
+    end
+
+    def assign_names(members)
+      @members = members
+    end
+
+    def set_ctypes(types)
+      @ctypes = types
+      @offset = []
+      offset = 0
+      max_align = 0
+      types.each_with_index{|t,i|
+        orig_offset = offset
+        if( t.is_a?(Array) )
+          align = ALIGN_MAP[t[0]]
+        else
+          align = ALIGN_MAP[t]
+        end
+        offset = PackInfo.align(orig_offset, align)
+        size = offset - orig_offset
+        @offset[i] = offset
+        if( t.is_a?(Array) )
+          offset += (SIZE_MAP[t[0]] * t[1])
+        else
+          offset += SIZE_MAP[t]
+        end
+        if (max_align < align)
+          max_align = align
+        end
+      }
+      offset = PackInfo.align(offset, max_align)
+      @size = offset
+    end
 
-      def define_union(contents)
-	init_types()
-	Union.new(@types, contents)
+    def [](name)
+      idx = @members.index(name)
+      if( idx.nil? )
+        raise(ArgumentError, "no such member: #{name}")
       end
-      alias union define_union
-
-      class Memory
-	def initialize(ptr, names, ty, len, enc, dec)
-	  @ptr = ptr
-	  @names = names
-	  @ty    = ty
-	  @len   = len
-	  @enc   = enc
-	  @dec   = dec
-
-	  # define methods
-	  @names.each{|name|
-	    instance_eval [
-	      "def #{name}",
-	      "  v = @ptr[\"#{name}\"]",
-	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
-              "  else",
-	      "    v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
-	      "  end",
-	      "  return v",
-	      "end",
-	      "def #{name}=(v)",
-	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
-	      "  else",
-	      "    v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
-              "  end",
-	      "  @ptr[\"#{name}\"] = v",
-	      "  return v",
-	      "end",
-	    ].join("\n")
-	  }
-	end
-
-	def to_ptr
-	  return @ptr
-	end
-
-	def size
-	  return @ptr.size
-	end
+      ty = @ctypes[idx]
+      if( ty.is_a?(Array) )
+        r = super(@offset[idx], SIZE_MAP[ty[0]] * ty[1])
+      else
+        r = super(@offset[idx], SIZE_MAP[ty.abs])
       end
+      packer = Packer.new([ty])
+      val = packer.unpack([r])
+      case ty
+      when Array
+        case ty[0]
+        when TYPE_VOIDP
+          val = val.collect{|v| CPtr.new(v)}
+        end
+      when TYPE_VOIDP
+        val = CPtr.new(val[0])
+      else
+        val = val[0]
+      end
+      if( ty.is_a?(Integer) && (ty < 0) )
+        return unsigned_value(val, ty)
+      elsif( ty.is_a?(Array) && (ty[0] < 0) )
+        return val.collect{|v| unsigned_value(v,ty[0])}
+      else
+        return val
+      end
+    end
 
-      class Struct
-	def initialize(types, contents)
-	  @names = []
-	  @ty   = {}
-	  @len  = {}
-	  @enc  = {}
-	  @dec  = {}
-	  @size = 0
-	  @tys  = ""
-	  @types = types
-	  parse(contents)
-	end
-
-	def size
-	  return @size
-	end
-
-	def members
-	  return @names
-	end
-
-	# ptr must be a PtrData object.
-	def new(ptr)
-	  ptr.struct!(@tys, *@names)
-	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
-	  return mem
-	end
-
-	def malloc(size = nil)
-	  if( !size )
-	    size = @size
-	  end
-	  ptr = DL::malloc(size)
-	  return new(ptr)
-	end
-
-	def parse(contents)
-	  contents.each{|elem|
-	    name,ty,num,enc,dec = parse_elem(elem)
-	    @names.push(name)
-	    @ty[name]  = ty
-	    @len[name] = num
-	    @enc[name] = enc
-	    @dec[name] = dec
-	    if( num )
-	      @tys += "#{ty}#{num}"
-	    else
-	      @tys += ty
-	    end
-	  }
-	  @size = DL.sizeof(@tys)
-	end
-	
-	def parse_elem(elem)
-	  elem.strip!
-	  case elem
-	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)$/
-	    ty = ($1 + $2).strip
-	    name = $3
-	    num = nil;
-	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)\[(\d+)\]$/
-	    ty = ($1 + $2).strip
-	    name = $3
-	    num = $4.to_i
-	  else
-	    raise(RuntimeError, "invalid element: #{elem}")
-	  end
-	  ty,enc,dec = @types.encode_struct_type(ty)
-          if( !ty )
-            raise(TypeError, "unsupported type: #{ty}")
-          end
-	  return [name,ty,num,enc,dec]
-	end
-      end  # class Struct
-      
-      class Union < Struct
-	def new
-	  ptr = DL::malloc(@size)
-	  ptr.union!(@tys, *@names)
-	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
-	  return mem
-	end
+    def []=(name, val)
+      idx = @members.index(name)
+      if( idx.nil? )
+        raise(ArgumentError, "no such member: #{name}")
+      end
+      ty  = @ctypes[idx]
+      packer = Packer.new([ty])
+      val = wrap_arg(val, ty, [])
+      buff = packer.pack([val].flatten())
+      super(@offset[idx], buff.size, buff)
+      if( ty.is_a?(Integer) && (ty < 0) )
+        return unsigned_value(val, ty)
+      elsif( ty.is_a?(Array) && (ty[0] < 0) )
+        return val.collect{|v| unsigned_value(v,ty[0])}
+      else
+        return val
       end
-    end  # module Internal
-  end  # module Importable
-end  # module DL
+    end
+
+    def to_s()
+      super(@size)
+    end
+  end
+
+  class CUnionEntity < CStructEntity
+    include PackInfo
+
+    def CUnionEntity.malloc(types, func=nil)
+      addr = DL.malloc(CUnionEntity.size(types))
+      CUnionEntity.new(addr, types, func)
+    end
+
+    def CUnionEntity.size(types)
+      size   = 0
+      types.each_with_index{|t,i|
+        if( t.is_a?(Array) )
+          tsize = PackInfo::SIZE_MAP[t[0]] * t[1]
+        else
+          tsize = PackInfo::SIZE_MAP[t]
+        end
+        if( tsize > size )
+          size = tsize
+        end
+      }
+    end
+
+    def set_ctypes(types)
+      @ctypes = types
+      @offset = []
+      @size   = 0
+      types.each_with_index{|t,i|
+        @offset[i] = 0
+        if( t.is_a?(Array) )
+          size = SIZE_MAP[t[0]] * t[1]
+        else
+          size = SIZE_MAP[t]
+        end
+        if( size > @size )
+          @size = size
+        end
+      }
+    end
+  end
+end
+
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index 1144917dae..b85ac890cd 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -1,245 +1,40 @@
-# -*- ruby -*-
-
-require 'dl'
-
 module DL
-  class Types
-    TYPES = [
-      # FORMAT:
-      # ["alias name",
-      #  "type name", encoding_method, decoding_method,   for function prototypes
-      #  "type name", encoding_method, decoding_method]   for structures (not implemented)
-      
-      # for Windows
-      ["DWORD",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["PDWORD", "unsigned long *", nil, nil,
-                 "unsigned long *", nil, nil],
-      ["WORD",   "unsigned short", nil, nil,
-                 "unsigned short", nil, nil],
-      ["PWORD",  "unsigned int *", nil, nil,
-                 "unsigned int *", nil, nil],
-      ["BYTE",   "unsigned char",   nil, nil,
-                 "unsigned char", nil, nil],
-      ["PBYTE",  "unsigned char *", nil, nil,
-                 "unsigned char *", nil, nil],
-      ["BOOL",   "ibool", nil, nil,
-                 "ibool", nil, nil],
-      ["ATOM",   "int", nil, nil,
-                 "int", nil, nil],
-      ["BYTE",   "unsigned char", nil, nil,
-                 "unsigned char", nil, nil],
-      ["PBYTE",  "unsigned char *", nil, nil,
-                 "unsigned char *", nil, nil],
-      ["UINT",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["ULONG",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["UCHAR",  "unsigned char", nil, nil,
-                 "unsigned char", nil, nil],
-      ["HANDLE", "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["PHANDLE","void*", nil, nil,
-                 "void*", nil, nil],
-      ["PVOID",  "void*", nil, nil,
-                 "void*", nil, nil],
-      ["LPCSTR", "char*", nil, nil,
-                 "char*", nil, nil],
-      ["HDC",    "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["HWND",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      
-      # Others
-      ["uint",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["u_int",  "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["ulong",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["u_long", "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-
-      # DL::Importable primitive types
-      ["ibool",
-        "I",
-	proc{|v| v ? 1 : 0},
-	proc{|v| (v != 0) ? true : false},
-        "I",
-	proc{|v| v ? 1 : 0 },
-	proc{|v| (v != 0) ? true : false} ],
-      ["cbool",
-        "C",
-	proc{|v| v ? 1 : 0},
-	proc{|v| (v != 0) ? true : false},
-        "C",
-	proc{|v,len| v ? 1 : 0},
-	proc{|v,len| (v != 0) ? true : false}],
-      ["lbool",
-        "L",
-	proc{|v| v ? 1 : 0},
-	proc{|v| (v != 0) ? true : false},
-        "L",
-	proc{|v,len| v ? 1 : 0},
-	proc{|v,len| (v != 0) ? true : false}],
-      ["unsigned char",
-        "C",
-	proc{|v| [v].pack("C").unpack("c")[0]},
-	proc{|v| [v].pack("c").unpack("C")[0]},
-        "C",
-	proc{|v| [v].pack("C").unpack("c")[0]},
-	proc{|v| [v].pack("c").unpack("C")[0]}],
-      ["unsigned short",
-        "H",
-	proc{|v| [v].pack("S").unpack("s")[0]},
-	proc{|v| [v].pack("s").unpack("S")[0]},
-        "H",
-	proc{|v| [v].pack("S").unpack("s")[0]},
-	proc{|v| [v].pack("s").unpack("S")[0]}],
-      ["unsigned int",
-        "I",
-	proc{|v| [v].pack("I").unpack("i")[0]},
-	proc{|v| [v].pack("i").unpack("I")[0]},
-        "I",
-	proc{|v| [v].pack("I").unpack("i")[0]},
-	proc{|v| [v].pack("i").unpack("I")[0]}],
-      ["unsigned long",
-        "L",
-	proc{|v| [v].pack("L").unpack("l")[0]},
-	proc{|v| [v].pack("l").unpack("L")[0]},
-        "L",
-	proc{|v| [v].pack("L").unpack("l")[0]},
-	proc{|v| [v].pack("l").unpack("L")[0]}],
-      ["unsigned char ref",
-        "c",
-	proc{|v| [v].pack("C").unpack("c")[0]},
-	proc{|v| [v].pack("c").unpack("C")[0]},
-	nil, nil, nil],
-      ["unsigned int ref",
-        "i",
-	proc{|v| [v].pack("I").unpack("i")[0]},
-	proc{|v| [v].pack("i").unpack("I")[0]},
-	nil, nil, nil],
-      ["unsigned long ref",
-        "l",
-	proc{|v| [v].pack("L").unpack("l")[0]},
-	proc{|v| [v].pack("l").unpack("L")[0]},
-	nil, nil, nil],
-      ["char ref",  "c", nil, nil,
-                    nil, nil, nil],
-      ["short ref", "h", nil, nil,
-                    nil, nil, nil],
-      ["int ref",   "i", nil, nil,
-                    nil, nil, nil],
-      ["long ref",  "l", nil, nil,
-                    nil, nil, nil],
-      ["float ref", "f", nil, nil,
-                    nil, nil, nil],
-      ["double ref","d", nil, nil,
-                    nil, nil, nil],
-      ["char",   "C", nil, nil,
-                 "C", nil, nil],
-      ["short",  "H", nil, nil,
-                 "H", nil, nil],
-      ["int",    "I", nil, nil,
-                 "I", nil, nil],
-      ["long",   "L", nil, nil,
-                 "L", nil, nil],
-      ["float",  "F", nil, nil,
-                 "F", nil, nil],
-      ["double", "D", nil, nil,
-                 "D", nil, nil],
-      [/^char\s*\*$/,"s",nil, nil,
-                     "S",nil, nil],
-      [/^const char\s*\*$/,"S",nil, nil,
-                           "S",nil, nil],
-      [/^.+\*$/,   "P", nil, nil,
-                   "P", nil, nil],
-      [/^.+\[\]$/, "a", nil, nil,
-                   "a", nil, nil],
-      ["void",   "0", nil, nil,
-                 nil, nil, nil],
-    ]
-
-    def initialize
-      init_types()
-    end
-
-    def typealias(ty1, ty2, enc=nil, dec=nil, ty3=nil, senc=nil, sdec=nil)
-      @TYDEFS.unshift([ty1, ty2, enc, dec, ty3, senc, sdec])
-    end
-
-    def init_types
-      @TYDEFS = TYPES.dup
-    end
-
-    def encode_argument_type(alias_type)
-      proc_encode = nil
-      proc_decode = nil
-      @TYDEFS.each{|aty,ty,enc,dec,_,_,_|
-	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
-	  alias_type = alias_type.gsub(aty,ty) if ty
-          alias_type.strip! if alias_type
-	  if( proc_encode )
-	    if( enc )
-	      conv1 = proc_encode
-	      proc_encode = proc{|v| enc.call(conv1.call(v))}
-	    end
-	  else
-	    if( enc )
-	      proc_encode = enc
-	    end
-	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
-	    end
-	  else
-	    if( dec )
-	      proc_decode = dec
-	    end
-	  end
-	end
+  module Win32Types
+    def included(m)
+      m.module_eval{
+        typealias "DWORD", "unsigned long"
+        typealias "PDWORD", "unsigned long *"
+        typealias "WORD", "unsigned short"
+        typealias "PWORD", "unsigned short *"
+        typealias "BOOL", "int"
+        typealias "ATOM", "int"
+        typealias "BYTE", "unsigned char"
+        typealias "PBYTE", "unsigned char *"
+        typealias "UINT", "unsigned int"
+        typealias "ULONG", "unsigned long"
+        typealias "UCHAR", "unsigned char"
+        typealias "HANDLE", "unsigned long"
+        typealias "PHANDLE", "void*"
+        typealias "PVOID", "void*"
+        typealias "LPCSTR", "char*"
+        typealias "LPSTR", "char*"
+        typealias "HINSTANCE", "unsigned int"
+        typealias "HDC", "unsigned int"
+        typealias "HWND", "unsigned int"
       }
-      return [alias_type, proc_encode, proc_decode]
     end
-
-    def encode_return_type(ty)
-      ty, enc, dec = encode_argument_type(ty)
-      return [ty, enc, dec]
-    end
-
-    def encode_struct_type(alias_type)
-      proc_encode = nil
-      proc_decode = nil
-      @TYDEFS.each{|aty,_,_,_,ty,enc,dec|
-	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
-	  alias_type = alias_type.gsub(aty,ty) if ty
-          alias_type.strip! if alias_type
-	  if( proc_encode )
-	    if( enc )
-	      conv1 = proc_encode
-	      proc_encode = proc{|v| enc.call(conv1.call(v))}
-	    end
-	  else
-	    if( enc )
-	      proc_encode = enc
-	    end
-	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
-	    end
-	  else
-	    if( dec )
-	      proc_decode = dec
-	    end
-	  end
-	end
+    module_function :included
+  end
+
+  module BasicTypes
+    def included(m)
+      m.module_eval{
+        typealias "uint", "unsigned int"
+        typealias "u_int", "unsigned int"
+        typealias "ulong", "unsigned long"
+        typealias "u_long", "unsigned long"
       }
-      return [alias_type, proc_encode, proc_decode]
     end
-  end # end of Types
+    module_function :included
+  end
 end
diff --git a/ext/dl/lib/dl/value.rb b/ext/dl/lib/dl/value.rb
new file mode 100644
index 0000000000..51f96b293b
--- /dev/null
+++ b/ext/dl/lib/dl/value.rb
@@ -0,0 +1,112 @@
+require 'dl'
+
+module DL
+  module ValueUtil
+    def unsigned_value(val, ty)
+      case ty.abs
+      when TYPE_CHAR
+        [val].pack("c").unpack("C")[0]
+      when TYPE_SHORT
+        [val].pack("s!").unpack("S!")[0]
+      when TYPE_INT
+        [val].pack("i!").unpack("I!")[0]
+      when TYPE_LONG
+        [val].pack("l!").unpack("L!")[0]
+      when TYPE_LONG_LONG
+        [val].pack("q!").unpack("Q!")[0]
+      else
+        val
+      end
+    end
+
+    def signed_value(val, ty)
+      case ty.abs
+      when TYPE_CHAR
+        [val].pack("C").unpack("c")[0]
+      when TYPE_SHORT
+        [val].pack("S!").unpack("s!")[0]
+      when TYPE_INT
+        [val].pack("I!").unpack("i!")[0]
+      when TYPE_LONG
+        [val].pack("L!").unpack("l!")[0]
+      when TYPE_LONG_LONG
+        [val].pack("Q!").unpack("q!")[0]
+      else
+        val
+      end
+    end
+
+    def wrap_args(args, tys, funcs, &block)
+      result = []
+      tys ||= []
+      args.each_with_index{|arg, idx|
+        result.push(wrap_arg(arg, tys[idx], funcs, &block))
+      }
+      result
+    end
+
+    def wrap_arg(arg, ty, funcs = [], &block)
+        funcs ||= []
+        case arg
+        when nil
+          return 0
+        when CPtr
+          return arg.to_i
+        when IO
+          case ty
+          when TYPE_VOIDP
+            return CPtr[arg].to_i
+          else
+            return arg.to_i
+          end
+        when Function
+          if( block )
+            arg.bind_at_call(&block)
+            funcs.push(arg)
+          elsif !arg.bound?
+            raise(RuntimeError, "block must be given.")
+          end
+          return arg.to_i
+        when String
+          if( ty.is_a?(Array) )
+            return arg.unpack('C*')
+          else
+            case SIZEOF_VOIDP
+            when SIZEOF_LONG
+              return [arg].pack("p").unpack("l!")[0]
+            when SIZEOF_LONG_LONG
+              return [arg].pack("p").unpack("q")[0]
+            else
+              raise(RuntimeError, "sizeof(void*)?")
+            end
+          end
+        when Float, Integer
+          return arg
+        when Array
+          if( ty.is_a?(Array) ) # used only by struct
+            case ty[0]
+            when TYPE_VOIDP
+              return arg.collect{|v| Integer(v)}
+            when TYPE_CHAR
+              if( arg.is_a?(String) )
+                return val.unpack('C*')
+              end
+            end
+            return arg
+          else
+            return arg
+          end
+        else
+          if( arg.respond_to?(:to_ptr) )
+            return arg.to_ptr.to_i
+          else
+            begin
+              return Integer(arg)
+            rescue
+              raise(ArgumentError, "unknown argument type: #{arg.class}")
+            end
+          end
+        end
+    end
+  end
+end
diff --git a/ext/dl/lib/dl/win32.rb b/ext/dl/lib/dl/win32.rb
deleted file mode 100644
index 0fed47c324..0000000000
--- a/ext/dl/lib/dl/win32.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-
-class Win32API
-  DLL = {}
-
-  def initialize(dllname, func, import, export = "0")
-    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
-    handle = DLL[dllname] ||= DL::Handle.new(dllname)
-    @sym = handle.sym(func, prototype)
-  end
-
-  def call(*args)
-    import = @sym.proto.split("", 2)[1]
-    args.each_with_index do |x, i|
-      args[i] = nil if x == 0 and import[i] == ?S
-      args[i], = [x].pack("I").unpack("i") if import[i] == ?I
-    end
-    ret, = @sym.call(*args)
-    return ret || 0
-  end
-
-  alias Call call
-end
diff --git a/ext/dl/mkcall.rb b/ext/dl/mkcall.rb
deleted file mode 100644
index 6a85570152..0000000000
--- a/ext/dl/mkcall.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def output_arg(x,i)
-  "args[#{i}].#{DLTYPE[x][:stmem]}"
-end
-
-def output_args(types)
-  t = []
-  types[1..-1].each_with_index{|x,i| t.push(output_arg(x,i))}
-  t.join(",")
-end
-
-def output_callfunc(types)
-  t = types[0]
-  stmem = DLTYPE[t][:stmem]
-  ctypes = types2ctypes(types)
-  if( t == VOID )
-    callstm = "(*f)(#{output_args(types)})"
-  else
-    callstm = "ret.#{stmem} = (*f)(#{output_args(types)})"
-  end
-  [ "{",
-    "#{ctypes[0]} (*f)(#{ctypes[1..-1].join(',')}) = func;",
-    "#{callstm};",
-    "}"].join(" ")
-end
-
-def output_case(types)
-  num = types2num(types)
-  callfunc_stm = output_callfunc(types)
-<<EOF
-  case #{num}:
-#ifdef DEBUG
-    printf("#{callfunc_stm}\\n");
-#endif
-    #{callfunc_stm};
-    break;
-EOF
-end
-
-def rec_output(types = [VOID])
-  print output_case(types)
-  if( types.length <= MAX_ARG )
-    DLTYPE.keys.sort.each{|t|
-      if( t != VOID && DLTYPE[t][:sym] )
-	rec_output(types + [t])
-      end
-    }
-  end
-end
-
-DLTYPE.keys.sort.each{|t|
-  if( DLTYPE[t][:sym] )
-    $stderr.printf("  #{DLTYPE[t][:ctype]}\n")
-    rec_output([t])
-  end
-}
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
deleted file mode 100644
index c9f92e4a0d..0000000000
--- a/ext/dl/mkcallback.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def mkfunc(rettype, fnum, argc)
-  args = (0..(argc-1)).collect{|i| "long arg#{i}"}.join(", ")
-
-  subst_code = (0..(argc-1)).collect{|i|
-    "  buff[#{i.to_s}] = arg#{i.to_s};"
-  }.join("\n")
-
-  ret_code =
-    if( DLTYPE[rettype][:c2rb] )
-      "  return #{DLTYPE[rettype][:rb2c]['retval']};"
-    else
-      "  /* no return value */"
-    end
-
-  code = [
-    "static #{DLTYPE[rettype][:ctype]}",
-    "rb_dl_callback_func_#{rettype.to_s}_#{fnum.to_s}(#{args})",
-    "{",
-    "  VALUE retval, proto, proc, obj;",
-    "  VALUE argv[#{argc.to_s}];",
-    "  int  argc;",
-    "  long buff[#{argc.to_s}];",
-    "",
-    subst_code,
-    "",
-    "  obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
-    "  if(NIL_P(obj))",
-    "    rb_raise(rb_eDLError, \"callback function does not exist in DL::FuncTable\");",
-    "  Check_Type(obj, T_ARRAY);",
-    "  proto = rb_ary_entry(obj, 0);",
-    "  proc  = rb_ary_entry(obj, 1);",
-    "  Check_Type(proto, T_STRING);",
-    "  if( RSTRING(proto)->len >= #{argc.to_s} )",
-    "    rb_raise(rb_eArgError, \"too many arguments\");",
-    "  rb_dl_scan_callback_args(buff, RSTRING(proto)->ptr, &argc, argv);",
-    "  retval = rb_funcall2(proc, id_call, argc, argv);",
-    "",
-    ret_code,
-    "}",
-  ].join("\n")
-
-  return code
-end
-
-DLTYPE.keys.sort.each{|t|
-  for n in 0..(MAX_CALLBACK - 1)
-    print(mkfunc(t, n, 15), "\n\n")
-  end
-}
diff --git a/ext/dl/mkcbtable.rb b/ext/dl/mkcbtable.rb
deleted file mode 100644
index 165c4bdc88..0000000000
--- a/ext/dl/mkcbtable.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def mktable(rettype, fnum, argc)
-  code =
-    "rb_dl_callback_table[#{rettype}][#{fnum}] = &rb_dl_callback_func_#{rettype.to_s}_#{fnum};"
-  return code
-end
-
-DLTYPE.keys.sort.each{|t|
-  for n in 0..(MAX_CALLBACK - 1)
-    print(mktable(t, n, 15), "\n")
-  end
-}
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
deleted file mode 100644
index 7e3d3549d3..0000000000
--- a/ext/dl/ptr.c
+++ /dev/null
@@ -1,1058 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include <ctype.h>
-#include "st.h"
-#include "dl.h"
-
-VALUE rb_cDLPtrData;
-VALUE rb_mDLMemorySpace;
-static st_table* st_memory_table;
-
-#ifndef T_SYMBOL
-# define T_SYMBOL T_FIXNUM
-#endif
-
-static void
-rb_dlmem_delete(void *ptr)
-{
-  rb_secure(4);
-  st_delete(st_memory_table, (st_data_t*)&ptr, NULL);
-}
-
-static void
-rb_dlmem_aset(void *ptr, VALUE obj)
-{
-  if (obj == Qnil) {
-    rb_dlmem_delete(ptr);
-  }
-  else{
-    st_insert(st_memory_table, (st_data_t)ptr, (st_data_t)obj);
-  }
-}
-
-static VALUE
-rb_dlmem_aref(void *ptr)
-{
-  VALUE val;
-
-  if(!st_lookup(st_memory_table, (st_data_t)ptr, &val)) return Qnil;
-  return val == Qundef ? Qnil : val;
-}
-
-void
-dlptr_free(struct ptr_data *data)
-{
-  if (data->ptr) {
-    DEBUG_CODE({
-      printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
-	     data->ptr);
-    });
-    rb_dlmem_delete(data->ptr);
-    if (data->free) {
-      DEBUG_CODE({
-	printf("dlptr_free(): 0x%x(data->ptr:0x%x)\n",data->free,data->ptr);
-      });
-      (*(data->free))(data->ptr);
-    }
-  }
-  if (data->stype) dlfree(data->stype);
-  if (data->ssize) dlfree(data->ssize);
-  if (data->ids) dlfree(data->ids);
-}
-
-void
-dlptr_init(VALUE val)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(val, struct ptr_data, data);
-  DEBUG_CODE({
-    printf("dlptr_init(): add the pointer `0x%x' to the MemorySpace\n",
-	   data->ptr);
-  });
-  rb_dlmem_aset(data->ptr, val);
-  OBJ_TAINT(val);
-}
-
-VALUE
-rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
-{
-  struct ptr_data *data;
-  VALUE val;
-
-  rb_secure(4);
-  if (ptr) {
-    val = rb_dlmem_aref(ptr);
-    if (val == Qnil) {
-      val = Data_Make_Struct(klass, struct ptr_data,
-			     0, dlptr_free, data);
-      data->ptr = ptr;
-      data->free = func;
-      data->ctype = DLPTR_CTYPE_UNKNOWN;
-      data->stype = NULL;
-      data->ssize = NULL;
-      data->slen = 0;
-      data->size = size;
-      data->ids = NULL;
-      data->ids_num = 0;
-      dlptr_init(val);
-    }
-    else{
-      if (func) {
-	Data_Get_Struct(val, struct ptr_data, data);
-	data->free = func;
-      }
-    }
-  }
-  else{
-    val = Qnil;
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_new(void *ptr, long size, freefunc_t func)
-{
-  return rb_dlptr_new2(rb_cDLPtrData, ptr, size, func);
-}
-
-VALUE
-rb_dlptr_malloc(long size, freefunc_t func)
-{
-  void *ptr;
-
-  rb_secure(4);
-  ptr = dlmalloc((size_t)size);
-  memset(ptr,0,(size_t)size);
-  return rb_dlptr_new(ptr, size, func);
-}
-
-void *
-rb_dlptr2cptr(VALUE val)
-{
-  struct ptr_data *data;
-  void *ptr;
-
-  if (rb_obj_is_kind_of(val, rb_cDLPtrData)) {
-    Data_Get_Struct(val, struct ptr_data, data);
-    ptr = data->ptr;
-  }
-  else if (val == Qnil) {
-    ptr = NULL;
-  }
-  else{
-    rb_raise(rb_eTypeError, "DL::PtrData was expected");
-  }
-    
-  return ptr;
-}
-
-static VALUE
-rb_dlptr_s_allocate(VALUE klass)
-{
-  VALUE obj;
-  struct ptr_data *data;
-
-  rb_secure(4);
-  obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data);
-  data->ptr = 0;
-  data->free = 0;
-  data->ctype = DLPTR_CTYPE_UNKNOWN;
-  data->stype = NULL;
-  data->ssize = NULL;
-  data->slen  = 0;
-  data->size  = 0;
-  data->ids   = NULL;
-  data->ids_num = 0;
-
-  return obj;
-}
-
-static VALUE
-rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
-{
-  VALUE ptr, sym, size;
-  struct ptr_data *data;
-  void *p = NULL;
-  freefunc_t f = NULL;
-  long s = 0;
-
-  switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
-  case 1:
-    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
-    break;
-  case 2:
-    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
-    s = DLNUM2LONG(size);
-    break;
-  case 3:
-    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
-    s = DLNUM2LONG(size);
-    f = rb_dlsym2csym(sym);
-    break;
-  default:
-    rb_bug("rb_dlptr_initialize");
-  }
-
-  if (p) {
-    Data_Get_Struct(self, struct ptr_data, data);
-    if (data->ptr && data->free) {
-      /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
-      (*(data->free))(data->ptr);
-    }
-    data->ptr  = p;
-    data->size = s;
-    data->free = f;
-  }
-
-  return Qnil;
-}
-
-static VALUE
-rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
-  VALUE size, sym, obj;
-  int   s;
-  freefunc_t f = NULL;
-
-  switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
-  case 1:
-    s = NUM2INT(size);
-    break;
-  case 2:
-    s = NUM2INT(size);
-    f = rb_dlsym2csym(sym);
-    break;
-  default:
-    rb_bug("rb_dlptr_s_malloc");
-  }
-
-  obj = rb_dlptr_malloc(s,f);
-
-  return obj;
-}
-
-VALUE
-rb_dlptr_to_i(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return DLLONG2NUM(data->ptr);
-}
-
-VALUE
-rb_dlptr_ptr(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return rb_dlptr_new(*((void**)(data->ptr)),0,0);
-}
-
-VALUE
-rb_dlptr_ref(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return rb_dlptr_new(&(data->ptr),0,0);
-}
-
-VALUE
-rb_dlptr_null_p(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return data->ptr ? Qfalse : Qtrue;
-}
-
-VALUE
-rb_dlptr_free_set(VALUE self, VALUE val)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-
-  data->free = DLFREEFUNC(rb_dlsym2csym(val));
-
-  return Qnil;
-}
-
-VALUE
-rb_dlptr_free_get(VALUE self)
-{
-  struct ptr_data *pdata;
-
-  Data_Get_Struct(self, struct ptr_data, pdata);
-
-  return rb_dlsym_new(pdata->free,"(free)","0P");
-}
-
-VALUE
-rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  int n;
-  int i;
-  int t;
-  VALUE ary;
-  VALUE type, size;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-
-  switch (rb_scan_args(argc, argv, "11", &type, &size)) {
-  case 2:
-    t = StringValuePtr(type)[0];
-    n = NUM2INT(size);
-    break;
-  case 1:
-    t = StringValuePtr(type)[0];
-    switch (t) {
-    case 'C':
-      n = data->size;
-      break;
-    case 'H':
-      n = data->size / sizeof(short);
-      break;
-    case 'I':
-      n = data->size / sizeof(int);
-      break;
-    case 'L':
-      n = data->size / sizeof(long);
-      break;
-    case 'F':
-      n = data->size / sizeof(float);
-      break;
-    case 'D':
-      n = data->size / sizeof(double);
-      break;
-    case  'P': case 'p':
-      n = data->size / sizeof(void*);
-      break;
-    case 'S': case 's':
-      for (n=0; ((void**)(data->ptr))[n]; n++) {};
-      break;
-    default:
-	n = 0;
-    }
-    break;
-  default:
-    rb_bug("rb_dlptr_to_array");
-  }
-
-  ary = rb_ary_new();
-
-  for (i=0; i < n; i++) {
-    switch (t) {
-    case 'C':
-      rb_ary_push(ary, INT2NUM(((char*)(data->ptr))[i]));
-      break;
-    case 'H':
-      rb_ary_push(ary, INT2NUM(((short*)(data->ptr))[i]));
-      break;
-    case 'I':
-      rb_ary_push(ary, INT2NUM(((int*)(data->ptr))[i]));
-      break;
-    case 'L':
-      rb_ary_push(ary, DLLONG2NUM(((long*)(data->ptr))[i]));
-      break;
-    case 'D':
-      rb_ary_push(ary, rb_float_new(((double*)(data->ptr))[i]));
-      break;
-    case 'F':
-      rb_ary_push(ary, rb_float_new(((float*)(data->ptr))[i]));
-      break;
-    case 'S':
-      {
-	char *str = ((char**)(data->ptr))[i];
-	if (str) {
-	  rb_ary_push(ary, rb_tainted_str_new2(str));
-	}
-	else{
-	  rb_ary_push(ary, Qnil);
-	}
-      }
-      break;
-    case 's':
-      {
-	char *str = ((char**)(data->ptr))[i];
-	if (str) {
-	  rb_ary_push(ary, rb_tainted_str_new2(str));
-	  xfree(str);
-	}
-	else{
-	  rb_ary_push(ary, Qnil);
-	}
-      }
-      break;
-    case 'P':
-      rb_ary_push(ary, rb_dlptr_new(((void**)(data->ptr))[i],0,0));
-      break;
-    case 'p':
-      rb_ary_push(ary,
-		  rb_dlptr_new(((void**)(data->ptr))[i],0,dlfree));
-      break;
-    }
-  }
-
-  return ary;
-}
-
-
-VALUE
-rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  VALUE arg1, val;
-  int len;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
-  case 0:
-    val = rb_tainted_str_new2((char*)(data->ptr));
-    break;
-  case 1:
-    len = NUM2INT(arg1);
-    val = rb_tainted_str_new((char*)(data->ptr), len);
-    break;
-  default:
-    rb_bug("rb_dlptr_to_s");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  VALUE arg1, val;
-  int len;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
-  case 0:
-    val = rb_tainted_str_new((char*)(data->ptr),data->size);
-    break;
-  case 1:
-    len = NUM2INT(arg1);
-    val = rb_tainted_str_new((char*)(data->ptr), len);
-    break;
-  default:
-    rb_bug("rb_dlptr_to_str");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_inspect(VALUE self)
-{
-  struct ptr_data *data;
-  char str[1024];
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
-	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
-	   (long)data->free);
-  return rb_str_new2(str);
-}
-
-VALUE
-rb_dlptr_eql(VALUE self, VALUE other)
-{
-  void *ptr1, *ptr2;
-  ptr1 = rb_dlptr2cptr(self);
-  ptr2 = rb_dlptr2cptr(other);
-
-  return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-VALUE
-rb_dlptr_cmp(VALUE self, VALUE other)
-{
-  void *ptr1, *ptr2;
-  ptr1 = rb_dlptr2cptr(self);
-  ptr2 = rb_dlptr2cptr(other);
-  return DLLONG2NUM((long)ptr1 - (long)ptr2);
-}
-
-VALUE
-rb_dlptr_plus(VALUE self, VALUE other)
-{
-  void *ptr;
-  long num, size;
-
-  ptr = rb_dlptr2cptr(self);
-  size = RDLPTR(self)->size;
-  num = DLNUM2LONG(other);
-  return rb_dlptr_new((char *)ptr + num, size - num, 0);
-}
-
-VALUE
-rb_dlptr_minus(VALUE self, VALUE other)
-{
-  void *ptr;
-  long num, size;
-
-  ptr = rb_dlptr2cptr(self);
-  size = RDLPTR(self)->size;
-  num = DLNUM2LONG(other);
-  return rb_dlptr_new((char *)ptr - num, size + num, 0);
-}
-
-VALUE
-rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
-{
-  VALUE data_type, type, rest, vid;
-  struct ptr_data *data;
-  int i, t, num;
-  char *ctype;
-
-  rb_scan_args(argc, argv, "11*", &data_type, &type, &rest);
-  Data_Get_Struct(self, struct ptr_data, data);
-
-  if (argc == 1 || (argc == 2 && type == Qnil)) {
-    if (NUM2INT(data_type) == DLPTR_CTYPE_UNKNOWN) {
-      data->ctype = DLPTR_CTYPE_UNKNOWN;
-      data->slen = 0;
-      data->ids_num  = 0;
-      if (data->stype) {
-	dlfree(data->stype);
-	data->stype = NULL;
-      }
-      if (data->ids) {
-	dlfree(data->ids);
-	data->ids = NULL;
-      }
-      return Qnil;
-    }
-    else{
-      rb_raise(rb_eArgError, "wrong arguments");
-    }
-  }
-
-  t = NUM2INT(data_type);
-  StringValue(type);
-  Check_Type(rest, T_ARRAY);
-  num = RARRAY(rest)->len;
-  for (i=0; i<num; i++) {
-    rb_to_id(rb_ary_entry(rest,i));
-  }
-
-  data->ctype = t;
-  data->slen = num;
-  data->ids_num  = num;
-  if (data->stype) dlfree(data->stype);
-  data->stype = (char*)dlmalloc(sizeof(char) * num);
-  if (data->ssize) dlfree(data->ssize);
-  data->ssize = (int*)dlmalloc(sizeof(int) * num);
-  if (data->ids) dlfree(data->ids);
-  data->ids  = (ID*)dlmalloc(sizeof(ID) * data->ids_num);
-
-  ctype = StringValuePtr(type);
-  for (i=0; i<num; i++) {
-    vid = rb_ary_entry(rest,i);
-    data->ids[i] = rb_to_id(vid);
-    data->stype[i] = *ctype;
-    ctype ++;
-    if (isdigit(*ctype)) {
-      char *p, *d;
-      for (p=ctype; isdigit(*p); p++) ;
-      d = ALLOCA_N(char, p - ctype + 1);
-      strncpy(d, ctype, p - ctype);
-      d[p - ctype] = '\0';
-      data->ssize[i] = atoi(d);
-      ctype = p;
-    }
-    else{
-      data->ssize[i] = 1;
-    }
-  }
-
-  if (*ctype) {
-    rb_raise(rb_eArgError, "too few/many arguments");
-  }
-
-  if (!data->size)
-    data->size = dlsizeof(RSTRING(type)->ptr);
-
-  return Qnil;
-}
-
-VALUE
-rb_dlptr_define_struct(int argc, VALUE argv[], VALUE self)
-{
-  VALUE *pass_argv;
-  int pass_argc, i;
-
-  pass_argc = argc + 1;
-  pass_argv = ALLOCA_N(VALUE, pass_argc);
-  pass_argv[0] = INT2FIX(DLPTR_CTYPE_STRUCT);
-  for (i=1; i<pass_argc; i++) {
-    pass_argv[i] = argv[i-1];
-  }
-  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
-}
-
-VALUE
-rb_dlptr_define_union(int argc, VALUE argv[], VALUE self)
-{
-  VALUE *pass_argv;
-  int pass_argc, i;
-
-  pass_argc = argc + 1;
-  pass_argv = ALLOCA_N(VALUE, pass_argc);
-  pass_argv[0] = INT2FIX(DLPTR_CTYPE_UNION);
-  for (i=1; i<pass_argc; i++) {
-    pass_argv[i] = argv[i-1];
-  }
-  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
-}
-
-VALUE
-rb_dlptr_get_data_type(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  if (data->stype)
-    return rb_assoc_new(INT2FIX(data->ctype),
-			rb_tainted_str_new(data->stype, data->slen));
-  else
-    return rb_assoc_new(INT2FIX(data->ctype), Qnil);
-}
-
-static VALUE
-cary2ary(void *ptr, char t, int len)
-{
-  VALUE ary;
-  VALUE elem;
-  int i;
-
-  if (len < 1)
-    return Qnil;
-
-  if (len == 1) {
-    switch (t) {
-    case 'I':
-      elem = INT2NUM(*((int*)ptr));
-      ptr = (char *)ptr + sizeof(int);
-      break;
-    case 'L':
-      elem = DLLONG2NUM(*((long*)ptr));
-      ptr = (char *)ptr + sizeof(long);
-      break;
-    case 'P':
-    case 'S':
-      elem = rb_dlptr_new(*((void**)ptr),0, 0);
-      ptr = (char *)ptr + sizeof(void*);
-      break;
-    case 'F':
-      elem = rb_float_new(*((float*)ptr));
-      ptr = (char *)ptr + sizeof(float);
-      break;
-    case 'D':
-      elem = rb_float_new(*((double*)ptr));
-      ptr = (char *)ptr + sizeof(double);
-      break;
-    case 'C':
-      elem = INT2NUM(*((char*)ptr));
-      ptr = (char *)ptr + sizeof(char);
-      break;
-    case 'H':
-      elem = INT2NUM(*((short*)ptr));
-      ptr = (char *)ptr + sizeof(short);
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
-    }
-    return elem;
-  }
-
-  ary = rb_ary_new();
-  for (i=0; i < len; i++) {
-    switch (t) {
-    case 'I':
-      elem = INT2NUM(*((int*)ptr));
-      ptr = (char *)ptr + sizeof(int);
-      break;
-    case 'L':
-      elem = DLLONG2NUM(*((long*)ptr));
-      ptr = (char *)ptr + sizeof(long);
-      break;
-    case 'P':
-    case 'S':
-      elem = rb_dlptr_new(*((void**)ptr), 0, 0);
-      ptr = (char *)ptr + sizeof(void*);
-      break;
-    case 'F':
-      elem = rb_float_new(*((float*)ptr));
-      ptr = (char *)ptr + sizeof(float);
-      break;
-    case 'D':
-      elem = rb_float_new(*((float*)ptr));
-      ptr = (char *)ptr + sizeof(double);
-      break;
-    case 'C':
-      elem = INT2NUM(*((char*)ptr));
-      ptr = (char *)ptr + sizeof(char);
-      break;
-    case 'H':
-      elem = INT2NUM(*((short*)ptr));
-      ptr = (char *)ptr + sizeof(short);
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
-    }
-    rb_ary_push(ary, elem);
-  }
-
-  return ary;
-}
-
-VALUE
-rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
-{
-  VALUE key = Qnil, num = Qnil;
-  ID id;
-  struct ptr_data *data;
-  int i;
-  int offset;
-
-  if (rb_scan_args(argc, argv, "11", &key, &num) == 1) {
-    num = INT2NUM(0);
-  }
-
-  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
-    VALUE pass[1];
-    pass[0] = num;
-    return rb_dlptr_to_str(1, pass, rb_dlptr_plus(self, key));
-  }
-  rb_to_id(key);
-  if (! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL)) {
-    rb_raise(rb_eTypeError, "the key must be a string or symbol");
-  }
-
-  id = rb_to_id(key);
-  Data_Get_Struct(self, struct ptr_data, data);
-  offset = 0;
-  switch (data->ctype) {
-  case DLPTR_CTYPE_STRUCT:
-    for (i=0; i < data->ids_num; i++) {
-      switch (data->stype[i]) {
-      case 'I':
-        DLALIGN(data->ptr,offset,INT_ALIGN);
-        break;
-      case 'L':
-        DLALIGN(data->ptr,offset,LONG_ALIGN);
-        break;
-      case 'P':
-      case 'S':
-        DLALIGN(data->ptr,offset,VOIDP_ALIGN);
-        break;
-      case 'F':
-        DLALIGN(data->ptr,offset,FLOAT_ALIGN);
-        break;
-      case 'D':
-        DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
-        break;
-      case 'C':
-        break;
-      case 'H':
-        DLALIGN(data->ptr,offset,SHORT_ALIGN);
-        break;
-      default:
-        rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
-      if (data->ids[i] == id) {
-	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
-      }
-      switch (data->stype[i]) {
-      case 'I':
-	offset += sizeof(int) * data->ssize[i];
-	break;
-      case 'L':
-	offset += sizeof(long) * data->ssize[i];
-	break;
-      case 'P':
-      case 'S':
-	offset += sizeof(void*) * data->ssize[i];
-	break;
-      case 'F':
-	offset += sizeof(float) * data->ssize[i];
-	break;
-      case 'D':
-	offset += sizeof(double) * data->ssize[i];
-	break;
-      case 'C':
-	offset += sizeof(char) * data->ssize[i];
-	break;
-      case 'H':
-	offset += sizeof(short) * data->ssize[i];
-	break;
-      default:
-	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
-    }
-    break;
-  case DLPTR_CTYPE_UNION:
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
-	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
-      }
-    }
-    break;
-  } /* end of switch */
-
-  rb_raise(rb_eNameError, "undefined key `%s' for %s",
-	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
-
-  return Qnil;
-}
-
-static void *
-ary2cary(char t, VALUE val, long *size)
-{
-  void *ptr;
-
-  if (TYPE(val) == T_ARRAY) {
-    ptr = rb_ary2cary(t, val, size);
-  }
-  else{
-    ptr = rb_ary2cary(t, rb_ary_new3(1, val), size);
-  }
-  return ptr;
-}
-
-VALUE
-rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
-{
-  VALUE key = Qnil, num = Qnil, val = Qnil;
-  ID id;
-  struct ptr_data *data;
-  int i;
-  int offset;
-  long memsize;
-  void *memimg;
-
-  rb_secure(4);
-  switch (rb_scan_args(argc, argv, "21", &key, &num, &val)) {
-  case 2:
-    val = num;
-    num = Qnil;
-    break;
-  }
-
-  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
-    void *dst, *src;
-    long len;
-
-    StringValue(val);
-    Data_Get_Struct(self, struct ptr_data, data);
-    dst = (void*)((long)(data->ptr) + DLNUM2LONG(key));
-    src = RSTRING(val)->ptr;
-    len = RSTRING(val)->len;
-    if (num == Qnil) {
-      memcpy(dst, src, len);
-    }
-    else{
-      long n = NUM2INT(num);
-      memcpy(dst, src, n < len ? n : len);
-      if (n > len) MEMZERO((char*)dst + len, char, n - len);
-    }
-    return val;
-  }
-
-  id = rb_to_id(key);
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (data->ctype) {
-  case DLPTR_CTYPE_STRUCT:
-    offset = 0;
-    for (i=0; i < data->ids_num; i++) {
-      switch (data->stype[i]) {
-      case 'I':
-        DLALIGN(data->ptr,offset,INT_ALIGN);
-        break;
-      case 'L':
-        DLALIGN(data->ptr,offset,LONG_ALIGN);
-        break;
-      case 'P':
-      case 'S':
-        DLALIGN(data->ptr,offset,VOIDP_ALIGN);
-        break;
-      case 'D':
-        DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
-        break;
-      case 'F':
-        DLALIGN(data->ptr,offset,FLOAT_ALIGN);
-        break;
-      case 'C':
-        break;
-      case 'H':
-        DLALIGN(data->ptr,offset,SHORT_ALIGN);
-        break;
-      default:
-        rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
-      if (data->ids[i] == id) {
-	memimg = ary2cary(data->stype[i], val, &memsize);
-	memcpy((char *)data->ptr + offset, memimg, memsize);
-        dlfree(memimg);
-	return val;
-      }
-      switch (data->stype[i]) {
-      case 'I':
-      case 'i':
-	offset += sizeof(int) * data->ssize[i];
-	break;
-      case 'L':
-      case 'l':
-	offset += sizeof(long) * data->ssize[i];
-	break;
-      case 'P':
-      case 'p':
-      case 'S':
-      case 's':
-	offset += sizeof(void*) * data->ssize[i];
-	break;
-      case 'D':
-      case 'd':
-	offset += sizeof(double) * data->ssize[i];
-	break;
-      case 'F':
-      case 'f':
-	offset += sizeof(float) * data->ssize[i];
-	break;
-      case 'C':
-      case 'c':
-	offset += sizeof(char) * data->ssize[i];
-	break;
-      case 'H':
-      case 'h':
-	offset += sizeof(short) * data->ssize[i];
-	break;
-      default:
-	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
-    }
-    return val;
-    /* break; */
-  case DLPTR_CTYPE_UNION:
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
-	switch (data->stype[i]) {
-	case 'I': case 'i':
-	  memsize = sizeof(int) * data->ssize[i];
-	  break;
-	case 'L': case 'l':
-	  memsize = sizeof(long) * data->ssize[i];
-	  break;
-	case 'P': case 'p':
-	case 'S': case 's':
-	  memsize = sizeof(void*) * data->ssize[i];
-	  break;
-	case 'F': case 'f':
-	  memsize = sizeof(float) * data->ssize[i];
-	  break;
-	case 'D': case 'd':
-	  memsize = sizeof(double) * data->ssize[i];
-	  break;
-	case 'C': case 'c':
-	  memsize = sizeof(char) * data->ssize[i];
-	  break;
-	case 'H': case 'h':
-	  memsize = sizeof(short) * data->ssize[i];
-	  break;
-	default:
-	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-	}
-	memimg = ary2cary(data->stype[i], val, NULL);
-	memcpy(data->ptr, memimg, memsize);
-        dlfree(memimg);
-      }
-    }
-    return val;
-    /* break; */
-  }
-
-  rb_raise(rb_eNameError, "undefined key `%s' for %s",
-	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
-
-  return Qnil;
-}
-
-VALUE
-rb_dlptr_size(int argc, VALUE argv[], VALUE self)
-{
-  VALUE size;
-
-  if (rb_scan_args(argc, argv, "01", &size) == 0){
-    return DLLONG2NUM(RDLPTR(self)->size);
-  }
-  else{
-    RDLPTR(self)->size = DLNUM2LONG(size);
-    return size;
-  }
-}
-
-static int
-dlmem_each_i(void* key, VALUE value, void* arg)
-{
-  VALUE vkey = DLLONG2NUM(key);
-  rb_yield(rb_assoc_new(vkey, value));
-  return Qnil;
-}
-
-VALUE
-rb_dlmem_each(VALUE self)
-{
-  st_foreach(st_memory_table, dlmem_each_i, 0);
-  return Qnil;
-}
-
-void
-Init_dlptr()
-{
-  rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cObject);
-  rb_define_alloc_func(rb_cDLPtrData, rb_dlptr_s_allocate);
-  rb_define_singleton_method(rb_cDLPtrData, "malloc", rb_dlptr_s_malloc, -1);
-  rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_initialize, -1);
-  rb_define_method(rb_cDLPtrData, "free=", rb_dlptr_free_set, 1);
-  rb_define_method(rb_cDLPtrData, "free",  rb_dlptr_free_get, 0);
-  rb_define_method(rb_cDLPtrData, "to_i",  rb_dlptr_to_i, 0);
-  rb_define_method(rb_cDLPtrData, "ptr",   rb_dlptr_ptr, 0);
-  rb_define_method(rb_cDLPtrData, "+@", rb_dlptr_ptr, 0);
-  rb_define_method(rb_cDLPtrData, "ref",   rb_dlptr_ref, 0);
-  rb_define_method(rb_cDLPtrData, "-@", rb_dlptr_ref, 0);
-  rb_define_method(rb_cDLPtrData, "null?", rb_dlptr_null_p, 0);
-  rb_define_method(rb_cDLPtrData, "to_a", rb_dlptr_to_array, -1);
-  rb_define_method(rb_cDLPtrData, "to_s", rb_dlptr_to_s, -1);
-  rb_define_method(rb_cDLPtrData, "to_str", rb_dlptr_to_str, -1);
-  rb_define_method(rb_cDLPtrData, "inspect", rb_dlptr_inspect, 0);
-  rb_define_method(rb_cDLPtrData, "<=>", rb_dlptr_cmp, 1);
-  rb_define_method(rb_cDLPtrData, "==", rb_dlptr_eql, 1);
-  rb_define_method(rb_cDLPtrData, "eql?", rb_dlptr_eql, 1);
-  rb_define_method(rb_cDLPtrData, "+", rb_dlptr_plus, 1);
-  rb_define_method(rb_cDLPtrData, "-", rb_dlptr_minus, 1);
-  rb_define_method(rb_cDLPtrData, "define_data_type",
-		   rb_dlptr_define_data_type, -1);
-  rb_define_method(rb_cDLPtrData, "struct!", rb_dlptr_define_struct, -1);
-  rb_define_method(rb_cDLPtrData, "union!",  rb_dlptr_define_union,  -1);
-  rb_define_method(rb_cDLPtrData, "data_type", rb_dlptr_get_data_type, 0);
-  rb_define_method(rb_cDLPtrData, "[]", rb_dlptr_aref, -1);
-  rb_define_method(rb_cDLPtrData, "[]=", rb_dlptr_aset, -1);
-  rb_define_method(rb_cDLPtrData, "size", rb_dlptr_size, -1);
-  rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
-
-  rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
-  st_memory_table = st_init_numtable();
-  rb_define_const(rb_mDLMemorySpace, "MemoryTable", Qnil); /* historical */
-  rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);
-}
diff --git a/ext/dl/sample/c++sample.C b/ext/dl/sample/c++sample.C
deleted file mode 100644
index d083d337a7..0000000000
--- a/ext/dl/sample/c++sample.C
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <stdio.h>
-
-class Person {
-private:
-  const char *name;
-  int age;
-
-public:
-  Person(const char *name, int age);
-  const char * get_name();
-  int get_age();
-  void set_age(int i);
-};
-
-Person::Person(const char *name, int age)
-  : name(name), age(age)
-{
-  /* empty */
-}
-
-const char *
-Person::get_name()
-{
-  return name;
-}
-
-int
-Person::get_age(){
-  return age;
-}
-
-void
-Person::set_age(int i){
-  age = i;
-}
diff --git a/ext/dl/sample/c++sample.rb b/ext/dl/sample/c++sample.rb
deleted file mode 100644
index 29887df845..0000000000
--- a/ext/dl/sample/c++sample.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-=begin
- This script shows how to deal with C++ classes using Ruby/DL.
- You must build a dynamic loadable library using "c++sample.C"
- to run this script as follows:
-   $ g++ -o libsample.so -shared c++sample.C
-=end
-
-require 'dl'
-require 'dl/import'
-require 'dl/struct'
-
-# Give a name of dynamic loadable library
-LIBNAME = ARGV[0] || "libsample.so"
-
-class Person
-  module Core
-    extend DL::Importable
-    
-    dlload LIBNAME
-
-    # mangled symbol names
-    extern "void __6PersonPCci(void *, const char *, int)"
-    extern "const char *get_name__6Person(void *)"
-    extern "int get_age__6Person(void *)"
-    extern "void set_age__6Personi(void *, int)"
-
-    Data = struct [
-      "char *name",
-      "int age",
-    ]
-  end
-
-  def initialize(name, age)
-    @ptr = Core::Data.alloc
-    Core::__6PersonPCci(@ptr, name, age)
-  end
-
-  def get_name()
-    str = Core::get_name__6Person(@ptr)
-    if( str )
-      str.to_s
-    else
-      nil
-    end
-  end
-
-  def get_age()
-    Core::get_age__6Person(@ptr)
-  end
-
-  def set_age(age)
-    Core::set_age__6Personi(@ptr, age)
-  end
-end
-
-obj = Person.new("ttate", 1)
-p obj.get_name()
-p obj.get_age()
-obj.set_age(10)
-p obj.get_age()
diff --git a/ext/dl/sample/drives.rb b/ext/dl/sample/drives.rb
deleted file mode 100644
index 8a590404b1..0000000000
--- a/ext/dl/sample/drives.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- ruby -*-
-# drives.rb -- find existing drives and show the drive type.
-
-require 'dl'
-require 'dl/import'
-
-module Kernel32
-  extend DL::Importable
-
-  dlload "kernel32"
-
-  extern "long GetLogicalDrives()"
-  extern "int GetDriveType(char*)"
-  extern "long GetDiskFreeSpace(char*, long ref, long ref, long ref, long ref)"
-end
-
-include Kernel32
-
-buff = Kernel32.getLogicalDrives()
-
-i = 0
-ds = []
-while( i < 26 )
-  mask = (1 << i)
-  if( buff & mask > 0 )
-    ds.push((65+i).chr)
-  end
-  i += 1
-end
-
-=begin
-From the cygwin's /usr/include/w32api/winbase.h:
-#define DRIVE_UNKNOWN 0
-#define DRIVE_NO_ROOT_DIR 1
-#define DRIVE_REMOVABLE 2
-#define DRIVE_FIXED 3
-#define DRIVE_REMOTE 4
-#define DRIVE_CDROM 5
-#define DRIVE_RAMDISK 6
-=end
-
-types = [
-  "unknown",
-  "no root dir",
-  "Removable",
-  "Fixed", 
-  "Remote",
-  "CDROM",
-  "RAM",
-]
-print("Drive : Type (Free Space/Available Space)\n")
-ds.each{|d|
-  t = Kernel32.getDriveType(d + ":\\")
-  Kernel32.getDiskFreeSpace(d + ":\\", 0, 0, 0, 0)
-  _,sec_per_clus,byte_per_sec,free_clus,total_clus = Kernel32._args_
-  fbytes = sec_per_clus * byte_per_sec * free_clus
-  tbytes = sec_per_clus * byte_per_sec * total_clus
-  unit = "B"
-  if( fbytes > 1024 && tbytes > 1024 )
-    fbytes = fbytes / 1024
-    tbytes = tbytes / 1024
-    unit = "K"
-  end
-  if( fbytes > 1024 && tbytes > 1024 )
-    fbytes = fbytes / 1024
-    tbytes = tbytes / 1024
-    unit = "M"
-  end
-  print("#{d} : #{types[t]} (#{fbytes} #{unit}/#{tbytes} #{unit})\n")
-}
diff --git a/ext/dl/sample/getch.rb b/ext/dl/sample/getch.rb
deleted file mode 100644
index 3f7261c979..0000000000
--- a/ext/dl/sample/getch.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'dl'
-
-crtdll = DL::dlopen("crtdll")
-getch  = crtdll['_getch', 'L']
-print(getch.call, "\n")
diff --git a/ext/dl/sample/libc.rb b/ext/dl/sample/libc.rb
deleted file mode 100644
index a1f6fbe543..0000000000
--- a/ext/dl/sample/libc.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require "dl/import"
-require "dl/struct"
-
-module LIBC
-  extend DL::Importable
-
-  begin
-    dlload "libc.so.6"
-  rescue
-    dlload "libc.so.5"
-  end
-
-  extern "int atoi(char*)"
-  extern "ibool isdigit(int)"
-  extern "int gettimeofday(struct timeval *, struct timezone *)"
-  extern "char* strcat(char*, char*)"
-  extern "FILE* fopen(char*, char*)"
-  extern "int fclose(FILE*)"
-  extern "int fgetc(FILE*)"
-  extern "int strlen(char*)"
-  extern "void qsort(void*, int, int, void*)"
-
-  def str_qsort(ary, comp)
-    len = ary.length
-    r,rs = qsort(ary, len, DL.sizeof('P'), comp)
-    return rs[0].to_a('S', len)
-  end
-
-  Timeval = struct [
-    "long tv_sec",
-    "long tv_usec",
-  ]
-
-  Timezone = struct [
-    "int tz_minuteswest",
-    "int tz_dsttime",
-  ]
-
-  def my_compare(ptr1, ptr2)
-    ptr1.ptr.to_s <=> ptr2.ptr.to_s
-  end
-  COMPARE = callback("int my_compare(char**, char**)")
-end
-
-
-$cb1 = DL.callback('IPP'){|ptr1, ptr2|
-  str1 = ptr1.ptr.to_s
-  str2 = ptr2.ptr.to_s
-  str1 <=> str2
-}
-
-p LIBC.atoi("10")
-
-p LIBC.isdigit(?1)
-
-p LIBC.isdigit(?a)
-
-p LIBC.strcat("a", "b")
-
-ary = ["a","c","b"]
-ptr = ary.to_ptr
-LIBC.qsort(ptr, ary.length, DL.sizeof('P'), LIBC::COMPARE)
-p ptr.to_a('S', ary.length)
-
-tv = LIBC::Timeval.malloc
-tz = LIBC::Timezone.malloc
-LIBC.gettimeofday(tv, tz)
-
-p Time.at(tv.tv_sec)
diff --git a/ext/dl/sample/msgbox.rb b/ext/dl/sample/msgbox.rb
deleted file mode 100644
index 091e646091..0000000000
--- a/ext/dl/sample/msgbox.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# This script works on Windows.
-
-require 'dl'
-
-User32 = DL.dlopen("user32")
-Kernel32 = DL.dlopen("kernel32")
-
-MB_OK = 0
-MB_OKCANCEL = 1
-
-message_box = User32['MessageBoxA', 'ILSSI']
-r,rs = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
-
-case r
-when 1
-  print("OK!\n")
-when 2
-  print("Cancel!\n")
-end
diff --git a/ext/dl/sample/msgbox2.rb b/ext/dl/sample/msgbox2.rb
deleted file mode 100644
index e49846cc5e..0000000000
--- a/ext/dl/sample/msgbox2.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# This script works on Windows.
-
-require 'dl/win32'
-
-MB_OK = 0
-MB_OKCANCEL = 1
-
-message_box = Win32API.new("user32",'MessageBoxA', 'ISSI', 'I')
-r = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
-
-case r
-when 1
-  print("OK!\n")
-when 2
-  print("Cancel!\n")
-else
-  p r
-end
diff --git a/ext/dl/sample/stream.rb b/ext/dl/sample/stream.rb
deleted file mode 100644
index 179836999d..0000000000
--- a/ext/dl/sample/stream.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- ruby -*-
-# Display a file name and stream names of a file with those size.
-
-require 'dl'
-require 'dl/import'
-
-module NTFS
-  extend DL::Importable
-
-  dlload "kernel32.dll"
-
-  OPEN_EXISTING         = 3
-  GENERIC_READ          = 0x80000000
-  BACKUP_DATA           = 0x00000001
-  BACKUP_ALTERNATE_DATA = 0x00000004
-  FILE_SHARE_READ       = 0x00000001
-  FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
-
-  typealias "LPSECURITY_ATTRIBUTES", "void*"
-
-  extern "BOOL BackupRead(HANDLE, PBYTE, DWORD, PDWORD, BOOL, BOOL, PVOID)"
-  extern "BOOL BackupSeek(HANDLE, DWORD, DWORD, PDWORD, PDWORD, PVOID)"
-  extern "BOOL CloseHandle(HANDLE)"
-  extern "HANDLE CreateFile(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
-                            DWORD, DWORD, HANDLE)"
-
-  module_function
-
-  def streams(filename)
-    status = []
-    h = createFile(filename,GENERIC_READ,FILE_SHARE_READ,nil,
-		   OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,0)
-    if( h != 0 )
-      begin
-	# allocate the memory for backup data used in backupRead().
-	data = DL.malloc(DL.sizeof("L5"))
-	data.struct!("LLLLL", :id, :attrs, :size_low, :size_high, :name_size)
-
-	# allocate memories for references to long values used in backupRead().
-	context = DL.malloc(DL.sizeof("L"))
-	lval = DL.malloc(DL.sizeof("L"))
-
-	while( backupRead(h, data, data.size, lval, false, false, context) )
-	  size = data[:size_low] + (data[:size_high] << (DL.sizeof("I") * 8))
-	  case data[:id]
-	  when BACKUP_ALTERNATE_DATA
-	    stream_name = DL.malloc(data[:name_size])
-	    backupRead(h, stream_name, stream_name.size,
-		       lval, false, false, context)
-	    name = stream_name[0, stream_name.size]
-	    name.tr!("\000","")
-	    if( name =~ /^:(.*?):.*$/ )
-	      status.push([$1,size])
-	    end
-	  when BACKUP_DATA
-	    status.push([nil,size])
-	  else
-	    raise(RuntimeError, "unknown data type #{data[:id]}.")
-	  end
-	  l1 = DL.malloc(DL.sizeof("L"))
-	  l2 = DL.malloc(DL.sizeof("L"))
-	  if( !backupSeek(h, data[:size_low], data[:size_high], l1, l2, context) )
-	    break
-	  end
-	end
-      ensure
-	backupRead(h, nil, 0, lval, true, false, context)
-	closeHandle(h)
-      end
-      return status
-    else
-      raise(RuntimeError, "can't open #{filename}.\n")
-    end
-  end
-end
-
-ARGV.each{|filename|
-  if( File.exist?(filename) )
-    NTFS.streams(filename).each{|name,size|
-      if( name )
-	print("#{filename}:#{name}\t#{size}bytes\n")
-      else
-	print("#{filename}\t#{size}bytes\n")
-      end
-    }
-  end
-}
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
deleted file mode 100644
index 01e0474f58..0000000000
--- a/ext/dl/sym.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include <errno.h>
-#include "dl.h"
-
-VALUE rb_cDLSymbol;
-
-static const char *
-char2type(int ch)
-{
-  switch (ch) {
-  case '0':
-    return "void";
-  case 'P':
-    return "void *";
-  case 'p':
-    return "void *";
-  case 'C':
-    return "char";
-  case 'c':
-    return "char *";
-  case 'H':
-    return "short";
-  case 'h':
-    return "short *";
-  case 'I':
-    return "int";
-  case 'i':
-    return "int *";
-  case 'L':
-    return "long";
-  case 'l':
-    return "long *";
-  case 'F':
-    return "double";
-  case 'f':
-    return "double *";
-  case 'D':
-    return "double";
-  case 'd':
-    return "double *";
-  case 'S':
-    return "const char *";
-  case 's':
-    return "char *";
-  case 'A':
-    return "[]";
-  case 'a':
-    return "[]"; /* ?? */
-  }
-  return NULL;
-}
-
-void
-dlsym_free(struct sym_data *data)
-{
-  if( data->name ){
-    DEBUG_CODE({
-      printf("dlsym_free(): free(data->name:%s)\n",data->name);
-    });
-    free(data->name);
-  }
-  if( data->type ){
-    DEBUG_CODE({
-      printf("dlsym_free(): free(data->type:%s)\n",data->type);
-    });
-    free(data->type);
-  }
-}
-
-VALUE
-rb_dlsym_new(void (*func)(), const char *name, const char *type)
-{
-  VALUE val;
-  struct sym_data *data;
-  const char *ptype;
-
-  rb_secure(4);
-  if( !type || !type[0] ){
-    return rb_dlptr_new((void*)func, 0, 0);
-  }
-
-  for( ptype = type; *ptype; ptype ++ ){
-    if( ! char2type(*ptype) ){
-      rb_raise(rb_eDLTypeError, "unknown type specifier '%c'", *ptype);
-    }
-  }
-
-  if( func ){
-    val = Data_Make_Struct(rb_cDLSymbol, struct sym_data, 0, dlsym_free, data);
-    data->func = func;
-    data->name = name ? strdup(name) : NULL;
-    data->type = type ? strdup(type) : NULL;
-    data->len  = type ? strlen(type) : 0;
-#if !(defined(DLSTACK))
-    if( data->len - 1 > MAX_ARG ){
-      rb_raise(rb_eDLError, "maximum number of arguments is %d.", MAX_ARG);
-    }
-#endif
-  }
-  else{
-    val = Qnil;
-  }
-
-  return val;
-}
-
-freefunc_t
-rb_dlsym2csym(VALUE val)
-{
-  struct sym_data *data;
-  freefunc_t func;
-
-  if( rb_obj_is_kind_of(val, rb_cDLSymbol) ){
-    Data_Get_Struct(val, struct sym_data, data);
-    func = data->func;
-  }
-  else if( val == Qnil ){
-    func = NULL;
-  }
-  else{
-    rb_raise(rb_eTypeError, "DL::Symbol was expected");
-  }
-
-  return func;
-}
-
-VALUE
-rb_dlsym_s_allocate(VALUE klass)
-{
-  VALUE obj;
-  struct sym_data *data;
-
-  obj = Data_Make_Struct(klass, struct sym_data, 0, dlsym_free, data);
-  data->func = 0;
-  data->name = 0;
-  data->type = 0;
-  data->len  = 0;
-
-  return obj;
-}
-
-VALUE
-rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
-{
-  VALUE addr, name, type;
-  struct sym_data *data;
-  void *saddr;
-  const char *sname, *stype;
-
-  rb_scan_args(argc, argv, "12", &addr, &name, &type);
-
-  saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
-  if (!NIL_P(name)) StringValue(name);
-  stype = NIL_P(type) ? NULL : StringValuePtr(type);
-  sname = NIL_P(name) ? NULL : RSTRING(name)->ptr;
-
-  if( saddr ){
-    Data_Get_Struct(self, struct sym_data, data);
-    if( data->name ) free(data->name);
-    if( data->type ) free(data->type);
-    data->func = saddr;
-    data->name = sname ? strdup(sname) : 0;
-    data->type = stype ? strdup(stype) : 0;
-    data->len  = stype ? strlen(stype) : 0;
-  }
-
-  return Qnil;
-}
-
-VALUE
-rb_s_dlsym_char2type(VALUE self, VALUE ch)
-{
-  const char *type;
-
-  type = char2type(StringValuePtr(ch)[0]);
-
-  if (type == NULL)
-    return Qnil;
-  else
-    return rb_str_new2(type);
-}
-
-VALUE
-rb_dlsym_name(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return sym->name ? rb_tainted_str_new2(sym->name) : Qnil;
-}
-
-VALUE
-rb_dlsym_proto(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return sym->type ? rb_tainted_str_new2(sym->type) : Qnil;
-}
-
-VALUE
-rb_dlsym_cproto(VALUE self)
-{
-  struct sym_data *sym;
-  const char *ptype, *typestr;
-  size_t len;
-  VALUE val;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-
-  ptype = sym->type;
-
-  if( ptype ){
-    typestr = char2type(*ptype++);
-    len = strlen(typestr);
-    
-    val = rb_tainted_str_new(typestr, len);
-    if (typestr[len - 1] != '*')
-      rb_str_cat(val, " ", 1);
-
-    if( sym->name ){
-      rb_str_cat2(val, sym->name);
-    }
-    else{
-      rb_str_cat2(val, "(null)");
-    }
-    rb_str_cat(val, "(", 1);
-    
-    while (*ptype) {
-      const char *ty = char2type(*ptype++);
-      rb_str_cat2(val, ty);
-      if (*ptype)
-	rb_str_cat(val, ", ", 2);
-    }
-
-    rb_str_cat(val, ");", 2);
-  }
-  else{
-    val = rb_tainted_str_new2("void (");
-    if( sym->name ){
-      rb_str_cat2(val, sym->name);
-    }
-    else{
-      rb_str_cat2(val, "(null)");
-    }
-    rb_str_cat2(val, ")()");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlsym_inspect(VALUE self)
-{
-  VALUE proto;
-  VALUE val;
-  char  *str;
-  int str_size;
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  proto = rb_dlsym_cproto(self);
-
-  str_size = RSTRING(proto)->len + 100;
-  str = dlmalloc(str_size);
-  snprintf(str, str_size - 1,
-          "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
-	   sym, sym->func, RSTRING(proto)->ptr);
-  val = rb_tainted_str_new2(str);
-  dlfree(str);
-
-  return val;
-}
-
-static int
-stack_size(struct sym_data *sym)
-{
-  int i;
-  int size;
-
-  size = 0;
-  for( i=1; i < sym->len; i++ ){
-    switch(sym->type[i]){
-    case 'C':
-    case 'H':
-    case 'I':
-    case 'L':
-      size += sizeof(long);
-      break;
-    case 'F':
-      size += sizeof(float);
-      break;
-    case 'D':
-      size += sizeof(double);
-      break;
-    case 'c':
-    case 'h':
-    case 'i':
-    case 'l':
-    case 'f':
-    case 'd':
-    case 'p':
-    case 'P':
-    case 's':
-    case 'S':
-    case 'a':
-    case 'A':
-      size += sizeof(void*);
-      break;
-    default:
-      return -(sym->type[i]);
-    }
-  }
-  return size;
-}
-
-static ID rb_dl_id_DLErrno;
-
-static VALUE
-rb_dl_get_last_error(VALUE self)
-{
-  return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLErrno);
-}
-
-static VALUE
-rb_dl_set_last_error(VALUE self, VALUE val)
-{
-  errno = NUM2INT(val);
-  rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, val);
-  return Qnil;
-}
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-static ID rb_dl_id_DLW32Error;
-
-static VALUE
-rb_dl_win32_get_last_error(VALUE self)
-{
-  return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLW32Error);
-}
-
-static VALUE
-rb_dl_win32_set_last_error(VALUE self, VALUE val)
-{
-    SetLastError(NUM2INT(val));
-    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, val);
-    return Qnil;
-}
-#endif
-
-#ifdef DLSTACK_GUARD
-# ifdef __MSVC_RUNTIME_CHECKS
-#  pragma runtime_checks("s", off)
-# endif
-# if _MSC_VER >= 1300
-__declspec(noinline)
-# endif
-static int
-rb_dlsym_guardcall(char type, ANY_TYPE *ret, long *stack, void *func)
-{
-  char *volatile guard = ALLOCA_N(char, 1); /* guard stack pointer */
-  switch(type){
-  case '0':
-    {
-      void (*f)(DLSTACK_PROTO) = func;
-      f(DLSTACK_ARGS);
-    }
-    break;
-  case 'P':
-  case 'p':
-    {
-      void * (*f)(DLSTACK_PROTO) = func;
-      ret->p = f(DLSTACK_ARGS);
-    }
-    break;
-  case 'C':
-  case 'c':
-    {
-      char (*f)(DLSTACK_PROTO) = func;
-      ret->c = f(DLSTACK_ARGS);
-    }
-    break;
-  case 'H':
-  case 'h':
-    {
-      short (*f)(DLSTACK_PROTO) = func;
-      ret->h = f(DLSTACK_ARGS);
-    }
-    break;
-  case 'I':
-  case 'i':
-    {
-      int (*f)(DLSTACK_PROTO) = func;
-      ret->i = f(DLSTACK_ARGS);
-    }
-    break;
-  case 'L':
-  case 'l':
-    {
-      long (*f)(DLSTACK_PROTO) = func;
-      ret->l = f(DLSTACK_ARGS);
-    }
-    break;
-  case 'F':
-  case 'f':
-    {
-      float (*f)(DLSTACK_PROTO) = func;
-      ret->f = f(DLSTACK_ARGS);
-    }
-    break;
-  case 'D':
-  case 'd':
-    {
-      double (*f)(DLSTACK_PROTO) = func;
-      ret->d = f(DLSTACK_ARGS);
-    }
-    break;
-  case 'S':
-  case 's':
-    {
-      char * (*f)(DLSTACK_PROTO) = func;
-      ret->s = f(DLSTACK_ARGS);
-    }
-    break;
-  default:
-    return 0;
-  }
-  return 1;
-}
-# ifdef __MSVC_RUNTIME_CHECKS
-#  pragma runtime_checks("s", restore)
-# endif
-#endif /* defined(DLSTACK_GUARD) */
-
-VALUE
-rb_dlsym_call(int argc, VALUE argv[], VALUE self)
-{
-  struct sym_data *sym;
-  ANY_TYPE *args;
-  ANY_TYPE *dargs;
-  ANY_TYPE ret;
-  int   *dtypes;
-  VALUE val;
-  VALUE dvals;
-  int i;
-  long ftype;
-  void *func;
-
-  rb_secure_update(self);
-  Data_Get_Struct(self, struct sym_data, sym);
-  DEBUG_CODE({
-    printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);
-  });
-  if( (sym->len - 1) != argc ){
-    rb_raise(rb_eArgError, "%d arguments are needed", sym->len - 1);
-  }
-
-  ftype = 0;
-  dvals = Qnil;
-
-  args = ALLOC_N(ANY_TYPE, sym->len - 1);
-  dargs = ALLOC_N(ANY_TYPE, sym->len - 1);
-  dtypes = ALLOC_N(int, sym->len - 1);
-#define FREE_ARGS {xfree(args); xfree(dargs); xfree(dtypes);}
-
-  for( i = sym->len - 2; i >= 0; i-- ){
-    dtypes[i] = 0;
-
-    switch( sym->type[i+1] ){
-    case 'p':
-      dtypes[i] = 'p';
-    case 'P':
-      {
-	struct ptr_data *data;
-	VALUE pval;
-
-	if( argv[i] == Qnil ){
-	  ANY2P(args[i]) = DLVOIDP(0);
-	}
-	else{
-	  if( rb_obj_is_kind_of(argv[i], rb_cDLPtrData) ){
-	    pval = argv[i];
-	  }
-	  else{
-	    pval = rb_funcall(argv[i], rb_intern("to_ptr"), 0);
-	    if( !rb_obj_is_kind_of(pval, rb_cDLPtrData) ){
-	      rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i);
-	    }
-	  }
-	  Data_Get_Struct(pval, struct ptr_data, data);
-	  ANY2P(args[i]) = DLVOIDP(data->ptr);
-	}
-      }
-      PUSH_P(ftype);
-      break;
-    case 'a':
-      dtypes[i] = 'a';
-    case 'A':
-      if( argv[i] == Qnil ){
-	ANY2P(args[i]) = DLVOIDP(0);
-      }
-      else{
-	ANY2P(args[i]) = DLVOIDP(rb_ary2cary(0, argv[i], NULL));
-      }
-      PUSH_P(ftype);
-      break;
-    case 'C':
-      ANY2C(args[i]) = DLCHAR(NUM2CHR(argv[i]));
-      PUSH_C(ftype);
-      break;
-    case 'c':
-      ANY2C(dargs[i]) = DLCHAR(NUM2CHR(argv[i]));
-      ANY2P(args[i]) = DLVOIDP(&(ANY2C(dargs[i])));
-      dtypes[i] = 'c';
-      PUSH_P(ftype);
-      break;
-    case 'H':
-      ANY2H(args[i]) = DLSHORT(NUM2INT(argv[i]));
-      PUSH_C(ftype);
-      break;
-    case 'h':
-      ANY2H(dargs[i]) = DLSHORT(NUM2INT(argv[i]));
-      ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
-      dtypes[i] = 'h';
-      PUSH_P(ftype);
-      break;
-    case 'I':
-      ANY2I(args[i]) = DLINT(NUM2INT(argv[i]));
-      PUSH_I(ftype);
-      break;
-    case 'i':
-      ANY2I(dargs[i]) = DLINT(NUM2INT(argv[i]));
-      ANY2P(args[i]) = DLVOIDP(&(ANY2I(dargs[i])));
-      dtypes[i] = 'i';
-      PUSH_P(ftype);
-      break;
-    case 'L':
-      ANY2L(args[i]) = DLNUM2LONG(argv[i]);
-      PUSH_L(ftype);
-      break;
-    case 'l':
-      ANY2L(dargs[i]) = DLNUM2LONG(argv[i]);
-      ANY2P(args[i]) = DLVOIDP(&(ANY2L(dargs[i])));
-      dtypes[i] = 'l';
-      PUSH_P(ftype);
-      break;
-    case 'F':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2F(args[i]) = DLFLOAT(RFLOAT(argv[i])->value);
-      PUSH_F(ftype);
-      break;
-    case 'f':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2F(dargs[i]) = DLFLOAT(RFLOAT(argv[i])->value);
-      ANY2P(args[i]) = DLVOIDP(&(ANY2F(dargs[i])));
-      dtypes[i] = 'f';
-      PUSH_P(ftype);
-      break;
-    case 'D':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2D(args[i]) = RFLOAT(argv[i])->value;
-      PUSH_D(ftype);
-      break;
-    case 'd':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2D(dargs[i]) = RFLOAT(argv[i])->value;
-      ANY2P(args[i]) = DLVOIDP(&(ANY2D(dargs[i])));
-      dtypes[i] = 'd';
-      PUSH_P(ftype);
-      break;
-    case 'S':
-      if( argv[i] == Qnil ){
-	ANY2S(args[i]) = DLSTR(0);
-      }
-      else{
-	VALUE str = argv[i];
-	SafeStringValue(str);
-	ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
-      }
-      PUSH_P(ftype);
-      break;
-    case 's':
-      {
-	VALUE str = argv[i];
-	SafeStringValue(str);
-	ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(str)->len + 1));
-	memcpy((char*)(ANY2S(args[i])), RSTRING(str)->ptr, RSTRING(str)->len + 1);
-	dtypes[i] = 's';
-      }
-      PUSH_P(ftype);
-      break;
-    default:
-      FREE_ARGS;
-      rb_raise(rb_eDLTypeError,
-	       "unknown type '%c' of the return value.",
-	       sym->type[i+1]);
-    }
-  }
-
-  switch( sym->type[0] ){
-  case '0':
-    PUSH_0(ftype);
-    break;
-  case 'P':
-  case 'p':
-  case 'S':
-  case 's':
-  case 'A':
-  case 'a':
-    PUSH_P(ftype);
-    break;
-  case 'C':
-  case 'c':
-    PUSH_C(ftype);
-    break;
-  case 'H':
-  case 'h':
-    PUSH_H(ftype);
-    break;
-  case 'I':
-  case 'i':
-    PUSH_I(ftype);
-    break;
-  case 'L':
-  case 'l':
-    PUSH_L(ftype);
-    break;
-  case 'F':
-  case 'f':
-    PUSH_F(ftype);
-    break;
-  case 'D':
-  case 'd':
-    PUSH_D(ftype);
-    break;
-  default:
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError,
-	     "unknown type `%c' of the return value.",
-	     sym->type[0]);
-  }
-
-  func = sym->func;
-
-#if defined(DLSTACK)
-  {
-#if defined(DLSTACK_SIZE)
-  int  stk_size;
-  long stack[DLSTACK_SIZE];
-  long *sp;
-
-  sp = stack;
-  stk_size = stack_size(sym);
-  if( stk_size < 0 ){
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unknown type '%c'.", -stk_size);
-  }
-  else if( stk_size > (int)(DLSTACK_SIZE) ){
-    FREE_ARGS;
-    rb_raise(rb_eArgError, "too many arguments.");
-  }
-#endif
-
-  DLSTACK_START(sym);
-
-#if defined(DLSTACK_REVERSE)
-  for( i = sym->len - 2; i >= 0; i-- )
-#else
-  for( i = 0; i <= sym->len -2; i++ )
-#endif
-  {
-    switch( sym->type[i+1] ){
-    case 'p':
-    case 'P':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'a':
-    case 'A':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'C':
-      DLSTACK_PUSH_C(ANY2C(args[i]));
-      break;
-    case 'c':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'H':
-      DLSTACK_PUSH_H(ANY2H(args[i]));
-      break;
-    case 'h':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'I':
-      DLSTACK_PUSH_I(ANY2I(args[i]));
-      break;
-    case 'i':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'L':
-      DLSTACK_PUSH_L(ANY2L(args[i]));
-      break;
-    case 'l':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'F':
-      DLSTACK_PUSH_F(ANY2F(args[i]));
-      break;
-    case 'f':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'D':
-      DLSTACK_PUSH_D(ANY2D(args[i]));
-      break;
-    case 'd':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'S':
-    case 's':
-      DLSTACK_PUSH_P(ANY2S(args[i]));
-      break;
-    }
-  }
-  DLSTACK_END(sym->type);
-
-#ifdef DLSTACK_GUARD
-  if(!rb_dlsym_guardcall(sym->type[0], &ret, stack, func)) {
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
-  }
-#else /* defined(DLSTACK_GUARD) */
-  {
-    switch( sym->type[0] ){
-    case '0':
-      {
-	void (*f)(DLSTACK_PROTO) = func;
-	f(DLSTACK_ARGS);
-      }
-      break;
-    case 'P':
-    case 'p':
-      {
-	void * (*f)(DLSTACK_PROTO) = func;
-	ret.p = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'C':
-    case 'c':
-      {
-	char (*f)(DLSTACK_PROTO) = func;
-	ret.c = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'H':
-    case 'h':
-      {
-	short (*f)(DLSTACK_PROTO) = func;
-	ret.h = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'I':
-    case 'i':
-      {
-	int (*f)(DLSTACK_PROTO) = func;
-	ret.i = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'L':
-    case 'l':
-      {
-	long (*f)(DLSTACK_PROTO) = func;
-	ret.l = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'F':
-    case 'f':
-      {
-	float (*f)(DLSTACK_PROTO) = func;
-	ret.f = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'D':
-    case 'd':
-      {
-	double (*f)(DLSTACK_PROTO) = func;
-	ret.d = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'S':
-    case 's':
-      {
-	char * (*f)(DLSTACK_PROTO) = func;
-	ret.s = f(DLSTACK_ARGS);
-      }
-      break;
-    default:
-      FREE_ARGS;
-      rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
-    }
-  }
-#endif /* defubed(DLSTACK_GUARD) */
-
-  {
-    /*
-     * We should get the value of errno/GetLastError() before calling another functions.
-     */
-    int last_errno = errno;
-#ifdef _WIN32
-    DWORD win32_last_err = GetLastError();
-#endif
-
-    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, INT2NUM(last_errno));
-#ifdef _WIN32
-    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, INT2NUM(win32_last_err));
-#endif
-  }
-
-  }
-#else /* defined(DLSTACK) */
-  switch(ftype){
-#include "call.func"
-  default:
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unsupported function type `%s'", sym->type);
-  }
-#endif /* defined(DLSTACK) */
-
-  switch( sym->type[0] ){
-  case '0':
-    val = Qnil;
-    break;
-  case 'P':
-    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, 0);
-    break;
-  case 'p':
-    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, dlfree);
-    break;
-  case 'C':
-  case 'c':
-    val = CHR2FIX((char)(ANY2C(ret)));
-    break;
-  case 'H':
-  case 'h':
-    val = INT2NUM((short)(ANY2H(ret)));
-    break;
-  case 'I':
-  case 'i':
-    val = INT2NUM((int)(ANY2I(ret)));
-    break;
-  case 'L':
-  case 'l':
-    val = DLLONG2NUM((long)(ANY2L(ret)));
-    break;
-  case 'F':
-  case 'f':
-    val = rb_float_new((double)(ANY2F(ret)));
-    break;
-  case 'D':
-  case 'd':
-    val = rb_float_new((double)(ANY2D(ret)));
-    break;
-  case 'S':
-    if( ANY2S(ret) ){
-      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
-    }
-    else{
-      val = Qnil;
-    }
-    break;
-  case 's':
-    if( ANY2S(ret) ){
-      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
-      DEBUG_CODE({
-	printf("dlfree(%s)\n",(char*)(ANY2S(ret)));
-      });
-      dlfree((void*)(ANY2S(ret)));
-    }
-    else{
-      val = Qnil;
-    }
-    break;
-  default:
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
-  }
-
-  dvals = rb_ary_new();
-  for( i = 0; i <= sym->len - 2; i++ ){
-    if( dtypes[i] ){
-      switch( dtypes[i] ){
-      case 'c':
-	rb_ary_push(dvals, CHR2FIX(*((char*)(ANY2P(args[i])))));
-	break;
-      case 'h':
-	rb_ary_push(dvals, INT2NUM(*((short*)(ANY2P(args[i])))));
-	break;
-      case 'i':
-	rb_ary_push(dvals, INT2NUM(*((int*)(ANY2P(args[i])))));
-	break;
-      case 'l':
-        rb_ary_push(dvals, DLLONG2NUM(*((long*)(ANY2P(args[i])))));
-        break;
-      case 'f':
-	rb_ary_push(dvals, rb_float_new(*((float*)(ANY2P(args[i])))));
-	break;
-      case 'd':
-	rb_ary_push(dvals, rb_float_new(*((double*)(ANY2P(args[i])))));
-	break;
-      case 'p':
-	rb_ary_push(dvals, rb_dlptr_new((void*)(ANY2P(args[i])), 0, 0));
-	break;
-      case 'a':
-	rb_ary_push(dvals, rb_dlptr_new((void*)ANY2P(args[i]), 0, 0));
-	break;
-      case 's':
-	rb_ary_push(dvals, rb_tainted_str_new2((char*)ANY2S(args[i])));
-	DEBUG_CODE({
-	  printf("dlfree(%s)\n",(char*)ANY2S(args[i]));
-	});
-	dlfree((void*)ANY2S(args[i]));
-	break;
-      default:
-	{
-	  char c = dtypes[i];
-	  FREE_ARGS;
-	  rb_raise(rb_eRuntimeError, "unknown argument type '%c'", i, c);
-	}
-      }
-    }
-    else{
-      switch( sym->type[i+1] ){
-      case 'A':
-	dlfree((void*)ANY2P(args[i]));
-	break;
-      }
-      rb_ary_push(dvals, argv[i]);
-    }
-  }
-
-  FREE_ARGS;
-#undef FREE_ARGS
-  return rb_assoc_new(val,dvals);
-}
-
-VALUE
-rb_dlsym_to_i(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return DLLONG2NUM(sym);
-}
-
-VALUE
-rb_dlsym_to_ptr(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return rb_dlptr_new(sym->func, sizeof(freefunc_t), 0);
-}
-
-void
-Init_dlsym()
-{
-  rb_cDLSymbol = rb_define_class_under(rb_mDL, "Symbol", rb_cObject);
-  rb_define_alloc_func(rb_cDLSymbol, rb_dlsym_s_allocate);
-  rb_define_singleton_method(rb_cDLSymbol, "char2type", rb_s_dlsym_char2type, 1);
-  rb_define_method(rb_cDLSymbol, "initialize", rb_dlsym_initialize, -1);
-  rb_define_method(rb_cDLSymbol, "call", rb_dlsym_call, -1);
-  rb_define_method(rb_cDLSymbol, "[]",   rb_dlsym_call, -1);
-  rb_define_method(rb_cDLSymbol, "name", rb_dlsym_name, 0);
-  rb_define_method(rb_cDLSymbol, "proto", rb_dlsym_proto, 0);
-  rb_define_method(rb_cDLSymbol, "cproto", rb_dlsym_cproto, 0);
-  rb_define_method(rb_cDLSymbol, "inspect", rb_dlsym_inspect, 0);
-  rb_define_method(rb_cDLSymbol, "to_s", rb_dlsym_cproto, 0);
-  rb_define_method(rb_cDLSymbol, "to_ptr", rb_dlsym_to_ptr, 0);
-  rb_define_method(rb_cDLSymbol, "to_i", rb_dlsym_to_i, 0);
-
-  rb_dl_id_DLErrno = rb_intern("DLErrno");
-  rb_define_singleton_method(rb_mDL, "last_error", rb_dl_get_last_error, 0);  
-  rb_define_singleton_method(rb_mDL, "last_error=", rb_dl_set_last_error, 1);
-#ifdef _WIN32
-  rb_dl_id_DLW32Error = rb_intern("DLW32Error");
-  rb_define_singleton_method(rb_mDL, "win32_last_error", rb_dl_win32_get_last_error, 0);
-  rb_define_singleton_method(rb_mDL, "win32_last_error=", rb_dl_win32_set_last_error, 1);
-#endif
-}
diff --git a/ext/dl/test/libtest.def b/ext/dl/test/libtest.def
deleted file mode 100644
index 8ecefc917b..0000000000
--- a/ext/dl/test/libtest.def
+++ /dev/null
@@ -1,28 +0,0 @@
-EXPORTS
-test_alloc_test_struct
-test_append
-test_arylen
-test_c2i
-test_call_func1
-test_callback1
-test_close
-test_d2f
-test_f2d
-test_fill_test_struct
-test_fill_test_union
-test_gets
-test_i2c
-test_init
-test_isucc
-test_lcc
-test_lsucc
-test_open
-test_strcat
-test_strlen
-test_succ
-test_data_init
-test_data_add
-test_data_aref
-test_set_long_value
-test_get_long_value
-internal_long_value
diff --git a/ext/dl/test/test.c b/ext/dl/test/test.c
deleted file mode 100644
index 7321379390..0000000000
--- a/ext/dl/test/test.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-static char internal_string[] = "internal_string";
-long internal_long_value = 100;
-
-struct test_struct {
-  char c;
-  long l;
-};
-
-union test_union {
-  char c;
-  int  i;
-  long l;
-  void *p;
-};
-
-struct test_data {
-  char name[1024];
-  struct test_data *next;
-};
-
-long
-test_get_long_value()
-{
-  return internal_long_value;
-};
-
-void
-test_set_long_value(long l)
-{
-  internal_long_value = l;
-};
-
-void
-test_fill_test_struct(struct test_struct *ptr, char c, long l)
-{
-  ptr->c = c;
-  ptr->l = l;
-};
-
-void
-test_fill_test_union(union test_union *ptr, long l)
-{
-  ptr->l = l;
-};
-
-struct test_struct *
-test_alloc_test_struct(char c, long l)
-{
-  struct test_struct *data;
-
-  data = (struct test_struct *)malloc(sizeof(struct test_struct));
-  data->c = c;
-  data->l = l;
-
-  return data;
-};
-
-int
-test_c2i(char c)
-{
-  return (int)c;
-};
-
-char
-test_i2c(int i)
-{
-  return (char)i;
-};
-
-long
-test_lcc(char c1, char c2)
-{
-  return (long)(c1 + c2);
-};
-
-double
-test_f2d(float f)
-{
-  double d;
-  d = f;
-  return d;
-};
-
-float
-test_d2f(double d)
-{
-  float f;
-  f = d;
-  return f;
-};
-
-int
-test_strlen(const char *str)
-{
-  return strlen(str);
-};
-
-int
-test_isucc(int i)
-{
-  return (i+1);
-};
-
-long
-test_lsucc(long l)
-{
-  return (l+1);
-};
-
-void
-test_succ(long *l)
-{
-  (*l)++;
-};
-
-char *
-test_strcat(char *str1, const char *str2)
-{
-  return strcat(str1, str2);
-};
-
-int
-test_arylen(char *ary[])
-{
-  int i;
-  for( i=0; ary[i]; i++ ){};
-  return i;
-};
-
-void
-test_append(char *ary[], int len, char *astr)
-{
-  int i;
-  int size1,size2;
-  char *str;
-
-  size2 = strlen(astr);
-
-  for( i=0; i <= len - 1; i++ ){
-    size1 = strlen(ary[i]);
-    str = (char*)malloc(size1 + size2 + 1);
-    strcpy(str, ary[i]);
-    strcat(str, astr);
-    ary[i] = str;
-  };
-};
-
-int
-test_init(int *argc, char **argv[])
-{
-  int i;
-  char s[256];
-
-  for( i=0; i < (*argc); i++ ){
-    sprintf(s, "arg%d", i);
-    if( strcmp((*argv)[i], s) != 0 ){
-      return 1;
-    }
-  }
-  return 0;
-}
-
-FILE *
-test_open(const char *filename, const char *mode)
-{
-  FILE *file;
-  file = fopen(filename,mode);
-  return file;
-};
-
-void
-test_close(FILE *file)
-{
-  fclose(file);
-};
-
-char *
-test_gets(char *s, int size, FILE *f)
-{
-  return fgets(s,size,f);
-};
-
-typedef int callback1_t(int, char *);
-#define CALLBACK_MSG "callback message"
-
-int
-test_callback1(int err, const char *msg)
-{
-  if( strcmp(msg, CALLBACK_MSG) == 0 ){
-    return 1;
-  }
-  else{
-    return 0;
-  }
-}
-
-int
-test_call_func1(callback1_t *func)
-{
-  if( func ){
-    return (*func)(0, CALLBACK_MSG);
-  }
-  else{
-    return 0;
-  }
-}
-
-struct test_data *
-test_data_init()
-{
-  struct test_data *data;
-
-  data = (struct test_data *)malloc(sizeof(struct test_data));
-  data->next = NULL;
-  memset(data->name, 0, 1024);
-
-  return data;
-};
-
-void
-test_data_add(struct test_data *list, const char *name)
-{
-  struct test_data *data;
-
-  data = (struct test_data *)malloc(sizeof(struct test_data));
-  memset(data->name, 0, 1024);
-  strncpy(data->name, name, 1024);
-  data->next = list->next;
-  list->next = data;
-};
-
-struct test_data *
-test_data_aref(struct test_data *list, int i)
-{
-  struct test_data *data;
-  int j;
-
-  for( data = list->next, j=0; data; data = data->next, j++ ){
-    if( i == j ){
-      return data;
-    };
-  };
-  return NULL;
-};
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
deleted file mode 100644
index bf8dfc18e3..0000000000
--- a/ext/dl/test/test.rb
+++ /dev/null
@@ -1,306 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-require 'dl/import'
-
-$FAIL = 0
-$TOTAL = 0
-
-def assert(label, ty, *conds)
-  $TOTAL += 1
-  cond = !conds.include?(false)
-  if( cond )
-    printf("succeed in `#{label}'\n")
-  else
-    $FAIL += 1
-    case ty
-    when :may
-      printf("fail in `#{label}' ... expected\n")
-    when :must
-      printf("fail in `#{label}' ... unexpected\n")
-    when :raise
-      raise(RuntimeError, "fail in `#{label}'")
-    end
-  end
-end
-
-def debug(*xs)
-  if( $DEBUG )
-    xs.each{|x|
-      p x
-    }
-  end
-end
-
-print("DLSTACK   = #{DL::DLSTACK}\n")
-print("MAX_ARG   = #{DL::MAX_ARG}\n")
-print("\n")
-print("DL::FREE = #{DL::FREE.inspect}\n")
-print("\n")
-
-$LIB = nil
-if( !$LIB && File.exist?("libtest.so") )
-  $LIB = "./libtest.so"
-end
-if( !$LIB && File.exist?("test/libtest.so") )
-  $LIB = "./test/libtest.so"
-end
-
-module LIBTest
-  extend DL::Importable
-
-  dlload($LIB)
-  extern "int test_c2i(char)"
-  extern "char test_i2c(int)"
-  extern "long test_lcc(char, char)"
-  extern "double test_f2d(float)"
-  extern "float test_d2f(double)"
-  extern "int test_strlen(char*)"
-  extern "int test_isucc(int)"
-  extern "long test_lsucc(long)"
-  extern "void test_succ(long *)"
-  extern "int test_arylen(int [])"
-  extern "void test_append(char*[], int, char *)"
-end
-
-DL.dlopen($LIB){|h|
-  c2i = h["test_c2i","IC"]
-  debug c2i
-  r,rs = c2i[?a]
-  debug r,rs
-  assert("c2i", :may, r == ?a)
-  assert("extern c2i", :must, r == LIBTest.test_c2i(?a))
-
-  i2c = h["test_i2c","CI"]
-  debug i2c
-  r,rs = i2c[?a]
-  debug r,rs
-  assert("i2c", :may, r == ?a)
-  assert("exern i2c", :must, r == LIBTest.test_i2c(?a))
-
-  lcc = h["test_lcc","LCC"]
-  debug lcc
-  r,rs = lcc[1,2]
-  assert("lcc", :may, r == 3)
-  assert("extern lcc", :must, r == LIBTest.test_lcc(1,2))
-
-  f2d = h["test_f2d","DF"]
-  debug f2d
-  r,rs = f2d[20.001]
-  debug r,rs
-  assert("f2d", :may, r.to_i == 20)
-  assert("extern f2d", :must, r = LIBTest.test_f2d(20.001))
-
-  d2f = h["test_d2f","FD"]
-  debug d2f
-  r,rs = d2f[20.001]
-  debug r,rs
-  assert("d2f", :may, r.to_i == 20)
-  assert("extern d2f", :must, r == LIBTest.test_d2f(20.001))
-
-  strlen = h["test_strlen","IS"]
-  debug strlen
-  r,rs = strlen["0123456789"]
-  debug r,rs
-  assert("strlen", :must, r == 10)
-  assert("extern strlen", :must, r == LIBTest.test_strlen("0123456789"))
-
-  isucc = h["test_isucc","II"]
-  debug isucc
-  r,rs = isucc[2]
-  debug r,rs
-  assert("isucc", :must, r == 3)
-  assert("extern isucc", :must, r == LIBTest.test_isucc(2))
-
-  lsucc = h["test_lsucc","LL"]
-  debug lsucc
-  r,rs = lsucc[10000000]
-  debug r,rs
-  assert("lsucc", :must, r == 10000001)
-  assert("extern lsucc", :must, r == LIBTest.test_lsucc(10000000))
-
-  succ = h["test_succ","0l"]
-  debug succ
-  r,rs = succ[0]
-  debug r,rs
-  assert("succ", :must, rs[0] == 1)
-  l = DL.malloc(DL.sizeof("L"))
-  l.struct!("L",:lval)
-  LIBTest.test_succ(l)
-  assert("extern succ", :must, rs[0] == l[:lval])
-
-  arylen = h["test_arylen","IA"]
-  debug arylen
-  r,rs = arylen[["a","b","c","d",nil]]
-  debug r,rs
-  assert("arylen", :must, r == 4)
-
-  arylen = h["test_arylen","IP"]
-  debug arylen
-  r,rs = arylen[["a","b","c","d",nil]]
-  debug r,rs
-  assert("arylen", :must, r == 4)
-  assert("extern arylen", :must, r == LIBTest.test_arylen(["a","b","c","d",nil]))
-
-  append = h["test_append","0aIS"]
-  debug append
-  r,rs = append[["a","b","c"],3,"x"]
-  debug r,rs
-  assert("append", :must, rs[0].to_a('S',3) == ["ax","bx","cx"])
-
-  LIBTest.test_append(["a","b","c"],3,"x")
-  assert("extern append", :must, rs[0].to_a('S',3) == LIBTest._args_[0].to_a('S',3))
-
-  strcat = h["test_strcat","SsS"]
-  debug strcat
-  r,rs = strcat["abc\0","x"]
-  debug r,rs
-  assert("strcat", :must, rs[0].to_s == "abcx")
-
-  init = h["test_init","IiP"]
-  debug init
-  argc = 3
-  argv = ["arg0","arg1","arg2"].to_ptr
-  r,rs = init[argc, argv.ref]
-  assert("init", :must, r == 0)
-}
-
-
-h = DL.dlopen($LIB)
-
-sym_open = h["test_open", "PSS"]
-sym_gets = h["test_gets", "SsIP"]
-sym_close = h["test_close", "0P"]
-debug sym_open,sym_gets,sym_close
-
-line = "Hello world!\n"
-File.open("tmp.txt", "w"){|f|
-  f.print(line)
-}
-
-fp,rs = sym_open["tmp.txt", "r"]
-if( fp )
-  fp.free = sym_close
-  r,rs = sym_gets[" " * 256, 256, fp]
-  debug r,rs
-  assert("open,gets", :must, rs[0] == line)
-  ObjectSpace.define_finalizer(fp) {File.unlink("tmp.txt")}
-  fp = nil
-else
-  assert("open,gets", :must, line == nil)
-  File.unlink("tmp.txt")
-end
-
-
-callback1 = h["test_callback1"]
-debug callback1
-r,rs = h["test_call_func1", "IP"][callback1]
-debug r,rs
-assert("callback1", :must, r == 1)
-
-
-callback2 = DL.callback("LLP"){|num,ptr|
-  msg = ptr.to_s
-  if( msg == "callback message" )
-    2
-  else
-    0
-  end
-}
-debug callback2
-r,rs = h["test_call_func1", "IP"][callback2]
-debug r,rs
-assert("callback2", :must, r == 2)
-DL.remove_callback(callback2)
-
-ptr = DL.malloc(DL.sizeof('CL'))
-ptr.struct!("CL", :c, :l)
-ptr["c"] = 0
-ptr["l"] = 0
-r,rs = h["test_fill_test_struct","0PIL"][ptr,100,1000]
-debug r,rs
-assert("fill_test_struct", :must, ptr["c"] == 100, ptr["l"] == 1000)
-assert("fill_test_struct", :must, ptr[:c] == 100, ptr[:l] == 1000) unless (Fixnum === :-)
-
-
-r,rs = h["test_alloc_test_struct", "PIL"][100,200]
-r.free = DL::FREE
-r.struct!("CL", :c, :l)
-assert("alloc_test_struct", :must, r["c"] == 100, r["l"] == 200)
-assert("alloc_test_struct", :must, r[:c] == 100, r[:l] == 200) unless (Fixnum === :-)
-
-ptr = h["test_strlen"]
-sym1 = DL::Symbol.new(ptr,"foo","0")
-sym2 = h["test_strlen","LS"]
-assert("Symbol.new", :must, ptr == sym1.to_ptr, sym1.to_ptr == sym2.to_ptr)
-
-set_val = h["test_set_long_value","0"]
-get_val = h["test_get_long_value","L"]
-lval = get_val[][0]
-ptr = h["internal_long_value"]
-ptr.struct!("L", :l)
-assert("get value", :must, ptr["l"] == lval)
-assert("get value", :must, ptr[:l] == lval) unless (Fixnum === :-)
-ptr["l"] = 200
-lval = get_val[][0]
-assert("set value", :must, ptr["l"] == lval)
-assert("set value", :must, ptr[:l] == lval) unless (Fixnum === :-)
-
-
-data_init = h["test_data_init", "P"]
-data_add  = h["test_data_add", "0PS"]
-data_aref = h["test_data_aref", "PPI"]
-r,rs = data_init[]
-ptr = r
-data_add[ptr, "name1"]
-data_add[ptr, "name2"]
-data_add[ptr, "name3"]
-
-r,rs = data_aref[ptr, 1]
-ptr = r
-ptr.struct!("C1024P", :name, :next)
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2")
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2") unless (Fixnum === :-)
-
-ptr = ptr["next"]
-ptr.struct!("C1024P", :name, :next)
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1")
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1") unless (Fixnum === :-)
-
-GC.start
-
-ptr = DL::malloc(32)
-ptr.struct!("CHIL", "c", "h", "i", "l")
-ptr["c"] = 1
-ptr["h"] = 2
-ptr["i"] = 3
-ptr["l"] = 4
-assert("struct!", :must,
-       ptr["c"] == 1 &&
-       ptr["h"] == 2 &&
-       ptr["i"] == 3 &&
-       ptr["l"] == 4)
-
-ptr = DL::malloc(DL::sizeof("IP"))
-ptr.struct!("IP", "n", "ptr")
-ptr["n"] = 10
-ptr["ptr"] = nil
-assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
-
-ptr = DL::malloc(16)
-ptr.struct!("CICI", "c1", "i1", "c2", "i2")
-ptr["c1"] = 0xf1
-ptr["c2"] = 0xf2
-c1 = [ptr["c1"]].pack("c").unpack("C")[0]
-c2 = [ptr["c2"]].pack("c").unpack("C")[0]
-assert("struct!", :must,
-  c1 == 0xf1 &&
-  c2 == 0xf2)
-
-
-GC.start
-printf("fail/total = #{$FAIL}/#{$TOTAL}\n")
diff --git a/ext/dl/type.rb b/ext/dl/type.rb
deleted file mode 100644
index 804420c395..0000000000
--- a/ext/dl/type.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# example:
-#  DLTYPE[INT][:rb2c]["arg0"] => "NUM2INT(arg0)"
-#  DLTYPE[DOUBLE][:c2rb]["r"] => "rb_float_new(r)"
-
-DLTYPE = {
-  VOID  = 0x00 => {
-    :name => 'VOID',
-    :rb2c => nil,
-    :c2rb => nil,
-    :ctype => "void",
-    :stmem => "v",
-    :sym => true,
-    :cb => true,
-  },
-  CHAR  = 0x01 => {
-    :name => 'CHAR',
-    :rb2c => proc{|x| "NUM2CHR(#{x})"},
-    :c2rb => proc{|x| "CHR2FIX(#{x})"},
-    :ctype => "char",
-    :stmem => "c",
-    :sym => false,
-    :cb => false,
-  },
-  SHORT = 0x02 => {
-    :name => 'SHORT',
-    :rb2c => proc{|x| "FIX2INT(#{x})"},
-    :c2rb => proc{|x| "INT2FIX(#{x})"},
-    :ctype => "short",
-    :stmem => "h",
-    :sym => false,
-    :cb => false,
-  },
-  INT   = 0x03 => {
-    :name => 'INT',
-    :rb2c => proc{|x| "NUM2INT(#{x})"},
-    :c2rb => proc{|x| "INT2NUM(#{x})"},
-    :ctype => "int",
-    :stmem => "i",
-    :sym => true,
-    :cb => false,
-  },
-  LONG  = 0x04 => {
-    :name => 'LONG',
-    :rb2c => proc{|x| "NUM2INT(#{x})"},
-    :c2rb => proc{|x| "INT2NUM(#{x})"},
-    :ctype => "long",
-    :stmem => "l",
-    :sym => true,
-    :cb => true,
-  },
-  FLOAT = 0x05 => {
-    :name => 'FLOAT',
-    :rb2c => proc{|x| "(float)(RFLOAT(#{x})->value)"},
-    :c2rb => proc{|x| "rb_float_new((double)#{x})"},
-    :ctype => "float",
-    :stmem => "f",
-    :sym => false,
-    :cb => false,
-  },
-  DOUBLE = 0x06 => {
-    :name => 'DOUBLE',
-    :rb2c => proc{|x| "RFLOAT(#{x})->value"},
-    :c2rb => proc{|x| "rb_float_new(#{x})"},
-    :ctype => "double",
-    :stmem => "d",
-    :sym => true,
-    :cb => true,
-  },
-  VOIDP = 0x07 => {
-    :name => 'VOIDP',
-    :rb2c => proc{|x| "rb_dlptr2cptr(#{x})"},
-    :c2rb => proc{|x| "rb_dlptr_new(#{x},sizeof(void*),0)"},
-    :ctype => "void *",
-    :stmem => "p",
-    :sym => true,
-    :cb => true,
-  },
-}
-
-def tpush(t, x)
-  (t << 3)|x
-end
-
-def tget(t, i)
-  (t & (0x07 << (i * 3))) >> (i * 3)
-end
-
-def types2num(types)
-  res = 0x00
-  r = types.reverse
-  r.each{|t|
-    res = tpush(res,t)
-  }
-  res
-end
-
-def num2types(num)
-  ts = []
-  i  = 0
-  t = tget(num,i)
-  while( (t != VOID && i > 0) || (i == 0) )
-    ts.push(DLTYPE[t][:ctype])
-    i += 1
-    t = tget(num,i)
-  end
-  ts
-end
-
-def types2ctypes(types)
-  res = []
-  types.each{|t|
-    res.push(DLTYPE[t][:ctype])
-  }
-  res
-end
diff --git a/ext/dl/win32/extconf.rb b/ext/dl/win32/extconf.rb
new file mode 100644
index 0000000000..a72ca49c06
--- /dev/null
+++ b/ext/dl/win32/extconf.rb
@@ -0,0 +1,3 @@
+if compiled?('dl') and $mswin||$bccwin||$mingw||$cygwin
+  create_makefile('win32')
+end
diff --git a/ext/dl/win32/lib/Win32API.rb b/ext/dl/win32/lib/Win32API.rb
new file mode 100644
index 0000000000..f18cec5749
--- /dev/null
+++ b/ext/dl/win32/lib/Win32API.rb
@@ -0,0 +1,30 @@
+# -*- ruby -*-
+# for backward compatibility
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use dl directly instead" if $VERBOSE
+
+require 'dl'
+
+class Win32API
+  DLL = {}
+  TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
+
+  def initialize(dllname, func, import, export = "0", calltype = :stdcall)
+    @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+    handle = DLL[dllname] ||= DL.dlopen(dllname)
+    @func = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func, calltype)
+  rescue DL::DLError => e
+    raise LoadError, e.message, e.backtrace
+  end
+
+  def call(*args)
+    import = @proto.split("")
+    args.each_with_index do |x, i|
+      args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if import[i] == "S"
+      args[i], = [x].pack("I").unpack("i") if import[i] == "I"
+    end
+    ret, = @func.call(args)
+    return ret || 0
+  end
+
+  alias Call call
+end
diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb
new file mode 100644
index 0000000000..6edd85b8fb
--- /dev/null
+++ b/ext/dl/win32/lib/win32/registry.rb
@@ -0,0 +1,845 @@
+require 'dl/import'
+module Win32
+
+=begin rdoc
+= Win32 Registry
+
+win32/registry is registry accessor library for Win32 platform.
+It uses dl/import to call Win32 Registry APIs.
+
+== example
+  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
+    value = reg['foo']                               # read a value
+    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
+    type, value = reg.read('foo')                    # read a value
+    reg['foo'] = 'bar'                               # write a value
+    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
+    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
+
+    reg.each_value { |name, type, data| ... }        # Enumerate values
+    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
+
+    reg.delete_value(name)                         # Delete a value
+    reg.delete_key(name)                           # Delete a subkey
+    reg.delete_key(name, true)                     # Delete a subkey recursively
+  end
+
+= Reference
+
+== Win32::Registry class
+
+--- info
+
+--- num_keys
+
+--- max_key_length
+
+--- num_values
+
+--- max_value_name_length
+
+--- max_value_length
+
+--- descriptor_length
+
+--- wtime
+    Returns an item of key information.
+
+=== constants
+--- HKEY_CLASSES_ROOT
+
+--- HKEY_CURRENT_USER
+
+--- HKEY_LOCAL_MACHINE
+
+--- HKEY_PERFORMANCE_DATA
+
+--- HKEY_CURRENT_CONFIG
+
+--- HKEY_DYN_DATA
+
+    Win32::Registry object whose key is predefined key.
+For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp] article.
+
+=end rdoc
+
+  class Registry
+
+    #
+    # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp].
+    #
+    # --- HKEY_*
+    #
+    #     Predefined key ((*handle*)).
+    #     These are Integer, not Win32::Registry.
+    #
+    # --- REG_*
+    #
+    #     Registry value type.
+    #
+    # --- KEY_*
+    #
+    #     Security access mask.
+    #
+    # --- KEY_OPTIONS_*
+    #
+    #     Key options.
+    #
+    # --- REG_CREATED_NEW_KEY
+    #
+    # --- REG_OPENED_EXISTING_KEY
+    #
+    #     If the key is created newly or opened existing key.
+    #     See also Registry#disposition method.
+    module Constants
+      HKEY_CLASSES_ROOT = 0x80000000
+      HKEY_CURRENT_USER = 0x80000001
+      HKEY_LOCAL_MACHINE = 0x80000002
+      HKEY_USERS = 0x80000003
+      HKEY_PERFORMANCE_DATA = 0x80000004
+      HKEY_PERFORMANCE_TEXT = 0x80000050
+      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
+      HKEY_CURRENT_CONFIG = 0x80000005
+      HKEY_DYN_DATA = 0x80000006
+
+      REG_NONE = 0
+      REG_SZ = 1
+      REG_EXPAND_SZ = 2
+      REG_BINARY = 3
+      REG_DWORD = 4
+      REG_DWORD_LITTLE_ENDIAN = 4
+      REG_DWORD_BIG_ENDIAN = 5
+      REG_LINK = 6
+      REG_MULTI_SZ = 7
+      REG_RESOURCE_LIST = 8
+      REG_FULL_RESOURCE_DESCRIPTOR = 9
+      REG_RESOURCE_REQUIREMENTS_LIST = 10
+      REG_QWORD = 11
+      REG_QWORD_LITTLE_ENDIAN = 11
+
+      STANDARD_RIGHTS_READ = 0x00020000
+      STANDARD_RIGHTS_WRITE = 0x00020000
+      KEY_QUERY_VALUE = 0x0001
+      KEY_SET_VALUE = 0x0002
+      KEY_CREATE_SUB_KEY = 0x0004
+      KEY_ENUMERATE_SUB_KEYS = 0x0008
+      KEY_NOTIFY = 0x0010
+      KEY_CREATE_LINK = 0x0020
+      KEY_READ = STANDARD_RIGHTS_READ |
+        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
+      KEY_WRITE = STANDARD_RIGHTS_WRITE |
+        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
+      KEY_EXECUTE = KEY_READ
+      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+
+      REG_OPTION_RESERVED = 0x0000
+      REG_OPTION_NON_VOLATILE = 0x0000
+      REG_OPTION_VOLATILE = 0x0001
+      REG_OPTION_CREATE_LINK = 0x0002
+      REG_OPTION_BACKUP_RESTORE = 0x0004
+      REG_OPTION_OPEN_LINK = 0x0008
+      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
+        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
+        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
+
+      REG_CREATED_NEW_KEY = 1
+      REG_OPENED_EXISTING_KEY = 2
+
+      REG_WHOLE_HIVE_VOLATILE = 0x0001
+      REG_REFRESH_HIVE = 0x0002
+      REG_NO_LAZY_FLUSH = 0x0004
+      REG_FORCE_RESTORE = 0x0008
+
+      MAX_KEY_LENGTH = 514
+      MAX_VALUE_LENGTH = 32768
+    end
+    include Constants
+    include Enumerable
+
+    #
+    # Error
+    #
+    class Error < ::StandardError
+      module Kernel32
+        extend DL::Importer
+        dlload "kernel32.dll"
+      end
+      FormatMessageA = Kernel32.extern "int FormatMessageA(int, void *, int, int, void *, int, void *)", :stdcall
+      def initialize(code)
+        @code = code
+        msg = "\0".force_encoding(Encoding::ASCII_8BIT) * 1024
+        len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
+        msg = msg[0, len].force_encoding(Encoding.find(Encoding.locale_charmap))
+        super msg.tr("\r", '').chomp
+      end
+      attr_reader :code
+    end
+
+    #
+    # Predefined Keys
+    #
+    class PredefinedKey < Registry
+      def initialize(hkey, keyname)
+        @hkey = hkey
+        @parent = nil
+        @keyname = keyname
+        @disposition = REG_OPENED_EXISTING_KEY
+      end
+
+      # Predefined keys cannot be closed
+      def close
+        raise Error.new(5) ## ERROR_ACCESS_DENIED
+      end
+
+      # Fake #class method for Registry#open, Registry#create
+      def class
+        Registry
+      end
+
+      # Make all
+      Constants.constants.grep(/^HKEY_/) do |c|
+        Registry.const_set c, new(Constants.const_get(c), c.to_s)
+      end
+    end
+
+    #
+    # Win32 APIs
+    #
+    module API
+      extend DL::Importer
+      dlload "advapi32.dll"
+      [
+        "long RegOpenKeyExA(void *, void *, long, long, void *)",
+        "long RegCreateKeyExA(void *, void *, long, long, long, long, void *, void *, void *)",
+        "long RegEnumValueA(void *, long, void *, void *, void *, void *, void *, void *)",
+        "long RegEnumKeyExA(void *, long, void *, void *, void *, void *, void *, void *)",
+        "long RegQueryValueExA(void *, void *, void *, void *, void *, void *)",
+        "long RegSetValueExA(void *, void *, long, long, void *, long)",
+        "long RegDeleteValue(void *, void *)",
+        "long RegDeleteKey(void *, void *)",
+        "long RegFlushKey(void *)",
+        "long RegCloseKey(void *)",
+        "long RegQueryInfoKey(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
+      ].each do |fn|
+        cfunc = extern fn, :stdcall
+        const_set cfunc.name.intern, cfunc
+      end
+
+      module_function
+
+      def check(result)
+        raise Error, result, caller(2) if result != 0
+      end
+
+      def packdw(dw)
+        [dw].pack('V')
+      end
+
+      def unpackdw(dw)
+        dw += [0].pack('V')
+        dw.unpack('V')[0]
+      end
+
+      def packqw(qw)
+        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
+      end
+
+      def unpackqw(qw)
+        qw = qw.unpack('VV')
+        (qw[1] << 32) | qw[0]
+      end
+
+      def OpenKey(hkey, name, opt, desired)
+        result = packdw(0)
+        check RegOpenKeyExA.call(hkey, name, opt, desired, result)
+        unpackdw(result)
+      end
+
+      def CreateKey(hkey, name, opt, desired)
+        result = packdw(0)
+        disp = packdw(0)
+        check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
+                                   0, result, disp)
+        [ unpackdw(result), unpackdw(disp) ]
+      end
+
+      def EnumValue(hkey, index)
+        name = ' ' * Constants::MAX_KEY_LENGTH
+        size = packdw(Constants::MAX_KEY_LENGTH)
+        check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
+        name[0, unpackdw(size)]
+      end
+
+      def EnumKey(hkey, index)
+        name = ' ' * Constants::MAX_KEY_LENGTH
+        size = packdw(Constants::MAX_KEY_LENGTH)
+        wtime = ' ' * 8
+        check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
+        [ name[0, unpackdw(size)], unpackqw(wtime) ]
+      end
+
+      def QueryValue(hkey, name)
+        type = packdw(0)
+        size = packdw(0)
+        check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
+        data = ' ' * unpackdw(size)
+        check RegQueryValueExA.call(hkey, name, 0, type, data, size)
+        [ unpackdw(type), data[0, unpackdw(size)] ]
+      end
+
+      def SetValue(hkey, name, type, data, size)
+        check RegSetValueExA.call(hkey, name, 0, type, data, size)
+      end
+
+      def DeleteValue(hkey, name)
+        check RegDeleteValue.call(hkey, name)
+      end
+
+      def DeleteKey(hkey, name)
+        check RegDeleteKey.call(hkey, name)
+      end
+
+      def FlushKey(hkey)
+        check RegFlushKey.call(hkey)
+      end
+
+      def CloseKey(hkey)
+        check RegCloseKey.call(hkey)
+      end
+
+      def QueryInfoKey(hkey)
+        subkeys = packdw(0)
+        maxsubkeylen = packdw(0)
+        values = packdw(0)
+        maxvaluenamelen = packdw(0)
+        maxvaluelen = packdw(0)
+        secdescs = packdw(0)
+        wtime = ' ' * 8
+        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
+          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
+        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
+          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
+          unpackdw(secdescs), unpackqw(wtime) ]
+      end
+    end
+
+    #
+    # Replace %\w+% into the environment value of what is contained between the %'s
+    # This method is used for REG_EXPAND_SZ.
+    #
+    # For detail, see expandEnvironmentStrings[http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp] \Win32 \API.
+    #
+    def self.expand_environ(str)
+      str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
+    end
+
+    @@type2name = { }
+    %w[
+      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
+      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
+      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
+      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
+    ].each do |type|
+      @@type2name[Constants.const_get(type)] = type
+    end
+
+    #
+    # Convert registry type value to readable string.
+    #
+    def self.type2name(type)
+      @@type2name[type] || type.to_s
+    end
+
+    #
+    # Convert 64-bit FILETIME integer into Time object.
+    #
+    def self.wtime2time(wtime)
+      Time.at((wtime - 116444736000000000) / 10000000)
+    end
+
+    #
+    # Convert Time object or Integer object into 64-bit FILETIME.
+    #
+    def self.time2wtime(time)
+      time.to_i * 10000000 + 116444736000000000
+    end
+
+    #
+    # constructor
+    #
+    private_class_method :new
+
+    #
+    # --- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+    #
+    # --- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
+    #
+    # Open the registry key subkey under key.
+    # key is Win32::Registry object of parent key.
+    # You can use predefined key HKEY_* (see Constants)
+    # desired and opt is access mask and key option.
+    # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp].
+    # If block is given, the key is closed automatically.
+    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+      subkey = subkey.chomp('\\')
+      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
+      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
+      if block_given?
+        begin
+          yield obj
+        ensure
+          obj.close
+        end
+      else
+        obj
+      end
+    end
+
+    #
+    # --- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+    #
+    # --- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
+    #
+    # Create or open the registry key subkey under key.
+    # You can use predefined key HKEY_* (see Constants)
+    #
+    # If subkey is already exists, key is opened and Registry#created?
+    # method will return false.
+    #
+    # If block is given, the key is closed automatically.
+    #
+    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
+      obj = new(newkey, hkey, subkey, disp)
+      if block_given?
+        begin
+          yield obj
+        ensure
+          obj.close
+        end
+      else
+        obj
+      end
+    end
+
+    #
+    # finalizer
+    #
+    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
+
+    #
+    # initialize
+    #
+    def initialize(hkey, parent, keyname, disposition)
+      @hkey = hkey
+      @parent = parent
+      @keyname = keyname
+      @disposition = disposition
+      @hkeyfinal = [ hkey ]
+      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
+    end
+
+    #  Returns key handle value.
+    attr_reader :hkey
+    # Win32::Registry object of parent key, or nil if predefeined key.
+    attr_reader :parent
+    # Same as subkey value of Registry.open or
+    # Registry.create method.
+    attr_reader :keyname
+    #  Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
+    attr_reader :disposition
+
+    #
+    # Returns if key is created ((*newly*)).
+    # (see Registry.create) -- basically you call create
+    # then when you call created? on the instance returned
+    # it will tell if it was successful or not
+    #
+    def created?
+      @disposition == REG_CREATED_NEW_KEY
+    end
+
+    #
+    # Returns if key is not closed.
+    #
+    def open?
+      !@hkey.nil?
+    end
+
+    #
+    # Full path of key such as 'HKEY_CURRENT_USER\SOFTWARE\foo\bar'.
+    #
+    def name
+      parent = self
+      name = @keyname
+      while parent = parent.parent
+        name = parent.keyname + '\\' + name
+      end
+      name
+    end
+
+    def inspect
+      "\#<Win32::Registry key=#{name.inspect}>"
+    end
+
+    #
+    # marshalling is not allowed
+    #
+    def _dump(depth)
+      raise TypeError, "can't dump Win32::Registry"
+    end
+
+    #
+    # Same as Win32::Registry.open (self, subkey, desired, opt)
+    #
+    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
+      self.class.open(self, subkey, desired, opt, &blk)
+    end
+
+    #
+    # Same as Win32::Registry.create (self, subkey, desired, opt)
+    #
+    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
+      self.class.create(self, subkey, desired, opt, &blk)
+    end
+
+    #
+    # Close key.
+    #
+    # After close, most method raise an error.
+    #
+    def close
+      API.CloseKey(@hkey)
+      @hkey = @parent = @keyname = nil
+      @hkeyfinal[0] = nil
+    end
+
+    #
+    # Enumerate values.
+    #
+    def each_value
+      index = 0
+      while true
+        begin
+          subkey = API.EnumValue(@hkey, index)
+        rescue Error
+          break
+        end
+        begin
+          type, data = read(subkey)
+        rescue Error
+          next
+        end
+        yield subkey, type, data
+        index += 1
+      end
+      index
+    end
+    alias each each_value
+
+    #
+    # Enumerate subkeys.
+    #
+    # subkey is String which contains name of subkey.
+    # wtime is last write time as FILETIME (64-bit integer).
+    # (see Registry.wtime2time)
+    #
+    def each_key
+      index = 0
+      while true
+        begin
+          subkey, wtime = API.EnumKey(@hkey, index)
+        rescue Error
+          break
+        end
+        yield subkey, wtime
+        index += 1
+      end
+      index
+    end
+
+    #
+    # return keys as an array
+    #
+    def keys
+      keys_ary = []
+      each_key { |key,| keys_ary << key }
+      keys_ary
+    end
+
+    # Read a registry value named name and return array of
+    # [ type, data ].
+    # When name is nil, the `default' value is read.
+    # type is value type. (see Win32::Registry::Constants module)
+    # data is value data, its class is:
+    # :REG_SZ, REG_EXPAND_SZ
+    #    String
+    # :REG_MULTI_SZ
+    #    Array of String
+    # :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
+    #    Integer
+    # :REG_BINARY
+    #    String (contains binary data)
+    #
+    # When rtype is specified, the value type must be included by
+    # rtype array, or TypeError is raised.
+    def read(name, *rtype)
+      type, data = API.QueryValue(@hkey, name)
+      unless rtype.empty? or rtype.include?(type)
+        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
+      end
+      case type
+      when REG_SZ, REG_EXPAND_SZ
+        [ type, data.chop ]
+      when REG_MULTI_SZ
+        [ type, data.split(/\0/) ]
+      when REG_BINARY
+        [ type, data ]
+      when REG_DWORD
+        [ type, API.unpackdw(data) ]
+      when REG_DWORD_BIG_ENDIAN
+        [ type, data.unpack('N')[0] ]
+      when REG_QWORD
+        [ type, API.unpackqw(data) ]
+      else
+        raise TypeError, "Type #{type} is not supported."
+      end
+    end
+
+    #
+    # Read a registry value named name and return its value data.
+    # The class of value is same as #read method returns.
+    #
+    # If the value type is REG_EXPAND_SZ, returns value data whose environment
+    # variables are replaced.
+    # If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
+    # REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
+    #
+    # The meaning of rtype is same as #read method.
+    #
+    def [](name, *rtype)
+      type, data = read(name, *rtype)
+      case type
+      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
+        data
+      when REG_EXPAND_SZ
+        Registry.expand_environ(data)
+      else
+        raise TypeError, "Type #{type} is not supported."
+      end
+    end
+
+    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
+    # registry value named name.
+    #
+    # If the values type does not match, TypeError is raised.
+    def read_s(name)
+      read(name, REG_SZ)[1]
+    end
+
+    #
+    # Read a REG_SZ or REG_EXPAND_SZ registry value named name.
+    #
+    # If the value type is REG_EXPAND_SZ, environment variables are replaced.
+    # Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
+    #
+    def read_s_expand(name)
+      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
+      if type == REG_EXPAND_SZ
+        Registry.expand_environ(data)
+      else
+        data
+      end
+    end
+
+    #
+    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
+    # registry value named name.
+    #
+    # If the values type does not match, TypeError is raised.
+    #
+    def read_i(name)
+      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
+    end
+
+    #
+    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
+    # registry value named name.
+    #
+    # If the values type does not match, TypeError is raised.
+    #
+    def read_bin(name)
+      read(name, REG_BINARY)[1]
+    end
+
+    #
+    # Write data to a registry value named name.
+    # When name is nil, write to the `default' value.
+    #
+    # type is type value. (see Registry::Constants module)
+    # Class of data must be same as which #read
+    # method returns.
+    #
+    def write(name, type, data)
+      case type
+      when REG_SZ, REG_EXPAND_SZ
+        data = data.to_s + "\0"
+      when REG_MULTI_SZ
+        data = data.to_a.join("\0") + "\0\0"
+      when REG_BINARY
+        data = data.to_s
+      when REG_DWORD
+        data = API.packdw(data.to_i)
+      when REG_DWORD_BIG_ENDIAN
+        data = [data.to_i].pack('N')
+      when REG_QWORD
+        data = API.packqw(data.to_i)
+      else
+        raise TypeError, "Unsupported type #{type}"
+      end
+      API.SetValue(@hkey, name, type, data, data.length)
+    end
+
+    #
+    # Write value to a registry value named name.
+    #
+    # If wtype is specified, the value type is it.
+    # Otherwise, the value type is depend on class of value:
+    # :Integer
+    #   REG_DWORD
+    # :String
+    #   REG_SZ
+    # :Array
+    #   REG_MULTI_SZ
+    #
+    def []=(name, rtype, value = nil)
+      if value
+        write name, rtype, value
+      else
+        case value = rtype
+        when Integer
+          write name, REG_DWORD, value
+        when String
+          write name, REG_SZ, value
+        when Array
+          write name, REG_MULTI_SZ, value
+        else
+          raise TypeError, "Unexpected type #{value.class}"
+        end
+      end
+      value
+    end
+
+    #
+    # Write value to a registry value named name.
+    #
+    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
+    # REG_BINARY(write_bin).
+    #
+    def write_s(name, value)
+      write name, REG_SZ, value.to_s
+    end
+
+    #
+    # Write value to a registry value named name.
+    #
+    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
+    # REG_BINARY(write_bin).
+    #
+    def write_i(name, value)
+      write name, REG_DWORD, value.to_i
+    end
+
+    #
+    # Write value to a registry value named name.
+    #
+    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
+    # REG_BINARY(write_bin).
+    #
+    def write_bin(name, value)
+      write name, REG_BINARY, value.to_s
+    end
+
+    #
+    # Delete a registry value named name.
+    # We can not delete the `default' value.
+    #
+    def delete_value(name)
+      API.DeleteValue(@hkey, name)
+    end
+    alias delete delete_value
+
+    #
+    # Delete a subkey named name and all its values.
+    #
+    # If recursive is false, the subkey must not have subkeys.
+    # Otherwise, this method deletes all subkeys and values recursively.
+    #
+    def delete_key(name, recursive = false)
+      if recursive
+        open(name, KEY_ALL_ACCESS) do |reg|
+          reg.keys.each do |key|
+            begin
+              reg.delete_key(key, true)
+            rescue Error
+              #
+            end
+          end
+        end
+        API.DeleteKey(@hkey, name)
+      else
+        begin
+          API.EnumKey @hkey, 0
+        rescue Error
+          return API.DeleteKey(@hkey, name)
+        end
+        raise Error.new(5) ## ERROR_ACCESS_DENIED
+      end
+    end
+
+    #
+    # Write all the attributes into the registry file.
+    #
+    def flush
+      API.FlushKey @hkey
+    end
+
+    #
+    # Returns key information as Array of:
+    # :num_keys
+    #   The number of subkeys.
+    # :max_key_length
+    #   Maximum length of name of subkeys.
+    # :num_values
+    #   The number of values.
+    # :max_value_name_length
+    #   Maximum length of name of values.
+    # :max_value_length
+    #   Maximum length of value of values.
+    # :descriptor_length
+    #   Length of security descriptor.
+    # :wtime
+    #   Last write time as FILETIME(64-bit integer)
+    #
+    # For detail, see RegQueryInfoKey[http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp] Win32 API.
+    #
+    def info
+      API.QueryInfoKey(@hkey)
+    end
+
+    #
+    # Returns an item of key information.
+    #
+    %w[
+      num_keys max_key_length
+      num_values max_value_name_length max_value_length
+      descriptor_length wtime
+    ].each_with_index do |s, i|
+      eval <<-__END__
+        def #{s}
+          info[#{i}]
+        end
+      __END__
+    end
+  end
+end
diff --git a/ext/dl/win32/lib/win32/resolv.rb b/ext/dl/win32/lib/win32/resolv.rb
new file mode 100644
index 0000000000..a164fd54d2
--- /dev/null
+++ b/ext/dl/win32/lib/win32/resolv.rb
@@ -0,0 +1,379 @@
+=begin
+= Win32 DNS and DHCP I/F
+
+=end
+
+require "dl/import"
+require 'win32/registry'
+
+module Win32
+  module Resolv
+    API = Registry::API
+
+    def self.get_hosts_path
+      path = get_hosts_dir
+      path = File.expand_path('hosts', path)
+      File.exist?(path) ? path : nil
+    end
+
+    def self.get_resolv_info
+      search, nameserver = get_info
+      if search.empty?
+        search = nil
+      else
+        search.delete("")
+        search.uniq!
+      end
+      if nameserver.empty?
+        nameserver = nil
+      else
+        nameserver.delete("")
+        nameserver.delete("0.0.0.0")
+        nameserver.uniq!
+      end
+      [ search, nameserver ]
+    end
+
+module Kernel32
+  extend DL::Importer
+  dlload "kernel32"
+end
+getv = Kernel32.extern "int GetVersionExA(void *)", :stdcall
+info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
+getv.call(info)
+if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
+#====================================================================
+# Windows NT
+#====================================================================
+  module_eval <<-'__EOS__', __FILE__, __LINE__+1
+    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
+
+    class << self
+      private
+      def get_hosts_dir
+        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
+          reg.read_s_expand('DataBasePath')
+        end
+      end
+
+      def get_info
+        search = nil
+        nameserver = []
+        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
+          begin
+            slist = reg.read_s('SearchList')
+            search = slist.split(/,\s*/) unless slist.empty?
+          rescue Registry::Error
+          end
+
+          if add_search = search.nil?
+            search = []
+            begin
+              nvdom = reg.read_s('NV Domain')
+              unless nvdom.empty?
+                @search = [ nvdom ]
+                if reg.read_i('UseDomainNameDevolution') != 0
+                  if /^[\w\d]+\./ =~ nvdom
+                    devo = $'
+                  end
+                end
+              end
+            rescue Registry::Error
+            end
+          end
+
+          reg.open('Interfaces') do |h|
+            h.each_key do |iface,|
+              h.open(iface) do |regif|
+                begin
+                  [ 'NameServer', 'DhcpNameServer' ].each do |key|
+                    begin
+                      ns = regif.read_s(key)
+                    rescue
+                    else
+                      unless ns.empty?
+                        nameserver.concat(ns.split(/[,\s]\s*/))
+                        break
+                      end
+                    end
+                  end
+                rescue Registry::Error
+                end
+
+                if add_search
+                  begin
+                    [ 'Domain', 'DhcpDomain' ].each do |key|
+                      dom = regif.read_s(key)
+                      unless dom.empty?
+                        search.concat(dom.split(/,\s*/))
+                        break
+                      end
+                    end
+                  rescue Registry::Error
+                  end
+                end
+              end
+            end
+          end
+          search << devo if add_search and devo
+        end
+        [ search.uniq, nameserver.uniq ]
+      end
+    end
+  __EOS__
+else
+#====================================================================
+# Windows 9x
+#====================================================================
+  module_eval <<-'__EOS__', __FILE__, __LINE__+1
+    TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
+    DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
+    WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
+
+    class << self
+   #   private
+
+      def get_hosts_dir
+        Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
+          reg.read_s_expand('SystemRoot')
+        end
+      end
+
+      def get_info
+        search = []
+        nameserver = []
+        begin
+          Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
+            if reg.read_s("EnableDNS") == "1"
+              domain = reg.read_s("Domain")
+              ns = reg.read_s("NameServer")
+              slist = reg.read_s("SearchList")
+              search << domain unless domain.empty?
+              search.concat(slist.split(/,\s*/))
+              nameserver.concat(ns.split(/[,\s]\s*/))
+            end
+          end
+        rescue Registry::Error
+        end
+
+        dhcpinfo = get_dhcpinfo
+        search.concat(dhcpinfo[0])
+        nameserver.concat(dhcpinfo[1])
+        [ search, nameserver ]
+      end
+
+      def get_dhcpinfo
+        macaddrs = {}
+        ipaddrs = {}
+        WsControl.get_iflist.each do |index, macaddr, *ipaddr|
+          macaddrs[macaddr] = 1
+          ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
+        end
+        iflist = [ macaddrs, ipaddrs ]
+
+        search = []
+        nameserver = []
+        version = -1
+        Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
+          begin
+            version = API.unpackdw(reg.read_bin("Version"))
+          rescue Registry::Error
+          end
+
+          reg.each_key do |key,|
+            catch(:not_used) do
+              reg.open(key) do |regdi|
+                dom, ns = get_dhcpinfo_key(version, regdi, iflist)
+                search << dom if dom
+                nameserver.concat(ns) if ns
+              end
+            end
+          end
+        end
+        [ search, nameserver ]
+      end
+
+      def get_dhcpinfo_95(reg)
+        dhcp = reg.read_bin("DhcpInfo")
+        [
+          API.unpackdw(dhcp[4..7]),
+          API.unpackdw(dhcp[8..11]),
+          1,
+          dhcp[45..50],
+          reg.read_bin("OptionInfo"),
+        ]
+      end
+
+      def get_dhcpinfo_98(reg)
+        [
+          API.unpackdw(reg.read_bin("DhcpIPAddress")),
+          API.unpackdw(reg.read_bin("DhcpSubnetMask")),
+          API.unpackdw(reg.read_bin("HardwareType")),
+          reg.read_bin("HardwareAddress"),
+          reg.read_bin("OptionInfo"),
+        ]
+      end
+
+      def get_dhcpinfo_key(version, reg, iflist)
+        info = case version
+               when 1
+                 get_dhcpinfo_95(reg)
+               when 2
+                 get_dhcpinfo_98(reg)
+               else
+                 begin
+                   get_dhcpinfo_98(reg)
+                 rescue Registry::Error
+                   get_dhcpinfo_95(reg)
+                 end
+               end
+        ipaddr, netmask, hwtype, macaddr, opt = info
+        throw :not_used unless
+          ipaddr and ipaddr != 0 and
+          netmask and netmask != 0 and
+          macaddr and macaddr.size == 6 and
+          hwtype == 1 and
+          iflist[0][macaddr] and iflist[1][ipaddr]
+
+        size = opt.size
+        idx = 0
+        while idx <= size
+          opttype = opt[idx]
+          optsize = opt[idx + 1]
+          optval  = opt[idx + 2, optsize]
+          case opttype
+          when 0xFF    ## term
+            break
+          when 0x0F    ## domain
+            domain = optval.chomp("\0")
+          when 0x06    ## dns
+            nameserver = optval.scan(/..../).collect { |addr|
+              "%d.%d.%d.%d" % addr.unpack('C4')
+            }
+          end
+          idx += optsize + 2
+        end
+        [ domain, nameserver ]
+      rescue Registry::Error
+        throw :not_used
+      end
+    end
+
+    module WsControl
+      module WSock32
+        extend DL::Importer
+        dlload "wsock32.dll"
+      end
+      WsControl = WSock32.extern "int WsControl(int, int, void *, void *, void *, void *", :stdcall
+      WSAGetLastError = WSock32.extern "int WSAGetLastError(void)", :stdcall
+
+      MAX_TDI_ENTITIES = 512
+      IPPROTO_TCP = 6
+      WSCTL_TCP_QUERY_INFORMATION = 0
+      INFO_CLASS_GENERIC = 0x100
+      INFO_CLASS_PROTOCOL = 0x200
+      INFO_TYPE_PROVIDER = 0x100
+      ENTITY_LIST_ID = 0
+      GENERIC_ENTITY = 0
+      CL_NL_ENTITY = 0x301
+      IF_ENTITY = 0x200
+      ENTITY_TYPE_ID = 1
+      CL_NL_IP = 0x303
+      IF_MIB = 0x202
+      IF_MIB_STATS_ID = 1
+      IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
+
+      def self.wsctl(tei_entity, tei_instance,
+                     toi_class, toi_type, toi_id,
+                     buffsize)
+        reqinfo = [
+                  ## TDIEntityID
+                    tei_entity, tei_instance,
+                  ## TDIObjectID
+                    toi_class, toi_type, toi_id,
+                  ## TCP_REQUEST_INFORMATION_EX
+                    ""
+                  ].pack('VVVVVa16')
+        reqsize = API.packdw(reqinfo.size)
+        buff = "\0" * buffsize
+        buffsize = API.packdw(buffsize)
+        result = WsControl.call(
+                   IPPROTO_TCP,
+                   WSCTL_TCP_QUERY_INFORMATION,
+                   reqinfo, reqsize,
+                   buff, buffsize)
+        if result != 0
+          raise RuntimeError, "WsControl failed.(#{result})"
+        end
+        [ buff, API.unpackdw(buffsize) ]
+      end
+      private_class_method :wsctl
+
+      def self.get_iflist
+        # Get TDI Entity List
+        entities, size =
+          wsctl(GENERIC_ENTITY, 0,
+                INFO_CLASS_GENERIC,
+                INFO_TYPE_PROVIDER,
+                ENTITY_LIST_ID,
+                MAX_TDI_ENTITIES * 8)  # sizeof(TDIEntityID)
+        entities = entities[0, size].
+                     scan(/.{8}/).
+                     collect { |e| e.unpack('VV') }
+
+        # Get MIB Interface List
+        iflist = []
+        ifcount = 0
+        entities.each do |entity, instance|
+          if( (entity & IF_ENTITY)>0 )
+            ifcount += 1
+            etype, = wsctl(entity, instance,
+                           INFO_CLASS_GENERIC,
+                           INFO_TYPE_PROVIDER,
+                           ENTITY_TYPE_ID,
+                           4)
+            if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
+              ifentry, = wsctl(entity, instance,
+                               INFO_CLASS_PROTOCOL,
+                               INFO_TYPE_PROVIDER,
+                               IF_MIB_STATS_ID,
+                               21 * 4 + 8 + 130)  # sizeof(IFEntry)
+              iflist << [
+                API.unpackdw(ifentry[0,4]),
+                ifentry[20, 6]
+              ]
+            end
+          end
+        end
+
+        # Get IP Addresses
+        entities.each do |entity, instance|
+          if entity == CL_NL_ENTITY
+            etype, = wsctl(entity, instance,
+                           INFO_CLASS_GENERIC,
+                           INFO_TYPE_PROVIDER,
+                           ENTITY_TYPE_ID,
+                           4)
+            if API.unpackdw(etype) == CL_NL_IP
+              ipentries, = wsctl(entity, instance,
+                                 INFO_CLASS_PROTOCOL,
+                                 INFO_TYPE_PROVIDER,
+                                 IP_MIB_ADDRTABLE_ENTRY_ID,
+                                 24 * (ifcount+1))  # sizeof(IPAddrEntry)
+              ipentries.scan(/.{24}/) do |ipentry|
+                ipaddr, index = ipentry.unpack('VV')
+                if ifitem = iflist.assoc(index)
+                  ifitem << ipaddr
+                end
+              end
+            end
+          end
+        end
+        iflist
+      end
+    end
+  __EOS__
+end
+#====================================================================
+  end
+end
diff --git a/ext/dl/win32/lib/win32/sspi.rb b/ext/dl/win32/lib/win32/sspi.rb
new file mode 100644
index 0000000000..6022df96c3
--- /dev/null
+++ b/ext/dl/win32/lib/win32/sspi.rb
@@ -0,0 +1,330 @@
+#
+# = win32/sspi.rb
+#
+# Copyright (c) 2006-2007 Justin Bailey
+#
+# Written and maintained by Justin Bailey <jgbailey@gmail.com>.
+#
+# This program is free software. You can re-distribute and/or
+# modify this program under the same terms of ruby itself ---
+# Ruby Distribution License or GNU General Public License.
+#
+
+require 'Win32API'
+
+# Implements bindings to Win32 SSPI functions, focused on authentication to a proxy server over HTTP.
+module Win32
+	module SSPI
+		# Specifies how credential structure requested will be used. Only SECPKG_CRED_OUTBOUND is used
+		# here.
+		SECPKG_CRED_INBOUND = 0x00000001
+		SECPKG_CRED_OUTBOUND = 0x00000002
+		SECPKG_CRED_BOTH = 0x00000003
+
+		# Format of token. NETWORK format is used here.
+		SECURITY_NATIVE_DREP = 0x00000010
+		SECURITY_NETWORK_DREP = 0x00000000
+
+		# InitializeSecurityContext Requirement flags
+		ISC_REQ_REPLAY_DETECT = 0x00000004
+		ISC_REQ_SEQUENCE_DETECT = 0x00000008
+		ISC_REQ_CONFIDENTIALITY = 0x00000010
+		ISC_REQ_USE_SESSION_KEY = 0x00000020
+		ISC_REQ_PROMPT_FOR_CREDS = 0x00000040
+		ISC_REQ_CONNECTION = 0x00000800
+
+		# Win32 API Functions. Uses Win32API to bind methods to constants contained in class.
+		module API
+			# Can be called with AcquireCredentialsHandle.call()
+			AcquireCredentialsHandle = Win32API.new("secur32", "AcquireCredentialsHandle", 'ppLpppppp', 'L')
+			# Can be called with InitializeSecurityContext.call()
+			InitializeSecurityContext = Win32API.new("secur32", "InitializeSecurityContext", 'pppLLLpLpppp', 'L')
+			# Can be called with DeleteSecurityContext.call()
+			DeleteSecurityContext = Win32API.new("secur32", "DeleteSecurityContext", 'P', 'L')
+			# Can be called with FreeCredentialsHandle.call()
+			FreeCredentialsHandle = Win32API.new("secur32", "FreeCredentialsHandle", 'P', 'L')
+		end
+
+		# SecHandle struct
+		class SecurityHandle
+			def upper
+				@struct.unpack("LL")[1]
+			end
+
+			def lower
+				@struct.unpack("LL")[0]
+			end
+
+			def to_p
+				@struct ||= "\0" * 8
+			end
+		end
+
+		# Some familiar aliases for the SecHandle structure
+		CredHandle = CtxtHandle = SecurityHandle
+
+		# TimeStamp struct
+		class TimeStamp
+			attr_reader :struct
+
+			def to_p
+				@struct ||= "\0" * 8
+			end
+		end
+
+		# Creates binary representaiton of a SecBufferDesc structure,
+		# including the SecBuffer contained inside.
+		class SecurityBuffer
+
+			SECBUFFER_TOKEN = 2   # Security token
+
+			TOKENBUFSIZE = 12288
+			SECBUFFER_VERSION = 0
+
+			def initialize(buffer = nil)
+				@buffer = buffer || "\0" * TOKENBUFSIZE
+				@bufferSize = @buffer.length
+				@type = SECBUFFER_TOKEN
+			end
+
+			def bufferSize
+				unpack
+				@bufferSize
+			end
+
+			def bufferType
+				unpack
+				@type
+			end
+
+			def token
+				unpack
+				@buffer
+			end
+
+			def to_p
+				# Assumption is that when to_p is called we are going to get a packed structure. Therefore,
+				# set @unpacked back to nil so we know to unpack when accessors are next accessed.
+				@unpacked = nil
+				# Assignment of inner structure to variable is very important here. Without it,
+				# will not be able to unpack changes to the structure. Alternative, nested unpacks,
+				# does not work (i.e. @struct.unpack("LLP12")[2].unpack("LLP12") results in "no associated pointer")
+				@sec_buffer ||= [@bufferSize, @type, @buffer].pack("LLP")
+				@struct ||= [SECBUFFER_VERSION, 1, @sec_buffer].pack("LLP")
+			end
+
+		private
+
+			# Unpacks the SecurityBufferDesc structure into member variables. We
+			# only want to do this once per struct, so the struct is deleted
+			# after unpacking.
+			def unpack
+				if ! @unpacked && @sec_buffer && @struct
+					@bufferSize, @type = @sec_buffer.unpack("LL")
+					@buffer = @sec_buffer.unpack("LLP#{@bufferSize}")[2]
+					@struct = nil
+					@sec_buffer = nil
+					@unpacked = true
+				end
+			end
+		end
+
+		# SEC_WINNT_AUTH_IDENTITY structure
+		class Identity
+			SEC_WINNT_AUTH_IDENTITY_ANSI = 0x1
+
+			attr_accessor :user, :domain, :password
+
+			def initialize(user = nil, domain = nil, password = nil)
+				@user = user
+				@domain = domain
+				@password = password
+				@flags = SEC_WINNT_AUTH_IDENTITY_ANSI
+			end
+
+			def to_p
+				[@user, @user ? @user.length : 0,
+				 @domain, @domain ? @domain.length : 0,
+				 @password, @password ? @password.length : 0,
+				 @flags].pack("PLPLPLL")
+			end
+		end
+
+		# Takes a return result from an SSPI function and interprets the value.
+		class SSPIResult
+			# Good results
+			SEC_E_OK = 0x00000000
+			SEC_I_CONTINUE_NEEDED = 0x00090312
+
+			# These are generally returned by InitializeSecurityContext
+			SEC_E_INSUFFICIENT_MEMORY = 0x80090300
+			SEC_E_INTERNAL_ERROR = 0x80090304
+			SEC_E_INVALID_HANDLE = 0x80090301
+			SEC_E_INVALID_TOKEN = 0x80090308
+			SEC_E_LOGON_DENIED = 0x8009030C
+			SEC_E_NO_AUTHENTICATING_AUTHORITY = 0x80090311
+			SEC_E_NO_CREDENTIALS = 0x8009030E
+			SEC_E_TARGET_UNKNOWN = 0x80090303
+			SEC_E_UNSUPPORTED_FUNCTION = 0x80090302
+			SEC_E_WRONG_PRINCIPAL = 0x80090322
+
+			# These are generally returned by AcquireCredentialsHandle
+			SEC_E_NOT_OWNER = 0x80090306
+			SEC_E_SECPKG_NOT_FOUND = 0x80090305
+			SEC_E_UNKNOWN_CREDENTIALS = 0x8009030D
+
+			@@map = {}
+			constants.each { |v| @@map[self.const_get(v.to_s)] = v }
+
+			attr_reader :value
+
+			def initialize(value)
+				# convert to unsigned long
+				value = [value].pack("L").unpack("L").first
+				raise "#{value.to_s(16)} is not a recognized result" unless @@map.has_key? value
+				@value = value
+			end
+
+			def to_s
+				@@map[@value].to_s
+			end
+
+			def ok?
+				@value == SEC_I_CONTINUE_NEEDED || @value == SEC_E_OK
+			end
+
+			def ==(other)
+				if other.is_a?(SSPIResult)
+					@value == other.value
+				elsif other.is_a?(Fixnum)
+					@value == @@map[other]
+				else
+					false
+				end
+			end
+		end
+
+		# Handles "Negotiate" type authentication. Geared towards authenticating with a proxy server over HTTP
+		class NegotiateAuth
+			attr_accessor :credentials, :context, :contextAttributes, :user, :domain
+
+			# Default request flags for SSPI functions
+			REQUEST_FLAGS = ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION
+
+			# NTLM tokens start with this header always. Encoding alone adds "==" and newline, so remove those
+      B64_TOKEN_PREFIX = ["NTLMSSP"].pack("m").delete("=\n")
+
+			# Given a connection and a request path, performs authentication as the current user and returns
+			# the response from a GET request. The connnection should be a Net::HTTP object, and it should
+			# have been constructed using the Net::HTTP.Proxy method, but anything that responds to "get" will work.
+			# If a user and domain are given, will authenticate as the given user.
+			# Returns the response received from the get method (usually Net::HTTPResponse)
+			def NegotiateAuth.proxy_auth_get(http, path, user = nil, domain = nil)
+				raise "http must respond to :get" unless http.respond_to?(:get)
+				nego_auth = self.new user, domain
+
+				resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
+				if resp["Proxy-Authenticate"]
+					resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(resp["Proxy-Authenticate"].split(" ").last.strip) }
+				end
+
+				resp
+			end
+
+			# Creates a new instance ready for authentication as the given user in the given domain.
+			# Defaults to current user and domain as defined by ENV["USERDOMAIN"] and ENV["USERNAME"] if
+			# no arguments are supplied.
+			def initialize(user = nil, domain = nil)
+				if user.nil? && domain.nil? && ENV["USERNAME"].nil? && ENV["USERDOMAIN"].nil?
+					raise "A username or domain must be supplied since they cannot be retrieved from the environment"
+				end
+
+				@user = user || ENV["USERNAME"]
+				@domain = domain || ENV["USERDOMAIN"]
+			end
+
+			# Gets the initial Negotiate token. Returns it as a base64 encoded string suitable for use in HTTP. Can
+			# be easily decoded, however.
+			def get_initial_token
+				raise "This object is no longer usable because its resources have been freed." if @cleaned_up
+				get_credentials
+
+				outputBuffer = SecurityBuffer.new
+				@context = CtxtHandle.new
+				@contextAttributes = "\0" * 4
+
+				result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, nil, nil,
+					REQUEST_FLAGS,0, SECURITY_NETWORK_DREP, nil, 0, @context.to_p, outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
+
+				if result.ok? then
+					return encode_token(outputBuffer.token)
+				else
+					raise "Error: #{result.to_s}"
+				end
+			end
+
+			# Takes a token and gets the next token in the Negotiate authentication chain. Token can be Base64 encoded or not.
+			# The token can include the "Negotiate" header and it will be stripped.
+			# Does not indicate if SEC_I_CONTINUE or SEC_E_OK was returned.
+			# Token returned is Base64 encoded w/ all new lines removed.
+			def complete_authentication(token)
+				raise "This object is no longer usable because its resources have been freed." if @cleaned_up
+
+				# Nil token OK, just set it to empty string
+				token = "" if token.nil?
+
+				if token.include? "Negotiate"
+					# If the Negotiate prefix is passed in, assume we are seeing "Negotiate <token>" and get the token.
+					token = token.split(" ").last
+				end
+
+				if token.include? B64_TOKEN_PREFIX
+					# indicates base64 encoded token
+          token = token.strip.unpack("m")[0]
+				end
+
+				outputBuffer = SecurityBuffer.new
+				result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, @context.to_p, nil,
+					REQUEST_FLAGS, 0, SECURITY_NETWORK_DREP, SecurityBuffer.new(token).to_p, 0,
+					@context.to_p,
+					outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
+
+				if result.ok? then
+					return encode_token(outputBuffer.token)
+				else
+					raise "Error: #{result.to_s}"
+				end
+			ensure
+				# need to make sure we don't clean up if we've already cleaned up.
+				clean_up unless @cleaned_up
+			end
+
+		 private
+
+			def clean_up
+				# free structures allocated
+				@cleaned_up = true
+				API::FreeCredentialsHandle.call(@credentials.to_p)
+				API::DeleteSecurityContext.call(@context.to_p)
+				@context = nil
+				@credentials = nil
+				@contextAttributes = nil
+			end
+
+			# Gets credentials based on user, domain or both. If both are nil, an error occurs
+			def get_credentials
+				@credentials = CredHandle.new
+				ts = TimeStamp.new
+				@identity = Identity.new @user, @domain
+				result = SSPIResult.new(API::AcquireCredentialsHandle.call(nil, "Negotiate", SECPKG_CRED_OUTBOUND, nil, @identity.to_p,
+					nil, nil, @credentials.to_p, ts.to_p))
+				raise "Error acquire credentials: #{result}" unless result.ok?
+			end
+
+			def encode_token(t)
+				# encode64 will add newlines every 60 characters so we need to remove those.
+        [t].pack("m").delete("\n")
+			end
+		end
+	end
+end
+\ No newline at end of file
diff --git a/ext/enumerator/.cvsignore b/ext/enumerator/.cvsignore
deleted file mode 100644
index fc802ff1c2..0000000000
--- a/ext/enumerator/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-mkmf.log
diff --git a/ext/enumerator/enumerator.c b/ext/enumerator/enumerator.c
deleted file mode 100644
index 1c6e1d1ace..0000000000
--- a/ext/enumerator/enumerator.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/************************************************
-
-  enumerator.c - provides Enumerator class
-
-  $Author$
-
-  Copyright (C) 2001-2003 Akinori MUSHA
-
-  $Idaemons: /home/cvs/rb/enumerator/enumerator.c,v 1.1.1.1 2001/07/15 10:12:48 knu Exp $
-  $RoughId: enumerator.c,v 1.6 2003/07/27 11:03:24 nobu Exp $
-  $Id$
-
-************************************************/
-
-#include "ruby.h"
-#include "node.h"
-
-/*
- * Document-class: Enumerable::Enumerator
- *
- * A class which provides a method `each' to be used as an Enumerable
- * object.
- */
-static VALUE rb_cEnumerator;
-static ID sym_each, sym_each_with_index, sym_each_slice, sym_each_cons;
-static ID id_new, id_enum_obj, id_enum_method, id_enum_args;
-
-/*
- *  call-seq:
- *    obj.to_enum(method = :each, *args)
- *    obj.enum_for(method = :each, *args)
- *
- *  Returns Enumerable::Enumerator.new(self, method, *args).
- *
- *  e.g.:
- *     str = "xyz"
- *
- *     enum = str.enum_for(:each_byte)
- *     a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
- *
- *     # protects an array from being modified
- *     a = [1, 2, 3]
- *     some_method(a.to_enum)
- *
- */
-static VALUE
-obj_to_enum(obj, enum_args)
-    VALUE obj, enum_args;
-{
-    rb_ary_unshift(enum_args, obj);
-
-    return rb_apply(rb_cEnumerator, id_new, enum_args);
-}
-
-/*
- *  call-seq:
- *    enum_with_index
- *
- *  Returns Enumerable::Enumerator.new(self, :each_with_index).
- *
- */
-static VALUE
-enumerator_enum_with_index(obj)
-    VALUE obj;
-{
-    return rb_funcall(rb_cEnumerator, id_new, 2, obj, sym_each_with_index);
-}
-
-static VALUE
-each_slice_i(val, memo)
-    VALUE val;
-    NODE *memo;
-{
-    VALUE ary = memo->u1.value;
-    long size = memo->u3.cnt;
-
-    rb_ary_push(ary, val);
-
-    if (RARRAY(ary)->len == size) {
-	rb_yield(ary);
-	memo->u1.value = rb_ary_new2(size);
-    }
-
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *    e.each_slice(n) {...}
- *
- *  Iterates the given block for each slice of <n> elements.
- *
- *  e.g.:
- *      (1..10).each_slice(3) {|a| p a}
- *      # outputs below
- *      [1, 2, 3]
- *      [4, 5, 6]
- *      [7, 8, 9]
- *      [10]
- *
- */
-static VALUE
-enum_each_slice(obj, n)
-    VALUE obj, n;
-{
-    long size = NUM2LONG(n);
-    NODE *memo;
-    VALUE ary;
-
-    if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
-
-    memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
-
-    rb_iterate(rb_each, obj, each_slice_i, (VALUE)memo);
-
-    ary = memo->u1.value;
-    if (RARRAY(ary)->len > 0) rb_yield(ary);
-
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *    e.enum_slice(n)
- *
- *  Returns Enumerable::Enumerator.new(self, :each_slice, n).
- *
- */
-static VALUE
-enumerator_enum_slice(obj, n)
-    VALUE obj, n;
-{
-    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_slice, n);
-}
-
-static VALUE
-each_cons_i(val, memo)
-    VALUE val;
-    NODE *memo;
-{
-    VALUE ary = memo->u1.value;
-    long size = memo->u3.cnt;
-
-    if (RARRAY(ary)->len == size) {
-	rb_ary_shift(ary);
-    }
-    rb_ary_push(ary, val);
-    if (RARRAY(ary)->len == size) {
-	rb_yield(rb_ary_dup(ary));
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *    each_cons(n) {...}
- *
- *  Iterates the given block for each array of consecutive <n>
- *  elements.
- *
- *  e.g.:
- *      (1..10).each_cons(3) {|a| p a}
- *      # outputs below
- *      [1, 2, 3]
- *      [2, 3, 4]
- *      [3, 4, 5]
- *      [4, 5, 6]
- *      [5, 6, 7]
- *      [6, 7, 8]
- *      [7, 8, 9]
- *      [8, 9, 10]
- *
- */
-static VALUE
-enum_each_cons(obj, n)
-    VALUE obj, n;
-{
-    long size = NUM2LONG(n);
-    NODE *memo;
-
-    if (size <= 0) rb_raise(rb_eArgError, "invalid size");
-    memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
-
-    rb_iterate(rb_each, obj, each_cons_i, (VALUE)memo);
-
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *    e.enum_cons(n)
- *
- *  Returns Enumerable::Enumerator.new(self, :each_cons, n).
- *
- */
-static VALUE
-enumerator_enum_cons(obj, n)
-    VALUE obj, n;
-{
-    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_cons, n);
-}
-
-/*
- *  call-seq:
- *    Enumerable::Enumerator.new(obj, method = :each, *args)
- *
- *  Creates a new Enumerable::Enumerator object, which is to be
- *  used as an Enumerable object using the given object's given
- *  method with the given arguments.
- *
- *  e.g.:
- *      str = "xyz"
- *
- *      enum = Enumerable::Enumerator.new(str, :each_byte)
- *      a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
- *
- */
-static VALUE
-enumerator_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE enum_obj, enum_method, enum_args;
-
-    rb_scan_args(argc, argv, "11*", &enum_obj, &enum_method, &enum_args);
-
-    if (enum_method == Qnil)
-	enum_method = sym_each;
-
-    rb_ivar_set(obj, id_enum_obj, enum_obj);
-    rb_ivar_set(obj, id_enum_method, enum_method);
-    rb_ivar_set(obj, id_enum_args, enum_args);
-
-    return Qnil;
-}
-
-static VALUE
-enumerator_iter(memo)
-    NODE *memo;
-{
-    return rb_apply(memo->u1.value, memo->u2.id, memo->u3.value);
-}
-
-/*
- *  call-seq:
- *    enum.each {...}
- *
- *  Iterates the given block using the object and the method specified
- *  in the first place.
- *
- */
-static VALUE
-enumerator_each(obj)
-    VALUE obj;
-{
-    VALUE val;
-
-    obj = (VALUE)rb_node_newnode(NODE_MEMO,
-				 rb_ivar_get(obj, id_enum_obj),
-				 rb_to_id(rb_ivar_get(obj, id_enum_method)),
-				 rb_ivar_get(obj, id_enum_args));
-    val = rb_iterate((VALUE (*)_((VALUE)))enumerator_iter, obj, rb_yield, 0);
-    return val;
-}
-
-void
-Init_enumerator()
-{
-    VALUE rb_mEnumerable;
-
-    rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -2);
-    rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -2);
-
-    rb_mEnumerable = rb_path2class("Enumerable");
-
-    rb_define_method(rb_mEnumerable, "enum_with_index", enumerator_enum_with_index, 0);
-    rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
-    rb_define_method(rb_mEnumerable, "enum_slice", enumerator_enum_slice, 1);
-    rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
-    rb_define_method(rb_mEnumerable, "enum_cons", enumerator_enum_cons, 1);
-
-    rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
-    rb_include_module(rb_cEnumerator, rb_mEnumerable);
-
-    rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
-    rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
-
-    sym_each		= ID2SYM(rb_intern("each"));
-    sym_each_with_index	= ID2SYM(rb_intern("each_with_index"));
-    sym_each_slice	= ID2SYM(rb_intern("each_slice"));
-    sym_each_cons	= ID2SYM(rb_intern("each_cons"));
-
-    id_new		= rb_intern("new");
-    id_enum_obj		= rb_intern("enum_obj");
-    id_enum_method	= rb_intern("enum_method");
-    id_enum_args	= rb_intern("enum_args");
-}
diff --git a/ext/enumerator/enumerator.txt b/ext/enumerator/enumerator.txt
deleted file mode 100644
index 64c7d50226..0000000000
--- a/ext/enumerator/enumerator.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" enumerator.txt -  -*- Indented-Text -*-
-$Idaemons: /home/cvs/rb/enumerator/enumerator.txt,v 1.2 2001/07/15 10:19:24 knu Exp $
-$RoughId: enumerator.txt,v 1.5 2003/02/20 12:24:51 knu Exp $
-$Id$
-
-** Enumerable::Enumerator(Class)
-
-A class which provides a method `each' to be used as an Enumerable
-object.
-
-Superclass: Object
-
-Mix-ins: Enumerable
-
-require 'enumerator'
-
-Class Methods:
-
-    new(obj, method = :each, *args)
-
-	Creates a new Enumerable::Enumerator object, which is to be
-	used as an Enumerable object using the given object's given
-	method with the given arguments.
-
-	e.g.:
-	    str = "xyz"
-
-	    enum = Enumerable::Enumerator.new(str, :each_byte)
-	    a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
-
-Methods:
-
-    each {...}
-
-	Iterates the given block using the object and the method
-	specified in the first place.
-
-
-Requiring this module also adds some methods to the Object class:
-
-    to_enum(method = :each, *args)
-    enum_for(method = :each, *args)
-
-	Returns Enumerable::Enumerator.new(self, method, *args).
-
-	e.g.:
-	    str = "xyz"
-
-	    enum = str.enum_for(:each_byte)
-	    a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
-
-	    # protects an array from being modified
-	    a = [1, 2, 3]
-	    some_method(a.to_enum)
-
-And the Enumerable module.
-
-    each_slice(n) {...}
-
-	Iterates the given block for each slice of <n> elements.
-
-	e.g.:
-	    (1..10).each_slice(3) {|a| p a}
-	    # outputs below
-	    [1, 2, 3]
-	    [4, 5, 6]
-	    [7, 8, 9]
-	    [10]
-
-    enum_slice(n)
-
-	Returns Enumerable::Enumerator.new(self, :each_slice, n).
-
-    each_cons(n) {...}
-
-	Iterates the given block for each array of consecutive <n>
-	elements.
-
-	e.g.:
-	    (1..10).each_cons(3) {|a| p a}
-	    # outputs below
-	    [1, 2, 3]
-	    [2, 3, 4]
-	    [3, 4, 5]
-	    [4, 5, 6]
-	    [5, 6, 7]
-	    [6, 7, 8]
-	    [7, 8, 9]
-	    [8, 9, 10]
-
-    enum_cons(n)
-
-	Returns Enumerable::Enumerator.new(self, :each_cons, n).
-
-    enum_with_index
-
-	Returns Enumerable::Enumerator.new(self, :each_with_index).
-
--------------------------------------------------------
-Local variables:
-fill-column: 70
-end:
diff --git a/ext/enumerator/extconf.rb b/ext/enumerator/extconf.rb
deleted file mode 100644
index 94e2ee38b2..0000000000
--- a/ext/enumerator/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('enumerator')
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 486963378b..0a01acf47d 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -3,12 +3,12 @@
   etc.c -
 
   $Author$
-  $Date$
   created at: Tue Mar 22 18:39:19 JST 1994
 
 ************************************************/
 
 #include "ruby.h"
+#include "ruby/encoding.h"
 
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
@@ -23,11 +23,17 @@
 #include <grp.h>
 #endif
 
-#ifndef HAVE_TYPE_UID_T
-#define uid_t int
+static VALUE sPasswd;
+#ifdef HAVE_GETGRENT
+static VALUE sGroup;
 #endif
 
-static VALUE sPasswd, sGroup;
+#ifdef _WIN32
+#include <shlobj.h>
+#ifndef CSIDL_COMMON_APPDATA
+#define CSIDL_COMMON_APPDATA 35
+#endif
+#endif
 
 #ifndef _WIN32
 char *getenv();
@@ -35,13 +41,14 @@ char *getenv();
 char *getlogin();
 
 /* Returns the short user name of the currently logged in user.
+ * Unfortunately, it is often rather easy to fool getlogin().
+ * Avoid getlogin() for security-related purposes.
  *
  * e.g.
  *   Etc.getlogin -> 'guest'
  */
 static VALUE
-etc_getlogin(obj)
-    VALUE obj;
+etc_getlogin(VALUE obj)
 {
     char *login;
 
@@ -60,8 +67,7 @@ etc_getlogin(obj)
 
 #if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
 static VALUE
-safe_setup_str(str)
-    const char *str;
+safe_setup_str(const char *str)
 {
     if (str == 0) str = "";
     return rb_tainted_str_new2(str);
@@ -70,8 +76,7 @@ safe_setup_str(str)
 
 #ifdef HAVE_GETPWENT
 static VALUE
-setup_passwd(pwd)
-    struct passwd *pwd;
+setup_passwd(struct passwd *pwd)
 {
     if (pwd == 0) rb_sys_fail("/etc/passwd");
     return rb_struct_new(sPasswd,
@@ -79,8 +84,8 @@ setup_passwd(pwd)
 #ifdef HAVE_ST_PW_PASSWD
 			 safe_setup_str(pwd->pw_passwd),
 #endif
-			 PW_UID2VAL(pwd->pw_uid),
-			 PW_GID2VAL(pwd->pw_gid),
+			 UIDT2NUM(pwd->pw_uid),
+			 GIDT2NUM(pwd->pw_gid),
 #ifdef HAVE_ST_PW_GECOS
 			 safe_setup_str(pwd->pw_gecos),
 #endif
@@ -119,27 +124,24 @@ setup_passwd(pwd)
  * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
  */
 static VALUE
-etc_getpwuid(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+etc_getpwuid(int argc, VALUE *argv, VALUE obj)
 {
 #if defined(HAVE_GETPWENT)
     VALUE id;
-    uid_t uid;
+    rb_uid_t uid;
     struct passwd *pwd;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
-	uid = PW_VAL2UID(id);
+	uid = NUM2UIDT(id);
     }
     else {
 	uid = getuid();
     }
     pwd = getpwuid(uid);
-    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", uid);
+    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", (int)uid);
     return setup_passwd(pwd);
-#else 
+#else
     return Qnil;
 #endif
 }
@@ -153,17 +155,16 @@ etc_getpwuid(argc, argv, obj)
  * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
  */
 static VALUE
-etc_getpwnam(obj, nam)
-    VALUE obj, nam;
+etc_getpwnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pwd;
 
     SafeStringValue(nam);
-    pwd = getpwnam(RSTRING(nam)->ptr);
-    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING(nam)->ptr);
+    pwd = getpwnam(RSTRING_PTR(nam));
+    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING_PTR(nam));
     return setup_passwd(pwd);
-#else 
+#else
     return Qnil;
 #endif
 }
@@ -171,14 +172,14 @@ etc_getpwnam(obj, nam)
 #ifdef HAVE_GETPWENT
 static int passwd_blocking = 0;
 static VALUE
-passwd_ensure()
+passwd_ensure(void)
 {
-    passwd_blocking = Qfalse;
+    passwd_blocking = (int)Qfalse;
     return Qnil;
 }
 
 static VALUE
-passwd_iterate()
+passwd_iterate(void)
 {
     struct passwd *pw;
 
@@ -189,12 +190,22 @@ passwd_iterate()
     endpwent();
     return Qnil;
 }
+
+static void
+each_passwd(void)
+{
+    if (passwd_blocking) {
+	rb_raise(rb_eRuntimeError, "parallel passwd iteration");
+    }
+    passwd_blocking = (int)Qtrue;
+    rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
+}
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry 
+/* Provides a convenient Ruby iterator which executes a block for each entry
  * in the /etc/passwd file.
  *
- * The code block is passed an Etc::Passwd struct; see getpwent above for 
+ * The code block is passed an Struct::Passwd struct; see getpwent above for
  * details.
  *
  * Example:
@@ -207,33 +218,55 @@ passwd_iterate()
  *
  */
 static VALUE
-etc_passwd(obj)
-    VALUE obj;
+etc_passwd(VALUE obj)
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
 
     rb_secure(4);
     if (rb_block_given_p()) {
-	if (passwd_blocking) {
-	    rb_raise(rb_eRuntimeError, "parallel passwd iteration");
-	}
-	passwd_blocking = Qtrue;
-	rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
+	each_passwd();
     }
-    if (pw = getpwent()) {
+    else if (pw = getpwent()) {
 	return setup_passwd(pw);
     }
 #endif
     return Qnil;
 }
 
+/* Iterates for each entry in the /etc/passwd file if a block is given.
+ * If no block is given, returns the enumerator.
+ *
+ * The code block is passed an Struct::Passwd struct; see getpwent above for
+ * details.
+ *
+ * Example:
+ *
+ *     require 'etc'
+ *
+ *     Etc::Passwd.each {|u|
+ *       puts u.name + " = " + u.gecos
+ *     }
+ *
+ *     Etc::Passwd.collect {|u| u.gecos}
+ *     Etc::Passwd.collect {|u| u.gecos}
+ *
+ */
+static VALUE
+etc_each_passwd(VALUE obj)
+{
+#ifdef HAVE_GETPWENT
+    RETURN_ENUMERATOR(obj, 0, 0);
+    each_passwd();
+#endif
+    return obj;
+}
+
 /* Resets the process of reading the /etc/passwd file, so that the next call
  * to getpwent will return the first entry again.
  */
 static VALUE
-etc_setpwent(obj)
-    VALUE obj;
+etc_setpwent(VALUE obj)
 {
 #ifdef HAVE_GETPWENT
     setpwent();
@@ -245,8 +278,7 @@ etc_setpwent(obj)
  * getpwent, and closes the file.
  */
 static VALUE
-etc_endpwent(obj)
-    VALUE obj;
+etc_endpwent(VALUE obj)
 {
 #ifdef HAVE_GETPWENT
     endpwent();
@@ -255,7 +287,7 @@ etc_endpwent(obj)
 }
 
 /* Returns an entry from the /etc/passwd file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns 
+ * opens the file and returns the first entry; each successive call returns
  * the next entry, or nil if the end of the file has been reached.
  *
  * To close the file when processing is complete, call endpwent.
@@ -272,8 +304,8 @@ etc_endpwent(obj)
  *
  * - Passwd#gid contains the integer group ID (gid) of the user's primary group.
  *
- * - Passwd#gecos contains a longer String description of the user, such as 
- *   a full name. Some Unix systems provide structured information in the 
+ * - Passwd#gecos contains a longer String description of the user, such as
+ *   a full name. Some Unix systems provide structured information in the
  *   gecos field, but this is system-dependent.
  *
  * - Passwd#dir contains the path to the home directory of the user as a String.
@@ -281,8 +313,7 @@ etc_endpwent(obj)
  * - Passwd#shell contains the path to the login shell of the user as a String.
  */
 static VALUE
-etc_getpwent(obj)
-    VALUE obj;
+etc_getpwent(VALUE obj)
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
@@ -296,8 +327,7 @@ etc_getpwent(obj)
 
 #ifdef HAVE_GETGRENT
 static VALUE
-setup_group(grp)
-    struct group *grp;
+setup_group(struct group *grp)
 {
     VALUE mem;
     char **tbl;
@@ -313,12 +343,12 @@ setup_group(grp)
 #ifdef HAVE_ST_GR_PASSWD
 			 safe_setup_str(grp->gr_passwd),
 #endif
-			 PW_GID2VAL(grp->gr_gid),
+			 GIDT2NUM(grp->gr_gid),
 			 mem);
 }
 #endif
 
-/* Returns information about the group with specified integer group id (gid), 
+/* Returns information about the group with specified integer group id (gid),
  * as found in /etc/group.
  *
  * The information is returned as a Struct::Group; see getgrent above for
@@ -329,24 +359,29 @@ setup_group(grp)
  *
  */
 static VALUE
-etc_getgrgid(obj, id)
-    VALUE obj, id;
+etc_getgrgid(int argc, VALUE *argv, VALUE obj)
 {
 #ifdef HAVE_GETGRENT
+    VALUE id;
     gid_t gid;
     struct group *grp;
 
     rb_secure(4);
-    gid = PW_VAL2GID(id);
+    if (rb_scan_args(argc, argv, "01", &id) == 1) {
+	gid = NUM2GIDT(id);
+    }
+    else {
+	gid = getgid();
+    }
     grp = getgrgid(gid);
-    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
+    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", (int)gid);
     return setup_group(grp);
 #else
     return Qnil;
 #endif
 }
 
-/* Returns information about the group with specified String name, as found 
+/* Returns information about the group with specified String name, as found
  * in /etc/group.
  *
  * The information is returned as a Struct::Group; see getgrent above for
@@ -357,16 +392,15 @@ etc_getgrgid(obj, id)
  *
  */
 static VALUE
-etc_getgrnam(obj, nam)
-    VALUE obj, nam;
+etc_getgrnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETGRENT
     struct group *grp;
 
     rb_secure(4);
     SafeStringValue(nam);
-    grp = getgrnam(RSTRING(nam)->ptr);
-    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING(nam)->ptr);
+    grp = getgrnam(RSTRING_PTR(nam));
+    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(nam));
     return setup_group(grp);
 #else
     return Qnil;
@@ -376,14 +410,14 @@ etc_getgrnam(obj, nam)
 #ifdef HAVE_GETGRENT
 static int group_blocking = 0;
 static VALUE
-group_ensure()
+group_ensure(void)
 {
-    group_blocking = Qfalse;
+    group_blocking = (int)Qfalse;
     return Qnil;
 }
 
 static VALUE
-group_iterate()
+group_iterate(void)
 {
     struct group *pw;
 
@@ -394,12 +428,22 @@ group_iterate()
     endgrent();
     return Qnil;
 }
+
+static void
+each_group(void)
+{
+    if (group_blocking) {
+	rb_raise(rb_eRuntimeError, "parallel group iteration");
+    }
+    group_blocking = (int)Qtrue;
+    rb_ensure(group_iterate, 0, group_ensure, 0);
+}
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry 
+/* Provides a convenient Ruby iterator which executes a block for each entry
  * in the /etc/group file.
  *
- * The code block is passed an Etc::Group struct; see getgrent above for 
+ * The code block is passed an Struct::Group struct; see getgrent above for
  * details.
  *
  * Example:
@@ -412,33 +456,55 @@ group_iterate()
  *
  */
 static VALUE
-etc_group(obj)
-    VALUE obj;
+etc_group(VALUE obj)
 {
 #ifdef HAVE_GETGRENT
     struct group *grp;
 
     rb_secure(4);
     if (rb_block_given_p()) {
-	if (group_blocking) {
-	    rb_raise(rb_eRuntimeError, "parallel group iteration");
-	}
-	group_blocking = Qtrue;
-	rb_ensure(group_iterate, 0, group_ensure, 0);
+	each_group();
     }
-    if (grp = getgrent()) {
+    else if (grp = getgrent()) {
 	return setup_group(grp);
     }
 #endif
     return Qnil;
 }
 
+#ifdef HAVE_GETGRENT
+/* Iterates for each entry in the /etc/group file if a block is given.
+ * If no block is given, returns the enumerator.
+ *
+ * The code block is passed an Struct::Group struct; see getpwent above for
+ * details.
+ *
+ * Example:
+ *
+ *     require 'etc'
+ *
+ *     Etc::Group.each {|g|
+ *       puts g.name + ": " + g.mem.join(', ')
+ *     }
+ *
+ *     Etc::Group.collect {|g| g.name}
+ *     Etc::Group.select {|g| !g.mem.empty?}
+ *
+ */
+static VALUE
+etc_each_group(VALUE obj)
+{
+    RETURN_ENUMERATOR(obj, 0, 0);
+    each_group();
+    return obj;
+}
+#endif
+
 /* Resets the process of reading the /etc/group file, so that the next call
  * to getgrent will return the first entry again.
  */
 static VALUE
-etc_setgrent(obj)
-    VALUE obj;
+etc_setgrent(VALUE obj)
 {
 #ifdef HAVE_GETGRENT
     setgrent();
@@ -446,12 +512,11 @@ etc_setgrent(obj)
     return Qnil;
 }
 
-/* Ends the process of scanning through the /etc/group file begun by 
+/* Ends the process of scanning through the /etc/group file begun by
  * getgrent, and closes the file.
  */
 static VALUE
-etc_endgrent(obj)
-    VALUE obj;
+etc_endgrent(VALUE obj)
 {
 #ifdef HAVE_GETGRENT
     endgrent();
@@ -460,7 +525,7 @@ etc_endgrent(obj)
 }
 
 /* Returns an entry from the /etc/group file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns 
+ * opens the file and returns the first entry; each successive call returns
  * the next entry, or nil if the end of the file has been reached.
  *
  * To close the file when processing is complete, call endgrent.
@@ -470,18 +535,17 @@ etc_endgrent(obj)
  * - Group#name contains the name of the group as a String.
  *
  * - Group#passwd contains the encrypted password as a String. An 'x' is
- *   returned if password access to the group is not available; an empty 
- *   string is returned if no password is needed to obtain membership of 
+ *   returned if password access to the group is not available; an empty
+ *   string is returned if no password is needed to obtain membership of
  *   the group.
  *
  * - Group#gid contains the group's numeric ID as an integer.
  *
- * - Group#mem is an Array of Strings containing the short login names of the 
+ * - Group#mem is an Array of Strings containing the short login names of the
  *   members of the group.
  */
 static VALUE
-etc_getgrent(obj)
-    VALUE obj;
+etc_getgrent(VALUE obj)
 {
 #ifdef HAVE_GETGRENT
     struct group *gr;
@@ -493,18 +557,54 @@ etc_getgrent(obj)
     return Qnil;
 }
 
-static VALUE mEtc;
+#define numberof(array) (sizeof(array) / sizeof(*array))
 
-/* The etc module provides access to information from the /etc/passwd and
- * /etc/group files on Linux and Unix systems.
+#ifdef _WIN32
+VALUE rb_w32_special_folder(int type);
+UINT rb_w32_system_tmpdir(WCHAR *path, UINT len);
+VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
+#endif
+
+/*
+ * Returns system configuration directory.
+ */
+static VALUE
+etc_sysconfdir(VALUE obj)
+{
+#ifdef _WIN32
+    return rb_w32_special_folder(CSIDL_COMMON_APPDATA);
+#else
+    return rb_filesystem_str_new_cstr(SYSCONFDIR);
+#endif
+}
+
+/*
+ * Returns system temporary directory.
+ */
+static VALUE
+etc_systmpdir(void)
+{
+#ifdef _WIN32
+    WCHAR path[_MAX_PATH];
+    UINT len = rb_w32_system_tmpdir(path, numberof(path));
+    if (!len) return Qnil;
+    return rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
+#else
+    return rb_filesystem_str_new_cstr("/tmp");
+#endif
+}
+
+/*
+ * The etc module provides access to information from the running OS.
  *
  * Documented by mathew <meta@pobox.com>.
  */
 void
-Init_etc()
+Init_etc(void)
 {
-    mEtc = rb_define_module("Etc");
+    VALUE mEtc;
 
+    mEtc = rb_define_module("Etc");
     rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
 
     rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
@@ -514,14 +614,15 @@ Init_etc()
     rb_define_module_function(mEtc, "getpwent", etc_getpwent, 0);
     rb_define_module_function(mEtc, "passwd", etc_passwd, 0);
 
-    rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, 1);
+    rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, -1);
     rb_define_module_function(mEtc, "getgrnam", etc_getgrnam, 1);
     rb_define_module_function(mEtc, "group", etc_group, 0);
     rb_define_module_function(mEtc, "setgrent", etc_setgrent, 0);
     rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
     rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
+    rb_define_module_function(mEtc, "sysconfdir", etc_sysconfdir, 0);
+    rb_define_module_function(mEtc, "systmpdir", etc_systmpdir, 0);
 
-    rb_global_variable(&sPasswd);
     sPasswd =  rb_struct_define("Passwd",
 				"name", "passwd", "uid", "gid",
 #ifdef HAVE_ST_PW_GECOS
@@ -547,13 +648,19 @@ Init_etc()
 				"expire",
 #endif
 				NULL);
+    rb_define_const(mEtc, "Passwd", sPasswd);
+    rb_extend_object(sPasswd, rb_mEnumerable);
+    rb_define_singleton_method(sPasswd, "each", etc_each_passwd, 0);
 
 #ifdef HAVE_GETGRENT
-    rb_global_variable(&sGroup);
     sGroup = rb_struct_define("Group", "name",
 #ifdef HAVE_ST_GR_PASSWD
 			      "passwd",
 #endif
 			      "gid", "mem", NULL);
+
+    rb_define_const(mEtc, "Group", sGroup);
+    rb_extend_object(sGroup, rb_mEnumerable);
+    rb_define_singleton_method(sGroup, "each", etc_each_group, 0);
 #endif
 }
diff --git a/ext/etc/etc.txt b/ext/etc/etc.txt
deleted file mode 100644
index 534790172c..0000000000
--- a/ext/etc/etc.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" etc.txt -  -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
-
-** Etc(Module)
-
-The module to retrieve information under /etc directory.  Available
-only on UNIX platforms.  All operations defined in this module are
-module functions, so that you can include Etc module into your class.
-
-Module Function:
-
-   getlogin
-
-	returns login name of the user.  It this fails, try getpwuid().
-
-   getpwnam(name)
-
-	searches in /etc/passwd file (or equivalent database), and
-	returns password entry for the user.  The return value is an
-	passwd structure, which has members described below.
-
-	  struct passwd
-	    name 	# user name(string)
-	    passwd	# encrypted password(string)
-	    uid		# user ID(integer)
-	    gid		# group ID(integer)
-	    gecos	# gecos field(string)
-	    dir		# home directory(string)
-	    shell	# login shell(string)
-	    # members below are optional
-	    change	# password change time(integer)
-	    quota	# quota value(integer)
-	    age		# password age(integer)
-	    class	# user access class(string)
-	    comment	# comment(string)
-	    expire	# account expiration time(integer)	    
-	  end
-
-	See getpwnam(3) for detail.
-
-   getpwuid([uid])
-
-	returns passwd entry for the specified user id.  If uid is
-	ommitted, use the value from getuid().  See getpwuid(3) for
-	detail.
-
-   getgrgid(gid)
-
-	searches in /etc/group file (or equivalent database), and
-	returns group entry for the group id.  The return value is an
-	group structure, which has members described below.
-
-	  struct group
-	    name 	# group name(string)
-	    passwd	# group password(string)
-	    gid		# group ID(integer)
-	    mem		# array of the group member names
-	  end
-
-	See getgrgid(3) for detail.
-
-   getgrnam(name)
-
-	returns the group entry for the specified name.  The return
-	value is the group structure.  See getgrnam(3) for detail.
-
-   group
-
-	iterates over all group entries.
-
-   passwd
-
-	iterates over all passwd entries.
diff --git a/ext/etc/etc.txt.ja b/ext/etc/etc.txt.ja
deleted file mode 100644
index 2dddcfb036..0000000000
--- a/ext/etc/etc.txt.ja
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" etc.txt.ja -  -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
-
-** Etc(�⥸�塼��)
-
-/etc�ǥ��쥯�ȥ�ʲ��ξ�������뤿��Υ⥸�塼�롥���饹�˥��󥯥롼��
-���ƻȤ����Ȥ�Ǥ��롥
-
-Module Function:
-
-   getlogin
-
-	��ʬ��login̾���֤������줬���Ԥ�������getpwuid()���Ѥ����
-	�ɤ���
-
-   getpwnam(name)
-
-	/etc/passwd�ե�����(���뤤��DBM�ե������NIS�ǡ����١���)��
-	������name��̾�������passwd����ȥ���֤�������ͤ�passwd��¤
-	�Τǰʲ��Υ��Ф���ġ�
-
-	  struct passwd
-	    name 	# �桼��̾(ʸ����)
-	    passwd	# �ѥ����(ʸ����)
-	    uid		# �桼��ID(����)
-	    gid		# ���롼��ID(����)
-	    gecos	# gecos�ե������(ʸ����)
-	    dir		# �ۡ���ǥ��쥯�ȥ�(ʸ����)
-	    shell	# �������󥷥���(ʸ����)
-	    # �ʹߤΥ��Фϥ����ƥ�ˤ�äƤ��󶡤���ʤ���
-	    change	# �ѥ�����ѹ�����(����)
-	    quota	# ��������(����)
-	    age		# ������(����)
-	    class	# �桼�������������饹(ʸ����)
-	    comment	# ������(ʸ����)
-	    expire	# ���������ͭ������(����)	    
-	  end
-
-	�ܺ٤�getpwnam(3)�򻲾ȤΤ��ȡ�
-
-   getpwuid([uid])
-
-	uid��桼��ID�Ȥ���passwd����ȥ���֤�������ͤ�getpwnam()��
-	Ʊ�ͤǤ��롥�������ά�������ˤ�getuid()���ͤ��Ѥ��롥�ܺ٤�
-	getpwuid(3)�򻲾ȤΤ��ȡ�
-
-   getgrgid(gid)
-
-	/etc/group�ե�����(���뤤�ϡ�getpwnam����)�򸡺�����gid�򥰥롼
-	��ID�Ȥ��륰�롼�ץ���ȥ���֤�������ͤ�group��¤�Τǰʲ���
-	���Ф���ġ�
-
-	  struct group
-	    name 	# ���롼��̾(ʸ����)
-	    passwd	# ���롼�פΥѥ����(ʸ����)
-	    gid		# ���롼��ID(����)
-	    mem		# ���롼�ץ���̾������
-	  end
-
-	�ܺ٤�getgrgid(3)�򻲾ȤΤ��ȡ�
-
-   getgrnam(name)
-
-	name�Ȥ���̾���Υ��롼�ץ���ȥ���֤�������ͤ�getgrgid()��Ʊ
-	�ͤǤ��롥�ܺ٤�getgrnam(3)�򻲾ȡ�
-
-   group
-
-	���ƤΥ��롼�ץ���ȥ���˥����������뤿��Υ��ƥ졼����
-
-   passwd
-
-	���Ƥ�passwd����ȥ���˥����������뤿��Υ��ƥ졼����
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index dbd0672545..1967560cd4 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -4,7 +4,9 @@ have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
 a = have_func("getlogin")
 b = have_func("getpwent")
 c = have_func("getgrent")
-if  a or b or c
+sysconfdir = RbConfig.expand(RbConfig::CONFIG["sysconfdir"].dup, "prefix"=>"", "DESTDIR"=>"")
+$defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
+if  a or b or c or sysconfdir
   have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
   have_struct_member('struct passwd', 'pw_change', 'pwd.h')
   have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
@@ -24,20 +26,5 @@ if  a or b or c
   have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
   have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
   have_struct_member('struct group', 'gr_passwd', 'grp.h')
-  [%w"uid_t pwd.h", %w"gid_t grp.h"].each do |t, *h|
-    h.unshift("sys/types.h")
-    f = "INT2NUM"
-    if have_type(t, h)
-      if try_static_assert("sizeof(#{t}) > sizeof(long)", h)
-	f = "LL2NUM"
-      end
-      if try_static_assert("(#{t})-1 > 0", h)
-	f = "U#{f}"
-      end
-    end
-    t = t.chomp('_t').upcase
-    $defs.push("-DPW_#{t}2VAL=#{f}")
-    $defs.push("-DPW_VAL2#{t}=#{f.sub(/([A-Z]+)2(NUM)/, '\22\1')}")
-  end
   create_makefile("etc")
 end
diff --git a/ext/extmk.rb b/ext/extmk.rb
index cf7944679c..ab48634c1a 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -16,6 +16,7 @@ $extlibs = nil
 $extpath = nil
 $ignore = nil
 $message = nil
+$command_output = nil
 
 $progname = $0
 alias $PROGRAM_NAME $0
@@ -24,33 +25,25 @@ alias $0 $progname
 $extlist = []
 $compiled = {}
 
-$:.replace([Dir.pwd])
-require 'rbconfig'
-
 srcdir = File.dirname(File.dirname(__FILE__))
-
-$:.unshift(srcdir, File.expand_path("lib", srcdir))
+unless defined?(CROSS_COMPILING) and CROSS_COMPILING
+  $:.replace([File.expand_path("lib", srcdir), Dir.pwd])
+end
+$:.unshift(srcdir)
+require 'rbconfig'
 
 $topdir = "."
 $top_srcdir = srcdir
 
-require 'mkmf'
+$" << "mkmf.rb"
+load File.expand_path("lib/mkmf.rb", srcdir)
 require 'optparse/shellwords'
 
 def sysquote(x)
-  @quote ||= /human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
+  @quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
   @quote ? x.quote : x
 end
 
-def relative_from(path, base)
-  dir = File.join(path, "")
-  if File.expand_path(dir) == File.expand_path(dir, base)
-    path
-  else
-    File.join(base, path)
-  end
-end
-
 def extract_makefile(makefile, keep = true)
   m = File.read(makefile)
   if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
@@ -69,17 +62,19 @@ def extract_makefile(makefile, keep = true)
       unless installrb.empty?
         config = CONFIG.dup
         install_dirs(target_prefix).each {|var, val| config[var] = val}
-        FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, :verbose => true)
+        FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, :verbose => true)
       end
     end
     return false
   end
   $target = target
   $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
-  $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false
-  /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil
+  if $static.nil?
+    $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false
+    /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = false
+  end
   $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
-  $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "")
+  $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "")
   if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
     s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "")
     s.sub!(/ *#{Regexp.quote($LIBS)}$/, "")
@@ -87,6 +82,7 @@ def extract_makefile(makefile, keep = true)
   end
   $objs = (m[/^OBJS[ \t]*=[ \t](.*)/, 1] || "").split
   $srcs = (m[/^SRCS[ \t]*=[ \t](.*)/, 1] || "").split
+  $distcleanfiles = (m[/^DISTCLEANFILES[ \t]*=[ \t](.*)/, 1] || "").split
   $LOCAL_LIBS = m[/^LOCAL_LIBS[ \t]*=[ \t]*(.*)/, 1] || ""
   $LIBPATH = Shellwords.shellwords(m[/^libpath[ \t]*=[ \t]*(.*)/, 1] || "") - %w[$(libdir) $(topdir)]
   true
@@ -95,15 +91,6 @@ end
 def extmake(target)
   print "#{$message} #{target}\n"
   $stdout.flush
-  if $force_static or $static_ext[target]
-    $static = target
-  else
-    $static = false
-  end
-
-  unless $ignore
-    return true if $nodynamic and not $static
-  end
 
   FileUtils.mkpath target unless File.directory?(target)
   begin
@@ -121,13 +108,13 @@ def extmake(target)
     $mdir = target
     $srcdir = File.join($top_srcdir, "ext", $mdir)
     $preload = nil
-    $objs = ""
-    $srcs = ""
+    $objs = []
+    $srcs = []
     $compiled[target] = false
     makefile = "./Makefile"
     ok = File.exist?(makefile)
     unless $ignore
-      rbconfig0 = Config::CONFIG
+      rbconfig0 = RbConfig::CONFIG
       mkconfig0 = CONFIG
       rbconfig = {
 	"hdrdir" => $hdrdir,
@@ -135,14 +122,13 @@ def extmake(target)
 	"topdir" => $topdir,
       }
       mkconfig = {
-	"top_srcdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1],
-	"hdrdir" => "$(top_srcdir)",
+	"hdrdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include",
 	"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
 	"topdir" => $topdir,
       }
       rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
       mkconfig0.each_pair {|key, val| mkconfig[key] ||= val.dup}
-      Config.module_eval {
+      RbConfig.module_eval {
 	remove_const(:CONFIG)
 	const_set(:CONFIG, rbconfig)
 	remove_const(:MAKEFILE_CONFIG)
@@ -155,18 +141,19 @@ def extmake(target)
       begin
 	$extconf_h = nil
 	ok &&= extract_makefile(makefile)
+	old_objs = $objs
+	old_cleanfiles = $distcleanfiles
+	conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
 	if (($extconf_h && !File.exist?($extconf_h)) ||
 	    !(t = modified?(makefile, MTIMES)) ||
-	    ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb", "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
+	    [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
         then
 	  ok = false
           init_mkmf
 	  Logging::logfile 'mkmf.log'
 	  rm_f makefile
-	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
-	    load $0
-	  elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
-	    load $0
+	  if conf
+	    load $0 = conf
 	  else
 	    create_makefile(target)
 	  end
@@ -184,7 +171,7 @@ def extmake(target)
     ok = yield(ok) if block_given?
     unless ok
       open(makefile, "w") do |f|
-	f.print dummy_makefile(CONFIG["srcdir"])
+	f.print(*dummy_makefile(CONFIG["srcdir"]))
       end
       return true
     end
@@ -196,6 +183,8 @@ def extmake(target)
       args += ["static"] unless $clean
       $extlist.push [$static, $target, File.basename($target), $preload]
     end
+    FileUtils.rm_f(old_cleanfiles - $distcleanfiles)
+    FileUtils.rm_f(old_objs - $objs)
     unless system($make, *args)
       $ignore or $continue or return false
     end
@@ -205,7 +194,6 @@ def extmake(target)
       if $clean != true
 	FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
       end
-      File.unlink(makefile) rescue nil
     end
     if $static
       $extflags ||= ""
@@ -219,7 +207,7 @@ def extmake(target)
     end
   ensure
     unless $ignore
-      Config.module_eval {
+      RbConfig.module_eval {
 	remove_const(:CONFIG)
 	const_set(:CONFIG, rbconfig0)
 	remove_const(:MAKEFILE_CONFIG)
@@ -250,8 +238,8 @@ end
 
 def parse_args()
   $mflags = []
+  $makeflags = []
 
-  opts = nil
   $optparser ||= OptionParser.new do |opts|
     opts.on('-n') {$dryrun = true}
     opts.on('--[no-]extension [EXTS]', Array) do |v|
@@ -279,18 +267,22 @@ def parse_args()
       if arg = v.first
         arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
       end
+      $makeflags.concat(v.reject {|arg2| /\AMINIRUBY=/ =~ arg2}.quote)
       $mflags.concat(v)
     end
     opts.on('--message [MESSAGE]', String) do |v|
       $message = v
     end
+    opts.on('--command-output=FILE', String) do |v|
+      $command_output = v
+    end
   end
   begin
     $optparser.parse!(ARGV)
   rescue OptionParser::InvalidOption => e
     retry if /^--/ =~ e.args[0]
     $optparser.warn(e)
-    abort opts.to_s
+    abort $optparser.to_s
   end
 
   $destdir ||= ''
@@ -299,7 +291,7 @@ def parse_args()
   $mflags.unshift(*rest) unless rest.empty?
 
   def $mflags.set?(flag)
-    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
+    grep(/\A-(?!-).*#{flag.chr}/i) { return true }
     false
   end
   def $mflags.defined?(var)
@@ -316,7 +308,7 @@ def parse_args()
   $continue = $mflags.set?(?k)
   if $extout
     $extout = '$(topdir)/'+$extout
-    Config::CONFIG["extout"] = CONFIG["extout"] = $extout
+    RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
     $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
     $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
   end
@@ -326,9 +318,9 @@ parse_args()
 
 if target = ARGV.shift and /^[a-z-]+$/ =~ target
   $mflags.push(target)
-  target = target.sub(/^(dist|real)(?=(?:clean)?$)/, '')
   case target
-  when /clean/
+  when /^(dist|real)?(clean)$/
+    target = $2
     $ignore ||= true
     $clean = $1 ? $1[0] : true
   when /^install\b/
@@ -349,26 +341,30 @@ end
 
 EXEEXT = CONFIG['EXEEXT']
 if CROSS_COMPILING
-  $ruby = CONFIG['MINIRUBY']
+  $ruby = $mflags.defined?("MINIRUBY") || CONFIG['MINIRUBY']
 elsif sep = config_string('BUILD_FILE_SEPARATOR')
   $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
 else
   $ruby = '$(topdir)/miniruby' + EXEEXT
 end
-$ruby << " -I'$(topdir)' -I'$(top_srcdir)/lib'"
-$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
-$ruby << " -I'$(hdrdir)/ext' -rpurelib.rb"
-$config_h = '$(topdir)/config.h'
-ENV["RUBYLIB"] = "-"
-ENV["RUBYOPT"] = "-rpurelib.rb"
+$ruby << " -I'$(topdir)'"
+unless CROSS_COMPILING
+  $ruby << " -I'$(top_srcdir)/lib'"
+  $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+  $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
+  ENV["RUBYLIB"] = "-"
+  ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
+end
+$mflags << "ruby=#$ruby"
 
 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
 
 # get static-link modules
 $static_ext = {}
 if $extstatic
-  $extstatic.each do |target|
-    target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
+  $extstatic.each do |t|
+    target = t
+    target = target.downcase if File::FNM_SYSCASE.nonzero?
     $static_ext[target] = $static_ext.size
   end
 end
@@ -388,7 +384,7 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
 	end
 	next
       end
-      target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
+      target = target.downcase if File::FNM_SYSCASE.nonzero?
       $static_ext[target] = $static_ext.size
     end
     MTIMES << f.mtime
@@ -400,23 +396,27 @@ end unless $extstatic
 
 ext_prefix = "#{$top_srcdir}/ext"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
-if $extension
-  exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")}
+withes, withouts = %w[--with --without].collect {|w|
+  if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
+    nil
+  elsif (w = w.grep(String)).empty?
+    proc {true}
+  else
+    proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)}
+  end
+}
+if withes
+  withouts ||= proc {true}
 else
-  withes, withouts = %w[--with --without].collect {|w|
-    if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any?
-      proc {false}
-    elsif (w = w.grep(String)).empty?
-      proc {true}
-    else
-      proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)}
-    end
-  }
-  cond = proc {|ext|
-    cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
-    withes.call(cond1) or !withouts.call(cond1)
-  }
-  exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
+  withes = proc {false}
+  withouts ||= withes
+end
+cond = proc {|ext, *|
+  cond1 = proc {|n| File.fnmatch(n, ext)}
+  withes.call(cond1) or !withouts.call(cond1)
+}
+($extension || %w[*]).each do |e|
+  exts |= Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
     d = File.dirname(d)
     d.slice!(0, ext_prefix.length + 1)
     d
@@ -426,7 +426,7 @@ else
 end
 
 if $extout
-  extout = Config.expand("#{$extout}", Config::CONFIG.merge("topdir"=>$topdir))
+  extout = RbConfig.expand("#{$extout}", RbConfig::CONFIG.merge("topdir"=>$topdir))
   unless $ignore
     FileUtils.mkpath(extout)
   end
@@ -437,9 +437,13 @@ FileUtils::makedirs('ext')
 Dir::chdir('ext')
 
 hdrdir = $hdrdir
-$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
+$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
 exts.each do |d|
-  extmake(d) or abort
+  $static = $force_static ? $static_ext[target] : nil
+
+  if $ignore or !$nodynamic or $static
+    extmake(d) or abort
+  end
 end
 $top_srcdir = srcdir
 $topdir = "."
@@ -455,7 +459,16 @@ if $ignore
   Dir.chdir ".."
   if $clean
     Dir.rmdir('ext') rescue nil
-    FileUtils.rm_rf(extout) if $extout
+    if $extout
+      FileUtils.rm_rf([extout+"/common", extout+"/include/ruby", extout+"/rdoc"])
+      FileUtils.rm_rf(extout+"/"+CONFIG["arch"])
+      if $clean != true
+	FileUtils.rm_rf(extout+"/include/"+CONFIG["arch"])
+	FileUtils.rm_f($mflags.defined?("INSTALLED_LIST")||ENV["INSTALLED_LIST"]||".installed.list")
+	Dir.rmdir(extout+"/include") rescue nil
+	Dir.rmdir(extout) rescue nil
+      end
+    end
   end
   exit
 end
@@ -478,7 +491,7 @@ unless $extlist.empty?
       end
       next
     end
-    f = format("%s/%s.%s", s, i, $LIBEXT)
+    f = format("%s/%s.%s", t, i, $LIBEXT)
     if File.exist?(f)
       $extinit << "    init(Init_#{i}, \"#{t}.so\");\n"
       $extobjs << "ext/#{f} "
@@ -489,18 +502,21 @@ unless $extlist.empty?
   src = %{\
 #include "ruby.h"
 
-#define init(func, name) {void func _((void)); ruby_init_ext(name, func);}
+#define init(func, name) {	\\
+    extern void func _((void));	\\
+    ruby_init_ext(name, func);	\\
+}
 
 void ruby_init_ext _((const char *name, void (*init)(void)));
 
 void Init_ext _((void))\n{\n#$extinit}
 }
   if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
-    open(extinit.c, "w") {|f| f.print src}
+    open(extinit.c, "w") {|fe| fe.print src}
   end
 
   $extobjs = "ext/#{extinit.o} #{$extobjs}"
-  if RUBY_PLATFORM =~ /m68k-human|beos/
+  if RUBY_PLATFORM =~ /beos/
     $extflags.delete("-L/usr/local/lib")
   end
   $extpath.delete("$(topdir)")
@@ -513,17 +529,18 @@ void Init_ext _((void))\n{\n#$extinit}
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?
   }.compact
-  puts conf
+  puts(*conf)
   $stdout.flush
   $mflags.concat(conf)
+  $makeflags.concat(conf)
 else
   FileUtils.rm_f(extinit.to_a)
 end
 rubies = []
-%w[RUBY RUBYW STATIC_RUBY].each {|r|
-  n = r
+%w[RUBY RUBYW STATIC_RUBY].each {|n|
+  r = n
   if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
-    rubies << Config.expand(r+=EXEEXT)
+    rubies << RbConfig.expand(r+=EXEEXT)
     $mflags << "#{n}=#{r}"
   end
 }
@@ -532,9 +549,10 @@ Dir.chdir ".."
 unless $destdir.to_s.empty?
   $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
 end
-puts "making #{rubies.join(', ')}"
-$stdout.flush
+message = "making #{rubies.join(', ')}"
 $mflags.concat(rubies)
+$makeflags.uniq!
+$makeflags.concat(rubies)
 
 if $nmake == ?b
   unless (vars = $mflags.grep(/\A\w+=/n)).empty?
@@ -548,7 +566,29 @@ if $nmake == ?b
     vars.each {|flag| flag.sub!(/\A/, "-D")}
   end
 end
-system($make, *sysquote($mflags)) or exit($?.exitstatus)
+$mflags.unshift("topdir=#$topdir")
+ENV.delete("RUBYOPT")
+if $command_output
+  message = "echo #{message}"
+  cmd = $makeflags.map {|ss|ss.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ')
+  open($command_output, 'wb') do |ff|
+    case $command_output
+    when /\.sh\z/
+      ff.puts message, "rm -f $0; exec \"$@\" #{cmd}"
+    when /\.bat\z/
+      ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |ss|
+        ff.print ss, "\r\n"
+      end
+    else
+      ff.puts cmd
+    end
+    ff.chmod(0755)
+  end
+else
+  puts message
+  $stdout.flush
+  system($make, *sysquote($mflags)) or exit($?.exitstatus)
+end
 
 #Local variables:
 # mode: ruby
diff --git a/ext/fcntl/.cvsignore b/ext/fcntl/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/fcntl/.cvsignore
+++ b/ext/fcntl/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 57cca103f4..b0992f30d8 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -22,7 +22,7 @@ fcntl - load the C fcntl.h defines
 
 = DESCRIPTION
 
-This module is just a translation of the C <fnctl.h> file.
+This module is just a translation of the C <fcntl.h> file.
 
 = NOTE
 
@@ -42,7 +42,7 @@ pack up your own arguments to pass as args for locking functions, etc.
  * Documented by mathew <meta@pobox.com>
  *
  * = Usage
- * 
+ *
  * To perform a fcntl(2) operation, use IO::fcntl in the core classes.
  *
  * To perform an open(2) operation, use IO::sysopen.
@@ -99,10 +99,10 @@ pack up your own arguments to pass as args for locking functions, etc.
  * - O_ACCMODE - mask to extract read/write flags.
  *
  * Example:
- * 
+ *
  *   require 'fcntl'
  *
- *   fd = IO::sysopen('/tmp/tempfile', 
+ *   fd = IO::sysopen('/tmp/tempfile',
  *        Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
  *   f = IO.open(fd)
  *   f.syswrite("TEMP DATA")
diff --git a/ext/fiber/extconf.rb b/ext/fiber/extconf.rb
new file mode 100644
index 0000000000..904ab94a9c
--- /dev/null
+++ b/ext/fiber/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+create_makefile('fiber')
+
diff --git a/ext/fiber/fiber.c b/ext/fiber/fiber.c
new file mode 100644
index 0000000000..12fcaad73b
--- /dev/null
+++ b/ext/fiber/fiber.c
@@ -0,0 +1,8 @@
+
+void ruby_Init_Fiber_as_Coroutine(void);
+
+void
+Init_fiber(void)
+{
+    ruby_Init_Fiber_as_Coroutine();
+}
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
new file mode 100644
index 0000000000..9dc619fb94
--- /dev/null
+++ b/ext/fiddle/closure.c
@@ -0,0 +1,236 @@
+#include <fiddle.h>
+
+VALUE cFiddleClosure;
+
+typedef struct {
+    void * code;
+    ffi_closure *pcl;
+    ffi_cif * cif;
+    int argc;
+    ffi_type **argv;
+} fiddle_closure;
+
+#if defined(MACOSX) || defined(__linux) || defined(__OpenBSD__)
+#define DONT_USE_FFI_CLOSURE_ALLOC
+#endif
+
+static void
+dealloc(void * ptr)
+{
+    fiddle_closure * cls = (fiddle_closure *)ptr;
+#ifndef DONT_USE_FFI_CLOSURE_ALLOC
+    ffi_closure_free(cls->pcl);
+#else
+    munmap(cls->pcl, sizeof(cls->pcl));
+#endif
+    xfree(cls->cif);
+    if (cls->argv) xfree(cls->argv);
+    xfree(cls);
+}
+
+static size_t
+closure_memsize(const void * ptr)
+{
+    fiddle_closure * cls = (fiddle_closure *)ptr;
+    size_t size = 0;
+
+    if (ptr) {
+	size += sizeof(*cls);
+#if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
+	size += ffi_raw_size(cls->cif);
+#endif
+	size += sizeof(*cls->argv);
+	size += sizeof(ffi_closure);
+    }
+    return size;
+}
+
+const rb_data_type_t closure_data_type = {
+    "fiddle/closure",
+    0, dealloc, closure_memsize,
+};
+
+void
+callback(ffi_cif *cif, void *resp, void **args, void *ctx)
+{
+    VALUE self      = (VALUE)ctx;
+    VALUE rbargs    = rb_iv_get(self, "@args");
+    VALUE ctype     = rb_iv_get(self, "@ctype");
+    int argc        = RARRAY_LENINT(rbargs);
+    VALUE *params   = xcalloc(argc, sizeof(VALUE *));
+    VALUE ret;
+    VALUE cPointer;
+    int i, type;
+
+    cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
+
+    for (i = 0; i < argc; i++) {
+        type = NUM2INT(RARRAY_PTR(rbargs)[i]);
+        switch (type) {
+	  case TYPE_VOID:
+	    argc = 0;
+	    break;
+	  case TYPE_INT:
+	    params[i] = INT2NUM(*(int *)args[i]);
+	    break;
+	  case TYPE_VOIDP:
+            params[i] = rb_funcall(cPointer, rb_intern("[]"), 1,
+              PTR2NUM(*(void **)args[i]));
+	    break;
+	  case TYPE_LONG:
+	    params[i] = LONG2NUM(*(long *)args[i]);
+	    break;
+	  case TYPE_CHAR:
+	    params[i] = INT2NUM(*(char *)args[i]);
+	    break;
+	  case TYPE_DOUBLE:
+	    params[i] = rb_float_new(*(double *)args[i]);
+	    break;
+	  case TYPE_FLOAT:
+	    params[i] = rb_float_new(*(float *)args[i]);
+	    break;
+#if HAVE_LONG_LONG
+	  case TYPE_LONG_LONG:
+	    params[i] = rb_ull2inum(*(unsigned LONG_LONG *)args[i]);
+	    break;
+#endif
+	  default:
+	    rb_raise(rb_eRuntimeError, "closure args: %d", type);
+        }
+    }
+
+    ret = rb_funcall2(self, rb_intern("call"), argc, params);
+
+    type = NUM2INT(ctype);
+    switch (type) {
+      case TYPE_VOID:
+	break;
+      case TYPE_LONG:
+	*(long *)resp = NUM2LONG(ret);
+	break;
+      case TYPE_CHAR:
+	*(char *)resp = NUM2INT(ret);
+	break;
+      case TYPE_VOIDP:
+	*(void **)resp = NUM2PTR(ret);
+	break;
+      case TYPE_INT:
+	*(int *)resp = NUM2INT(ret);
+	break;
+      case TYPE_DOUBLE:
+	*(double *)resp = NUM2DBL(ret);
+	break;
+      case TYPE_FLOAT:
+	*(float *)resp = (float)NUM2DBL(ret);
+	break;
+#if HAVE_LONG_LONG
+      case TYPE_LONG_LONG:
+	*(unsigned LONG_LONG *)resp = rb_big2ull(ret);
+	break;
+#endif
+      default:
+	rb_raise(rb_eRuntimeError, "closure retval: %d", type);
+    }
+    xfree(params);
+}
+
+static VALUE
+allocate(VALUE klass)
+{
+    fiddle_closure * closure;
+
+    VALUE i = TypedData_Make_Struct(klass, fiddle_closure,
+	    &closure_data_type, closure);
+
+#ifndef DONT_USE_FFI_CLOSURE_ALLOC
+    closure->pcl = ffi_closure_alloc(sizeof(ffi_closure), &closure->code);
+#else
+    closure->pcl = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE,
+        MAP_ANON | MAP_PRIVATE, -1, 0);
+#endif
+    closure->cif = xmalloc(sizeof(ffi_cif));
+
+    return i;
+}
+
+static VALUE
+initialize(int rbargc, VALUE argv[], VALUE self)
+{
+    VALUE ret;
+    VALUE args;
+    VALUE abi;
+    fiddle_closure * cl;
+    ffi_cif * cif;
+    ffi_closure *pcl;
+    ffi_status result;
+    int i, argc;
+
+    if (2 == rb_scan_args(rbargc, argv, "21", &ret, &args, &abi))
+	abi = INT2NUM(FFI_DEFAULT_ABI);
+
+    Check_Type(args, T_ARRAY);
+
+    argc = RARRAY_LENINT(args);
+
+    TypedData_Get_Struct(self, fiddle_closure, &closure_data_type, cl);
+
+    cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *));
+
+    for (i = 0; i < argc; i++) {
+        int type = NUM2INT(RARRAY_PTR(args)[i]);
+        cl->argv[i] = INT2FFI_TYPE(type);
+    }
+    cl->argv[argc] = NULL;
+
+    rb_iv_set(self, "@ctype", ret);
+    rb_iv_set(self, "@args", args);
+
+    cif = cl->cif;
+    pcl = cl->pcl;
+
+    result = ffi_prep_cif(cif, NUM2INT(abi), argc,
+                INT2FFI_TYPE(NUM2INT(ret)),
+		cl->argv);
+
+    if (FFI_OK != result)
+	rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);
+
+#ifndef DONT_USE_FFI_CLOSURE_ALLOC
+    result = ffi_prep_closure_loc(pcl, cif, callback,
+		(void *)self, cl->code);
+#else
+    result = ffi_prep_closure(pcl, cif, callback, (void *)self);
+    cl->code = (void *)pcl;
+    mprotect(pcl, sizeof(pcl), PROT_READ | PROT_EXEC);
+#endif
+
+    if (FFI_OK != result)
+	rb_raise(rb_eRuntimeError, "error prepping closure %d", result);
+
+    return self;
+}
+
+static VALUE
+to_i(VALUE self)
+{
+    fiddle_closure * cl;
+    void *code;
+
+    TypedData_Get_Struct(self, fiddle_closure, &closure_data_type, cl);
+
+    code = cl->code;
+
+    return PTR2NUM(code);
+}
+
+void
+Init_fiddle_closure()
+{
+    cFiddleClosure = rb_define_class_under(mFiddle, "Closure", rb_cObject);
+
+    rb_define_alloc_func(cFiddleClosure, allocate);
+
+    rb_define_method(cFiddleClosure, "initialize", initialize, -1);
+    rb_define_method(cFiddleClosure, "to_i", to_i, 0);
+}
+/* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/closure.h b/ext/fiddle/closure.h
new file mode 100644
index 0000000000..1e870e2285
--- /dev/null
+++ b/ext/fiddle/closure.h
@@ -0,0 +1,8 @@
+#ifndef FIDDLE_CLOSURE_H
+#define FIDDLE_CLOSURE_H
+
+#include <fiddle.h>
+
+void Init_fiddle_closure();
+
+#endif
diff --git a/ext/fiddle/conversions.c b/ext/fiddle/conversions.c
new file mode 100644
index 0000000000..bb5361a6c8
--- /dev/null
+++ b/ext/fiddle/conversions.c
@@ -0,0 +1,126 @@
+#include <fiddle.h>
+
+ffi_type *
+int_to_ffi_type(int type)
+{
+    int signed_p = 1;
+
+    if (type < 0) {
+	type = -1 * type;
+	signed_p = 0;
+    }
+
+#define rb_ffi_type_of(t) (signed_p ? &ffi_type_s##t : &ffi_type_u##t)
+
+    switch (type) {
+      case TYPE_VOID:
+	return &ffi_type_void;
+      case TYPE_VOIDP:
+	return &ffi_type_pointer;
+      case TYPE_CHAR:
+	return rb_ffi_type_of(char);
+      case TYPE_SHORT:
+	return rb_ffi_type_of(short);
+      case TYPE_INT:
+	return rb_ffi_type_of(int);
+      case TYPE_LONG:
+	return rb_ffi_type_of(long);
+#if HAVE_LONG_LONG
+      case TYPE_LONG_LONG:
+	return rb_ffi_type_of(int64);
+#endif
+      case TYPE_FLOAT:
+	return &ffi_type_float;
+      case TYPE_DOUBLE:
+	return &ffi_type_double;
+      default:
+	rb_raise(rb_eRuntimeError, "unknown type %d", type);
+    }
+    return &ffi_type_pointer;
+}
+
+void
+value_to_generic(int type, VALUE src, fiddle_generic * dst)
+{
+    int signed_p = 1;
+
+    if (type < 0) {
+	type = -1 * type;
+	signed_p = 0;
+    }
+
+    switch (type) {
+      case TYPE_VOID:
+	break;
+      case TYPE_VOIDP:
+	dst->pointer = NUM2PTR(rb_Integer(src));
+	break;
+      case TYPE_CHAR:
+      case TYPE_SHORT:
+      case TYPE_INT:
+	dst->sint = NUM2INT(src);
+	break;
+      case TYPE_LONG:
+	if (signed_p)
+	    dst->slong = NUM2LONG(src);
+	else
+	    dst->ulong = NUM2LONG(src);
+	break;
+#if HAVE_LONG_LONG
+      case TYPE_LONG_LONG:
+	dst->long_long = rb_big2ull(src);
+	break;
+#endif
+      case TYPE_FLOAT:
+	dst->ffloat = (float)NUM2DBL(src);
+	break;
+      case TYPE_DOUBLE:
+	dst->ddouble = NUM2DBL(src);
+	break;
+      default:
+	rb_raise(rb_eRuntimeError, "unknown type %d", type);
+    }
+}
+
+VALUE
+generic_to_value(VALUE rettype, fiddle_generic retval)
+{
+    int signed_p = 1;
+    int type = NUM2INT(rettype);
+    VALUE cPointer;
+
+    cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
+
+    if (type < 0) {
+	type = -1 * type;
+	signed_p = 0;
+    }
+
+    switch (type) {
+      case TYPE_VOID:
+	return Qnil;
+      case TYPE_VOIDP:
+        return rb_funcall(cPointer, rb_intern("[]"), 1,
+          PTR2NUM((void *)retval.pointer));
+      case TYPE_CHAR:
+      case TYPE_SHORT:
+      case TYPE_INT:
+	return INT2NUM(retval.sint);
+      case TYPE_LONG:
+	if (signed_p) return LONG2NUM(retval.slong);
+	return ULONG2NUM(retval.ulong);
+#if HAVE_LONG_LONG
+      case TYPE_LONG_LONG:
+	return rb_ll2inum(retval.long_long);
+	break;
+#endif
+      case TYPE_FLOAT:
+	return rb_float_new(retval.ffloat);
+      case TYPE_DOUBLE:
+	return rb_float_new(retval.ddouble);
+      default:
+	rb_raise(rb_eRuntimeError, "unknown type %d", type);
+    }
+}
+
+/* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/conversions.h b/ext/fiddle/conversions.h
new file mode 100644
index 0000000000..166c5d9af4
--- /dev/null
+++ b/ext/fiddle/conversions.h
@@ -0,0 +1,41 @@
+#ifndef FIDDLE_CONVERSIONS_H
+#define FIDDLE_CONVERSIONS_H
+
+#include <fiddle.h>
+
+typedef union
+{
+    unsigned char uchar;   /* ffi_type_uchar */
+    signed char   schar;   /* ffi_type_schar */
+    unsigned short ushort; /* ffi_type_sshort */
+    signed short sshort;   /* ffi_type_ushort */
+    unsigned int uint;     /* ffi_type_uint */
+    signed int sint;       /* ffi_type_sint */
+    unsigned long ulong;   /* ffi_type_ulong */
+    signed long slong;     /* ffi_type_slong */
+    float ffloat;          /* ffi_type_float */
+    double ddouble;        /* ffi_type_double */
+#if HAVE_LONG_LONG
+    unsigned LONG_LONG long_long; /* ffi_type_uint64 */
+#endif
+    void * pointer;        /* ffi_type_pointer */
+} fiddle_generic;
+
+ffi_type * int_to_ffi_type(int type);
+void value_to_generic(int type, VALUE src, fiddle_generic * dst);
+VALUE generic_to_value(VALUE rettype, fiddle_generic retval);
+
+#define VALUE2GENERIC(_type, _src, _dst) value_to_generic(_type, _src, _dst)
+#define INT2FFI_TYPE(_type) int_to_ffi_type(_type)
+#define GENERIC2VALUE(_type, _retval) generic_to_value(_type, _retval)
+
+#if SIZEOF_VOIDP == SIZEOF_LONG
+# define PTR2NUM(x)   (ULONG2NUM((unsigned long)(x)))
+# define NUM2PTR(x)   ((void*)(NUM2ULONG(x)))
+#else
+/* # error --->> Ruby/DL2 requires sizeof(void*) == sizeof(long) to be compiled. <<--- */
+# define PTR2NUM(x)   (ULL2NUM((unsigned long long)(x)))
+# define NUM2PTR(x)   ((void*)(NUM2ULL(x)))
+#endif
+
+#endif
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
new file mode 100644
index 0000000000..03b0ac2765
--- /dev/null
+++ b/ext/fiddle/extconf.rb
@@ -0,0 +1,24 @@
+require 'mkmf'
+
+# :stopdoc:
+
+dir_config 'libffi'
+
+pkg_config("libffi")
+unless have_header('ffi.h')
+  if have_header('ffi/ffi.h')
+    $defs.push(format('-DUSE_HEADER_HACKS'))
+  else
+    abort "ffi.h is missing. Please install libffi."
+  end
+end
+
+unless have_library('ffi') || have_library('libffi')
+  abort "libffi is missing. Please install libffi."
+end
+
+have_header 'sys/mman.h'
+
+create_makefile 'fiddle'
+
+# :startdoc:
diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c
new file mode 100644
index 0000000000..2580ac0e53
--- /dev/null
+++ b/ext/fiddle/fiddle.c
@@ -0,0 +1,30 @@
+#include <fiddle.h>
+
+VALUE mFiddle;
+
+void Init_fiddle()
+{
+    mFiddle = rb_define_module("Fiddle");
+
+    rb_define_const(mFiddle, "TYPE_VOID",      INT2NUM(TYPE_VOID));
+    rb_define_const(mFiddle, "TYPE_VOIDP",     INT2NUM(TYPE_VOIDP));
+    rb_define_const(mFiddle, "TYPE_CHAR",      INT2NUM(TYPE_CHAR));
+    rb_define_const(mFiddle, "TYPE_SHORT",     INT2NUM(TYPE_SHORT));
+    rb_define_const(mFiddle, "TYPE_INT",       INT2NUM(TYPE_INT));
+    rb_define_const(mFiddle, "TYPE_LONG",      INT2NUM(TYPE_LONG));
+#if HAVE_LONG_LONG
+    rb_define_const(mFiddle, "TYPE_LONG_LONG", INT2NUM(TYPE_LONG_LONG));
+#endif
+    rb_define_const(mFiddle, "TYPE_FLOAT",     INT2NUM(TYPE_FLOAT));
+    rb_define_const(mFiddle, "TYPE_DOUBLE",    INT2NUM(TYPE_DOUBLE));
+
+#if defined(_WIN32)
+    rb_define_const(mFiddle, "WINDOWS", Qtrue);
+#else
+    rb_define_const(mFiddle, "WINDOWS", Qfalse);
+#endif
+
+    Init_fiddle_function();
+    Init_fiddle_closure();
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
new file mode 100644
index 0000000000..7165969225
--- /dev/null
+++ b/ext/fiddle/fiddle.h
@@ -0,0 +1,94 @@
+#ifndef FIDDLE_H
+#define FIDDLE_H
+
+#include <ruby.h>
+#include <errno.h>
+
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#ifdef USE_HEADER_HACKS
+#include <ffi/ffi.h>
+#else
+#include <ffi.h>
+#endif
+
+#undef ffi_type_uchar
+#undef ffi_type_schar
+#undef ffi_type_ushort
+#undef ffi_type_sshort
+#undef ffi_type_uint
+#undef ffi_type_sint
+#undef ffi_type_ulong
+#undef ffi_type_slong
+
+#if CHAR_BIT == 8
+# define ffi_type_uchar ffi_type_uint8
+# define ffi_type_schar ffi_type_sint8
+#else
+# error "CHAR_BIT not supported"
+#endif
+
+# if SIZEOF_SHORT == 2
+#  define ffi_type_ushort ffi_type_uint16
+#  define ffi_type_sshort ffi_type_sint16
+# elif SIZEOF_SHORT == 4
+#  define ffi_type_ushort ffi_type_uint32
+#  define ffi_type_sshort ffi_type_sint32
+# else
+#  error "short size not supported"
+# endif
+
+# if SIZEOF_INT == 2
+#  define ffi_type_uint	ffi_type_uint16
+#  define ffi_type_sint	ffi_type_sint16
+# elif SIZEOF_INT == 4
+#  define ffi_type_uint	ffi_type_uint32
+#  define ffi_type_sint	ffi_type_sint32
+# elif SIZEOF_INT == 8
+#  define ffi_type_uint	ffi_type_uint64
+#  define ffi_type_sint	ffi_type_sint64
+# else
+#  error "int size not supported"
+# endif
+
+# if SIZEOF_LONG == 4
+#  define ffi_type_ulong ffi_type_uint32
+#  define ffi_type_slong ffi_type_sint32
+# elif SIZEOF_LONG == 8
+#  define ffi_type_ulong ffi_type_uint64
+#  define ffi_type_slong ffi_type_sint64
+# else
+#  error "long size not supported"
+# endif
+
+#include <closure.h>
+#include <conversions.h>
+#include <function.h>
+
+/* FIXME
+ * These constants need to match up with DL. We need to refactor this to use
+ * the DL header files or vice versa.
+ */
+
+#define TYPE_VOID  0
+#define TYPE_VOIDP 1
+#define TYPE_CHAR  2
+#define TYPE_SHORT 3
+#define TYPE_INT   4
+#define TYPE_LONG  5
+#if HAVE_LONG_LONG
+#define TYPE_LONG_LONG 6
+#endif
+#define TYPE_FLOAT 7
+#define TYPE_DOUBLE 8
+
+extern VALUE mFiddle;
+
+#endif
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
new file mode 100644
index 0000000000..c1b75afae6
--- /dev/null
+++ b/ext/fiddle/function.c
@@ -0,0 +1,154 @@
+#include <fiddle.h>
+
+VALUE cFiddleFunction;
+
+static void
+deallocate(void *p)
+{
+    ffi_cif *ptr = p;
+    if (ptr->arg_types) xfree(ptr->arg_types);
+    xfree(ptr);
+}
+
+static size_t
+function_memsize(const void *p)
+{
+    /* const */ffi_cif *ptr = (ffi_cif *)p;
+    size_t size = 0;
+
+    if (ptr) {
+	size += sizeof(*ptr);
+#if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
+	size += ffi_raw_size(ptr);
+#endif
+    }
+    return size;
+}
+
+const rb_data_type_t function_data_type = {
+    "fiddle/function",
+    0, deallocate, function_memsize,
+};
+
+static VALUE
+allocate(VALUE klass)
+{
+    ffi_cif * cif;
+
+    return TypedData_Make_Struct(klass, ffi_cif, &function_data_type, cif);
+}
+
+static VALUE
+initialize(int argc, VALUE argv[], VALUE self)
+{
+    ffi_cif * cif;
+    ffi_type **arg_types;
+    ffi_status result;
+    VALUE ptr, args, ret_type, abi;
+    int i;
+
+    rb_scan_args(argc, argv, "31", &ptr, &args, &ret_type, &abi);
+    if(NIL_P(abi)) abi = INT2NUM(FFI_DEFAULT_ABI);
+
+    Check_Type(args, T_ARRAY);
+
+    rb_iv_set(self, "@ptr", ptr);
+    rb_iv_set(self, "@args", args);
+    rb_iv_set(self, "@return_type", ret_type);
+    rb_iv_set(self, "@abi", abi);
+
+    TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
+
+    arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *));
+
+    for (i = 0; i < RARRAY_LEN(args); i++) {
+	int type = NUM2INT(RARRAY_PTR(args)[i]);
+	arg_types[i] = INT2FFI_TYPE(type);
+    }
+    arg_types[RARRAY_LEN(args)] = NULL;
+
+    result = ffi_prep_cif (
+	    cif,
+	    NUM2INT(abi),
+	    RARRAY_LENINT(args),
+	    INT2FFI_TYPE(NUM2INT(ret_type)),
+	    arg_types);
+
+    if (result)
+	rb_raise(rb_eRuntimeError, "error creating CIF %d", result);
+
+    return self;
+}
+
+static VALUE
+function_call(int argc, VALUE argv[], VALUE self)
+{
+    ffi_cif * cif;
+    fiddle_generic retval;
+    fiddle_generic *generic_args;
+    void **values;
+    VALUE cfunc, types, cPointer;
+    int i;
+
+    cfunc    = rb_iv_get(self, "@ptr");
+    types    = rb_iv_get(self, "@args");
+    cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
+
+    if(argc != RARRAY_LENINT(types)) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+		argc, RARRAY_LENINT(types));
+    }
+
+    TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
+
+    values = xcalloc((size_t)argc + 1, (size_t)sizeof(void *));
+    generic_args = xcalloc((size_t)argc, (size_t)sizeof(fiddle_generic));
+
+    for (i = 0; i < argc; i++) {
+	VALUE type = RARRAY_PTR(types)[i];
+	VALUE src = argv[i];
+
+	if(NUM2INT(type) == TYPE_VOIDP) {
+	    if(NIL_P(src)) {
+		src = INT2NUM(0);
+	    } else if(cPointer != CLASS_OF(src)) {
+	        src = rb_funcall(cPointer, rb_intern("[]"), 1, src);
+	    }
+	    src = rb_Integer(src);
+	}
+
+	VALUE2GENERIC(NUM2INT(type), src, &generic_args[i]);
+	values[i] = (void *)&generic_args[i];
+    }
+    values[argc] = NULL;
+
+    ffi_call(cif, NUM2PTR(rb_Integer(cfunc)), &retval, values);
+
+    rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno));
+#if defined(_WIN32)
+    rb_funcall(mFiddle, rb_intern("win32_last_error="), 1, INT2NUM(errno));
+#endif
+
+    xfree(values);
+    xfree(generic_args);
+
+    return GENERIC2VALUE(rb_iv_get(self, "@return_type"), retval);
+}
+
+void
+Init_fiddle_function(void)
+{
+    cFiddleFunction = rb_define_class_under(mFiddle, "Function", rb_cObject);
+
+    rb_define_const(cFiddleFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
+
+#ifdef FFI_STDCALL
+    rb_define_const(cFiddleFunction, "STDCALL", INT2NUM(FFI_STDCALL));
+#endif
+
+    rb_define_alloc_func(cFiddleFunction, allocate);
+
+    rb_define_method(cFiddleFunction, "call", function_call, -1);
+    rb_define_method(cFiddleFunction, "initialize", initialize, -1);
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/function.h b/ext/fiddle/function.h
new file mode 100644
index 0000000000..e5465ab64f
--- /dev/null
+++ b/ext/fiddle/function.h
@@ -0,0 +1,8 @@
+#ifndef FIDDLE_FUNCTION_H
+#define FIDDLE_FUNCTION_H
+
+#include <fiddle.h>
+
+void Init_fiddle_function();
+
+#endif
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
new file mode 100644
index 0000000000..8b8c069b03
--- /dev/null
+++ b/ext/fiddle/lib/fiddle.rb
@@ -0,0 +1,27 @@
+require 'fiddle.so'
+require 'fiddle/function'
+require 'fiddle/closure'
+require 'dl' unless Object.const_defined?(:DL)
+
+module Fiddle
+  Pointer = DL::CPtr
+
+  if WINDOWS
+    def self.win32_last_error
+      Thread.current[:__FIDDLE_WIN32_LAST_ERROR__]
+    end
+
+    def self.win32_last_error= error
+      Thread.current[:__FIDDLE_WIN32_LAST_ERROR__] = error
+    end
+  end
+
+  def self.last_error
+    Thread.current[:__FIDDLE_LAST_ERROR__]
+  end
+
+  def self.last_error= error
+    Thread.current[:__DL2_LAST_ERROR__] = error
+    Thread.current[:__FIDDLE_LAST_ERROR__] = error
+  end
+end
diff --git a/ext/fiddle/lib/fiddle/closure.rb b/ext/fiddle/lib/fiddle/closure.rb
new file mode 100644
index 0000000000..dc2b7a65be
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/closure.rb
@@ -0,0 +1,17 @@
+module Fiddle
+  class Closure
+    attr_reader :ctype
+    attr_reader :args
+
+    class BlockCaller < Fiddle::Closure
+      def initialize ctype, args, abi = Fiddle::Function::DEFAULT, &block
+        super(ctype, args, abi)
+        @block = block
+      end
+
+      def call *args
+        @block.call(*args)
+      end
+    end
+  end
+end
diff --git a/ext/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb
new file mode 100644
index 0000000000..7b9e735874
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/function.rb
@@ -0,0 +1,5 @@
+module Fiddle
+  class Function
+    attr_reader :abi
+  end
+end
diff --git a/ext/gdbm/.cvsignore b/ext/gdbm/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/gdbm/.cvsignore
+++ b/ext/gdbm/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 82109fda90..d0616cc63a 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -3,7 +3,6 @@
   gdbm.c -
 
   $Author$
-  $Date$
   modified at: Mon Jan 24 15:59:52 JST 1994
 
   Documentation by Peter Adolphs < futzilogik at users dot sourceforge dot net >
@@ -45,7 +44,7 @@
  * 1. Opening/creating a database, and filling it with some entries:
  *
  *      require 'gdbm'
- *      
+ *
  *      gdbm = GDBM.new("fruitstore.db")
  *      gdbm["ananas"]    = "3"
  *      gdbm["banana"]    = "8"
@@ -55,7 +54,7 @@
  * 2. Reading out a database:
  *
  *      require 'gdbm'
- *      
+ *
  *      gdbm = GDBM.new("fruitstore.db")
  *      gdbm.each_pair do |key, value|
  *        print "#{key}: #{value}\n"
@@ -79,8 +78,7 @@ static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
 #define MY_BLOCK_SIZE (2048)
 #define MY_FATAL_FUNC rb_gdbm_fatal
 static void
-rb_gdbm_fatal(msg)
-    char *msg;
+rb_gdbm_fatal(char *msg)
 {
     rb_raise(rb_eGDBMFatalError, "%s", msg);
 }
@@ -91,7 +89,7 @@ struct dbmdata {
 };
 
 static void
-closed_dbm()
+closed_dbm(void)
 {
     rb_raise(rb_eRuntimeError, "closed GDBM file");
 }
@@ -108,12 +106,11 @@ closed_dbm()
 }
 
 static void
-free_dbm(dbmp)
-    struct dbmdata *dbmp;
+free_dbm(struct dbmdata *dbmp)
 {
     if (dbmp) {
         if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
-        free(dbmp);
+        xfree(dbmp);
     }
 }
 
@@ -124,8 +121,7 @@ free_dbm(dbmp)
  * Closes the associated database file.
  */
 static VALUE
-fgdbm_close(obj)
-    VALUE obj;
+fgdbm_close(VALUE obj)
 {
     struct dbmdata *dbmp;
 
@@ -143,8 +139,7 @@ fgdbm_close(obj)
  * Returns true if the associated database file has been closed.
  */
 static VALUE
-fgdbm_closed(obj)
-    VALUE obj;
+fgdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
@@ -157,11 +152,8 @@ fgdbm_closed(obj)
     return Qfalse;
 }
 
-static VALUE fgdbm_s_alloc _((VALUE));
-
 static VALUE
-fgdbm_s_alloc(klass)
-    VALUE klass;
+fgdbm_s_alloc(VALUE klass)
 {
     return Data_Wrap_Struct(klass, 0, free_dbm, 0);
 }
@@ -190,10 +182,7 @@ fgdbm_s_alloc(klass)
  * database file as a reader (cf. flag <tt>READER</tt>).
  */
 static VALUE
-fgdbm_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
 {
     VALUE file, vmode, vflags;
     GDBM_FILE dbm;
@@ -217,31 +206,31 @@ fgdbm_initialize(argc, argv, obj)
 
     if (flags & RUBY_GDBM_RW_BIT) {
         flags &= ~RUBY_GDBM_RW_BIT;
-	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-			flags, mode, MY_FATAL_FUNC);
+        dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
+                        flags, mode, MY_FATAL_FUNC);
     }
     else {
         dbm = 0;
         if (mode >= 0)
-            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+            dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
                             GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
         if (!dbm)
-            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+            dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
                             GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
         if (!dbm)
-            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+            dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
                             GDBM_READER|flags, 0, MY_FATAL_FUNC);
     }
 
     if (!dbm) {
-	if (mode == -1) return Qnil;
-
-	if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
-	    gdbm_errno == GDBM_CANT_BE_READER ||
-	    gdbm_errno == GDBM_CANT_BE_WRITER)
-	    rb_sys_fail(RSTRING(file)->ptr);
-	else
-	    rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+        if (mode == -1) return Qnil;
+
+        if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
+            gdbm_errno == GDBM_CANT_BE_READER ||
+            gdbm_errno == GDBM_CANT_BE_WRITER)
+            rb_sys_fail(RSTRING_PTR(file));
+        else
+            rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
     }
 
     dbmp = ALLOC(struct dbmdata);
@@ -273,15 +262,12 @@ fgdbm_initialize(argc, argv, obj)
  *   end
  */
 static VALUE
-fgdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+fgdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
     VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
 
     if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
-	return Qnil;
+        return Qnil;
     }
 
     if (rb_block_given_p()) {
@@ -292,9 +278,7 @@ fgdbm_s_open(argc, argv, klass)
 }
 
 static VALUE
-rb_gdbm_fetch(dbm, key)
-    GDBM_FILE dbm;
-    datum key;
+rb_gdbm_fetch(GDBM_FILE dbm, datum key)
 {
     datum val;
     VALUE str;
@@ -303,33 +287,26 @@ rb_gdbm_fetch(dbm, key)
     if (val.dptr == 0)
         return Qnil;
 
-    str = rb_obj_alloc(rb_cString);
-    RSTRING(str)->len = val.dsize;
-    RSTRING(str)->aux.capa = val.dsize;
-    RSTRING(str)->ptr = REALLOC_N(val.dptr,char,val.dsize+1);
-    RSTRING(str)->ptr[val.dsize] = '\0';
-
+    str = rb_str_new(val.dptr, val.dsize);
+    free(val.dptr);
     OBJ_TAINT(str);
-    return (VALUE)str;
+    return str;
 }
 
 static VALUE
-rb_gdbm_fetch2(dbm, keystr)
-    GDBM_FILE dbm;
-    VALUE keystr;
+rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
 {
     datum key;
 
     StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     return rb_gdbm_fetch(dbm, key);
 }
 
 static VALUE
-rb_gdbm_fetch3(obj, keystr)
-    VALUE obj, keystr;
+rb_gdbm_fetch3(VALUE obj, VALUE keystr)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -339,8 +316,7 @@ rb_gdbm_fetch3(obj, keystr)
 }
 
 static VALUE
-rb_gdbm_firstkey(dbm)
-    GDBM_FILE dbm;
+rb_gdbm_firstkey(GDBM_FILE dbm)
 {
     datum key;
     VALUE str;
@@ -349,51 +325,40 @@ rb_gdbm_firstkey(dbm)
     if (key.dptr == 0)
         return Qnil;
 
-    str = rb_obj_alloc(rb_cString);
-    RSTRING(str)->len = key.dsize;
-    RSTRING(str)->aux.capa = key.dsize;
-    RSTRING(str)->ptr = REALLOC_N(key.dptr,char,key.dsize+1);
-    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
-
+    str = rb_str_new(key.dptr, key.dsize);
+    free(key.dptr);
     OBJ_TAINT(str);
     return str;
 }
 
 static VALUE
-rb_gdbm_nextkey(dbm, keystr)
-    GDBM_FILE dbm;
-    VALUE keystr;
+rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
 {
     datum key, key2;
     VALUE str;
 
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
     key2 = gdbm_nextkey(dbm, key);
     if (key2.dptr == 0)
         return Qnil;
 
-    str = rb_obj_alloc(rb_cString);
-    RSTRING(str)->len = key2.dsize;
-    RSTRING(str)->aux.capa = key2.dsize;
-    RSTRING(str)->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1);
-    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
-
+    str = rb_str_new(key2.dptr, key2.dsize);
+    free(key2.dptr);
     OBJ_TAINT(str);
     return str;
 }
 
 static VALUE
-fgdbm_fetch(obj, keystr, ifnone)
-    VALUE obj, keystr, ifnone;
+fgdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
 {
     VALUE valstr;
 
     valstr = rb_gdbm_fetch3(obj, keystr);
     if (NIL_P(valstr)) {
-	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(keystr);
-	return ifnone;
+        if (ifnone == Qnil && rb_block_given_p())
+            return rb_yield(keystr);
+        return ifnone;
     }
     return valstr;
 }
@@ -405,8 +370,7 @@ fgdbm_fetch(obj, keystr, ifnone)
  * Retrieves the _value_ corresponding to _key_.
  */
 static VALUE
-fgdbm_aref(obj, keystr)
-    VALUE obj, keystr;
+fgdbm_aref(VALUE obj, VALUE keystr)
 {
     return rb_gdbm_fetch3(obj, keystr);
 }
@@ -419,10 +383,7 @@ fgdbm_aref(obj, keystr)
  * associated with _key_, _default_ will be returned instead.
  */
 static VALUE
-fgdbm_fetch_m(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fgdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
 {
     VALUE keystr, valstr, ifnone;
 
@@ -436,14 +397,13 @@ fgdbm_fetch_m(argc, argv, obj)
 
 /*
  * call-seq:
- *      gdbm.index(value) -> key
+ *      gdbm.key(value) -> key
  *
  * Returns the _key_ for a given _value_. If several keys may map to the
  * same value, the key that is found first will be returned.
  */
 static VALUE
-fgdbm_index(obj, valstr)
-    VALUE obj, valstr;
+fgdbm_key(VALUE obj, VALUE valstr)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -454,76 +414,50 @@ fgdbm_index(obj, valstr)
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
-	valstr2 = rb_gdbm_fetch2(dbm, keystr);
+        valstr2 = rb_gdbm_fetch2(dbm, keystr);
         if (!NIL_P(valstr2) &&
-            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
-            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
-                   RSTRING(valstr)->len) == 0) {
-	    return keystr;
+            RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
+            memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
+                   RSTRING_LEN(valstr)) == 0) {
+            return keystr;
         }
     }
     return Qnil;
 }
 
+/* :nodoc: */
 static VALUE
-fgdbm_indexes(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fgdbm_index(VALUE obj, VALUE value)
 {
-    VALUE new;
-    int i;
-
-    new = rb_ary_new2(argc);
-    for (i=0; i<argc; i++) {
-	rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
-    }
-
-    return new;
+    rb_warn("GDBM#index is deprecated; use GDBM#key");
+    return fgdbm_key(obj, value);
 }
 
 /*
  * call-seq:
- *      gdbm.select { |value| block } -> array
+ *      gdbm.select { |key, value| block } -> array
  *
- * Returns a new array of all values of the database for which _block_
+ * Returns a new array of all key-value pairs of the database for which _block_
  * evaluates to true.
  */
 static VALUE
-fgdbm_select(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fgdbm_select(VALUE obj)
 {
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    if (rb_block_given_p()) {
-        GDBM_FILE dbm;
-        struct dbmdata *dbmp;
-        VALUE keystr;
+    VALUE new = rb_ary_new();
+    GDBM_FILE dbm;
+    struct dbmdata *dbmp;
+    VALUE keystr;
 
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-	}
-        GetDBM2(obj, dbmp, dbm);
-        for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-             keystr = rb_gdbm_nextkey(dbm, keystr)) {
-            VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
-	    VALUE v = rb_yield(assoc);
-
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
-        }
-    }
-    else {
-	rb_warn("GDBM#select(index..) is deprecated; use GDBM#values_at");
+    GetDBM2(obj, dbmp, dbm);
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+        VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
+        VALUE v = rb_yield(assoc);
 
-        for (i=0; i<argc; i++) {
-            rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+        if (RTEST(v)) {
+            rb_ary_push(new, assoc);
         }
+        GetDBM2(obj, dbmp, dbm);
     }
 
     return new;
@@ -536,10 +470,7 @@ fgdbm_select(argc, argv, obj)
  * Returns an array of the values associated with each specified _key_.
  */
 static VALUE
-fgdbm_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fgdbm_values_at(int argc, VALUE *argv, VALUE obj)
 {
     VALUE new = rb_ary_new2(argc);
     int i;
@@ -552,16 +483,14 @@ fgdbm_values_at(argc, argv, obj)
 }
 
 static void
-rb_gdbm_modify(obj)
-    VALUE obj;
+rb_gdbm_modify(VALUE obj)
 {
     rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
 }
 
 static VALUE
-rb_gdbm_delete(obj, keystr)
-    VALUE obj, keystr;
+rb_gdbm_delete(VALUE obj, VALUE keystr)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -569,8 +498,8 @@ rb_gdbm_delete(obj, keystr)
 
     rb_gdbm_modify(obj);
     StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
     if (!gdbm_exists(dbm, key)) {
@@ -595,8 +524,7 @@ rb_gdbm_delete(obj, keystr)
  * returns the corresponding _value_. Returns nil if the database is empty.
  */
 static VALUE
-fgdbm_delete(obj, keystr)
-    VALUE obj, keystr;
+fgdbm_delete(VALUE obj, VALUE keystr)
 {
     VALUE valstr;
 
@@ -609,12 +537,11 @@ fgdbm_delete(obj, keystr)
  * call-seq:
  *      gdbm.shift -> (key, value) or nil
  *
- * Removes a key-value-pair from this database and returns it as a 
+ * Removes a key-value-pair from this database and returns it as a
  * two-item array [ _key_, _value_ ]. Returns nil if the database is empty.
  */
 static VALUE
-fgdbm_shift(obj)
-    VALUE obj;
+fgdbm_shift(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -638,8 +565,7 @@ fgdbm_shift(obj)
  * Deletes every key-value pair from _gdbm_ for which _block_ evaluates to true.
  */
 static VALUE
-fgdbm_delete_if(obj)
-    VALUE obj;
+fgdbm_delete_if(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -662,10 +588,10 @@ fgdbm_delete_if(obj)
         GetDBM2(obj, dbmp, dbm);
     }
 
-    for (i = 0; i < RARRAY(ary)->len; i++)
-        rb_gdbm_delete(obj, RARRAY(ary)->ptr[i]);
+    for (i = 0; i < RARRAY_LEN(ary); i++)
+        rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
     if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
+    if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
 
     return obj;
 }
@@ -677,8 +603,7 @@ fgdbm_delete_if(obj)
  * Removes all the key-value pairs within _gdbm_.
  */
 static VALUE
-fgdbm_clear(obj)
-    VALUE obj;
+fgdbm_clear(VALUE obj)
 {
     datum key, nextkey;
     struct dbmdata *dbmp;
@@ -694,7 +619,7 @@ fgdbm_clear(obj)
             free(key.dptr);
             rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
         }
-        free(key.dptr); 
+        free(key.dptr);
     }
 #else
     while (key = gdbm_firstkey(dbm), key.dptr) {
@@ -722,8 +647,7 @@ fgdbm_clear(obj)
  * as values.
  */
 static VALUE
-fgdbm_invert(obj)
-    VALUE obj;
+fgdbm_invert(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -733,33 +657,55 @@ fgdbm_invert(obj)
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
-	valstr = rb_gdbm_fetch2(dbm, keystr);
+        valstr = rb_gdbm_fetch2(dbm, keystr);
 
-	rb_hash_aset(hash, valstr, keystr);
+        rb_hash_aset(hash, valstr, keystr);
     }
     return hash;
 }
 
-static VALUE each_pair _((VALUE));
-
+/*
+ * call-seq:
+ *      gdbm[key]= value -> value
+ *      gdbm.store(key, value) -> value
+ *
+ * Associates the value _value_ with the specified _key_.
+ */
 static VALUE
-each_pair(obj)
-    VALUE obj;
+fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 {
-    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
-}
+    datum key, val;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    rb_gdbm_modify(obj);
+    StringValue(keystr);
+    StringValue(valstr);
+
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
+
+    val.dptr = RSTRING_PTR(valstr);
+    val.dsize = RSTRING_LEN(valstr);
+
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+    if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
+        if (errno == EPERM) rb_sys_fail(0);
+        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
 
-static VALUE fgdbm_store _((VALUE,VALUE,VALUE));
+    return valstr;
+}
 
 static VALUE
-update_i(pair, dbm)
-    VALUE pair, dbm;
+update_i(VALUE pair, VALUE dbm)
 {
     Check_Type(pair, T_ARRAY);
-    if (RARRAY(pair)->len < 2) {
-	rb_raise(rb_eArgError, "pair must be [key, value]");
+    if (RARRAY_LEN(pair) < 2) {
+        rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    fgdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
+    fgdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
     return Qnil;
 }
 
@@ -772,10 +718,9 @@ update_i(pair, dbm)
  * method.
  */
 static VALUE
-fgdbm_update(obj, other)
-    VALUE obj, other;
+fgdbm_update(VALUE obj, VALUE other)
 {
-    rb_iterate(each_pair, other, update_i, obj);
+    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
     return obj;
 }
 
@@ -787,59 +732,22 @@ fgdbm_update(obj, other)
  * _other_ must have an each_pair method.
  */
 static VALUE
-fgdbm_replace(obj, other)
-    VALUE obj, other;
+fgdbm_replace(VALUE obj, VALUE other)
 {
     fgdbm_clear(obj);
-    rb_iterate(each_pair, other, update_i, obj);
+    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
     return obj;
 }
 
 /*
  * call-seq:
- *      gdbm[key]= value -> value
- *      gdbm.store(key, value) -> value
- *
- * Associates the value _value_ with the specified _key_.
- */
-static VALUE
-fgdbm_store(obj, keystr, valstr)
-    VALUE obj, keystr, valstr;
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-
-    rb_gdbm_modify(obj);
-    StringValue(keystr);
-    StringValue(valstr);
-
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
-
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
-
-    GetDBM2(obj, dbmp, dbm);
-    dbmp->di_size = -1;
-    if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
-        if (errno == EPERM) rb_sys_fail(0);
-        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
-    }
-
-    return valstr;
-}
-
-/*
- * call-seq:
  *      gdbm.length -> fixnum
  *      gdbm.size -> fixnum
  *
  * Returns the number of key-value pairs in this database.
  */
 static VALUE
-fgdbm_length(obj)
-    VALUE obj;
+fgdbm_length(VALUE obj)
 {
     datum key, nextkey;
     struct dbmdata *dbmp;
@@ -852,7 +760,7 @@ fgdbm_length(obj)
     for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
         nextkey = gdbm_nextkey(dbm, key);
         free(key.dptr);
-	i++;
+        i++;
     }
     dbmp->di_size = i;
 
@@ -866,8 +774,7 @@ fgdbm_length(obj)
  * Returns true if the database is empty.
  */
 static VALUE
-fgdbm_empty_p(obj)
-    VALUE obj;
+fgdbm_empty_p(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -875,13 +782,13 @@ fgdbm_empty_p(obj)
 
     GetDBM(obj, dbmp);
     if (dbmp->di_size < 0) {
-	dbm = dbmp->di_dbm;
+        dbm = dbmp->di_dbm;
 
-	key = gdbm_firstkey(dbm);
+        key = gdbm_firstkey(dbm);
         if (key.dptr) {
             free(key.dptr);
             return Qfalse;
-	}
+        }
         return Qtrue;
     }
 
@@ -897,19 +804,20 @@ fgdbm_empty_p(obj)
  * _value_ as a parameter.
  */
 static VALUE
-fgdbm_each_value(obj)
-    VALUE obj;
+fgdbm_each_value(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
         rb_yield(rb_gdbm_fetch2(dbm, keystr));
-	GetDBM2(obj, dbmp, dbm);
+        GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -922,19 +830,20 @@ fgdbm_each_value(obj)
  * _key_ as a parameter.
  */
 static VALUE
-fgdbm_each_key(obj)
-    VALUE obj;
+fgdbm_each_key(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
         rb_yield(keystr);
-	GetDBM2(obj, dbmp, dbm);
+        GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -947,13 +856,14 @@ fgdbm_each_key(obj)
  * correspoding _value_ as a parameter.
  */
 static VALUE
-fgdbm_each_pair(obj)
-    VALUE obj;
+fgdbm_each_pair(VALUE obj)
 {
     GDBM_FILE dbm;
     struct dbmdata *dbmp;
     VALUE keystr;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -972,8 +882,7 @@ fgdbm_each_pair(obj)
  * Returns an array of all keys of this database.
  */
 static VALUE
-fgdbm_keys(obj)
-    VALUE obj;
+fgdbm_keys(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -997,8 +906,7 @@ fgdbm_keys(obj)
  * Returns an array of all values of this database.
  */
 static VALUE
-fgdbm_values(obj)
-    VALUE obj;
+fgdbm_values(VALUE obj)
 {
     datum key, nextkey;
     struct dbmdata *dbmp;
@@ -1026,16 +934,15 @@ fgdbm_values(obj)
  * Returns false otherwise.
  */
 static VALUE
-fgdbm_has_key(obj, keystr)
-    VALUE obj, keystr;
+fgdbm_has_key(VALUE obj, VALUE keystr)
 {
     datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
     StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
     if (gdbm_exists(dbm, key))
@@ -1052,8 +959,7 @@ fgdbm_has_key(obj, keystr)
  * Returns false otherwise.
  */
 static VALUE
-fgdbm_has_value(obj, valstr)
-    VALUE obj, valstr;
+fgdbm_has_value(VALUE obj, VALUE valstr)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1064,13 +970,13 @@ fgdbm_has_value(obj, valstr)
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
-	valstr2 = rb_gdbm_fetch2(dbm, keystr);
+        valstr2 = rb_gdbm_fetch2(dbm, keystr);
 
         if (!NIL_P(valstr2) &&
-            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
-            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
-                   RSTRING(valstr)->len) == 0) {
-	    return Qtrue;
+            RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
+            memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
+                   RSTRING_LEN(valstr)) == 0) {
+            return Qtrue;
         }
     }
     return Qfalse;
@@ -1083,8 +989,7 @@ fgdbm_has_value(obj, valstr)
  * Returns an array of all key-value pairs contained in the database.
  */
 static VALUE
-fgdbm_to_a(obj)
-    VALUE obj;
+fgdbm_to_a(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1110,8 +1015,7 @@ fgdbm_to_a(obj)
  * deletions in the database.
  */
 static VALUE
-fgdbm_reorganize(obj)
-    VALUE obj;
+fgdbm_reorganize(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1133,8 +1037,7 @@ fgdbm_reorganize(obj)
  * to the disk have been finished.
  */
 static VALUE
-fgdbm_sync(obj)
-    VALUE obj;
+fgdbm_sync(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1152,8 +1055,7 @@ fgdbm_sync(obj)
  * Sets the size of the internal bucket cache to _size_.
  */
 static VALUE
-fgdbm_set_cachesize(obj, val)
-    VALUE obj, val;
+fgdbm_set_cachesize(VALUE obj, VALUE val)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1178,8 +1080,7 @@ fgdbm_set_cachesize(obj, val)
  * default. See also: #syncmode=
  */
 static VALUE
-fgdbm_set_fastmode(obj, val)
-    VALUE obj, val;
+fgdbm_set_fastmode(VALUE obj, VALUE val)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1210,8 +1111,7 @@ fgdbm_set_fastmode(obj, val)
  * by default. See also: #fastmode=
  */
 static VALUE
-fgdbm_set_syncmode(obj, val)
-    VALUE obj, val;
+fgdbm_set_syncmode(VALUE obj, VALUE val)
 {
 #if !defined(GDBM_SYNCMODE)
     fgdbm_set_fastmode(obj, RTEST(val) ? Qfalse : Qtrue);
@@ -1240,8 +1140,7 @@ fgdbm_set_syncmode(obj, val)
  * Returns a hash of all key-value pairs contained in the database.
  */
 static VALUE
-fgdbm_to_hash(obj)
-    VALUE obj;
+fgdbm_to_hash(VALUE obj)
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1266,14 +1165,13 @@ fgdbm_to_hash(obj)
  * which _block_ evaluates to true are removed. See also: #delete_if
  */
 static VALUE
-fgdbm_reject(obj)
-    VALUE obj;
+fgdbm_reject(VALUE obj)
 {
     return rb_hash_delete_if(fgdbm_to_hash(obj));
 }
 
 void
-Init_gdbm()
+Init_gdbm(void)
 {
     rb_cGDBM = rb_define_class("GDBM", rb_cObject);
     rb_eGDBMError = rb_define_class("GDBMError", rb_eStandardError);
@@ -1291,9 +1189,8 @@ Init_gdbm()
     rb_define_method(rb_cGDBM, "[]=", fgdbm_store, 2);
     rb_define_method(rb_cGDBM, "store", fgdbm_store, 2);
     rb_define_method(rb_cGDBM, "index",  fgdbm_index, 1);
-    rb_define_method(rb_cGDBM, "indexes",  fgdbm_indexes, -1);
-    rb_define_method(rb_cGDBM, "indices",  fgdbm_indexes, -1);
-    rb_define_method(rb_cGDBM, "select",  fgdbm_select, -1);
+    rb_define_method(rb_cGDBM, "key",  fgdbm_key, 1);
+    rb_define_method(rb_cGDBM, "select",  fgdbm_select, 0);
     rb_define_method(rb_cGDBM, "values_at",  fgdbm_values_at, -1);
     rb_define_method(rb_cGDBM, "length", fgdbm_length, 0);
     rb_define_method(rb_cGDBM, "size", fgdbm_length, 0);
diff --git a/ext/iconv/.cvsignore b/ext/iconv/.cvsignore
index 394787fced..66c8f5297a 100644
--- a/ext/iconv/.cvsignore
+++ b/ext/iconv/.cvsignore
@@ -3,3 +3,4 @@ mkmf.log
 *.def
 iconv.rb
 config.charset
+extconf.h
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index aed4644290..cd567a8e2e 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -3,11 +3,11 @@
 require 'rbconfig'
 require 'optparse'
 
-# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
-# Fri, 30 May 2003 00:09:00 GMT'
+# http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset
+# Tue, 25 Dec 2007 00:00:00 GMT
 
-OS = Config::CONFIG["target_os"]
-SHELL = Config::CONFIG['SHELL']
+OS = RbConfig::CONFIG["target_os"]
+SHELL = RbConfig::CONFIG['SHELL']
 
 class Hash::Ordered < Hash
   def [](key)
@@ -95,7 +95,8 @@ end
 
 target = OS
 opt = nil
-ARGV.options do |opt|
+ARGV.options do |opt2|
+  opt = opt2
   opt.banner << " config.status map.rb"
   opt.on("--target OS") {|t| target = t}
   opt.parse! and (1..2) === ARGV.size
diff --git a/ext/iconv/depend b/ext/iconv/depend
index 688ddd97b7..ac555596ce 100644
--- a/ext/iconv/depend
+++ b/ext/iconv/depend
@@ -1,2 +1,2 @@
 iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/intern.h
+  $(hdrdir)/st.h $(hdrdir)/intern.h $(hdrdir)/encoding.h
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index a9d0cfb5e6..c4a57c80d6 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -7,6 +7,7 @@ conf = with_config("config-charset", enable_config("config-charset", conf))
 
 if have_func("iconv", "iconv.h") or
     have_library("iconv", "iconv", "iconv.h")
+  check_signedness("size_t")
   if checking_for("const of iconv() 2nd argument") do
       create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---")
       src = xpopen(cpp_command("")) {|f|f.read}
@@ -23,6 +24,8 @@ if have_func("iconv", "iconv.h") or
     end
     $defs.push('-DICONV_INPTR_CONST')
   end
+  have_func("iconvlist", "iconv.h")
+  have_func("__iconv_free_list", "iconv.h")
   if conf
     prefix = '$(srcdir)'
     prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 4f5d49e5ed..ff30c4e13a 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -4,7 +4,6 @@
   iconv.c -
 
   $Author$
-  $Date$
   created at: Wed Dec  1 20:28:09 JST 1999
 
   All the files in this distribution are covered under the Ruby's
@@ -14,12 +13,12 @@
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include <errno.h>
 #include <iconv.h>
 #include <assert.h>
-#include "st.h"
-#include "intern.h"
+#include "ruby/st.h"
+#include "ruby/encoding.h"
 
 /*
  * Document-class: Iconv
@@ -27,23 +26,27 @@
  * == Summary
  *
  * Ruby extension for charset conversion.
- * 
+ *
  * == Abstract
  *
  * Iconv is a wrapper class for the UNIX 95 <tt>iconv()</tt> function family,
  * which translates string between various encoding systems.
- * 
+ *
  * See Open Group's on-line documents for more details.
  * * <tt>iconv.h</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html
  * * <tt>iconv_open()</tt>:  http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_open.html
  * * <tt>iconv()</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html
  * * <tt>iconv_close()</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_close.html
- * 
+ *
  * Which coding systems are available is platform-dependent.
- * 
+ *
  * == Examples
  *
- * 1. Instantiate a new Iconv and use method Iconv#iconv.
+ * 1. Simple conversion between two charsets.
+ *
+ *      converted_text = Iconv.conv('iso-8859-15', 'utf-8', text)
+ *
+ * 2. Instantiate a new Iconv and use method Iconv#iconv.
  *
  *      cd = Iconv.new(to, from)
  *      begin
@@ -53,20 +56,22 @@
  *        cd.close
  *      end
  *
- * 2. Invoke Iconv.open with a block.
+ * 3. Invoke Iconv.open with a block.
  *
  *      Iconv.open(to, from) do |cd|
  *        input.each { |s| output << cd.iconv(s) }
  *        output << cd.iconv(nil)
  *      end
  *
- * 3. Shorthand for (2).
+ * 4. Shorthand for (3).
  *
  *      Iconv.iconv(to, from, *input.to_a)
  *
- * 4. Simple conversion between two charsets.
+ * == Attentions
  *
- *      converted_text = Iconv.new('iso-8859-15', 'utf-8').iconv(text)
+ * Even if some extentions of implementation dependent are useful,
+ * DON'T USE those extentions in libraries and scripts to widely distribute.
+ * If you want to use those feature, use String#encode.
  */
 
 /* Invalid value for iconv_t is -1 but 0 for VALUE, I hope VALUE is
@@ -80,9 +85,18 @@ struct iconv_env_t
     int argc;
     VALUE *argv;
     VALUE ret;
+    int toidx;
     VALUE (*append)_((VALUE, VALUE));
 };
 
+struct rb_iconv_opt_t
+{
+    VALUE transliterate;
+    VALUE discard_ilseq;
+};
+
+static ID id_transliterate, id_discard_ilseq;
+
 static VALUE rb_eIconvInvalidEncoding;
 static VALUE rb_eIconvFailure;
 static VALUE rb_eIconvIllegalSeq;
@@ -92,24 +106,27 @@ static VALUE rb_eIconvBrokenLibrary;
 
 static ID rb_success, rb_failed;
 static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
+static VALUE iconv_fail_retry _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
 static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success, VALUE failed));
 static VALUE iconv_failure_success _((VALUE self));
 static VALUE iconv_failure_failed _((VALUE self));
 
-static iconv_t iconv_create _((VALUE to, VALUE from));
+static iconv_t iconv_create _((VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx));
 static void iconv_dfree _((void *cd));
 static VALUE iconv_free _((VALUE cd));
 static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
-static VALUE rb_str_derive _((VALUE str, const char* ptr, int len));
-static VALUE iconv_convert _((iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env));
+static VALUE rb_str_derive _((VALUE str, const char* ptr, long len));
+static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, int toidx,
+			      struct iconv_env_t* env));
 static VALUE iconv_s_allocate _((VALUE klass));
-static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from));
-static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from));
+static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self));
+static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self));
 static VALUE iconv_s_convert _((struct iconv_env_t* env));
 static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
 static VALUE iconv_init_state _((VALUE cd));
 static VALUE iconv_finish _((VALUE self));
 static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
+static VALUE iconv_conv _((int argc, VALUE *argv, VALUE self));
 
 static VALUE charset_map;
 
@@ -119,82 +136,157 @@ static VALUE charset_map;
  *
  * Returns the map from canonical name to system dependent name.
  */
-static VALUE charset_map_get _((void))
+static VALUE
+charset_map_get(void)
 {
     return charset_map;
 }
 
+static VALUE
+strip_glibc_option(VALUE *code)
+{
+    VALUE val = StringValue(*code);
+    const char *ptr = RSTRING_PTR(val), *pend = RSTRING_END(val);
+    const char *slash = memchr(ptr, '/', pend - ptr);
+
+    if (slash && slash < pend - 1 && slash[1] ==  '/') {
+	VALUE opt = rb_str_subseq(val, slash - ptr, pend - slash);
+	val = rb_str_subseq(val, 0, slash - ptr);
+	*code = val;
+	return opt;
+    }
+    return 0;
+}
+
 static char *
-map_charset
-#ifdef HAVE_PROTOTYPES
-    (VALUE *code)
-#else /* HAVE_PROTOTYPES */
-    (code)
-    VALUE *code;
-#endif /* HAVE_PROTOTYPES */
+map_charset(VALUE *code)
 {
-    VALUE val = *code;
+    VALUE val = StringValue(*code);
 
-    if (RHASH(charset_map)->tbl && RHASH(charset_map)->tbl->num_entries) {
+    if (RHASH_SIZE(charset_map)) {
 	VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
 	StringValuePtr(key);
-	if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
+	if (st_lookup(RHASH_TBL(charset_map), key, &val)) {
 	    *code = val;
 	}
     }
     return StringValuePtr(*code);
 }
 
+NORETURN(static void rb_iconv_sys_fail(const char *s));
+static void
+rb_iconv_sys_fail(const char *s)
+{
+    if (errno == 0) {
+	rb_exc_raise(iconv_fail(rb_eIconvBrokenLibrary, Qnil, Qnil, NULL, s));
+    }
+    rb_sys_fail(s);
+}
+
+#define rb_sys_fail(s) rb_iconv_sys_fail(s)
+
 static iconv_t
-iconv_create
-#ifdef HAVE_PROTOTYPES
-    (VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
-    (to, from)
-    VALUE to;
-    VALUE from;
-#endif /* HAVE_PROTOTYPES */
+iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
 {
+    VALUE toopt = strip_glibc_option(&to);
+    VALUE fromopt = strip_glibc_option(&from);
+    VALUE toenc = 0, fromenc = 0;
     const char* tocode = map_charset(&to);
     const char* fromcode = map_charset(&from);
+    iconv_t cd;
+    int retry = 0;
 
-    iconv_t cd = iconv_open(tocode, fromcode);
+    *idx = rb_enc_find_index(tocode);
 
-    if (cd == (iconv_t)-1) {
+    if (toopt) {
+	toenc = rb_str_plus(to, toopt);
+	tocode = RSTRING_PTR(toenc);
+    }
+    if (fromopt) {
+	fromenc = rb_str_plus(from, fromopt);
+	fromcode = RSTRING_PTR(fromenc);
+    }
+    while ((cd = iconv_open(tocode, fromcode)) == (iconv_t)-1) {
+	int inval = 0;
 	switch (errno) {
 	  case EMFILE:
 	  case ENFILE:
 	  case ENOMEM:
-	    rb_gc();
-	    cd = iconv_open(tocode, fromcode);
+	    if (!retry++) {
+		rb_gc();
+		continue;
+	    }
+	    break;
+	  case EINVAL:
+	    retry = 0;
+	    inval = 1;
+	    if (toenc) {
+		tocode = RSTRING_PTR(to);
+		rb_str_resize(toenc, 0);
+		toenc = 0;
+		continue;
+	    }
+	    if (fromenc) {
+		fromcode = RSTRING_PTR(from);
+		rb_str_resize(fromenc, 0);
+		fromenc = 0;
+		continue;
+	    }
+	    break;
 	}
-	if (cd == (iconv_t)-1) {
-	    int inval = errno == EINVAL;
-	    char *s = inval ? "invalid encoding " : "iconv";
-	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
-					    RSTRING(from)->len + 8);
-
-	    sprintf(RSTRING(msg)->ptr, "%s(\"%s\", \"%s\")",
-		    s, RSTRING(to)->ptr, RSTRING(from)->ptr);
-	    s = RSTRING(msg)->ptr;
-	    RSTRING(msg)->len = strlen(s);
+	{
+	    const char *s = inval ? "invalid encoding " : "iconv";
+	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING_LEN(to) +
+					    RSTRING_LEN(from) + 8);
+
+	    sprintf(RSTRING_PTR(msg), "%s(\"%s\", \"%s\")",
+		    s, RSTRING_PTR(to), RSTRING_PTR(from));
+	    s = RSTRING_PTR(msg);
+	    rb_str_set_len(msg, strlen(s));
 	    if (!inval) rb_sys_fail(s);
-	    iconv_fail(rb_eIconvInvalidEncoding,
-		       Qnil, rb_ary_new3(2, to, from), NULL, s);
+	    rb_exc_raise(iconv_fail(rb_eIconvInvalidEncoding, Qnil,
+				    rb_ary_new3(2, to, from), NULL, s));
+	}
+    }
+
+    if (toopt || fromopt) {
+	if (toopt && fromopt && RTEST(rb_str_equal(toopt, fromopt))) {
+	    fromopt = 0;
+	}
+	if (toopt && fromopt) {
+	    rb_warning("encoding option isn't portable: %s, %s",
+		       RSTRING_PTR(toopt) + 2, RSTRING_PTR(fromopt) + 2);
+	}
+	else {
+	    rb_warning("encoding option isn't portable: %s",
+		       (toopt ? RSTRING_PTR(toopt) : RSTRING_PTR(fromopt)) + 2);
+	}
+    }
+
+    if (opt) {
+#ifdef ICONV_SET_TRANSLITERATE
+	if (opt->transliterate != Qundef) {
+	    int flag = RTEST(opt->transliterate);
+	    rb_warning("encoding option isn't portable: transliterate");
+	    if (iconvctl(cd, ICONV_SET_TRANSLITERATE, (void *)&flag))
+		rb_sys_fail("ICONV_SET_TRANSLITERATE");
 	}
+#endif
+#ifdef ICONV_SET_DISCARD_ILSEQ
+	if (opt->discard_ilseq != Qundef) {
+	    int flag = RTEST(opt->discard_ilseq);
+	    rb_warning("encoding option isn't portable: discard_ilseq");
+	    if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&flag))
+		rb_sys_fail("ICONV_SET_DISCARD_ILSEQ");
+	}
+#endif
     }
 
     return cd;
 }
 
 static void
-iconv_dfree
-#ifdef HAVE_PROTOTYPES
-    (void *cd)
-#else /* HAVE_PROTOTYPES */
-    (cd)
-    void *cd;
-#endif /* HAVE_PROTOTYPES */
+iconv_dfree(void *cd)
 {
     iconv_close(VALUE2ICONV(cd));
 }
@@ -202,13 +294,7 @@ iconv_dfree
 #define ICONV_FREE iconv_dfree
 
 static VALUE
-iconv_free
-#ifdef HAVE_PROTOTYPES
-    (VALUE cd)
-#else /* HAVE_PROTOTYPES */
-    (cd)
-    VALUE cd;
-#endif /* HAVE_PROTOTYPES */
+iconv_free(VALUE cd)
 {
     if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
 	rb_sys_fail("iconv_close");
@@ -216,13 +302,7 @@ iconv_free
 }
 
 static VALUE
-check_iconv
-#ifdef HAVE_PROTOTYPES
-    (VALUE obj)
-#else /* HAVE_PROTOTYPES */
-    (obj)
-    VALUE obj;
-#endif /* HAVE_PROTOTYPES */
+check_iconv(VALUE obj)
 {
     Check_Type(obj, T_DATA);
     if (RDATA(obj)->dfree != ICONV_FREE) {
@@ -232,17 +312,7 @@ check_iconv
 }
 
 static VALUE
-iconv_try
-#ifdef HAVE_PROTOTYPES
-    (iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
-#else /* HAVE_PROTOTYPES */
-    (cd, inptr, inlen, outptr, outlen)
-    iconv_t cd;
-    const char **inptr;
-    size_t *inlen;
-    char **outptr;
-    size_t *outlen;
-#endif /* HAVE_PROTOTYPES */
+iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
 {
 #ifdef ICONV_INPTR_CONST
 #define ICONV_INPTR_CAST
@@ -282,13 +352,8 @@ iconv_try
 
 #define FAILED_MAXLEN 16
 
-static VALUE iconv_failure_initialize
-#ifdef HAVE_PROTOTYPES
-    (VALUE error, VALUE mesg, VALUE success, VALUE failed)
-#else /* HAVE_PROTOTYPES */
-    (error, mesg, success, failed)
-    VALUE error, mesg, success, failed;
-#endif /* HAVE_PROTOTYPES */
+static VALUE
+iconv_failure_initialize(VALUE error, VALUE mesg, VALUE success, VALUE failed)
 {
     rb_call_super(1, &mesg);
     rb_ivar_set(error, rb_success, success);
@@ -297,22 +362,14 @@ static VALUE iconv_failure_initialize
 }
 
 static VALUE
-iconv_fail
-#ifdef HAVE_PROTOTYPES
-    (VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
-#else /* HAVE_PROTOTYPES */
-    (error, success, failed, env, mesg)
-    VALUE error, success, failed;
-    struct iconv_env_t *env;
-    const char *mesg;
-#endif /* HAVE_PROTOTYPES */
+iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
 {
     VALUE args[3];
 
     if (mesg && *mesg) {
 	args[0] = rb_str_new2(mesg);
     }
-    else if (TYPE(failed) != T_STRING || RSTRING(failed)->len < FAILED_MAXLEN) {
+    else if (TYPE(failed) != T_STRING || RSTRING_LEN(failed) < FAILED_MAXLEN) {
 	args[0] = rb_inspect(failed);
     }
     else {
@@ -328,31 +385,27 @@ iconv_fail
 	    args[2] = rb_ary_new4(env->argc, env->argv);
 	}
     }
-    error = rb_class_new_instance(3, args, error);
+    return rb_class_new_instance(3, args, error);
+}
+
+static VALUE
+iconv_fail_retry(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+{
+    error = iconv_fail(error, success, failed, env, mesg);
     if (!rb_block_given_p()) rb_exc_raise(error);
-    ruby_errinfo = error;
+    rb_set_errinfo(error);
     return rb_yield(failed);
 }
 
 static VALUE
-rb_str_derive
-#ifdef HAVE_PROTOTYPES
-    (VALUE str, const char* ptr, int len)
-#else /* HAVE_PROTOTYPES */
-    (str, ptr, len)
-    VALUE str;
-    const char *ptr;
-    int len;
-#endif /* HAVE_PROTOTYPES */
+rb_str_derive(VALUE str, const char* ptr, long len)
 {
     VALUE ret;
 
     if (NIL_P(str))
 	return rb_str_new(ptr, len);
-    if (RSTRING(str)->ptr == ptr && RSTRING(str)->len == len)
-	return str;
-    if (RSTRING(str)->ptr + RSTRING(str)->len == ptr + len)
-	ret = rb_str_substr(str, ptr - RSTRING(str)->ptr, len);
+    if (RSTRING_PTR(str) + RSTRING_LEN(str) == ptr + len)
+	ret = rb_str_subseq(str, ptr - RSTRING_PTR(str), len);
     else
 	ret = rb_str_new(ptr, len);
     OBJ_INFECT(ret, str);
@@ -360,17 +413,7 @@ rb_str_derive
 }
 
 static VALUE
-iconv_convert
-#ifdef HAVE_PROTOTYPES
-    (iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env)
-#else /* HAVE_PROTOTYPES */
-    (cd, str, start, length, env)
-    iconv_t cd;
-    VALUE str;
-    int start;
-    int length;
-    struct iconv_env_t *env;
-#endif /* HAVE_PROTOTYPES */
+iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct iconv_env_t* env)
 {
     VALUE ret = Qfalse;
     VALUE error = Qfalse;
@@ -394,9 +437,9 @@ iconv_convert
 	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
 	if (RTEST(error)) {
 	    unsigned int i;
-	    rescue = iconv_fail(error, Qnil, Qnil, env, 0);
+	    rescue = iconv_fail_retry(error, Qnil, Qnil, env, 0);
 	    if (TYPE(rescue) == T_ARRAY) {
-		str = RARRAY(rescue)->len > 0 ? RARRAY(rescue)->ptr[0] : Qnil;
+		str = RARRAY_LEN(rescue) > 0 ? RARRAY_PTR(rescue)[0] : Qnil;
 	    }
 	    if (FIXNUM_P(str) && (i = FIX2INT(str)) <= 0xff) {
 		char c = i;
@@ -411,23 +454,15 @@ iconv_convert
 	length = 0;
     }
     else {
-	int slen;
+	long slen;
 
 	StringValue(str);
-	slen = RSTRING(str)->len;
-	inptr = RSTRING(str)->ptr;
-
-	if (start < 0 ? (start += slen) < 0 : start >= slen)
-	    length = 0;
-	else if (length < 0 && (length += slen + 1) < 0)
-	    length = 0;
-	else if ((length -= start) < 0)
-	    length = 0;
-	else {
-	    inptr += start;
-	    if (length > slen)
-		length = slen;
-	}
+	slen = RSTRING_LEN(str);
+	inptr = RSTRING_PTR(str);
+
+	inptr += start;
+	if (length < 0 || length > start + slen)
+	    length = slen - start;
     }
     instart = inptr;
     inlen = length;
@@ -441,15 +476,20 @@ iconv_convert
 	errmsg[0] = 0;
 	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
 
-	if (0 <= outlen && outlen <= sizeof(buffer)) {
+	if (
+#if SIGNEDNESS_OF_SIZE_T < 0
+	    0 <= outlen &&
+#endif
+	    outlen <= sizeof(buffer)) {
 	    outlen = sizeof(buffer) - outlen;
 	    if (NIL_P(error) ||	/* something converted */
-		outlen > inptr - tmpstart || /* input can't contain output */
-		(outlen < inptr - tmpstart && inlen > 0) || /* something skipped */
+		outlen > (size_t)(inptr - tmpstart) || /* input can't contain output */
+		(outlen < (size_t)(inptr - tmpstart) && inlen > 0) || /* something skipped */
 		memcmp(buffer, tmpstart, outlen)) /* something differs */
 	    {
 		if (NIL_P(str)) {
 		    ret = rb_str_new(buffer, outlen);
+		    if (toidx >= 0) rb_enc_associate_index(ret, toidx);
 		}
 		else {
 		    if (ret) {
@@ -457,6 +497,7 @@ iconv_convert
 		    }
 		    else {
 			ret = rb_str_new(instart, tmpstart - instart);
+			if (toidx >= 0) rb_enc_associate_index(ret, toidx);
 			OBJ_INFECT(ret, str);
 		    }
 		    ret = rb_str_buf_cat(ret, buffer, outlen);
@@ -476,19 +517,22 @@ iconv_convert
 	if (RTEST(error)) {
 	    long len = 0;
 
-	    if (!ret)
+	    if (!ret) {
 		ret = rb_str_derive(str, instart, inptr - instart);
-	    else if (inptr > instart)
+		if (toidx >= 0) rb_enc_associate_index(ret, toidx);
+	    }
+	    else if (inptr > instart) {
 		rb_str_cat(ret, instart, inptr - instart);
+	    }
 	    str = rb_str_derive(str, inptr, inlen);
-	    rescue = iconv_fail(error, ret, str, env, errmsg);
+	    rescue = iconv_fail_retry(error, ret, str, env, errmsg);
 	    if (TYPE(rescue) == T_ARRAY) {
-		if ((len = RARRAY(rescue)->len) > 0)
-		    rb_str_concat(ret, RARRAY(rescue)->ptr[0]);
-		if (len > 1 && !NIL_P(str = RARRAY(rescue)->ptr[1])) {
+		if ((len = RARRAY_LEN(rescue)) > 0)
+		    rb_str_concat(ret, RARRAY_PTR(rescue)[0]);
+		if (len > 1 && !NIL_P(str = RARRAY_PTR(rescue)[1])) {
 		    StringValue(str);
-		    inlen = length = RSTRING(str)->len;
-		    instart = inptr = RSTRING(str)->ptr;
+		    inlen = length = RSTRING_LEN(str);
+		    instart = inptr = RSTRING_PTR(str);
 		    continue;
 		}
 	    }
@@ -499,36 +543,103 @@ iconv_convert
 	}
     } while (inlen > 0);
 
-    if (!ret)
+    if (!ret) {
 	ret = rb_str_derive(str, instart, inptr - instart);
-    else if (inptr > instart)
+	if (toidx >= 0) rb_enc_associate_index(ret, toidx);
+    }
+    else if (inptr > instart) {
 	rb_str_cat(ret, instart, inptr - instart);
+    }
     return ret;
 }
 
 static VALUE
-iconv_s_allocate
-#ifdef HAVE_PROTOTYPES
-    (VALUE klass)
-#else /* HAVE_PROTOTYPES */
-    (klass)
-    VALUE klass;
-#endif /* HAVE_PROTOTYPES */
+iconv_s_allocate(VALUE klass)
 {
     return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
 }
 
+static VALUE
+get_iconv_opt_i(VALUE i, VALUE arg)
+{
+    struct rb_iconv_opt_t *opt = (struct rb_iconv_opt_t *)arg;
+    VALUE name, val;
+
+    (void)opt;
+    i = rb_Array(i);
+    name = rb_ary_entry(i, 0);
+    val = rb_ary_entry(i, 1);
+    do {
+	if (SYMBOL_P(name)) {
+	    ID id = SYM2ID(name);
+	    if (id == id_transliterate) {
+#ifdef ICONV_SET_TRANSLITERATE
+		opt->transliterate = val;
+#else
+		rb_notimplement();
+#endif
+		break;
+	    }
+	    if (id == id_discard_ilseq) {
+#ifdef ICONV_SET_DISCARD_ILSEQ
+		opt->discard_ilseq = val;
+#else
+		rb_notimplement();
+#endif
+		break;
+	    }
+	}
+	else {
+	    const char *s = StringValueCStr(name);
+	    if (strcmp(s, "transliterate") == 0) {
+#ifdef ICONV_SET_TRANSLITERATE
+		opt->transliterate = val;
+#else
+		rb_notimplement();
+#endif
+		break;
+	    }
+	    if (strcmp(s, "discard_ilseq") == 0) {
+#ifdef ICONV_SET_DISCARD_ILSEQ
+		opt->discard_ilseq = val;
+#else
+		rb_notimplement();
+#endif
+		break;
+	    }
+	}
+	name = rb_inspect(name);
+	rb_raise(rb_eArgError, "unknown option - %s", StringValueCStr(name));
+    } while (0);
+    return Qnil;
+}
+
+static void
+get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
+{
+    opt->transliterate = Qundef;
+    opt->discard_ilseq = Qundef;
+    if (!NIL_P(options)) {
+	rb_block_call(options, rb_intern("each"), 0, 0, get_iconv_opt_i, (VALUE)opt);
+    }
+}
+
+#define iconv_ctl(self, func, val) (\
+	iconvctl(VALUE2ICONV(check_iconv(self)), func, (void *)&(val)) ? \
+	rb_sys_fail(#func) : (void)0)
+
 /*
  * Document-method: new
- * call-seq: Iconv.new(to, from)
+ * call-seq: Iconv.new(to, from, [options])
  *
  * Creates new code converter from a coding-system designated with +from+
  * to another one designated with +to+.
- * 
+ *
  * === Parameters
  *
  * +to+::   encoding name for destination
  * +from+:: encoding name for source
+ * +options+:: options for converter
  *
  * === Exceptions
  *
@@ -537,19 +648,18 @@ iconv_s_allocate
  * SystemCallError:: if <tt>iconv_open(3)</tt> fails
  */
 static VALUE
-iconv_initialize
-#ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
-    (self, to, from)
-    VALUE self;
-    VALUE to;
-    VALUE from;
-#endif /* HAVE_PROTOTYPES */
+iconv_initialize(int argc, VALUE *argv, VALUE self)
 {
+    VALUE to, from, options;
+    struct rb_iconv_opt_t opt;
+    int idx;
+
+    rb_scan_args(argc, argv, "21", &to, &from, &options);
+    get_iconv_opt(&opt, options);
     iconv_free(check_iconv(self));
     DATA_PTR(self) = NULL;
-    DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from));
+    DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from, &opt, &idx));
+    if (idx >= 0) ENCODING_SET(self, idx);
     return self;
 }
 
@@ -562,19 +672,19 @@ iconv_initialize
  * returned from the block.
  */
 static VALUE
-iconv_s_open
-#ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
-    (self, to, from)
-    VALUE self;
-    VALUE to;
-    VALUE from;
-#endif /* HAVE_PROTOTYPES */
+iconv_s_open(int argc, VALUE *argv, VALUE self)
 {
-    VALUE cd = ICONV2VALUE(iconv_create(to, from));
+    VALUE to, from, options, cd;
+    struct rb_iconv_opt_t opt;
+    int idx;
+
+    rb_scan_args(argc, argv, "21", &to, &from, &options);
+    get_iconv_opt(&opt, options);
+    cd = ICONV2VALUE(iconv_create(to, from, &opt, &idx));
 
     self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
+    if (idx >= 0) ENCODING_SET(self, idx);
+
     if (rb_block_given_p()) {
 	return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
     }
@@ -584,24 +694,19 @@ iconv_s_open
 }
 
 static VALUE
-iconv_s_convert
-#ifdef HAVE_PROTOTYPES
-    (struct iconv_env_t* env)
-#else /* HAVE_PROTOTYPES */
-    (env)
-    struct iconv_env_t *env;
-#endif /* HAVE_PROTOTYPES */
+iconv_s_convert(struct iconv_env_t* env)
 {
     VALUE last = 0;
 
     for (; env->argc > 0; --env->argc, ++env->argv) {
-	VALUE s = iconv_convert(env->cd, last = *(env->argv), 0, -1, env);
+	VALUE s = iconv_convert(env->cd, last = *(env->argv),
+				0, -1, env->toidx, env);
 	env->append(env->ret, s);
     }
 
     if (!NIL_P(last)) {
-	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env);
-	if (RSTRING(s)->len)
+	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env->toidx, env);
+	if (RSTRING_LEN(s))
 	    env->append(env->ret, s);
     }
 
@@ -609,7 +714,7 @@ iconv_s_convert
 }
 
 /*
- * Document-method: iconv
+ * Document-method: Iconv::iconv
  * call-seq: Iconv.iconv(to, from, *strs)
  *
  * Shorthand for
@@ -627,15 +732,7 @@ iconv_s_convert
  * Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
  */
 static VALUE
-iconv_s_iconv
-#ifdef HAVE_PROTOTYPES
-    (int argc, VALUE *argv, VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
+iconv_s_iconv(int argc, VALUE *argv, VALUE self)
 {
     struct iconv_env_t arg;
 
@@ -646,7 +743,7 @@ iconv_s_iconv
     arg.argv = argv + 2;
     arg.append = rb_ary_push;
     arg.ret = rb_ary_new2(argc);
-    arg.cd = iconv_create(argv[0], argv[1]);
+    arg.cd = iconv_create(argv[0], argv[1], NULL, &arg.toidx);
     return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
 }
 
@@ -659,13 +756,7 @@ iconv_s_iconv
  * See Iconv.iconv.
  */
 static VALUE
-iconv_s_conv
-#ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from, VALUE str)
-#else /* HAVE_PROTOTYPES */
-    (self, to, from, str)
-    VALUE self, to, from, str;
-#endif /* HAVE_PROTOTYPES */
+iconv_s_conv(VALUE self, VALUE to, VALUE from, VALUE str)
 {
     struct iconv_env_t arg;
 
@@ -673,11 +764,95 @@ iconv_s_conv
     arg.argv = &str;
     arg.append = rb_str_append;
     arg.ret = rb_str_new(0, 0);
-    arg.cd = iconv_create(to, from);
+    arg.cd = iconv_create(to, from, NULL, &arg.toidx);
     return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
 }
 
 /*
+ * Document-method: list
+ * call-seq: Iconv.list {|*aliases| ... }
+ *
+ * Iterates each alias sets.
+ */
+
+#ifdef HAVE_ICONVLIST
+struct iconv_name_list
+{
+    unsigned int namescount;
+    const char *const *names;
+    VALUE array;
+};
+
+static VALUE
+list_iconv_i(VALUE ptr)
+{
+    struct iconv_name_list *p = (struct iconv_name_list *)ptr;
+    unsigned int i, namescount = p->namescount;
+    const char *const *names = p->names;
+    VALUE ary = rb_ary_new2(namescount);
+
+    for (i = 0; i < namescount; i++) {
+	rb_ary_push(ary, rb_str_new2(names[i]));
+    }
+    if (p->array) {
+	return rb_ary_push(p->array, ary);
+    }
+    return rb_yield(ary);
+}
+
+static int
+list_iconv(unsigned int namescount, const char *const *names, void *data)
+{
+    int *state = data;
+    struct iconv_name_list list;
+
+    list.namescount = namescount;
+    list.names = names;
+    list.array = ((VALUE *)data)[1];
+    rb_protect(list_iconv_i, (VALUE)&list, state);
+    return *state;
+}
+#endif
+
+#if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST)
+static VALUE
+iconv_s_list(void)
+{
+#ifdef HAVE_ICONVLIST
+    int state;
+    VALUE args[2];
+
+    args[1] = rb_block_given_p() ? 0 : rb_ary_new();
+    iconvlist(list_iconv, args);
+    state = *(int *)args;
+    if (state) rb_jump_tag(state);
+    if (args[1]) return args[1];
+#elif defined(HAVE___ICONV_FREE_LIST)
+    char **list;
+    size_t sz, i;
+    VALUE ary;
+
+    if (__iconv_get_list(&list, &sz)) return Qnil;
+
+    ary = rb_ary_new2(sz);
+    for (i = 0; i < sz; i++) {
+	rb_ary_push(ary, rb_str_new2(list[i]));
+    }
+    __iconv_free_list(list, sz);
+
+    if (!rb_block_given_p())
+	return ary;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	rb_yield(RARRAY_PTR(ary)[i]);
+    }
+#endif
+    return Qnil;
+}
+#else
+#define iconv_s_list rb_f_notimplement
+#endif
+
+/*
  * Document-method: close
  *
  * Finishes conversion.
@@ -689,36 +864,24 @@ iconv_s_conv
  * its initial shift state.
  */
 static VALUE
-iconv_init_state
-#ifdef HAVE_PROTOTYPES
-    (VALUE cd)
-#else /* HAVE_PROTOTYPES */
-    (cd)
-    VALUE cd;
-#endif /* HAVE_PROTOTYPES */
+iconv_init_state(VALUE self)
 {
-    return iconv_convert(VALUE2ICONV(cd), Qnil, 0, 0, NULL);
+    iconv_t cd = VALUE2ICONV((VALUE)DATA_PTR(self));
+    DATA_PTR(self) = NULL;
+    return iconv_convert(cd, Qnil, 0, 0, ENCODING_GET(self), NULL);
 }
 
 static VALUE
-iconv_finish
-#ifdef HAVE_PROTOTYPES
-    (VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
+iconv_finish(VALUE self)
 {
     VALUE cd = check_iconv(self);
 
     if (!cd) return Qnil;
-    DATA_PTR(self) = NULL;
-
-    return rb_ensure(iconv_init_state, cd, iconv_free, cd);
+    return rb_ensure(iconv_init_state, self, iconv_free, cd);
 }
 
 /*
- * Document-method: iconv
+ * Document-method: Iconv#iconv
  * call-seq: iconv(str, start=0, length=-1)
  *
  * Converts string and returns the result.
@@ -745,26 +908,186 @@ iconv_finish
  * See the Iconv documentation.
  */
 static VALUE
-iconv_iconv
-#ifdef HAVE_PROTOTYPES
-    (int argc, VALUE *argv, VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
+iconv_iconv(int argc, VALUE *argv, VALUE self)
 {
     VALUE str, n1, n2;
     VALUE cd = check_iconv(self);
+    long start = 0, length = 0, slen = 0;
 
-    n1 = n2 = Qnil;
     rb_scan_args(argc, argv, "12", &str, &n1, &n2);
+    if (!NIL_P(str)) {
+	VALUE n = rb_str_length(StringValue(str));
+	slen = NUM2LONG(n);
+    }
+    if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
+	if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
+	    length = NIL_P(n2) ? -1 : NUM2LONG(n2);
+	}
+    }
+    if (start > 0 || length > 0) {
+	rb_encoding *enc = rb_enc_get(str);
+	const char *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str);
+	const char *ps = s;
+	if (start > 0) {
+	    start = (ps = rb_enc_nth(s, e, start, enc)) - s;
+	}
+	if (length > 0) {
+	    length = rb_enc_nth(ps, e, length, enc) - ps;
+	}
+    }
+
+    return iconv_convert(VALUE2ICONV(cd), str, start, length, ENCODING_GET(self), NULL);
+}
+
+/*
+ * Document-method: conv
+ * call-seq: conv(str...)
+ *
+ * Equivalent to
+ *
+ *   iconv(nil, str..., nil).join
+ */
+static VALUE
+iconv_conv(int argc, VALUE *argv, VALUE self)
+{
+    iconv_t cd = VALUE2ICONV(check_iconv(self));
+    VALUE str, s;
+    int toidx = ENCODING_GET(self);
+
+    str = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
+    if (argc > 0) {
+	do {
+	    s = iconv_convert(cd, *argv++, 0, -1, toidx, NULL);
+	    if (RSTRING_LEN(s))
+		rb_str_buf_append(str, s);
+	} while (--argc);
+	s = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
+	if (RSTRING_LEN(s))
+	    rb_str_buf_append(str, s);
+    }
+
+    return str;
+}
+
+#ifdef ICONV_TRIVIALP
+/*
+ * Document-method: trivial?
+ * call-seq: trivial?
+ *
+ * Returns trivial flag.
+ */
+static VALUE
+iconv_trivialp(VALUE self)
+{
+    int trivial = 0;
+    iconv_ctl(self, ICONV_TRIVIALP, trivial);
+    if (trivial) return Qtrue;
+    return Qfalse;
+}
+#else
+#define iconv_trivialp rb_f_notimplement
+#endif
+
+#ifdef ICONV_GET_TRANSLITERATE
+/*
+ * Document-method: transliterate?
+ * call-seq: transliterate?
+ *
+ * Returns transliterate flag.
+ */
+static VALUE
+iconv_get_transliterate(VALUE self)
+{
+    int trans = 0;
+    iconv_ctl(self, ICONV_GET_TRANSLITERATE, trans);
+    if (trans) return Qtrue;
+    return Qfalse;
+}
+#else
+#define iconv_get_transliterate rb_f_notimplement
+#endif
+
+#ifdef ICONV_SET_TRANSLITERATE
+/*
+ * Document-method: transliterate=
+ * call-seq: cd.transliterate = flag
+ *
+ * Sets transliterate flag.
+ */
+static VALUE
+iconv_set_transliterate(VALUE self, VALUE transliterate)
+{
+    int trans = RTEST(transliterate);
+    iconv_ctl(self, ICONV_SET_TRANSLITERATE, trans);
+    return self;
+}
+#else
+#define iconv_set_transliterate rb_f_notimplement
+#endif
+
+#ifdef ICONV_GET_DISCARD_ILSEQ
+/*
+ * Document-method: discard_ilseq?
+ * call-seq: discard_ilseq?
+ *
+ * Returns discard_ilseq flag.
+ */
+static VALUE
+iconv_get_discard_ilseq(VALUE self)
+{
+    int dis = 0;
+    iconv_ctl(self, ICONV_GET_DISCARD_ILSEQ, dis);
+    if (dis) return Qtrue;
+    return Qfalse;
+}
+#else
+#define iconv_get_discard_ilseq rb_f_notimplement
+#endif
 
-    return iconv_convert(VALUE2ICONV(cd), str,
-			 NIL_P(n1) ? 0 : NUM2INT(n1),
-			 NIL_P(n2) ? -1 : NUM2INT(n2),
-			 NULL);
+#ifdef ICONV_SET_DISCARD_ILSEQ
+/*
+ * Document-method: discard_ilseq=
+ * call-seq: cd.discard_ilseq = flag
+ *
+ * Sets discard_ilseq flag.
+ */
+static VALUE
+iconv_set_discard_ilseq(VALUE self, VALUE discard_ilseq)
+{
+    int dis = RTEST(discard_ilseq);
+    iconv_ctl(self, ICONV_SET_DISCARD_ILSEQ, dis);
+    return self;
+}
+#else
+#define iconv_set_discard_ilseq rb_f_notimplement
+#endif
+
+/*
+ * Document-method: ctlmethods
+ * call-seq: Iconv.ctlmethods => array
+ *
+ * Returns available iconvctl() method list.
+ */
+static VALUE
+iconv_s_ctlmethods(VALUE klass)
+{
+    VALUE ary = rb_ary_new();
+#ifdef ICONV_TRIVIALP
+    rb_ary_push(ary, ID2SYM(rb_intern("trivial?")));
+#endif
+#ifdef ICONV_GET_TRANSLITERATE
+    rb_ary_push(ary, ID2SYM(rb_intern("transliterate?")));
+#endif
+#ifdef ICONV_SET_TRANSLITERATE
+    rb_ary_push(ary, ID2SYM(rb_intern("transliterate=")));
+#endif
+#ifdef ICONV_GET_DISCARD_ILSEQ
+    rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq?")));
+#endif
+#ifdef ICONV_SET_DISCARD_ILSEQ
+    rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq=")));
+#endif
+    return ary;
 }
 
 /*
@@ -783,13 +1106,7 @@ iconv_iconv
  *   failure and the last element is string on the way.
  */
 static VALUE
-iconv_failure_success
-#ifdef HAVE_PROTOTYPES
-(VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
+iconv_failure_success(VALUE self)
 {
     return rb_attr_get(self, rb_success);
 }
@@ -799,16 +1116,10 @@ iconv_failure_success
  * call-seq: failed
  *
  * Returns substring of the original string passed to Iconv that starts at the
- * character caused the exception. 
+ * character caused the exception.
  */
 static VALUE
-iconv_failure_failed
-#ifdef HAVE_PROTOTYPES
-(VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
+iconv_failure_failed(VALUE self)
 {
     return rb_attr_get(self, rb_failed);
 }
@@ -820,15 +1131,9 @@ iconv_failure_failed
  * Returns inspected string like as: #<_class_: _success_, _failed_>
  */
 static VALUE
-iconv_failure_inspect
-#ifdef HAVE_PROTOTYPES
-    (VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
+iconv_failure_inspect(VALUE self)
 {
-    char *cname = rb_class2name(CLASS_OF(self));
+    const char *cname = rb_class2name(CLASS_OF(self));
     VALUE success = rb_attr_get(self, rb_success);
     VALUE failed = rb_attr_get(self, rb_failed);
     VALUE str = rb_str_buf_cat2(rb_str_new2("#<"), cname);
@@ -841,13 +1146,13 @@ iconv_failure_inspect
 
 /*
  * Document-class: Iconv::InvalidEncoding
- * 
+ *
  * Requested coding-system is not available on this system.
  */
 
 /*
  * Document-class: Iconv::IllegalSequence
- * 
+ *
  * Input conversion stopped due to an input byte that does not belong to
  * the input codeset, or the output codeset does not contain the
  * character.
@@ -855,36 +1160,44 @@ iconv_failure_inspect
 
 /*
  * Document-class: Iconv::InvalidCharacter
- * 
+ *
  * Input conversion stopped due to an incomplete character or shift
  * sequence at the end of the input buffer.
  */
 
 /*
  * Document-class: Iconv::OutOfRange
- * 
+ *
  * Iconv library internal error.  Must not occur.
  */
 
 /*
  * Document-class: Iconv::BrokenLibrary
- * 
+ *
  * Detected a bug of underlying iconv(3) libray.
  * * returns an error without setting errno properly
  */
 
 void
-Init_iconv _((void))
+Init_iconv(void)
 {
     VALUE rb_cIconv = rb_define_class("Iconv", rb_cData);
 
     rb_define_alloc_func(rb_cIconv, iconv_s_allocate);
-    rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, 2);
+    rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, -1);
     rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);
     rb_define_singleton_method(rb_cIconv, "conv", iconv_s_conv, 3);
-    rb_define_method(rb_cIconv, "initialize", iconv_initialize, 2);
+    rb_define_singleton_method(rb_cIconv, "list", iconv_s_list, 0);
+    rb_define_singleton_method(rb_cIconv, "ctlmethods", iconv_s_ctlmethods, 0);
+    rb_define_method(rb_cIconv, "initialize", iconv_initialize, -1);
     rb_define_method(rb_cIconv, "close", iconv_finish, 0);
     rb_define_method(rb_cIconv, "iconv", iconv_iconv, -1);
+    rb_define_method(rb_cIconv, "conv", iconv_conv, -1);
+    rb_define_method(rb_cIconv, "trivial?", iconv_trivialp, 0);
+    rb_define_method(rb_cIconv, "transliterate?", iconv_get_transliterate, 0);
+    rb_define_method(rb_cIconv, "transliterate=", iconv_set_transliterate, 1);
+    rb_define_method(rb_cIconv, "discard_ilseq?", iconv_get_discard_ilseq, 0);
+    rb_define_method(rb_cIconv, "discard_ilseq=", iconv_set_discard_ilseq, 1);
 
     rb_eIconvFailure = rb_define_module_under(rb_cIconv, "Failure");
     rb_define_method(rb_eIconvFailure, "initialize", iconv_failure_initialize, 3);
@@ -905,6 +1218,8 @@ Init_iconv _((void))
 
     rb_success = rb_intern("success");
     rb_failed = rb_intern("failed");
+    id_transliterate = rb_intern("transliterate");
+    id_discard_ilseq = rb_intern("discard_ilseq");
 
     rb_gc_register_address(&charset_map);
     charset_map = rb_hash_new();
diff --git a/ext/iconv/mkwrapper.rb b/ext/iconv/mkwrapper.rb
new file mode 100644
index 0000000000..44d5fcf194
--- /dev/null
+++ b/ext/iconv/mkwrapper.rb
@@ -0,0 +1,53 @@
+#! /usr/bin/ruby
+require 'rbconfig'
+require 'optparse'
+
+# http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset
+# Tue, 25 Dec 2007 00:00:00 GMT
+
+HEADER = <<SRC
+require 'iconv.so'
+
+class Iconv
+  case RUBY_PLATFORM
+SRC
+
+def charset_alias(config_charset, mapfile = nil)
+  found = nil
+  src = [HEADER]
+  open(config_charset) do |input|
+    input.find {|line| /^case "\$os" in/ =~ line} or return
+    input.each do |line|
+      case line
+      when /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/
+        (s = "  when ") << $&.split('|').collect {|targ|
+          targ.strip!
+          tail = targ.chomp!("*") ? '' : '\z'
+          head = targ.slice!(/\A\*/) ? '' : '\A'
+          targ.gsub!(/\*/, '.*')
+          "/#{head}#{targ}#{tail}/"
+        }.join(", ")
+        src << s
+        found = {}
+      when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
+        sys, can = $1, $2
+        can.downcase!
+        unless found[can] or (/\Aen_(?!US\z)/ =~ sys && /\ACP437\z/i =~ can)
+          found[can] = true
+          src << "    charset_map['#{can}'] = '#{sys}'.freeze"
+        end
+      when /^\s*;;/
+        found = nil
+      end
+    end
+  end
+  src << "  end" << "end"
+  if mapfile
+    open(mapfile, "wb") {|f| f.puts(*src)}
+  else
+    puts(*src)
+  end
+end
+
+(1..2) === ARGV.size or abort "usage: #{$0} config_charset [mapfile]"
+charset_alias(*ARGV)
diff --git a/ext/io/nonblock/extconf.rb b/ext/io/nonblock/extconf.rb
new file mode 100644
index 0000000000..aecdc16cea
--- /dev/null
+++ b/ext/io/nonblock/extconf.rb
@@ -0,0 +1,8 @@
+require 'mkmf'
+target = "io/nonblock"
+
+hdr = %w"fcntl.h"
+if have_macro("O_NONBLOCK", hdr) and
+    (have_macro("F_GETFL", hdr) or have_macro("F_SETFL", hdr))
+  create_makefile(target)
+end
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
new file mode 100644
index 0000000000..d7e1ac8e01
--- /dev/null
+++ b/ext/io/nonblock/nonblock.c
@@ -0,0 +1,108 @@
+/**********************************************************************
+
+  io/wait.c -
+
+  $Author$
+  created at: Tue Jul 14 21:53:18 2009
+
+  All the files in this distribution are covered under the Ruby's
+  license (see the file COPYING).
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "ruby/io.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+
+#ifdef F_GETFL
+static int
+io_nonblock_mode(int fd)
+{
+    int f = fcntl(fd, F_GETFL);
+    if (f == -1) rb_sys_fail(0);
+    return f;
+}
+#else
+#define io_nonblock_mode(fd) ((void)(fd), 0)
+#endif
+
+#ifdef F_GETFL
+static VALUE
+rb_io_nonblock_p(VALUE io)
+{
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    if (io_nonblock_mode(fptr->fd) & O_NONBLOCK)
+	return Qtrue;
+    return Qfalse;
+}
+#else
+#define rb_io_nonblock_p rb_f_notimplement
+#endif
+
+#ifdef F_SETFL
+static void
+io_nonblock_set(int fd, int f, int nb)
+{
+    if (nb)
+	f |= O_NONBLOCK;
+    else
+	f &= ~O_NONBLOCK;
+    if (fcntl(fd, F_SETFL, f) == -1)
+	rb_sys_fail(0);
+}
+
+static VALUE
+rb_io_nonblock_set(VALUE io, VALUE nb)
+{
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    io_nonblock_set(fptr->fd, io_nonblock_mode(fptr->fd), RTEST(nb));
+    return io;
+}
+
+static VALUE
+io_nonblock_restore(VALUE arg)
+{
+    int *restore = (int *)arg;
+    if (fcntl(restore[0], F_SETFL, restore[1]) == -1)
+	rb_sys_fail(0);
+    return Qnil;
+}
+
+static VALUE
+rb_io_nonblock_block(int argc, VALUE *argv, VALUE io)
+{
+    int nb = 1;
+    rb_io_t *fptr;
+    int f, restore[2];
+
+    GetOpenFile(io, fptr);
+    if (argc > 0) {
+	VALUE v;
+	rb_scan_args(argc, argv, "01", &v);
+	nb = RTEST(v);
+    }
+    f = io_nonblock_mode(fptr->fd);
+    restore[0] = fptr->fd;
+    restore[1] = f;
+    io_nonblock_set(fptr->fd, f, nb);
+    return rb_ensure(rb_yield, io, io_nonblock_restore, (VALUE)restore);
+}
+#else
+#define rb_io_nonblock_set rb_f_notimplement
+#define rb_io_nonblock_block rb_f_notimplement
+#endif
+
+void
+Init_nonblock(void)
+{
+    VALUE io = rb_cIO;
+
+    rb_define_method(io, "nonblock?", rb_io_nonblock_p, 0);
+    rb_define_method(io, "nonblock=", rb_io_nonblock_set, 1);
+    rb_define_method(io, "nonblock", rb_io_nonblock_block, -1);
+}
diff --git a/ext/io/wait/.cvsignore b/ext/io/wait/.cvsignore
index fc802ff1c2..8767482975 100644
--- a/ext/io/wait/.cvsignore
+++ b/ext/io/wait/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+extconf.h
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index e8181d25f5..eed3543124 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -2,8 +2,9 @@ require 'mkmf'
 target = "io/wait"
 
 unless macro_defined?("DOSISH", "#include <ruby.h>")
-  fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
-    have_macro("FIONREAD", h)
+  have_header(ioctl_h = "sys/ioctl.h") or ioctl_h = nil
+  fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
+    have_macro("FIONREAD", [h, ioctl_h].compact)
   end
   if fionread
     $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
diff --git a/ext/io/wait/lib/nonblock.rb b/ext/io/wait/lib/nonblock.rb
deleted file mode 100644
index 2103fdf25b..0000000000
--- a/ext/io/wait/lib/nonblock.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "fcntl"
-class IO
-  def nonblock?
-    (fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0
-  end
-
-  def nonblock=(nb)
-    f = fcntl(Fcntl::F_GETFL)
-    if nb
-      f |= File::NONBLOCK
-    else
-      f &= ~File::NONBLOCK
-    end
-    fcntl(Fcntl::F_SETFL, f)
-  end
-
-  def nonblock(nb = true)
-    nb, self.nonblock = nonblock?, nb
-    yield
-  ensure
-    self.nonblock = nb
-  end
-end if defined?(Fcntl::F_GETFL)
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 61d6527b36..b73c9af1ce 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -3,7 +3,6 @@
   io/wait.c -
 
   $Author$
-  $Date$
   created at: Tue Aug 28 09:08:06 JST 2001
 
   All the files in this distribution are covered under the Ruby's
@@ -12,9 +11,12 @@
 **********************************************************************/
 
 #include "ruby.h"
-#include "rubyio.h"
+#include "ruby/io.h"
 
 #include <sys/types.h>
+#if defined(HAVE_SYS_IOCTL_H)
+#include <sys/ioctl.h>
+#endif
 #if defined(FIONREAD_HEADER)
 #include FIONREAD_HEADER
 #endif
@@ -31,7 +33,7 @@
 #ifdef HAVE_RB_W32_IS_SOCKET
 #define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
 #else
-#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
+#define FIONREAD_POSSIBLE_P(fd) ((void)(fd),Qtrue)
 #endif
 
 static VALUE io_ready_p _((VALUE io));
@@ -41,86 +43,126 @@ void Init_wait _((void));
 EXTERN struct timeval rb_time_interval _((VALUE time));
 
 /*
-=begin
-= IO wait methods.
-=end
+ * call-seq:
+ *   io.nread -> int
+ *
+ * Returns number of bytes that can be read without blocking.
+ * Returns zero if no information available.
  */
 
-/*
-=begin
---- IO#ready?
-    returns non-nil if input available without blocking, or nil.
-=end
-*/
 static VALUE
-io_ready_p(io)
-    VALUE io;
+io_nread(VALUE io)
 {
-    OpenFile *fptr;
-    FILE *fp;
+    rb_io_t *fptr;
+    int len;
     ioctl_arg n;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
-    fp = fptr->f;
-    if (feof(fp)) return Qfalse;
-    if (rb_read_pending(fp)) return Qtrue;
-    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
+    len = rb_io_read_pending(fptr);
+    if (len > 0) return len;
+    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0);
+    if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0);
     if (n > 0) return ioctl_arg2num(n);
-    return Qnil;
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *   io.ready? -> true, false or nil
+ *
+ * Returns true if input available without blocking, or false.
+ * Returns nil if no information available.
+ */
+
+static VALUE
+io_ready_p(VALUE io)
+{
+    rb_io_t *fptr;
+    ioctl_arg n;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    if (rb_io_read_pending(fptr)) return Qtrue;
+    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qnil;
+    if (ioctl(fptr->fd, FIONREAD, &n)) return Qnil;
+    if (n > 0) return Qtrue;
+    return Qfalse;
 }
 
+struct wait_readable_arg {
+    rb_fdset_t fds;
+    struct timeval *timeout;
+};
+
+#ifdef HAVE_RB_FD_INIT
+static VALUE
+wait_readable(VALUE p)
+{
+    struct wait_readable_arg *arg = (struct wait_readable_arg *)p;
+    rb_fdset_t *fds = &arg->fds;
+
+    return (VALUE)rb_thread_select(rb_fd_max(fds), rb_fd_ptr(fds), NULL, NULL, arg->timeout);
+}
+#endif
+
 /*
-=begin
---- IO#wait([timeout])
-    waits until input available or timed out and returns self, or nil
-    when EOF reached.
-=end
-*/
+ * call-seq:
+ *   io.wait          -> IO, true, false or nil
+ *   io.wait(timeout) -> IO, true, false or nil
+ *
+ * Waits until input is available or times out and returns self or nil when
+ * EOF is reached.
+ */
+
 static VALUE
-io_wait(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+io_wait(int argc, VALUE *argv, VALUE io)
 {
-    OpenFile *fptr;
-    fd_set rd;
-    FILE *fp;
-    int fd;
+    rb_io_t *fptr;
+    struct wait_readable_arg arg;
+    int fd, i;
     ioctl_arg n;
     VALUE timeout;
-    struct timeval *tp, timerec;
+    struct timeval timerec;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     rb_scan_args(argc, argv, "01", &timeout);
     if (NIL_P(timeout)) {
-	tp = 0;
+	arg.timeout = 0;
     }
     else {
 	timerec = rb_time_interval(timeout);
-	tp = &timerec;
+	arg.timeout = &timerec;
     }
 
-    fp = fptr->f;
-    if (feof(fp)) return Qfalse;
-    if (rb_read_pending(fp)) return Qtrue;
-    fd = fileno(fp);
-    FD_ZERO(&rd);
-    FD_SET(fd, &rd);
-    if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
+    if (rb_io_read_pending(fptr)) return Qtrue;
+    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
+    fd = fptr->fd;
+    rb_fd_init(&arg.fds);
+    rb_fd_set(fd, &arg.fds);
+#ifdef HAVE_RB_FD_INIT
+    i = (int)rb_ensure(wait_readable, (VALUE)&arg,
+		       (VALUE (*)_((VALUE)))rb_fd_term, (VALUE)&arg.fds);
+#else
+    i = rb_thread_select(fd + 1, rb_fd_ptr(&arg.fds), NULL, NULL, arg.timeout);
+#endif
+    if (i < 0)
 	rb_sys_fail(0);
     rb_io_check_closed(fptr);
-    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
-    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
+    if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
     if (n > 0) return io;
     return Qnil;
 }
 
+/*
+ * IO wait methods
+ */
+
 void
 Init_wait()
 {
+    rb_define_method(rb_cIO, "nread", io_nread, 0);
     rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
     rb_define_method(rb_cIO, "wait", io_wait, -1);
 }
diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb
new file mode 100644
index 0000000000..850798c643
--- /dev/null
+++ b/ext/json/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+create_makefile('json')
+
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
new file mode 100644
index 0000000000..bb76ad6400
--- /dev/null
+++ b/ext/json/generator/depend
@@ -0,0 +1 @@
+generator.o: generator.c generator.h
diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb
new file mode 100644
index 0000000000..195bfde3ff
--- /dev/null
+++ b/ext/json/generator/extconf.rb
@@ -0,0 +1,4 @@
+require 'mkmf'
+require 'rbconfig'
+
+create_makefile 'json/ext/generator'
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
new file mode 100644
index 0000000000..b25c94f8e9
--- /dev/null
+++ b/ext/json/generator/generator.c
@@ -0,0 +1,1341 @@
+#include "generator.h"
+
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE CEncoding_UTF_8;
+static ID i_encoding, i_encode;
+#endif
+
+static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
+             mHash, mArray, mInteger, mFloat, mString, mString_Extend,
+             mTrueClass, mFalseClass, mNilClass, eGeneratorError,
+             eNestingError, CRegexp_MULTILINE, CJSON_SAFE_STATE_PROTOTYPE;
+
+static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
+          i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only,
+          i_pack, i_unpack, i_create_id, i_extend, i_key_p, i_aref, i_send,
+          i_respond_to_p, i_match;
+
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ *
+ * Disclaimer
+ *
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ *
+ * Limitations on Rights to Redistribute This Code
+ *
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+/*
+ * Index into the table below with the first byte of a UTF-8 sequence to
+ * get the number of trailing bytes that are supposed to follow it.
+ * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
+ * left as-is for anyone who may want to do such conversion, which was
+ * allowed in earlier algorithms.
+ */
+static const char trailingBytesForUTF8[256] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/*
+ * Magic values subtracted from a buffer value during UTF8 conversion.
+ * This table contains as many values as there might be trailing bytes
+ * in a UTF-8 sequence.
+ */
+static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
+		     0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+
+/*
+ * Utility routine to tell whether a sequence of bytes is legal UTF-8.
+ * This must be called with the length pre-determined by the first byte.
+ * If not calling this from ConvertUTF8to*, then the length can be set by:
+ *  length = trailingBytesForUTF8[*source]+1;
+ * and the sequence is illegal right away if there aren't that many bytes
+ * available.
+ * If presented with a length > 4, this returns 0.  The Unicode
+ * definition of UTF-8 goes up to 4-byte sequences.
+ */
+static unsigned char isLegalUTF8(const UTF8 *source, int length)
+{
+    UTF8 a;
+    const UTF8 *srcptr = source+length;
+    switch (length) {
+        default: return 0;
+                 /* Everything else falls through when "1"... */
+        case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+        case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+        case 2: if ((a = (*--srcptr)) > 0xBF) return 0;
+
+                    switch (*source) {
+                        /* no fall-through in this inner switch */
+                        case 0xE0: if (a < 0xA0) return 0; break;
+                        case 0xED: if (a > 0x9F) return 0; break;
+                        case 0xF0: if (a < 0x90) return 0; break;
+                        case 0xF4: if (a > 0x8F) return 0; break;
+                        default:   if (a < 0x80) return 0;
+                    }
+
+        case 1: if (*source >= 0x80 && *source < 0xC2) return 0;
+    }
+    if (*source > 0xF4) return 0;
+    return 1;
+}
+
+/* Escapes the UTF16 character and stores the result in the buffer buf. */
+static void unicode_escape(char *buf, UTF16 character)
+{
+    const char *digits = "0123456789abcdef";
+
+    buf[2] = digits[character >> 12];
+    buf[3] = digits[(character >> 8) & 0xf];
+    buf[4] = digits[(character >> 4) & 0xf];
+    buf[5] = digits[character & 0xf];
+}
+
+/* Escapes the UTF16 character and stores the result in the buffer buf, then
+ * the buffer buf іs appended to the FBuffer buffer. */
+static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16
+        character)
+{
+    unicode_escape(buf, character);
+    fbuffer_append(buffer, buf, 6);
+}
+
+/* Converts string to a JSON string in FBuffer buffer, where all but the ASCII
+ * and control characters are JSON escaped. */
+static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
+{
+    const UTF8 *source = (UTF8 *) RSTRING_PTR(string);
+    const UTF8 *sourceEnd = source + RSTRING_LEN(string);
+    char buf[6] = { '\\', 'u' };
+
+    while (source < sourceEnd) {
+        UTF32 ch = 0;
+        unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+        if (source + extraBytesToRead >= sourceEnd) {
+            rb_raise(rb_path2class("JSON::GeneratorError"),
+                    "partial character in source, but hit end");
+        }
+        if (!isLegalUTF8(source, extraBytesToRead+1)) {
+            rb_raise(rb_path2class("JSON::GeneratorError"),
+                    "source sequence is illegal/malformed utf-8");
+        }
+        /*
+         * The cases all fall through. See "Note A" below.
+         */
+        switch (extraBytesToRead) {
+            case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+            case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+            case 3: ch += *source++; ch <<= 6;
+            case 2: ch += *source++; ch <<= 6;
+            case 1: ch += *source++; ch <<= 6;
+            case 0: ch += *source++;
+        }
+        ch -= offsetsFromUTF8[extraBytesToRead];
+
+        if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+            /* UTF-16 surrogate values are illegal in UTF-32 */
+            if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+#if UNI_STRICT_CONVERSION
+                source -= (extraBytesToRead+1); /* return to the illegal value itself */
+                rb_raise(rb_path2class("JSON::GeneratorError"),
+                        "source sequence is illegal/malformed utf-8");
+#else
+                unicode_escape_to_buffer(buffer, buf, UNI_REPLACEMENT_CHAR);
+#endif
+            } else {
+                /* normal case */
+                if (ch >= 0x20 && ch <= 0x7f) {
+                    switch (ch) {
+                        case '\\':
+                            fbuffer_append(buffer, "\\\\", 2);
+                            break;
+                        case '"':
+                            fbuffer_append(buffer, "\\\"", 2);
+                            break;
+                        default:
+                            fbuffer_append_char(buffer, (char)ch);
+                            break;
+                    }
+                } else {
+                    switch (ch) {
+                        case '\n':
+                            fbuffer_append(buffer, "\\n", 2);
+                            break;
+                        case '\r':
+                            fbuffer_append(buffer, "\\r", 2);
+                            break;
+                        case '\t':
+                            fbuffer_append(buffer, "\\t", 2);
+                            break;
+                        case '\f':
+                            fbuffer_append(buffer, "\\f", 2);
+                            break;
+                        case '\b':
+                            fbuffer_append(buffer, "\\b", 2);
+                            break;
+                        default:
+                            unicode_escape_to_buffer(buffer, buf, (UTF16) ch);
+                            break;
+                    }
+                }
+            }
+        } else if (ch > UNI_MAX_UTF16) {
+#if UNI_STRICT_CONVERSION
+            source -= (extraBytesToRead+1); /* return to the start */
+            rb_raise(rb_path2class("JSON::GeneratorError"),
+                    "source sequence is illegal/malformed utf8");
+#else
+            unicode_escape_to_buffer(buffer, buf, UNI_REPLACEMENT_CHAR);
+#endif
+        } else {
+            /* target is a character in range 0xFFFF - 0x10FFFF. */
+            ch -= halfBase;
+            unicode_escape_to_buffer(buffer, buf, (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START));
+            unicode_escape_to_buffer(buffer, buf, (UTF16)((ch & halfMask) + UNI_SUR_LOW_START));
+        }
+    }
+}
+
+/* Converts string to a JSON string in FBuffer buffer, where only the
+ * characters required by the JSON standard are JSON escaped. The remaining
+ * characters (should be UTF8) are just passed through and appended to the
+ * result. */
+static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
+{
+    const char *ptr = RSTRING_PTR(string), *p;
+    int len = RSTRING_LEN(string), start = 0, end = 0;
+    const char *escape = NULL;
+    int escape_len;
+    unsigned char c;
+    char buf[6] = { '\\', 'u' };
+
+    for (start = 0, end = 0; end < len;) {
+        p = ptr + end;
+        c = (unsigned char) *p;
+        if (c < 0x20) {
+            switch (c) {
+                case '\n':
+                    escape = "\\n";
+                    escape_len = 2;
+                    break;
+                case '\r':
+                    escape = "\\r";
+                    escape_len = 2;
+                    break;
+                case '\t':
+                    escape = "\\t";
+                    escape_len = 2;
+                    break;
+                case '\f':
+                    escape = "\\f";
+                    escape_len = 2;
+                    break;
+                case '\b':
+                    escape = "\\b";
+                    escape_len = 2;
+                    break;
+                default:
+                    unicode_escape(buf, (UTF16) *p);
+                    escape = buf;
+                    escape_len = 6;
+                    break;
+            }
+        } else {
+            switch (c) {
+                case '\\':
+                    escape = "\\\\";
+                    escape_len = 2;
+                    break;
+                case '"':
+                    escape =  "\\\"";
+                    escape_len = 2;
+                    break;
+                default:
+                    end++;
+                    continue;
+                    break;
+            }
+        }
+        fbuffer_append(buffer, ptr + start, end - start);
+        fbuffer_append(buffer, escape, escape_len);
+        start = ++end;
+        escape = NULL;
+    }
+    fbuffer_append(buffer, ptr + start, end - start);
+}
+
+static char *fstrndup(const char *ptr, int len) {
+  char *result;
+  if (len <= 0) return NULL;
+  result = ALLOC_N(char, len);
+  memccpy(result, ptr, 0, len);
+  return result;
+}
+
+/* fbuffer implementation */
+
+static FBuffer *fbuffer_alloc()
+{
+    FBuffer *fb = ALLOC(FBuffer);
+    memset((void *) fb, 0, sizeof(FBuffer));
+    fb->initial_length = FBUFFER_INITIAL_LENGTH;
+    return fb;
+}
+
+static FBuffer *fbuffer_alloc_with_length(unsigned int initial_length)
+{
+    FBuffer *fb;
+    assert(initial_length > 0);
+    fb = ALLOC(FBuffer);
+    memset((void *) fb, 0, sizeof(FBuffer));
+    fb->initial_length = initial_length;
+    return fb;
+}
+
+static void fbuffer_free(FBuffer *fb)
+{
+    if (fb->ptr) ruby_xfree(fb->ptr);
+    ruby_xfree(fb);
+}
+
+static void fbuffer_free_only_buffer(FBuffer *fb)
+{
+    ruby_xfree(fb);
+}
+
+static void fbuffer_clear(FBuffer *fb)
+{
+    fb->len = 0;
+}
+
+static void fbuffer_inc_capa(FBuffer *fb, unsigned int requested)
+{
+    unsigned int required;
+
+    if (!fb->ptr) {
+        fb->ptr = ALLOC_N(char, fb->initial_length);
+        fb->capa = fb->initial_length;
+    }
+
+    for (required = fb->capa; requested > required - fb->len; required <<= 1);
+
+    if (required > fb->capa) {
+        REALLOC_N(fb->ptr, char, required);
+        fb->capa = required;
+    }
+}
+
+static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned int len)
+{
+    if (len > 0) {
+        fbuffer_inc_capa(fb, len);
+        MEMCPY(fb->ptr + fb->len, newstr, char, len);
+        fb->len += len;
+    }
+}
+
+static void fbuffer_append_char(FBuffer *fb, char newchr)
+{
+    fbuffer_inc_capa(fb, 1);
+    *(fb->ptr + fb->len) = newchr;
+    fb->len++;
+}
+
+static void freverse(char *start, char *end)
+{
+    char c;
+
+    while (end > start) {
+        c = *end, *end-- = *start, *start++ = c;
+    }
+}
+
+static int fltoa(long number, char *buf)
+{
+    static char digits[] = "0123456789";
+    long sign = number;
+    char* tmp = buf;
+
+    if (sign < 0) number = -number;
+    do *tmp++ = digits[number % 10]; while (number /= 10);
+    if (sign < 0) *tmp++ = '-';
+    freverse(buf, tmp - 1);
+    return tmp - buf;
+}
+
+static void fbuffer_append_long(FBuffer *fb, long number)
+{
+    char buf[20];
+    int len = fltoa(number, buf);
+    fbuffer_append(fb, buf, len);
+}
+
+static FBuffer *fbuffer_dup(FBuffer *fb)
+{
+    int len = fb->len;
+    FBuffer *result;
+
+    if (len > 0) {
+        result = fbuffer_alloc_with_length(len);
+        fbuffer_append(result, FBUFFER_PAIR(fb));
+    } else {
+        result = fbuffer_alloc();
+    }
+    return result;
+}
+
+/*
+ * Document-module: JSON::Ext::Generator
+ *
+ * This is the JSON generator implemented as a C extension. It can be
+ * configured to be used by setting
+ *
+ *  JSON.generator = JSON::Ext::Generator
+ *
+ * with the method generator= in JSON.
+ *
+ */
+
+/*
+ * call-seq: to_json(state = nil, depth = 0)
+ *
+ * Returns a JSON string containing a JSON object, that is generated from
+ * this Hash instance.
+ * _state_ is a JSON::State object, that can also be used to configure the
+ * produced JSON string output further.
+ * _depth_ is used to find out nesting depth, to indent accordingly.
+ */
+static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: to_json(state = nil, depth = 0)
+ *
+ * Returns a JSON string containing a JSON array, that is generated from
+ * this Array instance.
+ * _state_ is a JSON::State object, that can also be used to configure the
+ * produced JSON string output further.
+ * _depth_ is used to find out nesting depth, to indent accordingly.
+ */
+static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
+    VALUE state, depth;
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: to_json(*)
+ *
+ * Returns a JSON string representation for this Integer number.
+ */
+static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: to_json(*)
+ *
+ * Returns a JSON string representation for this Float number.
+ */
+static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: String.included(modul)
+ *
+ * Extends _modul_ with the String::Extend module.
+ */
+static VALUE mString_included_s(VALUE self, VALUE modul) {
+    VALUE result = rb_funcall(modul, i_extend, 1, mString_Extend);
+    return result;
+}
+
+/*
+ * call-seq: to_json(*)
+ *
+ * This string should be encoded with UTF-8 A call to this method
+ * returns a JSON string encoded with UTF16 big endian characters as
+ * \u????.
+ */
+static VALUE mString_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: to_json_raw_object()
+ *
+ * This method creates a raw object hash, that can be nested into
+ * other data structures and will be generated as a raw string. This
+ * method should be used, if you want to convert raw strings to JSON
+ * instead of UTF-8 strings, e. g. binary data.
+ */
+static VALUE mString_to_json_raw_object(VALUE self)
+{
+    VALUE ary;
+    VALUE result = rb_hash_new();
+    rb_hash_aset(result, rb_funcall(mJSON, i_create_id, 0), rb_class_name(rb_obj_class(self)));
+    ary = rb_funcall(self, i_unpack, 1, rb_str_new2("C*"));
+    rb_hash_aset(result, rb_str_new2("raw"), ary);
+    return result;
+}
+
+/*
+ * call-seq: to_json_raw(*args)
+ *
+ * This method creates a JSON text from the result of a call to
+ * to_json_raw_object of this String.
+ */
+static VALUE mString_to_json_raw(int argc, VALUE *argv, VALUE self)
+{
+    VALUE obj = mString_to_json_raw_object(self);
+    Check_Type(obj, T_HASH);
+    return mHash_to_json(argc, argv, obj);
+}
+
+/*
+ * call-seq: json_create(o)
+ *
+ * Raw Strings are JSON Objects (the raw bytes are stored in an array for the
+ * key "raw"). The Ruby String can be created by this module method.
+ */
+static VALUE mString_Extend_json_create(VALUE self, VALUE o)
+{
+    VALUE ary;
+    Check_Type(o, T_HASH);
+    ary = rb_hash_aref(o, rb_str_new2("raw"));
+    return rb_funcall(ary, i_pack, 1, rb_str_new2("C*"));
+}
+
+/*
+ * call-seq: to_json(*)
+ *
+ * Returns a JSON string for true: 'true'.
+ */
+static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: to_json(*)
+ *
+ * Returns a JSON string for false: 'false'.
+ */
+static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: to_json(*)
+ *
+ */
+static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, self, depth);
+}
+
+/*
+ * call-seq: to_json(*)
+ *
+ * Converts this object to a string (calling #to_s), converts
+ * it to a JSON string, and returns the result. This is a fallback, if no
+ * special method #to_json was defined for some object.
+ */
+static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
+{
+    VALUE state, depth;
+    VALUE string = rb_funcall(self, i_to_s, 0);
+    rb_scan_args(argc, argv, "02", &state, &depth);
+    Check_Type(string, T_STRING);
+    state = cState_from_state_s(cState, state);
+    return cState_partial_generate(state, string, depth);
+}
+
+static void State_free(JSON_Generator_State *state)
+{
+    if (state->indent) ruby_xfree(state->indent);
+    if (state->space) ruby_xfree(state->space);
+    if (state->space_before) ruby_xfree(state->space_before);
+    if (state->object_nl) ruby_xfree(state->object_nl);
+    if (state->array_nl) ruby_xfree(state->array_nl);
+    if (state->array_delim) fbuffer_free(state->array_delim);
+    if (state->object_delim) fbuffer_free(state->object_delim);
+    if (state->object_delim2) fbuffer_free(state->object_delim2);
+    ruby_xfree(state);
+}
+
+static JSON_Generator_State *State_allocate()
+{
+    JSON_Generator_State *state = ALLOC(JSON_Generator_State);
+    return state;
+}
+
+static VALUE cState_s_allocate(VALUE klass)
+{
+    JSON_Generator_State *state = State_allocate();
+    return Data_Wrap_Struct(klass, NULL, State_free, state);
+}
+
+/*
+ * call-seq: configure(opts)
+ *
+ * Configure this State instance with the Hash _opts_, and return
+ * itself.
+ */
+static VALUE cState_configure(VALUE self, VALUE opts)
+{
+    VALUE tmp;
+    GET_STATE(self);
+    tmp = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
+    if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
+    if (NIL_P(tmp)) {
+        rb_raise(rb_eArgError, "opts has to be hash like or convertable into a hash");
+    }
+    opts = tmp;
+    tmp = rb_hash_aref(opts, ID2SYM(i_indent));
+    if (RTEST(tmp)) {
+        int len;
+        Check_Type(tmp, T_STRING);
+        len = RSTRING_LEN(tmp);
+        state->indent = fstrndup(RSTRING_PTR(tmp), len);
+        state->indent_len = len;
+    }
+    tmp = rb_hash_aref(opts, ID2SYM(i_space));
+    if (RTEST(tmp)) {
+        int len;
+        Check_Type(tmp, T_STRING);
+        len = RSTRING_LEN(tmp);
+        state->space = fstrndup(RSTRING_PTR(tmp), len);
+        state->space_len = len;
+    }
+    tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
+    if (RTEST(tmp)) {
+        int len;
+        Check_Type(tmp, T_STRING);
+        len = RSTRING_LEN(tmp);
+        state->space_before = fstrndup(RSTRING_PTR(tmp), len);
+        state->space_before_len = len;
+    }
+    tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
+    if (RTEST(tmp)) {
+        int len;
+        Check_Type(tmp, T_STRING);
+        len = RSTRING_LEN(tmp);
+        state->array_nl = fstrndup(RSTRING_PTR(tmp), len);
+        state->array_nl_len = len;
+    }
+    tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
+    if (RTEST(tmp)) {
+        int len;
+        Check_Type(tmp, T_STRING);
+        len = RSTRING_LEN(tmp);
+        state->object_nl = fstrndup(RSTRING_PTR(tmp), len);
+        state->object_nl_len = len;
+    }
+    tmp = ID2SYM(i_max_nesting);
+    state->max_nesting = 19;
+    if (option_given_p(opts, tmp)) {
+        VALUE max_nesting = rb_hash_aref(opts, tmp);
+        if (RTEST(max_nesting)) {
+            Check_Type(max_nesting, T_FIXNUM);
+            state->max_nesting = FIX2LONG(max_nesting);
+        } else {
+            state->max_nesting = 0;
+        }
+    }
+    tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
+    state->allow_nan = RTEST(tmp);
+    tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
+    state->ascii_only = RTEST(tmp);
+    return self;
+}
+
+/*
+ * call-seq: to_h
+ *
+ * Returns the configuration instance variables as a hash, that can be
+ * passed to the configure method.
+ */
+static VALUE cState_to_h(VALUE self)
+{
+    VALUE result = rb_hash_new();
+    GET_STATE(self);
+    rb_hash_aset(result, ID2SYM(i_indent), rb_str_new(state->indent, state->indent_len));
+    rb_hash_aset(result, ID2SYM(i_space), rb_str_new(state->space, state->space_len));
+    rb_hash_aset(result, ID2SYM(i_space_before), rb_str_new(state->space_before, state->space_before_len));
+    rb_hash_aset(result, ID2SYM(i_object_nl), rb_str_new(state->object_nl, state->object_nl_len));
+    rb_hash_aset(result, ID2SYM(i_array_nl), rb_str_new(state->array_nl, state->array_nl_len));
+    rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
+    rb_hash_aset(result, ID2SYM(i_ascii_only), state->ascii_only ? Qtrue : Qfalse);
+    rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
+    return result;
+}
+
+/*
+* call-seq: [](name)
+*
+* Return the value returned by method +name+.
+*/
+static VALUE cState_aref(VALUE self, VALUE name)
+{
+    GET_STATE(self);
+    if (RTEST(rb_funcall(self, i_respond_to_p, 1, name))) {
+        return rb_funcall(self, i_send, 1, name);
+    } else {
+        return Qnil;
+    }
+}
+
+static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj, long depth)
+{
+    VALUE tmp;
+    switch (TYPE(obj)) {
+        case T_HASH:
+            {
+                char *object_nl = state->object_nl;
+                long object_nl_len = state->object_nl_len;
+                char *indent = state->indent;
+                long indent_len = state->indent_len;
+                long max_nesting = state->max_nesting;
+                char *delim = FBUFFER_PTR(state->object_delim);
+                long delim_len = FBUFFER_LEN(state->object_delim);
+                char *delim2 = FBUFFER_PTR(state->object_delim2);
+                long delim2_len = FBUFFER_LEN(state->object_delim2);
+                int i, j;
+                VALUE key, key_to_s, keys;
+                depth++;
+                if (max_nesting != 0 && depth > max_nesting) {
+                    fbuffer_free(buffer);
+                    rb_raise(eNestingError, "nesting of %ld is too deep", depth);
+                }
+                fbuffer_append_char(buffer, '{');
+                keys = rb_funcall(obj, rb_intern("keys"), 0);
+                for(i = 0; i < RARRAY_LEN(keys); i++) {
+                    if (i > 0) fbuffer_append(buffer, delim, delim_len);
+                    if (object_nl) {
+                        fbuffer_append(buffer, object_nl, object_nl_len);
+                    }
+                    if (indent) {
+                        for (j = 0; j < depth; j++) {
+                            fbuffer_append(buffer, indent, indent_len);
+                        }
+                    }
+                    key = rb_ary_entry(keys, i);
+                    key_to_s = rb_funcall(key, i_to_s, 0);
+                    Check_Type(key_to_s, T_STRING);
+                    generate_json(buffer, Vstate, state, key_to_s, depth);
+                    fbuffer_append(buffer, delim2, delim2_len);
+                    generate_json(buffer, Vstate, state, rb_hash_aref(obj, key), depth);
+                }
+                depth--;
+                if (object_nl) {
+                    fbuffer_append(buffer, object_nl, object_nl_len);
+                    if (indent) {
+                        for (j = 0; j < depth; j++) {
+                            fbuffer_append(buffer, indent, indent_len);
+                        }
+                    }
+                }
+                fbuffer_append_char(buffer, '}');
+            }
+            break;
+        case T_ARRAY:
+            {
+                char *array_nl = state->array_nl;
+                long array_nl_len = state->array_nl_len;
+                char *indent = state->indent;
+                long indent_len = state->indent_len;
+                long max_nesting = state->max_nesting;
+                char *delim = FBUFFER_PTR(state->array_delim);
+                long delim_len = FBUFFER_LEN(state->array_delim);
+                int i, j;
+                depth++;
+                if (max_nesting != 0 && depth > max_nesting) {
+                    fbuffer_free(buffer);
+                    rb_raise(eNestingError, "nesting of %ld is too deep", depth);
+                }
+                fbuffer_append_char(buffer, '[');
+                if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len);
+                for(i = 0; i < RARRAY_LEN(obj); i++) {
+                    if (i > 0) fbuffer_append(buffer, delim, delim_len);
+                    if (indent) {
+                        for (j = 0; j < depth; j++) {
+                            fbuffer_append(buffer, indent, indent_len);
+                        }
+                    }
+                    generate_json(buffer, Vstate, state, rb_ary_entry(obj, i), depth);
+                }
+                depth--;
+                if (array_nl) {
+                    fbuffer_append(buffer, array_nl, array_nl_len);
+                    if (indent) {
+                        for (j = 0; j < depth; j++) {
+                            fbuffer_append(buffer, indent, indent_len);
+                        }
+                    }
+                }
+                fbuffer_append_char(buffer, ']');
+            }
+            break;
+        case T_STRING:
+            fbuffer_append_char(buffer, '"');
+#ifdef HAVE_RUBY_ENCODING_H
+            obj = rb_funcall(obj, i_encode, 1, CEncoding_UTF_8);
+#endif
+            if (state->ascii_only) {
+                convert_UTF8_to_JSON_ASCII(buffer, obj);
+            } else {
+                convert_UTF8_to_JSON(buffer, obj);
+            }
+            fbuffer_append_char(buffer, '"');
+            break;
+        case T_NIL:
+            fbuffer_append(buffer, "null", 4);
+            break;
+        case T_FALSE:
+            fbuffer_append(buffer, "false", 5);
+            break;
+        case T_TRUE:
+            fbuffer_append(buffer, "true", 4);
+            break;
+        case T_FIXNUM:
+            fbuffer_append_long(buffer, FIX2LONG(obj));
+            break;
+        case T_BIGNUM:
+            tmp = rb_funcall(obj, i_to_s, 0);
+            fbuffer_append(buffer, RSTRING_PAIR(tmp));
+            break;
+        case T_FLOAT:
+            {
+                double value = RFLOAT_VALUE(obj);
+                char allow_nan = state->allow_nan;
+                tmp = rb_funcall(obj, i_to_s, 0);
+                if (!allow_nan) {
+                    if (isinf(value)) {
+                        fbuffer_free(buffer);
+                        rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
+                    } else if (isnan(value)) {
+                        fbuffer_free(buffer);
+                        rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
+                    }
+                }
+                fbuffer_append(buffer, RSTRING_PAIR(tmp));
+            }
+            break;
+        default:
+            if (rb_respond_to(obj, i_to_json)) {
+                tmp = rb_funcall(obj, i_to_json, 2, Vstate, INT2FIX(depth + 1));
+                Check_Type(tmp, T_STRING);
+                fbuffer_append(buffer, RSTRING_PAIR(tmp));
+            } else {
+                tmp = rb_funcall(obj, i_to_s, 0);
+                Check_Type(tmp, T_STRING);
+                generate_json(buffer, Vstate, state, tmp, depth + 1);
+            }
+            break;
+    }
+}
+
+/*
+ * call-seq: partial_generate(obj)
+ *
+ * Generates a part of a JSON document from object +obj+ and returns the
+ * result.
+ */
+static VALUE cState_partial_generate(VALUE self, VALUE obj, VALUE depth)
+{
+    VALUE result;
+    FBuffer *buffer = fbuffer_alloc();
+    GET_STATE(self);
+
+    if (state->object_delim) {
+        fbuffer_clear(state->object_delim);
+    } else {
+        state->object_delim = fbuffer_alloc_with_length(16);
+    }
+    fbuffer_append_char(state->object_delim, ',');
+    if (state->object_delim2) {
+        fbuffer_clear(state->object_delim2);
+    } else {
+        state->object_delim2 = fbuffer_alloc_with_length(16);
+    }
+    fbuffer_append_char(state->object_delim2, ':');
+    if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len);
+
+    if (state->array_delim) {
+        fbuffer_clear(state->array_delim);
+    } else {
+        state->array_delim = fbuffer_alloc_with_length(16);
+    }
+    fbuffer_append_char(state->array_delim, ',');
+    if (state->array_nl) fbuffer_append(state->array_delim, state->array_nl, state->array_nl_len);
+
+    generate_json(buffer, self, state, obj, NIL_P(depth) ? 0 : FIX2INT(depth));
+    result = rb_str_new(FBUFFER_PAIR(buffer));
+    fbuffer_free(buffer);
+    FORCE_UTF8(result);
+    return result;
+}
+
+/*
+ * call-seq: generate(obj)
+ *
+ * Generates a valid JSON document from object +obj+ and returns the
+ * result. If no valid JSON document can be created this method raises a
+ * GeneratorError exception.
+ */
+static VALUE cState_generate(VALUE self, VALUE obj)
+{
+    VALUE result = cState_partial_generate(self, obj, Qnil);
+    VALUE re, args[2];
+    args[0] = rb_str_new2("\\A\\s*(?:\\[.*\\]|\\{.*\\})\\s*\\Z");
+    args[1] = CRegexp_MULTILINE;
+    re = rb_class_new_instance(2, args, rb_cRegexp);
+    if (NIL_P(rb_funcall(re, i_match, 1, result))) {
+        rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
+    }
+    return result;
+}
+
+/*
+ * call-seq: new(opts = {})
+ *
+ * Instantiates a new State object, configured by _opts_.
+ *
+ * _opts_ can have the following keys:
+ *
+ * * *indent*: a string used to indent levels (default: ''),
+ * * *space*: a string that is put after, a : or , delimiter (default: ''),
+ * * *space_before*: a string that is put before a : pair delimiter (default: ''),
+ * * *object_nl*: a string that is put at the end of a JSON object (default: ''),
+ * * *array_nl*: a string that is put at the end of a JSON array (default: ''),
+ * * *allow_nan*: true if NaN, Infinity, and -Infinity should be
+ *   generated, otherwise an exception is thrown, if these values are
+ *   encountered. This options defaults to false.
+ */
+static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE opts;
+    GET_STATE(self);
+    MEMZERO(state, JSON_Generator_State, 1);
+    state->max_nesting = 19;
+    rb_scan_args(argc, argv, "01", &opts);
+    if (!NIL_P(opts)) cState_configure(self, opts);
+    return self;
+}
+
+/*
+ * call-seq: initialize_copy(orig)
+ *
+ * Initializes this object from orig if it to be duplicated/cloned and returns
+ * it.
+*/
+static VALUE cState_init_copy(VALUE obj, VALUE orig)
+{
+    JSON_Generator_State *objState, *origState;
+
+    Data_Get_Struct(obj, JSON_Generator_State, objState);
+    Data_Get_Struct(orig, JSON_Generator_State, origState);
+    if (!objState) rb_raise(rb_eArgError, "unallocated JSON::State");
+
+    MEMCPY(objState, origState, JSON_Generator_State, 1);
+    objState->indent = fstrndup(origState->indent, origState->indent_len);
+    objState->space = fstrndup(origState->space, origState->space_len);
+    objState->space_before = fstrndup(origState->space_before, origState->space_before_len);
+    objState->object_nl = fstrndup(origState->object_nl, origState->object_nl_len);
+    objState->array_nl = fstrndup(origState->array_nl, origState->array_nl_len);
+    if (origState->array_delim) objState->array_delim = fbuffer_dup(origState->array_delim);
+    if (origState->object_delim) objState->object_delim = fbuffer_dup(origState->object_delim);
+    if (origState->object_delim2) objState->object_delim2 = fbuffer_dup(origState->object_delim2);
+    return obj;
+}
+
+/*
+ * call-seq: from_state(opts)
+ *
+ * Creates a State object from _opts_, which ought to be Hash to create a
+ * new State instance configured by _opts_, something else to create an
+ * unconfigured instance. If _opts_ is a State object, it is just returned.
+ */
+static VALUE cState_from_state_s(VALUE self, VALUE opts)
+{
+    if (rb_obj_is_kind_of(opts, self)) {
+        return opts;
+    } else if (rb_obj_is_kind_of(opts, rb_cHash)) {
+        return rb_funcall(self, i_new, 1, opts);
+    } else {
+        if (NIL_P(CJSON_SAFE_STATE_PROTOTYPE)) {
+            CJSON_SAFE_STATE_PROTOTYPE = rb_const_get(mJSON, rb_intern("SAFE_STATE_PROTOTYPE"));
+        }
+        return CJSON_SAFE_STATE_PROTOTYPE;
+    }
+}
+
+/*
+ * call-seq: indent()
+ *
+ * This string is used to indent levels in the JSON text.
+ */
+static VALUE cState_indent(VALUE self)
+{
+    GET_STATE(self);
+    return state->indent ? rb_str_new2(state->indent) : rb_str_new2("");
+}
+
+/*
+ * call-seq: indent=(indent)
+ *
+ * This string is used to indent levels in the JSON text.
+ */
+static VALUE cState_indent_set(VALUE self, VALUE indent)
+{
+    GET_STATE(self);
+    Check_Type(indent, T_STRING);
+    if (RSTRING_LEN(indent) == 0) {
+        if (state->indent) {
+            ruby_xfree(state->indent);
+            state->indent = NULL;
+        }
+    } else {
+        if (state->indent) ruby_xfree(state->indent);
+        state->indent = strdup(RSTRING_PTR(indent));
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq: space()
+ *
+ * This string is used to insert a space between the tokens in a JSON
+ * string.
+ */
+static VALUE cState_space(VALUE self)
+{
+    GET_STATE(self);
+    return state->space ? rb_str_new2(state->space) : rb_str_new2("");
+}
+
+/*
+ * call-seq: space=(space)
+ *
+ * This string is used to insert a space between the tokens in a JSON
+ * string.
+ */
+static VALUE cState_space_set(VALUE self, VALUE space)
+{
+    GET_STATE(self);
+    Check_Type(space, T_STRING);
+    if (RSTRING_LEN(space) == 0) {
+        if (state->space) {
+            ruby_xfree(state->space);
+            state->space = NULL;
+        }
+    } else {
+        if (state->space) ruby_xfree(state->space);
+        state->space = strdup(RSTRING_PTR(space));
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq: space_before()
+ *
+ * This string is used to insert a space before the ':' in JSON objects.
+ */
+static VALUE cState_space_before(VALUE self)
+{
+    GET_STATE(self);
+    return state->space_before ? rb_str_new2(state->space_before) : rb_str_new2("");
+}
+
+/*
+ * call-seq: space_before=(space_before)
+ *
+ * This string is used to insert a space before the ':' in JSON objects.
+ */
+static VALUE cState_space_before_set(VALUE self, VALUE space_before)
+{
+    GET_STATE(self);
+    Check_Type(space_before, T_STRING);
+    if (RSTRING_LEN(space_before) == 0) {
+        if (state->space_before) {
+            ruby_xfree(state->space_before);
+            state->space_before = NULL;
+        }
+    } else {
+        if (state->space_before) ruby_xfree(state->space_before);
+        state->space_before = strdup(RSTRING_PTR(space_before));
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq: object_nl()
+ *
+ * This string is put at the end of a line that holds a JSON object (or
+ * Hash).
+ */
+static VALUE cState_object_nl(VALUE self)
+{
+    GET_STATE(self);
+    return state->object_nl ? rb_str_new2(state->object_nl) : rb_str_new2("");
+}
+
+/*
+ * call-seq: object_nl=(object_nl)
+ *
+ * This string is put at the end of a line that holds a JSON object (or
+ * Hash).
+ */
+static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
+{
+    GET_STATE(self);
+    Check_Type(object_nl, T_STRING);
+    if (RSTRING_LEN(object_nl) == 0) {
+        if (state->object_nl) {
+            ruby_xfree(state->object_nl);
+            state->object_nl = NULL;
+        }
+    } else {
+        if (state->object_nl) ruby_xfree(state->object_nl);
+        state->object_nl = strdup(RSTRING_PTR(object_nl));
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq: array_nl()
+ *
+ * This string is put at the end of a line that holds a JSON array.
+ */
+static VALUE cState_array_nl(VALUE self)
+{
+    GET_STATE(self);
+    return state->array_nl ? rb_str_new2(state->array_nl) : rb_str_new2("");
+}
+
+/*
+ * call-seq: array_nl=(array_nl)
+ *
+ * This string is put at the end of a line that holds a JSON array.
+ */
+static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
+{
+    GET_STATE(self);
+    Check_Type(array_nl, T_STRING);
+    if (RSTRING_LEN(array_nl) == 0) {
+        if (state->array_nl) {
+            ruby_xfree(state->array_nl);
+            state->array_nl = NULL;
+        }
+    } else {
+        if (state->array_nl) ruby_xfree(state->array_nl);
+        state->array_nl = strdup(RSTRING_PTR(array_nl));
+    }
+    return Qnil;
+}
+
+
+/*
+* call-seq: check_circular?
+*
+* Returns true, if circular data structures should be checked,
+* otherwise returns false.
+*/
+static VALUE cState_check_circular_p(VALUE self)
+{
+    GET_STATE(self);
+    return state->max_nesting ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq: max_nesting
+ *
+ * This integer returns the maximum level of data structure nesting in
+ * the generated JSON, max_nesting = 0 if no maximum is checked.
+ */
+static VALUE cState_max_nesting(VALUE self)
+{
+    GET_STATE(self);
+    return LONG2FIX(state->max_nesting);
+}
+
+/*
+ * call-seq: max_nesting=(depth)
+ *
+ * This sets the maximum level of data structure nesting in the generated JSON
+ * to the integer depth, max_nesting = 0 if no maximum should be checked.
+ */
+static VALUE cState_max_nesting_set(VALUE self, VALUE depth)
+{
+    GET_STATE(self);
+    Check_Type(depth, T_FIXNUM);
+    return state->max_nesting = FIX2LONG(depth);
+}
+
+/*
+ * call-seq: allow_nan?
+ *
+ * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
+ * returns false.
+ */
+static VALUE cState_allow_nan_p(VALUE self)
+{
+    GET_STATE(self);
+    return state->allow_nan ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq: ascii_only?
+ *
+ * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
+ * returns false.
+ */
+static VALUE cState_ascii_only_p(VALUE self)
+{
+    GET_STATE(self);
+    return state->ascii_only ? Qtrue : Qfalse;
+}
+
+/*
+ *
+ */
+void Init_generator()
+{
+    rb_require("json/common");
+
+    mJSON = rb_define_module("JSON");
+    mExt = rb_define_module_under(mJSON, "Ext");
+    mGenerator = rb_define_module_under(mExt, "Generator");
+
+    eGeneratorError = rb_path2class("JSON::GeneratorError");
+    eNestingError = rb_path2class("JSON::NestingError");
+
+    cState = rb_define_class_under(mGenerator, "State", rb_cObject);
+    rb_define_alloc_func(cState, cState_s_allocate);
+    rb_define_singleton_method(cState, "from_state", cState_from_state_s, 1);
+    rb_define_method(cState, "initialize", cState_initialize, -1);
+    rb_define_method(cState, "initialize_copy", cState_init_copy, 1);
+    rb_define_method(cState, "indent", cState_indent, 0);
+    rb_define_method(cState, "indent=", cState_indent_set, 1);
+    rb_define_method(cState, "space", cState_space, 0);
+    rb_define_method(cState, "space=", cState_space_set, 1);
+    rb_define_method(cState, "space_before", cState_space_before, 0);
+    rb_define_method(cState, "space_before=", cState_space_before_set, 1);
+    rb_define_method(cState, "object_nl", cState_object_nl, 0);
+    rb_define_method(cState, "object_nl=", cState_object_nl_set, 1);
+    rb_define_method(cState, "array_nl", cState_array_nl, 0);
+    rb_define_method(cState, "array_nl=", cState_array_nl_set, 1);
+    rb_define_method(cState, "max_nesting", cState_max_nesting, 0);
+    rb_define_method(cState, "max_nesting=", cState_max_nesting_set, 1);
+    rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
+    rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
+    rb_define_method(cState, "ascii_only?", cState_ascii_only_p, 0);
+    rb_define_method(cState, "configure", cState_configure, 1);
+    rb_define_method(cState, "to_h", cState_to_h, 0);
+    rb_define_method(cState, "[]", cState_aref, 1);
+    rb_define_method(cState, "generate", cState_generate, 1);
+    rb_define_method(cState, "partial_generate", cState_partial_generate, 1);
+
+    mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
+    mObject = rb_define_module_under(mGeneratorMethods, "Object");
+    rb_define_method(mObject, "to_json", mObject_to_json, -1);
+    mHash = rb_define_module_under(mGeneratorMethods, "Hash");
+    rb_define_method(mHash, "to_json", mHash_to_json, -1);
+    mArray = rb_define_module_under(mGeneratorMethods, "Array");
+    rb_define_method(mArray, "to_json", mArray_to_json, -1);
+    mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
+    rb_define_method(mInteger, "to_json", mInteger_to_json, -1);
+    mFloat = rb_define_module_under(mGeneratorMethods, "Float");
+    rb_define_method(mFloat, "to_json", mFloat_to_json, -1);
+    mString = rb_define_module_under(mGeneratorMethods, "String");
+    rb_define_singleton_method(mString, "included", mString_included_s, 1);
+    rb_define_method(mString, "to_json", mString_to_json, -1);
+    rb_define_method(mString, "to_json_raw", mString_to_json_raw, -1);
+    rb_define_method(mString, "to_json_raw_object", mString_to_json_raw_object, 0);
+    mString_Extend = rb_define_module_under(mString, "Extend");
+    rb_define_method(mString_Extend, "json_create", mString_Extend_json_create, 1);
+    mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
+    rb_define_method(mTrueClass, "to_json", mTrueClass_to_json, -1);
+    mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
+    rb_define_method(mFalseClass, "to_json", mFalseClass_to_json, -1);
+    mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
+    rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
+
+    CRegexp_MULTILINE = rb_const_get(rb_cRegexp, rb_intern("MULTILINE"));
+    i_to_s = rb_intern("to_s");
+    i_to_json = rb_intern("to_json");
+    i_new = rb_intern("new");
+    i_indent = rb_intern("indent");
+    i_space = rb_intern("space");
+    i_space_before = rb_intern("space_before");
+    i_object_nl = rb_intern("object_nl");
+    i_array_nl = rb_intern("array_nl");
+    i_max_nesting = rb_intern("max_nesting");
+    i_allow_nan = rb_intern("allow_nan");
+    i_ascii_only = rb_intern("ascii_only");
+    i_pack = rb_intern("pack");
+    i_unpack = rb_intern("unpack");
+    i_create_id = rb_intern("create_id");
+    i_extend = rb_intern("extend");
+    i_key_p = rb_intern("key?");
+    i_aref = rb_intern("[]");
+    i_send = rb_intern("__send__");
+    i_respond_to_p = rb_intern("respond_to?");
+    i_match = rb_intern("match");
+#ifdef HAVE_RUBY_ENCODING_H
+    CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
+    i_encoding = rb_intern("encoding");
+    i_encode = rb_intern("encode");
+#endif
+    CJSON_SAFE_STATE_PROTOTYPE = Qnil;
+}
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
new file mode 100644
index 0000000000..37240a9c6b
--- /dev/null
+++ b/ext/json/generator/generator.h
@@ -0,0 +1,170 @@
+#ifndef _GENERATOR_H_
+#define _GENERATOR_H_
+
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+
+#include "ruby.h"
+
+#if HAVE_RUBY_RE_H
+#include "ruby/re.h"
+#endif
+
+#if HAVE_RE_H
+#include "re.h"
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
+#else
+#define FORCE_UTF8(obj)
+#endif
+
+#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
+
+#ifndef RHASH_SIZE
+#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
+#endif
+
+#ifndef RFLOAT_VALUE
+#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
+#endif
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(string) RSTRING(string)->ptr
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(string) RSTRING(string)->len
+#endif
+
+#define RSTRING_PAIR(string) RSTRING_PTR(string), RSTRING_LEN(string)
+
+/* fbuffer implementation */
+
+typedef struct FBufferStruct {
+    unsigned int initial_length;
+    char *ptr;
+    unsigned int len;
+    unsigned int capa;
+} FBuffer;
+
+#define FBUFFER_INITIAL_LENGTH 4096
+
+#define FBUFFER_PTR(fb) (fb->ptr)
+#define FBUFFER_LEN(fb) (fb->len)
+#define FBUFFER_CAPA(fb) (fb->capa)
+#define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb)
+
+static char *fstrndup(const char *ptr, int len);
+static FBuffer *fbuffer_alloc();
+static FBuffer *fbuffer_alloc_with_length(unsigned initial_length);
+static void fbuffer_free(FBuffer *fb);
+static void fbuffer_free_only_buffer(FBuffer *fb);
+static void fbuffer_clear(FBuffer *fb);
+static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned int len);
+static void fbuffer_append_long(FBuffer *fb, long number);
+static void fbuffer_append_char(FBuffer *fb, char newchr);
+static FBuffer *fbuffer_dup(FBuffer *fb);
+
+/* unicode defintions */
+
+#define UNI_STRICT_CONVERSION 1
+
+typedef unsigned long	UTF32;	/* at least 32 bits */
+typedef unsigned short	UTF16;	/* at least 16 bits */
+typedef unsigned char	UTF8;	/* typically 8 bits */
+
+#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
+#define UNI_MAX_BMP (UTF32)0x0000FFFF
+#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
+#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
+#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
+
+#define UNI_SUR_HIGH_START  (UTF32)0xD800
+#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
+#define UNI_SUR_LOW_START   (UTF32)0xDC00
+#define UNI_SUR_LOW_END     (UTF32)0xDFFF
+
+static const int halfShift  = 10; /* used for shifting by 10 bits */
+
+static const UTF32 halfBase = 0x0010000UL;
+static const UTF32 halfMask = 0x3FFUL;
+
+static unsigned char isLegalUTF8(const UTF8 *source, int length);
+static void unicode_escape(char *buf, UTF16 character);
+static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16 character);
+static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string);
+static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string);
+
+/* ruby api and some helpers */
+
+typedef struct JSON_Generator_StateStruct {
+    char *indent;
+    long indent_len;
+    char *space;
+    long space_len;
+    char *space_before;
+    long space_before_len;
+    char *object_nl;
+    long object_nl_len;
+    char *array_nl;
+    long array_nl_len;
+    FBuffer *array_delim;
+    FBuffer *object_delim;
+    FBuffer *object_delim2;
+    long max_nesting;
+    char allow_nan;
+    char ascii_only;
+} JSON_Generator_State;
+
+#define GET_STATE(self)                       \
+    JSON_Generator_State *state;              \
+    Data_Get_Struct(self, JSON_Generator_State, state)
+
+static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mString_included_s(VALUE self, VALUE modul);
+static VALUE mString_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mString_to_json_raw_object(VALUE self);
+static VALUE mString_to_json_raw(int argc, VALUE *argv, VALUE self);
+static VALUE mString_Extend_json_create(VALUE self, VALUE o);
+static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self);
+static void State_free(JSON_Generator_State *state);
+static JSON_Generator_State *State_allocate();
+static VALUE cState_s_allocate(VALUE klass);
+static VALUE cState_configure(VALUE self, VALUE opts);
+static VALUE cState_to_h(VALUE self);
+static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj, long depth);
+static VALUE cState_partial_generate(VALUE self, VALUE obj, VALUE depth);
+static VALUE cState_generate(VALUE self, VALUE obj);
+static VALUE cState_initialize(int argc, VALUE *argv, VALUE self);
+static VALUE cState_from_state_s(VALUE self, VALUE opts);
+static VALUE cState_indent(VALUE self);
+static VALUE cState_indent_set(VALUE self, VALUE indent);
+static VALUE cState_space(VALUE self);
+static VALUE cState_space_set(VALUE self, VALUE space);
+static VALUE cState_space_before(VALUE self);
+static VALUE cState_space_before_set(VALUE self, VALUE space_before);
+static VALUE cState_object_nl(VALUE self);
+static VALUE cState_object_nl_set(VALUE self, VALUE object_nl);
+static VALUE cState_array_nl(VALUE self);
+static VALUE cState_array_nl_set(VALUE self, VALUE array_nl);
+static VALUE cState_max_nesting(VALUE self);
+static VALUE cState_max_nesting_set(VALUE self, VALUE depth);
+static VALUE cState_allow_nan_p(VALUE self);
+static VALUE cState_ascii_only_p(VALUE self);
+
+#endif
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
new file mode 100644
index 0000000000..789b0de546
--- /dev/null
+++ b/ext/json/lib/json.rb
@@ -0,0 +1,10 @@
+require 'json/common'
+module JSON
+  require 'json/version'
+
+  begin
+    require 'json/ext'
+  rescue LoadError
+    require 'json/pure'
+  end
+end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
new file mode 100644
index 0000000000..03a00dded4
--- /dev/null
+++ b/ext/json/lib/json/add/core.rb
@@ -0,0 +1,148 @@
+# This file contains implementations of ruby core's custom objects for
+# serialisation/deserialisation.
+
+unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
+  ::JSON::JSON_LOADED
+  require 'json'
+end
+require 'date'
+
+class Symbol
+  def to_json(*a)
+    {
+      JSON.create_id => self.class.name,
+      's' => to_s,
+    }.to_json(*a)
+  end
+
+  def self.json_create(o)
+    o['s'].to_sym
+  end
+end
+
+class Time
+  def self.json_create(object)
+    if usec = object.delete('u') # used to be tv_usec -> tv_nsec
+      object['n'] = usec * 1000
+    end
+    if respond_to?(:tv_nsec)
+      at(*object.values_at('s', 'n'))
+    else
+      at(object['s'], object['n'] / 1000)
+    end
+  end
+
+  def to_json(*args)
+    {
+      JSON.create_id => self.class.name,
+      's' => tv_sec,
+      'n' => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
+    }.to_json(*args)
+  end
+end
+
+class Date
+  def self.json_create(object)
+    civil(*object.values_at('y', 'm', 'd', 'sg'))
+  end
+
+  alias start sg unless method_defined?(:start)
+
+  def to_json(*args)
+    {
+      JSON.create_id => self.class.name,
+      'y' => year,
+      'm' => month,
+      'd' => day,
+      'sg' => start,
+    }.to_json(*args)
+  end
+end
+
+class DateTime
+  def self.json_create(object)
+    args = object.values_at('y', 'm', 'd', 'H', 'M', 'S')
+    of_a, of_b = object['of'].split('/')
+    if of_b and of_b != '0'
+      args << Rational(of_a.to_i, of_b.to_i)
+    else
+      args << of_a
+    end
+    args << object['sg']
+    civil(*args)
+  end
+
+  alias start sg unless method_defined?(:start)
+
+  def to_json(*args)
+    {
+      JSON.create_id => self.class.name,
+      'y' => year,
+      'm' => month,
+      'd' => day,
+      'H' => hour,
+      'M' => min,
+      'S' => sec,
+      'of' => offset.to_s,
+      'sg' => start,
+    }.to_json(*args)
+  end
+end
+
+class Range
+  def self.json_create(object)
+    new(*object['a'])
+  end
+
+  def to_json(*args)
+    {
+      JSON.create_id   => self.class.name,
+      'a'         => [ first, last, exclude_end? ]
+    }.to_json(*args)
+  end
+end
+
+class Struct
+  def self.json_create(object)
+    new(*object['v'])
+  end
+
+  def to_json(*args)
+    klass = self.class.name
+    klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
+    {
+      JSON.create_id => klass,
+      'v'     => values,
+    }.to_json(*args)
+  end
+end
+
+class Exception
+  def self.json_create(object)
+    result = new(object['m'])
+    result.set_backtrace object['b']
+    result
+  end
+
+  def to_json(*args)
+    {
+      JSON.create_id => self.class.name,
+      'm'   => message,
+      'b' => backtrace,
+    }.to_json(*args)
+  end
+end
+
+class Regexp
+  def self.json_create(object)
+    new(object['s'], object['o'])
+  end
+
+  def to_json(*)
+    {
+      JSON.create_id => self.class.name,
+      'o' => options,
+      's' => source,
+    }.to_json
+  end
+end
diff --git a/ext/json/lib/json/add/rails.rb b/ext/json/lib/json/add/rails.rb
new file mode 100644
index 0000000000..8ce85efe57
--- /dev/null
+++ b/ext/json/lib/json/add/rails.rb
@@ -0,0 +1,58 @@
+# This file contains implementations of rails custom objects for
+# serialisation/deserialisation.
+
+unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
+  ::JSON::JSON_LOADED
+  require 'json'
+end
+
+class Object
+  def self.json_create(object)
+    obj = new
+    for key, value in object
+      next if key == JSON.create_id
+      instance_variable_set "@#{key}", value
+    end
+    obj
+  end
+
+  def to_json(*a)
+    result = {
+      JSON.create_id => self.class.name
+    }
+    instance_variables.inject(result) do |r, name|
+      r[name[1..-1]] = instance_variable_get name
+      r
+    end
+    result.to_json(*a)
+  end
+end
+
+class Symbol
+  def to_json(*a)
+    to_s.to_json(*a)
+  end
+end
+
+module Enumerable
+  def to_json(*a)
+    to_a.to_json(*a)
+  end
+end
+
+# class Regexp
+#   def to_json(*)
+#     inspect
+#   end
+# end
+#
+# The above rails definition has some problems:
+#
+# 1. { 'foo' => /bar/ }.to_json # => "{foo: /bar/}"
+#    This isn't valid JSON, because the regular expression syntax is not
+#    defined in RFC 4627. (And unquoted strings are disallowed there, too.)
+#    Though it is valid Javascript.
+#
+# 2. { 'foo' => /bar/mix }.to_json # => "{foo: /bar/mix}"
+#    This isn't even valid Javascript.
+
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
new file mode 100644
index 0000000000..244634b7a1
--- /dev/null
+++ b/ext/json/lib/json/common.rb
@@ -0,0 +1,397 @@
+require 'json/version'
+require 'iconv'
+
+module JSON
+  class << self
+    # If _object_ is string-like parse the string and return the parsed result
+    # as a Ruby data structure. Otherwise generate a JSON text from the Ruby
+    # data structure object and return it.
+    #
+    # The _opts_ argument is passed through to generate/parse respectively, see
+    # generate and parse for their documentation.
+    def [](object, opts = {})
+      if object.respond_to? :to_str
+        JSON.parse(object.to_str, opts => {})
+      else
+        JSON.generate(object, opts => {})
+      end
+    end
+
+    # Returns the JSON parser class, that is used by JSON. This might be either
+    # JSON::Ext::Parser or JSON::Pure::Parser.
+    attr_reader :parser
+
+    # Set the JSON parser class _parser_ to be used by JSON.
+    def parser=(parser) # :nodoc:
+      @parser = parser
+      remove_const :Parser if const_defined? :Parser
+      const_set :Parser, parser
+    end
+
+    # Return the constant located at _path_. The format of _path_ has to be
+    # either ::A::B::C or A::B::C. In any case A has to be located at the top
+    # level (absolute namespace path?). If there doesn't exist a constant at
+    # the given path, an ArgumentError is raised.
+    def deep_const_get(path) # :nodoc:
+      path.to_s.split(/::/).inject(Object) do |p, c|
+        case
+        when c.empty?             then p
+        when p.const_defined?(c)  then p.const_get(c)
+        else
+          begin
+            p.const_missing(c)
+          rescue NameError
+            raise ArgumentError, "can't find const #{path}"
+          end
+        end
+      end
+    end
+
+    # Set the module _generator_ to be used by JSON.
+    def generator=(generator) # :nodoc:
+      @generator = generator
+      generator_methods = generator::GeneratorMethods
+      for const in generator_methods.constants
+        klass = deep_const_get(const)
+        modul = generator_methods.const_get(const)
+        klass.class_eval do
+          instance_methods(false).each do |m|
+            m.to_s == 'to_json' and remove_method m
+          end
+          include modul
+        end
+      end
+      self.state = generator::State
+      const_set :State, self.state
+      const_set :SAFE_STATE_PROTOTYPE, State.new.freeze
+      const_set :FAST_STATE_PROTOTYPE, State.new(
+        :indent         => '',
+        :space          => '',
+        :object_nl      => "",
+        :array_nl       => "",
+        :max_nesting    => false
+      ).freeze
+      const_set :PRETTY_STATE_PROTOTYPE, State.new(
+        :indent         => '  ',
+        :space          => ' ',
+        :object_nl      => "\n",
+        :array_nl       => "\n"
+      ).freeze
+    end
+
+    # Returns the JSON generator modul, that is used by JSON. This might be
+    # either JSON::Ext::Generator or JSON::Pure::Generator.
+    attr_reader :generator
+
+    # Returns the JSON generator state class, that is used by JSON. This might
+    # be either JSON::Ext::Generator::State or JSON::Pure::Generator::State.
+    attr_accessor :state
+
+    # This is create identifier, that is used to decide, if the _json_create_
+    # hook of a class should be called. It defaults to 'json_class'.
+    attr_accessor :create_id
+  end
+  self.create_id = 'json_class'
+
+  NaN           = 0.0/0
+
+  Infinity      = 1.0/0
+
+  MinusInfinity = -Infinity
+
+  # The base exception for JSON errors.
+  class JSONError < StandardError; end
+
+  # This exception is raised, if a parser error occurs.
+  class ParserError < JSONError; end
+
+  # This exception is raised, if the nesting of parsed datastructures is too
+  # deep.
+  class NestingError < ParserError; end
+
+  # :stopdoc:
+  class CircularDatastructure < NestingError; end
+  # :startdoc:
+
+  # This exception is raised, if a generator or unparser error occurs.
+  class GeneratorError < JSONError; end
+  # For backwards compatibility
+  UnparserError = GeneratorError
+
+  # This exception is raised, if the required unicode support is missing on the
+  # system. Usually this means, that the iconv library is not installed.
+  class MissingUnicodeSupport < JSONError; end
+
+  module_function
+
+  # Parse the JSON document _source_ into a Ruby data structure and return it.
+  #
+  # _opts_ can have the following
+  # keys:
+  # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
+  #   structures. Disable depth checking with :max_nesting => false, it defaults
+  #   to 19.
+  # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
+  #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
+  #   to false.
+  # * *symbolize_names*: If set to true, returns symbols for the names
+  #   (keys) in a JSON object. Otherwise strings are returned, which is also
+  #   the default.
+  # * *create_additions*: If set to false, the Parser doesn't create
+  #   additions even if a matchin class and create_id was found. This option
+  #   defaults to true.
+  # * *object_class*: Defaults to Hash
+  # * *array_class*: Defaults to Array
+  def parse(source, opts = {})
+    Parser.new(source, opts).parse
+  end
+
+  # Parse the JSON document _source_ into a Ruby data structure and return it.
+  # The bang version of the parse method, defaults to the more dangerous values
+  # for the _opts_ hash, so be sure only to parse trusted _source_ documents.
+  #
+  # _opts_ can have the following keys:
+  # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
+  #   structures. Enable depth checking with :max_nesting => anInteger. The parse!
+  #   methods defaults to not doing max depth checking: This can be dangerous,
+  #   if someone wants to fill up your stack.
+  # * *allow_nan*: If set to true, allow NaN, Infinity, and -Infinity in
+  #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
+  #   to true.
+  # * *create_additions*: If set to false, the Parser doesn't create
+  #   additions even if a matchin class and create_id was found. This option
+  #   defaults to true.
+  def parse!(source, opts = {})
+    opts = {
+      :max_nesting  => false,
+      :allow_nan    => true
+    }.update(opts)
+    Parser.new(source, opts).parse
+  end
+
+  # Generate a JSON document from the Ruby data structure _obj_ and return
+  # it. _state_ is * a JSON::State object,
+  # * or a Hash like object (responding to to_hash),
+  # * an object convertible into a hash by a to_h method,
+  # that is used as or to configure a State object.
+  #
+  # It defaults to a state object, that creates the shortest possible JSON text
+  # in one line, checks for circular data structures and doesn't allow NaN,
+  # Infinity, and -Infinity.
+  #
+  # A _state_ hash can have the following keys:
+  # * *indent*: a string used to indent levels (default: ''),
+  # * *space*: a string that is put after, a : or , delimiter (default: ''),
+  # * *space_before*: a string that is put before a : pair delimiter (default: ''),
+  # * *object_nl*: a string that is put at the end of a JSON object (default: ''), 
+  # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
+  # * *allow_nan*: true if NaN, Infinity, and -Infinity should be
+  #   generated, otherwise an exception is thrown, if these values are
+  #   encountered. This options defaults to false.
+  # * *max_nesting*: The maximum depth of nesting allowed in the data
+  #   structures from which JSON is to be generated. Disable depth checking
+  #   with :max_nesting => false, it defaults to 19.
+  #
+  # See also the fast_generate for the fastest creation method with the least
+  # amount of sanity checks, and the pretty_generate method for some
+  # defaults for a pretty output.
+  def generate(obj, opts = nil)
+    if opts
+      if opts.respond_to? :to_hash
+        opts = opts.to_hash
+      elsif opts.respond_to? :to_h
+        opts = opts.to_h
+      else
+        raise TypeError, "can't convert #{opts.class} into Hash"
+      end
+      state = SAFE_STATE_PROTOTYPE.dup
+      state = state.configure(opts)
+    else
+      state = SAFE_STATE_PROTOTYPE
+    end
+    state.generate(obj)
+  end
+
+  # :stopdoc:
+  # I want to deprecate these later, so I'll first be silent about them, and
+  # later delete them.
+  alias unparse generate
+  module_function :unparse
+  # :startdoc:
+
+  # Generate a JSON document from the Ruby data structure _obj_ and return it.
+  # This method disables the checks for circles in Ruby objects.
+  #
+  # *WARNING*: Be careful not to pass any Ruby data structures with circles as
+  # _obj_ argument, because this will cause JSON to go into an infinite loop.
+  def fast_generate(obj, opts = nil)
+    if opts
+      if opts.respond_to? :to_hash
+        opts = opts.to_hash
+      elsif opts.respond_to? :to_h
+        opts = opts.to_h
+      else
+        raise TypeError, "can't convert #{opts.class} into Hash"
+      end
+      state = FAST_STATE_PROTOTYPE.dup
+      state.configure(opts)
+    else
+      state = FAST_STATE_PROTOTYPE
+    end
+    state.generate(obj)
+  end
+
+  # :stopdoc:
+  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
+  alias fast_unparse fast_generate
+  module_function :fast_unparse
+  # :startdoc:
+
+  # Generate a JSON document from the Ruby data structure _obj_ and return it.
+  # The returned document is a prettier form of the document returned by
+  # #unparse.
+  #
+  # The _opts_ argument can be used to configure the generator, see the
+  # generate method for a more detailed explanation.
+  def pretty_generate(obj, opts = nil)
+    if opts
+      if opts.respond_to? :to_hash
+        opts = opts.to_hash
+      elsif opts.respond_to? :to_h
+        opts = opts.to_h
+      else
+        raise TypeError, "can't convert #{opts.class} into Hash"
+      end
+      state = PRETTY_STATE_PROTOTYPE.dup
+      state.configure(opts)
+    else
+      state = PRETTY_STATE_PROTOTYPE
+    end
+    state.generate(obj)
+  end
+
+  # :stopdoc:
+  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
+  alias pretty_unparse pretty_generate
+  module_function :pretty_unparse
+  # :startdoc:
+
+  # Load a ruby data structure from a JSON _source_ and return it. A source can
+  # either be a string-like object, an IO like object, or an object responding
+  # to the read method. If _proc_ was given, it will be called with any nested
+  # Ruby object as an argument recursively in depth first order.
+  #
+  # This method is part of the implementation of the load/dump interface of
+  # Marshal and YAML.
+  def load(source, proc = nil)
+    if source.respond_to? :to_str
+      source = source.to_str
+    elsif source.respond_to? :to_io
+      source = source.to_io.read
+    else
+      source = source.read
+    end
+    result = parse(source, :max_nesting => false, :allow_nan => true)
+    recurse_proc(result, &proc) if proc
+    result
+  end
+
+  def recurse_proc(result, &proc)
+    case result
+    when Array
+      result.each { |x| recurse_proc x, &proc }
+      proc.call result
+    when Hash
+      result.each { |x, y| recurse_proc x, &proc; recurse_proc y, &proc }
+      proc.call result
+    else
+      proc.call result
+    end
+  end
+
+  alias restore load
+  module_function :restore
+
+  # Dumps _obj_ as a JSON string, i.e. calls generate on the object and returns
+  # the result.
+  #
+  # If anIO (an IO like object or an object that responds to the write method)
+  # was given, the resulting JSON is written to it.
+  #
+  # If the number of nested arrays or objects exceeds _limit_ an ArgumentError
+  # exception is raised. This argument is similar (but not exactly the
+  # same!) to the _limit_ argument in Marshal.dump.
+  #
+  # This method is part of the implementation of the load/dump interface of
+  # Marshal and YAML.
+  def dump(obj, anIO = nil, limit = nil)
+    if anIO and limit.nil?
+      anIO = anIO.to_io if anIO.respond_to?(:to_io)
+      unless anIO.respond_to?(:write)
+        limit = anIO
+        anIO = nil
+      end
+    end
+    limit ||= 0
+    result = generate(obj, :allow_nan => true, :max_nesting => limit)
+    if anIO
+      anIO.write result
+      anIO
+    else
+      result
+    end
+  rescue JSON::NestingError
+    raise ArgumentError, "exceed depth limit"
+  end
+
+  # Shortuct for iconv.
+  def self.iconv(to, from, string)
+    Iconv.iconv(to, from, string).first
+  end
+end
+
+module ::Kernel
+  private
+
+  # Outputs _objs_ to STDOUT as JSON strings in the shortest form, that is in
+  # one line.
+  def j(*objs)
+    objs.each do |obj|
+      puts JSON::generate(obj, :allow_nan => true, :max_nesting => false)
+    end
+    nil
+  end
+
+  # Ouputs _objs_ to STDOUT as JSON strings in a pretty format, with
+  # indentation and over many lines.
+  def jj(*objs)
+    objs.each do |obj|
+      puts JSON::pretty_generate(obj, :allow_nan => true, :max_nesting => false)
+    end
+    nil
+  end
+
+  # If _object_ is string-like parse the string and return the parsed result as
+  # a Ruby data structure. Otherwise generate a JSON text from the Ruby data
+  # structure object and return it.
+  #
+  # The _opts_ argument is passed through to generate/parse respectively, see
+  # generate and parse for their documentation.
+  def JSON(object, opts = {})
+    if object.respond_to? :to_str
+      JSON.parse(object.to_str, opts)
+    else
+      JSON.generate(object, opts)
+    end
+  end
+end
+
+class ::Class
+  # Returns true, if this class can be used to create an instance
+  # from a serialised JSON string. The class has to implement a class
+  # method _json_create_ that expects a hash as first parameter, which includes
+  # the required data.
+  def json_creatable?
+    respond_to?(:json_create)
+  end
+end
diff --git a/ext/json/lib/json/editor.rb b/ext/json/lib/json/editor.rb
new file mode 100644
index 0000000000..1e13f33c8c
--- /dev/null
+++ b/ext/json/lib/json/editor.rb
@@ -0,0 +1,1371 @@
+# To use the GUI JSON editor, start the edit_json.rb executable script. It
+# requires ruby-gtk to be installed.
+
+require 'gtk2'
+require 'iconv'
+require 'json'
+require 'rbconfig'
+require 'open-uri'
+
+module JSON
+  module Editor
+    include Gtk
+
+    # Beginning of the editor window title
+    TITLE                 = 'JSON Editor'.freeze
+
+    # Columns constants
+    ICON_COL, TYPE_COL, CONTENT_COL = 0, 1, 2
+
+    # JSON primitive types (Containers)
+    CONTAINER_TYPES = %w[Array Hash].sort
+    # All JSON primitive types
+    ALL_TYPES = (%w[TrueClass FalseClass Numeric String NilClass] +
+                 CONTAINER_TYPES).sort
+
+    # The Nodes necessary for the tree representation of a JSON document
+    ALL_NODES = (ALL_TYPES + %w[Key]).sort
+
+    DEFAULT_DIALOG_KEY_PRESS_HANDLER = lambda do |dialog, event|
+      case event.keyval
+      when Gdk::Keyval::GDK_Return
+        dialog.response Dialog::RESPONSE_ACCEPT
+      when Gdk::Keyval::GDK_Escape
+        dialog.response Dialog::RESPONSE_REJECT
+      end
+    end
+
+    # Returns the Gdk::Pixbuf of the icon named _name_ from the icon cache.
+    def Editor.fetch_icon(name)
+      @icon_cache ||= {}
+      unless @icon_cache.key?(name)
+        path = File.dirname(__FILE__)
+        @icon_cache[name] = Gdk::Pixbuf.new(File.join(path, name + '.xpm'))
+      end
+     @icon_cache[name]
+    end
+
+    # Opens an error dialog on top of _window_ showing the error message
+    # _text_.
+    def Editor.error_dialog(window, text)
+      dialog = MessageDialog.new(window, Dialog::MODAL, 
+        MessageDialog::ERROR, 
+        MessageDialog::BUTTONS_CLOSE, text)
+      dialog.show_all
+      dialog.run
+    rescue TypeError
+      dialog = MessageDialog.new(Editor.window, Dialog::MODAL, 
+        MessageDialog::ERROR, 
+        MessageDialog::BUTTONS_CLOSE, text)
+      dialog.show_all
+      dialog.run
+    ensure
+      dialog.destroy if dialog
+    end
+
+    # Opens a yes/no question dialog on top of _window_ showing the error
+    # message _text_. If yes was answered _true_ is returned, otherwise
+    # _false_.
+    def Editor.question_dialog(window, text)
+      dialog = MessageDialog.new(window, Dialog::MODAL, 
+        MessageDialog::QUESTION, 
+        MessageDialog::BUTTONS_YES_NO, text)
+      dialog.show_all
+      dialog.run do |response|
+        return Gtk::Dialog::RESPONSE_YES === response
+      end
+    ensure
+      dialog.destroy if dialog
+    end
+
+    # Convert the tree model starting from Gtk::TreeIter _iter_ into a Ruby
+    # data structure and return it.
+    def Editor.model2data(iter)
+      return nil if iter.nil?
+      case iter.type
+      when 'Hash'
+        hash = {}
+        iter.each { |c| hash[c.content] = Editor.model2data(c.first_child) }
+        hash
+      when 'Array'
+        array = Array.new(iter.n_children)
+        iter.each_with_index { |c, i| array[i] = Editor.model2data(c) }
+        array
+      when 'Key'
+        iter.content
+      when 'String'
+        iter.content
+      when 'Numeric'
+        content = iter.content
+        if /\./.match(content)
+          content.to_f
+        else
+          content.to_i
+        end
+      when 'TrueClass'
+        true
+      when 'FalseClass'
+        false
+      when 'NilClass'
+        nil
+      else
+        fail "Unknown type found in model: #{iter.type}"
+      end
+    end
+
+    # Convert the Ruby data structure _data_ into tree model data for Gtk and
+    # returns the whole model. If the parameter _model_ wasn't given a new
+    # Gtk::TreeStore is created as the model. The _parent_ parameter specifies
+    # the parent node (iter, Gtk:TreeIter instance) to which the data is
+    # appended, alternativeley the result of the yielded block is used as iter.
+    def Editor.data2model(data, model = nil, parent = nil)
+      model ||= TreeStore.new(Gdk::Pixbuf, String, String)
+      iter = if block_given?
+        yield model
+      else
+        model.append(parent)
+      end
+      case data
+      when Hash
+        iter.type = 'Hash'
+        data.sort.each do |key, value|
+          pair_iter = model.append(iter)
+          pair_iter.type    = 'Key'
+          pair_iter.content = key.to_s
+          Editor.data2model(value, model, pair_iter)
+        end
+      when Array
+        iter.type = 'Array'
+        data.each do |value|
+          Editor.data2model(value, model, iter)
+        end
+      when Numeric
+        iter.type = 'Numeric'
+        iter.content = data.to_s
+      when String, true, false, nil
+        iter.type    = data.class.name
+        iter.content = data.nil? ? 'null' : data.to_s
+      else
+        iter.type    = 'String'
+        iter.content = data.to_s
+      end
+      model
+    end
+
+    # The Gtk::TreeIter class is reopened and some auxiliary methods are added.
+    class Gtk::TreeIter
+      include Enumerable
+
+      # Traverse each of this Gtk::TreeIter instance's children
+      # and yield to them.
+      def each
+        n_children.times { |i| yield nth_child(i) }
+      end
+
+      # Recursively traverse all nodes of this Gtk::TreeIter's subtree
+      # (including self) and yield to them.
+      def recursive_each(&block)
+        yield self
+        each do |i|
+          i.recursive_each(&block)
+        end
+      end
+
+      # Remove the subtree of this Gtk::TreeIter instance from the
+      # model _model_.
+      def remove_subtree(model)
+        while current = first_child
+          model.remove(current)
+        end
+      end
+
+      # Returns the type of this node.
+      def type
+        self[TYPE_COL]
+      end
+
+      # Sets the type of this node to _value_. This implies setting
+      # the respective icon accordingly.
+      def type=(value)
+        self[TYPE_COL] = value
+        self[ICON_COL] = Editor.fetch_icon(value)
+      end
+
+      # Returns the content of this node.
+      def content
+        self[CONTENT_COL]
+      end
+
+      # Sets the content of this node to _value_.
+      def content=(value)
+        self[CONTENT_COL] = value
+      end
+    end
+
+    # This module bundles some method, that can be used to create a menu. It
+    # should be included into the class in question.
+    module MenuExtension
+      include Gtk
+
+      # Creates a Menu, that includes MenuExtension. _treeview_ is the
+      # Gtk::TreeView, on which it operates.
+      def initialize(treeview)
+        @treeview = treeview
+        @menu = Menu.new
+      end
+
+      # Returns the Gtk::TreeView of this menu.
+      attr_reader :treeview
+
+      # Returns the menu.
+      attr_reader :menu
+
+      # Adds a Gtk::SeparatorMenuItem to this instance's #menu.
+      def add_separator
+        menu.append SeparatorMenuItem.new
+      end
+
+      # Adds a Gtk::MenuItem to this instance's #menu. _label_ is the label
+      # string, _klass_ is the item type, and _callback_ is the procedure, that
+      # is called if the _item_ is activated.
+      def add_item(label, keyval = nil, klass = MenuItem, &callback)
+        label = "#{label} (C-#{keyval.chr})" if keyval
+        item = klass.new(label)
+        item.signal_connect(:activate, &callback)
+        if keyval
+          self.signal_connect(:'key-press-event') do |item, event|
+            if event.state & Gdk::Window::ModifierType::CONTROL_MASK != 0 and
+              event.keyval == keyval
+              callback.call item
+            end
+          end
+        end
+        menu.append item
+        item
+      end
+
+      # This method should be implemented in subclasses to create the #menu of
+      # this instance. It has to be called after an instance of this class is
+      # created, to build the menu.
+      def create
+        raise NotImplementedError
+      end
+
+      def method_missing(*a, &b)
+        treeview.__send__(*a, &b)
+      end
+    end
+
+    # This class creates the popup menu, that opens when clicking onto the
+    # treeview.
+    class PopUpMenu
+      include MenuExtension
+
+      # Change the type or content of the selected node.
+      def change_node(item)
+        if current = selection.selected
+          parent = current.parent
+          old_type, old_content = current.type, current.content
+          if ALL_TYPES.include?(old_type)
+            @clipboard_data = Editor.model2data(current)
+            type, content = ask_for_element(parent, current.type,
+              current.content)
+            if type
+              current.type, current.content = type, content
+              current.remove_subtree(model)
+              toplevel.display_status("Changed a node in tree.")
+              window.change
+            end
+          else
+            toplevel.display_status(
+              "Cannot change node of type #{old_type} in tree!")
+          end
+        end
+      end
+
+      # Cut the selected node and its subtree, and save it into the
+      # clipboard.
+      def cut_node(item)
+        if current = selection.selected
+          if current and current.type == 'Key'
+            @clipboard_data = {
+              current.content => Editor.model2data(current.first_child)
+            }
+          else
+            @clipboard_data = Editor.model2data(current)
+          end
+          model.remove(current)
+          window.change
+          toplevel.display_status("Cut a node from tree.")
+        end
+      end
+
+      # Copy the selected node and its subtree, and save it into the
+      # clipboard.
+      def copy_node(item)
+        if current = selection.selected
+          if current and current.type == 'Key'
+            @clipboard_data = {
+              current.content => Editor.model2data(current.first_child)
+            }
+          else
+            @clipboard_data = Editor.model2data(current)
+          end
+          window.change
+          toplevel.display_status("Copied a node from tree.")
+        end
+      end
+
+      # Paste the data in the clipboard into the selected Array or Hash by
+      # appending it.
+      def paste_node_appending(item)
+        if current = selection.selected
+          if @clipboard_data
+            case current.type
+            when 'Array'
+              Editor.data2model(@clipboard_data, model, current)
+              expand_collapse(current)
+            when 'Hash'
+              if @clipboard_data.is_a? Hash
+                parent = current.parent
+                hash = Editor.model2data(current)
+                model.remove(current)
+                hash.update(@clipboard_data)
+                Editor.data2model(hash, model, parent)
+                if parent
+                  expand_collapse(parent)
+                elsif @expanded
+                  expand_all
+                end
+                window.change
+              else
+                toplevel.display_status(
+                  "Cannot paste non-#{current.type} data into '#{current.type}'!")
+              end
+            else
+              toplevel.display_status(
+                "Cannot paste node below '#{current.type}'!")
+            end
+          else
+            toplevel.display_status("Nothing to paste in clipboard!")
+          end
+        else
+            toplevel.display_status("Append a node into the root first!")
+        end
+      end
+
+      # Paste the data in the clipboard into the selected Array inserting it
+      # before the selected element.
+      def paste_node_inserting_before(item)
+        if current = selection.selected
+          if @clipboard_data
+            parent = current.parent or return
+            parent_type = parent.type
+            if parent_type == 'Array'
+              selected_index = parent.each_with_index do |c, i|
+                break i if c == current
+              end
+              Editor.data2model(@clipboard_data, model, parent) do |m|
+                m.insert_before(parent, current)
+              end
+              expand_collapse(current)
+              toplevel.display_status("Inserted an element to " +
+                "'#{parent_type}' before index #{selected_index}.")
+              window.change
+            else
+              toplevel.display_status(
+                "Cannot insert node below '#{parent_type}'!")
+            end
+          else
+            toplevel.display_status("Nothing to paste in clipboard!")
+          end
+        else
+            toplevel.display_status("Append a node into the root first!")
+        end
+      end
+
+      # Append a new node to the selected Hash or Array.
+      def append_new_node(item)
+        if parent = selection.selected
+          parent_type = parent.type
+          case parent_type
+          when 'Hash'
+            key, type, content = ask_for_hash_pair(parent)
+            key or return
+            iter = create_node(parent, 'Key', key)
+            iter = create_node(iter, type, content)
+            toplevel.display_status(
+              "Added a (key, value)-pair to '#{parent_type}'.")
+            window.change
+          when 'Array'
+            type, content = ask_for_element(parent)
+            type or return
+            iter = create_node(parent, type, content)
+            window.change
+            toplevel.display_status("Appendend an element to '#{parent_type}'.")
+          else
+            toplevel.display_status("Cannot append to '#{parent_type}'!")
+          end
+        else
+          type, content = ask_for_element
+          type or return
+          iter = create_node(nil, type, content)
+          window.change
+        end
+      end
+
+      # Insert a new node into an Array before the selected element.
+      def insert_new_node(item)
+        if current = selection.selected
+          parent = current.parent or return
+          parent_parent = parent.parent
+          parent_type = parent.type
+          if parent_type == 'Array'
+            selected_index = parent.each_with_index do |c, i|
+              break i if c == current
+            end
+            type, content = ask_for_element(parent)
+            type or return
+            iter = model.insert_before(parent, current)
+            iter.type, iter.content = type, content
+            toplevel.display_status("Inserted an element to " +
+              "'#{parent_type}' before index #{selected_index}.")
+            window.change
+          else
+            toplevel.display_status(
+              "Cannot insert node below '#{parent_type}'!")
+          end
+        else
+            toplevel.display_status("Append a node into the root first!")
+        end
+      end
+
+      # Recursively collapse/expand a subtree starting from the selected node.
+      def collapse_expand(item)
+        if current = selection.selected
+          if row_expanded?(current.path)
+            collapse_row(current.path)
+          else
+            expand_row(current.path, true)
+          end
+        else
+            toplevel.display_status("Append a node into the root first!")
+        end
+      end
+
+      # Create the menu.
+      def create
+        add_item("Change node", ?n, &method(:change_node))
+        add_separator
+        add_item("Cut node", ?X, &method(:cut_node))
+        add_item("Copy node", ?C, &method(:copy_node))
+        add_item("Paste node (appending)", ?A, &method(:paste_node_appending))
+        add_item("Paste node (inserting before)", ?I,
+          &method(:paste_node_inserting_before))
+        add_separator
+        add_item("Append new node", ?a, &method(:append_new_node))
+        add_item("Insert new node before", ?i, &method(:insert_new_node))
+        add_separator 
+        add_item("Collapse/Expand node (recursively)", ?e,
+          &method(:collapse_expand))
+
+        menu.show_all
+        signal_connect(:button_press_event) do |widget, event|
+          if event.kind_of? Gdk::EventButton and event.button == 3
+            menu.popup(nil, nil, event.button, event.time)
+          end
+        end
+        signal_connect(:popup_menu) do
+          menu.popup(nil, nil, 0, Gdk::Event::CURRENT_TIME)
+        end
+      end
+    end
+
+    # This class creates the File pulldown menu.
+    class FileMenu
+      include MenuExtension
+
+      # Clear the model and filename, but ask to save the JSON document, if
+      # unsaved changes have occured.
+      def new(item)
+        window.clear
+      end
+
+      # Open a file and load it into the editor. Ask to save the JSON document
+      # first, if unsaved changes have occured.
+      def open(item)
+        window.file_open
+      end
+
+      def open_location(item)
+        window.location_open
+      end
+
+      # Revert the current JSON document in the editor to the saved version.
+      def revert(item)
+        window.instance_eval do
+          @filename and file_open(@filename) 
+        end
+      end
+
+      # Save the current JSON document.
+      def save(item)
+        window.file_save
+      end
+
+      # Save the current JSON document under the given filename.
+      def save_as(item)
+        window.file_save_as
+      end
+
+      # Quit the editor, after asking to save any unsaved changes first.
+      def quit(item)
+        window.quit
+      end
+
+      # Create the menu.
+      def create
+        title = MenuItem.new('File')
+        title.submenu = menu
+        add_item('New', &method(:new))
+        add_item('Open', ?o, &method(:open))
+        add_item('Open location', ?l, &method(:open_location))
+        add_item('Revert', &method(:revert))
+        add_separator
+        add_item('Save', ?s, &method(:save))
+        add_item('Save As', ?S, &method(:save_as))
+        add_separator
+        add_item('Quit', ?q, &method(:quit))
+        title
+      end
+    end
+
+    # This class creates the Edit pulldown menu.
+    class EditMenu
+      include MenuExtension
+
+      # Copy data from model into primary clipboard.
+      def copy(item)
+        data = Editor.model2data(model.iter_first)
+        json = JSON.pretty_generate(data, :max_nesting => false)
+        c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
+        c.text = json
+      end
+
+      # Copy json text from primary clipboard into model.
+      def paste(item)
+        c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
+        if json = c.wait_for_text
+          window.ask_save if @changed
+          begin
+            window.edit json
+          rescue JSON::ParserError
+            window.clear
+          end
+        end
+      end
+
+      # Find a string in all nodes' contents and select the found node in the
+      # treeview.
+      def find(item)
+        @search = ask_for_find_term(@search) or return
+        iter = model.get_iter('0') or return
+        iter.recursive_each do |i|
+          if @iter
+            if @iter != i
+              next
+            else
+              @iter = nil
+              next
+            end
+          elsif @search.match(i[CONTENT_COL])
+             set_cursor(i.path, nil, false)
+             @iter = i
+             break
+          end
+        end
+      end
+
+      # Repeat the last search given by #find.
+      def find_again(item)
+        @search or return
+        iter = model.get_iter('0')
+        iter.recursive_each do |i|
+          if @iter
+            if @iter != i
+              next
+            else
+              @iter = nil
+              next
+            end
+          elsif @search.match(i[CONTENT_COL])
+             set_cursor(i.path, nil, false)
+             @iter = i
+             break
+          end
+        end
+      end
+
+      # Sort (Reverse sort) all elements of the selected array by the given
+      # expression. _x_ is the element in question.
+      def sort(item)
+        if current = selection.selected
+          if current.type == 'Array'
+            parent = current.parent
+            ary = Editor.model2data(current)
+            order, reverse = ask_for_order
+            order or return
+            begin
+              block = eval "lambda { |x| #{order} }"
+              if reverse
+                ary.sort! { |a,b| block[b] <=> block[a] }
+              else
+                ary.sort! { |a,b| block[a] <=> block[b] }
+              end
+            rescue => e
+              Editor.error_dialog(self, "Failed to sort Array with #{order}: #{e}!")
+            else
+              Editor.data2model(ary, model, parent) do |m|
+                m.insert_before(parent, current)
+              end
+              model.remove(current)
+              expand_collapse(parent)
+              window.change
+              toplevel.display_status("Array has been sorted.")
+            end
+          else
+            toplevel.display_status("Only Array nodes can be sorted!")
+          end
+        else
+            toplevel.display_status("Select an Array to sort first!")
+        end
+      end
+
+      # Create the menu.
+      def create
+        title = MenuItem.new('Edit')
+        title.submenu = menu
+        add_item('Copy', ?c, &method(:copy))
+        add_item('Paste', ?v, &method(:paste))
+        add_separator
+        add_item('Find', ?f, &method(:find))
+        add_item('Find Again', ?g, &method(:find_again))
+        add_separator
+        add_item('Sort', ?S, &method(:sort))
+        title
+      end
+    end
+
+    class OptionsMenu
+      include MenuExtension
+
+      # Collapse/Expand all nodes by default.
+      def collapsed_nodes(item)
+        if expanded
+          self.expanded = false
+          collapse_all
+        else
+          self.expanded = true
+          expand_all 
+        end
+      end
+
+      # Toggle pretty saving mode on/off.
+      def pretty_saving(item)
+        @pretty_item.toggled
+        window.change
+      end
+
+      attr_reader :pretty_item
+
+      # Create the menu.
+      def create
+        title = MenuItem.new('Options')
+        title.submenu = menu
+        add_item('Collapsed nodes', nil, CheckMenuItem, &method(:collapsed_nodes))
+        @pretty_item = add_item('Pretty saving', nil, CheckMenuItem,
+          &method(:pretty_saving))
+        @pretty_item.active = true
+        window.unchange
+        title
+      end
+    end
+
+    # This class inherits from Gtk::TreeView, to configure it and to add a lot
+    # of behaviour to it.
+    class JSONTreeView < Gtk::TreeView
+      include Gtk
+
+      # Creates a JSONTreeView instance, the parameter _window_ is
+      # a MainWindow instance and used for self delegation.
+      def initialize(window)
+        @window = window
+        super(TreeStore.new(Gdk::Pixbuf, String, String))
+        self.selection.mode = SELECTION_BROWSE
+
+        @expanded = false
+        self.headers_visible = false
+        add_columns
+        add_popup_menu
+      end
+
+      # Returns the MainWindow instance of this JSONTreeView.
+      attr_reader :window
+
+      # Returns true, if nodes are autoexpanding, false otherwise.
+      attr_accessor :expanded
+
+      private
+
+      def add_columns
+        cell = CellRendererPixbuf.new
+        column = TreeViewColumn.new('Icon', cell,
+          'pixbuf'      => ICON_COL
+        )
+        append_column(column)
+
+        cell = CellRendererText.new
+        column = TreeViewColumn.new('Type', cell,
+          'text'      => TYPE_COL
+        )
+        append_column(column)
+
+        cell = CellRendererText.new
+        cell.editable = true
+        column = TreeViewColumn.new('Content', cell,
+          'text'       => CONTENT_COL
+        )
+        cell.signal_connect(:edited, &method(:cell_edited))
+        append_column(column)
+      end
+
+      def unify_key(iter, key)
+        return unless iter.type == 'Key'
+        parent = iter.parent
+        if parent.any? { |c| c != iter and c.content == key }
+          old_key = key
+          i = 0
+          begin
+            key = sprintf("%s.%d", old_key, i += 1)
+          end while parent.any? { |c| c != iter and c.content == key }
+        end
+        iter.content = key
+      end
+
+      def cell_edited(cell, path, value)
+        iter = model.get_iter(path)
+        case iter.type
+        when 'Key'
+          unify_key(iter, value)
+          toplevel.display_status('Key has been changed.')
+        when 'FalseClass'
+          value.downcase!
+          if value == 'true'
+            iter.type, iter.content = 'TrueClass', 'true'
+          end
+        when 'TrueClass'
+          value.downcase!
+          if value == 'false'
+            iter.type, iter.content = 'FalseClass', 'false'
+          end
+        when 'Numeric'
+          iter.content =
+            if value == 'Infinity'
+              value
+            else
+              (Integer(value) rescue Float(value) rescue 0).to_s
+            end
+        when 'String'
+          iter.content = value
+        when 'Hash', 'Array'
+          return
+        else
+          fail "Unknown type found in model: #{iter.type}"
+        end
+        window.change
+      end
+
+      def configure_value(value, type)
+        value.editable = false
+        case type
+        when 'Array', 'Hash'
+          value.text = ''
+        when 'TrueClass'
+          value.text = 'true'
+        when 'FalseClass'
+          value.text = 'false'
+        when 'NilClass'
+          value.text = 'null'
+        when 'Numeric', 'String'
+          value.text ||= ''
+          value.editable = true
+        else
+          raise ArgumentError, "unknown type '#{type}' encountered"
+        end
+      end
+
+      def add_popup_menu
+        menu = PopUpMenu.new(self)
+        menu.create
+      end
+
+      public
+
+      # Create a _type_ node with content _content_, and add it to _parent_
+      # in the model. If _parent_ is nil, create a new model and put it into
+      # the editor treeview.
+      def create_node(parent, type, content)
+        iter = if parent
+          model.append(parent)
+        else
+          new_model = Editor.data2model(nil)
+          toplevel.view_new_model(new_model)
+          new_model.iter_first
+        end
+        iter.type, iter.content = type, content
+        expand_collapse(parent) if parent
+        iter
+      end
+
+      # Ask for a hash key, value pair to be added to the Hash node _parent_.
+      def ask_for_hash_pair(parent)
+        key_input = type_input = value_input = nil
+
+        dialog = Dialog.new("New (key, value) pair for Hash", nil, nil,
+          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
+          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
+        )
+        dialog.width_request = 640
+
+        hbox = HBox.new(false, 5)
+        hbox.pack_start(Label.new("Key:"), false)
+        hbox.pack_start(key_input = Entry.new)
+        key_input.text = @key || ''
+        dialog.vbox.pack_start(hbox, false)
+        key_input.signal_connect(:activate) do
+          if parent.any? { |c| c.content == key_input.text }
+            toplevel.display_status('Key already exists in Hash!')
+            key_input.text = ''
+          else
+            toplevel.display_status('Key has been changed.')
+          end
+        end
+
+        hbox = HBox.new(false, 5)
+        hbox.pack_start(Label.new("Type:"), false)
+        hbox.pack_start(type_input = ComboBox.new(true))
+        ALL_TYPES.each { |t| type_input.append_text(t) }
+        type_input.active = @type || 0
+        dialog.vbox.pack_start(hbox, false)
+
+        type_input.signal_connect(:changed) do
+          value_input.editable = false
+          case ALL_TYPES[type_input.active]
+          when 'Array', 'Hash'
+            value_input.text = ''
+          when 'TrueClass'
+            value_input.text = 'true'
+          when 'FalseClass'
+            value_input.text = 'false'
+          when 'NilClass'
+            value_input.text = 'null'
+          else
+            value_input.text = ''
+            value_input.editable = true
+          end
+        end
+
+        hbox = HBox.new(false, 5)
+        hbox.pack_start(Label.new("Value:"), false)
+        hbox.pack_start(value_input = Entry.new)
+        value_input.width_chars = 60
+        value_input.text = @value || ''
+        dialog.vbox.pack_start(hbox, false)
+
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
+        dialog.show_all
+        self.focus = dialog
+        dialog.run do |response| 
+          if response == Dialog::RESPONSE_ACCEPT
+            @key = key_input.text
+            type = ALL_TYPES[@type = type_input.active]
+            content = value_input.text
+            return @key, type, content
+          end
+        end
+        return
+      ensure
+        dialog.destroy
+      end
+
+      # Ask for an element to be appended _parent_.
+      def ask_for_element(parent = nil, default_type = nil, value_text = @content)
+        type_input = value_input = nil
+
+        dialog = Dialog.new(
+          "New element into #{parent ? parent.type : 'root'}",
+          nil, nil,
+          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
+          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
+        )
+        hbox = HBox.new(false, 5)
+        hbox.pack_start(Label.new("Type:"), false)
+        hbox.pack_start(type_input = ComboBox.new(true))
+        default_active = 0
+        types = parent ? ALL_TYPES : CONTAINER_TYPES
+        types.each_with_index do |t, i|
+          type_input.append_text(t)
+          if t == default_type
+            default_active = i
+          end
+        end
+        type_input.active = default_active
+        dialog.vbox.pack_start(hbox, false)
+        type_input.signal_connect(:changed) do
+          configure_value(value_input, types[type_input.active])
+        end
+
+        hbox = HBox.new(false, 5)
+        hbox.pack_start(Label.new("Value:"), false)
+        hbox.pack_start(value_input = Entry.new)
+        value_input.width_chars = 60
+        value_input.text = value_text if value_text
+        configure_value(value_input, types[type_input.active])
+
+        dialog.vbox.pack_start(hbox, false)
+
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
+        dialog.show_all
+        self.focus = dialog
+        dialog.run do |response| 
+          if response == Dialog::RESPONSE_ACCEPT
+            type = types[type_input.active]
+            @content = case type
+            when 'Numeric'
+              if (t = value_input.text) == 'Infinity'
+                1 / 0.0
+              else
+                Integer(t) rescue Float(t) rescue 0
+              end
+            else
+              value_input.text
+            end.to_s
+            return type, @content
+          end
+        end
+        return
+      ensure
+        dialog.destroy if dialog
+      end
+
+      # Ask for an order criteria for sorting, using _x_ for the element in
+      # question. Returns the order criterium, and true/false for reverse
+      # sorting.
+      def ask_for_order
+        dialog = Dialog.new(
+          "Give an order criterium for 'x'.",
+          nil, nil,
+          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
+          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
+        )
+        hbox = HBox.new(false, 5)
+
+        hbox.pack_start(Label.new("Order:"), false)
+        hbox.pack_start(order_input = Entry.new)
+        order_input.text = @order || 'x'
+        order_input.width_chars = 60
+
+        hbox.pack_start(reverse_checkbox = CheckButton.new('Reverse'), false)
+
+        dialog.vbox.pack_start(hbox, false)
+
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
+        dialog.show_all
+        self.focus = dialog
+        dialog.run do |response| 
+          if response == Dialog::RESPONSE_ACCEPT
+            return @order = order_input.text, reverse_checkbox.active?
+          end
+        end
+        return
+      ensure
+        dialog.destroy if dialog
+      end
+
+      # Ask for a find term to search for in the tree. Returns the term as a
+      # string.
+      def ask_for_find_term(search = nil)
+        dialog = Dialog.new(
+          "Find a node matching regex in tree.",
+          nil, nil,
+          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
+          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
+        )
+        hbox = HBox.new(false, 5)
+
+        hbox.pack_start(Label.new("Regex:"), false)
+        hbox.pack_start(regex_input = Entry.new)
+        hbox.pack_start(icase_checkbox = CheckButton.new('Icase'), false)
+        regex_input.width_chars = 60
+        if search
+          regex_input.text = search.source
+          icase_checkbox.active = search.casefold?
+        end
+
+        dialog.vbox.pack_start(hbox, false)
+
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
+        dialog.show_all
+        self.focus = dialog
+        dialog.run do |response| 
+          if response == Dialog::RESPONSE_ACCEPT
+            begin
+              return Regexp.new(regex_input.text, icase_checkbox.active? ? Regexp::IGNORECASE : 0)
+            rescue => e
+              Editor.error_dialog(self, "Evaluation of regex /#{regex_input.text}/ failed: #{e}!")
+              return
+            end
+          end
+        end
+        return
+      ensure
+        dialog.destroy if dialog
+      end
+
+      # Expand or collapse row pointed to by _iter_ according
+      # to the #expanded attribute.
+      def expand_collapse(iter)
+        if expanded
+          expand_row(iter.path, true)
+        else
+          collapse_row(iter.path)
+        end
+      end
+    end
+
+    # The editor main window
+    class MainWindow < Gtk::Window
+      include Gtk
+
+      def initialize(encoding)
+        @changed  = false
+        @encoding = encoding
+        super(TOPLEVEL)
+        display_title
+        set_default_size(800, 600)
+        signal_connect(:delete_event) { quit }
+
+        vbox = VBox.new(false, 0)
+        add(vbox)
+        #vbox.border_width = 0
+
+        @treeview = JSONTreeView.new(self)
+        @treeview.signal_connect(:'cursor-changed') do
+          display_status('')
+        end
+
+        menu_bar = create_menu_bar
+        vbox.pack_start(menu_bar, false, false, 0)
+
+        sw = ScrolledWindow.new(nil, nil)
+        sw.shadow_type = SHADOW_ETCHED_IN
+        sw.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
+        vbox.pack_start(sw, true, true, 0)
+        sw.add(@treeview)
+
+        @status_bar = Statusbar.new
+        vbox.pack_start(@status_bar, false, false, 0)
+
+        @filename ||= nil
+        if @filename
+          data = read_data(@filename)
+          view_new_model Editor.data2model(data)
+        end
+
+        signal_connect(:button_release_event) do |_,event|
+          if event.button == 2
+            c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
+            if url = c.wait_for_text
+              location_open url
+            end
+            false
+          else
+            true
+          end
+        end
+      end
+
+      # Creates the menu bar with the pulldown menus and returns it.
+      def create_menu_bar
+        menu_bar = MenuBar.new
+        @file_menu = FileMenu.new(@treeview)
+        menu_bar.append @file_menu.create
+        @edit_menu = EditMenu.new(@treeview)
+        menu_bar.append @edit_menu.create
+        @options_menu = OptionsMenu.new(@treeview)
+        menu_bar.append @options_menu.create
+        menu_bar
+      end
+
+      # Sets editor status to changed, to indicate that the edited data
+      # containts unsaved changes.
+      def change
+        @changed = true
+        display_title
+      end
+
+      # Sets editor status to unchanged, to indicate that the edited data
+      # doesn't containt unsaved changes.
+      def unchange
+        @changed = false
+        display_title
+      end
+
+      # Puts a new model _model_ into the Gtk::TreeView to be edited.
+      def view_new_model(model)
+        @treeview.model     = model
+        @treeview.expanded  = true
+        @treeview.expand_all
+        unchange
+      end
+
+      # Displays _text_ in the status bar.
+      def display_status(text)
+        @cid ||= nil
+        @status_bar.pop(@cid) if @cid
+        @cid = @status_bar.get_context_id('dummy')
+        @status_bar.push(@cid, text)
+      end
+
+      # Opens a dialog, asking, if changes should be saved to a file.
+      def ask_save
+        if Editor.question_dialog(self,
+          "Unsaved changes to JSON model. Save?")
+          if @filename
+            file_save
+          else
+            file_save_as
+          end
+        end
+      end
+
+      # Quit this editor, that is, leave this editor's main loop.
+      def quit
+        ask_save if @changed
+        if Gtk.main_level > 0
+          destroy
+          Gtk.main_quit
+        end
+        nil
+      end
+
+      # Display the new title according to the editor's current state.
+      def display_title
+        title = TITLE.dup
+        title << ": #@filename" if @filename
+        title << " *" if @changed
+        self.title = title
+      end
+
+      # Clear the current model, after asking to save all unsaved changes.
+      def clear
+        ask_save if @changed
+        @filename = nil
+        self.view_new_model nil
+      end
+
+      def check_pretty_printed(json)
+        pretty = !!((nl_index = json.index("\n")) && nl_index != json.size - 1)
+        @options_menu.pretty_item.active = pretty
+      end
+      private :check_pretty_printed
+
+      # Open the data at the location _uri_, if given. Otherwise open a dialog
+      # to ask for the _uri_.
+      def location_open(uri = nil)
+        uri = ask_for_location unless uri
+        uri or return
+        ask_save if @changed
+        data = load_location(uri) or return
+        view_new_model Editor.data2model(data)
+      end
+
+      # Open the file _filename_ or call the #select_file method to ask for a
+      # filename.
+      def file_open(filename = nil)
+        filename = select_file('Open as a JSON file') unless filename
+        data = load_file(filename) or return
+        view_new_model Editor.data2model(data)
+      end
+
+      # Edit the string _json_ in the editor.
+      def edit(json)
+        if json.respond_to? :read
+          json = json.read
+        end
+        data = parse_json json
+        view_new_model Editor.data2model(data)
+      end
+
+      # Save the current file.
+      def file_save
+        if @filename
+          store_file(@filename)
+        else
+          file_save_as
+        end
+      end
+
+      # Save the current file as the filename 
+      def file_save_as
+        filename = select_file('Save as a JSON file')
+        store_file(filename)
+      end
+
+      # Store the current JSON document to _path_.
+      def store_file(path)
+        if path
+          data = Editor.model2data(@treeview.model.iter_first)
+          File.open(path + '.tmp', 'wb') do |output|
+            data or break
+            if @options_menu.pretty_item.active?
+              output.puts JSON.pretty_generate(data, :max_nesting => false)
+            else
+              output.write JSON.generate(data, :max_nesting => false)
+            end
+          end
+          File.rename path + '.tmp', path
+          @filename = path
+          toplevel.display_status("Saved data to '#@filename'.")
+          unchange
+        end
+      rescue SystemCallError => e
+        Editor.error_dialog(self, "Failed to store JSON file: #{e}!")
+      end
+  
+      # Load the file named _filename_ into the editor as a JSON document.
+      def load_file(filename)
+        if filename
+          if File.directory?(filename)
+            Editor.error_dialog(self, "Try to select a JSON file!")
+            nil
+          else
+            @filename = filename
+            if data = read_data(filename)
+              toplevel.display_status("Loaded data from '#@filename'.")
+            end
+            display_title
+            data
+          end
+        end
+      end
+
+      # Load the data at location _uri_ into the editor as a JSON document.
+      def load_location(uri)
+        data = read_data(uri) or return
+        @filename = nil
+        toplevel.display_status("Loaded data from '#{uri}'.")
+        display_title
+        data
+      end
+
+      def parse_json(json)
+        check_pretty_printed(json)
+        if @encoding && !/^utf8$/i.match(@encoding)
+          iconverter = Iconv.new('utf8', @encoding)
+          json = iconverter.iconv(json)
+        end
+        JSON::parse(json, :max_nesting => false, :create_additions => false)
+      end
+      private :parse_json
+
+      # Read a JSON document from the file named _filename_, parse it into a
+      # ruby data structure, and return the data.
+      def read_data(filename)
+        open(filename) do |f|
+          json = f.read
+          return parse_json(json)
+        end
+      rescue => e
+        Editor.error_dialog(self, "Failed to parse JSON file: #{e}!")
+        return
+      end
+
+      # Open a file selecton dialog, displaying _message_, and return the
+      # selected filename or nil, if no file was selected.
+      def select_file(message)
+        filename = nil
+        fs = FileSelection.new(message)
+        fs.set_modal(true)
+        @default_dir = File.join(Dir.pwd, '') unless @default_dir
+        fs.set_filename(@default_dir)
+        fs.set_transient_for(self)
+        fs.signal_connect(:destroy) { Gtk.main_quit }
+        fs.ok_button.signal_connect(:clicked) do
+          filename = fs.filename
+          @default_dir = File.join(File.dirname(filename), '')
+          fs.destroy
+          Gtk.main_quit
+        end
+        fs.cancel_button.signal_connect(:clicked) do
+          fs.destroy
+          Gtk.main_quit
+        end
+        fs.show_all
+        Gtk.main
+        filename
+      end
+
+      # Ask for location URI a to load data from. Returns the URI as a string.
+      def ask_for_location
+        dialog = Dialog.new(
+          "Load data from location...",
+          nil, nil,
+          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
+          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
+        )
+        hbox = HBox.new(false, 5)
+
+        hbox.pack_start(Label.new("Location:"), false)
+        hbox.pack_start(location_input = Entry.new)
+        location_input.width_chars = 60
+        location_input.text = @location || ''
+
+        dialog.vbox.pack_start(hbox, false)
+
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
+        dialog.show_all
+        dialog.run do |response| 
+          if response == Dialog::RESPONSE_ACCEPT
+            return @location = location_input.text
+          end
+        end
+        return
+      ensure
+        dialog.destroy if dialog
+      end
+    end
+
+    class << self
+      # Starts a JSON Editor. If a block was given, it yields
+      # to the JSON::Editor::MainWindow instance.
+      def start(encoding = 'utf8') # :yield: window
+        Gtk.init
+        @window = Editor::MainWindow.new(encoding)
+        @window.icon_list = [ Editor.fetch_icon('json') ]
+        yield @window if block_given?
+        @window.show_all
+        Gtk.main
+      end
+
+      # Edit the string _json_ with encoding _encoding_ in the editor.
+      def edit(json, encoding = 'utf8')
+        start(encoding) do |window|
+          window.edit json
+        end
+      end
+
+      attr_reader :window
+    end
+  end
+end
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
new file mode 100644
index 0000000000..719e56025c
--- /dev/null
+++ b/ext/json/lib/json/ext.rb
@@ -0,0 +1,15 @@
+require 'json/common'
+
+module JSON
+  # This module holds all the modules/classes that implement JSON's
+  # functionality as C extensions.
+  module Ext
+    require 'json/ext/parser'
+    require 'json/ext/generator'
+    $DEBUG and warn "Using c extension for JSON."
+    JSON.parser = Parser
+    JSON.generator = Generator
+  end
+
+  JSON_LOADED = true
+end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
new file mode 100644
index 0000000000..de7690b57c
--- /dev/null
+++ b/ext/json/lib/json/version.rb
@@ -0,0 +1,8 @@
+module JSON
+  # JSON version
+  VERSION         = '1.4.2'
+  VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
+  VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
+  VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
+  VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
+end
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
new file mode 100644
index 0000000000..5eaf6dd040
--- /dev/null
+++ b/ext/json/parser/depend
@@ -0,0 +1 @@
+parser.o: parser.c parser.h
diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
new file mode 100644
index 0000000000..f378479875
--- /dev/null
+++ b/ext/json/parser/extconf.rb
@@ -0,0 +1,4 @@
+require 'mkmf'
+require 'rbconfig'
+
+create_makefile 'json/ext/parser'
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
new file mode 100644
index 0000000000..bd8199a10c
--- /dev/null
+++ b/ext/json/parser/parser.c
@@ -0,0 +1,1939 @@
+
+#line 1 "parser.rl"
+#include "parser.h"
+
+/* unicode */
+
+static const char digit_values[256] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
+    -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1
+};
+
+static UTF32 unescape_unicode(const unsigned char *p)
+{
+    char b;
+    UTF32 result = 0;
+    b = digit_values[p[0]];
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    result = (result << 4) | b;
+    b = digit_values[p[1]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    b = digit_values[p[2]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    b = digit_values[p[3]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    return result;
+}
+
+static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
+{
+    int len = 1;
+    if (ch <= 0x7F) {
+        buf[0] = (char) ch;
+    } else if (ch <= 0x07FF) {
+        buf[0] = (char) ((ch >> 6) | 0xC0);
+        buf[1] = (char) ((ch & 0x3F) | 0x80);
+        len++;
+    } else if (ch <= 0xFFFF) {
+        buf[0] = (char) ((ch >> 12) | 0xE0);
+        buf[1] = (char) (((ch >> 6) & 0x3F) | 0x80);
+        buf[2] = (char) ((ch & 0x3F) | 0x80);
+        len += 2;
+    } else if (ch <= 0x1fffff) {
+        buf[0] =(char) ((ch >> 18) | 0xF0);
+        buf[1] =(char) (((ch >> 12) & 0x3F) | 0x80);
+        buf[2] =(char) (((ch >> 6) & 0x3F) | 0x80);
+        buf[3] =(char) ((ch & 0x3F) | 0x80);
+        len += 3;
+    } else {
+        buf[0] = '?';
+    }
+    return len;
+}
+
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE CEncoding_ASCII_8BIT, CEncoding_UTF_8, CEncoding_UTF_16BE,
+    CEncoding_UTF_16LE, CEncoding_UTF_32BE, CEncoding_UTF_32LE;
+static ID i_encoding, i_encode, i_encode_bang, i_force_encoding;
+#else
+static ID i_iconv;
+#endif
+
+static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
+static VALUE CNaN, CInfinity, CMinusInfinity;
+
+static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_object_class,
+          i_array_class, i_key_p, i_deep_const_get;
+
+
+#line 108 "parser.rl"
+
+
+
+#line 90 "parser.c"
+static const int JSON_object_start = 1;
+static const int JSON_object_first_final = 27;
+static const int JSON_object_error = 0;
+
+static const int JSON_object_en_main = 1;
+
+
+#line 144 "parser.rl"
+
+
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+    VALUE last_name = Qnil;
+    VALUE object_class = json->object_class;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    }
+
+    *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
+
+    
+#line 114 "parser.c"
+	{
+	cs = JSON_object_start;
+	}
+
+#line 159 "parser.rl"
+    
+#line 121 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+case 1:
+	if ( (*p) == 123 )
+		goto st2;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	switch( (*p) ) {
+		case 13: goto st2;
+		case 32: goto st2;
+		case 34: goto tr2;
+		case 47: goto st23;
+		case 125: goto tr4;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st2;
+	goto st0;
+tr2:
+#line 127 "parser.rl"
+	{
+        char *np;
+        json->parsing_name = 1;
+        np = JSON_parse_string(json, p, pe, &last_name);
+        json->parsing_name = 0;
+        if (np == NULL) { p--; {p++; cs = 3; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st3;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+#line 162 "parser.c"
+	switch( (*p) ) {
+		case 13: goto st3;
+		case 32: goto st3;
+		case 47: goto st4;
+		case 58: goto st8;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st3;
+	goto st0;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	switch( (*p) ) {
+		case 42: goto st5;
+		case 47: goto st7;
+	}
+	goto st0;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+	if ( (*p) == 42 )
+		goto st6;
+	goto st5;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	switch( (*p) ) {
+		case 42: goto st6;
+		case 47: goto st3;
+	}
+	goto st5;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+	if ( (*p) == 10 )
+		goto st3;
+	goto st7;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+	switch( (*p) ) {
+		case 13: goto st8;
+		case 32: goto st8;
+		case 34: goto tr11;
+		case 45: goto tr11;
+		case 47: goto st19;
+		case 73: goto tr11;
+		case 78: goto tr11;
+		case 91: goto tr11;
+		case 102: goto tr11;
+		case 110: goto tr11;
+		case 116: goto tr11;
+		case 123: goto tr11;
+	}
+	if ( (*p) > 10 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr11;
+	} else if ( (*p) >= 9 )
+		goto st8;
+	goto st0;
+tr11:
+#line 116 "parser.rl"
+	{
+        VALUE v = Qnil;
+        char *np = JSON_parse_value(json, p, pe, &v);
+        if (np == NULL) {
+            p--; {p++; cs = 9; goto _out;}
+        } else {
+            rb_hash_aset(*result, last_name, v);
+            {p = (( np))-1;}
+        }
+    }
+	goto st9;
+st9:
+	if ( ++p == pe )
+		goto _test_eof9;
+case 9:
+#line 245 "parser.c"
+	switch( (*p) ) {
+		case 13: goto st9;
+		case 32: goto st9;
+		case 44: goto st10;
+		case 47: goto st15;
+		case 125: goto tr4;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st9;
+	goto st0;
+st10:
+	if ( ++p == pe )
+		goto _test_eof10;
+case 10:
+	switch( (*p) ) {
+		case 13: goto st10;
+		case 32: goto st10;
+		case 34: goto tr2;
+		case 47: goto st11;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st10;
+	goto st0;
+st11:
+	if ( ++p == pe )
+		goto _test_eof11;
+case 11:
+	switch( (*p) ) {
+		case 42: goto st12;
+		case 47: goto st14;
+	}
+	goto st0;
+st12:
+	if ( ++p == pe )
+		goto _test_eof12;
+case 12:
+	if ( (*p) == 42 )
+		goto st13;
+	goto st12;
+st13:
+	if ( ++p == pe )
+		goto _test_eof13;
+case 13:
+	switch( (*p) ) {
+		case 42: goto st13;
+		case 47: goto st10;
+	}
+	goto st12;
+st14:
+	if ( ++p == pe )
+		goto _test_eof14;
+case 14:
+	if ( (*p) == 10 )
+		goto st10;
+	goto st14;
+st15:
+	if ( ++p == pe )
+		goto _test_eof15;
+case 15:
+	switch( (*p) ) {
+		case 42: goto st16;
+		case 47: goto st18;
+	}
+	goto st0;
+st16:
+	if ( ++p == pe )
+		goto _test_eof16;
+case 16:
+	if ( (*p) == 42 )
+		goto st17;
+	goto st16;
+st17:
+	if ( ++p == pe )
+		goto _test_eof17;
+case 17:
+	switch( (*p) ) {
+		case 42: goto st17;
+		case 47: goto st9;
+	}
+	goto st16;
+st18:
+	if ( ++p == pe )
+		goto _test_eof18;
+case 18:
+	if ( (*p) == 10 )
+		goto st9;
+	goto st18;
+tr4:
+#line 135 "parser.rl"
+	{ p--; {p++; cs = 27; goto _out;} }
+	goto st27;
+st27:
+	if ( ++p == pe )
+		goto _test_eof27;
+case 27:
+#line 341 "parser.c"
+	goto st0;
+st19:
+	if ( ++p == pe )
+		goto _test_eof19;
+case 19:
+	switch( (*p) ) {
+		case 42: goto st20;
+		case 47: goto st22;
+	}
+	goto st0;
+st20:
+	if ( ++p == pe )
+		goto _test_eof20;
+case 20:
+	if ( (*p) == 42 )
+		goto st21;
+	goto st20;
+st21:
+	if ( ++p == pe )
+		goto _test_eof21;
+case 21:
+	switch( (*p) ) {
+		case 42: goto st21;
+		case 47: goto st8;
+	}
+	goto st20;
+st22:
+	if ( ++p == pe )
+		goto _test_eof22;
+case 22:
+	if ( (*p) == 10 )
+		goto st8;
+	goto st22;
+st23:
+	if ( ++p == pe )
+		goto _test_eof23;
+case 23:
+	switch( (*p) ) {
+		case 42: goto st24;
+		case 47: goto st26;
+	}
+	goto st0;
+st24:
+	if ( ++p == pe )
+		goto _test_eof24;
+case 24:
+	if ( (*p) == 42 )
+		goto st25;
+	goto st24;
+st25:
+	if ( ++p == pe )
+		goto _test_eof25;
+case 25:
+	switch( (*p) ) {
+		case 42: goto st25;
+		case 47: goto st2;
+	}
+	goto st24;
+st26:
+	if ( ++p == pe )
+		goto _test_eof26;
+case 26:
+	if ( (*p) == 10 )
+		goto st2;
+	goto st26;
+	}
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof11: cs = 11; goto _test_eof; 
+	_test_eof12: cs = 12; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
+	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof15: cs = 15; goto _test_eof; 
+	_test_eof16: cs = 16; goto _test_eof; 
+	_test_eof17: cs = 17; goto _test_eof; 
+	_test_eof18: cs = 18; goto _test_eof; 
+	_test_eof27: cs = 27; goto _test_eof; 
+	_test_eof19: cs = 19; goto _test_eof; 
+	_test_eof20: cs = 20; goto _test_eof; 
+	_test_eof21: cs = 21; goto _test_eof; 
+	_test_eof22: cs = 22; goto _test_eof; 
+	_test_eof23: cs = 23; goto _test_eof; 
+	_test_eof24: cs = 24; goto _test_eof; 
+	_test_eof25: cs = 25; goto _test_eof; 
+	_test_eof26: cs = 26; goto _test_eof; 
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 160 "parser.rl"
+
+    if (cs >= JSON_object_first_final) {
+        if (RTEST(json->create_id)) {
+            VALUE klassname = rb_hash_aref(*result, json->create_id);
+            if (!NIL_P(klassname)) {
+                VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
+                if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
+                    *result = rb_funcall(klass, i_json_create, 1, *result);
+                }
+            }
+        }
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+
+#line 458 "parser.c"
+static const int JSON_value_start = 1;
+static const int JSON_value_first_final = 21;
+static const int JSON_value_error = 0;
+
+static const int JSON_value_en_main = 1;
+
+
+#line 258 "parser.rl"
+
+
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    
+#line 474 "parser.c"
+	{
+	cs = JSON_value_start;
+	}
+
+#line 265 "parser.rl"
+    
+#line 481 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+case 1:
+	switch( (*p) ) {
+		case 34: goto tr0;
+		case 45: goto tr2;
+		case 73: goto st2;
+		case 78: goto st9;
+		case 91: goto tr5;
+		case 102: goto st11;
+		case 110: goto st15;
+		case 116: goto st18;
+		case 123: goto tr9;
+	}
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto tr2;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+tr0:
+#line 206 "parser.rl"
+	{
+        char *np = JSON_parse_string(json, p, pe, result);
+        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st21;
+tr2:
+#line 211 "parser.rl"
+	{
+        char *np;
+        if(pe > p + 9 && !strncmp(MinusInfinity, p, 9)) {
+            if (json->allow_nan) {
+                *result = CMinusInfinity;
+                {p = (( p + 10))-1;}
+                p--; {p++; cs = 21; goto _out;}
+            } else {
+                rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+            }
+        }
+        np = JSON_parse_float(json, p, pe, result);
+        if (np != NULL) {p = (( np))-1;}
+        np = JSON_parse_integer(json, p, pe, result);
+        if (np != NULL) {p = (( np))-1;}
+        p--; {p++; cs = 21; goto _out;}
+    }
+	goto st21;
+tr5:
+#line 229 "parser.rl"
+	{
+        char *np;
+        json->current_nesting++;
+        np = JSON_parse_array(json, p, pe, result);
+        json->current_nesting--;
+        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st21;
+tr9:
+#line 237 "parser.rl"
+	{
+        char *np;
+        json->current_nesting++;
+        np =  JSON_parse_object(json, p, pe, result);
+        json->current_nesting--;
+        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st21;
+tr16:
+#line 199 "parser.rl"
+	{
+        if (json->allow_nan) {
+            *result = CInfinity;
+        } else {
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+        }
+    }
+	goto st21;
+tr18:
+#line 192 "parser.rl"
+	{
+        if (json->allow_nan) {
+            *result = CNaN;
+        } else {
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+        }
+    }
+	goto st21;
+tr22:
+#line 186 "parser.rl"
+	{
+        *result = Qfalse;
+    }
+	goto st21;
+tr25:
+#line 183 "parser.rl"
+	{
+        *result = Qnil;
+    }
+	goto st21;
+tr28:
+#line 189 "parser.rl"
+	{
+        *result = Qtrue;
+    }
+	goto st21;
+st21:
+	if ( ++p == pe )
+		goto _test_eof21;
+case 21:
+#line 245 "parser.rl"
+	{ p--; {p++; cs = 21; goto _out;} }
+#line 596 "parser.c"
+	goto st0;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	if ( (*p) == 110 )
+		goto st3;
+	goto st0;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+	if ( (*p) == 102 )
+		goto st4;
+	goto st0;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	if ( (*p) == 105 )
+		goto st5;
+	goto st0;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+	if ( (*p) == 110 )
+		goto st6;
+	goto st0;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	if ( (*p) == 105 )
+		goto st7;
+	goto st0;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+	if ( (*p) == 116 )
+		goto st8;
+	goto st0;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+	if ( (*p) == 121 )
+		goto tr16;
+	goto st0;
+st9:
+	if ( ++p == pe )
+		goto _test_eof9;
+case 9:
+	if ( (*p) == 97 )
+		goto st10;
+	goto st0;
+st10:
+	if ( ++p == pe )
+		goto _test_eof10;
+case 10:
+	if ( (*p) == 78 )
+		goto tr18;
+	goto st0;
+st11:
+	if ( ++p == pe )
+		goto _test_eof11;
+case 11:
+	if ( (*p) == 97 )
+		goto st12;
+	goto st0;
+st12:
+	if ( ++p == pe )
+		goto _test_eof12;
+case 12:
+	if ( (*p) == 108 )
+		goto st13;
+	goto st0;
+st13:
+	if ( ++p == pe )
+		goto _test_eof13;
+case 13:
+	if ( (*p) == 115 )
+		goto st14;
+	goto st0;
+st14:
+	if ( ++p == pe )
+		goto _test_eof14;
+case 14:
+	if ( (*p) == 101 )
+		goto tr22;
+	goto st0;
+st15:
+	if ( ++p == pe )
+		goto _test_eof15;
+case 15:
+	if ( (*p) == 117 )
+		goto st16;
+	goto st0;
+st16:
+	if ( ++p == pe )
+		goto _test_eof16;
+case 16:
+	if ( (*p) == 108 )
+		goto st17;
+	goto st0;
+st17:
+	if ( ++p == pe )
+		goto _test_eof17;
+case 17:
+	if ( (*p) == 108 )
+		goto tr25;
+	goto st0;
+st18:
+	if ( ++p == pe )
+		goto _test_eof18;
+case 18:
+	if ( (*p) == 114 )
+		goto st19;
+	goto st0;
+st19:
+	if ( ++p == pe )
+		goto _test_eof19;
+case 19:
+	if ( (*p) == 117 )
+		goto st20;
+	goto st0;
+st20:
+	if ( ++p == pe )
+		goto _test_eof20;
+case 20:
+	if ( (*p) == 101 )
+		goto tr28;
+	goto st0;
+	}
+	_test_eof21: cs = 21; goto _test_eof; 
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof11: cs = 11; goto _test_eof; 
+	_test_eof12: cs = 12; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
+	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof15: cs = 15; goto _test_eof; 
+	_test_eof16: cs = 16; goto _test_eof; 
+	_test_eof17: cs = 17; goto _test_eof; 
+	_test_eof18: cs = 18; goto _test_eof; 
+	_test_eof19: cs = 19; goto _test_eof; 
+	_test_eof20: cs = 20; goto _test_eof; 
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 266 "parser.rl"
+
+    if (cs >= JSON_value_first_final) {
+        return p;
+    } else {
+        return NULL;
+    }
+}
+
+
+#line 767 "parser.c"
+static const int JSON_integer_start = 1;
+static const int JSON_integer_first_final = 5;
+static const int JSON_integer_error = 0;
+
+static const int JSON_integer_en_main = 1;
+
+
+#line 282 "parser.rl"
+
+
+static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    
+#line 783 "parser.c"
+	{
+	cs = JSON_integer_start;
+	}
+
+#line 289 "parser.rl"
+    json->memo = p;
+    
+#line 791 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+case 1:
+	switch( (*p) ) {
+		case 45: goto st2;
+		case 48: goto st3;
+	}
+	if ( 49 <= (*p) && (*p) <= 57 )
+		goto st4;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	if ( (*p) == 48 )
+		goto st3;
+	if ( 49 <= (*p) && (*p) <= 57 )
+		goto st4;
+	goto st0;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st0;
+	goto tr4;
+tr4:
+#line 279 "parser.rl"
+	{ p--; {p++; cs = 5; goto _out;} }
+	goto st5;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+#line 832 "parser.c"
+	goto st0;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st4;
+	goto tr4;
+	}
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 291 "parser.rl"
+
+    if (cs >= JSON_integer_first_final) {
+        long len = p - json->memo;
+        *result = rb_Integer(rb_str_new(json->memo, len));
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+
+#line 863 "parser.c"
+static const int JSON_float_start = 1;
+static const int JSON_float_first_final = 10;
+static const int JSON_float_error = 0;
+
+static const int JSON_float_en_main = 1;
+
+
+#line 313 "parser.rl"
+
+
+static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    
+#line 879 "parser.c"
+	{
+	cs = JSON_float_start;
+	}
+
+#line 320 "parser.rl"
+    json->memo = p;
+    
+#line 887 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+case 1:
+	switch( (*p) ) {
+		case 45: goto st2;
+		case 48: goto st3;
+	}
+	if ( 49 <= (*p) && (*p) <= 57 )
+		goto st9;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	if ( (*p) == 48 )
+		goto st3;
+	if ( 49 <= (*p) && (*p) <= 57 )
+		goto st9;
+	goto st0;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+	switch( (*p) ) {
+		case 46: goto st4;
+		case 69: goto st6;
+		case 101: goto st6;
+	}
+	goto st0;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st5;
+	goto st0;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+	switch( (*p) ) {
+		case 69: goto st6;
+		case 101: goto st6;
+	}
+	if ( (*p) > 46 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st5;
+	} else if ( (*p) >= 45 )
+		goto st0;
+	goto tr7;
+tr7:
+#line 307 "parser.rl"
+	{ p--; {p++; cs = 10; goto _out;} }
+	goto st10;
+st10:
+	if ( ++p == pe )
+		goto _test_eof10;
+case 10:
+#line 952 "parser.c"
+	goto st0;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	switch( (*p) ) {
+		case 43: goto st7;
+		case 45: goto st7;
+	}
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st8;
+	goto st0;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st8;
+	goto st0;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+	switch( (*p) ) {
+		case 69: goto st0;
+		case 101: goto st0;
+	}
+	if ( (*p) > 46 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st8;
+	} else if ( (*p) >= 45 )
+		goto st0;
+	goto tr7;
+st9:
+	if ( ++p == pe )
+		goto _test_eof9;
+case 9:
+	switch( (*p) ) {
+		case 46: goto st4;
+		case 69: goto st6;
+		case 101: goto st6;
+	}
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st9;
+	goto st0;
+	}
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 322 "parser.rl"
+
+    if (cs >= JSON_float_first_final) {
+        long len = p - json->memo;
+        *result = rb_Float(rb_str_new(json->memo, len));
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+
+
+#line 1026 "parser.c"
+static const int JSON_array_start = 1;
+static const int JSON_array_first_final = 17;
+static const int JSON_array_error = 0;
+
+static const int JSON_array_en_main = 1;
+
+
+#line 358 "parser.rl"
+
+
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+    VALUE array_class = json->array_class;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    }
+    *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
+
+    
+#line 1048 "parser.c"
+	{
+	cs = JSON_array_start;
+	}
+
+#line 371 "parser.rl"
+    
+#line 1055 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+case 1:
+	if ( (*p) == 91 )
+		goto st2;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	switch( (*p) ) {
+		case 13: goto st2;
+		case 32: goto st2;
+		case 34: goto tr2;
+		case 45: goto tr2;
+		case 47: goto st13;
+		case 73: goto tr2;
+		case 78: goto tr2;
+		case 91: goto tr2;
+		case 93: goto tr4;
+		case 102: goto tr2;
+		case 110: goto tr2;
+		case 116: goto tr2;
+		case 123: goto tr2;
+	}
+	if ( (*p) > 10 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr2;
+	} else if ( (*p) >= 9 )
+		goto st2;
+	goto st0;
+tr2:
+#line 339 "parser.rl"
+	{
+        VALUE v = Qnil;
+        char *np = JSON_parse_value(json, p, pe, &v);
+        if (np == NULL) {
+            p--; {p++; cs = 3; goto _out;}
+        } else {
+            rb_ary_push(*result, v);
+            {p = (( np))-1;}
+        }
+    }
+	goto st3;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+#line 1110 "parser.c"
+	switch( (*p) ) {
+		case 13: goto st3;
+		case 32: goto st3;
+		case 44: goto st4;
+		case 47: goto st9;
+		case 93: goto tr4;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st3;
+	goto st0;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	switch( (*p) ) {
+		case 13: goto st4;
+		case 32: goto st4;
+		case 34: goto tr2;
+		case 45: goto tr2;
+		case 47: goto st5;
+		case 73: goto tr2;
+		case 78: goto tr2;
+		case 91: goto tr2;
+		case 102: goto tr2;
+		case 110: goto tr2;
+		case 116: goto tr2;
+		case 123: goto tr2;
+	}
+	if ( (*p) > 10 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr2;
+	} else if ( (*p) >= 9 )
+		goto st4;
+	goto st0;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+	switch( (*p) ) {
+		case 42: goto st6;
+		case 47: goto st8;
+	}
+	goto st0;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	if ( (*p) == 42 )
+		goto st7;
+	goto st6;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+	switch( (*p) ) {
+		case 42: goto st7;
+		case 47: goto st4;
+	}
+	goto st6;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+	if ( (*p) == 10 )
+		goto st4;
+	goto st8;
+st9:
+	if ( ++p == pe )
+		goto _test_eof9;
+case 9:
+	switch( (*p) ) {
+		case 42: goto st10;
+		case 47: goto st12;
+	}
+	goto st0;
+st10:
+	if ( ++p == pe )
+		goto _test_eof10;
+case 10:
+	if ( (*p) == 42 )
+		goto st11;
+	goto st10;
+st11:
+	if ( ++p == pe )
+		goto _test_eof11;
+case 11:
+	switch( (*p) ) {
+		case 42: goto st11;
+		case 47: goto st3;
+	}
+	goto st10;
+st12:
+	if ( ++p == pe )
+		goto _test_eof12;
+case 12:
+	if ( (*p) == 10 )
+		goto st3;
+	goto st12;
+tr4:
+#line 350 "parser.rl"
+	{ p--; {p++; cs = 17; goto _out;} }
+	goto st17;
+st17:
+	if ( ++p == pe )
+		goto _test_eof17;
+case 17:
+#line 1217 "parser.c"
+	goto st0;
+st13:
+	if ( ++p == pe )
+		goto _test_eof13;
+case 13:
+	switch( (*p) ) {
+		case 42: goto st14;
+		case 47: goto st16;
+	}
+	goto st0;
+st14:
+	if ( ++p == pe )
+		goto _test_eof14;
+case 14:
+	if ( (*p) == 42 )
+		goto st15;
+	goto st14;
+st15:
+	if ( ++p == pe )
+		goto _test_eof15;
+case 15:
+	switch( (*p) ) {
+		case 42: goto st15;
+		case 47: goto st2;
+	}
+	goto st14;
+st16:
+	if ( ++p == pe )
+		goto _test_eof16;
+case 16:
+	if ( (*p) == 10 )
+		goto st2;
+	goto st16;
+	}
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof11: cs = 11; goto _test_eof; 
+	_test_eof12: cs = 12; goto _test_eof; 
+	_test_eof17: cs = 17; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
+	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof15: cs = 15; goto _test_eof; 
+	_test_eof16: cs = 16; goto _test_eof; 
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 372 "parser.rl"
+
+    if(cs >= JSON_array_first_final) {
+        return p + 1;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return NULL;
+    }
+}
+
+static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
+{
+    char *p = string, *pe = string, *unescape;
+    int unescape_len;
+    char buf[4];
+
+    while (pe < stringEnd) {
+        if (*pe == '\\') {
+            unescape = (char *) "?";
+            unescape_len = 1;
+            if (pe > p) rb_str_buf_cat(result, p, pe - p);
+            switch (*++pe) {
+                case 'n':
+                    unescape = (char *) "\n";
+                    break;
+                case 'r':
+                    unescape = (char *) "\r";
+                    break;
+                case 't':
+                    unescape = (char *) "\t";
+                    break;
+                case '"':
+                    unescape = (char *) "\"";
+                    break;
+                case '\\':
+                    unescape = (char *) "\\";
+                    break;
+                case 'b':
+                    unescape = (char *) "\b";
+                    break;
+                case 'f':
+                    unescape = (char *) "\f";
+                    break;
+                case 'u':
+                    if (pe > stringEnd - 4) {
+                        return Qnil;
+                    } else {
+                        UTF32 ch = unescape_unicode((unsigned char *) ++pe);
+                        pe += 3;
+                        if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
+                            pe++;
+                            if (pe > stringEnd - 6) return Qnil;
+                            if (pe[0] == '\\' && pe[1] == 'u') {
+                                UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
+                                ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
+                                        | (sur & 0x3FF));
+                                pe += 5;
+                            } else {
+                                unescape = (char *) "?";
+                                break;
+                            }
+                        }
+                        unescape_len = convert_UTF32_to_UTF8(buf, ch);
+                        unescape = buf;
+                    }
+                    break;
+                default:
+                    p = pe;
+                    continue;
+            }
+            rb_str_buf_cat(result, unescape, unescape_len);
+            p = ++pe;
+        } else {
+            pe++;
+        }
+    }
+    rb_str_buf_cat(result, p, pe - p);
+    return result;
+}
+
+
+#line 1354 "parser.c"
+static const int JSON_string_start = 1;
+static const int JSON_string_first_final = 8;
+static const int JSON_string_error = 0;
+
+static const int JSON_string_en_main = 1;
+
+
+#line 471 "parser.rl"
+
+
+static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    *result = rb_str_buf_new(0);
+    
+#line 1371 "parser.c"
+	{
+	cs = JSON_string_start;
+	}
+
+#line 479 "parser.rl"
+    json->memo = p;
+    
+#line 1379 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+case 1:
+	if ( (*p) == 34 )
+		goto st2;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	switch( (*p) ) {
+		case 34: goto tr2;
+		case 92: goto st3;
+	}
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st2;
+tr2:
+#line 457 "parser.rl"
+	{
+        *result = json_string_unescape(*result, json->memo + 1, p);
+        if (NIL_P(*result)) {
+            p--;
+            {p++; cs = 8; goto _out;}
+        } else {
+            FORCE_UTF8(*result);
+            {p = (( p + 1))-1;}
+        }
+    }
+#line 468 "parser.rl"
+	{ p--; {p++; cs = 8; goto _out;} }
+	goto st8;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+#line 1422 "parser.c"
+	goto st0;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+	if ( (*p) == 117 )
+		goto st4;
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st2;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st5;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st5;
+	} else
+		goto st5;
+	goto st0;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st6;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st6;
+	} else
+		goto st6;
+	goto st0;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st7;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st7;
+	} else
+		goto st7;
+	goto st0;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st2;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st2;
+	} else
+		goto st2;
+	goto st0;
+	}
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 481 "parser.rl"
+
+    if (json->symbolize_names && json->parsing_name) {
+      *result = rb_str_intern(*result);
+    }
+    if (cs >= JSON_string_first_final) {
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+
+
+#line 1512 "parser.c"
+static const int JSON_start = 1;
+static const int JSON_first_final = 10;
+static const int JSON_error = 0;
+
+static const int JSON_en_main = 1;
+
+
+#line 518 "parser.rl"
+
+
+/*
+ * Document-class: JSON::Ext::Parser
+ *
+ * This is the JSON parser implemented as a C extension. It can be configured
+ * to be used by setting
+ *
+ *  JSON.parser = JSON::Ext::Parser
+ *
+ * with the method parser= in JSON.
+ *
+ */
+
+static VALUE convert_encoding(VALUE source)
+{
+    char *ptr = RSTRING_PTR(source);
+    long len = RSTRING_LEN(source);
+    if (len < 2) {
+        rb_raise(eParserError, "A JSON text must at least contain two octets!");
+    }
+#ifdef HAVE_RUBY_ENCODING_H
+    {
+        VALUE encoding = rb_funcall(source, i_encoding, 0);
+        if (encoding == CEncoding_ASCII_8BIT) {
+            if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32BE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16BE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32LE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16LE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else {
+                FORCE_UTF8(source);
+            }
+        } else {
+            source = rb_funcall(source, i_encode, 1, CEncoding_UTF_8);
+        }
+    }
+#else
+    if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32be"), source);
+    } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16be"), source);
+    } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32le"), source);
+    } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16le"), source);
+    }
+#endif
+    return source;
+}
+
+/*
+ * call-seq: new(source, opts => {})
+ *
+ * Creates a new JSON::Ext::Parser instance for the string _source_.
+ *
+ * Creates a new JSON::Ext::Parser instance for the string _source_.
+ *
+ * It will be configured by the _opts_ hash. _opts_ can have the following
+ * keys:
+ *
+ * _opts_ can have the following keys:
+ * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
+ *   structures. Disable depth checking with :max_nesting => false|nil|0, it
+ *   defaults to 19.
+ * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
+ *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
+ *   false.
+ * * *symbolize_names*: If set to true, returns symbols for the names
+ *   (keys) in a JSON object. Otherwise strings are returned, which is also
+ *   the default.
+ * * *create_additions*: If set to false, the Parser doesn't create
+ *   additions even if a matchin class and create_id was found. This option
+ *   defaults to true.
+ * * *object_class*: Defaults to Hash
+ * * *array_class*: Defaults to Array
+ */
+static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
+{
+    char *ptr;
+    long len;
+    VALUE source, opts;
+    GET_PARSER_INIT;
+
+    if (json->Vsource) {
+        rb_raise(rb_eTypeError, "already initialized instance");
+    }
+    rb_scan_args(argc, argv, "11", &source, &opts);
+    source = convert_encoding(StringValue(source));
+    ptr = RSTRING_PTR(source);
+    len = RSTRING_LEN(source);
+    if (!NIL_P(opts)) {
+        opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
+        if (NIL_P(opts)) {
+            rb_raise(rb_eArgError, "opts needs to be like a hash");
+        } else {
+            VALUE tmp = ID2SYM(i_max_nesting);
+            if (option_given_p(opts, tmp)) {
+                VALUE max_nesting = rb_hash_aref(opts, tmp);
+                if (RTEST(max_nesting)) {
+                    Check_Type(max_nesting, T_FIXNUM);
+                    json->max_nesting = FIX2INT(max_nesting);
+                } else {
+                    json->max_nesting = 0;
+                }
+            } else {
+                json->max_nesting = 19;
+            }
+            tmp = ID2SYM(i_allow_nan);
+            if (option_given_p(opts, tmp)) {
+                VALUE allow_nan = rb_hash_aref(opts, tmp);
+                json->allow_nan = RTEST(allow_nan) ? 1 : 0;
+            } else {
+                json->allow_nan = 0;
+            }
+            tmp = ID2SYM(i_symbolize_names);
+            if (option_given_p(opts, tmp)) {
+                VALUE symbolize_names = rb_hash_aref(opts, tmp);
+                json->symbolize_names = RTEST(symbolize_names) ? 1 : 0;
+            } else {
+                json->symbolize_names = 0;
+            }
+            tmp = ID2SYM(i_create_additions);
+            if (option_given_p(opts, tmp)) {
+                VALUE create_additions = rb_hash_aref(opts, tmp);
+                if (RTEST(create_additions)) {
+                    json->create_id = rb_funcall(mJSON, i_create_id, 0);
+                } else {
+                    json->create_id = Qnil;
+                }
+            } else {
+                json->create_id = rb_funcall(mJSON, i_create_id, 0);
+            }
+            tmp = ID2SYM(i_object_class);
+            if (option_given_p(opts, tmp)) {
+                json->object_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->object_class = Qnil;
+            }
+            tmp = ID2SYM(i_array_class);
+            if (option_given_p(opts, tmp)) {
+                json->array_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->array_class = Qnil;
+            }
+        }
+    } else {
+        json->max_nesting = 19;
+        json->allow_nan = 0;
+        json->create_id = rb_funcall(mJSON, i_create_id, 0);
+        json->object_class = Qnil;
+        json->array_class = Qnil;
+    }
+    json->current_nesting = 0;
+    json->len = len;
+    json->source = ptr;
+    json->Vsource = source;
+    return self;
+}
+
+/*
+ * call-seq: parse()
+ *
+ *  Parses the current JSON text _source_ and returns the complete data
+ *  structure as a result.
+ */
+static VALUE cParser_parse(VALUE self)
+{
+    char *p, *pe;
+    int cs = EVIL;
+    VALUE result = Qnil;
+    GET_PARSER;
+
+    
+#line 1706 "parser.c"
+	{
+	cs = JSON_start;
+	}
+
+#line 703 "parser.rl"
+    p = json->source;
+    pe = p + json->len;
+    
+#line 1715 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+st1:
+	if ( ++p == pe )
+		goto _test_eof1;
+case 1:
+	switch( (*p) ) {
+		case 13: goto st1;
+		case 32: goto st1;
+		case 47: goto st2;
+		case 91: goto tr3;
+		case 123: goto tr4;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	switch( (*p) ) {
+		case 42: goto st3;
+		case 47: goto st5;
+	}
+	goto st0;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+	if ( (*p) == 42 )
+		goto st4;
+	goto st3;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	switch( (*p) ) {
+		case 42: goto st4;
+		case 47: goto st1;
+	}
+	goto st3;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+	if ( (*p) == 10 )
+		goto st1;
+	goto st5;
+tr3:
+#line 507 "parser.rl"
+	{
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_array(json, p, pe, &result);
+        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st10;
+tr4:
+#line 500 "parser.rl"
+	{
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_object(json, p, pe, &result);
+        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st10;
+st10:
+	if ( ++p == pe )
+		goto _test_eof10;
+case 10:
+#line 1792 "parser.c"
+	switch( (*p) ) {
+		case 13: goto st10;
+		case 32: goto st10;
+		case 47: goto st6;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st10;
+	goto st0;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	switch( (*p) ) {
+		case 42: goto st7;
+		case 47: goto st9;
+	}
+	goto st0;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+	if ( (*p) == 42 )
+		goto st8;
+	goto st7;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+	switch( (*p) ) {
+		case 42: goto st8;
+		case 47: goto st10;
+	}
+	goto st7;
+st9:
+	if ( ++p == pe )
+		goto _test_eof9;
+case 9:
+	if ( (*p) == 10 )
+		goto st10;
+	goto st9;
+	}
+	_test_eof1: cs = 1; goto _test_eof; 
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 706 "parser.rl"
+
+    if (cs >= JSON_first_final && p == pe) {
+        return result;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return Qnil;
+    }
+}
+
+static JSON_Parser *JSON_allocate()
+{
+    JSON_Parser *json = ALLOC(JSON_Parser);
+    MEMZERO(json, JSON_Parser, 1);
+    return json;
+}
+
+static void JSON_mark(JSON_Parser *json)
+{
+    rb_gc_mark_maybe(json->Vsource);
+    rb_gc_mark_maybe(json->create_id);
+    rb_gc_mark_maybe(json->object_class);
+    rb_gc_mark_maybe(json->array_class);
+}
+
+static void JSON_free(JSON_Parser *json)
+{
+    ruby_xfree(json);
+}
+
+static VALUE cJSON_parser_s_allocate(VALUE klass)
+{
+    JSON_Parser *json = JSON_allocate();
+    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
+}
+
+/*
+ * call-seq: source()
+ *
+ * Returns a copy of the current _source_ string, that was used to construct
+ * this Parser.
+ */
+static VALUE cParser_source(VALUE self)
+{
+    GET_PARSER;
+    return rb_str_dup(json->Vsource);
+}
+
+void Init_parser()
+{
+    rb_require("json/common");
+    mJSON = rb_define_module("JSON");
+    mExt = rb_define_module_under(mJSON, "Ext");
+    cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
+    eParserError = rb_path2class("JSON::ParserError");
+    eNestingError = rb_path2class("JSON::NestingError");
+    rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
+    rb_define_method(cParser, "initialize", cParser_initialize, -1);
+    rb_define_method(cParser, "parse", cParser_parse, 0);
+    rb_define_method(cParser, "source", cParser_source, 0);
+
+    CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+
+    i_json_creatable_p = rb_intern("json_creatable?");
+    i_json_create = rb_intern("json_create");
+    i_create_id = rb_intern("create_id");
+    i_create_additions = rb_intern("create_additions");
+    i_chr = rb_intern("chr");
+    i_max_nesting = rb_intern("max_nesting");
+    i_allow_nan = rb_intern("allow_nan");
+    i_symbolize_names = rb_intern("symbolize_names");
+    i_object_class = rb_intern("object_class");
+    i_array_class = rb_intern("array_class");
+    i_key_p = rb_intern("key?");
+    i_deep_const_get = rb_intern("deep_const_get");
+#ifdef HAVE_RUBY_ENCODING_H
+    CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
+    CEncoding_UTF_16BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16be"));
+    CEncoding_UTF_16LE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16le"));
+    CEncoding_UTF_32BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-32be"));
+    CEncoding_UTF_32LE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-32le"));
+    CEncoding_ASCII_8BIT = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("ascii-8bit"));
+    i_encoding = rb_intern("encoding");
+    i_encode = rb_intern("encode");
+    i_encode_bang = rb_intern("encode!");
+    i_force_encoding = rb_intern("force_encoding");
+#else
+    i_iconv = rb_intern("iconv");
+#endif
+}
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
new file mode 100644
index 0000000000..a344da058c
--- /dev/null
+++ b/ext/json/parser/parser.h
@@ -0,0 +1,74 @@
+#ifndef _PARSER_H_
+#define _PARSER_H_
+
+#include "ruby.h"
+
+#if HAVE_RE_H
+#include "re.h"
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
+#else
+#define FORCE_UTF8(obj)
+#endif
+
+#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
+
+/* unicode */
+
+typedef unsigned long	UTF32;	/* at least 32 bits */
+typedef unsigned short UTF16;	/* at least 16 bits */
+typedef unsigned char	UTF8;	  /* typically 8 bits */
+
+#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
+#define UNI_SUR_HIGH_START  (UTF32)0xD800
+#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
+#define UNI_SUR_LOW_START   (UTF32)0xDC00
+#define UNI_SUR_LOW_END     (UTF32)0xDFFF
+
+typedef struct JSON_ParserStruct {
+    VALUE Vsource;
+    char *source;
+    long len;
+    char *memo;
+    VALUE create_id;
+    int max_nesting;
+    int current_nesting;
+    int allow_nan;
+    int parsing_name;
+    int symbolize_names;
+    VALUE object_class;
+    VALUE array_class;
+} JSON_Parser;
+
+#define GET_PARSER                          \
+    GET_PARSER_INIT;                        \
+    if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance")
+#define GET_PARSER_INIT                     \
+    JSON_Parser *json;                      \
+    Data_Get_Struct(self, JSON_Parser, json)
+
+#define MinusInfinity "-Infinity"
+#define EVIL 0x666
+
+static UTF32 unescape_unicode(const unsigned char *p);
+static int convert_UTF32_to_UTF8(char *buf, UTF32 ch);
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd);
+static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static VALUE convert_encoding(VALUE source);
+static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self);
+static VALUE cParser_parse(VALUE self);
+static JSON_Parser *JSON_allocate();
+static void JSON_mark(JSON_Parser *json);
+static void JSON_free(JSON_Parser *json);
+static VALUE cJSON_parser_s_allocate(VALUE klass);
+static VALUE cParser_source(VALUE self);
+
+#endif
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
new file mode 100644
index 0000000000..2f4e9390cd
--- /dev/null
+++ b/ext/json/parser/parser.rl
@@ -0,0 +1,796 @@
+#include "parser.h"
+
+/* unicode */
+
+static const char digit_values[256] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
+    -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1
+};
+
+static UTF32 unescape_unicode(const unsigned char *p)
+{
+    char b;
+    UTF32 result = 0;
+    b = digit_values[p[0]];
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    result = (result << 4) | b;
+    b = digit_values[p[1]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    b = digit_values[p[2]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    b = digit_values[p[3]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    return result;
+}
+
+static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
+{
+    int len = 1;
+    if (ch <= 0x7F) {
+        buf[0] = (char) ch;
+    } else if (ch <= 0x07FF) {
+        buf[0] = (char) ((ch >> 6) | 0xC0);
+        buf[1] = (char) ((ch & 0x3F) | 0x80);
+        len++;
+    } else if (ch <= 0xFFFF) {
+        buf[0] = (char) ((ch >> 12) | 0xE0);
+        buf[1] = (char) (((ch >> 6) & 0x3F) | 0x80);
+        buf[2] = (char) ((ch & 0x3F) | 0x80);
+        len += 2;
+    } else if (ch <= 0x1fffff) {
+        buf[0] =(char) ((ch >> 18) | 0xF0);
+        buf[1] =(char) (((ch >> 12) & 0x3F) | 0x80);
+        buf[2] =(char) (((ch >> 6) & 0x3F) | 0x80);
+        buf[3] =(char) ((ch & 0x3F) | 0x80);
+        len += 3;
+    } else {
+        buf[0] = '?';
+    }
+    return len;
+}
+
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE CEncoding_ASCII_8BIT, CEncoding_UTF_8, CEncoding_UTF_16BE,
+    CEncoding_UTF_16LE, CEncoding_UTF_32BE, CEncoding_UTF_32LE;
+static ID i_encoding, i_encode, i_encode_bang, i_force_encoding;
+#else
+static ID i_iconv;
+#endif
+
+static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
+static VALUE CNaN, CInfinity, CMinusInfinity;
+
+static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_object_class,
+          i_array_class, i_key_p, i_deep_const_get;
+
+%%{
+    machine JSON_common;
+
+    cr                  = '\n';
+    cr_neg              = [^\n];
+    ws                  = [ \t\r\n];
+    c_comment           = '/*' ( any* - (any* '*/' any* ) ) '*/';
+    cpp_comment         = '//' cr_neg* cr;
+    comment             = c_comment | cpp_comment;
+    ignore              = ws | comment;
+    name_separator      = ':';
+    value_separator     = ',';
+    Vnull               = 'null';
+    Vfalse              = 'false';
+    Vtrue               = 'true';
+    VNaN                = 'NaN';
+    VInfinity           = 'Infinity';
+    VMinusInfinity      = '-Infinity';
+    begin_value         = [nft"\-[{NI] | digit;
+    begin_object        = '{';
+    end_object          = '}';
+    begin_array         = '[';
+    end_array           = ']';
+    begin_string        = '"';
+    begin_name          = begin_string;
+    begin_number        = digit | '-';
+}%%
+
+%%{
+    machine JSON_object;
+    include JSON_common;
+
+    write data;
+
+    action parse_value {
+        VALUE v = Qnil;
+        char *np = JSON_parse_value(json, fpc, pe, &v);
+        if (np == NULL) {
+            fhold; fbreak;
+        } else {
+            rb_hash_aset(*result, last_name, v);
+            fexec np;
+        }
+    }
+
+    action parse_name {
+        char *np;
+        json->parsing_name = 1;
+        np = JSON_parse_string(json, fpc, pe, &last_name);
+        json->parsing_name = 0;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
+    }
+
+    action exit { fhold; fbreak; }
+
+    a_pair  = ignore* begin_name >parse_name
+        ignore* name_separator ignore*
+        begin_value >parse_value;
+
+    main := begin_object
+          (a_pair (ignore* value_separator a_pair)*)?
+          ignore* end_object @exit;
+}%%
+
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+    VALUE last_name = Qnil;
+    VALUE object_class = json->object_class;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    }
+
+    *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
+
+    %% write init;
+    %% write exec;
+
+    if (cs >= JSON_object_first_final) {
+        if (RTEST(json->create_id)) {
+            VALUE klassname = rb_hash_aref(*result, json->create_id);
+            if (!NIL_P(klassname)) {
+                VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
+                if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
+                    *result = rb_funcall(klass, i_json_create, 1, *result);
+                }
+            }
+        }
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+%%{
+    machine JSON_value;
+    include JSON_common;
+
+    write data;
+
+    action parse_null {
+        *result = Qnil;
+    }
+    action parse_false {
+        *result = Qfalse;
+    }
+    action parse_true {
+        *result = Qtrue;
+    }
+    action parse_nan {
+        if (json->allow_nan) {
+            *result = CNaN;
+        } else {
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+        }
+    }
+    action parse_infinity {
+        if (json->allow_nan) {
+            *result = CInfinity;
+        } else {
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+        }
+    }
+    action parse_string {
+        char *np = JSON_parse_string(json, fpc, pe, result);
+        if (np == NULL) { fhold; fbreak; } else fexec np;
+    }
+
+    action parse_number {
+        char *np;
+        if(pe > fpc + 9 && !strncmp(MinusInfinity, fpc, 9)) {
+            if (json->allow_nan) {
+                *result = CMinusInfinity;
+                fexec p + 10;
+                fhold; fbreak;
+            } else {
+                rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+            }
+        }
+        np = JSON_parse_float(json, fpc, pe, result);
+        if (np != NULL) fexec np;
+        np = JSON_parse_integer(json, fpc, pe, result);
+        if (np != NULL) fexec np;
+        fhold; fbreak;
+    }
+
+    action parse_array {
+        char *np;
+        json->current_nesting++;
+        np = JSON_parse_array(json, fpc, pe, result);
+        json->current_nesting--;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
+    }
+
+    action parse_object {
+        char *np;
+        json->current_nesting++;
+        np =  JSON_parse_object(json, fpc, pe, result);
+        json->current_nesting--;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
+    }
+
+    action exit { fhold; fbreak; }
+
+main := (
+              Vnull @parse_null |
+              Vfalse @parse_false |
+              Vtrue @parse_true |
+              VNaN @parse_nan |
+              VInfinity @parse_infinity |
+              begin_number >parse_number |
+              begin_string >parse_string |
+              begin_array >parse_array |
+              begin_object >parse_object
+        ) %*exit;
+}%%
+
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    %% write init;
+    %% write exec;
+
+    if (cs >= JSON_value_first_final) {
+        return p;
+    } else {
+        return NULL;
+    }
+}
+
+%%{
+    machine JSON_integer;
+
+    write data;
+
+    action exit { fhold; fbreak; }
+
+    main := '-'? ('0' | [1-9][0-9]*) (^[0-9] @exit);
+}%%
+
+static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    %% write init;
+    json->memo = p;
+    %% write exec;
+
+    if (cs >= JSON_integer_first_final) {
+        long len = p - json->memo;
+        *result = rb_Integer(rb_str_new(json->memo, len));
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+%%{
+    machine JSON_float;
+    include JSON_common;
+
+    write data;
+
+    action exit { fhold; fbreak; }
+
+    main := '-'? (
+              (('0' | [1-9][0-9]*) '.' [0-9]+ ([Ee] [+\-]?[0-9]+)?)
+              | (('0' | [1-9][0-9]*) ([Ee] [+\-]?[0-9]+))
+             )  (^[0-9Ee.\-] @exit );
+}%%
+
+static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    %% write init;
+    json->memo = p;
+    %% write exec;
+
+    if (cs >= JSON_float_first_final) {
+        long len = p - json->memo;
+        *result = rb_Float(rb_str_new(json->memo, len));
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+
+%%{
+    machine JSON_array;
+    include JSON_common;
+
+    write data;
+
+    action parse_value {
+        VALUE v = Qnil;
+        char *np = JSON_parse_value(json, fpc, pe, &v);
+        if (np == NULL) {
+            fhold; fbreak;
+        } else {
+            rb_ary_push(*result, v);
+            fexec np;
+        }
+    }
+
+    action exit { fhold; fbreak; }
+
+    next_element  = value_separator ignore* begin_value >parse_value;
+
+    main := begin_array ignore*
+          ((begin_value >parse_value ignore*)
+           (ignore* next_element ignore*)*)?
+          end_array @exit;
+}%%
+
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+    VALUE array_class = json->array_class;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    }
+    *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
+
+    %% write init;
+    %% write exec;
+
+    if(cs >= JSON_array_first_final) {
+        return p + 1;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return NULL;
+    }
+}
+
+static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
+{
+    char *p = string, *pe = string, *unescape;
+    int unescape_len;
+    char buf[4];
+
+    while (pe < stringEnd) {
+        if (*pe == '\\') {
+            unescape = (char *) "?";
+            unescape_len = 1;
+            if (pe > p) rb_str_buf_cat(result, p, pe - p);
+            switch (*++pe) {
+                case 'n':
+                    unescape = (char *) "\n";
+                    break;
+                case 'r':
+                    unescape = (char *) "\r";
+                    break;
+                case 't':
+                    unescape = (char *) "\t";
+                    break;
+                case '"':
+                    unescape = (char *) "\"";
+                    break;
+                case '\\':
+                    unescape = (char *) "\\";
+                    break;
+                case 'b':
+                    unescape = (char *) "\b";
+                    break;
+                case 'f':
+                    unescape = (char *) "\f";
+                    break;
+                case 'u':
+                    if (pe > stringEnd - 4) {
+                        return Qnil;
+                    } else {
+                        UTF32 ch = unescape_unicode((unsigned char *) ++pe);
+                        pe += 3;
+                        if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
+                            pe++;
+                            if (pe > stringEnd - 6) return Qnil;
+                            if (pe[0] == '\\' && pe[1] == 'u') {
+                                UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
+                                ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
+                                        | (sur & 0x3FF));
+                                pe += 5;
+                            } else {
+                                unescape = (char *) "?";
+                                break;
+                            }
+                        }
+                        unescape_len = convert_UTF32_to_UTF8(buf, ch);
+                        unescape = buf;
+                    }
+                    break;
+                default:
+                    p = pe;
+                    continue;
+            }
+            rb_str_buf_cat(result, unescape, unescape_len);
+            p = ++pe;
+        } else {
+            pe++;
+        }
+    }
+    rb_str_buf_cat(result, p, pe - p);
+    return result;
+}
+
+%%{
+    machine JSON_string;
+    include JSON_common;
+
+    write data;
+
+    action parse_string {
+        *result = json_string_unescape(*result, json->memo + 1, p);
+        if (NIL_P(*result)) {
+            fhold;
+            fbreak;
+        } else {
+            FORCE_UTF8(*result);
+            fexec p + 1;
+        }
+    }
+
+    action exit { fhold; fbreak; }
+
+    main := '"' ((^(["\\] | 0..0x1f) | '\\'["\\/bfnrt] | '\\u'[0-9a-fA-F]{4} | '\\'^(["\\/bfnrtu]|0..0x1f))* %parse_string) '"' @exit;
+}%%
+
+static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
+{
+    int cs = EVIL;
+
+    *result = rb_str_buf_new(0);
+    %% write init;
+    json->memo = p;
+    %% write exec;
+
+    if (json->symbolize_names && json->parsing_name) {
+      *result = rb_str_intern(*result);
+    }
+    if (cs >= JSON_string_first_final) {
+        return p + 1;
+    } else {
+        return NULL;
+    }
+}
+
+
+%%{
+    machine JSON;
+
+    write data;
+
+    include JSON_common;
+
+    action parse_object {
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_object(json, fpc, pe, &result);
+        if (np == NULL) { fhold; fbreak; } else fexec np;
+    }
+
+    action parse_array {
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_array(json, fpc, pe, &result);
+        if (np == NULL) { fhold; fbreak; } else fexec np;
+    }
+
+    main := ignore* (
+            begin_object >parse_object |
+            begin_array >parse_array
+            ) ignore*;
+}%%
+
+/*
+ * Document-class: JSON::Ext::Parser
+ *
+ * This is the JSON parser implemented as a C extension. It can be configured
+ * to be used by setting
+ *
+ *  JSON.parser = JSON::Ext::Parser
+ *
+ * with the method parser= in JSON.
+ *
+ */
+
+static VALUE convert_encoding(VALUE source)
+{
+    char *ptr = RSTRING_PTR(source);
+    long len = RSTRING_LEN(source);
+    if (len < 2) {
+        rb_raise(eParserError, "A JSON text must at least contain two octets!");
+    }
+#ifdef HAVE_RUBY_ENCODING_H
+    {
+        VALUE encoding = rb_funcall(source, i_encoding, 0);
+        if (encoding == CEncoding_ASCII_8BIT) {
+            if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32BE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16BE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32LE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16LE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else {
+                FORCE_UTF8(source);
+            }
+        } else {
+            source = rb_funcall(source, i_encode, 1, CEncoding_UTF_8);
+        }
+    }
+#else
+    if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32be"), source);
+    } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16be"), source);
+    } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32le"), source);
+    } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16le"), source);
+    }
+#endif
+    return source;
+}
+
+/*
+ * call-seq: new(source, opts => {})
+ *
+ * Creates a new JSON::Ext::Parser instance for the string _source_.
+ *
+ * Creates a new JSON::Ext::Parser instance for the string _source_.
+ *
+ * It will be configured by the _opts_ hash. _opts_ can have the following
+ * keys:
+ *
+ * _opts_ can have the following keys:
+ * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
+ *   structures. Disable depth checking with :max_nesting => false|nil|0, it
+ *   defaults to 19.
+ * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
+ *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
+ *   false.
+ * * *symbolize_names*: If set to true, returns symbols for the names
+ *   (keys) in a JSON object. Otherwise strings are returned, which is also
+ *   the default.
+ * * *create_additions*: If set to false, the Parser doesn't create
+ *   additions even if a matchin class and create_id was found. This option
+ *   defaults to true.
+ * * *object_class*: Defaults to Hash
+ * * *array_class*: Defaults to Array
+ */
+static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
+{
+    char *ptr;
+    long len;
+    VALUE source, opts;
+    GET_PARSER_INIT;
+
+    if (json->Vsource) {
+        rb_raise(rb_eTypeError, "already initialized instance");
+    }
+    rb_scan_args(argc, argv, "11", &source, &opts);
+    source = convert_encoding(StringValue(source));
+    ptr = RSTRING_PTR(source);
+    len = RSTRING_LEN(source);
+    if (!NIL_P(opts)) {
+        opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
+        if (NIL_P(opts)) {
+            rb_raise(rb_eArgError, "opts needs to be like a hash");
+        } else {
+            VALUE tmp = ID2SYM(i_max_nesting);
+            if (option_given_p(opts, tmp)) {
+                VALUE max_nesting = rb_hash_aref(opts, tmp);
+                if (RTEST(max_nesting)) {
+                    Check_Type(max_nesting, T_FIXNUM);
+                    json->max_nesting = FIX2INT(max_nesting);
+                } else {
+                    json->max_nesting = 0;
+                }
+            } else {
+                json->max_nesting = 19;
+            }
+            tmp = ID2SYM(i_allow_nan);
+            if (option_given_p(opts, tmp)) {
+                VALUE allow_nan = rb_hash_aref(opts, tmp);
+                json->allow_nan = RTEST(allow_nan) ? 1 : 0;
+            } else {
+                json->allow_nan = 0;
+            }
+            tmp = ID2SYM(i_symbolize_names);
+            if (option_given_p(opts, tmp)) {
+                VALUE symbolize_names = rb_hash_aref(opts, tmp);
+                json->symbolize_names = RTEST(symbolize_names) ? 1 : 0;
+            } else {
+                json->symbolize_names = 0;
+            }
+            tmp = ID2SYM(i_create_additions);
+            if (option_given_p(opts, tmp)) {
+                VALUE create_additions = rb_hash_aref(opts, tmp);
+                if (RTEST(create_additions)) {
+                    json->create_id = rb_funcall(mJSON, i_create_id, 0);
+                } else {
+                    json->create_id = Qnil;
+                }
+            } else {
+                json->create_id = rb_funcall(mJSON, i_create_id, 0);
+            }
+            tmp = ID2SYM(i_object_class);
+            if (option_given_p(opts, tmp)) {
+                json->object_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->object_class = Qnil;
+            }
+            tmp = ID2SYM(i_array_class);
+            if (option_given_p(opts, tmp)) {
+                json->array_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->array_class = Qnil;
+            }
+        }
+    } else {
+        json->max_nesting = 19;
+        json->allow_nan = 0;
+        json->create_id = rb_funcall(mJSON, i_create_id, 0);
+        json->object_class = Qnil;
+        json->array_class = Qnil;
+    }
+    json->current_nesting = 0;
+    json->len = len;
+    json->source = ptr;
+    json->Vsource = source;
+    return self;
+}
+
+/*
+ * call-seq: parse()
+ *
+ *  Parses the current JSON text _source_ and returns the complete data
+ *  structure as a result.
+ */
+static VALUE cParser_parse(VALUE self)
+{
+    char *p, *pe;
+    int cs = EVIL;
+    VALUE result = Qnil;
+    GET_PARSER;
+
+    %% write init;
+    p = json->source;
+    pe = p + json->len;
+    %% write exec;
+
+    if (cs >= JSON_first_final && p == pe) {
+        return result;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return Qnil;
+    }
+}
+
+static JSON_Parser *JSON_allocate()
+{
+    JSON_Parser *json = ALLOC(JSON_Parser);
+    MEMZERO(json, JSON_Parser, 1);
+    return json;
+}
+
+static void JSON_mark(JSON_Parser *json)
+{
+    rb_gc_mark_maybe(json->Vsource);
+    rb_gc_mark_maybe(json->create_id);
+    rb_gc_mark_maybe(json->object_class);
+    rb_gc_mark_maybe(json->array_class);
+}
+
+static void JSON_free(JSON_Parser *json)
+{
+    ruby_xfree(json);
+}
+
+static VALUE cJSON_parser_s_allocate(VALUE klass)
+{
+    JSON_Parser *json = JSON_allocate();
+    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
+}
+
+/*
+ * call-seq: source()
+ *
+ * Returns a copy of the current _source_ string, that was used to construct
+ * this Parser.
+ */
+static VALUE cParser_source(VALUE self)
+{
+    GET_PARSER;
+    return rb_str_dup(json->Vsource);
+}
+
+void Init_parser()
+{
+    rb_require("json/common");
+    mJSON = rb_define_module("JSON");
+    mExt = rb_define_module_under(mJSON, "Ext");
+    cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
+    eParserError = rb_path2class("JSON::ParserError");
+    eNestingError = rb_path2class("JSON::NestingError");
+    rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
+    rb_define_method(cParser, "initialize", cParser_initialize, -1);
+    rb_define_method(cParser, "parse", cParser_parse, 0);
+    rb_define_method(cParser, "source", cParser_source, 0);
+
+    CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+
+    i_json_creatable_p = rb_intern("json_creatable?");
+    i_json_create = rb_intern("json_create");
+    i_create_id = rb_intern("create_id");
+    i_create_additions = rb_intern("create_additions");
+    i_chr = rb_intern("chr");
+    i_max_nesting = rb_intern("max_nesting");
+    i_allow_nan = rb_intern("allow_nan");
+    i_symbolize_names = rb_intern("symbolize_names");
+    i_object_class = rb_intern("object_class");
+    i_array_class = rb_intern("array_class");
+    i_key_p = rb_intern("key?");
+    i_deep_const_get = rb_intern("deep_const_get");
+#ifdef HAVE_RUBY_ENCODING_H
+    CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
+    CEncoding_UTF_16BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16be"));
+    CEncoding_UTF_16LE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16le"));
+    CEncoding_UTF_32BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-32be"));
+    CEncoding_UTF_32LE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-32le"));
+    CEncoding_ASCII_8BIT = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("ascii-8bit"));
+    i_encoding = rb_intern("encoding");
+    i_encode = rb_intern("encode");
+    i_encode_bang = rb_intern("encode!");
+    i_force_encoding = rb_intern("force_encoding");
+#else
+    i_iconv = rb_intern("iconv");
+#endif
+}
diff --git a/ext/mathn/complex/complex.c b/ext/mathn/complex/complex.c
new file mode 100644
index 0000000000..dce494959f
--- /dev/null
+++ b/ext/mathn/complex/complex.c
@@ -0,0 +1,7 @@
+extern void nucomp_canonicalization(int);
+
+void
+Init_complex(void)
+{
+    nucomp_canonicalization(1);
+}
diff --git a/ext/mathn/complex/extconf.rb b/ext/mathn/complex/extconf.rb
new file mode 100644
index 0000000000..d4d14ffcb8
--- /dev/null
+++ b/ext/mathn/complex/extconf.rb
@@ -0,0 +1,3 @@
+require "mkmf"
+
+create_makefile "mathn/complex"
diff --git a/ext/mathn/rational/extconf.rb b/ext/mathn/rational/extconf.rb
new file mode 100644
index 0000000000..ba76306b7b
--- /dev/null
+++ b/ext/mathn/rational/extconf.rb
@@ -0,0 +1,3 @@
+require "mkmf"
+
+create_makefile "mathn/rational"
diff --git a/ext/mathn/rational/rational.c b/ext/mathn/rational/rational.c
new file mode 100644
index 0000000000..2ac5999946
--- /dev/null
+++ b/ext/mathn/rational/rational.c
@@ -0,0 +1,7 @@
+extern void nurat_canonicalization(int);
+
+void
+Init_rational(void)
+{
+    nurat_canonicalization(1);
+}
diff --git a/ext/nkf/.cvsignore b/ext/nkf/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/nkf/.cvsignore
+++ b/ext/nkf/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 4ffe8d984e..f8c1ae8f59 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -18,9 +18,9 @@ module Kconv
   #
   # Public Constants
   #
-  
+
   #Constant of Encoding
-  
+
   # Auto-Detect
   AUTO = NKF::AUTO
   # ISO-2022-JP
@@ -45,84 +45,18 @@ module Kconv
   UNKNOWN = NKF::UNKNOWN
 
   #
-  # Private Constants
-  #
-  
-  # Revision of kconv.rb
-  REVISION = %q$Revision$
-  
-  #Regexp of Encoding
-  
-  # Regexp of Shift_JIS string (private constant)
-  RegexpShiftjis = /\A(?:
-		       [\x00-\x7f\xa1-\xdf] |
-		       [\x81-\x9f\xe0-\xfc][\x40-\x7e\x80-\xfc] 
-		      )*\z/nx
-
-  # Regexp of EUC-JP string (private constant)
-  RegexpEucjp = /\A(?:
-		    [\x00-\x7f]                         |
-		    \x8e        [\xa1-\xdf]             |
-		    \x8f        [\xa1-\xfe] [\xa1-\xfe] |
-		    [\xa1-\xfe] [\xa1-\xfe]
-		   )*\z/nx
-
-  # Regexp of UTF-8 string (private constant)
-  RegexpUtf8  = /\A(?:
-		    [\x00-\x7f]                                     |
-		    [\xc2-\xdf] [\x80-\xbf]                         |
-		    \xe0        [\xa0-\xbf] [\x80-\xbf]             |
-		    [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
-		    \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
-		    [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
-		    \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
-		   )*\z/nx
-
-  #
   # Public Methods
   #
-  
+
   # call-seq:
-  #    Kconv.kconv(str, out_code, in_code = Kconv::AUTO)
-  #
-  # Convert <code>str</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want to decode them, use NKF.nkf.
-  def kconv(str, out_code, in_code = AUTO)
-    opt = '-'
-    case in_code
-    when ::NKF::JIS
-      opt << 'J'
-    when ::NKF::EUC
-      opt << 'E'
-    when ::NKF::SJIS
-      opt << 'S'
-    when ::NKF::UTF8
-      opt << 'W'
-    when ::NKF::UTF16
-      opt << 'W16'
-    end
-
-    case out_code
-    when ::NKF::JIS
-      opt << 'j'
-    when ::NKF::EUC
-      opt << 'e'
-    when ::NKF::SJIS
-      opt << 's'
-    when ::NKF::UTF8
-      opt << 'w'
-    when ::NKF::UTF16
-      opt << 'w16'
-    when ::NKF::NOCONV
-      return str
-    end
-
-    opt = '' if opt == '-'
+  #    Kconv.kconv(str, to_enc, from_enc=nil)
+  #
+  # Convert <code>str</code> to <code>to_enc</code>.
+  # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects.
+  def kconv(str, to_enc, from_enc=nil)
+    opt = ''
+    opt += ' --ic=' + from_enc.to_s if from_enc
+    opt += ' --oc=' + to_enc.to_s if to_enc
 
     ::NKF::nkf(opt, str)
   end
@@ -133,235 +67,216 @@ module Kconv
   #
 
   # call-seq:
-  #    Kconv.tojis(str)   -> string
+  #    Kconv.tojis(str)   => string
   #
   # Convert <code>str</code> to ISO-2022-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-jxm0', str).
   def tojis(str)
-    ::NKF::nkf('-jm', str)
+    kconv(str, JIS)
   end
   module_function :tojis
 
   # call-seq:
-  #    Kconv.toeuc(str)   -> string
+  #    Kconv.toeuc(str)   => string
   #
   # Convert <code>str</code> to EUC-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-exm0', str).
   def toeuc(str)
-    ::NKF::nkf('-em', str)
+    kconv(str, EUC)
   end
   module_function :toeuc
 
   # call-seq:
-  #    Kconv.tosjis(str)   -> string
+  #    Kconv.tosjis(str)   => string
   #
   # Convert <code>str</code> to Shift_JIS
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-sxm0', str).
   def tosjis(str)
-    ::NKF::nkf('-sm', str)
+    kconv(str, SJIS)
   end
   module_function :tosjis
 
   # call-seq:
-  #    Kconv.toutf8(str)   -> string
+  #    Kconv.toutf8(str)   => string
   #
   # Convert <code>str</code> to UTF-8
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-wxm0', str).
   def toutf8(str)
-    ::NKF::nkf('-wm', str)
+    kconv(str, UTF8)
   end
   module_function :toutf8
 
   # call-seq:
-  #    Kconv.toutf16(str)   -> string
+  #    Kconv.toutf16(str)   => string
   #
   # Convert <code>str</code> to UTF-16
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-w16xm0', str).
   def toutf16(str)
-    ::NKF::nkf('-w16m', str)
+    kconv(str, UTF16)
   end
   module_function :toutf16
 
+  # call-seq:
+  #    Kconv.toutf32(str)   => string
+  #
+  # Convert <code>str</code> to UTF-32
+  def toutf32(str)
+    kconv(str, UTF32)
+  end
+  module_function :toutf32
+
+  # call-seq:
+  #    Kconv.tolocale   => string
+  #
+  # Convert <code>self</code> to locale encoding
+  def tolocale(str)
+    kconv(str, Encoding.locale_charmap)
+  end
+  module_function :tolocale
+
   #
   # guess
   #
 
   # call-seq:
-  #    Kconv.guess(str)   -> integer
+  #    Kconv.guess(str)   => encoding
   #
-  # Guess input encoding by NKF.guess2
+  # Guess input encoding by NKF.guess
   def guess(str)
     ::NKF::guess(str)
   end
   module_function :guess
 
-  # call-seq:
-  #    Kconv.guess_old(str)   -> integer
-  #
-  # Guess input encoding by NKF.guess1
-  def guess_old(str)
-    ::NKF::guess1(str)
-  end
-  module_function :guess_old
-
   #
   # isEncoding
   #
 
   # call-seq:
-  #    Kconv.iseuc(str)   -> obj or nil
+  #    Kconv.iseuc(str)   => true or false
   #
   # Returns whether input encoding is EUC-JP or not.
   #
   # *Note* don't expect this return value is MatchData.
   def iseuc(str)
-    RegexpEucjp.match( str )
+    str.dup.force_encoding(EUC).valid_encoding?
   end
   module_function :iseuc
 
   # call-seq:
-  #    Kconv.issjis(str)   -> obj or nil
+  #    Kconv.issjis(str)   => true or false
   #
   # Returns whether input encoding is Shift_JIS or not.
-  #
-  # *Note* don't expect this return value is MatchData.
   def issjis(str)
-    RegexpShiftjis.match( str )
+    str.dup.force_encoding(SJIS).valid_encoding?
   end
   module_function :issjis
 
   # call-seq:
-  #    Kconv.isutf8(str)   -> obj or nil
+  #    Kconv.isjis(str)   => true or false
+  #
+  # Returns whether input encoding is ISO-2022-JP or not.
+  def isjis(str)
+    /\A [\t\n\r\x20-\x7E]*
+      (?:
+        (?:\x1b \x28 I      [\x21-\x7E]*
+          |\x1b \x28 J      [\x21-\x7E]*
+          |\x1b \x24 @      (?:[\x21-\x7E]{2})*
+          |\x1b \x24 B      (?:[\x21-\x7E]{2})*
+          |\x1b \x24 \x28 D (?:[\x21-\x7E]{2})*
+        )*
+        \x1b \x28 B [\t\n\r\x20-\x7E]*
+      )*
+     \z/nox =~ str.dup.force_encoding('BINARY') ? true : false
+  end
+  module_function :isjis
+
+  # call-seq:
+  #    Kconv.isutf8(str)   => true or false
   #
   # Returns whether input encoding is UTF-8 or not.
-  #
-  # *Note* don't expect this return value is MatchData.
   def isutf8(str)
-    RegexpUtf8.match( str )
+    str.dup.force_encoding(UTF8).valid_encoding?
   end
   module_function :isutf8
-
 end
 
 class String
   # call-seq:
-  #    String#kconv(out_code, in_code = Kconv::AUTO)
+  #    String#kconv(to_enc, from_enc)
   #
-  # Convert <code>self</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want to decode them, use NKF.nkf.
-  def kconv(out_code, in_code=Kconv::AUTO)
-    Kconv::kconv(self, out_code, in_code)
+  # Convert <code>self</code> to <code>to_enc</code>.
+  # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects.
+  def kconv(to_enc, from_enc=nil)
+    from_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0]
+    Kconv::kconv(self, to_enc, from_enc)
   end
-  
+
   #
   # to Encoding
   #
-  
+
   # call-seq:
-  #    String#tojis   -> string
+  #    String#tojis   => string
   #
   # Convert <code>self</code> to ISO-2022-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-jxm0', str).
   def tojis; Kconv.tojis(self) end
 
   # call-seq:
-  #    String#toeuc   -> string
+  #    String#toeuc   => string
   #
   # Convert <code>self</code> to EUC-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-exm0', str).
   def toeuc; Kconv.toeuc(self) end
 
   # call-seq:
-  #    String#tosjis   -> string
+  #    String#tosjis   => string
   #
   # Convert <code>self</code> to Shift_JIS
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-sxm0', str).
   def tosjis; Kconv.tosjis(self) end
 
   # call-seq:
-  #    String#toutf8   -> string
+  #    String#toutf8   => string
   #
   # Convert <code>self</code> to UTF-8
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-wxm0', str).
   def toutf8; Kconv.toutf8(self) end
 
   # call-seq:
-  #    String#toutf16   -> string
+  #    String#toutf16   => string
   #
   # Convert <code>self</code> to UTF-16
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-w16xm0', str).
   def toutf16; Kconv.toutf16(self) end
 
+  # call-seq:
+  #    String#toutf32   => string
+  #
+  # Convert <code>self</code> to UTF-32
+  def toutf32; Kconv.toutf32(self) end
+
+  # call-seq:
+  #    String#tolocale   => string
+  #
+  # Convert <code>self</code> to locale encoding
+  def tolocale; Kconv.tolocale(self) end
+
   #
   # is Encoding
   #
 
   # call-seq:
-  #    String#iseuc   -> obj or nil
+  #    String#iseuc   => true or false
   #
   # Returns whether <code>self</code>'s encoding is EUC-JP or not.
-  #
-  # *Note* don't expect this return value is MatchData.
   def iseuc;	Kconv.iseuc(self) end
 
   # call-seq:
-  #    String#issjis   -> obj or nil
+  #    String#issjis   => true or false
   #
   # Returns whether <code>self</code>'s encoding is Shift_JIS or not.
-  #
-  # *Note* don't expect this return value is MatchData.
   def issjis;	Kconv.issjis(self) end
 
   # call-seq:
-  #    String#isutf8   -> obj or nil
+  #    String#isjis   => true or false
   #
-  # Returns whether <code>self</code>'s encoding is UTF-8 or not.
+  # Returns whether <code>self</code>'s encoding is ISO-2022-JP or not.
+  def isjis;	Kconv.isjis(self) end
+
+  # call-seq:
+  #    String#isutf8   => true or false
   #
-  # *Note* don't expect this return value is MatchData.
+  # Returns whether <code>self</code>'s encoding is UTF-8 or not.
   def isutf8;	Kconv.isutf8(self) end
 end
diff --git a/ext/nkf/nkf-utf8/config.h b/ext/nkf/nkf-utf8/config.h
index 9da82c6aee..51dc2a5152 100644
--- a/ext/nkf/nkf-utf8/config.h
+++ b/ext/nkf/nkf-utf8/config.h
@@ -1,88 +1,51 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-/* UTF8 $BF~=PNO(B */
+/* UTF8 input and output */
 #define UTF8_INPUT_ENABLE
 #define UTF8_OUTPUT_ENABLE
 
-/* Shift_JIS $BHO0O30$NJ8;z$r!"(BCP932 $B$GF1CM$JJ8;z$KFI$_49$($k(B */
+/* invert characters invalid in Shift_JIS to CP932 */
 #define SHIFTJIS_CP932
 
-/* $B%*%W%7%g%s$GF~NO$r;XDj$7$?;~$K!"J8;z%3!<%I$r8GDj$9$k(B */
+/* fix input encoding when given by option */
 #define INPUT_CODE_FIX
 
-/* --overwrite $B%*%W%7%g%s(B */
+/* --overwrite option */
 /* by Satoru Takabayashi <ccsatoru@vega.aichi-u.ac.jp> */
 #define OVERWRITE
 
-/* --cap-input, --url-input $B%*%W%7%g%s(B */
+/* --cap-input, --url-input option */
 #define INPUT_OPTION
 
-/* --numchar-input $B%*%W%7%g%s(B */
+/* --numchar-input option */
 #define NUMCHAR_OPTION
 
-/* --debug, --no-output $B%*%W%7%g%s(B */
+/* --debug, --no-output option */
 #define CHECK_OPTION
 
 /* JIS X0212 */
 #define X0212_ENABLE
 
-/* --exec-in, --exec-out $B%*%W%7%g%s(B
- * pipe, fork, execvp $B$"$?$j$,L5$$$HF0$-$^$;$s!#(B
- * MS-DOS, MinGW $B$J$I$G$O(B undef $B$K$7$F$/$@$5$$(B
- * child process $B=*N;;~$N=hM}$,$$$$$+$2$s$J$N$G!"(B
- * $B%G%U%)%k%H$GL58z$K$7$F$$$^$9!#(B
+/* --exec-in, --exec-out option
+ * require pipe, fork, execvp and so on.
+ * please undef this on MS-DOS, MinGW
+ * this is still buggy arround child process
  */
 /* #define EXEC_IO */
 
-/* SunOS $B$N(B cc $B$r;H$&$H$-$O(B undef $B$K$7$F$/$@$5$$(B */
-#define ANSI_C_PROTOTYPE
-
-/* int $B$,(B 32bit $BL$K~$N4D6-$G(B NUMCHAR_OPTION $B$r;H$&$K$O!"(B
- * $B%3%a%s%H$r30$7$F$/$@$5$$!#(B
- */
-/* #define INT_IS_SHORT */
-
-
-#if defined(INT_IS_SHORT)
-typedef long nkf_char;
-typedef unsigned char nkf_nfchar;
-#else
-typedef int nkf_char;
-typedef int nkf_nfchar;
-#endif
-
 /* Unicode Normalization */
 #define UNICODE_NORMALIZATION
 
-#ifndef WIN32DLL
-/******************************/
-/* $B%G%U%)%k%H$N=PNO%3!<%IA*Br(B */
-/* Select DEFAULT_CODE */
-#define DEFAULT_CODE_JIS
-/* #define DEFAULT_CODE_SJIS */
-/* #define DEFAULT_CODE_EUC */
-/* #define DEFAULT_CODE_UTF8 */
-/******************************/
-#else
-#define DEFAULT_CODE_SJIS
-#endif
-
-#if defined(NUMCHAR_OPTION) && !defined(UTF8_INPUT_ENABLE)
-#define UTF8_INPUT_ENABLE
-#endif
+/*
+ * Select Default Output Encoding
+ *
+ */
 
-#ifdef UNICODE_NORMALIZATION
-#ifndef UTF8_INPUT_ENABLE
-#define UTF8_INPUT_ENABLE
-#endif
-#define NORMALIZATION_TABLE_LENGTH 942
-#define NORMALIZATION_TABLE_NFC_LENGTH 3
-#define NORMALIZATION_TABLE_NFD_LENGTH 9
-struct normalization_pair{
-    const nkf_nfchar nfc[NORMALIZATION_TABLE_NFC_LENGTH];
-    const nkf_nfchar nfd[NORMALIZATION_TABLE_NFD_LENGTH];
-};
-#endif
+/* #define DEFAULT_CODE_JIS    */
+/* #define DEFAULT_CODE_SJIS   */
+/* #define DEFAULT_CODE_WINDOWS_31J */
+/* #define DEFAULT_CODE_EUC    */
+/* #define DEFAULT_CODE_UTF8   */
 
 #endif /* _CONFIG_H_ */
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 3cd1b160da..06dfc74fcb 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -1,290 +1,305 @@
-/** Network Kanji Filter. (PDS Version)
-************************************************************************
-** Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
-** $BO"Mm@h!'(B $B!J3t!KIY;NDL8&5f=j!!%=%U%H#38&!!;T@n!!;j(B 
-** $B!J(BE-Mail Address: ichikawa@flab.fujitsu.co.jp$B!K(B
-** Copyright (C) 1996,1998
-** Copyright (C) 2002
-** $BO"Mm@h!'(B $BN05eBg3X>pJs9)3X2J(B $B2OLn(B $B??<#(B  mime/X0208 support
-** $B!J(BE-Mail Address: kono@ie.u-ryukyu.ac.jp$B!K(B
-** $BO"Mm@h!'(B COW for DOS & Win16 & Win32 & OS/2
-** $B!J(BE-Mail Address: GHG00637@niftyserve.or.p$B!K(B
-**
-**    $B$3$N%=!<%9$N$$$+$J$kJ#<L!$2~JQ!$=$@5$b5vBz$7$^$9!#$?$@$7!"(B
-**    $B$=$N:]$K$O!"C/$,9W8%$7$?$r<($9$3$NItJ,$r;D$9$3$H!#(B
-**    $B:FG[I[$d;(;o$NIUO?$J$I$NLd$$9g$o$;$bI,MW$"$j$^$;$s!#(B
-**    $B1DMxMxMQ$b>e5-$KH?$7$J$$HO0O$G5v2D$7$^$9!#(B
-**    $B%P%$%J%j$NG[I[$N:]$K$O(Bversion message$B$rJ]B8$9$k$3$H$r>r7o$H$7$^$9!#(B
-**    $B$3$N%W%m%0%i%`$K$D$$$F$OFC$K2?$NJ]>Z$b$7$J$$!"0-$7$+$i$:!#(B
-**
-**    Everyone is permitted to do anything on this program 
-**    including copying, modifying, improving,
-**    as long as you don't try to pretend that you wrote it.
-**    i.e., the above copyright notice has to appear in all copies.  
-**    Binary distribution requires original version messages.
-**    You don't have to ask before copying, redistribution or publishing.
-**    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
-***********************************************************************/
-
-/***********************************************************************
-** UTF-8 $B%5%]!<%H$K$D$$$F(B
-**    $B=>Mh$N(B nkf $B$HF~$l$+$($F$=$N$^$^;H$($k$h$&$K$J$C$F$$$^$9(B
-**    nkf -e $B$J$I$H$7$F5/F0$9$k$H!"<+F0H=JL$G(B UTF-8 $B$HH=Dj$5$l$l$P!"(B
-**    $B$=$N$^$^(B euc-jp $B$KJQ49$5$l$^$9(B
-**
-**    $B$^$@%P%0$,$"$k2DG=@-$,9b$$$G$9!#(B
-**    ($BFC$K<+F0H=JL!"%3!<%I:.:_!"%(%i!<=hM}7O(B)
-**
-**    $B2?$+LdBj$r8+$D$1$?$i!"(B
-**        E-Mail: furukawa@tcp-ip.or.jp
-**    $B$^$G8fO"Mm$r$*4j$$$7$^$9!#(B
-***********************************************************************/
-/* $Id$ */
-#define NKF_VERSION "2.0.8"
-#define NKF_RELEASE_DATE "2007-01-28"
-#include "config.h"
-#include "utf8tbl.h"
-
-#define COPY_RIGHT \
-    "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \
-    "Copyright (C) 2002-2006 Kono, Furukawa, Naruse, mastodon"
-
-
 /*
-**
-**
-**
-** USAGE:       nkf [flags] [file] 
-**
-** Flags:
-** b    Output is buffered             (DEFAULT)
-** u    Output is unbuffered
-**
-** t    no operation
-**
-** j    Output code is JIS 7 bit        (DEFAULT SELECT) 
-** s    Output code is MS Kanji         (DEFAULT SELECT) 
-** e    Output code is AT&T JIS         (DEFAULT SELECT) 
-** w    Output code is AT&T JIS         (DEFAULT SELECT) 
-** l    Output code is JIS 7bit and ISO8859-1 Latin-1
-**
-** m    MIME conversion for ISO-2022-JP
-** I    Convert non ISO-2022-JP charactor to GETA by Pekoe <pekoe@lair.net>
-** i_ Output sequence to designate JIS-kanji (DEFAULT_J)
-** o_ Output sequence to designate single-byte roman characters (DEFAULT_R)
-** M    MIME output conversion 
-**
-** r  {de/en}crypt ROT13/47
-**
-** v  display Version
-**
-** T  Text mode output        (for MS-DOS)
-**
-** x    Do not convert X0201 kana into X0208
-** Z    Convert X0208 alphabet to ASCII
-**
-** f60  fold option
-**
-** m    MIME decode
-** B    try to fix broken JIS, missing Escape
-** B[1-9]  broken level
-**
-** O   Output to 'nkf.out' file or last file name
-** d   Delete \r in line feed 
-** c   Add \r in line feed 
-** -- other long option
-** -- ignore following option (don't use with -O )
-**
-**/
-
-#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
-#define MSDOS
-#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
-#define __WIN32__
-#endif
-#endif
-
-#ifdef PERL_XS
-#undef OVERWRITE
-#endif
-
-#ifndef PERL_XS
-#include <stdio.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(MSDOS) || defined(__OS2__)
-#include <fcntl.h>
-#include <io.h>
-#if defined(_MSC_VER) || defined(__WATCOMC__)
-#define mktemp _mktemp
-#endif
-#endif
-
-#ifdef MSDOS
-#ifdef LSI_C
-#define setbinmode(fp) fsetbin(fp)
-#elif defined(__DJGPP__)
-#include <libc/dosio.h>
-#define setbinmode(fp) djgpp_setbinmode(fp)
-#else /* Microsoft C, Turbo C */
-#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
-#endif
-#else /* UNIX */
-#define setbinmode(fp)
-#endif
-
-#if defined(__DJGPP__)
-void  djgpp_setbinmode(FILE *fp)
-{
-    /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
-    int fd, m;
-    fd = fileno(fp);
-    m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
-    __file_handle_set(fd, m);
-}
-#endif
-
-#ifdef _IOFBF /* SysV and MSDOS, Windows */
-#define       setvbuffer(fp, buf, size)       setvbuf(fp, buf, _IOFBF, size)
-#else /* BSD */
-#define       setvbuffer(fp, buf, size)       setbuffer(fp, buf, size)
-#endif
-
-/*Borland C++ 4.5 EasyWin*/
-#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
-#define         EASYWIN
-#ifndef __WIN16__
-#define __WIN16__
-#endif
-#include <windows.h>
-#endif
+ * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
+ * Copyright (c) 1996-2010, The nkf Project.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+#define NKF_VERSION "2.1.1"
+#define NKF_RELEASE_DATE "2010-04-28"
+#define COPY_RIGHT \
+    "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
+    "Copyright (C) 1996-2010, The nkf Project."
 
-#ifdef OVERWRITE
-/* added by satoru@isoternet.org */
-#if defined(__EMX__)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
-#include <unistd.h>
-#if defined(__WATCOMC__)
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#endif
-#else /* defined(MSDOS) */
+#include "config.h"
+#include "nkf.h"
+#include "utf8tbl.h"
 #ifdef __WIN32__
-#ifdef __BORLANDC__ /* BCC32 */
-#include <utime.h>
-#else /* !defined(__BORLANDC__) */
-#include <sys/utime.h>
-#endif /* (__BORLANDC__) */
-#else /* !defined(__WIN32__) */
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__)  /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
-#include <sys/utime.h>
-#elif defined(__TURBOC__) /* BCC */
-#include <utime.h>
-#elif defined(LSI_C) /* LSI C */
-#endif /* (__WIN32__) */
-#endif
+#include <windows.h>
+#include <locale.h>
 #endif
+#if defined(__OS2__)
+# define INCL_DOS
+# define INCL_DOSERRORS
+# include <os2.h>
 #endif
+#include <assert.h>
 
-#define         FALSE   0
-#define         TRUE    1
 
-/* state of output_mode and input_mode  
+/* state of output_mode and input_mode
 
    c2           0 means ASCII
-                X0201
-                ISO8859_1
-                X0208
-                EOF      all termination
+   JIS_X_0201_1976_K
+   ISO_8859_1
+   JIS_X_0208
+   EOF      all termination
    c1           32bit data
 
  */
 
-#define         ASCII           0
-#define         X0208           1
-#define         X0201           2
-#define         ISO8859_1       8
-#define         NO_X0201        3
-#define         X0212      0x2844
-#define         X0213_1    0x284F
-#define         X0213_2    0x2850
-
-/* Input Assumption */
-
-#define         JIS_INPUT       4
-#define         EUC_INPUT      16
-#define         SJIS_INPUT      5
-#define         LATIN1_INPUT    6
-#define         FIXED_MIME      7
-#define         STRICT_MIME     8
-
 /* MIME ENCODE */
 
-#define        	ISO2022JP       9
-#define  	JAPANESE_EUC   10
-#define		SHIFT_JIS      11
-
-#define		UTF8           12
-#define		UTF8_INPUT     13
-#define		UTF16_INPUT    1015
-#define		UTF32_INPUT    1017
+#define         FIXED_MIME      7
+#define         STRICT_MIME     8
 
 /* byte order */
-
-#define		ENDIAN_BIG	1234
-#define		ENDIAN_LITTLE	4321
-#define		ENDIAN_2143	2143
-#define		ENDIAN_3412	3412
-
-#define         WISH_TRUE      15
+enum byte_order {
+    ENDIAN_BIG    = 1,
+    ENDIAN_LITTLE = 2,
+    ENDIAN_2143   = 3,
+    ENDIAN_3412   = 4
+};
 
 /* ASCII CODE */
 
 #define         BS      0x08
 #define         TAB     0x09
-#define         NL      0x0a
+#define         LF      0x0a
 #define         CR      0x0d
 #define         ESC     0x1b
-#define         SPACE   0x20
-#define         AT      0x40
-#define         SSP     0xa0
+#define         SP      0x20
 #define         DEL     0x7f
 #define         SI      0x0f
 #define         SO      0x0e
-#define         SSO     0x8e
+#define         SS2     0x8e
 #define         SS3     0x8f
+#define         CRLF    0x0D0A
+
+
+/* encodings */
+
+enum nkf_encodings {
+    ASCII,
+    ISO_8859_1,
+    ISO_2022_JP,
+    CP50220,
+    CP50221,
+    CP50222,
+    ISO_2022_JP_1,
+    ISO_2022_JP_3,
+    ISO_2022_JP_2004,
+    SHIFT_JIS,
+    WINDOWS_31J,
+    CP10001,
+    EUC_JP,
+    EUCJP_NKF,
+    CP51932,
+    EUCJP_MS,
+    EUCJP_ASCII,
+    SHIFT_JISX0213,
+    SHIFT_JIS_2004,
+    EUC_JISX0213,
+    EUC_JIS_2004,
+    UTF_8,
+    UTF_8N,
+    UTF_8_BOM,
+    UTF8_MAC,
+    UTF_16,
+    UTF_16BE,
+    UTF_16BE_BOM,
+    UTF_16LE,
+    UTF_16LE_BOM,
+    UTF_32,
+    UTF_32BE,
+    UTF_32BE_BOM,
+    UTF_32LE,
+    UTF_32LE_BOM,
+    BINARY,
+    NKF_ENCODING_TABLE_SIZE,
+    JIS_X_0201_1976_K = 0x1013, /* I */ /* JIS C 6220-1969 */
+    /* JIS_X_0201_1976_R = 0x1014, */ /* J */ /* JIS C 6220-1969 */
+    /* JIS_X_0208_1978   = 0x1040, */ /* @ */ /* JIS C 6226-1978 */
+    /* JIS_X_0208_1983   = 0x1087, */ /* B */ /* JIS C 6226-1983 */
+    JIS_X_0208        = 0x1168, /* @B */
+    JIS_X_0212        = 0x1159, /* D */
+    /* JIS_X_0213_2000_1 = 0x1228, */ /* O */
+    JIS_X_0213_2 = 0x1229, /* P */
+    JIS_X_0213_1 = 0x1233 /* Q */
+};
+
+static nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
+static nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
+static nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
+static nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0);
+static nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0);
+static void j_oconv(nkf_char c2, nkf_char c1);
+static void s_oconv(nkf_char c2, nkf_char c1);
+static void e_oconv(nkf_char c2, nkf_char c1);
+static void w_oconv(nkf_char c2, nkf_char c1);
+static void w_oconv16(nkf_char c2, nkf_char c1);
+static void w_oconv32(nkf_char c2, nkf_char c1);
+
+typedef struct {
+    const char *name;
+    nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0);
+    void (*oconv)(nkf_char c2, nkf_char c1);
+} nkf_native_encoding;
+
+nkf_native_encoding NkfEncodingASCII =		{ "ASCII", e_iconv, e_oconv };
+nkf_native_encoding NkfEncodingISO_2022_JP =	{ "ISO-2022-JP", e_iconv, j_oconv };
+nkf_native_encoding NkfEncodingShift_JIS =	{ "Shift_JIS", s_iconv, s_oconv };
+nkf_native_encoding NkfEncodingEUC_JP =		{ "EUC-JP", e_iconv, e_oconv };
+nkf_native_encoding NkfEncodingUTF_8 =		{ "UTF-8", w_iconv, w_oconv };
+nkf_native_encoding NkfEncodingUTF_16 =		{ "UTF-16", w_iconv16, w_oconv16 };
+nkf_native_encoding NkfEncodingUTF_32 =		{ "UTF-32", w_iconv32, w_oconv32 };
+
+typedef struct {
+    const int id;
+    const char *name;
+    const nkf_native_encoding *base_encoding;
+} nkf_encoding;
+
+nkf_encoding nkf_encoding_table[] = {
+    {ASCII,		"US-ASCII",		&NkfEncodingASCII},
+    {ISO_8859_1,	"ISO-8859-1",		&NkfEncodingASCII},
+    {ISO_2022_JP,	"ISO-2022-JP",		&NkfEncodingISO_2022_JP},
+    {CP50220,		"CP50220",		&NkfEncodingISO_2022_JP},
+    {CP50221,		"CP50221",		&NkfEncodingISO_2022_JP},
+    {CP50222,		"CP50222",		&NkfEncodingISO_2022_JP},
+    {ISO_2022_JP_1,	"ISO-2022-JP-1",	&NkfEncodingISO_2022_JP},
+    {ISO_2022_JP_3,	"ISO-2022-JP-3",	&NkfEncodingISO_2022_JP},
+    {ISO_2022_JP_2004,	"ISO-2022-JP-2004",	&NkfEncodingISO_2022_JP},
+    {SHIFT_JIS,		"Shift_JIS",		&NkfEncodingShift_JIS},
+    {WINDOWS_31J,	"Windows-31J",		&NkfEncodingShift_JIS},
+    {CP10001,		"CP10001",		&NkfEncodingShift_JIS},
+    {EUC_JP,		"EUC-JP",		&NkfEncodingEUC_JP},
+    {EUCJP_NKF,		"eucJP-nkf",		&NkfEncodingEUC_JP},
+    {CP51932,		"CP51932",		&NkfEncodingEUC_JP},
+    {EUCJP_MS,		"eucJP-MS",		&NkfEncodingEUC_JP},
+    {EUCJP_ASCII,	"eucJP-ASCII",		&NkfEncodingEUC_JP},
+    {SHIFT_JISX0213,	"Shift_JISX0213",	&NkfEncodingShift_JIS},
+    {SHIFT_JIS_2004,	"Shift_JIS-2004",	&NkfEncodingShift_JIS},
+    {EUC_JISX0213,	"EUC-JISX0213",		&NkfEncodingEUC_JP},
+    {EUC_JIS_2004,	"EUC-JIS-2004",		&NkfEncodingEUC_JP},
+    {UTF_8,		"UTF-8",		&NkfEncodingUTF_8},
+    {UTF_8N,		"UTF-8N",		&NkfEncodingUTF_8},
+    {UTF_8_BOM,		"UTF-8-BOM",		&NkfEncodingUTF_8},
+    {UTF8_MAC,		"UTF8-MAC",		&NkfEncodingUTF_8},
+    {UTF_16,		"UTF-16",		&NkfEncodingUTF_16},
+    {UTF_16BE,		"UTF-16BE",		&NkfEncodingUTF_16},
+    {UTF_16BE_BOM,	"UTF-16BE-BOM",		&NkfEncodingUTF_16},
+    {UTF_16LE,		"UTF-16LE",		&NkfEncodingUTF_16},
+    {UTF_16LE_BOM,	"UTF-16LE-BOM",		&NkfEncodingUTF_16},
+    {UTF_32,		"UTF-32",		&NkfEncodingUTF_32},
+    {UTF_32BE,		"UTF-32BE",		&NkfEncodingUTF_32},
+    {UTF_32BE_BOM,	"UTF-32BE-BOM",		&NkfEncodingUTF_32},
+    {UTF_32LE,		"UTF-32LE",		&NkfEncodingUTF_32},
+    {UTF_32LE_BOM,	"UTF-32LE-BOM",		&NkfEncodingUTF_32},
+    {BINARY,		"BINARY",		&NkfEncodingASCII},
+    {-1,		NULL,			NULL}
+};
+
+struct {
+    const char *name;
+    const int id;
+} encoding_name_to_id_table[] = {
+    {"US-ASCII",		ASCII},
+    {"ASCII",			ASCII},
+    {"646",			ASCII},
+    {"ROMAN8",			ASCII},
+    {"ISO-2022-JP",		ISO_2022_JP},
+    {"ISO2022JP-CP932",		CP50220},
+    {"CP50220",			CP50220},
+    {"CP50221",			CP50221},
+    {"CSISO2022JP",		CP50221},
+    {"CP50222",			CP50222},
+    {"ISO-2022-JP-1",		ISO_2022_JP_1},
+    {"ISO-2022-JP-3",		ISO_2022_JP_3},
+    {"ISO-2022-JP-2004",	ISO_2022_JP_2004},
+    {"SHIFT_JIS",		SHIFT_JIS},
+    {"SJIS",			SHIFT_JIS},
+    {"MS_Kanji",		SHIFT_JIS},
+    {"PCK",			SHIFT_JIS},
+    {"WINDOWS-31J",		WINDOWS_31J},
+    {"CSWINDOWS31J",		WINDOWS_31J},
+    {"CP932",			WINDOWS_31J},
+    {"MS932",			WINDOWS_31J},
+    {"CP10001",			CP10001},
+    {"EUCJP",			EUC_JP},
+    {"EUC-JP",			EUC_JP},
+    {"EUCJP-NKF",		EUCJP_NKF},
+    {"CP51932",			CP51932},
+    {"EUC-JP-MS",		EUCJP_MS},
+    {"EUCJP-MS",		EUCJP_MS},
+    {"EUCJPMS",			EUCJP_MS},
+    {"EUC-JP-ASCII",		EUCJP_ASCII},
+    {"EUCJP-ASCII",		EUCJP_ASCII},
+    {"SHIFT_JISX0213",		SHIFT_JISX0213},
+    {"SHIFT_JIS-2004",		SHIFT_JIS_2004},
+    {"EUC-JISX0213",		EUC_JISX0213},
+    {"EUC-JIS-2004",		EUC_JIS_2004},
+    {"UTF-8",			UTF_8},
+    {"UTF-8N",			UTF_8N},
+    {"UTF-8-BOM",		UTF_8_BOM},
+    {"UTF8-MAC",		UTF8_MAC},
+    {"UTF-8-MAC",		UTF8_MAC},
+    {"UTF-16",			UTF_16},
+    {"UTF-16BE",		UTF_16BE},
+    {"UTF-16BE-BOM",		UTF_16BE_BOM},
+    {"UTF-16LE",		UTF_16LE},
+    {"UTF-16LE-BOM",		UTF_16LE_BOM},
+    {"UTF-32",			UTF_32},
+    {"UTF-32BE",		UTF_32BE},
+    {"UTF-32BE-BOM",		UTF_32BE_BOM},
+    {"UTF-32LE",		UTF_32LE},
+    {"UTF-32LE-BOM",		UTF_32LE_BOM},
+    {"BINARY",			BINARY},
+    {NULL,			-1}
+};
+
+#if defined(DEFAULT_CODE_JIS)
+#define	    DEFAULT_ENCIDX ISO_2022_JP
+#elif defined(DEFAULT_CODE_SJIS)
+#define	    DEFAULT_ENCIDX SHIFT_JIS
+#elif defined(DEFAULT_CODE_WINDOWS_31J)
+#define	    DEFAULT_ENCIDX WINDOWS_31J
+#elif defined(DEFAULT_CODE_EUC)
+#define	    DEFAULT_ENCIDX EUC_JP
+#elif defined(DEFAULT_CODE_UTF8)
+#define	    DEFAULT_ENCIDX UTF_8
+#endif
+
 
 #define		is_alnum(c)  \
-            (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
+    (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
 
 /* I don't trust portablity of toupper */
 #define nkf_toupper(c)  (('a'<=c && c<='z')?(c-('a'-'A')):c)
 #define nkf_isoctal(c)  ('0'<=c && c<='7')
 #define nkf_isdigit(c)  ('0'<=c && c<='9')
 #define nkf_isxdigit(c)  (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F'))
-#define nkf_isblank(c) (c == SPACE || c == TAB)
-#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL)
+#define nkf_isblank(c) (c == SP || c == TAB)
+#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == LF)
 #define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
 #define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c))
-#define nkf_isprint(c) (' '<=c && c<='~')
+#define nkf_isprint(c) (SP<=c && c<='~')
 #define nkf_isgraph(c) ('!'<=c && c<='~')
 #define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \
-                    ('A'<=c&&c<='F') ? (c-'A'+10) : \
-                    ('a'<=c&&c<='f') ? (c-'a'+10) : 0 )
+		    ('A'<=c&&c<='F') ? (c-'A'+10) : \
+		    ('a'<=c&&c<='f') ? (c-'a'+10) : 0)
+#define bin2hex(c) ("0123456789ABCDEF"[c&15])
 #define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3)
+#define nkf_noescape_mime(c) ((c == CR) || (c == LF) || \
+			      ((c > SP) && (c < DEL) && (c != '?') && (c != '=') && (c != '_') \
+			       && (c != '(') && (c != ')') && (c != '.') && (c != 0x22)))
 
-#define CP932_TABLE_BEGIN 0xFA
-#define CP932_TABLE_END   0xFC
-#define CP932INV_TABLE_BEGIN 0xED
-#define CP932INV_TABLE_END   0xEE
 #define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END)
+#define nkf_byte_jisx0201_katakana_p(c) (SP <= c && c <= 0x5F)
 
 #define         HOLD_SIZE       1024
 #if defined(INT_IS_SHORT)
@@ -296,23 +311,11 @@ void  djgpp_setbinmode(FILE *fp)
 #define         DEFAULT_J       'B'
 #define         DEFAULT_R       'B'
 
-#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
-#define         SJ6394  0x0161          /* 63 - 94 ku offset */
 
-#define         RANGE_NUM_MAX   18
 #define         GETA1   0x22
 #define         GETA2   0x2e
 
 
-#if defined(UTF8_OUTPUT_ENABLE) || defined(UTF8_INPUT_ENABLE)
-#define sizeof_euc_to_utf8_1byte 94
-#define sizeof_euc_to_utf8_2bytes 94
-#define sizeof_utf8_to_euc_C2 64
-#define sizeof_utf8_to_euc_E5B8 64
-#define sizeof_utf8_to_euc_2bytes 112
-#define sizeof_utf8_to_euc_3bytes 16
-#endif
-
 /* MIME preprocessor */
 
 #ifdef EASYWIN /*Easy Win */
@@ -320,7 +323,7 @@ extern POINT _BufferSize;
 #endif
 
 struct input_code{
-    char *name;
+    const char *name;
     nkf_char stat;
     nkf_char score;
     nkf_char index;
@@ -330,31 +333,21 @@ struct input_code{
     int _file_stat;
 };
 
-static char *input_codename = "";
+static const char *input_codename = NULL; /* NULL: unestablished, "": BINARY */
+static nkf_encoding *input_encoding = NULL;
+static nkf_encoding *output_encoding = NULL;
 
-#ifndef PERL_XS
-static const char *CopyRight = COPY_RIGHT;
-#endif
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static  nkf_char     noconvert(FILE *f);
-#endif
-static  void    module_connection(void);
-static  nkf_char     kanji_convert(FILE *f);
-static  nkf_char     h_conv(FILE *f,nkf_char c2,nkf_char c1);
-static  nkf_char     push_hold_buf(nkf_char c2);
-static  void    set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0));
-static  nkf_char     s_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-static  nkf_char     s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
-static  nkf_char     e_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
 #if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
 /* UCS Mapping
  * 0: Shift_JIS, eucJP-ascii
  * 1: eucJP-ms
  * 2: CP932, CP51932
+ * 3: CP10001
  */
-#define UCS_MAP_ASCII 0
-#define UCS_MAP_MS    1
-#define UCS_MAP_CP932 2
+#define UCS_MAP_ASCII   0
+#define UCS_MAP_MS      1
+#define UCS_MAP_CP932   2
+#define UCS_MAP_CP10001 3
 static int ms_ucs_map_f = UCS_MAP_ASCII;
 #endif
 #ifdef UTF8_INPUT_ENABLE
@@ -364,48 +357,13 @@ static  int     no_cp932ext_f = FALSE;
 static  int     no_best_fit_chars_f = FALSE;
 static  int     input_endian = ENDIAN_BIG;
 static  nkf_char     unicode_subchar = '?'; /* the regular substitution character */
-static  void    nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c);
-static  void    encode_fallback_html(nkf_char c);
-static  void    encode_fallback_xml(nkf_char c);
-static  void    encode_fallback_java(nkf_char c);
-static  void    encode_fallback_perl(nkf_char c);
-static  void    encode_fallback_subchar(nkf_char c);
 static  void    (*encode_fallback)(nkf_char c) = NULL;
-static  nkf_char     w2e_conv(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
-static  nkf_char     w_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-static  nkf_char     w_iconv16(nkf_char c2,nkf_char c1,nkf_char c0);
-static  nkf_char     w_iconv32(nkf_char c2,nkf_char c1,nkf_char c0);
-static  nkf_char	unicode_to_jis_common(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
-static  nkf_char	w_iconv_common(nkf_char c1,nkf_char c0,const unsigned short *const *pp,nkf_char psize,nkf_char *p2,nkf_char *p1);
-static  void    w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0);
-static  nkf_char     ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0);
-static  nkf_char     w16e_conv(nkf_char val,nkf_char *p2,nkf_char *p1);
 static  void    w_status(struct input_code *, nkf_char);
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
 static  int     output_bom_f = FALSE;
 static  int     output_endian = ENDIAN_BIG;
-static  nkf_char     e2w_conv(nkf_char c2,nkf_char c1);
-static  void    w_oconv(nkf_char c2,nkf_char c1);
-static  void    w_oconv16(nkf_char c2,nkf_char c1);
-static  void    w_oconv32(nkf_char c2,nkf_char c1);
-#endif
-static  void    e_oconv(nkf_char c2,nkf_char c1);
-static  nkf_char     e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
-static  void    s_oconv(nkf_char c2,nkf_char c1);
-static  void    j_oconv(nkf_char c2,nkf_char c1);
-static  void    fold_conv(nkf_char c2,nkf_char c1);
-static  void    cr_conv(nkf_char c2,nkf_char c1);
-static  void    z_conv(nkf_char c2,nkf_char c1);
-static  void    rot_conv(nkf_char c2,nkf_char c1);
-static  void    hira_conv(nkf_char c2,nkf_char c1);
-static  void    base64_conv(nkf_char c2,nkf_char c1);
-static  void    iso2022jp_check_conv(nkf_char c2,nkf_char c1);
-static  void    no_connection(nkf_char c2,nkf_char c1);
-static  nkf_char     no_connection2(nkf_char c2,nkf_char c1,nkf_char c0);
-
-static  void    code_score(struct input_code *ptr);
-static  void    code_status(nkf_char c);
+#endif
 
 static  void    std_putc(nkf_char c);
 static  nkf_char     std_getc(FILE *f);
@@ -414,32 +372,9 @@ static  nkf_char     std_ungetc(nkf_char c,FILE *f);
 static  nkf_char     broken_getc(FILE *f);
 static  nkf_char     broken_ungetc(nkf_char c,FILE *f);
 
-static  nkf_char     mime_begin(FILE *f);
 static  nkf_char     mime_getc(FILE *f);
-static  nkf_char     mime_ungetc(nkf_char c,FILE *f);
-
-static  void    switch_mime_getc(void);
-static  void    unswitch_mime_getc(void);
-static  nkf_char     mime_begin_strict(FILE *f);
-static  nkf_char     mime_getc_buf(FILE *f);
-static  nkf_char     mime_ungetc_buf(nkf_char c,FILE *f);
-static  nkf_char     mime_integrity(FILE *f,const unsigned char *p);
-
-static  nkf_char     base64decode(nkf_char c);
-static  void    mime_prechar(nkf_char c2, nkf_char c1);
-static  void    mime_putc(nkf_char c);
-static  void    open_mime(nkf_char c);
-static  void    close_mime(void);
-static  void    eof_mime(void);
-static  void    mimeout_addchar(nkf_char c);
-#ifndef PERL_XS
-static  void    usage(void);
-static  void    version(void);
-#endif
-static  void    options(unsigned char *c);
-#if defined(PERL_XS) || defined(WIN32DLL)
-static  void    reinit(void);
-#endif
+
+static void mime_putc(nkf_char c);
 
 /* buffers */
 
@@ -447,19 +382,8 @@ static  void    reinit(void);
 static unsigned char   stdibuf[IOBUF_SIZE];
 static unsigned char   stdobuf[IOBUF_SIZE];
 #endif
-static unsigned char   hold_buf[HOLD_SIZE*2];
-static int             hold_count = 0;
-
-/* MIME preprocessor fifo */
 
-#define MIME_BUF_SIZE   (1024)    /* 2^n ring buffer */
-#define MIME_BUF_MASK   (MIME_BUF_SIZE-1)   
-#define Fifo(n)         mime_buf[(n)&MIME_BUF_MASK]
-static unsigned char           mime_buf[MIME_BUF_SIZE];
-static unsigned int            mime_top = 0;
-static unsigned int            mime_last = 0;  /* decoded */
-static unsigned int            mime_input = 0; /* undecoded */
-static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
+#define NKF_UNSPECIFIED (-TRUE)
 
 /* flags */
 static int             unbuf_f = FALSE;
@@ -468,79 +392,60 @@ static int             nop_f = FALSE;
 static int             binmode_f = TRUE;       /* binary mode */
 static int             rot_f = FALSE;          /* rot14/43 mode */
 static int             hira_f = FALSE;          /* hira/kata henkan */
-static int             input_f = FALSE;        /* non fixed input code  */
 static int             alpha_f = FALSE;        /* convert JIx0208 alphbet to ASCII */
-static int             mime_f = STRICT_MIME;   /* convert MIME B base64 or Q */
+static int             mime_f = MIME_DECODE_DEFAULT;   /* convert MIME B base64 or Q */
 static int             mime_decode_f = FALSE;  /* mime decode is explicitly on */
 static int             mimebuf_f = FALSE;      /* MIME buffered input */
 static int             broken_f = FALSE;       /* convert ESC-less broken JIS */
 static int             iso8859_f = FALSE;      /* ISO8859 through */
 static int             mimeout_f = FALSE;       /* base64 mode */
-#if defined(MSDOS) || defined(__OS2__) 
-static int             x0201_f = TRUE;         /* Assume JISX0201 kana */
-#else
-static int             x0201_f = NO_X0201;     /* Assume NO JISX0201 */
-#endif
-static int             iso2022jp_f = FALSE;    /* convert ISO-2022-JP */
+static int             x0201_f = NKF_UNSPECIFIED;   /* convert JIS X 0201 */
+static int             iso2022jp_f = FALSE;    /* replace non ISO-2022-JP with GETA */
 
 #ifdef UNICODE_NORMALIZATION
 static int nfc_f = FALSE;
 static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */
 static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char nfc_getc(FILE *f);
-static nkf_char nfc_ungetc(nkf_char c,FILE *f);
 #endif
 
 #ifdef INPUT_OPTION
 static int cap_f = FALSE;
 static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */
 static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char cap_getc(FILE *f);
-static nkf_char cap_ungetc(nkf_char c,FILE *f);
 
 static int url_f = FALSE;
 static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */
 static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char url_getc(FILE *f);
-static nkf_char url_ungetc(nkf_char c,FILE *f);
 #endif
 
-#if defined(INT_IS_SHORT)
-#define NKF_INT32_C(n)   (n##L)
-#else
-#define NKF_INT32_C(n)   (n)
-#endif
-#define PREFIX_EUCG3	NKF_INT32_C(0x8F00)
-#define CLASS_MASK	NKF_INT32_C(0xFF000000)
-#define CLASS_UNICODE	NKF_INT32_C(0x01000000)
-#define VALUE_MASK	NKF_INT32_C(0x00FFFFFF)
-#define UNICODE_MAX	NKF_INT32_C(0x0010FFFF)
-#define is_unicode_capsule(c) ((c & CLASS_MASK) == CLASS_UNICODE)
-#define is_unicode_bmp(c) ((c & VALUE_MASK) <= NKF_INT32_C(0xFFFF))
+#define PREFIX_EUCG3    NKF_INT32_C(0x8F00)
+#define CLASS_MASK      NKF_INT32_C(0xFF000000)
+#define CLASS_UNICODE   NKF_INT32_C(0x01000000)
+#define VALUE_MASK      NKF_INT32_C(0x00FFFFFF)
+#define UNICODE_BMP_MAX NKF_INT32_C(0x0000FFFF)
+#define UNICODE_MAX     NKF_INT32_C(0x0010FFFF)
+#define nkf_char_euc3_new(c) ((c) | PREFIX_EUCG3)
+#define nkf_char_unicode_new(c) ((c) | CLASS_UNICODE)
+#define nkf_char_unicode_p(c) ((c & CLASS_MASK) == CLASS_UNICODE)
+#define nkf_char_unicode_bmp_p(c) ((c & VALUE_MASK) <= UNICODE_BMP_MAX)
+#define nkf_char_unicode_value_p(c) ((c & VALUE_MASK) <= UNICODE_MAX)
 
 #ifdef NUMCHAR_OPTION
 static int numchar_f = FALSE;
 static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
 static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char numchar_getc(FILE *f);
-static nkf_char numchar_ungetc(nkf_char c,FILE *f);
 #endif
 
 #ifdef CHECK_OPTION
 static int noout_f = FALSE;
 static void no_putc(nkf_char c);
-static nkf_char debug_f = FALSE;
+static int debug_f = FALSE;
 static void debug(const char *str);
 static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0;
 #endif
 
-static int guess_f = FALSE;
-#if !defined PERL_XS
-static  void    print_guessed_code(char *filename);
-#endif
-static  void    set_input_codename(char *codename);
-static int is_inputcode_mixed = FALSE;
-static int is_inputcode_set   = FALSE;
+static int guess_f = 0; /* 0: OFF, 1: ON, 2: VERBOSE */
+static  void    set_input_codename(const char *codename);
 
 #ifdef EXEC_IO
 static int exec_f = 0;
@@ -556,23 +461,11 @@ static int cp932inv_f = TRUE;
 /* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */
 #endif /* SHIFTJIS_CP932 */
 
-#ifdef X0212_ENABLE
 static int x0212_f = FALSE;
-static nkf_char x0212_shift(nkf_char c);
-static nkf_char x0212_unshift(nkf_char c);
-#endif
 static int x0213_f = FALSE;
 
 static unsigned char prefix_table[256];
 
-static void set_code_score(struct input_code *ptr, nkf_char score);
-static void clr_code_score(struct input_code *ptr, nkf_char score);
-static void status_disable(struct input_code *ptr);
-static void status_push_ch(struct input_code *ptr, nkf_char c);
-static void status_clear(struct input_code *ptr);
-static void status_reset(struct input_code *ptr);
-static void status_reinit(struct input_code *ptr);
-static void status_check(struct input_code *ptr, nkf_char c);
 static void e_status(struct input_code *, nkf_char);
 static void s_status(struct input_code *, nkf_char);
 
@@ -581,13 +474,13 @@ struct input_code input_code_list[] = {
     {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0},
 #ifdef UTF8_INPUT_ENABLE
     {"UTF-8",     0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0},
-    {"UTF-16",    0, 0, 0, {0, 0, 0},     NULL, w_iconv16, 0},
-    {"UTF-32",    0, 0, 0, {0, 0, 0},     NULL, w_iconv32, 0},
+    {"UTF-16",     0, 0, 0, {0, 0, 0}, NULL, w_iconv16, 0},
+    {"UTF-32",     0, 0, 0, {0, 0, 0}, NULL, w_iconv32, 0},
 #endif
-    {0}
+    {NULL,        0, 0, 0, {0, 0, 0}, NULL, NULL, 0}
 };
 
-static int              mimeout_mode = 0;
+static int              mimeout_mode = 0; /* 0, -1, 'Q', 'B', 1, 2 */
 static int              base64_count = 0;
 
 /* X0208 -> ASCII converter */
@@ -610,31 +503,28 @@ static unsigned char   ascii_intro = DEFAULT_R;
 
 static int             fold_margin  = FOLD_MARGIN;
 
-/* converters */
+/* process default */
 
-#ifdef DEFAULT_CODE_JIS
-#   define  DEFAULT_CONV j_oconv
-#endif
-#ifdef DEFAULT_CODE_SJIS
-#   define  DEFAULT_CONV s_oconv
-#endif
-#ifdef DEFAULT_CODE_EUC
-#   define  DEFAULT_CONV e_oconv
-#endif
-#ifdef DEFAULT_CODE_UTF8
-#   define  DEFAULT_CONV w_oconv
-#endif
+static nkf_char
+no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    fprintf(stderr,"nkf internal module connection failure.\n");
+    exit(EXIT_FAILURE);
+    return 0; /* LINT */
+}
 
-/* process default */
-static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV;
+static void
+no_connection(nkf_char c2, nkf_char c1)
+{
+    no_connection2(c2,c1,0);
+}
 
-static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection;
-/* s_iconv or oconv */
 static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
+static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection;
 
 static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection;
 static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_crconv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_eol_conv)(nkf_char c2,nkf_char c1) = no_connection;
 static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection;
 static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection;
 static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection;
@@ -660,17 +550,15 @@ static  nkf_char    (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */
 static  nkf_char    (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc;
 
 /* Global states */
-static int output_mode = ASCII,    /* output kanji mode */
-           input_mode =  ASCII,    /* input kanji mode */
-           shift_mode =  FALSE;    /* TRUE shift out, or X0201  */
+static int output_mode = ASCII;    /* output kanji mode */
+static int input_mode =  ASCII;    /* input kanji mode */
 static int mime_decode_mode =   FALSE;    /* MIME mode B base64, Q hex */
 
 /* X0201 / X0208 conversion tables */
 
 /* X0201 kana conversion table */
 /* 90-9F A0-DF */
-static const
-unsigned char cv[]= {
+static const unsigned char cv[]= {
     0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57,
     0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21,
     0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29,
@@ -692,8 +580,7 @@ unsigned char cv[]= {
 
 /* X0201 kana conversion table for daguten */
 /* 90-9F A0-DF */
-static const
-unsigned char dv[]= { 
+static const unsigned char dv[]= {
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -714,8 +601,7 @@ unsigned char dv[]= {
 
 /* X0201 kana conversion table for han-daguten */
 /* 90-9F A0-DF */
-static const
-unsigned char ev[]= { 
+static const unsigned char ev[]= {
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -737,8 +623,7 @@ unsigned char ev[]= {
 
 /* X0208 kigou conversion table */
 /* 0x8140 - 0x819e */
-static const
-unsigned char fv[] = {
+static const unsigned char fv[] = {
 
     0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
     0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
@@ -755,283 +640,359 @@ unsigned char fv[] = {
 } ;
 
 
-#define    CRLF      1
 
+static int option_mode = 0;
 static int             file_out_f = FALSE;
 #ifdef OVERWRITE
 static int             overwrite_f = FALSE;
 static int             preserve_time_f = FALSE;
 static int             backup_f = FALSE;
 static char            *backup_suffix = "";
-static char *get_backup_filename(const char *suffix, const char *filename);
 #endif
 
-static int             crmode_f = 0;   /* CR, NL, CRLF */
+static int eolmode_f = 0;   /* CR, LF, CRLF */
+static int input_eol = 0; /* 0: unestablished, EOF: MIXED */
+static nkf_char prev_cr = 0; /* CR or 0 */
 #ifdef EASYWIN /*Easy Win */
 static int             end_check;
 #endif /*Easy Win */
 
-#define STD_GC_BUFSIZE (256)
-nkf_char std_gc_buf[STD_GC_BUFSIZE];
-nkf_char std_gc_ndx;
+static void *
+nkf_xmalloc(size_t size)
+{
+    void *ptr;
 
-#ifdef WIN32DLL
-#include "nkf32dll.c"
-#elif defined(PERL_XS)
-#else /* WIN32DLL */
-int main(int argc, char **argv)
+    if (size == 0) size = 1;
+
+    ptr = malloc(size);
+    if (ptr == NULL) {
+	perror("can't malloc");
+	exit(EXIT_FAILURE);
+    }
+
+    return ptr;
+}
+
+static void *
+nkf_xrealloc(void *ptr, size_t size)
 {
-    FILE  *fin;
-    unsigned char  *cp;
+    if (size == 0) size = 1;
 
-    char *outfname = NULL;
-    char *origfname;
+    ptr = realloc(ptr, size);
+    if (ptr == NULL) {
+	perror("can't realloc");
+	exit(EXIT_FAILURE);
+    }
 
-#ifdef EASYWIN /*Easy Win */
-    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
+    return ptr;
+}
+
+#define nkf_xfree(ptr) free(ptr)
+
+static int
+nkf_str_caseeql(const char *src, const char *target)
+{
+    int i;
+    for (i = 0; src[i] && target[i]; i++) {
+	if (nkf_toupper(src[i]) != nkf_toupper(target[i])) return FALSE;
+    }
+    if (src[i] || target[i]) return FALSE;
+    else return TRUE;
+}
+
+static nkf_encoding*
+nkf_enc_from_index(int idx)
+{
+    if (idx < 0 || NKF_ENCODING_TABLE_SIZE <= idx) {
+	return 0;
+    }
+    return &nkf_encoding_table[idx];
+}
+
+static int
+nkf_enc_find_index(const char *name)
+{
+    int i;
+    if (name[0] == 'X' && *(name+1) == '-') name += 2;
+    for (i = 0; encoding_name_to_id_table[i].id >= 0; i++) {
+	if (nkf_str_caseeql(encoding_name_to_id_table[i].name, name)) {
+	    return encoding_name_to_id_table[i].id;
+	}
+    }
+    return -1;
+}
+
+static nkf_encoding*
+nkf_enc_find(const char *name)
+{
+    int idx = -1;
+    idx = nkf_enc_find_index(name);
+    if (idx < 0) return 0;
+    return nkf_enc_from_index(idx);
+}
+
+#define nkf_enc_name(enc) (enc)->name
+#define nkf_enc_to_index(enc) (enc)->id
+#define nkf_enc_to_base_encoding(enc) (enc)->base_encoding
+#define nkf_enc_to_iconv(enc) nkf_enc_to_base_encoding(enc)->iconv
+#define nkf_enc_to_oconv(enc) nkf_enc_to_base_encoding(enc)->oconv
+#define nkf_enc_asciicompat(enc) (\
+				  nkf_enc_to_base_encoding(enc) == &NkfEncodingASCII ||\
+				  nkf_enc_to_base_encoding(enc) == &NkfEncodingISO_2022_JP)
+#define nkf_enc_unicode_p(enc) (\
+				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_8 ||\
+				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_16 ||\
+				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_32)
+#define nkf_enc_cp5022x_p(enc) (\
+				nkf_enc_to_index(enc) == CP50220 ||\
+				nkf_enc_to_index(enc) == CP50221 ||\
+				nkf_enc_to_index(enc) == CP50222)
+
+#ifdef DEFAULT_CODE_LOCALE
+static const char*
+nkf_locale_charmap()
+{
+#ifdef HAVE_LANGINFO_H
+    return nl_langinfo(CODESET);
+#elif defined(__WIN32__)
+    static char buf[16];
+    sprintf(buf, "CP%d", GetACP());
+    return buf;
+#elif defined(__OS2__)
+# if defined(INT_IS_SHORT)
+    /* OS/2 1.x */
+    return NULL;
+# else
+    /* OS/2 32bit */
+    static char buf[16];
+    ULONG ulCP[1], ulncp;
+    DosQueryCp(sizeof(ulCP), ulCP, &ulncp);
+    if (ulCP[0] == 932 || ulCP[0] == 943)
+        strcpy(buf, "Shift_JIS");
+    else
+        sprintf(buf, "CP%lu", ulCP[0]);
+    return buf;
+# endif
 #endif
+    return NULL;
+}
 
-    for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
-        cp = (unsigned char *)*argv;
-        options(cp);
-#ifdef EXEC_IO
-        if (exec_f){
-            int fds[2], pid;
-            if (pipe(fds) < 0 || (pid = fork()) < 0){
-                abort();
-            }
-            if (pid == 0){
-                if (exec_f > 0){
-                    close(fds[0]);
-                    dup2(fds[1], 1);
-                }else{
-                    close(fds[1]);
-                    dup2(fds[0], 0);
-                }
-                execvp(argv[1], &argv[1]);
-            }
-            if (exec_f > 0){
-                close(fds[1]);
-                dup2(fds[0], 0);
-            }else{
-                close(fds[0]);
-                dup2(fds[1], 1);
-            }
-            argc = 0;
-            break;
-        }
-#endif
-    }
-    if(x0201_f == WISH_TRUE)
-         x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+static nkf_encoding*
+nkf_locale_encoding()
+{
+    nkf_encoding *enc = 0;
+    const char *encname = nkf_locale_charmap();
+    if (encname)
+	enc = nkf_enc_find(encname);
+    return enc;
+}
+#endif /* DEFAULT_CODE_LOCALE */
 
-    if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-    if (freopen("","wb",stdout) == NULL) 
-        return (-1);
-#else
-    setbinmode(stdout);
+static nkf_encoding*
+nkf_utf8_encoding()
+{
+    return &nkf_encoding_table[UTF_8];
+}
+
+static nkf_encoding*
+nkf_default_encoding()
+{
+    nkf_encoding *enc = 0;
+#ifdef DEFAULT_CODE_LOCALE
+    enc = nkf_locale_encoding();
+#elif defined(DEFAULT_ENCIDX)
+    enc = nkf_enc_from_index(DEFAULT_ENCIDX);
+#endif
+    if (!enc) enc = nkf_utf8_encoding();
+    return enc;
+}
+
+typedef struct {
+    long capa;
+    long len;
+    nkf_char *ptr;
+} nkf_buf_t;
+
+static nkf_buf_t *
+nkf_buf_new(int length)
+{
+    nkf_buf_t *buf = nkf_xmalloc(sizeof(nkf_buf_t));
+    buf->ptr = nkf_xmalloc(sizeof(nkf_char) * length);
+    buf->capa = length;
+    buf->len = 0;
+    return buf;
+} 
+
+#if 0
+static void
+nkf_buf_dispose(nkf_buf_t *buf)
+{
+    nkf_xfree(buf->ptr);
+    nkf_xfree(buf);
+}
 #endif
 
-    if (unbuf_f)
-      setbuf(stdout, (char *) NULL);
-    else
-      setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
+#define nkf_buf_length(buf) ((buf)->len)
+#define nkf_buf_empty_p(buf) ((buf)->len == 0)
 
-    if (argc == 0) {
-      if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-      if (freopen("","rb",stdin) == NULL) return (-1);
+static nkf_char
+nkf_buf_at(nkf_buf_t *buf, int index)
+{
+    assert(index <= buf->len);
+    return buf->ptr[index];
+}
+
+static void
+nkf_buf_clear(nkf_buf_t *buf)
+{
+    buf->len = 0;
+}
+
+static void
+nkf_buf_push(nkf_buf_t *buf, nkf_char c)
+{
+    if (buf->capa <= buf->len) {
+	exit(EXIT_FAILURE);
+    }
+    buf->ptr[buf->len++] = c;
+}
+
+static nkf_char
+nkf_buf_pop(nkf_buf_t *buf)
+{
+    assert(!nkf_buf_empty_p(buf));
+    return buf->ptr[--buf->len];
+}
+
+/* Normalization Form C */
+#ifndef PERL_XS
+#ifdef WIN32DLL
+#define fprintf dllprintf
+#endif
+
+static void
+version(void)
+{
+    fprintf(HELP_OUTPUT,"Network Kanji Filter Version " NKF_VERSION " (" NKF_RELEASE_DATE ") \n" COPY_RIGHT "\n");
+}
+
+static void
+usage(void)
+{
+    fprintf(HELP_OUTPUT,
+	    "Usage:  nkf -[flags] [--] [in file] .. [out file for -O flag]\n"
+#ifdef UTF8_OUTPUT_ENABLE
+	    " j/s/e/w  Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
+	    "          UTF options is -w[8[0],{16,32}[{B,L}[0]]]\n"
 #else
-      setbinmode(stdin);
-#endif
-      setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
-      if (nop_f)
-          noconvert(stdin);
-      else {
-          kanji_convert(stdin);
-          if (guess_f) print_guessed_code(NULL);
-      }
-    } else {
-      int nfiles = argc;
-	int is_argument_error = FALSE;
-      while (argc--) {
-	    is_inputcode_mixed = FALSE;
-	    is_inputcode_set   = FALSE;
-	    input_codename = "";
-#ifdef CHECK_OPTION
-	    iconv_for_check = 0;
 #endif
-          if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
-              perror(*--argv);
-		*argv++;
-		is_argument_error = TRUE;
-		continue;
-          } else {
+#ifdef UTF8_INPUT_ENABLE
+	    " J/S/E/W  Specify input encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
+	    "          UTF option is -W[8,[16,32][B,L]]\n"
+#else
+	    " J/S/E    Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
+#endif
+	    );
+    fprintf(HELP_OUTPUT,
+	    " m[BQSN0] MIME decode [B:base64,Q:quoted,S:strict,N:nonstrict,0:no decode]\n"
+	    " M[BQ]    MIME encode [B:base64 Q:quoted]\n"
+	    " f/F      Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"
+	    );
+    fprintf(HELP_OUTPUT,
+	    " Z[0-4]   Default/0: Convert JISX0208 Alphabet to ASCII\n"
+	    "          1: Kankaku to one space  2: to two spaces  3: HTML Entity\n"
+	    "          4: JISX0208 Katakana to JISX0201 Katakana\n"
+	    " X,x      Convert Halfwidth Katakana to Fullwidth or preserve it\n"
+	    );
+    fprintf(HELP_OUTPUT,
+	    " O        Output to File (DEFAULT 'nkf.out')\n"
+	    " L[uwm]   Line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"
+	    );
+    fprintf(HELP_OUTPUT,
+	    " --ic=<encoding>        Specify the input encoding\n"
+	    " --oc=<encoding>        Specify the output encoding\n"
+	    " --hiragana --katakana  Hiragana/Katakana Conversion\n"
+	    " --katakana-hiragana    Converts each other\n"
+	    );
+    fprintf(HELP_OUTPUT,
+#ifdef INPUT_OPTION
+	    " --{cap, url}-input     Convert hex after ':' or '%%'\n"
+#endif
+#ifdef NUMCHAR_OPTION
+	    " --numchar-input        Convert Unicode Character Reference\n"
+#endif
+#ifdef UTF8_INPUT_ENABLE
+	    " --fb-{skip, html, xml, perl, java, subchar}\n"
+	    "                        Specify unassigned character's replacement\n"
+#endif
+	    );
+    fprintf(HELP_OUTPUT,
 #ifdef OVERWRITE
-              int fd = 0;
-              int fd_backup = 0;
+	    " --in-place[=SUF]       Overwrite original files\n"
+	    " --overwrite[=SUF]      Preserve timestamp of original files\n"
 #endif
+	    " -g --guess             Guess the input code\n"
+	    " -v --version           Print the version\n"
+	    " --help/-V              Print this help / configuration\n"
+	    );
+    version();
+}
 
-/* reopen file for stdout */
-              if (file_out_f == TRUE) {
-#ifdef OVERWRITE
-                  if (overwrite_f){
-                      outfname = malloc(strlen(origfname)
-                                        + strlen(".nkftmpXXXXXX")
-                                        + 1);
-                      if (!outfname){
-                          perror(origfname);
-                          return -1;
-                      }
-                      strcpy(outfname, origfname);
-#ifdef MSDOS
-                      {
-                          int i;
-                          for (i = strlen(outfname); i; --i){
-                              if (outfname[i - 1] == '/'
-                                  || outfname[i - 1] == '\\'){
-                                  break;
-                              }
-                          }
-                          outfname[i] = '\0';
-                      }
-                      strcat(outfname, "ntXXXXXX");
-                      mktemp(outfname);
-			fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
-                                S_IREAD | S_IWRITE);
+static void
+show_configuration(void)
+{
+    fprintf(HELP_OUTPUT,
+	    "Summary of my nkf " NKF_VERSION " (" NKF_RELEASE_DATE ") configuration:\n"
+	    "  Compile-time options:\n"
+	    "    Compiled at:                 " __DATE__ " " __TIME__ "\n"
+	   );
+    fprintf(HELP_OUTPUT,
+	    "    Default output encoding:     "
+#ifdef DEFAULT_CODE_LOCALE
+	    "LOCALE (%s)\n", nkf_enc_name(nkf_default_encoding())
+#elif defined(DEFAULT_ENCIDX)
+	    "CONFIG (%s)\n", nkf_enc_name(nkf_default_encoding())
 #else
-                      strcat(outfname, ".nkftmpXXXXXX");
-                      fd = mkstemp(outfname);
-#endif
-                      if (fd < 0
-                          || (fd_backup = dup(fileno(stdout))) < 0
-                          || dup2(fd, fileno(stdout)) < 0
-                          ){
-                          perror(origfname);
-                          return -1;
-                      }
-                  }else
-#endif
-		  if(argc == 1 ) {
-		      outfname = *argv++;
-		      argc--;
-		  } else {
-		      outfname = "nkf.out";
-		  }
-
-		  if(freopen(outfname, "w", stdout) == NULL) {
-		      perror (outfname);
-		      return (-1);
-		  }
-                  if (binmode_f == TRUE) {
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-                      if (freopen("","wb",stdout) == NULL) 
-                           return (-1);
+	    "NONE\n"
+#endif
+	   );
+    fprintf(HELP_OUTPUT,
+	    "    Default output end of line:  "
+#if DEFAULT_NEWLINE == CR
+	    "CR"
+#elif DEFAULT_NEWLINE == CRLF
+	    "CRLF"
 #else
-                      setbinmode(stdout);
+	    "LF"
 #endif
-                  }
-              }
-              if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-                 if (freopen("","rb",fin) == NULL) 
-                    return (-1);
-#else
-                 setbinmode(fin);
-#endif 
-              setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
-              if (nop_f)
-                  noconvert(fin);
-              else {
-                  char *filename = NULL;
-                  kanji_convert(fin);
-                  if (nfiles > 1) filename = origfname;
-                  if (guess_f) print_guessed_code(filename);
-              }
-              fclose(fin);
-#ifdef OVERWRITE
-              if (overwrite_f) {
-                  struct stat     sb;
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
-                  time_t tb[2];
+	    "\n"
+	    "    Decode MIME encoded string:  "
+#if MIME_DECODE_DEFAULT
+	    "ON"
 #else
-                  struct utimbuf  tb;
-#endif
-
-                  fflush(stdout);
-                  close(fd);
-                  if (dup2(fd_backup, fileno(stdout)) < 0){
-                      perror("dup2");
-                  }
-                  if (stat(origfname, &sb)) {
-                      fprintf(stderr, "Can't stat %s\n", origfname);
-                  }
-                  /* $B%Q!<%_%C%7%g%s$rI|85(B */
-                  if (chmod(outfname, sb.st_mode)) {
-                      fprintf(stderr, "Can't set permission %s\n", outfname);
-                  }
-
-                  /* $B%?%$%`%9%?%s%W$rI|85(B */
-		    if(preserve_time_f){
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
-			tb[0] = tb[1] = sb.st_mtime;
-			if (utime(outfname, tb)) {
-			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
-			}
-#else
-			tb.actime  = sb.st_atime;
-			tb.modtime = sb.st_mtime;
-			if (utime(outfname, &tb)) {
-			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
-			}
+	    "OFF"
 #endif
-		    }
-		    if(backup_f){
-			char *backup_filename = get_backup_filename(backup_suffix, origfname);
-#ifdef MSDOS
-			unlink(backup_filename);
+	    "\n"
+	    "    Convert JIS X 0201 Katakana: "
+#if X0201_DEFAULT
+	    "ON"
+#else
+	    "OFF"
 #endif
-			if (rename(origfname, backup_filename)) {
-			    perror(backup_filename);
-			    fprintf(stderr, "Can't rename %s to %s\n",
-				    origfname, backup_filename);
-			}
-		    }else{
-#ifdef MSDOS
-			if (unlink(origfname)){
-			    perror(origfname);
-			}
+	    "\n"
+	    "    --help, --version output:    "
+#if HELP_OUTPUT_HELP_OUTPUT
+	    "HELP_OUTPUT"
+#else
+	    "STDOUT"
 #endif
-		    }
-                  if (rename(outfname, origfname)) {
-                      perror(origfname);
-                      fprintf(stderr, "Can't rename %s to %s\n",
-                              outfname, origfname);
-                  }
-                  free(outfname);
-              }
-#endif
-          }
-      }
-	if (is_argument_error)
-	    return(-1);
-    }
-#ifdef EASYWIN /*Easy Win */
-    if (file_out_f == FALSE) 
-        scanf("%d",&end_check);
-    else 
-        fclose(stdout);
-#else /* for Other OS */
-    if (file_out_f == TRUE) 
-        fclose(stdout);
-#endif /*Easy Win */
-    return (0);
+	    "\n");
 }
-#endif /* WIN32DLL */
+#endif /*PERL_XS*/
 
 #ifdef OVERWRITE
-char *get_backup_filename(const char *suffix, const char *filename)
+static char*
+get_backup_filename(const char *suffix, const char *filename)
 {
     char *backup_filename;
     int asterisk_count = 0;
@@ -1043,12 +1004,7 @@ char *get_backup_filename(const char *suffix, const char *filename)
     }
 
     if(asterisk_count){
-	backup_filename = malloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
-	if (!backup_filename){
-	    perror("Can't malloc backup filename.");
-	    return NULL;
-	}
-
+	backup_filename = nkf_xmalloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
 	for(i = 0, j = 0; suffix[i];){
 	    if(suffix[i] == '*'){
 		backup_filename[j] = '\0';
@@ -1061,8 +1017,8 @@ char *get_backup_filename(const char *suffix, const char *filename)
 	}
 	backup_filename[j] = '\0';
     }else{
-	j = strlen(suffix) + filename_length;
-	backup_filename = malloc( + 1);
+	j = filename_length + strlen(suffix);
+	backup_filename = nkf_xmalloc(j + 1);
 	strcpy(backup_filename, filename);
 	strcat(backup_filename, suffix);
 	backup_filename[j] = '\0';
@@ -1071,8 +1027,102 @@ char *get_backup_filename(const char *suffix, const char *filename)
 }
 #endif
 
-static const
-struct {
+#ifdef UTF8_INPUT_ENABLE
+static void
+nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
+{
+    int shift = 20;
+    c &= VALUE_MASK;
+    while(shift >= 0){
+	if(c >= NKF_INT32_C(1)<<shift){
+	    while(shift >= 0){
+		(*f)(0, bin2hex(c>>shift));
+		shift -= 4;
+	    }
+	}else{
+	    shift -= 4;
+	}
+    }
+    return;
+}
+
+static void
+encode_fallback_html(nkf_char c)
+{
+    (*oconv)(0, '&');
+    (*oconv)(0, '#');
+    c &= VALUE_MASK;
+    if(c >= NKF_INT32_C(1000000))
+	(*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10);
+    if(c >= NKF_INT32_C(100000))
+	(*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10);
+    if(c >= 10000)
+	(*oconv)(0, 0x30+(c/10000  )%10);
+    if(c >= 1000)
+	(*oconv)(0, 0x30+(c/1000   )%10);
+    if(c >= 100)
+	(*oconv)(0, 0x30+(c/100    )%10);
+    if(c >= 10)
+	(*oconv)(0, 0x30+(c/10     )%10);
+    if(c >= 0)
+	(*oconv)(0, 0x30+ c         %10);
+    (*oconv)(0, ';');
+    return;
+}
+
+static void
+encode_fallback_xml(nkf_char c)
+{
+    (*oconv)(0, '&');
+    (*oconv)(0, '#');
+    (*oconv)(0, 'x');
+    nkf_each_char_to_hex(oconv, c);
+    (*oconv)(0, ';');
+    return;
+}
+
+static void
+encode_fallback_java(nkf_char c)
+{
+    (*oconv)(0, '\\');
+    c &= VALUE_MASK;
+    if(!nkf_char_unicode_bmp_p(c)){
+	(*oconv)(0, 'U');
+	(*oconv)(0, '0');
+	(*oconv)(0, '0');
+	(*oconv)(0, bin2hex(c>>20));
+	(*oconv)(0, bin2hex(c>>16));
+    }else{
+	(*oconv)(0, 'u');
+    }
+    (*oconv)(0, bin2hex(c>>12));
+    (*oconv)(0, bin2hex(c>> 8));
+    (*oconv)(0, bin2hex(c>> 4));
+    (*oconv)(0, bin2hex(c    ));
+    return;
+}
+
+static void
+encode_fallback_perl(nkf_char c)
+{
+    (*oconv)(0, '\\');
+    (*oconv)(0, 'x');
+    (*oconv)(0, '{');
+    nkf_each_char_to_hex(oconv, c);
+    (*oconv)(0, '}');
+    return;
+}
+
+static void
+encode_fallback_subchar(nkf_char c)
+{
+    c = unicode_subchar;
+    (*oconv)((c>>8)&0xFF, c&0xFF);
+    return;
+}
+#endif
+
+static const struct {
     const char *name;
     const char *alias;
 } long_option[] = {
@@ -1082,7 +1132,7 @@ struct {
     {"euc","e"},
     {"euc-input","E"},
     {"fj","jm"},
-    {"help","v"},
+    {"help",""},
     {"jis","j"},
     {"jis-input","J"},
     {"mac","sLm"},
@@ -1092,12 +1142,13 @@ struct {
     {"sjis","s"},
     {"sjis-input","S"},
     {"unix","eLu"},
-    {"version","V"},
+    {"version","v"},
     {"windows","sLw"},
     {"hiragana","h1"},
     {"katakana","h2"},
     {"katakana-hiragana","h3"},
-    {"guess", "g"},
+    {"guess=", ""},
+    {"guess", "g2"},
     {"cp932", ""},
     {"no-cp932", ""},
 #ifdef X0212_ENABLE
@@ -1151,2019 +1202,427 @@ struct {
     {"prefix=", ""},
 };
 
-static int option_mode = 0;
-
-void options(unsigned char *cp)
+static void
+set_input_encoding(nkf_encoding *enc)
 {
-    nkf_char i, j;
-    unsigned char *p;
-    unsigned char *cp_back = NULL;
-    char codeset[32];
-
-    if (option_mode==1)
-	return;
-    while(*cp && *cp++!='-');
-    while (*cp || cp_back) {
-	if(!*cp){
-	    cp = cp_back;
-	    cp_back = NULL;
-	    continue;
-	}
-	p = 0;
-        switch (*cp++) {
-        case '-':  /* literal options */
-	    if (!*cp || *cp == SPACE) {        /* ignore the rest of arguments */
-		option_mode = 1;
-		return;
-	    }
-            for (i=0;i<sizeof(long_option)/sizeof(long_option[0]);i++) {
-                p = (unsigned char *)long_option[i].name;
-                for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
-		if (*p == cp[j] || cp[j] == ' '){
-		    p = &cp[j] + 1;
-		    break;
-		}
-		p = 0;
-            }
-	    if (p == 0) return;
-	    while(*cp && *cp != SPACE && cp++);
-            if (long_option[i].alias[0]){
-		cp_back = cp;
-		cp = (unsigned char *)long_option[i].alias;
-	    }else{
-                if (strcmp(long_option[i].name, "ic=") == 0){
-		    for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
-			codeset[i] = nkf_toupper(p[i]);
-		    }
-		    codeset[i] = 0;
-		    if(strcmp(codeset, "ISO-2022-JP") == 0){
-			input_f = JIS_INPUT;
-		    }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0 ||
-		      strcmp(codeset, "CP50220") == 0 ||
-		      strcmp(codeset, "CP50221") == 0 ||
-		      strcmp(codeset, "CP50222") == 0){
-			input_f = JIS_INPUT;
+    switch (nkf_enc_to_index(enc)) {
+    case ISO_8859_1:
+	iso8859_f = TRUE;
+	break;
+    case CP50221:
+    case CP50222:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
+    case CP50220:
 #ifdef SHIFTJIS_CP932
-			cp51932_f = TRUE;
+	cp51932_f = TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
+	ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
-			input_f = JIS_INPUT;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
+	break;
+    case ISO_2022_JP_1:
+	x0212_f = TRUE;
+	break;
+    case ISO_2022_JP_3:
+	x0212_f = TRUE;
+	x0213_f = TRUE;
+	break;
+    case ISO_2022_JP_2004:
+	x0212_f = TRUE;
+	x0213_f = TRUE;
+	break;
+    case SHIFT_JIS:
+	break;
+    case WINDOWS_31J:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
+#ifdef SHIFTJIS_CP932
+	cp51932_f = TRUE;
 #endif
-		    }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
-			input_f = JIS_INPUT;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-			x0213_f = TRUE;
-		    }else if(strcmp(codeset, "SHIFT_JIS") == 0){
-			input_f = SJIS_INPUT;
-		    }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
-			     strcmp(codeset, "CSWINDOWS31J") == 0 ||
-			     strcmp(codeset, "CP932") == 0 ||
-			     strcmp(codeset, "MS932") == 0){
-			input_f = SJIS_INPUT;
+#ifdef UTF8_OUTPUT_ENABLE
+	ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+	break;
+	break;
+    case CP10001:
 #ifdef SHIFTJIS_CP932
-			cp51932_f = TRUE;
+	cp51932_f = TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
+	ms_ucs_map_f = UCS_MAP_CP10001;
 #endif
-		    }else if(strcmp(codeset, "EUCJP") == 0 ||
-			     strcmp(codeset, "EUC-JP") == 0){
-			input_f = EUC_INPUT;
-		    }else if(strcmp(codeset, "CP51932") == 0){
-			input_f = EUC_INPUT;
+	break;
+    case EUC_JP:
+	break;
+    case EUCJP_NKF:
+	break;
+    case CP51932:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
 #ifdef SHIFTJIS_CP932
-			cp51932_f = TRUE;
+	cp51932_f = TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
+	ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-		    }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
-			     strcmp(codeset, "EUCJP-MS") == 0 ||
-			     strcmp(codeset, "EUCJPMS") == 0){
-			input_f = EUC_INPUT;
+	break;
+    case EUCJP_MS:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
 #ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
+	cp51932_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_MS;
+	ms_ucs_map_f = UCS_MAP_MS;
 #endif
-		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
-			     strcmp(codeset, "EUCJP-ASCII") == 0){
-			input_f = EUC_INPUT;
+	break;
+    case EUCJP_ASCII:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
 #ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
+	cp51932_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_ASCII;
+	ms_ucs_map_f = UCS_MAP_ASCII;
 #endif
-		    }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
-			     strcmp(codeset, "SHIFT_JIS-2004") == 0){
-			input_f = SJIS_INPUT;
-			x0213_f = TRUE;
+	break;
+    case SHIFT_JISX0213:
+    case SHIFT_JIS_2004:
+	x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
+	cp51932_f = FALSE;
 #endif
-		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
-			     strcmp(codeset, "EUC-JIS-2004") == 0){
-			input_f = EUC_INPUT;
-			x0213_f = TRUE;
+	break;
+    case EUC_JISX0213:
+    case EUC_JIS_2004:
+	x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
+	cp51932_f = FALSE;
 #endif
+	break;
 #ifdef UTF8_INPUT_ENABLE
-		    }else if(strcmp(codeset, "UTF-8") == 0 ||
-			     strcmp(codeset, "UTF-8N") == 0 ||
-			     strcmp(codeset, "UTF-8-BOM") == 0){
-			input_f = UTF8_INPUT;
 #ifdef UNICODE_NORMALIZATION
-		    }else if(strcmp(codeset, "UTF8-MAC") == 0 ||
-			     strcmp(codeset, "UTF-8-MAC") == 0){
-			input_f = UTF8_INPUT;
-			nfc_f = TRUE;
-#endif
-		    }else if(strcmp(codeset, "UTF-16") == 0 ||
-			     strcmp(codeset, "UTF-16BE") == 0 ||
-			     strcmp(codeset, "UTF-16BE-BOM") == 0){
-			input_f = UTF16_INPUT;
-			input_endian = ENDIAN_BIG;
-		    }else if(strcmp(codeset, "UTF-16LE") == 0 ||
-			     strcmp(codeset, "UTF-16LE-BOM") == 0){
-			input_f = UTF16_INPUT;
-			input_endian = ENDIAN_LITTLE;
-		    }else if(strcmp(codeset, "UTF-32") == 0 ||
-			     strcmp(codeset, "UTF-32BE") == 0 ||
-			     strcmp(codeset, "UTF-32BE-BOM") == 0){
-			input_f = UTF32_INPUT;
-			input_endian = ENDIAN_BIG;
-		    }else if(strcmp(codeset, "UTF-32LE") == 0 ||
-			     strcmp(codeset, "UTF-32LE-BOM") == 0){
-			input_f = UTF32_INPUT;
-			input_endian = ENDIAN_LITTLE;
-#endif
-		    }
-                    continue;
-		}
-                if (strcmp(long_option[i].name, "oc=") == 0){
-		    x0201_f = FALSE;
-		    for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
-			codeset[i] = nkf_toupper(p[i]);
-		    }
-		    codeset[i] = 0;
-		    if(strcmp(codeset, "ISO-2022-JP") == 0){
-			output_conv = j_oconv;
-		    }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0){
-			output_conv = j_oconv;
-			no_cp932ext_f = TRUE;
-#ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
+    case UTF8_MAC:
+	nfc_f = TRUE;
+	break;
 #endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
+    case UTF_16:
+    case UTF_16BE:
+    case UTF_16BE_BOM:
+	input_endian = ENDIAN_BIG;
+	break;
+    case UTF_16LE:
+    case UTF_16LE_BOM:
+	input_endian = ENDIAN_LITTLE;
+	break;
+    case UTF_32:
+    case UTF_32BE:
+    case UTF_32BE_BOM:
+	input_endian = ENDIAN_BIG;
+	break;
+    case UTF_32LE:
+    case UTF_32LE_BOM:
+	input_endian = ENDIAN_LITTLE;
+	break;
 #endif
-		    }else if(strcmp(codeset, "CP50220") == 0){
-			output_conv = j_oconv;
-			x0201_f = TRUE;
+    }
+}
+
+static void
+set_output_encoding(nkf_encoding *enc)
+{
+    switch (nkf_enc_to_index(enc)) {
+    case CP50220:
 #ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
+	ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-		    }else if(strcmp(codeset, "CP50221") == 0){
-			output_conv = j_oconv;
+	break;
+    case CP50221:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
 #ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
-			output_conv = j_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
+	ms_ucs_map_f = UCS_MAP_CP932;
 #endif
+	break;
+    case ISO_2022_JP:
 #ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
-#endif
-		    }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
-			output_conv = j_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
-			x0213_f = TRUE;
+	break;
+    case ISO_2022_JP_1:
+	x0212_f = TRUE;
 #ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
-#endif
-		    }else if(strcmp(codeset, "SHIFT_JIS") == 0){
-			output_conv = s_oconv;
-		    }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
-			     strcmp(codeset, "CSWINDOWS31J") == 0 ||
-			     strcmp(codeset, "CP932") == 0 ||
-			     strcmp(codeset, "MS932") == 0){
-			output_conv = s_oconv;
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
-		    }else if(strcmp(codeset, "EUCJP") == 0 ||
-			     strcmp(codeset, "EUC-JP") == 0){
-			output_conv = e_oconv;
-		    }else if(strcmp(codeset, "CP51932") == 0){
-			output_conv = e_oconv;
+	break;
+    case ISO_2022_JP_3:
+	x0212_f = TRUE;
+	x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-		    }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
-			     strcmp(codeset, "EUCJP-MS") == 0 ||
-			     strcmp(codeset, "EUCJPMS") == 0){
-			output_conv = e_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
+	break;
+    case SHIFT_JIS:
+	break;
+    case WINDOWS_31J:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_MS;
-#endif
-		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
-			     strcmp(codeset, "EUCJP-ASCII") == 0){
-			output_conv = e_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
+	ms_ucs_map_f = UCS_MAP_CP932;
 #endif
+	break;
+    case CP10001:
 #ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_ASCII;
+	ms_ucs_map_f = UCS_MAP_CP10001;
 #endif
-		    }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
-			     strcmp(codeset, "SHIFT_JIS-2004") == 0){
-			output_conv = s_oconv;
-			x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
-#endif
-		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
-			     strcmp(codeset, "EUC-JIS-2004") == 0){
-			output_conv = e_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-			x0213_f = TRUE;
+	break;
+    case EUC_JP:
+	x0212_f = TRUE;
 #ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-		    }else if(strcmp(codeset, "UTF-8") == 0){
-			output_conv = w_oconv;
-		    }else if(strcmp(codeset, "UTF-8N") == 0){
-			output_conv = w_oconv;
-		    }else if(strcmp(codeset, "UTF-8-BOM") == 0){
-			output_conv = w_oconv;
-			output_bom_f = TRUE;
-		    }else if(strcmp(codeset, "UTF-16BE") == 0){
-			output_conv = w_oconv16;
-		    }else if(strcmp(codeset, "UTF-16") == 0 ||
-			     strcmp(codeset, "UTF-16BE-BOM") == 0){
-			output_conv = w_oconv16;
-			output_bom_f = TRUE;
-		    }else if(strcmp(codeset, "UTF-16LE") == 0){
-			output_conv = w_oconv16;
-			output_endian = ENDIAN_LITTLE;
-		    }else if(strcmp(codeset, "UTF-16LE-BOM") == 0){
-			output_conv = w_oconv16;
-			output_endian = ENDIAN_LITTLE;
-			output_bom_f = TRUE;
-		    }else if(strcmp(codeset, "UTF-32") == 0 ||
-			     strcmp(codeset, "UTF-32BE") == 0){
-			output_conv = w_oconv32;
-		    }else if(strcmp(codeset, "UTF-32BE-BOM") == 0){
-			output_conv = w_oconv32;
-			output_bom_f = TRUE;
-		    }else if(strcmp(codeset, "UTF-32LE") == 0){
-			output_conv = w_oconv32;
-			output_endian = ENDIAN_LITTLE;
-		    }else if(strcmp(codeset, "UTF-32LE-BOM") == 0){
-			output_conv = w_oconv32;
-			output_endian = ENDIAN_LITTLE;
-			output_bom_f = TRUE;
-#endif
-		    }
-                    continue;
-		}
-#ifdef OVERWRITE
-                if (strcmp(long_option[i].name, "overwrite") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = TRUE;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "overwrite=") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = TRUE;
-		    backup_f = TRUE;
-		    backup_suffix = malloc(strlen((char *) p) + 1);
-		    strcpy(backup_suffix, (char *) p);
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "in-place") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = FALSE;
-		    continue;
-                }
-                if (strcmp(long_option[i].name, "in-place=") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = FALSE;
-		    backup_f = TRUE;
-		    backup_suffix = malloc(strlen((char *) p) + 1);
-		    strcpy(backup_suffix, (char *) p);
-		    continue;
-                }
-#endif
-#ifdef INPUT_OPTION
-                if (strcmp(long_option[i].name, "cap-input") == 0){
-                    cap_f = TRUE;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "url-input") == 0){
-                    url_f = TRUE;
-                    continue;
-                }
-#endif
-#ifdef NUMCHAR_OPTION
-                if (strcmp(long_option[i].name, "numchar-input") == 0){
-                    numchar_f = TRUE;
-                    continue;
-                }
+	ms_ucs_map_f = UCS_MAP_ASCII;
 #endif
-#ifdef CHECK_OPTION
-                if (strcmp(long_option[i].name, "no-output") == 0){
-                    noout_f = TRUE;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "debug") == 0){
-                    debug_f = TRUE;
-                    continue;
-                }
-#endif
-                if (strcmp(long_option[i].name, "cp932") == 0){
+	break;
+    case EUCJP_NKF:
+	x0212_f = FALSE;
 #ifdef SHIFTJIS_CP932
-                    cp51932_f = TRUE;
-                    cp932inv_f = TRUE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-                    ms_ucs_map_f = UCS_MAP_CP932;
+	ms_ucs_map_f = UCS_MAP_ASCII;
 #endif
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "no-cp932") == 0){
+	break;
+    case CP51932:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
 #ifdef SHIFTJIS_CP932
-                    cp51932_f = FALSE;
-                    cp932inv_f = FALSE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-                    ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-                    continue;
-                }
-#ifdef SHIFTJIS_CP932
-                if (strcmp(long_option[i].name, "cp932inv") == 0){
-                    cp932inv_f = TRUE;
-                    continue;
-                }
-#endif
-
-#ifdef X0212_ENABLE
-                if (strcmp(long_option[i].name, "x0212") == 0){
-                    x0212_f = TRUE;
-                    continue;
-                }
-#endif
-
-#ifdef EXEC_IO
-                  if (strcmp(long_option[i].name, "exec-in") == 0){
-                      exec_f = 1;
-                      return;
-                  }
-                  if (strcmp(long_option[i].name, "exec-out") == 0){
-                      exec_f = -1;
-                      return;
-                  }
-#endif
-#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
-                if (strcmp(long_option[i].name, "no-cp932ext") == 0){
-		    no_cp932ext_f = TRUE;
-                    continue;
-                }
-		if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
-		    no_best_fit_chars_f = TRUE;
-		    continue;
-		}
-                if (strcmp(long_option[i].name, "fb-skip") == 0){
-		    encode_fallback = NULL;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-html") == 0){
-		    encode_fallback = encode_fallback_html;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-xml" ) == 0){
-		    encode_fallback = encode_fallback_xml;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-java") == 0){
-		    encode_fallback = encode_fallback_java;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-perl") == 0){
-		    encode_fallback = encode_fallback_perl;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-subchar") == 0){
-		    encode_fallback = encode_fallback_subchar;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-subchar=") == 0){
-		    encode_fallback = encode_fallback_subchar;
-		    unicode_subchar = 0;
-		    if (p[0] != '0'){
-			/* decimal number */
-			for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
-			    unicode_subchar *= 10;
-			    unicode_subchar += hex2bin(p[i]);
-			}
-		    }else if(p[1] == 'x' || p[1] == 'X'){
-			/* hexadecimal number */
-			for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
-			    unicode_subchar <<= 4;
-			    unicode_subchar |= hex2bin(p[i]);
-			}
-		    }else{
-			/* octal number */
-			for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
-			    unicode_subchar *= 8;
-			    unicode_subchar += hex2bin(p[i]);
-			}
-		    }
-		    w16e_conv(unicode_subchar, &i, &j);
-		    unicode_subchar = i<<8 | j;
-                    continue;
-                }
+	ms_ucs_map_f = UCS_MAP_CP932;
 #endif
+	break;
+    case EUCJP_MS:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
+	x0212_f = TRUE;
 #ifdef UTF8_OUTPUT_ENABLE
-                if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
-                    ms_ucs_map_f = UCS_MAP_MS;
-                    continue;
-                }
+	ms_ucs_map_f = UCS_MAP_MS;
 #endif
-#ifdef UNICODE_NORMALIZATION
-		if (strcmp(long_option[i].name, "utf8mac-input") == 0){
-		    input_f = UTF8_INPUT;
-		    nfc_f = TRUE;
-		    continue;
-		}
+	break;
+    case EUCJP_ASCII:
+	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
+	x0212_f = TRUE;
+#ifdef UTF8_OUTPUT_ENABLE
+	ms_ucs_map_f = UCS_MAP_ASCII;
 #endif
-                if (strcmp(long_option[i].name, "prefix=") == 0){
-                    if (nkf_isgraph(p[0])){
-                        for (i = 1; nkf_isgraph(p[i]); i++){
-                            prefix_table[p[i]] = p[0];
-                        }
-                    }
-                    continue;
-                }
-            }
-            continue;
-        case 'b':           /* buffered mode */
-            unbuf_f = FALSE;
-            continue;
-        case 'u':           /* non bufferd mode */
-            unbuf_f = TRUE;
-            continue;
-        case 't':           /* transparent mode */
-            if (*cp=='1') {
-		/* alias of -t */
-		nop_f = TRUE;
-		*cp++;
-	    } else if (*cp=='2') {
-		/*
-		 * -t with put/get
-		 *
-		 * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
-		 *
-		 */
-		nop_f = 2;
-		*cp++;
-            } else
-		nop_f = TRUE;
-            continue;
-        case 'j':           /* JIS output */
-        case 'n':
-            output_conv = j_oconv;
-            continue;
-        case 'e':           /* AT&T EUC output */
-            output_conv = e_oconv;
-            cp932inv_f = FALSE;
-            continue;
-        case 's':           /* SJIS output */
-            output_conv = s_oconv;
-            continue;
-        case 'l':           /* ISO8859 Latin-1 support, no conversion */
-            iso8859_f = TRUE;  /* Only compatible with ISO-2022-JP */
-            input_f = LATIN1_INPUT;
-            continue;
-        case 'i':           /* Kanji IN ESC-$-@/B */
-            if (*cp=='@'||*cp=='B') 
-                kanji_intro = *cp++;
-            continue;
-        case 'o':           /* ASCII IN ESC-(-J/B */
-            if (*cp=='J'||*cp=='B'||*cp=='H') 
-                ascii_intro = *cp++;
-            continue;
-        case 'h':
-            /*  
-                bit:1   katakana->hiragana
-                bit:2   hiragana->katakana
-            */
-            if ('9'>= *cp && *cp>='0') 
-                hira_f |= (*cp++ -'0');
-            else 
-                hira_f |= 1;
-            continue;
-        case 'r':
-            rot_f = TRUE;
-            continue;
-#if defined(MSDOS) || defined(__OS2__) 
-        case 'T':
-            binmode_f = FALSE;
-            continue;
+	break;
+    case SHIFT_JISX0213:
+    case SHIFT_JIS_2004:
+	x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
-#ifndef PERL_XS
-        case 'V':
-            version();
-            exit(1);
-            break;
-        case 'v':
-            usage();
-            exit(1);
-            break;
+	break;
+    case EUC_JISX0213:
+    case EUC_JIS_2004:
+	x0212_f = TRUE;
+	x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
+	break;
 #ifdef UTF8_OUTPUT_ENABLE
-        case 'w':           /* UTF-8 output */
-            if (cp[0] == '8') {
-		output_conv = w_oconv; cp++;
-		if (cp[0] == '0'){
-		    cp++;
-		} else {
-		    output_bom_f = TRUE;
-		}
-	    } else {
-		if ('1'== cp[0] && '6'==cp[1]) {
-		    output_conv = w_oconv16; cp+=2;
-		} else if ('3'== cp[0] && '2'==cp[1]) {
-		    output_conv = w_oconv32; cp+=2;
-		} else {
-		    output_conv = w_oconv;
-		    continue;
-		}
-		if (cp[0]=='L') {
-		    cp++;
-		    output_endian = ENDIAN_LITTLE;
-		} else if (cp[0] == 'B') {
-		    cp++;
-                } else {
-		    continue;
-                }
-		if (cp[0] == '0'){
-		    cp++;
-		} else {
-		    output_bom_f = TRUE;
-		}
-	    }
-            continue;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-        case 'W':           /* UTF input */
-	    if (cp[0] == '8') {
-		cp++;
-		input_f = UTF8_INPUT;
-	    }else{
-		if ('1'== cp[0] && '6'==cp[1]) {
-		    cp += 2;
-		    input_f = UTF16_INPUT;
-		    input_endian = ENDIAN_BIG;
-		} else if ('3'== cp[0] && '2'==cp[1]) {
-		    cp += 2;
-		    input_f = UTF32_INPUT;
-		    input_endian = ENDIAN_BIG;
-		} else {
-		    input_f = UTF8_INPUT;
-		    continue;
-		}
-		if (cp[0]=='L') {
-		    cp++;
-		    input_endian = ENDIAN_LITTLE;
-		} else if (cp[0] == 'B') {
-		    cp++;
-		}
-	    }
-            continue;
-#endif
-        /* Input code assumption */
-        case 'J':   /* JIS input */
-            input_f = JIS_INPUT;
-            continue;
-        case 'E':   /* AT&T EUC input */
-            input_f = EUC_INPUT;
-            continue;
-        case 'S':   /* MS Kanji input */
-            input_f = SJIS_INPUT;
-            if (x0201_f==NO_X0201) x0201_f=TRUE;
-            continue;
-        case 'Z':   /* Convert X0208 alphabet to asii */
-            /*  bit:0   Convert X0208
-                bit:1   Convert Kankaku to one space
-                bit:2   Convert Kankaku to two spaces
-                bit:3   Convert HTML Entity
-            */
-            if ('9'>= *cp && *cp>='0') 
-                alpha_f |= 1<<(*cp++ -'0');
-            else 
-                alpha_f |= TRUE;
-            continue;
-        case 'x':   /* Convert X0201 kana to X0208 or X0201 Conversion */
-            x0201_f = FALSE;    /* No X0201->X0208 conversion */
-            /* accept  X0201
-                    ESC-(-I     in JIS, EUC, MS Kanji
-                    SI/SO       in JIS, EUC, MS Kanji
-                    SSO         in EUC, JIS, not in MS Kanji
-                    MS Kanji (0xa0-0xdf) 
-               output  X0201
-                    ESC-(-I     in JIS (0x20-0x5f)
-                    SSO         in EUC (0xa0-0xdf)
-                    0xa0-0xd    in MS Kanji (0xa0-0xdf) 
-            */
-            continue;
-        case 'X':   /* Assume X0201 kana */
-            /* Default value is NO_X0201 for EUC/MS-Kanji mix */
-            x0201_f = TRUE;
-            continue;
-        case 'F':   /* prserve new lines */
-	    fold_preserve_f = TRUE;
-        case 'f':   /* folding -f60 or -f */
-            fold_f = TRUE;
-            fold_len = 0;
-            while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
-		fold_len *= 10;
-		fold_len += *cp++ - '0';
-	    }
-            if (!(0<fold_len && fold_len<BUFSIZ)) 
-                fold_len = DEFAULT_FOLD;
-	    if (*cp=='-') {
-		fold_margin = 0;
-		cp++;
-		while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
-		    fold_margin *= 10;
-		    fold_margin += *cp++ - '0';
-		}
-	    }
-            continue;
-        case 'm':   /* MIME support */
-            /* mime_decode_f = TRUE; */ /* this has too large side effects... */
-            if (*cp=='B'||*cp=='Q') {
-                mime_decode_mode = *cp++;
-                mimebuf_f = FIXED_MIME;
-            } else if (*cp=='N') {
-                mime_f = TRUE; cp++;
-            } else if (*cp=='S') {
-                mime_f = STRICT_MIME; cp++;
-            } else if (*cp=='0') {
-                mime_decode_f = FALSE;
-                mime_f = FALSE; cp++;
-            }
-            continue;
-        case 'M':   /* MIME output */
-            if (*cp=='B') {
-                mimeout_mode = 'B';
-                mimeout_f = FIXED_MIME; cp++;
-            } else if (*cp=='Q') {
-                mimeout_mode = 'Q';
-                mimeout_f = FIXED_MIME; cp++;
-            } else {
-		mimeout_f = TRUE;
-	    }
-            continue;
-        case 'B':   /* Broken JIS support */
-            /*  bit:0   no ESC JIS
-                bit:1   allow any x on ESC-(-x or ESC-$-x
-                bit:2   reset to ascii on NL
-            */
-            if ('9'>= *cp && *cp>='0') 
-                broken_f |= 1<<(*cp++ -'0');
-            else 
-                broken_f |= TRUE;
-            continue;
-#ifndef PERL_XS
-        case 'O':/* for Output file */
-            file_out_f = TRUE;
-            continue;
-#endif
-        case 'c':/* add cr code */
-            crmode_f = CRLF;
-            continue;
-        case 'd':/* delete cr code */
-            crmode_f = NL;
-            continue;
-        case 'I':   /* ISO-2022-JP output */
-            iso2022jp_f = TRUE;
-            continue;
-        case 'L':  /* line mode */
-            if (*cp=='u') {         /* unix */
-                crmode_f = NL; cp++;
-            } else if (*cp=='m') { /* mac */
-                crmode_f = CR; cp++;
-            } else if (*cp=='w') { /* windows */
-                crmode_f = CRLF; cp++;
-            } else if (*cp=='0') { /* no conversion  */
-                crmode_f = 0; cp++;
-            }
-            continue;
-        case 'g':
-#ifndef PERL_XS
-            guess_f = TRUE;
+    case UTF_8_BOM:
+	output_bom_f = TRUE;
+	break;
+    case UTF_16:
+    case UTF_16BE_BOM:
+	output_bom_f = TRUE;
+	break;
+    case UTF_16LE:
+	output_endian = ENDIAN_LITTLE;
+	output_bom_f = FALSE;
+	break;
+    case UTF_16LE_BOM:
+	output_endian = ENDIAN_LITTLE;
+	output_bom_f = TRUE;
+	break;
+    case UTF_32:
+    case UTF_32BE_BOM:
+	output_bom_f = TRUE;
+	break;
+    case UTF_32LE:
+	output_endian = ENDIAN_LITTLE;
+	output_bom_f = FALSE;
+	break;
+    case UTF_32LE_BOM:
+	output_endian = ENDIAN_LITTLE;
+	output_bom_f = TRUE;
+	break;
 #endif
-            continue;
-        case ' ':    
-        /* module muliple options in a string are allowed for Perl moudle  */
-	    while(*cp && *cp++!='-');
-            continue;
-        default:
-            /* bogus option but ignored */
-            continue;
-        }
     }
 }
 
-struct input_code * find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+static struct input_code*
+find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
 {
     if (iconv_func){
-        struct input_code *p = input_code_list;
-        while (p->name){
-            if (iconv_func == p->iconv_func){
-                return p;
-            }
-            p++;
-        }
+	struct input_code *p = input_code_list;
+	while (p->name){
+	    if (iconv_func == p->iconv_func){
+		return p;
+	    }
+	    p++;
+	}
     }
     return 0;
 }
 
-void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+static void
+set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
 {
 #ifdef INPUT_CODE_FIX
-    if (f || !input_f)
+    if (f || !input_encoding)
 #endif
-        if (estab_f != f){
-            estab_f = f;
-        }
+	if (estab_f != f){
+	    estab_f = f;
+	}
 
     if (iconv_func
 #ifdef INPUT_CODE_FIX
-        && (f == -TRUE || !input_f) /* -TRUE means "FORCE" */
+	&& (f == -TRUE || !input_encoding) /* -TRUE means "FORCE" */
 #endif
-        ){
-        iconv = iconv_func;
+       ){
+	iconv = iconv_func;
     }
 #ifdef CHECK_OPTION
     if (estab_f && iconv_for_check != iconv){
-        struct input_code *p = find_inputcode_byfunc(iconv);
-        if (p){
-            set_input_codename(p->name);
-            debug(input_codename);
-        }
-        iconv_for_check = iconv;
-    }
-#endif
-}
-
-#define SCORE_L2       (1)                   /* $BBh(B2$B?e=`4A;z(B */
-#define SCORE_KANA     (SCORE_L2 << 1)       /* $B$$$o$f$kH>3Q%+%J(B */
-#define SCORE_DEPEND   (SCORE_KANA << 1)     /* $B5!<o0MB8J8;z(B */
-#ifdef SHIFTJIS_CP932
-#define SCORE_CP932    (SCORE_DEPEND << 1)   /* CP932 $B$K$h$kFI$_49$((B */
-#define SCORE_NO_EXIST (SCORE_CP932 << 1)    /* $BB8:_$7$J$$J8;z(B */
-#else
-#define SCORE_NO_EXIST (SCORE_DEPEND << 1)   /* $BB8:_$7$J$$J8;z(B */
-#endif
-#define SCORE_iMIME    (SCORE_NO_EXIST << 1) /* MIME $B$K$h$k;XDj(B */
-#define SCORE_ERROR    (SCORE_iMIME << 1) /* $B%(%i!<(B */
-
-#define SCORE_INIT (SCORE_iMIME)
-
-const nkf_char score_table_A0[] = {
-    0, 0, 0, 0,
-    0, 0, 0, 0,
-    0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
-    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
-};
-
-const nkf_char score_table_F0[] = {
-    SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
-    SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
-    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
-    SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
-};
-
-void set_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-        ptr->score |= score;
-    }
-}
-
-void clr_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-        ptr->score &= ~score;
-    }
-}
-
-void code_score(struct input_code *ptr)
-{
-    nkf_char c2 = ptr->buf[0];
-#ifdef UTF8_OUTPUT_ENABLE
-    nkf_char c1 = ptr->buf[1];
-#endif
-    if (c2 < 0){
-        set_code_score(ptr, SCORE_ERROR);
-    }else if (c2 == SSO){
-        set_code_score(ptr, SCORE_KANA);
-#ifdef UTF8_OUTPUT_ENABLE
-    }else if (!e2w_conv(c2, c1)){
-        set_code_score(ptr, SCORE_NO_EXIST);
-#endif
-    }else if ((c2 & 0x70) == 0x20){
-        set_code_score(ptr, score_table_A0[c2 & 0x0f]);
-    }else if ((c2 & 0x70) == 0x70){
-        set_code_score(ptr, score_table_F0[c2 & 0x0f]);
-    }else if ((c2 & 0x70) >= 0x50){
-        set_code_score(ptr, SCORE_L2);
-    }
-}
-
-void status_disable(struct input_code *ptr)
-{
-    ptr->stat = -1;
-    ptr->buf[0] = -1;
-    code_score(ptr);
-    if (iconv == ptr->iconv_func) set_iconv(FALSE, 0);
-}
-
-void status_push_ch(struct input_code *ptr, nkf_char c)
-{
-    ptr->buf[ptr->index++] = c;
-}
-
-void status_clear(struct input_code *ptr)
-{
-    ptr->stat = 0;
-    ptr->index = 0;
-}
-
-void status_reset(struct input_code *ptr)
-{
-    status_clear(ptr);
-    ptr->score = SCORE_INIT;
-}
-
-void status_reinit(struct input_code *ptr)
-{
-    status_reset(ptr);
-    ptr->_file_stat = 0;
-}
-
-void status_check(struct input_code *ptr, nkf_char c)
-{
-    if (c <= DEL && estab_f){
-        status_reset(ptr);
+	struct input_code *p = find_inputcode_byfunc(iconv);
+	if (p){
+	    set_input_codename(p->name);
+	    debug(p->name);
+	}
+	iconv_for_check = iconv;
     }
-}
-
-void s_status(struct input_code *ptr, nkf_char c)
-{
-    switch(ptr->stat){
-      case -1:
-          status_check(ptr, c);
-          break;
-      case 0:
-          if (c <= DEL){
-              break;
-#ifdef NUMCHAR_OPTION
-          }else if (is_unicode_capsule(c)){
-              break;
-#endif
-          }else if (0xa1 <= c && c <= 0xdf){
-              status_push_ch(ptr, SSO);
-              status_push_ch(ptr, c);
-              code_score(ptr);
-              status_clear(ptr);
-          }else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xef)){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-#ifdef SHIFTJIS_CP932
-          }else if (cp51932_f
-                    && is_ibmext_in_sjis(c)){
-              ptr->stat = 2;
-              status_push_ch(ptr, c);
-#endif /* SHIFTJIS_CP932 */
-#ifdef X0212_ENABLE
-          }else if (x0212_f && 0xf0 <= c && c <= 0xfc){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 1:
-          if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
-              status_push_ch(ptr, c);
-              s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
-              code_score(ptr);
-              status_clear(ptr);
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 2:
-#ifdef SHIFTJIS_CP932
-          if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
-              status_push_ch(ptr, c);
-              if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0){
-                  set_code_score(ptr, SCORE_CP932);
-                  status_clear(ptr);
-                  break;
-              }
-          }
-#endif /* SHIFTJIS_CP932 */
-#ifndef X0212_ENABLE
-          status_disable(ptr);
 #endif
-          break;
-    }
 }
 
-void e_status(struct input_code *ptr, nkf_char c)
-{
-    switch (ptr->stat){
-      case -1:
-          status_check(ptr, c);
-          break;
-      case 0:
-          if (c <= DEL){
-              break;
-#ifdef NUMCHAR_OPTION
-          }else if (is_unicode_capsule(c)){
-              break;
-#endif
-          }else if (SSO == c || (0xa1 <= c && c <= 0xfe)){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-#ifdef X0212_ENABLE
-          }else if (0x8f == c){
-              ptr->stat = 2;
-              status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 1:
-          if (0xa1 <= c && c <= 0xfe){
-              status_push_ch(ptr, c);
-              code_score(ptr);
-              status_clear(ptr);
-          }else{
-              status_disable(ptr);
-          }
-          break;
 #ifdef X0212_ENABLE
-      case 2:
-          if (0xa1 <= c && c <= 0xfe){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-          }else{
-              status_disable(ptr);
-          }
-#endif /* X0212_ENABLE */
-    }
-}
-
-#ifdef UTF8_INPUT_ENABLE
-void w_status(struct input_code *ptr, nkf_char c)
-{
-    switch (ptr->stat){
-      case -1:
-          status_check(ptr, c);
-          break;
-      case 0:
-          if (c <= DEL){
-              break;
-#ifdef NUMCHAR_OPTION
-          }else if (is_unicode_capsule(c)){
-              break;
-#endif
-          }else if (0xc0 <= c && c <= 0xdf){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-          }else if (0xe0 <= c && c <= 0xef){
-              ptr->stat = 2;
-              status_push_ch(ptr, c);
-          }else if (0xf0 <= c && c <= 0xf4){
-              ptr->stat = 3;
-              status_push_ch(ptr, c);
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 1:
-      case 2:
-          if (0x80 <= c && c <= 0xbf){
-              status_push_ch(ptr, c);
-              if (ptr->index > ptr->stat){
-                  int bom = (ptr->buf[0] == 0xef && ptr->buf[1] == 0xbb
-                             && ptr->buf[2] == 0xbf);
-                  w2e_conv(ptr->buf[0], ptr->buf[1], ptr->buf[2],
-                           &ptr->buf[0], &ptr->buf[1]);
-                  if (!bom){
-                      code_score(ptr);
-                  }
-                  status_clear(ptr);
-              }
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 3:
-	if (0x80 <= c && c <= 0xbf){
-	    if (ptr->index < ptr->stat){
-		status_push_ch(ptr, c);
-	    } else {
-	    	status_clear(ptr);
-	    }
-          }else{
-              status_disable(ptr);
-          }
-          break;
-    }
-}
-#endif
-
-void code_status(nkf_char c)
+static nkf_char
+x0212_shift(nkf_char c)
 {
-    int action_flag = 1;
-    struct input_code *result = 0;
-    struct input_code *p = input_code_list;
-    while (p->name){
-        if (!p->status_func) {
-	    ++p;
-	    continue;
+    nkf_char ret = c;
+    c &= 0x7f;
+    if (is_eucg3(ret)){
+	if (0x75 <= c && c <= 0x7f){
+	    ret = c + (0x109 - 0x75);
+	}
+    }else{
+	if (0x75 <= c && c <= 0x7f){
+	    ret = c + (0x113 - 0x75);
 	}
-        if (!p->status_func)
-	    continue;
-        (p->status_func)(p, c);
-        if (p->stat > 0){
-            action_flag = 0;
-        }else if(p->stat == 0){
-            if (result){
-                action_flag = 0;
-            }else{
-                result = p;
-            }
-        }
-        ++p;
-    }
-
-    if (action_flag){
-        if (result && !estab_f){
-            set_iconv(TRUE, result->iconv_func);
-        }else if (c <= DEL){
-            struct input_code *ptr = input_code_list;
-            while (ptr->name){
-                status_reset(ptr);
-                ++ptr;
-            }
-        }
-    }
-}
-
-#ifndef WIN32DLL
-nkf_char std_getc(FILE *f)
-{
-    if (std_gc_ndx){
-        return std_gc_buf[--std_gc_ndx];
-    }
-    return getc(f);
-}
-#endif /*WIN32DLL*/
-
-nkf_char std_ungetc(nkf_char c, FILE *f)
-{
-    if (std_gc_ndx == STD_GC_BUFSIZE){
-        return EOF;
     }
-    std_gc_buf[std_gc_ndx++] = c;
-    return c;
-}
-
-#ifndef WIN32DLL
-void std_putc(nkf_char c)
-{
-    if(c!=EOF)
-      putchar(c);
+    return ret;
 }
-#endif /*WIN32DLL*/
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-nkf_char noconvert(FILE *f)
-{
-    nkf_char    c;
 
-    if (nop_f == 2)
-	module_connection();
-    while ((c = (*i_getc)(f)) != EOF)
-      (*o_putc)(c);
-    (*o_putc)(EOF);
-    return 1;
-}
-#endif
 
-void module_connection(void)
+static nkf_char
+x0212_unshift(nkf_char c)
 {
-    oconv = output_conv; 
-    o_putc = std_putc;
-
-    /* replace continucation module, from output side */
-
-    /* output redicrection */
-#ifdef CHECK_OPTION
-    if (noout_f || guess_f){
-        o_putc = no_putc;
-    }
-#endif
-    if (mimeout_f) {
-	o_mputc = o_putc;
-	o_putc = mime_putc;
-	if (mimeout_f == TRUE) {
-	    o_base64conv = oconv; oconv = base64_conv;
-	}
-	/* base64_count = 0; */
-    }
-
-    if (crmode_f) {
-	o_crconv = oconv; oconv = cr_conv;
-    }
-    if (rot_f) {
-	o_rot_conv = oconv; oconv = rot_conv;
-    }
-    if (iso2022jp_f) {
-	o_iso2022jp_check_conv = oconv; oconv = iso2022jp_check_conv;
-    }
-    if (hira_f) {
-	o_hira_conv = oconv; oconv = hira_conv;
-    }
-    if (fold_f) {
-	o_fconv = oconv; oconv = fold_conv;
-	f_line = 0;
-    }
-    if (alpha_f || x0201_f) {
-	o_zconv = oconv; oconv = z_conv;
-    }
-
-    i_getc = std_getc;
-    i_ungetc = std_ungetc;
-    /* input redicrection */
-#ifdef INPUT_OPTION
-    if (cap_f){
-        i_cgetc = i_getc; i_getc = cap_getc;
-        i_cungetc = i_ungetc; i_ungetc= cap_ungetc;
-    }
-    if (url_f){
-        i_ugetc = i_getc; i_getc = url_getc;
-        i_uungetc = i_ungetc; i_ungetc= url_ungetc;
-    }
-#endif
-#ifdef NUMCHAR_OPTION
-    if (numchar_f){
-        i_ngetc = i_getc; i_getc = numchar_getc;
-        i_nungetc = i_ungetc; i_ungetc= numchar_ungetc;
-    }
-#endif
-#ifdef UNICODE_NORMALIZATION
-    if (nfc_f && input_f == UTF8_INPUT){
-        i_nfc_getc = i_getc; i_getc = nfc_getc;
-        i_nfc_ungetc = i_ungetc; i_ungetc= nfc_ungetc;
-    }
-#endif
-    if (mime_f && mimebuf_f==FIXED_MIME) {
-	i_mgetc = i_getc; i_getc = mime_getc;
-	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
-    }
-    if (broken_f & 1) {
-	i_bgetc = i_getc; i_getc = broken_getc;
-	i_bungetc = i_ungetc; i_ungetc = broken_ungetc;
-    }
-    if (input_f == JIS_INPUT || input_f == EUC_INPUT || input_f == LATIN1_INPUT) {
-        set_iconv(-TRUE, e_iconv);
-    } else if (input_f == SJIS_INPUT) {
-        set_iconv(-TRUE, s_iconv);
-#ifdef UTF8_INPUT_ENABLE
-    } else if (input_f == UTF8_INPUT) {
-        set_iconv(-TRUE, w_iconv);
-    } else if (input_f == UTF16_INPUT) {
-        set_iconv(-TRUE, w_iconv16);
-    } else if (input_f == UTF32_INPUT) {
-        set_iconv(-TRUE, w_iconv32);
-#endif
-    } else {
-        set_iconv(FALSE, e_iconv);
-    }
-
-    {
-        struct input_code *p = input_code_list;
-        while (p->name){
-            status_reinit(p++);
-        }
+    nkf_char ret = c;
+    if (0x7f <= c && c <= 0x88){
+	ret = c + (0x75 - 0x7f);
+    }else if (0x89 <= c && c <= 0x92){
+	ret = PREFIX_EUCG3 | 0x80 | (c + (0x75 - 0x89));
     }
+    return ret;
 }
+#endif /* X0212_ENABLE */
 
-/*
- * Check and Ignore BOM
- */
-void check_bom(FILE *f)
+static nkf_char
+e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
 {
-    int c2;
-    switch(c2 = (*i_getc)(f)){
-    case 0x00:
-	if((c2 = (*i_getc)(f)) == 0x00){
-	    if((c2 = (*i_getc)(f)) == 0xFE){
-		if((c2 = (*i_getc)(f)) == 0xFF){
-		    if(!input_f){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_BIG;
-			return;
-		    }
-		    (*i_ungetc)(0xFF,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0xFE,f);
-	    }else if(c2 == 0xFF){
-		if((c2 = (*i_getc)(f)) == 0xFE){
-		    if(!input_f){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_2143;
-			return;
-		    }
-		    (*i_ungetc)(0xFF,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0xFF,f);
-	    }else (*i_ungetc)(c2,f);
-	    (*i_ungetc)(0x00,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0x00,f);
-	break;
-    case 0xEF:
-	if((c2 = (*i_getc)(f)) == 0xBB){
-	    if((c2 = (*i_getc)(f)) == 0xBF){
-		if(!input_f){
-		    set_iconv(TRUE, w_iconv);
-		}
-		if (iconv == w_iconv) {
-		    return;
-		}
-		(*i_ungetc)(0xBF,f);
-	    }else (*i_ungetc)(c2,f);
-	    (*i_ungetc)(0xBB,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xEF,f);
-	break;
-    case 0xFE:
-	if((c2 = (*i_getc)(f)) == 0xFF){
-	    if((c2 = (*i_getc)(f)) == 0x00){
-		if((c2 = (*i_getc)(f)) == 0x00){
-		    if(!input_f){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_3412;
-			return;
-		    }
-		    (*i_ungetc)(0x00,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0x00,f);
-	    }else (*i_ungetc)(c2,f);
-	    if(!input_f){
-		set_iconv(TRUE, w_iconv16);
-	    }
-	    if (iconv == w_iconv16) {
-		input_endian = ENDIAN_BIG;
-		return;
-	    }
-	    (*i_ungetc)(0xFF,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xFE,f);
-	break;
-    case 0xFF:
-	if((c2 = (*i_getc)(f)) == 0xFE){
-	    if((c2 = (*i_getc)(f)) == 0x00){
-		if((c2 = (*i_getc)(f)) == 0x00){
-		    if(!input_f){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_LITTLE;
-			return;
-		    }
-		    (*i_ungetc)(0x00,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0x00,f);
-	    }else (*i_ungetc)(c2,f);
-	    if(!input_f){
-		set_iconv(TRUE, w_iconv16);
-	    }
-	    if (iconv == w_iconv16) {
-		input_endian = ENDIAN_LITTLE;
-		return;
+    nkf_char ndx;
+    if (is_eucg3(c2)){
+	ndx = c2 & 0x7f;
+	if (x0213_f){
+	    if((0x21 <= ndx && ndx <= 0x2F)){
+		if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
+		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+		return 0;
+	    }else if(0x6E <= ndx && ndx <= 0x7E){
+		if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe;
+		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+		return 0;
 	    }
-	    (*i_ungetc)(0xFE,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xFF,f);
-	break;
-    default:
-	(*i_ungetc)(c2,f);
-	break;
-    }
-}
-
-/*
-   Conversion main loop. Code detection only. 
- */
-
-nkf_char kanji_convert(FILE *f)
-{
-    nkf_char    c3, c2=0, c1, c0=0;
-    int is_8bit = FALSE;
-
-    if(input_f == SJIS_INPUT || input_f == EUC_INPUT
-#ifdef UTF8_INPUT_ENABLE
-       || input_f == UTF8_INPUT || input_f == UTF16_INPUT
-#endif
-      ){
-	is_8bit = TRUE;
-    }
-
-    input_mode = ASCII;
-    output_mode = ASCII;
-    shift_mode = FALSE;
-
-#define NEXT continue      /* no output, get next */
-#define SEND ;             /* output c1 and c2, get next */
-#define LAST break         /* end of loop, go closing  */
-
-    module_connection();
-    check_bom(f);
-
-    while ((c1 = (*i_getc)(f)) != EOF) {
-#ifdef INPUT_CODE_FIX
-	if (!input_f)
-#endif
-	    code_status(c1);
-        if (c2) {
-            /* second byte */
-            if (c2 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) {
-                /* in case of 8th bit is on */
-                if (!estab_f&&!mime_decode_mode) {
-                    /* in case of not established yet */
-                    /* It is still ambiguious */
-                    if (h_conv(f, c2, c1)==EOF) 
-                        LAST;
-                    else 
-                        c2 = 0;
-                    NEXT;
-                } else {
-		    /* in case of already established */
-		    if (c1 < AT) {
-			/* ignore bogus code and not CP5022x UCD */
-			c2 = 0;
-			NEXT;
-		    } else {
-			SEND;
-		    }
-		}
-            } else
-                /* second byte, 7 bit code */
-                /* it might be kanji shitfted */
-                if ((c1 == DEL) || (c1 <= SPACE)) {
-                    /* ignore bogus first code */
-                    c2 = 0;
-                    NEXT;
-                } else
-                    SEND;
-        } else {
-            /* first byte */
-#ifdef UTF8_INPUT_ENABLE
-	    if (iconv == w_iconv16) {
-		if (input_endian == ENDIAN_BIG) {
-		    c2 = c1;
-		    if ((c1 = (*i_getc)(f)) != EOF) {
-			if (0xD8 <= c2 && c2 <= 0xDB) {
-			    if ((c0 = (*i_getc)(f)) != EOF) {
-				c0 <<= 8;
-				if ((c3 = (*i_getc)(f)) != EOF) {
-				    c0 |= c3;
-				} else c2 = EOF;
-			    } else c2 = EOF;
-			}
-		    } else c2 = EOF;
-		} else {
-		    if ((c2 = (*i_getc)(f)) != EOF) {
-			if (0xD8 <= c2 && c2 <= 0xDB) {
-			    if ((c3 = (*i_getc)(f)) != EOF) {
-				if ((c0 = (*i_getc)(f)) != EOF) {
-				    c0 <<= 8;
-				    c0 |= c3;
-				} else c2 = EOF;
-			    } else c2 = EOF;
-			}
-		    } else c2 = EOF;
-		}
-		SEND;
-            } else if(iconv == w_iconv32){
-		int c3 = c1;
-		if((c2 = (*i_getc)(f)) != EOF &&
-		   (c1 = (*i_getc)(f)) != EOF &&
-		   (c0 = (*i_getc)(f)) != EOF){
-		    switch(input_endian){
-		    case ENDIAN_BIG:
-			c1 = (c2&0xFF)<<16 | (c1&0xFF)<<8 | (c0&0xFF);
-			break;
-		    case ENDIAN_LITTLE:
-			c1 = (c3&0xFF) | (c2&0xFF)<<8 | (c1&0xFF)<<16;
-			break;
-		    case ENDIAN_2143:
-			c1 = (c3&0xFF)<<16 | (c1&0xFF) | (c0&0xFF)<<8;
-			break;
-		    case ENDIAN_3412:
-			c1 = (c3&0xFF)<<8 | (c2&0xFF) | (c0&0xFF)<<16;
-			break;
-		    }
-		    c2 = 0;
-		}else{
-		    c2 = EOF;
-		}
-		SEND;
-            } else
-#endif
-#ifdef NUMCHAR_OPTION
-            if (is_unicode_capsule(c1)){
-                SEND;
-	    } else
-#endif
-	    if (c1 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) {
-                /* 8 bit code */
-                if (!estab_f && !iso8859_f) {
-                    /* not established yet */
-                    c2 = c1;
-                    NEXT;
-                } else { /* estab_f==TRUE */
-                    if (iso8859_f) {
-                        c2 = ISO8859_1;
-                        c1 &= 0x7f;
-                        SEND;
-                    } else if (SSP<=c1 && c1<0xe0 && iconv == s_iconv) {
-                        /* SJIS X0201 Case... */
-                        if(iso2022jp_f && x0201_f==NO_X0201) {
-                            (*oconv)(GETA1, GETA2);
-                            NEXT;
-                        } else {
-			    c2 = X0201;
-			    c1 &= 0x7f;
-			    SEND;
-			}
-                    } else if (c1==SSO && iconv != s_iconv) {
-                        /* EUC X0201 Case */
-                        c1 = (*i_getc)(f);  /* skip SSO */
-                        code_status(c1);
-                        if (SSP<=c1 && c1<0xe0) {
-			    if(iso2022jp_f &&  x0201_f==NO_X0201) {
-				(*oconv)(GETA1, GETA2);
-				NEXT;
-			    } else {
-				c2 = X0201;
-				c1 &= 0x7f;
-				SEND;
-			    }
-                        } else  { /* bogus code, skip SSO and one byte */
-                            NEXT;
-                        }
-                    } else {
-                       /* already established */
-                       c2 = c1;
-                       NEXT;
-                    }
-                }
-            } else if ((c1 > SPACE) && (c1 != DEL)) {
-                /* in case of Roman characters */
-                if (shift_mode) { 
-                    /* output 1 shifted byte */
-                    if (iso8859_f) {
-                        c2 = ISO8859_1;
-                        SEND;
-                    } else if (SPACE<=c1 && c1<(0xe0&0x7f) ){
-                      /* output 1 shifted byte */
-			if(iso2022jp_f && x0201_f==NO_X0201) {
-			    (*oconv)(GETA1, GETA2);
-			    NEXT;
-			} else {
-			    c2 = X0201;
-			    SEND;
-			}
-                    } else {
-                        /* look like bogus code */
-                        NEXT;
-                    }
-                } else if (input_mode == X0208 || input_mode == X0212 ||
-			   input_mode == X0213_1 || input_mode == X0213_2) {
-                    /* in case of Kanji shifted */
-                    c2 = c1;
-                    NEXT;
-                } else if (c1 == '=' && mime_f && !mime_decode_mode ) {
-                    /* Check MIME code */
-                    if ((c1 = (*i_getc)(f)) == EOF) {
-                        (*oconv)(0, '=');
-                        LAST;
-                    } else if (c1 == '?') {
-                        /* =? is mime conversion start sequence */
-			if(mime_f == STRICT_MIME) {
-			    /* check in real detail */
-			    if (mime_begin_strict(f) == EOF) 
-				LAST;
-			    else
-				NEXT;
-			} else if (mime_begin(f) == EOF) 
-                            LAST;
-                        else
-                            NEXT;
-                    } else {
-                        (*oconv)(0, '=');
-                        (*i_ungetc)(c1,f);
-                        NEXT;
-                    }
-                } else {
-                    /* normal ASCII code */ 
-                    SEND;
-                }
-            } else if (c1 == SI && (!is_8bit || mime_decode_mode)) {
-                shift_mode = FALSE; 
-                NEXT;
-            } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
-                shift_mode = TRUE; 
-                NEXT;
-            } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
-                if ((c1 = (*i_getc)(f)) == EOF) {
-                    /*  (*oconv)(0, ESC); don't send bogus code */
-                    LAST;
-                } else if (c1 == '$') {
-                    if ((c1 = (*i_getc)(f)) == EOF) {
-                        /*
-                        (*oconv)(0, ESC); don't send bogus code 
-                        (*oconv)(0, '$'); */
-                        LAST;
-                    } else if (c1 == '@'|| c1 == 'B') {
-                        /* This is kanji introduction */
-                        input_mode = X0208;
-                        shift_mode = FALSE;
-                        set_input_codename("ISO-2022-JP");
-#ifdef CHECK_OPTION
-                        debug(input_codename);
-#endif
-                        NEXT;
-                    } else if (c1 == '(') {
-                        if ((c1 = (*i_getc)(f)) == EOF) {
-                            /* don't send bogus code 
-                            (*oconv)(0, ESC);
-                            (*oconv)(0, '$');
-                            (*oconv)(0, '(');
-                                */
-                            LAST;
-                        } else if (c1 == '@'|| c1 == 'B') {
-                            /* This is kanji introduction */
-                            input_mode = X0208;
-                            shift_mode = FALSE;
-                            NEXT;
+	    return 1;
+	}
 #ifdef X0212_ENABLE
-                        } else if (c1 == 'D'){
-                            input_mode = X0212;
-                            shift_mode = FALSE;
-                            NEXT;
-#endif /* X0212_ENABLE */
-                        } else if (c1 == (X0213_1&0x7F)){
-                            input_mode = X0213_1;
-                            shift_mode = FALSE;
-                            NEXT;
-                        } else if (c1 == (X0213_2&0x7F)){
-                            input_mode = X0213_2;
-                            shift_mode = FALSE;
-                            NEXT;
-                        } else {
-                            /* could be some special code */
-                            (*oconv)(0, ESC);
-                            (*oconv)(0, '$');
-                            (*oconv)(0, '(');
-                            (*oconv)(0, c1);
-                            NEXT;
-                        }
-                    } else if (broken_f&0x2) {
-                        /* accept any ESC-(-x as broken code ... */
-                        input_mode = X0208;
-                        shift_mode = FALSE;
-                        NEXT;
-                    } else {
-                        (*oconv)(0, ESC);
-                        (*oconv)(0, '$');
-                        (*oconv)(0, c1);
-                        NEXT;
-                    }
-                } else if (c1 == '(') {
-                    if ((c1 = (*i_getc)(f)) == EOF) {
-                        /* don't send bogus code 
-                        (*oconv)(0, ESC);
-                        (*oconv)(0, '('); */
-                        LAST;
-                    } else {
-                        if (c1 == 'I') {
-                            /* This is X0201 kana introduction */
-                            input_mode = X0201; shift_mode = X0201;
-                            NEXT;
-                        } else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
-                            /* This is X0208 kanji introduction */
-                            input_mode = ASCII; shift_mode = FALSE;
-                            NEXT;
-                        } else if (broken_f&0x2) {
-                            input_mode = ASCII; shift_mode = FALSE;
-                            NEXT;
-                        } else {
-                            (*oconv)(0, ESC);
-                            (*oconv)(0, '(');
-                            /* maintain various input_mode here */
-                            SEND;
-                        }
-                    }
-               } else if ( c1 == 'N' || c1 == 'n' ){
-                   /* SS2 */
-                   c3 = (*i_getc)(f);  /* skip SS2 */
-                   if ( (SPACE<=c3 && c3 < 0x60) || (0xa0<=c3 && c3 < 0xe0)){
-                       c1 = c3;
-                       c2 = X0201;
-                       SEND;
-                   }else{
-                       (*i_ungetc)(c3, f);
-                       /* lonely ESC  */
-                       (*oconv)(0, ESC);
-                       SEND;
-                   }
-                } else {
-                    /* lonely ESC  */
-                    (*oconv)(0, ESC);
-                    SEND;
-                }
-	    } else if (c1 == ESC && iconv == s_iconv) {
-		/* ESC in Shift_JIS */
-		if ((c1 = (*i_getc)(f)) == EOF) {
-		    /*  (*oconv)(0, ESC); don't send bogus code */
-		    LAST;
-		} else if (c1 == '$') {
-		    /* J-PHONE emoji */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			/*
-			   (*oconv)(0, ESC); don't send bogus code 
-			   (*oconv)(0, '$'); */
-			LAST;
-		    } else {
-			if (('E' <= c1 && c1 <= 'G') ||
-			    ('O' <= c1 && c1 <= 'Q')) {
-			    /*
-			       NUM : 0 1 2 3 4 5
-			       BYTE: G E F O P Q
-			       C%7 : 1 6 0 2 3 4
-			       C%7 : 0 1 2 3 4 5 6
-			       NUM : 2 0 3 4 5 X 1
-			     */
-			    static const int jphone_emoji_first_table[7] = {2, 0, 3, 4, 5, 0, 1};
-			    c0 = (jphone_emoji_first_table[c1 % 7] << 8) - SPACE + 0xE000 + CLASS_UNICODE;
-			    while ((c1 = (*i_getc)(f)) != EOF) {
-				if (SPACE <= c1 && c1 <= 'z') {
-				    (*oconv)(0, c1 + c0);
-				} else break; /* c1 == SO */
-			    }
-			}
-		    }
-		    if (c1 == EOF) LAST;
-		    NEXT;
-		} else {
-		    /* lonely ESC  */
-		    (*oconv)(0, ESC);
-		    SEND;
-		}
-            } else if ((c1 == NL || c1 == CR) && broken_f&4) {
-                input_mode = ASCII; set_iconv(FALSE, 0);
-                SEND;
-	    } else if (c1 == NL && mime_decode_f && !mime_decode_mode ) {
-		if ((c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
-		    i_ungetc(SPACE,f);
-		    continue;
-		} else {
-		    i_ungetc(c1,f);
-		}
-		c1 = NL;
-		SEND;
-	    } else if (c1 == CR && mime_decode_f && !mime_decode_mode ) {
-		if ((c1=(*i_getc)(f))!=EOF) {
-		    if (c1==SPACE) {
-			i_ungetc(SPACE,f);
-			continue;
-		    } else if (c1 == NL && (c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
-			i_ungetc(SPACE,f);
-			continue;
-		    } else {
-			i_ungetc(c1,f);
-		    }
-		    i_ungetc(NL,f);
-		} else {
-		    i_ungetc(c1,f);
-		}
-		c1 = CR;
-		SEND;
-	    } else if (c1 == DEL && input_mode == X0208 ) {
-		/* CP5022x */
-		c2 = c1;
-		NEXT;
-	    } else 
-                SEND;
-        }
-        /* send: */
-	switch(input_mode){
-	case ASCII:
-	    switch ((*iconv)(c2, c1, c0)) {  /* can be EUC / SJIS / UTF-8 / UTF-16 */
-	    case -2:
-		/* 4 bytes UTF-8 */
-		if ((c0 = (*i_getc)(f)) != EOF) {
-		    code_status(c0);
-		    c0 <<= 8;
-		    if ((c3 = (*i_getc)(f)) != EOF) {
-			code_status(c3);
-			(*iconv)(c2, c1, c0|c3);
-		    }
-		}
-		break;
-	    case -1:
-		/* 3 bytes EUC or UTF-8 */
-		if ((c0 = (*i_getc)(f)) != EOF) {
-		    code_status(c0);
-		    (*iconv)(c2, c1, c0);
-		}
-		break;
-	    }
-	    break;
-	case X0208:
-	case X0213_1:
-	    if (ms_ucs_map_f &&
-		0x7F <= c2 && c2 <= 0x92 &&
-		0x21 <= c1 && c1 <= 0x7E) {
-		/* CP932 UDC */
-		if(c1 == 0x7F) return 0;
-		c1 = (c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000 + CLASS_UNICODE;
-		c2 = 0;
+	else if(nkf_isgraph(ndx)){
+	    nkf_char val = 0;
+	    const unsigned short *ptr;
+	    ptr = x0212_shiftjis[ndx - 0x21];
+	    if (ptr){
+		val = ptr[(c1 & 0x7f) - 0x21];
 	    }
-	    (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
-	    break;
-#ifdef X0212_ENABLE
-	case X0212:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-#endif /* X0212_ENABLE */
-	case X0213_2:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-	default:
-	    (*oconv)(input_mode, c1);  /* other special case */
-	}
-
-        c2 = 0;
-        c0 = 0;
-        continue;
-        /* goto next_word */
-    }
-
-    /* epilogue */
-    (*iconv)(EOF, 0, 0);
-    if (!is_inputcode_set)
-    {
-	if (is_8bit) {
-	    struct input_code *p = input_code_list;
-	    struct input_code *result = p;
-	    while (p->name){
-		if (p->score < result->score) result = p;
-		++p;
+	    if (val){
+		c2 = val >> 8;
+		c1 = val & 0xff;
+		if (p2) *p2 = c2;
+		if (p1) *p1 = c1;
+		return 0;
 	    }
-	    set_input_codename(result->name);
-	}
-    }
-    return 1;
-}
-
-nkf_char
-h_conv(FILE *f, nkf_char c2, nkf_char c1)
-{
-    nkf_char ret, c3, c0;
-    int hold_index;
-
-
-    /** it must NOT be in the kanji shifte sequence      */
-    /** it must NOT be written in JIS7                   */
-    /** and it must be after 2 byte 8bit code            */
-
-    hold_count = 0;
-    push_hold_buf(c2);
-    push_hold_buf(c1);
-
-    while ((c1 = (*i_getc)(f)) != EOF) {
-        if (c1 == ESC){
-	    (*i_ungetc)(c1,f);
-            break;
-        }
-        code_status(c1);
-        if (push_hold_buf(c1) == EOF || estab_f){
-            break;
-        }
-    }
-
-    if (!estab_f){
-        struct input_code *p = input_code_list;
-        struct input_code *result = p;
-        if (c1 == EOF){
-            code_status(c1);
-        }
-        while (p->name){
-            if (p->score < result->score){
-                result = p;
-            }
-            ++p;
-        }
-        set_iconv(FALSE, result->iconv_func);
-    }
-
-
-    /** now,
-     ** 1) EOF is detected, or
-     ** 2) Code is established, or
-     ** 3) Buffer is FULL (but last word is pushed)
-     **
-     ** in 1) and 3) cases, we continue to use
-     ** Kanji codes by oconv and leave estab_f unchanged.
-     **/
-
-    ret = c1;
-    hold_index = 0;
-    while (hold_index < hold_count){
-        c2 = hold_buf[hold_index++];
-        if (c2 <= DEL
-#ifdef NUMCHAR_OPTION
-            || is_unicode_capsule(c2)
-#endif
-            ){
-            (*iconv)(0, c2, 0);
-            continue;
-        }else if (iconv == s_iconv && 0xa1 <= c2 && c2 <= 0xdf){
-            (*iconv)(X0201, c2, 0);
-            continue;
-        }
-        if (hold_index < hold_count){
-            c1 = hold_buf[hold_index++];
-        }else{
-            c1 = (*i_getc)(f);
-            if (c1 == EOF){
-                c3 = EOF;
-                break;
-            }
-            code_status(c1);
-        }
-        c0 = 0;
-        switch ((*iconv)(c2, c1, 0)) {  /* can be EUC/SJIS/UTF-8 */
-	case -2:
-	    /* 4 bytes UTF-8 */
-            if (hold_index < hold_count){
-                c0 = hold_buf[hold_index++];
-            } else if ((c0 = (*i_getc)(f)) == EOF) {
-		ret = EOF;
-		break;
-	    } else {
-                code_status(c0);
-		c0 <<= 8;
-		if (hold_index < hold_count){
-		    c3 = hold_buf[hold_index++];
-		} else if ((c3 = (*i_getc)(f)) == EOF) {
-		    c0 = ret = EOF;
-		    break;
-		} else {
-		    code_status(c3);
-		    (*iconv)(c2, c1, c0|c3);
-		}
-            }
-	    break;
-	case -1:
-	    /* 3 bytes EUC or UTF-8 */
-            if (hold_index < hold_count){
-                c0 = hold_buf[hold_index++];
-            } else if ((c0 = (*i_getc)(f)) == EOF) {
-		ret = EOF;
-		break;
-	    } else {
-                code_status(c0);
-            }
-            (*iconv)(c2, c1, c0);
-            break;
+	    c2 = x0212_shift(c2);
 	}
-	if (c0 == EOF) break;
+#endif /* X0212_ENABLE */
     }
-    return ret;
-}
-
-nkf_char push_hold_buf(nkf_char c2)
-{
-    if (hold_count >= HOLD_SIZE*2)
-        return (EOF);
-    hold_buf[hold_count++] = (unsigned char)c2;
-    return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
+    if(0x7F < c2) return 1;
+    if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1);
+    if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+    return 0;
 }
 
-nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+static nkf_char
+s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
 {
 #if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE)
     nkf_char val;
 #endif
-    static const nkf_char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
+    static const char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
+    if (0xFC < c1) return 1;
 #ifdef SHIFTJIS_CP932
     if (!cp932inv_f && is_ibmext_in_sjis(c2)){
-#if 0
-        extern const unsigned short shiftjis_cp932[3][189];
-#endif
-        val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
-        if (val){
-            c2 = val >> 8;
-            c1 = val & 0xff;
-        }
+	val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
+	if (val){
+	    c2 = val >> 8;
+	    c1 = val & 0xff;
+	}
     }
     if (cp932inv_f
-        && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
-#if 0
-        extern const unsigned short cp932inv[2][189];
-#endif
-        nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
-        if (c){
-            c2 = c >> 8;
-            c1 = c & 0xff;
-        }
+	&& CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
+	val = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
+	if (val){
+	    c2 = val >> 8;
+	    c1 = val & 0xff;
+	}
     }
 #endif /* SHIFTJIS_CP932 */
 #ifdef X0212_ENABLE
     if (!x0213_f && is_ibmext_in_sjis(c2)){
-#if 0
-        extern const unsigned short shiftjis_x0212[3][189];
-#endif
-        val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
-        if (val){
-            if (val > 0x7FFF){
-                c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f);
-                c1 = val & 0xff;
-            }else{
-                c2 = val >> 8;
-                c1 = val & 0xff;
-            }
-            if (p2) *p2 = c2;
-            if (p1) *p1 = c1;
-            return 0;
-        }
+	val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
+	if (val){
+	    if (val > 0x7FFF){
+		c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f);
+		c1 = val & 0xff;
+	    }else{
+		c2 = val >> 8;
+		c1 = val & 0xff;
+	    }
+	    if (p2) *p2 = c2;
+	    if (p1) *p1 = c1;
+	    return 0;
+	}
     }
 #endif
     if(c2 >= 0x80){
@@ -3175,11 +1634,13 @@ nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
 		if (0x9E < c1) c2++;
 	    }
 	}else{
+#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
+#define         SJ6394  0x0161          /* 63 - 94 ku offset */
 	    c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394);
 	    if (0x9E < c1) c2++;
 	}
 	if (c1 < 0x9F)
-	    c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F);
+	    c1 = c1 - ((c1 > DEL) ? SP : 0x1F);
 	else {
 	    c1 = c1 - 0x7E;
 	}
@@ -3193,320 +1654,135 @@ nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
     return 0;
 }
 
-nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    if (c2 == X0201) {
-	c1 &= 0x7f;
-    } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
-        /* NOP */
-    } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
-	/* CP932 UDC */
-	if(c1 == 0x7F) return 0;
-	c1 = (c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000 + CLASS_UNICODE;
-	c2 = 0;
-    } else {
-        nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
-        if (ret) return ret;
-    }
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    if (c2 == X0201) {
-	c1 &= 0x7f;
-#ifdef X0212_ENABLE
-    }else if (c2 == 0x8f){
-        if (c0 == 0){
-            return -1;
-        }
-	if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
-	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
-	    c1 = (c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC + CLASS_UNICODE;
-	    c2 = 0;
-	} else {
-	    c2 = (c2 << 8) | (c1 & 0x7f);
-	    c1 = c0 & 0x7f;
-#ifdef SHIFTJIS_CP932
-	    if (cp51932_f){
-		nkf_char s2, s1;
-		if (e2s_conv(c2, c1, &s2, &s1) == 0){
-		    s2e_conv(s2, s1, &c2, &c1);
-		    if (c2 < 0x100){
-			c1 &= 0x7f;
-			c2 &= 0x7f;
-		    }
-		}
-	    }
-#endif /* SHIFTJIS_CP932 */
-        }
-#endif /* X0212_ENABLE */
-    } else if (c2 == SSO){
-        c2 = X0201;
-        c1 &= 0x7f;
-    } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
-        /* NOP */
-    } else {
-	if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
-	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
-	    c1 = (c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000 + CLASS_UNICODE;
-	    c2 = 0;
-	} else {
-	    c1 &= 0x7f;
-	    c2 &= 0x7f;
-#ifdef SHIFTJIS_CP932
-	    if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
-		nkf_char s2, s1;
-		if (e2s_conv(c2, c1, &s2, &s1) == 0){
-		    s2e_conv(s2, s1, &c2, &c1);
-		    if (c2 < 0x100){
-			c1 &= 0x7f;
-			c2 &= 0x7f;
-		    }
-		}
-	    }
-#endif /* SHIFTJIS_CP932 */
-        }
-    }
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-#ifdef UTF8_INPUT_ENABLE
-nkf_char w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char ret = 0;
-
-    if (!c1){
-        *p2 = 0;
-        *p1 = c2;
-    }else if (0xc0 <= c2 && c2 <= 0xef) {
-	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
-#ifdef NUMCHAR_OPTION
-        if (ret > 0){
-            if (p2) *p2 = 0;
-            if (p1) *p1 = CLASS_UNICODE | ww16_conv(c2, c1, c0);
-            ret = 0;
-        }
-#endif
-    }
-    return ret;
-}
-
-nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    nkf_char ret = 0;
-    static const int w_iconv_utf8_1st_byte[] =
-    { /* 0xC0 - 0xFF */
-	20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
-	40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
-    
-    if (c2 < 0 || 0xff < c2) {
-    }else if (c2 == 0) { /* 0 : 1 byte*/
-	c0 = 0;
-    } else if ((c2 & 0xc0) == 0x80) { /* 0x80-0xbf : trail byte */
-	return 0;
-    } else{
-    	switch (w_iconv_utf8_1st_byte[c2 - 0xC0]) {
-	case 21:
-	    if (c1 < 0x80 || 0xBF < c1) return 0;
-	    break;
-	case 30:
-	    if (c0 == 0) return -1;
-	    if (c1 < 0xA0 || 0xBF < c1 || (c0 & 0xc0) != 0x80)
-		return 0;
-	    break;
-	case 31:
-	case 33:
-	    if (c0 == 0) return -1;
-	    if ((c1 & 0xc0) != 0x80 || (c0 & 0xc0) != 0x80)
-		return 0;
-	    break;
-	case 32:
-	    if (c0 == 0) return -1;
-	    if (c1 < 0x80 || 0x9F < c1 || (c0 & 0xc0) != 0x80)
-		return 0;
-	    break;
-	case 40:
-	    if (c0 == 0) return -2;
-	    if (c1 < 0x90 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
-		return 0;
-	    break;
-	case 41:
-	    if (c0 == 0) return -2;
-	    if (c1 < 0x80 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
-		return 0;
-	    break;
-	case 42:
-	    if (c0 == 0) return -2;
-	    if (c1 < 0x80 || 0x8F < c1 || (c0 & 0xc0c0) != 0x8080)
-		return 0;
-	    break;
-	default:
-	    return 0;
-	    break;
-	}
-    }
-    if (c2 == 0 || c2 == EOF){
-    } else if ((c2 & 0xf8) == 0xf0) { /* 4 bytes */
-	c1 = CLASS_UNICODE | ww16_conv(c2, c1, c0);
-	c2 = 0;
-    } else {
-	ret = w2e_conv(c2, c1, c0, &c2, &c1);
-    }
-    if (ret == 0){
-        (*oconv)(c2, c1);
-    }
-    return ret;
-}
-#endif
-
 #if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0)
+static void
+nkf_unicode_to_utf8(nkf_char val, nkf_char *p1, nkf_char *p2, nkf_char *p3, nkf_char *p4)
 {
     val &= VALUE_MASK;
     if (val < 0x80){
-        *p2 = val;
-        *p1 = 0;
-        *p0 = 0;
+	*p1 = val;
+	*p2 = 0;
+	*p3 = 0;
+	*p4 = 0;
     }else if (val < 0x800){
-	*p2 = 0xc0 | (val >> 6);
-	*p1 = 0x80 | (val & 0x3f);
-        *p0 = 0;
-    } else if (val <= NKF_INT32_C(0xFFFF)) {
-        *p2 = 0xe0 | (val >> 12);
-        *p1 = 0x80 | ((val >> 6) & 0x3f);
-        *p0 = 0x80 | (val        & 0x3f);
-    } else if (val <= NKF_INT32_C(0x10FFFF)) {
-        *p2 = 0xe0 |  (val >> 16);
-        *p1 = 0x80 | ((val >> 12) & 0x3f);
-        *p0 = 0x8080 | ((val << 2) & 0x3f00)| (val & 0x3f);
+	*p1 = 0xc0 | (val >> 6);
+	*p2 = 0x80 | (val & 0x3f);
+	*p3 = 0;
+	*p4 = 0;
+    } else if (nkf_char_unicode_bmp_p(val)) {
+	*p1 = 0xe0 |  (val >> 12);
+	*p2 = 0x80 | ((val >>  6) & 0x3f);
+	*p3 = 0x80 | ( val        & 0x3f);
+	*p4 = 0;
+    } else if (nkf_char_unicode_value_p(val)) {
+	*p1 = 0xf0 |  (val >> 18);
+	*p2 = 0x80 | ((val >> 12) & 0x3f);
+	*p3 = 0x80 | ((val >>  6) & 0x3f);
+	*p4 = 0x80 | ( val        & 0x3f);
     } else {
-        *p2 = 0;
-        *p1 = 0;
-        *p0 = 0;
-    }
-}
-#endif
-
-#ifdef UTF8_INPUT_ENABLE
-nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    nkf_char val;
-    if (c2 >= 0xf8) {
-	val = -1;
-    } else if (c2 >= 0xf0){
-	/* c2: 1st, c1: 2nd, c0: 3rd/4th */
-	val = (c2 & 0x0f) << 18;
-        val |= (c1 & 0x3f) << 12;
-        val |= (c0 & 0x3f00) >> 2;
-        val |= (c0 & 0x3f);
-    }else if (c2 >= 0xe0){
-        val = (c2 & 0x0f) << 12;
-        val |= (c1 & 0x3f) << 6;
-        val |= (c0 & 0x3f);
-    }else if (c2 >= 0xc0){
-        val = (c2 & 0x1f) << 6;
-        val |= (c1 & 0x3f);
-    }else{
-        val = c2;
+	*p1 = 0;
+	*p2 = 0;
+	*p3 = 0;
+	*p4 = 0;
     }
-    return val;
 }
 
-nkf_char w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
+static nkf_char
+nkf_utf8_to_unicode(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
 {
-    nkf_char c2, c1, c0;
-    nkf_char ret = 0;
-    val &= VALUE_MASK;
-    if (val < 0x80){
-        *p2 = 0;
-        *p1 = val;
-    }else{
-	w16w_conv(val, &c2, &c1, &c0);
-	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
-#ifdef NUMCHAR_OPTION
-	if (ret > 0){
-	    *p2 = 0;
-	    *p1 = CLASS_UNICODE | val;
-	    ret = 0;
-	}
-#endif
-    }
-    return ret;
+    nkf_char wc;
+    if (c1 <= 0x7F) {
+	/* single byte */
+	wc = c1;
+    }
+    else if (c1 <= 0xC3) {
+	/* trail byte or invalid */
+	return -1;
+    }
+    else if (c1 <= 0xDF) {
+	/* 2 bytes */
+	wc  = (c1 & 0x1F) << 6;
+	wc |= (c2 & 0x3F);
+    }
+    else if (c1 <= 0xEF) {
+	/* 3 bytes */
+	wc  = (c1 & 0x0F) << 12;
+	wc |= (c2 & 0x3F) << 6;
+	wc |= (c3 & 0x3F);
+    }
+    else if (c2 <= 0xF4) {
+	/* 4 bytes */
+	wc  = (c1 & 0x0F) << 18;
+	wc |= (c2 & 0x3F) << 12;
+	wc |= (c3 & 0x3F) << 6;
+	wc |= (c4 & 0x3F);
+    }
+    else {
+	return -1;
+    }
+    return wc;
 }
 #endif
 
 #ifdef UTF8_INPUT_ENABLE
-nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
+static int
+unicode_to_jis_common2(nkf_char c1, nkf_char c0,
+		       const unsigned short *const *pp, nkf_char psize,
+		       nkf_char *p2, nkf_char *p1)
 {
-    nkf_char ret = 0;
-    if ((c2==0 && c1 < 0x80) || c2==EOF) {
-	(*oconv)(c2, c1);
-	return 0;
-    }else if (0xD8 <= c2 && c2 <= 0xDB) {
-	if (c0 < NKF_INT32_C(0xDC00) || NKF_INT32_C(0xDFFF) < c0)
-	    return -2;
-	c1 =  CLASS_UNICODE | ((c2 << 18) + (c1 << 10) + c0 - NKF_INT32_C(0x35FDC00));
-	c2 = 0;
-    }else if ((c2>>3) == 27) { /* unpaired surrogate */
-	/*
-	   return 2;
-	*/
-	return 1;
-    }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1);
-    if (ret) return ret;
-    (*oconv)(c2, c1);
-    return 0;
-}
+    nkf_char c2;
+    const unsigned short *p;
+    unsigned short val;
 
-nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    int ret = 0;
+    if (pp == 0) return 1;
 
-    if ((c2 == 0 && c1 < 0x80) || c2==EOF) {
-    } else if (is_unicode_bmp(c1)) {
-	ret = w16e_conv(c1, &c2, &c1);
-    } else {
-	c2 = 0;
-	c1 =  CLASS_UNICODE | c1;
+    c1 -= 0x80;
+    if (c1 < 0 || psize <= c1) return 1;
+    p = pp[c1];
+    if (p == 0)  return 1;
+
+    c0 -= 0x80;
+    if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1;
+    val = p[c0];
+    if (val == 0) return 1;
+    if (no_cp932ext_f && (
+			  (val>>8) == 0x2D || /* NEC special characters */
+			  val > NKF_INT32_C(0xF300) /* IBM extended characters */
+			 )) return 1;
+
+    c2 = val >> 8;
+    if (val > 0x7FFF){
+	c2 &= 0x7f;
+	c2 |= PREFIX_EUCG3;
     }
-    if (ret) return ret;
-    (*oconv)(c2, c1);
+    if (c2 == SO) c2 = JIS_X_0201_1976_K;
+    c1 = val & 0xFF;
+    if (p2) *p2 = c2;
+    if (p1) *p1 = c1;
     return 0;
 }
 
-nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+static int
+unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
 {
-#if 0
-    extern const unsigned short *const utf8_to_euc_2bytes[];
-    extern const unsigned short *const utf8_to_euc_2bytes_ms[];
-    extern const unsigned short *const utf8_to_euc_2bytes_932[];
-    extern const unsigned short *const *const utf8_to_euc_3bytes[];
-    extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
-    extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
-#endif
     const unsigned short *const *pp;
     const unsigned short *const *const *ppp;
-    static const int no_best_fit_chars_table_C2[] =
+    static const char no_best_fit_chars_table_C2[] =
     {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2,
 	0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1};
-    static const int no_best_fit_chars_table_C2_ms[] =
+    static const char no_best_fit_chars_table_C2_ms[] =
     {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0,
 	0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0};
-    static const int no_best_fit_chars_table_932_C2[] =
+    static const char no_best_fit_chars_table_932_C2[] =
     {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
 	0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0};
-    static const int no_best_fit_chars_table_932_C3[] =
+    static const char no_best_fit_chars_table_932_C3[] =
     {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -3538,13 +1814,29 @@ nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *
 		}
 	    }else if(ms_ucs_map_f == UCS_MAP_MS){
 		if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1;
+	    }else if(ms_ucs_map_f == UCS_MAP_CP10001){
+		switch(c2){
+		case 0xC2:
+		    switch(c1){
+		    case 0xA2:
+		    case 0xA3:
+		    case 0xA5:
+		    case 0xA6:
+		    case 0xAC:
+		    case 0xAF:
+		    case 0xB8:
+			return 1;
+		    }
+		    break;
+		}
 	    }
 	}
 	pp =
 	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 :
 	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms :
+	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_2bytes_mac :
 	    utf8_to_euc_2bytes;
-	ret =  w_iconv_common(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
+	ret =  unicode_to_jis_common2(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
     }else if(c0 < 0xF0){
 	if(no_best_fit_chars_f){
 	    if(ms_ucs_map_f == UCS_MAP_CP932){
@@ -3565,6 +1857,19 @@ nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *
 		    if(c1 == 0x80 || c0 == 0x9C) return 1;
 		    break;
 		}
+	    }else if(ms_ucs_map_f == UCS_MAP_CP10001){
+		switch(c2){
+		case 0xE3:
+		    switch(c1){
+		    case 0x82:
+			if(c0 == 0x94) return 1;
+			break;
+		    case 0x83:
+			if(c0 == 0xBB) return 1;
+			break;
+		    }
+		    break;
+		}
 	    }else{
 		switch(c2){
 		case 0xE2:
@@ -3596,8 +1901,9 @@ nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *
 	ppp =
 	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 :
 	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms :
+	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac :
 	    utf8_to_euc_3bytes;
-	ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
+	ret = unicode_to_jis_common2(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
     }else return -1;
 #ifdef SHIFTJIS_CP932
     if (!ret && !cp932inv_f && is_eucg3(*p2)) {
@@ -3612,341 +1918,478 @@ nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *
     return ret;
 }
 
-nkf_char w_iconv_common(nkf_char c1, nkf_char c0, const unsigned short *const *pp, nkf_char psize, nkf_char *p2, nkf_char *p1)
+#ifdef UTF8_OUTPUT_ENABLE
+static nkf_char
+e2w_conv(nkf_char c2, nkf_char c1)
 {
-    nkf_char c2;
     const unsigned short *p;
-    unsigned short val;
-
-    if (pp == 0) return 1;
-
-    c1 -= 0x80;
-    if (c1 < 0 || psize <= c1) return 1;
-    p = pp[c1];
-    if (p == 0)  return 1;
 
-    c0 -= 0x80;
-    if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1;
-    val = p[c0];
-    if (val == 0) return 1;
-    if (no_cp932ext_f && (
-	(val>>8) == 0x2D || /* NEC special characters */
-	val > NKF_INT32_C(0xF300) /* IBM extended characters */
-	)) return 1;
-
-    c2 = val >> 8;
-   if (val > 0x7FFF){
-        c2 &= 0x7f;
-        c2 |= PREFIX_EUCG3;
+    if (c2 == JIS_X_0201_1976_K) {
+	if (ms_ucs_map_f == UCS_MAP_CP10001) {
+	    switch (c1) {
+	    case 0x20:
+		return 0xA0;
+	    case 0x7D:
+		return 0xA9;
+	    }
+	}
+	p = euc_to_utf8_1byte;
+#ifdef X0212_ENABLE
+    } else if (is_eucg3(c2)){
+	if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){
+	    return 0xA6;
+	}
+	c2 = (c2&0x7f) - 0x21;
+	if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
+	    p = x0212_to_utf8_2bytes[c2];
+	else
+	    return 0;
+#endif
+    } else {
+	c2 &= 0x7f;
+	c2 = (c2&0x7f) - 0x21;
+	if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
+	    p =
+		ms_ucs_map_f == UCS_MAP_ASCII ? euc_to_utf8_2bytes[c2] :
+		ms_ucs_map_f == UCS_MAP_CP10001 ? euc_to_utf8_2bytes_mac[c2] :
+		euc_to_utf8_2bytes_ms[c2];
+	else
+	    return 0;
     }
-    if (c2 == SO) c2 = X0201;
-    c1 = val & 0x7f;
-    if (p2) *p2 = c2;
-    if (p1) *p1 = c1;
+    if (!p) return 0;
+    c1 = (c1 & 0x7f) - 0x21;
+    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
+	return p[c1];
     return 0;
 }
+#endif
 
-void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
+static nkf_char
+w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
 {
-    const char *hex = "0123456789ABCDEF";
-    int shift = 20;
-    c &= VALUE_MASK;
-    while(shift >= 0){
-	if(c >= 1<<shift){
-	    while(shift >= 0){
-		(*f)(0, hex[(c>>shift)&0xF]);
-		shift -= 4;
-	    }
-	}else{
-	    shift -= 4;
+    nkf_char ret = 0;
+
+    if (!c1){
+	*p2 = 0;
+	*p1 = c2;
+    }else if (0xc0 <= c2 && c2 <= 0xef) {
+	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
+#ifdef NUMCHAR_OPTION
+	if (ret > 0){
+	    if (p2) *p2 = 0;
+	    if (p1) *p1 = nkf_char_unicode_new(nkf_utf8_to_unicode(c2, c1, c0, 0));
+	    ret = 0;
 	}
+#endif
     }
-    return;
+    return ret;
 }
 
-void encode_fallback_html(nkf_char c)
+#ifdef UTF8_INPUT_ENABLE
+static nkf_char
+w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
 {
-    (*oconv)(0, '&');
-    (*oconv)(0, '#');
-    c &= VALUE_MASK;
-    if(c >= NKF_INT32_C(1000000))
-	(*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10);
-    if(c >= NKF_INT32_C(100000))
-	(*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10);
-    if(c >= 10000)
-	(*oconv)(0, 0x30+(c/10000  )%10);
-    if(c >= 1000)
-	(*oconv)(0, 0x30+(c/1000   )%10);
-    if(c >= 100)
-	(*oconv)(0, 0x30+(c/100    )%10);
-    if(c >= 10)
-	(*oconv)(0, 0x30+(c/10     )%10);
-    if(c >= 0)
-	(*oconv)(0, 0x30+ c         %10);
-    (*oconv)(0, ';');
-    return;
+    nkf_char c1, c2, c3, c4;
+    nkf_char ret = 0;
+    val &= VALUE_MASK;
+    if (val < 0x80) {
+	*p2 = 0;
+	*p1 = val;
+    }
+    else if (nkf_char_unicode_bmp_p(val)){
+	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
+	ret =  unicode_to_jis_common(c1, c2, c3, p2, p1);
+	if (ret > 0){
+	    *p2 = 0;
+	    *p1 = nkf_char_unicode_new(val);
+	    ret = 0;
+	}
+    }
+    else {
+	*p2 = 0;
+	*p1 = nkf_char_unicode_new(val);
+    }
+    return ret;
 }
+#endif
 
-void encode_fallback_xml(nkf_char c)
+static nkf_char
+e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
 {
-    (*oconv)(0, '&');
-    (*oconv)(0, '#');
-    (*oconv)(0, 'x');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, ';');
-    return;
+    if (c2 == JIS_X_0201_1976_K || c2 == SS2){
+	if (iso2022jp_f && !x0201_f) {
+	    c2 = GETA1; c1 = GETA2;
+	} else {
+	    c2 = JIS_X_0201_1976_K;
+	    c1 &= 0x7f;
+	}
+#ifdef X0212_ENABLE
+    }else if (c2 == 0x8f){
+	if (c0 == 0){
+	    return -1;
+	}
+	if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
+	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+	    c1 = nkf_char_unicode_new((c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC);
+	    c2 = 0;
+	} else {
+	    c2 = (c2 << 8) | (c1 & 0x7f);
+	    c1 = c0 & 0x7f;
+#ifdef SHIFTJIS_CP932
+	    if (cp51932_f){
+		nkf_char s2, s1;
+		if (e2s_conv(c2, c1, &s2, &s1) == 0){
+		    s2e_conv(s2, s1, &c2, &c1);
+		    if (c2 < 0x100){
+			c1 &= 0x7f;
+			c2 &= 0x7f;
+		    }
+		}
+	    }
+#endif /* SHIFTJIS_CP932 */
+	}
+#endif /* X0212_ENABLE */
+    } else if ((c2 == EOF) || (c2 == 0) || c2 < SP || c2 == ISO_8859_1) {
+	/* NOP */
+    } else {
+	if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
+	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+	    c1 = nkf_char_unicode_new((c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000);
+	    c2 = 0;
+	} else {
+	    c1 &= 0x7f;
+	    c2 &= 0x7f;
+#ifdef SHIFTJIS_CP932
+	    if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
+		nkf_char s2, s1;
+		if (e2s_conv(c2, c1, &s2, &s1) == 0){
+		    s2e_conv(s2, s1, &c2, &c1);
+		    if (c2 < 0x100){
+			c1 &= 0x7f;
+			c2 &= 0x7f;
+		    }
+		}
+	    }
+#endif /* SHIFTJIS_CP932 */
+	}
+    }
+    (*oconv)(c2, c1);
+    return 0;
 }
 
-void encode_fallback_java(nkf_char c)
+static nkf_char
+s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
 {
-    const char *hex = "0123456789ABCDEF";
-    (*oconv)(0, '\\');
-    c &= VALUE_MASK;
-    if(!is_unicode_bmp(c)){
-	(*oconv)(0, 'U');
-	(*oconv)(0, '0');
-	(*oconv)(0, '0');
-	(*oconv)(0, hex[(c>>20)&0xF]);
-	(*oconv)(0, hex[(c>>16)&0xF]);
-    }else{
-	(*oconv)(0, 'u');
+    if (c2 == JIS_X_0201_1976_K || (0xA1 <= c2 && c2 <= 0xDF)) {
+	if (iso2022jp_f && !x0201_f) {
+	    c2 = GETA1; c1 = GETA2;
+	} else {
+	    c1 &= 0x7f;
+	}
+    } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) {
+	/* NOP */
+    } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
+	/* CP932 UDC */
+	if(c1 == 0x7F) return 0;
+	c1 = nkf_char_unicode_new((c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000);
+	c2 = 0;
+    } else {
+	nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
+	if (ret) return ret;
     }
-    (*oconv)(0, hex[(c>>12)&0xF]);
-    (*oconv)(0, hex[(c>> 8)&0xF]);
-    (*oconv)(0, hex[(c>> 4)&0xF]);
-    (*oconv)(0, hex[ c     &0xF]);
-    return;
+    (*oconv)(c2, c1);
+    return 0;
 }
 
-void encode_fallback_perl(nkf_char c)
+static nkf_char
+w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
 {
-    (*oconv)(0, '\\');
-    (*oconv)(0, 'x');
-    (*oconv)(0, '{');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, '}');
-    return;
-}
+    nkf_char ret = 0, c4 = 0;
+    static const char w_iconv_utf8_1st_byte[] =
+    { /* 0xC0 - 0xFF */
+	20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
+	40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
 
-void encode_fallback_subchar(nkf_char c)
-{
-    c = unicode_subchar;
-    (*oconv)((c>>8)&0xFF, c&0xFF);
-    return;
+    if (c3 > 0xFF) {
+	c4 = c3 & 0xFF;
+	c3 >>= 8;
+    }
+
+    if (c1 < 0 || 0xff < c1) {
+    }else if (c1 == 0) { /* 0 : 1 byte*/
+	c3 = 0;
+    } else if ((c1 & 0xC0) == 0x80) { /* 0x80-0xbf : trail byte */
+	return 0;
+    } else{
+	switch (w_iconv_utf8_1st_byte[c1 - 0xC0]) {
+	case 21:
+	    if (c2 < 0x80 || 0xBF < c2) return 0;
+	    break;
+	case 30:
+	    if (c3 == 0) return -1;
+	    if (c2 < 0xA0 || 0xBF < c2 || (c3 & 0xC0) != 0x80)
+		return 0;
+	    break;
+	case 31:
+	case 33:
+	    if (c3 == 0) return -1;
+	    if ((c2 & 0xC0) != 0x80 || (c3 & 0xC0) != 0x80)
+		return 0;
+	    break;
+	case 32:
+	    if (c3 == 0) return -1;
+	    if (c2 < 0x80 || 0x9F < c2 || (c3 & 0xC0) != 0x80)
+		return 0;
+	    break;
+	case 40:
+	    if (c3 == 0) return -2;
+	    if (c2 < 0x90 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
+		return 0;
+	    break;
+	case 41:
+	    if (c3 == 0) return -2;
+	    if (c2 < 0x80 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
+		return 0;
+	    break;
+	case 42:
+	    if (c3 == 0) return -2;
+	    if (c2 < 0x80 || 0x8F < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
+		return 0;
+	    break;
+	default:
+	    return 0;
+	    break;
+	}
+    }
+    if (c1 == 0 || c1 == EOF){
+    } else if ((c1 & 0xf8) == 0xf0) { /* 4 bytes */
+	c2 = nkf_char_unicode_new(nkf_utf8_to_unicode(c1, c2, c3, c4));
+	c1 = 0;
+    } else {
+	ret = w2e_conv(c1, c2, c3, &c1, &c2);
+    }
+    if (ret == 0){
+	(*oconv)(c1, c2);
+    }
+    return ret;
 }
-#endif
 
-#ifdef UTF8_OUTPUT_ENABLE
-nkf_char e2w_conv(nkf_char c2, nkf_char c1)
+#define NKF_ICONV_INVALID_CODE_RANGE -13
+static size_t
+unicode_iconv(nkf_char wc)
 {
-#if 0
-    extern const unsigned short euc_to_utf8_1byte[];
-    extern const unsigned short *const euc_to_utf8_2bytes[];
-    extern const unsigned short *const euc_to_utf8_2bytes_ms[];
-    extern const unsigned short *const x0212_to_utf8_2bytes[];
-#endif
-    const unsigned short *p;
+    nkf_char c1, c2;
+    int ret = 0;
 
-    if (c2 == X0201) {
-        p = euc_to_utf8_1byte;
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){
-	    return 0xA6;
-	}
-        c2 = (c2&0x7f) - 0x21;
-        if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
-	    p = x0212_to_utf8_2bytes[c2];
-        else
-            return 0;
-#endif
+    if (wc < 0x80) {
+	c2 = 0;
+	c1 = wc;
+    }else if ((wc>>11) == 27) {
+	/* unpaired surrogate */
+	return NKF_ICONV_INVALID_CODE_RANGE;
+    }else if (wc < 0xFFFF) {
+	ret = w16e_conv(wc, &c2, &c1);
+	if (ret) return ret;
+    }else if (wc < 0x10FFFF) {
+	c2 = 0;
+	c1 = nkf_char_unicode_new(wc);
     } else {
-        c2 &= 0x7f;
-        c2 = (c2&0x7f) - 0x21;
-        if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
-            p = ms_ucs_map_f != UCS_MAP_ASCII ? euc_to_utf8_2bytes_ms[c2] : euc_to_utf8_2bytes[c2];
-	else
-	    return 0;
+	return NKF_ICONV_INVALID_CODE_RANGE;
     }
-    if (!p) return 0;
-    c1 = (c1 & 0x7f) - 0x21;
-    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
-	return p[c1];
+    (*oconv)(c2, c1);
     return 0;
 }
 
-void w_oconv(nkf_char c2, nkf_char c1)
+#define NKF_ICONV_NEED_ONE_MORE_BYTE (size_t)-1
+#define NKF_ICONV_NEED_TWO_MORE_BYTES (size_t)-2
+#define UTF16_TO_UTF32(lead, trail) (((lead) << 10) + (trail) - NKF_INT32_C(0x35FDC00))
+static size_t
+nkf_iconv_utf_16(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
 {
-    nkf_char c0;
-    nkf_char val;
-
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-    	(*o_putc)('\357');
-	(*o_putc)('\273');
-	(*o_putc)('\277');
-    }
+    nkf_char wc;
 
-    if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
+    if (c1 == EOF) {
+	(*oconv)(EOF, 0);
+	return 0;
     }
 
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        val = c1 & VALUE_MASK;
-        if (val < 0x80){
-            (*o_putc)(val);
-        }else if (val < 0x800){
-            (*o_putc)(0xC0 | (val >> 6));
-            (*o_putc)(0x80 | (val & 0x3f));
-        } else if (val <= NKF_INT32_C(0xFFFF)) {
-            (*o_putc)(0xE0 | (val >> 12));
-            (*o_putc)(0x80 | ((val >> 6) & 0x3f));
-            (*o_putc)(0x80 | (val        & 0x3f));
-        } else if (val <= NKF_INT32_C(0x10FFFF)) {
-            (*o_putc)(0xF0 | ( val>>18));
-            (*o_putc)(0x80 | ((val>>12) & 0x3f));
-            (*o_putc)(0x80 | ((val>> 6) & 0x3f));
-            (*o_putc)(0x80 | ( val      & 0x3f));
-        }
-        return;
-    }
-#endif
-
-    if (c2 == 0) { 
-	output_mode = ASCII;
-        (*o_putc)(c1);
-    } else if (c2 == ISO8859_1) {
-	output_mode = ISO8859_1;
-        (*o_putc)(c1 | 0x080);
+    if (input_endian == ENDIAN_BIG) {
+	if (0xD8 <= c1 && c1 <= 0xDB) {
+	    if (0xDC <= c3 && c3 <= 0xDF) {
+		wc = UTF16_TO_UTF32(c1 << 8 | c2, c3 << 8 | c4);
+	    } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
+	} else {
+	    wc = c1 << 8 | c2;
+	}
     } else {
-        output_mode = UTF8;
-	val = e2w_conv(c2, c1);
-        if (val){
-            w16w_conv(val, &c2, &c1, &c0);
-            (*o_putc)(c2);
-            if (c1){
-                (*o_putc)(c1);
-                if (c0) (*o_putc)(c0);
-            }
-        }
+	if (0xD8 <= c2 && c2 <= 0xDB) {
+	    if (0xDC <= c4 && c4 <= 0xDF) {
+		wc = UTF16_TO_UTF32(c2 << 8 | c1, c4 << 8 | c3);
+	    } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
+	} else {
+	    wc = c2 << 8 | c1;
+	}
     }
+
+    return (*unicode_iconv)(wc);
 }
 
-void w_oconv16(nkf_char c2, nkf_char c1)
+static nkf_char
+w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
 {
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-        if (output_endian == ENDIAN_LITTLE){
-            (*o_putc)((unsigned char)'\377');
-            (*o_putc)('\376');
-        }else{
-            (*o_putc)('\376');
-            (*o_putc)((unsigned char)'\377');
-        }
-    }
+    (*oconv)(c2, c1);
+    return 16; /* different from w_iconv32 */
+}
 
-    if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
-    }
+static nkf_char
+w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    (*oconv)(c2, c1);
+    return 32; /* different from w_iconv16 */
+}
 
-    if (c2 == ISO8859_1) {
-        c2 = 0;
-        c1 |= 0x80;
-#ifdef NUMCHAR_OPTION
-    } else if (c2 == 0 && is_unicode_capsule(c1)) {
-        if (is_unicode_bmp(c1)) {
-            c2 = (c1 >> 8) & 0xff;
-            c1 &= 0xff;
-        } else {
-            c1 &= VALUE_MASK;
-            if (c1 <= UNICODE_MAX) {
-                c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
-                c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
-                if (output_endian == ENDIAN_LITTLE){
-                    (*o_putc)(c2 & 0xff);
-                    (*o_putc)((c2 >> 8) & 0xff);
-                    (*o_putc)(c1 & 0xff);
-                    (*o_putc)((c1 >> 8) & 0xff);
-                }else{
-                    (*o_putc)((c2 >> 8) & 0xff);
-                    (*o_putc)(c2 & 0xff);
-                    (*o_putc)((c1 >> 8) & 0xff);
-                    (*o_putc)(c1 & 0xff);
-                }
-            }
-            return;
-        }
-#endif
-    } else if (c2) {
-        nkf_char val = e2w_conv(c2, c1);
-        c2 = (val >> 8) & 0xff;
-        c1 = val & 0xff;
-	if (!val) return;
+static size_t
+nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+{
+    nkf_char wc;
+
+    if (c1 == EOF) {
+	(*oconv)(EOF, 0);
+	return 0;
     }
-    if (output_endian == ENDIAN_LITTLE){
-        (*o_putc)(c1);
-        (*o_putc)(c2);
-    }else{
-        (*o_putc)(c2);
-        (*o_putc)(c1);
+
+    switch(input_endian){
+    case ENDIAN_BIG:
+	wc = c2 << 16 | c3 << 8 | c4;
+	break;
+    case ENDIAN_LITTLE:
+	wc = c3 << 16 | c2 << 8 | c1;
+	break;
+    case ENDIAN_2143:
+	wc = c1 << 16 | c4 << 8 | c3;
+	break;
+    case ENDIAN_3412:
+	wc = c4 << 16 | c1 << 8 | c2;
+	break;
+    default:
+	return NKF_ICONV_INVALID_CODE_RANGE;
     }
+
+    return (*unicode_iconv)(wc);
 }
+#endif
 
-void w_oconv32(nkf_char c2, nkf_char c1)
-{
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-        if (output_endian == ENDIAN_LITTLE){
-            (*o_putc)((unsigned char)'\377');
-            (*o_putc)('\376');
-	    (*o_putc)('\000');
-	    (*o_putc)('\000');
-        }else{
-	    (*o_putc)('\000');
-	    (*o_putc)('\000');
-            (*o_putc)('\376');
-            (*o_putc)((unsigned char)'\377');
-        }
-    }
+#define output_ascii_escape_sequence(mode) do { \
+	    if (output_mode != ASCII && output_mode != ISO_8859_1) { \
+		    (*o_putc)(ESC); \
+		    (*o_putc)('('); \
+		    (*o_putc)(ascii_intro); \
+		    output_mode = mode; \
+	    } \
+    } while (0)
 
-    if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
+static void
+output_escape_sequence(int mode)
+{
+    if (output_mode == mode)
+	return;
+    switch(mode) {
+    case ISO_8859_1:
+	(*o_putc)(ESC);
+	(*o_putc)('.');
+	(*o_putc)('A');
+	break;
+    case JIS_X_0201_1976_K:
+	(*o_putc)(ESC);
+	(*o_putc)('(');
+	(*o_putc)('I');
+	break;
+    case JIS_X_0208:
+	(*o_putc)(ESC);
+	(*o_putc)('$');
+	(*o_putc)(kanji_intro);
+	break;
+    case JIS_X_0212:
+	(*o_putc)(ESC);
+	(*o_putc)('$');
+	(*o_putc)('(');
+	(*o_putc)('D');
+	break;
+    case JIS_X_0213_1:
+	(*o_putc)(ESC);
+	(*o_putc)('$');
+	(*o_putc)('(');
+	(*o_putc)('Q');
+	break;
+    case JIS_X_0213_2:
+	(*o_putc)(ESC);
+	(*o_putc)('$');
+	(*o_putc)('(');
+	(*o_putc)('P');
+	break;
     }
+    output_mode = mode;
+}
 
-    if (c2 == ISO8859_1) {
-        c1 |= 0x80;
+static void
+j_oconv(nkf_char c2, nkf_char c1)
+{
 #ifdef NUMCHAR_OPTION
-    } else if (c2 == 0 && is_unicode_capsule(c1)) {
-	c1 &= VALUE_MASK;
+    if (c2 == 0 && nkf_char_unicode_p(c1)){
+	w16e_conv(c1, &c2, &c1);
+	if (c2 == 0 && nkf_char_unicode_p(c1)){
+	    c2 = c1 & VALUE_MASK;
+	    if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
+		/* CP5022x UDC */
+		c1 &= 0xFFF;
+		c2 = 0x7F + c1 / 94;
+		c1 = 0x21 + c1 % 94;
+	    } else {
+		if (encode_fallback) (*encode_fallback)(c1);
+		return;
+	    }
+	}
+    }
 #endif
-    } else if (c2) {
-        c1 = e2w_conv(c2, c1);
-	if (!c1) return;
+    if (c2 == 0) {
+	output_ascii_escape_sequence(ASCII);
+	(*o_putc)(c1);
     }
-    if (output_endian == ENDIAN_LITTLE){
-        (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
-        (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >>  8);
-        (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
-	(*o_putc)('\000');
-    }else{
-	(*o_putc)('\000');
-        (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
-        (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >>  8);
-        (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
+    else if (c2 == EOF) {
+	output_ascii_escape_sequence(ASCII);
+	(*o_putc)(EOF);
     }
-}
+    else if (c2 == ISO_8859_1) {
+	output_ascii_escape_sequence(ISO_8859_1);
+	(*o_putc)(c1|0x80);
+    }
+    else if (c2 == JIS_X_0201_1976_K) {
+	output_escape_sequence(JIS_X_0201_1976_K);
+	(*o_putc)(c1);
+#ifdef X0212_ENABLE
+    } else if (is_eucg3(c2)){
+	output_escape_sequence(x0213_f ? JIS_X_0213_2 : JIS_X_0212);
+	(*o_putc)(c2 & 0x7f);
+	(*o_putc)(c1);
 #endif
+    } else {
+	if(ms_ucs_map_f
+	   ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
+	   : c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
+	output_escape_sequence(x0213_f ? JIS_X_0213_1 : JIS_X_0208);
+	(*o_putc)(c2);
+	(*o_putc)(c1);
+    }
+}
 
-void e_oconv(nkf_char c2, nkf_char c1)
+static void
+e_oconv(nkf_char c2, nkf_char c1)
 {
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        w16e_conv(c1, &c2, &c1);
-        if (c2 == 0 && is_unicode_capsule(c1)){
+    if (c2 == 0 && nkf_char_unicode_p(c1)){
+	w16e_conv(c1, &c2, &c1);
+	if (c2 == 0 && nkf_char_unicode_p(c1)){
 	    c2 = c1 & VALUE_MASK;
 	    if (x0212_f && 0xE000 <= c2 && c2 <= 0xE757) {
 		/* eucJP-ms UDC */
@@ -3967,143 +2410,68 @@ void e_oconv(nkf_char c2, nkf_char c1)
 		if (encode_fallback) (*encode_fallback)(c1);
 		return;
 	    }
-        }
+	}
     }
-#endif
+
     if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
-    } else if (c2 == 0) { 
+	(*o_putc)(EOF);
+    } else if (c2 == 0) {
 	output_mode = ASCII;
-        (*o_putc)(c1);
-    } else if (c2 == X0201) {
-	output_mode = JAPANESE_EUC;
-        (*o_putc)(SSO); (*o_putc)(c1|0x80);
-    } else if (c2 == ISO8859_1) {
-	output_mode = ISO8859_1;
-        (*o_putc)(c1 | 0x080);
+	(*o_putc)(c1);
+    } else if (c2 == JIS_X_0201_1976_K) {
+	output_mode = EUC_JP;
+	(*o_putc)(SS2); (*o_putc)(c1|0x80);
+    } else if (c2 == ISO_8859_1) {
+	output_mode = ISO_8859_1;
+	(*o_putc)(c1 | 0x080);
 #ifdef X0212_ENABLE
     } else if (is_eucg3(c2)){
-	output_mode = JAPANESE_EUC;
+	output_mode = EUC_JP;
 #ifdef SHIFTJIS_CP932
-        if (!cp932inv_f){
-            nkf_char s2, s1;
-            if (e2s_conv(c2, c1, &s2, &s1) == 0){
-                s2e_conv(s2, s1, &c2, &c1);
-            }
-        }
-#endif
-        if (c2 == 0) {
+	if (!cp932inv_f){
+	    nkf_char s2, s1;
+	    if (e2s_conv(c2, c1, &s2, &s1) == 0){
+		s2e_conv(s2, s1, &c2, &c1);
+	    }
+	}
+#endif
+	if (c2 == 0) {
 	    output_mode = ASCII;
 	    (*o_putc)(c1);
 	}else if (is_eucg3(c2)){
-            if (x0212_f){
-                (*o_putc)(0x8f);
-                (*o_putc)((c2 & 0x7f) | 0x080);
-                (*o_putc)(c1 | 0x080);
-            }
-        }else{
-            (*o_putc)((c2 & 0x7f) | 0x080);
-            (*o_putc)(c1 | 0x080);
-        }
-#endif
-    } else {
-        if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
-            set_iconv(FALSE, 0);
-            return; /* too late to rescue this char */
-        }
-	output_mode = JAPANESE_EUC;
-        (*o_putc)(c2 | 0x080);
-        (*o_putc)(c1 | 0x080);
-    }
-}
-
-#ifdef X0212_ENABLE
-nkf_char x0212_shift(nkf_char c)
-{
-    nkf_char ret = c;
-    c &= 0x7f;
-    if (is_eucg3(ret)){
-        if (0x75 <= c && c <= 0x7f){
-            ret = c + (0x109 - 0x75);
-        }
-    }else{
-        if (0x75 <= c && c <= 0x7f){
-            ret = c + (0x113 - 0x75);
-        }
-    }
-    return ret;
-}
-
-
-nkf_char x0212_unshift(nkf_char c)
-{
-    nkf_char ret = c;
-    if (0x7f <= c && c <= 0x88){
-        ret = c + (0x75 - 0x7f);
-    }else if (0x89 <= c && c <= 0x92){
-        ret = PREFIX_EUCG3 | 0x80 | (c + (0x75 - 0x89));
-    }
-    return ret;
-}
-#endif /* X0212_ENABLE */
-
-nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char ndx;
-    if (is_eucg3(c2)){
-	ndx = c2 & 0x7f;
-	if (x0213_f){
-	    if((0x21 <= ndx && ndx <= 0x2F)){
-		if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
-		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-		return 0;
-	    }else if(0x6E <= ndx && ndx <= 0x7E){
-		if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe;
-		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-		return 0;
+	    if (x0212_f){
+		(*o_putc)(0x8f);
+		(*o_putc)((c2 & 0x7f) | 0x080);
+		(*o_putc)(c1 | 0x080);
 	    }
-	    return 1;
+	}else{
+	    (*o_putc)((c2 & 0x7f) | 0x080);
+	    (*o_putc)(c1 | 0x080);
 	}
-#ifdef X0212_ENABLE
-	else if(nkf_isgraph(ndx)){
-	    nkf_char val = 0;
-	    const unsigned short *ptr;
-#if 0
-	    extern const unsigned short *const x0212_shiftjis[];
 #endif
-	    ptr = x0212_shiftjis[ndx - 0x21];
-	    if (ptr){
-		val = ptr[(c1 & 0x7f) - 0x21];
-	    }
-	    if (val){
-		c2 = val >> 8;
-		c1 = val & 0xff;
-		if (p2) *p2 = c2;
-		if (p1) *p1 = c1;
-		return 0;
-	    }
-	    c2 = x0212_shift(c2);
+    } else {
+	if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
+	    set_iconv(FALSE, 0);
+	    return; /* too late to rescue this char */
 	}
-#endif /* X0212_ENABLE */
+	output_mode = EUC_JP;
+	(*o_putc)(c2 | 0x080);
+	(*o_putc)(c1 | 0x080);
     }
-    if(0x7F < c2) return 1;
-    if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1);
-    if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-    return 0;
 }
 
-void s_oconv(nkf_char c2, nkf_char c1)
+static void
+s_oconv(nkf_char c2, nkf_char c1)
 {
 #ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        w16e_conv(c1, &c2, &c1);
-        if (c2 == 0 && is_unicode_capsule(c1)){
+    if (c2 == 0 && nkf_char_unicode_p(c1)){
+	w16e_conv(c1, &c2, &c1);
+	if (c2 == 0 && nkf_char_unicode_p(c1)){
 	    c2 = c1 & VALUE_MASK;
 	    if (!x0213_f && 0xE000 <= c2 && c2 <= 0xE757) {
 		/* CP932 UDC */
 		c1 &= 0xFFF;
-		c2 = c1 / 188 + 0xF0;
+		c2 = c1 / 188 + (cp932inv_f ? 0xF0 : 0xEB);
 		c1 = c1 % 188;
 		c1 += 0x40 + (c1 > 0x3e);
 		(*o_putc)(c2);
@@ -4117,515 +2485,1286 @@ void s_oconv(nkf_char c2, nkf_char c1)
     }
 #endif
     if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
+	(*o_putc)(EOF);
+	return;
     } else if (c2 == 0) {
 	output_mode = ASCII;
-        (*o_putc)(c1);
-    } else if (c2 == X0201) {
+	(*o_putc)(c1);
+    } else if (c2 == JIS_X_0201_1976_K) {
 	output_mode = SHIFT_JIS;
-        (*o_putc)(c1|0x80);
-    } else if (c2 == ISO8859_1) {
-	output_mode = ISO8859_1;
-        (*o_putc)(c1 | 0x080);
+	(*o_putc)(c1|0x80);
+    } else if (c2 == ISO_8859_1) {
+	output_mode = ISO_8859_1;
+	(*o_putc)(c1 | 0x080);
 #ifdef X0212_ENABLE
     } else if (is_eucg3(c2)){
 	output_mode = SHIFT_JIS;
-        if (e2s_conv(c2, c1, &c2, &c1) == 0){
-            (*o_putc)(c2);
-            (*o_putc)(c1);
-        }
+	if (e2s_conv(c2, c1, &c2, &c1) == 0){
+	    (*o_putc)(c2);
+	    (*o_putc)(c1);
+	}
 #endif
     } else {
-        if (!nkf_isprint(c1) || !nkf_isprint(c2)) {
-            set_iconv(FALSE, 0);
-            return; /* too late to rescue this char */
-        }
+	if (!nkf_isprint(c1) || !nkf_isprint(c2)) {
+	    set_iconv(FALSE, 0);
+	    return; /* too late to rescue this char */
+	}
 	output_mode = SHIFT_JIS;
-        e2s_conv(c2, c1, &c2, &c1);
+	e2s_conv(c2, c1, &c2, &c1);
 
 #ifdef SHIFTJIS_CP932
-        if (cp932inv_f
-            && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
-#if 0
-            extern const unsigned short cp932inv[2][189];
-#endif
-            nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
-            if (c){
-                c2 = c >> 8;
-                c1 = c & 0xff;
-            }
-        }
+	if (cp932inv_f
+	    && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
+	    nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
+	    if (c){
+		c2 = c >> 8;
+		c1 = c & 0xff;
+	    }
+	}
 #endif /* SHIFTJIS_CP932 */
 
-        (*o_putc)(c2);
+	(*o_putc)(c2);
 	if (prefix_table[(unsigned char)c1]){
-            (*o_putc)(prefix_table[(unsigned char)c1]);
+	    (*o_putc)(prefix_table[(unsigned char)c1]);
 	}
-        (*o_putc)(c1);
+	(*o_putc)(c1);
     }
 }
 
-void j_oconv(nkf_char c2, nkf_char c1)
+#ifdef UTF8_OUTPUT_ENABLE
+static void
+w_oconv(nkf_char c2, nkf_char c1)
 {
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        w16e_conv(c1, &c2, &c1);
-        if (c2 == 0 && is_unicode_capsule(c1)){
-	    c2 = c1 & VALUE_MASK;
-	    if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
-		/* CP5022x UDC */
-		c1 &= 0xFFF;
-		c2 = 0x7F + c1 / 94;
-		c1 = 0x21 + c1 % 94;
-	    } else {
-		if (encode_fallback) (*encode_fallback)(c1);
-		return;
+    nkf_char c3, c4;
+    nkf_char val;
+
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+	(*o_putc)('\357');
+	(*o_putc)('\273');
+	(*o_putc)('\277');
+    }
+
+    if (c2 == EOF) {
+	(*o_putc)(EOF);
+	return;
+    }
+
+    if (c2 == 0 && nkf_char_unicode_p(c1)){
+	val = c1 & VALUE_MASK;
+	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
+	(*o_putc)(c1);
+	if (c2) (*o_putc)(c2);
+	if (c3) (*o_putc)(c3);
+	if (c4) (*o_putc)(c4);
+	return;
+    }
+
+    if (c2 == 0) {
+	(*o_putc)(c1);
+    } else {
+	val = e2w_conv(c2, c1);
+	if (val){
+	    nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
+	    (*o_putc)(c1);
+	    if (c2) (*o_putc)(c2);
+	    if (c3) (*o_putc)(c3);
+	    if (c4) (*o_putc)(c4);
+	}
+    }
+}
+
+static void
+w_oconv16(nkf_char c2, nkf_char c1)
+{
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+	if (output_endian == ENDIAN_LITTLE){
+	    (*o_putc)(0xFF);
+	    (*o_putc)(0xFE);
+	}else{
+	    (*o_putc)(0xFE);
+	    (*o_putc)(0xFF);
+	}
+    }
+
+    if (c2 == EOF) {
+	(*o_putc)(EOF);
+	return;
+    }
+
+    if (c2 == 0 && nkf_char_unicode_p(c1)) {
+	if (nkf_char_unicode_bmp_p(c1)) {
+	    c2 = (c1 >> 8) & 0xff;
+	    c1 &= 0xff;
+	} else {
+	    c1 &= VALUE_MASK;
+	    if (c1 <= UNICODE_MAX) {
+		c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
+		c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
+		if (output_endian == ENDIAN_LITTLE){
+		    (*o_putc)(c2 & 0xff);
+		    (*o_putc)((c2 >> 8) & 0xff);
+		    (*o_putc)(c1 & 0xff);
+		    (*o_putc)((c1 >> 8) & 0xff);
+		}else{
+		    (*o_putc)((c2 >> 8) & 0xff);
+		    (*o_putc)(c2 & 0xff);
+		    (*o_putc)((c1 >> 8) & 0xff);
+		    (*o_putc)(c1 & 0xff);
+		}
 	    }
-        }
+	    return;
+	}
+    } else if (c2) {
+	nkf_char val = e2w_conv(c2, c1);
+	c2 = (val >> 8) & 0xff;
+	c1 = val & 0xff;
+	if (!val) return;
     }
-#endif
+
+    if (output_endian == ENDIAN_LITTLE){
+	(*o_putc)(c1);
+	(*o_putc)(c2);
+    }else{
+	(*o_putc)(c2);
+	(*o_putc)(c1);
+    }
+}
+
+static void
+w_oconv32(nkf_char c2, nkf_char c1)
+{
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+	if (output_endian == ENDIAN_LITTLE){
+	    (*o_putc)(0xFF);
+	    (*o_putc)(0xFE);
+	    (*o_putc)(0);
+	    (*o_putc)(0);
+	}else{
+	    (*o_putc)(0);
+	    (*o_putc)(0);
+	    (*o_putc)(0xFE);
+	    (*o_putc)(0xFF);
+	}
+    }
+
     if (c2 == EOF) {
-        if (output_mode !=ASCII && output_mode!=ISO8859_1) {
-            (*o_putc)(ESC);
-            (*o_putc)('(');
-            (*o_putc)(ascii_intro);
-	    output_mode = ASCII;
-        }
-        (*o_putc)(EOF);
+	(*o_putc)(EOF);
+	return;
+    }
+
+    if (c2 == ISO_8859_1) {
+	c1 |= 0x80;
+    } else if (c2 == 0 && nkf_char_unicode_p(c1)) {
+	c1 &= VALUE_MASK;
+    } else if (c2) {
+	c1 = e2w_conv(c2, c1);
+	if (!c1) return;
+    }
+    if (output_endian == ENDIAN_LITTLE){
+	(*o_putc)( c1        & 0xFF);
+	(*o_putc)((c1 >>  8) & 0xFF);
+	(*o_putc)((c1 >> 16) & 0xFF);
+	(*o_putc)(0);
+    }else{
+	(*o_putc)(0);
+	(*o_putc)((c1 >> 16) & 0xFF);
+	(*o_putc)((c1 >>  8) & 0xFF);
+	(*o_putc)( c1        & 0xFF);
+    }
+}
+#endif
+
+#define SCORE_L2       (1)                   /* Kanji Level 2 */
+#define SCORE_KANA     (SCORE_L2 << 1)       /* Halfwidth Katakana */
+#define SCORE_DEPEND   (SCORE_KANA << 1)     /* MD Characters */
+#define SCORE_CP932    (SCORE_DEPEND << 1)   /* IBM extended characters */
+#define SCORE_X0212    (SCORE_CP932 << 1)    /* JIS X 0212 */
+#define SCORE_NO_EXIST (SCORE_X0212 << 1)    /* Undefined Characters */
+#define SCORE_iMIME    (SCORE_NO_EXIST << 1) /* MIME selected */
+#define SCORE_ERROR    (SCORE_iMIME << 1) /* Error */
+
+#define SCORE_INIT (SCORE_iMIME)
+
+static const nkf_char score_table_A0[] = {
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
+    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
+};
+
+static const nkf_char score_table_F0[] = {
+    SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
+    SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
+    SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932,
+    SCORE_CP932, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
+};
+
+static void
+set_code_score(struct input_code *ptr, nkf_char score)
+{
+    if (ptr){
+	ptr->score |= score;
+    }
+}
+
+static void
+clr_code_score(struct input_code *ptr, nkf_char score)
+{
+    if (ptr){
+	ptr->score &= ~score;
+    }
+}
+
+static void
+code_score(struct input_code *ptr)
+{
+    nkf_char c2 = ptr->buf[0];
+#ifdef UTF8_OUTPUT_ENABLE
+    nkf_char c1 = ptr->buf[1];
+#endif
+    if (c2 < 0){
+	set_code_score(ptr, SCORE_ERROR);
+    }else if (c2 == SS2){
+	set_code_score(ptr, SCORE_KANA);
+    }else if (c2 == 0x8f){
+	set_code_score(ptr, SCORE_X0212);
+#ifdef UTF8_OUTPUT_ENABLE
+    }else if (!e2w_conv(c2, c1)){
+	set_code_score(ptr, SCORE_NO_EXIST);
+#endif
+    }else if ((c2 & 0x70) == 0x20){
+	set_code_score(ptr, score_table_A0[c2 & 0x0f]);
+    }else if ((c2 & 0x70) == 0x70){
+	set_code_score(ptr, score_table_F0[c2 & 0x0f]);
+    }else if ((c2 & 0x70) >= 0x50){
+	set_code_score(ptr, SCORE_L2);
+    }
+}
+
+static void
+status_disable(struct input_code *ptr)
+{
+    ptr->stat = -1;
+    ptr->buf[0] = -1;
+    code_score(ptr);
+    if (iconv == ptr->iconv_func) set_iconv(FALSE, 0);
+}
+
+static void
+status_push_ch(struct input_code *ptr, nkf_char c)
+{
+    ptr->buf[ptr->index++] = c;
+}
+
+static void
+status_clear(struct input_code *ptr)
+{
+    ptr->stat = 0;
+    ptr->index = 0;
+}
+
+static void
+status_reset(struct input_code *ptr)
+{
+    status_clear(ptr);
+    ptr->score = SCORE_INIT;
+}
+
+static void
+status_reinit(struct input_code *ptr)
+{
+    status_reset(ptr);
+    ptr->_file_stat = 0;
+}
+
+static void
+status_check(struct input_code *ptr, nkf_char c)
+{
+    if (c <= DEL && estab_f){
+	status_reset(ptr);
+    }
+}
+
+static void
+s_status(struct input_code *ptr, nkf_char c)
+{
+    switch(ptr->stat){
+    case -1:
+	status_check(ptr, c);
+	break;
+    case 0:
+	if (c <= DEL){
+	    break;
+	}else if (nkf_char_unicode_p(c)){
+	    break;
+	}else if (0xa1 <= c && c <= 0xdf){
+	    status_push_ch(ptr, SS2);
+	    status_push_ch(ptr, c);
+	    code_score(ptr);
+	    status_clear(ptr);
+	}else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xea)){
+	    ptr->stat = 1;
+	    status_push_ch(ptr, c);
+	}else if (0xed <= c && c <= 0xee){
+	    ptr->stat = 3;
+	    status_push_ch(ptr, c);
+#ifdef SHIFTJIS_CP932
+	}else if (is_ibmext_in_sjis(c)){
+	    ptr->stat = 2;
+	    status_push_ch(ptr, c);
+#endif /* SHIFTJIS_CP932 */
 #ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	if(x0213_f){
-	    if(output_mode!=X0213_2){
-		output_mode = X0213_2;
-		(*o_putc)(ESC);
-		(*o_putc)('$');
-		(*o_putc)('(');
-		(*o_putc)(X0213_2&0x7F);
+	}else if (0xf0 <= c && c <= 0xfc){
+	    ptr->stat = 1;
+	    status_push_ch(ptr, c);
+#endif /* X0212_ENABLE */
+	}else{
+	    status_disable(ptr);
+	}
+	break;
+    case 1:
+	if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
+	    status_push_ch(ptr, c);
+	    s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
+	    code_score(ptr);
+	    status_clear(ptr);
+	}else{
+	    status_disable(ptr);
+	}
+	break;
+    case 2:
+#ifdef SHIFTJIS_CP932
+	if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)) {
+	    status_push_ch(ptr, c);
+	    if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0) {
+		set_code_score(ptr, SCORE_CP932);
+		status_clear(ptr);
+		break;
 	    }
+	}
+#endif /* SHIFTJIS_CP932 */
+	status_disable(ptr);
+	break;
+    case 3:
+	if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
+	    status_push_ch(ptr, c);
+	    s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
+	    set_code_score(ptr, SCORE_CP932);
+	    status_clear(ptr);
+	}else{
+	    status_disable(ptr);
+	}
+	break;
+    }
+}
+
+static void
+e_status(struct input_code *ptr, nkf_char c)
+{
+    switch (ptr->stat){
+    case -1:
+	status_check(ptr, c);
+	break;
+    case 0:
+	if (c <= DEL){
+	    break;
+	}else if (nkf_char_unicode_p(c)){
+	    break;
+	}else if (SS2 == c || (0xa1 <= c && c <= 0xfe)){
+	    ptr->stat = 1;
+	    status_push_ch(ptr, c);
+#ifdef X0212_ENABLE
+	}else if (0x8f == c){
+	    ptr->stat = 2;
+	    status_push_ch(ptr, c);
+#endif /* X0212_ENABLE */
+	}else{
+	    status_disable(ptr);
+	}
+	break;
+    case 1:
+	if (0xa1 <= c && c <= 0xfe){
+	    status_push_ch(ptr, c);
+	    code_score(ptr);
+	    status_clear(ptr);
 	}else{
-	    if(output_mode!=X0212){
-		output_mode = X0212;
-		(*o_putc)(ESC);
-		(*o_putc)('$');
-		(*o_putc)('(');
-		(*o_putc)(X0212&0x7F);
+	    status_disable(ptr);
+	}
+	break;
+#ifdef X0212_ENABLE
+    case 2:
+	if (0xa1 <= c && c <= 0xfe){
+	    ptr->stat = 1;
+	    status_push_ch(ptr, c);
+	}else{
+	    status_disable(ptr);
+	}
+#endif /* X0212_ENABLE */
+    }
+}
+
+#ifdef UTF8_INPUT_ENABLE
+static void
+w_status(struct input_code *ptr, nkf_char c)
+{
+    switch (ptr->stat){
+    case -1:
+	status_check(ptr, c);
+	break;
+    case 0:
+	if (c <= DEL){
+	    break;
+	}else if (nkf_char_unicode_p(c)){
+	    break;
+	}else if (0xc0 <= c && c <= 0xdf){
+	    ptr->stat = 1;
+	    status_push_ch(ptr, c);
+	}else if (0xe0 <= c && c <= 0xef){
+	    ptr->stat = 2;
+	    status_push_ch(ptr, c);
+	}else if (0xf0 <= c && c <= 0xf4){
+	    ptr->stat = 3;
+	    status_push_ch(ptr, c);
+	}else{
+	    status_disable(ptr);
+	}
+	break;
+    case 1:
+    case 2:
+	if (0x80 <= c && c <= 0xbf){
+	    status_push_ch(ptr, c);
+	    if (ptr->index > ptr->stat){
+		int bom = (ptr->buf[0] == 0xef && ptr->buf[1] == 0xbb
+			   && ptr->buf[2] == 0xbf);
+		w2e_conv(ptr->buf[0], ptr->buf[1], ptr->buf[2],
+			 &ptr->buf[0], &ptr->buf[1]);
+		if (!bom){
+		    code_score(ptr);
+		}
+		status_clear(ptr);
 	    }
-        }
-        (*o_putc)(c2 & 0x7f);
-        (*o_putc)(c1);
-#endif
-    } else if (c2==X0201) {
-        if (output_mode!=X0201) {
-            output_mode = X0201;
-            (*o_putc)(ESC);
-            (*o_putc)('(');
-            (*o_putc)('I');
-        }
-        (*o_putc)(c1);
-    } else if (c2==ISO8859_1) {
-            /* iso8859 introduction, or 8th bit on */
-            /* Can we convert in 7bit form using ESC-'-'-A ? 
-               Is this popular? */
-	output_mode = ISO8859_1;
-        (*o_putc)(c1|0x80);
-    } else if (c2 == 0) {
-        if (output_mode !=ASCII && output_mode!=ISO8859_1) {
-            (*o_putc)(ESC);
-            (*o_putc)('(');
-            (*o_putc)(ascii_intro);
-            output_mode = ASCII;
-        }
-        (*o_putc)(c1);
-    } else {
-	if(ms_ucs_map_f
-	   ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
-	   : c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
-	if(x0213_f){
-	    if (output_mode!=X0213_1) {
-		output_mode = X0213_1;
-		(*o_putc)(ESC);
-		(*o_putc)('$');
-		(*o_putc)('(');
-		(*o_putc)(X0213_1&0x7F);
+	}else{
+	    status_disable(ptr);
+	}
+	break;
+    case 3:
+	if (0x80 <= c && c <= 0xbf){
+	    if (ptr->index < ptr->stat){
+		status_push_ch(ptr, c);
+	    } else {
+		status_clear(ptr);
 	    }
-	}else if (output_mode != X0208) {
-            output_mode = X0208;
-            (*o_putc)(ESC);
-            (*o_putc)('$');
-            (*o_putc)(kanji_intro);
-        }
-        (*o_putc)(c2);
-        (*o_putc)(c1);
+	}else{
+	    status_disable(ptr);
+	}
+	break;
     }
 }
+#endif
 
-void base64_conv(nkf_char c2, nkf_char c1)
+static void
+code_status(nkf_char c)
 {
-    mime_prechar(c2, c1);
-    (*o_base64conv)(c2,c1);
+    int action_flag = 1;
+    struct input_code *result = 0;
+    struct input_code *p = input_code_list;
+    while (p->name){
+	if (!p->status_func) {
+	    ++p;
+	    continue;
+	}
+	if (!p->status_func)
+	    continue;
+	(p->status_func)(p, c);
+	if (p->stat > 0){
+	    action_flag = 0;
+	}else if(p->stat == 0){
+	    if (result){
+		action_flag = 0;
+	    }else{
+		result = p;
+	    }
+	}
+	++p;
+    }
+
+    if (action_flag){
+	if (result && !estab_f){
+	    set_iconv(TRUE, result->iconv_func);
+	}else if (c <= DEL){
+	    struct input_code *ptr = input_code_list;
+	    while (ptr->name){
+		status_reset(ptr);
+		++ptr;
+	    }
+	}
+    }
+}
+
+typedef struct {
+    nkf_buf_t *std_gc_buf;
+    nkf_char broken_state;
+    nkf_buf_t *broken_buf;
+    nkf_char mimeout_state;
+    nkf_buf_t *nfc_buf;
+} nkf_state_t;
+
+static nkf_state_t *nkf_state = NULL;
+
+#define STD_GC_BUFSIZE (256)
+
+static void
+nkf_state_init(void)
+{
+    if (nkf_state) {
+	nkf_buf_clear(nkf_state->std_gc_buf);
+	nkf_buf_clear(nkf_state->broken_buf);
+	nkf_buf_clear(nkf_state->nfc_buf);
+    }
+    else {
+	nkf_state = nkf_xmalloc(sizeof(nkf_state_t));
+	nkf_state->std_gc_buf = nkf_buf_new(STD_GC_BUFSIZE);
+	nkf_state->broken_buf = nkf_buf_new(3);
+	nkf_state->nfc_buf = nkf_buf_new(9);
+    }
+    nkf_state->broken_state = 0;
+    nkf_state->mimeout_state = 0;
+}
+
+#ifndef WIN32DLL
+static nkf_char
+std_getc(FILE *f)
+{
+    if (!nkf_buf_empty_p(nkf_state->std_gc_buf)){
+	return nkf_buf_pop(nkf_state->std_gc_buf);
+    }
+    return getc(f);
+}
+#endif /*WIN32DLL*/
+
+static nkf_char
+std_ungetc(nkf_char c, FILE *f)
+{
+    nkf_buf_push(nkf_state->std_gc_buf, c);
+    return c;
+}
+
+#ifndef WIN32DLL
+static void
+std_putc(nkf_char c)
+{
+    if(c!=EOF)
+	putchar(c);
 }
+#endif /*WIN32DLL*/
+
+static nkf_char   hold_buf[HOLD_SIZE*2];
+static int             hold_count = 0;
+static nkf_char
+push_hold_buf(nkf_char c2)
+{
+    if (hold_count >= HOLD_SIZE*2)
+	return (EOF);
+    hold_buf[hold_count++] = c2;
+    return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
+}
+
+static int
+h_conv(FILE *f, nkf_char c1, nkf_char c2)
+{
+    int ret;
+    int hold_index;
+    nkf_char c3, c4;
 
+    /** it must NOT be in the kanji shifte sequence      */
+    /** it must NOT be written in JIS7                   */
+    /** and it must be after 2 byte 8bit code            */
+
+    hold_count = 0;
+    push_hold_buf(c1);
+    push_hold_buf(c2);
+
+    while ((c2 = (*i_getc)(f)) != EOF) {
+	if (c2 == ESC){
+	    (*i_ungetc)(c2,f);
+	    break;
+	}
+	code_status(c2);
+	if (push_hold_buf(c2) == EOF || estab_f) {
+	    break;
+	}
+    }
+
+    if (!estab_f) {
+	struct input_code *p = input_code_list;
+	struct input_code *result = p;
+	if (c2 == EOF) {
+	    code_status(c2);
+	}
+	while (p->name) {
+	    if (p->status_func && p->score < result->score) {
+		result = p;
+	    }
+	    p++;
+	}
+	set_iconv(TRUE, result->iconv_func);
+    }
+
+
+    /** now,
+     ** 1) EOF is detected, or
+     ** 2) Code is established, or
+     ** 3) Buffer is FULL (but last word is pushed)
+     **
+     ** in 1) and 3) cases, we continue to use
+     ** Kanji codes by oconv and leave estab_f unchanged.
+     **/
+
+    ret = c2;
+    hold_index = 0;
+    while (hold_index < hold_count){
+	c1 = hold_buf[hold_index++];
+	if (nkf_char_unicode_p(c1)) {
+	    (*oconv)(0, c1);
+	    continue;
+	}
+	else if (c1 <= DEL){
+	    (*iconv)(0, c1, 0);
+	    continue;
+	}else if (iconv == s_iconv && 0xa1 <= c1 && c1 <= 0xdf){
+	    (*iconv)(JIS_X_0201_1976_K, c1, 0);
+	    continue;
+	}
+	if (hold_index < hold_count){
+	    c2 = hold_buf[hold_index++];
+	}else{
+	    c2 = (*i_getc)(f);
+	    if (c2 == EOF){
+		c4 = EOF;
+		break;
+	    }
+	    code_status(c2);
+	}
+	c3 = 0;
+	switch ((*iconv)(c1, c2, 0)) {  /* can be EUC/SJIS/UTF-8 */
+	case -2:
+	    /* 4 bytes UTF-8 */
+	    if (hold_index < hold_count){
+		c3 = hold_buf[hold_index++];
+	    } else if ((c3 = (*i_getc)(f)) == EOF) {
+		ret = EOF;
+		break;
+	    }
+	    code_status(c3);
+	    if (hold_index < hold_count){
+		c4 = hold_buf[hold_index++];
+	    } else if ((c4 = (*i_getc)(f)) == EOF) {
+		c3 = ret = EOF;
+		break;
+	    }
+	    code_status(c4);
+	    (*iconv)(c1, c2, (c3<<8)|c4);
+	    break;
+	case -1:
+	    /* 3 bytes EUC or UTF-8 */
+	    if (hold_index < hold_count){
+		c3 = hold_buf[hold_index++];
+	    } else if ((c3 = (*i_getc)(f)) == EOF) {
+		ret = EOF;
+		break;
+	    } else {
+		code_status(c3);
+	    }
+	    (*iconv)(c1, c2, c3);
+	    break;
+	}
+	if (c3 == EOF) break;
+    }
+    return ret;
+}
+
+/*
+ * Check and Ignore BOM
+ */
+static void
+check_bom(FILE *f)
+{
+    int c2;
+    switch(c2 = (*i_getc)(f)){
+    case 0x00:
+	if((c2 = (*i_getc)(f)) == 0x00){
+	    if((c2 = (*i_getc)(f)) == 0xFE){
+		if((c2 = (*i_getc)(f)) == 0xFF){
+		    if(!input_encoding){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_BIG;
+			return;
+		    }
+		    (*i_ungetc)(0xFF,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0xFE,f);
+	    }else if(c2 == 0xFF){
+		if((c2 = (*i_getc)(f)) == 0xFE){
+		    if(!input_encoding){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_2143;
+			return;
+		    }
+		    (*i_ungetc)(0xFF,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0xFF,f);
+	    }else (*i_ungetc)(c2,f);
+	    (*i_ungetc)(0x00,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0x00,f);
+	break;
+    case 0xEF:
+	if((c2 = (*i_getc)(f)) == 0xBB){
+	    if((c2 = (*i_getc)(f)) == 0xBF){
+		if(!input_encoding){
+		    set_iconv(TRUE, w_iconv);
+		}
+		if (iconv == w_iconv) {
+		    return;
+		}
+		(*i_ungetc)(0xBF,f);
+	    }else (*i_ungetc)(c2,f);
+	    (*i_ungetc)(0xBB,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xEF,f);
+	break;
+    case 0xFE:
+	if((c2 = (*i_getc)(f)) == 0xFF){
+	    if((c2 = (*i_getc)(f)) == 0x00){
+		if((c2 = (*i_getc)(f)) == 0x00){
+		    if(!input_encoding){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_3412;
+			return;
+		    }
+		    (*i_ungetc)(0x00,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0x00,f);
+	    }else (*i_ungetc)(c2,f);
+	    if(!input_encoding){
+		set_iconv(TRUE, w_iconv16);
+	    }
+	    if (iconv == w_iconv16) {
+		input_endian = ENDIAN_BIG;
+		return;
+	    }
+	    (*i_ungetc)(0xFF,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xFE,f);
+	break;
+    case 0xFF:
+	if((c2 = (*i_getc)(f)) == 0xFE){
+	    if((c2 = (*i_getc)(f)) == 0x00){
+		if((c2 = (*i_getc)(f)) == 0x00){
+		    if(!input_encoding){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_LITTLE;
+			return;
+		    }
+		    (*i_ungetc)(0x00,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0x00,f);
+	    }else (*i_ungetc)(c2,f);
+	    if(!input_encoding){
+		set_iconv(TRUE, w_iconv16);
+	    }
+	    if (iconv == w_iconv16) {
+		input_endian = ENDIAN_LITTLE;
+		return;
+	    }
+	    (*i_ungetc)(0xFE,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xFF,f);
+	break;
+    default:
+	(*i_ungetc)(c2,f);
+	break;
+    }
+}
 
-static nkf_char broken_buf[3];
-static int broken_counter = 0;
-static int broken_last = 0;
-nkf_char broken_getc(FILE *f)
+static nkf_char
+broken_getc(FILE *f)
 {
-    nkf_char c,c1;
+    nkf_char c, c1;
 
-    if (broken_counter>0) {
-	return broken_buf[--broken_counter];
+    if (!nkf_buf_empty_p(nkf_state->broken_buf)) {
+	return nkf_buf_pop(nkf_state->broken_buf);
     }
-    c= (*i_bgetc)(f);
-    if (c=='$' && broken_last != ESC 
-            && (input_mode==ASCII || input_mode==X0201)) {
+    c = (*i_bgetc)(f);
+    if (c=='$' && nkf_state->broken_state != ESC
+	&& (input_mode == ASCII || input_mode == JIS_X_0201_1976_K)) {
 	c1= (*i_bgetc)(f);
-	broken_last = 0;
+	nkf_state->broken_state = 0;
 	if (c1=='@'|| c1=='B') {
-	    broken_buf[0]=c1; broken_buf[1]=c; 
-	    broken_counter=2;
+	    nkf_buf_push(nkf_state->broken_buf, c1);
+	    nkf_buf_push(nkf_state->broken_buf, c);
 	    return ESC;
 	} else {
 	    (*i_bungetc)(c1,f);
 	    return c;
 	}
-    } else if (c=='(' && broken_last != ESC 
-            && (input_mode==X0208 || input_mode==X0201)) { /* ) */
+    } else if (c=='(' && nkf_state->broken_state != ESC
+	       && (input_mode == JIS_X_0208 || input_mode == JIS_X_0201_1976_K)) {
 	c1= (*i_bgetc)(f);
-	broken_last = 0;
+	nkf_state->broken_state = 0;
 	if (c1=='J'|| c1=='B') {
-	    broken_buf[0]=c1; broken_buf[1]=c;
-	    broken_counter=2;
+	    nkf_buf_push(nkf_state->broken_buf, c1);
+	    nkf_buf_push(nkf_state->broken_buf, c);
 	    return ESC;
 	} else {
 	    (*i_bungetc)(c1,f);
 	    return c;
 	}
     } else {
-	broken_last = c;
+	nkf_state->broken_state = c;
 	return c;
     }
 }
 
-nkf_char broken_ungetc(nkf_char c, FILE *f)
+static nkf_char
+broken_ungetc(nkf_char c, FILE *f)
 {
-    if (broken_counter<2)
-	broken_buf[broken_counter++]=c;
+    if (nkf_buf_length(nkf_state->broken_buf) < 2)
+	nkf_buf_push(nkf_state->broken_buf, c);
     return c;
 }
 
-static nkf_char prev_cr = 0;
-
-void cr_conv(nkf_char c2, nkf_char c1)
+static void
+eol_conv(nkf_char c2, nkf_char c1)
 {
-    if (prev_cr) {
+    if (guess_f && input_eol != EOF) {
+	if (c2 == 0 && c1 == LF) {
+	    if (!input_eol) input_eol = prev_cr ? CRLF : LF;
+	    else if (input_eol != (prev_cr ? CRLF : LF)) input_eol = EOF;
+	} else if (c2 == 0 && c1 == CR && input_eol == LF) input_eol = EOF;
+	else if (!prev_cr);
+	else if (!input_eol) input_eol = CR;
+	else if (input_eol != CR) input_eol = EOF;
+    }
+    if (prev_cr || (c2 == 0 && c1 == LF)) {
 	prev_cr = 0;
-	if (! (c2==0&&c1==NL) ) {
-	    cr_conv(0,'\n');
-	}
-    }
-    if (c2) {
-        (*o_crconv)(c2,c1);
-    } else if (c1=='\r') {
-	prev_cr = c1;
-    } else if (c1=='\n') {
-        if (crmode_f==CRLF) {
-            (*o_crconv)(0,'\r');
-	} else if (crmode_f==CR) {
-            (*o_crconv)(0,'\r');
-	    return;
-	} 
-	(*o_crconv)(0,NL);
-    } else if (c1!='\032' || crmode_f!=NL){
-        (*o_crconv)(c2,c1);
+	if (eolmode_f != LF) (*o_eol_conv)(0, CR);
+	if (eolmode_f != CR) (*o_eol_conv)(0, LF);
+    }
+    if (c2 == 0 && c1 == CR) prev_cr = CR;
+    else if (c2 != 0 || c1 != LF) (*o_eol_conv)(c2, c1);
+}
+
+static void
+put_newline(void (*func)(nkf_char))
+{
+    switch (eolmode_f ? eolmode_f : DEFAULT_NEWLINE) {
+      case CRLF:
+	(*func)(0x0D);
+	(*func)(0x0A);
+	break;
+      case CR:
+	(*func)(0x0D);
+	break;
+      case LF:
+	(*func)(0x0A);
+	break;
     }
 }
 
-/* 
-  Return value of fold_conv()
+static void
+oconv_newline(void (*func)(nkf_char, nkf_char))
+{
+    switch (eolmode_f ? eolmode_f : DEFAULT_NEWLINE) {
+      case CRLF:
+	(*func)(0, 0x0D);
+	(*func)(0, 0x0A);
+	break;
+      case CR:
+	(*func)(0, 0x0D);
+	break;
+      case LF:
+	(*func)(0, 0x0A);
+	break;
+    }
+}
+
+/*
+   Return value of fold_conv()
 
-       \n  add newline  and output char
-       \r  add newline  and output nothing
-       ' ' space
-       0   skip  
-       1   (or else) normal output 
+   LF  add newline  and output char
+   CR  add newline  and output nothing
+   SP  space
+   0   skip
+   1   (or else) normal output
 
-  fold state in prev (previous character)
+   fold state in prev (previous character)
 
-      >0x80 Japanese (X0208/X0201)
-      <0x80 ASCII
-      \n    new line 
-      ' '   space
+   >0x80 Japanese (X0208/X0201)
+   <0x80 ASCII
+   LF    new line
+   SP    space
 
-  This fold algorthm does not preserve heading space in a line.
-  This is the main difference from fmt.
-*/
+   This fold algorthm does not preserve heading space in a line.
+   This is the main difference from fmt.
+ */
 
 #define char_size(c2,c1) (c2?2:1)
 
-void fold_conv(nkf_char c2, nkf_char c1)
-{ 
+static void
+fold_conv(nkf_char c2, nkf_char c1)
+{
     nkf_char prev0;
     nkf_char fold_state;
 
-    if (c1== '\r' && !fold_preserve_f) {
-    	fold_state=0;  /* ignore cr */
-    }else if (c1== '\n'&&f_prev=='\r' && fold_preserve_f) {
-        f_prev = '\n';
-     	fold_state=0;  /* ignore cr */
+    if (c1== CR && !fold_preserve_f) {
+	fold_state=0;  /* ignore cr */
+    }else if (c1== LF&&f_prev==CR && fold_preserve_f) {
+	f_prev = LF;
+	fold_state=0;  /* ignore cr */
     } else if (c1== BS) {
-        if (f_line>0) f_line--;
-        fold_state =  1;
+	if (f_line>0) f_line--;
+	fold_state =  1;
     } else if (c2==EOF && f_line != 0) {    /* close open last line */
-            fold_state = '\n';
-    } else if ((c1=='\n' && !fold_preserve_f)
-               || ((c1=='\r'||(c1=='\n'&&f_prev!='\r'))
-                   && fold_preserve_f)) {
-        /* new line */
-        if (fold_preserve_f) { 
-            f_prev = c1;
-            f_line = 0;
-            fold_state =  '\r';
+	fold_state = LF;
+    } else if ((c1==LF && !fold_preserve_f)
+	       || ((c1==CR||(c1==LF&&f_prev!=CR))
+		   && fold_preserve_f)) {
+	/* new line */
+	if (fold_preserve_f) {
+	    f_prev = c1;
+	    f_line = 0;
+	    fold_state =  CR;
 	} else if ((f_prev == c1 && !fold_preserve_f)
-                   || (f_prev == '\n' && fold_preserve_f)
-                   ) {        /* duplicate newline */
-            if (f_line) {
-                f_line = 0;
-                fold_state =  '\n';    /* output two newline */
-            } else {
-                f_line = 0;
-                fold_state =  1;
-            }
-        } else  {
-            if (f_prev&0x80) {     /* Japanese? */
-                f_prev = c1;
-                fold_state =  0;       /* ignore given single newline */
-            } else if (f_prev==' ') {
-                fold_state =  0;
-            } else {
-                f_prev = c1;
-                if (++f_line<=fold_len) 
-                    fold_state =  ' ';
-                else {
-                    f_line = 0;
-                    fold_state =  '\r';        /* fold and output nothing */
-                }
-            }
-        }
+		   || (f_prev == LF && fold_preserve_f)
+		  ) {        /* duplicate newline */
+	    if (f_line) {
+		f_line = 0;
+		fold_state =  LF;    /* output two newline */
+	    } else {
+		f_line = 0;
+		fold_state =  1;
+	    }
+	} else  {
+	    if (f_prev&0x80) {     /* Japanese? */
+		f_prev = c1;
+		fold_state =  0;       /* ignore given single newline */
+	    } else if (f_prev==SP) {
+		fold_state =  0;
+	    } else {
+		f_prev = c1;
+		if (++f_line<=fold_len)
+		    fold_state =  SP;
+		else {
+		    f_line = 0;
+		    fold_state =  CR;        /* fold and output nothing */
+		}
+	    }
+	}
     } else if (c1=='\f') {
-        f_prev = '\n';
-        f_line = 0;
-        fold_state =  '\n';            /* output newline and clear */
-    } else if ( (c2==0  && c1==' ')||
-               (c2==0  && c1=='\t')||
-               (c2=='!'&& c1=='!')) {
-        /* X0208 kankaku or ascii space */
-            if (f_prev == ' ') {
-                fold_state = 0;         /* remove duplicate spaces */
-            } else {
-                f_prev = ' ';    
-                if (++f_line<=fold_len) 
-                    fold_state = ' ';         /* output ASCII space only */
-                else {
-                    f_prev = ' '; f_line = 0;
-                    fold_state = '\r';        /* fold and output nothing */
-                }
-            }
+	f_prev = LF;
+	f_line = 0;
+	fold_state =  LF;            /* output newline and clear */
+    } else if ((c2==0 && nkf_isblank(c1)) || (c2 == '!' && c1 == '!')) {
+	/* X0208 kankaku or ascii space */
+	if (f_prev == SP) {
+	    fold_state = 0;         /* remove duplicate spaces */
+	} else {
+	    f_prev = SP;
+	    if (++f_line<=fold_len)
+		fold_state = SP;         /* output ASCII space only */
+	    else {
+		f_prev = SP; f_line = 0;
+		fold_state = CR;        /* fold and output nothing */
+	    }
+	}
     } else {
-        prev0 = f_prev; /* we still need this one... , but almost done */
-        f_prev = c1;
-        if (c2 || c2==X0201) 
-            f_prev |= 0x80;  /* this is Japanese */
-        f_line += char_size(c2,c1);
-        if (f_line<=fold_len) {   /* normal case */
-            fold_state = 1;
-        } else {
-            if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */
-                f_line = char_size(c2,c1);
-                fold_state =  '\n';       /* We can't wait, do fold now */
-            } else if (c2==X0201) {
-            /* simple kinsoku rules  return 1 means no folding  */
-                if (c1==(0xde&0x7f)) fold_state = 1; /* $B!+(B*/
-                else if (c1==(0xdf&0x7f)) fold_state = 1; /* $B!,(B*/
-                else if (c1==(0xa4&0x7f)) fold_state = 1; /* $B!#(B*/
-                else if (c1==(0xa3&0x7f)) fold_state = 1; /* $B!$(B*/
-                else if (c1==(0xa1&0x7f)) fold_state = 1; /* $B!W(B*/
-                else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
-                else if (SPACE<=c1 && c1<=(0xdf&0x7f)) {      /* X0201 */
+	prev0 = f_prev; /* we still need this one... , but almost done */
+	f_prev = c1;
+	if (c2 || c2 == JIS_X_0201_1976_K)
+	    f_prev |= 0x80;  /* this is Japanese */
+	f_line += char_size(c2,c1);
+	if (f_line<=fold_len) {   /* normal case */
+	    fold_state = 1;
+	} else {
+	    if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */
+		f_line = char_size(c2,c1);
+		fold_state =  LF;       /* We can't wait, do fold now */
+	    } else if (c2 == JIS_X_0201_1976_K) {
+		/* simple kinsoku rules  return 1 means no folding  */
+		if (c1==(0xde&0x7f)) fold_state = 1; /* $B!+(B*/
+		else if (c1==(0xdf&0x7f)) fold_state = 1; /* $B!,(B*/
+		else if (c1==(0xa4&0x7f)) fold_state = 1; /* $B!#(B*/
+		else if (c1==(0xa3&0x7f)) fold_state = 1; /* $B!$(B*/
+		else if (c1==(0xa1&0x7f)) fold_state = 1; /* $B!W(B*/
+		else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
+		else if (SP<=c1 && c1<=(0xdf&0x7f)) {      /* X0201 */
 		    f_line = 1;
-		    fold_state = '\n';/* add one new f_line before this character */
+		    fold_state = LF;/* add one new f_line before this character */
 		} else {
 		    f_line = 1;
-		    fold_state = '\n';/* add one new f_line before this character */
+		    fold_state = LF;/* add one new f_line before this character */
 		}
-            } else if (c2==0) {
-                /* kinsoku point in ASCII */ 
+	    } else if (c2==0) {
+		/* kinsoku point in ASCII */
 		if (  c1==')'||    /* { [ ( */
-                     c1==']'||
-                     c1=='}'||
-                     c1=='.'||
-                     c1==','||
-                     c1=='!'||
-                     c1=='?'||
-                     c1=='/'||
-                     c1==':'||
-                     c1==';' ) {
+		    c1==']'||
+		    c1=='}'||
+		    c1=='.'||
+		    c1==','||
+		    c1=='!'||
+		    c1=='?'||
+		    c1=='/'||
+		    c1==':'||
+		    c1==';') {
 		    fold_state = 1;
-		/* just after special */
+		    /* just after special */
 		} else if (!is_alnum(prev0)) {
 		    f_line = char_size(c2,c1);
-		    fold_state = '\n';
-		} else if ((prev0==' ') ||   /* ignored new f_line */
-                      (prev0=='\n')||        /* ignored new f_line */
-                      (prev0&0x80)) {        /* X0208 - ASCII */
+		    fold_state = LF;
+		} else if ((prev0==SP) ||   /* ignored new f_line */
+			   (prev0==LF)||        /* ignored new f_line */
+			   (prev0&0x80)) {        /* X0208 - ASCII */
 		    f_line = char_size(c2,c1);
-                    fold_state = '\n';/* add one new f_line before this character */
-                } else {
-                    fold_state = 1;  /* default no fold in ASCII */
-                }
-            } else {
-                if (c2=='!') {
-                    if (c1=='"')  fold_state = 1; /* $B!"(B */
-                    else if (c1=='#')  fold_state = 1; /* $B!#(B */
-                    else if (c1=='W')  fold_state = 1; /* $B!W(B */
-                    else if (c1=='K')  fold_state = 1; /* $B!K(B */
-                    else if (c1=='$')  fold_state = 1; /* $B!$(B */
-                    else if (c1=='%')  fold_state = 1; /* $B!%(B */
-                    else if (c1=='\'') fold_state = 1; /* $B!\(B */
-                    else if (c1=='(')  fold_state = 1; /* $B!((B */
-                    else if (c1==')')  fold_state = 1; /* $B!)(B */
-                    else if (c1=='*')  fold_state = 1; /* $B!*(B */
-                    else if (c1=='+')  fold_state = 1; /* $B!+(B */
-                    else if (c1==',')  fold_state = 1; /* $B!,(B */
-                         /* default no fold in kinsoku */
-		    else { 
-			fold_state = '\n';
+		    fold_state = LF;/* add one new f_line before this character */
+		} else {
+		    fold_state = 1;  /* default no fold in ASCII */
+		}
+	    } else {
+		if (c2=='!') {
+		    if (c1=='"')  fold_state = 1; /* $B!"(B */
+		    else if (c1=='#')  fold_state = 1; /* $B!#(B */
+		    else if (c1=='W')  fold_state = 1; /* $B!W(B */
+		    else if (c1=='K')  fold_state = 1; /* $B!K(B */
+		    else if (c1=='$')  fold_state = 1; /* $B!$(B */
+		    else if (c1=='%')  fold_state = 1; /* $B!%(B */
+		    else if (c1=='\'') fold_state = 1; /* $B!\(B */
+		    else if (c1=='(')  fold_state = 1; /* $B!((B */
+		    else if (c1==')')  fold_state = 1; /* $B!)(B */
+		    else if (c1=='*')  fold_state = 1; /* $B!*(B */
+		    else if (c1=='+')  fold_state = 1; /* $B!+(B */
+		    else if (c1==',')  fold_state = 1; /* $B!,(B */
+		    /* default no fold in kinsoku */
+		    else {
+			fold_state = LF;
 			f_line = char_size(c2,c1);
 			/* add one new f_line before this character */
 		    }
-                } else {
+		} else {
 		    f_line = char_size(c2,c1);
-                    fold_state = '\n'; 
-                    /* add one new f_line before this character */
-                }
-            }
-        }
+		    fold_state = LF;
+		    /* add one new f_line before this character */
+		}
+	    }
+	}
     }
     /* terminator process */
     switch(fold_state) {
-        case '\n': 
-            (*o_fconv)(0,'\n');
-            (*o_fconv)(c2,c1);
-            break;
-        case 0:    
-            return;
-        case '\r': 
-            (*o_fconv)(0,'\n');
-            break;
-        case '\t': 
-        case ' ': 
-            (*o_fconv)(0,' ');
-            break;
-        default:
-            (*o_fconv)(c2,c1);
+    case LF:
+	oconv_newline(o_fconv);
+	(*o_fconv)(c2,c1);
+	break;
+    case 0:
+	return;
+    case CR:
+	oconv_newline(o_fconv);
+	break;
+    case TAB:
+    case SP:
+	(*o_fconv)(0,SP);
+	break;
+    default:
+	(*o_fconv)(c2,c1);
     }
 }
 
-nkf_char z_prev2=0,z_prev1=0;
+static nkf_char z_prev2=0,z_prev1=0;
 
-void z_conv(nkf_char c2, nkf_char c1)
+static void
+z_conv(nkf_char c2, nkf_char c1)
 {
 
     /* if (c2) c1 &= 0x7f; assertion */
 
-    if (x0201_f && z_prev2==X0201) {  /* X0201 */
-        if (c1==(0xde&0x7f)) { /* $BByE@(B */
-            z_prev2=0;
-            (*o_zconv)(dv[(z_prev1-SPACE)*2],dv[(z_prev1-SPACE)*2+1]);
-            return;
-        } else if (c1==(0xdf&0x7f)&&ev[(z_prev1-SPACE)*2]) {  /* $BH>ByE@(B */
-            z_prev2=0;
-            (*o_zconv)(ev[(z_prev1-SPACE)*2],ev[(z_prev1-SPACE)*2+1]);
-            return;
-        } else {
-            z_prev2=0;
-            (*o_zconv)(cv[(z_prev1-SPACE)*2],cv[(z_prev1-SPACE)*2+1]);
-        }
-    }
-
-    if (c2==EOF) {
-        (*o_zconv)(c2,c1);
-        return;
-    }
-
-    if (x0201_f && c2==X0201) {
-        if (dv[(c1-SPACE)*2]||ev[(c1-SPACE)*2]) {
-            /* wait for $BByE@(B or $BH>ByE@(B */
-            z_prev1 = c1; z_prev2 = c2;
-            return;
-        } else {
-            (*o_zconv)(cv[(c1-SPACE)*2],cv[(c1-SPACE)*2+1]);
-            return;
-        }
-    }
-
-    /* JISX0208 Alphabet */
-    if (alpha_f && c2 == 0x23 ) {
-        c2 = 0;
-    } else if (alpha_f && c2 == 0x21 ) { 
-    /* JISX0208 Kigou */
-       if (0x21==c1) {
-           if (alpha_f&0x2) {
-               c1 = ' ';
-               c2 = 0;
-           } else if (alpha_f&0x4) {
-                (*o_zconv)(0,' ');
-                (*o_zconv)(0,' ');
-                return;
-           } 
-       } else if (0x20<c1 && c1<0x7f && fv[c1-0x20]) {
-           c1 = fv[c1-0x20];
-           c2 =  0;
-           if (alpha_f&0x8) {
-               char *entity = 0;
-               switch (c1){
-                 case '>': entity = "&gt;"; break;
-                 case '<': entity = "&lt;"; break;
-                 case '\"': entity = "&quot;"; break;
-                 case '&': entity = "&amp;"; break;
-               }
-               if (entity){
-                   while (*entity) (*o_zconv)(0, *entity++);
-                   return;
-               }
-           }
-       } 
+    if (c2 == JIS_X_0201_1976_K && (c1 == 0x20 || c1 == 0x7D || c1 == 0x7E)) {
+	(*o_zconv)(c2,c1);
+	return;
+    }
+
+    if (x0201_f) {
+	if (z_prev2 == JIS_X_0201_1976_K) {
+	    if (c2 == JIS_X_0201_1976_K) {
+		if (c1 == (0xde&0x7f)) { /* $BByE@(B */
+		    z_prev2 = 0;
+		    (*o_zconv)(dv[(z_prev1-SP)*2], dv[(z_prev1-SP)*2+1]);
+		    return;
+		} else if (c1 == (0xdf&0x7f) && ev[(z_prev1-SP)*2]) {  /* $BH>ByE@(B */
+		    z_prev2 = 0;
+		    (*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]);
+		    return;
+		}
+	    }
+	    z_prev2 = 0;
+	    (*o_zconv)(cv[(z_prev1-SP)*2], cv[(z_prev1-SP)*2+1]);
+	}
+	if (c2 == JIS_X_0201_1976_K) {
+	    if (dv[(c1-SP)*2] || ev[(c1-SP)*2]) {
+		/* wait for $BByE@(B or $BH>ByE@(B */
+		z_prev1 = c1;
+		z_prev2 = c2;
+		return;
+	    } else {
+		(*o_zconv)(cv[(c1-SP)*2], cv[(c1-SP)*2+1]);
+		return;
+	    }
+	}
+    }
+
+    if (c2 == EOF) {
+	(*o_zconv)(c2, c1);
+	return;
+    }
+
+    if (alpha_f&1 && c2 == 0x23) {
+	/* JISX0208 Alphabet */
+	c2 = 0;
+    } else if (c2 == 0x21) {
+	/* JISX0208 Kigou */
+	if (0x21==c1) {
+	    if (alpha_f&2) {
+		c2 = 0;
+		c1 = SP;
+	    } else if (alpha_f&4) {
+		(*o_zconv)(0, SP);
+		(*o_zconv)(0, SP);
+		return;
+	    }
+	} else if (alpha_f&1 && 0x20<c1 && c1<0x7f && fv[c1-0x20]) {
+	    c2 =  0;
+	    c1 = fv[c1-0x20];
+	}
+    }
+
+    if (alpha_f&8 && c2 == 0) {
+	/* HTML Entity */
+	const char *entity = 0;
+	switch (c1){
+	case '>': entity = "&gt;"; break;
+	case '<': entity = "&lt;"; break;
+	case '\"': entity = "&quot;"; break;
+	case '&': entity = "&amp;"; break;
+	}
+	if (entity){
+	    while (*entity) (*o_zconv)(0, *entity++);
+	    return;
+	}
+    }
+
+    if (alpha_f & 16) {
+	/* JIS X 0208 Katakana to JIS X 0201 Katakana */
+	if (c2 == 0x21) {
+	    nkf_char c = 0;
+	    switch (c1) {
+	    case 0x23:
+		/* U+3002 (0x8142) Ideographic Full Stop -> U+FF61 (0xA1) Halfwidth Ideographic Full Stop */
+		c = 0xA1;
+		break;
+	    case 0x56:
+		/* U+300C (0x8175) Left Corner Bracket -> U+FF62 (0xA2) Halfwidth Left Corner Bracket */
+		c = 0xA2;
+		break;
+	    case 0x57:
+		/* U+300D (0x8176) Right Corner Bracket -> U+FF63 (0xA3) Halfwidth Right Corner Bracket */
+		c = 0xA3;
+		break;
+	    case 0x22:
+		/* U+3001 (0x8141) Ideographic Comma -> U+FF64 (0xA4) Halfwidth Ideographic Comma */
+		c = 0xA4;
+		break;
+	    case 0x26:
+		/* U+30FB (0x8145) Katakana Middle Dot -> U+FF65 (0xA5) Halfwidth Katakana Middle Dot */
+		c = 0xA5;
+		break;
+	    case 0x3C:
+		/* U+30FC (0x815B) Katakana-Hiragana Prolonged Sound Mark -> U+FF70 (0xB0) Halfwidth Katakana-Hiragana Prolonged Sound Mark */
+		c = 0xB0;
+		break;
+	    case 0x2B:
+		/* U+309B (0x814A) Katakana-Hiragana Voiced Sound Mark -> U+FF9E (0xDE) Halfwidth Katakana Voiced Sound Mark */
+		c = 0xDE;
+		break;
+	    case 0x2C:
+		/* U+309C (0x814B) Katakana-Hiragana Semi-Voiced Sound Mark -> U+FF9F (0xDF) Halfwidth Katakana Semi-Voiced Sound Mark */
+		c = 0xDF;
+		break;
+	    }
+	    if (c) {
+		(*o_zconv)(JIS_X_0201_1976_K, c);
+		return;
+	    }
+	} else if (c2 == 0x25) {
+	    /* JISX0208 Katakana */
+	    static const int fullwidth_to_halfwidth[] =
+	    {
+		0x0000, 0x2700, 0x3100, 0x2800, 0x3200, 0x2900, 0x3300, 0x2A00,
+		0x3400, 0x2B00, 0x3500, 0x3600, 0x365E, 0x3700, 0x375E, 0x3800,
+		0x385E, 0x3900, 0x395E, 0x3A00, 0x3A5E, 0x3B00, 0x3B5E, 0x3C00,
+		0x3C5E, 0x3D00, 0x3D5E, 0x3E00, 0x3E5E, 0x3F00, 0x3F5E, 0x4000,
+		0x405E, 0x4100, 0x415E, 0x2F00, 0x4200, 0x425E, 0x4300, 0x435E,
+		0x4400, 0x445E, 0x4500, 0x4600, 0x4700, 0x4800, 0x4900, 0x4A00,
+		0x4A5E, 0x4A5F, 0x4B00, 0x4B5E, 0x4B5F, 0x4C00, 0x4C5E, 0x4C5F,
+		0x4D00, 0x4D5E, 0x4D5F, 0x4E00, 0x4E5E, 0x4E5F, 0x4F00, 0x5000,
+		0x5100, 0x5200, 0x5300, 0x2C00, 0x5400, 0x2D00, 0x5500, 0x2E00,
+		0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x5B00, 0x0000, 0x5C00,
+		0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x0000,
+		0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+	    };
+	    if (fullwidth_to_halfwidth[c1-0x20]){
+		c2 = fullwidth_to_halfwidth[c1-0x20];
+		(*o_zconv)(JIS_X_0201_1976_K, c2>>8);
+		if (c2 & 0xFF) {
+		    (*o_zconv)(JIS_X_0201_1976_K, c2&0xFF);
+		}
+		return;
+	    }
+	}
     }
     (*o_zconv)(c2,c1);
 }
 
 
 #define rot13(c)  ( \
-      ( c < 'A' ) ? c: \
-      (c <= 'M')  ? (c + 13): \
-      (c <= 'Z')  ? (c - 13): \
-      (c < 'a')   ? (c): \
-      (c <= 'm')  ? (c + 13): \
-      (c <= 'z')  ? (c - 13): \
-      (c) \
-)
+		   ( c < 'A') ? c: \
+		   (c <= 'M')  ? (c + 13): \
+		   (c <= 'Z')  ? (c - 13): \
+		   (c < 'a')   ? (c): \
+		   (c <= 'm')  ? (c + 13): \
+		   (c <= 'z')  ? (c - 13): \
+		   (c) \
+		  )
 
 #define  rot47(c) ( \
-      ( c < '!' ) ? c: \
-      ( c <= 'O' ) ? (c + 47) : \
-      ( c <= '~' ) ?  (c - 47) : \
-      c \
-)
-
-void rot_conv(nkf_char c2, nkf_char c1)
+		   ( c < '!') ? c: \
+		   ( c <= 'O') ? (c + 47) : \
+		   ( c <= '~') ?  (c - 47) : \
+		   c \
+		  )
+
+static void
+rot_conv(nkf_char c2, nkf_char c1)
 {
-    if (c2==0 || c2==X0201 || c2==ISO8859_1) {
+    if (c2 == 0 || c2 == JIS_X_0201_1976_K || c2 == ISO_8859_1) {
 	c1 = rot13(c1);
     } else if (c2) {
 	c1 = rot47(c1);
@@ -4634,61 +3773,64 @@ void rot_conv(nkf_char c2, nkf_char c1)
     (*o_rot_conv)(c2,c1);
 }
 
-void hira_conv(nkf_char c2, nkf_char c1)
+static void
+hira_conv(nkf_char c2, nkf_char c1)
 {
     if (hira_f & 1) {
-        if (c2 == 0x25) {
-            if (0x20 < c1 && c1 < 0x74) {
-                c2 = 0x24;
-                (*o_hira_conv)(c2,c1);
-                return;
-            } else if (c1 == 0x74 && (output_conv == w_oconv || output_conv == w_oconv16)) {
-                c2 = 0;
-                c1 = CLASS_UNICODE | 0x3094;
-                (*o_hira_conv)(c2,c1);
-                return;
-            }
-        } else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
-            c1 += 2;
-            (*o_hira_conv)(c2,c1);
-            return;
-        }
+	if (c2 == 0x25) {
+	    if (0x20 < c1 && c1 < 0x74) {
+		c2 = 0x24;
+		(*o_hira_conv)(c2,c1);
+		return;
+	    } else if (c1 == 0x74 && nkf_enc_unicode_p(output_encoding)) {
+		c2 = 0;
+		c1 = nkf_char_unicode_new(0x3094);
+		(*o_hira_conv)(c2,c1);
+		return;
+	    }
+	} else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
+	    c1 += 2;
+	    (*o_hira_conv)(c2,c1);
+	    return;
+	}
     }
     if (hira_f & 2) {
-        if (c2 == 0 && c1 == (CLASS_UNICODE | 0x3094)) {
-            c2 = 0x25;
-            c1 = 0x74;
-        } else if (c2 == 0x24 && 0x20 < c1 && c1 < 0x74) {
-            c2 = 0x25;
-        } else if (c2 == 0x21 && (c1 == 0x35 || c1 == 0x36)) {
-            c1 -= 2;
-        }
+	if (c2 == 0 && c1 == nkf_char_unicode_new(0x3094)) {
+	    c2 = 0x25;
+	    c1 = 0x74;
+	} else if (c2 == 0x24 && 0x20 < c1 && c1 < 0x74) {
+	    c2 = 0x25;
+	} else if (c2 == 0x21 && (c1 == 0x35 || c1 == 0x36)) {
+	    c1 -= 2;
+	}
     }
     (*o_hira_conv)(c2,c1);
 }
 
 
-void iso2022jp_check_conv(nkf_char c2, nkf_char c1)
+static void
+iso2022jp_check_conv(nkf_char c2, nkf_char c1)
 {
+#define RANGE_NUM_MAX 18
     static const nkf_char range[RANGE_NUM_MAX][2] = {
-        {0x222f, 0x2239,},
-        {0x2242, 0x2249,},
-        {0x2251, 0x225b,},
-        {0x226b, 0x2271,},
-        {0x227a, 0x227d,},
-        {0x2321, 0x232f,},
-        {0x233a, 0x2340,},
-        {0x235b, 0x2360,},
-        {0x237b, 0x237e,},
-        {0x2474, 0x247e,},
-        {0x2577, 0x257e,},
-        {0x2639, 0x2640,},
-        {0x2659, 0x267e,},
-        {0x2742, 0x2750,},
-        {0x2772, 0x277e,},
-        {0x2841, 0x287e,},
-        {0x4f54, 0x4f7e,},
-        {0x7425, 0x747e},
+	{0x222f, 0x2239,},
+	{0x2242, 0x2249,},
+	{0x2251, 0x225b,},
+	{0x226b, 0x2271,},
+	{0x227a, 0x227d,},
+	{0x2321, 0x232f,},
+	{0x233a, 0x2340,},
+	{0x235b, 0x2360,},
+	{0x237b, 0x237e,},
+	{0x2474, 0x247e,},
+	{0x2577, 0x257e,},
+	{0x2639, 0x2640,},
+	{0x2659, 0x267e,},
+	{0x2742, 0x2750,},
+	{0x2772, 0x277e,},
+	{0x2841, 0x287e,},
+	{0x4f54, 0x4f7e,},
+	{0x7425, 0x747e},
     };
     nkf_char i;
     nkf_char start, end, c;
@@ -4717,12 +3859,13 @@ void iso2022jp_check_conv(nkf_char c2, nkf_char c1)
 
 /* This converts  =?ISO-2022-JP?B?HOGE HOGE?= */
 
-const unsigned char *mime_pattern[] = {
+static const unsigned char *mime_pattern[] = {
     (const unsigned char *)"\075?EUC-JP?B?",
     (const unsigned char *)"\075?SHIFT_JIS?B?",
     (const unsigned char *)"\075?ISO-8859-1?Q?",
     (const unsigned char *)"\075?ISO-8859-1?B?",
     (const unsigned char *)"\075?ISO-2022-JP?B?",
+    (const unsigned char *)"\075?ISO-2022-JP?B?",
     (const unsigned char *)"\075?ISO-2022-JP?Q?",
 #if defined(UTF8_INPUT_ENABLE)
     (const unsigned char *)"\075?UTF-8?B?",
@@ -4742,17 +3885,17 @@ nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
     0,
 };
 
-const nkf_char mime_encode[] = {
-    JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201,
+static const nkf_char mime_encode[] = {
+    EUC_JP, SHIFT_JIS, ISO_8859_1, ISO_8859_1, JIS_X_0208, JIS_X_0201_1976_K, JIS_X_0201_1976_K,
 #if defined(UTF8_INPUT_ENABLE)
-    UTF8, UTF8,
+    UTF_8, UTF_8,
 #endif
     ASCII,
     0
 };
 
-const nkf_char mime_encode_method[] = {
-    'B', 'B','Q', 'B', 'B', 'Q',
+static const nkf_char mime_encode_method[] = {
+    'B', 'B','Q', 'B', 'B', 'B', 'Q',
 #if defined(UTF8_INPUT_ENABLE)
     'B', 'Q',
 #endif
@@ -4761,9 +3904,55 @@ const nkf_char mime_encode_method[] = {
 };
 
 
+/* MIME preprocessor fifo */
+
+#define MIME_BUF_SIZE   (1024)    /* 2^n ring buffer */
+#define MIME_BUF_MASK   (MIME_BUF_SIZE-1)
+#define mime_input_buf(n)        mime_input_state.buf[(n)&MIME_BUF_MASK]
+static struct {
+    unsigned char buf[MIME_BUF_SIZE];
+    unsigned int  top;
+    unsigned int  last;  /* decoded */
+    unsigned int  input; /* undecoded */
+} mime_input_state;
+static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
+
 #define MAXRECOVER 20
 
-void switch_mime_getc(void)
+static void
+mime_input_buf_unshift(nkf_char c)
+{
+    mime_input_buf(--mime_input_state.top) = (unsigned char)c;
+}
+
+static nkf_char
+mime_ungetc(nkf_char c, FILE *f)
+{
+    mime_input_buf_unshift(c);
+    return c;
+}
+
+static nkf_char
+mime_ungetc_buf(nkf_char c, FILE *f)
+{
+    if (mimebuf_f)
+	(*i_mungetc_buf)(c,f);
+    else
+	mime_input_buf(--mime_input_state.input) = (unsigned char)c;
+    return c;
+}
+
+static nkf_char
+mime_getc_buf(FILE *f)
+{
+    /* we don't keep eof of mime_input_buf, becase it contains ?= as
+       a terminator. It was checked in mime_integrity. */
+    return ((mimebuf_f)?
+	    (*i_mgetc_buf)(f):mime_input_buf(mime_input_state.input++));
+}
+
+static void
+switch_mime_getc(void)
 {
     if (i_getc!=mime_getc) {
 	i_mgetc = i_getc; i_getc = mime_getc;
@@ -4775,7 +3964,8 @@ void switch_mime_getc(void)
     }
 }
 
-void unswitch_mime_getc(void)
+static void
+unswitch_mime_getc(void)
 {
     if(mime_f==STRICT_MIME) {
 	i_mgetc = i_mgetc_buf;
@@ -4787,7 +3977,47 @@ void unswitch_mime_getc(void)
     mime_iconv_back = NULL;
 }
 
-nkf_char mime_begin_strict(FILE *f)
+static nkf_char
+mime_integrity(FILE *f, const unsigned char *p)
+{
+    nkf_char c,d;
+    unsigned int q;
+    /* In buffered mode, read until =? or NL or buffer full
+     */
+    mime_input_state.input = mime_input_state.top;
+    mime_input_state.last = mime_input_state.top;
+
+    while(*p) mime_input_buf(mime_input_state.input++) = *p++;
+    d = 0;
+    q = mime_input_state.input;
+    while((c=(*i_getc)(f))!=EOF) {
+	if (((mime_input_state.input-mime_input_state.top)&MIME_BUF_MASK)==0) {
+	    break;   /* buffer full */
+	}
+	if (c=='=' && d=='?') {
+	    /* checked. skip header, start decode */
+	    mime_input_buf(mime_input_state.input++) = (unsigned char)c;
+	    /* mime_last_input = mime_input_state.input; */
+	    mime_input_state.input = q;
+	    switch_mime_getc();
+	    return 1;
+	}
+	if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
+	    break;
+	/* Should we check length mod 4? */
+	mime_input_buf(mime_input_state.input++) = (unsigned char)c;
+	d=c;
+    }
+    /* In case of Incomplete MIME, no MIME decode  */
+    mime_input_buf(mime_input_state.input++) = (unsigned char)c;
+    mime_input_state.last = mime_input_state.input;     /* point undecoded buffer */
+    mime_decode_mode = 1;              /* no decode on mime_input_buf last in mime_getc */
+    switch_mime_getc();         /* anyway we need buffered getc */
+    return 1;
+}
+
+static nkf_char
+mime_begin_strict(FILE *f)
 {
     nkf_char c1 = 0;
     int i,j,k;
@@ -4800,25 +4030,25 @@ nkf_char mime_begin_strict(FILE *f)
     p = mime_pattern[j];
     r[0]='='; r[1]='?';
 
-    for(i=2;p[i]>' ';i++) {                   /* start at =? */
-        if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) {
-            /* pattern fails, try next one */
-            q = p;
-            while (mime_pattern[++j]) {
+    for(i=2;p[i]>SP;i++) {                   /* start at =? */
+	if (((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i]) {
+	    /* pattern fails, try next one */
+	    q = p;
+	    while (mime_pattern[++j]) {
 		p = mime_pattern[j];
-                for(k=2;k<i;k++)              /* assume length(p) > i */
-                    if (p[k]!=q[k]) break;
-                if (k==i && nkf_toupper(c1)==p[k]) break;
-            }
+		for(k=2;k<i;k++)              /* assume length(p) > i */
+		    if (p[k]!=q[k]) break;
+		if (k==i && nkf_toupper(c1)==p[k]) break;
+	    }
 	    p = mime_pattern[j];
-            if (p) continue;  /* found next one, continue */
-            /* all fails, output from recovery buffer */
-            (*i_ungetc)(c1,f);
-            for(j=0;j<i;j++) {
-                (*oconv)(0,r[j]);
-            }
-            return c1;
-        }
+	    if (p) continue;  /* found next one, continue */
+	    /* all fails, output from recovery buffer */
+	    (*i_ungetc)(c1,f);
+	    for(j=0;j<i;j++) {
+		(*oconv)(0,r[j]);
+	    }
+	    return c1;
+	}
     }
     mime_decode_mode = p[i-2];
 
@@ -4827,35 +4057,19 @@ nkf_char mime_begin_strict(FILE *f)
     clr_code_score(find_inputcode_byfunc(mime_priority_func[j]), SCORE_iMIME);
 
     if (mime_decode_mode=='B') {
-        mimebuf_f = unbuf_f;
-        if (!unbuf_f) {
-            /* do MIME integrity check */
-            return mime_integrity(f,mime_pattern[j]);
-        } 
+	mimebuf_f = unbuf_f;
+	if (!unbuf_f) {
+	    /* do MIME integrity check */
+	    return mime_integrity(f,mime_pattern[j]);
+	}
     }
     switch_mime_getc();
     mimebuf_f = TRUE;
     return c1;
 }
 
-nkf_char mime_getc_buf(FILE *f)
-{
-    /* we don't keep eof of Fifo, becase it contains ?= as
-       a terminator. It was checked in mime_integrity. */
-    return ((mimebuf_f)?
-        (*i_mgetc_buf)(f):Fifo(mime_input++));
-}
-
-nkf_char mime_ungetc_buf(nkf_char c, FILE *f)
-{
-    if (mimebuf_f)
-	(*i_mungetc_buf)(c,f);
-    else 
-	Fifo(--mime_input) = (unsigned char)c;
-    return c;
-}
-
-nkf_char mime_begin(FILE *f)
+static nkf_char
+mime_begin(FILE *f)
 {
     nkf_char c1;
     int i,k;
@@ -4864,195 +4078,236 @@ nkf_char mime_begin(FILE *f)
     /* re-read and convert again from mime_buffer.  */
 
     /* =? has been checked */
-    k = mime_last;
-    Fifo(mime_last++)='='; Fifo(mime_last++)='?';
+    k = mime_input_state.last;
+    mime_input_buf(mime_input_state.last++)='='; mime_input_buf(mime_input_state.last++)='?';
     for(i=2;i<MAXRECOVER;i++) {                   /* start at =? */
-        /* We accept any character type even if it is breaked by new lines */
-        c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
-        if (c1=='\n'||c1==' '||c1=='\r'||
-                c1=='-'||c1=='_'||is_alnum(c1) ) continue;
-        if (c1=='=') {
-            /* Failed. But this could be another MIME preemble */
-            (*i_ungetc)(c1,f);
-            mime_last--;
-            break;
-        }
-        if (c1!='?') break;
-        else {
-            /* c1=='?' */
-            c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
-            if (!(++i<MAXRECOVER) || c1==EOF) break;
-            if (c1=='b'||c1=='B') {
-                mime_decode_mode = 'B';
-            } else if (c1=='q'||c1=='Q') {
-                mime_decode_mode = 'Q';
-            } else {
-                break;
-            }
-            c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
-            if (!(++i<MAXRECOVER) || c1==EOF) break;
-            if (c1!='?') {
-                mime_decode_mode = FALSE;
-            }
-            break;
-        }
+	/* We accept any character type even if it is breaked by new lines */
+	c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
+	if (c1==LF||c1==SP||c1==CR||
+	    c1=='-'||c1=='_'||is_alnum(c1)) continue;
+	if (c1=='=') {
+	    /* Failed. But this could be another MIME preemble */
+	    (*i_ungetc)(c1,f);
+	    mime_input_state.last--;
+	    break;
+	}
+	if (c1!='?') break;
+	else {
+	    /* c1=='?' */
+	    c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
+	    if (!(++i<MAXRECOVER) || c1==EOF) break;
+	    if (c1=='b'||c1=='B') {
+		mime_decode_mode = 'B';
+	    } else if (c1=='q'||c1=='Q') {
+		mime_decode_mode = 'Q';
+	    } else {
+		break;
+	    }
+	    c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
+	    if (!(++i<MAXRECOVER) || c1==EOF) break;
+	    if (c1!='?') {
+		mime_decode_mode = FALSE;
+	    }
+	    break;
+	}
     }
     switch_mime_getc();
     if (!mime_decode_mode) {
-        /* false MIME premble, restart from mime_buffer */
-        mime_decode_mode = 1;  /* no decode, but read from the mime_buffer */
-        /* Since we are in MIME mode until buffer becomes empty,    */
-        /* we never go into mime_begin again for a while.           */
-        return c1;
+	/* false MIME premble, restart from mime_buffer */
+	mime_decode_mode = 1;  /* no decode, but read from the mime_buffer */
+	/* Since we are in MIME mode until buffer becomes empty,    */
+	/* we never go into mime_begin again for a while.           */
+	return c1;
     }
     /* discard mime preemble, and goto MIME mode */
-    mime_last = k;
+    mime_input_state.last = k;
     /* do no MIME integrity check */
     return c1;   /* used only for checking EOF */
 }
 
 #ifdef CHECK_OPTION
-void no_putc(nkf_char c)
+static void
+no_putc(nkf_char c)
 {
     ;
 }
 
-void debug(const char *str)
+static void
+debug(const char *str)
 {
     if (debug_f){
-        fprintf(stderr, "%s\n", str);
+	fprintf(stderr, "%s\n", str ? str : "NULL");
     }
 }
 #endif
 
-void set_input_codename(char *codename)
+static void
+set_input_codename(const char *codename)
 {
-    if (guess_f && 
-        is_inputcode_set &&
-        strcmp(codename, "") != 0 && 
-        strcmp(codename, input_codename) != 0)
-    {
-        is_inputcode_mixed = TRUE;
+    if (!input_codename) {
+	input_codename = codename;
+    } else if (strcmp(codename, input_codename) != 0) {
+	input_codename = "";
+    }
+}
+
+static const char*
+get_guessed_code(void)
+{
+    if (input_codename && !*input_codename) {
+	input_codename = "BINARY";
+    } else {
+	struct input_code *p = find_inputcode_byfunc(iconv);
+	if (!input_codename) {
+	    input_codename = "ASCII";
+	} else if (strcmp(input_codename, "Shift_JIS") == 0) {
+	    if (p->score & (SCORE_DEPEND|SCORE_CP932))
+		input_codename = "CP932";
+	} else if (strcmp(input_codename, "EUC-JP") == 0) {
+	    if (p->score & (SCORE_X0212))
+		input_codename = "EUCJP-MS";
+	    else if (p->score & (SCORE_DEPEND|SCORE_CP932))
+		input_codename = "CP51932";
+	} else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
+	    if (p->score & (SCORE_KANA))
+		input_codename = "CP50221";
+	    else if (p->score & (SCORE_DEPEND|SCORE_CP932))
+		input_codename = "CP50220";
+	}
     }
-    input_codename = codename;
-    is_inputcode_set = TRUE;
+    return input_codename;
 }
 
 #if !defined(PERL_XS) && !defined(WIN32DLL)
-void print_guessed_code(char *filename)
+static void
+print_guessed_code(char *filename)
 {
-    char *codename = "BINARY";
-    if (!is_inputcode_mixed) {
-        if (strcmp(input_codename, "") == 0) {
-            codename = "ASCII";
-        } else {
-            codename = input_codename;
-        }
+    if (filename != NULL) printf("%s: ", filename);
+    if (input_codename && !*input_codename) {
+	printf("BINARY\n");
+    } else {
+	input_codename = get_guessed_code();
+	if (guess_f == 1) {
+	    printf("%s\n", input_codename);
+	} else {
+	    printf("%s%s\n",
+		   input_codename,
+		   input_eol == CR   ? " (CR)" :
+		   input_eol == LF   ? " (LF)" :
+		   input_eol == CRLF ? " (CRLF)" :
+		   input_eol == EOF  ? " (MIXED NL)" :
+		   "");
+	}
     }
-    if (filename != NULL) printf("%s:", filename);
-    printf("%s\n", codename);
 }
 #endif /*WIN32DLL*/
 
-#ifdef INPUT_OPTION 
+#ifdef INPUT_OPTION
 
-nkf_char hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
+static nkf_char
+hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
 {
     nkf_char c1, c2, c3;
     c1 = (*g)(f);
     if (c1 != ch){
-        return c1;
+	return c1;
     }
     c2 = (*g)(f);
     if (!nkf_isxdigit(c2)){
-        (*u)(c2, f);
-        return c1;
+	(*u)(c2, f);
+	return c1;
     }
     c3 = (*g)(f);
     if (!nkf_isxdigit(c3)){
-        (*u)(c2, f);
-        (*u)(c3, f);
-        return c1;
+	(*u)(c2, f);
+	(*u)(c3, f);
+	return c1;
     }
     return (hex2bin(c2) << 4) | hex2bin(c3);
 }
 
-nkf_char cap_getc(FILE *f)
+static nkf_char
+cap_getc(FILE *f)
 {
     return hex_getc(':', f, i_cgetc, i_cungetc);
 }
 
-nkf_char cap_ungetc(nkf_char c, FILE *f)
+static nkf_char
+cap_ungetc(nkf_char c, FILE *f)
 {
     return (*i_cungetc)(c, f);
 }
 
-nkf_char url_getc(FILE *f)
+static nkf_char
+url_getc(FILE *f)
 {
     return hex_getc('%', f, i_ugetc, i_uungetc);
 }
 
-nkf_char url_ungetc(nkf_char c, FILE *f)
+static nkf_char
+url_ungetc(nkf_char c, FILE *f)
 {
     return (*i_uungetc)(c, f);
 }
 #endif
 
 #ifdef NUMCHAR_OPTION
-nkf_char numchar_getc(FILE *f)
+static nkf_char
+numchar_getc(FILE *f)
 {
     nkf_char (*g)(FILE *) = i_ngetc;
     nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
     int i = 0, j;
-    nkf_char buf[8];
+    nkf_char buf[12];
     long c = -1;
 
     buf[i] = (*g)(f);
     if (buf[i] == '&'){
-        buf[++i] = (*g)(f);
-        if (buf[i] == '#'){
-            c = 0;
-            buf[++i] = (*g)(f);
-            if (buf[i] == 'x' || buf[i] == 'X'){
-                for (j = 0; j < 7; j++){
-                    buf[++i] = (*g)(f);
-                    if (!nkf_isxdigit(buf[i])){
-                        if (buf[i] != ';'){
-                            c = -1;
-                        }
-                        break;
-                    }
-                    c <<= 4;
-                    c |= hex2bin(buf[i]);
-                }
-            }else{
-                for (j = 0; j < 8; j++){
-                    if (j){
-                        buf[++i] = (*g)(f);
-                    }
-                    if (!nkf_isdigit(buf[i])){
-                        if (buf[i] != ';'){
-                            c = -1;
-                        }
-                        break;
-                    }
-                    c *= 10;
-                    c += hex2bin(buf[i]);
-                }
-            }
-        }
+	buf[++i] = (*g)(f);
+	if (buf[i] == '#'){
+	    c = 0;
+	    buf[++i] = (*g)(f);
+	    if (buf[i] == 'x' || buf[i] == 'X'){
+		for (j = 0; j < 7; j++){
+		    buf[++i] = (*g)(f);
+		    if (!nkf_isxdigit(buf[i])){
+			if (buf[i] != ';'){
+			    c = -1;
+			}
+			break;
+		    }
+		    c <<= 4;
+		    c |= hex2bin(buf[i]);
+		}
+	    }else{
+		for (j = 0; j < 8; j++){
+		    if (j){
+			buf[++i] = (*g)(f);
+		    }
+		    if (!nkf_isdigit(buf[i])){
+			if (buf[i] != ';'){
+			    c = -1;
+			}
+			break;
+		    }
+		    c *= 10;
+		    c += hex2bin(buf[i]);
+		}
+	    }
+	}
     }
     if (c != -1){
-        return CLASS_UNICODE | c;
+	return nkf_char_unicode_new(c);
     }
     while (i > 0){
-        (*u)(buf[i], f);
-        --i;
+	(*u)(buf[i], f);
+	--i;
     }
     return buf[0];
 }
 
-nkf_char numchar_ungetc(nkf_char c, FILE *f)
+static nkf_char
+numchar_ungetc(nkf_char c, FILE *f)
 {
     return (*i_nungetc)(c, f);
 }
@@ -5060,54 +4315,89 @@ nkf_char numchar_ungetc(nkf_char c, FILE *f)
 
 #ifdef UNICODE_NORMALIZATION
 
-/* Normalization Form C */
-nkf_char nfc_getc(FILE *f)
+static nkf_char
+nfc_getc(FILE *f)
 {
     nkf_char (*g)(FILE *f) = i_nfc_getc;
     nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc;
-    int i=0, j, k=1, lower, upper;
-    nkf_char buf[9];
-    const nkf_nfchar *array;
-#if 0
-    extern const struct normalization_pair normalization_table[];
-#endif
-    
-    buf[i] = (*g)(f);
-    while (k > 0 && ((buf[i] & 0xc0) != 0x80)){
-	lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
-	while (upper >= lower) {
-	    j = (lower+upper) / 2;
-	    array = normalization_table[j].nfd;
-	    for (k=0; k < NORMALIZATION_TABLE_NFD_LENGTH && array[k]; k++){
-		if (array[k] != buf[k]){
-		    array[k] < buf[k] ? (lower = j + 1) : (upper = j - 1);
-		    k = 0;
+    nkf_buf_t *buf = nkf_state->nfc_buf;
+    const unsigned char *array;
+    int lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
+    nkf_char c = (*g)(f);
+
+    if (c == EOF || c > 0xFF || (c & 0xc0) == 0x80) return c;
+
+    nkf_buf_push(buf, c);
+    do {
+	while (lower <= upper) {
+	    int mid = (lower+upper) / 2;
+	    int len;
+	    array = normalization_table[mid].nfd;
+	    for (len=0; len < NORMALIZATION_TABLE_NFD_LENGTH && array[len]; len++) {
+		if (len >= nkf_buf_length(buf)) {
+		    c = (*g)(f);
+		    if (c == EOF) {
+			len = 0;
+			lower = 1, upper = 0;
+			break;
+		    }
+		    nkf_buf_push(buf, c);
+		}
+		if (array[len] != nkf_buf_at(buf, len)) {
+		    if (array[len] < nkf_buf_at(buf, len)) lower = mid + 1;
+		    else  upper = mid - 1;
+		    len = 0;
 		    break;
-		} else if (k >= i)
-		    buf[++i] = (*g)(f);
+		}
 	    }
-	    if (k > 0){
-		array = normalization_table[j].nfc;
+	    if (len > 0) {
+		int i;
+		array = normalization_table[mid].nfc;
+		nkf_buf_clear(buf);
 		for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++)
-		    buf[i] = (nkf_char)(array[i]);
-		i--;
+		    nkf_buf_push(buf, array[i]);
 		break;
 	    }
 	}
-	while (i > 0)
-	    (*u)(buf[i--], f);
-    }
-    return buf[0];
+    } while (lower <= upper);
+
+    while (nkf_buf_length(buf) > 1) (*u)(nkf_buf_pop(buf), f);
+    c = nkf_buf_pop(buf);
+
+    return c;
 }
 
-nkf_char nfc_ungetc(nkf_char c, FILE *f)
+static nkf_char
+nfc_ungetc(nkf_char c, FILE *f)
 {
     return (*i_nfc_ungetc)(c, f);
 }
 #endif /* UNICODE_NORMALIZATION */
 
 
-nkf_char 
+static nkf_char
+base64decode(nkf_char c)
+{
+    int             i;
+    if (c > '@') {
+	if (c < '[') {
+	    i = c - 'A';                        /* A..Z 0-25 */
+	} else if (c == '_') {
+	    i = '?'         /* 63 */ ;          /* _  63 */
+	} else {
+	    i = c - 'G'     /* - 'a' + 26 */ ;  /* a..z 26-51 */
+	}
+    } else if (c > '/') {
+	i = c - '0' + '4'   /* - '0' + 52 */ ;  /* 0..9 52-61 */
+    } else if (c == '+' || c == '-') {
+	i = '>'             /* 62 */ ;          /* + and -  62 */
+    } else {
+	i = '?'             /* 63 */ ;          /* / 63 */
+    }
+    return (i);
+}
+
+static nkf_char
 mime_getc(FILE *f)
 {
     nkf_char c1, c2, c3, c4, cc;
@@ -5117,8 +4407,8 @@ mime_getc(FILE *f)
     char *lwsp_buf_new;
     nkf_char lwsp_size = 128;
 
-    if (mime_top != mime_last) {  /* Something is in FIFO */
-        return  Fifo(mime_top++);
+    if (mime_input_state.top != mime_input_state.last) {  /* Something is in FIFO */
+	return  mime_input_buf(mime_input_state.top++);
     }
     if (mime_decode_mode==1 ||mime_decode_mode==FALSE) {
 	mime_decode_mode=FALSE;
@@ -5127,211 +4417,193 @@ mime_getc(FILE *f)
     }
 
     if (mimebuf_f == FIXED_MIME)
-        exit_mode = mime_decode_mode;
+	exit_mode = mime_decode_mode;
     else
-        exit_mode = FALSE;
+	exit_mode = FALSE;
     if (mime_decode_mode == 'Q') {
-        if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
-restart_mime_q:
-        if (c1=='_' && mimebuf_f != FIXED_MIME) return ' ';
-	if (c1<=' ' || DEL<=c1) {
+	if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
+      restart_mime_q:
+	if (c1=='_' && mimebuf_f != FIXED_MIME) return SP;
+	if (c1<=SP || DEL<=c1) {
 	    mime_decode_mode = exit_mode; /* prepare for quit */
 	    return c1;
 	}
-        if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
+	if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
 	    return c1;
 	}
-                
-        mime_decode_mode = exit_mode; /* prepare for quit */
-        if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
-        if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
-            /* end Q encoding */
-            input_mode = exit_mode;
+
+	mime_decode_mode = exit_mode; /* prepare for quit */
+	if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
+	if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
+	    /* end Q encoding */
+	    input_mode = exit_mode;
 	    lwsp_count = 0;
-	    lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
-	    if (lwsp_buf==NULL) {
-		perror("can't malloc");
-		return -1;
-	    }
+	    lwsp_buf = nkf_xmalloc((lwsp_size+5)*sizeof(char));
 	    while ((c1=(*i_getc)(f))!=EOF) {
 		switch (c1) {
-		case NL:
+		case LF:
 		case CR:
-		    if (c1==NL) {
-			if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-			    i_ungetc(SPACE,f);
+		    if (c1==LF) {
+			if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
+			    i_ungetc(SP,f);
 			    continue;
 			} else {
 			    i_ungetc(c1,f);
 			}
-			c1 = NL;
+			c1 = LF;
 		    } else {
-			if ((c1=(*i_getc)(f))!=EOF && c1 == NL) {
-			    if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-				i_ungetc(SPACE,f);
+			if ((c1=(*i_getc)(f))!=EOF && c1 == LF) {
+			    if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
+				i_ungetc(SP,f);
 				continue;
 			    } else {
 				i_ungetc(c1,f);
 			    }
-			    i_ungetc(NL,f);
+			    i_ungetc(LF,f);
 			} else {
 			    i_ungetc(c1,f);
 			}
 			c1 = CR;
 		    }
 		    break;
-		case SPACE:
+		case SP:
 		case TAB:
 		    lwsp_buf[lwsp_count] = (unsigned char)c1;
 		    if (lwsp_count++>lwsp_size){
 			lwsp_size <<= 1;
-			lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
-			if (lwsp_buf_new==NULL) {
-			    free(lwsp_buf);
-			    perror("can't realloc");
-			    return -1;
-			}
+			lwsp_buf_new = nkf_xrealloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
 			lwsp_buf = lwsp_buf_new;
 		    }
 		    continue;
 		}
 		break;
 	    }
-	    if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
+	    if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
 		i_ungetc(c1,f);
 		for(lwsp_count--;lwsp_count>0;lwsp_count--)
 		    i_ungetc(lwsp_buf[lwsp_count],f);
 		c1 = lwsp_buf[0];
 	    }
-	    free(lwsp_buf);
-            return c1;
-        }
-        if (c1=='='&&c2<' ') { /* this is soft wrap */
-            while((c1 =  (*i_mgetc)(f)) <=' ') {
-		if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
+	    nkf_xfree(lwsp_buf);
+	    return c1;
+	}
+	if (c1=='='&&c2<SP) { /* this is soft wrap */
+	    while((c1 =  (*i_mgetc)(f)) <=SP) {
+		if (c1 == EOF) return (EOF);
 	    }
-            mime_decode_mode = 'Q'; /* still in MIME */
+	    mime_decode_mode = 'Q'; /* still in MIME */
 	    goto restart_mime_q;
 	}
-        if (c1=='?') {
-            mime_decode_mode = 'Q'; /* still in MIME */
-            (*i_mungetc)(c2,f);
-            return c1;
-        }
-        if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
-        if (c2<=' ') return c2;
-        mime_decode_mode = 'Q'; /* still in MIME */
-        return ((hex2bin(c2)<<4) + hex2bin(c3));
+	if (c1=='?') {
+	    mime_decode_mode = 'Q'; /* still in MIME */
+	    (*i_mungetc)(c2,f);
+	    return c1;
+	}
+	if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
+	if (c2<=SP) return c2;
+	mime_decode_mode = 'Q'; /* still in MIME */
+	return ((hex2bin(c2)<<4) + hex2bin(c3));
     }
 
     if (mime_decode_mode != 'B') {
-        mime_decode_mode = FALSE;
-        return (*i_mgetc)(f);
+	mime_decode_mode = FALSE;
+	return (*i_mgetc)(f);
     }
 
 
     /* Base64 encoding */
-    /* 
-        MIME allows line break in the middle of 
-        Base64, but we are very pessimistic in decoding
-        in unbuf mode because MIME encoded code may broken by 
-        less or editor's control sequence (such as ESC-[-K in unbuffered
-        mode. ignore incomplete MIME.
-    */
+    /*
+       MIME allows line break in the middle of
+       Base64, but we are very pessimistic in decoding
+       in unbuf mode because MIME encoded code may broken by
+       less or editor's control sequence (such as ESC-[-K in unbuffered
+       mode. ignore incomplete MIME.
+     */
     mode = mime_decode_mode;
     mime_decode_mode = exit_mode;  /* prepare for quit */
 
-    while ((c1 = (*i_mgetc)(f))<=' ') {
-        if (c1==EOF)
-            return (EOF);
+    while ((c1 = (*i_mgetc)(f))<=SP) {
+	if (c1==EOF)
+	    return (EOF);
     }
-mime_c2_retry:
-    if ((c2 = (*i_mgetc)(f))<=' ') {
-        if (c2==EOF)
-            return (EOF);
+  mime_c2_retry:
+    if ((c2 = (*i_mgetc)(f))<=SP) {
+	if (c2==EOF)
+	    return (EOF);
 	if (mime_f != STRICT_MIME) goto mime_c2_retry;
-        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
-        return c2;
+	if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
+	return c2;
     }
     if ((c1 == '?') && (c2 == '=')) {
-        input_mode = ASCII;
+	input_mode = ASCII;
 	lwsp_count = 0;
-	lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
-	if (lwsp_buf==NULL) {
-	    perror("can't malloc");
-	    return -1;
-	}
+	lwsp_buf = nkf_xmalloc((lwsp_size+5)*sizeof(char));
 	while ((c1=(*i_getc)(f))!=EOF) {
 	    switch (c1) {
-	    case NL:
+	    case LF:
 	    case CR:
-		if (c1==NL) {
-		    if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-			i_ungetc(SPACE,f);
+		if (c1==LF) {
+		    if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
+			i_ungetc(SP,f);
 			continue;
 		    } else {
 			i_ungetc(c1,f);
 		    }
-		    c1 = NL;
+		    c1 = LF;
 		} else {
 		    if ((c1=(*i_getc)(f))!=EOF) {
-			if (c1==SPACE) {
-			    i_ungetc(SPACE,f);
+			if (c1==SP) {
+			    i_ungetc(SP,f);
 			    continue;
-			} else if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-			    i_ungetc(SPACE,f);
+			} else if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
+			    i_ungetc(SP,f);
 			    continue;
 			} else {
 			    i_ungetc(c1,f);
 			}
-			i_ungetc(NL,f);
+			i_ungetc(LF,f);
 		    } else {
 			i_ungetc(c1,f);
 		    }
 		    c1 = CR;
 		}
 		break;
-	    case SPACE:
+	    case SP:
 	    case TAB:
 		lwsp_buf[lwsp_count] = (unsigned char)c1;
 		if (lwsp_count++>lwsp_size){
 		    lwsp_size <<= 1;
-		    lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
-		    if (lwsp_buf_new==NULL) {
-			free(lwsp_buf);
-			perror("can't realloc");
-			return -1;
-		    }
+		    lwsp_buf_new = nkf_xrealloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
 		    lwsp_buf = lwsp_buf_new;
 		}
 		continue;
 	    }
 	    break;
 	}
-	if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
+	if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
 	    i_ungetc(c1,f);
 	    for(lwsp_count--;lwsp_count>0;lwsp_count--)
 		i_ungetc(lwsp_buf[lwsp_count],f);
 	    c1 = lwsp_buf[0];
 	}
-	free(lwsp_buf);
-        return c1;
+	nkf_xfree(lwsp_buf);
+	return c1;
     }
-mime_c3_retry:
-    if ((c3 = (*i_mgetc)(f))<=' ') {
-        if (c3==EOF)
-            return (EOF);
+  mime_c3_retry:
+    if ((c3 = (*i_mgetc)(f))<=SP) {
+	if (c3==EOF)
+	    return (EOF);
 	if (mime_f != STRICT_MIME) goto mime_c3_retry;
-        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
-        return c3;
+	if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
+	return c3;
     }
-mime_c4_retry:
-    if ((c4 = (*i_mgetc)(f))<=' ') {
-        if (c4==EOF)
-            return (EOF);
+  mime_c4_retry:
+    if ((c4 = (*i_mgetc)(f))<=SP) {
+	if (c4==EOF)
+	    return (EOF);
 	if (mime_f != STRICT_MIME) goto mime_c4_retry;
-        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
-        return c4;
+	if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
+	return c4;
     }
 
     mime_decode_mode = mode; /* still in MIME sigh... */
@@ -5344,147 +4616,112 @@ mime_c4_retry:
     t4 = 0x3f & base64decode(c4);
     cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
     if (c2 != '=') {
-        Fifo(mime_last++) = (unsigned char)cc;
-        cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
-        if (c3 != '=') {
-            Fifo(mime_last++) = (unsigned char)cc;
-            cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
-            if (c4 != '=') 
-                Fifo(mime_last++) = (unsigned char)cc;
-        }
-    } else {
-        return c1;
-    }
-    return  Fifo(mime_top++);
-}
-
-nkf_char mime_ungetc(nkf_char c, FILE *f)
-{
-    Fifo(--mime_top) = (unsigned char)c;
-    return c;
-}
-
-nkf_char mime_integrity(FILE *f, const unsigned char *p)
-{
-    nkf_char c,d;
-    unsigned int q;
-    /* In buffered mode, read until =? or NL or buffer full
-     */
-    mime_input = mime_top;
-    mime_last = mime_top;
-    
-    while(*p) Fifo(mime_input++) = *p++;
-    d = 0;
-    q = mime_input;
-    while((c=(*i_getc)(f))!=EOF) {
-        if (((mime_input-mime_top)&MIME_BUF_MASK)==0) {
-	    break;   /* buffer full */
-	}
-        if (c=='=' && d=='?') {
-            /* checked. skip header, start decode */
-            Fifo(mime_input++) = (unsigned char)c;
-            /* mime_last_input = mime_input; */
-            mime_input = q; 
-	    switch_mime_getc();
-            return 1;
-        }
-        if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
-            break;
-        /* Should we check length mod 4? */
-        Fifo(mime_input++) = (unsigned char)c;
-        d=c;
-    }
-    /* In case of Incomplete MIME, no MIME decode  */
-    Fifo(mime_input++) = (unsigned char)c;
-    mime_last = mime_input;     /* point undecoded buffer */
-    mime_decode_mode = 1;              /* no decode on Fifo last in mime_getc */
-    switch_mime_getc();         /* anyway we need buffered getc */
-    return 1;
-}
-
-nkf_char base64decode(nkf_char c)
-{
-    int             i;
-    if (c > '@') {
-        if (c < '[') {
-            i = c - 'A';                        /* A..Z 0-25 */
-        } else {
-            i = c - 'G'     /* - 'a' + 26 */ ;  /* a..z 26-51 */
+	mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
+	cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
+	if (c3 != '=') {
+	    mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
+	    cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
+	    if (c4 != '=')
+		mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
 	}
-    } else if (c > '/') {
-        i = c - '0' + '4'   /* - '0' + 52 */ ;  /* 0..9 52-61 */
-    } else if (c == '+') {
-        i = '>'             /* 62 */ ;          /* +  62 */
     } else {
-        i = '?'             /* 63 */ ;          /* / 63 */
+	return c1;
     }
-    return (i);
+    return  mime_input_buf(mime_input_state.top++);
 }
 
 static const char basis_64[] =
-   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-static nkf_char b64c;
-#define MIMEOUT_BUF_LENGTH (60)
-char mimeout_buf[MIMEOUT_BUF_LENGTH+1];
-int mimeout_buf_count = 0;
-int mimeout_preserve_space = 0;
-#define itoh4(c)   (c>=10?c+'A'-10:c+'0')
+#define MIMEOUT_BUF_LENGTH 74
+static struct {
+    char buf[MIMEOUT_BUF_LENGTH+1];
+    int count;
+} mimeout_state;
 
-void open_mime(nkf_char mode)
+/*nkf_char mime_lastchar2, mime_lastchar1;*/
+
+static void
+open_mime(nkf_char mode)
 {
     const unsigned char *p;
     int i;
     int j;
     p  = mime_pattern[0];
-    for(i=0;mime_encode[i];i++) {
+    for(i=0;mime_pattern[i];i++) {
 	if (mode == mime_encode[i]) {
 	    p = mime_pattern[i];
 	    break;
 	}
     }
     mimeout_mode = mime_encode_method[i];
-    
     i = 0;
     if (base64_count>45) {
-	if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){
-            (*o_mputc)(mimeout_buf[i]);
+	if (mimeout_state.count>0 && nkf_isblank(mimeout_state.buf[i])){
+	    (*o_mputc)(mimeout_state.buf[i]);
 	    i++;
 	}
-	(*o_mputc)(NL);
-	(*o_mputc)(SPACE);
+	put_newline(o_mputc);
+	(*o_mputc)(SP);
 	base64_count = 1;
-	if (!mimeout_preserve_space && mimeout_buf_count>0
-	    && (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
-	    	|| mimeout_buf[i]==CR || mimeout_buf[i]==NL )) {
+	if (mimeout_state.count>0 && nkf_isspace(mimeout_state.buf[i])) {
 	    i++;
 	}
     }
-    if (!mimeout_preserve_space) {
-	for (;i<mimeout_buf_count;i++) {
-	    if (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
-		|| mimeout_buf[i]==CR || mimeout_buf[i]==NL ) {
-		(*o_mputc)(mimeout_buf[i]);
-		base64_count ++;
-	    } else {
-		break;
-	    }
+    for (;i<mimeout_state.count;i++) {
+	if (nkf_isspace(mimeout_state.buf[i])) {
+	    (*o_mputc)(mimeout_state.buf[i]);
+	    base64_count ++;
+	} else {
+	    break;
 	}
     }
-    mimeout_preserve_space = FALSE;
-    
     while(*p) {
-        (*o_mputc)(*p++);
-        base64_count ++;
+	(*o_mputc)(*p++);
+	base64_count ++;
     }
-    j = mimeout_buf_count;
-    mimeout_buf_count = 0;
+    j = mimeout_state.count;
+    mimeout_state.count = 0;
     for (;i<j;i++) {
-	mime_putc(mimeout_buf[i]);
+	mime_putc(mimeout_state.buf[i]);
     }
 }
 
-void close_mime(void)
+static void
+mime_prechar(nkf_char c2, nkf_char c1)
+{
+    if (mimeout_mode > 0){
+	if (c2 == EOF){
+	    if (base64_count + mimeout_state.count/3*4> 73){
+		(*o_base64conv)(EOF,0);
+		oconv_newline(o_base64conv);
+		(*o_base64conv)(0,SP);
+		base64_count = 1;
+	    }
+	} else {
+	    if ((c2 != 0 || c1 > DEL) && base64_count + mimeout_state.count/3*4> 66) {
+		(*o_base64conv)(EOF,0);
+		oconv_newline(o_base64conv);
+		(*o_base64conv)(0,SP);
+		base64_count = 1;
+		mimeout_mode = -1;
+	    }
+	}
+    } else if (c2) {
+	if (c2 != EOF && base64_count + mimeout_state.count/3*4> 60) {
+	    mimeout_mode =  (output_mode==ASCII ||output_mode == ISO_8859_1) ? 'Q' : 'B';
+	    open_mime(output_mode);
+	    (*o_base64conv)(EOF,0);
+	    oconv_newline(o_base64conv);
+	    (*o_base64conv)(0,SP);
+	    base64_count = 1;
+	    mimeout_mode = -1;
+	}
+    }
+}
+
+static void
+close_mime(void)
 {
     (*o_mputc)('?');
     (*o_mputc)('=');
@@ -5492,290 +4729,344 @@ void close_mime(void)
     mimeout_mode = 0;
 }
 
-void eof_mime(void)
+static void
+eof_mime(void)
 {
     switch(mimeout_mode) {
     case 'Q':
     case 'B':
 	break;
     case 2:
-	(*o_mputc)(basis_64[((b64c & 0x3)<< 4)]);
+	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0x3)<< 4)]);
 	(*o_mputc)('=');
 	(*o_mputc)('=');
 	base64_count += 3;
 	break;
     case 1:
-	(*o_mputc)(basis_64[((b64c & 0xF) << 2)]);
+	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0xF) << 2)]);
 	(*o_mputc)('=');
 	base64_count += 2;
 	break;
     }
-    if (mimeout_mode) {
+    if (mimeout_mode > 0) {
 	if (mimeout_f!=FIXED_MIME) {
-	    close_mime(); 
+	    close_mime();
 	} else if (mimeout_mode != 'Q')
 	    mimeout_mode = 'B';
     }
 }
 
-void mimeout_addchar(nkf_char c)
+static void
+mimeout_addchar(nkf_char c)
 {
     switch(mimeout_mode) {
     case 'Q':
-	if (c==CR||c==NL) {
+	if (c==CR||c==LF) {
 	    (*o_mputc)(c);
 	    base64_count = 0;
 	} else if(!nkf_isalnum(c)) {
 	    (*o_mputc)('=');
-	    (*o_mputc)(itoh4(((c>>4)&0xf)));
-	    (*o_mputc)(itoh4((c&0xf)));
+	    (*o_mputc)(bin2hex(((c>>4)&0xf)));
+	    (*o_mputc)(bin2hex((c&0xf)));
 	    base64_count += 3;
 	} else {
 	    (*o_mputc)(c);
 	    base64_count++;
 	}
-        break;
+	break;
     case 'B':
-        b64c=c;
-        (*o_mputc)(basis_64[c>>2]);
-        mimeout_mode=2;
-        base64_count ++;
-        break;
+	nkf_state->mimeout_state=c;
+	(*o_mputc)(basis_64[c>>2]);
+	mimeout_mode=2;
+	base64_count ++;
+	break;
     case 2:
-        (*o_mputc)(basis_64[((b64c & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
-        b64c=c;
-        mimeout_mode=1;
-        base64_count ++;
-        break;
+	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
+	nkf_state->mimeout_state=c;
+	mimeout_mode=1;
+	base64_count ++;
+	break;
     case 1:
-        (*o_mputc)(basis_64[((b64c & 0xF) << 2) | ((c & 0xC0) >>6)]);
-        (*o_mputc)(basis_64[c & 0x3F]);
-        mimeout_mode='B';
-        base64_count += 2;
-        break;
+	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0xF) << 2) | ((c & 0xC0) >>6)]);
+	(*o_mputc)(basis_64[c & 0x3F]);
+	mimeout_mode='B';
+	base64_count += 2;
+	break;
     default:
 	(*o_mputc)(c);
 	base64_count++;
-        break;
+	break;
     }
 }
 
-nkf_char mime_lastchar2, mime_lastchar1;
-
-void mime_prechar(nkf_char c2, nkf_char c1)
-{
-    if (mimeout_mode){
-        if (c2){
-            if (base64_count + mimeout_buf_count/3*4> 66){
-                (*o_base64conv)(EOF,0);
-                (*o_base64conv)(0,NL);
-                (*o_base64conv)(0,SPACE);
-            }
-        }/*else if (mime_lastchar2){
-            if (c1 <=DEL && !nkf_isspace(c1)){
-                (*o_base64conv)(0,SPACE);
-            }
-        }*/
-    }/*else{
-        if (c2 && mime_lastchar2 == 0
-            && mime_lastchar1 && !nkf_isspace(mime_lastchar1)){
-            (*o_base64conv)(0,SPACE);
-        }
-    }*/
-    mime_lastchar2 = c2;
-    mime_lastchar1 = c1;
-}
-
-void mime_putc(nkf_char c)
+static void
+mime_putc(nkf_char c)
 {
     int i, j;
     nkf_char lastchar;
 
     if (mimeout_f == FIXED_MIME){
-        if (mimeout_mode == 'Q'){
-            if (base64_count > 71){
-                if (c!=CR && c!=NL) {
-                    (*o_mputc)('=');
-                    (*o_mputc)(NL);
-                }
-                base64_count = 0;
-            }
-        }else{
-            if (base64_count > 71){
-                eof_mime();
-                (*o_mputc)(NL);
-                base64_count = 0;
-            }
-            if (c == EOF) { /* c==EOF */
-                eof_mime();
-            }
-        }
-        if (c != EOF) { /* c==EOF */
-            mimeout_addchar(c);
-        }
-        return;
-    }
-    
+	if (mimeout_mode == 'Q'){
+	    if (base64_count > 71){
+		if (c!=CR && c!=LF) {
+		    (*o_mputc)('=');
+		    put_newline(o_mputc);
+		}
+		base64_count = 0;
+	    }
+	}else{
+	    if (base64_count > 71){
+		eof_mime();
+		put_newline(o_mputc);
+		base64_count = 0;
+	    }
+	    if (c == EOF) { /* c==EOF */
+		eof_mime();
+	    }
+	}
+	if (c != EOF) { /* c==EOF */
+	    mimeout_addchar(c);
+	}
+	return;
+    }
+
     /* mimeout_f != FIXED_MIME */
 
     if (c == EOF) { /* c==EOF */
-	j = mimeout_buf_count;
-	mimeout_buf_count = 0;
+	if (mimeout_mode == -1 && mimeout_state.count > 1) open_mime(output_mode);
+	j = mimeout_state.count;
+	mimeout_state.count = 0;
 	i = 0;
-	if (mimeout_mode) {
-	    for (;i<j;i++) {
-		if (nkf_isspace(mimeout_buf[i]) && base64_count < 71){
-		    break;
+	if (mimeout_mode > 0) {
+	    if (!nkf_isblank(mimeout_state.buf[j-1])) {
+		for (;i<j;i++) {
+		    if (nkf_isspace(mimeout_state.buf[i]) && base64_count < 71){
+			break;
+		    }
+		    mimeout_addchar(mimeout_state.buf[i]);
 		}
-		mimeout_addchar(mimeout_buf[i]);
-	    }
-	    eof_mime();
-	    for (;i<j;i++) {
-		mimeout_addchar(mimeout_buf[i]);
+		eof_mime();
+		for (;i<j;i++) {
+		    mimeout_addchar(mimeout_state.buf[i]);
+		}
+	    } else {
+		for (;i<j;i++) {
+		    mimeout_addchar(mimeout_state.buf[i]);
+		}
+		eof_mime();
 	    }
 	} else {
 	    for (;i<j;i++) {
-		mimeout_addchar(mimeout_buf[i]);
+		mimeout_addchar(mimeout_state.buf[i]);
 	    }
 	}
-        return;
+	return;
     }
 
-    if (mimeout_mode=='Q') {
-        if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
-            if (c <= SPACE) {
-                close_mime();
-                (*o_mputc)(SPACE);
-                base64_count++;
-            }
-            (*o_mputc)(c);
-            base64_count++;
-        }
-        return;
-    }
-
-    if (mimeout_buf_count > 0){
-        lastchar = mimeout_buf[mimeout_buf_count - 1];
+    if (mimeout_state.count > 0){
+	lastchar = mimeout_state.buf[mimeout_state.count - 1];
     }else{
-        lastchar = -1;
-    }
-
-    if (!mimeout_mode) {
-        if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1)) {
-            if (nkf_isspace(c)) {
-                if (c==CR || c==NL) {
-                    base64_count=0;
-                }
-                for (i=0;i<mimeout_buf_count;i++) {
-                    (*o_mputc)(mimeout_buf[i]);
-                    if (mimeout_buf[i] == CR || mimeout_buf[i] == NL){
-                        base64_count = 0;
-                    }else{
-                        base64_count++;
-                    }
-                }
-                mimeout_buf[0] = (char)c;
-                mimeout_buf_count = 1;
-            }else{
-                if (base64_count > 1
-                    && base64_count + mimeout_buf_count > 76){
-                    (*o_mputc)(NL);
-                    base64_count = 0;
-                    if (!nkf_isspace(mimeout_buf[0])){
-                        (*o_mputc)(SPACE);
-                        base64_count++;
-                    }
-                }
-                mimeout_buf[mimeout_buf_count++] = (char)c;
-                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
-                    open_mime(output_mode);
-                }
-            }
-            return;
-        }else{
-            if (lastchar==CR || lastchar == NL){
-                for (i=0;i<mimeout_buf_count;i++) {
-                    (*o_mputc)(mimeout_buf[i]);
-                }
-                base64_count = 0;
-                mimeout_buf_count = 0;
-            }
-            if (lastchar==SPACE) {
-                for (i=0;i<mimeout_buf_count-1;i++) {
-                    (*o_mputc)(mimeout_buf[i]);
-                    base64_count++;
-                }
-                mimeout_buf[0] = SPACE;
-                mimeout_buf_count = 1;
-            }
-            open_mime(output_mode);
-        }
+	lastchar = -1;
+    }
+
+    if (mimeout_mode=='Q') {
+	if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
+	    if (c == CR || c == LF) {
+		close_mime();
+		(*o_mputc)(c);
+		base64_count = 0;
+		return;
+	    } else if (c <= SP) {
+		close_mime();
+		if (base64_count > 70) {
+		    put_newline(o_mputc);
+		    base64_count = 0;
+		}
+		if (!nkf_isblank(c)) {
+		    (*o_mputc)(SP);
+		    base64_count++;
+		}
+	    } else {
+		if (base64_count > 70) {
+		    close_mime();
+		    put_newline(o_mputc);
+		    (*o_mputc)(SP);
+		    base64_count = 1;
+		    open_mime(output_mode);
+		}
+		if (!nkf_noescape_mime(c)) {
+		    mimeout_addchar(c);
+		    return;
+		}
+	    }
+	    if (c != 0x1B) {
+		(*o_mputc)(c);
+		base64_count++;
+		return;
+	    }
+	}
+    }
+
+    if (mimeout_mode <= 0) {
+	if (c <= DEL && (output_mode==ASCII || output_mode == ISO_8859_1 ||
+		    output_mode == UTF_8)) {
+	    if (nkf_isspace(c)) {
+		int flag = 0;
+		if (mimeout_mode == -1) {
+		    flag = 1;
+		}
+		if (c==CR || c==LF) {
+		    if (flag) {
+			open_mime(output_mode);
+			output_mode = 0;
+		    } else {
+			base64_count = 0;
+		    }
+		}
+		for (i=0;i<mimeout_state.count;i++) {
+		    (*o_mputc)(mimeout_state.buf[i]);
+		    if (mimeout_state.buf[i] == CR || mimeout_state.buf[i] == LF){
+			base64_count = 0;
+		    }else{
+			base64_count++;
+		    }
+		}
+		if (flag) {
+		    eof_mime();
+		    base64_count = 0;
+		    mimeout_mode = 0;
+		}
+		mimeout_state.buf[0] = (char)c;
+		mimeout_state.count = 1;
+	    }else{
+		if (base64_count > 1
+		    && base64_count + mimeout_state.count > 76
+		    && mimeout_state.buf[0] != CR && mimeout_state.buf[0] != LF){
+		    static const char *str = "boundary=\"";
+		    static int len = 10;
+		    i = 0;
+
+		    for (; i < mimeout_state.count - len; ++i) {
+			if (!strncmp(mimeout_state.buf+i, str, len)) {
+			    i += len - 2;
+			    break;
+			}
+		    }
+
+		    if (i == 0 || i == mimeout_state.count - len) {
+			put_newline(o_mputc);
+			base64_count = 0;
+			if (!nkf_isspace(mimeout_state.buf[0])){
+			    (*o_mputc)(SP);
+			    base64_count++;
+			}
+		    }
+		    else {
+			int j;
+			for (j = 0; j <= i; ++j) {
+			    (*o_mputc)(mimeout_state.buf[j]);
+			}
+			put_newline(o_mputc);
+			base64_count = 1;
+			for (; j <= mimeout_state.count; ++j) {
+			    mimeout_state.buf[j - i] = mimeout_state.buf[j];
+			}
+			mimeout_state.count -= i;
+		    }
+		}
+		mimeout_state.buf[mimeout_state.count++] = (char)c;
+		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
+		    open_mime(output_mode);
+		}
+	    }
+	    return;
+	}else{
+	    if (lastchar==CR || lastchar == LF){
+		for (i=0;i<mimeout_state.count;i++) {
+		    (*o_mputc)(mimeout_state.buf[i]);
+		}
+		base64_count = 0;
+		mimeout_state.count = 0;
+	    }
+	    if (lastchar==SP) {
+		for (i=0;i<mimeout_state.count-1;i++) {
+		    (*o_mputc)(mimeout_state.buf[i]);
+		    base64_count++;
+		}
+		mimeout_state.buf[0] = SP;
+		mimeout_state.count = 1;
+	    }
+	    open_mime(output_mode);
+	}
     }else{
-        /* mimeout_mode == 'B', 1, 2 */
-        if ( c<=DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
-            if (lastchar == CR || lastchar == NL){
-                if (nkf_isblank(c)) {
-                    for (i=0;i<mimeout_buf_count;i++) {
-                        mimeout_addchar(mimeout_buf[i]);
-                    }
-                    mimeout_buf_count = 0;
-                } else if (SPACE<c && c<DEL) {
-                    eof_mime();
-                    for (i=0;i<mimeout_buf_count;i++) {
-                        (*o_mputc)(mimeout_buf[i]);
-                    }
-                    base64_count = 0;
-                    mimeout_buf_count = 0;
-                }
-            }
-            if (c==SPACE || c==TAB || c==CR || c==NL) {
-                for (i=0;i<mimeout_buf_count;i++) {
-                    if (SPACE<mimeout_buf[i] && mimeout_buf[i]<DEL) {
-                        eof_mime();
-                        for (i=0;i<mimeout_buf_count;i++) {
-                            (*o_mputc)(mimeout_buf[i]);
-                            base64_count++;
-                        }
-                        mimeout_buf_count = 0;
-                    }
-                }
-                mimeout_buf[mimeout_buf_count++] = (char)c;
-                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
-                    eof_mime();
-                    for (i=0;i<mimeout_buf_count;i++) {
-                        (*o_mputc)(mimeout_buf[i]);
-                        base64_count++;
-                    }
-                    mimeout_buf_count = 0;
-                }
-                return;
-            }
-            if (mimeout_buf_count>0 && SPACE<c && c!='=') {
-                mimeout_buf[mimeout_buf_count++] = (char)c;
-                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
-                    j = mimeout_buf_count;
-                    mimeout_buf_count = 0;
-                    for (i=0;i<j;i++) {
-                        mimeout_addchar(mimeout_buf[i]);
-                    }
-                }
-                return;
-            }
-        }
-    }
-    if (mimeout_buf_count>0) {
-	j = mimeout_buf_count;
-	mimeout_buf_count = 0;
+	/* mimeout_mode == 'B', 1, 2 */
+	if (c <= DEL && (output_mode==ASCII || output_mode == ISO_8859_1 ||
+		    output_mode == UTF_8)) {
+	    if (lastchar == CR || lastchar == LF){
+		if (nkf_isblank(c)) {
+		    for (i=0;i<mimeout_state.count;i++) {
+			mimeout_addchar(mimeout_state.buf[i]);
+		    }
+		    mimeout_state.count = 0;
+		} else {
+		    eof_mime();
+		    for (i=0;i<mimeout_state.count;i++) {
+			(*o_mputc)(mimeout_state.buf[i]);
+		    }
+		    base64_count = 0;
+		    mimeout_state.count = 0;
+		}
+		mimeout_state.buf[mimeout_state.count++] = (char)c;
+		return;
+	    }
+	    if (nkf_isspace(c)) {
+		for (i=0;i<mimeout_state.count;i++) {
+		    if (SP<mimeout_state.buf[i] && mimeout_state.buf[i]<DEL) {
+			eof_mime();
+			for (i=0;i<mimeout_state.count;i++) {
+			    (*o_mputc)(mimeout_state.buf[i]);
+			    base64_count++;
+			}
+			mimeout_state.count = 0;
+		    }
+		}
+		mimeout_state.buf[mimeout_state.count++] = (char)c;
+		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
+		    eof_mime();
+		    for (i=0;i<mimeout_state.count;i++) {
+			(*o_mputc)(mimeout_state.buf[i]);
+			base64_count++;
+		    }
+		    mimeout_state.count = 0;
+		}
+		return;
+	    }
+	    if (mimeout_state.count>0 && SP<c && c!='=') {
+		mimeout_state.buf[mimeout_state.count++] = (char)c;
+		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
+		    j = mimeout_state.count;
+		    mimeout_state.count = 0;
+		    for (i=0;i<j;i++) {
+			mimeout_addchar(mimeout_state.buf[i]);
+		    }
+		}
+		return;
+	    }
+	}
+    }
+    if (mimeout_state.count>0) {
+	j = mimeout_state.count;
+	mimeout_state.count = 0;
 	for (i=0;i<j;i++) {
-	    if (mimeout_buf[i]==CR || mimeout_buf[i]==NL)
+	    if (mimeout_state.buf[i]==CR || mimeout_state.buf[i]==LF)
 		break;
-	    mimeout_addchar(mimeout_buf[i]);
+	    mimeout_addchar(mimeout_state.buf[i]);
 	}
 	if (i<j) {
 	    eof_mime();
 	    base64_count=0;
 	    for (;i<j;i++) {
-		(*o_mputc)(mimeout_buf[i]);
+		(*o_mputc)(mimeout_state.buf[i]);
 	    }
 	    open_mime(output_mode);
 	}
@@ -5783,15 +5074,112 @@ void mime_putc(nkf_char c)
     mimeout_addchar(c);
 }
 
+static void
+base64_conv(nkf_char c2, nkf_char c1)
+{
+    mime_prechar(c2, c1);
+    (*o_base64conv)(c2,c1);
+}
+
+#ifdef HAVE_ICONV_H
+typedef struct nkf_iconv_t {
+    iconv_t cd;
+    char *input_buffer;
+    size_t input_buffer_size;
+    char *output_buffer;
+    size_t output_buffer_size;
+}
+
+static nkf_iconv_t
+nkf_iconv_new(char *tocode, char *fromcode)
+{
+    nkf_iconv_t converter;
+
+    converter->input_buffer_size = IOBUF_SIZE;
+    converter->input_buffer = nkf_xmalloc(converter->input_buffer_size);
+    converter->output_buffer_size = IOBUF_SIZE * 2;
+    converter->output_buffer = nkf_xmalloc(converter->output_buffer_size);
+    converter->cd = iconv_open(tocode, fromcode);
+    if (converter->cd == (iconv_t)-1)
+    {
+	switch (errno) {
+	case EINVAL:
+	    perror(fprintf("iconv doesn't support %s to %s conversion.", fromcode, tocode));
+	    return -1;
+	default:
+	    perror("can't iconv_open");
+	}
+    }
+}
+
+static size_t
+nkf_iconv_convert(nkf_iconv_t *converter, FILE *input)
+{
+    size_t invalid = (size_t)0;
+    char *input_buffer = converter->input_buffer;
+    size_t input_length = (size_t)0;
+    char *output_buffer = converter->output_buffer;
+    size_t output_length = converter->output_buffer_size;
+    int c;
+
+    do {
+	if (c != EOF) {
+	    while ((c = (*i_getc)(f)) != EOF) {
+		input_buffer[input_length++] = c;
+		if (input_length < converter->input_buffer_size) break;
+	    }
+	}
+
+	size_t ret = iconv(converter->cd, &input_buffer, &input_length, &output_buffer, &output_length);
+	while (output_length-- > 0) {
+	    (*o_putc)(output_buffer[converter->output_buffer_size-output_length]);
+	}
+	if (ret == (size_t) - 1) {
+	    switch (errno) {
+	    case EINVAL:
+		if (input_buffer != converter->input_buffer)
+		    memmove(converter->input_buffer, input_buffer, input_length);
+		break;
+	    case E2BIG:
+		converter->output_buffer_size *= 2;
+		output_buffer = realloc(converter->outbuf, converter->output_buffer_size);
+		if (output_buffer == NULL) {
+		    perror("can't realloc");
+		    return -1;
+		}
+		converter->output_buffer = output_buffer;
+		break;
+	    default:
+		perror("can't iconv");
+		return -1;
+	    }
+	} else {
+	    invalid += ret;
+	}
+    } while (1);
+
+    return invalid;
+}
+
 
-#if defined(PERL_XS) || defined(WIN32DLL)
-void reinit(void)
+static void
+nkf_iconv_close(nkf_iconv_t *convert)
+{
+    nkf_xfree(converter->inbuf);
+    nkf_xfree(converter->outbuf);
+    iconv_close(converter->cd);
+}
+#endif
+
+
+static void
+reinit(void)
 {
     {
-        struct input_code *p = input_code_list;
-        while (p->name){
-            status_reinit(p++);
-        }
+	struct input_code *p = input_code_list;
+	while (p->name){
+	    status_reinit(p++);
+	}
     }
     unbuf_f = FALSE;
     estab_f = FALSE;
@@ -5799,19 +5187,14 @@ void reinit(void)
     binmode_f = TRUE;
     rot_f = FALSE;
     hira_f = FALSE;
-    input_f = FALSE;
     alpha_f = FALSE;
-    mime_f = STRICT_MIME;
+    mime_f = MIME_DECODE_DEFAULT;
     mime_decode_f = FALSE;
     mimebuf_f = FALSE;
     broken_f = FALSE;
     iso8859_f = FALSE;
     mimeout_f = FALSE;
-#if defined(MSDOS) || defined(__OS2__)
-     x0201_f = TRUE;
-#else
-     x0201_f = NO_X0201;
-#endif
+    x0201_f = NKF_UNSPECIFIED;
     iso2022jp_f = FALSE;
 #if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
     ms_ucs_map_f = UCS_MAP_ASCII;
@@ -5839,9 +5222,7 @@ void reinit(void)
     noout_f = FALSE;
     debug_f = FALSE;
 #endif
-    guess_f = FALSE;
-    is_inputcode_mixed = FALSE;
-    is_inputcode_set   = FALSE;
+    guess_f = 0;
 #ifdef EXEC_IO
     exec_f = 0;
 #endif
@@ -5854,13 +5235,13 @@ void reinit(void)
     x0213_f = FALSE;
 #endif
     {
-        int i;
-        for (i = 0; i < 256; i++){
-            prefix_table[i] = 0;
-        }
+	int i;
+	for (i = 0; i < 256; i++){
+	    prefix_table[i] = 0;
+	}
     }
     hold_count = 0;
-    mimeout_buf_count = 0;
+    mimeout_state.count = 0;
     mimeout_mode = 0;
     base64_count = 0;
     f_line = 0;
@@ -5871,11 +5252,9 @@ void reinit(void)
     kanji_intro = DEFAULT_J;
     ascii_intro = DEFAULT_R;
     fold_margin  = FOLD_MARGIN;
-    output_conv = DEFAULT_CONV;
-    oconv = DEFAULT_CONV;
     o_zconv = no_connection;
     o_fconv = no_connection;
-    o_crconv = no_connection;
+    o_eol_conv = no_connection;
     o_rot_conv = no_connection;
     o_hira_conv = no_connection;
     o_base64conv = no_connection;
@@ -5892,149 +5271,1447 @@ void reinit(void)
     i_mungetc_buf = std_ungetc;
     output_mode = ASCII;
     input_mode =  ASCII;
-    shift_mode =  FALSE;
     mime_decode_mode = FALSE;
     file_out_f = FALSE;
-    crmode_f = 0;
+    eolmode_f = 0;
+    input_eol = 0;
+    prev_cr = 0;
     option_mode = 0;
-    broken_counter = 0;
-    broken_last = 0;
     z_prev2=0,z_prev1=0;
 #ifdef CHECK_OPTION
     iconv_for_check = 0;
 #endif
-    input_codename = "";
+    input_codename = NULL;
+    input_encoding = NULL;
+    output_encoding = NULL;
+    nkf_state_init();
 #ifdef WIN32DLL
     reinitdll();
 #endif /*WIN32DLL*/
 }
+
+static int
+module_connection(void)
+{
+    if (input_encoding) set_input_encoding(input_encoding);
+    if (!output_encoding) {
+	output_encoding = nkf_default_encoding();
+    }
+    if (!output_encoding) {
+	if (noout_f || guess_f) output_encoding = nkf_enc_from_index(ISO_2022_JP);
+	else return -1;
+    }
+    set_output_encoding(output_encoding);
+    oconv = nkf_enc_to_oconv(output_encoding);
+    o_putc = std_putc;
+    if (nkf_enc_unicode_p(output_encoding))
+	output_mode = UTF_8;
+
+	if (x0201_f == NKF_UNSPECIFIED) {
+		x0201_f = X0201_DEFAULT;
+	}
+
+    /* replace continucation module, from output side */
+
+    /* output redicrection */
+#ifdef CHECK_OPTION
+    if (noout_f || guess_f){
+	o_putc = no_putc;
+    }
+#endif
+    if (mimeout_f) {
+	o_mputc = o_putc;
+	o_putc = mime_putc;
+	if (mimeout_f == TRUE) {
+	    o_base64conv = oconv; oconv = base64_conv;
+	}
+	/* base64_count = 0; */
+    }
+
+    if (eolmode_f || guess_f) {
+	o_eol_conv = oconv; oconv = eol_conv;
+    }
+    if (rot_f) {
+	o_rot_conv = oconv; oconv = rot_conv;
+    }
+    if (iso2022jp_f) {
+	o_iso2022jp_check_conv = oconv; oconv = iso2022jp_check_conv;
+    }
+    if (hira_f) {
+	o_hira_conv = oconv; oconv = hira_conv;
+    }
+    if (fold_f) {
+	o_fconv = oconv; oconv = fold_conv;
+	f_line = 0;
+    }
+    if (alpha_f || x0201_f) {
+	o_zconv = oconv; oconv = z_conv;
+    }
+
+    i_getc = std_getc;
+    i_ungetc = std_ungetc;
+    /* input redicrection */
+#ifdef INPUT_OPTION
+    if (cap_f){
+	i_cgetc = i_getc; i_getc = cap_getc;
+	i_cungetc = i_ungetc; i_ungetc= cap_ungetc;
+    }
+    if (url_f){
+	i_ugetc = i_getc; i_getc = url_getc;
+	i_uungetc = i_ungetc; i_ungetc= url_ungetc;
+    }
 #endif
+#ifdef NUMCHAR_OPTION
+    if (numchar_f){
+	i_ngetc = i_getc; i_getc = numchar_getc;
+	i_nungetc = i_ungetc; i_ungetc= numchar_ungetc;
+    }
+#endif
+#ifdef UNICODE_NORMALIZATION
+    if (nfc_f){
+	i_nfc_getc = i_getc; i_getc = nfc_getc;
+	i_nfc_ungetc = i_ungetc; i_ungetc= nfc_ungetc;
+    }
+#endif
+    if (mime_f && mimebuf_f==FIXED_MIME) {
+	i_mgetc = i_getc; i_getc = mime_getc;
+	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
+    }
+    if (broken_f & 1) {
+	i_bgetc = i_getc; i_getc = broken_getc;
+	i_bungetc = i_ungetc; i_ungetc = broken_ungetc;
+    }
+    if (input_encoding) {
+	set_iconv(-TRUE, nkf_enc_to_iconv(input_encoding));
+    } else {
+	set_iconv(FALSE, e_iconv);
+    }
+
+    {
+	struct input_code *p = input_code_list;
+	while (p->name){
+	    status_reinit(p++);
+	}
+    }
+    return 0;
+}
+
+/*
+   Conversion main loop. Code detection only.
+ */
 
-void no_connection(nkf_char c2, nkf_char c1)
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+static nkf_char
+noconvert(FILE *f)
 {
-    no_connection2(c2,c1,0);
+    nkf_char    c;
+
+    if (nop_f == 2)
+	module_connection();
+    while ((c = (*i_getc)(f)) != EOF)
+	(*o_putc)(c);
+    (*o_putc)(EOF);
+    return 1;
 }
+#endif
 
-nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
+#define NEXT continue        /* no output, get next */
+#define SKIP c2=0;continue        /* no output, get next */
+#define MORE c2=c1;continue  /* need one more byte */
+#define SEND (void)0         /* output c1 and c2, get next */
+#define LAST break           /* end of loop, go closing  */
+#define set_input_mode(mode) do { \
+    input_mode = mode; \
+    shift_mode = 0; \
+    set_input_codename("ISO-2022-JP"); \
+    debug("ISO-2022-JP"); \
+} while (0)
+
+static int
+kanji_convert(FILE *f)
 {
-    fprintf(stderr,"nkf internal module connection failure.\n");
-    exit(1);
-    return 0; /* LINT */
+    nkf_char c1=0, c2=0, c3=0, c4=0;
+    int shift_mode = 0; /* 0, 1, 2, 3 */
+    int g2 = 0;
+    int is_8bit = FALSE;
+
+    if (input_encoding && !nkf_enc_asciicompat(input_encoding)) {
+	is_8bit = TRUE;
+    }
+
+    input_mode = ASCII;
+    output_mode = ASCII;
+
+    if (module_connection() < 0) {
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+	fprintf(stderr, "no output encoding given\n");
+#endif
+	return -1;
+    }
+    check_bom(f);
+
+#ifdef UTF8_INPUT_ENABLE
+    if(iconv == w_iconv32){
+	while ((c1 = (*i_getc)(f)) != EOF &&
+	       (c2 = (*i_getc)(f)) != EOF &&
+	       (c3 = (*i_getc)(f)) != EOF &&
+	       (c4 = (*i_getc)(f)) != EOF) {
+	    nkf_iconv_utf_32(c1, c2, c3, c4);
+	}
+	goto finished;
+    }
+    else if (iconv == w_iconv16) {
+	while ((c1 = (*i_getc)(f)) != EOF &&
+	       (c2 = (*i_getc)(f)) != EOF) {
+	    if (nkf_iconv_utf_16(c1, c2, 0, 0) == NKF_ICONV_NEED_TWO_MORE_BYTES &&
+		(c3 = (*i_getc)(f)) != EOF &&
+		(c4 = (*i_getc)(f)) != EOF) {
+		nkf_iconv_utf_16(c1, c2, c3, c4);
+	    }
+	}
+	goto finished;
+    }
+#endif
+
+    while ((c1 = (*i_getc)(f)) != EOF) {
+#ifdef INPUT_CODE_FIX
+	if (!input_encoding)
+#endif
+	    code_status(c1);
+	if (c2) {
+	    /* second byte */
+	    if (c2 > DEL) {
+		/* in case of 8th bit is on */
+		if (!estab_f&&!mime_decode_mode) {
+		    /* in case of not established yet */
+		    /* It is still ambiguious */
+		    if (h_conv(f, c2, c1)==EOF) {
+			LAST;
+		    }
+		    else {
+			SKIP;
+		    }
+		}
+		else {
+		    /* in case of already established */
+		    if (c1 < 0x40) {
+			/* ignore bogus code */
+			SKIP;
+		    } else {
+			SEND;
+		    }
+		}
+	    }
+	    else {
+		/* 2nd byte of 7 bit code or SJIS */
+		SEND;
+	    }
+	}
+	else if (nkf_char_unicode_p(c1)) {
+	    (*oconv)(0, c1);
+	    NEXT;
+	}
+	else {
+	    /* first byte */
+	    if (input_mode == JIS_X_0208 && DEL <= c1 && c1 < 0x92) {
+		/* CP5022x */
+		MORE;
+	    }else if (input_codename && input_codename[0] == 'I' &&
+		    0xA1 <= c1 && c1 <= 0xDF) {
+		/* JIS X 0201 Katakana in 8bit JIS */
+		c2 = JIS_X_0201_1976_K;
+		c1 &= 0x7f;
+		SEND;
+	    } else if (c1 > DEL) {
+		/* 8 bit code */
+		if (!estab_f && !iso8859_f) {
+		    /* not established yet */
+		    MORE;
+		} else { /* estab_f==TRUE */
+		    if (iso8859_f) {
+			c2 = ISO_8859_1;
+			c1 &= 0x7f;
+			SEND;
+		    }
+		    else if ((iconv == s_iconv && 0xA0 <= c1 && c1 <= 0xDF) ||
+			     (ms_ucs_map_f == UCS_MAP_CP10001 && (c1 == 0xFD || c1 == 0xFE))) {
+			/* JIS X 0201 */
+			c2 = JIS_X_0201_1976_K;
+			c1 &= 0x7f;
+			SEND;
+		    }
+		    else {
+			/* already established */
+			MORE;
+		    }
+		}
+	    } else if (SP < c1 && c1 < DEL) {
+		/* in case of Roman characters */
+		if (shift_mode) {
+		    /* output 1 shifted byte */
+		    if (iso8859_f) {
+			c2 = ISO_8859_1;
+			SEND;
+		    } else if (nkf_byte_jisx0201_katakana_p(c1)){
+			/* output 1 shifted byte */
+			c2 = JIS_X_0201_1976_K;
+			SEND;
+		    } else {
+			/* look like bogus code */
+			SKIP;
+		    }
+		} else if (input_mode == JIS_X_0208 || input_mode == JIS_X_0212 ||
+			   input_mode == JIS_X_0213_1 || input_mode == JIS_X_0213_2) {
+		    /* in case of Kanji shifted */
+		    MORE;
+		} else if (c1 == '=' && mime_f && !mime_decode_mode) {
+		    /* Check MIME code */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			(*oconv)(0, '=');
+			LAST;
+		    } else if (c1 == '?') {
+			/* =? is mime conversion start sequence */
+			if(mime_f == STRICT_MIME) {
+			    /* check in real detail */
+			    if (mime_begin_strict(f) == EOF)
+				LAST;
+			    SKIP;
+			} else if (mime_begin(f) == EOF)
+			    LAST;
+			SKIP;
+		    } else {
+			(*oconv)(0, '=');
+			(*i_ungetc)(c1,f);
+			SKIP;
+		    }
+		} else {
+		    /* normal ASCII code */
+		    SEND;
+		}
+	    } else if (c1 == SI && (!is_8bit || mime_decode_mode)) {
+		shift_mode = 0;
+		SKIP;
+	    } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
+		shift_mode = 1;
+		SKIP;
+	    } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
+		if ((c1 = (*i_getc)(f)) == EOF) {
+		    (*oconv)(0, ESC);
+		    LAST;
+		}
+		else if (c1 == '&') {
+		    /* IRR */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			LAST;
+		    } else {
+			SKIP;
+		    }
+		}
+		else if (c1 == '$') {
+		    /* GZDMx */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			/* don't send bogus code
+			   (*oconv)(0, ESC);
+			   (*oconv)(0, '$'); */
+			LAST;
+		    } else if (c1 == '@' || c1 == 'B') {
+			/* JIS X 0208 */
+			set_input_mode(JIS_X_0208);
+			SKIP;
+		    } else if (c1 == '(') {
+			/* GZDM4 */
+			if ((c1 = (*i_getc)(f)) == EOF) {
+			    /* don't send bogus code
+			       (*oconv)(0, ESC);
+			       (*oconv)(0, '$');
+			       (*oconv)(0, '(');
+			     */
+			    LAST;
+			} else if (c1 == '@'|| c1 == 'B') {
+			    /* JIS X 0208 */
+			    set_input_mode(JIS_X_0208);
+			    SKIP;
+#ifdef X0212_ENABLE
+			} else if (c1 == 'D'){
+			    set_input_mode(JIS_X_0212);
+			    SKIP;
+#endif /* X0212_ENABLE */
+			} else if (c1 == 'O' || c1 == 'Q'){
+			    set_input_mode(JIS_X_0213_1);
+			    SKIP;
+			} else if (c1 == 'P'){
+			    set_input_mode(JIS_X_0213_2);
+			    SKIP;
+			} else {
+			    /* could be some special code */
+			    (*oconv)(0, ESC);
+			    (*oconv)(0, '$');
+			    (*oconv)(0, '(');
+			    (*oconv)(0, c1);
+			    SKIP;
+			}
+		    } else if (broken_f&0x2) {
+			/* accept any ESC-(-x as broken code ... */
+			input_mode = JIS_X_0208;
+			shift_mode = 0;
+			SKIP;
+		    } else {
+			(*oconv)(0, ESC);
+			(*oconv)(0, '$');
+			(*oconv)(0, c1);
+			SKIP;
+		    }
+		} else if (c1 == '(') {
+		    /* GZD4 */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			/* don't send bogus code
+			   (*oconv)(0, ESC);
+			   (*oconv)(0, '('); */
+			LAST;
+		    }
+		    else if (c1 == 'I') {
+			/* JIS X 0201 Katakana */
+			set_input_mode(JIS_X_0201_1976_K);
+			SKIP;
+		    }
+		    else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
+			/* ISO-646IRV:1983 or JIS X 0201 Roman or JUNET */
+			set_input_mode(ASCII);
+			SKIP;
+		    }
+		    else if (broken_f&0x2) {
+			set_input_mode(ASCII);
+			SKIP;
+		    }
+		    else {
+			(*oconv)(0, ESC);
+			(*oconv)(0, '(');
+			SEND;
+		    }
+		}
+		else if (c1 == '.') {
+		    /* G2D6 */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			LAST;
+		    }
+		    else if (c1 == 'A') {
+			/* ISO-8859-1 */
+			g2 = ISO_8859_1;
+			SKIP;
+		    }
+		    else {
+			(*oconv)(0, ESC);
+			(*oconv)(0, '.');
+			SEND;
+		    }
+		}
+		else if (c1 == 'N') {
+		    /* SS2 */
+		    c1 = (*i_getc)(f);
+		    if (g2 == ISO_8859_1) {
+			c2 = ISO_8859_1;
+			SEND;
+		    }else{
+			(*i_ungetc)(c1, f);
+			/* lonely ESC  */
+			(*oconv)(0, ESC);
+			SEND;
+		    }
+		}
+		else {
+		    /* lonely ESC  */
+		    (*oconv)(0, ESC);
+		    SEND;
+		}
+	    } else if (c1 == ESC && iconv == s_iconv) {
+		/* ESC in Shift_JIS */
+		if ((c1 = (*i_getc)(f)) == EOF) {
+		    (*oconv)(0, ESC);
+		    LAST;
+		} else if (c1 == '$') {
+		    /* J-PHONE emoji */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			LAST;
+		    } else if (('E' <= c1 && c1 <= 'G') ||
+			       ('O' <= c1 && c1 <= 'Q')) {
+			/*
+			   NUM : 0 1 2 3 4 5
+			   BYTE: G E F O P Q
+			   C%7 : 1 6 0 2 3 4
+			   C%7 : 0 1 2 3 4 5 6
+			   NUM : 2 0 3 4 5 X 1
+			 */
+			static const nkf_char jphone_emoji_first_table[7] =
+			{0xE1E0, 0xDFE0, 0xE2E0, 0xE3E0, 0xE4E0, 0xDFE0, 0xE0E0};
+			c3 = nkf_char_unicode_new(jphone_emoji_first_table[c1 % 7]);
+			if ((c1 = (*i_getc)(f)) == EOF) LAST;
+			while (SP <= c1 && c1 <= 'z') {
+			    (*oconv)(0, c1 + c3);
+			    if ((c1 = (*i_getc)(f)) == EOF) LAST;
+			}
+			SKIP;
+		    }
+		    else {
+			(*oconv)(0, ESC);
+			(*oconv)(0, '$');
+			SEND;
+		    }
+		}
+		else {
+		    /* lonely ESC  */
+		    (*oconv)(0, ESC);
+		    SEND;
+		}
+	    } else if (c1 == LF || c1 == CR) {
+		if (broken_f&4) {
+		    input_mode = ASCII; set_iconv(FALSE, 0);
+		    SEND;
+		} else if (mime_decode_f && !mime_decode_mode){
+		    if (c1 == LF) {
+			if ((c1=(*i_getc)(f))!=EOF && c1 == SP) {
+			    i_ungetc(SP,f);
+			    continue;
+			} else {
+			    i_ungetc(c1,f);
+			}
+			c1 = LF;
+			SEND;
+		    } else  { /* if (c1 == CR)*/
+			if ((c1=(*i_getc)(f))!=EOF) {
+			    if (c1==SP) {
+				i_ungetc(SP,f);
+				continue;
+			    } else if (c1 == LF && (c1=(*i_getc)(f))!=EOF && c1 == SP) {
+				i_ungetc(SP,f);
+				continue;
+			    } else {
+				i_ungetc(c1,f);
+			    }
+			    i_ungetc(LF,f);
+			} else {
+			    i_ungetc(c1,f);
+			}
+			c1 = CR;
+			SEND;
+		    }
+		}
+	    } else
+		SEND;
+	}
+	/* send: */
+	switch(input_mode){
+	case ASCII:
+	    switch ((*iconv)(c2, c1, 0)) {  /* can be EUC / SJIS / UTF-8 */
+	    case -2:
+		/* 4 bytes UTF-8 */
+		if ((c3 = (*i_getc)(f)) != EOF) {
+		    code_status(c3);
+		    c3 <<= 8;
+		    if ((c4 = (*i_getc)(f)) != EOF) {
+			code_status(c4);
+			(*iconv)(c2, c1, c3|c4);
+		    }
+		}
+		break;
+	    case -1:
+		/* 3 bytes EUC or UTF-8 */
+		if ((c3 = (*i_getc)(f)) != EOF) {
+		    code_status(c3);
+		    (*iconv)(c2, c1, c3);
+		}
+		break;
+	    }
+	    break;
+	case JIS_X_0208:
+	case JIS_X_0213_1:
+	    if (ms_ucs_map_f &&
+		0x7F <= c2 && c2 <= 0x92 &&
+		0x21 <= c1 && c1 <= 0x7E) {
+		/* CP932 UDC */
+		c1 = nkf_char_unicode_new((c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000);
+		c2 = 0;
+	    }
+	    (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
+	    break;
+#ifdef X0212_ENABLE
+	case JIS_X_0212:
+	    (*oconv)(PREFIX_EUCG3 | c2, c1);
+	    break;
+#endif /* X0212_ENABLE */
+	case JIS_X_0213_2:
+	    (*oconv)(PREFIX_EUCG3 | c2, c1);
+	    break;
+	default:
+	    (*oconv)(input_mode, c1);  /* other special case */
+	}
+
+	c2 = 0;
+	c3 = 0;
+	continue;
+	/* goto next_word */
+    }
+
+finished:
+    /* epilogue */
+    (*iconv)(EOF, 0, 0);
+    if (!input_codename)
+    {
+	if (is_8bit) {
+	    struct input_code *p = input_code_list;
+	    struct input_code *result = p;
+	    while (p->name){
+		if (p->score < result->score) result = p;
+		++p;
+	    }
+	    set_input_codename(result->name);
+#ifdef CHECK_OPTION
+	    debug(result->name);
+#endif
+	}
+    }
+    return 0;
 }
 
+/*
+ * int options(unsigned char *cp)
+ * 
+ * return values:
+ *    0: success
+ *   -1: ArgumentError
+ */
+static int
+options(unsigned char *cp)
+{
+    nkf_char i, j;
+    unsigned char *p;
+    unsigned char *cp_back = NULL;
+    nkf_encoding *enc;
+
+    if (option_mode==1)
+	return 0;
+    while(*cp && *cp++!='-');
+    while (*cp || cp_back) {
+	if(!*cp){
+	    cp = cp_back;
+	    cp_back = NULL;
+	    continue;
+	}
+	p = 0;
+	switch (*cp++) {
+	case '-':  /* literal options */
+	    if (!*cp || *cp == SP) {        /* ignore the rest of arguments */
+		option_mode = 1;
+		return 0;
+	    }
+	    for (i=0;i<(int)(sizeof(long_option)/sizeof(long_option[0]));i++) {
+		p = (unsigned char *)long_option[i].name;
+		for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
+		if (*p == cp[j] || cp[j] == SP){
+		    p = &cp[j] + 1;
+		    break;
+		}
+		p = 0;
+	    }
+	    if (p == 0) {
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+		fprintf(stderr, "unknown long option: --%s\n", cp);
+#endif
+		return -1;
+	    }
+	    while(*cp && *cp != SP && cp++);
+	    if (long_option[i].alias[0]){
+		cp_back = cp;
+		cp = (unsigned char *)long_option[i].alias;
+	    }else{
 #ifndef PERL_XS
-#ifdef WIN32DLL
-#define fprintf dllprintf
+		if (strcmp(long_option[i].name, "help") == 0){
+		    usage();
+		    exit(EXIT_SUCCESS);
+		}
 #endif
-void usage(void)
-{
-    fprintf(stderr,"USAGE:  nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n");
-    fprintf(stderr,"Flags:\n");
-    fprintf(stderr,"b,u      Output is buffered (DEFAULT),Output is unbuffered\n");
-#ifdef DEFAULT_CODE_SJIS
-    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n");
+		if (strcmp(long_option[i].name, "ic=") == 0){
+		    enc = nkf_enc_find((char *)p);
+		    if (!enc) continue;
+		    input_encoding = enc;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "oc=") == 0){
+		    enc = nkf_enc_find((char *)p);
+		    /* if (enc <= 0) continue; */
+		    if (!enc) continue;
+		    output_encoding = enc;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "guess=") == 0){
+		    if (p[0] == '0' || p[0] == '1') {
+			guess_f = 1;
+		    } else {
+			guess_f = 2;
+		    }
+		    continue;
+		}
+#ifdef OVERWRITE
+		if (strcmp(long_option[i].name, "overwrite") == 0){
+		    file_out_f = TRUE;
+		    overwrite_f = TRUE;
+		    preserve_time_f = TRUE;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "overwrite=") == 0){
+		    file_out_f = TRUE;
+		    overwrite_f = TRUE;
+		    preserve_time_f = TRUE;
+		    backup_f = TRUE;
+		    backup_suffix = (char *)p;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "in-place") == 0){
+		    file_out_f = TRUE;
+		    overwrite_f = TRUE;
+		    preserve_time_f = FALSE;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "in-place=") == 0){
+		    file_out_f = TRUE;
+		    overwrite_f = TRUE;
+		    preserve_time_f = FALSE;
+		    backup_f = TRUE;
+		    backup_suffix = (char *)p;
+		    continue;
+		}
 #endif
-#ifdef DEFAULT_CODE_JIS
-    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n");
+#ifdef INPUT_OPTION
+		if (strcmp(long_option[i].name, "cap-input") == 0){
+		    cap_f = TRUE;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "url-input") == 0){
+		    url_f = TRUE;
+		    continue;
+		}
 #endif
-#ifdef DEFAULT_CODE_EUC
-    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n");
+#ifdef NUMCHAR_OPTION
+		if (strcmp(long_option[i].name, "numchar-input") == 0){
+		    numchar_f = TRUE;
+		    continue;
+		}
+#endif
+#ifdef CHECK_OPTION
+		if (strcmp(long_option[i].name, "no-output") == 0){
+		    noout_f = TRUE;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "debug") == 0){
+		    debug_f = TRUE;
+		    continue;
+		}
 #endif
-#ifdef DEFAULT_CODE_UTF8
-    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n");
+		if (strcmp(long_option[i].name, "cp932") == 0){
+#ifdef SHIFTJIS_CP932
+		    cp51932_f = TRUE;
+		    cp932inv_f = -TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-    fprintf(stderr,"         After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n");
+		    ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-    fprintf(stderr,"J,S,E,W  Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n");
-#ifdef UTF8_INPUT_ENABLE
-    fprintf(stderr,"         After 'W' you can add more options. -W[ 8, 16 [BL] ] \n");
-#endif
-    fprintf(stderr,"t        no conversion\n");
-    fprintf(stderr,"i[@B]    Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n");
-    fprintf(stderr,"o[BJH]   Specify the Esc Seq for ASCII/Roman        (DEFAULT B)\n");
-    fprintf(stderr,"r        {de/en}crypt ROT13/47\n");
-    fprintf(stderr,"h        1 katakana->hiragana, 2 hiragana->katakana, 3 both\n");
-    fprintf(stderr,"v        Show this usage. V: show version\n");
-    fprintf(stderr,"m[BQN0]  MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n");
-    fprintf(stderr,"M[BQ]    MIME encode [B:base64 Q:quoted]\n");
-    fprintf(stderr,"l        ISO8859-1 (Latin-1) support\n");
-    fprintf(stderr,"f/F      Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n");
-    fprintf(stderr,"Z[0-3]   Convert X0208 alphabet to ASCII\n");
-    fprintf(stderr,"         1: Kankaku to 1 space  2: to 2 spaces  3: Convert to HTML Entity\n");
-    fprintf(stderr,"X,x      Assume X0201 kana in MS-Kanji, -x preserves X0201\n");
-    fprintf(stderr,"B[0-2]   Broken input  0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n");
-#ifdef MSDOS
-    fprintf(stderr,"T        Text mode output\n");
-#endif
-    fprintf(stderr,"O        Output to File (DEFAULT 'nkf.out')\n");
-    fprintf(stderr,"I        Convert non ISO-2022-JP charactor to GETA\n");
-    fprintf(stderr,"d,c      Convert line breaks  -d: LF  -c: CRLF\n");
-    fprintf(stderr,"-L[uwm]  line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n");
-    fprintf(stderr,"\n");
-    fprintf(stderr,"Long name options\n");
-    fprintf(stderr," --ic=<input codeset>  --oc=<output codeset>\n");
-    fprintf(stderr,"                   Specify the input or output codeset\n");
-    fprintf(stderr," --fj  --unix --mac  --windows\n");
-    fprintf(stderr," --jis  --euc  --sjis  --utf8  --utf16  --mime  --base64\n");
-    fprintf(stderr,"                   Convert for the system or code\n");
-    fprintf(stderr," --hiragana  --katakana  --katakana-hiragana\n");
-    fprintf(stderr,"                   To Hiragana/Katakana Conversion\n");
-    fprintf(stderr," --prefix=         Insert escape before troublesome characters of Shift_JIS\n");
-#ifdef INPUT_OPTION
-    fprintf(stderr," --cap-input, --url-input  Convert hex after ':' or '%%'\n");
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "no-cp932") == 0){
+#ifdef SHIFTJIS_CP932
+		    cp51932_f = FALSE;
+		    cp932inv_f = FALSE;
 #endif
-#ifdef NUMCHAR_OPTION
-    fprintf(stderr," --numchar-input   Convert Unicode Character Reference\n");
+#ifdef UTF8_OUTPUT_ENABLE
+		    ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+		    continue;
+		}
+#ifdef SHIFTJIS_CP932
+		if (strcmp(long_option[i].name, "cp932inv") == 0){
+		    cp932inv_f = -TRUE;
+		    continue;
+		}
+#endif
+
+#ifdef X0212_ENABLE
+		if (strcmp(long_option[i].name, "x0212") == 0){
+		    x0212_f = TRUE;
+		    continue;
+		}
+#endif
+
+#ifdef EXEC_IO
+		if (strcmp(long_option[i].name, "exec-in") == 0){
+		    exec_f = 1;
+		    return 0;
+		}
+		if (strcmp(long_option[i].name, "exec-out") == 0){
+		    exec_f = -1;
+		    return 0;
+		}
+#endif
+#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
+		if (strcmp(long_option[i].name, "no-cp932ext") == 0){
+		    no_cp932ext_f = TRUE;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
+		    no_best_fit_chars_f = TRUE;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "fb-skip") == 0){
+		    encode_fallback = NULL;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "fb-html") == 0){
+		    encode_fallback = encode_fallback_html;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "fb-xml") == 0){
+		    encode_fallback = encode_fallback_xml;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "fb-java") == 0){
+		    encode_fallback = encode_fallback_java;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "fb-perl") == 0){
+		    encode_fallback = encode_fallback_perl;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "fb-subchar") == 0){
+		    encode_fallback = encode_fallback_subchar;
+		    continue;
+		}
+		if (strcmp(long_option[i].name, "fb-subchar=") == 0){
+		    encode_fallback = encode_fallback_subchar;
+		    unicode_subchar = 0;
+		    if (p[0] != '0'){
+			/* decimal number */
+			for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
+			    unicode_subchar *= 10;
+			    unicode_subchar += hex2bin(p[i]);
+			}
+		    }else if(p[1] == 'x' || p[1] == 'X'){
+			/* hexadecimal number */
+			for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
+			    unicode_subchar <<= 4;
+			    unicode_subchar |= hex2bin(p[i]);
+			}
+		    }else{
+			/* octal number */
+			for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
+			    unicode_subchar *= 8;
+			    unicode_subchar += hex2bin(p[i]);
+			}
+		    }
+		    w16e_conv(unicode_subchar, &i, &j);
+		    unicode_subchar = i<<8 | j;
+		    continue;
+		}
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+		if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
+		    ms_ucs_map_f = UCS_MAP_MS;
+		    continue;
+		}
+#endif
+#ifdef UNICODE_NORMALIZATION
+		if (strcmp(long_option[i].name, "utf8mac-input") == 0){
+		    nfc_f = TRUE;
+		    continue;
+		}
+#endif
+		if (strcmp(long_option[i].name, "prefix=") == 0){
+		    if (nkf_isgraph(p[0])){
+			for (i = 1; nkf_isgraph(p[i]); i++){
+			    prefix_table[p[i]] = p[0];
+			}
+		    }
+		    continue;
+		}
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+		fprintf(stderr, "unsupported long option: --%s\n", long_option[i].name);
+#endif
+		return -1;
+	    }
+	    continue;
+	case 'b':           /* buffered mode */
+	    unbuf_f = FALSE;
+	    continue;
+	case 'u':           /* non bufferd mode */
+	    unbuf_f = TRUE;
+	    continue;
+	case 't':           /* transparent mode */
+	    if (*cp=='1') {
+		/* alias of -t */
+		cp++;
+		nop_f = TRUE;
+	    } else if (*cp=='2') {
+		/*
+		 * -t with put/get
+		 *
+		 * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
+		 *
+		 */
+		cp++;
+		nop_f = 2;
+	    } else
+		nop_f = TRUE;
+	    continue;
+	case 'j':           /* JIS output */
+	case 'n':
+	    output_encoding = nkf_enc_from_index(ISO_2022_JP);
+	    continue;
+	case 'e':           /* AT&T EUC output */
+	    output_encoding = nkf_enc_from_index(EUCJP_NKF);
+	    continue;
+	case 's':           /* SJIS output */
+	    output_encoding = nkf_enc_from_index(SHIFT_JIS);
+	    continue;
+	case 'l':           /* ISO8859 Latin-1 support, no conversion */
+	    iso8859_f = TRUE;  /* Only compatible with ISO-2022-JP */
+	    input_encoding = nkf_enc_from_index(ISO_8859_1);
+	    continue;
+	case 'i':           /* Kanji IN ESC-$-@/B */
+	    if (*cp=='@'||*cp=='B')
+		kanji_intro = *cp++;
+	    continue;
+	case 'o':           /* ASCII IN ESC-(-J/B/H */
+	    /* ESC ( H was used in initial JUNET messages */
+	    if (*cp=='J'||*cp=='B'||*cp=='H')
+		ascii_intro = *cp++;
+	    continue;
+	case 'h':
+	    /*
+	       bit:1   katakana->hiragana
+	       bit:2   hiragana->katakana
+	     */
+	    if ('9'>= *cp && *cp>='0')
+		hira_f |= (*cp++ -'0');
+	    else
+		hira_f |= 1;
+	    continue;
+	case 'r':
+	    rot_f = TRUE;
+	    continue;
+#if defined(MSDOS) || defined(__OS2__)
+	case 'T':
+	    binmode_f = FALSE;
+	    continue;
+#endif
+#ifndef PERL_XS
+	case 'V':
+	    show_configuration();
+	    exit(EXIT_SUCCESS);
+	    break;
+	case 'v':
+	    version();
+	    exit(EXIT_SUCCESS);
+	    break;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+	case 'w':           /* UTF-{8,16,32} output */
+	    if (cp[0] == '8') {
+		cp++;
+		if (cp[0] == '0'){
+		    cp++;
+		    output_encoding = nkf_enc_from_index(UTF_8N);
+		} else {
+		    output_bom_f = TRUE;
+		    output_encoding = nkf_enc_from_index(UTF_8_BOM);
+		}
+	    } else {
+		int enc_idx;
+		if ('1'== cp[0] && '6'==cp[1]) {
+		    cp += 2;
+		    enc_idx = UTF_16;
+		} else if ('3'== cp[0] && '2'==cp[1]) {
+		    cp += 2;
+		    enc_idx = UTF_32;
+		} else {
+		    output_encoding = nkf_enc_from_index(UTF_8);
+		    continue;
+		}
+		if (cp[0]=='L') {
+		    cp++;
+		    output_endian = ENDIAN_LITTLE;
+		    output_bom_f = TRUE;
+		} else if (cp[0] == 'B') {
+		    cp++;
+		    output_bom_f = TRUE;
+		}
+		if (cp[0] == '0'){
+		    output_bom_f = FALSE;
+		    cp++;
+		    enc_idx = enc_idx == UTF_16
+			? (output_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
+			: (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
+		} else {
+		    enc_idx = enc_idx == UTF_16
+			? (output_endian == ENDIAN_LITTLE ? UTF_16LE_BOM : UTF_16BE_BOM)
+			: (output_endian == ENDIAN_LITTLE ? UTF_32LE_BOM : UTF_32BE_BOM);
+		}
+		output_encoding = nkf_enc_from_index(enc_idx);
+	    }
+	    continue;
 #endif
 #ifdef UTF8_INPUT_ENABLE
-    fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n");
-    fprintf(stderr,"                   Specify how nkf handles unassigned characters\n");
+	case 'W':           /* UTF input */
+	    if (cp[0] == '8') {
+		cp++;
+		input_encoding = nkf_enc_from_index(UTF_8);
+	    }else{
+		int enc_idx;
+		if ('1'== cp[0] && '6'==cp[1]) {
+		    cp += 2;
+		    input_endian = ENDIAN_BIG;
+		    enc_idx = UTF_16;
+		} else if ('3'== cp[0] && '2'==cp[1]) {
+		    cp += 2;
+		    input_endian = ENDIAN_BIG;
+		    enc_idx = UTF_32;
+		} else {
+		    input_encoding = nkf_enc_from_index(UTF_8);
+		    continue;
+		}
+		if (cp[0]=='L') {
+		    cp++;
+		    input_endian = ENDIAN_LITTLE;
+		} else if (cp[0] == 'B') {
+		    cp++;
+		    input_endian = ENDIAN_BIG;
+		}
+		enc_idx = (enc_idx == UTF_16
+		    ? (input_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
+		    : (input_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE));
+		input_encoding = nkf_enc_from_index(enc_idx);
+	    }
+	    continue;
 #endif
-#ifdef OVERWRITE
-    fprintf(stderr," --in-place[=SUFFIX]  --overwrite[=SUFFIX]\n");
-    fprintf(stderr,"                   Overwrite original listed files by filtered result\n");
-    fprintf(stderr,"                   --overwrite preserves timestamp of original files\n");
-#endif
-    fprintf(stderr," -g  --guess       Guess the input code\n");
-    fprintf(stderr," --help  --version Show this help/the version\n");
-    fprintf(stderr,"                   For more information, see also man nkf\n");
-    fprintf(stderr,"\n");
-    version();
+	    /* Input code assumption */
+	case 'J':   /* ISO-2022-JP input */
+	    input_encoding = nkf_enc_from_index(ISO_2022_JP);
+	    continue;
+	case 'E':   /* EUC-JP input */
+	    input_encoding = nkf_enc_from_index(EUCJP_NKF);
+	    continue;
+	case 'S':   /* Shift_JIS input */
+	    input_encoding = nkf_enc_from_index(SHIFT_JIS);
+	    continue;
+	case 'Z':   /* Convert X0208 alphabet to asii */
+	    /* alpha_f
+	       bit:0   Convert JIS X 0208 Alphabet to ASCII
+	       bit:1   Convert Kankaku to one space
+	       bit:2   Convert Kankaku to two spaces
+	       bit:3   Convert HTML Entity
+	       bit:4   Convert JIS X 0208 Katakana to JIS X 0201 Katakana
+	     */
+	    while ('0'<= *cp && *cp <='4') {
+		alpha_f |= 1 << (*cp++ - '0');
+	    }
+	    alpha_f |= 1;
+	    continue;
+	case 'x':   /* Convert X0201 kana to X0208 or X0201 Conversion */
+	    x0201_f = FALSE;    /* No X0201->X0208 conversion */
+	    /* accept  X0201
+	       ESC-(-I     in JIS, EUC, MS Kanji
+	       SI/SO       in JIS, EUC, MS Kanji
+	       SS2         in EUC, JIS, not in MS Kanji
+	       MS Kanji (0xa0-0xdf)
+	       output  X0201
+	       ESC-(-I     in JIS (0x20-0x5f)
+	       SS2         in EUC (0xa0-0xdf)
+	       0xa0-0xd    in MS Kanji (0xa0-0xdf)
+	     */
+	    continue;
+	case 'X':   /* Convert X0201 kana to X0208 */
+	    x0201_f = TRUE;
+	    continue;
+	case 'F':   /* prserve new lines */
+	    fold_preserve_f = TRUE;
+	case 'f':   /* folding -f60 or -f */
+	    fold_f = TRUE;
+	    fold_len = 0;
+	    while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
+		fold_len *= 10;
+		fold_len += *cp++ - '0';
+	    }
+	    if (!(0<fold_len && fold_len<BUFSIZ))
+		fold_len = DEFAULT_FOLD;
+	    if (*cp=='-') {
+		fold_margin = 0;
+		cp++;
+		while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
+		    fold_margin *= 10;
+		    fold_margin += *cp++ - '0';
+		}
+	    }
+	    continue;
+	case 'm':   /* MIME support */
+	    /* mime_decode_f = TRUE; */ /* this has too large side effects... */
+	    if (*cp=='B'||*cp=='Q') {
+		mime_decode_mode = *cp++;
+		mimebuf_f = FIXED_MIME;
+	    } else if (*cp=='N') {
+		mime_f = TRUE; cp++;
+	    } else if (*cp=='S') {
+		mime_f = STRICT_MIME; cp++;
+	    } else if (*cp=='0') {
+		mime_decode_f = FALSE;
+		mime_f = FALSE; cp++;
+	    } else {
+		mime_f = STRICT_MIME;
+	    }
+	    continue;
+	case 'M':   /* MIME output */
+	    if (*cp=='B') {
+		mimeout_mode = 'B';
+		mimeout_f = FIXED_MIME; cp++;
+	    } else if (*cp=='Q') {
+		mimeout_mode = 'Q';
+		mimeout_f = FIXED_MIME; cp++;
+	    } else {
+		mimeout_f = TRUE;
+	    }
+	    continue;
+	case 'B':   /* Broken JIS support */
+	    /*  bit:0   no ESC JIS
+	       bit:1   allow any x on ESC-(-x or ESC-$-x
+	       bit:2   reset to ascii on NL
+	     */
+	    if ('9'>= *cp && *cp>='0')
+		broken_f |= 1<<(*cp++ -'0');
+	    else
+		broken_f |= TRUE;
+	    continue;
+#ifndef PERL_XS
+	case 'O':/* for Output file */
+	    file_out_f = TRUE;
+	    continue;
+#endif
+	case 'c':/* add cr code */
+	    eolmode_f = CRLF;
+	    continue;
+	case 'd':/* delete cr code */
+	    eolmode_f = LF;
+	    continue;
+	case 'I':   /* ISO-2022-JP output */
+	    iso2022jp_f = TRUE;
+	    continue;
+	case 'L':  /* line mode */
+	    if (*cp=='u') {         /* unix */
+		eolmode_f = LF; cp++;
+	    } else if (*cp=='m') { /* mac */
+		eolmode_f = CR; cp++;
+	    } else if (*cp=='w') { /* windows */
+		eolmode_f = CRLF; cp++;
+	    } else if (*cp=='0') { /* no conversion  */
+		eolmode_f = 0; cp++;
+	    }
+	    continue;
+#ifndef PERL_XS
+	case 'g':
+	    if ('2' <= *cp && *cp <= '9') {
+		guess_f = 2;
+		cp++;
+	    } else if (*cp == '0' || *cp == '1') {
+		guess_f = 1;
+		cp++;
+	    } else {
+		guess_f = 1;
+	    }
+	    continue;
+#endif
+	case SP:
+	    /* module muliple options in a string are allowed for Perl moudle  */
+	    while(*cp && *cp++!='-');
+	    continue;
+	default:
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+	    fprintf(stderr, "unknown option: -%c\n", *(cp-1));
+#endif
+	    /* bogus option but ignored */
+	    return -1;
+	}
+    }
+    return 0;
 }
 
-void version(void)
+#ifdef WIN32DLL
+#include "nkf32dll.c"
+#elif defined(PERL_XS)
+#else /* WIN32DLL */
+int
+main(int argc, char **argv)
 {
-    fprintf(stderr,"Network Kanji Filter Version %s (%s) "
-#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) && !defined(__OS2__)
-                  "for DOS"
+    FILE  *fin;
+    unsigned char  *cp;
+
+    char *outfname = NULL;
+    char *origfname;
+
+#ifdef EASYWIN /*Easy Win */
+    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
 #endif
-#if defined(MSDOS) && defined(__WIN16__)
-                  "for Win16"
+#ifdef DEFAULT_CODE_LOCALE
+    setlocale(LC_CTYPE, "");
 #endif
-#if defined(MSDOS) && defined(__WIN32__)
-                  "for Win32"
+    nkf_state_init();
+
+    for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
+	cp = (unsigned char *)*argv;
+	options(cp);
+#ifdef EXEC_IO
+	if (exec_f){
+	    int fds[2], pid;
+	    if (pipe(fds) < 0 || (pid = fork()) < 0){
+		abort();
+	    }
+	    if (pid == 0){
+		if (exec_f > 0){
+		    close(fds[0]);
+		    dup2(fds[1], 1);
+		}else{
+		    close(fds[1]);
+		    dup2(fds[0], 0);
+		}
+		execvp(argv[1], &argv[1]);
+	    }
+	    if (exec_f > 0){
+		close(fds[1]);
+		dup2(fds[0], 0);
+	    }else{
+		close(fds[0]);
+		dup2(fds[1], 1);
+	    }
+	    argc = 0;
+	    break;
+	}
+#endif
+    }
+
+    if (guess_f) {
+#ifdef CHECK_OPTION
+	int debug_f_back = debug_f;
 #endif
-#ifdef __OS2__
-                  "for OS/2"
+#ifdef EXEC_IO
+	int exec_f_back = exec_f;
 #endif
-                  ,NKF_VERSION,NKF_RELEASE_DATE);
-    fprintf(stderr,"\n%s\n",CopyRight);
-}
-#endif /*PERL_XS*/
+#ifdef X0212_ENABLE
+	int x0212_f_back = x0212_f;
+#endif
+	int x0213_f_back = x0213_f;
+	int guess_f_back = guess_f;
+	reinit();
+	guess_f = guess_f_back;
+	mime_f = FALSE;
+#ifdef CHECK_OPTION
+	debug_f = debug_f_back;
+#endif
+#ifdef EXEC_IO
+	exec_f = exec_f_back;
+#endif
+	x0212_f = x0212_f_back;
+	x0213_f = x0213_f_back;
+    }
 
-/**
- ** $B%Q%C%A@):n<T(B
- **  void@merope.pleiades.or.jp (Kusakabe Youichi)
- **  NIDE Naoyuki <nide@ics.nara-wu.ac.jp>
- **  ohta@src.ricoh.co.jp (Junn Ohta)
- **  inouet@strl.nhk.or.jp (Tomoyuki Inoue)
- **  kiri@pulser.win.or.jp (Tetsuaki Kiriyama)
- **  Kimihiko Sato <sato@sail.t.u-tokyo.ac.jp>
- **  a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe)
- **  kono@ie.u-ryukyu.ac.jp (Shinji Kono)
- **  GHG00637@nifty-serve.or.jp (COW)
- **
- **/
-
-/* end */
+    if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+	if (freopen("","wb",stdout) == NULL)
+	    return (-1);
+#else
+    setbinmode(stdout);
+#endif
+
+    if (unbuf_f)
+	setbuf(stdout, (char *) NULL);
+    else
+	setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
+
+    if (argc == 0) {
+	if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+	    if (freopen("","rb",stdin) == NULL) return (-1);
+#else
+	setbinmode(stdin);
+#endif
+	setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
+	if (nop_f)
+	    noconvert(stdin);
+	else {
+	    kanji_convert(stdin);
+	    if (guess_f) print_guessed_code(NULL);
+	}
+    } else {
+	int nfiles = argc;
+	int is_argument_error = FALSE;
+	while (argc--) {
+	    input_codename = NULL;
+	    input_eol = 0;
+#ifdef CHECK_OPTION
+	    iconv_for_check = 0;
+#endif
+	    if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
+		perror(*(argv-1));
+		is_argument_error = TRUE;
+		continue;
+	    } else {
+#ifdef OVERWRITE
+		int fd = 0;
+		int fd_backup = 0;
+#endif
+
+		/* reopen file for stdout */
+		if (file_out_f == TRUE) {
+#ifdef OVERWRITE
+		    if (overwrite_f){
+			outfname = nkf_xmalloc(strlen(origfname)
+					  + strlen(".nkftmpXXXXXX")
+					  + 1);
+			strcpy(outfname, origfname);
+#ifdef MSDOS
+			{
+			    int i;
+			    for (i = strlen(outfname); i; --i){
+				if (outfname[i - 1] == '/'
+				    || outfname[i - 1] == '\\'){
+				    break;
+				}
+			    }
+			    outfname[i] = '\0';
+			}
+			strcat(outfname, "ntXXXXXX");
+			mktemp(outfname);
+			fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
+				  S_IREAD | S_IWRITE);
+#else
+			strcat(outfname, ".nkftmpXXXXXX");
+			fd = mkstemp(outfname);
+#endif
+			if (fd < 0
+			    || (fd_backup = dup(fileno(stdout))) < 0
+			    || dup2(fd, fileno(stdout)) < 0
+			   ){
+			    perror(origfname);
+			    return -1;
+			}
+		    }else
+#endif
+		    if(argc == 1) {
+			outfname = *argv++;
+			argc--;
+		    } else {
+			outfname = "nkf.out";
+		    }
+
+		    if(freopen(outfname, "w", stdout) == NULL) {
+			perror (outfname);
+			return (-1);
+		    }
+		    if (binmode_f == TRUE) {
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+			if (freopen("","wb",stdout) == NULL)
+			    return (-1);
+#else
+			setbinmode(stdout);
+#endif
+		    }
+		}
+		if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+		    if (freopen("","rb",fin) == NULL)
+			return (-1);
+#else
+		setbinmode(fin);
+#endif
+		setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
+		if (nop_f)
+		    noconvert(fin);
+		else {
+		    char *filename = NULL;
+		    kanji_convert(fin);
+		    if (nfiles > 1) filename = origfname;
+		    if (guess_f) print_guessed_code(filename);
+		}
+		fclose(fin);
+#ifdef OVERWRITE
+		if (overwrite_f) {
+		    struct stat     sb;
+#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
+		    time_t tb[2];
+#else
+		    struct utimbuf  tb;
+#endif
+
+		    fflush(stdout);
+		    close(fd);
+		    if (dup2(fd_backup, fileno(stdout)) < 0){
+			perror("dup2");
+		    }
+		    if (stat(origfname, &sb)) {
+			fprintf(stderr, "Can't stat %s\n", origfname);
+		    }
+		    /* $B%Q!<%_%C%7%g%s$rI|85(B */
+		    if (chmod(outfname, sb.st_mode)) {
+			fprintf(stderr, "Can't set permission %s\n", outfname);
+		    }
+
+		    /* $B%?%$%`%9%?%s%W$rI|85(B */
+		    if(preserve_time_f){
+#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
+			tb[0] = tb[1] = sb.st_mtime;
+			if (utime(outfname, tb)) {
+			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
+			}
+#else
+			tb.actime  = sb.st_atime;
+			tb.modtime = sb.st_mtime;
+			if (utime(outfname, &tb)) {
+			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
+			}
+#endif
+		    }
+		    if(backup_f){
+			char *backup_filename = get_backup_filename(backup_suffix, origfname);
+#ifdef MSDOS
+			unlink(backup_filename);
+#endif
+			if (rename(origfname, backup_filename)) {
+			    perror(backup_filename);
+			    fprintf(stderr, "Can't rename %s to %s\n",
+				    origfname, backup_filename);
+			}
+			nkf_xfree(backup_filename);
+		    }else{
+#ifdef MSDOS
+			if (unlink(origfname)){
+			    perror(origfname);
+			}
+#endif
+		    }
+		    if (rename(outfname, origfname)) {
+			perror(origfname);
+			fprintf(stderr, "Can't rename %s to %s\n",
+				outfname, origfname);
+		    }
+		    nkf_xfree(outfname);
+		}
+#endif
+	    }
+	}
+	if (is_argument_error)
+	    return(-1);
+    }
+#ifdef EASYWIN /*Easy Win */
+    if (file_out_f == FALSE)
+	scanf("%d",&end_check);
+    else
+	fclose(stdout);
+#else /* for Other OS */
+    if (file_out_f == TRUE)
+	fclose(stdout);
+#endif /*Easy Win */
+    return (0);
+}
+#endif /* WIN32DLL */
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h
new file mode 100644
index 0000000000..dd479a0f87
--- /dev/null
+++ b/ext/nkf/nkf-utf8/nkf.h
@@ -0,0 +1,192 @@
+/*
+ *
+ * nkf.h - Header file for nkf
+ *
+ * $Id$
+ */
+
+#ifndef NKF_H
+
+/* Wrapper of configurations */
+
+#ifndef MIME_DECODE_DEFAULT
+#define MIME_DECODE_DEFAULT STRICT_MIME
+#endif
+#ifndef X0201_DEFAULT
+#define X0201_DEFAULT TRUE
+#endif
+
+#if DEFAULT_NEWLINE == 0x0D0A
+#define PUT_NEWLINE(func) do {\
+    func(0x0D);\
+    func(0x0A);\
+} while (0)
+#define OCONV_NEWLINE(func) do {\
+    func(0, 0x0D);\
+    func(0, 0x0A);\
+} while (0)
+#elif DEFAULT_NEWLINE == 0x0D
+#define PUT_NEWLINE(func) func(0x0D)
+#define OCONV_NEWLINE(func) func(0, 0x0D)
+#else
+#define DEFAULT_NEWLINE 0x0A
+#define PUT_NEWLINE(func) func(0x0A)
+#define OCONV_NEWLINE(func) func(0, 0x0A)
+#endif
+#ifdef HELP_OUTPUT_STDERR
+#define HELP_OUTPUT stderr
+#else
+#define HELP_OUTPUT stdout
+#endif
+
+
+/* Compatibility definitions */
+
+#ifdef nkf_char
+#elif defined(INT_IS_SHORT)
+typedef long nkf_char;
+#define NKF_INT32_C(n)   (n##L)
+#else
+typedef int nkf_char;
+#define NKF_INT32_C(n)   (n)
+#endif
+
+#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || (defined(__WATCOMC__) && defined(__386__) && !defined(__LINUX__)) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
+#define MSDOS
+#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
+#define __WIN32__
+#endif
+#endif
+
+#ifdef PERL_XS
+#undef OVERWRITE
+#endif
+
+#ifndef PERL_XS
+#include <stdio.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(MSDOS) || defined(__OS2__)
+#include <fcntl.h>
+#include <io.h>
+#if defined(_MSC_VER) || defined(__WATCOMC__)
+#define mktemp _mktemp
+#endif
+#endif
+
+#ifdef MSDOS
+#ifdef LSI_C
+#define setbinmode(fp) fsetbin(fp)
+#elif defined(__DJGPP__)
+#include <libc/dosio.h>
+void  setbinmode(FILE *fp)
+{
+    /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
+    int fd, m;
+    fd = fileno(fp);
+    m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
+    __file_handle_set(fd, m);
+}
+#else /* Microsoft C, Turbo C */
+#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
+#endif
+#else /* UNIX */
+#define setbinmode(fp)
+#endif
+
+#ifdef _IOFBF /* SysV and MSDOS, Windows */
+#define       setvbuffer(fp, buf, size)       setvbuf(fp, buf, _IOFBF, size)
+#else /* BSD */
+#define       setvbuffer(fp, buf, size)       setbuffer(fp, buf, size)
+#endif
+
+/*Borland C++ 4.5 EasyWin*/
+#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
+#define         EASYWIN
+#ifndef __WIN16__
+#define __WIN16__
+#endif
+#include <windows.h>
+#endif
+
+#ifdef OVERWRITE
+/* added by satoru@isoternet.org */
+#if defined(__EMX__)
+#include <sys/types.h>
+#endif
+#include <sys/stat.h>
+#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
+#include <unistd.h>
+#if defined(__WATCOMC__)
+#include <sys/utime.h>
+#else
+#include <utime.h>
+#endif
+#else /* defined(MSDOS) */
+#ifdef __WIN32__
+#ifdef __BORLANDC__ /* BCC32 */
+#include <utime.h>
+#else /* !defined(__BORLANDC__) */
+#include <sys/utime.h>
+#endif /* (__BORLANDC__) */
+#else /* !defined(__WIN32__) */
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__)  /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
+#include <sys/utime.h>
+#elif defined(__TURBOC__) /* BCC */
+#include <utime.h>
+#elif defined(LSI_C) /* LSI C */
+#endif /* (__WIN32__) */
+#endif
+#endif
+#endif
+
+#if !defined(DEFAULT_CODE_JIS) && !defined(DEFAULT_CODE_SJIS) && \
+	!defined(DEFAULT_CODE_WINDOWS_31J) && !defined(DEFAULT_CODE_EUC) && \
+	!defined(DEFAULT_CODE_UTF8) && !defined(DEFAULT_CODE_LOCALE)
+#define DEFAULT_CODE_LOCALE
+#endif
+
+#ifdef DEFAULT_CODE_LOCALE
+
+#if defined(__WIN32__) /* not win32 should be posix */
+# ifndef HAVE_LOCALE_H
+#  define HAVE_LOCALE_H
+# endif
+#elif defined(__OS2__)
+# undef HAVE_LANGINFO_H /* We do not use kLIBC's langinfo. */
+# ifndef HAVE_LOCALE_H
+#  define HAVE_LOCALE_H
+# endif
+#elif defined(MSDOS)
+# ifndef HAVE_LOCALE_H
+#  define HAVE_LOCALE_H
+# endif
+#else
+# ifndef HAVE_LANGINFO_H
+#  define HAVE_LANGINFO_H
+# endif
+# ifndef HAVE_LOCALE_H
+#  define HAVE_LOCALE_H
+# endif
+#endif
+
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#endif /* DEFAULT_CODE_LOCALE */
+
+#define         FALSE   0
+#define         TRUE    1
+
+#ifdef WIN32DLL
+#include "nkf32.h"
+#endif
+
+#endif /* NKF_H */
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index e43ad553d6..10eec60c5d 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ b/ext/nkf/nkf-utf8/utf8tbl.c
@@ -1,7 +1,14 @@
+/*
+ * utf8tbl.c - Convertion Table for nkf
+ *
+ * $Id$
+ */
+
 #include "config.h"
+#include "utf8tbl.h"
 
 #ifdef UTF8_OUTPUT_ENABLE
-const unsigned short euc_to_utf8_A1[] = {
+static const unsigned short euc_to_utf8_A1[] = {
          0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
  0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
  0xFF3E, 0x203E, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
@@ -17,7 +24,7 @@ const unsigned short euc_to_utf8_A1[] = {
 };
 
 /* Microsoft UCS Mapping Compatible */
-const unsigned short euc_to_utf8_A1_ms[] = {
+static const unsigned short euc_to_utf8_A1_ms[] = {
          0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
  0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
  0xFF3E, 0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
@@ -31,7 +38,7 @@ const unsigned short euc_to_utf8_A1_ms[] = {
  0xFF04, 0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
  0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
 };
-const unsigned short euc_to_utf8_A2[] = {
+static const unsigned short euc_to_utf8_A2[] = {
          0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
  0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -47,7 +54,7 @@ const unsigned short euc_to_utf8_A2[] = {
 };
 
 /* Microsoft UCS Mapping Compatible */
-const unsigned short euc_to_utf8_A2_ms[] = {
+static const unsigned short euc_to_utf8_A2_ms[] = {
          0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
  0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -61,7 +68,7 @@ const unsigned short euc_to_utf8_A2_ms[] = {
       0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
  0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
 };
-const unsigned short euc_to_utf8_A3[] = {
+static const unsigned short euc_to_utf8_A3[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
  0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
@@ -75,7 +82,7 @@ const unsigned short euc_to_utf8_A3[] = {
  0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
  0xFF58, 0xFF59, 0xFF5A,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_A4[] = {
+static const unsigned short euc_to_utf8_A4[] = {
          0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
  0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
  0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
@@ -89,7 +96,7 @@ const unsigned short euc_to_utf8_A4[] = {
  0x3090, 0x3091, 0x3092, 0x3093,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_A5[] = {
+static const unsigned short euc_to_utf8_A5[] = {
          0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
  0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
  0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
@@ -103,7 +110,7 @@ const unsigned short euc_to_utf8_A5[] = {
  0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_A6[] = {
+static const unsigned short euc_to_utf8_A6[] = {
          0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
  0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
  0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
@@ -117,7 +124,7 @@ const unsigned short euc_to_utf8_A6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_A7[] = {
+static const unsigned short euc_to_utf8_A7[] = {
          0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
  0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
  0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
@@ -131,7 +138,7 @@ const unsigned short euc_to_utf8_A7[] = {
  0x044E, 0x044F,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_A8[] = {
+static const unsigned short euc_to_utf8_A8[] = {
          0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
  0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
  0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
@@ -145,7 +152,7 @@ const unsigned short euc_to_utf8_A8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_A9[] = {
+static const unsigned short euc_to_utf8_A9[] = {
          0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
  0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
  0x246F, 0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,
@@ -159,7 +166,7 @@ const unsigned short euc_to_utf8_A9[] = {
       0,      0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D,
  0x248E, 0x248F, 0x2490,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_AA[] = {
+static const unsigned short euc_to_utf8_AA[] = {
          0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
  0x2167, 0x2168, 0x2169, 0x216A, 0x216B,      0,      0,      0,
       0,      0,      0,      0,      0, 0x2170, 0x2171, 0x2172,
@@ -173,7 +180,7 @@ const unsigned short euc_to_utf8_AA[] = {
  0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_AB[] = {
+static const unsigned short euc_to_utf8_AB[] = {
          0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4,      0, 0x33A1,
  0x33A5, 0x339E, 0x33A2, 0x338E,      0, 0x338F, 0x33C4, 0x3396,
  0x3397, 0x2113, 0x3398, 0x33B3, 0x33B2, 0x33B1, 0x33B0, 0x2109,
@@ -187,7 +194,7 @@ const unsigned short euc_to_utf8_AB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x2116, 0x33CD, 0x2121,      0,
 };
-const unsigned short euc_to_utf8_AC[] = {
+static const unsigned short euc_to_utf8_AC[] = {
          0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
  0x2666,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0x3020, 0x260E, 0x3004,
@@ -201,7 +208,21 @@ const unsigned short euc_to_utf8_AC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_AD[] = {
+static const unsigned short euc_to_utf8_AC_mac[] = {
+         0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
+ 0x2666,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x3020, 0x260E, 0x3004,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x261E, 0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5,
+      0, 0x21E8, 0x21E6, 0x21E7, 0x21E9, 0x2192, 0x2190, 0x2191,
+ 0x2193,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short euc_to_utf8_AD[] = {
          0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
  0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
  0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
@@ -215,7 +236,21 @@ const unsigned short euc_to_utf8_AD[] = {
  0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
  0x221F, 0x22BF, 0x2235, 0x2229, 0x222A,      0, 0x3299,
 };
-const unsigned short euc_to_utf8_AE[] = {
+static const unsigned short euc_to_utf8_AD_mac[] = {
+         0x65E5, 0x6708, 0x706B, 0x6C34, 0x6728, 0x91D1, 0x571F,
+ 0x796D, 0x795D, 0x81EA, 0x81F3, 0x3239, 0x547C, 0x3231, 0x8CC7,
+ 0x540D, 0x3232, 0x5B66, 0x8CA1, 0x793E, 0x7279, 0x76E3, 0x4F01,
+ 0x5354, 0x52B4, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169,      0,
+ 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
+ 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
+ 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x337B,
+ 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
+ 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
+ 0x2252, 0x5927, 0x5C0F, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8,
+ 0x533B, 0x8CA1, 0x512A, 0x52B4, 0x5370, 0x63A7, 0x79D8,
+};
+static const unsigned short euc_to_utf8_AE[] = {
          0x3349, 0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333,
  0x334E, 0x3303, 0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A,
  0x3339, 0x3357, 0x330D, 0x3342, 0x3323, 0x3326, 0x333B, 0x332B,
@@ -229,7 +264,7 @@ const unsigned short euc_to_utf8_AE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0x337F,      0,      0,
 };
-const unsigned short euc_to_utf8_AF[] = {
+static const unsigned short euc_to_utf8_AF[] = {
          0x222E, 0x221F, 0x22BF,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0x301D, 0x301F,      0,
@@ -243,7 +278,7 @@ const unsigned short euc_to_utf8_AF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_B0[] = {
+static const unsigned short euc_to_utf8_B0[] = {
          0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328,
  0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25,
  0x65ED, 0x8466, 0x82A6, 0x9BF5, 0x6893, 0x5727, 0x65A1, 0x6271,
@@ -257,7 +292,7 @@ const unsigned short euc_to_utf8_B0[] = {
  0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1,
  0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D,
 };
-const unsigned short euc_to_utf8_B1[] = {
+static const unsigned short euc_to_utf8_B1[] = {
          0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87,
  0x70CF, 0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11,
  0x7893, 0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B,
@@ -271,7 +306,7 @@ const unsigned short euc_to_utf8_B1[] = {
  0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC,
  0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC,
 };
-const unsigned short euc_to_utf8_B2[] = {
+static const unsigned short euc_to_utf8_B2[] = {
          0x62BC, 0x65FA, 0x6A2A, 0x6B27, 0x6BB4, 0x738B, 0x7FC1,
  0x8956, 0x9D2C, 0x9D0E, 0x9EC4, 0x5CA1, 0x6C96, 0x837B, 0x5104,
  0x5C4B, 0x61B6, 0x81C6, 0x6876, 0x7261, 0x4E59, 0x4FFA, 0x5378,
@@ -285,7 +320,7 @@ const unsigned short euc_to_utf8_B2[] = {
  0x4ECB, 0x4F1A, 0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB,
  0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539,
 };
-const unsigned short euc_to_utf8_B3[] = {
+static const unsigned short euc_to_utf8_B3[] = {
          0x9B41, 0x6666, 0x68B0, 0x6D77, 0x7070, 0x754C, 0x7686,
  0x7D75, 0x82A5, 0x87F9, 0x958B, 0x968E, 0x8C9D, 0x51F1, 0x52BE,
  0x5916, 0x54B3, 0x5BB3, 0x5D16, 0x6168, 0x6982, 0x6DAF, 0x788D,
@@ -299,7 +334,7 @@ const unsigned short euc_to_utf8_B3[] = {
  0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2,
  0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431,
 };
-const unsigned short euc_to_utf8_B4[] = {
+static const unsigned short euc_to_utf8_B4[] = {
          0x7CA5, 0x5208, 0x82C5, 0x74E6, 0x4E7E, 0x4F83, 0x51A0,
  0x5BD2, 0x520A, 0x52D8, 0x52E7, 0x5DFB, 0x559A, 0x582A, 0x59E6,
  0x5B8C, 0x5B98, 0x5BDB, 0x5E72, 0x5E79, 0x60A3, 0x611F, 0x6163,
@@ -313,7 +348,7 @@ const unsigned short euc_to_utf8_B4[] = {
  0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC,
  0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4,
 };
-const unsigned short euc_to_utf8_B5[] = {
+static const unsigned short euc_to_utf8_B5[] = {
          0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948,
  0x5B63, 0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77,
  0x8ECC, 0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100,
@@ -327,7 +362,7 @@ const unsigned short euc_to_utf8_B5[] = {
  0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD,
  0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC,
 };
-const unsigned short euc_to_utf8_B6[] = {
+static const unsigned short euc_to_utf8_B6[] = {
          0x4F9B, 0x4FA0, 0x50D1, 0x5147, 0x7AF6, 0x5171, 0x51F6,
  0x5354, 0x5321, 0x537F, 0x53EB, 0x55AC, 0x5883, 0x5CE1, 0x5F37,
  0x5F4A, 0x602F, 0x6050, 0x606D, 0x631F, 0x6559, 0x6A4B, 0x6CC1,
@@ -341,7 +376,7 @@ const unsigned short euc_to_utf8_B6[] = {
  0x99D2, 0x5177, 0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3,
  0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48,
 };
-const unsigned short euc_to_utf8_B7[] = {
+static const unsigned short euc_to_utf8_B7[] = {
          0x6398, 0x7A9F, 0x6C93, 0x9774, 0x8F61, 0x7AAA, 0x718A,
  0x9688, 0x7C82, 0x6817, 0x7E70, 0x6851, 0x936C, 0x52F2, 0x541B,
  0x85AB, 0x8A13, 0x7FA4, 0x8ECD, 0x90E1, 0x5366, 0x8888, 0x7941,
@@ -355,7 +390,7 @@ const unsigned short euc_to_utf8_B7[] = {
  0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F,
  0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372,
 };
-const unsigned short euc_to_utf8_B8[] = {
+static const unsigned short euc_to_utf8_B8[] = {
          0x691C, 0x6A29, 0x727D, 0x72AC, 0x732E, 0x7814, 0x786F,
  0x7D79, 0x770C, 0x80A9, 0x898B, 0x8B19, 0x8CE2, 0x8ED2, 0x9063,
  0x9375, 0x967A, 0x9855, 0x9A13, 0x9E78, 0x5143, 0x539F, 0x53B3,
@@ -369,7 +404,7 @@ const unsigned short euc_to_utf8_B8[] = {
  0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149,
  0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411,
 };
-const unsigned short euc_to_utf8_B9[] = {
+static const unsigned short euc_to_utf8_B9[] = {
          0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D,
  0x5B8F, 0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7,
  0x5F18, 0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602,
@@ -383,7 +418,7 @@ const unsigned short euc_to_utf8_B9[] = {
  0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09,
  0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC,
 };
-const unsigned short euc_to_utf8_BA[] = {
+static const unsigned short euc_to_utf8_BA[] = {
          0x6B64, 0x9803, 0x4ECA, 0x56F0, 0x5764, 0x58BE, 0x5A5A,
  0x6068, 0x61C7, 0x660F, 0x6606, 0x6839, 0x68B1, 0x6DF7, 0x75D5,
  0x7D3A, 0x826E, 0x9B42, 0x4E9B, 0x4F50, 0x53C9, 0x5506, 0x5D6F,
@@ -397,7 +432,7 @@ const unsigned short euc_to_utf8_BA[] = {
  0x548B, 0x643E, 0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22,
  0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237,
 };
-const unsigned short euc_to_utf8_BB[] = {
+static const unsigned short euc_to_utf8_BB[] = {
          0x5BDF, 0x62F6, 0x64AE, 0x64E6, 0x672D, 0x6BBA, 0x85A9,
  0x96D1, 0x7690, 0x9BD6, 0x634C, 0x9306, 0x9BAB, 0x76BF, 0x6652,
  0x4E09, 0x5098, 0x53C2, 0x5C71, 0x60E8, 0x6492, 0x6563, 0x685F,
@@ -411,7 +446,7 @@ const unsigned short euc_to_utf8_BB[] = {
  0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C,
  0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642,
 };
-const unsigned short euc_to_utf8_BC[] = {
+static const unsigned short euc_to_utf8_BC[] = {
          0x6B21, 0x6ECB, 0x6CBB, 0x723E, 0x74BD, 0x75D4, 0x78C1,
  0x793A, 0x800C, 0x8033, 0x81EA, 0x8494, 0x8F9E, 0x6C50, 0x9E7F,
  0x5F0F, 0x8B58, 0x9D2B, 0x7AFA, 0x8EF8, 0x5B8D, 0x96EB, 0x4E03,
@@ -425,7 +460,7 @@ const unsigned short euc_to_utf8_BC[] = {
  0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF,
  0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468,
 };
-const unsigned short euc_to_utf8_BD[] = {
+static const unsigned short euc_to_utf8_BD[] = {
          0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32,
  0x79C0, 0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490,
  0x8846, 0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C,
@@ -439,7 +474,7 @@ const unsigned short euc_to_utf8_BD[] = {
  0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973,
  0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F,
 };
-const unsigned short euc_to_utf8_BE[] = {
+static const unsigned short euc_to_utf8_BE[] = {
          0x52DD, 0x5320, 0x5347, 0x53EC, 0x54E8, 0x5546, 0x5531,
  0x5617, 0x5968, 0x59BE, 0x5A3C, 0x5BB5, 0x5C06, 0x5C0F, 0x5C11,
  0x5C1A, 0x5E84, 0x5E8A, 0x5EE0, 0x5F70, 0x627F, 0x6284, 0x62DB,
@@ -453,7 +488,7 @@ const unsigned short euc_to_utf8_BE[] = {
  0x60C5, 0x64FE, 0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63,
  0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE,
 };
-const unsigned short euc_to_utf8_BF[] = {
+static const unsigned short euc_to_utf8_BF[] = {
          0x62ED, 0x690D, 0x6B96, 0x71ED, 0x7E54, 0x8077, 0x8272,
  0x89E6, 0x98DF, 0x8755, 0x8FB1, 0x5C3B, 0x4F38, 0x4FE1, 0x4FB5,
  0x5507, 0x5A20, 0x5BDD, 0x5BE9, 0x5FC3, 0x614E, 0x632F, 0x65B0,
@@ -467,7 +502,7 @@ const unsigned short euc_to_utf8_BF[] = {
  0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB,
  0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE,
 };
-const unsigned short euc_to_utf8_C0[] = {
+static const unsigned short euc_to_utf8_C0[] = {
          0x6F84, 0x647A, 0x5BF8, 0x4E16, 0x702C, 0x755D, 0x662F,
  0x51C4, 0x5236, 0x52E2, 0x59D3, 0x5F81, 0x6027, 0x6210, 0x653F,
  0x6574, 0x661F, 0x6674, 0x68F2, 0x6816, 0x6B63, 0x6E05, 0x7272,
@@ -481,7 +516,7 @@ const unsigned short euc_to_utf8_C0[] = {
  0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3,
  0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA,
 };
-const unsigned short euc_to_utf8_C1[] = {
+static const unsigned short euc_to_utf8_C1[] = {
          0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E,
  0x8CCE, 0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE,
  0x524D, 0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3,
@@ -495,7 +530,7 @@ const unsigned short euc_to_utf8_C1[] = {
  0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001,
  0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E,
 };
-const unsigned short euc_to_utf8_C2[] = {
+static const unsigned short euc_to_utf8_C2[] = {
          0x81D3, 0x8535, 0x8D08, 0x9020, 0x4FC3, 0x5074, 0x5247,
  0x5373, 0x606F, 0x6349, 0x675F, 0x6E2C, 0x8DB3, 0x901F, 0x4FD7,
  0x5C5E, 0x8CCA, 0x65CF, 0x7D9A, 0x5352, 0x8896, 0x5176, 0x63C3,
@@ -509,7 +544,7 @@ const unsigned short euc_to_utf8_C2[] = {
  0x5B85, 0x6258, 0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17,
  0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA,
 };
-const unsigned short euc_to_utf8_C3[] = {
+static const unsigned short euc_to_utf8_C3[] = {
          0x53E9, 0x4F46, 0x9054, 0x8FB0, 0x596A, 0x8131, 0x5DFD,
  0x7AEA, 0x8FBF, 0x68DA, 0x8C37, 0x72F8, 0x9C48, 0x6A3D, 0x8AB0,
  0x4E39, 0x5358, 0x5606, 0x5766, 0x62C5, 0x63A2, 0x65E6, 0x6B4E,
@@ -523,7 +558,7 @@ const unsigned short euc_to_utf8_C3[] = {
  0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7,
  0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5,
 };
-const unsigned short euc_to_utf8_C4[] = {
+static const unsigned short euc_to_utf8_C4[] = {
          0x5E16, 0x5E33, 0x5E81, 0x5F14, 0x5F35, 0x5F6B, 0x5FB4,
  0x61F2, 0x6311, 0x66A2, 0x671D, 0x6F6E, 0x7252, 0x753A, 0x773A,
  0x8074, 0x8139, 0x8178, 0x8776, 0x8ABF, 0x8ADC, 0x8D85, 0x8DF3,
@@ -537,7 +572,7 @@ const unsigned short euc_to_utf8_C4[] = {
  0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E,
  0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013,
 };
-const unsigned short euc_to_utf8_C5[] = {
+static const unsigned short euc_to_utf8_C5[] = {
          0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2,
  0x6575, 0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2,
  0x5FB9, 0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929,
@@ -551,7 +586,7 @@ const unsigned short euc_to_utf8_C5[] = {
  0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8,
  0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230,
 };
-const unsigned short euc_to_utf8_C6[] = {
+static const unsigned short euc_to_utf8_C6[] = {
          0x8463, 0x8569, 0x85E4, 0x8A0E, 0x8B04, 0x8C46, 0x8E0F,
  0x9003, 0x900F, 0x9419, 0x9676, 0x982D, 0x9A30, 0x95D8, 0x50CD,
  0x52D5, 0x540C, 0x5802, 0x5C0E, 0x61A7, 0x649E, 0x6D1E, 0x77B3,
@@ -565,7 +600,7 @@ const unsigned short euc_to_utf8_C6[] = {
  0x8EDF, 0x96E3, 0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302,
  0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165,
 };
-const unsigned short euc_to_utf8_C7[] = {
+static const unsigned short euc_to_utf8_C7[] = {
          0x5982, 0x5C3F, 0x97EE, 0x4EFB, 0x598A, 0x5FCD, 0x8A8D,
  0x6FE1, 0x79B0, 0x7962, 0x5BE7, 0x8471, 0x732B, 0x71B1, 0x5E74,
  0x5FF5, 0x637B, 0x649A, 0x71C3, 0x7C98, 0x4E43, 0x5EFC, 0x4E4B,
@@ -579,7 +614,7 @@ const unsigned short euc_to_utf8_C7[] = {
  0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB,
  0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6,
 };
-const unsigned short euc_to_utf8_C8[] = {
+static const unsigned short euc_to_utf8_C8[] = {
          0x51FD, 0x7BB1, 0x7872, 0x7BB8, 0x8087, 0x7B48, 0x6AE8,
  0x5E61, 0x808C, 0x7551, 0x7560, 0x516B, 0x9262, 0x6E8C, 0x767A,
  0x9197, 0x9AEA, 0x4F10, 0x7F70, 0x629C, 0x7B4F, 0x95A5, 0x9CE9,
@@ -593,7 +628,7 @@ const unsigned short euc_to_utf8_C8[] = {
  0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099,
  0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E,
 };
-const unsigned short euc_to_utf8_C9[] = {
+static const unsigned short euc_to_utf8_C9[] = {
          0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66,
  0x819D, 0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C,
  0x6867, 0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A,
@@ -607,7 +642,7 @@ const unsigned short euc_to_utf8_C9[] = {
  0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8,
  0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D,
 };
-const unsigned short euc_to_utf8_CA[] = {
+static const unsigned short euc_to_utf8_CA[] = {
          0x798F, 0x8179, 0x8907, 0x8986, 0x6DF5, 0x5F17, 0x6255,
  0x6CB8, 0x4ECF, 0x7269, 0x9B92, 0x5206, 0x543B, 0x5674, 0x58B3,
  0x61A4, 0x626E, 0x711A, 0x596E, 0x7C89, 0x7CDE, 0x7D1B, 0x96F0,
@@ -621,7 +656,7 @@ const unsigned short euc_to_utf8_CA[] = {
  0x4FF8, 0x5305, 0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF,
  0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B,
 };
-const unsigned short euc_to_utf8_CB[] = {
+static const unsigned short euc_to_utf8_CB[] = {
          0x6CD5, 0x6CE1, 0x70F9, 0x7832, 0x7E2B, 0x80DE, 0x82B3,
  0x840C, 0x84EC, 0x8702, 0x8912, 0x8A2A, 0x8C4A, 0x90A6, 0x92D2,
  0x98FD, 0x9CF3, 0x9D6C, 0x4E4F, 0x4EA1, 0x508D, 0x5256, 0x574A,
@@ -635,7 +670,7 @@ const unsigned short euc_to_utf8_CB[] = {
  0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB,
  0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80,
 };
-const unsigned short euc_to_utf8_CC[] = {
+static const unsigned short euc_to_utf8_CC[] = {
          0x6F2B, 0x8513, 0x5473, 0x672A, 0x9B45, 0x5DF3, 0x7B95,
  0x5CAC, 0x5BC6, 0x871C, 0x6E4A, 0x84D1, 0x7A14, 0x8108, 0x5999,
  0x7C8D, 0x6C11, 0x7720, 0x52D9, 0x5922, 0x7121, 0x725F, 0x77DB,
@@ -649,7 +684,7 @@ const unsigned short euc_to_utf8_CC[] = {
  0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756,
  0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652,
 };
-const unsigned short euc_to_utf8_CD[] = {
+static const unsigned short euc_to_utf8_CD[] = {
          0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB,
  0x5BA5, 0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67,
  0x6D8C, 0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A,
@@ -663,7 +698,7 @@ const unsigned short euc_to_utf8_CD[] = {
  0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7,
  0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483,
 };
-const unsigned short euc_to_utf8_CE[] = {
+static const unsigned short euc_to_utf8_CE[] = {
          0x75E2, 0x88CF, 0x88E1, 0x91CC, 0x96E2, 0x9678, 0x5F8B,
  0x7387, 0x7ACB, 0x844E, 0x63A0, 0x7565, 0x5289, 0x6D41, 0x6E9C,
  0x7409, 0x7559, 0x786B, 0x7C92, 0x9686, 0x7ADC, 0x9F8D, 0x4FB6,
@@ -677,7 +712,7 @@ const unsigned short euc_to_utf8_CE[] = {
  0x9F62, 0x66A6, 0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9,
  0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F,
 };
-const unsigned short euc_to_utf8_CF[] = {
+static const unsigned short euc_to_utf8_CF[] = {
          0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
  0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
  0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
@@ -691,7 +726,7 @@ const unsigned short euc_to_utf8_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_D0[] = {
+static const unsigned short euc_to_utf8_D0[] = {
          0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C,
  0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A,
  0x8212, 0x5F0D, 0x4E8E, 0x4E9E, 0x4E9F, 0x4EA0, 0x4EA2, 0x4EB0,
@@ -705,7 +740,7 @@ const unsigned short euc_to_utf8_D0[] = {
  0x5043, 0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056,
  0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2,
 };
-const unsigned short euc_to_utf8_D1[] = {
+static const unsigned short euc_to_utf8_D1[] = {
          0x50C9, 0x50CA, 0x50B3, 0x50C2, 0x50D6, 0x50DE, 0x50E5,
  0x50ED, 0x50E3, 0x50EE, 0x50F9, 0x50F5, 0x5109, 0x5101, 0x5102,
  0x5116, 0x5115, 0x5114, 0x511A, 0x5121, 0x513A, 0x5137, 0x513C,
@@ -719,7 +754,7 @@ const unsigned short euc_to_utf8_D1[] = {
  0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D,
  0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8,
 };
-const unsigned short euc_to_utf8_D2[] = {
+static const unsigned short euc_to_utf8_D2[] = {
          0x8FA7, 0x52AC, 0x52AD, 0x52BC, 0x52B5, 0x52C1, 0x52CD,
  0x52D7, 0x52DE, 0x52E3, 0x52E6, 0x98ED, 0x52E0, 0x52F3, 0x52F5,
  0x52F8, 0x52F9, 0x5306, 0x5308, 0x7538, 0x530D, 0x5310, 0x530F,
@@ -733,7 +768,7 @@ const unsigned short euc_to_utf8_D2[] = {
  0x5492, 0x547B, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7,
  0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8,
 };
-const unsigned short euc_to_utf8_D3[] = {
+static const unsigned short euc_to_utf8_D3[] = {
          0x54AB, 0x54C2, 0x54A4, 0x54BE, 0x54BC, 0x54D8, 0x54E5,
  0x54E6, 0x550F, 0x5514, 0x54FD, 0x54EE, 0x54ED, 0x54FA, 0x54E2,
  0x5539, 0x5540, 0x5563, 0x554C, 0x552E, 0x555C, 0x5545, 0x5556,
@@ -747,7 +782,7 @@ const unsigned short euc_to_utf8_D3[] = {
  0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3,
  0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709,
 };
-const unsigned short euc_to_utf8_D4[] = {
+static const unsigned short euc_to_utf8_D4[] = {
          0x5708, 0x570B, 0x570D, 0x5713, 0x5718, 0x5716, 0x55C7,
  0x571C, 0x5726, 0x5737, 0x5738, 0x574E, 0x573B, 0x5740, 0x574F,
  0x5769, 0x57C0, 0x5788, 0x5761, 0x577F, 0x5789, 0x5793, 0x57A0,
@@ -761,7 +796,7 @@ const unsigned short euc_to_utf8_D4[] = {
  0x592D, 0x5932, 0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E,
  0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969,
 };
-const unsigned short euc_to_utf8_D5[] = {
+static const unsigned short euc_to_utf8_D5[] = {
          0x5978, 0x5981, 0x599D, 0x4F5E, 0x4FAB, 0x59A3, 0x59B2,
  0x59C6, 0x59E8, 0x59DC, 0x598D, 0x59D9, 0x59DA, 0x5A25, 0x5A1F,
  0x5A11, 0x5A1C, 0x5A09, 0x5A1A, 0x5A40, 0x5A6C, 0x5A49, 0x5A35,
@@ -775,7 +810,7 @@ const unsigned short euc_to_utf8_D5[] = {
  0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22,
  0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53,
 };
-const unsigned short euc_to_utf8_D6[] = {
+static const unsigned short euc_to_utf8_D6[] = {
          0x5C50, 0x5C4F, 0x5B71, 0x5C6C, 0x5C6E, 0x4E62, 0x5C76,
  0x5C79, 0x5C8C, 0x5C91, 0x5C94, 0x599B, 0x5CAB, 0x5CBB, 0x5CB6,
  0x5CBC, 0x5CB7, 0x5CC5, 0x5CBE, 0x5CC7, 0x5CD9, 0x5CE9, 0x5CFD,
@@ -789,7 +824,7 @@ const unsigned short euc_to_utf8_D6[] = {
  0x5E5F, 0x5E62, 0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC,
  0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF,
 };
-const unsigned short euc_to_utf8_D7[] = {
+static const unsigned short euc_to_utf8_D7[] = {
          0x5ED6, 0x5EE3, 0x5EDD, 0x5EDA, 0x5EDB, 0x5EE2, 0x5EE1,
  0x5EE8, 0x5EE9, 0x5EEC, 0x5EF1, 0x5EF3, 0x5EF0, 0x5EF4, 0x5EF8,
  0x5EFE, 0x5F03, 0x5F09, 0x5F5D, 0x5F5C, 0x5F0B, 0x5F11, 0x5F16,
@@ -803,7 +838,7 @@ const unsigned short euc_to_utf8_D7[] = {
  0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C,
  0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A,
 };
-const unsigned short euc_to_utf8_D8[] = {
+static const unsigned short euc_to_utf8_D8[] = {
          0x6084, 0x609B, 0x6096, 0x6097, 0x6092, 0x60A7, 0x608B,
  0x60E1, 0x60B8, 0x60E0, 0x60D3, 0x60B4, 0x5FF0, 0x60BD, 0x60C6,
  0x60B5, 0x60D8, 0x614D, 0x6115, 0x6106, 0x60F6, 0x60F7, 0x6100,
@@ -817,7 +852,7 @@ const unsigned short euc_to_utf8_D8[] = {
  0x61E3, 0x61F6, 0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE,
  0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B,
 };
-const unsigned short euc_to_utf8_D9[] = {
+static const unsigned short euc_to_utf8_D9[] = {
          0x621E, 0x6221, 0x622A, 0x622E, 0x6230, 0x6232, 0x6233,
  0x6241, 0x624E, 0x625E, 0x6263, 0x625B, 0x6260, 0x6268, 0x627C,
  0x6282, 0x6289, 0x627E, 0x6292, 0x6293, 0x6296, 0x62D4, 0x6283,
@@ -831,7 +866,7 @@ const unsigned short euc_to_utf8_D9[] = {
  0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E,
  0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC,
 };
-const unsigned short euc_to_utf8_DA[] = {
+static const unsigned short euc_to_utf8_DA[] = {
          0x64DA, 0x64D2, 0x64C5, 0x64C7, 0x64BB, 0x64D8, 0x64C2,
  0x64F1, 0x64E7, 0x8209, 0x64E0, 0x64E1, 0x62AC, 0x64E3, 0x64EF,
  0x652C, 0x64F6, 0x64F4, 0x64F2, 0x64FA, 0x6500, 0x64FD, 0x6518,
@@ -845,7 +880,7 @@ const unsigned short euc_to_utf8_DA[] = {
  0x665F, 0x6662, 0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684,
  0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC,
 };
-const unsigned short euc_to_utf8_DB[] = {
+static const unsigned short euc_to_utf8_DB[] = {
          0x66C4, 0x66B8, 0x66D6, 0x66DA, 0x66E0, 0x663F, 0x66E6,
  0x66E9, 0x66F0, 0x66F5, 0x66F7, 0x670F, 0x6716, 0x671E, 0x6726,
  0x6727, 0x9738, 0x672E, 0x673F, 0x6736, 0x6741, 0x6738, 0x6737,
@@ -859,7 +894,7 @@ const unsigned short euc_to_utf8_DB[] = {
  0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA,
  0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD,
 };
-const unsigned short euc_to_utf8_DC[] = {
+static const unsigned short euc_to_utf8_DC[] = {
          0x68D4, 0x68E7, 0x68D5, 0x6936, 0x6912, 0x6904, 0x68D7,
  0x68E3, 0x6925, 0x68F9, 0x68E0, 0x68EF, 0x6928, 0x692A, 0x691A,
  0x6923, 0x6921, 0x68C6, 0x6979, 0x6977, 0x695C, 0x6978, 0x696B,
@@ -873,7 +908,7 @@ const unsigned short euc_to_utf8_DC[] = {
  0x6A36, 0x6A78, 0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38,
  0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3,
 };
-const unsigned short euc_to_utf8_DD[] = {
+static const unsigned short euc_to_utf8_DD[] = {
          0x6A97, 0x8617, 0x6ABB, 0x6AC3, 0x6AC2, 0x6AB8, 0x6AB3,
  0x6AAC, 0x6ADE, 0x6AD1, 0x6ADF, 0x6AAA, 0x6ADA, 0x6AEA, 0x6AFB,
  0x6B05, 0x8616, 0x6AFA, 0x6B12, 0x6B16, 0x9B31, 0x6B1F, 0x6B38,
@@ -887,7 +922,7 @@ const unsigned short euc_to_utf8_DD[] = {
  0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3,
  0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE,
 };
-const unsigned short euc_to_utf8_DE[] = {
+static const unsigned short euc_to_utf8_DE[] = {
          0x6CBA, 0x6CDB, 0x6CEF, 0x6CD9, 0x6CEA, 0x6D1F, 0x884D,
  0x6D36, 0x6D2B, 0x6D3D, 0x6D38, 0x6D19, 0x6D35, 0x6D33, 0x6D12,
  0x6D0C, 0x6D63, 0x6D93, 0x6D64, 0x6D5A, 0x6D79, 0x6D59, 0x6D8E,
@@ -901,7 +936,7 @@ const unsigned short euc_to_utf8_DE[] = {
  0x6EA5, 0x6EC2, 0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8,
  0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC,
 };
-const unsigned short euc_to_utf8_DF[] = {
+static const unsigned short euc_to_utf8_DF[] = {
          0x6F3E, 0x6F13, 0x6EF7, 0x6F86, 0x6F7A, 0x6F78, 0x6F81,
  0x6F80, 0x6F6F, 0x6F5B, 0x6FF3, 0x6F6D, 0x6F82, 0x6F7C, 0x6F58,
  0x6F8E, 0x6F91, 0x6FC2, 0x6F66, 0x6FB3, 0x6FA3, 0x6FA1, 0x6FA4,
@@ -915,7 +950,7 @@ const unsigned short euc_to_utf8_DF[] = {
  0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9,
  0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC,
 };
-const unsigned short euc_to_utf8_E0[] = {
+static const unsigned short euc_to_utf8_E0[] = {
          0x71F9, 0x71FF, 0x720D, 0x7210, 0x721B, 0x7228, 0x722D,
  0x722C, 0x7230, 0x7232, 0x723B, 0x723C, 0x723F, 0x7240, 0x7246,
  0x724B, 0x7258, 0x7274, 0x727E, 0x7282, 0x7281, 0x7287, 0x7292,
@@ -929,7 +964,7 @@ const unsigned short euc_to_utf8_E0[] = {
  0x7441, 0x745C, 0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E,
  0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1,
 };
-const unsigned short euc_to_utf8_E1[] = {
+static const unsigned short euc_to_utf8_E1[] = {
          0x74E0, 0x74E3, 0x74E7, 0x74E9, 0x74EE, 0x74F2, 0x74F0,
  0x74F1, 0x74F8, 0x74F7, 0x7504, 0x7503, 0x7505, 0x750C, 0x750E,
  0x750D, 0x7515, 0x7513, 0x751E, 0x7526, 0x752C, 0x753C, 0x7544,
@@ -943,7 +978,7 @@ const unsigned short euc_to_utf8_E1[] = {
  0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661,
  0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670,
 };
-const unsigned short euc_to_utf8_E2[] = {
+static const unsigned short euc_to_utf8_E2[] = {
          0x7672, 0x7676, 0x7678, 0x767C, 0x7680, 0x7683, 0x7688,
  0x768B, 0x768E, 0x7696, 0x7693, 0x7699, 0x769A, 0x76B0, 0x76B4,
  0x76B8, 0x76B9, 0x76BA, 0x76C2, 0x76CD, 0x76D6, 0x76D2, 0x76DE,
@@ -957,7 +992,7 @@ const unsigned short euc_to_utf8_E2[] = {
  0x789A, 0x788C, 0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6,
  0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC,
 };
-const unsigned short euc_to_utf8_E3[] = {
+static const unsigned short euc_to_utf8_E3[] = {
          0x78E7, 0x78DA, 0x78FD, 0x78F4, 0x7907, 0x7912, 0x7911,
  0x7919, 0x792C, 0x792B, 0x7940, 0x7960, 0x7957, 0x795F, 0x795A,
  0x7955, 0x7953, 0x797A, 0x797F, 0x798A, 0x799D, 0x79A7, 0x9F4B,
@@ -971,7 +1006,7 @@ const unsigned short euc_to_utf8_E3[] = {
  0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33,
  0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50,
 };
-const unsigned short euc_to_utf8_E4[] = {
+static const unsigned short euc_to_utf8_E4[] = {
          0x7B7A, 0x7B04, 0x7B4D, 0x7B0B, 0x7B4C, 0x7B45, 0x7B75,
  0x7B65, 0x7B74, 0x7B67, 0x7B70, 0x7B71, 0x7B6C, 0x7B6E, 0x7B9D,
  0x7B98, 0x7B9F, 0x7B8D, 0x7B9C, 0x7B9A, 0x7B8B, 0x7B92, 0x7B8F,
@@ -985,7 +1020,7 @@ const unsigned short euc_to_utf8_E4[] = {
  0x7CBD, 0x7CC0, 0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2,
  0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06,
 };
-const unsigned short euc_to_utf8_E5[] = {
+static const unsigned short euc_to_utf8_E5[] = {
          0x7D02, 0x7D1C, 0x7D15, 0x7D0A, 0x7D45, 0x7D4B, 0x7D2E,
  0x7D32, 0x7D3F, 0x7D35, 0x7D46, 0x7D73, 0x7D56, 0x7D4E, 0x7D72,
  0x7D68, 0x7D6E, 0x7D4F, 0x7D63, 0x7D93, 0x7D89, 0x7D5B, 0x7D8F,
@@ -999,7 +1034,7 @@ const unsigned short euc_to_utf8_E5[] = {
  0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93,
  0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A,
 };
-const unsigned short euc_to_utf8_E6[] = {
+static const unsigned short euc_to_utf8_E6[] = {
          0x7F45, 0x7F4C, 0x7F4D, 0x7F4E, 0x7F50, 0x7F51, 0x7F55,
  0x7F54, 0x7F58, 0x7F5F, 0x7F60, 0x7F68, 0x7F69, 0x7F67, 0x7F78,
  0x7F82, 0x7F86, 0x7F83, 0x7F88, 0x7F87, 0x7F8C, 0x7F94, 0x7F9E,
@@ -1013,7 +1048,7 @@ const unsigned short euc_to_utf8_E6[] = {
  0x80DB, 0x80E5, 0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109,
  0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B,
 };
-const unsigned short euc_to_utf8_E7[] = {
+static const unsigned short euc_to_utf8_E7[] = {
          0x968B, 0x8146, 0x813E, 0x8153, 0x8151, 0x80FC, 0x8171,
  0x816E, 0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818A, 0x8180,
  0x8182, 0x81A0, 0x8195, 0x81A4, 0x81A3, 0x815F, 0x8193, 0x81A9,
@@ -1027,7 +1062,7 @@ const unsigned short euc_to_utf8_E7[] = {
  0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303,
  0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9,
 };
-const unsigned short euc_to_utf8_E8[] = {
+static const unsigned short euc_to_utf8_E8[] = {
          0x8335, 0x8334, 0x8316, 0x8332, 0x8331, 0x8340, 0x8339,
  0x8350, 0x8345, 0x832F, 0x832B, 0x8317, 0x8318, 0x8385, 0x839A,
  0x83AA, 0x839F, 0x83A2, 0x8396, 0x8323, 0x838E, 0x8387, 0x838A,
@@ -1041,7 +1076,7 @@ const unsigned short euc_to_utf8_E8[] = {
  0x84A1, 0x8521, 0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F,
  0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548,
 };
-const unsigned short euc_to_utf8_E9[] = {
+static const unsigned short euc_to_utf8_E9[] = {
          0x8541, 0x8602, 0x854B, 0x8555, 0x8580, 0x85A4, 0x8588,
  0x8591, 0x858A, 0x85A8, 0x856D, 0x8594, 0x859B, 0x85EA, 0x8587,
  0x859C, 0x8577, 0x857E, 0x8590, 0x85C9, 0x85BA, 0x85CF, 0x85B9,
@@ -1055,7 +1090,7 @@ const unsigned short euc_to_utf8_E9[] = {
  0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778,
  0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759,
 };
-const unsigned short euc_to_utf8_EA[] = {
+static const unsigned short euc_to_utf8_EA[] = {
          0x8753, 0x8763, 0x876A, 0x8805, 0x87A2, 0x879F, 0x8782,
  0x87AF, 0x87CB, 0x87BD, 0x87C0, 0x87D0, 0x96D6, 0x87AB, 0x87C4,
  0x87B3, 0x87C7, 0x87C6, 0x87BB, 0x87EF, 0x87F2, 0x87E0, 0x880F,
@@ -1069,7 +1104,7 @@ const unsigned short euc_to_utf8_EA[] = {
  0x8913, 0x8943, 0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944,
  0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E,
 };
-const unsigned short euc_to_utf8_EB[] = {
+static const unsigned short euc_to_utf8_EB[] = {
          0x8966, 0x8964, 0x896D, 0x896A, 0x896F, 0x8974, 0x8977,
  0x897E, 0x8983, 0x8988, 0x898A, 0x8993, 0x8998, 0x89A1, 0x89A9,
  0x89A6, 0x89AC, 0x89AF, 0x89B2, 0x89BA, 0x89BD, 0x89BF, 0x89C0,
@@ -1083,7 +1118,7 @@ const unsigned short euc_to_utf8_EB[] = {
  0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C,
  0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B,
 };
-const unsigned short euc_to_utf8_EC[] = {
+static const unsigned short euc_to_utf8_EC[] = {
          0x8B5F, 0x8B6C, 0x8B6F, 0x8B74, 0x8B7D, 0x8B80, 0x8B8C,
  0x8B8E, 0x8B92, 0x8B93, 0x8B96, 0x8B99, 0x8B9A, 0x8C3A, 0x8C41,
  0x8C3F, 0x8C48, 0x8C4C, 0x8C4E, 0x8C50, 0x8C55, 0x8C62, 0x8C6C,
@@ -1097,7 +1132,7 @@ const unsigned short euc_to_utf8_EC[] = {
  0x8DDF, 0x8DE3, 0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E,
  0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A,
 };
-const unsigned short euc_to_utf8_ED[] = {
+static const unsigned short euc_to_utf8_ED[] = {
          0x8E47, 0x8E49, 0x8E4C, 0x8E50, 0x8E48, 0x8E59, 0x8E64,
  0x8E60, 0x8E2A, 0x8E63, 0x8E55, 0x8E76, 0x8E72, 0x8E7C, 0x8E81,
  0x8E87, 0x8E85, 0x8E84, 0x8E8B, 0x8E8A, 0x8E93, 0x8E91, 0x8E94,
@@ -1111,7 +1146,7 @@ const unsigned short euc_to_utf8_ED[] = {
  0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E,
  0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8,
 };
-const unsigned short euc_to_utf8_EE[] = {
+static const unsigned short euc_to_utf8_EE[] = {
          0x904F, 0x9050, 0x9051, 0x9052, 0x900E, 0x9049, 0x903E,
  0x9056, 0x9058, 0x905E, 0x9068, 0x906F, 0x9076, 0x96A8, 0x9072,
  0x9082, 0x907D, 0x9081, 0x9080, 0x908A, 0x9089, 0x908F, 0x90A8,
@@ -1125,7 +1160,7 @@ const unsigned short euc_to_utf8_EE[] = {
  0x924B, 0x9250, 0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF,
  0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E,
 };
-const unsigned short euc_to_utf8_EF[] = {
+static const unsigned short euc_to_utf8_EF[] = {
          0x9319, 0x9322, 0x931A, 0x9323, 0x933A, 0x9335, 0x933B,
  0x935C, 0x9360, 0x937C, 0x936E, 0x9356, 0x93B0, 0x93AC, 0x93AD,
  0x9394, 0x93B9, 0x93D6, 0x93D7, 0x93E8, 0x93E5, 0x93D8, 0x93C3,
@@ -1139,7 +1174,7 @@ const unsigned short euc_to_utf8_EF[] = {
  0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F,
  0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E,
 };
-const unsigned short euc_to_utf8_F0[] = {
+static const unsigned short euc_to_utf8_F0[] = {
          0x965D, 0x965F, 0x9666, 0x9672, 0x966C, 0x968D, 0x9698,
  0x9695, 0x9697, 0x96AA, 0x96A7, 0x96B1, 0x96B2, 0x96B0, 0x96B4,
  0x96B6, 0x96B8, 0x96B9, 0x96CE, 0x96CB, 0x96C9, 0x96CD, 0x894D,
@@ -1153,7 +1188,7 @@ const unsigned short euc_to_utf8_F0[] = {
  0x97F6, 0x97F5, 0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837,
  0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870,
 };
-const unsigned short euc_to_utf8_F1[] = {
+static const unsigned short euc_to_utf8_F1[] = {
          0x9871, 0x9874, 0x9873, 0x98AA, 0x98AF, 0x98B1, 0x98B6,
  0x98C4, 0x98C3, 0x98C6, 0x98E9, 0x98EB, 0x9903, 0x9909, 0x9912,
  0x9914, 0x9918, 0x9921, 0x991D, 0x991E, 0x9924, 0x9920, 0x992C,
@@ -1167,7 +1202,7 @@ const unsigned short euc_to_utf8_F1[] = {
  0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3,
  0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7,
 };
-const unsigned short euc_to_utf8_F2[] = {
+static const unsigned short euc_to_utf8_F2[] = {
          0x9AFB, 0x9B06, 0x9B18, 0x9B1A, 0x9B1F, 0x9B22, 0x9B23,
  0x9B25, 0x9B27, 0x9B28, 0x9B29, 0x9B2A, 0x9B2E, 0x9B2F, 0x9B32,
  0x9B44, 0x9B43, 0x9B4F, 0x9B4D, 0x9B4E, 0x9B51, 0x9B58, 0x9B74,
@@ -1181,7 +1216,7 @@ const unsigned short euc_to_utf8_F2[] = {
  0x9D03, 0x9D06, 0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44,
  0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48,
 };
-const unsigned short euc_to_utf8_F3[] = {
+static const unsigned short euc_to_utf8_F3[] = {
          0x9D5D, 0x9D5E, 0x9D64, 0x9D51, 0x9D50, 0x9D59, 0x9D72,
  0x9D89, 0x9D87, 0x9DAB, 0x9D6F, 0x9D7A, 0x9D9A, 0x9DA4, 0x9DA9,
  0x9DB2, 0x9DC4, 0x9DC1, 0x9DBB, 0x9DB8, 0x9DBA, 0x9DC6, 0x9DCF,
@@ -1195,7 +1230,7 @@ const unsigned short euc_to_utf8_F3[] = {
  0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C,
  0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0,
 };
-const unsigned short euc_to_utf8_F4[] = {
+static const unsigned short euc_to_utf8_F4[] = {
          0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -1209,7 +1244,7 @@ const unsigned short euc_to_utf8_F4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_F5[] = {
+static const unsigned short euc_to_utf8_F5[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFE33,      0,      0,      0,      0,      0,
@@ -1223,7 +1258,7 @@ const unsigned short euc_to_utf8_F5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_F9[] = {
+static const unsigned short euc_to_utf8_F9[] = {
          0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB,
  0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC,
  0x4F00, 0x4F03, 0x4F39, 0x4F56, 0x4F92, 0x4F8A, 0x4F9A, 0x4F94,
@@ -1237,7 +1272,7 @@ const unsigned short euc_to_utf8_F9[] = {
  0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D,
  0x5DB8, 0x5DB9, 0x5DD0, 0x5F21, 0x5F34, 0x5F67, 0x5FB7,
 };
-const unsigned short euc_to_utf8_FA[] = {
+static const unsigned short euc_to_utf8_FA[] = {
          0x5FDE, 0x605D, 0x6085, 0x608A, 0x60DE, 0x60D5, 0x6120,
  0x60F2, 0x6111, 0x6137, 0x6130, 0x6198, 0x6213, 0x62A6, 0x63F5,
  0x6460, 0x649D, 0x64CE, 0x654E, 0x6600, 0x6615, 0x663B, 0x6609,
@@ -1251,7 +1286,7 @@ const unsigned short euc_to_utf8_FA[] = {
  0x6FF5, 0x7005, 0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104,
  0x715C, 0x7146, 0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1,
 };
-const unsigned short euc_to_utf8_FB[] = {
+static const unsigned short euc_to_utf8_FB[] = {
          0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6,
  0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E,
  0x7462, 0x7489, 0x749F, 0x7501, 0x756F, 0x7682, 0x769C, 0x769E,
@@ -1265,7 +1300,7 @@ const unsigned short euc_to_utf8_FB[] = {
  0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24,
  0xFA25, 0x9067, 0x90DE, 0xFA26, 0x9115, 0x9127, 0x91DA,
 };
-const unsigned short euc_to_utf8_FC[] = {
+static const unsigned short euc_to_utf8_FC[] = {
          0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
  0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
  0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
@@ -1281,7 +1316,7 @@ const unsigned short euc_to_utf8_FC[] = {
 };
 
 /* Microsoft UCS Mapping Compatible */
-const unsigned short euc_to_utf8_FC_ms[] = {
+static const unsigned short euc_to_utf8_FC_ms[] = {
          0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
  0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
  0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
@@ -1297,7 +1332,7 @@ const unsigned short euc_to_utf8_FC_ms[] = {
 };
 
 #ifdef X0212_ENABLE
-const unsigned short euc_to_utf8_8FA2[] = {
+static const unsigned short euc_to_utf8_8FA2[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0x02D8,
  0x02C7, 0x00B8, 0x02D9, 0x02DD, 0x00AF, 0x02DB, 0x02DA, 0xFF5E,
@@ -1311,7 +1346,7 @@ const unsigned short euc_to_utf8_8FA2[] = {
  0x00A4, 0x2116,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_8FA6[] = {
+static const unsigned short euc_to_utf8_8FA6[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -1325,7 +1360,7 @@ const unsigned short euc_to_utf8_8FA6[] = {
       0, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03CA, 0x0390, 0x03CC,
  0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE,      0,      0,
 };
-const unsigned short euc_to_utf8_8FA7[] = {
+static const unsigned short euc_to_utf8_8FA7[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -1339,7 +1374,7 @@ const unsigned short euc_to_utf8_8FA7[] = {
       0,      0, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
  0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F,
 };
-const unsigned short euc_to_utf8_8FA9[] = {
+static const unsigned short euc_to_utf8_8FA9[] = {
          0x00C6, 0x0110,      0, 0x0126,      0, 0x0132,      0,
  0x0141, 0x013F,      0, 0x014A, 0x00D8, 0x0152,      0, 0x0166,
  0x00DE,      0,      0,      0,      0,      0,      0,      0,
@@ -1353,7 +1388,7 @@ const unsigned short euc_to_utf8_8FA9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_8FAA[] = {
+static const unsigned short euc_to_utf8_8FAA[] = {
          0x00C1, 0x00C0, 0x00C4, 0x00C2, 0x0102, 0x01CD, 0x0100,
  0x0104, 0x00C5, 0x00C3, 0x0106, 0x0108, 0x010C, 0x00C7, 0x010A,
  0x010E, 0x00C9, 0x00C8, 0x00CB, 0x00CA, 0x011A, 0x0116, 0x0112,
@@ -1367,7 +1402,7 @@ const unsigned short euc_to_utf8_8FAA[] = {
  0x01D5, 0x0174, 0x00DD, 0x0178, 0x0176, 0x0179, 0x017D, 0x017B,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_8FAB[] = {
+static const unsigned short euc_to_utf8_8FAB[] = {
          0x00E1, 0x00E0, 0x00E4, 0x00E2, 0x0103, 0x01CE, 0x0101,
  0x0105, 0x00E5, 0x00E3, 0x0107, 0x0109, 0x010D, 0x00E7, 0x010B,
  0x010F, 0x00E9, 0x00E8, 0x00EB, 0x00EA, 0x011B, 0x0117, 0x0113,
@@ -1381,7 +1416,7 @@ const unsigned short euc_to_utf8_8FAB[] = {
  0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_8FB0[] = {
+static const unsigned short euc_to_utf8_8FB0[] = {
          0x4E02, 0x4E04, 0x4E05, 0x4E0C, 0x4E12, 0x4E1F, 0x4E23,
  0x4E24, 0x4E28, 0x4E2B, 0x4E2E, 0x4E2F, 0x4E30, 0x4E35, 0x4E40,
  0x4E41, 0x4E44, 0x4E47, 0x4E51, 0x4E5A, 0x4E5C, 0x4E63, 0x4E68,
@@ -1395,7 +1430,7 @@ const unsigned short euc_to_utf8_8FB0[] = {
  0x4F5F, 0x4F63, 0x4F6A, 0x4F6C, 0x4F6E, 0x4F71, 0x4F77, 0x4F78,
  0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84,
 };
-const unsigned short euc_to_utf8_8FB1[] = {
+static const unsigned short euc_to_utf8_8FB1[] = {
          0x4F85, 0x4F89, 0x4F8A, 0x4F8C, 0x4F8E, 0x4F90, 0x4F92,
  0x4F93, 0x4F94, 0x4F97, 0x4F99, 0x4F9A, 0x4F9E, 0x4F9F, 0x4FB2,
  0x4FB7, 0x4FB9, 0x4FBB, 0x4FBC, 0x4FBD, 0x4FBE, 0x4FC0, 0x4FC1,
@@ -1409,7 +1444,7 @@ const unsigned short euc_to_utf8_8FB1[] = {
  0x5066, 0x5067, 0x506A, 0x506D, 0x5070, 0x5071, 0x503B, 0x5081,
  0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090,
 };
-const unsigned short euc_to_utf8_8FB2[] = {
+static const unsigned short euc_to_utf8_8FB2[] = {
          0x5092, 0x5093, 0x5094, 0x5096, 0x509B, 0x509C, 0x509E,
  0x509F, 0x50A0, 0x50A1, 0x50A2, 0x50AA, 0x50AF, 0x50B0, 0x50B9,
  0x50BA, 0x50BD, 0x50C0, 0x50C3, 0x50C4, 0x50C7, 0x50CC, 0x50CE,
@@ -1423,7 +1458,7 @@ const unsigned short euc_to_utf8_8FB2[] = {
  0x5183, 0x5184, 0x518B, 0x518E, 0x5198, 0x519D, 0x51A1, 0x51A3,
  0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2,
 };
-const unsigned short euc_to_utf8_8FB3[] = {
+static const unsigned short euc_to_utf8_8FB3[] = {
          0x51C8, 0x51CF, 0x51D1, 0x51D2, 0x51D3, 0x51D5, 0x51D8,
  0x51DE, 0x51E2, 0x51E5, 0x51EE, 0x51F2, 0x51F3, 0x51F4, 0x51F7,
  0x5201, 0x5202, 0x5205, 0x5212, 0x5213, 0x5215, 0x5216, 0x5218,
@@ -1437,7 +1472,7 @@ const unsigned short euc_to_utf8_8FB3[] = {
  0x52E1, 0x52E5, 0x52E8, 0x52E9, 0x52EA, 0x52EC, 0x52F0, 0x52F1,
  0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B,
 };
-const unsigned short euc_to_utf8_8FB4[] = {
+static const unsigned short euc_to_utf8_8FB4[] = {
          0x530C, 0x5311, 0x5313, 0x5318, 0x531B, 0x531C, 0x531E,
  0x531F, 0x5325, 0x5327, 0x5328, 0x5329, 0x532B, 0x532C, 0x532D,
  0x5330, 0x5332, 0x5335, 0x533C, 0x533D, 0x533E, 0x5342, 0x534C,
@@ -1451,7 +1486,7 @@ const unsigned short euc_to_utf8_8FB4[] = {
  0x5444, 0x5447, 0x544D, 0x544F, 0x545E, 0x5462, 0x5464, 0x5466,
  0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F,
 };
-const unsigned short euc_to_utf8_8FB5[] = {
+static const unsigned short euc_to_utf8_8FB5[] = {
          0x5481, 0x5483, 0x5485, 0x5488, 0x5489, 0x548D, 0x5491,
  0x5495, 0x5496, 0x549C, 0x549F, 0x54A1, 0x54A6, 0x54A7, 0x54A9,
  0x54AA, 0x54AD, 0x54AE, 0x54B1, 0x54B7, 0x54B9, 0x54BA, 0x54BB,
@@ -1465,7 +1500,7 @@ const unsigned short euc_to_utf8_8FB5[] = {
  0x5597, 0x55A3, 0x55A4, 0x55AD, 0x55B2, 0x55BF, 0x55C1, 0x55C3,
  0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2,
 };
-const unsigned short euc_to_utf8_8FB6[] = {
+static const unsigned short euc_to_utf8_8FB6[] = {
          0x55D3, 0x55D7, 0x55D8, 0x55DB, 0x55DE, 0x55E2, 0x55E9,
  0x55F6, 0x55FF, 0x5605, 0x5608, 0x560A, 0x560D, 0x560E, 0x560F,
  0x5610, 0x5611, 0x5612, 0x5619, 0x562C, 0x5630, 0x5633, 0x5635,
@@ -1479,7 +1514,7 @@ const unsigned short euc_to_utf8_8FB6[] = {
  0x56CC, 0x56CD, 0x56D9, 0x56DC, 0x56DD, 0x56DF, 0x56E1, 0x56E4,
  0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED,
 };
-const unsigned short euc_to_utf8_8FB7[] = {
+static const unsigned short euc_to_utf8_8FB7[] = {
          0x56F6, 0x56F7, 0x5701, 0x5702, 0x5707, 0x570A, 0x570C,
  0x5711, 0x5715, 0x571A, 0x571B, 0x571D, 0x5720, 0x5722, 0x5723,
  0x5724, 0x5725, 0x5729, 0x572A, 0x572C, 0x572E, 0x572F, 0x5733,
@@ -1493,7 +1528,7 @@ const unsigned short euc_to_utf8_8FB7[] = {
  0x57E7, 0x57E9, 0x57ED, 0x57F0, 0x57F5, 0x57F6, 0x57F8, 0x57FD,
  0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1,
 };
-const unsigned short euc_to_utf8_8FB8[] = {
+static const unsigned short euc_to_utf8_8FB8[] = {
          0x580C, 0x580D, 0x581B, 0x581E, 0x581F, 0x5820, 0x5826,
  0x5827, 0x582D, 0x5832, 0x5839, 0x583F, 0x5849, 0x584C, 0x584D,
  0x584F, 0x5850, 0x5855, 0x585F, 0x5861, 0x5864, 0x5867, 0x5868,
@@ -1507,7 +1542,7 @@ const unsigned short euc_to_utf8_8FB8[] = {
  0x5936, 0x593F, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595B,
  0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D,
 };
-const unsigned short euc_to_utf8_8FB9[] = {
+static const unsigned short euc_to_utf8_8FB9[] = {
          0x596F, 0x5972, 0x5975, 0x5976, 0x5979, 0x597B, 0x597C,
  0x598B, 0x598C, 0x598E, 0x5992, 0x5995, 0x5997, 0x599F, 0x59A4,
  0x59A7, 0x59AD, 0x59AE, 0x59AF, 0x59B0, 0x59B3, 0x59B7, 0x59BA,
@@ -1521,7 +1556,7 @@ const unsigned short euc_to_utf8_8FB9[] = {
  0x5A9C, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AA7, 0x5AAC, 0x5AB1,
  0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF,
 };
-const unsigned short euc_to_utf8_8FBA[] = {
+static const unsigned short euc_to_utf8_8FBA[] = {
          0x5AC4, 0x5AC6, 0x5AC8, 0x5ACF, 0x5ADA, 0x5ADC, 0x5AE0,
  0x5AE5, 0x5AEA, 0x5AEE, 0x5AF5, 0x5AF6, 0x5AFD, 0x5B00, 0x5B01,
  0x5B08, 0x5B17, 0x5B34, 0x5B19, 0x5B1B, 0x5B1D, 0x5B21, 0x5B25,
@@ -1535,7 +1570,7 @@ const unsigned short euc_to_utf8_8FBA[] = {
  0x5C2B, 0x5C2C, 0x5C2E, 0x5C30, 0x5C32, 0x5C35, 0x5C36, 0x5C59,
  0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69,
 };
-const unsigned short euc_to_utf8_8FBB[] = {
+static const unsigned short euc_to_utf8_8FBB[] = {
          0x5C6D, 0x5C70, 0x5C74, 0x5C75, 0x5C7A, 0x5C7B, 0x5C7C,
  0x5C7D, 0x5C87, 0x5C88, 0x5C8A, 0x5C8F, 0x5C92, 0x5C9D, 0x5C9F,
  0x5CA0, 0x5CA2, 0x5CA3, 0x5CA6, 0x5CAA, 0x5CB2, 0x5CB4, 0x5CB5,
@@ -1549,7 +1584,7 @@ const unsigned short euc_to_utf8_8FBB[] = {
  0x5DA7, 0x5DAB, 0x5DB0, 0x5DB4, 0x5DB8, 0x5DB9, 0x5DC3, 0x5DC7,
  0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4,
 };
-const unsigned short euc_to_utf8_8FBC[] = {
+static const unsigned short euc_to_utf8_8FBC[] = {
          0x5DE9, 0x5DF8, 0x5DF9, 0x5E00, 0x5E07, 0x5E0D, 0x5E12,
  0x5E14, 0x5E15, 0x5E18, 0x5E1F, 0x5E20, 0x5E2E, 0x5E28, 0x5E32,
  0x5E35, 0x5E3E, 0x5E4B, 0x5E50, 0x5E49, 0x5E51, 0x5E56, 0x5E58,
@@ -1563,7 +1598,7 @@ const unsigned short euc_to_utf8_8FBC[] = {
  0x5F3D, 0x5F3F, 0x5F40, 0x5F44, 0x5F45, 0x5F47, 0x5F4D, 0x5F50,
  0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67,
 };
-const unsigned short euc_to_utf8_8FBD[] = {
+static const unsigned short euc_to_utf8_8FBD[] = {
          0x5F6F, 0x5F72, 0x5F74, 0x5F75, 0x5F78, 0x5F7A, 0x5F7D,
  0x5F7E, 0x5F89, 0x5F8D, 0x5F8F, 0x5F96, 0x5F9C, 0x5F9D, 0x5FA2,
  0x5FA7, 0x5FAB, 0x5FA4, 0x5FAC, 0x5FAF, 0x5FB0, 0x5FB1, 0x5FB8,
@@ -1577,7 +1612,7 @@ const unsigned short euc_to_utf8_8FBD[] = {
  0x608A, 0x608E, 0x6091, 0x6093, 0x6095, 0x6098, 0x609D, 0x609E,
  0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7,
 };
-const unsigned short euc_to_utf8_8FBE[] = {
+static const unsigned short euc_to_utf8_8FBE[] = {
          0x60BB, 0x60BE, 0x60C2, 0x60C4, 0x60C8, 0x60C9, 0x60CA,
  0x60CB, 0x60CE, 0x60CF, 0x60D4, 0x60D5, 0x60D9, 0x60DB, 0x60DD,
  0x60DE, 0x60E2, 0x60E5, 0x60F2, 0x60F5, 0x60F8, 0x60FC, 0x60FD,
@@ -1591,7 +1626,7 @@ const unsigned short euc_to_utf8_8FBE[] = {
  0x61C0, 0x61C1, 0x61C2, 0x61CE, 0x61CF, 0x61D5, 0x61DC, 0x61DD,
  0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5,
 };
-const unsigned short euc_to_utf8_8FBF[] = {
+static const unsigned short euc_to_utf8_8FBF[] = {
          0x61EC, 0x61ED, 0x61EF, 0x6201, 0x6203, 0x6204, 0x6207,
  0x6213, 0x6215, 0x621C, 0x6220, 0x6222, 0x6223, 0x6227, 0x6229,
  0x622B, 0x6239, 0x623D, 0x6242, 0x6243, 0x6244, 0x6246, 0x624C,
@@ -1605,7 +1640,7 @@ const unsigned short euc_to_utf8_8FBF[] = {
  0x634A, 0x634B, 0x634E, 0x6352, 0x6353, 0x6354, 0x6358, 0x635B,
  0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375,
 };
-const unsigned short euc_to_utf8_8FC0[] = {
+static const unsigned short euc_to_utf8_8FC0[] = {
          0x6378, 0x637C, 0x637D, 0x637F, 0x6382, 0x6384, 0x6387,
  0x638A, 0x6390, 0x6394, 0x6395, 0x6399, 0x639A, 0x639E, 0x63A4,
  0x63A6, 0x63AD, 0x63AE, 0x63AF, 0x63BD, 0x63C1, 0x63C5, 0x63C8,
@@ -1619,7 +1654,7 @@ const unsigned short euc_to_utf8_8FC0[] = {
  0x6491, 0x6498, 0x6499, 0x649B, 0x649D, 0x649F, 0x64A1, 0x64A3,
  0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF,
 };
-const unsigned short euc_to_utf8_8FC1[] = {
+static const unsigned short euc_to_utf8_8FC1[] = {
          0x64C4, 0x64C9, 0x64CA, 0x64CB, 0x64CC, 0x64CE, 0x64D0,
  0x64D1, 0x64D5, 0x64D7, 0x64E4, 0x64E5, 0x64E9, 0x64EA, 0x64ED,
  0x64F0, 0x64F5, 0x64F7, 0x64FB, 0x64FF, 0x6501, 0x6504, 0x6508,
@@ -1633,7 +1668,7 @@ const unsigned short euc_to_utf8_8FC1[] = {
  0x65F4, 0x65F5, 0x65F9, 0x65FE, 0x65FF, 0x6600, 0x6604, 0x6608,
  0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D,
 };
-const unsigned short euc_to_utf8_8FC2[] = {
+static const unsigned short euc_to_utf8_8FC2[] = {
          0x661E, 0x6621, 0x6622, 0x6623, 0x6624, 0x6626, 0x6629,
  0x662A, 0x662B, 0x662C, 0x662E, 0x6630, 0x6631, 0x6633, 0x6639,
  0x6637, 0x6640, 0x6645, 0x6646, 0x664A, 0x664C, 0x6651, 0x664E,
@@ -1647,7 +1682,7 @@ const unsigned short euc_to_utf8_8FC2[] = {
  0x670E, 0x6713, 0x6719, 0x671C, 0x6720, 0x6722, 0x6733, 0x673E,
  0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D,
 };
-const unsigned short euc_to_utf8_8FC3[] = {
+static const unsigned short euc_to_utf8_8FC3[] = {
          0x6766, 0x676C, 0x676E, 0x6774, 0x6776, 0x677B, 0x6781,
  0x6784, 0x678E, 0x678F, 0x6791, 0x6793, 0x6796, 0x6798, 0x6799,
  0x679B, 0x67B0, 0x67B1, 0x67B2, 0x67B5, 0x67BB, 0x67BC, 0x67BD,
@@ -1661,7 +1696,7 @@ const unsigned short euc_to_utf8_8FC3[] = {
  0x6898, 0x689A, 0x689C, 0x68A1, 0x68A3, 0x68A5, 0x68A9, 0x68AA,
  0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF,
 };
-const unsigned short euc_to_utf8_8FC4[] = {
+static const unsigned short euc_to_utf8_8FC4[] = {
          0x68D0, 0x68D1, 0x68D3, 0x68D6, 0x68D9, 0x68DC, 0x68DD,
  0x68E5, 0x68E8, 0x68EA, 0x68EB, 0x68EC, 0x68ED, 0x68F0, 0x68F1,
  0x68F5, 0x68F6, 0x68FB, 0x68FC, 0x68FD, 0x6906, 0x6909, 0x690A,
@@ -1675,7 +1710,7 @@ const unsigned short euc_to_utf8_8FC4[] = {
  0x69F5, 0x69FE, 0x6A00, 0x6A01, 0x6A03, 0x6A0F, 0x6A11, 0x6A15,
  0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32,
 };
-const unsigned short euc_to_utf8_8FC5[] = {
+static const unsigned short euc_to_utf8_8FC5[] = {
          0x6A34, 0x6A37, 0x6A3B, 0x6A3E, 0x6A3F, 0x6A45, 0x6A46,
  0x6A49, 0x6A4A, 0x6A4E, 0x6A50, 0x6A51, 0x6A52, 0x6A55, 0x6A56,
  0x6A5B, 0x6A64, 0x6A67, 0x6A6A, 0x6A71, 0x6A73, 0x6A7E, 0x6A81,
@@ -1689,7 +1724,7 @@ const unsigned short euc_to_utf8_8FC5[] = {
  0x6B3F, 0x6B46, 0x6B4A, 0x6B4D, 0x6B52, 0x6B56, 0x6B58, 0x6B5D,
  0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D,
 };
-const unsigned short euc_to_utf8_8FC6[] = {
+static const unsigned short euc_to_utf8_8FC6[] = {
          0x6B7E, 0x6B82, 0x6B85, 0x6B97, 0x6B9B, 0x6B9F, 0x6BA0,
  0x6BA2, 0x6BA3, 0x6BA8, 0x6BA9, 0x6BAC, 0x6BAD, 0x6BAE, 0x6BB0,
  0x6BB8, 0x6BB9, 0x6BBD, 0x6BBE, 0x6BC3, 0x6BC4, 0x6BC9, 0x6BCC,
@@ -1703,7 +1738,7 @@ const unsigned short euc_to_utf8_8FC6[] = {
  0x6C98, 0x6C9C, 0x6C9F, 0x6CB0, 0x6CB2, 0x6CB4, 0x6CC2, 0x6CC6,
  0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6,
 };
-const unsigned short euc_to_utf8_8FC7[] = {
+static const unsigned short euc_to_utf8_8FC7[] = {
          0x6CDA, 0x6CDC, 0x6CE0, 0x6CE7, 0x6CE9, 0x6CEB, 0x6CEC,
  0x6CEE, 0x6CF2, 0x6CF4, 0x6D04, 0x6D07, 0x6D0A, 0x6D0E, 0x6D0F,
  0x6D11, 0x6D13, 0x6D1A, 0x6D26, 0x6D27, 0x6D28, 0x6C67, 0x6D2E,
@@ -1717,7 +1752,7 @@ const unsigned short euc_to_utf8_8FC7[] = {
  0x6E3C, 0x6E44, 0x6E45, 0x6E48, 0x6E49, 0x6E4B, 0x6E4F, 0x6E51,
  0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E,
 };
-const unsigned short euc_to_utf8_8FC8[] = {
+static const unsigned short euc_to_utf8_8FC8[] = {
          0x6E62, 0x6E63, 0x6E68, 0x6E73, 0x6E7B, 0x6E7D, 0x6E8D,
  0x6E93, 0x6E99, 0x6EA0, 0x6EA7, 0x6EAD, 0x6EAE, 0x6EB1, 0x6EB3,
  0x6EBB, 0x6EBF, 0x6EC0, 0x6EC1, 0x6EC3, 0x6EC7, 0x6EC8, 0x6ECA,
@@ -1731,7 +1766,7 @@ const unsigned short euc_to_utf8_8FC8[] = {
  0x6FA0, 0x6FA5, 0x6FA6, 0x6FA7, 0x6FA8, 0x6FAE, 0x6FAF, 0x6FB0,
  0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA,
 };
-const unsigned short euc_to_utf8_8FC9[] = {
+static const unsigned short euc_to_utf8_8FC9[] = {
          0x6FDA, 0x6FDE, 0x6FE8, 0x6FE9, 0x6FF0, 0x6FF5, 0x6FF9,
  0x6FFC, 0x6FFD, 0x7000, 0x7005, 0x7006, 0x7007, 0x700D, 0x7017,
  0x7020, 0x7023, 0x702F, 0x7034, 0x7037, 0x7039, 0x703C, 0x7043,
@@ -1745,7 +1780,7 @@ const unsigned short euc_to_utf8_8FC9[] = {
  0x7131, 0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714A, 0x714B,
  0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160,
 };
-const unsigned short euc_to_utf8_8FCA[] = {
+static const unsigned short euc_to_utf8_8FCA[] = {
          0x7168, 0x7179, 0x7180, 0x7185, 0x7187, 0x718C, 0x7192,
  0x719A, 0x719B, 0x71A0, 0x71A2, 0x71AF, 0x71B0, 0x71B2, 0x71B3,
  0x71BA, 0x71BF, 0x71C0, 0x71C1, 0x71C4, 0x71CB, 0x71CC, 0x71D3,
@@ -1759,7 +1794,7 @@ const unsigned short euc_to_utf8_8FCA[] = {
  0x72B4, 0x72BE, 0x72C1, 0x72C7, 0x72C9, 0x72CC, 0x72D5, 0x72D6,
  0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB,
 };
-const unsigned short euc_to_utf8_8FCB[] = {
+static const unsigned short euc_to_utf8_8FCB[] = {
          0x72FE, 0x7302, 0x7304, 0x7305, 0x7307, 0x730B, 0x730D,
  0x7312, 0x7313, 0x7318, 0x7319, 0x731E, 0x7322, 0x7324, 0x7327,
  0x7328, 0x732C, 0x7331, 0x7332, 0x7335, 0x733A, 0x733B, 0x733D,
@@ -1773,7 +1808,7 @@ const unsigned short euc_to_utf8_8FCB[] = {
  0x73D6, 0x73D9, 0x73DD, 0x73E1, 0x73E3, 0x73E6, 0x73E7, 0x73E9,
  0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD,
 };
-const unsigned short euc_to_utf8_8FCC[] = {
+static const unsigned short euc_to_utf8_8FCC[] = {
          0x73FF, 0x7400, 0x7401, 0x7404, 0x7407, 0x740A, 0x7411,
  0x741A, 0x741B, 0x7424, 0x7426, 0x7428, 0x7429, 0x742A, 0x742B,
  0x742C, 0x742D, 0x742E, 0x742F, 0x7430, 0x7431, 0x7439, 0x7440,
@@ -1787,7 +1822,7 @@ const unsigned short euc_to_utf8_8FCC[] = {
  0x74DA, 0x74DB, 0x74DE, 0x74DF, 0x74E4, 0x74E8, 0x74EA, 0x74EB,
  0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506,
 };
-const unsigned short euc_to_utf8_8FCD[] = {
+static const unsigned short euc_to_utf8_8FCD[] = {
          0x7512, 0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527,
  0x7529, 0x752A, 0x752F, 0x7536, 0x7539, 0x753D, 0x753E, 0x753F,
  0x7540, 0x7543, 0x7547, 0x7548, 0x754E, 0x7550, 0x7552, 0x7557,
@@ -1801,7 +1836,7 @@ const unsigned short euc_to_utf8_8FCD[] = {
  0x7619, 0x761B, 0x761C, 0x761D, 0x761E, 0x7623, 0x7625, 0x7626,
  0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639,
 };
-const unsigned short euc_to_utf8_8FCE[] = {
+static const unsigned short euc_to_utf8_8FCE[] = {
          0x763A, 0x763C, 0x764A, 0x7640, 0x7641, 0x7643, 0x7644,
  0x7645, 0x7649, 0x764B, 0x7655, 0x7659, 0x765F, 0x7664, 0x7665,
  0x766D, 0x766E, 0x766F, 0x7671, 0x7674, 0x7681, 0x7685, 0x768C,
@@ -1815,7 +1850,7 @@ const unsigned short euc_to_utf8_8FCE[] = {
  0x7742, 0x7745, 0x7746, 0x774A, 0x774D, 0x774E, 0x774F, 0x7752,
  0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762,
 };
-const unsigned short euc_to_utf8_8FCF[] = {
+static const unsigned short euc_to_utf8_8FCF[] = {
          0x7764, 0x7767, 0x776A, 0x776C, 0x7770, 0x7772, 0x7773,
  0x7774, 0x777A, 0x777D, 0x7780, 0x7784, 0x778C, 0x778D, 0x7794,
  0x7795, 0x7796, 0x779A, 0x779F, 0x77A2, 0x77A7, 0x77AA, 0x77AE,
@@ -1829,7 +1864,7 @@ const unsigned short euc_to_utf8_8FCF[] = {
  0x788F, 0x7894, 0x7898, 0x78A1, 0x789D, 0x789E, 0x789F, 0x78A4,
  0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3,
 };
-const unsigned short euc_to_utf8_8FD0[] = {
+static const unsigned short euc_to_utf8_8FD0[] = {
          0x78BB, 0x78BD, 0x78BF, 0x78C7, 0x78C8, 0x78C9, 0x78CC,
  0x78CE, 0x78D2, 0x78D3, 0x78D5, 0x78D6, 0x78E4, 0x78DB, 0x78DF,
  0x78E0, 0x78E1, 0x78E6, 0x78EA, 0x78F2, 0x78F3, 0x7900, 0x78F6,
@@ -1843,7 +1878,7 @@ const unsigned short euc_to_utf8_8FD0[] = {
  0x79B1, 0x79B4, 0x79B8, 0x79BB, 0x79C2, 0x79C4, 0x79C7, 0x79C8,
  0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE,
 };
-const unsigned short euc_to_utf8_8FD1[] = {
+static const unsigned short euc_to_utf8_8FD1[] = {
          0x79E0, 0x79E2, 0x79E5, 0x79EA, 0x79EB, 0x79ED, 0x79F1,
  0x79F8, 0x79FC, 0x7A02, 0x7A03, 0x7A07, 0x7A09, 0x7A0A, 0x7A0C,
  0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x7A21, 0x7A27, 0x7A2B, 0x7A2D,
@@ -1857,7 +1892,7 @@ const unsigned short euc_to_utf8_8FD1[] = {
  0x7AFB, 0x7AFD, 0x7AFE, 0x7B07, 0x7B14, 0x7B1F, 0x7B23, 0x7B27,
  0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30,
 };
-const unsigned short euc_to_utf8_8FD2[] = {
+static const unsigned short euc_to_utf8_8FD2[] = {
          0x7B31, 0x7B34, 0x7B3D, 0x7B3F, 0x7B40, 0x7B41, 0x7B47,
  0x7B4E, 0x7B55, 0x7B60, 0x7B64, 0x7B66, 0x7B69, 0x7B6A, 0x7B6D,
  0x7B6F, 0x7B72, 0x7B73, 0x7B77, 0x7B84, 0x7B89, 0x7B8E, 0x7B90,
@@ -1871,7 +1906,7 @@ const unsigned short euc_to_utf8_8FD2[] = {
  0x7C36, 0x7C39, 0x7C3A, 0x7C46, 0x7C4A, 0x7C55, 0x7C51, 0x7C52,
  0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E,
 };
-const unsigned short euc_to_utf8_8FD3[] = {
+static const unsigned short euc_to_utf8_8FD3[] = {
          0x7C61, 0x7C63, 0x7C67, 0x7C69, 0x7C6D, 0x7C6E, 0x7C70,
  0x7C72, 0x7C79, 0x7C7C, 0x7C7D, 0x7C86, 0x7C87, 0x7C8F, 0x7C94,
  0x7C9E, 0x7CA0, 0x7CA6, 0x7CB0, 0x7CB6, 0x7CB7, 0x7CBA, 0x7CBB,
@@ -1885,7 +1920,7 @@ const unsigned short euc_to_utf8_8FD3[] = {
  0x7D7B, 0x7D7F, 0x7D81, 0x7D82, 0x7D83, 0x7D85, 0x7D86, 0x7D88,
  0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D,
 };
-const unsigned short euc_to_utf8_8FD4[] = {
+static const unsigned short euc_to_utf8_8FD4[] = {
          0x7D9E, 0x7DA6, 0x7DA7, 0x7DAA, 0x7DB3, 0x7DB6, 0x7DB7,
  0x7DB9, 0x7DC2, 0x7DC3, 0x7DC4, 0x7DC5, 0x7DC6, 0x7DCC, 0x7DCD,
  0x7DCE, 0x7DD7, 0x7DD9, 0x7E00, 0x7DE2, 0x7DE5, 0x7DE6, 0x7DEA,
@@ -1899,7 +1934,7 @@ const unsigned short euc_to_utf8_8FD4[] = {
  0x7F43, 0x7F44, 0x7F47, 0x7F4F, 0x7F52, 0x7F53, 0x7F5B, 0x7F5C,
  0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D,
 };
-const unsigned short euc_to_utf8_8FD5[] = {
+static const unsigned short euc_to_utf8_8FD5[] = {
          0x7F71, 0x7F7D, 0x7F7E, 0x7F7F, 0x7F80, 0x7F8B, 0x7F8D,
  0x7F8F, 0x7F90, 0x7F91, 0x7F96, 0x7F97, 0x7F9C, 0x7FA1, 0x7FA2,
  0x7FA6, 0x7FAA, 0x7FAD, 0x7FB4, 0x7FBC, 0x7FBF, 0x7FC0, 0x7FC3,
@@ -1913,7 +1948,7 @@ const unsigned short euc_to_utf8_8FD5[] = {
  0x80A7, 0x80AB, 0x80B8, 0x80B9, 0x80C8, 0x80CD, 0x80CF, 0x80D2,
  0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE,
 };
-const unsigned short euc_to_utf8_8FD6[] = {
+static const unsigned short euc_to_utf8_8FD6[] = {
          0x80F0, 0x80F2, 0x80F3, 0x80F6, 0x80F9, 0x80FA, 0x80FE,
  0x8103, 0x810B, 0x8116, 0x8117, 0x8118, 0x811C, 0x811E, 0x8120,
  0x8124, 0x8127, 0x812C, 0x8130, 0x8135, 0x813A, 0x813C, 0x8145,
@@ -1927,7 +1962,7 @@ const unsigned short euc_to_utf8_8FD6[] = {
  0x8213, 0x8214, 0x8219, 0x821A, 0x821D, 0x8221, 0x8222, 0x8228,
  0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246,
 };
-const unsigned short euc_to_utf8_8FD7[] = {
+static const unsigned short euc_to_utf8_8FD7[] = {
          0x824B, 0x824E, 0x824F, 0x8251, 0x8256, 0x825C, 0x8260,
  0x8263, 0x8267, 0x826D, 0x8274, 0x827B, 0x827D, 0x827F, 0x8280,
  0x8281, 0x8283, 0x8284, 0x8287, 0x8289, 0x828A, 0x828E, 0x8291,
@@ -1941,7 +1976,7 @@ const unsigned short euc_to_utf8_8FD7[] = {
  0x833A, 0x833C, 0x833D, 0x8342, 0x8343, 0x8344, 0x8347, 0x834D,
  0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378,
 };
-const unsigned short euc_to_utf8_8FD8[] = {
+static const unsigned short euc_to_utf8_8FD8[] = {
          0x837D, 0x837F, 0x8380, 0x8382, 0x8384, 0x8386, 0x838D,
  0x8392, 0x8394, 0x8395, 0x8398, 0x8399, 0x839B, 0x839C, 0x839D,
  0x83A6, 0x83A7, 0x83A9, 0x83AC, 0x83BE, 0x83BF, 0x83C0, 0x83C7,
@@ -1955,7 +1990,7 @@ const unsigned short euc_to_utf8_8FD8[] = {
  0x84A9, 0x84AA, 0x84AF, 0x84B1, 0x84B4, 0x84BA, 0x84BD, 0x84BE,
  0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3,
 };
-const unsigned short euc_to_utf8_8FD9[] = {
+static const unsigned short euc_to_utf8_8FD9[] = {
          0x84DC, 0x84E7, 0x84EA, 0x84EF, 0x84F0, 0x84F1, 0x84F2,
  0x84F7, 0x8532, 0x84FA, 0x84FB, 0x84FD, 0x8502, 0x8503, 0x8507,
  0x850C, 0x850E, 0x8510, 0x851C, 0x851E, 0x8522, 0x8523, 0x8524,
@@ -1969,7 +2004,7 @@ const unsigned short euc_to_utf8_8FD9[] = {
  0x85C7, 0x85CA, 0x85CB, 0x85CE, 0x85AD, 0x85D8, 0x85DA, 0x85DF,
  0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC,
 };
-const unsigned short euc_to_utf8_8FDA[] = {
+static const unsigned short euc_to_utf8_8FDA[] = {
          0x85FF, 0x8600, 0x8604, 0x8605, 0x860D, 0x860E, 0x8610,
  0x8611, 0x8612, 0x8618, 0x8619, 0x861B, 0x861E, 0x8621, 0x8627,
  0x8629, 0x8636, 0x8638, 0x863A, 0x863C, 0x863D, 0x8640, 0x8642,
@@ -1983,7 +2018,7 @@ const unsigned short euc_to_utf8_8FDA[] = {
  0x86FD, 0x8704, 0x8705, 0x8707, 0x870B, 0x870E, 0x870F, 0x8710,
  0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723,
 };
-const unsigned short euc_to_utf8_8FDB[] = {
+static const unsigned short euc_to_utf8_8FDB[] = {
          0x8728, 0x872E, 0x872F, 0x8731, 0x8732, 0x8739, 0x873A,
  0x873C, 0x873D, 0x873E, 0x8740, 0x8743, 0x8745, 0x874D, 0x8758,
  0x875D, 0x8761, 0x8764, 0x8765, 0x876F, 0x8771, 0x8772, 0x877B,
@@ -1997,7 +2032,7 @@ const unsigned short euc_to_utf8_8FDB[] = {
  0x8812, 0x8813, 0x8814, 0x8818, 0x881A, 0x881B, 0x881C, 0x881E,
  0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835,
 };
-const unsigned short euc_to_utf8_8FDC[] = {
+static const unsigned short euc_to_utf8_8FDC[] = {
          0x883A, 0x883C, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849,
  0x884A, 0x884B, 0x884E, 0x8851, 0x8855, 0x8856, 0x8858, 0x885A,
  0x885C, 0x885F, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887B,
@@ -2011,7 +2046,7 @@ const unsigned short euc_to_utf8_8FDC[] = {
  0x894F, 0x8952, 0x8957, 0x895A, 0x895B, 0x895C, 0x8961, 0x8962,
  0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A,
 };
-const unsigned short euc_to_utf8_8FDD[] = {
+static const unsigned short euc_to_utf8_8FDD[] = {
          0x897B, 0x897C, 0x897D, 0x8989, 0x898D, 0x8990, 0x8994,
  0x8995, 0x899B, 0x899C, 0x899F, 0x89A0, 0x89A5, 0x89B0, 0x89B4,
  0x89B5, 0x89B6, 0x89B7, 0x89BC, 0x89D4, 0x89D5, 0x89D6, 0x89D7,
@@ -2025,7 +2060,7 @@ const unsigned short euc_to_utf8_8FDD[] = {
  0x8A83, 0x8A86, 0x8A8B, 0x8A8F, 0x8A90, 0x8A92, 0x8A96, 0x8A97,
  0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3,
 };
-const unsigned short euc_to_utf8_8FDE[] = {
+static const unsigned short euc_to_utf8_8FDE[] = {
          0x8AB6, 0x8AB7, 0x8ABB, 0x8ABE, 0x8AC3, 0x8AC6, 0x8AC8,
  0x8AC9, 0x8ACA, 0x8AD1, 0x8AD3, 0x8AD4, 0x8AD5, 0x8AD7, 0x8ADD,
  0x8ADF, 0x8AEC, 0x8AF0, 0x8AF4, 0x8AF5, 0x8AF6, 0x8AFC, 0x8AFF,
@@ -2039,7 +2074,7 @@ const unsigned short euc_to_utf8_8FDE[] = {
  0x8C5B, 0x8C5D, 0x8C59, 0x8C63, 0x8C64, 0x8C66, 0x8C68, 0x8C69,
  0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86,
 };
-const unsigned short euc_to_utf8_8FDF[] = {
+static const unsigned short euc_to_utf8_8FDF[] = {
          0x8C87, 0x8C8B, 0x8C90, 0x8C92, 0x8C93, 0x8C99, 0x8C9B,
  0x8C9C, 0x8CA4, 0x8CB9, 0x8CBA, 0x8CC5, 0x8CC6, 0x8CC9, 0x8CCB,
  0x8CCF, 0x8CD6, 0x8CD5, 0x8CD9, 0x8CDD, 0x8CE1, 0x8CE8, 0x8CEC,
@@ -2053,7 +2088,7 @@ const unsigned short euc_to_utf8_8FDF[] = {
  0x8DF1, 0x8DF2, 0x8DF4, 0x8DFD, 0x8E01, 0x8E04, 0x8E05, 0x8E06,
  0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22,
 };
-const unsigned short euc_to_utf8_8FE0[] = {
+static const unsigned short euc_to_utf8_8FE0[] = {
          0x8E23, 0x8E26, 0x8E27, 0x8E31, 0x8E33, 0x8E36, 0x8E37,
  0x8E38, 0x8E39, 0x8E3D, 0x8E40, 0x8E41, 0x8E4B, 0x8E4D, 0x8E4E,
  0x8E4F, 0x8E54, 0x8E5B, 0x8E5C, 0x8E5D, 0x8E5E, 0x8E61, 0x8E62,
@@ -2067,7 +2102,7 @@ const unsigned short euc_to_utf8_8FE0[] = {
  0x8F21, 0x8F23, 0x8F25, 0x8F27, 0x8F28, 0x8F2C, 0x8F2D, 0x8F2E,
  0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41,
 };
-const unsigned short euc_to_utf8_8FE1[] = {
+static const unsigned short euc_to_utf8_8FE1[] = {
          0x8F43, 0x8F47, 0x8F4F, 0x8F51, 0x8F52, 0x8F53, 0x8F54,
  0x8F55, 0x8F58, 0x8F5D, 0x8F5E, 0x8F65, 0x8F9D, 0x8FA0, 0x8FA1,
  0x8FA4, 0x8FA5, 0x8FA6, 0x8FB5, 0x8FB6, 0x8FB8, 0x8FBE, 0x8FC0,
@@ -2081,7 +2116,7 @@ const unsigned short euc_to_utf8_8FE1[] = {
  0x9099, 0x909B, 0x90A0, 0x90A1, 0x90A2, 0x90A5, 0x90B0, 0x90B2,
  0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3,
 };
-const unsigned short euc_to_utf8_8FE2[] = {
+static const unsigned short euc_to_utf8_8FE2[] = {
          0x90C4, 0x90C5, 0x90C7, 0x90C8, 0x90D5, 0x90D7, 0x90D8,
  0x90D9, 0x90DC, 0x90DD, 0x90DF, 0x90E5, 0x90D2, 0x90F6, 0x90EB,
  0x90EF, 0x90F0, 0x90F4, 0x90FE, 0x90FF, 0x9100, 0x9104, 0x9105,
@@ -2095,7 +2130,7 @@ const unsigned short euc_to_utf8_8FE2[] = {
  0x91A1, 0x91A6, 0x91A8, 0x91AC, 0x91AD, 0x91AE, 0x91B0, 0x91B1,
  0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF,
 };
-const unsigned short euc_to_utf8_8FE3[] = {
+static const unsigned short euc_to_utf8_8FE3[] = {
          0x91C2, 0x91C3, 0x91C5, 0x91D3, 0x91D4, 0x91D7, 0x91D9,
  0x91DA, 0x91DE, 0x91E4, 0x91E5, 0x91E9, 0x91EA, 0x91EC, 0x91ED,
  0x91EE, 0x91EF, 0x91F0, 0x91F1, 0x91F7, 0x91F9, 0x91FB, 0x91FD,
@@ -2109,7 +2144,7 @@ const unsigned short euc_to_utf8_8FE3[] = {
  0x9276, 0x9277, 0x9278, 0x9279, 0x927B, 0x927C, 0x927D, 0x927F,
  0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297,
 };
-const unsigned short euc_to_utf8_8FE4[] = {
+static const unsigned short euc_to_utf8_8FE4[] = {
          0x9299, 0x929F, 0x92A0, 0x92A4, 0x92A5, 0x92A7, 0x92A8,
  0x92AB, 0x92AF, 0x92B2, 0x92B6, 0x92B8, 0x92BA, 0x92BB, 0x92BC,
  0x92BD, 0x92BF, 0x92C0, 0x92C1, 0x92C2, 0x92C3, 0x92C5, 0x92C6,
@@ -2123,7 +2158,7 @@ const unsigned short euc_to_utf8_8FE4[] = {
  0x9358, 0x935A, 0x935E, 0x9364, 0x9365, 0x9367, 0x9369, 0x936A,
  0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376,
 };
-const unsigned short euc_to_utf8_8FE5[] = {
+static const unsigned short euc_to_utf8_8FE5[] = {
          0x937A, 0x937D, 0x937F, 0x9380, 0x9381, 0x9382, 0x9388,
  0x938A, 0x938B, 0x938D, 0x938F, 0x9392, 0x9395, 0x9398, 0x939B,
  0x939E, 0x93A1, 0x93A3, 0x93A4, 0x93A6, 0x93A8, 0x93AB, 0x93B4,
@@ -2137,7 +2172,7 @@ const unsigned short euc_to_utf8_8FE5[] = {
  0x945C, 0x945F, 0x9461, 0x9463, 0x9468, 0x946B, 0x946D, 0x946E,
  0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579,
 };
-const unsigned short euc_to_utf8_8FE6[] = {
+static const unsigned short euc_to_utf8_8FE6[] = {
          0x957E, 0x9584, 0x9588, 0x958C, 0x958D, 0x958E, 0x959D,
  0x959E, 0x959F, 0x95A1, 0x95A6, 0x95A9, 0x95AB, 0x95AC, 0x95B4,
  0x95B6, 0x95BA, 0x95BD, 0x95BF, 0x95C6, 0x95C8, 0x95C9, 0x95CB,
@@ -2151,7 +2186,7 @@ const unsigned short euc_to_utf8_8FE6[] = {
  0x96B3, 0x96BA, 0x96CA, 0x96D2, 0x5DB2, 0x96D8, 0x96DA, 0x96DD,
  0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702,
 };
-const unsigned short euc_to_utf8_8FE7[] = {
+static const unsigned short euc_to_utf8_8FE7[] = {
          0x9703, 0x9705, 0x9709, 0x971A, 0x971B, 0x971D, 0x9721,
  0x9722, 0x9723, 0x9728, 0x9731, 0x9733, 0x9741, 0x9743, 0x974A,
  0x974E, 0x974F, 0x9755, 0x9757, 0x9758, 0x975A, 0x975B, 0x9763,
@@ -2165,7 +2200,7 @@ const unsigned short euc_to_utf8_8FE7[] = {
  0x97F7, 0x97F8, 0x97FA, 0x9807, 0x980A, 0x9819, 0x980D, 0x980E,
  0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826,
 };
-const unsigned short euc_to_utf8_8FE8[] = {
+static const unsigned short euc_to_utf8_8FE8[] = {
          0x982B, 0x982E, 0x982F, 0x9830, 0x9832, 0x9833, 0x9835,
  0x9825, 0x983E, 0x9844, 0x9847, 0x984A, 0x9851, 0x9852, 0x9853,
  0x9856, 0x9857, 0x9859, 0x985A, 0x9862, 0x9863, 0x9865, 0x9866,
@@ -2179,7 +2214,7 @@ const unsigned short euc_to_utf8_8FE8[] = {
  0x9958, 0x9959, 0x995B, 0x995C, 0x995E, 0x995F, 0x9960, 0x999B,
  0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5,
 };
-const unsigned short euc_to_utf8_8FE9[] = {
+static const unsigned short euc_to_utf8_8FE9[] = {
          0x99B9, 0x99BA, 0x99BD, 0x99BF, 0x99C3, 0x99C9, 0x99D3,
  0x99D4, 0x99D9, 0x99DA, 0x99DC, 0x99DE, 0x99E7, 0x99EA, 0x99EB,
  0x99EC, 0x99F0, 0x99F4, 0x99F5, 0x99F9, 0x99FD, 0x99FE, 0x9A02,
@@ -2193,7 +2228,7 @@ const unsigned short euc_to_utf8_8FE9[] = {
  0x9AE5, 0x9AE7, 0x9AE9, 0x9AEC, 0x9AF2, 0x9AF3, 0x9AF5, 0x9AF9,
  0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03,
 };
-const unsigned short euc_to_utf8_8FEA[] = {
+static const unsigned short euc_to_utf8_8FEA[] = {
          0x9B04, 0x9B05, 0x9B08, 0x9B09, 0x9B0B, 0x9B0C, 0x9B0D,
  0x9B0E, 0x9B10, 0x9B12, 0x9B16, 0x9B19, 0x9B1B, 0x9B1C, 0x9B20,
  0x9B26, 0x9B2B, 0x9B2D, 0x9B33, 0x9B34, 0x9B35, 0x9B37, 0x9B39,
@@ -2207,7 +2242,7 @@ const unsigned short euc_to_utf8_8FEA[] = {
  0x9BC8, 0x9BCE, 0x9BD0, 0x9BD7, 0x9BD8, 0x9BDD, 0x9BDF, 0x9BE5,
  0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8,
 };
-const unsigned short euc_to_utf8_8FEB[] = {
+static const unsigned short euc_to_utf8_8FEB[] = {
          0x9BF9, 0x9BFA, 0x9BFD, 0x9BFF, 0x9C00, 0x9C02, 0x9C0B,
  0x9C0F, 0x9C11, 0x9C16, 0x9C18, 0x9C19, 0x9C1A, 0x9C1C, 0x9C1E,
  0x9C22, 0x9C23, 0x9C26, 0x9C27, 0x9C28, 0x9C29, 0x9C2A, 0x9C31,
@@ -2221,7 +2256,7 @@ const unsigned short euc_to_utf8_8FEB[] = {
  0x9D47, 0x9D4A, 0x9D53, 0x9D54, 0x9D5F, 0x9D63, 0x9D62, 0x9D65,
  0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B,
 };
-const unsigned short euc_to_utf8_8FEC[] = {
+static const unsigned short euc_to_utf8_8FEC[] = {
          0x9D7C, 0x9D7E, 0x9D83, 0x9D84, 0x9D86, 0x9D8A, 0x9D8D,
  0x9D8E, 0x9D92, 0x9D93, 0x9D95, 0x9D96, 0x9D97, 0x9D98, 0x9DA1,
  0x9DAA, 0x9DAC, 0x9DAE, 0x9DB1, 0x9DB5, 0x9DB9, 0x9DBC, 0x9DBF,
@@ -2235,7 +2270,7 @@ const unsigned short euc_to_utf8_8FEC[] = {
  0x9EB5, 0x9EC6, 0x9EC8, 0x9ECB, 0x9ED5, 0x9EDF, 0x9EE4, 0x9EE7,
  0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5,
 };
-const unsigned short euc_to_utf8_8FED[] = {
+static const unsigned short euc_to_utf8_8FED[] = {
          0x9EF8, 0x9EFF, 0x9F02, 0x9F03, 0x9F09, 0x9F0F, 0x9F10,
  0x9F11, 0x9F12, 0x9F14, 0x9F16, 0x9F17, 0x9F19, 0x9F1A, 0x9F1B,
  0x9F1F, 0x9F22, 0x9F26, 0x9F2A, 0x9F2B, 0x9F2F, 0x9F31, 0x9F32,
@@ -2249,7 +2284,7 @@ const unsigned short euc_to_utf8_8FED[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short euc_to_utf8_8FF3[] = {
+static const unsigned short euc_to_utf8_8FF3[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2263,7 +2298,7 @@ const unsigned short euc_to_utf8_8FF3[] = {
       0,      0,      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174,
  0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2160, 0x2161,
 };
-const unsigned short euc_to_utf8_8FF4[] = {
+static const unsigned short euc_to_utf8_8FF4[] = {
             0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
     0x2169, 0xff07, 0xff02, 0x3231, 0x2116, 0x2121, 0x70bb, 0x4efc,
     0x50f4, 0x51ec, 0x5307, 0x5324, 0xfa0e, 0x548a, 0x5759, 0xfa0f,
@@ -2346,6 +2381,33 @@ const unsigned short *const euc_to_utf8_2bytes_ms[] = {
               0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
  euc_to_utf8_FC_ms,              0,              0,
 };
+/* CP10001 */
+const unsigned short *const euc_to_utf8_2bytes_mac[] = {
+                 euc_to_utf8_A1_ms, euc_to_utf8_A2_ms, euc_to_utf8_A3,
+ euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
+ euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
+ euc_to_utf8_AC_mac, euc_to_utf8_AD_mac, euc_to_utf8_AE, euc_to_utf8_AF,
+ euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
+ euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
+ euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
+ euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
+ euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
+ euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
+ euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
+ euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
+ euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
+ euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
+ euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
+ euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
+ euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
+ euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
+ euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
+ euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
+ euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
+ euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
+              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
+ euc_to_utf8_FC_ms,              0,              0,
+};
 
 #ifdef X0212_ENABLE
 const unsigned short *const x0212_to_utf8_2bytes[] = {
@@ -2377,7 +2439,7 @@ const unsigned short *const x0212_to_utf8_2bytes[] = {
 #endif /* UTF8_OUTPUT_ENABLE */
 
 #ifdef UTF8_INPUT_ENABLE
-const unsigned short utf8_to_euc_C2[] = {
+static const unsigned short utf8_to_euc_C2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2387,7 +2449,7 @@ const unsigned short utf8_to_euc_C2[] = {
  0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
  0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
 };
-const unsigned short utf8_to_euc_C2_ms[] = {
+static const unsigned short utf8_to_euc_C2_ms[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2397,7 +2459,17 @@ const unsigned short utf8_to_euc_C2_ms[] = {
  0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
  0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
 };
-const unsigned short utf8_to_euc_C2_932[] = {
+static const unsigned short utf8_to_euc_C2_mac[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x00A0, 0xA242, 0x2171, 0x2172, 0xA270,   0x5C, 0xA243, 0x2178,
+ 0x212F, 0x00FD, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
+ 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
+ 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
+};
+static const unsigned short utf8_to_euc_C2_932[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2407,7 +2479,7 @@ const unsigned short utf8_to_euc_C2_932[] = {
  0x216B, 0x215E,   0x32,   0x33, 0x212D, 0x264C, 0x2279, 0x2126,
  0x2124,   0x31,   0x6F, 0x2264,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_C3[] = {
+static const unsigned short utf8_to_euc_C3[] = {
  0xAA22, 0xAA21, 0xAA24, 0xAA2A, 0xAA23, 0xAA29, 0xA921, 0xAA2E,
  0xAA32, 0xAA31, 0xAA34, 0xAA33, 0xAA40, 0xAA3F, 0xAA42, 0xAA41,
       0, 0xAA50, 0xAA52, 0xAA51, 0xAA54, 0xAA58, 0xAA53, 0x215F,
@@ -2417,7 +2489,7 @@ const unsigned short utf8_to_euc_C3[] = {
  0xA943, 0xAB50, 0xAB52, 0xAB51, 0xAB54, 0xAB58, 0xAB53, 0x2160,
  0xA94C, 0xAB63, 0xAB62, 0xAB65, 0xAB64, 0xAB72, 0xA950, 0xAB73,
 };
-const unsigned short utf8_to_euc_C3_932[] = {
+static const unsigned short utf8_to_euc_C3_932[] = {
    0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x43,
    0x45,   0x45,   0x45,   0x45,   0x49,   0x49,   0x49,   0x49,
    0x44,   0x4E,   0x4F,   0x4F,   0x4F,   0x4F,   0x4F, 0x215F,
@@ -2427,7 +2499,7 @@ const unsigned short utf8_to_euc_C3_932[] = {
    0x64,   0x6E,   0x6F,   0x6F,   0x6F,   0x6F,   0x6F, 0x2160,
    0x6F,   0x75,   0x75,   0x75,   0x75,   0x79,   0x74,   0x79,
 };
-const unsigned short utf8_to_euc_C4[] = {
+static const unsigned short utf8_to_euc_C4[] = {
  0xAA27, 0xAB27, 0xAA25, 0xAB25, 0xAA28, 0xAB28, 0xAA2B, 0xAB2B,
  0xAA2C, 0xAB2C, 0xAA2F, 0xAB2F, 0xAA2D, 0xAB2D, 0xAA30, 0xAB30,
  0xA922, 0xA942, 0xAA37, 0xAB37,      0,      0, 0xAA36, 0xAB36,
@@ -2437,7 +2509,7 @@ const unsigned short utf8_to_euc_C4[] = {
  0xAA44, 0xA945, 0xA926, 0xA946, 0xAA48, 0xAB48, 0xAA49, 0xAB49,
  0xA947, 0xAA4A, 0xAB4A, 0xAA4C, 0xAB4C, 0xAA4B, 0xAB4B, 0xA929,
 };
-const unsigned short utf8_to_euc_C5[] = {
+static const unsigned short utf8_to_euc_C5[] = {
  0xA949, 0xA928, 0xA948, 0xAA4D, 0xAB4D, 0xAA4F, 0xAB4F, 0xAA4E,
  0xAB4E, 0xA94A, 0xA92B, 0xA94B, 0xAA57, 0xAB57,      0,      0,
  0xAA56, 0xAB56, 0xA92D, 0xA94D, 0xAA59, 0xAB59, 0xAA5B, 0xAB5B,
@@ -2447,7 +2519,7 @@ const unsigned short utf8_to_euc_C5[] = {
  0xAA68, 0xAB68, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
  0xAA73, 0xAA75, 0xAB75, 0xAA77, 0xAB77, 0xAA76, 0xAB76,      0,
 };
-const unsigned short utf8_to_euc_C7[] = {
+static const unsigned short utf8_to_euc_C7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0xAA26, 0xAB26, 0xAA43,
  0xAB43, 0xAA55, 0xAB55, 0xAA67, 0xAB67, 0xAA70, 0xAB70, 0xAA6D,
@@ -2457,7 +2529,7 @@ const unsigned short utf8_to_euc_C7[] = {
       0,      0,      0,      0,      0, 0xAB39,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_CB[] = {
+static const unsigned short utf8_to_euc_CB[] = {
       0,      0,      0,      0,      0,      0,      0, 0xA230,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2467,7 +2539,7 @@ const unsigned short utf8_to_euc_CB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_CE[] = {
+static const unsigned short utf8_to_euc_CE[] = {
       0,      0,      0,      0, 0xA238, 0xA239, 0xA661,      0,
  0xA662, 0xA663, 0xA664,      0, 0xA667,      0, 0xA669, 0xA66C,
  0xA676, 0x2621, 0x2622, 0x2623, 0x2624, 0x2625, 0x2626, 0x2627,
@@ -2477,7 +2549,7 @@ const unsigned short utf8_to_euc_CE[] = {
  0xA67B, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645, 0x2646, 0x2647,
  0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F,
 };
-const unsigned short utf8_to_euc_CF[] = {
+static const unsigned short utf8_to_euc_CF[] = {
  0x2650, 0x2651, 0xA678, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
  0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2487,7 +2559,7 @@ const unsigned short utf8_to_euc_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_D0[] = {
+static const unsigned short utf8_to_euc_D0[] = {
       0, 0x2727, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747,
  0xA748, 0xA749, 0xA74A, 0xA74B, 0xA74C,      0, 0xA74D, 0xA74E,
  0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2728, 0x2729,
@@ -2497,7 +2569,7 @@ const unsigned short utf8_to_euc_D0[] = {
  0x2751, 0x2752, 0x2753, 0x2754, 0x2755, 0x2756, 0x2758, 0x2759,
  0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0x275F, 0x2760, 0x2761,
 };
-const unsigned short utf8_to_euc_D1[] = {
+static const unsigned short utf8_to_euc_D1[] = {
  0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2768, 0x2769,
  0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, 0x2770, 0x2771,
       0, 0x2757, 0xA772, 0xA773, 0xA774, 0xA775, 0xA776, 0xA777,
@@ -2507,7 +2579,7 @@ const unsigned short utf8_to_euc_D1[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E280[] = {
+static const unsigned short utf8_to_euc_E280[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
  0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
@@ -2517,7 +2589,7 @@ const unsigned short utf8_to_euc_E280[] = {
  0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
       0,      0,      0, 0x2228,      0,      0, 0x2131,      0,
 };
-const unsigned short utf8_to_euc_E280_ms[] = {
+static const unsigned short utf8_to_euc_E280_ms[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
  0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
@@ -2527,7 +2599,7 @@ const unsigned short utf8_to_euc_E280_ms[] = {
  0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
       0,      0,      0, 0x2228,      0,      0,   0x7E,      0,
 };
-const unsigned short utf8_to_euc_E280_932[] = {
+static const unsigned short utf8_to_euc_E280_932[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
  0x213E,      0,      0,      0,      0, 0x213D,      0,      0,
@@ -2537,7 +2609,7 @@ const unsigned short utf8_to_euc_E280_932[] = {
  0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
       0,      0,      0, 0x2228,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E284[] = {
+static const unsigned short utf8_to_euc_E284[] = {
       0,      0,      0, 0x216E,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0x2D62,      0,
@@ -2547,7 +2619,17 @@ const unsigned short utf8_to_euc_E284[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E285[] = {
+static const unsigned short utf8_to_euc_E284_mac[] = {
+      0,      0,      0, 0x216E,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2B7B,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2B7D, 0x00FE,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2272,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E285[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2557,7 +2639,17 @@ const unsigned short utf8_to_euc_E285[] = {
  0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
  0xF37B, 0xF37C,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E286[] = {
+static const unsigned short utf8_to_euc_E285_mac[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2A21, 0x2A22, 0x2A23, 0x2A24, 0x2A25, 0x2A26, 0x2A27, 0x2A28,
+ 0x2A29, 0x2A2A,      0,      0,      0,      0,      0,      0,
+ 0x2A35, 0x2A36, 0x2A37, 0x2A38, 0x2A39, 0x2A3A, 0x2A3B, 0x2A3C,
+ 0x2A3D, 0x2A3E,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E286[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
  0x222B, 0x222C, 0x222A, 0x222D,      0,      0,      0,      0,
@@ -2567,7 +2659,7 @@ const unsigned short utf8_to_euc_E286[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E287[] = {
+static const unsigned short utf8_to_euc_E287[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0x224D,      0, 0x224E,      0,      0,      0,
@@ -2577,7 +2669,7 @@ const unsigned short utf8_to_euc_E287[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E288[] = {
+static const unsigned short utf8_to_euc_E288[] = {
  0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
  0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
       0, 0x2D74, 0x215D,      0,      0,      0,      0,      0,
@@ -2587,7 +2679,7 @@ const unsigned short utf8_to_euc_E288[] = {
       0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
       0,      0,      0,      0,      0, 0x2266,      0,      0,
 };
-const unsigned short utf8_to_euc_E288_932[] = {
+static const unsigned short utf8_to_euc_E288_932[] = {
  0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
  0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
       0, 0x2D74,      0,      0,      0,      0,      0,      0,
@@ -2597,7 +2689,17 @@ const unsigned short utf8_to_euc_E288_932[] = {
       0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
       0,      0,      0,      0,      0, 0x2266,      0,      0,
 };
-const unsigned short utf8_to_euc_E289[] = {
+static const unsigned short utf8_to_euc_E288_mac[] = {
+ 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
+ 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2F22,
+ 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
+ 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2F21,      0,
+      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
+      0,      0,      0,      0,      0, 0x2266,      0,      0,
+};
+static const unsigned short utf8_to_euc_E289[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0x2262,      0,      0,      0,      0,      0,
@@ -2607,7 +2709,7 @@ const unsigned short utf8_to_euc_E289[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E28A[] = {
+static const unsigned short utf8_to_euc_E28A[] = {
       0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2617,7 +2719,17 @@ const unsigned short utf8_to_euc_E28A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0x2D79,
 };
-const unsigned short utf8_to_euc_E28C[] = {
+static const unsigned short utf8_to_euc_E28A_mac[] = {
+      0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x225D,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x2F23,
+};
+static const unsigned short utf8_to_euc_E28C[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0x225E,      0,      0,      0,      0,      0,
@@ -2627,7 +2739,7 @@ const unsigned short utf8_to_euc_E28C[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E291[] = {
+static const unsigned short utf8_to_euc_E291[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2637,7 +2749,17 @@ const unsigned short utf8_to_euc_E291[] = {
  0x2D31, 0x2D32, 0x2D33, 0x2D34,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E294[] = {
+static const unsigned short utf8_to_euc_E291_mac[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2921, 0x2922, 0x2923, 0x2924, 0x2925, 0x2926, 0x2927, 0x2928,
+ 0x2929, 0x292A, 0x292B, 0x292C, 0x292D, 0x292E, 0x292F, 0x2930,
+ 0x2931, 0x2932, 0x2933, 0x2934,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E294[] = {
  0x2821, 0x282C, 0x2822, 0x282D,      0,      0,      0,      0,
       0,      0,      0,      0, 0x2823,      0,      0, 0x282E,
  0x2824,      0,      0, 0x282F, 0x2826,      0,      0, 0x2831,
@@ -2647,7 +2769,7 @@ const unsigned short utf8_to_euc_E294[] = {
  0x283D,      0,      0, 0x2833, 0x282A,      0,      0, 0x283A,
  0x283F,      0,      0, 0x2835, 0x282B,      0,      0, 0x283B,
 };
-const unsigned short utf8_to_euc_E295[] = {
+static const unsigned short utf8_to_euc_E295[] = {
       0,      0, 0x2840,      0,      0,      0,      0,      0,
       0,      0,      0, 0x2836,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2657,7 +2779,7 @@ const unsigned short utf8_to_euc_E295[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E296[] = {
+static const unsigned short utf8_to_euc_E296[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2667,7 +2789,7 @@ const unsigned short utf8_to_euc_E296[] = {
       0,      0, 0x2225, 0x2224,      0,      0,      0,      0,
       0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
 };
-const unsigned short utf8_to_euc_E297[] = {
+static const unsigned short utf8_to_euc_E297[] = {
       0,      0,      0,      0,      0,      0, 0x2221, 0x217E,
       0,      0,      0, 0x217B,      0,      0, 0x217D, 0x217C,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2677,7 +2799,7 @@ const unsigned short utf8_to_euc_E297[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E298[] = {
+static const unsigned short utf8_to_euc_E298[] = {
       0,      0,      0,      0,      0, 0x217A, 0x2179,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2687,7 +2809,7 @@ const unsigned short utf8_to_euc_E298[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E299[] = {
+static const unsigned short utf8_to_euc_E299[] = {
  0x216A,      0, 0x2169,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2697,7 +2819,7 @@ const unsigned short utf8_to_euc_E299[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E380[] = {
+static const unsigned short utf8_to_euc_E380[] = {
  0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
  0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
  0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
@@ -2707,7 +2829,7 @@ const unsigned short utf8_to_euc_E380[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E380_932[] = {
+static const unsigned short utf8_to_euc_E380_932[] = {
  0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
  0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
  0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
@@ -2717,7 +2839,7 @@ const unsigned short utf8_to_euc_E380_932[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E381[] = {
+static const unsigned short utf8_to_euc_E381[] = {
       0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427,
  0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F,
  0x2430, 0x2431, 0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437,
@@ -2727,7 +2849,7 @@ const unsigned short utf8_to_euc_E381[] = {
  0x2450, 0x2451, 0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457,
  0x2458, 0x2459, 0x245A, 0x245B, 0x245C, 0x245D, 0x245E, 0x245F,
 };
-const unsigned short utf8_to_euc_E382[] = {
+static const unsigned short utf8_to_euc_E382[] = {
  0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
  0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
  0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,      0,
@@ -2737,7 +2859,7 @@ const unsigned short utf8_to_euc_E382[] = {
  0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
  0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
 };
-const unsigned short utf8_to_euc_E382_932[] = {
+static const unsigned short utf8_to_euc_E382_932[] = {
  0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
  0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
  0x2470, 0x2471, 0x2472, 0x2473, 0x2574,      0,      0,      0,
@@ -2747,7 +2869,7 @@ const unsigned short utf8_to_euc_E382_932[] = {
  0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
  0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
 };
-const unsigned short utf8_to_euc_E383[] = {
+static const unsigned short utf8_to_euc_E383[] = {
  0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
  0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
  0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
@@ -2757,7 +2879,7 @@ const unsigned short utf8_to_euc_E383[] = {
  0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,      0,
       0,      0,      0, 0x2126, 0x213C, 0x2133, 0x2134,      0,
 };
-const unsigned short utf8_to_euc_E388[] = {
+static const unsigned short utf8_to_euc_E388[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2767,7 +2889,17 @@ const unsigned short utf8_to_euc_E388[] = {
       0, 0x2D6A, 0x2D6B,      0,      0,      0,      0,      0,
       0, 0x2D6C,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E38A[] = {
+static const unsigned short utf8_to_euc_E388_mac[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2D2E, 0x2D31,      0,      0,      0,      0,      0,
+      0, 0x2D2C,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E38A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2777,7 +2909,17 @@ const unsigned short utf8_to_euc_E38A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E38C[] = {
+static const unsigned short utf8_to_euc_E38A_mac[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2D73, 0x2D74, 0x2D75, 0x2D76,
+ 0x2D77,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E38C[] = {
       0,      0,      0, 0x2D46,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0x2D4A,      0,      0,
       0,      0,      0,      0, 0x2D41,      0,      0,      0,
@@ -2787,7 +2929,17 @@ const unsigned short utf8_to_euc_E38C[] = {
       0,      0,      0,      0,      0,      0, 0x2D47,      0,
       0,      0,      0, 0x2D4F,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E38D[] = {
+static const unsigned short utf8_to_euc_E38C_mac[] = {
+      0,      0,      0, 0x2E29,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2E32,      0,      0,
+      0,      0,      0,      0, 0x2E24,      0,      0,      0,
+ 0x2E2B,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2E22, 0x2E34,      0,      0, 0x2E35, 0x2E2D,
+      0,      0,      0, 0x2E37,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2E2A,      0,
+      0,      0,      0, 0x2E36,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E38D[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0, 0x2D40, 0x2D4E,      0,      0, 0x2D43,      0,      0,
       0, 0x2D48,      0,      0,      0,      0,      0, 0x2D49,
@@ -2797,7 +2949,17 @@ const unsigned short utf8_to_euc_E38D[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x2D5F, 0x2D6F, 0x2D6E, 0x2D6D,      0,
 };
-const unsigned short utf8_to_euc_E38E[] = {
+static const unsigned short utf8_to_euc_E38D_mac[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2E21, 0x2E2F,      0,      0, 0x2E23,      0,      0,
+      0, 0x2E2E,      0,      0,      0,      0,      0, 0x2E31,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2E6A, 0x2E69, 0x2E68, 0x2E67,      0,
+};
+static const unsigned short utf8_to_euc_E38E[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0x2D53, 0x2D54,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2807,7 +2969,17 @@ const unsigned short utf8_to_euc_E38E[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E38F[] = {
+static const unsigned short utf8_to_euc_E38E_mac[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2B2B, 0x2B2D,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2B21, 0x2B23, 0x2B29,      0,
+      0, 0x2B27,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E38F[] = {
       0,      0,      0,      0, 0x2D55,      0,      0,      0,
       0,      0,      0,      0,      0, 0x2D63,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2817,7 +2989,17 @@ const unsigned short utf8_to_euc_E38F[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E4B8[] = {
+static const unsigned short utf8_to_euc_E38F_mac[] = {
+      0,      0,      0,      0, 0x2B2E,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2B7C,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4B8[] = {
  0x306C, 0x437A, 0xB021, 0x3C37, 0xB022, 0xB023,      0, 0x4B7C,
  0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F,      0,
  0x5022, 0x312F, 0xB025,      0, 0x336E, 0x5023, 0x4024, 0x5242,
@@ -2827,7 +3009,7 @@ const unsigned short utf8_to_euc_E4B8[] = {
  0xB02D, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
  0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
 };
-const unsigned short utf8_to_euc_E4B9[] = {
+static const unsigned short utf8_to_euc_E4B9[] = {
  0xB02F, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557,      0, 0xB032,
       0,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33,
       0, 0xB033,      0,      0,      0, 0x6949, 0x502A, 0x3E68,
@@ -2837,7 +3019,7 @@ const unsigned short utf8_to_euc_E4B9[] = {
       0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
       0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
 };
-const unsigned short utf8_to_euc_E4BA[] = {
+static const unsigned short utf8_to_euc_E4BA[] = {
  0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0,
  0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0xB03D, 0x5032,      0,
       0, 0x313E, 0x385F,      0, 0x385E, 0x3066, 0xB03E, 0xB03F,
@@ -2847,7 +3029,7 @@ const unsigned short utf8_to_euc_E4BA[] = {
  0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
       0, 0xB042, 0x3F4D,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E4BB[] = {
+static const unsigned short utf8_to_euc_E4BB[] = {
  0x3D3A, 0x3F4E, 0x503E, 0xB043, 0x503C,      0, 0x503D, 0x3558,
       0,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29,
  0xB044,      0,      0,      0, 0x3B46, 0x3B45, 0x423E, 0x503F,
@@ -2857,7 +3039,7 @@ const unsigned short utf8_to_euc_E4BB[] = {
  0x3644, 0xB04C, 0x4367, 0xB04D,      0, 0xB04E, 0x376F, 0x5043,
       0,      0,      0, 0x4724, 0xF42F, 0xB04F, 0xB050, 0xB051,
 };
-const unsigned short utf8_to_euc_E4BC[] = {
+static const unsigned short utf8_to_euc_E4BC[] = {
  0xB052, 0x346B, 0xB053, 0xB054,      0,      0,      0,      0,
  0xB055, 0x5044, 0x304B, 0xB056, 0xB057, 0x3860, 0x346C, 0x497A,
  0x4832, 0x3559, 0xB058,      0,      0, 0xB059, 0xB05A, 0xB05B,
@@ -2867,7 +3049,7 @@ const unsigned short utf8_to_euc_E4BC[] = {
  0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xB062,
  0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xB065,      0,
 };
-const unsigned short utf8_to_euc_E4BD[] = {
+static const unsigned short utf8_to_euc_E4BD[] = {
  0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
  0xB068, 0xB069,      0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
  0x3A34, 0x4D24, 0xB06C, 0x424E, 0xB06D, 0x323F, 0xB06E, 0x5049,
@@ -2877,7 +3059,7 @@ const unsigned short utf8_to_euc_E4BD[] = {
  0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xB076,
  0xB077, 0xB078, 0xB079, 0x504F, 0x3873, 0xB07A, 0xB07B, 0x3B48,
 };
-const unsigned short utf8_to_euc_E4BE[] = {
+static const unsigned short utf8_to_euc_E4BE[] = {
       0, 0xB07C, 0xB07D, 0x3426, 0xB07E, 0xB121, 0x5054,      0,
  0x504C, 0xB122, 0xB123, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
  0xB126, 0x5052, 0xB127, 0xB128, 0xB129,      0, 0x5055, 0xB12A,
@@ -2887,7 +3069,7 @@ const unsigned short utf8_to_euc_E4BE[] = {
       0,      0, 0xB12F,      0,      0, 0x3F2F, 0x4E37, 0xB130,
       0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xB135, 0x4A58,
 };
-const unsigned short utf8_to_euc_E4BF[] = {
+static const unsigned short utf8_to_euc_E4BF[] = {
  0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xB138, 0xB139,      0,
  0xB13A, 0xB13B, 0x3D53, 0xB13C, 0xB13D, 0xB13E, 0x5059, 0xB13F,
  0x505E, 0x505C, 0xB140,      0, 0x5057,      0,      0, 0x422F,
@@ -2897,7 +3079,7 @@ const unsigned short utf8_to_euc_E4BF[] = {
  0xB144,      0, 0xB145, 0x4750,      0, 0x4936, 0x5068,      0,
  0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
 };
-const unsigned short utf8_to_euc_E580[] = {
+static const unsigned short utf8_to_euc_E580[] = {
  0xB149, 0xB14A,      0,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
       0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0xB14F, 0x6047,
  0xB150, 0x506E, 0x455D, 0xB151, 0x5063,      0, 0x3876, 0xB152,
@@ -2907,7 +3089,7 @@ const unsigned short utf8_to_euc_E580[] = {
  0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
       0, 0x3770,      0, 0xB176,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E581[] = {
+static const unsigned short utf8_to_euc_E581[] = {
  0xB15F, 0xB160, 0xB161, 0x5070,      0, 0xB162, 0xB163, 0x5071,
  0x5075, 0x304E, 0xB164,      0, 0xB165,      0, 0xB166, 0x4A50,
  0x5074, 0xB167, 0xB168, 0xB169,      0, 0x5073, 0x5077, 0xB16A,
@@ -2917,7 +3099,7 @@ const unsigned short utf8_to_euc_E581[] = {
  0xB174, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
  0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
 };
-const unsigned short utf8_to_euc_E582[] = {
+static const unsigned short utf8_to_euc_E582[] = {
  0x507A, 0xB177,      0, 0xB178, 0xB179, 0x507C, 0xB17A,      0,
       0,      0, 0xB17B,      0,      0, 0x4B35, 0xB17C, 0xB17D,
  0xB17E, 0x3766, 0xB221, 0xB222, 0xB223,      0, 0xB224,      0,
@@ -2927,7 +3109,7 @@ const unsigned short utf8_to_euc_E582[] = {
  0xB22E,      0, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
       0, 0xB22F, 0xB230,      0,      0, 0xB231, 0x3739,      0,
 };
-const unsigned short utf8_to_euc_E583[] = {
+static const unsigned short utf8_to_euc_E583[] = {
  0xB232,      0, 0x5124, 0xB233, 0xB234, 0x364F,      0, 0xB235,
       0, 0x5121, 0x5122,      0, 0xB236, 0x462F, 0xB237, 0x417C,
  0xB238, 0x3623,      0, 0xB239, 0xB23A, 0x4B4D, 0x5125,      0,
@@ -2937,7 +3119,7 @@ const unsigned short utf8_to_euc_E583[] = {
       0, 0xB245, 0xB251,      0, 0xF430, 0x512C, 0xB246,      0,
       0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
 };
-const unsigned short utf8_to_euc_E584[] = {
+static const unsigned short utf8_to_euc_E584[] = {
  0x3537, 0x512E, 0x512F, 0xB249, 0x322F,      0, 0xB24A, 0xB24B,
  0xB24C, 0x512D,      0, 0xB24D, 0xB24E, 0xB24F, 0xB250,      0,
  0xB252,      0, 0x3C74,      0, 0x5132, 0x5131, 0x5130, 0xB253,
@@ -2947,7 +3129,7 @@ const unsigned short utf8_to_euc_E584[] = {
       0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0xB262,      0, 0x5136,
  0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
 };
-const unsigned short utf8_to_euc_E585[] = {
+static const unsigned short utf8_to_euc_E585[] = {
  0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
  0x4068, 0x3877, 0xB266, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
  0x3B79,      0, 0x513B, 0xB268, 0x513D, 0xB269,      0, 0xB26A,
@@ -2957,7 +3139,7 @@ const unsigned short utf8_to_euc_E585[] = {
       0, 0x3626,      0,      0,      0, 0x4A3C, 0x4236, 0x3671,
  0x4535,      0,      0,      0, 0x3773,      0, 0xB26F,      0,
 };
-const unsigned short utf8_to_euc_E586[] = {
+static const unsigned short utf8_to_euc_E586[] = {
  0x5143,      0, 0x5144, 0xB270, 0xB271, 0x4662, 0x315F,      0,
       0, 0x5147, 0x3A7D, 0xB272, 0x5146, 0x3A46, 0xB273, 0x5148,
  0x666E, 0x5149, 0x4B41, 0x514A,      0, 0x514B, 0x514C, 0x3E69,
@@ -2967,7 +3149,7 @@ const unsigned short utf8_to_euc_E586[] = {
  0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
  0xB279,      0, 0xB27A,      0, 0xB27B, 0x5158, 0xB27C, 0xB27D,
 };
-const unsigned short utf8_to_euc_E587[] = {
+static const unsigned short utf8_to_euc_E587[] = {
       0,      0, 0xB27E,      0, 0x4028, 0x5159, 0x3D5A,      0,
  0xB321, 0x515A,      0, 0x437C, 0x4E3F, 0x4560,      0, 0xB322,
       0, 0xB323, 0xB324, 0xB325,      0, 0xB326, 0x5245,      0,
@@ -2977,7 +3159,7 @@ const unsigned short utf8_to_euc_E587[] = {
  0x5160, 0x332E, 0xB32C, 0xB32D, 0xB32E, 0x5161, 0x3627, 0xB32F,
  0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
 };
-const unsigned short utf8_to_euc_E588[] = {
+static const unsigned short utf8_to_euc_E588[] = {
  0x4561, 0xB330, 0xB331, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
  0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0,
       0, 0x373A, 0xB333, 0xB334, 0x5165, 0xB335, 0xB336, 0x4E73,
@@ -2987,7 +3169,7 @@ const unsigned short utf8_to_euc_E588[] = {
  0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
  0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E589[] = {
+static const unsigned short utf8_to_euc_E589[] = {
       0,      0,      0, 0x4466, 0x516D, 0xB33E,      0, 0x4227,
       0, 0xB33F, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C,
       0,      0,      0,      0, 0x5171, 0xB340, 0x4B36, 0xB341,
@@ -2997,7 +3179,7 @@ const unsigned short utf8_to_euc_E589[] = {
  0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xB34A,
  0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
 };
-const unsigned short utf8_to_euc_E58A[] = {
+static const unsigned short utf8_to_euc_E58A[] = {
  0xB34D,      0, 0xB34E, 0x3344,      0, 0xB34F,      0, 0x3760,
  0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
       0, 0x517D, 0x517A, 0xB352, 0x5179, 0xB353, 0xB354, 0xB355,
@@ -3007,7 +3189,7 @@ const unsigned short utf8_to_euc_E58A[] = {
  0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
  0xB361, 0x387A, 0xB362, 0xB363, 0x5224, 0xB364, 0x332F,      0,
 };
-const unsigned short utf8_to_euc_E58B[] = {
+static const unsigned short utf8_to_euc_E58B[] = {
  0xB365, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
  0xB368, 0x4A59,      0,      0, 0xB369, 0x5227,      0, 0xB36A,
       0, 0xB36B, 0x7055,      0, 0xB36C, 0x4630, 0xB36D, 0x5228,
@@ -3017,7 +3199,7 @@ const unsigned short utf8_to_euc_E58B[] = {
  0xB376, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xB37A,
  0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E,
 };
-const unsigned short utf8_to_euc_E58C[] = {
+static const unsigned short utf8_to_euc_E58C[] = {
  0xB37B, 0x4C68, 0x4677, 0xB37C,      0, 0x4A71, 0x5232, 0xF432,
  0x5233,      0, 0xB37D, 0xB37E, 0xB421, 0x5235,      0, 0x5237,
  0x5236, 0xB422,      0, 0xB423,      0, 0x5238, 0x323D, 0x4B4C,
@@ -3027,7 +3209,7 @@ const unsigned short utf8_to_euc_E58C[] = {
  0xB430, 0x523C, 0xB431, 0x523D,      0, 0xB432,      0,      0,
  0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xB435, 0x463F,
 };
-const unsigned short utf8_to_euc_E58D[] = {
+static const unsigned short utf8_to_euc_E58D[] = {
  0x523F, 0x3D3D, 0xB436, 0x4069,      0, 0x5241, 0x5240, 0x3E23,
  0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244,      0,      0,
       0, 0x485C, 0x4234, 0x426E, 0x3628,      0,      0, 0x466E,
@@ -3037,7 +3219,7 @@ const unsigned short utf8_to_euc_E58D[] = {
  0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
  0x3237, 0xB441,      0, 0x524A,      0,      0, 0xB442, 0x362A,
 };
-const unsigned short utf8_to_euc_E58E[] = {
+static const unsigned short utf8_to_euc_E58E[] = {
       0,      0, 0x524C, 0xB443, 0x4C71,      0,      0, 0xB444,
  0xB445,      0,      0,      0,      0,      0, 0xB446,      0,
       0,      0,      0, 0xB447, 0xB448,      0, 0x524D,      0,
@@ -3047,7 +3229,7 @@ const unsigned short utf8_to_euc_E58E[] = {
  0x5252,      0, 0xB450, 0x3837, 0xB451, 0xB452, 0x5253, 0xB453,
  0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
 };
-const unsigned short utf8_to_euc_E58F[] = {
+static const unsigned short utf8_to_euc_E58F[] = {
  0xB457,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
  0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
       0,      0, 0xB45A, 0xB45B, 0x3D47, 0xB45C, 0x3C68, 0x3C75,
@@ -3057,7 +3239,7 @@ const unsigned short utf8_to_euc_E58F[] = {
  0x4266, 0x3C38, 0x3B4B, 0x3126,      0, 0xB463, 0x3370, 0x3966,
  0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E590[] = {
+static const unsigned short utf8_to_euc_E590[] = {
       0, 0x525E, 0xB464, 0x3549, 0x3346,      0,      0,      0,
  0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
  0x4547, 0x387E,      0, 0xB465,      0,      0,      0,      0,
@@ -3067,7 +3249,7 @@ const unsigned short utf8_to_euc_E590[] = {
       0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
  0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
 };
-const unsigned short utf8_to_euc_E591[] = {
+static const unsigned short utf8_to_euc_E591[] = {
  0x5260,      0, 0x4F24, 0xB46F, 0xB470,      0, 0x4A72, 0xB471,
  0x4468, 0x3862, 0x3970,      0,      0, 0xB472, 0x5268, 0xB473,
       0, 0x465D,      0,      0,      0,      0,      0,      0,
@@ -3077,7 +3259,7 @@ const unsigned short utf8_to_euc_E591[] = {
  0x526F, 0x526D,      0, 0x4C23, 0xB47D, 0x526A, 0x5273, 0x526E,
       0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0xB47E,
 };
-const unsigned short utf8_to_euc_E592[] = {
+static const unsigned short utf8_to_euc_E592[] = {
  0x5272, 0xB521,      0, 0xB522, 0x5274, 0xB523, 0x5276,      0,
  0xB524, 0xB525, 0xF435, 0x3A70, 0x4F42, 0xB526, 0x526B, 0x5269,
  0x5275, 0xB527, 0x5270,      0,      0, 0xB528, 0xB529,      0,
@@ -3087,7 +3269,7 @@ const unsigned short utf8_to_euc_E592[] = {
       0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xB534,
  0x5279, 0xB535, 0xB536, 0xB537, 0x5325, 0x3076, 0x5324, 0xB538,
 };
-const unsigned short utf8_to_euc_E593[] = {
+static const unsigned short utf8_to_euc_E593[] = {
  0x3025, 0x494A, 0x5322,      0, 0x527C,      0, 0xB539, 0x5277,
  0x527D, 0x3A48, 0xB53A,      0,      0, 0xB53B, 0xB53C,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -3097,7 +3279,7 @@ const unsigned short utf8_to_euc_E593[] = {
       0,      0, 0x452F,      0,      0,      0, 0xB541,      0,
       0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0xB544,
 };
-const unsigned short utf8_to_euc_E594[] = {
+static const unsigned short utf8_to_euc_E594[] = {
  0xB545, 0xB546,      0,      0, 0x3134, 0xB547, 0x3A36, 0x3F30,
  0xB548, 0xB549,      0,      0, 0xB54A, 0xB54B, 0xB54C, 0x5329,
  0x4562,      0,      0,      0, 0x532A, 0xB54D, 0x3022,      0,
@@ -3107,7 +3289,7 @@ const unsigned short utf8_to_euc_E594[] = {
       0, 0x3E27, 0xB550, 0x533A,      0, 0xB551, 0xB552,      0,
  0x5339, 0x5330,      0, 0xB553, 0xB554, 0xB555, 0x4243,      0,
 };
-const unsigned short utf8_to_euc_E595[] = {
+static const unsigned short utf8_to_euc_E595[] = {
  0x5331, 0xB556,      0,      0, 0x426F, 0x5336, 0x3E26, 0xB557,
       0, 0xB558, 0xB559,      0, 0x5333, 0xB55A,      0, 0x4C64,
  0xB55B, 0xB55C,      0, 0x373C,      0,      0, 0x5337, 0x5338,
@@ -3117,7 +3299,7 @@ const unsigned short utf8_to_euc_E595[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x5341, 0x5346,      0, 0x5342, 0xB565,
 };
-const unsigned short utf8_to_euc_E596[] = {
+static const unsigned short utf8_to_euc_E596[] = {
  0x533D, 0xB566, 0xB567, 0x5347, 0x4131,      0, 0xB568, 0x5349,
  0xB569, 0x3922, 0x533F, 0x437D,      0,      0, 0xB56A, 0xB56B,
       0, 0xB56C, 0xB56D, 0xB56E, 0xB56F,      0,      0, 0xB570,
@@ -3127,7 +3309,7 @@ const unsigned short utf8_to_euc_E596[] = {
  0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
       0,      0,      0,      0,      0,      0,      0, 0xB575,
 };
-const unsigned short utf8_to_euc_E597[] = {
+static const unsigned short utf8_to_euc_E597[] = {
       0, 0xB576,      0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
       0, 0xB579,      0, 0xB57A, 0xB57B,      0, 0xB57C,      0,
       0, 0xB57D, 0xB57E, 0xB621, 0x5351,      0,      0, 0xB622,
@@ -3137,7 +3319,7 @@ const unsigned short utf8_to_euc_E597[] = {
       0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
       0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
 };
-const unsigned short utf8_to_euc_E598[] = {
+static const unsigned short utf8_to_euc_E598[] = {
       0,      0,      0,      0,      0, 0xB62A, 0x4332,      0,
  0xB62B, 0x3245, 0xB62C,      0,      0, 0xB62D, 0xB62E, 0xB62F,
  0xB630, 0xB631, 0xB632,      0, 0x5352,      0, 0x5354, 0x3E28,
@@ -3147,7 +3329,7 @@ const unsigned short utf8_to_euc_E598[] = {
  0xB635, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xB638,
  0x535F, 0xB639,      0, 0xB63A, 0xB63B, 0xB63C,      0, 0xB63D,
 };
-const unsigned short utf8_to_euc_E599[] = {
+static const unsigned short utf8_to_euc_E599[] = {
  0xB63E, 0xB63F, 0x313D, 0xB640, 0xB641,      0, 0xB642,      0,
       0, 0xB643,      0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
  0x535A,      0,      0,      0, 0xB647,      0,      0,      0,
@@ -3157,7 +3339,7 @@ const unsigned short utf8_to_euc_E599[] = {
       0, 0xB651, 0xB652,      0, 0x4A2E, 0xB653,      0,      0,
  0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E59A[] = {
+static const unsigned short utf8_to_euc_E59A[] = {
  0x5366,      0,      0,      0, 0xB654, 0xB655, 0x5365, 0x3345,
  0xB656,      0, 0x5367, 0xB657, 0xB658,      0,      0, 0x536A,
       0,      0,      0,      0, 0x5369, 0xB659,      0,      0,
@@ -3167,7 +3349,7 @@ const unsigned short utf8_to_euc_E59A[] = {
       0, 0xB666,      0, 0xB667, 0x536E,      0, 0x536D, 0xB668,
       0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
 };
-const unsigned short utf8_to_euc_E59B[] = {
+static const unsigned short utf8_to_euc_E59B[] = {
  0x5373, 0x5371, 0x536F, 0x5372,      0, 0xB66A,      0,      0,
  0x5374, 0xB66B, 0xB66C, 0xB66D, 0xB670, 0xB671, 0x5375, 0xB66E,
  0xB66F, 0x5376,      0, 0x5377,      0,      0,      0, 0x5378,
@@ -3177,7 +3359,7 @@ const unsigned short utf8_to_euc_E59B[] = {
  0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xB721, 0xB722,
       0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
 };
-const unsigned short utf8_to_euc_E59C[] = {
+static const unsigned short utf8_to_euc_E59C[] = {
  0x537B, 0xB723, 0xB724, 0x4A60, 0x537D,      0,      0, 0xB725,
  0x5421, 0x537E, 0xB726, 0x5422, 0xB727, 0x5423,      0, 0x3777,
       0, 0xB728, 0x3160, 0x5424,      0, 0xB729, 0x5426,      0,
@@ -3187,7 +3369,7 @@ const unsigned short utf8_to_euc_E59C[] = {
  0x434F,      0,      0, 0xB737, 0xB738,      0,      0, 0x542A,
  0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
 };
-const unsigned short utf8_to_euc_E59D[] = {
+static const unsigned short utf8_to_euc_E59D[] = {
  0x542E,      0, 0x3A64,      0,      0, 0xB73C, 0xB73D, 0x3651,
       0,      0, 0x4B37,      0, 0xB73E, 0xB73F, 0x542C, 0x542F,
  0x3A41, 0x3923, 0xB740,      0,      0,      0,      0,      0,
@@ -3197,7 +3379,7 @@ const unsigned short utf8_to_euc_E59D[] = {
  0xB749, 0xB74A,      0, 0xB74B, 0xB74C, 0xB74D,      0, 0xB74E,
       0, 0xB74F, 0xB750, 0xB751, 0xB752,      0, 0xB753, 0x5434,
 };
-const unsigned short utf8_to_euc_E59E[] = {
+static const unsigned short utf8_to_euc_E59E[] = {
       0, 0xB754, 0x3F62, 0xB755,      0,      0,      0,      0,
  0x5432, 0x5435,      0, 0x373F, 0xB756,      0,      0,      0,
       0,      0,      0, 0x5436, 0xB757, 0xB760,      0, 0xB758,
@@ -3207,7 +3389,7 @@ const unsigned short utf8_to_euc_E59E[] = {
  0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
  0xB765,      0,      0,      0,      0, 0xB766,      0,      0,
 };
-const unsigned short utf8_to_euc_E59F[] = {
+static const unsigned short utf8_to_euc_E59F[] = {
  0x5431,      0,      0, 0x543C,      0,      0, 0x543D, 0xB767,
  0xB768,      0,      0, 0x4B64, 0xB769,      0, 0x3E6B, 0xB76A,
       0,      0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442,      0,
@@ -3217,7 +3399,7 @@ const unsigned short utf8_to_euc_E59F[] = {
  0xB773,      0,      0,      0, 0x3E7D, 0xB774, 0xB775, 0x3C39,
  0xB776, 0x475D, 0x3470,      0, 0x3A6B, 0xB777, 0xB778, 0xB779,
 };
-const unsigned short utf8_to_euc_E5A0[] = {
+static const unsigned short utf8_to_euc_E5A0[] = {
  0x4B59,      0, 0x4632, 0xB77A, 0xB77B, 0x3778, 0x424F,      0,
  0xB77C, 0xB77D, 0x5441, 0x5444, 0xB821, 0xB822,      0,      0,
       0,      0,      0,      0,      0, 0x4244,      0,      0,
@@ -3227,7 +3409,7 @@ const unsigned short utf8_to_euc_E5A0[] = {
  0x3161, 0x4A73, 0xB82A,      0, 0x3E6C, 0x4548,      0,      0,
       0, 0xB82B, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
 };
-const unsigned short utf8_to_euc_E5A1[] = {
+static const unsigned short utf8_to_euc_E5A1[] = {
  0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0,
       0, 0xB82D, 0x3274, 0x544A, 0xB82E, 0xB82F,      0, 0xB830,
  0xB831, 0x413A, 0x544D,      0, 0x4563, 0xB832,      0, 0x4549,
@@ -3237,7 +3419,7 @@ const unsigned short utf8_to_euc_E5A1[] = {
  0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
  0xB838, 0x544F,      0,      0, 0xB839,      0, 0x3D4E, 0xB83A,
 };
-const unsigned short utf8_to_euc_E5A2[] = {
+static const unsigned short utf8_to_euc_E5A2[] = {
  0xB83B, 0xB83C,      0, 0x362D,      0, 0x5450,      0, 0xB83D,
  0xB83E, 0xB83F, 0xB840,      0, 0xB841, 0xB842,      0, 0xB843,
  0xB844,      0,      0, 0x4A68, 0xB845,      0, 0xB846, 0x417D,
@@ -3247,7 +3429,7 @@ const unsigned short utf8_to_euc_E5A2[] = {
       0, 0xB84D, 0xB84E, 0x4A2F,      0,      0,      0,      0,
  0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
 };
-const unsigned short utf8_to_euc_E5A3[] = {
+static const unsigned short utf8_to_euc_E5A3[] = {
       0, 0x4A49, 0xB851,      0, 0xB84F, 0x5459,      0, 0x4345,
  0xB852,      0, 0x3275,      0, 0x3E6D, 0xB853, 0xB854,      0,
  0xB855, 0x545B, 0xB856, 0x545A, 0xB857, 0x3968, 0xB858, 0x545C,
@@ -3257,7 +3439,7 @@ const unsigned short utf8_to_euc_E5A3[] = {
  0x403C, 0x306D, 0x4764, 0xB85E,      0,      0,      0, 0x445B,
       0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
 };
-const unsigned short utf8_to_euc_E5A4[] = {
+static const unsigned short utf8_to_euc_E5A4[] = {
       0,      0, 0x5469,      0,      0, 0xB85F, 0xB860,      0,
       0, 0x4A51, 0x546A, 0xB861, 0xB862,      0,      0, 0x3246,
  0x546B,      0, 0xB863, 0xB864, 0xB865, 0x4D3C, 0x3330,      0,
@@ -3267,7 +3449,7 @@ const unsigned short utf8_to_euc_E5A4[] = {
  0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
  0x5472,      0,      0,      0,      0,      0, 0x5473, 0xB871,
 };
-const unsigned short utf8_to_euc_E5A5[] = {
+static const unsigned short utf8_to_euc_E5A5[] = {
       0,      0,      0, 0xB872, 0x3162,      0, 0xB873, 0x3471,
  0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
  0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475,      0, 0x4565,
@@ -3277,7 +3459,7 @@ const unsigned short utf8_to_euc_E5A5[] = {
       0,      0, 0xB922, 0x3D77, 0x455B, 0xB923, 0xB924,      0,
  0x5521, 0xB925,      0, 0xB926, 0xB927, 0x3925,      0,      0,
 };
-const unsigned short utf8_to_euc_E5A6[] = {
+static const unsigned short utf8_to_euc_E5A6[] = {
       0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0,
       0,      0, 0x4725, 0xB928, 0xB929, 0x552B, 0xB92A,      0,
       0,      0, 0xB92B, 0x3538,      0, 0xB92C, 0x4D45, 0xB92D,
@@ -3287,7 +3469,7 @@ const unsigned short utf8_to_euc_E5A6[] = {
  0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
       0, 0x4B65, 0xB937, 0x3A4A, 0xB938,      0, 0x3E2A,      0,
 };
-const unsigned short utf8_to_euc_E5A7[] = {
+static const unsigned short utf8_to_euc_E5A7[] = {
       0, 0xB939,      0, 0xB93A, 0xB93B,      0, 0x5528,      0,
  0xB93C, 0x3B50, 0xB93D, 0x3B4F,      0, 0xB93E,      0,      0,
  0x3039, 0x3848, 0xB93F, 0x402B, 0x3051,      0,      0,      0,
@@ -3297,7 +3479,7 @@ const unsigned short utf8_to_euc_E5A7[] = {
       0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
       0,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
 };
-const unsigned short utf8_to_euc_E5A8[] = {
+static const unsigned short utf8_to_euc_E5A8[] = {
  0xB94C, 0x3052,      0, 0x3023, 0xB94D,      0,      0,      0,
       0, 0x5532,      0,      0, 0xB94E, 0xB94F, 0xB950,      0,
       0, 0x5530, 0xB951, 0xB952,      0,      0,      0,      0,
@@ -3307,7 +3489,7 @@ const unsigned short utf8_to_euc_E5A8[] = {
  0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
       0,      0,      0,      0, 0x3E2B,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E5A9[] = {
+static const unsigned short utf8_to_euc_E5A9[] = {
  0x5534, 0x4F2C,      0,      0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
  0xB95E, 0x5536,      0,      0, 0xB95F,      0,      0,      0,
  0xB960,      0,      0,      0,      0, 0xB961,      0,      0,
@@ -3317,7 +3499,7 @@ const unsigned short utf8_to_euc_E5A9[] = {
       0,      0,      0,      0,      0,      0,      0, 0xB967,
       0,      0, 0xB968, 0xB969,      0,      0, 0xB96A, 0x4C3B,
 };
-const unsigned short utf8_to_euc_E5AA[] = {
+static const unsigned short utf8_to_euc_E5AA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xB96B,      0,      0,      0,      0,
  0xB96C,      0, 0x475E, 0xB96D,      0,      0, 0xB96E,      0,
@@ -3327,7 +3509,7 @@ const unsigned short utf8_to_euc_E5AA[] = {
       0, 0xB977, 0xB978, 0xB979,      0, 0xB97A,      0,      0,
  0xB97B,      0, 0xB97C, 0xB97D, 0x553C, 0x5540, 0x553D, 0xB97E,
 };
-const unsigned short utf8_to_euc_E5AB[] = {
+static const unsigned short utf8_to_euc_E5AB[] = {
       0, 0x3247, 0x553F,      0, 0xBA21,      0, 0xBA22,      0,
  0xBA23, 0x3C3B,      0, 0x553E, 0x3779,      0,      0, 0xBA24,
  0x554C,      0,      0,      0,      0,      0, 0x5545, 0x5542,
@@ -3337,7 +3519,7 @@ const unsigned short utf8_to_euc_E5AB[] = {
       0,      0,      0,      0,      0, 0xBA2B, 0xBA2C,      0,
       0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
 };
-const unsigned short utf8_to_euc_E5AC[] = {
+static const unsigned short utf8_to_euc_E5AC[] = {
  0xBA2E, 0xBA2F,      0,      0,      0,      0,      0,      0,
  0xBA30, 0x3472,      0, 0x5549, 0x5548,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0x554A, 0xBA31,
@@ -3347,7 +3529,7 @@ const unsigned short utf8_to_euc_E5AC[] = {
  0x3145,      0, 0x554B,      0, 0xBA32,      0, 0x554E,      0,
  0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
 };
-const unsigned short utf8_to_euc_E5AD[] = {
+static const unsigned short utf8_to_euc_E5AD[] = {
  0x5552, 0xBA3A,      0, 0x5550,      0, 0x5551,      0,      0,
       0,      0,      0, 0xBA3B, 0xBA3C,      0,      0,      0,
  0x3B52, 0x5553, 0xBA3D,      0, 0x3926, 0x5554, 0xBA3E, 0x3B7A,
@@ -3357,7 +3539,7 @@ const unsigned short utf8_to_euc_E5AD[] = {
  0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
  0x555C,      0, 0x555E,      0, 0xBA43, 0xBA44, 0xBA45, 0xBA46,
 };
-const unsigned short utf8_to_euc_E5AE[] = {
+static const unsigned short utf8_to_euc_E5AE[] = {
  0x555F, 0xBA47,      0, 0x5560, 0xBA48, 0x4270, 0xBA49, 0x3127,
  0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
  0xBA4C, 0xBA4D,      0, 0xBA4E, 0xBA4F, 0x4566, 0xBA50, 0x3D21,
@@ -3367,7 +3549,7 @@ const unsigned short utf8_to_euc_E5AE[] = {
  0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
  0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
 };
-const unsigned short utf8_to_euc_E5AF[] = {
+static const unsigned short utf8_to_euc_E5AF[] = {
  0xBA5B, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
       0, 0x5565,      0,      0, 0x4959, 0xBA5D,      0, 0xBA5E,
  0x5567,      0, 0x3428, 0x3677, 0x5566,      0, 0xBA5F, 0xBA60,
@@ -3377,7 +3559,7 @@ const unsigned short utf8_to_euc_E5AF[] = {
  0x556E, 0xBA66,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
  0x4023,      0, 0x3B7B,      0,      0, 0xBA68, 0x4250, 0x3C77,
 };
-const unsigned short utf8_to_euc_E5B0[] = {
+static const unsigned short utf8_to_euc_E5B0[] = {
       0, 0x4975, 0x406C,      0, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
  0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
       0, 0x3E2F,      0, 0x5575,      0,      0, 0x406D, 0xBA6A,
@@ -3387,7 +3569,7 @@ const unsigned short utf8_to_euc_E5B0[] = {
  0xBA73, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
  0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
 };
-const unsigned short utf8_to_euc_E5B1[] = {
+static const unsigned short utf8_to_euc_E5B1[] = {
  0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0,
  0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622,
  0x5621, 0x367D,      0, 0x557E,      0, 0x4538,      0,      0,
@@ -3397,7 +3579,7 @@ const unsigned short utf8_to_euc_E5B1[] = {
  0xBB22, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
       0, 0x5628, 0xBB25, 0xBB26, 0xBB27, 0xBB28,      0,      0,
 };
-const unsigned short utf8_to_euc_E5B2[] = {
+static const unsigned short utf8_to_euc_E5B2[] = {
       0,      0,      0,      0,      0,      0,      0, 0xBB29,
  0xBB2A,      0, 0xBB2B,      0, 0x5629,      0,      0, 0xBB2C,
  0x3474, 0x562A, 0xBB2D,      0, 0x562B,      0,      0,      0,
@@ -3407,7 +3589,7 @@ const unsigned short utf8_to_euc_E5B2[] = {
       0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xBB37, 0x562F, 0x5631,
  0x345F,      0, 0xBB38, 0x562E, 0x5630,      0, 0x5633,      0,
 };
-const unsigned short utf8_to_euc_E5B3[] = {
+static const unsigned short utf8_to_euc_E5B3[] = {
       0,      0,      0,      0,      0, 0x5632,      0, 0x5634,
       0, 0xBB39,      0, 0xBB3A,      0,      0,      0,      0,
       0,      0, 0xBB3B,      0,      0,      0,      0, 0xBB3D,
@@ -3417,7 +3599,7 @@ const unsigned short utf8_to_euc_E5B3[] = {
  0x4A76, 0xBB3F, 0xBB40,      0, 0xBB41, 0xF43B, 0x4567,      0,
       0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
 };
-const unsigned short utf8_to_euc_E5B4[] = {
+static const unsigned short utf8_to_euc_E5B4[] = {
       0, 0xBB42,      0,      0,      0,      0, 0xBB43, 0x3F72,
       0,      0,      0, 0x563C,      0, 0xBB44, 0x3A6A,      0,
       0, 0x5642, 0xBB45,      0, 0x5643, 0x563D, 0x3333, 0x563E,
@@ -3427,7 +3609,7 @@ const unsigned short utf8_to_euc_E5B4[] = {
       0, 0xBB4B,      0,      0, 0xBB4C,      0,      0,      0,
       0, 0xBB4D,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
 };
-const unsigned short utf8_to_euc_E5B5[] = {
+static const unsigned short utf8_to_euc_E5B5[] = {
       0,      0, 0xBB50, 0xBB51,      0,      0, 0xBB52,      0,
  0xBB53,      0, 0xBB57, 0x564B, 0x5648,      0, 0x564A,      0,
  0x4D72, 0xBB55, 0x5649, 0xF43C,      0, 0xBB54,      0,      0,
@@ -3437,7 +3619,7 @@ const unsigned short utf8_to_euc_E5B5[] = {
  0xBB5F,      0,      0, 0x564D,      0,      0, 0x564E,      0,
       0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
 };
-const unsigned short utf8_to_euc_E5B6[] = {
+static const unsigned short utf8_to_euc_E5B6[] = {
       0, 0xBB64, 0x5651, 0xBB65, 0x5650,      0,      0, 0x564F,
  0xBB66,      0, 0xBB67, 0x4568, 0x563A,      0,      0,      0,
  0x5657,      0, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B,      0,      0,
@@ -3447,7 +3629,7 @@ const unsigned short utf8_to_euc_E5B6[] = {
  0xBB72,      0, 0xE674,      0, 0xBB73,      0,      0, 0x5658,
  0xBB74, 0xBB75, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
 };
-const unsigned short utf8_to_euc_E5B7[] = {
+static const unsigned short utf8_to_euc_E5B7[] = {
       0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
       0, 0x565A,      0, 0xBB78, 0x3460, 0x565B, 0xBB7A,      0,
  0xBB79,      0, 0x565D, 0x565C,      0,      0, 0x565E,      0,
@@ -3457,7 +3639,7 @@ const unsigned short utf8_to_euc_E5B7[] = {
       0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
  0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
 };
-const unsigned short utf8_to_euc_E5B8[] = {
+static const unsigned short utf8_to_euc_E5B8[] = {
  0xBC24,      0, 0x3B54, 0x495B,      0,      0, 0x4841, 0xBC25,
       0,      0,      0, 0x5663, 0x3475, 0xBC26,      0,      0,
       0, 0x5666, 0xBC27,      0, 0xBC28, 0xBC29, 0x4421,      0,
@@ -3467,7 +3649,7 @@ const unsigned short utf8_to_euc_E5B8[] = {
  0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
  0x3E6F,      0,      0,      0,      0, 0x4B39, 0xBC31,      0,
 };
-const unsigned short utf8_to_euc_E5B9[] = {
+static const unsigned short utf8_to_euc_E5B9[] = {
  0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673,
       0, 0xBC34,      0, 0xBC32, 0x4B5A,      0, 0x566D,      0,
  0xBC33, 0xBC35,      0,      0, 0x566F, 0x4B6B, 0xBC36, 0x566E,
@@ -3477,7 +3659,7 @@ const unsigned short utf8_to_euc_E5B9[] = {
  0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675,      0,
  0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
 };
-const unsigned short utf8_to_euc_E5BA[] = {
+static const unsigned short utf8_to_euc_E5BA[] = {
  0xBC42, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F,
       0,      0, 0x3E32, 0xBC43,      0,      0, 0xBC44, 0x3D78,
       0,      0,      0,      0,      0, 0x446C, 0x4A79, 0x4539,
@@ -3487,7 +3669,7 @@ const unsigned short utf8_to_euc_E5BA[] = {
       0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
  0x4D47,      0,      0,      0,      0, 0xBC4D, 0xBC4E, 0xBC4F,
 };
-const unsigned short utf8_to_euc_E5BB[] = {
+static const unsigned short utf8_to_euc_E5BB[] = {
       0, 0x567A, 0x567B, 0x4751,      0,      0, 0xBC50,      0,
  0x567C, 0x4E77, 0x4F2D, 0xBC52, 0xBC51,      0, 0xBC53, 0x567E,
  0x567D, 0xBC54, 0xBC55, 0x3347, 0xBC56, 0xBC57, 0x5721,      0,
@@ -3497,7 +3679,7 @@ const unsigned short utf8_to_euc_E5BB[] = {
  0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
  0x572F,      0, 0x377A, 0x3276, 0x4736,      0, 0x5730, 0x467B,
 };
-const unsigned short utf8_to_euc_E5BC[] = {
+static const unsigned short utf8_to_euc_E5BC[] = {
       0, 0x4A5B, 0xBC5C, 0x5731, 0x4F2E,      0, 0xBC5D, 0xBC5E,
  0xBC5F, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xBC60, 0x3C30,
  0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
@@ -3507,7 +3689,7 @@ const unsigned short utf8_to_euc_E5BC[] = {
  0xBC6C, 0x3C65,      0,      0, 0xBC6D, 0x4425, 0xBC6E, 0x362F,
  0x573A,      0,      0, 0xBC6F, 0x492B, 0xBC70, 0x4346, 0xBC71,
 };
-const unsigned short utf8_to_euc_E5BD[] = {
+static const unsigned short utf8_to_euc_E5BD[] = {
  0xBC72, 0x573B,      0,      0, 0xBC73, 0xBC74,      0, 0xBC75,
  0x573C,      0, 0x3630,      0, 0x573D, 0xBC76, 0x573E,      0,
  0xBC77, 0x5740,      0, 0x4576, 0xBC78,      0, 0x5741, 0x5742,
@@ -3517,7 +3699,7 @@ const unsigned short utf8_to_euc_E5BD[] = {
  0x3E34, 0x3146, 0xBD22, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
  0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0xBD27, 0xBD28, 0x574A,
 };
-const unsigned short utf8_to_euc_E5BE[] = {
+static const unsigned short utf8_to_euc_E5BE[] = {
  0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E,
  0x574C, 0xBD29, 0x574B, 0x4E27, 0x3865, 0xBD2A,      0, 0xBD2B,
  0x3D79, 0x574D, 0x454C, 0x3D3E,      0,      0, 0xBD2C, 0x4640,
@@ -3527,7 +3709,7 @@ const unsigned short utf8_to_euc_E5BE[] = {
  0xBD35, 0xBD36,      0, 0x4641, 0x4427,      0,      0, 0xF43E,
  0xBD37, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
 };
-const unsigned short utf8_to_euc_E5BF[] = {
+static const unsigned short utf8_to_euc_E5BF[] = {
       0,      0,      0, 0x3F34, 0xBD38, 0x492C,      0, 0xBD39,
  0xBD3A, 0xBD3B,      0, 0xBD3C, 0x3477, 0x4726,      0,      0,
  0xBD3D, 0xBD3E, 0xBD3F, 0xBD40, 0xBD41,      0, 0x5756, 0x3B56,
@@ -3537,7 +3719,7 @@ const unsigned short utf8_to_euc_E5BF[] = {
  0x582D, 0x575A, 0xBD4C, 0xBD4D,      0, 0x4730, 0xBD4E,      0,
  0x5759,      0, 0xBD4F, 0x5757, 0xBD50, 0x397A,      0, 0x575D,
 };
-const unsigned short utf8_to_euc_E680[] = {
+static const unsigned short utf8_to_euc_E680[] = {
       0,      0,      0,      0,      0,      0,      0, 0xBD51,
       0,      0, 0xBD52,      0,      0, 0xBD53, 0x5763, 0x5769,
  0x5761,      0, 0x455C, 0xBD54, 0xBD55, 0x5766, 0x495D, 0xBD56,
@@ -3547,7 +3729,7 @@ const unsigned short utf8_to_euc_E680[] = {
       0, 0x5764,      0, 0xBD5C,      0, 0xBD5D,      0,      0,
       0,      0, 0x576A,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E681[] = {
+static const unsigned short utf8_to_euc_E681[] = {
  0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0xBD5F,
  0xBD60, 0xBD61, 0x5770, 0x4E78, 0xBD62, 0x5772,      0,      0,
  0x3632, 0xBD63, 0x3931,      0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
@@ -3557,7 +3739,7 @@ const unsigned short utf8_to_euc_E681[] = {
  0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
       0,      0,      0,      0,      0,      0, 0xBD6B, 0xBD6C,
 };
-const unsigned short utf8_to_euc_E682[] = {
+static const unsigned short utf8_to_euc_E682[] = {
       0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E,      0,
  0xBD6F, 0x3C3D, 0xBD70, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
       0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xBD74, 0x5823, 0x5824,
@@ -3567,7 +3749,7 @@ const unsigned short utf8_to_euc_E682[] = {
  0xBD7C, 0xBD7D, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
  0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xBE22,      0,
 };
-const unsigned short utf8_to_euc_E683[] = {
+static const unsigned short utf8_to_euc_E683[] = {
       0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
  0xBE25, 0xBE26, 0xBE27, 0xBE28,      0,      0, 0xBE29, 0xBE2A,
       0, 0x4F47,      0, 0x582B, 0xBE2B, 0xBE2C,      0,      0,
@@ -3577,7 +3759,7 @@ const unsigned short utf8_to_euc_E683[] = {
  0x4246, 0x583D, 0xBE33, 0x415B, 0x5838, 0xBE34, 0x5835, 0x5836,
  0xBE35, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
 };
-const unsigned short utf8_to_euc_E684[] = {
+static const unsigned short utf8_to_euc_E684[] = {
  0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
  0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
  0xBE3C, 0xBE3D, 0xBE3E, 0xBE3F, 0xBE40, 0x5833, 0xBE41, 0xBE42,
@@ -3587,7 +3769,7 @@ const unsigned short utf8_to_euc_E684[] = {
  0xBE49, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0xBE4D,
       0, 0xBE4E,      0,      0, 0x5846, 0x5849, 0x5841, 0x5845,
 };
-const unsigned short utf8_to_euc_E685[] = {
+static const unsigned short utf8_to_euc_E685[] = {
       0, 0xBE4F, 0x584A,      0, 0x584B, 0xBE50, 0xBE51, 0x5840,
  0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0,
       0,      0,      0, 0x5858,      0, 0x4A69,      0,      0,
@@ -3597,7 +3779,7 @@ const unsigned short utf8_to_euc_E685[] = {
  0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
  0xBE57,      0,      0, 0xBE58, 0xBE59,      0, 0x4D5D, 0xBE5A,
 };
-const unsigned short utf8_to_euc_E686[] = {
+static const unsigned short utf8_to_euc_E686[] = {
  0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E,      0,      0, 0x585C,
       0,      0, 0x5860, 0xBE5F,      0, 0xBE60, 0x417E,      0,
  0x4E79, 0x5861, 0xBE61, 0xBE62, 0x585E,      0, 0x585B, 0xBE63,
@@ -3607,7 +3789,7 @@ const unsigned short utf8_to_euc_E686[] = {
       0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
  0xBE6D, 0xBE6E, 0x586B,      0, 0xBE6F,      0, 0x3438,      0,
 };
-const unsigned short utf8_to_euc_E687[] = {
+static const unsigned short utf8_to_euc_E687[] = {
  0xBE70, 0xBE71, 0xBE72, 0x5869,      0,      0, 0x586A, 0x3A29,
  0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
  0x327B,      0,      0,      0,      0, 0xBE75,      0,      0,
@@ -3617,7 +3799,7 @@ const unsigned short utf8_to_euc_E687[] = {
       0,      0, 0x4428,      0, 0x5873,      0, 0x5871, 0x5867,
  0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
 };
-const unsigned short utf8_to_euc_E688[] = {
+static const unsigned short utf8_to_euc_E688[] = {
  0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
  0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
  0x402E, 0x3266, 0x327C, 0xBF28, 0x587D, 0xBF29, 0x303F,      0,
@@ -3627,7 +3809,7 @@ const unsigned short utf8_to_euc_E688[] = {
  0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
  0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32,      0, 0x4B3C,
 };
-const unsigned short utf8_to_euc_E689[] = {
+static const unsigned short utf8_to_euc_E689[] = {
  0x3D6A, 0x5928, 0xBF33, 0xBF34, 0xBF35,      0, 0xBF36, 0x4070,
  0x6E3D, 0x4862,      0, 0x3C6A, 0xBF37, 0x3A4D, 0x5929,      0,
  0xBF38, 0xBF39, 0xBF3A, 0x4247, 0xBF3B, 0x4A27, 0xBF3C,      0,
@@ -3637,7 +3819,7 @@ const unsigned short utf8_to_euc_E689[] = {
       0, 0x3037,      0, 0xBF42,      0,      0, 0x495E,      0,
       0, 0x4863, 0xBF43,      0, 0x592F, 0xBF44, 0x5932, 0x3E35,
 };
-const unsigned short utf8_to_euc_E68A[] = {
+static const unsigned short utf8_to_euc_E68A[] = {
  0x353B,      0, 0x5930, 0x5937, 0x3E36,      0,      0,      0,
       0, 0x5931, 0x4744,      0,      0, 0xBF45, 0xBF46, 0xBF47,
  0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
@@ -3647,7 +3829,7 @@ const unsigned short utf8_to_euc_E68A[] = {
       0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
       0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
 };
-const unsigned short utf8_to_euc_E68B[] = {
+static const unsigned short utf8_to_euc_E68B[] = {
       0,      0, 0x5944,      0, 0xBF51, 0x4334, 0x593E, 0x5945,
  0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F, 0xBF52, 0x593C,
  0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xBF53, 0xBF54, 0x5939,
@@ -3657,7 +3839,7 @@ const unsigned short utf8_to_euc_E68B[] = {
       0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
       0,      0,      0,      0, 0xBF59, 0xBF5A, 0x3D26, 0x593D,
 };
-const unsigned short utf8_to_euc_E68C[] = {
+static const unsigned short utf8_to_euc_E68C[] = {
       0, 0x3B7D, 0x594C, 0xBF5B, 0xBF5C,      0,      0, 0x3B58,
  0x594D, 0x3044, 0xBF5D, 0xBF5E, 0x5948, 0xBF5F,      0,      0,
  0xBF60, 0x4429,      0, 0xBF61,      0,      0, 0xBF62,      0,
@@ -3667,7 +3849,7 @@ const unsigned short utf8_to_euc_E68C[] = {
       0,      0,      0,      0,      0, 0xBF67, 0xBF68,      0,
       0, 0xBF69, 0x4472,      0, 0xBF6A, 0x4854, 0x5951, 0x415E,
 };
-const unsigned short utf8_to_euc_E68D[] = {
+static const unsigned short utf8_to_euc_E68D[] = {
       0, 0xBF6B, 0xBF6C, 0xBF6D, 0xBF6E,      0, 0xBF6F,      0,
       0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xBF72, 0x5954,
  0x5950,      0, 0xBF73, 0xBF74, 0xBF75, 0x4A61,      0, 0x443D,
@@ -3677,7 +3859,7 @@ const unsigned short utf8_to_euc_E68D[] = {
       0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
  0xC021,      0, 0x4668, 0x4731, 0xC022, 0xC023,      0, 0xC024,
 };
-const unsigned short utf8_to_euc_E68E[] = {
+static const unsigned short utf8_to_euc_E68E[] = {
  0x5957,      0, 0xC025, 0x415D, 0xC026,      0,      0, 0xC027,
  0x3C78, 0x595C, 0xC028,      0, 0x3E38,      0, 0x5956, 0x595B,
  0xC029,      0, 0x4753,      0, 0xC02A, 0xC02B, 0x5955,      0,
@@ -3687,7 +3869,7 @@ const unsigned short utf8_to_euc_E68E[] = {
       0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
       0,      0,      0, 0x415F,      0, 0xC034, 0x5961,      0,
 };
-const unsigned short utf8_to_euc_E68F[] = {
+static const unsigned short utf8_to_euc_E68F[] = {
  0x5963, 0xC035,      0, 0x4237, 0x5969, 0xC036, 0x5964,      0,
  0xC037, 0x5966,      0,      0,      0,      0, 0xC038, 0x4941,
  0x4473, 0xC039, 0x5967, 0xC03A, 0xC03B, 0xC03C, 0x4D2C,      0,
@@ -3697,7 +3879,7 @@ const unsigned short utf8_to_euc_E68F[] = {
       0,      0, 0xC042, 0xC043, 0x3167, 0xC044, 0x5968,      0,
  0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E690[] = {
+static const unsigned short utf8_to_euc_E690[] = {
       0,      0,      0,      0,      0,      0, 0x596C,      0,
       0, 0xC047, 0xC048,      0,      0, 0x423B,      0, 0x5973,
  0xC049,      0, 0xC04A, 0x596D, 0xC04B,      0, 0x596A, 0x5971,
@@ -3707,7 +3889,7 @@ const unsigned short utf8_to_euc_E690[] = {
  0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
       0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
 };
-const unsigned short utf8_to_euc_E691[] = {
+static const unsigned short utf8_to_euc_E691[] = {
       0,      0, 0x405D,      0,      0,      0,      0,      0,
       0,      0,      0, 0xC059,      0,      0, 0x5977, 0xC05A,
       0, 0xC05B, 0xC05C, 0xC05D, 0xC05E,      0,      0,      0,
@@ -3717,7 +3899,7 @@ const unsigned short utf8_to_euc_E691[] = {
       0,      0,      0, 0xC068, 0xC069,      0, 0x5976,      0,
  0x4C4E,      0, 0x4022, 0xC06A,      0, 0xC06B,      0,      0,
 };
-const unsigned short utf8_to_euc_E692[] = {
+static const unsigned short utf8_to_euc_E692[] = {
       0,      0,      0, 0x3762,      0, 0xC06C,      0, 0xC06D,
  0x597D,      0,      0,      0,      0,      0,      0, 0xC06E,
  0xC06F, 0xC070, 0x3B35, 0x597A,      0, 0x5979,      0,      0,
@@ -3727,7 +3909,7 @@ const unsigned short utf8_to_euc_E692[] = {
  0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
       0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0xC07D, 0xC07E,
 };
-const unsigned short utf8_to_euc_E693[] = {
+static const unsigned short utf8_to_euc_E693[] = {
       0, 0x4D4A, 0x5A27,      0, 0xC121, 0x5A23,      0, 0x5A24,
       0, 0xC122, 0xC123, 0xC124, 0xC125, 0x4160, 0xC126,      0,
  0xC127, 0xC128, 0x5A22,      0, 0x593F, 0xC129,      0, 0xC12A,
@@ -3737,7 +3919,7 @@ const unsigned short utf8_to_euc_E693[] = {
  0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0xC132,
       0,      0, 0x5A34, 0xC133,      0, 0x5A36, 0x3E71, 0xC134,
 };
-const unsigned short utf8_to_euc_E694[] = {
+static const unsigned short utf8_to_euc_E694[] = {
  0x5A35, 0xC135,      0,      0, 0xC136, 0x5A39,      0,      0,
  0xC137, 0xC138, 0xC139,      0,      0,      0,      0, 0xC13A,
       0,      0,      0, 0xC13B, 0xC13C,      0, 0xC13D,      0,
@@ -3747,7 +3929,7 @@ const unsigned short utf8_to_euc_E694[] = {
       0, 0xC146,      0,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
  0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
 };
-const unsigned short utf8_to_euc_E695[] = {
+static const unsigned short utf8_to_euc_E695[] = {
       0,      0,      0, 0xC14A,      0, 0x384E,      0, 0xC14B,
  0x5A43, 0xC14C,      0,      0,      0, 0x5A46, 0xF441, 0x4952,
  0xC14D, 0x355F, 0xC14E,      0, 0xC14F, 0x5A45, 0x5A44, 0x4754,
@@ -3757,7 +3939,7 @@ const unsigned short utf8_to_euc_E695[] = {
  0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
  0x5A4B,      0, 0xC154,      0,      0, 0xC155,      0,      0,
 };
-const unsigned short utf8_to_euc_E696[] = {
+static const unsigned short utf8_to_euc_E696[] = {
       0, 0xC156, 0x5A4C, 0x5A4D,      0, 0xC157,      0, 0x4A38,
  0x555D, 0x4046, 0xC158,      0, 0x494C,      0, 0x3A58,      0,
  0x4865, 0x4843, 0xC159,      0,      0, 0xC15A,      0, 0x454D,
@@ -3767,7 +3949,7 @@ const unsigned short utf8_to_euc_E696[] = {
  0x3F37,      0, 0xC161, 0xC162, 0xC163,      0,      0, 0x5A52,
       0, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xC164,
 };
-const unsigned short utf8_to_euc_E697[] = {
+static const unsigned short utf8_to_euc_E697[] = {
       0, 0x5A55, 0xC165, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0,
  0xC166, 0xC167,      0, 0x407B, 0x5A57,      0, 0xC168, 0x4232,
  0xC169,      0, 0x5A58,      0, 0xC16A,      0, 0xC16B, 0x347A,
@@ -3777,7 +3959,7 @@ const unsigned short utf8_to_euc_E697[] = {
  0xC16E, 0x5A5D, 0xC16F,      0, 0xC170, 0xC171,      0,      0,
       0, 0xC172, 0x3222, 0x5A61,      0,      0, 0xC173, 0xC174,
 };
-const unsigned short utf8_to_euc_E698[] = {
+static const unsigned short utf8_to_euc_E698[] = {
  0xC175,      0, 0x3937, 0x5A60, 0xC176,      0, 0x3A2B, 0x3E3A,
  0xC177, 0xC178, 0x5A5F,      0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
       0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0xC17C, 0xC17D,      0,
@@ -3787,7 +3969,7 @@ const unsigned short utf8_to_euc_E698[] = {
  0xC22C, 0xC22D,      0, 0xC22E, 0x5A65, 0x5A63, 0x5A64, 0xC230,
       0, 0xC22F,      0, 0xF442, 0x436B,      0,      0, 0x5B26,
 };
-const unsigned short utf8_to_euc_E699[] = {
+static const unsigned short utf8_to_euc_E699[] = {
  0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233,      0,
       0, 0x5A69, 0xC234, 0x3F38, 0xC235,      0, 0xC237, 0x5A67,
       0, 0xC236, 0x3B2F,      0,      0,      0,      0, 0xC238,
@@ -3797,7 +3979,7 @@ const unsigned short utf8_to_euc_E699[] = {
  0x5A72,      0,      0, 0xC244, 0x4032, 0xC245, 0x3E3D, 0xC247,
  0xC248, 0xC249, 0x4352, 0xC24A, 0xC24C,      0, 0xC243, 0xC246,
 };
-const unsigned short utf8_to_euc_E69A[] = {
+static const unsigned short utf8_to_euc_E69A[] = {
  0xC24B, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B,
  0x5A74, 0x5A76,      0, 0xC24D, 0xC24E, 0xC24F, 0x5A75,      0,
  0xC250, 0x3D6B, 0xC251,      0,      0,      0, 0x4348, 0x3045,
@@ -3807,7 +3989,7 @@ const unsigned short utf8_to_euc_E69A[] = {
       0, 0xC25A, 0xC25B,      0, 0x4B3D, 0xC25C,      0,      0,
  0x5B22, 0x5A7B,      0, 0xC25D, 0x5A7E,      0, 0x5A7D, 0xC25E,
 };
-const unsigned short utf8_to_euc_E69B[] = {
+static const unsigned short utf8_to_euc_E69B[] = {
  0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21,      0,      0, 0x465E,
  0xC262, 0x5A7C,      0,      0, 0xC263,      0, 0xC264, 0xC265,
       0,      0,      0,      0, 0xC266,      0, 0x5B23,      0,
@@ -3817,7 +3999,7 @@ const unsigned short utf8_to_euc_E69B[] = {
  0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
  0x3D71, 0x4162, 0xC26D, 0xC23F, 0x5258, 0x413E, 0x413D, 0x4258,
 };
-const unsigned short utf8_to_euc_E69C[] = {
+static const unsigned short utf8_to_euc_E69C[] = {
  0x3A47,      0,      0, 0x5072,      0, 0xC26E,      0, 0xC26F,
  0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E, 0xC270, 0x5B2C,
       0,      0,      0, 0xC271, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
@@ -3827,7 +4009,7 @@ const unsigned short utf8_to_euc_E69C[] = {
       0, 0x3C6B,      0, 0xC276, 0x4B51,      0, 0x5B34, 0x5B37,
  0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
 };
-const unsigned short utf8_to_euc_E69D[] = {
+static const unsigned short utf8_to_euc_E69D[] = {
       0, 0x5B35,      0,      0,      0, 0xC278, 0x5B38, 0xC279,
  0xC27A, 0x3F79,      0,      0, 0xC27B,      0, 0x4D7B, 0x3049,
  0x3A60, 0x423C,      0, 0x3C5D, 0xC27C, 0xC27D, 0x3E73,      0,
@@ -3837,7 +4019,7 @@ const unsigned short utf8_to_euc_E69D[] = {
  0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xC324, 0x354F, 0xC325, 0x4747,
       0,      0,      0, 0xC326, 0x5B41,      0, 0x3E3E, 0x4844,
 };
-const unsigned short utf8_to_euc_E69E[] = {
+static const unsigned short utf8_to_euc_E69E[] = {
       0, 0xC327,      0,      0, 0xC328, 0x5B47,      0, 0x487A,
       0, 0x5B3E,      0, 0x5B44, 0x5B43,      0, 0xC329, 0xC32A,
  0x404F, 0xC32B,      0, 0xC32C,      0, 0x4B6D, 0xC32D, 0x4E53,
@@ -3847,7 +4029,7 @@ const unsigned short utf8_to_euc_E69E[] = {
  0xC331, 0xC332, 0xC333, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
  0x5B4E, 0x5B54,      0, 0xC335, 0xC336, 0xC337,      0,      0,
 };
-const unsigned short utf8_to_euc_E69F[] = {
+static const unsigned short utf8_to_euc_E69F[] = {
  0xC339, 0x4248, 0xC33A, 0xC33B, 0x4A41, 0xC33C, 0x5B56,      0,
  0xC33D, 0xC33E, 0x4922,      0,      0,      0, 0x5B55, 0x4770,
  0x4B3F, 0x343B, 0xC33F, 0x4077, 0x3D40,      0,      0, 0xC340,
@@ -3857,7 +4039,7 @@ const unsigned short utf8_to_euc_E69F[] = {
  0xC345, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xC348,
       0, 0xC338,      0, 0x3A3A,      0,      0, 0x4B6F, 0x3341,
 };
-const unsigned short utf8_to_euc_E6A0[] = {
+static const unsigned short utf8_to_euc_E6A0[] = {
       0, 0xF446, 0x444E, 0x464A, 0x3149,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x4072, 0xC34A,      0, 0x4034, 0x372A,
@@ -3867,7 +4049,7 @@ const unsigned short utf8_to_euc_E6A0[] = {
  0xC353, 0xC354, 0x5B5E, 0xC355, 0x4073,      0,      0,      0,
  0x334B, 0x3A2C,      0, 0xC356, 0x334A, 0x3A4F,      0, 0xC357,
 };
-const unsigned short utf8_to_euc_E6A1[] = {
+static const unsigned short utf8_to_euc_E6A1[] = {
  0x5B5C, 0x3765, 0x374B, 0x456D, 0xC358, 0xC359, 0x5B5A,      0,
  0x3046,      0, 0xC35A,      0, 0xC35B, 0x5B5D, 0x5B5F,      0,
  0x364D, 0x372C, 0xC349, 0x343C, 0x354B, 0xC35C,      0, 0xC35D,
@@ -3877,7 +4059,7 @@ const unsigned short utf8_to_euc_E6A1[] = {
  0xC363, 0xC364, 0xC365,      0, 0x5B6F, 0xC366, 0x3233, 0x5B64,
       0, 0xC367, 0xC368, 0xC369, 0xC36A,      0, 0x5B75, 0x5B65,
 };
-const unsigned short utf8_to_euc_E6A2[] = {
+static const unsigned short utf8_to_euc_E6A2[] = {
       0, 0x4E42, 0xC36B, 0x5B6C, 0xC36C, 0x475F, 0xC36D,      0,
  0xC36E,      0,      0,      0,      0, 0x5B74,      0, 0x5B67,
       0,      0,      0, 0x3034, 0x5B69,      0, 0xC36F, 0x393C,
@@ -3887,7 +4069,7 @@ const unsigned short utf8_to_euc_E6A2[] = {
  0x3323, 0x3A2D, 0xC379, 0x5B60,      0, 0x5B70, 0x3361,      0,
       0, 0x5B6E, 0x5B72, 0xC37A, 0x456E,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E6A3[] = {
+static const unsigned short utf8_to_euc_E6A3[] = {
       0,      0,      0,      0, 0x347E, 0xC37B, 0x5C32,      0,
  0xC37C, 0x4C49, 0x5B77, 0x347D, 0xC37D, 0x5B7E,      0, 0xC37E,
  0xC421, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xC424, 0x5C27,
@@ -3897,7 +4079,7 @@ const unsigned short utf8_to_euc_E6A3[] = {
  0xC42E, 0xC42F, 0x4033,      0,      0, 0xC430, 0xC431,      0,
       0, 0x5C2A, 0x343D, 0xC432, 0xC433, 0xC434,      0,      0,
 };
-const unsigned short utf8_to_euc_E6A4[] = {
+static const unsigned short utf8_to_euc_E6A4[] = {
  0x4F50, 0x5B76,      0,      0, 0x5C26, 0x3058, 0xC435,      0,
  0x5B78, 0xC436, 0xC437, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
  0xC438, 0xC439, 0x5C25, 0xC43A,      0,      0, 0xC43B, 0xC43C,
@@ -3907,7 +4089,7 @@ const unsigned short utf8_to_euc_E6A4[] = {
  0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0xC43F, 0x5C24,      0,
  0xC440, 0x5C3B,      0, 0xC441,      0, 0x5C3D,      0, 0x4458,
 };
-const unsigned short utf8_to_euc_E6A5[] = {
+static const unsigned short utf8_to_euc_E6A5[] = {
       0,      0, 0xC442,      0,      0, 0xC443,      0,      0,
       0, 0xC444, 0x4D4C,      0,      0,      0, 0xC445,      0,
       0,      0,      0, 0x4976, 0x5C38, 0x424A,      0, 0xC446,
@@ -3917,7 +4099,7 @@ const unsigned short utf8_to_euc_E6A5[] = {
  0xC44F, 0xC450, 0xC451, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
  0x5C36, 0x5C33, 0xC452, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xC454,
 };
-const unsigned short utf8_to_euc_E6A6[] = {
+static const unsigned short utf8_to_euc_E6A6[] = {
  0xC455, 0x5C43, 0x3335,      0,      0,      0,      0,      0,
       0,      0, 0x3A67,      0,      0, 0xC456, 0x315D,      0,
       0, 0x5C54, 0xC457,      0, 0x4F31, 0x5C57, 0xC458,      0,
@@ -3927,7 +4109,7 @@ const unsigned short utf8_to_euc_E6A6[] = {
       0, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xC461,
  0xC462,      0, 0xC463, 0x5C50, 0xC464,      0, 0x5C4B, 0x5C48,
 };
-const unsigned short utf8_to_euc_E6A7[] = {
+static const unsigned short utf8_to_euc_E6A7[] = {
       0, 0x5C49,      0, 0x5C51,      0, 0xC465,      0, 0x7422,
  0xC466,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C,      0,
  0x5C47, 0xC467,      0, 0x5C4A,      0,      0, 0xC468, 0xC469,
@@ -3937,7 +4119,7 @@ const unsigned short utf8_to_euc_E6A7[] = {
       0, 0xC46E, 0x5C60, 0xC46F,      0, 0xC470,      0,      0,
       0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xC471, 0x5C5D,
 };
-const unsigned short utf8_to_euc_E6A8[] = {
+static const unsigned short utf8_to_euc_E6A8[] = {
  0xC472, 0xC473, 0x5C5B, 0xC474,      0, 0x5C62,      0,      0,
       0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0, 0xC475,
       0, 0xC476, 0x5C69, 0x5C6C, 0x5C66, 0xC477,      0, 0x4374,
@@ -3947,7 +4129,7 @@ const unsigned short utf8_to_euc_E6A8[] = {
  0xC47D,      0, 0xC47E,      0, 0xC521, 0x3E41, 0x5C70, 0xC522,
  0x5C77, 0x3C79, 0x3372, 0xC523,      0, 0x432E, 0xC524, 0xC525,
 };
-const unsigned short utf8_to_euc_E6A9[] = {
+static const unsigned short utf8_to_euc_E6A9[] = {
       0,      0,      0,      0, 0x5C6D, 0xC526, 0xC527, 0x5C72,
  0x5C76, 0xC528, 0xC529, 0x3636,      0,      0, 0xC52A,      0,
  0xC52B, 0xC52C, 0xC52D,      0,      0, 0xC52E, 0xC52F,      0,
@@ -3957,7 +4139,7 @@ const unsigned short utf8_to_euc_E6A9[] = {
       0, 0xC534, 0x5C6F, 0xC535,      0,      0,      0,      0,
  0x5C71,      0,      0,      0,      0,      0, 0xC536, 0x3360,
 };
-const unsigned short utf8_to_euc_E6AA[] = {
+static const unsigned short utf8_to_euc_E6AA[] = {
  0x4349, 0xC537,      0, 0xC538, 0x5C7C,      0, 0xC539, 0xC53A,
       0, 0xC53B,      0, 0xC53C,      0, 0x5C7A, 0x3869,      0,
  0x5C79, 0xC53D,      0,      0,      0,      0,      0, 0x5D21,
@@ -3967,7 +4149,7 @@ const unsigned short utf8_to_euc_E6AA[] = {
  0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
  0x5D26,      0,      0, 0x5D23,      0, 0xC548, 0xC549, 0xC54A,
 };
-const unsigned short utf8_to_euc_E6AB[] = {
+static const unsigned short utf8_to_euc_E6AB[] = {
       0, 0x5C6A, 0x5D25, 0x5D24,      0,      0, 0xC54B,      0,
  0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
  0xC54F, 0x5D2A,      0, 0x4F26, 0xC550, 0xC551, 0xC552,      0,
@@ -3977,7 +4159,7 @@ const unsigned short utf8_to_euc_E6AB[] = {
  0xC558, 0xC559, 0xC55A,      0,      0,      0,      0,      0,
       0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xC55C,      0,      0,
 };
-const unsigned short utf8_to_euc_E6AC[] = {
+static const unsigned short utf8_to_euc_E6AC[] = {
       0,      0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
       0, 0xC561, 0x5C5E,      0,      0,      0,      0, 0xC562,
  0xC563, 0xC564, 0x5D33,      0,      0,      0, 0x5D34, 0xC565,
@@ -3987,7 +4169,7 @@ const unsigned short utf8_to_euc_E6AC[] = {
       0,      0, 0x4D5F,      0,      0, 0xC56D, 0xC56E, 0x5D38,
  0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
 };
-const unsigned short utf8_to_euc_E6AD[] = {
+static const unsigned short utf8_to_euc_E6AD[] = {
       0,      0,      0, 0x5D3D,      0,      0, 0xC571, 0x5D3C,
       0, 0x5D3E, 0xC572,      0, 0x324E, 0xC573, 0x4337,      0,
  0x5D3F,      0, 0xC574, 0x343F, 0x5D41,      0, 0xC575,      0,
@@ -3997,7 +4179,7 @@ const unsigned short utf8_to_euc_E6AD[] = {
  0xC57C,      0,      0, 0x3A50, 0x4E72, 0xC57D,      0,      0,
  0x5D45, 0x5D46,      0, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
 };
-const unsigned short utf8_to_euc_E6AE[] = {
+static const unsigned short utf8_to_euc_E6AE[] = {
  0x5D48,      0, 0xC622, 0x5D4A, 0x5D49, 0xC623, 0x4B58,      0,
       0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0,
       0,      0,      0,      0,      0, 0x5D4D, 0x3F23, 0xC624,
@@ -4007,7 +4189,7 @@ const unsigned short utf8_to_euc_E6AE[] = {
  0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
  0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xC632, 0xC633, 0x4542,
 };
-const unsigned short utf8_to_euc_E6AF[] = {
+static const unsigned short utf8_to_euc_E6AF[] = {
  0x544C,      0,      0, 0xC634, 0xC635, 0x3523, 0x5D58,      0,
       0, 0xC636,      0, 0x5D59, 0xC637, 0x4A6C, 0x4B68,      0,
       0,      0, 0x4647, 0x5D5A, 0x4866,      0, 0xC638,      0,
@@ -4017,7 +4199,7 @@ const unsigned short utf8_to_euc_E6AF[] = {
       0, 0xC63F,      0, 0x5D5E,      0,      0,      0, 0xC640,
       0, 0xC641,      0,      0,      0,      0,      0, 0xC642,
 };
-const unsigned short utf8_to_euc_E6B0[] = {
+static const unsigned short utf8_to_euc_E6B0[] = {
       0,      0, 0xC643,      0, 0xC644, 0xC645,      0,      0,
  0x5D61, 0xC646,      0,      0,      0, 0xC647, 0xC648, 0x3B61,
  0xC649, 0x4C31, 0xC64A, 0x5D62, 0x5D63,      0,      0, 0x3524,
@@ -4027,7 +4209,7 @@ const unsigned short utf8_to_euc_E6B0[] = {
       0,      0,      0, 0xC652, 0x3F65, 0xC653, 0xC654, 0x4939,
  0x314A,      0, 0xC655, 0xC656,      0,      0, 0x4845, 0xC657,
 };
-const unsigned short utf8_to_euc_E6B1[] = {
+static const unsigned short utf8_to_euc_E6B1[] = {
  0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0,
       0,      0, 0xC658, 0xC659,      0, 0xC65A, 0x4846, 0xC65B,
  0x3C2E,      0, 0xC65C,      0, 0xC65D, 0x5D68,      0, 0x3440,
@@ -4037,7 +4219,7 @@ const unsigned short utf8_to_euc_E6B1[] = {
  0x4241,      0, 0x3562, 0x5D72, 0xC664,      0, 0xC665,      0,
  0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
 };
-const unsigned short utf8_to_euc_E6B2[] = {
+static const unsigned short utf8_to_euc_E6B2[] = {
       0, 0x5D6E, 0x5D6B, 0x4D60,      0, 0xC669, 0xC66A, 0xC66B,
  0x4440, 0xC66C,      0,      0, 0x4659, 0x5D6C,      0,      0,
  0x5D74,      0, 0x5D73, 0x3723, 0xC66D, 0xC66E, 0x322D, 0xC66F,
@@ -4047,7 +4229,7 @@ const unsigned short utf8_to_euc_E6B2[] = {
  0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
  0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
 };
-const unsigned short utf8_to_euc_E6B3[] = {
+static const unsigned short utf8_to_euc_E6B3[] = {
       0, 0x3637, 0xC676,      0, 0x5D75, 0x5D7A, 0xC677,      0,
       0, 0x4074, 0x4771,      0, 0x4867, 0xC678,      0, 0xC679,
  0xC67A, 0xC67B, 0xC67C, 0x5D77, 0xC67D, 0x4B21, 0xC67E, 0x5D79,
@@ -4057,7 +4239,7 @@ const unsigned short utf8_to_euc_E6B3[] = {
  0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E6B4[] = {
+static const unsigned short utf8_to_euc_E6B4[] = {
       0,      0,      0,      0, 0xC72B,      0,      0, 0xC72C,
       0,      0, 0xC72D, 0x4D4E, 0x5E30,      0, 0xC72E, 0xC72F,
       0, 0xC730, 0x5E2F, 0xC731,      0,      0,      0, 0x4076,
@@ -4067,7 +4249,7 @@ const unsigned short utf8_to_euc_E6B4[] = {
       0, 0xC739, 0x3D27, 0x5E2E,      0, 0x5E2D, 0x5E28,      0,
  0x5E2B, 0xC73A,      0, 0x3368, 0xC73B, 0x5E2A, 0x4749, 0xC73C,
 };
-const unsigned short utf8_to_euc_E6B5[] = {
+static const unsigned short utf8_to_euc_E6B5[] = {
       0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0xC73D,
@@ -4077,7 +4259,7 @@ const unsigned short utf8_to_euc_E6B5[] = {
  0xC744,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
  0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E6B6[] = {
+static const unsigned short utf8_to_euc_E6B6[] = {
       0,      0, 0xC746,      0,      0, 0x5E3A,      0, 0xC747,
  0x3E43,      0,      0,      0, 0x4D30,      0, 0x5E37,      0,
       0, 0xC748, 0xC749, 0x5E32, 0xC74A, 0x5E38, 0xC74B, 0xC74C,
@@ -4087,7 +4269,7 @@ const unsigned short utf8_to_euc_E6B6[] = {
       0,      0, 0x3155,      0, 0xC750, 0x5E3E,      0, 0xC751,
  0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0xC754,
 };
-const unsigned short utf8_to_euc_E6B7[] = {
+static const unsigned short utf8_to_euc_E6B7[] = {
  0x4D64,      0,      0,      0, 0xC755, 0x5E48, 0x5E42, 0x5E3F,
  0xC756,      0, 0xC757, 0x4E54, 0x5E45,      0, 0xC758, 0xC759,
       0, 0x3D4A, 0x5E47,      0,      0, 0x5E4C, 0xC75A,      0,
@@ -4097,7 +4279,7 @@ const unsigned short utf8_to_euc_E6B7[] = {
  0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xC765, 0x3A2E,
  0xF44B, 0x5E3B, 0x5E49, 0x453A, 0xC766,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E6B8[] = {
+static const unsigned short utf8_to_euc_E6B8[] = {
  0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
  0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0,
       0,      0,      0, 0x374C,      0, 0x5E3C,      0,      0,
@@ -4107,7 +4289,7 @@ const unsigned short utf8_to_euc_E6B8[] = {
       0,      0, 0xC76C,      0,      0,      0, 0xC76D,      0,
  0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xC770,      0, 0x5E55,      0,
 };
-const unsigned short utf8_to_euc_E6B9[] = {
+static const unsigned short utf8_to_euc_E6B9[] = {
       0,      0,      0, 0x5E5C, 0xC771, 0xC772,      0,      0,
  0xC773, 0xC774, 0x4C2B, 0xC775,      0, 0x5E5A, 0x5E5E, 0xC776,
       0, 0xC777, 0xC778, 0xC779, 0xC77A,      0, 0x3850, 0xC77B,
@@ -4117,7 +4299,7 @@ const unsigned short utf8_to_euc_E6B9[] = {
       0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
       0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
 };
-const unsigned short utf8_to_euc_E6BA[] = {
+static const unsigned short utf8_to_euc_E6BA[] = {
  0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0x482E, 0xC827,      0, 0x5E6F,
  0x383B,      0,      0, 0xC828,      0,      0, 0x3D60,      0,
@@ -4127,7 +4309,7 @@ const unsigned short utf8_to_euc_E6BA[] = {
       0, 0xC82E, 0x5E6C, 0xC82F,      0,      0, 0x4D4F, 0x5E67,
       0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xC831,
 };
-const unsigned short utf8_to_euc_E6BB[] = {
+static const unsigned short utf8_to_euc_E6BB[] = {
  0xC832, 0xC833, 0x5E71, 0xC834, 0x5E6B, 0x4C47,      0, 0xC835,
  0xC836, 0x5E66, 0xC837, 0x3C22, 0x5E7E, 0xC838, 0xC839, 0xC83A,
       0, 0x336A,      0, 0x5E68, 0x5E6D, 0x5E6E,      0,      0,
@@ -4137,7 +4319,7 @@ const unsigned short utf8_to_euc_E6BB[] = {
       0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
  0x5E77, 0xC83E,      0, 0xC83F,      0, 0xC840, 0x5E78, 0x5E60,
 };
-const unsigned short utf8_to_euc_E6BC[] = {
+static const unsigned short utf8_to_euc_E6BC[] = {
       0, 0x3579, 0x493A,      0, 0xC841,      0, 0x3C3F,      0,
  0xC842, 0x3977, 0xC843,      0, 0xC844, 0xC845,      0, 0x4F33,
       0, 0x5E74,      0, 0x5F22, 0x3169, 0x4166, 0xC846,      0,
@@ -4147,7 +4329,7 @@ const unsigned short utf8_to_euc_E6BC[] = {
  0xC84E, 0x5E7B, 0x5E7D, 0xC84F,      0,      0, 0xC850,      0,
  0x4132,      0,      0, 0xC851, 0xC852,      0, 0x5F21, 0x5E79,
 };
-const unsigned short utf8_to_euc_E6BD[] = {
+static const unsigned short utf8_to_euc_E6BD[] = {
       0, 0x5E73,      0,      0,      0, 0x3443,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0xC854,
       0, 0xC855, 0xC856, 0xC857, 0x3769,      0,      0, 0xC858,
@@ -4157,7 +4339,7 @@ const unsigned short utf8_to_euc_E6BD[] = {
  0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
  0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xC861, 0xC862,      0,
 };
-const unsigned short utf8_to_euc_E6BE[] = {
+static const unsigned short utf8_to_euc_E6BE[] = {
  0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021,      0, 0x5F24, 0xC864,
  0xC865,      0,      0, 0xC866, 0xC867, 0xC868, 0x5F30,      0,
  0xC869, 0x5F31, 0xC86A, 0xC86B, 0xC86C,      0, 0xC86D, 0x3442,
@@ -4167,7 +4349,7 @@ const unsigned short utf8_to_euc_E6BE[] = {
  0xC877, 0x4543,      0, 0x5F34,      0, 0xC878, 0xC879,      0,
       0, 0x5F38,      0,      0, 0xC87A,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E6BF[] = {
+static const unsigned short utf8_to_euc_E6BF[] = {
  0x3763, 0x4279, 0x5F32, 0x473B,      0, 0xC87B, 0x5F39, 0xC87C,
  0xC87D,      0, 0xC87E,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0x5F3E, 0x5F3C,      0,      0,
@@ -4177,7 +4359,7 @@ const unsigned short utf8_to_euc_E6BF[] = {
  0xC925, 0x5F40,      0, 0x5F2B,      0, 0xC926, 0x6F69,      0,
       0, 0xC927, 0x5F45,      0, 0xC928, 0xC929, 0x5F49,      0,
 };
-const unsigned short utf8_to_euc_E780[] = {
+static const unsigned short utf8_to_euc_E780[] = {
  0xC92A, 0x5F47,      0,      0,      0, 0xC92B, 0xC92C, 0xC92D,
       0, 0x5F43,      0, 0x5F44,      0, 0xC92E,      0, 0x5F48,
       0, 0x5F46,      0,      0,      0, 0x494E,      0, 0xC92F,
@@ -4187,7 +4369,7 @@ const unsigned short utf8_to_euc_E780[] = {
  0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
       0, 0xC935,      0,      0, 0xC936,      0, 0x5F51,      0,
 };
-const unsigned short utf8_to_euc_E781[] = {
+static const unsigned short utf8_to_euc_E781[] = {
       0,      0,      0, 0xC937, 0xC938,      0,      0,      0,
  0xC939, 0xC93A, 0xC93B, 0xC93C, 0x5E75,      0, 0xC941,      0,
       0, 0x5F53,      0,      0, 0xC93D, 0xC93E,      0,      0,
@@ -4197,7 +4379,7 @@ const unsigned short utf8_to_euc_E781[] = {
  0x3325,      0,      0,      0,      0, 0xC946, 0xC947,      0,
  0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xC948,      0,
 };
-const unsigned short utf8_to_euc_E782[] = {
+static const unsigned short utf8_to_euc_E782[] = {
       0, 0xC949,      0,      0,      0, 0xC94A, 0xC94B,      0,
       0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0,
       0,      0, 0x5F56,      0, 0xC94C, 0xC94D, 0xC94E, 0xC94F,
@@ -4207,7 +4389,7 @@ const unsigned short utf8_to_euc_E782[] = {
  0xC954, 0xC955,      0, 0x5F5B, 0xC956,      0,      0, 0xC957,
  0x5F5A, 0x4540, 0x3059, 0xF42E,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E783[] = {
+static const unsigned short utf8_to_euc_E783[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0x4E75,      0, 0xC958, 0x5F5E,      0,      0,      0, 0x3128,
       0, 0xC959,      0, 0xC95A, 0xC95B, 0xC95C, 0xC95D,      0,
@@ -4217,7 +4399,7 @@ const unsigned short utf8_to_euc_E783[] = {
       0, 0x5F58,      0,      0,      0,      0,      0,      0,
       0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
 };
-const unsigned short utf8_to_euc_E784[] = {
+static const unsigned short utf8_to_euc_E784[] = {
       0,      0,      0, 0xC962, 0xC963, 0xC964, 0xC965, 0xC966,
       0, 0x5F61,      0, 0xC967, 0xC968,      0,      0, 0xC969,
       0,      0,      0,      0, 0x316B,      0,      0,      0,
@@ -4227,7 +4409,7 @@ const unsigned short utf8_to_euc_E784[] = {
  0xC96F, 0xC970,      0,      0,      0,      0, 0x4133,      0,
  0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E785[] = {
+static const unsigned short utf8_to_euc_E785[] = {
       0, 0xC972,      0,      0,      0, 0xC973, 0xC974, 0xC975,
       0, 0x4E7B, 0xC976, 0xC977, 0x5F6A,      0, 0x4079,      0,
  0xC978,      0, 0xC979,      0,      0, 0x5F66, 0x5F6B, 0xC97A,
@@ -4237,7 +4419,7 @@ const unsigned short utf8_to_euc_E785[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
 };
-const unsigned short utf8_to_euc_E786[] = {
+static const unsigned short utf8_to_euc_E786[] = {
  0xCA23,      0,      0,      0, 0x5F6F, 0xCA24,      0, 0xCA25,
  0x5F67,      0, 0x3727,      0, 0xCA26,      0,      0, 0x5F6D,
       0,      0, 0xCA27,      0, 0x4D50, 0x5F70,      0,      0,
@@ -4247,7 +4429,7 @@ const unsigned short utf8_to_euc_E786[] = {
  0xCA2D, 0x472E, 0xCA2E, 0xCA2F,      0,      0,      0,      0,
       0, 0x5F74, 0xCA30,      0,      0,      0, 0x5F75, 0xCA31,
 };
-const unsigned short utf8_to_euc_E787[] = {
+static const unsigned short utf8_to_euc_E787[] = {
  0xCA32, 0xCA33,      0, 0x4733, 0xCA34,      0,      0,      0,
  0x4575, 0x5F77,      0, 0xCA35, 0xCA36,      0, 0x5F79,      0,
  0x4E55,      0, 0x5F76, 0xCA37, 0x5F78, 0x316D, 0xCA38, 0x5F73,
@@ -4257,7 +4439,7 @@ const unsigned short utf8_to_euc_E787[] = {
       0,      0,      0,      0,      0, 0x5F7D,      0,      0,
  0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0xCA3D, 0x6022,
 };
-const unsigned short utf8_to_euc_E788[] = {
+static const unsigned short utf8_to_euc_E788[] = {
  0xCA3E,      0,      0,      0,      0,      0, 0x477A, 0xCA3F,
  0xCA40, 0xCA41,      0,      0,      0, 0x6023,      0,      0,
  0x6024,      0,      0, 0xCA42,      0,      0,      0, 0xCA43,
@@ -4267,7 +4449,7 @@ const unsigned short utf8_to_euc_E788[] = {
  0x6029,      0, 0x602A,      0, 0xCA4A, 0x3C5F, 0x4963,      0,
  0xCA4B, 0xCA4C, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
 };
-const unsigned short utf8_to_euc_E789[] = {
+static const unsigned short utf8_to_euc_E789[] = {
  0x602E, 0xCA4D, 0xCA4E, 0xCA4F,      0, 0xCA50, 0x602F, 0x4A52,
  0x4847,      0,      0, 0x6030, 0x4757,      0, 0xCA51, 0xCA52,
  0xCA53,      0, 0x442D, 0xCA54,      0, 0xCA55, 0xCA56,      0,
@@ -4277,7 +4459,7 @@ const unsigned short utf8_to_euc_E789[] = {
       0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
  0xCA62, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xCA65,
 };
-const unsigned short utf8_to_euc_E78A[] = {
+static const unsigned short utf8_to_euc_E78A[] = {
  0x3A54, 0x6035, 0x6034,      0, 0xCA66,      0,      0, 0x6036,
       0, 0xCA67,      0,      0,      0, 0xCA68, 0xCA69,      0,
       0,      0, 0x6037, 0xCA6A,      0,      0, 0x6038,      0,
@@ -4287,7 +4469,7 @@ const unsigned short utf8_to_euc_E78A[] = {
       0, 0xCA6F, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
       0, 0x603B,      0,      0,      0,      0, 0xCA71,      0,
 };
-const unsigned short utf8_to_euc_E78B[] = {
+static const unsigned short utf8_to_euc_E78B[] = {
       0, 0xCA72, 0x3638, 0x603D, 0x603F,      0, 0x603E, 0xCA73,
       0, 0xCA74,      0,      0, 0xCA75,      0, 0x6040,      0,
  0x3851,      0, 0x6041,      0,      0, 0xCA76, 0xCA77, 0x3669,
@@ -4297,7 +4479,7 @@ const unsigned short utf8_to_euc_E78B[] = {
       0,      0,      0, 0xCA7B, 0xCA7C,      0,      0, 0x6046,
  0x432C, 0x6045, 0xCA7D, 0xCA7E, 0x4F35, 0x4762, 0xCB21,      0,
 };
-const unsigned short utf8_to_euc_E78C[] = {
+static const unsigned short utf8_to_euc_E78C[] = {
       0,      0, 0xCB22,      0, 0xCB23, 0xCB24,      0, 0xCB25,
       0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
       0,      0, 0xCB28, 0xCB29,      0,      0, 0x604B, 0x6048,
@@ -4307,7 +4489,7 @@ const unsigned short utf8_to_euc_E78C[] = {
       0, 0xCB32, 0xCB33,      0, 0x604D, 0xCB34, 0x4D31, 0x4D32,
       0,      0, 0xCB35, 0xCB36,      0, 0xCB37, 0x6051, 0x316E,
 };
-const unsigned short utf8_to_euc_E78D[] = {
+static const unsigned short utf8_to_euc_E78D[] = {
       0,      0,      0, 0xCB38, 0x3976, 0x3B62,      0,      0,
       0,      0,      0,      0,      0, 0xCB39, 0x6052, 0x6053,
  0xCB3A,      0, 0xCB3B,      0,      0,      0, 0xCB3C, 0x6055,
@@ -4317,7 +4499,7 @@ const unsigned short utf8_to_euc_E78D[] = {
  0x6058, 0xCB49, 0x334D,      0,      0, 0x605A,      0, 0xCB4A,
  0x6059, 0xCB4B, 0x605C, 0x605B, 0xCB4C,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E78E[] = {
+static const unsigned short utf8_to_euc_E78E[] = {
  0xCB4D, 0xCB4E,      0, 0xCB4F, 0x383C, 0xCB50, 0xCB51, 0x4E28,
       0, 0x364C,      0, 0x3226,      0,      0, 0xCB52,      0,
  0xCB53,      0,      0, 0xCB54,      0, 0xCB55, 0x366A, 0xCB56,
@@ -4327,7 +4509,7 @@ const unsigned short utf8_to_euc_E78E[] = {
       0,      0, 0x4E68, 0x605E,      0, 0xCB62,      0, 0xCB63,
       0, 0xCB64,      0, 0x6060, 0xCB65, 0xCB66,      0, 0xCB67,
 };
-const unsigned short utf8_to_euc_E78F[] = {
+static const unsigned short utf8_to_euc_E78F[] = {
  0x6061,      0, 0x3251,      0,      0, 0xCB68, 0xCB69,      0,
  0x605D, 0xCB6A, 0x3B39, 0xCB6B, 0xCB6C, 0x4441, 0x605F, 0xCB6D,
       0,      0, 0xCB6E, 0xCB6F,      0,      0, 0xCB70,      0,
@@ -4337,7 +4519,7 @@ const unsigned short utf8_to_euc_E78F[] = {
       0, 0x607E,      0,      0, 0xCB78, 0xCB79,      0, 0xCB7A,
  0x6069, 0xCB7B, 0xCB7C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
 };
-const unsigned short utf8_to_euc_E790[] = {
+static const unsigned short utf8_to_euc_E790[] = {
  0xCC22, 0xCC23,      0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0xCC25,
       0, 0x4E30, 0xCC26,      0,      0,      0,      0,      0,
       0, 0xCC27,      0,      0,      0,      0,      0,      0,
@@ -4347,7 +4529,7 @@ const unsigned short utf8_to_euc_E790[] = {
  0xCC34, 0xCC35, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
       0, 0xCC36, 0x606B,      0,      0,      0,      0, 0x606D,
 };
-const unsigned short utf8_to_euc_E791[] = {
+static const unsigned short utf8_to_euc_E791[] = {
  0xCC37, 0x6070,      0, 0xCC38, 0xCC39,      0, 0xCC3A, 0xCC3B,
       0,      0,      0, 0xCC3C,      0, 0xCC3D,      0,      0,
       0, 0xCC3E, 0xCC3F,      0,      0, 0x606C,      0, 0xCC40,
@@ -4357,7 +4539,7 @@ const unsigned short utf8_to_euc_E791[] = {
  0x6073, 0xCC49, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
       0,      0,      0,      0,      0,      0, 0x6077,      0,
 };
-const unsigned short utf8_to_euc_E792[] = {
+static const unsigned short utf8_to_euc_E792[] = {
  0xCC4B, 0xCC4C,      0, 0x4D7E,      0, 0xCC4D, 0xCC4E, 0xCC4F,
       0, 0xCC50,      0, 0x6078,      0,      0,      0, 0xCC51,
  0xCC52, 0xCC53, 0xCC54,      0,      0,      0,      0,      0,
@@ -4367,7 +4549,7 @@ const unsigned short utf8_to_euc_E792[] = {
  0x3444, 0xCC64, 0xCC65,      0,      0, 0xCC66,      0,      0,
       0, 0xCC67,      0, 0xCC68,      0, 0x3C25,      0, 0xCC69,
 };
-const unsigned short utf8_to_euc_E793[] = {
+static const unsigned short utf8_to_euc_E793[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0xCC6A, 0xCC6B, 0x607B,      0, 0xCC6C,      0,      0, 0x607C,
  0xCC6D,      0,      0, 0xCC6E, 0x607D,      0,      0,      0,
@@ -4377,7 +4559,7 @@ const unsigned short utf8_to_euc_E793[] = {
  0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
  0x6129,      0, 0xCC7A, 0xCC7B, 0xCC7C,      0,      0, 0xCC7D,
 };
-const unsigned short utf8_to_euc_E794[] = {
+static const unsigned short utf8_to_euc_E794[] = {
       0, 0xF450,      0, 0x612C, 0x612B, 0x612D, 0xCC7E,      0,
       0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0,
       0, 0x3979, 0xCD21, 0x6132,      0, 0x6131, 0xCD22, 0xCD23,
@@ -4387,7 +4569,7 @@ const unsigned short utf8_to_euc_E794[] = {
  0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
  0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xCD2D, 0xCD2E, 0xCD2F,
 };
-const unsigned short utf8_to_euc_E795[] = {
+static const unsigned short utf8_to_euc_E795[] = {
  0xCD30,      0,      0, 0xCD31, 0x6137,      0, 0x613C, 0xCD32,
  0xCD33, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xCD34, 0x305A,
  0xCD35, 0x482A, 0xCD36,      0, 0x484A,      0,      0, 0xCD37,
@@ -4397,7 +4579,7 @@ const unsigned short utf8_to_euc_E795[] = {
  0x305B, 0xCD3C,      0, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
  0x6143, 0xCD3D, 0xCD3E, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0x3526,
 };
-const unsigned short utf8_to_euc_E796[] = {
+static const unsigned short utf8_to_euc_E796[] = {
       0, 0xCD43, 0x614A,      0,      0, 0xCD44, 0x6145, 0x6146,
       0, 0x6149, 0x6148, 0x4925,      0,      0, 0x4142, 0x4141,
  0xCD45, 0x353F, 0xCD46, 0xCD47, 0x614B, 0xCD48,      0,      0,
@@ -4407,7 +4589,7 @@ const unsigned short utf8_to_euc_E796[] = {
       0, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0,      0,
  0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xCD4F,
 };
-const unsigned short utf8_to_euc_E797[] = {
+static const unsigned short utf8_to_euc_E797[] = {
  0xCD50, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xCD53, 0x3E49,
       0,      0, 0x6159,      0, 0xCD54, 0x6158, 0xCD55, 0xCD56,
       0,      0, 0x615A,      0, 0x3C26, 0x3A2F,      0, 0xCD57,
@@ -4417,7 +4599,7 @@ const unsigned short utf8_to_euc_E797[] = {
  0x6162, 0xCD61, 0x6164, 0x6165, 0x4354,      0,      0,      0,
       0, 0xCD62, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
 };
-const unsigned short utf8_to_euc_E798[] = {
+static const unsigned short utf8_to_euc_E798[] = {
  0xCD63, 0x6161, 0xCD64, 0xCD65, 0xCD66,      0,      0, 0xCD67,
  0xCD68, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167,      0, 0xCD6B,
       0,      0, 0xCD6C, 0xCD6D,      0, 0xCD6E, 0xCD6F,      0,
@@ -4427,7 +4609,7 @@ const unsigned short utf8_to_euc_E798[] = {
  0x6170,      0, 0xCD7A, 0xCD7B, 0x616F, 0xCD7C,      0,      0,
  0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xCE22,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E799[] = {
+static const unsigned short utf8_to_euc_E799[] = {
  0xCE24, 0xCE25, 0x4E45, 0xCE26, 0xCE27, 0xCE28, 0x6174, 0x6172,
  0x6173, 0xCE29, 0xCE23, 0xCE2A, 0x3462,      0,      0,      0,
       0,      0, 0x4C7E,      0,      0, 0xCE2B, 0x4A4A,      0,
@@ -4437,7 +4619,7 @@ const unsigned short utf8_to_euc_E799[] = {
  0x617E, 0xCE33, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
  0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
 };
-const unsigned short utf8_to_euc_E79A[] = {
+static const unsigned short utf8_to_euc_E79A[] = {
  0x6225, 0xCE35, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
  0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
  0x3B29,      0,      0, 0x622B,      0, 0xCE39, 0x622A,      0,
@@ -4447,7 +4629,7 @@ const unsigned short utf8_to_euc_E79A[] = {
  0x622E,      0,      0,      0, 0x622F,      0,      0, 0x7369,
  0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
 };
-const unsigned short utf8_to_euc_E79B[] = {
+static const unsigned short utf8_to_euc_E79B[] = {
       0, 0xCE49, 0x6233, 0x4756,      0, 0xCE4A, 0x4B5F,      0,
  0x314E, 0xCE4B, 0x3157, 0xCE4C, 0xCE4D, 0x6234, 0xCE4E,      0,
       0,      0, 0x6236,      0, 0xCE4F,      0, 0x6235, 0x4570,
@@ -4457,7 +4639,7 @@ const unsigned short utf8_to_euc_E79B[] = {
  0xCE55, 0xCE56, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
  0x416A, 0xCE58,      0, 0x623D, 0xCE59,      0, 0x3D62,      0,
 };
-const unsigned short utf8_to_euc_E79C[] = {
+static const unsigned short utf8_to_euc_E79C[] = {
  0xCE5A, 0x3E4A,      0,      0, 0x6240,      0, 0xCE5B, 0x623F,
  0x623E, 0x487D, 0xCE5C, 0x3447, 0x3829,      0, 0xCE5D,      0,
       0,      0, 0xCE5E,      0, 0xCE5F, 0xCE60,      0, 0xCE61,
@@ -4467,7 +4649,7 @@ const unsigned short utf8_to_euc_E79C[] = {
       0,      0,      0,      0, 0xCE6A, 0xCE6B, 0xCE6C, 0x6247,
  0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
 };
-const unsigned short utf8_to_euc_E79D[] = {
+static const unsigned short utf8_to_euc_E79D[] = {
  0x4365,      0, 0xCE70,      0,      0, 0xCE71, 0xCE72, 0x6249,
       0,      0, 0xCE73,      0,      0, 0xCE74, 0xCE75, 0xCE76,
       0,      0, 0xCE77,      0,      0,      0, 0xCE78, 0xCE79,
@@ -4477,7 +4659,7 @@ const unsigned short utf8_to_euc_E79D[] = {
  0xCF25,      0, 0xCF26, 0xCF27, 0xCF28,      0,      0,      0,
       0, 0x6251, 0xCF29,      0,      0, 0xCF2A, 0x6250, 0x624F,
 };
-const unsigned short utf8_to_euc_E79E[] = {
+static const unsigned short utf8_to_euc_E79E[] = {
  0xCF2B,      0,      0,      0, 0xCF2C,      0,      0,      0,
       0,      0,      0, 0x6253, 0xCF2D, 0xCF2E, 0x6252,      0,
       0, 0x6254,      0,      0, 0xCF2F, 0xCF30, 0xCF31,      0,
@@ -4487,7 +4669,7 @@ const unsigned short utf8_to_euc_E79E[] = {
  0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
       0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
 };
-const unsigned short utf8_to_euc_E79F[] = {
+static const unsigned short utf8_to_euc_E79F[] = {
       0,      0,      0, 0xCF3C,      0,      0,      0, 0x625E,
       0, 0xCF3D,      0,      0,      0, 0x625F,      0,      0,
       0, 0xCF3E, 0xCF3F,      0,      0, 0xCF40,      0, 0x6260,
@@ -4497,7 +4679,7 @@ const unsigned short utf8_to_euc_E79F[] = {
  0xCF49, 0xCF4A,      0, 0x4050, 0xCF4B,      0,      0,      0,
  0xCF4C,      0,      0, 0xCF4D, 0x6265,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E7A0[] = {
+static const unsigned short utf8_to_euc_E7A0[] = {
       0,      0, 0x3A3D,      0,      0, 0xCF4E, 0xCF4F,      0,
       0, 0xCF50,      0,      0, 0x6266, 0xCF51, 0xCF52,      0,
       0, 0xCF53, 0x6267,      0, 0x3826, 0x3A55,      0,      0,
@@ -4507,7 +4689,7 @@ const unsigned short utf8_to_euc_E7A0[] = {
  0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
       0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
 };
-const unsigned short utf8_to_euc_E7A1[] = {
+static const unsigned short utf8_to_euc_E7A1[] = {
       0,      0,      0, 0xCF5D, 0xCF5E, 0x626B,      0, 0xCF5F,
  0xCF60,      0,      0,      0, 0xCF61,      0, 0xCF62,      0,
       0,      0, 0xCF63,      0,      0,      0,      0,      0,
@@ -4517,7 +4699,7 @@ const unsigned short utf8_to_euc_E7A1[] = {
       0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
       0,      0, 0xCF6D,      0, 0x626F,      0, 0xCF6E,      0,
 };
-const unsigned short utf8_to_euc_E7A2[] = {
+static const unsigned short utf8_to_euc_E7A2[] = {
       0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
       0,      0, 0xCF6F,      0, 0x6271, 0x3337, 0x626C, 0xCF70,
       0, 0x486A,      0, 0x3130, 0xCF71, 0x3A6C,      0, 0x4F52,
@@ -4527,7 +4709,7 @@ const unsigned short utf8_to_euc_E7A2[] = {
  0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
       0,      0, 0x334E, 0xD021, 0x627B, 0xD022, 0x627A, 0xD023,
 };
-const unsigned short utf8_to_euc_E7A3[] = {
+static const unsigned short utf8_to_euc_E7A3[] = {
       0, 0x3C27,      0,      0,      0, 0x627C, 0x6277, 0xD024,
  0xD025, 0xD026, 0x627D, 0x6278, 0xD027,      0, 0xD028,      0,
  0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xD02B, 0xD02C,      0,
@@ -4537,7 +4719,7 @@ const unsigned short utf8_to_euc_E7A3[] = {
       0,      0, 0xD034, 0xD035, 0x6324,      0, 0xD037, 0xD038,
       0,      0, 0xD039, 0xD03A,      0, 0x6323,      0, 0xD03B,
 };
-const unsigned short utf8_to_euc_E7A4[] = {
+static const unsigned short utf8_to_euc_E7A4[] = {
  0xD036, 0x3E4C,      0,      0,      0,      0, 0xD03C, 0x6325,
       0,      0,      0,      0, 0xD03D,      0, 0x4143,      0,
  0xD03E, 0x6327, 0x6326,      0,      0,      0,      0,      0,
@@ -4547,7 +4729,7 @@ const unsigned short utf8_to_euc_E7A4[] = {
  0xF454, 0xD048,      0,      0, 0xD049, 0xD04A,      0,      0,
       0,      0, 0x3C28, 0xD04B, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
 };
-const unsigned short utf8_to_euc_E7A5[] = {
+static const unsigned short utf8_to_euc_E7A5[] = {
  0x632B, 0x3737,      0,      0, 0xD04E, 0xD04F, 0xD050, 0x3540,
  0x3527, 0x3B63, 0xD051, 0xD052,      0,      0,      0, 0xD053,
  0x4D34, 0xD054,      0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
@@ -4557,7 +4739,7 @@ const unsigned short utf8_to_euc_E7A5[] = {
       0,      0, 0xD05C,      0,      0,      0,      0, 0x4578,
       0, 0xD05D, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
 };
-const unsigned short utf8_to_euc_E7A6[] = {
+static const unsigned short utf8_to_euc_E7A6[] = {
  0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0,
       0,      0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
       0, 0xD063,      0, 0xD064, 0xD065, 0xD066, 0xD067,      0,
@@ -4567,7 +4749,7 @@ const unsigned short utf8_to_euc_E7A6[] = {
  0x4729, 0xD070,      0, 0x633A, 0xD071,      0,      0,      0,
  0xD072, 0x633B, 0x633C, 0xD073,      0, 0x3659, 0x3253, 0x4645,
 };
-const unsigned short utf8_to_euc_E7A7[] = {
+static const unsigned short utf8_to_euc_E7A7[] = {
  0x3D28, 0x3B64, 0xD074,      0, 0xD075,      0,      0, 0xD076,
  0xD077, 0x633D, 0xD078, 0x3D29,      0,      0,      0, 0xD079,
       0, 0x324A, 0x4943,      0, 0xD07A, 0x633E, 0xD07B,      0,
@@ -4577,7 +4759,7 @@ const unsigned short utf8_to_euc_E7A7[] = {
  0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
  0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E7A8[] = {
+static const unsigned short utf8_to_euc_E7A8[] = {
  0x3529,      0, 0xD12A, 0xD12B,      0,      0,      0, 0xD12C,
  0x6343, 0xD12D, 0xD12E, 0x4478, 0xD12F, 0x6344, 0x4047,      0,
       0, 0xD130,      0,      0, 0x4C2D, 0xD131,      0, 0x4923,
@@ -4587,7 +4769,7 @@ const unsigned short utf8_to_euc_E7A8[] = {
  0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
  0xD13C, 0xD13D, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
 };
-const unsigned short utf8_to_euc_E7A9[] = {
+static const unsigned short utf8_to_euc_E7A9[] = {
  0x3972,      0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xD141,
  0xD142, 0x6350,      0,      0, 0xD143, 0x4051, 0x314F, 0x323A,
  0x302C,      0,      0,      0,      0, 0xD144, 0xD145, 0x634F,
@@ -4597,7 +4779,7 @@ const unsigned short utf8_to_euc_E7A9[] = {
  0x6355,      0,      0,      0, 0x376A, 0xD14F, 0x3566,      0,
  0xD150, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
 };
-const unsigned short utf8_to_euc_E7AA[] = {
+static const unsigned short utf8_to_euc_E7AA[] = {
  0xD152, 0x464D, 0xD153, 0x4060, 0x3A75, 0xD154, 0xD155,      0,
  0x6358,      0, 0xD156, 0xD157,      0,      0,      0,      0,
  0xD158, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
@@ -4607,7 +4789,7 @@ const unsigned short utf8_to_euc_E7AA[] = {
  0x635F,      0,      0, 0xD15F,      0, 0xD160, 0x6360,      0,
       0, 0xD161, 0x312E, 0xD162, 0xD163,      0,      0, 0x6363,
 };
-const unsigned short utf8_to_euc_E7AB[] = {
+static const unsigned short utf8_to_euc_E7AB[] = {
       0,      0,      0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
  0x635E, 0xD165, 0x6366, 0x4E29, 0xD166, 0x6367, 0xD167, 0x6368,
       0, 0xD168, 0x5474, 0x636A,      0, 0x6369,      0,      0,
@@ -4617,7 +4799,7 @@ const unsigned short utf8_to_euc_E7AB[] = {
  0x6372, 0xD16E,      0,      0, 0xD16F,      0, 0x3625,      0,
  0x513F, 0x435D, 0x3C33, 0xD170,      0, 0xD171, 0xD172, 0x3448,
 };
-const unsigned short utf8_to_euc_E7AC[] = {
+static const unsigned short utf8_to_euc_E7AC[] = {
       0,      0, 0x6373,      0, 0x6422,      0, 0x6376, 0xD173,
  0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374,
       0, 0x3E50,      0,      0, 0xD174,      0,      0,      0,
@@ -4627,7 +4809,7 @@ const unsigned short utf8_to_euc_E7AC[] = {
  0xD17E, 0xD221,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
       0, 0x3A7B,      0,      0,      0, 0xD223,      0, 0xD224,
 };
-const unsigned short utf8_to_euc_E7AD[] = {
+static const unsigned short utf8_to_euc_E7AD[] = {
  0xD225, 0xD226,      0,      0,      0, 0x6426, 0x492E, 0xD227,
  0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423, 0xD228, 0x4835,
  0x637E, 0x435E, 0x457B,      0, 0x457A, 0xD229, 0x3A76,      0,
@@ -4637,7 +4819,7 @@ const unsigned short utf8_to_euc_E7AD[] = {
  0x642B, 0x642C, 0xD231, 0xD232, 0x6429, 0x6427,      0, 0xD233,
       0,      0, 0x6421,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E7AE[] = {
+static const unsigned short utf8_to_euc_E7AE[] = {
       0,      0,      0,      0, 0xD234,      0, 0x4A4F, 0x3255,
       0, 0xD235,      0, 0x6435,      0, 0x6432, 0xD236, 0x6437,
  0xD237, 0xD238, 0x6436,      0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
@@ -4647,7 +4829,7 @@ const unsigned short utf8_to_euc_E7AE[] = {
  0xD240, 0x4822, 0xD241,      0, 0x643E, 0xD242, 0xD243,      0,
  0x4824,      0, 0xD244, 0xD245, 0xD246, 0xD247,      0,      0,
 };
-const unsigned short utf8_to_euc_E7AF[] = {
+static const unsigned short utf8_to_euc_E7AF[] = {
  0x4061, 0x643B, 0xD248,      0, 0x484F, 0xD249, 0x643F, 0x4A53,
  0xD24A, 0x435B, 0xD24B, 0x643A, 0x643C,      0,      0, 0x643D,
       0,      0,      0,      0, 0xD24C,      0, 0xD24D, 0xD24E,
@@ -4657,7 +4839,7 @@ const unsigned short utf8_to_euc_E7AF[] = {
       0,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
  0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
 };
-const unsigned short utf8_to_euc_E7B0[] = {
+static const unsigned short utf8_to_euc_E7B0[] = {
  0x6447, 0xD25C, 0xD25D, 0xD25E, 0xD25F,      0, 0xD260, 0x6448,
       0, 0xD261,      0, 0xD262, 0xD263, 0x644D, 0xD264, 0xD265,
       0, 0x6442, 0x5255, 0x6449, 0x6443,      0,      0, 0x644C,
@@ -4667,7 +4849,7 @@ const unsigned short utf8_to_euc_E7B0[] = {
       0, 0xD26D,      0, 0xD26E, 0xD26F,      0, 0xD270, 0x6453,
  0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
 };
-const unsigned short utf8_to_euc_E7B1[] = {
+static const unsigned short utf8_to_euc_E7B1[] = {
  0x645A,      0,      0, 0x6457,      0,      0, 0xD273,      0,
       0,      0, 0xD274,      0, 0x6456, 0x4052,      0, 0x6459,
  0x645B, 0xD276, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F,      0,
@@ -4677,7 +4859,7 @@ const unsigned short utf8_to_euc_E7B1[] = {
  0xD327,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
       0, 0xD329,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
 };
-const unsigned short utf8_to_euc_E7B2[] = {
+static const unsigned short utf8_to_euc_E7B2[] = {
       0, 0x364E, 0x3729, 0x6463,      0,      0, 0xD32C, 0xD32D,
       0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0, 0xD32E,
  0x6464,      0, 0x4E33,      0, 0xD32F, 0x4774,      0, 0x4146,
@@ -4687,7 +4869,7 @@ const unsigned short utf8_to_euc_E7B2[] = {
  0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xD334, 0xD335,
       0, 0x646F, 0xD336, 0xD337, 0xD338, 0x6470, 0x403A, 0xD339,
 };
-const unsigned short utf8_to_euc_E7B3[] = {
+static const unsigned short utf8_to_euc_E7B3[] = {
  0x6471,      0, 0x6473,      0, 0xD33A, 0x6472,      0, 0xD33B,
  0xD33C, 0xD33D, 0x3852,      0,      0, 0xD33E, 0x4138, 0xD33F,
       0,      0, 0x6475, 0xD340, 0xD341, 0xD342, 0x457C, 0xD343,
@@ -4697,7 +4879,7 @@ const unsigned short utf8_to_euc_E7B3[] = {
       0,      0, 0x647A,      0, 0x647B, 0xD34A, 0x647C,      0,
  0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
 };
-const unsigned short utf8_to_euc_E7B4[] = {
+static const unsigned short utf8_to_euc_E7B4[] = {
  0x352A,      0, 0x6521, 0xD34B, 0x4C73, 0x3948, 0x647E, 0xD34C,
  0xD34D, 0xD34E, 0x6524, 0x4C66,      0, 0x473C,      0, 0xD34F,
  0x4933, 0xD350, 0xD351, 0xD352, 0x3D63, 0x6523, 0xD353, 0x3C53,
@@ -4707,7 +4889,7 @@ const unsigned short utf8_to_euc_E7B4[] = {
  0x3A59, 0xD35A, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
       0, 0x3E52, 0x3A30,      0, 0xD35B, 0xD35C, 0xD35D, 0x6529,
 };
-const unsigned short utf8_to_euc_E7B5[] = {
+static const unsigned short utf8_to_euc_E7B5[] = {
  0xD35E, 0xD35F, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xD360,
  0xD361,      0,      0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
  0x376B, 0xD363,      0, 0xD364,      0,      0, 0x652D, 0xD365,
@@ -4717,7 +4899,7 @@ const unsigned short utf8_to_euc_E7B5[] = {
  0xD36D, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
  0xD36E, 0x3828, 0xD36F, 0xD370,      0, 0x6538,      0, 0xD371,
 };
-const unsigned short utf8_to_euc_E7B6[] = {
+static const unsigned short utf8_to_euc_E7B6[] = {
       0, 0xD372, 0xD373, 0xD374,      0, 0xD375, 0xD376,      0,
  0xD377, 0x6535,      0, 0xD378, 0xD379, 0xD37A,      0, 0x6537,
       0, 0xD37B,      0, 0x6534,      0,      0, 0xD37C, 0xD37D,
@@ -4727,7 +4909,7 @@ const unsigned short utf8_to_euc_E7B6[] = {
  0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xD426, 0xD427,
  0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
 };
-const unsigned short utf8_to_euc_E7B7[] = {
+static const unsigned short utf8_to_euc_E7B7[] = {
       0,      0, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
       0,      0, 0x365B, 0x486C, 0xD42E, 0xD42F, 0xD430, 0x416D,
       0, 0x4E50, 0x3D6F,      0,      0, 0x656E, 0xF45D, 0xD431,
@@ -4737,7 +4919,7 @@ const unsigned short utf8_to_euc_E7B7[] = {
       0, 0xD43A, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
       0, 0xD43D, 0xD43E, 0x654C,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E7B8[] = {
+static const unsigned short utf8_to_euc_E7B8[] = {
  0xD433, 0x316F,      0,      0, 0x466C, 0x654F,      0,      0,
  0xD43F, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0,
  0xD440, 0xD441, 0x6553,      0,      0, 0xD442,      0, 0xD443,
@@ -4747,7 +4929,7 @@ const unsigned short utf8_to_euc_E7B8[] = {
       0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
       0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
 };
-const unsigned short utf8_to_euc_E7B9[] = {
+static const unsigned short utf8_to_euc_E7B9[] = {
       0, 0x484B,      0, 0x655E, 0xD44F, 0xD450, 0x6559, 0xD451,
       0,      0, 0x4121, 0x3752,      0, 0x3D2B, 0xD452,      0,
  0xD453,      0, 0xD454,      0, 0x3F25, 0x4136, 0x6564,      0,
@@ -4757,7 +4939,7 @@ const unsigned short utf8_to_euc_E7B9[] = {
  0x372B,      0,      0, 0xD45D,      0,      0,      0,      0,
  0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xD45F, 0x6571,
 };
-const unsigned short utf8_to_euc_E7BA[] = {
+static const unsigned short utf8_to_euc_E7BA[] = {
       0, 0xD460, 0x3B3C, 0x656D,      0,      0, 0xD461, 0xD462,
  0x6572, 0x6573, 0xD463,      0, 0x6574, 0xD464, 0x657A, 0x453B,
  0x6576, 0xD465, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579,      0,
@@ -4767,7 +4949,7 @@ const unsigned short utf8_to_euc_E7BA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E7BC[] = {
+static const unsigned short utf8_to_euc_E7BC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -4777,7 +4959,7 @@ const unsigned short utf8_to_euc_E7BC[] = {
       0,      0,      0,      0,      0,      0, 0x344C,      0,
  0x657D,      0, 0x657E, 0xD46C, 0xD46B, 0xD46D, 0xD46E, 0xD46F,
 };
-const unsigned short utf8_to_euc_E7BD[] = {
+static const unsigned short utf8_to_euc_E7BD[] = {
       0,      0,      0, 0xD470, 0xD471, 0x6621,      0, 0xD472,
       0,      0,      0,      0, 0x6622, 0x6623, 0x6624, 0xD473,
  0x6625, 0x6626, 0xD474, 0xD475, 0x6628, 0x6627,      0,      0,
@@ -4787,7 +4969,7 @@ const unsigned short utf8_to_euc_E7BD[] = {
  0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
  0x662F, 0x586D,      0,      0,      0, 0xD522, 0xD523, 0xD524,
 };
-const unsigned short utf8_to_euc_E7BE[] = {
+static const unsigned short utf8_to_euc_E7BE[] = {
  0xD525,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634,
  0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
  0xD529, 0xD52A,      0,      0, 0x6636,      0, 0xD52B, 0xD52C,
@@ -4797,7 +4979,7 @@ const unsigned short utf8_to_euc_E7BE[] = {
       0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
  0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0xD535,
 };
-const unsigned short utf8_to_euc_E7BF[] = {
+static const unsigned short utf8_to_euc_E7BF[] = {
  0xD536, 0x3227,      0, 0xD537,      0, 0x6642, 0x6643,      0,
  0xD538,      0, 0x6644,      0, 0x4D62,      0, 0xD539, 0xD53A,
       0,      0, 0x3D2C,      0, 0x6646, 0x6645,      0,      0,
@@ -4807,7 +4989,7 @@ const unsigned short utf8_to_euc_E7BF[] = {
  0x344D,      0, 0xD543, 0x664A,      0,      0,      0,      0,
       0, 0x664B, 0xD544, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
 };
-const unsigned short utf8_to_euc_E880[] = {
+static const unsigned short utf8_to_euc_E880[] = {
  0x4D54, 0x4F37,      0, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
  0xD549,      0, 0xD54A, 0x664F, 0x3C29, 0xD54B, 0xD54C, 0xD54D,
  0x4251, 0xD54E, 0x6650, 0xD54F, 0xD550, 0x394C, 0xD551, 0x4C57,
@@ -4817,7 +4999,7 @@ const unsigned short utf8_to_euc_E880[] = {
  0xD55A,      0,      0, 0x3C2A, 0xD55B, 0xD55C, 0x4C6D, 0xD55D,
       0, 0xD55E, 0xD55F, 0x6657, 0xD560, 0x433F, 0xD561, 0x6656,
 };
-const unsigned short utf8_to_euc_E881[] = {
+static const unsigned short utf8_to_euc_E881[] = {
  0xD562,      0,      0,      0, 0xD563,      0, 0x6659,      0,
       0,      0, 0x6658,      0,      0,      0,      0,      0,
       0,      0, 0x665A,      0,      0,      0, 0x403B,      0,
@@ -4827,7 +5009,7 @@ const unsigned short utf8_to_euc_E881[] = {
  0x6662, 0xD568, 0x6661, 0x6660, 0x4430, 0xD569, 0x6663, 0x3F26,
       0, 0x6664,      0,      0,      0, 0x6665, 0x4F38, 0x6666,
 };
-const unsigned short utf8_to_euc_E882[] = {
+static const unsigned short utf8_to_euc_E882[] = {
       0, 0xD56A,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825,
  0xD56B, 0x4679,      0, 0x4F3E, 0x4829,      0, 0xD56C,      0,
       0,      0,      0, 0x666B,      0,      0, 0x3E53,      0,
@@ -4837,7 +5019,7 @@ const unsigned short utf8_to_euc_E882[] = {
       0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
  0xD572, 0xD573, 0x4759,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E883[] = {
+static const unsigned short utf8_to_euc_E883[] = {
       0,      0,      0, 0x305F, 0x6674,      0, 0x4340,      0,
  0xD574,      0,      0,      0, 0x4758, 0xD575, 0x425B, 0xD576,
       0,      0, 0xD577,      0, 0xD578, 0xD579, 0x6676, 0xD57A,
@@ -4847,7 +5029,7 @@ const unsigned short utf8_to_euc_E883[] = {
  0xD621, 0x6679, 0xD622, 0xD623, 0x4639,      0, 0xD624,      0,
  0x363B, 0xD625, 0xD626,      0, 0x6726, 0x473D, 0xD627,      0,
 };
-const unsigned short utf8_to_euc_E884[] = {
+static const unsigned short utf8_to_euc_E884[] = {
       0,      0, 0x3B69, 0xD628,      0, 0x363C, 0x4048, 0x4F46,
  0x4C2E, 0x6677, 0x4054, 0xD629,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xD62A, 0xD62B,
@@ -4857,7 +5039,7 @@ const unsigned short utf8_to_euc_E884[] = {
  0xD633, 0x4326,      0, 0x473E,      0, 0xD634,      0,      0,
       0, 0x4431, 0xD635,      0, 0xD636,      0, 0x6723,      0,
 };
-const unsigned short utf8_to_euc_E885[] = {
+static const unsigned short utf8_to_euc_E885[] = {
       0,      0,      0,      0,      0, 0xD637, 0x6722, 0xD638,
       0,      0, 0xD639, 0x667E, 0xD63A,      0, 0x3F55,      0,
  0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53,      0, 0xD63C,
@@ -4867,7 +5049,7 @@ const unsigned short utf8_to_euc_E885[] = {
  0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
  0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
 };
-const unsigned short utf8_to_euc_E886[] = {
+static const unsigned short utf8_to_euc_E886[] = {
  0x672F, 0xD645, 0x6730, 0x672C, 0xD647, 0xD648, 0xD649,      0,
  0x672D,      0, 0x672E, 0xD64A,      0,      0, 0xD64B, 0x3951,
  0xD646,      0,      0, 0x6736,      0, 0x6732, 0xD64C,      0,
@@ -4877,7 +5059,7 @@ const unsigned short utf8_to_euc_E886[] = {
  0x6738,      0, 0xD652, 0x4137, 0xD653, 0x6739,      0,      0,
  0x673B,      0, 0x673F, 0xD654,      0, 0x673C, 0x673A, 0x473F,
 };
-const unsigned short utf8_to_euc_E887[] = {
+static const unsigned short utf8_to_euc_E887[] = {
  0x673D,      0, 0x673E, 0xD656,      0, 0xD657, 0x3232,      0,
  0x6745, 0x6740, 0xD658, 0xD655,      0, 0x6741, 0xD659, 0xD65A,
       0, 0x6742,      0, 0x4221,      0, 0xD65B,      0, 0xD65C,
@@ -4887,7 +5069,7 @@ const unsigned short utf8_to_euc_E887[] = {
  0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
  0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xD66B, 0x674C, 0xD66C,
 };
-const unsigned short utf8_to_euc_E888[] = {
+static const unsigned short utf8_to_euc_E888[] = {
  0xD66D, 0x674D, 0x674E, 0xD66E,      0, 0x674F,      0, 0x6750,
  0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
  0x6753,      0, 0x5030, 0xD670, 0xD671,      0, 0x6754, 0x4A5E,
@@ -4897,7 +5079,7 @@ const unsigned short utf8_to_euc_E888[] = {
       0,      0, 0xD678, 0x6758, 0xD679, 0x4249, 0x4775, 0x383F,
  0x6757, 0x4125, 0xD67A,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E889[] = {
+static const unsigned short utf8_to_euc_E889[] = {
  0x6759,      0,      0, 0xD67B, 0xD67C, 0xD67D, 0xD67E, 0x447A,
       0,      0,      0, 0xD721,      0,      0, 0xD722, 0xD723,
       0, 0xD724,      0,      0,      0,      0, 0xD725,      0,
@@ -4907,7 +5089,7 @@ const unsigned short utf8_to_euc_E889[] = {
       0, 0x6765, 0x3F27,      0, 0xD72B,      0, 0x3170, 0x6766,
  0x6767,      0,      0, 0xD72C,      0, 0xD72D, 0x6768, 0xD72E,
 };
-const unsigned short utf8_to_euc_E88A[] = {
+static const unsigned short utf8_to_euc_E88A[] = {
  0xD72F, 0xD730,      0, 0xD731, 0xD732,      0,      0, 0xD733,
       0, 0xD734, 0xD735, 0x3072,      0, 0x6769, 0xD736,      0,
       0, 0xD737, 0x676A,      0, 0xD738,      0, 0xD739,      0,
@@ -4917,7 +5099,7 @@ const unsigned short utf8_to_euc_E88A[] = {
  0xD746, 0x3256, 0xD747, 0x4B27, 0xD748,      0,      0, 0xD749,
  0x375D, 0x365C, 0xD74A, 0x676D, 0xD74B, 0x326A, 0xD74C, 0xD74D,
 };
-const unsigned short utf8_to_euc_E88B[] = {
+static const unsigned short utf8_to_euc_E88B[] = {
       0,      0,      0,      0,      0, 0x3423, 0xD74E,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
  0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0xD750,      0, 0x4944,
@@ -4927,7 +5109,7 @@ const unsigned short utf8_to_euc_E88B[] = {
       0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xD75A,
       0, 0x6779, 0x6775, 0x6778,      0, 0xD75B, 0xD75C,      0,
 };
-const unsigned short utf8_to_euc_E88C[] = {
+static const unsigned short utf8_to_euc_E88C[] = {
  0xD75D, 0xD75E, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xD75F,
  0xD760, 0x677D, 0xD761, 0xD762,      0,      0, 0x3754,      0,
       0,      0,      0,      0,      0,      0, 0x6823, 0x682C,
@@ -4937,7 +5119,7 @@ const unsigned short utf8_to_euc_E88C[] = {
  0xD76D, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
  0x427B, 0x6827, 0xD770,      0, 0xD771, 0xD772,      0,      0,
 };
-const unsigned short utf8_to_euc_E88D[] = {
+static const unsigned short utf8_to_euc_E88D[] = {
  0x6826,      0, 0xD773, 0xD774, 0xD775, 0x6829,      0, 0xD776,
       0, 0x4170, 0x3755,      0,      0, 0xD777, 0xD778, 0x3141,
  0x6828, 0xD779, 0x3953, 0xD83E, 0xD763, 0xD77A, 0xD77B, 0xD77C,
@@ -4947,7 +5129,7 @@ const unsigned short utf8_to_euc_E88D[] = {
  0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
  0xD77E,      0,      0, 0x322E, 0x6838, 0xD821,      0, 0xD822,
 };
-const unsigned short utf8_to_euc_E88E[] = {
+static const unsigned short utf8_to_euc_E88E[] = {
  0xD823,      0, 0xD824,      0, 0xD825, 0x682E, 0xD826, 0x6836,
       0, 0x683D, 0x6837,      0,      0, 0xD827, 0x6835,      0,
       0,      0, 0xD828, 0x6776, 0xD829, 0xD82A, 0x6833,      0,
@@ -4957,7 +5139,7 @@ const unsigned short utf8_to_euc_E88E[] = {
       0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
       0,      0,      0,      0,      0, 0x684F, 0xD834, 0xD835,
 };
-const unsigned short utf8_to_euc_E88F[] = {
+static const unsigned short utf8_to_euc_E88F[] = {
  0xD836, 0x6847,      0,      0,      0, 0x3F7B,      0, 0xD837,
       0, 0xD838, 0x3546,      0, 0x365D,      0, 0x6842, 0xD839,
  0xD83A, 0xD83B,      0, 0x325B, 0xD83C,      0, 0x3E54,      0,
@@ -4967,7 +5149,7 @@ const unsigned short utf8_to_euc_E88F[] = {
  0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 0x6848,
  0xD842, 0xD843,      0, 0x6852, 0xD844, 0x6843,      0,      0,
 };
-const unsigned short utf8_to_euc_E890[] = {
+static const unsigned short utf8_to_euc_E890[] = {
       0, 0xD845,      0, 0x6844, 0x463A,      0, 0xD846, 0x6849,
       0,      0, 0xD847, 0x6846, 0x4B28, 0x684C, 0x3060, 0xD848,
       0, 0xD849,      0, 0x6840,      0, 0xD84A,      0,      0,
@@ -4977,7 +5159,7 @@ const unsigned short utf8_to_euc_E890[] = {
       0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
  0x6850, 0xD84E,      0,      0, 0x6855, 0x4D6E,      0,      0,
 };
-const unsigned short utf8_to_euc_E891[] = {
+static const unsigned short utf8_to_euc_E891[] = {
       0,      0,      0,      0,      0, 0xD84F, 0x685E, 0xD850,
  0xD851, 0x4D55, 0xD852,      0,      0, 0xD853, 0x4E2A, 0xD854,
       0, 0xD855, 0xD856,      0,      0,      0, 0xD857, 0x4378,
@@ -4987,7 +5169,7 @@ const unsigned short utf8_to_euc_E891[] = {
  0xD861, 0x472C,      0, 0xD862, 0xD863, 0x302A, 0xD864, 0x6858,
  0xD865, 0x6861, 0x4978,      0, 0xD866, 0xD867,      0,      0,
 };
-const unsigned short utf8_to_euc_E892[] = {
+static const unsigned short utf8_to_euc_E892[] = {
       0, 0xD868, 0x685C,      0, 0x6857, 0xD869,      0,      0,
       0,      0,      0, 0x3E55,      0,      0,      0,      0,
  0x3D2F,      0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C,      0,      0,
@@ -4997,7 +5179,7 @@ const unsigned short utf8_to_euc_E892[] = {
       0, 0xD873, 0x3377,      0, 0xD874,      0,      0,      0,
  0x3E78, 0x6865, 0xD875, 0x686A, 0x4173, 0xD876, 0xD877, 0x6866,
 };
-const unsigned short utf8_to_euc_E893[] = {
+static const unsigned short utf8_to_euc_E893[] = {
  0xD878, 0x686D, 0xD879,      0, 0x435F,      0, 0x686E, 0xD87A,
  0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869,      0, 0xD87D,
  0x686C, 0x4C2C,      0, 0xD87E,      0,      0, 0x686F,      0,
@@ -5007,7 +5189,7 @@ const unsigned short utf8_to_euc_E893[] = {
  0xD925, 0xD926, 0xD927,      0, 0x6873,      0,      0, 0xD928,
       0,      0, 0xD92A, 0xD92B, 0x687A, 0xD92C,      0, 0x6872,
 };
-const unsigned short utf8_to_euc_E894[] = {
+static const unsigned short utf8_to_euc_E894[] = {
  0x3C43,      0, 0xD92D, 0xD92E,      0,      0, 0x6851, 0xD92F,
       0,      0,      0,      0, 0xD930,      0, 0xD931,      0,
  0xD932, 0x4A4E,      0, 0x4C22, 0x6879, 0x6878,      0, 0x6874,
@@ -5017,7 +5199,7 @@ const unsigned short utf8_to_euc_E894[] = {
       0,      0, 0xD929, 0xD93D, 0xD93E, 0x4222, 0xD93F,      0,
       0,      0,      0,      0,      0, 0x4A43,      0, 0xD940,
 };
-const unsigned short utf8_to_euc_E895[] = {
+static const unsigned short utf8_to_euc_E895[] = {
  0x687B, 0x6921,      0, 0x4859,      0,      0, 0xD941,      0,
  0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E, 0xD942,
  0xD943, 0xD944, 0xD945, 0xD946,      0, 0x6924, 0xD947, 0x4979,
@@ -5027,7 +5209,7 @@ const unsigned short utf8_to_euc_E895[] = {
       0,      0,      0,      0,      0,      0,      0, 0x6931,
       0, 0xD953, 0xD954, 0xD955,      0, 0xD956, 0x6932, 0xD957,
 };
-const unsigned short utf8_to_euc_E896[] = {
+static const unsigned short utf8_to_euc_E896[] = {
  0x6925, 0xD958,      0,      0, 0x4776, 0xD959, 0xD95A, 0x692F,
  0x6927, 0xD95B, 0x6929, 0xD95C, 0xD95D,      0,      0, 0xD95E,
  0x6933, 0x6928,      0, 0xD95F, 0x692C,      0,      0, 0x3172,
@@ -5037,7 +5219,7 @@ const unsigned short utf8_to_euc_E896[] = {
  0xF461,      0,      0,      0, 0xD967,      0, 0xD968, 0xD969,
  0xD96A, 0x6937, 0x6935,      0, 0xD96B, 0xD96C, 0xD96D, 0xD96E,
 };
-const unsigned short utf8_to_euc_E897[] = {
+static const unsigned short utf8_to_euc_E897[] = {
       0, 0x4F4E, 0xD96F,      0,      0,      0,      0, 0xD970,
       0, 0x6934, 0xD971, 0xD972,      0, 0x4D75, 0xD973, 0x6936,
  0x6938,      0,      0,      0,      0, 0x6939,      0,      0,
@@ -5047,7 +5229,7 @@ const unsigned short utf8_to_euc_E897[] = {
       0,      0,      0, 0xD97C,      0,      0, 0xD97D, 0x3D73,
       0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0xDA21,
 };
-const unsigned short utf8_to_euc_E898[] = {
+static const unsigned short utf8_to_euc_E898[] = {
  0xDA22,      0, 0x6922,      0, 0xDA23, 0xDA24, 0x6943, 0x4149,
       0,      0, 0x693E, 0x6940,      0, 0xDA25, 0xDA26,      0,
  0xDA27, 0xDA28, 0xDA29, 0x693F,      0,      0, 0x5D31, 0x5D22,
@@ -5057,7 +5239,7 @@ const unsigned short utf8_to_euc_E898[] = {
  0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
  0xDA32,      0, 0xDA33,      0, 0xDA34, 0xDA35,      0, 0x6947,
 };
-const unsigned short utf8_to_euc_E899[] = {
+static const unsigned short utf8_to_euc_E899[] = {
  0xDA36, 0xB866, 0xDA37,      0,      0,      0, 0xDA38,      0,
       0,      0,      0,      0,      0, 0x6948, 0x3857,      0,
  0x3554,      0, 0xDA39, 0xDA3A, 0x694A, 0x515D, 0xDA3B, 0xDA3C,
@@ -5067,7 +5249,7 @@ const unsigned short utf8_to_euc_E899[] = {
       0, 0x694D,      0,      0,      0, 0xDA48, 0xDA49, 0xDA4A,
       0, 0x467A, 0xDA4B, 0x303A,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E89A[] = {
+static const unsigned short utf8_to_euc_E89A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0xDA6D,      0, 0x3263, 0x6952, 0x6953, 0xDA4C,      0,      0,
       0, 0xDA4D,      0, 0x694E,      0, 0x3B3D, 0xDA4E,      0,
@@ -5077,7 +5259,7 @@ const unsigned short utf8_to_euc_E89A[] = {
  0x6958, 0xDA57,      0, 0xDA58, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
  0xDA5C, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
 };
-const unsigned short utf8_to_euc_E89B[] = {
+static const unsigned short utf8_to_euc_E89B[] = {
  0xDA5F, 0xDA60,      0, 0xDA61, 0x6956, 0xDA62, 0x6957, 0x3C58,
       0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0,
       0, 0xDA63, 0xDA64,      0, 0x695C, 0xDA65,      0, 0xDA66,
@@ -5087,7 +5269,7 @@ const unsigned short utf8_to_euc_E89B[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0x427D, 0x696C, 0xDA6E, 0x6968, 0xDA6F, 0xDA70, 0x326B,      0,
 };
-const unsigned short utf8_to_euc_E89C[] = {
+static const unsigned short utf8_to_euc_E89C[] = {
  0x6966,      0, 0x4B2A, 0x6967, 0xDA71, 0xDA72, 0x6964, 0xDA73,
  0x6965, 0x696A, 0x696D, 0xDA74,      0, 0x696B, 0xDA75, 0xDA76,
  0xDA77, 0x6969, 0x6963, 0xDA78, 0xDA79,      0,      0,      0,
@@ -5097,7 +5279,7 @@ const unsigned short utf8_to_euc_E89C[] = {
       0, 0xDB24, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
       0, 0xDB26, 0xDB27, 0x6971, 0xDB28, 0xDB29, 0xDB2A, 0x696F,
 };
-const unsigned short utf8_to_euc_E89D[] = {
+static const unsigned short utf8_to_euc_E89D[] = {
  0xDB2B,      0,      0, 0xDB2C,      0, 0xDB2D,      0,      0,
       0, 0x4066,      0, 0x4F39, 0x6978, 0xDB2E, 0x6979,      0,
       0,      0,      0, 0x6A21,      0, 0x3F2A,      0, 0x697B,
@@ -5107,7 +5289,7 @@ const unsigned short utf8_to_euc_E89D[] = {
       0, 0xDB35, 0xDB36,      0, 0x697A,      0, 0x4433,      0,
  0x6977,      0,      0, 0xDB37,      0,      0,      0, 0x4768,
 };
-const unsigned short utf8_to_euc_E89E[] = {
+static const unsigned short utf8_to_euc_E89E[] = {
       0,      0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0xDB3C,
  0xDB3D, 0xDB3E,      0, 0xDB3F, 0xDB40, 0x4D3B,      0,      0,
  0xDB41,      0,      0, 0xDB42,      0, 0xDB43,      0, 0xDB44,
@@ -5117,7 +5299,7 @@ const unsigned short utf8_to_euc_E89E[] = {
       0, 0xDB4E,      0, 0x6A30,      0, 0xDB4F,      0,      0,
       0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xDB50, 0xDB51,
 };
-const unsigned short utf8_to_euc_E89F[] = {
+static const unsigned short utf8_to_euc_E89F[] = {
  0x6A2B, 0xDB52,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31,
  0xDB53, 0xDB54, 0xDB55, 0x6A29,      0,      0, 0xDB56,      0,
  0x6A2C,      0, 0x6A3D,      0,      0, 0xDB57, 0xDB58,      0,
@@ -5127,7 +5309,7 @@ const unsigned short utf8_to_euc_E89F[] = {
       0, 0xDB63, 0x6A35, 0xDB64,      0,      0, 0x6A3A, 0x6A3B,
  0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
 };
-const unsigned short utf8_to_euc_E8A0[] = {
+static const unsigned short utf8_to_euc_E8A0[] = {
       0, 0xDB68,      0, 0xDB69,      0, 0x6A24, 0xDB6A, 0xF464,
       0, 0xDB6B, 0xDB6C, 0xDB6D,      0, 0x6A38, 0x6A3C, 0x6A37,
  0xDB6E, 0x6A3E, 0xDB70, 0xDB71, 0xDB72, 0x6A40, 0x6A3F,      0,
@@ -5137,7 +5319,7 @@ const unsigned short utf8_to_euc_E8A0[] = {
  0xDB7C, 0x6A43, 0xDB7D,      0,      0, 0xDB7E, 0x6A44,      0,
       0, 0x6A45, 0xDC21, 0x6A47, 0xDC22,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E8A1[] = {
+static const unsigned short utf8_to_euc_E8A1[] = {
  0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30,      0,
  0xDC26, 0xDC27, 0xDC28, 0xDC29, 0x3954, 0x5E27, 0xDC2A,      0,
       0, 0xDC2B, 0x6A4A, 0x3D51,      0, 0xDC2C, 0xDC2D, 0x3339,
@@ -5147,7 +5329,7 @@ const unsigned short utf8_to_euc_E8A1[] = {
  0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
       0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
 };
-const unsigned short utf8_to_euc_E8A2[] = {
+static const unsigned short utf8_to_euc_E8A2[] = {
  0xDC38, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0,
  0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0,
       0,      0, 0x6A58,      0,      0,      0, 0x4235, 0x6A57,
@@ -5157,7 +5339,7 @@ const unsigned short utf8_to_euc_E8A2[] = {
  0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
       0,      0, 0xDC41,      0,      0, 0xDC42, 0xDC43, 0x6A5F,
 };
-const unsigned short utf8_to_euc_E8A3[] = {
+static const unsigned short utf8_to_euc_E8A3[] = {
  0xDC44, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0,
       0,      0, 0xDC45, 0xDC46, 0xDC47, 0xDC48, 0xDC49, 0x4E22,
       0, 0xDC4A, 0xDC4B, 0xDC4C, 0x6A63, 0x4D35,      0,      0,
@@ -5167,7 +5349,7 @@ const unsigned short utf8_to_euc_E8A3[] = {
  0xDC51, 0xDC52, 0x6A6C, 0x3E58, 0x6A6A, 0xDC53,      0, 0xDC54,
  0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
 };
-const unsigned short utf8_to_euc_E8A4[] = {
+static const unsigned short utf8_to_euc_E8A4[] = {
       0, 0xDC55, 0x6A68,      0, 0x6A6D,      0, 0xDC56, 0x4A23,
       0,      0, 0x6A6F,      0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
  0x336C,      0, 0x4B2B, 0x6A70,      0, 0xDC5A, 0xDC5B,      0,
@@ -5177,7 +5359,7 @@ const unsigned short utf8_to_euc_E8A4[] = {
  0xDC64, 0xDC65, 0xDC66,      0,      0, 0xDC67, 0x6A79,      0,
  0x6A7A, 0xDC68, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
 };
-const unsigned short utf8_to_euc_E8A5[] = {
+static const unsigned short utf8_to_euc_E8A5[] = {
  0xDC6B, 0x6A76, 0xDC6C, 0x6A71, 0x6A77, 0xDC6D, 0xDC6E,      0,
       0, 0xDC6F,      0,      0, 0x6A7B, 0x7037,      0, 0xDC70,
       0,      0, 0xDC71,      0,      0,      0, 0x3228, 0xDC72,
@@ -5187,7 +5369,7 @@ const unsigned short utf8_to_euc_E8A5[] = {
  0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
       0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
 };
-const unsigned short utf8_to_euc_E8A6[] = {
+static const unsigned short utf8_to_euc_E8A6[] = {
       0, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746,
  0x6B2A, 0xDD24, 0x6B2B, 0x382B,      0, 0xDD25,      0, 0x352C,
  0xDD26,      0,      0, 0x6B2C, 0xDD27, 0xDD28, 0x3B6B, 0x4741,
@@ -5197,7 +5379,7 @@ const unsigned short utf8_to_euc_E8A6[] = {
  0xDD2E,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xDD32,
       0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
 };
-const unsigned short utf8_to_euc_E8A7[] = {
+static const unsigned short utf8_to_euc_E8A7[] = {
  0x6B37,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0x3351,      0, 0xDD34, 0xDD35, 0xDD36, 0xDD37,
@@ -5207,7 +5389,7 @@ const unsigned short utf8_to_euc_E8A7[] = {
       0, 0xDD3D,      0, 0xDD3E, 0x6B3C,      0, 0xDD3F,      0,
  0x6B3D, 0xDD40,      0,      0,      0, 0xDD41,      0, 0xDD42,
 };
-const unsigned short utf8_to_euc_E8A8[] = {
+static const unsigned short utf8_to_euc_E8A8[] = {
  0x3840,      0, 0x447B, 0x6B3E, 0xDD43, 0xDD44,      0, 0xDD45,
  0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624, 0xDD46,
  0x6B40, 0xDD47, 0xDD48, 0x3731, 0xDD49, 0xDD4A, 0x6B3F, 0x4277,
@@ -5217,7 +5399,7 @@ const unsigned short utf8_to_euc_E8A8[] = {
       0, 0x3576,      0, 0x4C75, 0x414A, 0xDD53, 0x6B45, 0xDD54,
       0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xDD56,      0,
 };
-const unsigned short utf8_to_euc_E8A9[] = {
+static const unsigned short utf8_to_euc_E8A9[] = {
  0xDD57, 0x6B46,      0, 0xDD58,      0, 0xDD59, 0x6B49, 0xDD5A,
  0x6B4A, 0xDD5B,      0,      0,      0, 0xDD5C, 0xDD5D,      0,
  0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
@@ -5227,7 +5409,7 @@ const unsigned short utf8_to_euc_E8A9[] = {
  0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0xDD67, 0xDD68, 0xDD69,
       0, 0xDD6A, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
 };
-const unsigned short utf8_to_euc_E8AA[] = {
+static const unsigned short utf8_to_euc_E8AA[] = {
  0xDD6F,      0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
       0, 0x4D40,      0, 0xDD72, 0x3B6F, 0x4727,      0, 0xDD73,
  0xDD74, 0x6B54, 0xDD75, 0x4040,      0, 0x4342, 0xDD76, 0xDD77,
@@ -5237,7 +5419,7 @@ const unsigned short utf8_to_euc_E8AA[] = {
  0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xDE22,
       0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xDE24, 0x4434,
 };
-const unsigned short utf8_to_euc_E8AB[] = {
+static const unsigned short utf8_to_euc_E8AB[] = {
       0,      0, 0x6B5B, 0xDE25, 0x6B59,      0, 0xDE26, 0x434C,
  0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B,
       0, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xDE2E,
@@ -5247,7 +5429,7 @@ const unsigned short utf8_to_euc_E8AB[] = {
  0xDE32, 0x6B61,      0, 0x6B5E, 0xDE33, 0xDE34, 0xDE35, 0x6B65,
  0x3D74,      0, 0x3841,      0, 0xDE36,      0, 0x427A, 0xDE37,
 };
-const unsigned short utf8_to_euc_E8AC[] = {
+static const unsigned short utf8_to_euc_E8AC[] = {
  0x4B45, 0x315A, 0x3062,      0, 0x4625, 0xDE38, 0xDE39, 0x6B69,
       0,      0, 0xDE3F, 0xDE3A, 0x6B68,      0, 0x4666,      0,
  0x6B6D, 0xDE3B,      0,      0, 0x6B62,      0, 0x6B6C, 0x6B6E,
@@ -5257,7 +5439,7 @@ const unsigned short utf8_to_euc_E8AC[] = {
  0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
       0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
 };
-const unsigned short utf8_to_euc_E8AD[] = {
+static const unsigned short utf8_to_euc_E8AD[] = {
       0, 0x6B76, 0xDE44, 0xDE45, 0xDE46, 0xDE47, 0xDE48,      0,
  0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
       0,      0, 0xDE4A, 0xDE4B, 0xDE4C,      0, 0x6B7B,      0,
@@ -5267,7 +5449,7 @@ const unsigned short utf8_to_euc_E8AD[] = {
  0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xDE52, 0x386E,
  0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF466,
 };
-const unsigned short utf8_to_euc_E8AE[] = {
+static const unsigned short utf8_to_euc_E8AE[] = {
  0x6C26, 0xDE57,      0, 0x3B3E, 0xDE58, 0xDE59,      0,      0,
       0,      0, 0x5A4E, 0xDE5A, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
  0x3D32,      0, 0x6C29, 0x6C2A, 0xDE5D, 0xDE5E, 0x6C2B,      0,
@@ -5277,7 +5459,7 @@ const unsigned short utf8_to_euc_E8AE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E8B0[] = {
+static const unsigned short utf8_to_euc_E8B0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5287,7 +5469,7 @@ const unsigned short utf8_to_euc_E8B0[] = {
       0,      0,      0,      0,      0,      0,      0, 0x432B,
  0xDE62, 0xDE63, 0x6C2E,      0,      0, 0xDE64, 0xDE65, 0x6C30,
 };
-const unsigned short utf8_to_euc_E8B1[] = {
+static const unsigned short utf8_to_euc_E8B1[] = {
       0, 0x6C2F,      0,      0,      0, 0xDE66, 0x4626, 0xDE67,
  0x6C31, 0xDE68, 0x4B2D, 0xDE69, 0x6C32,      0, 0x6C33, 0xDE6A,
  0x6C34, 0xDE6B,      0, 0xDE6C, 0xDE6D, 0x6C35,      0, 0xDE6E,
@@ -5297,7 +5479,7 @@ const unsigned short utf8_to_euc_E8B1[] = {
       0,      0,      0, 0xDE79,      0, 0xDE7A, 0xDE7B,      0,
  0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
 };
-const unsigned short utf8_to_euc_E8B2[] = {
+static const unsigned short utf8_to_euc_E8B2[] = {
       0,      0, 0x6C3A,      0,      0, 0x6C3C, 0xDE7E, 0xDF21,
       0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F,      0,
  0xDF23,      0, 0xDF24, 0xDF25, 0x6C40,      0,      0,      0,
@@ -5307,7 +5489,7 @@ const unsigned short utf8_to_euc_E8B2[] = {
  0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
  0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
 };
-const unsigned short utf8_to_euc_E8B3[] = {
+static const unsigned short utf8_to_euc_E8B3[] = {
  0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
  0x6C4B, 0xDF2E, 0x4231, 0xDF2F,      0, 0x6C5C, 0x4128, 0xDF30,
       0, 0x4678,      0, 0x4950,      0, 0xDF32, 0xDF31,      0,
@@ -5317,7 +5499,7 @@ const unsigned short utf8_to_euc_E8B3[] = {
  0xDF39,      0, 0xDF3A,      0, 0xF467, 0xDF3B,      0, 0xDF3C,
  0xDF3D,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0xDF3E, 0xDF3F,
 };
-const unsigned short utf8_to_euc_E8B4[] = {
+static const unsigned short utf8_to_euc_E8B4[] = {
       0, 0xDF40,      0, 0xDF41, 0x6C53, 0x6C54,      0, 0x6C56,
  0x4223, 0xDF42, 0x6C55, 0x3466,      0, 0x6C58,      0, 0x6C57,
  0x6C59,      0, 0xDF43, 0x6C5B, 0x6C5D,      0, 0x6C5E, 0xDF44,
@@ -5327,7 +5509,7 @@ const unsigned short utf8_to_euc_E8B4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E8B5[] = {
+static const unsigned short utf8_to_euc_E8B5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5337,7 +5519,7 @@ const unsigned short utf8_to_euc_E8B5[] = {
  0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 0x352F,
       0,      0,      0,      0,      0,      0,      0, 0xDF4A,
 };
-const unsigned short utf8_to_euc_E8B6[] = {
+static const unsigned short utf8_to_euc_E8B6[] = {
       0, 0x6C63, 0xDF4B,      0, 0xDF4C, 0x4436,      0,      0,
  0xDF4D,      0, 0x315B,      0,      0, 0xDF4E,      0,      0,
  0xDF4F, 0xDF50,      0,      0,      0, 0xDF51,      0,      0,
@@ -5347,7 +5529,7 @@ const unsigned short utf8_to_euc_E8B6[] = {
       0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
       0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
 };
-const unsigned short utf8_to_euc_E8B7[] = {
+static const unsigned short utf8_to_euc_E8B7[] = {
  0xDF5E,      0, 0x6C65,      0,      0, 0xDF5F, 0xDF60, 0xDF61,
  0xDF62,      0, 0xDF63, 0x6C6D, 0x6C6B,      0, 0xDF64, 0x6C68,
       0, 0xDF65,      0,      0, 0xDF66, 0xDF67, 0x6C6A, 0xDF68,
@@ -5357,7 +5539,7 @@ const unsigned short utf8_to_euc_E8B7[] = {
  0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
       0,      0,      0,      0, 0x6C72, 0xDF73,      0, 0x6C75,
 };
-const unsigned short utf8_to_euc_E8B8[] = {
+static const unsigned short utf8_to_euc_E8B8[] = {
       0, 0xDF74,      0,      0, 0xDF75, 0xDF76, 0xDF77,      0,
  0x6C73, 0x6C74, 0x4D59, 0xDF78,      0,      0,      0, 0x4627,
  0x6C78, 0xDF79,      0,      0, 0xDF7A,      0, 0xDF7B,      0,
@@ -5367,7 +5549,7 @@ const unsigned short utf8_to_euc_E8B8[] = {
  0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xE026, 0xE027,
  0xE028, 0xE029,      0,      0,      0, 0xE02A,      0,      0,
 };
-const unsigned short utf8_to_euc_E8B9[] = {
+static const unsigned short utf8_to_euc_E8B9[] = {
  0xE02B, 0xE02C, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21,
  0x6D25, 0x6D22, 0x6C7E, 0xE02D, 0x6D23, 0xE02E, 0xE02F, 0xE030,
  0x6D24,      0,      0,      0, 0xE031, 0x6D2B,      0,      0,
@@ -5377,7 +5559,7 @@ const unsigned short utf8_to_euc_E8B9[] = {
  0xE03C, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
       0, 0xE03E, 0xE03F, 0xE040, 0x6D2E,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E8BA[] = {
+static const unsigned short utf8_to_euc_E8BA[] = {
       0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31,      0, 0x6D30,
       0, 0xE043, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0,
  0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046,      0,      0,
@@ -5387,7 +5569,7 @@ const unsigned short utf8_to_euc_E8BA[] = {
  0x6D3C, 0x6D3E,      0, 0xE050,      0, 0xE051,      0,      0,
       0,      0, 0xE052, 0xE053,      0,      0, 0x6D3F,      0,
 };
-const unsigned short utf8_to_euc_E8BB[] = {
+static const unsigned short utf8_to_euc_E8BB[] = {
  0xE054, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
  0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0, 0xE059,
       0, 0xE05A, 0x382E,      0, 0xE05B,      0,      0,      0,
@@ -5397,7 +5579,7 @@ const unsigned short utf8_to_euc_E8BB[] = {
  0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
  0x3C34, 0xE062, 0xE063, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
 };
-const unsigned short utf8_to_euc_E8BC[] = {
+static const unsigned short utf8_to_euc_E8BC[] = {
  0xE065,      0, 0xE066, 0x3353,      0, 0x6D4A,      0, 0xE067,
  0xE068, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0, 0xE069,
  0xE06A,      0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xE06C,
@@ -5407,7 +5589,7 @@ const unsigned short utf8_to_euc_E8BC[] = {
       0,      0,      0, 0x6D54, 0xE078, 0xE079, 0xE07A, 0xE07B,
  0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
 };
-const unsigned short utf8_to_euc_E8BD[] = {
+static const unsigned short utf8_to_euc_E8BD[] = {
  0xE07D, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
       0, 0x6D5B,      0,      0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
       0, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128,      0, 0x6D5E,
@@ -5417,7 +5599,7 @@ const unsigned short utf8_to_euc_E8BD[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E8BE[] = {
+static const unsigned short utf8_to_euc_E8BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5427,7 +5609,7 @@ const unsigned short utf8_to_euc_E8BE[] = {
  0x4324, 0x3F2B, 0x4740,      0,      0, 0xE133, 0xE134, 0x6D68,
  0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
 };
-const unsigned short utf8_to_euc_E8BF[] = {
+static const unsigned short utf8_to_euc_E8BF[] = {
  0xE137, 0xE138, 0x312A,      0, 0x4B78, 0x3F57, 0xE139,      0,
       0,      0, 0xE13A, 0xE13B,      0, 0xE13C, 0x375E,      0,
  0xE13D, 0x3661, 0xE13E, 0xE13F, 0x4A56, 0xE140,      0,      0,
@@ -5437,7 +5619,7 @@ const unsigned short utf8_to_euc_E8BF[] = {
  0x3D52, 0xE146,      0,      0, 0x6D6F, 0xE147, 0xE148, 0x4C42,
  0x6D7E, 0x6D71, 0x6D72, 0xE149,      0, 0x4449, 0xE14A,      0,
 };
-const unsigned short utf8_to_euc_E980[] = {
+static const unsigned short utf8_to_euc_E980[] = {
  0x4260, 0x4177, 0xE14B, 0x4628, 0xE14C, 0x6D70, 0x3555,      0,
  0xE14D,      0,      0, 0x6D79, 0xE14E, 0x6D76, 0x6E25, 0x4629,
  0x4360, 0x6D73,      0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
@@ -5447,7 +5629,7 @@ const unsigned short utf8_to_euc_E980[] = {
       0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xE159,
  0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
 };
-const unsigned short utf8_to_euc_E981[] = {
+static const unsigned short utf8_to_euc_E981[] = {
       0, 0x465B, 0x3F6B, 0xE15B, 0xE15C, 0x4359,      0, 0x3678,
       0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
  0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0,
@@ -5457,7 +5639,7 @@ const unsigned short utf8_to_euc_E981[] = {
  0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
  0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
 };
-const unsigned short utf8_to_euc_E982[] = {
+static const unsigned short utf8_to_euc_E982[] = {
  0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xE167,      0, 0x6D6E,
  0xE168, 0x6E35, 0x6E34, 0xE169, 0xE16A,      0, 0xE16B, 0x6E36,
  0xE16C, 0x4D38,      0,      0,      0, 0xE16D,      0, 0xE16E,
@@ -5467,7 +5649,7 @@ const unsigned short utf8_to_euc_E982[] = {
  0xE176, 0x6E39, 0xE177, 0xE178, 0xE179, 0x6E3A, 0xE17A,      0,
  0x4521,      0,      0,      0,      0, 0xE17B, 0xE17D,      0,
 };
-const unsigned short utf8_to_euc_E983[] = {
+static const unsigned short utf8_to_euc_E983[] = {
       0, 0x306A,      0, 0xE17E, 0xE221, 0xE222,      0, 0xE223,
  0xE224,      0, 0x3959,      0, 0xE17C,      0, 0x4F3A,      0,
       0,      0, 0xE22D,      0,      0, 0xE225,      0, 0xE226,
@@ -5477,7 +5659,7 @@ const unsigned short utf8_to_euc_E983[] = {
  0xE231,      0,      0,      0, 0xE232, 0x4D39, 0xE22E, 0x363F,
       0,      0,      0,      0,      0, 0x4554, 0xE233, 0xE234,
 };
-const unsigned short utf8_to_euc_E984[] = {
+static const unsigned short utf8_to_euc_E984[] = {
  0xE235,      0, 0x6E3F,      0, 0xE236, 0xE237, 0xE238,      0,
  0xE239,      0,      0,      0,      0, 0xE23A,      0,      0,
  0xE23B,      0, 0x6E40,      0, 0xE23C, 0xF46E, 0xE23D, 0xE23E,
@@ -5487,7 +5669,7 @@ const unsigned short utf8_to_euc_E984[] = {
  0x6E43, 0xE24B, 0x6E42,      0, 0xE24C,      0, 0xE24D, 0xE24E,
       0, 0xE24F, 0xE250,      0, 0xE251, 0xE252,      0,      0,
 };
-const unsigned short utf8_to_euc_E985[] = {
+static const unsigned short utf8_to_euc_E985[] = {
       0,      0,      0, 0xE253,      0,      0,      0, 0xE254,
  0xE255, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
       0,      0, 0x3C72, 0xE257, 0x3F6C,      0, 0x6E45, 0xE258,
@@ -5497,7 +5679,7 @@ const unsigned short utf8_to_euc_E985[] = {
       0,      0, 0x6E4B, 0x6E4A, 0xE260, 0x395A,      0, 0x3973,
  0x3B40, 0xE261, 0xE262, 0xE263,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E986[] = {
+static const unsigned short utf8_to_euc_E986[] = {
       0, 0xE264, 0x6E4E, 0xE265,      0, 0xE266, 0xE267, 0x3D66,
       0, 0x6E4D, 0xE268, 0x6E4C,      0, 0x4269, 0xE269,      0,
  0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D,      0, 0x4830,
@@ -5507,7 +5689,7 @@ const unsigned short utf8_to_euc_E986[] = {
  0xE276, 0xE277, 0xE278, 0xE279, 0x6E54, 0x6E53, 0xE27A,      0,
  0x3E7A,      0, 0x6E55, 0xE27B, 0xE27C, 0xE27D,      0, 0xE27E,
 };
-const unsigned short utf8_to_euc_E987[] = {
+static const unsigned short utf8_to_euc_E987[] = {
  0x6E56, 0x6E57, 0xE321, 0xE322,      0, 0xE323, 0x4850, 0x3A53,
  0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
  0x6E5A, 0x3662,      0, 0xE324, 0xE325,      0, 0x6E5B, 0xE326,
@@ -5517,7 +5699,7 @@ const unsigned short utf8_to_euc_E987[] = {
  0xE332, 0xE333,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
       0, 0xE335,      0, 0xE336, 0x6E5F, 0xE337,      0, 0x6E63,
 };
-const unsigned short utf8_to_euc_E988[] = {
+static const unsigned short utf8_to_euc_E988[] = {
  0xE338, 0xE339,      0,      0, 0xE33A, 0xE33B, 0xE33C, 0xE33D,
       0, 0xE33E, 0xE33F,      0, 0xE340, 0x465F, 0x3343,      0,
  0xE341, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xE344,      0,
@@ -5527,7 +5709,7 @@ const unsigned short utf8_to_euc_E988[] = {
  0xE34F,      0,      0, 0xE350, 0x4E6B, 0xE351, 0xE352, 0x385A,
  0xE353, 0xE354, 0xE355,      0, 0xE356,      0, 0xE357, 0x6E6F,
 };
-const unsigned short utf8_to_euc_E989[] = {
+static const unsigned short utf8_to_euc_E989[] = {
  0xE358,      0, 0xE359, 0xE35A, 0x4534, 0x6E6A, 0xE35B, 0xE35C,
  0x6E6D, 0x6E6B, 0xE35D, 0x6E70,      0, 0xE35E, 0xE35F, 0xE360,
  0x6E71, 0xE361,      0,      0,      0,      0,      0, 0x6E69,
@@ -5537,7 +5719,7 @@ const unsigned short utf8_to_euc_E989[] = {
  0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
  0xE372, 0xE373,      0, 0xE374, 0xE375, 0xE376, 0x4B48, 0xE377,
 };
-const unsigned short utf8_to_euc_E98A[] = {
+static const unsigned short utf8_to_euc_E98A[] = {
  0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0,
  0xE378, 0xE379, 0xE37A,      0,      0, 0xE37B, 0xE37C,      0,
       0, 0x412D, 0xE37D, 0x6E74,      0, 0x6E6E, 0x6E73, 0xE37E,
@@ -5547,7 +5729,7 @@ const unsigned short utf8_to_euc_E98A[] = {
       0,      0, 0xE42A,      0,      0,      0, 0xE42B, 0x6E79,
  0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xE431,
 };
-const unsigned short utf8_to_euc_E98B[] = {
+static const unsigned short utf8_to_euc_E98B[] = {
  0xE432, 0xE433, 0xE434, 0xE435,      0, 0xE436, 0xE437, 0xE438,
  0xE439,      0,      0, 0xE43A, 0xE43B, 0xE43C, 0xE43D, 0x6E77,
  0xE43E,      0, 0x4B2F, 0xE43F,      0, 0xE440,      0, 0xE441,
@@ -5557,7 +5739,7 @@ const unsigned short utf8_to_euc_E98B[] = {
  0xE44F,      0, 0x4946, 0x4372,      0,      0,      0,      0,
  0x3578, 0xE450, 0x6E7C, 0xE451, 0x395D,      0,      0, 0xE452,
 };
-const unsigned short utf8_to_euc_E98C[] = {
+static const unsigned short utf8_to_euc_E98C[] = {
  0xE453,      0, 0xE454,      0,      0,      0, 0x3B2C,      0,
  0xE455,      0,      0,      0,      0, 0xE456,      0, 0x6E7B,
  0x3F6D, 0xE457,      0,      0, 0xE458, 0xE459,      0,      0,
@@ -5567,7 +5749,7 @@ const unsigned short utf8_to_euc_E98C[] = {
       0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
       0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E98D[] = {
+static const unsigned short utf8_to_euc_E98D[] = {
       0,      0,      0,      0, 0x6E7D,      0,      0, 0xE468,
  0xE469, 0xE46A,      0, 0x4669,      0, 0x4555,      0,      0,
  0xE46B, 0xE46C, 0xE46D,      0, 0x4457, 0xE46E, 0x6F2C, 0xE46F,
@@ -5577,7 +5759,7 @@ const unsigned short utf8_to_euc_E98D[] = {
  0xE47A, 0xE47B,      0, 0xE47C, 0xE47D, 0x3830, 0xE47E,      0,
       0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
 };
-const unsigned short utf8_to_euc_E98E[] = {
+static const unsigned short utf8_to_euc_E98E[] = {
  0xE524, 0xE525, 0xE526,      0,      0,      0,      0,      0,
  0xE527,      0, 0xE528, 0xE529, 0x3379, 0xE52A,      0, 0xE52B,
       0,      0, 0xE52C,      0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
@@ -5587,7 +5769,7 @@ const unsigned short utf8_to_euc_E98E[] = {
  0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
       0, 0x6F31, 0xE53A,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E98F[] = {
+static const unsigned short utf8_to_euc_E98F[] = {
       0, 0xE53C,      0, 0x6F37, 0xE53D, 0xE53E, 0xE53F, 0xE540,
  0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545,      0,      0,
  0x6F39, 0x452D,      0, 0xE546,      0,      0, 0x6F32, 0x6F33,
@@ -5597,7 +5779,7 @@ const unsigned short utf8_to_euc_E98F[] = {
       0,      0,      0,      0,      0,      0,      0, 0xE54F,
  0xE550, 0xE54E, 0xE551, 0xE552,      0, 0xE553,      0,      0,
 };
-const unsigned short utf8_to_euc_E990[] = {
+static const unsigned short utf8_to_euc_E990[] = {
       0, 0xE554, 0xE555, 0x6F3F, 0xE556,      0,      0, 0x6F40,
  0xE557, 0xE558,      0,      0,      0, 0xE559, 0xE55A, 0xE55B,
  0x6F41,      0,      0, 0x6F3E, 0x6F3D, 0xE55C, 0xE55D, 0xE55E,
@@ -5607,7 +5789,7 @@ const unsigned short utf8_to_euc_E990[] = {
       0, 0xE562, 0xE563, 0xE564, 0xE565, 0x6F44, 0x6F42,      0,
  0x4278,      0, 0x6F46, 0xE566,      0, 0xE568,      0, 0xE567,
 };
-const unsigned short utf8_to_euc_E991[] = {
+static const unsigned short utf8_to_euc_E991[] = {
       0, 0x6F47,      0, 0xE569, 0x6F49, 0xE56A,      0,      0,
  0xE56B,      0, 0xE56C,      0, 0xE56D,      0,      0,      0,
       0, 0x3455, 0x6F48, 0x4C7A,      0, 0xE56E,      0,      0,
@@ -5617,7 +5799,7 @@ const unsigned short utf8_to_euc_E991[] = {
  0x6F50, 0xE579, 0xE57A,      0,      0, 0x6F51,      0, 0x6F52,
       0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
 };
-const unsigned short utf8_to_euc_E992[] = {
+static const unsigned short utf8_to_euc_E992[] = {
       0, 0x6F57,      0, 0xE57C, 0xE57B,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5627,7 +5809,7 @@ const unsigned short utf8_to_euc_E992[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E995[] = {
+static const unsigned short utf8_to_euc_E995[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5637,7 +5819,7 @@ const unsigned short utf8_to_euc_E995[] = {
       0,      0,      0,      0,      0,      0,      0, 0x4439,
  0xE57D, 0xE57E,      0,      0,      0,      0, 0xE621,      0,
 };
-const unsigned short utf8_to_euc_E996[] = {
+static const unsigned short utf8_to_euc_E996[] = {
  0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0,      0, 0x6F5A,
  0xE623, 0x4A44, 0x6F5B, 0x332B, 0xE624, 0xE625, 0xE626, 0x313C,
       0, 0x3457, 0xF471, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
@@ -5647,7 +5829,7 @@ const unsigned short utf8_to_euc_E996[] = {
       0,      0, 0x315C,      0, 0xE62F,      0, 0xE630,      0,
       0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0xE632, 0x6F67, 0xE633,
 };
-const unsigned short utf8_to_euc_E997[] = {
+static const unsigned short utf8_to_euc_E997[] = {
       0,      0,      0, 0x6F6A,      0,      0, 0xE634, 0x3047,
  0xE635, 0xE636, 0x6F68, 0xE637, 0x6F6C, 0x6F6B,      0,      0,
  0xE638, 0xE639, 0xE63A, 0xE63B, 0x6F6E, 0x6F6D, 0x6F6F,      0,
@@ -5657,7 +5839,7 @@ const unsigned short utf8_to_euc_E997[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E998[] = {
+static const unsigned short utf8_to_euc_E998[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5667,7 +5849,7 @@ const unsigned short utf8_to_euc_E998[] = {
       0, 0xE64B, 0x4B49, 0xE64C,      0,      0,      0, 0xE64D,
  0xE64E, 0xE64F, 0xE650, 0x414B, 0xE651, 0xE652,      0, 0x3024,
 };
-const unsigned short utf8_to_euc_E999[] = {
+static const unsigned short utf8_to_euc_E999[] = {
  0x424B, 0xE653, 0x6F78,      0, 0x496D,      0,      0,      0,
       0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A,
  0x3842,      0, 0xE654,      0, 0xE655,      0, 0xE656, 0xE657,
@@ -5677,7 +5859,7 @@ const unsigned short utf8_to_euc_E999[] = {
  0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
  0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
 };
-const unsigned short utf8_to_euc_E99A[] = {
+static const unsigned short utf8_to_euc_E99A[] = {
       0, 0xE660, 0xE661, 0xE662, 0xE663, 0x3679, 0x4E34,      0,
  0x3728, 0xE664, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F,
       0, 0xE665,      0,      0, 0x3356, 0x7028, 0xE666, 0x7029,
@@ -5687,7 +5869,7 @@ const unsigned short utf8_to_euc_E99A[] = {
  0x702E, 0x702C, 0x702D, 0xE670, 0x702F,      0, 0x7030, 0x4E6C,
  0x7031, 0x7032, 0xE671, 0x4049, 0x483B,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E99B[] = {
+static const unsigned short utf8_to_euc_E99B[] = {
  0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
       0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033,      0,
       0, 0x3B28, 0xE673,      0,      0, 0x703A, 0x6A2D,      0,
@@ -5697,7 +5879,7 @@ const unsigned short utf8_to_euc_E99B[] = {
  0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
       0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E99C[] = {
+static const unsigned short utf8_to_euc_E99C[] = {
  0x3C7B,      0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
  0x703E, 0xE723, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042,
       0, 0x7041,      0, 0x703F,      0,      0, 0x7043,      0,
@@ -5707,7 +5889,7 @@ const unsigned short utf8_to_euc_E99C[] = {
  0x7047, 0xE72B, 0x4F2A, 0xE72C,      0,      0,      0,      0,
  0x5B31, 0x7048,      0, 0xF474,      0, 0x7049, 0x704A,      0,
 };
-const unsigned short utf8_to_euc_E99D[] = {
+static const unsigned short utf8_to_euc_E99D[] = {
       0, 0xE72D, 0x704E, 0xE72E, 0x704B,      0, 0x704C,      0,
  0x704D, 0x704F, 0xE72F,      0,      0, 0xF475, 0xE730, 0xE731,
       0, 0xF476, 0x4044,      0,      0, 0xE732, 0x4C77, 0xE733,
@@ -5717,7 +5899,7 @@ const unsigned short utf8_to_euc_E99D[] = {
       0, 0x7057,      0, 0xE73B, 0x3724,      0, 0xE73C, 0xE73D,
  0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
 };
-const unsigned short utf8_to_euc_E99E[] = {
+static const unsigned short utf8_to_euc_E99E[] = {
  0xE742, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0,
       0, 0xE743,      0, 0x705E,      0, 0x3048,      0, 0x705F,
  0x7060,      0,      0,      0,      0, 0xE744, 0xE745, 0xE746,
@@ -5727,7 +5909,7 @@ const unsigned short utf8_to_euc_E99E[] = {
       0, 0xE74E, 0xE74F, 0x7065, 0x7066, 0xE750, 0xE751,      0,
  0xE752, 0xE753, 0xE754,      0, 0xE755,      0, 0xE756, 0xE757,
 };
-const unsigned short utf8_to_euc_E99F[] = {
+static const unsigned short utf8_to_euc_E99F[] = {
       0, 0xE758,      0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
  0x7069, 0xE75C, 0xE75D, 0x706A, 0xE75E, 0xE75F, 0xE760,      0,
  0xE761, 0xE762,      0, 0x345A, 0xE763,      0,      0, 0xE764,
@@ -5737,7 +5919,7 @@ const unsigned short utf8_to_euc_E99F[] = {
       0, 0xE76E, 0x706E, 0x323B, 0xE76F, 0x7071, 0x7070, 0xE770,
  0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
 };
-const unsigned short utf8_to_euc_E9A0[] = {
+static const unsigned short utf8_to_euc_E9A0[] = {
       0, 0x4A47, 0x443A, 0x3A22,      0, 0x3960, 0x3D67, 0xE773,
  0x3F5C,      0, 0xE774,      0, 0x7073, 0xE776, 0xE777, 0x7072,
  0x4D42, 0x3468, 0x4852, 0x465C, 0xE778,      0, 0xE779, 0x3F7C,
@@ -5747,7 +5929,7 @@ const unsigned short utf8_to_euc_E9A0[] = {
  0xE824,      0, 0xE825, 0xE826, 0x3150, 0xE827,      0, 0x7077,
  0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
 };
-const unsigned short utf8_to_euc_E9A1[] = {
+static const unsigned short utf8_to_euc_E9A1[] = {
       0,      0,      0,      0, 0xE82A,      0, 0x7079, 0xE82B,
       0,      0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
       0, 0xE82D, 0xE82E, 0xE82F, 0x3469, 0x3832, 0xE830, 0xE831,
@@ -5757,7 +5939,7 @@ const unsigned short utf8_to_euc_E9A1[] = {
  0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E9A2[] = {
+static const unsigned short utf8_to_euc_E9A2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5767,7 +5949,7 @@ const unsigned short utf8_to_euc_E9A2[] = {
  0xE83D, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xE83F,
  0xE840,      0, 0xE841, 0xE842,      0,      0,      0, 0xE843,
 };
-const unsigned short utf8_to_euc_E9A3[] = {
+static const unsigned short utf8_to_euc_E9A3[] = {
       0,      0, 0xE844, 0x7129, 0x7128, 0xE845, 0x712A,      0,
  0xE846,      0,      0,      0, 0xE847,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5777,7 +5959,7 @@ const unsigned short utf8_to_euc_E9A3[] = {
       0,      0, 0x307B, 0xE84E, 0x303B,      0, 0xE84F,      0,
       0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
 };
-const unsigned short utf8_to_euc_E9A4[] = {
+static const unsigned short utf8_to_euc_E9A4[] = {
       0,      0, 0xE850, 0x712D,      0, 0x4C5F,      0, 0xE851,
  0xE852, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
  0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xE855, 0xE856,
@@ -5787,7 +5969,7 @@ const unsigned short utf8_to_euc_E9A4[] = {
       0, 0xE85F, 0xE860, 0xE861, 0xE862, 0xE863,      0,      0,
       0, 0xE864, 0xE865, 0xE866, 0xE867, 0x7139, 0x713A,      0,
 };
-const unsigned short utf8_to_euc_E9A5[] = {
+static const unsigned short utf8_to_euc_E9A5[] = {
  0xE868, 0xE869, 0x713B,      0,      0, 0x713D, 0xE86A, 0xE86B,
  0xE86C, 0x713C,      0, 0x713F, 0x7142, 0xE86D, 0xE86E,      0,
  0x713E, 0x7140, 0x7141,      0, 0xE86F, 0x7143,      0, 0x3642,
@@ -5797,7 +5979,7 @@ const unsigned short utf8_to_euc_E9A5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E9A6[] = {
+static const unsigned short utf8_to_euc_E9A6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0x3C73, 0x7144,
@@ -5807,7 +5989,7 @@ const unsigned short utf8_to_euc_E9A6[] = {
  0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
       0, 0xE921, 0xE922,      0, 0x7149, 0xE923,      0, 0xE924,
 };
-const unsigned short utf8_to_euc_E9A7[] = {
+static const unsigned short utf8_to_euc_E9A7[] = {
       0, 0x477D,      0, 0xE925, 0x424C, 0x3158, 0x366E,      0,
  0x366F, 0xE926,      0,      0,      0,      0,      0,      0,
  0x4373, 0x714E, 0x3670, 0xE927, 0xE928, 0x326F,      0,      0,
@@ -5817,7 +5999,7 @@ const unsigned short utf8_to_euc_E9A7[] = {
  0xE931, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
  0x7154, 0xE934,      0, 0x7153,      0, 0xE935, 0xE936, 0x3D59,
 };
-const unsigned short utf8_to_euc_E9A8[] = {
+static const unsigned short utf8_to_euc_E9A8[] = {
       0, 0x7155, 0xE937, 0xE938, 0xE939, 0x7157,      0,      0,
       0,      0,      0, 0xE93A, 0xE93B,      0, 0x3533, 0x7156,
  0xE93C, 0xE93D, 0x417B, 0x3833,      0,      0, 0xE93E,      0,
@@ -5827,7 +6009,7 @@ const unsigned short utf8_to_euc_E9A8[] = {
  0x462D,      0,      0, 0xE947,      0, 0xE948, 0xE949, 0x715B,
  0xE94A,      0,      0,      0,      0,      0, 0x7160,      0,
 };
-const unsigned short utf8_to_euc_E9A9[] = {
+static const unsigned short utf8_to_euc_E9A9[] = {
  0x715E, 0xE94C, 0x715D, 0x715F, 0xE94D, 0x715C,      0, 0xE94B,
       0,      0, 0xE94E, 0xE94F, 0xE950, 0x7162, 0xE951,      0,
       0, 0xE952,      0,      0, 0xE953, 0x7161, 0xE954, 0x7164,
@@ -5837,7 +6019,7 @@ const unsigned short utf8_to_euc_E9A9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E9AA[] = {
+static const unsigned short utf8_to_euc_E9AA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5847,7 +6029,7 @@ const unsigned short utf8_to_euc_E9AA[] = {
  0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0xE95D,      0,
  0x333C, 0xE95E,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
 };
-const unsigned short utf8_to_euc_E9AB[] = {
+static const unsigned short utf8_to_euc_E9AB[] = {
  0x716F, 0xE962,      0, 0xE963, 0x3F71,      0, 0xE964,      0,
  0xE965,      0,      0,      0,      0,      0, 0xE966, 0x7170,
  0xE967, 0x7171, 0xE968, 0x7172, 0x7173, 0xE969, 0xE96A, 0xE96B,
@@ -5857,7 +6039,7 @@ const unsigned short utf8_to_euc_E9AB[] = {
       0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
       0, 0xE977, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
 };
-const unsigned short utf8_to_euc_E9AC[] = {
+static const unsigned short utf8_to_euc_E9AC[] = {
  0xE97B, 0xE97C, 0xE97D, 0xE97E, 0xEA21, 0xEA22, 0x7222,      0,
  0xEA23, 0xEA24,      0, 0xEA25, 0xEA26, 0xEA27, 0xEA28,      0,
  0xEA29,      0, 0xEA2A,      0,      0,      0, 0xEA2B,      0,
@@ -5867,7 +6049,7 @@ const unsigned short utf8_to_euc_E9AC[] = {
       0, 0x5D35, 0x722F, 0xEA33, 0xEA34, 0xEA35,      0, 0xEA36,
       0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xEA39,      0,      0,
 };
-const unsigned short utf8_to_euc_E9AD[] = {
+static const unsigned short utf8_to_euc_E9AD[] = {
       0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0,
  0xEA3A,      0,      0, 0xEA3B, 0xEA3C, 0x7233, 0x7234, 0x7232,
       0, 0x7235,      0,      0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
@@ -5877,7 +6059,7 @@ const unsigned short utf8_to_euc_E9AD[] = {
       0,      0, 0xF47C, 0xEA4C, 0x7237, 0xEA4D,      0, 0xEA4E,
  0xEA4F, 0xEA50,      0,      0,      0,      0,      0, 0xEA51,
 };
-const unsigned short utf8_to_euc_E9AE[] = {
+static const unsigned short utf8_to_euc_E9AE[] = {
  0xEA52,      0,      0, 0x7239, 0xEA53, 0xEA54, 0xEA55, 0xEA56,
       0, 0xEA57, 0xEA58, 0xEA59,      0, 0xEA5A, 0x303E, 0xEA5B,
  0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D,      0, 0x723B, 0x723C,
@@ -5887,7 +6069,7 @@ const unsigned short utf8_to_euc_E9AE[] = {
  0xEA65, 0xEA66, 0xEA67,      0, 0x7240,      0,      0, 0xEA68,
  0xEA69, 0x7243,      0, 0xEA6A, 0xEA6B,      0, 0xEA6C, 0xEA6D,
 };
-const unsigned short utf8_to_euc_E9AF[] = {
+static const unsigned short utf8_to_euc_E9AF[] = {
  0x7241, 0xEA6E,      0,      0,      0,      0, 0x7244, 0xEA6F,
  0xEA70, 0x3871, 0x7242,      0,      0,      0, 0xEA71, 0x7245,
  0xEA72, 0x7246, 0x7247,      0, 0x724B,      0, 0x3B2A, 0xEA73,
@@ -5897,7 +6079,7 @@ const unsigned short utf8_to_euc_E9AF[] = {
  0x7250, 0x724F, 0x724E, 0xEA7C,      0, 0x3033,      0, 0xEA7D,
  0xEA7E, 0xEB21, 0xEB22,      0,      0, 0xEB23,      0, 0xEB24,
 };
-const unsigned short utf8_to_euc_E9B0[] = {
+static const unsigned short utf8_to_euc_E9B0[] = {
  0xEB25,      0, 0xEB26,      0, 0x725A,      0, 0x7256,      0,
  0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362,      0, 0xEB28,
  0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xEB2A,      0,
@@ -5907,7 +6089,7 @@ const unsigned short utf8_to_euc_E9B0[] = {
  0x7260, 0xEB37, 0x7262,      0,      0, 0xEB38, 0xEB39, 0xEB3A,
       0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
 };
-const unsigned short utf8_to_euc_E9B1[] = {
+static const unsigned short utf8_to_euc_E9B1[] = {
       0, 0xEB3C,      0, 0xEB3D, 0xEB3E, 0xEB3F, 0x7263, 0x7261,
  0x432D, 0xEB40, 0xEB41,      0,      0,      0, 0xEB42, 0xEB43,
  0xEB44,      0, 0x4B70, 0xEB45, 0xEB46,      0, 0xEB47, 0x4E5A,
@@ -5917,7 +6099,7 @@ const unsigned short utf8_to_euc_E9B1[] = {
  0xEB54,      0, 0xEB55,      0,      0, 0xEB56, 0x7268, 0xEB57,
  0x7269,      0,      0, 0xEB58,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E9B3[] = {
+static const unsigned short utf8_to_euc_E9B3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5927,7 +6109,7 @@ const unsigned short utf8_to_euc_E9B3[] = {
  0x726C,      0, 0xEB5A, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
       0, 0xEB5C,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E9B4[] = {
+static const unsigned short utf8_to_euc_E9B4[] = {
       0,      0, 0xEB5E, 0x7270,      0,      0, 0x7271, 0x463E,
  0x726E, 0x726D,      0, 0xEB5D,      0,      0, 0x322A,      0,
       0, 0xEB5F, 0x7279,      0,      0, 0x7278,      0, 0xEB60,
@@ -5937,7 +6119,7 @@ const unsigned short utf8_to_euc_E9B4[] = {
  0xEB66,      0, 0xEB67, 0xEB68, 0xEB69,      0,      0,      0,
       0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
 };
-const unsigned short utf8_to_euc_E9B5[] = {
+static const unsigned short utf8_to_euc_E9B5[] = {
       0, 0x727A, 0xEB6E, 0xEB6F, 0x7277, 0xEB6C, 0x727D, 0xEB70,
  0x727E,      0, 0xEB71,      0,      0,      0,      0,      0,
  0x7325, 0x7324,      0, 0xEB72, 0xEB73,      0,      0,      0,
@@ -5947,7 +6129,7 @@ const unsigned short utf8_to_euc_E9B5[] = {
  0xEB7B,      0, 0x7327,      0,      0,      0, 0xEB7C, 0xEB7D,
       0,      0, 0x732C, 0xEB7E, 0xEC21,      0, 0xEC22,      0,
 };
-const unsigned short utf8_to_euc_E9B6[] = {
+static const unsigned short utf8_to_euc_E9B6[] = {
       0,      0,      0, 0xEC23, 0xEC24,      0, 0xEC25, 0x7329,
       0, 0x7328, 0xEC26,      0,      0, 0xEC27, 0xEC28, 0x375C,
       0,      0, 0xEC29, 0xEC2A,      0, 0xEC2B, 0xEC2C, 0xEC2D,
@@ -5957,7 +6139,7 @@ const unsigned short utf8_to_euc_E9B6[] = {
       0, 0xEC33, 0x7330,      0, 0x4461, 0xEC34,      0,      0,
  0x7334, 0xEC35, 0x7335, 0x7333, 0xEC36,      0,      0, 0xEC37,
 };
-const unsigned short utf8_to_euc_E9B7[] = {
+static const unsigned short utf8_to_euc_E9B7[] = {
       0, 0x7332, 0x7338, 0xEC38, 0x7331,      0, 0x7336, 0xEC39,
       0, 0xEC3A, 0xEC3B,      0,      0,      0,      0, 0x7337,
       0,      0,      0, 0x733A, 0xEC3C, 0xEC3D, 0xEC3E, 0xEC3F,
@@ -5967,7 +6149,7 @@ const unsigned short utf8_to_euc_E9B7[] = {
  0xEC49,      0, 0x4F49, 0xEC4A, 0xEC4B,      0,      0,      0,
  0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
 };
-const unsigned short utf8_to_euc_E9B8[] = {
+static const unsigned short utf8_to_euc_E9B8[] = {
       0,      0, 0xEC4E,      0,      0,      0,      0, 0xEC4F,
       0,      0, 0xEC4D,      0,      0,      0, 0xEC50,      0,
  0xEC51, 0xEC52, 0xEC53,      0,      0, 0xEC54, 0xEC55,      0,
@@ -5977,7 +6159,7 @@ const unsigned short utf8_to_euc_E9B8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_E9B9[] = {
+static const unsigned short utf8_to_euc_E9B9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5987,7 +6169,7 @@ const unsigned short utf8_to_euc_E9B9[] = {
       0,      0,      0,      0,      0, 0x7343,      0,      0,
  0x3834, 0x7344, 0xEC59, 0xEC5A, 0xEC5B, 0x7345,      0, 0x3C2F,
 };
-const unsigned short utf8_to_euc_E9BA[] = {
+static const unsigned short utf8_to_euc_E9BA[] = {
  0xEC5C, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xEC60,      0, 0xEC61,
  0x7347,      0,      0, 0x7348, 0x7349,      0, 0xEC62, 0xEC63,
       0, 0x734C, 0x734A, 0x4F3C,      0, 0x734B, 0xEC64, 0x4E6F,
@@ -5997,7 +6179,7 @@ const unsigned short utf8_to_euc_E9BA[] = {
  0xEC6D,      0,      0, 0xEC6E, 0xEC6F, 0xEC70,      0,      0,
  0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677,      0, 0x5D60, 0x4B7B,
 };
-const unsigned short utf8_to_euc_E9BB[] = {
+static const unsigned short utf8_to_euc_E9BB[] = {
       0,      0,      0,      0, 0x322B,      0, 0xEC71,      0,
  0xEC72,      0,      0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
  0x7357, 0xF47E, 0x3975,      0, 0x7358, 0xEC74,      0,      0,
@@ -6007,7 +6189,7 @@ const unsigned short utf8_to_euc_E9BB[] = {
  0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
  0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xED22,
 };
-const unsigned short utf8_to_euc_E9BC[] = {
+static const unsigned short utf8_to_euc_E9BC[] = {
       0,      0, 0xED23, 0xED24,      0,      0,      0, 0x7367,
  0x7368, 0xED25,      0,      0,      0,      0, 0x4524, 0xED26,
  0xED27, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xED2C,
@@ -6017,7 +6199,7 @@ const unsigned short utf8_to_euc_E9BC[] = {
       0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xED39,
       0, 0xED3A, 0xED3B, 0x4921, 0xED3C, 0xED3D, 0x736D, 0xED3E,
 };
-const unsigned short utf8_to_euc_E9BD[] = {
+static const unsigned short utf8_to_euc_E9BD[] = {
       0, 0xED3F,      0, 0xED40, 0xED41, 0xED42, 0xED43, 0xED44,
       0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D,
       0,      0, 0x736F, 0xED45, 0x7370, 0xED46, 0xED47, 0xED48,
@@ -6027,7 +6209,7 @@ const unsigned short utf8_to_euc_E9BD[] = {
  0xED52, 0xED53, 0x737A, 0xED54,      0, 0xED55, 0x737B, 0x7379,
       0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
 };
-const unsigned short utf8_to_euc_E9BE[] = {
+static const unsigned short utf8_to_euc_E9BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0x4E36,      0, 0xED58,
  0xED59, 0xED5A, 0xED5B,      0, 0xED5C, 0x737C, 0xED5D, 0xED5E,
@@ -6037,7 +6219,7 @@ const unsigned short utf8_to_euc_E9BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_EFA4[] = {
+static const unsigned short utf8_to_euc_EFA4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6047,7 +6229,7 @@ const unsigned short utf8_to_euc_EFA4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_EFA7[] = {
+static const unsigned short utf8_to_euc_EFA7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6057,7 +6239,7 @@ const unsigned short utf8_to_euc_EFA7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_EFA8[] = {
+static const unsigned short utf8_to_euc_EFA8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xF434, 0xF437,
  0xF438, 0xF43D, 0xF444, 0xF447, 0xF448, 0xF44E, 0xF44F, 0xF453,
@@ -6067,7 +6249,7 @@ const unsigned short utf8_to_euc_EFA8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_EFBC[] = {
+static const unsigned short utf8_to_euc_EFBC[] = {
       0, 0x212A, 0xF42A, 0x2174, 0x2170, 0x2173, 0x2175, 0xF429,
  0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x215D, 0x2125, 0x213F,
  0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
@@ -6077,7 +6259,7 @@ const unsigned short utf8_to_euc_EFBC[] = {
  0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
  0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
 };
-const unsigned short utf8_to_euc_EFBD[] = {
+static const unsigned short utf8_to_euc_EFBD[] = {
  0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
  0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
  0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
@@ -6087,7 +6269,7 @@ const unsigned short utf8_to_euc_EFBD[] = {
  0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
  0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
 };
-const unsigned short utf8_to_euc_EFBD_ms[] = {
+static const unsigned short utf8_to_euc_EFBD_ms[] = {
  0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
  0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
  0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
@@ -6097,7 +6279,7 @@ const unsigned short utf8_to_euc_EFBD_ms[] = {
  0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
  0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
 };
-const unsigned short utf8_to_euc_EFBE[] = {
+static const unsigned short utf8_to_euc_EFBE[] = {
  0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
  0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
  0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
@@ -6107,7 +6289,7 @@ const unsigned short utf8_to_euc_EFBE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short utf8_to_euc_EFBF[] = {
+static const unsigned short utf8_to_euc_EFBF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6117,7 +6299,7 @@ const unsigned short utf8_to_euc_EFBF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short *const utf8_to_euc_E2[] = {
+static const unsigned short *const utf8_to_euc_E2[] = {
  utf8_to_euc_E280,                0,                0,                0,
  utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
  utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
@@ -6135,7 +6317,7 @@ const unsigned short *const utf8_to_euc_E2[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-const unsigned short *const utf8_to_euc_E2_ms[] = {
+static const unsigned short *const utf8_to_euc_E2_ms[] = {
  utf8_to_euc_E280_ms,                0,                0,                0,
  utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
  utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
@@ -6153,7 +6335,7 @@ const unsigned short *const utf8_to_euc_E2_ms[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-const unsigned short *const utf8_to_euc_E2_932[] = {
+static const unsigned short *const utf8_to_euc_E2_932[] = {
  utf8_to_euc_E280_932,                0,                0,                0,
  utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
  utf8_to_euc_E288_932, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
@@ -6171,7 +6353,25 @@ const unsigned short *const utf8_to_euc_E2_932[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-const unsigned short *const utf8_to_euc_E3[] = {
+static const unsigned short *const utf8_to_euc_E2_mac[] = {
+ utf8_to_euc_E280_932,                0,                0,                0,
+ utf8_to_euc_E284_mac, utf8_to_euc_E285_mac, utf8_to_euc_E286, utf8_to_euc_E287,
+ utf8_to_euc_E288_mac, utf8_to_euc_E289, utf8_to_euc_E28A_mac,                0,
+ utf8_to_euc_E28C,                0,                0,                0,
+                0, utf8_to_euc_E291_mac,                0,                0,
+ utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
+ utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
+static const unsigned short *const utf8_to_euc_E3[] = {
  utf8_to_euc_E380, utf8_to_euc_E381, utf8_to_euc_E382, utf8_to_euc_E383,
                 0,                0,                0,                0,
  utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
@@ -6189,7 +6389,7 @@ const unsigned short *const utf8_to_euc_E3[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-const unsigned short *const utf8_to_euc_E3_932[] = {
+static const unsigned short *const utf8_to_euc_E3_932[] = {
  utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
                 0,                0,                0,                0,
  utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
@@ -6207,7 +6407,25 @@ const unsigned short *const utf8_to_euc_E3_932[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-const unsigned short *const utf8_to_euc_E4[] = {
+static const unsigned short *const utf8_to_euc_E3_mac[] = {
+ utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
+                0,                0,                0,                0,
+ utf8_to_euc_E388_mac,                0, utf8_to_euc_E38A_mac,                0,
+ utf8_to_euc_E38C_mac, utf8_to_euc_E38D_mac, utf8_to_euc_E38E_mac, utf8_to_euc_E38F_mac,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
+static const unsigned short *const utf8_to_euc_E4[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6225,7 +6443,7 @@ const unsigned short *const utf8_to_euc_E4[] = {
  utf8_to_euc_E4B8, utf8_to_euc_E4B9, utf8_to_euc_E4BA, utf8_to_euc_E4BB,
  utf8_to_euc_E4BC, utf8_to_euc_E4BD, utf8_to_euc_E4BE, utf8_to_euc_E4BF,
 };
-const unsigned short *const utf8_to_euc_E5[] = {
+static const unsigned short *const utf8_to_euc_E5[] = {
  utf8_to_euc_E580, utf8_to_euc_E581, utf8_to_euc_E582, utf8_to_euc_E583,
  utf8_to_euc_E584, utf8_to_euc_E585, utf8_to_euc_E586, utf8_to_euc_E587,
  utf8_to_euc_E588, utf8_to_euc_E589, utf8_to_euc_E58A, utf8_to_euc_E58B,
@@ -6243,7 +6461,7 @@ const unsigned short *const utf8_to_euc_E5[] = {
  utf8_to_euc_E5B8, utf8_to_euc_E5B9, utf8_to_euc_E5BA, utf8_to_euc_E5BB,
  utf8_to_euc_E5BC, utf8_to_euc_E5BD, utf8_to_euc_E5BE, utf8_to_euc_E5BF,
 };
-const unsigned short *const utf8_to_euc_E6[] = {
+static const unsigned short *const utf8_to_euc_E6[] = {
  utf8_to_euc_E680, utf8_to_euc_E681, utf8_to_euc_E682, utf8_to_euc_E683,
  utf8_to_euc_E684, utf8_to_euc_E685, utf8_to_euc_E686, utf8_to_euc_E687,
  utf8_to_euc_E688, utf8_to_euc_E689, utf8_to_euc_E68A, utf8_to_euc_E68B,
@@ -6261,7 +6479,7 @@ const unsigned short *const utf8_to_euc_E6[] = {
  utf8_to_euc_E6B8, utf8_to_euc_E6B9, utf8_to_euc_E6BA, utf8_to_euc_E6BB,
  utf8_to_euc_E6BC, utf8_to_euc_E6BD, utf8_to_euc_E6BE, utf8_to_euc_E6BF,
 };
-const unsigned short *const utf8_to_euc_E7[] = {
+static const unsigned short *const utf8_to_euc_E7[] = {
  utf8_to_euc_E780, utf8_to_euc_E781, utf8_to_euc_E782, utf8_to_euc_E783,
  utf8_to_euc_E784, utf8_to_euc_E785, utf8_to_euc_E786, utf8_to_euc_E787,
  utf8_to_euc_E788, utf8_to_euc_E789, utf8_to_euc_E78A, utf8_to_euc_E78B,
@@ -6279,7 +6497,7 @@ const unsigned short *const utf8_to_euc_E7[] = {
  utf8_to_euc_E7B8, utf8_to_euc_E7B9, utf8_to_euc_E7BA,                0,
  utf8_to_euc_E7BC, utf8_to_euc_E7BD, utf8_to_euc_E7BE, utf8_to_euc_E7BF,
 };
-const unsigned short *const utf8_to_euc_E8[] = {
+static const unsigned short *const utf8_to_euc_E8[] = {
  utf8_to_euc_E880, utf8_to_euc_E881, utf8_to_euc_E882, utf8_to_euc_E883,
  utf8_to_euc_E884, utf8_to_euc_E885, utf8_to_euc_E886, utf8_to_euc_E887,
  utf8_to_euc_E888, utf8_to_euc_E889, utf8_to_euc_E88A, utf8_to_euc_E88B,
@@ -6297,7 +6515,7 @@ const unsigned short *const utf8_to_euc_E8[] = {
  utf8_to_euc_E8B8, utf8_to_euc_E8B9, utf8_to_euc_E8BA, utf8_to_euc_E8BB,
  utf8_to_euc_E8BC, utf8_to_euc_E8BD, utf8_to_euc_E8BE, utf8_to_euc_E8BF,
 };
-const unsigned short *const utf8_to_euc_E9[] = {
+static const unsigned short *const utf8_to_euc_E9[] = {
  utf8_to_euc_E980, utf8_to_euc_E981, utf8_to_euc_E982, utf8_to_euc_E983,
  utf8_to_euc_E984, utf8_to_euc_E985, utf8_to_euc_E986, utf8_to_euc_E987,
  utf8_to_euc_E988, utf8_to_euc_E989, utf8_to_euc_E98A, utf8_to_euc_E98B,
@@ -6315,7 +6533,7 @@ const unsigned short *const utf8_to_euc_E9[] = {
  utf8_to_euc_E9B8, utf8_to_euc_E9B9, utf8_to_euc_E9BA, utf8_to_euc_E9BB,
  utf8_to_euc_E9BC, utf8_to_euc_E9BD, utf8_to_euc_E9BE,                0,
 };
-const unsigned short *const utf8_to_euc_EF[] = {
+static const unsigned short *const utf8_to_euc_EF[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6333,7 +6551,7 @@ const unsigned short *const utf8_to_euc_EF[] = {
                 0,                0,                0,                0,
  utf8_to_euc_EFBC, utf8_to_euc_EFBD, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
 };
-const unsigned short *const utf8_to_euc_EF_ms[] = {
+static const unsigned short *const utf8_to_euc_EF_ms[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6441,6 +6659,36 @@ const unsigned short *const utf8_to_euc_2bytes_932[] = {
               0,              0,              0,              0,
               0,              0,              0,              0,
 };
+const unsigned short *const utf8_to_euc_2bytes_mac[] = {
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0, utf8_to_euc_C2_mac, utf8_to_euc_C3,
+ utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
+              0,              0,              0, utf8_to_euc_CB,
+              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
+ utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+};
 const unsigned short *const *const utf8_to_euc_3bytes[] = {
               0,              0, utf8_to_euc_E2, utf8_to_euc_E3,
  utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
@@ -6459,6 +6707,12 @@ const unsigned short *const *const utf8_to_euc_3bytes_932[] = {
  utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
               0,              0,              0, utf8_to_euc_EF_ms,
 };
+const unsigned short *const *const utf8_to_euc_3bytes_mac[] = {
+              0,              0, utf8_to_euc_E2_mac, utf8_to_euc_E3_mac,
+ utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
+ utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
+              0,              0,              0, utf8_to_euc_EF_ms,
+};
 
 #ifdef UNICODE_NORMALIZATION
 
@@ -7631,7 +7885,7 @@ const unsigned short shiftjis_x0212[3][189] = {
  },
 };
 
-const unsigned short x0212_shiftjis_A2[] = {
+static const unsigned short x0212_shiftjis_A2[] = {
          0x819F,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0, 0x8143,      0,      0, 0x8150,      0,      0, 0x8160,
@@ -7645,7 +7899,7 @@ const unsigned short x0212_shiftjis_A2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_B0[] = {
+static const unsigned short x0212_shiftjis_B0[] = {
               0,      0,      0,      0,      0,      0,      0,
       0, 0xFA68,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7659,7 +7913,7 @@ const unsigned short x0212_shiftjis_B0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_B1[] = {
+static const unsigned short x0212_shiftjis_B1[] = {
               0,      0, 0xFA70,      0,      0,      0, 0xFA6F,
       0, 0xFA72,      0,      0, 0xFA71,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7673,7 +7927,7 @@ const unsigned short x0212_shiftjis_B1[] = {
       0,      0,      0,      0, 0xFA79,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_B2[] = {
+static const unsigned short x0212_shiftjis_B2[] = {
               0,      0, 0xFA7B,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7687,7 +7941,7 @@ const unsigned short x0212_shiftjis_B2[] = {
       0,      0,      0,      0,      0, 0xFA81,      0,      0,
       0,      0,      0,      0, 0xFA82,      0,      0,
 };
-const unsigned short x0212_shiftjis_B3[] = {
+static const unsigned short x0212_shiftjis_B3[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0xFA84,      0,      0,
@@ -7701,7 +7955,7 @@ const unsigned short x0212_shiftjis_B3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xFA89,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_B4[] = {
+static const unsigned short x0212_shiftjis_B4[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7715,7 +7969,7 @@ const unsigned short x0212_shiftjis_B4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_B5[] = {
+static const unsigned short x0212_shiftjis_B5[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFA91,      0,      0,      0,      0, 0xFA93,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7729,7 +7983,7 @@ const unsigned short x0212_shiftjis_B5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_B7[] = {
+static const unsigned short x0212_shiftjis_B7[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7743,7 +7997,7 @@ const unsigned short x0212_shiftjis_B7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_B8[] = {
+static const unsigned short x0212_shiftjis_B8[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7757,7 +8011,7 @@ const unsigned short x0212_shiftjis_B8[] = {
       0,      0,      0,      0,      0, 0xFAA0,      0, 0xFAA1,
  0xFAA2,      0,      0,      0, 0xFAA3,      0,      0,
 };
-const unsigned short x0212_shiftjis_B9[] = {
+static const unsigned short x0212_shiftjis_B9[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0xFAA4,
       0,      0,      0,      0,      0,      0,      0, 0xFAA5,
@@ -7771,7 +8025,7 @@ const unsigned short x0212_shiftjis_B9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_BA[] = {
+static const unsigned short x0212_shiftjis_BA[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7785,7 +8039,7 @@ const unsigned short x0212_shiftjis_BA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_BB[] = {
+static const unsigned short x0212_shiftjis_BB[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xFAAC,      0,      0,      0,      0,
@@ -7799,7 +8053,7 @@ const unsigned short x0212_shiftjis_BB[] = {
       0,      0,      0,      0, 0xFAB4, 0xFAB5,      0,      0,
       0, 0xFAB6,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_BC[] = {
+static const unsigned short x0212_shiftjis_BC[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7813,7 +8067,7 @@ const unsigned short x0212_shiftjis_BC[] = {
       0,      0,      0,      0, 0xFA67,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xFAB9,
 };
-const unsigned short x0212_shiftjis_BD[] = {
+static const unsigned short x0212_shiftjis_BD[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7827,7 +8081,7 @@ const unsigned short x0212_shiftjis_BD[] = {
  0xFABE,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_BE[] = {
+static const unsigned short x0212_shiftjis_BE[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0xFAC0,      0,      0,      0,
  0xFABF,      0,      0, 0xFAC2,      0,      0,      0,      0,
@@ -7841,7 +8095,7 @@ const unsigned short x0212_shiftjis_BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_BF[] = {
+static const unsigned short x0212_shiftjis_BF[] = {
               0,      0,      0,      0,      0,      0,      0,
  0xFAC7,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7855,7 +8109,7 @@ const unsigned short x0212_shiftjis_BF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_C0[] = {
+static const unsigned short x0212_shiftjis_C0[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7869,7 +8123,7 @@ const unsigned short x0212_shiftjis_C0[] = {
       0,      0,      0,      0, 0xFACB,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_C1[] = {
+static const unsigned short x0212_shiftjis_C1[] = {
               0,      0,      0,      0,      0, 0xFACC,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7883,7 +8137,7 @@ const unsigned short x0212_shiftjis_C1[] = {
       0,      0,      0,      0,      0, 0xFACE,      0,      0,
  0xFAD1,      0,      0,      0, 0xFACF,      0,      0,
 };
-const unsigned short x0212_shiftjis_C2[] = {
+static const unsigned short x0212_shiftjis_C2[] = {
          0xFAD3,      0,      0,      0, 0xFAD4,      0,      0,
       0,      0,      0, 0xFAD2,      0, 0xFA63,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7897,7 +8151,7 @@ const unsigned short x0212_shiftjis_C2[] = {
  0xFADF,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_C3[] = {
+static const unsigned short x0212_shiftjis_C3[] = {
          0xFAE1,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0xFAE2,      0,      0,
@@ -7911,7 +8165,7 @@ const unsigned short x0212_shiftjis_C3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0xFA64,      0, 0xFAE7,
 };
-const unsigned short x0212_shiftjis_C4[] = {
+static const unsigned short x0212_shiftjis_C4[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7925,7 +8179,7 @@ const unsigned short x0212_shiftjis_C4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0xFAED,      0,
 };
-const unsigned short x0212_shiftjis_C5[] = {
+static const unsigned short x0212_shiftjis_C5[] = {
               0,      0,      0,      0,      0,      0, 0xFAEF,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0xFAF0, 0xFAF1,      0,
@@ -7939,7 +8193,7 @@ const unsigned short x0212_shiftjis_C5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_C6[] = {
+static const unsigned short x0212_shiftjis_C6[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7953,7 +8207,7 @@ const unsigned short x0212_shiftjis_C6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_C7[] = {
+static const unsigned short x0212_shiftjis_C7[] = {
          0xFAF9,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xFAFA,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7967,7 +8221,7 @@ const unsigned short x0212_shiftjis_C7[] = {
  0xFB49,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0xFB47,      0,      0,
 };
-const unsigned short x0212_shiftjis_C8[] = {
+static const unsigned short x0212_shiftjis_C8[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0, 0xFB4A,      0,      0,      0,      0,      0,      0,
@@ -7981,7 +8235,7 @@ const unsigned short x0212_shiftjis_C8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0xFB4C,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_C9[] = {
+static const unsigned short x0212_shiftjis_C9[] = {
               0,      0,      0,      0,      0, 0xFB4D,      0,
       0,      0,      0, 0xFB4E,      0, 0xFB4F,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -7995,7 +8249,7 @@ const unsigned short x0212_shiftjis_C9[] = {
       0,      0,      0,      0, 0xFB56, 0xFB57,      0,      0,
       0,      0,      0,      0, 0xFB55,      0,      0,
 };
-const unsigned short x0212_shiftjis_CA[] = {
+static const unsigned short x0212_shiftjis_CA[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xFB59,      0,      0,      0,      0,
@@ -8009,7 +8263,7 @@ const unsigned short x0212_shiftjis_CA[] = {
       0, 0xFB5C,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_CB[] = {
+static const unsigned short x0212_shiftjis_CB[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xFB5D,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8023,7 +8277,7 @@ const unsigned short x0212_shiftjis_CB[] = {
  0xFB62,      0,      0,      0, 0xFB63,      0,      0,      0,
       0, 0xFB66,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_CC[] = {
+static const unsigned short x0212_shiftjis_CC[] = {
               0,      0,      0,      0, 0xFB65,      0,      0,
       0,      0,      0, 0xFB67,      0, 0xFB69, 0xFB68,      0,
       0,      0, 0xFB6A,      0,      0,      0,      0,      0,
@@ -8037,7 +8291,7 @@ const unsigned short x0212_shiftjis_CC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_CD[] = {
+static const unsigned short x0212_shiftjis_CD[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFAA8,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8051,7 +8305,7 @@ const unsigned short x0212_shiftjis_CD[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_CE[] = {
+static const unsigned short x0212_shiftjis_CE[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8065,7 +8319,7 @@ const unsigned short x0212_shiftjis_CE[] = {
       0,      0, 0xFB76,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_CF[] = {
+static const unsigned short x0212_shiftjis_CF[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8079,7 +8333,7 @@ const unsigned short x0212_shiftjis_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D0[] = {
+static const unsigned short x0212_shiftjis_D0[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8093,7 +8347,7 @@ const unsigned short x0212_shiftjis_D0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D1[] = {
+static const unsigned short x0212_shiftjis_D1[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8107,7 +8361,7 @@ const unsigned short x0212_shiftjis_D1[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D2[] = {
+static const unsigned short x0212_shiftjis_D2[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8121,7 +8375,7 @@ const unsigned short x0212_shiftjis_D2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D3[] = {
+static const unsigned short x0212_shiftjis_D3[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8135,7 +8389,7 @@ const unsigned short x0212_shiftjis_D3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D4[] = {
+static const unsigned short x0212_shiftjis_D4[] = {
               0,      0,      0,      0,      0,      0, 0xFB8C,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8149,7 +8403,7 @@ const unsigned short x0212_shiftjis_D4[] = {
       0,      0, 0xFB90,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D5[] = {
+static const unsigned short x0212_shiftjis_D5[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xFB91,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8163,7 +8417,7 @@ const unsigned short x0212_shiftjis_D5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D7[] = {
+static const unsigned short x0212_shiftjis_D7[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8177,7 +8431,7 @@ const unsigned short x0212_shiftjis_D7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D8[] = {
+static const unsigned short x0212_shiftjis_D8[] = {
               0, 0xFB95,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0xFB96,
@@ -8191,7 +8445,7 @@ const unsigned short x0212_shiftjis_D8[] = {
       0,      0,      0,      0, 0xFB99,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_D9[] = {
+static const unsigned short x0212_shiftjis_D9[] = {
          0xFA60,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8205,7 +8459,7 @@ const unsigned short x0212_shiftjis_D9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_DC[] = {
+static const unsigned short x0212_shiftjis_DC[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8219,7 +8473,7 @@ const unsigned short x0212_shiftjis_DC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_DD[] = {
+static const unsigned short x0212_shiftjis_DD[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8233,7 +8487,7 @@ const unsigned short x0212_shiftjis_DD[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFBA6,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_DE[] = {
+static const unsigned short x0212_shiftjis_DE[] = {
               0,      0,      0, 0xFBA7,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
  0xFBA8,      0,      0,      0,      0, 0xFBAA,      0,      0,
@@ -8247,7 +8501,7 @@ const unsigned short x0212_shiftjis_DE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_DF[] = {
+static const unsigned short x0212_shiftjis_DF[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8261,7 +8515,7 @@ const unsigned short x0212_shiftjis_DF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E0[] = {
+static const unsigned short x0212_shiftjis_E0[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8275,7 +8529,7 @@ const unsigned short x0212_shiftjis_E0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E1[] = {
+static const unsigned short x0212_shiftjis_E1[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8289,7 +8543,7 @@ const unsigned short x0212_shiftjis_E1[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E2[] = {
+static const unsigned short x0212_shiftjis_E2[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8303,7 +8557,7 @@ const unsigned short x0212_shiftjis_E2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E3[] = {
+static const unsigned short x0212_shiftjis_E3[] = {
               0,      0,      0,      0,      0, 0xFBBB,      0,
  0xFBBA, 0xFBBC, 0xFBBF, 0xFBC0,      0,      0,      0, 0xFBBD,
  0xFBBE,      0,      0,      0,      0,      0,      0,      0,
@@ -8317,7 +8571,7 @@ const unsigned short x0212_shiftjis_E3[] = {
       0, 0xFBCD, 0xFBCE,      0,      0,      0,      0,      0,
  0xFA5F,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E4[] = {
+static const unsigned short x0212_shiftjis_E4[] = {
               0,      0,      0,      0,      0, 0xFBCC,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8331,7 +8585,7 @@ const unsigned short x0212_shiftjis_E4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFBDF,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E5[] = {
+static const unsigned short x0212_shiftjis_E5[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xFBE1,      0,      0,      0,      0,
@@ -8345,7 +8599,7 @@ const unsigned short x0212_shiftjis_E5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E6[] = {
+static const unsigned short x0212_shiftjis_E6[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8359,7 +8613,7 @@ const unsigned short x0212_shiftjis_E6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E7[] = {
+static const unsigned short x0212_shiftjis_E7[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0xFBED,      0, 0xFBEF,      0,
       0, 0xFBF1, 0xFBF3,      0,      0,      0,      0,      0,
@@ -8373,7 +8627,7 @@ const unsigned short x0212_shiftjis_E7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E8[] = {
+static const unsigned short x0212_shiftjis_E8[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0, 0xFBF4,      0,      0,      0,      0, 0xFBF5,      0,
@@ -8387,7 +8641,7 @@ const unsigned short x0212_shiftjis_E8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_E9[] = {
+static const unsigned short x0212_shiftjis_E9[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8401,7 +8655,7 @@ const unsigned short x0212_shiftjis_E9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_EA[] = {
+static const unsigned short x0212_shiftjis_EA[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8415,7 +8669,7 @@ const unsigned short x0212_shiftjis_EA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_EB[] = {
+static const unsigned short x0212_shiftjis_EB[] = {
               0,      0,      0,      0, 0xFC46,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8429,7 +8683,7 @@ const unsigned short x0212_shiftjis_EB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFC48, 0xFC47,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_EC[] = {
+static const unsigned short x0212_shiftjis_EC[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8443,7 +8697,7 @@ const unsigned short x0212_shiftjis_EC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-const unsigned short x0212_shiftjis_F3[] = {
+static const unsigned short x0212_shiftjis_F3[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -8457,7 +8711,7 @@ const unsigned short x0212_shiftjis_F3[] = {
       0,      0,      0, 0xFA40, 0xFA41, 0xFA42, 0xFA43, 0xFA44,
  0xFA45, 0xFA46, 0xFA47, 0xFA48, 0xFA49, 0xFA4A, 0xFA4B,
 };
-const unsigned short x0212_shiftjis_F4[] = {
+static const unsigned short x0212_shiftjis_F4[] = {
          0xFA4C, 0xFA4D, 0xFA4E, 0xFA4F, 0xFA50, 0xFA51, 0xFA52,
  0xFA53, 0xFA56, 0xFA57, 0xFA58, 0xFA59, 0xFA5A, 0xFA62, 0xFA6A,
  0xFA7C, 0xFA83, 0xFA8A, 0xFA8B, 0xFA90, 0xFA92, 0xFA96, 0xFA9B,
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
index 1f40f0b363..c3d7709ef7 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ b/ext/nkf/nkf-utf8/utf8tbl.h
@@ -1,28 +1,55 @@
+/*
+ * utf8tbl.h - Header file for Convertion Table
+ *
+ * $Id$
+ */
+
 #ifndef _UTF8TBL_H_
 #define _UTF8TBL_H_
 
 #ifdef UTF8_OUTPUT_ENABLE
+#define sizeof_euc_to_utf8_1byte 94
+#define sizeof_euc_to_utf8_2bytes 94
 extern const unsigned short euc_to_utf8_1byte[];
 extern const unsigned short *const euc_to_utf8_2bytes[];
 extern const unsigned short *const euc_to_utf8_2bytes_ms[];
+extern const unsigned short *const euc_to_utf8_2bytes_mac[];
 extern const unsigned short *const x0212_to_utf8_2bytes[];
 #endif /* UTF8_OUTPUT_ENABLE */
 
 #ifdef UTF8_INPUT_ENABLE
+#define sizeof_utf8_to_euc_C2 64
+#define sizeof_utf8_to_euc_E5B8 64
+#define sizeof_utf8_to_euc_2bytes 112
+#define sizeof_utf8_to_euc_3bytes 16
 extern const unsigned short *const utf8_to_euc_2bytes[];
 extern const unsigned short *const utf8_to_euc_2bytes_ms[];
 extern const unsigned short *const utf8_to_euc_2bytes_932[];
+extern const unsigned short *const utf8_to_euc_2bytes_mac[];
 extern const unsigned short *const *const utf8_to_euc_3bytes[];
 extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
 extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
+extern const unsigned short *const *const utf8_to_euc_3bytes_mac[];
 #endif /* UTF8_INPUT_ENABLE */
 
 #ifdef UNICODE_NORMALIZATION
+
+#define NORMALIZATION_TABLE_LENGTH 942
+#define NORMALIZATION_TABLE_NFC_LENGTH 3
+#define NORMALIZATION_TABLE_NFD_LENGTH 9
+struct normalization_pair {
+    const unsigned char nfc[NORMALIZATION_TABLE_NFC_LENGTH];
+    const unsigned char nfd[NORMALIZATION_TABLE_NFD_LENGTH];
+};
 extern const struct normalization_pair normalization_table[];
 #endif
 
 #ifdef SHIFTJIS_CP932
+#define CP932_TABLE_BEGIN 0xFA
+#define CP932_TABLE_END   0xFC
 extern const unsigned short shiftjis_cp932[3][189];
+#define CP932INV_TABLE_BEGIN 0xED
+#define CP932INV_TABLE_END   0xEE
 extern const unsigned short cp932inv[2][189];
 #endif /* SHIFTJIS_CP932 */
 
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 2bb0340a64..05fd36de64 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -10,24 +10,8 @@
 #define RUBY_NKF_REVISION "$Revision$"
 #define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
 
-#include "ruby.h"
-
-/* Encoding Constants */
-#define	_AUTO		0
-#define	_JIS		1
-#define	_EUC		2
-#define	_SJIS		3
-#define	_BINARY		4
-#define	_NOCONV		4
-#define	_ASCII		5
-/* 0b011x is reserved for UTF-8 Family */
-#define	_UTF8		6
-/* 0b10xx is reserved for UTF-16 Family */
-#define	_UTF16		8
-/* 0b11xx is reserved for UTF-32 Family */
-#define	_UTF32		12
-#define	_OTHER		16
-#define	_UNKNOWN	_AUTO
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
 
 /* Replace nkf's getchar/putchar for variable modification */
 /* we never use getc, ungetc */
@@ -56,14 +40,13 @@ static int incsize;
 static VALUE result;
 
 static int
-rb_nkf_putchar(c)
-  unsigned int c;
+rb_nkf_putchar(unsigned int c)
 {
   if (output_ctr >= o_len) {
     o_len += incsize;
     rb_str_resize(result, o_len);
     incsize *= 2;
-    output = (unsigned char *)RSTRING(result)->ptr;
+    output = (unsigned char *)RSTRING_PTR(result);
   }
   output[output_ctr++] = c;
 
@@ -78,11 +61,23 @@ rb_nkf_putchar(c)
 #include "nkf-utf8/utf8tbl.c"
 #include "nkf-utf8/nkf.c"
 
-int nkf_split_options(arg)
-    const char* arg;
+rb_encoding* rb_nkf_enc_get(const char *name)
+{
+    int idx = rb_enc_find_index(name);
+    if (idx < 0) {
+	nkf_encoding *nkf_enc = nkf_enc_find(name);
+	idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
+	if (idx < 0) {
+	    idx = rb_define_dummy_encoding(name);
+	}
+    }
+    return rb_enc_from_index(idx);
+}
+
+int nkf_split_options(const char *arg)
 {
     int count = 0;
-    char option[256];
+    unsigned char option[256];
     int i = 0, j = 0;
     int is_escaped = FALSE;
     int is_single_quoted = FALSE;
@@ -128,245 +123,92 @@ int nkf_split_options(arg)
 
 /*
  *  call-seq:
- *     NKF.nkf(opt, str)   -> string
+ *     NKF.nkf(opt, str)   => string
  *
  *  Convert _str_ and return converted result.
  *  Conversion details are specified by _opt_ as String.
  *
  *     require 'nkf'
  *     output = NKF.nkf("-s", input)
- *
- *  *Note*
- *  By default, nkf decodes MIME encoded string.
- *  If you want not to decode input, use NKF.nkf with <b>-m0</b> flag.
  */
 
 static VALUE
-rb_nkf_kconv(obj, opt, src)
-  VALUE obj, opt, src;
+rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
 {
-  char *opt_ptr, *opt_end;
-  volatile VALUE v;
-
-  reinit();
-  StringValue(opt);
-  opt_ptr = RSTRING(opt)->ptr;
-  opt_end = opt_ptr + RSTRING(opt)->len;
-  nkf_split_options(opt_ptr);
-
-  incsize = INCSIZE;
-
-  input_ctr = 0;
-  StringValue(src);
-  input = (unsigned char *)RSTRING(src)->ptr;
-  i_len = RSTRING(src)->len;
-  result = rb_str_new(0, i_len*3 + 10);
-  v = result;
-
-  output_ctr = 0;
-  output     = (unsigned char *)RSTRING(result)->ptr;
-  o_len      = RSTRING(result)->len;
-  *output    = '\0';
-
-  if(x0201_f == WISH_TRUE)
-    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
-
-  kanji_convert(NULL);
-  RSTRING(result)->ptr[output_ctr] = '\0';
-  RSTRING(result)->len = output_ctr;
-  OBJ_INFECT(result, src);
-
-  return result;
-}
+    volatile VALUE tmp;
+    reinit();
+    StringValue(opt);
+    nkf_split_options(RSTRING_PTR(opt));
+    if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
+
+    switch (nkf_enc_to_index(output_encoding)) {
+    case UTF_8_BOM:    output_encoding = nkf_enc_from_index(UTF_8); break;
+    case UTF_16BE_BOM: output_encoding = nkf_enc_from_index(UTF_16BE); break;
+    case UTF_16LE_BOM: output_encoding = nkf_enc_from_index(UTF_16LE); break;
+    case UTF_32BE_BOM: output_encoding = nkf_enc_from_index(UTF_32BE); break;
+    case UTF_32LE_BOM: output_encoding = nkf_enc_from_index(UTF_32LE); break;
+    }
+    output_bom_f = FALSE;
 
+    incsize = INCSIZE;
 
-/*
- *  call-seq:
- *     NKF.guess1(str)  -> integer
- *
- *  Returns guessed encoding of _str_ as integer.
- *
- *  Algorithm described in:
- *  Ken Lunde. `Understanding Japanese Information Processing'
- *  Sebastopol, CA: O'Reilly & Associates.
- *
- *      case NKF.guess1(input)
- *      when NKF::JIS
- *        "ISO-2022-JP"
- *      when NKF::SJIS
- *        "Shift_JIS"
- *      when NKF::EUC
- *        "EUC-JP"
- *      when NKF::UNKNOWN
- *        "UNKNOWN(ASCII)"
- *      when NKF::BINARY
- *        "BINARY"
- *      end
- */
+    input_ctr = 0;
+    StringValue(src);
+    input = (unsigned char *)RSTRING_PTR(src);
+    i_len = RSTRING_LENINT(src);
+    tmp = result = rb_str_new(0, i_len*3 + 10);
 
-static VALUE
-rb_nkf_guess1(obj, src)
-  VALUE obj, src;
-{
-  unsigned char *p;
-  unsigned char *pend;
-  int sequence_counter = 0;
-
-  StringValue(src);
-  p = (unsigned char *)RSTRING(src)->ptr;
-  pend = p + RSTRING(src)->len;
-  if (p == pend) return INT2FIX(_UNKNOWN);
-
-#define INCR do {\
-      p++;\
-      if (p==pend) return INT2FIX(_UNKNOWN);\
-      sequence_counter++;\
-      if (sequence_counter % 2 == 1 && *p != 0xa4)\
-	sequence_counter = 0;\
-      if (6 <= sequence_counter) {\
-	  sequence_counter = 0;\
-	  return INT2FIX(_EUC);\
-      }\
-  } while (0)
-
-  if (*p == 0xa4)
-    sequence_counter = 1;
-
-  while (p<pend) {
-    if (*p == '\033') {
-      return INT2FIX(_JIS);
-    }
-    if (*p < '\006' || *p == 0x7f || *p == 0xff) {
-      return INT2FIX(_BINARY);
-    }
-    if (0x81 <= *p && *p <= 0x8d) {
-      return INT2FIX(_SJIS);
-    }
-    if (0x8f <= *p && *p <= 0x9f) {
-      return INT2FIX(_SJIS);
-    }
-    if (*p == 0x8e) {	/* SS2 */
-      INCR;
-      if ((0x40 <= *p && *p <= 0x7e) ||
-	  (0x80 <= *p && *p <= 0xa0) ||
-	  (0xe0 <= *p && *p <= 0xfc))
-	return INT2FIX(_SJIS);
-    }
-    else if (0xa1 <= *p && *p <= 0xdf) {
-      INCR;
-      if (0xf0 <= *p && *p <= 0xfe)
-	return INT2FIX(_EUC);
-      if (0xe0 <= *p && *p <= 0xef) {
-	while (p < pend && *p >= 0x40) {
-	  if (*p >= 0x81) {
-	    if (*p <= 0x8d || (0x8f <= *p && *p <= 0x9f)) {
-	      return INT2FIX(_SJIS);
-	    }
-	    else if (0xfd <= *p && *p <= 0xfe) {
-	      return INT2FIX(_EUC);
-	    }
-	  }
-	  INCR;
-	}
-      }
-      else if (*p <= 0x9f) {
-	return INT2FIX(_SJIS);
-      }
-    }
-    else if (0xf0 <= *p && *p <= 0xfe) {
-      return INT2FIX(_EUC);
-    }
-    else if (0xe0 <= *p && *p <= 0xef) {
-      INCR;
-      if ((0x40 <= *p && *p <= 0x7e) ||
-	  (0x80 <= *p && *p <= 0xa0)) {
-	return INT2FIX(_SJIS);
-      }
-      if (0xfd <= *p && *p <= 0xfe) {
-	return INT2FIX(_EUC);
-      }
-    }
-    INCR;
-  }
-  return INT2FIX(_UNKNOWN);
+    output_ctr = 0;
+    output     = (unsigned char *)RSTRING_PTR(result);
+    o_len      = RSTRING_LENINT(result);
+    *output    = '\0';
+
+    kanji_convert(NULL);
+    rb_str_set_len(result, output_ctr);
+    OBJ_INFECT(result, src);
+
+    if (mimeout_f)
+	rb_enc_associate(result, rb_usascii_encoding());
+    else
+	rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+
+    return result;
 }
 
 
 /*
  *  call-seq:
- *     NKF.guess2(str)  -> integer
- *
- *  Returns guessed encoding of _str_ as integer by nkf routine.
- *
- *     case NKF.guess(input)
- *     when NKF::ASCII
- *       "ASCII"
- *     when NKF::JIS
- *       "ISO-2022-JP"
- *     when NKF::SJIS
- *       "Shift_JIS"
- *     when NKF::EUC
- *       "EUC-JP"
- *     when NKF::UTF8
- *       "UTF-8"
- *     when NKF::UTF16
- *       "UTF-16"
- *     when NKF::UNKNOWN
- *       "UNKNOWN"
- *     when NKF::BINARY
- *       "BINARY"
- *     end
+ *     NKF.guess(str)  => encoding
+ *
+ *  Returns guessed encoding of _str_ by nkf routine.
+ *
  */
 
 static VALUE
-rb_nkf_guess2(obj, src)
-  VALUE obj, src;
+rb_nkf_guess(VALUE obj, VALUE src)
 {
-  int code = _BINARY;
-
-  reinit();
-
-  input_ctr = 0;
-  StringValue(src);
-  input = (unsigned char *)RSTRING(src)->ptr;
-  i_len = RSTRING(src)->len;
-
-  if(x0201_f == WISH_TRUE)
-    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
-
-  guess_f = TRUE;
-  kanji_convert( NULL );
-  guess_f = FALSE;
-
-  if (!is_inputcode_mixed) {
-    if (strcmp(input_codename, "") == 0) {
-      code = _ASCII;
-    } else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
-      code = _JIS;
-    } else if (strcmp(input_codename, "EUC-JP") == 0) {
-      code = _EUC;
-    } else if (strcmp(input_codename, "Shift_JIS") == 0) {
-      code = _SJIS;
-    } else if (strcmp(input_codename, "UTF-8") == 0) {
-      code = _UTF8;
-    } else if (strcmp(input_codename, "UTF-16") == 0) {
-      code = _UTF16;
-    } else if (strlen(input_codename) > 0) {
-      code = _UNKNOWN;
-    }
-  }
+    reinit();
+
+    input_ctr = 0;
+    StringValue(src);
+    input = (unsigned char *)RSTRING_PTR(src);
+    i_len = RSTRING_LENINT(src);
 
-  return INT2FIX( code );
+    guess_f = TRUE;
+    kanji_convert( NULL );
+    guess_f = FALSE;
+
+    return rb_enc_from_encoding(rb_nkf_enc_get(get_guessed_code()));
 }
 
 
 /*
- *  NKF - Ruby extension for Network Kanji Filter 
+ *  NKF - Ruby extension for Network Kanji Filter
  *
  *  == Description
  *
- *  This is a Ruby Extension version of nkf (Netowrk Kanji Filter).
- *  It converts the first argument and return converted result. Conversion
+ *  This is a Ruby Extension version of nkf (Network Kanji Filter).
+ *  It converts the first argument and returns converted result. Conversion
  *  details are specified by flags as the first argument.
  *
  *  *Nkf* is a yet another kanji code converter among networks, hosts and terminals.
@@ -388,16 +230,16 @@ rb_nkf_guess2(obj, src)
  *
  *  Output is buffered (DEFAULT), Output is unbuffered.
  *
- *  === -j -s -e -w -w16
+ *  === -j -s -e -w -w16 -w32
  *
  *  Output code is ISO-2022-JP (7bit JIS), Shift_JIS, EUC-JP,
- *  UTF-8N, UTF-16BE.
+ *  UTF-8N, UTF-16BE, UTF-32BE.
  *  Without this option and compile option, ISO-2022-JP is assumed.
  *
- *  === -J -S -E -W -W16
+ *  === -J -S -E -W -W16 -W32
  *
  *  Input assumption is JIS 7 bit, Shift_JIS, EUC-JP,
- *  UTF-8, UTF-16LE.
+ *  UTF-8, UTF-16, UTF-32.
  *
  *  ==== -J
  *
@@ -499,7 +341,7 @@ rb_nkf_guess2(obj, src)
  *  To see ISO8859-1 (Latin-1) -l is necessary.
  *
  *  [-mB] Decode MIME base64 encoded stream. Remove header or other part before
- *  conversion. 
+ *  conversion.
  *
  *  [-mQ] Decode MIME quoted stream. '_' in quoted stream is converted to space.
  *
@@ -562,7 +404,7 @@ rb_nkf_guess2(obj, src)
  *
  *  [Shift_JIS] SJIS, MS-Kanji
  *
- *  [CP932] a.k.a. Windows-31J
+ *  [Windows-31J] a.k.a. CP932
  *
  *  [UTF-8] same as UTF-8N
  *
@@ -580,6 +422,16 @@ rb_nkf_guess2(obj, src)
  *
  *  [UTF-16LE-BOM] UTF-16 Little Endian with BOM
  *
+ *  [UTF-32] same as UTF-32BE
+ *
+ *  [UTF-32BE] UTF-32 Big Endian without BOM
+ *
+ *  [UTF-32BE-BOM] UTF-32 Big Endian with BOM
+ *
+ *  [UTF-32LE] UTF-32 Little Endian without BOM
+ *
+ *  [UTF-32LE-BOM] UTF-32 Little Endian with BOM
+ *
  *  [UTF8-MAC] NKDed UTF-8, a.k.a. UTF8-NFD (input only)
  *
  *  === --fb-{skip, html, xml, perl, java, subchar}
@@ -593,10 +445,20 @@ rb_nkf_guess2(obj, src)
  *  nkf adds a specified escape character to specified 2nd byte of Shift_JIS characters.
  *  1st byte of argument is the escape character and following bytes are target characters.
  *
- *  === --disable-cp932ext
+ *  === --no-cp932ext
  *
  *  Handle the characters extended in CP932 as unassigned characters.
  *
+ *  == --no-best-fit-chars
+ *
+ *  When Unicode to Encoded byte conversion,
+ *  don't convert characters which is not round trip safe.
+ *  When Unicode to Unicode conversion,
+ *  with this and -x option, nkf can be used as UTF converter.
+ *  (In other words, without this and -x option, nkf doesn't save some characters)
+ *
+ *  When nkf convert string which related to path, you should use this opion.
+ *
  *  === --cap-input
  *
  *  Decode hex encoded characters.
@@ -613,42 +475,28 @@ rb_nkf_guess2(obj, src)
 void
 Init_nkf()
 {
-    /* hoge */
-    VALUE mKconv = rb_define_module("NKF");
-    /* hoge */
-
-    rb_define_module_function(mKconv, "nkf", rb_nkf_kconv, 2);
-    rb_define_module_function(mKconv, "guess1", rb_nkf_guess1, 1);
-    rb_define_module_function(mKconv, "guess2", rb_nkf_guess2, 1);
-    rb_define_alias(mKconv, "guess", "guess2");
-    rb_define_alias(rb_singleton_class(mKconv), "guess", "guess2");
-
-    /* Auto-Detect */
-    rb_define_const(mKconv, "AUTO", INT2FIX(_AUTO));
-    /* ISO-2022-JP */
-    rb_define_const(mKconv, "JIS", INT2FIX(_JIS));
-    /* EUC-JP */
-    rb_define_const(mKconv, "EUC", INT2FIX(_EUC));
-    /* Shift_JIS */
-    rb_define_const(mKconv, "SJIS", INT2FIX(_SJIS));
-    /* BINARY */
-    rb_define_const(mKconv, "BINARY", INT2FIX(_BINARY));
-    /* No conversion */
-    rb_define_const(mKconv, "NOCONV", INT2FIX(_NOCONV));
-    /* ASCII */
-    rb_define_const(mKconv, "ASCII", INT2FIX(_ASCII));
-    /* UTF-8 */
-    rb_define_const(mKconv, "UTF8", INT2FIX(_UTF8));
-    /* UTF-16 */
-    rb_define_const(mKconv, "UTF16", INT2FIX(_UTF16));
-    /* UTF-32 */
-    rb_define_const(mKconv, "UTF32", INT2FIX(_UTF32));
-    /* UNKNOWN */
-    rb_define_const(mKconv, "UNKNOWN", INT2FIX(_UNKNOWN));
+    VALUE mNKF = rb_define_module("NKF");
+
+    rb_define_module_function(mNKF, "nkf", rb_nkf_convert, 2);
+    rb_define_module_function(mNKF, "guess", rb_nkf_guess, 1);
+    rb_define_alias(rb_singleton_class(mNKF), "guess", "guess");
+
+    rb_define_const(mNKF, "AUTO",	Qnil);
+    rb_define_const(mNKF, "NOCONV",	Qnil);
+    rb_define_const(mNKF, "UNKNOWN",	Qnil);
+    rb_define_const(mNKF, "BINARY",	rb_enc_from_encoding(rb_nkf_enc_get("BINARY")));
+    rb_define_const(mNKF, "ASCII",	rb_enc_from_encoding(rb_nkf_enc_get("US-ASCII")));
+    rb_define_const(mNKF, "JIS",	rb_enc_from_encoding(rb_nkf_enc_get("ISO-2022-JP")));
+    rb_define_const(mNKF, "EUC",	rb_enc_from_encoding(rb_nkf_enc_get("EUC-JP")));
+    rb_define_const(mNKF, "SJIS",	rb_enc_from_encoding(rb_nkf_enc_get("Shift_JIS")));
+    rb_define_const(mNKF, "UTF8",	rb_enc_from_encoding(rb_utf8_encoding()));
+    rb_define_const(mNKF, "UTF16",	rb_enc_from_encoding(rb_nkf_enc_get("UTF-16BE")));
+    rb_define_const(mNKF, "UTF32",	rb_enc_from_encoding(rb_nkf_enc_get("UTF-32BE")));
+
     /* Full version string of nkf */
-    rb_define_const(mKconv, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
+    rb_define_const(mNKF, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
     /* Version of nkf */
-    rb_define_const(mKconv, "NKF_VERSION", rb_str_new2(NKF_VERSION));
+    rb_define_const(mNKF, "NKF_VERSION", rb_str_new2(NKF_VERSION));
     /* Release date of nkf */
-    rb_define_const(mKconv, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
+    rb_define_const(mNKF, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
 }
diff --git a/ext/objspace/extconf.rb b/ext/objspace/extconf.rb
new file mode 100644
index 0000000000..a0cc3cecce
--- /dev/null
+++ b/ext/objspace/extconf.rb
@@ -0,0 +1,2 @@
+
+create_makefile('objspace')
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
new file mode 100644
index 0000000000..ebca2f8487
--- /dev/null
+++ b/ext/objspace/objspace.c
@@ -0,0 +1,554 @@
+/**********************************************************************
+
+  objspace.c - ObjectSpace extender for MRI.
+
+  $Author$
+  created at: Wed Jun 17 07:39:17 2009
+
+  NOTE: This extension library is not expected to exist except C Ruby.
+
+  All the files in this distribution are covered under the Ruby's
+  license (see the file COPYING).
+
+**********************************************************************/
+
+/* objspace library extends ObjectSpace module and add several
+ * methods to get internal statistic information about
+ * object/memory management.
+ *
+ * Generally, you *SHOULD NOT*use this library if you do not know
+ * about the MRI implementation.  Mainly, this library is for (memory)
+ * profiler developers and MRI developers who need to know how MRI
+ * memory usage.
+ *
+ */
+
+#include <ruby/ruby.h>
+#include <ruby/st.h>
+#include <ruby/io.h>
+#include <ruby/re.h>
+#include <../../node.h>
+
+size_t rb_str_memsize(VALUE);
+size_t rb_ary_memsize(VALUE);
+size_t rb_io_memsize(rb_io_t *);
+size_t onig_memsize(regex_t *);
+size_t rb_generic_ivar_memsize(VALUE);
+size_t rb_objspace_data_type_memsize(VALUE obj);
+
+void rb_objspace_each_objects(
+    int (*callback)(void *start, void *end, size_t stride, void *data),
+    void *data);
+
+static size_t
+memsize_of(VALUE obj)
+{
+    size_t size = 0;
+
+    if (SPECIAL_CONST_P(obj)) {
+	return 0;
+    }
+
+    if (FL_TEST(obj, FL_EXIVAR)) {
+	size += rb_generic_ivar_memsize(obj);
+    }
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_OBJECT:
+	if (!(RBASIC(obj)->flags & ROBJECT_EMBED) &&
+	    ROBJECT(obj)->as.heap.ivptr) {
+	    size += ROBJECT(obj)->as.heap.numiv * sizeof(VALUE);
+	}
+	break;
+      case T_MODULE:
+      case T_CLASS:
+	size += st_memsize(RCLASS_M_TBL(obj));
+	if (RCLASS_IV_TBL(obj)) {
+	    size += st_memsize(RCLASS_IV_TBL(obj));
+	}
+	if (RCLASS_IV_INDEX_TBL(obj)) {
+	    size += st_memsize(RCLASS_IV_INDEX_TBL(obj));
+	}
+	if (RCLASS(obj)->ptr->iv_tbl) {
+	    size += st_memsize(RCLASS(obj)->ptr->iv_tbl);
+	}
+	size += sizeof(rb_classext_t);
+	break;
+      case T_STRING:
+	size += rb_str_memsize(obj);
+	break;
+      case T_ARRAY:
+	size += rb_ary_memsize(obj);
+	break;
+      case T_HASH:
+	if (RHASH(obj)->ntbl) {
+	    size += st_memsize(RHASH(obj)->ntbl);
+	}
+	break;
+      case T_REGEXP:
+	if (RREGEXP(obj)->ptr) {
+	    size += onig_memsize(RREGEXP(obj)->ptr);
+	}
+	break;
+      case T_DATA:
+	size += rb_objspace_data_type_memsize(obj);
+	break;
+      case T_MATCH:
+	if (RMATCH(obj)->rmatch) {
+            struct rmatch *rm = RMATCH(obj)->rmatch;
+	    size += sizeof(struct re_registers); /* TODO: onig_region_memsize(&rm->regs); */
+	    size += sizeof(struct rmatch_offset) * rm->char_offset_num_allocated;
+	    size += sizeof(struct rmatch);
+	}
+	break;
+      case T_FILE:
+	if (RFILE(obj)->fptr) {
+	    size += rb_io_memsize(RFILE(obj)->fptr);
+	}
+	break;
+      case T_RATIONAL:
+      case T_COMPLEX:
+	break;
+      case T_ICLASS:
+	/* iClass shares table with the module */
+	break;
+
+      case T_FLOAT:
+	break;
+
+      case T_BIGNUM:
+	if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
+	    size += RBIGNUM_LEN(obj) * sizeof(BDIGIT);
+	}
+	break;
+      case T_NODE:
+	switch (nd_type(obj)) {
+	  case NODE_SCOPE:
+	    if (RNODE(obj)->u1.tbl) {
+		/* TODO: xfree(RANY(obj)->as.node.u1.tbl); */
+	    }
+	    break;
+	  case NODE_ALLOCA:
+	    /* TODO: xfree(RANY(obj)->as.node.u1.node); */
+	    ;
+	}
+	break;			/* no need to free iv_tbl */
+
+      case T_STRUCT:
+	if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
+	    RSTRUCT(obj)->as.heap.ptr) {
+	    size += sizeof(VALUE) * RSTRUCT_LEN(obj);
+	}
+	break;
+
+      case T_ZOMBIE:
+	break;
+
+      default:
+	rb_bug("objspace/memsize_of(): unknown data type 0x%x(%p)",
+	       BUILTIN_TYPE(obj), (void*)obj);
+    }
+
+    return size;
+}
+
+/*
+ *  call-seq:
+ *    ObjectSpace.memsize_of(obj) -> Integer
+ *
+ *  Return consuming memory size of obj.
+ *
+ *  Note that this information is incomplete.  You need to deal with
+ *  this information as only a *HINT*.  Especaially, the size of
+ *  T_DATA may not right size.
+ *
+ *  This method is not expected to work except C Ruby.
+ */
+
+static VALUE
+memsize_of_m(VALUE self, VALUE obj)
+{
+    return SIZET2NUM(memsize_of(obj));
+}
+
+static int
+set_zero_i(st_data_t key, st_data_t val, st_data_t arg)
+{
+    VALUE k = (VALUE)key;
+    VALUE hash = (VALUE)arg;
+    rb_hash_aset(hash, k, INT2FIX(0));
+    return ST_CONTINUE;
+}
+
+static int
+cos_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    size_t *counts = (size_t *)data;
+    VALUE v = (VALUE)vstart;
+
+    for (;v != (VALUE)vend; v += stride) {
+	if (RBASIC(v)->flags) {
+	    counts[BUILTIN_TYPE(v)] += memsize_of(v);
+	}
+    }
+    return 0;
+}
+
+/*
+ *  call-seq:
+ *    ObjectSpace.count_objects_size([result_hash]) -> hash
+ *
+ *  Counts objects size (in bytes) for each type.
+ *
+ *  Note that this information is incomplete.  You need to deal with
+ *  this information as only a *HINT*.  Especaially, total size of
+ *  T_DATA may not right size.
+ *
+ *  It returns a hash as:
+ *    {:TOTAL=>1461154, :T_CLASS=>158280, :T_MODULE=>20672, :T_STRING=>527249, ...}
+ *
+ *  If the optional argument, result_hash, is given,
+ *  it is overwritten and returned.
+ *  This is intended to avoid probe effect.
+ *
+ *  The contents of the returned hash is implementation defined.
+ *  It may be changed in future.
+ *
+ *  This method is not expected to work except C Ruby.
+ */
+
+static VALUE
+count_objects_size(int argc, VALUE *argv, VALUE os)
+{
+    size_t counts[T_MASK+1];
+    size_t total = 0;
+    size_t i;
+    VALUE hash;
+
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+        if (TYPE(hash) != T_HASH)
+            rb_raise(rb_eTypeError, "non-hash given");
+    }
+
+    for (i = 0; i <= T_MASK; i++) {
+	counts[i] = 0;
+    }
+
+    rb_objspace_each_objects(cos_i, &counts[0]);
+
+    if (hash == Qnil) {
+        hash = rb_hash_new();
+    }
+    else if (!RHASH_EMPTY_P(hash)) {
+        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
+    }
+
+    for (i = 0; i <= T_MASK; i++) {
+	if (counts[i]) {
+	    VALUE type;
+	    switch (i) {
+#define COUNT_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
+		COUNT_TYPE(T_NONE);
+		COUNT_TYPE(T_OBJECT);
+		COUNT_TYPE(T_CLASS);
+		COUNT_TYPE(T_MODULE);
+		COUNT_TYPE(T_FLOAT);
+		COUNT_TYPE(T_STRING);
+		COUNT_TYPE(T_REGEXP);
+		COUNT_TYPE(T_ARRAY);
+		COUNT_TYPE(T_HASH);
+		COUNT_TYPE(T_STRUCT);
+		COUNT_TYPE(T_BIGNUM);
+		COUNT_TYPE(T_FILE);
+		COUNT_TYPE(T_DATA);
+		COUNT_TYPE(T_MATCH);
+		COUNT_TYPE(T_COMPLEX);
+		COUNT_TYPE(T_RATIONAL);
+		COUNT_TYPE(T_NIL);
+		COUNT_TYPE(T_TRUE);
+		COUNT_TYPE(T_FALSE);
+		COUNT_TYPE(T_SYMBOL);
+		COUNT_TYPE(T_FIXNUM);
+		COUNT_TYPE(T_UNDEF);
+		COUNT_TYPE(T_NODE);
+		COUNT_TYPE(T_ICLASS);
+		COUNT_TYPE(T_ZOMBIE);
+#undef COUNT_TYPE
+	      default: type = INT2NUM(i); break;
+	    }
+	    total += counts[i];
+	    rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
+	}
+    }
+    rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
+    return hash;
+}
+
+static int
+cn_i(void *vstart, void *vend, size_t stride, void *n)
+{
+    size_t *nodes = (size_t *)n;
+    VALUE v = (VALUE)vstart;
+
+    for (; v != (VALUE)vend; v += stride) {
+	if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_NODE) {
+	    size_t s = nd_type((NODE *)v);
+	    nodes[s]++;
+	}
+    }
+
+    return 0;
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.count_nodes([result_hash]) -> hash
+ *
+ *  Counts nodes for each node type.
+ *
+ *  This method is not for ordinary Ruby programmers, but for MRI developers
+ *  who have interest in MRI performance and memory usage.
+ *
+ *  It returns a hash as:
+ *  {:NODE_METHOD=>2027, :NODE_FBODY=>1927, :NODE_CFUNC=>1798, ...}
+ *
+ *  If the optional argument, result_hash, is given,
+ *  it is overwritten and returned.
+ *  This is intended to avoid probe effect.
+ *
+ *  The contents of the returned hash is implementation defined.
+ *  It may be changed in future.
+ *
+ *  This method is not expected to work except C Ruby.
+ */
+
+static VALUE
+count_nodes(int argc, VALUE *argv, VALUE os)
+{
+    size_t nodes[NODE_LAST+1];
+    size_t i;
+    VALUE hash;
+
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+        if (TYPE(hash) != T_HASH)
+            rb_raise(rb_eTypeError, "non-hash given");
+    }
+
+    for (i = 0; i <= NODE_LAST; i++) {
+	nodes[i] = 0;
+    }
+
+    rb_objspace_each_objects(cn_i, &nodes[0]);
+
+    if (hash == Qnil) {
+        hash = rb_hash_new();
+    }
+    else if (!RHASH_EMPTY_P(hash)) {
+        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
+    }
+
+    for (i=0; i<NODE_LAST; i++) {
+	if (nodes[i] != 0) {
+	    VALUE node;
+	    switch (i) {
+#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); break;
+		COUNT_NODE(NODE_SCOPE);
+		COUNT_NODE(NODE_BLOCK);
+		COUNT_NODE(NODE_IF);
+		COUNT_NODE(NODE_CASE);
+		COUNT_NODE(NODE_WHEN);
+		COUNT_NODE(NODE_OPT_N);
+		COUNT_NODE(NODE_WHILE);
+		COUNT_NODE(NODE_UNTIL);
+		COUNT_NODE(NODE_ITER);
+		COUNT_NODE(NODE_FOR);
+		COUNT_NODE(NODE_BREAK);
+		COUNT_NODE(NODE_NEXT);
+		COUNT_NODE(NODE_REDO);
+		COUNT_NODE(NODE_RETRY);
+		COUNT_NODE(NODE_BEGIN);
+		COUNT_NODE(NODE_RESCUE);
+		COUNT_NODE(NODE_RESBODY);
+		COUNT_NODE(NODE_ENSURE);
+		COUNT_NODE(NODE_AND);
+		COUNT_NODE(NODE_OR);
+		COUNT_NODE(NODE_MASGN);
+		COUNT_NODE(NODE_LASGN);
+		COUNT_NODE(NODE_DASGN);
+		COUNT_NODE(NODE_DASGN_CURR);
+		COUNT_NODE(NODE_GASGN);
+		COUNT_NODE(NODE_IASGN);
+		COUNT_NODE(NODE_IASGN2);
+		COUNT_NODE(NODE_CDECL);
+		COUNT_NODE(NODE_CVASGN);
+		COUNT_NODE(NODE_CVDECL);
+		COUNT_NODE(NODE_OP_ASGN1);
+		COUNT_NODE(NODE_OP_ASGN2);
+		COUNT_NODE(NODE_OP_ASGN_AND);
+		COUNT_NODE(NODE_OP_ASGN_OR);
+		COUNT_NODE(NODE_CALL);
+		COUNT_NODE(NODE_FCALL);
+		COUNT_NODE(NODE_VCALL);
+		COUNT_NODE(NODE_SUPER);
+		COUNT_NODE(NODE_ZSUPER);
+		COUNT_NODE(NODE_ARRAY);
+		COUNT_NODE(NODE_ZARRAY);
+		COUNT_NODE(NODE_VALUES);
+		COUNT_NODE(NODE_HASH);
+		COUNT_NODE(NODE_RETURN);
+		COUNT_NODE(NODE_YIELD);
+		COUNT_NODE(NODE_LVAR);
+		COUNT_NODE(NODE_DVAR);
+		COUNT_NODE(NODE_GVAR);
+		COUNT_NODE(NODE_IVAR);
+		COUNT_NODE(NODE_CONST);
+		COUNT_NODE(NODE_CVAR);
+		COUNT_NODE(NODE_NTH_REF);
+		COUNT_NODE(NODE_BACK_REF);
+		COUNT_NODE(NODE_MATCH);
+		COUNT_NODE(NODE_MATCH2);
+		COUNT_NODE(NODE_MATCH3);
+		COUNT_NODE(NODE_LIT);
+		COUNT_NODE(NODE_STR);
+		COUNT_NODE(NODE_DSTR);
+		COUNT_NODE(NODE_XSTR);
+		COUNT_NODE(NODE_DXSTR);
+		COUNT_NODE(NODE_EVSTR);
+		COUNT_NODE(NODE_DREGX);
+		COUNT_NODE(NODE_DREGX_ONCE);
+		COUNT_NODE(NODE_ARGS);
+		COUNT_NODE(NODE_ARGS_AUX);
+		COUNT_NODE(NODE_OPT_ARG);
+		COUNT_NODE(NODE_POSTARG);
+		COUNT_NODE(NODE_ARGSCAT);
+		COUNT_NODE(NODE_ARGSPUSH);
+		COUNT_NODE(NODE_SPLAT);
+		COUNT_NODE(NODE_TO_ARY);
+		COUNT_NODE(NODE_BLOCK_ARG);
+		COUNT_NODE(NODE_BLOCK_PASS);
+		COUNT_NODE(NODE_DEFN);
+		COUNT_NODE(NODE_DEFS);
+		COUNT_NODE(NODE_ALIAS);
+		COUNT_NODE(NODE_VALIAS);
+		COUNT_NODE(NODE_UNDEF);
+		COUNT_NODE(NODE_CLASS);
+		COUNT_NODE(NODE_MODULE);
+		COUNT_NODE(NODE_SCLASS);
+		COUNT_NODE(NODE_COLON2);
+		COUNT_NODE(NODE_COLON3);
+		COUNT_NODE(NODE_DOT2);
+		COUNT_NODE(NODE_DOT3);
+		COUNT_NODE(NODE_FLIP2);
+		COUNT_NODE(NODE_FLIP3);
+		COUNT_NODE(NODE_SELF);
+		COUNT_NODE(NODE_NIL);
+		COUNT_NODE(NODE_TRUE);
+		COUNT_NODE(NODE_FALSE);
+		COUNT_NODE(NODE_ERRINFO);
+		COUNT_NODE(NODE_DEFINED);
+		COUNT_NODE(NODE_POSTEXE);
+		COUNT_NODE(NODE_ALLOCA);
+		COUNT_NODE(NODE_BMETHOD);
+		COUNT_NODE(NODE_MEMO);
+		COUNT_NODE(NODE_IFUNC);
+		COUNT_NODE(NODE_DSYM);
+		COUNT_NODE(NODE_ATTRASGN);
+		COUNT_NODE(NODE_PRELUDE);
+		COUNT_NODE(NODE_LAMBDA);
+		COUNT_NODE(NODE_OPTBLOCK);
+#undef COUNT_NODE
+	      default: node = INT2FIX(nodes[i]);
+	    }
+	    rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
+	}
+    }
+    return hash;
+}
+
+static int
+cto_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    VALUE hash = (VALUE)data;
+    VALUE v = (VALUE)vstart;
+
+    for (; v != (VALUE)vend; v += stride) {
+	if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_DATA) {
+	    VALUE counter = rb_hash_aref(hash, RBASIC(v)->klass);
+	    if (NIL_P(counter)) {
+		counter = INT2FIX(1);
+	    }
+	    else {
+		counter = INT2FIX(FIX2INT(counter) + 1);
+	    }
+	    rb_hash_aset(hash, RBASIC(v)->klass, counter);
+	}
+    }
+
+    return 0;
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.count_tdata_objects([result_hash]) -> hash
+ *
+ *  Counts nodes for each node type.
+ *
+ *  This method is not for ordinary Ruby programmers, but for MRI developers
+ *  who interest on MRI performance.
+ *
+ *  It returns a hash as:
+ *  {:NODE_METHOD=>2027, :NODE_FBODY=>1927, :NODE_CFUNC=>1798, ...}
+ *
+ *  If the optional argument, result_hash, is given,
+ *  it is overwritten and returned.
+ *  This is intended to avoid probe effect.
+ *
+ *  The contents of the returned hash is implementation defined.
+ *  It may be changed in future.
+ *
+ *  This method is not expected to work except C Ruby.
+ *
+ */
+
+static VALUE
+count_tdata_objects(int argc, VALUE *argv, VALUE self)
+{
+    VALUE hash;
+
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+        if (TYPE(hash) != T_HASH)
+            rb_raise(rb_eTypeError, "non-hash given");
+    }
+
+    if (hash == Qnil) {
+        hash = rb_hash_new();
+    }
+    else if (!RHASH_EMPTY_P(hash)) {
+        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
+    }
+
+    rb_objspace_each_objects(cto_i, (void *)hash);
+
+    return hash;
+}
+
+/* objspace library extends ObjectSpace module and add several
+ * methods to get internal statistic information about
+ * object/memory management.
+ *
+ * Generally, you *SHOULD NOT*use this library if you do not know
+ * about the MRI implementation.  Mainly, this library is for (memory)
+ * profiler developers and MRI developers who need to know how MRI
+ * memory usage.
+ */
+
+void
+Init_objspace(void)
+{
+    VALUE rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
+
+    rb_define_module_function(rb_mObjSpace, "count_objects_size", count_objects_size, -1);
+    rb_define_module_function(rb_mObjSpace, "memsize_of", memsize_of_m, 1);
+    rb_define_module_function(rb_mObjSpace, "count_nodes", count_nodes, -1);
+    rb_define_module_function(rb_mObjSpace, "count_tdata_objects", count_tdata_objects, -1);
+}
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 98921bc468..f26d06cb1b 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -28,7 +28,7 @@ message "=== OpenSSL for Ruby configurator ===\n"
 if with_config("debug") or enable_config("debug")
   $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
 
-  if /gcc/ =~ CONFIG["CC"]
+  if CONFIG['GCC'] == 'yes'
     $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
   end
 end
@@ -59,6 +59,8 @@ unless have_header("openssl/conf_api.h")
   exit 1
 end
 
+%w"rb_str_set_len rb_block_call".each {|func| have_func(func, "ruby.h")}
+
 message "=== Checking for OpenSSL features... ===\n"
 have_func("ERR_peek_last_error")
 have_func("BN_mod_add")
@@ -81,6 +83,8 @@ have_func("HMAC_CTX_cleanup")
 have_func("HMAC_CTX_copy")
 have_func("HMAC_CTX_init")
 have_func("PEM_def_callback")
+have_func("PKCS5_PBKDF2_HMAC")
+have_func("PKCS5_PBKDF2_HMAC_SHA1")
 have_func("X509V3_set_nconf")
 have_func("X509V3_EXT_nconf_nid")
 have_func("X509_CRL_add0_revoked")
@@ -90,8 +94,16 @@ have_func("X509_CRL_sort")
 have_func("X509_STORE_get_ex_data")
 have_func("X509_STORE_set_ex_data")
 have_func("OBJ_NAME_do_all_sorted")
+have_func("SSL_SESSION_get_id")
+have_func("SSL_SESSION_cmp")
 have_func("OPENSSL_cleanse")
-if try_compile("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
+have_func("SSLv2_method")
+have_func("SSLv2_server_method")
+have_func("SSLv2_client_method")
+unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h'])
+	have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME")
+end
+if try_compile("#define FOO(...) foo(__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
   $defs.push("-DHAVE_VA_ARGS_MACRO")
 end
 if have_header("openssl/engine.h")
@@ -101,6 +113,14 @@ if have_header("openssl/engine.h")
   have_func("ENGINE_get_digest")
   have_func("ENGINE_get_cipher")
   have_func("ENGINE_cleanup")
+  have_func("ENGINE_load_4758cca")
+  have_func("ENGINE_load_aep")
+  have_func("ENGINE_load_atalla")
+  have_func("ENGINE_load_chil")
+  have_func("ENGINE_load_cswift")
+  have_func("ENGINE_load_nuron")
+  have_func("ENGINE_load_sureware")
+  have_func("ENGINE_load_ubsec")
 end
 if try_compile(<<SRC)
 #include <openssl/opensslv.h>
diff --git a/ext/openssl/lib/net/ftptls.rb b/ext/openssl/lib/net/ftptls.rb
deleted file mode 100644
index a21c1f6c3c..0000000000
--- a/ext/openssl/lib/net/ftptls.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2003 Blaz Grilc <farmer@gmx.co.uk>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Requirements
-
-= Version
-  $Id$
-  
-= Notes
-  Tested on FreeBSD 5-CURRENT and 4-STABLE
-  - ruby 1.6.8 (2003-01-17) [i386-freebsd5]
-  - OpenSSL 0.9.7a Feb 19 2003
-  - ruby-openssl-0.2.0.p0
-  tested on ftp server: glftpd 1.30
-=end
-
-require 'socket'
-require 'openssl'
-require 'net/ftp'
-
-module Net
-  class FTPTLS < FTP
-    def connect(host, port=FTP_PORT)
-      @hostname = host
-      super
-    end
-
-    def login(user = "anonymous", passwd = nil, acct = nil)
-       store = OpenSSL::X509::Store.new
-       store.set_default_paths
-       ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
-       ctx.cert_store = store
-       ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-       ctx.key = nil
-       ctx.cert = nil
-       voidcmd("AUTH TLS")
-       @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
-       @sock.connect
-       @sock.post_connection_check(@hostname)
-       super(user, passwd, acct)
-       voidcmd("PBSZ 0")
-    end
-  end
-end
diff --git a/ext/openssl/lib/net/telnets.rb b/ext/openssl/lib/net/telnets.rb
deleted file mode 100644
index 2b69280432..0000000000
--- a/ext/openssl/lib/net/telnets.rb
+++ /dev/null
@@ -1,251 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net::Telnet.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-  
-  2001/11/06: Contiributed to Ruby/OpenSSL project.
-
-== class Net::Telnet
-
-This class will initiate SSL/TLS session automaticaly if the server
-sent OPT_STARTTLS. Some options are added for SSL/TLS.
-
-  host = Net::Telnet::new({
-           "Host"       => "localhost",
-           "Port"       => "telnets",
-           ## follows are new options.
-           'CertFile'   => "user.crt",
-           'KeyFile'    => "user.key",
-           'CAFile'     => "/some/where/certs/casert.pem",
-           'CAPath'     => "/some/where/caserts",
-           'VerifyMode' => SSL::VERIFY_PEER,
-           'VerifyCallback' => verify_proc
-         })
-
-Or, the new options ('Cert', 'Key' and 'CACert') are available from
-Michal Rokos's OpenSSL module.
-
-  cert_data = File.open("user.crt"){|io| io.read }
-  pkey_data = File.open("user.key"){|io| io.read }
-  cacert_data = File.open("your_ca.pem"){|io| io.read }
-  host = Net::Telnet::new({
-           "Host"       => "localhost",
-           "Port"       => "telnets",
-           'Cert'       => OpenSSL::X509::Certificate.new(cert_data)
-           'Key'        => OpenSSL::PKey::RSA.new(pkey_data)
-           'CACert'     => OpenSSL::X509::Certificate.new(cacert_data)
-           'CAFile'     => "/some/where/certs/casert.pem",
-           'CAPath'     => "/some/where/caserts",
-           'VerifyMode' => SSL::VERIFY_PEER,
-           'VerifyCallback' => verify_proc
-         })
-
-This class is expected to be a superset of usual Net::Telnet.
-=end
-
-require "net/telnet"
-require "openssl"
-
-module Net
-  class Telnet
-    attr_reader :ssl
-
-    OPT_STARTTLS       =  46.chr # "\056" # "\x2e" # Start TLS
-    TLS_FOLLOWS        =   1.chr # "\001" # "\x01" # FOLLOWS (for STARTTLS)
-
-    alias preprocess_orig preprocess
-
-    def ssl?; @ssl; end
-
-    def preprocess(string)
-      # combine CR+NULL into CR
-      string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
-
-      # combine EOL into "\n"
-      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
-
-      string.gsub(/#{IAC}(
-                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
-                   [#{DO}#{DONT}#{WILL}#{WONT}][#{OPT_BINARY}-#{OPT_EXOPL}]|
-                   #{SB}[#{OPT_BINARY}-#{OPT_EXOPL}]
-                     (#{IAC}#{IAC}|[^#{IAC}])+#{IAC}#{SE}
-                 )/xno) do
-        if    IAC == $1  # handle escaped IAC characters
-          IAC
-        elsif AYT == $1  # respond to "IAC AYT" (are you there)
-          self.write("nobody here but us pigeons" + EOL)
-          ''
-        elsif DO[0] == $1[0]  # respond to "IAC DO x"
-          if    OPT_BINARY[0] == $1[1]
-            @telnet_option["BINARY"] = true
-            self.write(IAC + WILL + OPT_BINARY)
-          elsif OPT_STARTTLS[0] == $1[1]
-            self.write(IAC + WILL + OPT_STARTTLS)
-            self.write(IAC + SB + OPT_STARTTLS + TLS_FOLLOWS + IAC + SE)
-          else
-            self.write(IAC + WONT + $1[1..1])
-          end
-          ''
-        elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
-          self.write(IAC + WONT + $1[1..1])
-          ''
-        elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
-          if    OPT_BINARY[0] == $1[1]
-            self.write(IAC + DO + OPT_BINARY)
-          elsif OPT_ECHO[0] == $1[1]
-            self.write(IAC + DO + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = true
-            self.write(IAC + DO + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
-          if    OPT_ECHO[0] == $1[1]
-            self.write(IAC + DONT + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = false
-            self.write(IAC + DONT + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif SB[0] == $1[0]    # respond to "IAC SB xxx IAC SE"
-          if    OPT_STARTTLS[0] == $1[1] && TLS_FOLLOWS[0] == $2[0]
-            @sock = OpenSSL::SSL::SSLSocket.new(@sock)
-            @sock.cert            = @options['Cert'] unless @sock.cert
-            @sock.key             = @options['Key'] unless @sock.key
-            @sock.ca_cert         = @options['CACert']
-            @sock.ca_file         = @options['CAFile']
-            @sock.ca_path         = @options['CAPath']
-            @sock.timeout         = @options['Timeout']
-            @sock.verify_mode     = @options['VerifyMode']
-            @sock.verify_callback = @options['VerifyCallback']
-            @sock.verify_depth    = @options['VerifyDepth']
-            @sock.connect
-            if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
-              @sock.post_connection_check(@options['Host'])
-            end
-            @ssl = true
-          end
-          ''
-        else
-          ''
-        end
-      end
-    end # preprocess
-    
-    alias waitfor_org waitfor
-
-    def waitfor(options)
-      time_out = @options["Timeout"]
-      waittime = @options["Waittime"]
-
-      if options.kind_of?(Hash)
-        prompt   = if options.has_key?("Match")
-                     options["Match"]
-                   elsif options.has_key?("Prompt")
-                     options["Prompt"]
-                   elsif options.has_key?("String")
-                     Regexp.new( Regexp.quote(options["String"]) )
-                   end
-        time_out = options["Timeout"]  if options.has_key?("Timeout")
-        waittime = options["Waittime"] if options.has_key?("Waittime")
-      else
-        prompt = options
-      end
-
-      if time_out == false
-        time_out = nil
-      end
-
-      line = ''
-      buf = ''
-      @rest = '' unless @rest
-
-      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
-        unless IO::select([@sock], nil, nil, time_out)
-          raise TimeoutError, "timed-out; wait for the next data"
-        end
-        begin
-          c = @rest + @sock.sysread(1024 * 1024)
-          @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-          if @options["Telnetmode"]   
-            pos = 0
-            catch(:next){
-              while true
-                case c[pos]
-                when IAC[0]
-                  case c[pos+1]
-                  when DO[0], DONT[0], WILL[0], WONT[0]
-                    throw :next unless c[pos+2]
-                    pos += 3
-                  when SB[0]
-                    ret = detect_sub_negotiation(c, pos)
-                    throw :next unless ret
-                    pos = ret
-                  when nil
-                    throw :next
-                  else
-                    pos += 2
-                  end
-                when nil
-                  throw :next
-                else
-                  pos += 1
-                end
-              end
-            }
-
-            buf = preprocess(c[0...pos])
-            @rest = c[pos..-1]
-          end
-          @log.print(buf) if @options.has_key?("Output_log")
-          line.concat(buf)
-          yield buf if block_given?   
-        rescue EOFError # End of file reached
-          if line == ''
-            line = nil
-            yield nil if block_given? 
-          end
-          break
-        end
-      end
-      line
-    end
-
-    private
-
-    def detect_sub_negotiation(data, pos)
-      return nil if data.length < pos+6  # IAC SB x param IAC SE
-      pos += 3
-      while true
-        case data[pos]
-        when IAC[0]
-          if data[pos+1] == SE[0]
-            pos += 2
-            return pos
-          else
-            pos += 2
-          end
-        when nil
-          return nil
-        else
-          pos += 1
-        end
-      end
-    end
-
-  end
-end
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 24a9eed136..70fce196a5 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -19,6 +19,6 @@ require 'openssl.so'
 require 'openssl/bn'
 require 'openssl/cipher'
 require 'openssl/digest'
-require 'openssl/ssl'
-require 'openssl/x509'
+require 'openssl/ssl-internal'
+require 'openssl/x509-internal'
 
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index e7cbf2cfaf..624c13715c 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -29,7 +29,7 @@ end # OpenSSL
 #
 class Integer
   def to_bn
-    OpenSSL::BN::new(self)
+    OpenSSL::BN::new(self.to_s(16), 16)
   end
 end # Integer
 
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 761a017487..cc1f08f563 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -14,6 +14,7 @@
   $Id$
 =end
 
+module OpenSSL
 module Buffering
   include Enumerable
   attr_accessor :sync
@@ -57,10 +58,10 @@ module Buffering
     if size == 0
       if buf
         buf.clear
+        return buf
       else
-        buf = ""
+        return ""
       end
-      return @eof ? nil : buf
     end
     until @eof
       break if size && size <= @rbuffer.size
@@ -78,10 +79,10 @@ module Buffering
     if maxlen == 0
       if buf
         buf.clear
+        return buf
       else
-        buf = ""
+        return ""
       end
-      return @eof ? nil : buf
     end
     if @rbuffer.empty?
       begin
@@ -99,7 +100,60 @@ module Buffering
     ret
   end
 
-  def gets(eol=$/)
+  # Reads at most _maxlen_ bytes in the non-blocking manner.
+  #
+  # When no data can be read without blocking,
+  # It raises OpenSSL::SSL::SSLError extended by
+  # IO::WaitReadable or IO::WaitWritable.
+  #
+  # IO::WaitReadable means SSL needs to read internally.
+  # So read_nonblock should be called again after
+  # underlying IO is readable.
+  #
+  # IO::WaitWritable means SSL needs to write internally.
+  # So read_nonblock should be called again after
+  # underlying IO is writable.
+  #
+  # So OpenSSL::Buffering#read_nonblock needs two rescue clause as follows.
+  # 
+  #  # emulates blocking read (readpartial).
+  #  begin
+  #    result = ssl.read_nonblock(maxlen)
+  #  rescue IO::WaitReadable
+  #    IO.select([io])
+  #    retry
+  #  rescue IO::WaitWritable
+  #    IO.select(nil, [io])
+  #    retry
+  #  end
+  #
+  # Note that one reason that read_nonblock write to a underlying IO
+  # is the peer requests a new TLS/SSL handshake.
+  # See openssl FAQ for more details.
+  # http://www.openssl.org/support/faq.html
+  #
+  def read_nonblock(maxlen, buf=nil)
+    if maxlen == 0
+      if buf
+        buf.clear
+        return buf
+      else
+        return ""
+      end
+    end
+    if @rbuffer.empty?
+      return sysread_nonblock(maxlen, buf)
+    end
+    ret = consume_rbuff(maxlen)
+    if buf
+      buf.replace(ret)
+      ret = buf
+    end
+    raise EOFError if ret.empty?
+    ret
+  end
+
+  def gets(eol=$/, limit=nil)
     idx = @rbuffer.index(eol)
     until @eof
       break if idx
@@ -111,6 +165,9 @@ module Buffering
     else
       size = idx ? idx+eol.size : nil
     end
+    if limit and limit >= 0
+      size = [size, limit].min
+    end
     consume_rbuff(size)
   end
 
@@ -193,6 +250,48 @@ module Buffering
     s.length
   end
 
+  # Writes _str_ in the non-blocking manner.
+  #
+  # If there are buffered data, it is flushed at first.
+  # This may block.
+  #
+  # write_nonblock returns number of bytes written to the SSL connection.
+  #
+  # When no data can be written without blocking,
+  # It raises OpenSSL::SSL::SSLError extended by
+  # IO::WaitReadable or IO::WaitWritable.
+  #
+  # IO::WaitReadable means SSL needs to read internally.
+  # So write_nonblock should be called again after
+  # underlying IO is readable.
+  #
+  # IO::WaitWritable means SSL needs to write internally.
+  # So write_nonblock should be called again after
+  # underlying IO is writable.
+  #
+  # So OpenSSL::Buffering#write_nonblock needs two rescue clause as follows.
+  # 
+  #  # emulates blocking write.
+  #  begin
+  #    result = ssl.write_nonblock(str)
+  #  rescue IO::WaitReadable
+  #    IO.select([io])
+  #    retry
+  #  rescue IO::WaitWritable
+  #    IO.select(nil, [io])
+  #    retry
+  #  end
+  #
+  # Note that one reason that write_nonblock read from a underlying IO
+  # is the peer requests a new TLS/SSL handshake.
+  # See openssl FAQ for more details.
+  # http://www.openssl.org/support/faq.html
+  #
+  def write_nonblock(s)
+    flush
+    syswrite_nonblock(s)
+  end
+
   def << (s)
     do_write(s)
     self
@@ -229,6 +328,8 @@ module Buffering
     osync = @sync
     @sync = true
     do_write ""
+    return self
+  ensure
     @sync = osync
   end
 
@@ -237,3 +338,4 @@ module Buffering
     sysclose
   end
 end
+end
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index 049533d06b..290e9c1d2d 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -19,7 +19,7 @@
 #require 'openssl'
 
 module OpenSSL
-  module Cipher
+  class Cipher
     %w(AES CAST5 BF DES IDEA RC2 RC4 RC5).each{|name|
       klass = Class.new(Cipher){
         define_method(:initialize){|*args|
@@ -41,18 +41,25 @@ module OpenSSL
       const_set("AES#{keylen}", klass)
     }
 
-    class Cipher
-      def random_key
-        str = OpenSSL::Random.random_bytes(self.key_len)
-        self.key = str
-        return str
-      end
-
-      def random_iv
-        str = OpenSSL::Random.random_bytes(self.iv_len)
-        self.iv = str
-        return str
-      end
+    # Generate, set, and return a random key.
+    # You must call cipher.encrypt or cipher.decrypt before calling this method.
+    def random_key
+      str = OpenSSL::Random.random_bytes(self.key_len)
+      self.key = str
+      return str
+    end
+
+    # Generate, set, and return a random iv.
+    # You must call cipher.encrypt or cipher.decrypt before calling this method.
+    def random_iv
+      str = OpenSSL::Random.random_bytes(self.iv_len)
+      self.iv = str
+      return str
+    end
+
+    # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
+    class Cipher < Cipher
+      # add warning
     end
   end # Cipher
 end # OpenSSL
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index b3e4484805..e603c41de4 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -19,13 +19,17 @@
 #require 'openssl'
 
 module OpenSSL
-  module Digest
+  class Digest
 
     alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
     if OPENSSL_VERSION_NUMBER > 0x00908000
       alg += %w(SHA224 SHA256 SHA384 SHA512)
     end
 
+    def self.digest(name, data)
+        super(data, name)
+    end
+
     alg.each{|name|
       klass = Class.new(Digest){
         define_method(:initialize){|*data|
@@ -36,7 +40,7 @@ module OpenSSL
           super(name, data.first)
         }
       }
-      singleton = (class <<klass; self; end)
+      singleton = (class << klass; self; end)
       singleton.class_eval{
         define_method(:digest){|data| Digest.digest(name, data) }
         define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
@@ -44,6 +48,14 @@ module OpenSSL
       const_set(name, klass)
     }
 
+    # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
+    class Digest < Digest
+      def initialize(*args)
+        # add warning
+        super(*args)
+      end
+    end
+
   end # Digest
 end # OpenSSL
 
diff --git a/ext/openssl/lib/openssl/ssl-internal.rb b/ext/openssl/lib/openssl/ssl-internal.rb
new file mode 100644
index 0000000000..04a9faa0b6
--- /dev/null
+++ b/ext/openssl/lib/openssl/ssl-internal.rb
@@ -0,0 +1,177 @@
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+require "openssl/buffering"
+require "fcntl"
+
+module OpenSSL
+  module SSL
+    class SSLContext
+      DEFAULT_PARAMS = {
+        :ssl_version => "SSLv23",
+        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
+        :ciphers => "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
+        :options => OpenSSL::SSL::OP_ALL,
+      }
+
+      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
+      DEFAULT_CERT_STORE.set_default_paths
+      if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
+        DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
+      end
+
+      def set_params(params={})
+        params = DEFAULT_PARAMS.merge(params)
+        params.each{|name, value| self.__send__("#{name}=", value) }
+        if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
+          unless self.ca_file or self.ca_path or self.cert_store
+            self.cert_store = DEFAULT_CERT_STORE
+          end
+        end
+        return params
+      end
+    end
+
+    module SocketForwarder
+      def addr
+        to_io.addr
+      end
+
+      def peeraddr
+        to_io.peeraddr
+      end
+
+      def setsockopt(level, optname, optval)
+        to_io.setsockopt(level, optname, optval)
+      end
+
+      def getsockopt(level, optname)
+        to_io.getsockopt(level, optname)
+      end
+
+      def fcntl(*args)
+        to_io.fcntl(*args)
+      end
+
+      def closed?
+        to_io.closed?
+      end
+
+      def do_not_reverse_lookup=(flag)
+        to_io.do_not_reverse_lookup = flag
+      end
+    end
+
+    module Nonblock
+      def initialize(*args)
+        flag = File::NONBLOCK
+        flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
+        @io.fcntl(Fcntl::F_SETFL, flag)
+        super
+      end
+    end
+
+    def verify_certificate_identity(cert, hostname)
+      should_verify_common_name = true
+      cert.extensions.each{|ext|
+        next if ext.oid != "subjectAltName"
+        ext.value.split(/,\s+/).each{|general_name|
+          if /\ADNS:(.*)/ =~ general_name
+            should_verify_common_name = false
+            reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
+            return true if /\A#{reg}\z/i =~ hostname
+          elsif /\AIP Address:(.*)/ =~ general_name
+            should_verify_common_name = false
+            return true if $1 == hostname
+          end
+        }
+      }
+      if should_verify_common_name
+        cert.subject.to_a.each{|oid, value|
+          if oid == "CN"
+            reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
+            return true if /\A#{reg}\z/i =~ hostname
+          end
+        }
+      end
+      return false
+    end
+    module_function :verify_certificate_identity
+
+    class SSLSocket
+      include Buffering
+      include SocketForwarder
+      include Nonblock
+
+      def post_connection_check(hostname)
+        unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
+          raise SSLError, "hostname was not match with the server certificate"
+        end
+        return true
+      end
+
+      def session
+        SSL::Session.new(self)
+      rescue SSL::Session::SessionError
+        nil
+      end
+    end
+
+    class SSLServer
+      include SocketForwarder
+      attr_accessor :start_immediately
+
+      def initialize(svr, ctx)
+        @svr = svr
+        @ctx = ctx
+        unless ctx.session_id_context
+          session_id = OpenSSL::Digest::MD5.hexdigest($0)
+          @ctx.session_id_context = session_id
+        end
+        @start_immediately = true
+      end
+
+      def to_io
+        @svr
+      end
+
+      def listen(backlog=5)
+        @svr.listen(backlog)
+      end
+
+      def shutdown(how=Socket::SHUT_RDWR)
+        @svr.shutdown(how)
+      end
+
+      def accept
+        sock = @svr.accept
+        begin
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
+          ssl.sync_close = true
+          ssl.accept if @start_immediately
+          ssl
+        rescue SSLError => ex
+          sock.close
+          raise ex
+        end
+      end
+
+      def close
+        @svr.close
+      end
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 9e9a9448ba..3f17f5aa29 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -1,135 +1 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-require "openssl"
-require "openssl/buffering"
-require "fcntl"
-
-module OpenSSL
-  module SSL
-    module SocketForwarder
-      def addr
-        to_io.addr
-      end
-
-      def peeraddr
-        to_io.peeraddr
-      end
-
-      def setsockopt(level, optname, optval)
-        to_io.setsockopt(level, optname, optval)
-      end
-
-      def getsockopt(level, optname)
-        to_io.getsockopt(level, optname)
-      end
-
-      def fcntl(*args)
-        to_io.fcntl(*args)
-      end
-
-      def closed?
-        to_io.closed?
-      end
-
-      def do_not_reverse_lookup=(flag)
-        to_io.do_not_reverse_lookup = flag
-      end
-    end
-
-    module Nonblock
-      def initialize(*args)
-        flag = File::NONBLOCK
-        flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
-        @io.fcntl(Fcntl::F_SETFL, flag)
-        super
-      end
-    end
-
-    class SSLSocket
-      include Buffering
-      include SocketForwarder
-      include Nonblock
-
-      def post_connection_check(hostname)
-        check_common_name = true
-        cert = peer_cert
-        cert.extensions.each{|ext|
-          next if ext.oid != "subjectAltName"
-          ext.value.split(/,\s+/).each{|general_name|
-            if /\ADNS:(.*)/ =~ general_name
-              check_common_name = false
-              reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
-              return true if /\A#{reg}\z/i =~ hostname
-            elsif /\AIP Address:(.*)/ =~ general_name
-              check_common_name = false
-              return true if $1 == hostname
-            end
-          }
-        }
-        if check_common_name
-          cert.subject.to_a.each{|oid, value|
-            if oid == "CN"
-              reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
-              return true if /\A#{reg}\z/i =~ hostname
-            end
-          }
-        end
-        raise SSLError, "hostname was not match with the server certificate"
-      end
-    end
-
-    class SSLServer
-      include SocketForwarder
-      attr_accessor :start_immediately
-
-      def initialize(svr, ctx)
-        @svr = svr
-        @ctx = ctx
-        unless ctx.session_id_context
-          session_id = OpenSSL::Digest::MD5.hexdigest($0)
-          @ctx.session_id_context = session_id
-        end
-        @start_immediately = true
-      end
-
-      def to_io
-        @svr
-      end
-
-      def listen(backlog=5)
-        @svr.listen(backlog)
-      end
-
-      def accept
-        sock = @svr.accept
-        begin
-          ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
-          ssl.sync_close = true
-          ssl.accept if @start_immediately
-          ssl
-        rescue SSLError => ex
-          sock.close
-          raise ex
-        end
-      end
-
-      def close
-        @svr.close
-      end
-    end
-  end
-end
+require 'openssl'
diff --git a/ext/openssl/lib/openssl/x509-internal.rb b/ext/openssl/lib/openssl/x509-internal.rb
new file mode 100644
index 0000000000..c3de83be66
--- /dev/null
+++ b/ext/openssl/lib/openssl/x509-internal.rb
@@ -0,0 +1,153 @@
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for X509 and subclasses
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+module OpenSSL
+  module X509
+    class ExtensionFactory
+      def create_extension(*arg)
+        if arg.size > 1
+          create_ext(*arg)
+        else
+          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
+        end
+      end
+
+      def create_ext_from_array(ary)
+        raise ExtensionError, "unexpected array form" if ary.size > 3
+        create_ext(ary[0], ary[1], ary[2])
+      end
+
+      def create_ext_from_string(str) # "oid = critical, value"
+        oid, value = str.split(/=/, 2)
+        oid.strip!
+        value.strip!
+        create_ext(oid, value)
+      end
+
+      def create_ext_from_hash(hash)
+        create_ext(hash["oid"], hash["value"], hash["critical"])
+      end
+    end
+
+    class Extension
+      def to_s # "oid = critical, value"
+        str = self.oid
+        str << " = "
+        str << "critical, " if self.critical?
+        str << self.value.gsub(/\n/, ", ")
+      end
+
+      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
+        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
+      end
+
+      def to_a
+        [ self.oid, self.value, self.critical? ]
+      end
+    end
+
+    class Name
+      module RFC2253DN
+        Special = ',=+<>#;'
+        HexChar = /[0-9a-fA-F]/
+        HexPair = /#{HexChar}#{HexChar}/
+        HexString = /#{HexPair}+/
+        Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
+        StringChar = /[^#{Special}\\"]/
+        QuoteChar = /[^\\"]/
+        AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
+        AttributeValue = /
+          (?!["#])((?:#{StringChar}|#{Pair})*)|
+          \#(#{HexString})|
+          "((?:#{QuoteChar}|#{Pair})*)"
+        /x
+        TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
+
+        module_function
+
+        def expand_pair(str)
+          return nil unless str
+          return str.gsub(Pair){
+            pair = $&
+            case pair.size
+            when 2 then pair[1,1]
+            when 3 then Integer("0x#{pair[1,2]}").chr
+            else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
+            end
+          }
+        end
+
+        def expand_hexstring(str)
+          return nil unless str
+          der = str.gsub(HexPair){$&.to_i(16).chr }
+          a1 = OpenSSL::ASN1.decode(der)
+          return a1.value, a1.tag
+        end
+
+        def expand_value(str1, str2, str3)
+          value = expand_pair(str1)
+          value, tag = expand_hexstring(str2) unless value
+          value = expand_pair(str3) unless value
+          return value, tag
+        end
+
+        def scan(dn)
+          str = dn
+          ary = []
+          while true
+            if md = TypeAndValue.match(str)
+              matched = md.to_s
+              remain = md.post_match
+              type = md[1]
+              value, tag = expand_value(md[2], md[3], md[4]) rescue nil
+              if value
+                type_and_value = [type, value]
+                type_and_value.push(tag) if tag
+                ary.unshift(type_and_value)
+                if remain.length > 2 && remain[0] == ?,
+                  str = remain[1..-1]
+                  next
+                elsif remain.length > 2 && remain[0] == ?+
+                  raise OpenSSL::X509::NameError,
+                    "multi-valued RDN is not supported: #{dn}"
+                elsif remain.empty?
+                  break
+                end
+              end
+            end
+            msg_dn = dn[0, dn.length - str.length] + " =>" + str
+            raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
+          end
+          return ary
+        end
+      end
+
+      class << self
+        def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
+          ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
+          self.new(ary, template)
+        end
+
+        def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
+          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
+          self.new(ary, template)
+        end
+
+        alias parse parse_openssl
+      end
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index e711bda39c..3f17f5aa29 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1,154 +1 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for X509 and subclasses
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-require "openssl"
-
-module OpenSSL
-  module X509
-    class ExtensionFactory
-      def create_extension(*arg)
-        if arg.size > 1
-          create_ext(*arg)
-        else
-          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
-        end
-      end
-
-      def create_ext_from_array(ary)
-        raise ExtensionError, "unexpected array form" if ary.size > 3 
-        create_ext(ary[0], ary[1], ary[2])
-      end
-
-      def create_ext_from_string(str) # "oid = critical, value"
-        oid, value = str.split(/=/, 2)
-        oid.strip!
-        value.strip!
-        create_ext(oid, value)
-      end
-      
-      def create_ext_from_hash(hash)
-        create_ext(hash["oid"], hash["value"], hash["critical"])
-      end
-    end
-    
-    class Extension
-      def to_s # "oid = critical, value"
-        str = self.oid
-        str << " = "
-        str << "critical, " if self.critical?
-        str << self.value.gsub(/\n/, ", ")
-      end
-        
-      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
-        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
-      end
-
-      def to_a
-        [ self.oid, self.value, self.critical? ]
-      end
-    end
-
-    class Name
-      module RFC2253DN
-        Special = ',=+<>#;'
-        HexChar = /[0-9a-fA-F]/
-        HexPair = /#{HexChar}#{HexChar}/
-        HexString = /#{HexPair}+/
-        Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
-        StringChar = /[^#{Special}\\"]/
-        QuoteChar = /[^\\"]/
-        AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
-        AttributeValue = /
-          (?!["#])((?:#{StringChar}|#{Pair})*)|
-          \#(#{HexString})|
-          "((?:#{QuoteChar}|#{Pair})*)"
-        /x
-        TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
-
-        module_function
-
-        def expand_pair(str)
-          return nil unless str
-          return str.gsub(Pair){|pair|
-            case pair.size
-            when 2 then pair[1,1]
-            when 3 then Integer("0x#{pair[1,2]}").chr
-            else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
-            end
-          }
-        end
-
-        def expand_hexstring(str)
-          return nil unless str
-          der = str.gsub(HexPair){|hex| Integer("0x#{hex}").chr }
-          a1 = OpenSSL::ASN1.decode(der)
-          return a1.value, a1.tag
-        end
-
-        def expand_value(str1, str2, str3)
-          value = expand_pair(str1)
-          value, tag = expand_hexstring(str2) unless value
-          value = expand_pair(str3) unless value
-          return value, tag
-        end
-
-        def scan(dn)
-          str = dn
-          ary = []
-          while true
-            if md = TypeAndValue.match(str)
-              matched = md.to_s
-              remain = md.post_match
-              type = md[1]
-              value, tag = expand_value(md[2], md[3], md[4]) rescue nil
-              if value
-                type_and_value = [type, value]
-                type_and_value.push(tag) if tag
-                ary.unshift(type_and_value)
-                if remain.length > 2 && remain[0] == ?,
-                  str = remain[1..-1]
-                  next
-                elsif remain.length > 2 && remain[0] == ?+
-                  raise OpenSSL::X509::NameError,
-                    "multi-valued RDN is not supported: #{dn}"
-                elsif remain.empty?
-                  break
-                end
-              end
-            end
-            msg_dn = dn[0, dn.length - str.length] + " =>" + str
-            raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
-          end
-          return ary
-        end
-      end
-
-      class <<self
-        def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
-          ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
-          self.new(ary, template)
-        end
-
-        def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
-          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
-          self.new(ary, template)
-        end
-
-        alias parse parse_openssl
-      end
-    end
-  end
-end
+require 'openssl'
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index f77731ed65..3ffe651b5b 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -22,28 +22,27 @@
 #include "openssl_missing.h"
 
 #if !defined(HAVE_HMAC_CTX_COPY)
-int
+void
 HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
 {
-    if (!out || !in) return 0;
+    if (!out || !in) return;
     memcpy(out, in, sizeof(HMAC_CTX));
 
-    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)
-	    || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)
-	    || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx))
-	return 0;
-    return 1;
+    EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
+    EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
+    EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
 }
 #endif /* HAVE_HMAC_CTX_COPY */
 #endif /* NO_HMAC */
 
 #if !defined(HAVE_X509_STORE_SET_EX_DATA)
-
 int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
 {
     return CRYPTO_set_ex_data(&str->ex_data, idx, data);
 }
- 
+#endif
+
+#if !defined(HAVE_X509_STORE_GET_EX_DATA)
 void *X509_STORE_get_ex_data(X509_STORE *str, int idx)
 {
     return CRYPTO_get_ex_data(&str->ex_data, idx);
@@ -113,7 +112,7 @@ HMAC_CTX_cleanup(HMAC_CTX *ctx)
 #endif
 
 #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-/* 
+/*
  * this function does not exist in OpenSSL yet... or ever?.
  * a future version may break this function.
  * tested on 0.9.7d.
@@ -182,12 +181,12 @@ OSSL_X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const
 		(ASN1_STRING *)(*a)->serialNumber,
 		(ASN1_STRING *)(*b)->serialNumber));
 }
-		    
+
 int
 X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
 {
     X509_CRL_INFO *inf;
-    
+
     inf = crl->crl;
     if (!inf->revoked)
 	inf->revoked = sk_X509_REVOKED_new(OSSL_X509_REVOKED_cmp);
@@ -315,7 +314,7 @@ PEM_def_callback(char *buf, int num, int w, void *key)
 {
     int i,j;
     const char *prompt;
-    
+
     if (key) {
 	i = strlen(key);
 	i = (i > num) ? num : i;
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index e8c75ca42c..a1c256ba20 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -15,55 +15,81 @@
 extern "C" {
 #endif
 
+#ifndef TYPEDEF_D2I_OF
+typedef char *d2i_of_void();
+#endif
+#ifndef TYPEDEF_I2D_OF
+typedef int i2d_of_void();
+#endif
+
 /*
  * These functions are not included in headers of OPENSSL <= 0.9.6b
  */
 
 #if !defined(PEM_read_bio_DSAPublicKey)
 # define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
+        (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(void **)x,cb,u)
 #endif
 
 #if !defined(PEM_write_bio_DSAPublicKey)
 # define PEM_write_bio_DSAPublicKey(bp,x) \
-	PEM_ASN1_write_bio((int (*)())i2d_DSAPublicKey,\
+	PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPublicKey,\
 		PEM_STRING_DSA_PUBLIC,\
 		bp,(char *)x, NULL, NULL, 0, NULL, NULL)
 #endif
 
 #if !defined(DSAPrivateKey_dup)
-# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \
-	(char *(*)())d2i_DSAPrivateKey,(char *)dsa)
+# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPrivateKey, \
+	(d2i_of_void *)d2i_DSAPrivateKey,(char *)dsa)
 #endif
 
 #if !defined(DSAPublicKey_dup)
-# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \
-	(char *(*)())d2i_DSAPublicKey,(char *)dsa)
+# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPublicKey, \
+	(d2i_of_void *)d2i_DSAPublicKey,(char *)dsa)
 #endif
 
 #if !defined(X509_REVOKED_dup)
-# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
-	(char *(*)())d2i_X509_REVOKED, (char *)rev)
+# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
+	(d2i_of_void *)d2i_X509_REVOKED, (char *)rev)
 #endif
 
 #if !defined(PKCS7_SIGNER_INFO_dup)
-#  define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((int (*)())i2d_PKCS7_SIGNER_INFO, \
-	(char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si)
+#  define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_SIGNER_INFO, \
+	(d2i_of_void *)d2i_PKCS7_SIGNER_INFO, (char *)si)
 #endif
 
 #if !defined(PKCS7_RECIP_INFO_dup)
-#  define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((int (*)())i2d_PKCS7_RECIP_INFO, \
-	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
+#  define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_RECIP_INFO, \
+	(d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
 #endif
 
+#if !defined(HAVE_HMAC_CTX_INIT)
 void HMAC_CTX_init(HMAC_CTX *ctx);
-int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
+#endif
+
+#if !defined(HAVE_HMAC_CTX_COPY)
+void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
+#endif
+
+#if !defined(HAVE_HMAC_CTX_CLEANUP)
 void HMAC_CTX_cleanup(HMAC_CTX *ctx);
+#endif
 
+#if !defined(HAVE_EVP_MD_CTX_CREATE)
 EVP_MD_CTX *EVP_MD_CTX_create(void);
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_INIT)
 void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
 int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
 void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
+#endif
 
 #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
 int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
@@ -107,19 +133,57 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
 #define OPENSSL_cleanse(p, l) memset(p, 0, l)
 #endif
 
+#if !defined(HAVE_X509_STORE_GET_EX_DATA)
 void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
+#endif
+
+#if !defined(HAVE_X509_STORE_SET_EX_DATA)
 int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
+#endif
+
+#if !defined(HAVE_X509_CRL_SET_VERSION)
 int X509_CRL_set_version(X509_CRL *x, long version);
+#endif
+
+#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
 int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
+#endif
+
+#if !defined(HAVE_X509_CRL_SORT)
 int X509_CRL_sort(X509_CRL *c);
+#endif
+
+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
 int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
+#endif
+
+#if !defined(HAVE_BN_MOD_SQR)
 int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
+#endif
+
+#if !defined(HAVE_BN_MOD_ADD)
 int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
+#endif
+
+#if !defined(HAVE_BN_MOD_SUB)
 int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
+#endif
+
+#if !defined(HAVE_BN_RAND_RANGE)
 int BN_rand_range(BIGNUM *r, BIGNUM *range);
+#endif
+
+#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
 int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
+#endif
+
+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
 char *CONF_get1_default_config_file(void);
+#endif
+
+#if !defined(HAVE_PEM_DEF_CALLBACK)
 int PEM_def_callback(char *buf, int num, int w, void *key);
+#endif
 
 #if defined(__cplusplus)
 }
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index a98f2641cc..b3f76c26fc 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -15,7 +15,7 @@
  * String to HEXString conversion
  */
 int
-string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
+string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
 {
     static const char hex[]="0123456789abcdef";
     int i, len = 2 * buf_len;
@@ -48,7 +48,7 @@ string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
  * Data Conversion
  */
 STACK_OF(X509) *
-ossl_x509_ary2sk0(VALUE ary)  
+ossl_x509_ary2sk0(VALUE ary)
 {
     STACK_OF(X509) *sk;
     VALUE val;
@@ -57,13 +57,13 @@ ossl_x509_ary2sk0(VALUE ary)
 
     Check_Type(ary, T_ARRAY);
     sk = sk_X509_new_null();
-    if (!sk) ossl_raise(eOSSLError, NULL); 
+    if (!sk) ossl_raise(eOSSLError, NULL);
 
-    for (i = 0; i < RARRAY(ary)->len; i++) {
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
         val = rb_ary_entry(ary, i);
         if (!rb_obj_is_kind_of(val, cX509Cert)) {
             sk_X509_pop_free(sk, X509_free);
-            ossl_raise(eOSSLError, "object not X509 cert in array"); 
+            ossl_raise(eOSSLError, "object not X509 cert in array");
         }
         x509 = DupX509CertPtr(val); /* NEED TO DUP */
         sk_X509_push(sk, x509);
@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
 
 #define OSSL_IMPL_SK2ARY(name, type)	        \
 VALUE						\
-ossl_##name##_sk2ary(STACK *sk)			\
+ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
 {						\
     type *t;					\
     int i, num;					\
@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
 	OSSL_Debug("empty sk!");		\
 	return Qnil;				\
     }						\
-    num = sk_num(sk);				\
+    num = sk_##type##_num(sk);			\
     if (num < 0) {				\
 	OSSL_Debug("items in sk < -1???");	\
 	return rb_ary_new();			\
@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
     ary = rb_ary_new2(num);			\
 						\
     for (i=0; i<num; i++) {			\
-	t = (type *)sk_value(sk, i);		\
+	t = sk_##type##_value(sk, i);		\
 	rb_ary_push(ary, ossl_##name##_new(t));	\
     }						\
     return ary;					\
@@ -131,7 +131,7 @@ ossl_buf2str(char *buf, int len)
     int status = 0;
 
     str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
-    if(!NIL_P(str)) memcpy(RSTRING(str)->ptr, buf, len);
+    if(!NIL_P(str)) memcpy(RSTRING_PTR(str), buf, len);
     OPENSSL_free(buf);
     if(status) rb_jump_tag(status);
 
@@ -143,7 +143,7 @@ ossl_buf2str(char *buf, int len)
  */
 static VALUE
 ossl_pem_passwd_cb0(VALUE flag)
-{	
+{
     VALUE pass;
 
     pass = rb_yield(flag);
@@ -157,7 +157,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 {
     int len, status = 0;
     VALUE rflag, pass;
-    
+
     if (pwd || !rb_block_given_p())
 	return PEM_def_callback(buf, max_len, flag, pwd);
 
@@ -170,7 +170,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 	rflag = flag ? Qtrue : Qfalse;
 	pass  = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
 	if (status) return -1; /* exception was raised. */
-	len = RSTRING(pass)->len;
+	len = RSTRING_LEN(pass);
 	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
 	    rb_warning("password must be longer than 4 bytes");
 	    continue;
@@ -179,7 +179,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 	    rb_warning("password must be shorter then %d bytes", max_len-1);
 	    continue;
 	}
-	memcpy(buf, RSTRING(pass)->ptr, len);
+	memcpy(buf, RSTRING_PTR(pass), len);
 	break;
     }
     return len;
@@ -192,12 +192,12 @@ int ossl_verify_cb_idx;
 
 VALUE
 ossl_call_verify_cb_proc(struct ossl_verify_cb_args *args)
-{   
+{
     return rb_funcall(args->proc, rb_intern("call"), 2,
                       args->preverify_ok, args->store_ctx);
 }
- 
-int 
+
+int
 ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
 {
     VALUE proc, rctx, ret;
@@ -272,10 +272,9 @@ ossl_to_der_if_possible(VALUE obj)
 /*
  * Errors
  */
-void
-ossl_raise(VALUE exc, const char *fmt, ...)
+static VALUE
+ossl_make_error(VALUE exc, const char *fmt, va_list args)
 {
-    va_list args;
     char buf[BUFSIZ];
     const char *msg;
     long e;
@@ -287,17 +286,14 @@ ossl_raise(VALUE exc, const char *fmt, ...)
     e = ERR_peek_error();
 #endif
     if (fmt) {
-	va_start(args, fmt);
 	len = vsnprintf(buf, BUFSIZ, fmt, args);
-	va_end(args);
     }
     if (len < BUFSIZ && e) {
 	if (dOSSL == Qtrue) /* FULL INFO */
 	    msg = ERR_error_string(e, NULL);
 	else
 	    msg = ERR_reason_error_string(e);
-	fmt = len ? ": %s" : "%s";
-	len += snprintf(buf+len, BUFSIZ-len, fmt, msg);
+	len += snprintf(buf+len, BUFSIZ-len, "%s%s", (len ? ": " : ""), msg);
     }
     if (dOSSL == Qtrue){ /* show all errors on the stack */
 	while ((e = ERR_get_error()) != 0){
@@ -307,10 +303,40 @@ ossl_raise(VALUE exc, const char *fmt, ...)
     ERR_clear_error();
 
     if(len > BUFSIZ) len = strlen(buf);
-    rb_exc_raise(rb_exc_new(exc, buf, len));
+    return rb_exc_new(exc, buf, len);
+}
+
+void
+ossl_raise(VALUE exc, const char *fmt, ...)
+{
+    va_list args;
+    VALUE err;
+    va_start(args, fmt);
+    err = ossl_make_error(exc, fmt, args);
+    va_end(args);
+    rb_exc_raise(err);
 }
 
 VALUE
+ossl_exc_new(VALUE exc, const char *fmt, ...)
+{
+    va_list args;
+    VALUE err;
+    va_start(args, fmt);
+    err = ossl_make_error(exc, fmt, args);
+    va_end(args);
+    return err;
+}
+
+/*
+ * call-seq:
+ *   OpenSSL.errors -> [String...]
+ *
+ * See any remaining errors held in queue.
+ *
+ * Any errors you see here are probably due to a bug in ruby's OpenSSL implementation.
+ */
+VALUE
 ossl_get_errors()
 {
     VALUE ary;
@@ -334,7 +360,7 @@ void
 ossl_debug(const char *fmt, ...)
 {
     va_list args;
-	
+
     if (dOSSL == Qtrue) {
 	fprintf(stderr, "OSSL_DEBUG: ");
 	va_start(args, fmt);
@@ -345,18 +371,29 @@ ossl_debug(const char *fmt, ...)
 }
 #endif
 
+/*
+ * call-seq:
+ *   OpenSSL.debug -> true | false
+ */
 static VALUE
 ossl_debug_get(VALUE self)
 {
     return dOSSL;
 }
 
+/*
+ * call-seq:
+ *   OpenSSL.debug = boolean -> boolean
+ *
+ * Turns on or off CRYPTO_MEM_CHECK.
+ * Also shows some debugging message on stderr.
+ */
 static VALUE
 ossl_debug_set(VALUE self, VALUE val)
 {
     VALUE old = dOSSL;
     dOSSL = val;
-	
+
     if (old != dOSSL) {
 	if (dOSSL == Qtrue) {
 	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
@@ -427,8 +464,8 @@ Init_openssl()
     /*
      * Verify callback Proc index for ext-data
      */
-    ossl_verify_cb_idx =
-	X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0);
+    if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_verify_cb_idx", 0, 0, 0)) < 0)
+        ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
 
     /*
      * Init debug core
@@ -454,6 +491,7 @@ Init_openssl()
     Init_ossl_ns_spki();
     Init_ossl_pkcs12();
     Init_ossl_pkcs7();
+    Init_ossl_pkcs5();
     Init_ossl_pkey();
     Init_ossl_rand();
     Init_ossl_ssl();
@@ -468,7 +506,7 @@ Init_openssl()
  * Check if all symbols are OK with 'make LDSHARED=gcc all'
  */
 int
-main(int argc, char *argv[], char *env[])
+main(int argc, char *argv[])
 {
     return 0;
 }
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 598bfb69da..1a5b263124 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -17,6 +17,11 @@
 extern "C" {
 #endif
 
+#if 0
+  mOSSL = rb_define_module("OpenSSL");
+  mX509 = rb_define_module_under(mOSSL, "X509");
+#endif
+
 /*
 * OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
 */
@@ -24,7 +29,7 @@ extern "C" {
 #  undef RFILE
 #endif
 #include <ruby.h>
-#include <rubyio.h>
+#include <ruby/io.h>
 
 /*
  * Check the OpenSSL version
@@ -40,8 +45,11 @@ extern "C" {
 #endif
 
 #if defined(_WIN32)
-#  define OpenFile WINAPI_OpenFile
 #  define OSSL_NO_CONF_API 1
+#  if !defined(OPENSSL_SYS_WIN32)
+#    define OPENSSL_SYS_WIN32 1
+#  endif
+#  include <winsock2.h>
 #endif
 #include <errno.h>
 #include <openssl/err.h>
@@ -64,9 +72,6 @@ extern "C" {
 #  define OSSL_OCSP_ENABLED
 #  include <openssl/ocsp.h>
 #endif
-#if defined(_WIN32)
-#  undef OpenFile
-#endif
 
 /*
  * Common Module
@@ -102,9 +107,16 @@ extern VALUE eOSSLError;
 } while (0)
 
 /*
+ * Compatibility
+ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
+
+/*
  * String to HEXString conversion
  */
-int string2hex(char *, int, char **, int *);
+int string2hex(const unsigned char *, int, char **, int *);
 
 /*
  * Data Conversion
@@ -117,11 +129,10 @@ VALUE ossl_x509crl_sk2ary(STACK_OF(X509_CRL) *crl);
 VALUE ossl_buf2str(char *buf, int len);
 #define ossl_str_adjust(str, p) \
 do{\
-    int len = RSTRING(str)->len;\
-    int newlen = (p) - (unsigned char*)RSTRING(str)->ptr;\
+    int len = RSTRING_LEN(str);\
+    int newlen = (p) - (unsigned char*)RSTRING_PTR(str);\
     assert(newlen <= len);\
-    RSTRING(str)->len = newlen;\
-    RSTRING(str)->ptr[newlen] = 0;\
+    rb_str_set_len(str, newlen);\
 }while(0)
 
 /*
@@ -134,6 +145,7 @@ int ossl_pem_passwd_cb(char *, int, int, void *);
  */
 #define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
 NORETURN(void ossl_raise(VALUE, const char *, ...));
+VALUE ossl_exc_new(VALUE, const char *, ...);
 
 /*
  * Verify callback
@@ -162,10 +174,10 @@ VALUE ossl_to_der_if_possible(VALUE);
 extern VALUE dOSSL;
 
 #if defined(HAVE_VA_ARGS_MACRO)
-#define OSSL_Debug(fmt, ...) do { \
+#define OSSL_Debug(...) do { \
   if (dOSSL == Qtrue) { \
     fprintf(stderr, "OSSL_DEBUG: "); \
-    fprintf(stderr, fmt, ##__VA_ARGS__); \
+    fprintf(stderr, __VA_ARGS__); \
     fprintf(stderr, " [%s:%d]\n", __FILE__, __LINE__); \
   } \
 } while (0)
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 3614f470d9..a9ab7e38ce 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -27,16 +27,16 @@ asn1time_to_time(ASN1_TIME *time)
 {
     struct tm tm;
     VALUE argv[6];
-    
+
     if (!time || !time->data) return Qnil;
     memset(&tm, 0, sizeof(struct tm));
-	
+
     switch (time->type) {
     case V_ASN1_UTCTIME:
-	if (sscanf(time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+	if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
     		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
 	    ossl_raise(rb_eTypeError, "bad UTCTIME format");
-	} 
+	}
 	if (tm.tm_year < 69) {
 	    tm.tm_year += 2000;
 	} else {
@@ -44,10 +44,10 @@ asn1time_to_time(ASN1_TIME *time)
 	}
 	break;
     case V_ASN1_GENERALIZEDTIME:
-	if (sscanf(time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+	if (sscanf((const char *)time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
     		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
 	    ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
-	} 
+	}
 	break;
     default:
 	rb_warning("unknown time format");
@@ -80,7 +80,7 @@ time_to_time_t(VALUE time)
 VALUE
 asn1str_to_str(ASN1_STRING *str)
 {
-    return rb_str_new(str->data, str->length);
+    return rb_str_new((const char *)str->data, str->length);
 }
 
 /*
@@ -144,7 +144,7 @@ ASN1_INTEGER *
 num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 {
     BIGNUM *bn = GetBNPtr(obj);
-    
+
     if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
 	ossl_raise(eOSSLError, NULL);
     }
@@ -196,7 +196,11 @@ static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
 static ASN1_BOOLEAN
 obj_to_asn1bool(VALUE obj)
 {
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
      return RTEST(obj) ? 0xff : 0x100;
+#else
+     return RTEST(obj) ? 0xff : 0x0;
+#endif
 }
 
 static ASN1_INTEGER*
@@ -214,7 +218,7 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
     StringValue(obj);
     if(!(bstr = ASN1_BIT_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_BIT_STRING_set(bstr, RSTRING(obj)->ptr, RSTRING(obj)->len);
+    ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LEN(obj));
     bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
     bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
 
@@ -229,7 +233,7 @@ obj_to_asn1str(VALUE obj)
     StringValue(obj);
     if(!(str = ASN1_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_STRING_set(str, RSTRING(obj)->ptr, RSTRING(obj)->len);
+    ASN1_STRING_set(str, RSTRING_PTR(obj), RSTRING_LEN(obj));
 
     return str;
 }
@@ -253,8 +257,8 @@ obj_to_asn1obj(VALUE obj)
     ASN1_OBJECT *a1obj;
 
     StringValue(obj);
-    a1obj = OBJ_txt2obj(RSTRING(obj)->ptr, 0);
-    if(!a1obj) a1obj = OBJ_txt2obj(RSTRING(obj)->ptr, 1);
+    a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 0);
+    if(!a1obj) a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 1);
     if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID");
 
     return a1obj;
@@ -295,7 +299,7 @@ obj_to_asn1derstr(VALUE obj)
     str = ossl_to_der(obj);
     if(!(a1str = ASN1_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_STRING_set(a1str, RSTRING(str)->ptr, RSTRING(str)->len);
+    ASN1_STRING_set(a1str, RSTRING_PTR(str), RSTRING_LEN(str));
 
     return a1str;
 }
@@ -306,22 +310,22 @@ obj_to_asn1derstr(VALUE obj)
 static VALUE
 decode_bool(unsigned char* der, int length)
 {
-    int bool;
-    unsigned char *p;
+    int val;
+    const unsigned char *p;
 
     p = der;
-    if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
+    if((val = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
 	ossl_raise(eASN1Error, NULL);
 
-    return bool ? Qtrue : Qfalse;
+    return val ? Qtrue : Qfalse;
 }
 
 static VALUE
 decode_int(unsigned char* der, int length)
 {
     ASN1_INTEGER *ai;
-    unsigned char *p;
-    VALUE ret; 
+    const unsigned char *p;
+    VALUE ret;
     int status = 0;
 
     p = der;
@@ -339,7 +343,7 @@ static VALUE
 decode_bstr(unsigned char* der, int length, long *unused_bits)
 {
     ASN1_BIT_STRING *bstr;
-    unsigned char *p, *buf;
+    const unsigned char *p;
     long len;
     VALUE ret;
 
@@ -347,16 +351,11 @@ decode_bstr(unsigned char* der, int length, long *unused_bits)
     if(!(bstr = d2i_ASN1_BIT_STRING(NULL, &p, length)))
 	ossl_raise(eASN1Error, NULL);
     len = bstr->length;
-    if(!(buf = OPENSSL_malloc(len))){
-	ASN1_BIT_STRING_free(bstr);
-	ossl_raise(eASN1Error, NULL);
-    }
     *unused_bits = 0;
     if(bstr->flags & ASN1_STRING_FLAG_BITS_LEFT)
 	*unused_bits = bstr->flags & 0x07;
-    memcpy(buf, bstr->data, len);
+    ret = rb_str_new((const char *)bstr->data, len);
     ASN1_BIT_STRING_free(bstr);
-    ret = ossl_buf2str(buf, len);
 
     return ret;
 }
@@ -365,8 +364,8 @@ static VALUE
 decode_enum(unsigned char* der, int length)
 {
     ASN1_ENUMERATED *ai;
-    unsigned char *p;
-    VALUE ret; 
+    const unsigned char *p;
+    VALUE ret;
     int status = 0;
 
     p = der;
@@ -384,7 +383,7 @@ static VALUE
 decode_null(unsigned char* der, int length)
 {
     ASN1_NULL *null;
-    unsigned char *p;
+    const unsigned char *p;
 
     p = der;
     if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
@@ -398,7 +397,7 @@ static VALUE
 decode_obj(unsigned char* der, int length)
 {
     ASN1_OBJECT *obj;
-    unsigned char *p;
+    const unsigned char *p;
     VALUE ret;
     int nid;
     BIO *bio;
@@ -427,7 +426,7 @@ static VALUE
 decode_time(unsigned char* der, int length)
 {
     ASN1_TIME *time;
-    unsigned char *p;
+    const unsigned char *p;
     VALUE ret;
     int status = 0;
 
@@ -445,7 +444,7 @@ decode_time(unsigned char* der, int length)
 /********/
 
 typedef struct {
-    char *name;
+    const char *name;
     VALUE *klass;
 } ossl_asn1_info_t;
 
@@ -500,7 +499,7 @@ ossl_asn1_get_asn1type(VALUE obj)
     value = ossl_asn1_get_value(obj);
     switch(tag){
     case V_ASN1_BOOLEAN:
-	ptr = (void*)obj_to_asn1bool(value);
+	ptr = (void*)(VALUE)obj_to_asn1bool(value);
 	free_func = NULL;
 	break;
     case V_ASN1_INTEGER:         /* FALLTHROUGH */
@@ -529,7 +528,7 @@ ossl_asn1_get_asn1type(VALUE obj)
     case V_ASN1_ISO64STRING:     /* FALLTHROUGH */
     case V_ASN1_GENERALSTRING:   /* FALLTHROUGH */
     case V_ASN1_UNIVERSALSTRING: /* FALLTHROUGH */
-    case V_ASN1_BMPSTRING:   
+    case V_ASN1_BMPSTRING:
 	ptr = obj_to_asn1str(value);
 	free_func = ASN1_STRING_free;
 	break;
@@ -665,8 +664,8 @@ ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
     return self;
 }
 
-static VALUE 
-join_der_i(VALUE i, VALUE str) 
+static VALUE
+join_der_i(VALUE i, VALUE str)
 {
     i = ossl_to_der_if_possible(i);
     StringValue(i);
@@ -678,7 +677,7 @@ static VALUE
 join_der(VALUE enumerable)
 {
     VALUE str = rb_str_new(0, 0);
-    rb_iterate(rb_each, enumerable, join_der_i, str);
+    rb_block_call(enumerable, rb_intern("each"), 0, 0, join_der_i, str);
     return str;
 }
 
@@ -699,13 +698,13 @@ ossl_asn1data_to_der(VALUE self)
 
     tag = ossl_asn1_tag(self);
     tag_class = ossl_asn1_tag_class(self);
-    if((length = ASN1_object_size(1, RSTRING(value)->len, tag)) <= 0)
+    if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0)
 	ossl_raise(eASN1Error, NULL);
     der = rb_str_new(0, length);
-    p = RSTRING(der)->ptr;
-    ASN1_put_object(&p, is_cons, RSTRING(value)->len, tag, tag_class);
-    memcpy(p, RSTRING(value)->ptr, RSTRING(value)->len);
-    p += RSTRING(value)->len;
+    p = (unsigned char *)RSTRING_PTR(der);
+    ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
+    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
+    p += RSTRING_LEN(value);
     ossl_str_adjust(der, p);
 
     return der;
@@ -716,6 +715,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
 		  int once, int yield)
 {
     unsigned char *start, *p;
+    const unsigned char *p0;
     long len, off = *offset;
     int hlen, tag, tc, j;
     VALUE ary, asn1data, value, tag_class;
@@ -724,7 +724,9 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
     p = *pp;
     while(length > 0){
 	start = p;
-	j = ASN1_get_object(&p, &len, &tag, &tc, length);
+	p0 = p;
+	j = ASN1_get_object(&p0, &len, &tag, &tc, length);
+	p = (unsigned char *)p0;
 	if(j & 0x80) ossl_raise(eASN1Error, NULL);
 	hlen = p - start;
 	if(yield){
@@ -739,7 +741,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
 	    rb_yield(arg);
 	}
 	length -= hlen;
-	off += hlen; 
+	off += hlen;
 	if(len > length) ossl_raise(eASN1Error, "value is too short");
 	if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
 	    tag_class = sPRIVATE;
@@ -759,7 +761,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
 	    else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
 	}
 	else{
-	    value = rb_str_new(p, len);
+	    value = rb_str_new((const char *)p, len);
 	    p += len;
 	    off += len;
 	}
@@ -824,8 +826,8 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING(tmp)->ptr;
-    ossl_asn1_decode0(&p, RSTRING(tmp)->len, &offset, 0, 0, 1);
+    p = (unsigned char *)RSTRING_PTR(tmp);
+    ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
 
     return Qnil;
 }
@@ -840,8 +842,8 @@ ossl_asn1_decode(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING(tmp)->ptr;
-    ary = ossl_asn1_decode0(&p, RSTRING(tmp)->len, &offset, 0, 1, 0);
+    p = (unsigned char *)RSTRING_PTR(tmp);
+    ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
     ret = rb_ary_entry(ary, 0);
 
     return ret;
@@ -857,8 +859,8 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING(tmp)->ptr;
-    ret = ossl_asn1_decode0(&p, RSTRING(tmp)->len, &offset, 0, 0, 0);
+    p = (unsigned char *)RSTRING_PTR(tmp);
+    ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
 
     return ret;
 }
@@ -925,7 +927,7 @@ ossl_asn1prim_to_der(VALUE self)
 {
     ASN1_TYPE *asn1;
     int tn, tc, explicit;
-    long length, reallen;
+    long len, reallen;
     unsigned char *buf, *p;
     VALUE str;
 
@@ -934,27 +936,25 @@ ossl_asn1prim_to_der(VALUE self)
     explicit = ossl_asn1_is_explicit(self);
     asn1 = ossl_asn1_get_asn1type(self);
 
-    length = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
-    if(!(buf = OPENSSL_malloc(length))){
+    len = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
+    if(!(buf = OPENSSL_malloc(len))){
 	ossl_ASN1_TYPE_free(asn1);
 	ossl_raise(eASN1Error, "cannot alloc buffer");
     }
     p = buf;
-    if(tc == V_ASN1_UNIVERSAL) ossl_i2d_ASN1_TYPE(asn1, &p);
-    else{
-	if(explicit){
-	    ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
-	    ossl_i2d_ASN1_TYPE(asn1, &p);
-	}
-	else{
-	    ossl_i2d_ASN1_TYPE(asn1, &p);
-	    *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
-	}
+    if (tc == V_ASN1_UNIVERSAL) {
+        ossl_i2d_ASN1_TYPE(asn1, &p);
+    } else if (explicit) {
+        ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
+        ossl_i2d_ASN1_TYPE(asn1, &p);
+    } else {
+        ossl_i2d_ASN1_TYPE(asn1, &p);
+        *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
     }
     ossl_ASN1_TYPE_free(asn1);
     reallen = p - buf;
-    assert(reallen <= length);
-    str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
+    assert(reallen <= len);
+    str = ossl_buf2str((char *)buf, reallen); /* buf will be free in ossl_buf2str */
 
     return str;
 }
@@ -973,21 +973,21 @@ ossl_asn1cons_to_der(VALUE self)
     explicit = ossl_asn1_is_explicit(self);
     value = join_der(ossl_asn1_get_value(self));
 
-    seq_len = ASN1_object_size(1, RSTRING(value)->len, tag);
+    seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag);
     length = ASN1_object_size(1, seq_len, tn);
     str = rb_str_new(0, length);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(tc == V_ASN1_UNIVERSAL)
-	ASN1_put_object(&p, 1, RSTRING(value)->len, tn, tc);
+	ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
     else{
 	if(explicit){
 	    ASN1_put_object(&p, 1, seq_len, tn, tc);
-	    ASN1_put_object(&p, 1, RSTRING(value)->len, tag, V_ASN1_UNIVERSAL);
+	    ASN1_put_object(&p, 1, RSTRING_LEN(value), tag, V_ASN1_UNIVERSAL);
 	}
-	else ASN1_put_object(&p, 1, RSTRING(value)->len, tn, tc);
+	else ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
     }
-    memcpy(p, RSTRING(value)->ptr, RSTRING(value)->len);
-    p += RSTRING(value)->len;
+    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
+    p += RSTRING_LEN(value);
     ossl_str_adjust(str, p);
 
     return str;
@@ -1007,7 +1007,7 @@ ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
     StringValue(sn);
     StringValue(ln);
 
-    if(!OBJ_create(RSTRING(oid)->ptr, RSTRING(sn)->ptr, RSTRING(ln)->ptr))
+    if(!OBJ_create(RSTRING_PTR(oid), RSTRING_PTR(sn), RSTRING_PTR(ln)))
 	ossl_raise(eASN1Error, NULL);
 
     return Qtrue;
@@ -1112,9 +1112,9 @@ Init_ossl_asn1()
     }
 
     cASN1Data = rb_define_class_under(mASN1, "ASN1Data", rb_cObject);
-    rb_attr(cASN1Data, rb_intern("value"), 1, 1, Qtrue);
-    rb_attr(cASN1Data, rb_intern("tag"), 1, 1, Qtrue);
-    rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, Qtrue);
+    rb_attr(cASN1Data, rb_intern("value"), 1, 1, 0);
+    rb_attr(cASN1Data, rb_intern("tag"), 1, 1, 0);
+    rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, 0);
     rb_define_method(cASN1Data, "initialize", ossl_asn1data_initialize, 3);
     rb_define_method(cASN1Data, "to_der", ossl_asn1data_to_der, 0);
 
@@ -1166,5 +1166,5 @@ do{\
     rb_define_method(cASN1ObjectId, "oid", ossl_asn1obj_get_oid, 0);
     rb_define_alias(cASN1ObjectId, "short_name", "sn");
     rb_define_alias(cASN1ObjectId, "long_name", "ln");
-    rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, Qtrue);
+    rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, 0);
 }
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h
index 8aad9f970d..718f43f068 100644
--- a/ext/openssl/ossl_asn1.h
+++ b/ext/openssl/ossl_asn1.h
@@ -32,12 +32,12 @@ ASN1_INTEGER *num_to_asn1integer(VALUE, ASN1_INTEGER *);
  * ASN1 module
  */
 extern VALUE mASN1;
-extern VALUE eASN1Error;  
+extern VALUE eASN1Error;
 
 extern VALUE cASN1Data;
 extern VALUE cASN1Primitive;
 extern VALUE cASN1Constructive;
- 
+
 extern VALUE cASN1Boolean;                           /* BOOLEAN           */
 extern VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
 extern VALUE cASN1BitString;                         /* BIT STRING        */
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index 9c9aa24197..dc8732d9d9 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -19,16 +19,29 @@ ossl_obj2bio(VALUE obj)
     BIO *bio;
 
     if (TYPE(obj) == T_FILE) {
-	OpenFile *fptr;
+	rb_io_t *fptr;
+	FILE *fp;
+	int fd;
+
 	GetOpenFile(obj, fptr);
 	rb_io_check_readable(fptr);
-	bio = BIO_new_fp(fptr->f, BIO_NOCLOSE);
-    }       
+	if ((fd = dup(FPTR_TO_FD(fptr))) < 0){
+	    rb_sys_fail(0);
+	}
+	if (!(fp = fdopen(fd, "r"))){
+	    close(fd);
+	    rb_sys_fail(0);
+	}
+	if (!(bio = BIO_new_fp(fp, BIO_CLOSE))){
+	    fclose(fp);
+	    ossl_raise(eOSSLError, NULL);
+	}
+    }
     else {
 	StringValue(obj);
-	bio = BIO_new_mem_buf(RSTRING(obj)->ptr, RSTRING(obj)->len);
+	bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LEN(obj));
+	if (!bio) ossl_raise(eOSSLError, NULL);
     }
-    if (!bio) ossl_raise(eOSSLError, NULL);
 
     return bio;
 }
@@ -59,7 +72,7 @@ ossl_protect_membio2str(BIO *bio, int *status)
     return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
 }
 
-VALUE 
+VALUE
 ossl_membio2str(BIO *bio)
 {
     VALUE ret;
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index cc7689eef5..6adc59fc1a 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -40,7 +40,7 @@ VALUE eBNError;
  * Public
  */
 VALUE
-ossl_bn_new(BIGNUM *bn)
+ossl_bn_new(const BIGNUM *bn)
 {
     BIGNUM *newbn;
     VALUE obj;
@@ -91,7 +91,7 @@ ossl_bn_alloc(VALUE klass)
 {
     BIGNUM *bn;
     VALUE obj;
-	
+
     if (!(bn = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
@@ -100,6 +100,13 @@ ossl_bn_alloc(VALUE klass)
     return obj;
 }
 
+/*
+ * call-seq:
+ *    BN.new => aBN
+ *    BN.new(bn) => aBN
+ *    BN.new(string) => aBN
+ *    BN.new(string, 0 | 2 | 10 | 16) => aBN
+ */
 static VALUE
 ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -124,31 +131,44 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 
     switch (base) {
     case 0:
-	if (!BN_mpi2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
+	if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 2:
-	if (!BN_bin2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
+	if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 10:
-	if (!BN_dec2bn(&bn, RSTRING(str)->ptr)) {
+	if (!BN_dec2bn(&bn, RSTRING_PTR(str))) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 16:
-	if (!BN_hex2bn(&bn, RSTRING(str)->ptr)) {
+	if (!BN_hex2bn(&bn, RSTRING_PTR(str))) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     default:
-	ossl_raise(rb_eArgError, "illegal radix %d", base);
+	ossl_raise(rb_eArgError, "invalid radix %d", base);
     }
     return self;
 }
 
+/*
+ * call-seq:
+ *    bn.to_s => string
+ *    bn.to_s(base) => string
+ *
+ * === Parameters
+ * * +base+ - integer
+ * * * Valid values:
+ * * * * 0 - MPI
+ * * * * 2 - binary
+ * * * * 10 - the default
+ * * * * 16 - hex
+ */
 static VALUE
 ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
 {
@@ -165,13 +185,13 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
     case 0:
 	len = BN_bn2mpi(bn, NULL);
         str = rb_str_new(0, len);
-	if (BN_bn2mpi(bn, RSTRING(str)->ptr) != len)
+	if (BN_bn2mpi(bn, (unsigned char *)RSTRING_PTR(str)) != len)
 	    ossl_raise(eBNError, NULL);
 	break;
     case 2:
 	len = BN_num_bytes(bn);
         str = rb_str_new(0, len);
-	if (BN_bn2bin(bn, RSTRING(str)->ptr) != len)
+	if (BN_bn2bin(bn, (unsigned char *)RSTRING_PTR(str)) != len)
 	    ossl_raise(eBNError, NULL);
 	break;
     case 10:
@@ -183,12 +203,16 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
 	str = ossl_buf2str(buf, strlen(buf));
 	break;
     default:
-	ossl_raise(rb_eArgError, "illegal radix %d", base);
+	ossl_raise(rb_eArgError, "invalid radix %d", base);
     }
 
     return str;
 }
 
+/*
+ * call-seq:
+ *    bn.to_i => integer
+ */
 static VALUE
 ossl_bn_to_i(VALUE self)
 {
@@ -233,6 +257,11 @@ ossl_bn_coerce(VALUE self, VALUE other)
 }
 
 #define BIGNUM_BOOL1(func)				\
+    /*							\
+     * call-seq:					\
+     *   bn.##func -> true | false			\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self)				\
     {							\
@@ -243,11 +272,16 @@ ossl_bn_coerce(VALUE self, VALUE other)
 	}						\
 	return Qfalse;					\
     }
-BIGNUM_BOOL1(is_zero);
-BIGNUM_BOOL1(is_one);
-BIGNUM_BOOL1(is_odd);
+BIGNUM_BOOL1(is_zero)
+BIGNUM_BOOL1(is_one)
+BIGNUM_BOOL1(is_odd)
 
 #define BIGNUM_1c(func)					\
+    /*							\
+     * call-seq:					\
+     *   bn.##func -> aBN				\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self)				\
     {							\
@@ -264,9 +298,14 @@ BIGNUM_BOOL1(is_odd);
 	WrapBN(CLASS_OF(self), obj, result);		\
 	return obj;					\
     }
-BIGNUM_1c(sqr);
+BIGNUM_1c(sqr)
 
 #define BIGNUM_2(func)					\
+    /*							\
+     * call-seq:					\
+     *   bn.##func(bn2) -> aBN				\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE other)		\
     {							\
@@ -283,10 +322,15 @@ BIGNUM_1c(sqr);
 	WrapBN(CLASS_OF(self), obj, result);		\
 	return obj;					\
     }
-BIGNUM_2(add);
-BIGNUM_2(sub);
+BIGNUM_2(add)
+BIGNUM_2(sub)
 
 #define BIGNUM_2c(func)						\
+    /*								\
+     * call-seq:						\
+     *   bn.##func(bn2) -> aBN					\
+     *								\
+     */								\
     static VALUE						\
     ossl_bn_##func(VALUE self, VALUE other)			\
     {								\
@@ -303,13 +347,17 @@ BIGNUM_2(sub);
 	WrapBN(CLASS_OF(self), obj, result);			\
 	return obj;						\
     }
-BIGNUM_2c(mul);
-BIGNUM_2c(mod);
-BIGNUM_2c(exp);
-BIGNUM_2c(gcd);
-BIGNUM_2c(mod_sqr);
-BIGNUM_2c(mod_inverse);
+BIGNUM_2c(mul)
+BIGNUM_2c(mod)
+BIGNUM_2c(exp)
+BIGNUM_2c(gcd)
+BIGNUM_2c(mod_sqr)
+BIGNUM_2c(mod_inverse)
 
+/*
+ * call-seq:
+ *    bn1 / bn2 => [result, remainder]
+ */
 static VALUE
 ossl_bn_div(VALUE self, VALUE other)
 {
@@ -332,11 +380,16 @@ ossl_bn_div(VALUE self, VALUE other)
     }
     WrapBN(CLASS_OF(self), obj1, r1);
     WrapBN(CLASS_OF(self), obj2, r2);
-    
+
     return rb_ary_new3(2, obj1, obj2);
 }
 
 #define BIGNUM_3c(func)						\
+    /*								\
+     * call-seq:						\
+     *   bn.##func(bn1, bn2) -> aBN				\
+     *								\
+     */								\
     static VALUE						\
     ossl_bn_##func(VALUE self, VALUE other1, VALUE other2)	\
     {								\
@@ -354,12 +407,17 @@ ossl_bn_div(VALUE self, VALUE other)
 	WrapBN(CLASS_OF(self), obj, result);			\
 	return obj;						\
     }
-BIGNUM_3c(mod_add);
-BIGNUM_3c(mod_sub);
-BIGNUM_3c(mod_mul);
-BIGNUM_3c(mod_exp);
+BIGNUM_3c(mod_add)
+BIGNUM_3c(mod_sub)
+BIGNUM_3c(mod_mul)
+BIGNUM_3c(mod_exp)
 
 #define BIGNUM_BIT(func)				\
+    /*							\
+     * call-seq:					\
+     *   bn.##func(bit) -> self				\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE bit)		\
     {							\
@@ -370,10 +428,14 @@ BIGNUM_3c(mod_exp);
 	}						\
 	return self;					\
     }
-BIGNUM_BIT(set_bit);
-BIGNUM_BIT(clear_bit);
-BIGNUM_BIT(mask_bits);
+BIGNUM_BIT(set_bit)
+BIGNUM_BIT(clear_bit)
+BIGNUM_BIT(mask_bits)
 
+/*
+ * call-seq:
+ *    bn.bit_set?(bit) => true | false
+ */
 static VALUE
 ossl_bn_is_bit_set(VALUE self, VALUE bit)
 {
@@ -389,6 +451,11 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 }
 
 #define BIGNUM_SHIFT(func)				\
+    /*							\
+     * call-seq:					\
+     *   bn.##func(bits) -> aBN				\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE bits)		\
     {							\
@@ -407,10 +474,35 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 	WrapBN(CLASS_OF(self), obj, result);		\
 	return obj;					\
     }
-BIGNUM_SHIFT(lshift);
-BIGNUM_SHIFT(rshift);
+BIGNUM_SHIFT(lshift)
+BIGNUM_SHIFT(rshift)
+
+#define BIGNUM_SELF_SHIFT(func)				\
+    /*							\
+     * call-seq:					\
+     *   bn.##func!(bits) -> self			\
+     *							\
+     */							\
+    static VALUE					\
+    ossl_bn_self_##func(VALUE self, VALUE bits)		\
+    {							\
+	BIGNUM *bn;					\
+	int b;						\
+	b = NUM2INT(bits);				\
+	GetBN(self, bn);				\
+	if (!BN_##func(bn, bn, b))			\
+		ossl_raise(eBNError, NULL);		\
+	return self;					\
+    }
+BIGNUM_SELF_SHIFT(lshift)
+BIGNUM_SELF_SHIFT(rshift)
 
 #define BIGNUM_RAND(func)					\
+    /*								\
+     * call-seq:						\
+     *   BN.##func(bits [, fill [, odd]]) -> aBN		\
+     *								\
+     */								\
     static VALUE						\
     ossl_bn_s_##func(int argc, VALUE *argv, VALUE klass)	\
     {								\
@@ -423,7 +515,7 @@ BIGNUM_SHIFT(rshift);
 	    bottom = (odd == Qtrue) ? 1 : 0;			\
 	    /* FALLTHROUGH */					\
 	case 2:							\
-	    top = FIX2INT(fill);				\
+	    top = NUM2INT(fill);				\
 	}							\
 	b = NUM2INT(bits);					\
 	if (!(result = BN_new())) {				\
@@ -436,10 +528,15 @@ BIGNUM_SHIFT(rshift);
 	WrapBN(klass, obj, result);				\
 	return obj;						\
     }
-BIGNUM_RAND(rand);
-BIGNUM_RAND(pseudo_rand);
+BIGNUM_RAND(rand)
+BIGNUM_RAND(pseudo_rand)
 
 #define BIGNUM_RAND_RANGE(func)					\
+    /*								\
+     * call-seq:						\
+     *   BN.##func(range) -> aBN				\
+     *								\
+     */								\
     static VALUE						\
     ossl_bn_s_##func##_range(VALUE klass, VALUE range)		\
     {								\
@@ -455,9 +552,19 @@ BIGNUM_RAND(pseudo_rand);
 	WrapBN(klass, obj, result);				\
 	return obj;						\
     }
-BIGNUM_RAND_RANGE(rand);
-BIGNUM_RAND_RANGE(pseudo_rand);
+BIGNUM_RAND_RANGE(rand)
+BIGNUM_RAND_RANGE(pseudo_rand)
 
+/*
+ * call-seq:
+ *    BN.generate_prime(bits, [, safe [, add [, rem]]]) => bn
+ *
+ * === Parameters
+ * * +bits+ - integer
+ * * +safe+ - boolean
+ * * +add+ - BN
+ * * +rem+ - BN
+ */
 static VALUE
 ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
 {
@@ -466,19 +573,15 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
     VALUE vnum, vsafe, vadd, vrem, obj;
 
     rb_scan_args(argc, argv, "13", &vnum, &vsafe, &vadd, &vrem);
-	
+
     num = NUM2INT(vnum);
 
     if (vsafe == Qfalse) {
 	safe = 0;
     }
     if (!NIL_P(vadd)) {
-	if (NIL_P(vrem)) {
-	    ossl_raise(rb_eArgError,
-		       "if ADD is specified, REM must be also given");
-	}
 	add = GetBNPtr(vadd);
-	rem = GetBNPtr(vrem);
+	rem = NIL_P(vrem) ? NULL : GetBNPtr(vrem);
     }
     if (!(result = BN_new())) {
 	ossl_raise(eBNError, NULL);
@@ -488,11 +591,16 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
 	ossl_raise(eBNError, NULL);
     }
     WrapBN(klass, obj, result);
-    
-	return obj;
+
+    return obj;
 }
 
 #define BIGNUM_NUM(func)			\
+    /*							\
+     * call-seq:					\
+     *   bn.##func -> integer				\
+     *							\
+     */							\
     static VALUE 				\
     ossl_bn_##func(VALUE self)			\
     {						\
@@ -500,21 +608,21 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
 	GetBN(self, bn);			\
 	return INT2FIX(BN_##func(bn));		\
     }
-BIGNUM_NUM(num_bytes);
-BIGNUM_NUM(num_bits);
+BIGNUM_NUM(num_bytes)
+BIGNUM_NUM(num_bits)
 
 static VALUE
 ossl_bn_copy(VALUE self, VALUE other)
 {
     BIGNUM *bn1, *bn2;
-    
+
     rb_check_frozen(self);
-    
+
     if (self == other) return self;
-    
+
     GetBN(self, bn1);
     bn2 = GetBNPtr(other);
-    
+
     if (!BN_copy(bn1, bn2)) {
 	ossl_raise(eBNError, NULL);
     }
@@ -522,6 +630,11 @@ ossl_bn_copy(VALUE self, VALUE other)
 }
 
 #define BIGNUM_CMP(func)				\
+    /*							\
+     * call-seq:					\
+     *   bn.##func(bn2) -> integer			\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE other)		\
     {							\
@@ -529,8 +642,8 @@ ossl_bn_copy(VALUE self, VALUE other)
 	GetBN(self, bn1);				\
 	return INT2FIX(BN_##func(bn1, bn2));		\
     }
-BIGNUM_CMP(cmp);
-BIGNUM_CMP(ucmp);
+BIGNUM_CMP(cmp)
+BIGNUM_CMP(ucmp)
 
 static VALUE
 ossl_bn_eql(VALUE self, VALUE other)
@@ -541,6 +654,14 @@ ossl_bn_eql(VALUE self, VALUE other)
     return Qfalse;
 }
 
+/*
+ * call-seq:
+ *    bn.prime? => true | false
+ *    bn.prime?(checks) => true | false
+ *
+ * === Parameters
+ * * +checks+ - integer
+ */
 static VALUE
 ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
 {
@@ -548,7 +669,7 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
     VALUE vchecks;
     int checks = BN_prime_checks;
 
-    if (rb_scan_args(argc, argv, "01", &vchecks) == 0) {
+    if (rb_scan_args(argc, argv, "01", &vchecks) == 1) {
 	checks = NUM2INT(vchecks);
     }
     GetBN(self, bn);
@@ -564,6 +685,16 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *    bn.prime_fasttest? => true | false
+ *    bn.prime_fasttest?(checks) => true | false
+ *    bn.prime_fasttest?(checks, trial_div) => true | false
+ *
+ * === Parameters
+ * * +checks+ - integer
+ * * +trial_div+ - boolean
+ */
 static VALUE
 ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
 {
@@ -614,7 +745,7 @@ Init_ossl_bn()
 
     rb_define_alloc_func(cBN, ossl_bn_alloc);
     rb_define_method(cBN, "initialize", ossl_bn_initialize, -1);
-	
+
     rb_define_copy_func(cBN, ossl_bn_copy);
     rb_define_method(cBN, "copy", ossl_bn_copy, 1);
 
@@ -662,7 +793,7 @@ Init_ossl_bn()
      * value_one - DON'T IMPL.
      * set_word
      * get_word */
-    
+
     rb_define_singleton_method(cBN, "rand", ossl_bn_s_rand, -1);
     rb_define_singleton_method(cBN, "pseudo_rand", ossl_bn_s_pseudo_rand, -1);
     rb_define_singleton_method(cBN, "rand_range", ossl_bn_s_rand_range, 1);
@@ -676,8 +807,10 @@ Init_ossl_bn()
     rb_define_method(cBN, "bit_set?", ossl_bn_is_bit_set, 1);
     rb_define_method(cBN, "mask_bits!", ossl_bn_mask_bits, 1);
     rb_define_method(cBN, "<<", ossl_bn_lshift, 1);
-    /* lshift1 - DON'T IMPL. */
     rb_define_method(cBN, ">>", ossl_bn_rshift, 1);
+    rb_define_method(cBN, "lshift!", ossl_bn_self_lshift, 1);
+    rb_define_method(cBN, "rshift!", ossl_bn_self_rshift, 1);
+    /* lshift1 - DON'T IMPL. */
     /* rshift1 - DON'T IMPL. */
 
     /*
@@ -697,7 +830,7 @@ Init_ossl_bn()
     rb_define_alias(cBN, "to_int", "to_i");
     rb_define_method(cBN, "to_bn", ossl_bn_to_bn, 0);
     rb_define_method(cBN, "coerce", ossl_bn_coerce, 1);
-	
+
     /*
      * TODO:
      * But how to: from_bin, from_mpi? PACK?
diff --git a/ext/openssl/ossl_bn.h b/ext/openssl/ossl_bn.h
index 12aa484873..d6c396227b 100644
--- a/ext/openssl/ossl_bn.h
+++ b/ext/openssl/ossl_bn.h
@@ -14,9 +14,12 @@
 extern VALUE cBN;
 extern VALUE eBNError;
 
-VALUE ossl_bn_new(BIGNUM *);
+extern BN_CTX *ossl_bn_ctx;
+
+VALUE ossl_bn_new(const BIGNUM *);
 BIGNUM *GetBNPtr(VALUE);
 void Init_ossl_bn(void);
 
+
 #endif /* _OSS_BN_H_ */
 
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 57b7976617..41dc6b7e3e 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -26,7 +26,6 @@
 /*
  * Classes
  */
-VALUE mCipher;
 VALUE cCipher;
 VALUE eCipherError;
 
@@ -68,7 +67,7 @@ ossl_cipher_free(EVP_CIPHER_CTX *ctx)
 {
     if (ctx) {
 	EVP_CIPHER_CTX_cleanup(ctx);
-	free(ctx);
+	ruby_xfree(ctx);
     }
 }
 
@@ -80,10 +79,18 @@ ossl_cipher_alloc(VALUE klass)
 
     MakeCipher(obj, klass, ctx);
     EVP_CIPHER_CTX_init(ctx);
-	
+
     return obj;
 }
 
+/*
+ *  call-seq:
+ *     Cipher.new(string) -> cipher
+ *
+ *  The string must contain a valid cipher name like "AES-128-CBC" or "3DES".
+ *
+ *  A list of cipher names is available by calling OpenSSL::Cipher.ciphers.
+ */
 static VALUE
 ossl_cipher_initialize(VALUE self, VALUE str)
 {
@@ -105,7 +112,7 @@ static VALUE
 ossl_cipher_copy(VALUE self, VALUE other)
 {
     EVP_CIPHER_CTX *ctx1, *ctx2;
-	
+
     rb_check_frozen(self);
     if (self == other) return self;
 
@@ -117,17 +124,25 @@ ossl_cipher_copy(VALUE self, VALUE other)
     return self;
 }
 
+#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
 static void*
 add_cipher_name_to_ary(const OBJ_NAME *name, VALUE ary)
 {
     rb_ary_push(ary, rb_str_new2(name->name));
     return NULL;
 }
+#endif
 
+#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
+/*
+ *  call-seq:
+ *     Cipher.ciphers -> array[string...]
+ *
+ *  Returns the names of all available ciphers in an array.
+ */
 static VALUE
 ossl_s_ciphers(VALUE self)
 {
-#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
     VALUE ary;
 
     ary = rb_ary_new();
@@ -136,11 +151,17 @@ ossl_s_ciphers(VALUE self)
                     (void*)ary);
 
     return ary;
+}
 #else
-    rb_notimplement();
+#define ossl_s_ciphers rb_f_notimplement
 #endif
-}
 
+/*
+ *  call-seq:
+ *     cipher.reset -> self
+ *
+ *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1).
+ */
 static VALUE
 ossl_cipher_reset(VALUE self)
 {
@@ -149,7 +170,7 @@ ossl_cipher_reset(VALUE self)
     GetCipher(self, ctx);
     if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
-		
+
     return self;
 }
 
@@ -167,22 +188,23 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
 	 * We deprecated the arguments for this method, but we decided
 	 * keeping this behaviour for backward compatibility.
 	 */
+	const char *cname  = rb_class2name(rb_obj_class(self));
+	rb_warn("argumtents for %s#encrypt and %s#decrypt were deprecated; "
+                "use %s#pkcs5_keyivgen to derive key and IV",
+                cname, cname, cname);
 	StringValue(pass);
 	GetCipher(self, ctx);
 	if (NIL_P(init_v)) memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv));
 	else{
-	    char *cname  = rb_class2name(rb_obj_class(self));
-	    rb_warning("key derivation by %s#encrypt is deprecated; "
-		       "use %s::pkcs5_keyivgen instead", cname, cname);
 	    StringValue(init_v);
-	    if (EVP_MAX_IV_LENGTH > RSTRING(init_v)->len) {
+	    if (EVP_MAX_IV_LENGTH > RSTRING_LEN(init_v)) {
 		memset(iv, 0, EVP_MAX_IV_LENGTH);
-		memcpy(iv, RSTRING(init_v)->ptr, RSTRING(init_v)->len);
+		memcpy(iv, RSTRING_PTR(init_v), RSTRING_LEN(init_v));
 	    }
-	    else memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv));
+	    else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv));
 	}
 	EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
-		       RSTRING(pass)->ptr, RSTRING(pass)->len, 1, key, NULL);
+		       (unsigned char *)RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
 	p_key = key;
 	p_iv = iv;
     }
@@ -196,18 +218,54 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
     return self;
 }
 
+/*
+ *  call-seq:
+ *     cipher.encrypt -> self
+ *
+ *  Make sure to call .encrypt or .decrypt before using any of the following methods:
+ *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
+ *
+ *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 1).
+ */
 static VALUE
 ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
 {
     return ossl_cipher_init(argc, argv, self, 1);
 }
 
+/*
+ *  call-seq:
+ *     cipher.decrypt -> self
+ *
+ *  Make sure to call .encrypt or .decrypt before using any of the following methods:
+ *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
+ *
+ *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 0).
+ */
 static VALUE
 ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
 {
     return ossl_cipher_init(argc, argv, self, 0);
 }
 
+/*
+ *  call-seq:
+ *     cipher.pkcs5_keyivgen(pass [, salt [, iterations [, digest]]] ) -> nil
+ *
+ *  Generates and sets the key/iv based on a password.
+ *
+ *  WARNING: This method is only PKCS5 v1.5 compliant when using RC2, RC4-40, or DES
+ *  with MD5 or SHA1.  Using anything else (like AES) will generate the key/iv using an
+ *  OpenSSL specific method.  Use a PKCS5 v2 key generation method instead.
+ *
+ *  === Parameters
+ *  +salt+ must be an 8 byte string if provided.
+ *  +iterations+ is a integer with a default of 2048.
+ *  +digest+ is a Digest object that defaults to 'MD5'
+ *
+ *  A minimum of 1000 iterations is recommended.
+ *
+ */
 static VALUE
 ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
 {
@@ -221,15 +279,15 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
     StringValue(vpass);
     if(!NIL_P(vsalt)){
 	StringValue(vsalt);
-	if(RSTRING(vsalt)->len != PKCS5_SALT_LEN)
+	if(RSTRING_LEN(vsalt) != PKCS5_SALT_LEN)
 	    rb_raise(eCipherError, "salt must be an 8-octet string");
-	salt = RSTRING(vsalt)->ptr;
+	salt = (unsigned char *)RSTRING_PTR(vsalt);
     }
     iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
     digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
     GetCipher(self, ctx);
     EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
-		   RSTRING(vpass)->ptr, RSTRING(vpass)->len, iter, key, iv); 
+		   (unsigned char *)RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv);
     if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
 	ossl_raise(eCipherError, NULL);
     OPENSSL_cleanse(key, sizeof key);
@@ -238,40 +296,56 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-static VALUE 
-ossl_cipher_update(VALUE self, VALUE data)
+
+/*
+ *  call-seq:
+ *     cipher.update(data [, buffer]) -> string or buffer
+ *
+ *  === Parameters
+ *  +data+ is a nonempty string.
+ *  +buffer+ is an optional string to store the result.
+ */
+static VALUE
+ossl_cipher_update(int argc, VALUE *argv, VALUE self)
 {
     EVP_CIPHER_CTX *ctx;
-    char *in;
+    unsigned char *in;
     int in_len, out_len;
-    VALUE str;
+    VALUE data, str;
+
+    rb_scan_args(argc, argv, "11", &data, &str);
 
     StringValue(data);
-    in = RSTRING(data)->ptr;
-    if ((in_len = RSTRING(data)->len) == 0)
+    in = (unsigned char *)RSTRING_PTR(data);
+    if ((in_len = RSTRING_LEN(data)) == 0)
         rb_raise(rb_eArgError, "data must not be empty");
     GetCipher(self, ctx);
-    str = rb_str_new(0, in_len+EVP_CIPHER_CTX_block_size(ctx));
-    if (!EVP_CipherUpdate(ctx, RSTRING(str)->ptr, &out_len, in, in_len))
+    out_len = in_len+EVP_CIPHER_CTX_block_size(ctx);
+
+    if (NIL_P(str)) {
+        str = rb_str_new(0, out_len);
+    } else {
+        StringValue(str);
+        rb_str_resize(str, out_len);
+    }
+
+    if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
 	ossl_raise(eCipherError, NULL);
-    assert(out_len < RSTRING(str)->len);
-    RSTRING(str)->len = out_len;
-    RSTRING(str)->ptr[out_len] = 0;
+    assert(out_len < RSTRING_LEN(str));
+    rb_str_set_len(str, out_len);
 
     return str;
 }
 
+/*
+ *  call-seq:
+ *     cipher.final -> aString
+ *
+ *  Returns the remaining data held in the cipher object.  Further calls to update() or final() will return garbage.
+ *
+ *  See EVP_CipherFinal_ex for further information.
+ */
 static VALUE
-ossl_cipher_update_deprecated(VALUE self, VALUE data)
-{
-    char *cname;
-
-    cname = rb_class2name(rb_obj_class(self));
-    rb_warning("%s#<< is deprecated; use %s#update instead", cname, cname);
-    return ossl_cipher_update(self, data);
-}
-
-static VALUE 
 ossl_cipher_final(VALUE self)
 {
     EVP_CIPHER_CTX *ctx;
@@ -280,15 +354,20 @@ ossl_cipher_final(VALUE self)
 
     GetCipher(self, ctx);
     str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
-    if (!EVP_CipherFinal_ex(ctx, RSTRING(str)->ptr, &out_len))
+    if (!EVP_CipherFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), &out_len))
 	ossl_raise(eCipherError, NULL);
-    assert(out_len <= RSTRING(str)->len);
-    RSTRING(str)->len = out_len;
-    RSTRING(str)->ptr[out_len] = 0;
+    assert(out_len <= RSTRING_LEN(str));
+    rb_str_set_len(str, out_len);
 
     return str;
 }
 
+/*
+ *  call-seq:
+ *     cipher.name -> string
+ *
+ *  Returns the name of the cipher which may differ slightly from the original name provided.
+ */
 static VALUE
 ossl_cipher_name(VALUE self)
 {
@@ -299,6 +378,14 @@ ossl_cipher_name(VALUE self)
     return rb_str_new2(EVP_CIPHER_name(EVP_CIPHER_CTX_cipher(ctx)));
 }
 
+/*
+ *  call-seq:
+ *     cipher.key = string -> string
+ *
+ *  Sets the cipher key.
+ *
+ *  Only call this method after calling cipher.encrypt or cipher.decrypt.
+ */
 static VALUE
 ossl_cipher_set_key(VALUE self, VALUE key)
 {
@@ -307,15 +394,23 @@ ossl_cipher_set_key(VALUE self, VALUE key)
     StringValue(key);
     GetCipher(self, ctx);
 
-    if (RSTRING(key)->len < EVP_CIPHER_CTX_key_length(ctx))
+    if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx))
         ossl_raise(eCipherError, "key length too short");
 
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, RSTRING(key)->ptr, NULL, -1) != 1)
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
         ossl_raise(eCipherError, NULL);
 
     return key;
 }
 
+/*
+ *  call-seq:
+ *     cipher.iv = string -> string
+ *
+ *  Sets the cipher iv.
+ *
+ *  Only call this method after calling cipher.encrypt or cipher.decrypt.
+ */
 static VALUE
 ossl_cipher_set_iv(VALUE self, VALUE iv)
 {
@@ -324,21 +419,33 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     StringValue(iv);
     GetCipher(self, ctx);
 
-    if (RSTRING(iv)->len < EVP_CIPHER_CTX_iv_length(ctx))
+    if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(ctx))
         ossl_raise(eCipherError, "iv length too short");
 
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, RSTRING(iv)->ptr, -1) != 1)
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, (unsigned char *)RSTRING_PTR(iv), -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
     return iv;
 }
 
+
+/*
+ *  call-seq:
+ *     cipher.key_length = integer -> integer
+ *
+ *  Sets the key length of the cipher.  If the cipher is a fixed length cipher then attempting to set the key
+ *  length to any value other than the fixed value is an error.
+ *
+ *  Under normal circumstances you do not need to call this method (and probably shouldn't).
+ *
+ *  See EVP_CIPHER_CTX_set_key_length for further information.
+ */
 static VALUE
 ossl_cipher_set_key_length(VALUE self, VALUE key_length)
 {
-    EVP_CIPHER_CTX *ctx;
     int len = NUM2INT(key_length);
- 
+    EVP_CIPHER_CTX *ctx;
+
     GetCipher(self, ctx);
     if (EVP_CIPHER_CTX_set_key_length(ctx, len) != 1)
         ossl_raise(eCipherError, NULL);
@@ -346,21 +453,31 @@ ossl_cipher_set_key_length(VALUE self, VALUE key_length)
     return key_length;
 }
 
+#if defined(HAVE_EVP_CIPHER_CTX_SET_PADDING)
+/*
+ *  call-seq:
+ *     cipher.padding = integer -> integer
+ *
+ *  Enables or disables padding. By default encryption operations are padded using standard block padding and the
+ *  padding is checked and removed when decrypting. If the pad parameter is zero then no padding is performed, the
+ *  total amount of data encrypted or decrypted must then be a multiple of the block size or an error will occur.
+ *
+ *  See EVP_CIPHER_CTX_set_padding for further information.
+ */
 static VALUE
 ossl_cipher_set_padding(VALUE self, VALUE padding)
 {
-#if defined(HAVE_EVP_CIPHER_CTX_SET_PADDING)
     EVP_CIPHER_CTX *ctx;
     int pad = NUM2INT(padding);
 
     GetCipher(self, ctx);
     if (EVP_CIPHER_CTX_set_padding(ctx, pad) != 1)
 	ossl_raise(eCipherError, NULL);
-#else
-    rb_notimplement();
-#endif
     return padding;
 }
+#else
+#define ossl_cipher_set_padding rb_f_notimplement
+#endif
 
 #define CIPHER_0ARG_INT(func)					\
     static VALUE						\
@@ -374,30 +491,48 @@ CIPHER_0ARG_INT(key_length)
 CIPHER_0ARG_INT(iv_length)
 CIPHER_0ARG_INT(block_size)
 
+#if 0
+/*
+ *  call-seq:
+ *     cipher.key_length -> integer
+ *
+ */
+static VALUE ossl_cipher_key_length() { }
+/*
+ *  call-seq:
+ *     cipher.iv_length -> integer
+ *
+ */
+static VALUE ossl_cipher_iv_length() { }
+/*
+ *  call-seq:
+ *     cipher.block_size -> integer
+ *
+ */
+static VALUE ossl_cipher_block_size() { }
+#endif
+
 /*
  * INIT
  */
-void 
+void
 Init_ossl_cipher(void)
 {
 #if 0 /* let rdoc know about mOSSL */
     mOSSL = rb_define_module("OpenSSL");
 #endif
-
-    mCipher = rb_define_module_under(mOSSL, "Cipher");
-    eCipherError = rb_define_class_under(mOSSL, "CipherError", eOSSLError);
-    cCipher = rb_define_class_under(mCipher, "Cipher", rb_cObject);
+    cCipher = rb_define_class_under(mOSSL, "Cipher", rb_cObject);
+    eCipherError = rb_define_class_under(cCipher, "CipherError", eOSSLError);
 
     rb_define_alloc_func(cCipher, ossl_cipher_alloc);
     rb_define_copy_func(cCipher, ossl_cipher_copy);
-    rb_define_module_function(mCipher, "ciphers", ossl_s_ciphers, 0);
+    rb_define_module_function(cCipher, "ciphers", ossl_s_ciphers, 0);
     rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
     rb_define_method(cCipher, "reset", ossl_cipher_reset, 0);
     rb_define_method(cCipher, "encrypt", ossl_cipher_encrypt, -1);
     rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, -1);
     rb_define_method(cCipher, "pkcs5_keyivgen", ossl_cipher_pkcs5_keyivgen, -1);
-    rb_define_method(cCipher, "update", ossl_cipher_update, 1);
-    rb_define_method(cCipher, "<<", ossl_cipher_update_deprecated, 1);
+    rb_define_method(cCipher, "update", ossl_cipher_update, -1);
     rb_define_method(cCipher, "final", ossl_cipher_final, 0);
     rb_define_method(cCipher, "name", ossl_cipher_name, 0);
     rb_define_method(cCipher, "key=", ossl_cipher_set_key, 1);
@@ -408,3 +543,4 @@ Init_ossl_cipher(void)
     rb_define_method(cCipher, "block_size", ossl_cipher_block_size, 0);
     rb_define_method(cCipher, "padding=", ossl_cipher_set_padding, 1);
 }
+
diff --git a/ext/openssl/ossl_cipher.h b/ext/openssl/ossl_cipher.h
index 63c7a875e8..bed4fa853b 100644
--- a/ext/openssl/ossl_cipher.h
+++ b/ext/openssl/ossl_cipher.h
@@ -11,7 +11,6 @@
 #if !defined(_OSSL_CIPHER_H_)
 #define _OSSL_CIPHER_H_
 
-extern VALUE mCipher;
 extern VALUE cCipher;
 extern VALUE eCipherError;
 
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index f1d6a98253..22ea9dea5d 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -33,8 +33,8 @@
 VALUE cConfig;
 VALUE eConfigError;
 
-/* 
- * Public 
+/*
+ * Public
  */
 
 static CONF *parse_config(VALUE, CONF*);
@@ -154,7 +154,7 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
 	_CONF_new_data(conf);
     }
 #endif
-    
+
     return self;
 }
 
@@ -171,27 +171,46 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
     StringValue(name);
     StringValue(value);
     GetConfig(self, conf);
-    if(!(sv = _CONF_get_section(conf, RSTRING(section)->ptr))){
-	if(!(sv = _CONF_new_section(conf, RSTRING(section)->ptr))){
+    if(!(sv = _CONF_get_section(conf, RSTRING_PTR(section)))){
+	if(!(sv = _CONF_new_section(conf, RSTRING_PTR(section)))){
 	    ossl_raise(eConfigError, NULL);
 	}
     }
     if(!(cv = OPENSSL_malloc(sizeof(CONF_VALUE)))){
 	ossl_raise(eConfigError, NULL);
     }
-    cv->name = BUF_strdup(RSTRING(name)->ptr);
-    cv->value = BUF_strdup(RSTRING(value)->ptr);
+    cv->name = BUF_strdup(RSTRING_PTR(name));
+    cv->value = BUF_strdup(RSTRING_PTR(value));
     if(!cv->name || !cv->value || !_CONF_add_string(conf, sv, cv)){
 	OPENSSL_free(cv->name);
 	OPENSSL_free(cv->value);
 	OPENSSL_free(cv);
 	ossl_raise(eConfigError, "_CONF_add_string failure");
     }
-    
+
     return value;
 #endif
 }
 
+static void
+rb_ossl_config_modify_check(VALUE config)
+{
+    if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config");
+    if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config");
+}
+
+#if !defined(OSSL_NO_CONF_API)
+static VALUE
+ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value)
+{
+    rb_ossl_config_modify_check(self);
+    return ossl_config_add_value(self, section, name, value);
+}
+#else
+#define ossl_config_add_value_m rb_f_notimplement
+#endif
+
 static VALUE
 ossl_config_get_value(VALUE self, VALUE section, VALUE name)
 {
@@ -201,7 +220,7 @@ ossl_config_get_value(VALUE self, VALUE section, VALUE name)
     StringValue(section);
     StringValue(name);
     GetConfig(self, conf);
-    str = NCONF_get_string(conf, RSTRING(section)->ptr, RSTRING(name)->ptr);
+    str = NCONF_get_string(conf, RSTRING_PTR(section), RSTRING_PTR(name));
     if(!str){
 	ERR_clear_error();
 	return Qnil;
@@ -214,7 +233,7 @@ static VALUE
 ossl_config_get_value_old(int argc, VALUE *argv, VALUE self)
 {
     VALUE section, name;
-    
+
     rb_scan_args(argc, argv, "11", &section, &name);
 
     /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */
@@ -247,9 +266,10 @@ ossl_config_set_section(VALUE self, VALUE section, VALUE hash)
 {
     VALUE arg[2];
 
+    rb_ossl_config_modify_check(self);
     arg[0] = self;
     arg[1] = section;
-    rb_iterate(rb_each, hash, set_conf_section_i, (VALUE)arg);
+    rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg);
     return hash;
 }
 
@@ -278,7 +298,7 @@ ossl_config_get_section(VALUE self, VALUE section)
 	return hash;
     }
     for (i=0; i<entries; i++) {
-	entry = sk_CONF_VALUE_value(sk, i);		
+	entry = sk_CONF_VALUE_value(sk, i);
 	rb_hash_aset(hash, rb_str_new2(entry->name), rb_str_new2(entry->value));
     }
 
@@ -292,15 +312,16 @@ ossl_config_get_section_old(VALUE self, VALUE section)
     return ossl_config_get_section(self, section);
 }
 
-#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN
+#if defined(IMPLEMENT_LHASH_DOALL_ARG_FN) && defined(LHASH_OF)
 static void
-get_conf_section(CONF_VALUE *cv, VALUE ary)
+get_conf_section_doall_arg(CONF_VALUE *cv, void *tmp)
 {
+    VALUE ary = (VALUE)tmp;
     if(cv->name) return;
     rb_ary_push(ary, rb_str_new2(cv->section));
 }
 
-static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE);
+static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE, void)
 
 static VALUE
 ossl_config_get_sections(VALUE self)
@@ -310,14 +331,16 @@ ossl_config_get_sections(VALUE self)
 
     GetConfig(self, conf);
     ary = rb_ary_new();
-    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary);
+    lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(get_conf_section),
+		 (void*)ary);
 
     return ary;
 }
 
 static void
-dump_conf_value(CONF_VALUE *cv, VALUE str)
+dump_conf_value_doall_arg(CONF_VALUE *cv, void *tmp)
 {
+    VALUE str = (VALUE)tmp;
     STACK_OF(CONF_VALUE) *sk;
     CONF_VALUE *v;
     int i, num;
@@ -338,7 +361,7 @@ dump_conf_value(CONF_VALUE *cv, VALUE str)
     rb_str_cat2(str, "\n");
 }
 
-static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE);
+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, void)
 
 static VALUE
 dump_conf(CONF *conf)
@@ -346,7 +369,8 @@ dump_conf(CONF *conf)
     VALUE str;
 
     str = rb_str_new(0, 0);
-    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str);
+    lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(dump_conf_value),
+		 (void*)str);
 
     return str;
 }
@@ -362,7 +386,7 @@ ossl_config_to_s(VALUE self)
 }
 
 static void
-each_conf_value(CONF_VALUE *cv, void* dummy)
+each_conf_value_doall_arg(CONF_VALUE *cv, void *dummy)
 {
     STACK_OF(CONF_VALUE) *sk;
     CONF_VALUE *v;
@@ -382,15 +406,18 @@ each_conf_value(CONF_VALUE *cv, void* dummy)
     }
 }
 
-static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*);
+static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE, void *)
 
 static VALUE
 ossl_config_each(VALUE self)
 {
     CONF *conf;
 
+    RETURN_ENUMERATOR(self, 0, 0);
+
     GetConfig(self, conf);
-    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL);
+    lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(each_conf_value),
+		 (void*)NULL);
 
     return self;
 }
@@ -421,7 +448,7 @@ static VALUE
 ossl_config_inspect(VALUE self)
 {
     VALUE str, ary = ossl_config_get_sections(self);
-    char *cname = rb_class2name(rb_obj_class(self));
+    const char *cname = rb_class2name(rb_obj_class(self));
 
     str = rb_str_new2("#<");
     rb_str_cat2(str, cname);
@@ -438,11 +465,14 @@ ossl_config_inspect(VALUE self)
 void
 Init_ossl_config()
 {
+    char *default_config_file;
     eConfigError = rb_define_class_under(mOSSL, "ConfigError", eOSSLError);
     cConfig = rb_define_class_under(mOSSL, "Config", rb_cObject);
 
+    default_config_file = CONF_get1_default_config_file();
     rb_define_const(cConfig, "DEFAULT_CONFIG_FILE",
-		    rb_str_new2(CONF_get1_default_config_file()));
+		    rb_str_new2(default_config_file));
+    OPENSSL_free(default_config_file);
     rb_include_module(cConfig, rb_mEnumerable);
     rb_define_singleton_method(cConfig, "parse", ossl_config_s_parse, 1);
     rb_define_alias(CLASS_OF(cConfig), "load", "new");
@@ -451,7 +481,7 @@ Init_ossl_config()
     rb_define_method(cConfig, "initialize", ossl_config_initialize, -1);
     rb_define_method(cConfig, "get_value", ossl_config_get_value, 2);
     rb_define_method(cConfig, "value", ossl_config_get_value_old, -1);
-    rb_define_method(cConfig, "add_value", ossl_config_add_value, 3);
+    rb_define_method(cConfig, "add_value", ossl_config_add_value_m, 3);
     rb_define_method(cConfig, "[]", ossl_config_get_section, 1);
     rb_define_method(cConfig, "section", ossl_config_get_section_old, 1);
     rb_define_method(cConfig, "[]=", ossl_config_set_section, 2);
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index 4096b097a2..04679d37f9 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -24,7 +24,6 @@
 /*
  * Classes
  */
-VALUE mDigest;
 VALUE cDigest;
 VALUE eDigestError;
 
@@ -36,24 +35,35 @@ static VALUE ossl_digest_alloc(VALUE klass);
 const EVP_MD *
 GetDigestPtr(VALUE obj)
 {
-    EVP_MD_CTX *ctx;
+    const EVP_MD *md;
+
+    if (TYPE(obj) == T_STRING) {
+    	const char *name = StringValueCStr(obj);
+
+        md = EVP_get_digestbyname(name);
+        if (!md)
+            ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
+    } else {
+        EVP_MD_CTX *ctx;
 
-    SafeGetDigest(obj, ctx);
+        SafeGetDigest(obj, ctx);
 
-    return EVP_MD_CTX_md(ctx); /*== ctx->digest*/
+        md = EVP_MD_CTX_md(ctx);
+    }
+
+    return md;
 }
 
 VALUE
 ossl_digest_new(const EVP_MD *md)
-{  
+{
     VALUE ret;
     EVP_MD_CTX *ctx;
 
     ret = ossl_digest_alloc(cDigest);
     GetDigest(ret, ctx);
-    EVP_MD_CTX_init(ctx);
     EVP_DigestInit_ex(ctx, md, NULL);
-   
+
     return ret;
 }
 
@@ -69,34 +79,32 @@ ossl_digest_alloc(VALUE klass)
     ctx = EVP_MD_CTX_create();
     if (ctx == NULL)
 	ossl_raise(rb_eRuntimeError, "EVP_MD_CTX_create() failed");
-    EVP_MD_CTX_init(ctx);
     obj = Data_Wrap_Struct(klass, 0, EVP_MD_CTX_destroy, ctx);
-	
+
     return obj;
 }
 
 VALUE ossl_digest_update(VALUE, VALUE);
 
+/*
+ *  call-seq:
+ *     Digest.new(string) -> digest
+ *
+ */
 static VALUE
 ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
 {
     EVP_MD_CTX *ctx;
     const EVP_MD *md;
-    char *name;
     VALUE type, data;
 
     rb_scan_args(argc, argv, "11", &type, &data);
-    StringValue(type);
+    md = GetDigestPtr(type);
     if (!NIL_P(data)) StringValue(data);
-    name = StringValuePtr(type);
-    
-    md = EVP_get_digestbyname(name);
-    if (!md) {
-	ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
-    }
+
     GetDigest(self, ctx);
     EVP_DigestInit_ex(ctx, md, NULL);
-    
+
     if (!NIL_P(data)) return ossl_digest_update(self, data);
     return self;
 }
@@ -105,7 +113,7 @@ static VALUE
 ossl_digest_copy(VALUE self, VALUE other)
 {
     EVP_MD_CTX *ctx1, *ctx2;
-    
+
     rb_check_frozen(self);
     if (self == other) return self;
 
@@ -118,6 +126,11 @@ ossl_digest_copy(VALUE self, VALUE other)
     return self;
 }
 
+/*
+ *  call-seq:
+ *     digest.reset -> self
+ *
+ */
 static VALUE
 ossl_digest_reset(VALUE self)
 {
@@ -129,6 +142,11 @@ ossl_digest_reset(VALUE self)
     return self;
 }
 
+/*
+ *  call-seq:
+ *     digest.update(string) -> aString
+ *
+ */
 VALUE
 ossl_digest_update(VALUE self, VALUE data)
 {
@@ -136,126 +154,77 @@ ossl_digest_update(VALUE self, VALUE data)
 
     StringValue(data);
     GetDigest(self, ctx);
-    EVP_DigestUpdate(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
+    EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
 
     return self;
 }
 
-static void
-digest_final(EVP_MD_CTX *ctx, char **buf, int *buf_len)
-{
-    EVP_MD_CTX final;
-
-    if (!EVP_MD_CTX_copy(&final, ctx)) {
-	ossl_raise(eDigestError, NULL);
-    }
-    if (!(*buf = OPENSSL_malloc(EVP_MD_CTX_size(&final)))) {
-	EVP_MD_CTX_cleanup(&final);
-	ossl_raise(eDigestError, "Cannot allocate mem for digest");
-    }
-    EVP_DigestFinal_ex(&final, *buf, buf_len);
-    EVP_MD_CTX_cleanup(&final);
-}
-
+/*
+ *  call-seq:
+ *      digest.finish -> aString
+ *
+ */
 static VALUE
-ossl_digest_digest(VALUE self)
+ossl_digest_finish(int argc, VALUE *argv, VALUE self)
 {
     EVP_MD_CTX *ctx;
-    char *buf;
-    int buf_len;
-    VALUE digest;
-	
-    GetDigest(self, ctx);
-    digest_final(ctx, &buf, &buf_len);
-    digest = ossl_buf2str(buf, buf_len);
-	
-    return digest;
-}
+    VALUE str;
 
-static VALUE
-ossl_digest_hexdigest(VALUE self)
-{
-    EVP_MD_CTX *ctx;
-    char *buf, *hexbuf;
-    int buf_len;
-    VALUE hexdigest;
+    rb_scan_args(argc, argv, "01", &str);
 
     GetDigest(self, ctx);
-    digest_final(ctx, &buf, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
-	OPENSSL_free(buf);
-	ossl_raise(eDigestError, "Memory alloc error");
-    }
-    OPENSSL_free(buf);
-    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
 
-    return hexdigest;
-}
-
-static VALUE
-ossl_digest_s_digest(VALUE klass, VALUE str, VALUE data)
-{
-    VALUE obj = rb_class_new_instance(1, &str, klass);
-
-    ossl_digest_update(obj, data);
-
-    return ossl_digest_digest(obj);
-}
-
-static VALUE
-ossl_digest_s_hexdigest(VALUE klass, VALUE str, VALUE data)
-{
-    VALUE obj = rb_class_new_instance(1, &str, klass);
+    if (NIL_P(str)) {
+        str = rb_str_new(NULL, EVP_MD_CTX_size(ctx));
+    } else {
+        StringValue(str);
+        rb_str_resize(str, EVP_MD_CTX_size(ctx));
+    }
 
-    ossl_digest_update(obj, data);
+    EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
 
-    return ossl_digest_hexdigest(obj);
+    return str;
 }
 
+/*
+ *  call-seq:
+ *      digest.name -> string
+ *
+ */
 static VALUE
-ossl_digest_equal(VALUE self, VALUE other)
+ossl_digest_name(VALUE self)
 {
     EVP_MD_CTX *ctx;
-    VALUE str1, str2;
 
-    if (rb_obj_is_kind_of(other, cDigest) == Qtrue) {
-	str2 = ossl_digest_digest(other);
-    } else {
-	StringValue(other);
-	str2 = other;
-    }
     GetDigest(self, ctx);
-    if (RSTRING(str2)->len == EVP_MD_CTX_size(ctx)) {
-	str1 = ossl_digest_digest(self);
-    } else {
-	str1 = ossl_digest_hexdigest(self);
-    }
-    if (RSTRING(str1)->len == RSTRING(str2)->len
-	&& rb_str_cmp(str1, str2) == 0) {
-	return Qtrue;
-    }
 
-    return Qfalse;
+    return rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
 }
 
+/*
+ *  call-seq:
+ *      digest.digest_size -> integer
+ *
+ *  Returns the output size of the digest.
+ */
 static VALUE
-ossl_digest_name(VALUE self)
+ossl_digest_size(VALUE self)
 {
     EVP_MD_CTX *ctx;
 
     GetDigest(self, ctx);
 
-    return rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
+    return INT2NUM(EVP_MD_CTX_size(ctx));
 }
 
 static VALUE
-ossl_digest_size(VALUE self)
+ossl_digest_block_length(VALUE self)
 {
     EVP_MD_CTX *ctx;
 
     GetDigest(self, ctx);
 
-    return INT2NUM(EVP_MD_CTX_size(ctx));
+    return INT2NUM(EVP_MD_CTX_block_size(ctx));
 }
 
 /*
@@ -264,35 +233,25 @@ ossl_digest_size(VALUE self)
 void
 Init_ossl_digest()
 {
+    rb_require("digest");
+
 #if 0 /* let rdoc know about mOSSL */
     mOSSL = rb_define_module("OpenSSL");
 #endif
 
-    mDigest = rb_define_module_under(mOSSL, "Digest");
-	
-    eDigestError = rb_define_class_under(mDigest, "DigestError", eOSSLError);
-	
-    cDigest = rb_define_class_under(mDigest, "Digest", rb_cObject);
-	
+    cDigest = rb_define_class_under(mOSSL, "Digest", rb_path2class("Digest::Class"));
+    eDigestError = rb_define_class_under(cDigest, "DigestError", eOSSLError);
+
     rb_define_alloc_func(cDigest, ossl_digest_alloc);
-    rb_define_singleton_method(cDigest, "digest", ossl_digest_s_digest, 2);
-    rb_define_singleton_method(cDigest, "hexdigest", ossl_digest_s_hexdigest, 2);
-	
+
     rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
-    rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
-    
     rb_define_copy_func(cDigest, ossl_digest_copy);
-    
-    rb_define_method(cDigest, "digest", ossl_digest_digest, 0);
-    rb_define_method(cDigest, "hexdigest", ossl_digest_hexdigest, 0);
-    rb_define_alias(cDigest, "inspect", "hexdigest");
-    rb_define_alias(cDigest, "to_s", "hexdigest");
-    
+    rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
     rb_define_method(cDigest, "update", ossl_digest_update, 1);
     rb_define_alias(cDigest, "<<", "update");
-    
-    rb_define_method(cDigest, "==", ossl_digest_equal, 1);
-    
+    rb_define_private_method(cDigest, "finish", ossl_digest_finish, -1);
+    rb_define_method(cDigest, "digest_length", ossl_digest_size, 0);
+    rb_define_method(cDigest, "block_length", ossl_digest_block_length, 0);
+
     rb_define_method(cDigest, "name", ossl_digest_name, 0);
-    rb_define_method(cDigest, "size", ossl_digest_size, 0);
 }
diff --git a/ext/openssl/ossl_digest.h b/ext/openssl/ossl_digest.h
index 8a1f7964f2..8cc5b1bc56 100644
--- a/ext/openssl/ossl_digest.h
+++ b/ext/openssl/ossl_digest.h
@@ -11,7 +11,6 @@
 #if !defined(_OSSL_DIGEST_H_)
 #define _OSSL_DIGEST_H_
 
-extern VALUE mDigest;
 extern VALUE cDigest;
 extern VALUE eDigestError;
 
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index 71586e3620..3b48119b7f 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -29,7 +29,7 @@
     GetPKCS7(obj, engine); \
 } while (0)
 
-/* 
+/*
  * Classes
  */
 VALUE cEngine;
@@ -40,7 +40,7 @@ VALUE eEngineError;
  */
 #define OSSL_ENGINE_LOAD_IF_MATCH(x) \
 do{\
-  if(!strcmp(#x, RSTRING(name)->ptr)){\
+  if(!strcmp(#x, RSTRING_PTR(name))){\
     ENGINE_load_##x();\
     return Qtrue;\
   }\
@@ -61,21 +61,39 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
     }
     StringValue(name);
 #ifndef OPENSSL_NO_STATIC_ENGINE
+#if HAVE_ENGINE_LOAD_DYNAMIC
     OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
+#endif
+#if HAVE_ENGINE_LOAD_CSWIFT
     OSSL_ENGINE_LOAD_IF_MATCH(cswift);
+#endif
+#if HAVE_ENGINE_LOAD_CHIL
     OSSL_ENGINE_LOAD_IF_MATCH(chil);
+#endif
+#if HAVE_ENGINE_LOAD_ATALLA
     OSSL_ENGINE_LOAD_IF_MATCH(atalla);
+#endif
+#if HAVE_ENGINE_LOAD_NURON
     OSSL_ENGINE_LOAD_IF_MATCH(nuron);
+#endif
+#if HAVE_ENGINE_LOAD_UBSEC
     OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
+#endif
+#if HAVE_ENGINE_LOAD_AEP
     OSSL_ENGINE_LOAD_IF_MATCH(aep);
+#endif
+#if HAVE_ENGINE_LOAD_SUREWARE
     OSSL_ENGINE_LOAD_IF_MATCH(sureware);
+#endif
+#if HAVE_ENGINE_LOAD_4758CCA
     OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
 #endif
+#endif
 #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
     OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
 #endif
     OSSL_ENGINE_LOAD_IF_MATCH(openssl);
-    rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr);
+    rb_warning("no such builtin loader for `%s'", RSTRING_PTR(name));
     return Qnil;
 #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
 }
@@ -112,14 +130,14 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
 
     StringValue(id);
     ossl_engine_s_load(1, &id, klass);
-    if(!(e = ENGINE_by_id(RSTRING(id)->ptr)))
+    if(!(e = ENGINE_by_id(RSTRING_PTR(id))))
 	ossl_raise(eEngineError, NULL);
     WrapEngine(klass, obj, e);
     if(rb_block_given_p()) rb_yield(obj);
     if(!ENGINE_init(e))
 	ossl_raise(eEngineError, NULL);
     ENGINE_ctrl(e, ENGINE_CTRL_SET_PASSWORD_CALLBACK,
-		0, NULL, (void(*)())ossl_pem_passwd_cb);
+		0, NULL, (void(*)(void))ossl_pem_passwd_cb);
     ERR_clear_error();
 
     return obj;
@@ -166,10 +184,10 @@ ossl_engine_finish(VALUE self)
     return Qnil;
 }
 
+#if defined(HAVE_ENGINE_GET_CIPHER)
 static VALUE
 ossl_engine_get_cipher(VALUE self, VALUE name)
 {
-#if defined(HAVE_ENGINE_GET_CIPHER)
     ENGINE *e;
     const EVP_CIPHER *ciph, *tmp;
     char *s;
@@ -184,15 +202,15 @@ ossl_engine_get_cipher(VALUE self, VALUE name)
     if(!ciph) ossl_raise(eEngineError, NULL);
 
     return ossl_cipher_new(ciph);
+}
 #else
-    rb_notimplement();
+#define ossl_engine_get_cipher rb_f_notimplement
 #endif
-}
 
+#if defined(HAVE_ENGINE_GET_DIGEST)
 static VALUE
 ossl_engine_get_digest(VALUE self, VALUE name)
 {
-#if defined(HAVE_ENGINE_GET_DIGEST)
     ENGINE *e;
     const EVP_MD *md, *tmp;
     char *s;
@@ -207,10 +225,10 @@ ossl_engine_get_digest(VALUE self, VALUE name)
     if(!md) ossl_raise(eEngineError, NULL);
 
     return ossl_digest_new(md);
+}
 #else
-    rb_notimplement();
+#define ossl_engine_get_digest rb_f_notimplement
 #endif
-}
 
 static VALUE
 ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
@@ -281,8 +299,8 @@ ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &cmd, &val);
     StringValue(cmd);
     if (!NIL_P(val)) StringValue(val);
-    ret = ENGINE_ctrl_cmd_string(e, RSTRING(cmd)->ptr,
-				 NIL_P(val) ? NULL : RSTRING(val)->ptr, 0);
+    ret = ENGINE_ctrl_cmd_string(e, RSTRING_PTR(cmd),
+				 NIL_P(val) ? NULL : RSTRING_PTR(val), 0);
     if (!ret) ossl_raise(eEngineError, NULL);
 
     return self;
@@ -326,8 +344,8 @@ static VALUE
 ossl_engine_inspect(VALUE self)
 {
     VALUE str;
-    char *cname = rb_class2name(rb_obj_class(self));
-    
+    const char *cname = rb_class2name(rb_obj_class(self));
+
     str = rb_str_new2("#<");
     rb_str_cat2(str, cname);
     rb_str_cat2(str, " id=\"");
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index 312343e03d..d9a425e334 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -42,7 +42,7 @@ static void
 ossl_hmac_free(HMAC_CTX *ctx)
 {
     HMAC_CTX_cleanup(ctx);
-    free(ctx);
+    ruby_xfree(ctx);
 }
 
 static VALUE
@@ -53,10 +53,16 @@ ossl_hmac_alloc(VALUE klass)
 
     MakeHMAC(obj, klass, ctx);
     HMAC_CTX_init(ctx);
-	
+
     return obj;
 }
 
+
+/*
+ *  call-seq:
+ *     HMAC.new(key, digest) -> hmac
+ *
+ */
 static VALUE
 ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 {
@@ -64,7 +70,7 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 
     StringValue(key);
     GetHMAC(self, ctx);
-    HMAC_Init_ex(ctx, RSTRING(key)->ptr, RSTRING(key)->len,
+    HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LEN(key),
 		 GetDigestPtr(digest), NULL);
 
     return self;
@@ -74,19 +80,22 @@ static VALUE
 ossl_hmac_copy(VALUE self, VALUE other)
 {
     HMAC_CTX *ctx1, *ctx2;
-    
+
     rb_check_frozen(self);
     if (self == other) return self;
 
     GetHMAC(self, ctx1);
     SafeGetHMAC(other, ctx2);
 
-    if (!HMAC_CTX_copy(ctx1, ctx2)) {
-	ossl_raise(eHMACError, NULL);
-    }
+    HMAC_CTX_copy(ctx1, ctx2);
     return self;
 }
 
+/*
+ *  call-seq:
+ *     hmac.update(string) -> self
+ *
+ */
 static VALUE
 ossl_hmac_update(VALUE self, VALUE data)
 {
@@ -94,19 +103,17 @@ ossl_hmac_update(VALUE self, VALUE data)
 
     StringValue(data);
     GetHMAC(self, ctx);
-    HMAC_Update(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
+    HMAC_Update(ctx, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data));
 
     return self;
 }
 
 static void
-hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
+hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
 {
     HMAC_CTX final;
 
-    if (!HMAC_CTX_copy(&final, ctx)) {
-	ossl_raise(eHMACError, NULL);
-    }
+    HMAC_CTX_copy(&final, ctx);
     if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
 	HMAC_CTX_cleanup(&final);
 	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
@@ -116,29 +123,40 @@ hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
     HMAC_CTX_cleanup(&final);
 }
 
+/*
+ *  call-seq:
+ *     hmac.digest -> aString
+ *
+ */
 static VALUE
 ossl_hmac_digest(VALUE self)
 {
     HMAC_CTX *ctx;
-    char *buf;
-    int buf_len;
+    unsigned char *buf;
+    unsigned int buf_len;
     VALUE digest;
-	
+
     GetHMAC(self, ctx);
     hmac_final(ctx, &buf, &buf_len);
-    digest = ossl_buf2str(buf, buf_len);
-    
+    digest = ossl_buf2str((char *)buf, buf_len);
+
     return digest;
 }
 
+/*
+ *  call-seq:
+ *     hmac.hexdigest -> aString
+ *
+ */
 static VALUE
 ossl_hmac_hexdigest(VALUE self)
 {
     HMAC_CTX *ctx;
-    char *buf, *hexbuf;
-    int buf_len;
+    unsigned char *buf;
+    char *hexbuf;
+    unsigned int buf_len;
     VALUE hexdigest;
-	
+
     GetHMAC(self, ctx);
     hmac_final(ctx, &buf, &buf_len);
     if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
@@ -151,32 +169,59 @@ ossl_hmac_hexdigest(VALUE self)
     return hexdigest;
 }
 
+/*
+ *  call-seq:
+ *     hmac.reset -> self
+ *
+ */
+static VALUE
+ossl_hmac_reset(VALUE self)
+{
+    HMAC_CTX *ctx;
+
+    GetHMAC(self, ctx);
+    HMAC_Init_ex(ctx, NULL, 0, NULL, NULL);
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     HMAC.digest(digest, key, data) -> aString
+ *
+ */
 static VALUE
 ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
-    char *buf;
-    int buf_len;
-	
+    unsigned char *buf;
+    unsigned int buf_len;
+
     StringValue(key);
     StringValue(data);
-    buf = HMAC(GetDigestPtr(digest), RSTRING(key)->ptr, RSTRING(key)->len,
-	       RSTRING(data)->ptr, RSTRING(data)->len, NULL, &buf_len);
+    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
+	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
 
-    return rb_str_new(buf, buf_len);
+    return rb_str_new((const char *)buf, buf_len);
 }
 
+/*
+ *  call-seq:
+ *     HMAC.digest(digest, key, data) -> aString
+ *
+ */
 static VALUE
 ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
-    char *buf, *hexbuf;
-    int buf_len;
+    unsigned char *buf;
+    char *hexbuf;
+    unsigned int buf_len;
     VALUE hexdigest;
 
     StringValue(key);
     StringValue(data);
-	
-    buf = HMAC(GetDigestPtr(digest), RSTRING(key)->ptr, RSTRING(key)->len,
-	       RSTRING(data)->ptr, RSTRING(data)->len, NULL, &buf_len);
+
+    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
+	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
     if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
 	ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
     }
@@ -196,16 +241,17 @@ Init_ossl_hmac()
 #endif
 
     eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
-	
+
     cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject);
 
     rb_define_alloc_func(cHMAC, ossl_hmac_alloc);
     rb_define_singleton_method(cHMAC, "digest", ossl_hmac_s_digest, 3);
     rb_define_singleton_method(cHMAC, "hexdigest", ossl_hmac_s_hexdigest, 3);
-    
+
     rb_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
     rb_define_copy_func(cHMAC, ossl_hmac_copy);
 
+    rb_define_method(cHMAC, "reset", ossl_hmac_reset, 0);
     rb_define_method(cHMAC, "update", ossl_hmac_update, 1);
     rb_define_alias(cHMAC, "<<", "update");
     rb_define_method(cHMAC, "digest", ossl_hmac_digest, 0);
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index 66e28374cc..b67dd225a1 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -42,12 +42,12 @@ ossl_spki_alloc(VALUE klass)
 {
     NETSCAPE_SPKI *spki;
     VALUE obj;
-	
+
     if (!(spki = NETSCAPE_SPKI_new())) {
 	ossl_raise(eSPKIError, NULL);
-    }	
+    }
     WrapSPKI(klass, obj, spki);
-	
+
     return obj;
 }
 
@@ -56,15 +56,15 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
 {
     NETSCAPE_SPKI *spki;
     VALUE buffer;
-    unsigned char *p;
-	
+    const unsigned char *p;
+
     if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
 	return self;
     }
     StringValue(buffer);
-    if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING(buffer)->ptr, -1))) {
-	p = RSTRING(buffer)->ptr;
-	if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING(buffer)->len))) {
+    if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) {
+	p = (unsigned char *)RSTRING_PTR(buffer);
+	if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
 	    ossl_raise(eSPKIError, NULL);
 	}
     }
@@ -87,11 +87,11 @@ ossl_spki_to_der(VALUE self)
     if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
         ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
         ossl_raise(eX509CertError, NULL);
     ossl_str_adjust(str, p);
-    
+
     return str;
 }
 
@@ -101,7 +101,7 @@ ossl_spki_to_pem(VALUE self)
     NETSCAPE_SPKI *spki;
     char *data;
     VALUE str;
-	
+
     GetSPKI(self, spki);
     if (!(data = NETSCAPE_SPKI_b64_encode(spki))) {
 	ossl_raise(eSPKIError, NULL);
@@ -118,7 +118,7 @@ ossl_spki_print(VALUE self)
     BIO *out;
     BUF_MEM *buf;
     VALUE str;
-	
+
     GetSPKI(self, spki);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eSPKIError, NULL);
@@ -130,7 +130,7 @@ ossl_spki_print(VALUE self)
     BIO_get_mem_ptr(out, &buf);
     str = rb_str_new(buf->data, buf->length);
     BIO_free(out);
-	
+
     return str;
 }
 
@@ -172,7 +172,7 @@ ossl_spki_get_challenge(VALUE self)
 	return rb_str_new(0, 0);
     }
 
-    return rb_str_new(spki->spkac->challenge->data,
+    return rb_str_new((const char *)spki->spkac->challenge->data,
 		      spki->spkac->challenge->length);
 }
 
@@ -183,11 +183,11 @@ ossl_spki_set_challenge(VALUE self, VALUE str)
 
     StringValue(str);
     GetSPKI(self, spki);
-    if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING(str)->ptr,
-			 RSTRING(str)->len)) {
+    if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING_PTR(str),
+			 RSTRING_LEN(str))) {
 	ossl_raise(eSPKIError, NULL);
     }
-    
+
     return str;
 }
 
@@ -235,14 +235,14 @@ void
 Init_ossl_ns_spki()
 {
     mNetscape = rb_define_module_under(mOSSL, "Netscape");
-	
+
     eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
-	
+
     cSPKI = rb_define_class_under(mNetscape, "SPKI", rb_cObject);
-	
+
     rb_define_alloc_func(cSPKI, ossl_spki_alloc);
     rb_define_method(cSPKI, "initialize", ossl_spki_initialize, -1);
-	
+
     rb_define_method(cSPKI, "to_der", ossl_spki_to_der, 0);
     rb_define_method(cSPKI, "to_pem", ossl_spki_to_pem, 0);
     rb_define_alias(cSPKI, "to_s", "to_pem");
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index b5ea9dadf5..7c42839153 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -103,15 +103,17 @@ static VALUE
 ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
-    unsigned char *p;
+    const unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
+	OCSP_REQUEST *req = DATA_PTR(self), *x;
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
-	p = (unsigned char*)RSTRING(arg)->ptr;
-	if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
-			     RSTRING(arg)->len)){
+	p = (unsigned char*)RSTRING_PTR(arg);
+	x = d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg));
+	DATA_PTR(self) = req;
+	if(!x){
 	    ossl_raise(eOCSPError, "cannot load DER encoded request");
 	}
     }
@@ -134,7 +136,7 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
     else{
 	StringValue(val);
 	GetOCSPReq(self, req);
-	ret = OCSP_request_add1_nonce(req, RSTRING(val)->ptr, RSTRING(val)->len);
+	ret = OCSP_request_add1_nonce(req, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
     }
     if(!ret) ossl_raise(eOCSPError, NULL);
 
@@ -243,7 +245,7 @@ ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
     x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     x509s = ossl_x509_ary2sk(certs);
     GetOCSPReq(self, req);
     result = OCSP_request_verify(req, x509s, x509st, flg);
@@ -265,7 +267,7 @@ ossl_ocspreq_to_der(VALUE self)
     if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0)
 	ossl_raise(eOCSPError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_OCSP_REQUEST(req, &p) <= 0)
 	ossl_raise(eOCSPError, NULL);
     ossl_str_adjust(str, p);
@@ -310,15 +312,17 @@ static VALUE
 ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
-    unsigned char *p;
+    const unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
+	OCSP_RESPONSE *res = DATA_PTR(self), *x;
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
-	p = RSTRING(arg)->ptr;
-	if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
-			      RSTRING(arg)->len)){
+	p = (unsigned char *)RSTRING_PTR(arg);
+	x = d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg));
+	DATA_PTR(self) = res;
+	if(!x){
 	    ossl_raise(eOCSPError, "cannot load DER encoded response");
 	}
     }
@@ -377,8 +381,8 @@ ossl_ocspres_to_der(VALUE self)
     if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
 	ossl_raise(eOCSPError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_OCSP_RESPONSE(res, NULL) <= 0)
+    p = (unsigned char *)RSTRING_PTR(str);
+    if(i2d_OCSP_RESPONSE(res, &p) <= 0)
 	ossl_raise(eOCSPError, NULL);
     ossl_str_adjust(str, p);
 
@@ -436,7 +440,7 @@ ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
     else{
 	StringValue(val);
 	GetOCSPBasicRes(self, bs);
-	ret = OCSP_basic_add1_nonce(bs, RSTRING(val)->ptr, RSTRING(val)->len);
+	ret = OCSP_basic_add1_nonce(bs, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
     }
     if(!ret) ossl_raise(eOCSPError, NULL);
 
@@ -461,8 +465,8 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     if(!NIL_P(ext)){
 	/* All ary's members should be X509Extension */
 	Check_Type(ext, T_ARRAY);
-	for (i = 0; i < RARRAY(ext)->len; i++)
-	    OSSL_Check_Kind(RARRAY(ext)->ptr[i], cX509Ext);
+	for (i = 0; i < RARRAY_LEN(ext); i++)
+	    OSSL_Check_Kind(RARRAY_PTR(ext)[i], cX509Ext);
     }
 
     error = 0;
@@ -490,8 +494,8 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 	X509_EXTENSION *x509ext;
 	sk_X509_EXTENSION_pop_free(single->singleExtensions, X509_EXTENSION_free);
 	single->singleExtensions = NULL;
-	for(i = 0; i < RARRAY(ext)->len; i++){
-	    x509ext = DupX509ExtPtr(RARRAY(ext)->ptr[i]);
+	for(i = 0; i < RARRAY_LEN(ext); i++){
+	    x509ext = DupX509ExtPtr(RARRAY_PTR(ext)[i]);
 	    if(!OCSP_SINGLERESP_add_ext(single, x509ext, -1)){
 		X509_EXTENSION_free(x509ext);
 		error = 1;
@@ -554,7 +558,7 @@ ossl_ocspbres_get_status(VALUE self)
     }
 
     return ret;
-} 
+}
 
 static VALUE
 ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
@@ -589,22 +593,22 @@ ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
 {
-    VALUE certs, store, flags;
+    VALUE certs, store, flags, result;
     OCSP_BASICRESP *bs;
     STACK_OF(X509) *x509s;
     X509_STORE *x509st;
-    int flg, result;
+    int flg;
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
     x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     x509s = ossl_x509_ary2sk(certs);
     GetOCSPBasicRes(self, bs);
-    result = OCSP_basic_verify(bs, x509s, x509st, flg);
+    result = OCSP_basic_verify(bs, x509s, x509st, flg) > 0 ? Qtrue : Qfalse;
     sk_X509_pop_free(x509s, X509_free);
     if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
 
-    return result ? Qtrue : Qfalse;
+    return result;
 }
 
 /*
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index e7d9954c5a..85e092b251 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -30,7 +30,6 @@
 /*
  * Classes
  */
-VALUE mPKCS12;
 VALUE cPKCS12;
 VALUE ePKCS12Error;
 
@@ -49,32 +48,85 @@ ossl_pkcs12_s_allocate(VALUE klass)
     return obj;
 }
 
+/*
+ * call-seq:
+ *    PKCS12.create(pass, name, key, cert [, ca, [, key_pbe [, cert_pbe [, key_iter [, mac_iter [, keytype]]]]]])
+ *
+ * === Parameters
+ * * +pass+ - string
+ * * +name+ - A string describing the key.
+ * * +key+ - Any PKey.
+ * * +cert+ - A X509::Certificate.
+ * * * The public_key portion of the certificate must contain a valid public key.
+ * * * The not_before and not_after fields must be filled in.
+ * * +ca+ - An optional array of X509::Certificate's.
+ * * +key_pbe+ - string
+ * * +cert_pbe+ - string
+ * * +key_iter+ - integer
+ * * +mac_iter+ - integer
+ * * +keytype+ - An integer representing an MSIE specific extension.
+ *
+ * Any optional arguments may be supplied as nil to preserve the OpenSSL defaults.
+ *
+ * See the OpenSSL documentation for PKCS12_create().
+ */
 static VALUE
 ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
 {
-    VALUE pass, name, pkey, cert, ca;
+    VALUE pass, name, pkey, cert, ca, key_nid, cert_nid, key_iter, mac_iter, keytype;
     VALUE obj;
     char *passphrase, *friendlyname;
     EVP_PKEY *key;
     X509 *x509;
     STACK_OF(X509) *x509s;
+    int nkey = 0, ncert = 0, kiter = 0, miter = 0, ktype = 0;
     PKCS12 *p12;
-    
-    rb_scan_args(argc, argv, "41", &pass, &name, &pkey, &cert, &ca);
+
+    rb_scan_args(argc, argv, "46", &pass, &name, &pkey, &cert, &ca, &key_nid, &cert_nid, &key_iter, &mac_iter, &keytype);
     passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
     friendlyname = NIL_P(name) ? NULL : StringValuePtr(name);
     key = GetPKeyPtr(pkey);
     x509 = GetX509CertPtr(cert);
     x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
+/* TODO: make a VALUE to nid function */
+    if (!NIL_P(key_nid)) {
+        if ((nkey = OBJ_txt2nid(StringValuePtr(key_nid))) == NID_undef)
+            rb_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(key_nid));
+    }
+    if (!NIL_P(cert_nid)) {
+        if ((ncert = OBJ_txt2nid(StringValuePtr(cert_nid))) == NID_undef)
+            rb_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(cert_nid));
+    }
+    if (!NIL_P(key_iter))
+        kiter = NUM2INT(key_iter);
+    if (!NIL_P(mac_iter))
+        miter = NUM2INT(mac_iter);
+    if (!NIL_P(keytype))
+        ktype = NUM2INT(keytype);
+
     p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
-                        0, 0, 0, 0, 0);
+                        nkey, ncert, kiter, miter, ktype);
     sk_X509_pop_free(x509s, X509_free);
     if(!p12) ossl_raise(ePKCS12Error, NULL);
     WrapPKCS12(cPKCS12, obj, p12);
 
+    ossl_pkcs12_set_key(obj, pkey);
+    ossl_pkcs12_set_cert(obj, cert);
+    ossl_pkcs12_set_ca_certs(obj, ca);
+
     return obj;
 }
 
+/*
+ * call-seq:
+ *    PKCS12.new -> pkcs12
+ *    PKCS12.new(str) -> pkcs12
+ *    PKCS12.new(str, pass) -> pkcs12
+ *
+ * === Parameters
+ * * +str+ - Must be a DER encoded PKCS12 string.
+ * * +pass+ - string
+ */
 static VALUE
 ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -85,16 +137,18 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
     X509 *x509;
     STACK_OF(X509) *x509s = NULL;
     int st = 0;
+    PKCS12 *pkcs = DATA_PTR(self);
 
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
     passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
     in = ossl_obj2bio(arg);
-    d2i_PKCS12_bio(in, (PKCS12 **)&DATA_PTR(self));
+    d2i_PKCS12_bio(in, &pkcs);
+    DATA_PTR(self) = pkcs;
     BIO_free(in);
 
     pkey = cert = ca = Qnil;
-    if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s))
-	ossl_raise(ePKCS12Error, NULL);
+    if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
+	ossl_raise(ePKCS12Error, "PKCS12_parse");
     pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
 		      &st); /* NO DUP */
     if(st) goto err;
@@ -129,7 +183,7 @@ ossl_pkcs12_to_der(VALUE self)
     if((len = i2d_PKCS12(p12, NULL)) <= 0)
 	ossl_raise(ePKCS12Error, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_PKCS12(p12, &p) <= 0)
 	ossl_raise(ePKCS12Error, NULL);
     ossl_str_adjust(str, p);
@@ -140,10 +194,14 @@ ossl_pkcs12_to_der(VALUE self)
 void
 Init_ossl_pkcs12()
 {
-    mPKCS12 = rb_define_module_under(mOSSL, "PKCS12");
-    cPKCS12 = rb_define_class_under(mPKCS12, "PKCS12", rb_cObject);
-    ePKCS12Error = rb_define_class_under(mPKCS12, "PKCS12Error", eOSSLError);
-    rb_define_module_function(mPKCS12, "create", ossl_pkcs12_s_create, -1);
+    /*
+     * Defines a file format commonly used to store private keys with
+     * accompanying public key certificates, protected with a password-based
+     * symmetric key.
+     */
+    cPKCS12 = rb_define_class_under(mOSSL, "PKCS12", rb_cObject);
+    ePKCS12Error = rb_define_class_under(cPKCS12, "PKCS12Error", eOSSLError);
+    rb_define_singleton_method(cPKCS12, "create", ossl_pkcs12_s_create, -1);
 
     rb_define_alloc_func(cPKCS12, ossl_pkcs12_s_allocate);
     rb_attr(cPKCS12, rb_intern("key"), 1, 0, Qfalse);
diff --git a/ext/openssl/ossl_pkcs12.h b/ext/openssl/ossl_pkcs12.h
index 01dde2bc30..24d25d00bb 100644
--- a/ext/openssl/ossl_pkcs12.h
+++ b/ext/openssl/ossl_pkcs12.h
@@ -6,7 +6,6 @@
 #if !defined(_OSSL_PKCS12_H_)
 #define _OSSL_PKCS12_H_
 
-extern VALUE mPKCS12;
 extern VALUE cPKCS12;
 extern VALUE ePKCS12Error;
 
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
new file mode 100644
index 0000000000..18d166d1ca
--- /dev/null
+++ b/ext/openssl/ossl_pkcs5.c
@@ -0,0 +1,98 @@
+/*
+ * $Id$
+ * Copyright (C) 2007 Technorama Ltd. <oss-ruby@technorama.net>
+ */
+#include "ossl.h"
+
+VALUE mPKCS5;
+VALUE ePKCS5;
+
+#ifdef HAVE_PKCS5_PBKDF2_HMAC
+/*
+ * call-seq:
+ *    PKCS5.pbkdf2_hmac(pass, salt, iter, keylen, digest) => string
+ *
+ * === Parameters
+ * * +pass+ - string
+ * * +salt+ - string
+ * * +iter+ - integer - should be greater than 1000.  2000 is better.
+ * * +keylen+ - integer
+ * * +digest+ - a string or OpenSSL::Digest object.
+ *
+ * Available in OpenSSL 0.9.9?.
+ *
+ * Digests other than SHA1 may not be supported by other cryptography libraries.
+ */
+static VALUE
+ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen, VALUE digest)
+{
+    VALUE str;
+    const EVP_MD *md;
+    int len = NUM2INT(keylen);
+
+    StringValue(pass);
+    StringValue(salt);
+    md = GetDigestPtr(digest);
+
+    str = rb_str_new(0, len);
+
+    if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), md, len, RSTRING_PTR(str)) != 1)
+        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");
+
+    return str;
+}
+#else
+#define ossl_pkcs5_pbkdf2_hmac rb_f_notimplement
+#endif
+
+
+#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
+/*
+ * call-seq:
+ *    PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, keylen) => string
+ *
+ * === Parameters
+ * * +pass+ - string
+ * * +salt+ - string
+ * * +iter+ - integer - should be greater than 1000.  2000 is better.
+ * * +keylen+ - integer
+ *
+ * This method is available almost any version OpenSSL.
+ *
+ * Conforms to rfc2898.
+ */
+static VALUE
+ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen)
+{
+    VALUE str;
+    int len = NUM2INT(keylen);
+
+    StringValue(pass);
+    StringValue(salt);
+
+    str = rb_str_new(0, len);
+
+    if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass),
+			       (const unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter),
+			       len, (unsigned char *)RSTRING_PTR(str)) != 1)
+        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
+
+    return str;
+}
+#else
+#define ossl_pkcs5_pbkdf2_hmac_sha1 rb_f_notimplement
+#endif
+
+void
+Init_ossl_pkcs5()
+{
+    /*
+     * Password-based Encryption
+     *
+     */
+    mPKCS5 = rb_define_module_under(mOSSL, "PKCS5");
+    ePKCS5 = rb_define_class_under(mPKCS5, "PKCS5Error", eOSSLError);
+
+    rb_define_module_function(mPKCS5, "pbkdf2_hmac", ossl_pkcs5_pbkdf2_hmac, 5);
+    rb_define_module_function(mPKCS5, "pbkdf2_hmac_sha1", ossl_pkcs5_pbkdf2_hmac_sha1, 4);
+}
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index 0fcabd7777..68494c2e0b 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -68,10 +68,9 @@
 #define ossl_pkcs7_set_err_string(o,v) rb_iv_set((o), "@error_string", (v))
 #define ossl_pkcs7_get_err_string(o)   rb_iv_get((o), "@error_string")
 
-/* 
+/*
  * Classes
  */
-VALUE mPKCS7;
 VALUE cPKCS7;
 VALUE cPKCS7Signer;
 VALUE cPKCS7Recipient;
@@ -98,7 +97,7 @@ static PKCS7_SIGNER_INFO *
 DupPKCS7SignerPtr(VALUE obj)
 {
     PKCS7_SIGNER_INFO *p7si, *pkcs7;
-	
+
     SafeGetPKCS7si(obj, p7si);
     if (!(pkcs7 = PKCS7_SIGNER_INFO_dup(p7si))) {
 	ossl_raise(ePKCS7Error, NULL);
@@ -124,7 +123,7 @@ static PKCS7_RECIP_INFO *
 DupPKCS7RecipientPtr(VALUE obj)
 {
     PKCS7_RECIP_INFO *p7ri, *pkcs7;
-	
+
     SafeGetPKCS7ri(obj, p7ri);
     if (!(pkcs7 = PKCS7_RECIP_INFO_dup(p7ri))) {
 	ossl_raise(ePKCS7Error, NULL);
@@ -134,7 +133,8 @@ DupPKCS7RecipientPtr(VALUE obj)
 }
 
 /*
- * Private
+ * call-seq:
+ *    PKCS7.read_smime(string) => pkcs7
  */
 static VALUE
 ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
@@ -156,6 +156,10 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
     return ret;
 }
 
+/*
+ * call-seq:
+ *    PKCS7.write_smime(pkcs7 [, data [, flags]]) => string
+ */
 static VALUE
 ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
 {
@@ -187,6 +191,10 @@ ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
     return str;
 }
 
+/*
+ * call-seq:
+ *    PKCS7.sign(cert, key, data, [, certs [, flags]]) => pkcs7
+ */
 static VALUE
 ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
 {
@@ -226,6 +234,10 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
     return ret;
 }
 
+/*
+ * call-seq:
+ *    PKCS7.encrypt(certs, data, [, cipher [, flags]]) => pkcs7
+ */
 static VALUE
 ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 {
@@ -283,14 +295,21 @@ ossl_pkcs7_alloc(VALUE klass)
 	ossl_raise(ePKCS7Error, NULL);
     }
     WrapPKCS7(klass, obj, pkcs7);
-    
+
     return obj;
 }
 
+/*
+ * call-seq:
+ *    PKCS7.new => pkcs7
+ *    PKCS7.new(string) => pkcs7
+ *
+ * Many methods in this class aren't documented.
+ */
 static VALUE
 ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 {
-    PKCS7 *p7;
+    PKCS7 *p7, *pkcs = DATA_PTR(self);
     BIO *in;
     VALUE arg;
 
@@ -298,10 +317,12 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    p7 = PEM_read_bio_PKCS7(in, (PKCS7 **)&DATA_PTR(self), NULL, NULL);
+    p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
+    DATA_PTR(self) = pkcs;
     if (!p7) {
-	BIO_reset(in);
-        p7 = d2i_PKCS7_bio(in, (PKCS7 **)&DATA_PTR(self));
+	(void)BIO_reset(in);
+        p7 = d2i_PKCS7_bio(in, &pkcs);
+	DATA_PTR(self) = pkcs;
     }
     BIO_free(in);
     ossl_pkcs7_set_data(self, Qnil);
@@ -335,7 +356,7 @@ static int
 ossl_pkcs7_sym2typeid(VALUE sym)
 {
     int i, ret = Qnil;
-    char *s;
+    const char *s;
 
     static struct {
         const char *name;
@@ -364,6 +385,10 @@ ossl_pkcs7_sym2typeid(VALUE sym)
     return ret;
 }
 
+/*
+ * call-seq:
+ *    pkcs7.type = type => type
+ */
 static VALUE
 ossl_pkcs7_set_type(VALUE self, VALUE type)
 {
@@ -376,6 +401,10 @@ ossl_pkcs7_set_type(VALUE self, VALUE type)
     return type;
 }
 
+/*
+ * call-seq:
+ *    pkcs7.type => string or nil
+ */
 static VALUE
 ossl_pkcs7_get_type(VALUE self)
 {
@@ -466,7 +495,7 @@ ossl_pkcs7_get_signer(VALUE self)
     PKCS7_SIGNER_INFO *si;
     int num, i;
     VALUE ary;
-    
+
     GetPKCS7(self, pkcs7);
     if (!(sk = PKCS7_get_signer_info(pkcs7))) {
 	OSSL_Debug("OpenSSL::PKCS7#get_signer_info == NULL!");
@@ -508,7 +537,7 @@ ossl_pkcs7_get_recipient(VALUE self)
     PKCS7_RECIP_INFO *si;
     int num, i;
     VALUE ary;
-    
+
     GetPKCS7(self, pkcs7);
     if (PKCS7_type_is_enveloped(pkcs7))
 	sk = pkcs7->d.enveloped->recipientinfo;
@@ -543,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert)
     return self;
 }
 
-static STACK *
-pkcs7_get_certs_or_crls(VALUE self, int want_certs)
+static STACK_OF(X509) *
+pkcs7_get_certs(VALUE self)
 {
     PKCS7 *pkcs7;
     STACK_OF(X509) *certs;
-    STACK_OF(X509_CRL) *crls;
     int i;
 
     GetPKCS7(self, pkcs7);
@@ -556,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs)
     switch(i){
     case NID_pkcs7_signed:
         certs = pkcs7->d.sign->cert;
-        crls = pkcs7->d.sign->crl;
         break;
     case NID_pkcs7_signedAndEnveloped:
         certs = pkcs7->d.signed_and_enveloped->cert;
+        break;
+    default:
+        certs = NULL;
+    }
+
+    return certs;
+}
+
+static STACK_OF(X509_CRL) *
+pkcs7_get_crls(VALUE self)
+{
+    PKCS7 *pkcs7;
+    STACK_OF(X509_CRL) *crls;
+    int i;
+
+    GetPKCS7(self, pkcs7);
+    i = OBJ_obj2nid(pkcs7->type);
+    switch(i){
+    case NID_pkcs7_signed:
+        crls = pkcs7->d.sign->crl;
+        break;
+    case NID_pkcs7_signedAndEnveloped:
         crls = pkcs7->d.signed_and_enveloped->crl;
         break;
     default:
-        certs = crls = NULL;
+        crls = NULL;
     }
 
-    return want_certs ? certs : crls;
+    return crls;
 }
 
 static VALUE
@@ -581,9 +630,9 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
     STACK_OF(X509) *certs;
     X509 *cert;
 
-    certs = pkcs7_get_certs_or_crls(self, 1);
+    certs = pkcs7_get_certs(self);
     while((cert = sk_X509_pop(certs))) X509_free(cert);
-    rb_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self);
+    rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
 
     return ary;
 }
@@ -591,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
 static VALUE
 ossl_pkcs7_get_certificates(VALUE self)
 {
-    return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
+    return ossl_x509_sk2ary(pkcs7_get_certs(self));
 }
 
 static VALUE
@@ -621,9 +670,9 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
     STACK_OF(X509_CRL) *crls;
     X509_CRL *crl;
 
-    crls = pkcs7_get_certs_or_crls(self, 0);
+    crls = pkcs7_get_crls(self);
     while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
-    rb_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self);
+    rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
 
     return ary;
 }
@@ -631,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
 static VALUE
 ossl_pkcs7_get_crls(VALUE self)
 {
-    return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
+    return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
 }
 
 static VALUE
@@ -728,7 +777,7 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
     }
     if(!PKCS7_dataFinal(pkcs7, out)) goto err;
     ossl_pkcs7_set_data(self, Qnil);
-    
+
  err:
     BIO_free(out);
     BIO_free(in);
@@ -751,7 +800,7 @@ ossl_pkcs7_to_der(VALUE self)
     if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
 	ossl_raise(ePKCS7Error, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_PKCS7(pkcs7, &p) <= 0)
 	ossl_raise(ePKCS7Error, NULL);
     ossl_str_adjust(str, p);
@@ -765,7 +814,7 @@ ossl_pkcs7_to_pem(VALUE self)
     PKCS7 *pkcs7;
     BIO *out;
     VALUE str;
-	
+
     GetPKCS7(self, pkcs7);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(ePKCS7Error, NULL);
@@ -840,9 +889,9 @@ ossl_pkcs7si_get_signed_time(VALUE self)
 {
     PKCS7_SIGNER_INFO *p7si;
     ASN1_TYPE *asn1obj;
-	
+
     GetPKCS7si(self, p7si);
-	
+
     if (!(asn1obj = PKCS7_get_signed_attribute(p7si, NID_pkcs9_signingTime))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
@@ -926,15 +975,12 @@ ossl_pkcs7ri_get_enc_key(VALUE self)
 void
 Init_ossl_pkcs7()
 {
-    mPKCS7 = rb_define_module_under(mOSSL, "PKCS7");
-
-    ePKCS7Error = rb_define_class_under(mPKCS7, "PKCS7Error", eOSSLError);
-
-    cPKCS7 = rb_define_class_under(mPKCS7, "PKCS7", rb_cObject);
-    rb_define_singleton_method(mPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
-    rb_define_singleton_method(mPKCS7, "write_smime", ossl_pkcs7_s_write_smime, -1);
-    rb_define_singleton_method(mPKCS7, "sign",  ossl_pkcs7_s_sign, -1);
-    rb_define_singleton_method(mPKCS7, "encrypt", ossl_pkcs7_s_encrypt, -1);
+    cPKCS7 = rb_define_class_under(mOSSL, "PKCS7", rb_cObject);
+    ePKCS7Error = rb_define_class_under(cPKCS7, "PKCS7Error", eOSSLError);
+    rb_define_singleton_method(cPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
+    rb_define_singleton_method(cPKCS7, "write_smime", ossl_pkcs7_s_write_smime, -1);
+    rb_define_singleton_method(cPKCS7, "sign",  ossl_pkcs7_s_sign, -1);
+    rb_define_singleton_method(cPKCS7, "encrypt", ossl_pkcs7_s_encrypt, -1);
     rb_attr(cPKCS7, rb_intern("data"), 1, 0, Qfalse);
     rb_attr(cPKCS7, rb_intern("error_string"), 1, 1, Qfalse);
     rb_define_alloc_func(cPKCS7, ossl_pkcs7_alloc);
@@ -964,8 +1010,8 @@ Init_ossl_pkcs7()
     rb_define_alias(cPKCS7,  "to_s", "to_pem");
     rb_define_method(cPKCS7, "to_der", ossl_pkcs7_to_der, 0);
 
-    cPKCS7Signer = rb_define_class_under(mPKCS7, "SignerInfo", rb_cObject);
-    rb_define_const(mPKCS7, "Signer", cPKCS7Signer);
+    cPKCS7Signer = rb_define_class_under(cPKCS7, "SignerInfo", rb_cObject);
+    rb_define_const(cPKCS7, "Signer", cPKCS7Signer);
     rb_define_alloc_func(cPKCS7Signer, ossl_pkcs7si_alloc);
     rb_define_method(cPKCS7Signer, "initialize", ossl_pkcs7si_initialize,3);
     rb_define_method(cPKCS7Signer, "issuer", ossl_pkcs7si_get_issuer, 0);
@@ -973,14 +1019,14 @@ Init_ossl_pkcs7()
     rb_define_method(cPKCS7Signer, "serial", ossl_pkcs7si_get_serial,0);
     rb_define_method(cPKCS7Signer,"signed_time",ossl_pkcs7si_get_signed_time,0);
 
-    cPKCS7Recipient = rb_define_class_under(mPKCS7,"RecipientInfo",rb_cObject);
+    cPKCS7Recipient = rb_define_class_under(cPKCS7,"RecipientInfo",rb_cObject);
     rb_define_alloc_func(cPKCS7Recipient, ossl_pkcs7ri_alloc);
-    rb_define_method(cPKCS7Recipient, "initialize", ossl_pkcs7ri_initialize,1); 
+    rb_define_method(cPKCS7Recipient, "initialize", ossl_pkcs7ri_initialize,1);
     rb_define_method(cPKCS7Recipient, "issuer", ossl_pkcs7ri_get_issuer,0);
     rb_define_method(cPKCS7Recipient, "serial", ossl_pkcs7ri_get_serial,0);
-    rb_define_method(cPKCS7Recipient, "enc_key", ossl_pkcs7ri_get_enc_key,0); 
+    rb_define_method(cPKCS7Recipient, "enc_key", ossl_pkcs7ri_get_enc_key,0);
 
-#define DefPKCS7Const(x) rb_define_const(mPKCS7, #x, INT2NUM(PKCS7_##x))
+#define DefPKCS7Const(x) rb_define_const(cPKCS7, #x, INT2NUM(PKCS7_##x))
 
     DefPKCS7Const(TEXT);
     DefPKCS7Const(NOCERTS);
diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h
index f5942d65db..371c421103 100644
--- a/ext/openssl/ossl_pkcs7.h
+++ b/ext/openssl/ossl_pkcs7.h
@@ -11,7 +11,6 @@
 #if !defined(_OSSL_PKCS7_H_)
 #define _OSSL_PKCS7_H_
 
-extern VALUE mPKCS7;
 extern VALUE cPKCS7;
 extern VALUE cPKCS7Signer;
 extern VALUE cPKCS7Recipient;
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index d54f5b938e..16ceff4997 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -55,6 +55,10 @@ ossl_pkey_new(EVP_PKEY *pkey)
     case EVP_PKEY_DH:
 	return ossl_dh_new(pkey);
 #endif
+#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
+    case EVP_PKEY_EC:
+	return ossl_ec_new(pkey);
+#endif
     default:
 	ossl_raise(ePKeyError, "unsupported key type");
     }
@@ -68,7 +72,7 @@ ossl_pkey_new_from_file(VALUE filename)
     EVP_PKEY *pkey;
 
     SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
+    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
 	ossl_raise(ePKeyError, "%s", strerror(errno));
     }
 
@@ -95,7 +99,7 @@ EVP_PKEY *
 GetPrivPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
-	
+
     if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
 	ossl_raise(rb_eArgError, "Private key is needed.");
     }
@@ -119,7 +123,7 @@ EVP_PKEY *
 DupPrivPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
-	
+
     if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
 	ossl_raise(rb_eArgError, "Private key is needed.");
     }
@@ -160,7 +164,7 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
 {
     EVP_PKEY *pkey;
     EVP_MD_CTX ctx;
-    int buf_len;
+    unsigned int buf_len;
     VALUE str;
 
     if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
@@ -169,13 +173,12 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
     GetPKey(self, pkey);
     EVP_SignInit(&ctx, GetDigestPtr(digest));
     StringValue(data);
-    EVP_SignUpdate(&ctx, RSTRING(data)->ptr, RSTRING(data)->len);
+    EVP_SignUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
     str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
-    if (!EVP_SignFinal(&ctx, RSTRING(str)->ptr, &buf_len, pkey))
+    if (!EVP_SignFinal(&ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey))
 	ossl_raise(ePKeyError, NULL);
-    assert(buf_len <= RSTRING(str)->len);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
+    assert((long)buf_len <= RSTRING_LEN(str));
+    rb_str_set_len(str, buf_len);
 
     return str;
 }
@@ -190,8 +193,8 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
     EVP_VerifyInit(&ctx, GetDigestPtr(digest));
     StringValue(sig);
     StringValue(data);
-    EVP_VerifyUpdate(&ctx, RSTRING(data)->ptr, RSTRING(data)->len);
-    switch (EVP_VerifyFinal(&ctx, RSTRING(sig)->ptr, RSTRING(sig)->len, pkey)) {
+    EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+    switch (EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
     case 0:
 	return Qfalse;
     case 1:
@@ -211,26 +214,27 @@ Init_ossl_pkey()
 #if 0 /* let rdoc know about mOSSL */
     mOSSL = rb_define_module("OpenSSL");
 #endif
-        
+
     mPKey = rb_define_module_under(mOSSL, "PKey");
-	
+
     ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 
     cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
-	
+
     rb_define_alloc_func(cPKey, ossl_pkey_alloc);
     rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
 
     rb_define_method(cPKey, "sign", ossl_pkey_sign, 2);
     rb_define_method(cPKey, "verify", ossl_pkey_verify, 3);
-	
+
     id_private_q = rb_intern("private?");
-	
+
     /*
-     * INIT rsa, dsa
+     * INIT rsa, dsa, dh, ec
      */
     Init_ossl_rsa();
     Init_ossl_dsa();
     Init_ossl_dh();
+    Init_ossl_ec();
 }
 
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index 880a104675..67ff1fddd0 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -77,7 +77,24 @@ extern DH *OSSL_DEFAULT_DH_1024;
 VALUE ossl_dh_new(EVP_PKEY *);
 void Init_ossl_dh(void);
 
+/*
+ * EC
+ */
+extern VALUE cEC;
+extern VALUE eECError;
+extern VALUE cEC_GROUP;
+extern VALUE eEC_GROUP;
+extern VALUE cEC_POINT;
+extern VALUE eEC_POINT;
+VALUE ossl_ec_new(EVP_PKEY *);
+void Init_ossl_ec(void);
+
+
 #define OSSL_PKEY_BN(keytype, name)					\
+/*									\
+ *  call-seq:								\
+ *     key.##name -> aBN						\
+ */									\
 static VALUE ossl_##keytype##_get_##name(VALUE self)			\
 {									\
 	EVP_PKEY *pkey;							\
@@ -89,6 +106,10 @@ static VALUE ossl_##keytype##_get_##name(VALUE self)			\
 		return Qnil;						\
 	return ossl_bn_new(bn);						\
 }									\
+/*									\
+ *  call-seq:								\
+ *     key.##name = bn -> bn						\
+ */									\
 static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum)	\
 {									\
 	EVP_PKEY *pkey;							\
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index e16ede8bba..756ce6620c 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -42,7 +42,7 @@ dh_instance(VALUE klass, DH *dh)
 {
     EVP_PKEY *pkey;
     VALUE obj;
-	
+
     if (!dh) {
 	return Qfalse;
     }
@@ -85,7 +85,7 @@ static DH *
 dh_generate(int size, int gen)
 {
     DH *dh;
-    
+
     dh = DH_generate_parameters(size, gen,
 	    rb_block_given_p() ? ossl_generate_cb : NULL,
 	    NULL);
@@ -99,17 +99,26 @@ dh_generate(int size, int gen)
     return dh;
 }
 
+/*
+ *  call-seq:
+ *     DH.generate(size [, generator]) -> dh
+ *
+ *  === Parameters
+ *  * +size+ is an integer representing the desired key size.  Keys smaller than 1024 should be considered insecure.
+ *  * +generator+ is a small number > 1, typically 2 or 5.
+ *
+ */
 static VALUE
 ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
 {
     DH *dh ;
     int g = 2;
     VALUE size, gen, obj;
-	
+
     if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {
-	g = FIX2INT(gen);
+	g = NUM2INT(gen);
     }
-    dh = dh_generate(FIX2INT(size), g);
+    dh = dh_generate(NUM2INT(size), g);
     obj = dh_instance(klass, dh);
     if (obj == Qfalse) {
 	DH_free(dh);
@@ -119,6 +128,21 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
     return obj;
 }
 
+/*
+ *  call-seq:
+ *     DH.new([size [, generator] | string]) -> dh
+ *
+ *  === Parameters
+ *  * +size+ is an integer representing the desired key size.  Keys smaller than 1024 should be considered insecure.
+ *  * +generator+ is a small number > 1, typically 2 or 5.
+ *  * +string+ contains the DER or PEM encoded key.
+ *
+ *  === Examples
+ *  * DH.new -> dh
+ *  * DH.new(1024) -> dh
+ *  * DH.new(1024, 5) -> dh
+ *  * DH.new(File.read('key.pem')) -> dh
+ */
 static VALUE
 ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -134,7 +158,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     }
     else if (FIXNUM_P(arg)) {
 	if (!NIL_P(gen)) {
-	    g = FIX2INT(gen);
+	    g = NUM2INT(gen);
 	}
 	if (!(dh = dh_generate(FIX2INT(arg), g))) {
 	    ossl_raise(eDHError, NULL);
@@ -145,11 +169,15 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
 	in = ossl_obj2bio(arg);
 	dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
 	if (!dh){
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    dh = d2i_DHparams_bio(in, NULL);
 	}
 	BIO_free(in);
-	if (!dh) ossl_raise(eDHError, NULL);
+	if (!dh) {
+	    (void)ERR_get_error();
+	    ossl_raise(eDHError, NULL);
+	}
     }
     if (!EVP_PKEY_assign_DH(pkey, dh)) {
 	DH_free(dh);
@@ -158,29 +186,41 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ *  call-seq:
+ *     dh.public? -> true | false
+ *
+ */
 static VALUE
 ossl_dh_is_public(VALUE self)
 {
     EVP_PKEY *pkey;
 
     GetPKeyDH(self, pkey);
-    /*
-     * Do we need to check dhp->dh->public_pkey?
-     * return Qtrue;
-     */
+
     return (pkey->pkey.dh->pub_key) ? Qtrue : Qfalse;
 }
 
+/*
+ *  call-seq:
+ *     dh.private? -> true | false
+ *
+ */
 static VALUE
 ossl_dh_is_private(VALUE self)
 {
     EVP_PKEY *pkey;
 
     GetPKeyDH(self, pkey);
-	
+
     return (DH_PRIVATE(pkey->pkey.dh)) ? Qtrue : Qfalse;
 }
 
+/*
+ *  call-seq:
+ *     dh.to_pem -> aString
+ *
+ */
 static VALUE
 ossl_dh_export(VALUE self)
 {
@@ -201,9 +241,14 @@ ossl_dh_export(VALUE self)
     return str;
 }
 
+/*
+ *  call-seq:
+ *     dh.to_der -> aString
+ *
+ */
 static VALUE
 ossl_dh_to_der(VALUE self)
-{       
+{
     EVP_PKEY *pkey;
     unsigned char *p;
     long len;
@@ -213,7 +258,7 @@ ossl_dh_to_der(VALUE self)
     if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
 	ossl_raise(eDHError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
 	ossl_raise(eDHError, NULL);
     ossl_str_adjust(str, p);
@@ -222,6 +267,9 @@ ossl_dh_to_der(VALUE self)
 }
 
 /*
+ *  call-seq:
+ *     dh.params -> hash
+ *
  * Stores all parameters of key to the hash
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -240,11 +288,14 @@ ossl_dh_get_params(VALUE self)
     rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dh->g));
     rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dh->pub_key));
     rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dh->priv_key));
-    
+
     return hash;
 }
 
 /*
+ *  call-seq:
+ *     dh.to_text -> aString
+ *
  * Prints all parameters of key to buffer
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -270,7 +321,10 @@ ossl_dh_to_text(VALUE self)
 }
 
 /*
- * Makes new instance DH PUBLIC_KEY from PRIVATE_KEY
+ *  call-seq:
+ *     dh.public_key -> aDH
+ *
+ *  Makes new instance DH PUBLIC_KEY from PRIVATE_KEY
  */
 static VALUE
 ossl_dh_to_public_key(VALUE self)
@@ -278,7 +332,7 @@ ossl_dh_to_public_key(VALUE self)
     EVP_PKEY *pkey;
     DH *dh;
     VALUE obj;
-	
+
     GetPKeyDH(self, pkey);
     dh = DHparams_dup(pkey->pkey.dh); /* err check perfomed by dh_instance */
     obj = dh_instance(CLASS_OF(self), dh);
@@ -290,13 +344,18 @@ ossl_dh_to_public_key(VALUE self)
     return obj;
 }
 
+/*
+ *  call-seq:
+ *     dh.check_params -> true | false
+ *
+ */
 static VALUE
 ossl_dh_check_params(VALUE self)
 {
     DH *dh;
     EVP_PKEY *pkey;
     int codes;
-    
+
     GetPKeyDH(self, pkey);
     dh = pkey->pkey.dh;
 
@@ -307,6 +366,11 @@ ossl_dh_check_params(VALUE self)
     return codes == 0 ? Qtrue : Qfalse;
 }
 
+/*
+ *  call-seq:
+ *     dh.generate_key -> self
+ *
+ */
 static VALUE
 ossl_dh_generate_key(VALUE self)
 {
@@ -321,6 +385,18 @@ ossl_dh_generate_key(VALUE self)
     return self;
 }
 
+/*
+ *  call-seq:
+ *     dh.compute_key(pub_bn) -> aString
+ *
+ *  === Parameters
+ *  * +pub_bn+ is a OpenSSL::BN.
+ *
+ *  Returns aString containing a shared secret computed from the other parties public value.
+ *
+ *  See DH_compute_key() for further information.
+ *
+ */
 static VALUE
 ossl_dh_compute_key(VALUE self, VALUE pub)
 {
@@ -335,19 +411,18 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
     pub_key = GetBNPtr(pub);
     len = DH_size(dh);
     str = rb_str_new(0, len);
-    if ((len = DH_compute_key(RSTRING(str)->ptr, pub_key, dh)) < 0) {
+    if ((len = DH_compute_key((unsigned char *)RSTRING_PTR(str), pub_key, dh)) < 0) {
 	ossl_raise(eDHError, NULL);
     }
-    RSTRING(str)->len = len;
-    RSTRING(str)->ptr[len] = 0;
+    rb_str_set_len(str, len);
 
     return str;
 }
 
-OSSL_PKEY_BN(dh, p);
-OSSL_PKEY_BN(dh, g);
-OSSL_PKEY_BN(dh, pub_key);
-OSSL_PKEY_BN(dh, priv_key);
+OSSL_PKEY_BN(dh, p)
+OSSL_PKEY_BN(dh, g)
+OSSL_PKEY_BN(dh, pub_key)
+OSSL_PKEY_BN(dh, priv_key)
 
 /*
  * -----BEGIN DH PARAMETERS-----
@@ -365,10 +440,10 @@ static unsigned char DEFAULT_DH_512_PRIM[] = {
     0x08, 0x04, 0x8c, 0x52, 0x8f, 0xe3, 0x4a, 0x31,
     0x44, 0x47, 0x19, 0xa1, 0x4a, 0xc8, 0x8b, 0xcb,
 };
-static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 }; 
+static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 };
 DH *OSSL_DEFAULT_DH_512 = NULL;
 
-/* 
+/*
  * -----BEGIN DH PARAMETERS-----
  * MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
  * AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
@@ -406,7 +481,7 @@ ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen)
     dh->g = BN_bin2bn(g, glen, NULL);
     if (dh->p == NULL || dh->g == NULL){
         DH_free(dh);
-        ossl_raise(eDHError, NULL);
+	ossl_raise(eDHError, NULL);
     }
 
     return dh;
@@ -453,11 +528,9 @@ Init_ossl_dh()
 }
 
 #else /* defined NO_DH */
-#   warning >>> OpenSSL is compiled without DH support <<<
 void
 Init_ossl_dh()
 {
-    rb_warning("OpenSSL is compiled without DH support");
 }
 #endif /* NO_DH */
 
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index fdf23aa496..f87238a13c 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -36,7 +36,7 @@ dsa_instance(VALUE klass, DSA *dsa)
 {
     EVP_PKEY *pkey;
     VALUE obj;
-	
+
     if (!dsa) {
 	return Qfalse;
     }
@@ -99,10 +99,18 @@ dsa_generate(int size)
     return dsa;
 }
 
+/*
+ *  call-seq:
+ *    DSA.generate(size) -> dsa
+ *
+ *  === Parameters
+ *  * +size+ is an integer representing the desired key size.
+ *
+ */
 static VALUE
 ossl_dsa_s_generate(VALUE klass, VALUE size)
 {
-    DSA *dsa = dsa_generate(FIX2INT(size)); /* err handled by dsa_instance */
+    DSA *dsa = dsa_generate(NUM2INT(size)); /* err handled by dsa_instance */
     VALUE obj = dsa_instance(klass, dsa);
 
     if (obj == Qfalse) {
@@ -113,6 +121,22 @@ ossl_dsa_s_generate(VALUE klass, VALUE size)
     return obj;
 }
 
+/*
+ *  call-seq:
+ *    DSA.new([size | string [, pass]) -> dsa
+ *
+ *  === Parameters
+ *  * +size+ is an integer representing the desired key size.
+ *  * +string+ contains a DER or PEM encoded key.
+ *  * +pass+ is a string that contains a optional password.
+ *
+ *  === Examples
+ *  * DSA.new -> dsa
+ *  * DSA.new(1024) -> dsa
+ *  * DSA.new(File.read('dsa.pem')) -> dsa
+ *  * DSA.new(File.read('dsa.pem'), 'mypassword') -> dsa
+ *
+ */
 static VALUE
 ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -121,7 +145,7 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     BIO *in;
     char *passwd = NULL;
     VALUE arg, pass;
-	
+
     GetPKey(self, pkey);
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
         dsa = DSA_new();
@@ -137,23 +161,30 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 	in = ossl_obj2bio(arg);
 	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
 	if (!dsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
 	}
 	if (!dsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
 	}
 	if (!dsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
 	}
 	if (!dsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
 	}
 	BIO_free(in);
-	if (!dsa) ossl_raise(eDSAError, "Neither PUB key nor PRIV key:");
+	if (!dsa) {
+	    (void)ERR_get_error();
+	    ossl_raise(eDSAError, "Neither PUB key nor PRIV key:");
+	}
     }
     if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
 	DSA_free(dsa);
@@ -163,6 +194,11 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ *  call-seq:
+ *    dsa.public? -> true | false
+ *
+ */
 static VALUE
 ossl_dsa_is_public(VALUE self)
 {
@@ -170,23 +206,37 @@ ossl_dsa_is_public(VALUE self)
 
     GetPKeyDSA(self, pkey);
 
-    /*
-     * Do we need to check dsap->dsa->public_pkey?
-     * return Qtrue;
-     */
     return (pkey->pkey.dsa->pub_key) ? Qtrue : Qfalse;
 }
 
+/*
+ *  call-seq:
+ *    dsa.private? -> true | false
+ *
+ */
 static VALUE
 ossl_dsa_is_private(VALUE self)
 {
     EVP_PKEY *pkey;
-	
+
     GetPKeyDSA(self, pkey);
-	
+
     return (DSA_PRIVATE(self, pkey->pkey.dsa)) ? Qtrue : Qfalse;
 }
 
+/*
+ *  call-seq:
+ *    dsa.to_pem([cipher, password]) -> aString
+ *
+ *  === Parameters
+ *  +cipher+ is an OpenSSL::Cipher.
+ *  +password+ is a string containing your password.
+ *
+ *  === Examples
+ *  * DSA.to_pem -> aString
+ *  * DSA.to_pem(cipher, 'mypassword') -> aString
+ *
+ */
 static VALUE
 ossl_dsa_export(int argc, VALUE *argv, VALUE self)
 {
@@ -224,6 +274,11 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
     return str;
 }
 
+/*
+ *  call-seq:
+ *    dsa.to_der -> aString
+ *
+ */
 static VALUE
 ossl_dsa_to_der(VALUE self)
 {
@@ -241,7 +296,7 @@ ossl_dsa_to_der(VALUE self)
     if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
 	ossl_raise(eDSAError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_func(pkey->pkey.dsa, &p) < 0)
 	ossl_raise(eDSAError, NULL);
     ossl_str_adjust(str, p);
@@ -250,6 +305,9 @@ ossl_dsa_to_der(VALUE self)
 }
 
 /*
+ *  call-seq:
+ *    dsa.params -> hash
+ *
  * Stores all parameters of key to the hash
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -269,11 +327,14 @@ ossl_dsa_get_params(VALUE self)
     rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dsa->g));
     rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dsa->pub_key));
     rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dsa->priv_key));
-    
+
     return hash;
 }
 
 /*
+ *  call-seq:
+ *    dsa.to_text -> aString
+ *
  * Prints all parameters of key to buffer
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -299,6 +360,9 @@ ossl_dsa_to_text(VALUE self)
 }
 
 /*
+ *  call-seq:
+ *    dsa.public_key -> aDSA
+ *
  * Makes new instance DSA PUBLIC_KEY from PRIVATE_KEY
  */
 static VALUE
@@ -307,7 +371,7 @@ ossl_dsa_to_public_key(VALUE self)
     EVP_PKEY *pkey;
     DSA *dsa;
     VALUE obj;
-	
+
     GetPKeyDSA(self, pkey);
     /* err check performed by dsa_instance */
     dsa = DSAPublicKey_dup(pkey->pkey.dsa);
@@ -321,11 +385,16 @@ ossl_dsa_to_public_key(VALUE self)
 
 #define ossl_dsa_buf_size(pkey) (DSA_size((pkey)->pkey.dsa)+16)
 
+/*
+ *  call-seq:
+ *    dsa.syssign(string) -> aString
+ *
+ */
 static VALUE
 ossl_dsa_sign(VALUE self, VALUE data)
 {
     EVP_PKEY *pkey;
-    int buf_len;
+    unsigned int buf_len;
     VALUE str;
 
     GetPKeyDSA(self, pkey);
@@ -334,16 +403,21 @@ ossl_dsa_sign(VALUE self, VALUE data)
 	ossl_raise(eDSAError, "Private DSA key needed!");
     }
     str = rb_str_new(0, ossl_dsa_buf_size(pkey));
-    if (!DSA_sign(0, RSTRING(data)->ptr, RSTRING(data)->len, RSTRING(str)->ptr,
+    if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data),
+		  (unsigned char *)RSTRING_PTR(str),
 		  &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
 	ossl_raise(eDSAError, NULL);
     }
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
+    rb_str_set_len(str, buf_len);
 
     return str;
 }
 
+/*
+ *  call-seq:
+ *    dsa.sysverify(digest, sig) -> true | false
+ *
+ */
 static VALUE
 ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
 {
@@ -354,8 +428,8 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     StringValue(digest);
     StringValue(sig);
     /* type is ignored (0) */
-    ret = DSA_verify(0, RSTRING(digest)->ptr, RSTRING(digest)->len,
-		     RSTRING(sig)->ptr, RSTRING(sig)->len, pkey->pkey.dsa);
+    ret = DSA_verify(0, (unsigned char *)RSTRING_PTR(digest), RSTRING_LEN(digest),
+		     (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
     if (ret < 0) {
 	ossl_raise(eDSAError, NULL);
     }
@@ -366,11 +440,11 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     return Qfalse;
 }
 
-OSSL_PKEY_BN(dsa, p);
-OSSL_PKEY_BN(dsa, q);
-OSSL_PKEY_BN(dsa, g);
-OSSL_PKEY_BN(dsa, pub_key);
-OSSL_PKEY_BN(dsa, priv_key);
+OSSL_PKEY_BN(dsa, p)
+OSSL_PKEY_BN(dsa, q)
+OSSL_PKEY_BN(dsa, g)
+OSSL_PKEY_BN(dsa, pub_key)
+OSSL_PKEY_BN(dsa, priv_key)
 
 /*
  * INIT
@@ -386,7 +460,7 @@ Init_ossl_dsa()
     eDSAError = rb_define_class_under(mPKey, "DSAError", ePKeyError);
 
     cDSA = rb_define_class_under(mPKey, "DSA", cPKey);
-	
+
     rb_define_singleton_method(cDSA, "generate", ossl_dsa_s_generate, 1);
     rb_define_method(cDSA, "initialize", ossl_dsa_initialize, -1);
 
@@ -411,12 +485,8 @@ Init_ossl_dsa()
 }
 
 #else /* defined NO_DSA */
-#   warning >>> OpenSSL is compiled without DSA support <<<
-
 void
 Init_ossl_dsa()
 {
-    rb_warning("OpenSSL is compiled without DSA support");
 }
-
 #endif /* NO_DSA */
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
new file mode 100644
index 0000000000..18bcaa873c
--- /dev/null
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -0,0 +1,1597 @@
+/*
+ * Copyright (C) 2006-2007 Technorama Ltd. <oss-ruby@technorama.net>
+ */
+
+#include "ossl.h"
+
+#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
+
+typedef struct {
+	EC_GROUP *group;
+	int dont_free;
+} ossl_ec_group;
+
+typedef struct {
+	EC_POINT *point;
+	int dont_free;
+} ossl_ec_point;
+
+
+#define EXPORT_PEM 0
+#define EXPORT_DER 1
+
+
+#define GetPKeyEC(obj, pkey) do { \
+    GetPKey(obj, pkey); \
+    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_EC) { \
+	ossl_raise(rb_eRuntimeError, "THIS IS NOT A EC PKEY!"); \
+    } \
+} while (0)
+
+#define SafeGet_ec_group(obj, group) do { \
+    OSSL_Check_Kind(obj, cEC_GROUP); \
+    Data_Get_Struct(obj, ossl_ec_group, group); \
+} while(0)
+
+#define Get_EC_KEY(obj, key) do { \
+    EVP_PKEY *pkey; \
+    GetPKeyEC(obj, pkey); \
+    key = pkey->pkey.ec; \
+} while(0)
+
+#define Require_EC_KEY(obj, key) do { \
+    Get_EC_KEY(obj, key); \
+    if (key == NULL) \
+        rb_raise(eECError, "EC_KEY is not initialized"); \
+} while(0)
+
+#define SafeRequire_EC_KEY(obj, key) do { \
+    OSSL_Check_Kind(obj, cEC); \
+    Require_EC_KEY(obj, key); \
+} while (0)
+
+#define Get_EC_GROUP(obj, g) do { \
+    ossl_ec_group *ec_group; \
+    Data_Get_Struct(obj, ossl_ec_group, ec_group); \
+    if (ec_group == NULL) \
+        rb_raise(eEC_GROUP, "missing ossl_ec_group structure"); \
+    g = ec_group->group; \
+} while(0)
+
+#define Require_EC_GROUP(obj, group) do { \
+    Get_EC_GROUP(obj, group); \
+    if (group == NULL) \
+        rb_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
+} while(0)
+
+#define SafeRequire_EC_GROUP(obj, group) do { \
+    OSSL_Check_Kind(obj, cEC_GROUP); \
+    Require_EC_GROUP(obj, group); \
+} while(0)
+
+#define Get_EC_POINT(obj, p) do { \
+    ossl_ec_point *ec_point; \
+    Data_Get_Struct(obj, ossl_ec_point, ec_point); \
+    if (ec_point == NULL) \
+        rb_raise(eEC_POINT, "missing ossl_ec_point structure"); \
+    p = ec_point->point; \
+} while(0)
+
+#define Require_EC_POINT(obj, point) do { \
+    Get_EC_POINT(obj, point); \
+    if (point == NULL) \
+        rb_raise(eEC_POINT, "EC_POINT is not initialized"); \
+} while(0)
+
+#define SafeRequire_EC_POINT(obj, point) do { \
+    OSSL_Check_Kind(obj, cEC_POINT); \
+    Require_EC_POINT(obj, point); \
+} while(0)
+
+VALUE cEC;
+VALUE eECError;
+VALUE cEC_GROUP;
+VALUE eEC_GROUP;
+VALUE cEC_POINT;
+VALUE eEC_POINT;
+
+static ID s_GFp;
+static ID s_GFp_simple;
+static ID s_GFp_mont;
+static ID s_GFp_nist;
+static ID s_GF2m;
+static ID s_GF2m_simple;
+
+static ID ID_uncompressed;
+static ID ID_compressed;
+static ID ID_hybrid;
+
+static VALUE ec_instance(VALUE klass, EC_KEY *ec)
+{
+    EVP_PKEY *pkey;
+    VALUE obj;
+
+    if (!ec) {
+	return Qfalse;
+    }
+    if (!(pkey = EVP_PKEY_new())) {
+	return Qfalse;
+    }
+    if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {
+	EVP_PKEY_free(pkey);
+	return Qfalse;
+    }
+    WrapPKey(klass, obj, pkey);
+
+    return obj;
+}
+
+VALUE ossl_ec_new(EVP_PKEY *pkey)
+{
+    VALUE obj;
+
+    if (!pkey) {
+	obj = ec_instance(cEC, EC_KEY_new());
+    } else {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_EC) {
+	    ossl_raise(rb_eTypeError, "Not a EC key!");
+	}
+	WrapPKey(cEC, obj, pkey);
+    }
+    if (obj == Qfalse) {
+	ossl_raise(eECError, NULL);
+    }
+
+    return obj;
+}
+
+
+/*  call-seq:
+ *     OpenSSL::PKey::EC.new()
+ *     OpenSSL::PKey::EC.new(ec_key)
+ *     OpenSSL::PKey::EC.new(ec_group)
+ *     OpenSSL::PKey::EC.new("secp112r1")
+ *     OpenSSL::PKey::EC.new(pem_string)
+ *     OpenSSL::PKey::EC.new(der_string)
+ *
+ *  See the OpenSSL documentation for:
+ *     EC_KEY_*
+ */
+static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    EC_KEY *ec = NULL;
+    VALUE arg, pass;
+    VALUE group = Qnil;
+
+    GetPKey(self, pkey);
+    if (pkey->pkey.ec)
+        rb_raise(eECError, "EC_KEY already initialized");
+
+    rb_scan_args(argc, argv, "02", &arg, &pass);
+
+    if (NIL_P(arg)) {
+        ec = EC_KEY_new();
+    } else {
+        if (rb_obj_is_kind_of(arg, cEC)) {
+            EC_KEY *other_ec = NULL;
+
+            SafeRequire_EC_KEY(arg, other_ec);
+            ec = EC_KEY_dup(other_ec);
+        } else if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
+        	ec = EC_KEY_new();
+        	group = arg;
+        } else {
+            BIO *in = ossl_obj2bio(arg);
+
+            ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL);
+            if (!ec) {
+                (void)BIO_reset(in);
+                (void)ERR_get_error();
+                ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
+            }
+            if (!ec) {
+                (void)BIO_reset(in);
+                (void)ERR_get_error();
+                ec = d2i_ECPrivateKey_bio(in, NULL);
+            }
+            if (!ec) {
+                (void)BIO_reset(in);
+                (void)ERR_get_error();
+                ec = d2i_EC_PUBKEY_bio(in, NULL);
+            }
+
+            BIO_free(in);
+
+            if (ec == NULL) {
+                const char *name = StringValueCStr(arg);
+                int nid = OBJ_sn2nid(name);
+
+                (void)ERR_get_error();
+                if (nid == NID_undef)
+                    ossl_raise(eECError, "unknown curve name (%s)\n", name);
+
+                if ((ec = EC_KEY_new_by_curve_name(nid)) == NULL)
+                    ossl_raise(eECError, "unable to create curve (%s)\n", name);
+
+                EC_KEY_set_asn1_flag(ec, OPENSSL_EC_NAMED_CURVE);
+                EC_KEY_set_conv_form(ec, POINT_CONVERSION_UNCOMPRESSED);
+            }
+        }
+    }
+
+    if (ec == NULL)
+        ossl_raise(eECError, NULL);
+
+    if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {
+	EC_KEY_free(ec);
+	ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");
+    }
+
+    rb_iv_set(self, "@group", Qnil);
+
+    if (!NIL_P(group))
+        rb_funcall(self, rb_intern("group="), 1, arg);
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     key.group   => group
+ *
+ *  Returns a constant <code>OpenSSL::EC::Group</code> that is tied to the key.
+ *  Modifying the returned group can make the key invalid.
+ */
+static VALUE ossl_ec_key_get_group(VALUE self)
+{
+    VALUE group_v;
+    EC_KEY *ec;
+    ossl_ec_group *ec_group;
+    EC_GROUP *group;
+
+    Require_EC_KEY(self, ec);
+
+    group_v = rb_iv_get(self, "@group");
+    if (!NIL_P(group_v))
+        return group_v;
+
+    if ((group = (EC_GROUP *)EC_KEY_get0_group(ec)) != NULL) {
+        group_v = rb_obj_alloc(cEC_GROUP);
+        SafeGet_ec_group(group_v, ec_group);
+        ec_group->group = group;
+        ec_group->dont_free = 1;
+        rb_iv_set(group_v, "@key", self);
+        rb_iv_set(self, "@group", group_v);
+        return group_v;
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     key.group = group   => group
+ *
+ *  Returns the same object passed, not the group object associated with the key.
+ *  If you wish to access the group object tied to the key call key.group after setting
+ *  the group.
+ *
+ *  Setting the group will immediately destroy any previously assigned group object.
+ *  The group is internally copied by OpenSSL.  Modifying the original group after
+ *  assignment will not effect the internal key structure.
+ *  (your changes may be lost).  BE CAREFUL.
+ *
+ *  EC_KEY_set_group calls EC_GROUP_free(key->group) then EC_GROUP_dup(), not EC_GROUP_copy.
+ *  This documentation is accurate for OpenSSL 0.9.8b.
+ */
+static VALUE ossl_ec_key_set_group(VALUE self, VALUE group_v)
+{
+    VALUE old_group_v;
+    EC_KEY *ec;
+    EC_GROUP *group;
+
+    Require_EC_KEY(self, ec);
+    SafeRequire_EC_GROUP(group_v, group);
+
+    old_group_v = rb_iv_get(self, "@group");
+    if (!NIL_P(old_group_v)) {
+        ossl_ec_group *old_ec_group;
+        SafeGet_ec_group(old_group_v, old_ec_group);
+
+        old_ec_group->group = NULL;
+        old_ec_group->dont_free = 0;
+        rb_iv_set(old_group_v, "@key", Qnil);
+    }
+
+    rb_iv_set(self, "@group", Qnil);
+
+    if (EC_KEY_set_group(ec, group) != 1)
+        ossl_raise(eECError, "EC_KEY_set_group");
+
+    return group_v;
+}
+
+/*
+ *  call-seq:
+ *     key.private_key   => OpenSSL::BN
+ *
+ *  See the OpenSSL documentation for EC_KEY_get0_private_key()
+ */
+static VALUE ossl_ec_key_get_private_key(VALUE self)
+{
+    EC_KEY *ec;
+    const BIGNUM *bn;
+
+    Require_EC_KEY(self, ec);
+
+    if ((bn = EC_KEY_get0_private_key(ec)) == NULL)
+        return Qnil;
+
+    return ossl_bn_new(bn);
+}
+
+/*
+ *  call-seq:
+ *     key.private_key = openssl_bn
+ *
+ *  See the OpenSSL documentation for EC_KEY_set_private_key()
+ */
+static VALUE ossl_ec_key_set_private_key(VALUE self, VALUE private_key)
+{
+    EC_KEY *ec;
+    BIGNUM *bn = NULL;
+
+    Require_EC_KEY(self, ec);
+    if (!NIL_P(private_key))
+        bn = GetBNPtr(private_key);
+
+    switch (EC_KEY_set_private_key(ec, bn)) {
+    case 1:
+        break;
+    case 0:
+        if (bn == NULL)
+            break;
+    default:
+        ossl_raise(eECError, "EC_KEY_set_private_key");
+    }
+
+    return private_key;
+}
+
+
+static VALUE ossl_ec_point_dup(const EC_POINT *point, VALUE group_v)
+{
+    VALUE obj;
+    const EC_GROUP *group;
+    ossl_ec_point *new_point;
+
+    obj = rb_obj_alloc(cEC_POINT);
+    Data_Get_Struct(obj, ossl_ec_point, new_point);
+
+    SafeRequire_EC_GROUP(group_v, group);
+
+    new_point->point = EC_POINT_dup(point, group);
+    if (new_point->point == NULL)
+        ossl_raise(eEC_POINT, "EC_POINT_dup");
+    rb_iv_set(obj, "@group", group_v);
+
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     key.public_key   => OpenSSL::PKey::EC::Point
+ *
+ *  See the OpenSSL documentation for EC_KEY_get0_public_key()
+ */
+static VALUE ossl_ec_key_get_public_key(VALUE self)
+{
+    EC_KEY *ec;
+    const EC_POINT *point;
+    VALUE group;
+
+    Require_EC_KEY(self, ec);
+
+    if ((point = EC_KEY_get0_public_key(ec)) == NULL)
+        return Qnil;
+
+    group = rb_funcall(self, rb_intern("group"), 0);
+    if (NIL_P(group))
+        ossl_raise(eECError, "EC_KEY_get0_get0_group (has public_key but no group???");
+
+    return ossl_ec_point_dup(point, group);
+}
+
+/*
+ *  call-seq:
+ *     key.public_key = ec_point
+ *
+ *  See the OpenSSL documentation for EC_KEY_set_public_key()
+ */
+static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
+{
+    EC_KEY *ec;
+    EC_POINT *point = NULL;
+
+    Require_EC_KEY(self, ec);
+    if (!NIL_P(public_key))
+        SafeRequire_EC_POINT(public_key, point);
+
+    switch (EC_KEY_set_public_key(ec, point)) {
+    case 1:
+        break;
+    case 0:
+        if (point == NULL)
+            break;
+    default:
+        ossl_raise(eECError, "EC_KEY_set_public_key");
+    }
+
+    return public_key;
+}
+
+/*
+ *  call-seq:
+ *     key.public_key? => true or false
+ *
+ *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
+ */
+static VALUE ossl_ec_key_is_public_key(VALUE self)
+{
+    EC_KEY *ec;
+
+    Require_EC_KEY(self, ec);
+
+    return (EC_KEY_get0_public_key(ec) ? Qtrue : Qfalse);
+}
+
+/*
+ *  call-seq:
+ *     key.private_key? => true or false
+ *
+ *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
+ */
+static VALUE ossl_ec_key_is_private_key(VALUE self)
+{
+    EC_KEY *ec;
+
+    Require_EC_KEY(self, ec);
+
+    return (EC_KEY_get0_private_key(ec) ? Qtrue : Qfalse);
+}
+
+static VALUE ossl_ec_key_to_string(VALUE self, int format)
+{
+    EC_KEY *ec;
+    BIO *out;
+    int i = -1;
+    int private = 0;
+#if 0  /* unused now */
+    EVP_CIPHER *cipher = NULL;
+    char *password = NULL;
+#endif
+    VALUE str;
+
+    Require_EC_KEY(self, ec);
+
+    if (EC_KEY_get0_public_key(ec) == NULL)
+        rb_raise(eECError, "can't export - no public key set");
+
+    if (EC_KEY_check_key(ec) != 1)
+	ossl_raise(eECError, "can't export - EC_KEY_check_key failed");
+
+    if (EC_KEY_get0_private_key(ec))
+        private = 1;
+
+    if (!(out = BIO_new(BIO_s_mem())))
+        ossl_raise(eECError, "BIO_new(BIO_s_mem())");
+
+    switch(format) {
+    case EXPORT_PEM:
+    	if (private) {
+#if 0  /* unused now */
+    	    if (cipher || password)
+/* BUG: finish cipher/password key export */
+    	        rb_notimplement();
+            i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, NULL, password);
+#endif
+            i = PEM_write_bio_ECPrivateKey(out, ec, NULL, NULL, 0, NULL, NULL);
+    	} else {
+#if 0  /* unused now */
+    	    if (cipher || password)
+                rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
+#endif
+
+            i = PEM_write_bio_EC_PUBKEY(out, ec);
+        }
+
+    	break;
+    case EXPORT_DER:
+        if (private) {
+#if 0  /* unused now */
+    	    if (cipher || password)
+                rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
+#endif
+
+            i = i2d_ECPrivateKey_bio(out, ec);
+        } else {
+#if 0  /* unused now */
+    	    if (cipher || password)
+                rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
+#endif
+
+            i = i2d_EC_PUBKEY_bio(out, ec);
+        }
+
+    	break;
+    default:
+        BIO_free(out);
+    	rb_raise(rb_eRuntimeError, "unknown format (internal error)");
+    }
+
+    if (i != 1) {
+        BIO_free(out);
+        ossl_raise(eECError, "outlen=%d", i);
+    }
+
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     key.to_pem   => String
+ *
+ *  See the OpenSSL documentation for PEM_write_bio_ECPrivateKey()
+ */
+static VALUE ossl_ec_key_to_pem(VALUE self)
+{
+    return ossl_ec_key_to_string(self, EXPORT_PEM);
+}
+
+/*
+ *  call-seq:
+ *     key.to_der   => String
+ *
+ *  See the OpenSSL documentation for i2d_ECPrivateKey_bio()
+ */
+static VALUE ossl_ec_key_to_der(VALUE self)
+{
+    return ossl_ec_key_to_string(self, EXPORT_DER);
+}
+
+/*
+ *  call-seq:
+ *     key.to_text   => String
+ *
+ *  See the OpenSSL documentation for EC_KEY_print()
+ */
+static VALUE ossl_ec_key_to_text(VALUE self)
+{
+    EC_KEY *ec;
+    BIO *out;
+    VALUE str;
+
+    Require_EC_KEY(self, ec);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eECError, "BIO_new(BIO_s_mem())");
+    }
+    if (!EC_KEY_print(out, ec, 0)) {
+	BIO_free(out);
+	ossl_raise(eECError, "EC_KEY_print");
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     key.generate_key   => self
+ *
+ *  See the OpenSSL documentation for EC_KEY_generate_key()
+ */
+static VALUE ossl_ec_key_generate_key(VALUE self)
+{
+    EC_KEY *ec;
+
+    Require_EC_KEY(self, ec);
+
+    if (EC_KEY_generate_key(ec) != 1)
+	ossl_raise(eECError, "EC_KEY_generate_key");
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     key.check_key   => true
+ *
+ *  Raises an exception if the key is invalid.
+ *
+ *  See the OpenSSL documentation for EC_KEY_check_key()
+ */
+static VALUE ossl_ec_key_check_key(VALUE self)
+{
+    EC_KEY *ec;
+
+    Require_EC_KEY(self, ec);
+
+    if (EC_KEY_check_key(ec) != 1)
+	ossl_raise(eECError, "EC_KEY_check_key");
+
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     key.dh_compute_key(pubkey)   => String
+ *
+ *  See the OpenSSL documentation for ECDH_compute_key()
+ */
+static VALUE ossl_ec_key_dh_compute_key(VALUE self, VALUE pubkey)
+{
+    EC_KEY *ec;
+    EC_POINT *point;
+    int buf_len;
+    VALUE str;
+
+    Require_EC_KEY(self, ec);
+    SafeRequire_EC_POINT(pubkey, point);
+
+/* BUG: need a way to figure out the maximum string size */
+    buf_len = 1024;
+    str = rb_str_new(0, buf_len);
+/* BUG: take KDF as a block */
+    buf_len = ECDH_compute_key(RSTRING_PTR(str), buf_len, point, ec, NULL);
+    if (buf_len < 0)
+         ossl_raise(eECError, "ECDH_compute_key");
+
+    rb_str_resize(str, buf_len);
+
+    return str;
+}
+
+/* sign_setup */
+
+/*
+ *  call-seq:
+ *     key.dsa_sign_asn1(data)   => String
+ *
+ *  See the OpenSSL documentation for ECDSA_sign()
+ */
+static VALUE ossl_ec_key_dsa_sign_asn1(VALUE self, VALUE data)
+{
+    EC_KEY *ec;
+    unsigned int buf_len;
+    VALUE str;
+
+    Require_EC_KEY(self, ec);
+    StringValue(data);
+
+    if (EC_KEY_get0_private_key(ec) == NULL)
+	ossl_raise(eECError, "Private EC key needed!");
+
+    str = rb_str_new(0, ECDSA_size(ec) + 16);
+    if (ECDSA_sign(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) RSTRING_PTR(str), &buf_len, ec) != 1)
+         ossl_raise(eECError, "ECDSA_sign");
+
+    rb_str_resize(str, buf_len);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     key.dsa_verify_asn1(data, sig)   => true or false
+ *
+ *  See the OpenSSL documentation for ECDSA_verify()
+ */
+static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
+{
+    EC_KEY *ec;
+
+    Require_EC_KEY(self, ec);
+    StringValue(data);
+    StringValue(sig);
+
+    switch (ECDSA_verify(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) RSTRING_PTR(sig), RSTRING_LEN(sig), ec)) {
+    case 1:	return Qtrue;
+    case 0:	return Qfalse;
+    default:	break;
+    }
+
+    ossl_raise(eECError, "ECDSA_verify");
+}
+
+static void ossl_ec_group_free(ossl_ec_group *ec_group)
+{
+    if (!ec_group->dont_free && ec_group->group)
+        EC_GROUP_clear_free(ec_group->group);
+    ruby_xfree(ec_group);
+}
+
+static VALUE ossl_ec_group_alloc(VALUE klass)
+{
+    ossl_ec_group *ec_group;
+    VALUE obj;
+
+    obj = Data_Make_Struct(klass, ossl_ec_group, 0, ossl_ec_group_free, ec_group);
+
+    return obj;
+}
+
+/*  call-seq:
+ *     OpenSSL::PKey::EC::Group.new("secp112r1")
+ *     OpenSSL::PKey::EC::Group.new(ec_group)
+ *     OpenSSL::PKey::EC::Group.new(pem_string)
+ *     OpenSSL::PKey::EC::Group.new(der_string)
+ *     OpenSSL::PKey::EC::Group.new(pem_file)
+ *     OpenSSL::PKey::EC::Group.new(der_file)
+ *     OpenSSL::PKey::EC::Group.new(:GFp_simple)
+ *     OpenSSL::PKey::EC::Group.new(:GFp_mult)
+ *     OpenSSL::PKey::EC::Group.new(:GFp_nist)
+ *     OpenSSL::PKey::EC::Group.new(:GF2m_simple)
+ *     OpenSSL::PKey::EC::Group.new(:GFp, bignum_p, bignum_a, bignum_b)
+ *     OpenSSL::PKey::EC::Group.new(:GF2m, bignum_p, bignum_a, bignum_b)
+ *
+ *  See the OpenSSL documentation for EC_GROUP_*
+ */
+static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE arg1, arg2, arg3, arg4;
+    ossl_ec_group *ec_group;
+    EC_GROUP *group = NULL;
+
+    Data_Get_Struct(self, ossl_ec_group, ec_group);
+    if (ec_group->group != NULL)
+        rb_raise(rb_eRuntimeError, "EC_GROUP is already initialized");
+
+    switch (rb_scan_args(argc, argv, "13", &arg1, &arg2, &arg3, &arg4)) {
+    case 1:
+        if (SYMBOL_P(arg1)) {
+            const EC_METHOD *method = NULL;
+            ID id = SYM2ID(arg1);
+
+            if (id == s_GFp_simple) {
+                method = EC_GFp_simple_method();
+            } else if (id == s_GFp_mont) {
+                method = EC_GFp_mont_method();
+            } else if (id == s_GFp_nist) {
+                method = EC_GFp_nist_method();
+            } else if (id == s_GF2m_simple) {
+                method = EC_GF2m_simple_method();
+            }
+
+            if (method) {
+                if ((group = EC_GROUP_new(method)) == NULL)
+                    ossl_raise(eEC_GROUP, "EC_GROUP_new");
+            } else {
+                rb_raise(rb_eArgError, "unknown symbol, must be :GFp_simple, :GFp_mont, :GFp_nist or :GF2m_simple");
+            }
+        } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
+            const EC_GROUP *arg1_group;
+
+            SafeRequire_EC_GROUP(arg1, arg1_group);
+            if ((group = EC_GROUP_dup(arg1_group)) == NULL)
+                ossl_raise(eEC_GROUP, "EC_GROUP_dup");
+        } else {
+            BIO *in = ossl_obj2bio(arg1);
+
+            group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
+            if (!group) {
+                (void)BIO_reset(in);
+                group = d2i_ECPKParameters_bio(in, NULL);
+            }
+
+            BIO_free(in);
+
+            if (!group) {
+                const char *name = StringValueCStr(arg1);
+                int nid = OBJ_sn2nid(name);
+
+                if (nid == NID_undef)
+                    ossl_raise(eEC_GROUP, "unknown curve name (%s)", name);
+
+                group = EC_GROUP_new_by_curve_name(nid);
+                if (group == NULL)
+                    ossl_raise(eEC_GROUP, "unable to create curve (%s)", name);
+
+                EC_GROUP_set_asn1_flag(group, OPENSSL_EC_NAMED_CURVE);
+                EC_GROUP_set_point_conversion_form(group, POINT_CONVERSION_UNCOMPRESSED);
+            }
+        }
+
+        break;
+    case 4:
+        if (SYMBOL_P(arg1)) {
+            ID id = SYM2ID(arg1);
+            EC_GROUP *(*new_curve)(const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *) = NULL;
+            const BIGNUM *p = GetBNPtr(arg2);
+            const BIGNUM *a = GetBNPtr(arg3);
+            const BIGNUM *b = GetBNPtr(arg4);
+
+            if (id == s_GFp) {
+                new_curve = EC_GROUP_new_curve_GFp;
+            } else if (id == s_GF2m) {
+                new_curve = EC_GROUP_new_curve_GF2m;
+            } else {
+                rb_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m");
+            }
+
+            if ((group = new_curve(p, a, b, ossl_bn_ctx)) == NULL)
+                ossl_raise(eEC_GROUP, "EC_GROUP_new_by_GF*");
+        } else {
+             rb_raise(rb_eArgError, "unknown argument, must be :GFp or :GF2m");
+        }
+
+        break;
+    default:
+        rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    if (group == NULL)
+        ossl_raise(eEC_GROUP, "");
+
+    ec_group->group = group;
+
+    return self;
+}
+
+/*  call-seq:
+ *     group1 == group2   => true | false
+ *
+ */
+static VALUE ossl_ec_group_eql(VALUE a, VALUE b)
+{
+    EC_GROUP *group1 = NULL, *group2 = NULL;
+
+    Require_EC_GROUP(a, group1);
+    SafeRequire_EC_GROUP(b, group2);
+
+    if (EC_GROUP_cmp(group1, group2, ossl_bn_ctx) == 1)
+       return Qfalse;
+
+    return Qtrue;
+}
+
+/*  call-seq:
+ *     group.generator   => ec_point
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get0_generator()
+ */
+static VALUE ossl_ec_group_get_generator(VALUE self)
+{
+    VALUE point_obj;
+    EC_GROUP *group = NULL;
+
+    Require_EC_GROUP(self, group);
+
+    point_obj = ossl_ec_point_dup(EC_GROUP_get0_generator(group), self);
+
+    return point_obj;
+}
+
+/*  call-seq:
+ *     group.set_generator(generator, order, cofactor)   => self
+ *
+ *  See the OpenSSL documentation for EC_GROUP_set_generator()
+ */
+static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE order, VALUE cofactor)
+{
+    EC_GROUP *group = NULL;
+    const EC_POINT *point;
+    const BIGNUM *o, *co;
+
+    Require_EC_GROUP(self, group);
+    SafeRequire_EC_POINT(generator, point);
+    o = GetBNPtr(order);
+    co = GetBNPtr(cofactor);
+
+    if (EC_GROUP_set_generator(group, point, o, co) != 1)
+        ossl_raise(eEC_GROUP, "EC_GROUP_set_generator");
+
+    return self;
+}
+
+/*  call-seq:
+ *     group.get_order   => order_bn
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get_order()
+ */
+static VALUE ossl_ec_group_get_order(VALUE self)
+{
+    VALUE bn_obj;
+    BIGNUM *bn;
+    EC_GROUP *group = NULL;
+
+    Require_EC_GROUP(self, group);
+
+    bn_obj = ossl_bn_new(NULL);
+    bn = GetBNPtr(bn_obj);
+
+    if (EC_GROUP_get_order(group, bn, ossl_bn_ctx) != 1)
+        ossl_raise(eEC_GROUP, "EC_GROUP_get_order");
+
+    return bn_obj;
+}
+
+/*  call-seq:
+ *     group.get_cofactor   => cofactor_bn
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get_cofactor()
+ */
+static VALUE ossl_ec_group_get_cofactor(VALUE self)
+{
+    VALUE bn_obj;
+    BIGNUM *bn;
+    EC_GROUP *group = NULL;
+
+    Require_EC_GROUP(self, group);
+
+    bn_obj = ossl_bn_new(NULL);
+    bn = GetBNPtr(bn_obj);
+
+    if (EC_GROUP_get_cofactor(group, bn, ossl_bn_ctx) != 1)
+        ossl_raise(eEC_GROUP, "EC_GROUP_get_cofactor");
+
+    return bn_obj;
+}
+
+/*  call-seq:
+ *     group.curve_name  => String
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get_curve_name()
+ */
+static VALUE ossl_ec_group_get_curve_name(VALUE self)
+{
+    EC_GROUP *group = NULL;
+    int nid;
+
+    Get_EC_GROUP(self, group);
+    if (group == NULL)
+        return Qnil;
+
+    nid = EC_GROUP_get_curve_name(group);
+
+/* BUG: an nid or asn1 object should be returned, maybe. */
+    return rb_str_new2(OBJ_nid2sn(nid));
+}
+
+/*  call-seq:
+ *     EC.builtin_curves => [[name, comment], ...]
+ *
+ *  See the OpenSSL documentation for EC_builtin_curves()
+ */
+static VALUE ossl_s_builtin_curves(VALUE self)
+{
+    EC_builtin_curve *curves = NULL;
+    int n;
+    int crv_len = EC_get_builtin_curves(NULL, 0);
+    VALUE ary, ret;
+
+    curves = ALLOCA_N(EC_builtin_curve, crv_len);
+    if (curves == NULL)
+        return Qnil;
+    if (!EC_get_builtin_curves(curves, crv_len))
+        ossl_raise(rb_eRuntimeError, "EC_get_builtin_curves");
+
+    ret = rb_ary_new2(crv_len);
+
+    for (n = 0; n < crv_len; n++) {
+        const char *sname = OBJ_nid2sn(curves[n].nid);
+        const char *comment = curves[n].comment;
+
+        ary = rb_ary_new2(2);
+        rb_ary_push(ary, rb_str_new2(sname));
+        rb_ary_push(ary, comment ? rb_str_new2(comment) : Qnil);
+        rb_ary_push(ret, ary);
+    }
+
+    return ret;
+}
+
+/*  call-seq:
+ *     group.asn1_flag  => Fixnum
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get_asn1_flag()
+ */
+static VALUE ossl_ec_group_get_asn1_flag(VALUE self)
+{
+    EC_GROUP *group = NULL;
+    int flag;
+
+    Require_EC_GROUP(self, group);
+
+    flag = EC_GROUP_get_asn1_flag(group);
+
+    return INT2FIX(flag);
+}
+
+/*  call-seq:
+ *     group.asn1_flag = Fixnum   => Fixnum
+ *
+ *  See the OpenSSL documentation for EC_GROUP_set_asn1_flag()
+ */
+static VALUE ossl_ec_group_set_asn1_flag(VALUE self, VALUE flag_v)
+{
+    EC_GROUP *group = NULL;
+
+    Require_EC_GROUP(self, group);
+
+    EC_GROUP_set_asn1_flag(group, NUM2INT(flag_v));
+
+    return flag_v;
+}
+
+/*  call-seq:
+ *     group.point_conversion_form  => :uncompressed | :compressed | :hybrid
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get_point_conversion_form()
+ */
+static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
+{
+    EC_GROUP *group = NULL;
+    point_conversion_form_t form;
+    VALUE ret;
+
+    Require_EC_GROUP(self, group);
+
+    form = EC_GROUP_get_point_conversion_form(group);
+
+    switch (form) {
+    case POINT_CONVERSION_UNCOMPRESSED:	ret = ID_uncompressed; break;
+    case POINT_CONVERSION_COMPRESSED:	ret = ID_compressed; break;
+    case POINT_CONVERSION_HYBRID:	ret = ID_hybrid; break;
+    default:	rb_raise(eEC_GROUP, "unsupported point conversion form: %d, this module should be updated", form);
+    }
+
+   return ID2SYM(ret);
+}
+
+/*  call-seq:
+ *     group.point_conversion_form = form => form
+ *
+ *  See the OpenSSL documentation for EC_GROUP_set_point_conversion_form()
+ */
+static VALUE ossl_ec_group_set_point_conversion_form(VALUE self, VALUE form_v)
+{
+    EC_GROUP *group = NULL;
+    point_conversion_form_t form;
+    ID form_id = SYM2ID(form_v);
+
+    Require_EC_GROUP(self, group);
+
+    if (form_id == ID_uncompressed) {
+        form = POINT_CONVERSION_UNCOMPRESSED;
+    } else if (form_id == ID_compressed) {
+        form = POINT_CONVERSION_COMPRESSED;
+    } else if (form_id == ID_hybrid) {
+        form = POINT_CONVERSION_HYBRID;
+    } else {
+        rb_raise(rb_eArgError, "form must be :compressed, :uncompressed, or :hybrid");
+    }
+
+    EC_GROUP_set_point_conversion_form(group, form);
+
+    return form_v;
+}
+
+/*  call-seq:
+ *     group.seed   => String or nil
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get0_seed()
+ */
+static VALUE ossl_ec_group_get_seed(VALUE self)
+{
+    EC_GROUP *group = NULL;
+    size_t seed_len;
+
+    Require_EC_GROUP(self, group);
+
+    seed_len = EC_GROUP_get_seed_len(group);
+
+    if (seed_len == 0)
+        return Qnil;
+
+    return rb_str_new((const char *)EC_GROUP_get0_seed(group), seed_len);
+}
+
+/*  call-seq:
+ *     group.seed = seed  => seed
+ *
+ *  See the OpenSSL documentation for EC_GROUP_set_seed()
+ */
+static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
+{
+    EC_GROUP *group = NULL;
+
+    Require_EC_GROUP(self, group);
+    StringValue(seed);
+
+    if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
+        ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
+
+    return seed;
+}
+
+/* get/set curve GFp, GF2m */
+
+/*  call-seq:
+ *     group.degree   => Fixnum
+ *
+ *  See the OpenSSL documentation for EC_GROUP_get_degree()
+ */
+static VALUE ossl_ec_group_get_degree(VALUE self)
+{
+    EC_GROUP *group = NULL;
+
+    Require_EC_GROUP(self, group);
+
+    return INT2NUM(EC_GROUP_get_degree(group));
+}
+
+static VALUE ossl_ec_group_to_string(VALUE self, int format)
+{
+    EC_GROUP *group;
+    BIO *out;
+    int i = -1;
+    VALUE str;
+
+    Get_EC_GROUP(self, group);
+
+    if (!(out = BIO_new(BIO_s_mem())))
+        ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
+
+    switch(format) {
+    case EXPORT_PEM:
+        i = PEM_write_bio_ECPKParameters(out, group);
+    	break;
+    case EXPORT_DER:
+        i = i2d_ECPKParameters_bio(out, group);
+    	break;
+    default:
+        BIO_free(out);
+    	rb_raise(rb_eRuntimeError, "unknown format (internal error)");
+    }
+
+    if (i != 1) {
+        BIO_free(out);
+        ossl_raise(eECError, NULL);
+    }
+
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+/*  call-seq:
+ *     group.to_pem   => String
+ *
+ *  See the OpenSSL documentation for PEM_write_bio_ECPKParameters()
+ */
+static VALUE ossl_ec_group_to_pem(VALUE self)
+{
+    return ossl_ec_group_to_string(self, EXPORT_PEM);
+}
+
+/*  call-seq:
+ *     group.to_der   => String
+ *
+ *  See the OpenSSL documentation for i2d_ECPKParameters_bio()
+ */
+static VALUE ossl_ec_group_to_der(VALUE self)
+{
+    return ossl_ec_group_to_string(self, EXPORT_DER);
+}
+
+/*  call-seq:
+ *     group.to_text   => String
+ *
+ *  See the OpenSSL documentation for ECPKParameters_print()
+ */
+static VALUE ossl_ec_group_to_text(VALUE self)
+{
+    EC_GROUP *group;
+    BIO *out;
+    VALUE str;
+
+    Require_EC_GROUP(self, group);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
+    }
+    if (!ECPKParameters_print(out, group, 0)) {
+	BIO_free(out);
+	ossl_raise(eEC_GROUP, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+
+static void ossl_ec_point_free(ossl_ec_point *ec_point)
+{
+    if (!ec_point->dont_free && ec_point->point)
+        EC_POINT_clear_free(ec_point->point);
+    ruby_xfree(ec_point);
+}
+
+static VALUE ossl_ec_point_alloc(VALUE klass)
+{
+    ossl_ec_point *ec_point;
+    VALUE obj;
+
+    obj = Data_Make_Struct(klass, ossl_ec_point, 0, ossl_ec_point_free, ec_point);
+
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     OpenSSL::PKey::EC::Point.new(point)
+ *     OpenSSL::PKey::EC::Point.new(group)
+ *     OpenSSL::PKey::EC::Point.new(group, bn)
+ *
+ *  See the OpenSSL documentation for EC_POINT_*
+ */
+static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
+{
+    ossl_ec_point *ec_point;
+    EC_POINT *point = NULL;
+    VALUE arg1, arg2;
+    VALUE group_v = Qnil;
+    const EC_GROUP *group = NULL;
+
+    Data_Get_Struct(self, ossl_ec_point, ec_point);
+    if (ec_point->point)
+        rb_raise(eEC_POINT, "EC_POINT already initialized");
+
+    switch (rb_scan_args(argc, argv, "11", &arg1, &arg2)) {
+    case 1:
+        if (rb_obj_is_kind_of(arg1, cEC_POINT)) {
+            const EC_POINT *arg_point;
+
+            group_v = rb_iv_get(arg1, "@group");
+            SafeRequire_EC_GROUP(group_v, group);
+            SafeRequire_EC_POINT(arg1, arg_point);
+
+            point = EC_POINT_dup(arg_point, group);
+        } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
+            group_v = arg1;
+            SafeRequire_EC_GROUP(group_v, group);
+
+            point = EC_POINT_new(group);
+        } else {
+            rb_raise(eEC_POINT, "wrong argument type: must be OpenSSL::PKey::EC::Point or OpenSSL::Pkey::EC::Group");
+        }
+
+        break;
+     case 2:
+        if (!rb_obj_is_kind_of(arg1, cEC_GROUP))
+            rb_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
+        group_v = arg1;
+        SafeRequire_EC_GROUP(group_v, group);
+
+        if (rb_obj_is_kind_of(arg2, cBN)) {
+            const BIGNUM *bn = GetBNPtr(arg2);
+
+            point = EC_POINT_bn2point(group, bn, NULL, ossl_bn_ctx);
+        } else {
+            BIO *in = ossl_obj2bio(arg1);
+
+/* BUG: finish me */
+
+            BIO_free(in);
+
+            if (point == NULL) {
+                ossl_raise(eEC_POINT, "unknown type for 2nd arg");
+            }
+        }
+        break;
+    default:
+        rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    if (point == NULL)
+        ossl_raise(eEC_POINT, NULL);
+
+    if (NIL_P(group_v))
+        rb_raise(rb_eRuntimeError, "missing group (internal error)");
+
+    ec_point->point = point;
+
+    rb_iv_set(self, "@group", group_v);
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     point1 == point2 => true | false
+ *
+ */
+static VALUE ossl_ec_point_eql(VALUE a, VALUE b)
+{
+    EC_POINT *point1, *point2;
+    VALUE group_v1 = rb_iv_get(a, "@group");
+    VALUE group_v2 = rb_iv_get(b, "@group");
+    const EC_GROUP *group;
+
+    if (ossl_ec_group_eql(group_v1, group_v2) == Qfalse)
+        return Qfalse;
+
+    Require_EC_POINT(a, point1);
+    SafeRequire_EC_POINT(b, point2);
+    SafeRequire_EC_GROUP(group_v1, group);
+
+    if (EC_POINT_cmp(group, point1, point2, ossl_bn_ctx) == 1)
+        return Qfalse;
+
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     point.infinity? => true | false
+ *
+ */
+static VALUE ossl_ec_point_is_at_infinity(VALUE self)
+{
+    EC_POINT *point;
+    VALUE group_v = rb_iv_get(self, "@group");
+    const EC_GROUP *group;
+
+    Require_EC_POINT(self, point);
+    SafeRequire_EC_GROUP(group_v, group);
+
+    switch (EC_POINT_is_at_infinity(group, point)) {
+    case 1: return Qtrue;
+    case 0: return Qfalse;
+    default: ossl_raise(cEC_POINT, "EC_POINT_is_at_infinity");
+    }
+}
+
+/*
+ *  call-seq:
+ *     point.on_curve? => true | false
+ *
+ */
+static VALUE ossl_ec_point_is_on_curve(VALUE self)
+{
+    EC_POINT *point;
+    VALUE group_v = rb_iv_get(self, "@group");
+    const EC_GROUP *group;
+
+    Require_EC_POINT(self, point);
+    SafeRequire_EC_GROUP(group_v, group);
+
+    switch (EC_POINT_is_on_curve(group, point, ossl_bn_ctx)) {
+    case 1: return Qtrue;
+    case 0: return Qfalse;
+    default: ossl_raise(cEC_POINT, "EC_POINT_is_on_curve");
+    }
+}
+
+/*
+ *  call-seq:
+ *     point.make_affine! => self
+ *
+ */
+static VALUE ossl_ec_point_make_affine(VALUE self)
+{
+    EC_POINT *point;
+    VALUE group_v = rb_iv_get(self, "@group");
+    const EC_GROUP *group;
+
+    Require_EC_POINT(self, point);
+    SafeRequire_EC_GROUP(group_v, group);
+
+    if (EC_POINT_make_affine(group, point, ossl_bn_ctx) != 1)
+        ossl_raise(cEC_POINT, "EC_POINT_make_affine");
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     point.invert! => self
+ *
+ */
+static VALUE ossl_ec_point_invert(VALUE self)
+{
+    EC_POINT *point;
+    VALUE group_v = rb_iv_get(self, "@group");
+    const EC_GROUP *group;
+
+    Require_EC_POINT(self, point);
+    SafeRequire_EC_GROUP(group_v, group);
+
+    if (EC_POINT_invert(group, point, ossl_bn_ctx) != 1)
+        ossl_raise(cEC_POINT, "EC_POINT_invert");
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     point.set_to_infinity! => self
+ *
+ */
+static VALUE ossl_ec_point_set_to_infinity(VALUE self)
+{
+    EC_POINT *point;
+    VALUE group_v = rb_iv_get(self, "@group");
+    const EC_GROUP *group;
+
+    Require_EC_POINT(self, point);
+    SafeRequire_EC_GROUP(group_v, group);
+
+    if (EC_POINT_set_to_infinity(group, point) != 1)
+        ossl_raise(cEC_POINT, "EC_POINT_set_to_infinity");
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     point.to_bn   => OpenSSL::BN
+ *
+ *  See the OpenSSL documentation for EC_POINT_point2bn()
+ */
+static VALUE ossl_ec_point_to_bn(VALUE self)
+{
+    EC_POINT *point;
+    VALUE bn_obj;
+    VALUE group_v = rb_iv_get(self, "@group");
+    const EC_GROUP *group;
+    point_conversion_form_t form;
+    BIGNUM *bn;
+
+    Require_EC_POINT(self, point);
+    SafeRequire_EC_GROUP(group_v, group);
+
+    form = EC_GROUP_get_point_conversion_form(group);
+
+    bn_obj = rb_obj_alloc(cBN);
+    bn = GetBNPtr(bn_obj);
+
+    if (EC_POINT_point2bn(group, point, form, bn, ossl_bn_ctx) == NULL)
+        ossl_raise(eEC_POINT, "EC_POINT_point2bn");
+
+    return bn_obj;
+}
+
+static void no_copy(VALUE klass)
+{
+    rb_undef_method(klass, "copy");
+    rb_undef_method(klass, "clone");
+    rb_undef_method(klass, "dup");
+    rb_undef_method(klass, "initialize_copy");
+}
+
+void Init_ossl_ec()
+{
+#ifdef DONT_NEED_RDOC_WORKAROUND
+    mOSSL = rb_define_module("OpenSSL");
+    mPKey = rb_define_module_under(mOSSL, "PKey");
+#endif
+
+    eECError = rb_define_class_under(mPKey, "ECError", ePKeyError);
+
+    cEC = rb_define_class_under(mPKey, "EC", cPKey);
+    cEC_GROUP = rb_define_class_under(cEC, "Group", rb_cObject);
+    cEC_POINT = rb_define_class_under(cEC, "Point", rb_cObject);
+    eEC_GROUP = rb_define_class_under(cEC_GROUP, "Error", eOSSLError);
+    eEC_POINT = rb_define_class_under(cEC_POINT, "Error", eOSSLError);
+
+    s_GFp = rb_intern("GFp");
+    s_GF2m = rb_intern("GF2m");
+    s_GFp_simple = rb_intern("GFp_simple");
+    s_GFp_mont = rb_intern("GFp_mont");
+    s_GFp_nist = rb_intern("GFp_nist");
+    s_GF2m_simple = rb_intern("GF2m_simple");
+
+    ID_uncompressed = rb_intern("uncompressed");
+    ID_compressed = rb_intern("compressed");
+    ID_hybrid = rb_intern("hybrid");
+
+#ifdef OPENSSL_EC_NAMED_CURVE
+    rb_define_const(cEC, "NAMED_CURVE", ULONG2NUM(OPENSSL_EC_NAMED_CURVE));
+#endif
+
+    rb_define_singleton_method(cEC, "builtin_curves", ossl_s_builtin_curves, 0);
+
+    rb_define_method(cEC, "initialize", ossl_ec_key_initialize, -1);
+/* copy/dup/cmp */
+
+    rb_define_method(cEC, "group", ossl_ec_key_get_group, 0);
+    rb_define_method(cEC, "group=", ossl_ec_key_set_group, 1);
+    rb_define_method(cEC, "private_key", ossl_ec_key_get_private_key, 0);
+    rb_define_method(cEC, "private_key=", ossl_ec_key_set_private_key, 1);
+    rb_define_method(cEC, "public_key", ossl_ec_key_get_public_key, 0);
+    rb_define_method(cEC, "public_key=", ossl_ec_key_set_public_key, 1);
+    rb_define_method(cEC, "private_key?", ossl_ec_key_is_private_key, 0);
+    rb_define_method(cEC, "public_key?", ossl_ec_key_is_public_key, 0);
+/*  rb_define_method(cEC, "", ossl_ec_key_get_, 0);
+    rb_define_method(cEC, "=", ossl_ec_key_set_ 1);
+    set/get enc_flags
+    set/get _conv_from
+    set/get asn1_flag (can use ruby to call self.group.asn1_flag)
+    set/get precompute_mult
+*/
+    rb_define_method(cEC, "generate_key", ossl_ec_key_generate_key, 0);
+    rb_define_method(cEC, "check_key", ossl_ec_key_check_key, 0);
+
+    rb_define_method(cEC, "dh_compute_key", ossl_ec_key_dh_compute_key, 1);
+    rb_define_method(cEC, "dsa_sign_asn1", ossl_ec_key_dsa_sign_asn1, 1);
+    rb_define_method(cEC, "dsa_verify_asn1", ossl_ec_key_dsa_verify_asn1, 2);
+/* do_sign/do_verify */
+
+    rb_define_method(cEC, "to_pem", ossl_ec_key_to_pem, 0);
+    rb_define_method(cEC, "to_der", ossl_ec_key_to_der, 0);
+    rb_define_method(cEC, "to_text", ossl_ec_key_to_text, 0);
+
+
+    rb_define_alloc_func(cEC_GROUP, ossl_ec_group_alloc);
+    rb_define_method(cEC_GROUP, "initialize", ossl_ec_group_initialize, -1);
+    rb_define_method(cEC_GROUP, "eql?", ossl_ec_group_eql, 1);
+    rb_define_alias(cEC_GROUP, "==", "eql?");
+/* copy/dup/cmp */
+
+    rb_define_method(cEC_GROUP, "generator", ossl_ec_group_get_generator, 0);
+    rb_define_method(cEC_GROUP, "set_generator", ossl_ec_group_set_generator, 3);
+    rb_define_method(cEC_GROUP, "order", ossl_ec_group_get_order, 0);
+    rb_define_method(cEC_GROUP, "cofactor", ossl_ec_group_get_cofactor, 0);
+
+    rb_define_method(cEC_GROUP, "curve_name", ossl_ec_group_get_curve_name, 0);
+/*    rb_define_method(cEC_GROUP, "curve_name=", ossl_ec_group_set_curve_name, 1); */
+
+    rb_define_method(cEC_GROUP, "asn1_flag", ossl_ec_group_get_asn1_flag, 0);
+    rb_define_method(cEC_GROUP, "asn1_flag=", ossl_ec_group_set_asn1_flag, 1);
+
+    rb_define_method(cEC_GROUP, "point_conversion_form", ossl_ec_group_get_point_conversion_form, 0);
+    rb_define_method(cEC_GROUP, "point_conversion_form=", ossl_ec_group_set_point_conversion_form, 1);
+
+    rb_define_method(cEC_GROUP, "seed", ossl_ec_group_get_seed, 0);
+    rb_define_method(cEC_GROUP, "seed=", ossl_ec_group_set_seed, 1);
+
+/* get/set GFp, GF2m */
+
+    rb_define_method(cEC_GROUP, "degree", ossl_ec_group_get_degree, 0);
+
+/* check* */
+
+
+    rb_define_method(cEC_GROUP, "to_pem", ossl_ec_group_to_pem, 0);
+    rb_define_method(cEC_GROUP, "to_der", ossl_ec_group_to_der, 0);
+    rb_define_method(cEC_GROUP, "to_text", ossl_ec_group_to_text, 0);
+
+
+    rb_define_alloc_func(cEC_POINT, ossl_ec_point_alloc);
+    rb_define_method(cEC_POINT, "initialize", ossl_ec_point_initialize, -1);
+    rb_attr(cEC_POINT, rb_intern("group"), 1, 0, 0);
+    rb_define_method(cEC_POINT, "eql?", ossl_ec_point_eql, 1);
+    rb_define_alias(cEC_POINT, "==", "eql?");
+
+    rb_define_method(cEC_POINT, "infinity?", ossl_ec_point_is_at_infinity, 0);
+    rb_define_method(cEC_POINT, "on_curve?", ossl_ec_point_is_on_curve, 0);
+    rb_define_method(cEC_POINT, "make_affine!", ossl_ec_point_make_affine, 0);
+    rb_define_method(cEC_POINT, "invert!", ossl_ec_point_invert, 0);
+    rb_define_method(cEC_POINT, "set_to_infinity!", ossl_ec_point_set_to_infinity, 0);
+/* all the other methods */
+
+    rb_define_method(cEC_POINT, "to_bn", ossl_ec_point_to_bn, 0);
+
+    no_copy(cEC);
+    no_copy(cEC_GROUP);
+    no_copy(cEC_POINT);
+}
+
+#else /* defined NO_EC */
+void Init_ossl_ec()
+{
+}
+#endif /* NO_EC */
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 0afdcf8d01..1b8a85332c 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -36,7 +36,7 @@ rsa_instance(VALUE klass, RSA *rsa)
 {
     EVP_PKEY *pkey;
     VALUE obj;
-	
+
     if (!rsa) {
 	return Qfalse;
     }
@@ -48,7 +48,7 @@ rsa_instance(VALUE klass, RSA *rsa)
 	return Qfalse;
     }
     WrapPKey(klass, obj, pkey);
-	
+
     return obj;
 }
 
@@ -84,9 +84,19 @@ rsa_generate(int size, int exp)
 	    NULL);
 }
 
+/*
+ *  call-seq:
+ *     RSA.generate(size [, exponent]) -> rsa
+ *
+ *  === Parameters
+ *  * +size+ is an integer representing the desired key size.  Keys smaller than 1024 should be considered insecure.
+ *  * +exponent+ is an odd number normally 3, 17, or 65537.
+ *
+ */
 static VALUE
 ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
 {
+/* why does this method exist?  why can't initialize take an optional exponent? */
     RSA *rsa;
     VALUE size, exp;
     VALUE obj;
@@ -104,6 +114,20 @@ ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
     return obj;
 }
 
+/*
+ *  call-seq:
+ *     RSA.new([size | encoded_key] [, pass]) -> rsa
+ *
+ *  === Parameters
+ *  * +size+ is an integer representing the desired key size.
+ *  * +encoded_key+ is a string containing PEM or DER encoded key.
+ *  * +pass+ is an optional string with the password to decrypt the encoded key.
+ *
+ *  === Examples
+ *  * RSA.new(2048) -> rsa
+ *  * RSA.new(File.read("rsa.pem")) -> rsa
+ *  * RSA.new(File.read("rsa.pem"), "mypassword") -> rsa
+ */
 static VALUE
 ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -112,7 +136,7 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     BIO *in;
     char *passwd = NULL;
     VALUE arg, pass;
-	
+
     GetPKey(self, pkey);
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
 	rsa = RSA_new();
@@ -127,27 +151,35 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
 	in = ossl_obj2bio(arg);
 	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
 	if (!rsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
 	}
 	if (!rsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
 	}
 	if (!rsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    rsa = d2i_RSAPrivateKey_bio(in, NULL);
 	}
 	if (!rsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    rsa = d2i_RSAPublicKey_bio(in, NULL);
 	}
 	if (!rsa) {
-	    BIO_reset(in);
+	    (void)BIO_reset(in);
+	    (void)ERR_get_error();
 	    rsa = d2i_RSA_PUBKEY_bio(in, NULL);
 	}
 	BIO_free(in);
-	if (!rsa) ossl_raise(eRSAError, "Neither PUB key nor PRIV key:");
+	if (!rsa) {
+	    (void)ERR_get_error();
+	    ossl_raise(eRSAError, "Neither PUB key nor PRIV key:");
+	}
     }
     if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
 	RSA_free(rsa);
@@ -157,6 +189,13 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ *  call-seq:
+ *     rsa.public? -> true
+ *
+ *  The return value is always true since every private key is also a public key.
+ *
+ */
 static VALUE
 ossl_rsa_is_public(VALUE self)
 {
@@ -164,22 +203,38 @@ ossl_rsa_is_public(VALUE self)
 
     GetPKeyRSA(self, pkey);
     /*
-     * SURPRISE! :-))
-     * Every key is public at the same time!
+     * This method should check for n and e.  BUG.
      */
     return Qtrue;
 }
 
+/*
+ *  call-seq:
+ *     rsa.private? -> true | false
+ *
+ */
 static VALUE
 ossl_rsa_is_private(VALUE self)
 {
     EVP_PKEY *pkey;
-	
+
     GetPKeyRSA(self, pkey);
-    
+
     return (RSA_PRIVATE(self, pkey->pkey.rsa)) ? Qtrue : Qfalse;
 }
 
+/*
+ *  call-seq:
+ *     rsa.to_pem([cipher, pass]) -> aString
+ *
+ *  === Parameters
+ *  * +cipher+ is a Cipher object.
+ *  * +pass+ is a string.
+ *
+ *  === Examples
+ *  * rsa.to_pem -> aString
+ *  * rsa.to_pem(cipher, pass) -> aString
+ */
 static VALUE
 ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 {
@@ -215,10 +270,15 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 	}
     }
     str = ossl_membio2str(out);
-    
+
     return str;
 }
 
+/*
+ *  call-seq:
+ *     rsa.to_der -> aString
+ *
+ */
 static VALUE
 ossl_rsa_to_der(VALUE self)
 {
@@ -236,7 +296,7 @@ ossl_rsa_to_der(VALUE self)
     if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
 	ossl_raise(eRSAError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_func(pkey->pkey.rsa, &p) < 0)
 	ossl_raise(eRSAError, NULL);
     ossl_str_adjust(str, p);
@@ -246,6 +306,11 @@ ossl_rsa_to_der(VALUE self)
 
 #define ossl_rsa_buf_size(pkey) (RSA_size((pkey)->pkey.rsa)+16)
 
+/*
+ *  call-seq:
+ *     rsa.public_encrypt(string [, padding]) -> aString
+ *
+ */
 static VALUE
 ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
 {
@@ -258,16 +323,20 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_public_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				 RSTRING(str)->ptr, pkey->pkey.rsa,
+    buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
+				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
 				 pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
+    rb_str_set_len(str, buf_len);
 
     return str;
 }
 
+/*
+ *  call-seq:
+ *     rsa.public_decrypt(string [, padding]) -> aString
+ *
+ */
 static VALUE
 ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
 {
@@ -280,16 +349,20 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_public_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				 RSTRING(str)->ptr, pkey->pkey.rsa,
+    buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
+				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
 				 pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-    
+    rb_str_set_len(str, buf_len);
+
     return str;
 }
 
+/*
+ *  call-seq:
+ *     rsa.private_encrypt(string [, padding]) -> aString
+ *
+ */
 static VALUE
 ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
 {
@@ -300,21 +373,26 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
     GetPKeyRSA(self, pkey);
     if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
 	ossl_raise(eRSAError, "private key needed.");
-    }	
+    }
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_private_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				  RSTRING(str)->ptr, pkey->pkey.rsa,
+    buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
+				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
 				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-    
+    rb_str_set_len(str, buf_len);
+
     return str;
 }
 
+
+/*
+ *  call-seq:
+ *     rsa.private_decrypt(string [, padding]) -> aString
+ *
+ */
 static VALUE
 ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
 {
@@ -330,17 +408,19 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_private_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				  RSTRING(str)->ptr, pkey->pkey.rsa,
+    buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
+				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
 				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
+    rb_str_set_len(str, buf_len);
 
     return str;
 }
 
 /*
+ *  call-seq:
+ *     rsa.params -> hash
+ *
  * Stores all parameters of key to the hash
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -363,11 +443,14 @@ ossl_rsa_get_params(VALUE self)
     rb_hash_aset(hash, rb_str_new2("dmp1"), ossl_bn_new(pkey->pkey.rsa->dmp1));
     rb_hash_aset(hash, rb_str_new2("dmq1"), ossl_bn_new(pkey->pkey.rsa->dmq1));
     rb_hash_aset(hash, rb_str_new2("iqmp"), ossl_bn_new(pkey->pkey.rsa->iqmp));
-    
+
     return hash;
 }
 
 /*
+ *  call-seq:
+ *     rsa.to_text -> aString
+ *
  * Prints all parameters of key to buffer
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (It's up to you)
@@ -393,6 +476,9 @@ ossl_rsa_to_text(VALUE self)
 }
 
 /*
+ *  call-seq:
+ *     rsa.public_key -> aRSA
+ *
  * Makes new instance RSA PUBLIC_KEY from PRIVATE_KEY
  */
 static VALUE
@@ -401,7 +487,7 @@ ossl_rsa_to_public_key(VALUE self)
     EVP_PKEY *pkey;
     RSA *rsa;
     VALUE obj;
-    
+
     GetPKeyRSA(self, pkey);
     /* err check performed by rsa_instance */
     rsa = RSAPublicKey_dup(pkey->pkey.rsa);
@@ -415,13 +501,12 @@ ossl_rsa_to_public_key(VALUE self)
 
 /*
  * TODO: Test me
-extern BN_CTX *ossl_bn_ctx;
 
 static VALUE
 ossl_rsa_blinding_on(VALUE self)
 {
     EVP_PKEY *pkey;
-    
+
     GetPKeyRSA(self, pkey);
 
     if (RSA_blinding_on(pkey->pkey.rsa, ossl_bn_ctx) != 1) {
@@ -434,7 +519,7 @@ static VALUE
 ossl_rsa_blinding_off(VALUE self)
 {
     EVP_PKEY *pkey;
-    
+
     GetPKeyRSA(self, pkey);
     RSA_blinding_off(pkey->pkey.rsa);
 
@@ -442,14 +527,14 @@ ossl_rsa_blinding_off(VALUE self)
 }
  */
 
-OSSL_PKEY_BN(rsa, n);
-OSSL_PKEY_BN(rsa, e);
-OSSL_PKEY_BN(rsa, d);
-OSSL_PKEY_BN(rsa, p);
-OSSL_PKEY_BN(rsa, q);
-OSSL_PKEY_BN(rsa, dmp1);
-OSSL_PKEY_BN(rsa, dmq1);
-OSSL_PKEY_BN(rsa, iqmp);
+OSSL_PKEY_BN(rsa, n)
+OSSL_PKEY_BN(rsa, e)
+OSSL_PKEY_BN(rsa, d)
+OSSL_PKEY_BN(rsa, p)
+OSSL_PKEY_BN(rsa, q)
+OSSL_PKEY_BN(rsa, dmp1)
+OSSL_PKEY_BN(rsa, dmq1)
+OSSL_PKEY_BN(rsa, iqmp)
 
 /*
  * INIT
@@ -470,7 +555,7 @@ Init_ossl_rsa()
 
     rb_define_singleton_method(cRSA, "generate", ossl_rsa_s_generate, -1);
     rb_define_method(cRSA, "initialize", ossl_rsa_initialize, -1);
-	
+
     rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
     rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
     rb_define_method(cRSA, "to_text", ossl_rsa_to_text, 0);
@@ -508,11 +593,9 @@ Init_ossl_rsa()
 }
 
 #else /* defined NO_RSA */
-#   warning >>> OpenSSL is compiled without RSA support <<<
 void
 Init_ossl_rsa()
 {
-    rb_warning("OpenSSL is compiled without RSA support");
 }
 #endif /* NO_RSA */
 
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index 71bb3bedd5..97a1b9fa95 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -27,84 +27,150 @@ VALUE eRandomError;
 /*
  * Private
  */
+
+/*
+ *  call-seq:
+ *     seed(str) -> str
+ *
+ */
 static VALUE
 ossl_rand_seed(VALUE self, VALUE str)
 {
     StringValue(str);
-    RAND_seed(RSTRING(str)->ptr, RSTRING(str)->len);
+    RAND_seed(RSTRING_PTR(str), RSTRING_LEN(str));
 
     return str;
 }
 
+/*
+ *  call-seq:
+ *     add(str, entropy) -> self
+ *
+ */
+static VALUE
+ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
+{
+    StringValue(str);
+    RAND_add(RSTRING_PTR(str), RSTRING_LEN(str), NUM2DBL(entropy));
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     load_random_file(filename) -> true
+ *
+ */
 static VALUE
 ossl_rand_load_file(VALUE self, VALUE filename)
 {
     SafeStringValue(filename);
-	
-    if(!RAND_load_file(RSTRING(filename)->ptr, -1)) {
+
+    if(!RAND_load_file(RSTRING_PTR(filename), -1)) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
+/*
+ *  call-seq:
+ *     write_random_file(filename) -> true
+ *
+ */
 static VALUE
 ossl_rand_write_file(VALUE self, VALUE filename)
 {
     SafeStringValue(filename);
-    if (RAND_write_file(RSTRING(filename)->ptr) == -1) {
+    if (RAND_write_file(RSTRING_PTR(filename)) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
+/*
+ *  call-seq:
+ *     random_bytes(length) -> aString
+ *
+ */
 static VALUE
 ossl_rand_bytes(VALUE self, VALUE len)
 {
     VALUE str;
-	
-    str = rb_str_new(0, FIX2INT(len));
-    if (!RAND_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
+    int n = NUM2INT(len);
+
+    str = rb_str_new(0, n);
+    if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) {
 	ossl_raise(eRandomError, NULL);
     }
 
     return str;
 }
 
+/*
+ *  call-seq:
+ *     pseudo_bytes(length) -> aString
+ *
+ */
 static VALUE
 ossl_rand_pseudo_bytes(VALUE self, VALUE len)
 {
     VALUE str;
+    int n = NUM2INT(len);
 
-    str = rb_str_new(0, FIX2INT(len));
-    if (!RAND_pseudo_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
+    str = rb_str_new(0, n);
+    if (!RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n)) {
 	ossl_raise(eRandomError, NULL);
     }
 
     return str;
 }
 
+/*
+ *  call-seq:
+ *     egd(filename) -> true
+ *
+ */
 static VALUE
 ossl_rand_egd(VALUE self, VALUE filename)
 {
     SafeStringValue(filename);
-	
-    if(!RAND_egd(RSTRING(filename)->ptr)) {
+
+    if(!RAND_egd(RSTRING_PTR(filename))) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
+/*
+ *  call-seq:
+ *     egd_bytes(filename, length) -> true
+ *
+ */
 static VALUE
 ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
 {
+    long n = NUM2INT(len);
+
     SafeStringValue(filename);
 
-    if (!RAND_egd_bytes(RSTRING(filename)->ptr, FIX2INT(len))) {
+    if (!RAND_egd_bytes(RSTRING_PTR(filename), n)) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
+/*
+ *  call-seq:
+ *     status? => true | false
+ *
+ * Return true if the PRNG has been seeded with enough data, false otherwise.
+ */
+static VALUE
+ossl_rand_status(VALUE self)
+{
+    return RAND_status() ? Qtrue : Qfalse;
+}
+
 #define DEFMETH(class, name, func, argc) \
 	rb_define_method(class, name, func, argc); \
 	rb_define_singleton_method(class, name, func, argc);
@@ -120,15 +186,17 @@ Init_ossl_rand()
 #endif
 
     mRandom = rb_define_module_under(mOSSL, "Random");
-	
+
     eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
-	
+
     DEFMETH(mRandom, "seed", ossl_rand_seed, 1);
+    DEFMETH(mRandom, "random_add", ossl_rand_add, 2);
     DEFMETH(mRandom, "load_random_file", ossl_rand_load_file, 1);
     DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1);
     DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
     DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
     DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
-    DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);	
+    DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
+    DEFMETH(mRandom, "status?", ossl_rand_status, 0)
 }
 
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 8e632b526b..7de1a6bb7a 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -3,6 +3,7 @@
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2000-2002  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * Copyright (C) 2001-2007  Technorama Ltd. <oss-ruby@technorama.net>
  * All rights reserved.
  */
 /*
@@ -10,14 +11,12 @@
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
-#include <rubysig.h>
-#include <rubyio.h>
 
 #if defined(HAVE_UNISTD_H)
 #  include <unistd.h> /* for read(), and write() */
 #endif
 
-#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
+#define numberof(ary) (int)(sizeof(ary)/sizeof(ary[0]))
 
 #ifdef _WIN32
 #  define TO_SOCKET(s) _get_osfhandle(s)
@@ -30,9 +29,6 @@ VALUE eSSLError;
 VALUE cSSLContext;
 VALUE cSSLSocket;
 
-/*
- * SSLContext class
- */
 #define ossl_sslctx_set_cert(o,v)        rb_iv_set((o),"@cert",(v))
 #define ossl_sslctx_set_key(o,v)         rb_iv_set((o),"@key",(v))
 #define ossl_sslctx_set_client_ca(o,v)   rb_iv_set((o),"@client_ca",(v))
@@ -65,11 +61,15 @@ VALUE cSSLSocket;
 #define ossl_sslctx_get_tmp_dh_cb(o)     rb_iv_get((o),"@tmp_dh_callback")
 #define ossl_sslctx_get_sess_id_ctx(o)   rb_iv_get((o),"@session_id_context")
 
-static char *ossl_sslctx_attrs[] = {
+static const char *ossl_sslctx_attrs[] = {
     "cert", "key", "client_ca", "ca_file", "ca_path",
     "timeout", "verify_mode", "verify_depth",
     "verify_callback", "options", "cert_store", "extra_chain_cert",
     "client_cert_cb", "tmp_dh_callback", "session_id_context",
+    "session_get_cb", "session_new_cb", "session_remove_cb",
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
+    "servername_cb",
+#endif
 };
 
 #define ossl_ssl_get_io(o)           rb_iv_get((o),"@io")
@@ -86,8 +86,15 @@ static char *ossl_sslctx_attrs[] = {
 #define ossl_ssl_set_key(o,v)        rb_iv_set((o),"@key",(v))
 #define ossl_ssl_set_tmp_dh(o,v)     rb_iv_set((o),"@tmp_dh",(v))
 
-static char *ossl_ssl_attr_readers[] = { "io", "context", };
-static char *ossl_ssl_attrs[] = { "sync_close", };
+static const char *ossl_ssl_attr_readers[] = { "io", "context", };
+static const char *ossl_ssl_attrs[] = {
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
+    "hostname",
+#endif
+    "sync_close",
+};
+
+ID ID_callback_state;
 
 /*
  * SSLContext class
@@ -96,13 +103,16 @@ struct {
     const char *name;
     SSL_METHOD *(*func)(void);
 } ossl_ssl_method_tab[] = {
-#define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
+#define OSSL_SSL_METHOD_ENTRY(name) { #name, (SSL_METHOD *(*)(void))name##_method }
     OSSL_SSL_METHOD_ENTRY(TLSv1),
     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+        defined(HAVE_SSLV2_CLIENT_METHOD)	
     OSSL_SSL_METHOD_ENTRY(SSLv2),
     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+#endif
     OSSL_SSL_METHOD_ENTRY(SSLv3),
     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
@@ -136,27 +146,17 @@ ossl_sslctx_s_alloc(VALUE klass)
         ossl_raise(eSSLError, "SSL_CTX_new:");
     }
     SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
-    SSL_CTX_set_options(ctx, SSL_OP_ALL);
     return Data_Wrap_Struct(klass, 0, ossl_sslctx_free, ctx);
 }
 
 static VALUE
-ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
+ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
 {
-    VALUE ssl_method;
     SSL_METHOD *method = NULL;
-    SSL_CTX *ctx;
+    const char *s;
     int i;
-    char *s;
 
-    for(i = 0; i < numberof(ossl_sslctx_attrs); i++){
-	char buf[32];
-	snprintf(buf, sizeof(buf), "@%s", ossl_sslctx_attrs[i]);
-	rb_iv_set(self, buf, Qnil);
-    }
-    if (rb_scan_args(argc, argv, "01", &ssl_method) == 0){
-        return self;
-    }
+    SSL_CTX *ctx;
     if(TYPE(ssl_method) == T_SYMBOL)
 	s = rb_id2name(SYM2ID(ssl_method));
     else
@@ -175,6 +175,33 @@ ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
         ossl_raise(eSSLError, "SSL_CTX_set_ssl_version:");
     }
 
+    return ssl_method;
+}
+
+/*
+ * call-seq:
+ *    SSLContext.new => ctx
+ *    SSLContext.new(:TLSv1) => ctx
+ *    SSLContext.new("SSLv23_client") => ctx
+ *
+ * You can get a list of valid methods with OpenSSL::SSL::SSLContext::METHODS
+ */
+static VALUE
+ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE ssl_method;
+    int i;
+
+    for(i = 0; i < numberof(ossl_sslctx_attrs); i++){
+	char buf[32];
+	snprintf(buf, sizeof(buf), "@%s", ossl_sslctx_attrs[i]);
+	rb_iv_set(self, buf, Qnil);
+    }
+    if (rb_scan_args(argc, argv, "01", &ssl_method) == 0){
+        return self;
+    }
+    ossl_sslctx_set_ssl_version(self, ssl_method);
+
     return self;
 }
 
@@ -251,6 +278,8 @@ ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
 static DH*
 ossl_default_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
 {
+    rb_warning("using default DH parameters.");
+
     switch(keylength){
     case 512:
 	return OSSL_DEFAULT_DH_512;
@@ -274,6 +303,145 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 }
 
 static VALUE
+ossl_call_session_get_cb(VALUE ary)
+{
+    VALUE ssl_obj, sslctx_obj, cb;
+
+    Check_Type(ary, T_ARRAY);
+    ssl_obj = rb_ary_entry(ary, 0);
+
+    sslctx_obj = rb_iv_get(ssl_obj, "@context");
+    if (NIL_P(sslctx_obj)) return Qnil;
+    cb = rb_iv_get(sslctx_obj, "@session_get_cb");
+    if (NIL_P(cb)) return Qnil;
+
+    return rb_funcall(cb, rb_intern("call"), 1, ary);
+}
+
+/* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
+static SSL_SESSION *
+ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
+{
+    VALUE ary, ssl_obj, ret_obj;
+    SSL_SESSION *sess;
+    void *ptr;
+    int state = 0;
+
+    OSSL_Debug("SSL SESSION get callback entered");
+    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return NULL;
+    ssl_obj = (VALUE)ptr;
+    ary = rb_ary_new2(2);
+    rb_ary_push(ary, ssl_obj);
+    rb_ary_push(ary, rb_str_new((const char *)buf, len));
+
+    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
+    if (state) {
+        rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
+        return NULL;
+    }
+    if (!rb_obj_is_instance_of(ret_obj, cSSLSession))
+        return NULL;
+
+    SafeGetSSLSession(ret_obj, sess);
+    *copy = 1;
+
+    return sess;
+}
+
+static VALUE
+ossl_call_session_new_cb(VALUE ary)
+{
+    VALUE ssl_obj, sslctx_obj, cb;
+
+    Check_Type(ary, T_ARRAY);
+    ssl_obj = rb_ary_entry(ary, 0);
+
+    sslctx_obj = rb_iv_get(ssl_obj, "@context");
+    if (NIL_P(sslctx_obj)) return Qnil;
+    cb = rb_iv_get(sslctx_obj, "@session_new_cb");
+    if (NIL_P(cb)) return Qnil;
+
+    return rb_funcall(cb, rb_intern("call"), 1, ary);
+}
+
+/* return 1 normal.  return 0 removes the session */
+static int
+ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
+{
+    VALUE ary, ssl_obj, sess_obj, ret_obj;
+    void *ptr;
+    int state = 0;
+
+    OSSL_Debug("SSL SESSION new callback entered");
+
+    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return 1;
+    ssl_obj = (VALUE)ptr;
+    sess_obj = rb_obj_alloc(cSSLSession);
+    CRYPTO_add(&sess->references, 1, CRYPTO_LOCK_SSL_SESSION);
+    DATA_PTR(sess_obj) = sess;
+
+    ary = rb_ary_new2(2);
+    rb_ary_push(ary, ssl_obj);
+    rb_ary_push(ary, sess_obj);
+
+    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
+    if (state) {
+        rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
+        return 0; /* what should be returned here??? */
+    }
+
+    return RTEST(ret_obj) ? 1 : 0;
+}
+
+#if 0				/* unused */
+static VALUE
+ossl_call_session_remove_cb(VALUE ary)
+{
+    VALUE sslctx_obj, cb;
+
+    Check_Type(ary, T_ARRAY);
+    sslctx_obj = rb_ary_entry(ary, 0);
+
+    cb = rb_iv_get(sslctx_obj, "@session_remove_cb");
+    if (NIL_P(cb)) return Qnil;
+
+    return rb_funcall(cb, rb_intern("call"), 1, ary);
+}
+#endif
+
+static void
+ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
+{
+    VALUE ary, sslctx_obj, sess_obj, ret_obj;
+    void *ptr;
+    int state = 0;
+
+    OSSL_Debug("SSL SESSION remove callback entered");
+
+    if ((ptr = SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return;
+    sslctx_obj = (VALUE)ptr;
+    sess_obj = rb_obj_alloc(cSSLSession);
+    CRYPTO_add(&sess->references, 1, CRYPTO_LOCK_SSL_SESSION);
+    DATA_PTR(sess_obj) = sess;
+
+    ary = rb_ary_new2(2);
+    rb_ary_push(ary, sslctx_obj);
+    rb_ary_push(ary, sess_obj);
+
+    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
+    if (state) {
+/*
+  the SSL_CTX is frozen, nowhere to save state.
+  there is no common accessor method to check it either.
+        rb_ivar_set(sslctx_obj, ID_callback_state, INT2NUM(state));
+*/
+    }
+}
+
+static VALUE
 ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
 {
     X509 *x509;
@@ -288,6 +456,74 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
     return i;
 }
 
+static VALUE ossl_sslctx_setup(VALUE self);
+
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
+static VALUE
+ossl_call_servername_cb(VALUE ary)
+{
+    VALUE ssl_obj, sslctx_obj, cb, ret_obj;
+
+    Check_Type(ary, T_ARRAY);
+    ssl_obj = rb_ary_entry(ary, 0);
+
+    sslctx_obj = rb_iv_get(ssl_obj, "@context");
+    if (NIL_P(sslctx_obj)) return Qnil;
+    cb = rb_iv_get(sslctx_obj, "@servername_cb");
+    if (NIL_P(cb)) return Qnil;
+
+    ret_obj = rb_funcall(cb, rb_intern("call"), 1, ary);
+    if (rb_obj_is_kind_of(ret_obj, cSSLContext)) {
+        SSL *ssl;
+        SSL_CTX *ctx2;
+
+        ossl_sslctx_setup(ret_obj);
+        Data_Get_Struct(ssl_obj, SSL, ssl);
+        Data_Get_Struct(ret_obj, SSL_CTX, ctx2);
+        SSL_set_SSL_CTX(ssl, ctx2);
+    } else if (!NIL_P(ret_obj)) {
+            rb_raise(rb_eArgError, "servername_cb must return an OpenSSL::SSL::SSLContext object or nil");
+    }
+
+    return ret_obj;
+}
+
+static int
+ssl_servername_cb(SSL *ssl, int *ad, void *arg)
+{
+    VALUE ary, ssl_obj, ret_obj;
+    void *ptr;
+    int state = 0;
+    const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+
+    if (!servername)
+        return SSL_TLSEXT_ERR_OK;
+
+    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return SSL_TLSEXT_ERR_ALERT_FATAL;
+    ssl_obj = (VALUE)ptr;
+    ary = rb_ary_new2(2);
+    rb_ary_push(ary, ssl_obj);
+    rb_ary_push(ary, rb_str_new2(servername));
+
+    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_servername_cb, ary, &state);
+    if (state) {
+        rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+    return SSL_TLSEXT_ERR_OK;
+}
+#endif
+
+/*
+ * call-seq:
+ *    ctx.setup => Qtrue # first time
+ *    ctx.setup => nil # thereafter
+ *
+ * This method is called automatically when a new SSLSocket is created.
+ * Normally you do not need to call this method (unless you are writing an extension in C).
+ */
 static VALUE
 ossl_sslctx_setup(VALUE self)
 {
@@ -307,10 +543,10 @@ ossl_sslctx_setup(VALUE self)
 	SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
     }
     else{
-	rb_warning("using default DH parameters.");
 	SSL_CTX_set_tmp_dh_callback(ctx, ossl_default_tmp_dh_callback);
     }
 #endif
+    SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_ptr_idx, (void*)self);
 
     val = ossl_sslctx_get_cert_store(self);
     if(!NIL_P(val)){
@@ -327,7 +563,7 @@ ossl_sslctx_setup(VALUE self)
 
     val = ossl_sslctx_get_extra_cert(self);
     if(!NIL_P(val)){
-	rb_iterate(rb_each, val, ossl_sslctx_add_extra_chain_cert_i, self);
+	rb_block_call(val, rb_intern("each"), 0, 0, ossl_sslctx_add_extra_chain_cert_i, self);
     }
 
     /* private key may be bundled in certificate file. */
@@ -352,8 +588,8 @@ ossl_sslctx_setup(VALUE self)
     val = ossl_sslctx_get_client_ca(self);
     if(!NIL_P(val)){
 	if(TYPE(val) == T_ARRAY){
-	    for(i = 0; i < RARRAY(val)->len; i++){
-		client_ca = GetX509CertPtr(RARRAY(val)->ptr[i]);
+	    for(i = 0; i < RARRAY_LEN(val); i++){
+		client_ca = GetX509CertPtr(RARRAY_PTR(val)[i]);
         	if (!SSL_CTX_add_client_CA(ctx, client_ca)){
 		    /* Copies X509_NAME => FREE it. */
         	    ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
@@ -391,18 +627,43 @@ ossl_sslctx_setup(VALUE self)
     if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2LONG(val));
 
     val = ossl_sslctx_get_options(self);
-    if(!NIL_P(val)) SSL_CTX_set_options(ctx, NUM2LONG(val));
+    if(!NIL_P(val)) {
+	SSL_CTX_set_options(ctx, NUM2LONG(val));
+    } else {
+	SSL_CTX_set_options(ctx, SSL_OP_ALL);
+    }
     rb_obj_freeze(self);
 
     val = ossl_sslctx_get_sess_id_ctx(self);
     if (!NIL_P(val)){
 	StringValue(val);
-	if (!SSL_CTX_set_session_id_context(ctx, RSTRING(val)->ptr,
-					    RSTRING(val)->len)){
-            ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
+	if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
+					    RSTRING_LEN(val))){
+	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
 	}
     }
 
+    if (RTEST(rb_iv_get(self, "@session_get_cb"))) {
+	SSL_CTX_sess_set_get_cb(ctx, ossl_sslctx_session_get_cb);
+	OSSL_Debug("SSL SESSION get callback added");
+    }
+    if (RTEST(rb_iv_get(self, "@session_new_cb"))) {
+	SSL_CTX_sess_set_new_cb(ctx, ossl_sslctx_session_new_cb);
+	OSSL_Debug("SSL SESSION new callback added");
+    }
+    if (RTEST(rb_iv_get(self, "@session_remove_cb"))) {
+	SSL_CTX_sess_set_remove_cb(ctx, ossl_sslctx_session_remove_cb);
+	OSSL_Debug("SSL SESSION remove callback added");
+    }
+
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
+    val = rb_iv_get(self, "@servername_cb");
+    if (!NIL_P(val)) {
+        SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
+	OSSL_Debug("SSL TLSEXT servername callback added");
+    }
+#endif
+
     return Qtrue;
 }
 
@@ -422,6 +683,10 @@ ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
     return ary;
 }
 
+/*
+ * call-seq:
+ *    ctx.ciphers => [[name, version, bits, alg_bits], ...]
+ */
 static VALUE
 ossl_sslctx_get_ciphers(VALUE self)
 {
@@ -450,6 +715,12 @@ ossl_sslctx_get_ciphers(VALUE self)
     return ary;
 }
 
+/*
+ * call-seq:
+ *    ctx.ciphers = "cipher1:cipher2:..."
+ *    ctx.ciphers = [name, ...]
+ *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
+ */
 static VALUE
 ossl_sslctx_set_ciphers(VALUE self, VALUE v)
 {
@@ -462,12 +733,12 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
 	return v;
     else if (TYPE(v) == T_ARRAY) {
         str = rb_str_new(0, 0);
-        for (i = 0; i < RARRAY(v)->len; i++) {
+        for (i = 0; i < RARRAY_LEN(v); i++) {
             elem = rb_ary_entry(v, i);
             if (TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0);
             elem = rb_String(elem);
             rb_str_append(str, elem);
-            if (i < RARRAY(v)->len-1) rb_str_cat2(str, ":");
+            if (i < RARRAY_LEN(v)-1) rb_str_cat2(str, ":");
         }
     } else {
         str = v;
@@ -479,13 +750,172 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
         ossl_raise(eSSLError, "SSL_CTX is not initialized.");
         return Qnil;
     }
-    if (!SSL_CTX_set_cipher_list(ctx, RSTRING(str)->ptr)) {
+    if (!SSL_CTX_set_cipher_list(ctx, RSTRING_PTR(str))) {
         ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
     }
 
     return v;
 }
 
+
+/*
+ *  call-seq:
+ *     ctx.session_add(session) -> true | false
+ *
+ */
+static VALUE
+ossl_sslctx_session_add(VALUE self, VALUE arg)
+{
+    SSL_CTX *ctx;
+    SSL_SESSION *sess;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+    SafeGetSSLSession(arg, sess);
+
+    return SSL_CTX_add_session(ctx, sess) == 1 ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     ctx.session_remove(session) -> true | false
+ *
+ */
+static VALUE
+ossl_sslctx_session_remove(VALUE self, VALUE arg)
+{
+    SSL_CTX *ctx;
+    SSL_SESSION *sess;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+    SafeGetSSLSession(arg, sess);
+
+    return SSL_CTX_remove_session(ctx, sess) == 1 ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     ctx.session_cache_mode -> integer
+ *
+ */
+static VALUE
+ossl_sslctx_get_session_cache_mode(VALUE self)
+{
+    SSL_CTX *ctx;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+    return LONG2NUM(SSL_CTX_get_session_cache_mode(ctx));
+}
+
+/*
+ *  call-seq:
+ *     ctx.session_cache_mode=(integer) -> integer
+ *
+ */
+static VALUE
+ossl_sslctx_set_session_cache_mode(VALUE self, VALUE arg)
+{
+    SSL_CTX *ctx;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+    SSL_CTX_set_session_cache_mode(ctx, NUM2LONG(arg));
+
+    return arg;
+}
+
+/*
+ *  call-seq:
+ *     ctx.session_cache_size -> integer
+ *
+ */
+static VALUE
+ossl_sslctx_get_session_cache_size(VALUE self)
+{
+    SSL_CTX *ctx;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+    return LONG2NUM(SSL_CTX_sess_get_cache_size(ctx));
+}
+
+/*
+ *  call-seq:
+ *     ctx.session_cache_size=(integer) -> integer
+ *
+ */
+static VALUE
+ossl_sslctx_set_session_cache_size(VALUE self, VALUE arg)
+{
+    SSL_CTX *ctx;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+    SSL_CTX_sess_set_cache_size(ctx, NUM2LONG(arg));
+
+    return arg;
+}
+
+/*
+ *  call-seq:
+ *     ctx.session_cache_stats -> Hash
+ *
+ */
+static VALUE
+ossl_sslctx_get_session_cache_stats(VALUE self)
+{
+    SSL_CTX *ctx;
+    VALUE hash;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+    hash = rb_hash_new();
+    rb_hash_aset(hash, ID2SYM(rb_intern("cache_num")), LONG2NUM(SSL_CTX_sess_number(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("connect")), LONG2NUM(SSL_CTX_sess_connect(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("connect_good")), LONG2NUM(SSL_CTX_sess_connect_good(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("connect_renegotiate")), LONG2NUM(SSL_CTX_sess_connect_renegotiate(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("accept")), LONG2NUM(SSL_CTX_sess_accept(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("accept_good")), LONG2NUM(SSL_CTX_sess_accept_good(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("accept_renegotiate")), LONG2NUM(SSL_CTX_sess_accept_renegotiate(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("cache_hits")), LONG2NUM(SSL_CTX_sess_hits(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("cb_hits")), LONG2NUM(SSL_CTX_sess_cb_hits(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("cache_misses")), LONG2NUM(SSL_CTX_sess_misses(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("cache_full")), LONG2NUM(SSL_CTX_sess_cache_full(ctx)));
+    rb_hash_aset(hash, ID2SYM(rb_intern("timeouts")), LONG2NUM(SSL_CTX_sess_timeouts(ctx)));
+
+    return hash;
+}
+
+
+/*
+ *  call-seq:
+ *     ctx.flush_sessions(time | nil) -> self
+ *
+ */
+static VALUE
+ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
+{
+    VALUE arg1;
+    SSL_CTX *ctx;
+    time_t tm = 0;
+
+    rb_scan_args(argc, argv, "01", &arg1);
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+    if (NIL_P(arg1)) {
+        tm = time(0);
+    } else if (rb_obj_is_instance_of(arg1, rb_cTime)) {
+        tm = NUM2LONG(rb_funcall(arg1, rb_intern("to_i"), 0));
+    } else {
+        rb_raise(rb_eArgError, "arg must be Time or nil");
+    }
+
+    SSL_CTX_flush_sessions(ctx, (long)tm);
+
+    return self;
+}
+
 /*
  * SSLSocket class
  */
@@ -511,6 +941,20 @@ ossl_ssl_s_alloc(VALUE klass)
     return Data_Wrap_Struct(klass, 0, ossl_ssl_free, NULL);
 }
 
+/*
+ * call-seq:
+ *    SSLSocket.new(io) => aSSLSocket
+ *    SSLSocket.new(io, ctx) => aSSLSocket
+ *
+ * === Parameters
+ * * +io+ is a real ruby IO object.  Not an IO like object that responds to read/write.
+ * * +ctx+ is an OpenSSLSSL::SSLContext.
+ *
+ * The OpenSSL::Buffering module provides additional IO methods.
+ *
+ * This method will freeze the SSLContext if one is provided;
+ * however, session management is still allowed in the frozen SSLContext.
+ */
 static VALUE
 ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -525,6 +969,9 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
     ossl_ssl_set_ctx(self, ctx);
     ossl_ssl_set_sync_close(self, Qfalse);
     ossl_sslctx_setup(ctx);
+
+    rb_iv_set(self, "@hostname", Qnil);
+
     rb_call_super(0, 0);
 
     return self;
@@ -536,10 +983,14 @@ ossl_ssl_setup(VALUE self)
     VALUE io, v_ctx, cb;
     SSL_CTX *ctx;
     SSL *ssl;
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     Data_Get_Struct(self, SSL, ssl);
     if(!ssl){
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
+	VALUE hostname = rb_iv_get(self, "@hostname");
+#endif
+
         v_ctx = ossl_ssl_get_ctx(self);
         Data_Get_Struct(v_ctx, SSL_CTX, ctx);
 
@@ -549,11 +1000,17 @@ ossl_ssl_setup(VALUE self)
         }
         DATA_PTR(self) = ssl;
 
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
+        if (!NIL_P(hostname)) {
+           if (SSL_set_tlsext_host_name(ssl, StringValuePtr(hostname)) != 1)
+               ossl_raise(eSSLError, "SSL_set_tlsext_host_name:");
+        }
+#endif
         io = ossl_ssl_get_io(self);
         GetOpenFile(io, fptr);
         rb_io_check_readable(fptr);
         rb_io_check_writable(fptr);
-        SSL_set_fd(ssl, TO_SOCKET(fileno(fptr->f)));
+        SSL_set_fd(ssl, TO_SOCKET(FPTR_TO_FD(fptr)));
 	SSL_set_ex_data(ssl, ossl_ssl_ex_ptr_idx, (void*)self);
 	cb = ossl_sslctx_get_verify_cb(v_ctx);
 	SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void*)cb);
@@ -567,61 +1024,152 @@ ossl_ssl_setup(VALUE self)
 }
 
 #ifdef _WIN32
-#define ssl_get_error(ssl, ret) \
-  (errno = WSAGetLastError(), SSL_get_error(ssl, ret))
+#define ssl_get_error(ssl, ret) (errno = rb_w32_map_errno(WSAGetLastError()), SSL_get_error(ssl, ret))
 #else
 #define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
 #endif
 
+static void
+write_would_block(int nonblock)
+{
+    if (nonblock) {
+        VALUE exc = ossl_exc_new(eSSLError, "write would block");
+        rb_extend_object(exc, rb_mWaitWritable);
+        rb_exc_raise(exc);
+    }
+}
+
+static void
+read_would_block(int nonblock)
+{
+    if (nonblock) {
+        VALUE exc = ossl_exc_new(eSSLError, "read would block");
+        rb_extend_object(exc, rb_mWaitReadable);
+        rb_exc_raise(exc);
+    }
+}
+
 static VALUE
-ossl_start_ssl(VALUE self, int (*func)())
+ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
 {
     SSL *ssl;
-    OpenFile *fptr;
-    int ret;
+    rb_io_t *fptr;
+    int ret, ret2;
+    VALUE cb_state;
+
+    rb_ivar_set(self, ID_callback_state, Qnil);
 
     Data_Get_Struct(self, SSL, ssl);
     GetOpenFile(ossl_ssl_get_io(self), fptr);
     for(;;){
-	if((ret = func(ssl)) > 0) break;
-	switch(ssl_get_error(ssl, ret)){
+	ret = func(ssl);
+
+        cb_state = rb_ivar_get(self, ID_callback_state);
+        if (!NIL_P(cb_state))
+            rb_jump_tag(NUM2INT(cb_state));
+
+	if (ret > 0)
+	    break;
+
+	switch((ret2 = ssl_get_error(ssl, ret))){
 	case SSL_ERROR_WANT_WRITE:
-            rb_io_wait_writable(fileno(fptr->f));
+            write_would_block(nonblock);
+            rb_io_wait_writable(FPTR_TO_FD(fptr));
             continue;
 	case SSL_ERROR_WANT_READ:
-            rb_io_wait_readable(fileno(fptr->f));
+            read_would_block(nonblock);
+            rb_io_wait_readable(FPTR_TO_FD(fptr));
             continue;
 	case SSL_ERROR_SYSCALL:
-	    if (errno) rb_sys_fail(0);
+	    if (errno) rb_sys_fail(funcname);
+	    ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
 	default:
-	    ossl_raise(eSSLError, NULL);
+	    ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
 	}
     }
 
     return self;
 }
 
+/*
+ * call-seq:
+ *    ssl.connect => self
+ */
 static VALUE
 ossl_ssl_connect(VALUE self)
 {
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_connect);
+    return ossl_start_ssl(self, SSL_connect, "SSL_connect", 0);
 }
 
+/*
+ * call-seq:
+ *    ssl.connect_nonblock => self
+ *
+ * initiate the TLS/SSL handshake as a client in non-blocking manner.
+ *
+ *   # emulates blocking connect
+ *   begin
+ *     ssl.connect_nonblock
+ *   rescue IO::WaitReadable
+ *     IO.select([s2])
+ *     retry
+ *   rescue IO::WaitWritable
+ *     IO.select(nil, [s2])
+ *     retry
+ *   end
+ *
+ */
+static VALUE
+ossl_ssl_connect_nonblock(VALUE self)
+{
+    ossl_ssl_setup(self);
+    return ossl_start_ssl(self, SSL_connect, "SSL_connect", 1);
+}
+
+/*
+ * call-seq:
+ *    ssl.accept => self
+ */
 static VALUE
 ossl_ssl_accept(VALUE self)
 {
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_accept);
+    return ossl_start_ssl(self, SSL_accept, "SSL_accept", 0);
 }
 
+/*
+ * call-seq:
+ *    ssl.accept_nonblock => self
+ *
+ * initiate the TLS/SSL handshake as a server in non-blocking manner.
+ *
+ *   # emulates blocking accept
+ *   begin
+ *     ssl.accept_nonblock
+ *   rescue IO::WaitReadable
+ *     IO.select([s2])
+ *     retry
+ *   rescue IO::WaitWritable
+ *     IO.select(nil, [s2])
+ *     retry
+ *   end
+ *
+ */
 static VALUE
-ossl_ssl_read(int argc, VALUE *argv, VALUE self)
+ossl_ssl_accept_nonblock(VALUE self)
+{
+    ossl_ssl_setup(self);
+    return ossl_start_ssl(self, SSL_accept, "SSL_accept", 1);
+}
+
+static VALUE
+ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
 {
     SSL *ssl;
     int ilen, nread = 0;
     VALUE len, str;
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     rb_scan_args(argc, argv, "11", &len, &str);
     ilen = NUM2INT(len);
@@ -636,20 +1184,22 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(self, SSL, ssl);
     GetOpenFile(ossl_ssl_get_io(self), fptr);
     if (ssl) {
-	if(SSL_pending(ssl) <= 0)
-	    rb_thread_wait_fd(fileno(fptr->f));
+	if(!nonblock && SSL_pending(ssl) <= 0)
+	    rb_thread_wait_fd(FPTR_TO_FD(fptr));
 	for (;;){
-	    nread = SSL_read(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
+	    nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
 	    switch(ssl_get_error(ssl, nread)){
 	    case SSL_ERROR_NONE:
 		goto end;
 	    case SSL_ERROR_ZERO_RETURN:
 		rb_eof_error();
 	    case SSL_ERROR_WANT_WRITE:
-                rb_io_wait_writable(fileno(fptr->f));
+                write_would_block(nonblock);
+                rb_io_wait_writable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_WANT_READ:
-                rb_io_wait_readable(fileno(fptr->f));
+                read_would_block(nonblock);
+                rb_io_wait_readable(FPTR_TO_FD(fptr));
 		continue;
 	    case SSL_ERROR_SYSCALL:
 		if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
@@ -660,25 +1210,55 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
         }
     }
     else {
-        ID id_sysread = rb_intern("sysread");
+        ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
         rb_warning("SSL session is not started yet.");
-        return rb_funcall(ossl_ssl_get_io(self), id_sysread, 2, len, str);
+        return rb_funcall(ossl_ssl_get_io(self), meth, 2, len, str);
     }
 
   end:
-    RSTRING(str)->len = nread;
-    RSTRING(str)->ptr[nread] = 0;
+    rb_str_set_len(str, nread);
     OBJ_TAINT(str);
 
     return str;
 }
 
+
+/*
+ * call-seq:
+ *    ssl.sysread(length) => string
+ *    ssl.sysread(length, buffer) => buffer
+ *
+ * === Parameters
+ * * +length+ is a positive integer.
+ * * +buffer+ is a string used to store the result.
+ */
 static VALUE
-ossl_ssl_write(VALUE self, VALUE str)
+ossl_ssl_read(int argc, VALUE *argv, VALUE self)
+{
+    return ossl_ssl_read_internal(argc, argv, self, 0);
+}
+
+/*
+ * call-seq:
+ *    ssl.sysread_nonblock(length) => string
+ *    ssl.sysread_nonblock(length, buffer) => buffer
+ *
+ * === Parameters
+ * * +length+ is a positive integer.
+ * * +buffer+ is a string used to store the result.
+ */
+static VALUE
+ossl_ssl_read_nonblock(int argc, VALUE *argv, VALUE self)
+{
+    return ossl_ssl_read_internal(argc, argv, self, 1);
+}
+
+static VALUE
+ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
 {
     SSL *ssl;
     int nwrite = 0;
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     StringValue(str);
     Data_Get_Struct(self, SSL, ssl);
@@ -686,15 +1266,17 @@ ossl_ssl_write(VALUE self, VALUE str)
 
     if (ssl) {
 	for (;;){
-	    nwrite = SSL_write(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
+	    nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
 	    switch(ssl_get_error(ssl, nwrite)){
 	    case SSL_ERROR_NONE:
 		goto end;
 	    case SSL_ERROR_WANT_WRITE:
-                rb_io_wait_writable(fileno(fptr->f));
+                write_would_block(nonblock);
+                rb_io_wait_writable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_WANT_READ:
-                rb_io_wait_readable(fileno(fptr->f));
+                read_would_block(nonblock);
+                rb_io_wait_readable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_SYSCALL:
 		if (errno) rb_sys_fail(0);
@@ -713,6 +1295,30 @@ ossl_ssl_write(VALUE self, VALUE str)
     return INT2NUM(nwrite);
 }
 
+/*
+ * call-seq:
+ *    ssl.syswrite(string) => integer
+ */
+static VALUE
+ossl_ssl_write(VALUE self, VALUE str)
+{
+    return ossl_ssl_write_internal(self, str, 0);
+}
+
+/*
+ * call-seq:
+ *    ssl.syswrite_nonblock(string) => integer
+ */
+static VALUE
+ossl_ssl_write_nonblock(VALUE self, VALUE str)
+{
+    return ossl_ssl_write_internal(self, str, 1);
+}
+
+/*
+ * call-seq:
+ *    ssl.sysclose => nil
+ */
 static VALUE
 ossl_ssl_close(VALUE self)
 {
@@ -726,6 +1332,10 @@ ossl_ssl_close(VALUE self)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *    ssl.cert => cert or nil
+ */
 static VALUE
 ossl_ssl_get_cert(VALUE self)
 {
@@ -733,7 +1343,7 @@ ossl_ssl_get_cert(VALUE self)
     X509 *cert = NULL;
 
     Data_Get_Struct(self, SSL, ssl);
-    if (ssl) {
+    if (!ssl) {
         rb_warning("SSL session is not started yet.");
         return Qnil;
     }
@@ -750,6 +1360,10 @@ ossl_ssl_get_cert(VALUE self)
     return ossl_x509_new(cert);
 }
 
+/*
+ * call-seq:
+ *    ssl.peer_cert => cert or nil
+ */
 static VALUE
 ossl_ssl_get_peer_cert(VALUE self)
 {
@@ -775,6 +1389,10 @@ ossl_ssl_get_peer_cert(VALUE self)
     return obj;
 }
 
+/*
+ * call-seq:
+ *    ssl.peer_cert_chain => [cert, ...] or nil
+ */
 static VALUE
 ossl_ssl_get_peer_cert_chain(VALUE self)
 {
@@ -791,16 +1409,20 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
     }
     chain = SSL_get_peer_cert_chain(ssl);
     if(!chain) return Qnil;
-    num = sk_num(chain);
+    num = sk_X509_num(chain);
     ary = rb_ary_new2(num);
     for (i = 0; i < num; i++){
-	cert = (X509*)sk_value(chain, i);
+	cert = sk_X509_value(chain, i);
 	rb_ary_push(ary, ossl_x509_new(cert));
     }
 
     return ary;
 }
 
+/*
+ * call-seq:
+ *    ssl.cipher => [name, version, bits, alg_bits]
+ */
 static VALUE
 ossl_ssl_get_cipher(VALUE self)
 {
@@ -812,11 +1434,15 @@ ossl_ssl_get_cipher(VALUE self)
         rb_warning("SSL session is not started yet.");
         return Qnil;
     }
-    cipher = SSL_get_current_cipher(ssl);
+    cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl);
 
     return ossl_ssl_cipher_to_ary(cipher);
 }
 
+/*
+ * call-seq:
+ *    ssl.state => string
+ */
 static VALUE
 ossl_ssl_get_state(VALUE self)
 {
@@ -836,6 +1462,10 @@ ossl_ssl_get_state(VALUE self)
     return ret;
 }
 
+/*
+ * call-seq:
+ *    ssl.pending => integer
+ */
 static VALUE
 ossl_ssl_pending(VALUE self)
 {
@@ -850,36 +1480,149 @@ ossl_ssl_pending(VALUE self)
     return INT2NUM(SSL_pending(ssl));
 }
 
+/*
+ *  call-seq:
+ *     ssl.session_reused? -> true | false
+ *
+ */
+static VALUE
+ossl_ssl_session_reused(VALUE self)
+{
+    SSL *ssl;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if (!ssl) {
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+
+    switch(SSL_session_reused(ssl)) {
+    case 1:	return Qtrue;
+    case 0:	return Qfalse;
+    default:	ossl_raise(eSSLError, "SSL_session_reused");
+    }
+}
+
+/*
+ *  call-seq:
+ *     ssl.session = session -> session
+ *
+ */
+static VALUE
+ossl_ssl_set_session(VALUE self, VALUE arg1)
+{
+    SSL *ssl;
+    SSL_SESSION *sess;
+
+/* why is ossl_ssl_setup delayed? */
+    ossl_ssl_setup(self);
+
+    Data_Get_Struct(self, SSL, ssl);
+    if (!ssl) {
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+
+    SafeGetSSLSession(arg1, sess);
+
+    if (SSL_set_session(ssl, sess) != 1)
+        ossl_raise(eSSLError, "SSL_set_session");
+
+    return arg1;
+}
+
+static VALUE
+ossl_ssl_get_verify_result(VALUE self)
+{
+    SSL *ssl;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if (!ssl) {
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+
+    return INT2FIX(SSL_get_verify_result(ssl));
+}
+
 void
 Init_ossl_ssl()
 {
     int i;
+    VALUE ary;
 
 #if 0 /* let rdoc know about mOSSL */
     mOSSL = rb_define_module("OpenSSL");
 #endif
 
-    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0);
-    ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0);
-    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0);
+    ID_callback_state = rb_intern("@callback_state");
+
+    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_vcb_idx",0,0,0);
+    ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_store_p",0,0,0);
+    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_ptr_idx",0,0,0);
     ossl_ssl_ex_client_cert_cb_idx =
-	SSL_get_ex_new_index(0,"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
+	SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
     ossl_ssl_ex_tmp_dh_callback_idx =
-	SSL_get_ex_new_index(0,"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
+	SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
 
     mSSL = rb_define_module_under(mOSSL, "SSL");
     eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
 
-    /* class SSLContext */
+    Init_ossl_ssl_session();
+
+    /* class SSLContext
+     *
+     * The following attributes are available but don't show up in rdoc.
+     * All attributes must be set before calling SSLSocket.new(io, ctx).
+     * * ssl_version, cert, key, client_ca, ca_file, ca_path, timeout,
+     * * verify_mode, verify_depth client_cert_cb, tmp_dh_callback,
+     * * session_id_context, session_add_cb, session_new_cb, session_remove_cb
+     */
     cSSLContext = rb_define_class_under(mSSL, "SSLContext", rb_cObject);
     rb_define_alloc_func(cSSLContext, ossl_sslctx_s_alloc);
     for(i = 0; i < numberof(ossl_sslctx_attrs); i++)
         rb_attr(cSSLContext, rb_intern(ossl_sslctx_attrs[i]), 1, 1, Qfalse);
+    rb_define_alias(cSSLContext, "ssl_timeout", "timeout");
+    rb_define_alias(cSSLContext, "ssl_timeout=", "timeout=");
     rb_define_method(cSSLContext, "initialize",  ossl_sslctx_initialize, -1);
+    rb_define_method(cSSLContext, "ssl_version=", ossl_sslctx_set_ssl_version, 1);
     rb_define_method(cSSLContext, "ciphers",     ossl_sslctx_get_ciphers, 0);
     rb_define_method(cSSLContext, "ciphers=",    ossl_sslctx_set_ciphers, 1);
 
-    /* class SSLSocket */
+    rb_define_method(cSSLContext, "setup", ossl_sslctx_setup, 0);
+
+
+    rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2FIX(SSL_SESS_CACHE_OFF));
+    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2FIX(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2FIX(SSL_SESS_CACHE_SERVER));
+    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2FIX(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2FIX(SSL_SESS_CACHE_NO_AUTO_CLEAR));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_STORE));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL));
+    rb_define_method(cSSLContext, "session_add",     ossl_sslctx_session_add, 1);
+    rb_define_method(cSSLContext, "session_remove",     ossl_sslctx_session_remove, 1);
+    rb_define_method(cSSLContext, "session_cache_mode",     ossl_sslctx_get_session_cache_mode, 0);
+    rb_define_method(cSSLContext, "session_cache_mode=",     ossl_sslctx_set_session_cache_mode, 1);
+    rb_define_method(cSSLContext, "session_cache_size",     ossl_sslctx_get_session_cache_size, 0);
+    rb_define_method(cSSLContext, "session_cache_size=",     ossl_sslctx_set_session_cache_size, 1);
+    rb_define_method(cSSLContext, "session_cache_stats",     ossl_sslctx_get_session_cache_stats, 0);
+    rb_define_method(cSSLContext, "flush_sessions",     ossl_sslctx_flush_sessions, -1);
+
+    ary = rb_ary_new2(numberof(ossl_ssl_method_tab));
+    for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
+        rb_ary_push(ary, ID2SYM(rb_intern(ossl_ssl_method_tab[i].name)));
+    }
+    rb_obj_freeze(ary);
+    /* holds a list of available SSL/TLS methods */
+    rb_define_const(cSSLContext, "METHODS", ary);
+
+    /* class SSLSocket
+     *
+     * The following attributes are available but don't show up in rdoc.
+     * * io, context, sync_close
+     *
+     */
     cSSLSocket = rb_define_class_under(mSSL, "SSLSocket", rb_cObject);
     rb_define_alloc_func(cSSLSocket, ossl_ssl_s_alloc);
     for(i = 0; i < numberof(ossl_ssl_attr_readers); i++)
@@ -889,9 +1632,13 @@ Init_ossl_ssl()
     rb_define_alias(cSSLSocket, "to_io", "io");
     rb_define_method(cSSLSocket, "initialize", ossl_ssl_initialize, -1);
     rb_define_method(cSSLSocket, "connect",    ossl_ssl_connect, 0);
+    rb_define_method(cSSLSocket, "connect_nonblock",    ossl_ssl_connect_nonblock, 0);
     rb_define_method(cSSLSocket, "accept",     ossl_ssl_accept, 0);
+    rb_define_method(cSSLSocket, "accept_nonblock",     ossl_ssl_accept_nonblock, 0);
     rb_define_method(cSSLSocket, "sysread",    ossl_ssl_read, -1);
+    rb_define_private_method(cSSLSocket, "sysread_nonblock",    ossl_ssl_read_nonblock, -1);
     rb_define_method(cSSLSocket, "syswrite",   ossl_ssl_write, 1);
+    rb_define_private_method(cSSLSocket, "syswrite_nonblock",    ossl_ssl_write_nonblock, 1);
     rb_define_method(cSSLSocket, "sysclose",   ossl_ssl_close, 0);
     rb_define_method(cSSLSocket, "cert",       ossl_ssl_get_cert, 0);
     rb_define_method(cSSLSocket, "peer_cert",  ossl_ssl_get_peer_cert, 0);
@@ -899,25 +1646,30 @@ Init_ossl_ssl()
     rb_define_method(cSSLSocket, "cipher",     ossl_ssl_get_cipher, 0);
     rb_define_method(cSSLSocket, "state",      ossl_ssl_get_state, 0);
     rb_define_method(cSSLSocket, "pending",    ossl_ssl_pending, 0);
+    rb_define_method(cSSLSocket, "session_reused?",    ossl_ssl_session_reused, 0);
+    rb_define_method(cSSLSocket, "session=",    ossl_ssl_set_session, 1);
+    rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0);
 
-#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2FIX(SSL_##x))
+#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2NUM(SSL_##x))
 
     ossl_ssl_def_const(VERIFY_NONE);
     ossl_ssl_def_const(VERIFY_PEER);
     ossl_ssl_def_const(VERIFY_FAIL_IF_NO_PEER_CERT);
     ossl_ssl_def_const(VERIFY_CLIENT_ONCE);
-    /* Not introduce constants included in OP_ALL such as...
-     * ossl_ssl_def_const(OP_MICROSOFT_SESS_ID_BUG);
-     * ossl_ssl_def_const(OP_NETSCAPE_CHALLENGE_BUG);
-     * ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
-     * ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
-     * ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
-     * ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
-     * ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
-     * ossl_ssl_def_const(OP_TLS_D5_BUG);
-     * ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
-     * ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
+    /* Introduce constants included in OP_ALL.  These constants are mostly for
+     * unset some bits in OP_ALL such as;
+     *   ctx.options = OP_ALL & ~OP_DONT_INSERT_EMPTY_FRAGMENTS
      */
+    ossl_ssl_def_const(OP_MICROSOFT_SESS_ID_BUG);
+    ossl_ssl_def_const(OP_NETSCAPE_CHALLENGE_BUG);
+    ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
+    ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
+    ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
+    ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
+    ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
+    ossl_ssl_def_const(OP_TLS_D5_BUG);
+    ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
+    ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
     ossl_ssl_def_const(OP_ALL);
 #if defined(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
     ossl_ssl_def_const(OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
@@ -934,6 +1686,9 @@ Init_ossl_ssl()
     ossl_ssl_def_const(OP_NO_SSLv2);
     ossl_ssl_def_const(OP_NO_SSLv3);
     ossl_ssl_def_const(OP_NO_TLSv1);
+#if defined(SSL_OP_NO_TICKET)
+    ossl_ssl_def_const(OP_NO_TICKET);
+#endif
     ossl_ssl_def_const(OP_PKCS1_CHECK_1);
     ossl_ssl_def_const(OP_PKCS1_CHECK_2);
     ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
index 5929eef856..92df5f5599 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -11,11 +11,26 @@
 #if !defined(_OSSL_SSL_H_)
 #define _OSSL_SSL_H_
 
+#define GetSSLSession(obj, sess) do { \
+	Data_Get_Struct(obj, SSL_SESSION, sess); \
+	if (!sess) { \
+		ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
+	} \
+} while (0)
+
+#define SafeGetSSLSession(obj, sess) do { \
+	OSSL_Check_Kind(obj, cSSLSession); \
+	GetSSLSession(obj, sess); \
+} while (0)
+
 extern VALUE mSSL;
 extern VALUE eSSLError;
 extern VALUE cSSLSocket;
 extern VALUE cSSLContext;
+extern VALUE cSSLSession;
 
 void Init_ossl_ssl(void);
+void Init_ossl_ssl_session(void);
 
 #endif /* _OSSL_SSL_H_ */
+
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
new file mode 100644
index 0000000000..8df6ba4df3
--- /dev/null
+++ b/ext/openssl/ossl_ssl_session.c
@@ -0,0 +1,325 @@
+/*
+ *  Copyright (C) 2004-2007 Technorama Ltd. <oss-ruby@technorama.net>
+ */
+
+#include "ossl.h"
+
+#define GetSSLSession(obj, sess) do { \
+	Data_Get_Struct(obj, SSL_SESSION, sess); \
+	if (!sess) { \
+		ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
+	} \
+} while (0)
+
+#define SafeGetSSLSession(obj, sess) do { \
+	OSSL_Check_Kind(obj, cSSLSession); \
+	GetSSLSession(obj, sess); \
+} while (0)
+
+
+VALUE cSSLSession;
+static VALUE eSSLSession;
+
+static VALUE ossl_ssl_session_alloc(VALUE klass)
+{
+	return Data_Wrap_Struct(klass, 0, SSL_SESSION_free, NULL);
+}
+
+/*
+ * call-seq:
+ *    Session.new(SSLSocket | string) => session
+ *
+ * === Parameters
+ * +SSLSocket+ is an OpenSSL::SSL::SSLSocket
+ * +string+ must be a DER or PEM encoded Session.
+*/
+static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
+{
+	SSL_SESSION *ctx = NULL;
+
+	if (RDATA(self)->data)
+		ossl_raise(eSSLSession, "SSL Session already initialized");
+
+	if (rb_obj_is_instance_of(arg1, cSSLSocket)) {
+		SSL *ssl;
+
+		Data_Get_Struct(arg1, SSL, ssl);
+
+		if (!ssl || (ctx = SSL_get1_session(ssl)) == NULL)
+			ossl_raise(eSSLSession, "no session available");
+	} else {
+		BIO *in = ossl_obj2bio(arg1);
+
+		ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
+
+		if (!ctx) {
+			(void)BIO_reset(in);
+			ctx = d2i_SSL_SESSION_bio(in, NULL);
+		}
+
+		BIO_free(in);
+
+		if (!ctx)
+			ossl_raise(rb_eArgError, "unknown type");
+	}
+
+	/* should not happen */
+	if (ctx == NULL)
+		ossl_raise(eSSLSession, "ctx not set - internal error");
+
+	RDATA(self)->data = ctx;
+
+	return self;
+}
+
+#if HAVE_SSL_SESSION_CMP == 0
+int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b)
+{
+    if (a->ssl_version != b->ssl_version ||
+	a->session_id_length != b->session_id_length)
+	return 1;
+    return memcmp(a->session_id,b-> session_id, a->session_id_length);
+}
+#endif
+
+/*
+ * call-seq:
+ *    session1 == session2 -> boolean
+ *
+*/
+static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
+{
+	SSL_SESSION *ctx1, *ctx2;
+
+	GetSSLSession(val1, ctx1);
+	SafeGetSSLSession(val2, ctx2);
+
+	switch (SSL_SESSION_cmp(ctx1, ctx2)) {
+	case 0:		return Qtrue;
+	default:	return Qfalse;
+	}
+}
+
+/*
+ * call-seq:
+ *    session.time -> Time
+ *
+ * Gets start time of the session.
+ *
+*/
+static VALUE ossl_ssl_session_get_time(VALUE self)
+{
+	SSL_SESSION *ctx;
+	time_t t;
+
+	GetSSLSession(self, ctx);
+
+	t = SSL_SESSION_get_time(ctx);
+
+	if (t == 0)
+		return Qnil;
+
+	return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
+}
+
+/*
+ * call-seq:
+ *    session.timeout -> integer
+ *
+ * Gets how long until the session expires in seconds.
+ *
+*/
+static VALUE ossl_ssl_session_get_timeout(VALUE self)
+{
+	SSL_SESSION *ctx;
+	time_t t;
+
+	GetSSLSession(self, ctx);
+
+	t = SSL_SESSION_get_timeout(ctx);
+
+	return TIMET2NUM(t);
+}
+
+/*
+ * call-seq:
+ *    session.time=(Time) -> Time
+ *    session.time=(integer) -> Time
+ *
+ * Sets start time of the session. Time resolution is in seconds.
+ *
+*/
+static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
+{
+	SSL_SESSION *ctx;
+	long t;
+
+	GetSSLSession(self, ctx);
+	if (rb_obj_is_instance_of(time_v, rb_cTime)) {
+		time_v = rb_funcall(time_v, rb_intern("to_i"), 0);
+	}
+	t = NUM2LONG(time_v);
+	SSL_SESSION_set_time(ctx, t);
+	return ossl_ssl_session_get_time(self);
+}
+
+/*
+ * call-seq:
+ *    session.timeout=(integer) -> integer
+ *
+ * Sets how long until the session expires in seconds.
+ *
+*/
+static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)
+{
+	SSL_SESSION *ctx;
+	long t;
+
+	GetSSLSession(self, ctx);
+	if (rb_obj_is_instance_of(time_v, rb_cTime)) {
+		time_v = rb_funcall(time_v, rb_intern("to_i"), 0);
+	}
+	t = NUM2LONG(time_v);
+	SSL_SESSION_set_timeout(ctx, t);
+	return ossl_ssl_session_get_timeout(self);
+}
+
+#ifdef HAVE_SSL_SESSION_GET_ID
+/*
+ * call-seq:
+ *    session.id -> aString
+ *
+ * Returns the Session ID.
+*/
+static VALUE ossl_ssl_session_get_id(VALUE self)
+{
+	SSL_SESSION *ctx;
+	const unsigned char *p = NULL;
+	unsigned int i = 0;
+
+	GetSSLSession(self, ctx);
+
+	p = SSL_SESSION_get_id(ctx, &i);
+
+	return rb_str_new((const char *) p, i);
+}
+#endif
+
+/*
+ * call-seq:
+ *    session.to_der -> aString
+ *
+ * Returns an ASN1 encoded String that contains the Session object.
+*/
+static VALUE ossl_ssl_session_to_der(VALUE self)
+{
+	SSL_SESSION *ctx;
+	unsigned char buf[1024*10], *p;
+	int len;
+
+	GetSSLSession(self, ctx);
+
+	p = buf;
+	len = i2d_SSL_SESSION(ctx, &p);
+
+	if (len <= 0)
+		ossl_raise(eSSLSession, "i2d_SSL_SESSION");
+	else if (len >= sizeof(buf))
+		ossl_raise(eSSLSession, "i2d_SSL_SESSION too large");
+
+	return rb_str_new((const char *) p, len);
+}
+
+/*
+ * call-seq:
+ *    session.to_pem -> String
+ *
+ * Returns a PEM encoded String that contains the Session object.
+*/
+static VALUE ossl_ssl_session_to_pem(VALUE self)
+{
+	SSL_SESSION *ctx;
+	BIO *out;
+	BUF_MEM *buf;
+	VALUE str;
+	int i;
+
+	GetSSLSession(self, ctx);
+
+	if (!(out = BIO_new(BIO_s_mem()))) {
+		ossl_raise(eSSLSession, "BIO_s_mem()");
+	}
+
+	if (!(i=PEM_write_bio_SSL_SESSION(out, ctx))) {
+		BIO_free(out);
+		ossl_raise(eSSLSession, "SSL_SESSION_print()");
+	}
+
+	BIO_get_mem_ptr(out, &buf);
+	str = rb_str_new(buf->data, buf->length);
+	BIO_free(out);
+
+	return str;
+}
+
+
+/*
+ * call-seq:
+ *    session.to_text -> String
+ *
+ * Shows everything in the Session object.
+*/
+static VALUE ossl_ssl_session_to_text(VALUE self)
+{
+	SSL_SESSION *ctx;
+	BIO *out;
+	BUF_MEM *buf;
+	VALUE str;
+
+	GetSSLSession(self, ctx);
+
+	if (!(out = BIO_new(BIO_s_mem()))) {
+		ossl_raise(eSSLSession, "BIO_s_mem()");
+	}
+
+	if (!SSL_SESSION_print(out, ctx)) {
+		BIO_free(out);
+		ossl_raise(eSSLSession, "SSL_SESSION_print()");
+	}
+
+	BIO_get_mem_ptr(out, &buf);
+	str = rb_str_new(buf->data, buf->length);
+	BIO_free(out);
+
+	return str;
+}
+
+
+void Init_ossl_ssl_session(void)
+{
+#if 0 /* let rdoc know about mOSSL */
+	mOSSL = rb_define_module("OpenSSL");
+	mSSL = rb_define_module_under(mOSSL, "SSL");
+#endif
+	cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
+	eSSLSession = rb_define_class_under(cSSLSession, "SessionError", eOSSLError);
+
+	rb_define_alloc_func(cSSLSession, ossl_ssl_session_alloc);
+	rb_define_method(cSSLSession, "initialize", ossl_ssl_session_initialize, 1);
+
+	rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
+
+	rb_define_method(cSSLSession, "time", ossl_ssl_session_get_time, 0);
+	rb_define_method(cSSLSession, "time=", ossl_ssl_session_set_time, 1);
+	rb_define_method(cSSLSession, "timeout", ossl_ssl_session_get_timeout, 0);
+	rb_define_method(cSSLSession, "timeout=", ossl_ssl_session_set_timeout, 1);
+
+#ifdef HAVE_SSL_SESSION_GET_ID
+	rb_define_method(cSSLSession, "id", ossl_ssl_session_get_id, 0);
+#else
+	rb_undef_method(cSSLSession, "id");
+#endif
+	rb_define_method(cSSLSession, "to_der", ossl_ssl_session_to_der, 0);
+	rb_define_method(cSSLSession, "to_pem", ossl_ssl_session_to_pem, 0);
+	rb_define_method(cSSLSession, "to_text", ossl_ssl_session_to_text, 0);
+}
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
index 63878e0d8e..193ceab089 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -11,6 +11,6 @@
 #if !defined(_OSSL_VERSION_H_)
 #define _OSSL_VERSION_H_
 
-#define OSSL_VERSION "1.0.0"
+#define OSSL_VERSION "1.1.0"
 
 #endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index 7b88e294a9..1ab13692d4 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -41,7 +41,7 @@ ossl_x509attr_new(X509_ATTRIBUTE *attr)
 {
     X509_ATTRIBUTE *new;
     VALUE obj;
-    
+
     if (!attr) {
 	new = X509_ATTRIBUTE_new();
     } else {
@@ -77,27 +77,32 @@ ossl_x509attr_alloc(VALUE klass)
     X509_ATTRIBUTE *attr;
     VALUE obj;
 
-    if (!(attr = X509_ATTRIBUTE_new())) 
+    if (!(attr = X509_ATTRIBUTE_new()))
 	ossl_raise(eX509AttrError, NULL);
     WrapX509Attr(klass, obj, attr);
 
     return obj;
 }
 
+/*
+ * call-seq:
+ *    Attribute.new(oid [, value]) => attr
+ */
 static VALUE
 ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE oid, value;
-    X509_ATTRIBUTE *attr;
-    unsigned char *p;
+    X509_ATTRIBUTE *attr, *x;
+    const unsigned char *p;
 
     GetX509Attr(self, attr);
     if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
 	oid = ossl_to_der_if_possible(oid);
 	StringValue(oid);
-	p = RSTRING(oid)->ptr;
-	if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
-			       &p, RSTRING(oid)->len)){
+	p = (unsigned char *)RSTRING_PTR(oid);
+	x = d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid));
+	DATA_PTR(self) = attr;
+	if(!x){
 	    ossl_raise(eX509AttrError, NULL);
 	}
 	return self;
@@ -108,23 +113,31 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ * call-seq:
+ *    attr.oid = string => string
+ */
 static VALUE
 ossl_x509attr_set_oid(VALUE self, VALUE oid)
 {
     X509_ATTRIBUTE *attr;
     ASN1_OBJECT *obj;
     char *s;
- 
+
     s = StringValuePtr(oid);
     obj = OBJ_txt2obj(s, 0);
     if(!obj) obj = OBJ_txt2obj(s, 1);
     if(!obj) ossl_raise(eX509AttrError, NULL);
     GetX509Attr(self, attr);
     X509_ATTRIBUTE_set1_object(attr, obj);
- 
+
     return oid;
 }
 
+/*
+ * call-seq:
+ *    attr.oid => string
+ */
 static VALUE
 ossl_x509attr_get_oid(VALUE self)
 {
@@ -144,7 +157,7 @@ ossl_x509attr_get_oid(VALUE self)
 	i2a_ASN1_OBJECT(out, oid);
 	ret = ossl_membio2str(out);
     }
-  
+
     return ret;
 }
 
@@ -156,6 +169,10 @@ ossl_x509attr_get_oid(VALUE self)
 #  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->set = 0)
 #endif
 
+/*
+ * call-seq:
+ *    attr.value = asn1 => asn1
+ */
 static VALUE
 ossl_x509attr_set_value(VALUE self, VALUE value)
 {
@@ -179,6 +196,10 @@ ossl_x509attr_set_value(VALUE self, VALUE value)
     return value;
 }
 
+/*
+ * call-seq:
+ *    attr.value => asn1
+ */
 static VALUE
 ossl_x509attr_get_value(VALUE self)
 {
@@ -192,15 +213,16 @@ ossl_x509attr_get_value(VALUE self)
     if(OSSL_X509ATTR_IS_SINGLE(attr)){
 	length = i2d_ASN1_TYPE(attr->value.single, NULL);
 	str = rb_str_new(0, length);
-	p = RSTRING(str)->ptr;
+	p = (unsigned char *)RSTRING_PTR(str);
 	i2d_ASN1_TYPE(attr->value.single, &p);
 	ossl_str_adjust(str, p);
     }
     else{
-	length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
-			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
+	length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set,
+			(unsigned char **) NULL, i2d_ASN1_TYPE,
+			V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
 	str = rb_str_new(0, length);
-	p = RSTRING(str)->ptr;
+	p = (unsigned char *)RSTRING_PTR(str);
 	i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
 			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
 	ossl_str_adjust(str, p);
@@ -210,6 +232,10 @@ ossl_x509attr_get_value(VALUE self)
     return asn1;
 }
 
+/*
+ * call-seq:
+ *    attr.to_der => string
+ */
 static VALUE
 ossl_x509attr_to_der(VALUE self)
 {
@@ -222,10 +248,10 @@ ossl_x509attr_to_der(VALUE self)
     if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
 	ossl_raise(eX509AttrError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
 	ossl_raise(eX509AttrError, NULL);
-    RSTRING(str)->len = p - (unsigned char*)RSTRING(str)->ptr; 
+    rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str));
 
     return str;
 }
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index fc587a31f3..0217ffc0e1 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -51,11 +51,11 @@ ossl_x509_new(X509 *x509)
 	ossl_raise(eX509CertError, NULL);
     }
     WrapX509(cX509Cert, obj, new);
-	
+
     return obj;
 }
 
-VALUE 
+VALUE
 ossl_x509_new_from_file(VALUE filename)
 {
     X509 *x509;
@@ -63,7 +63,7 @@ ossl_x509_new_from_file(VALUE filename)
     VALUE obj;
 
     SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
+    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
 	ossl_raise(eX509CertError, "%s", strerror(errno));
     }
     x509 = PEM_read_X509(fp, NULL, NULL, NULL);
@@ -90,9 +90,9 @@ X509 *
 GetX509CertPtr(VALUE obj)
 {
     X509 *x509;
-	
+
     SafeGetX509(obj, x509);
-	
+
     return x509;
 }
 
@@ -100,18 +100,18 @@ X509 *
 DupX509CertPtr(VALUE obj)
 {
     X509 *x509;
-	
+
     SafeGetX509(obj, x509);
-	
+
     CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509);
-	
+
     return x509;
 }
 
 /*
  * Private
  */
-static VALUE 
+static VALUE
 ossl_x509_alloc(VALUE klass)
 {
     X509 *x509;
@@ -125,11 +125,16 @@ ossl_x509_alloc(VALUE klass)
     return obj;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    Certificate.new => cert
+ *    Certificate.new(string) => cert
+ */
+static VALUE
 ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509 *x509;
+    X509 *x509, *x = DATA_PTR(self);
     VALUE arg;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -138,14 +143,16 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
     }
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL);
+    x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
+    DATA_PTR(self) = x;
     if (!x509) {
-	BIO_reset(in);
-	x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self));
+	(void)BIO_reset(in);
+	x509 = d2i_X509_bio(in, &x);
+	DATA_PTR(self) = x;
     }
     BIO_free(in);
     if (!x509) ossl_raise(eX509CertError, NULL);
-    
+
     return self;
 }
 
@@ -153,7 +160,7 @@ static VALUE
 ossl_x509_copy(VALUE self, VALUE other)
 {
     X509 *a, *b, *x509;
-	
+
     rb_check_frozen(self);
     if (self == other) return self;
 
@@ -162,14 +169,18 @@ ossl_x509_copy(VALUE self, VALUE other)
 
     x509 = X509_dup(b);
     if (!x509) ossl_raise(eX509CertError, NULL);
-    
+
     DATA_PTR(self) = x509;
     X509_free(a);
 
     return self;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.to_der => string
+ */
+static VALUE
 ossl_x509_to_der(VALUE self)
 {
     X509 *x509;
@@ -181,21 +192,25 @@ ossl_x509_to_der(VALUE self)
     if ((len = i2d_X509(x509, NULL)) <= 0)
 	ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if (i2d_X509(x509, &p) <= 0)
 	ossl_raise(eX509CertError, NULL);
     ossl_str_adjust(str, p);
-    
+
     return str;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.to_pem => string
+ */
+static VALUE
 ossl_x509_to_pem(VALUE self)
 {
     X509 *x509;
     BIO *out;
     VALUE str;
-	
+
     GetX509(self, x509);
     out = BIO_new(BIO_s_mem());
     if (!out) ossl_raise(eX509CertError, NULL);
@@ -209,13 +224,17 @@ ossl_x509_to_pem(VALUE self)
     return str;
 }
 
+/*
+ * call-seq:
+ *    cert.to_text => string
+ */
 static VALUE
 ossl_x509_to_text(VALUE self)
 {
     X509 *x509;
     BIO *out;
     VALUE str;
-	
+
     GetX509(self, x509);
 
     out = BIO_new(BIO_s_mem());
@@ -234,7 +253,7 @@ ossl_x509_to_text(VALUE self)
 /*
  * Makes from X509 X509_REQuest
  */
-static VALUE 
+static VALUE
 ossl_x509_to_req(VALUE self)
 {
     X509 *x509;
@@ -252,17 +271,25 @@ ossl_x509_to_req(VALUE self)
 }
 #endif
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.version => integer
+ */
+static VALUE
 ossl_x509_get_version(VALUE self)
 {
     X509 *x509;
 
     GetX509(self, x509);
-	
+
     return LONG2NUM(X509_get_version(x509));
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.version = integer => integer
+ */
+static VALUE
 ossl_x509_set_version(VALUE self, VALUE version)
 {
     X509 *x509;
@@ -279,17 +306,25 @@ ossl_x509_set_version(VALUE self, VALUE version)
     return version;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.serial => integer
+ */
+static VALUE
 ossl_x509_get_serial(VALUE self)
 {
     X509 *x509;
 
     GetX509(self, x509);
-	
+
     return asn1integer_to_num(X509_get_serialNumber(x509));
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.serial = integer => integer
+ */
+static VALUE
 ossl_x509_set_serial(VALUE self, VALUE num)
 {
     X509 *x509;
@@ -298,11 +333,15 @@ ossl_x509_set_serial(VALUE self, VALUE num)
 
     x509->cert_info->serialNumber =
 	num_to_asn1integer(num, X509_get_serialNumber(x509));
-	
+
     return num;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.signature_algorithm => string
+ */
+static VALUE
 ossl_x509_get_signature_algorithm(VALUE self)
 {
     X509 *x509;
@@ -322,12 +361,16 @@ ossl_x509_get_signature_algorithm(VALUE self)
     return str;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.subject => name
+ */
+static VALUE
 ossl_x509_get_subject(VALUE self)
 {
     X509 *x509;
     X509_NAME *name;
-	
+
     GetX509(self, x509);
     if (!(name = X509_get_subject_name(x509))) { /* NO DUP - don't free! */
 	ossl_raise(eX509CertError, NULL);
@@ -336,11 +379,15 @@ ossl_x509_get_subject(VALUE self)
     return ossl_x509name_new(name);
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.subject = name => name
+ */
+static VALUE
 ossl_x509_set_subject(VALUE self, VALUE subject)
 {
     X509 *x509;
-	
+
     GetX509(self, x509);
     if (!X509_set_subject_name(x509, GetX509NamePtr(subject))) { /* DUPs name */
 	ossl_raise(eX509CertError, NULL);
@@ -349,7 +396,11 @@ ossl_x509_set_subject(VALUE self, VALUE subject)
     return subject;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.issuer => name
+ */
+static VALUE
 ossl_x509_get_issuer(VALUE self)
 {
     X509 *x509;
@@ -363,7 +414,11 @@ ossl_x509_get_issuer(VALUE self)
     return ossl_x509name_new(name);
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.issuer = name => name
+ */
+static VALUE
 ossl_x509_set_issuer(VALUE self, VALUE issuer)
 {
     X509 *x509;
@@ -376,7 +431,11 @@ ossl_x509_set_issuer(VALUE self, VALUE issuer)
     return issuer;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.not_before => time
+ */
+static VALUE
 ossl_x509_get_not_before(VALUE self)
 {
     X509 *x509;
@@ -390,12 +449,16 @@ ossl_x509_get_not_before(VALUE self)
     return asn1time_to_time(asn1time);
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.not_before = time => time
+ */
+static VALUE
 ossl_x509_set_not_before(VALUE self, VALUE time)
 {
     X509 *x509;
     time_t sec;
-	
+
     sec = time_to_time_t(time);
     GetX509(self, x509);
     if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
@@ -405,7 +468,11 @@ ossl_x509_set_not_before(VALUE self, VALUE time)
     return time;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.not_after => time
+ */
+static VALUE
 ossl_x509_get_not_after(VALUE self)
 {
     X509 *x509;
@@ -419,12 +486,16 @@ ossl_x509_get_not_after(VALUE self)
     return asn1time_to_time(asn1time);
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.not_before = time => time
+ */
+static VALUE
 ossl_x509_set_not_after(VALUE self, VALUE time)
 {
     X509 *x509;
     time_t sec;
-	
+
     sec = time_to_time_t(time);
     GetX509(self, x509);
     if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
@@ -434,7 +505,11 @@ ossl_x509_set_not_after(VALUE self, VALUE time)
     return time;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.public_key => key
+ */
+static VALUE
 ossl_x509_get_public_key(VALUE self)
 {
     X509 *x509;
@@ -448,7 +523,11 @@ ossl_x509_get_public_key(VALUE self)
     return ossl_pkey_new(pkey); /* NO DUP - OK */
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.public_key = key => key
+ */
+static VALUE
 ossl_x509_set_public_key(VALUE self, VALUE key)
 {
     X509 *x509;
@@ -461,7 +540,11 @@ ossl_x509_set_public_key(VALUE self, VALUE key)
     return key;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.sign(key, digest) => self
+ */
+static VALUE
 ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
 {
     X509 *x509;
@@ -479,9 +562,12 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
 }
 
 /*
+ * call-seq:
+ *    cert.verify(key) => true | false
+ *
  * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
  */
-static VALUE 
+static VALUE
 ossl_x509_verify(VALUE self, VALUE key)
 {
     X509 *x509;
@@ -492,7 +578,7 @@ ossl_x509_verify(VALUE self, VALUE key)
     GetX509(self, x509);
     if ((i = X509_verify(x509, pkey)) < 0) {
 	ossl_raise(eX509CertError, NULL);
-    } 
+    }
     if (i > 0) {
 	return Qtrue;
     }
@@ -501,14 +587,17 @@ ossl_x509_verify(VALUE self, VALUE key)
 }
 
 /*
+ * call-seq:
+ *    cert.check_private_key(key)
+ *
  * Checks if 'key' is PRIV key for this cert
  */
-static VALUE 
+static VALUE
 ossl_x509_check_private_key(VALUE self, VALUE key)
 {
     X509 *x509;
     EVP_PKEY *pkey;
-	
+
     /* not needed private key, but should be */
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     GetX509(self, x509);
@@ -521,9 +610,10 @@ ossl_x509_check_private_key(VALUE self, VALUE key)
 }
 
 /*
- * Gets X509v3 extensions as array of X509Ext objects
+ * call-seq:
+ *    cert.extensions => [extension...]
  */
-static VALUE 
+static VALUE
 ossl_x509_get_extensions(VALUE self)
 {
     X509 *x509;
@@ -546,26 +636,27 @@ ossl_x509_get_extensions(VALUE self)
 }
 
 /*
- * Sets X509_EXTENSIONs
+ * call-seq:
+ *    cert.extensions = [ext...] => [ext...]
  */
-static VALUE 
+static VALUE
 ossl_x509_set_extensions(VALUE self, VALUE ary)
 {
     X509 *x509;
     X509_EXTENSION *ext;
     int i;
-	
+
     Check_Type(ary, T_ARRAY);
     /* All ary's members should be X509Extension */
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
     }
     GetX509(self, x509);
     sk_X509_EXTENSION_pop_free(x509->cert_info->extensions, X509_EXTENSION_free);
     x509->cert_info->extensions = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	ext = DupX509ExtPtr(RARRAY(ary)->ptr[i]);
-	
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
+
 	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
 	    X509_EXTENSION_free(ext);
 	    ossl_raise(eX509CertError, NULL);
@@ -576,12 +667,16 @@ ossl_x509_set_extensions(VALUE self, VALUE ary)
     return ary;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    cert.add_extension(extension) => extension
+ */
+static VALUE
 ossl_x509_add_extension(VALUE self, VALUE extension)
 {
     X509 *x509;
     X509_EXTENSION *ext;
-	
+
     GetX509(self, x509);
     ext = DupX509ExtPtr(extension);
     if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
@@ -597,7 +692,7 @@ static VALUE
 ossl_x509_inspect(VALUE self)
 {
     VALUE str;
-    char *cname = rb_class2name(rb_obj_class(self));
+    const char *cname = rb_class2name(rb_obj_class(self));
 
     str = rb_str_new2("#<");
     rb_str_cat2(str, cname);
@@ -630,17 +725,17 @@ ossl_x509_inspect(VALUE self)
 /*
  * INIT
  */
-void 
+void
 Init_ossl_x509cert()
 {
     eX509CertError = rb_define_class_under(mX509, "CertificateError", eOSSLError);
-	
+
     cX509Cert = rb_define_class_under(mX509, "Certificate", rb_cObject);
-	
+
     rb_define_alloc_func(cX509Cert, ossl_x509_alloc);
     rb_define_method(cX509Cert, "initialize", ossl_x509_initialize, -1);
     rb_define_copy_func(cX509Cert, ossl_x509_copy);
-    
+
     rb_define_method(cX509Cert, "to_der", ossl_x509_to_der, 0);
     rb_define_method(cX509Cert, "to_pem", ossl_x509_to_pem, 0);
     rb_define_alias(cX509Cert, "to_s", "to_pem");
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index 0dc22416e7..d0221a18bc 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -66,14 +66,14 @@ ossl_x509crl_new(X509_CRL *crl)
     tmp = crl ? X509_CRL_dup(crl) : X509_CRL_new();
     if(!tmp) ossl_raise(eX509CRLError, NULL);
     WrapX509CRL(cX509CRL, obj, tmp);
-        
+
     return obj;
 }
 
 /*
  * PRIVATE
  */
-static VALUE 
+static VALUE
 ossl_x509crl_alloc(VALUE klass)
 {
     X509_CRL *crl;
@@ -87,11 +87,11 @@ ossl_x509crl_alloc(VALUE klass)
     return obj;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509_CRL *crl;
+    X509_CRL *crl, *x = DATA_PTR(self);
     VALUE arg;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -99,10 +99,12 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
     }
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL);
+    crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
+    DATA_PTR(self) = x;
     if (!crl) {
-	BIO_reset(in);
-	crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self));
+	(void)BIO_reset(in);
+	crl = d2i_X509_CRL_bio(in, &x);
+	DATA_PTR(self) = x;
     }
     BIO_free(in);
     if (!crl) ossl_raise(eX509CRLError, NULL);
@@ -114,7 +116,7 @@ static VALUE
 ossl_x509crl_copy(VALUE self, VALUE other)
 {
     X509_CRL *a, *b, *crl;
-	
+
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509CRL(self, a);
@@ -128,7 +130,7 @@ ossl_x509crl_copy(VALUE self, VALUE other)
     return self;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_get_version(VALUE self)
 {
     X509_CRL *crl;
@@ -140,7 +142,7 @@ ossl_x509crl_get_version(VALUE self)
     return LONG2NUM(ver);
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_set_version(VALUE self, VALUE version)
 {
     X509_CRL *crl;
@@ -157,7 +159,7 @@ ossl_x509crl_set_version(VALUE self, VALUE version)
     return version;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_get_signature_algorithm(VALUE self)
 {
     X509_CRL *crl;
@@ -179,7 +181,7 @@ ossl_x509crl_get_signature_algorithm(VALUE self)
     return str;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_get_issuer(VALUE self)
 {
     X509_CRL *crl;
@@ -189,7 +191,7 @@ ossl_x509crl_get_issuer(VALUE self)
     return ossl_x509name_new(X509_CRL_get_issuer(crl)); /* NO DUP - don't free */
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_set_issuer(VALUE self, VALUE issuer)
 {
     X509_CRL *crl;
@@ -202,7 +204,7 @@ ossl_x509crl_set_issuer(VALUE self, VALUE issuer)
     return issuer;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_get_last_update(VALUE self)
 {
     X509_CRL *crl;
@@ -212,7 +214,7 @@ ossl_x509crl_get_last_update(VALUE self)
     return asn1time_to_time(X509_CRL_get_lastUpdate(crl));
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_set_last_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
@@ -227,7 +229,7 @@ ossl_x509crl_set_last_update(VALUE self, VALUE time)
     return time;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_get_next_update(VALUE self)
 {
     X509_CRL *crl;
@@ -237,7 +239,7 @@ ossl_x509crl_get_next_update(VALUE self)
     return asn1time_to_time(X509_CRL_get_nextUpdate(crl));
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_set_next_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
@@ -262,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self)
     VALUE ary, revoked;
 
     GetX509CRL(self, crl);
-    num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
+    num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
     if (num < 0) {
 	OSSL_Debug("num < 0???");
 	return rb_ary_new();
@@ -270,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self)
     ary = rb_ary_new2(num);
     for(i=0; i<num; i++) {
 	/* NO DUP - don't free! */
-	rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
+	rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
 	revoked = ossl_x509revoked_new(rev);
 	rb_ary_push(ary, revoked);
     }
@@ -278,7 +280,7 @@ ossl_x509crl_get_revoked(VALUE self)
     return ary;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_set_revoked(VALUE self, VALUE ary)
 {
     X509_CRL *crl;
@@ -287,14 +289,14 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
 
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Revoked */
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Rev);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Rev);
     }
     GetX509CRL(self, crl);
     sk_X509_REVOKED_pop_free(crl->crl->revoked, X509_REVOKED_free);
     crl->crl->revoked = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	rev = DupX509RevokedPtr(RARRAY(ary)->ptr[i]);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	rev = DupX509RevokedPtr(RARRAY_PTR(ary)[i]);
 	if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
 	    ossl_raise(eX509CRLError, NULL);
 	}
@@ -304,7 +306,7 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
     return ary;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_add_revoked(VALUE self, VALUE revoked)
 {
     X509_CRL *crl;
@@ -320,7 +322,7 @@ ossl_x509crl_add_revoked(VALUE self, VALUE revoked)
     return revoked;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
 {
     X509_CRL *crl;
@@ -337,7 +339,7 @@ ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
     return self;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_verify(VALUE self, VALUE key)
 {
     X509_CRL *crl;
@@ -354,7 +356,7 @@ ossl_x509crl_verify(VALUE self, VALUE key)
     return Qfalse;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_to_der(VALUE self)
 {
     X509_CRL *crl;
@@ -377,7 +379,7 @@ ossl_x509crl_to_der(VALUE self)
     return str;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_to_pem(VALUE self)
 {
     X509_CRL *crl;
@@ -400,7 +402,7 @@ ossl_x509crl_to_pem(VALUE self)
     return str;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_to_text(VALUE self)
 {
     X509_CRL *crl;
@@ -419,14 +421,14 @@ ossl_x509crl_to_text(VALUE self)
     BIO_get_mem_ptr(out, &buf);
     str = rb_str_new(buf->data, buf->length);
     BIO_free(out);
-	
+
     return str;
 }
 
 /*
  * Gets X509v3 extensions as array of X509Ext objects
  */
-static VALUE 
+static VALUE
 ossl_x509crl_get_extensions(VALUE self)
 {
     X509_CRL *crl;
@@ -452,23 +454,23 @@ ossl_x509crl_get_extensions(VALUE self)
 /*
  * Sets X509_EXTENSIONs
  */
-static VALUE 
+static VALUE
 ossl_x509crl_set_extensions(VALUE self, VALUE ary)
 {
     X509_CRL *crl;
     X509_EXTENSION *ext;
     int i;
-	
+
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Extensions */
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
     }
     GetX509CRL(self, crl);
     sk_X509_EXTENSION_pop_free(crl->crl->extensions, X509_EXTENSION_free);
     crl->crl->extensions = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	ext = DupX509ExtPtr(RARRAY(ary)->ptr[i]);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
 	if(!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
 	    X509_EXTENSION_free(ext);
 	    ossl_raise(eX509CRLError, NULL);
@@ -479,7 +481,7 @@ ossl_x509crl_set_extensions(VALUE self, VALUE ary)
     return ary;
 }
 
-static VALUE 
+static VALUE
 ossl_x509crl_add_extension(VALUE self, VALUE extension)
 {
     X509_CRL *crl;
@@ -499,17 +501,17 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
 /*
  * INIT
  */
-void 
+void
 Init_ossl_x509crl()
 {
     eX509CRLError = rb_define_class_under(mX509, "CRLError", eOSSLError);
 
     cX509CRL = rb_define_class_under(mX509, "CRL", rb_cObject);
-	
+
     rb_define_alloc_func(cX509CRL, ossl_x509crl_alloc);
     rb_define_method(cX509CRL, "initialize", ossl_x509crl_initialize, -1);
     rb_define_copy_func(cX509CRL, ossl_x509crl_copy);
-    
+
     rb_define_method(cX509CRL, "version", ossl_x509crl_get_version, 0);
     rb_define_method(cX509CRL, "version=", ossl_x509crl_set_version, 1);
     rb_define_method(cX509CRL, "signature_algorithm", ossl_x509crl_get_signature_algorithm, 0);
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index 31ffec48fa..416730b9b1 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -49,7 +49,7 @@ VALUE eX509ExtError;
 /*
  * Public
  */
-VALUE 
+VALUE
 ossl_x509ext_new(X509_EXTENSION *ext)
 {
     X509_EXTENSION *new;
@@ -64,7 +64,7 @@ ossl_x509ext_new(X509_EXTENSION *ext)
 	ossl_raise(eX509ExtError, NULL);
     }
     WrapX509Ext(cX509Ext, obj, new);
-	
+
     return obj;
 }
 
@@ -103,18 +103,19 @@ ossl_x509extfactory_free(X509V3_CTX *ctx)
     OPENSSL_free(ctx);
 }
 
-static VALUE 
+static VALUE
 ossl_x509extfactory_alloc(VALUE klass)
 {
     X509V3_CTX *ctx;
     VALUE obj;
 
     MakeX509ExtFactory(klass, obj, ctx);
+    rb_iv_set(obj, "@config", Qnil);
 
     return obj;
 }
 
-static VALUE 
+static VALUE
 ossl_x509extfactory_set_issuer_cert(VALUE self, VALUE cert)
 {
     X509V3_CTX *ctx;
@@ -126,7 +127,7 @@ ossl_x509extfactory_set_issuer_cert(VALUE self, VALUE cert)
     return cert;
 }
 
-static VALUE 
+static VALUE
 ossl_x509extfactory_set_subject_cert(VALUE self, VALUE cert)
 {
     X509V3_CTX *ctx;
@@ -138,7 +139,7 @@ ossl_x509extfactory_set_subject_cert(VALUE self, VALUE cert)
     return cert;
 }
 
-static VALUE 
+static VALUE
 ossl_x509extfactory_set_subject_req(VALUE self, VALUE req)
 {
     X509V3_CTX *ctx;
@@ -150,7 +151,7 @@ ossl_x509extfactory_set_subject_req(VALUE self, VALUE req)
     return req;
 }
 
-static VALUE 
+static VALUE
 ossl_x509extfactory_set_crl(VALUE self, VALUE crl)
 {
     X509V3_CTX *ctx;
@@ -162,10 +163,10 @@ ossl_x509extfactory_set_crl(VALUE self, VALUE crl)
     return crl;
 }
 
+#ifdef HAVE_X509V3_SET_NCONF
 static VALUE
 ossl_x509extfactory_set_config(VALUE self, VALUE config)
 {
-#ifdef HAVE_X509V3_SET_NCONF
     X509V3_CTX *ctx;
     CONF *conf;
 
@@ -175,17 +176,17 @@ ossl_x509extfactory_set_config(VALUE self, VALUE config)
     X509V3_set_nconf(ctx, conf);
 
     return config;
+}
 #else
-    rb_notimplement();
+#define ossl_x509extfactory_set_config rb_f_notimplement
 #endif
-}
 
-static VALUE 
+static VALUE
 ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
 {
     /*X509V3_CTX *ctx;*/
     VALUE issuer_cert, subject_cert, subject_req, crl;
-	
+
     /*GetX509ExtFactory(self, ctx);*/
 
     rb_scan_args(argc, argv, "04",
@@ -210,7 +211,7 @@ ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
  * ["ln", "critical,value"] or the same for sn
  * ["ln", "value"] => not critical
  */
-static VALUE 
+static VALUE
 ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
 {
     X509V3_CTX *ctx;
@@ -229,23 +230,23 @@ ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
     StringValue(value);
     if(NIL_P(critical)) critical = Qfalse;
 
-    nid = OBJ_ln2nid(RSTRING(oid)->ptr);
-    if(!nid) nid = OBJ_sn2nid(RSTRING(oid)->ptr);
-    if(!nid) ossl_raise(eX509ExtError, "unknown OID `%s'", RSTRING(oid)->ptr);
+    nid = OBJ_ln2nid(RSTRING_PTR(oid));
+    if(!nid) nid = OBJ_sn2nid(RSTRING_PTR(oid));
+    if(!nid) ossl_raise(eX509ExtError, "unknown OID `%s'", RSTRING_PTR(oid));
     valstr = rb_str_new2(RTEST(critical) ? "critical," : "");
     rb_str_append(valstr, value);
     GetX509ExtFactory(self, ctx);
 #ifdef HAVE_X509V3_EXT_NCONF_NID
     rconf = rb_iv_get(self, "@config");
     conf = NIL_P(rconf) ? NULL : GetConfigPtr(rconf);
-    ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING(valstr)->ptr);
+    ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING_PTR(valstr));
 #else
     if (!empty_lhash) empty_lhash = lh_new(NULL, NULL);
-    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING(valstr)->ptr);
+    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING_PTR(valstr));
 #endif
     if (!ext){
 	ossl_raise(eX509ExtError, "%s = %s",
-		   RSTRING(oid)->ptr, RSTRING(value)->ptr);
+		   RSTRING_PTR(oid), RSTRING_PTR(value));
     }
     WrapX509Ext(cX509Ext, obj, ext);
 
@@ -273,16 +274,17 @@ static VALUE
 ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE oid, value, critical;
-    unsigned char *p;
-    X509_EXTENSION *ext;
+    const unsigned char *p;
+    X509_EXTENSION *ext, *x;
 
     GetX509Ext(self, ext);
     if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
 	oid = ossl_to_der_if_possible(oid);
 	StringValue(oid);
-	p  = RSTRING(oid)->ptr;
-	if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self),
-			       &p, RSTRING(oid)->len))
+	p = (unsigned char *)RSTRING_PTR(oid);
+	x = d2i_X509_EXTENSION(&ext, &p, RSTRING_LEN(oid));
+	DATA_PTR(self) = ext;
+	if(!x)
 	    ossl_raise(eX509ExtError, NULL);
 	return self;
     }
@@ -319,18 +321,19 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
 
     data = ossl_to_der_if_possible(data);
     StringValue(data);
-    if(!(s = OPENSSL_malloc(RSTRING(data)->len)))
+    if(!(s = OPENSSL_malloc(RSTRING_LEN(data))))
 	ossl_raise(eX509ExtError, "malloc error");
-    memcpy(s, RSTRING(data)->ptr, RSTRING(data)->len);
+    memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data));
     if(!(asn1s = ASN1_OCTET_STRING_new())){
-	free(s);
+	OPENSSL_free(s);
 	ossl_raise(eX509ExtError, NULL);
     }
-    if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING(data)->len)){
-	free(s);
+    if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LEN(data))){
+	OPENSSL_free(s);
 	ASN1_OCTET_STRING_free(asn1s);
 	ossl_raise(eX509ExtError, NULL);
     }
+    OPENSSL_free(s);
     GetX509Ext(self, ext);
     X509_EXTENSION_set_data(ext, asn1s);
 
@@ -348,7 +351,7 @@ ossl_x509ext_set_critical(VALUE self, VALUE flag)
     return flag;
 }
 
-static VALUE 
+static VALUE
 ossl_x509ext_get_oid(VALUE obj)
 {
     X509_EXTENSION *ext;
@@ -409,7 +412,7 @@ ossl_x509ext_to_der(VALUE obj)
     if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0)
 	ossl_raise(eX509ExtError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_X509_EXTENSION(ext, &p) < 0)
 	ossl_raise(eX509ExtError, NULL);
     ossl_str_adjust(str, p);
@@ -424,12 +427,12 @@ void
 Init_ossl_x509ext()
 {
     eX509ExtError = rb_define_class_under(mX509, "ExtensionError", eOSSLError);
-    
+
     cX509ExtFactory = rb_define_class_under(mX509, "ExtensionFactory", rb_cObject);
-	
+
     rb_define_alloc_func(cX509ExtFactory, ossl_x509extfactory_alloc);
     rb_define_method(cX509ExtFactory, "initialize", ossl_x509extfactory_initialize, -1);
-	
+
     rb_attr(cX509ExtFactory, rb_intern("issuer_certificate"), 1, 0, Qfalse);
     rb_attr(cX509ExtFactory, rb_intern("subject_certificate"), 1, 0, Qfalse);
     rb_attr(cX509ExtFactory, rb_intern("subject_request"), 1, 0, Qfalse);
@@ -442,7 +445,7 @@ Init_ossl_x509ext()
     rb_define_method(cX509ExtFactory, "crl=", ossl_x509extfactory_set_crl, 1);
     rb_define_method(cX509ExtFactory, "config=", ossl_x509extfactory_set_config, 1);
     rb_define_method(cX509ExtFactory, "create_ext", ossl_x509extfactory_create_ext, -1);
-	
+
     cX509Ext = rb_define_class_under(mX509, "Extension", rb_cObject);
     rb_define_alloc_func(cX509Ext, ossl_x509ext_alloc);
     rb_define_method(cX509Ext, "initialize", ossl_x509ext_initialize, -1);
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 076d61fb96..fe53a86dc0 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -41,7 +41,7 @@ VALUE eX509NameError;
 /*
  * Public
  */
-VALUE 
+VALUE
 ossl_x509name_new(X509_NAME *name)
 {
     X509_NAME *new;
@@ -56,7 +56,7 @@ ossl_x509name_new(X509_NAME *name)
 	ossl_raise(eX509NameError, NULL);
     }
     WrapX509Name(cX509Name, obj, new);
-    
+
     return obj;
 }
 
@@ -78,7 +78,7 @@ ossl_x509name_alloc(VALUE klass)
 {
     X509_NAME *name;
     VALUE obj;
-	
+
     if (!(name = X509_NAME_new())) {
 	ossl_raise(eX509NameError, NULL);
     }
@@ -87,7 +87,7 @@ ossl_x509name_alloc(VALUE klass)
     return obj;
 }
 
-static int id_aref;
+static ID id_aref;
 static VALUE ossl_x509name_add_entry(int, VALUE*, VALUE);
 #define rb_aref(obj, key) rb_funcall(obj, id_aref, 1, key)
 
@@ -109,6 +109,13 @@ ossl_x509name_init_i(VALUE i, VALUE args)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *    X509::Name.new => name
+ *    X509::Name.new(string) => name
+ *    X509::Name.new(dn) => name
+ *    X509::Name.new(dn, template) => name
+ */
 static VALUE
 ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -125,14 +132,17 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
 	    VALUE args;
 	    if(NIL_P(template)) template = OBJECT_TYPE_TEMPLATE;
 	    args = rb_ary_new3(2, self, template);
-	    rb_iterate(rb_each, tmp, ossl_x509name_init_i, args);
+	    rb_block_call(tmp, rb_intern("each"), 0, 0, ossl_x509name_init_i, args);
 	}
 	else{
-	    unsigned char *p;
+	    const unsigned char *p;
 	    VALUE str = ossl_to_der_if_possible(arg);
+	    X509_NAME *x;
 	    StringValue(str);
-	    p = RSTRING(str)->ptr;
-	    if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING(str)->len)){
+	    p = (unsigned char *)RSTRING_PTR(str);
+	    x = d2i_X509_NAME(&name, &p, RSTRING_LEN(str));
+	    DATA_PTR(self) = name;
+	    if(!x){
 		ossl_raise(eX509NameError, NULL);
 	    }
 	}
@@ -141,6 +151,10 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ * call-seq:
+ *    name.add_entry(oid, value [, type]) => self
+ */
 static
 VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
 {
@@ -152,8 +166,8 @@ VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
     StringValue(value);
     if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
     GetX509Name(self, name);
-    if (!X509_NAME_add_entry_by_txt(name, RSTRING(oid)->ptr, NUM2INT(type),
-		RSTRING(value)->ptr, RSTRING(value)->len, -1, 0)) {
+    if (!X509_NAME_add_entry_by_txt(name, RSTRING_PTR(oid), NUM2INT(type),
+		(const unsigned char *)RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
 	ossl_raise(eX509NameError, NULL);
     }
 
@@ -175,9 +189,14 @@ ossl_x509name_to_s_old(VALUE self)
     return str;
 }
 
+/*
+ * call-seq:
+ *    name.to_s => string
+ *    name.to_s(integer) => string
+ */
 static VALUE
 ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
-{           
+{
     X509_NAME *name;
     VALUE flag, str;
     BIO *out;
@@ -199,7 +218,11 @@ ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
     return str;
 }
 
-static VALUE 
+/*
+ * call-seq:
+ *    name.to_a => [[name, data, type], ...]
+ */
+static VALUE
 ossl_x509name_to_a(VALUE self)
 {
     X509_NAME *name;
@@ -208,7 +231,7 @@ ossl_x509name_to_a(VALUE self)
     char long_name[512];
     const char *short_name;
     VALUE ary, ret;
-	
+
     GetX509Name(self, name);
     entries = X509_NAME_entry_count(name);
     if (entries < 0) {
@@ -225,7 +248,7 @@ ossl_x509name_to_a(VALUE self)
 	}
 	short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
 	ary = rb_ary_new3(3, rb_str_new2(short_name),
-        		  rb_str_new(entry->value->data, entry->value->length),
+        		  rb_str_new((const char *)entry->value->data, entry->value->length),
         		  INT2FIX(entry->value->type));
 	rb_ary_push(ret, ary);
     }
@@ -266,6 +289,10 @@ ossl_x509name_eql(VALUE self, VALUE other)
     return (result == 0) ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq:
+ *    name.hash => integer
+ */
 static VALUE
 ossl_x509name_hash(VALUE self)
 {
@@ -279,6 +306,10 @@ ossl_x509name_hash(VALUE self)
     return ULONG2NUM(hash);
 }
 
+/*
+ * call-seq:
+ *    name.to_der => string
+ */
 static VALUE
 ossl_x509name_to_der(VALUE self)
 {
@@ -291,7 +322,7 @@ ossl_x509name_to_der(VALUE self)
     if((len = i2d_X509_NAME(name, NULL)) <= 0)
 	ossl_raise(eX509NameError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_X509_NAME(name, &p) <= 0)
 	ossl_raise(eX509NameError, NULL);
     ossl_str_adjust(str, p);
@@ -302,7 +333,7 @@ ossl_x509name_to_der(VALUE self)
 /*
  * INIT
  */
-void 
+void
 Init_ossl_x509name()
 {
     VALUE utf8str, ptrstr, ia5str, hash;
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index d644250433..368bff2776 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -81,7 +81,7 @@ DupX509ReqPtr(VALUE obj)
 /*
  * Private functions
  */
-static VALUE 
+static VALUE
 ossl_x509req_alloc(VALUE klass)
 {
     X509_REQ *req;
@@ -95,11 +95,11 @@ ossl_x509req_alloc(VALUE klass)
     return obj;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509_REQ *req;
+    X509_REQ *req, *x = DATA_PTR(self);
     VALUE arg;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -107,10 +107,12 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
     }
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    req = PEM_read_bio_X509_REQ(in, (X509_REQ **)&DATA_PTR(self), NULL, NULL);
+    req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
+    DATA_PTR(self) = x;
     if (!req) {
-	BIO_reset(in);
-	req = d2i_X509_REQ_bio(in, (X509_REQ **)&DATA_PTR(self));
+	(void)BIO_reset(in);
+	req = d2i_X509_REQ_bio(in, &x);
+	DATA_PTR(self) = x;
     }
     BIO_free(in);
     if (!req) ossl_raise(eX509ReqError, NULL);
@@ -122,7 +124,7 @@ static VALUE
 ossl_x509req_copy(VALUE self, VALUE other)
 {
     X509_REQ *a, *b, *req;
-	
+
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509Req(self, a);
@@ -136,14 +138,14 @@ ossl_x509req_copy(VALUE self, VALUE other)
     return self;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_to_pem(VALUE self)
 {
     X509_REQ *req;
     BIO *out;
     BUF_MEM *buf;
     VALUE str;
-	
+
     GetX509Req(self, req);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eX509ReqError, NULL);
@@ -171,7 +173,7 @@ ossl_x509req_to_der(VALUE self)
     if ((len = i2d_X509_REQ(req, NULL)) <= 0)
 	ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
+    p = (unsigned char *)RSTRING_PTR(str);
     if (i2d_X509_REQ(req, &p) <= 0)
 	ossl_raise(eX509ReqError, NULL);
     ossl_str_adjust(str, p);
@@ -179,7 +181,7 @@ ossl_x509req_to_der(VALUE self)
     return str;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_to_text(VALUE self)
 {
     X509_REQ *req;
@@ -206,12 +208,12 @@ ossl_x509req_to_text(VALUE self)
 /*
  * Makes X509 from X509_REQuest
  */
-static VALUE 
+static VALUE
 ossl_x509req_to_x509(VALUE self, VALUE days, VALUE key)
 {
     X509_REQ *req;
     X509 *x509;
-	
+
     GetX509Req(self, req);
     ...
     if (!(x509 = X509_REQ_to_X509(req, d, pkey))) {
@@ -222,7 +224,7 @@ ossl_x509req_to_x509(VALUE self, VALUE days, VALUE key)
 }
 #endif
 
-static VALUE 
+static VALUE
 ossl_x509req_get_version(VALUE self)
 {
     X509_REQ *req;
@@ -234,7 +236,7 @@ ossl_x509req_get_version(VALUE self)
     return LONG2FIX(version);
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_set_version(VALUE self, VALUE version)
 {
     X509_REQ *req;
@@ -251,7 +253,7 @@ ossl_x509req_set_version(VALUE self, VALUE version)
     return version;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_get_subject(VALUE self)
 {
     X509_REQ *req;
@@ -265,11 +267,11 @@ ossl_x509req_get_subject(VALUE self)
     return ossl_x509name_new(name);
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_set_subject(VALUE self, VALUE subject)
 {
     X509_REQ *req;
-	
+
     GetX509Req(self, req);
     /* DUPs name */
     if (!X509_REQ_set_subject_name(req, GetX509NamePtr(subject))) {
@@ -279,7 +281,7 @@ ossl_x509req_set_subject(VALUE self, VALUE subject)
     return subject;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_get_signature_algorithm(VALUE self)
 {
     X509_REQ *req;
@@ -288,7 +290,7 @@ ossl_x509req_get_signature_algorithm(VALUE self)
     VALUE str;
 
     GetX509Req(self, req);
-	
+
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -302,7 +304,7 @@ ossl_x509req_get_signature_algorithm(VALUE self)
     return str;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_get_public_key(VALUE self)
 {
     X509_REQ *req;
@@ -316,7 +318,7 @@ ossl_x509req_get_public_key(VALUE self)
     return ossl_pkey_new(pkey); /* NO DUP - OK */
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_set_public_key(VALUE self, VALUE key)
 {
     X509_REQ *req;
@@ -331,7 +333,7 @@ ossl_x509req_set_public_key(VALUE self, VALUE key)
     return key;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
 {
     X509_REQ *req;
@@ -351,7 +353,7 @@ ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
 /*
  * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
  */
-static VALUE 
+static VALUE
 ossl_x509req_verify(VALUE self, VALUE key)
 {
     X509_REQ *req;
@@ -370,14 +372,14 @@ ossl_x509req_verify(VALUE self, VALUE key)
     return Qfalse;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_get_attributes(VALUE self)
 {
     X509_REQ *req;
     int count, i;
     X509_ATTRIBUTE *attr;
     VALUE ary;
-	
+
     GetX509Req(self, req);
 
     count = X509_REQ_get_attr_count(req);
@@ -394,7 +396,7 @@ ossl_x509req_get_attributes(VALUE self)
     return ary;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_set_attributes(VALUE self, VALUE ary)
 {
     X509_REQ *req;
@@ -403,14 +405,14 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
     VALUE item;
 
     Check_Type(ary, T_ARRAY);
-    for (i=0;i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Attr);
+    for (i=0;i<RARRAY_LEN(ary); i++) {
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Attr);
     }
     GetX509Req(self, req);
     sk_X509_ATTRIBUTE_pop_free(req->req_info->attributes, X509_ATTRIBUTE_free);
     req->req_info->attributes = NULL;
-    for (i=0;i<RARRAY(ary)->len; i++) {
-	item = RARRAY(ary)->ptr[i];
+    for (i=0;i<RARRAY_LEN(ary); i++) {
+	item = RARRAY_PTR(ary)[i];
 	attr = DupX509AttrPtr(item);
 	if (!X509_REQ_add1_attr(req, attr)) {
 	    ossl_raise(eX509ReqError, NULL);
@@ -419,7 +421,7 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
     return ary;
 }
 
-static VALUE 
+static VALUE
 ossl_x509req_add_attribute(VALUE self, VALUE attr)
 {
     X509_REQ *req;
@@ -435,17 +437,17 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
 /*
  * X509_REQUEST init
  */
-void 
+void
 Init_ossl_x509req()
 {
     eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
-	
+
     cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
-	
+
     rb_define_alloc_func(cX509Req, ossl_x509req_alloc);
     rb_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
     rb_define_copy_func(cX509Req, ossl_x509req_copy);
-	
+
     rb_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
     rb_define_method(cX509Req, "to_der", ossl_x509req_to_der, 0);
     rb_define_alias(cX509Req, "to_s", "to_pem");
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
index 3ccac8d26a..6ba73b13b8 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -36,7 +36,7 @@ VALUE eX509RevError;
 /*
  * PUBLIC
  */
-VALUE 
+VALUE
 ossl_x509revoked_new(X509_REVOKED *rev)
 {
     X509_REVOKED *new;
@@ -71,7 +71,7 @@ DupX509RevokedPtr(VALUE obj)
 /*
  * PRIVATE
  */
-static VALUE 
+static VALUE
 ossl_x509revoked_alloc(VALUE klass)
 {
     X509_REVOKED *rev;
@@ -85,14 +85,14 @@ ossl_x509revoked_alloc(VALUE klass)
     return obj;
 }
 
-static VALUE 
+static VALUE
 ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
 {
     /* EMPTY */
     return self;
 }
 
-static VALUE 
+static VALUE
 ossl_x509revoked_get_serial(VALUE self)
 {
     X509_REVOKED *rev;
@@ -102,7 +102,7 @@ ossl_x509revoked_get_serial(VALUE self)
     return asn1integer_to_num(rev->serialNumber);
 }
 
-static VALUE 
+static VALUE
 ossl_x509revoked_set_serial(VALUE self, VALUE num)
 {
     X509_REVOKED *rev;
@@ -113,17 +113,17 @@ ossl_x509revoked_set_serial(VALUE self, VALUE num)
     return num;
 }
 
-static VALUE 
+static VALUE
 ossl_x509revoked_get_time(VALUE self)
 {
     X509_REVOKED *rev;
-	
+
     GetX509Rev(self, rev);
 
     return asn1time_to_time(rev->revocationDate);
 }
 
-static VALUE 
+static VALUE
 ossl_x509revoked_set_time(VALUE self, VALUE time)
 {
     X509_REVOKED *rev;
@@ -140,7 +140,7 @@ ossl_x509revoked_set_time(VALUE self, VALUE time)
 /*
  * Gets X509v3 extensions as array of X509Ext objects
  */
-static VALUE 
+static VALUE
 ossl_x509revoked_get_extensions(VALUE self)
 {
     X509_REVOKED *rev;
@@ -166,7 +166,7 @@ ossl_x509revoked_get_extensions(VALUE self)
 /*
  * Sets X509_EXTENSIONs
  */
-static VALUE 
+static VALUE
 ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
 {
     X509_REVOKED *rev;
@@ -175,14 +175,14 @@ ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
     VALUE item;
 
     Check_Type(ary, T_ARRAY);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
     }
     GetX509Rev(self, rev);
     sk_X509_EXTENSION_pop_free(rev->extensions, X509_EXTENSION_free);
     rev->extensions = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	item = RARRAY(ary)->ptr[i];
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	item = RARRAY_PTR(ary)[i];
 	ext = DupX509ExtPtr(item);
 	if(!X509_REVOKED_add_ext(rev, ext, -1)) {
 	    ossl_raise(eX509RevError, NULL);
@@ -196,7 +196,7 @@ static VALUE
 ossl_x509revoked_add_extension(VALUE self, VALUE ext)
 {
     X509_REVOKED *rev;
-    
+
     GetX509Rev(self, rev);
     if(!X509_REVOKED_add_ext(rev, DupX509ExtPtr(ext), -1)) {
 	ossl_raise(eX509RevError, NULL);
@@ -214,10 +214,10 @@ Init_ossl_x509revoked()
     eX509RevError = rb_define_class_under(mX509, "RevokedError", eOSSLError);
 
     cX509Rev = rb_define_class_under(mX509, "Revoked", rb_cObject);
-	
+
     rb_define_alloc_func(cX509Rev, ossl_x509revoked_alloc);
     rb_define_method(cX509Rev, "initialize", ossl_x509revoked_initialize, -1);
-	
+
     rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
     rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
     rb_define_method(cX509Rev, "time", ossl_x509revoked_get_time, 0);
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index cea845a1cc..7b4a005110 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -9,7 +9,6 @@
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
-#include <rubysig.h>
 
 #define WrapX509Store(klass, obj, st) do { \
     if (!st) { \
@@ -55,7 +54,7 @@ VALUE eX509StoreError;
 /*
  * Public functions
  */
-VALUE 
+VALUE
 ossl_x509store_new(X509_STORE *store)
 {
     VALUE obj;
@@ -77,19 +76,19 @@ GetX509StorePtr(VALUE obj)
 
 X509_STORE *
 DupX509StorePtr(VALUE obj)
-{   
+{
     X509_STORE *store;
 
     SafeGetX509Store(obj, store);
     CRYPTO_add(&store->references, 1, CRYPTO_LOCK_X509_STORE);
-    
+
     return store;
 }
 
 /*
  * Private functions
  */
-static VALUE 
+static VALUE
 ossl_x509store_alloc(VALUE klass)
 {
     X509_STORE *store;
@@ -118,12 +117,20 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
     return cb;
 }
 
+
+/*
+ * call-seq:
+ *    X509::Store.new => store
+ *
+ */
 static VALUE
 ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
 {
     X509_STORE *store;
 
+/* BUG: This method takes any number of arguments but appears to ignore them. */
     GetX509Store(self, store);
+    store->ex_data.sk = NULL;
     X509_STORE_set_verify_cb_func(store, ossl_verify_cb);
     ossl_x509store_set_vfy_cb(self, Qnil);
 
@@ -164,7 +171,7 @@ ossl_x509store_set_purpose(VALUE self, VALUE purpose)
 #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE *store;
     long p = NUM2LONG(purpose);
-    
+
     GetX509Store(self, store);
     X509_STORE_set_purpose(store, p);
 #else
@@ -190,14 +197,14 @@ ossl_x509store_set_trust(VALUE self, VALUE trust)
     return trust;
 }
 
-static VALUE 
+static VALUE
 ossl_x509store_set_time(VALUE self, VALUE time)
 {
     rb_iv_set(self, "@time", time);
     return time;
 }
 
-static VALUE 
+static VALUE
 ossl_x509store_add_file(VALUE self, VALUE file)
 {
     X509_STORE *store;
@@ -205,8 +212,8 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     char *path = NULL;
 
     if(file != Qnil){
-        Check_SafeStr(file);
-	path = RSTRING(file)->ptr;
+        SafeStringValue(file);
+	path = RSTRING_PTR(file);
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
@@ -218,7 +225,7 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     return self;
 }
 
-static VALUE 
+static VALUE
 ossl_x509store_add_path(VALUE self, VALUE dir)
 {
     X509_STORE *store;
@@ -226,8 +233,8 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
     char *path = NULL;
 
     if(dir != Qnil){
-        Check_SafeStr(dir);
-	path = RSTRING(dir)->ptr;
+        SafeStringValue(dir);
+	path = RSTRING_PTR(dir);
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
@@ -286,7 +293,7 @@ static VALUE ossl_x509stctx_get_err(VALUE);
 static VALUE ossl_x509stctx_get_err_string(VALUE);
 static VALUE ossl_x509stctx_get_chain(VALUE);
 
-static VALUE 
+static VALUE
 ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
 {
     VALUE cert, chain;
@@ -343,7 +350,7 @@ ossl_x509stctx_free(X509_STORE_CTX *ctx)
     X509_STORE_CTX_free(ctx);
 }
 
-static VALUE 
+static VALUE
 ossl_x509stctx_alloc(VALUE klass)
 {
     X509_STORE_CTX *ctx;
@@ -435,7 +442,7 @@ ossl_x509stctx_get_chain(VALUE self)
     return ary;
 }
 
-static VALUE 
+static VALUE
 ossl_x509stctx_get_err(VALUE self)
 {
     X509_STORE_CTX *ctx;
@@ -451,12 +458,12 @@ ossl_x509stctx_set_error(VALUE self, VALUE err)
     X509_STORE_CTX *ctx;
 
     GetX509StCtx(self, ctx);
-    X509_STORE_CTX_set_error(ctx, FIX2INT(err));
+    X509_STORE_CTX_set_error(ctx, NUM2INT(err));
 
     return err;
 }
 
-static VALUE 
+static VALUE
 ossl_x509stctx_get_err_string(VALUE self)
 {
     X509_STORE_CTX *ctx;
@@ -468,7 +475,7 @@ ossl_x509stctx_get_err_string(VALUE self)
     return rb_str_new2(X509_verify_cert_error_string(err));
 }
 
-static VALUE 
+static VALUE
 ossl_x509stctx_get_err_depth(VALUE self)
 {
     X509_STORE_CTX *ctx;
@@ -478,7 +485,7 @@ ossl_x509stctx_get_err_depth(VALUE self)
     return INT2FIX(X509_STORE_CTX_get_error_depth(ctx));
 }
 
-static VALUE 
+static VALUE
 ossl_x509stctx_get_curr_cert(VALUE self)
 {
     X509_STORE_CTX *ctx;
@@ -550,6 +557,10 @@ ossl_x509stctx_set_trust(VALUE self, VALUE trust)
     return trust;
 }
 
+/*
+ * call-seq:
+ *    storectx.time = time => time
+ */
 static VALUE
 ossl_x509stctx_set_time(VALUE self, VALUE time)
 {
@@ -566,7 +577,7 @@ ossl_x509stctx_set_time(VALUE self, VALUE time)
 /*
  * INIT
  */
-void 
+void
 Init_ossl_x509store()
 {
     VALUE x509stctx;
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
index 4bd08890f8..64b76f26b4 100644
--- a/ext/openssl/ruby_missing.h
+++ b/ext/openssl/ruby_missing.h
@@ -9,10 +9,33 @@
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_RUBY_MISSING_H_)
-#define _OSS_RUBY_MISSING_H_
+#define _OSSL_RUBY_MISSING_H_
 
 #define rb_define_copy_func(klass, func) \
 	rb_define_method(klass, "initialize_copy", func, 1)
 
-#endif /* _OSS_RUBY_MISSING_H_ */
 
+#ifndef GetReadFile
+#define FPTR_TO_FD(fptr) (fptr->fd)
+#else
+#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
+#endif
+
+#ifndef HAVE_RB_IO_T
+#define rb_io_t OpenFile
+#endif
+
+#ifndef HAVE_RB_STR_SET_LEN
+/* these methods should probably be backported to 1.8 */
+#define rb_str_set_len(str, length) do {	\
+	RSTRING(str)->ptr[length] = 0;		\
+	RSTRING(str)->len = length;		\
+} while(0)
+#endif /* ! HAVE_RB_STR_SET_LEN */
+
+#ifndef HAVE_RB_BLOCK_CALL
+/* the openssl module doesn't use arg[3-4] and arg2 is always rb_each */
+#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, arg1, arg5, arg6)
+#endif /* ! HAVE_RB_BLOCK_CALL */
+
+#endif /* _OSSL_RUBY_MISSING_H_ */
diff --git a/ext/psych/emitter.c b/ext/psych/emitter.c
new file mode 100644
index 0000000000..befa98e821
--- /dev/null
+++ b/ext/psych/emitter.c
@@ -0,0 +1,412 @@
+#include <psych.h>
+
+VALUE cPsychEmitter;
+static ID id_write;
+
+static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
+{
+    if(!yaml_emitter_emit(emitter, event))
+	rb_raise(rb_eRuntimeError, "%s", emitter->problem);
+}
+
+static int writer(void *ctx, unsigned char *buffer, size_t size)
+{
+    VALUE io = (VALUE)ctx;
+    VALUE str = rb_str_new((const char *)buffer, (long)size);
+    VALUE wrote = rb_funcall(io, id_write, 1, str);
+    return (int)NUM2INT(wrote);
+}
+
+static void dealloc(yaml_emitter_t * emitter)
+{
+    yaml_emitter_delete(emitter);
+    free(emitter);
+}
+
+static VALUE allocate(VALUE klass)
+{
+    yaml_emitter_t * emitter = malloc(sizeof(yaml_emitter_t));
+    yaml_emitter_initialize(emitter);
+    yaml_emitter_set_unicode(emitter, 1);
+    yaml_emitter_set_indent(emitter, 2);
+
+    return Data_Wrap_Struct(klass, 0, dealloc, emitter);
+}
+
+/* call-seq: Psych::Emitter.new(io)
+ *
+ * Create a new Psych::Emitter that writes to +io+.
+ */
+static VALUE initialize(VALUE self, VALUE io)
+{
+    yaml_emitter_t * emitter;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_emitter_set_output(emitter, writer, (void *)io);
+
+    return self;
+}
+
+/* call-seq: emitter.start_stream(encoding)
+ *
+ * Start a stream emission with +encoding+
+ *
+ * See Psych::Handler#start_stream
+ */
+static VALUE start_stream(VALUE self, VALUE encoding)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    Check_Type(encoding, T_FIXNUM);
+
+    yaml_stream_start_event_initialize(&event, (yaml_encoding_t)NUM2INT(encoding));
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.end_stream
+ *
+ * End a stream emission
+ *
+ * See Psych::Handler#end_stream
+ */
+static VALUE end_stream(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_stream_end_event_initialize(&event);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.start_document(version, tags, implicit)
+ *
+ * Start a document emission with YAML +version+, +tags+, and an +implicit+
+ * start.
+ *
+ * See Psych::Handler#start_document
+ */
+static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+{
+    yaml_emitter_t * emitter;
+    yaml_tag_directive_t * head = NULL;
+    yaml_tag_directive_t * tail = NULL;
+    yaml_event_t event;
+    yaml_version_directive_t version_directive;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+
+    Check_Type(version, T_ARRAY);
+
+    if(RARRAY_LEN(version) > 0) {
+	VALUE major = rb_ary_entry(version, (long)0);
+	VALUE minor = rb_ary_entry(version, (long)1);
+
+	version_directive.major = NUM2INT(major);
+	version_directive.minor = NUM2INT(minor);
+    }
+
+    if(RTEST(tags)) {
+	int i = 0;
+
+	Check_Type(tags, T_ARRAY);
+
+	head  = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
+	tail  = head;
+
+	for(i = 0; i < RARRAY_LEN(tags); i++) {
+	    VALUE tuple = RARRAY_PTR(tags)[i];
+	    Check_Type(tuple, T_ARRAY);
+
+	    if(RARRAY_LEN(tuple) < 2) {
+		xfree(head);
+		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
+	    }
+
+	    tail->handle = (yaml_char_t *)StringValuePtr(RARRAY_PTR(tuple)[0]);
+	    tail->prefix = (yaml_char_t *)StringValuePtr(RARRAY_PTR(tuple)[1]);
+
+	    tail++;
+	}
+    }
+
+    yaml_document_start_event_initialize(
+	    &event,
+	    (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
+	    head,
+	    tail,
+	    imp ? 1 : 0
+	    );
+
+    emit(emitter, &event);
+
+    if(head) xfree(head);
+
+    return self;
+}
+
+/* call-seq: emitter.end_document(implicit)
+ *
+ * End a document emission with an +implicit+ ending.
+ *
+ * See Psych::Handler#end_document
+ */
+static VALUE end_document(VALUE self, VALUE imp)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_document_end_event_initialize(&event, imp ? 1 : 0);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.scalar(value, anchor, tag, plain, quoted, style)
+ *
+ * Emit a scalar with +value+, +anchor+, +tag+, and a +plain+ or +quoted+
+ * string type with +style+.
+ *
+ * See Psych::Handler#scalar
+ */
+static VALUE scalar(
+	VALUE self,
+	VALUE value,
+	VALUE anchor,
+	VALUE tag,
+	VALUE plain,
+	VALUE quoted,
+	VALUE style
+	) {
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    Check_Type(value, T_STRING);
+
+    yaml_scalar_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+	    (yaml_char_t*)StringValuePtr(value),
+	    (int)RSTRING_LEN(value),
+	    plain ? 1 : 0,
+	    quoted ? 1 : 0,
+	    (yaml_scalar_style_t)NUM2INT(style)
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.start_sequence(anchor, tag, implicit, style)
+ *
+ * Start emitting a sequence with +anchor+, a +tag+, +implicit+ sequence
+ * start and end, along with +style+.
+ *
+ * See Psych::Handler#start_sequence
+ */
+static VALUE start_sequence(
+	VALUE self,
+	VALUE anchor,
+	VALUE tag,
+	VALUE implicit,
+	VALUE style
+	) {
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_sequence_start_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+	    implicit ? 1 : 0,
+	    (yaml_sequence_style_t)NUM2INT(style)
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.end_sequence
+ *
+ * End sequence emission.
+ *
+ * See Psych::Handler#end_sequence
+ */
+static VALUE end_sequence(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_sequence_end_event_initialize(&event);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.start_mapping(anchor, tag, implicit, style)
+ *
+ * Start emitting a YAML map with +anchor+, +tag+, an +implicit+ start
+ * and end, and +style+.
+ *
+ * See Psych::Handler#start_mapping
+ */
+static VALUE start_mapping(
+	VALUE self,
+	VALUE anchor,
+	VALUE tag,
+	VALUE implicit,
+	VALUE style
+	) {
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_mapping_start_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+	    implicit ? 1 : 0,
+	    (yaml_sequence_style_t)NUM2INT(style)
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.end_mapping
+ *
+ * Emit the end of a mapping.
+ *
+ * See Psych::Handler#end_mapping
+ */
+static VALUE end_mapping(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_mapping_end_event_initialize(&event);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.alias(anchor)
+ *
+ * Emit an alias with +anchor+.
+ *
+ * See Psych::Handler#alias
+ */
+static VALUE alias(VALUE self, VALUE anchor)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_alias_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor))
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.canonical = true
+ *
+ * Set the output style to canonical, or not.
+ */
+static VALUE set_canonical(VALUE self, VALUE style)
+{
+    yaml_emitter_t * emitter;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_emitter_set_canonical(emitter, Qtrue == style ? 1 : 0);
+
+    return style;
+}
+
+/* call-seq: emitter.canonical
+ *
+ * Get the output style, canonical or not.
+ */
+static VALUE canonical(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    return (emitter->canonical == 0) ? Qfalse : Qtrue;
+}
+
+/* call-seq: emitter.indentation = level
+ *
+ * Set the indentation level to +level+.
+ */
+static VALUE set_indentation(VALUE self, VALUE level)
+{
+    yaml_emitter_t * emitter;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    yaml_emitter_set_indent(emitter, NUM2INT(level));
+
+    return level;
+}
+
+/* call-seq: emitter.indentation
+ *
+ * Get the indentation level.
+ */
+static VALUE indentation(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+    return INT2NUM(emitter->best_indent);
+}
+
+void Init_psych_emitter()
+{
+    VALUE psych     = rb_define_module("Psych");
+    VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);
+    cPsychEmitter   = rb_define_class_under(psych, "Emitter", handler);
+
+    rb_define_alloc_func(cPsychEmitter, allocate);
+
+    rb_define_method(cPsychEmitter, "initialize", initialize, 1);
+    rb_define_method(cPsychEmitter, "start_stream", start_stream, 1);
+    rb_define_method(cPsychEmitter, "end_stream", end_stream, 0);
+    rb_define_method(cPsychEmitter, "start_document", start_document, 3);
+    rb_define_method(cPsychEmitter, "end_document", end_document, 1);
+    rb_define_method(cPsychEmitter, "scalar", scalar, 6);
+    rb_define_method(cPsychEmitter, "start_sequence", start_sequence, 4);
+    rb_define_method(cPsychEmitter, "end_sequence", end_sequence, 0);
+    rb_define_method(cPsychEmitter, "start_mapping", start_mapping, 4);
+    rb_define_method(cPsychEmitter, "end_mapping", end_mapping, 0);
+    rb_define_method(cPsychEmitter, "alias", alias, 1);
+    rb_define_method(cPsychEmitter, "canonical", canonical, 0);
+    rb_define_method(cPsychEmitter, "canonical=", set_canonical, 1);
+    rb_define_method(cPsychEmitter, "indentation", indentation, 0);
+    rb_define_method(cPsychEmitter, "indentation=", set_indentation, 1);
+
+    id_write = rb_intern("write");
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/emitter.h b/ext/psych/emitter.h
new file mode 100644
index 0000000000..560451ef31
--- /dev/null
+++ b/ext/psych/emitter.h
@@ -0,0 +1,8 @@
+#ifndef PSYCH_EMITTER_H
+#define PSYCH_EMITTER_H
+
+#include <psych.h>
+
+void Init_psych_emitter();
+
+#endif
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
new file mode 100644
index 0000000000..11f44ac104
--- /dev/null
+++ b/ext/psych/extconf.rb
@@ -0,0 +1,16 @@
+require 'mkmf'
+
+# :stopdoc:
+
+dir_config 'libyaml'
+
+def asplode missing
+  abort "#{missing} is missing. Please install libyaml."
+end
+
+asplode('yaml.h')  unless find_header  'yaml.h'
+asplode('libyaml') unless find_library 'yaml', 'yaml_get_version'
+
+create_makefile 'psych'
+
+# :startdoc:
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
new file mode 100644
index 0000000000..464fae499e
--- /dev/null
+++ b/ext/psych/lib/psych.rb
@@ -0,0 +1,239 @@
+require 'psych.so'
+require 'psych/nodes'
+require 'psych/visitors'
+require 'psych/handler'
+require 'psych/tree_builder'
+require 'psych/json/tree_builder'
+require 'psych/parser'
+require 'psych/omap'
+require 'psych/set'
+require 'psych/coder'
+require 'psych/core_ext'
+require 'psych/deprecated'
+
+###
+# = Overview
+#
+# Psych is a YAML parser and emitter.  Psych leverages
+# libyaml[http://libyaml.org] for it's YAML parsing and emitting capabilities.
+# In addition to wrapping libyaml, Psych also knows how to serialize and
+# de-serialize most Ruby objects to and from the YAML format.
+#
+# = I NEED TO PARSE OR EMIT YAML RIGHT NOW!
+#
+#   # Parse some YAML
+#   Psych.load("--- foo") # => "foo"
+#
+#   # Emit some YAML
+#   Psych.dump("foo")     # => "--- foo\n...\n"
+#   { :a => 'b'}.to_yaml  # => "---\n:a: b\n"
+#
+# Got more time on your hands?  Keep on reading!
+#
+# == YAML Parsing
+#
+# Psych provides a range of interfaces for parsing a YAML document ranging from
+# low level to high level, depending on your parsing needs.  At the lowest
+# level, is an event based parser.  Mid level is access to the raw YAML AST,
+# and at the highest level is the ability to unmarshal YAML to ruby objects.
+#
+# === Low level parsing
+#
+# The lowest level parser should be used when the YAML input is already known,
+# and the developer does not want to pay the price of building an AST or
+# automatic detection and conversion to ruby objects.  See Psych::Parser for
+# more information on using the event based parser.
+#
+# === Mid level parsing
+#
+# Psych provides access to an AST produced from parsing a YAML document.  This
+# tree is built using the Psych::Parser and Psych::TreeBuilder.  The AST can
+# be examined and manipulated freely.  Please see Psych::parse_stream,
+# Psych::Nodes, and Psych::Nodes::Node for more information on dealing with
+# YAML syntax trees.
+#
+# === High level parsing
+#
+# The high level YAML parser provided by Psych simply takes YAML as input and
+# returns a Ruby data structure.  For information on using the high level parser
+# see Psych.load
+#
+# == YAML Emitting
+#
+# Psych provides a range of interfaces ranging from low to high level for
+# producing YAML documents.  Very similar to the YAML parsing interfaces, Psych
+# provides at the lowest level, an event based system, mid-level is building
+# a YAML AST, and the highest level is converting a Ruby object straight to
+# a YAML document.
+#
+# === Low level emitting
+#
+# The lowest level emitter is an event based system.  Events are sent to a
+# Psych::Emitter object.  That object knows how to convert the events to a YAML
+# document.  This interface should be used when document format is known in
+# advance or speed is a concern.  See Psych::Emitter for more information.
+#
+# === Mid level emitting
+#
+# At the mid level is building an AST.  This AST is exactly the same as the AST
+# used when parsing a YAML document.  Users can build an AST by hand and the
+# AST knows how to emit itself as a YAML document.  See Psych::Nodes,
+# Psych::Nodes::Node, and Psych::TreeBuilder for more information on building
+# a YAML AST.
+#
+# === High level emitting
+#
+# The high level emitter has the easiest interface.  Psych simply takes a Ruby
+# data structure and converts it to a YAML document.  See Psych.dump for more
+# information on dumping a Ruby data structure.
+
+module Psych
+  # The version is Psych you're using
+  VERSION         = '1.0.0'
+
+  # The version of libyaml Psych is using
+  LIBYAML_VERSION = Psych.libyaml_version.join '.'
+
+  ###
+  # Load +yaml+ in to a Ruby data structure.  If multiple documents are
+  # provided, the object contained in the first document will be returned.
+  #
+  # Example:
+  #
+  #   Psych.load("--- a")           # => 'a'
+  #   Psych.load("---\n - a\n - b") # => ['a', 'b']
+  def self.load yaml
+    result = parse(yaml)
+    result ? result.to_ruby : result
+  end
+
+  ###
+  # Parse a YAML string in +yaml+.  Returns the first object of a YAML AST.
+  #
+  # Example:
+  #
+  #   Psych.parse("---\n - a\n - b") # => #<Psych::Nodes::Sequence:0x00>
+  #
+  # See Psych::Nodes for more information about YAML AST.
+  def self.parse yaml
+    children = parse_stream(yaml).children
+    children.empty? ? false : children.first.children.first
+  end
+
+  ###
+  # Parse a file at +filename+. Returns the YAML AST.
+  def self.parse_file filename
+    File.open filename do |f|
+      parse f
+    end
+  end
+
+  ###
+  # Returns a default parser
+  def self.parser
+    Psych::Parser.new(TreeBuilder.new)
+  end
+
+  ###
+  # Parse a YAML string in +yaml+.  Returns the full AST for the YAML document.
+  # This method can handle multiple YAML documents contained in +yaml+.
+  #
+  # Example:
+  #
+  #   Psych.parse_stream("---\n - a\n - b") # => #<Psych::Nodes::Stream:0x00>
+  #
+  # See Psych::Nodes for more information about YAML AST.
+  def self.parse_stream yaml
+    parser = self.parser
+    parser.parse yaml
+    parser.handler.root
+  end
+
+  ###
+  # Dump Ruby object +o+ to a YAML string using +options+.
+  #
+  # Example:
+  #
+  #   Psych.dump(['a', 'b'])  # => "---\n- a\n- b\n"
+  def self.dump o, io = nil, options = {}
+    if Hash === io
+      options = io
+      io      = nil
+    end
+
+    visitor = Psych::Visitors::YAMLTree.new options
+    visitor << o
+    visitor.tree.to_yaml io
+  end
+
+  ###
+  # Dump a list of objects as separate documents to a document stream.
+  #
+  # Example:
+  #
+  #   Psych.dump_stream("foo\n  ", {}) # => "--- ! \"foo\\n  \"\n--- {}\n"
+  def self.dump_stream *objects
+    visitor = Psych::Visitors::YAMLTree.new {}
+    objects.each do |o|
+      visitor << o
+    end
+    visitor.tree.to_yaml
+  end
+
+  ###
+  # Dump Ruby object +o+ to a JSON string.
+  def self.to_json o
+    visitor = Psych::Visitors::JSONTree.new
+    visitor << o
+    visitor.tree.to_yaml
+  end
+
+  ###
+  # Load multiple documents given in +yaml+.  Returns the parsed documents
+  # as a list.  For example:
+  #
+  #   Psych.load_stream("--- foo\n...\n--- bar\n...") # => ['foo', 'bar']
+  #
+  def self.load_stream yaml
+    parse_stream(yaml).children.map { |child| child.to_ruby }
+  end
+
+  ###
+  # Load the document contained in +filename+.  Returns the yaml contained in
+  # +filename+ as a ruby object
+  def self.load_file filename
+    self.load File.open(filename)
+  end
+
+  # :stopdoc:
+  @domain_types = {}
+  def self.add_domain_type domain, type_tag, &block
+    key = ['tag', domain, type_tag].join ':'
+    @domain_types[key] = [key, block]
+    @domain_types["tag:#{type_tag}"] = [key, block]
+  end
+
+  def self.add_builtin_type type_tag, &block
+    domain = 'yaml.org,2002'
+    key = ['tag', domain, type_tag].join ':'
+    @domain_types[key] = [key, block]
+  end
+
+  def self.remove_type type_tag
+    @domain_types.delete type_tag
+  end
+
+  @load_tags = {}
+  @dump_tags = {}
+  def self.add_tag tag, klass
+    @load_tags[tag] = klass
+    @dump_tags[klass] = tag
+  end
+
+  class << self
+    attr_accessor :load_tags
+    attr_accessor :dump_tags
+    attr_accessor :domain_types
+  end
+  # :startdoc:
+end
diff --git a/ext/psych/lib/psych/coder.rb b/ext/psych/lib/psych/coder.rb
new file mode 100644
index 0000000000..c06c9c1e61
--- /dev/null
+++ b/ext/psych/lib/psych/coder.rb
@@ -0,0 +1,86 @@
+module Psych
+  ###
+  # If an object defines +encode_with+, then an instance of Psych::Coder will
+  # be passed to the method when the object is being serialized.  The Coder
+  # automatically assumes a Psych::Nodes::Mapping is being emitted.  Other
+  # objects like Sequence and Scalar may be emitted if +seq=+ or +scalar=+ are
+  # called, respectively.
+  class Coder
+    attr_accessor :tag, :style, :implicit
+    attr_reader   :type, :seq
+
+    def initialize tag
+      @map        = {}
+      @seq        = []
+      @implicit   = false
+      @type       = :map
+      @tag        = tag
+      @style      = Psych::Nodes::Mapping::BLOCK
+      @scalar     = nil
+    end
+
+    def scalar *args
+      if args.length > 0
+        warn "#{caller[0]}: Coder#scalar(a,b,c) is deprecated" if $VERBOSE
+        @tag, @scalar, _ = args
+        @type = :scalar
+      end
+      @scalar
+    end
+
+    # Emit a map.  The coder will be yielded to the block.
+    def map tag = @tag, style = @style
+      @tag   = tag
+      @style = style
+      yield self if block_given?
+      @map
+    end
+
+    # Emit a scalar with +value+ and +tag+
+    def represent_scalar tag, value
+      self.tag    = tag
+      self.scalar = value
+    end
+
+    # Emit a sequence with +list+ and +tag+
+    def represent_seq tag, list
+      @tag = tag
+      self.seq = list
+    end
+
+    # Emit a sequence with +map+ and +tag+
+    def represent_map tag, map
+      @tag = tag
+      self.map = map
+    end
+
+    # Emit a scalar with +value+
+    def scalar= value
+      @type   = :scalar
+      @scalar = value
+    end
+
+    # Emit a map with +value+
+    def map= map
+      @type = :map
+      @map  = map
+    end
+
+    def []= k, v
+      @type = :map
+      @map[k] = v
+    end
+    alias :add :[]=
+
+    def [] k
+      @type = :map
+      @map[k]
+    end
+
+    # Emit a sequence of +list+
+    def seq= list
+      @type = :seq
+      @seq  = list
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/core_ext.rb b/ext/psych/lib/psych/core_ext.rb
new file mode 100644
index 0000000000..8d3e8fb7b6
--- /dev/null
+++ b/ext/psych/lib/psych/core_ext.rb
@@ -0,0 +1,38 @@
+class Object
+  def self.yaml_tag url
+    Psych.add_tag(url, self)
+  end
+
+  # FIXME: rename this to "to_yaml" when syck is removed
+
+  ###
+  # call-seq: to_yaml
+  #
+  # Convert an object to YAML
+  def psych_to_yaml options = {}
+    Psych.dump self, options
+  end
+  remove_method :to_yaml rescue nil
+  alias :to_yaml :psych_to_yaml
+end
+
+class Module
+  def psych_yaml_as url
+    return if caller[0].end_with?('rubytypes.rb')
+    if $VERBOSE
+      warn "#{caller[0]}: yaml_as is deprecated, please use yaml_tag"
+    end
+    Psych.add_tag(url, self)
+  end
+
+  remove_method :yaml_as rescue nil
+  alias :yaml_as :psych_yaml_as
+end
+
+module Kernel
+  def psych_y *objects
+    puts Psych.dump_stream(*objects)
+  end
+  remove_method :y rescue nil
+  alias y psych_y
+end
diff --git a/ext/psych/lib/psych/deprecated.rb b/ext/psych/lib/psych/deprecated.rb
new file mode 100644
index 0000000000..f4034e32c0
--- /dev/null
+++ b/ext/psych/lib/psych/deprecated.rb
@@ -0,0 +1,82 @@
+require 'date'
+
+module Psych
+  DEPRECATED = __FILE__ # :nodoc:
+
+  module DeprecatedMethods # :nodoc:
+    attr_accessor :taguri
+    attr_accessor :to_yaml_style
+  end
+
+  def self.quick_emit thing, opts = {}, &block # :nodoc:
+    warn "#{caller[0]}: YAML.quick_emit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+    target = eval 'self', block.binding
+    target.extend DeprecatedMethods
+    metaclass = class << target; self; end
+    metaclass.send(:define_method, :encode_with) do |coder|
+      target.taguri        = coder.tag
+      target.to_yaml_style = coder.style
+      block.call coder
+    end
+    target.psych_to_yaml unless opts[:nodump]
+  end
+
+  def self.load_documents yaml, &block
+    if $VERBOSE
+      warn "#{caller[0]}: load_documents is deprecated, use load_stream"
+    end
+    list = load_stream yaml
+    return list unless block_given?
+    list.each(&block)
+  end
+
+  def self.detect_implicit thing
+    warn "#{caller[0]}: detect_implicit is deprecated" if $VERBOSE
+    return '' unless String === thing
+    return 'null' if '' == thing
+    ScalarScanner.new.tokenize(thing).class.name.downcase
+  end
+
+  def self.add_ruby_type type_tag, &block
+    warn "#{caller[0]}: add_ruby_type is deprecated, use add_domain_type" if $VERBOSE
+    domain = 'ruby.yaml.org,2002'
+    key = ['tag', domain, type_tag].join ':'
+    @domain_types[key] = [key, block]
+  end
+
+  def self.add_private_type type_tag, &block
+    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
+    domain = 'x-private'
+    key = [domain, type_tag].join ':'
+    @domain_types[key] = [key, block]
+  end
+
+  def self.tagurize thing
+    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
+    return thing unless String === thing
+    "tag:yaml.org,2002:#{thing}"
+  end
+
+  def self.read_type_class type, reference
+    warn "#{caller[0]}: read_type_class is deprecated" if $VERBOSE
+    _, _, type, name = type.split ':', 4
+
+    reference = name.split('::').inject(reference) do |k,n|
+      k.const_get(n.to_sym)
+    end if name
+    [type, reference]
+  end
+
+  def self.object_maker klass, hash
+    warn "#{caller[0]}: object_maker is deprecated" if $VERBOSE
+    klass.allocate.tap do |obj|
+      hash.each { |k,v| obj.instance_variable_set(:"@#{k}", v) }
+    end
+  end
+end
+
+class Object
+  def to_yaml_properties # :nodoc:
+    instance_variables
+  end
+end
diff --git a/ext/psych/lib/psych/handler.rb b/ext/psych/lib/psych/handler.rb
new file mode 100644
index 0000000000..bfc62d701f
--- /dev/null
+++ b/ext/psych/lib/psych/handler.rb
@@ -0,0 +1,215 @@
+module Psych
+  ###
+  # Psych::Handler is an abstract base class that defines the events used
+  # when dealing with Psych::Parser.  Clients who want to use Psych::Parser
+  # should implement a class that inherits from Psych::Handler and define
+  # events that they can handle.
+  #
+  # Psych::Handler defines all events that Psych::Parser can possibly send to
+  # event handlers.
+  #
+  # See Psych::Parser for more details
+  class Handler
+    ###
+    # Called with +encoding+ when the YAML stream starts.  This method is
+    # called once per stream.  A stream may contain multiple documents.
+    #
+    # See the constants in Psych::Parser for the possible values of +encoding+.
+    def start_stream encoding
+    end
+
+    ###
+    # Called when the document starts with the declared +version+,
+    # +tag_directives+, if the document is +implicit+.
+    #
+    # +version+ will be an array of integers indicating the YAML version being
+    # dealt with, +tag_directives+ is a list of tuples indicating the prefix
+    # and suffix of each tag, and +implicit+ is a boolean indicating whether
+    # the document is started implicitly.
+    #
+    # === Example
+    #
+    # Given the following YAML:
+    #
+    #   %YAML 1.1
+    #   %TAG ! tag:tenderlovemaking.com,2009:
+    #   --- !squee
+    #
+    # The parameters for start_document must be this:
+    #
+    #   version         # => [1, 1]
+    #   tag_directives  # => [["!", "tag:tenderlovemaking.com,2009:"]]
+    #   implicit        # => false
+    def start_document version, tag_directives, implicit
+    end
+
+    ###
+    # Called with the document ends.  +implicit+ is a boolean value indicating
+    # whether or not the document has an implicit ending.
+    #
+    # === Example
+    #
+    # Given the following YAML:
+    #
+    #   ---
+    #     hello world
+    #
+    # +implicit+ will be true.  Given this YAML:
+    #
+    #   ---
+    #     hello world
+    #   ...
+    #
+    # +implicit+ will be false.
+    def end_document implicit
+    end
+
+    ###
+    # Called when an alias is found to +anchor+.  +anchor+ will be the name
+    # of the anchor found.
+    #
+    # === Example
+    #
+    # Here we have an example of an array that references itself in YAML:
+    #
+    #   --- &ponies
+    #   - first element
+    #   - *ponies
+    #
+    # &ponies is the achor, *ponies is the alias.  In this case, alias is
+    # called with "ponies".
+    def alias anchor
+    end
+
+    ###
+    # Called when a scalar +value+ is found.  The scalar may have an
+    # +anchor+, a +tag+, be implicitly +plain+ or implicitly +quoted+
+    #
+    # +value+ is the string value of the scalar
+    # +anchor+ is an associated anchor or nil
+    # +tag+ is an associated tag or nil
+    # +plain+ is a boolean value
+    # +quoted+ is a boolean value
+    # +style+ is an integer idicating the string style
+    #
+    # See the constants in Psych::Nodes::Scalar for the possible values of
+    # +style+
+    #
+    # === Example
+    #
+    # Here is a YAML document that exercises most of the possible ways this
+    # method can be called:
+    #
+    #   ---
+    #   - !str "foo"
+    #   - &anchor fun
+    #   - many
+    #     lines
+    #   - |
+    #     many
+    #     newlines
+    #
+    # The above YAML document contains a list with four strings.  Here are
+    # the parameters sent to this method in the same order:
+    #
+    #   # value               anchor    tag     plain   quoted  style
+    #   ["foo",               nil,      "!str", false,  false,  3    ]
+    #   ["fun",               "anchor", nil,    true,   false,  1    ]
+    #   ["many lines",        nil,      nil,    true,   false,  1    ]
+    #   ["many\nnewlines\n",  nil,      nil,    false,  true,   4    ]
+    #
+    def scalar value, anchor, tag, plain, quoted, style
+    end
+
+    ###
+    # Called when a sequence is started.
+    #
+    # +anchor+ is the anchor associated with the sequence or nil.
+    # +tag+ is the tag associated with the sequence or nil.
+    # +implicit+ a boolean indicating whether or not the sequence was implicitly
+    # started.
+    # +style+ is an integer indicating the list style.
+    #
+    # See the constants in Psych::Nodes::Sequence for the possible values of
+    # +style+.
+    #
+    # === Example
+    #
+    # Here is a YAML document that exercises most of the possible ways this
+    # method can be called:
+    #
+    #   ---
+    #   - !!seq [
+    #     a
+    #   ]
+    #   - &pewpew
+    #     - b
+    #
+    # The above YAML document consists of three lists, an outer list that
+    # contains two inner lists.  Here is a matrix of the parameters sent
+    # to represent these lists:
+    #
+    #   # anchor    tag                       implicit  style
+    #   [nil,       nil,                      true,     1     ]
+    #   [nil,       "tag:yaml.org,2002:seq",  false,    2     ]
+    #   ["pewpew",  nil,                      true,     1     ]
+
+    def start_sequence anchor, tag, implicit, style
+    end
+
+    ###
+    # Called when a sequence ends.
+    def end_sequence
+    end
+
+    ###
+    # Called when a map starts.
+    #
+    # +anchor+ is the anchor associated with the map or +nil+.
+    # +tag+ is the tag associated with the map or +nil+.
+    # +implicit+ is a boolean indicating whether or not the map was implicitly
+    # started.
+    # +style+ is an integer indicating the mapping style.
+    #
+    # See the constants in Psych::Nodes::Mapping for the possible values of
+    # +style+.
+    #
+    # === Example
+    #
+    # Here is a YAML document that exercises most of the possible ways this
+    # method can be called:
+    #
+    #   ---
+    #   k: !!map { hello: world }
+    #   v: &pewpew
+    #     hello: world
+    #
+    # The above YAML document consists of three maps, an outer map that contains
+    # two inner maps.  Below is a matrix of the parameters sent in order to
+    # represent these three maps:
+    #
+    #   # anchor    tag                       implicit  style
+    #   [nil,       nil,                      true,     1     ]
+    #   [nil,       "tag:yaml.org,2002:map",  false,    2     ]
+    #   ["pewpew",  nil,                      true,     1     ]
+
+    def start_mapping anchor, tag, implicit, style
+    end
+
+    ###
+    # Called when a map ends
+    def end_mapping
+    end
+
+    ###
+    # Called when an empty event happens. (Which, as far as I can tell, is
+    # never).
+    def empty
+    end
+
+    ###
+    # Called when the YAML stream ends
+    def end_stream
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
new file mode 100644
index 0000000000..12e0625866
--- /dev/null
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -0,0 +1,24 @@
+module Psych
+  module JSON
+    ###
+    # Psych::JSON::TreeBuilder is an event based AST builder.  Events are sent
+    # to an instance of Psych::JSON::TreeBuilder and a JSON AST is constructed.
+    class TreeBuilder < Psych::TreeBuilder
+      def start_document version, tag_directives, implicit
+        super(version, tag_directives, true)
+      end
+
+      def end_document implicit_end
+        super(true)
+      end
+
+      def start_mapping anchor, tag, implicit, style
+        super(anchor, nil, implicit, Nodes::Mapping::FLOW)
+      end
+
+      def start_sequence anchor, tag, implicit, style
+        super(anchor, nil, implicit, Nodes::Sequence::FLOW)
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes.rb b/ext/psych/lib/psych/nodes.rb
new file mode 100644
index 0000000000..9e5946daa9
--- /dev/null
+++ b/ext/psych/lib/psych/nodes.rb
@@ -0,0 +1,77 @@
+require 'psych/nodes/node'
+require 'psych/nodes/stream'
+require 'psych/nodes/document'
+require 'psych/nodes/sequence'
+require 'psych/nodes/scalar'
+require 'psych/nodes/mapping'
+require 'psych/nodes/alias'
+
+module Psych
+  ###
+  # = Overview
+  #
+  # When using Psych.load to deserialize a YAML document, the document is
+  # translated to an intermediary AST.  That intermediary AST is then
+  # translated in to a Ruby object graph.
+  #
+  # In the opposite direction, when using Psych.dump, the Ruby object graph is
+  # translated to an intermediary AST which is then converted to a YAML
+  # document.
+  #
+  # Psych::Nodes contains all of the classes that make up the nodes of a YAML
+  # AST.  You can manually build an AST and use one of the visitors (see
+  # Psych::Visitors) to convert that AST to either a YAML document or to a
+  # Ruby object graph.
+  #
+  # Here is an example of building an AST that represents a list with one
+  # scalar:
+  #
+  #   # Create our nodes
+  #   stream = Psych::Nodes::Stream.new
+  #   doc    = Psych::Nodes::Document.new
+  #   seq    = Psych::Nodes::Sequence.new
+  #   scalar = Psych::Nodes::Scalar.new('foo')
+  #   
+  #   # Build up our tree
+  #   stream.children << doc
+  #   doc.children    << seq
+  #   seq.children    << scalar
+  #
+  # The stream is the root of the tree.  We can then convert the tree to YAML:
+  #
+  #   stream.to_yaml => "---\n- foo\n"
+  #
+  # Or convert it to Ruby:
+  #
+  #   stream.to_ruby => [["foo"]]
+  #
+  # == YAML AST Requirements
+  #
+  # A valid YAML AST *must* have one Psych::Nodes::Stream at the root.  A
+  # Psych::Nodes::Stream node must have 1 or more Psych::Nodes::Document nodes
+  # as children.
+  #
+  # Psych::Nodes::Document nodes must have one and *only* one child.  That child
+  # may be one of:
+  #
+  # * Psych::Nodes::Sequence
+  # * Psych::Nodes::Mapping
+  # * Psych::Nodes::Scalar
+  #
+  # Psych::Nodes::Sequence and Psych::Nodes::Mapping nodes may have many
+  # children, but Psych::Nodes::Mapping nodes should have an even number of
+  # children.
+  #
+  # All of these are valid children for Psych::Nodes::Sequence and
+  # Psych::Nodes::Mapping nodes:
+  #
+  # * Psych::Nodes::Sequence
+  # * Psych::Nodes::Mapping
+  # * Psych::Nodes::Scalar
+  # * Psych::Nodes::Alias
+  #
+  # Psych::Nodes::Scalar and Psych::Nodes::Alias are both terminal nodes and
+  # should not have any children.
+  module Nodes
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/alias.rb b/ext/psych/lib/psych/nodes/alias.rb
new file mode 100644
index 0000000000..5bd4df13d1
--- /dev/null
+++ b/ext/psych/lib/psych/nodes/alias.rb
@@ -0,0 +1,18 @@
+module Psych
+  module Nodes
+    ###
+    # This class represents a {YAML Alias}[http://yaml.org/spec/1.1/#alias].
+    # It points to an +anchor+.
+    #
+    # A Psych::Nodes::Alias is a terminal node and may have no children.
+    class Alias < Psych::Nodes::Node
+      # The anchor this alias links to
+      attr_accessor :anchor
+
+      # Create a new Alias that points to an +anchor+
+      def initialize anchor
+        @anchor = anchor
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/document.rb b/ext/psych/lib/psych/nodes/document.rb
new file mode 100644
index 0000000000..32014d60dc
--- /dev/null
+++ b/ext/psych/lib/psych/nodes/document.rb
@@ -0,0 +1,60 @@
+module Psych
+  module Nodes
+    ###
+    # This represents a YAML Document.  This node must be a child of
+    # Psych::Nodes::Stream.  A Psych::Nodes::Document must have one child,
+    # and that child may be one of the following:
+    #
+    # * Psych::Nodes::Sequence
+    # * Psych::Nodes::Mapping
+    # * Psych::Nodes::Scalar
+    class Document < Psych::Nodes::Node
+      # The version of the YAML document
+      attr_accessor :version
+
+      # A list of tag directives for this document
+      attr_accessor :tag_directives
+
+      # Was this document implicitly created?
+      attr_accessor :implicit
+
+      # Is the end of the document implicit?
+      attr_accessor :implicit_end
+
+      ###
+      # Create a new Psych::Nodes::Document object.
+      #
+      # +version+ is a list indicating the YAML version.
+      # +tags_directives+ is a list of tag directive declarations
+      # +implicit+ is a flag indicating whether the document will be implicitly
+      # started.
+      #
+      # == Example:
+      # This creates a YAML document object that represents a YAML 1.1 document
+      # with one tag directive, and has an implicit start:
+      #
+      #   Psych::Nodes::Document.new(
+      #     [1,1],
+      #     [["!", "tag:tenderlovemaking.com,2009:"]],
+      #     true
+      #   )
+      #
+      # == See Also
+      # See also Psych::Handler#start_document
+      def initialize version = [], tag_directives = [], implicit = false
+        super()
+        @version        = version
+        @tag_directives = tag_directives
+        @implicit       = implicit
+        @implicit_end   = true
+      end
+
+      ###
+      # Returns the root node.  A Document may only have one root node:
+      # http://yaml.org/spec/1.1/#id898031
+      def root
+        children.first
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/mapping.rb b/ext/psych/lib/psych/nodes/mapping.rb
new file mode 100644
index 0000000000..5ba95ce4b6
--- /dev/null
+++ b/ext/psych/lib/psych/nodes/mapping.rb
@@ -0,0 +1,56 @@
+module Psych
+  module Nodes
+    ###
+    # This class represents a {YAML Mapping}[http://yaml.org/spec/1.1/#mapping].
+    #
+    # A Psych::Nodes::Mapping node may have 0 or more children, but must have
+    # an even number of children.  Here are the valid children a
+    # Psych::Nodes::Mapping node may have:
+    #
+    # * Psych::Nodes::Sequence
+    # * Psych::Nodes::Mapping
+    # * Psych::Nodes::Scalar
+    # * Psych::Nodes::Alias
+    class Mapping < Psych::Nodes::Node
+      # Any Map Style
+      ANY   = 0
+
+      # Block Map Style
+      BLOCK = 1
+
+      # Flow Map Style
+      FLOW  = 2
+
+      # The optional anchor for this mapping
+      attr_accessor :anchor
+
+      # The optional tag for this mapping
+      attr_accessor :tag
+
+      # Is this an implicit mapping?
+      attr_accessor :implicit
+
+      # The style of this mapping
+      attr_accessor :style
+
+      ###
+      # Create a new Psych::Nodes::Mapping object.
+      #
+      # +anchor+ is the anchor associated with the map or +nil+.
+      # +tag+ is the tag associated with the map or +nil+.
+      # +implicit+ is a boolean indicating whether or not the map was implicitly
+      # started.
+      # +style+ is an integer indicating the mapping style.
+      #
+      # == See Also
+      # See also Psych::Handler#start_mapping
+      def initialize anchor = nil, tag = nil, implicit = true, style = BLOCK
+        super()
+        @anchor   = anchor
+        @tag      = tag
+        @implicit = implicit
+        @style    = style
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb
new file mode 100644
index 0000000000..3ab9acae43
--- /dev/null
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -0,0 +1,42 @@
+require 'stringio'
+
+module Psych
+  module Nodes
+    ###
+    # The base class for any Node in a YAML parse tree.  This class should
+    # never be instantiated.
+    class Node
+      # The children of this node
+      attr_reader :children
+
+      # An associated tag
+      attr_reader :tag
+
+      # Create a new Psych::Nodes::Node
+      def initialize
+        @children = []
+      end
+
+      ###
+      # Convert this node to Ruby.
+      #
+      # See also Psych::Visitors::ToRuby
+      def to_ruby
+        Visitors::ToRuby.new.accept self
+      end
+      alias :transform :to_ruby
+
+      ###
+      # Convert this node to YAML.
+      #
+      # See also Psych::Visitors::Emitter
+      def to_yaml io = nil
+        real_io = io || StringIO.new
+
+        Visitors::Emitter.new(real_io).accept self
+        return real_io.string unless io
+        io
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/scalar.rb b/ext/psych/lib/psych/nodes/scalar.rb
new file mode 100644
index 0000000000..1b1b25b98a
--- /dev/null
+++ b/ext/psych/lib/psych/nodes/scalar.rb
@@ -0,0 +1,67 @@
+module Psych
+  module Nodes
+    ###
+    # This class represents a {YAML Scalar}[http://yaml.org/spec/1.1/#id858081].
+    #
+    # This node type is a terminal node and should not have any children.
+    class Scalar < Psych::Nodes::Node
+      # Any style scalar, the emitter chooses
+      ANY           = 0
+
+      # Plain scalar style
+      PLAIN         = 1
+
+      # Single quoted style
+      SINGLE_QUOTED = 2
+
+      # Double quoted style
+      DOUBLE_QUOTED = 3
+
+      # Literal style
+      LITERAL       = 4
+
+      # Folded style
+      FOLDED        = 5
+
+      # The scalar value
+      attr_accessor :value
+
+      # The anchor value (if there is one)
+      attr_accessor :anchor
+
+      # The tag value (if there is one)
+      attr_accessor :tag
+
+      # Is this a plain scalar?
+      attr_accessor :plain
+
+      # Is this scalar quoted?
+      attr_accessor :quoted
+
+      # The style of this scalar
+      attr_accessor :style
+
+      ###
+      # Create a new Psych::Nodes::Scalar object.
+      #
+      # +value+ is the string value of the scalar
+      # +anchor+ is an associated anchor or nil
+      # +tag+ is an associated tag or nil
+      # +plain+ is a boolean value
+      # +quoted+ is a boolean value
+      # +style+ is an integer idicating the string style
+      #
+      # == See Also
+      #
+      # See also Psych::Handler#scalar
+      def initialize value, anchor = nil, tag = nil, plain = true, quoted = false, style = ANY
+        @value  = value
+        @anchor = anchor
+        @tag    = tag
+        @plain  = plain
+        @quoted = quoted
+        @style  = style
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/sequence.rb b/ext/psych/lib/psych/nodes/sequence.rb
new file mode 100644
index 0000000000..e4b833d330
--- /dev/null
+++ b/ext/psych/lib/psych/nodes/sequence.rb
@@ -0,0 +1,81 @@
+module Psych
+  module Nodes
+    ###
+    # This class represents a
+    # {YAML sequence}[http://yaml.org/spec/1.1/#sequence/syntax].
+    #
+    # A YAML sequence is basically a list, and looks like this:
+    #
+    #   %YAML 1.1
+    #   ---
+    #   - I am
+    #   - a Sequence
+    #
+    # A YAML sequence may have an anchor like this:
+    #
+    #   %YAML 1.1
+    #   ---
+    #   &A [
+    #     "This sequence",
+    #     "has an anchor"
+    #   ]
+    #
+    # A YAML sequence may also have a tag like this:
+    #
+    #   %YAML 1.1
+    #   ---
+    #   !!seq [
+    #     "This sequence",
+    #     "has a tag"
+    #   ]
+    #
+    # This class represents a sequence in a YAML document.  A
+    # Psych::Nodes::Sequence node may have 0 or more children.  Valid children
+    # for this node are:
+    #
+    # * Psych::Nodes::Sequence
+    # * Psych::Nodes::Mapping
+    # * Psych::Nodes::Scalar
+    # * Psych::Nodes::Alias
+    class Sequence < Psych::Nodes::Node
+      # Any Styles, emitter chooses
+      ANY   = 0
+
+      # Block style sequence
+      BLOCK = 1
+
+      # Flow style sequence
+      FLOW  = 2
+
+      # The anchor for this sequence (if any)
+      attr_accessor :anchor
+
+      # The tag name for this sequence (if any)
+      attr_accessor :tag
+
+      # Is this sequence started implicitly?
+      attr_accessor :implicit
+
+      # The sequece style used
+      attr_accessor :style
+
+      ###
+      # Create a new object representing a YAML sequence.
+      #
+      # +anchor+ is the anchor associated with the sequence or nil.
+      # +tag+ is the tag associated with the sequence or nil.
+      # +implicit+ a boolean indicating whether or not the sequence was
+      # implicitly started.
+      # +style+ is an integer indicating the list style.
+      #
+      # See Psych::Handler#start_sequence
+      def initialize anchor = nil, tag = nil, implicit = true, style = BLOCK
+        super()
+        @anchor   = anchor
+        @tag      = tag
+        @implicit = implicit
+        @style    = style
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/stream.rb b/ext/psych/lib/psych/nodes/stream.rb
new file mode 100644
index 0000000000..f4aab5a7dc
--- /dev/null
+++ b/ext/psych/lib/psych/nodes/stream.rb
@@ -0,0 +1,37 @@
+module Psych
+  module Nodes
+    ###
+    # Represents a YAML stream.  This is the root node for any YAML parse
+    # tree.  This node must have one or more child nodes.  The only valid
+    # child node for a Psych::Nodes::Stream node is Psych::Nodes::Document.
+    class Stream < Psych::Nodes::Node
+
+      # Encodings supported by Psych (and libyaml)
+
+      # Any encoding
+      ANY     = Psych::Parser::ANY
+
+      # UTF-8 encoding
+      UTF8    = Psych::Parser::UTF8
+
+      # UTF-16LE encoding
+      UTF16LE = Psych::Parser::UTF16LE
+
+      # UTF-16BE encoding
+      UTF16BE = Psych::Parser::UTF16BE
+
+      # The encoding used for this stream
+      attr_reader :encoding
+
+      ###
+      # Create a new Psych::Nodes::Stream node with an +encoding+ that
+      # defaults to Psych::Nodes::Stream::UTF8.
+      #
+      # See also Psych::Handler#start_stream
+      def initialize encoding = UTF8
+        super()
+        @encoding = encoding
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/omap.rb b/ext/psych/lib/psych/omap.rb
new file mode 100644
index 0000000000..6286270616
--- /dev/null
+++ b/ext/psych/lib/psych/omap.rb
@@ -0,0 +1,4 @@
+module Psych
+  class Omap < ::Hash
+  end
+end
diff --git a/ext/psych/lib/psych/parser.rb b/ext/psych/lib/psych/parser.rb
new file mode 100644
index 0000000000..0e38a4ae7d
--- /dev/null
+++ b/ext/psych/lib/psych/parser.rb
@@ -0,0 +1,44 @@
+module Psych
+  ###
+  # YAML event parser class.  This class parses a YAML document and calls
+  # events on the handler that is passed to the constructor.  The events can
+  # be used for things such as constructing a YAML AST or deserializing YAML
+  # documents.  It can even be fed back to Psych::Emitter to emit the same
+  # document that was parsed.
+  #
+  # See Psych::Handler for documentation on the events that Psych::Parser emits.
+  #
+  # Here is an example that prints out ever scalar found in a YAML document:
+  #
+  #   # Handler for detecting scalar values
+  #   class ScalarHandler < Psych::Handler
+  #     def scalar value, anchor, tag, plain, quoted, style
+  #       puts value
+  #     end
+  #   end
+  #
+  #   parser = Psych::Parser.new(ScalarHandler.new)
+  #   parser.parse(yaml_document)
+  #
+  # Here is an example that feeds the parser back in to Psych::Emitter.  The
+  # YAML document is read from STDIN and written back out to STDERR:
+  #
+  #   parser = Psych::Parser.new(Psych::Emitter.new($stderr))
+  #   parser.parse($stdin)
+  #
+  # Psych uses Psych::Parser in combination with Psych::TreeBuilder to
+  # construct an AST of the parsed YAML document.
+
+  class Parser
+    # The handler on which events will be called
+    attr_accessor :handler
+
+    ###
+    # Creates a new Psych::Parser instance with +handler+.  YAML events will
+    # be called on +handler+.  See Psych::Parser for more details.
+
+    def initialize handler = Handler.new
+      @handler = handler
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
new file mode 100644
index 0000000000..f7aaea7435
--- /dev/null
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -0,0 +1,105 @@
+require 'strscan'
+
+module Psych
+  ###
+  # Scan scalars for built in types
+  class ScalarScanner
+    # Taken from http://yaml.org/type/timestamp.html
+    TIME = /^\d{4}-\d{1,2}-\d{1,2}([Tt]|\s+)\d{1,2}:\d\d:\d\d(\.\d*)?(\s*Z|[-+]\d{1,2}(:\d\d)?)?/
+
+    # Create a new scanner
+    def initialize
+      @string_cache = {}
+    end
+
+    # Tokenize +string+ returning the ruby object
+    def tokenize string
+      return nil if string.empty?
+      return string if @string_cache.key?(string)
+
+      case string
+      when /^[A-Za-z~]/
+        if string.length > 5
+          @string_cache[string] = true
+          return string
+        end
+
+        case string
+        when /^[^ytonf~]/i
+          @string_cache[string] = true
+          string
+        when '~', /^null$/i
+          nil
+        when /^(yes|true|on)$/i
+          true
+        when /^(no|false|off)$/i
+          false
+        else
+          @string_cache[string] = true
+          string
+        end
+      when TIME
+        parse_time string
+      when /^\d{4}-\d{1,2}-\d{1,2}$/
+        require 'date'
+        Date.strptime(string, '%Y-%m-%d')
+      when /^\.inf$/i
+        1 / 0.0
+      when /^-\.inf$/i
+        -1 / 0.0
+      when /^\.nan$/i
+        0.0 / 0.0
+      when /^:./
+        if string =~ /^:(["'])(.*)\1/
+          $2.sub(/^:/, '').to_sym
+        else
+          string.sub(/^:/, '').to_sym
+        end
+      when /^[-+]?[1-9][0-9_]*(:[0-5]?[0-9])+$/
+        i = 0
+        string.split(':').each_with_index do |n,e|
+          i += (n.to_i * 60 ** (e - 2).abs)
+        end
+        i
+      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+\.[0-9_]*$/
+        i = 0
+        string.split(':').each_with_index do |n,e|
+          i += (n.to_f * 60 ** (e - 2).abs)
+        end
+        i
+      else
+        return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError
+        return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
+        @string_cache[string] = true
+        string
+      end
+    end
+
+    ###
+    # Parse and return a Time from +string+
+    def parse_time string
+      date, time = *(string.split(/[ tT]/, 2))
+      (yy, m, dd) = date.split('-').map { |x| x.to_i }
+      md = time.match(/(\d+:\d+:\d+)(\.\d*)?\s*(Z|[-+]\d+(:\d\d)?)?/)
+
+      (hh, mm, ss) = md[1].split(':').map { |x| x.to_i }
+      us = (md[2] ? Rational(md[2].sub(/^\./, '0.')) : 0) * 1000000
+
+      time = Time.utc(yy, m, dd, hh, mm, ss, us)
+
+      return time if 'Z' == md[3]
+      return Time.at(time.to_i, us) unless md[3]
+
+      tz = md[3].match(/^([+\-]?\d{1,2})\:?(\d{1,2})?$/)[1..-1].compact.map { |digit| Integer(digit, 10) }
+      offset = tz.first * 3600
+
+      if offset < 0
+        offset -= ((tz[1] || 0) * 60)
+      else
+        offset += ((tz[1] || 0) * 60)
+      end
+
+      Time.at((time - offset).to_i, us)
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/set.rb b/ext/psych/lib/psych/set.rb
new file mode 100644
index 0000000000..6793a8ed1b
--- /dev/null
+++ b/ext/psych/lib/psych/set.rb
@@ -0,0 +1,4 @@
+module Psych
+  class Set < ::Hash
+  end
+end
diff --git a/ext/psych/lib/psych/tree_builder.rb b/ext/psych/lib/psych/tree_builder.rb
new file mode 100644
index 0000000000..54d87a0b61
--- /dev/null
+++ b/ext/psych/lib/psych/tree_builder.rb
@@ -0,0 +1,94 @@
+require 'psych/handler'
+
+module Psych
+  ###
+  # This class works in conjunction with Psych::Parser to build an in-memory
+  # parse tree that represents a YAML document.
+  #
+  # == Example
+  #
+  #   parser = Psych::Parser.new Psych::TreeBuilder.new
+  #   parser.parse('--- foo')
+  #   tree = parser.handler.root
+  #
+  # See Psych::Handler for documentation on the event methods used in this
+  # class.
+  class TreeBuilder < Psych::Handler
+    # Returns the root node for the built tree
+    attr_reader :root
+
+    # Create a new TreeBuilder instance
+    def initialize
+      @stack = []
+      @last  = nil
+      @root  = nil
+    end
+
+    %w{
+      Sequence
+      Mapping
+    }.each do |node|
+      class_eval %{
+        def start_#{node.downcase}(anchor, tag, implicit, style)
+          n = Nodes::#{node}.new(anchor, tag, implicit, style)
+          @last.children << n
+          push n
+        end
+
+        def end_#{node.downcase}
+          pop
+        end
+      }
+    end
+
+    ###
+    # Handles start_document events with +version+, +tag_directives+,
+    # and +implicit+ styling.
+    #
+    # See Psych::Handler#start_document
+    def start_document version, tag_directives, implicit
+      n = Nodes::Document.new version, tag_directives, implicit
+      @last.children << n
+      push n
+    end
+
+    ###
+    # Handles end_document events with +version+, +tag_directives+,
+    # and +implicit+ styling.
+    #
+    # See Psych::Handler#start_document
+    def end_document implicit_end
+      @last.implicit_end = implicit_end
+      pop
+    end
+
+    def start_stream encoding
+      @root = Nodes::Stream.new(encoding)
+      push @root
+    end
+
+    def end_stream
+      pop
+    end
+
+    def scalar value, anchor, tag, plain, quoted, style
+      @last.children << Nodes::Scalar.new(value,anchor,tag,plain,quoted,style)
+    end
+
+    def alias anchor
+      @last.children << Nodes::Alias.new(anchor)
+    end
+
+    private
+    def push value
+      @stack.push value
+      @last = value
+    end
+
+    def pop
+      x = @stack.pop
+      @last = @stack.last
+      x
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/visitors.rb b/ext/psych/lib/psych/visitors.rb
new file mode 100644
index 0000000000..10ac4ce270
--- /dev/null
+++ b/ext/psych/lib/psych/visitors.rb
@@ -0,0 +1,5 @@
+require 'psych/visitors/visitor'
+require 'psych/visitors/to_ruby'
+require 'psych/visitors/emitter'
+require 'psych/visitors/yaml_tree'
+require 'psych/visitors/json_tree'
diff --git a/ext/psych/lib/psych/visitors/emitter.rb b/ext/psych/lib/psych/visitors/emitter.rb
new file mode 100644
index 0000000000..0768fbb528
--- /dev/null
+++ b/ext/psych/lib/psych/visitors/emitter.rb
@@ -0,0 +1,41 @@
+module Psych
+  module Visitors
+    class Emitter < Psych::Visitors::Visitor
+      def initialize io
+        @handler = Psych::Emitter.new io
+      end
+
+      def visit_Psych_Nodes_Stream o
+        @handler.start_stream o.encoding
+        o.children.each { |c| accept c }
+        @handler.end_stream
+      end
+
+      def visit_Psych_Nodes_Document o
+        @handler.start_document o.version, o.tag_directives, o.implicit
+        o.children.each { |c| accept c }
+        @handler.end_document o.implicit_end
+      end
+
+      def visit_Psych_Nodes_Scalar o
+        @handler.scalar o.value, o.anchor, o.tag, o.plain, o.quoted, o.style
+      end
+
+      def visit_Psych_Nodes_Sequence o
+        @handler.start_sequence o.anchor, o.tag, o.implicit, o.style
+        o.children.each { |c| accept c }
+        @handler.end_sequence
+      end
+
+      def visit_Psych_Nodes_Mapping o
+        @handler.start_mapping o.anchor, o.tag, o.implicit, o.style
+        o.children.each { |c| accept c }
+        @handler.end_mapping
+      end
+
+      def visit_Psych_Nodes_Alias o
+        @handler.alias o.anchor
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/visitors/json_tree.rb b/ext/psych/lib/psych/visitors/json_tree.rb
new file mode 100644
index 0000000000..dcb5ddccae
--- /dev/null
+++ b/ext/psych/lib/psych/visitors/json_tree.rb
@@ -0,0 +1,29 @@
+module Psych
+  module Visitors
+    class JSONTree < YAMLTree
+      def initialize options = {}, emitter = Psych::JSON::TreeBuilder.new
+        super
+      end
+
+      def visit_NilClass o
+        @emitter.scalar 'null', nil, nil, true, false, Nodes::Scalar::PLAIN
+      end
+
+      def visit_Integer o
+        @emitter.scalar o.to_s, nil, nil, true, false, Nodes::Scalar::PLAIN
+      end
+
+      def visit_Float o
+        return super if o.nan? || o.infinite?
+        visit_Integer o
+      end
+
+      def visit_String o
+        @emitter.scalar o.to_s, nil, nil, false, true, Nodes::Scalar::DOUBLE_QUOTED
+      end
+      alias :visit_Symbol :visit_String
+
+      private
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
new file mode 100644
index 0000000000..a68c8e698e
--- /dev/null
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -0,0 +1,269 @@
+require 'psych/scalar_scanner'
+
+module Psych
+  module Visitors
+    ###
+    # This class walks a YAML AST, converting each node to ruby
+    class ToRuby < Psych::Visitors::Visitor
+      def initialize
+        super
+        @st = {}
+        @ss = ScalarScanner.new
+        @domain_types = Psych.domain_types
+      end
+
+      def accept target
+        result = super
+        return result if @domain_types.empty? || !target.tag
+
+        key = target.tag.sub(/^[!\/]*/, '').sub(/(,\d+)\//, '\1:')
+        key = "tag:#{key}" unless key =~ /^(tag:|x-private)/
+
+        if @domain_types.key? key
+          value, block = @domain_types[key]
+          return block.call value, result
+        end
+
+        result
+      end
+
+      def visit_Psych_Nodes_Scalar o
+        @st[o.anchor] = o.value if o.anchor
+
+        if klass = Psych.load_tags[o.tag]
+          instance = klass.allocate
+
+          if instance.respond_to?(:init_with)
+            coder = Psych::Coder.new(o.tag)
+            coder.scalar = o.value
+            instance.init_with coder
+          end
+
+          return instance
+        end
+
+        return o.value if o.quoted
+        return @ss.tokenize(o.value) unless o.tag
+
+        case o.tag
+        when '!binary', 'tag:yaml.org,2002:binary'
+          o.value.unpack('m').first
+        when '!str', 'tag:yaml.org,2002:str'
+          o.value
+        when "!ruby/object:DateTime"
+          require 'date'
+          @ss.parse_time(o.value).to_datetime
+        when "!ruby/object:Complex"
+          Complex(o.value)
+        when "!ruby/object:Rational"
+          Rational(o.value)
+        when "tag:yaml.org,2002:float", "!float"
+          Float(@ss.tokenize(o.value))
+        when "!ruby/regexp"
+          o.value =~ /^\/(.*)\/([mixn]*)$/
+          source  = $1
+          options = 0
+          lang    = nil
+          ($2 || '').split('').each do |option|
+            case option
+            when 'x' then options |= Regexp::EXTENDED
+            when 'i' then options |= Regexp::IGNORECASE
+            when 'm' then options |= Regexp::MULTILINE
+
+            # FIXME: there is no constant for ARG_ENCODING_NONE
+            when 'n' then options |= 32
+            else lang = option
+            end
+          end
+          Regexp.new(*[source, options, lang].compact)
+        when "!ruby/range"
+          args = o.value.split(/([.]{2,3})/, 2).map { |s|
+            accept Nodes::Scalar.new(s)
+          }
+          args.push(args.delete_at(1) == '...')
+          Range.new(*args)
+        when /^!ruby\/sym(bol)?:?(.*)?$/
+          o.value.to_sym
+        else
+          @ss.tokenize o.value
+        end
+      end
+
+      def visit_Psych_Nodes_Sequence o
+        if klass = Psych.load_tags[o.tag]
+          instance = klass.allocate
+
+          if instance.respond_to?(:init_with)
+            coder = Psych::Coder.new(o.tag)
+            coder.seq = o.children.map { |c| accept c }
+            instance.init_with coder
+          end
+
+          return instance
+        end
+
+        case o.tag
+        when '!omap', 'tag:yaml.org,2002:omap'
+          map = Psych::Omap.new
+          @st[o.anchor] = map if o.anchor
+          o.children.each { |a|
+            map[accept(a.children.first)] = accept a.children.last
+          }
+          map
+        else
+          list = []
+          @st[o.anchor] = list if o.anchor
+          o.children.each { |c| list.push accept c }
+          list
+        end
+      end
+
+      def visit_Psych_Nodes_Mapping o
+        return revive(Psych.load_tags[o.tag], o) if Psych.load_tags[o.tag]
+
+        case o.tag
+        when '!str', 'tag:yaml.org,2002:str'
+          members = Hash[*o.children.map { |c| accept c }]
+          string = members.delete 'str'
+          init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)
+        when /^!ruby\/struct:?(.*)?$/
+          klass = resolve_class($1)
+
+          if klass
+            s = klass.allocate
+            @st[o.anchor] = s if o.anchor
+
+            members = {}
+            struct_members = s.members.map { |x| x.to_sym }
+            o.children.each_slice(2) do |k,v|
+              member = accept(k)
+              value  = accept(v)
+              if struct_members.include?(member.to_sym)
+                s.send("#{member}=", value)
+              else
+                members[member.to_s.sub(/^@/, '')] = value
+              end
+            end
+            init_with(s, members, o)
+          else
+            members = o.children.map { |c| accept c }
+            h = Hash[*members]
+            Struct.new(*h.map { |k,v| k.to_sym }).new(*h.map { |k,v| v })
+          end
+
+        when '!ruby/range'
+          h = Hash[*o.children.map { |c| accept c }]
+          Range.new(h['begin'], h['end'], h['excl'])
+
+        when /^!ruby\/exception:?(.*)?$/
+          h = Hash[*o.children.map { |c| accept c }]
+
+          e = build_exception((resolve_class($1) || Exception),
+                              h.delete('message'))
+          init_with(e, h, o)
+
+        when '!set', 'tag:yaml.org,2002:set'
+          set = Psych::Set.new
+          @st[o.anchor] = set if o.anchor
+          o.children.each_slice(2) do |k,v|
+            set[accept(k)] = accept(v)
+          end
+          set
+
+        when '!ruby/object:Complex'
+          h = Hash[*o.children.map { |c| accept c }]
+          Complex(h['real'], h['image'])
+
+        when '!ruby/object:Rational'
+          h = Hash[*o.children.map { |c| accept c }]
+          Rational(h['numerator'], h['denominator'])
+
+        when /^!ruby\/object:?(.*)?$/
+          name = $1 || 'Object'
+          obj = revive((resolve_class(name) || Object), o)
+          @st[o.anchor] = obj if o.anchor
+          obj
+        else
+          hash = {}
+          @st[o.anchor] = hash if o.anchor
+
+          o.children.each_slice(2) { |k,v|
+            key = accept(k)
+
+            if key == '<<'
+              case v
+              when Nodes::Alias
+                hash.merge! accept(v)
+              when Nodes::Sequence
+                accept(v).reverse_each do |value|
+                  hash.merge! value
+                end
+              else
+                hash[key] = accept(v)
+              end
+            else
+              hash[key] = accept(v)
+            end
+
+          }
+          hash
+        end
+      end
+
+      def visit_Psych_Nodes_Document o
+        accept o.root
+      end
+
+      def visit_Psych_Nodes_Stream o
+        o.children.map { |c| accept c }
+      end
+
+      def visit_Psych_Nodes_Alias o
+        @st[o.anchor]
+      end
+
+      private
+      def revive klass, node
+        s = klass.allocate
+        h = Hash[*node.children.map { |c| accept c }]
+        init_with(s, h, node)
+      end
+
+      def init_with o, h, node
+        c = Psych::Coder.new(node.tag)
+        c.map = h
+
+        if o.respond_to?(:init_with)
+          o.init_with c
+        elsif o.respond_to?(:yaml_initialize)
+          if $VERBOSE
+            "Implementing #{o.class}#yaml_initialize is deprecated, please implement \"init_with(coder)\""
+          end
+          o.yaml_initialize c.tag, c.map
+        else
+          h.each { |k,v| o.instance_variable_set(:"@#{k}", v) }
+        end
+        o
+      end
+
+      # Convert +klassname+ to a Class
+      def resolve_class klassname
+        return nil unless klassname and not klassname.empty?
+
+        name    = klassname
+        retried = false
+
+        begin
+          path2class(name)
+        rescue ArgumentError, NameError => ex
+          unless retried
+            name    = "Struct::#{name}"
+            retried = ex
+            retry
+          end
+          raise retried
+        end
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/visitors/visitor.rb b/ext/psych/lib/psych/visitors/visitor.rb
new file mode 100644
index 0000000000..ccd8c3bd55
--- /dev/null
+++ b/ext/psych/lib/psych/visitors/visitor.rb
@@ -0,0 +1,18 @@
+module Psych
+  module Visitors
+    class Visitor
+      def accept target
+        case target
+        when Psych::Nodes::Scalar   then visit_Psych_Nodes_Scalar target
+        when Psych::Nodes::Mapping  then visit_Psych_Nodes_Mapping target
+        when Psych::Nodes::Sequence then visit_Psych_Nodes_Sequence target
+        when Psych::Nodes::Alias    then visit_Psych_Nodes_Alias target
+        when Psych::Nodes::Document then visit_Psych_Nodes_Document target
+        when Psych::Nodes::Stream   then visit_Psych_Nodes_Stream target
+        else
+          raise "Can't handle #{target}"
+        end
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
new file mode 100644
index 0000000000..271bac5a23
--- /dev/null
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -0,0 +1,330 @@
+module Psych
+  module Visitors
+    ###
+    # YAMLTree builds a YAML ast given a ruby object.  For example:
+    #
+    #   builder = Psych::Visitors::YAMLTree.new
+    #   builder << { :foo => 'bar' }
+    #   builder.tree # => #<Psych::Nodes::Stream .. }
+    #
+    class YAMLTree < Psych::Visitors::Visitor
+      def initialize options = {}, emitter = Psych::TreeBuilder.new
+        super()
+        @emitter = emitter
+        @st      = {}
+        @ss      = ScalarScanner.new
+
+        @emitter.start_stream Psych::Nodes::Stream::UTF8
+
+        @dispatch_cache = Hash.new do |h,klass|
+          method = "visit_#{(klass.name || '').split('::').join('_')}"
+
+          method = respond_to?(method) ? method : h[klass.superclass]
+
+          raise(TypeError, "Can't dump #{target.class}") unless method
+
+          h[klass] = method
+        end
+      end
+
+      def tree
+        @emitter.end_stream
+      end
+
+      def << object
+        @emitter.start_document [], [], false
+        accept object
+        @emitter.end_document true
+      end
+
+      def accept target
+        # return any aliases we find
+        if node = @st[target.object_id]
+          node.anchor = target.object_id.to_s
+          return @emitter.alias target.object_id.to_s
+        end
+
+        if target.respond_to?(:to_yaml)
+          loc = target.method(:to_yaml).source_location.first
+          if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
+            unless target.respond_to?(:encode_with)
+              if $VERBOSE
+                warn "implementing to_yaml is deprecated, please implement \"encode_with\""
+              end
+
+              target.to_yaml(:nodump => true)
+            end
+          end
+        end
+
+        if target.respond_to?(:encode_with)
+          dump_coder target
+        else
+          send(@dispatch_cache[target.class], target)
+        end
+      end
+
+      def visit_Psych_Omap o
+        seq = @emitter.start_sequence(nil, '!omap', false, Nodes::Sequence::BLOCK)
+        register(o, seq)
+
+        o.each { |k,v| visit_Hash k => v }
+        @emitter.end_sequence
+      end
+
+      def visit_Object o
+        tag = Psych.dump_tags[o.class]
+        unless tag
+          klass = o.class == Object ? nil : o.class.name
+          tag   = ['!ruby/object', klass].compact.join(':')
+        end
+
+        map = @emitter.start_mapping(nil, tag, false, Nodes::Mapping::BLOCK)
+        register(o, map)
+
+        dump_ivars o
+        @emitter.end_mapping
+      end
+
+      def visit_Struct o
+        tag = ['!ruby/struct', o.class.name].compact.join(':')
+
+        register o, @emitter.start_mapping(nil, tag, false, Nodes::Mapping::BLOCK)
+        o.members.each do |member|
+          @emitter.scalar member.to_s, nil, nil, true, false, Nodes::Scalar::ANY
+          accept o[member]
+        end
+
+        dump_ivars o
+
+        @emitter.end_mapping
+      end
+
+      def visit_Exception o
+        tag = ['!ruby/exception', o.class.name].join ':'
+
+        @emitter.start_mapping nil, tag, false, Nodes::Mapping::BLOCK
+
+        {
+          'message'   => private_iv_get(o, 'mesg'),
+          'backtrace' => private_iv_get(o, 'backtrace'),
+        }.each do |k,v|
+          next unless v
+          @emitter.scalar k, nil, nil, true, false, Nodes::Scalar::ANY
+          accept v
+        end
+
+        dump_ivars o
+
+        @emitter.end_mapping
+      end
+
+      def visit_Regexp o
+        @emitter.scalar o.inspect, nil, '!ruby/regexp', false, false, Nodes::Scalar::ANY
+      end
+
+      def visit_DateTime o
+        formatted = format_time o.to_time
+        tag = '!ruby/object:DateTime'
+        @emitter.scalar formatted, nil, tag, false, false, Nodes::Scalar::ANY
+      end
+
+      def visit_Time o
+        formatted = format_time o
+        @emitter.scalar formatted, nil, nil, true, false, Nodes::Scalar::ANY
+      end
+
+      def visit_Rational o
+        @emitter.start_mapping(nil, '!ruby/object:Rational', false, Nodes::Mapping::BLOCK)
+
+        [
+          'denominator', o.denominator.to_s,
+          'numerator', o.numerator.to_s
+        ].each do |m|
+          @emitter.scalar m, nil, nil, true, false, Nodes::Scalar::ANY
+        end
+
+        @emitter.end_mapping
+      end
+
+      def visit_Complex o
+        @emitter.start_mapping(nil, '!ruby/object:Complex', false, Nodes::Mapping::BLOCK)
+
+        ['real', o.real.to_s, 'image', o.imag.to_s].each do |m|
+          @emitter.scalar m, nil, nil, true, false, Nodes::Scalar::ANY
+        end
+
+        @emitter.end_mapping
+      end
+
+      def visit_Integer o
+        @emitter.scalar o.to_s, nil, nil, true, false, Nodes::Scalar::ANY
+      end
+      alias :visit_TrueClass :visit_Integer
+      alias :visit_FalseClass :visit_Integer
+      alias :visit_Date :visit_Integer
+
+      def visit_Float o
+        if o.nan?
+          @emitter.scalar '.nan', nil, nil, true, false, Nodes::Scalar::ANY
+        elsif o.infinite?
+          @emitter.scalar((o.infinite? > 0 ? '.inf' : '-.inf'),
+            nil, nil, true, false, Nodes::Scalar::ANY)
+        else
+          @emitter.scalar o.to_s, nil, nil, true, false, Nodes::Scalar::ANY
+        end
+      end
+
+      def visit_String o
+        plain = false
+        quote = false
+        style = Nodes::Scalar::ANY
+
+        if o.index("\x00") || o.count("\x00-\x7F", "^ -~\t\r\n").fdiv(o.length) > 0.3
+          str   = [o].pack('m').chomp
+          tag   = '!binary' # FIXME: change to below when syck is removed
+          #tag   = 'tag:yaml.org,2002:binary'
+          style = Nodes::Scalar::LITERAL
+        else
+          str   = o
+          tag   = nil
+          quote = !(String === @ss.tokenize(o))
+          plain = !quote
+        end
+
+        ivars = find_ivars o
+
+        if ivars.empty?
+          @emitter.scalar str, nil, tag, plain, quote, style
+        else
+          @emitter.start_mapping nil, '!str', false, Nodes::Mapping::BLOCK
+          @emitter.scalar 'str', nil, nil, true, false, Nodes::Scalar::ANY
+          @emitter.scalar str, nil, tag, plain, quote, style
+
+          dump_ivars o
+
+          @emitter.end_mapping
+        end
+      end
+
+      def visit_Class o
+        raise TypeError, "can't dump anonymous class #{o.class}"
+      end
+
+      def visit_Range o
+        @emitter.start_mapping nil, '!ruby/range', false, Nodes::Mapping::BLOCK
+        ['begin', o.begin, 'end', o.end, 'excl', o.exclude_end?].each do |m|
+          accept m
+        end
+        @emitter.end_mapping
+      end
+
+      def visit_Hash o
+        register(o, @emitter.start_mapping(nil, nil, true, Psych::Nodes::Mapping::BLOCK))
+
+        o.each do |k,v|
+          accept k
+          accept v
+        end
+
+        @emitter.end_mapping
+      end
+
+      def visit_Psych_Set o
+        register(o, @emitter.start_mapping(nil, '!set', false, Psych::Nodes::Mapping::BLOCK))
+
+        o.each do |k,v|
+          accept k
+          accept v
+        end
+
+        @emitter.end_mapping
+      end
+
+      def visit_Array o
+        register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
+        o.each { |c| accept c }
+        @emitter.end_sequence
+      end
+
+      def visit_NilClass o
+        @emitter.scalar('', nil, 'tag:yaml.org,2002:null', false, false, Nodes::Scalar::ANY)
+      end
+
+      def visit_Symbol o
+        @emitter.scalar ":#{o}", nil, nil, true, false, Nodes::Scalar::ANY
+      end
+
+      private
+      def format_time time
+        formatted = time.strftime("%Y-%m-%d %H:%M:%S.%9N")
+        if time.utc?
+          formatted += "Z"
+        else
+          zone = time.strftime('%z')
+          formatted += " #{zone[0,3]}:#{zone[3,5]}"
+        end
+        formatted
+      end
+
+      # FIXME: remove this method once "to_yaml_properties" is removed
+      def find_ivars target
+        loc = target.method(:to_yaml_properties).source_location.first
+        unless loc.start_with?(Psych::DEPRECATED) || loc.end_with?('rubytypes.rb')
+          if $VERBOSE
+            warn "#{loc}: to_yaml_properties is deprecated, please implement \"encode_with(coder)\""
+          end
+          return target.to_yaml_properties
+        end
+
+        target.instance_variables
+      end
+
+      def register target, yaml_obj
+        @st[target.object_id] = yaml_obj
+        yaml_obj
+      end
+
+      def dump_coder o
+        tag = Psych.dump_tags[o.class]
+        unless tag
+          klass = o.class == Object ? nil : o.class.name
+          tag   = ['!ruby/object', klass].compact.join(':')
+        end
+
+        c = Psych::Coder.new(tag)
+        o.encode_with(c)
+        emit_coder c
+      end
+
+      def emit_coder c
+        case c.type
+        when :scalar
+          @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, Nodes::Scalar::ANY
+        when :seq
+          @emitter.start_sequence nil, c.tag, c.tag.nil?, Nodes::Sequence::BLOCK
+          c.seq.each do |thing|
+            accept thing
+          end
+          @emitter.end_sequence
+        when :map
+          @emitter.start_mapping nil, c.tag, c.implicit, c.style
+          c.map.each do |k,v|
+            @emitter.scalar k, nil, nil, true, false, Nodes::Scalar::ANY
+            accept v
+          end
+          @emitter.end_mapping
+        end
+      end
+
+      def dump_ivars target
+        ivars = find_ivars target
+
+        ivars.each do |iv|
+          @emitter.scalar("#{iv.to_s.sub(/^@/, '')}", nil, nil, true, false, Nodes::Scalar::ANY)
+          accept target.instance_variable_get(iv)
+        end
+      end
+    end
+  end
+end
diff --git a/ext/psych/parser.c b/ext/psych/parser.c
new file mode 100644
index 0000000000..a69f2763bc
--- /dev/null
+++ b/ext/psych/parser.c
@@ -0,0 +1,341 @@
+#include <psych.h>
+
+VALUE cPsychParser;
+VALUE ePsychSyntaxError;
+
+static ID id_read;
+static ID id_empty;
+static ID id_start_stream;
+static ID id_end_stream;
+static ID id_start_document;
+static ID id_end_document;
+static ID id_alias;
+static ID id_scalar;
+static ID id_start_sequence;
+static ID id_end_sequence;
+static ID id_start_mapping;
+static ID id_end_mapping;
+
+#define PSYCH_TRANSCODE(_str, _yaml_enc, _internal_enc) \
+  do { \
+    rb_enc_associate_index(_str, _yaml_enc); \
+    if(_internal_enc) \
+      _str = rb_str_export_to_enc(_str, _internal_enc); \
+  } while (0)
+
+static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
+{
+    VALUE io = (VALUE)data;
+    VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size));
+
+    *read = 0;
+
+    if(! NIL_P(string)) {
+	void * str = (void *)StringValuePtr(string);
+	*read = (size_t)RSTRING_LEN(string);
+	memcpy(buf, str, *read);
+    }
+
+    return 1;
+}
+
+/*
+ * call-seq:
+ *    parser.parse(yaml)
+ *
+ * Parse the YAML document contained in +yaml+.  Events will be called on
+ * the handler set on the parser instance.
+ *
+ * See Psych::Parser and Psych::Parser#handler
+ */
+static VALUE parse(VALUE self, VALUE yaml)
+{
+    yaml_parser_t parser;
+    yaml_event_t event;
+    int done = 0;
+    int tainted = 0;
+#ifdef HAVE_RUBY_ENCODING_H
+    int encoding = rb_enc_find_index("ASCII-8BIT");
+    rb_encoding * internal_enc;
+#endif
+    VALUE handler = rb_iv_get(self, "@handler");
+
+
+    yaml_parser_initialize(&parser);
+
+    if (OBJ_TAINTED(yaml)) tainted = 1;
+
+    if(rb_respond_to(yaml, id_read)) {
+	yaml_parser_set_input(&parser, io_reader, (void *)yaml);
+	if (RTEST(rb_obj_is_kind_of(yaml, rb_cIO))) tainted = 1;
+    } else {
+	StringValue(yaml);
+	yaml_parser_set_input_string(
+		&parser,
+		(const unsigned char *)RSTRING_PTR(yaml),
+		(size_t)RSTRING_LEN(yaml)
+		);
+    }
+
+    while(!done) {
+	if(!yaml_parser_parse(&parser, &event)) {
+	    size_t line   = parser.mark.line + 1;
+	    size_t column = parser.mark.column;
+
+	    yaml_parser_delete(&parser);
+	    rb_raise(ePsychSyntaxError, "couldn't parse YAML at line %d column %d",
+		    (int)line, (int)column);
+	}
+
+	switch(event.type) {
+	  case YAML_STREAM_START_EVENT:
+
+#ifdef HAVE_RUBY_ENCODING_H
+	    switch(event.data.stream_start.encoding) {
+	      case YAML_ANY_ENCODING:
+		break;
+	      case YAML_UTF8_ENCODING:
+		encoding = rb_enc_find_index("UTF-8");
+		break;
+	      case YAML_UTF16LE_ENCODING:
+		encoding = rb_enc_find_index("UTF-16LE");
+		break;
+	      case YAML_UTF16BE_ENCODING:
+		encoding = rb_enc_find_index("UTF-16BE");
+		break;
+	      default:
+		break;
+	    }
+	    internal_enc = rb_default_internal_encoding();
+#endif
+
+	    rb_funcall(handler, id_start_stream, 1,
+		       INT2NUM((long)event.data.stream_start.encoding)
+		);
+	    break;
+	  case YAML_DOCUMENT_START_EVENT:
+	    {
+		/* Get a list of tag directives (if any) */
+		VALUE tag_directives = rb_ary_new();
+		/* Grab the document version */
+		VALUE version = event.data.document_start.version_directive ?
+		    rb_ary_new3(
+			(long)2,
+			INT2NUM((long)event.data.document_start.version_directive->major),
+			INT2NUM((long)event.data.document_start.version_directive->minor)
+			) : rb_ary_new();
+
+		if(event.data.document_start.tag_directives.start) {
+		    yaml_tag_directive_t *start =
+			event.data.document_start.tag_directives.start;
+		    yaml_tag_directive_t *end =
+			event.data.document_start.tag_directives.end;
+		    for(; start != end; start++) {
+			VALUE handle = Qnil;
+			VALUE prefix = Qnil;
+			if(start->handle) {
+			    handle = rb_str_new2((const char *)start->handle);
+			    if (tainted) OBJ_TAINT(handle);
+#ifdef HAVE_RUBY_ENCODING_H
+			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
+#endif
+			}
+
+			if(start->prefix) {
+			    prefix = rb_str_new2((const char *)start->prefix);
+			    if (tainted) OBJ_TAINT(prefix);
+#ifdef HAVE_RUBY_ENCODING_H
+			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
+#endif
+			}
+
+			rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
+		    }
+		}
+		rb_funcall(handler, id_start_document, 3,
+			   version, tag_directives,
+			   event.data.document_start.implicit == 1 ? Qtrue : Qfalse
+		    );
+	    }
+	    break;
+	  case YAML_DOCUMENT_END_EVENT:
+	    rb_funcall(handler, id_end_document, 1,
+		       event.data.document_end.implicit == 1 ? Qtrue : Qfalse
+		);
+	    break;
+	  case YAML_ALIAS_EVENT:
+	    {
+		VALUE alias = Qnil;
+		if(event.data.alias.anchor) {
+		    alias = rb_str_new2((const char *)event.data.alias.anchor);
+		    if (tainted) OBJ_TAINT(alias);
+#ifdef HAVE_RUBY_ENCODING_H
+		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
+#endif
+		}
+
+		rb_funcall(handler, id_alias, 1, alias);
+	    }
+	    break;
+	  case YAML_SCALAR_EVENT:
+	    {
+		VALUE anchor = Qnil;
+		VALUE tag = Qnil;
+		VALUE plain_implicit, quoted_implicit, style;
+		VALUE val = rb_str_new(
+		    (const char *)event.data.scalar.value,
+		    (long)event.data.scalar.length
+		    );
+		if (tainted) OBJ_TAINT(val);
+
+#ifdef HAVE_RUBY_ENCODING_H
+		PSYCH_TRANSCODE(val, encoding, internal_enc);
+#endif
+
+		if(event.data.scalar.anchor) {
+		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
+		    if (tainted) OBJ_TAINT(anchor);
+#ifdef HAVE_RUBY_ENCODING_H
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+#endif
+		}
+
+		if(event.data.scalar.tag) {
+		    tag = rb_str_new2((const char *)event.data.scalar.tag);
+		    if (tainted) OBJ_TAINT(tag);
+#ifdef HAVE_RUBY_ENCODING_H
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+#endif
+		}
+
+		plain_implicit =
+		    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
+
+		quoted_implicit =
+		    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
+
+		style = INT2NUM((long)event.data.scalar.style);
+
+		rb_funcall(handler, id_scalar, 6,
+			   val, anchor, tag, plain_implicit, quoted_implicit, style);
+	    }
+	    break;
+	  case YAML_SEQUENCE_START_EVENT:
+	    {
+		VALUE anchor = Qnil;
+		VALUE tag = Qnil;
+		VALUE implicit, style;
+		if(event.data.sequence_start.anchor) {
+		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
+		    if (tainted) OBJ_TAINT(anchor);
+#ifdef HAVE_RUBY_ENCODING_H
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+#endif
+		}
+
+		tag = Qnil;
+		if(event.data.sequence_start.tag) {
+		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
+		    if (tainted) OBJ_TAINT(tag);
+#ifdef HAVE_RUBY_ENCODING_H
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+#endif
+		}
+
+		implicit =
+		    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
+
+		style = INT2NUM((long)event.data.sequence_start.style);
+
+		rb_funcall(handler, id_start_sequence, 4,
+			   anchor, tag, implicit, style);
+	    }
+	    break;
+	  case YAML_SEQUENCE_END_EVENT:
+	    rb_funcall(handler, id_end_sequence, 0);
+	    break;
+	  case YAML_MAPPING_START_EVENT:
+	    {
+		VALUE anchor = Qnil;
+		VALUE tag = Qnil;
+		VALUE implicit, style;
+		if(event.data.mapping_start.anchor) {
+		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
+		    if (tainted) OBJ_TAINT(anchor);
+#ifdef HAVE_RUBY_ENCODING_H
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+#endif
+		}
+
+		if(event.data.mapping_start.tag) {
+		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
+		    if (tainted) OBJ_TAINT(tag);
+#ifdef HAVE_RUBY_ENCODING_H
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+#endif
+		}
+
+		implicit =
+		    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
+
+		style = INT2NUM((long)event.data.mapping_start.style);
+
+		rb_funcall(handler, id_start_mapping, 4,
+			   anchor, tag, implicit, style);
+	    }
+	    break;
+	  case YAML_MAPPING_END_EVENT:
+	    rb_funcall(handler, id_end_mapping, 0);
+	    break;
+	  case YAML_NO_EVENT:
+	    rb_funcall(handler, id_empty, 0);
+	    break;
+	  case YAML_STREAM_END_EVENT:
+	    rb_funcall(handler, id_end_stream, 0);
+	    done = 1;
+	    break;
+	}
+	yaml_event_delete(&event);
+    }
+
+    return self;
+}
+
+void Init_psych_parser()
+{
+#if 0
+    mPsych = rb_define_module("Psych");
+#endif
+
+    cPsychParser = rb_define_class_under(mPsych, "Parser", rb_cObject);
+
+    /* Any encoding: Let the parser choose the encoding */
+    rb_define_const(cPsychParser, "ANY", INT2NUM(YAML_ANY_ENCODING));
+
+    /* UTF-8 Encoding */
+    rb_define_const(cPsychParser, "UTF8", INT2NUM(YAML_UTF8_ENCODING));
+
+    /* UTF-16-LE Encoding with BOM */
+    rb_define_const(cPsychParser, "UTF16LE", INT2NUM(YAML_UTF16LE_ENCODING));
+
+    /* UTF-16-BE Encoding with BOM */
+    rb_define_const(cPsychParser, "UTF16BE", INT2NUM(YAML_UTF16BE_ENCODING));
+
+    ePsychSyntaxError = rb_define_class_under(mPsych, "SyntaxError", rb_eSyntaxError);
+
+    rb_define_method(cPsychParser, "parse", parse, 1);
+
+    id_read           = rb_intern("read");
+    id_empty          = rb_intern("empty");
+    id_start_stream   = rb_intern("start_stream");
+    id_end_stream     = rb_intern("end_stream");
+    id_start_document = rb_intern("start_document");
+    id_end_document   = rb_intern("end_document");
+    id_alias          = rb_intern("alias");
+    id_scalar         = rb_intern("scalar");
+    id_start_sequence = rb_intern("start_sequence");
+    id_end_sequence   = rb_intern("end_sequence");
+    id_start_mapping  = rb_intern("start_mapping");
+    id_end_mapping    = rb_intern("end_mapping");
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/parser.h b/ext/psych/parser.h
new file mode 100644
index 0000000000..25e896f01d
--- /dev/null
+++ b/ext/psych/parser.h
@@ -0,0 +1,6 @@
+#ifndef PSYCH_PARSER_H
+#define PSYCH_PARSER_H
+
+void Init_psych_parser();
+
+#endif
diff --git a/ext/psych/psych.c b/ext/psych/psych.c
new file mode 100644
index 0000000000..69ff1d8dfc
--- /dev/null
+++ b/ext/psych/psych.c
@@ -0,0 +1,34 @@
+#include <psych.h>
+
+/* call-seq: Psych.libyaml_version
+ *
+ * Returns the version of libyaml being used
+ */
+static VALUE libyaml_version(VALUE module)
+{
+    int major, minor, patch;
+    VALUE list[3];
+
+    yaml_get_version(&major, &minor, &patch);
+
+    list[0] = INT2NUM((long)major);
+    list[1] = INT2NUM((long)minor);
+    list[2] = INT2NUM((long)patch);
+
+    return rb_ary_new4((long)3, list);
+}
+
+VALUE mPsych;
+
+void Init_psych()
+{
+    mPsych = rb_define_module("Psych");
+
+    rb_define_singleton_method(mPsych, "libyaml_version", libyaml_version, 0);
+
+    Init_psych_parser();
+    Init_psych_emitter();
+    Init_psych_to_ruby();
+    Init_psych_yaml_tree();
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych.h b/ext/psych/psych.h
new file mode 100644
index 0000000000..9f1be449a2
--- /dev/null
+++ b/ext/psych/psych.h
@@ -0,0 +1,20 @@
+#ifndef PSYCH_H
+#define PSYCH_H
+
+#include <ruby.h>
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#endif
+
+#include <yaml.h>
+
+#include <parser.h>
+#include <emitter.h>
+#include <to_ruby.h>
+#include <yaml_tree.h>
+
+extern VALUE mPsych;
+
+
+#endif
diff --git a/ext/psych/to_ruby.c b/ext/psych/to_ruby.c
new file mode 100644
index 0000000000..ed5245e12e
--- /dev/null
+++ b/ext/psych/to_ruby.c
@@ -0,0 +1,41 @@
+#include <psych.h>
+
+VALUE cPsychVisitorsToRuby;
+
+/* call-seq: vis.build_exception(klass, message)
+ *
+ * Create an exception with class +klass+ and +message+
+ */
+static VALUE build_exception(VALUE self, VALUE klass, VALUE mesg)
+{
+    VALUE e = rb_obj_alloc(klass);
+
+    rb_iv_set(e, "mesg", mesg);
+
+    return e;
+}
+
+/* call-seq: vis.path2class(path)
+ *
+ * Convert +path+ string to a class
+ */
+static VALUE path2class(VALUE self, VALUE path)
+{
+#ifdef HAVE_RUBY_ENCODING_H
+    return rb_path_to_class(path);
+#else
+    return rb_path2class(StringValuePtr(path));
+#endif
+}
+
+void Init_psych_to_ruby(void)
+{
+    VALUE psych     = rb_define_module("Psych");
+    VALUE visitors  = rb_define_module_under(psych, "Visitors");
+    VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
+    cPsychVisitorsToRuby = rb_define_class_under(visitors, "ToRuby", visitor);
+
+    rb_define_private_method(cPsychVisitorsToRuby, "build_exception", build_exception, 2);
+    rb_define_private_method(cPsychVisitorsToRuby, "path2class", path2class, 1);
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/to_ruby.h b/ext/psych/to_ruby.h
new file mode 100644
index 0000000000..7b8e757a45
--- /dev/null
+++ b/ext/psych/to_ruby.h
@@ -0,0 +1,8 @@
+#ifndef PSYCH_TO_RUBY_H
+#define PSYCH_TO_RUBY_H
+
+#include <psych.h>
+
+void Init_psych_to_ruby(void);
+
+#endif
diff --git a/ext/psych/yaml_tree.c b/ext/psych/yaml_tree.c
new file mode 100644
index 0000000000..bcf24d2070
--- /dev/null
+++ b/ext/psych/yaml_tree.c
@@ -0,0 +1,24 @@
+#include <psych.h>
+
+VALUE cPsychVisitorsYamlTree;
+
+/*
+ * call-seq: private_iv_get(target, prop)
+ *
+ * Get the private instance variable +prop+ from +target+
+ */
+static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
+{
+    return rb_attr_get(target, rb_intern(StringValuePtr(prop)));
+}
+
+void Init_psych_yaml_tree(void)
+{
+    VALUE psych     = rb_define_module("Psych");
+    VALUE visitors  = rb_define_module_under(psych, "Visitors");
+    VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
+    cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
+
+    rb_define_private_method(cPsychVisitorsYamlTree, "private_iv_get", private_iv_get, 2);
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/yaml_tree.h b/ext/psych/yaml_tree.h
new file mode 100644
index 0000000000..4628a69d71
--- /dev/null
+++ b/ext/psych/yaml_tree.h
@@ -0,0 +1,8 @@
+#ifndef PSYCH_YAML_TREE_H
+#define PSYCH_YAML_TREE_H
+
+#include <psych.h>
+
+void Init_psych_yaml_tree(void);
+
+#endif
diff --git a/ext/pty/.cvsignore b/ext/pty/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/pty/.cvsignore
+++ b/ext/pty/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/pty/README b/ext/pty/README
deleted file mode 100644
index 42c7d4f891..0000000000
--- a/ext/pty/README
+++ /dev/null
@@ -1,65 +0,0 @@
-pty extension version 0.3 by A.ito
-
-1. Introduction
-
-This extension module adds ruby a functionality to execute an 
-arbitrary command through pseudo tty (pty).
-
-2. Install
-
-Follow the instruction below.
-
-(1) Execute
-
-      ruby extconf.rb
-
-    then Makefile is generated.
-
-(3) Do make; make install.
-
-3. What you can do
-
-This extension module defines a module named PTY, which contains
-following module fungtions:
-
-   getpty(command)
-   spawn(command)
-
-      This function reserves a pty, executes command over the pty 
-      and returns an array. The return value is an array with three
-      elements. The first element in the array is for reading and the 
-      second for writing. The third element is the process ID of the
-      child process. If this function is called with an iterator block,
-      the array is passed to the block as block parameters, and the
-      function itself returns nil.
-
-      When the child process is suspended or finished, an exception is
-      raised.  If this function is called with an iterator block,
-      exception is raised only within the block.  Child process
-      monitor is terminated on block exit.
-
-   protect_signal
-   reset_signal
-
-      These functions are obsolete in this version of pty.
-
-4. License
-
-(C) Copyright 1998 by Akinori Ito.
-
-This software may be redistributed freely for this purpose, in full 
-or in part, provided that this entire copyright notice is included 
-on any copies of this software and applications and derivations thereof.
-
-This software is provided on an "as is" basis, without warranty of any
-kind, either expressed or implied, as to any matter including, but not
-limited to warranty of fitness of purpose, or merchantability, or
-results obtained from use of this software.
-
-5. Bug report
-
-Please feel free to send E-mail to
-
-   aito@ei5sun.yz.yamagata-u.ac.jp
-
-for any bug report, opinion, contribution, etc.
diff --git a/ext/pty/README.ja b/ext/pty/README.ja
deleted file mode 100644
index 5ae4fb06a0..0000000000
--- a/ext/pty/README.ja
+++ /dev/null
@@ -1,89 +0,0 @@
-pty ��ĥ�⥸�塼�� version 0.3 by A.ito
-
-1. �Ϥ����
-
-���γ�ĥ�⥸�塼��ϡ�����tty (pty) ���̤���Ŭ���ʥ��ޥ�ɤ�
-�¹Ԥ��뵡ǽ�� ruby ���󶡤��ޤ���
-
-2. ���󥹥ȡ���
-
-���Τ褦�ˤ��ƥ��󥹥ȡ��뤷�Ƥ���������
-
-(1)  ruby extconf.rb
-
-    ��¹Ԥ���� Makefile ����������ޤ���
-
-(2) make; make install ��¹Ԥ��Ƥ���������
-
-3. �����Ǥ��뤫
-
-���γ�ĥ�⥸�塼��ϡ�PTY �Ȥ����⥸�塼���������ޤ���������
-�ˤϡ����Τ褦�ʥ⥸�塼��ؿ����ޤޤ�Ƥ��ޤ���
-
-   getpty(command)
-   spawn(command)
-
-      ���δؿ��ϡ�����tty����ݤ������ꤵ�줿���ޥ�ɤ򤽤β���tty
-      �θ������Ǽ¹Ԥ���������֤��ޤ�������ͤ�3�Ĥ����Ǥ���ʤ�
-      ����Ǥ����ǽ�����Ǥϲ���tty�����ɤ߽Ф������IO���֥������ȡ�
-      2���ܤϽ񤭤��ि���IO���֥������ȡ�3���ܤϻҥץ������Υץ�
-      ����ID�Ǥ������δؿ������ƥ졼���Ȥ��ƸƤФ줿��硤������
-      ���Ǥϥ֥��å��ѥ�᡼���Ȥ����Ϥ��졤�ؿ����Τ�nil���֤��ޤ���
-
-      ���δؿ��ˤ�äƺ��줿���֥ץ�������ư���Ƥ���֡��ҥץ�����
-      �ξ��֤�ƻ뤹�뤿��� SIGCHLD �����ʥ����ª���ޤ����ҥץ�����
-      ����λ��������ߤ������ˤϡ��㳰��ȯ�����ޤ������δ֡����٤Ƥ�
-      SIGCHLD �� PTY �⥸�塼��Υ����ʥ�ϥ�ɥ����ª�����Τǡ�
-      ���֥ץ���������������¾�δؿ�(system() �Ȥ� IO.popen()�ʤ�)��
-      �Ȥ��ȡ�ͽ�����ʤ��㳰��ȯ�����뤳�Ȥ�����ޤ���������ɤ�����
-      �ˤϡ�������protect_signal()�򻲾Ȥ��Ƥ���������
-
-      ���δؿ����֥��å��ѥ�᡼���դ��ǸƤФ줿���ˤϡ����Υ֥��å�
-      ����ǤΤ� SIGCHLD ����ª����ޤ����������äơ��֥��å��ѥ�᡼��
-      �Ȥ����Ϥ��줿IO���֥������Ȥ򡤥֥��å��γ��˻����Ф��ƻȤ���
-      �ϴ�����ޤ���
-
-
-   protect_signal
-
-      ���δؿ��ϥ��ƥ졼���Ǥ��������ǻ��ꤵ�줿�֥��å�����Ǥϡ�
-      �ҥץ���������λ���Ƥ��㳰��ȯ�����ޤ��󡥤��δؿ���Ȥ����Ȥǡ�
-      PTY�λҥץ�������ư���Ƥ���֤Ǥ⡤system()�� IO.popen()�ʤɤ�
-      �ؿ�������˻Ȥ����Ȥ��Ǥ��ޤ����㤨�С�
-
-        PTY.spawn("command_foo") do |r,w|
-          ...
-          ...
-          PTY.protect_signal do
-            system "some other commands"
-          end
-          ...
-        end
-
-      ���Τ褦�ʵ��Ҥˤ�ꡤ"some other commands" ����λ�����Ȥ���
-      �㳰��ȯ������Τ��ɤ��ޤ���
-
-    reset_signal
-
-      PTY �λҥץ�������ư���Ƥ��Ƥ⡤���Υץ������ν�λ�����㳰��ȯ��
-      ���ʤ��褦�ˤ��ޤ���
-
-4. ���ѤˤĤ���
-
-��ƣ��§���������ͭ���ޤ���
-
-�������ץ������ޤ��ϥɥ�����Ȥ˸������ɽ�������Ѥ��줺��
-ɽ������Ƥ�����˸¤ꡤï�Ǥ⡤���Υ��եȥ�������̵����������
-���Ԥ�̵�Ǥ����ѡ����ۡ����ѤǤ��ޤ���������Ū�ϸ��ꤵ��Ƥ��ޤ�
-��
-
-���Υץ����������ѡ����ۤ���¾���Υץ������˴ط�����԰٤ˤ�
-�ä������������ʤ�»�����Ф��Ƥ⡤��Ԥϰ�����Ǥ���餤�ޤ���
-
-5. �Х������
-
-�Х���ݡ��Ȥϴ��ޤ��ޤ���
-
-	aito@ei5sun.yz.yamagata-u.ac.jp
-
-�ޤ��Żҥ᡼��ǥХ���ݡ��Ȥ����꤯��������
diff --git a/ext/pty/depend b/ext/pty/depend
index 888be6c301..2249eb8fcd 100644
--- a/ext/pty/depend
+++ b/ext/pty/depend
@@ -1 +1 @@
-pty.o: pty.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+pty.o: pty.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/io.h
diff --git a/ext/pty/expect_sample.rb b/ext/pty/expect_sample.rb
deleted file mode 100644
index bf8a2352fe..0000000000
--- a/ext/pty/expect_sample.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# sample program of expect.rb
-#
-#  by A. Ito
-#
-#  This program reports the latest version of ruby interpreter
-#  by connecting to ftp server at ruby-lang.org.
-#
-require 'pty'
-require 'expect'
-
-fnames = []
-PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
-  w_f.sync = true
-  
-  $expect_verbose = false
-  
-  r_f.expect(/^Name.*: /) do
-    w_f.print "ftp\n"
-  end
-  
-  if !ENV['USER'].nil?
-    username = ENV['USER']
-  elsif !ENV['LOGNAME'].nil?
-    username = ENV['LOGNAME']
-  else
-    username = 'guest'
-  end
-  
-  r_f.expect('word:') do
-    w_f.print username+"@\n"
-  end
-  r_f.expect("> ") do
-    w_f.print "cd pub/ruby\n"
-  end
-  r_f.expect("> ") do
-    w_f.print "dir\n"
-  end
-  
-  r_f.expect("> ") do |output|
-    for x in output[0].split("\n")
-      if x =~ /(ruby.*\.tar\.gz)/ then
-         fnames.push $1
-      end
-    end
-  end
-  begin
-    w_f.print "quit\n"
-  rescue
-  end
-end
-
-print "The latest ruby interpreter is "
-print fnames.sort.pop
-print "\n"
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 5e126fe0cf..3d6d0f1e46 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,12 +1,14 @@
 require 'mkmf'
 
-if /mswin32|mingw|bccwin32/ !~ RUBY_PLATFORM
+if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
   have_header("sys/stropts.h")
   have_func("setresuid")
   have_header("libutil.h")
+  have_header("util.h") # OpenBSD openpty
   have_header("pty.h")
   have_library("util", "openpty")
-  if have_func("openpty") or
+  if have_func("posix_openpt") or
+      have_func("openpty") or
       have_func("_getpty") or
       have_func("ptsname") or
       have_func("ioctl")
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index 08191b05b9..54cf709ee2 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -1,6 +1,12 @@
 $expect_verbose = false
 
 class IO
+  # Reads ios until pattern matches or the timeout is over. It returns
+  # an array with the read buffer, followed by the matches. If a block is given,
+  # the result is yielded to the block and returns nil. The optional timeout parameter defines,
+  # in seconds, the total time to wait for pattern. If it is over of eof is found, it 
+  # returns/yields nil. However, the buffer in a timeout session is kept for the next expect call.
+  # The default timeout is 9999999 seconds.
   def expect(pat,timeout=9999999)
     buf = ''
     case pat
@@ -8,13 +14,20 @@ class IO
       e_pat = Regexp.new(Regexp.quote(pat))
     when Regexp
       e_pat = pat
+    else
+      raise TypeError, "unsupported pattern class: #{pattern.class}"
     end
+    @unusedBuf ||= ''
     while true
-      if !IO.select([self],nil,nil,timeout) or eof? then
+      if not @unusedBuf.empty?
+        c = @unusedBuf.slice!(0).chr
+      elsif !IO.select([self],nil,nil,timeout) or eof? then
         result = nil
+        @unusedBuf = buf
         break
+      else
+        c = getc.chr
       end
-      c = getc.chr
       buf << c
       if $expect_verbose
         STDOUT.print c
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 206d4cd131..800e75959b 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -1,4 +1,8 @@
-#include	"config.h"
+#include	"ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+#include	<stdlib.h>
 #include	<stdio.h>
 #include	<sys/types.h>
 #include	<sys/stat.h>
@@ -12,6 +16,9 @@
 #ifdef HAVE_LIBUTIL_H
 #include	<libutil.h>
 #endif
+#ifdef HAVE_UTIL_H
+#include	<util.h>
+#endif
 #ifdef HAVE_PTY_H
 #include	<pty.h>
 #endif
@@ -22,9 +29,9 @@
 #endif
 #include <ctype.h>
 
-#include "ruby.h"
-#include "rubyio.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "ruby/util.h"
 
 #include <signal.h>
 #ifdef HAVE_SYS_STROPTS_H
@@ -39,10 +46,10 @@
 
 #if !defined(HAVE_OPENPTY)
 #if defined(__hpux)
-static
-char	*MasterDevice = "/dev/ptym/pty%s",
-	*SlaveDevice =  "/dev/pty/tty%s",
-	*deviceNo[] = {
+static const
+char	MasterDevice[] = "/dev/ptym/pty%s",
+	SlaveDevice[] =  "/dev/pty/tty%s",
+	*const deviceNo[] = {
 		"p0","p1","p2","p3","p4","p5","p6","p7",
 		"p8","p9","pa","pb","pc","pd","pe","pf",
 		"q0","q1","q2","q3","q4","q5","q6","q7",
@@ -62,10 +69,10 @@ char	*MasterDevice = "/dev/ptym/pty%s",
 		0,
 	};
 #elif defined(_IBMESA)  /* AIX/ESA */
-static
-char	*MasterDevice = "/dev/ptyp%s",
-  	*SlaveDevice = "/dev/ttyp%s",
-	*deviceNo[] = {
+static const
+char	MasterDevice[] = "/dev/ptyp%s",
+  	SlaveDevice[] = "/dev/ttyp%s",
+	*const deviceNo[] = {
 "00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
 "10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
 "20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
@@ -84,10 +91,10 @@ char	*MasterDevice = "/dev/ptyp%s",
 "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
 		};
 #elif !defined(HAVE_PTSNAME)
-static
-char	*MasterDevice = "/dev/pty%s",
-	*SlaveDevice = "/dev/tty%s",
-	*deviceNo[] = {
+static const
+char	MasterDevice[] = "/dev/pty%s",
+	SlaveDevice[] = "/dev/tty%s",
+	*const deviceNo[] = {
 		"p0","p1","p2","p3","p4","p5","p6","p7",
 		"p8","p9","pa","pb","pc","pd","pe","pf",
 		"q0","q1","q2","q3","q4","q5","q6","q7",
@@ -101,8 +108,6 @@ char	*MasterDevice = "/dev/pty%s",
 #endif
 #endif /* !defined(HAVE_OPENPTY) */
 
-static char SlaveName[DEVICELEN];
-
 #ifndef HAVE_SETEUID
 # ifdef HAVE_SETREUID
 #  define seteuid(e)	setreuid(-1, (e))
@@ -118,8 +123,7 @@ static char SlaveName[DEVICELEN];
 static VALUE eChildExited;
 
 static VALUE
-echild_status(self)
-    VALUE self;
+echild_status(VALUE self)
 {
     return rb_ivar_get(self, rb_intern("status"));
 }
@@ -127,87 +131,112 @@ echild_status(self)
 struct pty_info {
     int fd;
     rb_pid_t child_pid;
-    VALUE thread;
 };
 
-static void
-raise_from_wait(state, info)
-    struct pty_info *info;
-    char *state;
-{
-    extern VALUE rb_last_status;
-    char buf[1024];
-    VALUE exc;
-
-    snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)info->child_pid);
-    exc = rb_exc_new2(eChildExited, buf);
-    rb_iv_set(exc, "status", rb_last_status);
-    rb_funcall(info->thread, rb_intern("raise"), 1, exc);
-}
-
-static VALUE
-pty_syswait(info)
-    struct pty_info *info;
-{
-    int cpid, status;
-
-    for (;;) {
-	cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
-	if (cpid == -1) return Qnil;
-
-#if defined(IF_STOPPED)
-	if (IF_STOPPED(status)) { /* suspend */
-	    raise_from_wait("stopped", info);
-	}
-#elif defined(WIFSTOPPED)
-	if (WIFSTOPPED(status)) { /* suspend */
-	    raise_from_wait("stopped", info);
-	}
-#else
----->> Either IF_STOPPED or WIFSTOPPED is needed <<----
-#endif /* WIFSTOPPED | IF_STOPPED */
-	else if (kill(info->child_pid, 0) == 0) {
-	    raise_from_wait("changed", info);
-	}
-	else {
-	    raise_from_wait("exited", info);
-	    return Qnil;
-	}
-    }
-}
-
-static void getDevice _((int*, int*));
+static void getDevice(int*, int*, char [DEVICELEN], int);
 
 struct exec_info {
     int argc;
     VALUE *argv;
 };
 
-static VALUE pty_exec _((VALUE v));
-
 static VALUE
-pty_exec(v)
-    VALUE v;
+pty_exec(VALUE v)
 {
     struct exec_info *arg = (struct exec_info *)v;
     return rb_f_exec(arg->argc, arg->argv);
 }
 
-static void
-establishShell(argc, argv, info)
+struct child_info {
+    int master, slave;
+    char *slavename;
     int argc;
     VALUE *argv;
-    struct pty_info *info;
+};
+
+static int
+chfunc(void *data)
+{
+    struct child_info *carg = data;
+    int master = carg->master;
+    int slave = carg->slave;
+    int argc = carg->argc;
+    VALUE *argv = carg->argv;
+
+    struct exec_info arg;
+    int status;
+
+    rb_thread_atfork_before_exec();
+
+    /*
+     * Set free from process group and controlling terminal
+     */
+#ifdef HAVE_SETSID
+    (void) setsid();
+#else /* HAS_SETSID */
+# ifdef HAVE_SETPGRP
+#  ifdef SETGRP_VOID
+    if (setpgrp() == -1)
+        perror("setpgrp()");
+#  else /* SETGRP_VOID */
+    if (setpgrp(0, getpid()) == -1)
+        rb_sys_fail("setpgrp()");
+    {
+        int i = open("/dev/tty", O_RDONLY);
+        if (i < 0) rb_sys_fail("/dev/tty");
+        if (ioctl(i, TIOCNOTTY, (char *)0))
+            perror("ioctl(TIOCNOTTY)");
+        close(i);
+    }
+#  endif /* SETGRP_VOID */
+# endif /* HAVE_SETPGRP */
+#endif /* HAS_SETSID */
+
+    /*
+     * obtain new controlling terminal
+     */
+#if defined(TIOCSCTTY)
+    close(master);
+    (void) ioctl(slave, TIOCSCTTY, (char *)0);
+    /* errors ignored for sun */
+#else
+    close(slave);
+    slave = open(carg->slavename, O_RDWR);
+    if (slave < 0) {
+        perror("open: pty slave");
+        _exit(1);
+    }
+    close(master);
+#endif
+    write(slave, "", 1);
+    dup2(slave,0);
+    dup2(slave,1);
+    dup2(slave,2);
+    close(slave);
+#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
+    seteuid(getuid());
+#endif
+
+    arg.argc = argc;
+    arg.argv = argv;
+    rb_protect(pty_exec, (VALUE)&arg, &status);
+    sleep(1);
+    _exit(1);
+}
+
+static void
+establishShell(int argc, VALUE *argv, struct pty_info *info,
+	       char SlaveName[DEVICELEN])
 {
-    int 		i,master,slave;
+    int 		master,slave;
+    rb_pid_t		pid;
     char		*p, tmp, *getenv();
     struct passwd	*pwent;
     VALUE		v;
-    struct exec_info	arg;
-    int			status;
+    struct child_info   carg;
 
     if (argc == 0) {
-	char *shellname;
+	const char *shellname;
 
 	if ((p = getenv("SHELL")) != NULL) {
 	    shellname = p;
@@ -223,94 +252,80 @@ establishShell(argc, argv, info)
 	argc = 1;
 	argv = &v;
     }
-    getDevice(&master,&slave);
 
-    info->thread = rb_thread_current();
-    if((i = fork()) < 0) {
-	close(master);
-	close(slave);
-	rb_sys_fail("fork failed");
-    }
+    getDevice(&master, &slave, SlaveName, 0);
 
-    if(i == 0) {	/* child */
-	/*
-	 * Set free from process group and controlling terminal
-	 */
-#ifdef HAVE_SETSID
-	(void) setsid();
-#else /* HAS_SETSID */
-# ifdef HAVE_SETPGRP
-#  ifdef SETGRP_VOID
-	if (setpgrp() == -1)
-	    perror("setpgrp()");
-#  else /* SETGRP_VOID */
-	if (setpgrp(0, getpid()) == -1)
-	    rb_sys_fail("setpgrp()");
-	if ((i = open("/dev/tty", O_RDONLY)) < 0)
-	    rb_sys_fail("/dev/tty");
-	else {
-	    if (ioctl(i, TIOCNOTTY, (char *)0))
-		perror("ioctl(TIOCNOTTY)");
-	    close(i);
-	}
-#  endif /* SETGRP_VOID */
-# endif /* HAVE_SETPGRP */
-#endif /* HAS_SETSID */
+    carg.master = master;
+    carg.slave = slave;
+    carg.slavename = SlaveName;
+    carg.argc = argc;
+    carg.argv = argv;
+    pid = rb_fork(0, chfunc, &carg, Qnil);
 
-	/*
-	 * obtain new controlling terminal
-	 */
-#if defined(TIOCSCTTY)
+    if (pid < 0) {
 	close(master);
-	(void) ioctl(slave, TIOCSCTTY, (char *)0);
-	/* errors ignored for sun */
-#else
 	close(slave);
-	slave = open(SlaveName, O_RDWR);
-	if (slave < 0) {
-	    perror("open: pty slave");
-	    _exit(1);
-	}
-	close(master);
-#endif
-	write(slave, "", 1);
-	dup2(slave,0);
-	dup2(slave,1);
-	dup2(slave,2);
-	close(slave);
-#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
-	seteuid(getuid());
-#endif
-
-	arg.argc = argc;
-	arg.argv = argv;
-	rb_protect(pty_exec, (VALUE)&arg, &status);
-	sleep(1);
-	_exit(1);
+	rb_sys_fail("fork failed");
     }
 
     read(master, &tmp, 1);
     close(slave);
 
-    info->child_pid = i;
+    info->child_pid = pid;
     info->fd = master;
 }
 
-static VALUE
-pty_finalize_syswait(info)
-    struct pty_info *info;
+static int
+no_mesg(char *slavedevice, int nomesg)
 {
-    rb_thread_kill(info->thread);
-    rb_funcall(info->thread, rb_intern("value"), 0);
-    rb_detach_process(info->child_pid);
-    return Qnil;
+    if (nomesg)
+        return chmod(slavedevice, 0600);
+    else
+        return 0;
 }
 
 static int
-get_device_once(master, slave, fail)
-    int *master, *slave, fail;
+get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
 {
-#if defined HAVE_OPENPTY
+#if defined(HAVE_POSIX_OPENPT)
+    int masterfd = -1, slavefd = -1;
+    char *slavedevice;
+    struct sigaction dfl, old;
+
+    dfl.sa_handler = SIG_DFL;
+    dfl.sa_flags = 0;
+    sigemptyset(&dfl.sa_mask);
+
+    if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error;
+    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
+    if (grantpt(masterfd) == -1) goto grantpt_error;
+    if (sigaction(SIGCHLD, &old, NULL) == -1) goto error;
+    if (unlockpt(masterfd) == -1) goto error;
+    if ((slavedevice = ptsname(masterfd)) == NULL) goto error;
+    if (no_mesg(slavedevice, nomesg) == -1) goto error;
+    if ((slavefd = open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
+
+#if defined I_PUSH && !defined linux
+    if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
+    if (ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
+    if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error;
+#endif
+
+    *master = masterfd;
+    *slave = slavefd;
+    strlcpy(SlaveName, slavedevice, DEVICELEN);
+    return 0;
+
+  grantpt_error:
+    sigaction(SIGCHLD, &old, NULL);
+  error:
+    if (slavefd != -1) close(slavefd);
+    if (masterfd != -1) close(masterfd);
+    if (fail) {
+        rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
+    }
+    return -1;
+#elif defined HAVE_OPENPTY
 /*
  * Use openpty(3) of 4.3BSD Reno and later,
  * or the same interface function.
@@ -320,153 +335,301 @@ get_device_once(master, slave, fail)
 	if (!fail) return -1;
 	rb_raise(rb_eRuntimeError, "openpty() failed");
     }
+    if (no_mesg(SlaveName, nomesg) == -1) {
+	if (!fail) return -1;
+	rb_raise(rb_eRuntimeError, "can't chmod slave pty");
+    }
 
     return 0;
+
 #elif defined HAVE__GETPTY
     char *name;
+    mode_t mode = nomesg ? 0600 : 0622;
 
-    if (!(name = _getpty(master, O_RDWR, 0622, 0))) {
+    if (!(name = _getpty(master, O_RDWR, mode, 0))) {
 	if (!fail) return -1;
 	rb_raise(rb_eRuntimeError, "_getpty() failed");
     }
 
     *slave = open(name, O_RDWR);
-    strcpy(SlaveName, name);
+    strlcpy(SlaveName, name, DEVICELEN);
 
     return 0;
-#else /* HAVE__GETPTY */
-    int	 i,j;
-
-#ifdef HAVE_PTSNAME
-    char *pn;
+#elif defined(HAVE_PTSNAME)
+    int	 masterfd = -1, slavefd = -1;
+    char *slavedevice;
     void (*s)();
 
     extern char *ptsname(int);
     extern int unlockpt(int);
     extern int grantpt(int);
 
-    if((i = open("/dev/ptmx", O_RDWR, 0)) != -1) {
-	s = signal(SIGCHLD, SIG_DFL);
-	if(grantpt(i) != -1) {
-	    signal(SIGCHLD, s);
-	    if(unlockpt(i) != -1) {
-		if((pn = ptsname(i)) != NULL) {
-		    if((j = open(pn, O_RDWR, 0)) != -1) {
+    if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
+    s = signal(SIGCHLD, SIG_DFL);
+    if(grantpt(masterfd) == -1) goto error;
+    signal(SIGCHLD, s);
+    if(unlockpt(masterfd) == -1) goto error;
+    if((slavedevice = ptsname(masterfd)) == NULL) goto error;
+    if (no_mesg(slavedevice, nomesg) == -1) goto error;
+    if((slavefd = open(slavedevice, O_RDWR, 0)) == -1) goto error;
 #if defined I_PUSH && !defined linux
-			if(ioctl(j, I_PUSH, "ptem") != -1) {
-			    if(ioctl(j, I_PUSH, "ldterm") != -1) {
-				ioctl(j, I_PUSH, "ttcompat");
+    if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
+    if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
+    ioctl(slavefd, I_PUSH, "ttcompat");
 #endif
-				*master = i;
-				*slave = j;
-				strcpy(SlaveName, pn);
-				return 0;
-#if defined I_PUSH && !defined linux
-			    }
-			}
-#endif
-		    }
-		}
-	    }
-	}
-	close(i);
-    }
-    if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
+    *master = masterfd;
+    *slave = slavefd;
+    strlcpy(SlaveName, slavedevice, DEVICELEN);
+    return 0;
+
+  error:
+    if (slavefd != -1) close(slavefd);
+    if (masterfd != -1) close(masterfd);
+    if (fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     return -1;
 #else
-    char **p;
+    int	 masterfd = -1, slavefd = -1;
+    const char *const *p;
     char MasterName[DEVICELEN];
 
     for (p = deviceNo; *p != NULL; p++) {
-	sprintf(MasterName,MasterDevice,*p);
-	if ((i = open(MasterName,O_RDWR,0)) >= 0) {
-	    *master = i;
-	    sprintf(SlaveName,SlaveDevice,*p);
-	    if ((j = open(SlaveName,O_RDWR,0)) >= 0) {
-		*slave = j;
-		chown(SlaveName, getuid(), getgid());
-		chmod(SlaveName, 0622);
+	snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
+	if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) {
+	    *master = masterfd;
+	    snprintf(SlaveName, DEVICELEN, SlaveDevice, *p);
+	    if ((slavefd = open(SlaveName,O_RDWR,0)) >= 0) {
+		*slave = slavefd;
+		if (chown(SlaveName, getuid(), getgid()) != 0) goto error;
+		if (chmod(SlaveName, nomesg ? 0600 : 0622) != 0) goto error;
 		return 0;
 	    }
-	    close(i);
+	    close(masterfd);
 	}
     }
+  error:
+    if (slavefd != -1) close(slavefd);
+    if (masterfd != -1) close(masterfd);
     if (fail) rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
     return -1;
 #endif
-#endif
 }
 
 static void
-getDevice(master, slave)
-    int *master, *slave;
+getDevice(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg)
 {
-    if (get_device_once(master, slave, 0)) {
+    if (get_device_once(master, slave, SlaveName, nomesg, 0)) {
 	rb_gc();
-	get_device_once(master, slave, 1);
+	get_device_once(master, slave, SlaveName, nomesg, 1);
     }
 }
 
-/* ruby function: getpty */
 static VALUE
-pty_getpty(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pty_close_pty(VALUE assoc)
+{
+    VALUE io;
+    int i;
+
+    for (i = 0; i < 2; i++) {
+        io = rb_ary_entry(assoc, i);
+        if (TYPE(io) == T_FILE && 0 <= RFILE(io)->fptr->fd)
+            rb_io_close(io);
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   PTY.open   => [master_io, slave_file]
+ *   PTY.open {|master_io, slave_file| ... }    => block value
+ *
+ * Allocates a pty (pseudo-terminal).
+ *
+ * It returns an array which contains an IO object and a File object.
+ * The former is the master of the pty.
+ * The latter is the slave of the pty.
+ *
+ * If a block is given, it yields the array instead of return.
+ * The value of the block is returned.
+ * master_io and slave_file is closed when return if they are not closed.
+ *
+ * The path name of the terminal device can be gotten by slave_file.path.
+ *
+ *   PTY.open {|m, s|
+ *     p m      #=> #<IO:masterpty:/dev/pts/1>
+ *     p s      #=> #<File:/dev/pts/1>
+ *     p s.path #=> "/dev/pts/1"
+ *   }
+ *
+ *   # Change the buffering type in factor command,
+ *   # assuming that factor uses stdio for stdout buffering.
+ *   # If IO.pipe is used instead of PTY.open,
+ *   # this code deadlocks because factor's stdout is fully buffered.
+ *   m, s = PTY.open
+ *   system("stty raw", :in=>s) # disable newline conversion.
+ *   r, w = IO.pipe
+ *   pid = spawn("factor", :in=>r, :out=>s)
+ *   r.close
+ *   s.close
+ *   w.puts "42"
+ *   p m.gets #=> "42: 2 3 7\n"
+ *   w.puts "144"
+ *   p m.gets #=> "144: 2 2 2 2 3 3\n"
+ *   w.close
+ *   # The result of read operation when pty slave is closed is platform dependnet.
+ *   ret = begin
+ *           m.gets          # FreeBSD returns nil.
+ *         rescue Errno::EIO # GNU/Linux raises EIO.
+ *           nil
+ *         end
+ *   p ret #=> nil
+ *
+ */
+static VALUE
+pty_open(VALUE klass)
+{
+    int master_fd, slave_fd;
+    char slavename[DEVICELEN];
+    VALUE master_io, slave_file;
+    rb_io_t *master_fptr, *slave_fptr;
+    VALUE assoc;
+
+    getDevice(&master_fd, &slave_fd, slavename, 1);
+
+    master_io = rb_obj_alloc(rb_cIO);
+    MakeOpenFile(master_io, master_fptr);
+    master_fptr->mode = FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX;
+    master_fptr->fd = master_fd;
+    master_fptr->pathv = rb_obj_freeze(rb_sprintf("masterpty:%s", slavename));
+
+    slave_file = rb_obj_alloc(rb_cFile);
+    MakeOpenFile(slave_file, slave_fptr);
+    slave_fptr->mode = FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX | FMODE_TTY;
+    slave_fptr->fd = slave_fd;
+    slave_fptr->pathv = rb_obj_freeze(rb_str_new_cstr(slavename));
+
+    assoc = rb_assoc_new(master_io, slave_file);
+    if (rb_block_given_p()) {
+	return rb_ensure(rb_yield, assoc, pty_close_pty, assoc);
+    }
+    return assoc;
+}
+
+static VALUE
+pty_detach_process(struct pty_info *info)
+{
+    rb_detach_process(info->child_pid);
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   PTY.spawn(command...) {|r, w, pid| ... }   => nil
+ *   PTY.spawn(command...)                      => r, w, pid
+ *   PTY.getpty(command...) {|r, w, pid| ... }  => nil
+ *   PTY.getpty(command...)                     => r, w, pid
+ *
+ * spawns the specified command on a newly allocated pty.
+ *
+ * The command's controlling tty is set to the slave device of the pty.
+ * Also its standard input/output/error is redirected to the slave device.
+ *
+ * PTY.spawn returns two IO objects and PID.
+ * PID is the process ID of the command.
+ * The two IO objects are connected to the master device of the pty.
+ * The first IO object is opened as read mode and
+ * The second is opened as write mode.
+ *
+ * If a block is given, two IO objects and PID is yielded.
+ *
+ */
+static VALUE
+pty_getpty(int argc, VALUE *argv, VALUE self)
 {
     VALUE res;
     struct pty_info info;
-    struct pty_info thinfo;
-    OpenFile *wfptr,*rfptr;
+    rb_io_t *wfptr,*rfptr;
     VALUE rport = rb_obj_alloc(rb_cFile);
     VALUE wport = rb_obj_alloc(rb_cFile);
+    char SlaveName[DEVICELEN];
 
     MakeOpenFile(rport, rfptr);
     MakeOpenFile(wport, wfptr);
 
-    establishShell(argc, argv, &info);
+    establishShell(argc, argv, &info, SlaveName);
 
     rfptr->mode = rb_io_mode_flags("r");
-    rfptr->f = fdopen(info.fd, "r");
-    rfptr->path = strdup(SlaveName);
+    rfptr->fd = info.fd;
+    rfptr->pathv = rb_obj_freeze(rb_str_new_cstr(SlaveName));
 
     wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
-    wfptr->f = fdopen(dup(info.fd), "w");
-    wfptr->path = strdup(SlaveName);
+    wfptr->fd = dup(info.fd);
+    if (wfptr->fd == -1)
+        rb_sys_fail("dup()");
+    wfptr->pathv = rfptr->pathv;
 
     res = rb_ary_new2(3);
     rb_ary_store(res,0,(VALUE)rport);
     rb_ary_store(res,1,(VALUE)wport);
-    rb_ary_store(res,2,INT2FIX(info.child_pid));
-
-    thinfo.thread = rb_thread_create(pty_syswait, (void*)&info);
-    thinfo.child_pid = info.child_pid;
-    rb_thread_schedule();
+    rb_ary_store(res,2,PIDT2NUM(info.child_pid));
 
     if (rb_block_given_p()) {
-	rb_ensure(rb_yield, res, pty_finalize_syswait, (VALUE)&thinfo);
+	rb_ensure(rb_yield, res, pty_detach_process, (VALUE)&info);
 	return Qnil;
     }
     return res;
 }
 
-/* ruby function: protect_signal - obsolete */
-static VALUE
-pty_protect(self)
-    VALUE self;
+static void
+raise_from_check(pid_t pid, int status)
 {
-    rb_warn("PTY::protect_signal is no longer needed");
-    rb_yield(Qnil);
-    return self;
+    const char *state;
+    char buf[1024];
+    VALUE exc;
+
+#if defined(WIFSTOPPED)
+#elif defined(IF_STOPPED)
+#define WIFSTOPPED(status) IF_STOPPED(status)
+#else
+---->> Either IF_STOPPED or WIFSTOPPED is needed <<----
+#endif /* WIFSTOPPED | IF_STOPPED */
+    if (WIFSTOPPED(status)) { /* suspend */
+	state = "stopped";
+    }
+    else if (kill(pid, 0) == 0) {
+	state = "changed";
+    }
+    else {
+	state = "exited";
+    }
+    snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)pid);
+    exc = rb_exc_new2(eChildExited, buf);
+    rb_iv_set(exc, "status", rb_last_status_get());
+    rb_exc_raise(exc);
 }
 
-/* ruby function: reset_signal - obsolete */
+/*
+ * call-seq:
+ *   PTY.check(pid[, raise=false])   => Process::Status or nil
+ *
+ * checks the status of the child process specified by _pid_, and
+ * returns +nil+ if the process is still alive and active.  Otherwise,
+ * returns +Process::Status+ about the process if _raise_ is false, or
+ * +PTY::ChildExited+ exception is raised.
+ */
 static VALUE
-pty_reset_signal(self)
-    VALUE self;
+pty_check(int argc, VALUE *argv, VALUE self)
 {
-    rb_warn("PTY::reset_signal is no longer needed");
-    return self;
+    VALUE pid, exc;
+    pid_t cpid;
+    int status;
+
+    rb_scan_args(argc, argv, "11", &pid, &exc);
+    cpid = rb_waitpid(NUM2PIDT(pid), &status, WNOHANG|WUNTRACED);
+    if (cpid == -1) return Qnil;
+
+    if (!RTEST(exc)) return rb_last_status_get();
+    raise_from_check(cpid, status);
+    return Qnil;		/* not reached */
 }
 
 static VALUE cPTY;
@@ -477,8 +640,8 @@ Init_pty()
     cPTY = rb_define_module("PTY");
     rb_define_module_function(cPTY,"getpty",pty_getpty,-1);
     rb_define_module_function(cPTY,"spawn",pty_getpty,-1);
-    rb_define_module_function(cPTY,"protect_signal",pty_protect,0);
-    rb_define_module_function(cPTY,"reset_signal",pty_reset_signal,0);
+    rb_define_singleton_method(cPTY,"check",pty_check,-1);
+    rb_define_singleton_method(cPTY,"open",pty_open,0);
 
     eChildExited = rb_define_class_under(cPTY,"ChildExited",rb_eRuntimeError);
     rb_define_method(eChildExited,"status",echild_status,0);
diff --git a/ext/pty/script.rb b/ext/pty/script.rb
deleted file mode 100644
index dbb933171f..0000000000
--- a/ext/pty/script.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'pty'
-
-if ARGV.size == 0 then
-  ofile = "typescript"
-else
-  ofile = ARGV[0]
-end
-
-logfile = File.open(ofile,"a")
-
-system "stty -echo raw lnext ^_"
-
-PTY.spawn("/bin/csh") do |r_pty,w_pty,pid|
-
-  Thread.new do
-    while true
-      w_pty.print STDIN.getc.chr
-      w_pty.flush
-    end
-  end
-  
-  begin
-    while true
-      c = r_pty.sysread(512)
-      break if c.nil?
-      print c
-      STDOUT.flush
-      logfile.print c
-    end
-  rescue
-  #  print $@,':',$!,"\n"
-    logfile.close
-  end
-end
-
-system "stty echo -raw lnext ^v"
-
diff --git a/ext/purelib.rb b/ext/purelib.rb
index 10ee06176c..cc1a00bdb2 100644
--- a/ext/purelib.rb
+++ b/ext/purelib.rb
@@ -1,3 +1,17 @@
-if nul = $:.index("-")
-  $:[nul..-1] = ["."]
+nul = nil
+$:.each_with_index {|path, index|
+  if /\A(?:\.\/)*-\z/ =~ path
+    nul = index
+    break
+  end
+}
+if nul
+  removed, $:[nul..-1] = $:[nul..-1], []
+  if defined?(Gem::QuickLoader)
+    removed.each do |path|
+      # replaces a fake rubygems by gem_prelude.rb with an alternative path
+      index = $".index(File.join(path, 'rubygems.rb'))
+      $"[index] = Gem::QuickLoader.path_to_full_rubygems_library if index
+    end
+  end
 end
diff --git a/ext/racc/cparse/.cvsignore b/ext/racc/cparse/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/racc/cparse/.cvsignore
+++ b/ext/racc/cparse/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/racc/cparse/README b/ext/racc/cparse/README
new file mode 100644
index 0000000000..80b4dce311
--- /dev/null
+++ b/ext/racc/cparse/README
@@ -0,0 +1,10 @@
+Racc Runtime README
+===================
+
+This directory contains a runtime library of
+Racc parser generator.  If you want to generate
+your own parser, you must get Racc full package.
+Get it from:
+
+  http://raa.ruby-lang.org/list.rhtml?name=racc
+
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index 18a26f670f..3a2a8ae74e 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -1,9 +1,9 @@
 /*
 
     cparse.c -- Racc Runtime Core
-  
+
     Copyright (c) 1999-2006 Minero Aoki
-  
+
     This library is free software.
     You can distribute/modify this program under the same terms of ruby.
 
@@ -11,8 +11,14 @@
 
 */
 
-#include "ruby.h"
-#include "version.h"
+#include "ruby/ruby.h"
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
 
 /* -----------------------------------------------------------------------
                         Important Constants
@@ -65,9 +71,6 @@ static ID id_d_e_pop;
 #ifndef LONG2NUM
 #  define LONG2NUM(i) INT2NUM(i)
 #endif
-#if RUBY_VERSION_CODE >= 190
-#  define HAVE_RB_BLOCK_CALL 1
-#endif
 
 static ID value_to_id _((VALUE v));
 static inline long num_to_long _((VALUE n));
@@ -88,7 +91,7 @@ num_to_long(VALUE n)
 }
 
 #define AREF(s, idx) \
-    ((0 <= idx && idx < RARRAY(s)->len) ? RARRAY(s)->ptr[idx] : Qnil)
+    ((0 <= idx && idx < RARRAY_LEN(s)) ? RARRAY_PTR(s)[idx] : Qnil)
 
 /* -----------------------------------------------------------------------
                         Parser Stack Interfaces
@@ -101,8 +104,8 @@ static VALUE
 get_stack_tail(VALUE stack, long len)
 {
     if (len < 0) return Qnil;  /* system error */
-    if (len > RARRAY(stack)->len) len = RARRAY(stack)->len;
-    return rb_ary_new4(len, RARRAY(stack)->ptr + RARRAY(stack)->len - len);
+    if (len > RARRAY_LEN(stack)) len = RARRAY_LEN(stack);
+    return rb_ary_new4(len, RARRAY_PTR(stack) + RARRAY_LEN(stack) - len);
 }
 
 static void
@@ -116,10 +119,10 @@ cut_stack_tail(VALUE stack, long len)
 
 #define STACK_INIT_LEN 64
 #define NEW_STACK() rb_ary_new2(STACK_INIT_LEN)
-#define PUSH(s, i) rb_ary_store(s, RARRAY(s)->len, i)
+#define PUSH(s, i) rb_ary_store(s, RARRAY_LEN(s), i)
 #define POP(s) rb_ary_pop(s)
 #define LAST_I(s) \
-    ((RARRAY(s)->len > 0) ? RARRAY(s)->ptr[RARRAY(s)->len - 1] : Qnil)
+    ((RARRAY_LEN(s) > 0) ? RARRAY_PTR(s)[RARRAY_LEN(s) - 1] : Qnil)
 #define GET_TAIL(s, len) get_stack_tail(s, len)
 #define CUT_TAIL(s, len) cut_stack_tail(s, len)
 
@@ -225,7 +228,7 @@ racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug)
     D_puts("starting cparse");
     v->sys_debug = RTEST(sysdebug);
     vparams = initialize_params(vparams, parser, arg, Qnil, Qnil);
-    v->lex_is_iterator = Qfalse;
+    v->lex_is_iterator = FALSE;
     parse_main(v, Qnil, Qnil, 0);
 
     return v->retval;
@@ -242,7 +245,7 @@ racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
     v->sys_debug = RTEST(sysdebug);
     D_puts("start C yyparse");
     vparams = initialize_params(vparams, parser, arg, lexer, lexmid);
-    v->lex_is_iterator = Qtrue;
+    v->lex_is_iterator = TRUE;
     D_puts("params initialized");
     parse_main(v, Qnil, Qnil, 0);
     call_lexer(v);
@@ -290,7 +293,7 @@ lexer_i(VALUE block_args, VALUE data, VALUE self)
     extract_user_token(v, block_args, &tok, &val);
     parse_main(v, tok, val, 1);
     if (v->fin && v->fin != CP_FIN_ACCEPT)
-       rb_iter_break(); 
+       rb_iter_break();
     return Qnil;
 }
 
@@ -329,26 +332,26 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     v->debug = RTEST(rb_ivar_get(parser, id_yydebug));
 
     Check_Type(arg, T_ARRAY);
-    if (!(13 <= RARRAY(arg)->len && RARRAY(arg)->len <= 14))
-        rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY(arg)->len);
-    v->action_table   = assert_array  (RARRAY(arg)->ptr[ 0]);
-    v->action_check   = assert_array  (RARRAY(arg)->ptr[ 1]);
-    v->action_default = assert_array  (RARRAY(arg)->ptr[ 2]);
-    v->action_pointer = assert_array  (RARRAY(arg)->ptr[ 3]);
-    v->goto_table     = assert_array  (RARRAY(arg)->ptr[ 4]);
-    v->goto_check     = assert_array  (RARRAY(arg)->ptr[ 5]);
-    v->goto_default   = assert_array  (RARRAY(arg)->ptr[ 6]);
-    v->goto_pointer   = assert_array  (RARRAY(arg)->ptr[ 7]);
-    v->nt_base        = assert_integer(RARRAY(arg)->ptr[ 8]);
-    v->reduce_table   = assert_array  (RARRAY(arg)->ptr[ 9]);
-    v->token_table    = assert_hash   (RARRAY(arg)->ptr[10]);
-    v->shift_n        = assert_integer(RARRAY(arg)->ptr[11]);
-    v->reduce_n       = assert_integer(RARRAY(arg)->ptr[12]);
-    if (RARRAY(arg)->len > 13) {
-        v->use_result_var = RTEST(RARRAY(arg)->ptr[13]);
+    if (!(13 <= RARRAY_LEN(arg) && RARRAY_LEN(arg) <= 14))
+        rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY_LEN(arg));
+    v->action_table   = assert_array  (RARRAY_PTR(arg)[ 0]);
+    v->action_check   = assert_array  (RARRAY_PTR(arg)[ 1]);
+    v->action_default = assert_array  (RARRAY_PTR(arg)[ 2]);
+    v->action_pointer = assert_array  (RARRAY_PTR(arg)[ 3]);
+    v->goto_table     = assert_array  (RARRAY_PTR(arg)[ 4]);
+    v->goto_check     = assert_array  (RARRAY_PTR(arg)[ 5]);
+    v->goto_default   = assert_array  (RARRAY_PTR(arg)[ 6]);
+    v->goto_pointer   = assert_array  (RARRAY_PTR(arg)[ 7]);
+    v->nt_base        = assert_integer(RARRAY_PTR(arg)[ 8]);
+    v->reduce_table   = assert_array  (RARRAY_PTR(arg)[ 9]);
+    v->token_table    = assert_hash   (RARRAY_PTR(arg)[10]);
+    v->shift_n        = assert_integer(RARRAY_PTR(arg)[11]);
+    v->reduce_n       = assert_integer(RARRAY_PTR(arg)[12]);
+    if (RARRAY_LEN(arg) > 13) {
+        v->use_result_var = RTEST(RARRAY_PTR(arg)[13]);
     }
     else {
-        v->use_result_var = Qtrue;
+        v->use_result_var = TRUE;
     }
 
     v->tstack = v->debug ? NEW_STACK() : Qnil;
@@ -364,7 +367,7 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     v->retval = Qnil;
     v->fin = 0;
 
-    v->lex_is_iterator = Qfalse;
+    v->lex_is_iterator = FALSE;
 
     rb_iv_set(parser, "@vstack", v->vstack);
     if (v->debug) {
@@ -420,12 +423,12 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
                  v->lex_is_iterator ? "yielded" : "returned",
                  rb_class2name(CLASS_OF(block_args)));
     }
-    if (RARRAY(block_args)->len != 2) {
+    if (RARRAY_LEN(block_args) != 2) {
         rb_raise(rb_eArgError,
                  "%s() %s wrong size of array (%ld for 2)",
                  v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
                  v->lex_is_iterator ? "yielded" : "returned",
-                 RARRAY(block_args)->len);
+                 RARRAY_LEN(block_args));
     }
     *tok = AREF(block_args, 0);
     *val = AREF(block_args, 1);
@@ -457,7 +460,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
     if (resume)
         goto resume;
-    
+
     while (1) {
         D_puts("");
         D_puts("---- enter new loop ----");
@@ -516,7 +519,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
       act_fixed:
         D_printf("act=%ld\n", act);
         goto handle_act;
-    
+
       notfound:
         D_puts("(act) not found: use default");
         act_value = AREF(v->action_default, v->curstate);
@@ -561,7 +564,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
   accept:
     if (v->debug) rb_funcall(v->parser, id_d_accept, 0);
-    v->retval = RARRAY(v->vstack)->ptr[0];
+    v->retval = RARRAY_PTR(v->vstack)[0];
     v->fin = CP_FIN_ACCEPT;
     return;
 
@@ -617,11 +620,11 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
         D_puts("(err) found: can handle error token");
         break;
-          
+
       error_pop:
         D_puts("(err) act not found: can't handle error token; pop");
 
-        if (RARRAY(v->state)->len <= 1) {
+        if (RARRAY_LEN(v->state) <= 1) {
             v->retval = Qnil;
             v->fin = CP_FIN_CANTPOP;
             return;
@@ -690,9 +693,9 @@ reduce0(VALUE val, VALUE data, VALUE self)
     VALUE goto_state;
 
     Data_Get_Struct(data, struct cparse_params, v);
-    reduce_len = RARRAY(v->reduce_table)->ptr[v->ruleno];
-    reduce_to  = RARRAY(v->reduce_table)->ptr[v->ruleno+1];
-    method_id  = RARRAY(v->reduce_table)->ptr[v->ruleno+2];
+    reduce_len = RARRAY_PTR(v->reduce_table)[v->ruleno];
+    reduce_to  = RARRAY_PTR(v->reduce_table)[v->ruleno+1];
+    method_id  = RARRAY_PTR(v->reduce_table)[v->ruleno+2];
     len = NUM2LONG(reduce_len);
     mid = value_to_id(method_id);
 
@@ -707,10 +710,10 @@ reduce0(VALUE val, VALUE data, VALUE self)
     else {
         if (mid != id_noreduce) {
             tmp_v = GET_TAIL(v->vstack, len);
-            tmp = RARRAY(tmp_v)->ptr[0];
+            tmp = RARRAY_PTR(tmp_v)[0];
         }
         else {
-            tmp = RARRAY(v->vstack)->ptr[ RARRAY(v->vstack)->len - len ];
+            tmp = RARRAY_PTR(v->vstack)[ RARRAY_LEN(v->vstack) - len ];
         }
         CUT_TAIL(v->vstack, len);
         if (v->debug) {
@@ -739,7 +742,7 @@ reduce0(VALUE val, VALUE data, VALUE self)
     }
 
     /* calculate transition state */
-    if (RARRAY(v->state)->len == 0)
+    if (RARRAY_LEN(v->state) == 0)
         rb_raise(RaccBug, "state stack unexpectedly empty");
     k2 = num_to_long(LAST_I(v->state));
     k1 = num_to_long(reduce_to) - v->nt_base;
diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb
index dd953a7e15..3710f6f7e7 100644
--- a/ext/racc/cparse/extconf.rb
+++ b/ext/racc/cparse/extconf.rb
@@ -1,4 +1,5 @@
 # $Id$
 
 require 'mkmf'
+have_func('rb_block_call', 'ruby/ruby.h')
 create_makefile 'racc/cparse'
diff --git a/ext/readline/.cvsignore b/ext/readline/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/readline/.cvsignore
+++ b/ext/readline/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/readline/README b/ext/readline/README
index 9bbf325c99..57c51b5f5d 100644
--- a/ext/readline/README
+++ b/ext/readline/README
@@ -1,62 +1,10 @@
-Extension for GNU Readline Library
+The Readline module provides interface for GNU Readline.
+This module defines a number of methods to facilitate completion
+and accesses input history from the Ruby interpreter.
+This module supported Edit Line(libedit) too.
+libedit is compatible with GNU Readline.
 
-Example:
+GNU Readline:: http://www.gnu.org/directory/readline.html
+libedit::      http://www.thrysoee.dk/editline/
 
-  require "readline"
-  include Readline
-
-  line = readline("Prompt> ", true)
-
-[Readline]
-
-<module function>
-
-readline(prompt, add_history=nil)
-
-  Reads one line with line editing.  The inputted line is added to the
-  history if add_history is true.
-
-<class methods>
-
-completion_proc = proc
-
-  Specifies a Proc object to determine completion behavior.  It
-  should take input-string, and return an array of completion
-  candidates.
-
-completion_proc
-
-  Returns the completion Proc object.
-
-completion_case_fold = bool
-
-  Sets whether or not to ignore case on completion.
-
-completion_case_fold
-
-  Returns true if completion ignores case.
-
-completion_append_character = char
-
-  Specifies a character to be appended on completion.
-  Nothing will be appended if an empty string ("") or nil is
-  specified.
-
-completion_append_character
-
-  Returns a string containing a character to be appended on
-  completion.  The default is a space (" ").
-
-vi_editing_mode
-
-  Specifies VI editing mode.
-
-emacs_editing_mode
-
-  Specifies Emacs editing mode.
-
-<class constants>
-
-HISTORY
-
-The history buffer.  It behaves just like an array.
+See RDoc for Readline module.
diff --git a/ext/readline/README.ja b/ext/readline/README.ja
index beb951fbf0..5c8e0da508 100644
--- a/ext/readline/README.ja
+++ b/ext/readline/README.ja
@@ -1,63 +1,437 @@
-GNU Readline Library�����Ѥ��뤿��γ�ĥ�⥸�塼��Ǥ���
+GNU Readline �ˤ�륳�ޥ�ɥ饤�����ϥ��󥿥ե��������󶡤���⥸�塼��
+�Ǥ���GNU Readline �θߴ��饤�֥��ΤҤȤĤǤ��� Edit Line(libedit) ��
+���ݡ��Ȥ��Ƥ��ޤ���
 
-require "readline"
-include Readline
+GNU Readline:: http://www.gnu.org/directory/readline.html
+libedit::      http://www.thrysoee.dk/editline/
 
-line = readline("Prompt> ", true)
+Readline.readline ����Ѥ��ƥ桼����������Ϥ�����Ǥ��ޤ������ΤȤ���
+GNU Readline �Τ褦�����Ϥ��䴰��Emacs �Τ褦�ʥ������ʤɤ��Ǥ��ޤ���
 
-�Τ褦�˻��Ѥ��Ƥ���������
+  require "readline"
+  while buf = Readline.readline("> ", true)
+    p buf
+  end
 
-[Readline]
+�桼�������Ϥ������Ƥ�����(�ʲ����ҥ��ȥ�)�Ȥ��Ƶ�Ͽ���뤳�Ȥ��Ǥ��ޤ���
+��� Readline::HISTORY ����Ѥ��ƥҥ��ȥ�˥��������Ǥ��ޤ���
 
-<�⥸�塼��ؿ�>
+  require "readline"
+  while buf = Readline.readline("> ", true)
+    p Readline::HISTORY.to_a
+    print("-> ", buf, "\n")
+  end
 
-readline(prompt, add_history=nil)
+���Ѥ���饤�֥��ˤ�ꡢ�����Ĥ��Υ᥽�åɤ��㳰 NotImplementedError
+��ȯ�����ޤ���
 
-  ������Ϥ��ɤ߹��ߤޤ���
-  add_history��true�ξ�硢�ҥ��ȥ���ɤ߹����ʸ������ɲä��ޤ���
+$SAFE �� 4 �ξ�硢¿���Υ᥽�åɤ��㳰 SecurityError ��ȯ�����ޤ���
 
-<���饹�᥽�å�>
+== Readline �⥸�塼��
 
-completion_proc = proc
+=== �⥸�塼��ؿ�
 
-  �䴰����ư�����ꤹ��Proc���֥������Ȥ���ꤷ�ޤ���
-  proc�ϰ���������ʸ������ꡢ����ʸ�����������֤��褦��
-  ���Ƥ���������
+readline([prompt, [add_hist]]) -> String | nil
 
-completion_proc
+  prompt ����Ϥ����桼������Υ������Ϥ��Ԥ��ޤ���
+  ���󥿡������β����ʤɤǥ桼����ʸ��������Ϥ�������ȡ�
+  ���Ϥ���ʸ������֤��ޤ���
+  ���ΤȤ���add_hist �� true �Ǥ���С����Ϥ���ʸ�����ҥ��ȥ���ɲä��ޤ���
+  
+  �������Ϥ��Ƥ��ʤ����֤� EOF(UNIX �Ǥ� ^D) �����Ϥ���ʤɤǡ�
+  �桼����������Ϥ��ʤ����� nil ���֤��ޤ���
+  
+  ���ξ���������������硢�㳰 IOError ��ȯ�����ޤ���
+  1. ɸ�����Ϥ� tty �Ǥʤ���
+  2. ɸ�����Ϥ򥯥��������Ƥ��롣(isatty(2) �� errno �� EBADF �Ǥ��롣)
+  
+  �ܥ᥽�åɤϥ���åɤ��б����Ƥ��ޤ���
+  �����Ԥ����֤ΤȤ��ϥ���åɥ���ƥ����Ȥ����ؤ���ȯ�����ޤ���
+  
+  ���ϻ��ˤϹ����Խ�����ǽ�ǡ�vi �⡼�ɤ� Emacs �⡼�ɤ��Ѱդ���Ƥ��ޤ���
+  �ǥե���Ȥ� Emacs �⡼�ɤǤ���
+  
+  �ܥ᥽�åɤˤ����ջ��ब����ޤ���
+  �����Ԥ��ξ��֤� ^C ����� ruby ���󥿥ץ꥿����λ����ü�����֤��������ޤ���
+  �������򤹤뤿������3�ĵ󤲤ޤ���
+  
+  * ^C�ˤ��Interrupt�㳰�������ơ�ü�����֤��������ޤ�:
+  
+      require "readline"
+      
+      stty_save = `stty -g`.chomp
+      begin
+        while buf = Readline.readline
+            p buf
+            end
+          rescue Interrupt
+            system("stty", stty_save)
+            exit
+          end
+        end
+      end
+  
+  * INT�����ʥ�������ơ�ü�����֤��������ޤ�:
+  
+      require "readline"
+      
+      stty_save = `stty -g`.chomp
+      trap("INT") { system "stty", stty_save; exit }
+    
+      while buf = Readline.readline
+        p buf
+      end
+  
+  * ñ�� ^C ��̵�뤹����ˡ�⤢��ޤ�:
+  
+      require "readline"
+      
+      trap("INT", "SIG_IGN")
+      
+      while buf = Readline.readline
+        p buf
+      end
+  
+  �������� Readline::HISTORY ����Ѥ��ơ����Ԥ�ľ�������Ϥ�Ʊ�����Ƥ�����
+  ����˻Ĥ��ʤ��Ȥ������Ȥ�Ǥ��ޤ���
+  
+    require "readline"
+      
+    while buf = Readline.readline("> ", true)
+      # p Readline::HISTORY.to_a
+      Readline::HISTORY.pop if /^\s*$/ =~ buf
+   
+      begin
+        if Readline::HISTORY[Readline::HISTORY.length-2] == buf
+          Readline::HISTORY.pop 
+        end
+      rescue IndexError
+      end
+   
+      # p Readline::HISTORY.to_a
+      print "-> ", buf, "\n"
+    end
+  
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
 
-  �䴰����ư�����ꤹ��Proc���֥������Ȥ��֤��ޤ���
+=== ���饹�᥽�å�
 
-completion_case_fold = case_fold
+Readline.input = input
 
-  �䴰������ʸ����ʸ������̤��ʤ���硢true����ꤷ�ޤ���
+  Readline.readline �᥽�åɤǻ��Ѥ��������Ѥ� File ���֥������� input
+  ����ꤷ�ޤ���
 
-completion_case_fold
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
 
-  �䴰������ʸ����ʸ������̤��ʤ���硢true���֤��ޤ���
+Readline.output = output
 
-completion_append_character = char
+  Readline.readline �᥽�åɤǻ��Ѥ�������Ѥ� File ���֥�������
+  output ����ꤷ�ޤ���
 
-  �䴰�����ղä����ʸ����ʸ����ǻ��ꤷ�ޤ�����Ƭ�ΰ�ʸ����
-  ���ꤵ�졢��ʸ���� ("") �ޤ��� nil ����ꤹ��Ȳ����ղ�
-  ����ʤ��ʤ�ޤ���
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
 
-completion_append_character
+Readline.completion_proc = proc
 
-  �䴰�����ղä����ʸ����ʸ������֤��ޤ����ǥե���Ȥ�
-  ���� (" ") �Ǥ���
+  �桼����������Ϥ��䴰������θ����������� Proc ���֥������� proc ��
+  ���ꤷ�ޤ���proc �ϡ����Τ�Τ����ꤷ�Ƥ��ޤ���
+  1. call �᥽�åɤ�����ޤ���
+     call �᥽�åɤ�����ʤ���硢�㳰 ArgumentError ��ȯ�����ޤ���
+  2. �����˥桼�����������ʸ����(��1)����ޤ���
+  3. �����ʸ�����������֤��ޤ���
 
-vi_editing_mode
+  ��1:��/var/lib /v�פθ���䴰��Ԥ��ȡ�
+  �ǥե���ȤǤ� proc �ΰ����ˡ�/v�פ��Ϥ���ޤ���
+  ���Τ褦�ˡ��桼�������Ϥ���ʸ�����
+  Readline.completer_word_break_characters �˴ޤޤ��ʸ���Ƕ��ڤä���
+  �Τ�ñ��Ȥ���ȡ��������뤬����ñ��κǽ��ʸ�����鸽�ߤΥ��������
+  �֤ޤǤ�ʸ���� proc �ΰ������Ϥ���ޤ���
 
-  VI�⡼�ɤˤʤ�ޤ���
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
 
-emacs_editing_mode
+Readline.completion_proc -> proc
 
-  Emacs�⡼�ɤˤʤ�ޤ���
+  �桼����������Ϥ��䴰������θ����������� Proc ���֥������� proc
+  ��������ޤ���
 
-<���饹���>
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completion_case_fold = bool
+
+  �桼�������Ϥ��䴰����ݡ���ʸ���Ⱦ�ʸ������̤��롿���ʤ�����ꤷ�ޤ���
+  bool �����ʤ�ж��̤��ޤ���bool �����ʤ�ж��̤��ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completion_case_fold -> bool
+
+  �桼�������Ϥ��䴰����ݡ���ʸ���Ⱦ�ʸ������̤��롿���ʤ���������ޤ���
+  bool �����ʤ�ж��̤��ޤ���bool �����ʤ�ж��̤��ޤ���
+
+  �ʤ���Readline.completion_case_fold= �᥽�åɤǻ��ꤷ�����֥������Ȥ�
+  ���Τޤ޼�������Τǡ����Τ褦��ư��򤷤ޤ���
+
+    require "readline"
+    
+    Readline.completion_case_fold = "This is a String."
+    p Readline.completion_case_fold # => "This is a String."
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.line_buffer -> string
+
+  ������ι����Τ��֤��ޤ���complete_proc ����ǻ��Ѥ��뤳�Ȥ����ꤷ
+  �Ƥ��ޤ���Readline.line_buffer ��Ĺ���� GNU Readline �� rl_end �ѿ���
+  �ͤȰ��פ��ޤ���
+
+Readline.point -> int
+
+  ���ߤΥ�������ΰ��֤��֤��ޤ���
+  Readline �⥸�塼����䴰�оݤ�ñ��γ��ϰ��֤ξ�����󶡤��Ƥ��ޤ���
+  �������ʤ��顢 completion_proc ��������Ϥ���ñ�� text ��
+  Readline.point ����Ѥ��뤳�Ȥǳ��ϰ��֤�Ƴ�����Ȥ��Ǥ��ޤ���
+
+    ���ϰ��� = ���Ϥ���ñ���Ĺ�� - Readline.point
+
+Readline.vi_editing_mode -> nil
+
+  �Խ��⡼�ɤ� vi �⡼�ɤˤ��ޤ���
+  vi �⡼�ɤξܺ٤ϡ�GNU Readline �Υޥ˥奢��򻲾Ȥ��Ƥ���������
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.vi_editing_mode? -> bool
+
+  �Խ��⡼�ɤ� vi �⡼�ɤξ�硢true ���֤��ޤ��������Ǥʤ���� false
+  ���֤��ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.emacs_editing_mode -> nil
+
+  �Խ��⡼�ɤ� Emacs �⡼�ɤˤ��ޤ���
+  �ǥե���Ȥ� Emacs �⡼�ɤǤ���
+  Emacs �⡼�ɤξܺ٤ϡ�GNU Readline �Υޥ˥奢��򻲾Ȥ��Ƥ���������
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.emacs_editing_mode? -> bool
+
+  �Խ��⡼�ɤ� Emacs �⡼�ɤξ�硢true ���֤��ޤ��������Ǥʤ���� false
+  ���֤��ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completion_append_character = char
+
+  �桼�������Ϥ��䴰����λ�������ˡ��Ǹ���ղä���ʸ�� char ����ꤷ
+  �ޤ���Ⱦ�ѥ��ڡ�����" "�פʤɤ�ñ�����ڤ�ʸ������ꤹ��С�Ϣ³����
+  ���Ϥ���ݤ������Ǥ���
+
+  ������:
+
+    require "readline"
+    
+    Readline.readline("> ", true)
+    Readline.completion_append_character = " "
+
+  �¹���:
+
+    >
+    ������ "/var/li" �����Ϥ��ޤ���
+    
+    > /var/li
+    ������ TAB ���������Ϥ��ޤ���
+    
+    > /var/lib
+    "b" ���䴰���졢�Ǹ�� " " ���ɲä����Τǡ�"/usr" ��Ϣ³�������ϤǤ��ޤ���
+    
+    > /var/lib /usr
+
+  �ʤ���1ʸ���������ꤹ�뤳�ȤϤǤ��ޤ���
+  �㤨�С�"string"����ꤷ�����Ϻǽ��ʸ���Ǥ���"s"��������Ѥ��ޤ���
+
+    require "readline"
+
+    Readline.completion_append_character = "string"
+    p Readline.completion_append_character # => "s"
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completion_append_character -> char
+
+  �桼�������Ϥ��䴰����λ�������ˡ��Ǹ���ղä���ʸ����������ޤ���
+  �ǥե���Ȥ϶��� (" ") �Ǥ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.basic_word_break_characters = string
+
+  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ��������
+  ʸ���� string ����ꤷ�ޤ���
+
+  GNU Readline �Υǥե���Ȥ��ͤϡ�Bash ���䴰�����ǻ��Ѥ��Ƥ���ʸ����
+  " \t\n\"\\'`@$><=;|&{(" (���ڡ�����ޤ�) �ˤʤäƤ��ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.basic_word_break_characters -> string
+
+  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ��������
+  ʸ�����������ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completer_word_break_characters = string
+
+  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ��������
+  ʸ���� string ����ꤷ�ޤ���
+  Readline.basic_word_break_characters= �Ȥΰ㤤�ϡ�
+  GNU Readline �� rl_complete_internal �ؿ��ǻ��Ѥ���뤳�ȤǤ���
+
+  GNU Readline �Υǥե���Ȥ��ͤϡ� 
+  Readline.basic_word_break_characters ��Ʊ���Ǥ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completer_word_break_characters -> string
+
+  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ������줿
+  ʸ�����������ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.basic_quote_characters = string
+
+  ���ڡ����ʤɤ�ñ��ζ��ڤ�򥯥����Ȥ��뤿���ʣ����ʸ���ǹ��������
+  ʸ���� string ����ꤷ�ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.basic_quote_characters -> string
+
+  ���ڡ����ʤɤ�ñ��ζ��ڤ�򥯥����Ȥ��뤿���ʣ����ʸ���ǹ��������
+  ʸ�����������ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completer_quote_characters = string
+
+  �桼�������Ϥ��䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
+  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ���� string ����ꤷ�ޤ���
+  ���ꤷ��ʸ���δ֤Ǥϡ�Readline.completer_word_break_characters=
+  �ǻ��ꤷ��ʸ����˴ޤޤ��ʸ���⡢���̤�ʸ����Ȥ��ư����ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.completer_quote_characters -> string
+
+  �桼�������Ϥ��䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
+  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ�����������ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.filename_quote_characters = string
+
+  �桼�������ϻ��˥ե�����̾���䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
+  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ���� string ����ꤷ�ޤ���
+
+  GNU Readline �Υǥե�����ͤ� nil �Ǥ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+Readline.filename_quote_characters -> string
+
+  �桼�������ϻ��˥ե�����̾���䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
+  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ�����������ޤ���
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+
+  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+
+=== ���饹���
 
 HISTORY
 
-�ҥ��ȥ���Ф������Ϥ���������̤��ƹԤäƤ���������
-�����Ʊ���褦�˰�����褦�ˤʤäƤ��ޤ���
+  ��� HISTORY ����Ѥ��ƥҥ��ȥ�˥��������Ǥ��ޤ���
+  Enumerable �⥸�塼��� extend ���Ƥ��ꡢ
+  ����Τ褦�˿����񤦤��Ȥ��Ǥ��ޤ���
+  �㤨�С�HISTORY[4] �ˤ�� 5 ���ܤ����Ϥ������Ƥ���Ф����Ȥ��Ǥ��ޤ���
+
+    require "readline"
+    
+    Readline::HISTORY.push("a", "b", "c", "d", "e")
+    p Readline::HISTORY[4] # => "e"
+
+  �������Ƥ���᥽�åɤ򼡤˵󤲤ޤ���
+  * HISTORY.to_s -> "HISTORY"
+  * HISTORY[index] -> string
+  * HISTORY[index] = string
+  * HISTORY.push(string[, string, ...]) -> self
+  * HISTORY << string -> self
+  * HISTORY.pop -> string
+  * HISTORY.shift -> string
+  * HISTORY.each -> Enumerator
+  * HISTORY.each { |i| } -> [string]
+  * HISTORY.length -> Integer
+  * HISTORY.empty? -> true or false
+  * HISTORY.delete_at(index) -> string
+  * HISTORY.clear -> self
+
+  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ����Υ᥽�åɤ��㳰 NotImplementedError ��
+  ȯ�����ޤ���
+  * HISTORY[index] = string
+  * HISTORY.pop -> string
+  * HISTORY.shift -> string
+  * HISTORY.delete_at(index) -> string
+  * HISTORY.clear -> self
+
+  $SAFE �� 4 �ξ�硢�ҥ��ȥ�˥������������Ȥ����㳰 SecurityError ��
+  ȯ�����ޤ���
+
+FILENAME_COMPLETION_PROC
+
+  �ե�����̾���䴰��Ԥ� call �᥽�åɤ���ĥ��֥������ȤǤ���
+ 
+  Readline.completion_proc= �ˤ�ꡢ�桼�������ϻ��˥ե�����̾���䴰��
+  �Ԥ��褦�����ꤹ�뤿��˻��Ѥ��뤳�Ȥ����ꤷ�Ƥޤ���
+
+USERNAME_COMPLETION_PROC
+
+  �桼��̾���䴰��Ԥ� call �᥽�åɤ���ĥ��֥������ȤǤ���
+
+  Readline.completion_proc= �ˤ�ꡢ�桼�������ϻ��˥桼��̾���䴰���
+  ���褦�����ꤹ�뤿��˻��Ѥ��뤳�Ȥ����ꤷ�Ƥޤ���
+
+VERSION
+
+  ���Ѥ��Ƥ��� GNU Readline �ޤ��� libedit �ΥС������Ǥ���
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index b820c0b32f..5dc7a6a3ae 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -15,6 +15,14 @@ def have_readline_var(var)
   return have_var(var, $readline_headers)
 end
 
+def have_readline_func(func)
+  return have_func(func, $readline_headers)
+end
+
+def have_readline_macro(macro)
+  return have_macro(macro, $readline_headers)
+end
+
 dir_config('curses')
 dir_config('ncurses')
 dir_config('termcap')
@@ -42,9 +50,11 @@ else
   end
 end
 
-have_func("rl_filename_completion_function")
-have_func("rl_username_completion_function")
-have_func("rl_completion_matches")
+have_readline_func("rl_getc_function")
+have_readline_func("rl_filename_completion_function")
+have_readline_func("rl_username_completion_function")
+have_readline_func("rl_completion_matches")
+have_readline_func("rl_refresh_line")
 have_readline_var("rl_deprep_term_function")
 have_readline_var("rl_completion_append_character")
 have_readline_var("rl_basic_word_break_characters")
@@ -54,11 +64,22 @@ have_readline_var("rl_completer_quote_characters")
 have_readline_var("rl_filename_quote_characters")
 have_readline_var("rl_attempted_completion_over")
 have_readline_var("rl_library_version")
-have_readline_var("rl_event_hook")
-have_func("rl_cleanup_after_signal")
-have_func("rl_clear_signals")
-have_func("rl_vi_editing_mode")
-have_func("rl_emacs_editing_mode")
-have_func("replace_history_entry")
-have_func("remove_history")
+have_readline_var("rl_editing_mode")
+have_readline_var("rl_line_buffer")
+have_readline_var("rl_point")
+# workaround for native windows.
+/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_event_hook")
+/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_sigwinch")
+/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_signals")
+have_readline_func("rl_cleanup_after_signal")
+have_readline_func("rl_clear_signals")
+have_readline_func("rl_set_screen_size")
+have_readline_func("rl_get_screen_size")
+have_readline_func("rl_vi_editing_mode")
+have_readline_func("rl_emacs_editing_mode")
+have_readline_func("replace_history_entry")
+have_readline_func("remove_history")
+have_readline_func("clear_history")
+have_readline_macro("RL_PROMPT_START_IGNORE")
+have_readline_macro("RL_PROMPT_END_IGNORE")
 create_makefile("readline")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 82ddc8a3cb..dccfe5e8b0 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1,10 +1,27 @@
-/* readline.c -- GNU Readline module
-   Copyright (C) 1997-2001  Shugo Maeda */
+/************************************************
 
-#include "config.h"
+  readline.c - GNU Readline module
+
+  $Author$
+  created at: Wed Jan 20 13:59:32 JST 1999
+
+  Copyright (C) 1997-2008  Shugo Maeda
+  Copyright (C) 2008-2009  TAKAO Kouji
+
+  $Id$
+
+  Contact:
+   - TAKAO Kouji <kouji at takao7 dot net> (current maintainer)
+
+************************************************/
+
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
+#include "ruby/config.h"
 #include <errno.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
 #ifdef HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
@@ -16,9 +33,8 @@
 #include <editline/readline.h>
 #endif
 
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -26,11 +42,21 @@
 
 static VALUE mReadline;
 
-#define TOLOWER(c) (isupper(c) ? tolower(c) : c)
+#define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper"
+#ifndef USE_INSERT_IGNORE_ESCAPE
+# if !defined(HAVE_EDITLINE_READLINE_H) && defined(HAVE_RL_PROMPT_START_IGNORE) && defined(HAVE_RL_PROMPT_END_IGNORE)
+#  define USE_INSERT_IGNORE_ESCAPE 1
+# else
+#  define USE_INSERT_IGNORE_ESCAPE 0
+# endif
+#endif
 
 #define COMPLETION_PROC "completion_proc"
 #define COMPLETION_CASE_FOLD "completion_case_fold"
 static ID completion_proc, completion_case_fold;
+#if USE_INSERT_IGNORE_ESCAPE
+static ID id_orig_prompt, id_last_prompt;
+#endif
 
 #ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
 # define rl_filename_completion_function filename_completion_function
@@ -42,19 +68,75 @@ static ID completion_proc, completion_case_fold;
 # define rl_completion_matches completion_matches
 #endif
 
+static int (*history_get_offset_func)(int);
+
 static char **readline_attempted_completion_function(const char *text,
                                                      int start, int end);
 
-#ifdef HAVE_RL_EVENT_HOOK
-#ifdef DOSISH
-#define BUSY_WAIT 1
-#else
+#define OutputStringValue(str) do {\
+    SafeStringValue(str);\
+    str = rb_str_conv_enc(str, rb_enc_get(str), rb_locale_encoding());\
+} while (0)\
+
+
+/*
+ * Document-class: Readline
+ *
+ * The Readline module provides interface for GNU Readline.
+ * This module defines a number of methods to facilitate completion
+ * and accesses input history from the Ruby interpreter.
+ * This module supported Edit Line(libedit) too.
+ * libedit is compatible with GNU Readline.
+ *
+ * GNU Readline:: http://www.gnu.org/directory/readline.html
+ * libedit::      http://www.thrysoee.dk/editline/
+ *
+ * Reads one inputted line with line edit by Readline.readline method.
+ * At this time, the facilitatation completion and the key
+ * bind like Emacs can be operated like GNU Readline.
+ *
+ *   require "readline"
+ *   while buf = Readline.readline("> ", true)
+ *     p buf
+ *   end
+ *
+ * The content that the user input can be recorded to the history.
+ * The history can be accessed by Readline::HISTORY constant.
+ *
+ *   require "readline"
+ *   while buf = Readline.readline("> ", true)
+ *     p Readline::HISTORY.to_a
+ *     print("-> ", buf, "\n")
+ *   end
+ *
+ * Most of methods raise SecurityError exception if $SAFE is 4.
+ *
+ * Documented by TAKAO Kouji <kouji at takao7 dot net>.
+ */
+
+#if defined HAVE_RL_GETC_FUNCTION
+static VALUE readline_instream;
+static ID id_getbyte;
+
+static int readline_getc(FILE *);
+static int
+readline_getc(FILE *input)
+{
+    rb_io_t *ifp = 0;
+    VALUE c;
+    if (!readline_instream) return rl_getc(input);
+    GetOpenFile(readline_instream, ifp);
+    if (rl_instream != ifp->stdio_file) return rl_getc(input);
+    c = rb_funcall(readline_instream, id_getbyte, 0, 0);
+    if (NIL_P(c)) return EOF;
+    return NUM2CHR(c);
+}
+#elif defined HAVE_RL_EVENT_HOOK
 #define BUSY_WAIT 0
-#endif
 
 static int readline_event(void);
 static int
-readline_event()
+readline_event(void)
 {
 #if BUSY_WAIT
     rb_thread_schedule();
@@ -69,37 +151,206 @@ readline_event()
 }
 #endif
 
+#if USE_INSERT_IGNORE_ESCAPE
 static VALUE
-readline_readline(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+insert_ignore_escape(VALUE self, VALUE prompt)
+{
+    VALUE last_prompt, orig_prompt = rb_attr_get(self, id_orig_prompt);
+    int ignoring = 0;
+    const char *s0, *s, *e;
+    long len;
+    static const char ignore_code[2] = {RL_PROMPT_START_IGNORE, RL_PROMPT_END_IGNORE};
+
+    prompt = rb_str_new_shared(prompt);
+    last_prompt = rb_attr_get(self, id_last_prompt);
+    if (orig_prompt == prompt) return last_prompt;
+    len = RSTRING_LEN(prompt);
+    if (NIL_P(last_prompt)) {
+	last_prompt = rb_str_tmp_new(len);
+    }
+
+    s = s0 = RSTRING_PTR(prompt);
+    e = s0 + len;
+    rb_str_set_len(last_prompt, 0);
+    while (s < e && *s) {
+	switch (*s) {
+	  case RL_PROMPT_START_IGNORE:
+	    ignoring = -1;
+	    rb_str_cat(last_prompt, s0, ++s - s0);
+	    s0 = s;
+	    break;
+	  case RL_PROMPT_END_IGNORE:
+	    ignoring = 0;
+	    rb_str_cat(last_prompt, s0, ++s - s0);
+	    s0 = s;
+	    break;
+	  case '\033':
+	    if (++s < e && *s == '[') {
+		rb_str_cat(last_prompt, s0, s - s0 - 1);
+		s0 = s - 1;
+		while (++s < e && *s) {
+		    if (ISALPHA(*s)) {
+			if (!ignoring) {
+			    ignoring = 1;
+			    rb_str_cat(last_prompt, ignore_code+0, 1);
+			}
+			rb_str_cat(last_prompt, s0, ++s - s0);
+			s0 = s;
+			break;
+		    }
+		    else if (!('0' <= *s && *s <= '9' || *s == ';')) {
+			break;
+		    }
+		}
+	    }
+	    break;
+	  default:
+	    if (ignoring > 0) {
+		ignoring = 0;
+		rb_str_cat(last_prompt, ignore_code+1, 1);
+	    }
+	    s++;
+	    break;
+	}
+    }
+    if (ignoring > 0) {
+	ignoring = 0;
+	rb_str_cat(last_prompt, ignore_code+1, 1);
+    }
+    rb_str_cat(last_prompt, s0, s - s0);
+
+    rb_ivar_set(self, id_orig_prompt, prompt);
+    rb_ivar_set(self, id_last_prompt, last_prompt);
+
+    return last_prompt;
+}
+#endif
+
+static VALUE
+readline_get(VALUE prompt)
+{
+    return (VALUE)readline((char *)prompt);
+}
+
+/*
+ * call-seq:
+ *   Readline.readline(prompt = "", add_hist = false) -> string or nil
+ *
+ * Shows the +prompt+ and reads the inputted line with line editing.
+ * The inputted line is added to the history if +add_hist+ is true.
+ *
+ * Returns nil when the inputted line is empty and user inputs EOF
+ * (Presses ^D on UNIX).
+ *
+ * Raises IOError exception if below conditions are satisfied.
+ * 1. stdin is not tty.
+ * 2. stdin was closed. (errno is EBADF after called isatty(2).)
+ *
+ * This method supports thread. Switchs the thread context when waits
+ * inputting line.
+ *
+ * Supports line edit when inputs line. Provides VI and Emacs editing mode.
+ * Default is Emacs editing mode.
+ *
+ * NOTE: Terminates ruby interpreter and does not return the terminal
+ * status after user pressed '^C' when wait inputting line.
+ * Give 3 examples that avoid it.
+ *
+ * * Catches the Interrupt exception by pressed ^C after returns
+ *   terminal status:
+ *
+ *     require "readline"
+ *
+ *     stty_save = `stty -g`.chomp
+ *     begin
+ *       while buf = Readline.readline
+ *           p buf
+ *           end
+ *         rescue Interrupt
+ *           system("stty", stty_save)
+ *           exit
+ *         end
+ *       end
+ *     end
+ *
+ * * Catches the INT signal by pressed ^C after returns terminal
+ *   status:
+ *
+ *     require "readline"
+ *
+ *     stty_save = `stty -g`.chomp
+ *     trap("INT") { system "stty", stty_save; exit }
+ *
+ *     while buf = Readline.readline
+ *       p buf
+ *     end
+ *
+ * * Ignores pressing ^C:
+ *
+ *     require "readline"
+ *
+ *     trap("INT", "SIG_IGN")
+ *
+ *     while buf = Readline.readline
+ *       p buf
+ *     end
+ *
+ * Can make as follows with Readline::HISTORY constant.
+ * It does not record to the history if the inputted line is empty or
+ * the same it as last one.
+ *
+ *   require "readline"
+ *
+ *   while buf = Readline.readline("> ", true)
+ *     # p Readline::HISTORY.to_a
+ *     Readline::HISTORY.pop if /^\s*$/ =~ buf
+ *
+ *     begin
+ *       if Readline::HISTORY[Readline::HISTORY.length-2] == buf
+ *         Readline::HISTORY.pop
+ *       end
+ *     rescue IndexError
+ *     end
+ *
+ *     # p Readline::HISTORY.to_a
+ *     print "-> ", buf, "\n"
+ *   end
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_readline(int argc, VALUE *argv, VALUE self)
 {
     VALUE tmp, add_hist, result;
     char *prompt = NULL;
     char *buff;
     int status;
-    OpenFile *ofp, *ifp;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
-	SafeStringValue(tmp);
-	prompt = RSTRING(tmp)->ptr;
+	OutputStringValue(tmp);
+#if USE_INSERT_IGNORE_ESCAPE
+	tmp = insert_ignore_escape(self, tmp);
+	rb_str_locktmp(tmp);
+#endif
+	prompt = RSTRING_PTR(tmp);
     }
 
-    if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed");
+    if (!isatty(fileno(rl_instream)) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin");
 
-    Check_Type(rb_stdout, T_FILE);
-    GetOpenFile(rb_stdout, ofp);
-    rl_outstream = GetWriteFile(ofp);
-    Check_Type(rb_stdin, T_FILE);
-    GetOpenFile(rb_stdin, ifp);
-    rl_instream = GetReadFile(ifp);
-    buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt,
-                              &status);
+#ifdef _WIN32
+    rl_prep_terminal(1);
+#endif
+    buff = (char*)rb_protect(readline_get, (VALUE)prompt, &status);
+#if USE_INSERT_IGNORE_ESCAPE
+    if (prompt) {
+	rb_str_unlocktmp(tmp);
+    }
+#endif
     if (status) {
 #if defined HAVE_RL_CLEANUP_AFTER_SIGNAL
         /* restore terminal mode and signal handler*/
+        rl_free_line_state();
         rl_cleanup_after_signal();
 #elif defined HAVE_RL_DEPREP_TERM_FUNCTION
         /* restore terminal mode */
@@ -115,60 +366,191 @@ readline_readline(argc, argv, self)
     if (RTEST(add_hist) && buff) {
 	add_history(buff);
     }
-    if (buff)
-	result = rb_tainted_str_new2(buff);
+    if (buff) {
+	result = rb_locale_str_new_cstr(buff);
+    }
     else
 	result = Qnil;
     if (buff) free(buff);
     return result;
 }
 
+/*
+ * call-seq:
+ *   Readline.input = input
+ *
+ * Specifies a File object +input+ that is input stream for
+ * Readline.readline method.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_s_set_input(VALUE self, VALUE input)
+{
+    rb_io_t *ifp;
+
+    rb_secure(4);
+    Check_Type(input, T_FILE);
+    GetOpenFile(input, ifp);
+    rl_instream = rb_io_stdio_file(ifp);
+#ifdef HAVE_RL_GETC_FUNCTION
+    readline_instream = input;
+#endif
+    return input;
+}
+
+/*
+ * call-seq:
+ *   Readline.output = output
+ *
+ * Specifies a File object +output+ that is output stream for
+ * Readline.readline method.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_completion_proc(self, proc)
-    VALUE self;
-    VALUE proc;
+readline_s_set_output(VALUE self, VALUE output)
+{
+    rb_io_t *ofp;
+
+    rb_secure(4);
+    Check_Type(output, T_FILE);
+    GetOpenFile(output, ofp);
+    rl_outstream = rb_io_stdio_file(ofp);
+    return output;
+}
+
+/*
+ * call-seq:
+ *   Readline.completion_proc = proc
+ *
+ * Specifies a Proc object +proc+ to determine completion behavior. It
+ * should take input-string, and return an array of completion
+ * candidates.
+ *
+ * Set default if +proc+ is nil.
+ *
+ * Raises ArgumentError exception if +proc+ does not respond to call method.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_s_set_completion_proc(VALUE self, VALUE proc)
 {
     rb_secure(4);
-    if (!rb_respond_to(proc, rb_intern("call")))
+    if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
 	rb_raise(rb_eArgError, "argument must respond to `call'");
     return rb_ivar_set(mReadline, completion_proc, proc);
 }
 
+/*
+ * call-seq:
+ *   Readline.completion_proc -> proc
+ *
+ * Returns the completion Proc object.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_completion_proc(self)
-    VALUE self;
+readline_s_get_completion_proc(VALUE self)
 {
     rb_secure(4);
     return rb_attr_get(mReadline, completion_proc);
 }
 
+/*
+ * call-seq:
+ *   Readline.completion_case_fold = bool
+ *
+ * Sets whether or not to ignore case on completion.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_completion_case_fold(self, val)
-    VALUE self;
-    VALUE val;
+readline_s_set_completion_case_fold(VALUE self, VALUE val)
 {
     rb_secure(4);
     return rb_ivar_set(mReadline, completion_case_fold, val);
 }
 
+/*
+ * call-seq:
+ *   Readline.completion_case_fold -> bool
+ *
+ * Returns true if completion ignores case. If no, returns false.
+ *
+ * NOTE: Returns the same object that is specified by
+ * Readline.completion_case_fold= method.
+ *
+ *   require "readline"
+ *
+ *   Readline.completion_case_fold = "This is a String."
+ *   p Readline.completion_case_fold # => "This is a String."
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_completion_case_fold(self)
-    VALUE self;
+readline_s_get_completion_case_fold(VALUE self)
 {
     rb_secure(4);
     return rb_attr_get(mReadline, completion_case_fold);
 }
 
+#ifdef HAVE_RL_LINE_BUFFER
+/*
+ * call-seq:
+ *   Readline.line_buffer -> string
+ *
+ * Returns the full line that is being edited. This is useful from
+ * within the complete_proc for determining the context of the
+ * completion request.
+ *
+ * The length of +Readline.line_buffer+ and GNU Readline's rl_end are
+ * same.
+ */
+static VALUE
+readline_s_get_line_buffer(VALUE self)
+{
+    rb_secure(4);
+    if (rl_line_buffer == NULL)
+	return Qnil;
+    return rb_locale_str_new_cstr(rl_line_buffer);
+}
+#else
+#define readline_s_get_line_buffer rb_f_notimplement
+#endif
+
+#ifdef HAVE_RL_POINT
+/*
+ * call-seq:
+ *   Readline.point -> int
+ *
+ * Returns the index of the current cursor position in
+ * +Readline.line_buffer+.
+ *
+ * The index in +Readline.line_buffer+ which matches the start of
+ * input-string passed to completion_proc is computed by subtracting
+ * the length of input-string from +Readline.point+.
+ *
+ *   start = (the length of input-string) - Readline.point
+ */
+static VALUE
+readline_s_get_point(VALUE self)
+{
+    rb_secure(4);
+    return INT2NUM(rl_point);
+}
+#else
+#define readline_s_get_point rb_f_notimplement
+#endif
+
 static char **
-readline_attempted_completion_function(text, start, end)
-    const char *text;
-    int start;
-    int end;
+readline_attempted_completion_function(const char *text, int start, int end)
 {
     VALUE proc, ary, temp;
     char **result;
     int case_fold;
-    int i, matches;
+    long i, matches;
 
     proc = rb_attr_get(mReadline, completion_proc);
     if (NIL_P(proc))
@@ -177,17 +559,17 @@ readline_attempted_completion_function(text, start, end)
     rl_attempted_completion_over = 1;
 #endif
     case_fold = RTEST(rb_attr_get(mReadline, completion_case_fold));
-    ary = rb_funcall(proc, rb_intern("call"), 1, rb_tainted_str_new2(text));
+    ary = rb_funcall(proc, rb_intern("call"), 1, rb_locale_str_new_cstr(text));
     if (TYPE(ary) != T_ARRAY)
 	ary = rb_Array(ary);
-    matches = RARRAY(ary)->len;
+    matches = RARRAY_LEN(ary);
     if (matches == 0)
 	return NULL;
     result = ALLOC_N(char *, matches + 2);
     for (i = 0; i < matches; i++) {
-	temp = rb_obj_as_string(RARRAY(ary)->ptr[i]);
-	result[i + 1] = ALLOC_N(char, RSTRING(temp)->len + 1);
-	strcpy(result[i + 1], RSTRING(temp)->ptr);
+	temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
+	result[i + 1] = ALLOC_N(char, RSTRING_LEN(temp) + 1);
+	strcpy(result[i + 1], RSTRING_PTR(temp));
     }
     result[matches + 1] = NULL;
 
@@ -226,304 +608,581 @@ readline_attempted_completion_function(text, start, end)
     return result;
 }
 
+#ifdef HAVE_RL_SET_SCREEN_SIZE
+/*
+ * call-seq:
+ *   Readline.set_screen_size(rows, columns) -> self
+ *
+ * Set terminal size to +rows+ and +columns+.
+ *
+ * See GNU Readline's rl_set_screen_size function.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_s_set_screen_size(VALUE self, VALUE rows, VALUE columns)
+{
+    rb_secure(4);
+    rl_set_screen_size(NUM2INT(rows), NUM2INT(columns));
+    return self;
+}
+#else
+#define readline_s_set_screen_size rb_f_notimplement
+#endif
+
+#ifdef HAVE_RL_GET_SCREEN_SIZE
+/*
+ * call-seq:
+ *   Readline.get_screen_size -> [rows, columns]
+ *
+ * Returns the terminal's rows and columns.
+ *
+ * See GNU Readline's rl_get_screen_size function.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_vi_editing_mode(self)
-    VALUE self;
+readline_s_get_screen_size(VALUE self)
 {
+    int rows, columns;
+    VALUE res;
+
+    rb_secure(4);
+    rl_get_screen_size(&rows, &columns);
+    res = rb_ary_new();
+    rb_ary_push(res, INT2NUM(rows));
+    rb_ary_push(res, INT2NUM(columns));
+    return res;
+}
+#else
+#define readline_s_get_screen_size rb_f_notimplement
+#endif
+
 #ifdef HAVE_RL_VI_EDITING_MODE
+/*
+ * call-seq:
+ *   Readline.vi_editing_mode -> nil
+ *
+ * Specifies VI editing mode. See the manual of GNU Readline for
+ * details of VI editing mode.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_s_vi_editing_mode(VALUE self)
+{
     rb_secure(4);
     rl_vi_editing_mode(1,0);
     return Qnil;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_VI_EDITING_MODE */
 }
+#else
+#define readline_s_vi_editing_mode rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_EDITING_MODE
+/*
+ * call-seq:
+ *   Readline.vi_editing_mode? -> bool
+ *
+ * Returns true if vi mode is active. Returns false if not.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_emacs_editing_mode(self)
-    VALUE self;
+readline_s_vi_editing_mode_p(VALUE self)
 {
+    rb_secure(4);
+    return rl_editing_mode == 0 ? Qtrue : Qfalse;
+}
+#else
+#define readline_s_vi_editing_mode_p rb_f_notimplement
+#endif
+
 #ifdef HAVE_RL_EMACS_EDITING_MODE
+/*
+ * call-seq:
+ *   Readline.emacs_editing_mode -> nil
+ *
+ * Specifies Emacs editing mode. The default is this mode. See the
+ * manual of GNU Readline for details of Emacs editing mode.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_s_emacs_editing_mode(VALUE self)
+{
     rb_secure(4);
     rl_emacs_editing_mode(1,0);
     return Qnil;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_EMACS_EDITING_MODE */
 }
+#else
+#define readline_s_emacs_editing_mode rb_f_notimplement
+#endif
 
+#ifdef  HAVE_RL_EDITING_MODE
+/*
+ * call-seq:
+ *   Readline.emacs_editing_mode? -> bool
+ *
+ * Returns true if emacs mode is active. Returns false if not.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_completion_append_character(self, str)
-    VALUE self, str;
+readline_s_emacs_editing_mode_p(VALUE self)
 {
+    rb_secure(4);
+    return rl_editing_mode == 1 ? Qtrue : Qfalse;
+}
+#else
+#define readline_s_emacs_editing_mode_p rb_f_notimplement
+#endif
+
 #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+/*
+ * call-seq:
+ *   Readline.completion_append_character = char
+ *
+ * Specifies a character to be appended on completion.
+ * Nothing will be appended if an empty string ("") or nil is
+ * specified.
+ *
+ * For example:
+ *   require "readline"
+ *
+ *   Readline.readline("> ", true)
+ *   Readline.completion_append_character = " "
+ *
+ * Result:
+ *   >
+ *   Input "/var/li".
+ *
+ *   > /var/li
+ *   Press TAB key.
+ *
+ *   > /var/lib
+ *   Completes "b" and appends " ". So, you can continuously input "/usr".
+ *
+ *   > /var/lib /usr
+ *
+ * NOTE: Only one character can be specified. When "string" is
+ * specified, sets only "s" that is the first.
+ *
+ *   require "readline"
+ *
+ *   Readline.completion_append_character = "string"
+ *   p Readline.completion_append_character # => "s"
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_s_set_completion_append_character(VALUE self, VALUE str)
+{
     rb_secure(4);
     if (NIL_P(str)) {
 	rl_completion_append_character = '\0';
     }
     else {
-	SafeStringValue(str);
-	if (RSTRING(str)->len == 0) {
+	OutputStringValue(str);
+	if (RSTRING_LEN(str) == 0) {
 	    rl_completion_append_character = '\0';
 	} else {
-	    rl_completion_append_character = RSTRING(str)->ptr[0];
+	    rl_completion_append_character = RSTRING_PTR(str)[0];
 	}
     }
     return self;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
 }
+#else
+#define readline_s_set_completion_append_character rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+/*
+ * call-seq:
+ *   Readline.completion_append_character -> char
+ *
+ * Returns a string containing a character to be appended on
+ * completion. The default is a space (" ").
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_completion_append_character(self)
-    VALUE self;
+readline_s_get_completion_append_character(VALUE self)
 {
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-    VALUE str;
+    char buf[1];
 
     rb_secure(4);
     if (rl_completion_append_character == '\0')
 	return Qnil;
 
-    str = rb_str_new("", 1);
-    RSTRING(str)->ptr[0] = rl_completion_append_character;
-    return str;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
+    buf[0] = (char) rl_completion_append_character;
+    return rb_locale_str_new(buf, 1);
 }
+#else
+#define readline_s_get_completion_append_character rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.basic_word_break_characters = string
+ *
+ * Sets the basic list of characters that signal a break between words
+ * for the completer routine. The default is the characters which
+ * break words for completion in Bash: "\t\n\"\\'`@$><=;|&{(".
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_basic_word_break_characters(self, str)
-    VALUE self, str;
+readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
     static char *basic_word_break_characters = NULL;
 
     rb_secure(4);
-    SafeStringValue(str);
+    OutputStringValue(str);
     if (basic_word_break_characters == NULL) {
 	basic_word_break_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
+	    ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(basic_word_break_characters, char, RSTRING(str)->len + 1);
+	REALLOC_N(basic_word_break_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(basic_word_break_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    basic_word_break_characters[RSTRING(str)->len] = '\0';
+	    RSTRING_PTR(str), RSTRING_LEN(str));
+    basic_word_break_characters[RSTRING_LEN(str)] = '\0';
     rl_basic_word_break_characters = basic_word_break_characters;
     return self;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
 }
+#else
+#define readline_s_set_basic_word_break_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.basic_word_break_characters -> string
+ *
+ * Gets the basic list of characters that signal a break between words
+ * for the completer routine.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_basic_word_break_characters(self, str)
-    VALUE self, str;
+readline_s_get_basic_word_break_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
     rb_secure(4);
     if (rl_basic_word_break_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_basic_word_break_characters);
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+    return rb_locale_str_new_cstr(rl_basic_word_break_characters);
 }
+#else
+#define readline_s_get_basic_word_break_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.completer_word_break_characters = string
+ *
+ * Sets the basic list of characters that signal a break between words
+ * for rl_complete_internal(). The default is the value of
+ * Readline.basic_word_break_characters.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_completer_word_break_characters(self, str)
-    VALUE self, str;
+readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
     static char *completer_word_break_characters = NULL;
 
     rb_secure(4);
-    SafeStringValue(str);
+    OutputStringValue(str);
     if (completer_word_break_characters == NULL) {
 	completer_word_break_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
+	    ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(completer_word_break_characters, char, RSTRING(str)->len + 1);
+	REALLOC_N(completer_word_break_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(completer_word_break_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    completer_word_break_characters[RSTRING(str)->len] = '\0';
+	    RSTRING_PTR(str), RSTRING_LEN(str));
+    completer_word_break_characters[RSTRING_LEN(str)] = '\0';
     rl_completer_word_break_characters = completer_word_break_characters;
     return self;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
 }
+#else
+#define readline_s_set_completer_word_break_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.completer_word_break_characters -> string
+ *
+ * Gets the basic list of characters that signal a break between words
+ * for rl_complete_internal().
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_completer_word_break_characters(self, str)
-    VALUE self, str;
+readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
     rb_secure(4);
     if (rl_completer_word_break_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_completer_word_break_characters);
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+    return rb_locale_str_new_cstr(rl_completer_word_break_characters);
 }
+#else
+#define readline_s_get_completer_word_break_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.basic_quote_characters = string
+ *
+ * Sets a list of quote characters which can cause a word break.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_basic_quote_characters(self, str)
-    VALUE self, str;
+readline_s_set_basic_quote_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
     static char *basic_quote_characters = NULL;
 
     rb_secure(4);
-    SafeStringValue(str);
+    OutputStringValue(str);
     if (basic_quote_characters == NULL) {
 	basic_quote_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
+	    ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(basic_quote_characters, char, RSTRING(str)->len + 1);
+	REALLOC_N(basic_quote_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(basic_quote_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    basic_quote_characters[RSTRING(str)->len] = '\0';
+	    RSTRING_PTR(str), RSTRING_LEN(str));
+    basic_quote_characters[RSTRING_LEN(str)] = '\0';
     rl_basic_quote_characters = basic_quote_characters;
 
     return self;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
 }
+#else
+#define readline_s_set_basic_quote_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.basic_quote_characters -> string
+ *
+ * Gets a list of quote characters which can cause a word break.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_basic_quote_characters(self, str)
-    VALUE self, str;
+readline_s_get_basic_quote_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
     rb_secure(4);
     if (rl_basic_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_basic_quote_characters);
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+    return rb_locale_str_new_cstr(rl_basic_quote_characters);
 }
+#else
+#define readline_s_get_basic_quote_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.completer_quote_characters = string
+ *
+ * Sets a list of characters which can be used to quote a substring of
+ * the line. Completion occurs on the entire substring, and within
+ * the substring Readline.completer_word_break_characters are treated
+ * as any other character, unless they also appear within this list.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_completer_quote_characters(self, str)
-    VALUE self, str;
+readline_s_set_completer_quote_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
     static char *completer_quote_characters = NULL;
 
     rb_secure(4);
-    SafeStringValue(str);
+    OutputStringValue(str);
     if (completer_quote_characters == NULL) {
 	completer_quote_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
+	    ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(completer_quote_characters, char, RSTRING(str)->len + 1);
+	REALLOC_N(completer_quote_characters, char, RSTRING_LEN(str) + 1);
     }
-    strncpy(completer_quote_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    completer_quote_characters[RSTRING(str)->len] = '\0';
+    strncpy(completer_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
+    completer_quote_characters[RSTRING_LEN(str)] = '\0';
     rl_completer_quote_characters = completer_quote_characters;
 
     return self;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
 }
+#else
+#define readline_s_set_completer_quote_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.completer_quote_characters -> string
+ *
+ * Gets a list of characters which can be used to quote a substring of
+ * the line.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_completer_quote_characters(self, str)
-    VALUE self, str;
+readline_s_get_completer_quote_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
     rb_secure(4);
     if (rl_completer_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_completer_quote_characters);
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+    return rb_locale_str_new_cstr(rl_completer_quote_characters);
 }
+#else
+#define readline_s_get_completer_quote_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.filename_quote_characters = string
+ *
+ * Sets a list of characters that cause a filename to be quoted by the completer
+ * when they appear in a completed filename. The default is nil.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_set_filename_quote_characters(self, str)
-    VALUE self, str;
+readline_s_set_filename_quote_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
     static char *filename_quote_characters = NULL;
 
     rb_secure(4);
-    SafeStringValue(str);
+    OutputStringValue(str);
     if (filename_quote_characters == NULL) {
 	filename_quote_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
+	    ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(filename_quote_characters, char, RSTRING(str)->len + 1);
+	REALLOC_N(filename_quote_characters, char, RSTRING_LEN(str) + 1);
     }
-    strncpy(filename_quote_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    filename_quote_characters[RSTRING(str)->len] = '\0';
+    strncpy(filename_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
+    filename_quote_characters[RSTRING_LEN(str)] = '\0';
     rl_filename_quote_characters = filename_quote_characters;
 
     return self;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
 }
+#else
+#define readline_s_set_filename_quote_characters rb_f_notimplement
+#endif
 
+#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
+/*
+ * call-seq:
+ *   Readline.filename_quote_characters -> string
+ *
+ * Gets a list of characters that cause a filename to be quoted by the completer
+ * when they appear in a completed filename.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
 static VALUE
-readline_s_get_filename_quote_characters(self, str)
-    VALUE self, str;
+readline_s_get_filename_quote_characters(VALUE self, VALUE str)
 {
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
     rb_secure(4);
     if (rl_filename_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_filename_quote_characters);
+    return rb_locale_str_new_cstr(rl_filename_quote_characters);
+}
 #else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+#define readline_s_get_filename_quote_characters rb_f_notimplement
+#endif
+
+#ifdef HAVE_RL_REFRESH_LINE
+/*
+ * call-seq:
+ *   Readline.refresh_line -> nil
+ *
+ * Clear the current input line.
+ *
+ * Raises SecurityError exception if $SAFE is 4.
+ */
+static VALUE
+readline_s_refresh_line(VALUE self)
+{
+    rb_secure(4);
+    rl_refresh_line(0, 0);
+    return Qnil;
 }
+#else
+#define readline_s_refresh_line rb_f_notimplement
+#endif
 
 static VALUE
-hist_to_s(self)
-    VALUE self;
+hist_to_s(VALUE self)
+{
+    return rb_str_new_cstr("HISTORY");
+}
+
+static int
+history_get_offset_history_base(int offset)
 {
-    return rb_str_new2("HISTORY");
+    return history_base + offset;
+}
+
+static int
+history_get_offset_0(int offset)
+{
+    return offset;
 }
 
 static VALUE
-hist_get(self, index)
-    VALUE self;
-    VALUE index;
+hist_get(VALUE self, VALUE index)
 {
-    HIST_ENTRY *entry;
+    HIST_ENTRY *entry = NULL;
     int i;
 
     rb_secure(4);
@@ -531,71 +1190,65 @@ hist_get(self, index)
     if (i < 0) {
         i += history_length;
     }
-    entry = history_get(history_base + i);
+    if (i >= 0) {
+	entry = history_get(history_get_offset_func(i));
+    }
     if (entry == NULL) {
 	rb_raise(rb_eIndexError, "invalid index");
     }
-    return rb_tainted_str_new2(entry->line);
+    return rb_locale_str_new_cstr(entry->line);
 }
 
+#ifdef HAVE_REPLACE_HISTORY_ENTRY
 static VALUE
-hist_set(self, index, str)
-    VALUE self;
-    VALUE index;
-    VALUE str;
+hist_set(VALUE self, VALUE index, VALUE str)
 {
-#ifdef HAVE_REPLACE_HISTORY_ENTRY
-    HIST_ENTRY *entry;
+    HIST_ENTRY *entry = NULL;
     int i;
 
     rb_secure(4);
     i = NUM2INT(index);
-    SafeStringValue(str);
+    OutputStringValue(str);
     if (i < 0) {
         i += history_length;
     }
-    entry = replace_history_entry(i, RSTRING(str)->ptr, NULL);
+    if (i >= 0) {
+	entry = replace_history_entry(i, RSTRING_PTR(str), NULL);
+    }
     if (entry == NULL) {
 	rb_raise(rb_eIndexError, "invalid index");
     }
     return str;
+}
 #else
-    rb_notimplement();
-    return Qnil; /* not reached */
+#define hist_set rb_f_notimplement
 #endif
-}
 
 static VALUE
-hist_push(self, str)
-    VALUE self;
-    VALUE str;
+hist_push(VALUE self, VALUE str)
 {
     rb_secure(4);
-    SafeStringValue(str);
-    add_history(RSTRING(str)->ptr);
+    OutputStringValue(str);
+    add_history(RSTRING_PTR(str));
     return self;
 }
 
 static VALUE
-hist_push_method(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+hist_push_method(int argc, VALUE *argv, VALUE self)
 {
     VALUE str;
-    
+
     rb_secure(4);
     while (argc--) {
 	str = *argv++;
-	SafeStringValue(str);
-	add_history(RSTRING(str)->ptr);
+	OutputStringValue(str);
+	add_history(RSTRING_PTR(str));
     }
     return self;
 }
 
 static VALUE
-rb_remove_history(index)
-    int index;
+rb_remove_history(int index)
 {
 #ifdef HAVE_REMOVE_HISTORY
     HIST_ENTRY *entry;
@@ -604,8 +1257,8 @@ rb_remove_history(index)
     rb_secure(4);
     entry = remove_history(index);
     if (entry) {
-        val = rb_tainted_str_new2(entry->line);
-        free(entry->line);
+        val = rb_locale_str_new_cstr(entry->line);
+        free((void *) entry->line);
         free(entry);
         return val;
     }
@@ -617,8 +1270,7 @@ rb_remove_history(index)
 }
 
 static VALUE
-hist_pop(self)
-    VALUE self;
+hist_pop(VALUE self)
 {
     rb_secure(4);
     if (history_length > 0) {
@@ -629,8 +1281,7 @@ hist_pop(self)
 }
 
 static VALUE
-hist_shift(self)
-    VALUE self;
+hist_shift(VALUE self)
 {
     rb_secure(4);
     if (history_length > 0) {
@@ -641,42 +1292,39 @@ hist_shift(self)
 }
 
 static VALUE
-hist_each(self)
-    VALUE self;
+hist_each(VALUE self)
 {
     HIST_ENTRY *entry;
     int i;
 
+    RETURN_ENUMERATOR(self, 0, 0);
+
     rb_secure(4);
     for (i = 0; i < history_length; i++) {
-        entry = history_get(history_base + i);
+        entry = history_get(history_get_offset_func(i));
         if (entry == NULL)
             break;
-	rb_yield(rb_tainted_str_new2(entry->line));
+	rb_yield(rb_locale_str_new_cstr(entry->line));
     }
     return self;
 }
 
 static VALUE
-hist_length(self)
-    VALUE self;
+hist_length(VALUE self)
 {
     rb_secure(4);
     return INT2NUM(history_length);
 }
 
 static VALUE
-hist_empty_p(self)
-    VALUE self;
+hist_empty_p(VALUE self)
 {
     rb_secure(4);
     return history_length == 0 ? Qtrue : Qfalse;
 }
 
 static VALUE
-hist_delete_at(self, index)
-    VALUE self;
-    VALUE index;
+hist_delete_at(VALUE self, VALUE index)
 {
     int i;
 
@@ -690,10 +1338,20 @@ hist_delete_at(self, index)
     return rb_remove_history(i);
 }
 
+#ifdef HAVE_CLEAR_HISTORY
 static VALUE
-filename_completion_proc_call(self, str)
-    VALUE self;
-    VALUE str;
+hist_clear(VALUE self)
+{
+    rb_secure(4);
+    clear_history();
+    return self;
+}
+#else
+#define hist_clear rb_f_notimplement
+#endif
+
+static VALUE
+filename_completion_proc_call(VALUE self, VALUE str)
 {
     VALUE result;
     char **matches;
@@ -704,11 +1362,11 @@ filename_completion_proc_call(self, str)
     if (matches) {
 	result = rb_ary_new();
 	for (i = 0; matches[i]; i++) {
-	    rb_ary_push(result, rb_tainted_str_new2(matches[i]));
+	    rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
 	    free(matches[i]);
 	}
 	free(matches);
-	if (RARRAY(result)->len >= 2)
+	if (RARRAY_LEN(result) >= 2)
 	    rb_ary_shift(result);
     }
     else {
@@ -718,9 +1376,7 @@ filename_completion_proc_call(self, str)
 }
 
 static VALUE
-username_completion_proc_call(self, str)
-    VALUE self;
-    VALUE str;
+username_completion_proc_call(VALUE self, VALUE str)
 {
     VALUE result;
     char **matches;
@@ -731,11 +1387,11 @@ username_completion_proc_call(self, str)
     if (matches) {
 	result = rb_ary_new();
 	for (i = 0; matches[i]; i++) {
-	    rb_ary_push(result, rb_tainted_str_new2(matches[i]));
+	    rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
 	    free(matches[i]);
 	}
 	free(matches);
-	if (RARRAY(result)->len >= 2)
+	if (RARRAY_LEN(result) >= 2)
 	    rb_ary_shift(result);
     }
     else {
@@ -747,10 +1403,10 @@ username_completion_proc_call(self, str)
 void
 Init_readline()
 {
-    VALUE history, fcomp, ucomp;
+    VALUE history, fcomp, ucomp, version;
 
     /* Allow conditional parsing of the ~/.inputrc file. */
-    rl_readline_name = "Ruby";
+    rl_readline_name = (char *)"Ruby";
 
     using_history();
 
@@ -760,6 +1416,10 @@ Init_readline()
     mReadline = rb_define_module("Readline");
     rb_define_module_function(mReadline, "readline",
 			      readline_readline, -1);
+    rb_define_singleton_method(mReadline, "input=",
+			       readline_s_set_input, 1);
+    rb_define_singleton_method(mReadline, "output=",
+			       readline_s_set_output, 1);
     rb_define_singleton_method(mReadline, "completion_proc=",
 			       readline_s_set_completion_proc, 1);
     rb_define_singleton_method(mReadline, "completion_proc",
@@ -768,10 +1428,22 @@ Init_readline()
 			       readline_s_set_completion_case_fold, 1);
     rb_define_singleton_method(mReadline, "completion_case_fold",
 			       readline_s_get_completion_case_fold, 0);
+    rb_define_singleton_method(mReadline, "line_buffer",
+			       readline_s_get_line_buffer, 0);
+    rb_define_singleton_method(mReadline, "point",
+			       readline_s_get_point, 0);
+    rb_define_singleton_method(mReadline, "set_screen_size",
+			       readline_s_set_screen_size, 2);
+    rb_define_singleton_method(mReadline, "get_screen_size",
+			       readline_s_get_screen_size, 0);
     rb_define_singleton_method(mReadline, "vi_editing_mode",
 			       readline_s_vi_editing_mode, 0);
+    rb_define_singleton_method(mReadline, "vi_editing_mode?",
+			       readline_s_vi_editing_mode_p, 0);
     rb_define_singleton_method(mReadline, "emacs_editing_mode",
 			       readline_s_emacs_editing_mode, 0);
+    rb_define_singleton_method(mReadline, "emacs_editing_mode?",
+			       readline_s_emacs_editing_mode_p, 0);
     rb_define_singleton_method(mReadline, "completion_append_character=",
 			       readline_s_set_completion_append_character, 1);
     rb_define_singleton_method(mReadline, "completion_append_character",
@@ -796,6 +1468,13 @@ Init_readline()
 			       readline_s_set_filename_quote_characters, 1);
     rb_define_singleton_method(mReadline, "filename_quote_characters",
 			       readline_s_get_filename_quote_characters, 0);
+    rb_define_singleton_method(mReadline, "refresh_line",
+			       readline_s_refresh_line, 0);
+
+#if USE_INSERT_IGNORE_ESCAPE
+    CONST_ID(id_orig_prompt, "orig_prompt");
+    CONST_ID(id_last_prompt, "last_prompt");
+#endif
 
     history = rb_obj_alloc(rb_cObject);
     rb_extend_object(history, rb_mEnumerable);
@@ -811,29 +1490,78 @@ Init_readline()
     rb_define_singleton_method(history,"size", hist_length, 0);
     rb_define_singleton_method(history,"empty?", hist_empty_p, 0);
     rb_define_singleton_method(history,"delete_at", hist_delete_at, 1);
+    rb_define_singleton_method(history,"clear", hist_clear, 0);
+
+    /*
+     * The history buffer. It extends Enumerable module, so it behaves
+     * just like an array.
+     * For example, gets the fifth content that the user input by
+     * HISTORY[4].
+     */
     rb_define_const(mReadline, "HISTORY", history);
 
     fcomp = rb_obj_alloc(rb_cObject);
     rb_define_singleton_method(fcomp, "call",
 			       filename_completion_proc_call, 1);
+    /*
+     * The Object with the call method that is a completion for filename.
+     * This is sets by Readline.completion_proc= method.
+     */
     rb_define_const(mReadline, "FILENAME_COMPLETION_PROC", fcomp);
 
     ucomp = rb_obj_alloc(rb_cObject);
     rb_define_singleton_method(ucomp, "call",
 			       username_completion_proc_call, 1);
+    /*
+     * The Object with the call method that is a completion for usernames.
+     * This is sets by Readline.completion_proc= method.
+     */
     rb_define_const(mReadline, "USERNAME_COMPLETION_PROC", ucomp);
+    history_get_offset_func = history_get_offset_history_base;
 #if defined HAVE_RL_LIBRARY_VERSION
-    rb_define_const(mReadline, "VERSION", rb_str_new2(rl_library_version));
+    version = rb_str_new_cstr(rl_library_version);
+#if defined HAVE_CLEAR_HISTORY || defined HAVE_REMOVE_HISTORY
+    if (strncmp(rl_library_version, EDIT_LINE_LIBRARY_VERSION,
+		strlen(EDIT_LINE_LIBRARY_VERSION)) == 0) {
+	add_history("1");
+	if (history_get(history_get_offset_func(0)) == NULL) {
+	    history_get_offset_func = history_get_offset_0;
+	}
+#if !defined HAVE_CLEAR_HISTORY
+	clear_history();
 #else
-    rb_define_const(mReadline, "VERSION",
-                    rb_str_new2("2.0 or before version"));
+	{
+	    HIST_ENTRY *entry = remove_history(0);
+	    if (entry) {
+		free((char *)entry->line);
+		free(entry);
+	    }
+	}
 #endif
+    }
+#endif
+#else
+    version = rb_str_new_cstr("2.0 or prior version");
+#endif
+    /* Version string of GNU Readline or libedit. */
+    rb_define_const(mReadline, "VERSION", version);
 
     rl_attempted_completion_function = readline_attempted_completion_function;
-#ifdef HAVE_RL_EVENT_HOOK
+#if defined HAVE_RL_GETC_FUNCTION
+    rl_getc_function = readline_getc;
+    id_getbyte = rb_intern_const("getbyte");
+#elif defined HAVE_RL_EVENT_HOOK
     rl_event_hook = readline_event;
 #endif
+#ifdef HAVE_RL_CATCH_SIGNALS
+    rl_catch_signals = 0;
+#endif
+#ifdef HAVE_RL_CATCH_SIGWINCH
+    rl_catch_sigwinch = 0;
+#endif
 #ifdef HAVE_RL_CLEAR_SIGNALS
     rl_clear_signals();
 #endif
+
+    readline_s_set_input(mReadline, rb_stdin);
 }
diff --git a/ext/ripper/.cvsignore b/ext/ripper/.cvsignore
new file mode 100644
index 0000000000..c9adce0b1a
--- /dev/null
+++ b/ext/ripper/.cvsignore
@@ -0,0 +1,8 @@
+Makefile
+mkmf.log
+eventids1.c
+eventids2table.c
+ripper.*
+ids1
+ids2
+extconf.h
diff --git a/ext/ripper/README b/ext/ripper/README
new file mode 100644
index 0000000000..0825013ba9
--- /dev/null
+++ b/ext/ripper/README
@@ -0,0 +1,30 @@
+Ripper README
+=============
+
+  Ripper is a Ruby script parser.  You can get information
+  by event-based style from the parser.
+
+  !! WARNING !!
+
+  Ripper is still early-alpha version.
+  I never assure any kind of backward compatibility.
+  
+Requirements
+------------
+
+  * ruby 1.9 (support CVS HEAD only)
+  * bison 1.28 or later (Other yaccs do not work)
+
+Usage
+-----
+
+  See test/ripper/* and sample/ripper/*.
+
+License
+-------
+
+  Ruby License.
+
+                                                Minero Aoki
+                                        aamine@loveruby.net
+                                      http://i.loveruby.net
diff --git a/ext/ripper/depend b/ext/ripper/depend
new file mode 100644
index 0000000000..306a75ca9e
--- /dev/null
+++ b/ext/ripper/depend
@@ -0,0 +1,41 @@
+GEN  = $(srcdir)/tools/generate.rb
+SRC1 = $(top_srcdir)/parse.y
+SRC2 = $(srcdir)/eventids2.c
+BISON = bison
+
+.SUFFIXES: .y
+
+src: ripper.c eventids1.c eventids2table.c
+
+ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c \
+	$(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
+	$(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h \
+	$(hdrdir)/ruby/encoding.h $(hdrdir)/missing.h \
+	$(hdrdir)/../node.h $(hdrdir)/oniguruma.h \
+	$(hdrdir)/regex.h $(hdrdir)/st.h $(hdrdir)/util.h
+
+.y.c:
+	$(BISON) -t -v -oy.tab.c $<
+	sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
+	@$(RM) y.tab.c
+
+all: check
+static: check
+
+ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
+	$(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
+
+check: $(GEN) $(SRC1) $(SRC2)
+	$(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
+
+eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
+	$(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
+
+eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
+	$(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
+
+# Entries for Ripper maintainer
+
+preproc: ripper.E
+ripper.E: ripper.c
+	$(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
new file mode 100644
index 0000000000..8b0d9c3757
--- /dev/null
+++ b/ext/ripper/eventids2.c
@@ -0,0 +1,279 @@
+#define tIGNORED_NL      (tLAST_TOKEN + 1)
+#define tCOMMENT         (tLAST_TOKEN + 2)
+#define tEMBDOC_BEG      (tLAST_TOKEN + 3)
+#define tEMBDOC          (tLAST_TOKEN + 4)
+#define tEMBDOC_END      (tLAST_TOKEN + 5)
+#define tSP              (tLAST_TOKEN + 6)
+#define tHEREDOC_BEG     (tLAST_TOKEN + 7)
+#define tHEREDOC_END     (tLAST_TOKEN + 8)
+#define k__END__         (tLAST_TOKEN + 9)
+
+static ID ripper_id_backref;
+static ID ripper_id_backtick;
+static ID ripper_id_comma;
+static ID ripper_id_const;
+static ID ripper_id_cvar;
+static ID ripper_id_embexpr_beg;
+static ID ripper_id_embexpr_end;
+static ID ripper_id_embvar;
+static ID ripper_id_float;
+static ID ripper_id_gvar;
+static ID ripper_id_ident;
+static ID ripper_id_int;
+static ID ripper_id_ivar;
+static ID ripper_id_kw;
+static ID ripper_id_lbrace;
+static ID ripper_id_lbracket;
+static ID ripper_id_lparen;
+static ID ripper_id_nl;
+static ID ripper_id_op;
+static ID ripper_id_period;
+static ID ripper_id_rbrace;
+static ID ripper_id_rbracket;
+static ID ripper_id_rparen;
+static ID ripper_id_semicolon;
+static ID ripper_id_symbeg;
+static ID ripper_id_tstring_beg;
+static ID ripper_id_tstring_content;
+static ID ripper_id_tstring_end;
+static ID ripper_id_words_beg;
+static ID ripper_id_qwords_beg;
+static ID ripper_id_words_sep;
+static ID ripper_id_regexp_beg;
+static ID ripper_id_regexp_end;
+static ID ripper_id_label;
+static ID ripper_id_tlambda;
+static ID ripper_id_tlambeg;
+
+static ID ripper_id_ignored_nl;
+static ID ripper_id_comment;
+static ID ripper_id_embdoc_beg;
+static ID ripper_id_embdoc;
+static ID ripper_id_embdoc_end;
+static ID ripper_id_sp;
+static ID ripper_id_heredoc_beg;
+static ID ripper_id_heredoc_end;
+static ID ripper_id___end__;
+static ID ripper_id_CHAR;
+
+#include "eventids2table.c"
+
+static void
+ripper_init_eventids2(VALUE self)
+{
+    ripper_id_backref = rb_intern_const("on_backref");
+    ripper_id_backtick = rb_intern_const("on_backtick");
+    ripper_id_comma = rb_intern_const("on_comma");
+    ripper_id_const = rb_intern_const("on_const");
+    ripper_id_cvar = rb_intern_const("on_cvar");
+    ripper_id_embexpr_beg = rb_intern_const("on_embexpr_beg");
+    ripper_id_embexpr_end = rb_intern_const("on_embexpr_end");
+    ripper_id_embvar = rb_intern_const("on_embvar");
+    ripper_id_float = rb_intern_const("on_float");
+    ripper_id_gvar = rb_intern_const("on_gvar");
+    ripper_id_ident = rb_intern_const("on_ident");
+    ripper_id_int = rb_intern_const("on_int");
+    ripper_id_ivar = rb_intern_const("on_ivar");
+    ripper_id_kw = rb_intern_const("on_kw");
+    ripper_id_lbrace = rb_intern_const("on_lbrace");
+    ripper_id_lbracket = rb_intern_const("on_lbracket");
+    ripper_id_lparen = rb_intern_const("on_lparen");
+    ripper_id_nl = rb_intern_const("on_nl");
+    ripper_id_op = rb_intern_const("on_op");
+    ripper_id_period = rb_intern_const("on_period");
+    ripper_id_rbrace = rb_intern_const("on_rbrace");
+    ripper_id_rbracket = rb_intern_const("on_rbracket");
+    ripper_id_rparen = rb_intern_const("on_rparen");
+    ripper_id_semicolon = rb_intern_const("on_semicolon");
+    ripper_id_symbeg = rb_intern_const("on_symbeg");
+    ripper_id_tstring_beg = rb_intern_const("on_tstring_beg");
+    ripper_id_tstring_content = rb_intern_const("on_tstring_content");
+    ripper_id_tstring_end = rb_intern_const("on_tstring_end");
+    ripper_id_words_beg = rb_intern_const("on_words_beg");
+    ripper_id_qwords_beg = rb_intern_const("on_qwords_beg");
+    ripper_id_words_sep = rb_intern_const("on_words_sep");
+    ripper_id_regexp_beg = rb_intern_const("on_regexp_beg");
+    ripper_id_regexp_end = rb_intern_const("on_regexp_end");
+    ripper_id_label = rb_intern_const("on_label");
+    ripper_id_tlambda = rb_intern_const("on_tlambda");
+    ripper_id_tlambeg = rb_intern_const("on_tlambeg");
+
+    ripper_id_ignored_nl = rb_intern_const("on_ignored_nl");
+    ripper_id_comment = rb_intern_const("on_comment");
+    ripper_id_embdoc_beg = rb_intern_const("on_embdoc_beg");
+    ripper_id_embdoc = rb_intern_const("on_embdoc");
+    ripper_id_embdoc_end = rb_intern_const("on_embdoc_end");
+    ripper_id_sp = rb_intern_const("on_sp");
+    ripper_id_heredoc_beg = rb_intern_const("on_heredoc_beg");
+    ripper_id_heredoc_end = rb_intern_const("on_heredoc_end");
+    ripper_id___end__ = rb_intern_const("on___end__");
+    ripper_id_CHAR = rb_intern_const("on_CHAR");
+
+    ripper_init_eventids2_table(self);
+}
+
+static const struct token_assoc {
+    int token;
+    ID *id;
+} token_to_eventid[] = {
+    {' ',		&ripper_id_words_sep},
+    {'!',		&ripper_id_op},
+    {'%',		&ripper_id_op},
+    {'&',		&ripper_id_op},
+    {'*',		&ripper_id_op},
+    {'+',		&ripper_id_op},
+    {'-',		&ripper_id_op},
+    {'/',		&ripper_id_op},
+    {'<',		&ripper_id_op},
+    {'=',		&ripper_id_op},
+    {'>',		&ripper_id_op},
+    {'?',		&ripper_id_op},
+    {'^',		&ripper_id_op},
+    {'|',		&ripper_id_op},
+    {'~',		&ripper_id_op},
+    {':',		&ripper_id_op},
+    {',',		&ripper_id_comma},
+    {'.',		&ripper_id_period},
+    {';',		&ripper_id_semicolon},
+    {'`',		&ripper_id_backtick},
+    {'\n',              &ripper_id_nl},
+    {keyword_alias,	&ripper_id_kw},
+    {keyword_and,	&ripper_id_kw},
+    {keyword_begin,	&ripper_id_kw},
+    {keyword_break,	&ripper_id_kw},
+    {keyword_case,	&ripper_id_kw},
+    {keyword_class,	&ripper_id_kw},
+    {keyword_def,	&ripper_id_kw},
+    {keyword_defined,	&ripper_id_kw},
+    {keyword_do,	&ripper_id_kw},
+    {keyword_do_block,	&ripper_id_kw},
+    {keyword_do_cond,	&ripper_id_kw},
+    {keyword_else,	&ripper_id_kw},
+    {keyword_elsif,	&ripper_id_kw},
+    {keyword_end,	&ripper_id_kw},
+    {keyword_ensure,	&ripper_id_kw},
+    {keyword_false,	&ripper_id_kw},
+    {keyword_for,	&ripper_id_kw},
+    {keyword_if,	&ripper_id_kw},
+    {modifier_if,	&ripper_id_kw},
+    {keyword_in,	&ripper_id_kw},
+    {keyword_module,	&ripper_id_kw},
+    {keyword_next,	&ripper_id_kw},
+    {keyword_nil,	&ripper_id_kw},
+    {keyword_not,	&ripper_id_kw},
+    {keyword_or,	&ripper_id_kw},
+    {keyword_redo,	&ripper_id_kw},
+    {keyword_rescue,	&ripper_id_kw},
+    {modifier_rescue,	&ripper_id_kw},
+    {keyword_retry,	&ripper_id_kw},
+    {keyword_return,	&ripper_id_kw},
+    {keyword_self,	&ripper_id_kw},
+    {keyword_super,	&ripper_id_kw},
+    {keyword_then,	&ripper_id_kw},
+    {keyword_true,	&ripper_id_kw},
+    {keyword_undef,	&ripper_id_kw},
+    {keyword_unless,	&ripper_id_kw},
+    {modifier_unless,	&ripper_id_kw},
+    {keyword_until,	&ripper_id_kw},
+    {modifier_until,	&ripper_id_kw},
+    {keyword_when,	&ripper_id_kw},
+    {keyword_while,	&ripper_id_kw},
+    {modifier_while,	&ripper_id_kw},
+    {keyword_yield,	&ripper_id_kw},
+    {keyword__FILE__,	&ripper_id_kw},
+    {keyword__LINE__,	&ripper_id_kw},
+    {keyword__ENCODING__, &ripper_id_kw},
+    {keyword_BEGIN,	&ripper_id_kw},
+    {keyword_END,	&ripper_id_kw},
+    {keyword_do_LAMBDA,	&ripper_id_kw},
+    {tAMPER,		&ripper_id_op},
+    {tANDOP,		&ripper_id_op},
+    {tAREF,		&ripper_id_op},
+    {tASET,		&ripper_id_op},
+    {tASSOC,		&ripper_id_op},
+    {tBACK_REF,		&ripper_id_backref},
+    {tCHAR,		&ripper_id_CHAR},
+    {tCMP,		&ripper_id_op},
+    {tCOLON2,		&ripper_id_op},
+    {tCOLON3,		&ripper_id_op},
+    {tCONSTANT,		&ripper_id_const},
+    {tCVAR,		&ripper_id_cvar},
+    {tDOT2,		&ripper_id_op},
+    {tDOT3,		&ripper_id_op},
+    {tEQ,		&ripper_id_op},
+    {tEQQ,		&ripper_id_op},
+    {tFID,		&ripper_id_ident},
+    {tFLOAT,		&ripper_id_float},
+    {tGEQ,		&ripper_id_op},
+    {tGVAR,		&ripper_id_gvar},
+    {tIDENTIFIER,	&ripper_id_ident},
+    {tINTEGER,		&ripper_id_int},
+    {tIVAR,		&ripper_id_ivar},
+    {tLBRACE,		&ripper_id_lbrace},
+    {tLBRACE_ARG,	&ripper_id_lbrace},
+    {'{',       	&ripper_id_lbrace},
+    {'}',       	&ripper_id_rbrace},
+    {tLBRACK,		&ripper_id_lbracket},
+    {'[',       	&ripper_id_lbracket},
+    {']',       	&ripper_id_rbracket},
+    {tLEQ,		&ripper_id_op},
+    {tLPAREN,		&ripper_id_lparen},
+    {tLPAREN_ARG,	&ripper_id_lparen},
+    {'(',		&ripper_id_lparen},
+    {')',		&ripper_id_rparen},
+    {tLSHFT,		&ripper_id_op},
+    {tMATCH,		&ripper_id_op},
+    {tNEQ,		&ripper_id_op},
+    {tNMATCH,		&ripper_id_op},
+    {tNTH_REF,		&ripper_id_backref},
+    {tOP_ASGN,		&ripper_id_op},
+    {tOROP,		&ripper_id_op},
+    {tPOW,		&ripper_id_op},
+    {tQWORDS_BEG,	&ripper_id_qwords_beg},
+    {tREGEXP_BEG,	&ripper_id_regexp_beg},
+    {tREGEXP_END,	&ripper_id_regexp_end},
+    {tRPAREN,		&ripper_id_rparen},
+    {tRSHFT,		&ripper_id_op},
+    {tSTAR,		&ripper_id_op},
+    {tSTRING_BEG,	&ripper_id_tstring_beg},
+    {tSTRING_CONTENT,	&ripper_id_tstring_content},
+    {tSTRING_DBEG,	&ripper_id_embexpr_beg},
+    {tSTRING_DVAR,	&ripper_id_embvar},
+    {tSTRING_END,	&ripper_id_tstring_end},
+    {tSYMBEG,		&ripper_id_symbeg},
+    {tUMINUS,		&ripper_id_op},
+    {tUMINUS_NUM,	&ripper_id_op},
+    {tUPLUS,		&ripper_id_op},
+    {tWORDS_BEG,	&ripper_id_words_beg},
+    {tXSTRING_BEG,	&ripper_id_backtick},
+    {tLABEL,		&ripper_id_label},
+    {tLAMBDA,		&ripper_id_tlambda},
+    {tLAMBEG,		&ripper_id_tlambeg},
+
+    /* ripper specific tokens */
+    {tIGNORED_NL,       &ripper_id_ignored_nl},
+    {tCOMMENT,          &ripper_id_comment},
+    {tEMBDOC_BEG,       &ripper_id_embdoc_beg},
+    {tEMBDOC,           &ripper_id_embdoc},
+    {tEMBDOC_END,       &ripper_id_embdoc_end},
+    {tSP,               &ripper_id_sp},
+    {tHEREDOC_BEG,      &ripper_id_heredoc_beg},
+    {tHEREDOC_END,      &ripper_id_heredoc_end},
+    {k__END__,          &ripper_id___end__},
+    {0, NULL}
+};
+
+static ID
+ripper_token2eventid(int tok)
+{
+    const struct token_assoc *a;
+
+    for (a = token_to_eventid; a->id != NULL; a++) {
+        if (a->token == tok)
+            return *a->id;
+    }
+    if (tok < 256) {
+        return ripper_id_CHAR;
+    }
+    rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
+}
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
new file mode 100644
index 0000000000..4914d70e78
--- /dev/null
+++ b/ext/ripper/extconf.rb
@@ -0,0 +1,22 @@
+#!ruby -s
+
+require 'mkmf'
+require 'rbconfig'
+
+def main
+  unless find_executable('bison')
+    unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
+      Logging.message 'missing bison; abort'
+      return
+    end
+  end
+  $objs = %w(ripper.o)
+  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output y.output eventids1.c eventids2table.c)
+  $defs << '-DRIPPER'
+  $defs << '-DRIPPER_DEBUG' if $debug
+  $VPATH << '$(topdir)' << '$(top_srcdir)'
+  $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
+  create_makefile 'ripper'
+end
+
+main
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
new file mode 100644
index 0000000000..cb19da334a
--- /dev/null
+++ b/ext/ripper/lib/ripper.rb
@@ -0,0 +1,4 @@
+require 'ripper/core'
+require 'ripper/lexer'
+require 'ripper/filter'
+require 'ripper/sexp'
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
new file mode 100644
index 0000000000..35aa54d090
--- /dev/null
+++ b/ext/ripper/lib/ripper/core.rb
@@ -0,0 +1,70 @@
+#
+# $Id$
+#
+# Copyright (c) 2003-2005 Minero Aoki
+#
+# This program is free software.
+# You can distribute and/or modify this program under the Ruby License.
+# For details of Ruby License, see ruby/COPYING.
+#
+
+require 'ripper.so'
+
+class Ripper
+
+  # Parses Ruby program read from _src_.
+  # _src_ must be a String or a IO or a object which has #gets method.
+  def Ripper.parse(src, filename = '(ripper)', lineno = 1)
+    new(src, filename, lineno).parse
+  end
+
+  # This array contains name of parser events.
+  PARSER_EVENTS = PARSER_EVENT_TABLE.keys
+
+  # This array contains name of scanner events.
+  SCANNER_EVENTS = SCANNER_EVENT_TABLE.keys
+
+  # This array contains name of all ripper events.
+  EVENTS = PARSER_EVENTS + SCANNER_EVENTS
+
+  private
+
+  #
+  # Parser Events
+  #
+
+  PARSER_EVENT_TABLE.each do |id, arity|
+    module_eval(<<-End, __FILE__, __LINE__ + 1)
+      def on_#{id}(#{ ('a'..'z').to_a[0, arity].join(', ') })
+        #{arity == 0 ? 'nil' : 'a'}
+      end
+    End
+  end
+
+  # This method is called when weak warning is produced by the parser.
+  # _fmt_ and _args_ is printf style.
+  def warn(fmt, *args)
+  end
+
+  # This method is called when strong warning is produced by the parser.
+  # _fmt_ and _args_ is printf style.
+  def warning(fmt, *args)
+  end
+
+  # This method is called when the parser found syntax error.
+  def compile_error(msg)
+  end
+
+  #
+  # Scanner Events
+  #
+
+  SCANNER_EVENTS.each do |id|
+    module_eval(<<-End, __FILE__, __LINE__ + 1)
+      def on_#{id}(token)
+        token
+      end
+    End
+  end
+
+end
diff --git a/ext/ripper/lib/ripper/filter.rb b/ext/ripper/lib/ripper/filter.rb
new file mode 100644
index 0000000000..898501b23c
--- /dev/null
+++ b/ext/ripper/lib/ripper/filter.rb
@@ -0,0 +1,70 @@
+#
+# $Id$
+#
+# Copyright (c) 2004,2005 Minero Aoki
+#
+# This program is free software.
+# You can distribute and/or modify this program under the Ruby License.
+# For details of Ruby License, see ruby/COPYING.
+#
+
+require 'ripper/lexer'
+
+class Ripper
+
+  # This class handles only scanner events,
+  # and they are dispatched in the `right' order (same with input).
+  class Filter
+
+    def initialize(src, filename = '-', lineno = 1)
+      @__lexer = Lexer.new(src, filename, lineno)
+      @__line = nil
+      @__col = nil
+    end
+
+    # The file name of the input.
+    def filename
+      @__lexer.filename
+    end
+
+    # The line number of the current token.
+    # This value starts from 1.
+    # This method is valid only in event handlers.
+    def lineno
+      @__line
+    end
+
+    # The column number of the current token.
+    # This value starts from 0.
+    # This method is valid only in event handlers.
+    def column
+      @__col
+    end
+
+    # Starts parsing.  _init_ is a data accumulator.
+    # It is passed to the next event handler (as of Enumerable#inject).
+    def parse(init = nil)
+      data = init
+      @__lexer.lex.each do |pos, event, tok|
+        @__line, @__col = *pos
+        data = if respond_to?(event, true)
+               then __send__(event, tok, data)
+               else on_default(event, tok, data)
+               end
+      end
+      data
+    end
+
+    private
+
+    # This method is called when some event handler have not defined.
+    # _event_ is :on_XXX, _token_ is scanned token, _data_ is a data
+    # accumulator.  The return value of this method is passed to the
+    # next event handler (as of Enumerable#inject).
+    def on_default(event, token, data)
+      data
+    end
+
+  end
+
+end
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
new file mode 100644
index 0000000000..5bbee39e06
--- /dev/null
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -0,0 +1,179 @@
+#
+# $Id$
+#
+# Copyright (c) 2004,2005 Minero Aoki
+#
+# This program is free software.
+# You can distribute and/or modify this program under the Ruby License.
+# For details of Ruby License, see ruby/COPYING.
+#
+
+require 'ripper/core'
+
+class Ripper
+
+  # Tokenizes Ruby program and returns an Array of String.
+  def Ripper.tokenize(src, filename = '-', lineno = 1)
+    Lexer.new(src, filename, lineno).tokenize
+  end
+
+  # Tokenizes Ruby program and returns an Array of Array,
+  # which is formatted like [[lineno, column], type, token].
+  #
+  #   require 'ripper'
+  #   require 'pp'
+  #
+  #   p Ripper.lex("def m(a) nil end")
+  #     #=> [[[1,  0], :on_kw,     "def"],
+  #          [[1,  3], :on_sp,     " "  ],
+  #          [[1,  4], :on_ident,  "m"  ],
+  #          [[1,  5], :on_lparen, "("  ],
+  #          [[1,  6], :on_ident,  "a"  ],
+  #          [[1,  7], :on_rparen, ")"  ],
+  #          [[1,  8], :on_sp,     " "  ],
+  #          [[1,  9], :on_kw,     "nil"],
+  #          [[1, 12], :on_sp,     " "  ],
+  #          [[1, 13], :on_kw,     "end"]]
+  #
+  def Ripper.lex(src, filename = '-', lineno = 1)
+    Lexer.new(src, filename, lineno).lex
+  end
+
+  class Lexer < ::Ripper   #:nodoc: internal use only
+    def tokenize
+      lex().map {|pos, event, tok| tok }
+    end
+
+    def lex
+      parse().sort_by {|pos, event, tok| pos }
+    end
+
+    def parse
+      @buf = []
+      super
+      @buf
+    end
+
+    private
+
+    SCANNER_EVENTS.each do |event|
+      module_eval(<<-End, __FILE__+'/module_eval', __LINE__ + 1)
+        def on_#{event}(tok)
+          @buf.push [[lineno(), column()], :on_#{event}, tok]
+        end
+      End
+    end
+  end
+
+  # [EXPERIMENTAL]
+  # Parses +src+ and return a string which was matched to +pattern+.
+  # +pattern+ should be described as Regexp.
+  #
+  #   require 'ripper'
+  #
+  #   p Ripper.slice('def m(a) nil end', 'ident')                   #=> "m"
+  #   p Ripper.slice('def m(a) nil end', '[ident lparen rparen]+')  #=> "m(a)"
+  #   p Ripper.slice("<<EOS\nstring\nEOS",
+  #                  'heredoc_beg nl $(tstring_content*) heredoc_end', 1)
+  #       #=> "string\n"
+  #
+  def Ripper.slice(src, pattern, n = 0)
+    if m = token_match(src, pattern)
+    then m.string(n)
+    else nil
+    end
+  end
+
+  def Ripper.token_match(src, pattern)   #:nodoc:
+    TokenPattern.compile(pattern).match(src)
+  end
+
+  class TokenPattern   #:nodoc:
+
+    class Error < ::StandardError; end
+    class CompileError < Error; end
+    class MatchError < Error; end
+
+    class << self
+      alias compile new
+    end
+
+    def initialize(pattern)
+      @source = pattern
+      @re = compile(pattern)
+    end
+
+    def match(str)
+      match_list(::Ripper.lex(str))
+    end
+
+    def match_list(tokens)
+      if m = @re.match(map_tokens(tokens))
+      then MatchData.new(tokens, m)
+      else nil
+      end
+    end
+
+    private
+
+    def compile(pattern)
+      if m = /[^\w\s$()\[\]{}?*+\.]/.match(pattern)
+        raise CompileError, "invalid char in pattern: #{m[0].inspect}"
+      end
+      buf = ''
+      pattern.scan(/(?:\w+|\$\(|[()\[\]\{\}?*+\.]+)/) do |tok|
+        case tok
+        when /\w/
+          buf.concat map_token(tok)
+        when '$('
+          buf.concat '('
+        when '('
+          buf.concat '(?:'
+        when /[?*\[\])\.]/
+          buf.concat tok
+        else
+          raise 'must not happen'
+        end
+      end
+      Regexp.compile(buf)
+    rescue RegexpError => err
+      raise CompileError, err.message
+    end
+
+    def map_tokens(tokens)
+      tokens.map {|pos,type,str| map_token(type.to_s.sub(/\Aon_/,'')) }.join
+    end
+
+    MAP = {}
+    seed = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
+    SCANNER_EVENT_TABLE.each do |ev, |
+      raise CompileError, "[RIPPER FATAL] too many system token" if seed.empty?
+      MAP[ev.to_s.sub(/\Aon_/,'')] = seed.shift
+    end
+
+    def map_token(tok)
+      MAP[tok]  or raise CompileError, "unknown token: #{tok}"
+    end
+
+    class MatchData
+      def initialize(tokens, match)
+        @tokens = tokens
+        @match = match
+      end
+
+      def string(n = 0)
+        return nil unless @match
+        match(n).join
+      end
+
+      private
+
+      def match(n = 0)
+        return [] unless @match
+        @tokens[@match.begin(n)...@match.end(n)].map {|pos,type,str| str }
+      end
+    end
+
+  end
+
+end
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
new file mode 100644
index 0000000000..f2260fe8dd
--- /dev/null
+++ b/ext/ripper/lib/ripper/sexp.rb
@@ -0,0 +1,99 @@
+#
+# $Id$
+#
+# Copyright (c) 2004,2005 Minero Aoki
+#
+# This program is free software.
+# You can distribute and/or modify this program under the Ruby License.
+# For details of Ruby License, see ruby/COPYING.
+#
+
+require 'ripper/core'
+
+class Ripper
+
+  # [EXPERIMENTAL]
+  # Parses +src+ and create S-exp tree.
+  # This method is for mainly developper use.
+  #
+  #   require 'ripper'
+  #   require 'pp
+  #
+  #   pp Ripper.sexp("def m(a) nil end")
+  #     #=> [:program,
+  #          [:stmts_add,
+  #           [:stmts_new],
+  #           [:def,
+  #            [:@ident, "m", [1, 4]],
+  #            [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil]],
+  #            [:bodystmt,
+  #             [:stmts_add, [:stmts_new], [:var_ref, [:@kw, "nil", [1, 9]]]],
+  #             nil,
+  #             nil,
+  #             nil]]]]
+  #
+  def Ripper.sexp(src, filename = '-', lineno = 1)
+    SexpBuilderPP.new(src, filename, lineno).parse
+  end
+
+  def Ripper.sexp_raw(src, filename = '-', lineno = 1)
+    SexpBuilder.new(src, filename, lineno).parse
+  end
+
+  class SexpBuilderPP < ::Ripper   #:nodoc:
+    private
+
+    PARSER_EVENT_TABLE.each do |event, arity|
+      if /_new\z/ =~ event.to_s and arity == 0
+        module_eval(<<-End, __FILE__, __LINE__ + 1)
+          def on_#{event}
+            []
+          end
+        End
+      elsif /_add\z/ =~ event.to_s
+        module_eval(<<-End, __FILE__, __LINE__ + 1)
+          def on_#{event}(list, item)
+            list.push item
+            list
+          end
+        End
+      else
+        module_eval(<<-End, __FILE__, __LINE__ + 1)
+          def on_#{event}(*args)
+            [:#{event}, *args]
+          end
+        End
+      end
+    end
+
+    SCANNER_EVENTS.each do |event|
+      module_eval(<<-End, __FILE__, __LINE__ + 1)
+        def on_#{event}(tok)
+          [:@#{event}, tok, [lineno(), column()]]
+        end
+      End
+    end
+  end
+
+  class SexpBuilder < ::Ripper   #:nodoc:
+    private
+
+    PARSER_EVENTS.each do |event|
+      module_eval(<<-End, __FILE__, __LINE__ + 1)
+        def on_#{event}(*args)
+          args.unshift :#{event}
+          args
+        end
+      End
+    end
+
+    SCANNER_EVENTS.each do |event|
+      module_eval(<<-End, __FILE__, __LINE__ + 1)
+        def on_#{event}(tok)
+          [:@#{event}, tok, [lineno(), column()]]
+        end
+      End
+    end
+  end
+
+end
diff --git a/ext/ripper/tools/generate-param-macros.rb b/ext/ripper/tools/generate-param-macros.rb
new file mode 100755
index 0000000000..b19f6e8d5c
--- /dev/null
+++ b/ext/ripper/tools/generate-param-macros.rb
@@ -0,0 +1,14 @@
+off = true
+ARGF.each do |line|
+  case line
+  when /RIPPER_PARAMS_DECL_BEGIN/
+    off = false
+  when /RIPPER_PARAMS_DECL_END/
+    exit
+  when /ripper/
+    next if off
+    var = line.scan(/\w+/).last or next
+    base = var.sub(/ripper_/, '')
+    puts %"\#define #{base}\t\t(parser->ripper_#{base})"
+  end
+end
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
new file mode 100755
index 0000000000..22c3ac0eb7
--- /dev/null
+++ b/ext/ripper/tools/generate.rb
@@ -0,0 +1,152 @@
+# $Id$
+
+require 'optparse'
+
+def main
+  mode = nil
+  ids1src = nil
+  ids2src = nil
+  template = nil
+  output = nil
+
+  parser = @parser = OptionParser.new
+  parser.banner = "Usage: #{File.basename($0)} --mode=MODE [--ids1src=PATH] [--ids2src=PATH] [--output=PATH]"
+  parser.on('--mode=MODE', 'check, eventids1, or eventids2table.') {|m|
+    mode = m
+  }
+  parser.on('--ids1src=PATH', 'A source file of event-IDs 1 (parse.y).') {|path|
+    ids1src = path
+  }
+  parser.on('--ids2src=PATH', 'A source file of event-IDs 2 (eventids2.c).') {|path|
+    ids2src = path
+  }
+  parser.on('--output=PATH', 'An output file.') {|path|
+    output = path
+  }
+  parser.on('--help', 'Prints this message and quit.') {
+    puts parser.help
+    exit true
+  }
+  begin
+    parser.parse!
+  rescue OptionParser::ParseError => err
+    usage err.message
+  end
+  usage 'no mode given' unless mode
+  case mode
+  when 'check'
+    usage 'no --ids1src' unless ids1src
+    usage 'no --ids2src' unless ids2src
+    h = read_ids1_with_locations(ids1src)
+    check_arity h
+    ids2 = read_ids2(ids2src)
+    common = h.keys & ids2
+    unless common.empty?
+      abort "event crash: #{common.join(' ')}"
+    end
+    exit 0
+  when 'eventids1'
+    usage 'no --ids1src' unless ids1src
+    result = generate_eventids1(read_ids1(ids1src))
+  when 'eventids2table'
+    usage 'no --ids2src' unless ids2src
+    result = generate_eventids2_table(read_ids2(ids2src))
+  end
+  if output
+    File.open(output, 'w') {|f|
+      f.write result
+    }
+  else
+    puts result
+  end
+end
+
+def usage(msg)
+  $stderr.puts msg
+  $stderr.puts @parser.help
+  exit false
+end
+
+def generate_eventids1(ids)
+  buf = ""
+  ids.each do |id, arity|
+    buf << %Q[static ID ripper_id_#{id};\n]
+  end
+  buf << %Q[\n]
+  buf << %Q[static void\n]
+  buf << %Q[ripper_init_eventids1(VALUE self)\n]
+  buf << %Q[{\n]
+  buf << %Q[    VALUE h;\n]
+  buf << %Q[    ID id;\n]
+  ids.each do |id, arity|
+    buf << %Q[    ripper_id_#{id} = rb_intern_const("on_#{id}");\n]
+  end
+  buf << %Q[\n]
+  buf << %Q[    h = rb_hash_new();\n]
+  buf << %Q[    rb_define_const(self, "PARSER_EVENT_TABLE", h);\n]
+  ids.each do |id, arity|
+    buf << %Q[    id = rb_intern_const("#{id}");\n]
+    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(#{arity}));\n]
+  end
+  buf << %Q[}\n]
+  buf
+end
+
+def generate_eventids2_table(ids)
+  buf = ""
+  buf << %Q[static void\n]
+  buf << %Q[ripper_init_eventids2_table(VALUE self)\n]
+  buf << %Q[{\n]
+  buf << %Q[    VALUE h = rb_hash_new();\n]
+  buf << %Q[    ID id;\n]
+  buf << %Q[    rb_define_const(self, "SCANNER_EVENT_TABLE", h);\n]
+  ids.each do |id|
+    buf << %Q[    id = rb_intern_const("#{id}");\n]
+    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(1));\n]
+  end
+  buf << %Q[}\n]
+  buf
+end
+
+def read_ids1(path)
+  strip_locations(read_ids1_with_locations(path))
+end
+
+def strip_locations(h)
+  h.map {|event, list| [event, list.first[1]] }\
+      .sort_by {|event, arity| event.to_s }
+end
+
+def check_arity(h)
+  invalid = false
+  h.each do |event, list|
+    unless list.map {|line, arity| arity }.uniq.size == 1
+      invalid = true
+      locations = list.map {|line, a| "#{line}:#{a}" }.join(', ')
+      $stderr.puts "arity crash [event=#{event}]: #{locations}"
+    end
+  end
+  abort if invalid
+end
+
+def read_ids1_with_locations(path)
+  h = {}
+  File.open(path) {|f|
+    f.each do |line|
+      next if /\A\#\s*define\s+s?dispatch/ =~ line
+      next if /ripper_dispatch/ =~ line
+      line.scan(/dispatch(\d)\((\w+)/) do |arity, event|
+        (h[event] ||= []).push [f.lineno, arity.to_i]
+      end
+    end
+  }
+  h
+end
+
+def read_ids2(path)
+  File.open(path) {|f|
+    return f.read.scan(/ripper_id_(\w+)/).flatten.uniq.sort
+  }
+end
+
+main
diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb
new file mode 100755
index 0000000000..06397cea05
--- /dev/null
+++ b/ext/ripper/tools/preproc.rb
@@ -0,0 +1,91 @@
+# $Id$
+
+require 'optparse'
+
+def main
+  output = nil
+  parser = OptionParser.new
+  parser.banner = "Usage: #{File.basename($0)} [--output=PATH] <parse.y>"
+  parser.on('--output=PATH', 'An output file.') {|path|
+    output = path
+  }
+  parser.on('--help', 'Prints this message and quit.') {
+    puts parser.help
+    exit true
+  }
+  begin
+    parser.parse!
+  rescue OptionParser::ParseError => err
+    $stderr.puts err.message
+    $stderr.puts parser.help
+    exit false
+  end
+  unless ARGV.size == 1
+    abort "wrong number of arguments (#{ARGV.size} for 1)"
+  end
+  out = ""
+  File.open(ARGV[0]) {|f|
+    prelude f, out
+    grammar f, out
+    usercode f, out
+  }
+  if output
+    File.open(output, 'w') {|f|
+      f.write out
+    }
+  else
+    print out
+  end
+end
+
+def prelude(f, out)
+  while line = f.gets
+    case line
+    when %r</\*%%%\*/>
+      out << '/*' << $/
+    when %r</\*%>
+      out << '*/' << $/
+    when %r<%\*/>
+      out << $/
+    when /\A%%/
+      out << '%%' << $/
+      return
+    when /\A%token/
+      out << line.sub(/<\w+>/, '<val>')
+    when /\A%type/
+      out << line.sub(/<\w+>/, '<val>')
+    else
+      out << line
+    end
+  end
+end
+
+def grammar(f, out)
+  while line = f.gets
+    case line
+    when %r</\*%%%\*/>
+      out << '#if 0' << $/
+    when %r</\*%c%\*/>
+      out << '/*' << $/
+    when %r</\*%c>
+      out << '*/' << $/
+    when %r</\*%>
+      out << '#endif' << $/
+    when %r<%\*/>
+      out << $/
+    when /\A%%/
+      out << '%%' << $/
+      return
+    else
+      out << line
+    end
+  end
+end
+
+def usercode(f, out)
+  while line = f.gets
+    out << line
+  end
+end
+
+main
diff --git a/ext/ripper/tools/strip.rb b/ext/ripper/tools/strip.rb
new file mode 100755
index 0000000000..99413c361d
--- /dev/null
+++ b/ext/ripper/tools/strip.rb
@@ -0,0 +1,12 @@
+last_is_void = false
+ARGF.each do |line|
+  if line.strip.empty?
+    #puts() unless last_is_void
+    last_is_void = true
+  elsif /\A\#/ === line
+    ;
+  else
+    print line
+    last_is_void = false
+  end
+end
diff --git a/ext/sdbm/.cvsignore b/ext/sdbm/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/sdbm/.cvsignore
+++ b/ext/sdbm/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 5b34824afc..b1ffdc04f0 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -11,8 +11,14 @@
 /*char sdbm_rcsid[] = "$Id$";*/
 #endif
 
+#include "ruby/config.h"
+#include "ruby/defines.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include "sdbm.h"
-#include "config.h"
 
 /*
  * sdbm - ndbm work-alike hashed database library
@@ -22,10 +28,6 @@
 
 #define BYTESIZ		8
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef BSD42
 #define SEEK_SET	L_SET
 #define	memset(s,c,n)	bzero(s, n)		/* only when c is zero */
@@ -103,7 +105,7 @@ static int   duppair proto((char *, datum));
 /*
  * externals
  */
-#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
+#if !defined sun && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
 extern int errno;
 #endif
 
@@ -143,10 +145,7 @@ static long masks[] = {
 datum nullitem = {NULL, 0};
 
 DBM *
-sdbm_open(file, flags, mode)
-register char *file;
-register int flags;
-register int mode;
+sdbm_open(register char *file, register int flags, register int mode)
 {
 	register DBM *db;
 	register char *dirname;
@@ -175,11 +174,7 @@ register int mode;
 }
 
 DBM *
-sdbm_prep(dirname, pagname, flags, mode)
-char *dirname;
-char *pagname;
-int flags;
-int mode;
+sdbm_prep(char *dirname, char *pagname, int flags, int mode)
 {
 	register DBM *db;
 	struct stat dstat;
@@ -192,7 +187,7 @@ int mode;
         db->blkptr = 0;
         db->keyptr = 0;
 /*
- * adjust user flags so that WRONLY becomes RDWR, 
+ * adjust user flags so that WRONLY becomes RDWR,
  * as required by this package. Also set our internal
  * flag for RDONLY.
  */
@@ -235,8 +230,7 @@ int mode;
 }
 
 void
-sdbm_close(db)
-register DBM *db;
+sdbm_close(register DBM *db)
 {
 	if (db == NULL)
 		errno = EINVAL;
@@ -248,9 +242,7 @@ register DBM *db;
 }
 
 datum
-sdbm_fetch(db, key)
-register DBM *db;
-datum key;
+sdbm_fetch(register DBM *db, datum key)
 {
 	if (db == NULL || bad(key))
 		return errno = EINVAL, nullitem;
@@ -262,9 +254,7 @@ datum key;
 }
 
 int
-sdbm_delete(db, key)
-register DBM *db;
-datum key;
+sdbm_delete(register DBM *db, datum key)
 {
 	if (db == NULL || bad(key))
 		return errno = EINVAL, -1;
@@ -288,11 +278,7 @@ datum key;
 }
 
 int
-sdbm_store(db, key, val, flags)
-register DBM *db;
-datum key;
-datum val;
-int flags;
+sdbm_store(register DBM *db, datum key, datum val, int flags)
 {
 	int need;
 	register long hash;
@@ -350,14 +336,11 @@ int flags;
  * giving up.
  */
 static int
-makroom(db, hash, need)
-register DBM *db;
-long hash;
-int need;
+makroom(register DBM *db, long int hash, int need)
 {
 	long newp;
 	char twin[PBLKSIZ];
-#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
+#if defined _WIN32 && !defined __CYGWIN__
 	char zer[PBLKSIZ];
 	long oldtail;
 #endif
@@ -384,7 +367,7 @@ int need;
  * here, as sdbm_store will do so, after it inserts the incoming pair.
  */
 
-#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
+#if defined _WIN32 && !defined __CYGWIN__
 	/*
 	 * Fill hole with 0 if made it.
 	 * (hole is NOT read as 0)
@@ -425,7 +408,7 @@ int need;
  * need to read in anything. BUT we have to write the current
  * [deferred] page out, as the window of failure is too great.
  */
-		db->curbit = 2 * db->curbit + 
+		db->curbit = 2 * db->curbit +
 			((hash & (db->hmask + 1)) ? 2 : 1);
 		db->hmask |= (db->hmask + 1);
 
@@ -450,8 +433,7 @@ int need;
  * deletions aren't taken into account. (ndbm bug)
  */
 datum
-sdbm_firstkey(db)
-register DBM *db;
+sdbm_firstkey(register DBM *db)
 {
 	if (db == NULL)
 		return errno = EINVAL, nullitem;
@@ -470,8 +452,7 @@ register DBM *db;
 }
 
 datum
-sdbm_nextkey(db)
-register DBM *db;
+sdbm_nextkey(register DBM *db)
 {
 	if (db == NULL)
 		return errno = EINVAL, nullitem;
@@ -482,9 +463,7 @@ register DBM *db;
  * all important binary trie traversal
  */
 static int
-getpage(db, hash)
-register DBM *db;
-register long hash;
+getpage(register DBM *db, register long int hash)
 {
 	register int hbit;
 	register long dbit;
@@ -505,7 +484,7 @@ register long hash;
  * see if the block we need is already in memory.
  * note: this lookaside cache has about 10% hit rate.
  */
-	if (pagb != db->pagbno) { 
+	if (pagb != db->pagbno) {
 /*
  * note: here, we assume a "hole" is read as 0s.
  * if not, must zero pagbuf first.
@@ -526,9 +505,7 @@ register long hash;
 }
 
 static int
-getdbit(db, dbit)
-register DBM *db;
-register long dbit;
+getdbit(register DBM *db, register long int dbit)
 {
 	register long c;
 	register long dirb;
@@ -549,9 +526,7 @@ register long dbit;
 }
 
 static int
-setdbit(db, dbit)
-register DBM *db;
-register long dbit;
+setdbit(register DBM *db, register long int dbit)
 {
 	register long c;
 	register long dirb;
@@ -585,8 +560,7 @@ register long dbit;
  * the page, try the next page in sequence
  */
 static datum
-getnext(db)
-register DBM *db;
+getnext(register DBM *db)
 {
 	datum key;
 
@@ -635,8 +609,8 @@ register DBM *db;
 
 #define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
 
-/* 
- * forward 
+/*
+ * forward
  */
 static int seepair proto((char *, int, char *, int));
 
@@ -661,9 +635,7 @@ static int seepair proto((char *, int, char *, int));
  */
 
 static int
-fitpair(pag, need)
-char *pag;
-int need;
+fitpair(char *pag, int need)
 {
 	register int n;
 	register int off;
@@ -680,10 +652,7 @@ int need;
 }
 
 static void
-putpair(pag, key, val)
-char *pag;
-datum key;
-datum val;
+putpair(char *pag, datum key, datum val)
 {
 	register int n;
 	register int off;
@@ -711,9 +680,7 @@ datum val;
 }
 
 static datum
-getpair(pag, key)
-char *pag;
-datum key;
+getpair(char *pag, datum key)
 {
 	register int i;
 	register int n;
@@ -733,9 +700,7 @@ datum key;
 
 #ifdef SEEDUPS
 static int
-duppair(pag, key)
-char *pag;
-datum key;
+duppair(char *pag, datum key)
 {
 	register short *ino = (short *) pag;
 	return GET_SHORT(ino,0) > 0 &&
@@ -744,9 +709,7 @@ datum key;
 #endif
 
 static datum
-getnkey(pag, num)
-char *pag;
-int num;
+getnkey(char *pag, int num)
 {
 	datum key;
 	register int off;
@@ -765,9 +728,7 @@ int num;
 }
 
 static int
-delpair(pag, key)
-char *pag;
-datum key;
+delpair(char *pag, datum key)
 {
 	register int n;
 	register int i;
@@ -837,11 +798,7 @@ datum key;
  * return 0 if not found.
  */
 static int
-seepair(pag, n, key, siz)
-char *pag;
-register int n;
-register char *key;
-register int siz;
+seepair(char *pag, register int n, register char *key, register int siz)
 {
 	register int i;
 	register int off = PBLKSIZ;
@@ -857,10 +814,7 @@ register int siz;
 }
 
 static void
-splpage(pag, new, sbit)
-char *pag;
-char *new;
-long sbit;
+splpage(char *pag, char *new, long int sbit)
 {
 	datum key;
 	datum val;
@@ -876,7 +830,7 @@ long sbit;
 
 	n = GET_SHORT(ino,0);
 	for (ino++; n > 0; ino += 2) {
-		key.dptr = cur + GET_SHORT(ino,0); 
+		key.dptr = cur + GET_SHORT(ino,0);
 		key.dsize = off - GET_SHORT(ino,0);
 		val.dptr = cur + GET_SHORT(ino,1);
 		val.dsize = GET_SHORT(ino,0) - GET_SHORT(ino,1);
@@ -889,20 +843,19 @@ long sbit;
 		n -= 2;
 	}
 
-	debug(("%d split %d/%d\n", ((short *) cur)[0] / 2, 
+	debug(("%d split %d/%d\n", ((short *) cur)[0] / 2,
 	       ((short *) new)[0] / 2,
 	       ((short *) pag)[0] / 2));
 }
 
 /*
- * check page sanity: 
+ * check page sanity:
  * number of entries should be something
  * reasonable, and all offsets in the index should be in order.
  * this could be made more rigorous.
  */
 static int
-chkpage(pag)
-char *pag;
+chkpage(char *pag)
 {
 	register int n;
 	register int off;
@@ -939,12 +892,10 @@ char *pag;
  * [this seems to work remarkably well, in fact better
  * then the ndbm hash function. Replace at your own risk]
  * use: 65599	nice.
- *      65587   even better. 
+ *      65587   even better.
  */
 long
-sdbm_hash(str, len)
-register char *str;
-register int len;
+sdbm_hash(register char *str, register int len)
 {
 	register unsigned long n = 0;
 
diff --git a/ext/sdbm/depend b/ext/sdbm/depend
index 1d8b13d13f..f205edc611 100644
--- a/ext/sdbm/depend
+++ b/ext/sdbm/depend
@@ -1,2 +1,2 @@
-_sdbm.o: _sdbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
-init.o: init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+_sdbm.o: _sdbm.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+init.o: init.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index acadc9b26a..fdb7fd42c9 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -3,7 +3,6 @@
   sdbminit.c -
 
   $Author$
-  $Date$
   created at: Fri May  7 08:34:24 JST 1999
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -41,17 +40,15 @@ closed_sdbm()
 }
 
 static void
-free_sdbm(dbmp)
-    struct dbmdata *dbmp;
+free_sdbm(struct dbmdata *dbmp)
 {
 
     if (dbmp->di_dbm) sdbm_close(dbmp->di_dbm);
-    free(dbmp);
+    ruby_xfree(dbmp);
 }
 
 static VALUE
-fsdbm_close(obj)
-    VALUE obj;
+fsdbm_close(VALUE obj)
 {
     struct dbmdata *dbmp;
 
@@ -63,8 +60,7 @@ fsdbm_close(obj)
 }
 
 static VALUE
-fsdbm_closed(obj)
-    VALUE obj;
+fsdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
@@ -77,21 +73,17 @@ fsdbm_closed(obj)
     return Qfalse;
 }
 
-static VALUE fsdbm_alloc _((VALUE));
 static VALUE
-fsdbm_alloc(klass)
-    VALUE klass;
+fsdbm_alloc(VALUE klass)
 {
     return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
 }
 
 static VALUE
-fsdbm_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE file, vmode;
+    volatile VALUE file;
+    VALUE vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode;
@@ -105,19 +97,19 @@ fsdbm_initialize(argc, argv, obj)
     else {
 	mode = NUM2INT(vmode);
     }
-    SafeStringValue(file);
+    FilePathValue(file);
 
     dbm = 0;
     if (mode >= 0)
-	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
+	dbm = sdbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
     if (!dbm)
-	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, 0);
+	dbm = sdbm_open(RSTRING_PTR(file), O_RDWR, 0);
     if (!dbm)
-	dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
+	dbm = sdbm_open(RSTRING_PTR(file), O_RDONLY, 0);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
-	rb_sys_fail(RSTRING(file)->ptr);
+	rb_sys_fail(RSTRING_PTR(file));
     }
 
     dbmp = ALLOC(struct dbmdata);
@@ -129,10 +121,7 @@ fsdbm_initialize(argc, argv, obj)
 }
 
 static VALUE
-fsdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
     VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
 
@@ -148,39 +137,34 @@ fsdbm_s_open(argc, argv, klass)
 }
 
 static VALUE
-fsdbm_fetch(obj, keystr, ifnone)
-    VALUE obj, keystr, ifnone;
+fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
 {
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    ExportStringValue(keystr);
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
     value = sdbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	    return rb_yield(rb_external_str_new(key.dptr, key.dsize));
 	return ifnone;
     }
-    return rb_tainted_str_new(value.dptr, value.dsize);
+    return rb_external_str_new(value.dptr, value.dsize);
 }
 
 static VALUE
-fsdbm_aref(obj, keystr)
-    VALUE obj, keystr;
+fsdbm_aref(VALUE obj, VALUE keystr)
 {
     return fsdbm_fetch(obj, keystr, Qnil);
 }
 
 static VALUE
-fsdbm_fetch_m(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
 {
     VALUE keystr, valstr, ifnone;
 
@@ -193,90 +177,59 @@ fsdbm_fetch_m(argc, argv, obj)
 }
 
 static VALUE
-fsdbm_index(obj, valstr)
-    VALUE obj, valstr;
+fsdbm_key(VALUE obj, VALUE valstr)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(valstr);
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
+    ExportStringValue(valstr);
+    val.dptr = RSTRING_PTR(valstr);
+    val.dsize = RSTRING_LEN(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	if (val.dsize == RSTRING(valstr)->len &&
-	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
-	    return rb_tainted_str_new(key.dptr, key.dsize);
+	if (val.dsize == RSTRING_LEN(valstr) &&
+	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
+	    return rb_external_str_new(key.dptr, key.dsize);
     }
     return Qnil;
 }
 
 static VALUE
-fsdbm_indexes(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fsdbm_index(VALUE hash, VALUE value)
 {
-    VALUE new;
-    int i;
-
-    new = rb_ary_new2(argc);
-    for (i=0; i<argc; i++) {
-	rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
-    }
-
-    return new;
+    rb_warn("SDBM#index is deprecated; use SDBM#key");
+    return fsdbm_key(hash, value);
 }
 
 static VALUE
-fsdbm_select(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fsdbm_select(VALUE obj)
 {
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    if (rb_block_given_p()) {
-        datum key, val;
-        DBM *dbm;
-        struct dbmdata *dbmp;
+    VALUE new = rb_ary_new();
+    datum key, val;
+    DBM *dbm;
+    struct dbmdata *dbmp;
 
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    GetDBM2(obj, dbmp, dbm);
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	VALUE assoc, v;
+	val = sdbm_fetch(dbm, key);
+	assoc = rb_assoc_new(rb_external_str_new(key.dptr, key.dsize),
+			     rb_external_str_new(val.dptr, val.dsize));
+	v = rb_yield(assoc);
+	if (RTEST(v)) {
+	    rb_ary_push(new, assoc);
 	}
-        GetDBM2(obj, dbmp, dbm);
-        for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-            VALUE assoc, v;
-            val = sdbm_fetch(dbm, key);
-            assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-                                 rb_tainted_str_new(val.dptr, val.dsize));
-	    v = rb_yield(assoc);
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
-        }
-    }
-    else {
-	rb_warn("SDBM#select(index..) is deprecated; use SDBM#values_at");
-
-        for (i=0; i<argc; i++) {
-            rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
-        }
+	GetDBM2(obj, dbmp, dbm);
     }
 
     return new;
 }
 
 static VALUE
-fsdbm_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
 {
     VALUE new = rb_ary_new2(argc);
     int i;
@@ -289,16 +242,14 @@ fsdbm_values_at(argc, argv, obj)
 }
 
 static void
-fdbm_modify(obj)
-    VALUE obj;
+fdbm_modify(VALUE obj)
 {
     rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
 }
 
 static VALUE
-fsdbm_delete(obj, keystr)
-    VALUE obj, keystr;
+fsdbm_delete(VALUE obj, VALUE keystr)
 {
     datum key, value;
     struct dbmdata *dbmp;
@@ -306,9 +257,9 @@ fsdbm_delete(obj, keystr)
     VALUE valstr;
 
     fdbm_modify(obj);
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    ExportStringValue(keystr);
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
@@ -320,7 +271,7 @@ fsdbm_delete(obj, keystr)
     }
 
     /* need to save value before sdbm_delete() */
-    valstr = rb_tainted_str_new(value.dptr, value.dsize);
+    valstr = rb_external_str_new(value.dptr, value.dsize);
 
     if (sdbm_delete(dbm, key)) {
 	dbmp->di_size = -1;
@@ -333,8 +284,7 @@ fsdbm_delete(obj, keystr)
 }
 
 static VALUE
-fsdbm_shift(obj)
-    VALUE obj;
+fsdbm_shift(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -343,11 +293,11 @@ fsdbm_shift(obj)
 
     fdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
-    key = sdbm_firstkey(dbm); 
+    key = sdbm_firstkey(dbm);
     if (!key.dptr) return Qnil;
     val = sdbm_fetch(dbm, key);
-    keystr = rb_tainted_str_new(key.dptr, key.dsize);
-    valstr = rb_tainted_str_new(val.dptr, val.dsize);
+    keystr = rb_external_str_new(key.dptr, key.dsize);
+    valstr = rb_external_str_new(val.dptr, val.dsize);
     sdbm_delete(dbm, key);
     if (dbmp->di_size >= 0) {
 	dbmp->di_size--;
@@ -357,8 +307,7 @@ fsdbm_shift(obj)
 }
 
 static VALUE
-fsdbm_delete_if(obj)
-    VALUE obj;
+fsdbm_delete_if(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -373,32 +322,31 @@ fsdbm_delete_if(obj)
     dbmp->di_size = -1;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_external_str_new(key.dptr, key.dsize);
+	valstr = rb_external_str_new(val.dptr, val.dsize);
         ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
         if (status != 0) break;
 	if (RTEST(ret)) rb_ary_push(ary, keystr);
 	GetDBM2(obj, dbmp, dbm);
     }
 
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	keystr = RARRAY(ary)->ptr[i];
-	StringValue(keystr);
-	key.dptr = RSTRING(keystr)->ptr;
-	key.dsize = RSTRING(keystr)->len;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	keystr = RARRAY_PTR(ary)[i];
+	ExportStringValue(keystr);
+	key.dptr = RSTRING_PTR(keystr);
+	key.dsize = RSTRING_LEN(keystr);
 	if (sdbm_delete(dbm, key)) {
 	    rb_raise(rb_eDBMError, "sdbm_delete failed");
 	}
     }
     if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
+    if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
 
     return obj;
 }
 
 static VALUE
-fsdbm_clear(obj)
-    VALUE obj;
+fsdbm_clear(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -418,8 +366,7 @@ fsdbm_clear(obj)
 }
 
 static VALUE
-fsdbm_invert(obj)
-    VALUE obj;
+fsdbm_invert(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -430,56 +377,15 @@ fsdbm_invert(obj)
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_external_str_new(key.dptr, key.dsize);
+	valstr = rb_external_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
     return hash;
 }
 
-static VALUE each_pair _((VALUE));
-
-static VALUE
-each_pair(obj)
-    VALUE obj;
-{
-    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
-}
-
-static VALUE fsdbm_store _((VALUE,VALUE,VALUE));
-
-static VALUE
-update_i(pair, dbm)
-    VALUE pair, dbm;
-{
-    Check_Type(pair, T_ARRAY);
-    if (RARRAY(pair)->len < 2) {
-	rb_raise(rb_eArgError, "pair must be [key, value]");
-    }
-    fsdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
-    return Qnil;
-}
-
 static VALUE
-fsdbm_update(obj, other)
-    VALUE obj, other;
-{
-    rb_iterate(each_pair, other, update_i, obj);
-    return obj;
-}
-
-static VALUE
-fsdbm_replace(obj, other)
-    VALUE obj, other;
-{
-    fsdbm_clear(obj);
-    rb_iterate(each_pair, other, update_i, obj);
-    return obj;
-}
-
-static VALUE
-fsdbm_store(obj, keystr, valstr)
-    VALUE obj, keystr, valstr;
+fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -491,14 +397,14 @@ fsdbm_store(obj, keystr, valstr)
     }
 
     fdbm_modify(obj);
-    StringValue(keystr);
-    StringValue(valstr);
+    ExportStringValue(keystr);
+    ExportStringValue(valstr);
 
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
+    val.dptr = RSTRING_PTR(valstr);
+    val.dsize = RSTRING_LEN(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
@@ -514,8 +420,33 @@ fsdbm_store(obj, keystr, valstr)
 }
 
 static VALUE
-fsdbm_length(obj)
-    VALUE obj;
+update_i(VALUE pair, VALUE dbm)
+{
+    Check_Type(pair, T_ARRAY);
+    if (RARRAY_LEN(pair) < 2) {
+	rb_raise(rb_eArgError, "pair must be [key, value]");
+    }
+    fsdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    return Qnil;
+}
+
+static VALUE
+fsdbm_update(VALUE obj, VALUE other)
+{
+    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+    return obj;
+}
+
+static VALUE
+fsdbm_replace(VALUE obj, VALUE other)
+{
+    fsdbm_clear(obj);
+    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+    return obj;
+}
+
+static VALUE
+fsdbm_length(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -534,8 +465,7 @@ fsdbm_length(obj)
 }
 
 static VALUE
-fsdbm_empty_p(obj)
-    VALUE obj;
+fsdbm_empty_p(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -558,52 +488,55 @@ fsdbm_empty_p(obj)
 }
 
 static VALUE
-fsdbm_each_value(obj)
-    VALUE obj;
+fsdbm_each_value(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
+	rb_yield(rb_external_str_new(val.dptr, val.dsize));
 	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
 
 static VALUE
-fsdbm_each_key(obj)
-    VALUE obj;
+fsdbm_each_key(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
     DBM *dbm;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	rb_yield(rb_external_str_new(key.dptr, key.dsize));
 	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
 
 static VALUE
-fsdbm_each_pair(obj)
-    VALUE obj;
+fsdbm_each_pair(VALUE obj)
 {
     datum key, val;
     DBM *dbm;
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_external_str_new(key.dptr, key.dsize);
+	valstr = rb_external_str_new(val.dptr, val.dsize);
 	rb_yield(rb_assoc_new(keystr, valstr));
 	GetDBM2(obj, dbmp, dbm);
     }
@@ -612,8 +545,7 @@ fsdbm_each_pair(obj)
 }
 
 static VALUE
-fsdbm_keys(obj)
-    VALUE obj;
+fsdbm_keys(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
@@ -623,15 +555,14 @@ fsdbm_keys(obj)
     GetDBM2(obj, dbmp, dbm);
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
+	rb_ary_push(ary, rb_external_str_new(key.dptr, key.dsize));
     }
 
     return ary;
 }
 
 static VALUE
-fsdbm_values(obj)
-    VALUE obj;
+fsdbm_values(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -642,23 +573,22 @@ fsdbm_values(obj)
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
+	rb_ary_push(ary, rb_external_str_new(val.dptr, val.dsize));
     }
 
     return ary;
 }
 
 static VALUE
-fsdbm_has_key(obj, keystr)
-    VALUE obj, keystr;
+fsdbm_has_key(VALUE obj, VALUE keystr)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    ExportStringValue(keystr);
+    key.dptr = RSTRING_PTR(keystr);
+    key.dsize = RSTRING_LEN(keystr);
 
     GetDBM2(obj, dbmp, dbm);
     val = sdbm_fetch(dbm, key);
@@ -667,30 +597,28 @@ fsdbm_has_key(obj, keystr)
 }
 
 static VALUE
-fsdbm_has_value(obj, valstr)
-    VALUE obj, valstr;
+fsdbm_has_value(VALUE obj, VALUE valstr)
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(valstr);
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
+    ExportStringValue(valstr);
+    val.dptr = RSTRING_PTR(valstr);
+    val.dsize = RSTRING_LEN(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	if (val.dsize == RSTRING(valstr)->len &&
-	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
+	if (val.dsize == RSTRING_LEN(valstr) &&
+	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
 	    return Qtrue;
     }
     return Qfalse;
 }
 
 static VALUE
-fsdbm_to_a(obj)
-    VALUE obj;
+fsdbm_to_a(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -701,16 +629,15 @@ fsdbm_to_a(obj)
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-				      rb_tainted_str_new(val.dptr, val.dsize)));
+	rb_ary_push(ary, rb_assoc_new(rb_external_str_new(key.dptr, key.dsize),
+				      rb_external_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
 }
 
 static VALUE
-fsdbm_to_hash(obj)
-    VALUE obj;
+fsdbm_to_hash(VALUE obj)
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -721,16 +648,15 @@ fsdbm_to_hash(obj)
     hash = rb_hash_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
-		           rb_tainted_str_new(val.dptr, val.dsize));
+	rb_hash_aset(hash, rb_external_str_new(key.dptr, key.dsize),
+		           rb_external_str_new(val.dptr, val.dsize));
     }
 
     return hash;
 }
 
 static VALUE
-fsdbm_reject(obj)
-    VALUE obj;
+fsdbm_reject(VALUE obj)
 {
     return rb_hash_delete_if(fsdbm_to_hash(obj));
 }
@@ -753,9 +679,8 @@ Init_sdbm()
     rb_define_method(rb_cDBM, "[]=", fsdbm_store, 2);
     rb_define_method(rb_cDBM, "store", fsdbm_store, 2);
     rb_define_method(rb_cDBM, "index",  fsdbm_index, 1);
-    rb_define_method(rb_cDBM, "indexes",  fsdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "indices",  fsdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "select",  fsdbm_select, -1);
+    rb_define_method(rb_cDBM, "key",  fsdbm_key, 1);
+    rb_define_method(rb_cDBM, "select",  fsdbm_select, 0);
     rb_define_method(rb_cDBM, "values_at",  fsdbm_values_at, -1);
     rb_define_method(rb_cDBM, "length", fsdbm_length, 0);
     rb_define_method(rb_cDBM, "size", fsdbm_length, 0);
diff --git a/ext/sdbm/sdbm.h b/ext/sdbm/sdbm.h
index ce8f54c4d4..c3b53c4a8f 100644
--- a/ext/sdbm/sdbm.h
+++ b/ext/sdbm/sdbm.h
@@ -2,11 +2,13 @@
  * sdbm - ndbm work-alike hashed database library
  * based on Per-Ake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
  * author: oz@nexus.yorku.ca
- * status: public domain. 
+ * status: public domain.
  */
 #ifndef	_SDBM_H_
 #define	_SDBM_H_
 
+#include <stdio.h>
+
 #define DBLKSIZ 4096
 #define PBLKSIZ 1024
 #define PAIRMAX 1008			/* arbitrary on PBLKSIZ-N */
@@ -19,11 +21,11 @@ typedef struct {
 	int dirf;		       /* directory file descriptor */
 	int pagf;		       /* page file descriptor */
 	int flags;		       /* status/error flags, see below */
-	long maxbno;		       /* size of dirfile in bits */
+	int keyptr;		       /* current key for nextkey */
+	off_t maxbno;		       /* size of dirfile in bits */
 	long curbit;		       /* current bit number */
 	long hmask;		       /* current hash mask */
 	long blkptr;		       /* current block for nextkey */
-	int keyptr;		       /* current key for nextkey */
 	long blkno;		       /* current page to read/write */
 	long pagbno;		       /* current page in pagbuf */
 	char pagbuf[PBLKSIZ];	       /* page file block buffer */
@@ -52,7 +54,7 @@ typedef struct {
 
 extern datum nullitem;
 
-#if defined(__STDC__) || defined(MSDOS)
+#if defined(__STDC__)
 #define proto(p) p
 #else
 #define proto(p) ()
diff --git a/ext/socket/.cvsignore b/ext/socket/.cvsignore
index 4088712231..ce98586d91 100644
--- a/ext/socket/.cvsignore
+++ b/ext/socket/.cvsignore
@@ -1,3 +1,5 @@
 Makefile
 mkmf.log
 *.def
+constants.h
+extconf.h
diff --git a/ext/socket/.document b/ext/socket/.document
new file mode 100644
index 0000000000..636418d086
--- /dev/null
+++ b/ext/socket/.document
@@ -0,0 +1,16 @@
+init.c
+raddrinfo.c
+basicsocket.c
+ipsocket.c
+tcpsocket.c
+tcpserver.c
+sockssocket.c
+udpsocket.c
+unixsocket.c
+unixserver.c
+socket.c
+option.c
+ancdata.c
+constants.c
+constdefs.c
+lib/socket.rb
diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h
index a22615ee00..3a478cf36c 100644
--- a/ext/socket/addrinfo.h
+++ b/ext/socket/addrinfo.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,7 +29,6 @@
 
 #ifndef ADDR_INFO_H
 #define ADDR_INFO_H
-#ifndef HAVE_GETADDRINFO
 
 /* special compatibility hack */
 #undef EAI_ADDRFAMILY
@@ -50,6 +49,7 @@
 #undef AI_PASSIVE
 #undef AI_CANONNAME
 #undef AI_NUMERICHOST
+#undef AI_NUMERICSERV
 #undef AI_ALL
 #undef AI_ADDRCONFIG
 #undef AI_V4MAPPED
@@ -61,12 +61,6 @@
 #undef NI_NUMERICSERV
 #undef NI_DGRAM
 
-#define addrinfo addrinfo__compat
-#define getaddrinfo getaddrinfo__compat
-#define getnameinfo getnameinfo__compat
-#define freehostent freehostent__compat
-#define freeaddrinfo freeaddrinfo__compat
-
 #ifndef __P
 # ifdef HAVE_PROTOTYPES
 #  define __P(args) args
@@ -102,8 +96,12 @@
 #define	AI_PASSIVE	0x00000001 /* get address to use bind() */
 #define	AI_CANONNAME	0x00000002 /* fill ai_canonname */
 #define	AI_NUMERICHOST	0x00000004 /* prevent name resolution */
+#define	AI_NUMERICSERV	0x00000008 /* prevent service name resolution */
 /* valid flags for addrinfo */
-#define	AI_MASK		(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST)
+#ifndef __HAIKU__
+#undef AI_MASK
+#define	AI_MASK		(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV)
+#endif
 
 #define	AI_ALL		0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
 #define	AI_V4MAPPED_CFG	0x00000200 /* accept IPv4-mapped if kernel supports */
@@ -129,6 +127,7 @@
 #define	NI_NUMERICSERV	0x00000008
 #define	NI_DGRAM	0x00000010
 
+#ifndef HAVE_TYPE_STRUCT_ADDRINFO
 struct addrinfo {
 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
 	int	ai_family;	/* PF_xxx */
@@ -139,6 +138,24 @@ struct addrinfo {
 	struct sockaddr *ai_addr;	/* binary address */
 	struct addrinfo *ai_next;	/* next structure in linked list */
 };
+#endif
+
+#ifndef HAVE_GETADDRINFO
+#undef getaddrinfo
+#define getaddrinfo getaddrinfo__compat
+#endif
+#ifndef HAVE_GETNAMEINFO
+#undef getnameinfo
+#define getnameinfo getnameinfo__compat
+#endif
+#ifndef HAVE_FREEHOSTENT
+#undef freehostent
+#define freehostent freehostent__compat
+#endif
+#ifndef HAVE_FREEADDRINFO
+#undef freeaddrinfo
+#define freeaddrinfo freeaddrinfo__compat
+#endif
 
 extern int getaddrinfo __P((
 	const char *hostname, const char *servname,
@@ -147,19 +164,22 @@ extern int getaddrinfo __P((
 
 extern int getnameinfo __P((
 	const struct sockaddr *sa,
-	size_t salen,
+	socklen_t salen,
 	char *host,
-	size_t hostlen,
+	socklen_t hostlen,
 	char *serv,
-	size_t servlen,
+	socklen_t servlen,
 	int flags));
 
 extern void freehostent __P((struct hostent *));
+#ifndef HAVE_PADDRINFO
 extern void freeaddrinfo __P((struct addrinfo *));
-#if defined __UCLIBC__
+#endif
+extern
+#ifdef GAI_STRERROR_CONST
 const
 #endif
-extern char *gai_strerror __P((int));
+char *gai_strerror __P((int));
 
 /* In case there is no definition of offsetof() provided - though any proper
 Standard C system should have one. */
@@ -169,4 +189,3 @@ Standard C system should have one. */
 #endif
 
 #endif
-#endif
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
new file mode 100644
index 0000000000..307e21ecaa
--- /dev/null
+++ b/ext/socket/ancdata.c
@@ -0,0 +1,1800 @@
+#include "rubysocket.h"
+
+#include <time.h>
+
+#if defined(HAVE_ST_MSG_CONTROL)
+static VALUE rb_cAncillaryData;
+
+static VALUE
+constant_to_sym(int constant, ID (*intern_const)(int))
+{
+    ID name = intern_const(constant);
+    if (name) {
+        return ID2SYM(name);
+    }
+
+    return INT2NUM(constant);
+}
+
+static VALUE
+ip_cmsg_type_to_sym(int level, int cmsg_type)
+{
+    switch (level) {
+      case SOL_SOCKET:
+        return constant_to_sym(cmsg_type, rsock_intern_scm_optname);
+      case IPPROTO_IP:
+        return constant_to_sym(cmsg_type, rsock_intern_ip_optname);
+#ifdef IPPROTO_IPV6
+      case IPPROTO_IPV6:
+        return constant_to_sym(cmsg_type, rsock_intern_ipv6_optname);
+#endif
+      case IPPROTO_TCP:
+        return constant_to_sym(cmsg_type, rsock_intern_tcp_optname);
+      case IPPROTO_UDP:
+        return constant_to_sym(cmsg_type, rsock_intern_udp_optname);
+      default:
+        return INT2NUM(cmsg_type);
+    }
+}
+
+/*
+ * call-seq:
+ *   Socket::AncillaryData.new(family, cmsg_level, cmsg_type, cmsg_data) -> ancillarydata
+ *
+ * _family_ should be an integer, a string or a symbol.
+ * - Socket::AF_INET, "AF_INET", "INET", :AF_INET, :INET
+ * - Socket::AF_UNIX, "AF_UNIX", "UNIX", :AF_UNIX, :UNIX
+ * - etc.
+ *
+ * _cmsg_level_ should be an integer, a string or a symbol.
+ * - Socket::SOL_SOCKET, "SOL_SOCKET", "SOCKET", :SOL_SOCKET and :SOCKET
+ * - Socket::IPPROTO_IP, "IP" and :IP
+ * - Socket::IPPROTO_IPV6, "IPV6" and :IPV6
+ * - Socket::IPPROTO_TCP, "TCP" and :TCP
+ * - etc.
+ *
+ * _cmsg_type_ should be an integer, a string or a symbol.
+ * If a string/symbol is specified, it is interpreted depend on _cmsg_level_.
+ * - Socket::SCM_RIGHTS, "SCM_RIGHTS", "RIGHTS", :SCM_RIGHTS, :RIGHTS for SOL_SOCKET
+ * - Socket::IP_RECVTTL, "RECVTTL" and :RECVTTL for IPPROTO_IP
+ * - Socket::IPV6_PKTINFO, "PKTINFO" and :PKTINFO for IPPROTO_IPV6
+ * - etc.
+ *
+ * _cmsg_data_ should be a string.
+ *
+ *   p Socket::AncillaryData.new(:INET, :TCP, :NODELAY, "")
+ *   #=> #<Socket::AncillaryData: INET TCP NODELAY "">
+ *
+ *   p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "")
+ *   #=> #<Socket::AncillaryData: INET6 IPV6 PKTINFO "">
+ *
+ */
+static VALUE
+ancillary_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE vtype, VALUE data)
+{
+    int family = rsock_family_arg(vfamily);
+    int level = rsock_level_arg(family, vlevel);
+    int type = rsock_cmsg_type_arg(family, level, vtype);
+    StringValue(data);
+    rb_ivar_set(self, rb_intern("family"), INT2NUM(family));
+    rb_ivar_set(self, rb_intern("level"), INT2NUM(level));
+    rb_ivar_set(self, rb_intern("type"), INT2NUM(type));
+    rb_ivar_set(self, rb_intern("data"), data);
+    return self;
+}
+
+static VALUE
+ancdata_new(int family, int level, int type, VALUE data)
+{
+    NEWOBJ(obj, struct RObject);
+    OBJSETUP(obj, rb_cAncillaryData, T_OBJECT);
+    StringValue(data);
+    ancillary_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(type), data);
+    return (VALUE)obj;
+}
+
+static int
+ancillary_family(VALUE self)
+{
+    VALUE v = rb_attr_get(self, rb_intern("family"));
+    return NUM2INT(v);
+}
+
+/*
+ * call-seq:
+ *   ancillarydata.family => integer
+ *
+ * returns the socket family as an integer.
+ *
+ *   p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").family
+ *   #=> 10
+ */
+static VALUE
+ancillary_family_m(VALUE self)
+{
+    return INT2NUM(ancillary_family(self));
+}
+
+static int
+ancillary_level(VALUE self)
+{
+    VALUE v = rb_attr_get(self, rb_intern("level"));
+    return NUM2INT(v);
+}
+
+/*
+ * call-seq:
+ *   ancillarydata.level => integer
+ *
+ * returns the cmsg level as an integer.
+ *
+ *   p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").level
+ *   #=> 41
+ */
+static VALUE
+ancillary_level_m(VALUE self)
+{
+    return INT2NUM(ancillary_level(self));
+}
+
+static int
+ancillary_type(VALUE self)
+{
+    VALUE v = rb_attr_get(self, rb_intern("type"));
+    return NUM2INT(v);
+}
+
+/*
+ * call-seq:
+ *   ancillarydata.type => integer
+ *
+ * returns the cmsg type as an integer.
+ *
+ *   p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").type
+ *   #=> 2
+ */
+static VALUE
+ancillary_type_m(VALUE self)
+{
+    return INT2NUM(ancillary_type(self));
+}
+
+/*
+ * call-seq:
+ *   ancillarydata.data => string
+ *
+ * returns the cmsg data as a string.
+ *
+ *   p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").data
+ *   #=> ""
+ */
+static VALUE
+ancillary_data(VALUE self)
+{
+    VALUE v = rb_attr_get(self, rb_intern("data"));
+    StringValue(v);
+    return v;
+}
+
+#ifdef SCM_RIGHTS
+/*
+ * call-seq:
+ *   Socket::AncillaryData.unix_rights(io1, io2, ...) => ancillarydata
+ *
+ * Creates a new Socket::AncillaryData object which contains file descriptors as data.
+ *
+ *   p Socket::AncillaryData.unix_rights(STDERR)
+ *   #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 2>
+ */
+static VALUE
+ancillary_s_unix_rights(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE result, str, ary;
+    int i;
+
+    ary = rb_ary_new();
+
+    for (i = 0 ; i < argc; i++) {
+        VALUE obj = argv[i];
+        if (TYPE(obj) != T_FILE) {
+            rb_raise(rb_eTypeError, "IO expected");
+        }
+        rb_ary_push(ary, obj);
+    }
+
+    str = rb_str_buf_new(sizeof(int) * argc);
+
+    for (i = 0 ; i < argc; i++) {
+        VALUE obj = RARRAY_PTR(ary)[i];
+        rb_io_t *fptr;
+        int fd;
+        GetOpenFile(obj, fptr);
+        fd = fptr->fd;
+        rb_str_buf_cat(str, (char *)&fd, sizeof(int));
+    }
+
+    result = ancdata_new(AF_UNIX, SOL_SOCKET, SCM_RIGHTS, str);
+    rb_ivar_set(result, rb_intern("unix_rights"), ary);
+    return result;
+}
+#else
+#define ancillary_s_unix_rights rb_f_notimplement
+#endif
+
+#ifdef SCM_RIGHTS
+/*
+ * call-seq:
+ *   ancillarydata.unix_rights => array-of-IOs or nil
+ *
+ * returns the array of IO objects for SCM_RIGHTS control message in UNIX domain socket.
+ *
+ * The class of the IO objects in the array is IO or Socket.
+ *
+ * The array is attached to _ancillarydata_ when it is instantiated.
+ * For example, BasicSocket#recvmsg attach the array when
+ * receives a SCM_RIGHTS control message and :scm_rights=>true option is given.
+ *
+ *   # recvmsg needs :scm_rights=>true for unix_rights
+ *   s1, s2 = UNIXSocket.pair
+ *   p s1                                         #=> #<UNIXSocket:fd 3>
+ *   s1.sendmsg "stdin and a socket", 0, nil, Socket::AncillaryData.unix_rights(STDIN, s1)
+ *   _, _, _, ctl = s2.recvmsg(:scm_rights=>true)
+ *   p ctl                                        #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 6 7>
+ *   p ctl.unix_rights                            #=> [#<IO:fd 6>, #<Socket:fd 7>]
+ *   p File.identical?(STDIN, ctl.unix_rights[0]) #=> true
+ *   p File.identical?(s1, ctl.unix_rights[1])    #=> true
+ *
+ *   # If :scm_rights=>true is not given, unix_rights returns nil
+ *   s1, s2 = UNIXSocket.pair
+ *   s1.sendmsg "stdin and a socket", 0, nil, Socket::AncillaryData.unix_rights(STDIN, s1)
+ *   _, _, _, ctl = s2.recvmsg
+ *   p ctl #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 6 7>
+ *   p ctl.unix_rights #=> nil
+ *
+ */
+static VALUE
+ancillary_unix_rights(VALUE self)
+{
+    int level, type;
+
+    level = ancillary_level(self);
+    type = ancillary_type(self);
+
+    if (level != SOL_SOCKET || type != SCM_RIGHTS)
+        rb_raise(rb_eTypeError, "SCM_RIGHTS ancillary data expected");
+
+    return rb_attr_get(self, rb_intern("unix_rights"));
+}
+#else
+#define ancillary_unix_rights rb_f_notimplement
+#endif
+
+#if defined(SCM_TIMESTAMP) || defined(SCM_TIMESTAMPNS) || defined(SCM_BINTIME)
+/*
+ * call-seq:
+ *   ancillarydata.timestamp => time
+ *
+ * returns the timestamp as a time object.
+ *
+ * _ancillarydata_ should be one of following type:
+ * - SOL_SOCKET/SCM_TIMESTAMP (micro second) GNU/Linux, FreeBSD, NetBSD, OpenBSD, Solaris, MacOS X
+ * - SOL_SOCKET/SCM_TIMESTAMPNS (nano second) GNU/Linux
+ * - SOL_SOCKET/SCM_BINTIME (2**(-64) second) FreeBSD
+ *
+ *   Addrinfo.udp("127.0.0.1", 0).bind {|s1|
+ *     Addrinfo.udp("127.0.0.1", 0).bind {|s2|
+ *       s1.setsockopt(:SOCKET, :TIMESTAMP, true)
+ *       s2.send "a", 0, s1.local_address
+ *       ctl = s1.recvmsg.last
+ *       p ctl    #=> #<Socket::AncillaryData: INET SOCKET TIMESTAMP 2009-02-24 17:35:46.775581>
+ *       t = ctl.timestamp
+ *       p t      #=> 2009-02-24 17:35:46 +0900
+ *       p t.usec #=> 775581
+ *       p t.nsec #=> 775581000
+ *     }
+ *   }
+ *
+ */
+static VALUE
+ancillary_timestamp(VALUE self)
+{
+    int level, type;
+    VALUE data;
+    VALUE result = Qnil;
+
+    level = ancillary_level(self);
+    type = ancillary_type(self);
+    data = ancillary_data(self);
+
+# ifdef SCM_TIMESTAMP
+    if (level == SOL_SOCKET && type == SCM_TIMESTAMP &&
+        RSTRING_LEN(data) == sizeof(struct timeval)) {
+        struct timeval tv;
+        memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv));
+        result = rb_time_new(tv.tv_sec, tv.tv_usec);
+    }
+# endif
+
+# ifdef SCM_TIMESTAMPNS
+    if (level == SOL_SOCKET && type == SCM_TIMESTAMPNS &&
+        RSTRING_LEN(data) == sizeof(struct timespec)) {
+        struct timespec ts;
+        memcpy((char*)&ts, RSTRING_PTR(data), sizeof(ts));
+        result = rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
+    }
+# endif
+
+#define add(x,y) (rb_funcall((x), '+', 1, (y)))
+#define mul(x,y) (rb_funcall((x), '*', 1, (y)))
+#define quo(x,y) (rb_funcall((x), rb_intern("quo"), 1, (y)))
+
+# ifdef SCM_BINTIME
+    if (level == SOL_SOCKET && type == SCM_BINTIME &&
+        RSTRING_LEN(data) == sizeof(struct bintime)) {
+        struct bintime bt;
+	VALUE d, timev;
+        memcpy((char*)&bt, RSTRING_PTR(data), sizeof(bt));
+	d = ULL2NUM(0x100000000UL);
+	d = mul(d,d);
+	timev = add(TIMET2NUM(bt.sec), quo(ULL2NUM(bt.frac), d));
+        result = rb_time_num_new(timev, Qnil);
+    }
+# endif
+
+    if (result == Qnil)
+        rb_raise(rb_eTypeError, "timestamp ancillary data expected");
+
+    return result;
+}
+#else
+#define ancillary_timestamp rb_f_notimplement
+#endif
+
+/*
+ * call-seq:
+ *   Socket::AncillaryData.int(family, cmsg_level, cmsg_type, integer) => ancillarydata
+ *
+ * Creates a new Socket::AncillaryData object which contains a int as data.
+ *
+ * The size and endian is dependent on the host.
+ *
+ *   p Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, STDERR.fileno)
+ *   #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 2>
+ */
+static VALUE
+ancillary_s_int(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE vtype, VALUE integer)
+{
+    int family = rsock_family_arg(vfamily);
+    int level = rsock_level_arg(family, vlevel);
+    int type = rsock_cmsg_type_arg(family, level, vtype);
+    int i = NUM2INT(integer);
+    return ancdata_new(family, level, type, rb_str_new((char*)&i, sizeof(i)));
+}
+
+/*
+ * call-seq:
+ *   ancillarydata.int => integer
+ *
+ * Returns the data in _ancillarydata_ as an int.
+ *
+ * The size and endian is dependent on the host.
+ *
+ *   ancdata = Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, STDERR.fileno)
+ *   p ancdata.int #=> 2
+ */
+static VALUE
+ancillary_int(VALUE self)
+{
+    VALUE data;
+    int i;
+    data = ancillary_data(self);
+    if (RSTRING_LEN(data) != sizeof(int))
+        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(int)=%d but %ld", (int)sizeof(int), (long)RSTRING_LEN(data));
+    memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
+    return INT2NUM(i);
+}
+
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
+/*
+ * call-seq:
+ *   Socket::AncillaryData.ip_pktinfo(addr, ifindex) => ancdata
+ *   Socket::AncillaryData.ip_pktinfo(addr, ifindex, spec_dst) => ancdata
+ *
+ * Returns new ancillary data for IP_PKTINFO.
+ *
+ * If spec_dst is not given, addr is used.
+ *
+ * IP_PKTINFO is not standard.
+ *
+ * Supported platform: GNU/Linux
+ *
+ *   addr = Addrinfo.ip("127.0.0.1")
+ *   ifindex = 0
+ *   spec_dst = Addrinfo.ip("127.0.0.1")
+ *   p Socket::AncillaryData.ip_pktinfo(addr, ifindex, spec_dst)
+ *   #=> #<Socket::AncillaryData: INET IP PKTINFO 127.0.0.1 ifindex:0 spec_dst:127.0.0.1>
+ *
+ */
+static VALUE
+ancillary_s_ip_pktinfo(int argc, VALUE *argv, VALUE self)
+{
+    VALUE v_addr, v_ifindex, v_spec_dst;
+    unsigned int ifindex;
+    struct sockaddr_in sa;
+    struct in_pktinfo pktinfo;
+
+    rb_scan_args(argc, argv, "21", &v_addr, &v_ifindex, &v_spec_dst);
+
+    SockAddrStringValue(v_addr);
+    ifindex = NUM2UINT(v_ifindex);
+    if (NIL_P(v_spec_dst))
+        v_spec_dst = v_addr;
+    else
+        SockAddrStringValue(v_spec_dst);
+
+    memset(&pktinfo, 0, sizeof(pktinfo));
+
+    memset(&sa, 0, sizeof(sa));
+    if (RSTRING_LEN(v_addr) != sizeof(sa))
+        rb_raise(rb_eArgError, "addr size different to AF_INET sockaddr");
+    memcpy(&sa, RSTRING_PTR(v_addr), sizeof(sa));
+    if (sa.sin_family != AF_INET)
+        rb_raise(rb_eArgError, "addr is not AF_INET sockaddr");
+    memcpy(&pktinfo.ipi_addr, &sa.sin_addr, sizeof(pktinfo.ipi_addr));
+
+    pktinfo.ipi_ifindex = ifindex;
+
+    memset(&sa, 0, sizeof(sa));
+    if (RSTRING_LEN(v_spec_dst) != sizeof(sa))
+        rb_raise(rb_eArgError, "spec_dat size different to AF_INET sockaddr");
+    memcpy(&sa, RSTRING_PTR(v_spec_dst), sizeof(sa));
+    if (sa.sin_family != AF_INET)
+        rb_raise(rb_eArgError, "spec_dst is not AF_INET sockaddr");
+    memcpy(&pktinfo.ipi_spec_dst, &sa.sin_addr, sizeof(pktinfo.ipi_spec_dst));
+
+    return ancdata_new(AF_INET, IPPROTO_IP, IP_PKTINFO, rb_str_new((char *)&pktinfo, sizeof(pktinfo)));
+}
+#else
+#define ancillary_s_ip_pktinfo rb_f_notimplement
+#endif
+
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
+/*
+ * call-seq:
+ *   ancdata.ip_pktinfo => [addr, ifindex, spec_dst]
+ *
+ * Extracts addr, ifindex and spec_dst from IP_PKTINFO ancillary data.
+ *
+ * IP_PKTINFO is not standard.
+ *
+ * Supported platform: GNU/Linux
+ *
+ *   addr = Addrinfo.ip("127.0.0.1")
+ *   ifindex = 0
+ *   spec_dest = Addrinfo.ip("127.0.0.1")
+ *   ancdata = Socket::AncillaryData.ip_pktinfo(addr, ifindex, spec_dest)
+ *   p ancdata.ip_pktinfo
+ *   #=> [#<Addrinfo: 127.0.0.1>, 0, #<Addrinfo: 127.0.0.1>]
+ *
+ *
+ */
+static VALUE
+ancillary_ip_pktinfo(VALUE self)
+{
+    int level, type;
+    VALUE data;
+    struct in_pktinfo pktinfo;
+    struct sockaddr_in sa;
+    VALUE v_spec_dst, v_addr;
+
+    level = ancillary_level(self);
+    type = ancillary_type(self);
+    data = ancillary_data(self);
+
+    if (level != IPPROTO_IP || type != IP_PKTINFO ||
+        RSTRING_LEN(data) != sizeof(struct in_pktinfo)) {
+        rb_raise(rb_eTypeError, "IP_PKTINFO ancillary data expected");
+    }
+
+    memcpy(&pktinfo, RSTRING_PTR(data), sizeof(struct in_pktinfo));
+    memset(&sa, 0, sizeof(sa));
+
+    sa.sin_family = AF_INET;
+    memcpy(&sa.sin_addr, &pktinfo.ipi_addr, sizeof(sa.sin_addr));
+    v_addr = rsock_addrinfo_new((struct sockaddr *)&sa, sizeof(sa), PF_INET, 0, 0, Qnil, Qnil);
+
+    sa.sin_family = AF_INET;
+    memcpy(&sa.sin_addr, &pktinfo.ipi_spec_dst, sizeof(sa.sin_addr));
+    v_spec_dst = rsock_addrinfo_new((struct sockaddr *)&sa, sizeof(sa), PF_INET, 0, 0, Qnil, Qnil);
+
+    return rb_ary_new3(3, v_addr, UINT2NUM(pktinfo.ipi_ifindex), v_spec_dst);
+}
+#else
+#define ancillary_ip_pktinfo rb_f_notimplement
+#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
+/*
+ * call-seq:
+ *   Socket::AncillaryData.ipv6_pktinfo(addr, ifindex) => ancdata
+ *
+ * Returns new ancillary data for IPV6_PKTINFO.
+ *
+ * IPV6_PKTINFO is defined by RFC 3542.
+ *
+ *   addr = Addrinfo.ip("::1")
+ *   ifindex = 0
+ *   p Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
+ *   #=> #<Socket::AncillaryData: INET6 IPV6 PKTINFO ::1 ifindex:0>
+ *
+ */
+static VALUE
+ancillary_s_ipv6_pktinfo(VALUE self, VALUE v_addr, VALUE v_ifindex)
+{
+    unsigned int ifindex;
+    struct sockaddr_in6 sa;
+    struct in6_pktinfo pktinfo;
+
+    SockAddrStringValue(v_addr);
+    ifindex = NUM2UINT(v_ifindex);
+
+    memset(&pktinfo, 0, sizeof(pktinfo));
+
+    memset(&sa, 0, sizeof(sa));
+    if (RSTRING_LEN(v_addr) != sizeof(sa))
+        rb_raise(rb_eArgError, "addr size different to AF_INET6 sockaddr");
+    memcpy(&sa, RSTRING_PTR(v_addr), sizeof(sa));
+    if (sa.sin6_family != AF_INET6)
+        rb_raise(rb_eArgError, "addr is not AF_INET6 sockaddr");
+    memcpy(&pktinfo.ipi6_addr, &sa.sin6_addr, sizeof(pktinfo.ipi6_addr));
+
+    pktinfo.ipi6_ifindex = ifindex;
+
+    return ancdata_new(AF_INET6, IPPROTO_IPV6, IPV6_PKTINFO, rb_str_new((char *)&pktinfo, sizeof(pktinfo)));
+}
+#else
+#define ancillary_s_ipv6_pktinfo rb_f_notimplement
+#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
+static void
+extract_ipv6_pktinfo(VALUE self, struct in6_pktinfo *pktinfo_ptr, struct sockaddr_in6 *sa_ptr)
+{
+    int level, type;
+    VALUE data;
+
+    level = ancillary_level(self);
+    type = ancillary_type(self);
+    data = ancillary_data(self);
+
+    if (level != IPPROTO_IPV6 || type != IPV6_PKTINFO ||
+        RSTRING_LEN(data) != sizeof(struct in6_pktinfo)) {
+        rb_raise(rb_eTypeError, "IPV6_PKTINFO ancillary data expected");
+    }
+
+    memcpy(pktinfo_ptr, RSTRING_PTR(data), sizeof(*pktinfo_ptr));
+
+    memset(sa_ptr, 0, sizeof(*sa_ptr));
+    SET_SA_LEN((struct sockaddr *)sa_ptr, sizeof(struct sockaddr_in6));
+    sa_ptr->sin6_family = AF_INET6;
+    memcpy(&sa_ptr->sin6_addr, &pktinfo_ptr->ipi6_addr, sizeof(sa_ptr->sin6_addr));
+    if (IN6_IS_ADDR_LINKLOCAL(&sa_ptr->sin6_addr))
+        sa_ptr->sin6_scope_id = pktinfo_ptr->ipi6_ifindex;
+}
+#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
+/*
+ * call-seq:
+ *   ancdata.ipv6_pktinfo => [addr, ifindex]
+ *
+ * Extracts addr and ifindex from IPV6_PKTINFO ancillary data.
+ *
+ * IPV6_PKTINFO is defined by RFC 3542.
+ *
+ *   addr = Addrinfo.ip("::1")
+ *   ifindex = 0
+ *   ancdata = Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
+ *   p ancdata.ipv6_pktinfo #=> [#<Addrinfo: ::1>, 0]
+ *
+ */
+static VALUE
+ancillary_ipv6_pktinfo(VALUE self)
+{
+    struct in6_pktinfo pktinfo;
+    struct sockaddr_in6 sa;
+    VALUE v_addr;
+
+    extract_ipv6_pktinfo(self, &pktinfo, &sa);
+    v_addr = rsock_addrinfo_new((struct sockaddr *)&sa, (socklen_t)sizeof(sa), PF_INET6, 0, 0, Qnil, Qnil);
+    return rb_ary_new3(2, v_addr, UINT2NUM(pktinfo.ipi6_ifindex));
+}
+#else
+#define ancillary_ipv6_pktinfo rb_f_notimplement
+#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
+/*
+ * call-seq:
+ *   ancdata.ipv6_pktinfo_addr => addr
+ *
+ * Extracts addr from IPV6_PKTINFO ancillary data.
+ *
+ * IPV6_PKTINFO is defined by RFC 3542.
+ *
+ *   addr = Addrinfo.ip("::1")
+ *   ifindex = 0
+ *   ancdata = Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
+ *   p ancdata.ipv6_pktinfo_addr #=> #<Addrinfo: ::1>
+ *
+ */
+static VALUE
+ancillary_ipv6_pktinfo_addr(VALUE self)
+{
+    struct in6_pktinfo pktinfo;
+    struct sockaddr_in6 sa;
+    extract_ipv6_pktinfo(self, &pktinfo, &sa);
+    return rsock_addrinfo_new((struct sockaddr *)&sa, (socklen_t)sizeof(sa), PF_INET6, 0, 0, Qnil, Qnil);
+}
+#else
+#define ancillary_ipv6_pktinfo_addr rb_f_notimplement
+#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
+/*
+ * call-seq:
+ *   ancdata.ipv6_pktinfo_ifindex => addr
+ *
+ * Extracts ifindex from IPV6_PKTINFO ancillary data.
+ *
+ * IPV6_PKTINFO is defined by RFC 3542.
+ *
+ *   addr = Addrinfo.ip("::1")
+ *   ifindex = 0
+ *   ancdata = Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
+ *   p ancdata.ipv6_pktinfo_ifindex #=> 0
+ *
+ */
+static VALUE
+ancillary_ipv6_pktinfo_ifindex(VALUE self)
+{
+    struct in6_pktinfo pktinfo;
+    struct sockaddr_in6 sa;
+    extract_ipv6_pktinfo(self, &pktinfo, &sa);
+    return UINT2NUM(pktinfo.ipi6_ifindex);
+}
+#else
+#define ancillary_ipv6_pktinfo_ifindex rb_f_notimplement
+#endif
+
+#if defined(SOL_SOCKET) && defined(SCM_RIGHTS) /* 4.4BSD */
+static int
+anc_inspect_socket_rights(int level, int type, VALUE data, VALUE ret)
+{
+    if (level == SOL_SOCKET && type == SCM_RIGHTS &&
+        0 < RSTRING_LEN(data) && (RSTRING_LEN(data) % sizeof(int) == 0)) {
+        long off;
+        for (off = 0; off < RSTRING_LEN(data); off += sizeof(int)) {
+            int fd;
+            memcpy((char*)&fd, RSTRING_PTR(data)+off, sizeof(int));
+            rb_str_catf(ret, " %d", fd);
+        }
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(SCM_CREDENTIALS) /* GNU/Linux */
+static int
+anc_inspect_passcred_credentials(int level, int type, VALUE data, VALUE ret)
+{
+    if (level == SOL_SOCKET && type == SCM_CREDENTIALS &&
+        RSTRING_LEN(data) == sizeof(struct ucred)) {
+        struct ucred cred;
+        memcpy(&cred, RSTRING_PTR(data), sizeof(struct ucred));
+        rb_str_catf(ret, " pid=%u uid=%u gid=%u", cred.pid, cred.uid, cred.gid);
+	rb_str_cat2(ret, " (ucred)");
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(SCM_CREDS)
+#define INSPECT_SCM_CREDS
+static int
+anc_inspect_socket_creds(int level, int type, VALUE data, VALUE ret)
+{
+    if (level != SOL_SOCKET && type != SCM_CREDS)
+	return 0;
+
+    /*
+     * FreeBSD has struct cmsgcred and struct sockcred.
+     * They use both SOL_SOCKET/SCM_CREDS in the ancillary message.
+     * They are not ambiguous from the view of the caller
+     * because struct sockcred is sent if and only if the caller sets LOCAL_CREDS socket option.
+     * But inspect method doesn't know it.
+     * So they are ambiguous from the view of inspect.
+     * This function distinguish them by the size of the ancillary message.
+     * This heuristics works well except when sc_ngroups == CMGROUP_MAX.
+     */
+
+#if defined(HAVE_TYPE_STRUCT_CMSGCRED) /* FreeBSD */
+    if (RSTRING_LEN(data) == sizeof(struct cmsgcred)) {
+	struct cmsgcred cred;
+        memcpy(&cred, RSTRING_PTR(data), sizeof(struct cmsgcred));
+        rb_str_catf(ret, " pid=%u", cred.cmcred_pid);
+        rb_str_catf(ret, " uid=%u", cred.cmcred_uid);
+        rb_str_catf(ret, " euid=%u", cred.cmcred_euid);
+        rb_str_catf(ret, " gid=%u", cred.cmcred_gid);
+	if (cred.cmcred_ngroups) {
+	    int i;
+	    const char *sep = " groups=";
+	    for (i = 0; i < cred.cmcred_ngroups; i++) {
+		rb_str_catf(ret, "%s%u", sep, cred.cmcred_groups[i]);
+		sep = ",";
+	    }
+	}
+	rb_str_cat2(ret, " (cmsgcred)");
+        return 1;
+    }
+#endif
+#if defined(HAVE_TYPE_STRUCT_SOCKCRED) /* FreeBSD, NetBSD */
+    if ((size_t)RSTRING_LEN(data) >= SOCKCREDSIZE(0)) {
+	struct sockcred cred0, *cred;
+        memcpy(&cred0, RSTRING_PTR(data), SOCKCREDSIZE(0));
+	if ((size_t)RSTRING_LEN(data) == SOCKCREDSIZE(cred0.sc_ngroups)) {
+	    cred = (struct sockcred *)ALLOCA_N(char, SOCKCREDSIZE(cred0.sc_ngroups));
+	    memcpy(cred, RSTRING_PTR(data), SOCKCREDSIZE(cred0.sc_ngroups));
+	    rb_str_catf(ret, " uid=%u", cred->sc_uid);
+	    rb_str_catf(ret, " euid=%u", cred->sc_euid);
+	    rb_str_catf(ret, " gid=%u", cred->sc_gid);
+	    rb_str_catf(ret, " egid=%u", cred->sc_egid);
+	    if (cred0.sc_ngroups) {
+		int i;
+		const char *sep = " groups=";
+		for (i = 0; i < cred0.sc_ngroups; i++) {
+		    rb_str_catf(ret, "%s%u", sep, cred->sc_groups[i]);
+		    sep = ",";
+		}
+	    }
+	    rb_str_cat2(ret, " (sockcred)");
+	    return 1;
+	}
+    }
+#endif
+    return 0;
+}
+#endif
+
+#if defined(IPPROTO_IP) && defined(IP_RECVDSTADDR) /* 4.4BSD */
+static int
+anc_inspect_ip_recvdstaddr(int level, int type, VALUE data, VALUE ret)
+{
+    if (level == IPPROTO_IP && type == IP_RECVDSTADDR &&
+        RSTRING_LEN(data) == sizeof(struct in_addr)) {
+        struct in_addr addr;
+        char addrbuf[INET_ADDRSTRLEN];
+        memcpy(&addr, RSTRING_PTR(data), sizeof(addr));
+        if (inet_ntop(AF_INET, &addr, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
+            rb_str_cat2(ret, " invalid-address");
+        else
+            rb_str_catf(ret, " %s", addrbuf);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
+static int
+anc_inspect_ip_pktinfo(int level, int type, VALUE data, VALUE ret)
+{
+    if (level == IPPROTO_IP && type == IP_PKTINFO &&
+        RSTRING_LEN(data) == sizeof(struct in_pktinfo)) {
+        struct in_pktinfo pktinfo;
+        char buf[INET_ADDRSTRLEN > IFNAMSIZ ? INET_ADDRSTRLEN : IFNAMSIZ];
+        memcpy(&pktinfo, RSTRING_PTR(data), sizeof(pktinfo));
+        if (inet_ntop(AF_INET, &pktinfo.ipi_addr, buf, sizeof(buf)) == NULL)
+            rb_str_cat2(ret, " invalid-address");
+        else
+            rb_str_catf(ret, " %s", buf);
+        if (if_indextoname(pktinfo.ipi_ifindex, buf) == NULL)
+            rb_str_catf(ret, " ifindex:%d", pktinfo.ipi_ifindex);
+        else
+            rb_str_catf(ret, " %s", buf);
+        if (inet_ntop(AF_INET, &pktinfo.ipi_spec_dst, buf, sizeof(buf)) == NULL)
+            rb_str_cat2(ret, " spec_dst:invalid-address");
+        else
+            rb_str_catf(ret, " spec_dst:%s", buf);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN6_PKTINFO) /* IPv6 RFC3542 */
+static int
+anc_inspect_ipv6_pktinfo(int level, int type, VALUE data, VALUE ret)
+{
+    if (level == IPPROTO_IPV6 && type == IPV6_PKTINFO &&
+        RSTRING_LEN(data) == sizeof(struct in6_pktinfo)) {
+        struct in6_pktinfo *pktinfo = (struct in6_pktinfo *)RSTRING_PTR(data);
+        struct in6_addr addr;
+        unsigned int ifindex;
+        char addrbuf[INET6_ADDRSTRLEN], ifbuf[IFNAMSIZ];
+        memcpy(&addr, &pktinfo->ipi6_addr, sizeof(addr));
+        memcpy(&ifindex, &pktinfo->ipi6_ifindex, sizeof(ifindex));
+        if (inet_ntop(AF_INET6, &addr, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
+            rb_str_cat2(ret, " invalid-address");
+        else
+            rb_str_catf(ret, " %s", addrbuf);
+        if (if_indextoname(ifindex, ifbuf) == NULL)
+            rb_str_catf(ret, " ifindex:%d", ifindex);
+        else
+            rb_str_catf(ret, " %s", ifbuf);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(SCM_TIMESTAMP) /* GNU/Linux, FreeBSD, NetBSD, OpenBSD, MacOS X, Solaris */
+static int
+inspect_timeval_as_abstime(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(struct timeval)) {
+        struct timeval tv;
+        time_t time;
+        struct tm tm;
+        char buf[32];
+        memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv));
+        time = tv.tv_sec;
+        tm = *localtime(&time);
+        strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
+        rb_str_catf(ret, " %s.%06ld", buf, (long)tv.tv_usec);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(SCM_TIMESTAMPNS) /* GNU/Linux */
+static int
+inspect_timespec_as_abstime(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(struct timespec)) {
+        struct timespec ts;
+        struct tm tm;
+        char buf[32];
+        memcpy((char*)&ts, RSTRING_PTR(data), sizeof(ts));
+        tm = *localtime(&ts.tv_sec);
+        strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
+        rb_str_catf(ret, " %s.%09ld", buf, (long)ts.tv_nsec);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(SCM_BINTIME) /* FreeBSD */
+static int
+inspect_bintime_as_abstime(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(struct bintime)) {
+        struct bintime bt;
+        struct tm tm;
+	uint64_t frac_h, frac_l;
+	uint64_t scale_h, scale_l;
+	uint64_t tmp1, tmp2;
+	uint64_t res_h, res_l;
+        char buf[32];
+        memcpy((char*)&bt, RSTRING_PTR(data), sizeof(bt));
+        tm = *localtime(&bt.sec);
+        strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
+
+	/* res_h = frac * 10**19 / 2**64 */
+
+	frac_h = bt.frac >> 32;
+	frac_l = bt.frac & 0xffffffff;
+
+	scale_h = 0x8ac72304; /* 0x8ac7230489e80000 == 10**19 */
+	scale_l = 0x89e80000;
+
+	res_h = frac_h * scale_h;
+	res_l = frac_l * scale_l;
+
+	tmp1 = frac_h * scale_l;
+	res_h += tmp1 >> 32;
+	tmp2 = res_l;
+	res_l += tmp1 & 0xffffffff;
+	if (res_l < tmp2) res_h++;
+
+	tmp1 = frac_l * scale_h;
+	res_h += tmp1 >> 32;
+	tmp2 = res_l;
+	res_l += tmp1 & 0xffffffff;
+	if (res_l < tmp2) res_h++;
+
+        rb_str_catf(ret, " %s.%019"PRIu64, buf, res_h);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+/*
+ * call-seq:
+ *   ancillarydata.inspect => string
+ *
+ * returns a string which shows ancillarydata in human-readable form.
+ *
+ *   p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").inspect
+ *   #=> "#<Socket::AncillaryData: INET6 IPV6 PKTINFO \"\">"
+ */
+static VALUE
+ancillary_inspect(VALUE self)
+{
+    VALUE ret;
+    int family, level, type;
+    VALUE data;
+    ID family_id, level_id, type_id;
+    VALUE vtype;
+    int inspected;
+
+    family = ancillary_family(self);
+    level = ancillary_level(self);
+    type = ancillary_type(self);
+    data = ancillary_data(self);
+
+    ret = rb_sprintf("#<%s:", rb_obj_classname(self));
+
+    family_id = rsock_intern_family_noprefix(family);
+    if (family_id)
+        rb_str_catf(ret, " %s", rb_id2name(family_id));
+    else
+        rb_str_catf(ret, " family:%d", family);
+
+    if (level == SOL_SOCKET) {
+        rb_str_cat2(ret, " SOCKET");
+
+        type_id = rsock_intern_scm_optname(type);
+        if (type_id)
+            rb_str_catf(ret, " %s", rb_id2name(type_id));
+        else
+            rb_str_catf(ret, " cmsg_type:%d", type);
+    }
+    else if (IS_IP_FAMILY(family)) {
+        level_id = rsock_intern_iplevel(level);
+        if (level_id)
+            rb_str_catf(ret, " %s", rb_id2name(level_id));
+        else
+            rb_str_catf(ret, " cmsg_level:%d", level);
+
+        vtype = ip_cmsg_type_to_sym(level, type);
+        if (SYMBOL_P(vtype))
+            rb_str_catf(ret, " %s", rb_id2name(SYM2ID(vtype)));
+        else
+            rb_str_catf(ret, " cmsg_type:%d", type);
+    }
+    else {
+        rb_str_catf(ret, " cmsg_level:%d", level);
+        rb_str_catf(ret, " cmsg_type:%d", type);
+    }
+
+    inspected = 0;
+
+    if (level == SOL_SOCKET)
+        family = AF_UNSPEC;
+
+    switch (family) {
+      case AF_UNSPEC:
+        switch (level) {
+#        if defined(SOL_SOCKET)
+          case SOL_SOCKET:
+            switch (type) {
+#            if defined(SCM_TIMESTAMP) /* GNU/Linux, FreeBSD, NetBSD, OpenBSD, MacOS X, Solaris */
+              case SCM_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break;
+#            endif
+#            if defined(SCM_TIMESTAMPNS) /* GNU/Linux */
+              case SCM_TIMESTAMPNS: inspected = inspect_timespec_as_abstime(level, type, data, ret); break;
+#            endif
+#            if defined(SCM_BINTIME) /* FreeBSD */
+              case SCM_BINTIME: inspected = inspect_bintime_as_abstime(level, type, data, ret); break;
+#            endif
+#            if defined(SCM_RIGHTS) /* 4.4BSD */
+              case SCM_RIGHTS: inspected = anc_inspect_socket_rights(level, type, data, ret); break;
+#            endif
+#            if defined(SCM_CREDENTIALS) /* GNU/Linux */
+              case SCM_CREDENTIALS: inspected = anc_inspect_passcred_credentials(level, type, data, ret); break;
+#            endif
+#            if defined(INSPECT_SCM_CREDS) /* NetBSD */
+              case SCM_CREDS: inspected = anc_inspect_socket_creds(level, type, data, ret); break;
+#            endif
+            }
+            break;
+#        endif
+        }
+        break;
+
+      case AF_INET:
+#ifdef INET6
+      case AF_INET6:
+#endif
+        switch (level) {
+#        if defined(IPPROTO_IP)
+          case IPPROTO_IP:
+            switch (type) {
+#            if defined(IP_RECVDSTADDR) /* 4.4BSD */
+              case IP_RECVDSTADDR: inspected = anc_inspect_ip_recvdstaddr(level, type, data, ret); break;
+#            endif
+#            if defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
+              case IP_PKTINFO: inspected = anc_inspect_ip_pktinfo(level, type, data, ret); break;
+#            endif
+            }
+            break;
+#        endif
+
+#        if defined(IPPROTO_IPV6)
+          case IPPROTO_IPV6:
+            switch (type) {
+#            if defined(IPV6_PKTINFO) /* RFC 3542 */
+              case IPV6_PKTINFO: inspected = anc_inspect_ipv6_pktinfo(level, type, data, ret); break;
+#            endif
+            }
+            break;
+#        endif
+        }
+        break;
+    }
+
+    if (!inspected) {
+        rb_str_cat2(ret, " ");
+        rb_str_append(ret, rb_str_dump(data));
+    }
+
+    rb_str_cat2(ret, ">");
+
+    return ret;
+}
+
+/*
+ * call-seq:
+ *   ancillarydata.cmsg_is?(level, type) => true or false
+ *
+ * tests the level and type of _ancillarydata_.
+ *
+ *   ancdata = Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "")
+ *   ancdata.cmsg_is?(Socket::IPPROTO_IPV6, Socket::IPV6_PKTINFO) #=> true
+ *   ancdata.cmsg_is?(:IPV6, :PKTINFO)       #=> true
+ *   ancdata.cmsg_is?(:IP, :PKTINFO)         #=> false
+ *   ancdata.cmsg_is?(:SOCKET, :RIGHTS)      #=> false
+ */
+static VALUE
+ancillary_cmsg_is_p(VALUE self, VALUE vlevel, VALUE vtype)
+{
+    int family = ancillary_family(self);
+    int level = rsock_level_arg(family, vlevel);
+    int type = rsock_cmsg_type_arg(family, level, vtype);
+
+    if (ancillary_level(self) == level &&
+        ancillary_type(self) == type)
+        return Qtrue;
+    else
+        return Qfalse;
+}
+
+#endif
+
+#if defined(HAVE_SENDMSG)
+struct sendmsg_args_struct {
+    int fd;
+    const struct msghdr *msg;
+    int flags;
+};
+
+static VALUE
+nogvl_sendmsg_func(void *ptr)
+{
+    struct sendmsg_args_struct *args = ptr;
+    return sendmsg(args->fd, args->msg, args->flags);
+}
+
+static ssize_t
+rb_sendmsg(int fd, const struct msghdr *msg, int flags)
+{
+    struct sendmsg_args_struct args;
+    args.fd = fd;
+    args.msg = msg;
+    args.flags = flags;
+    return rb_thread_blocking_region(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0);
+}
+
+static VALUE
+bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
+{
+    rb_io_t *fptr;
+    VALUE data, vflags, dest_sockaddr;
+    VALUE *controls_ptr;
+    int controls_num;
+    struct msghdr mh;
+    struct iovec iov;
+#if defined(HAVE_ST_MSG_CONTROL)
+    volatile VALUE controls_str = 0;
+#endif
+    int flags;
+    ssize_t ss;
+    int family;
+
+    rb_secure(4);
+    GetOpenFile(sock, fptr);
+    family = rsock_getfamily(fptr->fd);
+
+    data = vflags = dest_sockaddr = Qnil;
+    controls_ptr = NULL;
+    controls_num = 0;
+
+    if (argc == 0)
+        rb_raise(rb_eArgError, "mesg argument required");
+    data = argv[0];
+    if (1 < argc) vflags = argv[1];
+    if (2 < argc) dest_sockaddr = argv[2];
+    if (3 < argc) { controls_ptr = &argv[3]; controls_num = argc - 3; }
+
+    StringValue(data);
+
+    if (controls_num) {
+#if defined(HAVE_ST_MSG_CONTROL)
+	int i;
+	size_t last_pad = 0;
+        int last_level = 0;
+        int last_type = 0;
+        controls_str = rb_str_tmp_new(0);
+        for (i = 0; i < controls_num; i++) {
+            VALUE elt = controls_ptr[i], v;
+            VALUE vlevel, vtype;
+            int level, type;
+            VALUE cdata;
+            long oldlen;
+            struct cmsghdr cmh;
+            char *cmsg;
+            size_t cspace;
+            v = rb_check_convert_type(elt, T_ARRAY, "Array", "to_ary");
+            if (!NIL_P(v)) {
+                elt = v;
+                if (RARRAY_LEN(elt) != 3)
+                    rb_raise(rb_eArgError, "an element of controls should be 3-elements array");
+                vlevel = rb_ary_entry(elt, 0);
+                vtype = rb_ary_entry(elt, 1);
+                cdata = rb_ary_entry(elt, 2);
+            }
+            else {
+                vlevel = rb_funcall(elt, rb_intern("level"), 0);
+                vtype = rb_funcall(elt, rb_intern("type"), 0);
+                cdata = rb_funcall(elt, rb_intern("data"), 0);
+            }
+            level = rsock_level_arg(family, vlevel);
+            type = rsock_cmsg_type_arg(family, level, vtype);
+            StringValue(cdata);
+            oldlen = RSTRING_LEN(controls_str);
+            cspace = CMSG_SPACE(RSTRING_LEN(cdata));
+            rb_str_resize(controls_str, oldlen + cspace);
+            cmsg = RSTRING_PTR(controls_str)+oldlen;
+            memset((char *)cmsg, 0, cspace);
+            memset((char *)&cmh, 0, sizeof(cmh));
+            cmh.cmsg_level = level;
+            cmh.cmsg_type = type;
+            cmh.cmsg_len = (socklen_t)CMSG_LEN(RSTRING_LEN(cdata));
+            MEMCPY(cmsg, &cmh, char, sizeof(cmh));
+            MEMCPY(cmsg+((char*)CMSG_DATA(&cmh)-(char*)&cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata));
+            last_level = cmh.cmsg_level;
+            last_type = cmh.cmsg_type;
+	    last_pad = cspace - cmh.cmsg_len;
+        }
+	if (last_pad) {
+            /*
+             * This code removes the last padding from msg_controllen.
+             *
+             * 4.3BSD-Reno reject the padding for SCM_RIGHTS. (There was no 64bit environments in those days?)
+             * RFC 2292 require the padding.
+             * RFC 3542 relaxes the condition - implementation must accept both as valid.
+             *
+             * Actual problems:
+             *
+             * - NetBSD 4.0.1
+             *   SCM_RIGHTS with padding causes EINVAL
+             *   IPV6_PKTINFO without padding causes "page fault trap"
+             *     http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40661
+             *
+             * - OpenBSD 4.4
+             *   IPV6_PKTINFO without padding causes EINVAL
+             *
+             * Basically, msg_controllen should contains the padding.
+             * So the padding is removed only if a problem really exists.
+             */
+#if defined(__NetBSD__)
+            if (last_level == SOL_SOCKET && last_type == SCM_RIGHTS)
+                rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
+#endif
+	}
+#else
+	rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
+#endif
+    }
+
+    flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
+#ifdef MSG_DONTWAIT
+    if (nonblock)
+        flags |= MSG_DONTWAIT;
+#endif
+
+    if (!NIL_P(dest_sockaddr))
+	SockAddrStringValue(dest_sockaddr);
+
+    rb_io_check_closed(fptr);
+
+  retry:
+    memset(&mh, 0, sizeof(mh));
+    if (!NIL_P(dest_sockaddr)) {
+        mh.msg_name = RSTRING_PTR(dest_sockaddr);
+        mh.msg_namelen = RSTRING_LENINT(dest_sockaddr);
+    }
+    mh.msg_iovlen = 1;
+    mh.msg_iov = &iov;
+    iov.iov_base = RSTRING_PTR(data);
+    iov.iov_len = RSTRING_LEN(data);
+#if defined(HAVE_ST_MSG_CONTROL)
+    if (controls_str) {
+        mh.msg_control = RSTRING_PTR(controls_str);
+        mh.msg_controllen = RSTRING_LENINT(controls_str);
+    }
+    else {
+        mh.msg_control = NULL;
+        mh.msg_controllen = 0;
+    }
+#endif
+
+    rb_io_check_closed(fptr);
+    if (nonblock)
+        rb_io_set_nonblock(fptr);
+
+    ss = rb_sendmsg(fptr->fd, &mh, flags);
+
+    if (!nonblock && rb_io_wait_writable(fptr->fd)) {
+        rb_io_check_closed(fptr);
+        goto retry;
+    }
+
+    if (ss == -1) {
+        if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
+            rb_mod_sys_fail(rb_mWaitWritable, "sendmsg(2) would block");
+	rb_sys_fail("sendmsg(2)");
+    }
+
+    return SSIZET2NUM(ss);
+}
+#endif
+
+#if defined(HAVE_SENDMSG)
+/*
+ * call-seq:
+ *    basicsocket.sendmsg(mesg, flags=0, dest_sockaddr=nil, *controls) => numbytes_sent
+ *
+ * sendmsg sends a message using sendmsg(2) system call in blocking manner.
+ *
+ * _mesg_ is a string to send.
+ *
+ * _flags_ is bitwise OR of MSG_* constants such as Socket::MSG_OOB.
+ *
+ * _dest_sockaddr_ is a destination socket address for connection-less socket.
+ * It should be a sockaddr such as a result of Socket.sockaddr_in.
+ * An Addrinfo object can be used too.
+ *
+ * _controls_ is a list of ancillary data.
+ * The element of _controls_ should be Socket::AncillaryData or
+ * 3-elements array.
+ * The 3-element array should contains cmsg_level, cmsg_type and data.
+ *
+ * The return value, _numbytes_sent_ is an integer which is the number of bytes sent.
+ *
+ * sendmsg can be used to implement send_io as follows:
+ *
+ *   # use Socket::AncillaryData.
+ *   ancdata = Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, io.fileno)
+ *   sock.sendmsg("a", 0, nil, ancdata)
+ *
+ *   # use 3-element array.
+ *   ancdata = [:SOCKET, :RIGHTS, [io.fileno].pack("i!")]
+ *   sock.sendmsg("\0", 0, nil, ancdata)
+ *
+ */
+VALUE
+rsock_bsock_sendmsg(int argc, VALUE *argv, VALUE sock)
+{
+    return bsock_sendmsg_internal(argc, argv, sock, 0);
+}
+#endif
+
+#if defined(HAVE_SENDMSG)
+/*
+ * call-seq:
+ *    basicsocket.sendmsg_nonblock(mesg, flags=0, dest_sockaddr=nil, *controls) => numbytes_sent
+ *
+ * sendmsg_nonblock sends a message using sendmsg(2) system call in non-blocking manner.
+ *
+ * It is similar to BasicSocket#sendmsg
+ * but the non-blocking flag is set before the system call
+ * and it doesn't retry the system call.
+ *
+ */
+VALUE
+rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock)
+{
+    return bsock_sendmsg_internal(argc, argv, sock, 1);
+}
+#endif
+
+#if defined(HAVE_RECVMSG)
+struct recvmsg_args_struct {
+    int fd;
+    struct msghdr *msg;
+    int flags;
+};
+
+static VALUE
+nogvl_recvmsg_func(void *ptr)
+{
+    struct recvmsg_args_struct *args = ptr;
+    return recvmsg(args->fd, args->msg, args->flags);
+}
+
+static ssize_t
+rb_recvmsg(int fd, struct msghdr *msg, int flags)
+{
+    struct recvmsg_args_struct args;
+    args.fd = fd;
+    args.msg = msg;
+    args.flags = flags;
+    return rb_thread_blocking_region(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0);
+}
+
+#if defined(HAVE_ST_MSG_CONTROL)
+static void
+discard_cmsg(struct cmsghdr *cmh, char *msg_end)
+{
+    if (cmh->cmsg_level == SOL_SOCKET && cmh->cmsg_type == SCM_RIGHTS) {
+        int *fdp = (int *)CMSG_DATA(cmh);
+        int *end = (int *)((char *)cmh + cmh->cmsg_len);
+        while ((char *)fdp + sizeof(int) <= (char *)end &&
+               (char *)fdp + sizeof(int) <= msg_end) {
+            close(*fdp);
+            fdp++;
+        }
+    }
+}
+#endif
+
+void
+rsock_discard_cmsg_resource(struct msghdr *mh)
+{
+#if defined(HAVE_ST_MSG_CONTROL)
+    struct cmsghdr *cmh;
+    char *msg_end;
+
+    if (mh->msg_controllen == 0)
+        return;
+
+    msg_end = (char *)mh->msg_control + mh->msg_controllen;
+
+    for (cmh = CMSG_FIRSTHDR(mh); cmh != NULL; cmh = CMSG_NXTHDR(mh, cmh)) {
+        discard_cmsg(cmh, msg_end);
+    }
+#endif
+}
+
+#if defined(HAVE_ST_MSG_CONTROL)
+static void
+make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
+{
+    if (cmh->cmsg_level == SOL_SOCKET && cmh->cmsg_type == SCM_RIGHTS) {
+        int *fdp, *end;
+	VALUE ary = rb_ary_new();
+	rb_ivar_set(ctl, rb_intern("unix_rights"), ary);
+        fdp = (int *)CMSG_DATA(cmh);
+        end = (int *)((char *)cmh + cmh->cmsg_len);
+        while ((char *)fdp + sizeof(int) <= (char *)end &&
+	       (char *)fdp + sizeof(int) <= msg_end) {
+            int fd = *fdp;
+            struct stat stbuf;
+            VALUE io;
+            if (fstat(fd, &stbuf) == -1)
+                rb_raise(rb_eSocket, "invalid fd in SCM_RIGHTS");
+            if (S_ISSOCK(stbuf.st_mode))
+                io = rsock_init_sock(rb_obj_alloc(rb_cSocket), fd);
+            else
+                io = rb_io_fdopen(fd, O_RDWR, NULL);
+            ary = rb_attr_get(ctl, rb_intern("unix_rights"));
+            rb_ary_push(ary, io);
+            fdp++;
+        }
+	OBJ_FREEZE(ary);
+    }
+}
+#endif
+
+static VALUE
+bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
+{
+    rb_io_t *fptr;
+    VALUE vmaxdatlen, vmaxctllen, vflags, vopts;
+    int grow_buffer;
+    size_t maxdatlen;
+    int flags, orig_flags;
+    int request_scm_rights;
+    struct msghdr mh;
+    struct iovec iov;
+    struct sockaddr_storage namebuf;
+    char datbuf0[4096], *datbuf;
+    VALUE dat_str = Qnil;
+    VALUE ret;
+    ssize_t ss;
+#if defined(HAVE_ST_MSG_CONTROL)
+    struct cmsghdr *cmh;
+    size_t maxctllen;
+    union {
+        char bytes[4096];
+        struct cmsghdr align;
+    } ctlbuf0;
+    char *ctlbuf;
+    VALUE ctl_str = Qnil;
+    int family;
+    int gc_done = 0;
+#endif
+
+    rb_secure(4);
+
+    vopts = Qnil;
+    if (0 < argc && TYPE(argv[argc-1]) == T_HASH)
+        vopts = argv[--argc];
+
+    rb_scan_args(argc, argv, "03", &vmaxdatlen, &vflags, &vmaxctllen);
+
+    maxdatlen = NIL_P(vmaxdatlen) ? sizeof(datbuf0) : NUM2SIZET(vmaxdatlen);
+#if defined(HAVE_ST_MSG_CONTROL)
+    maxctllen = NIL_P(vmaxctllen) ? sizeof(ctlbuf0) : NUM2SIZET(vmaxctllen);
+#else
+    if (!NIL_P(vmaxctllen))
+        rb_raise(rb_eArgError, "control message not supported");
+#endif
+    flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
+#ifdef MSG_DONTWAIT
+    if (nonblock)
+        flags |= MSG_DONTWAIT;
+#endif
+    orig_flags = flags;
+
+    grow_buffer = NIL_P(vmaxdatlen) || NIL_P(vmaxctllen);
+
+    request_scm_rights = 0;
+    if (!NIL_P(vopts) && RTEST(rb_hash_aref(vopts, ID2SYM(rb_intern("scm_rights")))))
+        request_scm_rights = 1;
+
+    GetOpenFile(sock, fptr);
+    if (rb_io_read_pending(fptr)) {
+        rb_raise(rb_eIOError, "recvmsg for buffered IO");
+    }
+
+#if !defined(HAVE_ST_MSG_CONTROL)
+    if (grow_buffer) {
+	int socktype;
+	socklen_t optlen = (socklen_t)sizeof(socktype);
+        if (getsockopt(fptr->fd, SOL_SOCKET, SO_TYPE, (void*)&socktype, &optlen) == -1) {
+	    rb_sys_fail("getsockopt(SO_TYPE)");
+	}
+	if (socktype == SOCK_STREAM)
+	    grow_buffer = 0;
+    }
+#endif
+
+  retry:
+    if (maxdatlen <= sizeof(datbuf0))
+        datbuf = datbuf0;
+    else {
+        if (NIL_P(dat_str))
+            dat_str = rb_str_tmp_new(maxdatlen);
+        else
+            rb_str_resize(dat_str, maxdatlen);
+        datbuf = RSTRING_PTR(dat_str);
+    }
+
+#if defined(HAVE_ST_MSG_CONTROL)
+    if (maxctllen <= sizeof(ctlbuf0))
+        ctlbuf = ctlbuf0.bytes;
+    else {
+        if (NIL_P(ctl_str))
+            ctl_str = rb_str_tmp_new(maxctllen);
+        else
+            rb_str_resize(ctl_str, maxctllen);
+        ctlbuf = RSTRING_PTR(ctl_str);
+    }
+#endif
+
+    memset(&mh, 0, sizeof(mh));
+
+    memset(&namebuf, 0, sizeof(namebuf));
+    mh.msg_name = (struct sockaddr *)&namebuf;
+    mh.msg_namelen = (socklen_t)sizeof(namebuf);
+
+    mh.msg_iov = &iov;
+    mh.msg_iovlen = 1;
+    iov.iov_base = datbuf;
+    iov.iov_len = maxdatlen;
+
+#if defined(HAVE_ST_MSG_CONTROL)
+    mh.msg_control = ctlbuf;
+    mh.msg_controllen = (socklen_t)maxctllen;
+#endif
+
+    if (grow_buffer)
+        flags |= MSG_PEEK;
+
+    rb_io_check_closed(fptr);
+    if (nonblock)
+        rb_io_set_nonblock(fptr);
+
+    ss = rb_recvmsg(fptr->fd, &mh, flags);
+
+    if (!nonblock && rb_io_wait_readable(fptr->fd)) {
+        rb_io_check_closed(fptr);
+        goto retry;
+    }
+
+    if (ss == -1) {
+        if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
+            rb_mod_sys_fail(rb_mWaitReadable, "recvmsg(2) would block");
+#if defined(HAVE_ST_MSG_CONTROL)
+        if (!gc_done && (errno == EMFILE || errno == EMSGSIZE)) {
+          /*
+           * When SCM_RIGHTS hit the file descriptors limit:
+           * - Linux 2.6.18 causes success with MSG_CTRUNC
+           * - MacOS X 10.4 causes EMSGSIZE (and lost file descriptors?)
+           * - Solaris 11 causes EMFILE
+           */
+          gc_and_retry:
+            rb_gc();
+            gc_done = 1;
+	    goto retry;
+        }
+#endif
+	rb_sys_fail("recvmsg(2)");
+    }
+
+    if (grow_buffer) {
+	int grown = 0;
+#if defined(HAVE_ST_MSG_CONTROL)
+        if (NIL_P(vmaxdatlen) && (mh.msg_flags & MSG_TRUNC)) {
+            if (SIZE_MAX/2 < maxdatlen)
+                rb_raise(rb_eArgError, "max data length too big");
+	    maxdatlen *= 2;
+	    grown = 1;
+	}
+        if (NIL_P(vmaxctllen) && (mh.msg_flags & MSG_CTRUNC)) {
+#define BIG_ENOUGH_SPACE 65536
+            if (BIG_ENOUGH_SPACE < maxctllen &&
+                mh.msg_controllen < maxctllen - BIG_ENOUGH_SPACE) {
+                /* there are big space bug truncated.
+                 * file descriptors limit? */
+                if (!gc_done) {
+		    rsock_discard_cmsg_resource(&mh);
+                    goto gc_and_retry;
+		}
+            }
+            else {
+                if (SIZE_MAX/2 < maxctllen)
+                    rb_raise(rb_eArgError, "max control message length too big");
+                maxctllen *= 2;
+                grown = 1;
+            }
+#undef BIG_ENOUGH_SPACE
+	}
+#else
+	if (NIL_P(vmaxdatlen) && ss != -1 && ss == (ssize_t)iov.iov_len) {
+            if (SIZE_MAX/2 < maxdatlen)
+                rb_raise(rb_eArgError, "max data length too big");
+	    maxdatlen *= 2;
+	    grown = 1;
+	}
+#endif
+	if (grown) {
+            rsock_discard_cmsg_resource(&mh);
+	    goto retry;
+	}
+	else {
+            grow_buffer = 0;
+            if (flags != orig_flags) {
+                flags = orig_flags;
+                rsock_discard_cmsg_resource(&mh);
+                goto retry;
+            }
+        }
+    }
+
+    if (NIL_P(dat_str))
+        dat_str = rb_tainted_str_new(datbuf, ss);
+    else {
+        rb_str_resize(dat_str, ss);
+        OBJ_TAINT(dat_str);
+        RBASIC(dat_str)->klass = rb_cString;
+    }
+
+    ret = rb_ary_new3(3, dat_str,
+                         rsock_io_socket_addrinfo(sock, mh.msg_name, mh.msg_namelen),
+#if defined(HAVE_ST_MSG_CONTROL)
+			 INT2NUM(mh.msg_flags)
+#else
+			 Qnil
+#endif
+			 );
+
+#if defined(HAVE_ST_MSG_CONTROL)
+    family = rsock_getfamily(fptr->fd);
+    if (mh.msg_controllen) {
+	char *msg_end = (char *)mh.msg_control + mh.msg_controllen;
+        for (cmh = CMSG_FIRSTHDR(&mh); cmh != NULL; cmh = CMSG_NXTHDR(&mh, cmh)) {
+            VALUE ctl;
+	    char *ctl_end;
+            size_t clen;
+            if (cmh->cmsg_len == 0) {
+                rb_raise(rb_eTypeError, "invalid control message (cmsg_len == 0)");
+            }
+            ctl_end = (char*)cmh + cmh->cmsg_len;
+	    clen = (ctl_end <= msg_end ? ctl_end : msg_end) - (char*)CMSG_DATA(cmh);
+            ctl = ancdata_new(family, cmh->cmsg_level, cmh->cmsg_type, rb_tainted_str_new((char*)CMSG_DATA(cmh), clen));
+            if (request_scm_rights)
+                make_io_for_unix_rights(ctl, cmh, msg_end);
+            else
+                discard_cmsg(cmh, msg_end);
+            rb_ary_push(ret, ctl);
+        }
+    }
+#endif
+
+    return ret;
+}
+#endif
+
+#if defined(HAVE_RECVMSG)
+/*
+ * call-seq:
+ *    basicsocket.recvmsg(maxmesglen=nil, flags=0, maxcontrollen=nil, opts={}) => [mesg, sender_addrinfo, rflags, *controls]
+ *
+ * recvmsg receives a message using recvmsg(2) system call in blocking manner.
+ *
+ * _maxmesglen_ is the maximum length of mesg to receive.
+ *
+ * _flags_ is bitwise OR of MSG_* constants such as Socket::MSG_PEEK.
+ *
+ * _maxcontrollen_ is the maximum length of controls (ancillary data) to receive.
+ *
+ * _opts_ is option hash.
+ * Currently :scm_rights=>bool is the only option.
+ *
+ * :scm_rights option specifies that application expects SCM_RIGHTS control message.
+ * If the value is nil or false, application don't expects SCM_RIGHTS control message.
+ * In this case, recvmsg closes the passed file descriptors immediately.
+ * This is the default behavior.
+ *
+ * If :scm_rights value is neither nil nor false, application expects SCM_RIGHTS control message.
+ * In this case, recvmsg creates IO objects for each file descriptors for
+ * Socket::AncillaryData#unix_rights method.
+ *
+ * The return value is 4-elements array.
+ *
+ * _mesg_ is a string of the received message.
+ *
+ * _sender_addrinfo_ is a sender socket address for connection-less socket.
+ * It is an Addrinfo object.
+ * For connection-oriented socket such as TCP, sender_addrinfo is platform dependent.
+ *
+ * _rflags_ is a flags on the received message which is bitwise OR of MSG_* constants such as Socket::MSG_TRUNC.
+ * It will be nil if the system uses 4.3BSD style old recvmsg system call.
+ *
+ * _controls_ is ancillary data which is an array of Socket::AncillaryData objects such as:
+ *
+ *   #<Socket::AncillaryData: AF_UNIX SOCKET RIGHTS 7>
+ *
+ * _maxmesglen_ and _maxcontrollen_ can be nil.
+ * In that case, the buffer will be grown until the message is not truncated.
+ * Internally, MSG_PEEK is used and MSG_TRUNC/MSG_CTRUNC are checked.
+ *
+ * recvmsg can be used to implement recv_io as follows:
+ *
+ *   mesg, sender_sockaddr, rflags, *controls = sock.recvmsg(:scm_rights=>true)
+ *   controls.each {|ancdata|
+ *     if ancdata.cmsg_is?(:SOCKET, :RIGHTS)
+ *       return ancdata.unix_rights[0]
+ *     end
+ *   }
+ *
+ */
+VALUE
+rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock)
+{
+    return bsock_recvmsg_internal(argc, argv, sock, 0);
+}
+#endif
+
+#if defined(HAVE_RECVMSG)
+/*
+ * call-seq:
+ *    basicsocket.recvmsg_nonblock(maxdatalen=nil, flags=0, maxcontrollen=nil, opts={}) => [data, sender_addrinfo, rflags, *controls]
+ *
+ * recvmsg receives a message using recvmsg(2) system call in non-blocking manner.
+ *
+ * It is similar to BasicSocket#recvmsg
+ * but non-blocking flag is set before the system call
+ * and it doesn't retry the system call.
+ *
+ */
+VALUE
+rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock)
+{
+    return bsock_recvmsg_internal(argc, argv, sock, 1);
+}
+#endif
+
+/*
+ * Document-class: ::Socket::AncillaryData
+ *
+ * Socket::AncillaryData represents the ancillary data (control information)
+ * used by sendmsg and recvmsg system call.
+ * It contains socket family, cmsg level, cmsg type and cmsg data.
+ */
+void
+rsock_init_ancdata(void)
+{
+#if defined(HAVE_ST_MSG_CONTROL)
+    rb_cAncillaryData = rb_define_class_under(rb_cSocket, "AncillaryData", rb_cObject);
+    rb_define_method(rb_cAncillaryData, "initialize", ancillary_initialize, 4);
+    rb_define_method(rb_cAncillaryData, "inspect", ancillary_inspect, 0);
+    rb_define_method(rb_cAncillaryData, "family", ancillary_family_m, 0);
+    rb_define_method(rb_cAncillaryData, "level", ancillary_level_m, 0);
+    rb_define_method(rb_cAncillaryData, "type", ancillary_type_m, 0);
+    rb_define_method(rb_cAncillaryData, "data", ancillary_data, 0);
+
+    rb_define_method(rb_cAncillaryData, "cmsg_is?", ancillary_cmsg_is_p, 2);
+
+    rb_define_singleton_method(rb_cAncillaryData, "int", ancillary_s_int, 4);
+    rb_define_method(rb_cAncillaryData, "int", ancillary_int, 0);
+
+    rb_define_singleton_method(rb_cAncillaryData, "unix_rights", ancillary_s_unix_rights, -1);
+    rb_define_method(rb_cAncillaryData, "unix_rights", ancillary_unix_rights, 0);
+
+    rb_define_method(rb_cAncillaryData, "timestamp", ancillary_timestamp, 0);
+
+    rb_define_singleton_method(rb_cAncillaryData, "ip_pktinfo", ancillary_s_ip_pktinfo, -1);
+    rb_define_method(rb_cAncillaryData, "ip_pktinfo", ancillary_ip_pktinfo, 0);
+
+    rb_define_singleton_method(rb_cAncillaryData, "ipv6_pktinfo", ancillary_s_ipv6_pktinfo, 2);
+    rb_define_method(rb_cAncillaryData, "ipv6_pktinfo", ancillary_ipv6_pktinfo, 0);
+    rb_define_method(rb_cAncillaryData, "ipv6_pktinfo_addr", ancillary_ipv6_pktinfo_addr, 0);
+    rb_define_method(rb_cAncillaryData, "ipv6_pktinfo_ifindex", ancillary_ipv6_pktinfo_ifindex, 0);
+#endif
+}
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
new file mode 100644
index 0000000000..e744ad27d3
--- /dev/null
+++ b/ext/socket/basicsocket.c
@@ -0,0 +1,771 @@
+/************************************************
+
+  basicsocket.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+/*
+ * call-seq:
+ *   BasicSocket.for_fd(fd) => basicsocket
+ *
+ * Returns a socket object which contains the file descriptor, _fd_.
+ *
+ *   # If invoked by inetd, STDIN/STDOUT/STDERR is a socket.
+ *   STDIN_SOCK = Socket.for_fd(STDIN.fileno)
+ *   p STDIN_SOCK.remote_address
+ *
+ */
+static VALUE
+bsock_s_for_fd(VALUE klass, VALUE fd)
+{
+    rb_io_t *fptr;
+    VALUE sock = rsock_init_sock(rb_obj_alloc(klass), NUM2INT(fd));
+
+    GetOpenFile(sock, fptr);
+
+    return sock;
+}
+
+/*
+ * call-seq:
+ *   basicsocket.shutdown([how]) => 0
+ *
+ * Calls shutdown(2) system call.
+ *
+ * s.shutdown(Socket::SHUT_RD) disallows further read.
+ *
+ * s.shutdown(Socket::SHUT_WR) disallows further write.
+ *
+ * s.shutdown(Socket::SHUT_RDWR) disallows further read and write.
+ *
+ * _how_ can be symbol or string:
+ * - :RD, :SHUT_RD, "RD" and "SHUT_RD" are accepted as Socket::SHUT_RD.
+ * - :WR, :SHUT_WR, "WR" and "SHUT_WR" are accepted as Socket::SHUT_WR.
+ * - :RDWR, :SHUT_RDWR, "RDWR" and "SHUT_RDWR" are accepted as Socket::SHUT_RDWR.
+ *
+ *   UNIXSocket.pair {|s1, s2|
+ *     s1.puts "ping"
+ *     s1.shutdown(:WR)
+ *     p s2.read          #=> "ping\n"
+ *     s2.puts "pong"
+ *     s2.close
+ *     p s1.read          #=> "pong\n"
+ *   }
+ *
+ */
+static VALUE
+bsock_shutdown(int argc, VALUE *argv, VALUE sock)
+{
+    VALUE howto;
+    int how;
+    rb_io_t *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
+    }
+    rb_scan_args(argc, argv, "01", &howto);
+    if (howto == Qnil)
+	how = SHUT_RDWR;
+    else {
+	how = rsock_shutdown_how_arg(howto);
+        if (how != SHUT_WR && how != SHUT_RD && how != SHUT_RDWR) {
+	    rb_raise(rb_eArgError, "`how' should be either :SHUT_RD, :SHUT_WR, :SHUT_RDWR");
+	}
+    }
+    GetOpenFile(sock, fptr);
+    if (shutdown(fptr->fd, how) == -1)
+	rb_sys_fail(0);
+
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *   basicsocket.close_read => nil
+ *
+ * Disallows further read using shutdown system call.
+ *
+ *   s1, s2 = UNIXSocket.pair
+ *   s1.close_read
+ *   s2.puts #=> Broken pipe (Errno::EPIPE)
+ */
+static VALUE
+bsock_close_read(VALUE sock)
+{
+    rb_io_t *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+    }
+    GetOpenFile(sock, fptr);
+    shutdown(fptr->fd, 0);
+    if (!(fptr->mode & FMODE_WRITABLE)) {
+	return rb_io_close(sock);
+    }
+    fptr->mode &= ~FMODE_READABLE;
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   basicsocket.close_write => nil
+ *
+ * Disallows further write using shutdown system call.
+ *
+ *   UNIXSocket.pair {|s1, s2|
+ *     s1.print "ping"
+ *     s1.close_write
+ *     p s2.read        #=> "ping"
+ *     s2.print "pong"
+ *     s2.close
+ *     p s1.read        #=> "pong"
+ *   }
+ */
+static VALUE
+bsock_close_write(VALUE sock)
+{
+    rb_io_t *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+    }
+    GetOpenFile(sock, fptr);
+    if (!(fptr->mode & FMODE_READABLE)) {
+	return rb_io_close(sock);
+    }
+    shutdown(fptr->fd, 1);
+    fptr->mode &= ~FMODE_WRITABLE;
+
+    return Qnil;
+}
+
+/*
+ * Document-method: setsockopt
+ * call-seq:
+ *   setsockopt(level, optname, optval)
+ *   setsockopt(socketoption)
+ *
+ * Sets a socket option. These are protocol and system specific, see your
+ * local system documentation for details.
+ *
+ * === Parameters
+ * * +level+ is an integer, usually one of the SOL_ constants such as
+ *   Socket::SOL_SOCKET, or a protocol level.
+ *   A string or symbol of the name, possibly without prefix, is also
+ *   accepted.
+ * * +optname+ is an integer, usually one of the SO_ constants, such
+ *   as Socket::SO_REUSEADDR.
+ *   A string or symbol of the name, possibly without prefix, is also
+ *   accepted.
+ * * +optval+ is the value of the option, it is passed to the underlying
+ *   setsockopt() as a pointer to a certain number of bytes. How this is
+ *   done depends on the type:
+ *   - Fixnum: value is assigned to an int, and a pointer to the int is
+ *     passed, with length of sizeof(int).
+ *   - true or false: 1 or 0 (respectively) is assigned to an int, and the
+ *     int is passed as for a Fixnum. Note that +false+ must be passed,
+ *     not +nil+.
+ *   - String: the string's data and length is passed to the socket.
+ * * +socketoption+ is an instance of Socket::Option
+ *
+ * === Examples
+ *
+ * Some socket options are integers with boolean values, in this case
+ * #setsockopt could be called like this:
+ *   sock.setsockopt(:SOCKET, :REUSEADDR, true)
+ *   sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+ *   sock.setsockopt(Socket::Option.bool(:INET, :SOCKET, :REUSEADDR, true))
+ *
+ * Some socket options are integers with numeric values, in this case
+ * #setsockopt could be called like this:
+ *   sock.setsockopt(:IP, :TTL, 255)
+ *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, 255)
+ *   sock.setsockopt(Socket::Option.int(:INET, :IP, :TTL, 255))
+ *
+ * Option values may be structs. Passing them can be complex as it involves
+ * examining your system headers to determine the correct definition. An
+ * example is an +ip_mreq+, which may be defined in your system headers as:
+ *   struct ip_mreq {
+ *     struct  in_addr imr_multiaddr;
+ *     struct  in_addr imr_interface;
+ *   };
+ *
+ * In this case #setsockopt could be called like this:
+ *   optval = IPAddr.new("224.0.0.251").hton +
+ *            IPAddr.new(Socket::INADDR_ANY, Socket::AF_INET).hton
+ *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
+ *
+*/
+static VALUE
+bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
+{
+    VALUE lev, optname, val;
+    int family, level, option;
+    rb_io_t *fptr;
+    int i;
+    char *v;
+    int vlen;
+
+    if (argc == 1) {
+        lev = rb_funcall(argv[0], rb_intern("level"), 0);
+        optname = rb_funcall(argv[0], rb_intern("optname"), 0);
+        val = rb_funcall(argv[0], rb_intern("data"), 0);
+    }
+    else {
+        rb_scan_args(argc, argv, "30", &lev, &optname, &val);
+    }
+
+    rb_secure(2);
+    GetOpenFile(sock, fptr);
+    family = rsock_getfamily(fptr->fd);
+    level = rsock_level_arg(family, lev);
+    option = rsock_optname_arg(family, level, optname);
+
+    switch (TYPE(val)) {
+      case T_FIXNUM:
+	i = FIX2INT(val);
+	goto numval;
+      case T_FALSE:
+	i = 0;
+	goto numval;
+      case T_TRUE:
+	i = 1;
+      numval:
+	v = (char*)&i; vlen = (int)sizeof(i);
+	break;
+      default:
+	StringValue(val);
+	v = RSTRING_PTR(val);
+	vlen = RSTRING_LENINT(val);
+	break;
+    }
+
+#define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
+
+    rb_io_check_closed(fptr);
+    if (setsockopt(fptr->fd, level, option, v, vlen) < 0)
+	rb_sys_fail_path(fptr->pathv);
+
+    return INT2FIX(0);
+}
+
+#if !defined(__BEOS__)
+/*
+ * Document-method: getsockopt
+ * call-seq:
+ *   getsockopt(level, optname) => socketoption
+ *
+ * Gets a socket option. These are protocol and system specific, see your
+ * local system documentation for details. The option is returned as
+ * a Socket::Option object.
+ *
+ * === Parameters
+ * * +level+ is an integer, usually one of the SOL_ constants such as
+ *   Socket::SOL_SOCKET, or a protocol level.
+ *   A string or symbol of the name, possibly without prefix, is also
+ *   accepted.
+ * * +optname+ is an integer, usually one of the SO_ constants, such
+ *   as Socket::SO_REUSEADDR.
+ *   A string or symbol of the name, possibly without prefix, is also
+ *   accepted.
+ *
+ * === Examples
+ *
+ * Some socket options are integers with boolean values, in this case
+ * #getsockopt could be called like this:
+ *
+ *   reuseaddr = sock.getsockopt(:SOCKET, :REUSEADDR).bool
+ *
+ *   optval = sock.getsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR)
+ *   optval = optval.unpack "i"
+ *   reuseaddr = optval[0] == 0 ? false : true
+ *
+ * Some socket options are integers with numeric values, in this case
+ * #getsockopt could be called like this:
+ *
+ *   ipttl = sock.getsockopt(:IP, :TTL).int
+ *
+ *   optval = sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
+ *   ipttl = optval.unpack("i")[0]
+ *
+ * Option values may be structs. Decoding them can be complex as it involves
+ * examining your system headers to determine the correct definition. An
+ * example is a +struct linger+, which may be defined in your system headers
+ * as:
+ *   struct linger {
+ *     int l_onoff;
+ *     int l_linger;
+ *   };
+ *
+ * In this case #getsockopt could be called like this:
+ *
+ *   # Socket::Option knows linger structure.
+ *   onoff, linger = sock.getsockopt(:SOCKET, :LINGER).linger
+ *
+ *   optval =  sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
+ *   onoff, linger = optval.unpack "ii"
+ *   onoff = onoff == 0 ? false : true
+*/
+static VALUE
+bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
+{
+    int level, option;
+    socklen_t len;
+    char *buf;
+    rb_io_t *fptr;
+    int family;
+
+    GetOpenFile(sock, fptr);
+    family = rsock_getfamily(fptr->fd);
+    level = rsock_level_arg(family, lev);
+    option = rsock_optname_arg(family, level, optname);
+    len = 256;
+    buf = ALLOCA_N(char,len);
+
+    rb_io_check_closed(fptr);
+
+    if (getsockopt(fptr->fd, level, option, buf, &len) < 0)
+	rb_sys_fail_path(fptr->pathv);
+
+    return rsock_sockopt_new(family, level, option, rb_str_new(buf, len));
+}
+#else
+#define bsock_getsockopt rb_f_notimplement
+#endif
+
+/*
+ * call-seq:
+ *   basicsocket.getsockname => sockaddr
+ *
+ * Returns the local address of the socket as a sockaddr string.
+ *
+ *   TCPServer.open("127.0.0.1", 15120) {|serv|
+ *     p serv.getsockname #=> "\x02\x00;\x10\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+ *   }
+ *
+ * If Addrinfo object is preferred over the binary string,
+ * use BasicSocket#local_address.
+ */
+static VALUE
+bsock_getsockname(VALUE sock)
+{
+    struct sockaddr_storage buf;
+    socklen_t len = (socklen_t)sizeof buf;
+    rb_io_t *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+	rb_sys_fail("getsockname(2)");
+    return rb_str_new((char*)&buf, len);
+}
+
+/*
+ * call-seq:
+ *   basicsocket.getpeername => sockaddr
+ *
+ * Returns the remote address of the socket as a sockaddr string.
+ *
+ *   TCPServer.open("127.0.0.1", 1440) {|serv|
+ *     c = TCPSocket.new("127.0.0.1", 1440)
+ *     s = serv.accept
+ *     p s.getpeername #=> "\x02\x00\x82u\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+ *   }
+ *
+ * If Addrinfo object is preferred over the binary string,
+ * use BasicSocket#remote_address.
+ *
+ */
+static VALUE
+bsock_getpeername(VALUE sock)
+{
+    struct sockaddr_storage buf;
+    socklen_t len = (socklen_t)sizeof buf;
+    rb_io_t *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+	rb_sys_fail("getpeername(2)");
+    return rb_str_new((char*)&buf, len);
+}
+
+#if defined(HAVE_GETPEEREID) || defined(SO_PEERCRED) || defined(HAVE_GETPEERUCRED)
+/*
+ * call-seq:
+ *   basicsocket.getpeereid => [euid, egid]
+ *
+ * Returns the user and group on the peer of the UNIX socket.
+ * The result is a two element array which contains the effective uid and the effective gid.
+ *
+ *   Socket.unix_server_loop("/tmp/sock") {|s|
+ *     begin
+ *       euid, egid = s.getpeereid
+ *
+ *       # Check the connected client is myself or not.
+ *       next if euid != Process.uid
+ *
+ *       # do something about my resource.
+ *
+ *     ensure
+ *       s.close
+ *     end
+ *   }
+ *
+ */
+static VALUE
+bsock_getpeereid(VALUE self)
+{
+#if defined(HAVE_GETPEEREID)
+    rb_io_t *fptr;
+    uid_t euid;
+    gid_t egid;
+    GetOpenFile(self, fptr);
+    if (getpeereid(fptr->fd, &euid, &egid) == -1)
+	rb_sys_fail("getpeereid");
+    return rb_assoc_new(UIDT2NUM(euid), GIDT2NUM(egid));
+#elif defined(SO_PEERCRED) /* GNU/Linux */
+    rb_io_t *fptr;
+    struct ucred cred;
+    socklen_t len = sizeof(cred);
+    GetOpenFile(self, fptr);
+    if (getsockopt(fptr->fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1)
+	rb_sys_fail("getsockopt(SO_PEERCRED)");
+    return rb_assoc_new(UIDT2NUM(cred.uid), GIDT2NUM(cred.gid));
+#elif defined(HAVE_GETPEERUCRED) /* Solaris */
+    rb_io_t *fptr;
+    ucred_t *uc = NULL;
+    VALUE ret;
+    GetOpenFile(self, fptr);
+    if (getpeerucred(fptr->fd, &uc) == -1)
+	rb_sys_fail("getpeerucred");
+    ret = rb_assoc_new(UIDT2NUM(ucred_geteuid(uc)), GIDT2NUM(ucred_getegid(uc)));
+    ucred_free(uc);
+    return ret;
+#endif
+}
+#else
+#define bsock_getpeereid rb_f_notimplement
+#endif
+
+/*
+ * call-seq:
+ *   bsock.local_address => addrinfo
+ *
+ * Returns an Addrinfo object for local address obtained by getsockname.
+ *
+ * Note that addrinfo.protocol is filled by 0.
+ *
+ *   TCPSocket.open("www.ruby-lang.org", 80) {|s|
+ *     p s.local_address #=> #<Addrinfo: 192.168.0.129:36873 TCP>
+ *   }
+ *
+ *   TCPServer.open("127.0.0.1", 1512) {|serv|
+ *     p serv.local_address #=> #<Addrinfo: 127.0.0.1:1512 TCP>
+ *   }
+ *
+ */
+static VALUE
+bsock_local_address(VALUE sock)
+{
+    struct sockaddr_storage buf;
+    socklen_t len = (socklen_t)sizeof buf;
+    rb_io_t *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+	rb_sys_fail("getsockname(2)");
+    return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
+}
+
+/*
+ * call-seq:
+ *   bsock.remote_address => addrinfo
+ *
+ * Returns an Addrinfo object for remote address obtained by getpeername.
+ *
+ * Note that addrinfo.protocol is filled by 0.
+ *
+ *   TCPSocket.open("www.ruby-lang.org", 80) {|s|
+ *     p s.remote_address #=> #<Addrinfo: 221.186.184.68:80 TCP>
+ *   }
+ *
+ *   TCPServer.open("127.0.0.1", 1728) {|serv|
+ *     c = TCPSocket.new("127.0.0.1", 1728)
+ *     s = serv.accept
+ *     p s.remote_address #=> #<Addrinfo: 127.0.0.1:36504 TCP>
+ *   }
+ *
+ */
+static VALUE
+bsock_remote_address(VALUE sock)
+{
+    struct sockaddr_storage buf;
+    socklen_t len = (socklen_t)sizeof buf;
+    rb_io_t *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+	rb_sys_fail("getpeername(2)");
+    return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
+}
+
+/*
+ * call-seq:
+ *   basicsocket.send(mesg, flags [, dest_sockaddr]) => numbytes_sent
+ *
+ * send _mesg_ via _basicsocket_.
+ *
+ * _mesg_ should be a string.
+ *
+ * _flags_ should be a bitwise OR of Socket::MSG_* constants.
+ *
+ * _dest_sockaddr_ should be a packed sockaddr string or an addrinfo.
+ *
+ *   TCPSocket.open("localhost", 80) {|s|
+ *     s.send "GET / HTTP/1.0\r\n\r\n", 0
+ *     p s.read
+ *   }
+ */
+VALUE
+rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
+{
+    struct rsock_send_arg arg;
+    VALUE flags, to;
+    rb_io_t *fptr;
+    int n;
+    rb_blocking_function_t *func;
+
+    rb_secure(4);
+    rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
+
+    StringValue(arg.mesg);
+    if (!NIL_P(to)) {
+	SockAddrStringValue(to);
+	to = rb_str_new4(to);
+	arg.to = (struct sockaddr *)RSTRING_PTR(to);
+	arg.tolen = (socklen_t)RSTRING_LENINT(to);
+	func = rsock_sendto_blocking;
+    }
+    else {
+	func = rsock_send_blocking;
+    }
+    GetOpenFile(sock, fptr);
+    arg.fd = fptr->fd;
+    arg.flags = NUM2INT(flags);
+    while (rb_thread_fd_writable(arg.fd),
+	   (n = (int)BLOCKING_REGION(func, &arg)) < 0) {
+	if (rb_io_wait_writable(arg.fd)) {
+	    continue;
+	}
+	rb_sys_fail("send(2)");
+    }
+    return INT2FIX(n);
+}
+
+/*
+ * call-seq:
+ *   basicsocket.do_not_reverse_lookup => true or false
+ *
+ * Gets the do_not_reverse_lookup flag of _basicsocket_.
+ *
+ *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
+ *     p sock.do_not_reverse_lookup      #=> false
+ *     p sock.peeraddr                   #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
+ *     sock.do_not_reverse_lookup = true
+ *     p sock.peeraddr                   #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
+ *   }
+ */
+static VALUE
+bsock_do_not_reverse_lookup(VALUE sock)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(sock, fptr);
+    return (fptr->mode & FMODE_NOREVLOOKUP) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   basicsocket.do_not_reverse_lookup = bool
+ *
+ * Sets the do_not_reverse_lookup flag of _basicsocket_.
+ *
+ *   BasicSocket.do_not_reverse_lookup = false
+ *   p TCPSocket.new("127.0.0.1", 80).do_not_reverse_lookup #=> false
+ *   BasicSocket.do_not_reverse_lookup = true
+ *   p TCPSocket.new("127.0.0.1", 80).do_not_reverse_lookup #=> true
+ *
+ */
+static VALUE
+bsock_do_not_reverse_lookup_set(VALUE sock, VALUE state)
+{
+    rb_io_t *fptr;
+
+    rb_secure(4);
+    GetOpenFile(sock, fptr);
+    if (RTEST(state)) {
+	fptr->mode |= FMODE_NOREVLOOKUP;
+    }
+    else {
+	fptr->mode &= ~FMODE_NOREVLOOKUP;
+    }
+    return sock;
+}
+
+/*
+ * call-seq:
+ *   basicsocket.recv(maxlen) => mesg
+ *   basicsocket.recv(maxlen, flags) => mesg
+ *
+ * Receives a message.
+ *
+ * _maxlen_ is the maximum number of bytes to receive.
+ *
+ * _flags_ should be a bitwise OR of Socket::MSG_* constants.
+ *
+ *   UNIXSocket.pair {|s1, s2|
+ *     s1.puts "Hello World"
+ *     p s2.recv(4)                     #=> "Hell"
+ *     p s2.recv(4, Socket::MSG_PEEK)   #=> "o Wo"
+ *     p s2.recv(4)                     #=> "o Wo"
+ *     p s2.recv(10)                    #=> "rld\n"
+ *   }
+ */
+static VALUE
+bsock_recv(int argc, VALUE *argv, VALUE sock)
+{
+    return rsock_s_recvfrom(sock, argc, argv, RECV_RECV);
+}
+
+/*
+ * call-seq:
+ * 	basicsocket.recv_nonblock(maxlen) => mesg
+ * 	basicsocket.recv_nonblock(maxlen, flags) => mesg
+ *
+ * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * _flags_ is zero or more of the +MSG_+ options.
+ * The result, _mesg_, is the data received.
+ *
+ * When recvfrom(2) returns 0, Socket#recv_nonblock returns
+ * an empty string as data.
+ * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
+ *
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options
+ *
+ * === Example
+ * 	serv = TCPServer.new("127.0.0.1", 0)
+ * 	af, port, host, addr = serv.addr
+ * 	c = TCPSocket.new(addr, port)
+ * 	s = serv.accept
+ * 	c.send "aaa", 0
+ * 	begin # emulate blocking recv.
+ * 	  p s.recv_nonblock(10) #=> "aaa"
+ * 	rescue IO::WaitReadable
+ * 	  IO.select([s])
+ * 	  retry
+ * 	end
+ *
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recv_nonblock_ fails.
+ *
+ * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
+ * including Errno::EWOULDBLOCK.
+ *
+ * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
+ * it is extended by IO::WaitReadable.
+ * So IO::WaitReadable can be used to rescue the exceptions for retrying recv_nonblock.
+ *
+ * === See
+ * * Socket#recvfrom
+ */
+
+static VALUE
+bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)
+{
+    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
+}
+
+/*
+ * call-seq:
+ *   BasicSocket.do_not_reverse_lookup => true or false
+ *
+ * Gets the global do_not_reverse_lookup flag.
+ *
+ *   BasicSocket.do_not_reverse_lookup  #=> false
+ */
+static VALUE
+bsock_do_not_rev_lookup(void)
+{
+    return rsock_do_not_reverse_lookup?Qtrue:Qfalse;
+}
+
+/*
+ * call-seq:
+ *   BasicSocket.do_not_reverse_lookup = bool
+ *
+ * Sets the global do_not_reverse_lookup flag.
+ *
+ * The flag is used for initial value of do_not_reverse_lookup for each socket.
+ *
+ *   s1 = TCPSocket.new("localhost", 80)
+ *   p s1.do_not_reverse_lookup                 #=> true
+ *   BasicSocket.do_not_reverse_lookup = false
+ *   s2 = TCPSocket.new("localhost", 80)
+ *   p s2.do_not_reverse_lookup                 #=> false
+ *   p s1.do_not_reverse_lookup                 #=> true
+ *
+ */
+static VALUE
+bsock_do_not_rev_lookup_set(VALUE self, VALUE val)
+{
+    rb_secure(4);
+    rsock_do_not_reverse_lookup = RTEST(val);
+    return val;
+}
+
+/*
+ * BasicSocket is the super class for the all socket classes.
+ */
+void
+rsock_init_basicsocket(void)
+{
+    rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
+    rb_undef_method(rb_cBasicSocket, "initialize");
+
+    rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup",
+			       bsock_do_not_rev_lookup, 0);
+    rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup=",
+			       bsock_do_not_rev_lookup_set, 1);
+    rb_define_singleton_method(rb_cBasicSocket, "for_fd", bsock_s_for_fd, 1);
+
+    rb_define_method(rb_cBasicSocket, "close_read", bsock_close_read, 0);
+    rb_define_method(rb_cBasicSocket, "close_write", bsock_close_write, 0);
+    rb_define_method(rb_cBasicSocket, "shutdown", bsock_shutdown, -1);
+    rb_define_method(rb_cBasicSocket, "setsockopt", bsock_setsockopt, -1);
+    rb_define_method(rb_cBasicSocket, "getsockopt", bsock_getsockopt, 2);
+    rb_define_method(rb_cBasicSocket, "getsockname", bsock_getsockname, 0);
+    rb_define_method(rb_cBasicSocket, "getpeername", bsock_getpeername, 0);
+    rb_define_method(rb_cBasicSocket, "getpeereid", bsock_getpeereid, 0);
+    rb_define_method(rb_cBasicSocket, "local_address", bsock_local_address, 0);
+    rb_define_method(rb_cBasicSocket, "remote_address", bsock_remote_address, 0);
+    rb_define_method(rb_cBasicSocket, "send", rsock_bsock_send, -1);
+    rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1);
+    rb_define_method(rb_cBasicSocket, "recv_nonblock", bsock_recv_nonblock, -1);
+    rb_define_method(rb_cBasicSocket, "do_not_reverse_lookup", bsock_do_not_reverse_lookup, 0);
+    rb_define_method(rb_cBasicSocket, "do_not_reverse_lookup=", bsock_do_not_reverse_lookup_set, 1);
+
+    rb_define_method(rb_cBasicSocket, "sendmsg", rsock_bsock_sendmsg, -1); /* in ancdata.c */
+    rb_define_method(rb_cBasicSocket, "sendmsg_nonblock", rsock_bsock_sendmsg_nonblock, -1); /* in ancdata.c */
+    rb_define_method(rb_cBasicSocket, "recvmsg", rsock_bsock_recvmsg, -1); /* in ancdata.c */
+    rb_define_method(rb_cBasicSocket, "recvmsg_nonblock", rsock_bsock_recvmsg_nonblock, -1); /* in ancdata.c */
+
+}
diff --git a/ext/socket/constants.c b/ext/socket/constants.c
new file mode 100644
index 0000000000..39f985b316
--- /dev/null
+++ b/ext/socket/constants.c
@@ -0,0 +1,145 @@
+/************************************************
+
+  constants.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+static VALUE rb_mSockConst;
+
+#include "constdefs.c"
+
+static int
+constant_arg(VALUE arg, int (*str_to_int)(const char*, long, int*), const char *errmsg)
+{
+    VALUE tmp;
+    char *ptr;
+    int ret;
+
+    if (SYMBOL_P(arg)) {
+        arg = rb_sym_to_s(arg);
+        goto str;
+    }
+    else if (!NIL_P(tmp = rb_check_string_type(arg))) {
+	arg = tmp;
+      str:
+	rb_check_safe_obj(arg);
+        ptr = RSTRING_PTR(arg);
+        if (str_to_int(ptr, RSTRING_LEN(arg), &ret) == -1)
+	    rb_raise(rb_eSocket, "%s: %s", errmsg, ptr);
+    }
+    else {
+	ret = NUM2INT(arg);
+    }
+    return ret;
+}
+
+int
+rsock_family_arg(VALUE domain)
+{
+    /* convert AF_INET, etc. */
+    return constant_arg(domain, rsock_family_to_int, "unknown socket domain");
+}
+
+int
+rsock_socktype_arg(VALUE type)
+{
+    /* convert SOCK_STREAM, etc. */
+    return constant_arg(type, rsock_socktype_to_int, "unknown socket type");
+}
+
+int
+rsock_level_arg(int family, VALUE level)
+{
+    /* convert SOL_SOCKET, IPPROTO_TCP, etc. */
+    if (IS_IP_FAMILY(family)) {
+        return constant_arg(level, rsock_ip_level_to_int, "unknown protocol level");
+    }
+    else {
+        return constant_arg(level, rsock_unknown_level_to_int, "unknown protocol level");
+    }
+}
+
+int
+rsock_optname_arg(int family, int level, VALUE optname)
+{
+    if (IS_IP_FAMILY(family)) {
+        switch (level) {
+          case SOL_SOCKET:
+            return constant_arg(optname, rsock_so_optname_to_int, "unknown socket level option name");
+          case IPPROTO_IP:
+            return constant_arg(optname, rsock_ip_optname_to_int, "unknown IP level option name");
+#ifdef IPPROTO_IPV6
+          case IPPROTO_IPV6:
+            return constant_arg(optname, rsock_ipv6_optname_to_int, "unknown IPv6 level option name");
+#endif
+          case IPPROTO_TCP:
+            return constant_arg(optname, rsock_tcp_optname_to_int, "unknown TCP level option name");
+          case IPPROTO_UDP:
+            return constant_arg(optname, rsock_udp_optname_to_int, "unknown UDP level option name");
+          default:
+            return NUM2INT(optname);
+        }
+    }
+    else {
+        switch (level) {
+          case SOL_SOCKET:
+            return constant_arg(optname, rsock_so_optname_to_int, "unknown socket level option name");
+          default:
+            return NUM2INT(optname);
+        }
+    }
+}
+
+int
+rsock_cmsg_type_arg(int family, int level, VALUE type)
+{
+    if (IS_IP_FAMILY(family)) {
+        switch (level) {
+          case SOL_SOCKET:
+            return constant_arg(type, rsock_scm_optname_to_int, "unknown UNIX control message");
+          case IPPROTO_IP:
+            return constant_arg(type, rsock_ip_optname_to_int, "unknown IP control message");
+#ifdef INET6
+          case IPPROTO_IPV6:
+            return constant_arg(type, rsock_ipv6_optname_to_int, "unknown IPv6 control message");
+#endif
+          case IPPROTO_TCP:
+            return constant_arg(type, rsock_tcp_optname_to_int, "unknown TCP control message");
+          case IPPROTO_UDP:
+            return constant_arg(type, rsock_udp_optname_to_int, "unknown UDP control message");
+          default:
+            return NUM2INT(type);
+        }
+    }
+    else {
+        switch (level) {
+          case SOL_SOCKET:
+            return constant_arg(type, rsock_scm_optname_to_int, "unknown UNIX control message");
+          default:
+            return NUM2INT(type);
+        }
+    }
+}
+
+int
+rsock_shutdown_how_arg(VALUE how)
+{
+    /* convert SHUT_RD, SHUT_WR, SHUT_RDWR. */
+    return constant_arg(how, rsock_shutdown_how_to_int, "unknown shutdown argument");
+}
+
+/*
+ * Socket::Constants module
+ */
+void
+rsock_init_socket_constants(void)
+{
+    /* constants */
+    init_constants();
+}
diff --git a/ext/socket/depend b/ext/socket/depend
index cca6d4e62a..f870b9f834 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,3 +1,25 @@
-socket.o : socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h sockport.h
-getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h
-getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.h
+SOCK_HEADERS = $(srcdir)/rubysocket.h $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
+	$(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h \
+	$(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h
+
+init.o: init.c $(SOCK_HEADERS)
+constants.o: constants.c constdefs.c $(SOCK_HEADERS)
+basicsocket.o: basicsocket.c $(SOCK_HEADERS)
+socket.o: socket.c $(SOCK_HEADERS)
+ipsocket.o: ipsocket.c $(SOCK_HEADERS)
+tcpsocket.o: tcpsocket.c $(SOCK_HEADERS)
+tcpserver.o: tcpserver.c $(SOCK_HEADERS)
+sockssocket.o: sockssocket.c $(SOCK_HEADERS)
+udpsocket.o: udpsocket.c $(SOCK_HEADERS)
+unixsocket.o: unixsocket.c $(SOCK_HEADERS)
+unixserver.o: unixserver.c $(SOCK_HEADERS)
+option.o: option.c $(SOCK_HEADERS)
+ancdata.o: ancdata.c $(SOCK_HEADERS)
+raddrinfo.o: raddrinfo.c $(SOCK_HEADERS)
+
+getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
+getaddrinfo.o: getaddrinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
+
+constdefs.h constdefs.c : $(srcdir)/mkconstants.rb
+	@echo "generating constant definitions"
+	@$(RUBY) $(srcdir)/mkconstants.rb -H constdefs.h -o constdefs.c
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 8a13ddba73..92fa6bf7e1 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,22 +1,18 @@
 require 'mkmf'
 
 case RUBY_PLATFORM
-when /bccwin32/
+when /(ms|bcc)win32|mingw/
   test_func = "WSACleanup"
   have_library("ws2_32", "WSACleanup")
-when /mswin32|mingw/
-  test_func = "WSACleanup"
-  if with_config("winsock2")
-    have_library("ws2_32", "WSACleanup")
-  else
-    have_library("wsock32", "WSACleanup")
-  end
+  $defs << "-DHAVE_SOCKETPAIR"
 when /cygwin/
   test_func = "socket"
 when /beos/
   test_func = "socket"
   have_library("net", "socket")
-  have_func("closesocket")
+when /haiku/
+  test_func = "socket"
+  have_library("network", "socket")
 when /i386-os2_emx/
   test_func = "socket"
   have_library("socket", "socket")
@@ -38,11 +34,14 @@ if have_header("arpa/inet.h")
 end
 
 ipv6 = false
-default_ipv6 = /cygwin/ !~ RUBY_PLATFORM
+default_ipv6 = /mswin|cygwin|beos|haiku/ !~ RUBY_PLATFORM
 if enable_config("ipv6", default_ipv6)
   if checking_for("ipv6") {try_link(<<EOF)}
 #include <sys/types.h>
+#ifndef _WIN32
 #include <sys/socket.h>
+#endif
+int
 main()
 {
   socket(AF_INET6, SOCK_STREAM, 0);
@@ -54,6 +53,9 @@ EOF
 end
 
 if ipv6
+  if $mingw
+    $CPPFLAGS << " -D_WIN32_WINNT=0x501"
+  end
   ipv6lib = nil
   class << (fmt = "unknown")
     def %(s) s || self end
@@ -94,33 +96,36 @@ if have_struct_member("struct sockaddr_in", "sin_len", headers)
 end
 
 #   doug's fix, NOW add -Dss_family... only if required!
-[nil, " -Dss_family=__ss_family -Dss_len=__ss_len"].each do |flags|
-  if flags
-    cppflags = $CPPFLAGS
-    $CPPFLAGS += flags
-  end
-  if have_struct_member("struct sockaddr_storage", "ss_family", headers)
-    $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
-    break
-  elsif flags
-    $CPPFLAGS = cppflags
-  end
+doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)}
+if (doug[] or
+    with_cppflags($CPPFLAGS + " -Dss_family=__ss_family", &doug))
+  $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
+  doug = proc {have_struct_member("struct sockaddr_storage", "ss_len", headers)}
+  doug[] or with_cppflags($CPPFLAGS + " -Dss_len=__ss_len", &doug)
 end
 
 if have_struct_member("struct sockaddr", "sa_len", headers)
   $defs[-1] = "-DHAVE_SA_LEN "
 end
 
-have_header("netinet/tcp.h") if not /cygwin/ =~ RUBY_PLATFORM # for cygwin 1.1.5
+have_header("netinet/tcp.h") if /cygwin/ !~ RUBY_PLATFORM # for cygwin 1.1.5
 have_header("netinet/udp.h")
 
+if !have_macro("IPPROTO_IPV6", headers) && have_const("IPPROTO_IPV6", headers)
+  IO.read(File.join(File.dirname(__FILE__), "mkconstants.rb")).sub(/\A.*^__END__$/m, '').split(/\r?\n/).grep(/\AIPPROTO_\w*/){$&}.each {|name|
+    have_const(name, headers) unless $defs.include?("-DHAVE_CONST_#{name.upcase}")
+  }
+end
+
 if have_func("sendmsg") | have_func("recvmsg")
   have_struct_member('struct msghdr', 'msg_control', ['sys/types.h', 'sys/socket.h'])
   have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
 end
 
-getaddr_info_ok = enable_config("wide-getaddrinfo") do
-  checking_for("wide getaddrinfo") {try_run(<<EOF)}
+have_type("PADDRINFO", %w[ ws2tcpip.h wspiapi.h ])
+
+getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
+  (checking_for("wide getaddrinfo") {try_run(<<EOF)} && :os)
 #{cpp_include(headers)}
 #include <stdlib.h>
 
@@ -135,11 +140,17 @@ getaddr_info_ok = enable_config("wide-getaddrinfo") do
 #define AF_LOCAL AF_UNIX
 #endif
 
+int
 main()
 {
   int passive, gaierr, inet4 = 0, inet6 = 0;
   struct addrinfo hints, *ai, *aitop;
   char straddr[INET6_ADDRSTRLEN], strport[16];
+#ifdef _WIN32
+  WSADATA retdata;
+
+  WSAStartup(MAKEWORD(2, 0), &retdata);
+#endif
 
   for (passive = 0; passive <= 1; passive++) {
     memset(&hints, 0, sizeof(hints));
@@ -222,7 +233,6 @@ main()
   exit(EXIT_FAILURE);
 }
 EOF
-end
 if ipv6 and not getaddr_info_ok
   abort <<EOS
 
@@ -247,15 +257,52 @@ Fatal: invalid value for --with-lookup-order-hack (expected INET, INET6 or UNSPE
 EOS
 end
 
-$objs = ["socket.#{$OBJEXT}"]
+have_type("struct addrinfo", headers)
+have_func("freehostent")
+have_func("freeaddrinfo")
+if /haiku/ !~ RUBY_PLATFORM and have_func("gai_strerror")
+  if checking_for("gai_strerror() returns const pointer") {!try_compile(<<EOF)}
+#{cpp_include(headers)}
+#include <stdlib.h>
+void
+conftest_gai_strerror_is_const()
+{
+    *gai_strerror(0) = 0;
+}
+EOF
+    $defs << "-DGAI_STRERROR_CONST"
+  end
+end
+
+$objs = [
+  "init.#{$OBJEXT}",
+  "constants.#{$OBJEXT}",
+  "basicsocket.#{$OBJEXT}",
+  "socket.#{$OBJEXT}",
+  "ipsocket.#{$OBJEXT}",
+  "tcpsocket.#{$OBJEXT}",
+  "tcpserver.#{$OBJEXT}",
+  "sockssocket.#{$OBJEXT}",
+  "udpsocket.#{$OBJEXT}",
+  "unixsocket.#{$OBJEXT}",
+  "unixserver.#{$OBJEXT}",
+  "option.#{$OBJEXT}",
+  "ancdata.#{$OBJEXT}",
+  "raddrinfo.#{$OBJEXT}"
+]
 
-unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("getaddrinfo", "netdb.h")
+if getaddr_info_ok == :wide or
+    !have_func("getnameinfo", headers) or !have_func("getaddrinfo", headers)
   if have_struct_member("struct in6_addr", "s6_addr8", headers)
-    $defs[-1] = "-DHAVE_ADDR8"
+    $defs[-1] = "s6_addr=s6_addr8"
+  end
+  if ipv6 == "kame" && have_struct_member("struct in6_addr", "s6_addr32", headers)
+    $defs[-1] = "-DFAITH"
   end
   $CPPFLAGS="-I. "+$CPPFLAGS
   $objs += ["getaddrinfo.#{$OBJEXT}"]
   $objs += ["getnameinfo.#{$OBJEXT}"]
+  $defs << "-DGETADDRINFO_EMU"
   have_func("inet_ntop") or have_func("inet_ntoa")
   have_func("inet_pton") or have_func("inet_aton")
   have_func("getservbyport")
@@ -263,17 +310,47 @@ unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("ge
   have_header("resolv.h")
 end
 
+have_header("ifaddrs.h")
+have_func("getifaddrs")
+have_header("sys/ioctl.h")
+have_header("sys/sockio.h")
+have_header("net/if.h", headers)
+
+have_header("sys/param.h", headers)
+have_header("sys/ucred.h", headers)
+
 unless have_type("socklen_t", headers)
   $defs << "-Dsocklen_t=int"
 end
 
 have_header("sys/un.h")
 have_header("sys/uio.h")
+have_type("struct in_pktinfo", headers) {|src|
+  src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
+  "#else\n" << "#error\n" << ">>>>>> no in_pktinfo <<<<<<\n" << "#endif\n"
+} and have_struct_member("struct in_pktinfo", "ipi_spec_dst", headers)
+have_type("struct in6_pktinfo", headers) {|src|
+  src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
+  "#else\n" << "#error\n" << ">>>>>> no in6_pktinfo <<<<<<\n" << "#endif\n"
+}
+
+have_type("struct sockcred", headers)
+have_type("struct cmsgcred", headers)
+
+have_func("getpeereid")
+
+have_header("ucred.h", headers)
+have_func("getpeerucred")
+
+# workaround for recent Windows SDK
+$defs << "-DIPPROTO_IPV6=IPPROTO_IPV6" if $defs.include?("-DHAVE_CONST_IPPROTO_IPV6") && !have_macro("IPPROTO_IPV6")
+
+$distcleanfiles << "constants.h" << "constdefs.*"
 
 if have_func(test_func)
   have_func("hsterror")
   have_func("getipnodebyname") or have_func("gethostbyname2")
-  have_func("socketpair")
+  have_func("socketpair") unless $defs.include?("-DHAVE_SOCKETPAIR")
   unless have_func("gethostname")
     have_func("uname")
   end
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 9fb4ebcb06..3382f00e52 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,11 +38,14 @@
  * - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag.
  */
 
-#include "config.h"
+#include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
 #include <sys/types.h>
-#if !defined(_WIN32) && !defined(__VMS)
+#ifndef _WIN32
 #include <sys/param.h>
-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
 # include <net/socket.h>
 #else
 # include <sys/socket.h>
@@ -62,13 +65,9 @@
 #include <resolv.h>
 #endif
 #include <unistd.h>
-#elif defined(__VMS )
-#include <socket.h>
-#include <inet.h>
-#include <in.h>
-#include <netdb.h>
 #else
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <io.h>
 #endif
 #include <string.h>
@@ -84,10 +83,6 @@
 #include "addrinfo.h"
 #include "sockport.h"
 
-#if defined(__KAME__) && defined(INET6)
-# define FAITH
-#endif
-
 #define SUCCESS 0
 #define ANY 0
 #define YES 1
@@ -102,7 +97,7 @@ static const char in_addrany[] = { 0, 0, 0, 0 };
 static const char in6_addrany[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
-static const char in_loopback[] = { 127, 0, 0, 1 }; 
+static const char in_loopback[] = { 127, 0, 0, 1 };
 static const char in6_loopback[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
 };
@@ -119,7 +114,7 @@ static const struct afd {
 	int a_socklen;
 	int a_off;
 	const char *a_addrany;
-	const char *a_loopback;	
+	const char *a_loopback;
 } afdl [] = {
 #ifdef INET6
 #define N_INET6 0
@@ -150,7 +145,7 @@ static int get_name __P((const char *, const struct afd *,
 static int get_addr __P((const char *, int, struct addrinfo **,
 			struct addrinfo *, int));
 static int str_isnumber __P((const char *));
-	
+
 static const char *const ai_errlist[] = {
 	"success.",
 	"address family for hostname not supported.",	/* EAI_ADDRFAMILY */
@@ -199,21 +194,21 @@ if (pai->ai_flags & AI_CANONNAME) {\
 
 #define ERR(err) { error = (err); goto bad; }
 
-#if defined __UCLIBC__
+#ifndef HAVE_GAI_STRERROR
+#ifdef GAI_STRERROR_CONST
 const
 #endif
 char *
-gai_strerror(ecode)
-	int ecode;
+gai_strerror(int ecode)
 {
 	if (ecode < 0 || ecode > EAI_MAX)
 		ecode = EAI_MAX;
 	return (char *)ai_errlist[ecode];
 }
+#endif
 
 void
-freeaddrinfo(ai)
-	struct addrinfo *ai;
+freeaddrinfo(struct addrinfo *ai)
 {
 	struct addrinfo *next;
 
@@ -227,8 +222,7 @@ freeaddrinfo(ai)
 }
 
 static int
-str_isnumber(p)
-	const char *p;
+str_isnumber(const char *p)
 {
 	char *q = (char *)p;
 	while (*q) {
@@ -242,10 +236,7 @@ str_isnumber(p)
 #ifndef HAVE_INET_PTON
 
 static int
-inet_pton(af, hostname, pton)
-	int af;
-	const char *hostname;
-	void *pton;
+inet_pton(int af, const char *hostname, void *pton)
 {
 	struct in_addr in;
 
@@ -273,10 +264,7 @@ inet_pton(af, hostname, pton)
 #endif
 
 int
-getaddrinfo(hostname, servname, hints, res)
-	const char *hostname, *servname;
-	const struct addrinfo *hints;
-	struct addrinfo **res;
+getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res)
 {
 	struct addrinfo sentinel;
 	struct addrinfo *top = NULL;
@@ -314,7 +302,7 @@ getaddrinfo(hostname, servname, hints, res)
 	pai->ai_addr = NULL;
 	pai->ai_next = NULL;
 	port = ANY;
-	
+
 	if (hostname == NULL && servname == NULL)
 		return EAI_NONAME;
 	if (hints) {
@@ -386,9 +374,11 @@ getaddrinfo(hostname, servname, hints, res)
 				pai->ai_protocol = IPPROTO_UDP;
 			}
 			port = htons((unsigned short)atoi(servname));
+                } else if (pai->ai_flags & AI_NUMERICSERV) {
+                        ERR(EAI_NONAME);
 		} else {
 			struct servent *sp;
-			char *proto;
+			const char *proto;
 
 			proto = NULL;
 			switch (pai->ai_socktype) {
@@ -419,7 +409,7 @@ getaddrinfo(hostname, servname, hints, res)
 					ERR(EAI_PROTOCOL);	/*xxx*/
 		}
 	}
-	
+
 	/*
 	 * hostname == NULL.
 	 * passive socket -> anyaddr (0.0.0.0 or ::)
@@ -442,7 +432,7 @@ getaddrinfo(hostname, servname, hints, res)
 			s = socket(afd->a_af, SOCK_DGRAM, 0);
 			if (s < 0)
 				continue;
-#if defined(HAVE_CLOSESOCKET)
+#if defined(__BEOS__)
 			closesocket(s);
 #else
 			close(s);
@@ -468,7 +458,7 @@ getaddrinfo(hostname, servname, hints, res)
 		else
 			ERR(EAI_FAMILY);
 	}
-	
+
 	/* hostname as numeric name */
 	for (i = 0; afdl[i].a_af; i++) {
 		if (inet_pton(afdl[i].a_af, hostname, pton)) {
@@ -488,17 +478,13 @@ getaddrinfo(hostname, servname, hints, res)
 				break;
 #ifdef INET6
 			case AF_INET6:
-#ifdef HAVE_ADDR8
-				pfx = ((struct in6_addr *)pton)->s6_addr8[0];
-#else
 				pfx = ((struct in6_addr *)pton)->s6_addr[0];
-#endif
 				if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
 					pai->ai_flags &= ~AI_CANONNAME;
 				break;
 #endif
 			}
-			
+
 			if (pai->ai_family == afdl[i].a_af ||
 			    pai->ai_family == PF_UNSPEC) {
 				if (! (pai->ai_flags & AI_CANONNAME)) {
@@ -516,7 +502,7 @@ getaddrinfo(hostname, servname, hints, res)
 				 */
 				get_name(pton, &afdl[i], &top, pton, pai, port);
 				goto good;
-			} else 
+			} else
 				ERR(EAI_FAMILY);	/*xxx*/
 		}
 	}
@@ -543,13 +529,7 @@ getaddrinfo(hostname, servname, hints, res)
 }
 
 static int
-get_name(addr, afd, res, numaddr, pai, port0)
-	const char *addr;
-	const struct afd *afd;
-	struct addrinfo **res;
-	char *numaddr;
-	struct addrinfo *pai;
-	int port0;
+get_name(const char *addr, const struct afd *afd, struct addrinfo **res, char *numaddr, struct addrinfo *pai, int port0)
 {
 	u_short port = port0 & 0xffff;
 	struct hostent *hp;
@@ -569,7 +549,7 @@ get_name(addr, afd, res, numaddr, pai, port0)
 		GET_CANONNAME(cur, hp->h_name);
 	} else
 		GET_AI(cur, afd, numaddr, port);
-	
+
 #ifdef INET6
 	if (hp)
 		freehostent(hp);
@@ -589,12 +569,7 @@ get_name(addr, afd, res, numaddr, pai, port0)
 }
 
 static int
-get_addr(hostname, af, res, pai, port0)
-	const char *hostname;
-	int af;
-	struct addrinfo **res;
-	struct addrinfo *pai;
-	int port0;
+get_addr(const char *hostname, int af, struct addrinfo **res, struct addrinfo *pai, int port0)
 {
 	u_short port = port0 & 0xffff;
 	struct addrinfo sentinel;
@@ -637,7 +612,7 @@ get_addr(hostname, af, res, pai, port0)
 	if ((hp->h_name == NULL) || (hp->h_name[0] == 0) ||
 	    (hp->h_addr_list[0] == NULL))
 		ERR(EAI_FAIL);
-	
+
 	for (i = 0; (ap = hp->h_addr_list[i]) != NULL; i++) {
 		switch (af) {
 #ifdef INET6
@@ -668,9 +643,10 @@ get_addr(hostname, af, res, pai, port0)
 
 			GET_AI(cur->ai_next, &afdl[N_INET6], ap, port);
 			in6 = &((struct sockaddr_in6 *)cur->ai_next->ai_addr)->sin6_addr;
-			memcpy(&in6->s6_addr32[0], &faith_prefix,
-			    sizeof(struct in6_addr) - sizeof(struct in_addr));
-			memcpy(&in6->s6_addr32[3], ap, sizeof(struct in_addr));
+			memcpy(&in6->s6_addr, &faith_prefix,
+			       sizeof(struct in6_addr) - sizeof(struct in_addr));
+			memcpy(&in6->s6_addr + sizeof(struct in_addr), ap,
+			       sizeof(struct in_addr));
 		} else
 #endif /* FAITH */
 		GET_AI(cur->ai_next, afd, ap, port);
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 66f7e8818a..3ee83eb2a0 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,11 +34,14 @@
  *   but INRIA implementation returns EAI_xxx defined for getaddrinfo().
  */
 
-#include "config.h"
+#include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
 #include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32
-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
 # include <net/socket.h>
 #else
 # include <sys/socket.h>
@@ -57,6 +60,7 @@
 #endif
 #ifdef _WIN32
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #define snprintf _snprintf
 #endif
 
@@ -110,13 +114,12 @@ static struct afd {
 #define ENI_FAMILY	5
 #define ENI_SALEN	6
 
+#ifdef __HAIKU__
+#define HAVE_INET_NTOP
+#endif
 #ifndef HAVE_INET_NTOP
 static const char *
-inet_ntop(af, addr, numaddr, numaddr_len)
-	int af;
-	const void *addr;
-	char *numaddr;
-	size_t numaddr_len;
+inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 {
 #ifdef HAVE_INET_NTOA
 	struct in_addr in;
@@ -133,17 +136,9 @@ inet_ntop(af, addr, numaddr, numaddr_len)
 #endif
 
 int
-getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
-	const struct sockaddr *sa;
-	size_t salen;
-	char *host;
-	size_t hostlen;
-	char *serv;
-	size_t servlen;
-	int flags;
+getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, int flags)
 {
 	struct afd *afd;
-	struct servent *sp;
 	struct hostent *hp;
 	u_short port;
 	int family, len, i;
@@ -161,7 +156,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 
 	len = SA_LEN(sa);
 	if (len != salen) return ENI_SALEN;
-	
+
 	family = sa->sa_family;
 	for (i = 0; afdl[i].a_af; i++)
 		if (afdl[i].a_af == family) {
@@ -169,10 +164,10 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 			goto found;
 		}
 	return ENI_FAMILY;
-	
+
  found:
 	if (len != afd->a_socklen) return ENI_SALEN;
-	
+
 	port = ((struct sockinet *)sa)->si_port; /* network byte order */
 	addr = (char *)sa + afd->a_off;
 
@@ -185,7 +180,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 		strcpy(serv, numserv);
 	} else {
 #if defined(HAVE_GETSERVBYPORT)
-		sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp");
+		struct servent *sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp");
 		if (sp) {
 			if (strlen(sp->s_name) + 1 > servlen)
 				return ENI_MEMORY;
@@ -204,7 +199,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 			flags |= NI_NUMERICHOST;
 		v4a >>= IN_CLASSA_NSHIFT;
 		if (v4a == 0)
-			flags |= NI_NUMERICHOST;			
+			flags |= NI_NUMERICHOST;
 		break;
 #ifdef INET6
 	case AF_INET6:
diff --git a/ext/socket/init.c b/ext/socket/init.c
new file mode 100644
index 0000000000..48718313f0
--- /dev/null
+++ b/ext/socket/init.c
@@ -0,0 +1,575 @@
+/************************************************
+
+  init.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+VALUE rb_cBasicSocket;
+VALUE rb_cIPSocket;
+VALUE rb_cTCPSocket;
+VALUE rb_cTCPServer;
+VALUE rb_cUDPSocket;
+#ifdef AF_UNIX
+VALUE rb_cUNIXSocket;
+VALUE rb_cUNIXServer;
+#endif
+VALUE rb_cSocket;
+VALUE rb_cAddrinfo;
+
+VALUE rb_eSocket;
+
+#ifdef SOCKS
+VALUE rb_cSOCKSSocket;
+#endif
+
+int rsock_do_not_reverse_lookup = 1;
+
+void
+rsock_raise_socket_error(const char *reason, int error)
+{
+#ifdef EAI_SYSTEM
+    if (error == EAI_SYSTEM) rb_sys_fail(reason);
+#endif
+    rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
+}
+
+VALUE
+rsock_init_sock(VALUE sock, int fd)
+{
+    rb_io_t *fp;
+    struct stat sbuf;
+
+#ifndef _WIN32
+    if (fstat(fd, &sbuf) < 0)
+        rb_sys_fail(0);
+    if (!S_ISSOCK(sbuf.st_mode))
+        rb_raise(rb_eArgError, "not a socket file descriptor");
+#else
+    if (!rb_w32_is_socket(fd))
+        rb_raise(rb_eArgError, "not a socket file descriptor");
+#endif
+
+    MakeOpenFile(sock, fp);
+    fp->fd = fd;
+    fp->mode = FMODE_READWRITE|FMODE_DUPLEX;
+    rb_io_ascii8bit_binmode(sock);
+    if (rsock_do_not_reverse_lookup) {
+	fp->mode |= FMODE_NOREVLOOKUP;
+    }
+    rb_io_synchronized(fp);
+
+    return sock;
+}
+
+VALUE
+rsock_sendto_blocking(void *data)
+{
+    struct rsock_send_arg *arg = data;
+    VALUE mesg = arg->mesg;
+    return (VALUE)sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+                         arg->flags, arg->to, arg->tolen);
+}
+
+VALUE
+rsock_send_blocking(void *data)
+{
+    struct rsock_send_arg *arg = data;
+    VALUE mesg = arg->mesg;
+    return (VALUE)send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+                       arg->flags);
+}
+
+struct recvfrom_arg {
+    int fd, flags;
+    VALUE str;
+    socklen_t alen;
+    struct sockaddr_storage buf;
+};
+
+static VALUE
+recvfrom_blocking(void *data)
+{
+    struct recvfrom_arg *arg = data;
+    return (VALUE)recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str),
+			   arg->flags, (struct sockaddr*)&arg->buf, &arg->alen);
+}
+
+VALUE
+rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
+{
+    rb_io_t *fptr;
+    VALUE str, klass;
+    struct recvfrom_arg arg;
+    VALUE len, flg;
+    long buflen;
+    long slen;
+
+    rb_scan_args(argc, argv, "11", &len, &flg);
+
+    if (flg == Qnil) arg.flags = 0;
+    else             arg.flags = NUM2INT(flg);
+    buflen = NUM2INT(len);
+
+    GetOpenFile(sock, fptr);
+    if (rb_io_read_pending(fptr)) {
+	rb_raise(rb_eIOError, "recv for buffered IO");
+    }
+    arg.fd = fptr->fd;
+    arg.alen = (socklen_t)sizeof(arg.buf);
+
+    arg.str = str = rb_tainted_str_new(0, buflen);
+    klass = RBASIC(str)->klass;
+    RBASIC(str)->klass = 0;
+
+    while (rb_io_check_closed(fptr),
+	   rb_thread_wait_fd(arg.fd),
+	   (slen = BLOCKING_REGION(recvfrom_blocking, &arg)) < 0) {
+        if (!rb_io_wait_readable(fptr->fd)) {
+            rb_sys_fail("recvfrom(2)");
+        }
+	if (RBASIC(str)->klass || RSTRING_LEN(str) != buflen) {
+	    rb_raise(rb_eRuntimeError, "buffer string modified");
+	}
+    }
+
+    RBASIC(str)->klass = klass;
+    if (slen < RSTRING_LEN(str)) {
+	rb_str_set_len(str, slen);
+    }
+    rb_obj_taint(str);
+    switch (from) {
+      case RECV_RECV:
+	return str;
+      case RECV_IP:
+#if 0
+	if (arg.alen != sizeof(struct sockaddr_in)) {
+	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
+	}
+#endif
+	if (arg.alen && arg.alen != sizeof(arg.buf)) /* OSX doesn't return a from result for connection-oriented sockets */
+	    return rb_assoc_new(str, rsock_ipaddr((struct sockaddr*)&arg.buf, fptr->mode & FMODE_NOREVLOOKUP));
+	else
+	    return rb_assoc_new(str, Qnil);
+
+#ifdef HAVE_SYS_UN_H
+      case RECV_UNIX:
+        return rb_assoc_new(str, rsock_unixaddr((struct sockaddr_un*)&arg.buf, arg.alen));
+#endif
+      case RECV_SOCKET:
+	return rb_assoc_new(str, rsock_io_socket_addrinfo(sock, (struct sockaddr*)&arg.buf, arg.alen));
+      default:
+	rb_bug("rsock_s_recvfrom called with bad value");
+    }
+}
+
+VALUE
+rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
+{
+    rb_io_t *fptr;
+    VALUE str;
+    struct sockaddr_storage buf;
+    socklen_t alen = (socklen_t)sizeof buf;
+    VALUE len, flg;
+    long buflen;
+    long slen;
+    int fd, flags;
+    VALUE addr = Qnil;
+
+    rb_scan_args(argc, argv, "11", &len, &flg);
+
+    if (flg == Qnil) flags = 0;
+    else             flags = NUM2INT(flg);
+    buflen = NUM2INT(len);
+
+#ifdef MSG_DONTWAIT
+    /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
+       It is not portable, though. */
+    flags |= MSG_DONTWAIT;
+#endif
+
+    GetOpenFile(sock, fptr);
+    if (rb_io_read_pending(fptr)) {
+	rb_raise(rb_eIOError, "recvfrom for buffered IO");
+    }
+    fd = fptr->fd;
+
+    str = rb_tainted_str_new(0, buflen);
+
+    rb_io_check_closed(fptr);
+    rb_io_set_nonblock(fptr);
+    slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, (struct sockaddr*)&buf, &alen);
+
+    if (slen < 0) {
+	switch (errno) {
+	  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
+            rb_mod_sys_fail(rb_mWaitReadable, "recvfrom(2) would block");
+	}
+	rb_sys_fail("recvfrom(2)");
+    }
+    if (slen < RSTRING_LEN(str)) {
+	rb_str_set_len(str, slen);
+    }
+    rb_obj_taint(str);
+    switch (from) {
+      case RECV_RECV:
+        return str;
+
+      case RECV_IP:
+        if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
+            addr = rsock_ipaddr((struct sockaddr*)&buf, fptr->mode & FMODE_NOREVLOOKUP);
+        break;
+
+      case RECV_SOCKET:
+        addr = rsock_io_socket_addrinfo(sock, (struct sockaddr*)&buf, alen);
+        break;
+
+      default:
+        rb_bug("rsock_s_recvfrom_nonblock called with bad value");
+    }
+    return rb_assoc_new(str, addr);
+}
+
+int
+rsock_socket(int domain, int type, int proto)
+{
+    int fd;
+
+    fd = socket(domain, type, proto);
+    if (fd < 0) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    fd = socket(domain, type, proto);
+	}
+    }
+    return fd;
+}
+
+static int
+wait_connectable0(int fd, rb_fdset_t *fds_w, rb_fdset_t *fds_e)
+{
+    int sockerr;
+    socklen_t sockerrlen;
+
+    for (;;) {
+	rb_fd_zero(fds_w);
+	rb_fd_zero(fds_e);
+
+	rb_fd_set(fd, fds_w);
+	rb_fd_set(fd, fds_e);
+
+	rb_thread_select(fd+1, 0, rb_fd_ptr(fds_w), rb_fd_ptr(fds_e), 0);
+
+	if (rb_fd_isset(fd, fds_w)) {
+	    return 0;
+	}
+	else if (rb_fd_isset(fd, fds_e)) {
+	    sockerrlen = (socklen_t)sizeof(sockerr);
+	    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
+			   &sockerrlen) == 0) {
+		if (sockerr == 0)
+		    continue;	/* workaround for winsock */
+		errno = sockerr;
+	    }
+	    return -1;
+	}
+    }
+}
+
+struct wait_connectable_arg {
+    int fd;
+    rb_fdset_t fds_w;
+    rb_fdset_t fds_e;
+};
+
+#ifdef HAVE_RB_FD_INIT
+static VALUE
+try_wait_connectable(VALUE arg)
+{
+    struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
+    return (VALUE)wait_connectable0(p->fd, &p->fds_w, &p->fds_e);
+}
+
+static VALUE
+wait_connectable_ensure(VALUE arg)
+{
+    struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
+    rb_fd_term(&p->fds_w);
+    rb_fd_term(&p->fds_e);
+    return Qnil;
+}
+#endif
+
+static int
+wait_connectable(int fd)
+{
+    struct wait_connectable_arg arg;
+
+    rb_fd_init(&arg.fds_w);
+    rb_fd_init(&arg.fds_e);
+#ifdef HAVE_RB_FD_INIT
+    arg.fd = fd;
+    return (int)rb_ensure(try_wait_connectable, (VALUE)&arg,
+			  wait_connectable_ensure,(VALUE)&arg);
+#else
+    return wait_connectable0(fd, &arg.fds_w, &arg.fds_e);
+#endif
+}
+
+#ifdef __CYGWIN__
+#define WAIT_IN_PROGRESS 10
+#endif
+#ifdef __APPLE__
+#define WAIT_IN_PROGRESS 10
+#endif
+#ifdef __linux__
+/* returns correct error */
+#define WAIT_IN_PROGRESS 0
+#endif
+#ifndef WAIT_IN_PROGRESS
+/* BSD origin code apparently has a problem */
+#define WAIT_IN_PROGRESS 1
+#endif
+
+struct connect_arg {
+    int fd;
+    const struct sockaddr *sockaddr;
+    socklen_t len;
+};
+
+static VALUE
+connect_blocking(void *data)
+{
+    struct connect_arg *arg = data;
+    return (VALUE)connect(arg->fd, arg->sockaddr, arg->len);
+}
+
+#if defined(SOCKS) && !defined(SOCKS5)
+static VALUE
+socks_connect_blocking(void *data)
+{
+    struct connect_arg *arg = data;
+    return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len);
+}
+#endif
+
+int
+rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
+{
+    int status;
+    rb_blocking_function_t *func = connect_blocking;
+    struct connect_arg arg;
+#if WAIT_IN_PROGRESS > 0
+    int wait_in_progress = -1;
+    int sockerr;
+    socklen_t sockerrlen;
+#endif
+
+    arg.fd = fd;
+    arg.sockaddr = sockaddr;
+    arg.len = len;
+#if defined(SOCKS) && !defined(SOCKS5)
+    if (socks) func = socks_connect_blocking;
+#endif
+    for (;;) {
+	status = (int)BLOCKING_REGION(func, &arg);
+	if (status < 0) {
+	    switch (errno) {
+	      case EINTR:
+#if defined(ERESTART)
+	      case ERESTART:
+#endif
+		continue;
+
+	      case EAGAIN:
+#ifdef EINPROGRESS
+	      case EINPROGRESS:
+#endif
+#if WAIT_IN_PROGRESS > 0
+		sockerrlen = (socklen_t)sizeof(sockerr);
+		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+		if (status) break;
+		if (sockerr) {
+		    status = -1;
+		    errno = sockerr;
+		    break;
+		}
+#endif
+#ifdef EALREADY
+	      case EALREADY:
+#endif
+#if WAIT_IN_PROGRESS > 0
+		wait_in_progress = WAIT_IN_PROGRESS;
+#endif
+		status = wait_connectable(fd);
+		if (status) {
+		    break;
+		}
+		errno = 0;
+		continue;
+
+#if WAIT_IN_PROGRESS > 0
+	      case EINVAL:
+		if (wait_in_progress-- > 0) {
+		    /*
+		     * connect() after EINPROGRESS returns EINVAL on
+		     * some platforms, need to check true error
+		     * status.
+		     */
+		    sockerrlen = (socklen_t)sizeof(sockerr);
+		    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+		    if (!status && !sockerr) {
+			struct timeval tv = {0, 100000};
+			rb_thread_wait_for(tv);
+			continue;
+		    }
+		    status = -1;
+		    errno = sockerr;
+		}
+		break;
+#endif
+
+#ifdef EISCONN
+	      case EISCONN:
+		status = 0;
+		errno = 0;
+		break;
+#endif
+	      default:
+		break;
+	    }
+	}
+	return status;
+    }
+}
+
+static void
+make_fd_nonblock(int fd)
+{
+    int flags;
+#ifdef F_GETFL
+    flags = fcntl(fd, F_GETFL);
+    if (flags == -1) {
+        rb_sys_fail(0);
+    }
+#else
+    flags = 0;
+#endif
+    flags |= O_NONBLOCK;
+    if (fcntl(fd, F_SETFL, flags) == -1) {
+        rb_sys_fail(0);
+    }
+}
+
+VALUE
+rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len)
+{
+    int fd2;
+
+    rb_secure(3);
+    rb_io_set_nonblock(fptr);
+    fd2 = accept(fptr->fd, (struct sockaddr*)sockaddr, len);
+    if (fd2 < 0) {
+	switch (errno) {
+	  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
+	  case ECONNABORTED:
+#if defined EPROTO
+	  case EPROTO:
+#endif
+            rb_mod_sys_fail(rb_mWaitReadable, "accept(2) would block");
+	}
+        rb_sys_fail("accept(2)");
+    }
+    make_fd_nonblock(fd2);
+    return rsock_init_sock(rb_obj_alloc(klass), fd2);
+}
+
+struct accept_arg {
+    int fd;
+    struct sockaddr *sockaddr;
+    socklen_t *len;
+};
+
+static VALUE
+accept_blocking(void *data)
+{
+    struct accept_arg *arg = data;
+    return (VALUE)accept(arg->fd, arg->sockaddr, arg->len);
+}
+
+VALUE
+rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
+{
+    int fd2;
+    int retry = 0;
+    struct accept_arg arg;
+
+    rb_secure(3);
+    arg.fd = fd;
+    arg.sockaddr = sockaddr;
+    arg.len = len;
+  retry:
+    rb_thread_wait_fd(fd);
+    fd2 = (int)BLOCKING_REGION(accept_blocking, &arg);
+    if (fd2 < 0) {
+	switch (errno) {
+	  case EMFILE:
+	  case ENFILE:
+	    if (retry) break;
+	    rb_gc();
+	    retry = 1;
+	    goto retry;
+	  default:
+	    if (!rb_io_wait_readable(fd)) break;
+	    retry = 0;
+	    goto retry;
+	}
+	rb_sys_fail(0);
+    }
+    if (!klass) return INT2NUM(fd2);
+    return rsock_init_sock(rb_obj_alloc(klass), fd2);
+}
+
+int
+rsock_getfamily(int sockfd)
+{
+    struct sockaddr_storage ss;
+    socklen_t sslen = (socklen_t)sizeof(ss);
+
+    ss.ss_family = AF_UNSPEC;
+    if (getsockname(sockfd, (struct sockaddr*)&ss, &sslen) < 0)
+        return AF_UNSPEC;
+
+    return ss.ss_family;
+}
+
+/*
+ * SocketError is the error class for socket.
+ */
+void
+rsock_init_socket_init()
+{
+    rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
+    rsock_init_ipsocket();
+    rsock_init_tcpsocket();
+    rsock_init_tcpserver();
+    rsock_init_sockssocket();
+    rsock_init_udpsocket();
+    rsock_init_unixsocket();
+    rsock_init_unixserver();
+    rsock_init_sockopt();
+    rsock_init_ancdata();
+    rsock_init_addrinfo();
+    rsock_init_socket_constants();
+}
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
new file mode 100644
index 0000000000..dd7eb80b55
--- /dev/null
+++ b/ext/socket/ipsocket.c
@@ -0,0 +1,308 @@
+/************************************************
+
+  ipsocket.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+struct inetsock_arg
+{
+    VALUE sock;
+    struct {
+	VALUE host, serv;
+	struct addrinfo *res;
+    } remote, local;
+    int type;
+    int fd;
+};
+
+static VALUE
+inetsock_cleanup(struct inetsock_arg *arg)
+{
+    if (arg->remote.res) {
+	freeaddrinfo(arg->remote.res);
+	arg->remote.res = 0;
+    }
+    if (arg->local.res) {
+	freeaddrinfo(arg->local.res);
+	arg->local.res = 0;
+    }
+    if (arg->fd >= 0) {
+	close(arg->fd);
+    }
+    return Qnil;
+}
+
+static VALUE
+init_inetsock_internal(struct inetsock_arg *arg)
+{
+    int type = arg->type;
+    struct addrinfo *res;
+    int fd, status = 0;
+    const char *syscall = 0;
+
+    arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
+				    (type == INET_SERVER) ? AI_PASSIVE : 0);
+    /*
+     * Maybe also accept a local address
+     */
+
+    if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
+	arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
+    }
+
+    arg->fd = fd = -1;
+    for (res = arg->remote.res; res; res = res->ai_next) {
+#if !defined(INET6) && defined(AF_INET6)
+	if (res->ai_family == AF_INET6)
+	    continue;
+#endif
+	status = rsock_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
+	syscall = "socket(2)";
+	fd = status;
+	if (fd < 0) {
+	    continue;
+	}
+	arg->fd = fd;
+	if (type == INET_SERVER) {
+#if !defined(_WIN32) && !defined(__CYGWIN__)
+	    status = 1;
+	    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+		       (char*)&status, (socklen_t)sizeof(status));
+#endif
+	    status = bind(fd, res->ai_addr, res->ai_addrlen);
+	    syscall = "bind(2)";
+	}
+	else {
+	    if (arg->local.res) {
+		status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
+		syscall = "bind(2)";
+	    }
+
+	    if (status >= 0) {
+		status = rsock_connect(fd, res->ai_addr, res->ai_addrlen,
+				       (type == INET_SOCKS));
+		syscall = "connect(2)";
+	    }
+	}
+
+	if (status < 0) {
+	    close(fd);
+	    arg->fd = fd = -1;
+	    continue;
+	} else
+	    break;
+    }
+    if (status < 0) {
+	rb_sys_fail(syscall);
+    }
+
+    arg->fd = -1;
+
+    if (type == INET_SERVER) {
+	status = listen(fd, 5);
+	if (status < 0) {
+	    close(fd);
+	    syscall = "listen(2)";
+	}
+    }
+
+    /* create new instance */
+    return rsock_init_sock(arg->sock, fd);
+}
+
+VALUE
+rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
+	            VALUE local_host, VALUE local_serv, int type)
+{
+    struct inetsock_arg arg;
+    arg.sock = sock;
+    arg.remote.host = remote_host;
+    arg.remote.serv = remote_serv;
+    arg.remote.res = 0;
+    arg.local.host = local_host;
+    arg.local.serv = local_serv;
+    arg.local.res = 0;
+    arg.type = type;
+    arg.fd = -1;
+    return rb_ensure(init_inetsock_internal, (VALUE)&arg,
+		     inetsock_cleanup, (VALUE)&arg);
+}
+
+static ID id_numeric, id_hostname;
+
+int
+rsock_revlookup_flag(VALUE revlookup, int *norevlookup)
+{
+#define return_norevlookup(x) {*norevlookup = x; return 1;}
+    ID id;
+
+    switch (revlookup) {
+      case Qtrue:  return_norevlookup(0);
+      case Qfalse: return_norevlookup(1);
+      case Qnil: break;
+      default:
+	Check_Type(revlookup, T_SYMBOL);
+	id = SYM2ID(revlookup);
+	if (id == id_numeric) return_norevlookup(1);
+	if (id == id_hostname) return_norevlookup(0);
+	rb_raise(rb_eArgError, "invalid reverse_lookup flag: :%s", rb_id2name(id));
+    }
+    return 0;
+#undef return_norevlookup
+}
+
+/*
+ * call-seq:
+ *   ipsocket.addr([reverse_lookup]) => [address_family, port, hostname, numeric_address]
+ *
+ * Returns the local address as an array which contains
+ * address_family, port, hostname and numeric_address.
+ *
+ * If +reverse_lookup+ is +true+ or +:hostname+,
+ * hostname is obtained from numeric_address using reverse lookup.
+ * Or if it is +false+, or +:numeric+,
+ * hostname is same as numeric_address.
+ * Or if it is +nil+ or ommitted, obeys to +ipsocket.do_not_reverse_lookup+.
+ * See +Socket.getaddrinfo+ also.
+ *
+ *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
+ *     p sock.addr #=> ["AF_INET", 49429, "hal", "192.168.0.128"]
+ *     p sock.addr(true)  #=> ["AF_INET", 49429, "hal", "192.168.0.128"]
+ *     p sock.addr(false) #=> ["AF_INET", 49429, "192.168.0.128", "192.168.0.128"]
+ *     p sock.addr(:hostname)  #=> ["AF_INET", 49429, "hal", "192.168.0.128"]
+ *     p sock.addr(:numeric)   #=> ["AF_INET", 49429, "192.168.0.128", "192.168.0.128"]
+ *   }
+ *
+ */
+static VALUE
+ip_addr(int argc, VALUE *argv, VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_storage addr;
+    socklen_t len = (socklen_t)sizeof addr;
+    int norevlookup;
+
+    GetOpenFile(sock, fptr);
+
+    if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup))
+	norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
+    if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getsockname(2)");
+    return rsock_ipaddr((struct sockaddr*)&addr, norevlookup);
+}
+
+/*
+ * call-seq:
+ *   ipsocket.peeraddr([reverse_lookup]) => [address_family, port, hostname, numeric_address]
+ *
+ * Returns the remote address as an array which contains
+ * address_family, port, hostname and numeric_address.
+ * It is defined for connection oriented socket such as TCPSocket.
+ *
+ * If +reverse_lookup+ is +true+ or +:hostname+,
+ * hostname is obtained from numeric_address using reverse lookup.
+ * Or if it is +false+, or +:numeric+,
+ * hostname is same as numeric_address.
+ * Or if it is +nil+ or ommitted, obeys to +ipsocket.do_not_reverse_lookup+.
+ * See +Socket.getaddrinfo+ also.
+ *
+ *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
+ *     p sock.peeraddr #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
+ *     p sock.peeraddr(true)  #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
+ *     p sock.peeraddr(false) #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
+ *     p sock.peeraddr(:hostname) #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
+ *     p sock.peeraddr(:numeric)  #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
+ *   }
+ *
+ */
+static VALUE
+ip_peeraddr(int argc, VALUE *argv, VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_storage addr;
+    socklen_t len = (socklen_t)sizeof addr;
+    int norevlookup;
+
+    GetOpenFile(sock, fptr);
+
+    if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup))
+	norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
+    if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getpeername(2)");
+    return rsock_ipaddr((struct sockaddr*)&addr, norevlookup);
+}
+
+/*
+ * call-seq:
+ *   ipsocket.recvfrom(maxlen)        => [mesg, ipaddr]
+ *   ipsocket.recvfrom(maxlen, flags) => [mesg, ipaddr]
+ *
+ * Receives a message and return the message as a string and
+ * an address which the message come from.
+ *
+ * _maxlen_ is the maximum number of bytes to receive.
+ *
+ * _flags_ should be a bitwise OR of Socket::MSG_* constants.
+ *
+ * ipaddr is same as IPSocket#{peeraddr,addr}.
+ *
+ *   u1 = UDPSocket.new
+ *   u1.bind("127.0.0.1", 4913)
+ *   u2 = UDPSocket.new
+ *   u2.send "uuuu", 0, "127.0.0.1", 4913
+ *   p u1.recvfrom(10) #=> ["uuuu", ["AF_INET", 33230, "localhost", "127.0.0.1"]]
+ *
+ */
+static VALUE
+ip_recvfrom(int argc, VALUE *argv, VALUE sock)
+{
+    return rsock_s_recvfrom(sock, argc, argv, RECV_IP);
+}
+
+/*
+ * call-seq:
+ *   IPSocket.getaddress(host)        => ipaddress
+ *
+ * Lookups the IP address of _host_.
+ *
+ *   IPSocket.getaddress("localhost")     #=> "127.0.0.1"
+ *   IPSocket.getaddress("ip6-localhost") #=> "::1"
+ *
+ */
+static VALUE
+ip_s_getaddress(VALUE obj, VALUE host)
+{
+    struct sockaddr_storage addr;
+    struct addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0);
+
+    /* just take the first one */
+    memcpy(&addr, res->ai_addr, res->ai_addrlen);
+    freeaddrinfo(res);
+
+    return rsock_make_ipaddr((struct sockaddr*)&addr);
+}
+
+/*
+ * Document-class: ::IPSocket < BasicSocket
+ *
+ * IPSocket is the super class of TCPSocket and UDPSocket.
+ */
+void
+rsock_init_ipsocket(void)
+{
+    rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
+    rb_define_method(rb_cIPSocket, "addr", ip_addr, -1);
+    rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, -1);
+    rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
+    rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
+    rb_undef_method(rb_cIPSocket, "getpeereid");
+
+    id_numeric = rb_intern_const("numeric");
+    id_hostname = rb_intern_const("hostname");
+}
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
new file mode 100644
index 0000000000..b7dc446c94
--- /dev/null
+++ b/ext/socket/lib/socket.rb
@@ -0,0 +1,755 @@
+require 'socket.so'
+
+class Addrinfo
+  # creates an Addrinfo object from the arguments.
+  #
+  # The arguments are interpreted as similar to self.
+  #
+  #   Addrinfo.tcp("0.0.0.0", 4649).family_addrinfo("www.ruby-lang.org", 80)
+  #   #=> #<Addrinfo: 221.186.184.68:80 TCP (www.ruby-lang.org:80)>
+  #
+  #   Addrinfo.unix("/tmp/sock").family_addrinfo("/tmp/sock2")
+  #   #=> #<Addrinfo: /tmp/sock2 SOCK_STREAM>
+  #
+  def family_addrinfo(*args)
+    if args.empty?
+      raise ArgumentError, "no address specified"
+    elsif Addrinfo === args.first
+      raise ArgumentError, "too many arguments" if args.length != 1
+    elsif self.ip?
+      raise ArgumentError, "IP address needs host and port but #{args.length} arguments given" if args.length != 2
+      host, port = args
+      Addrinfo.getaddrinfo(host, port, self.pfamily, self.socktype, self.protocol)[0]
+    elsif self.unix?
+      raise ArgumentError, "UNIX socket needs single path argument but #{args.length} arguments given" if args.length != 1
+      path, = args
+      Addrinfo.unix(path)
+    else
+      raise ArgumentError, "unexpected family"
+    end
+  end
+
+  def connect_internal(local_addrinfo)
+    sock = Socket.new(self.pfamily, self.socktype, self.protocol)
+    begin
+      sock.ipv6only! if self.ipv6?
+      sock.bind local_addrinfo if local_addrinfo
+      sock.connect(self)
+      if block_given?
+        yield sock
+      else
+        sock
+      end
+    ensure
+      sock.close if !sock.closed? && (block_given? || $!)
+    end
+  end
+  private :connect_internal
+
+  # creates a socket connected to the address of self.
+  #
+  # If one or more arguments given as _local_addr_args_,
+  # it is used as the local address of the socket.
+  # _local_addr_args_ is given for family_addrinfo to obtain actual address.
+  #
+  # If no arguments given, the local address of the socket is not bound.
+  #
+  # If a block is given, it is called with the socket and the value of the block is returned.
+  # The socket is returned otherwise.
+  #
+  #   Addrinfo.tcp("www.ruby-lang.org", 80).connect_from("0.0.0.0", 4649) {|s|
+  #     s.print "GET / HTTP/1.0\r\nHost: www.ruby-lang.org\r\n\r\n"
+  #     puts s.read
+  #   }
+  #
+  #   # Addrinfo object can be taken for the argument.
+  #   Addrinfo.tcp("www.ruby-lang.org", 80).connect_from(Addrinfo.tcp("0.0.0.0", 4649)) {|s|
+  #     s.print "GET / HTTP/1.0\r\nHost: www.ruby-lang.org\r\n\r\n"
+  #     puts s.read
+  #   }
+  #
+  def connect_from(*local_addr_args, &block)
+    connect_internal(family_addrinfo(*local_addr_args), &block)
+  end
+
+  # creates a socket connected to the address of self.
+  #
+  # If a block is given, it is called with the socket and the value of the block is returned.
+  # The socket is returned otherwise.
+  #
+  #   Addrinfo.tcp("www.ruby-lang.org", 80).connect {|s|
+  #     s.print "GET / HTTP/1.0\r\nHost: www.ruby-lang.org\r\n\r\n"
+  #     puts s.read
+  #   }
+  #
+  def connect(&block)
+    connect_internal(nil, &block)
+  end
+
+  # creates a socket connected to _remote_addr_args_ and bound to self.
+  #
+  # If a block is given, it is called with the socket and the value of the block is returned.
+  # The socket is returned otherwise.
+  #
+  #   Addrinfo.tcp("0.0.0.0", 4649).connect_to("www.ruby-lang.org", 80) {|s|
+  #     s.print "GET / HTTP/1.0\r\nHost: www.ruby-lang.org\r\n\r\n"
+  #     puts s.read
+  #   }
+  #
+  def connect_to(*remote_addr_args, &block)
+    remote_addrinfo = family_addrinfo(*remote_addr_args)
+    remote_addrinfo.send(:connect_internal, self, &block)
+  end
+
+  # creates a socket bound to self.
+  #
+  # If a block is given, it is called with the socket and the value of the block is returned.
+  # The socket is returned otherwise.
+  #
+  #   Addrinfo.udp("0.0.0.0", 9981).bind {|s|
+  #     s.local_address.connect {|s| s.send "hello", 0 }
+  #     p s.recv(10) #=> "hello"
+  #   }
+  #
+  def bind
+    sock = Socket.new(self.pfamily, self.socktype, self.protocol)
+    begin
+      sock.ipv6only! if self.ipv6?
+      sock.setsockopt(:SOCKET, :REUSEADDR, 1)
+      sock.bind(self)
+      if block_given?
+        yield sock
+      else
+        sock
+      end
+    ensure
+      sock.close if !sock.closed? && (block_given? || $!)
+    end
+  end
+
+  # creates a listening socket bound to self.
+  def listen(backlog=5)
+    sock = Socket.new(self.pfamily, self.socktype, self.protocol)
+    begin
+      sock.ipv6only! if self.ipv6?
+      sock.setsockopt(:SOCKET, :REUSEADDR, 1)
+      sock.bind(self)
+      sock.listen(backlog)
+      if block_given?
+        yield sock
+      else
+        sock
+      end
+    ensure
+      sock.close if !sock.closed? && (block_given? || $!)
+    end
+  end
+
+  # iterates over the list of Addrinfo objects obtained by Addrinfo.getaddrinfo.
+  #
+  #   Addrinfo.foreach(nil, 80) {|x| p x }
+  #   #=> #<Addrinfo: 127.0.0.1:80 TCP (:80)>
+  #   #   #<Addrinfo: 127.0.0.1:80 UDP (:80)>
+  #   #   #<Addrinfo: [::1]:80 TCP (:80)>
+  #   #   #<Addrinfo: [::1]:80 UDP (:80)>
+  #
+  def self.foreach(nodename, service, family=nil, socktype=nil, protocol=nil, flags=nil, &block)
+    Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags).each(&block)
+  end
+end
+
+class BasicSocket < IO
+  # Returns an address of the socket suitable for connect in the local machine.
+  #
+  # This method returns _self_.local_address, except following condition.
+  #
+  # - IPv4 unspecified address (0.0.0.0) is replaced by IPv4 loopback address (127.0.0.1).
+  # - IPv6 unspecified address (::) is replaced by IPv6 loopback address (::1).
+  #
+  # If the local address is not suitable for connect, SocketError is raised.
+  # IPv4 and IPv6 address which port is 0 is not suitable for connect.
+  # Unix domain socket which has no path is not suitable for connect.
+  #
+  #   Addrinfo.tcp("0.0.0.0", 0).listen {|serv|
+  #     p serv.connect_address #=> #<Addrinfo: 127.0.0.1:53660 TCP>
+  #     serv.connect_address.connect {|c|
+  #       s, _ = serv.accept
+  #       p [c, s] #=> [#<Socket:fd 4>, #<Socket:fd 6>]
+  #     }
+  #   }
+  #
+  def connect_address
+    addr = local_address
+    afamily = addr.afamily
+    if afamily == Socket::AF_INET
+      raise SocketError, "unbound IPv4 socket" if addr.ip_port == 0
+      if addr.ip_address == "0.0.0.0"
+        addr = Addrinfo.new(["AF_INET", addr.ip_port, nil, "127.0.0.1"], addr.pfamily, addr.socktype, addr.protocol)
+      end
+    elsif defined?(Socket::AF_INET6) && afamily == Socket::AF_INET6
+      raise SocketError, "unbound IPv6 socket" if addr.ip_port == 0
+      if addr.ip_address == "::"
+        addr = Addrinfo.new(["AF_INET6", addr.ip_port, nil, "::1"], addr.pfamily, addr.socktype, addr.protocol)
+      elsif addr.ip_address == "0.0.0.0" # MacOS X 10.4 returns "a.b.c.d" for IPv4-mapped IPv6 address.
+        addr = Addrinfo.new(["AF_INET6", addr.ip_port, nil, "::1"], addr.pfamily, addr.socktype, addr.protocol)
+      elsif addr.ip_address == "::ffff:0.0.0.0" # MacOS X 10.6 returns "::ffff:a.b.c.d" for IPv4-mapped IPv6 address.
+        addr = Addrinfo.new(["AF_INET6", addr.ip_port, nil, "::1"], addr.pfamily, addr.socktype, addr.protocol)
+      end
+    elsif defined?(Socket::AF_UNIX) && afamily == Socket::AF_UNIX
+      raise SocketError, "unbound Unix socket" if addr.unix_path == ""
+    end
+    addr
+  end
+end
+
+class Socket < BasicSocket
+  # enable the socket option IPV6_V6ONLY if IPV6_V6ONLY is available.
+  def ipv6only!
+    if defined? Socket::IPV6_V6ONLY
+      self.setsockopt(:IPV6, :V6ONLY, 1)
+    end
+  end
+
+  # creates a new socket object connected to host:port using TCP/IP.
+  #
+  # If local_host:local_port is given,
+  # the socket is bound to it.
+  #
+  # If a block is given, the block is called with the socket.
+  # The value of the block is returned.
+  # The socket is closed when this method returns.
+  #
+  # If no block is given, the socket is returned.
+  #
+  #   Socket.tcp("www.ruby-lang.org", 80) {|sock|
+  #     sock.print "GET / HTTP/1.0\r\nHost: www.ruby-lang.org\r\n\r\n"
+  #     sock.close_write
+  #     puts sock.read
+  #   }
+  #
+  def self.tcp(host, port, local_host=nil, local_port=nil) # :yield: socket
+    last_error = nil
+    ret = nil
+
+    local_addr_list = nil
+    if local_host != nil || local_port != nil
+      local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
+    end
+
+    Addrinfo.foreach(host, port, nil, :STREAM) {|ai|
+      if local_addr_list
+        local_addr = local_addr_list.find {|local_ai| local_ai.afamily == ai.afamily }
+        next if !local_addr
+      else
+        local_addr = nil
+      end
+      begin
+        sock = local_addr ? ai.connect_from(local_addr) : ai.connect
+      rescue SystemCallError
+        last_error = $!
+        next
+      end
+      ret = sock
+      break
+    }
+    if !ret
+      if last_error
+        raise last_error
+      else
+        raise SocketError, "no appropriate local address"
+      end
+    end
+    if block_given?
+      begin
+        yield ret
+      ensure
+        ret.close if !ret.closed?
+      end
+    else
+      ret
+    end
+  end
+
+  # :stopdoc:
+  def self.ip_sockets_port0(ai_list, reuseaddr)
+    begin
+      sockets = []
+      port = nil
+      ai_list.each {|ai|
+        begin
+          s = Socket.new(ai.pfamily, ai.socktype, ai.protocol)
+        rescue SystemCallError
+          next
+        end
+        sockets << s
+        s.ipv6only! if ai.ipv6?
+        if reuseaddr
+          s.setsockopt(:SOCKET, :REUSEADDR, 1)
+        end
+        if !port
+          s.bind(ai)
+          port = s.local_address.ip_port
+        else
+          s.bind(ai.family_addrinfo(ai.ip_address, port))
+        end
+      }
+    rescue Errno::EADDRINUSE
+      sockets.each {|s|
+        s.close
+      }
+      retry
+    end
+    sockets
+  ensure
+    sockets.each {|s| s.close if !s.closed? } if $!
+  end
+  class << self
+    private :ip_sockets_port0
+  end
+
+  def self.tcp_server_sockets_port0(host)
+    ai_list = Addrinfo.getaddrinfo(host, 0, nil, :STREAM, nil, Socket::AI_PASSIVE)
+    sockets = ip_sockets_port0(ai_list, true)
+    sockets.each {|s|
+      s.listen(5)
+    }
+    sockets
+  ensure
+    sockets.each {|s| s.close if !s.closed? } if $! && sockets
+  end
+  class << self
+    private :tcp_server_sockets_port0
+  end
+  # :startdoc:
+
+  # creates TCP/IP server sockets for _host_ and _port_.
+  # _host_ is optional.
+  #
+  # If no block given,
+  # it returns an array of listening sockets.
+  #
+  # If a block is given, the block is called with the sockets.
+  # The value of the block is returned.
+  # The socket is closed when this method returns.
+  #
+  # If _port_ is 0, actual port number is choosen dynamically.
+  # However all sockets in the result has same port number.
+  #
+  #   # tcp_server_sockets returns two sockets.
+  #   sockets = Socket.tcp_server_sockets(1296)
+  #   p sockets #=> [#<Socket:fd 3>, #<Socket:fd 4>]
+  #
+  #   # The sockets contains IPv6 and IPv4 sockets.
+  #   sockets.each {|s| p s.local_address }
+  #   #=> #<Addrinfo: [::]:1296 TCP>
+  #   #   #<Addrinfo: 0.0.0.0:1296 TCP>
+  #
+  #   # IPv6 and IPv4 socket has same port number, 53114, even if it is choosen dynamically.
+  #   sockets = Socket.tcp_server_sockets(0)
+  #   sockets.each {|s| p s.local_address }
+  #   #=> #<Addrinfo: [::]:53114 TCP>
+  #   #   #<Addrinfo: 0.0.0.0:53114 TCP>
+  #
+  #   # The block is called with the sockets.
+  #   Socket.tcp_server_sockets(0) {|sockets|
+  #     p sockets #=> [#<Socket:fd 3>, #<Socket:fd 4>]
+  #   }
+  #
+  def self.tcp_server_sockets(host=nil, port)
+    if port == 0
+      sockets = tcp_server_sockets_port0(host)
+    else
+      begin
+        last_error = nil
+        sockets = []
+        Addrinfo.foreach(host, port, nil, :STREAM, nil, Socket::AI_PASSIVE) {|ai|
+          begin
+            s = ai.listen
+          rescue SystemCallError
+            last_error = $!
+            next
+          end
+          sockets << s
+        }
+        if sockets.empty?
+          raise last_error
+        end
+      ensure
+        sockets.each {|s| s.close if !s.closed? } if $!
+      end
+    end
+    if block_given?
+      begin
+        yield sockets
+      ensure
+        sockets.each {|s| s.close if !s.closed? }
+      end
+    else
+      sockets
+    end
+  end
+
+  # yield socket and client address for each a connection accepted via given sockets.
+  #
+  # The arguments are a list of sockets.
+  # The individual argument should be a socket or an array of sockets.
+  #
+  # This method yields the block sequentially.
+  # It means that the next connection is not accepted until the block returns.
+  # So concurrent mechanism, thread for example, should be used to service multiple clients at a time.
+  #
+  def self.accept_loop(*sockets) # :yield: socket, client_addrinfo
+    sockets.flatten!(1)
+    if sockets.empty?
+      raise ArgumentError, "no sockets"
+    end
+    loop {
+      readable, _, _ = IO.select(sockets)
+      readable.each {|r|
+        begin
+          sock, addr = r.accept_nonblock
+        rescue IO::WaitReadable
+          next
+        end
+        yield sock, addr
+      }
+    }
+  end
+
+  # creates a TCP/IP server on _port_ and calls the block for each connection accepted.
+  # The block is called with a socket and a client_address as an Addrinfo object.
+  #
+  # If _host_ is specified, it is used with _port_ to determine the server addresses.
+  #
+  # The socket is *not* closed when the block returns.
+  # So application should close it explicitly.
+  #
+  # This method calls the block sequentially.
+  # It means that the next connection is not accepted until the block returns.
+  # So concurrent mechanism, thread for example, should be used to service multiple clients at a time.
+  #
+  # Note that Addrinfo.getaddrinfo is used to determine the server socket addresses.
+  # When Addrinfo.getaddrinfo returns two or more addresses,
+  # IPv4 and IPv6 address for example,
+  # all of them are used.
+  # Socket.tcp_server_loop succeeds if one socket can be used at least.
+  #
+  #   # Sequential echo server.
+  #   # It services only one client at a time.
+  #   Socket.tcp_server_loop(16807) {|sock, client_addrinfo|
+  #     begin
+  #       IO.copy_stream(sock, sock)
+  #     ensure
+  #       sock.close
+  #     end
+  #   }
+  #
+  #   # Threaded echo server
+  #   # It services multiple clients at a time.
+  #   # Note that it may accept connections too much.
+  #   Socket.tcp_server_loop(16807) {|sock, client_addrinfo|
+  #     Thread.new {
+  #       begin
+  #         IO.copy_stream(sock, sock)
+  #       ensure
+  #         sock.close
+  #       end
+  #     }
+  #   }
+  #
+  def self.tcp_server_loop(host=nil, port, &b) # :yield: socket, client_addrinfo
+    tcp_server_sockets(host, port) {|sockets|
+      accept_loop(sockets, &b)
+    }
+  end
+
+  # :call-seq:
+  #   Socket.udp_server_sockets([host, ] port)
+  #
+  # Creates UDP/IP sockets for a UDP server.
+  #
+  # If no block given, it returns an array of sockets.
+  #
+  # If a block is given, the block is called with the sockets.
+  # The value of the block is returned.
+  # The sockets are closed when this method returns.
+  #
+  # If _port_ is zero, some port is choosen.
+  # But the choosen port is used for the all sockets.
+  #
+  #   # UDP/IP echo server
+  #   Socket.udp_server_sockets(0) {|sockets|
+  #     p sockets.first.local_address.ip_port     #=> 32963
+  #     Socket.udp_server_loop_on(sockets) {|msg, msg_src|
+  #       msg_src.reply msg
+  #     }
+  #   }
+  #
+  def self.udp_server_sockets(host=nil, port)
+    last_error = nil
+    sockets = []
+
+    ipv6_recvpktinfo = nil
+    if defined? Socket::AncillaryData
+      if defined? Socket::IPV6_RECVPKTINFO # RFC 3542
+        ipv6_recvpktinfo = Socket::IPV6_RECVPKTINFO
+      elsif defined? Socket::IPV6_PKTINFO # RFC 2292
+        ipv6_recvpktinfo = Socket::IPV6_PKTINFO
+      end
+    end
+
+    local_addrs = Socket.ip_address_list
+
+    ip_list = []
+    Addrinfo.foreach(host, port, nil, :DGRAM, nil, Socket::AI_PASSIVE) {|ai|
+      if ai.ipv4? && ai.ip_address == "0.0.0.0"
+        local_addrs.each {|a|
+          next if !a.ipv4?
+          ip_list << Addrinfo.new(a.to_sockaddr, :INET, :DGRAM, 0);
+        }
+      elsif ai.ipv6? && ai.ip_address == "::" && !ipv6_recvpktinfo
+        local_addrs.each {|a|
+          next if !a.ipv6?
+          ip_list << Addrinfo.new(a.to_sockaddr, :INET6, :DGRAM, 0);
+        }
+      else
+        ip_list << ai
+      end
+    }
+
+    if port == 0
+      sockets = ip_sockets_port0(ip_list, false)
+    else
+      ip_list.each {|ip|
+        ai = Addrinfo.udp(ip.ip_address, port)
+        begin
+          s = ai.bind
+        rescue SystemCallError
+          last_error = $!
+          next
+        end
+        sockets << s
+      }
+      if sockets.empty?
+        raise last_error
+      end
+    end
+
+    pktinfo_sockets = {}
+    sockets.each {|s|
+      ai = s.local_address
+      if ipv6_recvpktinfo && ai.ipv6? && ai.ip_address == "::"
+        s.setsockopt(:IPV6, ipv6_recvpktinfo, 1)
+        pktinfo_sockets[s] = true
+      end
+    }
+
+    if block_given?
+      begin
+        yield sockets
+      ensure
+        sockets.each {|s| s.close if !s.closed? } if sockets
+      end
+    else
+      sockets
+    end
+  end
+
+  # :call-seq:
+  #   Socket.udp_server_recv(sockets) {|msg, msg_src| ... }
+  #
+  # Receive UDP/IP packets from the given _sockets_.
+  # For each packet received, the block is called.
+  #
+  # The block receives _msg_ and _msg_src_.
+  # _msg_ is a string which is the payload of the received packet.
+  # _msg_src_ is a Socket::UDPSource object which is used for reply.
+  #
+  # Socket.udp_server_loop can be implemented using this method as follows.
+  #
+  #   udp_server_sockets(host, port) {|sockets|
+  #     loop {
+  #       readable, _, _ = IO.select(sockets)
+  #       udp_server_recv(readable) {|msg, msg_src| ... }
+  #     }
+  #   }
+  #
+  def self.udp_server_recv(sockets)
+    sockets.each {|r|
+      begin
+        msg, sender_addrinfo, rflags, *controls = r.recvmsg_nonblock
+      rescue IO::WaitReadable
+        next
+      end
+      ai = r.local_address
+      if ai.ipv6? and pktinfo = controls.find {|c| c.cmsg_is?(:IPV6, :PKTINFO) }
+        ai = Addrinfo.udp(pktinfo.ipv6_pktinfo_addr.ip_address, ai.ip_port)
+        yield msg, UDPSource.new(sender_addrinfo, ai) {|reply_msg|
+          r.sendmsg reply_msg, 0, sender_addrinfo, pktinfo
+        }
+      else
+        yield msg, UDPSource.new(sender_addrinfo, ai) {|reply_msg|
+          r.send reply_msg, 0, sender_addrinfo
+        }
+      end
+    }
+  end
+
+  # :call-seq:
+  #   Socket.udp_server_loop_on(sockets) {|msg, msg_src| ... }
+  #
+  # Run UDP/IP server loop on the given sockets.
+  #
+  # The return value of Socket.udp_server_sockets is appropriate for the argument.
+  #
+  # It calls the block for each message received.
+  #
+  def self.udp_server_loop_on(sockets, &b) # :yield: msg, msg_src
+    loop {
+      readable, _, _ = IO.select(sockets)
+      udp_server_recv(readable, &b)
+    }
+  end
+
+  # :call-seq:
+  #   Socket.udp_server_loop(port) {|msg, msg_src| ... }
+  #   Socket.udp_server_loop(host, port) {|msg, msg_src| ... }
+  #
+  # creates a UDP/IP server on _port_ and calls the block for each message arrived.
+  # The block is called with the message and its source information.
+  #
+  # This method allocates sockets internally using _port_.
+  # If _host_ is specified, it is used conjunction with _port_ to determine the server addresses.
+  #
+  # The _msg_ is a string.
+  #
+  # The _msg_src_ is a Socket::UDPSource object.
+  # It is used for reply.
+  #
+  #   # UDP/IP echo server.
+  #   Socket.udp_server_loop(9261) {|msg, msg_src|
+  #     msg_src.reply msg
+  #   }
+  #
+  def self.udp_server_loop(host=nil, port, &b) # :yield: message, message_source
+    udp_server_sockets(host, port) {|sockets|
+      udp_server_loop_on(sockets, &b)
+    }
+  end
+
+  # UDP/IP address information used by Socket.udp_server_loop.
+  class UDPSource
+    def initialize(remote_address, local_address, &reply_proc)
+      @remote_address = remote_address
+      @local_address = local_address
+      @reply_proc = reply_proc
+    end
+    attr_reader :remote_address, :local_address
+
+    def inspect
+      "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>"
+    end
+
+    def reply(msg)
+      @reply_proc.call msg
+    end
+  end
+
+  # creates a new socket connected to path using UNIX socket socket.
+  #
+  # If a block is given, the block is called with the socket.
+  # The value of the block is returned.
+  # The socket is closed when this method returns.
+  #
+  # If no block is given, the socket is returned.
+  #
+  #   # talk to /tmp/sock socket.
+  #   Socket.unix("/tmp/sock") {|sock|
+  #     t = Thread.new { IO.copy_stream(sock, STDOUT) }
+  #     IO.copy_stream(STDIN, sock)
+  #     t.join
+  #   }
+  #
+  def self.unix(path) # :yield: socket
+    addr = Addrinfo.unix(path)
+    sock = addr.connect
+    if block_given?
+      begin
+        yield sock
+      ensure
+        sock.close if !sock.closed?
+      end
+    else
+      sock
+    end
+  end
+
+  # creates a UNIX server socket on _path_
+  #
+  # If no block given, it returns a listening socket.
+  #
+  # If a block is given, it is called with the socket and the block value is returned.
+  # When the block exits, the socket is closed and the socket file is removed.
+  #
+  #   socket = Socket.unix_server_socket("/tmp/s")
+  #   p socket                  #=> #<Socket:fd 3>
+  #   p socket.local_address    #=> #<Addrinfo: /tmp/s SOCK_STREAM>
+  #
+  #   Socket.unix_server_socket("/tmp/sock") {|s|
+  #     p s                     #=> #<Socket:fd 3>
+  #     p s.local_address       #=> # #<Addrinfo: /tmp/sock SOCK_STREAM>
+  #   }
+  #
+  def self.unix_server_socket(path)
+    begin
+      st = File.lstat(path)
+    rescue Errno::ENOENT
+    end
+    if st && st.socket? && st.owned?
+      File.unlink path
+    end
+    s = Addrinfo.unix(path).listen
+    if block_given?
+      begin
+        yield s
+      ensure
+        s.close if !s.closed?
+        File.unlink path
+      end
+    else
+      s
+    end
+  end
+
+  # creates a UNIX socket server on _path_.
+  # It calls the block for each socket accepted.
+  #
+  # If _host_ is specified, it is used with _port_ to determine the server ports.
+  #
+  # The socket is *not* closed when the block returns.
+  # So application should close it.
+  #
+  # This method deletes the socket file pointed by _path_ at first if
+  # the file is a socket file and it is owned by the user of the application.
+  # This is safe only if the directory of _path_ is not changed by a malicious user.
+  # So don't use /tmp/malicious-users-directory/socket.
+  # Note that /tmp/socket and /tmp/your-private-directory/socket is safe assuming that /tmp has sticky bit.
+  #
+  #   # Sequential echo server.
+  #   # It services only one client at a time.
+  #   Socket.unix_server_loop("/tmp/sock") {|sock, client_addrinfo|
+  #     begin
+  #       IO.copy_stream(sock, sock)
+  #     ensure
+  #       sock.close
+  #     end
+  #   }
+  #
+  def self.unix_server_loop(path, &b) # :yield: socket, client_addrinfo
+    unix_server_socket(path) {|serv|
+      accept_loop(serv, &b)
+    }
+  end
+
+end
+
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
new file mode 100644
index 0000000000..fe00f30e3d
--- /dev/null
+++ b/ext/socket/mkconstants.rb
@@ -0,0 +1,696 @@
+require 'optparse'
+require 'erb'
+
+opt = OptionParser.new
+
+opt.def_option('-h', 'help') {
+  puts opt
+  exit 0
+}
+
+opt_o = nil
+opt.def_option('-o FILE', 'specify output file') {|filename|
+  opt_o = filename
+}
+
+opt_H = nil
+opt.def_option('-H FILE', 'specify output header file') {|filename|
+  opt_H = filename
+}
+
+C_ESC = {
+  "\\" => "\\\\",
+  '"' => '\"',
+  "\n" => '\n',
+}
+
+0x00.upto(0x1f) {|ch| C_ESC[[ch].pack("C")] ||= "\\%03o" % ch }
+0x7f.upto(0xff) {|ch| C_ESC[[ch].pack("C")] = "\\%03o" % ch }
+C_ESC_PAT = Regexp.union(*C_ESC.keys)
+
+def c_str(str)
+  '"' + str.gsub(C_ESC_PAT) {|s| C_ESC[s]} + '"'
+end
+
+opt.parse!
+
+
+
+h = {}
+DATA.each_line {|s|
+  name, default_value = s.scan(/\S+/)
+  next unless name && name[0] != ?#
+  if h.has_key? name
+    warn "#{$.}: warning: duplicate name: #{name}"
+    next
+  end
+  h[name] = default_value
+}
+DEFS = h.to_a
+
+def each_const
+  DEFS.each {|name, default_value|
+    if name =~ /\AINADDR_/
+      make_value = "UINT2NUM"
+    else
+      make_value = "INT2NUM"
+    end
+    guard = nil
+    if /\A(AF_INET6|PF_INET6|IPV6_.*)\z/ =~ name
+      # IPv6 is not supported although AF_INET6 is defined on bcc32/mingw
+      guard = "defined(INET6)"
+    end
+    yield guard, make_value, name, default_value
+  }
+end
+
+def each_name(pat)
+  DEFS.each {|name, default_value|
+    next if pat !~ name
+    yield name
+  }
+end
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+% each_const {|guard, make_value, name, default_value|
+#if !defined(<%=name%>)
+# if defined(HAVE_CONST_<%=name.upcase%>)
+#  define <%=name%> <%=name%>
+%if default_value
+# else
+#  define <%=name%> <%=default_value%>
+%end
+# endif
+#endif
+% }
+EOS
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(make_value, name, default_value)")
+#if defined(<%=name%>)
+    /* <%=name%>: */
+    rb_define_const(rb_cSocket, <%=c_str name%>, <%=make_value%>(<%=name%>));
+    /* <%=name%>: */
+    rb_define_const(rb_mSockConst, <%=c_str name%>, <%=make_value%>(<%=name%>));
+#endif
+EOS
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+% each_const {|guard, make_value, name, default_value|
+%   if guard
+#if <%=guard%>
+<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
+#endif
+%   else
+<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
+%   end
+% }
+EOS
+
+def reverse_each_name(pat)
+  DEFS.reverse_each {|name, default_value|
+    next if pat !~ name
+    yield name
+  }
+end
+
+def each_names_with_len(pat, prefix_optional=nil)
+  h = {}
+  DEFS.each {|name, default_value|
+    next if pat !~ name
+    (h[name.length] ||= []) << [name, name]
+  }
+  if prefix_optional
+    if Regexp === prefix_optional
+      prefix_pat = prefix_optional
+    else
+      prefix_pat = /\A#{Regexp.escape prefix_optional}/
+    end
+    DEFS.each {|const, default_value|
+      next if pat !~ const
+      next if prefix_pat !~ const
+      name = $'
+      (h[name.length] ||= []) << [name, const]
+    }
+  end
+  hh = {}
+  h.each {|len, pairs|
+    pairs.each {|name, const|
+      raise "name crash: #{name}" if hh[name]
+      hh[name] = true
+    }
+  }
+  h.keys.sort.each {|len|
+    yield h[len], len
+  }
+end
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
+%if guard
+#ifdef <%=guard%>
+int <%=funcname%>(const char *str, long len, int *valp);
+#endif
+%else
+int <%=funcname%>(const char *str, long len, int *valp);
+%end
+EOS
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
+int
+<%=funcname%>(const char *str, long len, int *valp)
+{
+    switch (len) {
+%    each_names_with_len(pat, prefix_optional) {|pairs, len|
+      case <%=len%>:
+%      pairs.each {|name, const|
+#ifdef <%=const%>
+        if (memcmp(str, <%=c_str name%>, <%=len%>) == 0) { *valp = <%=const%>; return 0; }
+#endif
+%      }
+        return -1;
+
+%    }
+      default:
+        return -1;
+    }
+}
+EOS
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
+%if guard
+#ifdef <%=guard%>
+<%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
+#endif
+%else
+<%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
+%end
+EOS
+
+NAME_TO_INT_DEFS = []
+def def_name_to_int(funcname, pat, prefix_optional, guard=nil)
+  decl = gen_name_to_int_decl(funcname, pat, prefix_optional, guard)
+  func = gen_name_to_int_func(funcname, pat, prefix_optional, guard)
+  NAME_TO_INT_DEFS << [decl, func]
+end
+
+def reverse_each_name_with_prefix_optional(pat, prefix_pat)
+  reverse_each_name(pat) {|n|
+    yield n, n
+  }
+  if prefix_pat
+    reverse_each_name(pat) {|n|
+      next if prefix_pat !~ n
+      yield n, $'
+    }
+  end
+end
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
+    <%=hash_var%> = st_init_numtable();
+% reverse_each_name_with_prefix_optional(pat, prefix_pat) {|n,s|
+#ifdef <%=n%>
+    st_insert(<%=hash_var%>, (st_data_t)<%=n%>, (st_data_t)rb_intern2(<%=c_str s%>, <%=s.length%>));
+#endif
+% }
+EOS
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
+ID
+<%=func_name%>(int val)
+{
+    st_data_t name;
+    if (st_lookup(<%=hash_var%>, (st_data_t)val, &name))
+        return (ID)name;
+    return 0;
+}
+EOS
+
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
+ID <%=func_name%>(int val);
+EOS
+
+INTERN_DEFS = []
+def def_intern(func_name, pat, prefix_optional=nil)
+  prefix_pat = nil
+  if prefix_optional
+    if Regexp === prefix_optional
+      prefix_pat = prefix_optional
+    else
+      prefix_pat = /\A#{Regexp.escape prefix_optional}/
+    end
+  end
+  hash_var = "#{func_name}_hash"
+  vardef = "static st_table *#{hash_var};"
+  gen_hash = gen_int_to_name_hash(hash_var, pat, prefix_pat)
+  decl = gen_int_to_name_decl(func_name, hash_var)
+  func = gen_int_to_name_func(func_name, hash_var)
+  INTERN_DEFS << [vardef, gen_hash, decl, func]
+end
+
+def_name_to_int("rsock_family_to_int", /\A(AF_|PF_)/, "AF_")
+def_name_to_int("rsock_socktype_to_int", /\ASOCK_/, "SOCK_")
+def_name_to_int("rsock_ipproto_to_int", /\AIPPROTO_/, "IPPROTO_")
+def_name_to_int("rsock_unknown_level_to_int", /\ASOL_SOCKET\z/, "SOL_")
+def_name_to_int("rsock_ip_level_to_int", /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/)
+def_name_to_int("rsock_so_optname_to_int", /\ASO_/, "SO_")
+def_name_to_int("rsock_ip_optname_to_int", /\AIP_/, "IP_")
+def_name_to_int("rsock_ipv6_optname_to_int", /\AIPV6_/, "IPV6_", "IPPROTO_IPV6")
+def_name_to_int("rsock_tcp_optname_to_int", /\ATCP_/, "TCP_")
+def_name_to_int("rsock_udp_optname_to_int", /\AUDP_/, "UDP_")
+def_name_to_int("rsock_shutdown_how_to_int", /\ASHUT_/, "SHUT_")
+def_name_to_int("rsock_scm_optname_to_int", /\ASCM_/, "SCM_")
+
+def_intern('rsock_intern_family',  /\AAF_/)
+def_intern('rsock_intern_family_noprefix',  /\AAF_/, "AF_")
+def_intern('rsock_intern_protocol_family',  /\APF_/)
+def_intern('rsock_intern_socktype',  /\ASOCK_/)
+def_intern('rsock_intern_ipproto',  /\AIPPROTO_/)
+def_intern('rsock_intern_iplevel',  /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/)
+def_intern('rsock_intern_so_optname',  /\ASO_/, "SO_")
+def_intern('rsock_intern_ip_optname',  /\AIP_/, "IP_")
+def_intern('rsock_intern_ipv6_optname',  /\AIPV6_/, "IPV6_")
+def_intern('rsock_intern_tcp_optname',  /\ATCP_/, "TCP_")
+def_intern('rsock_intern_udp_optname',  /\AUDP_/, "UDP_")
+def_intern('rsock_intern_scm_optname',  /\ASCM_/, "SCM_")
+def_intern('rsock_intern_local_optname',  /\ALOCAL_/, "LOCAL_")
+
+result = ERB.new(<<'EOS', nil, '%').result(binding)
+/* autogenerated file */
+
+<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
+
+/*
+ * Document-module: ::Socket::Constants
+ *
+ * Socket::Constants provides socket related constants.
+ * Following lists possible constants.
+ * If underlying platform doesn't define a constant,
+ * the corresponding Ruby constant is not defined.
+ *
+ */
+static void
+init_constants(void)
+{
+    rb_mSockConst = rb_define_module_under(rb_cSocket, "Constants");
+
+<%= gen_const_defs %>
+<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| gen_hash }.join("\n") %>
+}
+
+<%= NAME_TO_INT_DEFS.map {|decl, func| func }.join("\n") %>
+
+<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| func }.join("\n") %>
+
+EOS
+
+header_result = ERB.new(<<'EOS', nil, '%').result(binding)
+/* autogenerated file */
+<%= gen_const_decls %>
+<%= NAME_TO_INT_DEFS.map {|decl, func| decl }.join("\n") %>
+<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| decl }.join("\n") %>
+EOS
+
+if opt_H
+  File.open(opt_H, 'w') {|f|
+    f << header_result
+  }
+else
+  result = header_result + result
+end
+
+if opt_o
+  File.open(opt_o, 'w') {|f|
+    f << result
+  }
+else
+  $stdout << result
+end
+
+__END__
+
+SOCK_STREAM
+SOCK_DGRAM
+SOCK_RAW
+SOCK_RDM
+SOCK_SEQPACKET
+SOCK_PACKET
+
+AF_UNSPEC
+PF_UNSPEC
+AF_INET
+PF_INET
+AF_INET6
+PF_INET6
+AF_UNIX
+PF_UNIX
+AF_AX25
+PF_AX25
+AF_IPX
+PF_IPX
+AF_APPLETALK
+PF_APPLETALK
+AF_LOCAL
+PF_LOCAL
+AF_IMPLINK
+PF_IMPLINK
+AF_PUP
+PF_PUP
+AF_CHAOS
+PF_CHAOS
+AF_NS
+PF_NS
+AF_ISO
+PF_ISO
+AF_OSI
+PF_OSI
+AF_ECMA
+PF_ECMA
+AF_DATAKIT
+PF_DATAKIT
+AF_CCITT
+PF_CCITT
+AF_SNA
+PF_SNA
+AF_DEC
+PF_DEC
+AF_DLI
+PF_DLI
+AF_LAT
+PF_LAT
+AF_HYLINK
+PF_HYLINK
+AF_ROUTE
+PF_ROUTE
+AF_LINK
+PF_LINK
+AF_COIP
+PF_COIP
+AF_CNT
+PF_CNT
+AF_SIP
+PF_SIP
+AF_NDRV
+PF_NDRV
+AF_ISDN
+PF_ISDN
+AF_NATM
+PF_NATM
+AF_SYSTEM
+PF_SYSTEM
+AF_NETBIOS
+PF_NETBIOS
+AF_PPP
+PF_PPP
+AF_ATM
+PF_ATM
+AF_NETGRAPH
+PF_NETGRAPH
+AF_MAX
+PF_MAX
+AF_PACKET
+PF_PACKET
+
+AF_E164
+PF_XTP
+PF_RTIP
+PF_PIP
+PF_KEY
+
+MSG_OOB
+MSG_PEEK
+MSG_DONTROUTE
+MSG_EOR
+MSG_TRUNC
+MSG_CTRUNC
+MSG_WAITALL
+MSG_DONTWAIT
+MSG_EOF
+MSG_FLUSH
+MSG_HOLD
+MSG_SEND
+MSG_HAVEMORE
+MSG_RCVMORE
+MSG_COMPAT
+MSG_PROXY
+MSG_FIN
+MSG_SYN
+MSG_CONFIRM
+MSG_RST
+MSG_ERRQUEUE
+MSG_NOSIGNAL
+MSG_MORE
+
+SOL_SOCKET
+SOL_IP
+SOL_IPX
+SOL_AX25
+SOL_ATALK
+SOL_TCP
+SOL_UDP
+
+IPPROTO_IP	0
+IPPROTO_ICMP	1
+IPPROTO_IGMP
+IPPROTO_GGP
+IPPROTO_TCP	6
+IPPROTO_EGP
+IPPROTO_PUP
+IPPROTO_UDP	17
+IPPROTO_IDP
+IPPROTO_HELLO
+IPPROTO_ND
+IPPROTO_TP
+IPPROTO_XTP
+IPPROTO_EON
+IPPROTO_BIP
+IPPROTO_AH
+IPPROTO_DSTOPTS
+IPPROTO_ESP
+IPPROTO_FRAGMENT
+IPPROTO_HOPOPTS
+IPPROTO_ICMPV6
+IPPROTO_IPV6
+IPPROTO_NONE
+IPPROTO_ROUTING
+
+IPPROTO_RAW	255
+IPPROTO_MAX
+
+# Some port configuration
+IPPORT_RESERVED		1024
+IPPORT_USERRESERVED	5000
+
+# Some reserved IP v.4 addresses
+INADDR_ANY		0x00000000
+INADDR_BROADCAST	0xffffffff
+INADDR_LOOPBACK		0x7F000001
+INADDR_UNSPEC_GROUP	0xe0000000
+INADDR_ALLHOSTS_GROUP	0xe0000001
+INADDR_MAX_LOCAL_GROUP	0xe00000ff
+INADDR_NONE		0xffffffff
+
+# IP [gs]etsockopt options
+IP_OPTIONS
+IP_HDRINCL
+IP_TOS
+IP_TTL
+IP_RECVOPTS
+IP_RECVRETOPTS
+IP_RECVDSTADDR
+IP_RETOPTS
+IP_MINTTL
+IP_DONTFRAG
+IP_SENDSRCADDR
+IP_ONESBCAST
+IP_RECVTTL
+IP_RECVIF
+IP_RECVSLLA
+IP_PORTRANGE
+IP_MULTICAST_IF
+IP_MULTICAST_TTL
+IP_MULTICAST_LOOP
+IP_ADD_MEMBERSHIP
+IP_DROP_MEMBERSHIP
+IP_DEFAULT_MULTICAST_TTL
+IP_DEFAULT_MULTICAST_LOOP
+IP_MAX_MEMBERSHIPS
+IP_ROUTER_ALERT
+IP_PKTINFO
+IP_PKTOPTIONS
+IP_MTU_DISCOVER
+IP_RECVERR
+IP_RECVTOS
+IP_MTU
+IP_FREEBIND
+IP_IPSEC_POLICY
+IP_XFRM_POLICY
+IP_PASSSEC
+IP_PMTUDISC_DONT
+IP_PMTUDISC_WANT
+IP_PMTUDISC_DO
+IP_UNBLOCK_SOURCE
+IP_BLOCK_SOURCE
+IP_ADD_SOURCE_MEMBERSHIP
+IP_DROP_SOURCE_MEMBERSHIP
+IP_MSFILTER
+
+MCAST_JOIN_GROUP
+MCAST_BLOCK_SOURCE
+MCAST_UNBLOCK_SOURCE
+MCAST_LEAVE_GROUP
+MCAST_JOIN_SOURCE_GROUP
+MCAST_LEAVE_SOURCE_GROUP
+MCAST_MSFILTER
+MCAST_EXCLUDE
+MCAST_INCLUDE
+
+SO_DEBUG
+SO_REUSEADDR
+SO_REUSEPORT
+SO_TYPE
+SO_ERROR
+SO_DONTROUTE
+SO_BROADCAST
+SO_SNDBUF
+SO_RCVBUF
+SO_KEEPALIVE
+SO_OOBINLINE
+SO_NO_CHECK
+SO_PRIORITY
+SO_LINGER
+SO_PASSCRED
+SO_PEERCRED
+SO_RCVLOWAT
+SO_SNDLOWAT
+SO_RCVTIMEO
+SO_SNDTIMEO
+SO_ACCEPTCONN
+SO_USELOOPBACK
+SO_ACCEPTFILTER
+SO_DONTTRUNC
+SO_WANTMORE
+SO_WANTOOBFLAG
+SO_NREAD
+SO_NKE
+SO_NOSIGPIPE
+SO_SECURITY_AUTHENTICATION
+SO_SECURITY_ENCRYPTION_TRANSPORT
+SO_SECURITY_ENCRYPTION_NETWORK
+SO_BINDTODEVICE
+SO_ATTACH_FILTER
+SO_DETACH_FILTER
+SO_PEERNAME
+SO_TIMESTAMP
+SO_TIMESTAMPNS
+SO_BINTIME
+SO_RECVUCRED
+SO_MAC_EXEMPT
+SO_ALLZONES
+
+SOPRI_INTERACTIVE
+SOPRI_NORMAL
+SOPRI_BACKGROUND
+
+IPX_TYPE
+
+TCP_NODELAY
+TCP_MAXSEG
+TCP_CORK
+TCP_DEFER_ACCEPT
+TCP_INFO
+TCP_KEEPCNT
+TCP_KEEPIDLE
+TCP_KEEPINTVL
+TCP_LINGER2
+TCP_MD5SIG
+TCP_NOOPT
+TCP_NOPUSH
+TCP_QUICKACK
+TCP_SYNCNT
+TCP_WINDOW_CLAMP
+
+UDP_CORK
+
+EAI_ADDRFAMILY
+EAI_AGAIN
+EAI_BADFLAGS
+EAI_FAIL
+EAI_FAMILY
+EAI_MEMORY
+EAI_NODATA
+EAI_NONAME
+EAI_OVERFLOW
+EAI_SERVICE
+EAI_SOCKTYPE
+EAI_SYSTEM
+EAI_BADHINTS
+EAI_PROTOCOL
+EAI_MAX
+
+AI_PASSIVE
+AI_CANONNAME
+AI_NUMERICHOST
+AI_NUMERICSERV
+AI_MASK
+AI_ALL
+AI_V4MAPPED_CFG
+AI_ADDRCONFIG
+AI_V4MAPPED
+AI_DEFAULT
+
+NI_MAXHOST
+NI_MAXSERV
+NI_NOFQDN
+NI_NUMERICHOST
+NI_NAMEREQD
+NI_NUMERICSERV
+NI_DGRAM
+
+SHUT_RD		0
+SHUT_WR		1
+SHUT_RDWR	2
+
+IPV6_JOIN_GROUP
+IPV6_LEAVE_GROUP
+IPV6_MULTICAST_HOPS
+IPV6_MULTICAST_IF
+IPV6_MULTICAST_LOOP
+IPV6_UNICAST_HOPS
+IPV6_V6ONLY
+IPV6_CHECKSUM
+IPV6_DONTFRAG
+IPV6_DSTOPTS
+IPV6_HOPLIMIT
+IPV6_HOPOPTS
+IPV6_NEXTHOP
+IPV6_PATHMTU
+IPV6_PKTINFO
+IPV6_RECVDSTOPTS
+IPV6_RECVHOPLIMIT
+IPV6_RECVHOPOPTS
+IPV6_RECVPKTINFO
+IPV6_RECVRTHDR
+IPV6_RECVTCLASS
+IPV6_RTHDR
+IPV6_RTHDRDSTOPTS
+IPV6_RTHDR_TYPE_0
+IPV6_RECVPATHMTU
+IPV6_TCLASS
+IPV6_USE_MIN_MTU
+
+INET_ADDRSTRLEN
+INET6_ADDRSTRLEN
+IFNAMSIZ
+
+SOMAXCONN
+
+SCM_RIGHTS
+SCM_TIMESTAMP
+SCM_TIMESTAMPNS
+SCM_BINTIME
+SCM_CREDENTIALS
+SCM_CREDS
+SCM_UCRED
+
+LOCAL_PEERCRED
+LOCAL_CREDS
+LOCAL_CONNWAIT
diff --git a/ext/socket/option.c b/ext/socket/option.c
new file mode 100644
index 0000000000..63bffb9f68
--- /dev/null
+++ b/ext/socket/option.c
@@ -0,0 +1,692 @@
+#include "rubysocket.h"
+
+VALUE rb_cSockOpt;
+
+static VALUE
+constant_to_sym(int constant, ID (*intern_const)(int))
+{
+    ID name = intern_const(constant);
+    if (name) {
+        return ID2SYM(name);
+    }
+
+    return INT2NUM(constant);
+}
+
+static VALUE
+optname_to_sym(int level, int optname)
+{
+    switch (level) {
+      case SOL_SOCKET:
+        return constant_to_sym(optname, rsock_intern_so_optname);
+      case IPPROTO_IP:
+        return constant_to_sym(optname, rsock_intern_ip_optname);
+#ifdef INET6
+      case IPPROTO_IPV6:
+        return constant_to_sym(optname, rsock_intern_ipv6_optname);
+#endif
+      case IPPROTO_TCP:
+        return constant_to_sym(optname, rsock_intern_tcp_optname);
+      case IPPROTO_UDP:
+        return constant_to_sym(optname, rsock_intern_udp_optname);
+      default:
+        return INT2NUM(optname);
+    }
+}
+
+/*
+ * call-seq:
+ *   Socket::Option.new(family, level, optname, data) => sockopt
+ *
+ * Returns a new Socket::Option object.
+ *
+ *   sockopt = Socket::Option.new(:INET, :SOCKET, :KEEPALIVE, [1].pack("i"))
+ *   p sockopt #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
+ *
+ */
+static VALUE
+sockopt_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE data)
+{
+    int family = rsock_family_arg(vfamily);
+    int level = rsock_level_arg(family, vlevel);
+    int optname = rsock_optname_arg(family, level, voptname);
+    StringValue(data);
+    rb_ivar_set(self, rb_intern("family"), INT2NUM(family));
+    rb_ivar_set(self, rb_intern("level"), INT2NUM(level));
+    rb_ivar_set(self, rb_intern("optname"), INT2NUM(optname));
+    rb_ivar_set(self, rb_intern("data"), data);
+    return self;
+}
+
+VALUE
+rsock_sockopt_new(int family, int level, int optname, VALUE data)
+{
+    NEWOBJ(obj, struct RObject);
+    OBJSETUP(obj, rb_cSockOpt, T_OBJECT);
+    StringValue(data);
+    sockopt_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(optname), data);
+    return (VALUE)obj;
+}
+
+/*
+ * call-seq:
+ *   sockopt.family => integer
+ *
+ * returns the socket family as an integer.
+ *
+ *   p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).family
+ *   #=> 10
+ */
+static VALUE
+sockopt_family_m(VALUE self)
+{
+    return rb_attr_get(self, rb_intern("family"));
+}
+
+static int
+sockopt_level(VALUE self)
+{
+    return NUM2INT(rb_attr_get(self, rb_intern("level")));
+}
+
+/*
+ * call-seq:
+ *   sockopt.level => integer
+ *
+ * returns the socket level as an integer.
+ *
+ *   p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).level
+ *   #=> 41
+ */
+static VALUE
+sockopt_level_m(VALUE self)
+{
+    return INT2NUM(sockopt_level(self));
+}
+
+static int
+sockopt_optname(VALUE self)
+{
+    return NUM2INT(rb_attr_get(self, rb_intern("optname")));
+}
+
+/*
+ * call-seq:
+ *   sockopt.optname => integer
+ *
+ * returns the socket option name as an integer.
+ *
+ *   p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).optname
+ *   #=> 2
+ */
+static VALUE
+sockopt_optname_m(VALUE self)
+{
+    return INT2NUM(sockopt_optname(self));
+}
+
+/*
+ * call-seq:
+ *   sockopt.data => string
+ *
+ * returns the socket option data as a string.
+ *
+ *   p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).data
+ *   #=> "\x01\x00\x00\x00"
+ */
+static VALUE
+sockopt_data(VALUE self)
+{
+    VALUE v = rb_attr_get(self, rb_intern("data"));
+    StringValue(v);
+    return v;
+}
+
+/*
+ * call-seq:
+ *   Socket::Option.int(family, level, optname, integer) => sockopt
+ *
+ * Creates a new Socket::Option object which contains an int as data.
+ *
+ * The size and endian is dependent on the platform.
+ *
+ *   p Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 1)
+ *   #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
+ */
+static VALUE
+sockopt_s_int(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vint)
+{
+    int family = rsock_family_arg(vfamily);
+    int level = rsock_level_arg(family, vlevel);
+    int optname = rsock_optname_arg(family, level, voptname);
+    int i = NUM2INT(vint);
+    return rsock_sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i)));
+}
+
+/*
+ * call-seq:
+ *   sockopt.int => integer
+ *
+ * Returns the data in _sockopt_ as an int.
+ *
+ * The size and endian is dependent on the platform.
+ *
+ *   sockopt = Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 1)
+ *   p sockopt.int => 1
+ */
+static VALUE
+sockopt_int(VALUE self)
+{
+    int i;
+    VALUE data = sockopt_data(self);
+    StringValue(data);
+    if (RSTRING_LEN(data) != sizeof(int))
+        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(int)=%d but %ld",
+                 (int)sizeof(int), (long)RSTRING_LEN(data));
+    memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
+    return INT2NUM(i);
+}
+
+/*
+ * call-seq:
+ *   Socket::Option.bool(family, level, optname, bool) => sockopt
+ *
+ * Creates a new Socket::Option object which contains boolean as data.
+ * Actually 0 or 1 as int is used.
+ *
+ *   p Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, true)
+ *   #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
+ *
+ *   p Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, false)
+ *   #=> #<Socket::Option: AF_INET SOCKET KEEPALIVE 0>
+ *
+ */
+static VALUE
+sockopt_s_bool(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vbool)
+{
+    int family = rsock_family_arg(vfamily);
+    int level = rsock_level_arg(family, vlevel);
+    int optname = rsock_optname_arg(family, level, voptname);
+    int i = RTEST(vbool) ? 1 : 0;
+    return rsock_sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i)));
+}
+
+/*
+ * call-seq:
+ *   sockopt.bool => true or false
+ *
+ * Returns the data in _sockopt_ as an boolean value.
+ *
+ *   sockopt = Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 1)
+ *   p sockopt.bool => true
+ */
+static VALUE
+sockopt_bool(VALUE self)
+{
+    int i;
+    VALUE data = sockopt_data(self);
+    StringValue(data);
+    if (RSTRING_LEN(data) != sizeof(int))
+        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(int)=%d but %ld",
+                 (int)sizeof(int), (long)RSTRING_LEN(data));
+    memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
+    return i == 0 ? Qfalse : Qtrue;
+}
+
+/*
+ * call-seq:
+ *   Socket::Option.linger(onoff, secs) => sockopt
+ *
+ * Creates a new Socket::Option object for SOL_SOCKET/SO_LINGER.
+ *
+ * _onoff_ should be an integer or a boolean.
+ *
+ * _secs_ should be the number of seconds.
+ *
+ *   p Socket::Option.linger(true, 10)
+ *   #=> #<Socket::Option: UNSPEC SOCKET LINGER on 10sec>
+ *
+ */
+static VALUE
+sockopt_s_linger(VALUE klass, VALUE vonoff, VALUE vsecs)
+{
+    VALUE tmp;
+    struct linger l;
+    memset(&l, 0, sizeof(l));
+    if (!NIL_P(tmp = rb_check_to_integer(vonoff, "to_int")))
+        l.l_onoff = NUM2INT(tmp);
+    else
+        l.l_onoff = RTEST(vonoff) ? 1 : 0;
+    l.l_linger = NUM2INT(vsecs);
+    return rsock_sockopt_new(AF_UNSPEC, SOL_SOCKET, SO_LINGER, rb_str_new((char*)&l, sizeof(l)));
+}
+
+/*
+ * call-seq:
+ *   sockopt.linger => [bool, seconds]
+ *
+ * Returns the linger data in _sockopt_ as a pair of boolean and integer.
+ *
+ *   sockopt = Socket::Option.linger(true, 10)
+ *   p sockopt.linger => [true, 10]
+ */
+static VALUE
+sockopt_linger(VALUE self)
+{
+    int level = sockopt_level(self);
+    int optname = sockopt_optname(self);
+    VALUE data = sockopt_data(self);
+    struct linger l;
+    VALUE vonoff, vsecs;
+
+    if (level != SOL_SOCKET || optname != SO_LINGER)
+        rb_raise(rb_eTypeError, "linger socket option expected");
+    if (RSTRING_LEN(data) != sizeof(l))
+        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(struct linger)=%d but %ld",
+                 (int)sizeof(struct linger), (long)RSTRING_LEN(data));
+    memcpy((char*)&l, RSTRING_PTR(data), sizeof(struct linger));
+    switch (l.l_onoff) {
+      case 0: vonoff = Qfalse; break;
+      case 1: vonoff = Qtrue; break;
+      default: vonoff = INT2NUM(l.l_onoff); break;
+    }
+    vsecs = INT2NUM(l.l_linger);
+    return rb_assoc_new(vonoff, vsecs);
+}
+
+static int
+inspect_int(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(int)) {
+        int i;
+        memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
+        rb_str_catf(ret, " %d", i);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+
+static int
+inspect_errno(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(int)) {
+        int i;
+        char *err;
+        memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
+        err = strerror(i);
+        rb_str_catf(ret, " %s (%d)", err, i);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+
+#if defined(IPV6_MULTICAST_IF) || defined(IPV6_MULTICAST_LOOP)
+static int
+inspect_uint(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(int)) {
+        unsigned int i;
+        memcpy((char*)&i, RSTRING_PTR(data), sizeof(unsigned int));
+        rb_str_catf(ret, " %u", i);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(SOL_SOCKET) && defined(SO_LINGER) /* POSIX */
+static int
+inspect_linger(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(struct linger)) {
+        struct linger s;
+        memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
+        switch (s.l_onoff) {
+          case 0: rb_str_cat2(ret, " off"); break;
+          case 1: rb_str_cat2(ret, " on"); break;
+          default: rb_str_catf(ret, " on(%d)", s.l_onoff); break;
+        }
+        rb_str_catf(ret, " %dsec", s.l_linger);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(SOL_SOCKET) && defined(SO_TYPE) /* POSIX */
+static int
+inspect_socktype(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(int)) {
+        int i;
+        ID id;
+        memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
+        id = rsock_intern_socktype(i);
+        if (id)
+            rb_str_catf(ret, " %s", rb_id2name(id));
+        else
+            rb_str_catf(ret, " %d", i);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+static int
+inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(struct timeval)) {
+        struct timeval s;
+        memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
+        rb_str_catf(ret, " %ld.%06ldsec", (long)s.tv_sec, (long)s.tv_usec);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+
+#if defined(SOL_SOCKET) && defined(SO_PEERCRED) /* GNU/Linux */
+static int
+inspect_peercred(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(struct ucred)) {
+        struct ucred cred;
+        memcpy(&cred, RSTRING_PTR(data), sizeof(struct ucred));
+        rb_str_catf(ret, " pid=%u euid=%u egid=%u",
+		    (unsigned)cred.pid, (unsigned)cred.uid, (unsigned)cred.gid);
+        rb_str_cat2(ret, " (ucred)");
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+#if defined(LOCAL_PEERCRED) /* FreeBSD, MacOS X */
+static int
+inspect_local_peercred(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(struct xucred)) {
+        struct xucred cred;
+        memcpy(&cred, RSTRING_PTR(data), sizeof(struct xucred));
+        if (cred.cr_version != XUCRED_VERSION)
+            return 0;
+        rb_str_catf(ret, " version=%u", cred.cr_version);
+        rb_str_catf(ret, " euid=%u", cred.cr_uid);
+	if (cred.cr_ngroups) {
+	    int i;
+	    const char *sep = " groups=";
+	    for (i = 0; i < cred.cr_ngroups; i++) {
+		rb_str_catf(ret, "%s%u", sep, cred.cr_groups[i]);
+		sep = ",";
+	    }
+	}
+        rb_str_cat2(ret, " (xucred)");
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
+
+/*
+ * call-seq:
+ *   sockopt.inspect => string
+ *
+ * Returns a string which shows sockopt in human-readable form.
+ *
+ *   p Socket::Option.new(:INET, :SOCKET, :KEEPALIVE, [1].pack("i")).inspect
+ *   #=> "#<Socket::Option: INET SOCKET KEEPALIVE 1>"
+ *
+ */
+static VALUE
+sockopt_inspect(VALUE self)
+{
+    int family = NUM2INT(sockopt_family_m(self));
+    int level = NUM2INT(sockopt_level_m(self));
+    int optname = NUM2INT(sockopt_optname_m(self));
+    VALUE data = sockopt_data(self);
+    VALUE v, ret;
+    ID family_id, level_id, optname_id;
+    int inspected;
+
+    StringValue(data);
+
+    ret = rb_sprintf("#<%s:", rb_obj_classname(self));
+
+    family_id = rsock_intern_family_noprefix(family);
+    if (family_id)
+	rb_str_catf(ret, " %s", rb_id2name(family_id));
+    else
+        rb_str_catf(ret, " family:%d", family);
+
+    if (level == SOL_SOCKET) {
+        rb_str_cat2(ret, " SOCKET");
+
+	optname_id = rsock_intern_so_optname(optname);
+	if (optname_id)
+	    rb_str_catf(ret, " %s", rb_id2name(optname_id));
+	else
+	    rb_str_catf(ret, " optname:%d", optname);
+    }
+#ifdef HAVE_SYS_UN_H
+    else if (family == AF_UNIX) {
+	rb_str_catf(ret, " level:%d", level);
+
+	optname_id = rsock_intern_local_optname(optname);
+	if (optname_id)
+	    rb_str_catf(ret, " %s", rb_id2name(optname_id));
+	else
+	    rb_str_catf(ret, " optname:%d", optname);
+    }
+#endif
+    else if (IS_IP_FAMILY(family)) {
+	level_id = rsock_intern_iplevel(level);
+	if (level_id)
+	    rb_str_catf(ret, " %s", rb_id2name(level_id));
+	else
+	    rb_str_catf(ret, " level:%d", level);
+
+	v = optname_to_sym(level, optname);
+	if (SYMBOL_P(v))
+	    rb_str_catf(ret, " %s", rb_id2name(SYM2ID(v)));
+	else
+	    rb_str_catf(ret, " optname:%d", optname);
+    }
+    else {
+        rb_str_catf(ret, " level:%d", level);
+        rb_str_catf(ret, " optname:%d", optname);
+    }
+
+    inspected = 0;
+
+    if (level == SOL_SOCKET)
+        family = AF_UNSPEC;
+    switch (family) {
+      case AF_UNSPEC:
+        switch (level) {
+          case SOL_SOCKET:
+            switch (optname) {
+#            if defined(SO_DEBUG) /* POSIX */
+              case SO_DEBUG: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_ERROR) /* POSIX */
+              case SO_ERROR: inspected = inspect_errno(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_TYPE) /* POSIX */
+              case SO_TYPE: inspected = inspect_socktype(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_ACCEPTCONN) /* POSIX */
+              case SO_ACCEPTCONN: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_BROADCAST) /* POSIX */
+              case SO_BROADCAST: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_REUSEADDR) /* POSIX */
+              case SO_REUSEADDR: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_KEEPALIVE) /* POSIX */
+              case SO_KEEPALIVE: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_OOBINLINE) /* POSIX */
+              case SO_OOBINLINE: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_SNDBUF) /* POSIX */
+              case SO_SNDBUF: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_RCVBUF) /* POSIX */
+              case SO_RCVBUF: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_DONTROUTE) /* POSIX */
+              case SO_DONTROUTE: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_RCVLOWAT) /* POSIX */
+              case SO_RCVLOWAT: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_SNDLOWAT) /* POSIX */
+              case SO_SNDLOWAT: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_LINGER) /* POSIX */
+              case SO_LINGER: inspected = inspect_linger(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_RCVTIMEO) /* POSIX */
+              case SO_RCVTIMEO: inspected = inspect_timeval_as_interval(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_SNDTIMEO) /* POSIX */
+              case SO_SNDTIMEO: inspected = inspect_timeval_as_interval(level, optname, data, ret); break;
+#            endif
+#            if defined(SO_PEERCRED) /* GNU/Linux */
+              case SO_PEERCRED: inspected = inspect_peercred(level, optname, data, ret); break;
+#            endif
+            }
+            break;
+        }
+        break;
+
+      case AF_INET:
+#ifdef INET6
+      case AF_INET6:
+#endif
+        switch (level) {
+#        if defined(IPPROTO_IPV6)
+          case IPPROTO_IPV6:
+            switch (optname) {
+              /* IPV6_JOIN_GROUP ipv6_mreq, IPV6_LEAVE_GROUP ipv6_mreq */
+#            if defined(IPV6_MULTICAST_HOPS) /* POSIX */
+              case IPV6_MULTICAST_HOPS: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(IPV6_MULTICAST_IF) /* POSIX */
+              case IPV6_MULTICAST_IF: inspected = inspect_uint(level, optname, data, ret); break;
+#            endif
+#            if defined(IPV6_MULTICAST_LOOP) /* POSIX */
+              case IPV6_MULTICAST_LOOP: inspected = inspect_uint(level, optname, data, ret); break;
+#            endif
+#            if defined(IPV6_UNICAST_HOPS) /* POSIX */
+              case IPV6_UNICAST_HOPS: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+#            if defined(IPV6_V6ONLY) /* POSIX */
+              case IPV6_V6ONLY: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+            }
+            break;
+#        endif
+
+#        if defined(IPPROTO_TCP)
+          case IPPROTO_TCP:
+            switch (optname) {
+#            if defined(TCP_NODELAY) /* POSIX */
+              case TCP_NODELAY: inspected = inspect_int(level, optname, data, ret); break;
+#            endif
+            }
+            break;
+#        endif
+        }
+        break;
+
+#ifdef HAVE_SYS_UN_H
+      case AF_UNIX:
+        switch (level) {
+          case 0:
+            switch (optname) {
+#            if defined(LOCAL_PEERCRED)
+              case LOCAL_PEERCRED: inspected = inspect_local_peercred(level, optname, data, ret); break;
+#            endif
+            }
+            break;
+        }
+        break;
+#endif
+    }
+
+    if (!inspected) {
+        rb_str_cat2(ret, " ");
+        rb_str_append(ret, rb_str_dump(data));
+    }
+
+    rb_str_cat2(ret, ">");
+
+    return ret;
+}
+
+/*
+ * call-seq:
+ *   sockopt.unpack(template) => array
+ *
+ * Calls String#unpack on sockopt.data.
+ *
+ *   sockopt = Socket::Option.new(:INET, :SOCKET, :KEEPALIVE, [1].pack("i"))
+ *   p sockopt.unpack("i")      #=> [1]
+ *   p sockopt.data.unpack("i") #=> [1]
+ */
+static VALUE
+sockopt_unpack(VALUE self, VALUE template)
+{
+    return rb_funcall(sockopt_data(self), rb_intern("unpack"), 1, template);
+}
+
+/*
+ * Document-class: ::Socket::Option
+ *
+ * Socket::Option represents a socket option used by getsockopt and setsockopt
+ * system call.
+ * It contains socket family, protocol level, option name and option value.
+ */
+void
+rsock_init_sockopt(void)
+{
+    rb_cSockOpt = rb_define_class_under(rb_cSocket, "Option", rb_cObject);
+    rb_define_method(rb_cSockOpt, "initialize", sockopt_initialize, 4);
+    rb_define_method(rb_cSockOpt, "family", sockopt_family_m, 0);
+    rb_define_method(rb_cSockOpt, "level", sockopt_level_m, 0);
+    rb_define_method(rb_cSockOpt, "optname", sockopt_optname_m, 0);
+    rb_define_method(rb_cSockOpt, "data", sockopt_data, 0);
+    rb_define_method(rb_cSockOpt, "inspect", sockopt_inspect, 0);
+
+    rb_define_singleton_method(rb_cSockOpt, "int", sockopt_s_int, 4);
+    rb_define_method(rb_cSockOpt, "int", sockopt_int, 0);
+
+    rb_define_singleton_method(rb_cSockOpt, "bool", sockopt_s_bool, 4);
+    rb_define_method(rb_cSockOpt, "bool", sockopt_bool, 0);
+
+    rb_define_singleton_method(rb_cSockOpt, "linger", sockopt_s_linger, 2);
+    rb_define_method(rb_cSockOpt, "linger", sockopt_linger, 0);
+
+    rb_define_method(rb_cSockOpt, "unpack", sockopt_unpack, 1);
+
+    rb_define_method(rb_cSockOpt, "to_s", sockopt_data, 0); /* compatibility for ruby before 1.9.2 */
+}
+
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
new file mode 100644
index 0000000000..65b2b63927
--- /dev/null
+++ b/ext/socket/raddrinfo.c
@@ -0,0 +1,2211 @@
+/************************************************
+
+  ainfo.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
+#define LOOKUP_ORDERS (sizeof(lookup_order_table) / sizeof(lookup_order_table[0]))
+static const int lookup_order_table[] = {
+#if defined(LOOKUP_ORDER_HACK_INET)
+    PF_INET, PF_INET6, PF_UNSPEC,
+#elif defined(LOOKUP_ORDER_HACK_INET6)
+    PF_INET6, PF_INET, PF_UNSPEC,
+#else
+    /* should not happen */
+#endif
+};
+
+static int
+ruby_getaddrinfo(const char *nodename, const char *servname,
+		 const struct addrinfo *hints, struct addrinfo **res)
+{
+    struct addrinfo tmp_hints;
+    int i, af, error;
+
+    if (hints->ai_family != PF_UNSPEC) {
+	return getaddrinfo(nodename, servname, hints, res);
+    }
+
+    for (i = 0; i < LOOKUP_ORDERS; i++) {
+	af = lookup_order_table[i];
+	MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
+	tmp_hints.ai_family = af;
+	error = getaddrinfo(nodename, servname, &tmp_hints, res);
+	if (error) {
+	    if (tmp_hints.ai_family == PF_UNSPEC) {
+		break;
+	    }
+	}
+	else {
+	    break;
+	}
+    }
+
+    return error;
+}
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
+#endif
+
+#if defined(_AIX)
+static int
+ruby_getaddrinfo__aix(const char *nodename, const char *servname,
+		      struct addrinfo *hints, struct addrinfo **res)
+{
+    int error = getaddrinfo(nodename, servname, hints, res);
+    struct addrinfo *r;
+    if (error)
+	return error;
+    for (r = *res; r != NULL; r = r->ai_next) {
+	if (r->ai_addr->sa_family == 0)
+	    r->ai_addr->sa_family = r->ai_family;
+	if (r->ai_addr->sa_len == 0)
+	    r->ai_addr->sa_len = r->ai_addrlen;
+    }
+    return 0;
+}
+#undef getaddrinfo
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
+static int
+ruby_getnameinfo__aix(const struct sockaddr *sa, size_t salen,
+		      char *host, size_t hostlen,
+		      char *serv, size_t servlen, int flags)
+{
+    struct sockaddr_in6 *sa6;
+    u_int32_t *a6;
+
+    if (sa->sa_family == AF_INET6) {
+	sa6 = (struct sockaddr_in6 *)sa;
+	a6 = sa6->sin6_addr.u6_addr.u6_addr32;
+
+	if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) {
+	    strncpy(host, "::", hostlen);
+	    snprintf(serv, servlen, "%d", sa6->sin6_port);
+	    return 0;
+	}
+    }
+    return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
+}
+#undef getnameinfo
+#define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
+            ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags))
+#endif
+
+static int str_is_number(const char *);
+
+#if defined(__APPLE__)
+/* fix [ruby-core:29427] */
+static int
+ruby_getaddrinfo__darwin(const char *nodename, const char *servname,
+			 struct addrinfo *hints, struct addrinfo **res)
+{
+    const char *tmp_servname;
+    struct addrinfo tmp_hints;
+    tmp_servname = servname;
+    MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
+    if (nodename && servname) {
+	if (str_is_number(tmp_servname) && atoi(servname) == 0) {
+	    tmp_servname = NULL;
+#ifdef AI_NUMERICSERV
+	    if (tmp_hints.ai_flags) tmp_hints.ai_flags &= ~AI_NUMERICSERV;
+#endif
+	}
+    }
+    int error = getaddrinfo(nodename, tmp_servname, &tmp_hints, res);
+    return error;
+}
+#undef getaddrinfo
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__darwin((node),(serv),(hints),(res))
+#endif
+
+#ifndef GETADDRINFO_EMU
+struct getaddrinfo_arg
+{
+    const char *node;
+    const char *service;
+    const struct addrinfo *hints;
+    struct addrinfo **res;
+};
+
+static VALUE
+nogvl_getaddrinfo(void *arg)
+{
+    struct getaddrinfo_arg *ptr = arg;
+    return getaddrinfo(ptr->node, ptr->service,
+                       ptr->hints, ptr->res);
+}
+#endif
+
+int
+rb_getaddrinfo(const char *node, const char *service,
+               const struct addrinfo *hints,
+               struct addrinfo **res)
+{
+#ifdef GETADDRINFO_EMU
+    return getaddrinfo(node, service, hints, res);
+#else
+    struct getaddrinfo_arg arg;
+    int ret;
+    MEMZERO(&arg, sizeof arg, 1);
+    arg.node = node;
+    arg.service = service;
+    arg.hints = hints;
+    arg.res = res;
+    ret = (int)BLOCKING_REGION(nogvl_getaddrinfo, &arg);
+    return ret;
+#endif
+}
+
+#ifndef GETADDRINFO_EMU
+struct getnameinfo_arg
+{
+    const struct sockaddr *sa;
+    socklen_t salen;
+    char *host;
+    size_t hostlen;
+    char *serv;
+    size_t servlen;
+    int flags;
+};
+
+static VALUE
+nogvl_getnameinfo(void *arg)
+{
+    struct getnameinfo_arg *ptr = arg;
+    return getnameinfo(ptr->sa, ptr->salen,
+                       ptr->host, (socklen_t)ptr->hostlen,
+                       ptr->serv, (socklen_t)ptr->servlen,
+                       ptr->flags);
+}
+#endif
+
+int
+rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
+           char *host, size_t hostlen,
+           char *serv, size_t servlen, int flags)
+{
+#ifdef GETADDRINFO_EMU
+    return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
+#else
+    struct getnameinfo_arg arg;
+    int ret;
+    arg.sa = sa;
+    arg.salen = salen;
+    arg.host = host;
+    arg.hostlen = hostlen;
+    arg.serv = serv;
+    arg.servlen = servlen;
+    arg.flags = flags;
+    ret = (int)BLOCKING_REGION(nogvl_getnameinfo, &arg);
+    return ret;
+#endif
+}
+
+static void
+make_ipaddr0(struct sockaddr *addr, char *buf, size_t len)
+{
+    int error;
+
+    error = rb_getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
+    if (error) {
+        rsock_raise_socket_error("getnameinfo", error);
+    }
+}
+
+VALUE
+rsock_make_ipaddr(struct sockaddr *addr)
+{
+    char hbuf[1024];
+
+    make_ipaddr0(addr, hbuf, sizeof(hbuf));
+    return rb_str_new2(hbuf);
+}
+
+static void
+make_inetaddr(unsigned int host, char *buf, size_t len)
+{
+    struct sockaddr_in sin;
+
+    MEMZERO(&sin, struct sockaddr_in, 1);
+    sin.sin_family = AF_INET;
+    SET_SIN_LEN(&sin, sizeof(sin));
+    sin.sin_addr.s_addr = host;
+    make_ipaddr0((struct sockaddr*)&sin, buf, len);
+}
+
+static int
+str_is_number(const char *p)
+{
+    char *ep;
+
+    if (!p || *p == '\0')
+       return 0;
+    ep = NULL;
+    (void)STRTOUL(p, &ep, 10);
+    if (ep && *ep == '\0')
+       return 1;
+    else
+       return 0;
+}
+
+static char*
+host_str(VALUE host, char *hbuf, size_t len, int *flags_ptr)
+{
+    if (NIL_P(host)) {
+        return NULL;
+    }
+    else if (rb_obj_is_kind_of(host, rb_cInteger)) {
+        unsigned int i = NUM2UINT(host);
+
+        make_inetaddr(htonl(i), hbuf, len);
+        if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
+        return hbuf;
+    }
+    else {
+        char *name;
+
+        SafeStringValue(host);
+        name = RSTRING_PTR(host);
+        if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
+            make_inetaddr(INADDR_ANY, hbuf, len);
+            if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
+        }
+        else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
+            make_inetaddr(INADDR_BROADCAST, hbuf, len);
+            if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
+        }
+        else if (strlen(name) >= len) {
+            rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
+                strlen(name));
+        }
+        else {
+            strcpy(hbuf, name);
+        }
+        return hbuf;
+    }
+}
+
+static char*
+port_str(VALUE port, char *pbuf, size_t len, int *flags_ptr)
+{
+    if (NIL_P(port)) {
+        return 0;
+    }
+    else if (FIXNUM_P(port)) {
+        snprintf(pbuf, len, "%ld", FIX2LONG(port));
+#ifdef AI_NUMERICSERV
+        if (flags_ptr) *flags_ptr |= AI_NUMERICSERV;
+#endif
+        return pbuf;
+    }
+    else {
+        char *serv;
+
+        SafeStringValue(port);
+        serv = RSTRING_PTR(port);
+        if (strlen(serv) >= len) {
+            rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
+                strlen(serv));
+        }
+        strcpy(pbuf, serv);
+        return pbuf;
+    }
+}
+
+struct addrinfo*
+rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack)
+{
+    struct addrinfo* res = NULL;
+    char *hostp, *portp;
+    int error;
+    char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
+    int additional_flags = 0;
+
+    hostp = host_str(host, hbuf, sizeof(hbuf), &additional_flags);
+    portp = port_str(port, pbuf, sizeof(pbuf), &additional_flags);
+
+    if (socktype_hack && hints->ai_socktype == 0 && str_is_number(portp)) {
+       hints->ai_socktype = SOCK_DGRAM;
+    }
+    hints->ai_flags |= additional_flags;
+
+    error = rb_getaddrinfo(hostp, portp, hints, &res);
+    if (error) {
+        if (hostp && hostp[strlen(hostp)-1] == '\n') {
+            rb_raise(rb_eSocket, "newline at the end of hostname");
+        }
+        rsock_raise_socket_error("getaddrinfo", error);
+    }
+
+#if defined(__APPLE__) && defined(__MACH__)
+    /* [ruby-dev:23164] */
+    {
+        struct addrinfo *r;
+        r = res;
+        while (r) {
+            if (! r->ai_socktype) r->ai_socktype = hints->ai_socktype;
+            if (! r->ai_protocol) {
+                if (r->ai_socktype == SOCK_DGRAM) {
+                    r->ai_protocol = IPPROTO_UDP;
+                }
+                else if (r->ai_socktype == SOCK_STREAM) {
+                    r->ai_protocol = IPPROTO_TCP;
+                }
+            }
+            r = r->ai_next;
+        }
+    }
+#endif
+    return res;
+}
+
+struct addrinfo*
+rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
+{
+    struct addrinfo hints;
+
+    MEMZERO(&hints, struct addrinfo, 1);
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = socktype;
+    hints.ai_flags = flags;
+    return rsock_getaddrinfo(host, port, &hints, 1);
+}
+
+VALUE
+rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup)
+{
+    VALUE family, port, addr1, addr2;
+    VALUE ary;
+    int error;
+    char hbuf[1024], pbuf[1024];
+    ID id;
+
+    id = rsock_intern_family(sockaddr->sa_family);
+    if (id) {
+        family = rb_str_dup(rb_id2str(id));
+    }
+    else {
+        sprintf(pbuf, "unknown:%d", sockaddr->sa_family);
+        family = rb_str_new2(pbuf);
+    }
+
+    addr1 = Qnil;
+    if (!norevlookup) {
+        error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+                               NULL, 0, 0);
+        if (! error) {
+            addr1 = rb_str_new2(hbuf);
+        }
+    }
+    error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+                           pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
+    if (error) {
+        rsock_raise_socket_error("getnameinfo", error);
+    }
+    addr2 = rb_str_new2(hbuf);
+    if (addr1 == Qnil) {
+        addr1 = addr2;
+    }
+    port = INT2FIX(atoi(pbuf));
+    ary = rb_ary_new3(4, family, port, addr1, addr2);
+
+    return ary;
+}
+
+#ifdef HAVE_SYS_UN_H
+const char*
+rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len)
+{
+    if (sockaddr->sun_path < (char*)sockaddr + len)
+        return sockaddr->sun_path;
+    else
+        return "";
+}
+
+VALUE
+rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len)
+{
+    return rb_assoc_new(rb_str_new2("AF_UNIX"),
+                        rb_str_new2(rsock_unixpath(sockaddr, len)));
+}
+#endif
+
+struct hostent_arg {
+    VALUE host;
+    struct addrinfo* addr;
+    VALUE (*ipaddr)(struct sockaddr*, size_t);
+};
+
+static VALUE
+make_hostent_internal(struct hostent_arg *arg)
+{
+    VALUE host = arg->host;
+    struct addrinfo* addr = arg->addr;
+    VALUE (*ipaddr)(struct sockaddr*, size_t) = arg->ipaddr;
+
+    struct addrinfo *ai;
+    struct hostent *h;
+    VALUE ary, names;
+    char **pch;
+    const char* hostp;
+    char hbuf[NI_MAXHOST];
+
+    ary = rb_ary_new();
+    if (addr->ai_canonname) {
+        hostp = addr->ai_canonname;
+    }
+    else {
+        hostp = host_str(host, hbuf, sizeof(hbuf), NULL);
+    }
+    rb_ary_push(ary, rb_str_new2(hostp));
+
+    if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
+        names = rb_ary_new();
+        if (h->h_aliases != NULL) {
+            for (pch = h->h_aliases; *pch; pch++) {
+                rb_ary_push(names, rb_str_new2(*pch));
+            }
+        }
+    }
+    else {
+        names = rb_ary_new2(0);
+    }
+    rb_ary_push(ary, names);
+    rb_ary_push(ary, INT2NUM(addr->ai_family));
+    for (ai = addr; ai; ai = ai->ai_next) {
+        rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
+    }
+
+    return ary;
+}
+
+VALUE
+rsock_freeaddrinfo(struct addrinfo *addr)
+{
+    freeaddrinfo(addr);
+    return Qnil;
+}
+
+VALUE
+rsock_make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t))
+{
+    struct hostent_arg arg;
+
+    arg.host = host;
+    arg.addr = addr;
+    arg.ipaddr = ipaddr;
+    return rb_ensure(make_hostent_internal, (VALUE)&arg,
+                     rsock_freeaddrinfo, (VALUE)addr);
+}
+
+typedef struct {
+    VALUE inspectname;
+    VALUE canonname;
+    int pfamily;
+    int socktype;
+    int protocol;
+    socklen_t sockaddr_len;
+    struct sockaddr_storage addr;
+} rb_addrinfo_t;
+
+static void
+addrinfo_mark(void *ptr)
+{
+    rb_addrinfo_t *rai = ptr;
+    if (rai) {
+        rb_gc_mark(rai->inspectname);
+        rb_gc_mark(rai->canonname);
+    }
+}
+
+#define addrinfo_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+addrinfo_memsize(const void *ptr)
+{
+    return ptr ? sizeof(rb_addrinfo_t) : 0;
+}
+
+static const rb_data_type_t addrinfo_type = {
+    "socket/addrinfo",
+    addrinfo_mark, addrinfo_free, addrinfo_memsize,
+};
+
+static VALUE
+addrinfo_s_allocate(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &addrinfo_type, 0);
+}
+
+#define IS_ADDRINFO(obj) rb_typeddata_is_kind_of(obj, &addrinfo_type)
+static inline rb_addrinfo_t *
+check_addrinfo(VALUE self)
+{
+    return rb_check_typeddata(self, &addrinfo_type);
+}
+
+static rb_addrinfo_t *
+get_addrinfo(VALUE self)
+{
+    rb_addrinfo_t *rai = check_addrinfo(self);
+
+    if (!rai) {
+        rb_raise(rb_eTypeError, "uninitialized socket address");
+    }
+    return rai;
+}
+
+
+static rb_addrinfo_t *
+alloc_addrinfo()
+{
+    rb_addrinfo_t *rai = ALLOC(rb_addrinfo_t);
+    memset(rai, 0, sizeof(rb_addrinfo_t));
+    rai->inspectname = Qnil;
+    rai->canonname = Qnil;
+    return rai;
+}
+
+static void
+init_addrinfo(rb_addrinfo_t *rai, struct sockaddr *sa, socklen_t len,
+              int pfamily, int socktype, int protocol,
+              VALUE canonname, VALUE inspectname)
+{
+    if (sizeof(rai->addr) < len)
+        rb_raise(rb_eArgError, "sockaddr string too big");
+    memcpy((void *)&rai->addr, (void *)sa, len);
+    rai->sockaddr_len = len;
+
+    rai->pfamily = pfamily;
+    rai->socktype = socktype;
+    rai->protocol = protocol;
+    rai->canonname = canonname;
+    rai->inspectname = inspectname;
+}
+
+VALUE
+rsock_addrinfo_new(struct sockaddr *addr, socklen_t len,
+                   int family, int socktype, int protocol,
+                   VALUE canonname, VALUE inspectname)
+{
+    VALUE a;
+    rb_addrinfo_t *rai;
+
+    a = addrinfo_s_allocate(rb_cAddrinfo);
+    DATA_PTR(a) = rai = alloc_addrinfo();
+    init_addrinfo(rai, addr, len, family, socktype, protocol, canonname, inspectname);
+    return a;
+}
+
+static struct addrinfo *
+call_getaddrinfo(VALUE node, VALUE service,
+                 VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
+                 int socktype_hack)
+{
+    struct addrinfo hints, *res;
+
+    MEMZERO(&hints, struct addrinfo, 1);
+    hints.ai_family = NIL_P(family) ? PF_UNSPEC : rsock_family_arg(family);
+
+    if (!NIL_P(socktype)) {
+	hints.ai_socktype = rsock_socktype_arg(socktype);
+    }
+    if (!NIL_P(protocol)) {
+	hints.ai_protocol = NUM2INT(protocol);
+    }
+    if (!NIL_P(flags)) {
+	hints.ai_flags = NUM2INT(flags);
+    }
+    res = rsock_getaddrinfo(node, service, &hints, socktype_hack);
+
+    if (res == NULL)
+	rb_raise(rb_eSocket, "host not found");
+    return res;
+}
+
+static VALUE make_inspectname(VALUE node, VALUE service, struct addrinfo *res);
+
+static void
+init_addrinfo_getaddrinfo(rb_addrinfo_t *rai, VALUE node, VALUE service,
+                          VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
+                          VALUE inspectnode, VALUE inspectservice)
+{
+    struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 1);
+    VALUE canonname;
+    VALUE inspectname = rb_str_equal(node, inspectnode) ? Qnil : make_inspectname(inspectnode, inspectservice, res);
+
+    canonname = Qnil;
+    if (res->ai_canonname) {
+        canonname = rb_tainted_str_new_cstr(res->ai_canonname);
+        OBJ_FREEZE(canonname);
+    }
+
+    init_addrinfo(rai, res->ai_addr, res->ai_addrlen,
+                  NUM2INT(family), NUM2INT(socktype), NUM2INT(protocol),
+                  canonname, inspectname);
+
+    freeaddrinfo(res);
+}
+
+static VALUE
+make_inspectname(VALUE node, VALUE service, struct addrinfo *res)
+{
+    VALUE inspectname = Qnil;
+
+    if (res) {
+        char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
+        int ret;
+        ret = rb_getnameinfo(res->ai_addr, res->ai_addrlen, hbuf,
+                             sizeof(hbuf), pbuf, sizeof(pbuf),
+                             NI_NUMERICHOST|NI_NUMERICSERV);
+        if (ret == 0) {
+            if (TYPE(node) == T_STRING && strcmp(hbuf, RSTRING_PTR(node)) == 0)
+                node = Qnil;
+            if (TYPE(service) == T_STRING && strcmp(pbuf, RSTRING_PTR(service)) == 0)
+                service = Qnil;
+            else if (TYPE(service) == T_FIXNUM && atoi(pbuf) == FIX2INT(service))
+                service = Qnil;
+        }
+    }
+
+    if (TYPE(node) == T_STRING) {
+        inspectname = rb_str_dup(node);
+    }
+    if (TYPE(service) == T_STRING) {
+        if (NIL_P(inspectname))
+            inspectname = rb_sprintf(":%s", StringValueCStr(service));
+        else
+            rb_str_catf(inspectname, ":%s", StringValueCStr(service));
+    }
+    else if (TYPE(service) == T_FIXNUM && FIX2INT(service) != 0)
+    {
+        if (NIL_P(inspectname))
+            inspectname = rb_sprintf(":%d", FIX2INT(service));
+        else
+            rb_str_catf(inspectname, ":%d", FIX2INT(service));
+    }
+    if (!NIL_P(inspectname)) {
+        OBJ_INFECT(inspectname, node);
+        OBJ_INFECT(inspectname, service);
+        OBJ_FREEZE(inspectname);
+    }
+    return inspectname;
+}
+
+static VALUE
+addrinfo_firstonly_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags)
+{
+    VALUE ret;
+    VALUE canonname;
+    VALUE inspectname;
+
+    struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
+
+    inspectname = make_inspectname(node, service, res);
+
+    canonname = Qnil;
+    if (res->ai_canonname) {
+        canonname = rb_tainted_str_new_cstr(res->ai_canonname);
+        OBJ_FREEZE(canonname);
+    }
+
+    ret = rsock_addrinfo_new(res->ai_addr, res->ai_addrlen,
+                             res->ai_family, res->ai_socktype, res->ai_protocol,
+                             canonname, inspectname);
+
+    freeaddrinfo(res);
+    return ret;
+}
+
+static VALUE
+addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags)
+{
+    VALUE ret;
+    struct addrinfo *r;
+    VALUE inspectname;
+
+    struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
+
+    inspectname = make_inspectname(node, service, res);
+
+    ret = rb_ary_new();
+    for (r = res; r; r = r->ai_next) {
+        VALUE addr;
+        VALUE canonname = Qnil;
+
+        if (r->ai_canonname) {
+            canonname = rb_tainted_str_new_cstr(r->ai_canonname);
+            OBJ_FREEZE(canonname);
+        }
+
+        addr = rsock_addrinfo_new(r->ai_addr, r->ai_addrlen,
+                                  r->ai_family, r->ai_socktype, r->ai_protocol,
+                                  canonname, inspectname);
+
+        rb_ary_push(ret, addr);
+    }
+
+    freeaddrinfo(res);
+    return ret;
+}
+
+
+#ifdef HAVE_SYS_UN_H
+static void
+init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
+{
+    struct sockaddr_un un;
+
+    StringValue(path);
+
+    if (sizeof(un.sun_path) <= (size_t)RSTRING_LEN(path))
+        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
+            (int)sizeof(un.sun_path)-1);
+
+    MEMZERO(&un, struct sockaddr_un, 1);
+
+    un.sun_family = AF_UNIX;
+    memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
+
+    init_addrinfo(rai, (struct sockaddr *)&un, (socklen_t)sizeof(un),
+		  PF_UNIX, socktype, 0, Qnil, Qnil);
+}
+#endif
+
+/*
+ * call-seq:
+ *   Addrinfo.new(sockaddr)                             => addrinfo
+ *   Addrinfo.new(sockaddr, family)                     => addrinfo
+ *   Addrinfo.new(sockaddr, family, socktype)           => addrinfo
+ *   Addrinfo.new(sockaddr, family, socktype, protocol) => addrinfo
+ *
+ * returns a new instance of Addrinfo.
+ * The instance contains sockaddr, family, socktype, protocol.
+ * sockaddr means struct sockaddr which can be used for connect(2), etc.
+ * family, socktype and protocol are integers which is used for arguments of socket(2).
+ *
+ * sockaddr is specified as an array or a string.
+ * The array should be compatible to the value of IPSocket#addr or UNIXSocket#addr.
+ * The string should be struct sockaddr as generated by
+ * Socket.sockaddr_in or Socket.unpack_sockaddr_un.
+ *
+ * sockaddr examples:
+ * - ["AF_INET", 46102, "localhost.localdomain", "127.0.0.1"]
+ * - ["AF_INET6", 42304, "ip6-localhost", "::1"]
+ * - ["AF_UNIX", "/tmp/sock"]
+ * - Socket.sockaddr_in("smtp", "2001:DB8::1")
+ * - Socket.sockaddr_in(80, "172.18.22.42")
+ * - Socket.sockaddr_in(80, "www.ruby-lang.org")
+ * - Socket.sockaddr_un("/tmp/sock")
+ *
+ * In an AF_INET/AF_INET6 sockaddr array, the 4th element,
+ * numeric IP address, is used to construct socket address in the Addrinfo instance.
+ * If the 3rd element, textual host name, is non-nil, it is also recorded but used only for Addrinfo#inspect.
+ *
+ * family is specified as an integer to specify the protocol family such as Socket::PF_INET.
+ * It can be a symbol or a string which is the constant name
+ * with or without PF_ prefix such as :INET, :INET6, :UNIX, "PF_INET", etc.
+ * If omitted, PF_UNSPEC is assumed.
+ *
+ * socktype is specified as an integer to specify the socket type such as Socket::SOCK_STREAM.
+ * It can be a symbol or a string which is the constant name
+ * with or without SOCK_ prefix such as :STREAM, :DGRAM, :RAW, "SOCK_STREAM", etc.
+ * If omitted, 0 is assumed.
+ *
+ * protocol is specified as an integer to specify the protocol such as Socket::IPPROTO_TCP.
+ * It must be an integer, unlike family and socktype.
+ * If omitted, 0 is assumed.
+ * Note that 0 is reasonable value for most protocols, except raw socket.
+ *
+ */
+static VALUE
+addrinfo_initialize(int argc, VALUE *argv, VALUE self)
+{
+    rb_addrinfo_t *rai;
+    VALUE sockaddr_arg, sockaddr_ary, pfamily, socktype, protocol;
+    int i_pfamily, i_socktype, i_protocol;
+    struct sockaddr *sockaddr_ptr;
+    socklen_t sockaddr_len;
+    VALUE canonname = Qnil, inspectname = Qnil;
+
+    if (check_addrinfo(self))
+        rb_raise(rb_eTypeError, "already initialized socket address");
+    DATA_PTR(self) = rai = alloc_addrinfo();
+
+    rb_scan_args(argc, argv, "13", &sockaddr_arg, &pfamily, &socktype, &protocol);
+
+    i_pfamily = NIL_P(pfamily) ? PF_UNSPEC : rsock_family_arg(pfamily);
+    i_socktype = NIL_P(socktype) ? 0 : rsock_socktype_arg(socktype);
+    i_protocol = NIL_P(protocol) ? 0 : NUM2INT(protocol);
+
+    sockaddr_ary = rb_check_array_type(sockaddr_arg);
+    if (!NIL_P(sockaddr_ary)) {
+        VALUE afamily = rb_ary_entry(sockaddr_ary, 0);
+        int af;
+        StringValue(afamily);
+        if (rsock_family_to_int(RSTRING_PTR(afamily), RSTRING_LEN(afamily), &af) == -1)
+	    rb_raise(rb_eSocket, "unknown address family: %s", StringValueCStr(afamily));
+        switch (af) {
+          case AF_INET: /* ["AF_INET", 46102, "localhost.localdomain", "127.0.0.1"] */
+#ifdef INET6
+          case AF_INET6: /* ["AF_INET6", 42304, "ip6-localhost", "::1"] */
+#endif
+          {
+            VALUE service = rb_ary_entry(sockaddr_ary, 1);
+            VALUE nodename = rb_ary_entry(sockaddr_ary, 2);
+            VALUE numericnode = rb_ary_entry(sockaddr_ary, 3);
+            int flags;
+
+            service = INT2NUM(NUM2INT(service));
+            if (!NIL_P(nodename))
+                StringValue(nodename);
+            StringValue(numericnode);
+            flags = AI_NUMERICHOST;
+#ifdef AI_NUMERICSERV
+            flags |= AI_NUMERICSERV;
+#endif
+
+            init_addrinfo_getaddrinfo(rai, numericnode, service,
+                    INT2NUM(i_pfamily ? i_pfamily : af), INT2NUM(i_socktype), INT2NUM(i_protocol),
+                    INT2NUM(flags),
+                    nodename, service);
+            break;
+          }
+
+#ifdef HAVE_SYS_UN_H
+          case AF_UNIX: /* ["AF_UNIX", "/tmp/sock"] */
+          {
+            VALUE path = rb_ary_entry(sockaddr_ary, 1);
+            StringValue(path);
+            init_unix_addrinfo(rai, path, SOCK_STREAM);
+            break;
+          }
+#endif
+
+          default:
+            rb_raise(rb_eSocket, "unexpected address family");
+        }
+    }
+    else {
+        StringValue(sockaddr_arg);
+        sockaddr_ptr = (struct sockaddr *)RSTRING_PTR(sockaddr_arg);
+        sockaddr_len = RSTRING_LENINT(sockaddr_arg);
+        init_addrinfo(rai, sockaddr_ptr, sockaddr_len,
+                      i_pfamily, i_socktype, i_protocol,
+                      canonname, inspectname);
+    }
+
+    return self;
+}
+
+static int
+get_afamily(struct sockaddr *addr, socklen_t len)
+{
+    if ((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr <= len)
+        return addr->sa_family;
+    else
+        return AF_UNSPEC;
+}
+
+static int
+ai_get_afamily(rb_addrinfo_t *rai)
+{
+    return get_afamily((struct sockaddr *)&rai->addr, rai->sockaddr_len);
+}
+
+static VALUE
+inspect_sockaddr(VALUE addrinfo, VALUE ret)
+{
+    rb_addrinfo_t *rai = get_addrinfo(addrinfo);
+
+    if (rai->sockaddr_len == 0) {
+        rb_str_cat2(ret, "empty-sockaddr");
+    }
+    else if ((long)rai->sockaddr_len < ((char*)&rai->addr.ss_family + sizeof(rai->addr.ss_family)) - (char*)&rai->addr)
+        rb_str_cat2(ret, "too-short-sockaddr");
+    else {
+        switch (rai->addr.ss_family) {
+          case AF_INET:
+          {
+            struct sockaddr_in *addr;
+            int port;
+            if (rai->sockaddr_len < sizeof(struct sockaddr_in)) {
+                rb_str_cat2(ret, "too-short-AF_INET-sockaddr");
+            }
+            else {
+                addr = (struct sockaddr_in *)&rai->addr;
+                rb_str_catf(ret, "%d.%d.%d.%d",
+                            ((unsigned char*)&addr->sin_addr)[0],
+                            ((unsigned char*)&addr->sin_addr)[1],
+                            ((unsigned char*)&addr->sin_addr)[2],
+                            ((unsigned char*)&addr->sin_addr)[3]);
+                port = ntohs(addr->sin_port);
+                if (port)
+                    rb_str_catf(ret, ":%d", port);
+                if (sizeof(struct sockaddr_in) < rai->sockaddr_len)
+                    rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in)));
+            }
+            break;
+          }
+
+#ifdef AF_INET6
+          case AF_INET6:
+          {
+            struct sockaddr_in6 *addr;
+            char hbuf[1024];
+            int port;
+            int error;
+            if (rai->sockaddr_len < sizeof(struct sockaddr_in6)) {
+                rb_str_cat2(ret, "too-short-AF_INET6-sockaddr");
+            }
+            else {
+                addr = (struct sockaddr_in6 *)&rai->addr;
+                /* use getnameinfo for scope_id.
+                 * RFC 4007: IPv6 Scoped Address Architecture
+                 * draft-ietf-ipv6-scope-api-00.txt: Scoped Address Extensions to the IPv6 Basic Socket API
+                 */
+                error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
+                                    hbuf, (socklen_t)sizeof(hbuf), NULL, 0,
+                                    NI_NUMERICHOST|NI_NUMERICSERV);
+                if (error) {
+                    rsock_raise_socket_error("getnameinfo", error);
+                }
+                if (addr->sin6_port == 0) {
+                    rb_str_cat2(ret, hbuf);
+                }
+                else {
+                    port = ntohs(addr->sin6_port);
+                    rb_str_catf(ret, "[%s]:%d", hbuf, port);
+                }
+                if (sizeof(struct sockaddr_in6) < rai->sockaddr_len)
+                    rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in6)));
+            }
+            break;
+          }
+#endif
+
+#ifdef HAVE_SYS_UN_H
+          case AF_UNIX:
+          {
+            struct sockaddr_un *addr = (struct sockaddr_un *)&rai->addr;
+            char *p, *s, *t, *e;
+            s = addr->sun_path;
+            e = (char*)addr + rai->sockaddr_len;
+            if (e < s)
+                rb_str_cat2(ret, "too-short-AF_UNIX-sockaddr");
+            else if (s == e)
+                rb_str_cat2(ret, "empty-path-AF_UNIX-sockaddr");
+            else {
+                int printable_only = 1;
+                p = s;
+                while (p < e && *p != '\0') {
+                    printable_only = printable_only && ISPRINT(*p) && !ISSPACE(*p);
+                    p++;
+                }
+                t = p;
+                while (p < e && *p == '\0')
+                    p++;
+                if (printable_only && /* only printable, no space */
+                    t < e && /* NUL terminated */
+                    p == e) { /* no data after NUL */
+		    if (s == t)
+			rb_str_cat2(ret, "empty-path-AF_UNIX-sockaddr");
+		    else if (s[0] == '/') /* absolute path */
+			rb_str_cat2(ret, s);
+		    else
+                        rb_str_catf(ret, "AF_UNIX %s", s);
+                }
+                else {
+                    rb_str_cat2(ret, "AF_UNIX");
+                    e = (char *)addr->sun_path + sizeof(addr->sun_path);
+                    while (s < e && *(e-1) == '\0')
+                        e--;
+                    while (s < e)
+                        rb_str_catf(ret, ":%02x", (unsigned char)*s++);
+                }
+                if (addr->sun_path + sizeof(addr->sun_path) < (char*)&rai->addr + rai->sockaddr_len)
+                    rb_str_catf(ret, "(sockaddr %d bytes too long)",
+                            (int)(rai->sockaddr_len - (addr->sun_path + sizeof(addr->sun_path) - (char*)&rai->addr)));
+            }
+            break;
+          }
+#endif
+
+          default:
+          {
+            ID id = rsock_intern_family(rai->addr.ss_family);
+            if (id == 0)
+                rb_str_catf(ret, "unknown address family %d", rai->addr.ss_family);
+            else
+                rb_str_catf(ret, "%s address format unknown", rb_id2name(id));
+            break;
+          }
+        }
+    }
+
+    return ret;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.inspect => string
+ *
+ * returns a string which shows addrinfo in human-readable form.
+ *
+ *   Addrinfo.tcp("localhost", 80).inspect #=> "#<Addrinfo: 127.0.0.1:80 TCP (localhost:80)>"
+ *   Addrinfo.unix("/tmp/sock").inspect    #=> "#<Addrinfo: /tmp/sock SOCK_STREAM>"
+ *
+ */
+static VALUE
+addrinfo_inspect(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int internet_p;
+    VALUE ret;
+
+    ret = rb_sprintf("#<%s: ", rb_obj_classname(self));
+
+    inspect_sockaddr(self, ret);
+
+    if (rai->pfamily && ai_get_afamily(rai) != rai->pfamily) {
+        ID id = rsock_intern_protocol_family(rai->pfamily);
+        if (id)
+            rb_str_catf(ret, " %s", rb_id2name(id));
+        else
+            rb_str_catf(ret, " PF_\?\?\?(%d)", rai->pfamily);
+    }
+
+    internet_p = rai->pfamily == PF_INET;
+#ifdef INET6
+    internet_p = internet_p || rai->pfamily == PF_INET6;
+#endif
+    if (internet_p && rai->socktype == SOCK_STREAM &&
+        (rai->protocol == 0 || rai->protocol == IPPROTO_TCP)) {
+        rb_str_cat2(ret, " TCP");
+    }
+    else if (internet_p && rai->socktype == SOCK_DGRAM &&
+        (rai->protocol == 0 || rai->protocol == IPPROTO_UDP)) {
+        rb_str_cat2(ret, " UDP");
+    }
+    else {
+        if (rai->socktype) {
+            ID id = rsock_intern_socktype(rai->socktype);
+            if (id)
+                rb_str_catf(ret, " %s", rb_id2name(id));
+            else
+                rb_str_catf(ret, " SOCK_\?\?\?(%d)", rai->socktype);
+        }
+
+        if (rai->protocol) {
+            if (internet_p) {
+                ID id = rsock_intern_ipproto(rai->protocol);
+                if (id)
+                    rb_str_catf(ret, " %s", rb_id2name(id));
+                else
+                    goto unknown_protocol;
+            }
+            else {
+              unknown_protocol:
+                rb_str_catf(ret, " UNKNOWN_PROTOCOL(%d)", rai->protocol);
+            }
+        }
+    }
+
+    if (!NIL_P(rai->canonname)) {
+        VALUE name = rai->canonname;
+        rb_str_catf(ret, " %s", StringValueCStr(name));
+    }
+
+    if (!NIL_P(rai->inspectname)) {
+        VALUE name = rai->inspectname;
+        rb_str_catf(ret, " (%s)", StringValueCStr(name));
+    }
+
+    rb_str_buf_cat2(ret, ">");
+    return ret;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.inspect_sockaddr => string
+ *
+ * returns a string which shows the sockaddr in _addrinfo_ with human-readable form.
+ *
+ *   Addrinfo.tcp("localhost", 80).inspect_sockaddr     #=> "127.0.0.1:80"
+ *   Addrinfo.tcp("ip6-localhost", 80).inspect_sockaddr #=> "[::1]:80"
+ *   Addrinfo.unix("/tmp/sock").inspect_sockaddr        #=> "/tmp/sock"
+ *
+ */
+static VALUE
+addrinfo_inspect_sockaddr(VALUE self)
+{
+    return inspect_sockaddr(self, rb_str_new("", 0));
+}
+
+/* :nodoc: */
+static VALUE
+addrinfo_mdump(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    VALUE sockaddr, afamily, pfamily, socktype, protocol, canonname, inspectname;
+    int afamily_int = ai_get_afamily(rai);
+    ID id;
+
+    id = rsock_intern_protocol_family(rai->pfamily);
+    if (id == 0)
+        rb_raise(rb_eSocket, "unknown protocol family: %d", rai->pfamily);
+    pfamily = rb_id2str(id);
+
+    if (rai->socktype == 0)
+        socktype = INT2FIX(0);
+    else {
+        id = rsock_intern_socktype(rai->socktype);
+        if (id == 0)
+            rb_raise(rb_eSocket, "unknown socktype: %d", rai->socktype);
+        socktype = rb_id2str(id);
+    }
+
+    if (rai->protocol == 0)
+        protocol = INT2FIX(0);
+    else if (IS_IP_FAMILY(afamily_int)) {
+        id = rsock_intern_ipproto(rai->protocol);
+        if (id == 0)
+            rb_raise(rb_eSocket, "unknown IP protocol: %d", rai->protocol);
+        protocol = rb_id2str(id);
+    }
+    else {
+        rb_raise(rb_eSocket, "unknown protocol: %d", rai->protocol);
+    }
+
+    canonname = rai->canonname;
+
+    inspectname = rai->inspectname;
+
+    id = rsock_intern_family(afamily_int);
+    if (id == 0)
+        rb_raise(rb_eSocket, "unknown address family: %d", afamily_int);
+    afamily = rb_id2str(id);
+
+    switch(afamily_int) {
+#ifdef HAVE_SYS_UN_H
+      case AF_UNIX:
+      {
+        struct sockaddr_un *su = (struct sockaddr_un *)&rai->addr;
+        char *s, *e;
+        s = su->sun_path;
+        e = (char*)s + sizeof(su->sun_path);
+        while (s < e && *(e-1) == '\0')
+            e--;
+        sockaddr = rb_str_new(s, e-s);
+        break;
+      }
+#endif
+
+      default:
+      {
+        char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
+        int error;
+        error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
+                            hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
+                            NI_NUMERICHOST|NI_NUMERICSERV);
+        if (error) {
+            rsock_raise_socket_error("getnameinfo", error);
+        }
+        sockaddr = rb_assoc_new(rb_str_new_cstr(hbuf), rb_str_new_cstr(pbuf));
+        break;
+      }
+    }
+
+    return rb_ary_new3(7, afamily, sockaddr, pfamily, socktype, protocol, canonname, inspectname);
+}
+
+/* :nodoc: */
+static VALUE
+addrinfo_mload(VALUE self, VALUE ary)
+{
+    VALUE v;
+    VALUE canonname, inspectname;
+    int afamily, pfamily, socktype, protocol;
+    struct sockaddr_storage ss;
+    socklen_t len;
+    rb_addrinfo_t *rai;
+
+    if (check_addrinfo(self))
+        rb_raise(rb_eTypeError, "already initialized socket address");
+
+    ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
+
+    v = rb_ary_entry(ary, 0);
+    StringValue(v);
+    if (rsock_family_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &afamily) == -1)
+        rb_raise(rb_eTypeError, "unexpected address family");
+
+    v = rb_ary_entry(ary, 2);
+    StringValue(v);
+    if (rsock_family_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &pfamily) == -1)
+        rb_raise(rb_eTypeError, "unexpected protocol family");
+
+    v = rb_ary_entry(ary, 3);
+    if (v == INT2FIX(0))
+        socktype = 0;
+    else {
+        StringValue(v);
+        if (rsock_socktype_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &socktype) == -1)
+            rb_raise(rb_eTypeError, "unexpected socktype");
+    }
+
+    v = rb_ary_entry(ary, 4);
+    if (v == INT2FIX(0))
+        protocol = 0;
+    else {
+        StringValue(v);
+        if (IS_IP_FAMILY(afamily)) {
+            if (rsock_ipproto_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &protocol) == -1)
+                rb_raise(rb_eTypeError, "unexpected protocol");
+        }
+        else {
+            rb_raise(rb_eTypeError, "unexpected protocol");
+        }
+    }
+
+    v = rb_ary_entry(ary, 5);
+    if (NIL_P(v))
+        canonname = Qnil;
+    else {
+        StringValue(v);
+        canonname = v;
+    }
+
+    v = rb_ary_entry(ary, 6);
+    if (NIL_P(v))
+        inspectname = Qnil;
+    else {
+        StringValue(v);
+        inspectname = v;
+    }
+
+    v = rb_ary_entry(ary, 1);
+    switch(afamily) {
+#ifdef HAVE_SYS_UN_H
+      case AF_UNIX:
+      {
+        struct sockaddr_un uaddr;
+        memset(&uaddr, 0, sizeof(uaddr));
+        uaddr.sun_family = AF_UNIX;
+
+        StringValue(v);
+        if (sizeof(uaddr.sun_path) <= (size_t)RSTRING_LEN(v))
+            rb_raise(rb_eSocket, "too long AF_UNIX path");
+        memcpy(uaddr.sun_path, RSTRING_PTR(v), RSTRING_LEN(v));
+        len = (socklen_t)sizeof(uaddr);
+        memcpy(&ss, &uaddr, len);
+        break;
+      }
+#endif
+
+      default:
+      {
+        VALUE pair = rb_convert_type(v, T_ARRAY, "Array", "to_ary");
+        struct addrinfo *res;
+        int flags = AI_NUMERICHOST;
+#ifdef AI_NUMERICSERV
+        flags |= AI_NUMERICSERV;
+#endif
+        res = call_getaddrinfo(rb_ary_entry(pair, 0), rb_ary_entry(pair, 1),
+                               INT2NUM(pfamily), INT2NUM(socktype), INT2NUM(protocol),
+                               INT2NUM(flags), 1);
+
+        len = res->ai_addrlen;
+        memcpy(&ss, res->ai_addr, res->ai_addrlen);
+        break;
+      }
+    }
+
+    DATA_PTR(self) = rai = alloc_addrinfo();
+    init_addrinfo(rai, (struct sockaddr *)&ss, len,
+                  pfamily, socktype, protocol,
+                  canonname, inspectname);
+    return self;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.afamily => integer
+ *
+ * returns the address family as an integer.
+ *
+ *   Addrinfo.tcp("localhost", 80).afamily == Socket::AF_INET #=> true
+ *
+ */
+static VALUE
+addrinfo_afamily(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    return INT2NUM(ai_get_afamily(rai));
+}
+
+/*
+ * call-seq:
+ *   addrinfo.pfamily => integer
+ *
+ * returns the protocol family as an integer.
+ *
+ *   Addrinfo.tcp("localhost", 80).pfamily == Socket::PF_INET #=> true
+ *
+ */
+static VALUE
+addrinfo_pfamily(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    return INT2NUM(rai->pfamily);
+}
+
+/*
+ * call-seq:
+ *   addrinfo.socktype => integer
+ *
+ * returns the socket type as an integer.
+ *
+ *   Addrinfo.tcp("localhost", 80).socktype == Socket::SOCK_STREAM #=> true
+ *
+ */
+static VALUE
+addrinfo_socktype(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    return INT2NUM(rai->socktype);
+}
+
+/*
+ * call-seq:
+ *   addrinfo.protocol => integer
+ *
+ * returns the socket type as an integer.
+ *
+ *   Addrinfo.tcp("localhost", 80).protocol == Socket::IPPROTO_TCP #=> true
+ *
+ */
+static VALUE
+addrinfo_protocol(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    return INT2NUM(rai->protocol);
+}
+
+/*
+ * call-seq:
+ *   addrinfo.to_sockaddr => string
+ *
+ * returns the socket address as packed struct sockaddr string.
+ *
+ *   Addrinfo.tcp("localhost", 80).to_sockaddr
+ *   #=> "\x02\x00\x00P\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+ *
+ */
+static VALUE
+addrinfo_to_sockaddr(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    VALUE ret;
+    ret = rb_str_new((char*)&rai->addr, rai->sockaddr_len);
+    OBJ_INFECT(ret, self);
+    return ret;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.canonname => string or nil
+ *
+ * returns the canonical name as an string.
+ *
+ * nil is returned if no canonical name.
+ *
+ * The canonical name is set by Addrinfo.getaddrinfo when AI_CANONNAME is specified.
+ *
+ *   list = Addrinfo.getaddrinfo("www.ruby-lang.org", 80, :INET, :STREAM, nil, Socket::AI_CANONNAME)
+ *   p list[0] #=> #<Addrinfo: 221.186.184.68:80 TCP carbon.ruby-lang.org (www.ruby-lang.org:80)>
+ *   p list[0].canonname #=> "carbon.ruby-lang.org"
+ *
+ */
+static VALUE
+addrinfo_canonname(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    return rai->canonname;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.ip? => true or false
+ *
+ * returns true if addrinfo is internet (IPv4/IPv6) address.
+ * returns false otherwise.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).ip? #=> true
+ *   Addrinfo.tcp("::1", 80).ip?       #=> true
+ *   Addrinfo.unix("/tmp/sock").ip?    #=> false
+ *
+ */
+static VALUE
+addrinfo_ip_p(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int family = ai_get_afamily(rai);
+    return IS_IP_FAMILY(family) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.ipv4? => true or false
+ *
+ * returns true if addrinfo is IPv4 address.
+ * returns false otherwise.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).ipv4? #=> true
+ *   Addrinfo.tcp("::1", 80).ipv4?       #=> false
+ *   Addrinfo.unix("/tmp/sock").ipv4?    #=> false
+ *
+ */
+static VALUE
+addrinfo_ipv4_p(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    return ai_get_afamily(rai) == AF_INET ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.ipv6? => true or false
+ *
+ * returns true if addrinfo is IPv6 address.
+ * returns false otherwise.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).ipv6? #=> false
+ *   Addrinfo.tcp("::1", 80).ipv6?       #=> true
+ *   Addrinfo.unix("/tmp/sock").ipv6?    #=> false
+ *
+ */
+static VALUE
+addrinfo_ipv6_p(VALUE self)
+{
+#ifdef AF_INET6
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    return ai_get_afamily(rai) == AF_INET6 ? Qtrue : Qfalse;
+#else
+    return Qfalse;
+#endif
+}
+
+/*
+ * call-seq:
+ *   addrinfo.unix? => true or false
+ *
+ * returns true if addrinfo is UNIX address.
+ * returns false otherwise.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).unix? #=> false
+ *   Addrinfo.tcp("::1", 80).unix?       #=> false
+ *   Addrinfo.unix("/tmp/sock").unix?    #=> true
+ *
+ */
+static VALUE
+addrinfo_unix_p(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+#ifdef AF_UNIX
+    return ai_get_afamily(rai) == AF_UNIX ? Qtrue : Qfalse;
+#else
+    return Qfalse;
+#endif
+}
+
+/*
+ * call-seq:
+ *   addrinfo.getnameinfo        => [nodename, service]
+ *   addrinfo.getnameinfo(flags) => [nodename, service]
+ *
+ * returns nodename and service as a pair of strings.
+ * This converts struct sockaddr in addrinfo to textual representation.
+ *
+ * flags should be bitwise OR of Socket::NI_??? constants.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).getnameinfo #=> ["localhost", "www"]
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).getnameinfo(Socket::NI_NUMERICSERV)
+ *   #=> ["localhost", "80"]
+ */
+static VALUE
+addrinfo_getnameinfo(int argc, VALUE *argv, VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    VALUE vflags;
+    char hbuf[1024], pbuf[1024];
+    int flags, error;
+
+    rb_scan_args(argc, argv, "01", &vflags);
+
+    flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
+
+    if (rai->socktype == SOCK_DGRAM)
+        flags |= NI_DGRAM;
+
+    error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
+                        hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
+                        flags);
+    if (error) {
+        rsock_raise_socket_error("getnameinfo", error);
+    }
+
+    return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
+}
+
+/*
+ * call-seq:
+ *   addrinfo.ip_unpack => [addr, port]
+ *
+ * Returns the IP address and port number as 2-element array.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).ip_unpack    #=> ["127.0.0.1", 80]
+ *   Addrinfo.tcp("::1", 80).ip_unpack          #=> ["::1", 80]
+ */
+static VALUE
+addrinfo_ip_unpack(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int family = ai_get_afamily(rai);
+    VALUE vflags;
+    VALUE ret, portstr;
+
+    if (!IS_IP_FAMILY(family))
+	rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
+
+    vflags = INT2NUM(NI_NUMERICHOST|NI_NUMERICSERV);
+    ret = addrinfo_getnameinfo(1, &vflags, self);
+    portstr = rb_ary_entry(ret, 1);
+    rb_ary_store(ret, 1, INT2NUM(atoi(StringValueCStr(portstr))));
+    return ret;
+}
+
+/*
+ * call-seq:
+ *   addrinfo.ip_address => string
+ *
+ * Returns the IP address as a string.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).ip_address    #=> "127.0.0.1"
+ *   Addrinfo.tcp("::1", 80).ip_address          #=> "::1"
+ */
+static VALUE
+addrinfo_ip_address(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int family = ai_get_afamily(rai);
+    VALUE vflags;
+    VALUE ret;
+
+    if (!IS_IP_FAMILY(family))
+	rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
+
+    vflags = INT2NUM(NI_NUMERICHOST|NI_NUMERICSERV);
+    ret = addrinfo_getnameinfo(1, &vflags, self);
+    return rb_ary_entry(ret, 0);
+}
+
+/*
+ * call-seq:
+ *   addrinfo.ip_port => port
+ *
+ * Returns the port number as an integer.
+ *
+ *   Addrinfo.tcp("127.0.0.1", 80).ip_port    #=> 80
+ *   Addrinfo.tcp("::1", 80).ip_port          #=> 80
+ */
+static VALUE
+addrinfo_ip_port(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int family = ai_get_afamily(rai);
+    int port;
+
+    if (!IS_IP_FAMILY(family)) {
+      bad_family:
+#ifdef AF_INET6
+	rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
+#else
+	rb_raise(rb_eSocket, "need IPv4 address");
+#endif
+    }
+
+    switch (family) {
+      case AF_INET:
+        if (rai->sockaddr_len != sizeof(struct sockaddr_in))
+            rb_raise(rb_eSocket, "unexpected sockaddr size for IPv4");
+        port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port);
+        break;
+
+#ifdef AF_INET6
+      case AF_INET6:
+        if (rai->sockaddr_len != sizeof(struct sockaddr_in6))
+            rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6");
+        port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port);
+        break;
+#endif
+
+      default:
+	goto bad_family;
+    }
+
+    return INT2NUM(port);
+}
+
+static int
+extract_in_addr(VALUE self, uint32_t *addrp)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int family = ai_get_afamily(rai);
+    if (family != AF_INET) return 0;
+    *addrp = ntohl(((struct sockaddr_in *)&rai->addr)->sin_addr.s_addr);
+    return 1;
+}
+
+/*
+ * Returns true for IPv4 private address (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv4_private_p(VALUE self)
+{
+    uint32_t a;
+    if (!extract_in_addr(self, &a)) return Qfalse;
+    if ((a & 0xff000000) == 0x0a000000 || /* 10.0.0.0/8 */
+        (a & 0xfff00000) == 0xac100000 || /* 172.16.0.0/12 */
+        (a & 0xffff0000) == 0xc0a80000)   /* 192.168.0.0/16 */
+        return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv4 loopback address (127.0.0.0/8).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv4_loopback_p(VALUE self)
+{
+    uint32_t a;
+    if (!extract_in_addr(self, &a)) return Qfalse;
+    if ((a & 0xff000000) == 0x7f000000) /* 127.0.0.0/8 */
+        return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv4 multicast address (224.0.0.0/4).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv4_multicast_p(VALUE self)
+{
+    uint32_t a;
+    if (!extract_in_addr(self, &a)) return Qfalse;
+    if ((a & 0xf0000000) == 0xe0000000) /* 224.0.0.0/4 */
+        return Qtrue;
+    return Qfalse;
+}
+
+#ifdef INET6
+
+static struct in6_addr *
+extract_in6_addr(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int family = ai_get_afamily(rai);
+    if (family != AF_INET6) return NULL;
+    return &((struct sockaddr_in6 *)&rai->addr)->sin6_addr;
+}
+
+/*
+ * Returns true for IPv6 unspecified address (::).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_unspecified_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_UNSPECIFIED(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 loopback address (::1).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_loopback_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_LOOPBACK(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 multicast address (ff00::/8).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_multicast_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_MULTICAST(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 link local address (ff80::/10).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_linklocal_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_LINKLOCAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 site local address (ffc0::/10).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_sitelocal_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_SITELOCAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv4-mapped IPv6 address (::ffff:0:0/80).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_v4mapped_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_V4MAPPED(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv4-compatible IPv6 address (::/80).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_v4compat_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_V4COMPAT(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 multicast node-local scope address.
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_mc_nodelocal_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_MC_NODELOCAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 multicast link-local scope address.
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_mc_linklocal_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_MC_LINKLOCAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 multicast site-local scope address.
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_mc_sitelocal_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_MC_SITELOCAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 multicast organization-local scope address.
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_mc_orglocal_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_MC_ORGLOCAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns true for IPv6 multicast global scope address.
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_mc_global_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_MC_GLOBAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * Returns IPv4 address of IPv4 mapped/compatible IPv6 address.
+ * It returns nil if +self+ is not IPv4 mapped/compatible IPv6 address.
+ *
+ *   Addrinfo.ip("::192.0.2.3").ipv6_to_ipv4      #=> #<Addrinfo: 192.0.2.3>
+ *   Addrinfo.ip("::ffff:192.0.2.3").ipv6_to_ipv4 #=> #<Addrinfo: 192.0.2.3>
+ *   Addrinfo.ip("::1").ipv6_to_ipv4              #=> nil
+ *   Addrinfo.ip("192.0.2.3").ipv6_to_ipv4        #=> nil
+ *   Addrinfo.unix("/tmp/sock").ipv6_to_ipv4      #=> nil
+ */
+static VALUE
+addrinfo_ipv6_to_ipv4(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    struct in6_addr *addr;
+    int family = ai_get_afamily(rai);
+    if (family != AF_INET6) return Qnil;
+    addr = &((struct sockaddr_in6 *)&rai->addr)->sin6_addr;
+    if (IN6_IS_ADDR_V4MAPPED(addr) || IN6_IS_ADDR_V4COMPAT(addr)) {
+        struct sockaddr_in sin4;
+        MEMZERO(&sin4, struct sockaddr_in, 1);
+        sin4.sin_family = AF_INET;
+        SET_SIN_LEN(&sin4, sizeof(sin4));
+        memcpy(&sin4.sin_addr, (char*)addr + sizeof(*addr) - sizeof(sin4.sin_addr), sizeof(sin4.sin_addr));
+        return rsock_addrinfo_new((struct sockaddr *)&sin4, (socklen_t)sizeof(sin4),
+                                  PF_INET, rai->socktype, rai->protocol,
+                                  rai->canonname, rai->inspectname);
+    }
+    else {
+        return Qnil;
+    }
+}
+
+#endif
+
+#ifdef HAVE_SYS_UN_H
+/*
+ * call-seq:
+ *   addrinfo.unix_path => path
+ *
+ * Returns the socket path as a string.
+ *
+ *   Addrinfo.unix("/tmp/sock").unix_path       #=> "/tmp/sock"
+ */
+static VALUE
+addrinfo_unix_path(VALUE self)
+{
+    rb_addrinfo_t *rai = get_addrinfo(self);
+    int family = ai_get_afamily(rai);
+    struct sockaddr_un *addr;
+    char *s, *e;
+
+    if (family != AF_UNIX)
+	rb_raise(rb_eSocket, "need AF_UNIX address");
+
+    addr = (struct sockaddr_un *)&rai->addr;
+
+    s = addr->sun_path;
+    e = (char*)addr + rai->sockaddr_len;
+    if (e < s)
+        rb_raise(rb_eSocket, "too short AF_UNIX address");
+    if (addr->sun_path + sizeof(addr->sun_path) < e)
+        rb_raise(rb_eSocket, "too long AF_UNIX address");
+    while (s < e && *(e-1) == '\0')
+        e--;
+    return rb_str_new(s, e-s);
+}
+#endif
+
+/*
+ * call-seq:
+ *   Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags) => [addrinfo, ...]
+ *   Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol)        => [addrinfo, ...]
+ *   Addrinfo.getaddrinfo(nodename, service, family, socktype)                  => [addrinfo, ...]
+ *   Addrinfo.getaddrinfo(nodename, service, family)                            => [addrinfo, ...]
+ *   Addrinfo.getaddrinfo(nodename, service)                                    => [addrinfo, ...]
+ *
+ * returns a list of addrinfo objects as an array.
+ *
+ * This method converts nodename (hostname) and service (port) to addrinfo.
+ * Since the conversion is not unique, the result is a list of addrinfo objects.
+ *
+ * nodename or service can be nil if no conversion intended.
+ *
+ * family, socktype and protocol are hint for preferred protocol.
+ * If the result will be used for a socket with SOCK_STREAM,
+ * SOCK_STREAM should be specified as socktype.
+ * If so, Addrinfo.getaddrinfo returns addrinfo list appropriate for SOCK_STREAM.
+ * If they are omitted or nil is given, the result is not restricted.
+ *
+ * Similarly, PF_INET6 as family restricts for IPv6.
+ *
+ * flags should be bitwise OR of Socket::AI_??? constants.
+ *
+ * Note that socktype should be specified whenever application knows the usage of the address.
+ * Some platform causes an error when socktype is omitted and servname is specified as an integer
+ * because some port numbers, 512 for example, are ambiguous without socktype.
+ *
+ *   Addrinfo.getaddrinfo("www.kame.net", 80, nil, :STREAM)
+ *   #=> [#<Addrinfo: 203.178.141.194:80 TCP (www.kame.net:80)>,
+ *   #    #<Addrinfo: [2001:200:0:8002:203:47ff:fea5:3085]:80 TCP (www.kame.net:80)>]
+ *
+ */
+static VALUE
+addrinfo_s_getaddrinfo(int argc, VALUE *argv, VALUE self)
+{
+    VALUE node, service, family, socktype, protocol, flags;
+
+    rb_scan_args(argc, argv, "24", &node, &service, &family, &socktype, &protocol, &flags);
+    return addrinfo_list_new(node, service, family, socktype, protocol, flags);
+}
+
+/*
+ * call-seq:
+ *   Addrinfo.ip(host) => addrinfo
+ *
+ * returns an addrinfo object for IP address.
+ *
+ * The port, socktype, protocol of the result is filled by zero.
+ * So, it is not appropriate to create a socket.
+ *
+ *   Addrinfo.ip("localhost") #=> #<Addrinfo: 127.0.0.1 (localhost)>
+ */
+static VALUE
+addrinfo_s_ip(VALUE self, VALUE host)
+{
+    VALUE ret;
+    rb_addrinfo_t *rai;
+    ret = addrinfo_firstonly_new(host, Qnil,
+            INT2NUM(PF_UNSPEC), INT2FIX(0), INT2FIX(0), INT2FIX(0));
+    rai = get_addrinfo(ret);
+    rai->socktype = 0;
+    rai->protocol = 0;
+    return ret;
+}
+
+/*
+ * call-seq:
+ *   Addrinfo.tcp(host, port) => addrinfo
+ *
+ * returns an addrinfo object for TCP address.
+ *
+ *   Addrinfo.tcp("localhost", "smtp") #=> #<Addrinfo: 127.0.0.1:25 TCP (localhost:smtp)>
+ */
+static VALUE
+addrinfo_s_tcp(VALUE self, VALUE host, VALUE port)
+{
+    return addrinfo_firstonly_new(host, port,
+            INT2NUM(PF_UNSPEC), INT2NUM(SOCK_STREAM), INT2NUM(IPPROTO_TCP), INT2FIX(0));
+}
+
+/*
+ * call-seq:
+ *   Addrinfo.udp(host, port) => addrinfo
+ *
+ * returns an addrinfo object for UDP address.
+ *
+ *   Addrinfo.udp("localhost", "daytime") #=> #<Addrinfo: 127.0.0.1:13 UDP (localhost:daytime)>
+ */
+static VALUE
+addrinfo_s_udp(VALUE self, VALUE host, VALUE port)
+{
+    return addrinfo_firstonly_new(host, port,
+            INT2NUM(PF_UNSPEC), INT2NUM(SOCK_DGRAM), INT2NUM(IPPROTO_UDP), INT2FIX(0));
+}
+
+#ifdef HAVE_SYS_UN_H
+
+/*
+ * call-seq:
+ *   Addrinfo.unix(path [, socktype]) => addrinfo
+ *
+ * returns an addrinfo object for UNIX socket address.
+ *
+ * _socktype_ specifies the socket type.
+ * If it is omitted, :STREAM is used.
+ *
+ *   Addrinfo.unix("/tmp/sock")         #=> #<Addrinfo: /tmp/sock SOCK_STREAM>
+ *   Addrinfo.unix("/tmp/sock", :DGRAM) #=> #<Addrinfo: /tmp/sock SOCK_DGRAM>
+ */
+static VALUE
+addrinfo_s_unix(int argc, VALUE *argv, VALUE self)
+{
+    VALUE path, vsocktype, addr;
+    int socktype;
+    rb_addrinfo_t *rai;
+
+    rb_scan_args(argc, argv, "11", &path, &vsocktype);
+
+    if (NIL_P(vsocktype))
+        socktype = SOCK_STREAM;
+    else
+        socktype = rsock_socktype_arg(vsocktype);
+
+    addr = addrinfo_s_allocate(rb_cAddrinfo);
+    DATA_PTR(addr) = rai = alloc_addrinfo();
+    init_unix_addrinfo(rai, path, socktype);
+    OBJ_INFECT(addr, path);
+    return addr;
+}
+
+#endif
+
+VALUE
+rsock_sockaddr_string_value(volatile VALUE *v)
+{
+    VALUE val = *v;
+    if (IS_ADDRINFO(val)) {
+        *v = addrinfo_to_sockaddr(val);
+    }
+    StringValue(*v);
+    return *v;
+}
+
+char *
+rsock_sockaddr_string_value_ptr(volatile VALUE *v)
+{
+    rsock_sockaddr_string_value(v);
+    return RSTRING_PTR(*v);
+}
+
+VALUE
+rb_check_sockaddr_string_type(VALUE val)
+{
+    if (IS_ADDRINFO(val))
+        return addrinfo_to_sockaddr(val);
+    return rb_check_string_type(val);
+}
+
+VALUE
+rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len)
+{
+    int family;
+    int socktype;
+    int ret;
+    socklen_t optlen = (socklen_t)sizeof(socktype);
+
+    /* assumes protocol family and address family are identical */
+    family = get_afamily(addr, len);
+
+    ret = getsockopt(fd, SOL_SOCKET, SO_TYPE, (void*)&socktype, &optlen);
+    if (ret == -1) {
+        rb_sys_fail("getsockopt(SO_TYPE)");
+    }
+
+    return rsock_addrinfo_new(addr, len, family, socktype, 0, Qnil, Qnil);
+}
+
+VALUE
+rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
+{
+    rb_io_t *fptr;
+
+    switch (TYPE(io)) {
+      case T_FIXNUM:
+        return rsock_fd_socket_addrinfo(FIX2INT(io), addr, len);
+
+      case T_BIGNUM:
+        return rsock_fd_socket_addrinfo(NUM2INT(io), addr, len);
+
+      case T_FILE:
+        GetOpenFile(io, fptr);
+        return rsock_fd_socket_addrinfo(fptr->fd, addr, len);
+
+      default:
+        rb_raise(rb_eTypeError, "neither IO nor file descriptor");
+    }
+}
+
+/*
+ * Addrinfo class
+ */
+void
+rsock_init_addrinfo(void)
+{
+    rb_cAddrinfo = rb_define_class("Addrinfo", rb_cData);
+    rb_define_alloc_func(rb_cAddrinfo, addrinfo_s_allocate);
+    rb_define_method(rb_cAddrinfo, "initialize", addrinfo_initialize, -1);
+    rb_define_method(rb_cAddrinfo, "inspect", addrinfo_inspect, 0);
+    rb_define_method(rb_cAddrinfo, "inspect_sockaddr", addrinfo_inspect_sockaddr, 0);
+    rb_define_singleton_method(rb_cAddrinfo, "getaddrinfo", addrinfo_s_getaddrinfo, -1);
+    rb_define_singleton_method(rb_cAddrinfo, "ip", addrinfo_s_ip, 1);
+    rb_define_singleton_method(rb_cAddrinfo, "tcp", addrinfo_s_tcp, 2);
+    rb_define_singleton_method(rb_cAddrinfo, "udp", addrinfo_s_udp, 2);
+#ifdef HAVE_SYS_UN_H
+    rb_define_singleton_method(rb_cAddrinfo, "unix", addrinfo_s_unix, -1);
+#endif
+
+    rb_define_method(rb_cAddrinfo, "afamily", addrinfo_afamily, 0);
+    rb_define_method(rb_cAddrinfo, "pfamily", addrinfo_pfamily, 0);
+    rb_define_method(rb_cAddrinfo, "socktype", addrinfo_socktype, 0);
+    rb_define_method(rb_cAddrinfo, "protocol", addrinfo_protocol, 0);
+    rb_define_method(rb_cAddrinfo, "canonname", addrinfo_canonname, 0);
+
+    rb_define_method(rb_cAddrinfo, "ipv4?", addrinfo_ipv4_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6?", addrinfo_ipv6_p, 0);
+    rb_define_method(rb_cAddrinfo, "unix?", addrinfo_unix_p, 0);
+
+    rb_define_method(rb_cAddrinfo, "ip?", addrinfo_ip_p, 0);
+    rb_define_method(rb_cAddrinfo, "ip_unpack", addrinfo_ip_unpack, 0);
+    rb_define_method(rb_cAddrinfo, "ip_address", addrinfo_ip_address, 0);
+    rb_define_method(rb_cAddrinfo, "ip_port", addrinfo_ip_port, 0);
+
+    rb_define_method(rb_cAddrinfo, "ipv4_private?", addrinfo_ipv4_private_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv4_loopback?", addrinfo_ipv4_loopback_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv4_multicast?", addrinfo_ipv4_multicast_p, 0);
+
+#ifdef INET6
+    rb_define_method(rb_cAddrinfo, "ipv6_unspecified?", addrinfo_ipv6_unspecified_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_loopback?", addrinfo_ipv6_loopback_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_multicast?", addrinfo_ipv6_multicast_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_linklocal?", addrinfo_ipv6_linklocal_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_sitelocal?", addrinfo_ipv6_sitelocal_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_v4mapped?", addrinfo_ipv6_v4mapped_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_v4compat?", addrinfo_ipv6_v4compat_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_mc_nodelocal?", addrinfo_ipv6_mc_nodelocal_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_mc_linklocal?", addrinfo_ipv6_mc_linklocal_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_mc_sitelocal?", addrinfo_ipv6_mc_sitelocal_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_mc_orglocal?", addrinfo_ipv6_mc_orglocal_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_mc_global?", addrinfo_ipv6_mc_global_p, 0);
+
+    rb_define_method(rb_cAddrinfo, "ipv6_to_ipv4", addrinfo_ipv6_to_ipv4, 0);
+#endif
+
+#ifdef HAVE_SYS_UN_H
+    rb_define_method(rb_cAddrinfo, "unix_path", addrinfo_unix_path, 0);
+#endif
+
+    rb_define_method(rb_cAddrinfo, "to_sockaddr", addrinfo_to_sockaddr, 0);
+    rb_define_method(rb_cAddrinfo, "to_s", addrinfo_to_sockaddr, 0); /* compatibility for ruby before 1.9.2 */
+
+    rb_define_method(rb_cAddrinfo, "getnameinfo", addrinfo_getnameinfo, -1);
+
+    rb_define_method(rb_cAddrinfo, "marshal_dump", addrinfo_mdump, 0);
+    rb_define_method(rb_cAddrinfo, "marshal_load", addrinfo_mload, 1);
+}
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
new file mode 100644
index 0000000000..60ac25fbbd
--- /dev/null
+++ b/ext/socket/rubysocket.h
@@ -0,0 +1,306 @@
+#ifndef RUBY_SOCKET_H
+#define RUBY_SOCKET_H 1
+
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "ruby/util.h"
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
+#ifdef HAVE_XTI_H
+#include <xti.h>
+#endif
+
+#ifndef _WIN32
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
+# include <net/socket.h>
+#else
+# include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+# include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+# include <netinet/tcp.h>
+#endif
+#ifdef HAVE_NETINET_UDP_H
+# include <netinet/udp.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#include <netdb.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+#if defined(HAVE_FCNTL)
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#endif
+
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_UCRED_H
+#include <sys/ucred.h>
+#endif
+#ifdef HAVE_UCRED_H
+#include <ucred.h>
+#endif
+
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK EAGAIN
+#endif
+
+/*
+ * workaround for NetBSD, OpenBSD and etc.
+ * The problem is since 4.4BSD-Lite.
+ * FreeBSD fix the problem at FreeBSD 2.2.0.
+ * NetBSD fix the problem at NetBSD 3.0 by kern/29624.
+ * OpenBSD fix the problem at OpenBSD 3.8.
+ */
+#define pseudo_AF_FTIP pseudo_AF_RTIP
+
+#ifndef HAVE_GETADDRINFO
+#include "addrinfo.h"
+#endif
+#include "sockport.h"
+
+#ifndef NI_MAXHOST
+# define NI_MAXHOST 1025
+#endif
+#ifndef NI_MAXSERV
+# define NI_MAXSERV 32
+#endif
+
+#ifdef AF_INET6
+# define IS_IP_FAMILY(af) ((af) == AF_INET || (af) == AF_INET6)
+#else
+# define IS_IP_FAMILY(af) ((af) == AF_INET)
+#endif
+
+#ifndef HAVE_SOCKADDR_STORAGE
+/*
+ * RFC 2553: protocol-independent placeholder for socket addresses
+ */
+#define _SS_MAXSIZE     128
+#define _SS_ALIGNSIZE   (sizeof(double))
+#define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
+#define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
+                                _SS_PAD1SIZE - _SS_ALIGNSIZE)
+
+struct sockaddr_storage {
+#ifdef HAVE_SA_LEN
+        unsigned char ss_len;           /* address length */
+        unsigned char ss_family;        /* address family */
+#else
+        unsigned short ss_family;
+#endif
+        char    __ss_pad1[_SS_PAD1SIZE];
+        double  __ss_align;     /* force desired structure storage alignment */
+        char    __ss_pad2[_SS_PAD2SIZE];
+};
+#endif
+
+#if defined __APPLE__ && defined __MACH__
+/*
+ * CMSG_ macros are broken on 64bit darwin, because __DARWIN_ALIGN
+ * aligns up to __darwin_size_t which is 64bit, but CMSG_DATA is
+ * 32bit-aligned.
+ */
+#undef __DARWIN_ALIGNBYTES
+#define __DARWIN_ALIGNBYTES (sizeof(unsigned int) - 1)
+#endif
+
+#if defined(_AIX)
+#ifndef CMSG_SPACE
+# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+#endif
+#ifndef CMSG_LEN
+# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+#endif
+#endif
+
+#ifdef __BEOS__
+#undef close
+#define close closesocket
+#endif
+
+#define INET_CLIENT 0
+#define INET_SERVER 1
+#define INET_SOCKS  2
+
+extern int rsock_do_not_reverse_lookup;
+#define FMODE_NOREVLOOKUP 0x100
+
+extern VALUE rb_cBasicSocket;
+extern VALUE rb_cIPSocket;
+extern VALUE rb_cTCPSocket;
+extern VALUE rb_cTCPServer;
+extern VALUE rb_cUDPSocket;
+#ifdef HAVE_SYS_UN_H
+extern VALUE rb_cUNIXSocket;
+extern VALUE rb_cUNIXServer;
+#endif
+extern VALUE rb_cSocket;
+extern VALUE rb_cAddrinfo;
+extern VALUE rb_cSockOpt;
+
+extern VALUE rb_eSocket;
+
+#ifdef SOCKS
+extern VALUE rb_cSOCKSSocket;
+#ifdef SOCKS5
+#include <socks.h>
+#else
+void SOCKSinit();
+int Rconnect();
+#endif
+#endif
+
+#include "constdefs.h"
+
+#define BLOCKING_REGION(func, arg) (long)rb_thread_blocking_region((func), (arg), RUBY_UBF_IO, 0)
+
+#define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v))
+#define SockAddrStringValuePtr(v) rsock_sockaddr_string_value_ptr(&(v))
+VALUE rsock_sockaddr_string_value(volatile VALUE *);
+char *rsock_sockaddr_string_value_ptr(volatile VALUE *);
+VALUE rb_check_sockaddr_string_type(VALUE);
+
+NORETURN(void rsock_raise_socket_error(const char *, int));
+
+int rsock_family_arg(VALUE domain);
+int rsock_socktype_arg(VALUE type);
+int rsock_level_arg(int family, VALUE level);
+int rsock_optname_arg(int family, int level, VALUE optname);
+int rsock_cmsg_type_arg(int family, int level, VALUE type);
+int rsock_shutdown_how_arg(VALUE how);
+
+int rsock_getfamily(int sockfd);
+
+int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
+int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
+struct addrinfo *rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags);
+struct addrinfo *rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack);
+VALUE rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len);
+VALUE rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len);
+
+VALUE rsock_addrinfo_new(struct sockaddr *addr, socklen_t len, int family, int socktype, int protocol, VALUE canonname, VALUE inspectname);
+
+VALUE rsock_make_ipaddr(struct sockaddr *addr);
+VALUE rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup);
+VALUE rsock_make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t));
+
+int rsock_revlookup_flag(VALUE revlookup, int *norevlookup);
+
+#ifdef HAVE_SYS_UN_H
+const char* rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len);
+VALUE rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len);
+#endif
+
+int rsock_socket(int domain, int type, int proto);
+VALUE rsock_init_sock(VALUE sock, int fd);
+VALUE rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass);
+VALUE rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type);
+VALUE rsock_init_unixsock(VALUE sock, VALUE path, int server);
+
+struct rsock_send_arg {
+    int fd, flags;
+    VALUE mesg;
+    struct sockaddr *to;
+    socklen_t tolen;
+};
+
+VALUE rsock_sendto_blocking(void *data);
+VALUE rsock_send_blocking(void *data);
+VALUE rsock_bsock_send(int argc, VALUE *argv, VALUE sock);
+
+enum sock_recv_type {
+    RECV_RECV,                  /* BasicSocket#recv(no from) */
+    RECV_IP,                    /* IPSocket#recvfrom */
+    RECV_UNIX,                  /* UNIXSocket#recvfrom */
+    RECV_SOCKET                 /* Socket#recvfrom */
+};
+
+VALUE rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
+VALUE rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
+
+int rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks);
+
+VALUE rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len);
+VALUE rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len);
+VALUE rsock_sock_listen(VALUE sock, VALUE log);
+
+VALUE rsock_sockopt_new(int family, int level, int optname, VALUE data);
+
+#if defined(HAVE_SENDMSG)
+VALUE rsock_bsock_sendmsg(int argc, VALUE *argv, VALUE sock);
+VALUE rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock);
+#else
+#define rsock_bsock_sendmsg rb_f_notimplement
+#define rsock_bsock_sendmsg_nonblock rb_f_notimplement
+#endif
+#if defined(HAVE_RECVMSG)
+VALUE rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock);
+VALUE rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock);
+#else
+#define rsock_bsock_recvmsg rb_f_notimplement
+#define rsock_bsock_recvmsg_nonblock rb_f_notimplement
+#endif
+
+#ifdef HAVE_ST_MSG_CONTROL
+void rsock_discard_cmsg_resource(struct msghdr *mh);
+#endif
+
+void rsock_init_basicsocket(void);
+void rsock_init_ipsocket(void);
+void rsock_init_tcpsocket(void);
+void rsock_init_tcpserver(void);
+void rsock_init_sockssocket(void);
+void rsock_init_udpsocket(void);
+void rsock_init_unixsocket(void);
+void rsock_init_unixserver(void);
+void rsock_init_socket_constants(void);
+void rsock_init_ancdata(void);
+void rsock_init_addrinfo(void);
+void rsock_init_sockopt(void);
+void rsock_init_socket_init(void);
+
+#endif
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 22e178a4c8..63586fc002 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2,2375 +2,112 @@
 
   socket.c -
 
-  $Author$
-  $Date$
   created at: Thu Mar 31 12:21:29 JST 1994
 
-  Copyright (C) 1993-2001 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 ************************************************/
 
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
-#include "util.h"
-#include <stdio.h>
-#include <sys/types.h>
+#include "rubysocket.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
-#ifndef _WIN32
-#if defined(__BEOS__)
-# include <net/socket.h>
-#else
-# include <sys/socket.h>
-# define pseudo_AF_FTIP pseudo_AF_RTIP	/* workaround for NetBSD and etc. */
-#endif
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-# include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-# include <netinet/tcp.h>
-#endif
-#ifdef HAVE_NETINET_UDP_H
-# include <netinet/udp.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#include <netdb.h>
-#endif
-#include <errno.h>
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-
-#if defined(HAVE_FCNTL)
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#endif
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK EAGAIN
-#endif
-#ifndef HAVE_GETADDRINFO
-# include "addrinfo.h"
-#endif
-#include "sockport.h"
-
-#if defined(__vms)
-#include <tcp.h>
-#endif
-
-static int do_not_reverse_lookup = 0;
-
-VALUE rb_cBasicSocket;
-VALUE rb_cIPSocket;
-VALUE rb_cTCPSocket;
-VALUE rb_cTCPServer;
-VALUE rb_cUDPSocket;
-#ifdef AF_UNIX
-VALUE rb_cUNIXSocket;
-VALUE rb_cUNIXServer;
-#endif
-VALUE rb_cSocket;
-
-static VALUE rb_eSocket;
-
-#ifdef SOCKS
-VALUE rb_cSOCKSSocket;
-#ifdef SOCKS5
-#include <socks.h>
-#else
-void SOCKSinit();
-int Rconnect();
-#endif
-#endif
-
-#define INET_CLIENT 0
-#define INET_SERVER 1
-#define INET_SOCKS  2
-
-#ifndef HAVE_SOCKADDR_STORAGE
-/*
- * RFC 2553: protocol-independent placeholder for socket addresses
- */
-#define _SS_MAXSIZE	128
-#define _SS_ALIGNSIZE	(sizeof(double))
-#define _SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
-#define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
-				_SS_PAD1SIZE - _SS_ALIGNSIZE)
-
-struct sockaddr_storage {
-#ifdef HAVE_SA_LEN
-	unsigned char ss_len;		/* address length */
-	unsigned char ss_family;	/* address family */
-#else
-	unsigned short ss_family;
-#endif
-	char	__ss_pad1[_SS_PAD1SIZE];
-	double	__ss_align;	/* force desired structure storage alignment */
-	char	__ss_pad2[_SS_PAD2SIZE];
-};
-#endif
-
-#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
-#define LOOKUP_ORDERS		3
-static int lookup_order_table[LOOKUP_ORDERS] = {
-#if defined(LOOKUP_ORDER_HACK_INET)
-    PF_INET, PF_INET6, PF_UNSPEC,
-#elif defined(LOOKUP_ORDER_HACK_INET6)
-    PF_INET6, PF_INET, PF_UNSPEC,
-#else
-    /* should not happen */
-#endif
-};
-
-static int
-ruby_getaddrinfo(nodename, servname, hints, res)
-     char *nodename;
-     char *servname;
-     struct addrinfo *hints;
-     struct addrinfo **res;
-{
-    struct addrinfo tmp_hints;
-    int i, af, error;
-
-    if (hints->ai_family != PF_UNSPEC) {
-	return getaddrinfo(nodename, servname, hints, res);
-    }
-
-    for (i = 0; i < LOOKUP_ORDERS; i++) {
-	af = lookup_order_table[i];
-	MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
-	tmp_hints.ai_family = af;
-	error = getaddrinfo(nodename, servname, &tmp_hints, res);
-	if (error) {
-	    if (tmp_hints.ai_family == PF_UNSPEC) {
-		break;
-	    }
-	}
-	else {
-	    break;
-	}
-    }
-
-    return error;
-}
-#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
-#endif
-
-#if defined(_AIX)
-static int
-ruby_getaddrinfo__aix(nodename, servname, hints, res)
-     char *nodename;
-     char *servname;
-     struct addrinfo *hints;
-     struct addrinfo **res;
-{
-    int error = getaddrinfo(nodename, servname, hints, res);
-    struct addrinfo *r;
-    if (error)
-	return error;
-    for (r = *res; r != NULL; r = r->ai_next) {
-	if (r->ai_addr->sa_family == 0)
-	    r->ai_addr->sa_family = r->ai_family;
-	if (r->ai_addr->sa_len == 0)
-	    r->ai_addr->sa_len = r->ai_addrlen;
-    }
-    return 0;
-}
-#undef getaddrinfo
-#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
-static int
-ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags)
-     const struct sockaddr *sa;
-     size_t salen;
-     char *host;
-     size_t hostlen;
-     char *serv;
-     size_t servlen;
-     int flags;
-{
-  struct sockaddr_in6 *sa6;
-  u_int32_t *a6;
-
-  if (sa->sa_family == AF_INET6) {
-    sa6 = (struct sockaddr_in6 *)sa;
-    a6 = sa6->sin6_addr.u6_addr.u6_addr32;
-
-    if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) {
-      strncpy(host, "::", hostlen);
-      snprintf(serv, servlen, "%d", sa6->sin6_port);
-      return 0;
-    }
-  }
-  return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
-}
-#undef getnameinfo
-#define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
-            ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags))
-#ifndef CMSG_SPACE
-# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
-#endif
-#ifndef CMSG_LEN
-# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
-#endif
-#endif
-
-#ifdef HAVE_CLOSESOCKET
-#undef close
-#define close closesocket
-#endif
-
-static VALUE
-init_sock(sock, fd)
-    VALUE sock;
-    int fd;
-{
-    OpenFile *fp;
-
-    MakeOpenFile(sock, fp);
-    fp->f = rb_fdopen(fd, "r");
-    fp->f2 = rb_fdopen(fd, "w");
-    fp->mode = FMODE_READWRITE;
-    rb_io_synchronized(fp);
-
-    return sock;
-}
-
-static VALUE
-bsock_s_for_fd(klass, fd)
-    VALUE klass, fd;
-{
-    OpenFile *fptr;
-    VALUE sock = init_sock(rb_obj_alloc(klass), NUM2INT(fd));
-
-    GetOpenFile(sock, fptr);
-
-    return sock;
-}
-
-static VALUE
-bsock_shutdown(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    VALUE howto;
-    int how;
-    OpenFile *fptr;
-
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
-    }
-    rb_scan_args(argc, argv, "01", &howto);
-    if (howto == Qnil)
-	how = 2;
-    else {
-	how = NUM2INT(howto);
-	if (how < 0 || 2 < how) {
-	    rb_raise(rb_eArgError, "`how' should be either 0, 1, 2");
-	}
-    }
-    GetOpenFile(sock, fptr);
-    if (shutdown(fileno(fptr->f), how) == -1)
-	rb_sys_fail(0);
-
-    return INT2FIX(0);
-}
-
-static VALUE
-bsock_close_read(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
-    }
-    GetOpenFile(sock, fptr);
-    shutdown(fileno(fptr->f), 0);
-    if (!(fptr->mode & FMODE_WRITABLE)) {
-	return rb_io_close(sock);
-    }
-    fptr->mode &= ~FMODE_READABLE;
-
-    return Qnil;
-}
-
-static VALUE
-bsock_close_write(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
-    }
-    GetOpenFile(sock, fptr);
-    if (!(fptr->mode & FMODE_READABLE)) {
-	return rb_io_close(sock);
-    }
-    shutdown(fileno(fptr->f2), 1);
-    fptr->mode &= ~FMODE_WRITABLE;
-
-    return Qnil;
-}
-
-/*
- * Document-method: setsockopt
- * call-seq: setsockopt(level, optname, optval)
- *
- * Sets a socket option. These are protocol and system specific, see your
- * local sytem documentation for details.
- *
- * === Parameters
- * * +level+ is an integer, usually one of the SOL_ constants such as
- *   Socket::SOL_SOCKET, or a protocol level.
- * * +optname+ is an integer, usually one of the SO_ constants, such
- *   as Socket::SO_REUSEADDR.
- * * +optval+ is the value of the option, it is passed to the underlying
- *   setsockopt() as a pointer to a certain number of bytes. How this is
- *   done depends on the type:
- *   - Fixnum: value is assigned to an int, and a pointer to the int is
- *     passed, with length of sizeof(int).
- *   - true or false: 1 or 0 (respectively) is assigned to an int, and the
- *     int is passed as for a Fixnum. Note that +false+ must be passed,
- *     not +nil+.
- *   - String: the string's data and length is passed to the socket.
- *
- * === Examples
- *
- * Some socket options are integers with boolean values, in this case
- * #setsockopt could be called like this:
- *   sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
- *
- * Some socket options are integers with numeric values, in this case
- * #setsockopt could be called like this:
- *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, 255)
- *
- * Option values may be structs. Passing them can be complex as it involves
- * examining your system headers to determine the correct definition. An
- * example is an +ip_mreq+, which may be defined in your system headers as:
- *   struct ip_mreq {
- *     struct  in_addr imr_multiaddr;
- *     struct  in_addr imr_interface;
- *   };
- * 
- * In this case #setsockopt could be called like this:
- *   optval =  IPAddr.new("224.0.0.251") + Socket::INADDR_ANY
- *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
- *
-*/
-static VALUE
-bsock_setsockopt(sock, lev, optname, val)
-    VALUE sock, lev, optname, val;
-{
-    int level, option;
-    OpenFile *fptr;
-    int i;
-    char *v;
-    int vlen;
-
-    rb_secure(2);
-    level = NUM2INT(lev);
-    option = NUM2INT(optname);
-
-    switch (TYPE(val)) {
-      case T_FIXNUM:
-	i = FIX2INT(val);
-	goto numval;
-      case T_FALSE:
-	i = 0;
-	goto numval;
-      case T_TRUE:
-	i = 1;
-      numval:
-	v = (char*)&i; vlen = sizeof(i);
-	break;
-      default:
-	StringValue(val);
-	v = RSTRING(val)->ptr;
-	vlen = RSTRING(val)->len;
-	break;
-    }
-
-    GetOpenFile(sock, fptr);
-    if (setsockopt(fileno(fptr->f), level, option, v, vlen) < 0)
-	rb_sys_fail(fptr->path);
-
-    return INT2FIX(0);
-}
-
-/*
- * Document-method: getsockopt
- * call-seq: getsockopt(level, optname)
- *
- * Gets a socket option. These are protocol and system specific, see your
- * local sytem documentation for details. The option is returned as
- * a String with the data being the binary value of the socket option.
- *
- * === Parameters
- * * +level+ is an integer, usually one of the SOL_ constants such as
- *   Socket::SOL_SOCKET, or a protocol level.
- * * +optname+ is an integer, usually one of the SO_ constants, such
- *   as Socket::SO_REUSEADDR.
- *
- * === Examples
- *
- * Some socket options are integers with boolean values, in this case
- * #getsockopt could be called like this:
- *   optval = sock.getsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR)
- *   optval = optval.unpack "i"
- *   reuseaddr = optval[0] == 0 ? false : true
- *
- * Some socket options are integers with numeric values, in this case
- * #getsockopt could be called like this:
- *   optval = sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
- *   ipttl = optval.unpack("i")[0]
- *
- * Option values may be structs. Decoding them can be complex as it involves
- * examining your system headers to determine the correct definition. An
- * example is a +struct linger+, which may be defined in your system headers
- * as:
- *   struct linger {
- *     int l_onoff;
- *     int l_linger;
- *   };
- * 
- * In this case #getsockopt could be called like this:
- *   optval =  sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
- *   onoff, linger = optval.unpack "ii"
-*/
-static VALUE
-bsock_getsockopt(sock, lev, optname)
-    VALUE sock, lev, optname;
-{
-#if !defined(__BEOS__)
-    int level, option;
-    socklen_t len;
-    char *buf;
-    OpenFile *fptr;
-
-    level = NUM2INT(lev);
-    option = NUM2INT(optname);
-    len = 256;
-    buf = ALLOCA_N(char,len);
-    GetOpenFile(sock, fptr);
-
-    GetOpenFile(sock, fptr);
-    if (getsockopt(fileno(fptr->f), level, option, buf, &len) < 0)
-	rb_sys_fail(fptr->path);
-
-    return rb_str_new(buf, len);
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE
-bsock_getsockname(sock)
-    VALUE sock;
-{
-    char buf[1024];
-    socklen_t len = sizeof buf;
-    OpenFile *fptr;
-
-    GetOpenFile(sock, fptr);
-    if (getsockname(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
-	rb_sys_fail("getsockname(2)");
-    return rb_str_new(buf, len);
-}
-
-static VALUE
-bsock_getpeername(sock)
-    VALUE sock;
-{
-    char buf[1024];
-    socklen_t len = sizeof buf;
-    OpenFile *fptr;
-
-    GetOpenFile(sock, fptr);
-    if (getpeername(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
-	rb_sys_fail("getpeername(2)");
-    return rb_str_new(buf, len);
-}
-
-static VALUE
-bsock_send(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    VALUE mesg, to;
-    VALUE flags;
-    OpenFile *fptr;
-    FILE *f;
-    int fd, n;
-
-    rb_secure(4);
-    rb_scan_args(argc, argv, "21", &mesg, &flags, &to);
-
-    StringValue(mesg);
-    if (!NIL_P(to)) StringValue(to);
-    GetOpenFile(sock, fptr);
-    f = GetWriteFile(fptr);
-    fd = fileno(f);
-    rb_thread_fd_writable(fd);
-  retry:
-    if (!NIL_P(to)) {
-        TRAP_BEG;
-	n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
-		   (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
-        TRAP_END;
-    }
-    else {
-        TRAP_BEG;
-	n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
-        TRAP_END;
-    }
-    if (n < 0) {
-	if (rb_io_wait_writable(fd)) {
-	    goto retry;
-	}
-	rb_sys_fail("send(2)");
-    }
-    return INT2FIX(n);
-}
-
-static VALUE ipaddr _((struct sockaddr*));
-#ifdef HAVE_SYS_UN_H
-static VALUE unixaddr _((struct sockaddr_un*, socklen_t));
-#endif
-
-enum sock_recv_type {
-    RECV_RECV,			/* BasicSocket#recv(no from) */
-    RECV_IP,			/* IPSocket#recvfrom */
-    RECV_UNIX,			/* UNIXSocket#recvfrom */
-    RECV_SOCKET			/* Socket#recvfrom */
-};
-
-static VALUE
-s_recvfrom(sock, argc, argv, from)
-    VALUE sock;
-    int argc;
-    VALUE *argv;
-    enum sock_recv_type from;
-{
-    OpenFile *fptr;
-    VALUE str;
-    char buf[1024];
-    socklen_t alen = sizeof buf;
-    VALUE len, flg;
-    long buflen;
-    long slen;
-    int fd, flags;
-
-    rb_scan_args(argc, argv, "11", &len, &flg);
-
-    if (flg == Qnil) flags = 0;
-    else             flags = NUM2INT(flg);
-    buflen = NUM2INT(len);
-
-    GetOpenFile(sock, fptr);
-    if (rb_read_pending(fptr->f)) {
-	rb_raise(rb_eIOError, "recv for buffered IO");
-    }
-    fd = fileno(fptr->f);
-
-    str = rb_tainted_str_new(0, buflen);
-
-  retry:
-    rb_str_locktmp(str);
-    rb_thread_wait_fd(fd);
-    TRAP_BEG;
-    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
-    TRAP_END;
-    rb_str_unlocktmp(str);
-
-    if (slen < 0) {
-	if (rb_io_wait_readable(fd)) {
-	    goto retry;
-	}
-	rb_sys_fail("recvfrom(2)");
-    }
-    if (slen < RSTRING(str)->len) {
-	RSTRING(str)->len = slen;
-	RSTRING(str)->ptr[slen] = '\0';
-    }
-    rb_obj_taint(str);
-    switch (from) {
-      case RECV_RECV:
-	return (VALUE)str;
-      case RECV_IP:
-#if 0
-	if (alen != sizeof(struct sockaddr_in)) {
-	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
-	}
-#endif
-	if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
-	    return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
-	else
-	    return rb_assoc_new(str, Qnil);
-
-#ifdef HAVE_SYS_UN_H
-      case RECV_UNIX:
-        return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf, alen));
-#endif
-      case RECV_SOCKET:
-	return rb_assoc_new(str, rb_str_new(buf, alen));
-      default:
-	rb_bug("s_recvfrom called with bad value");
-    }
-}
-
-static VALUE
-s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
-{
-    OpenFile *fptr;
-    VALUE str;
-    char buf[1024];
-    socklen_t alen = sizeof buf;
-    VALUE len, flg;
-    long buflen;
-    long slen;
-    int fd, flags;
-    VALUE addr = Qnil;
-
-    rb_scan_args(argc, argv, "11", &len, &flg);
-
-    if (flg == Qnil) flags = 0;
-    else             flags = NUM2INT(flg);
-    buflen = NUM2INT(len);
-
-#ifdef MSG_DONTWAIT
-    /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
-       It is not portable, though. */
-    flags |= MSG_DONTWAIT;
-#endif
-
-    GetOpenFile(sock, fptr);
-    if (rb_read_pending(fptr->f)) {
-	rb_raise(rb_eIOError, "recvfrom for buffered IO");
-    }
-    fd = fileno(fptr->f);
-
-    str = rb_tainted_str_new(0, buflen);
-
-    rb_io_check_closed(fptr);
-    rb_io_set_nonblock(fptr);
-    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
-
-    if (slen < 0) {
-	rb_sys_fail("recvfrom(2)");
-    }
-    if (slen < RSTRING(str)->len) {
-	RSTRING(str)->len = slen;
-	RSTRING(str)->ptr[slen] = '\0';
-    }
-    rb_obj_taint(str);
-    switch (from) {
-      case RECV_RECV:
-	return str;
-
-      case RECV_IP:
-        if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
-            addr = ipaddr((struct sockaddr*)buf);
-        break;
-
-      case RECV_SOCKET:
-        addr = rb_str_new(buf, alen);
-        break;
-
-      default:
-        rb_bug("s_recvfrom_nonblock called with bad value");
-    }
-    return rb_assoc_new(str, addr);
-}
-
-static VALUE
-bsock_recv(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
+static void
+setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
 {
-    return s_recvfrom(sock, argc, argv, RECV_RECV);
+    *dv = rsock_family_arg(domain);
+    *tv = rsock_socktype_arg(type);
 }
 
 /*
  * call-seq:
- * 	basicsocket.recv_nonblock(maxlen) => mesg
- * 	basicsocket.recv_nonblock(maxlen, flags) => mesg
- * 
- * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * _flags_ is zero or more of the +MSG_+ options.
- * The result, _mesg_, is the data received.
+ *   Socket.new(domain, socktype [, protocol]) => socket
  *
- * When recvfrom(2) returns 0, Socket#recv_nonblock returns
- * an empty string as data.
- * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
- * 
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
- * === Example
- * 	serv = TCPServer.new("127.0.0.1", 0)
- * 	af, port, host, addr = serv.addr
- * 	c = TCPSocket.new(addr, port)
- * 	s = serv.accept
- * 	c.send "aaa", 0
- * 	IO.select([s])
- * 	p s.recv_nonblock(10) #=> "aaa"
+ * Creates a new socket object.
  *
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recv_nonblock_ fails. 
+ * _domain_ should be a communications domain such as: :INET, :INET6, :UNIX, etc.
  *
- * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EAGAIN.
+ * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
- * === See
- * * Socket#recvfrom
- */
-
-static VALUE
-bsock_recv_nonblock(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    return s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
-}
-
-static VALUE
-bsock_do_not_rev_lookup()
-{
-    return do_not_reverse_lookup?Qtrue:Qfalse;
-}
-
-static VALUE
-bsock_do_not_rev_lookup_set(self, val)
-    VALUE self, val;
-{
-    rb_secure(4);
-    do_not_reverse_lookup = RTEST(val);
-    return val;
-}
-
-static void
-make_ipaddr0(addr, buf, len)
-    struct sockaddr *addr;
-    char *buf;
-    size_t len;
-{
-    int error;
-
-    error = getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
-    if (error) {
-	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
-    }
-}
-
-static VALUE
-make_ipaddr(addr)
-    struct sockaddr *addr;
-{
-    char buf[1024];
-
-    make_ipaddr0(addr, buf, sizeof(buf));
-    return rb_str_new2(buf);
-}
-
-static void
-make_inetaddr(host, buf, len)
-    long host;
-    char *buf;
-    size_t len;
-{
-    struct sockaddr_in sin;
-
-    MEMZERO(&sin, struct sockaddr_in, 1);
-    sin.sin_family = AF_INET;
-    SET_SIN_LEN(&sin, sizeof(sin));
-    sin.sin_addr.s_addr = host;
-    make_ipaddr0((struct sockaddr*)&sin, buf, len);
-}
-
-static int
-str_isnumber(p)
-        const char *p;
-{
-    char *ep;
-
-    if (!p || *p == '\0')
-       return 0;
-    ep = NULL;
-    (void)strtoul(p, &ep, 10);
-    if (ep && *ep == '\0')
-       return 1;
-    else
-       return 0;
-}
-
-static char *
-host_str(host, hbuf, len)
-    VALUE host;
-    char *hbuf;
-    size_t len;
-{
-    if (NIL_P(host)) {
-	return NULL;
-    }
-    else if (rb_obj_is_kind_of(host, rb_cInteger)) {
-	long i = NUM2LONG(host);
-
-	make_inetaddr(htonl(i), hbuf, len);
-	return hbuf;
-    }
-    else {
-	char *name;
-
-	SafeStringValue(host);
-	name = RSTRING(host)->ptr;
-	if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
-	    make_inetaddr(INADDR_ANY, hbuf, len);
-	}
-	else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
-	    make_inetaddr(INADDR_BROADCAST, hbuf, len);
-	}
-	else if (strlen(name) >= len) {
-	    rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name));
-	}
-	else {
-	    strcpy(hbuf, name);
-	}
-	return hbuf;
-    }
-}
-
-static char *
-port_str(port, pbuf, len)
-    VALUE port;
-    char *pbuf;
-    size_t len;
-{
-    if (NIL_P(port)) {
-	return 0;
-    }
-    else if (FIXNUM_P(port)) {
-	snprintf(pbuf, len, "%ld", FIX2LONG(port));
-	return pbuf;
-    }
-    else {
-	char *serv;
-
-	SafeStringValue(port);
-	serv = RSTRING(port)->ptr;
-	if (strlen(serv) >= len) {
-	    rb_raise(rb_eArgError, "service name too long (%d)", strlen(serv));
-	}
-	strcpy(pbuf, serv);
-	return pbuf;
-    }
-}
-
-#ifndef NI_MAXHOST
-# define 1025
-#endif
-#ifndef NI_MAXSERV
-# define 32
-#endif
-
-static struct addrinfo*
-sock_addrinfo(host, port, socktype, flags)
-    VALUE host, port;
-    int socktype, flags;
-{
-    struct addrinfo hints;
-    struct addrinfo* res = NULL;
-    char *hostp, *portp;
-    int error;
-    char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
-
-    hostp = host_str(host, hbuf, sizeof(hbuf));
-    portp = port_str(port, pbuf, sizeof(pbuf));
-
-    if (socktype == 0 && flags == 0 && str_isnumber(portp)) {
-       socktype = SOCK_DGRAM;
-    }
-
-    MEMZERO(&hints, struct addrinfo, 1);
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = socktype;
-    hints.ai_flags = flags;
-    error = getaddrinfo(hostp, portp, &hints, &res);
-    if (error) {
-	if (hostp && hostp[strlen(hostp)-1] == '\n') {
-	    rb_raise(rb_eSocket, "newline at the end of hostname");
-	}
-	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
-    }
-
-#if defined(__APPLE__) && defined(__MACH__)
-    {
-        struct addrinfo *r;
-       r = res;
-       while (r) {
-            if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
-            if (! r->ai_protocol) {
-                if (r->ai_socktype == SOCK_DGRAM) {
-                    r->ai_protocol = IPPROTO_UDP;
-                } else if (r->ai_socktype == SOCK_STREAM) {
-                    r->ai_protocol = IPPROTO_TCP;
-                }
-            }
-            r = r->ai_next;
-        }
-    }
-#endif
-    return res;
-}
-
-static VALUE
-ipaddr(sockaddr)
-    struct sockaddr *sockaddr;
-{
-    VALUE family, port, addr1, addr2;
-    VALUE ary;
-    int error;
-    char hbuf[1024], pbuf[1024];
-
-    switch (sockaddr->sa_family) {
-    case AF_UNSPEC:
-	family = rb_str_new2("AF_UNSPEC");
-	break;
-    case AF_INET:
-	family = rb_str_new2("AF_INET");
-	break;
-#ifdef INET6
-    case AF_INET6:
-	family = rb_str_new2("AF_INET6");
-	break;
-#endif
-#ifdef AF_LOCAL
-    case AF_LOCAL:
-	family = rb_str_new2("AF_LOCAL");
-	break;
-#elif  AF_UNIX
-    case AF_UNIX:
-	family = rb_str_new2("AF_UNIX");
-	break;
-#endif
-    default:
-        sprintf(pbuf, "unknown:%d", sockaddr->sa_family);
-	family = rb_str_new2(pbuf);
-	break;
-    }
-    addr1 = Qnil;
-    if (!do_not_reverse_lookup) {
-	error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
-			    NULL, 0, 0);
-	if (! error) {
-	    addr1 = rb_str_new2(hbuf);
-	}
-    }
-    error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
-			pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
-    if (error) {
-	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
-    }
-    addr2 = rb_str_new2(hbuf);
-    if (addr1 == Qnil) {
-	addr1 = addr2;
-    }
-    port = INT2FIX(atoi(pbuf));
-    ary = rb_ary_new3(4, family, port, addr1, addr2);
-
-    return ary;
-}
-
-static int
-ruby_socket(domain, type, proto)
-    int domain, type, proto;
-{
-    int fd;
-
-    fd = socket(domain, type, proto);
-    if (fd < 0) {
-	if (errno == EMFILE || errno == ENFILE) {
-	    rb_gc();
-	    fd = socket(domain, type, proto);
-	}
-    }
-    return fd;
-}
-
-static int
-wait_connectable(fd)
-    int fd;
-{
-    int sockerr;
-    socklen_t sockerrlen;
-    fd_set fds_w;
-    fd_set fds_e;
-
-    for (;;) {
-	FD_ZERO(&fds_w);
-	FD_ZERO(&fds_e);
-
-	FD_SET(fd, &fds_w);
-	FD_SET(fd, &fds_e);
-
-	rb_thread_select(fd+1, 0, &fds_w, &fds_e, 0);
-
-	if (FD_ISSET(fd, &fds_w)) {
-	    return 0;
-	}
-	else if (FD_ISSET(fd, &fds_e)) {
-	    sockerrlen = sizeof(sockerr);
-	    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
-			   &sockerrlen) == 0) {
-		if (sockerr == 0)
-		    continue;	/* workaround for winsock */
-		errno = sockerr;
-	    }
-	    return -1;
-	}
-    }
-
-    return 0;
-}
-
-#ifdef __CYGWIN__
-#define WAIT_IN_PROGRESS 10
-#endif
-#ifdef __APPLE__
-#define WAIT_IN_PROGRESS 10
-#endif
-#ifdef __linux__
-/* returns correct error */
-#define WAIT_IN_PROGRESS 0
-#endif
-#ifndef WAIT_IN_PROGRESS
-/* BSD origin code apparently has a problem */
-#define WAIT_IN_PROGRESS 1
-#endif
-
-static int
-ruby_connect(fd, sockaddr, len, socks)
-    int fd;
-    struct sockaddr *sockaddr;
-    int len;
-    int socks;
-{
-    int status;
-    int mode;
-#if WAIT_IN_PROGRESS > 0
-    int wait_in_progress = -1;
-    int sockerr;
-    socklen_t sockerrlen;
-#endif
-
-#if defined(HAVE_FCNTL)
-# if defined(F_GETFL)
-    mode = fcntl(fd, F_GETFL, 0);
-# else
-    mode = 0;
-# endif
-
-#ifdef O_NDELAY
-# define NONBLOCKING O_NDELAY
-#else
-#ifdef O_NBIO
-# define NONBLOCKING O_NBIO
-#else
-# define NONBLOCKING O_NONBLOCK
-#endif
-#endif
-#ifdef SOCKS5
-    if (!socks)
-#endif
-    fcntl(fd, F_SETFL, mode|NONBLOCKING);
-#endif /* HAVE_FCNTL */
-
-    for (;;) {
-#if defined(SOCKS) && !defined(SOCKS5)
-	if (socks) {
-	    status = Rconnect(fd, sockaddr, len);
-	}
-	else
-#endif
-	{
-	    status = connect(fd, sockaddr, len);
-	}
-	if (status < 0) {
-	    switch (errno) {
-	      case EAGAIN:
-#ifdef EINPROGRESS
-	      case EINPROGRESS:
-#endif
-#if WAIT_IN_PROGRESS > 0
-		sockerrlen = sizeof(sockerr);
-		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
-		if (status) break;
-		if (sockerr) {
-		    status = -1;
-		    errno = sockerr;
-		    break;
-		}
-#endif
-#ifdef EALREADY
-	      case EALREADY:
-#endif
-#if WAIT_IN_PROGRESS > 0
-		wait_in_progress = WAIT_IN_PROGRESS;
-#endif
-		status = wait_connectable(fd);
-		if (status) {
-		    break;
-		}
-		errno = 0;
-		continue;
-
-#if WAIT_IN_PROGRESS > 0
-	      case EINVAL:
-		if (wait_in_progress-- > 0) {
-		    /*
-		     * connect() after EINPROGRESS returns EINVAL on
-		     * some platforms, need to check true error
-		     * status.
-		     */
-		    sockerrlen = sizeof(sockerr);
-		    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
-		    if (!status && !sockerr) {
-			struct timeval tv = {0, 100000};
-			rb_thread_wait_for(tv);
-			continue;
-		    }
-		    status = -1;
-		    errno = sockerr;
-		}
-		break;
-#endif
-
-#ifdef EISCONN
-	      case EISCONN:
-		status = 0;
-		errno = 0;
-		break;
-#endif
-	      default:
-		break;
-	    }
-	}
-#ifdef HAVE_FCNTL
-	fcntl(fd, F_SETFL, mode);
-#endif
-	return status;
-    }
-}
-
-struct inetsock_arg
-{
-    VALUE sock;
-    struct {
-	VALUE host, serv;
-	struct addrinfo *res;
-    } remote, local;
-    int type;
-    int fd;
-};
-
-static VALUE
-inetsock_cleanup(arg)
-    struct inetsock_arg *arg;
-{
-    if (arg->remote.res) {
-	freeaddrinfo(arg->remote.res);
-	arg->remote.res = 0;
-    }
-    if (arg->local.res) {
-	freeaddrinfo(arg->local.res);
-	arg->local.res = 0;
-    }
-    if (arg->fd >= 0) {
-	close(arg->fd);
-    }
-    return Qnil;
-}
-
-static VALUE
-init_inetsock_internal(arg)
-    struct inetsock_arg *arg;
-{
-    int type = arg->type;
-    struct addrinfo *res;
-    int fd, status = 0;
-    char *syscall;
-
-    arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
-				    (type == INET_SERVER) ? AI_PASSIVE : 0);
-    /*
-     * Maybe also accept a local address
-     */
-
-    if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
-	arg->local.res = sock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
-    }
-
-    arg->fd = fd = -1;
-    for (res = arg->remote.res; res; res = res->ai_next) {
-	status = ruby_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
-	syscall = "socket(2)";
-	fd = status;
-	if (fd < 0) {
-	    continue;
-	}
-	arg->fd = fd;
-	if (type == INET_SERVER) {
-#if !defined(_WIN32) && !defined(__CYGWIN__)
-	    status = 1;
-	    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-		       (char*)&status, sizeof(status));
-#endif
-	    status = bind(fd, res->ai_addr, res->ai_addrlen);
-	    syscall = "bind(2)";
-	}
-	else {
-	    if (arg->local.res) {
-		status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
-		syscall = "bind(2)";
-	    }
-
-	    if (status >= 0) {
-		status = ruby_connect(fd, res->ai_addr, res->ai_addrlen,
-				      (type == INET_SOCKS));
-		syscall = "connect(2)";
-	    }
-	}
-
-	if (status < 0) {
-	    close(fd);
-	    arg->fd = fd = -1;
-	    continue;
-	} else
-	    break;
-    }
-    if (status < 0) {
-	rb_sys_fail(syscall);
-    }
-
-    arg->fd = -1;
-
-    if (type == INET_SERVER)
-	listen(fd, 5);
-
-    /* create new instance */
-    return init_sock(arg->sock, fd);
-}
-
-static VALUE
-init_inetsock(sock, remote_host, remote_serv, local_host, local_serv, type)
-    VALUE sock, remote_host, remote_serv, local_host, local_serv;
-    int type;
-{
-    struct inetsock_arg arg;
-    arg.sock = sock;
-    arg.remote.host = remote_host;
-    arg.remote.serv = remote_serv;
-    arg.remote.res = 0;
-    arg.local.host = local_host;
-    arg.local.serv = local_serv;
-    arg.local.res = 0;
-    arg.type = type;
-    arg.fd = -1;
-    return rb_ensure(init_inetsock_internal, (VALUE)&arg,
-		     inetsock_cleanup, (VALUE)&arg);
-}
-
-/*
- * call-seq:
- *    TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil)
+ * _protocol_ should be a protocol defined in the domain.
+ * This is optional.
+ * If it is not given, 0 is used internally.
  *
- * Opens a TCP connection to +remote_host+ on +remote_port+.  If +local_host+
- * and +local_port+ are specified, then those parameters are used on the local
- * end to establish the connection.
+ *   Socket.new(:INET, :STREAM) # TCP socket
+ *   Socket.new(:INET, :DGRAM)  # UDP socket
+ *   Socket.new(:UNIX, :STREAM) # UNIX stream socket
+ *   Socket.new(:UNIX, :DGRAM)  # UNIX datagram socket
  */
 static VALUE
-tcp_init(argc, argv, sock)
-     int argc;
-     VALUE *argv;
-     VALUE sock;
-{
-    VALUE remote_host, remote_serv;
-    VALUE local_host, local_serv;
-
-    rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
-			&local_host, &local_serv);
-
-    return init_inetsock(sock, remote_host, remote_serv,
-			local_host, local_serv, INET_CLIENT);
-}
-
-#ifdef SOCKS
-static VALUE
-socks_init(sock, host, serv)
-    VALUE sock, host, serv;
+sock_initialize(int argc, VALUE *argv, VALUE sock)
 {
-    static init = 0;
-
-    if (init == 0) {
-	SOCKSinit("ruby");
-	init = 1;
-    }
-
-    return init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
-}
-
-#ifdef SOCKS5
-static VALUE
-socks_s_close(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
-    }
-    GetOpenFile(sock, fptr);
-    shutdown(fileno(fptr->f), 2);
-    shutdown(fileno(fptr->f2), 2);
-    return rb_io_close(sock);
-}
-#endif
-#endif
-
-struct hostent_arg {
-    VALUE host;
-    struct addrinfo* addr;
-    VALUE (*ipaddr)_((struct sockaddr*, size_t));
-};
-
-static VALUE
-make_hostent_internal(arg)
-    struct hostent_arg *arg;
-{
-    VALUE host = arg->host;
-    struct addrinfo* addr = arg->addr;
-    VALUE (*ipaddr)_((struct sockaddr*, size_t)) = arg->ipaddr;
-
-    struct addrinfo *ai;
-    struct hostent *h;
-    VALUE ary, names;
-    char **pch;
-    const char* hostp;
-    char hbuf[NI_MAXHOST];
-
-    ary = rb_ary_new();
-    if (addr->ai_canonname) {
-	hostp = addr->ai_canonname;
-    }
-    else {
-	hostp = host_str(host, hbuf, sizeof(hbuf));
-    }
-    rb_ary_push(ary, rb_str_new2(hostp));
-
-    if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
-	names = rb_ary_new();
-	if (h->h_aliases != NULL) {
-	    for (pch = h->h_aliases; *pch; pch++) {
-		rb_ary_push(names, rb_str_new2(*pch));
-	    }
-	}
-    }
-    else {
-	names = rb_ary_new2(0);
-    }
-    rb_ary_push(ary, names);
-    rb_ary_push(ary, INT2NUM(addr->ai_family));
-    for (ai = addr; ai; ai = ai->ai_next) {
-      /* Pushing all addresses regardless of address family is not the
-       * behaviour expected of gethostbyname(). All the addresses in struct
-       * hostent->h_addr_list must be of the same family.
-       */
-       if(ai->ai_family == addr->ai_family) {
-	   rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
-       }
-    }
-
-    return ary;
-}
-
-static VALUE
-make_hostent(host, addr, ipaddr)
-    VALUE host;
-    struct addrinfo* addr;
-    VALUE (*ipaddr)_((struct sockaddr*, size_t));
-{
-    struct hostent_arg arg;
-
-    arg.host = host;
-    arg.addr = addr;
-    arg.ipaddr = ipaddr;
-    return rb_ensure(make_hostent_internal, (VALUE)&arg,
-		     RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr);
-}
-
-VALUE
-tcp_sockaddr(addr, len)
-    struct sockaddr *addr;
-    size_t len;
-{
-    return make_ipaddr(addr);
-}
-
-static VALUE
-tcp_s_gethostbyname(obj, host)
-    VALUE obj, host;
-{
-    rb_secure(3);
-    return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
-}
-
-static VALUE
-tcp_svr_init(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    VALUE arg1, arg2;
-
-    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2)
-	return init_inetsock(sock, arg1, arg2, Qnil, Qnil, INET_SERVER);
-    else
-	return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
-}
-
-static void
-make_fd_nonblock(int fd)
-{
-    int flags;
-#ifdef F_GETFL
-    flags = fcntl(fd, F_GETFL);
-    if (flags == -1) {
-        rb_sys_fail(0);
-    }
-#else
-    flags = 0;
-#endif
-    flags |= O_NONBLOCK;
-    if (fcntl(fd, F_SETFL, flags) == -1) {
-        rb_sys_fail(0);
-    }
-}
-
-static VALUE
-s_accept_nonblock(VALUE klass, OpenFile *fptr, struct sockaddr *sockaddr, socklen_t *len)
-{
-    int fd2;
-
-    rb_secure(3);
-    rb_io_set_nonblock(fptr);
-    fd2 = accept(fileno(fptr->f), (struct sockaddr*)sockaddr, len);
-    if (fd2 < 0) {
-        rb_sys_fail("accept(2)");
-    }
-    make_fd_nonblock(fd2);
-    return init_sock(rb_obj_alloc(klass), fd2);
-}
-
-static VALUE
-s_accept(klass, fd, sockaddr, len)
-    VALUE klass;
-    int fd;
-    struct sockaddr *sockaddr;
-    socklen_t *len;
-{
-    int fd2;
-    int retry = 0;
-
-    rb_secure(3);
-  retry:
-    rb_thread_wait_fd(fd);
-#if defined(_nec_ews)
-    fd2 = accept(fd, sockaddr, len);
-#else
-    TRAP_BEG;
-    fd2 = accept(fd, sockaddr, len);
-    TRAP_END;
-#endif
-    if (fd2 < 0) {
-	switch (errno) {
-	  case EMFILE:
-	  case ENFILE:
-	    if (retry) break;
-	    rb_gc();
-	    retry = 1;
-	    goto retry;
-	  case EWOULDBLOCK:
-	    break;
-	  default:
-	    if (!rb_io_wait_readable(fd)) break;
-	    retry = 0;
-	    goto retry;
-	}
-	rb_sys_fail(0);
-    }
-    if (!klass) return INT2NUM(fd2);
-    return init_sock(rb_obj_alloc(klass), fd2);
-}
-
-static VALUE
-tcp_accept(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_storage from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(from);
-    return s_accept(rb_cTCPSocket, fileno(fptr->f),
-		    (struct sockaddr*)&from, &fromlen);
-}
-
-/*
- * call-seq:
- * 	tcpserver.accept_nonblock => tcpsocket
- * 
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted TCPSocket for the incoming connection.
- * 
- * === Example
- * 	require 'socket'
- * 	serv = TCPServer.new(2202)
- * 	begin
- * 	  sock = serv.accept_nonblock
- * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
- * 	  IO.select([serv])
- * 	  retry
- * 	end
- * 	# sock is an accepted socket.
- * 
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to TCPServer#accept_nonblock fails. 
- *
- * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EAGAIN.
- * 
- * === See
- * * TCPServer#accept
- * * Socket#accept
- */
-static VALUE
-tcp_accept_nonblock(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_storage from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(from);
-    return s_accept_nonblock(rb_cTCPSocket, fptr,
-                             (struct sockaddr *)&from, &fromlen);
-}
-
-static VALUE
-tcp_sysaccept(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_storage from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(from);
-    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
-}
-
-#ifdef HAVE_SYS_UN_H
-struct unixsock_arg {
-    struct sockaddr_un *sockaddr;
+    VALUE domain, type, protocol;
     int fd;
-};
-
-static VALUE
-unixsock_connect_internal(arg)
-    struct unixsock_arg *arg;
-{
-    return (VALUE)ruby_connect(arg->fd, arg->sockaddr, sizeof(*arg->sockaddr),
-			       0);
-}
-
-static VALUE
-init_unixsock(sock, path, server)
-    VALUE sock;
-    VALUE path;
-    int server;
-{
-    struct sockaddr_un sockaddr;
-    int fd, status;
-    OpenFile *fptr;
-
-    SafeStringValue(path);
-    fd = ruby_socket(AF_UNIX, SOCK_STREAM, 0);
-    if (fd < 0) {
-	rb_sys_fail("socket(2)");
-    }
-
-    MEMZERO(&sockaddr, struct sockaddr_un, 1);
-    sockaddr.sun_family = AF_UNIX;
-    if (sizeof(sockaddr.sun_path) <= RSTRING(path)->len) {
-        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
-            (int)sizeof(sockaddr.sun_path)-1);
-    }
-    strcpy(sockaddr.sun_path, StringValueCStr(path));
-
-    if (server) {
-        status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
-    }
-    else {
-	int prot;
-	struct unixsock_arg arg;
-	arg.sockaddr = &sockaddr;
-	arg.fd = fd;
-        status = rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
-	if (prot) {
-	    close(fd);
-	    rb_jump_tag(prot);
-	}
-    }
-
-    if (status < 0) {
-	close(fd);
-	rb_sys_fail(sockaddr.sun_path);
-    }
-
-    if (server) listen(fd, 5);
-
-    init_sock(sock, fd);
-    GetOpenFile(sock, fptr);
-    if (server) {
-        fptr->path = strdup(RSTRING(path)->ptr);
-    }
-
-    return sock;
-}
-#endif
-
-static VALUE
-ip_addr(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_storage addr;
-    socklen_t len = sizeof addr;
-
-    GetOpenFile(sock, fptr);
-
-    if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
-	rb_sys_fail("getsockname(2)");
-    return ipaddr((struct sockaddr*)&addr);
-}
-
-static VALUE
-ip_peeraddr(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_storage addr;
-    socklen_t len = sizeof addr;
-
-    GetOpenFile(sock, fptr);
-
-    if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
-	rb_sys_fail("getpeername(2)");
-    return ipaddr((struct sockaddr*)&addr);
-}
-
-static VALUE
-ip_recvfrom(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    return s_recvfrom(sock, argc, argv, RECV_IP);
-}
-
-static VALUE
-ip_s_getaddress(obj, host)
-    VALUE obj, host;
-{
-    struct sockaddr_storage addr;
-    struct addrinfo *res = sock_addrinfo(host, Qnil, SOCK_STREAM, 0);
-
-    /* just take the first one */
-    memcpy(&addr, res->ai_addr, res->ai_addrlen);
-    freeaddrinfo(res);
-
-    return make_ipaddr((struct sockaddr*)&addr);
-}
+    int d, t;
 
-static VALUE
-udp_init(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    VALUE arg;
-    int socktype = AF_INET;
-    int fd;
+    rb_scan_args(argc, argv, "21", &domain, &type, &protocol);
+    if (NIL_P(protocol))
+        protocol = INT2FIX(0);
 
     rb_secure(3);
-    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
-	socktype = NUM2INT(arg);
-    }
-    fd = ruby_socket(socktype, SOCK_DGRAM, 0);
-    if (fd < 0) {
-	rb_sys_fail("socket(2) - udp");
-    }
-
-    return init_sock(sock, fd);
-}
-
-struct udp_arg
-{
-    struct addrinfo *res;
-    int fd;
-};
-
-static VALUE
-udp_connect_internal(arg)
-    struct udp_arg *arg;
-{
-    int fd = arg->fd;
-    struct addrinfo *res;
+    setup_domain_and_type(domain, &d, type, &t);
+    fd = rsock_socket(d, t, NUM2INT(protocol));
+    if (fd < 0) rb_sys_fail("socket(2)");
 
-    for (res = arg->res; res; res = res->ai_next) {
-	if (ruby_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
-	    return Qtrue;
-	}
-    }
-    return Qfalse;
+    return rsock_init_sock(sock, fd);
 }
 
+#if defined HAVE_SOCKETPAIR
 static VALUE
-udp_connect(sock, host, port)
-    VALUE sock, host, port;
+io_call_close(VALUE io)
 {
-    OpenFile *fptr;
-    struct udp_arg arg;
-    VALUE ret;
-
-    rb_secure(3);
-    arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
-    GetOpenFile(sock, fptr);
-    arg.fd = fileno(fptr->f);
-    ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
-		    RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
-    if (!ret) rb_sys_fail("connect(2)");
-    return INT2FIX(0);
+    return rb_funcall(io, rb_intern("close"), 0, 0);
 }
 
 static VALUE
-udp_bind(sock, host, port)
-    VALUE sock, host, port;
+io_close(VALUE io)
 {
-    OpenFile *fptr;
-    struct addrinfo *res0, *res;
-
-    rb_secure(3);
-    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
-    GetOpenFile(sock, fptr);
-    for (res = res0; res; res = res->ai_next) {
-	if (bind(fileno(fptr->f), res->ai_addr, res->ai_addrlen) < 0) {
-	    continue;
-	}
-	freeaddrinfo(res0);
-	return INT2FIX(0);
-    }
-    freeaddrinfo(res0);
-    rb_sys_fail("bind(2)");
-    return INT2FIX(0);
+    return rb_rescue(io_call_close, io, 0, 0);
 }
 
 static VALUE
-udp_send(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
+pair_yield(VALUE pair)
 {
-    VALUE mesg, flags, host, port;
-    OpenFile *fptr;
-    FILE *f;
-    int n;
-    struct addrinfo *res0, *res;
-
-    if (argc == 2 || argc == 3) {
-	return bsock_send(argc, argv, sock);
-    }
-    rb_secure(4);
-    rb_scan_args(argc, argv, "4", &mesg, &flags, &host, &port);
-
-    StringValue(mesg);
-    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
-    GetOpenFile(sock, fptr);
-    f = GetWriteFile(fptr);
-    for (res = res0; res; res = res->ai_next) {
-      retry:
-	n = sendto(fileno(f), RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
-		   res->ai_addr, res->ai_addrlen);
-	if (n >= 0) {
-	    freeaddrinfo(res0);
-	    return INT2FIX(n);
-	}
-	if (rb_io_wait_writable(fileno(f))) {
-	    goto retry;
-	}
-    }
-    freeaddrinfo(res0);
-    rb_sys_fail("sendto(2)");
-    return INT2FIX(n);
+    return rb_ensure(rb_yield, pair, io_close, rb_ary_entry(pair, 1));
 }
+#endif
 
+#if defined HAVE_SOCKETPAIR
 /*
  * call-seq:
- * 	udpsocket.recvfrom_nonblock(maxlen) => [mesg, sender_inet_addr]
- * 	udpsocket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_inet_addr]
- * 
- * Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * _flags_ is zero or more of the +MSG_+ options.
- * The first element of the results, _mesg_, is the data received.
- * The second element, _sender_inet_addr_, is an array to represent the sender address.
+ *   Socket.pair(domain, type, protocol)       => [socket1, socket2]
+ *   Socket.socketpair(domain, type, protocol) => [socket1, socket2]
  *
- * When recvfrom(2) returns 0,
- * Socket#recvfrom_nonblock returns an empty string as data.
- * It means an empty packet.
- * 
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
- * === Example
- * 	require 'socket'
- * 	s1 = UDPSocket.new
- * 	s1.bind("127.0.0.1", 0)
- * 	s2 = UDPSocket.new
- * 	s2.bind("127.0.0.1", 0)
- * 	s2.connect(*s1.addr.values_at(3,1))
- * 	s1.connect(*s2.addr.values_at(3,1))
- * 	s1.send "aaa", 0
- * 	IO.select([s2])
- * 	p s2.recvfrom_nonblock(10)  #=> ["aaa", ["AF_INET", 33302, "localhost.localdomain", "127.0.0.1"]]
+ * Creates a pair of sockets connected each other.
  *
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recvfrom_nonblock_ fails. 
+ * _domain_ should be a communications domain such as: :INET, :INET6, :UNIX, etc.
  *
- * UDPSocket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EAGAIN.
+ * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
- * === See
- * * Socket#recvfrom
- */
-static VALUE
-udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
-{
-    return s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
-}
-
-#ifdef HAVE_SYS_UN_H
-static VALUE
-unix_init(sock, path)
-    VALUE sock, path;
-{
-    return init_unixsock(sock, path, 0);
-}
-
-static char *
-unixpath(struct sockaddr_un *sockaddr, socklen_t len)
-{
-    if (sockaddr->sun_path < (char*)sockaddr + len)
-        return sockaddr->sun_path;
-    else
-        return "";
-}
-
-static VALUE
-unix_path(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-
-    GetOpenFile(sock, fptr);
-    if (fptr->path == 0) {
-	struct sockaddr_un addr;
-	socklen_t len = sizeof(addr);
-	if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
-	    rb_sys_fail(0);
-	fptr->path = strdup(unixpath(&addr, len));
-    }
-    return rb_str_new2(fptr->path);
-}
-
-static VALUE
-unix_svr_init(sock, path)
-    VALUE sock, path;
-{
-    return init_unixsock(sock, path, 1);
-}
-
-static VALUE
-unix_recvfrom(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    return s_recvfrom(sock, argc, argv, RECV_UNIX);
-}
-
-#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
-#define FD_PASSING_BY_MSG_CONTROL 1
-#else
-#define FD_PASSING_BY_MSG_CONTROL 0
-#endif
-
-#if defined(HAVE_ST_MSG_ACCRIGHTS)
-#define FD_PASSING_BY_MSG_ACCRIGHTS 1
-#else
-#define FD_PASSING_BY_MSG_ACCRIGHTS 0
-#endif
-
-static VALUE
-unix_send_io(sock, val)
-    VALUE sock, val;
-{
-#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
-    int fd;
-    OpenFile *fptr;
-    struct msghdr msg;
-    struct iovec vec[1];
-    char buf[1];
-
-#if FD_PASSING_BY_MSG_CONTROL
-    struct {
-	struct cmsghdr hdr;
-	int fd;
-    } cmsg;
-#endif
-
-    if (rb_obj_is_kind_of(val, rb_cIO)) {
-        OpenFile *valfptr;
-	GetOpenFile(val, valfptr);
-	fd = fileno(valfptr->f);
-    }
-    else if (FIXNUM_P(val)) {
-        fd = FIX2INT(val);
-    }
-    else {
-	rb_raise(rb_eTypeError, "neither IO nor file descriptor");
-    }
-
-    GetOpenFile(sock, fptr);
-
-    msg.msg_name = NULL;
-    msg.msg_namelen = 0;
-
-    /* Linux and Solaris doesn't work if msg_iov is NULL. */
-    buf[0] = '\0';
-    vec[0].iov_base = buf;
-    vec[0].iov_len = 1;
-    msg.msg_iov = vec;
-    msg.msg_iovlen = 1;
-
-#if FD_PASSING_BY_MSG_CONTROL
-    msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = CMSG_SPACE(sizeof(int));
-    msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
-    cmsg.hdr.cmsg_level = SOL_SOCKET;
-    cmsg.hdr.cmsg_type = SCM_RIGHTS;
-    cmsg.fd = fd;
-#else
-    msg.msg_accrights = (caddr_t)&fd;
-    msg.msg_accrightslen = sizeof(fd);
-#endif
-
-    if (sendmsg(fileno(fptr->f), &msg, 0) == -1)
-	rb_sys_fail("sendmsg(2)");
-
-    return Qnil;
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
-}
-
-#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
-static void
-thread_read_select(fd)
-    int fd;
-{
-    fd_set fds;
-
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
-    rb_thread_select(fd+1, &fds, 0, 0, 0);
-}
-#endif
-
-static VALUE
-unix_recv_io(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
-    VALUE klass, mode;
-    OpenFile *fptr;
-    struct msghdr msg;
-    struct iovec vec[2];
-    char buf[1];
-
-    int fd;
-#if FD_PASSING_BY_MSG_CONTROL
-    struct {
-	struct cmsghdr hdr;
-	int fd;
-    } cmsg;
-#endif
-
-    rb_scan_args(argc, argv, "02", &klass, &mode);
-    if (argc == 0)
-	klass = rb_cIO;
-    if (argc <= 1)
-	mode = Qnil;
-
-    GetOpenFile(sock, fptr);
-
-    thread_read_select(fileno(fptr->f));
-
-    msg.msg_name = NULL;
-    msg.msg_namelen = 0;
-
-    vec[0].iov_base = buf;
-    vec[0].iov_len = sizeof(buf);
-    msg.msg_iov = vec;
-    msg.msg_iovlen = 1;
-
-#if FD_PASSING_BY_MSG_CONTROL
-    msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = CMSG_SPACE(sizeof(int));
-    msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
-    cmsg.hdr.cmsg_level = SOL_SOCKET;
-    cmsg.hdr.cmsg_type = SCM_RIGHTS;
-    cmsg.fd = -1;
-#else
-    msg.msg_accrights = (caddr_t)&fd;
-    msg.msg_accrightslen = sizeof(fd);
-    fd = -1;
-#endif
-
-    if (recvmsg(fileno(fptr->f), &msg, 0) == -1)
-	rb_sys_fail("recvmsg(2)");
-
-#if FD_PASSING_BY_MSG_CONTROL
-    if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (msg_controllen : %d != %d)",
-          msg.msg_controllen, CMSG_SPACE(sizeof(int)));
-    }
-    if (cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_len : %d != %d)",
-          cmsg.hdr.cmsg_len, CMSG_SPACE(0) + sizeof(int));
-    }
-    if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_level : %d != %d)",
-          cmsg.hdr.cmsg_level, SOL_SOCKET);
-    }
-    if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_type : %d != %d)",
-          cmsg.hdr.cmsg_type, SCM_RIGHTS);
-    }
-#else
-    if (msg.msg_accrightslen != sizeof(fd)) {
-	rb_raise(rb_eSocket,
-            "file descriptor was not passed (accrightslen) : %d != %d",
-            msg.msg_accrightslen, sizeof(fd));
-    }
-#endif
-
-#if FD_PASSING_BY_MSG_CONTROL
-    fd = cmsg.fd;
-#endif
-
-    if (klass == Qnil)
-	return INT2FIX(fd);
-    else {
-	static ID for_fd = 0;
-	int ff_argc;
-	VALUE ff_argv[2];
-	if (!for_fd)
-	    for_fd = rb_intern("for_fd");
-	ff_argc = mode == Qnil ? 1 : 2;
-	ff_argv[0] = INT2FIX(fd);
-	ff_argv[1] = mode;
-        return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
-    }
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
-}
-
-static VALUE
-unix_accept(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_un from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(struct sockaddr_un);
-    return s_accept(rb_cUNIXSocket, fileno(fptr->f),
-		    (struct sockaddr*)&from, &fromlen);
-}
-
-/*
- * call-seq:
- * 	unixserver.accept_nonblock => unixsocket
- * 
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted UNIXSocket for the incoming connection.
- * 
- * === Example
- * 	require 'socket'
- * 	serv = UNIXServer.new("/tmp/sock")
- * 	begin
- * 	  sock = serv.accept_nonblock
- * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
- * 	  IO.select([serv])
- * 	  retry
- * 	end
- * 	# sock is an accepted socket.
- * 
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to UNIXServer#accept_nonblock fails. 
+ * _protocol_ should be a protocol defined in the domain.
+ * 0 is default protocol for the domain.
+ *
+ *   s1, s2 = Socket.pair(:UNIX, :DGRAM, 0)
+ *   s1.send "a", 0
+ *   s1.send "b", 0
+ *   p s2.recv(10) #=> "a"
+ *   p s2.recv(10) #=> "b"
  *
- * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EAGAIN.
- * 
- * === See
- * * UNIXServer#accept
- * * Socket#accept
  */
-static VALUE
-unix_accept_nonblock(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_un from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(from);
-    return s_accept_nonblock(rb_cUNIXSocket, fptr,
-                             (struct sockaddr *)&from, &fromlen);
-}
-
-static VALUE
-unix_sysaccept(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_un from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(struct sockaddr_un);
-    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
-}
-
-static VALUE
-unixaddr(sockaddr, len)
-    struct sockaddr_un *sockaddr;
-    socklen_t len;
-{
-    return rb_assoc_new(rb_str_new2("AF_UNIX"),
-                        rb_str_new2(unixpath(sockaddr, len)));
-}
-
-static VALUE
-unix_addr(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_un addr;
-    socklen_t len = sizeof addr;
-
-    GetOpenFile(sock, fptr);
-
-    if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
-	rb_sys_fail("getsockname(2)");
-    return unixaddr(&addr, len);
-}
-
-static VALUE
-unix_peeraddr(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_un addr;
-    socklen_t len = sizeof addr;
-
-    GetOpenFile(sock, fptr);
-
-    if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
-	rb_sys_fail("getpeername(2)");
-    return unixaddr(&addr, len);
-}
-#endif
-
-static void
-setup_domain_and_type(domain, dv, type, tv)
-    VALUE domain, type;
-    int *dv, *tv;
-{
-    VALUE tmp;
-    char *ptr;
-
-    tmp = rb_check_string_type(domain);
-    if (!NIL_P(tmp)) {
-	domain = tmp;
-	rb_check_safe_obj(domain);
-	ptr = RSTRING(domain)->ptr;
-	if (strcmp(ptr, "AF_INET") == 0)
-	    *dv = AF_INET;
-#ifdef AF_UNIX
-	else if (strcmp(ptr, "AF_UNIX") == 0)
-	    *dv = AF_UNIX;
-#endif
-#ifdef AF_ISO
-	else if (strcmp(ptr, "AF_ISO") == 0)
-	    *dv = AF_ISO;
-#endif
-#ifdef AF_NS
-	else if (strcmp(ptr, "AF_NS") == 0)
-	    *dv = AF_NS;
-#endif
-#ifdef AF_IMPLINK
-	else if (strcmp(ptr, "AF_IMPLINK") == 0)
-	    *dv = AF_IMPLINK;
-#endif
-#ifdef PF_INET
-	else if (strcmp(ptr, "PF_INET") == 0)
-	    *dv = PF_INET;
-#endif
-#ifdef PF_UNIX
-	else if (strcmp(ptr, "PF_UNIX") == 0)
-	    *dv = PF_UNIX;
-#endif
-#ifdef PF_IMPLINK
-	else if (strcmp(ptr, "PF_IMPLINK") == 0)
-	    *dv = PF_IMPLINK;
-	else if (strcmp(ptr, "AF_IMPLINK") == 0)
-	    *dv = AF_IMPLINK;
-#endif
-#ifdef PF_AX25
-	else if (strcmp(ptr, "PF_AX25") == 0)
-	    *dv = PF_AX25;
-#endif
-#ifdef PF_IPX
-	else if (strcmp(ptr, "PF_IPX") == 0)
-	    *dv = PF_IPX;
-#endif
-	else
-	    rb_raise(rb_eSocket, "unknown socket domain %s", ptr);
-    }
-    else {
-	*dv = NUM2INT(domain);
-    }
-    tmp = rb_check_string_type(type);
-    if (!NIL_P(tmp)) {
-	type = tmp;
-	rb_check_safe_obj(type);
-	ptr = RSTRING(type)->ptr;
-	if (strcmp(ptr, "SOCK_STREAM") == 0)
-	    *tv = SOCK_STREAM;
-	else if (strcmp(ptr, "SOCK_DGRAM") == 0)
-	    *tv = SOCK_DGRAM;
-#ifdef SOCK_RAW
-	else if (strcmp(ptr, "SOCK_RAW") == 0)
-	    *tv = SOCK_RAW;
-#endif
-#ifdef SOCK_SEQPACKET
-	else if (strcmp(ptr, "SOCK_SEQPACKET") == 0)
-	    *tv = SOCK_SEQPACKET;
-#endif
-#ifdef SOCK_RDM
-	else if (strcmp(ptr, "SOCK_RDM") == 0)
-	    *tv = SOCK_RDM;
-#endif
-#ifdef SOCK_PACKET
-	else if (strcmp(ptr, "SOCK_PACKET") == 0)
-	    *tv = SOCK_PACKET;
-#endif
-	else
-	    rb_raise(rb_eSocket, "unknown socket type %s", ptr);
-    }
-    else {
-	*tv = NUM2INT(type);
-    }
-}
-
-static VALUE
-sock_initialize(sock, domain, type, protocol)
-    VALUE sock, domain, type, protocol;
-{
-    int fd;
-    int d, t;
-
-    rb_secure(3);
-    setup_domain_and_type(domain, &d, type, &t);
-    fd = ruby_socket(d, t, NUM2INT(protocol));
-    if (fd < 0) rb_sys_fail("socket(2)");
-
-    return init_sock(sock, fd);
-}
-
-static VALUE
-sock_s_socketpair(klass, domain, type, protocol)
-    VALUE klass, domain, type, protocol;
+VALUE
+rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
 {
-#if defined HAVE_SOCKETPAIR
+    VALUE domain, type, protocol;
     int d, t, p, sp[2];
     int ret;
+    VALUE s1, s2, r;
+
+    rb_scan_args(argc, argv, "21", &domain, &type, &protocol);
+    if (NIL_P(protocol))
+        protocol = INT2FIX(0);
 
     setup_domain_and_type(domain, &d, type, &t);
     p = NUM2INT(protocol);
@@ -2383,43 +120,28 @@ sock_s_socketpair(klass, domain, type, protocol)
 	rb_sys_fail("socketpair(2)");
     }
 
-    return rb_assoc_new(init_sock(rb_obj_alloc(klass), sp[0]),
-			init_sock(rb_obj_alloc(klass), sp[1]));
-#else
-    rb_notimplement();
-#endif
-}
-
-#ifdef HAVE_SYS_UN_H
-static VALUE
-unix_s_socketpair(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE domain, type, protocol;
-    domain = INT2FIX(PF_UNIX);
-
-    rb_scan_args(argc, argv, "02", &type, &protocol);
-    if (argc == 0)
-	type = INT2FIX(SOCK_STREAM);
-    if (argc <= 1)
-	protocol = INT2FIX(0);
-
-    return sock_s_socketpair(klass, domain, type, protocol);
+    s1 = rsock_init_sock(rb_obj_alloc(klass), sp[0]);
+    s2 = rsock_init_sock(rb_obj_alloc(klass), sp[1]);
+    r = rb_assoc_new(s1, s2);
+    if (rb_block_given_p()) {
+        return rb_ensure(pair_yield, r, io_close, s1);
+    }
+    return r;
 }
+#else
+#define rsock_sock_s_socketpair rb_f_notimplement
 #endif
 
 /*
  * call-seq:
- * 	socket.connect(server_sockaddr) => 0
- * 
- * Requests a connection to be made on the given +server_sockaddr+. Returns 0 if
+ * 	socket.connect(remote_sockaddr) => 0
+ *
+ * Requests a connection to be made on the given +remote_sockaddr+. Returns 0 if
  * successful, otherwise an exception is raised.
- *  
+ *
  * === Parameter
- * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
- * 
+ * * +remote_sockaddr+ - the +struct+ sockaddr contained in a string or Addrinfo object
+ *
  * === Example:
  * 	# Pull down Google's web page
  * 	require 'socket'
@@ -2428,17 +150,17 @@ unix_s_socketpair(argc, argv, klass)
  * 	sockaddr = Socket.pack_sockaddr_in( 80, 'www.google.com' )
  * 	socket.connect( sockaddr )
  * 	socket.write( "GET / HTTP/1.0\r\n\r\n" )
- * 	results = socket.read 
- * 
+ * 	results = socket.read
+ *
  * === Unix-based Exceptions
- * On unix-based systems the following system exceptions may be raised if 
+ * On unix-based systems the following system exceptions may be raised if
  * the call to _connect_ fails:
  * * Errno::EACCES - search permission is denied for a component of the prefix
- *   path or write access to the +socket+ is denided
+ *   path or write access to the +socket+ is denied
  * * Errno::EADDRINUSE - the _sockaddr_ is already in use
  * * Errno::EADDRNOTAVAIL - the specified _sockaddr_ is not available from the
  *   local machine
- * * Errno::EAFNOSUPPORT - the specified _sockaddr_ is not a valid address for 
+ * * Errno::EAFNOSUPPORT - the specified _sockaddr_ is not a valid address for
  *   the address family of the specified +socket+
  * * Errno::EALREADY - a connection is already in progress for the specified
  *   socket
@@ -2447,56 +169,56 @@ unix_s_socketpair(argc, argv, klass)
  *   refused the connection request
  * * Errno::ECONNRESET - the remote host reset the connection request
  * * Errno::EFAULT - the _sockaddr_ cannot be accessed
- * * Errno::EHOSTUNREACH - the destination host cannot be reached (probably 
+ * * Errno::EHOSTUNREACH - the destination host cannot be reached (probably
  *   because the host is down or a remote router cannot reach it)
  * * Errno::EINPROGRESS - the O_NONBLOCK is set for the +socket+ and the
- *   connection cnanot be immediately established; the connection will be
+ *   connection cannot be immediately established; the connection will be
  *   established asynchronously
  * * Errno::EINTR - the attempt to establish the connection was interrupted by
  *   delivery of a signal that was caught; the connection will be established
  *   asynchronously
  * * Errno::EISCONN - the specified +socket+ is already connected
  * * Errno::EINVAL - the address length used for the _sockaddr_ is not a valid
- *   length for the address family or there is an invalid family in _sockaddr_ 
+ *   length for the address family or there is an invalid family in _sockaddr_
  * * Errno::ENAMETOOLONG - the pathname resolved had a length which exceeded
  *   PATH_MAX
  * * Errno::ENETDOWN - the local interface used to reach the destination is down
  * * Errno::ENETUNREACH - no route to the network is present
  * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOSR - there were insufficient STREAMS resources available to 
+ * * Errno::ENOSR - there were insufficient STREAMS resources available to
  *   complete the operation
  * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
  * * Errno::EOPNOTSUPP - the calling +socket+ is listening and cannot be connected
- * * Errno::EPROTOTYPE - the _sockaddr_ has a different type than the socket 
+ * * Errno::EPROTOTYPE - the _sockaddr_ has a different type than the socket
  *   bound to the specified peer address
  * * Errno::ETIMEDOUT - the attempt to connect time out before a connection
  *   was made.
- * 
+ *
  * On unix-based systems if the address family of the calling +socket+ is
  * AF_UNIX the follow exceptions may be raised if the call to _connect_
  * fails:
- * * Errno::EIO - an i/o error occured while reading from or writing to the 
+ * * Errno::EIO - an i/o error occurred while reading from or writing to the
  *   file system
  * * Errno::ELOOP - too many symbolic links were encountered in translating
  *   the pathname in _sockaddr_
- * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX 
- *   characters, or an entired pathname exceeded PATH_MAX characters
+ * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX
+ *   characters, or an entire pathname exceeded PATH_MAX characters
  * * Errno::ENOENT - a component of the pathname does not name an existing file
  *   or the pathname is an empty string
  * * Errno::ENOTDIR - a component of the path prefix of the pathname in _sockaddr_
- *   is not a directory 
- * 
+ *   is not a directory
+ *
  * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
+ * On Windows systems the following system exceptions may be raised if
  * the call to _connect_ fails:
  * * Errno::ENETDOWN - the network is down
  * * Errno::EADDRINUSE - the socket's local address is already in use
  * * Errno::EINTR - the socket was cancelled
  * * Errno::EINPROGRESS - a blocking socket is in progress or the service provider
- *   is still processing a callback function. Or a nonblocking connect call is 
+ *   is still processing a callback function. Or a nonblocking connect call is
  *   in progress on the +socket+.
  * * Errno::EALREADY - see Errno::EINVAL
- * * Errno::EADDRNOTAVAIL - the remote address is not a valid address, such as 
+ * * Errno::EADDRNOTAVAIL - the remote address is not a valid address, such as
  *   ADDR_ANY TODO check ADDRANY TO INADDR_ANY
  * * Errno::EAFNOSUPPORT - addresses in the specified family cannot be used with
  *   with this +socket+
@@ -2512,84 +234,89 @@ unix_s_socketpair(argc, argv, klass)
  * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
  * * Errno::ETIMEDOUT - the attempt to connect time out before a connection
  *   was made.
- * * Errno::EWOULDBLOCK - the socket is marked as nonblocking and the 
+ * * Errno::EWOULDBLOCK - the socket is marked as nonblocking and the
  *   connection cannot be completed immediately
- * * Errno::EACCES - the attempt to connect the datagram socket to the 
+ * * Errno::EACCES - the attempt to connect the datagram socket to the
  *   broadcast address failed
- * 
+ *
  * === See
  * * connect manual pages on unix-based systems
  * * connect function in Microsoft's Winsock functions reference
  */
 static VALUE
-sock_connect(sock, addr)
-    VALUE sock, addr;
+sock_connect(VALUE sock, VALUE addr)
 {
-    OpenFile *fptr;
-    int fd;
+    rb_io_t *fptr;
+    int fd, n;
 
-    StringValue(addr);
+    SockAddrStringValue(addr);
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
-    fd = fileno(fptr->f);
-    if (ruby_connect(fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len, 0) < 0) {
+    fd = fptr->fd;
+    n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr), 0);
+    if (n < 0) {
 	rb_sys_fail("connect(2)");
     }
 
-    return INT2FIX(0);
+    return INT2FIX(n);
 }
 
 /*
  * call-seq:
- * 	socket.connect_nonblock(server_sockaddr) => 0
- * 
- * Requests a connection to be made on the given +server_sockaddr+ after
+ * 	socket.connect_nonblock(remote_sockaddr) => 0
+ *
+ * Requests a connection to be made on the given +remote_sockaddr+ after
  * O_NONBLOCK is set for the underlying file descriptor.
  * Returns 0 if successful, otherwise an exception is raised.
- *  
+ *
  * === Parameter
- * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
- * 
+ * * +remote_sockaddr+ - the +struct+ sockaddr contained in a string or Addrinfo object
+ *
  * === Example:
  * 	# Pull down Google's web page
  * 	require 'socket'
  * 	include Socket::Constants
  * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
  * 	sockaddr = Socket.sockaddr_in(80, 'www.google.com')
- * 	begin
+ * 	begin # emulate blocking connect
  * 	  socket.connect_nonblock(sockaddr)
- * 	rescue Errno::EINPROGRESS
- * 	  IO.select(nil, [socket])
+ * 	rescue IO::WaitWritable
+ * 	  IO.select(nil, [socket]) # wait 3-way handshake completion
  * 	  begin
- * 	    socket.connect_nonblock(sockaddr)
+ * 	    socket.connect_nonblock(sockaddr) # check connection failure
  * 	  rescue Errno::EISCONN
  * 	  end
  * 	end
  * 	socket.write("GET / HTTP/1.0\r\n\r\n")
- * 	results = socket.read 
- * 
+ * 	results = socket.read
+ *
  * Refer to Socket#connect for the exceptions that may be thrown if the call
- * to _connect_nonblock_ fails. 
+ * to _connect_nonblock_ fails.
  *
  * Socket#connect_nonblock may raise any error corresponding to connect(2) failure,
  * including Errno::EINPROGRESS.
  *
+ * If the exception is Errno::EINPROGRESS,
+ * it is extended by IO::WaitWritable.
+ * So IO::WaitWritable can be used to rescue the exceptions for retrying connect_nonblock.
+ *
  * === See
  * * Socket#connect
  */
 static VALUE
-sock_connect_nonblock(sock, addr)
-    VALUE sock, addr;
+sock_connect_nonblock(VALUE sock, VALUE addr)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     int n;
 
-    StringValue(addr);
+    SockAddrStringValue(addr);
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
     rb_io_set_nonblock(fptr);
-    n = connect(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len);
+    n = connect(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr));
     if (n < 0) {
+        if (errno == EINPROGRESS)
+            rb_mod_sys_fail(rb_mWaitWritable, "connect(2) would block");
 	rb_sys_fail("connect(2)");
     }
 
@@ -2598,33 +325,40 @@ sock_connect_nonblock(sock, addr)
 
 /*
  * call-seq:
- * 	socket.bind(server_sockaddr) => 0
- * 
- * Binds to the given +struct+ sockaddr.
- * 
+ * 	socket.bind(local_sockaddr) => 0
+ *
+ * Binds to the given local address.
+ *
  * === Parameter
- * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
+ * * +local_sockaddr+ - the +struct+ sockaddr contained in a string or an Addrinfo object
  *
  * === Example
  * 	require 'socket'
+ *
+ * 	# use Addrinfo
+ * 	socket = Socket.new(:INET, :STREAM, 0)
+ * 	socket.bind(Addrinfo.tcp("127.0.0.1", 2222))
+ * 	p socket.local_address #=> #<Addrinfo: 127.0.0.1:2222 TCP>
+ *
+ * 	# use struct sockaddr
  * 	include Socket::Constants
  * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
  * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
  * 	socket.bind( sockaddr )
- *  
+ *
  * === Unix-based Exceptions
- * On unix-based based systems the following system exceptions may be raised if 
+ * On unix-based based systems the following system exceptions may be raised if
  * the call to _bind_ fails:
  * * Errno::EACCES - the specified _sockaddr_ is protected and the current
  *   user does not have permission to bind to it
  * * Errno::EADDRINUSE - the specified _sockaddr_ is already in use
  * * Errno::EADDRNOTAVAIL - the specified _sockaddr_ is not available from the
  *   local machine
- * * Errno::EAFNOSUPPORT - the specified _sockaddr_ isnot a valid address for
+ * * Errno::EAFNOSUPPORT - the specified _sockaddr_ is not a valid address for
  *   the family of the calling +socket+
  * * Errno::EBADF - the _sockaddr_ specified is not a valid file descriptor
  * * Errno::EFAULT - the _sockaddr_ argument cannot be accessed
- * * Errno::EINVAL - the +socket+ is already bound to an address, and the 
+ * * Errno::EINVAL - the +socket+ is already bound to an address, and the
  *   protocol does not support binding to the new _sockaddr_ or the +socket+
  *   has been shut down.
  * * Errno::EINVAL - the address length is not a valid length for the address
@@ -2632,35 +366,35 @@ sock_connect_nonblock(sock, addr)
  * * Errno::ENAMETOOLONG - the pathname resolved had a length which exceeded
  *   PATH_MAX
  * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOSR - there were insufficient STREAMS resources available to 
+ * * Errno::ENOSR - there were insufficient STREAMS resources available to
  *   complete the operation
  * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
- * * Errno::EOPNOTSUPP - the socket type of the +socket+ does not support 
+ * * Errno::EOPNOTSUPP - the socket type of the +socket+ does not support
  *   binding to an address
- * 
+ *
  * On unix-based based systems if the address family of the calling +socket+ is
  * Socket::AF_UNIX the follow exceptions may be raised if the call to _bind_
  * fails:
  * * Errno::EACCES - search permission is denied for a component of the prefix
- *   path or write access to the +socket+ is denided
+ *   path or write access to the +socket+ is denied
  * * Errno::EDESTADDRREQ - the _sockaddr_ argument is a null pointer
  * * Errno::EISDIR - same as Errno::EDESTADDRREQ
  * * Errno::EIO - an i/o error occurred
  * * Errno::ELOOP - too many symbolic links were encountered in translating
  *   the pathname in _sockaddr_
- * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX 
- *   characters, or an entired pathname exceeded PATH_MAX characters
+ * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX
+ *   characters, or an entire pathname exceeded PATH_MAX characters
  * * Errno::ENOENT - a component of the pathname does not name an existing file
  *   or the pathname is an empty string
  * * Errno::ENOTDIR - a component of the path prefix of the pathname in _sockaddr_
  *   is not a directory
  * * Errno::EROFS - the name would reside on a read only filesystem
- * 
+ *
  * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
+ * On Windows systems the following system exceptions may be raised if
  * the call to _bind_ fails:
  * * Errno::ENETDOWN-- the network is down
- * * Errno::EACCES - the attempt to connect the datagram socket to the 
+ * * Errno::EACCES - the attempt to connect the datagram socket to the
  *   broadcast address failed
  * * Errno::EADDRINUSE - the socket's local address is already in use
  * * Errno::EADDRNOTAVAIL - the specified address is not a valid address for this
@@ -2670,20 +404,19 @@ sock_connect_nonblock(sock, addr)
  * * Errno::EINVAL - the +socket+ is already bound to an address
  * * Errno::ENOBUFS - no buffer space is available
  * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
- * 
+ *
  * === See
  * * bind manual pages on unix-based systems
  * * bind function in Microsoft's Winsock functions reference
- */ 
+ */
 static VALUE
-sock_bind(sock, addr)
-    VALUE sock, addr;
+sock_bind(VALUE sock, VALUE addr)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
-    StringValue(addr);
+    SockAddrStringValue(addr);
     GetOpenFile(sock, fptr);
-    if (bind(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len) < 0)
+    if (bind(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr)) < 0)
 	rb_sys_fail("bind(2)");
 
     return INT2FIX(0);
@@ -2692,14 +425,14 @@ sock_bind(sock, addr)
 /*
  * call-seq:
  * 	socket.listen( int ) => 0
- * 
+ *
  * Listens for connections, using the specified +int+ as the backlog. A call
- * to _listen_ only applies if the +socket+ is of type SOCK_STREAM or 
+ * to _listen_ only applies if the +socket+ is of type SOCK_STREAM or
  * SOCK_SEQPACKET.
- * 
+ *
  * === Parameter
  * * +backlog+ - the maximum length of the queue for pending connections.
- * 
+ *
  * === Example 1
  * 	require 'socket'
  * 	include Socket::Constants
@@ -2707,43 +440,43 @@ sock_bind(sock, addr)
  * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
  * 	socket.bind( sockaddr )
  * 	socket.listen( 5 )
- * 
- * === Example 2 (listening on an arbitary port, unix-based systems only):
+ *
+ * === Example 2 (listening on an arbitrary port, unix-based systems only):
  * 	require 'socket'
  * 	include Socket::Constants
  * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
  * 	socket.listen( 1 )
- * 
+ *
  * === Unix-based Exceptions
  * On unix based systems the above will work because a new +sockaddr+ struct
  * is created on the address ADDR_ANY, for an arbitrary port number as handed
  * off by the kernel. It will not work on Windows, because Windows requires that
  * the +socket+ is bound by calling _bind_ before it can _listen_.
- * 
+ *
  * If the _backlog_ amount exceeds the implementation-dependent maximum
  * queue length, the implementation's maximum queue length will be used.
- * 
+ *
  * On unix-based based systems the following system exceptions may be raised if the
  * call to _listen_ fails:
  * * Errno::EBADF - the _socket_ argument is not a valid file descriptor
- * * Errno::EDESTADDRREQ - the _socket_ is not bound to a local address, and 
+ * * Errno::EDESTADDRREQ - the _socket_ is not bound to a local address, and
  *   the protocol does not support listening on an unbound socket
  * * Errno::EINVAL - the _socket_ is already connected
  * * Errno::ENOTSOCK - the _socket_ argument does not refer to a socket
  * * Errno::EOPNOTSUPP - the _socket_ protocol does not support listen
- * * Errno::EACCES - the calling process does not have approriate privileges
+ * * Errno::EACCES - the calling process does not have appropriate privileges
  * * Errno::EINVAL - the _socket_ has been shut down
- * * Errno::ENOBUFS - insufficient resources are available in the system to 
+ * * Errno::ENOBUFS - insufficient resources are available in the system to
  *   complete the call
- * 
+ *
  * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
+ * On Windows systems the following system exceptions may be raised if
  * the call to _listen_ fails:
  * * Errno::ENETDOWN - the network is down
- * * Errno::EADDRINUSE - the socket's local address is already in use. This 
+ * * Errno::EADDRINUSE - the socket's local address is already in use. This
  *   usually occurs during the execution of _bind_ but could be delayed
  *   if the call to _bind_ was to a partially wildcard address (involving
- *   ADDR_ANY) and if a specific address needs to be commmitted at the 
+ *   ADDR_ANY) and if a specific address needs to be committed at the
  *   time of the call to _listen_
  * * Errno::EINPROGRESS - a Windows Sockets 1.1 call is in progress or the
  *   service provider is still processing a callback function
@@ -2754,22 +487,21 @@ sock_bind(sock, addr)
  * * Errno::ENOTSOC - +socket+ is not a socket
  * * Errno::EOPNOTSUPP - the referenced +socket+ is not a type that supports
  *   the _listen_ method
- * 
+ *
  * === See
  * * listen manual pages on unix-based systems
  * * listen function in Microsoft's Winsock functions reference
  */
-static VALUE
-sock_listen(sock, log)
-    VALUE sock, log;
+VALUE
+rsock_sock_listen(VALUE sock, VALUE log)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     int backlog;
 
     rb_secure(4);
     backlog = NUM2INT(log);
     GetOpenFile(sock, fptr);
-    if (listen(fileno(fptr->f), backlog) < 0)
+    if (listen(fptr->fd, backlog) < 0)
 	rb_sys_fail("listen(2)");
 
     return INT2FIX(0);
@@ -2777,18 +509,18 @@ sock_listen(sock, log)
 
 /*
  * call-seq:
- * 	socket.recvfrom(maxlen) => [mesg, sender_sockaddr]
- * 	socket.recvfrom(maxlen, flags) => [mesg, sender_sockaddr]
- * 
+ * 	socket.recvfrom(maxlen) => [mesg, sender_addrinfo]
+ * 	socket.recvfrom(maxlen, flags) => [mesg, sender_addrinfo]
+ *
  * Receives up to _maxlen_ bytes from +socket+. _flags_ is zero or more
  * of the +MSG_+ options. The first element of the results, _mesg_, is the data
- * received. The second element, _sender_sockaddr_, contains protocol-specific information
- * on the sender.
- * 
+ * received. The second element, _sender_addrinfo_, contains protocol-specific
+ * address information of the sender.
+ *
  * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
+ * * +maxlen+ - the maximum number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options
+ *
  * === Example
  * 	# In one file, start this first
  * 	require 'socket'
@@ -2797,12 +529,12 @@ sock_listen(sock, log)
  * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
  * 	socket.bind( sockaddr )
  * 	socket.listen( 5 )
- * 	client, client_sockaddr = socket.accept
+ * 	client, client_addrinfo = socket.accept
  * 	data = client.recvfrom( 20 )[0].chomp
  * 	puts "I only received 20 bytes '#{data}'"
  * 	sleep 1
  * 	socket.close
- * 
+ *
  * 	# In another file, start this second
  * 	require 'socket'
  * 	include Socket::Constants
@@ -2810,29 +542,29 @@ sock_listen(sock, log)
  * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
  * 	socket.connect( sockaddr )
  * 	socket.puts "Watch this get cut short!"
- * 	socket.close 
- * 
+ * 	socket.close
+ *
  * === Unix-based Exceptions
  * On unix-based based systems the following system exceptions may be raised if the
  * call to _recvfrom_ fails:
  * * Errno::EAGAIN - the +socket+ file descriptor is marked as O_NONBLOCK and no
  *   data is waiting to be received; or MSG_OOB is set and no out-of-band data
- *   is available and either the +socket+ file descriptor is marked as 
- *   O_NONBLOCK or the +socket+ does not support blocking to wait for 
+ *   is available and either the +socket+ file descriptor is marked as
+ *   O_NONBLOCK or the +socket+ does not support blocking to wait for
  *   out-of-band-data
  * * Errno::EWOULDBLOCK - see Errno::EAGAIN
  * * Errno::EBADF - the +socket+ is not a valid file descriptor
  * * Errno::ECONNRESET - a connection was forcibly closed by a peer
- * * Errno::EFAULT - the socket's internal buffer, address or address length 
+ * * Errno::EFAULT - the socket's internal buffer, address or address length
  *   cannot be accessed or written
- * * Errno::EINTR - a signal interupted _recvfrom_ before any data was available
+ * * Errno::EINTR - a signal interrupted _recvfrom_ before any data was available
  * * Errno::EINVAL - the MSG_OOB flag is set and no out-of-band data is available
- * * Errno::EIO - an i/o error occurred while reading from or writing to the 
+ * * Errno::EIO - an i/o error occurred while reading from or writing to the
  *   filesystem
- * * Errno::ENOBUFS - insufficient resources were available in the system to 
+ * * Errno::ENOBUFS - insufficient resources were available in the system to
  *   perform the operation
  * * Errno::ENOMEM - insufficient memory was available to fulfill the request
- * * Errno::ENOSR - there were insufficient STREAMS resources available to 
+ * * Errno::ENOSR - there were insufficient STREAMS resources available to
  *   complete the operation
  * * Errno::ENOTCONN - a receive is attempted on a connection-mode socket that
  *   is not connected
@@ -2840,75 +572,72 @@ sock_listen(sock, log)
  * * Errno::EOPNOTSUPP - the specified flags are not supported for this socket type
  * * Errno::ETIMEDOUT - the connection timed out during connection establishment
  *   or due to a transmission timeout on an active connection
- * 
+ *
  * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
+ * On Windows systems the following system exceptions may be raised if
  * the call to _recvfrom_ fails:
  * * Errno::ENETDOWN - the network is down
  * * Errno::EFAULT - the internal buffer and from parameters on +socket+ are not
  *   part of the user address space, or the internal fromlen parameter is
- *   too small to accomodate the peer address
+ *   too small to accommodate the peer address
  * * Errno::EINTR - the (blocking) call was cancelled by an internal call to
  *   the WinSock function WSACancelBlockingCall
- * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or 
+ * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or
  *   the service provider is still processing a callback function
  * * Errno::EINVAL - +socket+ has not been bound with a call to _bind_, or an
  *   unknown flag was specified, or MSG_OOB was specified for a socket with
  *   SO_OOBINLINE enabled, or (for byte stream-style sockets only) the internal
  *   len parameter on +socket+ was zero or negative
  * * Errno::EISCONN - +socket+ is already connected. The call to _recvfrom_ is
- *   not permitted with a connected socket on a socket that is connetion 
+ *   not permitted with a connected socket on a socket that is connection
  *   oriented or connectionless.
- * * Errno::ENETRESET - the connection has been broken due to the keep-alive 
+ * * Errno::ENETRESET - the connection has been broken due to the keep-alive
  *   activity detecting a failure while the operation was in progress.
  * * Errno::EOPNOTSUPP - MSG_OOB was specified, but +socket+ is not stream-style
  *   such as type SOCK_STREAM. OOB data is not supported in the communication
- *   domain associated with +socket+, or +socket+ is unidirectional and 
+ *   domain associated with +socket+, or +socket+ is unidirectional and
  *   supports only send operations
- * * Errno::ESHUTDOWN - +socket+ has been shutdown. It is not possible to 
+ * * Errno::ESHUTDOWN - +socket+ has been shutdown. It is not possible to
  *   call _recvfrom_ on a socket after _shutdown_ has been invoked.
- * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and a  call to 
+ * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and a  call to
  *   _recvfrom_ would block.
  * * Errno::EMSGSIZE - the message was too large to fit into the specified buffer
  *   and was truncated.
  * * Errno::ETIMEDOUT - the connection has been dropped, because of a network
  *   failure or because the system on the other end went down without
  *   notice
- * * Errno::ECONNRESET - the virtual circuit was reset by the remote side 
+ * * Errno::ECONNRESET - the virtual circuit was reset by the remote side
  *   executing a hard or abortive close. The application should close the
  *   socket; it is no longer usable. On a UDP-datagram socket this error
  *   indicates a previous send operation resulted in an ICMP Port Unreachable
  *   message.
  */
 static VALUE
-sock_recvfrom(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
+sock_recvfrom(int argc, VALUE *argv, VALUE sock)
 {
-    return s_recvfrom(sock, argc, argv, RECV_SOCKET);
+    return rsock_s_recvfrom(sock, argc, argv, RECV_SOCKET);
 }
 
 /*
  * call-seq:
- * 	socket.recvfrom_nonblock(maxlen) => [mesg, sender_sockaddr]
- * 	socket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_sockaddr]
- * 
+ * 	socket.recvfrom_nonblock(maxlen) => [mesg, sender_addrinfo]
+ * 	socket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_addrinfo]
+ *
  * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
  * O_NONBLOCK is set for the underlying file descriptor.
  * _flags_ is zero or more of the +MSG_+ options.
  * The first element of the results, _mesg_, is the data received.
- * The second element, _sender_sockaddr_, contains protocol-specific information
- * on the sender.
+ * The second element, _sender_addrinfo_, contains protocol-specific address
+ * information of the sender.
  *
  * When recvfrom(2) returns 0, Socket#recvfrom_nonblock returns
  * an empty string as data.
  * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
- * 
+ *
  * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
+ * * +maxlen+ - the maximum number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options
+ *
  * === Example
  * 	# In one file, start this first
  * 	require 'socket'
@@ -2917,10 +646,10 @@ sock_recvfrom(argc, argv, sock)
  * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
  * 	socket.bind(sockaddr)
  * 	socket.listen(5)
- * 	client, client_sockaddr = socket.accept
- * 	begin
+ * 	client, client_addrinfo = socket.accept
+ * 	begin # emulate blocking recvfrom
  * 	  pair = client.recvfrom_nonblock(20)
- * 	rescue Errno::EAGAIN
+ * 	rescue IO::WaitReadable
  * 	  IO.select([client])
  * 	  retry
  * 	end
@@ -2928,7 +657,7 @@ sock_recvfrom(argc, argv, sock)
  * 	puts "I only received 20 bytes '#{data}'"
  * 	sleep 1
  * 	socket.close
- * 
+ *
  * 	# In another file, start this second
  * 	require 'socket'
  * 	include Socket::Constants
@@ -2936,13 +665,17 @@ sock_recvfrom(argc, argv, sock)
  * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
  * 	socket.connect(sockaddr)
  * 	socket.puts "Watch this get cut short!"
- * 	socket.close 
- * 
+ * 	socket.close
+ *
  * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recvfrom_nonblock_ fails. 
+ * to _recvfrom_nonblock_ fails.
  *
  * Socket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EAGAIN.
+ * including Errno::EWOULDBLOCK.
+ *
+ * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
+ * it is extended by IO::WaitReadable.
+ * So IO::WaitReadable can be used to rescue the exceptions for retrying recvfrom_nonblock.
  *
  * === See
  * * Socket#recvfrom
@@ -2950,117 +683,47 @@ sock_recvfrom(argc, argv, sock)
 static VALUE
 sock_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
 {
-    return s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
+    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
 }
 
 /*
  * call-seq:
- * 	socket.accept => [ socket, string ]
- * 
- * Accepts an incoming connection returning an array containing a new
- * Socket object and a string holding the +struct+ sockaddr information about 
- * the caller.
- * 
- * === Example
- * 	# In one script, start this first
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.bind( sockaddr )
- * 	socket.listen( 5 )
- * 	client, client_sockaddr = socket.accept
- * 	puts "The client said, '#{client.readline.chomp}'"
- * 	client.puts "Hello from script one!"
- * 	socket.close
- * 
- * 	# In another script, start this second
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.connect( sockaddr )
- * 	socket.puts "Hello from script 2." 
- * 	puts "The server said, '#{socket.readline.chomp}'"
- * 	socket.close 
- * 
- * === Unix-based Exceptions
- * On unix-based based systems the following system exceptions may be raised if the
- * call to _accept_ fails:
- * * Errno::EAGAIN - O_NONBLOCK is set for the +socket+ file descriptor and no 
- *   connections are parent to be accepted
- * * Errno::EWOULDBLOCK - same as Errno::EAGAIN
- * * Errno::EBADF - the +socket+ is not a valid file descriptor
- * * Errno::ECONNABORTED - a connection has been aborted
- * * Errno::EFAULT - the socket's internal address or address length parameter 
- *   cannot be access or written
- * * Errno::EINTR - the _accept_ method was interrupted by a signal that was 
- *   caught before a valid connection arrived
- * * Errno::EINVAL - the +socket+ is not accepting connections
- * * Errno::EMFILE - OPEN_MAX file descriptors are currently open in the calling 
- *   process
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOMEM - there was insufficient memory available to complete the
- *   operation
- * * Errno::ENOSR - there was insufficient STREAMS resources available to 
- *   complete the operation
- * * Errno::ENFILE - the maximum number of file descriptors in the system are 
- *   already open
- * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
- * * Errno::EOPNOTSUPP - the socket type for the calling +socket+ does not 
- *   support accept connections
- * * Errno::EPROTO - a protocol error has occurred
- * 
- * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
- * the call to _accept_ fails:
- * * Errno::ECONNRESET - an incoming connection was indicated, but was 
- *   terminated by the remote peer prior to accepting the connection
- * * Errno::EFAULT - the socket's internal address or address length parameter
- *   is too small or is not a valid part of the user space address
- * * Errno::EINVAL - the _listen_ method was not invoked prior to calling _accept_
- * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or
- *   the service provider is still processing a callback function
- * * Errno::EMFILE - the queue is not empty, upong etry to _accept_ and there are
- *   no socket descriptors available
- * * Errno::ENETDOWN - the network is down
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOTSOCK - +socket+ is not a socket
- * * Errno::EOPNOTSUPP - +socket+ is not a type that supports connection-oriented
- *   service.
- * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and no connections are
- *   present to be accepted
- * 
- * === See
- * * accept manual pages on unix-based systems
- * * accept function in Microsoft's Winsock functions reference
+ *   socket.accept => [client_socket, client_addrinfo]
+ *
+ * Accepts a next connection.
+ * Returns a new Socket object and Addrinfo object.
+ *
+ *   serv = Socket.new(:INET, :STREAM, 0)
+ *   serv.listen(5)
+ *   c = Socket.new(:INET, :STREAM, 0)
+ *   c.connect(serv.connect_address)
+ *   p serv.accept #=> [#<Socket:fd 6>, #<Addrinfo: 127.0.0.1:48555 TCP>]
+ *
  */
 static VALUE
-sock_accept(sock)
-    VALUE sock;
+sock_accept(VALUE sock)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     VALUE sock2;
-    char buf[1024];
-    socklen_t len = sizeof buf;
+    struct sockaddr_storage buf;
+    socklen_t len = (socklen_t)sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = s_accept(rb_cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
+    sock2 = rsock_s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)&buf,&len);
 
-    return rb_assoc_new(sock2, rb_str_new(buf, len));
+    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
 }
 
 /*
  * call-seq:
- *    socket.accept_nonblock => [client_socket, client_sockaddr]
- * 
+ * 	socket.accept_nonblock => [client_socket, client_addrinfo]
+ *
  * Accepts an incoming connection using accept(2) after
  * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an array containg the accpeted socket
+ * It returns an array containing the accepted socket
  * for the incoming connection, _client_socket_,
- * and a string that contains the +struct+ sockaddr information
- * about the caller, _client_sockaddr_.
- * 
+ * and an Addrinfo, _client_addrinfo_.
+ *
  * === Example
  * 	# In one script, start this first
  * 	require 'socket'
@@ -3069,9 +732,9 @@ sock_accept(sock)
  * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
  * 	socket.bind(sockaddr)
  * 	socket.listen(5)
- * 	begin
- * 	  client_socket, client_sockaddr = socket.accept_nonblock
- * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+ * 	begin # emulate blocking accept
+ * 	  client_socket, client_addrinfo = socket.accept_nonblock
+ * 	rescue IO::WaitReadable, Errno::EINTR
  * 	  IO.select([socket])
  * 	  retry
  * 	end
@@ -3085,42 +748,44 @@ sock_accept(sock)
  * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
  * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
  * 	socket.connect(sockaddr)
- * 	socket.puts "Hello from script 2." 
+ * 	socket.puts "Hello from script 2."
  * 	puts "The server said, '#{socket.readline.chomp}'"
  * 	socket.close
- * 
+ *
  * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to _accept_nonblock_ fails. 
+ * to _accept_nonblock_ fails.
  *
  * Socket#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EAGAIN.
- * 
+ * including Errno::EWOULDBLOCK.
+ *
+ * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED or Errno::EPROTO,
+ * it is extended by IO::WaitReadable.
+ * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
+ *
  * === See
  * * Socket#accept
  */
 static VALUE
-sock_accept_nonblock(sock)
-    VALUE sock;
+sock_accept_nonblock(VALUE sock)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     VALUE sock2;
-    char buf[1024];
-    socklen_t len = sizeof buf;
+    struct sockaddr_storage buf;
+    socklen_t len = (socklen_t)sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)buf, &len);
-    return rb_assoc_new(sock2, rb_str_new(buf, len));
+    sock2 = rsock_s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)&buf, &len);
+    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
 }
 
 /*
  * call-seq:
- * 	socket.sysaccept => [client_socket_fd, client_sockaddr]
- * 
- * Accepts an incoming connection returnings an array containg the (integer)
+ * 	socket.sysaccept => [client_socket_fd, client_addrinfo]
+ *
+ * Accepts an incoming connection returning an array containing the (integer)
  * file descriptor for the incoming connection, _client_socket_fd_,
- * and a string that contains the +struct+ sockaddr information
- * about the caller, _client_sockaddr_.
- * 
+ * and an Addrinfo, _client_addrinfo_.
+ *
  * === Example
  * 	# In one script, start this first
  * 	require 'socket'
@@ -3129,49 +794,61 @@ sock_accept_nonblock(sock)
  * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
  * 	socket.bind( sockaddr )
  * 	socket.listen( 5 )
- * 	client_fd, client_sockaddr = socket.sysaccept
+ * 	client_fd, client_addrinfo = socket.sysaccept
  * 	client_socket = Socket.for_fd( client_fd )
  * 	puts "The client said, '#{client_socket.readline.chomp}'"
  * 	client_socket.puts "Hello from script one!"
  * 	socket.close
- * 
+ *
  * 	# In another script, start this second
  * 	require 'socket'
  * 	include Socket::Constants
  * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
  * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
  * 	socket.connect( sockaddr )
- * 	socket.puts "Hello from script 2." 
+ * 	socket.puts "Hello from script 2."
  * 	puts "The server said, '#{socket.readline.chomp}'"
  * 	socket.close
- * 
+ *
  * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to _sysaccept_ fails. 
- * 
+ * to _sysaccept_ fails.
+ *
  * === See
  * * Socket#accept
  */
 static VALUE
-sock_sysaccept(sock)
-    VALUE sock;
+sock_sysaccept(VALUE sock)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     VALUE sock2;
-    char buf[1024];
-    socklen_t len = sizeof buf;
+    struct sockaddr_storage buf;
+    socklen_t len = (socklen_t)sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = s_accept(0,fileno(fptr->f),(struct sockaddr*)buf,&len);
+    sock2 = rsock_s_accept(0,fptr->fd,(struct sockaddr*)&buf,&len);
 
-    return rb_assoc_new(sock2, rb_str_new(buf, len));
+    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
 }
 
 #ifdef HAVE_GETHOSTNAME
+/*
+ * call-seq:
+ *   Socket.gethostname => hostname
+ *
+ * Returns the hostname.
+ *
+ *   p Socket.gethostname #=> "hal"
+ *
+ * Note that it is not guaranteed to be able to convert to IP address using gethostbyname, getaddrinfo, etc.
+ * If you need local IP address, use Socket.ip_address_list.
+ */
 static VALUE
-sock_gethostname(obj)
-    VALUE obj;
+sock_gethostname(VALUE obj)
 {
-    char buf[1024];
+#ifndef HOST_NAME_MAX
+#  define HOST_NAME_MAX 1024
+#endif
+    char buf[HOST_NAME_MAX+1];
 
     rb_secure(3);
     if (gethostname(buf, (int)sizeof buf - 1) < 0)
@@ -3186,8 +863,7 @@ sock_gethostname(obj)
 #include <sys/utsname.h>
 
 static VALUE
-sock_gethostname(obj)
-    VALUE obj;
+sock_gethostname(VALUE obj)
 {
     struct utsname un;
 
@@ -3196,18 +872,12 @@ sock_gethostname(obj)
     return rb_str_new2(un.nodename);
 }
 #else
-static VALUE
-sock_gethostname(obj)
-    VALUE obj;
-{
-    rb_notimplement();
-}
+#define sock_gethostname rb_f_notimplement
 #endif
 #endif
 
 static VALUE
-make_addrinfo(res0)
-    struct addrinfo *res0;
+make_addrinfo(struct addrinfo *res0, int norevlookup)
 {
     VALUE base, ary;
     struct addrinfo *res;
@@ -3217,7 +887,10 @@ make_addrinfo(res0)
     }
     base = rb_ary_new();
     for (res = res0; res; res = res->ai_next) {
-	ary = ipaddr(res->ai_addr);
+	ary = rsock_ipaddr(res->ai_addr, norevlookup);
+	if (res->ai_canonname) {
+	    RARRAY_PTR(ary)[2] = rb_str_new2(res->ai_canonname);
+	}
 	rb_ary_push(ary, INT2FIX(res->ai_family));
 	rb_ary_push(ary, INT2FIX(res->ai_socktype));
 	rb_ary_push(ary, INT2FIX(res->ai_protocol));
@@ -3226,11 +899,8 @@ make_addrinfo(res0)
     return base;
 }
 
-/* Returns a String containing the binary value of a struct sockaddr. */
-VALUE
-sock_sockaddr(addr, len)
-    struct sockaddr *addr;
-    size_t len;
+static VALUE
+sock_sockaddr(struct sockaddr *addr, size_t len)
 {
     char *ptr;
 
@@ -3239,7 +909,7 @@ sock_sockaddr(addr, len)
 	ptr = (char*)&((struct sockaddr_in*)addr)->sin_addr.s_addr;
 	len = sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr);
 	break;
-#ifdef INET6
+#ifdef AF_INET6
       case AF_INET6:
 	ptr = (char*)&((struct sockaddr_in6*)addr)->sin6_addr.s6_addr;
 	len = sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr);
@@ -3253,132 +923,51 @@ sock_sockaddr(addr, len)
 }
 
 /*
- * Document-class: IPSocket
- *
- * IPSocket is the parent of TCPSocket and UDPSocket and implements
- * functionality common to them.
- *
- * A number of APIs in IPSocket, Socket, and their descendants return an
- * address as an array. The members of that array are:
- * - address family: A string like "AF_INET" or "AF_INET6" if it is one of the
- *   commonly used families, the string "unknown:#" (where `#' is the address
- *   family number) if it is not one of the common ones.  The strings map to
- *   the Socket::AF_* constants.
- * - port: The port number.
- * - name: Either the canonical name from looking the address up in the DNS, or
- *   the address in presentation format
- * - address: The address in presentation format (a dotted decimal string for
- *   IPv4, a hex string for IPv6).
- *
- * The address and port can be used directly to create sockets and to bind or
- * connect them to the address.
- */
-
-/*
- * Document-class: Socket
+ * call-seq:
+ *   Socket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
+ *
+ * Obtains the host information for _hostname_.
+ *
+ *   p Socket.gethostbyname("hal") #=> ["localhost", ["hal"], 2, "\x7F\x00\x00\x01"]
  *
- * Socket contains a number of generally useful singleton methods and
- * constants, as well as offering low-level interfaces that can be used to
- * develop socket applications using protocols other than TCP, UDP, and UNIX
- * domain sockets.
- */
-
-/*
- * Document-method: gethostbyname
- * call-seq: Socket.gethostbyname(host) => hostent
- *
- * Resolve +host+ and return name and address information for it, similarly to
- * gethostbyname(3). +host+ can be a domain name or the presentation format of
- * an address.
- *
- * Returns an array of information similar to that found in a +struct hostent+:
- *   - cannonical name: the cannonical name for host in the DNS, or a
- *     string representing the address
- *   - aliases: an array of aliases for the canonical name, there may be no aliases
- *   - address family: usually one of Socket::AF_INET or Socket::AF_INET6
- *   - address: a string, the binary value of the +struct sockaddr+ for this name, in
- *     the indicated address family
- *   - ...: if there are multiple addresses for this host,  a series of
- *     strings/+struct sockaddr+s may follow, not all necessarily in the same
- *     address family. Note that the fact that they may not be all in the same
- *     address family is a departure from the behaviour of gethostbyname(3).
- *
- * Note: I believe that the fact that the multiple addresses returned are not
- * necessarily in the same address family may be a bug, since if this function
- * actually called gethostbyname(3), ALL the addresses returned in the trailing
- * address list (h_addr_list from struct hostent) would be of the same address
- * family!  Examples from my system, OS X 10.3:
- *
- *   ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
- *     and
- *   ["ensemble.local", [], 30, "\376\200\000\004\000\000\000\000\002\003\223\377\376\255\010\214", "\300\250{\232" ]
- *
- * Similar information can be returned by Socket.getaddrinfo if called as:
- *
- *    Socket.getaddrinfo(+host+, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)
- *
- * == Examples
- *   
- *   Socket.gethostbyname "example.com"                                                           
- *   => ["example.com", [], 2, "\300\000\"\246"]
- *   
- * This name has no DNS aliases, and a single IPv4 address.
- *   
- *   Socket.gethostbyname "smtp.telus.net"
- *   => ["smtp.svc.telus.net", ["smtp.telus.net"], 2, "\307\271\334\371"]
- *   
- * This name is an an alias so the canonical name is returned, as well as the
- * alias and a single IPv4 address.
- *   
- *   Socket.gethostbyname "localhost"
- *   => ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
- *   
- * This machine has no aliases, returns an IPv6 address, and has an additional IPv4 address.
- *
- * +host+ can also be an IP address in presentation format, in which case a
- * reverse lookup is done on the address:
- *
- *   Socket.gethostbyname("127.0.0.1")
- *   => ["localhost", [], 2, "\177\000\000\001"]
- *
- *   Socket.gethostbyname("192.0.34.166")
- *   => ["www.example.com", [], 2, "\300\000\"\246"]
- *
- *
- * == See
- * See: Socket.getaddrinfo
  */
 static VALUE
-sock_s_gethostbyname(obj, host)
-    VALUE obj, host;
+sock_s_gethostbyname(VALUE obj, VALUE host)
 {
     rb_secure(3);
-    return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
+    return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
 }
 
+/*
+ * call-seq:
+ *   Socket.gethostbyaddr(address_string [, address_family]) => hostent
+ *
+ * Obtains the host information for _address_.
+ *
+ *   p Socket.gethostbyaddr([221,186,184,68].pack("CCCC"))
+ *   #=> ["carbon.ruby-lang.org", [], 2, "\xDD\xBA\xB8D"]
+ */
 static VALUE
-sock_s_gethostbyaddr(argc, argv)
-    int argc;
-    VALUE *argv;
+sock_s_gethostbyaddr(int argc, VALUE *argv)
 {
-    VALUE addr, type;
+    VALUE addr, family;
     struct hostent *h;
     struct sockaddr *sa;
     char **pch;
     VALUE ary, names;
     int t = AF_INET;
 
-    rb_scan_args(argc, argv, "11", &addr, &type);
+    rb_scan_args(argc, argv, "11", &addr, &family);
     sa = (struct sockaddr*)StringValuePtr(addr);
-    if (!NIL_P(type)) {
-	t = NUM2INT(type);
+    if (!NIL_P(family)) {
+	t = rsock_family_arg(family);
     }
-#ifdef INET6
-    else if (RSTRING(addr)->len == 16) {
+#ifdef AF_INET6
+    else if (RSTRING_LEN(addr) == 16) {
 	t = AF_INET6;
     }
 #endif
-    h = gethostbyaddr(RSTRING(addr)->ptr, RSTRING(addr)->len, t);
+    h = gethostbyaddr(RSTRING_PTR(addr), RSTRING_LENINT(addr), t);
     if (h == NULL) {
 #ifdef HAVE_HSTRERROR
 	extern int h_errno;
@@ -3409,215 +998,129 @@ sock_s_gethostbyaddr(argc, argv)
 }
 
 /*
- * Document-method: getservbyname
- * call-seq: Socket.getservbyname(name, proto="tcp") => port
+ * call-seq:
+ *   Socket.getservbyname(service_name)                => port_number
+ *   Socket.getservbyname(service_name, protocol_name) => port_number
  *
- * +name+ is a service name ("ftp", "telnet", ...) and proto is a protocol name
- * ("udp", "tcp", ...). '/etc/services' (or your system's equivalent) is
- * searched for a service for +name+ and +proto+, and the port number is
- * returned.
+ * Obtains the port number for _service_name_.
  *
- * Note that unlike Socket.getaddrinfo, +proto+ may not be specified using the
- * Socket::SOCK_* constants, a string must must be used.
+ * If _protocol_name_ is not given, "tcp" is assumed.
+ *
+ *   Socket.getservbyname("smtp")          #=> 25
+ *   Socket.getservbyname("shell")         #=> 514
+ *   Socket.getservbyname("syslog", "udp") #=> 514
  */
 static VALUE
-sock_s_getservbyaname(argc, argv)
-    int argc;
-    VALUE *argv;
+sock_s_getservbyname(int argc, VALUE *argv)
 {
     VALUE service, proto;
     struct servent *sp;
-    int port;
+    long port;
+    const char *servicename, *protoname = "tcp";
 
     rb_scan_args(argc, argv, "11", &service, &proto);
-    if (NIL_P(proto)) proto = rb_str_new2("tcp");
     StringValue(service);
-    StringValue(proto);
-
-    sp = getservbyname(StringValueCStr(service),  StringValueCStr(proto));
+    if (!NIL_P(proto)) StringValue(proto);
+    servicename = StringValueCStr(service);
+    if (!NIL_P(proto)) protoname = StringValueCStr(proto);
+    sp = getservbyname(servicename, protoname);
     if (sp) {
 	port = ntohs(sp->s_port);
     }
     else {
-	char *s = RSTRING(service)->ptr;
 	char *end;
 
-	port = strtoul(s, &end, 0);
+	port = STRTOUL(servicename, &end, 0);
 	if (*end != '\0') {
-	    rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING(proto)->ptr);
+	    rb_raise(rb_eSocket, "no such service %s/%s", servicename, protoname);
 	}
     }
     return INT2FIX(port);
 }
 
 /*
-Documentation should explain the following:
-
-  $ pp Socket.getaddrinfo("", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
-
-  $ pp Socket.getaddrinfo(nil, 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET6", 1, "::", "::", 30, 1, 6],
-   ["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
-
-  $ pp Socket.getaddrinfo("localhost", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET6", 1, "localhost", "::1", 30, 1, 6],
-   ["AF_INET", 1, "localhost", "127.0.0.1", 2, 1, 6]]
-
-  $ pp Socket.getaddrinfo("ensemble.local.", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET", 1, "localhost", "192.168.123.154", 2, 1, 6]]
+ * call-seq:
+ *   Socket.getservbyport(port [, protocol_name]) => service
+ *
+ * Obtains the port number for _port_.
+ *
+ * If _protocol_name_ is not given, "tcp" is assumed.
+ *
+ *   Socket.getservbyport(80)         #=> "www"
+ *   Socket.getservbyport(514, "tcp") #=> "shell"
+ *   Socket.getservbyport(514, "udp") #=> "syslog"
+ *
+ */
+static VALUE
+sock_s_getservbyport(int argc, VALUE *argv)
+{
+    VALUE port, proto;
+    struct servent *sp;
+    long portnum;
+    const char *protoname = "tcp";
 
-Does it?
+    rb_scan_args(argc, argv, "11", &port, &proto);
+    portnum = NUM2LONG(port);
+    if (portnum != (uint16_t)portnum) {
+	const char *s = portnum > 0 ? "big" : "small";
+	rb_raise(rb_eRangeError, "integer %ld too %s to convert into `int16_t'", portnum, s);
+    }
+    if (!NIL_P(proto)) protoname = StringValueCStr(proto);
 
-API suggestion: this method has too many arguments, it would be backwards compatible and easier
-to understand if limit args were accepted as :family=>..., :flags=>...
-*/
+    sp = getservbyport((int)htons((uint16_t)portnum), protoname);
+    if (!sp) {
+	rb_raise(rb_eSocket, "no such service for port %d/%s", (int)portnum, protoname);
+    }
+    return rb_tainted_str_new2(sp->s_name);
+}
 
 /*
- * Document-method: getaddrinfo
- * call-seq: Socket.getaddrinfo(host, service, family=nil, socktype=nil, protocol=nil, flags=nil) => addrinfo
+ * call-seq:
+ *   Socket.getaddrinfo(nodename, servname[, family[, socktype[, protocol[, flags[, reverse_lookup]]]]]) => array
  *
- * Return address information for +host+ and +port+. The remaining arguments
- * are hints that limit the address information returned.
+ * Obtains address information for _nodename_:_servname_.
  *
- * This method corresponds closely to the POSIX.1g getaddrinfo() definition.
+ * _family_ should be an address family such as: :INET, :INET6, :UNIX, etc.
  *
- * === Parameters
- * - +host+ is a host name or an address string (dotted decimal for IPv4, or a hex string
- *   for IPv6) for which to return information. A nil is also allowed, its meaning
- *   depends on +flags+, see below.
- * - +service+ is a service name ("http", "ssh", ...), or 
- *   a port number (80, 22, ...), see Socket.getservbyname for more
- *   information. A nil is also allowed, meaning zero.
- * - +family+ limits the output to a specific address family, one of the
- *   Socket::AF_* constants. Socket::AF_INET (IPv4) and Socket::AF_INET6 (IPv6)
- *   are the most commonly used families. You will usually pass either nil or
- *   Socket::AF_UNSPEC, allowing the IPv6 information to be returned first if
- *   +host+ is reachable via IPv6, and IPv4 information otherwise.  The two
- *   strings "AF_INET" or "AF_INET6" are also allowed, they are converted to
- *   their respective Socket::AF_* constants.
- * - +socktype+ limits the output to a specific type of socket, one of the
- *   Socket::SOCK_* constants. Socket::SOCK_STREAM (for TCP) and
- *   Socket::SOCK_DGRAM (for UDP) are the most commonly used socket types. If
- *   nil, then information for all types of sockets supported by +service+ will
- *   be returned. You will usually know what type of socket you intend to
- *   create, and should pass that socket type in.
- * - +protocol+ limits the output to a specific protocol numpber, one of the
- *   Socket::IPPROTO_* constants. It is usually implied by the socket type
- *   (Socket::SOCK_STREAM => Socket::IPPROTO_TCP, ...), if you pass other than
- *   nil you already know what this is for.
- * - +flags+ is one of the Socket::AI_* constants. They mean:
- *   - Socket::AI_PASSIVE: when set, if +host+ is nil the 'any' address will be
- *     returned, Socket::INADDR_ANY or 0 for IPv4, "0::0" or "::" for IPv6.  This
- *     address is suitable for use by servers that will bind their socket and do
- *     a passive listen, thus the name of the flag. Otherwise the local or
- *     loopback address will be returned, this is "127.0.0.1" for IPv4 and "::1'
- *     for IPv6.
- *   - ...
- *
- *
- * === Returns
- *
- * Returns an array of arrays, where each subarray contains:
- * - address family, a string like "AF_INET" or "AF_INET6"
- * - port number, the port number for +service+
- * - host name, either a canonical name for +host+, or it's address in presentation
- *   format if the address could not be looked up.
- * - host IP, the address of +host+ in presentation format
- * - address family, as a numeric value (one of the Socket::AF_* constants).
- * - socket type, as a numeric value (one of the Socket::SOCK_* constants).
- * - protocol number, as a numeric value (one of the Socket::IPPROTO_* constants).
- *
- * The first four values are identical to what is commonly returned as an
- * address array, see IPSocket for more information.
- *
- * === Examples
- *
- * Not all input combinations are valid, and while there are many combinations,
- * only a few cases are common.
- *
- * A typical client will call getaddrinfo with the +host+ and +service+ it
- * wants to connect to. It knows that it will attempt to connect with either
- * TCP or UDP, and specifies +socktype+ accordingly. It loops through all
- * returned addresses, and try to connect to them in turn:
- *
- *   addrinfo = Socket::getaddrinfo('www.example.com', 'www', nil, Socket::SOCK_STREAM)
- *   addrinfo.each do |af, port, name, addr|
- *     begin
- *       sock = TCPSocket.new(addr, port)
- *       # ...
- *       exit 1
- *     rescue
- *     end
- *   end
- *
- * With UDP you don't know if connect suceeded, but if communication fails,
- * the next address can be tried.
- *
- * A typical server will call getaddrinfo with a +host+ of nil, the +service+
- * it listens to, and a +flags+ of Socket::AI_PASSIVE. It will listen for
- * connections on the first returned address:
- *   addrinfo = Socket::getaddrinfo(nil, 'www', nil, Socket::SOCK_STREAM, nil, Socket::AI_PASSIVE)
- *   af, port, name, addr = addrinfo.first
- *   sock = TCPServer(addr, port)
- *   while( client = s.accept )
- *     # ...
- *   end
+ * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
+ *
+ * _protocol_ should be a protocol defined in the family.
+ * 0 is default protocol for the family.
+ *
+ * _flags_ should be bitwise OR of Socket::AI_* constants.
+ *
+ *   Socket.getaddrinfo("www.ruby-lang.org", "http", nil, :STREAM)
+ *   #=> [["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68", 2, 1, 6]] # PF_INET/SOCK_STREAM/IPPROTO_TCP
+ *
+ *   Socket.getaddrinfo("localhost", nil)
+ *   #=> [["AF_INET", 0, "localhost", "127.0.0.1", 2, 1, 6],  # PF_INET/SOCK_STREAM/IPPROTO_TCP
+ *   #    ["AF_INET", 0, "localhost", "127.0.0.1", 2, 2, 17], # PF_INET/SOCK_DGRAM/IPPROTO_UDP
+ *   #    ["AF_INET", 0, "localhost", "127.0.0.1", 2, 3, 0]]  # PF_INET/SOCK_RAW/IPPROTO_IP
+ *
+ * _reverse_lookup_ directs the form of the third element, and has to
+ * be one of below.
+ * If it is ommitted, the default value is +nil+.
+ *
+ *   +true+, +:hostname+:  hostname is obtained from numeric address using reverse lookup, which may take a time.
+ *   +false+, +:numeric+:  hostname is same as numeric address.
+ *   +nil+:              obey to the current +do_not_reverse_lookup+ flag.
+ *
+ * If Addrinfo object is preferred, use Addrinfo.getaddrinfo.
  */
 static VALUE
-sock_s_getaddrinfo(argc, argv)
-    int argc;
-    VALUE *argv;
+sock_s_getaddrinfo(int argc, VALUE *argv)
 {
-    VALUE host, port, family, socktype, protocol, flags, ret;
-    char hbuf[1024], pbuf[1024];
-    char *hptr, *pptr, *ap;
+    VALUE host, port, family, socktype, protocol, flags, ret, revlookup;
     struct addrinfo hints, *res;
-    int error;
+    int norevlookup;
 
-    host = port = family = socktype = protocol = flags = Qnil;
-    rb_scan_args(argc, argv, "24", &host, &port, &family, &socktype, &protocol, &flags);
-    if (NIL_P(host)) {
-	hptr = NULL;
-    }
-    else {
-	strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
-	hbuf[sizeof(hbuf) - 1] = '\0';
-	hptr = hbuf;
-    }
-    if (NIL_P(port)) {
-	pptr = NULL;
-    }
-    else if (FIXNUM_P(port)) {
-	snprintf(pbuf, sizeof(pbuf), "%ld", FIX2LONG(port));
-	pptr = pbuf;
-    }
-    else {
-	strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
-	pbuf[sizeof(pbuf) - 1] = '\0';
-	pptr = pbuf;
-    }
+    rb_scan_args(argc, argv, "25", &host, &port, &family, &socktype, &protocol, &flags, &revlookup);
 
     MEMZERO(&hints, struct addrinfo, 1);
-    if (NIL_P(family)) {
-	hints.ai_family = PF_UNSPEC;
-    }
-    else if (FIXNUM_P(family)) {
-	hints.ai_family = FIX2INT(family);
-    }
-    else if ((ap = StringValuePtr(family)) != 0) {
-	if (strcmp(ap, "AF_INET") == 0) {
-	    hints.ai_family = PF_INET;
-	}
-#ifdef INET6
-	else if (strcmp(ap, "AF_INET6") == 0) {
-	    hints.ai_family = PF_INET6;
-	}
-#endif
-    }
+    hints.ai_family = NIL_P(family) ? PF_UNSPEC : rsock_family_arg(family);
 
     if (!NIL_P(socktype)) {
-	hints.ai_socktype = NUM2INT(socktype);
+	hints.ai_socktype = rsock_socktype_arg(socktype);
     }
     if (!NIL_P(protocol)) {
 	hints.ai_protocol = NUM2INT(protocol);
@@ -3625,20 +1128,39 @@ sock_s_getaddrinfo(argc, argv)
     if (!NIL_P(flags)) {
 	hints.ai_flags = NUM2INT(flags);
     }
-    error = getaddrinfo(hptr, pptr, &hints, &res);
-    if (error) {
-	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+    if (NIL_P(revlookup) || !rsock_revlookup_flag(revlookup, &norevlookup)) {
+	norevlookup = rsock_do_not_reverse_lookup;
     }
+    res = rsock_getaddrinfo(host, port, &hints, 0);
 
-    ret = make_addrinfo(res);
+    ret = make_addrinfo(res, norevlookup);
     freeaddrinfo(res);
     return ret;
 }
 
+/*
+ * call-seq:
+ *   Socket.getnameinfo(sockaddr [, flags]) => [hostname, servicename]
+ *
+ * Obtains name information for _sockaddr_.
+ *
+ * _sockaddr_ should be one of follows.
+ * - packed sockaddr string such as Socket.sockaddr_in(80, "127.0.0.1")
+ * - 3-elements array such as ["AF_INET", 80, "127.0.0.1"]
+ * - 4-elements array such as ["AF_INET", 80, ignored, "127.0.0.1"]
+ *
+ * _flags_ should be bitwise OR of Socket::NI_* constants.
+ *
+ * Note that the last form is compatible with IPSocket#{addr,peeraddr}.
+ *
+ *   Socket.getnameinfo(Socket.sockaddr_in(80, "127.0.0.1"))       #=> ["localhost", "www"]
+ *   Socket.getnameinfo(["AF_INET", 80, "127.0.0.1"])              #=> ["localhost", "www"]
+ *   Socket.getnameinfo(["AF_INET", 80, "localhost", "127.0.0.1"]) #=> ["localhost", "www"]
+ *
+ * If Addrinfo object is preferred, use Addrinfo#getnameinfo.
+ */
 static VALUE
-sock_s_getnameinfo(argc, argv)
-    int argc;
-    VALUE *argv;
+sock_s_getnameinfo(int argc, VALUE *argv)
 {
     VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
     char *hptr, *pptr;
@@ -3648,7 +1170,6 @@ sock_s_getnameinfo(argc, argv)
     int error;
     struct sockaddr_storage ss;
     struct sockaddr *sap;
-    char *ap;
 
     sa = flags = Qnil;
     rb_scan_args(argc, argv, "11", &sa, &flags);
@@ -3657,14 +1178,14 @@ sock_s_getnameinfo(argc, argv)
     if (!NIL_P(flags)) {
 	fl = NUM2INT(flags);
     }
-    tmp = rb_check_string_type(sa);
+    tmp = rb_check_sockaddr_string_type(sa);
     if (!NIL_P(tmp)) {
 	sa = tmp;
-	if (sizeof(ss) < RSTRING(sa)->len) {
+	if (sizeof(ss) < (size_t)RSTRING_LEN(sa)) {
 	    rb_raise(rb_eTypeError, "sockaddr length too big");
 	}
-	memcpy(&ss, RSTRING(sa)->ptr, RSTRING(sa)->len);
-	if (RSTRING(sa)->len != SA_LEN((struct sockaddr*)&ss)) {
+	memcpy(&ss, RSTRING_PTR(sa), RSTRING_LEN(sa));
+	if ((size_t)RSTRING_LEN(sa) != SS_LEN(&ss)) {
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
 	sap = (struct sockaddr*)&ss;
@@ -3674,22 +1195,22 @@ sock_s_getnameinfo(argc, argv)
     if (!NIL_P(tmp)) {
 	sa = tmp;
 	MEMZERO(&hints, struct addrinfo, 1);
-	if (RARRAY(sa)->len == 3) {
-	    af = RARRAY(sa)->ptr[0];
-	    port = RARRAY(sa)->ptr[1];
-	    host = RARRAY(sa)->ptr[2];
+	if (RARRAY_LEN(sa) == 3) {
+	    af = RARRAY_PTR(sa)[0];
+	    port = RARRAY_PTR(sa)[1];
+	    host = RARRAY_PTR(sa)[2];
 	}
-	else if (RARRAY(sa)->len >= 4) {
-	    af = RARRAY(sa)->ptr[0];
-	    port = RARRAY(sa)->ptr[1];
-	    host = RARRAY(sa)->ptr[3];
+	else if (RARRAY_LEN(sa) >= 4) {
+	    af = RARRAY_PTR(sa)[0];
+	    port = RARRAY_PTR(sa)[1];
+	    host = RARRAY_PTR(sa)[3];
 	    if (NIL_P(host)) {
-		host = RARRAY(sa)->ptr[2];
+		host = RARRAY_PTR(sa)[2];
 	    }
 	    else {
 		/*
 		 * 4th element holds numeric form, don't resolve.
-		 * see ipaddr().
+		 * see rsock_ipaddr().
 		 */
 #ifdef AI_NUMERICHOST /* AIX 4.3.3 doesn't have AI_NUMERICHOST. */
 		hints.ai_flags |= AI_NUMERICHOST;
@@ -3698,7 +1219,7 @@ sock_s_getnameinfo(argc, argv)
 	}
 	else {
 	    rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
-		     RARRAY(sa)->len);
+		     RARRAY_LEN(sa));
 	}
 	/* host */
 	if (NIL_P(host)) {
@@ -3725,23 +1246,8 @@ sock_s_getnameinfo(argc, argv)
 	}
 	hints.ai_socktype = (fl & NI_DGRAM) ? SOCK_DGRAM : SOCK_STREAM;
 	/* af */
-	if (NIL_P(af)) {
-	    hints.ai_family = PF_UNSPEC;
-	}
-	else if (FIXNUM_P(af)) {
-	    hints.ai_family = FIX2INT(af);
-	}
-	else if ((ap = StringValuePtr(af)) != 0) {
-	    if (strcmp(ap, "AF_INET") == 0) {
-		hints.ai_family = PF_INET;
-	    }
-#ifdef INET6
-	    else if (strcmp(ap, "AF_INET6") == 0) {
-		hints.ai_family = PF_INET6;
-	    }
-#endif
-	}
-	error = getaddrinfo(hptr, pptr, &hints, &res);
+        hints.ai_family = NIL_P(af) ? PF_UNSPEC : rsock_family_arg(af);
+	error = rb_getaddrinfo(hptr, pptr, &hints, &res);
 	if (error) goto error_exit_addr;
 	sap = res->ai_addr;
     }
@@ -3750,16 +1256,16 @@ sock_s_getnameinfo(argc, argv)
     }
 
   call_nameinfo:
-    error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
-			pbuf, sizeof(pbuf), fl);
+    error = rb_getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
+			   pbuf, sizeof(pbuf), fl);
     if (error) goto error_exit_name;
     if (res) {
 	for (r = res->ai_next; r; r = r->ai_next) {
 	    char hbuf2[1024], pbuf2[1024];
 
 	    sap = r->ai_addr;
-	    error = getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
-				pbuf2, sizeof(pbuf2), fl);
+	    error = rb_getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
+				   pbuf2, sizeof(pbuf2), fl);
 	    if (error) goto error_exit_name;
 	    if (strcmp(hbuf, hbuf2) != 0|| strcmp(pbuf, pbuf2) != 0) {
 		freeaddrinfo(res);
@@ -3772,18 +1278,31 @@ sock_s_getnameinfo(argc, argv)
 
   error_exit_addr:
     if (res) freeaddrinfo(res);
-    rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+    rsock_raise_socket_error("getaddrinfo", error);
 
   error_exit_name:
     if (res) freeaddrinfo(res);
-    rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+    rsock_raise_socket_error("getnameinfo", error);
 }
 
+/*
+ * call-seq:
+ *   Socket.sockaddr_in(port, host)      => sockaddr
+ *   Socket.pack_sockaddr_in(port, host) => sockaddr
+ *
+ * Packs _port_ and _host_ as an AF_INET/AF_INET6 sockaddr string.
+ *
+ *   Socket.sockaddr_in(80, "127.0.0.1")
+ *   #=> "\x02\x00\x00P\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+ *
+ *   Socket.sockaddr_in(80, "::1")
+ *   #=> "\n\x00\x00P\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00"
+ *
+ */
 static VALUE
-sock_s_pack_sockaddr_in(self, port, host)
-    VALUE self, port, host;
+sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
 {
-    struct addrinfo *res = sock_addrinfo(host, port, 0, 0);
+    struct addrinfo *res = rsock_addrinfo(host, port, 0, 0);
     VALUE addr = rb_str_new((char*)res->ai_addr, res->ai_addrlen);
 
     freeaddrinfo(res);
@@ -3793,14 +1312,31 @@ sock_s_pack_sockaddr_in(self, port, host)
     return addr;
 }
 
+/*
+ * call-seq:
+ *   Socket.unpack_sockaddr_in(sockaddr) => [port, ip_address]
+ *
+ * Unpacks _sockaddr_ into port and ip_address.
+ *
+ * _sockaddr_ should be a string or an addrinfo for AF_INET/AF_INET6.
+ *
+ *   sockaddr = Socket.sockaddr_in(80, "127.0.0.1")
+ *   p sockaddr #=> "\x02\x00\x00P\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+ *   p Socket.unpack_sockaddr_in(sockaddr) #=> [80, "127.0.0.1"]
+ *
+ */
 static VALUE
-sock_s_unpack_sockaddr_in(self, addr)
-    VALUE self, addr;
+sock_s_unpack_sockaddr_in(VALUE self, VALUE addr)
 {
     struct sockaddr_in * sockaddr;
     VALUE host;
 
-    sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
+    sockaddr = (struct sockaddr_in*)SockAddrStringValuePtr(addr);
+    if (RSTRING_LEN(addr) <
+        (char*)&((struct sockaddr *)sockaddr)->sa_family +
+        sizeof(((struct sockaddr *)sockaddr)->sa_family) -
+        (char*)sockaddr)
+        rb_raise(rb_eArgError, "too short sockaddr");
     if (((struct sockaddr *)sockaddr)->sa_family != AF_INET
 #ifdef INET6
         && ((struct sockaddr *)sockaddr)->sa_family != AF_INET6
@@ -3812,15 +1348,25 @@ sock_s_unpack_sockaddr_in(self, addr)
         rb_raise(rb_eArgError, "not an AF_INET sockaddr");
 #endif
     }
-    host = make_ipaddr((struct sockaddr*)sockaddr);
+    host = rsock_make_ipaddr((struct sockaddr*)sockaddr);
     OBJ_INFECT(host, addr);
     return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
 }
 
 #ifdef HAVE_SYS_UN_H
+
+/*
+ * call-seq:
+ *   Socket.sockaddr_un(path)      => sockaddr
+ *   Socket.pack_sockaddr_un(path) => sockaddr
+ *
+ * Packs _path_ as an AF_UNIX sockaddr string.
+ *
+ *   Socket.sockaddr_un("/tmp/sock") #=> "\x01\x00/tmp/sock\x00\x00..."
+ *
+ */
 static VALUE
-sock_s_pack_sockaddr_un(self, path)
-    VALUE self, path;
+sock_s_pack_sockaddr_un(VALUE self, VALUE path)
 {
     struct sockaddr_un sockaddr;
     char *sun_path;
@@ -3840,26 +1386,42 @@ sock_s_pack_sockaddr_un(self, path)
     return addr;
 }
 
+/*
+ * call-seq:
+ *   Socket.unpack_sockaddr_un(sockaddr) => path
+ *
+ * Unpacks _sockaddr_ into path.
+ *
+ * _sockaddr_ should be a string or an addrinfo for AF_UNIX.
+ *
+ *   sockaddr = Socket.sockaddr_un("/tmp/sock")
+ *   p Socket.unpack_sockaddr_un(sockaddr) #=> "/tmp/sock"
+ *
+ */
 static VALUE
-sock_s_unpack_sockaddr_un(self, addr)
-    VALUE self, addr;
+sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
 {
     struct sockaddr_un * sockaddr;
-    char *sun_path;
+    const char *sun_path;
     VALUE path;
 
-    sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
+    sockaddr = (struct sockaddr_un*)SockAddrStringValuePtr(addr);
+    if (RSTRING_LEN(addr) <
+        (char*)&((struct sockaddr *)sockaddr)->sa_family +
+        sizeof(((struct sockaddr *)sockaddr)->sa_family) -
+        (char*)sockaddr)
+        rb_raise(rb_eArgError, "too short sockaddr");
     if (((struct sockaddr *)sockaddr)->sa_family != AF_UNIX) {
         rb_raise(rb_eArgError, "not an AF_UNIX sockaddr");
     }
-    if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) {
-        rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
-		 RSTRING(addr)->len, sizeof(struct sockaddr_un));
+    if (sizeof(struct sockaddr_un) < (size_t)RSTRING_LEN(addr)) {
+	rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
+		 RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un));
     }
-    sun_path = unixpath(sockaddr, RSTRING(addr)->len);
-    if (sizeof(struct sockaddr_un) == RSTRING(addr)->len &&
+    sun_path = rsock_unixpath(sockaddr, RSTRING_LENINT(addr));
+    if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) &&
         sun_path == sockaddr->sun_path &&
-        sun_path + strlen(sun_path) == RSTRING(addr)->ptr + RSTRING(addr)->len) {
+        sun_path + strlen(sun_path) == RSTRING_PTR(addr) + RSTRING_LEN(addr)) {
         rb_raise(rb_eArgError, "sockaddr_un.sun_path not NUL terminated");
     }
     path = rb_str_new2(sun_path);
@@ -3868,133 +1430,417 @@ sock_s_unpack_sockaddr_un(self, addr)
 }
 #endif
 
-static VALUE mConst;
+#if defined(HAVE_GETIFADDRS) || defined(SIOCGLIFCONF) || defined(SIOCGIFCONF) || defined(_WIN32)
+static VALUE
+sockaddr_obj(struct sockaddr *addr)
+{
+    socklen_t len;
+#if defined(AF_INET6) && defined(__KAME__)
+    struct sockaddr_in6 addr6;
+#endif
 
-static void
-sock_define_const(name, value)
-    char *name;
-    int value;
+    if (addr == NULL)
+        return Qnil;
+
+    switch (addr->sa_family) {
+      case AF_INET:
+        len = (socklen_t)sizeof(struct sockaddr_in);
+        break;
+
+#ifdef AF_INET6
+      case AF_INET6:
+        len = (socklen_t)sizeof(struct sockaddr_in6);
+#  ifdef __KAME__
+	/* KAME uses the 2nd 16bit word of link local IPv6 address as interface index internally */
+        /* http://orange.kame.net/dev/cvsweb.cgi/kame/IMPLEMENTATION */
+	/* convert fe80:1::1 to fe80::1%1 */
+	memcpy(&addr6, addr, len);
+	addr = (struct sockaddr *)&addr6;
+	if (IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) &&
+	    addr6.sin6_scope_id == 0 &&
+	    (addr6.sin6_addr.s6_addr[2] || addr6.sin6_addr.s6_addr[3])) {
+	    addr6.sin6_scope_id = (addr6.sin6_addr.s6_addr[2] << 8) | addr6.sin6_addr.s6_addr[3];
+	    addr6.sin6_addr.s6_addr[2] = 0;
+	    addr6.sin6_addr.s6_addr[3] = 0;
+	}
+#  endif
+        break;
+#endif
+
+#ifdef HAVE_SYS_UN_H
+      case AF_UNIX:
+        len = (socklen_t)sizeof(struct sockaddr_un);
+        break;
+#endif
+
+      default:
+        len = (socklen_t)sizeof(struct sockaddr_in);
+        break;
+    }
+#ifdef SA_LEN
+    if (len < (socklen_t)SA_LEN(addr))
+	len = (socklen_t)SA_LEN(addr);
+#endif
+
+    return rsock_addrinfo_new(addr, len, addr->sa_family, 0, 0, Qnil, Qnil);
+}
+#endif
+
+#if defined(HAVE_GETIFADDRS) || (defined(SIOCGLIFCONF) && defined(SIOCGLIFNUM) && !defined(__hpux)) || defined(SIOCGIFCONF) ||  defined(_WIN32)
+/*
+ * call-seq:
+ *   Socket.ip_address_list => array
+ *
+ * Returns local IP addresses as an array.
+ *
+ * The array contains Addrinfo objects.
+ *
+ *  pp Socket.ip_address_list
+ *  #=> [#<Addrinfo: 127.0.0.1>,
+ *       #<Addrinfo: 192.168.0.128>,
+ *       #<Addrinfo: ::1>,
+ *       ...]
+ *
+ */
+static VALUE
+socket_s_ip_address_list(VALUE self)
 {
-    rb_define_const(rb_cSocket, name, INT2FIX(value));
-    rb_define_const(mConst, name, INT2FIX(value));
+#if defined(HAVE_GETIFADDRS)
+    struct ifaddrs *ifp = NULL;
+    struct ifaddrs *p;
+    int ret;
+    VALUE list;
+
+    ret = getifaddrs(&ifp);
+    if (ret == -1) {
+        rb_sys_fail("getifaddrs");
+    }
+
+    list = rb_ary_new();
+    for (p = ifp; p; p = p->ifa_next) {
+        if (p->ifa_addr != NULL && IS_IP_FAMILY(p->ifa_addr->sa_family)) {
+            rb_ary_push(list, sockaddr_obj(p->ifa_addr));
+        }
+    }
+
+    freeifaddrs(ifp);
+
+    return list;
+#elif defined(SIOCGLIFCONF) && defined(SIOCGLIFNUM) && !defined(__hpux)
+    /* Solaris if_tcp(7P) */
+    /* HP-UX has SIOCGLIFCONF too.  But it uses different struct */
+    int fd = -1;
+    int ret;
+    struct lifnum ln;
+    struct lifconf lc;
+    char *reason = NULL;
+    int save_errno;
+    int i;
+    VALUE list = Qnil;
+
+    lc.lifc_buf = NULL;
+
+    fd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (fd == -1)
+        rb_sys_fail("socket");
+
+    memset(&ln, 0, sizeof(ln));
+    ln.lifn_family = AF_UNSPEC;
+
+    ret = ioctl(fd, SIOCGLIFNUM, &ln);
+    if (ret == -1) {
+	reason = "SIOCGLIFNUM";
+	goto finish;
+    }
+
+    memset(&lc, 0, sizeof(lc));
+    lc.lifc_family = AF_UNSPEC;
+    lc.lifc_flags = 0;
+    lc.lifc_len = sizeof(struct lifreq) * ln.lifn_count;
+    lc.lifc_req = xmalloc(lc.lifc_len);
+
+    ret = ioctl(fd, SIOCGLIFCONF, &lc);
+    if (ret == -1) {
+	reason = "SIOCGLIFCONF";
+	goto finish;
+    }
+
+    list = rb_ary_new();
+    for (i = 0; i < ln.lifn_count; i++) {
+	struct lifreq *req = &lc.lifc_req[i];
+        if (IS_IP_FAMILY(req->lifr_addr.ss_family)) {
+            if (req->lifr_addr.ss_family == AF_INET6 &&
+                IN6_IS_ADDR_LINKLOCAL(&((struct sockaddr_in6 *)(&req->lifr_addr))->sin6_addr) &&
+                ((struct sockaddr_in6 *)(&req->lifr_addr))->sin6_scope_id == 0) {
+                struct lifreq req2;
+                memcpy(req2.lifr_name, req->lifr_name, LIFNAMSIZ);
+                ret = ioctl(fd, SIOCGLIFINDEX, &req2);
+                if (ret == -1) {
+                    reason = "SIOCGLIFINDEX";
+                    goto finish;
+                }
+                ((struct sockaddr_in6 *)(&req->lifr_addr))->sin6_scope_id = req2.lifr_index;
+            }
+            rb_ary_push(list, sockaddr_obj((struct sockaddr *)&req->lifr_addr));
+        }
+    }
+
+  finish:
+    save_errno = errno;
+    if (lc.lifc_buf != NULL)
+	xfree(lc.lifc_req);
+    if (fd != -1)
+	close(fd);
+    errno = save_errno;
+
+    if (reason)
+	rb_sys_fail(reason);
+    return list;
+
+#elif defined(SIOCGIFCONF)
+    int fd = -1;
+    int ret;
+#define EXTRA_SPACE (sizeof(struct ifconf) + sizeof(struct sockaddr_storage))
+    char initbuf[4096+EXTRA_SPACE];
+    char *buf = initbuf;
+    int bufsize;
+    struct ifconf conf;
+    struct ifreq *req;
+    VALUE list = Qnil;
+    const char *reason = NULL;
+    int save_errno;
+
+    fd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (fd == -1)
+        rb_sys_fail("socket");
+
+    bufsize = sizeof(initbuf);
+    buf = initbuf;
+
+  retry:
+    conf.ifc_len = bufsize;
+    conf.ifc_req = (struct ifreq *)buf;
+
+    /* fprintf(stderr, "bufsize: %d\n", bufsize); */
+
+    ret = ioctl(fd, SIOCGIFCONF, &conf);
+    if (ret == -1) {
+        reason = "SIOCGIFCONF";
+        goto finish;
+    }
+
+    /* fprintf(stderr, "conf.ifc_len: %d\n", conf.ifc_len); */
+
+    if (bufsize - EXTRA_SPACE < conf.ifc_len) {
+	if (bufsize < conf.ifc_len) {
+	    /* NetBSD returns required size for all interfaces. */
+	    bufsize = conf.ifc_len + EXTRA_SPACE;
+	}
+	else {
+	    bufsize = bufsize << 1;
+	}
+	if (buf == initbuf)
+	    buf = NULL;
+	buf = xrealloc(buf, bufsize);
+	goto retry;
+    }
+
+    close(fd);
+    fd = -1;
+
+    list = rb_ary_new();
+    req = conf.ifc_req;
+    while ((char*)req < (char*)conf.ifc_req + conf.ifc_len) {
+	struct sockaddr *addr = &req->ifr_addr;
+        if (IS_IP_FAMILY(addr->sa_family)) {
+	    rb_ary_push(list, sockaddr_obj(addr));
+	}
+#ifdef HAVE_SA_LEN
+# ifndef _SIZEOF_ADDR_IFREQ
+#  define _SIZEOF_ADDR_IFREQ(r) \
+          (sizeof(struct ifreq) + \
+           (sizeof(struct sockaddr) < (r).ifr_addr.sa_len ? \
+            (r).ifr_addr.sa_len - sizeof(struct sockaddr) : \
+            0))
+# endif
+	req = (struct ifreq *)((char*)req + _SIZEOF_ADDR_IFREQ(*req));
+#else
+	req = (struct ifreq *)((char*)req + sizeof(struct ifreq));
+#endif
+    }
+
+  finish:
+
+    save_errno = errno;
+    if (buf != initbuf)
+        xfree(buf);
+    if (fd != -1)
+	close(fd);
+    errno = save_errno;
+
+    if (reason)
+	rb_sys_fail(reason);
+    return list;
+
+#undef EXTRA_SPACE
+#elif defined(_WIN32)
+    typedef struct ip_adapter_unicast_address_st {
+	unsigned LONG_LONG dummy0;
+	struct ip_adapter_unicast_address_st *Next;
+	struct {
+	    struct sockaddr *lpSockaddr;
+	    int iSockaddrLength;
+	} Address;
+	int dummy1;
+	int dummy2;
+	int dummy3;
+	long dummy4;
+	long dummy5;
+	long dummy6;
+    } ip_adapter_unicast_address_t;
+    typedef struct ip_adapter_anycast_address_st {
+	unsigned LONG_LONG dummy0;
+	struct ip_adapter_anycast_address_st *Next;
+	struct {
+	    struct sockaddr *lpSockaddr;
+	    int iSockaddrLength;
+	} Address;
+    } ip_adapter_anycast_address_t;
+    typedef struct ip_adapter_addresses_st {
+	unsigned LONG_LONG dummy0;
+	struct ip_adapter_addresses_st *Next;
+	void *dummy1;
+	ip_adapter_unicast_address_t *FirstUnicastAddress;
+	ip_adapter_anycast_address_t *FirstAnycastAddress;
+	void *dummy2;
+	void *dummy3;
+	void *dummy4;
+	void *dummy5;
+	void *dummy6;
+	BYTE dummy7[8];
+	DWORD dummy8;
+	DWORD dummy9;
+	DWORD dummy10;
+	DWORD IfType;
+	int OperStatus;
+	DWORD dummy12;
+	DWORD dummy13[16];
+	void *dummy14;
+    } ip_adapter_addresses_t;
+    typedef ULONG (WINAPI *GetAdaptersAddresses_t)(ULONG, ULONG, PVOID, ip_adapter_addresses_t *, PULONG);
+    HMODULE h;
+    GetAdaptersAddresses_t pGetAdaptersAddresses;
+    ULONG len;
+    DWORD ret;
+    ip_adapter_addresses_t *adapters;
+    VALUE list;
+
+    h = LoadLibrary("iphlpapi.dll");
+    if (!h)
+	rb_notimplement();
+    pGetAdaptersAddresses = (GetAdaptersAddresses_t)GetProcAddress(h, "GetAdaptersAddresses");
+    if (!pGetAdaptersAddresses) {
+	FreeLibrary(h);
+	rb_notimplement();
+    }
+
+    ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &len);
+    if (ret != ERROR_SUCCESS && ret != ERROR_BUFFER_OVERFLOW) {
+	errno = rb_w32_map_errno(ret);
+	FreeLibrary(h);
+	rb_sys_fail("GetAdaptersAddresses");
+    }
+    adapters = (ip_adapter_addresses_t *)ALLOCA_N(BYTE, len);
+    ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &len);
+    if (ret != ERROR_SUCCESS) {
+	errno = rb_w32_map_errno(ret);
+	FreeLibrary(h);
+	rb_sys_fail("GetAdaptersAddresses");
+    }
+
+    list = rb_ary_new();
+    for (; adapters; adapters = adapters->Next) {
+	ip_adapter_unicast_address_t *uni;
+	ip_adapter_anycast_address_t *any;
+	if (adapters->OperStatus != 1)	/* 1 means IfOperStatusUp */
+	    continue;
+	for (uni = adapters->FirstUnicastAddress; uni; uni = uni->Next) {
+#ifndef INET6
+	    if (uni->Address.lpSockaddr->sa_family == AF_INET)
+#else
+	    if (IS_IP_FAMILY(uni->Address.lpSockaddr->sa_family))
+#endif
+		rb_ary_push(list, sockaddr_obj(uni->Address.lpSockaddr));
+	}
+	for (any = adapters->FirstAnycastAddress; any; any = any->Next) {
+#ifndef INET6
+	    if (any->Address.lpSockaddr->sa_family == AF_INET)
+#else
+	    if (IS_IP_FAMILY(any->Address.lpSockaddr->sa_family))
+#endif
+		rb_ary_push(list, sockaddr_obj(any->Address.lpSockaddr));
+	}
+    }
+
+    FreeLibrary(h);
+    return list;
+#endif
 }
+#else
+#define socket_s_ip_address_list rb_f_notimplement
+#endif
 
 /*
+ * Document-class: ::Socket < BasicSocket
+ *
  * Class +Socket+ provides access to the underlying operating system
  * socket implementations. It can be used to provide more operating system
- * specific functionality than the protocol-specific socket classes but at the
- * expense of greater complexity. In particular, the class handles addresses
- * using +struct sockaddr+ structures packed into Ruby strings, which can be
- * a joy to manipulate.
- * 
+ * specific functionality than the protocol-specific socket classes.
+ *
+ * The constants defined under Socket::Constants are also defined under Socket.
+ * For example, Socket::AF_INET is usable as well as Socket::Constants::AF_INET.
+ * See Socket::Constants for the list of constants.
+ *
  * === Exception Handling
  * Ruby's implementation of +Socket+ causes an exception to be raised
  * based on the error generated by the system dependent implementation.
  * This is why the methods are documented in a way that isolate
  * Unix-based system exceptions from Windows based exceptions. If more
- * information on particular exception is needed please refer to the 
+ * information on particular exception is needed please refer to the
  * Unix manual pages or the Windows WinSock reference.
- * 
- * 
+ *
+ * === Convenient methods
+ *
+ * Although the general way to create socket is Socket.new,
+ * there are several methods for socket creation for most cases.
+ *
+ * * TCP client socket: Socket.tcp, TCPSocket.open
+ * * TCP server socket: Socket.tcp_server_loop, TCPServer.open
+ * * UNIX client socket: Socket.unix, UNIXSocket.open
+ * * UNIX server socket: Socket.unix_server_loop, UNIXServer.open
+ *
  * === Documentation by
  * * Zach Dennis
  * * Sam Roberts
- * * <em>Programming Ruby</em> from The Pragmatic Bookshelf.  
- * 
- * Much material in this documentation is taken with permission from  
- * <em>Programming Ruby</em> from The Pragmatic Bookshelf.  
+ * * <em>Programming Ruby</em> from The Pragmatic Bookshelf.
+ *
+ * Much material in this documentation is taken with permission from
+ * <em>Programming Ruby</em> from The Pragmatic Bookshelf.
  */
 void
 Init_socket()
 {
-    rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
-
-    rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
-    rb_undef_method(rb_cBasicSocket, "initialize");
-
-    rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup",
-			       bsock_do_not_rev_lookup, 0);
-    rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup=",
-			       bsock_do_not_rev_lookup_set, 1);
-    rb_define_singleton_method(rb_cBasicSocket, "for_fd", bsock_s_for_fd, 1);
-
-    rb_define_method(rb_cBasicSocket, "close_read", bsock_close_read, 0);
-    rb_define_method(rb_cBasicSocket, "close_write", bsock_close_write, 0);
-    rb_define_method(rb_cBasicSocket, "shutdown", bsock_shutdown, -1);
-    rb_define_method(rb_cBasicSocket, "setsockopt", bsock_setsockopt, 3);
-    rb_define_method(rb_cBasicSocket, "getsockopt", bsock_getsockopt, 2);
-    rb_define_method(rb_cBasicSocket, "getsockname", bsock_getsockname, 0);
-    rb_define_method(rb_cBasicSocket, "getpeername", bsock_getpeername, 0);
-    rb_define_method(rb_cBasicSocket, "send", bsock_send, -1);
-    rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1);
-    rb_define_method(rb_cBasicSocket, "recv_nonblock", bsock_recv_nonblock, -1);
-
-    rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
-    rb_define_global_const("IPsocket", rb_cIPSocket);
-    rb_define_method(rb_cIPSocket, "addr", ip_addr, 0);
-    rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0);
-    rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
-    rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
-
-    rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
-    rb_define_global_const("TCPsocket", rb_cTCPSocket);
-    rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
-    rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
-
-#ifdef SOCKS
-    rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
-    rb_define_global_const("SOCKSsocket", rb_cSOCKSSocket);
-    rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
-#ifdef SOCKS5
-    rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
-#endif
-#endif
-
-    rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
-    rb_define_global_const("TCPserver", rb_cTCPServer);
-    rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
-    rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 0);
-    rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0);
-    rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1);
-    rb_define_method(rb_cTCPServer, "listen", sock_listen, 1);
-
-    rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
-    rb_define_global_const("UDPsocket", rb_cUDPSocket);
-    rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
-    rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
-    rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
-    rb_define_method(rb_cUDPSocket, "send", udp_send, -1);
-    rb_define_method(rb_cUDPSocket, "recvfrom_nonblock", udp_recvfrom_nonblock, -1);
-
-#ifdef HAVE_SYS_UN_H
-    rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
-    rb_define_global_const("UNIXsocket", rb_cUNIXSocket);
-    rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
-    rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
-    rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
-    rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0);
-    rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1);
-    rb_define_method(rb_cUNIXSocket, "send_io", unix_send_io, 1);
-    rb_define_method(rb_cUNIXSocket, "recv_io", unix_recv_io, -1);
-    rb_define_singleton_method(rb_cUNIXSocket, "socketpair", unix_s_socketpair, -1);
-    rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
-
-    rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
-    rb_define_global_const("UNIXserver", rb_cUNIXServer);
-    rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
-    rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
-    rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 0);
-    rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
-    rb_define_method(rb_cUNIXServer, "listen", sock_listen, 1);
-#endif
+    rsock_init_basicsocket();
 
     rb_cSocket = rb_define_class("Socket", rb_cBasicSocket);
 
-    rb_define_method(rb_cSocket, "initialize", sock_initialize, 3);
+    rsock_init_socket_init();
+
+    rb_define_method(rb_cSocket, "initialize", sock_initialize, -1);
     rb_define_method(rb_cSocket, "connect", sock_connect, 1);
     rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 1);
     rb_define_method(rb_cSocket, "bind", sock_bind, 1);
-    rb_define_method(rb_cSocket, "listen", sock_listen, 1);
+    rb_define_method(rb_cSocket, "listen", rsock_sock_listen, 1);
     rb_define_method(rb_cSocket, "accept", sock_accept, 0);
     rb_define_method(rb_cSocket, "accept_nonblock", sock_accept_nonblock, 0);
     rb_define_method(rb_cSocket, "sysaccept", sock_sysaccept, 0);
@@ -4002,12 +1848,13 @@ Init_socket()
     rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
     rb_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1);
 
-    rb_define_singleton_method(rb_cSocket, "socketpair", sock_s_socketpair, 3);
-    rb_define_singleton_method(rb_cSocket, "pair", sock_s_socketpair, 3);
+    rb_define_singleton_method(rb_cSocket, "socketpair", rsock_sock_s_socketpair, -1);
+    rb_define_singleton_method(rb_cSocket, "pair", rsock_sock_s_socketpair, -1);
     rb_define_singleton_method(rb_cSocket, "gethostname", sock_gethostname, 0);
     rb_define_singleton_method(rb_cSocket, "gethostbyname", sock_s_gethostbyname, 1);
     rb_define_singleton_method(rb_cSocket, "gethostbyaddr", sock_s_gethostbyaddr, -1);
-    rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyaname, -1);
+    rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyname, -1);
+    rb_define_singleton_method(rb_cSocket, "getservbyport", sock_s_getservbyport, -1);
     rb_define_singleton_method(rb_cSocket, "getaddrinfo", sock_s_getaddrinfo, -1);
     rb_define_singleton_method(rb_cSocket, "getnameinfo", sock_s_getnameinfo, -1);
     rb_define_singleton_method(rb_cSocket, "sockaddr_in", sock_s_pack_sockaddr_in, 2);
@@ -4019,702 +1866,5 @@ Init_socket()
     rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_un", sock_s_unpack_sockaddr_un, 1);
 #endif
 
-    /* constants */
-    mConst = rb_define_module_under(rb_cSocket, "Constants");
-    sock_define_const("SOCK_STREAM", SOCK_STREAM);
-    sock_define_const("SOCK_DGRAM", SOCK_DGRAM);
-#ifdef SOCK_RAW
-    sock_define_const("SOCK_RAW", SOCK_RAW);
-#endif
-#ifdef SOCK_RDM
-    sock_define_const("SOCK_RDM", SOCK_RDM);
-#endif
-#ifdef SOCK_SEQPACKET
-    sock_define_const("SOCK_SEQPACKET", SOCK_SEQPACKET);
-#endif
-#ifdef SOCK_PACKET
-    sock_define_const("SOCK_PACKET", SOCK_PACKET);
-#endif
-
-    sock_define_const("AF_INET", AF_INET);
-#ifdef PF_INET
-    sock_define_const("PF_INET", PF_INET);
-#endif
-#ifdef AF_UNIX
-    sock_define_const("AF_UNIX", AF_UNIX);
-    sock_define_const("PF_UNIX", PF_UNIX);
-#endif
-#ifdef AF_AX25
-    sock_define_const("AF_AX25", AF_AX25);
-    sock_define_const("PF_AX25", PF_AX25);
-#endif
-#ifdef AF_IPX
-    sock_define_const("AF_IPX", AF_IPX);
-    sock_define_const("PF_IPX", PF_IPX);
-#endif
-#ifdef AF_APPLETALK
-    sock_define_const("AF_APPLETALK", AF_APPLETALK);
-    sock_define_const("PF_APPLETALK", PF_APPLETALK);
-#endif
-#ifdef AF_UNSPEC
-    sock_define_const("AF_UNSPEC", AF_UNSPEC);
-    sock_define_const("PF_UNSPEC", PF_UNSPEC);
-#endif
-#ifdef INET6
-    sock_define_const("AF_INET6", AF_INET6);
-#endif
-#ifdef INET6
-    sock_define_const("PF_INET6", PF_INET6);
-#endif
-#ifdef AF_LOCAL
-    sock_define_const("AF_LOCAL", AF_LOCAL);
-#endif
-#ifdef PF_LOCAL
-    sock_define_const("PF_LOCAL", PF_LOCAL);
-#endif
-#ifdef AF_IMPLINK
-    sock_define_const("AF_IMPLINK", AF_IMPLINK);
-#endif
-#ifdef PF_IMPLINK
-    sock_define_const("PF_IMPLINK", PF_IMPLINK);
-#endif
-#ifdef AF_PUP
-    sock_define_const("AF_PUP", AF_PUP);
-#endif
-#ifdef PF_PUP
-    sock_define_const("PF_PUP", PF_PUP);
-#endif
-#ifdef AF_CHAOS
-    sock_define_const("AF_CHAOS", AF_CHAOS);
-#endif
-#ifdef PF_CHAOS
-    sock_define_const("PF_CHAOS", PF_CHAOS);
-#endif
-#ifdef AF_NS
-    sock_define_const("AF_NS", AF_NS);
-#endif
-#ifdef PF_NS
-    sock_define_const("PF_NS", PF_NS);
-#endif
-#ifdef AF_ISO
-    sock_define_const("AF_ISO", AF_ISO);
-#endif
-#ifdef PF_ISO
-    sock_define_const("PF_ISO", PF_ISO);
-#endif
-#ifdef AF_OSI
-    sock_define_const("AF_OSI", AF_OSI);
-#endif
-#ifdef PF_OSI
-    sock_define_const("PF_OSI", PF_OSI);
-#endif
-#ifdef AF_ECMA
-    sock_define_const("AF_ECMA", AF_ECMA);
-#endif
-#ifdef PF_ECMA
-    sock_define_const("PF_ECMA", PF_ECMA);
-#endif
-#ifdef AF_DATAKIT
-    sock_define_const("AF_DATAKIT", AF_DATAKIT);
-#endif
-#ifdef PF_DATAKIT
-    sock_define_const("PF_DATAKIT", PF_DATAKIT);
-#endif
-#ifdef AF_CCITT
-    sock_define_const("AF_CCITT", AF_CCITT);
-#endif
-#ifdef PF_CCITT
-    sock_define_const("PF_CCITT", PF_CCITT);
-#endif
-#ifdef AF_SNA
-    sock_define_const("AF_SNA", AF_SNA);
-#endif
-#ifdef PF_SNA
-    sock_define_const("PF_SNA", PF_SNA);
-#endif
-#ifdef AF_DEC
-    sock_define_const("AF_DEC", AF_DEC);
-#endif
-#ifdef PF_DEC
-    sock_define_const("PF_DEC", PF_DEC);
-#endif
-#ifdef AF_DLI
-    sock_define_const("AF_DLI", AF_DLI);
-#endif
-#ifdef PF_DLI
-    sock_define_const("PF_DLI", PF_DLI);
-#endif
-#ifdef AF_LAT
-    sock_define_const("AF_LAT", AF_LAT);
-#endif
-#ifdef PF_LAT
-    sock_define_const("PF_LAT", PF_LAT);
-#endif
-#ifdef AF_HYLINK
-    sock_define_const("AF_HYLINK", AF_HYLINK);
-#endif
-#ifdef PF_HYLINK
-    sock_define_const("PF_HYLINK", PF_HYLINK);
-#endif
-#ifdef AF_ROUTE
-    sock_define_const("AF_ROUTE", AF_ROUTE);
-#endif
-#ifdef PF_ROUTE
-    sock_define_const("PF_ROUTE", PF_ROUTE);
-#endif
-#ifdef AF_LINK
-    sock_define_const("AF_LINK", AF_LINK);
-#endif
-#ifdef PF_LINK
-    sock_define_const("PF_LINK", PF_LINK);
-#endif
-#ifdef AF_COIP
-    sock_define_const("AF_COIP", AF_COIP);
-#endif
-#ifdef PF_COIP
-    sock_define_const("PF_COIP", PF_COIP);
-#endif
-#ifdef AF_CNT
-    sock_define_const("AF_CNT", AF_CNT);
-#endif
-#ifdef PF_CNT
-    sock_define_const("PF_CNT", PF_CNT);
-#endif
-#ifdef AF_SIP
-    sock_define_const("AF_SIP", AF_SIP);
-#endif
-#ifdef PF_SIP
-    sock_define_const("PF_SIP", PF_SIP);
-#endif
-#ifdef AF_NDRV
-    sock_define_const("AF_NDRV", AF_NDRV);
-#endif
-#ifdef PF_NDRV
-    sock_define_const("PF_NDRV", PF_NDRV);
-#endif
-#ifdef AF_ISDN
-    sock_define_const("AF_ISDN", AF_ISDN);
-#endif
-#ifdef PF_ISDN
-    sock_define_const("PF_ISDN", PF_ISDN);
-#endif
-#ifdef AF_NATM
-    sock_define_const("AF_NATM", AF_NATM);
-#endif
-#ifdef PF_NATM
-    sock_define_const("PF_NATM", PF_NATM);
-#endif
-#ifdef AF_SYSTEM
-    sock_define_const("AF_SYSTEM", AF_SYSTEM);
-#endif
-#ifdef PF_SYSTEM
-    sock_define_const("PF_SYSTEM", PF_SYSTEM);
-#endif
-#ifdef AF_NETBIOS
-    sock_define_const("AF_NETBIOS", AF_NETBIOS);
-#endif
-#ifdef PF_NETBIOS
-    sock_define_const("PF_NETBIOS", PF_NETBIOS);
-#endif
-#ifdef AF_PPP
-    sock_define_const("AF_PPP", AF_PPP);
-#endif
-#ifdef PF_PPP
-    sock_define_const("PF_PPP", PF_PPP);
-#endif
-#ifdef AF_ATM
-    sock_define_const("AF_ATM", AF_ATM);
-#endif
-#ifdef PF_ATM
-    sock_define_const("PF_ATM", PF_ATM);
-#endif
-#ifdef AF_NETGRAPH
-    sock_define_const("AF_NETGRAPH", AF_NETGRAPH);
-#endif
-#ifdef PF_NETGRAPH
-    sock_define_const("PF_NETGRAPH", PF_NETGRAPH);
-#endif
-#ifdef AF_MAX
-    sock_define_const("AF_MAX", AF_MAX);
-#endif
-#ifdef PF_MAX
-    sock_define_const("PF_MAX", PF_MAX);
-#endif
-#ifdef AF_E164
-    sock_define_const("AF_E164", AF_E164);
-#endif
-#ifdef PF_XTP
-    sock_define_const("PF_XTP", PF_XTP);
-#endif
-#ifdef PF_RTIP
-    sock_define_const("PF_RTIP", PF_RTIP);
-#endif
-#ifdef PF_PIP
-    sock_define_const("PF_PIP", PF_PIP);
-#endif
-#ifdef PF_KEY
-    sock_define_const("PF_KEY", PF_KEY);
-#endif
-
-    sock_define_const("MSG_OOB", MSG_OOB);
-#ifdef MSG_PEEK
-    sock_define_const("MSG_PEEK", MSG_PEEK);
-#endif
-#ifdef MSG_DONTROUTE
-    sock_define_const("MSG_DONTROUTE", MSG_DONTROUTE);
-#endif
-#ifdef MSG_EOR
-    sock_define_const("MSG_EOR", MSG_EOR);
-#endif
-#ifdef MSG_TRUNC
-    sock_define_const("MSG_TRUNC", MSG_TRUNC);
-#endif
-#ifdef MSG_CTRUNC
-    sock_define_const("MSG_CTRUNC", MSG_CTRUNC);
-#endif
-#ifdef MSG_WAITALL
-    sock_define_const("MSG_WAITALL", MSG_WAITALL);
-#endif
-#ifdef MSG_DONTWAIT
-    sock_define_const("MSG_DONTWAIT", MSG_DONTWAIT);
-#endif
-#ifdef MSG_EOF
-    sock_define_const("MSG_EOF", MSG_EOF);
-#endif
-#ifdef MSG_FLUSH
-    sock_define_const("MSG_FLUSH", MSG_FLUSH);
-#endif
-#ifdef MSG_HOLD
-    sock_define_const("MSG_HOLD", MSG_HOLD);
-#endif
-#ifdef MSG_SEND
-    sock_define_const("MSG_SEND", MSG_SEND);
-#endif
-#ifdef MSG_HAVEMORE
-    sock_define_const("MSG_HAVEMORE", MSG_HAVEMORE);
-#endif
-#ifdef MSG_RCVMORE
-    sock_define_const("MSG_RCVMORE", MSG_RCVMORE);
-#endif
-#ifdef MSG_COMPAT
-    sock_define_const("MSG_COMPAT", MSG_COMPAT);
-#endif
-
-    sock_define_const("SOL_SOCKET", SOL_SOCKET);
-#ifdef SOL_IP
-    sock_define_const("SOL_IP", SOL_IP);
-#endif
-#ifdef SOL_IPX
-    sock_define_const("SOL_IPX", SOL_IPX);
-#endif
-#ifdef SOL_AX25
-    sock_define_const("SOL_AX25", SOL_AX25);
-#endif
-#ifdef SOL_ATALK
-    sock_define_const("SOL_ATALK", SOL_ATALK);
-#endif
-#ifdef SOL_TCP
-    sock_define_const("SOL_TCP", SOL_TCP);
-#endif
-#ifdef SOL_UDP
-    sock_define_const("SOL_UDP", SOL_UDP);
-#endif
-
-#ifdef	IPPROTO_IP
-    sock_define_const("IPPROTO_IP", IPPROTO_IP);
-#else
-    sock_define_const("IPPROTO_IP", 0);
-#endif
-#ifdef	IPPROTO_ICMP
-    sock_define_const("IPPROTO_ICMP", IPPROTO_ICMP);
-#else
-    sock_define_const("IPPROTO_ICMP", 1);
-#endif
-#ifdef	IPPROTO_IGMP
-    sock_define_const("IPPROTO_IGMP", IPPROTO_IGMP);
-#endif
-#ifdef	IPPROTO_GGP
-    sock_define_const("IPPROTO_GGP", IPPROTO_GGP);
-#endif
-#ifdef	IPPROTO_TCP
-    sock_define_const("IPPROTO_TCP", IPPROTO_TCP);
-#else
-    sock_define_const("IPPROTO_TCP", 6);
-#endif
-#ifdef	IPPROTO_EGP
-    sock_define_const("IPPROTO_EGP", IPPROTO_EGP);
-#endif
-#ifdef	IPPROTO_PUP
-    sock_define_const("IPPROTO_PUP", IPPROTO_PUP);
-#endif
-#ifdef	IPPROTO_UDP
-    sock_define_const("IPPROTO_UDP", IPPROTO_UDP);
-#else
-    sock_define_const("IPPROTO_UDP", 17);
-#endif
-#ifdef	IPPROTO_IDP
-    sock_define_const("IPPROTO_IDP", IPPROTO_IDP);
-#endif
-#ifdef	IPPROTO_HELLO
-    sock_define_const("IPPROTO_HELLO", IPPROTO_HELLO);
-#endif
-#ifdef	IPPROTO_ND
-    sock_define_const("IPPROTO_ND", IPPROTO_ND);
-#endif
-#ifdef	IPPROTO_TP
-    sock_define_const("IPPROTO_TP", IPPROTO_TP);
-#endif
-#ifdef	IPPROTO_XTP
-    sock_define_const("IPPROTO_XTP", IPPROTO_XTP);
-#endif
-#ifdef	IPPROTO_EON
-    sock_define_const("IPPROTO_EON", IPPROTO_EON);
-#endif
-#ifdef	IPPROTO_BIP
-    sock_define_const("IPPROTO_BIP", IPPROTO_BIP);
-#endif
-/**/
-#ifdef	IPPROTO_RAW
-    sock_define_const("IPPROTO_RAW", IPPROTO_RAW);
-#else
-    sock_define_const("IPPROTO_RAW", 255);
-#endif
-#ifdef	IPPROTO_MAX
-    sock_define_const("IPPROTO_MAX", IPPROTO_MAX);
-#endif
-
-	/* Some port configuration */
-#ifdef	IPPORT_RESERVED
-    sock_define_const("IPPORT_RESERVED", IPPORT_RESERVED);
-#else
-    sock_define_const("IPPORT_RESERVED", 1024);
-#endif
-#ifdef	IPPORT_USERRESERVED
-    sock_define_const("IPPORT_USERRESERVED", IPPORT_USERRESERVED);
-#else
-    sock_define_const("IPPORT_USERRESERVED", 5000);
-#endif
-	/* Some reserved IP v.4 addresses */
-#ifdef	INADDR_ANY
-    sock_define_const("INADDR_ANY", INADDR_ANY);
-#else
-    sock_define_const("INADDR_ANY", 0x00000000);
-#endif
-#ifdef	INADDR_BROADCAST
-    sock_define_const("INADDR_BROADCAST", INADDR_BROADCAST);
-#else
-    sock_define_const("INADDR_BROADCAST", 0xffffffff);
-#endif
-#ifdef	INADDR_LOOPBACK
-    sock_define_const("INADDR_LOOPBACK", INADDR_LOOPBACK);
-#else
-    sock_define_const("INADDR_LOOPBACK", 0x7F000001);
-#endif
-#ifdef	INADDR_UNSPEC_GROUP
-    sock_define_const("INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
-#else
-    sock_define_const("INADDR_UNSPEC_GROUP", 0xe0000000);
-#endif
-#ifdef	INADDR_ALLHOSTS_GROUP
-    sock_define_const("INADDR_ALLHOSTS_GROUP", INADDR_ALLHOSTS_GROUP);
-#else
-    sock_define_const("INADDR_ALLHOSTS_GROUP", 0xe0000001);
-#endif
-#ifdef	INADDR_MAX_LOCAL_GROUP
-    sock_define_const("INADDR_MAX_LOCAL_GROUP", INADDR_MAX_LOCAL_GROUP);
-#else
-    sock_define_const("INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
-#endif
-#ifdef	INADDR_NONE
-    sock_define_const("INADDR_NONE", INADDR_NONE);
-#else
-    sock_define_const("INADDR_NONE", 0xffffffff);
-#endif
-	/* IP [gs]etsockopt options */
-#ifdef	IP_OPTIONS
-    sock_define_const("IP_OPTIONS", IP_OPTIONS);
-#endif
-#ifdef	IP_HDRINCL
-    sock_define_const("IP_HDRINCL", IP_HDRINCL);
-#endif
-#ifdef	IP_TOS
-    sock_define_const("IP_TOS", IP_TOS);
-#endif
-#ifdef	IP_TTL
-    sock_define_const("IP_TTL", IP_TTL);
-#endif
-#ifdef	IP_RECVOPTS
-    sock_define_const("IP_RECVOPTS", IP_RECVOPTS);
-#endif
-#ifdef	IP_RECVRETOPTS
-    sock_define_const("IP_RECVRETOPTS", IP_RECVRETOPTS);
-#endif
-#ifdef	IP_RECVDSTADDR
-    sock_define_const("IP_RECVDSTADDR", IP_RECVDSTADDR);
-#endif
-#ifdef	IP_RETOPTS
-    sock_define_const("IP_RETOPTS", IP_RETOPTS);
-#endif
-#ifdef	IP_MULTICAST_IF
-    sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF);
-#endif
-#ifdef	IP_MULTICAST_TTL
-    sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL);
-#endif
-#ifdef	IP_MULTICAST_LOOP
-    sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
-#endif
-#ifdef	IP_ADD_MEMBERSHIP
-    sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
-#endif
-#ifdef	IP_DROP_MEMBERSHIP
-    sock_define_const("IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
-#endif
-#ifdef	IP_DEFAULT_MULTICAST_TTL
-    sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL);
-#endif
-#ifdef	IP_DEFAULT_MULTICAST_LOOP
-    sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP);
-#endif
-#ifdef	IP_MAX_MEMBERSHIPS
-    sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
-#endif
-#ifdef SO_DEBUG
-    sock_define_const("SO_DEBUG", SO_DEBUG);
-#endif
-    sock_define_const("SO_REUSEADDR", SO_REUSEADDR);
-#ifdef SO_REUSEPORT
-    sock_define_const("SO_REUSEPORT", SO_REUSEPORT);
-#endif
-#ifdef SO_TYPE
-    sock_define_const("SO_TYPE", SO_TYPE);
-#endif
-#ifdef SO_ERROR
-    sock_define_const("SO_ERROR", SO_ERROR);
-#endif
-#ifdef SO_DONTROUTE
-    sock_define_const("SO_DONTROUTE", SO_DONTROUTE);
-#endif
-#ifdef SO_BROADCAST
-    sock_define_const("SO_BROADCAST", SO_BROADCAST);
-#endif
-#ifdef SO_SNDBUF
-    sock_define_const("SO_SNDBUF", SO_SNDBUF);
-#endif
-#ifdef SO_RCVBUF
-    sock_define_const("SO_RCVBUF", SO_RCVBUF);
-#endif
-#ifdef SO_KEEPALIVE
-    sock_define_const("SO_KEEPALIVE", SO_KEEPALIVE);
-#endif
-#ifdef SO_OOBINLINE
-    sock_define_const("SO_OOBINLINE", SO_OOBINLINE);
-#endif
-#ifdef SO_NO_CHECK
-    sock_define_const("SO_NO_CHECK", SO_NO_CHECK);
-#endif
-#ifdef SO_PRIORITY
-    sock_define_const("SO_PRIORITY", SO_PRIORITY);
-#endif
-#ifdef SO_LINGER
-    sock_define_const("SO_LINGER", SO_LINGER);
-#endif
-#ifdef SO_PASSCRED
-    sock_define_const("SO_PASSCRED", SO_PASSCRED);
-#endif
-#ifdef SO_PEERCRED
-    sock_define_const("SO_PEERCRED", SO_PEERCRED);
-#endif
-#ifdef SO_RCVLOWAT
-    sock_define_const("SO_RCVLOWAT", SO_RCVLOWAT);
-#endif
-#ifdef SO_SNDLOWAT
-    sock_define_const("SO_SNDLOWAT", SO_SNDLOWAT);
-#endif
-#ifdef SO_RCVTIMEO
-    sock_define_const("SO_RCVTIMEO", SO_RCVTIMEO);
-#endif
-#ifdef SO_SNDTIMEO
-    sock_define_const("SO_SNDTIMEO", SO_SNDTIMEO);
-#endif
-#ifdef SO_ACCEPTCONN
-    sock_define_const("SO_ACCEPTCONN", SO_ACCEPTCONN);
-#endif
-#ifdef SO_USELOOPBACK
-    sock_define_const("SO_USELOOPBACK", SO_USELOOPBACK);
-#endif
-#ifdef SO_ACCEPTFILTER
-    sock_define_const("SO_ACCEPTFILTER", SO_ACCEPTFILTER);
-#endif
-#ifdef SO_DONTTRUNC
-    sock_define_const("SO_DONTTRUNC", SO_DONTTRUNC);
-#endif
-#ifdef SO_WANTMORE
-    sock_define_const("SO_WANTMORE", SO_WANTMORE);
-#endif
-#ifdef SO_WANTOOBFLAG
-    sock_define_const("SO_WANTOOBFLAG", SO_WANTOOBFLAG);
-#endif
-#ifdef SO_NREAD
-    sock_define_const("SO_NREAD", SO_NREAD);
-#endif
-#ifdef SO_NKE
-    sock_define_const("SO_NKE", SO_NKE);
-#endif
-#ifdef SO_NOSIGPIPE
-    sock_define_const("SO_NOSIGPIPE", SO_NOSIGPIPE);
-#endif
-
-#ifdef SO_SECURITY_AUTHENTICATION
-    sock_define_const("SO_SECURITY_AUTHENTICATION", SO_SECURITY_AUTHENTICATION);
-#endif
-#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
-    sock_define_const("SO_SECURITY_ENCRYPTION_TRANSPORT", SO_SECURITY_ENCRYPTION_TRANSPORT);
-#endif
-#ifdef SO_SECURITY_ENCRYPTION_NETWORK
-    sock_define_const("SO_SECURITY_ENCRYPTION_NETWORK", SO_SECURITY_ENCRYPTION_NETWORK);
-#endif
-
-#ifdef SO_BINDTODEVICE
-    sock_define_const("SO_BINDTODEVICE", SO_BINDTODEVICE);
-#endif
-#ifdef SO_ATTACH_FILTER
-    sock_define_const("SO_ATTACH_FILTER", SO_ATTACH_FILTER);
-#endif
-#ifdef SO_DETACH_FILTER
-    sock_define_const("SO_DETACH_FILTER", SO_DETACH_FILTER);
-#endif
-#ifdef SO_PEERNAME
-    sock_define_const("SO_PEERNAME", SO_PEERNAME);
-#endif
-#ifdef SO_TIMESTAMP
-    sock_define_const("SO_TIMESTAMP", SO_TIMESTAMP);
-#endif
-
-#ifdef SOPRI_INTERACTIVE
-    sock_define_const("SOPRI_INTERACTIVE", SOPRI_INTERACTIVE);
-#endif
-#ifdef SOPRI_NORMAL
-    sock_define_const("SOPRI_NORMAL", SOPRI_NORMAL);
-#endif
-#ifdef SOPRI_BACKGROUND
-    sock_define_const("SOPRI_BACKGROUND", SOPRI_BACKGROUND);
-#endif
-
-#ifdef IPX_TYPE
-    sock_define_const("IPX_TYPE", IPX_TYPE);
-#endif
-
-#ifdef TCP_NODELAY
-    sock_define_const("TCP_NODELAY", TCP_NODELAY);
-#endif
-#ifdef TCP_MAXSEG
-    sock_define_const("TCP_MAXSEG", TCP_MAXSEG);
-#endif
-
-#ifdef EAI_ADDRFAMILY
-    sock_define_const("EAI_ADDRFAMILY", EAI_ADDRFAMILY);
-#endif
-#ifdef EAI_AGAIN
-    sock_define_const("EAI_AGAIN", EAI_AGAIN);
-#endif
-#ifdef EAI_BADFLAGS
-    sock_define_const("EAI_BADFLAGS", EAI_BADFLAGS);
-#endif
-#ifdef EAI_FAIL
-    sock_define_const("EAI_FAIL", EAI_FAIL);
-#endif
-#ifdef EAI_FAMILY
-    sock_define_const("EAI_FAMILY", EAI_FAMILY);
-#endif
-#ifdef EAI_MEMORY
-    sock_define_const("EAI_MEMORY", EAI_MEMORY);
-#endif
-#ifdef EAI_NODATA
-    sock_define_const("EAI_NODATA", EAI_NODATA);
-#endif
-#ifdef EAI_NONAME
-    sock_define_const("EAI_NONAME", EAI_NONAME);
-#endif
-#ifdef EAI_SERVICE
-    sock_define_const("EAI_SERVICE", EAI_SERVICE);
-#endif
-#ifdef EAI_SOCKTYPE
-    sock_define_const("EAI_SOCKTYPE", EAI_SOCKTYPE);
-#endif
-#ifdef EAI_SYSTEM
-    sock_define_const("EAI_SYSTEM", EAI_SYSTEM);
-#endif
-#ifdef EAI_BADHINTS
-    sock_define_const("EAI_BADHINTS", EAI_BADHINTS);
-#endif
-#ifdef EAI_PROTOCOL
-    sock_define_const("EAI_PROTOCOL", EAI_PROTOCOL);
-#endif
-#ifdef EAI_MAX
-    sock_define_const("EAI_MAX", EAI_MAX);
-#endif
-#ifdef AI_PASSIVE
-    sock_define_const("AI_PASSIVE", AI_PASSIVE);
-#endif
-#ifdef AI_CANONNAME
-    sock_define_const("AI_CANONNAME", AI_CANONNAME);
-#endif
-#ifdef AI_NUMERICHOST
-    sock_define_const("AI_NUMERICHOST", AI_NUMERICHOST);
-#endif
-#ifdef AI_MASK
-    sock_define_const("AI_MASK", AI_MASK);
-#endif
-#ifdef AI_ALL
-    sock_define_const("AI_ALL", AI_ALL);
-#endif
-#ifdef AI_V4MAPPED_CFG
-    sock_define_const("AI_V4MAPPED_CFG", AI_V4MAPPED_CFG);
-#endif
-#ifdef AI_ADDRCONFIG
-    sock_define_const("AI_ADDRCONFIG", AI_ADDRCONFIG);
-#endif
-#ifdef AI_V4MAPPED
-    sock_define_const("AI_V4MAPPED", AI_V4MAPPED);
-#endif
-#ifdef AI_DEFAULT
-    sock_define_const("AI_DEFAULT", AI_DEFAULT);
-#endif
-#ifdef NI_MAXHOST
-    sock_define_const("NI_MAXHOST", NI_MAXHOST);
-#endif
-#ifdef NI_MAXSERV
-    sock_define_const("NI_MAXSERV", NI_MAXSERV);
-#endif
-#ifdef NI_NOFQDN
-    sock_define_const("NI_NOFQDN", NI_NOFQDN);
-#endif
-#ifdef NI_NUMERICHOST
-    sock_define_const("NI_NUMERICHOST", NI_NUMERICHOST);
-#endif
-#ifdef NI_NAMEREQD
-    sock_define_const("NI_NAMEREQD", NI_NAMEREQD);
-#endif
-#ifdef NI_NUMERICSERV
-    sock_define_const("NI_NUMERICSERV", NI_NUMERICSERV);
-#endif
-#ifdef NI_DGRAM
-    sock_define_const("NI_DGRAM", NI_DGRAM);
-#endif
-#ifdef SHUT_RD
-    sock_define_const("SHUT_RD", SHUT_RD);
-#else
-    sock_define_const("SHUT_RD", 0);
-#endif
-#ifdef SHUT_WR
-    sock_define_const("SHUT_WR", SHUT_WR);
-#else
-    sock_define_const("SHUT_WR", 1);
-#endif
-#ifdef SHUT_RDWR
-    sock_define_const("SHUT_RDWR", SHUT_RDWR);
-#else
-    sock_define_const("SHUT_RDWR", 2);
-#endif
+    rb_define_singleton_method(rb_cSocket, "ip_address_list", socket_s_ip_address_list, 0);
 }
diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h
index e1cddf53f4..5f2fd24530 100644
--- a/ext/socket/sockport.h
+++ b/ext/socket/sockport.h
@@ -3,7 +3,6 @@
   sockport.h -
 
   $Author$
-  $Date$
   created at: Fri Apr 30 23:19:34 JST 1999
 
 ************************************************/
@@ -11,25 +10,34 @@
 #ifndef SOCKPORT_H
 #define SOCKPORT_H
 
-#ifndef SA_LEN
+#ifdef SA_LEN
+#  define SS_LEN(ss) (ss)->ss_len
+#else
 # ifdef HAVE_SA_LEN
 #  define SA_LEN(sa) (sa)->sa_len
+#  define SS_LEN(ss) (ss)->ss_len
 # else
-#  ifdef INET6
+#  ifdef AF_INET6
 #   define SA_LEN(sa) \
 	(((sa)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
 				       : sizeof(struct sockaddr))
+#   define SS_LEN(ss) \
+	(((ss)->ss_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
+				       : sizeof(struct sockaddr))
 #  else
     /* by tradition, sizeof(struct sockaddr) covers most of the sockaddrs */
 #   define SA_LEN(sa)	(sizeof(struct sockaddr))
+#   define SS_LEN(ss)	(sizeof(struct sockaddr))
 #  endif
 # endif
 #endif
 
 #ifdef HAVE_SA_LEN
-# define SET_SA_LEN(sa, len) (sa)->sa_len = (len)
+# define SET_SA_LEN(sa, len) (void)((sa)->sa_len = (len))
+# define SET_SS_LEN(ss, len) (void)((ss)->ss_len = (len))
 #else
-# define SET_SA_LEN(sa, len) (len)
+# define SET_SA_LEN(sa, len) (void)(len)
+# define SET_SS_LEN(ss, len) (void)(len)
 #endif
 
 #ifdef HAVE_SIN_LEN
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
new file mode 100644
index 0000000000..cbe8792271
--- /dev/null
+++ b/ext/socket/sockssocket.c
@@ -0,0 +1,58 @@
+/************************************************
+
+  sockssocket.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+#ifdef SOCKS
+static VALUE
+socks_init(VALUE sock, VALUE host, VALUE serv)
+{
+    static int init = 0;
+
+    if (init == 0) {
+	SOCKSinit("ruby");
+	init = 1;
+    }
+
+    return rsock_init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
+}
+
+#ifdef SOCKS5
+static VALUE
+socks_s_close(VALUE sock)
+{
+    rb_io_t *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+    }
+    GetOpenFile(sock, fptr);
+    shutdown(fptr->fd, 2);
+    return rb_io_close(sock);
+}
+#endif
+#endif
+
+/*
+ * Document-class: ::SOCKSSocket < TCPSocket
+ *
+ * SOCKSSocket class
+ */
+void
+rsock_init_sockssocket(void)
+{
+#ifdef SOCKS
+    rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
+    rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
+#ifdef SOCKS5
+    rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
+#endif
+#endif
+}
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c
new file mode 100644
index 0000000000..7bb02d91f0
--- /dev/null
+++ b/ext/socket/tcpserver.c
@@ -0,0 +1,145 @@
+/************************************************
+
+  tcpserver.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+/*
+ * call-seq:
+ *   TCPServer.new([hostname,] port)                    => tcpserver
+ *
+ * Creates a new server socket bound to _port_.
+ *
+ * If _hostname_ is given, the socket is bound to it.
+ *
+ *   serv = TCPServer.new("127.0.0.1", 28561)
+ *   s = serv.accept
+ *   s.puts Time.now
+ *   s.close
+ */
+static VALUE
+tcp_svr_init(int argc, VALUE *argv, VALUE sock)
+{
+    VALUE hostname, port;
+
+    rb_scan_args(argc, argv, "011", &hostname, &port);
+    return rsock_init_inetsock(sock, hostname, port, Qnil, Qnil, INET_SERVER);
+}
+
+/*
+ * call-seq:
+ *   tcpserver.accept => tcpsocket
+ *
+ *   TCPServer.open("127.0.0.1", 14641) {|serv|
+ *     s = serv.accept
+ *     s.puts Time.now
+ *     s.close
+ *   }
+ *
+ */
+static VALUE
+tcp_accept(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_storage from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = (socklen_t)sizeof(from);
+    return rsock_s_accept(rb_cTCPSocket, fptr->fd,
+		          (struct sockaddr*)&from, &fromlen);
+}
+
+/*
+ * call-seq:
+ * 	tcpserver.accept_nonblock => tcpsocket
+ *
+ * Accepts an incoming connection using accept(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * It returns an accepted TCPSocket for the incoming connection.
+ *
+ * === Example
+ * 	require 'socket'
+ * 	serv = TCPServer.new(2202)
+ * 	begin # emulate blocking accept
+ * 	  sock = serv.accept_nonblock
+ * 	rescue IO::WaitReadable, Errno::EINTR
+ * 	  IO.select([serv])
+ * 	  retry
+ * 	end
+ * 	# sock is an accepted socket.
+ *
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to TCPServer#accept_nonblock fails.
+ *
+ * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
+ * including Errno::EWOULDBLOCK.
+ *
+ * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED, Errno::EPROTO,
+ * it is extended by IO::WaitReadable.
+ * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
+ *
+ * === See
+ * * TCPServer#accept
+ * * Socket#accept
+ */
+static VALUE
+tcp_accept_nonblock(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_storage from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = (socklen_t)sizeof(from);
+    return rsock_s_accept_nonblock(rb_cTCPSocket, fptr,
+			           (struct sockaddr *)&from, &fromlen);
+}
+
+/*
+ * call-seq:
+ *   tcpserver.sysaccept => file_descriptor
+ *
+ * Returns a file descriptor of a accepted connection.
+ *
+ *   TCPServer.open("127.0.0.1", 28561) {|serv|
+ *     fd = serv.sysaccept
+ *     s = IO.for_fd(fd)
+ *     s.puts Time.now
+ *     s.close
+ *   }
+ *
+ */
+static VALUE
+tcp_sysaccept(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_storage from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = (socklen_t)sizeof(from);
+    return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
+}
+
+/*
+ * Document-class: ::TCPServer < TCPSocket
+ *
+ * TCPServer represents a TCP/IP server socket.
+ */
+void
+rsock_init_tcpserver(void)
+{
+    rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
+    rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
+    rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 0);
+    rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0);
+    rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1);
+    rb_define_method(rb_cTCPServer, "listen", rsock_sock_listen, 1); /* in socket.c */
+}
diff --git a/ext/socket/tcpsocket.c b/ext/socket/tcpsocket.c
new file mode 100644
index 0000000000..42d75d6015
--- /dev/null
+++ b/ext/socket/tcpsocket.c
@@ -0,0 +1,69 @@
+/************************************************
+
+  tcpsocket.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+/*
+ * call-seq:
+ *    TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil)
+ *
+ * Opens a TCP connection to +remote_host+ on +remote_port+.  If +local_host+
+ * and +local_port+ are specified, then those parameters are used on the local
+ * end to establish the connection.
+ */
+static VALUE
+tcp_init(int argc, VALUE *argv, VALUE sock)
+{
+    VALUE remote_host, remote_serv;
+    VALUE local_host, local_serv;
+
+    rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
+			&local_host, &local_serv);
+
+    return rsock_init_inetsock(sock, remote_host, remote_serv,
+			       local_host, local_serv, INET_CLIENT);
+}
+
+static VALUE
+tcp_sockaddr(struct sockaddr *addr, size_t len)
+{
+    return rsock_make_ipaddr(addr);
+}
+
+/*
+ * call-seq:
+ *   TCPSocket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
+ *
+ * Lookups host information by _hostname_.
+ *
+ *   TCPSocket.gethostbyname("localhost")
+ *   #=> ["localhost", ["hal"], 2, "127.0.0.1"]
+ *
+ */
+static VALUE
+tcp_s_gethostbyname(VALUE obj, VALUE host)
+{
+    rb_secure(3);
+    return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME),
+			tcp_sockaddr);
+}
+
+/*
+ * Document-class: ::TCPSocket < IPSocket
+ *
+ * TCPSocket represents a TCP/IP client socket.
+ */
+void
+rsock_init_tcpsocket(void)
+{
+    rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
+    rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
+    rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
+}
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
new file mode 100644
index 0000000000..b278523eba
--- /dev/null
+++ b/ext/socket/udpsocket.c
@@ -0,0 +1,264 @@
+/************************************************
+
+  udpsocket.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+/*
+ * call-seq:
+ *   UDPSocket.new([address_family]) => socket
+ *
+ * Creates a new UDPSocket object.
+ *
+ * _address_family_ should be an integer, a string or a symbol:
+ * Socket::AF_INET, "AF_INET", :INET, etc.
+ *
+ *   UDPSocket.new                   #=> #<UDPSocket:fd 3>
+ *   UDPSocket.new(Socket::AF_INET6) #=> #<UDPSocket:fd 4>
+ *
+ */
+static VALUE
+udp_init(int argc, VALUE *argv, VALUE sock)
+{
+    VALUE arg;
+    int family = AF_INET;
+    int fd;
+
+    rb_secure(3);
+    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
+	family = rsock_family_arg(arg);
+    }
+    fd = rsock_socket(family, SOCK_DGRAM, 0);
+    if (fd < 0) {
+	rb_sys_fail("socket(2) - udp");
+    }
+
+    return rsock_init_sock(sock, fd);
+}
+
+struct udp_arg
+{
+    struct addrinfo *res;
+    int fd;
+};
+
+static VALUE
+udp_connect_internal(struct udp_arg *arg)
+{
+    int fd = arg->fd;
+    struct addrinfo *res;
+
+    for (res = arg->res; res; res = res->ai_next) {
+	if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+VALUE rsock_freeaddrinfo(struct addrinfo *addr);
+
+/*
+ * call-seq:
+ *   udpsocket.connect(host, port) => 0
+ *
+ * Connects _udpsocket_ to _host_:_port_.
+ *
+ * This makes possible to send without destination address.
+ *
+ *   u1 = UDPSocket.new
+ *   u1.bind("127.0.0.1", 4913)
+ *   u2 = UDPSocket.new
+ *   u2.connect("127.0.0.1", 4913)
+ *   u2.send "uuuu", 0
+ *   p u1.recvfrom(10) #=> ["uuuu", ["AF_INET", 33230, "localhost", "127.0.0.1"]]
+ *
+ */
+static VALUE
+udp_connect(VALUE sock, VALUE host, VALUE port)
+{
+    rb_io_t *fptr;
+    struct udp_arg arg;
+    VALUE ret;
+
+    rb_secure(3);
+    arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
+    GetOpenFile(sock, fptr);
+    arg.fd = fptr->fd;
+    ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
+		    rsock_freeaddrinfo, (VALUE)arg.res);
+    if (!ret) rb_sys_fail("connect(2)");
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *   udpsocket.bind(host, port) #=> 0
+ *
+ * Binds _udpsocket_ to _host_:_port_.
+ *
+ *   u1 = UDPSocket.new
+ *   u1.bind("127.0.0.1", 4913)
+ *   u1.send "message-to-self", 0, "127.0.0.1", 4913
+ *   p u1.recvfrom(10) #=> ["message-to", ["AF_INET", 4913, "localhost", "127.0.0.1"]]
+ *
+ */
+static VALUE
+udp_bind(VALUE sock, VALUE host, VALUE port)
+{
+    rb_io_t *fptr;
+    struct addrinfo *res0, *res;
+
+    rb_secure(3);
+    res0 = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
+    GetOpenFile(sock, fptr);
+    for (res = res0; res; res = res->ai_next) {
+	if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
+	    continue;
+	}
+	freeaddrinfo(res0);
+	return INT2FIX(0);
+    }
+    freeaddrinfo(res0);
+    rb_sys_fail("bind(2)");
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *   udpsocket.send(mesg, flags, host, port)  => numbytes_sent
+ *   udpsocket.send(mesg, flags, sockaddr_to) => numbytes_sent
+ *   udpsocket.send(mesg, flags)              => numbytes_sent
+ *
+ * Sends _mesg_ via _udpsocket_.
+ *
+ * _flags_ should be a bitwise OR of Socket::MSG_* constants.
+ *
+ *   u1 = UDPSocket.new
+ *   u1.bind("127.0.0.1", 4913)
+ *
+ *   u2 = UDPSocket.new
+ *   u2.send "hi", 0, "127.0.0.1", 4913
+ *
+ *   mesg, addr = u1.recvfrom(10)
+ *   u1.send mesg, 0, addr[3], addr[1]
+ *
+ *   p u2.recv(100) #=> "hi"
+ *
+ */
+static VALUE
+udp_send(int argc, VALUE *argv, VALUE sock)
+{
+    VALUE flags, host, port;
+    rb_io_t *fptr;
+    int n;
+    struct addrinfo *res0, *res;
+    struct rsock_send_arg arg;
+
+    if (argc == 2 || argc == 3) {
+	return rsock_bsock_send(argc, argv, sock);
+    }
+    rb_secure(4);
+    rb_scan_args(argc, argv, "4", &arg.mesg, &flags, &host, &port);
+
+    StringValue(arg.mesg);
+    res0 = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
+    GetOpenFile(sock, fptr);
+    arg.fd = fptr->fd;
+    arg.flags = NUM2INT(flags);
+    for (res = res0; res; res = res->ai_next) {
+      retry:
+	arg.to = res->ai_addr;
+	arg.tolen = res->ai_addrlen;
+	rb_thread_fd_writable(arg.fd);
+	n = (int)BLOCKING_REGION(rsock_sendto_blocking, &arg);
+	if (n >= 0) {
+	    freeaddrinfo(res0);
+	    return INT2FIX(n);
+	}
+	if (rb_io_wait_writable(fptr->fd)) {
+	    goto retry;
+	}
+    }
+    freeaddrinfo(res0);
+    rb_sys_fail("sendto(2)");
+    return INT2FIX(n);
+}
+
+/*
+ * call-seq:
+ * 	udpsocket.recvfrom_nonblock(maxlen) => [mesg, sender_inet_addr]
+ * 	udpsocket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_inet_addr]
+ *
+ * Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * If _maxlen_ is omitted, its default value is 65536.
+ * _flags_ is zero or more of the +MSG_+ options.
+ * The first element of the results, _mesg_, is the data received.
+ * The second element, _sender_inet_addr_, is an array to represent the sender address.
+ *
+ * When recvfrom(2) returns 0,
+ * Socket#recvfrom_nonblock returns an empty string as data.
+ * It means an empty packet.
+ *
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options
+ *
+ * === Example
+ * 	require 'socket'
+ * 	s1 = UDPSocket.new
+ * 	s1.bind("127.0.0.1", 0)
+ * 	s2 = UDPSocket.new
+ * 	s2.bind("127.0.0.1", 0)
+ * 	s2.connect(*s1.addr.values_at(3,1))
+ * 	s1.connect(*s2.addr.values_at(3,1))
+ * 	s1.send "aaa", 0
+ * 	begin # emulate blocking recvfrom
+ * 	  p s2.recvfrom_nonblock(10)  #=> ["aaa", ["AF_INET", 33302, "localhost.localdomain", "127.0.0.1"]]
+ * 	rescue IO::WaitReadable
+ * 	  IO.select([s2])
+ * 	  retry
+ * 	end
+ *
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recvfrom_nonblock_ fails.
+ *
+ * UDPSocket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
+ * including Errno::EWOULDBLOCK.
+ *
+ * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
+ * it is extended by IO::WaitReadable.
+ * So IO::WaitReadable can be used to rescue the exceptions for retrying recvfrom_nonblock.
+ *
+ * === See
+ * * Socket#recvfrom
+ */
+static VALUE
+udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
+{
+    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
+}
+
+/*
+ * Document-class: ::UDPSocket < IPSocket
+ *
+ * UDPSocket represents a UDP/IP socket.
+ */
+void
+rsock_init_udpsocket(void)
+{
+    rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
+    rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
+    rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
+    rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
+    rb_define_method(rb_cUDPSocket, "send", udp_send, -1);
+    rb_define_method(rb_cUDPSocket, "recvfrom_nonblock", udp_recvfrom_nonblock, -1);
+}
+
diff --git a/ext/socket/unixserver.c b/ext/socket/unixserver.c
new file mode 100644
index 0000000000..4fdc1d709d
--- /dev/null
+++ b/ext/socket/unixserver.c
@@ -0,0 +1,154 @@
+/************************************************
+
+  unixserver.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+#ifdef HAVE_SYS_UN_H
+/*
+ * call-seq:
+ *   UNIXServer.new(path) => unixserver
+ *
+ * Creates a new UNIX server socket bound to _path_.
+ *
+ *   serv = UNIXServer.new("/tmp/sock")
+ *   s = serv.accept
+ *   p s.read
+ */
+static VALUE
+unix_svr_init(VALUE sock, VALUE path)
+{
+    return rsock_init_unixsock(sock, path, 1);
+}
+
+/*
+ * call-seq:
+ *   unixserver.accept => unixsocket
+ *
+ * Accepts a new connection.
+ * It returns new UNIXSocket object.
+ *
+ *   UNIXServer.open("/tmp/sock") {|serv|
+ *     UNIXSocket.open("/tmp/sock") {|c|
+ *       s = serv.accept
+ *       s.puts "hi"
+ *       s.close
+ *       p c.read #=> "hi\n"
+ *     }
+ *   }
+ *
+ */
+static VALUE
+unix_accept(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_un from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = (socklen_t)sizeof(struct sockaddr_un);
+    return rsock_s_accept(rb_cUNIXSocket, fptr->fd,
+		          (struct sockaddr*)&from, &fromlen);
+}
+
+/*
+ * call-seq:
+ * 	unixserver.accept_nonblock => unixsocket
+ *
+ * Accepts an incoming connection using accept(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * It returns an accepted UNIXSocket for the incoming connection.
+ *
+ * === Example
+ * 	require 'socket'
+ * 	serv = UNIXServer.new("/tmp/sock")
+ * 	begin # emulate blocking accept
+ * 	  sock = serv.accept_nonblock
+ * 	rescue IO::WaitReadable, Errno::EINTR
+ * 	  IO.select([serv])
+ * 	  retry
+ * 	end
+ * 	# sock is an accepted socket.
+ *
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to UNIXServer#accept_nonblock fails.
+ *
+ * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
+ * including Errno::EWOULDBLOCK.
+ *
+ * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED or Errno::EPROTO,
+ * it is extended by IO::WaitReadable.
+ * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
+ *
+ * === See
+ * * UNIXServer#accept
+ * * Socket#accept
+ */
+static VALUE
+unix_accept_nonblock(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_un from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = (socklen_t)sizeof(from);
+    return rsock_s_accept_nonblock(rb_cUNIXSocket, fptr,
+			           (struct sockaddr *)&from, &fromlen);
+}
+
+/*
+ * call-seq:
+ *   unixserver.sysaccept => file_descriptor
+ *
+ * Accepts a new connection.
+ * It returns the new file descriptor which is an integer.
+ *
+ *   UNIXServer.open("/tmp/sock") {|serv|
+ *     UNIXSocket.open("/tmp/sock") {|c|
+ *       fd = serv.sysaccept
+ *       s = IO.new(fd)
+ *       s.puts "hi"
+ *       s.close
+ *       p c.read #=> "hi\n"
+ *     }
+ *   }
+ *
+ */
+static VALUE
+unix_sysaccept(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_un from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = (socklen_t)sizeof(struct sockaddr_un);
+    return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
+}
+
+#endif
+
+/*
+ * Document-class: ::UNIXServer < UNIXSocket
+ *
+ * UNIXServer represents a UNIX domain stream server socket.
+ */
+void
+rsock_init_unixserver(void)
+{
+#ifdef HAVE_SYS_UN_H
+    rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
+    rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
+    rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
+    rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 0);
+    rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
+    rb_define_method(rb_cUNIXServer, "listen", rsock_sock_listen, 1); /* in socket.c */
+#endif
+}
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
new file mode 100644
index 0000000000..3e3a8ba0d7
--- /dev/null
+++ b/ext/socket/unixsocket.c
@@ -0,0 +1,514 @@
+/************************************************
+
+  unixsocket.c -
+
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+************************************************/
+
+#include "rubysocket.h"
+
+#ifdef HAVE_SYS_UN_H
+struct unixsock_arg {
+    struct sockaddr_un *sockaddr;
+    int fd;
+};
+
+static VALUE
+unixsock_connect_internal(VALUE a)
+{
+    struct unixsock_arg *arg = (struct unixsock_arg *)a;
+    return (VALUE)rsock_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
+			        (socklen_t)sizeof(*arg->sockaddr), 0);
+}
+
+VALUE
+rsock_init_unixsock(VALUE sock, VALUE path, int server)
+{
+    struct sockaddr_un sockaddr;
+    int fd, status;
+    rb_io_t *fptr;
+
+    SafeStringValue(path);
+    fd = rsock_socket(AF_UNIX, SOCK_STREAM, 0);
+    if (fd < 0) {
+	rb_sys_fail("socket(2)");
+    }
+
+    MEMZERO(&sockaddr, struct sockaddr_un, 1);
+    sockaddr.sun_family = AF_UNIX;
+    if (sizeof(sockaddr.sun_path) <= (size_t)RSTRING_LEN(path)) {
+        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
+            (int)sizeof(sockaddr.sun_path)-1);
+    }
+    memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
+
+    if (server) {
+        status = bind(fd, (struct sockaddr*)&sockaddr, (socklen_t)sizeof(sockaddr));
+    }
+    else {
+	int prot;
+	struct unixsock_arg arg;
+	arg.sockaddr = &sockaddr;
+	arg.fd = fd;
+        status = (int)rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
+	if (prot) {
+	    close(fd);
+	    rb_jump_tag(prot);
+	}
+    }
+
+    if (status < 0) {
+	close(fd);
+	rb_sys_fail(sockaddr.sun_path);
+    }
+
+    if (server) {
+	if (listen(fd, 5) < 0) {
+	    close(fd);
+	    rb_sys_fail("listen(2)");
+	}
+    }
+
+    rsock_init_sock(sock, fd);
+    if (server) {
+	GetOpenFile(sock, fptr);
+        fptr->pathv = rb_str_new_frozen(path);
+    }
+
+    return sock;
+}
+
+/*
+ * call-seq:
+ *   UNIXSocket.new(path) => unixsocket
+ *
+ * Creates a new UNIX client socket connected to _path_.
+ *
+ *   s = UNIXSocket.new("/tmp/sock")
+ *   s.send "hello", 0
+ *
+ */
+static VALUE
+unix_init(VALUE sock, VALUE path)
+{
+    return rsock_init_unixsock(sock, path, 0);
+}
+
+/*
+ * call-seq:
+ *   unixsocket.path => path
+ *
+ * Returns the path of the local address of unixsocket.
+ *
+ *   s = UNIXServer.new("/tmp/sock")
+ *   p s.path #=> "/tmp/sock"
+ *
+ */
+static VALUE
+unix_path(VALUE sock)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (NIL_P(fptr->pathv)) {
+	struct sockaddr_un addr;
+	socklen_t len = (socklen_t)sizeof(addr);
+	if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+	    rb_sys_fail(0);
+	fptr->pathv = rb_obj_freeze(rb_str_new_cstr(rsock_unixpath(&addr, len)));
+    }
+    return rb_str_dup(fptr->pathv);
+}
+
+/*
+ * call-seq:
+ *   unixsocket.recvfrom(maxlen [, flags]) => [mesg, unixaddress]
+ *
+ * Receives a message via _unixsocket_.
+ *
+ * _maxlen_ is the maximum number of bytes to receive.
+ *
+ * _flags_ should be a bitwise OR of Socket::MSG_* constants.
+ *
+ *   s1 = Socket.new(:UNIX, :DGRAM, 0)
+ *   s1_ai = Addrinfo.unix("/tmp/sock1")
+ *   s1.bind(s1_ai)
+ *
+ *   s2 = Socket.new(:UNIX, :DGRAM, 0)
+ *   s2_ai = Addrinfo.unix("/tmp/sock2")
+ *   s2.bind(s2_ai)
+ *   s3 = UNIXSocket.for_fd(s2.fileno)
+ *
+ *   s1.send "a", 0, s2_ai
+ *   p s3.recvfrom(10) #=> ["a", ["AF_UNIX", "/tmp/sock1"]]
+ *
+ */
+static VALUE
+unix_recvfrom(int argc, VALUE *argv, VALUE sock)
+{
+    return rsock_s_recvfrom(sock, argc, argv, RECV_UNIX);
+}
+
+#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
+#define FD_PASSING_BY_MSG_CONTROL 1
+#else
+#define FD_PASSING_BY_MSG_CONTROL 0
+#endif
+
+#if defined(HAVE_ST_MSG_ACCRIGHTS)
+#define FD_PASSING_BY_MSG_ACCRIGHTS 1
+#else
+#define FD_PASSING_BY_MSG_ACCRIGHTS 0
+#endif
+
+struct iomsg_arg {
+    int fd;
+    struct msghdr msg;
+};
+
+#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+static VALUE
+sendmsg_blocking(void *data)
+{
+    struct iomsg_arg *arg = data;
+    return sendmsg(arg->fd, &arg->msg, 0);
+}
+
+/*
+ * call-seq:
+ *   unixsocket.send_io(io) => nil
+ *
+ * Sends _io_ as file descriptor passing.
+ *
+ *   s1, s2 = UNIXSocket.pair
+ *
+ *   s1.send_io STDOUT
+ *   stdout = s2.recv_io
+ *
+ *   p STDOUT.fileno #=> 1
+ *   p stdout.fileno #=> 6
+ *
+ *   stdout.puts "hello" # outputs "hello\n" to standard output.
+ */
+static VALUE
+unix_send_io(VALUE sock, VALUE val)
+{
+    int fd;
+    rb_io_t *fptr;
+    struct iomsg_arg arg;
+    struct iovec vec[1];
+    char buf[1];
+
+#if FD_PASSING_BY_MSG_CONTROL
+    struct {
+	struct cmsghdr hdr;
+        char pad[8+sizeof(int)+8];
+    } cmsg;
+#endif
+
+    if (rb_obj_is_kind_of(val, rb_cIO)) {
+        rb_io_t *valfptr;
+	GetOpenFile(val, valfptr);
+	fd = valfptr->fd;
+    }
+    else if (FIXNUM_P(val)) {
+        fd = FIX2INT(val);
+    }
+    else {
+	rb_raise(rb_eTypeError, "neither IO nor file descriptor");
+    }
+
+    GetOpenFile(sock, fptr);
+
+    arg.msg.msg_name = NULL;
+    arg.msg.msg_namelen = 0;
+
+    /* Linux and Solaris doesn't work if msg_iov is NULL. */
+    buf[0] = '\0';
+    vec[0].iov_base = buf;
+    vec[0].iov_len = 1;
+    arg.msg.msg_iov = vec;
+    arg.msg.msg_iovlen = 1;
+
+#if FD_PASSING_BY_MSG_CONTROL
+    arg.msg.msg_control = (caddr_t)&cmsg;
+    arg.msg.msg_controllen = (socklen_t)CMSG_LEN(sizeof(int));
+    arg.msg.msg_flags = 0;
+    MEMZERO((char*)&cmsg, char, sizeof(cmsg));
+    cmsg.hdr.cmsg_len = (socklen_t)CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_level = SOL_SOCKET;
+    cmsg.hdr.cmsg_type = SCM_RIGHTS;
+    memcpy(CMSG_DATA(&cmsg.hdr), &fd, sizeof(int));
+#else
+    arg.msg.msg_accrights = (caddr_t)&fd;
+    arg.msg.msg_accrightslen = sizeof(fd);
+#endif
+
+    arg.fd = fptr->fd;
+    while ((int)BLOCKING_REGION(sendmsg_blocking, &arg) == -1) {
+	if (!rb_io_wait_writable(arg.fd))
+	    rb_sys_fail("sendmsg(2)");
+    }
+
+    return Qnil;
+}
+#else
+#define unix_send_io rb_f_notimplement
+#endif
+
+#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+static VALUE
+recvmsg_blocking(void *data)
+{
+    struct iomsg_arg *arg = data;
+    return recvmsg(arg->fd, &arg->msg, 0);
+}
+
+/*
+ * call-seq:
+ *   unixsocket.recv_io([klass [, mode]]) => io
+ *
+ *   UNIXServer.open("/tmp/sock") {|serv|
+ *     UNIXSocket.open("/tmp/sock") {|c|
+ *       s = serv.accept
+ *
+ *       c.send_io STDOUT
+ *       stdout = s.recv_io
+ *
+ *       p STDOUT.fileno #=> 1
+ *       p stdout.fileno #=> 7
+ *
+ *       stdout.puts "hello" # outputs "hello\n" to standard output.
+ *     }
+ *   }
+ *
+ */
+static VALUE
+unix_recv_io(int argc, VALUE *argv, VALUE sock)
+{
+    VALUE klass, mode;
+    rb_io_t *fptr;
+    struct iomsg_arg arg;
+    struct iovec vec[2];
+    char buf[1];
+
+    int fd;
+#if FD_PASSING_BY_MSG_CONTROL
+    struct {
+	struct cmsghdr hdr;
+        char pad[8+sizeof(int)+8];
+    } cmsg;
+#endif
+
+    rb_scan_args(argc, argv, "02", &klass, &mode);
+    if (argc == 0)
+	klass = rb_cIO;
+    if (argc <= 1)
+	mode = Qnil;
+
+    GetOpenFile(sock, fptr);
+
+    arg.msg.msg_name = NULL;
+    arg.msg.msg_namelen = 0;
+
+    vec[0].iov_base = buf;
+    vec[0].iov_len = sizeof(buf);
+    arg.msg.msg_iov = vec;
+    arg.msg.msg_iovlen = 1;
+
+#if FD_PASSING_BY_MSG_CONTROL
+    arg.msg.msg_control = (caddr_t)&cmsg;
+    arg.msg.msg_controllen = (socklen_t)CMSG_SPACE(sizeof(int));
+    arg.msg.msg_flags = 0;
+    cmsg.hdr.cmsg_len = (socklen_t)CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_level = SOL_SOCKET;
+    cmsg.hdr.cmsg_type = SCM_RIGHTS;
+    fd = -1;
+    memcpy(CMSG_DATA(&cmsg.hdr), &fd, sizeof(int));
+#else
+    arg.msg.msg_accrights = (caddr_t)&fd;
+    arg.msg.msg_accrightslen = sizeof(fd);
+    fd = -1;
+#endif
+
+    arg.fd = fptr->fd;
+    while ((int)BLOCKING_REGION(recvmsg_blocking, &arg) == -1) {
+	if (!rb_io_wait_readable(arg.fd))
+	    rb_sys_fail("recvmsg(2)");
+    }
+
+#if FD_PASSING_BY_MSG_CONTROL
+    if (arg.msg.msg_controllen < sizeof(struct cmsghdr)) {
+	rb_raise(rb_eSocket,
+		 "file descriptor was not passed (msg_controllen=%d smaller than sizeof(struct cmsghdr)=%d)",
+		 (int)arg.msg.msg_controllen, (int)sizeof(struct cmsghdr));
+    }
+    if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
+	rb_raise(rb_eSocket,
+		 "file descriptor was not passed (cmsg_level=%d, %d expected)",
+		 cmsg.hdr.cmsg_level, SOL_SOCKET);
+    }
+    if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
+	rb_raise(rb_eSocket,
+		 "file descriptor was not passed (cmsg_type=%d, %d expected)",
+		 cmsg.hdr.cmsg_type, SCM_RIGHTS);
+    }
+    if (arg.msg.msg_controllen < CMSG_LEN(sizeof(int))) {
+	rb_raise(rb_eSocket,
+		 "file descriptor was not passed (msg_controllen=%d smaller than CMSG_LEN(sizeof(int))=%d)",
+		 (int)arg.msg.msg_controllen, (int)CMSG_LEN(sizeof(int)));
+    }
+    if (CMSG_SPACE(sizeof(int)) < arg.msg.msg_controllen) {
+	rb_raise(rb_eSocket,
+		 "file descriptor was not passed (msg_controllen=%d bigger than CMSG_SPACE(sizeof(int))=%d)",
+		 (int)arg.msg.msg_controllen, (int)CMSG_SPACE(sizeof(int)));
+    }
+    if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
+	rsock_discard_cmsg_resource(&arg.msg);
+	rb_raise(rb_eSocket,
+		 "file descriptor was not passed (cmsg_len=%d, %d expected)",
+		 (int)cmsg.hdr.cmsg_len, (int)CMSG_LEN(sizeof(int)));
+    }
+#else
+    if (arg.msg.msg_accrightslen != sizeof(fd)) {
+	rb_raise(rb_eSocket,
+		 "file descriptor was not passed (accrightslen) : %d != %d",
+		 arg.msg.msg_accrightslen, (int)sizeof(fd));
+    }
+#endif
+
+#if FD_PASSING_BY_MSG_CONTROL
+    memcpy(&fd, CMSG_DATA(&cmsg.hdr), sizeof(int));
+#endif
+
+    if (klass == Qnil)
+	return INT2FIX(fd);
+    else {
+	ID for_fd;
+	int ff_argc;
+	VALUE ff_argv[2];
+	CONST_ID(for_fd, "for_fd");
+	ff_argc = mode == Qnil ? 1 : 2;
+	ff_argv[0] = INT2FIX(fd);
+	ff_argv[1] = mode;
+        return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
+    }
+}
+#else
+#define unix_recv_io rb_f_notimplement
+#endif
+
+/*
+ * call-seq:
+ *   unixsocket.addr => [address_family, unix_path]
+ *
+ * Returns the local address as an array which contains
+ * address_family and unix_path.
+ *
+ * Example
+ *   serv = UNIXServer.new("/tmp/sock")
+ *   p serv.addr #=> ["AF_UNIX", "/tmp/sock"]
+ */
+static VALUE
+unix_addr(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_un addr;
+    socklen_t len = (socklen_t)sizeof addr;
+
+    GetOpenFile(sock, fptr);
+
+    if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getsockname(2)");
+    return rsock_unixaddr(&addr, len);
+}
+
+/*
+ * call-seq:
+ *   unixsocket.peeraddr => [address_family, unix_path]
+ *
+ * Returns the remote address as an array which contains
+ * address_family and unix_path.
+ *
+ * Example
+ *   serv = UNIXServer.new("/tmp/sock")
+ *   c = UNIXSocket.new("/tmp/sock")
+ *   p c.peeraddr #=> ["AF_UNIX", "/tmp/sock"]
+ */
+static VALUE
+unix_peeraddr(VALUE sock)
+{
+    rb_io_t *fptr;
+    struct sockaddr_un addr;
+    socklen_t len = (socklen_t)sizeof addr;
+
+    GetOpenFile(sock, fptr);
+
+    if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getpeername(2)");
+    return rsock_unixaddr(&addr, len);
+}
+
+/*
+ * call-seq:
+ *   UNIXSocket.pair([type [, protocol]])       => [unixsocket1, unixsocket2]
+ *   UNIXSocket.socketpair([type [, protocol]]) => [unixsocket1, unixsocket2]
+ *
+ * Creates a pair of sockets connected each other.
+ *
+ * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
+ *
+ * _protocol_ should be a protocol defined in the domain.
+ * 0 is default protocol for the domain.
+ *
+ *   s1, s2 = UNIXSocket.pair
+ *   s1.send "a", 0
+ *   s1.send "b", 0
+ *   p s2.recv(10) #=> "ab"
+ *
+ */
+static VALUE
+unix_s_socketpair(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE domain, type, protocol;
+    VALUE args[3];
+
+    domain = INT2FIX(PF_UNIX);
+    rb_scan_args(argc, argv, "02", &type, &protocol);
+    if (argc == 0)
+	type = INT2FIX(SOCK_STREAM);
+    if (argc <= 1)
+	protocol = INT2FIX(0);
+
+    args[0] = domain;
+    args[1] = type;
+    args[2] = protocol;
+
+    return rsock_sock_s_socketpair(3, args, klass);
+}
+#endif
+
+/*
+ * Document-class: ::UNIXSocket < BasicSocket
+ *
+ * UNIXSocket represents a UNIX domain stream client socket.
+ */
+void
+rsock_init_unixsocket(void)
+{
+#ifdef HAVE_SYS_UN_H
+    rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
+    rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
+    rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
+    rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
+    rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0);
+    rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1);
+    rb_define_method(rb_cUNIXSocket, "send_io", unix_send_io, 1);
+    rb_define_method(rb_cUNIXSocket, "recv_io", unix_recv_io, -1);
+    rb_define_singleton_method(rb_cUNIXSocket, "socketpair", unix_s_socketpair, -1);
+    rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
+#endif
+}
diff --git a/ext/stringio/.cvsignore b/ext/stringio/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/stringio/.cvsignore
+++ b/ext/stringio/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/stringio/README b/ext/stringio/README
index c4031f7e97..10dd237de8 100644
--- a/ext/stringio/README
+++ b/ext/stringio/README
@@ -1,6 +1,5 @@
 -*- rd -*-
 $Author$
-$Date$
 
 =begin
 
diff --git a/ext/stringio/depend b/ext/stringio/depend
index cc9eae3f55..338ebde529 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -1,2 +1,3 @@
-stringio.o: stringio.c $(hdrdir)/ruby.h $(topdir)/config.h \
-  $(hdrdir)/defines.h $(hdrdir)/intern.h $(hdrdir)/rubyio.h
+stringio.o: stringio.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
+  $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h 
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 7355afd770..3ca5001fe0 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -3,7 +3,6 @@
   stringio.c -
 
   $Author$
-  $Date$
   $RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
   created at: Tue Feb 19 04:10:38 JST 2002
 
@@ -13,15 +12,14 @@
 **********************************************************************/
 
 #include "ruby.h"
-#include "rubyio.h"
+#include "ruby/io.h"
+#include "ruby/encoding.h"
 #if defined(HAVE_FCNTL_H) || defined(_WIN32)
 #include <fcntl.h>
 #elif defined(HAVE_SYS_FCNTL_H)
 #include <sys/fcntl.h>
 #endif
 
-#define STRIO_EOF FMODE_SYNC
-
 struct StringIO {
     VALUE string;
     long pos;
@@ -30,20 +28,13 @@ struct StringIO {
     int count;
 };
 
-static struct StringIO* strio_alloc _((void));
-static void strio_mark _((struct StringIO *));
-static void strio_free _((struct StringIO *));
-static struct StringIO* check_strio _((VALUE));
-static struct StringIO* get_strio _((VALUE));
-static struct StringIO* readable _((struct StringIO *));
-static struct StringIO* writable _((struct StringIO *));
-static void check_modifiable _((struct StringIO *));
+static void strio_init(int, VALUE *, struct StringIO *);
 
-#define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark)
+#define IS_STRIO(obj) (rb_typeddata_is_kind_of(obj, &strio_data_type))
 #define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
 
 static struct StringIO *
-strio_alloc()
+strio_alloc(void)
 {
     struct StringIO *ptr = ALLOC(struct StringIO);
     ptr->string = Qnil;
@@ -55,40 +46,44 @@ strio_alloc()
 }
 
 static void
-strio_mark(ptr)
-    struct StringIO *ptr;
+strio_mark(void *p)
 {
+    struct StringIO *ptr = p;
     if (ptr) {
 	rb_gc_mark(ptr->string);
     }
 }
 
 static void
-strio_free(ptr)
-    struct StringIO *ptr;
+strio_free(void *p)
 {
+    struct StringIO *ptr = p;
     if (--ptr->count <= 0) {
 	xfree(ptr);
     }
 }
 
-static struct StringIO*
-check_strio(self)
-    VALUE self;
+static size_t
+strio_memsize(const void *p)
 {
-    Check_Type(self, T_DATA);
-    if (!IS_STRIO(self)) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected StringIO)",
-		 rb_class2name(CLASS_OF(self)));
-    }
-    return DATA_PTR(self);
+    const struct StringIO *ptr = p;
+    if (!ptr) return 0;
+    return sizeof(struct StringIO);
 }
 
+static const rb_data_type_t strio_data_type = {
+    "strio",
+    strio_mark,
+    strio_free,
+    strio_memsize,
+};
+
+#define check_strio(self) ((struct StringIO*)rb_check_typeddata(self, &strio_data_type))
+
 static struct StringIO*
-get_strio(self)
-    VALUE self;
+get_strio(VALUE self)
 {
-    struct StringIO *ptr = check_strio(self);
+    struct StringIO *ptr = check_strio(rb_io_taint_check(self));
 
     if (!ptr) {
 	rb_raise(rb_eIOError, "uninitialized stream");
@@ -96,6 +91,18 @@ get_strio(self)
     return ptr;
 }
 
+static VALUE
+strio_substr(struct StringIO *ptr, long pos, long len)
+{
+    VALUE str = ptr->string;
+    rb_encoding *enc = rb_enc_get(str);
+    long rlen = RSTRING_LEN(str) - pos;
+
+    if (len > rlen) len = rlen;
+    if (len < 0) len = 0;
+    return rb_enc_str_new(RSTRING_PTR(str)+pos, len, enc);
+}
+
 #define StringIO(obj) get_strio(obj)
 
 #define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
@@ -103,8 +110,7 @@ get_strio(self)
 #define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
 
 static struct StringIO*
-readable(ptr)
-    struct StringIO *ptr;
+readable(struct StringIO *ptr)
 {
     if (!READABLE(ptr)) {
 	rb_raise(rb_eIOError, "not opened for reading");
@@ -113,8 +119,7 @@ readable(ptr)
 }
 
 static struct StringIO*
-writable(ptr)
-    struct StringIO *ptr;
+writable(struct StringIO *ptr)
 {
     if (!WRITABLE(ptr)) {
 	rb_raise(rb_eIOError, "not opened for writing");
@@ -126,84 +131,17 @@ writable(ptr)
 }
 
 static void
-check_modifiable(ptr)
-    struct StringIO *ptr;
+check_modifiable(struct StringIO *ptr)
 {
     if (OBJ_FROZEN(ptr->string)) {
 	rb_raise(rb_eIOError, "not modifiable string");
     }
 }
 
-static VALUE strio_s_allocate _((VALUE));
-static VALUE strio_s_open _((int, VALUE *, VALUE));
-static void strio_init _((int, VALUE *, struct StringIO *));
-static VALUE strio_initialize _((int, VALUE *, VALUE));
-static VALUE strio_finalize _((VALUE));
-static VALUE strio_self _((VALUE));
-static VALUE strio_false _((VALUE));
-static VALUE strio_nil _((VALUE));
-static VALUE strio_0 _((VALUE));
-static VALUE strio_first _((VALUE, VALUE));
-static VALUE strio_unimpl _((int, VALUE *, VALUE));
-static VALUE strio_get_string _((VALUE));
-static VALUE strio_set_string _((VALUE, VALUE));
-static VALUE strio_close _((VALUE));
-static VALUE strio_close_read _((VALUE));
-static VALUE strio_close_write _((VALUE));
-static VALUE strio_closed _((VALUE));
-static VALUE strio_closed_read _((VALUE));
-static VALUE strio_closed_write _((VALUE));
-static VALUE strio_eof _((VALUE));
-static VALUE strio_get_lineno _((VALUE));
-static VALUE strio_set_lineno _((VALUE, VALUE));
-static VALUE strio_get_pos _((VALUE));
-static VALUE strio_set_pos _((VALUE, VALUE));
-static VALUE strio_rewind _((VALUE));
-static VALUE strio_seek _((int, VALUE *, VALUE));
-static VALUE strio_get_sync _((VALUE));
-static VALUE strio_each_byte _((VALUE));
-static VALUE strio_getc _((VALUE));
-static VALUE strio_ungetc _((VALUE, VALUE));
-static VALUE strio_readchar _((VALUE));
-static VALUE strio_getline _((int, VALUE *, struct StringIO *));
-static VALUE strio_gets _((int, VALUE *, VALUE));
-static VALUE strio_readline _((int, VALUE *, VALUE));
-static VALUE strio_each _((int, VALUE *, VALUE));
-static VALUE strio_readlines _((int, VALUE *, VALUE));
-static VALUE strio_write _((VALUE, VALUE));
-static VALUE strio_putc _((VALUE, VALUE));
-static VALUE strio_read _((int, VALUE *, VALUE));
-static VALUE strio_size _((VALUE));
-static VALUE strio_truncate _((VALUE, VALUE));
-void Init_stringio _((void));
-
-/* Boyer-Moore search: copied from regex.c */
-static void bm_init_skip _((long *, const char *, long));
-static long bm_search _((const char *, long, const char *, long, const long *));
-
-static VALUE
-strio_s_allocate(klass)
-    VALUE klass;
-{
-    return Data_Wrap_Struct(klass, strio_mark, strio_free, 0);
-}
-
-/*
- * call-seq: StringIO.open(string=""[, mode]) {|strio| ...}
- *
- * Equivalent to StringIO.new except that when it is called with a block, it
- * yields with the new instance and closes it, and returns the result which
- * returned from the block.
- */
 static VALUE
-strio_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+strio_s_allocate(VALUE klass)
 {
-    VALUE obj = rb_class_new_instance(argc, argv, klass);
-    if (!rb_block_given_p()) return obj;
-    return rb_ensure(rb_yield, obj, strio_finalize, obj);
+    return TypedData_Wrap_Struct(klass, &strio_data_type, 0);
 }
 
 /*
@@ -212,10 +150,7 @@ strio_s_open(argc, argv, klass)
  * Creates new StringIO instance from with _string_ and _mode_.
  */
 static VALUE
-strio_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_initialize(int argc, VALUE *argv, VALUE self)
 {
     struct StringIO *ptr = check_strio(self);
 
@@ -228,13 +163,10 @@ strio_initialize(argc, argv, self)
 }
 
 static void
-strio_init(argc, argv, ptr)
-    int argc;
-    VALUE *argv;
-    struct StringIO *ptr;
+strio_init(int argc, VALUE *argv, struct StringIO *ptr)
 {
     VALUE string, mode;
-    int trunc = Qfalse;
+    int trunc = 0;
 
     switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
       case 2:
@@ -262,16 +194,17 @@ strio_init(argc, argv, ptr)
 	ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
 	break;
       case 0:
-	string = rb_str_new("", 0);
+	string = rb_enc_str_new("", 0, rb_default_external_encoding());
 	ptr->flags = FMODE_READWRITE;
 	break;
     }
     ptr->string = string;
+    ptr->pos = 0;
+    ptr->lineno = 0;
 }
 
 static VALUE
-strio_finalize(self)
-    VALUE self;
+strio_finalize(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     ptr->string = Qnil;
@@ -280,11 +213,25 @@ strio_finalize(self)
 }
 
 /*
+ * call-seq: StringIO.open(string=""[, mode]) {|strio| ...}
+ *
+ * Equivalent to StringIO.new except that when it is called with a block, it
+ * yields with the new instance and closes it, and returns the result which
+ * returned from the block.
+ */
+static VALUE
+strio_s_open(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE obj = rb_class_new_instance(argc, argv, klass);
+    if (!rb_block_given_p()) return obj;
+    return rb_ensure(rb_yield, obj, strio_finalize, obj);
+}
+
+/*
  * Returns +false+.  Just for compatibility to IO.
  */
 static VALUE
-strio_false(self)
-    VALUE self;
+strio_false(VALUE self)
 {
     StringIO(self);
     return Qfalse;
@@ -294,8 +241,7 @@ strio_false(self)
  * Returns +nil+.  Just for compatibility to IO.
  */
 static VALUE
-strio_nil(self)
-    VALUE self;
+strio_nil(VALUE self)
 {
     StringIO(self);
     return Qnil;
@@ -305,8 +251,7 @@ strio_nil(self)
  * Returns *strio* itself.  Just for compatibility to IO.
  */
 static VALUE
-strio_self(self)
-    VALUE self;
+strio_self(VALUE self)
 {
     StringIO(self);
     return self;
@@ -316,8 +261,7 @@ strio_self(self)
  * Returns 0.  Just for compatibility to IO.
  */
 static VALUE
-strio_0(self)
-    VALUE self;
+strio_0(VALUE self)
 {
     StringIO(self);
     return INT2FIX(0);
@@ -327,8 +271,7 @@ strio_0(self)
  * Returns the argument unchanged.  Just for compatibility to IO.
  */
 static VALUE
-strio_first(self, arg)
-    VALUE self, arg;
+strio_first(VALUE self, VALUE arg)
 {
     StringIO(self);
     return arg;
@@ -338,10 +281,7 @@ strio_first(self, arg)
  * Raises NotImplementedError.
  */
 static VALUE
-strio_unimpl(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_unimpl(int argc, VALUE *argv, VALUE self)
 {
     StringIO(self);
     rb_notimplement();
@@ -354,8 +294,7 @@ strio_unimpl(argc, argv, self)
  * Returns underlying String object, the subject of IO.
  */
 static VALUE
-strio_get_string(self)
-    VALUE self;
+strio_get_string(VALUE self)
 {
     return StringIO(self)->string;
 }
@@ -367,12 +306,11 @@ strio_get_string(self)
  * Changes underlying String object, the subject of IO.
  */
 static VALUE
-strio_set_string(self, string)
-    VALUE self, string;
+strio_set_string(VALUE self, VALUE string)
 {
     struct StringIO *ptr = StringIO(self);
 
-    if (!OBJ_TAINTED(self)) rb_secure(4);
+    rb_io_taint_check(self);
     ptr->flags &= ~FMODE_READWRITE;
     StringValue(string);
     ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
@@ -385,12 +323,11 @@ strio_set_string(self, string)
  * call-seq:
  *   strio.close  -> nil
  *
- * Closes strio.  The *strio* is unavailable for any further data 
+ * Closes strio.  The *strio* is unavailable for any further data
  * operations; an +IOError+ is raised if such an attempt is made.
  */
 static VALUE
-strio_close(self)
-    VALUE self;
+strio_close(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     if (CLOSED(ptr)) {
@@ -408,8 +345,7 @@ strio_close(self)
  * *strio* is not readable.
  */
 static VALUE
-strio_close_read(self)
-    VALUE self;
+strio_close_read(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     if (!READABLE(ptr)) {
@@ -427,8 +363,7 @@ strio_close_read(self)
  * *strio* is not writeable.
  */
 static VALUE
-strio_close_write(self)
-    VALUE self;
+strio_close_write(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     if (!WRITABLE(ptr)) {
@@ -445,8 +380,7 @@ strio_close_write(self)
  * Returns +true+ if *strio* is completely closed, +false+ otherwise.
  */
 static VALUE
-strio_closed(self)
-    VALUE self;
+strio_closed(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     if (!CLOSED(ptr)) return Qfalse;
@@ -460,8 +394,7 @@ strio_closed(self)
  * Returns +true+ if *strio* is not readable, +false+ otherwise.
  */
 static VALUE
-strio_closed_read(self)
-    VALUE self;
+strio_closed_read(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     if (READABLE(ptr)) return Qfalse;
@@ -475,8 +408,7 @@ strio_closed_read(self)
  * Returns +true+ if *strio* is not writable, +false+ otherwise.
  */
 static VALUE
-strio_closed_write(self)
-    VALUE self;
+strio_closed_write(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     if (WRITABLE(ptr)) return Qfalse;
@@ -488,22 +420,20 @@ strio_closed_write(self)
  *   strio.eof     -> true or false
  *   strio.eof?    -> true or false
  *
- * Returns true if *strio* is at end of file. The stringio must be  
+ * Returns true if *strio* is at end of file. The stringio must be
  * opened for reading or an +IOError+ will be raised.
  */
 static VALUE
-strio_eof(self)
-    VALUE self;
+strio_eof(VALUE self)
 {
     struct StringIO *ptr = readable(StringIO(self));
-    if (ptr->pos < RSTRING(ptr->string)->len) return Qfalse;
+    if (ptr->pos < RSTRING_LEN(ptr->string)) return Qfalse;
     return Qtrue;
 }
 
 /* :nodoc: */
 static VALUE
-strio_copy(copy, orig)
-    VALUE copy, orig;
+strio_copy(VALUE copy, VALUE orig)
 {
     struct StringIO *ptr;
 
@@ -530,8 +460,7 @@ strio_copy(copy, orig)
  * newline.  See also the  <code>$.</code> variable.
  */
 static VALUE
-strio_get_lineno(self)
-    VALUE self;
+strio_get_lineno(VALUE self)
 {
     return LONG2NUM(StringIO(self)->lineno);
 }
@@ -544,8 +473,7 @@ strio_get_lineno(self)
  * <code>$.</code> is updated only on the next read.
  */
 static VALUE
-strio_set_lineno(self, lineno)
-    VALUE self, lineno;
+strio_set_lineno(VALUE self, VALUE lineno)
 {
     StringIO(self)->lineno = NUM2LONG(lineno);
     return lineno;
@@ -568,16 +496,13 @@ strio_set_lineno(self, lineno)
  *   strio.reopen(other_StrIO)     -> strio
  *   strio.reopen(string, mode)    -> strio
  *
- * Reinitializes *strio* with the given <i>other_StrIO</i> or _string_ 
+ * Reinitializes *strio* with the given <i>other_StrIO</i> or _string_
  * and _mode_ (see StringIO#new).
  */
 static VALUE
-strio_reopen(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_reopen(int argc, VALUE *argv, VALUE self)
 {
-    if (!OBJ_TAINTED(self)) rb_secure(4);
+    rb_io_taint_check(self);
     if (argc == 1 && TYPE(*argv) != T_STRING) {
 	return strio_copy(self, *argv);
     }
@@ -593,8 +518,7 @@ strio_reopen(argc, argv, self)
  * Returns the current offset (in bytes) of *strio*.
  */
 static VALUE
-strio_get_pos(self)
-    VALUE self;
+strio_get_pos(VALUE self)
 {
     return LONG2NUM(StringIO(self)->pos);
 }
@@ -606,9 +530,7 @@ strio_get_pos(self)
  * Seeks to the given position (in bytes) in *strio*.
  */
 static VALUE
-strio_set_pos(self, pos)
-    VALUE self;
-    VALUE pos;
+strio_set_pos(VALUE self, VALUE pos)
 {
     struct StringIO *ptr = StringIO(self);
     long p = NUM2LONG(pos);
@@ -616,7 +538,6 @@ strio_set_pos(self, pos)
 	error_inval(0);
     }
     ptr->pos = p;
-    ptr->flags &= ~STRIO_EOF;
     return pos;
 }
 
@@ -628,13 +549,11 @@ strio_set_pos(self, pos)
  * +lineno+ to zero.
  */
 static VALUE
-strio_rewind(self)
-    VALUE self;
+strio_rewind(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     ptr->pos = 0;
     ptr->lineno = 0;
-    ptr->flags &= ~STRIO_EOF;
     return INT2FIX(0);
 }
 
@@ -646,10 +565,7 @@ strio_rewind(self)
  * the value of _whence_ (see IO#seek).
  */
 static VALUE
-strio_seek(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_seek(int argc, VALUE *argv, VALUE self)
 {
     VALUE whence;
     struct StringIO *ptr = StringIO(self);
@@ -657,6 +573,9 @@ strio_seek(argc, argv, self)
 
     rb_scan_args(argc, argv, "11", NULL, &whence);
     offset = NUM2LONG(argv[0]);
+    if (CLOSED(ptr)) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
     switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
       case 0:
 	break;
@@ -664,16 +583,15 @@ strio_seek(argc, argv, self)
 	offset += ptr->pos;
 	break;
       case 2:
-	offset += RSTRING(ptr->string)->len;
+	offset += RSTRING_LEN(ptr->string);
 	break;
       default:
-	rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence));
+	error_inval("invalid whence");
     }
     if (offset < 0) {
 	error_inval(0);
     }
     ptr->pos = offset;
-    ptr->flags &= ~STRIO_EOF;
     return INT2FIX(0);
 }
 
@@ -684,8 +602,7 @@ strio_seek(argc, argv, self)
  * Returns +true+ always.
  */
 static VALUE
-strio_get_sync(self)
-    VALUE self;
+strio_get_sync(VALUE self)
 {
     StringIO(self);
     return Qtrue;
@@ -698,55 +615,80 @@ strio_get_sync(self)
 
 /*
  * call-seq:
+ *   strio.bytes {|byte| block }      -> strio
+ *   strio.bytes                      -> anEnumerator
+ *
  *   strio.each_byte {|byte| block }  -> strio
+ *   strio.each_byte                  -> anEnumerator
  *
  * See IO#each_byte.
  */
 static VALUE
-strio_each_byte(self)
-    VALUE self;
+strio_each_byte(VALUE self)
 {
     struct StringIO *ptr = readable(StringIO(self));
-    while (ptr->pos < RSTRING(ptr->string)->len) {
-	char c = RSTRING(ptr->string)->ptr[ptr->pos++];
+
+    RETURN_ENUMERATOR(self, 0, 0);
+
+    while (ptr->pos < RSTRING_LEN(ptr->string)) {
+	char c = RSTRING_PTR(ptr->string)[ptr->pos++];
 	rb_yield(CHR2FIX(c));
     }
-    return Qnil;
+    return self;
 }
 
 /*
  * call-seq:
- *   strio.getc   -> fixnum or nil
+ *   strio.getc   -> string or nil
  *
  * See IO#getc.
  */
 static VALUE
-strio_getc(self)
-    VALUE self;
+strio_getc(VALUE self)
+{
+    struct StringIO *ptr = readable(StringIO(self));
+    rb_encoding *enc = rb_enc_get(ptr->string);
+    int len;
+    char *p;
+
+    if (ptr->pos >= RSTRING_LEN(ptr->string)) {
+	return Qnil;
+    }
+    p = RSTRING_PTR(ptr->string)+ptr->pos;
+    len = rb_enc_mbclen(p, RSTRING_END(ptr->string), enc);
+    ptr->pos += len;
+    return rb_enc_str_new(p, len, rb_enc_get(ptr->string));
+}
+
+/*
+ * call-seq:
+ *   strio.getbyte   -> fixnum or nil
+ *
+ * See IO#getbyte.
+ */
+static VALUE
+strio_getbyte(VALUE self)
 {
     struct StringIO *ptr = readable(StringIO(self));
     int c;
-    if (ptr->pos >= RSTRING(ptr->string)->len) {
-	ptr->flags |= STRIO_EOF;
+    if (ptr->pos >= RSTRING_LEN(ptr->string)) {
 	return Qnil;
     }
-    c = RSTRING(ptr->string)->ptr[ptr->pos++];
+    c = RSTRING_PTR(ptr->string)[ptr->pos++];
     return CHR2FIX(c);
 }
 
 static void
-strio_extend(ptr, pos, len)
-    struct StringIO *ptr;
-    long pos, len;
+strio_extend(struct StringIO *ptr, long pos, long len)
 {
     long olen;
 
     check_modifiable(ptr);
-    olen = RSTRING(ptr->string)->len;
+    olen = RSTRING_LEN(ptr->string);
     if (pos + len > olen) {
 	rb_str_resize(ptr->string, pos + len);
 	if (pos > olen)
-	    MEMZERO(RSTRING(ptr->string)->ptr + olen, char, pos - olen);
+	    MEMZERO(RSTRING_PTR(ptr->string) + olen, char, pos - olen);
     }
     else {
 	rb_str_modify(ptr->string);
@@ -755,56 +697,193 @@ strio_extend(ptr, pos, len)
 
 /*
  * call-seq:
- *   strio.ungetc(integer)   -> nil
+ *   strio.ungetc(string)   -> nil
  *
  * Pushes back one character (passed as a parameter) onto *strio*
- * such that a subsequent buffered read will return it.  Pushing back 
- * behind the beginning of the buffer string is not possible.  Nothing
- * will be done if such an attempt is made.
- * In other case, there is no limitation for multiple pushbacks.
+ * such that a subsequent buffered read will return it.  There is no
+ * limitation for multiple pushbacks including pushing back behind the
+ * beginning of the buffer string.
  */
 static VALUE
-strio_ungetc(self, ch)
-    VALUE self, ch;
+strio_ungetc(VALUE self, VALUE c)
 {
     struct StringIO *ptr = readable(StringIO(self));
-    int cc = NUM2INT(ch);
-    long len, pos = ptr->pos;
-
-    if (cc != EOF && pos > 0) {
-	if ((len = RSTRING(ptr->string)->len) < pos-- ||
-	    (unsigned char)RSTRING(ptr->string)->ptr[pos] !=
-	    (unsigned char)cc) {
-	    strio_extend(ptr, pos, 1);
-	    RSTRING(ptr->string)->ptr[pos] = cc;
-	    OBJ_INFECT(ptr->string, self);
+    long lpos, clen;
+    char *p, *pend;
+    rb_encoding *enc, *enc2;
+
+    if (NIL_P(c)) return Qnil;
+    if (FIXNUM_P(c)) {
+	int cc = FIX2INT(c);
+	char buf[16];
+
+	enc = rb_enc_get(ptr->string);
+	rb_enc_mbcput(cc, buf, enc);
+	c = rb_enc_str_new(buf, rb_enc_codelen(cc, enc), enc);
+    }
+    else {
+	SafeStringValue(c);
+	enc = rb_enc_get(ptr->string);
+	enc2 = rb_enc_get(c);
+	if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
+	    c = rb_str_conv_enc(c, enc2, enc);
+	}
+    }
+    if (RSTRING_LEN(ptr->string) < ptr->pos) {
+	long len = RSTRING_LEN(ptr->string);
+	rb_str_resize(ptr->string, ptr->pos - 1);
+	memset(RSTRING_PTR(ptr->string) + len, 0, ptr->pos - len - 1);
+	rb_str_concat(ptr->string, c);
+	ptr->pos--;
+    }
+    else {
+	/* get logical position */
+	lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos;
+	for (;;) {
+	    clen = rb_enc_mbclen(p, pend, enc);
+	    if (p+clen >= pend) break;
+	    p += clen;
+	    lpos++;
 	}
-	--ptr->pos;
-	ptr->flags &= ~STRIO_EOF;
+	clen = p - RSTRING_PTR(ptr->string);
+	rb_str_update(ptr->string, lpos, ptr->pos ? 1 : 0, c);
+	ptr->pos = clen;
     }
+
     return Qnil;
 }
 
 /*
  * call-seq:
- *   strio.readchar   -> fixnum
+ *   strio.ungetbyte(fixnum)   -> nil
+ *
+ * See IO#ungetbyte
+ */
+static VALUE
+strio_ungetbyte(VALUE self, VALUE c)
+{
+    struct StringIO *ptr = readable(StringIO(self));
+    char buf[1], *cp = buf;
+    long pos = ptr->pos, cl = 1;
+    VALUE str = ptr->string;
+
+    if (NIL_P(c)) return Qnil;
+    if (FIXNUM_P(c)) {
+	buf[0] = (char)FIX2INT(c);
+    }
+    else {
+	SafeStringValue(c);
+	cp = RSTRING_PTR(c);
+	cl = RSTRING_LEN(c);
+	if (cl == 0) return Qnil;
+    }
+    rb_str_modify(str);
+    if (cl > pos) {
+	char *s;
+	long rest = RSTRING_LEN(str) - pos;
+	rb_str_resize(str, rest + cl);
+	s = RSTRING_PTR(str);
+	memmove(s + cl, s + pos, rest);
+	pos = 0;
+    }
+    else {
+	pos -= cl;
+    }
+    memcpy(RSTRING_PTR(str) + pos, cp, cl);
+    ptr->pos = pos;
+    RB_GC_GUARD(c);
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   strio.readchar   -> string
  *
  * See IO#readchar.
  */
 static VALUE
-strio_readchar(self)
-    VALUE self;
+strio_readchar(VALUE self)
 {
     VALUE c = strio_getc(self);
     if (NIL_P(c)) rb_eof_error();
     return c;
 }
 
+/*
+ * call-seq:
+ *   strio.readbyte   -> fixnum
+ *
+ * See IO#readbyte.
+ */
+static VALUE
+strio_readbyte(VALUE self)
+{
+    VALUE c = strio_getbyte(self);
+    if (NIL_P(c)) rb_eof_error();
+    return c;
+}
+
+/*
+ * call-seq:
+ *   strio.chars {|char| block }      -> strio
+ *   strio.chars                      -> anEnumerator
+ *
+ *   strio.each_char {|char| block }  -> strio
+ *   strio.each_char                  -> anEnumerator
+ *
+ * See IO#each_char.
+ */
+static VALUE
+strio_each_char(VALUE self)
+{
+    VALUE c;
+
+    RETURN_ENUMERATOR(self, 0, 0);
+
+    while (!NIL_P(c = strio_getc(self))) {
+	rb_yield(c);
+    }
+    return self;
+}
+
+/*
+ * call-seq:
+ *   strio.codepoints {|c| block }      -> strio
+ *   strio.codepoints                   -> anEnumerator
+ *
+ *   strio.each_codepoint {|c| block }  -> strio
+ *   strio.each_codepoint               -> anEnumerator
+ *
+ * See IO#each_codepoint.
+ */
+static VALUE
+strio_each_codepoint(VALUE self)
+{
+    struct StringIO *ptr;
+    rb_encoding *enc;
+    unsigned int c;
+    int n;
+
+    RETURN_ENUMERATOR(self, 0, 0);
+
+    ptr = readable(StringIO(self));
+    enc = rb_enc_get(ptr->string);
+    for (;;) {
+	if (ptr->pos >= RSTRING_LEN(ptr->string)) {
+	    return self;
+	}
+
+	c = rb_enc_codepoint_len(RSTRING_PTR(ptr->string)+ptr->pos,
+				 RSTRING_END(ptr->string), &n, enc);
+	rb_yield(UINT2NUM(c));
+	ptr->pos += n;
+    }
+    return self;
+}
+
+/* Boyer-Moore search: copied from regex.c */
 static void
-bm_init_skip(skip, pat, m)
-     long *skip;
-     const char *pat;
-     long m;
+bm_init_skip(long *skip, const char *pat, long m)
 {
     int c;
 
@@ -817,12 +896,7 @@ bm_init_skip(skip, pat, m)
 }
 
 static long
-bm_search(little, llen, big, blen, skip)
-    const char *little;
-    long llen;
-    const char *big;
-    long blen;
-    const long *skip;
+bm_search(const char *little, long llen, const char *big, long blen, const long *skip)
 {
     long i, j, k;
 
@@ -841,61 +915,77 @@ bm_search(little, llen, big, blen, skip)
 }
 
 static VALUE
-strio_getline(argc, argv, ptr)
-    int argc;
-    VALUE *argv;
-    struct StringIO *ptr;
+strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 {
     const char *s, *e, *p;
-    long n;
-    VALUE str;
+    long n, limit = 0;
+    VALUE str, lim;
 
-    if (argc == 0) {
+    rb_scan_args(argc, argv, "02", &str, &lim);
+    switch (argc) {
+      case 0:
 	str = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &str);
+	break;
+
+      case 1:
+	if (!NIL_P(str) && TYPE(str) != T_STRING) {
+	    VALUE tmp = rb_check_string_type(str);
+	    if (NIL_P(tmp)) {
+		limit = NUM2LONG(str);
+		if (limit == 0) return rb_str_new(0,0);
+		str = rb_rs;
+	    }
+	    else {
+		str = tmp;
+	    }
+	}
+	break;
+
+      case 2:
 	if (!NIL_P(str)) StringValue(str);
+	limit = NUM2LONG(lim);
+	break;
     }
 
-    if (ptr->pos >= (n = RSTRING(ptr->string)->len)) {
-	ptr->flags |= STRIO_EOF;
+    if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
 	return Qnil;
     }
-    s = RSTRING(ptr->string)->ptr;
-    e = s + RSTRING(ptr->string)->len;
+    s = RSTRING_PTR(ptr->string);
+    e = s + RSTRING_LEN(ptr->string);
     s += ptr->pos;
+    if (limit > 0 && s + limit < e) {
+	e = rb_enc_right_char_head(s, s + limit, e, rb_enc_get(ptr->string));
+    }
     if (NIL_P(str)) {
-	str = rb_str_substr(ptr->string, ptr->pos, e - s);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
-    else if ((n = RSTRING(str)->len) == 0) {
+    else if ((n = RSTRING_LEN(str)) == 0) {
 	p = s;
 	while (*p == '\n') {
 	    if (++p == e) {
-		ptr->flags |= STRIO_EOF;
 		return Qnil;
 	    }
 	}
 	s = p;
 	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
 	    if (*++p == '\n') {
-		e = p;
+		e = p + 1;
 		break;
 	    }
 	}
-	str = rb_str_substr(ptr->string, s - RSTRING(ptr->string)->ptr, e - s); 
+	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s);
     }
     else if (n == 1) {
-	if ((p = memchr(s, RSTRING(str)->ptr[0], e - s)) != 0) {
+	if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) {
 	    e = p + 1;
 	}
-	str = rb_str_substr(ptr->string, ptr->pos, e - s);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
     else {
 	if (n < e - s) {
 	    if (e - s < 1024) {
 		for (p = s; p + n <= e; ++p) {
-		    if (MEMCMP(p, RSTRING(str)->ptr, char, n) == 0) {
+		    if (MEMCMP(p, RSTRING_PTR(str), char, n) == 0) {
 			e = p + n;
 			break;
 		    }
@@ -903,31 +993,30 @@ strio_getline(argc, argv, ptr)
 	    }
 	    else {
 		long skip[1 << CHAR_BIT], pos;
-		p = RSTRING(str)->ptr;
+		p = RSTRING_PTR(str);
 		bm_init_skip(skip, p, n);
 		if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
 		    e = s + pos + n;
 		}
 	    }
 	}
-	str = rb_str_substr(ptr->string, ptr->pos, e - s);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
-    ptr->pos = e - RSTRING(ptr->string)->ptr;
+    ptr->pos = e - RSTRING_PTR(ptr->string);
     ptr->lineno++;
     return str;
 }
 
 /*
  * call-seq:
- *   strio.gets(sep_string=$/)   -> string or nil
+ *   strio.gets(sep=$/)     -> string or nil
+ *   strio.gets(limit)      -> string or nil
+ *   strio.gets(sep, limit) -> string or nil
  *
  * See IO#gets.
  */
 static VALUE
-strio_gets(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_gets(int argc, VALUE *argv, VALUE self)
 {
     VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
 
@@ -937,37 +1026,47 @@ strio_gets(argc, argv, self)
 
 /*
  * call-seq:
- *   strio.readline(sep_string=$/)   -> string
+ *   strio.readline(sep=$/)     -> string
+ *   strio.readline(limit)      -> string or nil
+ *   strio.readline(sep, limit) -> string or nil
  *
  * See IO#readline.
  */
 static VALUE
-strio_readline(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_readline(int argc, VALUE *argv, VALUE self)
 {
-    VALUE line = strio_getline(argc, argv, readable(StringIO(self)));
+    VALUE line = strio_gets(argc, argv, self);
     if (NIL_P(line)) rb_eof_error();
     return line;
 }
 
 /*
  * call-seq:
- *   strio.each(sep_string=$/)      {|line| block }  -> strio
- *   strio.each_line(sep_string=$/) {|line| block }  -> strio
+ *   strio.each(sep=$/) {|line| block }         -> strio
+ *   strio.each(limit) {|line| block }          -> strio
+ *   strio.each(sep, limit) {|line| block }     -> strio
+ *   strio.each(...)                            -> anEnumerator
+ *
+ *   strio.each_line(sep=$/) {|line| block }    -> strio
+ *   strio.each_line(limit) {|line| block }     -> strio
+ *   strio.each_line(sep,limit) {|line| block } -> strio
+ *   strio.each_line(...)                       -> anEnumerator
+ *
+ *   strio.lines(sep=$/) {|line| block }        -> strio
+ *   strio.lines(limit) {|line| block }         -> strio
+ *   strio.lines(sep,limit) {|line| block }     -> strio
+ *   strio.lines(...)                           -> anEnumerator
  *
  * See IO#each.
  */
 static VALUE
-strio_each(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_each(int argc, VALUE *argv, VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     VALUE line;
 
+    RETURN_ENUMERATOR(self, argc, argv);
+
     while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
 	rb_yield(line);
     }
@@ -976,15 +1075,14 @@ strio_each(argc, argv, self)
 
 /*
  * call-seq:
- *   strio.readlines(sep_string=$/)  ->   array
+ *   strio.readlines(sep=$/)    ->   array
+ *   strio.readlines(limit)     ->   array
+ *   strio.readlines(sep,limit) ->   array
  *
  * See IO#readlines.
  */
 static VALUE
-strio_readlines(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_readlines(int argc, VALUE *argv, VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
     VALUE ary = rb_ary_new(), line;
@@ -1005,27 +1103,34 @@ strio_readlines(argc, argv, self)
  * Returns the number of bytes written.  See IO#write.
  */
 static VALUE
-strio_write(self, str)
-    VALUE self, str;
+strio_write(VALUE self, VALUE str)
 {
     struct StringIO *ptr = writable(StringIO(self));
     long len, olen;
+    rb_encoding *enc, *enc2;
 
+    RB_GC_GUARD(str);
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
-    len = RSTRING(str)->len;
-    if (!len) return INT2FIX(0);
+    enc = rb_enc_get(ptr->string);
+    enc2 = rb_enc_get(str);
+    if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
+	str = rb_str_conv_enc(str, enc2, enc);
+    }
+    len = RSTRING_LEN(str);
+    if (len == 0) return INT2FIX(0);
     check_modifiable(ptr);
-    olen = RSTRING(ptr->string)->len;
+    olen = RSTRING_LEN(ptr->string);
     if (ptr->flags & FMODE_APPEND) {
 	ptr->pos = olen;
     }
     if (ptr->pos == olen) {
-	rb_str_cat(ptr->string, RSTRING(str)->ptr, len);
+	rb_str_cat(ptr->string, RSTRING_PTR(str), len);
     }
     else {
 	strio_extend(ptr, ptr->pos, len);
-	rb_str_update(ptr->string, ptr->pos, len, str);
+	memmove(RSTRING_PTR(ptr->string)+ptr->pos, RSTRING_PTR(str), len);
+	OBJ_INFECT(ptr->string, str);
     }
     OBJ_INFECT(ptr->string, self);
     ptr->pos += len;
@@ -1064,20 +1169,19 @@ strio_write(self, str)
  * See IO#putc.
  */
 static VALUE
-strio_putc(self, ch)
-    VALUE self, ch;
+strio_putc(VALUE self, VALUE ch)
 {
     struct StringIO *ptr = writable(StringIO(self));
     int c = NUM2CHR(ch);
     long olen;
 
     check_modifiable(ptr);
-    olen = RSTRING(ptr->string)->len;
+    olen = RSTRING_LEN(ptr->string);
     if (ptr->flags & FMODE_APPEND) {
 	ptr->pos = olen;
     }
     strio_extend(ptr, ptr->pos, 1);
-    RSTRING(ptr->string)->ptr[ptr->pos++] = c;
+    RSTRING_PTR(ptr->string)[ptr->pos++] = c;
     OBJ_INFECT(ptr->string, self);
     return ch;
 }
@@ -1097,14 +1201,11 @@ strio_putc(self, ch)
  * See IO#read.
  */
 static VALUE
-strio_read(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_read(int argc, VALUE *argv, VALUE self)
 {
     struct StringIO *ptr = readable(StringIO(self));
     VALUE str = Qnil;
-    long len, olen;
+    long len;
 
     switch (argc) {
       case 2:
@@ -1113,16 +1214,11 @@ strio_read(argc, argv, self)
 	rb_str_modify(str);
       case 1:
 	if (!NIL_P(argv[0])) {
-	    len = olen = NUM2LONG(argv[0]);
+	    len = NUM2LONG(argv[0]);
 	    if (len < 0) {
 		rb_raise(rb_eArgError, "negative length %ld given", len);
 	    }
-	    if (len > 0 && ptr->pos >= RSTRING(ptr->string)->len) {
-		ptr->flags |= STRIO_EOF;
-		if (!NIL_P(str)) rb_str_resize(str, 0);
-		return Qnil;
-	    }
-	    else if (ptr->flags & STRIO_EOF) {
+	    if (len > 0 && ptr->pos >= RSTRING_LEN(ptr->string)) {
 		if (!NIL_P(str)) rb_str_resize(str, 0);
 		return Qnil;
 	    }
@@ -1130,10 +1226,8 @@ strio_read(argc, argv, self)
 	}
 	/* fall through */
       case 0:
-	olen = -1;
-	len = RSTRING(ptr->string)->len;
+	len = RSTRING_LEN(ptr->string);
 	if (len <= ptr->pos) {
-	    ptr->flags |= STRIO_EOF;
 	    if (NIL_P(str)) {
 		str = rb_str_new(0, 0);
 	    }
@@ -1150,22 +1244,22 @@ strio_read(argc, argv, self)
 	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
     }
     if (NIL_P(str)) {
-	str = rb_str_substr(ptr->string, ptr->pos, len);
+	str = strio_substr(ptr, ptr->pos, len);
+	if (argc > 0) rb_enc_associate(str, rb_ascii8bit_encoding());
     }
     else {
-	long rest = RSTRING(ptr->string)->len - ptr->pos;
+	long rest = RSTRING_LEN(ptr->string) - ptr->pos;
 	if (len > rest) len = rest;
 	rb_str_resize(str, len);
-	MEMCPY(RSTRING(str)->ptr, RSTRING(ptr->string)->ptr + ptr->pos, char, len);
+	MEMCPY(RSTRING_PTR(str), RSTRING_PTR(ptr->string) + ptr->pos, char, len);
     }
     if (NIL_P(str)) {
-	if (!(ptr->flags & STRIO_EOF)) str = rb_str_new(0, 0);
+	str = rb_str_new(0, 0);
 	len = 0;
     }
     else {
-	ptr->pos += len = RSTRING(str)->len;
+	ptr->pos += len = RSTRING_LEN(str);
     }
-    if (olen < 0 || olen > len) ptr->flags |= STRIO_EOF;
     return str;
 }
 
@@ -1177,13 +1271,10 @@ strio_read(argc, argv, self)
  * returning +nil+, as well as IO#sysread does.
  */
 static VALUE
-strio_sysread(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+strio_sysread(int argc, VALUE *argv, VALUE self)
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val) || RSTRING(val)->len == 0) {
+    if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;
@@ -1191,9 +1282,6 @@ strio_sysread(argc, argv, self)
 
 #define strio_syswrite strio_write
 
-/* call-seq: strio.path -> nil */
-#define strio_path strio_nil
-
 /*
  * call-seq:
  *   strio.isatty -> nil
@@ -1215,14 +1303,13 @@ strio_sysread(argc, argv, self)
  * Returns the size of the buffer string.
  */
 static VALUE
-strio_size(self)
-    VALUE self;
+strio_size(VALUE self)
 {
     VALUE string = StringIO(self)->string;
     if (NIL_P(string)) {
 	rb_raise(rb_eIOError, "not opened");
     }
-    return ULONG2NUM(RSTRING(string)->len);
+    return ULONG2NUM(RSTRING_LEN(string));
 }
 
 /*
@@ -1233,23 +1320,67 @@ strio_size(self)
  * must be opened for writing.
  */
 static VALUE
-strio_truncate(self, len)
-    VALUE self, len;
+strio_truncate(VALUE self, VALUE len)
 {
     VALUE string = writable(StringIO(self))->string;
     long l = NUM2LONG(len);
-    long plen = RSTRING(string)->len;
+    long plen = RSTRING_LEN(string);
     if (l < 0) {
 	error_inval("negative legnth");
     }
     rb_str_resize(string, l);
     if (plen < l) {
-	MEMZERO(RSTRING(string)->ptr + plen, char, l - plen);
+	MEMZERO(RSTRING_PTR(string) + plen, char, l - plen);
     }
     return len;
 }
 
 /*
+ *  call-seq:
+ *     strio.external_encoding   => encoding
+ *
+ *  Returns the Encoding object that represents the encoding of the file.
+ *  If strio is write mode and no encoding is specified, returns <code>nil</code>.
+ */
+
+static VALUE
+strio_external_encoding(VALUE self)
+{
+    return rb_enc_from_encoding(rb_enc_get(StringIO(self)->string));
+}
+
+/*
+ *  call-seq:
+ *     strio.internal_encoding   => encoding
+ *
+ *  Returns the Encoding of the internal string if conversion is
+ *  specified.  Otherwise returns nil.
+ */
+
+static VALUE
+strio_internal_encoding(VALUE self)
+{
+     return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     strio.set_encoding(ext_enc)                => strio
+ *
+ *  Tagged with the encoding specified.
+ */
+
+static VALUE
+strio_set_encoding(VALUE self, VALUE ext_enc)
+{
+    rb_encoding* enc;
+    VALUE str = StringIO(self)->string;
+    enc = rb_to_encoding(ext_enc);
+    rb_enc_associate(str, enc);
+    return self;
+}
+
+/*
  * Pseudo I/O on String object.
  */
 void
@@ -1288,19 +1419,29 @@ Init_stringio()
     rb_define_method(StringIO, "sync", strio_get_sync, 0);
     rb_define_method(StringIO, "sync=", strio_set_sync, 1);
     rb_define_method(StringIO, "tell", strio_tell, 0);
-    rb_define_method(StringIO, "path", strio_path, 0);
 
     rb_define_method(StringIO, "each", strio_each, -1);
-    rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
     rb_define_method(StringIO, "each_line", strio_each, -1);
+    rb_define_method(StringIO, "lines", strio_each, -1);
+    rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
+    rb_define_method(StringIO, "bytes", strio_each_byte, 0);
+    rb_define_method(StringIO, "each_char", strio_each_char, 0);
+    rb_define_method(StringIO, "chars", strio_each_char, 0);
+    rb_define_method(StringIO, "each_codepoint", strio_each_codepoint, 0);
+    rb_define_method(StringIO, "codepoints", strio_each_codepoint, 0);
     rb_define_method(StringIO, "getc", strio_getc, 0);
     rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
+    rb_define_method(StringIO, "ungetbyte", strio_ungetbyte, 1);
     rb_define_method(StringIO, "readchar", strio_readchar, 0);
+    rb_define_method(StringIO, "getbyte", strio_getbyte, 0);
+    rb_define_method(StringIO, "readbyte", strio_readbyte, 0);
     rb_define_method(StringIO, "gets", strio_gets, -1);
     rb_define_method(StringIO, "readline", strio_readline, -1);
     rb_define_method(StringIO, "readlines", strio_readlines, -1);
     rb_define_method(StringIO, "read", strio_read, -1);
     rb_define_method(StringIO, "sysread", strio_sysread, -1);
+    rb_define_method(StringIO, "readpartial", strio_sysread, -1);
+    rb_define_method(StringIO, "read_nonblock", strio_sysread, -1);
 
     rb_define_method(StringIO, "write", strio_write, 1);
     rb_define_method(StringIO, "<<", strio_addstr, 1);
@@ -1309,6 +1450,7 @@ Init_stringio()
     rb_define_method(StringIO, "putc", strio_putc, 1);
     rb_define_method(StringIO, "puts", strio_puts, -1);
     rb_define_method(StringIO, "syswrite", strio_syswrite, 1);
+    rb_define_method(StringIO, "write_nonblock", strio_syswrite, 1);
 
     rb_define_method(StringIO, "isatty", strio_isatty, 0);
     rb_define_method(StringIO, "tty?", strio_isatty, 0);
@@ -1317,4 +1459,8 @@ Init_stringio()
     rb_define_method(StringIO, "size", strio_size, 0);
     rb_define_method(StringIO, "length", strio_size, 0);
     rb_define_method(StringIO, "truncate", strio_truncate, 1);
+
+    rb_define_method(StringIO, "external_encoding", strio_external_encoding, 0);
+    rb_define_method(StringIO, "internal_encoding", strio_internal_encoding, 0);
+    rb_define_method(StringIO, "set_encoding", strio_set_encoding, 1);
 }
diff --git a/ext/strscan/.cvsignore b/ext/strscan/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/strscan/.cvsignore
+++ b/ext/strscan/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 9199574c3f..76f6e0b18b 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -1 +1,2 @@
-strscan.o: strscan.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+strscan.o: strscan.c $(hdrdir)/ruby.h $(hdrdir)/re.h $(hdrdir)/regex.h \
+	   $(hdrdir)/oniguruma.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index b5ee20282c..2bf1a4faa2 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -8,8 +8,9 @@
     the Ruby License. For details, see the file COPYING.
 */
 
-#include "ruby.h"
-#include "re.h"
+#include "ruby/ruby.h"
+#include "ruby/re.h"
+#include "ruby/encoding.h"
 
 #define STRSCAN_VERSION "0.7.0"
 
@@ -28,7 +29,7 @@ struct strscanner
 
     /* the string to scan */
     VALUE str;
-    
+
     /* scan pointers */
     long prev;   /* legal only when MATCHED_P(s) */
     long curr;   /* always legal */
@@ -41,13 +42,13 @@ struct strscanner
 #define MATCHED(s)             (s)->flags |= FLAG_MATCHED
 #define CLEAR_MATCH_STATUS(s)  (s)->flags &= ~FLAG_MATCHED
 
-#define S_PBEG(s)  (RSTRING((s)->str)->ptr)
-#define S_LEN(s)  (RSTRING((s)->str)->len)
+#define S_PBEG(s)  (RSTRING_PTR((s)->str))
+#define S_LEN(s)  (RSTRING_LEN((s)->str))
 #define S_PEND(s)  (S_PBEG(s) + S_LEN(s))
 #define CURPTR(s) (S_PBEG(s) + (s)->curr)
 #define S_RESTLEN(s) (S_LEN(s) - (s)->curr)
 
-#define EOS_P(s) ((s)->curr >= RSTRING(p->str)->len)
+#define EOS_P(s) ((s)->curr >= RSTRING_LEN(p->str))
 
 #define GET_SCANNER(obj,var) do {\
     Data_Get_Struct(obj, struct strscanner, var);\
@@ -62,7 +63,7 @@ static VALUE infect _((VALUE str, struct strscanner *p));
 static VALUE extract_range _((struct strscanner *p, long beg_i, long end_i));
 static VALUE extract_beg_len _((struct strscanner *p, long beg_i, long len));
 
-static void check_strscan _((VALUE obj));
+void check_strscan _((VALUE obj));
 static void strscan_mark _((struct strscanner *p));
 static void strscan_free _((struct strscanner *p));
 static VALUE strscan_s_allocate _((VALUE klass));
@@ -126,12 +127,20 @@ infect(VALUE str, struct strscanner *p)
 }
 
 static VALUE
+str_new(struct strscanner *p, const char *ptr, long len)
+{
+    VALUE str = rb_str_new(ptr, len);
+    rb_enc_copy(str, p->str);
+    return str;
+}
+
+static VALUE
 extract_range(struct strscanner *p, long beg_i, long end_i)
 {
     if (beg_i > S_LEN(p)) return Qnil;
     if (end_i > S_LEN(p))
         end_i = S_LEN(p);
-    return infect(rb_str_new(S_PBEG(p) + beg_i, end_i - beg_i), p);
+    return infect(str_new(p, S_PBEG(p) + beg_i, end_i - beg_i), p);
 }
 
 static VALUE
@@ -140,7 +149,7 @@ extract_beg_len(struct strscanner *p, long beg_i, long len)
     if (beg_i > S_LEN(p)) return Qnil;
     if (beg_i + len > S_LEN(p))
         len = S_LEN(p) - beg_i;
-    return infect(rb_str_new(S_PBEG(p) + beg_i, len), p);
+    return infect(str_new(p, S_PBEG(p) + beg_i, len), p);
 }
 
 /* =======================================================================
@@ -156,19 +165,19 @@ strscan_mark(struct strscanner *p)
 static void
 strscan_free(struct strscanner *p)
 {
-    re_free_registers(&(p->regs));
-    free(p);
+    onig_region_free(&(p->regs), 0);
+    ruby_xfree(p);
 }
 
 static VALUE
 strscan_s_allocate(VALUE klass)
 {
     struct strscanner *p;
-    
+
     p = ALLOC(struct strscanner);
     MEMZERO(p, struct strscanner, 1);
     CLEAR_MATCH_STATUS(p);
-    MEMZERO(&(p->regs), struct re_registers, 1);
+    onig_region_init(&(p->regs));
     p->str = Qnil;
     return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
 }
@@ -193,7 +202,7 @@ strscan_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static void
+void
 check_strscan(VALUE obj)
 {
     if (TYPE(obj) != T_DATA || RDATA(obj)->dmark != (RUBY_DATA_FUNC)strscan_mark) {
@@ -219,12 +228,13 @@ strscan_init_copy(VALUE vself, VALUE vorig)
     check_strscan(vorig);
     Data_Get_Struct(vorig, struct strscanner, orig);
     if (self != orig) {
-        self->flags = orig->flags;
-        self->str = orig->str;
-        self->prev = orig->prev;
-        self->curr = orig->curr;
-        re_copy_registers(&self->regs, &orig->regs);
+	self->flags = orig->flags;
+	self->str = orig->str;
+	self->prev = orig->prev;
+	self->curr = orig->curr;
+	onig_region_copy(&self->regs, &orig->regs);
     }
+
     return vself;
 }
 
@@ -311,8 +321,7 @@ strscan_set_string(VALUE self, VALUE str)
 
     Data_Get_Struct(self, struct strscanner, p);
     StringValue(str);
-    p->str = rb_str_dup(str);
-    rb_obj_freeze(p->str);
+    p->str = str;
     p->curr = 0;
     CLEAR_MATCH_STATUS(p);
     return str;
@@ -344,9 +353,9 @@ strscan_concat(VALUE self, VALUE str)
 }
 
 /*
- * Returns the position of the scan pointer.  In the 'reset' position, this
+ * Returns the byte position of the scan pointer.  In the 'reset' position, this
  * value is zero.  In the 'terminated' position (i.e. the string is exhausted),
- * this value is the length of the string.
+ * this value is the bytesize of the string.
  *
  * In short, it's a 0-based index into the string.
  *
@@ -369,7 +378,7 @@ strscan_get_pos(VALUE self)
 /*
  * call-seq: pos=(n)
  *
- * Modify the scan pointer.
+ * Set the byte position of the scan pointer.
  *
  *   s = StringScanner.new('test string')
  *   s.pos = 7            # -> 7
@@ -393,8 +402,11 @@ strscan_set_pos(VALUE self, VALUE v)
 static VALUE
 strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
 {
+    regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
     struct strscanner *p;
+    regex_t *re;
     int ret;
+    int tmpreg;
 
     Check_Type(regex, T_REGEXP);
     GET_SCANNER(self, p);
@@ -403,21 +415,31 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
     if (S_RESTLEN(p) < 0) {
         return Qnil;
     }
-    rb_kcode_set_option(regex);
+    re = rb_reg_prepare_re(regex, p->str);
+    tmpreg = re != RREGEXP(regex)->ptr;
+    if (!tmpreg) RREGEXP(regex)->usecnt++;
+
     if (headonly) {
-        ret = re_match(RREGEXP(regex)->ptr,
-                       CURPTR(p), S_RESTLEN(p),
-                       0,
-                       &(p->regs));
+        ret = onig_match(re, (UChar* )CURPTR(p),
+                         (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                         (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE);
     }
     else {
-        ret = re_search(RREGEXP(regex)->ptr,
-                        CURPTR(p), S_RESTLEN(p),
-                        0,
-                        S_RESTLEN(p),
-                        &(p->regs));
+        ret = onig_search(re,
+                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                          &(p->regs), ONIG_OPTION_NONE);
+    }
+    if (!tmpreg) RREGEXP(regex)->usecnt--;
+    if (tmpreg) {
+        if (RREGEXP(regex)->usecnt) {
+            onig_free(re);
+        }
+        else {
+            onig_free(RREGEXP(regex)->ptr);
+            RREGEXP(regex)->ptr = re;
+        }
     }
-    rb_kcode_reset_option();
 
     if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
     if (ret < 0) {
@@ -521,11 +543,11 @@ strscan_check(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: scan_full(pattern, return_string_p, advance_pointer_p)
+ * call-seq: scan_full(pattern, advance_pointer_p, return_string_p)
  *
  * Tests whether the given +pattern+ is matched from the current scan pointer.
- * Returns the matched string if +return_string_p+ is true.
  * Advances the scan pointer if +advance_pointer_p+ is true.
+ * Returns the matched string if +return_string_p+ is true.
  * The match register is affected.
  *
  * "full" means "#scan with full parameters".
@@ -536,7 +558,6 @@ strscan_scan_full(VALUE self, VALUE re, VALUE s, VALUE f)
     return strscan_do_scan(self, re, RTEST(s), RTEST(f), 1);
 }
 
-
 /*
  * call-seq: scan_until(pattern)
  *
@@ -565,7 +586,7 @@ strscan_scan_until(VALUE self, VALUE re)
  *   s = StringScanner.new('test string')
  *   s.exist? /s/            # -> 3
  *   s.scan /test/           # -> "test"
- *   s.exist? /s/            # -> 6
+ *   s.exist? /s/            # -> 2
  *   s.exist? /e/            # -> nil
  */
 static VALUE
@@ -588,7 +609,7 @@ strscan_exist_p(VALUE self, VALUE re)
  *
  *   s = StringScanner.new("Fri Dec 12 1975 14:39")
  *   s.skip_until /12/           # -> 10
- *   s                           # 
+ *   s                           #
  */
 static VALUE
 strscan_skip_until(VALUE self, VALUE re)
@@ -616,12 +637,12 @@ strscan_check_until(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: search_full(pattern, return_string_p, advance_pointer_p)
+ * call-seq: search_full(pattern, advance_pointer_p, return_string_p)
  *
  * Scans the string _until_ the +pattern+ is matched.
+ * Advances the scan pointer if +advance_pointer_p+, otherwise not.
  * Returns the matched string if +return_string_p+ is true, otherwise
  * returns the number of bytes advanced.
- * Advances the scan pointer if +advance_pointer_p+, otherwise not.
  * This method does affect the match register.
  */
 static VALUE
@@ -630,26 +651,18 @@ strscan_search_full(VALUE self, VALUE re, VALUE s, VALUE f)
     return strscan_do_scan(self, re, RTEST(s), RTEST(f), 0);
 }
 
-/* DANGEROUS; need to synchronize with regex.c */
 static void
 adjust_registers_to_matched(struct strscanner *p)
 {
-    if (p->regs.allocated == 0) {
-        p->regs.beg = ALLOC_N(int, RE_NREGS);
-        p->regs.end = ALLOC_N(int, RE_NREGS);
-        p->regs.allocated = RE_NREGS;
-    }
-    p->regs.num_regs = 1;
-    p->regs.beg[0] = 0;
-    p->regs.end[0] = p->curr - p->prev;
+    onig_region_clear(&(p->regs));
+    onig_region_set(&(p->regs), 0, 0, p->curr - p->prev);
 }
 
 /*
  * Scans one character and returns it.
- * This method is multi-byte character sensitive.
- * See also #get_byte.
+ * This method is multibyte character sensitive.
  *
- *   s = StringScanner.new('ab')
+ *   s = StringScanner.new("ab")
  *   s.getch           # => "a"
  *   s.getch           # => "b"
  *   s.getch           # => nil
@@ -669,7 +682,8 @@ strscan_getch(VALUE self)
     CLEAR_MATCH_STATUS(p);
     if (EOS_P(p))
         return Qnil;
-    len = mbclen(*CURPTR(p));
+
+    len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
     if (p->curr + len > S_LEN(p)) {
         len = S_LEN(p) - p->curr;
     }
@@ -683,14 +697,15 @@ strscan_getch(VALUE self)
 
 /*
  * Scans one byte and returns it.
- * This method is NOT multi-byte character sensitive.
- * See also #getch.
+ * This method is not multibyte character sensitive.
+ * See also: #getch.
  *
  *   s = StringScanner.new('ab')
  *   s.get_byte         # => "a"
  *   s.get_byte         # => "b"
  *   s.get_byte         # => nil
  *
+ *   $KCODE = 'EUC'
  *   s = StringScanner.new("\244\242")
  *   s.get_byte         # => "\244"
  *   s.get_byte         # => "\242"
@@ -703,9 +718,9 @@ strscan_get_byte(VALUE self)
 
     GET_SCANNER(self, p);
     CLEAR_MATCH_STATUS(p);
-    if (EOS_P(p)) {
+    if (EOS_P(p))
         return Qnil;
-    }
+
     p->prev = p->curr;
     p->curr++;
     MATCHED(p);
@@ -743,13 +758,13 @@ strscan_peek(VALUE self, VALUE vlen)
     long len;
 
     GET_SCANNER(self, p);
+
     len = NUM2LONG(vlen);
-    if (EOS_P(p)) {
-        return infect(rb_str_new("", 0), p);
-    }
-    if (p->curr + len > S_LEN(p)) {
+    if (EOS_P(p))
+        return infect(str_new(p, "", 0), p);
+
+    if (p->curr + len > S_LEN(p))
         len = S_LEN(p) - p->curr;
-    }
     return extract_beg_len(p, p->curr, len);
 }
 
@@ -773,7 +788,7 @@ strscan_peep(VALUE self, VALUE vlen)
  *   s.unscan
  *   s.scan(/../)         # => "te"
  *   s.scan(/\d/)         # => nil
- *   s.unscan             # ScanError: unscan failed: previous match had failed
+ *   s.unscan             # ScanError: unscan failed: previous match record not exist
  */
 static VALUE
 strscan_unscan(VALUE self)
@@ -781,9 +796,8 @@ strscan_unscan(VALUE self)
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    if (! MATCHED_P(p)) {
-        rb_raise(ScanError, "unscan failed: previous match had failed");
-    }
+    if (! MATCHED_P(p))
+        rb_raise(ScanError, "unscan failed: previous match record not exist");
     p->curr = p->prev;
     CLEAR_MATCH_STATUS(p);
     return self;
@@ -879,7 +893,7 @@ strscan_matched_p(VALUE self)
 
 /*
  * Returns the last matched string.
- * 
+ *
  *   s = StringScanner.new('test string')
  *   s.match?(/\w+/)     # -> 4
  *   s.matched           # -> "test"
@@ -891,7 +905,6 @@ strscan_matched(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
-
     return extract_range(p, p->prev + p->regs.beg[0],
                             p->prev + p->regs.end[0]);
 }
@@ -913,22 +926,10 @@ strscan_matched_size(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
-
     return INT2NUM(p->regs.end[0] - p->regs.beg[0]);
 }
 
 /*
- * Equivalent to #matched_size.
- * This method is obsolete; use #matched_size instead.
- */
-static VALUE
-strscan_matchedsize(VALUE self)
-{
-    rb_warning("StringScanner#matchedsize is obsolete; use #matched_size instead");
-    return strscan_matched_size(self);
-}
-
-/*
  * call-seq: [](n)
  *
  * Return the n-th subgroup in the most recent match.
@@ -950,7 +951,7 @@ strscan_aref(VALUE self, VALUE idx)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p))        return Qnil;
-    
+
     i = NUM2LONG(idx);
     if (i < 0)
         i += p->regs.num_regs;
@@ -978,7 +979,6 @@ strscan_pre_match(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
-
     return extract_range(p, 0, p->prev + p->regs.beg[0]);
 }
 
@@ -998,7 +998,6 @@ strscan_post_match(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
-
     return extract_range(p, p->prev + p->regs.end[0], S_LEN(p));
 }
 
@@ -1013,7 +1012,7 @@ strscan_rest(VALUE self)
 
     GET_SCANNER(self, p);
     if (EOS_P(p)) {
-        return infect(rb_str_new("", 0), p);
+        return infect(str_new(p, "", 0), p);
     }
     return extract_range(p, p->curr, S_LEN(p));
 }
@@ -1031,7 +1030,6 @@ strscan_rest_size(VALUE self)
     if (EOS_P(p)) {
         return INT2FIX(0);
     }
-
     i = S_LEN(p) - p->curr;
     return INT2FIX(i);
 }
@@ -1085,7 +1083,7 @@ strscan_inspect(VALUE self)
         len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld @ %s>",
                        rb_class2name(CLASS_OF(self)),
                        p->curr, S_LEN(p),
-                       RSTRING(b)->ptr);
+                       RSTRING_PTR(b));
         return infect(rb_str_new(buf, len), p);
     }
     a = inspect1(p);
@@ -1093,8 +1091,8 @@ strscan_inspect(VALUE self)
     len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s @ %s>",
                    rb_class2name(CLASS_OF(self)),
                    p->curr, S_LEN(p),
-                   RSTRING(a)->ptr,
-                   RSTRING(b)->ptr);
+                   RSTRING_PTR(a),
+                   RSTRING_PTR(b));
     return infect(rb_str_new(buf, len), p);
 }
 
@@ -1143,20 +1141,20 @@ inspect2(struct strscanner *p)
 
 /*
  * Document-class: StringScanner
- * 
+ *
  * StringScanner provides for lexical scanning operations on a String.  Here is
  * an example of its usage:
  *
  *   s = StringScanner.new('This is an example string')
  *   s.eos?               # -> false
- *   
+ *
  *   p s.scan(/\w+/)      # -> "This"
  *   p s.scan(/\w+/)      # -> nil
  *   p s.scan(/\s+/)      # -> " "
  *   p s.scan(/\s+/)      # -> nil
  *   p s.scan(/\w+/)      # -> "is"
  *   s.eos?               # -> false
- *   
+ *
  *   p s.scan(/\s+/)      # -> " "
  *   p s.scan(/\w+/)      # -> "an"
  *   p s.scan(/\s+/)      # -> " "
@@ -1164,7 +1162,7 @@ inspect2(struct strscanner *p)
  *   p s.scan(/\s+/)      # -> " "
  *   p s.scan(/\w+/)      # -> "string"
  *   s.eos?               # -> true
- *   
+ *
  *   p s.scan(/\s+/)      # -> nil
  *   p s.scan(/\w+/)      # -> nil
  *
@@ -1193,7 +1191,7 @@ inspect2(struct strscanner *p)
  * the string without actually scanning.  You can access the most recent match.
  * You can modify the string being scanned, reset or terminate the scanner,
  * find out or change the position of the scan pointer, skip ahead, and so on.
- * 
+ *
  * === Advancing the Scan Pointer
  *
  * - #getch
@@ -1224,7 +1222,7 @@ inspect2(struct strscanner *p)
  * - #reset
  * - #terminate
  * - #pos=
- * 
+ *
  * === Match Data
  *
  * - #matched
@@ -1245,7 +1243,7 @@ inspect2(struct strscanner *p)
  * There are aliases to several of the methods.
  */
 void
-Init_strscan(void)
+Init_strscan()
 {
     ID id_scanerr = rb_intern("ScanError");
     VALUE tmp;
@@ -1261,7 +1259,7 @@ Init_strscan(void)
     tmp = rb_str_new2("$Id$");
     rb_obj_freeze(tmp);
     rb_const_set(StringScanner, rb_intern("Id"), tmp);
-    
+
     rb_define_alloc_func(StringScanner, strscan_s_allocate);
     rb_define_private_method(StringScanner, "initialize", strscan_initialize, -1);
     rb_define_private_method(StringScanner, "initialize_copy", strscan_init_copy, 1);
@@ -1307,7 +1305,6 @@ Init_strscan(void)
     rb_define_method(StringScanner, "matched?",    strscan_matched_p,   0);
     rb_define_method(StringScanner, "matched",     strscan_matched,     0);
     rb_define_method(StringScanner, "matched_size", strscan_matched_size, 0);
-    rb_define_method(StringScanner, "matchedsize", strscan_matchedsize, 0);
     rb_define_method(StringScanner, "[]",          strscan_aref,        1);
     rb_define_method(StringScanner, "pre_match",   strscan_pre_match,   0);
     rb_define_method(StringScanner, "post_match",  strscan_post_match,  0);
diff --git a/ext/syck/.cvsignore b/ext/syck/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/syck/.cvsignore
+++ b/ext/syck/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/syck/bytecode.c b/ext/syck/bytecode.c
index 567aaf52a8..5cddb22831 100644
--- a/ext/syck/bytecode.c
+++ b/ext/syck/bytecode.c
@@ -4,11 +4,10 @@
  * bytecode.re
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "syck.h"
 #include "gram.h"
 
@@ -99,7 +98,7 @@ char *get_inline( SyckParser *parser );
                 if ( reset == 1 ) YYPOS(0); \
                 return YAML_IOPEN; \
             } \
-        } 
+        }
 
 /*
  * Nice little macro to ensure closure of levels.
@@ -136,7 +135,7 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
 {
     SyckLevel *lvl;
     syck_parser_ptr = parser;
-    if ( YYCURSOR == NULL ) 
+    if ( YYCURSOR == NULL )
     {
         syck_parser_read( parser );
     }
@@ -165,7 +164,7 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
 #line 165 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy0;
 	++YYCURSOR;
 yy0:
@@ -290,7 +289,7 @@ yy17:	++YYCURSOR;
 	goto yy18;
 yy18:
 #line 288 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str); 
+{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
             goto Scalar;
         }
 #line 296 "<stdout>"
@@ -393,7 +392,7 @@ yy28:
 {   CHK_NL(YYCURSOR);
             if ( lvl->status == syck_lvl_seq )
             {
-                return YAML_INDENT; 
+                return YAML_INDENT;
             }
             else if ( lvl->status == syck_lvl_map )
             {
@@ -435,12 +434,12 @@ yy33:
                 FORCE_NEXT_TOKEN( '}' );
                 return '{';
             }
-            
+
             POP_LEVEL();
             lvl = CURRENT_LEVEL();
             if ( lvl->status == syck_lvl_seq )
             {
-                FORCE_NEXT_TOKEN(YAML_INDENT);   
+                FORCE_NEXT_TOKEN(YAML_INDENT);
             }
             else if ( lvl->status == syck_lvl_map )
             {
@@ -495,7 +494,7 @@ yy39:
             {
                 complex = 1;
             }
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_map); 
+            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_map);
             CHK_NL(YYCURSOR);
             if ( complex )
             {
@@ -543,7 +542,7 @@ Directive:
 #line 543 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy45;
 	++YYCURSOR;
 yy45:
@@ -991,7 +990,7 @@ yy70:	++YYCURSOR;
 yy71:
 #line 461 "bytecode.re"
 {   YYCURSOR = tok;
-            goto ScalarEnd; 
+            goto ScalarEnd;
         }
 #line 996 "<stdout>"
 yy72:	++YYCURSOR;
@@ -1002,7 +1001,7 @@ yy72:	++YYCURSOR;
 yy73:
 #line 469 "bytecode.re"
 {   CAT(str, cap, idx, tok[0]);
-            goto Scalar2; 
+            goto Scalar2;
         }
 #line 1007 "<stdout>"
 yy74:	++YYCURSOR;
@@ -1072,7 +1071,7 @@ yy84:
 #line 456 "bytecode.re"
 {   CHK_NL(tok+1);
             CAT(str, cap, idx, '\0');
-            goto Scalar2; 
+            goto Scalar2;
         }
 #line 1077 "<stdout>"
 }
@@ -1140,7 +1139,7 @@ yy89:	++YYCURSOR;
 yy90:
 #line 515 "bytecode.re"
 {   CAT(str, cap, idx, tok[0]);
-                goto Inline; 
+                goto Inline;
             }
 #line 1145 "<stdout>"
 yy91:	++YYCURSOR;
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
index 9c8ab8d49b..985bfb2500 100644
--- a/ext/syck/emitter.c
+++ b/ext/syck/emitter.c
@@ -2,14 +2,13 @@
  * emitter.c
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
- * 
+ *
  * All Base64 code from Ruby's pack.c.
- * Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto 
+ * Ruby is Copyright (C) 1993-2007 Yukihiro Matsumoto
  */
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -18,7 +17,7 @@
 
 #define DEFAULT_ANCHOR_FORMAT "id%03d"
 
-const char hex_table[] = 
+const char hex_table[] =
 "0123456789ABCDEF";
 static char b64_table[] =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -98,7 +97,7 @@ syck_base64dec( char *s, long len )
         }
     }
     *end = '\0';
-    /*RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;*/
+    /*RSTRING_LEN(buf) = ptr - RSTRING_PTR(buf);*/
     return ptr;
 }
 
@@ -106,7 +105,7 @@ syck_base64dec( char *s, long len )
  * Allocate an emitter
  */
 SyckEmitter *
-syck_new_emitter()
+syck_new_emitter(void)
 {
     SyckEmitter *e;
     e = S_ALLOC( SyckEmitter );
@@ -132,7 +131,7 @@ syck_new_emitter()
     e->output_handler = NULL;
     e->lvl_idx = 0;
     e->lvl_capa = ALLOC_CT;
-    e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa ); 
+    e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa );
     syck_emitter_reset_levels( e );
     e->bonus = NULL;
     return e;
@@ -198,7 +197,7 @@ syck_emitter_pop_level( SyckEmitter *e )
     free( e->levels[e->lvl_idx].domain );
 }
 
-void 
+void
 syck_emitter_add_level( SyckEmitter *e, int len, enum syck_level_status status )
 {
     ASSERT( e != NULL );
@@ -282,20 +281,20 @@ syck_emitter_clear( SyckEmitter *e )
  * Raw write to the emitter buffer.
  */
 void
-syck_emitter_write( SyckEmitter *e, char *str, long len )
+syck_emitter_write( SyckEmitter *e, const char *str, long len )
 {
     long at;
-    ASSERT( str != NULL )
+    ASSERT( str != NULL );
     if ( e->buffer == NULL )
     {
         syck_emitter_clear( e );
     }
-    
+
     /*
      * Flush if at end of buffer
      */
     at = e->marker - e->buffer;
-    if ( len + at >= e->bufsize )
+    if ( len + at >= (long)e->bufsize )
     {
         syck_emitter_flush( e, 0 );
 	for (;;) {
@@ -327,7 +326,7 @@ syck_emitter_flush( SyckEmitter *e, long check_room )
      */
     if ( check_room > 0 )
     {
-        if ( e->bufsize > ( e->marker - e->buffer ) + check_room )
+        if ( (long)e->bufsize > ( e->marker - e->buffer ) + check_room )
         {
             return;
         }
@@ -361,7 +360,7 @@ syck_emit( SyckEmitter *e, st_data_t n )
     int indent = 0;
     long x = 0;
     SyckLevel *lvl = syck_emitter_current_level( e );
-    
+
     /*
      * Determine headers.
      */
@@ -392,7 +391,7 @@ syck_emit( SyckEmitter *e, st_data_t n )
     /* Look for anchor */
     if ( e->anchors != NULL &&
         st_lookup( e->markers, n, (st_data_t *)&oid ) &&
-        st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
+        st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
     {
         if ( e->anchored == NULL )
         {
@@ -438,7 +437,7 @@ end_emit:
  * and the implicit tag which would be assigned to this node.  If a tag is
  * required, write the tag.
  */
-void syck_emit_tag( SyckEmitter *e, char *tag, char *ignore )
+void syck_emit_tag( SyckEmitter *e, const char *tag, const char *ignore )
 {
     SyckLevel *lvl;
     if ( tag == NULL ) return;
@@ -457,10 +456,10 @@ void syck_emit_tag( SyckEmitter *e, char *tag, char *ignore )
             int skip = 4 + strlen( YAML_DOMAIN ) + 1;
             syck_emitter_write( e, tag + skip, taglen - skip );
         } else {
-            char *subd = tag + 4;
+            const char *subd = tag + 4;
             while ( *subd != ':' && *subd != '\0' ) subd++;
             if ( *subd == ':' ) {
-                if ( subd - tag > ( strlen( YAML_DOMAIN ) + 5 ) &&
+                if ( subd - tag > ( (long)( strlen( YAML_DOMAIN ) + 5 )) &&
                      strncmp( subd - strlen( YAML_DOMAIN ), YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
                     syck_emitter_write( e, tag + 4, subd - strlen( YAML_DOMAIN ) - ( tag + 4 ) - 1 );
                     syck_emitter_write( e, "/", 1 );
@@ -486,7 +485,7 @@ void syck_emit_tag( SyckEmitter *e, char *tag, char *ignore )
     lvl->anctag = 1;
 }
 
-/* 
+/*
  * Emit a newline and an appropriately spaced indent.
  */
 void syck_emit_indent( SyckEmitter *e )
@@ -539,7 +538,7 @@ void syck_emit_indent( SyckEmitter *e )
  * Basic printable test for LATIN-1 characters.
  */
 int
-syck_scan_scalar( int req_width, char *cursor, long len )
+syck_scan_scalar( int req_width, const char *cursor, long len )
 {
     long i = 0, start = 0;
     int flags = SCAN_NONE;
@@ -570,8 +569,8 @@ syck_scan_scalar( int req_width, char *cursor, long len )
     } else if ( len > 1 && cursor[len-2] == '\n' ) {
         flags |= SCAN_MANYNL_E;
     }
-    if ( 
-        ( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' ) ) ||
+    if (
+        ( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' || cursor[0] == '\n' || cursor[0] == '\r' ) ) ||
         ( len > 1 && ( cursor[len-1] == ' ' || cursor[len-1] == '\t' ) )
     ) {
         flags |= SCAN_WHITEEDGE;
@@ -595,7 +594,7 @@ syck_scan_scalar( int req_width, char *cursor, long len )
             flags |= SCAN_NEWLINE;
             if ( len - i >= 3 && strncmp( &cursor[i+1], "---", 3 ) == 0 )
                 flags |= SCAN_DOCSEP;
-            if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' ) 
+            if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' )
                 flags |= SCAN_INDENTED;
             if ( req_width > 0 && i - start > req_width )
                 flags |= SCAN_WIDE;
@@ -619,12 +618,12 @@ syck_scan_scalar( int req_width, char *cursor, long len )
         }
         /* remember, if plain collections get implemented, to add nb-plain-flow-char */
         else if ( ( cursor[i] == ' ' && cursor[i+1] == '#' ) ||
-                  ( cursor[i] == ':' && 
+                  ( cursor[i] == ':' &&
                     ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) ) )
         {
             flags |= SCAN_INDIC_C;
         }
-        else if ( cursor[i] == ',' && 
+        else if ( cursor[i] == ',' &&
                   ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) )
         {
             flags |= SCAN_FLOWMAP;
@@ -639,37 +638,38 @@ syck_scan_scalar( int req_width, char *cursor, long len )
  * All scalars should be emitted through this function, which determines an appropriate style,
  * tag and indent.
  */
-void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style, int force_indent, int force_width,
-                       char keep_nl, char *str, long len )
+void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_style, int force_indent, int force_width,
+                       char keep_nl, const char *str, long len )
 {
     enum scalar_style favor_style = scalar_literal;
     SyckLevel *parent = syck_emitter_parent_level( e );
     SyckLevel *lvl = syck_emitter_current_level( e );
     int scan = 0;
+    const char *match_implicit;
     char *implicit;
-    
+
     if ( str == NULL ) str = "";
 
     /* No empty nulls as map keys */
-    if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) && 
-         parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 ) 
+    if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) &&
+         parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 )
     {
         str = "~";
         len = 1;
     }
 
     scan = syck_scan_scalar( force_width, str, len );
-    implicit = syck_match_implicit( str, len );
+    match_implicit = syck_match_implicit( str, len );
 
     /* quote strings which default to implicits */
-    implicit = syck_taguri( YAML_DOMAIN, implicit, strlen( implicit ) );
+    implicit = syck_taguri( YAML_DOMAIN, match_implicit, strlen( match_implicit ) );
     if ( syck_tagcmp( tag, implicit ) != 0 && syck_tagcmp( tag, "tag:yaml.org,2002:str" ) == 0 ) {
         force_style = scalar_2quote;
     } else {
         /* complex key */
         if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 &&
-             ( !( tag == NULL || 
-             ( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) ) 
+             ( !( tag == NULL ||
+             ( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) )
         {
             syck_emitter_write( e, "? ", 2 );
             parent->status = syck_lvl_mapx;
@@ -773,7 +773,7 @@ void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style,
 }
 
 void
-syck_emitter_escape( SyckEmitter *e, char *src, long len )
+syck_emitter_escape( SyckEmitter *e, const char *src, long len )
 {
     int i;
     for( i = 0; i < len; i++ )
@@ -786,8 +786,8 @@ syck_emitter_escape( SyckEmitter *e, char *src, long len )
             else
             {
                 syck_emitter_write( e, "x", 1 );
-                syck_emitter_write( e, (char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
-                syck_emitter_write( e, (char *)hex_table + (src[i] & 0x0F), 1 );
+                syck_emitter_write( e, (const char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
+                syck_emitter_write( e, (const char *)hex_table + (src[i] & 0x0F), 1 );
             }
         }
         else
@@ -802,12 +802,13 @@ syck_emitter_escape( SyckEmitter *e, char *src, long len )
 /*
  * Outputs a single-quoted block.
  */
-void syck_emit_1quoted( SyckEmitter *e, int width, char *str, long len )
+void
+syck_emit_1quoted( SyckEmitter *e, int width, const char *str, long len )
 {
     char do_indent = 0;
-    char *mark = str;
-    char *start = str;
-    char *end = str;
+    const char *mark = str;
+    const char *start = str;
+    const char *end = str;
     syck_emitter_write( e, "'", 1 );
     while ( mark < str + len ) {
         if ( do_indent ) {
@@ -849,12 +850,13 @@ void syck_emit_1quoted( SyckEmitter *e, int width, char *str, long len )
 /*
  * Outputs a double-quoted block.
  */
-void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )
+void
+syck_emit_2quoted( SyckEmitter *e, int width, const char *str, long len )
 {
     char do_indent = 0;
-    char *mark = str;
-    char *start = str;
-    char *end = str;
+    const char *mark = str;
+    const char *start = str;
+    const char *end = str;
     syck_emitter_write( e, "\"", 1 );
     while ( mark < str + len ) {
         if ( do_indent > 0 ) {
@@ -909,11 +911,12 @@ void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )
 /*
  * Outputs a literal block.
  */
-void syck_emit_literal( SyckEmitter *e, char keep_nl, char *str, long len )
+void
+syck_emit_literal( SyckEmitter *e, char keep_nl, const char *str, long len )
 {
-    char *mark = str;
-    char *start = str;
-    char *end = str;
+    const char *mark = str;
+    const char *start = str;
+    const char *end = str;
     syck_emitter_write( e, "|", 1 );
     if ( keep_nl == NL_CHOMP ) {
         syck_emitter_write( e, "-", 1 );
@@ -944,11 +947,12 @@ void syck_emit_literal( SyckEmitter *e, char keep_nl, char *str, long len )
 /*
  * Outputs a folded block.
  */
-void syck_emit_folded( SyckEmitter *e, int width, char keep_nl, char *str, long len )
+void
+syck_emit_folded( SyckEmitter *e, int width, char keep_nl, const char *str, long len )
 {
-    char *mark = str;
-    char *start = str;
-    char *end = str;
+    const char *mark = str;
+    const char *start = str;
+    const char *end = str;
     syck_emitter_write( e, ">", 1 );
     if ( keep_nl == NL_CHOMP ) {
         syck_emitter_write( e, "-", 1 );
@@ -993,7 +997,7 @@ void syck_emit_folded( SyckEmitter *e, int width, char keep_nl, char *str, long
 /*
  * Begins emission of a sequence.
  */
-void syck_emit_seq( SyckEmitter *e, char *tag, enum seq_style style )
+void syck_emit_seq( SyckEmitter *e, const char *tag, enum seq_style style )
 {
     SyckLevel *parent = syck_emitter_parent_level( e );
     SyckLevel *lvl = syck_emitter_current_level( e );
@@ -1014,7 +1018,8 @@ void syck_emit_seq( SyckEmitter *e, char *tag, enum seq_style style )
 /*
  * Begins emission of a mapping.
  */
-void syck_emit_map( SyckEmitter *e, char *tag, enum map_style style )
+void
+syck_emit_map( SyckEmitter *e, const char *tag, enum map_style style )
 {
     SyckLevel *parent = syck_emitter_parent_level( e );
     SyckLevel *lvl = syck_emitter_current_level( e );
@@ -1218,10 +1223,10 @@ syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
             e->anchors = st_init_numtable();
         }
 
-        if ( ! st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
+        if ( ! st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
         {
             int idx = 0;
-            char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
+            const char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
 
             /*
              * Second time hitting this object, let's give it an anchor
diff --git a/ext/syck/gram.c b/ext/syck/gram.c
index 615a594f61..8fe4e4f3b5 100644
--- a/ext/syck/gram.c
+++ b/ext/syck/gram.c
@@ -1216,7 +1216,7 @@ yyreduce:
 
   case 8:
 #line 76 "gram.y"
-    { 
+    {
             syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
             yyval.nodeData = yyvsp[0].nodeData;
         }
@@ -1232,7 +1232,7 @@ yyreduce:
 
   case 10:
 #line 86 "gram.y"
-    { 
+    {
            /*
             * _Anchors_: The language binding must keep a separate symbol table
             * for anchors.  The actual ID in the symbol table is returned to the
@@ -1266,7 +1266,7 @@ yyreduce:
 
   case 16:
 #line 114 "gram.y"
-    { 
+    {
                    if ( ((SyckParser *)parser)->implicit_typing == 1 )
                    {
                       try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
@@ -1277,7 +1277,7 @@ yyreduce:
 
   case 17:
 #line 122 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1293,7 +1293,7 @@ yyreduce:
 
   case 19:
 #line 132 "gram.y"
-    { 
+    {
                    /*
                     * _Anchors_: The language binding must keep a separate symbol table
                     * for anchors.  The actual ID in the symbol table is returned to the
@@ -1305,7 +1305,7 @@ yyreduce:
 
   case 26:
 #line 165 "gram.y"
-    { 
+    {
                syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
                yyval.nodeData = yyvsp[0].nodeData;
             }
@@ -1313,7 +1313,7 @@ yyreduce:
 
   case 27:
 #line 170 "gram.y"
-    { 
+    {
                syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
                yyval.nodeData = yyvsp[0].nodeData;
             }
@@ -1321,7 +1321,7 @@ yyreduce:
 
   case 28:
 #line 175 "gram.y"
-    { 
+    {
                if ( ((SyckParser *)parser)->implicit_typing == 1 )
                {
                   try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
@@ -1332,7 +1332,7 @@ yyreduce:
 
   case 29:
 #line 183 "gram.y"
-    { 
+    {
                yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
             }
     break;
@@ -1350,7 +1350,7 @@ yyreduce:
 
   case 31:
 #line 195 "gram.y"
-    { 
+    {
                SyckNode *n = yyvsp[0].nodeData;
                if ( ((SyckParser *)parser)->taguri_expansion == 1 )
                {
@@ -1373,28 +1373,28 @@ yyreduce:
 
   case 39:
 #line 229 "gram.y"
-    { 
+    {
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
   case 40:
 #line 233 "gram.y"
-    { 
+    {
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
   case 41:
 #line 239 "gram.y"
-    { 
+    {
                     yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
                 }
     break;
 
   case 42:
 #line 245 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1402,7 +1402,7 @@ yyreduce:
 
   case 43:
 #line 250 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1410,7 +1410,7 @@ yyreduce:
 
   case 44:
 #line 255 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1418,7 +1418,7 @@ yyreduce:
 
   case 45:
 #line 260 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1426,14 +1426,14 @@ yyreduce:
 
   case 46:
 #line 265 "gram.y"
-    { 
+    {
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
                 }
     break;
 
   case 47:
 #line 269 "gram.y"
-    { 
+    {
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
                 }
     break;
@@ -1447,7 +1447,7 @@ yyreduce:
 
   case 49:
 #line 279 "gram.y"
-    { 
+    {
                     syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
                     yyval.nodeData = yyvsp[-2].nodeData;
 				}
@@ -1455,21 +1455,21 @@ yyreduce:
 
   case 50:
 #line 284 "gram.y"
-    { 
+    {
                     yyval.nodeData = yyvsp[-1].nodeData;
 				}
     break;
 
   case 51:
 #line 293 "gram.y"
-    { 
+    {
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
   case 52:
 #line 297 "gram.y"
-    { 
+    {
                     yyval.nodeData = syck_alloc_seq();
                 }
     break;
@@ -1483,7 +1483,7 @@ yyreduce:
 
   case 54:
 #line 307 "gram.y"
-    { 
+    {
                     syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
                     yyval.nodeData = yyvsp[-2].nodeData;
 				}
@@ -1491,7 +1491,7 @@ yyreduce:
 
   case 57:
 #line 321 "gram.y"
-    { 
+    {
                     apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
@@ -1499,7 +1499,7 @@ yyreduce:
 
   case 58:
 #line 326 "gram.y"
-    { 
+    {
                     apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
@@ -1507,7 +1507,7 @@ yyreduce:
 
   case 59:
 #line 333 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1515,7 +1515,7 @@ yyreduce:
 
   case 60:
 #line 338 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1523,7 +1523,7 @@ yyreduce:
 
   case 61:
 #line 343 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1531,7 +1531,7 @@ yyreduce:
 
   case 62:
 #line 348 "gram.y"
-    { 
+    {
                     syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
@@ -1539,14 +1539,14 @@ yyreduce:
 
   case 63:
 #line 353 "gram.y"
-    { 
+    {
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
                 }
     break;
 
   case 64:
 #line 357 "gram.y"
-    { 
+    {
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
                 }
     break;
@@ -1561,8 +1561,8 @@ yyreduce:
   case 68:
 #line 380 "gram.y"
     {
-                    yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
+                    yyval.nodeData = syck_new_map(
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
                         syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
                 }
     break;
@@ -1603,8 +1603,8 @@ yyreduce:
   case 73:
 #line 427 "gram.y"
     {
-                    yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
+                    yyval.nodeData = syck_new_map(
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
                         syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
                 }
     break;
@@ -1637,8 +1637,8 @@ yyreduce:
 #line 455 "gram.y"
     {
                     NULL_NODE( parser, n );
-                    yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ), 
+                    yyval.nodeData = syck_new_map(
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ),
                         syck_hdlr_add_node( (SyckParser *)parser, n ) );
                 }
     break;
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
index 56fe838fbd..40f5ef27d0 100644
--- a/ext/syck/handler.c
+++ b/ext/syck/handler.c
@@ -2,20 +2,19 @@
  * handler.c
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "syck.h"
 
-SYMID 
+SYMID
 syck_hdlr_add_node( SyckParser *p, SyckNode *n )
 {
     SYMID id;
 
-    if ( ! n->id ) 
+    if ( ! n->id )
     {
         n->id = (p->handler)( p, n );
     }
@@ -37,7 +36,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
     if ( p->bad_anchors != NULL )
     {
         SyckNode *bad;
-        if ( st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&bad ) )
+        if ( st_lookup( p->bad_anchors, (st_data_t)a, (void *)&bad ) )
         {
             if ( n->kind != syck_str_kind )
             {
@@ -50,7 +49,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
     {
         p->anchors = st_init_strtable();
     }
-    if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&ntmp ) )
+    if ( st_lookup( p->anchors, (st_data_t)a, (void *)&ntmp ) )
     {
         if ( ntmp != (void *)1 )
         {
@@ -70,7 +69,7 @@ syck_hdlr_remove_anchor( SyckParser *p, char *a )
     {
         p->anchors = st_init_strtable();
     }
-    if ( st_delete( p->anchors, (st_data_t *)&atmp, (st_data_t *)&ntmp ) )
+    if ( st_delete( p->anchors, (void *)&atmp, (void *)&ntmp ) )
     {
         if ( ntmp != (void *)1 )
         {
@@ -87,10 +86,10 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
 
     if ( p->anchors != NULL )
     {
-        if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
+        if ( st_lookup( p->anchors, (st_data_t)a, (void *)&n ) )
         {
             if ( n != (void *)1 )
-            {    
+            {
                 S_FREE( a );
                 return n;
             }
@@ -100,7 +99,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
                 {
                     p->bad_anchors = st_init_strtable();
                 }
-                if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&n ) )
+                if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (void *)&n ) )
                 {
                     n = (p->bad_anchor_handler)( p, a );
                     st_insert( p->bad_anchors, (st_data_t)a, (st_data_t)n );
@@ -117,7 +116,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
     if ( n->anchor )
     {
         S_FREE( a );
-    } 
+    }
     else
     {
         n->anchor = a;
@@ -145,7 +144,7 @@ syck_add_transfer( char *uri, SyckNode *n, int taguri )
 }
 
 char *
-syck_xprivate( char *type_id, int type_len )
+syck_xprivate( const char *type_id, int type_len )
 {
     char *uri = S_ALLOC_N( char, type_len + 14 );
     uri[0] = '\0';
@@ -155,7 +154,7 @@ syck_xprivate( char *type_id, int type_len )
 }
 
 char *
-syck_taguri( char *domain, char *type_id, int type_len )
+syck_taguri( const char *domain, const char *type_id, int type_len )
 {
     char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
     uri[0] = '\0';
@@ -166,7 +165,7 @@ syck_taguri( char *domain, char *type_id, int type_len )
     return uri;
 }
 
-int 
+int
 syck_try_implicit( SyckNode *n )
 {
     return 1;
diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
index d356faf7d9..7d40747756 100644
--- a/ext/syck/implicit.c
+++ b/ext/syck/implicit.c
@@ -4,24 +4,23 @@
  * implicit.re
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "syck.h"
 
 #define YYCTYPE     char
 #define YYCURSOR    cursor
 #define YYMARKER    marker
 #define YYLIMIT     limit
-#define YYFILL(n)
+#define YYFILL(n)   (void)0
 
 void
 try_tag_implicit( SyckNode *n, int taguri )
 {
-    char *tid = "";
+    const char *tid = "";
     switch ( n->kind )
     {
         case syck_str_kind:
@@ -45,9 +44,10 @@ try_tag_implicit( SyckNode *n, int taguri )
     }
 }
 
-char *syck_match_implicit( char *str, size_t len )
+const char *
+syck_match_implicit( const char *str, size_t len )
 {
-    char *cursor, *limit, *marker;
+    const char *cursor, *limit, *marker = 0;
     cursor = str;
     limit = str + len;
 
@@ -1585,7 +1585,7 @@ yy201:	++YYCURSOR;
 
 /* Remove ending fragment and compare types */
 int
-syck_tagcmp( char *tag1, char *tag2 )
+syck_tagcmp( const char *tag1, const char *tag2 )
 {
     if ( tag1 == tag2 ) return 1;
     if ( tag1 == NULL || tag2 == NULL ) return 0;
@@ -1609,9 +1609,9 @@ syck_tagcmp( char *tag1, char *tag2 )
 }
 
 char *
-syck_type_id_to_uri( char *type_id )
+syck_type_id_to_uri( const char *type_id )
 {
-    char *cursor, *limit, *marker;
+    const char *cursor, *limit, *marker = 0;
 
     cursor = type_id;
     limit = type_id + strlen( type_id );
@@ -1620,7 +1620,7 @@ syck_type_id_to_uri( char *type_id )
 #line 1620 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy202;
 	++YYCURSOR;
 yy202:
diff --git a/ext/syck/lib/syck.rb b/ext/syck/lib/syck.rb
new file mode 100644
index 0000000000..92fd7a15d6
--- /dev/null
+++ b/ext/syck/lib/syck.rb
@@ -0,0 +1,447 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+# $Id$
+#
+# = yaml.rb: top-level module with methods for loading and parsing YAML documents
+#
+# Author:: why the lucky stiff
+#
+
+require 'yaml/syck'
+
+# == YAML
+#
+# YAML(tm) (rhymes with 'camel') is a
+# straightforward machine parsable data serialization format designed for
+# human readability and interaction with scripting languages such as Perl
+# and Python. YAML is optimized for data serialization, formatted
+# dumping, configuration files, log files, Internet messaging and
+# filtering. This specification describes the YAML information model and
+# serialization format. Together with the Unicode standard for characters, it
+# provides all the information necessary to understand YAML Version 1.0
+# and construct computer programs to process it.
+#
+# See http://yaml.org/ for more information.  For a quick tutorial, please
+# visit YAML In Five Minutes (http://yaml.kwiki.org/?YamlInFiveMinutes).
+#
+# == About This Library
+#
+# The YAML 1.0 specification outlines four stages of YAML loading and dumping.
+# This library honors all four of those stages, although data is really only
+# available to you in three stages.
+#
+# The four stages are: native, representation, serialization, and presentation.
+#
+# The native stage refers to data which has been loaded completely into Ruby's
+# own types. (See +YAML::load+.)
+#
+# The representation stage means data which has been composed into
+# +YAML::BaseNode+ objects.  In this stage, the document is available as a
+# tree of node objects.  You can perform YPath queries and transformations
+# at this level.  (See +YAML::parse+.)
+#
+# The serialization stage happens inside the parser.  The YAML parser used in
+# Ruby is called Syck.  Serialized nodes are available in the extension as
+# SyckNode structs.
+#
+# The presentation stage is the YAML document itself.  This is accessible
+# to you as a string.  (See +YAML::dump+.)
+#
+# For more information about the various information models, see Chapter
+# 3 of the YAML 1.0 Specification (http://yaml.org/spec/#id2491269).
+#
+# The YAML module provides quick access to the most common loading (YAML::load)
+# and dumping (YAML::dump) tasks.  This module also provides an API for registering
+# global types (YAML::add_domain_type).
+#
+# == Example
+#
+# A simple round-trip (load and dump) of an object.
+#
+#     require "yaml"
+#
+#     test_obj = ["dogs", "cats", "badgers"]
+#
+#     yaml_obj = YAML::dump( test_obj )
+#                         # -> ---
+#                              - dogs
+#                              - cats
+#                              - badgers
+#     ruby_obj = YAML::load( yaml_obj )
+#                         # => ["dogs", "cats", "badgers"]
+#     ruby_obj == test_obj
+#                         # => true
+#
+# To register your custom types with the global resolver, use +add_domain_type+.
+#
+#     YAML::add_domain_type( "your-site.com,2004", "widget" ) do |type, val|
+#         Widget.new( val )
+#     end
+#
+module Syck
+
+    DefaultResolver.use_types_at( @@tagged_classes )
+
+    # Returns a new default parser
+    def self.parser; Parser.new.set_resolver( self.resolver ); end
+
+    # Returns a new generic parser
+    def self.generic_parser
+        warn "#{caller[0]}: YAML.generic_parser is deprecated, switch to psych" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        Parser.new.set_resolver( GenericResolver )
+    end
+
+    # Returns the default resolver
+    def self.resolver
+        warn "#{caller[0]}: YAML.resolver is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        DefaultResolver
+    end
+
+    # Returns a new default emitter
+    def self.emitter
+        warn "#{caller[0]}: YAML.emitter is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        Emitter.new.set_resolver( self.resolver )
+    end
+
+    #
+    # Converts _obj_ to YAML and writes the YAML result to _io_.
+    #
+    #   File.open( 'animals.yaml', 'w' ) do |out|
+    #     YAML.dump( ['badger', 'elephant', 'tiger'], out )
+    #   end
+    #
+    # If no _io_ is provided, a string containing the dumped YAML
+    # is returned.
+    #
+    #   YAML.dump( :locked )
+    #      #=> "--- :locked"
+    #
+    def self.dump( obj, io = nil )
+        obj.to_yaml( io || io2 = StringIO.new )
+        io || ( io2.rewind; io2.read )
+    end
+
+    #
+    # Load a document from the current _io_ stream.
+    #
+    #   File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
+    #      #=> ['badger', 'elephant', 'tiger']
+    #
+    # Can also load from a string.
+    #
+    #   YAML.load( "--- :locked" )
+    #      #=> :locked
+    #
+    def self.load( io )
+        yp = parser.load( io )
+    end
+
+    #
+    # Load a document from the file located at _filepath_.
+    #
+    #   YAML.load_file( 'animals.yaml' )
+    #      #=> ['badger', 'elephant', 'tiger']
+    #
+    def self.load_file( filepath )
+        File.open( filepath ) do |f|
+            load( f )
+        end
+    end
+
+    #
+    # Parse the first document from the current _io_ stream
+    #
+    #   File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
+    #      #=> #<YAML::Syck::Node:0x82ccce0
+    #           @kind=:seq,
+    #           @value=
+    #            [#<YAML::Syck::Node:0x82ccd94
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="badger">,
+    #             #<YAML::Syck::Node:0x82ccd58
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="elephant">,
+    #             #<YAML::Syck::Node:0x82ccd1c
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="tiger">]>
+    #
+    # Can also load from a string.
+    #
+    #   YAML.parse( "--- :locked" )
+    #      #=> #<YAML::Syck::Node:0x82edddc
+    #            @type_id="tag:ruby.yaml.org,2002:sym",
+    #            @value=":locked", @kind=:scalar>
+    #
+    def self.parse( io )
+        yp = generic_parser.load( io )
+    end
+
+    #
+    # Parse a document from the file located at _filepath_.
+    #
+    #   YAML.parse_file( 'animals.yaml' )
+    #      #=> #<YAML::Syck::Node:0x82ccce0
+    #           @kind=:seq,
+    #           @value=
+    #            [#<YAML::Syck::Node:0x82ccd94
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="badger">,
+    #             #<YAML::Syck::Node:0x82ccd58
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="elephant">,
+    #             #<YAML::Syck::Node:0x82ccd1c
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="tiger">]>
+    #
+    def self.parse_file( filepath )
+        File.open( filepath ) do |f|
+            parse( f )
+        end
+    end
+
+    #
+    # Calls _block_ with each consecutive document in the YAML
+    # stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.each_document( yf ) do |ydoc|
+    #       ## ydoc contains the single object
+    #       ## from the YAML document
+    #     end
+    #   end
+    #
+    def self.each_document( io, &block )
+        warn "#{caller[0]}: YAML.each_document is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        yp = parser.load_documents( io, &block )
+    end
+
+    #
+    # Calls _block_ with each consecutive document in the YAML
+    # stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.load_documents( yf ) do |ydoc|
+    #       ## ydoc contains the single object
+    #       ## from the YAML document
+    #     end
+    #   end
+    #
+    def self.load_documents( io, &doc_proc )
+        yp = parser.load_documents( io, &doc_proc )
+    end
+
+    #
+    # Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
+    # each consecutive document in the YAML stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.each_node( yf ) do |ydoc|
+    #       ## ydoc contains a tree of nodes
+    #       ## from the YAML document
+    #     end
+    #   end
+    #
+    def self.each_node( io, &doc_proc )
+        warn "#{caller[0]}: YAML.each_node is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        yp = generic_parser.load_documents( io, &doc_proc )
+    end
+
+    #
+    # Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
+    # each consecutive document in the YAML stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.parse_documents( yf ) do |ydoc|
+    #       ## ydoc contains a tree of nodes
+    #       ## from the YAML document
+    #     end
+    #   end
+    #
+    def self.parse_documents( io, &doc_proc )
+        warn "#{caller[0]}: YAML.parse_documents is deprecated, use load_stream" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        self.each_node( io, &doc_proc )
+    end
+
+    #
+    # Loads all documents from the current _io_ stream,
+    # returning a +YAML::Stream+ object containing all
+    # loaded documents.
+    #
+    def self.load_stream( io )
+        d = nil
+        parser.load_documents( io ) do |doc|
+            d = Stream.new if not d
+            d.add( doc )
+        end
+        return d
+    end
+
+    #
+    # Returns a YAML stream containing each of the items in +objs+,
+    # each having their own document.
+    #
+    #   YAML.dump_stream( 0, [], {} )
+    #     #=> --- 0
+    #         --- []
+    #         --- {}
+    #
+    def self.dump_stream( *objs )
+        d = Stream.new
+        objs.each do |doc|
+            d.add( doc )
+        end
+        d.emit
+    end
+
+    #
+    # Add a global handler for a YAML domain type.
+    #
+    def self.add_domain_type( domain, type_tag, &transfer_proc )
+        resolver.add_type( "tag:#{ domain }:#{ type_tag }", transfer_proc )
+    end
+
+    #
+    # Add a transfer method for a builtin type
+    #
+    def self.add_builtin_type( type_tag, &transfer_proc )
+        resolver.add_type( "tag:yaml.org,2002:#{ type_tag }", transfer_proc )
+    end
+
+    #
+    # Add a transfer method for a builtin type
+    #
+    def self.add_ruby_type( type_tag, &transfer_proc )
+        warn "#{caller[0]}: YAML.add_ruby_type is deprecated, use add_domain_type" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        resolver.add_type( "tag:ruby.yaml.org,2002:#{ type_tag }", transfer_proc )
+    end
+
+    #
+    # Add a private document type
+    #
+    def self.add_private_type( type_re, &transfer_proc )
+        warn "#{caller[0]}: YAML.add_private_type is deprecated, use add_domain_type" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        resolver.add_type( "x-private:" + type_re, transfer_proc )
+    end
+
+    #
+    # Detect typing of a string
+    #
+    def self.detect_implicit( val )
+        warn "#{caller[0]}: YAML.detect_implicit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        resolver.detect_implicit( val )
+    end
+
+    #
+    # Convert a type_id to a taguri
+    #
+    def self.tagurize( val )
+        warn "#{caller[0]}: YAML.tagurize is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        resolver.tagurize( val )
+    end
+
+    #
+    # Apply a transfer method to a Ruby object
+    #
+    def self.transfer( type_id, obj )
+        warn "#{caller[0]}: YAML.transfer is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        resolver.transfer( tagurize( type_id ), obj )
+    end
+
+    #
+    # Apply any implicit a node may qualify for
+    #
+    def self.try_implicit( obj )
+        warn "#{caller[0]}: YAML.try_implicit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        transfer( detect_implicit( obj ), obj )
+    end
+
+    #
+    # Method to extract colon-seperated type and class, returning
+    # the type and the constant of the class
+    #
+    def self.read_type_class( type, obj_class )
+        warn "#{caller[0]}: YAML.read_type_class is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        scheme, domain, type, tclass = type.split( ':', 4 )
+        tclass.split( "::" ).each { |c| obj_class = obj_class.const_get( c ) } if tclass
+        return [ type, obj_class ]
+    end
+
+    #
+    # Allocate blank object
+    #
+    def self.object_maker( obj_class, val )
+        warn "#{caller[0]}: YAML.object_maker is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        if Hash === val
+            o = obj_class.allocate
+            val.each_pair { |k,v|
+                o.instance_variable_set("@#{k}", v)
+            }
+            o
+        else
+            raise Error, "Invalid object explicitly tagged !ruby/Object: " + val.inspect
+        end
+    end
+
+    #
+    # Allocate an Emitter if needed
+    #
+    def self.quick_emit( oid, opts = {}, &e )
+        warn "#{caller[0]}: YAML.quick_emit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+        out =
+            if opts.is_a? Emitter
+                opts
+            else
+                emitter.reset( opts )
+            end
+        out.emit( oid, &e )
+    end
+
+end
+
+module Kernel
+    #
+    # ryan:: You know how Kernel.p is a really convenient way to dump ruby
+    #        structures?  The only downside is that it's not as legible as
+    #        YAML.
+    #
+    # _why:: (listening)
+    #
+    # ryan:: I know you don't want to urinate all over your users' namespaces.
+    #        But, on the other hand, convenience of dumping for debugging is,
+    #        IMO, a big YAML use case.
+    #
+    # _why:: Go nuts!  Have a pony parade!
+    #
+    # ryan:: Either way, I certainly will have a pony parade.
+    #
+
+    # Prints any supplied _objects_ out in YAML.  Intended as
+    # a variation on +Kernel::p+.
+    #
+    #   S = Struct.new(:name, :state)
+    #   s = S['dave', 'TX']
+    #   y s
+    #
+    # _produces:_
+    #
+    #   --- !ruby/struct:S
+    #   name: dave
+    #   state: TX
+    #
+    def y( object, *objects )
+        objects.unshift object
+        puts( if objects.length == 1
+                  YAML.dump( *objects )
+              else
+                  YAML.dump_stream( *objects )
+              end )
+    end
+    private :y
+end
+
+
diff --git a/ext/syck/lib/syck/baseemitter.rb b/ext/syck/lib/syck/baseemitter.rb
new file mode 100644
index 0000000000..5e39e450de
--- /dev/null
+++ b/ext/syck/lib/syck/baseemitter.rb
@@ -0,0 +1,242 @@
+#
+# BaseEmitter
+#
+
+require 'syck/constants'
+require 'syck/encoding'
+require 'syck/error'
+
+module Syck
+  module BaseEmitter
+    def options( opt = nil )
+      if opt
+        @options[opt] || DEFAULTS[opt]
+      else
+        @options
+      end
+    end
+
+    def options=( opt )
+      @options = opt
+    end
+
+    #
+    # Emit binary data
+    #
+    def binary_base64( value )
+      self << "!binary "
+      self.node_text( [value].pack("m"), '|' )
+    end
+
+    #
+    # Emit plain, normal flowing text
+    #
+    def node_text( value, block = nil )
+      @seq_map = false
+      valx = value.dup
+      unless block
+        block =
+          if options(:UseBlock)
+            '|'
+          elsif not options(:UseFold) and valx =~ /\n[ \t]/ and not valx =~ /#{ESCAPE_CHAR}/
+            '|'
+          else
+            '>'
+          end
+        indt = $&.to_i if block =~ /\d+/
+        if valx =~ /(\A\n*[ \t#]|^---\s+)/
+          indt = options(:Indent) unless indt.to_i > 0
+          block += indt.to_s
+        end
+
+        block +=
+          if valx =~ /\n\Z\n/
+            "+"
+          elsif valx =~ /\Z\n/
+            ""
+          else
+            "-"
+          end
+      end
+      block += "\n"
+      if block[0] == ?"
+        esc_skip = ( "\t\n" unless valx =~ /^[ \t]/ ) || ""
+        valx = fold( Syck.escape( valx, esc_skip ) + "\"" ).chomp
+        self << '"' + indent_text( valx, indt, false )
+      else
+        if block[0] == ?>
+          valx = fold( valx )
+        end
+        #p [block, indt]
+        self << block + indent_text( valx, indt )
+      end
+    end
+
+    #
+    # Emit a simple, unqouted string
+    #
+    def simple( value )
+      @seq_map = false
+      self << value.to_s
+    end
+
+    #
+    # Emit double-quoted string
+    #
+    def double( value )
+      "\"#{Syck.escape( value )}\""
+    end
+
+    #
+    # Emit single-quoted string
+    #
+    def single( value )
+      "'#{value}'"
+    end
+
+    #
+    # Write a text block with the current indent
+    #
+    def indent_text( text, mod, first_line = true )
+      return "" if text.to_s.empty?
+      spacing = indent( mod )
+      text = text.gsub( /\A([^\n])/, "#{ spacing }\\1" ) if first_line
+      return text.gsub( /\n^([^\n])/, "\n#{spacing}\\1" )
+    end
+
+    #
+    # Write a current indent
+    #
+    def indent( mod = nil )
+      #p [ self.id, level, mod, :INDENT ]
+      if level <= 0
+        mod ||= 0
+      else
+        mod ||= options(:Indent)
+        mod += ( level - 1 ) * options(:Indent)
+      end
+      return " " * mod
+    end
+
+    #
+    # Add indent to the buffer
+    #
+    def indent!
+      self << indent
+    end
+
+    #
+    # Folding paragraphs within a column
+    #
+    def fold( value )
+      value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]|\Z))|$)/ ) do
+        $1 || $2 + ( $3 || "\n" )
+      end
+    end
+
+    #
+    # Quick mapping
+    #
+    def map( type, &e )
+      val = Mapping.new
+      e.call( val )
+      self << "#{type} " if type.length.nonzero?
+
+      #
+      # Empty hashes
+      #
+      if val.length.zero?
+        self << "{}"
+        @seq_map = false
+      else
+        # FIXME
+        # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero?
+        #     @headless = 1
+        # end
+
+        defkey = @options.delete( :DefaultKey )
+        if defkey
+          seq_map_shortcut
+          self << "= : "
+          defkey.to_yaml( :Emitter => self )
+        end
+
+        #
+        # Emit the key and value
+        #
+        val.each { |v|
+          seq_map_shortcut
+          if v[0].is_complex_yaml?
+            self << "? "
+          end
+          v[0].to_yaml( :Emitter => self )
+          if v[0].is_complex_yaml?
+            self << "\n"
+            indent!
+          end
+          self << ": "
+          v[1].to_yaml( :Emitter => self )
+        }
+      end
+    end
+
+    def seq_map_shortcut
+      # FIXME: seq_map needs to work with the new anchoring system
+      # if @seq_map
+      #     @anchor_extras[@buffer.length - 1] = "\n" + indent
+      #     @seq_map = false
+      # else
+      self << "\n"
+      indent!
+      # end
+    end
+
+    #
+    # Quick sequence
+    #
+    def seq( type, &e )
+      @seq_map = false
+      val = Sequence.new
+      e.call( val )
+      self << "#{type} " if type.length.nonzero?
+
+      #
+      # Empty arrays
+      #
+      if val.length.zero?
+        self << "[]"
+      else
+        # FIXME
+        # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero?
+        #     @headless = 1
+        # end
+
+        #
+        # Emit the key and value
+        #
+        val.each { |v|
+          self << "\n"
+          indent!
+          self << "- "
+          @seq_map = true if v.class == Hash
+          v.to_yaml( :Emitter => self )
+        }
+      end
+    end
+  end
+
+  #
+  # Emitter helper classes
+  #
+  class Mapping < Array
+    def add( k, v )
+      push [k, v]
+    end
+  end
+
+  class Sequence < Array
+    def add( v )
+      push v
+    end
+  end
+end
diff --git a/ext/syck/lib/syck/basenode.rb b/ext/syck/lib/syck/basenode.rb
new file mode 100644
index 0000000000..3739331562
--- /dev/null
+++ b/ext/syck/lib/syck/basenode.rb
@@ -0,0 +1,223 @@
+#
+# YAML::BaseNode class
+#
+
+module Syck
+
+    #
+    # YAML Generic Model container
+    #
+    module BaseNode
+
+        #
+        # Search for YPath entry and return
+        # qualified nodes.
+        #
+        def select( ypath_str )
+            warn "#{caller[0]}: select is deprecated" if $VERBOSE
+            matches = match_path( ypath_str )
+
+            #
+            # Create a new generic view of the elements selected
+            #
+            if matches
+                result = []
+                matches.each { |m|
+                    result.push m.last
+                }
+                Syck.transfer( 'seq', result )
+            end
+        end
+
+        #
+        # Search for YPath entry and return
+        # transformed nodes.
+        #
+        def select!( ypath_str )
+            warn "#{caller[0]}: select!() is deprecated" if $VERBOSE
+            matches = match_path( ypath_str )
+
+            #
+            # Create a new generic view of the elements selected
+            #
+            if matches
+                result = []
+                matches.each { |m|
+                    result.push m.last.transform
+                }
+                result
+            end
+        end
+
+        #
+        # Search for YPath entry and return a list of
+        # qualified paths.
+        #
+        def search( ypath_str )
+            warn "#{caller[0]}: search() is deprecated" if $VERBOSE
+            matches = match_path( ypath_str )
+
+            if matches
+                matches.collect { |m|
+                    path = []
+                    m.each_index { |i|
+                        path.push m[i] if ( i % 2 ).zero?
+                    }
+                    "/" + path.compact.join( "/" )
+                }
+            end
+        end
+
+        def at( seg )
+            warn "#{caller[0]}: at() is deprecated" if $VERBOSE
+            if Hash === @value
+                self[seg]
+            elsif Array === @value and seg =~ /\A\d+\Z/ and @value[seg.to_i]
+                @value[seg.to_i]
+            end
+        end
+
+        #
+        # YPath search returning a complete depth array
+        #
+        def match_path( ypath_str )
+            warn "#{caller[0]}: match_path is deprecated" if $VERBOSE
+            require 'syck/ypath'
+            depth = 0
+            matches = []
+            YPath.each_path( ypath_str ) do |ypath|
+                seg = match_segment( ypath, 0 )
+                matches += seg if seg
+            end
+            matches.uniq
+        end
+
+        #
+        # Search a node for a single YPath segment
+        #
+        def match_segment( ypath, depth )
+            warn "#{caller[0]}: match_segment is deprecated" if $VERBOSE
+            deep_nodes = []
+            seg = ypath.segments[ depth ]
+            if seg == "/"
+                unless String === @value
+                    idx = -1
+                    @value.collect { |v|
+                        idx += 1
+                        if Hash === @value
+                            match_init = [v[0].transform, v[1]]
+                            match_deep = v[1].match_segment( ypath, depth )
+                        else
+                            match_init = [idx, v]
+                            match_deep = v.match_segment( ypath, depth )
+                        end
+                        if match_deep
+                            match_deep.each { |m|
+                                deep_nodes.push( match_init + m )
+                            }
+                        end
+                    }
+                end
+                depth += 1
+                seg = ypath.segments[ depth ]
+            end
+            match_nodes =
+                case seg
+                when "."
+                    [[nil, self]]
+                when ".."
+                    [["..", nil]]
+                when "*"
+                    if @value.is_a? Enumerable
+                        idx = -1
+                        @value.collect { |h|
+                            idx += 1
+                            if Hash === @value
+                                [h[0].transform, h[1]]
+                            else
+                                [idx, h]
+                            end
+                        }
+                    end
+                else
+                    if seg =~ /^"(.*)"$/
+                        seg = $1
+                    elsif seg =~ /^'(.*)'$/
+                        seg = $1
+                    end
+                    if ( v = at( seg ) )
+                        [[ seg, v ]]
+                    end
+                end
+            return deep_nodes unless match_nodes
+            pred = ypath.predicates[ depth ]
+            if pred
+                case pred
+                when /^\.=/
+                    pred = $'   # '
+                    match_nodes.reject! { |n|
+                        n.last.value != pred
+                    }
+                else
+                    match_nodes.reject! { |n|
+                        n.last.at( pred ).nil?
+                    }
+                end
+            end
+            return match_nodes + deep_nodes unless ypath.segments.length > depth + 1
+
+            #puts "DEPTH: #{depth + 1}"
+            deep_nodes = []
+            match_nodes.each { |n|
+                if n[1].is_a? BaseNode
+                    match_deep = n[1].match_segment( ypath, depth + 1 )
+                    if match_deep
+                        match_deep.each { |m|
+                            deep_nodes.push( n + m )
+                        }
+                    end
+                else
+                    deep_nodes = []
+                end
+            }
+            deep_nodes = nil if deep_nodes.length == 0
+            deep_nodes
+        end
+
+        #
+        # We want the node to act like as Hash
+        # if it is.
+        #
+        def []( *key )
+            if Hash === @value
+                v = @value.detect { |k,| k.transform == key.first }
+                v[1] if v
+            elsif Array === @value
+                @value.[]( *key )
+            end
+        end
+
+        def children
+            if Hash === @value
+                @value.values.collect { |c| c[1] }
+            elsif Array === @value
+                @value
+            end
+        end
+
+        def children_with_index
+            warn "#{caller[0]}: children_with_index is deprecated, use children" if $VERBOSE
+            if Hash === @value
+                @value.keys.collect { |i| [self[i], i] }
+            elsif Array === @value
+                i = -1; @value.collect { |v| i += 1; [v, i] }
+            end
+        end
+
+        def emit
+            transform.to_yaml
+        end
+    end
+
+end
+
diff --git a/ext/syck/lib/syck/constants.rb b/ext/syck/lib/syck/constants.rb
new file mode 100644
index 0000000000..19fe42ef85
--- /dev/null
+++ b/ext/syck/lib/syck/constants.rb
@@ -0,0 +1,45 @@
+#
+# Constants used throughout the library
+#
+module Syck
+
+	#
+	# Constants
+	#
+	VERSION = '0.60'
+	SUPPORTED_YAML_VERSIONS = ['1.0']
+
+	#
+	# Parser tokens
+	#
+	WORD_CHAR = 'A-Za-z0-9'
+	PRINTABLE_CHAR = '-_A-Za-z0-9!?/()$\'". '
+	NOT_PLAIN_CHAR = '\x7f\x0-\x1f\x80-\x9f'
+	ESCAPE_CHAR = '[\\x00-\\x09\\x0b-\\x1f]'
+	INDICATOR_CHAR = '*&!|\\\\^@%{}[]='
+	SPACE_INDICATORS = '-#:,?'
+	RESTRICTED_INDICATORS = '#:,}]'
+	DNS_COMP_RE = "\\w(?:[-\\w]*\\w)?"
+	DNS_NAME_RE = "(?:(?:#{DNS_COMP_RE}\\.)+#{DNS_COMP_RE}|#{DNS_COMP_RE})"
+	ESCAPES = %w{\x00   \x01	\x02	\x03	\x04	\x05	\x06	\a
+			     \x08	\t		\n		\v		\f		\r		\x0e	\x0f
+				 \x10	\x11	\x12	\x13	\x14	\x15	\x16	\x17
+				 \x18	\x19	\x1a	\e		\x1c	\x1d	\x1e	\x1f
+			    }
+	UNESCAPES = {
+				'a' => "\x07", 'b' => "\x08", 't' => "\x09",
+				'n' => "\x0a", 'v' => "\x0b", 'f' => "\x0c",
+				'r' => "\x0d", 'e' => "\x1b", '\\' => '\\',
+			    }
+
+	#
+	# Default settings
+	#
+	DEFAULTS = {
+		:Indent => 2, :UseHeader => false, :UseVersion => false, :Version => '1.0',
+		:SortKeys => false, :AnchorFormat => 'id%03d', :ExplicitTypes => false,
+		:WidthType => 'absolute', :BestWidth => 80,
+		:UseBlock => false, :UseFold => false, :Encoding => :None
+	}
+
+end
diff --git a/ext/syck/lib/syck/encoding.rb b/ext/syck/lib/syck/encoding.rb
new file mode 100644
index 0000000000..dad062994c
--- /dev/null
+++ b/ext/syck/lib/syck/encoding.rb
@@ -0,0 +1,35 @@
+#
+# Handle Unicode-to-Internal conversion
+#
+
+module Syck
+
+	#
+	# Escape the string, condensing common escapes
+	#
+	def self.escape( value, skip = "" )
+              warn "#{caller[0]}: YAML.escape is deprecated" if $VERBOSE
+		value.gsub( /\\/, "\\\\\\" ).
+              gsub( /"/, "\\\"" ).
+              gsub( /([\x00-\x1f])/ ) do
+                 skip[$&] || ESCAPES[ $&.unpack("C")[0] ]
+             end
+	end
+
+	#
+	# Unescape the condenses escapes
+	#
+	def self.unescape( value )
+              warn "#{caller[0]}: YAML.unescape is deprecated" if $VERBOSE
+		value.gsub( /\\(?:([nevfbart\\])|0?x([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/ ) {
+			if $3
+				["#$3".hex ].pack('U*')
+			elsif $2
+				[$2].pack( "H2" )
+			else
+				UNESCAPES[$1]
+			end
+		}
+	end
+
+end
diff --git a/ext/syck/lib/syck/error.rb b/ext/syck/lib/syck/error.rb
new file mode 100644
index 0000000000..0bac872411
--- /dev/null
+++ b/ext/syck/lib/syck/error.rb
@@ -0,0 +1,34 @@
+#
+# Error messages and exception class
+#
+
+module Syck
+
+	#
+	# Error messages
+	#
+
+	ERROR_NO_HEADER_NODE = "With UseHeader=false, the node Array or Hash must have elements"
+	ERROR_NEED_HEADER = "With UseHeader=false, the node must be an Array or Hash"
+	ERROR_BAD_EXPLICIT = "Unsupported explicit transfer: '%s'"
+    ERROR_MANY_EXPLICIT = "More than one explicit transfer"
+	ERROR_MANY_IMPLICIT = "More than one implicit request"
+	ERROR_NO_ANCHOR = "No anchor for alias '%s'"
+	ERROR_BAD_ANCHOR = "Invalid anchor: %s"
+	ERROR_MANY_ANCHOR = "More than one anchor"
+	ERROR_ANCHOR_ALIAS = "Can't define both an anchor and an alias"
+	ERROR_BAD_ALIAS = "Invalid alias: %s"
+	ERROR_MANY_ALIAS = "More than one alias"
+	ERROR_ZERO_INDENT = "Can't use zero as an indentation width"
+	ERROR_UNSUPPORTED_VERSION = "This release of YAML.rb does not support YAML version %s"
+	ERROR_UNSUPPORTED_ENCODING = "Attempt to use unsupported encoding: %s"
+
+	#
+	# YAML Error classes
+	#
+
+	class Error < StandardError; end
+	class ParseError < Error; end
+    class TypeError < StandardError; end
+
+end
diff --git a/ext/syck/lib/syck/loader.rb b/ext/syck/lib/syck/loader.rb
new file mode 100644
index 0000000000..925c9ee4b2
--- /dev/null
+++ b/ext/syck/lib/syck/loader.rb
@@ -0,0 +1,14 @@
+#
+# YAML::Loader class
+# .. type handling ..
+#
+module Syck
+    class Loader
+        TRANSFER_DOMAINS = {
+            'yaml.org,2002' => {},
+            'ruby.yaml.org,2002' => {}
+        }
+        PRIVATE_TYPES = {}
+        IMPLICIT_TYPES = [ 'null', 'bool', 'time', 'int', 'float' ]
+    end
+end
diff --git a/ext/syck/lib/syck/rubytypes.rb b/ext/syck/lib/syck/rubytypes.rb
new file mode 100644
index 0000000000..b47045504d
--- /dev/null
+++ b/ext/syck/lib/syck/rubytypes.rb
@@ -0,0 +1,465 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+require 'date'
+
+class Class
+	def to_yaml( opts = {} )
+		raise TypeError, "can't dump anonymous class %s" % self.class
+	end
+end
+
+class Object
+    yaml_as "tag:ruby.yaml.org,2002:object"
+    def to_yaml_style; end
+    def to_yaml_properties; instance_variables.sort; end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( self, opts ) do |out|
+            out.map( taguri, to_yaml_style ) do |map|
+				to_yaml_properties.each do |m|
+                    map.add( m[1..-1], instance_variable_get( m ) )
+                end
+            end
+        end
+	end
+    alias :syck_to_yaml :to_yaml
+end
+
+class Hash
+    yaml_as "tag:ruby.yaml.org,2002:hash"
+    yaml_as "tag:yaml.org,2002:map"
+    def yaml_initialize( tag, val )
+        if Array === val
+            update Hash.[]( *val )		# Convert the map to a sequence
+        elsif Hash === val
+            update val
+        else
+            raise YAML::TypeError, "Invalid map explicitly tagged #{ tag }: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+            out.map( taguri, to_yaml_style ) do |map|
+                each do |k, v|
+                    map.add( k, v )
+                end
+            end
+        end
+	end
+end
+
+class Struct
+    yaml_as "tag:ruby.yaml.org,2002:struct"
+    def self.yaml_tag_class_name; self.name.gsub( "Struct::", "" ); end
+    def self.yaml_tag_read_class( name ); "Struct::#{ name }"; end
+    def self.yaml_new( klass, tag, val )
+        if Hash === val
+            struct_type = nil
+
+            #
+            # Use existing Struct if it exists
+            #
+            props = {}
+            val.delete_if { |k,v| props[k] = v if k =~ /^@/ }
+            begin
+                struct_name, struct_type = YAML.read_type_class( tag, Struct )
+            rescue NameError
+            end
+            if not struct_type
+                struct_def = [ tag.split( ':', 4 ).last ]
+                struct_type = Struct.new( *struct_def.concat( val.keys.collect { |k| k.intern } ) )
+            end
+
+            #
+            # Set the Struct properties
+            #
+            st = YAML::object_maker( struct_type, {} )
+            st.members.each do |m|
+                st.send( "#{m}=", val[m.to_s] )
+            end
+            props.each do |k,v|
+                st.instance_variable_set(k, v)
+            end
+            st
+        else
+            raise YAML::TypeError, "Invalid Ruby Struct: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+			#
+			# Basic struct is passed as a YAML map
+			#
+            out.map( taguri, to_yaml_style ) do |map|
+				self.members.each do |m|
+                    map.add( m.to_s, self[m.to_s] )
+                end
+				self.to_yaml_properties.each do |m|
+                    map.add( m, instance_variable_get( m ) )
+                end
+            end
+        end
+	end
+end
+
+class Array
+    yaml_as "tag:ruby.yaml.org,2002:array"
+    yaml_as "tag:yaml.org,2002:seq"
+    def yaml_initialize( tag, val ); concat( val.to_a ); end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+            out.seq( taguri, to_yaml_style ) do |seq|
+                each do |x|
+                    seq.add( x )
+                end
+            end
+        end
+	end
+end
+
+class Exception
+    yaml_as "tag:ruby.yaml.org,2002:exception"
+    def Exception.yaml_new( klass, tag, val )
+        o = YAML.object_maker( klass, { 'mesg' => val.delete( 'message' ) } )
+        val.each_pair do |k,v|
+            o.instance_variable_set("@#{k}", v)
+        end
+        o
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+            out.map( taguri, to_yaml_style ) do |map|
+                map.add( 'message', message )
+				to_yaml_properties.each do |m|
+                    map.add( m[1..-1], instance_variable_get( m ) )
+                end
+            end
+        end
+	end
+end
+
+class String
+    yaml_as "tag:ruby.yaml.org,2002:string"
+    yaml_as "tag:yaml.org,2002:binary"
+    yaml_as "tag:yaml.org,2002:str"
+    def is_complex_yaml?
+        to_yaml_style or not to_yaml_properties.empty? or self =~ /\n.+/
+    end
+    def is_binary_data?
+        self.count("\x00-\x7F", "^ -~\t\r\n").fdiv(self.size) > 0.3 || self.index("\x00") unless self.empty?
+    end
+    def String.yaml_new( klass, tag, val )
+        val = val.unpack("m")[0] if tag == "tag:yaml.org,2002:binary"
+        val = { 'str' => val } if String === val
+        if Hash === val
+            s = klass.allocate
+            # Thank you, NaHi
+            String.instance_method(:initialize).
+                  bind(s).
+                  call( val.delete( 'str' ) )
+            val.each { |k,v| s.instance_variable_set( k, v ) }
+            s
+        else
+            raise YAML::TypeError, "Invalid String: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( is_complex_yaml? ? self : nil, opts ) do |out|
+            if is_binary_data?
+                out.scalar( "tag:yaml.org,2002:binary", [self].pack("m"), :literal )
+            elsif to_yaml_properties.empty?
+                out.scalar( taguri, self, self =~ /^:/ ? :quote2 : to_yaml_style )
+            else
+                out.map( taguri, to_yaml_style ) do |map|
+                    map.add( 'str', "#{self}" )
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            end
+        end
+	end
+end
+
+class Symbol
+    yaml_as "tag:ruby.yaml.org,2002:symbol"
+    yaml_as "tag:ruby.yaml.org,2002:sym"
+    def Symbol.yaml_new( klass, tag, val )
+        if String === val
+            val = YAML::load( val ) if val =~ /\A(["']).*\1\z/
+            val.intern
+        else
+            raise YAML::TypeError, "Invalid Symbol: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( "tag:yaml.org,2002:str", self.inspect, :plain )
+        end
+	end
+end
+
+class Range
+    yaml_as "tag:ruby.yaml.org,2002:range"
+    def Range.yaml_new( klass, tag, val )
+        inr = %r'(\w+|[+-]?\d+(?:\.\d+)?(?:e[+-]\d+)?|"(?:[^\\"]|\\.)*")'
+        opts = {}
+        if String === val and val =~ /^#{inr}(\.{2,3})#{inr}$/o
+            r1, rdots, r2 = $1, $2, $3
+            opts = {
+                'begin' => YAML.load( "--- #{r1}" ),
+                'end' => YAML.load( "--- #{r2}" ),
+                'excl' => rdots.length == 3
+            }
+            val = {}
+        elsif Hash === val
+            opts['begin'] = val.delete('begin')
+            opts['end'] = val.delete('end')
+            opts['excl'] = val.delete('excl')
+        end
+        if Hash === opts
+            r = YAML::object_maker( klass, {} )
+            # Thank you, NaHi
+            Range.instance_method(:initialize).
+                  bind(r).
+                  call( opts['begin'], opts['end'], opts['excl'] )
+            val.each { |k,v| r.instance_variable_set( k, v ) }
+            r
+        else
+            raise YAML::TypeError, "Invalid Range: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+            # if self.begin.is_complex_yaml? or self.begin.respond_to? :to_str or
+            #   self.end.is_complex_yaml? or self.end.respond_to? :to_str or
+            #   not to_yaml_properties.empty?
+                out.map( taguri, to_yaml_style ) do |map|
+                    map.add( 'begin', self.begin )
+                    map.add( 'end', self.end )
+                    map.add( 'excl', self.exclude_end? )
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            # else
+            #     out.scalar( taguri ) do |sc|
+            #         sc.embed( self.begin )
+            #         sc.concat( self.exclude_end? ? "..." : ".." )
+            #         sc.embed( self.end )
+            #     end
+            # end
+        end
+	end
+end
+
+class Regexp
+    yaml_as "tag:ruby.yaml.org,2002:regexp"
+    def Regexp.yaml_new( klass, tag, val )
+        if String === val and val =~ /^\/(.*)\/([mixn]*)$/
+            val = { 'regexp' => $1, 'mods' => $2 }
+        end
+        if Hash === val
+            mods = nil
+            unless val['mods'].to_s.empty?
+                mods = 0x00
+                mods |= Regexp::EXTENDED if val['mods'].include?( 'x' )
+                mods |= Regexp::IGNORECASE if val['mods'].include?( 'i' )
+                mods |= Regexp::MULTILINE if val['mods'].include?( 'm' )
+                mods |= 32 if val['mods'].include?( 'n' )
+            end
+            val.delete( 'mods' )
+            r = YAML::object_maker( klass, {} )
+            Regexp.instance_method(:initialize).
+                  bind(r).
+                  call( val.delete( 'regexp' ), mods )
+            val.each { |k,v| r.instance_variable_set( k, v ) }
+            r
+        else
+            raise YAML::TypeError, "Invalid Regular expression: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( nil, opts ) do |out|
+            if to_yaml_properties.empty?
+                out.scalar( taguri, self.inspect, :plain )
+            else
+                out.map( taguri, to_yaml_style ) do |map|
+                    src = self.inspect
+                    if src =~ /\A\/(.*)\/([a-z]*)\Z/
+                        map.add( 'regexp', $1 )
+                        map.add( 'mods', $2 )
+                    else
+		                raise YAML::TypeError, "Invalid Regular expression: " + src
+                    end
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            end
+        end
+	end
+end
+
+class Time
+    yaml_as "tag:ruby.yaml.org,2002:time"
+    yaml_as "tag:yaml.org,2002:timestamp"
+    def Time.yaml_new( klass, tag, val )
+        if Hash === val
+            t = val.delete( 'at' )
+            val.each { |k,v| t.instance_variable_set( k, v ) }
+            t
+        else
+            raise YAML::TypeError, "Invalid Time: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+            tz = "Z"
+            # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
+            unless self.utc?
+                utc_same_instant = self.dup.utc
+                utc_same_writing = Time.utc(year,month,day,hour,min,sec,usec)
+                difference_to_utc = utc_same_writing - utc_same_instant
+                if (difference_to_utc < 0)
+                    difference_sign = '-'
+                    absolute_difference = -difference_to_utc
+                else
+                    difference_sign = '+'
+                    absolute_difference = difference_to_utc
+                end
+                difference_minutes = (absolute_difference/60).round
+                tz = "%s%02d:%02d" % [ difference_sign, difference_minutes / 60, difference_minutes % 60]
+            end
+            standard = self.strftime( "%Y-%m-%d %H:%M:%S" )
+            standard += ".%06d" % [usec] if usec.nonzero?
+            standard += " %s" % [tz]
+            if to_yaml_properties.empty?
+                out.scalar( taguri, standard, :plain )
+            else
+                out.map( taguri, to_yaml_style ) do |map|
+                    map.add( 'at', standard )
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            end
+        end
+	end
+end
+
+class Date
+    yaml_as "tag:yaml.org,2002:timestamp#ymd"
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+            out.scalar( "tag:yaml.org,2002:timestamp", self.to_s, :plain )
+        end
+	end
+end
+
+class Integer
+    yaml_as "tag:yaml.org,2002:int"
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( "tag:yaml.org,2002:int", self.to_s, :plain )
+        end
+	end
+end
+
+class Float
+    yaml_as "tag:yaml.org,2002:float"
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( nil, opts ) do |out|
+            str = self.to_s
+            if str == "Infinity"
+                str = ".Inf"
+            elsif str == "-Infinity"
+                str = "-.Inf"
+            elsif str == "NaN"
+                str = ".NaN"
+            end
+            out.scalar( "tag:yaml.org,2002:float", str, :plain )
+        end
+	end
+end
+
+class Rational
+	yaml_as "tag:ruby.yaml.org,2002:object:Rational"
+	def Rational.yaml_new( klass, tag, val )
+		if val.is_a? String
+			Rational( val )
+		else
+			Rational( val['numerator'], val['denominator'] )
+		end
+	end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+			out.map( taguri, nil ) do |map|
+				map.add( 'denominator', denominator )
+				map.add( 'numerator', numerator )
+			end
+		end
+	end
+end
+
+class Complex
+	yaml_as "tag:ruby.yaml.org,2002:object:Complex"
+	def Complex.yaml_new( klass, tag, val )
+		if val.is_a? String
+			Complex( val )
+		else
+			Complex( val['real'], val['image'] )
+		end
+	end
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( self, opts ) do |out|
+			out.map( taguri, nil ) do |map|
+				map.add( 'image', imaginary )
+				map.add( 'real', real )
+			end
+		end
+	end
+end
+
+class TrueClass
+    yaml_as "tag:yaml.org,2002:bool#yes"
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( taguri, "true", :plain )
+        end
+	end
+end
+
+class FalseClass
+    yaml_as "tag:yaml.org,2002:bool#no"
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( taguri, "false", :plain )
+        end
+	end
+end
+
+class NilClass
+    yaml_as "tag:yaml.org,2002:null"
+	def to_yaml( opts = {} )
+        return super unless YAML::ENGINE.syck?
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( taguri, "", :plain )
+        end
+	end
+end
+
diff --git a/ext/syck/lib/syck/stream.rb b/ext/syck/lib/syck/stream.rb
new file mode 100644
index 0000000000..cd77a033c6
--- /dev/null
+++ b/ext/syck/lib/syck/stream.rb
@@ -0,0 +1,41 @@
+module Syck
+
+	#
+	# YAML::Stream -- for emitting many documents
+	#
+	class Stream
+
+		attr_accessor :documents, :options
+
+		def initialize( opts = {} )
+			@options = opts
+			@documents = []
+		end
+
+        def []( i )
+            @documents[ i ]
+        end
+
+		def add( doc )
+			@documents << doc
+		end
+
+		def edit( doc_num, doc )
+                  warn "#{caller[0]}: edit is deprecated" if $VERBOSE
+			@documents[ doc_num ] = doc
+		end
+
+		def emit( io = nil )
+            # opts = @options.dup
+			# opts[:UseHeader] = true if @documents.length > 1
+            out = Syck.emitter
+            out.reset( io || io2 = StringIO.new )
+            @documents.each { |v|
+                v.to_yaml( out )
+            }
+            io || ( io2.rewind; io2.read )
+		end
+
+	end
+
+end
diff --git a/ext/syck/lib/syck/stringio.rb b/ext/syck/lib/syck/stringio.rb
new file mode 100644
index 0000000000..77a2b827e5
--- /dev/null
+++ b/ext/syck/lib/syck/stringio.rb
@@ -0,0 +1,85 @@
+warn "#{caller[0]}: yaml/stringio is deprecated" if $VERBOSE
+
+#
+# Limited StringIO if no core lib is available
+#
+begin
+require 'stringio'
+rescue LoadError
+    # StringIO based on code by MoonWolf
+    class StringIO
+        def initialize(string="")
+            @string=string
+            @pos=0
+            @eof=(string.size==0)
+        end
+        def pos
+            @pos
+        end
+        def eof
+            @eof
+        end
+        alias eof? eof
+        def readline(rs=$/)
+            if @eof
+                raise EOFError
+            else
+                if p = @string[@pos..-1]=~rs
+                    line = @string[@pos,p+1]
+                else
+                    line = @string[@pos..-1]
+                end
+                @pos+=line.size
+                @eof =true if @pos==@string.size
+                $_ = line
+            end
+        end
+        def rewind
+            seek(0,0)
+        end
+        def seek(offset,whence)
+            case whence
+            when 0
+                @pos=offset
+            when 1
+                @pos+=offset
+            when 2
+                @pos=@string.size+offset
+            end
+            @eof=(@pos>=@string.size)
+            0
+        end
+    end
+
+	#
+	# Class method for creating streams
+	#
+	def Syck.make_stream( io )
+        if String === io
+            io = StringIO.new( io )
+        elsif not IO === io
+            raise Syck::Error, "YAML stream must be an IO or String object."
+        end
+        if Syck::unicode
+            def io.readline
+                Syck.utf_to_internal( readline( @ln_sep ), @utf_encoding )
+            end
+            def io.check_unicode
+                @utf_encoding = Syck.sniff_encoding( read( 4 ) )
+                @ln_sep = Syck.enc_separator( @utf_encoding )
+                seek( -4, IO::SEEK_CUR )
+            end
+		    def io.utf_encoding
+		    	@utf_encoding
+		    end
+            io.check_unicode
+        else
+            def io.utf_encoding
+                :None
+            end
+        end
+        io
+	end
+
+end
+
diff --git a/ext/syck/lib/syck/syck.rb b/ext/syck/lib/syck/syck.rb
new file mode 100644
index 0000000000..10e5023f46
--- /dev/null
+++ b/ext/syck/lib/syck/syck.rb
@@ -0,0 +1,16 @@
+#
+# YAML::Syck module
+# .. glues syck and yaml.rb together ..
+#
+require 'syck/basenode'
+
+module Syck
+
+  #
+  # Mixin BaseNode functionality
+  #
+  class Node
+    include Syck::BaseNode
+  end
+
+end
diff --git a/ext/syck/lib/syck/tag.rb b/ext/syck/lib/syck/tag.rb
new file mode 100644
index 0000000000..9c6de57953
--- /dev/null
+++ b/ext/syck/lib/syck/tag.rb
@@ -0,0 +1,95 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+# $Id$
+#
+# = yaml/tag.rb: methods for associating a taguri to a class.
+#
+# Author:: why the lucky stiff
+#
+module Syck
+    # A dictionary of taguris which map to
+    # Ruby classes.
+    @@tagged_classes = {}
+
+    #
+    # Associates a taguri _tag_ with a Ruby class _cls_.  The taguri is used to give types
+    # to classes when loading YAML.  Taguris are of the form:
+    #
+    #   tag:authorityName,date:specific
+    #
+    # The +authorityName+ is a domain name or email address.  The +date+ is the date the type
+    # was issued in YYYY or YYYY-MM or YYYY-MM-DD format.  The +specific+ is a name for
+    # the type being added.
+    #
+    # For example, built-in YAML types have 'yaml.org' as the +authorityName+ and '2002' as the
+    # +date+.  The +specific+ is simply the name of the type:
+    #
+    #  tag:yaml.org,2002:int
+    #  tag:yaml.org,2002:float
+    #  tag:yaml.org,2002:timestamp
+    #
+    # The domain must be owned by you on the +date+ declared.  If you don't own any domains on the
+    # date you declare the type, you can simply use an e-mail address.
+    #
+    #  tag:why@ruby-lang.org,2004:notes/personal
+    #
+    def self.tag_class( tag, cls )
+        if @@tagged_classes.has_key? tag
+            warn "class #{ @@tagged_classes[tag] } held ownership of the #{ tag } tag"
+        end
+        @@tagged_classes[tag] = cls
+    end
+
+    # Returns the complete dictionary of taguris, paired with classes.  The key for
+    # the dictionary is the full taguri.  The value for each key is the class constant
+    # associated to that taguri.
+    #
+    #  YAML.tagged_classes["tag:yaml.org,2002:int"] => Integer
+    #
+    def self.tagged_classes
+        @@tagged_classes
+    end
+end
+
+class Module
+    # :stopdoc:
+
+    # Adds a taguri _tag_ to a class, used when dumping or loading the class
+    # in YAML.  See YAML::tag_class for detailed information on typing and
+    # taguris.
+    def syck_yaml_as( tag, sc = true )
+        verbose, $VERBOSE = $VERBOSE, nil
+        class_eval <<-"END", __FILE__, __LINE__+1
+            attr_writer :taguri
+            def taguri
+                if respond_to? :to_yaml_type
+                    Syck.tagurize( to_yaml_type[1..-1] )
+                else
+                    return @taguri if defined?(@taguri) and @taguri
+                    tag = #{ tag.dump }
+                    if self.class.yaml_tag_subclasses? and self.class != Syck.tagged_classes[tag]
+                        tag = "\#{ tag }:\#{ self.class.yaml_tag_class_name }"
+                    end
+                    tag
+                end
+            end
+            def self.yaml_tag_subclasses?; #{ sc ? 'true' : 'false' }; end
+        END
+        Syck.tag_class tag, self
+    ensure
+        $VERBOSE = verbose
+    end
+    remove_method :yaml_as rescue nil
+    alias :yaml_as :syck_yaml_as
+
+    # Transforms the subclass name into a name suitable for display
+    # in a subclassed tag.
+    def yaml_tag_class_name
+        self.name
+    end
+    # Transforms the subclass name found in the tag into a Ruby
+    # constant name.
+    def yaml_tag_read_class( name )
+        name
+    end
+    # :startdoc:
+end
diff --git a/ext/syck/lib/syck/types.rb b/ext/syck/lib/syck/types.rb
new file mode 100644
index 0000000000..5c129acba4
--- /dev/null
+++ b/ext/syck/lib/syck/types.rb
@@ -0,0 +1,192 @@
+# -*- mode: ruby; ruby-indent-level: 4 -*- vim: sw=4
+#
+# Classes required by the full core typeset
+#
+
+module Syck
+
+    #
+    # Default private type
+    #
+    class PrivateType
+        def self.tag_subclasses?; false; end
+        verbose, $VERBOSE = $VERBOSE, nil
+        def initialize( type, val )
+            @type_id = type; @value = val
+            @value.taguri = "x-private:#{ @type_id }"
+        end
+        def to_yaml( opts = {} )
+            @value.to_yaml( opts )
+        end
+    ensure
+        $VERBOSE = verbose
+    end
+
+    #
+    # Default domain type
+    #
+    class DomainType
+        def self.tag_subclasses?; false; end
+        verbose, $VERBOSE = $VERBOSE, nil
+        def initialize( domain, type, val )
+            @domain = domain; @type_id = type; @value = val
+            @value.taguri = "tag:#{ @domain }:#{ @type_id }"
+        end
+        def to_yaml( opts = {} )
+            @value.to_yaml( opts )
+        end
+    ensure
+        $VERBOSE = verbose
+    end
+
+    #
+    # Unresolved objects
+    #
+    class Object
+        def self.tag_subclasses?; false; end
+        def to_yaml( opts = {} )
+            Syck.quick_emit( self, opts ) do |out|
+                out.map( "tag:ruby.yaml.org,2002:object:#{ @class }", to_yaml_style ) do |map|
+                    @ivars.each do |k,v|
+                        map.add( k, v )
+                    end
+                end
+            end
+        end
+    end
+
+    #
+    # YAML Hash class to support comments and defaults
+    #
+    class SpecialHash < ::Hash
+        attr_accessor :default
+        def inspect
+            self.default.to_s
+        end
+        def to_s
+            self.default.to_s
+        end
+        def update( h )
+            if Syck::SpecialHash === h
+                @default = h.default if h.default
+            end
+            super( h )
+        end
+        def to_yaml( opts = {} )
+            opts[:DefaultKey] = self.default
+            super( opts )
+        end
+    end
+
+    #
+    # Builtin collection: !omap
+    #
+    class Omap < ::Array
+        yaml_as "tag:yaml.org,2002:omap"
+        def yaml_initialize( tag, val )
+            if Array === val
+                val.each do |v|
+                    if Hash === v
+                        concat( v.to_a )		# Convert the map to a sequence
+                    else
+                        raise Syck::Error, "Invalid !omap entry: " + val.inspect
+                    end
+                end
+            else
+                raise Syck::Error, "Invalid !omap: " + val.inspect
+            end
+            self
+        end
+        def self.[]( *vals )
+            o = Omap.new
+            0.step( vals.length - 1, 2 ) do |i|
+                o[vals[i]] = vals[i+1]
+            end
+            o
+        end
+        def []( k )
+            self.assoc( k ).to_a[1]
+        end
+        def []=( k, *rest )
+            val, set = rest.reverse
+            if ( tmp = self.assoc( k ) ) and not set
+                tmp[1] = val
+            else
+                self << [ k, val ]
+            end
+            val
+        end
+        def has_key?( k )
+            self.assoc( k ) ? true : false
+        end
+        def is_complex_yaml?
+            true
+        end
+        def to_yaml( opts = {} )
+            Syck.quick_emit( self, opts ) do |out|
+                out.seq( taguri, to_yaml_style ) do |seq|
+                    self.each do |v|
+                        seq.add( Hash[ *v ] )
+                    end
+                end
+            end
+        end
+    end
+
+    #
+    # Builtin collection: !pairs
+    #
+    class Pairs < ::Array
+        yaml_as "tag:yaml.org,2002:pairs"
+        def yaml_initialize( tag, val )
+            if Array === val
+                val.each do |v|
+                    if Hash === v
+                        concat( v.to_a )		# Convert the map to a sequence
+                    else
+                        raise Syck::Error, "Invalid !pairs entry: " + val.inspect
+                    end
+                end
+            else
+                raise Syck::Error, "Invalid !pairs: " + val.inspect
+            end
+            self
+        end
+        def self.[]( *vals )
+            p = Pairs.new
+            0.step( vals.length - 1, 2 ) { |i|
+                p[vals[i]] = vals[i+1]
+            }
+            p
+        end
+        def []( k )
+            self.assoc( k ).to_a
+        end
+        def []=( k, val )
+            self << [ k, val ]
+            val
+        end
+        def has_key?( k )
+            self.assoc( k ) ? true : false
+        end
+        def is_complex_yaml?
+            true
+        end
+        def to_yaml( opts = {} )
+            Syck.quick_emit( self, opts ) do |out|
+                out.seq( taguri, to_yaml_style ) do |seq|
+                    self.each do |v|
+                        seq.add( Hash[ *v ] )
+                    end
+                end
+            end
+        end
+    end
+
+    #
+    # Builtin collection: !set
+    #
+    class Set < ::Hash
+        yaml_as "tag:yaml.org,2002:set"
+    end
+end
diff --git a/ext/syck/lib/syck/yamlnode.rb b/ext/syck/lib/syck/yamlnode.rb
new file mode 100644
index 0000000000..2fa57b1f97
--- /dev/null
+++ b/ext/syck/lib/syck/yamlnode.rb
@@ -0,0 +1,54 @@
+#
+# YAML::YamlNode class
+#
+require 'syck/basenode'
+
+module Syck
+
+    #
+    # YAML Generic Model container
+    #
+    class YamlNode
+        include BaseNode
+        attr_accessor :kind, :type_id, :value, :anchor
+        def initialize(t, v)
+            @type_id = t
+            if Hash === v
+                @kind = 'map'
+                @value = {}
+                v.each {|key,val|
+                    @value[key.transform] = [key, val]
+                }
+            elsif Array === v
+                @kind = 'seq'
+                @value = v
+            elsif String === v
+                @kind = 'scalar'
+                @value = v
+            end
+        end
+
+        #
+        # Transform this node fully into a native type
+        #
+        def transform
+            t = nil
+            if @value.is_a? Hash
+                t = {}
+                @value.each { |k,v|
+                    t[ k ] = v[1].transform
+                }
+            elsif @value.is_a? Array
+                t = []
+                @value.each { |v|
+                    t.push v.transform
+                }
+            else
+                t = @value
+            end
+            Syck.transfer_method( @type_id, t )
+        end
+
+    end
+
+end
diff --git a/ext/syck/lib/syck/ypath.rb b/ext/syck/lib/syck/ypath.rb
new file mode 100644
index 0000000000..024dcb7f4e
--- /dev/null
+++ b/ext/syck/lib/syck/ypath.rb
@@ -0,0 +1,54 @@
+#
+# YAML::YPath
+#
+
+warn "#{caller[0]}: YAML::YPath is deprecated" if $VERBOSE
+
+module Syck
+
+    class YPath
+        attr_accessor :segments, :predicates, :flags
+        def initialize( str )
+            @segments = []
+            @predicates = []
+            @flags = nil
+            while str =~ /^\/?(\/|[^\/\[]+)(?:\[([^\]]+)\])?/
+                @segments.push $1
+                @predicates.push $2
+                str = $'
+            end
+            unless str.to_s.empty?
+                @segments += str.split( "/" )
+            end
+            if @segments.length == 0
+                @segments.push "."
+            end
+        end
+        def self.each_path( str )
+            #
+            # Find choices
+            #
+            paths = []
+            str = "(#{ str })"
+            while str.sub!( /\(([^()]+)\)/, "\n#{ paths.length }\n" )
+                paths.push $1.split( '|' )
+            end
+
+            #
+            # Construct all possible paths
+            #
+            all = [ str ]
+            ( paths.length - 1 ).downto( 0 ) do |i|
+                all = all.collect do |a|
+                    paths[i].collect do |p|
+                        a.gsub( /\n#{ i }\n/, p )
+                    end
+                end.flatten.uniq
+            end
+            all.collect do |path|
+                yield YPath.new( path )
+            end
+        end
+    end
+
+end
diff --git a/ext/syck/lib/yaml/syck.rb b/ext/syck/lib/yaml/syck.rb
new file mode 100644
index 0000000000..5b5d1c494e
--- /dev/null
+++ b/ext/syck/lib/yaml/syck.rb
@@ -0,0 +1,14 @@
+# $Id$
+#
+# = yaml/syck.rb:
+#
+
+require 'stringio'
+require 'syck.so'
+require 'syck/error'
+require 'syck/syck'
+require 'syck/tag'
+require 'syck/stream'
+require 'syck/constants'
+require 'syck/rubytypes'
+require 'syck/types'
diff --git a/ext/syck/node.c b/ext/syck/node.c
index 28fc78c077..35c1f45150 100644
--- a/ext/syck/node.c
+++ b/ext/syck/node.c
@@ -2,12 +2,11 @@
  * node.c
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "syck.h"
 
 /*
@@ -46,7 +45,7 @@ syck_free_node( SyckNode *n )
 }
 
 SyckNode *
-syck_alloc_map()
+syck_alloc_map(void)
 {
     SyckNode *n;
     struct SyckMap *m;
@@ -60,12 +59,12 @@ syck_alloc_map()
 
     n = syck_alloc_node( syck_map_kind );
     n->data.pairs = m;
-    
+
     return n;
 }
 
 SyckNode *
-syck_alloc_seq()
+syck_alloc_seq(void)
 {
     SyckNode *n;
     struct SyckSeq *s;
@@ -83,7 +82,7 @@ syck_alloc_seq()
 }
 
 SyckNode *
-syck_alloc_str()
+syck_alloc_str(void)
 {
     SyckNode *n;
     struct SyckStr *s;
@@ -95,18 +94,18 @@ syck_alloc_str()
 
     n = syck_alloc_node( syck_str_kind );
     n->data.str = s;
-    
+
     return n;
 }
 
 SyckNode *
-syck_new_str( char *str, enum scalar_style style )
+syck_new_str( const char *str, enum scalar_style style )
 {
     return syck_new_str2( str, strlen( str ), style );
 }
 
 SyckNode *
-syck_new_str2( char *str, long len, enum scalar_style style )
+syck_new_str2( const char *str, long len, enum scalar_style style )
 {
     SyckNode *n;
 
@@ -129,7 +128,7 @@ syck_replace_str( SyckNode *n, char *str, enum scalar_style style )
 void
 syck_replace_str2( SyckNode *n, char *str, long len, enum scalar_style style )
 {
-    if ( n->data.str != NULL ) 
+    if ( n->data.str->ptr != NULL )
     {
         S_FREE( n->data.str->ptr );
         n->data.str->ptr = NULL;
@@ -202,7 +201,7 @@ syck_map_add( SyckNode *map, SYMID key, SYMID value )
 
     ASSERT( map != NULL );
     ASSERT( map->data.pairs != NULL );
-    
+
     m = map->data.pairs;
     idx = m->idx;
     m->idx += 1;
@@ -227,7 +226,7 @@ syck_map_update( SyckNode *map1, SyckNode *map2 )
     m1 = map1->data.pairs;
     m2 = map2->data.pairs;
     if ( m2->idx < 1 ) return;
-        
+
     new_idx = m1->idx;
     new_idx += m2->idx;
     new_capa = m1->capa;
@@ -243,8 +242,8 @@ syck_map_update( SyckNode *map1, SyckNode *map2 )
     }
     for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
     {
-        m1->keys[m1->idx] = m2->keys[new_idx]; 
-        m1->values[m1->idx] = m2->values[new_idx]; 
+        m1->keys[m1->idx] = m2->keys[new_idx];
+        m1->values[m1->idx] = m2->values[new_idx];
     }
 }
 
@@ -325,7 +324,7 @@ syck_seq_add( SyckNode *arr, SYMID value )
 
     ASSERT( arr != NULL );
     ASSERT( arr->data.list != NULL );
-    
+
     s = arr->data.list;
     idx = s->idx;
     s->idx += 1;
@@ -375,7 +374,7 @@ syck_free_members( SyckNode *n )
     switch ( n->kind  )
     {
         case syck_str_kind:
-            if ( n->data.str != NULL ) 
+            if ( n->data.str != NULL )
             {
                 S_FREE( n->data.str->ptr );
                 n->data.str->ptr = NULL;
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index 6de3546308..1be472e040 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -3,12 +3,12 @@
  * rubyext.c
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003-2005 why the lucky stiff
  */
 
-#include "ruby.h"
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
 #include "syck.h"
 #include <sys/types.h>
 #include <time.h>
@@ -49,21 +49,21 @@ typedef struct {
 /*
  * symbols and constants
  */
-static ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_cmp, s_transfer, s_update, s_dup, s_haskey, s_match, s_keys, s_unpack, s_tr_bang, s_default_set, s_tag_read_class, s_tag_subclasses, s_resolver, s_push, s_emitter, s_level, s_detect_implicit, s_node_import, s_out, s_input, s_intern, s_transform, s_yaml_new, s_yaml_initialize, s_node_export, s_to_yaml, s_write, s_set_resolver;
-static ID s_tags, s_domain, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set;
+static ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_cmp, s_transfer, s_update, s_dup, s_haskey, s_match, s_keys, s_unpack, s_tr_bang, s_default_set, s_tag_read_class, s_tag_subclasses, s_resolver, s_push, s_emitter, s_level, s_detect_implicit, s_node_import, s_out, s_input, s_intern, s_transform, s_yaml_new, s_yaml_initialize, s_node_export, s_to_yaml, s_write, s_set_resolver, s_each;
+static ID s_tags, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set, s_parse;
 static VALUE sym_model, sym_generic, sym_input, sym_bytecode;
 static VALUE sym_scalar, sym_seq, sym_map;
 static VALUE sym_1quote, sym_2quote, sym_fold, sym_literal, sym_plain, sym_inline;
-static VALUE cDate, cNode, cMap, cSeq, cScalar, cOut, cParser, cResolver, cPrivateType, cDomainType, cYObject, cBadAlias, cDefaultKey, cMergeKey, cEmitter;
+static VALUE cDate, cNode, cMap, cSeq, cScalar, cOut, cParser, cResolver, cPrivateType, cDomainType, cYObject, cBadAlias, cDefaultKey, cMergeKey, cEmitter, cDateTime;
 static VALUE oDefaultResolver, oGenericResolver;
 
 /*
  * my private collection of numerical oddities.
  */
-static double S_zero()    { return 0.0; }
-static double S_one() { return 1.0; }
-static double S_inf() { return S_one() / S_zero(); }
-static double S_nan() { return S_zero() / S_zero(); }
+static double S_zero(void)    { return 0.0; }
+static double S_one(void) { return 1.0; }
+static double S_inf(void) { return S_one() / S_zero(); }
+static double S_nan(void) { return S_zero() / S_zero(); }
 
 static VALUE syck_node_transform( VALUE );
 
@@ -71,7 +71,7 @@ static VALUE syck_node_transform( VALUE );
  * handler prototypes
  */
 SYMID rb_syck_load_handler _((SyckParser *, SyckNode *));
-void rb_syck_err_handler _((SyckParser *, char *));
+void rb_syck_err_handler _((SyckParser *, const char *));
 SyckNode * rb_syck_bad_anchor_handler _((SyckParser *, char *));
 void rb_syck_output_handler _((SyckEmitter *, char *, long));
 void rb_syck_emitter_handler _((SyckEmitter *, st_data_t));
@@ -97,14 +97,14 @@ struct emitter_xtra {
  * Convert YAML to bytecode
  */
 VALUE
-rb_syck_compile(self, port)
-    VALUE self, port;
+rb_syck_compile(VALUE self, VALUE port)
 {
     SYMID oid;
     int taint;
     char *ret;
     VALUE bc;
-    bytestring_t *sav; 
+    bytestring_t *sav = NULL;
+    void *data = NULL;
 
     SyckParser *parser = syck_new_parser();
     taint = syck_parser_assign_io(parser, &port);
@@ -113,7 +113,10 @@ rb_syck_compile(self, port)
     syck_parser_implicit_typing( parser, 0 );
     syck_parser_taguri_expansion( parser, 0 );
     oid = syck_parse( parser );
-    syck_lookup_sym( parser, oid, (char **)&sav );
+    if (!syck_lookup_sym( parser, oid, &data )) {
+	rb_raise(rb_eSyntaxError, "root node <%lx> not found", oid);
+    }
+    sav = data;
 
     ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
     ret[0] = '\0';
@@ -150,8 +153,8 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
         if (!NIL_P(str2))
         {
             StringValue(str2);
-            len = RSTRING(str2)->len;
-            memcpy( buf + skip, RSTRING(str2)->ptr, len );
+            len = RSTRING_LEN(str2);
+            memcpy( buf + skip, RSTRING_PTR(str2), len );
         }
     }
     len += skip;
@@ -164,16 +167,14 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
  * (returns tainted? boolean)
  */
 int
-syck_parser_assign_io(parser, pport)
-    SyckParser *parser;
-    VALUE *pport;
+syck_parser_assign_io(SyckParser *parser, VALUE *pport)
 {
     int taint = Qtrue;
     VALUE tmp, port = *pport;
     if (!NIL_P(tmp = rb_check_string_type(port))) {
         taint = OBJ_TAINTED(port); /* original taintedness */
         port = tmp;
-        syck_parser_str( parser, RSTRING(port)->ptr, RSTRING(port)->len, NULL );
+        syck_parser_str( parser, RSTRING_PTR(port), RSTRING_LEN(port), NULL );
     }
     else if (rb_respond_to(port, s_read)) {
         if (rb_respond_to(port, s_binmode)) {
@@ -192,11 +193,10 @@ syck_parser_assign_io(parser, pport)
  * Get value in hash by key, forcing an empty hash if nil.
  */
 VALUE
-syck_get_hash_aref(hsh, key)
-    VALUE hsh, key;
+syck_get_hash_aref(VALUE hsh, VALUE key)
 {
    VALUE val = rb_hash_aref( hsh, key );
-   if ( NIL_P( val ) ) 
+   if ( NIL_P( val ) )
    {
        val = rb_hash_new();
        rb_hash_aset(hsh, key, val);
@@ -207,12 +207,17 @@ syck_get_hash_aref(hsh, key)
 /*
  * creating timestamps
  */
-SYMID
-rb_syck_mktime(str, len)
+struct mktime_arg {
     char *str;
     long len;
+};
+
+SYMID
+mktime_do(struct mktime_arg *arg)
 {
     VALUE time;
+    char *str = arg->str;
+    long len = arg->len;
     char *ptr = str;
     VALUE year = INT2FIX(0);
     VALUE mon = INT2FIX(0);
@@ -220,7 +225,7 @@ rb_syck_mktime(str, len)
     VALUE hour = INT2FIX(0);
     VALUE min = INT2FIX(0);
     VALUE sec = INT2FIX(0);
-    long usec;
+    double usec;
 
     /* Year*/
     if ( ptr[0] != '\0' && len > 0 ) {
@@ -266,15 +271,20 @@ rb_syck_mktime(str, len)
     ptr += 2;
     if ( len > ptr - str && *ptr == '.' )
     {
-        char padded[] = "000000";
-        char *end = ptr + 1;
+        char padded[] = "000000.000000";
+        const int padding = 6;
+        const int offset = padding + 1;
+        const char *end = ptr + 1;
+        const char *begin = end;
+        int length;
         while ( isdigit( *end ) ) end++;
-        MEMCPY(padded, ptr + 1, char, end - (ptr + 1));
-        usec = strtol(padded, NULL, 10);
+        length = (int)(end - begin) <= padding ? (int)(end - begin) : padding;
+        MEMCPY(padded, begin, char, length);
+        usec = strtod(padded, NULL);
     }
     else
     {
-        usec = 0;
+        usec = 0.0;
     }
 
     /* Time Zone*/
@@ -282,7 +292,7 @@ rb_syck_mktime(str, len)
     if ( len > ptr - str && ( *ptr == '-' || *ptr == '+' ) )
     {
         time_t tz_offset = strtol(ptr, NULL, 10) * 3600;
-        time_t tmp;
+        VALUE tmp;
 
         while ( *ptr != ':' && *ptr != '\0' ) ptr++;
         if ( *ptr == ':' )
@@ -300,14 +310,38 @@ rb_syck_mktime(str, len)
 
         /* Make TZ time*/
         time = rb_funcall(rb_cTime, s_utc, 6, year, mon, day, hour, min, sec);
-        tmp = NUM2LONG(rb_funcall(time, s_to_i, 0)) - tz_offset;
-        return rb_funcall(rb_cTime, s_at, 2, LONG2NUM(tmp), LONG2NUM(usec));
+        tmp = rb_funcall(time, s_to_i, 0);
+        tmp = rb_funcall(tmp, '-', 1, LONG2FIX(tz_offset));
+        return rb_funcall(rb_cTime, s_at, 2, tmp, rb_float_new(usec));
     }
     else
     {
         /* Make UTC time*/
-        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, LONG2NUM(usec));
+        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, rb_float_new(usec));
+    }
+}
+
+SYMID
+mktime_r(struct mktime_arg *arg)
+{
+    if (!cDateTime) {
+        /*
+         * Load Date module
+         */
+        rb_require("date");
+        cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime"));
     }
+    return rb_funcall(cDateTime, s_parse, 1, rb_str_new(arg->str, arg->len));
+}
+
+SYMID
+rb_syck_mktime(char *str, long len)
+{
+    struct mktime_arg a;
+
+    a.str = str;
+    a.len = len;
+    return rb_rescue2(mktime_do, (VALUE)&a, mktime_r, (VALUE)&a, rb_eArgError, NULL);
 }
 
 /*
@@ -315,8 +349,7 @@ rb_syck_mktime(str, len)
  * (see http://www.yaml.org/type/merge/)
  */
 VALUE
-syck_merge_i( entry, hsh )
-    VALUE entry, hsh;
+syck_merge_i(VALUE entry, VALUE hsh )
 {
     VALUE tmp;
     if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
@@ -331,9 +364,7 @@ syck_merge_i( entry, hsh )
  * default handler for ruby.yaml.org types
  */
 int
-yaml_org_handler( n, ref )
-    SyckNode *n;
-    VALUE *ref;
+yaml_org_handler( SyckNode *n, VALUE *ref )
 {
     char *type_id = n->type_id;
     int transferred = 0;
@@ -507,16 +538,17 @@ yaml_org_handler( n, ref )
                 obj = rb_funcall( cDefaultKey, s_new, 0 );
             }
             else if ( n->data.str->style == scalar_plain &&
-                      n->data.str->len > 1 && 
+                      n->data.str->len > 1 &&
                       strncmp( n->data.str->ptr, ":", 1 ) == 0 )
             {
-                obj = rb_funcall( oDefaultResolver, s_transfer, 2, 
-                                  rb_str_new2( "tag:ruby.yaml.org,2002:sym" ), 
+                obj = rb_funcall( oDefaultResolver, s_transfer, 2,
+                                  rb_str_new2( "tag:ruby.yaml.org,2002:sym" ),
                                   rb_str_new( n->data.str->ptr + 1, n->data.str->len - 1 ) );
             }
             else if ( strcmp( type_id, "str" ) == 0 )
             {
                 obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+                rb_enc_associate(obj, rb_utf8_encoding());
             }
             else
             {
@@ -571,7 +603,7 @@ yaml_org_handler( n, ref )
                             VALUE dup = rb_funcall( tmph, s_dup, 0 );
                             tmp = rb_ary_reverse( tmp );
                             rb_ary_push( tmp, obj );
-                            rb_iterate( rb_each, tmp, syck_merge_i, dup );
+                            rb_block_call( tmp, s_each, 0, 0, syck_merge_i, dup );
                             obj = dup;
                             skip_aset = 1;
                         }
@@ -602,9 +634,7 @@ static void syck_node_mark( SyckNode *n );
  * - Converts data into native Ruby types
  */
 SYMID
-rb_syck_load_handler(p, n)
-    SyckParser *p;
-    SyckNode *n;
+rb_syck_load_handler(SyckParser *p, SyckNode *n)
 {
     VALUE obj = Qnil;
     struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
@@ -615,7 +645,7 @@ rb_syck_load_handler(p, n)
     }
 
     /*
-     * Create node, 
+     * Create node,
      */
     obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, NULL, NULL, n ) );
 
@@ -632,7 +662,7 @@ rb_syck_load_handler(p, n)
     if ( bonus->taint)      OBJ_TAINT( obj );
     if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, obj);
 
-    rb_hash_aset(bonus->data, INT2FIX(RHASH(bonus->data)->tbl->num_entries), obj);
+    rb_hash_aset(bonus->data, INT2FIX(RHASH_SIZE(bonus->data)), obj);
     return obj;
 }
 
@@ -640,9 +670,7 @@ rb_syck_load_handler(p, n)
  * friendly errors.
  */
 void
-rb_syck_err_handler(p, msg)
-    SyckParser *p;
-    char *msg;
+rb_syck_err_handler(SyckParser *p, const char *msg)
 {
     char *endl = p->cursor;
 
@@ -650,20 +678,18 @@ rb_syck_err_handler(p, msg)
         endl++;
 
     endl[0] = '\0';
-    rb_raise(rb_eArgError, "%s on line %d, col %d: `%s'",
+    rb_raise(rb_eArgError, "%s on line %d, col %"PRIdPTRDIFF": `%s'",
            msg,
            p->linect,
-           p->cursor - p->lineptr, 
-           p->lineptr); 
+           p->cursor - p->lineptr,
+           p->lineptr);
 }
 
 /*
  * provide bad anchor object to the parser.
  */
 SyckNode *
-rb_syck_bad_anchor_handler(p, a)
-    SyckParser *p;
-    char *a;
+rb_syck_bad_anchor_handler(SyckParser *p, char *a)
 {
     VALUE anchor_name = rb_str_new2( a );
     SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), anchor_name );
@@ -675,8 +701,7 @@ rb_syck_bad_anchor_handler(p, a)
  * data loaded based on the model requested.
  */
 void
-syck_set_model( p, input, model )
-    VALUE p, input, model;
+syck_set_model(VALUE p, VALUE input, VALUE model)
 {
     SyckParser *parser;
     Data_Get_Struct(p, SyckParser, parser);
@@ -691,7 +716,7 @@ syck_set_model( p, input, model )
 
     if ( NIL_P( input ) )
     {
-        input = rb_ivar_get( p, s_input ); 
+        input = rb_ivar_get( p, s_input );
     }
     if ( input == sym_bytecode )
     {
@@ -716,8 +741,7 @@ syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
  * mark parser nodes
  */
 static void
-syck_mark_parser(parser)
-    SyckParser *parser;
+syck_mark_parser(SyckParser *parser)
 {
     struct parser_xtra *bonus = (struct parser_xtra *)parser->bonus;
     rb_gc_mark_maybe(parser->root);
@@ -740,8 +764,7 @@ syck_mark_parser(parser)
  * Free the parser and any bonus attachment.
  */
 void
-rb_syck_free_parser(p)
-    SyckParser *p;
+rb_syck_free_parser(SyckParser *p)
 {
     S_FREE( p->bonus );
     syck_free_parser(p);
@@ -751,9 +774,8 @@ rb_syck_free_parser(p)
  * YAML::Syck::Parser.allocate
  */
 VALUE syck_parser_s_alloc _((VALUE));
-VALUE 
-syck_parser_s_alloc(class)
-    VALUE class;
+VALUE
+syck_parser_s_alloc(VALUE class)
 {
     VALUE pobj;
     SyckParser *parser = syck_new_parser();
@@ -772,10 +794,7 @@ syck_parser_s_alloc(class)
  * YAML::Syck::Parser.initialize( resolver, options )
  */
 static VALUE
-syck_parser_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_parser_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE options;
     if (rb_scan_args(argc, argv, "01", &options) == 0)
@@ -795,8 +814,7 @@ syck_parser_initialize(argc, argv, self)
  * YAML::Syck::Parser.bufsize = Integer
  */
 static VALUE
-syck_parser_bufsize_set( self, size )
-    VALUE self, size;
+syck_parser_bufsize_set(VALUE self, VALUE size)
 {
     SyckParser *parser;
 
@@ -812,8 +830,7 @@ syck_parser_bufsize_set( self, size )
  * YAML::Syck::Parser.bufsize => Integer
  */
 static VALUE
-syck_parser_bufsize_get( self )
-    VALUE self;
+syck_parser_bufsize_get(VALUE self)
 {
     SyckParser *parser;
 
@@ -825,10 +842,7 @@ syck_parser_bufsize_get( self )
  * YAML::Syck::Parser.load( IO or String )
  */
 VALUE
-syck_parser_load(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_parser_load(int argc, VALUE *argv, VALUE self)
 {
     VALUE port, proc, model, input;
     SyckParser *parser;
@@ -855,10 +869,7 @@ syck_parser_load(argc, argv, self)
  * YAML::Syck::Parser.load_documents( IO or String ) { |doc| }
  */
 VALUE
-syck_parser_load_documents(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_parser_load_documents(int argc, VALUE *argv, VALUE self)
 {
     VALUE port, proc, v, input, model;
     SyckParser *parser;
@@ -870,7 +881,7 @@ syck_parser_load_documents(argc, argv, self)
     model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
     Data_Get_Struct(self, SyckParser, parser);
     syck_set_model( self, input, model );
-    
+
     bonus = (struct parser_xtra *)parser->bonus;
     bonus->taint = syck_parser_assign_io(parser, &port);
     bonus->resolver = rb_attr_get( self, s_resolver );
@@ -899,8 +910,7 @@ syck_parser_load_documents(argc, argv, self)
  * YAML::Syck::Parser#set_resolver
  */
 VALUE
-syck_parser_set_resolver( self, resolver )
-    VALUE self, resolver;
+syck_parser_set_resolver(VALUE self, VALUE resolver)
 {
     rb_ivar_set( self, s_resolver, resolver );
     return self;
@@ -910,10 +920,8 @@ syck_parser_set_resolver( self, resolver )
  * YAML::Syck::Resolver.initialize
  */
 static VALUE
-syck_resolver_initialize( self )
-    VALUE self;
+syck_resolver_initialize(VALUE self)
 {
-    VALUE tags = rb_hash_new();
     rb_ivar_set(self, s_tags, rb_hash_new());
     return self;
 }
@@ -922,8 +930,7 @@ syck_resolver_initialize( self )
  * YAML::Syck::Resolver#add_type
  */
 VALUE
-syck_resolver_add_type( self, taguri, cls )
-    VALUE self, taguri, cls;
+syck_resolver_add_type(VALUE self, VALUE taguri, VALUE cls)
 {
     VALUE tags = rb_attr_get(self, s_tags);
     rb_hash_aset( tags, taguri, cls );
@@ -934,21 +941,18 @@ syck_resolver_add_type( self, taguri, cls )
  * YAML::Syck::Resolver#use_types_at
  */
 VALUE
-syck_resolver_use_types_at( self, hsh )
-    VALUE self, hsh;
+syck_resolver_use_types_at(VALUE self, VALUE hsh)
 {
     rb_ivar_set( self, s_tags, hsh );
     return Qnil;
 }
 
 /*
- * YAML::Syck::Resolver#detect_implicit 
+ * YAML::Syck::Resolver#detect_implicit
  */
 VALUE
-syck_resolver_detect_implicit( self, val )
-    VALUE self, val;
+syck_resolver_detect_implicit(VALUE self, VALUE val)
 {
-    char *type_id;
     return rb_str_new2( "" );
 }
 
@@ -956,11 +960,10 @@ syck_resolver_detect_implicit( self, val )
  * YAML::Syck::Resolver#node_import
  */
 VALUE
-syck_resolver_node_import( self, node )
-    VALUE self, node;
+syck_resolver_node_import(VALUE self, VALUE node)
 {
     SyckNode *n;
-    VALUE obj;
+    VALUE obj = Qnil;
     int i = 0;
     Data_Get_Struct(node, SyckNode, n);
 
@@ -1006,7 +1009,7 @@ syck_resolver_node_import( self, node )
                             VALUE dup = rb_funcall( end, s_dup, 0 );
                             v = rb_ary_reverse( v );
                             rb_ary_push( v, obj );
-                            rb_iterate( rb_each, v, syck_merge_i, dup );
+                            rb_block_call( v, s_each, 0, 0, syck_merge_i, dup );
                             obj = dup;
                             skip_aset = 1;
                         }
@@ -1037,16 +1040,15 @@ syck_resolver_node_import( self, node )
  * Set instance variables
  */
 VALUE
-syck_set_ivars( vars, obj )
-        VALUE vars, obj;
+syck_set_ivars(VALUE vars, VALUE obj)
 {
     VALUE ivname = rb_ary_entry( vars, 0 );
     char *ivn;
     StringValue( ivname );
-    ivn = S_ALLOCA_N( char, RSTRING(ivname)->len + 2 );
+    ivn = S_ALLOCA_N( char, RSTRING_LEN(ivname) + 2 );
     ivn[0] = '@';
     ivn[1] = '\0';
-    strncat( ivn, RSTRING(ivname)->ptr, RSTRING(ivname)->len );
+    strncat( ivn, RSTRING_PTR(ivname), RSTRING_LEN(ivname) );
     rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) );
     return Qnil;
 }
@@ -1055,13 +1057,12 @@ syck_set_ivars( vars, obj )
  * YAML::Syck::Resolver#const_find
  */
 VALUE
-syck_const_find( const_name )
-    VALUE const_name;
+syck_const_find(VALUE const_name)
 {
     VALUE tclass = rb_cObject;
     VALUE tparts = rb_str_split( const_name, "::" );
     int i = 0;
-    for ( i = 0; i < RARRAY(tparts)->len; i++ ) {
+    for ( i = 0; i < RARRAY_LEN(tparts); i++ ) {
         VALUE tpart = rb_to_id( rb_ary_entry( tparts, i ) );
         if ( !rb_const_defined( tclass, tpart ) ) return Qnil;
         tclass = rb_const_get( tclass, tpart );
@@ -1073,15 +1074,14 @@ syck_const_find( const_name )
  * YAML::Syck::Resolver#transfer
  */
 VALUE
-syck_resolver_transfer( self, type, val )
-    VALUE self, type, val;
+syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
 {
-    if (NIL_P(type) || RSTRING(StringValue(type))->len == 0) 
+    if (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0)
     {
         type = rb_funcall( self, s_detect_implicit, 1, val );
     }
 
-    if ( ! (NIL_P(type) || RSTRING(StringValue(type))->len == 0) )
+    if ( ! (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0) )
     {
         VALUE str_xprivate = rb_str_new2( "x-private" );
         VALUE colon = rb_str_new2( ":" );
@@ -1098,7 +1098,7 @@ syck_resolver_transfer( self, type, val )
             VALUE subclass_parts = rb_ary_new();
             VALUE parts = rb_str_split( type, ":" );
 
-            while ( RARRAY(parts)->len > 1 )
+            while ( RARRAY_LEN(parts) > 1 )
             {
                 VALUE partial;
                 rb_ary_unshift( subclass_parts, rb_ary_pop( parts ) );
@@ -1116,7 +1116,7 @@ syck_resolver_transfer( self, type, val )
                 if ( ! NIL_P( target_class ) )
                 {
                     subclass = target_class;
-                    if ( RARRAY(subclass_parts)->len > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
+                    if ( RARRAY_LEN(subclass_parts) > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
                          RTEST( rb_funcall( target_class, s_tag_subclasses, 0 ) ) )
                     {
                         VALUE subclass_v;
@@ -1124,7 +1124,7 @@ syck_resolver_transfer( self, type, val )
                         subclass = rb_funcall( target_class, s_tag_read_class, 1, subclass );
                         subclass_v = syck_const_find( subclass );
 
-                        if ( subclass_v != Qnil ) 
+                        if ( subclass_v != Qnil )
                         {
                             subclass = subclass_v;
                         }
@@ -1175,10 +1175,10 @@ syck_resolver_transfer( self, type, val )
                 }
                 else if ( !NIL_P( obj ) && rb_obj_is_instance_of( val, rb_cHash ) )
                 {
-                    rb_iterate( rb_each, val, syck_set_ivars, obj );
+                    rb_block_call( val, s_each, 0, 0, syck_set_ivars, obj );
                 }
             }
-            else 
+            else
             {
                 VALUE parts = rb_str_split( type, ":" );
                 VALUE scheme = rb_ary_shift( parts );
@@ -1205,14 +1205,13 @@ syck_resolver_transfer( self, type, val )
  * YAML::Syck::Resolver#tagurize
  */
 VALUE
-syck_resolver_tagurize( self, val )
-    VALUE self, val;
+syck_resolver_tagurize(VALUE self, VALUE val)
 {
     VALUE tmp = rb_check_string_type(val);
 
     if ( !NIL_P(tmp) )
     {
-        char *taguri = syck_type_id_to_uri( RSTRING(tmp)->ptr );
+        char *taguri = syck_type_id_to_uri( RSTRING_PTR(tmp) );
         val = rb_str_new2( taguri );
         S_FREE( taguri );
     }
@@ -1221,19 +1220,18 @@ syck_resolver_tagurize( self, val )
 }
 
 /*
- * YAML::Syck::DefaultResolver#detect_implicit 
+ * YAML::Syck::DefaultResolver#detect_implicit
  */
 VALUE
-syck_defaultresolver_detect_implicit( self, val )
-    VALUE self, val;
+syck_defaultresolver_detect_implicit(VALUE self, VALUE val)
 {
-    char *type_id;
+    const char *type_id;
     VALUE tmp = rb_check_string_type(val);
 
     if ( !NIL_P(tmp) )
     {
         val = tmp;
-        type_id = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
+        type_id = syck_match_implicit( RSTRING_PTR(val), RSTRING_LEN(val) );
         return rb_str_new2( type_id );
     }
 
@@ -1244,8 +1242,7 @@ syck_defaultresolver_detect_implicit( self, val )
  * YAML::Syck::DefaultResolver#node_import
  */
 VALUE
-syck_defaultresolver_node_import( self, node )
-    VALUE self, node;
+syck_defaultresolver_node_import(VALUE self, VALUE node)
 {
     SyckNode *n;
     VALUE obj;
@@ -1261,8 +1258,7 @@ syck_defaultresolver_node_import( self, node )
  * YAML::Syck::GenericResolver#node_import
  */
 VALUE
-syck_genericresolver_node_import( self, node )
-    VALUE self, node;
+syck_genericresolver_node_import(VALUE self, VALUE node)
 {
     SyckNode *n;
     int i = 0;
@@ -1279,22 +1275,23 @@ syck_genericresolver_node_import( self, node )
         case syck_str_kind:
         {
             v = rb_str_new( n->data.str->ptr, n->data.str->len );
+	    rb_enc_associate(v, rb_utf8_encoding());
             if ( n->data.str->style == scalar_1quote )
             {
                 style = sym_1quote;
-            } 
+            }
             else if ( n->data.str->style == scalar_2quote )
             {
                 style = sym_2quote;
-            } 
+            }
             else if ( n->data.str->style == scalar_fold )
             {
                 style = sym_fold;
-            } 
+            }
             else if ( n->data.str->style == scalar_literal )
             {
                 style = sym_literal;
-            } 
+            }
             else if ( n->data.str->style == scalar_plain )
             {
                 style = sym_plain;
@@ -1304,7 +1301,6 @@ syck_genericresolver_node_import( self, node )
         break;
 
         case syck_seq_kind:
-            rb_iv_set(obj, "@kind", sym_seq);
             v = rb_ary_new2( syck_seq_count( n ) );
             for ( i = 0; i < syck_seq_count( n ); i++ )
             {
@@ -1313,12 +1309,12 @@ syck_genericresolver_node_import( self, node )
             if ( n->data.list->style == seq_inline )
             {
                 style = sym_inline;
-            } 
+            }
             obj = rb_funcall( cSeq, s_new, 3, t, v, style );
+            rb_iv_set(obj, "@kind", sym_seq);
         break;
 
         case syck_map_kind:
-            rb_iv_set(obj, "@kind", sym_map);
             v = rb_hash_new();
             for ( i = 0; i < syck_map_count( n ); i++ )
             {
@@ -1327,8 +1323,9 @@ syck_genericresolver_node_import( self, node )
             if ( n->data.pairs->style == map_inline )
             {
                 style = sym_inline;
-            } 
+            }
             obj = rb_funcall( cMap, s_new, 3, t, v, style );
+            rb_iv_set(obj, "@kind", sym_map);
         break;
     }
 
@@ -1339,8 +1336,7 @@ syck_genericresolver_node_import( self, node )
  * YAML::Syck::BadAlias.initialize
  */
 VALUE
-syck_badalias_initialize( self, val )
-    VALUE self, val;
+syck_badalias_initialize(VALUE self, VALUE val)
 {
     rb_iv_set( self, "@name", val );
     return self;
@@ -1350,11 +1346,10 @@ syck_badalias_initialize( self, val )
  * YAML::Syck::BadAlias.<=>
  */
 VALUE
-syck_badalias_cmp( alias1, alias2 )
-    VALUE alias1, alias2;
+syck_badalias_cmp(VALUE alias1, VALUE alias2)
 {
-    VALUE str1 = rb_ivar_get( alias1, s_name ); 
-    VALUE str2 = rb_ivar_get( alias2, s_name ); 
+    VALUE str1 = rb_ivar_get( alias1, s_name );
+    VALUE str2 = rb_ivar_get( alias2, s_name );
     VALUE val = rb_funcall( str1, s_cmp, 1, str2 );
     return val;
 }
@@ -1363,8 +1358,7 @@ syck_badalias_cmp( alias1, alias2 )
  * YAML::DomainType.initialize
  */
 VALUE
-syck_domaintype_initialize( self, domain, type_id, val )
-    VALUE self, domain, type_id, val;
+syck_domaintype_initialize(VALUE self, VALUE domain, VALUE type_id, VALUE val)
 {
     rb_iv_set( self, "@domain", domain );
     rb_iv_set( self, "@type_id", type_id );
@@ -1376,8 +1370,7 @@ syck_domaintype_initialize( self, domain, type_id, val )
  * YAML::Object.initialize
  */
 VALUE
-syck_yobject_initialize( self, klass, ivars )
-    VALUE self, klass, ivars;
+syck_yobject_initialize(VALUE self, VALUE klass, VALUE ivars)
 {
     rb_iv_set( self, "@class", klass );
     rb_iv_set( self, "@ivars", ivars );
@@ -1388,8 +1381,7 @@ syck_yobject_initialize( self, klass, ivars )
  * YAML::PrivateType.initialize
  */
 VALUE
-syck_privatetype_initialize( self, type_id, val )
-    VALUE self, type_id, val;
+syck_privatetype_initialize(VALUE self, VALUE type_id, VALUE val)
 {
     rb_iv_set( self, "@type_id", type_id );
     rb_iv_set( self, "@value", val );
@@ -1400,8 +1392,7 @@ syck_privatetype_initialize( self, type_id, val )
  * Mark node contents.
  */
 static void
-syck_node_mark( n )
-    SyckNode *n;
+syck_node_mark(SyckNode *n)
 {
     int i;
     rb_gc_mark_maybe( n->id );
@@ -1421,6 +1412,11 @@ syck_node_mark( n )
                 rb_gc_mark( syck_map_read( n, map_value, i ) );
             }
         break;
+
+	case syck_str_kind:
+	default:
+	    /* nothing */
+	break;
     }
 #if 0 /* maybe needed */
     if ( n->shortcut ) syck_node_mark( n->shortcut ); /* caution: maybe cyclic */
@@ -1431,8 +1427,7 @@ syck_node_mark( n )
  * YAML::Syck::Scalar.allocate
  */
 VALUE
-syck_scalar_alloc( class )
-    VALUE class;
+syck_scalar_alloc(VALUE class)
 {
     SyckNode *node = syck_alloc_str();
     VALUE obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
@@ -1444,8 +1439,7 @@ syck_scalar_alloc( class )
  * YAML::Syck::Scalar.initialize
  */
 VALUE
-syck_scalar_initialize( self, type_id, val, style )
-    VALUE self, type_id, val, style;
+syck_scalar_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
 {
     rb_iv_set( self, "@kind", sym_scalar );
     rb_funcall( self, s_type_id_set, 1, type_id );
@@ -1458,8 +1452,7 @@ syck_scalar_initialize( self, type_id, val, style )
  * YAML::Syck::Scalar.style=
  */
 VALUE
-syck_scalar_style_set( self, style )
-    VALUE self, style;
+syck_scalar_style_set(VALUE self, VALUE style)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1467,23 +1460,23 @@ syck_scalar_style_set( self, style )
     if ( NIL_P( style ) )
     {
         node->data.str->style = scalar_none;
-    } 
+    }
     else if ( style == sym_1quote )
     {
         node->data.str->style = scalar_1quote;
-    } 
+    }
     else if ( style == sym_2quote )
     {
         node->data.str->style = scalar_2quote;
-    } 
+    }
     else if ( style == sym_fold )
     {
         node->data.str->style = scalar_fold;
-    } 
+    }
     else if ( style == sym_literal )
     {
         node->data.str->style = scalar_literal;
-    } 
+    }
     else if ( style == sym_plain )
     {
         node->data.str->style = scalar_plain;
@@ -1497,15 +1490,14 @@ syck_scalar_style_set( self, style )
  * YAML::Syck::Scalar.value=
  */
 VALUE
-syck_scalar_value_set( self, val )
-    VALUE self, val;
+syck_scalar_value_set(VALUE  self, VALUE val)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
 
     StringValue( val );
-    node->data.str->ptr = syck_strndup( RSTRING(val)->ptr, RSTRING(val)->len );
-    node->data.str->len = RSTRING(val)->len;
+    node->data.str->ptr = syck_strndup( RSTRING_PTR(val), RSTRING_LEN(val) );
+    node->data.str->len = RSTRING_LEN(val);
     node->data.str->style = scalar_none;
 
     rb_iv_set( self, "@value", val );
@@ -1516,8 +1508,7 @@ syck_scalar_value_set( self, val )
  * YAML::Syck::Seq.allocate
  */
 VALUE
-syck_seq_alloc( class )
-    VALUE class;
+syck_seq_alloc(VALUE class)
 {
     SyckNode *node;
     VALUE obj;
@@ -1531,8 +1522,7 @@ syck_seq_alloc( class )
  * YAML::Syck::Seq.initialize
  */
 VALUE
-syck_seq_initialize( self, type_id, val, style )
-    VALUE self, type_id, val, style;
+syck_seq_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1548,8 +1538,7 @@ syck_seq_initialize( self, type_id, val, style )
  * YAML::Syck::Seq.value=
  */
 VALUE
-syck_seq_value_set( self, val )
-    VALUE self, val;
+syck_seq_value_set(VALUE self, VALUE val)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1558,7 +1547,7 @@ syck_seq_value_set( self, val )
     if ( !NIL_P( val ) ) {
         int i;
         syck_seq_empty( node );
-        for ( i = 0; i < RARRAY( val )->len; i++ )
+        for ( i = 0; i < RARRAY_LEN( val ); i++ )
         {
             syck_seq_add( node, rb_ary_entry(val, i) );
         }
@@ -1572,8 +1561,7 @@ syck_seq_value_set( self, val )
  * YAML::Syck::Seq.add
  */
 VALUE
-syck_seq_add_m( self, val )
-    VALUE self, val;
+syck_seq_add_m(VALUE self, VALUE val)
 {
     SyckNode *node;
     VALUE emitter = rb_ivar_get( self, s_emitter );
@@ -1592,8 +1580,7 @@ syck_seq_add_m( self, val )
  * YAML::Syck::Seq.style=
  */
 VALUE
-syck_seq_style_set( self, style )
-    VALUE self, style;
+syck_seq_style_set(VALUE self, VALUE style)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1601,7 +1588,7 @@ syck_seq_style_set( self, style )
     if ( style == sym_inline )
     {
         node->data.list->style = seq_inline;
-    } 
+    }
     else
     {
         node->data.list->style = seq_none;
@@ -1615,8 +1602,7 @@ syck_seq_style_set( self, style )
  * YAML::Syck::Map.allocate
  */
 VALUE
-syck_map_alloc( class )
-    VALUE class;
+syck_map_alloc(VALUE class)
 {
     SyckNode *node;
     VALUE obj;
@@ -1630,8 +1616,7 @@ syck_map_alloc( class )
  * YAML::Syck::Map.initialize
  */
 VALUE
-syck_map_initialize( self, type_id, val, style )
-    VALUE self, type_id, val, style;
+syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1647,7 +1632,7 @@ syck_map_initialize( self, type_id, val, style )
         }
 
         keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY(keys)->len; i++ )
+        for ( i = 0; i < RARRAY_LEN(keys); i++ )
         {
             VALUE key = rb_ary_entry(keys, i);
             syck_map_add( node, key, rb_hash_aref(hsh, key) );
@@ -1665,8 +1650,7 @@ syck_map_initialize( self, type_id, val, style )
  * YAML::Syck::Map.value=
  */
 VALUE
-syck_map_value_set( self, val )
-    VALUE self, val;
+syck_map_value_set(VALUE self, VALUE val)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1683,7 +1667,7 @@ syck_map_value_set( self, val )
 
         syck_map_empty( node );
         keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY(keys)->len; i++ )
+        for ( i = 0; i < RARRAY_LEN(keys); i++ )
         {
             VALUE key = rb_ary_entry(keys, i);
             syck_map_add( node, key, rb_hash_aref(hsh, key) );
@@ -1698,8 +1682,7 @@ syck_map_value_set( self, val )
  * YAML::Syck::Map.add
  */
 VALUE
-syck_map_add_m( self, key, val )
-    VALUE self, key, val;
+syck_map_add_m(VALUE self, VALUE key, VALUE val)
 {
     SyckNode *node;
     VALUE emitter = rb_ivar_get( self, s_emitter );
@@ -1719,8 +1702,7 @@ syck_map_add_m( self, key, val )
  * YAML::Syck::Map.style=
  */
 VALUE
-syck_map_style_set( self, style )
-    VALUE self, style;
+syck_map_style_set(VALUE self, VALUE style)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1728,7 +1710,7 @@ syck_map_style_set( self, style )
     if ( style == sym_inline )
     {
         node->data.pairs->style = map_inline;
-    } 
+    }
     else
     {
         node->data.pairs->style = map_none;
@@ -1742,8 +1724,7 @@ syck_map_style_set( self, style )
  * Cloning method for all node types
  */
 VALUE
-syck_node_init_copy( copy, orig )
-    VALUE copy, orig;
+syck_node_init_copy(VALUE copy, VALUE orig)
 {
     SyckNode *copy_n;
     SyckNode *orig_n;
@@ -1766,8 +1747,7 @@ syck_node_init_copy( copy, orig )
  * YAML::Syck::Node#type_id=
  */
 VALUE
-syck_node_type_id_set( self, type_id )
-    VALUE self, type_id;
+syck_node_type_id_set(VALUE self, VALUE type_id)
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1776,7 +1756,7 @@ syck_node_type_id_set( self, type_id )
 
     if ( !NIL_P( type_id ) ) {
         StringValue( type_id );
-        node->type_id = syck_strndup( RSTRING(type_id)->ptr, RSTRING(type_id)->len );
+        node->type_id = syck_strndup( RSTRING_PTR(type_id), RSTRING_LEN(type_id) );
     }
 
     rb_iv_set( self, "@type_id", type_id );
@@ -1787,11 +1767,10 @@ syck_node_type_id_set( self, type_id )
  * YAML::Syck::Node.transform
  */
 VALUE
-syck_node_transform( self )
-    VALUE self;
+syck_node_transform(VALUE self)
 {
     VALUE t;
-    SyckNode *n;
+    SyckNode *n = NULL;
     SyckNode *orig_n;
     Data_Get_Struct(self, SyckNode, orig_n);
     t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );
@@ -1844,9 +1823,7 @@ syck_node_transform( self )
  * No one could possibly object.
  */
 void
-rb_syck_emitter_handler(e, data)
-    SyckEmitter *e;
-    st_data_t data;
+rb_syck_emitter_handler(SyckEmitter *e, st_data_t data)
 {
     SyckNode *n;
     Data_Get_Struct((VALUE)data, SyckNode, n);
@@ -1889,11 +1866,8 @@ rb_syck_emitter_handler(e, data)
 /*
  * Handle output from the emitter
  */
-void 
-rb_syck_output_handler( emitter, str, len )
-    SyckEmitter *emitter;
-    char *str;
-    long len;
+void
+rb_syck_output_handler(SyckEmitter * emitter, char *str, long len)
 {
     struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
     VALUE dest = bonus->port;
@@ -1909,8 +1883,7 @@ rb_syck_output_handler( emitter, str, len )
  * symbol table.
  */
 void
-syck_out_mark( emitter, node )
-    VALUE emitter, node;
+syck_out_mark(VALUE emitter, VALUE node)
 {
     SyckEmitter *emitterPtr;
     struct emitter_xtra *bonus;
@@ -1927,8 +1900,7 @@ syck_out_mark( emitter, node )
  * Mark emitter values.
  */
 static void
-syck_mark_emitter(emitter)
-    SyckEmitter *emitter;
+syck_mark_emitter(SyckEmitter *emitter)
 {
     struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
     rb_gc_mark( bonus->oid  );
@@ -1940,8 +1912,7 @@ syck_mark_emitter(emitter)
  * Free the emitter and any bonus attachment.
  */
 void
-rb_syck_free_emitter(e)
-    SyckEmitter *e;
+rb_syck_free_emitter(SyckEmitter *e)
 {
     S_FREE( e->bonus );
     syck_free_emitter(e);
@@ -1951,9 +1922,8 @@ rb_syck_free_emitter(e)
  * YAML::Syck::Emitter.allocate
  */
 VALUE syck_emitter_s_alloc _((VALUE));
-VALUE 
-syck_emitter_s_alloc(class)
-    VALUE class;
+VALUE
+syck_emitter_s_alloc(VALUE class)
 {
     VALUE pobj;
     SyckEmitter *emitter = syck_new_emitter();
@@ -1969,14 +1939,20 @@ syck_emitter_s_alloc(class)
     return pobj;
 }
 
+static VALUE
+id_hash_new(void)
+{
+    VALUE hash;
+    hash = rb_hash_new();
+    rb_funcall(hash, rb_intern("compare_by_identity"), 0);
+    return hash;
+}
+
 /*
  * YAML::Syck::Emitter.reset( options )
  */
 VALUE
-syck_emitter_reset( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_emitter_reset(int argc, VALUE *argv, VALUE self)
 {
     VALUE options, tmp;
     SyckEmitter *emitter;
@@ -1987,7 +1963,7 @@ syck_emitter_reset( argc, argv, self )
 
     bonus->oid = Qnil;
     bonus->port = rb_str_new2( "" );
-    bonus->data = rb_hash_new();
+    bonus->data = id_hash_new();
 
     if (rb_scan_args(argc, argv, "01", &options) == 0)
     {
@@ -2007,7 +1983,7 @@ syck_emitter_reset( argc, argv, self )
         Check_Type(options, T_HASH);
         rb_ivar_set(self, s_options, options);
     }
-    
+
     emitter->headless = 0;
     rb_ivar_set(self, s_level, INT2FIX(0));
     rb_ivar_set(self, s_resolver, Qnil);
@@ -2018,13 +1994,9 @@ syck_emitter_reset( argc, argv, self )
  * YAML::Syck::Emitter.emit( object_id ) { |out| ... }
  */
 VALUE
-syck_emitter_emit( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_emitter_emit(int argc, VALUE *argv, VALUE self)
 {
     VALUE oid, proc;
-    char *anchor_name;
     SyckEmitter *emitter;
     struct emitter_xtra *bonus;
     SYMID symple;
@@ -2047,14 +2019,14 @@ syck_emitter_emit( argc, argv, self )
     /* Second pass, build emitted string */
     level -= 1;
     rb_ivar_set(self, s_level, INT2FIX(level));
-    if ( level == 0 ) 
+    if ( level == 0 )
     {
         syck_emit(emitter, (st_data_t)symple);
         syck_emitter_flush(emitter, 0);
 
         return bonus->port;
     }
-    
+
     return symple;
 }
 
@@ -2062,8 +2034,7 @@ syck_emitter_emit( argc, argv, self )
  * YAML::Syck::Emitter#node_export
  */
 VALUE
-syck_emitter_node_export( self, node )
-    VALUE self, node;
+syck_emitter_node_export(VALUE self, VALUE node)
 {
     return rb_funcall( node, s_to_yaml, 1, self );
 }
@@ -2072,8 +2043,7 @@ syck_emitter_node_export( self, node )
  * YAML::Syck::Emitter#set_resolver
  */
 VALUE
-syck_emitter_set_resolver( self, resolver )
-    VALUE self, resolver;
+syck_emitter_set_resolver(VALUE self, VALUE resolver)
 {
     rb_ivar_set( self, s_resolver, resolver );
     return self;
@@ -2083,8 +2053,7 @@ syck_emitter_set_resolver( self, resolver )
  * YAML::Syck::Out::initialize
  */
 VALUE
-syck_out_initialize( self, emitter )
-    VALUE self, emitter;
+syck_out_initialize(VALUE self, VALUE emitter)
 {
     rb_ivar_set( self, s_emitter, emitter );
     return self;
@@ -2094,10 +2063,7 @@ syck_out_initialize( self, emitter )
  * YAML::Syck::Out::map
  */
 VALUE
-syck_out_map( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_out_map(int argc, VALUE *argv, VALUE self)
 {
     VALUE type_id, style, map;
     if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
@@ -2113,10 +2079,7 @@ syck_out_map( argc, argv, self )
  * YAML::Syck::Out::seq
  */
 VALUE
-syck_out_seq( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_out_seq(int argc, VALUE *argv, VALUE self)
 {
     VALUE type_id, style, seq;
     if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
@@ -2134,15 +2097,10 @@ syck_out_scalar( self, type_id, str, style )
     VALUE self, type_id, str, style;
  */
 VALUE
-syck_out_scalar( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_out_scalar(int argc, VALUE *argv, VALUE self)
 {
     VALUE type_id, str, style, scalar;
-    if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
-        style = Qnil;
-    }
+    rb_scan_args(argc, argv, "21", &type_id, &str, &style);
     scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
     syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
     return scalar;
@@ -2154,9 +2112,7 @@ syck_out_scalar( argc, argv, self )
 void
 Init_syck()
 {
-    VALUE rb_yaml = rb_define_module( "YAML" );
-    VALUE rb_syck = rb_define_module_under( rb_yaml, "Syck" );
-    rb_define_const( rb_syck, "VERSION", rb_str_new2( SYCK_VERSION ) );
+    VALUE rb_syck = rb_define_module_under( rb_cObject, "Syck" );
     rb_define_module_function( rb_syck, "compile", rb_syck_compile, 1 );
 
     /*
@@ -2194,6 +2150,8 @@ Init_syck()
     s_transform = rb_intern( "transform" );
     s_yaml_new = rb_intern("yaml_new");
     s_yaml_initialize = rb_intern("yaml_initialize");
+    s_each = rb_intern("each");
+    s_parse = rb_intern("parse");
 
     s_tags = rb_intern("@tags");
     s_name = rb_intern("@name");
@@ -2299,7 +2257,7 @@ Init_syck()
     /*
      * Define YAML::PrivateType class
      */
-    cPrivateType = rb_define_class_under( rb_yaml, "PrivateType", rb_cObject );
+    cPrivateType = rb_define_class_under( rb_syck, "PrivateType", rb_cObject );
     rb_define_attr( cPrivateType, "type_id", 1, 1 );
     rb_define_attr( cPrivateType, "value", 1, 1 );
     rb_define_method( cPrivateType, "initialize", syck_privatetype_initialize, 2);
@@ -2307,7 +2265,7 @@ Init_syck()
     /*
      * Define YAML::DomainType class
      */
-    cDomainType = rb_define_class_under( rb_yaml, "DomainType", rb_cObject );
+    cDomainType = rb_define_class_under( rb_syck, "DomainType", rb_cObject );
     rb_define_attr( cDomainType, "domain", 1, 1 );
     rb_define_attr( cDomainType, "type_id", 1, 1 );
     rb_define_attr( cDomainType, "value", 1, 1 );
@@ -2316,7 +2274,7 @@ Init_syck()
     /*
      * Define YAML::Object class
      */
-    cYObject = rb_define_class_under( rb_yaml, "Object", rb_cObject );
+    cYObject = rb_define_class_under( rb_syck, "Object", rb_cObject );
     rb_define_attr( cYObject, "class", 1, 1 );
     rb_define_attr( cYObject, "ivars", 1, 1 );
     rb_define_method( cYObject, "initialize", syck_yobject_initialize, 2);
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
index a83c8813c1..6ae48a75be 100644
--- a/ext/syck/syck.c
+++ b/ext/syck/syck.c
@@ -2,11 +2,10 @@
  * syck.c
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -18,12 +17,12 @@ void syck_parser_pop_level( SyckParser * );
 /*
  * Custom assert
  */
-void 
-syck_assert( char *file_name, unsigned line_num )
+void
+syck_assert( const char *file_name, unsigned line_num, const char *expr )
 {
     fflush( NULL );
-    fprintf( stderr, "\nAssertion failed: %s, line %u\n",
-             file_name, line_num );
+    fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
+             file_name, line_num, expr );
     fflush( stderr );
     abort();
 }
@@ -32,7 +31,7 @@ syck_assert( char *file_name, unsigned line_num )
  * Allocates and copies a string
  */
 char *
-syck_strndup( char *buf, long len )
+syck_strndup( const char *buf, long len )
 {
     char *new = S_ALLOC_N( char, len + 1 );
     S_MEMZERO( new, char, len + 1 );
@@ -155,13 +154,13 @@ syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
  * Allocate the parser
  */
 SyckParser *
-syck_new_parser()
+syck_new_parser(void)
 {
     SyckParser *p;
     p = S_ALLOC( SyckParser );
     S_MEMZERO( p, SyckParser, 1 );
     p->lvl_capa = ALLOC_CT;
-    p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa ); 
+    p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa );
     p->input_type = syck_yaml_utf8;
     p->io_type = syck_io_str;
     p->io.str = NULL;
@@ -178,7 +177,7 @@ syck_new_parser()
 }
 
 int
-syck_add_sym( SyckParser *p, char *data )
+syck_add_sym( SyckParser *p, void *data )
 {
     SYMID id = 0;
     if ( p->syms == NULL )
@@ -191,10 +190,14 @@ syck_add_sym( SyckParser *p, char *data )
 }
 
 int
-syck_lookup_sym( SyckParser *p, SYMID id, char **data )
+syck_lookup_sym( SyckParser *p, SYMID id, void **datap )
 {
+    st_data_t data;
+    int ret;
     if ( p->syms == NULL ) return 0;
-    return st_lookup( p->syms, id, (st_data_t *)data );
+    ret = st_lookup( p->syms, id, &data );
+    if(ret) *datap = (void *)data;
+    return ret;
 }
 
 int
@@ -226,6 +229,22 @@ syck_st_free( SyckParser *p )
     }
 }
 
+typedef struct {
+   long hash;
+   char *buffer;
+   long length;
+   long remaining;
+   int  printed;
+} bytestring_t;
+
+int
+syck_st_free_syms( void *key, bytestring_t *sav, void *dummy )
+{
+    S_FREE(sav->buffer);
+    S_FREE(sav);
+    return ST_CONTINUE;
+}
+
 void
 syck_free_parser( SyckParser *p )
 {
@@ -234,6 +253,7 @@ syck_free_parser( SyckParser *p )
      */
     if ( p->syms != NULL )
     {
+        st_foreach( p->syms, syck_st_free_syms, 0 );
         st_free_table( p->syms );
         p->syms = NULL;
     }
@@ -358,7 +378,7 @@ syck_parser_pop_level( SyckParser *p )
     free( p->levels[p->lvl_idx].domain );
 }
 
-void 
+void
 syck_parser_add_level( SyckParser *p, int len, enum syck_level_status status )
 {
     ASSERT( p != NULL );
@@ -383,7 +403,7 @@ free_any_io( SyckParser *p )
     switch ( p->io_type )
     {
         case syck_io_str:
-            if ( p->io.str != NULL ) 
+            if ( p->io.str != NULL )
             {
                 S_FREE( p->io.str );
                 p->io.str = NULL;
@@ -391,7 +411,7 @@ free_any_io( SyckParser *p )
         break;
 
         case syck_io_file:
-            if ( p->io.file != NULL ) 
+            if ( p->io.file != NULL )
             {
                 S_FREE( p->io.file );
                 p->io.file = NULL;
@@ -494,9 +514,9 @@ syck_parse( SyckParser *p )
 }
 
 void
-syck_default_error_handler( SyckParser *p, char *msg )
+syck_default_error_handler( SyckParser *p, const char *msg )
 {
-    printf( "Error at [Line %d, Col %d]: %s\n", 
+    printf( "Error at [Line %d, Col %"PRIdPTRDIFF"]: %s\n",
         p->linect,
         p->cursor - p->lineptr,
         msg );
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
index e7d07e9c0d..2cf81a8b9a 100644
--- a/ext/syck/syck.h
+++ b/ext/syck/syck.h
@@ -2,7 +2,6 @@
  * syck.h
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
@@ -13,13 +12,12 @@
 #define SYCK_YAML_MAJOR 1
 #define SYCK_YAML_MINOR 0
 
-#define SYCK_VERSION    "0.60"
 #define YAML_DOMAIN     "yaml.org,2002"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "st.h"
+#include "ruby/st.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -33,14 +31,11 @@ extern "C" {
 #endif
 
 #if DEBUG
-  void syck_assert( char *, unsigned );
+void syck_assert( const char *, unsigned, const char * );
 # define ASSERT(f) \
-    if ( f ) \
-        {}   \
-    else     \
-        syck_assert( __FILE__, __LINE__ )
+    (( f ) ? (void)0 : syck_assert( __FILE__, __LINE__, #f ))
 #else
-# define ASSERT(f)
+# define ASSERT(f) ((void)0)
 #endif
 
 #ifndef NULL
@@ -156,9 +151,9 @@ typedef struct _syck_str SyckIoStr;
 typedef struct _syck_level SyckLevel;
 
 typedef SYMID (*SyckNodeHandler)(SyckParser *, SyckNode *);
-typedef void (*SyckErrorHandler)(SyckParser *, char *);
+typedef void (*SyckErrorHandler)(SyckParser *, const char *);
 typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *, char *);
-typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long); 
+typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long);
 typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
 
 enum syck_io_type {
@@ -210,7 +205,7 @@ struct _syck_str {
 struct _syck_level {
     /* Indent */
     int spaces;
-    /* Counts nodes emitted at this level, useful for parsing 
+    /* Counts nodes emitted at this level, useful for parsing
      * keys and pairs in bytecode */
     int ncount;
     /* Does node have anchors or tags? */
@@ -270,8 +265,8 @@ struct _syck_parser {
 typedef struct _syck_emitter SyckEmitter;
 typedef struct _syck_emitter_node SyckEmitterNode;
 
-typedef void (*SyckOutputHandler)(SyckEmitter *, char *, long); 
-typedef void (*SyckEmitterHandler)(SyckEmitter *, st_data_t); 
+typedef void (*SyckOutputHandler)(SyckEmitter *, char *, long);
+typedef void (*SyckEmitterHandler)(SyckEmitter *, st_data_t);
 
 enum doc_stage {
     doc_open,
@@ -346,57 +341,57 @@ SyckNode *syck_hdlr_add_anchor( SyckParser *, char *, SyckNode * );
 void syck_hdlr_remove_anchor( SyckParser *, char * );
 SyckNode *syck_hdlr_get_anchor( SyckParser *, char * );
 void syck_add_transfer( char *, SyckNode *, int );
-char *syck_xprivate( char *, int );
-char *syck_taguri( char *, char *, int );
-int syck_tagcmp( char *, char * );
-int syck_add_sym( SyckParser *, char * );
-int syck_lookup_sym( SyckParser *, SYMID, char ** );
+char *syck_xprivate( const char *, int );
+char *syck_taguri( const char *, const char *, int );
+int syck_tagcmp( const char *, const char * );
+int syck_add_sym( SyckParser *, void * );
+int syck_lookup_sym( SyckParser *, SYMID, void ** );
 int syck_try_implicit( SyckNode * );
-char *syck_type_id_to_uri( char * );
+char *syck_type_id_to_uri( const char * );
 void try_tag_implicit( SyckNode *, int );
-char *syck_match_implicit( char *, size_t );
+const char *syck_match_implicit( const char *, size_t );
 
 /*
  * API prototypes
  */
-char *syck_strndup( char *, long );
+char *syck_strndup( const char *, long );
 long syck_io_file_read( char *, SyckIoFile *, long, long );
 long syck_io_str_read( char *, SyckIoStr *, long, long );
 char *syck_base64enc( char *, long );
 char *syck_base64dec( char *, long );
-SyckEmitter *syck_new_emitter();
+SyckEmitter *syck_new_emitter(void);
 SYMID syck_emitter_mark_node( SyckEmitter *, st_data_t );
 void syck_emitter_ignore_id( SyckEmitter *, SYMID );
 void syck_output_handler( SyckEmitter *, SyckOutputHandler );
 void syck_emitter_handler( SyckEmitter *, SyckEmitterHandler );
 void syck_free_emitter( SyckEmitter * );
 void syck_emitter_clear( SyckEmitter * );
-void syck_emitter_write( SyckEmitter *, char *, long );
-void syck_emitter_escape( SyckEmitter *, char *, long );
+void syck_emitter_write( SyckEmitter *, const char *, long );
+void syck_emitter_escape( SyckEmitter *, const char *, long );
 void syck_emitter_flush( SyckEmitter *, long );
 void syck_emit( SyckEmitter *, st_data_t );
-void syck_emit_scalar( SyckEmitter *, char *, enum scalar_style, int, int, char, char *, long );
-void syck_emit_1quoted( SyckEmitter *, int, char *, long );
-void syck_emit_2quoted( SyckEmitter *, int, char *, long );
-void syck_emit_folded( SyckEmitter *, int, char, char *, long );
-void syck_emit_literal( SyckEmitter *, char, char *, long );
-void syck_emit_seq( SyckEmitter *, char *, enum seq_style );
+void syck_emit_scalar( SyckEmitter *, const char *, enum scalar_style, int, int, char, const char *, long );
+void syck_emit_1quoted( SyckEmitter *, int, const char *, long );
+void syck_emit_2quoted( SyckEmitter *, int, const char *, long );
+void syck_emit_folded( SyckEmitter *, int, char, const char *, long );
+void syck_emit_literal( SyckEmitter *, char, const char *, long );
+void syck_emit_seq( SyckEmitter *, const char *, enum seq_style );
 void syck_emit_item( SyckEmitter *, st_data_t );
-void syck_emit_map( SyckEmitter *, char *, enum map_style );
+void syck_emit_map( SyckEmitter *, const char *, enum map_style );
 void syck_emit_end( SyckEmitter * );
-void syck_emit_tag( SyckEmitter *, char *, char * );
+void syck_emit_tag( SyckEmitter *, const char *, const char * );
 void syck_emit_indent( SyckEmitter * );
 SyckLevel *syck_emitter_current_level( SyckEmitter * );
 SyckLevel *syck_emitter_parent_level( SyckEmitter * );
 void syck_emitter_pop_level( SyckEmitter * );
 void syck_emitter_add_level( SyckEmitter *, int, enum syck_level_status );
 void syck_emitter_reset_levels( SyckEmitter * );
-SyckParser *syck_new_parser();
+SyckParser *syck_new_parser(void);
 void syck_free_parser( SyckParser * );
 void syck_parser_set_root_on_error( SyckParser *, SYMID );
 void syck_parser_implicit_typing( SyckParser *, int );
 void syck_parser_taguri_expansion( SyckParser *, int );
-int syck_scan_scalar( int, char *, long );
+int syck_scan_scalar( int, const char *, long );
 void syck_parser_handler( SyckParser *, SyckNodeHandler );
 void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
 void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
@@ -411,20 +406,20 @@ void free_any_io( SyckParser * );
 long syck_parser_read( SyckParser * );
 long syck_parser_readlen( SyckParser *, long );
 SYMID syck_parse( SyckParser * );
-void syck_default_error_handler( SyckParser *, char * );
+void syck_default_error_handler( SyckParser *, const char * );
 SYMID syck_yaml2byte_handler( SyckParser *, SyckNode * );
 char *syck_yaml2byte( char * );
 
 /*
  * Allocation prototypes
  */
-SyckNode *syck_alloc_map();
-SyckNode *syck_alloc_seq();
-SyckNode *syck_alloc_str();
+SyckNode *syck_alloc_map(void);
+SyckNode *syck_alloc_seq(void);
+SyckNode *syck_alloc_str(void);
 void syck_free_node( SyckNode * );
 void syck_free_members( SyckNode * );
-SyckNode *syck_new_str( char *, enum scalar_style );
-SyckNode *syck_new_str2( char *, long, enum scalar_style );
+SyckNode *syck_new_str( const char *, enum scalar_style );
+SyckNode *syck_new_str2( const char *, long, enum scalar_style );
 void syck_replace_str( SyckNode *, char *, enum scalar_style );
 void syck_replace_str2( SyckNode *, char *, long, enum scalar_style );
 void syck_str_blow_away_commas( SyckNode * );
@@ -446,7 +441,7 @@ long syck_seq_count( SyckNode * );
 /*
  * Lexer prototypes
  */
-void syckerror( char * );
+void syckerror( const char * );
 int syckparse( void * );
 union YYSTYPE;
 int sycklex( union YYSTYPE *, SyckParser * );
diff --git a/ext/syck/token.c b/ext/syck/token.c
index 3c6cd1a9cf..1521c5489d 100644
--- a/ext/syck/token.c
+++ b/ext/syck/token.c
@@ -4,11 +4,10 @@
  * token.re
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "syck.h"
 #include "gram.h"
 
@@ -71,7 +70,7 @@
                 if ( reset == 1 ) YYPOS(0); \
                 return YAML_IOPEN; \
             } \
-        } 
+        }
 
 /*
  * Nice little macro to ensure closure of levels.
@@ -279,7 +278,7 @@ sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser )
 {
     int doc_level = 0;
     syck_parser_ptr = parser;
-    if ( YYCURSOR == NULL ) 
+    if ( YYCURSOR == NULL )
     {
         syck_parser_read( parser );
     }
@@ -332,7 +331,7 @@ yy2:	yyaccept = 0;
 yy3:
 #line 374 "token.re"
 {   YYPOS(0);
-                        goto Document; 
+                        goto Document;
                     }
 #line 337 "<stdout>"
 yy4:	yyaccept = 0;
@@ -345,7 +344,7 @@ yy5:	++YYCURSOR;
 	goto yy6;
 yy6:
 #line 356 "token.re"
-{   eat_comments( parser ); 
+{   eat_comments( parser );
                         goto Header;
                     }
 #line 351 "<stdout>"
@@ -356,7 +355,7 @@ yy8:
 {   SyckLevel *lvl = CURRENT_LEVEL();
                         ENSURE_YAML_IEND(lvl, -1);
                         YYPOS(0);
-                        return 0; 
+                        return 0;
                     }
 #line 361 "<stdout>"
 yy9:	yyaccept = 1;
@@ -365,7 +364,7 @@ yy9:	yyaccept = 1;
 yy10:
 #line 366 "token.re"
 {   GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
-                        goto Header; 
+                        goto Header;
                     }
 #line 370 "<stdout>"
 yy11:	yych = *++YYCURSOR;
@@ -433,15 +432,15 @@ yy24:
 {   SyckLevel *lvl = CURRENT_LEVEL();
                         if ( lvl->status == syck_lvl_header )
                         {
-                            goto Header; 
+                            goto Header;
                         }
                         else
                         {
                             ENSURE_YAML_IEND(lvl, -1);
                             YYPOS(0);
-                            return 0; 
+                            return 0;
                         }
-                        return 0; 
+                        return 0;
                     }
 #line 446 "<stdout>"
 yy25:	++YYCURSOR;
@@ -477,13 +476,13 @@ yy31:
                         if ( lvl->status == syck_lvl_header )
                         {
                             YYPOS(3);
-                            goto Directive; 
+                            goto Directive;
                         }
                         else
                         {
                             ENSURE_YAML_IEND(lvl, -1);
                             YYPOS(0);
-                            return 0; 
+                            return 0;
                         }
                     }
 #line 489 "<stdout>"
@@ -584,7 +583,7 @@ yy39:	++YYCURSOR;
 yy40:
 #line 497 "token.re"
 {   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto Plain; 
+                        goto Plain;
                     }
 #line 589 "<stdout>"
 yy41:	++YYCURSOR;
@@ -594,7 +593,7 @@ yy42:
 {   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         lvl = CURRENT_LEVEL();
                         ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq);
-                        return YYTOKEN[0]; 
+                        return YYTOKEN[0];
                     }
 #line 599 "<stdout>"
 yy43:	++YYCURSOR;
@@ -604,7 +603,7 @@ yy44:
 {   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         lvl = CURRENT_LEVEL();
                         ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap);
-                        return YYTOKEN[0]; 
+                        return YYTOKEN[0];
                     }
 #line 609 "<stdout>"
 yy45:	++YYCURSOR;
@@ -612,7 +611,7 @@ yy45:	++YYCURSOR;
 yy46:
 #line 432 "token.re"
 {   POP_LEVEL();
-                        return YYTOKEN[0]; 
+                        return YYTOKEN[0];
                     }
 #line 617 "<stdout>"
 yy47:	yyaccept = 1;
@@ -801,7 +800,7 @@ yy58:	++YYCURSOR;
 	goto yy59;
 yy59:
 #line 486 "token.re"
-{   eat_comments( parser ); 
+{   eat_comments( parser );
                         goto Document;
                     }
 #line 807 "<stdout>"
@@ -818,7 +817,7 @@ yy63:
 #line 492 "token.re"
 {   ENSURE_YAML_IEND(lvl, -1);
                         YYPOS(0);
-                        return 0; 
+                        return 0;
                     }
 #line 823 "<stdout>"
 yy64:	yych = *++YYCURSOR;
@@ -860,11 +859,11 @@ yy70:	++YYCURSOR;
 	goto yy71;
 yy71:
 #line 479 "token.re"
-{   if ( is_newline( YYCURSOR - 1 ) ) 
+{   if ( is_newline( YYCURSOR - 1 ) )
                         {
                             YYCURSOR--;
                         }
-                        goto ScalarBlock; 
+                        goto ScalarBlock;
                     }
 #line 869 "<stdout>"
 yy72:	++YYCURSOR;
@@ -1042,14 +1041,14 @@ yy82:
                         FORCE_NEXT_TOKEN(YAML_IOPEN);
                         if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
                         {
-                            YYCURSOR--; 
+                            YYCURSOR--;
                             ADD_LEVEL((YYTOKEN + 1) - YYLINEPTR, syck_lvl_seq);
                         }
                         else /* spaces followed by content uses the space as indentation */
                         {
                             ADD_LEVEL(YYCURSOR - YYLINEPTR, syck_lvl_seq);
                         }
-                        return YYTOKEN[0]; 
+                        return YYTOKEN[0];
                     }
 #line 1054 "<stdout>"
 yy83:	++YYCURSOR;
@@ -1070,8 +1069,8 @@ yy86:	++YYCURSOR;
 yy87:
 #line 436 "token.re"
 {   if ( *YYTOKEN == ':' && lvl->status != syck_lvl_imap ) lvl->status = syck_lvl_map;
-                        YYPOS(1); 
-                        return YYTOKEN[0]; 
+                        YYPOS(1);
+                        return YYTOKEN[0];
                     }
 #line 1076 "<stdout>"
 yy88:	++YYCURSOR;
@@ -1117,7 +1116,7 @@ Directive:
 #line 1117 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy94;
 	++YYCURSOR;
 yy94:
@@ -1500,7 +1499,7 @@ Plain:
         plvl = CURRENT_LEVEL();
         GET_TRUE_YAML_INDENT(parentIndent);
 
-Plain2: 
+Plain2:
         YYTOKEN = YYCURSOR;
 
 Plain3:
@@ -1565,7 +1564,7 @@ yy113:
                             }
                         }
 
-                        goto Plain2; 
+                        goto Plain2;
                     }
 #line 1570 "<stdout>"
 yy114:	++YYCURSOR;
@@ -1632,13 +1631,13 @@ yy122:	++YYCURSOR;
 	}
 yy123:
 #line 617 "token.re"
-{   if ( qidx == 0 ) 
+{   if ( qidx == 0 )
                         {
                             goto Plain2;
                         }
                         else
                         {
-                            goto Plain3; 
+                            goto Plain3;
                         }
                     }
 #line 1644 "<stdout>"
@@ -1656,7 +1655,7 @@ yy128:	++YYCURSOR;
 	goto yy129;
 yy129:
 #line 611 "token.re"
-{   eat_comments( parser ); 
+{   eat_comments( parser );
                         RETURN_IMPLICIT();
                     }
 #line 1662 "<stdout>"
@@ -1802,7 +1801,7 @@ yy147:
                             }
                         }
 
-                        goto SingleQuote2; 
+                        goto SingleQuote2;
                     }
 #line 1807 "<stdout>"
 yy148:	++YYCURSOR;
@@ -1812,8 +1811,8 @@ yy148:	++YYCURSOR;
 	}
 yy149:
 #line 712 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto SingleQuote2; 
+{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
+                        goto SingleQuote2;
                     }
 #line 1818 "<stdout>"
 yy150:	++YYCURSOR;
@@ -1843,7 +1842,7 @@ yy151:
                         n->data.str->len = qidx;
                         n->data.str->style = scalar_1quote;
                         sycklval->nodeData = n;
-                        return YAML_PLAIN; 
+                        return YAML_PLAIN;
                     }
 #line 1848 "<stdout>"
 yy152:	yych = *++YYCURSOR;
@@ -1855,7 +1854,7 @@ yy154:	++YYCURSOR;
 yy155:
 #line 685 "token.re"
 {   QUOTECAT(qstr, qcapa, qidx, '\'');
-                        goto SingleQuote2; 
+                        goto SingleQuote2;
                     }
 #line 1860 "<stdout>"
 yy156:	yyaccept = 0;
@@ -1961,7 +1960,7 @@ yy163:
                         }
 
                         keep_nl = 1;
-                        goto DoubleQuote2; 
+                        goto DoubleQuote2;
                     }
 #line 1966 "<stdout>"
 yy164:	++YYCURSOR;
@@ -1971,8 +1970,8 @@ yy164:	++YYCURSOR;
 	}
 yy165:
 #line 820 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto DoubleQuote2; 
+{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
+                        goto DoubleQuote2;
                     }
 #line 1977 "<stdout>"
 yy166:	yyaccept = 1;
@@ -2011,7 +2010,7 @@ yy168:
                         n->data.str->len = qidx;
                         n->data.str->style = scalar_2quote;
                         sycklval->nodeData = n;
-                        return YAML_PLAIN; 
+                        return YAML_PLAIN;
                     }
 #line 2016 "<stdout>"
 yy169:	yych = *++YYCURSOR;
@@ -2039,7 +2038,7 @@ yy175:
 #line 792 "token.re"
 {   keep_nl = 0;
                         YYCURSOR--;
-                        goto DoubleQuote2; 
+                        goto DoubleQuote2;
                     }
 #line 2044 "<stdout>"
 yy176:	yych = *++YYCURSOR;
@@ -2077,7 +2076,7 @@ yy179:
 #line 778 "token.re"
 {   char ch = *( YYCURSOR - 1 );
                         QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
-                        goto DoubleQuote2; 
+                        goto DoubleQuote2;
                     }
 #line 2082 "<stdout>"
 yy180:	yych = *++YYCURSOR;
@@ -2114,7 +2113,7 @@ yy182:
                         ch = strtol( chr_text, NULL, 16 );
                         free( chr_text );
                         QUOTECAT(qstr, qcapa, qidx, ch);
-                        goto DoubleQuote2; 
+                        goto DoubleQuote2;
                     }
 #line 2119 "<stdout>"
 yy183:	yyaccept = 0;
@@ -2217,7 +2216,7 @@ yy189:
                             }
                         }
 
-                        return YAML_TRANSFER; 
+                        return YAML_TRANSFER;
                     }
 #line 2222 "<stdout>"
 yy190:	yych = *++YYCURSOR;
@@ -2231,7 +2230,7 @@ yy192:	++YYCURSOR;
 	}
 yy193:
 #line 905 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
+{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
                         goto TransferMethod2;
                     }
 #line 2237 "<stdout>"
@@ -2506,7 +2505,7 @@ yy214:
 #line 1046 "token.re"
 {   YYCURSOR--;
                         POP_LEVEL();
-                        RETURN_YAML_BLOCK(); 
+                        RETURN_YAML_BLOCK();
                     }
 #line 2511 "<stdout>"
 yy215:	yyaccept = 1;
@@ -2637,7 +2636,7 @@ yy233:	++YYCURSOR;
 	}
 yy234:
 #line 1095 "token.re"
-{   goto Comment; 
+{   goto Comment;
                     }
 #line 2642 "<stdout>"
 yy235:	yych = *++YYCURSOR;
@@ -2700,21 +2699,21 @@ newline_len( char *ptr )
 {
     if ( *ptr == '\n' )
         return 1;
-    
+
     if ( *ptr == '\r' && *( ptr + 1 ) == '\n' )
         return 2;
 
     return 0;
 }
 
-int 
+int
 syckwrap()
 {
     return 1;
 }
 
-void 
-syckerror( char *msg )
+void
+syckerror( const char *msg )
 {
     if ( syck_parser_ptr->error_handler == NULL )
         syck_parser_ptr->error_handler = syck_default_error_handler;
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
index 821a3cd5b5..e5cc4e0779 100644
--- a/ext/syck/yaml2byte.c
+++ b/ext/syck/yaml2byte.c
@@ -2,14 +2,13 @@
  * yaml2byte.c
  *
  * $Author$
- * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff, clark evans
  *
  *   WARNING WARNING WARNING  --- THIS IS *NOT JUST* PLAYING
  *   ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
- */ 
-#include "ruby.h"
+ */
+#include "ruby/ruby.h"
 #include <syck.h>
 #include <assert.h>
 #define YAMLBYTE_UTF8
@@ -35,8 +34,8 @@ typedef struct {
    long remaining;
    int  printed;
 } bytestring_t;
-bytestring_t *bytestring_alloc() {
-    bytestring_t *ret; 
+bytestring_t *bytestring_alloc(void) {
+    bytestring_t *ret;
     /*TRACE0("bytestring_alloc()");*/
     ret = S_ALLOC(bytestring_t);
     ret->hash   = HASH;
@@ -47,8 +46,8 @@ bytestring_t *bytestring_alloc() {
     ret->printed = 0;
     return ret;
 }
-void bytestring_append(bytestring_t *str, char code, 
-                       char *start, char *finish) 
+void bytestring_append(bytestring_t *str, char code,
+                       char *start, char *finish)
 {
     long grow;
     long length = 2;   /* CODE + LF */
@@ -63,14 +62,14 @@ void bytestring_append(bytestring_t *str, char code,
     if(length > str->remaining) {
         grow = (length - str->remaining) + CHUNKSIZE;
         str->remaining += grow;
-        str->length    += grow; 
-        str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+        str->length    += grow;
+        S_REALLOC_N( str->buffer, char, str->length + 1 );
         assert(str->buffer);
     }
     curr = str->buffer + (str->length - str->remaining);
     *curr = code;
     curr += 1;
-    if(start) 
+    if(start)
         while(start < finish)
             *curr ++ = *start ++;
     *curr = '\n';
@@ -100,8 +99,8 @@ void bytestring_extend(bytestring_t *str, bytestring_t *ext)
         if(length > str->remaining) {
             grow = (length - str->remaining) + CHUNKSIZE;
             str->remaining += grow;
-            str->length    += grow; 
-            str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+            str->length    += grow;
+            S_REALLOC_N( str->buffer, char, str->length + 1 );
         }
         curr = str->buffer + (str->length - str->remaining);
         from = ext->buffer;
@@ -129,6 +128,7 @@ syck_yaml2byte_handler(p, n)
     char *finish;
     bytestring_t *val = NULL;
     bytestring_t *sav = NULL;
+    void *data;
     /*TRACE0("syck_yaml2byte_handler()");*/
     val = bytestring_alloc();
     if(n->anchor) bytestring_append(val,YAMLBYTE_ANCHOR, n->anchor, NULL);
@@ -176,7 +176,7 @@ syck_yaml2byte_handler(p, n)
                     {
                         bytestring_append(val,YAMLBYTE_NULLCHAR,NULL,NULL);
                     }
-                    else 
+                    else
                     {
                         assert("oops");
                     }
@@ -189,7 +189,7 @@ syck_yaml2byte_handler(p, n)
             for ( i = 0; i < n->data.list->idx; i++ )
             {
                 oid = syck_seq_read( n, i );
-                syck_lookup_sym( p, oid, (char **)&sav );
+                if (syck_lookup_sym( p, oid, &data )) sav = data;
                 bytestring_extend(val, sav);
             }
             bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@@ -199,10 +199,10 @@ syck_yaml2byte_handler(p, n)
             for ( i = 0; i < n->data.pairs->idx; i++ )
             {
                 oid = syck_map_read( n, map_key, i );
-                syck_lookup_sym( p, oid, (char **)&sav );
+                if (syck_lookup_sym( p, oid, &data )) sav = data;
                 bytestring_extend(val, sav);
                 oid = syck_map_read( n, map_value, i );
-                syck_lookup_sym( p, oid, (char **)&sav );
+                if (syck_lookup_sym( p, oid, &data )) sav = data;
                 bytestring_extend(val, sav);
             }
             bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@@ -218,7 +218,8 @@ syck_yaml2byte(char *yamlstr)
 {
     SYMID oid;
     char *ret;
-    bytestring_t *sav; 
+    bytestring_t *sav;
+    void *data;
 
     SyckParser *parser = syck_new_parser();
     syck_parser_str_auto( parser, yamlstr, NULL );
@@ -228,7 +229,8 @@ syck_yaml2byte(char *yamlstr)
     syck_parser_taguri_expansion( parser, 1 );
     oid = syck_parse( parser );
 
-    if ( syck_lookup_sym( parser, oid, (char **)&sav ) == 1 ) {
+    if ( syck_lookup_sym( parser, oid, &data ) ) {
+	sav = data;
         ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
         ret[0] = '\0';
         strcat( ret, "D\n" );
diff --git a/ext/syck/yamlbyte.h b/ext/syck/yamlbyte.h
index 0fe4e7b576..16ca3d70de 100644
--- a/ext/syck/yamlbyte.h
+++ b/ext/syck/yamlbyte.h
@@ -82,12 +82,13 @@ typedef enum {
     YAMLBYTE_E_WRITE     = 'W',   /* output stream write error      */
     YAMLBYTE_E_OTHER     = '?',   /* some other error condition     */
     YAMLBYTE_E_PARSE     = 'P',   /* parse error, check bytecodes   */
+    YAMLBYTE_MAX
 } yamlbyte_result_t;
- 
-typedef const yamlbyte_char_t *yamlbyte_buff_t; 
 
-/* 
- *  The "Instruction" API 
+typedef const yamlbyte_char_t *yamlbyte_buff_t;
+
+/*
+ *  The "Instruction" API
  */
 
 typedef struct yaml_instruction {
@@ -96,7 +97,7 @@ typedef struct yaml_instruction {
     yamlbyte_buff_t finish;  /* open range, *finish is _not_ part */
 } *yamlbyte_inst_t;
 
-/* producer pushes the instruction with one bytecode event to the 
+/* producer pushes the instruction with one bytecode event to the
  * consumer; if the consumer's result is not YAMLBYTE_OK, then
  * the producer should stop */
 typedef
@@ -110,14 +111,14 @@ typedef
  * case the instruction (and is buffer) are owned by the producer and
  * will remain valid till the pull function is called once again;
  * if the instruction is NULL, then there are no more results; and
- * it is important to call the pull function till it returns NULL so 
+ * it is important to call the pull function till it returns NULL so
  * that the producer can clean up its memory allocations */
-typedef 
+typedef
    yamlbyte_result_t
     (*yamlbyte_pull_t)(
       yamlbyte_producer_t self,
       yamlbyte_inst_t *inst   /* to be filled in by the producer */
-    ); 
+    );
 
 /*
  *  Buffer based API
@@ -139,12 +140,12 @@ typedef
  * is set to NULL, then there are no more results; it is important
  * to call the pull function till it returns NULL so that the
  * producer can clean up its memory allocations */
-typedef 
+typedef
    yamlbyte_result_t
     (*yamlbyte_pullbuff_t)(
       yamlbyte_producer_t self,
       yamlbyte_buff_t *buff   /* to be filled in by the producer */
-    ); 
+    );
 
 /* convert a pull interface to a push interface; the reverse process
  * requires threads and thus is language dependent */
diff --git a/ext/syslog/.cvsignore b/ext/syslog/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/syslog/.cvsignore
+++ b/ext/syslog/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 477489ddfe..2c91c9fa08 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * UNIX Syslog extension for Ruby
  * Amos Gouaux, University of Texas at Dallas
  * <amos+ruby@utdallas.edu>
@@ -7,8 +7,8 @@
  * $Id$
  */
 
-#include "ruby.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/util.h"
 #include <syslog.h>
 
 /* Syslog class */
@@ -22,6 +22,7 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 {
     VALUE str;
 
+    rb_secure(4);
     if (argc < 1) {
         rb_raise(rb_eArgError, "no log message supplied");
     }
@@ -32,12 +33,13 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 
     str = rb_f_sprintf(argc, argv);
 
-    syslog(pri, "%s", RSTRING(str)->ptr);
+    syslog(pri, "%s", RSTRING_PTR(str));
 }
 
 /* Syslog module methods */
 static VALUE mSyslog_close(VALUE self)
 {
+    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "syslog not opened");
     }
@@ -63,14 +65,10 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "03", &ident, &opt, &fac);
 
     if (NIL_P(ident)) {
-        ident = rb_gv_get("$0"); 
+        ident = rb_gv_get("$0");
     }
-#ifdef SafeStringValue
     SafeStringValue(ident);
-#else
-    Check_SafeStr(ident);
-#endif
-    syslog_ident = strdup(RSTRING(ident)->ptr);
+    syslog_ident = strdup(RSTRING_PTR(ident));
 
     if (NIL_P(opt)) {
 	syslog_options = LOG_PID | LOG_CONS;
@@ -132,6 +130,7 @@ static VALUE mSyslog_get_mask(VALUE self)
 
 static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
 {
+    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
     }
@@ -165,6 +164,8 @@ static VALUE mSyslog_inspect(VALUE self)
 {
     char buf[1024];
 
+    Check_Type(self, T_MODULE);
+
     if (syslog_opened) {
 	snprintf(buf, sizeof(buf),
 	  "<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
@@ -221,19 +222,19 @@ define_syslog_shortcut_method(LOG_DEBUG, debug)
 
 static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
 {
-    return INT2FIX(LOG_MASK(FIX2INT(pri)));
+    return INT2FIX(LOG_MASK(NUM2INT(pri)));
 }
 
 static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
 {
-    return INT2FIX(LOG_UPTO(FIX2INT(pri)));
+    return INT2FIX(LOG_UPTO(NUM2INT(pri)));
 }
 
 /* Init for package syslog */
 void Init_syslog()
 {
     mSyslog = rb_define_module("Syslog");
- 
+
     mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
 
     rb_include_module(mSyslog, mSyslogConstants);
diff --git a/ext/syslog/syslog.txt b/ext/syslog/syslog.txt
index 9aed35133d..35bd4cb057 100644
--- a/ext/syslog/syslog.txt
+++ b/ext/syslog/syslog.txt
@@ -7,7 +7,10 @@ Amos Gouaux, University of Texas at Dallas
 <amos+ruby@utdallas.edu>
 &
 Akinori MUSHA
-<knu@ruby-lang.org>
+<knu@iDaemons.org>
+
+Contact:
+  - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
 
 ** Syslog(Module)
 
diff --git a/ext/syslog/test.rb b/ext/syslog/test.rb
deleted file mode 100644
index cfa33eff8f..0000000000
--- a/ext/syslog/test.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env ruby
-# $RoughId: test.rb,v 1.9 2002/02/25 08:20:14 knu Exp $
-# $Id$
-
-# Please only run this test on machines reasonable for testing.
-# If in doubt, ask your admin.
-
-require 'test/unit'
-
-# Prepend current directory to load path for testing.
-$:.unshift('.')
-
-require 'syslog'
-
-class TestSyslog < Test::Unit::TestCase
-  def test_new
-    assert_raises(NoMethodError) {
-      Syslog.new
-    }
-  end
-
-  def test_instance
-    sl1 = Syslog.instance
-    sl2 = Syslog.open
-    sl3 = Syslog.instance
-
-    assert_equal(Syslog, sl1)
-    assert_equal(Syslog, sl2)
-    assert_equal(Syslog, sl3)
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_open
-    # default parameters
-    Syslog.open
-
-    assert_equal($0, Syslog.ident)
-    assert_equal(Syslog::LOG_PID | Syslog::LOG_CONS, Syslog.options)
-    assert_equal(Syslog::LOG_USER, Syslog.facility)
-
-    # open without close
-    assert_raises(RuntimeError) {
-      Syslog.open
-    }
-
-    Syslog.close
-
-    # given parameters
-    Syslog.open("foo", Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog::LOG_DAEMON) 
-
-    assert_equal('foo', Syslog.ident)
-    assert_equal(Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog.options)
-    assert_equal(Syslog::LOG_DAEMON, Syslog.facility)
-
-    Syslog.close
-
-    # default parameters again (after close)
-    Syslog.open
-    Syslog.close
-
-    assert_equal(nil, Syslog.ident)
-    assert_equal(nil, Syslog.options)
-    assert_equal(nil, Syslog.facility)
-
-    # block
-    param = nil
-    Syslog.open { |param| }
-    assert_equal(Syslog, param)
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_opened?
-    assert_equal(false, Syslog.opened?)
-
-    Syslog.open
-    assert_equal(true, Syslog.opened?)
-
-    Syslog.close
-    assert_equal(false, Syslog.opened?)
-
-    Syslog.open {
-      assert_equal(true, Syslog.opened?)
-    }
-
-    assert_equal(false, Syslog.opened?)
-  end
-
-  def test_close
-    assert_raises(RuntimeError) {
-      Syslog.close
-    }
-  end
-
-  def test_mask
-    assert_equal(nil, Syslog.mask)
-
-    Syslog.open
-
-    orig = Syslog.mask
-
-    Syslog.mask = Syslog.LOG_UPTO(Syslog::LOG_ERR)
-    assert_equal(Syslog.LOG_UPTO(Syslog::LOG_ERR), Syslog.mask)
-
-    Syslog.mask = Syslog.LOG_MASK(Syslog::LOG_CRIT)
-    assert_equal(Syslog.LOG_MASK(Syslog::LOG_CRIT), Syslog.mask)
-
-    Syslog.mask = orig
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_log
-    stderr = IO::pipe
-
-    pid = fork {
-      stderr[0].close
-      STDERR.reopen(stderr[1])
-      stderr[1].close
-
-      options = Syslog::LOG_PERROR | Syslog::LOG_NDELAY
-
-      Syslog.open("syslog_test", options) { |sl|
-	sl.log(Syslog::LOG_NOTICE, "test1 - hello, %s!", "world")
-	sl.notice("test1 - hello, %s!", "world")
-      }
-
-      Syslog.open("syslog_test", options | Syslog::LOG_PID) { |sl|
-	sl.log(Syslog::LOG_CRIT, "test2 - pid")
-	sl.crit("test2 - pid")
-      }
-      exit!
-    }
-
-    stderr[1].close
-    Process.waitpid(pid)
-
-    # LOG_PERROR is not yet implemented on Cygwin.
-    return if RUBY_PLATFORM =~ /cygwin/
-
-    2.times {
-      assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets)
-    }
-
-    2.times {
-      assert_equal(format("syslog_test[%d]: test2 - pid\n", pid), stderr[0].gets)
-    }
-  end
-
-  def test_inspect
-    Syslog.open { |sl|
-      assert_equal(format('<#%s: opened=true, ident="%s", options=%d, facility=%d, mask=%d>',
-			  Syslog,
-			  sl.ident,
-			  sl.options,
-			  sl.facility,
-			  sl.mask),
-		   sl.inspect)
-    }
-
-    assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect)
-  end
-end
diff --git a/ext/thread/extconf.rb b/ext/thread/extconf.rb
deleted file mode 100644
index 2f984efc6d..0000000000
--- a/ext/thread/extconf.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'mkmf'
-
-enable_config('fastthread', true) or exit
-
-if with_config('mem-pools', true)
-  $CPPFLAGS << ' -DUSE_MEM_POOLS'
-end
-
-create_makefile("thread")
diff --git a/ext/thread/lib/thread.rb b/ext/thread/lib/thread.rb
deleted file mode 100644
index 6c533aba39..0000000000
--- a/ext/thread/lib/thread.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-unless defined? Thread
-  fail "Thread not available for this ruby interpreter"
-end
-
-require 'thread.so'
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
deleted file mode 100644
index bca807725e..0000000000
--- a/ext/thread/thread.c
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*
- * Optimized Ruby Mutex implementation, loosely based on thread.rb by
- * Yukihiro Matsumoto <matz@ruby-lang.org>
- *
- *  Copyright 2006-2007  MenTaLguY <mental@rydia.net>
- *
- * RDoc taken from original.
- *
- * This file is made available under the same terms as Ruby.
- */
-
-#include <ruby.h>
-#include <intern.h>
-#include <rubysig.h>
-#include <node.h>
-
-enum rb_thread_status rb_thread_status _((VALUE));
-
-static VALUE rb_cMutex;
-static VALUE rb_cConditionVariable;
-static VALUE rb_cQueue;
-static VALUE rb_cSizedQueue;
-
-static VALUE set_critical(VALUE value);
-
-static VALUE
-thread_exclusive(VALUE (*func)(ANYARGS), VALUE arg)
-{
-    VALUE critical = rb_thread_critical;
-
-    rb_thread_critical = 1;
-    return rb_ensure(func, arg, set_critical, (VALUE)critical);
-}
-
-/*
- *  call-seq:
- *     Thread.exclusive { block }   => obj
- *  
- *  Wraps a block in Thread.critical, restoring the original value
- *  upon exit from the critical section, and returns the value of the
- *  block.
- */
-
-static VALUE
-rb_thread_exclusive(void)
-{
-    return thread_exclusive(rb_yield, Qundef);
-}
-
-typedef struct _Entry {
-    VALUE value;
-    struct _Entry *next;
-} Entry;
-
-typedef struct _List {
-    Entry *entries;
-    Entry *last_entry;
-    Entry *entry_pool;
-    unsigned long size;
-} List;
-
-static void
-init_list(List *list)
-{
-    list->entries = NULL;
-    list->last_entry = NULL;
-    list->entry_pool = NULL;
-    list->size = 0;
-}
-
-static void
-mark_list(List *list)
-{
-    Entry *entry;
-    for (entry = list->entries; entry; entry = entry->next) {
-        rb_gc_mark(entry->value);
-    }
-}
-
-static void
-free_entries(Entry *first)
-{
-    Entry *next;
-    while (first) {
-        next = first->next;
-        xfree(first);
-        first = next;
-    }
-}
-
-static void
-finalize_list(List *list)
-{
-    free_entries(list->entries);
-    free_entries(list->entry_pool);
-}
-
-static void
-push_list(List *list, VALUE value)
-{
-    Entry *entry;
-
-    if (list->entry_pool) {
-        entry = list->entry_pool;
-        list->entry_pool = entry->next;
-    } else {
-        entry = ALLOC(Entry);
-    }
-
-    entry->value = value;
-    entry->next = NULL;
-
-    if (list->last_entry) {
-        list->last_entry->next = entry;
-    } else {
-        list->entries = entry;
-    }
-    list->last_entry = entry;
-
-    ++list->size;
-}
-
-static void
-push_multiple_list(List *list, VALUE *values, unsigned count)
-{
-    unsigned i;
-    for (i = 0; i < count; i++) {
-        push_list(list, values[i]);
-    }
-}
-
-static void
-recycle_entries(List *list, Entry *first_entry, Entry *last_entry)
-{
-#ifdef USE_MEM_POOLS
-    last_entry->next = list->entry_pool;
-    list->entry_pool = first_entry;
-#else
-    last_entry->next = NULL;
-    free_entries(first_entry);
-#endif
-}
-
-static VALUE
-shift_list(List *list)
-{
-    Entry *entry;
-    VALUE value;
-
-    entry = list->entries;
-    if (!entry) return Qnil;
-
-    list->entries = entry->next;
-    if (entry == list->last_entry) {
-        list->last_entry = NULL;
-    }
-
-    --list->size;
-
-    value = entry->value;
-    recycle_entries(list, entry, entry);
-
-    return value;
-}
-
-static void
-remove_one(List *list, VALUE value)
-{
-    Entry **ref;
-    Entry *prev;
-    Entry *entry;
-
-    for (ref = &list->entries, prev = NULL, entry = list->entries;
-              entry != NULL;
-              ref = &entry->next, prev = entry, entry = entry->next) {
-        if (entry->value == value) {
-            *ref = entry->next;
-            list->size--;
-            if (!entry->next) {
-                list->last_entry = prev;
-            }
-            recycle_entries(list, entry, entry);
-            break;
-        }
-    }
-}
-
-static void
-clear_list(List *list)
-{
-    if (list->last_entry) {
-        recycle_entries(list, list->entries, list->last_entry);
-        list->entries = NULL;
-        list->last_entry = NULL;
-        list->size = 0;
-    }
-}
-
-static VALUE
-array_from_list(List const *list)
-{
-    VALUE ary;
-    Entry *entry;
-    ary = rb_ary_new();
-    for (entry = list->entries; entry; entry = entry->next) {
-        rb_ary_push(ary, entry->value);
-    }
-    return ary;
-}
-
-static VALUE
-wake_thread(VALUE thread)
-{
-    return rb_thread_wakeup_alive(thread);
-}
-
-static VALUE
-run_thread(VALUE thread)
-{
-    thread = wake_thread(thread);
-    if (RTEST(thread) && !rb_thread_critical)
-	rb_thread_schedule();
-    return thread;
-}
-
-static VALUE
-wake_one(List *list)
-{
-    VALUE waking;
-
-    waking = Qnil;
-    while (list->entries && !RTEST(waking)) {
-	waking = shift_list(list);
-	if (waking == Qundef) break;
-	waking = wake_thread(waking);
-    }
-
-    return waking;
-}
-
-static VALUE
-wake_all(List *list)
-{
-    while (list->entries) {
-        wake_one(list);
-    }
-    return Qnil;
-}
-
-static VALUE
-wait_list_inner(List *list)
-{
-    push_list(list, rb_thread_current());
-    rb_thread_stop();
-    return Qnil;
-}
-
-static VALUE
-wait_list_cleanup(List *list)
-{
-    /* cleanup in case of spurious wakeups */
-    remove_one(list, rb_thread_current());
-    return Qnil;
-}
-
-static void
-wait_list(List *list)
-{
-    rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
-}
-
-static void
-kill_waiting_threads(List *waiting)
-{
-    Entry *entry;
-
-    for (entry = waiting->entries; entry; entry = entry->next) {
-	rb_thread_kill(entry->value);
-    }
-}
-
-/*
- * Document-class: Mutex
- *
- * Mutex implements a simple semaphore that can be used to coordinate access to
- * shared data from multiple concurrent threads.
- *
- * Example:
- *
- *   require 'thread'
- *   semaphore = Mutex.new
- *
- *   a = Thread.new {
- *     semaphore.synchronize {
- *       # access shared resource
- *     }
- *   }
- *
- *   b = Thread.new {
- *     semaphore.synchronize {
- *       # access shared resource
- *     }
- *   }
- *
- */
-
-typedef struct _Mutex {
-    VALUE owner;
-    List waiting;
-} Mutex;
-
-#define MUTEX_LOCKED_P(mutex) (RTEST((mutex)->owner) && rb_thread_alive_p((mutex)->owner))
-
-static void
-mark_mutex(Mutex *mutex)
-{
-    rb_gc_mark(mutex->owner);
-    mark_list(&mutex->waiting);
-}
-
-static void
-finalize_mutex(Mutex *mutex)
-{
-    finalize_list(&mutex->waiting);
-}
-
-static void
-free_mutex(Mutex *mutex)
-{
-    kill_waiting_threads(&mutex->waiting);
-    finalize_mutex(mutex);
-    xfree(mutex);
-}
-
-static void
-init_mutex(Mutex *mutex)
-{
-    mutex->owner = Qnil;
-    init_list(&mutex->waiting);
-}
-
-/*
- * Document-method: new
- * call-seq: Mutex.new
- * 
- * Creates a new Mutex
- *
- */
-
-static VALUE 
-rb_mutex_alloc(VALUE klass)
-{
-    Mutex *mutex;
-    mutex = ALLOC(Mutex);
-    init_mutex(mutex);
-    return Data_Wrap_Struct(klass, mark_mutex, free_mutex, mutex);
-}
-
-/*
- * Document-method: locked?
- * call-seq: locked?
- *
- * Returns +true+ if this lock is currently held by some thread.
- *
- */
-
-static VALUE
-rb_mutex_locked_p(VALUE self)
-{
-    Mutex *mutex;
-    Data_Get_Struct(self, Mutex, mutex);
-    return MUTEX_LOCKED_P(mutex) ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: try_lock
- * call-seq: try_lock
- *
- * Attempts to obtain the lock and returns immediately. Returns +true+ if the
- * lock was granted.
- *
- */
-
-static VALUE
-rb_mutex_try_lock(VALUE self)
-{
-    Mutex *mutex;
-
-    Data_Get_Struct(self, Mutex, mutex);
-
-    if (MUTEX_LOCKED_P(mutex))
-        return Qfalse;
-
-    mutex->owner = rb_thread_current();
-    return Qtrue;
-}
-
-/*
- * Document-method: lock
- * call-seq: lock
- *
- * Attempts to grab the lock and waits if it isn't available.
- *
- */
-
-static VALUE
-lock_mutex(Mutex *mutex)
-{
-    VALUE current;
-    current = rb_thread_current();
-
-    rb_thread_critical = 1;
-
-    if (!MUTEX_LOCKED_P(mutex)) {
-	mutex->owner = current;
-    }
-    else {
-	do {
-	    wait_list(&mutex->waiting);
-	    rb_thread_critical = 1;
-	    if (!MUTEX_LOCKED_P(mutex)) {
-		mutex->owner = current;
-		break;
-	    }
-	} while (mutex->owner != current);
-    }
-
-    rb_thread_critical = 0;
-    return Qnil;
-}
-
-static VALUE
-rb_mutex_lock(VALUE self)
-{
-    Mutex *mutex;
-    Data_Get_Struct(self, Mutex, mutex);
-    lock_mutex(mutex);
-    return self;
-}
-
-static VALUE
-relock_mutex(Mutex *mutex)
-{
-    VALUE current = rb_thread_current();
-
-    switch (rb_thread_status(current)) {
-      case THREAD_RUNNABLE:
-      case THREAD_STOPPED:
-	lock_mutex(mutex);
-	break;
-      default:
-	break;
-    }
-    return Qundef;
-}
-
-/*
- * Document-method: unlock
- *
- * Releases the lock. Returns +nil+ if ref wasn't locked.
- *
- */
-
-static VALUE
-unlock_mutex_inner(Mutex *mutex)
-{
-    VALUE waking;
-
-    if (mutex->owner != rb_thread_current()) {
-	rb_raise(rb_eThreadError, "not owner");
-    }
-
-    waking = wake_one(&mutex->waiting);
-    mutex->owner = waking;
-
-    return waking;
-}
-
-static VALUE
-set_critical(VALUE value)
-{
-    rb_thread_critical = (int)value;
-    return Qundef;
-}
-
-static VALUE
-unlock_mutex(Mutex *mutex)
-{
-    VALUE waking = thread_exclusive(unlock_mutex_inner, (VALUE)mutex);
-
-    if (!RTEST(waking)) {
-        return Qfalse;
-    }
-
-    run_thread(waking);
-
-    return Qtrue;
-}
-
-static VALUE
-rb_mutex_unlock(VALUE self)
-{
-    Mutex *mutex;
-    Data_Get_Struct(self, Mutex, mutex);
-
-    if (RTEST(unlock_mutex(mutex))) {
-        return self;
-    } else {
-        return Qnil;
-    }
-}
-
-/*
- * Document-method: exclusive_unlock
- * call-seq: exclusive_unlock { ... }
- *
- * If the mutex is locked, unlocks the mutex, wakes one waiting thread, and
- * yields in a critical section.
- *
- */
-
-static VALUE
-rb_mutex_exclusive_unlock_inner(Mutex *mutex)
-{
-    VALUE waking;
-    waking = unlock_mutex_inner(mutex);
-    rb_yield(Qundef);
-    return waking;
-}
-
-static VALUE
-rb_mutex_exclusive_unlock(VALUE self)
-{
-    Mutex *mutex;
-    VALUE waking;
-    Data_Get_Struct(self, Mutex, mutex);
-
-    waking = thread_exclusive(rb_mutex_exclusive_unlock_inner, (VALUE)mutex);
-
-    if (!RTEST(waking)) {
-        return Qnil;
-    }
-
-    run_thread(waking);
-
-    return self;
-}
-
-/*
- * Document-method: synchronize
- * call-seq: synchronize { ... }
- *
- * Obtains a lock, runs the block, and releases the lock when the block
- * completes.  See the example under Mutex.
- *
- */
-
-static VALUE
-rb_mutex_synchronize(VALUE self)
-{
-    rb_mutex_lock(self);
-    return rb_ensure(rb_yield, Qundef, rb_mutex_unlock, self);
-}
-
-/*
- * Document-class: ConditionVariable
- *
- * ConditionVariable objects augment class Mutex. Using condition variables,
- * it is possible to suspend while in the middle of a critical section until a
- * resource becomes available.
- *
- * Example:
- *
- *   require 'thread'
- *
- *   mutex = Mutex.new
- *   resource = ConditionVariable.new
- *
- *   a = Thread.new {
- *     mutex.synchronize {
- *       # Thread 'a' now needs the resource
- *       resource.wait(mutex)
- *       # 'a' can now have the resource
- *     }
- *   }
- *
- *   b = Thread.new {
- *     mutex.synchronize {
- *       # Thread 'b' has finished using the resource
- *       resource.signal
- *     }
- *   }
- *
- */
-
-typedef struct _ConditionVariable {
-    List waiting;
-} ConditionVariable;
-
-static void
-mark_condvar(ConditionVariable *condvar)
-{
-    mark_list(&condvar->waiting);
-}
-
-static void
-finalize_condvar(ConditionVariable *condvar)
-{
-    finalize_list(&condvar->waiting);
-}
-
-static void
-free_condvar(ConditionVariable *condvar)
-{
-    kill_waiting_threads(&condvar->waiting);
-    finalize_condvar(condvar);
-    xfree(condvar);
-}
-
-static void
-init_condvar(ConditionVariable *condvar)
-{
-    init_list(&condvar->waiting);
-}
-
-/*
- * Document-method: new
- * call-seq: ConditionVariable.new
- *
- * Creates a new ConditionVariable
- *
- */
-
-static VALUE
-rb_condvar_alloc(VALUE klass)
-{
-    ConditionVariable *condvar;
-
-    condvar = ALLOC(ConditionVariable);
-    init_condvar(condvar);
-
-    return Data_Wrap_Struct(klass, mark_condvar, free_condvar, condvar);
-}
-
-/*
- * Document-method: wait
- * call-seq: wait
- *
- * Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
- *
- */
-
-static void
-wait_condvar(ConditionVariable *condvar, Mutex *mutex)
-{
-    VALUE waking;
-
-    rb_thread_critical = 1;
-    if (rb_thread_current() != mutex->owner) {
-        rb_thread_critical = 0;
-        rb_raise(rb_eThreadError, "not owner of the synchronization mutex");
-    }
-    waking = unlock_mutex_inner(mutex);
-    if (RTEST(waking)) {
-	wake_thread(waking);
-    }
-    rb_ensure(wait_list, (VALUE)&condvar->waiting, relock_mutex, (VALUE)mutex);
-}
-
-static VALUE
-legacy_exclusive_unlock(VALUE mutex)
-{
-    return rb_funcall(mutex, rb_intern("exclusive_unlock"), 0);
-}
-
-typedef struct {
-    ConditionVariable *condvar;
-    VALUE mutex;
-} legacy_wait_args;
-
-static VALUE
-legacy_wait(VALUE unused, legacy_wait_args *args)
-{
-    wait_list(&args->condvar->waiting);
-    rb_funcall(args->mutex, rb_intern("lock"), 0);
-    return Qnil;
-}
-
-static VALUE
-rb_condvar_wait(VALUE self, VALUE mutex_v)
-{
-    ConditionVariable *condvar;
-    Data_Get_Struct(self, ConditionVariable, condvar);
-
-    if (CLASS_OF(mutex_v) != rb_cMutex) {
-        /* interoperate with legacy mutex */
-        legacy_wait_args args;
-        args.condvar = condvar;
-        args.mutex = mutex_v;
-        rb_iterate(legacy_exclusive_unlock, mutex_v, legacy_wait, (VALUE)&args);
-    } else {
-        Mutex *mutex;
-        Data_Get_Struct(mutex_v, Mutex, mutex);
-        wait_condvar(condvar, mutex);
-    }
-
-    return self;
-}
-
-/*
- * Document-method: broadcast
- * call-seq: broadcast
- *
- * Wakes up all threads waiting for this condition.
- *
- */
-
-static VALUE
-rb_condvar_broadcast(VALUE self)
-{
-    ConditionVariable *condvar;
-
-    Data_Get_Struct(self, ConditionVariable, condvar);
-  
-    thread_exclusive(wake_all, (VALUE)&condvar->waiting);
-    rb_thread_schedule();
-
-    return self;
-}
-
-/*
- * Document-method: signal
- * call-seq: signal
- *
- * Wakes up the first thread in line waiting for this condition.
- *
- */
-
-static void
-signal_condvar(ConditionVariable *condvar)
-{
-    VALUE waking = thread_exclusive(wake_one, (VALUE)&condvar->waiting);
-
-    if (RTEST(waking)) {
-        run_thread(waking);
-    }
-}
-
-static VALUE
-rb_condvar_signal(VALUE self)
-{
-    ConditionVariable *condvar;
-    Data_Get_Struct(self, ConditionVariable, condvar);
-    signal_condvar(condvar);
-    return self;
-}
-
-/*
- * Document-class: Queue
- *
- * This class provides a way to synchronize communication between threads.
- *
- * Example:
- *
- *   require 'thread'
- *
- *   queue = Queue.new
- *
- *   producer = Thread.new do
- *     5.times do |i|
- *       sleep rand(i) # simulate expense
- *       queue << i
- *       puts "#{i} produced"
- *     end
- *   end
- *
- *   consumer = Thread.new do
- *     5.times do |i|
- *       value = queue.pop
- *       sleep rand(i/2) # simulate expense
- *       puts "consumed #{value}"
- *     end
- *   end
- *
- *   consumer.join
- *
- */
-
-typedef struct _Queue {
-    Mutex mutex;
-    ConditionVariable value_available;
-    ConditionVariable space_available;
-    List values;
-    unsigned long capacity;
-} Queue;
-
-static void
-mark_queue(Queue *queue)
-{
-    mark_mutex(&queue->mutex);
-    mark_condvar(&queue->value_available);
-    mark_condvar(&queue->space_available);
-    mark_list(&queue->values);
-}
-
-static void
-finalize_queue(Queue *queue)
-{
-    finalize_mutex(&queue->mutex);
-    finalize_condvar(&queue->value_available);
-    finalize_condvar(&queue->space_available);
-    finalize_list(&queue->values);
-}
-
-static void
-free_queue(Queue *queue)
-{
-    kill_waiting_threads(&queue->mutex.waiting);
-    kill_waiting_threads(&queue->space_available.waiting);
-    kill_waiting_threads(&queue->value_available.waiting);
-    finalize_queue(queue);
-    xfree(queue);
-}
-
-static void
-init_queue(Queue *queue)
-{
-    init_mutex(&queue->mutex);
-    init_condvar(&queue->value_available);
-    init_condvar(&queue->space_available);
-    init_list(&queue->values);
-    queue->capacity = 0;
-}
-
-/*
- * Document-method: new
- * call-seq: new
- *
- * Creates a new queue.
- *
- */
-
-static VALUE
-rb_queue_alloc(VALUE klass)
-{
-    Queue *queue;
-    queue = ALLOC(Queue);
-    init_queue(queue);
-    return Data_Wrap_Struct(klass, mark_queue, free_queue, queue);
-}
-
-static VALUE
-rb_queue_marshal_load(VALUE self, VALUE data)
-{
-    Queue *queue;
-    VALUE array;
-    Data_Get_Struct(self, Queue, queue);
-
-    array = rb_marshal_load(data);
-    if (TYPE(array) != T_ARRAY) {
-	rb_raise(rb_eTypeError, "expected Array of queue data");
-    }
-    if (RARRAY(array)->len < 1) {
-	rb_raise(rb_eArgError, "missing capacity value");
-    }
-    queue->capacity = NUM2ULONG(rb_ary_shift(array));
-    push_multiple_list(&queue->values, RARRAY(array)->ptr, (unsigned)RARRAY(array)->len);
-
-    return self;
-}
-
-static VALUE
-rb_queue_marshal_dump(VALUE self)
-{
-    Queue *queue;
-    VALUE array;
-    Data_Get_Struct(self, Queue, queue);
-
-    array = array_from_list(&queue->values);
-    rb_ary_unshift(array, ULONG2NUM(queue->capacity));
-    return rb_marshal_dump(array, Qnil);
-}
-
-/*
- * Document-method: clear
- * call-seq: clear
- *
- * Removes all objects from the queue.
- *
- */
-
-static VALUE
-rb_queue_clear(VALUE self)
-{
-    Queue *queue;
-    Data_Get_Struct(self, Queue, queue);
-
-    lock_mutex(&queue->mutex);
-    clear_list(&queue->values);
-    signal_condvar(&queue->space_available);
-    unlock_mutex(&queue->mutex);
-
-    return self;
-}
-
-/*
- * Document-method: empty?
- * call-seq: empty?
- *
- * Returns +true+ if the queue is empty.
- *
- */
-
-static VALUE
-rb_queue_empty_p(VALUE self)
-{
-    Queue *queue;
-    VALUE result;
-    Data_Get_Struct(self, Queue, queue);
-
-    lock_mutex(&queue->mutex);
-    result = queue->values.size == 0 ? Qtrue : Qfalse;
-    unlock_mutex(&queue->mutex);
-
-    return result;
-}
-
-/*
- * Document-method: length
- * call-seq: length
- *
- * Returns the length of the queue.
- *
- */
-
-static VALUE
-rb_queue_length(VALUE self)
-{
-    Queue *queue;
-    VALUE result;
-    Data_Get_Struct(self, Queue, queue);
-
-    lock_mutex(&queue->mutex);
-    result = ULONG2NUM(queue->values.size);
-    unlock_mutex(&queue->mutex);
-
-    return result;
-}
-
-/*
- * Document-method: num_waiting
- * call-seq: num_waiting
- *
- * Returns the number of threads waiting on the queue.
- *
- */
-
-static VALUE
-rb_queue_num_waiting(VALUE self)
-{
-    Queue *queue;
-    VALUE result;
-    Data_Get_Struct(self, Queue, queue);
-
-    lock_mutex(&queue->mutex);
-    result = ULONG2NUM(queue->value_available.waiting.size +
-      queue->space_available.waiting.size);
-    unlock_mutex(&queue->mutex);
-
-    return result;
-}
-
-/*
- * Document-method: pop
- * call_seq: pop(non_block=false)
- *
- * Retrieves data from the queue.  If the queue is empty, the calling thread is
- * suspended until data is pushed onto the queue.  If +non_block+ is true, the
- * thread isn't suspended, and an exception is raised.
- *
- */
-
-static VALUE
-rb_queue_pop(int argc, VALUE *argv, VALUE self)
-{
-    Queue *queue;
-    int should_block;
-    VALUE result;
-    Data_Get_Struct(self, Queue, queue);
-
-    if (argc == 0) {
-        should_block = 1;
-    } else if (argc == 1) {
-        should_block = !RTEST(argv[0]);
-    } else {
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
-    }
-
-    lock_mutex(&queue->mutex);
-    if (!queue->values.entries && !should_block) {
-        unlock_mutex(&queue->mutex);
-        rb_raise(rb_eThreadError, "queue empty");
-    }
-
-    while (!queue->values.entries) {
-        wait_condvar(&queue->value_available, &queue->mutex);
-    }
-
-    result = shift_list(&queue->values);
-    if (queue->capacity && queue->values.size < queue->capacity) {
-        signal_condvar(&queue->space_available);
-    }
-    unlock_mutex(&queue->mutex);
-
-    return result;
-}
-
-/*
- * Document-method: push
- * call-seq: push(obj)
- *
- * Pushes +obj+ to the queue.
- *
- */
-
-static VALUE
-rb_queue_push(VALUE self, VALUE value)
-{
-    Queue *queue;
-    Data_Get_Struct(self, Queue, queue);
-
-    lock_mutex(&queue->mutex);
-    while (queue->capacity && queue->values.size >= queue->capacity) {
-        wait_condvar(&queue->space_available, &queue->mutex);
-    }
-    push_list(&queue->values, value);
-    signal_condvar(&queue->value_available);
-    unlock_mutex(&queue->mutex);
-
-    return self;
-}
-
-/*
- * Document-class: SizedQueue
- *
- * This class represents queues of specified size capacity.  The push operation
- * may be blocked if the capacity is full.
- *
- * See Queue for an example of how a SizedQueue works.
- *
- */
-
-/*
- * Document-method: new
- * call-seq: new
- *
- * Creates a fixed-length queue with a maximum size of +max+.
- *
- */
-
-/*
- * Document-method: max
- * call-seq: max
- *
- * Returns the maximum size of the queue.
- *
- */
-
-static VALUE
-rb_sized_queue_max(VALUE self)
-{
-    Queue *queue;
-    VALUE result;
-    Data_Get_Struct(self, Queue, queue);
-
-    lock_mutex(&queue->mutex);
-    result = ULONG2NUM(queue->capacity);
-    unlock_mutex(&queue->mutex);
-
-    return result;
-}
-
-/*
- * Document-method: max=
- * call-seq: max=(size)
- *
- * Sets the maximum size of the queue.
- *
- */
-
-static VALUE
-rb_sized_queue_max_set(VALUE self, VALUE value)
-{
-    Queue *queue;
-    unsigned long new_capacity;
-    unsigned long difference;
-    Data_Get_Struct(self, Queue, queue);
-
-    new_capacity = NUM2ULONG(value);
-
-    if (new_capacity < 1) {
-        rb_raise(rb_eArgError, "value must be positive");
-    }
-
-    lock_mutex(&queue->mutex);
-    if (queue->capacity && new_capacity > queue->capacity) {
-        difference = new_capacity - queue->capacity;
-    } else {
-        difference = 0;
-    }
-    queue->capacity = new_capacity;
-    for (; difference > 0; --difference) {
-        signal_condvar(&queue->space_available);
-    }
-    unlock_mutex(&queue->mutex);
-
-    return self;
-}
-
-/*
- * Document-method: push
- * call-seq: push(obj)
- *
- * Pushes +obj+ to the queue.  If there is no space left in the queue, waits
- * until space becomes available.
- *
- */
-
-/*
- * Document-method: pop
- * call-seq: pop(non_block=false)
- *
- * Retrieves data from the queue and runs a waiting thread, if any.
- *
- */
-
-/* for marshalling mutexes and condvars */
-
-static VALUE
-dummy_load(VALUE self, VALUE string)
-{
-    return Qnil;
-}
-
-static VALUE
-dummy_dump(VALUE self)
-{
-    return rb_str_new2("");
-}
-
-void
-Init_thread(void)
-{
-    rb_define_singleton_method(rb_cThread, "exclusive", rb_thread_exclusive, 0);
-
-    rb_cMutex = rb_define_class("Mutex", rb_cObject);
-    rb_define_alloc_func(rb_cMutex, rb_mutex_alloc);
-    rb_define_method(rb_cMutex, "marshal_load", dummy_load, 1);
-    rb_define_method(rb_cMutex, "marshal_dump", dummy_dump, 0);
-    rb_define_method(rb_cMutex, "locked?", rb_mutex_locked_p, 0);
-    rb_define_method(rb_cMutex, "try_lock", rb_mutex_try_lock, 0);
-    rb_define_method(rb_cMutex, "lock", rb_mutex_lock, 0);
-    rb_define_method(rb_cMutex, "unlock", rb_mutex_unlock, 0);
-    rb_define_method(rb_cMutex, "exclusive_unlock", rb_mutex_exclusive_unlock, 0);
-    rb_define_method(rb_cMutex, "synchronize", rb_mutex_synchronize, 0);
-
-    rb_cConditionVariable = rb_define_class("ConditionVariable", rb_cObject);
-    rb_define_alloc_func(rb_cConditionVariable, rb_condvar_alloc);
-    rb_define_method(rb_cConditionVariable, "marshal_load", dummy_load, 1);
-    rb_define_method(rb_cConditionVariable, "marshal_dump", dummy_dump, 0);
-    rb_define_method(rb_cConditionVariable, "wait", rb_condvar_wait, 1);
-    rb_define_method(rb_cConditionVariable, "broadcast", rb_condvar_broadcast, 0);
-    rb_define_method(rb_cConditionVariable, "signal", rb_condvar_signal, 0);
-
-    rb_cQueue = rb_define_class("Queue", rb_cObject);
-    rb_define_alloc_func(rb_cQueue, rb_queue_alloc);
-    rb_define_method(rb_cQueue, "marshal_load", rb_queue_marshal_load, 1);
-    rb_define_method(rb_cQueue, "marshal_dump", rb_queue_marshal_dump, 0);
-    rb_define_method(rb_cQueue, "clear", rb_queue_clear, 0);
-    rb_define_method(rb_cQueue, "empty?", rb_queue_empty_p, 0);
-    rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
-    rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
-    rb_define_method(rb_cQueue, "pop", rb_queue_pop, -1);
-    rb_define_method(rb_cQueue, "push", rb_queue_push, 1);
-    rb_alias(rb_cQueue, rb_intern("enq"), rb_intern("push"));
-    rb_alias(rb_cQueue, rb_intern("<<"), rb_intern("push"));
-    rb_alias(rb_cQueue, rb_intern("deq"), rb_intern("pop"));
-    rb_alias(rb_cQueue, rb_intern("shift"), rb_intern("pop"));
-    rb_alias(rb_cQueue, rb_intern("size"), rb_intern("length"));
-
-    rb_cSizedQueue = rb_define_class("SizedQueue", rb_cQueue);
-    rb_define_method(rb_cSizedQueue, "initialize", rb_sized_queue_max_set, 1);
-    rb_define_method(rb_cSizedQueue, "num_waiting", rb_queue_num_waiting, 0);
-    rb_define_method(rb_cSizedQueue, "pop", rb_queue_pop, -1);
-    rb_define_method(rb_cSizedQueue, "push", rb_queue_push, 1);
-    rb_define_method(rb_cSizedQueue, "max", rb_sized_queue_max, 0);
-    rb_define_method(rb_cSizedQueue, "max=", rb_sized_queue_max_set, 1);
-    rb_alias(rb_cSizedQueue, rb_intern("enq"), rb_intern("push"));
-    rb_alias(rb_cSizedQueue, rb_intern("<<"), rb_intern("push"));
-    rb_alias(rb_cSizedQueue, rb_intern("deq"), rb_intern("pop"));
-    rb_alias(rb_cSizedQueue, rb_intern("shift"), rb_intern("pop"));
-}
-
diff --git a/ext/tk/.cvsignore b/ext/tk/.cvsignore
index 44e7f262dc..90c83ed9b1 100644
--- a/ext/tk/.cvsignore
+++ b/ext/tk/.cvsignore
@@ -1,3 +1,3 @@
 Makefile
-mkmf.log
 *.log
+*.def
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index 359b466a32..4aa9cb61d6 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -1,3 +1,34 @@
+2009-07-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/*: update release.
+	     Tcllib 1.8/Tklib 0.4.1  ==>  Tcllib 1.11.1/Tklib 0.5
+	     BWidgets 1.7            ==>  BWidgets 1.8
+	     TkTable 2.9             ==>  TkTable 2.10
+	     TkTreeCtrl 2005-12-02   ==>  TkTreeCtrl 2.2.9
+	     Tile 0.8.0/8.5.1        ==>  Tile 0.8.3/8.6b1
+	     IncrTcl 2005-02-14      ==>  IncrTcl 2008-12-15
+	     TclX 2005-02-07         ==>  TclX 2008-12-15
+	     Trofs 0.4.3             ==>  Trofs 0.4.4
+
+--------------< ... some bug fixes ... >------------------
+
+Tue Nov 25 03:37:42 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/blt/tabset.rb, 
+	  ext/tk/lib/tkextlib/blt/tabnotebook.rb: 
+	  fix many bugs. Now, those work properly.
+
+Sat Nov 22 10:31:25 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: 
+	  fix NameError bug.
+
+2008-05-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.
+
+--------------< ... some changes ... >------------------
+
 2007-05-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/tcllib/tablelist.rb: fix typo.
diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng
index 1db61f228e..c139947da4 100644
--- a/ext/tk/MANUAL_tcltklib.eng
+++ b/ext/tk/MANUAL_tcltklib.eng
@@ -125,7 +125,23 @@ module TclTklib
          : Tcl7.6 doesn't have this flag. So PARSE_VARNAME is 
          : defined as 0. 
 
+  module TclTkLib::RELEASE_TYPE
+    : Defines release type number of Tcl/Tk
+
+       ALPHA
+         : ALPHA release
+
+       BETA
+         : BETA release
+
+       FINAL
+         : FINAL release
+
   [module methods]
+     get_version()
+        : return an array of major, minor, release-type number, 
+        : and patchlevel of current Tcl/Tk library.
+
      mainloop(check_root = true)
        : Starts the eventloop. If 'check_root' is true, this method 
        : doesn't return when a root widget exists. 
@@ -337,6 +353,11 @@ class TclTkIp
        : to _eval and regist the command once, after that, the
        : command can be called by _invoke. 
 
+    _cancel_eval(str)
+    _cancel_eval_unwind(str)
+       : (Tcl/Tk8.6 or later)
+       : Call Tcl_CancelEval() function, and cancel evaluation.
+
     _toUTF8(str, encoding=nil)
     _fromUTF8(str, encoding=nil)
        : Call the function (which is internal function of Tcl/Tk) to
@@ -431,6 +452,10 @@ class TclTkIp
        : slave interpreter, same to the TclTkLib module method with
        : the same name. 
 
+    encoding_table
+       : For Ruby m17n. Return encoding relation table between Ruby's 
+       : Encoding object and Tcl's encoding name.
+
 class TkCallbackBreak < StandardError
 class TkCallbackContinue < StandardError
   : They are exception classes to break or continue the Tk callback 
@@ -441,5 +466,8 @@ class TkCallbackContinue < StandardError
   : If raise TkCallbackContinue, returns 'continue' code (Then the Tk
   : interpreter will break the operateion for the current bindtag and 
   : starts the operation for the next buindtag for the current event).
+  : However, current tcltklib supports Ruby's 'break' and 'next' to 
+  : get the same effect. That is, those classes are obsolete. Those 
+  : exist for backward compatibility. 
 
 (eof)
diff --git a/ext/tk/MANUAL_tcltklib.eucj b/ext/tk/MANUAL_tcltklib.eucj
index 5dd36726ba..26b39f7943 100644
--- a/ext/tk/MANUAL_tcltklib.eucj
+++ b/ext/tk/MANUAL_tcltklib.eucj
@@ -221,7 +221,23 @@ require "tcltklib" �����, �ʲ��Υ⥸�塼��, ���饹�����Ѳ�ǽ�Ǥ�.
          : ������Ф����Ϥ��Ǥ��뤫�顤index_name ������ nil ��
          : ���ͤФʤ�ʤ���
 
+   �⥸�塼�� TclTkLib::RELEASE_TYPE
+      : Tcl/Tk �Υ�꡼���������ֹ�����
+
+      ���  ALPHA
+         : ALPHA ��꡼��
+
+      ���  BETA
+         : BETA ��꡼��
+
+      ���  FINAL
+         : FINAL ��꡼��
+
    �⥸�塼��᥽�å�
+      get_version()
+         : Tcl/Tk �� major, minor, release-type �ֹ�, patchlevel ��
+         : ����ˤ����֤���
+
       mainloop(check_root = true)
          : ���٥�ȥ롼�פ�ư���롥check_root �� true �Ǥ���С�
          : root widget ��¸�ߤ���¤ꡤ���Υ᥽�åɤϽ�λ���ʤ���
@@ -448,6 +464,11 @@ require "tcltklib" �����, �ʲ��Υ⥸�塼��, ���饹�����Ѳ�ǽ�Ǥ�.
          : ������Ͽ����������������С��ʹߤ� _invoke �Ǥ����Ѥ�
          : ����褦�ˤʤ롥
 
+      _cancel_eval(str)
+      _cancel_eval_unwind(str)
+         : (Tcl/Tk8.6 or later)
+         : Tcl_CancelEval() �ؿ���ƤӽФ���eval �μ¹Ԥ��Ǥ��ڤ롥
+
       _toUTF8(str, encoding=nil)
       _fromUTF8(str, encoding=nil)
          : Tcl/Tk ����¢���Ƥ��� UTF8 �Ѵ�������ƤӽФ���
@@ -543,6 +564,9 @@ require "tcltklib" �����, �ʲ��Υ⥸�塼��, ���饹�����Ѳ�ǽ�Ǥ�.
          : ���졼�� IP �ξ��ˤ��ͤ����꤬������ʤ� (̵�뤵���)��
          : ����ʳ������Ǥϰ�����ޤ�� TclTkLib ��Ʊ̾�᥽�åɤ�Ʊ����
 
+      encoding_table
+         : Ruby m17n �Ѥ� Ruby �� Tk �Ȥδ֤� encoding �б�ɽ���֤���
+
 ���饹 TkCallbackBreak < StandardError
 ���饹 TkCallbackContinue < StandardError
    : �����ϥ��٥�ȥ�����Хå��ˤ����ơ�������Хå�������Ŭ�ڤ���
@@ -553,5 +577,8 @@ require "tcltklib" �����, �ʲ��Υ⥸�塼��, ���饹�����Ѳ�ǽ�Ǥ�.
    : �ɤ��֤�ɬ�פ����롥Ruby �μ�³�������̤��ͤ��֤��ΤǤϡ����줬��
    : �̤�����ͤǤ���Τ��ݤ�����̤��Ǥ��ʤ����ᡤ�㳰ȯ�������Ѥ���
    : ������ԤäƤ��롥
+   : ���������ߤǤϡ�������Хå���³���� Ruby �� break, next �ǽ�λ��
+   : �뤳�Ȥ�Ʊ���η�̤����뤳�Ȥ��Ǥ���褦�ˤʤäƤ��롥����椨��
+   : ������ɬ�פʤ���ΤǤϤ��뤬���ߴ����Τ���˻Ĥ��Ƥ��롥
 
 (eof)
diff --git a/ext/tk/README.1st b/ext/tk/README.1st
index df6c819d26..fce5b0242b 100644
--- a/ext/tk/README.1st
+++ b/ext/tk/README.1st
@@ -1,7 +1,6 @@
 If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so 
-which is working correctly. If you fail to call 'require "tcltklib"', 
-you may not have tcltklib.so. When you have some troubles on compiling
-tcltklib, please read README files on tcltklib. 
+which is working correctly. When you have some troubles on compiling, 
+please read README.tcltklib and README.ActiveTcl. 
 Even if there is a tcltklib.so on your Ruby library directry, it will not 
 work without Tcl/Tk libraries (e.g. libtcl8.4.so) on your environment. 
 You must also check that your Tcl/Tk is installed properly. 
@@ -9,11 +8,9 @@ You must also check that your Tcl/Tk is installed properly.
 --------------------------------------------
  ( the following is written in EUC-JP )
 
-Ruby/Tk (tk.rb �ʤ�) ��Ȥ��������ˤϡ�tcltklib.so ��������ư����
-���ʤ���Фʤ�ޤ��󡥤⤷ 'require "tcltklib"' �˼��Ԥ���褦�ʤ顤
-tcltklib.so �����󥹥ȡ��뤵��Ƥ��ʤ��Τ��⤷��ޤ���tcltklib ��
-����ѥ�����˲������꤬�����Ƥ�����ϡ�tcltklib �� README �ե�����
-�򸫤Ƥ���������
+Ruby/Tk (tk.rb �ʤ�) ��Ȥ��������ˤϡ�tcltklib.so ��������ư���Ƥ���
+����Фʤ�ޤ��󡥥���ѥ�����˲������꤬���������ϡ�README.tcltklib 
+�� README.ActiveTcl �򸫤Ƥ���������
 ���Ȥ� Ruby �Υ饤�֥��ǥ��쥯�ȥ�� tcltklib.so ��¸�ߤ��Ƥ����Ȥ���
 �⡤�¹ԴĶ��� Tcl/Tk �饤�֥�� (libtcl8.4.so �ʤ�) ���ʤ���е�ǽ����
 ����Tcl/Tk �����������󥹥ȡ��뤵��Ƥ��뤫������å����Ƥ���������
diff --git a/ext/tk/README.ActiveTcl b/ext/tk/README.ActiveTcl
index 3afb3f4cf6..c0f9ef8fe4 100644
--- a/ext/tk/README.ActiveTcl
+++ b/ext/tk/README.ActiveTcl
@@ -3,9 +3,22 @@ ActiveTcl is ActiveState's quality-assured distribution of Tcl.
 # see <http://www.activestate.com/Products/ActiveTcl/>
 #     <http://www.tcl.tk/>
 
+First of all, please try to configure without any options.
+"extconf.rb" searches ActiveTcl as default action.
+If you have ActiveTcl and standard (or your own) Tcl/Tk on your
+environment and don't want to use ActiveTcl on your Ruby/Tk, please
+use --without-ActiveTcl option.
+
+When "extconf.rb" fails to find your ActiveTcl libraries, please try
+the followings.
+
 If you want to use ActiveTcl binary package as the Tcl/Tk libraries, 
 please use the following configure options.
 
+   --with-ActiveTcl=<ActiveTcl_root>
+     ( When without argument; no <ActiveTcl_root>; only '--with-ActiveTcl', 
+       it same to '--with-ActiveTcl=/opt/ActiveTcl*/lib' )
+
    --with-tcl-dir=<ActiveTcl_root>
    --with-tk-dir=<ActiveTcl_root>
 
diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
index e939ba1f51..251348e91a 100644
--- a/ext/tk/README.tcltklib
+++ b/ext/tk/README.tcltklib
@@ -1,14 +1,53 @@
 To compile 'tcltklib', you must have Tcl/Tk libraries on your environment. 
-Although 'extconf.rb' script searches Tcl/Tk libraries and header files, 
+Although 'extconf.rb' script searches Tcl/Tk libraries and header files
+(as default, searches tclConfig.sh/tkConfig.sh and use the defintions on
+those; ActiveTcl has high priority on searching unless --without-ActiveTcl),
 sometimes fails to find them. And then, 'tcltklib' cannot be compiled. If 
 Tcl/Tk libraries or header files are installed but are not found, you can 
 give the information by arguments of the 'configure' script. Please give 
 some or all of the following options. 
 
+ --with-tk-old-extconf         use old "extconf.rb" (default: false).
+                               If current extconf.rb doesn't work properly
+                               (or your install process is based on old 
+                               documant about Ruby/Tk install), please try
+			       this option.
+
+ --with-ActiveTcl / --without-ActiveTcl
+ --with-ActiveTcl=<dir>        search ActiveTcl libraries (default: true).
+                               When true, try to find installed ActiveTcl. 
+                               When <dir> is given, use it as the ActiveTcl's
+			       top directory (use <dir>/lib, and so on).
+                               Old "extconf.rb" doesn't support this option.
+
+ --with-tk-shlib-search-path=<paths>
+                               teach the paths for loading shared-libraries 
+                               to linker.
+                               <paths> is a path list with the same format 
+                               as PATH environment variable.
+                               This option may be experimental.
+                               Old "extconf.rb" doesn't support this option.
+
+ --with-tcltkversion=<version> 
+      force version of Tcl/Tk libaray
+      (e.g. libtcl8.4g.so ==> --with-tcltkversion=8.4g)
+
+ --without-tcl-config / --without-tk-config
+ --with-tclConfig-dir=<dir>       
+ --with-tkConfig-dir=<dir>     the directory contains 'tclConfig.sh' and 
+                               'tkConfig.sh'. 
+			       Current "extconf.rb" uses the information 
+                               on tclConfig.sh/tkConfig.rb, if possible.
+                               Old "extconf.rb" doesn't support this option.
+
  --with-tcllib=<libname>       (e.g. libtcl8.4.so ==> --with-tcllib=tcl8.4)
  --with-tklib=<libname>        (e.g. libtk8.4.so  ==> --with-tklib=tk8.4)
 
- --enable-tcltk_stubs          (if you force to enable stubs)
+ --enable-tcltk-stubs          (if you force to enable stubs)
+                               On old "extconf.rb", default is false.
+                               On current "extconf.rb", default is true when 
+                               tclConfig.sh/tkConfig.sh have TCL_STUB_LIB_SPEC
+                               /TK_STUB_LIB_SPEC, else default is false.
 
  --with-tcl-dir=<path> 
       equal to "--with-tcl-include=<path>/include --with-tcl-lib=<path>/lib"
@@ -16,22 +55,28 @@ some or all of the following options.
  --with-tk-dir=<path> 
       equal to "--with-tk-include=<path>/include --with-tk-lib=<path>/lib"
 
- --with-tcl-include=<dir>      the directry containts 'tcl.h'
- --with-tk-include=<dir>       the directry containts 'tk.h'
+ --with-tcl-include=<dir>      the directry contains 'tcl.h'
+ --with-tk-include=<dir>       the directry contains 'tk.h'
 
- --with-tcl-lib=<dir>          the directry containts 'libtcl<version>.so'
- --with-tk-lib=<dir>           the directry containts 'libtk<version>.so'
+ --with-tcl-lib=<dir>          the directry contains 'libtcl<version>.so'
+ --with-tk-lib=<dir>           the directry contains 'libtk<version>.so'
 
  --enable-mac-tcltk-framework  (MacOS X) use Tcl/Tk framework
                                (Obsolete. Please use '--enable-tcltk-framework'.)
 
  --enable-tcltk-framework      use Tcl/Tk framework
 
- --with-tcltk-framework=<dir>  the directory containts Tcl/Tk framework; 
+ --with-tcltk-framework=<dir>  the directory contains Tcl/Tk framework; 
                                "<dir>/Tcl.framework" and "<dir>/Tk.framework".
                                When this option is given, it is assumed that 
                                --enable-tcltk-framework option is given also.
 
+ --with-tcl-framework-dir=<dir>
+      Tcl framework directory (e.g. "/Library/Frameworks/Tcl.framework")
+
+ --with-tk-framework-dir=<dir>
+      Tk framework directory (e.g. "/Library/Frameworks/Tk.framework")
+
  --with-tcl-framework-header=<dir>
       Tcl framework headers directory 
       (e.g. "/Library/Frameworks/Tcl.framework/Headers")
@@ -46,8 +91,8 @@ some or all of the following options.
  --with-X11-dir=<path> 
       equal to "--with-X11-include=<path>/include --with-X11-lib=<path>/lib"
 
- --with-X11-include=<dir>      the directry contains X11 header files
- --with-X11-lib=<dir>          the directry contains X11 libraries
+ --with-X11-include=<dir>      the directry contais X11 header files
+ --with-X11-lib=<dir>          the directry contais X11 libraries
 
 
 If you forgot to give the options when do 'configure' on toplevel
@@ -68,6 +113,7 @@ options may be useful.
 
   --enable-tcl-thread/--disable-tcl-thread
   --with-tclConfig-file=<path of 'tclConfig.sh'>
+  --with-tkConfig-file=<path of 'tkConfig.sh'>
 
 It is not need that 'tclConfig.sh' is a normal Tcl/Tk's tclConfig.sh. 
 But the file is expected to include the line "TCL_THREADS=0" or "...=1".
diff --git a/ext/tk/config_list.in b/ext/tk/config_list.in
new file mode 100644
index 0000000000..ba61797e9b
--- /dev/null
+++ b/ext/tk/config_list.in
@@ -0,0 +1,37 @@
+##############################################
+# configure options for Ruby/Tk
+# release date:  2009-07-28
+##############################################
+with tk-old-extconf
+with ActiveTcl
+with tk-shlib-search-path
+enable tcltk-stubs
+with tcltkversion
+with tcl-config
+with tk-config
+with tclConfig-dir
+with tkConfig-dir
+with tclConfig-file
+with tkConfig-file
+with tcllib
+with tklib
+with tcl-dir
+with tk-dir
+with tcl-include
+with tk-include
+with tcl-lib
+with tk-lib
+enable mac-tcltk-framework
+enable tcltk-framework
+with tcltk-framework
+with tcl-framework-dir
+with tk-framework-dir
+with tcl-framework-header
+with tk-framework-header
+with X11
+with X11-dir
+with X11-include
+with X11-lib
+enable pthread
+enable tcl-thread
+enable space-on-tk-libpath
diff --git a/ext/tk/depend b/ext/tk/depend
index 2cd9c400f7..f7ba3229c1 100644
--- a/ext/tk/depend
+++ b/ext/tk/depend
@@ -1,2 +1,2 @@
-tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
-stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h
+stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 5ed86a8b76..2f68d01e7f 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1,56 +1,1035 @@
+##############################################################
 # extconf.rb for tcltklib
-
+# release date: 2010-07-30
+##############################################################
 require 'mkmf'
 
-is_win32 = (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM)
-#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
+TkLib_Config = {}
+TkLib_Config['search_versions'] =
+  # %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2]
+  # %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0]
+  %w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps
+
+TkLib_Config['major_nums'] = '87'
+
+
+##############################################################
+# use old extconf.rb ?
+##############################################################
+if with_config('tk-old-extconf')
+  require File.join(File.dirname(__FILE__), 'old-extconf.rb')
+  exit
+end
+
+
+##############################################################
+# check configs
+##############################################################
+($cleanfiles ||= "") << 'config_list'
+config_list_file = 'config_list'
+config_list_file_source = File.join(File.dirname(__FILE__),'config_list.in')
+if !File.exist?(config_list_file) ||
+    File.ctime(config_list_file_source) > File.ctime(config_list_file)
+  old_config_list_file = config_list_file_source
+else
+  old_config_list_file = config_list_file
+end
+
+current_configs = {'with'=>{}, 'enable'=>{}}
+
+# setup keys by config_list.in
+IO.foreach(config_list_file_source){|line|
+  line.chomp!
+  line.lstrip!
+  next if line.empty? || line =~ /^\#/ #
+  mode, key, value = line.split(/\s+/, 3)
+  value ||= ""
+  current_configs[mode][key] = value rescue nil
+}
+
+# define current value of keys
+IO.foreach(old_config_list_file){|line|
+  line.chomp!
+  line.lstrip!
+  next if line.empty? || line =~ /^\#/ #
+  mode, key, value = line.split(/\s+/, 3)
+  value ||= ""
+  if current_configs[mode] && current_configs[mode].has_key?(key)
+    current_configs[mode][key] = value
+  end
+}
+
+update_flag = false
+current_configs['with'].each_key{|key|
+  if (value = with_config(key).to_s) != current_configs['with'][key]
+    update_flag = true
+    current_configs['with'][key] = value
+  end
+}
+current_configs['enable'].each_key{|key|
+  if (value = enable_config(key).to_s) != current_configs['enable'][key]
+    update_flag = true
+    current_configs['enable'][key] = value
+  end
+}
+
+# update current_configs
+if update_flag || !File.exist?(config_list_file)
+  open(config_list_file, 'w'){|fobj|
+    fobj.print("# values of current configure options (generated by extconf.rb)\n");
+    ['with', 'enable'].each{|mode|
+      current_configs[mode].each_key{|key|
+        fobj.print("#{mode} #{key} #{current_configs[mode][key]}\n")
+      }
+    }
+  }
+end
+
+if update_flag
+  puts "Configure options for Ruby/Tk may be updated."
+  puts "So, delete files which depend on old configs."
+  File.delete(*Dir.glob("*.#{CONFIG['DLEXT']}", File::FNM_CASEFOLD))
+  File.delete(*Dir.glob("*.#{$OBJEXT}", File::FNM_CASEFOLD))
+  File.delete('Makefile') rescue nil
+
+else
+  makefile = 'Makefile'
+  if File.exist?(makefile) &&
+      File.ctime(config_list_file) > File.ctime(makefile)
+    # no need to update Makefile
+    exit
+  end
+end
+
+
+##############################################################
+# fuctions
+##############################################################
+def is_win32?
+  /mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
+end
+
+def is_macosx?
+ /darwin/ =~ RUBY_PLATFORM
+end
+
+def maybe_64bit?
+  /64|universal/ =~ RUBY_PLATFORM
+end
+
+def check_tcltk_version(version)
+  return [nil, nil] unless version.kind_of? String
+
+  tclver, tkver = version.split(',')
+  tclver = tclver.strip
+  return [tclver, tkver.strip] if tkver
+
+  dot = major = minor_dot = minor = plvl_dot = plvl = ext = nil
+  if tclver =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
+    major = $1; minor_dot = $2; minor = $3; plvl_dot = $4; plvl = $5; ext = $6
+    dot = ! minor_dot.empty?
+    if plvl_dot.empty? && ! plvl.empty?
+      minor << plvl
+    end
+  elsif tclver =~ /^(\d)(\.?)(\d?)(.*)$/
+    major = $1; minor_dot = $2; minor = $3; ext = $4
+    dot = ! minor_dot.empty?
+  else # unknown -> believe user
+    return [tclver, tkver]
+  end
+
+  # check Tcl7.6 / Tk4.2 ?
+  if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
+    # Tk4.2
+    tkver  = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
+  elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
+    # Tcl7.6
+    tkver = tclver
+    tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
+  end
+
+  tkver = tclver unless tkver
+
+  [tclver, tkver]
+end
+
+def get_shlib_versions(major = 8, minor_max = 9, minor_min = 0, ext = "")
+  if tclcfg = TkLib_Config["tclConfig_info"]
+    major = tclcfg['TCL_MAJOR_VERSION'].to_i
+    minor_min = tclcfg['TCL_MINOR_VERSION'].to_i
+
+  elsif TkLib_Config["tcltkversion"]
+    tclver, tkver = TkLib_Config["tcltkversion"]
+    if tclver =~ /8\.?(\d)(.*)/
+      minor_min = $1.to_i
+      ext = $2
+    else
+      # unsupported version
+      return [""]
+    end
+  end
+
+  # if disable-stubs, version is fixed.
+  minor_max = minor_min unless TkLib_Config["tcltk-stubs"]
+
+  vers = []
+  minor_max.downto(minor_min){|minor|
+    vers << "#{major}.#{minor}#{ext}" unless ext.empty?
+    vers << "#{major}.#{minor}"
+  }
+
+  vers << ""
+end
+
+def get_shlib_path_head
+  path_head = []
+  path_dirs = []
+
+  if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
+    # path_head << TkLib_Config["ActiveTcl"]
+    path_head.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
+    # path_dirs.concat Dir.glob(File.join(TkLib_Config["ActiveTcl"], 'lib'), File::FNM_CASEFOLD).sort.reverse
+  end
+
+  if CROSS_COMPILING
+  elsif is_win32?
+    if TkLib_Config["ActiveTcl"]
+      path_head.concat ["c:/ActiveTcl", "c:/Program Files/ActiveTcl",
+                        "c:/Program Files (x86)/ActiveTcl"]
+    end
+    path_head.concat [
+      "c:/Tcl", "c:/Program Files/Tcl", "c:/Program Files (x86)/Tcl",
+      "/Tcl", "/Program Files/Tcl", "/Program Files (x86)/Tcl"
+    ]
+    path_head.uniq!
+    #path_head.each{|dir| path_dirs << dir.dup if File.directory? dir}
+    path_head.each{|dir| path_dirs << File.expand_path(dir) if File.directory? dir}
+
+    # for MinGW
+    ["/usr/local/lib64", "/usr/lib64", "/usr/local/lib", "/usr/lib"].each{|dir|
+      #path_dirs << dir if File.directory? dir
+      path_dirs << File.expand_path(dir) if File.directory? dir
+    }
+    path_dirs |= ENV['LIBRARY_PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['LIBRARY_PATH']
+    path_dirs |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
 
-def find_framework(tcl_hdr, tk_hdr)
-  if framework_dir = with_config("tcltk-framework")
-    paths = [framework_dir]
   else
-    unless tcl_hdr || tk_hdr ||
-        enable_config("tcltk-framework", false) ||
-        enable_config("mac-tcltk-framework", false)
-      return false
+    [
+      '/opt', '/pkg', '/share',
+      '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
+      '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
+    ].each{|dir|
+      next unless File.directory?(dir)
+
+      path_dirs << "#{dir}/lib64" if maybe_64bit?
+      path_dirs << "#{dir}/lib"
+      path_dirs << "#{dir}" unless Dir.glob("#{dir}/lib*.*", File::FNM_CASEFOLD).empty?
+
+      dirnames = []
+      if TkLib_Config["ActiveTcl"]
+        dirnames.concat ["ActiveTcl"]
+      end
+      dirnames.concat ["TclTk","Tcl_Tk","Tcl-Tk"]
+
+      dirnames.each{|name|
+        path_dirs << "#{dir}/#{name}" if File.directory?("#{dir}/#{name}")
+        path_head << "#{dir}/#{name}" unless Dir.glob("#{dir}/#{name}[-89_]*", File::FNM_CASEFOLD).empty?
+      }
+    }
+  end
+
+  unless TkLib_Config["space-on-tk-libpath"]
+    path_head.delete_if{|path| path =~ / /}
+    path_dirs.delete_if{|path| path =~ / /}
+  end
+
+  [path_head, path_dirs]
+end
+
+def find_macosx_framework
+  use_framework = is_macosx? && TkLib_Config["ActiveTcl"]
+
+  use_framework ||= (tcl_hdr = with_config("tcl-framework-header"))
+  use_framework ||= (tk_hdr  = with_config("tk-framework-header"))
+  tcl_hdr = nil unless tcl_hdr.kind_of? String
+  tk_hdr  = nil unless tk_hdr.kind_of? String
+  TkLib_Config["tcl-framework-header"] = tcl_hdr
+  TkLib_Config["tk-framework-header"]  = tk_hdr
+
+  use_framework ||= (tcl_dir = with_config("tcl-framework-dir"))
+  tcl_dir = nil unless tcl_dir.kind_of? String
+  if !tcl_dir && tcl_hdr
+    # e.g. /Library/Frameworks/Tcl.framework/Headers
+    #       ==> /Library/Frameworks/Tcl.framework
+    tcl_dir = File.dirname(tcl_hdr.strip.chomp('/'))
+  end
+  TkLib_Config["tcl-framework-dir"] = tcl_dir
+
+  use_framework ||= (tk_dir = with_config("tk-framework-dir"))
+  tk_dir = nil unless tk_dir.kind_of? String
+  if !tk_dir && tk_hdr
+    # e.g. /Library/Frameworks/Tk.framework/Headers
+    #       ==> /Library/Frameworks/Tk.framework
+    tk_dir = File.dirname(tk_hdr.strip.chomp('/'))
+  end
+  TkLib_Config["tk-framework-dir"] = tk_dir
+
+  if tcl_dir && !tk_dir
+    tk_dir = File.join(File.dirname(tcl_dir), 'Tk.framework')
+    TkLib_Config["tk-framework-dir"] = tk_dir
+  elsif !tcl_dir && tk_dir
+    tcl_dir = File.join(File.dirname(tk_dir), 'Tcl.framework')
+    TkLib_Config["tcl-framework-dir"] = tcl_dir
+  end
+  if tcl_dir && tk_dir
+    TkLib_Config["tcltk-framework"] = File.dirname(tcl_dir) unless TkLib_Config["tcltk-framework"]
+    return [tcl_dir, tk_dir]
+  end
+
+  # framework is disabled?
+  if with_config("tcltk-framework") == false ||
+      enable_config("tcltk-framework") == false
+   return false
+  end
+
+  use_framework ||= (framework_dir = with_config("tcltk-framework"))
+  if framework_dir.kind_of? String
+    TkLib_Config["tcltk-framework"] = framework_dir.strip.chomp('/')
+    return [File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework'),
+            File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')]
+  end
+
+  unless enable_config("tcltk-framework", use_framework) ||
+      enable_config("mac-tcltk-framework", use_framework)
+    TkLib_Config["tcltk-framework"] = false
+    return false
+  end
+
+  paths = [
+    #"~/Library/Frameworks",
+    "/Library/Frameworks",
+    "/Network/Library/Frameworks", "/System/Library/Frameworks"
+  ]
+  paths.reverse! unless TkLib_Config["ActiveTcl"] # system has higher priority
+
+  paths.map{|dir| dir.strip.chomp('/')}.each{|dir|
+    next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
+    next unless File.directory?(tkdir  = File.join(dir, "Tk.framework"))
+    TkLib_Config["tcltk-framework"] = dir
+    return [tcldir, tkdir]
+  }
+
+  nil
+end
+
+def collect_tcltk_defs(tcl_defs_str, tk_defs_str)
+  conflicts = [
+    'PACKAGE_NAME', 'PACKAGE_TARNAME', 'PACKAGE_VERSION',
+    'PACKAGE_STRING', 'PACKAGE_BUGREPORT'
+  ]
+
+  begin
+    # Ruby 1.9.x or later
+    arch_config_h = RbConfig.expand($arch_hdrdir + "/ruby/config.h")
+    if File.exist?(arch_config_h)
+      keys = []
+      IO.foreach(arch_config_h){|line|
+        if line =~ /^#define +([^ ]+)/
+            keys << $1
+        end
+      }
+      conflicts = keys
     end
-    paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
+  rescue
+    # ignore, use default
+  end
+
+  if tcl_defs_str
+    tcl_defs = tcl_defs_str.split(/ ?-D/).map{|s|
+      s =~ /^([^=]+)(.*)$/
+      [$1, $2]
+    }
+  else
+    tcl_defs = []
   end
 
-  checking_for('Tcl/Tk Framework') {
-    paths.find{|dir|
-      dir.strip!
-      dir.chomp!('/')
-      (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
-        (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
+  if tk_defs_str
+    tk_defs = tk_defs_str.split(/ ?-D/).map{|s|
+      s =~ /^([^=]+)(.*)$/
+      [$1, $2]
     }
+  else
+    tk_defs = []
+  end
+
+  defs = tcl_defs | tk_defs
+
+  defs.delete_if{|name,value|
+    conflicts.include?(name) ||
+      ( (vtcl = tcl_defs.assoc(name)) && (vtk = tk_defs.assoc(name)) &&
+          vtcl != vtk )
   }
+
+  defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s}
 end
 
-tcl_framework_header = with_config("tcl-framework-header")
-tk_framework_header  = with_config("tk-framework-header")
+def parse_tclConfig(file)
+  # check tclConfig.sh/tkConfig.sh
+  tbl = Hash.new{|h,k| h[k] = ""}
+  return tbl unless file
+  IO.foreach(file){|line|
+    line.strip!
+    next if line !~ /^([^\#=][^=]*)=(['"]|)(.*)\2$/
+    key, val = $1, $3
+    tbl[key] = val.gsub(/\$\{([^}]+)\}/){|s|
+      subst = $1
+      (tbl[subst])? tbl[subst]: s
+    } rescue nil
+  }
+  tbl
+end
 
-tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
+def get_libpath(lib_flag, lib_spec)
+  # get libpath from {TCL,Tk}_LIB_FLAG and {TCL,Tk}_LIB_SPEC
+  lib_spec.gsub(/(#{lib_flag}|-L)/, "").strip
+end
 
-unless is_win32
-  have_library("nsl", "t_open")
-  have_library("socket", "socket")
-  have_library("dl", "dlopen")
-  have_library("m", "log") 
+def get_tclConfig_dirs
+  config_dir = []
+
+  if CROSS_COMPILING
+  elsif is_win32?
+    if TkLib_Config["ActiveTcl"]
+      dirs = []
+      if TkLib_Config["ActiveTcl"].kind_of?(String)
+        dirs << File.join(TkLib_Config["ActiveTcl"], 'lib')
+      end
+      dirs.concat [
+        "c:/ActiveTcl*/lib", "c:/Tcl*/lib",
+        "c:/Program Files*/ActiveTcl*/lib", "c:/Program Files*/Tcl*/lib",
+        "/ActiveTcl*/lib", "/Tcl*/lib",
+        "/Program Files*/ActiveTcl*/lib", "/Program Files*/Tcl*/lib"
+      ]
+    else
+      dirs = [
+        "c:/Tcl*/lib", "c:/Program Files*/Tcl*/lib",
+        "/Tcl*/lib", "/Program Files*/Tcl*/lib"
+      ]
+    end
+    dirs = dirs.collect{|d| Dir.glob(d, File::FNM_CASEFOLD)}.flatten.uniq
+
+    dirs |= ENV['LIBRARY_PATH'].split(';')  if ENV['LIBRARY_PATH']
+    dirs |= ENV['PATH'].split(';')  if ENV['PATH']
+
+    exeext = RbConfig::CONFIG['EXEEXT']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each{|dir|
+      dir.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+      next if Dir.glob(File.join(dir, "{tclsh,wish}*#{exeext}"), File::FNM_CASEFOLD).empty?
+      dirs << File.expand_path(File.join(dir, '..', 'lib'))
+      dirs << dir
+      # dirs << File.expand_path(File.join(dir, '..'))
+    }
+
+    unless TkLib_Config["space-on-tk-libpath"]
+      dirs.delete_if{|path| path =~ / /}
+    end
+
+    config_dir.concat(dirs.zip(dirs))
+
+  else
+    if framework = find_macosx_framework()
+      config_dir.unshift(framework)
+    end
+
+    if activeTcl = TkLib_Config['ActiveTcl']
+      # check latest version at first
+      if is_macosx?
+        base = File.expand_path(activeTcl)
+        config_dir << [
+          File.join(base, 'Tcl.framework'), File.join(base, 'Tk.framework')
+        ]
+
+        config_dir << [
+          File.join(base, 'Tcl.framework', 'Versions', 'Current'),
+          File.join(base, 'Tk.framework', 'Versions', 'Current')
+        ]
+
+        Dir.glob(File.join(base, 'Tcl.framework',
+                           'Versions', '*')).sort.reverse.each{|dir|
+          next if dir =~ /Current/
+          config_dir << [dir, dir.gsub(/Tcl/, 'Tk')]
+        }
+      else
+        config_dir.concat(Dir.glob(File.join(activeTcl, 'lib'), File::FNM_CASEFOLD).sort.reverse)
+      end
+    end
+
+    config_dir << RbConfig::CONFIG['libdir']
+
+    ((maybe_64bit?)? ['lib64', 'lib']: ['lib']).each{|dir|
+      config_dir.concat [
+        File.join(RbConfig::CONFIG['exec_prefix'], dir),
+        File.join(RbConfig::CONFIG['prefix'], dir),
+        "/usr/local/opt/#{dir}", "/usr/local/pkg/#{dir}",
+        "/usr/local/share/#{dir}", "/usr/local/#{dir}",
+        "/usr/opt/#{dir}", "/usr/pkg/#{dir}", "/usr/share/#{dir}",
+        "/usr/contrib/#{dir}", "/usr/#{dir}"
+      ]
+    }
+
+    config_dir.concat [
+      '/opt', '/pkg', '/share',
+      '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
+      '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
+    ].map{|dir|
+      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}*/lib",
+               File::FNM_CASEFOLD)
+      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}*",
+               File::FNM_CASEFOLD)
+      Dir.glob(dir + '/{tcltk,tcl,tk}/lib', File::FNM_CASEFOLD)
+      Dir.glob(dir + '/{tcltk,tcl,tk}', File::FNM_CASEFOLD)
+    }.flatten!
+
+    exeext = RbConfig::CONFIG['EXEEXT']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each{|dir|
+      dir.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+      next if Dir.glob(File.join(dir, "{tclsh,wish}*#{exeext}"), File::FNM_CASEFOLD).empty?
+      config_dir << File.expand_path(File.join(dir, '..', 'lib'))
+    }
+
+    # for MacOS X
+    paths = [
+      #"~/Library/Tcl",
+      "/Library/Tcl", "/Network/Library/Tcl", "/System/Library/Tcl"
+    ]
+    paths.reverse! unless TkLib_Config["ActiveTcl"]
+
+    paths.each{|path|
+      config_dir << path
+      config_dir.concat(Dir.glob(File.join(path, '{tcl,tk}*'), File::FNM_CASEFOLD).sort.reverse.find_all{|d| File.directory?(d)})
+    }
+
+    paths = [
+      #"~/Library/Frameworks",
+      "/Library/Frameworks",
+      "/Network/Library/Frameworks", "/System/Library/Frameworks"
+    ]
+    paths.reverse! unless TkLib_Config["ActiveTcl"]
+
+    paths.each{|frmwk|
+      base = File.expand_path(frmwk)
+      config_dir << [
+        File.join(base, 'Tcl.framework'), File.join(base, 'Tk.framework')
+      ]
+
+      config_dir << [
+        File.join(base, 'Tcl.framework', 'Versions', 'Current'),
+        File.join(base, 'Tk.framework', 'Versions', 'Current')
+      ]
+
+      Dir.glob(File.join(base, 'Tcl.framework',
+                         'Versions', '*')).sort.reverse.each{|dir|
+        next if dir =~ /Current/
+        config_dir << [dir, dir.gsub(/Tcl/, 'Tk')]
+      }
+    }
+  end
+
+  config_dir
 end
 
-dir_config("tk")
-dir_config("tcl")
-dir_config("X11")
+def get_ext_list()
+  exts = [CONFIG['DLEXT']]
+  exts.concat %w(dll lib) if is_win32?
+  exts.concat %w(bundle dylib) if is_macosx? || /nextstep|openstep|rhapsody/ =~ RUBY_PLATFORM
 
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
+  if enable_config("shared") == false
+    [CONFIG['LIBEXT'], "a"].concat exts
+  else
+    exts.concat [CONFIG['LIBEXT'], "a"]
+  end
+
+  if is_win32?
+    exts.map!{|ext| [ext.downcase, ext.upcase]}.flatten!
+  end
+
+  exts
+end
+
+def libcheck_for_tclConfig(tcldir, tkdir, tclconf, tkconf)
+  tcllib_ok = tklib_ok = false
+
+  if TkLib_Config["tcltk-stubs"]
+    stub = "stub"
+    tclfunc = "Tcl_InitStubs"
+    tkfunc  = "Tk_InitStubs"
+  else
+    stub = ""
+    tclfunc = "Tcl_FindExecutable"
+    tkfunc  = "Tk_Init"
+  end
+
+  incflags = ($INCFLAGS ||= "").dup
+  libpath = ($LIBPATH ||= []).dup
+  libs_param = ($libs ||= "").dup
+  tcllibs = nil
+  mkmf_param = nil
+
+  tclver, tkver = TkLib_Config["tcltkversion"]
+  exts = "(" + get_ext_list.join('|') + ")"
+
+  if tclver
+    tcl_glob = "*tcl#{stub}#{tclver}.*"
+    tcl_regexp = /^.*(tcl#{stub}#{tclver}.*)\.(#{exts}).*$/
+  elsif tclconf
+    tcl_glob = "*tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}{.,}#{tclconf['TCL_MINOR_VERSION']}*.*"
+    tcl_regexp = /^.*(tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}(?:\.|)#{tclconf['TCL_MINOR_VERSION']}.*)\.(#{exts}).*$/
+  end
+  if tkver
+    tk_glob = "*tk#{stub}#{tkver}.*"
+    tk_regexp = /^.*(tk#{stub}#{tkver}.*)\.(#{exts}).*$/
+  elsif tkconf
+    tk_glob = "*tk#{stub}#{tkconf['TK_MAJOR_VERSION']}{.,}#{tkconf['TK_MINOR_VERSION']}*.*"
+    tk_regexp = /^.*(tk#{stub}#{tkconf['TK_MAJOR_VERSION']}(?:\.|)#{tkconf['TK_MINOR_VERSION']}.*)\.#{exts}.*$/
+  end
+
+  tcllib_ok ||= !tclconf || Dir.glob(File.join(tcldir, tcl_glob), File::FNM_CASEFOLD).find{|file|
+    if file =~ tcl_regexp
+      libname = $1
+      ext = $2.downcase
+      begin
+        $INCFLAGS = incflags.dup << " " << tclconf["TCL_INCLUDE_SPEC"]
+        #puts "check #{file} #{$1} #{tclfunc} #{tcldir}"
+        #find_library($1, tclfunc, tcldir)
+        if (tclconf && tclconf["TCL_SHARED_BUILD"] == "0") ||
+            (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) || ext == "a"
+          # static link
+          tcllibs = $libs + " -DSTATIC_BUILD " + file.quote
+
+          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
+          #   e.g. TCL_INCLUDE_SPEC describes "-I/usr/local/include",
+          #        but compiler can find "-IC:/msys/1.0/local/include" only.
+          $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
+        else
+          tcllibs = append_library($libs, libname)
+          tcllibs = "-L#{tcldir.quote} -Wl,-R#{tcldir.quote} " + tcllibs
+
+          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
+          $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
+        end
+
+        $LIBPATH = libpath | [tcldir]
+        try_func(tclfunc, tcllibs, ["tcl.h"]) ||
+          ( try_func(tclfunc, tcllibs << " " << tclconf['TCL_LIBS'], ["tcl.h"]) if tclconf['TCL_LIBS'] )
+
+      ensure
+        mkmf_param = {
+          'PATH' => file,
+          'LIBNAME' => libname,
+          'libs' => tcllibs.dup,
+          'INCFLAGS' => $INCFLAGS.dup,
+          'LIBPATH' => $LIBPATH.dup,
+        }
+        $LIBPATH = libpath.dup
+        $libs = libs_param.dup
+      end
+    end
+  }
+  tclconf['MKMF_PARAMS'] = mkmf_param if tclconf && tcllib_ok
+
+  tklib_ok ||= !tkconf || Dir.glob(File.join(tkdir, tk_glob), File::FNM_CASEFOLD).find{|file|
+    if file =~ tk_regexp
+      libname = $1
+      ext = $2.downcase
+      begin
+        #puts "check #{file} #{$1} #{tkfunc} #{tkdir}"
+        # find_library($1, tkfunc, tkdir)
+        if (tkconf && tkconf["TCL_SHARED_BUILD"] == "0") ||
+            (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) || ext == "a"
+          # static link
+          tklibs = " -DSTATIC_BUILD " + file.quote
+
+          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
+          $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
+        else
+          tklibs = append_library("", libname)
+          #tklibs = append_library("", $1)
+          tklibs = "-L#{tkdir.quote} -Wl,-R#{tkdir.quote} " + tklibs
+
+          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
+          $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
+        end
+
+        tklibs << " " <<  tcllibs if tcllibs
+        tmp_tklibs = tklibs.dup
+        $LIBPATH = libpath | [tkdir]
+        try_func(tkfunc, tklibs, ["tcl.h", "tk.h"]) ||
+          ( try_func(tkfunc, tklibs << " " << tkconf['TK_LIBS'], ["tcl.h", "tk.h"]) if tkconf['TK_LIBS'] ) ||
+          ( try_func(tkfunc, (tklibs = tmp_tklibs.dup) << " " << tkconf['TK_XLIBSW'], ["tcl.h", "tk.h"]) if tkconf['TK_XLIBSW'] ) ||
+          ( try_func(tkfunc, tklibs << " " << tkconf['TK_LIBS'], ["tcl.h", "tk.h"]) if tkconf['TK_LIBS'] )
+
+      ensure
+        mkmf_param = {
+          'PATH' => file,
+          'LIBNAME' => libname,
+          'libs' => tklibs.dup,
+          'INCFLAGS' => $INCFLAGS.dup,
+          'LIBPATH' => $LIBPATH.dup,
+        }
+        $LIBPATH = libpath.dup
+        $libs = libs_param.dup
+      end
+    end
+  }
+
+  $INCFLAGS = incflags.dup
+  tkconf['MKMF_PARAMS'] = mkmf_param if tkconf && tklib_ok
+
+  [tcllib_ok, tklib_ok]
+end
+
+def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
+  TkLib_Config["tclConfig_paths"] = []
+
+  paths.compact!
+  if paths.empty?
+    config_dir = get_tclConfig_dirs
+  elsif paths.length == 1 && !paths[0][0] && !paths[0][1]
+    config_dir = get_tclConfig_dirs.map{|dir|
+      if dir.kind_of? Array
+        [ (paths[0][0] == false)? nil: dir[0],
+          (paths[0][1] == false)? nil: dir[1] ]
+      else
+        [ (paths[0][0] == false)? nil: dir,
+          (paths[0][1] == false)? nil: dir ]
+      end
+    }
+  else
+    # fixed tclConfig
+    config_dir = []
+    paths.each{|path|
+      if path.kind_of?(Array)
+        config_dir << path
+      else
+        dirs = Dir.glob(path, File::FNM_CASEFOLD)
+        config_dir.concat(dirs.zip(dirs))
+      end
+    }
+  end
+
+  tclver, tkver = TkLib_Config['tcltkversion']
+  if tclver && tclver =~ /^\D*(\d)\.?(\d)?/  # ignore PATCH_LEVEL
+    tclver_major = $1
+    tclver_minor = $2
+  else
+    tclver_major = nil
+    tclver_minor = nil
+  end
+  if tkver && tkver =~ /^\D*(\d)\.?(\d)?/  # ignore PATCH_LEVEL
+    tkver_major = $1
+    tkver_minor = $2
+  else
+    tkver_major = nil
+    tkver_minor = nil
+  end
+
+  conf = nil
+
+  config_dir.uniq!
+  config_dir.map{|dir|
+    if dir.kind_of? Array
+      [ (dir[0])? dir[0].strip.chomp('/'): nil,
+        (dir[1])? dir[1].strip.chomp('/'): nil ]
+    else
+      dir.strip.chomp('/')
+    end
+  }.each{|dir|
+    print(".") # progress
+    # print("check #{dir} ==>");
+    if dir.kind_of? Array
+      tcldir, tkdir = dir
+    else
+      tcldir = tkdir = dir
+    end
+
+    tails = ['Config-shared.sh', 'config-shared.sh', 'Config.sh', 'config.sh']
+
+    if tcldir
+      if File.file?(tcldir)
+        tclcfg_files = [tcldir] * tails.length
+      else
+        tclcfg_files = tails.map{|f| File.join(tcldir, 'tcl' << f)}
+      end
+    else
+      tclcfg_files = [nil] * tails.length
+    end
+
+    if tkdir
+      if File.file?(tkdir)
+        tkcfg_files = [tkdir] * tails.length
+      else
+        tkcfg_files = tails.map{|f| File.join(tkdir, 'tk' << f)}
+      end
+    else
+      tkcfg_files = [nil] * tails.length
+    end
+
+    tclcfg_files.zip(tkcfg_files).map{|tclpath, tkpath|
+      [ (tclpath && File.exist?(tclpath))? File.expand_path(tclpath): tclpath,
+        (tkpath && File.exist?(tkpath))? File.expand_path(tkpath): tkpath ]
+    }.uniq.each{|tclpath, tkpath|
+      next if tclpath && !File.exist?(tclpath)
+      next if tkpath && !File.exist?(tkpath)
+
+      # parse tclConfig.sh/tkConfig.sh
+      tclconf = (tclpath)? parse_tclConfig(tclpath): nil
+      next if tclconf && tclver && ((tclver_major && tclver_major != tclconf['TCL_MAJOR_VERSION']) || (tclver_minor && tclver_minor != tclconf['TCL_MINOR_VERSION']))
+
+      tkconf = (tkpath)? parse_tclConfig(tkpath): nil
+      next if tkconf && tkver && ((tkver_major && tkver_major != tkconf['TK_MAJOR_VERSION']) || (tkver_minor && tkver_minor != tkconf['TK_MINOR_VERSION']))
+
+      # nativethread check
+      if !TkLib_Config["ruby_with_thread"]
+        if tclconf
+          if tclconf['TCL_THREADS'] == '1'
+            puts "\nWARNING: found #{tclpath.inspect}, but it WITH nativethread-support under ruby WITHOUT nativethread-support. So, ignore it."
+            TkLib_Config["tcl-NG-path"] << File.dirname(tclpath)
+            next
+          end
+        else
+          puts "\nWARNING: When not refer tclConfig.sh, cannot check native-thread support on Tcl/Tk libraries. Ruby, which is used now, does NOT support native-thread. So, if Tcl/Tk libraries support native-thread, it will NOT work properly."
+        end
+      end
+
+      # find tclConfig.sh & tkConfig.sh
+      conf = [tclconf, tkconf] unless conf
+
+      # check Tcl library
+      if is_macosx? && TkLib_Config["tcltk-framework"]
+        # if use framework, not check (believe it is installed properly)
+        tcllib_ok = tklib_ok = true
+      else
+        tcllib_ok, tklib_ok =
+          libcheck_for_tclConfig((tclpath)? File.dirname(tclpath): nil,
+                                 (tkpath)? File.dirname(tkpath): nil,
+                                 tclconf, tkconf)
+      end
+
+      unless tcllib_ok && tklib_ok
+        unless tcllib_ok
+          puts "\nWARNING: found #{tclpath.inspect}, but cannot find valid Tcl library for the tclConfig.sh. So, ignore it."
+          TkLib_Config["tcl-NG-path"] << File.dirname(tclpath)
+        end
+        unless tklib_ok
+          puts "\nWARNING: found #{tkpath.inspect}, but cannot find valid Tk library for the tkConfig.sh. So, ignore it."
+          TkLib_Config["tk-NG-path"] << File.dirname(tkpath)
+        end
+        next
+      end
+
+      #return [tclpath, tkpath]
+      # print(" #{[tclpath, tkpath].inspect}");
+      TkLib_Config["tclConfig_paths"] << [tclpath, tkpath]
+    }
+
+    # print("\n");
+  }
+
+  if is_macosx? && TkLib_Config["tcltk-stubs"]
+    CONFIG['LDSHARED'] << " -Xlinker -bind_at_load"
+    if config_string('LDSHAREDXX')
+      config_string('LDSHAREDXX') << " -Xlinker -bind_at_load"
+    end
+  end
+
+  if TkLib_Config["tclConfig_paths"].empty?
+    [nil, nil]
+  else
+    # find tclConfig.sh and tkConfig.sh
+    TkLib_Config["tclConfig_info"], TkLib_Config["tkConfig_info"] = conf
+    TkLib_Config["tclConfig_paths"][0]
+  end
+end
+
+def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
+  use_tclConfig = tclConfig_file != false && tclConfig_dir != false
+  use_tkConfig  = tkConfig_file  != false && tkConfig_dir  != false
+
+  unless use_tclConfig || use_tkConfig
+    puts("Don't use [tclConfig.sh, tkConfig.sh]")
+    return [nil, nil]
+  end
+
+  tclConfig_file = nil unless tclConfig_file.kind_of? String
+  tkConfig_file = nil unless tkConfig_file.kind_of? String
+  tclConfig_dir = nil unless tclConfig_dir.kind_of? String
+  tkConfig_dir = nil unless tkConfig_dir.kind_of? String
+
+  if use_tclConfig && !tclConfig_dir
+    if tclConfig_file
+      tclConfig_dir = File.dirname(tclConfig_file)
+    elsif tkConfig_dir
+      tclConfig_dir = tkConfig_dir
+    end
+  end
+  if use_tkConfig && !tkConfig_dir
+    if tkConfig_file
+      tkConfig_dir = File.dirname(tkConfig_file)
+    elsif tclConfig_dir
+      tkConfig_dir = tclConfig_dir
+    end
+  end
+  tkConfig_dir ||= tclConfig_dir
+
+  if use_tclConfig
+    TkLib_Config["tclConfig-file"] = tclConfig_file
+    TkLib_Config["tclConfig-dir"] = tclConfig_dir
+  else
+    tclConfig_file = false
+    tclConfig_dir = false
+  end
+  if use_tkConfig
+    TkLib_Config["tkConfig-file"] = tkConfig_file
+    TkLib_Config["tkConfig-dir"] = tkConfig_dir
+  else
+    tkConfig_file = false
+    tkConfig_dir = false
+  end
+
+  print ("Don't use tclConfig.sh (specified by configure option).\n") unless use_tclConfig
+  print ("Don't use tkConfig.sh (specified by configure option).\n") unless use_tkConfig
+  print("Search ")
+  print("tclConfig.sh", (tclConfig_dir)? " (in #{tclConfig_dir})": "") if use_tclConfig
+  print((use_tclConfig)? " and ": "", "tkConfig.sh", (tkConfig_dir)? " (in #{tkConfig_dir})": "") if use_tkConfig
+  print(".")
+
+  if tclConfig_dir || tkConfig_dir || !use_tclConfig || !use_tkConfig
+    tclConfig, tkConfig =
+      search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir),
+                         ((tkConfig_file)?  tkConfig_file:  tkConfig_dir) ])
+  else
+    tclConfig, tkConfig = search_tclConfig()
+  end
+  print("\n")
+  # TclConfig_Info = TkLib_Config["tclConfig_info"]
+  # TkConfig_Info  = TkLib_Config["tkConfig_info"]
+
+  if tclConfig || tkConfig
+    dirs = TkLib_Config["tclConfig_paths"].map{|tclpath, tkpath|
+      [ (tclpath)? File.dirname(tclpath): nil,
+        (tkpath)? File.dirname(tkpath): nil ]
+    }
+    dirs |= dirs
+    puts("Valid [tclConfig.sh, tkConfig.sh] are found in #{dirs.inspect}")
+    puts("Use [tclConfig.sh, tkConfig.sh] == #{[tclConfig, tkConfig].inspect}")
+    $LIBPATH ||= []
+    $LIBPATH |= [File.dirname(tclConfig)] if tclConfig
+    $LIBPATH |= [File.dirname(tkConfig)]  if tkConfig
+    #TkLib_Config["tclConfig_paths"].each{|tclcfg, tkcfg|
+    #  $LIBPATH |= [File.dirname(tclcfg)] | [File.dirname(tkcfg)]
+    #}
+  else
+    puts("Fail to find [tclConfig.sh, tkConfig.sh]")
+  end
+
+  [tclConfig, tkConfig]
+end
+
+def check_tcl_NG_path(path_list)
+  path_list.find_all{|path| not TkLib_Config["tcl-NG-path"].include?(path) }
+end
+
+def check_tk_NG_path(path_list)
+  path_list.find_all{|path| not TkLib_Config["tk-NG-path"].include?(path) }
+end
+
+def check_NG_path(path_list)
+  path_list.find_all{|path|
+    not (TkLib_Config["tcl-NG-path"].include?(path) &&
+         TkLib_Config["tk-NG-path"].include?(path))
+  }
+end
+
+def check_shlib_search_path(paths)
+  if !paths || paths.empty?
+    path_list = []
+
+    #if TkLib_Config["ActiveTcl"]
+    #  path_list.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
+    #end
+    if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
+      path_list.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
+    end
+
+    vers = get_shlib_versions
+    path_head, path_dirs = get_shlib_path_head
+
+    path_list.concat vers.map{|ver|
+      path_head.map{|head|
+        if ver.empty?
+          head + "/lib"
+        else
+          dirs = []
+
+          if Dir.glob(head, File::FNM_CASEFOLD).find{|dir| dir == head}
+            dirs << head + "/lib"
+          end
+
+          if !Dir.glob(head + "-*", File::FNM_CASEFOLD).empty?
+            dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*", File::FNM_CASEFOLD).empty?
+            dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*", File::FNM_CASEFOLD).empty?
+          end
+
+          if !Dir.glob(head + "[_-]*", File::FNM_CASEFOLD).empty?
+            dirs << head + "_#{ver}/lib" if !Dir.glob(head + "_[89].*", File::FNM_CASEFOLD).empty?
+            dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*", File::FNM_CASEFOLD).empty?
+            dirs << head + "_#{ver.delete('.')}/lib" if !Dir.glob(head + "_[89][0-9]*", File::FNM_CASEFOLD).empty?
+            dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*", File::FNM_CASEFOLD).empty?
+          end
+
+          dirs
+        end
+      }
+    }.flatten!
+
+    path_list.concat path_dirs
+
+  else
+    # paths is a string with PATH environment style
+    path_list = paths.split((is_win32?)? ';': ':')
+  end
+
+  path_list = check_NG_path(path_list)
+  path_list.map!{|path| path.strip}
+
+  if !CROSS_COMPILING and (is_win32? || is_macosx?)
+    # exist-dir only
+    path_list.delete_if{|path| Dir.glob(File.join(path, "*.{a,so,dll,lib}")).empty?}
+  end
+
+  # keep paths for searching dynamic libs
+  #$LIBPATH |= path_list
+  path_list.uniq
+end
+
+def search_vers_on_path(vers, path, *heads)
+  exts = get_ext_list.join(',')
+  files = Dir.glob(File.join(path, "*{#{heads.join(',')}}*.{#{exts}}"), File::FNM_CASEFOLD)
+  vers.find_all{|ver| files.find{|f| f =~ /(#{ver}|#{ver.delete('.')})/} }
+end
+
+def find_tcl(tcllib, stubs, version, *opt_paths)
+  if TclConfig_Info['MKMF_PARAMS']
+    # already checked existence of tcl library based on tclConfig.sh
+    ($INCFLAGS ||= "") << " " << TclConfig_Info['MKMF_PARAMS']['INCFLAGS']
+    $LIBPATH ||= []; $LIBPATH |= TclConfig_Info['MKMF_PARAMS']['LIBPATH']
+    ($libs ||= "") << " " << TclConfig_Info['MKMF_PARAMS']['libs']
+    return [true, nil, nil, nil]
+  end
+  # else, no available tclConfig.sh on the system
 
-use_X = with_config("X11", (! is_win32))
+  print "Search Tcl library"
 
-def find_tcl(tcllib, stubs)
-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
   if stubs
     func = "Tcl_InitStubs"
     lib = "tclstub"
@@ -58,22 +1037,143 @@ def find_tcl(tcllib, stubs)
     func = "Tcl_FindExecutable"
     lib = "tcl"
   end
-  if tcllib
-    find_library(tcllib, func, *paths)
-  elsif find_library(lib, func, *paths)
-    true
+
+  if version && ! version.empty?
+    versions = [version]
   else
-    %w[8.5 8.4 8.3 8.2 8.1 8.0 7.6].find { |ver|
-      find_library("#{lib}#{ver}", func, *paths) or
-        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-        find_library("tcl#{ver}", func, *paths) or
-        find_library("tcl#{ver.delete('.')}", func, *paths)
+    versions = TkLib_Config['search_versions']
+  end
+
+  default_paths = []
+
+  default_paths.concat [
+    RbConfig::CONFIG['libdir'],
+    File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
+    File.join(RbConfig::CONFIG['prefix'], 'lib'),
+    "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
+  ].find_all{|dir| File.directory?(dir)} unless CROSS_COMPILING
+
+  if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
+    default_paths.concat Dir.glob(TkLib_Config["ActiveTcl"]).sort.reverse.map{|d| d << "/lib"}
+  end
+
+  if !CROSS_COMPILING and is_win32?
+    default_paths.concat [
+      "c:/Tcl/lib","c:/Program Files/Tcl/lib","c:/Program Files (x86)/Tcl/lib",
+      "/Tcl/lib","/Program Files/Tcl/lib","/Program Files (x86)/Tcl/lib"
+    ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
+
+    # for MinGW
+    ["/usr/local/lib64", "/usr/lib64", "/usr/local/lib", "/usr/lib"].each{|dir|
+      default_paths << File.expand_path(dir) if File.directory? dir
     }
+
+    default_paths |= ENV['LIBRARY_PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['LIBRARY_PATH']
+    default_paths |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
+  end
+
+  default_paths |= TkLib_Config["checked_shlib_dirs"]
+
+  unless TkLib_Config["space-on-tk-libpath"]
+    default_paths.delete_if{|path| path =~ / /}
   end
+
+  if (paths = opt_paths.compact).empty?
+    paths = check_tcl_NG_path(default_paths)
+  end
+
+  incflags = ($INCFLAGS ||= "").dup
+  libpath = ($LIBPATH ||= []).dup
+  libs_param = ($libs ||= "").dup
+  tcllibs = nil
+
+  exts = "(" + get_ext_list.join('|') + ")"
+
+  paths.map{|path|
+    lib_w_sufx = lib
+    begin
+      $LIBPATH |= [path]
+      inc = [File.join(File.dirname(path),"include"), File.dirname(path)]
+      inc.each{|f| $INCFLAGS << " -I" << f }
+
+      if tcllib
+        print(".")
+        if have_library(tcllib, func, ["tcl.h"])
+          return [true, path, lib_w_sufx, nil, *inc]
+        end
+      else
+        sufx_list = ['', 't', 'g', 's', 'x']
+        search_vers_on_path(versions, path, lib, 'tcl').find{|ver|
+          dir_enum = Dir.foreach(path)
+          no_dot_ver = ver.delete('.')
+          libnames = ["#{lib}#{ver}", "#{lib}#{no_dot_ver}"]
+          libnames << "tcl#{ver}" << "tcl#{no_dot_ver}"  if lib != "tcl"
+          libnames.find{|libname|
+            sufx_list.find{|sufx|
+              print(".")
+              dir_enum.map{|fname|
+                if fname =~ /^.*(#{libname}.*#{sufx})\.(#{exts}).*$/
+                  [fname, $1, $2]
+                end
+              }.compact.find{|fname, lib_w_sufx, ext|
+                ext.downcase!
+                if (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) ||
+                    ext == "a"
+                  # static link
+                  tcllibs = libs_param + " -DSTATIC_BUILD " + fname.quote
+                else
+                  tcllibs = append_library($libs, lib_w_sufx)
+                  tcllibs = "-L#{path.quote} -Wl,-R#{path.quote} " + tcllibs
+                end
+                if try_func(func, tcllibs, ["tcl.h"])
+                  return [true, path, nil, tcllibs, *inc]
+                end
+              }
+            }
+          }
+        }
+        if (!version && (print(".");try_func(func, libs_param, ["tcl.h"])))
+          return [true, path, lib_w_sufx, nil, *inc]
+        end
+      end
+    ensure
+      $LIBPATH = libpath.dup
+      $libs = libs_param.dup
+      $INCFLAGS = incflags.dup
+    end
+  }
+
+  print("\n") # progress
+  [false, nil, nil, nil]
+end
+
+def parse_TK_LIBS(tklibs)
+  sfx = "lib|shlib|dll|so"
+  re = /(("|')[^"']+\.(#{sfx})\2|[^"' ]+\.(#{sfx})|-l("|')[^"']+\5|-l[^" ]+)/#'
+
+  tklibs.scan(re).map{|lib,|
+    if lib =~ /^("|')([^"]+)\.(#{sfx})\1/
+        "\"-l#{$2}\""
+    elsif lib =~ /([^" ]+)\.(#{sfx})/
+        "-l#{$1}"
+    else
+      lib
+    end
+  }.join(' ')
 end
 
-def find_tk(tklib, stubs)
-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+def find_tk(tklib, stubs, version, *opt_paths)
+  if TkConfig_Info['MKMF_PARAMS']
+    # already checked existence of tcl library based on tkConfig.sh
+    ($INCFLAGS ||= "") << " " << TkConfig_Info['MKMF_PARAMS']['INCFLAGS']
+    $LIBPATH ||= []; $LIBPATH |= TkConfig_Info['MKMF_PARAMS']['LIBPATH']
+    ($libs ||= "") << " " << TkConfig_Info['MKMF_PARAMS']['libs']
+    return [true, nil, nil, nil]
+  end
+  # else, no available tkConfig.sh on the system
+
+  print "Search Tk library"
+
   if stubs
     func = "Tk_InitStubs"
     lib = "tkstub"
@@ -81,18 +1181,385 @@ def find_tk(tklib, stubs)
     func = "Tk_Init"
     lib = "tk"
   end
-  if tklib
-    find_library(tklib, func, *paths)
-  elsif find_library(lib, func, *paths)
-    true
+
+  if version && ! version.empty?
+    versions = [version]
   else
-    %w[8.5 8.4 8.3 8.2 8.1 8.0 4.2].find { |ver|
-      find_library("#{lib}#{ver}", func, *paths) or
-        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-        find_library("tk#{ver}", func, *paths) or
-        find_library("tk#{ver.delete('.')}", func, *paths)
+    versions = TkLib_Config['search_versions']
+  end
+
+  default_paths = []
+
+  default_paths.concat [
+    RbConfig::CONFIG['libdir'],
+    File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
+    File.join(RbConfig::CONFIG['prefix'], 'lib'),
+    "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
+  ].find_all{|dir| File.directory?(dir)} unless CROSS_COMPILING
+
+  if !CROSS_COMPILING and is_win32?
+    default_paths.concat [
+      "c:/Tcl/lib","c:/Program Files/Tcl/lib","c:/Program Files (x86)/Tcl/lib",
+      "/Tcl/lib","/Program Files/Tcl/lib","/Program Files (x86)/Tcl/lib"
+    ].find_all{|dir| File.directory?(dir)}
+
+    # for MinGW
+    ["/usr/local/lib64", "/usr/lib64", "/usr/local/lib", "/usr/lib"].each{|dir|
+      default_paths << File.expand_path(dir) if File.directory? dir
     }
+
+    default_paths |= ENV['LIBRARY_PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['LIBRARY_PATH']
+    default_paths |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
+  end
+
+  default_paths |= TkLib_Config["checked_shlib_dirs"]
+
+  unless TkLib_Config["space-on-tk-libpath"]
+    default_paths.delete_if{|path| path =~ / /}
+  end
+
+  if (paths = opt_paths.compact).empty?
+    paths = check_tk_NG_path(default_paths)
+  end
+
+  incflags = ($INCFLAGS ||= "").dup
+  libpath = ($LIBPATH ||= []).dup
+  libs_param = ($libs ||= "").dup
+  tcllibs = nil
+
+  exts = "(" + get_ext_list.join('|') + ")"
+
+  paths.map{|path|
+    lib_w_sufx = lib
+    begin
+      $LIBPATH |= [path]
+      inc = [File.join(File.dirname(path),"include"), File.dirname(path)]
+      inc.each{|f| $INCFLAGS << " -I" << f }
+
+      if tklib
+        print(".")
+        if have_library(tklib, func, ["tcl.h", "tk.h"])
+          return [true, path, lib_w_sufx, nil, *inc]
+        end
+      else
+        sufx_list = ['', 't', 'g', 's', 'x']
+        search_vers_on_path(versions, path, lib, 'tk').find{|ver|
+          dir_enum = Dir.foreach(path)
+          no_dot_ver = ver.delete('.')
+          libnames = ["#{lib}#{ver}", "#{lib}#{no_dot_ver}"]
+          libnames << "tk#{ver}" << "tk#{no_dot_ver}"  if lib != "tk"
+          libnames.find{|libname|
+            sufx_list.find{|sufx|
+              print(".")
+              dir_enum.map{|fname|
+                if fname =~ /^.*(#{libname}.*#{sufx})\.(#{exts}).*$/
+                  [fname, $1, $2]
+                end
+              }.compact.find{|fname, lib_w_sufx, ext|
+                if (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) ||
+                    ext == "a"
+                  # static link
+                  tklibs = libs_param + " -DSTATIC_BUILD " + fname.quote
+                else
+                  tklibs = append_library($libs, lib_w_sufx)
+                  tklibs = "-L#{path.quote} -Wl,-R#{path.quote} " + tklibs
+                end
+                if try_func(func, tklibs, ["tcl.h", "tk.h"])
+                  return [true, path, nil, tklibs, *inc]
+                end
+              }
+            }
+          }
+        }
+        if (!version && (print(".");try_func(func, libs_param, ["tcl.h", "tk.h"])))
+          return [true, path, lib_w_sufx, nil, *inc]
+        end
+      end
+    ensure
+      $LIBPATH = libpath
+      $libs = libs_param
+      $INCFLAGS = incflags.dup
+    end
+  }
+
+  print("\n") # progress
+  [false, nil, nil, nil]
+end
+
+def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
+                       tcl_opt_paths, tk_opt_paths)
+  st,path,lib,libs,*inc = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
+  unless st
+    puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
+    return false
+  else
+    ($LIBPATH ||= []; $LIBPATH |= [path]) if path
+    $libs = append_library($libs, lib) if lib
+    ($libs ||= "") << " " << libs if libs
+    $INCFLAGS ||= ""
+    inc.each{|f| $INCFLAGS << " -I" << f}
   end
+
+  st,path,lib,libs,*inc = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
+  unless st
+    puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
+    return false
+  else
+    ($LIBPATH ||= []; $LIBPATH |= [path]) if path
+    $libs = append_library($libs, lib) if lib && !lib.empty?
+    ($libs ||= "") << " " << libs if libs
+    $INCFLAGS ||= ""
+    inc.each{|f| $INCFLAGS << " -I" << f}
+  end
+
+  true
+end
+
+def find_tcltk_header(tclver, tkver)
+  base_dir = []
+
+  base_dir.concat [
+    File.join(RbConfig::CONFIG['prefix'], 'include'),
+    "/usr/local/include", "/usr/pkg/include", "/usr/contrib/include",
+    "/usr/include"
+  ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
+
+  if !CROSS_COMPILING && is_win32?
+    base_dir.concat [
+      "c:/Tcl/include","c:/Program Files/Tcl/include",
+      "c:/Program Files (x86)/Tcl/include",
+      "/Tcl/include","/Program Files/Tcl/include",
+      "/Program Files (x86)/Tcl/include"
+    ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
+
+    if ENV['CPATH']
+      base_dir |= ENV['CPATH'].split(';').find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
+    end
+  end
+
+  base_dir |= TkLib_Config["checked_shlib_dirs"]
+
+  unless TkLib_Config["space-on-tk-libpath"]
+    base_dir.delete_if{|path| path =~ / /}
+  end
+
+  # tcl.h
+  if TclConfig_Info['MKMF_PARAMS']
+    # already checked existence of tcl headers based on tclConfig.sh
+    have_tcl_h = true
+  else
+    print "\nSearch tcl.h"
+    if enable_config("tcl-h-ver-check", true) &&
+        tclver && tclver =~ /^\D*(\d)\.?(\d)/
+      major = $1; minor = $2
+    else
+      major = minor = nil
+    end
+    print(".") # progress
+    if major && minor
+      # version check on tcl.h
+      have_tcl_h = try_cpp("#include <tcl.h>\n#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
+    else
+      have_tcl_h = have_header('tcl.h')
+    end
+    unless have_tcl_h
+      if tclver && ! tclver.empty?
+        versions = [tclver]
+      else
+        versions = TkLib_Config['search_versions']
+      end
+      paths = base_dir.dup
+      (versions + [""]).each{|ver|
+        paths.concat(base_dir.map{|dir|
+                       [
+                        dir + '/tcl' + ver,
+                        dir + '/tcl' + ver + '/include',
+                        dir + '/tcl' + ver.delete('.'),
+                        dir + '/tcl' + ver.delete('.') + '/include'
+                       ]
+                     }.flatten)
+      }
+      paths = paths.map{|dir|
+        (File.directory?(dir))? File.expand_path(dir): nil
+      }.compact.uniq
+
+      code = "#include <tcl.h>\n"
+      code << "#if TCL_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
+      code << "#if TCL_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
+      have_tcl_h = paths.find{|path|
+        print(".") # progress
+        inc_opt = " -I#{path.quote}"
+        if try_cpp(code, inc_opt)
+          ($INCFLAGS ||= "") << inc_opt
+          true
+        else
+          false
+        end
+      }
+    end
+  end
+
+  # tk.h
+  if TkConfig_Info['MKMF_PARAMS']
+    # already checked existence of tk headers based on tkConfig.sh
+    have_tk_h = true
+  else
+    print "\nSearch tk.h"
+    if enable_config("tk-h-ver-check", true) &&
+        tkver && tkver =~ /^\D*(\d)\.?(\d)/
+      major = $1; minor = $2
+    else
+      major = minor = nil
+    end
+    print(".") # progress
+    if major && minor
+      # version check on tk.h
+      have_tk_h = try_cpp("#include <tk.h>\n#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
+    else
+      have_tk_h = have_header('tk.h')
+    end
+    unless have_tk_h
+      if tkver && ! tkver.empty?
+        versions = [tkver]
+      else
+        versions = TkLib_Config['search_versions']
+      end
+      paths = base_dir.dup
+      (versions + [""]).each{|ver|
+        paths.concat(base_dir.map{|dir|
+                       [
+                        dir + '/tk' + ver,
+                        dir + '/tk' + ver + '/include',
+                        dir + '/tk' + ver.delete('.'),
+                        dir + '/tk' + ver.delete('.') + '/include'
+                       ]
+                     }.flatten)
+      }
+      paths = paths.map{|dir|
+        (File.directory?(dir))? File.expand_path(dir): nil
+      }.compact.uniq
+
+      code = "#include <tcl.h>\n#include <tk.h>\n"
+      code << "#if TK_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
+      code << "#if TK_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
+      have_tk_h = paths.find{|path|
+        print(".") # progress
+        inc_opt = " -I#{path.quote}"
+        if try_cpp(code, inc_opt)
+          ($INCFLAGS ||= "") << inc_opt
+          true
+        else
+          false
+        end
+      }
+    end
+  end
+
+  puts "Can't find \"tcl.h\"." unless have_tcl_h
+  puts "Can't find \"tk.h\"."  unless have_tk_h
+  have_tcl_h && have_tk_h
+end
+
+def setup_for_macosx_framework(tclver, tkver)
+  # use framework, but no tclConfig.sh
+  unless $LDFLAGS && $LDFLAGS.include?('-framework')
+    ($LDFLAGS ||= "") << ' -framework Tk -framework Tcl'
+  end
+
+  if TkLib_Config["tcl-framework-header"]
+    TclConfig_Info['TCL_INCLUDE_SPEC'][0,0] =
+      " -I#{TkLib_Config["tcl-framework-header"].quote} "
+  else
+    tcl_base = File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework')
+    if tclver
+      TclConfig_Info['TCL_INCLUDE_SPEC'] <<
+        " -I#{File.join(tcl_base, 'Versions', tclver, 'Headers').quote} "
+    end
+
+    TclConfig_Info['TCL_INCLUDE_SPEC'] << File.join(tcl_base, 'Headers')
+
+    unless tclver
+      dir = Dir.glob(File.join(tcl_base, 'Versions', '*', 'Headers'),
+                     File::FNM_CASEFOLD).sort.reverse[0]
+      TclConfig_Info['TCL_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
+    end
+  end
+
+  if TkLib_Config["tk-framework-header"]
+    TkConfig_Info['TK_INCLUDE_SPEC'][0,0] =
+      " -I#{TkLib_Config["tk-framework-header"].quote} "
+  else
+    tk_base  = File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')
+    if tkver
+      TkConfig_Info['TK_INCLUDE_SPEC'] <<
+        " -I#{File.join(tk_base, 'Versions', tkver, 'Headers').quote} "
+    end
+
+    TkConfig_Info['TK_INCLUDE_SPEC'] << File.join(tk_base, 'Headers')
+
+    unless tkver
+      dir = Dir.glob(File.join(tk_base, 'Versions', '*', 'Headers'),
+                     File::FNM_CASEFOLD).sort.reverse[0]
+      TkConfig_Info['TK_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
+    end
+  end
+end
+
+def find_X11(*opt_paths)
+  defaults =
+    [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
+  paths = []
+  opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
+  defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
+  st = find_library("X11", "XOpenDisplay", *paths)
+  unless st
+    puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
+  end
+  st
+end
+
+def search_X_libraries
+  use_tkConfig = false
+  if TkConfig_Info['config_file_path']
+    # use definitions on tkConfig.sh
+    if (TkConfig_Info['TK_XINCLUDES'] &&
+        !TkConfig_Info['TK_XINCLUDES'].strip.empty?) ||
+        (TkConfig_Info['TK_XLIBSW'] && !TkConfig_Info['TK_XLIBSW'].strip.empty?)
+      use_tkConfig = true
+      #use_X = true && with_config("X11", ! is_win32?)
+      use_X = with_config("X11", true)
+    else
+      #use_X = false || with_config("X11", false)
+      use_X = with_config("X11", false)
+    end
+  else
+    # depend on configure options
+    use_X = with_config("X11", !(is_win32? || TkLib_Config["tcltk-framework"]))
+  end
+
+  if TkConfig_Info['TK_XINCLUDES'] &&
+      !TkConfig_Info['TK_XINCLUDES'].strip.empty?
+    ($INCFLAGS ||= "") << " " << TkConfig_Info['TK_XINCLUDES'].strip
+  end
+
+  if use_X
+    puts("Use X11 libraries (or use TK_XINCLUDES/TK_XLIBSW information on tkConfig.sh).")
+    x11_idir, x11_ldir = dir_config("X11")
+    x11_ldir2 = with_config("X11-lib")
+    unless find_X11(x11_ldir2, x11_ldir)
+      puts("Can't find X11 libraries. ")
+      if use_tkConfig &&
+          TkConfig_Info['TK_XLIBSW'] && !TkConfig_Info['TK_XLIBSW'].strip.empty?
+        puts("But, try to use TK_XLIBSW information (believe tkCOnfig.sh).")
+        ($libs ||= "") << " " << TkConfig_Info['TK_XLIBSW'] << " "
+      else
+        puts("So, can't make tcltklib.so which is required by Ruby/Tk.")
+        exit
+      end
+    end
+  end
+
+  use_X
 end
 
 def pthread_check()
@@ -109,74 +1576,50 @@ def pthread_check()
     tcl_enable_thread = nil
   end
 
-  if (tclConfig = with_config("tclConfig-file"))
+  if TclConfig_Info['config_file_path']
     if tcl_enable_thread == true
-      puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
+      puts("Warning: definiton of tclConfig.sh is ignored, because --enable-tcl-thread option is given.")
     elsif tcl_enable_thread == false
-      puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
+      puts("Warning: definition of tclConfig.sh is ignored, because --disable-tcl-thread option is given.")
     else
       # tcl-thread is unknown and tclConfig.sh is given
-      begin
-        open(tclConfig, "r") do |cfg|
-          while line = cfg.gets()
-            if line =~ /^\s*TCL_THREADS=(0|1)/
-              tcl_enable_thread = ($1 == "1")
-              break
-            end
-
-            if line =~ /^\s*TCL_MAJOR_VERSION=("|')(\d+)\1/
-              tcl_major_ver = $2
-              if tcl_major_ver =~ /^[1-7]$/
-                tcl_enable_thread = false
-                break
-              end
-              if tcl_major_ver == "8" && tcl_minor_ver == "0"
-                tcl_enable_thread = false
-                break
-              end
-            end
-
-            if line =~ /^\s*TCL_MINOR_VERSION=("|')(\d+)\1/
-              tcl_minor_ver = $2
-              if tcl_major_ver == "8" && tcl_minor_ver == "0"
-                tcl_enable_thread = false
-                break
-              end
-            end
-          end
+      if TclConfig_Info['TCL_THREADS']
+        tcl_enable_thread = (TclConfig_Info['TCL_THREADS'] == "1")
+      else
+        tcl_major_ver = TclConfig_Info['TCL_MAJOR_VERSION'].to_i
+        tcl_minor_ver = TclConfig_Info['TCL_MINOR_VERSION'].to_i
+        if tcl_major_ver < 8 || (tcl_major_ver == 8 && tcl_minor_ver == 0)
+          tcl_enable_thread = false
         end
+      end
 
-        if tcl_enable_thread == nil
-          # not find definition
-          if tcl_major_ver
-            puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
-          else
-            puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
-          end
-          tclConfig = false
+      if tcl_enable_thread == nil
+        # cannot find definition
+        if tcl_major_ver
+          puts("Warning: '#{TclConfig_Info['config_file_path']}' doesn't include TCL_THREADS definition.")
+        else
+          puts("Warning: '#{TclConfig_Info['config_file_path']}' may not be a tclConfig file.")
         end
-      rescue Exception
-        puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
-        tclConfig = false
+        #tclConfig = false
       end
     end
   end
 
-  if tcl_enable_thread == nil && !tclConfig
+  if tcl_enable_thread == nil && !TclConfig_Info['config_file_path']
     # tcl-thread is unknown and tclConfig is unavailable
     begin
-      try_run_available = try_run("int main() { exit(0); }")
+      try_run("int main() { exit(0); }")
     rescue Exception
       # cannot try_run. Is CROSS-COMPILE environment?
       puts(%Q'\
 *****************************************************************************
 **
-** PTHREAD SUPPORT CHECK WARNING: 
+** NATIVETHREAD SUPPORT CHECK WARNING:
 **
-**   We cannot check the consistency of pthread support between Ruby 
-**   and the Tcl/Tk library in your environment (are you perhaps
-**   cross-compiling?). If pthread support for these 2 packages is
-**   inconsistent you may find you get errors when running Ruby/Tk
+**   We cannot check the consistency of nativethread support between
+**   Ruby and the Tcl/Tk library in your environment (are you perhaps
+**   cross-compiling?). If nativethread support for these 2 packages
+**   is inconsistent you may find you get errors when running Ruby/Tk
 **   (e.g. hangs or segmentation faults).  We strongly recommend
 **   you to check the consistency manually.
 **
@@ -190,7 +1633,7 @@ def pthread_check()
     # tcl-thread is unknown
     if try_run(<<EOF)
 #include <tcl.h>
-int main() { 
+int main() {
    Tcl_Interp *ip;
    ip = Tcl_CreateInterp();
    exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
@@ -209,26 +1652,29 @@ EOF
   end
 
   # check pthread mode
-  if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
+  if (TkLib_Config["ruby_with_thread"])
+    $CPPFLAGS ||= ""
+
     # ruby -> enable
     unless tcl_enable_thread
       # ruby -> enable && tcl -> disable
       puts(%Q'\
 *****************************************************************************
 **
-** PTHREAD SUPPORT MODE WARNING: 
+** NATIVETHREAD SUPPORT MODE WARNING:
 **
 **   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-**   seems to be compiled without pthread support. Although you can
-**   create the tcltklib library, this combination may cause errors
-**   (e.g. hangs or segmentation faults). If you have no reason to
-**   keep the current pthread support status, we recommend you reconfigure
-**   and recompile the libraries so that both or neither support pthreads.
+**   seems to be compiled without nativethread support. Although you can
+**   create the tcltklib library, this combination may cause errors (e.g.
+**   hangs or segmentation faults). If you have no reason to keep the
+**   current nativethread support status, we recommend you reconfigure and
+**   recompile the libraries so that both or neither support nativethreads.
 **
-**   If you want change the status of pthread support, please recompile 
-**   Ruby without "--enable-pthread" configure option or recompile Tcl/Tk 
-**   with "--enable-threads" configure option (if your Tcl/Tk is later 
-**   than or equal to Tcl/Tk 8.1).
+**   If you want change the status of nativethread support, please recompile
+**   Ruby without "--enable-pthread" configure option (If you use Ruby 1.9.x
+**   or later, you cannot remove this option, because it requires native-
+**   thread support.) or recompile Tcl/Tk with "--enable-threads" configure
+**   option (if your Tcl/Tk is later than or equal to Tcl/Tk 8.1).
 **
 *****************************************************************************
 ')
@@ -250,13 +1696,13 @@ EOF
       puts(%Q'\
 *****************************************************************************
 **
-** PTHREAD SUPPORT MODE ERROR: 
+** NATIVETHREAD SUPPORT MODE ERROR:
 **
-**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk 
-**   library seems to be compiled with pthread support. This
+**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk
+**   library seems to be compiled with nativethread support. This
 **   combination may cause frequent hang or segmentation fault
 **   errors when Ruby/Tk is working. We recommend that you NEVER
-**   create the library with such a combination of pthread support.
+**   create the library with such a combination of nativethread support.
 **
 **   Please recompile Ruby with the "--enable-pthread" configure option
 **   or recompile Tcl/Tk with the "--disable-threads" configure option.
@@ -273,40 +1719,314 @@ EOF
   end
 end
 
-if tcltk_framework || 
-   (have_header("tcl.h") && have_header("tk.h") &&
-      ( !use_X || find_library("X11", "XOpenDisplay",
-                               "/usr/X11/lib", "/usr/lib/X11", 
-                               "/usr/X11R6/lib", "/usr/openwin/lib")) &&
-    find_tcl(tcllib, stubs) &&
-    find_tk(tklib, stubs))
-  $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
-  $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
+##############################################################
+# main
+##############################################################
+# check header file
+print("check functions.")
+have_func("ruby_native_thread_p", "ruby.h")
+print(".") # progress
+have_func("rb_errinfo", "ruby.h")
+print(".") # progress
+have_func("rb_safe_level", "ruby.h")
+print(".") # progress
+have_func("rb_hash_lookup", "ruby.h")
+print(".") # progress
+have_func("rb_proc_new", "ruby.h")
+print(".") # progress
+have_func("rb_obj_untrust", "ruby.h")
+print(".") # progress
+have_func("rb_obj_taint", "ruby.h")
+print(".") # progress
+have_func("rb_set_safe_level_force", "ruby.h")
+print(".") # progress
+have_func("rb_sourcefile", "ruby.h")
+print("\n") # progress
+
+print("check struct members.")
+have_struct_member("struct RArray", "ptr", "ruby.h")
+print(".") # progress
+have_struct_member("struct RArray", "len", "ruby.h")
+print("\n") # progress
 
-  if tcltk_framework
-    if tcl_framework_header
-      $CPPFLAGS += " -I#{tcl_framework_header}"
+# check libraries
+unless is_win32?
+  print("check libraries.")
+  have_library("nsl", "t_open")
+  print(".") # progress
+  have_library("socket", "socket")
+  print(".") # progress
+  have_library("dl", "dlopen")
+  print(".") # progress
+  have_library("m", "log", "math.h")
+  print("\n") # progress
+end
+$CPPFLAGS ||= ""
+$CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
+
+# Does ruby have nativethread ?
+TkLib_Config["ruby_with_thread"] =
+  macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"')
+
+
+#---------------------------------------------------
+TclConfig_Info = {}
+TkConfig_Info  = {}
+
+# use Tcl/Tk build dir?  (has highest priority)
+TkLib_Config["tcl-build-dir"] = with_config("tcl-build-dir")
+TkLib_Config["tk-build-dir"]  = with_config("tk-build-dir")
+if TkLib_Config["tcl-build-dir"]
+  puts("use Tcl build (pre-install) dir \"#{TkLib_Config["tcl-build-dir"]}\"")
+  TkLib_Config["tcl-build-dir"] = File.expand_path(TkLib_Config["tcl-build-dir"])
+  base = File.dirname(TkLib_Config["tcl-build-dir"])
+  ($INCFLAGS ||= "") << " -I#{File.join(base, "generic").quote} -I#{TkLib_Config["tcl-build-dir"].quote}"
+  $LIBPATH ||= []; $LIBPATH |= [TkLib_Config["tcl-build-dir"]]
+end
+if TkLib_Config["tk-build-dir"]
+  puts("use Tk build (pre-install) dir \"#{TkLib_Config["tk-build-dir"]}\"")
+  TkLib_Config["tk-build-dir"] = File.expand_path(TkLib_Config["tk-build-dir"])
+  base = File.dirname(TkLib_Config["tk-build-dir"])
+  ($INCFLAGS ||= "") << " -I#{File.join(base, "generic").quote} -I#{TkLib_Config["tk-build-dir"].quote}"
+  $LIBPATH ||= []; $LIBPATH |= [TkLib_Config["tk-build-dir"]]
+end
+
+# check requirement of Tcl/tk version
+tcltk_version = with_config("tcltkversion")
+TkLib_Config["tcltkversion"] = check_tcltk_version(tcltk_version)
+
+if TkLib_Config["tcl-build-dir"]
+  if (cfgfile = with_config("tclConfig-file", Dir.glob(File.join(TkLib_Config["tcl-build-dir"], "tclConfig*.sh"), File::FNM_CASEFOLD)[0]))
+    TclConfig_Info['config_file_path'] = cfgfile
+    TkLib_Config["tclConfig_info"] = cfginfo = parse_tclConfig(cfgfile)
+    if tclver = TkLib_Config["tcltkversion"][0]
+      TkLib_Config["tcltkversion"][0].sub!(/\d(\.?)\d/, "#{cfginfo['TCL_MAJOR_VERSION']}\\1#{cfginfo['TCL_MINOR_VERSION']}")
+    else
+      TkLib_Config["tcltkversion"][0] = "#{cfginfo['TCL_MAJOR_VERSION']}.#{cfginfo['TCL_MINOR_VERSION']}"
+    end
+  end
+end
+if TkLib_Config["tk-build-dir"]
+  if (cfgfile = with_config("tkConfig-file", Dir.glob(File.join(TkLib_Config["tk-build-dir"], "tkConfig*.sh"), File::FNM_CASEFOLD)[0]))
+    TkConfig_Info['config_file_path'] = cfgfile
+    TkLib_Config["tkConfig_info"] = cfginfo = parse_tclConfig(cfgfile)
+    if TkLib_Config["tcltkversion"][1]
+      TkLib_Config["tcltkversion"][1].sub!(/\d(\.?)\d/, "#{cfginfo['TK_MAJOR_VERSION']}\\1#{cfginfo['TK_MINOR_VERSION']}")
     else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
+      TkLib_Config["tcltkversion"][1] = "#{cfginfo['TK_MAJOR_VERSION']}.#{cfginfo['TK_MINOR_VERSION']}"
     end
+  end
+end
+
+tclver, tkver = TkLib_Config["tcltkversion"]
+puts("Specified Tcl/Tk version is #{[tclver, tkver].inspect}") if tclver||tkver
 
-    if tk_framework_header
-      $CPPFLAGS += " -I#{tk_framework_header}"
+# use ActiveTcl ?
+#if activeTcl = with_config("ActiveTcl")
+#if activeTcl = with_config("ActiveTcl", true)
+if activeTcl = with_config("ActiveTcl", !(TkLib_Config["tcl-build-dir"] && TkLib_Config["tk-build-dir"]))
+  puts("Use ActiveTcl libraries (if available).")
+  unless activeTcl.kind_of? String
+    # set default ActiveTcl path
+    if CROSS_COMPILING
+    elsif is_win32?
+      activeTcl = 'c:/Tcl*'
+    elsif is_macosx?
+      activeTcl = '/Library/Frameworks'
     else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
+      activeTcl = '/opt/ActiveTcl*'
     end
+  end
+end
+TkLib_Config["ActiveTcl"] = activeTcl
 
-    $LDFLAGS += ' -framework Tk -framework Tcl'
+# allow space chars on a libpath
+TkLib_Config["space-on-tk-libpath"] =
+  enable_config("space-on-tk-libpath", ! is_win32?)
+
+# enable Tcl/Tk stubs?
+=begin
+if TclConfig_Info['TCL_STUB_LIB_SPEC'] && TkConfig_Info['TK_STUB_LIB_SPEC'] &&
+    !TclConfig_Info['TCL_STUB_LIB_SPEC'].strip.empty? &&
+    !TkConfig_Info['TK_STUB_LIB_SPEC'].strip.empty?
+  stubs = true
+  unless (st = enable_config("tcltk-stubs")).nil?
+    stubs &&= st
+  end
+  unless (st = with_config("tcltk-stubs")).nil?
+    stubs &&= st
   end
+else
+  stubs = enable_config("tcltk-stubs") || with_config("tcltk-stubs")
+end
+=end
+stubs = enable_config("tcltk-stubs") || with_config("tcltk-stubs")
+if (TkLib_Config["tcltk-stubs"] = stubs)
+  puts("Compile with Tcl/Tk stubs.")
+  $CPPFLAGS ||= ""; $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS'
+end
 
-  if stubs or pthread_check
-    # create Makefile
+# directory configuration of Tcl/Tk libraries
+if TkLib_Config["tcl-build-dir"]
+  tcl_idir = File.join(File.dirname(TkLib_Config["tcl-build-dir"]),"generic")
+  tcl_ldir = TkLib_Config["tcl-build-dir"]
+else
+  tcl_idir, tcl_ldir = dir_config("tcl")
+end
+if TkLib_Config["tk-build-dir"]
+  tk_idir = File.join(File.dirname(TkLib_Config["tk-build-dir"]),"generic")
+  tk_ldir = TkLib_Config["tk-build-dir"]
+else
+  tk_idir, tk_ldir = dir_config("tk")
+end
 
-    # for SUPPORT_STATUS
-    $INSTALLFILES ||= []
-    $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
+tcl_idir = tk_idir unless tcl_idir
+tcl_ldir = tk_ldir unless tcl_ldir
+tk_idir = tcl_idir unless tk_idir
+tk_ldir = tcl_ldir unless tk_ldir
 
-    # create
-    create_makefile("tcltklib")
+TclConfig_Info['TCL_INCLUDE_SPEC'] ||= ""
+TkConfig_Info['TK_INCLUDE_SPEC']   ||= ""
+TclConfig_Info['TCL_INCLUDE_SPEC'][0,0] = "-I#{tcl_idir.quote} " if tcl_idir
+TkConfig_Info['TK_INCLUDE_SPEC'][0,0]   = "-I#{tk_idir.quote} "  if tk_idir
+
+# get tclConfig.sh/tkConfig.sh
+TkLib_Config["tcl-NG-path"] = []
+TkLib_Config["tk-NG-path"] = []
+tclcfg, tkcfg =
+  get_tclConfig(
+    TclConfig_Info['config_file_path'] || with_config("tclConfig-file", true),
+    TkConfig_Info['config_file_path']  || with_config("tkConfig-file", true),
+    (TclConfig_Info['config_file_path'])?
+                File.dirname(TclConfig_Info['config_file_path']) :
+                with_config("tclConfig-dir", tcl_ldir || true),
+    (TkConfig_Info['config_file_path'])?
+                File.dirname(TkConfig_Info['config_file_path']) :
+                with_config("tkConfig-dir", tk_ldir || true)
+  )
+TclConfig_Info.merge!(TkLib_Config["tclConfig_info"]) if TkLib_Config["tclConfig_info"]
+TkConfig_Info.merge!(TkLib_Config["tkConfig_info"]) if TkLib_Config["tkConfig_info"]
+TclConfig_Info['config_file_path'] ||= tclcfg
+TkConfig_Info['config_file_path'] ||= tkcfg
+
+tk_cfg_dir  = File.dirname(TkConfig_Info['config_file_path'])  rescue nil
+tcl_cfg_dir = File.dirname(TclConfig_Info['config_file_path']) rescue nil
+
+tk_ldir_list  = [tk_ldir,  tk_cfg_dir].uniq
+tcl_ldir_list = [tcl_ldir, tcl_cfg_dir].uniq
+
+if TkConfig_Info['config_file_path']
+  if TkLib_Config["tk-build-dir"]
+    spec_dir = get_libpath(TkConfig_Info['TK_LIB_FLAG'], TkConfig_Info['TK_BUILD_LIB_SPEC'])
+  else
+    spec_dir = get_libpath(TkConfig_Info['TK_LIB_FLAG'], TkConfig_Info['TK_LIB_SPEC'])
   end
+  tk_ldir_list << spec_dir if File.directory?(spec_dir)
+end
+if TclConfig_Info['config_file_path']
+  if TkLib_Config["tcl-build-dir"]
+    spec_dir = get_libpath(TclConfig_Info['TCL_LIB_FLAG'], TclConfig_Info['TCL_BUILD_LIB_SPEC'])
+  else
+    spec_dir = get_libpath(TclConfig_Info['TCL_LIB_FLAG'], TclConfig_Info['TCL_LIB_SPEC'])
+  end
+  tcl_ldir_list << spec_dir if File.directory?(spec_dir)
+end
+
+# check tk_shlib_search_path
+TkLib_Config["checked_shlib_dirs"] =
+  check_shlib_search_path(with_config('tk-shlib-search-path'))
+
+# set TCL_DEFS and TK_DEFS
+$CPPFLAGS ||= ""
+# $CPPFLAGS += " #{TclConfig_Info['TCL_DEFS']}"
+# $CPPFLAGS += " #{TkConfig_Info['TK_DEFS']}"
+$defs += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS'])
+
+# MacOS X Frameworks?
+if TkLib_Config["tcltk-framework"]
+  puts("Use MacOS X Frameworks.")
+  ($LDFLAGS ||= "") << " -L#{TkLib_Config["tcl-build-dir"].quote} -Wl,-R#{TkLib_Config["tcl-build-dir"].quote}" if TkLib_Config["tcl-build-dir"]
+
+  if tcl_cfg_dir
+    TclConfig_Info['TCL_LIBS'] ||= ""
+    ($INCFLAGS ||= "") << ' ' << TclConfig_Info['TCL_INCLUDE_SPEC']
+    $LDFLAGS  << ' ' << TclConfig_Info['TCL_LIBS']
+    if stubs
+      if TkLib_Config["tcl-build-dir"] &&
+          TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC'] &&
+          !TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC'].strip.empty?
+        $LDFLAGS << ' ' << TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC']
+      else
+        $LDFLAGS << ' ' << TclConfig_Info['TCL_STUB_LIB_SPEC']
+      end
+    else
+      if TkLib_Config["tcl-build-dir"] &&
+          TclConfig_Info['TCL_BUILD_LIB_SPEC'] &&
+          !TclConfig_Info['TCL_BUILD_LIB_SPEC'].strip.empty?
+        $LDFLAGS << ' ' << TclConfig_Info['TCL_BUILD_LIB_SPEC']
+      else
+        $LDFLAGS << ' ' << TclConfig_Info['TCL_LIB_SPEC']
+      end
+    end
+  end
+
+  $LDFLAGS  << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-R#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"]
+
+  if tk_cfg_dir
+    TkConfig_Info['TK_LIBS'] ||= ""
+    ($INCFLAGS ||= "") << ' ' << TkConfig_Info['TK_INCLUDE_SPEC']
+    $LDFLAGS  << ' ' << TkConfig_Info['TK_LIBS']
+    if stubs
+      if TkLib_Config["tk-build-dir"] &&
+          TclConfig_Info['TK_BUILD_STUB_LIB_SPEC'] &&
+          !TclConfig_Info['TK_BUILD_STUB_LIB_SPEC'].strip.empty?
+        $LDFLAGS << ' ' << TkConfig_Info['TK_BUILD_STUB_LIB_SPEC']
+      else
+        $LDFLAGS << ' ' << TkConfig_Info['TK_STUB_LIB_SPEC']
+      end
+    else
+      if TkLib_Config["tk-build-dir"] &&
+          TclConfig_Info['TK_BUILD_LIB_SPEC'] &&
+          !TclConfig_Info['TK_BUILD_LIB_SPEC'].strip.empty?
+        $LDFLAGS << ' ' << TkConfig_Info['TK_BUILD_LIB_SPEC']
+      else
+        $LDFLAGS << ' ' << TkConfig_Info['TK_LIB_SPEC']
+      end
+    end
+  end
+  setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
+end
+
+# name of  Tcl/Tk libraries
+tklib = with_config("tklib")
+tcllib = with_config("tcllib")
+
+# search X libraries
+use_X = search_X_libraries
+
+
+#---------------------------------------------------
+if (TkLib_Config["tcltk-framework"] ||
+      ( find_tcltk_header(tclver, tkver) &&
+          find_tcltk_library(tcllib, tklib, stubs, tclver, tkver,
+                             tcl_ldir_list, tk_ldir_list) ) ) &&
+    (stubs || pthread_check())
+  # create Makefile
+
+  # for SUPPORT_STATUS
+  $INSTALLFILES ||= []
+  $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
+
+  # create
+  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
+  $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
+
+  # remove harmful definitions.
+  $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x}
+
+  create_makefile("tcltklib")
+
+  puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."
+else
+  puts "\nCan't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk."
 end
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 78ed1aa6ee..efeaf9830a 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -28,70 +28,18 @@ class << TclTkIp
     if Thread.current.group != ThreadGroup::Default
       raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
     end
-    __new__(*args)
+    obj = __new__(*args)
+    obj.instance_eval{
+      @force_default_encoding ||= TkUtil.untrust([false])
+      @encoding ||= TkUtil.untrust([nil])
+      def @encoding.to_s; self.join(nil); end
+    }
+    obj
   end
 end
 
 
 ################################################
-# use pseudo-toplevel feature of MultiTkIp ?
-if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) || 
-      Use_PseudoToplevel_Feature_of_MultiTkIp)
-  module MultiTkIp_PseudoToplevel_Evaluable
-    #def pseudo_toplevel_eval(body = Proc.new)
-    #  Thread.current[:TOPLEVEL] = self
-    #  begin
-    #    body.call
-    #  ensure
-    #    Thread.current[:TOPLEVEL] = nil
-    #  end
-    #end
-
-    def pseudo_toplevel_evaluable?
-      @pseudo_toplevel_evaluable
-    end
-
-    def pseudo_toplevel_evaluable=(mode)
-      @pseudo_toplevel_evaluable = (mode)? true: false
-    end
-
-    def self.extended(mod)
-      mod.__send__(:extend_object, mod)
-      mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
-    end
-  end
-
-  class Object
-    alias __method_missing_alias_for_MultiTkIp__ method_missing
-    private :__method_missing_alias_for_MultiTkIp__
-
-    def method_missing(id, *args)
-      begin
-        has_top = (top = MultiTkIp.__getip.__pseudo_toplevel) && 
-          top.respond_to?(:pseudo_toplevel_evaluable?) && 
-          top.pseudo_toplevel_evaluable? && 
-          top.respond_to?(id)
-      rescue Exception => e
-        has_top = false
-      end
-
-      if has_top
-        top.__send__(id, *args)
-      else
-        __method_missing_alias_for_MultiTkIp__(id, *args)
-      end
-    end
-  end
-else
-  # dummy
-  module MultiTkIp_PseudoToplevel_Evaluable
-    def pseudo_toplevel_evaluable?
-      false
-    end
-  end
-end
-
-################################################
 # exceptiopn to treat the return value from IP
 class MultiTkIp_OK < Exception
   def self.send(thread, ret=nil)
@@ -112,28 +60,61 @@ MultiTkIp_OK.freeze
 ################################################
 # methods for construction
 class MultiTkIp
+  class Command_Queue < Queue
+    def initialize(interp)
+      @interp = interp
+      super()
+    end
+
+    def push(value)
+      if !@interp || @interp.deleted?
+        fail RuntimeError, "Tk interpreter is already deleted"
+      end
+      super(value)
+    end
+    alias << push
+    alias enq push
+
+    def close
+      @interp = nil
+    end
+  end
+  Command_Queue.freeze
+
   BASE_DIR = File.dirname(__FILE__)
 
-  @@SLAVE_IP_ID = ['slave'.freeze, '0'.taint].freeze
+  WITH_RUBY_VM  = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
+  WITH_ENCODING = defined?(::Encoding.default_external)
+  #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
 
-  @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
+  (@@SLAVE_IP_ID = ['slave'.freeze, TkUtil.untrust('0')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
 
-  @@INIT_IP_ENV  = [].taint unless defined?(@@INIT_IP_ENV)  # table of Procs
-  @@ADD_TK_PROCS = [].taint unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
+  @@INIT_IP_ENV  = TkUtil.untrust([]) unless defined?(@@INIT_IP_ENV)  # table of Procs
+  @@ADD_TK_PROCS = TkUtil.untrust([]) unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
 
-  @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
+  @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
 
   unless defined?(@@TK_CMD_TBL)
-    @@TK_CMD_TBL = Object.new.taint
+    @@TK_CMD_TBL = TkUtil.untrust(Object.new)
 
-    @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
+    # @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
+    tbl_obj = TkUtil.untrust(Hash.new{|hash,key|
+                               fail IndexError, "unknown command ID '#{key}'"
+                             })
+    @@TK_CMD_TBL.instance_variable_set('@tbl', tbl_obj)
 
     class << @@TK_CMD_TBL
       allow = [
-        '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 
+        '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 'object_id',
         '[]', '[]=', 'delete', 'each', 'has_key?'
       ]
-      instance_methods.each{|m| undef_method(m) unless allow.index(m)}
+      instance_methods.each{|m| undef_method(m) unless allow.index(m.to_s)}
 
       def kind_of?(klass)
         @tbl.kind_of?(klass)
@@ -169,7 +150,7 @@ class MultiTkIp
       def delete(idx, &blk)
         # if gets an entry, is permited to delete
         if self[idx]
-          @tbl.delete(idx) 
+          @tbl.delete(idx)
         elsif blk
           blk.call(idx)
         else
@@ -205,8 +186,11 @@ class MultiTkIp
   @@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
     def initialize(ip, cmd)
       @ip = ip
-      @cmd = cmd
-      freeze
+      @safe = safe = $SAFE
+      # @cmd = cmd
+      cmd = MultiTkIp._proc_on_safelevel(&cmd)
+      @cmd = proc{|*args| cmd.call(safe, *args)}
+      self.freeze
     end
     attr_reader :ip, :cmd
     def inspect
@@ -215,8 +199,8 @@ class MultiTkIp
     def call(*args)
       unless @ip.deleted?
         current = Thread.current
-        backup_ip = current['callback_ip']
-        current['callback_ip'] = @ip
+        backup_ip = current[:callback_ip]
+        current[:callback_ip] = @ip
         begin
           ret = @ip.cb_eval(@cmd, *args)
           fail ret if ret.kind_of?(Exception)
@@ -249,7 +233,7 @@ class MultiTkIp
             fail e
           end
         ensure
-          current['callback_ip'] = backup_ip
+          current[:callback_ip] = backup_ip
         end
       end
     end
@@ -425,7 +409,7 @@ class MultiTkIp
     rescue SystemExit => e
       # delete IP
       unless @interp.deleted?
-        @slave_ip_tbl.each{|name, subip| 
+        @slave_ip_tbl.each{|name, subip|
           _destroy_slaves_of_slaveIP(subip)
           begin
             # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
@@ -448,11 +432,11 @@ class MultiTkIp
               next if subip.deleted?
             end
           end
-          if subip.respond_to?(:safe_base?) && subip.safe_base? && 
+          if subip.respond_to?(:safe_base?) && subip.safe_base? &&
               !subip.deleted?
             # do 'exit' to call the delete_hook procedure
             begin
-              subip._eval_without_enc('exit') 
+              subip._eval_without_enc('exit')
             rescue Exception
             end
           else
@@ -527,11 +511,11 @@ class MultiTkIp
                 next if subip.deleted?
               end
             end
-            if subip.respond_to?(:safe_base?) && subip.safe_base? && 
+            if subip.respond_to?(:safe_base?) && subip.safe_base? &&
                 !subip.deleted?
               # do 'exit' to call the delete_hook procedure
               begin
-                subip._eval_without_enc('exit') 
+                subip._eval_without_enc('exit')
               rescue Exception
               end
             else
@@ -573,7 +557,11 @@ class MultiTkIp
       # raise exception
       begin
         bt = _toUTF8(e.backtrace.join("\n"))
-        bt.instance_variable_set(:@encoding, 'utf-8')
+        if MultiTkIp::WITH_ENCODING
+          bt.force_encoding('utf-8')
+        else
+          bt.instance_variable_set(:@encoding, 'utf-8')
+        end
       rescue Exception
         bt = e.backtrace.join("\n")
       end
@@ -642,12 +630,12 @@ class MultiTkIp
           case cmd
           when 'set_safe_level'
             begin
-              safe_level = args[0] if safe_level < args[0] 
+              safe_level = args[0] if safe_level < args[0]
             rescue Exception
             end
           when 'call_mainloop'
             thread = args.shift
-            _check_and_return(thread, 
+            _check_and_return(thread,
                               MultiTkIp_OK.new(_receiver_mainloop(*args)))
           else
             # ignore
@@ -655,8 +643,8 @@ class MultiTkIp
 
         else
           # procedure
-          last_thread[thread] = _receiver_eval_proc(last_thread[thread], 
-						    safe_level, thread, 
+          last_thread[thread] = _receiver_eval_proc(last_thread[thread],
+						    safe_level, thread,
 						    cmd, *args)
         end
       end
@@ -667,21 +655,35 @@ class MultiTkIp
       begin
         loop do
           sleep 1
-          receiver.kill if @interp.deleted?
+          if @interp.deleted?
+            receiver.kill
+            @cmd_queue.close
+          end
           break unless receiver.alive?
         end
       rescue Exception
         # ignore all kind of Exception
       end
+
       # receiver is dead
+      retry_count = 3
       loop do
-        thread, cmd, *args = @cmd_queue.deq
+        Thread.pass
+        begin
+          thread, cmd, *args = @cmd_queue.deq(true) # non-block
+        rescue ThreadError
+          # queue is empty
+          retry_count -= 1
+          break if retry_count <= 0
+          sleep 0.5
+          retry
+        end
         next unless thread
         if thread.alive?
           if @interp.deleted?
             thread.raise RuntimeError, 'the interpreter is already deleted'
           else
-            thread.raise RuntimeError, 
+            thread.raise RuntimeError,
               'the interpreter no longer receives command procedures'
           end
         end
@@ -695,6 +697,11 @@ class MultiTkIp
 
   ######################################
 
+  unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
+    ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
+    RUN_EVENTLOOP_ON_MAIN_THREAD = false
+  end
+
   if self.const_defined? :DEFAULT_MASTER_NAME
     name = DEFAULT_MASTER_NAME.to_s
   else
@@ -709,28 +716,109 @@ class MultiTkIp
 
   @@DEFAULT_MASTER = self.allocate
   @@DEFAULT_MASTER.instance_eval{
-    @tk_windows = {}.taint
+    @tk_windows = TkUtil.untrust({})
 
-    @tk_table_list = [].taint
+    @tk_table_list = TkUtil.untrust([])
 
-    @slave_ip_tbl = {}.taint
+    @slave_ip_tbl = TkUtil.untrust({})
 
-    @slave_ip_top = {}.taint
+    @slave_ip_top = TkUtil.untrust({})
 
-    @evloop_thread = [].taint
+    @evloop_thread = TkUtil.untrust([])
 
     unless keys.kind_of? Hash
       fail ArgumentError, "expecting a Hash object for the 2nd argument"
     end
 
-    @interp = TclTkIp.new(name, _keys2opts(keys))
+    if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
+      @interp = TclTkIp.new(name, _keys2opts(keys))
+    else ### Ruby 1.9 !!!!!!!!!!!
+      @interp_thread = Thread.new{
+        current = Thread.current
+        begin
+          current[:interp] = interp = TclTkIp.new(name, _keys2opts(keys))
+        rescue e
+          current[:interp] = e
+          raise e
+        end
+        #sleep
+        current[:mutex] = mutex = Mutex.new
+        current[:root_check] = cond_var = ConditionVariable.new
+
+        status = [nil]
+        def status.value
+          self[0]
+        end
+        def status.value=(val)
+          self[0] = val
+        end
+        current[:status] = status
+
+        begin
+          begin
+            #TclTkLib.mainloop_abort_on_exception = false
+            #Thread.current[:status].value = TclTkLib.mainloop(true)
+            interp.mainloop_abort_on_exception = true
+            current[:status].value = interp.mainloop(true)
+          rescue SystemExit=>e
+            current[:status].value = e
+          rescue Exception=>e
+            current[:status].value = e
+            retry if interp.has_mainwindow?
+          ensure
+            mutex.synchronize{ cond_var.broadcast }
+          end
+
+          #Thread.current[:status].value = TclTkLib.mainloop(false)
+          current[:status].value = interp.mainloop(false)
+
+        ensure
+          # interp must be deleted before the thread for interp is dead.
+          # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler 
+          # deleted by the wrong thread.
+          interp.delete
+        end
+      }
+      until @interp_thread[:interp]
+        Thread.pass
+      end
+      # INTERP_THREAD.run
+      raise @interp_thread[:interp] if @interp_thread[:interp].kind_of? Exception
+      @interp = @interp_thread[:interp]
+
+      # delete the interpreter and kill the eventloop thread at exit
+      interp = @interp
+      interp_thread = @interp_thread
+      END{
+        if interp_thread.alive?
+          interp.delete
+          interp_thread.kill
+        end
+      }
+
+      def self.mainloop(check_root = true)
+        begin
+          TclTkLib.set_eventloop_window_mode(true)
+          @interp_thread.value
+        ensure
+          TclTkLib.set_eventloop_window_mode(false)
+        end
+      end
+    end
+
+    @interp.instance_eval{
+      @force_default_encoding ||= TkUtil.untrust([false])
+      @encoding ||= TkUtil.untrust([nil])
+      def @encoding.to_s; self.join(nil); end
+    }
+
     @ip_name = nil
 
-    @callback_status = [].taint
+    @callback_status = TkUtil.untrust([])
 
     @system = Object.new
 
-    @wait_on_mainloop = [true, 0].taint
+    @wait_on_mainloop = TkUtil.untrust([true, 0])
 
     @threadgroup  = Thread.current.group
 
@@ -738,7 +826,7 @@ class MultiTkIp
 
     @safe_level = [$SAFE]
 
-    @cmd_queue = Queue.new
+    @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
 
     @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
 
@@ -755,13 +843,13 @@ class MultiTkIp
     @pseudo_toplevel = [false, nil]
 
     def self.__pseudo_toplevel
-      Thread.current.group == ThreadGroup::Default && 
+      Thread.current.group == ThreadGroup::Default &&
         MultiTkIp.__getip == @@DEFAULT_MASTER &&
         self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
     end
 
     def self.__pseudo_toplevel=(m)
-      unless (Thread.current.group == ThreadGroup::Default && 
+      unless (Thread.current.group == ThreadGroup::Default &&
                 MultiTkIp.__getip == @@DEFAULT_MASTER)
         fail SecurityError, "no permission to manipulate"
       end
@@ -785,7 +873,7 @@ class MultiTkIp
     end
 
     def self.__pseudo_toplevel_evaluable=(mode)
-      unless (Thread.current.group == ThreadGroup::Default && 
+      unless (Thread.current.group == ThreadGroup::Default &&
                 MultiTkIp.__getip == @@DEFAULT_MASTER)
         fail SecurityError, "no permission to manipulate"
       end
@@ -812,7 +900,7 @@ class MultiTkIp
         rescue @assign_request=>req
           begin
             req.ret[0] = req.target.instance_eval{
-              @cmd_receiver, @receiver_watchdog = 
+              @cmd_receiver, @receiver_watchdog =
                 _create_receiver_and_watchdog(@safe_level[0])
               @threadgroup.add @cmd_receiver
               @threadgroup.add @receiver_watchdog
@@ -853,22 +941,26 @@ class MultiTkIp
     Thread.new{
       current = Thread.current
       loop {
-        mtx, ret, table, script = @init_ip_env_queue.deq
-        begin        
+        mtx, cond, ret, table, script = @init_ip_env_queue.deq
+        begin
           ret[0] = table.each{|tg, ip| ip._init_ip_env(script) }
         rescue Exception => e
           ret[0] = e
         ensure
-          mtx.unlock
+          mtx.synchronize{ cond.signal }
         end
+        mtx = cond = ret = table = script = nil  # clear variables for GC
       }
     }
 
     def self.__init_ip_env__(table, script)
       ret = []
-      mtx = Mutex.new.lock
-      @init_ip_env_queue.enq([mtx, ret, table, script])
-      mtx.lock
+      mtx  = (Thread.current[:MultiTk_ip_Mutex] ||= Mutex.new)
+      cond = (Thread.current[:MultiTk_ip_CondVar] ||= ConditionVariable.new)
+      mtx.synchronize{
+        @init_ip_env_queue.enq([mtx, cond, ret, table, script])
+        cond.wait(mtx)
+      }
       if ret[0].kind_of?(Exception)
         raise ret[0]
       else
@@ -893,8 +985,9 @@ class MultiTkIp
       begin
         class << subclass
           self.methods.each{|m|
+            name = m.to_s
             begin
-              unless m == '__id__' || m == '__send__' || m == 'freeze'
+              unless name == '__id__' || name == '__send__' || name == 'freeze'
                 undef_method(m)
               end
             rescue Exception
@@ -904,7 +997,7 @@ class MultiTkIp
         end
       ensure
         subclass.freeze
-        fail SecurityError, 
+        fail SecurityError,
           "cannot create subclass of MultiTkIp on a untrusted ThreadGroup"
       end
     end
@@ -913,9 +1006,9 @@ class MultiTkIp
   ######################################
 
   @@SAFE_OPT_LIST = [
-    'accessPath'.freeze, 
-    'statics'.freeze, 
-    'nested'.freeze, 
+    'accessPath'.freeze,
+    'statics'.freeze,
+    'nested'.freeze,
     'deleteHook'.freeze
   ].freeze
 
@@ -928,7 +1021,7 @@ class MultiTkIp
     keys.each{|k,v|
       k_str = k.to_s
       if k_str == 'name'
-        name = v 
+        name = v
       elsif k_str == 'safe'
         safe = v
       elsif @@SAFE_OPT_LIST.member?(k_str)
@@ -947,9 +1040,11 @@ class MultiTkIp
   private :_parse_slaveopts
 
   def _create_slave_ip_name
-    name = @@SLAVE_IP_ID.join('')
-    @@SLAVE_IP_ID[1].succ!
-    name.freeze
+    @@SLAVE_IP_ID.mutex.synchronize{
+      name = @@SLAVE_IP_ID.join('')
+      @@SLAVE_IP_ID[1].succ!
+      name.freeze
+    }
   end
   private :_create_slave_ip_name
 
@@ -998,8 +1093,8 @@ class MultiTkIp
       # match display?
       if assoc_display != new_keys['display']
         if optkeys.key?(:display) || optkeys.key?('display')
-          fail RuntimeError, 
-            "conflicting 'display'=>#{new_keys['display']} " + 
+          fail RuntimeError,
+            "conflicting 'display'=>#{new_keys['display']} " +
             "and display '#{assoc_display}' on 'use'=>#{new_keys['use']}"
         else
           new_keys['display'] = assoc_display
@@ -1066,14 +1161,14 @@ class MultiTkIp
       fc.bindtags = fc.bindtags.unshift(tag)
 
       TkFrame.new(fc, :bd=>0){|f|
-        TkButton.new(f, 
-                     :text=>'Delete', :bd=>1, :padx=>2, :pady=>0, 
+        TkButton.new(f,
+                     :text=>'Delete', :bd=>1, :padx=>2, :pady=>0,
                      :highlightthickness=>0, :command=>slave_delete_proc
                      ).pack(:side=>:right, :fill=>:both)
         f.pack(:side=>:right, :fill=>:both, :expand=>true)
       }
 
-      TkLabel.new(fc, :text=>msg, :padx=>2, :pady=>0, 
+      TkLabel.new(fc, :text=>msg, :padx=>2, :pady=>0,
                   :anchor=>:w).pack(:side=>:left, :fill=>:both, :expand=>true)
 
       fc.pack(:side=>:bottom, :fill=>:x)
@@ -1097,6 +1192,11 @@ class MultiTkIp
     # safe interpreter
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, true)
+    slave_ip.instance_eval{
+      @force_default_encoding ||= TkUtil.untrust([false])
+      @encoding ||= TkUtil.untrust([nil])
+      def @encoding.to_s; self.join(nil); end
+    }
     @slave_ip_tbl[ip_name] = slave_ip
     def slave_ip.safe_base?
       true
@@ -1111,21 +1211,22 @@ class MultiTkIp
       if tk_opts.key?('use')
         @slave_ip_top[ip_name] = ''
       else
-        tk_opts, top_path = __create_safetk_frame(slave_ip, ip_name, app_name, 
+        tk_opts, top_path = __create_safetk_frame(slave_ip, ip_name, app_name,
                                                   tk_opts)
         @slave_ip_top[ip_name] = top_path
       end
       @interp._eval("::safe::loadTk #{ip_name} #{_keys2opts(tk_opts)}")
+      @interp._invoke('__replace_slave_tk_commands__', ip_name)
     else
       @slave_ip_top[ip_name] = nil
     end
 
     if safe_opts.key?('deleteHook') || safe_opts.key?(:deleteHook)
-      @interp._eval("::safe::interpConfigure #{ip_name} " + 
+      @interp._eval("::safe::interpConfigure #{ip_name} " +
                     _keys2opts(safe_opts))
     else
-      @interp._eval("::safe::interpConfigure #{ip_name} " + 
-                    _keys2opts(safe_opts) + '-deleteHook {' + 
+      @interp._eval("::safe::interpConfigure #{ip_name} " +
+                    _keys2opts(safe_opts) + '-deleteHook {' +
                     TkComm._get_eval_string(proc{|slave|
                                               self._default_delete_hook(slave)
                                             }) + '}')
@@ -1139,9 +1240,15 @@ class MultiTkIp
 
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, false)
+    slave_ip.instance_eval{
+      @force_default_encoding ||= TkUtil.untrust([false])
+      @encoding ||= TkUtil.untrust([nil])
+      def @encoding.to_s; self.join(nil); end
+    }
     slave_ip._invoke('set', 'argv0', name) if name.kind_of?(String)
     slave_ip._invoke('set', 'argv', _keys2opts(keys))
     @interp._invoke('load', '', 'Tk', ip_name)
+    @interp._invoke('__replace_slave_tk_commands__', ip_name)
     @slave_ip_tbl[ip_name] = slave_ip
     [slave_ip, ip_name]
   end
@@ -1189,12 +1296,12 @@ class MultiTkIp
     @cb_error_proc = []
     @evloop_thread = []
 
-    @tk_windows.taint unless @tk_windows.tainted?
-    @tk_table_list.taint unless @tk_table_list.tainted?
-    @slave_ip_tbl.taint unless @slave_ip_tbl.tainted?
-    @slave_ip_top.taint unless @slave_ip_top.tainted?
-    @cb_error_proc.taint unless @cb_error_proc.tainted?
-    @evloop_thread.taint unless @evloop_thread.tainted?
+    TkUtil.untrust(@tk_windows)    unless @tk_windows.tainted?
+    TkUtil.untrust(@tk_table_list) unless @tk_table_list.tainted?
+    TkUtil.untrust(@slave_ip_tbl)  unless @slave_ip_tbl.tainted?
+    TkUtil.untrust(@slave_ip_top)  unless @slave_ip_top.tainted?
+    TkUtil.untrust(@cb_error_proc) unless @cb_error_proc.tainted?
+    TkUtil.untrust(@evloop_thread) unless @evloop_thread.tainted?
 
     @callback_status = []
 
@@ -1206,21 +1313,112 @@ class MultiTkIp
 
     if safeip == nil
       # create master-ip
-      @interp = TclTkIp.new(name, _keys2opts(tk_opts))
+      unless WITH_RUBY_VM
+        @interp = TclTkIp.new(name, _keys2opts(tk_opts))
+        @interp.instance_eval{
+          @force_default_encoding ||= TkUtil.untrust([false])
+          @encoding ||= TkUtil.untrust([nil])
+          def @encoding.to_s; self.join(nil); end
+        }
+
+      else ### Ruby 1.9 !!!!!!!!!!!
+=begin
+        @interp_thread = Thread.new{
+          Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
+          interp.instance_eval{
+            @force_default_encoding ||= TkUtil.untrust([false])
+            @encoding ||= TkUtil.untrust([nil])
+            def @encoding.to_s; self.join(nil); end
+          }
+
+          #sleep
+          TclTkLib.mainloop(true)
+        }
+        until @interp_thread[:interp]
+          Thread.pass
+        end
+        # INTERP_THREAD.run
+        @interp = @interp_thread[:interp]
+=end
+        @interp_thread = Thread.new{
+          current = Thread.current
+          begin
+            current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
+          rescue e
+            current[:interp] = e
+            raise e
+          end
+          #sleep
+          #TclTkLib.mainloop(true)
+          current[:mutex] = mutex = Mutex.new
+          current[:root_check] = cond_ver = ConditionVariable.new
+
+          status = [nil]
+          def status.value
+            self[0]
+          end
+          def status.value=(val)
+            self[0] = val
+          end
+          current[:status] = status
+
+          begin
+            begin
+              current[:status].value = interp.mainloop(true)
+            rescue SystemExit=>e
+              current[:status].value = e
+            rescue Exception=>e
+              current[:status].value = e
+              retry if interp.has_mainwindow?
+            ensure
+              mutex.synchronize{ cond_var.broadcast }
+            end
+            current[:status].value = interp.mainloop(false)
+          ensure
+            interp.delete
+          end
+        }
+        until @interp_thread[:interp]
+          Thread.pass
+        end
+        # INTERP_THREAD.run
+        @interp = @interp_thread[:interp]
+
+        @evloop_thread[0] = @interp_thread
+
+        def self.mainloop(check_root = true)
+          begin
+            TclTkLib.set_eventloop_window_mode(true)
+            @interp_thread.value
+          ensure
+            TclTkLib.set_eventloop_window_mode(false)
+          end
+        end
+      end
+
+      @interp.instance_eval{
+        @force_default_encoding ||= TkUtil.untrust([false])
+        @encoding ||= TkUtil.untrust([nil])
+        def @encoding.to_s; self.join(nil); end
+      }
 
       @ip_name = nil
+
       if safe
         safe = $SAFE if safe < $SAFE
         @safe_level = [safe]
       else
         @safe_level = [$SAFE]
       end
+
     else
       # create slave-ip
       if safeip || master.safe?
         @safe_base = true
-        @interp, @ip_name = master.__create_safe_slave_obj(safe_opts, 
+        @interp, @ip_name = master.__create_safe_slave_obj(safe_opts,
                                                            name, tk_opts)
+        # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
+        @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
         if safe
           safe = master.safe_level if safe < master.safe_level
           @safe_level = [safe]
@@ -1229,6 +1427,8 @@ class MultiTkIp
         end
       else
         @interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
+        # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
+        @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
         if safe
           safe = master.safe_level if safe < master.safe_level
           @safe_level = [safe]
@@ -1236,21 +1436,21 @@ class MultiTkIp
           @safe_level = [master.safe_level]
         end
       end
-      @set_alias_proc = proc{|name| 
+      @set_alias_proc = proc{|name|
         master._invoke('interp', 'alias', @ip_name, name, '', name)
       }.freeze
     end
 
     @system = Object.new
 
-    @wait_on_mainloop = [true, 0].taint
-    # @wait_on_mainloop = [false, 0].taint
+    @wait_on_mainloop = TkUtil.untrust([true, 0])
+    # @wait_on_mainloop = TkUtil.untrust([false, 0])
 
     @threadgroup  = ThreadGroup.new
 
     @pseudo_toplevel = [false, nil]
 
-    @cmd_queue = Queue.new
+    @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
 
 =begin
     @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
@@ -1263,11 +1463,10 @@ class MultiTkIp
     @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
 
     @@IP_TABLE[@threadgroup] = self
-    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-    @@TK_TABLE_LIST.size.times{ 
-      (tbl = {}).tainted? || tbl.taint
-      @tk_table_list << tbl
+    @@TK_TABLE_LIST.size.times{
+      @tk_table_list << TkUtil.untrust({})
     }
+    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
 
     class << self
       undef :instance_eval
@@ -1313,6 +1512,17 @@ end
 
 # get target IP
 class MultiTkIp
+  @@CALLBACK_SUBTHREAD = Class.new(Thread){
+    def self.new(interp, &blk)
+      super(interp){|ip| Thread.current[:callback_ip] = ip; blk.call}
+    end
+
+    @table = TkUtil.untrust(Hash.new{|h,k| h[k] = TkUtil.untrust([])})
+    def self.table
+      @table
+    end
+  }
+
   def self._ip_id_
     __getip._ip_id_
   end
@@ -1323,15 +1533,18 @@ class MultiTkIp
 
   def self.__getip
     current = Thread.current
-    if TclTkLib.mainloop_thread? != false && current['callback_ip']
-      return current['callback_ip']
+    if current.kind_of?(@@CALLBACK_SUBTHREAD)
+      return current[:callback_ip]
+    end
+    if TclTkLib.mainloop_thread? != false && current[:callback_ip]
+      return current[:callback_ip]
     end
     if current.group == ThreadGroup::Default
       @@DEFAULT_MASTER
     else
       ip = @@IP_TABLE[current.group]
       unless ip
-        fail SecurityError, 
+        fail SecurityError,
           "cannot call Tk methods on #{Thread.current.inspect}"
       end
       ip
@@ -1345,8 +1558,13 @@ class << MultiTkIp
   alias __new new
   private :__new
 
+  def new_master(safe=nil, keys={}, &blk)
+    if MultiTkIp::WITH_RUBY_VM
+      #### TODO !!!!!!
+      fail RuntimeError,
+           'sorry, still not support multiple master-interpreters on RubyVM'
+    end
 
-  def new_master(safe=nil, keys={})
     if safe.kind_of?(Hash)
       keys = safe
     elsif safe.kind_of?(Integer)
@@ -1362,15 +1580,17 @@ class << MultiTkIp
 
     ip = __new(__getip, nil, keys)
     #ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
-     if block_given?
-       Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-     end
+    if block_given?
+      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
+      ip._proc_on_safelevel(&blk).call(ip.safe_level)
+    end
     ip
   end
 
   alias new new_master
 
-  def new_slave(safe=nil, keys={})
+  def new_slave(safe=nil, keys={}, &blk)
     if safe.kind_of?(Hash)
       keys = safe
     elsif safe.kind_of?(Integer)
@@ -1387,13 +1607,15 @@ class << MultiTkIp
     ip = __new(__getip, false, keys)
     # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
     if block_given?
-      Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
+      ip._proc_on_safelevel(&blk).call(ip.safe_level)
     end
     ip
   end
   alias new_trusted_slave new_slave
 
-  def new_safe_slave(safe=4, keys={})
+  def new_safe_slave(safe=4, keys={}, &blk)
     if safe.kind_of?(Hash)
       keys = safe
     elsif safe.kind_of?(Integer)
@@ -1408,7 +1630,9 @@ class << MultiTkIp
     ip = __new(__getip, true, keys)
     # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
     if block_given?
-      Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
+      ip._proc_on_safelevel(&blk).call(ip.safe_level)
     end
     ip
   end
@@ -1494,7 +1718,7 @@ class MultiTkIp
 
   def slaves(all = false)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp','slaves').split.map!{|name| 
+    @interp._invoke('interp','slaves').split.map!{|name|
       if @slave_ip_tbl.key?(name)
         @slave_ip_tbl[name]
       elsif all
@@ -1541,9 +1765,8 @@ class MultiTkIp
   end
 
   def _add_new_tables
-    (@@TK_TABLE_LIST.size - @tk_table_list.size).times{ 
-      (tbl = {}).tainted? || tbl.taint
-      @tk_table_list << tbl
+    (@@TK_TABLE_LIST.size - @tk_table_list.size).times{
+      @tk_table_list << TkUtil.untrust({})
     }
   end
 
@@ -1563,8 +1786,13 @@ class MultiTkIp
     return if slave?
     names.each{|name|
       name = name.to_s
+
+      return if @interp.deleted?
       @interp._invoke('rename', name, '')
+
+      return if @interp.deleted?
       @interp._invoke('interp', 'slaves').split.each{|slave|
+        return if @interp.deleted?
         @interp._invoke('interp', 'alias', slave, name, '') rescue nil
       }
     }
@@ -1573,7 +1801,7 @@ class MultiTkIp
   def _init_ip_internal(init_ip_env, add_tk_procs)
     #init_ip_env.each{|script| self.eval_proc{script.call(self)}}
     init_ip_env.each{|script| self._init_ip_env(script)}
-    add_tk_procs.each{|name, args, body| 
+    add_tk_procs.each{|name, args, body|
       if master?
         @interp._invoke('proc', name, args, body) if args && body
       else
@@ -1596,7 +1824,7 @@ class MultiTkIp
     __getip._tk_table_list[id]
   end
   def self.create_table
-    if __getip.slave? 
+    if __getip.slave?
       begin
         raise SecurityError, "slave-IP has no permission creating a new table"
       rescue SecurityError => e
@@ -1614,11 +1842,16 @@ class MultiTkIp
     id = @@TK_TABLE_LIST.size
     obj = Object.new
     @@TK_TABLE_LIST << obj
-    obj.instance_eval <<-EOD
+    obj.instance_variable_set(:@id, id)
+    obj.instance_variable_set(:@mutex, Mutex.new)
+    obj.instance_eval{
+      def self.mutex
+        @mutex
+      end
       def self.method_missing(m, *args)
-         MultiTkIp.tk_object_table(#{id}).__send__(m, *args)
+        MultiTkIp.tk_object_table(@id).__send__(m, *args)
       end
-    EOD
+    }
     obj.freeze
     @@IP_TABLE.each{|tg, ip| ip._add_new_tables }
     return obj
@@ -1641,7 +1874,7 @@ class MultiTkIp
       end
     end
 
-    # @@IP_TABLE.each{|tg, ip| 
+    # @@IP_TABLE.each{|tg, ip|
     #   ip._init_ip_env(script)
     # }
     @@DEFAULT_MASTER.__init_ip_env__(@@IP_TABLE, script)
@@ -1653,7 +1886,7 @@ class MultiTkIp
     else
       name = name.to_s
       @@ADD_TK_PROCS << [name, args, body]
-      @@IP_TABLE.each{|tg, ip| 
+      @@IP_TABLE.each{|tg, ip|
         ip._add_tk_procs(name, args, body)
       }
     end
@@ -1662,11 +1895,11 @@ class MultiTkIp
   def self.remove_tk_procs(*names)
     names.each{|name|
       name = name.to_s
-      @@ADD_TK_PROCS.delete_if{|elem| 
+      @@ADD_TK_PROCS.delete_if{|elem|
         elem.kind_of?(Array) && elem[0].to_s == name
       }
     }
-    @@IP_TABLE.each{|tg, ip| 
+    @@IP_TABLE.each{|tg, ip|
       ip._remove_tk_procs(*names)
     }
   end
@@ -1676,7 +1909,6 @@ class MultiTkIp
   end
 end
 
-
 # for callback operation
 class MultiTkIp
   def self.cb_entry_class
@@ -1701,12 +1933,20 @@ class MultiTkIp
   end
 =end
   def cb_eval(cmd, *args)
+    self.eval_callback(*args, 
+                       &_proc_on_safelevel{|*params|
+                         TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
+                       })
+  end
+=begin
+  def cb_eval(cmd, *args)
     self.eval_callback(*args){|safe, *params|
       $SAFE=safe if $SAFE < safe
       # TkUtil.eval_cmd(cmd, *params)
       TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
     }
   end
+=end
 =begin
   def cb_eval(cmd, *args)
     @callback_status[0] ||= TkVariable.new
@@ -1766,7 +2006,7 @@ class MultiTkIp
   end
 
   def __pseudo_toplevel=(m)
-    unless (Thread.current.group == ThreadGroup::Default && 
+    unless (Thread.current.group == ThreadGroup::Default &&
               MultiTkIp.__getip == @@DEFAULT_MASTER)
       fail SecurityError, "no permission to manipulate"
     end
@@ -1790,7 +2030,7 @@ class MultiTkIp
   end
 
   def __pseudo_toplevel_evaluable=(mode)
-    unless (Thread.current.group == ThreadGroup::Default && 
+    unless (Thread.current.group == ThreadGroup::Default &&
               MultiTkIp.__getip == @@DEFAULT_MASTER)
       fail SecurityError, "no permission to manipulate"
     end
@@ -1799,8 +2039,111 @@ class MultiTkIp
   end
 end
 
+
+################################################
+# use pseudo-toplevel feature of MultiTkIp ?
+if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
+      Use_PseudoToplevel_Feature_of_MultiTkIp)
+  module MultiTkIp_PseudoToplevel_Evaluable
+    #def pseudo_toplevel_eval(body = Proc.new)
+    #  Thread.current[:TOPLEVEL] = self
+    #  begin
+    #    body.call
+    #  ensure
+    #    Thread.current[:TOPLEVEL] = nil
+    #  end
+    #end
+
+    def pseudo_toplevel_evaluable?
+      @pseudo_toplevel_evaluable
+    end
+
+    def pseudo_toplevel_evaluable=(mode)
+      @pseudo_toplevel_evaluable = (mode)? true: false
+    end
+
+    def self.extended(mod)
+      mod.__send__(:extend_object, mod)
+      mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
+    end
+  end
+
+  class Object
+    alias __method_missing_alias_for_MultiTkIp__ method_missing
+    private :__method_missing_alias_for_MultiTkIp__
+
+    def method_missing(id, *args)
+      begin
+        has_top = (top = MultiTkIp.__getip.__pseudo_toplevel) &&
+          top.respond_to?(:pseudo_toplevel_evaluable?) &&
+          top.pseudo_toplevel_evaluable? &&
+          top.respond_to?(id)
+      rescue Exception => e
+        has_top = false
+      end
+
+      if has_top
+        top.__send__(id, *args)
+      else
+        __method_missing_alias_for_MultiTkIp__(id, *args)
+      end
+    end
+  end
+else
+  # dummy
+  module MultiTkIp_PseudoToplevel_Evaluable
+    def pseudo_toplevel_evaluable?
+      false
+    end
+  end
+end
+
+
+################################################
 # evaluate a procedure on the proper interpreter
 class MultiTkIp
+  # instance & class method
+  def _proc_on_safelevel(cmd=nil, &blk) # require a block for eval
+    if cmd
+      if cmd.kind_of?(Method)
+        _proc_on_safelevel{|*args| cmd.call(*args)}
+      else
+        _proc_on_safelevel(&cmd)
+      end
+    else
+      #Proc.new{|safe, *args| $SAFE=safe if $SAFE < safe; yield(*args)}
+      Proc.new{|safe, *args|
+        # avoid security error on Exception objects
+        untrust_proc = proc{|err|
+          begin
+            err.untrust if err.respond_to?(:untrust)
+          rescue SecurityError
+          end
+          err
+        }
+        $SAFE=safe if $SAFE < safe; 
+        begin
+          yield(*args)
+        rescue Exception => e
+          fail untrust_proc.call(e)
+        end
+      }
+    end
+  end
+  def MultiTkIp._proc_on_safelevel(cmd=nil, &blk)
+    MultiTkIp.__getip._proc_on_safelevel(cmd, &blk)
+  end
+
+  def _proc_on_current_safelevel(cmd=nil, &blk) # require a block for eval
+    safe = $SAFE
+    cmd = _proc_on_safelevel(cmd, &blk)
+    Proc.new{|*args| cmd.call(safe, *args)}
+  end
+  def MultiTkIp._proc_on_current_safelevel(cmd=nil, &blk)
+    MultiTkIp.__getip._proc_on_current_safelevel(cmd, &blk)
+  end
+
+  ######################################
   # instance method
   def eval_proc_core(req_val, cmd, *args)
     # check
@@ -1810,23 +2153,23 @@ class MultiTkIp
     end
 
     # on IP thread
-    if @cmd_receiver == Thread.current || 
+    if @cmd_receiver == Thread.current ||
         (!req_val && TclTkLib.mainloop_thread? != false) # callback
       begin
         ret = cmd.call(safe_level, *args)
       rescue SystemExit => e
         # exit IP
-        warn("Warning: "+ $! + " on " + self.inspect) if $DEBUG
+        warn("Warning: "+ e.inspect + " on " + self.inspect) if $DEBUG
         begin
           self._eval_without_enc('exit')
-        rescue Exception
+        rescue Exception => e
         end
         self.delete
         ret = nil
       rescue Exception => e
         if $DEBUG
-          warn("Warning: " + e.class.inspect + 
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+          warn("Warning: " + e.class.inspect +
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +
                " on " + self.inspect)
         end
 =begin
@@ -1853,9 +2196,9 @@ class MultiTkIp
       rescue Exception => e
         # ignore
         if $DEBUG
-          warn("Warning: " + e.class.inspect + 
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-               " on " + self.inspect) 
+          warn("Warning: " + e.class.inspect +
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +
+               " on " + self.inspect)
         end
         return e
       end
@@ -1871,7 +2214,7 @@ class MultiTkIp
       return ret.value
     rescue SystemExit => e
       # exit IP
-      warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
+      warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
       begin
         self._eval_without_enc('exit')
       rescue Exception
@@ -1884,9 +2227,9 @@ class MultiTkIp
       end
     rescue Exception => e
       if $DEBUG
-        warn("Warning: " + e.class.inspect + 
-             ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-             " on " + self.inspect) 
+        warn("Warning: " + e.class.inspect +
+             ((e.message.length > 0)? ' "' + e.message + '"': '') +
+             " on " + self.inspect)
       end
       return e
     end
@@ -1894,25 +2237,80 @@ class MultiTkIp
   end
   private :eval_proc_core
 
+if false && WITH_RUBY_VM  ### Ruby 1.9
+  # Not stable, so disable this feature
+  def eval_callback(*args)
+    if block_given?
+      cmd = Proc.new
+    else
+      cmd = args.shift
+    end
+    begin
+      if @@CALLBACK_SUBTHREAD.table[self].index(Thread.current)
+        last_th = nil
+      else
+        last_th = @@CALLBACK_SUBTHREAD.table[self][-1]
+      end
+      @@CALLBACK_SUBTHREAD.new(self){
+        @@CALLBACK_SUBTHREAD.table[self] << Thread.current
+        begin
+          last_th.join if last_th
+          eval_proc_core(false, cmd, *args)
+        rescue Exception=>e
+          e
+        ensure
+          @@CALLBACK_SUBTHREAD.table[self].delete(Thread.current)
+        end
+      }
+    end
+  end
+else  ### Ruby 1.8
   def eval_callback(*args)
     if block_given?
       cmd = Proc.new
     else
       cmd = args.shift
     end
-    current = Thread.current
-    backup_ip = current['callback_ip']
-    current['callback_ip'] = self
     begin
       eval_proc_core(false, cmd, *args)
+    rescue Exception=>e
+      e
     ensure
-      current['callback_ip'] = backup_ip
     end
   end
+end
 
+  def eval_proc(*args, &blk)
+    if block_given?
+      cmd = _proc_on_safelevel(&blk)
+    else
+      unless (cmd = args.shift)
+        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
+      end
+      cmd = _proc_on_safelevel(&cmd)
+    end
+    if TclTkLib.mainloop_thread? == true
+      # call from eventloop
+      current = Thread.current
+      backup_ip = current[:callback_ip]
+      current[:callback_ip] = self
+      begin
+        eval_proc_core(false, cmd, *args)
+      ensure
+        current[:callback_ip] = backup_ip
+      end
+    else
+      eval_proc_core(true, 
+                     proc{|safe, *params|
+                       Thread.new{cmd.call(safe, *params)}.value
+                     },
+                     *args)
+    end
+  end
+=begin
   def eval_proc(*args)
-    # The scope of the eval-block of 'eval_proc' method is different from 
-    # the external. If you want to pass local values to the eval-block, 
+    # The scope of the eval-block of 'eval_proc' method is different from
+    # the external. If you want to pass local values to the eval-block,
     # use arguments of eval_proc method. They are passed to block-arguments.
     if block_given?
       cmd = Proc.new
@@ -1924,26 +2322,27 @@ class MultiTkIp
     if TclTkLib.mainloop_thread? == true
       # call from eventloop
       current = Thread.current
-      backup_ip = current['callback_ip']
-      current['callback_ip'] = self
+      backup_ip = current[:callback_ip]
+      current[:callback_ip] = self
       begin
-        eval_proc_core(false, 
+        eval_proc_core(false,
 	               proc{|safe, *params|
 		         $SAFE=safe if $SAFE < safe
                          cmd.call(*params)
                        }, *args)
       ensure
-        current['callback_ip'] = backup_ip
+        current[:callback_ip] = backup_ip
       end
     else
-      eval_proc_core(true, 
-                     proc{|safe, *params| 
+      eval_proc_core(true,
+                     proc{|safe, *params|
                        $SAFE=safe if $SAFE < safe
                        Thread.new(*params, &cmd).value
                      },
                      *args)
     end
   end
+=end
   alias call eval_proc
 
   def bg_eval_proc(*args)
@@ -1957,8 +2356,8 @@ class MultiTkIp
     Thread.new{
       eval_proc(cmd, *args)
 =begin
-      eval_proc_core(false, 
-                     proc{|safe, *params| 
+      eval_proc_core(false,
+                     proc{|safe, *params|
                        $SAFE=safe if $SAFE < safe
                        Thread.new(*params, &cmd).value
                      },
@@ -1977,8 +2376,8 @@ class MultiTkIp
       raise RuntimeError, "A String object is expected for the 'cmd' argument"
     end
 
-    eval_proc_core(true, 
-                   proc{|safe| 
+    eval_proc_core(true,
+                   proc{|safe|
                      Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
                                  *eval_args)
                    })
@@ -1991,8 +2390,8 @@ class MultiTkIp
       raise RuntimeError, "A String object is expected for the 'cmd' argument"
     end
     Thread.new{
-      eval_proc_core(true, 
-                     proc{|safe| 
+      eval_proc_core(true,
+                     proc{|safe|
                        Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
                                    *eval_args)
                      })
@@ -2077,6 +2476,11 @@ end
 
 # event loop
 # all master/slave IPs are controled by only one event-loop
+class MultiTkIp
+  def self.default_master?
+    __getip == @@DEFAULT_MASTER
+  end
+end
 class << MultiTkIp
   def mainloop(check_root = true)
     __getip.mainloop(check_root)
@@ -2336,8 +2740,14 @@ end
 
 # depend on TclTkIp
 class MultiTkIp
-  def mainloop(check_root = true, restart_on_dead = true)
+#  def mainloop(check_root = true, restart_on_dead = true)
+  def mainloop(check_root = true, restart_on_dead = false)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
+      return @interp_thread.value if @interp_thread
+    end
+
     #return self if self.slave?
     #return self if self != @@DEFAULT_MASTER
     if self != @@DEFAULT_MASTER
@@ -2347,7 +2757,7 @@ class MultiTkIp
           if $SAFE >= 4
 	    _receiver_mainloop(check_root).join
           else
-            @cmd_queue.enq([@system, 'call_mainloop', 
+            @cmd_queue.enq([@system, 'call_mainloop',
                             Thread.current, check_root])
             Thread.stop
           end
@@ -2360,7 +2770,7 @@ class MultiTkIp
           end
         rescue SystemExit => e
           # exit IP
-          warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
+          warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
           begin
             self._eval_without_enc('exit')
           rescue Exception
@@ -2368,9 +2778,9 @@ class MultiTkIp
           self.delete
         rescue StandardError => e
           if $DEBUG
-            warn("Warning: " + e.class.inspect + 
-                 ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-                 " on " + self.inspect) 
+            warn("Warning: " + e.class.inspect +
+                 ((e.message.length > 0)? ' "' + e.message + '"': '') +
+                 " on " + self.inspect)
           end
           return e
         rescue Exception => e
@@ -2389,9 +2799,9 @@ class MultiTkIp
         @interp.mainloop(check_root)
       rescue StandardError => e
         if $DEBUG
-          warn("Warning: " + e.class.inspect + 
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-               " on " + self.inspect) 
+          warn("Warning: " + e.class.inspect +
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +
+               " on " + self.inspect)
         end
       end
 =end
@@ -2416,7 +2826,7 @@ class MultiTkIp
           @interp.mainloop(check_root)
         rescue StandardError => e
           if TclTkLib.mainloop_abort_on_exception != nil
-            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect, 
+            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
             #             " exception (ignore) : ", $!.message, "\n");
             if $DEBUG
               warn("Warning: Tk mainloop receives " << e.class.inspect <<
@@ -2427,7 +2837,7 @@ class MultiTkIp
         rescue Exception => e
 =begin
           if TclTkLib.mainloop_abort_on_exception != nil
-            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect, 
+            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
             #             " exception (ignore) : ", $!.message, "\n");
             if $DEBUG
               warn("Warning: Tk mainloop receives " << e.class.inspect <<
@@ -2498,11 +2908,11 @@ class MultiTkIp
           next if subip.deleted?
         end
       end
-      if subip.respond_to?(:safe_base?) && subip.safe_base? && 
+      if subip.respond_to?(:safe_base?) && subip.safe_base? &&
           !subip.deleted?
         # do 'exit' to call the delete_hook procedure
         begin
-          subip._eval_without_enc('exit') 
+          subip._eval_without_enc('exit')
         rescue Exception
         end
       else
@@ -2746,9 +3156,10 @@ class MultiTkIp
     i = -1
     brace = 1
     str.each_byte {|c|
+      c = c.chr
       i += 1
-      brace += 1 if c == ?{
-      brace -= 1 if c == ?}
+      brace += 1 if c == '{'
+      brace -= 1 if c == '}'
       break if brace == 0
     }
     if i == 0
@@ -2795,7 +3206,7 @@ class MultiTkIp
 
   def def_alias(slave, new_cmd, org_cmd, *args)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    ret = @interp._invoke('interp', 'alias', _slavearg(slave), new_cmd, 
+    ret = @interp._invoke('interp', 'alias', _slavearg(slave), new_cmd,
                           '', org_cmd, *args)
     (ret == new_cmd)? self: nil
   end
@@ -2888,7 +3299,7 @@ class MultiTkIp
     end
     keys << _slavearg(slave)
     if Tk::TCL_MAJOR_VERSION > 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) 
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
       keys << '--'
     end
     keys << cmd
@@ -2909,7 +3320,7 @@ class MultiTkIp
     keys << _slavearg(slave)
     keys << '-global'
     if Tk::TCL_MAJOR_VERSION > 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) 
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
       keys << '--'
     end
     keys << cmd
@@ -2985,11 +3396,11 @@ class MultiTkIp
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
 
     if slot
-      num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave), 
+      num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave),
                                  limit_type, slot))
     else
-      l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit', 
-                                                            _slavearg(slave), 
+      l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit',
+                                                            _slavearg(slave),
                                                             limit_type))
       l.map!{|s| _fromUTF8(s)}
       r = {}
@@ -3008,7 +3419,7 @@ class MultiTkIp
 
   def recursion_limit(slave = '', limit = None)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    number(@interp._invoke('interp', 'recursionlimit', 
+    number(@interp._invoke('interp', 'recursionlimit',
                            _slavearg(slave), limit))
   end
   def self.recursion_limit(slave = '', limit = None)
@@ -3118,7 +3529,7 @@ class MultiTkIp
       ip = MultiTkIp.__getip
       ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + _keys2opts(slot))
     else
-      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + 
+      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' +
                "-#{slot} #{_get_eval_string(value)}")
     end
     self
@@ -3128,7 +3539,7 @@ class MultiTkIp
     ip = MultiTkIp.__getip
     ret = {}
     if slot
-      conf = _lst2ary(ip._eval("::safe::interpConfigure " + 
+      conf = _lst2ary(ip._eval("::safe::interpConfigure " +
                                @ip_name + " -#{slot}"))
       if conf[0] == '-deleteHook'
 =begin
@@ -3144,7 +3555,7 @@ class MultiTkIp
         ret[conf[0][1..-1]] = conf[1]
       end
     else
-      Hash[*_lst2ary(ip._eval("::safe::interpConfigure " + 
+      Hash[*_lst2ary(ip._eval("::safe::interpConfigure " +
                               @ip_name))].each{|k, v|
         if k == '-deleteHook'
 =begin
@@ -3187,15 +3598,80 @@ end
 
 
 # encoding convert
+class << MultiTkIp
+  def encoding_table
+    __getip.encoding_table
+  end
+
+  def force_default_encoding=(mode)
+    __getip.force_default_encoding=(mode)
+  end
+
+  def force_default_encoding?
+    __getip.force_default_encoding?
+  end
+
+  def default_encoding=(enc)
+    __getip.default_encoding=(enc)
+  end
+
+  def encoding=(enc)
+    __getip.encoding=(enc)
+  end
+
+  def encoding_name
+    __getip.encoding_name
+  end
+
+  def encoding_obj
+    __getip.encoding_obj
+  end
+  alias encoding encoding_name
+  alias default_encoding encoding_name
+
+  def encoding_convertfrom(str, enc=None)
+    __getip.encoding_convertfrom(str, enc)
+  end
+  alias encoding_convert_from encoding_convertfrom
+
+  def encoding_convertto(str, enc=None)
+    __getip.encoding_convertto(str, enc)
+  end
+  alias encoding_convert_to encoding_convertto
+end
 class MultiTkIp
-  def encoding
+  def encoding_table
+    @interp.encoding_table
+  end
+
+  def force_default_encoding=(mode)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.force_default_encoding = mode
+  end
+  def force_default_encoding?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.force_default_encoding?
+  end
+
+  def default_encoding=(enc)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding
+    @interp.default_encoding = enc
   end
+
   def encoding=(enc)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp.encoding = enc
   end
+  def encoding_name
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.encoding_name
+  end
+  def encoding_obj
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.encoding_obj
+  end
+  alias encoding encoding_name
+  alias default_encoding encoding_name
 
   def encoding_convertfrom(str, enc=None)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
@@ -3212,13 +3688,58 @@ end
 
 
 # remove methods for security
+=begin
 class MultiTkIp
+  INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
+  INTERP_MUTEX  = INTERP_THREAD[:mutex]
+  INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
+
   # undef_method :instance_eval
   undef_method :instance_variable_get
   undef_method :instance_variable_set
 end
 
+module TkCore
+  if MultiTkIp::WITH_RUBY_VM &&
+      ! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
+    INTERP_THREAD = MultiTkIp::INTERP_THREAD
+    INTERP_MUTEX  = MultiTkIp::INTERP_MUTEX
+    INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
+  end
+end
+class MultiTkIp
+  remove_const(:INTERP_THREAD)
+  remove_const(:INTERP_MUTEX)
+  remove_const(:INTERP_ROOT_CHECK)
+end
+=end
+if MultiTkIp::WITH_RUBY_VM &&
+    ! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
+  class MultiTkIp
+    INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
+    INTERP_THREAD_STATUS = INTERP_THREAD[:status]
+    INTERP_MUTEX  = INTERP_THREAD[:mutex]
+    INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
+  end
+  module TkCore
+    INTERP_THREAD = MultiTkIp::INTERP_THREAD
+    INTERP_THREAD_STATUS = MultiTkIp::INTERP_THREAD_STATUS
+    INTERP_MUTEX  = MultiTkIp::INTERP_MUTEX
+    INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
+  end
+  class MultiTkIp
+    remove_const(:INTERP_THREAD)
+    remove_const(:INTERP_THREAD_STATUS)
+    remove_const(:INTERP_MUTEX)
+    remove_const(:INTERP_ROOT_CHECK)
+  end
+end
 
+class MultiTkIp
+  # undef_method :instance_eval
+  undef_method :instance_variable_get
+  undef_method :instance_variable_set
+end
 # end of MultiTkIp definition
 
 # defend against modification
diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb
index 70115a60aa..443d66010c 100644
--- a/ext/tk/lib/remote-tk.rb
+++ b/ext/tk/lib/remote-tk.rb
@@ -10,8 +10,8 @@ class MultiTkIp; end
 class RemoteTkIp < MultiTkIp; end
 
 class MultiTkIp
-  @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
-  @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
+  @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
+  @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
   def self._IP_TABLE; @@IP_TABLE; end
   def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end
 
@@ -88,10 +88,14 @@ class RemoteTkIp
     @slave_ip_tbl = {}
     @slave_ip_top = {}
 
-    @tk_windows.taint unless @tk_windows.tainted?
-    @tk_table_list.taint unless @tk_table_list.tainted?
-    @slave_ip_tbl.taint unless @slave_ip_tbl.tainted?
-    @slave_ip_top.taint unless @slave_ip_top.tainted?
+    @force_default_encoding ||= TkUtil.untrust([false])
+    @encoding ||= TkUtil.untrust([nil])
+    def @encoding.to_s; self.join(nil); end
+
+    TkUtil.untrust(@tk_windows)    unless @tk_windows.tainted?
+    TkUtil.untrust(@tk_table_list) unless @tk_table_list.tainted?
+    TkUtil.untrust(@slave_ip_tbl)  unless @slave_ip_tbl.tainted?
+    TkUtil.untrust(@slave_ip_top)  unless @slave_ip_top.tainted?
 
     @system = Object.new
 
@@ -114,8 +118,8 @@ class RemoteTkIp
     @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
 
     @@IP_TABLE[@threadgroup] = self
-    @@TK_TABLE_LIST.size.times{ 
-      (tbl = {}).tainted? || tbl.taint
+    @@TK_TABLE_LIST.size.times{
+      (tbl = {}).tainted? || TkUtil.untrust(tbl)
       @tk_table_list << tbl
     }
 
@@ -154,13 +158,13 @@ class RemoteTkIp
 
     return nil if timeout < 1
     @ret_val.value = ''
-    @interp._invoke('send', '-async', @remote, 
-                    'send', '-async', Tk.appname, 
+    @interp._invoke('send', '-async', @remote,
+                    'send', '-async', Tk.appname,
                     "set #{@ret_val.id} ready")
     Tk.update
     if @ret_val != 'ready'
       (1..(timeout*5)).each{
-        sleep 0.2 
+        sleep 0.2
         Tk.update
         break if @ret_val == 'ready'
       }
@@ -204,10 +208,10 @@ class RemoteTkIp
     cmds = @interp._merge_tklist(*TkUtil::_conv_args([], enc_mode, *cmds))
     if @displayof
       if async
-        @interp.__invoke('send', '-async', '-displayof', @displayof, 
+        @interp.__invoke('send', '-async', '-displayof', @displayof,
                          '--', @remote, *cmds)
       else
-        @interp.__invoke('send', '-displayof', @displayof, 
+        @interp.__invoke('send', '-displayof', @displayof,
                          '--', @remote, *cmds)
       end
     else
@@ -229,7 +233,7 @@ class RemoteTkIp
 
   def is_rubytk?
     return false if _appsend(false, false, 'info', 'command', 'ruby') == ""
-    [ _appsend(false, false, 'ruby', 'RUBY_VERSION'), 
+    [ _appsend(false, false, 'ruby', 'RUBY_VERSION'),
       _appsend(false, false, 'set', 'tk_patchLevel') ]
   end
 
@@ -298,7 +302,7 @@ class RemoteTkIp
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
 
     if @displayof
-      lst = @interp._invoke_without_enc('winfo', 'interps', 
+      lst = @interp._invoke_without_enc('winfo', 'interps',
                                         '-displayof', @displayof)
     else
       lst = @interp._invoke_without_enc('winfo', 'interps')
@@ -460,7 +464,7 @@ class RemoteTkIp
   def mainloop_watchdog
     fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
   end
-  def do_one_evant(flag = nil)
+  def do_one_event(flag = nil)
     fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
   end
   def mainloop_abort_on_exception
@@ -496,7 +500,7 @@ class << RemoteTkIp
   def mainloop_watchdog(*args)
     fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
   end
-  def do_one_evant(flag = nil)
+  def do_one_event(flag = nil)
     fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
   end
   def mainloop_abort_on_exception
diff --git a/ext/tk/lib/tcltk.rb b/ext/tk/lib/tcltk.rb
index 1a6694dbff..2df3b2fd8c 100644
--- a/ext/tk/lib/tcltk.rb
+++ b/ext/tk/lib/tcltk.rb
@@ -84,7 +84,7 @@ end
 # class TclTkInterpreter: tcl/tk interpreter
 class TclTkInterpreter
 
-  # initialize(): 
+  # initialize():
   def initialize()
     # generate interpreter object
     @ip = TclTkIp.new()
@@ -181,7 +181,7 @@ end
 # class TclTkObject: base class of the tcl/tk objects
 class TclTkObject
 
-  # initialize(ip, exp): 
+  # initialize(ip, exp):
   #   ip: interpreter(TclTkIp)
   #   exp: tcl/tk representation
   def initialize(ip, exp)
@@ -211,7 +211,7 @@ end
 # class TclTkLibCommand: tcl/tk commands in the library
 class TclTkLibCommand < TclTkCommand
 
-  # initialize(ip, name): 
+  # initialize(ip, name):
   #   ip: interpreter(TclTkInterpreter)
   #   name: command name (String)
   def initialize(ip, name)
@@ -222,7 +222,7 @@ end
 # class TclTkVariable: tcl/tk variable
 class TclTkVariable < TclTkObject
 
-  # initialize(interp, dat): 
+  # initialize(interp, dat):
   #   interp: interpreter(TclTkInterpreter)
   #   dat: the value to set(String)
   #       if nil, not initialize variable
@@ -237,7 +237,7 @@ class TclTkVariable < TclTkObject
     set(dat) if dat
   end
 
-  # although you can set/refer variable by using set in tcl/tk,
+  # although you can set/read variables by using set in tcl/tk,
   # we provide the method for accessing variables
 
   # set(data): set tcl/tk variable using `set'
@@ -255,7 +255,7 @@ end
 # class TclTkWidget: tcl/tk widget
 class TclTkWidget < TclTkCommand
 
-  # initialize(*args): 
+  # initialize(*args):
   #   *args: parameters
   def initialize(*args)
     if args[0].kind_of?(TclTkIp)
@@ -265,7 +265,7 @@ class TclTkWidget < TclTkCommand
       # (used in TclTkInterpreter#initialize())
 
       # need two arguments
-      fail("illegal # of parameter") if args.size != 2
+      fail("invalid # of parameter") if args.size != 2
 
       # ip: interpreter(TclTkIp)
       # exp: tcl/tk representation
@@ -281,7 +281,7 @@ class TclTkWidget < TclTkCommand
       # interp: interpreter(TclTkInterpreter)
       # parent: parent widget
       # command: widget generating tk command(label ��)
-      # *args: argument to the command 
+      # *args: argument to the command
       interp, parent, command, *args = args
 
       # generate widget name
@@ -303,14 +303,14 @@ end
 # class TclTkCallback: tcl/tk callbacks
 class TclTkCallback < TclTkObject
 
-  # initialize(interp, pr, arg): 
+  # initialize(interp, pr, arg):
   #   interp: interpreter(TclTkInterpreter)
   #   pr: callback procedure(Proc)
   #   arg: string to pass as block parameters of pr
   #       bind command of tcl/tk uses % replacement for parameters
   #       pr can receive replaced data using block parameter
   #       its format is specified by arg string
-  #       You should not specify arg for the command like 
+  #       You should not specify arg for the command like
   #       scrollbar with -command option, which receives parameters
   #       without specifying any replacement
   def initialize(interp, pr, arg = nil)
@@ -347,7 +347,7 @@ end
 # class TclTkImage: tcl/tk images
 class TclTkImage < TclTkCommand
 
-  # initialize(interp, t, *args): 
+  # initialize(interp, t, *args):
   #     generating image is done by TclTkImage.new()
   #     destrying is done by image delete (inconsistent, sigh)
   #   interp: interpreter(TclTkInterpreter)
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 32b5e20bc5..87ed2a449e 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1,6 +1,5 @@
 #
 #               tk.rb - Tk interface module using tcltklib
-#                       $Date$
 #                       by Yukihiro Matsumoto <matz@netlab.jp>
 
 # use Shigehiro's tcltklib
@@ -10,15 +9,31 @@ require 'tkutil'
 # autoload
 require 'tk/autoload'
 
+# for Mutex
+require 'thread'
+
 class TclTkIp
   # backup original (without encoding) _eval and _invoke
   alias _eval_without_enc _eval
+  alias __eval__ _eval
   alias _invoke_without_enc _invoke
+  alias __invoke__ _invoke
 
   def _ip_id_
     # for RemoteTkIp
     ''
   end
+
+  alias __initialize__ initialize
+  private :__initialize__
+
+  def initialize(*args)
+    __initialize__(*args)
+
+    @force_default_encoding ||= TkUtil.untrust([false])
+    @encoding ||= TkUtil.untrust([nil])
+    def @encoding.to_s; self.join(nil); end
+  end
 end
 
 # define TkComm module (step 1: basic functions)
@@ -26,8 +41,8 @@ module TkComm
   include TkUtil
   extend TkUtil
 
-  WidgetClassNames = {}.taint
-  TkExtlibAutoloadModule = [].taint
+  WidgetClassNames = TkUtil.untrust({})
+  TkExtlibAutoloadModule = TkUtil.untrust([])
 
   # None = Object.new  ### --> definition is moved to TkUtil module
   # def None.to_s
@@ -37,7 +52,15 @@ module TkComm
 
   #Tk_CMDTBL = {}
   #Tk_WINDOWS = {}
-  Tk_IDs = ["00000".taint, "00000".taint].freeze  # [0]-cmdid, [1]-winid
+  Tk_IDs = [
+    TkUtil.untrust("00000"), # [0]-cmdid
+    TkUtil.untrust("00000")  # [1]-winid
+  ]
+  Tk_IDs.instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
 
   # for backward compatibility
   Tk_CMDTBL = Object.new
@@ -52,13 +75,13 @@ module TkComm
   Tk_WINDOWS.freeze
 
   self.instance_eval{
-    @cmdtbl = [].taint
+    @cmdtbl = TkUtil.untrust([])
   }
 
   unless const_defined?(:GET_CONFIGINFO_AS_ARRAY)
     # GET_CONFIGINFO_AS_ARRAY = false => returns a Hash { opt =>val, ... }
     #                           true  => returns an Array [[opt,val], ... ]
-    # val is a list which includes resource info. 
+    # val is a list which includes resource info.
     GET_CONFIGINFO_AS_ARRAY = true
   end
   unless const_defined?(:GET_CONFIGINFOwoRES_AS_ARRAY)
@@ -95,15 +118,22 @@ module TkComm
       gen_class_name = ruby_class_name
       classname_def = ''
     else # ruby_class == nil
-      mods = TkExtlibAutoloadModule.find_all{|m| m.const_defined?(tk_class)}
-      mods.each{|mod|
-        begin
-          mod.const_get(tk_class)  # auto_load
-          break if (ruby_class = WidgetClassNames[tk_class])
-        rescue LoadError
-          # ignore load error
-        end
-      }
+      if Tk.const_defined?(tk_class)
+        Tk.const_get(tk_class)  # auto_load
+        ruby_class = WidgetClassNames[tk_class]
+      end
+
+      unless ruby_class
+        mods = TkExtlibAutoloadModule.find_all{|m| m.const_defined?(tk_class)}
+        mods.each{|mod|
+          begin
+            mod.const_get(tk_class)  # auto_load
+            break if (ruby_class = WidgetClassNames[tk_class])
+          rescue LoadError
+            # ignore load error
+          end
+        }
+      end
 
       unless ruby_class
         std_class = 'Tk' << tk_class
@@ -113,6 +143,14 @@ module TkComm
         end
       end
 
+      unless ruby_class
+        if Tk.const_defined?('TOPLEVEL_ALIASES') &&
+            Tk::TOPLEVEL_ALIASES.const_defined?(std_class)
+          Tk::TOPLEVEL_ALIASES.const_get(std_class)  # auto_load
+          ruby_class = WidgetClassNames[tk_class]
+        end
+      end
+
       if ruby_class
         # found
         ruby_class_name = ruby_class.name
@@ -159,7 +197,7 @@ module TkComm
                            #{classname_def}
                          end"
     end
-    Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}', 
+    Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
                                              'without_creating'=>true)"
 =end
     base = Object
@@ -174,7 +212,7 @@ module TkComm
                                 #{klass}"
       end
     }
-    base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}', 
+    base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
                                            'without_creating'=>true)"
   end
   private :_genobj_for_tkwidget
@@ -215,10 +253,12 @@ module TkComm
       val.to_i
     when /\A\.\S*\z/
       #Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
-      TkCore::INTERP.tk_windows[val]? 
+      TkCore::INTERP.tk_windows[val]?
            TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
     when /\Ai(_\d+_)?\d+\z/
-      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+      TkImage::Tk_IMGTBL.mutex.synchronize{
+        TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+      }
     when /\A-?\d+\.?\d*(e[-+]?\d+)?\z/
       val.to_f
     when /\\ /
@@ -335,6 +375,8 @@ if USE_TCLs_LIST_FUNCTIONS
       if dst_enc != true && dst_enc != false
         if (s_enc = s.instance_variable_get(:@encoding))
           s_enc = s_enc.to_s
+        elsif TkCore::WITH_ENCODING
+          s_enc = s.encoding.name
         else
           s_enc = sys_enc
         end
@@ -347,11 +389,20 @@ if USE_TCLs_LIST_FUNCTIONS
     if sys_enc && dst_enc
       dst.map!{|s| _toUTF8(s)}
       ret = TkCore::INTERP._merge_tklist(*dst)
-      if dst_enc.kind_of?(String)
-        ret = _fromUTF8(ret, dst_enc)
-        ret.instance_variable_set(:@encoding, dst_enc)
-      else
-        ret.instance_variable_set(:@encoding, 'utf-8')
+      if TkCore::WITH_ENCODING
+        if dst_enc.kind_of?(String)
+          ret = _fromUTF8(ret, dst_enc)
+          ret.force_encoding(dst_enc)
+        else
+          ret.force_encoding('utf-8')
+        end
+      else # without encoding
+        if dst_enc.kind_of?(String)
+          ret = _fromUTF8(ret, dst_enc)
+          ret.instance_variable_set(:@encoding, dst_enc)
+        else
+          ret.instance_variable_set(:@encoding, 'utf-8')
+        end
       end
       ret
     else
@@ -407,50 +458,10 @@ else
 
   def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
     return [] if str == ""
-    tk_split_escstr(str).collect{|token| 
+    tk_split_escstr(str).collect{|token|
       tk_split_sublist(token, depth - 1)
     }
   end
-=begin
-  def tk_split_list(str)
-    return [] if str == ""
-    idx = str.index('{')
-    while idx and idx > 0 and str[idx-1] == ?\\
-      idx = str.index('{', idx+1)
-    end
-    unless idx
-      list = tk_tcl2ruby(str)
-      unless Array === list
-        list = [list]
-      end
-      return list
-    end
-
-    list = tk_tcl2ruby(str[0,idx])
-    list = [] if list == ""
-    str = str[idx+1..-1]
-    i = -1
-    escape = false
-    brace = 1
-    str.each_byte {|c|
-      i += 1
-      brace += 1 if c == ?{ && !escape
-      brace -= 1 if c == ?} && !escape
-      escape = (c == ?\\)
-      break if brace == 0
-    }
-    if str.size == i + 1
-      return tk_split_list(str[0, i])
-    end
-    if str[0, i] == ' '
-      list.push ' '
-    else
-      list.push tk_split_list(str[0, i])
-    end
-    list += tk_split_list(str[i+1..-1])
-    list
-  end
-=end
 
   def tk_split_simplelist(str, src_enc=true, dst_enc=true)
     return [] if str == ""
@@ -593,7 +604,7 @@ end
   def window(val)
     if val =~ /^\./
       #Tk_WINDOWS[val]? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
-      TkCore::INTERP.tk_windows[val]? 
+      TkCore::INTERP.tk_windows[val]?
            TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
     else
       nil
@@ -601,7 +612,9 @@ end
   end
   def image_obj(val)
     if val =~ /^i(_\d+_)?\d+$/
-      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+      TkImage::Tk_IMGTBL.mutex.synchronize{
+        TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+      }
     else
       val
     end
@@ -620,14 +633,38 @@ end
       val
     end
   end
-  private :bool, :number, :string, :num_or_str
-  private :list, :simplelist, :window, :procedure
-  module_function :bool, :number, :num_or_str, :string
+  private :bool, :number, :num_or_str, :num_or_nil, :string
+  private :list, :simplelist, :window, :image_obj, :procedure
+  module_function :bool, :number, :num_or_str, :num_or_nil, :string
   module_function :list, :simplelist, :window, :image_obj, :procedure
 
+  if (RUBY_VERSION.split('.').map{|n| n.to_i} <=> [1,8,7]) < 0
+    def slice_ary(ary, size)
+      sliced = []
+      wk_ary = ary.dup
+      until wk_ary.size.zero?
+        sub_ary = []
+        size.times{ sub_ary << wk_ary.shift }
+        yield(sub_ary) if block_given?
+        sliced << sub_ary
+      end
+      (block_given?)? ary: sliced
+    end
+  else
+    def slice_ary(ary, size, &b)
+      if b
+        ary.each_slice(size, &b)
+      else
+        ary.each_slice(size).to_a
+      end
+    end
+  end
+  private :slice_ary
+  module_function :slice_ary
+
   def subst(str, *opts)
     # opts := :nobackslashes | :nocommands | novariables
-    tk_call('subst', 
+    tk_call('subst',
             *(opts.collect{|opt|
                 opt = opt.to_s
                 (opt[0] == ?-)? opt: '-' << opt
@@ -685,7 +722,7 @@ end
     else
       str = str.to_s() || ''
       unless str.kind_of? String
-        fail RuntimeError, "fail to convert the object to a string" 
+        fail RuntimeError, "fail to convert the object to a string"
       end
       str = _toUTF8(str) if enc_mode
     end
@@ -724,7 +761,7 @@ end
         begin
           obj = obj.to_s || ''
         rescue
-          fail RuntimeError, "fail to convert object '#{obj}' to string" 
+          fail RuntimeError, "fail to convert object '#{obj}' to string"
         end
         (enc_mode)? _toUTF8(obj): obj
       end
@@ -783,15 +820,17 @@ end
     id = "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
   end
   def _next_cmd_id
-    id = _curr_cmd_id
-    #Tk_IDs[0] += 1
-    TkComm::Tk_IDs[0].succ!
-    id
+    TkComm::Tk_IDs.mutex.synchronize{
+      id = _curr_cmd_id
+      #Tk_IDs[0] += 1
+      TkComm::Tk_IDs[0].succ!
+      id
+    }
   end
   private :_curr_cmd_id, :_next_cmd_id
   module_function :_curr_cmd_id, :_next_cmd_id
 
-  def install_cmd(cmd)
+  def TkComm.install_cmd(cmd, local_cmdtbl=nil)
     return '' if cmd == ''
     begin
       ns = TkCore::INTERP._invoke_without_enc('namespace', 'current')
@@ -808,8 +847,17 @@ end
       TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
     end
     @cmdtbl = [] unless defined? @cmdtbl
-    @cmdtbl.taint unless @cmdtbl.tainted?
+    TkUtil.untrust(@cmdtbl) unless @cmdtbl.tainted?
     @cmdtbl.push id
+
+    if local_cmdtbl && local_cmdtbl.kind_of?(Array)
+      begin
+        local_cmdtbl << id
+      rescue Exception
+        # ignore
+      end
+    end
+
     #return Kernel.format("rb_out %s", id);
     if ns
       'rb_out' << TkCore::INTERP._ip_id_ << ' ' << ns << ' ' << id
@@ -817,14 +865,30 @@ end
       'rb_out' << TkCore::INTERP._ip_id_ << ' ' << id
     end
   end
-  def uninstall_cmd(id)
+  def TkComm.uninstall_cmd(id, local_cmdtbl=nil)
     #id = $1 if /rb_out\S* (c(_\d+_)?\d+)/ =~ id
     id = $4 if id =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+
+    if local_cmdtbl && local_cmdtbl.kind_of?(Array)
+      begin
+        local_cmdtbl.delete(id)
+      rescue Exception
+        # ignore
+      end
+    end
+    @cmdtbl.delete(id)
+
     #Tk_CMDTBL.delete(id)
     TkCore::INTERP.tk_cmd_tbl.delete(id)
   end
   # private :install_cmd, :uninstall_cmd
-  module_function :install_cmd, :uninstall_cmd
+  # module_function :install_cmd, :uninstall_cmd
+  def install_cmd(cmd)
+    TkComm.install_cmd(cmd, @cmdtbl)
+  end
+  def uninstall_cmd(id)
+    TkComm.uninstall_cmd(id, @cmdtbl)
+  end
 
 =begin
   def install_win(ppath,name=nil)
@@ -856,8 +920,10 @@ end
         return TkCore::INTERP.tk_windows[@path] = self
       end
     else
-      name = "w" + TkCore::INTERP._ip_id_ + Tk_IDs[1]
-      Tk_IDs[1].succ!
+      Tk_IDs.mutex.synchronize{
+        name = "w" + TkCore::INTERP._ip_id_ + Tk_IDs[1]
+        Tk_IDs[1].succ!
+      }
     end
     if !ppath or ppath == '.'
       @path = '.' + name
@@ -914,7 +980,7 @@ module TkComm
   def _bind_core(mode, what, context, cmd, *args)
     id = install_bind(cmd, *args) if cmd
     begin
-      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", 
+      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
                               mode + id]))
     rescue
       uninstall_cmd(id) if cmd
@@ -936,7 +1002,12 @@ module TkComm
 
   def _bindinfo(what, context=nil)
     if context
-      tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"]) .collect {|cmdline|
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        enum_obj = tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"]).each_line
+      else
+        enum_obj = tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"])
+      end
+      enum_obj.collect {|cmdline|
 =begin
         if cmdline =~ /^rb_out\S* (c(?:_\d+_)?\d+)\s+(.*)$/
           #[Tk_CMDTBL[$1], $2]
@@ -968,7 +1039,7 @@ module TkComm
   def _bind_core_for_event_class(klass, mode, what, context, cmd, *args)
     id = install_bind_for_event_class(klass, cmd, *args) if cmd
     begin
-      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", 
+      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
                               mode + id]))
     rescue
       uninstall_cmd(id) if cmd
@@ -994,8 +1065,8 @@ module TkComm
 
   private :tk_event_sequence
   private :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
-  private :_bind_core_for_event_class, :_bind_for_event_class, 
-          :_bind_append_for_event_class, :_bind_remove_for_event_class, 
+  private :_bind_core_for_event_class, :_bind_for_event_class,
+          :_bind_append_for_event_class, :_bind_remove_for_event_class,
           :_bindinfo_for_event_class
 
   #def bind(tagOrClass, context, cmd=Proc.new, *args)
@@ -1082,6 +1153,10 @@ module TkCore
   include TkComm
   extend TkComm
 
+  WITH_RUBY_VM  = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
+  WITH_ENCODING = defined?(::Encoding.default_external) && true
+  #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
+
   unless self.const_defined? :INTERP
     if self.const_defined? :IP_NAME
       name = IP_NAME.to_s
@@ -1099,14 +1174,183 @@ module TkCore
       opts = ''
     end
 
-    INTERP = TclTkIp.new(name, opts)
+    # RUN_EVENTLOOP_ON_MAIN_THREAD = true
+
+    unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
+      if WITH_RUBY_VM ### check Ruby 1.9 !!!!!!!
+        # *** NEED TO FIX ***
+        case RUBY_PLATFORM
+        when /cygwin/
+          RUN_EVENTLOOP_ON_MAIN_THREAD = true
+        when /darwin/ # MacOS X
+=begin
+          ip = TclTkIp.new(name, opts)
+          if ip._invoke_without_enc('tk', 'windowingsystem') == 'aqua' &&
+             (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0
+=end
+          if TclTkLib::WINDOWING_SYSTEM == 'aqua' &&
+             (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0
+            # *** KNOWN BUG ***
+            #  Main event loop thread of TkAqua (> Tk8.4.9) must be the main
+            #  application thread. So, ruby1.9 users must call Tk.mainloop on
+            #  the main application thread.
+            #
+            # *** ADD (2009/05/10) ***
+            #  In some cases (I don't know the description of conditions),
+            #  TkAqua 8.4.7 has a same kind of hang-up trouble.
+            #  So, if 8.4.7 or later, set RUN_EVENTLOOP_ON_MAIN_THREAD to true.
+            #  When you want to control this mode, please call the following
+            #  (set true/false as you want) before "require 'tk'".
+            #  ----------------------------------------------------------
+            #  module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
+            #  ----------------------------------------------------------
+            #
+            RUN_EVENTLOOP_ON_MAIN_THREAD = true
+          else
+            RUN_EVENTLOOP_ON_MAIN_THREAD = false
+=begin
+            ip.delete
+            ip = nil
+=end
+          end
+        else
+          RUN_EVENTLOOP_ON_MAIN_THREAD = false
+        end
+
+      else # Ruby 1.8.x
+        RUN_EVENTLOOP_ON_MAIN_THREAD = false
+      end
+    end
+
+    if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
+      INTERP = TclTkIp.new(name, opts) unless self.const_defined? :INTERP
+    else
+      INTERP_MUTEX = Mutex.new
+      INTERP_ROOT_CHECK = ConditionVariable.new
+      INTERP_THREAD = Thread.new{
+        begin
+          #Thread.current[:interp] = interp = TclTkIp.new(name, opts)
+          interp = TclTkIp.new(name, opts)
+        rescue => e
+          Thread.current[:interp] = e
+          raise e
+        end
+
+        interp.mainloop_abort_on_exception = true
+        Thread.current.instance_variable_set("@interp", interp)
+
+        status = [nil]
+        def status.value
+          self[0]
+        end
+        def status.value=(val)
+          self[0] = val
+        end
+
+        Thread.current[:status] = status
+        #sleep
+
+        # like as 1.8, withdraw a root widget before calling Tk.mainloop
+        interp._eval <<EOS
+wm withdraw .
+rename wm __wm_orig__
+proc wm {subcmd win args} {
+  set val [eval [list __wm_orig__ $subcmd $win] $args]
+  if {[string equal $subcmd withdraw] && [string equal $win .]} {
+    rename wm {}
+    rename __wm_orig__ wm
+  }
+  return $val
+}
+proc __startup_rbtk_mainloop__ {args} {
+  rename __startup_rbtk_mainloop__ {}
+  if {[info command __wm_orig__] == "__wm_orig__"} {
+    rename wm {}
+    rename __wm_orig__ wm
+    if [string equal [wm state .] withdrawn] {
+      wm deiconify .
+    }
+  }
+}
+set __initial_state_of_rubytk__ 1
+trace add variable __initial_state_of_rubytk__ unset __startup_rbtk_mainloop__
+
+# complete initializing
+ruby {TkCore::INTERP_THREAD[:interp] = TkCore::INTERP_THREAD.instance_variable_get('@interp')}
+EOS
+
+        begin
+          begin
+            #TclTkLib.mainloop_abort_on_exception = false
+            #interp.mainloop_abort_on_exception = true
+            #Thread.current[:interp] = interp
+            #Thread.current[:status].value = TclTkLib.mainloop(true)
+            Thread.current[:status].value = interp.mainloop(true)
+          rescue SystemExit=>e
+            Thread.current[:status].value = e
+          rescue Exception=>e
+            Thread.current[:status].value = e
+            p e if $DEBUG
+            retry if interp.has_mainwindow?
+          ensure
+            INTERP_MUTEX.synchronize{ INTERP_ROOT_CHECK.broadcast }
+          end
+
+          unless interp.deleted?
+            #Thread.current[:status].value = TclTkLib.mainloop(false)
+            Thread.current[:status].value = interp.mainloop(false)
+          end
+
+        ensure
+          # interp must be deleted before the thread for interp is dead.
+          # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler 
+          # deleted by the wrong thread.
+          interp.delete
+        end
+      }
+
+      # check a Tcl/Tk interpreter is initialized
+      until INTERP_THREAD[:interp]
+        # Thread.pass
+        INTERP_THREAD.run
+      end
+
+      # INTERP_THREAD.run
+      raise INTERP_THREAD[:interp] if INTERP_THREAD[:interp].kind_of? Exception
+
+      # check an eventloop is running
+      while INTERP_THREAD.alive? && TclTkLib.mainloop_thread?.nil?
+        INTERP_THREAD.run
+      end
+
+      INTERP = INTERP_THREAD[:interp]
+      INTERP_THREAD_STATUS = INTERP_THREAD[:status]
+
+      # delete the interpreter and kill the eventloop thread at exit
+      END{
+        if INTERP_THREAD.alive?
+          INTERP.delete
+          INTERP_THREAD.kill
+        end
+      }
+
+      # (for safety's sake) force the eventloop to run
+      INTERP_THREAD.run
+    end
 
     def INTERP.__getip
       self
     end
+    def INTERP.default_master?
+      true
+    end
 
     INTERP.instance_eval{
-      @tk_cmd_tbl = {}.taint
+      # @tk_cmd_tbl = TkUtil.untrust({})
+      @tk_cmd_tbl = 
+        TkUtil.untrust(Hash.new{|hash, key|
+                         fail IndexError, "unknown command ID '#{key}'"
+                       })
       def @tk_cmd_tbl.[]=(idx,val)
         if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
           fail SecurityError,"cannot change the entried command"
@@ -1114,12 +1358,16 @@ module TkCore
         super(idx,val)
       end
 
-      @tk_windows = {}.taint
+      @tk_windows = TkUtil.untrust({})
+
+      @tk_table_list = TkUtil.untrust([])
 
-      @tk_table_list = [].taint
+      @init_ip_env  = TkUtil.untrust([])  # table of Procs
+      @add_tk_procs = TkUtil.untrust([])  # table of [name, args, body]
 
-      @init_ip_env  = [].taint  # table of Procs
-      @add_tk_procs = [].taint  # table of [name, args, body]
+      @force_default_encoding ||= TkUtil.untrust([false])
+      @encoding ||= TkUtil.untrust([nil])
+      def @encoding.to_s; self.join(nil); end
 
       @cb_entry_class = Class.new(TkCallbackEntry){
         class << self
@@ -1157,6 +1405,10 @@ module TkCore
     class Tk_OBJECT_TABLE
       def initialize(id)
         @id = id
+        @mutex = Mutex.new
+      end
+      def mutex
+        @mutex
       end
       def method_missing(m, *args, &b)
         TkCore::INTERP.tk_object_table(@id).__send__(m, *args, &b)
@@ -1168,7 +1420,7 @@ module TkCore
     end
     def INTERP.create_table
       id = @tk_table_list.size
-      (tbl = {}).tainted? || tbl.taint
+      (tbl = {}).tainted? || TkUtil.untrust(tbl)
       @tk_table_list << tbl
 #      obj = Object.new
 #      obj.instance_eval <<-EOD
@@ -1203,10 +1455,11 @@ module TkCore
     def INTERP.remove_tk_procs(*names)
       names.each{|name|
         name = name.to_s
-        @add_tk_procs.delete_if{|elem| 
+        @add_tk_procs.delete_if{|elem|
           elem.kind_of?(Array) && elem[0].to_s == name
         }
-        self._invoke('rename', name, '')
+        #self._invoke('rename', name, '')
+        self.__invoke__('rename', name, '')
       }
     end
     def INTERP.init_ip_internal
@@ -1216,8 +1469,13 @@ module TkCore
     end
   end
 
+  unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
+    ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
+    RUN_EVENTLOOP_ON_MAIN_THREAD = false
+  end
+
   WIDGET_DESTROY_HOOK = '<WIDGET_DESTROY_HOOK>'
-  INTERP._invoke_without_enc('event', 'add', 
+  INTERP._invoke_without_enc('event', 'add',
                              "<#{WIDGET_DESTROY_HOOK}>", '<Destroy>')
   INTERP._invoke_without_enc('bind', 'all', "<#{WIDGET_DESTROY_HOOK}>",
                              install_cmd(proc{|path|
@@ -1234,8 +1492,8 @@ module TkCore
                                 end
                              }) << ' %W')
 
-  INTERP.add_tk_procs(TclTkLib::FINALIZE_PROC_NAME, '', 
-                      "bind all <#{WIDGET_DESTROY_HOOK}> {}")
+  INTERP.add_tk_procs(TclTkLib::FINALIZE_PROC_NAME, '',
+                      "catch { bind all <#{WIDGET_DESTROY_HOOK}> {} }")
 
   INTERP.add_tk_procs('rb_out', 'ns args', <<-'EOL')
     if [regexp {^::} $ns] {
@@ -1337,16 +1595,20 @@ module TkCore
       fail(e)
     rescue Exception => e
       begin
-        msg = _toUTF8(e.class.inspect) + ': ' + 
-              _toUTF8(e.message) + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              _toUTF8(e.backtrace.join("\n")) + 
+        msg = _toUTF8(e.class.inspect) + ': ' +
+              _toUTF8(e.message) + "\n" +
+              "\n---< backtrace of Ruby side >-----\n" +
+              _toUTF8(e.backtrace.join("\n")) +
               "\n---< backtrace of Tk side >-------"
-        msg.instance_variable_set(:@encoding, 'utf-8')
+        if TkCore::WITH_ENCODING
+          msg.force_encoding('utf-8')
+        else
+          msg.instance_variable_set(:@encoding, 'utf-8')
+        end
       rescue Exception
-        msg = e.class.inspect + ': ' + e.message + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              e.backtrace.join("\n") + 
+        msg = e.class.inspect + ': ' + e.message + "\n" +
+              "\n---< backtrace of Ruby side >-----\n" +
+              e.backtrace.join("\n") +
               "\n---< backtrace of Tk side >-------"
       end
       # TkCore::INTERP._set_global_var('errorInfo', msg)
@@ -1359,15 +1621,15 @@ module TkCore
     # arg = tk_split_list(arg_str)
     arg = tk_split_simplelist(arg_str)
     #_get_eval_string(TkUtil.eval_cmd(Tk_CMDTBL[arg.shift], *arg))
-    #_get_eval_string(TkUtil.eval_cmd(TkCore::INTERP.tk_cmd_tbl[arg.shift], 
+    #_get_eval_string(TkUtil.eval_cmd(TkCore::INTERP.tk_cmd_tbl[arg.shift],
     #                        *arg))
     # TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
     begin
       TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
     rescue Exception => e
-      raise(e, e.class.inspect + ': ' + e.message + "\n" + 
-               "\n---< backtrace of Ruby side >-----\n" + 
-               e.backtrace.join("\n") + 
+      raise(e, e.class.inspect + ': ' + e.message + "\n" +
+               "\n---< backtrace of Ruby side >-----\n" +
+               e.backtrace.join("\n") +
                "\n---< backtrace of Tk side >-------")
     end
 #=begin
@@ -1385,7 +1647,7 @@ module TkCore
 #       cb_obj.call(*arg)
 #      rescue
 #       trace = $!.backtrace
-#       raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" + 
+#       raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
 #                 "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
 #      end
 #    end
@@ -1398,6 +1660,13 @@ module TkCore
   end
 
   def after(ms, cmd=Proc.new)
+    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
+    after_id = tk_call_without_enc("after",ms,cmdid)
+    after_id.instance_variable_set('@cmdid', cmdid)
+    after_id
+  end
+=begin
+  def after(ms, cmd=Proc.new)
     crit_bup = Thread.critical
     Thread.critical = true
 
@@ -1420,8 +1689,16 @@ module TkCore
 #      tk_call("after",ms,cmdid)
 #    end
   end
+=end
 
   def after_idle(cmd=Proc.new)
+    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
+    after_id = tk_call_without_enc('after','idle',cmdid)
+    after_id.instance_variable_set('@cmdid', cmdid)
+    after_id
+  end
+=begin
+  def after_idle(cmd=Proc.new)
     crit_bup = Thread.critical
     Thread.critical = true
 
@@ -1432,9 +1709,15 @@ module TkCore
 
     tk_call_without_enc('after','idle',cmdid)
   end
+=end
 
   def after_cancel(afterId)
     tk_call_without_enc('after','cancel',afterId)
+    if (cmdid = afterId.instance_variable_get('@cmdid'))
+      afterId.instance_variable_set('@cmdid', nil)
+      uninstall_cmd(cmdid)
+    end
+    afterId
   end
 
   def windowingsystem
@@ -1554,7 +1837,62 @@ module TkCore
   end
 
   def mainloop(check_root = true)
-    TclTkLib.mainloop(check_root)
+    if !TkCore::WITH_RUBY_VM
+      TclTkLib.mainloop(check_root)
+
+    elsif TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
+      # if TclTkLib::WINDOWING_SYSTEM == 'aqua' &&
+      #if TkCore::INTERP._invoke_without_enc('tk','windowingsystem')=='aqua' &&
+      #    Thread.current != Thread.main &&
+      #    (TclTkLib.get_version <=> [8,4,TclTkLib::RELEASE_TYPE::FINAL,9]) > 0
+      #  raise RuntimeError,
+      #       "eventloop on TkAqua ( > Tk8.4.9 ) works on the main thread only"
+      #end
+      if Thread.current != Thread.main
+        raise RuntimeError, "Tk.mainloop is allowed on the main thread only"
+      end
+      TclTkLib.mainloop(check_root)
+
+    else ### Ruby 1.9 !!!!!
+      unless TkCore::INTERP.default_master?
+        # [MultiTkIp] slave interp ?
+        return TkCore::INTERP._thread_tkwait('window', '.') if check_root
+      end
+
+      # like as 1.8, withdraw a root widget before calling Tk.mainloop
+      TkCore::INTERP._eval_without_enc('catch {unset __initial_state_of_rubytk__}')
+      INTERP_THREAD.run
+
+      begin
+        TclTkLib.set_eventloop_window_mode(true)
+
+        # force run the eventloop
+        TkCore::INTERP._eval_without_enc('update')
+        TkCore::INTERP._eval_without_enc('catch {set __initial_state_of_rubytk__}')
+        INTERP_THREAD.run
+        if check_root
+          INTERP_MUTEX.synchronize{
+            INTERP_ROOT_CHECK.wait(INTERP_MUTEX)
+            status = INTERP_THREAD_STATUS.value
+            if status && TkCore::INTERP.default_master?
+              INTERP_THREAD_STATUS.value = nil if $SAFE < 4
+              raise status if status.kind_of?(Exception)
+            end
+          }
+        else
+          # INTERP_THREAD.value
+          begin
+            INTERP_THREAD.value
+          rescue Exception => e
+            raise e
+          end
+        end
+      rescue Exception => e
+        raise e
+      ensure
+        TclTkLib.set_eventloop_window_mode(false)
+      end
+    end
   end
 
   def mainloop_thread?
@@ -1562,7 +1900,12 @@ module TkCore
     # nil   : there is no mainloop
     # false : mainloop is running on the other thread
     #         ( At then, it is dangerous to call Tk interpreter directly. )
-    TclTkLib.mainloop_thread?
+    if !TkCore::WITH_RUBY_VM || TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
+      ### Ruby 1.9 !!!!!!!!!!!
+      TclTkLib.mainloop_thread?
+    else
+      Thread.current == INTERP_THREAD
+    end
   end
 
   def mainloop_exist?
@@ -1624,11 +1967,11 @@ module TkCore
     if context.kind_of?(TkEvent::Event)
       context.generate(win, ((keys)? keys: {}))
     elsif keys
-      tk_call_without_enc('event', 'generate', win, 
-                          "<#{tk_event_sequence(context)}>", 
+      tk_call_without_enc('event', 'generate', win,
+                          "<#{tk_event_sequence(context)}>",
                           *hash_kv(keys, true))
     else
-      tk_call_without_enc('event', 'generate', win, 
+      tk_call_without_enc('event', 'generate', win,
                           "<#{tk_event_sequence(context)}>")
     end
     nil
@@ -1725,7 +2068,7 @@ module TkCore
     puts 'invoke args => ' + args.inspect if $DEBUG
     ### print "=> ", args.join(" ").inspect, "\n" if $DEBUG
     begin
-      # res = INTERP._invoke(*args).taint
+      # res = TkUtil.untrust(INTERP._invoke(*args))
       # res = INTERP._invoke(enc_mode, *args)
       res = _ip_invoke_core(enc_mode, *args)
       # >>>>>  _invoke returns a TAINTED string  <<<<<
@@ -1733,9 +2076,9 @@ module TkCore
       # err = $!
       begin
         args.unshift "unknown"
-        #res = INTERP._invoke(*args).taint 
-        #res = INTERP._invoke(enc_mode, *args) 
-        res = _ip_invoke_core(enc_mode, *args) 
+        #res = TkUtil.untrust(INTERP._invoke(*args))
+        #res = INTERP._invoke(enc_mode, *args)
+        res = _ip_invoke_core(enc_mode, *args)
         # >>>>>  _invoke returns a TAINTED string  <<<<<
       rescue StandardError => err2
         fail err2 unless /^invalid command/ =~ err2.message
@@ -1817,7 +2160,7 @@ module Tk
   TK_MAJOR_VERSION = major.to_i
   TK_MINOR_VERSION = minor.to_i
 
-  JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands", 
+  JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands",
                                              "kanji") != "").freeze
 
   def Tk.const_missing(sym)
@@ -1846,14 +2189,14 @@ module Tk
         fail SecurityError, "can't get #{sym} when $SAFE >= 4"
       end
       INTERP._invoke_without_enc('global', 'tcl_platform')
-      Hash[*tk_split_simplelist(INTERP._invoke_without_enc('array', 'get', 
+      Hash[*tk_split_simplelist(INTERP._invoke_without_enc('array', 'get',
                                                            'tcl_platform'))]
 
     when :ENV
       INTERP._invoke_without_enc('global', 'env')
       Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'env'))]
 
-    #when :AUTO_PATH   #<=== 
+    #when :AUTO_PATH   #<===
     #  tk_split_simplelist(INTERP._invoke('set', 'auto_path'))
 
     #when :AUTO_OLDPATH
@@ -1871,7 +2214,7 @@ module Tk
         var_nam = 'tkPriv'
       end
       INTERP._invoke_without_enc('global', var_nam)
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get',
                                                var_nam))].each{|k,v|
         k.freeze
         case v
@@ -1914,7 +2257,7 @@ module Tk
   end
 
   def root
-    TkRoot.new
+    Tk::Root.new
   end
 
   def Tk.load_tclscript(file, enc=nil)
@@ -2027,9 +2370,30 @@ module Tk
   end
 
   def Tk.exit
-    tk_call_without_enc('destroy', '.')
+    TkCore::INTERP.has_mainwindow? && tk_call_without_enc('destroy', '.')
+  end
+
+  ################################################
+
+  def Tk.sleep(ms = nil, id = nil)
+    if id
+      var = (id.kind_of?(TkVariable))? id: TkVarAccess.new(id.to_s)
+    else
+      var = TkVariable.new
+    end
+
+    var.value = tk_call_without_enc('after', ms, proc{ var.value = 0 }) if ms
+    var.thread_wait
+    ms
+  end
+
+  def Tk.wakeup(id)
+    ((id.kind_of?(TkVariable))? id: TkVarAccess.new(id.to_s)).value = 0
+    nil
   end
 
+  ################################################
+
   def Tk.pack(*args)
     TkPack.configure(*args)
   end
@@ -2077,9 +2441,9 @@ module Tk
   end
 
   # NOTE::
-  #   If no eventloop-thread is running, "thread_update" method is same 
-  #   to "update" method. Else, "thread_update" method waits to complete 
-  #   idletask operation on the eventloop-thread. 
+  #   If no eventloop-thread is running, "thread_update" method is same
+  #   to "update" method. Else, "thread_update" method waits to complete
+  #   idletask operation on the eventloop-thread.
   def Tk.thread_update(idle=nil)
     if idle
       tk_call_without_enc('thread_update', 'idletasks')
@@ -2151,7 +2515,7 @@ module Tk
   def Tk.add_kinsoku(chars, mode='both')
     begin
       if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'add', mode, 
+        tk_split_simplelist(tk_call('kinsoku', 'add', mode,
                                     *(chars.split(''))))
       else
         []
@@ -2163,7 +2527,7 @@ module Tk
   def Tk.delete_kinsoku(chars, mode='both')
     begin
       if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'delete', mode, 
+        tk_split_simplelist(tk_call('kinsoku', 'delete', mode,
                             *(chars.split(''))))
       end
     rescue
@@ -2173,7 +2537,7 @@ module Tk
   def Tk.toUTF8(str, encoding = nil)
     _toUTF8(str, encoding)
   end
-  
+
   def Tk.fromUTF8(str, encoding = nil)
     _fromUTF8(str, encoding)
   end
@@ -2205,16 +2569,439 @@ end
 #  convert kanji string to/from utf-8
 ###########################################
 if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
+  module Tk
+    module Encoding
+      extend Encoding
+
+      TkCommandNames = ['encoding'.freeze].freeze
+
+      #############################################
+
+      if TkCore::WITH_ENCODING ### Ruby 1.9
+        RubyEncoding = ::Encoding
+
+        # for saving GC cost
+        #ENCNAMES_CMD = ['encoding'.freeze, 'names'.freeze]
+        BINARY_NAME  = 'binary'.freeze
+        UTF8_NAME    = 'utf-8'.freeze
+        DEFAULT_EXTERNAL_NAME = RubyEncoding.default_external.name.freeze
+        DEFAULT_INTERNAL_NAME = RubyEncoding.default_internal.name.freeze rescue nil
+
+        BINARY  = RubyEncoding.find(BINARY_NAME)
+        UNKNOWN = RubyEncoding.find('ASCII-8BIT')
+
+        ### start of creating ENCODING_TABLE
+        ENCODING_TABLE = TkCore::INTERP.encoding_table
+=begin
+        ENCODING_TABLE = {
+          'binary'       => BINARY,
+          # 'UNKNOWN-8BIT' => UNKNOWN,
+        }
+
+        list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
+                                                  ENCNAMES_CMD[1])
+        TkCore::INTERP._split_tklist(list).each{|name|
+          begin
+            enc = RubyEncoding.find(name)
+          rescue ArgumentError
+            case name
+            when 'identity'
+              enc = BINARY
+            when 'shiftjis'
+              enc = RubyEncoding.find('Shift_JIS')
+            when 'unicode'
+              enc = RubyEncoding.find('UTF-8')
+              #if Tk.tk_call('set', 'tcl_platform(byteOrder)') =='littleEndian'
+              #  enc = RubyEncoding.find('UTF-16LE')
+              #else
+              #  enc = RubyEncoding.find('UTF-16BE')
+              #end
+            when 'symbol'
+              # single byte data
+              enc = RubyEncoding.find('ASCII-8BIT') ### ???
+            else
+              # unsupported on Ruby, but supported on Tk
+              enc = TkCore::INTERP.create_dummy_encoding_for_tk(name)
+            end
+          end
+          ENCODING_TABLE[name.freeze] = enc
+        }
+=end
+=begin
+        def ENCODING_TABLE.get_name(enc)
+          orig_enc = enc
+
+          # unles enc, use system default
+          #  1st: Ruby/Tk default encoding
+          #  2nd: Tcl/Tk default encoding
+          #  3rd: Ruby's default_external
+          enc ||= TkCore::INTERP.encoding
+          enc ||= TclTkLib.encoding_system
+          enc ||= DEFAULT_EXTERNAL_NAME
+
+          if enc.kind_of?(RubyEncoding)
+            # Ruby's Encoding object
+            if (name = self.key(enc))
+              return name
+            end
+
+            # Is it new ?
+            list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
+                                                      ENCNAMES_CMD[1])
+            TkComm.simplelist(list).each{|name|
+              if ((enc == RubyEncoding.find(name)) rescue false)
+                # new relation!! update table
+                self[name.freeze] = enc
+                return name
+              end
+            }
+          else
+            # String or Symbol ?
+            if self[name = enc.to_s]
+              return name
+            end
+
+            # Is it new ?
+            if (enc_obj = (RubyEncoding.find(name) rescue false))
+              list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
+                                                        ENCNAMES_CMD[1])
+              if TkComm.simplelist(list).index(name)
+                # Tk's encoding name ?
+                self[name.freeze] = enc_obj  # new relation!! update table
+                return name
+              else
+                # Ruby's encoding name ?
+                if (name = self.key(enc_obj))
+                  return name
+                end
+              end
+            end
+          end
+
+          fail ArgumentError, "unsupported Tk encoding '#{orig_enc}'"
+        end
+
+        def ENCODING_TABLE.get_obj(enc)
+          # returns the encoding object.
+          # If 'enc' is the encoding name on Tk only, it returns nil.
+          ((obj = self[self.get_name(enc)]).kind_of?(RubyEncoding))? obj: nil
+        end
+=end
+        ### end of creating ENCODING_TABLE
+
+      end
+
+      #############################################
+
+      if TkCore::WITH_ENCODING
+        ################################
+        ### Ruby 1.9
+        ################################
+        def force_default_encoding(mode)
+          TkCore::INTERP.force_default_encoding = mode
+        end
+
+        def force_default_encoding?
+          TkCore::INTERP.force_default_encoding?
+        end
+
+        def default_encoding=(enc)
+          TkCore::INTERP.default_encoding = Tk::Encoding::ENCODING_TABLE.get_name(enc)
+        end
+
+        def encoding=(enc)
+          TkCore::INTERP.encoding = Tk::Encoding::ENCODING_TABLE.get_name(enc)
+        end
+
+        def encoding_name
+          Tk::Encoding::ENCODING_TABLE.get_name(TkCore::INTERP.encoding)
+        end
+        def encoding_obj
+          Tk::Encoding::ENCODING_TABLE.get_obj(TkCore::INTERP.encoding)
+        end
+        alias encoding encoding_name
+        alias default_encoding encoding_name
+
+        def tk_encoding_names
+          #TkComm.simplelist(TkCore::INTERP._invoke_without_enc(Tk::Encoding::ENCNAMES_CMD[0], Tk::Encoding::ENCNAMES_CMD[1]))
+          TkComm.simplelist(TkCore::INTERP._invoke_without_enc('encoding', 'names'))
+        end
+        def encoding_names
+          self.tk_encoding_names.find_all{|name|
+            Tk::Encoding::ENCODING_TABLE.get_name(name) rescue false
+          }
+        end
+        def encoding_objs
+          self.tk_encoding_names.map!{|name|
+            Tk::Encoding::ENCODING_TABLE.get_obj(name) rescue nil
+          }.compact
+        end
+
+        def encoding_system=(enc)
+          TclTkLib.encoding_system = Tk::Encoding::ENCODING_TABLE.get_name(enc)
+        end
+
+        def encoding_system_name
+          Tk::Encoding::ENCODING_TABLE.get_name(TclTkLib.encoding_system)
+        end
+        def encoding_system_obj
+          Tk::Encoding::ENCODING_TABLE.get_obj(TclTkLib.encoding_system)
+        end
+        alias encoding_system encoding_system_name
+
+        ################################
+      else
+        ################################
+        ### Ruby 1.8-
+        ################################
+        def force_default_encoding=(mode)
+          true
+        end
+
+        def force_default_encoding?
+          true
+        end
+
+        def default_encoding=(enc)
+          TkCore::INTERP.default_encoding = enc
+        end
+
+        def encoding=(enc)
+          TkCore::INTERP.encoding = enc
+        end
+
+        def encoding_obj
+          TkCore::INTERP.encoding
+        end
+        def encoding_name
+          TkCore::INTERP.encoding
+        end
+        alias encoding encoding_name
+        alias default_encoding encoding_name
+
+        def tk_encoding_names
+          TkComm.simplelist(Tk.tk_call('encoding', 'names'))
+        end
+        def encoding_objs
+          self.tk_encoding_names
+        end
+        def encoding_names
+          self.tk_encoding_names
+        end
+
+        def encoding_system=(enc)
+          TclTkLib.encoding_system = enc
+        end
+
+        def encoding_system_name
+          TclTkLib.encoding_system
+        end
+        def encoding_system_obj
+          TclTkLib.encoding_system
+        end
+        alias encoding_system encoding_system_name
+
+        ################################
+      end
+
+      def encoding_convertfrom(str, enc=nil)
+        enc = encoding_system_name unless enc
+        str = str.dup
+        if TkCore::WITH_ENCODING
+          if str.kind_of?(Tk::EncodedString)
+            str.__instance_variable_set('@encoding', nil)
+          else
+            str.instance_variable_set('@encoding', nil)
+          end
+          str.force_encoding('binary')
+        else
+          str.instance_variable_set('@encoding', 'binary')
+        end
+        ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertfrom',
+                                                 enc, str)
+        if TkCore::WITH_ENCODING
+          ret.force_encoding('utf-8')
+        else
+          Tk::UTF8_String.new(ret)
+        end
+        ret
+      end
+      alias encoding_convert_from encoding_convertfrom
+
+      def encoding_convertto(str, enc=nil)
+        # str must be a UTF-8 string
+        enc = encoding_system_name unless enc
+        ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertto',
+                                                 enc, str)
+        #ret.instance_variable_set('@encoding', 'binary')
+        if TkCore::WITH_ENCODING
+          #ret.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj('binary'))
+          ret.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj(enc))
+        end
+        ret
+      end
+      alias encoding_convert_to encoding_convertto
+
+      def encoding_dirs
+        # Tcl8.5 feature
+        TkComm.simplelist(Tk.tk_call_without_enc('encoding', 'dirs'))
+      end
+
+      def encoding_dirs=(dir_list) # an array or a Tcl's list string
+        # Tcl8.5 feature
+        Tk.tk_call_without_enc('encoding', 'dirs', dir_list)
+      end
+    end
+
+    extend Encoding
+  end
+
   class TclTkIp
+    def force_default_encoding=(mode)
+      @force_default_encoding[0] = (mode)? true: false
+    end
+
+    def force_default_encoding?
+      @force_default_encoding[0] ||= false
+    end
+
+    def default_encoding=(name)
+      name = name.name if Tk::WITH_ENCODING && name.kind_of?(::Encoding)
+      @encoding[0] = name.to_s.dup
+    end
+
     # from tkencoding.rb by ttate@jaist.ac.jp
-    attr_accessor :encoding
+    #attr_accessor :encoding
+    def encoding=(name)
+      self.force_default_encoding = true  # for comaptibility
+      self.default_encoding = name
+    end
 
-    alias __eval _eval
-    alias __invoke _invoke
+    def encoding_name
+      (@encoding[0])? @encoding[0].dup: nil
+    end
+    alias encoding encoding_name
+    alias default_encoding encoding_name
+
+    def encoding_obj
+      if Tk::WITH_ENCODING
+        Tk::Encoding.tcl2rb_encoding(@encoding[0])
+      else
+        (@encoding[0])? @encoding[0].dup: nil
+      end
+    end
 
     alias __toUTF8 _toUTF8
     alias __fromUTF8 _fromUTF8
 
+    if Object.const_defined?(:Encoding) && ::Encoding.class == Class
+      # with Encoding (Ruby 1.9+)
+      #
+      # use functions on Tcl as default.
+      # but when unsupported encoding on Tcl, use methods on Ruby.
+      #
+      def _toUTF8(str, enc = nil)
+        if enc
+          # use given encoding
+          begin
+            enc_name = Tk::Encoding::ENCODING_TABLE.get_name(enc)
+          rescue
+            # unknown encoding for Tk -> try to convert encoding on Ruby
+            str = str.dup.force_encoding(enc)
+            str.encode!(Tk::Encoding::UTF8_NAME) # modify self !!
+            return str  # if no error, probably succeed converting
+          end
+        end
+
+        enc_name ||= str.instance_variable_get(:@encoding)
+
+        enc_name ||=
+          Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
+
+        if enc_name
+          # str has its encoding information
+          encstr = __toUTF8(str, enc_name)
+          encstr.force_encoding(Tk::Encoding::UTF8_NAME)
+          return encstr
+        else
+          # str.encoding isn't supported by Tk -> try to convert on Ruby
+          begin
+            return str.encode(Tk::Encoding::UTF8_NAME) # new string
+          rescue
+            # error -> ignore, try to use default encoding of Ruby/Tk
+          end
+        end
+
+        #enc_name ||=
+        #  Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding) rescue nil
+        enc_name ||= Tk::Encoding::ENCODING_TABLE.get_name(nil)
+
+        # is 'binary' encoding?
+        if enc_name == Tk::Encoding::BINARY_NAME
+          return str.dup.force_encoding(Tk::Encoding::BINARY_NAME)
+        end
+
+        # force default encoding?
+        if ! str.kind_of?(Tk::EncodedString) && self.force_default_encoding?
+          enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.default_encoding)
+        end
+
+        encstr = __toUTF8(str, enc_name)
+        encstr.force_encoding(Tk::Encoding::UTF8_NAME)
+        encstr
+      end
+      def _fromUTF8(str, enc = nil)
+        # str must be UTF-8 or binary.
+        enc_name = str.instance_variable_get(:@encoding)
+        enc_name ||=
+          Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
+
+        # is 'binary' encoding?
+        if enc_name == Tk::Encoding::BINARY_NAME
+          return str.dup.force_encoding(Tk::Encoding::BINARY_NAME)
+        end
+
+        # get target encoding name (if enc == nil, use default encoding)
+        begin
+          enc_name = Tk::Encoding::ENCODING_TABLE.get_name(enc)
+        rescue
+          # then, enc != nil
+          # unknown encoding for Tk -> try to convert encoding on Ruby
+          str = str.dup.force_encoding(Tk::Encoding::UTF8_NAME)
+          str.encode!(enc) # modify self !!
+          return str  # if no error, probably succeed converting
+        end
+
+        encstr = __fromUTF8(str, enc_name)
+        encstr.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj(enc_name))
+        encstr
+      end
+      ###
+    else
+      # without Encoding (Ruby 1.8)
+      def _toUTF8(str, encoding = nil)
+        __toUTF8(str, encoding)
+      end
+      def _fromUTF8(str, encoding = nil)
+        __fromUTF8(str, encoding)
+      end
+      ###
+    end
+
+    alias __eval _eval
+    alias __invoke _invoke
+
+    def _eval(cmd)
+      _fromUTF8(__eval(_toUTF8(cmd)))
+    end
+
+    def _invoke(*cmds)
+      _fromUTF8(__invoke(*(cmds.collect{|cmd| _toUTF8(cmd)})))
+    end
+
+    alias _eval_with_enc _eval
+    alias _invoke_with_enc _invoke
+
 =begin
     #### --> definition is moved to TclTkIp module
 
@@ -2264,17 +3051,6 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
     end
 =end
 
-    def _eval(cmd)
-      _fromUTF8(__eval(_toUTF8(cmd)))
-    end
-
-    def _invoke(*cmds)
-      _fromUTF8(__invoke(*(cmds.collect{|cmd| _toUTF8(cmd)})))
-    end
-
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _invoke
-
 =begin
     def _eval(cmd)
       if defined?(@encoding) && @encoding != 'utf-8'
@@ -2331,127 +3107,219 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
 
   module TclTkLib
     class << self
-      alias _encoding encoding
-      alias _encoding= encoding=
-      def encoding=(name)
-        TkCore::INTERP.encoding = name
+      def force_default_encoding=(mode)
+        TkCore::INTERP.force_default_encoding = mode
       end
-      def encoding
-        TkCore::INTERP.encoding
-      end
-    end
-  end
 
-  module Tk
-    module Encoding
-      extend Encoding
+      def force_default_encoding?
+        TkCore::INTERP.force_default_encoding?
+      end
 
-      TkCommandNames = ['encoding'.freeze].freeze
+      def default_encoding=(name)
+        TkCore::INTERP.default_encoding = name
+      end
 
+      alias _encoding encoding
+      alias _encoding= encoding=
       def encoding=(name)
+        name = name.name if name.kind_of?(::Encoding) if Tk::WITH_ENCODING
         TkCore::INTERP.encoding = name
       end
 
-      def encoding
+      def encoding_name
         TkCore::INTERP.encoding
       end
+      alias encoding encoding_name
+      alias default_encoding encoding_name
 
-      def encoding_names
-        TkComm.simplelist(Tk.tk_call('encoding', 'names'))
+      def encoding_obj
+        if Tk::WITH_ENCODING
+          Tk::Encoding.tcl2rb_encoding(TkCore::INTERP.encoding)
+        else
+          TkCore::INTERP.encoding
+        end
       end
+    end
+  end
 
-      def encoding_system
-        Tk.tk_call('encoding', 'system')
+  # estimate encoding
+  unless TkCore::WITH_ENCODING
+    case $KCODE
+    when /^e/i  # EUC
+      Tk.encoding = 'euc-jp'
+      Tk.encoding_system = 'euc-jp'
+    when /^s/i  # SJIS
+      begin
+        if Tk.encoding_system == 'cp932'
+          Tk.encoding = 'cp932'
+        else
+          Tk.encoding = 'shiftjis'
+          Tk.encoding_system = 'shiftjis'
+        end
+      rescue StandardError, NameError
+        Tk.encoding = 'shiftjis'
+        Tk.encoding_system = 'shiftjis'
       end
-
-      def encoding_system=(enc)
-        Tk.tk_call('encoding', 'system', enc)
+    when /^u/i  # UTF8
+      Tk.encoding = 'utf-8'
+      Tk.encoding_system = 'utf-8'
+    else        # NONE
+      if defined? DEFAULT_TK_ENCODING
+        Tk.encoding_system = DEFAULT_TK_ENCODING
       end
-
-      def encoding_convertfrom(str, enc=nil)
-        # str is an usual enc string or a Tcl's internal string expression
-        # in enc (which is returned from 'encoding_convertto' method). 
-        # the return value is a UTF-8 string.
-        enc = encoding_system unless enc
-        ret = TkCore::INTERP.__invoke('encoding', 'convertfrom', enc, str)
-        ret.instance_variable_set('@encoding', 'utf-8')
-        ret
+      begin
+        Tk.encoding = Tk.encoding_system
+      rescue StandardError, NameError
+        Tk.encoding = 'utf-8'
+        Tk.encoding_system = 'utf-8'
       end
-      alias encoding_convert_from encoding_convertfrom
+    end
 
-      def encoding_convertto(str, enc=nil)
-        # str must be a UTF-8 string.
-        # The return value is a Tcl's internal string expression in enc. 
-        # To get an usual enc string, use Tk.fromUTF8(ret_val, enc).
-        enc = encoding_system unless enc
-        ret = TkCore::INTERP.__invoke('encoding', 'convertto', enc, str)
-        ret.instance_variable_set('@encoding', 'binary')
-        ret
-      end
-      alias encoding_convert_to encoding_convertto
+  else ### Ruby 1.9 !!!!!!!!!!!!
+    # loc_enc_obj = (::Encoding.find(::Encoding.locale_charmap) rescue Tk::Encoding::UNKNOWN)
+    loc_enc_obj = ::Encoding.find("locale")
+    ext_enc_obj = ::Encoding.default_external
+    int_enc_obj = ::Encoding.default_internal || ext_enc_obj
+    tksys_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding_system)
+    # p [Tk.encoding, Tk.encoding_system, loc_enc_obj, ext_enc_obj]
 
-      def encoding_dirs
-        # Tcl8.5 feature
-        TkComm.simplelist(Tk.tk_call_without_enc('encoding', 'dirs'))
+=begin
+    if ext_enc_obj == Tk::Encoding::UNKNOWN
+      if defined? DEFAULT_TK_ENCODING
+        if DEFAULT_TK_ENCODING.kind_of?(::Encoding)
+          tk_enc_name    = DEFAULT_TK_ENCODING.name
+          tksys_enc_name = DEFAULT_TK_ENCODING.name
+        else
+          tk_enc_name    = DEFAULT_TK_ENCODING
+          tksys_enc_name = DEFAULT_TK_ENCODING
+        end
+      else
+        tk_enc_name    = loc_enc_obj.name
+        tksys_enc_name = loc_enc_obj.name
       end
+    else
+      tk_enc_name    = ext_enc_obj.name
+      tksys_enc_name = ext_enc_obj.name
+    end
 
-      def encoding_dirs=(dir_list) # an array or a Tcl's list string
-        # Tcl8.5 feature
-        Tk.tk_call_without_enc('encoding', 'dirs', dir_list)
+    # Tk.encoding = tk_enc_name
+    Tk.default_encoding = tk_enc_name
+    Tk.encoding_system = tksys_enc_name
+=end
+
+    if ext_enc_obj == Tk::Encoding::UNKNOWN
+      if loc_enc_obj == Tk::Encoding::UNKNOWN
+        # use Tk.encoding_system
+      else
+        # use locale_charmap
+        begin
+          loc_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(loc_enc_obj)
+          if loc_enc_name && loc_enc_name != tksys_enc_name
+            # use locale_charmap
+            Tk.encoding_system = loc_enc_name
+          else
+            # use Tk.encoding_system
+          end
+        rescue ArgumentError
+          # unsupported encoding on Tk -> use Tk.encoding_system
+        end
+      end
+    else
+      begin
+        ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
+        if ext_enc_name && ext_enc_name != tksys_enc_name
+          # use default_external
+          Tk.encoding_system = ext_enc_name
+        else
+          # use Tk.encoding_system
+        end
+      rescue ArgumentError
+        # unsupported encoding on Tk -> use Tk.encoding_system
       end
     end
 
-    extend Encoding
-  end
+    # setup Tk.encoding
+    enc_name = nil
 
-  # estimate encoding
-  case $KCODE
-  when /^e/i  # EUC
-    Tk.encoding = 'euc-jp'
-    Tk.encoding_system = 'euc-jp'
-  when /^s/i  # SJIS
     begin
-      if Tk.encoding_system == 'cp932'
-        Tk.encoding = 'cp932'
-      else
-        Tk.encoding = 'shiftjis'
-        Tk.encoding_system = 'shiftjis'
+      default_def = DEFAULT_TK_ENCODING
+      if ::Encoding.find(default_def.to_s) != Tk::Encoding::UNKNOWN
+        enc_name = Tk::Encoding::ENCODING_TABLE.get_name(default_def)
       end
-    rescue StandardError, NameError
-      Tk.encoding = 'shiftjis'
-      Tk.encoding_system = 'shiftjis'
-    end
-  when /^u/i  # UTF8
-    Tk.encoding = 'utf-8'
-    Tk.encoding_system = 'utf-8'
-  else        # NONE
-    if defined? DEFAULT_TK_ENCODING
-      Tk.encoding_system = DEFAULT_TK_ENCODING
+    rescue NameError
+      # ignore
+      enc_name = nil
+    rescue ArgumentError
+      enc_name = nil
+      fail ArgumentError,
+           "DEFAULT_TK_ENCODING has an unknown encoding #{default_def}"
     end
-    begin
-      Tk.encoding = Tk.encoding_system
-    rescue StandardError, NameError
-      Tk.encoding = 'utf-8'
-      Tk.encoding_system = 'utf-8'
+
+    unless enc_name
+      #if ext_enc_obj == Tk::Encoding::UNKNOWN
+      if int_enc_obj == Tk::Encoding::UNKNOWN
+        if loc_enc_obj == Tk::Encoding::UNKNOWN
+          # use Tk.encoding_system
+          enc_name = tksys_enc_name
+        else
+          # use locale_charmap
+          begin
+            loc_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(loc_enc_obj)
+            if loc_enc_name
+              # use locale_charmap
+              enc_name = loc_enc_name
+            else
+              # use Tk.encoding_system
+              enc_name = tksys_enc_name
+            end
+          rescue ArgumentError
+            # unsupported encoding on Tk -> use Tk.encoding_system
+            enc_name = tksys_enc_name
+          end
+        end
+      else
+        begin
+          #ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
+          #if ext_enc_name && ext_enc_name != tksys_enc_name
+          int_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(int_enc_obj)
+          if int_enc_name
+            # use default_internal
+            enc_name = int_enc_name
+          else
+            # use Tk.encoding_system
+            enc_name = tksys_enc_name
+          end
+        rescue ArgumentError
+          # unsupported encoding on Tk -> use Tk.encoding_system
+          enc_name = tksys_enc_name
+        end
+      end
     end
+
+    Tk.default_encoding = (enc_name)? enc_name: tksys_enc_name
   end
 
 else
   # dummy methods
-  class TclTkIp
-    attr_accessor :encoding
-
-    alias __eval _eval
-    alias __invoke _invoke
-
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _invoke
-  end
-
   module Tk
     module Encoding
       extend Encoding
 
+      def force_default_encoding=(mode)
+        nil
+      end
+
+      def force_default_encoding?
+        nil
+      end
+
+      def default_encoding=(enc)
+        nil
+      end
+      def default_encoding
+        nil
+      end
+
       def encoding=(name)
         nil
       end
@@ -2487,6 +3355,16 @@ else
 
     extend Encoding
   end
+
+  class TclTkIp
+    attr_accessor :encoding
+
+    alias __eval _eval
+    alias __invoke _invoke
+
+    alias _eval_with_enc _eval
+    alias _invoke_with_enc _invoke
+  end
 end
 
 
@@ -2550,19 +3428,19 @@ module TkTreatFont
 
     if key
       pathname = [win, tag, key].join(';')
-      TkFont.used_on(pathname) || 
+      TkFont.used_on(pathname) ||
         TkFont.init_widget_font(pathname, *__confinfo_cmd)
     elsif optkeys.size == 1
       pathname = [win, tag, optkeys[0]].join(';')
-      TkFont.used_on(pathname) || 
+      TkFont.used_on(pathname) ||
         TkFont.init_widget_font(pathname, *__confinfo_cmd)
     else
       fonts = {}
-      optkeys.each{|key|
-        key = key.to_s
-        pathname = [win, tag, key].join(';')
-        fonts[key] = 
-          TkFont.used_on(pathname) || 
+      optkeys.each{|k|
+        k = k.to_s
+        pathname = [win, tag, k].join(';')
+        fonts[k] =
+          TkFont.used_on(pathname) ||
           TkFont.init_widget_font(pathname, *__confinfo_cmd)
       }
       fonts
@@ -2592,8 +3470,8 @@ module TkTreatFont
           next
         else
           if fnt
-            if (slot.key?(l_optkey) || 
-                slot.key?(a_optkey) || 
+            if (slot.key?(l_optkey) ||
+                slot.key?(a_optkey) ||
                 slot.key?(k_optkey))
               fnt = TkFont.new(fnt)
 
@@ -2604,12 +3482,20 @@ module TkTreatFont
               fnt.latin_replace(lfnt) if lfnt
               fnt.kanji_replace(kfnt) if kfnt
 
-              fnt.call_font_configure([pathname, optkey], 
+              fnt.call_font_configure([pathname, optkey],
                                       *(__config_cmd << {}))
               next
             else
               fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
-              tk_call(*(__config_cmd << "-#{optkey}" << fnt))
+              unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+                tk_call(*(__config_cmd << "-#{optkey}" << fnt))
+              else
+                begin
+                  tk_call(*(__config_cmd << "-#{optkey}" << fnt))
+                rescue
+                  # ignore
+                end
+              end
             end
           end
           next
@@ -2621,7 +3507,7 @@ module TkTreatFont
       kfnt = slot.delete(k_optkey)
 
       if lfnt && kfnt
-        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey], 
+        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
                                                    *(__config_cmd << {}))
       elsif lfnt
         latinfont_configure([lfnt, optkey])
@@ -2663,14 +3549,22 @@ module TkTreatFont
         fobj = fontobj          # create a new TkFont object
       else
         ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
-        tk_call(*(__config_cmd << "-#{optkey}" << ltn))
+        unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+          tk_call(*(__config_cmd << "-#{optkey}" << ltn))
+        else
+          begin
+            tk_call(*(__config_cmd << "-#{optkey}" << ltn))
+          rescue => e
+            # ignore
+          end
+        end
         next
       end
 
       if fobj.kind_of?(TkFont)
         if ltn.kind_of?(TkFont)
           conf = {}
-          ltn.latin_configinfo.each{|key,val| conf[key] = val}
+          ltn.latin_configinfo.each{|k,val| conf[k] = val}
           if keys
             fobj.latin_configure(conf.update(keys))
           else
@@ -2715,14 +3609,22 @@ module TkTreatFont
         fobj = fontobj          # create a new TkFont object
       else
         knj = hash_kv(knj) if knj.kind_of?(Hash)
-        tk_call(*(__config_cmd << "-#{optkey}" << knj))
+        unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+          tk_call(*(__config_cmd << "-#{optkey}" << knj))
+        else
+          begin
+            tk_call(*(__config_cmd << "-#{optkey}" << knj))
+          rescue => e
+            # ignore
+          end
+        end
         next
       end
 
       if fobj.kind_of?(TkFont)
         if knj.kind_of?(TkFont)
           conf = {}
-          knj.kanji_configinfo.each{|key,val| conf[key] = val}
+          knj.kanji_configinfo.each{|k,val| conf[k] = val}
           if keys
             fobj.kanji_configure(conf.update(keys))
           else
@@ -2763,7 +3665,7 @@ module TkTreatFont
 
   def latinfont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
     if targetkey
-      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey], 
+      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
                                                  *(__config_cmd << {}))
     else
       fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
@@ -2788,7 +3690,7 @@ module TkTreatFont
 
   def kanjifont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
     if targetkey
-      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey], 
+      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
                                                  *(__config_cmd << {}))
     else
         fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
@@ -2816,6 +3718,14 @@ module TkConfigMethod
   include TkUtil
   include TkTreatFont
 
+  def TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+    @mode || false
+  end
+  def TkConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode)
+    fail SecurityError, "can't change the mode" if $SAFE>=4
+    @mode = (mode)? true: false
+  end
+
   def __cget_cmd
     [self.path, 'cget']
   end
@@ -2832,11 +3742,16 @@ module TkConfigMethod
   private :__confinfo_cmd
 
   def __configinfo_struct
-    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
+    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
       :default_value=>3, :current_value=>4}
   end
   private :__configinfo_struct
 
+  def __optkey_aliases
+    {}
+  end
+  private :__optkey_aliases
+
   def __numval_optkeys
     []
   end
@@ -2854,10 +3769,10 @@ module TkConfigMethod
 
   def __strval_optkeys
     [
-      'text', 'label', 'show', 'data', 'file', 
-      'activebackground', 'activeforeground', 'background', 
-      'disabledforeground', 'disabledbackground', 'foreground', 
-      'highlightbackground', 'highlightcolor', 'insertbackground', 
+      'text', 'label', 'show', 'data', 'file',
+      'activebackground', 'activeforeground', 'background',
+      'disabledforeground', 'disabledbackground', 'foreground',
+      'highlightbackground', 'highlightcolor', 'insertbackground',
       'selectbackground', 'selectforeground', 'troughcolor'
     ]
   end
@@ -2943,14 +3858,25 @@ module TkConfigMethod
     val
   end
 
-  def cget(slot)
+  def cget_tkstring(option)
+    opt = option.to_s
+    fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.length == 0
+    tk_call_without_enc(*(__cget_cmd << "-#{opt}"))
+  end
+
+  def __cget_core(slot)
     orig_slot = slot
     slot = slot.to_s
- 
-   if slot.length == 0
+
+    if slot.length == 0
       fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
     end
 
+    alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+    if real_name
+      slot = real_name.to_s
+    end
+
     if ( method = _symbolkey2str(__val2ruby_optkeys())[slot] )
       optval = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
       begin
@@ -3019,11 +3945,41 @@ module TkConfigMethod
       tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{slot}")), true)
     end
   end
+  private :__cget_core
 
-  def configure(slot, value=None)
+  def cget(slot)
+    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      __cget_core(slot)
+    else
+      begin
+        __cget_core(slot)
+      rescue => e
+        if current_configinfo.has_key?(slot.to_s)
+          # error on known option
+          fail e
+        else
+          # unknown option
+          nil
+        end
+      end
+    end
+  end
+  def cget_strict(slot)
+    # never use TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+    __cget_core(slot)
+  end
+
+  def __configure_core(slot, value=None)
     if slot.kind_of? Hash
       slot = _symbolkey2str(slot)
 
+      __optkey_aliases.each{|alias_name, real_name|
+        alias_name = alias_name.to_s
+        if slot.has_key?(alias_name)
+          slot[real_name.to_s] = slot.delete(alias_name)
+        end
+      }
+
       __methodcall_optkeys.each{|key, method|
         value = slot.delete(key.to_s)
         self.__send__(method, value) if value
@@ -3060,6 +4016,11 @@ module TkConfigMethod
         fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
       end
 
+      alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+      if real_name
+        slot = real_name.to_s
+      end
+
       if ( conf = __keyonly_optkeys.find{|k, v| k.to_s == slot} )
         defkey, undefkey = conf
         if value
@@ -3083,33 +4044,86 @@ module TkConfigMethod
     end
     self
   end
+  private :__configure_core
+
+  def __check_available_configure_options(keys)
+    availables = self.current_configinfo.keys
+
+    # add non-standard keys
+    availables |= __font_optkeys.map{|k|
+      [k.to_s, "latin#{k}", "ascii#{k}", "kanji#{k}"]
+    }.flatten
+    availables |= __methodcall_optkeys.keys.map{|k| k.to_s}
+    availables |= __keyonly_optkeys.keys.map{|k| k.to_s}
+
+    keys = _symbolkey2str(keys)
+    keys.delete_if{|k, v| !(availables.include?(k))}
+  end
+
+  def configure(slot, value=None)
+    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      __configure_core(slot, value)
+    else
+      if slot.kind_of?(Hash)
+        begin
+          __configure_core(slot)
+        rescue
+          slot = __check_available_configure_options(slot)
+          __configure_core(slot) unless slot.empty?
+        end
+      else
+        begin
+          __configure_core(slot, value)
+        rescue => e
+          if current_configinfo.has_key?(slot.to_s)
+            # error on known option
+            fail e
+          else
+            # unknown option
+            nil
+          end
+        end
+      end
+    end
+    self
+  end
 
   def configure_cmd(slot, value)
     configure(slot, install_cmd(value))
   end
 
-  def configinfo(slot = nil)
+  def __configinfo_core(slot = nil)
     if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && 
+      if (slot &&
           slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
         fontkey  = $2
         # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
         conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
-        conf[__configinfo_struct[:key]] = 
+        conf[__configinfo_struct[:key]] =
           conf[__configinfo_struct[:key]][1..-1]
         if ( ! __configinfo_struct[:alias] \
             || conf.size > __configinfo_struct[:alias] + 1 )
+          fnt = conf[__configinfo_struct[:default_value]]
+          if TkFont.is_system_font?(fnt)
+            conf[__configinfo_struct[:default_value]] = TkNamedFont.new(fnt)
+          end
           conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
         elsif ( __configinfo_struct[:alias] \
                && conf.size == __configinfo_struct[:alias] + 1 \
                && conf[__configinfo_struct[:alias]][0] == ?- )
-          conf[__configinfo_struct[:alias]] = 
+          conf[__configinfo_struct[:alias]] =
             conf[__configinfo_struct[:alias]][1..-1]
         end
         conf
       else
         if slot
           slot = slot.to_s
+
+          alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+          if real_name
+            slot = real_name.to_s
+          end
+
           case slot
           when /^(#{__val2ruby_optkeys().keys.join('|')})$/
             method = _symbolkey2str(__val2ruby_optkeys())[slot]
@@ -3147,7 +4161,7 @@ module TkConfigMethod
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]])
               begin
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   number(conf[__configinfo_struct[:default_value]])
               rescue
                 conf[__configinfo_struct[:default_value]] = nil
@@ -3155,7 +4169,7 @@ module TkConfigMethod
             end
             if ( conf[__configinfo_struct[:current_value]] )
               begin
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   number(conf[__configinfo_struct[:current_value]])
               rescue
                 conf[__configinfo_struct[:current_value]] = nil
@@ -3168,11 +4182,11 @@ module TkConfigMethod
 
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]])
-              conf[__configinfo_struct[:default_value]] = 
+              conf[__configinfo_struct[:default_value]] =
                 num_or_str(conf[__configinfo_struct[:default_value]])
             end
             if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
+              conf[__configinfo_struct[:current_value]] =
                 num_or_str(conf[__configinfo_struct[:current_value]])
             end
 
@@ -3183,7 +4197,7 @@ module TkConfigMethod
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]])
               begin
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   bool(conf[__configinfo_struct[:default_value]])
               rescue
                 conf[__configinfo_struct[:default_value]] = nil
@@ -3191,7 +4205,7 @@ module TkConfigMethod
             end
             if ( conf[__configinfo_struct[:current_value]] )
               begin
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   bool(conf[__configinfo_struct[:current_value]])
               rescue
                 conf[__configinfo_struct[:current_value]] = nil
@@ -3204,11 +4218,11 @@ module TkConfigMethod
 
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]])
-              conf[__configinfo_struct[:default_value]] = 
+              conf[__configinfo_struct[:default_value]] =
                 simplelist(conf[__configinfo_struct[:default_value]])
             end
             if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
+              conf[__configinfo_struct[:current_value]] =
                 simplelist(conf[__configinfo_struct[:current_value]])
             end
 
@@ -3219,12 +4233,12 @@ module TkConfigMethod
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]] \
                 && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:default_value]] = 
+              conf[__configinfo_struct[:default_value]] =
                 list(conf[__configinfo_struct[:default_value]])
             end
             if ( conf[__configinfo_struct[:current_value]] \
                 && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:current_value]] = 
+              conf[__configinfo_struct[:current_value]] =
                 list(conf[__configinfo_struct[:current_value]])
             end
 
@@ -3255,15 +4269,16 @@ module TkConfigMethod
 
           else
             # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
+            # conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
+            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 1, false, true)
           end
-          conf[__configinfo_struct[:key]] = 
+          conf[__configinfo_struct[:key]] =
             conf[__configinfo_struct[:key]][1..-1]
 
           if ( __configinfo_struct[:alias] \
               && conf.size == __configinfo_struct[:alias] + 1 \
               && conf[__configinfo_struct[:alias]][0] == ?- )
-            conf[__configinfo_struct[:alias]] = 
+            conf[__configinfo_struct[:alias]] =
               conf[__configinfo_struct[:alias]][1..-1]
           end
 
@@ -3274,7 +4289,7 @@ module TkConfigMethod
           #  conf = tk_split_simplelist(conflist)
           ret = tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).collect{|conflist|
             conf = tk_split_simplelist(conflist, false, true)
-            conf[__configinfo_struct[:key]] = 
+            conf[__configinfo_struct[:key]] =
               conf[__configinfo_struct[:key]][1..-1]
 
             optkey = conf[__configinfo_struct[:key]]
@@ -3310,7 +4325,7 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
                 begin
-                  conf[__configinfo_struct[:default_value]] = 
+                  conf[__configinfo_struct[:default_value]] =
                     number(conf[__configinfo_struct[:default_value]])
                 rescue
                   conf[__configinfo_struct[:default_value]] = nil
@@ -3318,7 +4333,7 @@ module TkConfigMethod
               end
               if ( conf[__configinfo_struct[:current_value]] )
                 begin
-                  conf[__configinfo_struct[:current_value]] = 
+                  conf[__configinfo_struct[:current_value]] =
                     number(conf[__configinfo_struct[:current_value]])
                 rescue
                   conf[__configinfo_struct[:current_value]] = nil
@@ -3328,11 +4343,11 @@ module TkConfigMethod
             when /^(#{__numstrval_optkeys.join('|')})$/
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   num_or_str(conf[__configinfo_struct[:default_value]])
               end
               if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   num_or_str(conf[__configinfo_struct[:current_value]])
               end
 
@@ -3340,7 +4355,7 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
                 begin
-                  conf[__configinfo_struct[:default_value]] = 
+                  conf[__configinfo_struct[:default_value]] =
                     bool(conf[__configinfo_struct[:default_value]])
                 rescue
                   conf[__configinfo_struct[:default_value]] = nil
@@ -3348,7 +4363,7 @@ module TkConfigMethod
               end
               if ( conf[__configinfo_struct[:current_value]] )
                 begin
-                  conf[__configinfo_struct[:current_value]] = 
+                  conf[__configinfo_struct[:current_value]] =
                     bool(conf[__configinfo_struct[:current_value]])
                 rescue
                   conf[__configinfo_struct[:current_value]] = nil
@@ -3358,11 +4373,11 @@ module TkConfigMethod
             when /^(#{__listval_optkeys.join('|')})$/
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   simplelist(conf[__configinfo_struct[:default_value]])
               end
               if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   simplelist(conf[__configinfo_struct[:current_value]])
               end
 
@@ -3370,12 +4385,12 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] \
                   && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   list(conf[__configinfo_struct[:default_value]])
               end
               if ( conf[__configinfo_struct[:current_value]] \
                   && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   list(conf[__configinfo_struct[:current_value]])
               end
 
@@ -3402,20 +4417,20 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
                 if conf[__configinfo_struct[:default_value]].index('{')
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:default_value]]) 
+                  conf[__configinfo_struct[:default_value]] =
+                    tk_split_list(conf[__configinfo_struct[:default_value]])
                 else
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]]) 
+                  conf[__configinfo_struct[:default_value]] =
+                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
                 end
               end
               if conf[__configinfo_struct[:current_value]]
                 if conf[__configinfo_struct[:current_value]].index('{')
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:current_value]]) 
+                  conf[__configinfo_struct[:current_value]] =
+                    tk_split_list(conf[__configinfo_struct[:current_value]])
                 else
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]]) 
+                  conf[__configinfo_struct[:current_value]] =
+                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
                 end
               end
             end
@@ -3423,7 +4438,7 @@ module TkConfigMethod
             if ( __configinfo_struct[:alias] \
                 && conf.size == __configinfo_struct[:alias] + 1 \
                 && conf[__configinfo_struct[:alias]][0] == ?- )
-              conf[__configinfo_struct[:alias]] = 
+              conf[__configinfo_struct[:alias]] =
                 conf[__configinfo_struct[:alias]][1..-1]
             end
 
@@ -3435,13 +4450,18 @@ module TkConfigMethod
             fontconf = ret.assoc(optkey)
             if fontconf && fontconf.size > 2
               ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
+              fnt = fontconf[__configinfo_struct[:default_value]]
+              if TkFont.is_system_font?(fnt)
+                fontconf[__configinfo_struct[:default_value]] \
+                  = TkNamedFont.new(fnt)
+              end
               fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
               ret.push(fontconf)
             end
           }
 
-          __methodcall_optkeys.each{|optkey, method|
-            ret << [optkey.to_s, '', '', '', self.__send__(method)]
+          __methodcall_optkeys.each{|optkey, m|
+            ret << [optkey.to_s, '', '', '', self.__send__(m)]
           }
 
           ret
@@ -3449,22 +4469,26 @@ module TkConfigMethod
       end
 
     else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && 
+      if (slot &&
           slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
         fontkey  = $2
         # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
         conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
-        conf[__configinfo_struct[:key]] = 
+        conf[__configinfo_struct[:key]] =
           conf[__configinfo_struct[:key]][1..-1]
 
         if ( ! __configinfo_struct[:alias] \
             || conf.size > __configinfo_struct[:alias] + 1 )
+          fnt = conf[__configinfo_struct[:default_value]]
+          if TkFont.is_system_font?(fnt)
+            conf[__configinfo_struct[:default_value]] = TkNamedFont.new(fnt)
+          end
           conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
           { conf.shift => conf }
         elsif ( __configinfo_struct[:alias] \
                && conf.size == __configinfo_struct[:alias] + 1 )
           if conf[__configinfo_struct[:alias]][0] == ?-
-            conf[__configinfo_struct[:alias]] = 
+            conf[__configinfo_struct[:alias]] =
               conf[__configinfo_struct[:alias]][1..-1]
           end
           { conf[0] => conf[1] }
@@ -3474,6 +4498,12 @@ module TkConfigMethod
       else
         if slot
           slot = slot.to_s
+
+          alias_name, real_name = __optkey_aliases.find{|k,var| k.to_s == slot}
+          if real_name
+            slot = real_name.to_s
+          end
+
           case slot
           when /^(#{__val2ruby_optkeys().keys.join('|')})$/
             method = _symbolkey2str(__val2ruby_optkeys())[slot]
@@ -3511,7 +4541,7 @@ module TkConfigMethod
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]] )
               begin
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   number(conf[__configinfo_struct[:default_value]])
               rescue
                 conf[__configinfo_struct[:default_value]] = nil
@@ -3519,7 +4549,7 @@ module TkConfigMethod
             end
             if ( conf[__configinfo_struct[:current_value]] )
               begin
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   number(conf[__configinfo_struct[:current_value]])
               rescue
                 conf[__configinfo_struct[:current_value]] = nil
@@ -3532,11 +4562,11 @@ module TkConfigMethod
 
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]] )
-              conf[__configinfo_struct[:default_value]] = 
+              conf[__configinfo_struct[:default_value]] =
                 num_or_str(conf[__configinfo_struct[:default_value]])
             end
             if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
+              conf[__configinfo_struct[:current_value]] =
                 num_or_str(conf[__configinfo_struct[:current_value]])
             end
 
@@ -3547,7 +4577,7 @@ module TkConfigMethod
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]] )
               begin
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   bool(conf[__configinfo_struct[:default_value]])
               rescue
                 conf[__configinfo_struct[:default_value]] = nil
@@ -3555,7 +4585,7 @@ module TkConfigMethod
             end
             if ( conf[__configinfo_struct[:current_value]] )
               begin
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   bool(conf[__configinfo_struct[:current_value]])
               rescue
                 conf[__configinfo_struct[:current_value]] = nil
@@ -3568,11 +4598,11 @@ module TkConfigMethod
 
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]] )
-              conf[__configinfo_struct[:default_value]] = 
+              conf[__configinfo_struct[:default_value]] =
                 simplelist(conf[__configinfo_struct[:default_value]])
             end
             if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
+              conf[__configinfo_struct[:current_value]] =
                 simplelist(conf[__configinfo_struct[:current_value]])
             end
 
@@ -3583,12 +4613,12 @@ module TkConfigMethod
             if ( __configinfo_struct[:default_value] \
                 && conf[__configinfo_struct[:default_value]] \
                 && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:default_value]] = 
+              conf[__configinfo_struct[:default_value]] =
                 list(conf[__configinfo_struct[:default_value]])
             end
             if ( conf[__configinfo_struct[:current_value]] \
                 && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:current_value]] = 
+              conf[__configinfo_struct[:current_value]] =
                 list(conf[__configinfo_struct[:current_value]])
             end
 
@@ -3620,13 +4650,13 @@ module TkConfigMethod
             # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
             conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
           end
-          conf[__configinfo_struct[:key]] = 
+          conf[__configinfo_struct[:key]] =
             conf[__configinfo_struct[:key]][1..-1]
 
           if ( __configinfo_struct[:alias] \
               && conf.size == __configinfo_struct[:alias] + 1 )
             if conf[__configinfo_struct[:alias]][0] == ?-
-              conf[__configinfo_struct[:alias]] = 
+              conf[__configinfo_struct[:alias]] =
                 conf[__configinfo_struct[:alias]][1..-1]
             end
             { conf[0] => conf[1] }
@@ -3640,7 +4670,7 @@ module TkConfigMethod
           #  conf = tk_split_simplelist(conflist)
           tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).each{|conflist|
             conf = tk_split_simplelist(conflist, false, true)
-            conf[__configinfo_struct[:key]] = 
+            conf[__configinfo_struct[:key]] =
               conf[__configinfo_struct[:key]][1..-1]
 
             optkey = conf[__configinfo_struct[:key]]
@@ -3676,7 +4706,7 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
                 begin
-                  conf[__configinfo_struct[:default_value]] = 
+                  conf[__configinfo_struct[:default_value]] =
                     number(conf[__configinfo_struct[:default_value]])
                 rescue
                   conf[__configinfo_struct[:default_value]] = nil
@@ -3684,7 +4714,7 @@ module TkConfigMethod
               end
               if ( conf[__configinfo_struct[:current_value]] )
                 begin
-                  conf[__configinfo_struct[:current_value]] = 
+                  conf[__configinfo_struct[:current_value]] =
                     number(conf[__configinfo_struct[:current_value]])
                 rescue
                   conf[__configinfo_struct[:current_value]] = nil
@@ -3694,11 +4724,11 @@ module TkConfigMethod
             when /^(#{__numstrval_optkeys.join('|')})$/
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   num_or_str(conf[__configinfo_struct[:default_value]])
               end
               if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   num_or_str(conf[__configinfo_struct[:current_value]])
               end
 
@@ -3706,7 +4736,7 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
                 begin
-                  conf[__configinfo_struct[:default_value]] = 
+                  conf[__configinfo_struct[:default_value]] =
                     bool(conf[__configinfo_struct[:default_value]])
                 rescue
                   conf[__configinfo_struct[:default_value]] = nil
@@ -3714,7 +4744,7 @@ module TkConfigMethod
               end
               if ( conf[__configinfo_struct[:current_value]] )
                 begin
-                  conf[__configinfo_struct[:current_value]] = 
+                  conf[__configinfo_struct[:current_value]] =
                     bool(conf[__configinfo_struct[:current_value]])
                 rescue
                   conf[__configinfo_struct[:current_value]] = nil
@@ -3724,11 +4754,11 @@ module TkConfigMethod
             when /^(#{__listval_optkeys.join('|')})$/
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   simplelist(conf[__configinfo_struct[:default_value]])
               end
               if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   simplelist(conf[__configinfo_struct[:current_value]])
               end
 
@@ -3736,12 +4766,12 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] \
                   && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:default_value]] = 
+                conf[__configinfo_struct[:default_value]] =
                   list(conf[__configinfo_struct[:default_value]])
               end
               if ( conf[__configinfo_struct[:current_value]] \
                   && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:current_value]] = 
+                conf[__configinfo_struct[:current_value]] =
                   list(conf[__configinfo_struct[:current_value]])
               end
 
@@ -3768,20 +4798,20 @@ module TkConfigMethod
               if ( __configinfo_struct[:default_value] \
                   && conf[__configinfo_struct[:default_value]] )
                 if conf[__configinfo_struct[:default_value]].index('{')
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:default_value]]) 
+                  conf[__configinfo_struct[:default_value]] =
+                    tk_split_list(conf[__configinfo_struct[:default_value]])
                 else
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]]) 
+                  conf[__configinfo_struct[:default_value]] =
+                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
                 end
               end
               if conf[__configinfo_struct[:current_value]]
                 if conf[__configinfo_struct[:current_value]].index('{')
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:current_value]]) 
+                  conf[__configinfo_struct[:current_value]] =
+                    tk_split_list(conf[__configinfo_struct[:current_value]])
                 else
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]]) 
+                  conf[__configinfo_struct[:current_value]] =
+                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
                 end
               end
             end
@@ -3789,7 +4819,7 @@ module TkConfigMethod
             if ( __configinfo_struct[:alias] \
                 && conf.size == __configinfo_struct[:alias] + 1 )
               if conf[__configinfo_struct[:alias]][0] == ?-
-                conf[__configinfo_struct[:alias]] = 
+                conf[__configinfo_struct[:alias]] =
                   conf[__configinfo_struct[:alias]][1..-1]
               end
               ret[conf[0]] = conf[1]
@@ -3806,13 +4836,18 @@ module TkConfigMethod
               ret.delete('latin' << optkey)
               ret.delete('ascii' << optkey)
               ret.delete('kanji' << optkey)
+              fnt = fontconf[__configinfo_struct[:default_value]]
+              if TkFont.is_system_font?(fnt)
+                fontconf[__configinfo_struct[:default_value]] \
+                  = TkNamedFont.new(fnt)
+              end
               fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
               ret[optkey] = fontconf
             end
           }
 
-          __methodcall_optkeys.each{|optkey, method|
-            ret[optkey.to_s] = ['', '', '', self.__send__(method)]
+          __methodcall_optkeys.each{|optkey, m|
+            ret[optkey.to_s] = ['', '', '', self.__send__(m)]
           }
 
           ret
@@ -3820,6 +4855,19 @@ module TkConfigMethod
       end
     end
   end
+  private :__configinfo_core
+
+  def configinfo(slot = nil)
+    if slot && TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      begin
+        __configinfo_core(slot)
+      rescue
+        Array.new(__configinfo_struct.values.max).unshift(slot.to_s)
+      end
+    else
+      __configinfo_core(slot)
+    end
+  end
 
   def current_configinfo(slot = nil)
     if TkComm::GET_CONFIGINFO_AS_ARRAY
@@ -3833,22 +4881,22 @@ module TkConfigMethod
           end
           slot = conf[__configinfo_struct[:alias]]
         end while(org_slot != slot)
-        fail RuntimeError, 
+        fail RuntimeError,
           "there is a configure alias loop about '#{org_slot}'"
       else
         ret = {}
-        configinfo().each{|conf|
+        configinfo().each{|cnf|
           if ( ! __configinfo_struct[:alias] \
-              || conf.size > __configinfo_struct[:alias] + 1 )
-            ret[conf[0]] = conf[-1]
+              || cnf.size > __configinfo_struct[:alias] + 1 )
+            ret[cnf[0]] = cnf[-1]
           end
         }
         ret
       end
     else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
       ret = {}
-      configinfo(slot).each{|key, conf| 
-        ret[key] = conf[-1] if conf.kind_of?(Array)
+      configinfo(slot).each{|key, cnf|
+        ret[key] = cnf[-1] if cnf.kind_of?(Array)
       }
       ret
     end
@@ -3919,9 +4967,14 @@ class TkObject<TkKernel
       begin
         cget(name)
       rescue
-        super(id, *args)
-#        fail NameError, 
-#             "undefined local variable or method `#{name}' for #{self.to_s}", 
+        if self.kind_of?(TkWindow) && name != "to_ary" && name != "to_str"
+          fail NameError,
+               "unknown option '#{id}' for #{self.inspect} (deleted widget?)"
+        else
+          super(id, *args)
+        end
+#        fail NameError,
+#             "undefined local variable or method `#{name}' for #{self.to_s}",
 #             error_at
       end
     else
@@ -3945,14 +4998,14 @@ class TkObject<TkKernel
     if context.kind_of?(TkEvent::Event)
       context.generate(self, ((keys)? keys: {}))
     elsif keys
-      #tk_call('event', 'generate', path, 
+      #tk_call('event', 'generate', path,
       #       "<#{tk_event_sequence(context)}>", *hash_kv(keys))
-      tk_call_without_enc('event', 'generate', path, 
-                          "<#{tk_event_sequence(context)}>", 
+      tk_call_without_enc('event', 'generate', path,
+                          "<#{tk_event_sequence(context)}>",
                           *hash_kv(keys, true))
     else
       #tk_call('event', 'generate', path, "<#{tk_event_sequence(context)}>")
-      tk_call_without_enc('event', 'generate', path, 
+      tk_call_without_enc('event', 'generate', path,
                           "<#{tk_event_sequence(context)}>")
     end
   end
@@ -3974,12 +5027,22 @@ end
 class TkWindow<TkObject
   include TkWinfo
   extend TkBindCore
+  include Tk::Wm_for_General
+  include Tk::Busy
+
+  @@WIDGET_INSPECT_FULL = false
+  def TkWindow._widget_inspect_full_?
+    @@WIDGET_INSPECT_FULL
+  end
+  def TkWindow._widget_inspect_full_=(mode)
+    @@WIDGET_INSPECT_FULL = (mode && true) || false
+  end
 
   TkCommandNames = [].freeze
-  ## ==> If TkCommandNames[0] is a string (not a null string), 
-  ##     assume the string is a Tcl/Tk's create command of the widget class. 
+  ## ==> If TkCommandNames[0] is a string (not a null string),
+  ##     assume the string is a Tcl/Tk's create command of the widget class.
   WidgetClassName = ''.freeze
-  # WidgetClassNames[WidgetClassName] = self  
+  # WidgetClassNames[WidgetClassName] = self
   ## ==> If self is a widget class, entry to the WidgetClassNames table.
   def self.to_eval
     self::WidgetClassName
@@ -3992,8 +5055,8 @@ class TkWindow<TkObject
       widgetname = keys.delete('widgetname')
       install_win(if parent then parent.path end, widgetname)
       without_creating = keys.delete('without_creating')
-      # if without_creating && !widgetname 
-      #   fail ArgumentError, 
+      # if without_creating && !widgetname
+      #   fail ArgumentError,
       #        "if set 'without_creating' to true, need to define 'widgetname'"
       # end
     elsif keys
@@ -4001,8 +5064,8 @@ class TkWindow<TkObject
       widgetname = keys.delete('widgetname')
       install_win(if parent then parent.path end, widgetname)
       without_creating = keys.delete('without_creating')
-      # if without_creating && !widgetname 
-      #   fail ArgumentError, 
+      # if without_creating && !widgetname
+      #   fail ArgumentError,
       #        "if set 'without_creating' to true, need to define 'widgetname'"
       # end
     else
@@ -4037,6 +5100,13 @@ class TkWindow<TkObject
           fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
         }
 
+        __optkey_aliases.each{|alias_name, real_name|
+          alias_name = alias_name.to_s
+          if keys.has_key?(alias_name)
+            keys[real_name.to_s] = keys.delete(alias_name)
+          end
+        }
+
         __methodcall_optkeys.each{|key|
           key = key.to_s
           methodkeys[key] = keys.delete(key) if keys.key?(key)
@@ -4069,13 +5139,48 @@ class TkWindow<TkObject
     end
 
     if keys and keys != None
-      tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
+      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+        tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
+      else
+        begin
+          tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
+        rescue => e
+          tk_call_without_enc(cmd, @path)
+          keys = __check_available_configure_options(keys)
+          unless keys.empty?
+            begin
+              # try to configure
+              configure(keys)
+            rescue
+              # fail => includes options adaptable when creattion only?
+              begin
+                tk_call_without_enc('destroy', @path)
+              rescue
+                # cannot rescue options error
+                fail e
+              else
+                # re-create widget
+                tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
+              end
+            end
+          end
+        end
+      end
     else
       tk_call_without_enc(cmd, @path)
     end
   end
   private :create_self
 
+  def inspect
+    if @@WIDGET_INSPECT_FULL
+      super
+    else
+      str = super
+      str[0..(str.index(' '))] << '@path=' << @path.inspect << '>'
+    end
+  end
+
   def exist?
     TkWinfo.exist?(self)
   end
@@ -4197,6 +5302,15 @@ class TkWindow<TkObject
     self
   end
 
+  def grid_anchor(anchor=None)
+    if anchor == None
+      TkGrid.anchor(self)
+    else
+      TkGrid.anchor(self, anchor)
+      self
+    end
+  end
+
   def grid_forget
     #tk_call('grid', 'forget', epath)
     TkGrid.forget(self)
@@ -4263,6 +5377,22 @@ class TkWindow<TkObject
     TkGrid.rowconfiginfo(self, index, slot)
   end
 
+  def grid_column(index, keys=nil)
+    if keys.kind_of?(Hash)
+      grid_columnconfigure(index, keys)
+    else
+      grid_columnconfiginfo(index, keys)
+    end
+  end
+
+  def grid_row(index, keys=nil)
+    if keys.kind_of?(Hash)
+      grid_rowconfigure(index, keys)
+    else
+      grid_rowconfiginfo(index, keys)
+    end
+  end
+
   def grid_info()
     #list(tk_call('grid', 'info', epath))
     TkGrid.info(self)
@@ -4299,9 +5429,9 @@ class TkWindow<TkObject
     TkGrid.size(self)
   end
 
-  def grid_slaves(args)
+  def grid_slaves(keys = nil)
     #list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
-    TkGrid.slaves(self, args)
+    TkGrid.slaves(self, keys)
   end
 
   def place(keys)
@@ -4346,7 +5476,7 @@ class TkWindow<TkObject
     #  conf[0] = conf[0][1..-1]
     #  conf
     #else
-    #  tk_split_simplelist(tk_call('place', 
+    #  tk_split_simplelist(tk_call('place',
     #                             'configure', epath)).collect{|conflist|
     #   conf = tk_split_simplelist(conflist)
     #   conf[0] = conf[0][1..-1]
@@ -4476,11 +5606,13 @@ class TkWindow<TkObject
     end
 
     children.each{|path, obj|
-      if defined?(@cmdtbl)
-        for id in @cmdtbl
-          uninstall_cmd id
+      obj.instance_eval{
+        if defined?(@cmdtbl)
+          for id in @cmdtbl
+            uninstall_cmd id
+          end
         end
-      end
+      }
       TkCore::INTERP.tk_windows.delete(path)
     }
 
@@ -4554,7 +5686,7 @@ class TkWindow<TkObject
       taglist
     else
       list(tk_call('bindtags', path)).collect{|tag|
-        if tag.kind_of?(String) 
+        if tag.kind_of?(String)
           if cls = WidgetClassNames[tag]
             cls
           elsif btag = TkBindTag.id2obj(tag)
@@ -4585,7 +5717,7 @@ class TkWindow<TkObject
     bindtags(bindtags().unshift(tag))
   end
 end
-
+TkWidget = TkWindow
 
 # freeze core modules
 #TclTkLib.freeze
@@ -4598,7 +5730,7 @@ end
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2007-01-26'.freeze
+  RELEASE_DATE = '2010-06-03'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb
index 6b3773f4ea..2ebee9ea24 100644
--- a/ext/tk/lib/tk/autoload.rb
+++ b/ext/tk/lib/tk/autoload.rb
@@ -1,9 +1,19 @@
 #
 #  autoload
 #
-
-#######################
+############################################
 #  geometry manager
+module Tk
+  autoload :Grid,             'tk/grid'
+  def Grid(*args); TkGrid.configure(*args); end
+
+  autoload :Pack,             'tk/pack'
+  def Pack(*args); TkPack.configure(*args); end
+
+  autoload :Place,            'tk/place'
+  def Place(*args); TkPlace.configure(*args); end
+end
+
 autoload :TkGrid,             'tk/grid'
 def TkGrid(*args); TkGrid.configure(*args); end
 
@@ -14,19 +24,119 @@ autoload :TkPlace,            'tk/place'
 def TkPlace(*args); TkPlace.configure(*args); end
 
 
-#######################
-# others
+############################################
+# classes on Tk module
+module Tk
+  autoload :Busy,             'tk/busy'
+
+  autoload :Button,           'tk/button'
+
+  autoload :Canvas,           'tk/canvas'
+
+  autoload :CheckButton,      'tk/checkbutton'
+  autoload :Checkbutton,      'tk/checkbutton'
+
+  autoload :Entry,            'tk/entry'
+
+  autoload :Frame,            'tk/frame'
+
+  autoload :Label,            'tk/label'
+
+  autoload :LabelFrame,       'tk/labelframe'
+  autoload :Labelframe,       'tk/labelframe'
+
+  autoload :Listbox,          'tk/listbox'
+
+  autoload :Menu,             'tk/menu'
+  autoload :MenuClone,        'tk/menu'
+  autoload :CloneMenu,        'tk/menu'
+  autoload :SystemMenu,       'tk/menu'
+  autoload :SysMenu_Help,     'tk/menu'
+  autoload :SysMenu_System,   'tk/menu'
+  autoload :SysMenu_Apple,    'tk/menu'
+  autoload :Menubutton,       'tk/menu'
+  autoload :MenuButton,       'tk/menu'
+  autoload :OptionMenubutton, 'tk/menu'
+  autoload :OptionMenBbutton, 'tk/menu'
+
+  autoload :Message,          'tk/message'
+
+  autoload :PanedWindow,      'tk/panedwindow'
+  autoload :Panedwindow,      'tk/panedwindow'
+
+  autoload :RadioButton,      'tk/radiobutton'
+  autoload :Radiobutton,      'tk/radiobutton'
+
+  autoload :Root,             'tk/root'
+
+  autoload :Scale,            'tk/scale'
+
+  autoload :Scrollbar,        'tk/scrollbar'
+  autoload :XScrollbar,       'tk/scrollbar'
+  autoload :YScrollbar,       'tk/scrollbar'
+
+  autoload :Spinbox,          'tk/spinbox'
+
+  autoload :Text,             'tk/text'
+
+  autoload :Toplevel,         'tk/toplevel'
+end
+
+
+############################################
+# sub-module of Tk
+module Tk
+  autoload :Clock,            'tk/clock'
+
+  autoload :OptionObj,        'tk/optionobj'
+
+  autoload :X_Scrollable,     'tk/scrollable'
+  autoload :Y_Scrollable,     'tk/scrollable'
+  autoload :Scrollable,       'tk/scrollable'
+
+  autoload :Wm,               'tk/wm'
+  autoload :Wm_for_General,   'tk/wm'
+
+  autoload :MacResource,      'tk/macpkg'
+
+  autoload :WinDDE,           'tk/winpkg'
+  autoload :WinRegistry,      'tk/winpkg'
+
+  autoload :ValidateConfigure,     'tk/validation'
+  autoload :ItemValidateConfigure, 'tk/validation'
+
+  autoload :EncodedString,    'tk/encodedstr'
+  def Tk.EncodedString(str, enc = nil); Tk::EncodedString.new(str, enc); end
+
+  autoload :BinaryString,     'tk/encodedstr'
+  def Tk.BinaryString(str); Tk::BinaryString.new(str); end
+
+  autoload :UTF8_String,      'tk/encodedstr'
+  def Tk.UTF8_String(str); Tk::UTF8_String.new(str); end
+
+end
+
+
+############################################
+#  toplevel classes/modules (fixed)
 autoload :TkBgError,          'tk/bgerror'
 
 autoload :TkBindTag,          'tk/bindtag'
 autoload :TkBindTagAll,       'tk/bindtag'
 autoload :TkDatabaseClass,    'tk/bindtag'
 
-autoload :TkButton,           'tk/button'
-
 autoload :TkConsole,          'tk/console'
 
-autoload :TkCanvas,           'tk/canvas'
+autoload :TkcItem,            'tk/canvas'
+autoload :TkcArc,             'tk/canvas'
+autoload :TkcBitmap,          'tk/canvas'
+autoload :TkcImage,           'tk/canvas'
+autoload :TkcLine,            'tk/canvas'
+autoload :TkcOval,            'tk/canvas'
+autoload :TkcPolygon,         'tk/canvas'
+autoload :TkcRectangle,       'tk/canvas'
+autoload :TkcText,            'tk/canvas'
+autoload :TkcWindow,          'tk/canvas'
 
 autoload :TkcTagAccess,       'tk/canvastag'
 autoload :TkcTag,             'tk/canvastag'
@@ -36,9 +146,6 @@ autoload :TkcTagAll,          'tk/canvastag'
 autoload :TkcTagCurrent,      'tk/canvastag'
 autoload :TkcTagGroup,        'tk/canvastag'
 
-autoload :TkCheckButton,      'tk/checkbutton'
-autoload :TkCheckbutton,      'tk/checkbutton'
-
 autoload :TkClipboard,        'tk/clipboard'
 
 autoload :TkComposite,        'tk/composite'
@@ -52,14 +159,10 @@ autoload :TkWarning,          'tk/dialog'
 autoload :TkWarning2,         'tk/dialog'
 autoload :TkWarningObj,       'tk/dialog'
 
-autoload :TkEntry,            'tk/entry'
-
 autoload :TkEvent,            'tk/event'
 
 autoload :TkFont,             'tk/font'
-autoload :TkTreatTagFont,     'tk/font'
-
-autoload :TkFrame,            'tk/frame'
+autoload :TkNamedFont,        'tk/font'
 
 autoload :TkImage,            'tk/image'
 autoload :TkBitmapImage,      'tk/image'
@@ -71,30 +174,12 @@ autoload :TkTreatItemFont,    'tk/itemfont'
 
 autoload :TkKinput,           'tk/kinput'
 
-autoload :TkLabel,            'tk/label'
-
-autoload :TkLabelFrame,       'tk/labelframe'
-autoload :TkLabelframe,       'tk/labelframe'
-
-autoload :TkListbox,          'tk/listbox'
-
-autoload :TkMacResource,      'tk/macpkg'
-
-autoload :TkMenu,             'tk/menu'
-autoload :TkMenuClone,        'tk/menu'
 autoload :TkSystemMenu,       'tk/menu'
-autoload :TkSysMenu_Help,     'tk/menu'
-autoload :TkSysMenu_System,   'tk/menu'
-autoload :TkSysMenu_Apple,    'tk/menu'
-autoload :TkMenubutton,       'tk/menu'
-autoload :TkOptionMenubutton, 'tk/menu'
 
 autoload :TkMenubar,          'tk/menubar'
 
 autoload :TkMenuSpec,         'tk/menuspec'
 
-autoload :TkMessage,          'tk/message'
-
 autoload :TkManageFocus,      'tk/mngfocus'
 
 autoload :TkMsgCatalog,       'tk/msgcat'
@@ -110,53 +195,46 @@ autoload :TkPackage,          'tk/package'
 
 autoload :TkPalette,          'tk/palette'
 
-autoload :TkPanedWindow,      'tk/panedwindow'
-autoload :TkPanedwindow,      'tk/panedwindow'
-
-autoload :TkRadioButton,      'tk/radiobutton'
-autoload :TkRadiobutton,      'tk/radiobutton'
-
 autoload :TkRoot,             'tk/root'
 
-autoload :TkScale,            'tk/scale'
-
-autoload :TkScrollbar,        'tk/scrollbar'
-autoload :TkXScrollbar,       'tk/scrollbar'
-autoload :TkYScrollbar,       'tk/scrollbar'
-
 autoload :TkScrollbox,        'tk/scrollbox'
 
 autoload :TkSelection,        'tk/selection'
 
-autoload :TkSpinbox,          'tk/spinbox'
-
 autoload :TkTreatTagFont,     'tk/tagfont'
 
-autoload :TkText,             'tk/text'
-
 autoload :TkTextImage,        'tk/textimage'
+autoload :TktImage,           'tk/textimage'
 
 autoload :TkTextMark,         'tk/textmark'
 autoload :TkTextNamedMark,    'tk/textmark'
 autoload :TkTextMarkInsert,   'tk/textmark'
 autoload :TkTextMarkCurrent,  'tk/textmark'
 autoload :TkTextMarkAnchor,   'tk/textmark'
+autoload :TktMark,            'tk/textmark'
+autoload :TktNamedMark,       'tk/textmark'
+autoload :TktMarkInsert,      'tk/textmark'
+autoload :TktMarkCurrent,     'tk/textmark'
+autoload :TktMarkAnchor,      'tk/textmark'
 
 autoload :TkTextTag,          'tk/texttag'
 autoload :TkTextNamedTag,     'tk/texttag'
 autoload :TkTextTagSel,       'tk/texttag'
+autoload :TktTag,             'tk/texttag'
+autoload :TktNamedTag,        'tk/texttag'
+autoload :TktTagSel,          'tk/texttag'
 
 autoload :TkTextWindow,       'tk/textwindow'
+autoload :TktWindow,          'tk/textwindow'
 
 autoload :TkAfter,            'tk/timer'
 autoload :TkTimer,            'tk/timer'
 autoload :TkRTTimer,          'tk/timer'
 
-autoload :TkToplevel,         'tk/toplevel'
-
 autoload :TkTextWin,          'tk/txtwin_abst'
 
 autoload :TkValidation,       'tk/validation'
+autoload :TkValidateCommand,  'tk/validation'
 
 autoload :TkVariable,         'tk/variable'
 autoload :TkVarAccess,        'tk/variable'
@@ -166,31 +244,517 @@ autoload :TkNamedVirtualEvent,'tk/virtevent'
 
 autoload :TkWinfo,            'tk/winfo'
 
-autoload :TkWinDDE,           'tk/winpkg'
-autoload :TkWinRegistry,      'tk/winpkg'
-
 autoload :TkXIM,              'tk/xim'
 
 
-#######################
-# sub-module of Tk
+############################################
+#  toplevel classes/modules (switchable)
 module Tk
-  autoload :Clock,            'tk/clock'
-  autoload :OptionObj,        'tk/optionobj'
-  autoload :X_Scrollable,     'tk/scrollable'
-  autoload :Y_Scrollable,     'tk/scrollable'
-  autoload :Scrollable,       'tk/scrollable'
-  autoload :Wm,               'tk/wm'
+  @TOPLEVEL_ALIAS_TABLE = {}
+  @TOPLEVEL_ALIAS_TABLE[:Tk] = {
+    :TkButton             => 'tk/button',
 
-  autoload :ValidateConfigure,     'tk/validation'
-  autoload :ItemValidateConfigure, 'tk/validation'
+    :TkCanvas             => 'tk/canvas',
 
-  autoload :EncodedString,    'tk/encodedstr'
-  def Tk.EncodedString(str, enc = nil); Tk::EncodedString.new(str, enc); end
+    :TkCheckButton        => 'tk/checkbutton',
+    :TkCheckbutton        => 'tk/checkbutton',
 
-  autoload :BinaryString,     'tk/encodedstr'
-  def Tk.BinaryString(str); Tk::BinaryString.new(str); end
+    # :TkDialog             => 'tk/dialog',
+    # :TkDialog2            => 'tk/dialog',
+    # :TkDialogObj          => 'tk/dialog',
+    # :TkWarning            => 'tk/dialog',
+    # :TkWarning2           => 'tk/dialog',
+    # :TkWarningObj         => 'tk/dialog',
 
-  autoload :UTF8_String,      'tk/encodedstr'
-  def Tk.UTF8_String(str); Tk::UTF8_String.new(str); end
+    :TkEntry              => 'tk/entry',
+
+    :TkFrame              => 'tk/frame',
+
+    :TkLabel              => 'tk/label',
+
+    :TkLabelFrame         => 'tk/labelframe',
+    :TkLabelframe         => 'tk/labelframe',
+
+    :TkListbox            => 'tk/listbox',
+
+    :TkMacResource        => 'tk/macpkg',
+
+    :TkMenu               => 'tk/menu',
+    :TkMenuClone          => 'tk/menu',
+    :TkCloneMenu          => 'tk/menu',
+    # :TkSystemMenu         => 'tk/menu',
+    :TkSysMenu_Help       => 'tk/menu',
+    :TkSysMenu_System     => 'tk/menu',
+    :TkSysMenu_Apple      => 'tk/menu',
+    :TkMenubutton         => 'tk/menu',
+    :TkMenuButton         => 'tk/menu',
+    :TkOptionMenubutton   => 'tk/menu',
+    :TkOptionMenuButton   => 'tk/menu',
+
+    :TkMessage            => 'tk/message',
+
+    :TkPanedWindow        => 'tk/panedwindow',
+    :TkPanedwindow        => 'tk/panedwindow',
+
+    :TkRadioButton        => 'tk/radiobutton',
+    :TkRadiobutton        => 'tk/radiobutton',
+
+    # :TkRoot               => 'tk/root',
+
+    :TkScale              => 'tk/scale',
+
+    :TkScrollbar          => 'tk/scrollbar',
+    :TkXScrollbar         => 'tk/scrollbar',
+    :TkYScrollbar         => 'tk/scrollbar',
+
+    :TkSpinbox            => 'tk/spinbox',
+
+    :TkText               => 'tk/text',
+
+    :TkToplevel           => 'tk/toplevel',
+
+    :TkWinDDE             => 'tk/winpkg',
+    :TkWinRegistry        => 'tk/winpkg',
+  }
+
+  @TOPLEVEL_ALIAS_OWNER = {}
+
+  @TOPLEVEL_ALIAS_SETUP_PROC = {}
+
+  @AUTOLOAD_FILE_SYM_TABLE = Hash.new{|h,k| h[k]={}} # TABLE[file][sym] -> obj
+
+  @current_default_widget_set = nil
+
+  module TOPLEVEL_ALIASES; end
+end
+
+class Object
+  include Tk::TOPLEVEL_ALIASES
+end
+
+############################################
+#  methods to control default widget set
+############################################
+
+class << Tk
+  def default_widget_set
+    @current_default_widget_set
+  end
+
+  def default_widget_set=(target)
+    target = target.to_sym
+    return target if target == @current_default_widget_set
+
+    if (cmd = @TOPLEVEL_ALIAS_SETUP_PROC[target])
+      cmd.call(target)
+    end
+
+    _replace_toplevel_aliases(target)
+  end
+
+  def widget_set_symbols
+    @TOPLEVEL_ALIAS_TABLE.keys
+  end
+
+  def toplevel_aliases_on_widget_set(widget_set)
+    if (tbl = @TOPLEVEL_ALIAS_TABLE[widget_set.to_sym])
+      tbl.collect{|k, v| (v.nil?)? nil: k}.compact
+    else
+      fail ArgumentError, "unknown widget_set #{widget_set.to_sym.inspect}"
+    end
+  end
+
+  def __toplevel_alias_setup_proc__(*target_list, &cmd)
+    target_list.each{|target| @TOPLEVEL_ALIAS_SETUP_PROC[target.to_sym] = cmd}
+  end
+
+  def topobj_defined?(sym) #=> alias_filename or object or false
+    Object.autoload?(sym) ||
+      (Object.const_defined?(sym) && Object.const_get(sym))
+  end
+  def topalias_defined?(sym) #=> alias_filename or object or false
+    Tk::TOPLEVEL_ALIASES.autoload?(sym) ||
+      (Tk::TOPLEVEL_ALIASES.const_defined?(sym) &&
+         Tk::TOPLEVEL_ALIASES.const_get(sym))
+  end
+  def define_topobj(sym, obj)
+    if obj.kind_of? String
+      # obj is an autoload path
+      Object.autoload(sym, obj)
+      unless Object.autoload?(sym)
+        # file is autoloaded?
+        if @AUTOLOAD_FILE_SYM_TABLE.has_key?(obj) &&
+            (loaded_obj = @AUTOLOAD_FILE_SYM_TABLE[obj][sym])
+          Object.const_set(sym, loaded_obj)
+        else
+          fail ArgumentError, "cannot define autoload file (already loaded?)"
+        end
+      end
+    else
+      # object
+      Object.const_set(sym, obj)
+    end
+  end
+  def define_topalias(sym, obj)
+    if obj.kind_of? String
+      # obj is an autoload path
+      Tk::TOPLEVEL_ALIASES.autoload(sym, obj)
+      unless Tk::TOPLEVEL_ALIASES.autoload?(sym)
+        # file is autoloaded?
+        if @AUTOLOAD_FILE_SYM_TABLE.has_key?(obj) &&
+            (loaded_obj = @AUTOLOAD_FILE_SYM_TABLE[obj][sym])
+          Tk::TOPLEVEL_ALIASES.const_set(sym, loaded_obj)
+        else
+          fail ArgumentError, "cannot define autoload file (already loaded?)"
+        end
+      end
+    else
+      # object
+      Tk::TOPLEVEL_ALIASES.const_set(sym, obj)
+    end
+  end
+  def replace_topobj(sym, obj) #=> old_obj (alias_filename or object) or nil
+    if old_obj = topobj_defined?(sym)
+      Object.class_eval{remove_const sym} rescue nil # ignore err
+    end
+    define_topobj(sym, obj)
+    old_obj
+  end
+  def replace_topalias(sym, obj) #=> old_obj (alias_filename or object) or nil
+    if old_obj = topalias_defined?(sym)
+      Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} rescue nil #ignore err
+    end
+    define_topalias(sym, obj)
+    old_obj
+  end
+  private :topobj_defined?, :topalias_defined?
+  private :define_topobj, :define_topalias
+  private :replace_topobj, :replace_topalias
+
+  def __regist_toplevel_aliases__(target, obj, *symbols)
+    # initial regist
+    @TOPLEVEL_ALIAS_TABLE[target = target.to_sym] ||= {}
+    symbols.each{|sym|
+      @TOPLEVEL_ALIAS_TABLE[target][sym = sym.to_sym] = obj
+      if !topalias_defined?(sym) || target == @current_default_widget_set
+        @TOPLEVEL_ALIAS_OWNER[sym] = target
+        replace_topalias(sym, obj)
+        replace_topobj(sym, obj) unless obj.kind_of?(String) # NOT autoload
+      end
+    }
+  end
+
+  def regist_sym_for_loaded_file(auto, obj, sym)
+    @AUTOLOAD_FILE_SYM_TABLE[auto][sym] = obj
+
+    reg = /^#{Regexp.quote(auto)}(\.rb|\.so|)$/
+    @TOPLEVEL_ALIAS_TABLE.each_key{|set|
+      if @TOPLEVEL_ALIAS_TABLE[set][sym] =~ reg
+        @TOPLEVEL_ALIAS_TABLE[set][sym] = obj
+        if @TOPLEVEL_ALIAS_OWNER[sym].nil? || @TOPLEVEL_ALIAS_OWNER[sym] == set
+          replace_topalias(sym, obj)
+          replace_topobj(sym, obj) if set == @current_default_widget_set
+        end
+      end
+    }
+    if (f = Object.autoload?(sym)) && f =~ reg
+      replace_topobj(sym, obj)
+    end
+    if (f = Tk::TOPLEVEL_ALIASES.autoload?(sym)) && f =~ reg
+      replace_topalias(sym, obj)
+    end
+  end
+  private :regist_sym_for_loaded_file
+
+  def set_topalias(target, obj, sym)
+    # obj is a kind of String : define autoload path
+    #                  Class  : use the class object
+    if target == @current_default_widget_set
+      case @TOPLEVEL_ALIAS_OWNER[sym]
+      when false
+        # Object::sym is out of control. --> not change
+        # Make ALIAS::sym under control, because target widget set is current.
+        # Keep OWNER[sym]
+        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+        replace_topalias(sym, obj)
+
+      when target
+        if current_obj = topobj_defined?(sym)
+          if current_obj == obj
+            # Make current_obj under control.
+            # Keep Object::sym.
+            # Keep OWNER[sym].
+            @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+            replace_topalias(sym, obj)
+
+          else # current_obj != obj
+            if current_obj == topalias_defined?(sym)
+              # Change controlled object
+              # Keep OWNER[sym].
+              @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+              replace_topalias(sym, obj)
+              replace_topobj(sym, obj)
+
+            else # current_obj != topalias_defined?(sym)
+              # Maybe current_obj is defined by user. --> OWNER[sym] = faise
+              # Keep Object::sym.
+              @TOPLEVEL_ALIAS_OWNER[sym] = false
+              @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+              replace_topalias(sym, obj)
+            end
+          end
+
+        else # NOT topobj_defined?(sym)
+          # New definition for sym at target.
+          # Keep OWNER[sym].
+          @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+          replace_topalias(sym, obj)
+          define_topobj(sym, obj)
+        end
+
+      when nil
+        # New definition for sym at target.
+        @TOPLEVEL_ALIAS_OWNER[sym] = target
+        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+        replace_topalias(sym, obj)
+
+      else # others
+        # Maybe planning to make sym under control.
+        @TOPLEVEL_ALIAS_OWNER[sym] = target
+        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+        replace_topalias(sym, obj)
+        replace_topobj(sym, obj)
+      end
+
+    else # target != @current_default_widget_set
+      case @TOPLEVEL_ALIAS_OWNER[sym]
+      when false
+        # Object::sym is out of control. --> not change
+        if topalias_defined?(sym)
+          # ALIAS[sym] may be defined by other widget set.
+          # Keep Object::sym (even if it is not defined)
+          # Keep ALIAS[sym].
+          # Keep OWNER[sym].
+          @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+
+        else # NOT topalias_defined?(sym)
+          # Nobody controls ALIAS[sym]. 
+          # At leaset, current widget set doesn't control ALIAS[sym]. 
+          # Keep Object::sym (even if it is not defined)
+          # Keep OWNER[sym].
+          @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+          define_topalias(sym, obj)
+        end
+
+      when target
+        # Maybe change controlled object, because Object::sym is under control.
+        # Keep OWNER[sym].
+        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+        replace_topalias(sym, obj)
+        replace_topobj(sym, obj)
+        
+      when nil
+        # New definition for sym
+        @TOPLEVEL_ALIAS_OWNER[sym] = target
+        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+        replace_topalias(sym, obj)
+        replace_topobj(sym, obj)
+
+      else # others
+        # An other widget set controls sym.
+        # Keep Object::sym (even if it is not defined)
+        # Keep ALIAS[sym].
+        # Keep OWNER[sym].
+        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
+        
+      end
+    end
+
+    sym
+  end
+  private :set_topalias
+
+  def __set_toplevel_aliases__(target, obj, *symbols)
+    # obj is a kind of String : define autoload path
+    #                  Class  : use the class object
+    target = target.to_sym
+    symbols.each{|sym| set_topalias(target, obj, sym.to_sym)}
+  end
+
+  def __set_loaded_toplevel_aliases__(autopath, target, obj, *symbols)
+    # autopath is an autoload file
+    # Currently, this method doesn't support that autoload loads 
+    # different toplevels between <basename>.rb and <basename>.so extension.
+    shortpath = (autopath =~ /^(.*)(.rb|.so)$/)? $1: autopath
+    target = target.to_sym
+    symbols.map!{|sym| sym.to_sym}
+
+    symbols.each{|sym| regist_sym_for_loaded_file(shortpath, obj, sym) }
+    symbols.each{|sym| set_topalias(target, obj, sym)}
+  end
+
+  def backup_current_topdef(sym)
+    return if (current = @current_default_widget_set).nil?
+
+    case @TOPLEVEL_ALIAS_OWNER[sym]
+    when false
+      # Object::sym is out of control.
+      if (cur_alias = topalias_defined?(sym)) && ! cur_alias.kind_of?(String)
+        @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
+      end
+
+    when current
+      if cur_obj = topobj_defined?(sym)
+        if ! cur_obj.kind_of?(String) && (cur_alias = topalias_defined?(sym))
+          if cur_alias.kind_of?(String)
+            # Mayby, user replaced Object::sym.
+            # Make Object::sym out of control.
+            @TOPLEVEL_ALIAS_OWNER[sym] = false
+          elsif cur_obj == cur_alias
+            # Possibley, defined normally. Backup it
+            @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
+          else
+            # Mayby, user replaced Object::sym.
+            # Make Object::sym out of control.
+            @TOPLEVEL_ALIAS_OWNER[sym] = false
+          end
+        end
+      else
+        # Mayby, user replaced Object::sym.
+        # Make Object::sym out of control.
+        @TOPLEVEL_ALIAS_OWNER[sym] = false
+      end
+
+    when nil
+      # Object::sym is out of control.
+      if (cur_alias = topalias_defined?(sym)) && ! cur_alias.kind_of?(String)
+        # Possibley, defined normally. Backup it.
+        @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
+      end
+    else
+      # No authority to control Object::sym and ALIASES::sym.
+      # Do nothing.
+    end
+  end
+  private :backup_current_topdef
+
+  def _replace_toplevel_aliases(target)
+    # backup
+    @TOPLEVEL_ALIAS_TABLE[target].each_key{|sym|
+      backup_current_topdef(sym)
+    }
+
+    # replace
+    @TOPLEVEL_ALIAS_TABLE[target].each_key{|sym|
+      next if (obj = @TOPLEVEL_ALIAS_TABLE[target][sym]).nil?
+      if @TOPLEVEL_ALIAS_OWNER[sym] == false
+        # Object::sym is out of control. --> not change
+        # Keep OWNER[sym].
+        replace_topalias(sym, obj)
+      else
+        # New definition
+        @TOPLEVEL_ALIAS_OWNER[sym] = target
+        replace_topalias(sym, obj)
+        replace_topobj(sym, obj)
+      end
+    }
+
+    # change default_widget_set
+    @current_default_widget_set = target
+  end
+  private :_replace_toplevel_aliases
+
+  def __import_toplevel_aliases__(target, *symbols)
+    current = @current_default_widget_set
+    symbols.each{|sym|
+      sym = sym.to_sym
+      if (obj = @TOPLEVEL_ALIAS_TABLE[target][sym]).nil?
+        # remove
+        @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
+        @TOPLEVEL_ALIAS_OWNER.delete(sym)
+        Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
+        Object.class_eval{remove_const sym} if topobj_defined?(sym)
+
+      elsif obj == false
+        # remove, but OWNER[sym] <- false and not treat Object::sym
+        @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
+        @TOPLEVEL_ALIAS_OWNER[sym] = false
+        Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
+
+      elsif @TOPLEVEL_ALIAS_OWNER[sym] == false
+        # Object::sym is out of control. --> not change
+        # Keep OWNER[sym].
+        @TOPLEVEL_ALIAS_TABLE[current][sym] = obj
+        replace_topalias(sym, obj)
+
+      else
+        # new definition under control
+        @TOPLEVEL_ALIAS_OWNER[sym] = current
+        @TOPLEVEL_ALIAS_TABLE[current][sym] = obj
+        replace_topalias(sym, obj)
+        replace_topobj(sym, obj)
+      end
+    }
+  end
+
+  def __remove_toplevel_aliases__(*symbols)
+    # remove toplevel aliases of current widget set
+    current = @current_default_widget_set
+    symbols.each{|sym|
+      sym = sym.to_sym
+      @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
+      @TOPLEVEL_ALIAS_OWNER.delete(sym)
+      Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
+      Object.class_eval{remove_const sym} if topobj_defined?(sym)
+    }
+  end
+
+  def __reset_toplevel_owner__(*symbols)
+    symbols.each{|sym| @TOPLEVEL_ALIAS_OWNER.delete(sym.to_sym)}
+  end
+
+  def __disable_toplevel_control__(*symbols)
+    symbols.each{|sym| @TOPLEVEL_ALIAS_OWNER[sym.to_sym] = false}
+  end
+
+  def __create_widget_set__(new_set, src_set={})
+    new_set = new_set.to_sym
+    if @TOPLEVEL_ALIAS_TABLE[new_set]
+      fail RuntimeError, "A widget-set #{new_set.inspect} is already exist."
+    end
+    if src_set.kind_of?(Symbol)
+      # new_set is an alias name of existed widget set.
+      @TOPLEVEL_ALIAS_TABLE[new_set] = @TOPLEVEL_ALIAS_TABLE[src_set]
+    else
+      @TOPLEVEL_ALIAS_TABLE[new_set] = {}
+      src_set.each{|sym, obj| set_topalias(new_set, obj, sym.to_sym) }
+    end
+  end
+end
+
+
+############################################
+# setup default widget set => :Tk
+Tk.default_widget_set = :Tk
+
+
+############################################
+#  depend on the version of Tcl/Tk
+# major, minor, type, patchlevel = TclTkLib.get_version
+
+############################################
+# Ttk (Tile) support
+=begin
+if major > 8 ||
+    (major == 8 && minor > 5) ||
+    (major == 8 && minor == 5 && type >= TclTkLib::RELEASE_TYPE::BETA)
+  # Tcl/Tk 8.5 beta or later
+  Object.autoload :Ttk, 'tkextlib/tile'
+  Tk.autoload :Tile, 'tkextlib/tile'
+
+  require 'tk/ttk_selector'
 end
+=end
+Object.autoload :Ttk, 'tkextlib/tile'
+Tk.autoload :Tile, 'tkextlib/tile'
+require 'tk/ttk_selector'
diff --git a/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
index 9023a08e06..23b4e0b7c3 100644
--- a/ext/tk/lib/tk/bindtag.rb
+++ b/ext/tk/lib/tk/bindtag.rb
@@ -8,30 +8,64 @@ class TkBindTag
 
   #BTagID_TBL = {}
   BTagID_TBL = TkCore::INTERP.create_table
-  Tk_BINDTAG_ID = ["btag".freeze, "00000".taint].freeze
 
-  TkCore::INTERP.init_ip_env{ BTagID_TBL.clear }
+  (Tk_BINDTAG_ID = ["btag".freeze, TkUtil.untrust("00000")]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    BTagID_TBL.mutex.synchronize{ BTagID_TBL.clear }
+  }
 
   def TkBindTag.id2obj(id)
-    BTagID_TBL[id]? BTagID_TBL[id]: id
+    BTagID_TBL.mutex.synchronize{
+      (BTagID_TBL[id])? BTagID_TBL[id]: id
+    }
   end
 
+=begin
   def TkBindTag.new_by_name(name, *args, &b)
-    return BTagID_TBL[name] if BTagID_TBL[name]
+    BTagID_TBL.mutex.synchronize{
+      return BTagID_TBL[name] if BTagID_TBL[name]
+    }
+
     self.new.instance_eval{
-      BTagID_TBL.delete @id
-      @id = name
-      BTagID_TBL[@id] = self
+      BTagID_TBL.mutex.synchronize{
+        BTagID_TBL.delete @id
+        @id = name
+        BTagID_TBL[@id] = self
+      }
       bind(*args, &b) if args != []
       self
     }
   end
+=end
+  def TkBindTag.new_by_name(name, *args, &b)
+    obj = nil
+    BTagID_TBL.mutex.synchronize{
+      if BTagID_TBL[name]
+        obj = BTagID_TBL[name]
+      else
+        (obj = BTagID_TBL[name] = self.allocate).instance_eval{
+          @id = name
+        }
+      end
+    }
+    bind(*args, &b) if obj && args != []
+    obj
+  end
 
   def initialize(*args, &b)
-    # @id = Tk_BINDTAG_ID.join('')
-    @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
-    Tk_BINDTAG_ID[1].succ!
-    BTagID_TBL[@id] = self
+    Tk_BINDTAG_ID.mutex.synchronize{
+      # @id = Tk_BINDTAG_ID.join('')
+      @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
+      Tk_BINDTAG_ID[1].succ!
+    }
+    BTagID_TBL.mutex.synchronize{
+      BTagID_TBL[@id] = self
+    }
     bind(*args, &b) if args != []
   end
 
@@ -63,14 +97,37 @@ end
 
 
 class TkDatabaseClass<TkBindTag
+=begin
   def self.new(name, *args, &b)
-    return BTagID_TBL[name] if BTagID_TBL[name]
+    BTagID_TBL.mutex.synchronize{
+      return BTagID_TBL[name] if BTagID_TBL[name]
+    }
     super(name, *args, &b)
   end
 
   def initialize(name, *args, &b)
     @id = name
-    BTagID_TBL[@id] = self
+    BTagID_TBL.mutex.synchronize{
+      BTagID_TBL[@id] = self
+    }
+    bind(*args, &b) if args != []
+  end
+=end
+  def self.new(name, *args, &b)
+    BTagID_TBL.mutex.synchronize{
+      if BTagID_TBL[name]
+        BTagID_TBL[name]
+      else
+        BTagID_TBL[name] = self.allocate.instance_eval{
+          initialize(name, *args, &b)
+          self
+        }
+      end
+    }
+  end
+
+  def initialize(name, *args, &b)
+    @id = name
     bind(*args, &b) if args != []
   end
 
diff --git a/ext/tk/lib/tk/busy.rb b/ext/tk/lib/tk/busy.rb
new file mode 100644
index 0000000000..7f4f89f524
--- /dev/null
+++ b/ext/tk/lib/tk/busy.rb
@@ -0,0 +1,118 @@
+#
+# tk/busy.rb: support 'tk busy' command (Tcl/Tk8.6 or later)
+#
+require 'tk'
+
+module Tk::Busy
+  include TkCore
+  extend TkCore
+  extend TkItemConfigMethod
+end
+
+class << Tk::Busy
+  def __item_cget_cmd(win)
+    # maybe need to override
+    ['tk', 'busy', 'cget', win.path]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(win)
+    # maybe need to override
+    ['tk', 'busy', 'configure', win.path]
+  end
+  private :__item_config_cmd
+
+  def __item_confinfo_cmd(win)
+    # maybe need to override
+    __item_config_cmd(win)
+  end
+  private :__item_confinfo_cmd
+
+  alias cget_tkstring itemcget_tkstring
+  alias cget itemcget
+  alias cget_strict itemcget_strict
+  alias configure itemconfigure
+  alias configinfo itemconfiginfo
+  alias current_configinfo current_itemconfiginfo
+
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  def method_missing(id, *args)
+    name = id.id2name
+    case args.length
+    when 1
+      if name[-1] == ?=
+        configure name[0..-2], args[0]
+        args[0]
+      else
+        configure name, args[0]
+        self
+      end
+    when 0
+      begin
+        cget(name)
+      rescue
+        super(id, *args)
+      end
+    else
+      super(id, *args)
+    end
+  end
+
+  def hold(win, keys={})
+    tk_call_without_enc('tk', 'busy', 'hold', win, *hash_kv(keys))
+    win
+  end
+
+  def forget(*wins)
+    tk_call_without_enc('tk', 'busy', 'forget', *wins)
+    self
+  end
+
+  def current(pat=None)
+    list(tk_call('tk', 'busy', 'current', pat))
+  end
+
+  def status(win)
+    bool(tk_call_without_enc('tk', 'busy', 'status', win))
+  end
+end
+
+module Tk::Busy
+  def busy_configinfo(option=nil)
+    Tk::Busy.configinfo(self, option)
+  end
+
+  def busy_current_configinfo(option=nil)
+    Tk::Busy.current_configinfo(self, option)
+  end
+
+  def busy_configure(option, value=None)
+    Tk::Busy.configure(self, option, value)
+    self
+  end
+
+  def busy_cget(option)
+    Tk::Busy.configure(self, option)
+  end
+
+  def busy(keys={})
+    Tk::Busy.hold(self, keys)
+    self
+  end
+  alias busy_hold busy
+
+  def busy_forget
+    Tk::Busy.forget(self)
+    self
+  end
+
+  def busy_current?
+    ! Tk::Busy.current(self.path).empty?
+  end
+
+  def busy_status
+    Tk::Busy.status(self)
+  end
+end
diff --git a/ext/tk/lib/tk/button.rb b/ext/tk/lib/tk/button.rb
index 407a47c400..65233c91b6 100644
--- a/ext/tk/lib/tk/button.rb
+++ b/ext/tk/lib/tk/button.rb
@@ -4,10 +4,10 @@
 require 'tk'
 require 'tk/label'
 
-class TkButton<TkLabel
+class Tk::Button<Tk::Label
   TkCommandNames = ['button'.freeze].freeze
   WidgetClassName = 'Button'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   #def create_self(keys)
   #  if keys and keys != None
   #    tk_call_without_enc('button', @path, *hash_kv(keys, true))
@@ -25,3 +25,7 @@ class TkButton<TkLabel
     self
   end
 end
+
+#TkButton = Tk::Button unless Object.const_defined? :TkButton
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Button, :TkButton)
+Tk.__set_loaded_toplevel_aliases__('tk/button.rb', :Tk, Tk::Button, :TkButton)
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
index c30fd79bb9..f0cb755bd7 100644
--- a/ext/tk/lib/tk/canvas.rb
+++ b/ext/tk/lib/tk/canvas.rb
@@ -1,6 +1,5 @@
 #
 #               tk/canvas.rb - Tk canvas classes
-#                       $Date$
 #                       by Yukihiro Matsumoto <matz@caelum.co.jp>
 #
 require 'tk'
@@ -14,7 +13,7 @@ module TkCanvasItemConfig
   def __item_strval_optkeys(id)
     # maybe need to override
     super(id) + [
-      'fill', 'activefill', 'disabledfill', 
+      'fill', 'activefill', 'disabledfill',
       'outline', 'activeoutline', 'disabledoutline'
     ]
   end
@@ -26,7 +25,10 @@ module TkCanvasItemConfig
   private :__item_methodcall_optkeys
 
   def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
-    super(id).update('window'=>proc{|i, v| window(v)})
+    super(id).update('window'=>proc{|i, v| window(v)},
+                     'tags'=>proc{|i, v|
+                       simplelist(v).collect{|tag| TkcTag.id2obj(self, tag)}
+                     })
   end
   private :__item_val2ruby_optkeys
 
@@ -40,13 +42,13 @@ module TkCanvasItemConfig
   private :__item_pathname
 end
 
-class TkCanvas<TkWindow
+class Tk::Canvas<TkWindow
   include TkCanvasItemConfig
   include Tk::Scrollable
 
   TkCommandNames = ['canvas'.freeze].freeze
   WidgetClassName = 'Canvas'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __destroy_hook__
     TkcItem::CItemID_TBL.delete(@path)
@@ -118,7 +120,7 @@ class TkCanvas<TkWindow
   end
 
   def bbox(tagOrId, *tags)
-    list(tk_send_without_enc('bbox', tagid(tagOrId), 
+    list(tk_send_without_enc('bbox', tagid(tagOrId),
                              *tags.collect{|t| tagid(t)}))
   end
 
@@ -169,9 +171,11 @@ class TkCanvas<TkWindow
     #tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
     number(tk_send_without_enc('canvasy', screen_y, *args))
   end
+  alias canvas_x canvasx
+  alias canvas_y canvasy
 
   def coords(tag, *args)
-    if args == []
+    if args.empty?
       tk_split_list(tk_send_without_enc('coords', tagid(tag)))
     else
       tk_send_without_enc('coords', tagid(tag), *(args.flatten))
@@ -180,17 +184,23 @@ class TkCanvas<TkWindow
   end
 
   def dchars(tag, first, last=None)
-    tk_send_without_enc('dchars', tagid(tag), 
+    tk_send_without_enc('dchars', tagid(tag),
                         _get_eval_enc_str(first), _get_eval_enc_str(last))
     self
   end
 
   def delete(*args)
-    if TkcItem::CItemID_TBL[self.path]
+    tbl = nil
+    TkcItem::CItemID_TBL.mutex.synchronize{
+      tbl = TkcItem::CItemID_TBL[self.path]
+    }
+    if tbl
       args.each{|tag|
         find('withtag', tag).each{|item|
           if item.kind_of?(TkcItem)
-            TkcItem::CItemID_TBL[self.path].delete(item.id)
+            TkcItem::CItemID_TBL.mutex.synchronize{
+              tbl.delete(item.id)
+            }
           end
         }
       }
@@ -207,7 +217,7 @@ class TkCanvas<TkWindow
   alias deltag dtag
 
   def find(mode, *args)
-    list(tk_send_without_enc('find', mode, *args)).collect!{|id| 
+    list(tk_send_without_enc('find', mode, *args)).collect!{|id|
       TkcItem.id2obj(self, id)
     }
   end
@@ -258,12 +268,18 @@ class TkCanvas<TkWindow
     self
   end
 
+  def imove(tagOrId, idx, x, y)
+    tk_send_without_enc('imove', tagid(tagOrId), idx, x, y)
+    self
+  end
+  alias i_move imove
+
   def index(tagOrId, idx)
     number(tk_send_without_enc('index', tagid(tagOrId), idx))
   end
 
   def insert(tagOrId, index, string)
-    tk_send_without_enc('insert', tagid(tagOrId), index, 
+    tk_send_without_enc('insert', tagid(tagOrId), index,
                         _get_eval_enc_str(string))
     self
   end
@@ -293,7 +309,7 @@ class TkCanvas<TkWindow
         fnt
       end
     else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId), 
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId),
                                                 "-#{option}")))
     end
   end
@@ -308,16 +324,16 @@ class TkCanvas<TkWindow
           || key['latinfont'] || key['asciifont'] )
         tagfont_configure(tagid(tagOrId), key.dup)
       else
-        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), 
+        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
                                       *hash_kv(key, true)))
       end
 
     else
       if ( key == 'coords' || key == :coords )
         self.coords(tagOrId, value)
-      elsif ( key == 'font' || key == :font || 
-              key == 'kanjifont' || key == :kanjifont || 
-              key == 'latinfont' || key == :latinfont || 
+      elsif ( key == 'font' || key == :font ||
+              key == 'kanjifont' || key == :kanjifont ||
+              key == 'latinfont' || key == :latinfont ||
               key == 'asciifont' || key == :asciifont )
         if value == None
           tagfontobj(tagid(tagOrId))
@@ -325,7 +341,7 @@ class TkCanvas<TkWindow
           tagfont_configure(tagid(tagOrId), {key=>value})
         end
       else
-        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), 
+        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
                                       "-#{key}", _get_eval_enc_str(value)))
       end
     end
@@ -382,16 +398,16 @@ class TkCanvas<TkWindow
           else
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
             if conf[4]
               if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4]) 
+                conf[4] = tk_split_list(conf[4])
               else
-                conf[4] = tk_tcl2ruby(conf[4]) 
+                conf[4] = tk_tcl2ruby(conf[4])
               end
             end
           end
@@ -414,8 +430,8 @@ class TkCanvas<TkWindow
         when 'coords'
           {'coords' => ['', '', '', self.coords(tagOrId)]}
         when 'dash', 'activedash', 'disableddash'
-          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure', 
-                                                         tagid(tagOrId), 
+          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure',
+                                                         tagid(tagOrId),
                                                          "-#{key}"))
           if conf[3] && conf[3] =~ /^[0-9]/
             conf[3] = list(conf[3])
@@ -450,16 +466,16 @@ class TkCanvas<TkWindow
           else
             if conf[2]
               if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
+                conf[2] = tk_split_list(conf[2])
               else
-                conf[2] = tk_tcl2ruby(conf[2]) 
+                conf[2] = tk_tcl2ruby(conf[2])
               end
             end
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
           end
@@ -516,11 +532,18 @@ class TkCanvas<TkWindow
     self
   end
 
-  def move(tag, x, y)
-    tk_send_without_enc('move', tagid(tag), x, y)
+  def move(tag, dx, dy)
+    tk_send_without_enc('move', tagid(tag), dx, dy)
     self
   end
 
+  def moveto(tag, x, y)
+    # Tcl/Tk 8.6 or later
+    tk_send_without_enc('moveto', tagid(tag), x, y)
+    self
+  end
+  alias move_to moveto
+
   def postscript(keys)
     tk_send("postscript", *hash_kv(keys))
   end
@@ -534,6 +557,15 @@ class TkCanvas<TkWindow
     self
   end
 
+  def rchars(tag, first, last, str_or_coords)
+    # Tcl/Tk 8.6 or later
+    str_or_coords = str_or_coords.flatten if str_or_coords.kinad_of? Array
+    tk_send_without_enc('rchars', tagid(tag), first, last, str_or_coords)
+    self
+  end
+  alias replace_chars rchars
+  alias replace_coords rchars
+
   def scale(tag, x, y, xs, ys)
     tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
     self
@@ -573,6 +605,11 @@ class TkCanvas<TkWindow
   end
 end
 
+#TkCanvas = Tk::Canvas unless Object.const_defined? :TkCanvas
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Canvas, :TkCanvas)
+Tk.__set_loaded_toplevel_aliases__('tk/canvas.rb', :Tk, Tk::Canvas, :TkCanvas)
+
+
 class TkcItem<TkObject
   extend Tk
   include TkcTagAccess
@@ -581,9 +618,12 @@ class TkcItem<TkObject
 
   CItemTypeName = nil
   CItemTypeToClass = {}
+
   CItemID_TBL = TkCore::INTERP.create_table
 
-  TkCore::INTERP.init_ip_env{ CItemID_TBL.clear }
+  TkCore::INTERP.init_ip_env{
+    CItemID_TBL.mutex.synchronize{ CItemID_TBL.clear }
+  }
 
   def TkcItem.type2class(type)
     CItemTypeToClass[type]
@@ -591,8 +631,13 @@ class TkcItem<TkObject
 
   def TkcItem.id2obj(canvas, id)
     cpath = canvas.path
-    return id unless CItemID_TBL[cpath]
-    CItemID_TBL[cpath][id]? CItemID_TBL[cpath][id]: id
+    CItemID_TBL.mutex.synchronize{
+      if CItemID_TBL[cpath]
+        CItemID_TBL[cpath][id]? CItemID_TBL[cpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   ########################################
@@ -625,6 +670,13 @@ class TkcItem<TkObject
         fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
       }
 
+      __item_optkey_aliases(nil).each{|alias_name, real_name|
+        alias_name = alias_name.to_s
+        if keys.has_key?(alias_name)
+          keys[real_name.to_s] = keys.delete(alias_name)
+        end
+      }
+
       __item_methodcall_optkeys(nil).each{|key|
         key = key.to_s
         methodkeys[key] = keys.delete(key) if keys.key?(key)
@@ -641,7 +693,7 @@ class TkcItem<TkObject
       args = args.flatten
     end
 
-    [args, fontkeys]
+    [args, fontkeys, methodkeys]
   end
   private_class_method :_parse_create_args
 
@@ -649,24 +701,27 @@ class TkcItem<TkObject
     unless self::CItemTypeName
       fail RuntimeError, "#{self} is an abstract class"
     end
-    args, fontkeys = _parse_create_args(args)
-    idnum = tk_call_without_enc(canvas.path, 'create', 
+    args, fontkeys, methodkeys = _parse_create_args(args)
+    idnum = tk_call_without_enc(canvas.path, 'create',
                                 self::CItemTypeName, *args)
     canvas.itemconfigure(idnum, fontkeys) unless fontkeys.empty?
+    canvas.itemconfigure(idnum, methodkeys) unless methodkeys.empty?
     idnum.to_i  # 'canvas item id' is an integer number
   end
   ########################################
 
   def initialize(parent, *args)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #unless parent.kind_of?(Tk::Canvas)
+    #  fail ArgumentError, "expect Tk::Canvas for 1st argument"
     #end
     @parent = @c = parent
     @path = parent.path
 
     @id = create_self(*args) # an integer number as 'canvas item id'
-    CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
-    CItemID_TBL[@path][@id] = self
+    CItemID_TBL.mutex.synchronize{
+      CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
+      CItemID_TBL[@path][@id] = self
+    }
   end
   def create_self(*args)
     self.class.create(@c, *args) # return an integer number as 'canvas item id'
@@ -687,7 +742,9 @@ class TkcItem<TkObject
 
   def delete
     @c.delete @id
-    CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+    CItemID_TBL.mutex.synchronize{
+      CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+    }
     self
   end
   alias remove  delete
diff --git a/ext/tk/lib/tk/canvastag.rb b/ext/tk/lib/tk/canvastag.rb
index a5650ee68b..495d92a9a8 100644
--- a/ext/tk/lib/tk/canvastag.rb
+++ b/ext/tk/lib/tk/canvastag.rb
@@ -60,9 +60,15 @@ module TkcTagAccess
     @c.itembindinfo(@id, seq)
   end
 
+  def cget_tkstring(option)
+    @c.itemcget_tkstring(@id, option)
+  end
   def cget(option)
     @c.itemcget(@id, option)
   end
+  def cget_strict(option)
+    @c.itemcget_strict(@id, option)
+  end
 
   def configure(key, value=None)
     @c.itemconfigure(@id, key, value)
@@ -113,6 +119,13 @@ module TkcTagAccess
     self
   end
 
+  def imove(idx, x, y)
+    # Tcl/Tk 8.6 or later
+    @c.imove(@id, idx, x, y)
+    self
+  end
+  alias i_move imove
+
   def index(idx)
     @c.index(@id, idx)
   end
@@ -132,6 +145,13 @@ module TkcTagAccess
     self
   end
 
+  def moveto(x, y)
+    # Tcl/Tk 8.6 or later
+    @c.moveto(@id, x, y)
+    self
+  end
+  alias move_to moveto
+
   def raise(abovethis=None)
     @c.raise(@id, abovethis)
     self
@@ -142,6 +162,14 @@ module TkcTagAccess
     self
   end
 
+  def rchars(first, last, str_or_coords)
+    # Tcl/Tk 8.6 or later
+    @c.rchars(@id, first, last, str_or_coords)
+    self
+  end
+  alias replace_chars rchars
+  alias replace_coords rchars
+
   def select_adjust(index)
     @c.select('adjust', @id, index)
     self
@@ -199,14 +227,26 @@ class TkcTag<TkObject
   include TkcTagAccess
 
   CTagID_TBL = TkCore::INTERP.create_table
-  Tk_CanvasTag_ID = ['ctag'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ CTagID_TBL.clear }
+  (Tk_CanvasTag_ID = ['ctag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    CTagID_TBL.mutex.synchronize{ CTagID_TBL.clear }
+  }
 
   def TkcTag.id2obj(canvas, id)
     cpath = canvas.path
-    return id unless CTagID_TBL[cpath]
-    CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
+    CTagID_TBL.mutex.synchronize{
+      if CTagID_TBL[cpath]
+        CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, mode=nil, *args)
@@ -215,11 +255,15 @@ class TkcTag<TkObject
     #end
     @c = parent
     @cpath = parent.path
-    # @path = @id = Tk_CanvasTag_ID.join('')
-    @path = @id = Tk_CanvasTag_ID.join(TkCore::INTERP._ip_id_)
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-    Tk_CanvasTag_ID[1].succ!
+    Tk_CanvasTag_ID.mutex.synchronize{
+      # @path = @id = Tk_CanvasTag_ID.join('')
+      @path = @id = Tk_CanvasTag_ID.join(TkCore::INTERP._ip_id_)
+      Tk_CanvasTag_ID[1].succ!
+    }
+    CTagID_TBL.mutex.synchronize{
+      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+      CTagID_TBL[@cpath][@id] = self
+    }
     if mode
       tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
     end
@@ -238,7 +282,9 @@ class TkcTag<TkObject
 
   def delete
     @c.delete @id
-    CTagID_TBL[@cpath].delete(@id) if CTagID_TBL[@cpath]
+    CTagID_TBL.mutex.synchronize{
+      CTagID_TBL[@cpath].delete(@id) if CTagID_TBL[@cpath]
+    }
     self
   end
   alias remove  delete
@@ -288,23 +334,38 @@ class TkcTag<TkObject
 end
 
 class TkcTagString<TkcTag
-  def self.new(parent, name, *args)
-    if CTagID_TBL[parent.path] && CTagID_TBL[parent.path][name]
-      return CTagID_TBL[parent.path][name]
-    else
-      super(parent, name, *args)
+  def self.new(parent, name, mode=nil, *args)
+    obj = nil
+    CTagID_TBL.mutex.synchronize{
+      if CTagID_TBL[parent.path] && CTagID_TBL[parent.path][name]
+        obj = CTagID_TBL[parent.path][name]
+      else
+        # super(parent, name, *args)
+        (obj = self.allocate).instance_eval{
+          @c = parent
+          @cpath = parent.path
+          @path = @id = name
+          CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+          CTagID_TBL[@cpath][@id] = self
+        }
+      end
+    }
+    if obj && mode
+      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
     end
+    obj
   end
 
   def initialize(parent, name, mode=nil, *args)
+    # dummy:: not called by 'new' method
+
     #unless parent.kind_of?(TkCanvas)
     #  fail ArgumentError, "expect TkCanvas for 1st argument"
     #end
     @c = parent
     @cpath = parent.path
     @path = @id = name
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
+
     if mode
       tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
     end
@@ -312,7 +373,11 @@ class TkcTagString<TkcTag
 end
 TkcNamedTag = TkcTagString
 
-class TkcTagAll<TkcTag
+class TkcTagAll<TkcTagString
+  def self.new(parent)
+    super(parent, 'all')
+  end
+=begin
   def initialize(parent)
     #unless parent.kind_of?(TkCanvas)
     #  fail ArgumentError, "expect TkCanvas for 1st argument"
@@ -320,12 +385,19 @@ class TkcTagAll<TkcTag
     @c = parent
     @cpath = parent.path
     @path = @id = 'all'
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
+    CTagID_TBL.mutex.synchronize{
+      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+      CTagID_TBL[@cpath][@id] = self
+    }
   end
+=end
 end
 
-class TkcTagCurrent<TkcTag
+class TkcTagCurrent<TkcTagString
+  def self.new(parent)
+    super(parent, 'current')
+  end
+=begin
   def initialize(parent)
     #unless parent.kind_of?(TkCanvas)
     #  fail ArgumentError, "expect TkCanvas for 1st argument"
@@ -333,13 +405,21 @@ class TkcTagCurrent<TkcTag
     @c = parent
     @cpath = parent.path
     @path = @id = 'current'
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
+    CTagID_TBL.mutex.synchronize{
+      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+      CTagID_TBL[@cpath][@id] = self
+    }
   end
+=end
 end
 
 class TkcGroup<TkcTag
-  Tk_cGroup_ID = ['tkcg'.freeze, '00000'.taint].freeze
+  (Tk_cGroup_ID = ['tkcg'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
   #def create_self(parent, *args)
   def initialize(parent, *args)
     #unless parent.kind_of?(TkCanvas)
@@ -347,15 +427,19 @@ class TkcGroup<TkcTag
     #end
     @c = parent
     @cpath = parent.path
-    # @path = @id = Tk_cGroup_ID.join('')
-    @path = @id = Tk_cGroup_ID.join(TkCore::INTERP._ip_id_)
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-    Tk_cGroup_ID[1].succ!
+    Tk_cGroup_ID.mutex.synchronize{
+      # @path = @id = Tk_cGroup_ID.join('')
+      @path = @id = Tk_cGroup_ID.join(TkCore::INTERP._ip_id_)
+      Tk_cGroup_ID[1].succ!
+    }
+    CTagID_TBL.mutex.synchronize{
+      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+      CTagID_TBL[@cpath][@id] = self
+    }
     include(*args) if args != []
   end
   #private :create_self
-  
+
   def include(*tags)
     for i in tags
       #i.addtag(@id)
diff --git a/ext/tk/lib/tk/checkbutton.rb b/ext/tk/lib/tk/checkbutton.rb
index d76d99c0f2..b7449541c5 100644
--- a/ext/tk/lib/tk/checkbutton.rb
+++ b/ext/tk/lib/tk/checkbutton.rb
@@ -4,10 +4,10 @@
 require 'tk'
 require 'tk/radiobutton'
 
-class TkCheckButton<TkRadioButton
+class Tk::CheckButton<Tk::RadioButton
   TkCommandNames = ['checkbutton'.freeze].freeze
   WidgetClassName = 'Checkbutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   #def create_self(keys)
   #  if keys and keys != None
   #    tk_call_without_enc('checkbutton', @path, *hash_kv(keys, true))
@@ -22,4 +22,11 @@ class TkCheckButton<TkRadioButton
     self
   end
 end
-TkCheckbutton = TkCheckButton
+
+Tk::Checkbutton = Tk::CheckButton
+#TkCheckButton = Tk::CheckButton unless Object.const_defined? :TkCheckButton
+#TkCheckbutton = Tk::Checkbutton unless Object.const_defined? :TkCheckbutton
+#Tk.__set_toplevel_aliases__(:Tk, Tk::CheckButton,
+#                            :TkCheckButton, :TkCheckbutton)
+Tk.__set_loaded_toplevel_aliases__('tk/checkbutton.rb', :Tk, Tk::CheckButton,
+                                   :TkCheckButton, :TkCheckbutton)
diff --git a/ext/tk/lib/tk/composite.rb b/ext/tk/lib/tk/composite.rb
index eaed8ed363..e267c7a22b 100644
--- a/ext/tk/lib/tk/composite.rb
+++ b/ext/tk/lib/tk/composite.rb
@@ -1,5 +1,5 @@
 #
-# tk/composite.rb : 
+# tk/composite.rb :
 #
 require 'tk'
 
@@ -34,7 +34,8 @@ module TkComposite
 
     if klass
       # WidgetClassName is a known class
-      if klass <= TkFrame || klass < TkComposite
+      #if klass <= TkFrame || klass < TkComposite
+      if klass <= TkFrame || klass < Tk::Frame || klass < TkComposite
         # klass is valid for the base frame
         if self.class <= klass
           # use my classname
@@ -50,7 +51,8 @@ module TkComposite
 
       else
         # klass is invalid for the base frame
-        if self.class < TkFrame || self.class.superclass < TkComposite
+        #if self.class < TkFrame || self.class.superclass < TkComposite
+        if self.class < TkFrame || self.class.superclass < Tk::Frame || self.class.superclass < TkComposite
           # my class name is valid for the base frame -> use my classname
           base_class_name = self.class.name
           if base_class_name == ''
@@ -69,7 +71,8 @@ module TkComposite
 
     else
       # no valid WidgetClassName
-      if self.class < TkFrame || self.class.superclass < TkComposite
+      #if self.class < TkFrame || self.class.superclass < TkComposite
+      if self.class < TkFrame || self.class.superclass < Tk::Frame || self.class.superclass < TkComposite
         # my class name is valid for the base frame -> use my classname
         base_class_name = self.class.name
         if base_class_name == ''
@@ -108,8 +111,12 @@ module TkComposite
     end
 
     if base_class_name
+      # @frame = Tk::Frame.new(parent, :class=>base_class_name)
+      # --> use current TkFrame class
       @frame = TkFrame.new(parent, :class=>base_class_name)
     else
+      # @frame = Tk::Frame.new(parent)
+      # --> use current TkFrame class
       @frame = TkFrame.new(parent)
     end
     @path = @epath = @frame.path
@@ -133,16 +140,39 @@ module TkComposite
   def initialize_composite(*args) end
   private :initialize_composite
 
+  def inspect
+    str = super
+    str.chop << ' @epath=' << @epath.inspect << '>'
+  end
+
+  def _get_opt_method_list(arg)
+    m_set, m_cget, m_info = arg
+    m_set  = m_set.to_s
+    m_cget = m_set if !m_cget && self.method(m_set).arity == -1
+    m_cget = m_cget.to_s if m_cget
+    m_info = m_info.to_s if m_info
+    [m_set, m_cget, m_info]
+  end
+  private :_get_opt_method_list
+
   def option_methods(*opts)
-    opts.each{|m_set, m_cget, m_info|
-      m_set  = m_set.to_s
-      m_cget = m_set if !m_cget && self.method(m_set).arity == -1
-      m_cget = m_cget.to_s if m_cget
-      m_info = m_info.to_s if m_info
-      @option_methods[m_set] = {
-        :set  => m_set, :cget => m_cget, :info => m_info
+    if opts.size == 1 && opts[0].kind_of?(Hash)
+      # {name => [m_set, m_cget, m_info], name => method} style
+      opts[0].each{|name, arg|
+        m_set, m_cget, m_info = _get_opt_method_list(arg)
+        @option_methods[name.to_s] = {
+          :set => m_set, :cget => m_cget, :info => m_info
+        }
+      }
+    else
+      # [m_set, m_cget, m_info] or method style
+      opts.each{|arg|
+        m_set, m_cget, m_info = _get_opt_method_list(arg)
+        @option_methods[m_set] = {
+          :set => m_set, :cget => m_cget, :info => m_info
+        }
       }
-    }
+    end
   end
 
   def delegate_alias(alias_opt, option, *wins)
@@ -169,6 +199,65 @@ module TkComposite
     delegate_alias(option, option, *wins)
   end
 
+  def __cget_delegates(slot)
+    slot = slot.to_s
+
+    if @option_methods.include?(slot)
+      if @option_methods[slot][:cget]
+        return self.__send__(@option_methods[slot][:cget])
+      else
+        if @option_setting[slot]
+          return @option_setting[slot]
+        else
+          return ''
+        end
+      end
+    end
+
+    tbl = @delegates[slot]
+    tbl = @delegates['DEFAULT'] unless tbl
+
+    begin
+      if tbl
+        opt, wins = tbl[-1]
+        opt = slot if opt == 'DEFAULT'
+        if wins && wins[-1]
+          # return wins[-1].cget(opt)
+          return wins[-1].cget_strict(opt)
+        end
+      end
+    rescue
+    end
+
+    return None
+  end
+  private :__cget_delegates
+
+  def cget_tkstring(slot)
+    if (ret = __cget_delegates(slot)) == None
+      super(slot)
+    else
+      _get_eval_string(ret)
+    end
+  end
+
+  def cget(slot)
+    if (ret = __cget_delegates(slot)) == None
+      super(slot)
+    else
+      ret
+    end
+  end
+
+  def cget_strict(slot)
+    if (ret = __cget_delegates(slot)) == None
+      super(slot)
+    else
+      ret
+    end
+  end
+
+=begin
   def cget(slot)
     slot = slot.to_s
 
@@ -200,6 +289,7 @@ module TkComposite
 
     super(slot)
   end
+=end
 
   def configure(slot, value=None)
     if slot.kind_of? Hash
@@ -294,7 +384,7 @@ module TkComposite
             opt, wins = tbl[0]
             next unless wins && wins[-1]
             if slot == opt
-              info_list.delete_if{|i| i[0] == slot} << 
+              info_list.delete_if{|i| i[0] == slot} <<
                 wins[-1].configinfo(slot)
             else
               info = wins[-1].configinfo(opt)
@@ -303,7 +393,7 @@ module TkComposite
             end
           else
             opt, wins = tbl[-1]
-            info_list.delete_if{|i| i[0] == slot} << 
+            info_list.delete_if{|i| i[0] == slot} <<
               [slot, '', '', '', wins[-1].cget(opt)]
           end
         }
diff --git a/ext/tk/lib/tk/console.rb b/ext/tk/lib/tk/console.rb
index 26ce262caa..64e257594c 100644
--- a/ext/tk/lib/tk/console.rb
+++ b/ext/tk/lib/tk/console.rb
@@ -28,7 +28,7 @@ module TkConsole
     # supports a Tcl script only
     # I have no idea to support a Ruby script seamlessly.
     #
-    _fromUTF8(tk_call_without_enc('console', 'eval', 
+    _fromUTF8(tk_call_without_enc('console', 'eval',
                                   _get_eval_enc_str(tcl_script)))
   end
   def self.maininterp_eval(tcl_script)
@@ -36,7 +36,7 @@ module TkConsole
     # supports a Tcl script only
     # I have no idea to support a Ruby script seamlessly.
     #
-    _fromUTF8(tk_call_without_enc('consoleinterp', 'eval', 
+    _fromUTF8(tk_call_without_enc('consoleinterp', 'eval',
                                   _get_eval_enc_str(tcl_script)))
 
   end
@@ -45,7 +45,7 @@ module TkConsole
     # supports a Tcl script only
     # I have no idea to support a Ruby script seamlessly.
     #
-    _fromUTF8(tk_call_without_enc('consoleinterp', 'record', 
+    _fromUTF8(tk_call_without_enc('consoleinterp', 'record',
                                   _get_eval_enc_str(tcl_script)))
 
   end
diff --git a/ext/tk/lib/tk/dialog.rb b/ext/tk/lib/tk/dialog.rb
index 180da101e3..7ef7820699 100644
--- a/ext/tk/lib/tk/dialog.rb
+++ b/ext/tk/lib/tk/dialog.rb
@@ -18,11 +18,11 @@ class TkDialogObj < TkWindow
   def _set_button_config(configs)
     set_config = proc{|c,i|
       if $VERBOSE && (c.has_key?('command') || c.has_key?(:command))
-        STDERR.print("Warning: cannot give a command option " + 
+        STDERR.print("Warning: cannot give a command option " +
                      "to the dialog button#{i}. It was removed.\n")
       end
       c.delete('command'); c.delete(:command)
-      # @config << Kernel.format("%s.button%s configure %s; ", 
+      # @config << Kernel.format("%s.button%s configure %s; ",
       #                                @path, i, hash_kv(c).join(' '))
       # @config << @path+'.button'+i.to_s+' configure '+hash_kv(c).join(' ')+'; '
       @config << @path+'.button'+i.to_s+' configure '+
@@ -103,7 +103,7 @@ class TkDialogObj < TkWindow
     #end
 
     if @buttons.kind_of?(Array)
-      _set_button_config(@buttons.collect{|cfg| 
+      _set_button_config(@buttons.collect{|cfg|
                            (cfg.kind_of? Array)? cfg[1]: nil})
       @buttons = @buttons.collect{|cfg| (cfg.kind_of? Array)? cfg[0]: cfg}
     end
@@ -127,7 +127,7 @@ class TkDialogObj < TkWindow
 =end
 
     if @message_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.msg configure %s;", 
+      # @config << Kernel.format("%s.msg configure %s;",
       #                        @path, hash_kv(@message_config).join(' '))
       # @config << @path+'.msg configure '+hash_kv(@message_config).join(' ')+';'
       @config << @path+'.msg configure '+
@@ -135,7 +135,7 @@ class TkDialogObj < TkWindow
     end
 
     if @msgframe_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.top configure %s;", 
+      # @config << Kernel.format("%s.top configure %s;",
       #                        @path, hash_kv(@msgframe_config).join(' '))
       # @config << @path+'.top configure '+hash_kv(@msgframe_config).join(' ')+';'
       @config << @path+'.top configure '+
@@ -143,7 +143,7 @@ class TkDialogObj < TkWindow
     end
 
     if @btnframe_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.bot configure %s;", 
+      # @config << Kernel.format("%s.bot configure %s;",
       #                        @path, hash_kv(@btnframe_config).join(' '))
       # @config << @path+'.bot configure '+hash_kv(@btnframe_config).join(' ')+';'
       @config << @path+'.bot configure '+
@@ -151,7 +151,7 @@ class TkDialogObj < TkWindow
     end
 
     if @bitmap_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.bitmap configure %s;", 
+      # @config << Kernel.format("%s.bitmap configure %s;",
       #                        @path, hash_kv(@bitmap_config).join(' '))
       # @config << @path+'.bitmap configure '+hash_kv(@bitmap_config).join(' ')+';'
       @config << @path+'.bitmap configure '+
@@ -176,19 +176,19 @@ class TkDialogObj < TkWindow
     # default_button = '{}' if default_button == nil
     default_button = '' if default_button == nil
     #Tk.ip_eval('eval {global '+@var.id+';'+@config+
-    #          'set '+@var.id+' [tk_dialog '+ 
+    #          'set '+@var.id+' [tk_dialog '+
     #          @path+" "+@title+" {#{@message}} "+@bitmap+" "+
     #          String(default_button)+" "+@buttons.join(' ')+']}')
     Tk.ip_eval(@config)
-    # @val = Tk.ip_eval('tk_dialog ' + @path + ' ' + @title + 
-    #                 ' {' + @message + '} ' + @bitmap + ' ' + 
+    # @val = Tk.ip_eval('tk_dialog ' + @path + ' ' + @title +
+    #                 ' {' + @message + '} ' + @bitmap + ' ' +
     #                 String(default_button) + ' ' + @buttons.join(' ')).to_i
-    # @val = Tk.ip_eval(self.class::TkCommandNames[0] + ' ' + @path + ' ' + 
-    #                   @title + ' {' + @message + '} ' + @bitmap + ' ' + 
+    # @val = Tk.ip_eval(self.class::TkCommandNames[0] + ' ' + @path + ' ' +
+    #                   @title + ' {' + @message + '} ' + @bitmap + ' ' +
     #                   String(default_button) + ' ' + @buttons.join(' ')).to_i
     @val = Tk.ip_eval(array2tk_list([
-                                      self.class::TkCommandNames[0], 
-                                      @path, @title, @message, @bitmap, 
+                                      self.class::TkCommandNames[0],
+                                      @path, @title, @message, @bitmap,
                                       String(default_button)
                                     ].concat(@buttons))).to_i
   end
@@ -226,7 +226,7 @@ class TkDialogObj < TkWindow
     return nil
   end
   def bitmap
-    # returns a bitmap name or a bitmap file path 
+    # returns a bitmap name or a bitmap file path
     # (@ + path ; e.g. '@/usr/share/bitmap/sample.xbm')
     return "info"
   end
diff --git a/ext/tk/lib/tk/encodedstr.rb b/ext/tk/lib/tk/encodedstr.rb
index 797e514a4c..59fbb1911d 100644
--- a/ext/tk/lib/tk/encodedstr.rb
+++ b/ext/tk/lib/tk/encodedstr.rb
@@ -67,16 +67,92 @@ module Tk
 
     def initialize(str, enc = nil)
       super(str)
-      # @encoding = ( enc || 
-      #              ((self.class::Encoding)? 
+      # @encoding = ( enc ||
+      #              ((self.class::Encoding)?
       #                  self.class::Encoding : Tk.encoding_system) )
-      @encoding = ( enc || 
-                   ((self.class::Encoding)?
-                         self.class::Encoding : 
-                         ((Tk.encoding)? Tk.encoding : Tk.encoding_system) ) )
+      enc ||= (self.class::Encoding)?
+                         self.class::Encoding :
+                         ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
+      if TkCore::WITH_ENCODING
+        unless encobj = Tk::Encoding::ENCODING_TABLE.get_obj(enc)
+          fail ArgumentError, "unsupported Tk encoding '#{enc}'"
+        end
+        self.force_encoding(encobj)
+      else
+        @encoding = enc
+      end
+    end
+
+    if TkCore::WITH_ENCODING
+      alias encoding_obj encoding
+      alias __encoding   encoding
+      def encoding
+        Tk::Encoding::ENCODING_TABLE.get_name(super())
+      end
+    else
+      def encoding
+        @encoding
+      end
+      alias encoding_obj encoding
     end
 
-    attr_reader :encoding
+    if TkCore::WITH_ENCODING
+      # wrapper methods for compatibility
+      alias __instance_variable_get instance_variable_get
+      alias __instance_variable_set instance_variable_set
+      alias __instance_eval         instance_eval
+      alias __instance_variables    instance_variables
+
+      def instance_variable_get(key)
+        if (key.to_s == '@encoding')
+          self.encoding
+        else
+          super(key)
+        end
+      end
+
+      def instance_variable_set(key, value)
+        if (key.to_s == '@encoding')
+          if value
+            self.force_encoding(value)
+          else
+            self.force_encoding(Tk::Encoding::UNKNOWN)
+          end
+          value
+        else
+          super(key, value)
+        end
+      end
+
+      def instance_eval(*args, &b)
+        old_enc = @encoding = self.encoding
+
+        ret = super(*args, &b)
+
+        if @encoding
+          if @encoding != old_enc
+            # modified by user
+            self.force_encoding(@encoding)
+          end
+          remove_instance_variable(:@encoding)
+        else
+          begin
+            remove_instance_variable(:@encoding)
+            # user sets to nil -> use current default
+            self.force_encoding(Tk.encoding)
+          rescue NameError
+            # removed by user -> ignore, because user don't use @encoding
+          end
+        end
+        ret
+      end
+    end
+
+    def instance_variables
+      ret = super()
+      ret << :@encoding  # fake !!
+      ret
+    end
   end
   # def Tk.EncodedString(str, enc = nil)
   #   Tk::EncodedString.new(str, enc)
diff --git a/ext/tk/lib/tk/entry.rb b/ext/tk/lib/tk/entry.rb
index 4ac3f28229..d4aa03f2b6 100644
--- a/ext/tk/lib/tk/entry.rb
+++ b/ext/tk/lib/tk/entry.rb
@@ -1,6 +1,5 @@
 #
 #               tk/entry.rb - Tk entry classes
-#                       $Date$
 #                       by Yukihiro Matsumoto <matz@caelum.co.jp>
 
 require 'tk'
@@ -8,13 +7,13 @@ require 'tk/label'
 require 'tk/scrollable'
 require 'tk/validation'
 
-class TkEntry<TkLabel
+class Tk::Entry<Tk::Label
   include X_Scrollable
   include TkValidation
 
   TkCommandNames = ['entry'.freeze].freeze
   WidgetClassName = 'Entry'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   #def create_self(keys)
   #  super(__conv_vcmd_on_hash_kv(keys))
@@ -115,3 +114,7 @@ class TkEntry<TkLabel
     val
   end
 end
+
+#TkEntry = Tk::Entry unless Object.const_defined? :TkEntry
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Entry, :TkEntry)
+Tk.__set_loaded_toplevel_aliases__('tk/entry.rb', :Tk, Tk::Entry, :TkEntry)
diff --git a/ext/tk/lib/tk/event.rb b/ext/tk/lib/tk/event.rb
index 70a1e38bbe..bf4e122322 100644
--- a/ext/tk/lib/tk/event.rb
+++ b/ext/tk/lib/tk/event.rb
@@ -8,7 +8,7 @@ end
 ########################
 
 require 'tkutil'
-require 'tk'
+require 'tk' unless Object.const_defined? :TkComm
 
 ########################
 
@@ -39,7 +39,9 @@ module TkEvent
       RESIZEREQ   =           0x200000
       CIRCREQ     =           0x400000
 
-      MWHEEL      =           0x10000000
+      MWHEEL      =           KEY
+
+      STRING_DATA =           0x80000000  # special flag for 'data' field
 
       ALL         =           0xFFFFFFFF
 
@@ -51,39 +53,39 @@ module TkEvent
       #-----+-------------------+------------------+-----------------------#
       #  ID |  const            |  group_flag      |  context_name         #
       #-----+-------------------+------------------+-----------------------#
-      [  2,  :KeyPress,          Grp::KEY,         'KeyPress',    'Key'    ], 
-      [  3,  :KeyRelease,        Grp::KEY,         'KeyRelease'            ], 
-      [  4,  :ButtonPress,       Grp::BUTTON,      'ButtonPress', 'Button' ], 
-      [  5,  :ButtonRelease,     Grp::BUTTON,      'ButtonRelease'         ], 
-      [  6,  :MotionNotify,      Grp::MOTION,      'Motion'                ], 
-      [  7,  :EnterNotify,       Grp::CROSSING,    'Enter'                 ], 
-      [  8,  :LeaveNotify,       Grp::CROSSING,    'Leave'                 ], 
-      [  9,  :FocusIn,           Grp::FOCUS,       'FocusIn'               ], 
-      [ 10,  :FocusOut,          Grp::FOCUS,       'FocusOut'              ], 
-      [ 11,  :KeymapNotify,      0,                                        ], 
-      [ 12,  :Expose,            Grp::EXPOSE,      'Expose'                ], 
-      [ 13,  :GraphicsExpose,    Grp::EXPOSE,                              ], 
-      [ 14,  :NoExpose,          0,                                        ], 
-      [ 15,  :VisibilityNotify,  Grp::VISIBILITY,  'Visibility'            ], 
-      [ 16,  :CreateNotify,      Grp::CREATE,      'Create'                ], 
-      [ 17,  :DestroyNotify,     Grp::DESTROY,     'Destroy'               ], 
-      [ 18,  :UnmapNotify,       Grp::UNMAP,       'Unmap'                 ], 
-      [ 19,  :MapNotify,         Grp::MAP,         'Map'                   ], 
-      [ 20,  :MapRequest,        Grp::MAPREQ,      'MapRequest'            ], 
-      [ 21,  :ReparentNotify,    Grp::REPARENT,    'Reparent'              ], 
-      [ 22,  :ConfigureNotify,   Grp::CONFIG,      'Configure'             ], 
-      [ 23,  :ConfigureRequest,  Grp::CONFIGREQ,   'ConfigureRequest'      ], 
-      [ 24,  :GravityNotify,     Grp::GRAVITY,     'Gravity'               ], 
-      [ 25,  :ResizeRequest,     Grp::RESIZEREQ,   'ResizeRequest'         ], 
-      [ 26,  :CirculateNotify,   Grp::CIRC,        'Circulate'             ], 
-      [ 27,  :CirculateRequest,  0,                'CirculateRequest'      ], 
-      [ 28,  :PropertyNotify,    Grp::PROP,        'Property'              ], 
-      [ 29,  :SelectionClear,    0,                                        ], 
-      [ 30,  :SelectionRequest,  0,                                        ], 
-      [ 31,  :SelectionNotify,   0,                                        ], 
-      [ 32,  :ColormapNotify,    Grp::COLORMAP,    'Colormap'              ], 
-      [ 33,  :ClientMessage,     0,                                        ], 
-      [ 34,  :MappingNotify,     0,                                        ], 
+      [  2,  :KeyPress,          Grp::KEY,         'KeyPress',    'Key'    ],
+      [  3,  :KeyRelease,        Grp::KEY,         'KeyRelease'            ],
+      [  4,  :ButtonPress,       Grp::BUTTON,      'ButtonPress', 'Button' ],
+      [  5,  :ButtonRelease,     Grp::BUTTON,      'ButtonRelease'         ],
+      [  6,  :MotionNotify,      Grp::MOTION,      'Motion'                ],
+      [  7,  :EnterNotify,       Grp::CROSSING,    'Enter'                 ],
+      [  8,  :LeaveNotify,       Grp::CROSSING,    'Leave'                 ],
+      [  9,  :FocusIn,           Grp::FOCUS,       'FocusIn'               ],
+      [ 10,  :FocusOut,          Grp::FOCUS,       'FocusOut'              ],
+      [ 11,  :KeymapNotify,      0,                                        ],
+      [ 12,  :Expose,            Grp::EXPOSE,      'Expose'                ],
+      [ 13,  :GraphicsExpose,    Grp::EXPOSE,                              ],
+      [ 14,  :NoExpose,          0,                                        ],
+      [ 15,  :VisibilityNotify,  Grp::VISIBILITY,  'Visibility'            ],
+      [ 16,  :CreateNotify,      Grp::CREATE,      'Create'                ],
+      [ 17,  :DestroyNotify,     Grp::DESTROY,     'Destroy'               ],
+      [ 18,  :UnmapNotify,       Grp::UNMAP,       'Unmap'                 ],
+      [ 19,  :MapNotify,         Grp::MAP,         'Map'                   ],
+      [ 20,  :MapRequest,        Grp::MAPREQ,      'MapRequest'            ],
+      [ 21,  :ReparentNotify,    Grp::REPARENT,    'Reparent'              ],
+      [ 22,  :ConfigureNotify,   Grp::CONFIG,      'Configure'             ],
+      [ 23,  :ConfigureRequest,  Grp::CONFIGREQ,   'ConfigureRequest'      ],
+      [ 24,  :GravityNotify,     Grp::GRAVITY,     'Gravity'               ],
+      [ 25,  :ResizeRequest,     Grp::RESIZEREQ,   'ResizeRequest'         ],
+      [ 26,  :CirculateNotify,   Grp::CIRC,        'Circulate'             ],
+      [ 27,  :CirculateRequest,  0,                'CirculateRequest'      ],
+      [ 28,  :PropertyNotify,    Grp::PROP,        'Property'              ],
+      [ 29,  :SelectionClear,    0,                                        ],
+      [ 30,  :SelectionRequest,  0,                                        ],
+      [ 31,  :SelectionNotify,   0,                                        ],
+      [ 32,  :ColormapNotify,    Grp::COLORMAP,    'Colormap'              ],
+      [ 33,  :ClientMessage,     0,                                        ],
+      [ 34,  :MappingNotify,     0,                                        ],
       [ 35,  :VirtualEvent,      Grp::VIRTUAL,                             ],
       [ 36,  :ActivateNotify,    Grp::ACTIVATE,    'Activate'              ],
       [ 37,  :DeactivateNotify,  Grp::ACTIVATE,    'Deactivate'            ],
@@ -151,12 +153,12 @@ module TkEvent
 
     FIELD_FLAG = {
       # key  =>  flag
-      'above'       => Grp::CONFIG, 
+      'above'       => Grp::CONFIG,
       'borderwidth' => (Grp::CREATE|Grp::CONFIG),
-      'button'      => Grp::BUTTON, 
-      'count'       => Grp::EXPOSE, 
-      'data'        => Grp::VIRTUAL, 
-      'delta'       => Grp::MWHEEL, 
+      'button'      => Grp::BUTTON,
+      'count'       => Grp::EXPOSE,
+      'data'        => (Grp::VIRTUAL|Grp::STRING_DATA),
+      'delta'       => Grp::MWHEEL,
       'detail'      => (Grp::FOCUS|Grp::CROSSING),
       'focus'       => Grp::CROSSING,
       'height'      => (Grp::EXPOSE|Grp::CONFIG),
@@ -189,23 +191,23 @@ module TkEvent
     }
 
     FIELD_OPERATION = {
-      'root' => proc{|val| 
+      'root' => proc{|val|
         begin
           Tk.tk_call_without_enc('winfo', 'pathname', val)
           val
         rescue
           nil
         end
-      }, 
+      },
 
-      'subwindow' => proc{|val| 
+      'subwindow' => proc{|val|
         begin
           Tk.tk_call_without_enc('winfo', 'pathname', val)
           val
         rescue
           nil
         end
-      }, 
+      },
 
       'window' => proc{|val| nil}
     }
@@ -223,7 +225,8 @@ module TkEvent
         rescue
           next
         end
-        next if !val || val == '??'
+        # next if !val || val == '??'
+        next if !val || (val == '??' && (flag & Grp::STRING_DATA))
         fields[key] = val
       }
 
@@ -277,7 +280,7 @@ module TkEvent
         Tk.event_generate(win, type_name, opts)
       else
         # If type is KEY event, focus should be set to target widget.
-        # If not set, original widget will get the same event. 
+        # If not set, original widget will get the same event.
         # That will make infinite loop.
         w = Tk.tk_call_without_enc('focus')
         begin
@@ -293,45 +296,76 @@ module TkEvent
 
     # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
     KEY_TBL = [
-      [ ?#, ?n, :serial ], 
-      [ ?a, ?s, :above ], 
-      [ ?b, ?n, :num ], 
-      [ ?c, ?n, :count ], 
-      [ ?d, ?s, :detail ], 
-      [ ?f, ?b, :focus ], 
-      [ ?h, ?n, :height ], 
-      [ ?i, ?s, :win_hex ], 
-      [ ?k, ?n, :keycode ], 
-      [ ?m, ?s, :mode ], 
-      [ ?o, ?b, :override ], 
-      [ ?p, ?s, :place ], 
-      [ ?s, ?x, :state ], 
-      [ ?t, ?n, :time ], 
-      [ ?w, ?n, :width ], 
-      [ ?x, ?n, :x ], 
-      [ ?y, ?n, :y ], 
-      [ ?A, ?s, :char ], 
-      [ ?B, ?n, :borderwidth ], 
-      [ ?D, ?n, :wheel_delta ], 
-      [ ?E, ?b, :send_event ], 
-      [ ?K, ?s, :keysym ], 
-      [ ?N, ?n, :keysym_num ], 
-      [ ?P, ?s, :property ], 
-      [ ?R, ?s, :rootwin_id ], 
-      [ ?S, ?s, :subwindow ], 
-      [ ?T, ?n, :type ], 
-      [ ?W, ?w, :widget ], 
-      [ ?X, ?n, :x_root ], 
-      [ ?Y, ?n, :y_root ], 
+      [ ?#, ?n, :serial ],
+      [ ?a, ?s, :above ],
+      [ ?b, ?n, :num ],
+      [ ?c, ?n, :count ],
+      [ ?d, ?s, :detail ],
+      # ?e
+      [ ?f, ?b, :focus ],
+      # ?g
+      [ ?h, ?n, :height ],
+      [ ?i, ?s, :win_hex ],
+      # ?j
+      [ ?k, ?n, :keycode ],
+      # ?l
+      [ ?m, ?s, :mode ],
+      # ?n
+      [ ?o, ?b, :override ],
+      [ ?p, ?s, :place ],
+      # ?q
+      # ?r
+      [ ?s, ?x, :state ],
+      [ ?t, ?n, :time ],
+      # ?u
+      [ ?v, ?n, :value_mask ],
+      [ ?w, ?n, :width ],
+      [ ?x, ?n, :x ],
+      [ ?y, ?n, :y ],
+      # ?z
+      [ ?A, ?s, :char ],
+      [ ?B, ?n, :borderwidth ],
+      # ?C
+      [ ?D, ?n, :wheel_delta ],
+      [ ?E, ?b, :send_event ],
+      # ?F
+      # ?G
+      # ?H
+      # ?I
+      # ?J
+      [ ?K, ?s, :keysym ],
+      # ?L
+      # ?M
+      [ ?N, ?n, :keysym_num ],
+      # ?O
+      [ ?P, ?s, :property ],
+      # ?Q
+      [ ?R, ?s, :rootwin_id ],
+      [ ?S, ?s, :subwindow ],
+      [ ?T, ?n, :type ],
+      # ?U
+      # ?V
+      [ ?W, ?w, :widget ],
+      [ ?X, ?n, :x_root ],
+      [ ?Y, ?n, :y_root ],
+      # ?Z
       nil
     ]
 
+    # [ <'%' subst-key str>, <proc type char>, <instance var (accessor) name>]
+    #   the subst-key string will be converted to a bytecode (128+idx).
+    LONGKEY_TBL = [
+      # for example, for %CTT and %CST subst-key on tkdnd-2.0
+      # ['CTT', ?l, :drop_target_type],
+      # ['CST', ?l, :drop_source_type],
+    ]
+
     # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
     PROC_TBL = [
-      [ ?n, TkComm.method(:num_or_str) ], 
-      [ ?s, TkComm.method(:string) ], 
-      [ ?b, TkComm.method(:bool) ], 
-      [ ?w, TkComm.method(:window) ], 
+      [ ?n, TkComm.method(:num_or_str) ],
+      [ ?s, TkComm.method(:string) ],
+      [ ?b, TkComm.method(:bool) ],
+      [ ?w, TkComm.method(:window) ],
 
       [ ?x, proc{|val|
           begin
@@ -340,31 +374,50 @@ module TkEvent
             val
           end
         }
-      ], 
+      ],
 
       nil
     ]
 
+=begin
+    # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+    KEY_TBL.map!{|inf|
+      if inf.kind_of?(Array)
+        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+      end
+      inf
+    }
+
+    PROC_TBL.map!{|inf|
+      if inf.kind_of?(Array)
+        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+      end
+      inf
+    }
+=end
+
     # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
     #
-    #     _get_subst_key() and _get_all_subst_keys() generates key-string 
-    #     which describe how to convert callback arguments to ruby objects. 
-    #     When binding parameters are given, use _get_subst_key(). 
-    #     But when no parameters are given, use _get_all_subst_keys() to 
-    #     create a Event class object as a callback parameter. 
+    #     _get_subst_key() and _get_all_subst_keys() generates key-string
+    #     which describe how to convert callback arguments to ruby objects.
+    #     When binding parameters are given, use _get_subst_key().
+    #     But when no parameters are given, use _get_all_subst_keys() to
+    #     create a Event class object as a callback parameter.
     #
-    #     scan_args() is used when doing callback. It convert arguments 
-    #     ( which are Tcl strings ) to ruby objects based on the key string 
-    #     that is generated by _get_subst_key() or _get_all_subst_keys(). 
+    #     scan_args() is used when doing callback. It convert arguments
+    #     ( which are Tcl strings ) to ruby objects based on the key string
+    #     that is generated by _get_subst_key() or _get_all_subst_keys().
     #
-    _setup_subst_table(KEY_TBL, PROC_TBL);
+    _setup_subst_table(KEY_TBL, PROC_TBL)
+    # _setup_subst_table(KEY_TBL, LONGKEY_TBL, PROC_TBL) # if use longname-keys
 
     #
-    # NOTE: The order of parameters which passed to callback procedure is 
+    # NOTE: The order of parameters which passed to callback procedure is
     #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
     #
 
-    # If you need support extra arguments given by Tcl/Tk, 
+    # If you need support extra arguments given by Tcl/Tk,
     # please override _get_extra_args_tbl
     #
     #def self._get_extra_args_tbl
@@ -383,15 +436,15 @@ module TkEvent
     alias sendevent send_event
 =end
     ALIAS_TBL = {
-      :button    => :num, 
-      :data      => :detail, 
-      :delta     => :wheel_delta, 
-      :root      => :rootwin_id, 
-      :rootx     => :x_root, 
-      :root_x    => :x_root, 
-      :rooty     => :y_root, 
-      :root_y    => :y_root, 
-      :sendevent => :send_event, 
+      :button    => :num,
+      :data      => :detail,
+      :delta     => :wheel_delta,
+      :root      => :rootwin_id,
+      :rootx     => :x_root,
+      :root_x    => :x_root,
+      :rooty     => :y_root,
+      :root_y    => :y_root,
+      :sendevent => :send_event,
       :window    => :widget
     }
 
@@ -405,6 +458,7 @@ module TkEvent
     extra_args_tbl = klass._get_extra_args_tbl
 
     if args.compact.size > 0
+      args.map!{|arg| klass._sym2subst(arg)}
       args = args.join(' ')
       keys = klass._get_subst_key(args)
 
@@ -428,6 +482,26 @@ module TkEvent
           end
         })
       end
+    elsif cmd.respond_to?(:arity) && cmd.arity == 0  # args.size == 0
+      args = ''
+      if cmd.kind_of?(String)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        id = install_cmd(cmd)
+      else
+        id = install_cmd(proc{
+                           begin
+                             TkUtil.eval_cmd(cmd)
+                           rescue Exception=>e
+                             if TkCore::INTERP.kind_of?(TclTkIp)
+                               fail e
+                             else
+                               # MultiTkIp
+                               fail Exception, "#{e.class}: #{e.message.dup}"
+                             end
+                           end
+                         })
+      end
     else
       keys, args = klass._get_all_subst_keys
 
diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
index ab58ac5762..03db850f96 100644
--- a/ext/tk/lib/tk/font.rb
+++ b/ext/tk/lib/tk/font.rb
@@ -11,13 +11,18 @@ class TkFont
 
   TkCommandNames = ['font'.freeze].freeze
 
-  Tk_FontID = ["@font".freeze, "00000".taint].freeze
+  (Tk_FontID = ["@font".freeze, TkUtil.untrust("00000")]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
   Tk_FontNameTBL = TkCore::INTERP.create_table
   Tk_FontUseTBL  = TkCore::INTERP.create_table
 
-  TkCore::INTERP.init_ip_env{ 
-    Tk_FontNameTBL.clear
-    Tk_FontUseTBL.clear
+  TkCore::INTERP.init_ip_env{
+    Tk_FontNameTBL.mutex.synchronize{ Tk_FontNameTBL.clear }
+    Tk_FontUseTBL.mutex.synchronize{ Tk_FontUseTBL.clear }
   }
 
   # option_type : default => string
@@ -31,13 +36,26 @@ class TkFont
   MetricType = Hash.new(?n)
   MetricType['fixed'] = ?b
 
+  # system font names
+  SYSTEM_FONT_NAMES = []
+  def SYSTEM_FONT_NAMES.add(font_names)
+    (@mutex ||= Mutex.new).synchronize{
+      self.replace(self | font_names.map{|name| name.to_s})
+    }
+  end
+  def SYSTEM_FONT_NAMES.include?(name)
+    (@mutex ||= Mutex.new).synchronize{
+      super(name.to_s)
+    }
+  end
+
   # set default font
   case Tk::TK_VERSION
-  when /^4\.*/
+  when /^4\..*/
     DEFAULT_LATIN_FONT_NAME = 'a14'.freeze
     DEFAULT_KANJI_FONT_NAME = 'k14'.freeze
 
-  when /^8\.*/
+  when /^8\.[0-4]/
     if JAPANIZED_TK
       begin
         fontnames = tk_call('font', 'names')
@@ -48,8 +66,8 @@ class TkFont
           knj = 'defaultgui'
         when /Mincho:Helvetica-Bold-12/
           # Tcl/Tk-JP for UNIX/X
-          ltn, knj = tk_split_simplelist(tk_call('font', 'configure', 
-                                                 'Mincho:Helvetica-Bold-12', 
+          ltn, knj = tk_split_simplelist(tk_call('font', 'configure',
+                                                 'Mincho:Helvetica-Bold-12',
                                                  '-compound'))
         else
           # unknown Tcl/Tk-JP
@@ -57,7 +75,7 @@ class TkFont
           platform = Tk::PLATFORM['platform']
           case platform
           when 'unix'
-            ltn = {'family'=>'Helvetica'.freeze, 
+            ltn = {'family'=>'Helvetica'.freeze,
                    'size'=>-12, 'weight'=>'bold'.freeze}
             #knj = 'k14'
             #knj = '-misc-fixed-medium-r-normal--14-*-*-*-c-*-jisx0208.1983-0'
@@ -84,7 +102,7 @@ class TkFont
         platform = Tk::PLATFORM['platform']
         case platform
         when 'unix'
-          ltn = {'family'=>'Helvetica'.freeze, 
+          ltn = {'family'=>'Helvetica'.freeze,
                  'size'=>-12, 'weight'=>'bold'.freeze}
         when 'windows'
           ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
@@ -103,6 +121,15 @@ class TkFont
     DEFAULT_LATIN_FONT_NAME = ltn.freeze
     DEFAULT_KANJI_FONT_NAME = knj.freeze
 
+  when /^8\.[5-9]/, /^9\..*/
+    if tk_call('font', 'names') =~ /\bTkDefaultFont\b/
+      DEFAULT_LATIN_FONT_NAME = 'TkDefaultFont'.freeze
+      DEFAULT_KANJI_FONT_NAME = 'TkDefaultFont'.freeze
+    else
+      DEFAULT_LATIN_FONT_NAME = 'Helvetica'.freeze
+      DEFAULT_KANJI_FONT_NAME = 'mincho'.freeze
+    end
+
   else # unknown version
     DEFAULT_LATIN_FONT_NAME = 'Helvetica'.freeze
     DEFAULT_KANJI_FONT_NAME = 'mincho'.freeze
@@ -121,6 +148,7 @@ class TkFont
       unless compound.kind_of?(TkFont)
         fail ArgumentError, "a TkFont object is expected for the 1st argument"
       end
+
       @compound = compound
       case type
       when 'kanji', 'latin', 'ascii'
@@ -145,6 +173,9 @@ class TkFont
     def font
       @compound.__send__(@type + '_font_id')
     end
+    alias font_id font
+    alias name font
+    alias to_s font
 
     def [](slot)
       @compound.__send__(@type + '_configinfo', slot)
@@ -163,6 +194,14 @@ class TkFont
   ###################################
   # class methods
   ###################################
+  def TkFont.is_system_font?(fnt)
+    # true  --> system font which is available on the current system
+    # false --> not system font (or unknown system font)
+    # nil   --> system font name, but not available on the current system
+    fnt = fnt.to_s
+    SYSTEM_FONT_NAMES.include?(fnt) && self.names.index(fnt) && true
+  end
+
   def TkFont.actual(fnt, option=nil)
     fnt = '{}' if fnt == ''
     if fnt.kind_of?(TkFont)
@@ -171,6 +210,9 @@ class TkFont
       actual_core(fnt, nil, option)
     end
   end
+  def TkFont.actual_hash(fnt, option=nil)
+    Hash[TkFont.actual(fnt, option)]
+  end
 
   def TkFont.actual_displayof(fnt, win, option=nil)
     fnt = '{}' if fnt == ''
@@ -181,6 +223,9 @@ class TkFont
       actual_core(fnt, win, option)
     end
   end
+  def TkFont.actual_hash_displayof(fnt, option=nil)
+    Hash[TkFont.actual_displayof(fnt, option)]
+  end
 
   def TkFont.configure(fnt, slot, value=None)
     if fnt.kind_of?(TkFont)
@@ -234,6 +279,33 @@ class TkFont
       metrics_core(fnt, nil, option)
     end
   end
+  def TkFont.metrics_hash(fnt, option=nil)
+    if option
+      val = TkFont.metrics(fnt, option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[TkFont.metrics(fnt)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
+  end
 
   def TkFont.metrics_displayof(fnt, win, option=nil)
     fnt = '{}' if fnt == ''
@@ -244,13 +316,40 @@ class TkFont
       metrics_core(fnt, win, option)
     end
   end
+  def TkFont.metrics_hash_displayof(fnt, win, option=nil)
+    if option
+      val = TkFont.metrics_displayof(fnt, win, option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[TkFont.metrics_displayof(fnt, win, option)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
+  end
 
   def TkFont.families(win=nil)
     case (Tk::TK_VERSION)
-    when /^4\.*/
+    when /^4\..*/
       ['fixed']
 
-    when /^8\.*/
+    when /^8\..*/
       if win
         tk_split_simplelist(tk_call('font', 'families', '-displayof', win))
       else
@@ -261,13 +360,16 @@ class TkFont
 
   def TkFont.names
     case (Tk::TK_VERSION)
-    when /^4\.*/
+    when /^4\..*/
       r = ['fixed']
       r += ['a14', 'k14'] if JAPANIZED_TK
-      Tk_FontNameTBL.each_value{|obj| r.push(obj)}
-      r | []
+      Tk_FontNameTBL.mutex.synchronize{
+        Tk_FontNameTBL.each_value{|obj| r.push(obj)}
+      }
+      #r | []
+      r.uniq
 
-    when /^8\.*/
+    when /^8\..*/
       tk_split_simplelist(tk_call('font', 'names'))
 
     end
@@ -285,10 +387,15 @@ class TkFont
   end
 
   def TkFont.get_obj(name)
+    name = name.to_s
     if name =~ /^(@font[0-9]+)(|c|l|k)$/
-      Tk_FontNameTBL[$1]
+      Tk_FontNameTBL.mutex.synchronize{
+        Tk_FontNameTBL[$1]
+      }
     else
-      nil
+      Tk_FontNameTBL.mutex.synchronize{
+        Tk_FontNameTBL[name]
+      }
     end
   end
 
@@ -298,7 +405,7 @@ class TkFont
     path = [win, tag, key].join(';')
 
     case (Tk::TK_VERSION)
-    when /^4\.*/
+    when /^4\..*/
       regexp = /^-(|kanji)#{key} /
 
       conf_list = tk_split_simplelist(tk_call(*args)).
@@ -324,7 +431,7 @@ class TkFont
 
       TkFont.new(ltn, knj).call_font_configure([path, key], *args)
 
-    when /^8\.*/
+    when /^8\.[0-4]/
       regexp = /^-#{key} /
 
       conf_list = tk_split_simplelist(tk_call(*args)).
@@ -352,7 +459,7 @@ class TkFont
       else
         begin
           compound = tk_split_simplelist(
-              Hash[*tk_split_simplelist(tk_call('font', 'configure', 
+              Hash[*tk_split_simplelist(tk_call('font', 'configure',
                                                 fnt))].collect{|k,v|
                 [k[1..-1], v]
               }.assoc('compound')[1])
@@ -360,26 +467,66 @@ class TkFont
           compound = []
         end
         if compound == []
-          TkFont.new(fnt).call_font_configure([path, key], *args)
+          if TkFont.is_system_font?(fnt)
+            TkNamedFont.new(fnt).call_font_configure([path, key], *args)
+          else
+            TkFont.new(fnt).call_font_configure([path, key], *args)
+          end
         else
-          TkFont.new(compound[0], 
+          TkFont.new(compound[0],
                      compound[1]).call_font_configure([path, key], *args)
         end
       end
+
+    when /^8\.[5-9]/, /^9\..*/
+      regexp = /^-#{key} /
+
+      conf_list = tk_split_simplelist(tk_call(*args)).
+        find_all{|prop| prop =~ regexp}.
+        collect{|prop| tk_split_simplelist(prop)}
+
+      if conf_list.size == 0
+        raise RuntimeError, "the widget may not support 'font' option"
+      end
+
+      args << {}
+
+      optkey = "-#{key}"
+
+      info = conf_list.find{|conf| conf[0] == optkey}
+      fnt = info[-1]
+      fnt = nil if fnt == [] || fnt == ""
+
+      unless fnt
+        # create dummy
+        # TkFont.new(nil, nil).call_font_configure([path, key], *args)
+        dummy_fnt = TkFont.allocate
+        dummy_fnt.instance_eval{ init_dummy_fontobj() }
+        dummy_fnt
+      else
+        if TkFont.is_system_font?(fnt)
+          TkNamedFont.new(fnt).call_font_configure([path, key], *args)
+        else
+          TkFont.new(fnt).call_font_configure([path, key], *args)
+        end
+      end
     end
   end
 
   def TkFont.used_on(path=nil)
-    if path
-      Tk_FontUseTBL[path]
-    else
-      Tk_FontUseTBL.values | []
-    end
+    Tk_FontUseTBL.mutex.synchronize{
+      if path
+        Tk_FontUseTBL[path]
+      else
+        # Tk_FontUseTBL.values | []
+        Tk_FontUseTBL.values.uniq
+      end
+    }
   end
 
   def TkFont.failsafe(font)
     begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+      if /^8\..*/ === Tk::TK_VERSION  && JAPANIZED_TK
         tk_call('font', 'failsafe', font)
       end
     rescue
@@ -392,15 +539,20 @@ class TkFont
   private
   ###################################
   def init_dummy_fontobj
-    @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-    Tk_FontID[1].succ!
-    Tk_FontNameTBL[@id] = self
+    Tk_FontID.mutex.synchronize{
+      @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
+      Tk_FontID[1].succ!
+    }
+    Tk_FontNameTBL.mutex.synchronize{
+      Tk_FontNameTBL[@id] = self
+    }
 
-    @latin_desscendant = nil
-    @kanji_desscendant = nil
+    # @latin_desscendant = nil
+    # @kanji_desscendant = nil
+    @descendant = [nil, nil] # [latin, kanji]
 
     case (Tk::TK_VERSION)
-    when /^4\.*/
+    when /^4\..*/
       @latinfont = ""
       @kanjifont = ""
       if JAPANIZED_TK
@@ -418,7 +570,7 @@ class TkFont
       if JAPANIZED_TK
         tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
         tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
-        tk_call('font', 'create', @compoundfont, 
+        tk_call('font', 'create', @compoundfont,
                 '-compound', [@latinfont, @kanjifont])
       else
         tk_call('font', 'create', @latinfont)
@@ -436,13 +588,23 @@ class TkFont
     ltn = '{}' if ltn == ''
     knj = '{}' if knj == ''
 
-    # @id = Tk_FontID.join('')
-    @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-    Tk_FontID[1].succ!
-    Tk_FontNameTBL[@id] = self
+    Tk_FontID.mutex.synchronize{
+      # @id = Tk_FontID.join('')
+      @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
+      Tk_FontID[1].succ!
+    }
+    Tk_FontNameTBL.mutex.synchronize{
+      Tk_FontNameTBL[@id] = self
+    }
+
+    # @latin_desscendant = nil
+    # @kanji_desscendant = nil
+    @descendant = [nil, nil] # [latin, kanji]
 
-    @latin_desscendant = nil
-    @kanji_desscendant = nil
+    # @latinfont = @id + 'l'
+    # @kanjifont = @id + 'k'
+    # @compoundfont = @id + 'c'
+    # @fontslot = {}
 
     if knj.kind_of?(Hash) && !keys
       keys = knj
@@ -452,7 +614,7 @@ class TkFont
     # compound font check
     if Tk::TK_VERSION == '8.0' && JAPANIZED_TK
       begin
-        compound = tk_split_simplelist(tk_call('font', 'configure', 
+        compound = tk_split_simplelist(tk_call('font', 'configure',
                                                ltn, '-compound'))
         if knj == nil
           if compound != []
@@ -462,7 +624,7 @@ class TkFont
           if compound != []
             ltn = compound[0]
           end
-          compound = tk_split_simplelist(tk_call('font', 'configure', 
+          compound = tk_split_simplelist(tk_call('font', 'configure',
                                                  knj, '-compound'))
           if compound != []
             knj = compound[1]
@@ -474,10 +636,10 @@ class TkFont
 
     if ltn
       if JAPANIZED_TK && !knj
-        if Tk::TK_VERSION =~ /^4.*/
+        if Tk::TK_VERSION =~ /^4..*/
           knj = DEFAULT_KANJI_FONT_NAME
         else
-          knj = ltn 
+          knj = ltn
         end
       end
     else
@@ -625,9 +787,14 @@ class TkFont
     if JAPANIZED_TK
       @compoundfont = [[@latinfont], [@kanjifont]]
       @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
+      # @fontslot.clear
+      # @fontslot['font'] = @latinfont
+      # @fontslot['kanjifont'] = @kanjifont
     else
       @compoundfont = @latinfont
       @fontslot = {'font'=>@latinfont}
+      # @fontslot.clear
+      # @fontslot['font'] = @latinfont
     end
   end
 
@@ -639,7 +806,7 @@ class TkFont
         if font[:charset] || font['charset']
           tk_call('font', 'create', @latinfont, *hash_kv(font))
         else
-          tk_call('font', 'create', @latinfont, 
+          tk_call('font', 'create', @latinfont,
                   '-charset', 'iso8859', *hash_kv(font))
         end
       elsif font.kind_of? Array
@@ -648,7 +815,7 @@ class TkFont
       elsif font.kind_of? TkFont
         tk_call('font', 'create', @latinfont, '-copy', font.latin_font)
       elsif font
-        tk_call('font', 'create', @latinfont, '-copy', font, 
+        tk_call('font', 'create', @latinfont, '-copy', font,
                 '-charset', 'iso8859')
       else
         tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
@@ -684,7 +851,7 @@ class TkFont
         if font[:charset] || font['charset']
           tk_call('font', 'create', @kanjifont, *hash_kv(font))
         else
-          tk_call('font', 'create', @kanjifont, 
+          tk_call('font', 'create', @kanjifont,
                   '-charset', 'jisx0208.1983', *hash_kv(font))
         end
       elsif font.kind_of? Array
@@ -693,7 +860,7 @@ class TkFont
       elsif font.kind_of? TkFont
         tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font_id)
       elsif font
-        tk_call('font', 'create', @kanjifont, '-copy', font, 
+        tk_call('font', 'create', @kanjifont, '-copy', font,
                 '-charset', 'jisx0208.1983')
       else
         tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
@@ -753,8 +920,9 @@ class TkFont
       end
 
       @fontslot = {'font'=>@compoundfont}
+      # @fontslot['font'] = @compoundfont
       begin
-        tk_call('font', 'create', @compoundfont, 
+        tk_call('font', 'create', @compoundfont,
                 '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
       rescue RuntimeError => e
         if ltn == knj
@@ -762,7 +930,7 @@ class TkFont
             tk_call('font', 'delete', @latinfont)
             create_latinfont(DEFAULT_LATIN_FONT_NAME)
             opts = []
-            Hash[*(tk_split_simplelist(tk_call('font', 'configure', 
+            Hash[*(tk_split_simplelist(tk_call('font', 'configure',
                                                @kanjifont)))].each{|k,v|
               case k
               when '-size', '-weight', '-slant', '-underline', '-overstrike'
@@ -770,14 +938,14 @@ class TkFont
               end
             }
             tk_call('font', 'configure', @latinfont, *opts)
-            tk_call('font', 'create', @compoundfont, 
+            tk_call('font', 'create', @compoundfont,
                     '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
 
           elsif e.message =~ /ascii font .* specified/
             tk_call('font', 'delete', @kanjifont)
             create_kanjifont(DEFAULT_KANJI_FONT_NAME)
             opts = []
-            Hash[*(tk_split_simplelist(tk_call('font', 'configure', 
+            Hash[*(tk_split_simplelist(tk_call('font', 'configure',
                                                @latinfont)))].each{|k,v|
               case k
               when '-size', '-weight', '-slant', '-underline', '-overstrike'
@@ -785,7 +953,7 @@ class TkFont
               end
             }
             tk_call('font', 'configure', @kanjifont, *opts)
-            tk_call('font', 'create', @compoundfont, 
+            tk_call('font', 'create', @compoundfont,
                     '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
 
           else
@@ -833,6 +1001,7 @@ class TkFont
       end
 
       @fontslot = {'font'=>@compoundfont}
+      # @fontslot['font'] = @compoundfont
       tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
     end
   end
@@ -887,25 +1056,39 @@ class TkFont
 
     keys = _symbolkey2str(args.pop).update(fontslot)
     args.concat(hash_kv(keys))
-    tk_call(*args)
-    Tk_FontUseTBL[[win, tag, optkey].join(';')] = self
+    begin
+      tk_call(*args)
+    rescue => e
+      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+        fail e
+      end
+    end
+    Tk_FontUseTBL.mutex.synchronize{
+      Tk_FontUseTBL[[win, tag, optkey].join(';')] = self
+    }
     self
   end
 
   def used
     ret = []
-    Tk_FontUseTBL.each{|key,value|
+    table = nil
+    Tk_FontUseTBL.mutex.synchronize{
+      table = Tk_FontUseTBL.clone # to avoid deadlock
+    }
+    table.each{|key,value|
       next unless self == value
       if key.include?(';')
         win, tag, optkey = key.split(';')
         winobj = tk_tcl2ruby(win)
-        if winobj.kind_of? TkText
+        #if winobj.kind_of? TkText
+        if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
           if optkey
             ret.push([winobj, winobj.tagid2obj(tag), optkey])
           else
             ret.push([winobj, winobj.tagid2obj(tag)])
           end
-        elsif winobj.kind_of? TkCanvas
+        #elsif winobj.kind_of? TkCanvas
+        elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
           if (tagobj = TkcTag.id2obj(winobj, tag)).kind_of? TkcTag
             if optkey
               ret.push([winobj, tagobj, optkey])
@@ -925,7 +1108,8 @@ class TkFont
               ret.push([winobj, tag])
             end
           end
-        elsif winobj.kind_of? TkMenu
+        #elsif winobj.kind_of? TkMenu
+        elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
           if optkey
             ret.push([winobj, tag, optkey])
           else
@@ -957,6 +1141,8 @@ class TkFont
     @compoundfont
   end
   alias font_id font
+  alias name font
+  alias to_s font
 
   def latin_font_id
     @latinfont
@@ -964,11 +1150,18 @@ class TkFont
 
   def latin_font
     # @latinfont
+    if @descendant[0] # [0] -> latin
+      @descendant[0]
+    else
+      @descendant[0] = DescendantFont.new(self, 'latin')
+    end
+=begin
     if @latin_descendant
       @latin_descendant
     else
       @latin_descendant = DescendantFont.new(self, 'latin')
     end
+=end
   end
   alias latinfont latin_font
 
@@ -978,50 +1171,87 @@ class TkFont
 
   def kanji_font
     # @kanjifont
+    if @descendant[1] # [1] -> kanji
+      @descendant[1]
+    else
+      @descendant[1] = DescendantFont.new(self, 'kanji')
+    end
+=begin
     if @kanji_descendant
       @kanji_descendant
     else
       @kanji_descendant = DescendantFont.new(self, 'kanji')
     end
+=end
   end
   alias kanjifont kanji_font
 
   def actual(option=nil)
     actual_core(@compoundfont, nil, option)
   end
+  def actual_hash(option=nil)
+    Hash[actual(option)]
+  end
 
   def actual_displayof(win, option=nil)
     win = '.' unless win
     actual_core(@compoundfont, win, option)
   end
+  def actual_hash_displayof(win, option=nil)
+    Hash[actual_displayof(win, option)]
+  end
 
   def latin_actual(option=nil)
-    actual_core(@latinfont, nil, option)
+    if @latinfont == nil
+      actual_core(@compoundfont, nil, option) # use @compoundfont
+    else
+      actual_core(@latinfont, nil, option)
+    end
+  end
+  def latin_actual_hash(option=nil)
+    Hash[latin_actual(option)]
   end
 
   def latin_actual_displayof(win, option=nil)
     win = '.' unless win
-    actual_core(@latinfont, win, option)
+    if @latinfont == nil
+      actual_core(@compoundfont, win, option) # use @compoundfont
+    else
+      actual_core(@latinfont, win, option)
+    end
+  end
+  def latin_actual_hash_displayof(win, option=nil)
+    Hash[latin_actual_displayof(win, option)]
   end
 
   def kanji_actual(option=nil)
     #if JAPANIZED_TK
-    if @kanjifont != ""
+    if @kanjifont == nil
+      actual_core(@compoundfont, nil, option) # use @compoundfont
+    elsif @kanjifont != ""
       actual_core(@kanjifont, nil, option)
     else
       actual_core_tk4x(nil, nil, option)
     end
   end
+  def kanji_actual_hash(option=nil)
+    Hash[kanji_actual(option)]
+  end
 
   def kanji_actual_displayof(win, option=nil)
     #if JAPANIZED_TK
-    if @kanjifont != ""
+    if @kanjifont == nil
+      actual_core(@compoundfont, nil, option) # use @compoundfont
+    elsif @kanjifont != ""
       win = '.' unless win
       actual_core(@kanjifont, win, option)
     else
       actual_core_tk4x(nil, win, option)
     end
   end
+  def kanji_actual_hash_displayof(win, option=nil)
+    Hash[kanji_actual_displayof(win, option)]
+  end
 
   def [](slot)
     configinfo slot
@@ -1065,10 +1295,15 @@ class TkFont
       configinfo(slot)
     end
   end
+  def latin_current_configinfo(slot=nil)
+    Hash[latin_configinfo(slot)]
+  end
 
   def kanji_configure(slot, value=None)
     #if JAPANIZED_TK
-    if @kanjifont != ""
+    if @kanjifont == nil
+      configure_core(@compoundfont, slot, value) # use @compoundfont
+    elsif @kanjifont != ""
       configure_core(@kanjifont, slot, value)
       configure('size'=>configinfo('size')) # to reflect new configuration
     else
@@ -1080,13 +1315,18 @@ class TkFont
 
   def kanji_configinfo(slot=nil)
     #if JAPANIZED_TK
-    if @kanjifont != ""
+    if @kanjifont == nil
+      configure_core(@compoundfont, slot) # use @compoundfont
+    elsif @kanjifont != ""
       configinfo_core(@kanjifont, slot)
     else
       #[]
       configinfo(slot)
     end
   end
+  def kanji_current_configinfo(slot=nil)
+    Hash[kanji_configinfo(slot)]
+  end
 
   def replace(ltn, knj=None)
     knj = ltn if knj == None
@@ -1096,12 +1336,30 @@ class TkFont
   end
 
   def latin_replace(ltn)
-    latin_replace_core(ltn)
-    reset_pointadjust
+    if @latinfont
+      latin_replace_core(ltn)
+      reset_pointadjust
+    else
+      # not compound font -> copy properties of ltn
+      latinkeys = {}
+      begin
+        actual_core(ltn).each{|key,val| latinkeys[key] = val}
+      rescue
+        latinkeys = {}
+      end
+      begin
+        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+      rescue
+        # not exist? (deleted?) -> create font
+        tk_call('font', 'create', @compoundfont, *hash_kv(latinkeys))
+      end
+    end
+
     self
   end
 
   def kanji_replace(knj)
+    return self unless @kanjifont  # ignore
     kanji_replace_core(knj)
     reset_pointadjust
     self
@@ -1119,42 +1377,216 @@ class TkFont
   def metrics(option=nil)
     metrics_core(@compoundfont, nil, option)
   end
+  def metrics_hash(option=nil)
+    if option
+      val = metrics(option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[metrics(option)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
+  end
 
   def metrics_displayof(win, option=nil)
     win = '.' unless win
     metrics_core(@compoundfont, win, option)
   end
+  def metrics_hash_displayof(win, option=nil)
+    if option
+      val = metrics_displayof(win, option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[metrics_displayof(win, option)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
+  end
 
   def latin_metrics(option=nil)
-    metrics_core(@latinfont, nil, option)
+    if @latinfont == nil
+      metrics_core(@compoundfont, nil, option) # use @compoundfont
+    else
+      metrics_core(@latinfont, nil, option)
+    end
+  end
+  def latin_metrics_hash(option=nil)
+    if option
+      val = latin_metrics(option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[latin_metrics(option)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
   end
 
   def latin_metrics_displayof(win, option=nil)
     win = '.' unless win
-    metrics_core(@latinfont, win, option)
+    if @latinfont == nil
+      metrics_core(@compoundfont, win, option) # use @compoundfont
+    else
+      metrics_core(@latinfont, win, option)
+    end
+  end
+  def latin_metrics_hash_displayof(win, option=nil)
+    if option
+      val = latin_metrics_displayof(win, option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[latin_metrics_displayof(win, option)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
   end
 
   def kanji_metrics(option=nil)
-    if JAPANIZED_TK
+    if @latinfont == nil
+      metrics_core(@compoundfont, nil, option) # use @compoundfont
+    elsif JAPANIZED_TK
       metrics_core(@kanjifont, nil, option)
     else
       metrics_core_tk4x(nil, nil, option)
     end
   end
+  def kanji_metrics_hash(option=nil)
+    if option
+      val = kanji_metrics(option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[kanji_metrics(option)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
+  end
 
   def kanji_metrics_displayof(win, option=nil)
-    if JAPANIZED_TK
-      win = '.' unless win
+    win = '.' unless win
+    if @latinfont == nil
+      metrics_core(@compoundfont, win, option) # use @compoundfont
+    elsif JAPANIZED_TK
       metrics_core(@kanjifont, win, option)
     else
       metrics_core_tk4x(nil, win, option)
     end
   end
+  def kanji_metrics_hash_displayof(win, option=nil)
+    if option
+      val = kanji_metrics_displayof(win, option)
+      case TkFont::MetricsType[option.to_s]
+      when ?n
+        val = TkComm::num_or_str(val)
+      when ?b
+        val = TkComm::bool(val)
+      else
+        # do nothing
+      end
+      return val
+    end
+
+    h = Hash[kanji_metrics_displayof(win, option)]
+    h.keys.each{|k|
+      case TkFont::MetricsType[k.to_s]
+      when ?n
+        h[k] = TkComm::num_or_str(h[k])
+      when ?b
+        h[k] = TkComm::bool(h[k])
+      else
+        # do nothing
+      end
+    }
+    h
+  end
 
   def reset_pointadjust
     begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        configure('pointadjust' => latin_actual.assoc('size')[1].to_f / 
+      if /^8\..*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        configure('pointadjust' => latin_actual.assoc('size')[1].to_f /
                                       kanji_actual.assoc('size')[1].to_f )
       end
     rescue
@@ -1166,7 +1598,7 @@ class TkFont
   # private alias
   ###################################
   case (Tk::TK_VERSION)
-  when /^4\.*/
+  when /^4\..*/
     alias create_latinfont        create_latinfont_tk4x
     alias create_kanjifont        create_kanjifont_tk4x
     alias create_compoundfont     create_compoundfont_tk4x
@@ -1227,8 +1659,8 @@ module TkFont::CoreMethods
         ''
       end
     else
-      [['family',''], ['size',0], ['weight',''], ['slant',''], 
-        ['underline',false], ['overstrike',false], ['charset',''], 
+      [['family',''], ['size',0], ['weight',''], ['slant',''],
+        ['underline',false], ['overstrike',false], ['charset',''],
         ['pointadjust',0]]
     end
   end
@@ -1240,7 +1672,7 @@ module TkFont::CoreMethods
       ""
     elsif option
       if win
-        val = tk_call('font', 'actual', font, 
+        val = tk_call('font', 'actual', font,
                       "-displayof", win, "-#{option}")
       else
         val = tk_call('font', 'actual', font, "-#{option}")
@@ -1255,7 +1687,7 @@ module TkFont::CoreMethods
       end
     else
       l = tk_split_simplelist(if win
-                                 tk_call('font', 'actual', font, 
+                                 tk_call('font', 'actual', font,
                                                      "-displayof", win)
                               else
                                  tk_call('font', 'actual', font)
@@ -1301,8 +1733,8 @@ module TkFont::CoreMethods
           ''
         end
       else
-        [['family',''], ['size',0], ['weight',''], ['slant',''], 
-          ['underline',false], ['overstrike',false], ['charset',''], 
+        [['family',''], ['size',0], ['weight',''], ['slant',''],
+          ['underline',false], ['overstrike',false], ['charset',''],
           ['pointadjust',1.0]]
       end
     else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
@@ -1321,8 +1753,8 @@ module TkFont::CoreMethods
         ''
       end
     else
-      {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'', 
-        'underline'=>false, 'overstrike'=>false, 
+      {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'',
+        'underline'=>false, 'overstrike'=>false,
         'charset'=>false, 'pointadjust'=>1.0}
     end
   end
@@ -1343,20 +1775,20 @@ module TkFont::CoreMethods
         configure_core_tk8x(font, 'family', slot.delete('family'))
       end
 
-      if ((slot.key?('size') || slot.key?(:size)) && 
+      if ((slot.key?('size') || slot.key?(:size)) &&
           padjust && !slot.key?('pointadjust') && !slot.key?(:pointadjust))
-        tk_call('font', 'configure', font, 
+        tk_call('font', 'configure', font,
                 '-pointadjust', padjust, *hash_kv(slot))
       else
         tk_call('font', 'configure', font, *hash_kv(slot))
       end
     elsif (slot == 'size' || slot == :size) && padjust != nil
-      tk_call('font', 'configure', font, 
+      tk_call('font', 'configure', font,
               "-#{slot}", value, '-pointadjust', padjust)
     elsif JAPANIZED_TK && (slot == 'family' || slot == :family)
       # coumpund font?
       begin
-        compound = tk_split_simplelist(tk_call('font', 'configure', 
+        compound = tk_split_simplelist(tk_call('font', 'configure',
                                                font, '-compound'))
       rescue
         tk_call('font', 'configure', font, '-family', value)
@@ -1387,7 +1819,7 @@ module TkFont::CoreMethods
       ensure
         tk_call('font', 'delete', kfnt) if kfnt != ''
       end
-      
+
     else
       tk_call('font', 'configure', font, "-#{slot}", value)
     end
@@ -1471,32 +1903,44 @@ module TkFont::CoreMethods
   end
 
   def delete_core_tk4x
-    TkFont::Tk_FontNameTBL.delete(@id)
-    TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
+    TkFont::Tk_FontNameTBL.mutex.synchronize{
+      TkFont::Tk_FontNameTBL.delete(@id)
+    }
+    TkFont::Tk_FontUseTBL.mutex.synchronize{
+      TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
+    }
   end
 
   def delete_core_tk8x
     begin
-      tk_call('font', 'delete', @latinfont)
+      tk_call('font', 'delete', @latinfont) if @latinfont
     rescue
     end
     begin
-      tk_call('font', 'delete', @kanjifont)
+      tk_call('font', 'delete', @kanjifont) if @kanjifont
     rescue
     end
     begin
-      tk_call('font', 'delete', @compoundfont)
+      tk_call('font', 'delete', @compoundfont) if @compoundfont
     rescue
     end
-    TkFont::Tk_FontNameTBL.delete(@id)
-    TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
+    TkFont::Tk_FontNameTBL.mutex.synchronize{
+      TkFont::Tk_FontNameTBL.delete(@id)
+    }
+    TkFont::Tk_FontUseTBL.mutex.synchronize{
+      TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
+    }
   end
 
   def latin_replace_core_tk4x(ltn)
     create_latinfont_tk4x(ltn)
     @compoundfont[0] = [@latinfont] if JAPANIZED_TK
     @fontslot['font'] = @latinfont
-    TkFont::Tk_FontUseTBL.dup.each{|w, fobj|
+    table = nil
+    TkFont::Tk_FontUseTBL.mutex.synchronize{
+      table = TkFont::Tk_FontUseTBL.clone
+    }
+    table.each{|w, fobj|
       if self == fobj
         begin
           if w.include?(';')
@@ -1504,11 +1948,14 @@ module TkFont::CoreMethods
             optkey = 'font' if optkey == nil || optkey == ''
             winobj = tk_tcl2ruby(win)
 #           winobj.tagfont_configure(tag, {'font'=>@latinfont})
-            if winobj.kind_of? TkText
+            #if winobj.kind_of? TkText
+            if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
               tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @latinfont)
-            elsif winobj.kind_of? TkCanvas
+            #elsif winobj.kind_of? TkCanvas
+            elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
               tk_call(win, 'itemconfigure', tag, "-#{optkey}", @latinfont)
-            elsif winobj.kind_of? TkMenu
+            #elsif winobj.kind_of? TkMenu
+            elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
               tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
             else
               raise RuntimeError, "unknown widget type"
@@ -1518,7 +1965,9 @@ module TkFont::CoreMethods
             tk_call(w, 'configure', '-font', @latinfont)
           end
         rescue
-          TkFont::Tk_FontUseTBL.delete(w)
+          TkFont::Tk_FontUseTBL.mutex.synchronize{
+            TkFont::Tk_FontUseTBL.delete(w)
+          }
         end
       end
     }
@@ -1531,7 +1980,11 @@ module TkFont::CoreMethods
     create_kanjifont_tk4x(knj)
     @compoundfont[1] = [@kanjifont]
     @fontslot['kanjifont'] = @kanjifont
-    TkFont::Tk_FontUseTBL.dup.each{|w, fobj|
+    table = nil
+    TkFont::Tk_FontUseTBL.mutex.synchronize{
+      table = TkFont::Tk_FontUseTBL.clone
+    }
+    table.dup.each{|w, fobj|
       if self == fobj
         begin
           if w.include?(';')
@@ -1539,11 +1992,14 @@ module TkFont::CoreMethods
             optkey = 'kanjifont' unless optkey
             winobj = tk_tcl2ruby(win)
 #           winobj.tagfont_configure(tag, {'kanjifont'=>@kanjifont})
-            if winobj.kind_of? TkText
+            #if winobj.kind_of? TkText
+            if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
               tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @kanjifont)
-            elsif winobj.kind_of? TkCanvas
+            #elsif winobj.kind_of? TkCanvas
+            elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
               tk_call(win, 'itemconfigure', tag, "-#{optkey}", @kanjifont)
-            elsif winobj.kind_of? TkMenu
+            #elsif winobj.kind_of? TkMenu
+            elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
               tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
             else
               raise RuntimeError, "unknown widget type"
@@ -1553,7 +2009,9 @@ module TkFont::CoreMethods
             tk_call(w, 'configure', '-kanjifont', @kanjifont)
           end
         rescue
-          TkFont::Tk_FontUseTBL.delete(w)
+          Tk_FontUseTBL.mutex.synchronize{
+            TkFont::Tk_FontUseTBL.delete(w)
+          }
         end
       end
     }
@@ -1586,7 +2044,7 @@ module TkFont::CoreMethods
       keys = self.configinfo
       tk_call('font', 'delete', @compoundfont)
       begin
-        tk_call('font', 'create', @compoundfont, 
+        tk_call('font', 'create', @compoundfont,
                 '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
 =begin
         latinkeys = {}
@@ -1603,7 +2061,7 @@ module TkFont::CoreMethods
         tk_call('font', 'delete', @latinfont)
         if fnt_bup && fnt_bup != ''
           tk_call('font', 'create', @latinfont, '-copy', fnt_bup)
-          tk_call('font', 'create', @compoundfont, 
+          tk_call('font', 'create', @compoundfont,
                   '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
           tk_call('font', 'delete', fnt_bup)
         else
@@ -1618,10 +2076,13 @@ module TkFont::CoreMethods
       rescue
         latinkeys = {}
       end
-      if latinkeys != {}
+      begin
         tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+      rescue
+        # not exist? (deleted?) -> create font
+        tk_call('font', 'create', @compoundfont, *hash_kv(latinkeys))
       end
-    end    
+    end
     self
   end
 
@@ -1651,20 +2112,20 @@ module TkFont::CoreMethods
       keys = self.configinfo
       tk_call('font', 'delete', @compoundfont)
       begin
-        tk_call('font', 'create', @compoundfont, 
+        tk_call('font', 'create', @compoundfont,
                 '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
       rescue RuntimeError => e
         tk_call('font', 'delete', @kanjifont)
         if fnt_bup && fnt_bup != ''
           tk_call('font', 'create', @kanjifont, '-copy', fnt_bup)
-          tk_call('font', 'create', @compoundfont, 
+          tk_call('font', 'create', @compoundfont,
                   '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
           tk_call('font', 'delete', fnt_bup)
         else
           fail e
         end
       end
-    end    
+    end
     self
   end
 
@@ -1676,7 +2137,7 @@ module TkFont::CoreMethods
     font = '{}' if font == ''
 
     if win
-      number(tk_call('font', 'measure', font, 
+      number(tk_call('font', 'measure', font,
                      '-displayof', win, text))
     else
       number(tk_call('font', 'measure', font, text))
@@ -1697,7 +2158,7 @@ module TkFont::CoreMethods
 
     if option
       if win
-        number(tk_call('font', 'metrics', font, 
+        number(tk_call('font', 'metrics', font,
                        "-displayof", win, "-#{option}"))
       else
         number(tk_call('font', 'metrics', font, "-#{option}"))
@@ -1711,6 +2172,13 @@ module TkFont::CoreMethods
       r = []
       while key=l.shift
         r.push [key[1..-1], l.shift.to_i]
+=begin
+        if key == '-fixed'  # boolean value
+          r.push [key[1..-1], bool(l.shift)]
+        else
+          r.push [key[1..-1], l.shift.to_i]
+        end
+=end
       end
       r
     end
@@ -1720,7 +2188,7 @@ module TkFont::CoreMethods
   # private alias
   ###################################
   case (Tk::TK_VERSION)
-  when /^4\.*/
+  when /^4\..*/
     alias actual_core             actual_core_tk4x
     alias configure_core          configure_core_tk4x
     alias configinfo_core         configinfo_core_tk4x
@@ -1731,7 +2199,7 @@ module TkFont::CoreMethods
     alias measure_core            measure_core_tk4x
     alias metrics_core            metrics_core_tk4x
 
-  when /^8\.[0-5]/
+  when /^8\.[0-9]/
     alias actual_core             actual_core_tk8x
     alias configure_core          configure_core_tk8x
     alias configinfo_core         configinfo_core_tk8x
@@ -1760,3 +2228,124 @@ class TkFont
   include TkFont::CoreMethods
   extend  TkFont::CoreMethods
 end
+
+class TkNamedFont < TkFont
+  # for built-in named fonts
+  def TkNamedFont.find(name)
+    name = name.to_s
+    unless (obj = Tk_FontNameTBL[name])
+      obj = self.new(name) if TkFont.is_system_font?(name)
+    end
+    obj
+  end
+
+  def TkNamedFont.new(name, keys=nil)
+    name = name.to_s
+    obj = nil
+    Tk_FontNameTBL.mutex.synchronize{
+      unless (obj = Tk_FontNameTBL[name])
+        (obj = self.allocate).instance_eval{
+          @id = @compoundfont = name.to_s
+          @latinfont = nil
+          @kanjifont = nil
+          @descendant = [self, self] # [latin, kanji] : dummy
+          Tk_FontNameTBL[@id] = self
+        }
+      end
+    }
+    obj.instance_eval{ initialize(name, keys) }
+    obj
+  end
+
+  ###########################
+  private
+  ###########################
+  def initialize(name, keys=nil)
+    @id = @compoundfont = name.to_s
+
+    # if not exist named font, create it.
+    begin
+      if keys
+        tk_call('font', 'configure', @compoundfont, keys)
+      else
+        tk_call('font', 'configure', @compoundfont)
+      end
+    rescue
+      # the named font doesn't exist -> create
+      if keys
+        tk_call('font', 'create', @compoundfont, keys)
+      else
+        tk_call('font', 'create', @compoundfont)
+      end
+    end
+  end
+
+  def create_latinfont(fnt)
+    # ignore
+  end
+  def create_kanjifont(fnt)
+    # ignore
+  end
+  def create_compoundfont(ltn, knj, keys)
+    # ignore
+  end
+
+  ###########################
+  public
+  ###########################
+  def latin_font_id
+    @compoundfont
+  end
+  def kanji_font_id
+    @compoundfont
+  end
+end
+
+#######################################
+# define system font names
+#######################################
+if Tk::TCL_MAJOR_VERSION > 8 ||
+    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
+  # add standard fonts of Tcl/Tk 8.5+
+  TkFont::SYSTEM_FONT_NAMES.add [
+    'TkDefaultFont', 'TkTextFont', 'TkFixedFont', 'TkMenuFont',
+    'TkHeadingFont', 'TkCaptionFont', 'TkSmallCaptionFont',
+    'TkIconFont', 'TkTooltipFont'
+  ]
+end
+
+# platform-specific fonts
+#  -- windows
+TkFont::SYSTEM_FONT_NAMES.add [
+  'ansifixed', 'ansi', 'device', 'oemfixed', 'systemfixed', 'system'
+]
+
+#  --  macintosh, macosx
+TkFont::SYSTEM_FONT_NAMES.add ['system', 'application']
+
+if Tk::TCL_MAJOR_VERSION > 8 ||
+    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
+  TkFont::SYSTEM_FONT_NAMES.add ['menu']
+end
+
+#  --  macosx (Aqua theme)
+if Tk::TCL_MAJOR_VERSION > 8 ||
+    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
+  TkFont::SYSTEM_FONT_NAMES.add [
+    'systemSystemFont', 'systemEmphasizedSystemFont',
+    'systemSmallSystemFont', 'systemSmallEmphasizedSystemFont',
+    'systemApplicationFont', 'systemLabelFont', 'systemViewsFont',
+    'systemMenuTitleFont', 'systemMenuItemFont', 'systemMenuItemMarkFont',
+    'systemMenuItemCmdKeyFont', 'systemWindowTitleFont',
+    'systemPushButtonFont', 'systemUtilityWindowTitleFont',
+    'systemAlertHeaderFont', 'systemToolbarFont', 'systemMiniSystemFont',
+    'systemDetailSystemFont', 'systemDetailEmphasizedSystemFont'
+  ]
+end
+
+#######################################
+# autoload
+#######################################
+class TkFont
+  autoload :Chooser, 'tk/fontchooser'
+end
diff --git a/ext/tk/lib/tk/fontchooser.rb b/ext/tk/lib/tk/fontchooser.rb
new file mode 100644
index 0000000000..092ffc04bf
--- /dev/null
+++ b/ext/tk/lib/tk/fontchooser.rb
@@ -0,0 +1,176 @@
+#
+# tk/fontchooser.rb -- "tk fontchooser" support (Tcl/Tk8.6 or later)
+#
+require 'tk'
+require 'tk/font'
+
+module TkFont::Chooser
+  extend TkCore
+end
+
+class << TkFont::Chooser
+  def method_missing(id, *args)
+    name = id.id2name
+    case args.length
+    when 1
+      if name[-1] == ?=
+        configure name[0..-2], args[0]
+        args[0]
+      else
+        configure name, args[0]
+        self
+      end
+    when 0
+      begin
+        cget(name)
+      rescue
+        super(id, *args)
+      end
+    else
+      super(id, *args)
+    end
+  end
+
+  def __configinfo_value(key, val)
+    case key
+    when 'parent'
+      window(val)
+    when 'title'
+      val
+    when 'font'
+      if (lst = tk_split_simplelist(val)).size == 1
+        lst[0]
+      else
+        lst.map{|elem| num_or_str(elem)}
+      end
+    when 'command'
+      tk_tcl2ruby(val)
+    when 'visible'
+      bool(val)
+    else # unkown
+      val
+    end
+  end
+  private :__configinfo_value
+
+  def configinfo(option=nil)
+    if !option && TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      lst = tk_split_simplelist(tk_call('tk', 'fontchooser', 'configure'))
+      ret = []
+      TkComm.slice_ary(lst, 2){|k, v|
+        k = k[1..-1]
+        ret << [k, __configinfo_value(k, v)]
+      }
+      ret
+    else
+      current_configinfo(option)
+    end
+  end
+
+  def current_configinfo(option=nil)
+    if option
+      opt = option.to_s
+      fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.empty?
+      __configinfo_value(option.to_s, tk_call('tk','fontchooser',
+                                              'configure',"-#{opt}"))
+    else
+      lst = tk_split_simplelist(tk_call('tk', 'fontchooser', 'configure'))
+      ret = {}
+      TkComm.slice_ary(lst, 2){|k, v|
+        k = k[1..-1]
+        ret[k] = __configinfo_value(k, v)
+      }
+      ret
+    end
+  end
+
+  def configure(option, value=None)
+    if option.kind_of? Hash
+      tk_call('tk', 'fontchooser', 'configure', 
+              *hash_kv(_symbolkey2str(option)))
+    else
+      opt = option.to_s
+      fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.empty?
+      tk_call('tk', 'fontchooser', 'configure', "-#{opt}", value)
+    end
+    self
+  end
+
+  def configure_cmd(slot, value)
+    configure(slot, install_cmd(value))
+  end
+
+  def command(cmd=nil, &b)
+    if cmd
+      configure_cmd('command', cmd)
+    elsif b
+      configure_cmd('command', Proc.new(&b))
+    else
+      cget('command')
+    end
+  end
+
+  def cget(slot)
+    configinfo slot
+  end
+
+  def [](slot)
+    cget slot
+  end
+
+  def []=(slot, val)
+    configure slot, val
+    val
+  end
+
+  def show
+    tk_call('tk', 'fontchooser', 'show')
+    self
+  end
+
+  def hide
+    tk_call('tk', 'fontchooser', 'hide')
+    self
+  end
+
+  def toggle
+    cget(:visible) ?  hide: show
+    self
+  end
+
+  def set_for(target, title="Font")
+    if target.kind_of? TkFont
+      configs = {
+        :font=>target.actual_hash, 
+        :command=>proc{|fnt, *args| 
+          target.configure(TkFont.actual_hash(fnt))
+        }
+      }
+    elsif target.kind_of? Hash
+      # key=>value list or OptionObj
+      fnt = target[:font] rescue ''
+      fnt = fnt.actual_hash if fnt.kind_of?(TkFont)
+      configs = {
+        :font => fnt,
+        :command=>proc{|fnt, *args| 
+          target[:font] = TkFont.actual_hash(fnt)
+        }
+      }
+    else
+      configs = {
+        :font=>target.cget_tkstring(:font), 
+        :command=>proc{|fnt, *args| 
+          target.font = TkFont.actual_hash_displayof(fnt, target)
+        }
+      }
+    end
+
+    configs[:title] = title if title
+    configure(configs)
+    target
+  end
+
+  def unset
+    configure(:command, nil)
+  end
+end
diff --git a/ext/tk/lib/tk/frame.rb b/ext/tk/lib/tk/frame.rb
index 6636fef5b5..5118939732 100644
--- a/ext/tk/lib/tk/frame.rb
+++ b/ext/tk/lib/tk/frame.rb
@@ -3,10 +3,10 @@
 #
 require 'tk'
 
-class TkFrame<TkWindow
+class Tk::Frame<TkWindow
   TkCommandNames = ['frame'.freeze].freeze
   WidgetClassName = 'Frame'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
 ################# old version
 #  def initialize(parent=nil, keys=nil)
@@ -126,3 +126,7 @@ class TkFrame<TkWindow
     end
   end
 end
+
+#TkFrame = Tk::Frame unless Object.const_defined? :TkFrame
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Frame, :TkFrame)
+Tk.__set_loaded_toplevel_aliases__('tk/frame.rb', :Tk, Tk::Frame, :TkFrame)
diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb
index 10fdf3569b..e1e07c44fa 100644
--- a/ext/tk/lib/tk/grid.rb
+++ b/ext/tk/lib/tk/grid.rb
@@ -22,6 +22,7 @@ module TkGrid
     list(tk_call_without_enc('grid', 'bbox', *args))
   end
 
+=begin
   def configure(win, *args)
     if args[-1].kind_of?(Hash)
       opts = args.pop
@@ -53,12 +54,54 @@ module TkGrid
       tk_call_without_enc('grid', 'configure', *params)
     end
   end
+=end
+  def configure(*args)
+    if args[-1].kind_of?(Hash)
+      opts = args.pop
+    else
+      opts = {}
+    end
+    fail ArgumentError, 'no widget is given' if args.empty?
+    params = []
+    args.flatten(1).each{|win|
+      case win
+      when '-', ?-              # RELATIVE PLACEMENT (increase columnspan)
+        params.push('-')
+      when /^-+$/             # RELATIVE PLACEMENT (increase columnspan)
+        params.concat(win.to_s.split(//))
+      when '^', ?^              # RELATIVE PLACEMENT (increase rowspan)
+        params.push('^')
+      when /^\^+$/             # RELATIVE PLACEMENT (increase rowspan)
+        params.concat(win.to_s.split(//))
+      when 'x', :x, ?x, nil, '' # RELATIVE PLACEMENT (empty column)
+        params.push('x')
+      when /^x+$/             # RELATIVE PLACEMENT (empty column)
+        params.concat(win.to_s.split(//))
+      else
+        params.push(_epath(win))
+      end
+    }
+    opts.each{|k, v|
+      params.push("-#{k}")
+      params.push(_epath(v))  # have to use 'epath' (hash_kv() is unavailable)
+    }
+    if Tk::TCL_MAJOR_VERSION < 8 ||
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION <= 3)
+      if params[0] == '-' || params[0] == 'x' || params[0] == '^'
+        tk_call_without_enc('grid', *params)
+      else
+        tk_call_without_enc('grid', 'configure', *params)
+      end
+    else
+      tk_call_without_enc('grid', 'configure', *params)
+    end
+  end
   alias grid configure
 
   def columnconfigure(master, index, args)
     # master = master.epath if master.kind_of?(TkObject)
     master = _epath(master)
-    tk_call_without_enc("grid", 'columnconfigure', 
+    tk_call_without_enc("grid", 'columnconfigure',
                         master, index, *hash_kv(args))
   end
 
@@ -74,15 +117,15 @@ module TkGrid
     if slot
       case slot
       when 'uniform', :uniform
-        tk_call_without_enc('grid', 'columnconfigure', 
+        tk_call_without_enc('grid', 'columnconfigure',
                             master, index, "-#{slot}")
       else
-        num_or_str(tk_call_without_enc('grid', 'columnconfigure', 
+        num_or_str(tk_call_without_enc('grid', 'columnconfigure',
                                        master, index, "-#{slot}"))
       end
     else
       #ilist = list(tk_call_without_enc('grid','columnconfigure',master,index))
-      ilist = simplelist(tk_call_without_enc('grid', 'columnconfigure', 
+      ilist = simplelist(tk_call_without_enc('grid', 'columnconfigure',
                                              master, index))
       info = {}
       while key = ilist.shift
@@ -103,15 +146,15 @@ module TkGrid
     if slot
       case slot
       when 'uniform', :uniform
-        tk_call_without_enc('grid', 'rowconfigure', 
+        tk_call_without_enc('grid', 'rowconfigure',
                             master, index, "-#{slot}")
       else
-        num_or_str(tk_call_without_enc('grid', 'rowconfigure', 
+        num_or_str(tk_call_without_enc('grid', 'rowconfigure',
                                        master, index, "-#{slot}"))
       end
     else
       #ilist = list(tk_call_without_enc('grid', 'rowconfigure', master, index))
-      ilist = simplelist(tk_call_without_enc('grid', 'rowconfigure', 
+      ilist = simplelist(tk_call_without_enc('grid', 'rowconfigure',
                                              master, index))
       info = {}
       while key = ilist.shift
@@ -126,6 +169,22 @@ module TkGrid
     end
   end
 
+  def column(master, index, keys=nil)
+    if keys.kind_of?(Hash)
+      columnconfigure(master, index, keys)
+    else
+      columnconfiginfo(master, index, keys)
+    end
+  end
+
+  def row(master, index, keys=nil)
+    if keys.kind_of?(Hash)
+      rowconfigure(master, index, keys)
+    else
+      rowconfiginfo(master, index, keys)
+    end
+  end
+
   def add(widget, *args)
     configure(widget, *args)
   end
@@ -183,16 +242,16 @@ module TkGrid
     list(tk_call_without_enc('grid', 'size', master))
   end
 
-  def slaves(master, args)
+  def slaves(master, keys=nil)
     # master = master.epath if master.kind_of?(TkObject)
     master = _epath(master)
     list(tk_call_without_enc('grid', 'slaves', master, *hash_kv(args)))
   end
 
-  module_function :bbox, :forget, :propagate, :info
+  module_function :anchor, :bbox, :add, :forget, :propagate, :info
   module_function :remove, :size, :slaves, :location
   module_function :grid, :configure, :columnconfigure, :rowconfigure
-  module_function :columnconfiginfo, :rowconfiginfo
+  module_function :column, :row, :columnconfiginfo, :rowconfiginfo
 end
 =begin
 def TkGrid(win, *args)
diff --git a/ext/tk/lib/tk/image.rb b/ext/tk/lib/tk/image.rb
index 35e2c4e394..39d63478a6 100644
--- a/ext/tk/lib/tk/image.rb
+++ b/ext/tk/lib/tk/image.rb
@@ -10,9 +10,16 @@ class TkImage<TkObject
   TkCommandNames = ['image'.freeze].freeze
 
   Tk_IMGTBL = TkCore::INTERP.create_table
-  Tk_Image_ID = ['i'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ Tk_IMGTBL.clear }
+  (Tk_Image_ID = ['i'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    Tk_IMGTBL.mutex.synchronize{ Tk_IMGTBL.clear }
+  }
 
   def self.new(keys=nil)
     if keys.kind_of?(Hash)
@@ -27,7 +34,10 @@ class TkImage<TkObject
           obj = name
         else
           name = _get_eval_string(name)
-          obj = Tk_IMGTBL[name]
+          obj = nil
+          Tk_IMGTBL.mutex.synchronize{
+            obj = Tk_IMGTBL[name]
+          }
         end
         if obj
           if !(keys[:without_creating] || keys['without_creating'])
@@ -35,7 +45,7 @@ class TkImage<TkObject
             keys.delete('imagename')
             keys.delete('without_creating')
             obj.instance_eval{
-              tk_call_without_enc('image', 'create', 
+              tk_call_without_enc('image', 'create',
                                   @type, @path, *hash_kv(keys, true))
             }
           end
@@ -43,7 +53,13 @@ class TkImage<TkObject
         end
       end
     end
-    super(keys)
+    (obj = self.allocate).instance_eval{
+      Tk_IMGTBL.mutex.synchronize{
+        initialize(keys)
+        Tk_IMGTBL[@path] = self
+      }
+    }
+    obj
   end
 
   def initialize(keys=nil)
@@ -55,19 +71,22 @@ class TkImage<TkObject
       without_creating = keys.delete('without_creating')
     end
     unless @path
-      # @path = Tk_Image_ID.join('')
-      @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
-      Tk_Image_ID[1].succ!
+      Tk_Image_ID.mutex.synchronize{
+        # @path = Tk_Image_ID.join('')
+        @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
+        Tk_Image_ID[1].succ!
+      }
     end
     unless without_creating
-      tk_call_without_enc('image', 'create', 
+      tk_call_without_enc('image', 'create',
                           @type, @path, *hash_kv(keys, true))
     end
-    Tk_IMGTBL[@path] = self
   end
 
   def delete
-    Tk_IMGTBL.delete(@id) if @id
+    Tk_IMGTBL.mutex.synchronize{
+      Tk_IMGTBL.delete(@id) if @id
+    }
     tk_call_without_enc('image', 'delete', @path)
     self
   end
@@ -85,8 +104,10 @@ class TkImage<TkObject
   end
 
   def TkImage.names
-    Tk.tk_call_without_enc('image', 'names').split.collect!{|id|
-      (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
+    Tk_IMGTBL.mutex.synchronize{
+      Tk.tk_call_without_enc('image', 'names').split.collect!{|id|
+        (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
+      }
     }
   end
 
@@ -135,7 +156,7 @@ class TkPhotoImage<TkImage
     self
   end
 
-  def cget(option)
+  def cget_strict(option)
     case option.to_s
     when 'data', 'file'
       tk_send 'cget', '-' << option.to_s
@@ -143,6 +164,23 @@ class TkPhotoImage<TkImage
       tk_tcl2ruby(tk_send('cget', '-' << option.to_s))
     end
   end
+  def cget(option)
+    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      cget_strict(option)
+    else
+      begin
+        cget_strict(option)
+      rescue => e
+        if current_configinfo.has_key?(option.to_s)
+          # error on known option
+          fail e
+        else
+          # unknown option
+          nil
+        end
+      end
+    end
+  end
 
   def copy(src, *opts)
     if opts.size == 0
@@ -173,7 +211,7 @@ class TkPhotoImage<TkImage
   end
 
   def put(data, *opts)
-    if opts == []
+    if opts.empty?
       tk_send('put', data)
     elsif opts.size == 1 && opts[0].kind_of?(Hash)
       tk_send('put', data, *_photo_hash_kv(opts[0]))
diff --git a/ext/tk/lib/tk/itemconfig.rb b/ext/tk/lib/tk/itemconfig.rb
index a7885e74f3..14396048ba 100644
--- a/ext/tk/lib/tk/itemconfig.rb
+++ b/ext/tk/lib/tk/itemconfig.rb
@@ -8,6 +8,11 @@ require 'tk/itemfont.rb'
 module TkItemConfigOptkeys
   include TkUtil
 
+  def __item_optkey_aliases(id)
+    {}
+  end
+  private :__item_optkey_aliases
+
   def __item_numval_optkeys(id)
     []
   end
@@ -26,10 +31,10 @@ module TkItemConfigOptkeys
   def __item_strval_optkeys(id)
     # maybe need to override
     [
-      'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile', 
-      'activebackground', 'activeforeground', 'background', 
-      'disabledforeground', 'disabledbackground', 'foreground', 
-      'highlightbackground', 'highlightcolor', 'insertbackground', 
+      'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile',
+      'activebackground', 'activeforeground', 'background',
+      'disabledforeground', 'disabledbackground', 'foreground',
+      'highlightbackground', 'highlightcolor', 'insertbackground',
       'selectbackground', 'selectforeground', 'troughcolor'
     ]
   end
@@ -115,6 +120,14 @@ module TkItemConfigMethod
   include TkTreatItemFont
   include TkItemConfigOptkeys
 
+  def TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+    @mode || false
+  end
+  def TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode)
+    fail SecurityError, "can't change the mode" if $SAFE>=4
+    @mode = (mode)? true: false
+  end
+
   def __item_cget_cmd(id)
     # maybe need to override
     [self.path, 'itemcget', id]
@@ -135,7 +148,7 @@ module TkItemConfigMethod
 
   def __item_configinfo_struct(id)
     # maybe need to override
-    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
+    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
       :default_value=>3, :current_value=>4}
   end
   private :__item_configinfo_struct
@@ -149,7 +162,14 @@ module TkItemConfigMethod
 
   ################################################
 
-  def itemcget(tagOrId, option)
+
+  def itemcget_tkstring(tagOrId, option)
+    opt = option.to_s
+    fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.length == 0
+    tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{opt}"))
+  end
+
+  def __itemcget_core(tagOrId, option)
     orig_opt = option
     option = option.to_s
 
@@ -157,6 +177,11 @@ module TkItemConfigMethod
       fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
     end
 
+    alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == option}
+    if real_name
+      option = real_name.to_s
+    end
+
     if ( method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[option] )
       optval = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
       begin
@@ -224,11 +249,45 @@ module TkItemConfigMethod
       tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")), true)
     end
   end
+  private :__itemcget_core
 
-  def itemconfigure(tagOrId, slot, value=None)
+  def itemcget(tagOrId, option)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      __itemcget_core(tagOrId, option)
+    else
+      begin
+        __itemcget_core(tagOrId, option)
+      rescue => e
+        begin
+          if __current_itemconfiginfo(tagOrId).has_key?(option.to_s)
+            # not tag error & option is known -> error on known option
+            fail e
+          else
+            # not tag error & option is unknown
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
+    end
+  end
+  def itemcget_strict(tagOrId, option)
+    # never use TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+    __itemcget_core(tagOrId, option)
+  end
+
+  def __itemconfigure_core(tagOrId, slot, value=None)
     if slot.kind_of? Hash
       slot = _symbolkey2str(slot)
 
+      __item_optkey_aliases(tagid(tagOrId)).each{|alias_name, real_name|
+        alias_name = alias_name.to_s
+        if slot.has_key?(alias_name)
+          slot[real_name.to_s] = slot.delete(alias_name)
+        end
+      }
+
       __item_methodcall_optkeys(tagid(tagOrId)).each{|key, method|
         value = slot.delete(key.to_s)
         self.__send__(method, tagOrId, value) if value
@@ -265,6 +324,11 @@ module TkItemConfigMethod
         fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
       end
 
+      alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+      if real_name
+        slot = real_name.to_s
+      end
+
       if ( conf = __item_keyonly_optkeys(tagid(tagOrId)).find{|k, v| k.to_s == slot } )
         defkey, undefkey = conf
         if value
@@ -288,6 +352,56 @@ module TkItemConfigMethod
     end
     self
   end
+  private :__itemconfigure_core
+
+  def __check_available_itemconfigure_options(tagOrId, keys)
+    id = tagid(tagOrId)
+
+    availables = self.__current_itemconfiginfo(id).keys
+
+    # add non-standard keys
+    availables |= __font_optkeys.map{|k|
+      [k.to_s, "latin#{k}", "ascii#{k}", "kanji#{k}"]
+    }.flatten
+    availables |= __item_methodcall_optkeys(id).keys.map{|k| k.to_s}
+    availables |= __item_keyonly_optkeys(id).keys.map{|k| k.to_s}
+
+    keys = _symbolkey2str(keys)
+
+    keys.delete_if{|k, v| !(availables.include?(k))}
+  end
+
+  def itemconfigure(tagOrId, slot, value=None)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      __itemconfigure_core(tagOrId, slot, value)
+    else
+      if slot.kind_of?(Hash)
+        begin
+          __itemconfigure_core(tagOrId, slot)
+        rescue
+          slot = __check_available_itemconfigure_options(tagOrId, slot)
+          __itemconfigure_core(tagOrId, slot) unless slot.empty?
+        end
+      else
+        begin
+          __itemconfigure_core(tagOrId, slot, value)
+        rescue => e
+          begin
+            if __current_itemconfiginfo(tagOrId).has_key?(slot.to_s)
+              # not tag error & option is known -> error on known option
+              fail e
+            else
+              # not tag error & option is unknown
+              nil
+            end
+          rescue
+            fail e  # tag error
+          end
+        end
+      end
+    end
+    self
+  end
 
   def __itemconfiginfo_core(tagOrId, slot = nil)
     if TkComm::GET_CONFIGINFO_AS_ARRAY
@@ -295,21 +409,31 @@ module TkItemConfigMethod
         fontkey  = $2
         # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
         conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
-        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
           conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
         if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
             || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+          fnt = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+          if TkFont.is_system_font?(fnt)
+            conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
+          end
           conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), fontkey)
         elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
                && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-          conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+          conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
             conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
         end
         conf
       else
         if slot
           slot = slot.to_s
+
+          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          if real_name
+            slot = real_name.to_s
+          end
+
           case slot
           when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
             method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
@@ -347,7 +471,7 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -355,7 +479,7 @@ module TkItemConfigMethod
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -368,11 +492,11 @@ module TkItemConfigMethod
 
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                 num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                 num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
             end
 
@@ -383,7 +507,7 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -391,7 +515,7 @@ module TkItemConfigMethod
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -404,11 +528,11 @@ module TkItemConfigMethod
 
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                 simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                 simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
             end
 
@@ -419,12 +543,12 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                 list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                 list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
             end
 
@@ -457,13 +581,13 @@ module TkItemConfigMethod
             # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
             conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
           end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
             conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
 
           if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
               && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
               conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
           end
 
@@ -474,7 +598,7 @@ module TkItemConfigMethod
           #   conf = tk_split_simplelist(conflist)
           ret = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).collect{|conflist|
             conf = tk_split_simplelist(conflist, false, true)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
               conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
 
             optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
@@ -510,7 +634,7 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                     number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -518,7 +642,7 @@ module TkItemConfigMethod
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                     number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -528,11 +652,11 @@ module TkItemConfigMethod
             when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               end
 
@@ -540,7 +664,7 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                     bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -548,7 +672,7 @@ module TkItemConfigMethod
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                     bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -558,11 +682,11 @@ module TkItemConfigMethod
             when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               end
 
@@ -570,12 +694,12 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               end
 
@@ -602,20 +726,20 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
                 if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 end
               end
               if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
                 if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 end
               end
             end
@@ -623,7 +747,7 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
                 && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
                 conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
             end
 
@@ -635,6 +759,10 @@ module TkItemConfigMethod
             fontconf = ret.assoc(optkey)
             if fontconf && fontconf.size > 2
               ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
+              fnt = fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              if TkFont.is_system_font?(fnt)
+                fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
+              end
               fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
               ret.push(fontconf)
             end
@@ -653,17 +781,21 @@ module TkItemConfigMethod
         fontkey  = $2
         # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
         conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
-        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
           conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
 
         if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
             || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = fontobj(tagid(tagOrId), fontkey)
+          fnt = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+          if TkFont.is_system_font?(fnt)
+            conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
+          end
+          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), fontkey)
           { conf.shift => conf }
         elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
           if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
               conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
           end
           { conf[0] => conf[1] }
@@ -673,6 +805,12 @@ module TkItemConfigMethod
       else
         if slot
           slot = slot.to_s
+
+          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          if real_name
+            slot = real_name.to_s
+          end
+
           case slot
           when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
             method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
@@ -710,7 +848,7 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -718,7 +856,7 @@ module TkItemConfigMethod
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -731,11 +869,11 @@ module TkItemConfigMethod
 
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                 num_or_stre(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                 num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
             end
 
@@ -746,7 +884,7 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -754,7 +892,7 @@ module TkItemConfigMethod
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
               begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               rescue
                 conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -767,11 +905,11 @@ module TkItemConfigMethod
 
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                 simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                 simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
             end
 
@@ -782,12 +920,12 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                 list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
             end
             if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
                 && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                 list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
             end
 
@@ -820,13 +958,13 @@ module TkItemConfigMethod
             # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
             conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
           end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
             conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
 
           if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
             if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
                 conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
             end
             { conf[0] => conf[1] }
@@ -840,7 +978,7 @@ module TkItemConfigMethod
           #   conf = tk_split_simplelist(conflist)
           tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).each{|conflist|
             conf = tk_split_simplelist(conflist, false, true)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
               conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
 
             optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
@@ -876,7 +1014,7 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                     number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -884,7 +1022,7 @@ module TkItemConfigMethod
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                     number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -894,11 +1032,11 @@ module TkItemConfigMethod
             when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               end
 
@@ -906,7 +1044,7 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                     bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -914,7 +1052,7 @@ module TkItemConfigMethod
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
                 begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                     bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 rescue
                   conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -924,11 +1062,11 @@ module TkItemConfigMethod
             when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               end
 
@@ -936,12 +1074,12 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                   list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
               end
               if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                   list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
               end
 
@@ -968,19 +1106,19 @@ module TkItemConfigMethod
               if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
                   && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
                 if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
                     tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
                 end
               end
               if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
                 if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
                     tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
                 end
               end
@@ -989,7 +1127,7 @@ module TkItemConfigMethod
             if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
                 && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
               if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
                   conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
               end
               ret[conf[0]] = conf[1]
@@ -1006,6 +1144,10 @@ module TkItemConfigMethod
               ret.delete('latin' << optkey)
               ret.delete('ascii' << optkey)
               ret.delete('kanji' << optkey)
+              fnt = fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              if TkFont.is_system_font?(fnt)
+                fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
+              end
               fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
               ret[optkey] = fontconf
             end
@@ -1023,10 +1165,24 @@ module TkItemConfigMethod
   private :__itemconfiginfo_core
 
   def itemconfiginfo(tagOrId, slot = nil)
-    __itemconfiginfo_core(tagOrId, slot)
+    if slot && TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      begin
+        __itemconfiginfo_core(tagOrId, slot)
+      rescue => e
+        begin
+          __itemconfiginfo_core(tagOrId)
+          # not tag error -> option is unknown
+          Array.new(__item_configinfo_struct.values.max).unshift(slot.to_s)
+        rescue
+          fail e  # tag error
+        end
+      end
+    else
+      __itemconfiginfo_core(tagOrId, slot)
+    end
   end
 
-  def current_itemconfiginfo(tagOrId, slot = nil)
+  def __current_itemconfiginfo(tagOrId, slot = nil)
     if TkComm::GET_CONFIGINFO_AS_ARRAY
       if slot
         org_slot = slot
@@ -1038,7 +1194,7 @@ module TkItemConfigMethod
           end
           slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
         end while(org_slot != slot)
-        fail RuntimeError, 
+        fail RuntimeError,
           "there is a configure alias loop about '#{org_slot}'"
       else
         ret = {}
@@ -1048,6 +1204,7 @@ module TkItemConfigMethod
             ret[conf[0]] = conf[-1]
           end
         }
+
         ret
       end
     else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
@@ -1058,4 +1215,8 @@ module TkItemConfigMethod
       ret
     end
   end
+
+  def current_itemconfiginfo(tagOrId, slot = nil)
+    __current_itemconfiginfo(tagOrId, slot)
+  end
 end
diff --git a/ext/tk/lib/tk/itemfont.rb b/ext/tk/lib/tk/itemfont.rb
index ab9e3ff6c9..b5da4fa1ef 100644
--- a/ext/tk/lib/tk/itemfont.rb
+++ b/ext/tk/lib/tk/itemfont.rb
@@ -32,22 +32,22 @@ module TkTreatItemFont
 
     if key
       pathname = [win, tag, key].join(';')
-      TkFont.used_on(pathname) || 
-        TkFont.init_widget_font(pathname, 
+      TkFont.used_on(pathname) ||
+        TkFont.init_widget_font(pathname,
                                 *(__item_confinfo_cmd(tagid(tagOrId))))
     elsif optkeys.size == 1
       pathname = [win, tag, optkeys[0]].join(';')
-      TkFont.used_on(pathname) || 
-        TkFont.init_widget_font(pathname, 
+      TkFont.used_on(pathname) ||
+        TkFont.init_widget_font(pathname,
                                 *(__item_confinfo_cmd(tagid(tagOrId))))
     else
       fonts = {}
       optkeys.each{|key|
         key = key.to_s
         pathname = [win, tag, key].join(';')
-        fonts[key] = 
-          TkFont.used_on(pathname) || 
-          TkFont.init_widget_font(pathname, 
+        fonts[key] =
+          TkFont.used_on(pathname) ||
+          TkFont.init_widget_font(pathname,
                                   *(__item_confinfo_cmd(tagid(tagOrId))))
       }
       fonts
@@ -73,13 +73,13 @@ module TkTreatItemFont
           slot.delete(a_optkey)
           slot.delete(k_optkey)
 
-          fnt.call_font_configure([pathname, optkey], 
+          fnt.call_font_configure([pathname, optkey],
                                   *(__item_config_cmd(tagid(tagOrId)) << {}))
           next
         else
           if fnt
-            if (slot.key?(l_optkey) || 
-                slot.key?(a_optkey) || 
+            if (slot.key?(l_optkey) ||
+                slot.key?(a_optkey) ||
                 slot.key?(k_optkey))
               fnt = TkFont.new(fnt)
 
@@ -90,11 +90,20 @@ module TkTreatItemFont
               fnt.latin_replace(lfnt) if lfnt
               fnt.kanji_replace(kfnt) if kfnt
 
-              fnt.call_font_configure([pathname, optkey], 
+              fnt.call_font_configure([pathname, optkey],
                                       *(__item_config_cmd(tagid(tagOrId)) << {}))
               next
             else
-              tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
+              fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
+              unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+                tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
+              else
+                begin
+                  tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
+                rescue => e
+                  # ignore
+                end
+              end
             end
           end
           next
@@ -106,7 +115,7 @@ module TkTreatItemFont
       kfnt = slot.delete(k_optkey)
 
       if lfnt && kfnt
-        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey], 
+        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
                                                    *(__item_config_cmd(tagid(tagOrId)) << {}))
       elsif lfnt
         latintagfont_configure([lfnt, optkey])
@@ -147,7 +156,16 @@ module TkTreatItemFont
       elsif Tk::JAPANIZED_TK
         fobj = fontobj          # create a new TkFont object
       else
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
+        ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
+        unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
+        else
+          begin
+            tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
+          rescue => e
+            # ignore
+          end
+        end
         next
       end
 
@@ -198,7 +216,16 @@ module TkTreatItemFont
       elsif Tk::JAPANIZED_TK
         fobj = fontobj          # create a new TkFont object
       else
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
+        knj = hash_kv(knj) if knj.kind_of?(Hash)
+        unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
+        else
+          begin
+            tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
+          rescue => e
+            # ignore
+          end
+        end
         next
       end
 
@@ -237,10 +264,10 @@ module TkTreatItemFont
     end
 
     if targetkey
-      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
+      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
                               *(__item_config_cmd(tagid(tagOrId)) << {}))
     else
-      fnt.call_font_configure(__item_pathname(tagid(tagOrId)), 
+      fnt.call_font_configure(__item_pathname(tagid(tagOrId)),
                               *(__item_config_cmd(tagid(tagOrId)) << {}))
     end
     self
@@ -249,10 +276,10 @@ module TkTreatItemFont
 
   def latintagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
     if targetkey
-      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
+      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
                                                  *(__item_config_cmd(tagid(tagOrId)) << {}))
     else
-      fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
+      fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
                                       *(__item_config_cmd(tagid(tagOrId)) << {}))
     end
 
@@ -275,10 +302,10 @@ module TkTreatItemFont
 
   def kanjifont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
     if targetkey
-      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
+      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
                                                  *(__item_config_cmd(tagid(tagOrId)) << {}))
     else
-        fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
+        fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
                                         *(__item_config_cmd(tagid(tagOrId)) << {}))
     end
 
diff --git a/ext/tk/lib/tk/kinput.rb b/ext/tk/lib/tk/kinput.rb
index a29dbcdb72..b63f756def 100644
--- a/ext/tk/lib/tk/kinput.rb
+++ b/ext/tk/lib/tk/kinput.rb
@@ -8,8 +8,8 @@ module TkKinput
   extend Tk
 
   TkCommandNames = [
-    'kinput_start'.freeze, 
-    'kinput_send_spot'.freeze, 
+    'kinput_start'.freeze,
+    'kinput_send_spot'.freeze,
     'kanjiInput'.freeze
   ].freeze
 
@@ -47,7 +47,7 @@ module TkKinput
 
   def TkKinput.attribute_info(win, slot=nil)
     if slot
-      conf = tk_split_list(tk_call('kanjiInput', 'attribute', 
+      conf = tk_split_list(tk_call('kanjiInput', 'attribute',
                                    win, "-#{slot}"))
       conf[0] = conf[0][1..-1]
       conf
diff --git a/ext/tk/lib/tk/label.rb b/ext/tk/lib/tk/label.rb
index 8b45db9b30..05e430e49b 100644
--- a/ext/tk/lib/tk/label.rb
+++ b/ext/tk/lib/tk/label.rb
@@ -3,10 +3,10 @@
 #
 require 'tk'
 
-class TkLabel<TkWindow
+class Tk::Label<TkWindow
   TkCommandNames = ['label'.freeze].freeze
   WidgetClassName = 'Label'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   #def create_self(keys)
   #  if keys and keys != None
   #    tk_call_without_enc('label', @path, *hash_kv(keys, true))
@@ -16,3 +16,7 @@ class TkLabel<TkWindow
   #end
   #private :create_self
 end
+
+#TkLabel = Tk::Label unless Object.const_defined? :TkLabel
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Label, :TkLabel)
+Tk.__set_loaded_toplevel_aliases__('tk/label.rb', :Tk, Tk::Label, :TkLabel)
diff --git a/ext/tk/lib/tk/labelframe.rb b/ext/tk/lib/tk/labelframe.rb
index 73d5603200..6f679e55b5 100644
--- a/ext/tk/lib/tk/labelframe.rb
+++ b/ext/tk/lib/tk/labelframe.rb
@@ -4,10 +4,10 @@
 require 'tk'
 require 'tk/frame'
 
-class TkLabelFrame<TkFrame
+class Tk::LabelFrame<Tk::Frame
   TkCommandNames = ['labelframe'.freeze].freeze
   WidgetClassName = 'Labelframe'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   #def create_self(keys)
   #  if keys and keys != None
   #    tk_call_without_enc('labelframe', @path, *hash_kv(keys, true))
@@ -22,4 +22,10 @@ class TkLabelFrame<TkFrame
   end
   private :__val2ruby_optkeys
 end
-TkLabelframe = TkLabelFrame
+
+Tk::Labelframe = Tk::LabelFrame
+#TkLabelFrame = Tk::LabelFrame unless Object.const_defined? :TkLabelFrame
+#TkLabelframe = Tk::Labelframe unless Object.const_defined? :TkLabelframe
+#Tk.__set_toplevel_aliases__(:Tk, Tk::LabelFrame, :TkLabelFrame, :TkLabelframe)
+Tk.__set_loaded_toplevel_aliases__('tk/labelframe.rb', :Tk, Tk::LabelFrame,
+                                   :TkLabelFrame, :TkLabelframe)
diff --git a/ext/tk/lib/tk/listbox.rb b/ext/tk/lib/tk/listbox.rb
index 41d02d279e..6742b2132c 100644
--- a/ext/tk/lib/tk/listbox.rb
+++ b/ext/tk/lib/tk/listbox.rb
@@ -15,13 +15,13 @@ module TkListItemConfig
   private :__item_listval_optkeys
 end
 
-class TkListbox<TkTextWin
+class Tk::Listbox<TkTextWin
   include TkListItemConfig
   include Scrollable
 
   TkCommandNames = ['listbox'.freeze].freeze
   WidgetClassName = 'Listbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   #def create_self(keys)
   #  if keys and keys != None
@@ -92,7 +92,7 @@ class TkListbox<TkTextWin
       fail ArgumentError, 'an Array is expected'
     end
     tk_send_without_enc('delete', '0', 'end')
-    tk_send_without_enc('insert', '0', 
+    tk_send_without_enc('insert', '0',
                         *(vals.collect{|v| _get_eval_enc_str(v)}))
     vals
   end
@@ -110,7 +110,7 @@ class TkListbox<TkTextWin
       _fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}"))
     when 'font', 'kanjifont'
       #fnt = tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index, 
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index,
                                                       '-font')))
       unless fnt.kind_of?(TkFont)
         fnt = tagfontobj(index, fnt)
@@ -127,9 +127,9 @@ class TkListbox<TkTextWin
   end
   def itemconfigure(index, key, val=None)
     if key.kind_of? Hash
-      if (key['font'] || key[:font] || 
-          key['kanjifont'] || key[:kanjifont] || 
-          key['latinfont'] || key[:latinfont] || 
+      if (key['font'] || key[:font] ||
+          key['kanjifont'] || key[:kanjifont] ||
+          key['latinfont'] || key[:latinfont] ||
           key['asciifont'] || key[:asciifont] )
         tagfont_configure(index, _symbolkey2str(key))
       else
@@ -137,9 +137,9 @@ class TkListbox<TkTextWin
       end
 
     else
-      if (key == 'font' || key == :font || 
-          key == 'kanjifont' || key == :kanjifont || 
-          key == 'latinfont' || key == :latinfont || 
+      if (key == 'font' || key == :font ||
+          key == 'kanjifont' || key == :kanjifont ||
+          key == 'latinfont' || key == :latinfont ||
           key == 'asciifont' || key == :asciifont )
         if val == None
           tagfontobj(index)
@@ -176,16 +176,16 @@ class TkListbox<TkTextWin
           else
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
             if conf[4]
               if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4]) 
+                conf[4] = tk_split_list(conf[4])
               else
-                conf[4] = tk_tcl2ruby(conf[4]) 
+                conf[4] = tk_tcl2ruby(conf[4])
               end
             end
           end
@@ -224,16 +224,16 @@ class TkListbox<TkTextWin
           else
             if conf[2]
               if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
+                conf[2] = tk_split_list(conf[2])
               else
-                conf[2] = tk_tcl2ruby(conf[2]) 
+                conf[2] = tk_tcl2ruby(conf[2])
               end
             end
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
           end
@@ -277,3 +277,8 @@ class TkListbox<TkTextWin
   end
 =end
 end
+
+#TkListbox = Tk::Listbox unless Object.const_defined? :TkListbox
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Listbox, :TkListbox)
+Tk.__set_loaded_toplevel_aliases__('tk/listbox.rb', :Tk, Tk::Listbox,
+                                   :TkListbox)
diff --git a/ext/tk/lib/tk/macpkg.rb b/ext/tk/lib/tk/macpkg.rb
index 1802073f46..3ca7953c13 100644
--- a/ext/tk/lib/tk/macpkg.rb
+++ b/ext/tk/lib/tk/macpkg.rb
@@ -20,9 +20,16 @@ module Tk
   end
 end
 
-module TkMacResource
+module Tk::MacResource
+end
+#TkMacResource = Tk::MacResource
+#Tk.__set_toplevel_aliases__(:Tk, Tk::MacResource, :TkMacResource)
+Tk.__set_loaded_toplevel_aliases__('tk/macpkg.rb', :Tk, Tk::MacResource,
+                                   :TkMacResource)
+
+module Tk::MacResource
   extend Tk
-  extend TkMacResource
+  extend Tk::MacResource
 
   TkCommandNames = ['resource'.freeze].freeze
 
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
index ddddc8e53e..bcd250026d 100644
--- a/ext/tk/lib/tk/menu.rb
+++ b/ext/tk/lib/tk/menu.rb
@@ -33,23 +33,25 @@ module TkMenuEntryConfig
   end
   private :__item_val2ruby_optkeys
 
+  alias entrycget_tkstring itemcget_tkstring
   alias entrycget itemcget
+  alias entrycget_strict itemcget_strict
   alias entryconfigure itemconfigure
   alias entryconfiginfo itemconfiginfo
   alias current_entryconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 end
 
-class TkMenu<TkWindow
+class Tk::Menu<TkWindow
   include Wm
   include TkMenuEntryConfig
   extend TkMenuSpec
 
   TkCommandNames = ['menu'.freeze].freeze
   WidgetClassName = 'Menu'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   #def create_self(keys)
   #  if keys and keys != None
@@ -140,9 +142,9 @@ class TkMenu<TkWindow
     type = keys.delete('type') if keys.has_key?('type')
 
     if keys.empty?
-      TkMenuClone.new(self, parent, type)
+      Tk::MenuClone.new(self, parent, type)
     else
-      TkMenuClone.new(self, parent, type, keys)
+      Tk::MenuClone.new(self, parent, type, keys)
     end
   end
 
@@ -154,13 +156,13 @@ class TkMenu<TkWindow
     _fromUTF8(tk_send_without_enc('invoke', _get_eval_enc_str(index)))
   end
   def insert(index, type, keys=nil)
-    tk_send_without_enc('insert', _get_eval_enc_str(index), 
+    tk_send_without_enc('insert', _get_eval_enc_str(index),
                         type, *hash_kv(keys, true))
     self
   end
   def delete(first, last=nil)
     if last
-      tk_send_without_enc('delete', _get_eval_enc_str(first), 
+      tk_send_without_enc('delete', _get_eval_enc_str(first),
                           _get_eval_enc_str(last))
     else
       tk_send_without_enc('delete', _get_eval_enc_str(first))
@@ -169,7 +171,7 @@ class TkMenu<TkWindow
   end
   def popup(x, y, index=nil)
     if index
-      tk_call_without_enc('tk_popup', path, x, y, 
+      tk_call_without_enc('tk_popup', path, x, y,
                           _get_eval_enc_str(index))
     else
       tk_call_without_enc('tk_popup', path, x, y)
@@ -202,6 +204,9 @@ class TkMenu<TkWindow
     tk_send_without_enc('unpost')
     self
   end
+  def xposition(index)
+    number(tk_send_without_enc('xposition', _get_eval_enc_str(index)))
+  end
   def yposition(index)
     number(tk_send_without_enc('yposition', _get_eval_enc_str(index)))
   end
@@ -210,7 +215,7 @@ class TkMenu<TkWindow
   def entrycget(index, key)
     case key.to_s
     when 'text', 'label', 'show'
-      _fromUTF8(tk_send_without_enc('entrycget', 
+      _fromUTF8(tk_send_without_enc('entrycget',
                                     _get_eval_enc_str(index), "-#{key}"))
     when 'font', 'kanjifont'
       #fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
@@ -230,20 +235,20 @@ class TkMenu<TkWindow
   end
   def entryconfigure(index, key, val=None)
     if key.kind_of? Hash
-      if (key['font'] || key[:font] || 
-          key['kanjifont'] || key[:kanjifont] || 
-          key['latinfont'] || key[:latinfont] || 
+      if (key['font'] || key[:font] ||
+          key['kanjifont'] || key[:kanjifont] ||
+          key['latinfont'] || key[:latinfont] ||
           key['asciifont'] || key[:asciifont])
         tagfont_configure(index, _symbolkey2str(key))
       else
-        tk_send_without_enc('entryconfigure', _get_eval_enc_str(index), 
+        tk_send_without_enc('entryconfigure', _get_eval_enc_str(index),
                             *hash_kv(key, true))
       end
 
     else
-      if (key == 'font' || key == :font || 
-          key == 'kanjifont' || key == :kanjifont || 
-          key == 'latinfont' || key == :latinfont || 
+      if (key == 'font' || key == :font ||
+          key == 'kanjifont' || key == :kanjifont ||
+          key == 'latinfont' || key == :latinfont ||
           key == 'asciifont' || key == :asciifont )
         if val == None
           tagfontobj(index)
@@ -280,16 +285,16 @@ class TkMenu<TkWindow
           else
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
             if conf[4]
               if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4]) 
+                conf[4] = tk_split_list(conf[4])
               else
-                conf[4] = tk_tcl2ruby(conf[4]) 
+                conf[4] = tk_tcl2ruby(conf[4])
               end
             end
           end
@@ -327,16 +332,16 @@ class TkMenu<TkWindow
           else
             if conf[2]
               if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
+                conf[2] = tk_split_list(conf[2])
               else
-                conf[2] = tk_tcl2ruby(conf[2]) 
+                conf[2] = tk_tcl2ruby(conf[2])
               end
             end
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
           end
@@ -381,8 +386,35 @@ class TkMenu<TkWindow
 =end
 end
 
+#TkMenu = Tk::Menu unless Object.const_defined? :TkMenu
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Menu, :TkMenu)
+Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::Menu, :TkMenu)
+
+
+module Tk::Menu::TkInternalFunction; end
+class << Tk::Menu::TkInternalFunction
+  # These methods calls internal functions of Tcl/Tk.
+  # So, They may not work on your Tcl/Tk.
+  def next_menu(menu, dir='next')
+    dir = dir.to_s
+    case dir
+    when 'next', 'forward', 'down'
+      dir = 'right'
+    when 'previous', 'backward', 'up'
+      dir = 'left'
+    end
 
-class TkMenuClone<TkMenu
+    Tk.tk_call('::tk::MenuNextMenu', menu, dir)
+  end
+
+  def next_entry(menu, delta)
+    # delta is increment value of entry index.
+    # For example, +1 denotes 'next entry' and -1 denotes 'previous entry'.
+    Tk.tk_call('::tk::MenuNextEntry', menu, delta)
+  end
+end
+
+class Tk::MenuClone<Tk::Menu
 =begin
   def initialize(parent, type=None)
     widgetname = nil
@@ -436,9 +468,14 @@ class TkMenuClone<TkMenu
     @src_menu
   end
 end
-TkCloneMenu = TkMenuClone
-
-module TkSystemMenu
+Tk::CloneMenu = Tk::MenuClone
+#TkMenuClone = Tk::MenuClone unless Object.const_defined? :TkMenuClone
+#TkCloneMenu = Tk::CloneMenu unless Object.const_defined? :TkCloneMenu
+#Tk.__set_toplevel_aliases__(:Tk, Tk::MenuClone, :TkMenuClone, :TkCloneMenu)
+Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::MenuClone,
+                                   :TkMenuClone, :TkCloneMenu)
+
+module Tk::SystemMenu
   def initialize(parent, keys=nil)
     if parent.kind_of? Hash
       keys = _symbolkey2str(parent)
@@ -461,38 +498,66 @@ module TkSystemMenu
     end
   end
 end
+TkSystemMenu = Tk::SystemMenu
 
 
-class TkSysMenu_Help<TkMenu
+class Tk::SysMenu_Help<Tk::Menu
   # for all platform
-  include TkSystemMenu
+  include Tk::SystemMenu
   SYSMENU_NAME = 'help'
 end
+#TkSysMenu_Help = Tk::SysMenu_Help unless Object.const_defined? :TkSysMenu_Help
+#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Help, :TkSysMenu_Help)
+Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_Help,
+                                   :TkSysMenu_Help)
 
 
-class TkSysMenu_System<TkMenu
+class Tk::SysMenu_System<Tk::Menu
   # for Windows
-  include TkSystemMenu
+  include Tk::SystemMenu
   SYSMENU_NAME = 'system'
 end
+#TkSysMenu_System = Tk::SysMenu_System unless Object.const_defined? :TkSysMenu_System
+#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_System, :TkSysMenu_System)
+Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_System,
+                                   :TkSysMenu_System)
 
 
-class TkSysMenu_Apple<TkMenu
+class Tk::SysMenu_Apple<Tk::Menu
   # for Machintosh
-  include TkSystemMenu
+  include Tk::SystemMenu
   SYSMENU_NAME = 'apple'
 end
+#TkSysMenu_Apple = Tk::SysMenu_Apple unless Object.const_defined? :TkSysMenu_Apple
+#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Apple, :TkSysMenu_Apple)
+Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_Apple,
+                                   :TkSysMenu_Apple)
 
 
-class TkMenubutton<TkLabel
+class Tk::Menubutton<Tk::Label
   TkCommandNames = ['menubutton'.freeze].freeze
   WidgetClassName = 'Menubutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   def create_self(keys)
     if keys and keys != None
-      # tk_call_without_enc('menubutton', @path, *hash_kv(keys, true))
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                          *hash_kv(keys, true))
+      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+        # tk_call_without_enc('menubutton', @path, *hash_kv(keys, true))
+        tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                            *hash_kv(keys, true))
+      else
+        begin
+          tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                              *hash_kv(keys, true))
+        rescue
+          tk_call_without_enc(self.class::TkCommandNames[0], @path)
+          keys = __check_available_configure_options(keys)
+          unless keys.empty?
+            tk_call_without_enc('destroy', @path) rescue nil
+            tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                                *hash_kv(keys, true))
+          end
+        end
+      end
     else
       # tk_call_without_enc('menubutton', @path)
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -506,10 +571,15 @@ class TkMenubutton<TkLabel
   private :__boolval_optkeys
 
 end
-TkMenuButton = TkMenubutton
+Tk::MenuButton = Tk::Menubutton
+#TkMenubutton = Tk::Menubutton unless Object.const_defined? :TkMenubutton
+#TkMenuButton = Tk::MenuButton unless Object.const_defined? :TkMenuButton
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Menubutton, :TkMenubutton, :TkMenuButton)
+Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::Menubutton,
+                                   :TkMenubutton, :TkMenuButton)
 
 
-class TkOptionMenubutton<TkMenubutton
+class Tk::OptionMenubutton<Tk::Menubutton
   TkCommandNames = ['tk_optionMenu'.freeze].freeze
 
   class OptionMenu<TkMenu
@@ -534,17 +604,17 @@ class TkOptionMenubutton<TkMenubutton
     keys = _symbolkey2str(keys)
 
     parent = nil
-    if args[0].kind_of?(TkWindow) || args[0] == nil
+    if !args.empty? && (args[0].kind_of?(TkWindow) || args[0] == nil)
       keys.delete('parent') # ignore
-      parent = args.shift 
+      parent = args.shift
     else
       parent = keys.delete('parent')
     end
 
     @variable = nil
-    if args[0].kind_of?(TkVariable) || args[0] == nil
+    if !args.empty? && (args[0].kind_of?(TkVariable) || args[0] == nil)
       keys.delete('variable') # ignore
-      @variable = args.shift 
+      @variable = args.shift
     else
       @variable = keys.delete('variable')
     end
@@ -558,7 +628,7 @@ class TkOptionMenubutton<TkMenubutton
     end
 
     install_win(if parent then parent.path end)
-    @menu = OptionMenu.new(tk_call('tk_optionMenu', 
+    @menu = OptionMenu.new(tk_call('tk_optionMenu',
                                    @path, @variable.id, *args))
 
     configure(keys) if keys
@@ -577,7 +647,7 @@ class TkOptionMenubutton<TkMenubutton
     self
   end
   def add(value)
-    @menu.add('radiobutton', 'variable'=>@variable, 
+    @menu.add('radiobutton', 'variable'=>@variable,
               'label'=>value, 'value'=>value)
     self
   end
@@ -588,7 +658,7 @@ class TkOptionMenubutton<TkMenubutton
     @menu.invoke(index)
   end
   def insert(index, value)
-    @menu.insert(index, 'radiobutton', 'variable'=>@variable, 
+    @menu.insert(index, 'radiobutton', 'variable'=>@variable,
               'label'=>value, 'value'=>value)
     self
   end
@@ -596,6 +666,9 @@ class TkOptionMenubutton<TkMenubutton
     @menu.delete(index, last)
     self
   end
+  def xposition(index)
+    @menu.xposition(index)
+  end
   def yposition(index)
     @menu.yposition(index)
   end
@@ -605,6 +678,9 @@ class TkOptionMenubutton<TkMenubutton
   def menucget(key)
     @menu.cget(key)
   end
+  def menucget_strict(key)
+    @menu.cget_strict(key)
+  end
   def menuconfigure(key, val=None)
     @menu.configure(key, val)
     self
@@ -618,6 +694,9 @@ class TkOptionMenubutton<TkMenubutton
   def entrycget(index, key)
     @menu.entrycget(index, key)
   end
+  def entrycget_strict(index, key)
+    @menu.entrycget_strict(index, key)
+  end
   def entryconfigure(index, key, val=None)
     @menu.entryconfigure(index, key, val)
     self
@@ -629,4 +708,11 @@ class TkOptionMenubutton<TkMenubutton
     @menu.current_entryconfiginfo(index, key)
   end
 end
-TkOptionMenuButton = TkOptionMenubutton
+
+Tk::OptionMenuButton = Tk::OptionMenubutton
+#TkOptionMenubutton = Tk::OptionMenubutton unless Object.const_defined? :TkOptionMenubutton
+#TkOptionMenuButton = Tk::OptionMenuButton unless Object.const_defined? :TkOptionMenuButton
+#Tk.__set_toplevel_aliases__(:Tk, Tk::OptionMenubutton,
+#                            :TkOptionMenubutton, :TkOptionMenuButton)
+Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::OptionMenubutton,
+                                   :TkOptionMenubutton, :TkOptionMenuButton)
diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb
index 392b6fbd4e..9d5571c470 100644
--- a/ext/tk/lib/tk/menubar.rb
+++ b/ext/tk/lib/tk/menubar.rb
@@ -2,7 +2,7 @@
 # tk/menubar.rb
 #
 # Original version:
-#   Copyright (C) 1998 maeda shugo. All rights reserved. 
+#   Copyright (C) 1998 maeda shugo. All rights reserved.
 #   This file can be distributed under the terms of the Ruby.
 
 # Usage:
@@ -52,18 +52,18 @@
 #     {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
 #     '---',
 #     ['Check_A', TkVariable.new(true), 6],
-#     {:type=>'checkbutton', :label=>'Check_B', 
+#     {:type=>'checkbutton', :label=>'Check_B',
 #                 :variable=>TkVariable.new, :underline=>6},
 #     '---',
 #     ['Radio_X', [radio_var, 'x'], 6],
 #     ['Radio_Y', [radio_var, 'y'], 6],
 #     ['Radio_Z', [radio_var, 'z'], 6],
 #     '---',
-#     ['cascade', [ 
-#                    ['sss', proc{p 'sss'}, 0], 
-#                    ['ttt', proc{p 'ttt'}, 0], 
-#                    ['uuu', proc{p 'uuu'}, 0], 
-#                    ['vvv', proc{p 'vvv'}, 0], 
+#     ['cascade', [
+#                    ['sss', proc{p 'sss'}, 0],
+#                    ['ttt', proc{p 'ttt'}, 0],
+#                    ['uuu', proc{p 'uuu'}, 0],
+#                    ['vvv', proc{p 'vvv'}, 0],
 #                 ], 0],
 #     '---',
 #     ['Quit', proc{exit}, 0]],
@@ -89,28 +89,34 @@ require 'tk/frame'
 require 'tk/composite'
 require 'tk/menuspec'
 
-class TkMenubar<TkFrame
+class TkMenubar<Tk::Frame
   include TkComposite
   include TkMenuSpec
-  
-  def initialize(parent = nil, spec = nil, options = nil)
+
+  def initialize(parent = nil, spec = nil, options = {})
     if parent.kind_of? Hash
-      options = _symbolkey2str(parent)
-      spec = options.delete('spec')
-      super(options)
-    else
-      super(parent, options)
+      options = parent
+      parent = nil
+      spec = (options.has_key?('spec'))? options.delete('spec'): nil
     end
 
+    _symbolkey2str(options)
+    menuspec_opt = {}
+    TkMenuSpec::MENUSPEC_OPTKEYS.each{|key|
+      menuspec_opt[key] = options.delete(key) if options.has_key?(key)
+    }
+
+    super(parent, options)
+
     @menus = []
-    
-    spec.each{|info| add_menu(info)} if spec
+
+    spec.each{|info| add_menu(info, menuspec_opt)} if spec
 
     options.each{|key, value| configure(key, value)} if options
   end
 
-  def add_menu(menu_info)
-    mbtn, menu = _create_menubutton(@frame, menu_info)
+  def add_menu(menu_info, menuspec_opt={})
+    mbtn, menu = _create_menubutton(@frame, menu_info, menuspec_opt)
 
     submenus = _get_cascade_menus(menu).flatten
 
@@ -124,7 +130,7 @@ class TkMenubar<TkFrame
     delegate('font', mbtn, menu, *submenus)
     delegate('kanjifont', mbtn, menu, *submenus)
   end
-  
+
   def [](index)
     return @menus[index]
   end
diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
index 118a4f42b1..9521a157d9 100644
--- a/ext/tk/lib/tk/menuspec.rb
+++ b/ext/tk/lib/tk/menuspec.rb
@@ -3,35 +3,50 @@
 #                              Hidethoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
 # based on tkmenubar.rb :
-#   Copyright (C) 1998 maeda shugo. All rights reserved. 
+#   Copyright (C) 1998 maeda shugo. All rights reserved.
 #   This file can be distributed under the terms of the Ruby.
 #
 # The format of the menu_spec is:
-#   [ menu_info, menu_info, ... ]
+#   [ menubutton_info, menubutton_info, ... ]
 #
-# And the format of the menu_info is:
+# The format of the menubutton_info is:
+#   [ menubutton_info, entry_info, entry_info, ... ]
+#
+# And each format of *_info is:
 #   [
 #     [text, underline, configs], # menu button/entry (*1)
 #     [label, command, underline, accelerator, configs],   # command entry
 #     [label, TkVar_obj, underline, accelerator, configs], # checkbutton entry
-#     [label, [TkVar_obj, value], 
+#     [label, [TkVar_obj, value],
 #                        underline, accelerator, configs], # radiobutton entry
-#     [label, [[...menu_info...], [...menu_info...], ...], 
+#     [label, [[...menu_info...], [...menu_info...], ...],
 #                        underline, accelerator, configs], # cascade entry (*2)
 #     '---', # separator
 #     ...
 #   ]
 #
-# underline, accelerator, and configs are optional pearameters. 
-# Hashes are OK instead of Arrays. Then the entry type ('command', 
+# A menu_info is an array of menu entries:
+#   [ entry_info, entry_info, ... ]
+# 
+#
+# underline, accelerator, and configs are optional pearameters.
+# Hashes are OK instead of Arrays. Then the entry type ('command',
 # 'checkbutton', 'radiobutton' or 'cascade') is given by 'type' key
 # (e.g. :type=>'cascade'). When type is 'cascade', an array of menu_info
 # is acceptable for 'menu' key (then, create sub-menu).
 #
+# If the value of underline is true instead of an integer,
+# check whether the text/label string contains a '&' character.
+# When includes, the first '&' is removed and its following character is
+# converted the corresponding 'underline' option (first '&' is removed).
+# Else if the value of underline is a String or a Regexp,
+# use the result of label.index(underline) as the index of underline
+# (don't remove matched substring).
+#
 # NOTE: (*1)
-#   If you want to make special menus (*.help for UNIX, *.system for Win, 
-#   and *.apple for Mac), append 'menu_name'=>name (name is 'help' for UNIX, 
-#   'system' for Win, and 'apple' for Mac) option to the configs hash of 
+#   If you want to make special menus (*.help for UNIX, *.system for Win,
+#   and *.apple for Mac), append 'menu_name'=>name (name is 'help' for UNIX,
+#   'system' for Win, and 'apple' for Mac) option to the configs hash of
 #   menu button/entry information.
 #
 # NOTE: (*2)
@@ -39,7 +54,11 @@
 #   to the configs of the cascade entry.
 
 module TkMenuSpec
-  def _create_menu(parent, menu_info, menu_name = nil, 
+  extend TkMenuSpec
+
+  MENUSPEC_OPTKEYS = [ 'layout_proc' ]
+
+  def _create_menu(parent, menu_info, menu_name = nil,
                    tearoff = false, default_opts = nil)
     if tearoff.kind_of?(Hash)
       default_opts = tearoff
@@ -59,10 +78,15 @@ module TkMenuSpec
     end
 
     tearoff = orig_opts.delete('tearoff') if orig_opts.key?('tearoff')
+    tearoff = false unless tearoff # nil --> false
 
     if menu_name
+      #menu = Tk::Menu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
+      # --> use current TkMenu class
       menu = TkMenu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
     else
+      #menu = Tk::Menu.new(parent, :tearoff=>tearoff)
+      # --> use current TkMenu class
       menu = TkMenu.new(parent, :tearoff=>tearoff)
     end
 
@@ -76,10 +100,27 @@ module TkMenuSpec
         menu_opts.update(_symbolkey2str(options.delete('menu_config') || {}))
         if item_type == 'cascade' && options['menu'].kind_of?(Array)
           # create cascade menu
-          submenu = _create_menu(menu, options['menu'], menu_name, 
+          submenu = _create_menu(menu, options['menu'], menu_name,
                                  tearoff, menu_opts)
           options['menu'] = submenu
         end
+        case options['underline']
+        when String, Regexp
+          if options['label'] &&
+              (idx = options['label'].index(options['underline']))
+            options['underline'] = idx
+          else
+            options['underline'] = -1
+          end
+        when true
+          if options['label'] && (idx = options['label'].index('&'))
+            options['label'] = options['label'].dup
+            options['label'][idx] = ''
+            options['underline'] = idx
+          else
+            options['underline'] = -1
+          end
+        end
         menu.add(item_type, options)
 
       elsif item_info.kind_of?(Array)
@@ -113,7 +154,7 @@ module TkMenuSpec
               menu_config = opts.delete('menu_config') || {}
               menu_opts.update(_symbolkey2str(menu_config))
             end
-            submenu = _create_menu(menu, item_info[1], menu_name, 
+            submenu = _create_menu(menu, item_info[1], menu_name,
                                    tearoff, menu_opts)
             options['menu'] = submenu
           end
@@ -134,6 +175,25 @@ module TkMenuSpec
           end
           options.update(opts)
         end
+
+        case options['underline']
+        when String, Regexp
+          if options['label'] &&
+              (idx = options['label'].index(options['underline']))
+            options['underline'] = idx
+          else
+            options['underline'] = -1
+          end
+        when true
+          if options['label'] && (idx = options['label'].index('&'))
+            options['label'] = options['label'].dup
+            options['label'][idx] = ''
+            options['underline'] = idx
+          else
+            options['underline'] = -1
+          end
+        end
+
         menu.add(item_type, options)
 
       elsif /^-+$/ =~ item_info
@@ -150,21 +210,22 @@ module TkMenuSpec
 
   def _use_menubar?(parent)
     use_menubar = false
-    if parent.kind_of?(TkRoot) || parent.kind_of?(TkToplevel)
-      return true 
+    if parent.kind_of?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
+      true
+    elsif parent.current_configinfo.has_key?('menu')
+      true
     else
-      begin
-        parent.cget('menu')
-        return true 
-      rescue
-      end
+      false
     end
-    false
   end
   private :_use_menubar?
 
   def _create_menu_for_menubar(parent)
-    unless (mbar = parent.menu).kind_of?(TkMenu)
+    #unless (mbar = parent.menu).kind_of?(TkMenu)
+    # --> use current TkMenu class
+    mbar = parent.menu
+    unless mbar.kind_of?(Tk::Menu) || mbar.kind_of?(TkMenu)
+      #mbar = Tk::Menu.new(parent, :tearoff=>false)
       mbar = TkMenu.new(parent, :tearoff=>false)
       parent.menu(mbar)
     end
@@ -172,7 +233,7 @@ module TkMenuSpec
   end
   private :_create_menu_for_menubar
 
-  def _create_menubutton(parent, menu_info, tearoff=false, default_opts = nil)
+  def _create_menubutton(parent, menu_info, tearoff=false, default_opts = {})
     btn_info = menu_info[0]
 
     if tearoff.kind_of?(Hash)
@@ -181,16 +242,50 @@ module TkMenuSpec
     end
 
     if default_opts.kind_of?(Hash)
-      keys = _symbolkey2str(default_opts)
-    else
-      keys = {}
+      default_opts = _symbolkey2str(default_opts)
+
+      if default_opts.has_key?('layout_proc')
+        layout_proc = default_opts.delete('layout_proc')
+      end
+
+      _vertical_mbar_bind_proc = proc{|m, dir|
+        Tk::Menu::TkInternalFunction.next_menu(m, dir) rescue nil
+        # ignore error when the internal function doesn't exist
+      }
+
+      case layout_proc
+      when :vertical, 'vertical', :vertical_left, 'vertical_left'
+        layout_proc = proc{|_parent, _mbtn|
+          _mbtn.direction :right
+          _mbtn.pack(:side=>:top, :fill=>:x)
+
+          menu = _mbtn.menu
+          menu.bind('Tab', _vertical_mbar_bind_proc, :widget, 'forward')
+          menu.bind('Alt-Tab', _vertical_mbar_bind_proc, :widget, 'backward')
+        }
+      when :vertical_right, 'vertical_right'
+        layout_proc = proc{|_parent, _mbtn|
+          _mbtn.direction :left
+          _mbtn.pack(:side=>:top, :fill=>:x)
+
+          menu = _mbtn.menu
+          menu.bind('Tab', _vertical_mbar_bind_proc, :widget, 'forward')
+          menu.bind('Alt-Tab', _vertical_mbar_bind_proc, :widget, 'backward')
+        }
+      when :horizontal, 'horizontal'
+        layout_proc = proc{|_parent, _mbtn| _mbtn.pack(:side=>:left)}
+      else
+        # do nothing
+      end
     end
 
+    keys = (default_opts)? default_opts.dup: {}
+
     tearoff = keys.delete('tearoff') if keys.key?('tearoff')
+    tearoff = false unless tearoff # nil --> false
 
-    if _use_menubar?(parent)
+    if _use_menubar?(parent) && ! layout_proc
       # menubar by menu entries
-
       mbar = _create_menu_for_menubar(parent)
 
       menu_name = nil
@@ -198,19 +293,57 @@ module TkMenuSpec
       if btn_info.kind_of?(Hash)
         keys.update(_symbolkey2str(btn_info))
         menu_name = keys.delete('menu_name')
-        keys['label'] = keys.delete('text') if keys.key?('text')
+        keys['label'] = keys.delete('text') || ''
+
+        case keys['underline']
+        when String, Regexp
+          if idx = keys['label'].index(keys['underline'])
+            keys['underline'] = idx
+          else
+            keys['underline'] = -1
+          end
+        when true
+          if idx = keys['label'].index('&')
+            keys['label'] = keys['label'].dup
+            keys['label'][idx] = ''
+            keys['underline'] = idx
+          else
+            keys['underline'] = -1
+          end
+        end
+
       elsif btn_info.kind_of?(Array)
         keys['label'] = btn_info[0] if btn_info[0]
-        keys['underline'] = btn_info[1] if btn_info[1]
+
+        case btn_info[1]
+        when Integer
+          keys['underline'] = btn_info[1]
+        when String, Regexp
+          if idx = keys['label'].index(btn_info[1])
+            keys['underline'] = idx
+          else
+            keys['underline'] = -1
+          end
+        when true
+          if idx = keys['label'].index('&')
+            keys['label'] = keys['label'].dup
+            keys['label'][idx] = ''
+            keys['underline'] = idx
+          else
+            keys['underline'] = -1
+          end
+        end
+
         if btn_info[2]&&btn_info[2].kind_of?(Hash)
           keys.update(_symbolkey2str(btn_info[2]))
           menu_name = keys.delete('menu_name')
         end
+
       else
         keys = {:label=>btn_info}
       end
 
-      menu = _create_menu(mbar, menu_info[1..-1], menu_name, 
+      menu = _create_menu(mbar, menu_info[1..-1], menu_name,
                           tearoff, default_opts)
       menu.tearoff(tearoff)
 
@@ -221,6 +354,8 @@ module TkMenuSpec
 
     else
       # menubar by menubuttons
+      #mbtn = Tk::Menubutton.new(parent)
+      # --> use current TkMenubutton class
       mbtn = TkMenubutton.new(parent)
 
       menu_name = nil
@@ -228,9 +363,42 @@ module TkMenuSpec
       if btn_info.kind_of?(Hash)
         keys.update(_symbolkey2str(btn_info))
         menu_name = keys.delete('menu_name')
-        keys['text'] = keys.delete('label') if keys.key?('label')
+        keys['text'] = keys.delete('label') || ''
+        case keys['underline']
+        when String, Regexp
+          if idx = keys['text'].index(keys['underline'])
+            keys['underline'] = idx
+          else
+            keys['underline'] = -1
+          end
+        when true
+          if idx = keys['text'].index('&')
+            keys['text'] = keys['text'].dup
+            keys['text'][idx] = ''
+            keys['underline'] = idx
+          else
+            keys['underline'] = -1
+          end
+        end
         mbtn.configure(keys)
+
       elsif btn_info.kind_of?(Array)
+        case btn_info[1]
+        when String, Regexp
+          if btn_info[0] && (idx = btn_info[0].index(btn_info[1]))
+            btn_info[1] = idx
+          else
+            btn_info[1] = -1
+          end
+        when true
+          if btn_info[0] && (idx = btn_info[0].index('&'))
+            btn_info[0] = btn_info[0].dup
+            btn_info[0][idx] = ''
+            btn_info[1] = idx
+          else
+            btn_info[1] = -1
+          end
+        end
         mbtn.configure('text', btn_info[0]) if btn_info[0]
         mbtn.configure('underline', btn_info[1]) if btn_info[1]
         # mbtn.configure('accelerator', btn_info[2]) if btn_info[2]
@@ -239,22 +407,41 @@ module TkMenuSpec
           menu_name = keys.delete('menu_name')
           mbtn.configure(keys)
         end
+
       else
         mbtn.configure('text', btn_info)
       end
 
-      mbtn.pack('side' => 'left')
-
-      menu = _create_menu(mbtn, menu_info[1..-1], menu_name, 
+      menu = _create_menu(mbtn, menu_info[1..-1], menu_name,
                           tearoff, default_opts)
-    
       mbtn.menu(menu)
 
+      if layout_proc.kind_of?(Proc) || layout_proc.kind_of?(Method)
+        # e.g. make a vertical menubar
+        #  :layout_proc => proc{|parent, btn| btn.pack(:side=>:top, :fill=>:x)}
+        layout_proc.call(parent, mbtn)
+      else
+        mbtn.pack('side' => 'left')
+      end
+
       [mbtn, menu]
     end
   end
   private :_create_menubutton
 
+  def _create_menubar(parent, menu_spec, tearoff = false, opts = nil)
+    if tearoff.kind_of?(Hash)
+      opts = tearoff
+      tearoff = false
+    end
+    tearoff = false unless tearoff # nil --> false
+    menu_spec.each{|menu_info|
+      _create_menubutton(parent, menu_info, tearoff, opts)
+    }
+    parent
+  end
+  private :_create_menubar
+
   def _get_cascade_menus(menu)
     menus = []
     (0..(menu.index('last'))).each{|idx|
diff --git a/ext/tk/lib/tk/message.rb b/ext/tk/lib/tk/message.rb
index 79121bebb3..5f73b3066f 100644
--- a/ext/tk/lib/tk/message.rb
+++ b/ext/tk/lib/tk/message.rb
@@ -4,10 +4,10 @@
 require 'tk'
 require 'tk/label'
 
-class TkMessage<TkLabel
+class Tk::Message<Tk::Label
   TkCommandNames = ['message'.freeze].freeze
   WidgetClassName = 'Message'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   #def create_self(keys)
   #  if keys and keys != None
   #    tk_call_without_enc('message', @path, *hash_kv(keys, true))
@@ -17,3 +17,8 @@ class TkMessage<TkLabel
   #end
   private :create_self
 end
+
+#TkMessage = Tk::Message unless Object.const_defined? :TkMessage
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Message, :TkMessage)
+Tk.__set_loaded_toplevel_aliases__('tk/message.rb', :Tk, Tk::Message,
+                                   :TkMessage)
diff --git a/ext/tk/lib/tk/mngfocus.rb b/ext/tk/lib/tk/mngfocus.rb
index 1a2049c8a8..a05fb94f8e 100644
--- a/ext/tk/lib/tk/mngfocus.rb
+++ b/ext/tk/lib/tk/mngfocus.rb
@@ -8,8 +8,8 @@ module TkManageFocus
   extend Tk
 
   TkCommandNames = [
-    'tk_focusFollowMouse'.freeze, 
-    'tk_focusNext'.freeze, 
+    'tk_focusFollowMouse'.freeze,
+    'tk_focusNext'.freeze,
     'tk_focusPrev'.freeze
   ].freeze
 
diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
index 061e43fd89..4abbcad85e 100644
--- a/ext/tk/lib/tk/msgcat.rb
+++ b/ext/tk/lib/tk/msgcat.rb
@@ -11,13 +11,13 @@ class TkMsgCatalog < TkObject
   #extend TkMsgCatalog
 
   TkCommandNames = [
-    '::msgcat::mc'.freeze, 
-    '::msgcat::mcmax'.freeze, 
-    '::msgcat::mclocale'.freeze, 
-    '::msgcat::mcpreferences'.freeze, 
-    '::msgcat::mcload'.freeze, 
-    '::msgcat::mcset'.freeze, 
-    '::msgcat::mcmset'.freeze, 
+    '::msgcat::mc'.freeze,
+    '::msgcat::mcmax'.freeze,
+    '::msgcat::mclocale'.freeze,
+    '::msgcat::mcpreferences'.freeze,
+    '::msgcat::mcload'.freeze,
+    '::msgcat::mcset'.freeze,
+    '::msgcat::mcmset'.freeze,
     '::msgcat::mcunknown'.freeze
   ].freeze
 
@@ -36,7 +36,7 @@ class TkMsgCatalog < TkObject
 
   MSGCAT_EXT = '.msg'
 
-  UNKNOWN_CBTBL = Hash.new{|hash,key| hash[key] = {}}.taint
+  UNKNOWN_CBTBL = TkUtil.untrust(Hash.new{|hash,key| hash[key] = {}})
 
   TkCore::INTERP.add_tk_procs('::msgcat::mcunknown', 'args', <<-'EOL')
     if {[set st [catch {eval {ruby_cmd TkMsgCatalog callback} [namespace current] $args} ret]] != 0} {
@@ -69,16 +69,20 @@ class TkMsgCatalog < TkObject
       exit!(1)
     rescue Exception => e
       begin
-        msg = _toUTF8(e.class.inspect) + ': ' + 
-              _toUTF8(e.message) + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              _toUTF8(e.backtrace.join("\n")) + 
+        msg = _toUTF8(e.class.inspect) + ': ' +
+              _toUTF8(e.message) + "\n" +
+              "\n---< backtrace of Ruby side >-----\n" +
+              _toUTF8(e.backtrace.join("\n")) +
               "\n---< backtrace of Tk side >-------"
-        msg.instance_variable_set(:@encoding, 'utf-8')
+        if TkCore::WITH_ENCODING
+          msg.force_encoding('utf-8')
+        else
+          msg.instance_variable_set(:@encoding, 'utf-8')
+        end
       rescue Exception
-        msg = e.class.inspect + ': ' + e.message + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              e.backtrace.join("\n") + 
+        msg = e.class.inspect + ': ' + e.message + "\n" +
+              "\n---< backtrace of Ruby side >-----\n" +
+              e.backtrace.join("\n") +
               "\n---< backtrace of Tk side >-------"
       end
       fail(e, msg)
@@ -149,7 +153,7 @@ class TkMsgCatalog < TkObject
   end
   def translate(*args)
     dst = args.collect{|src|
-      @namespace.eval{tk_call_without_enc('::msgcat::mc', 
+      @namespace.eval{tk_call_without_enc('::msgcat::mc',
                                           _get_eval_string(src, true))}
     }
     Tk.UTF8_String(sprintf(*dst))
@@ -225,29 +229,29 @@ class TkMsgCatalog < TkObject
   def self.set_translation(locale, src_str, trans_str=None, enc='utf-8')
     if trans_str && trans_str != None
       trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
-      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', 
-                                         locale, 
-                                         _get_eval_string(src_str, true), 
+      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
+                                         locale,
+                                         _get_eval_string(src_str, true),
                                          trans_str))
     else
-      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', 
-                                         locale, 
+      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
+                                         locale,
                                          _get_eval_string(src_str, true)))
     end
   end
   def set_translation(locale, src_str, trans_str=None, enc='utf-8')
     if trans_str && trans_str != None
-      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc)) 
+      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
       Tk.UTF8_String(@namespace.eval{
-                       tk_call_without_enc('::msgcat::mcset', 
-                                           locale, 
-                                           _get_eval_string(src_str, true), 
+                       tk_call_without_enc('::msgcat::mcset',
+                                           locale,
+                                           _get_eval_string(src_str, true),
                                            trans_str)
                      })
     else
       Tk.UTF8_String(@namespace.eval{
-                       tk_call_without_enc('::msgcat::mcset', 
-                                           locale, 
+                       tk_call_without_enc('::msgcat::mcset',
+                                           locale,
                                            _get_eval_string(src_str, true))})
     end
   end
@@ -257,7 +261,7 @@ class TkMsgCatalog < TkObject
     list = []
     trans_list.each{|src, trans|
       if trans && trans != None
-        list << _get_eval_string(src, true) 
+        list << _get_eval_string(src, true)
         list << Tk.UTF8_Stirng(_toUTF8(trans, enc))
       else
         list << _get_eval_string(src, true) << ''
@@ -270,7 +274,7 @@ class TkMsgCatalog < TkObject
     list = []
     trans_list.each{|src, trans|
       if trans && trans != None
-        list << _get_eval_string(src, true) 
+        list << _get_eval_string(src, true)
         list << Tk.UTF8_String(_toUTF8(trans, enc))
       else
         list << _get_eval_string(src, true) << ''
diff --git a/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb
index 5bf6474c5b..4af891995e 100644
--- a/ext/tk/lib/tk/namespace.rb
+++ b/ext/tk/lib/tk/namespace.rb
@@ -8,21 +8,28 @@ class TkNamespace < TkObject
   extend Tk
 
   TkCommandNames = [
-    'namespace'.freeze, 
+    'namespace'.freeze,
   ].freeze
 
   Tk_Namespace_ID_TBL = TkCore::INTERP.create_table
-  Tk_Namespace_ID = ["ns".freeze, "00000".taint].freeze
+
+  (Tk_Namespace_ID = ["ns".freeze, TkUtil.untrust("00000")]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
 
   Tk_NsCode_RetObjID_TBL = TkCore::INTERP.create_table
 
   TkCore::INTERP.init_ip_env{
-    Tk_Namespace_ID_TBL.clear
-    Tk_NsCode_RetObjID_TBL.clear
+    Tk_Namespace_ID_TBL.mutex.synchronize{ Tk_Namespace_ID_TBL.clear }
+    Tk_NsCode_RetObjID_TBL.mutex.synchronize{ Tk_NsCode_RetObjID_TBL.clear }
   }
 
   def TkNamespace.id2obj(id)
-    Tk_Namespace_ID_TBL[id]? Tk_Namespace_ID_TBL[id]: id
+    Tk_Namespace_ID_TBL.mutex.synchronize{
+      Tk_Namespace_ID_TBL[id]? Tk_Namespace_ID_TBL[id]: id
+    }
   end
 
   #####################################
@@ -39,7 +46,7 @@ class TkNamespace < TkObject
     private :__config_cmd
 
     def __configinfo_struct
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
         :default_value=>nil, :current_value=>2}
     end
     private :__configinfo_struct
@@ -65,11 +72,27 @@ class TkNamespace < TkObject
     def cget(slot)
       if slot == :namespace || slot == 'namespace'
         ns = super(slot)
-        if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
-          TkNamespace::Tk_Namespace_ID_TBL[ns]
-        else
-          ns
-        end
+        Tk_Namespace_ID_TBL.mutex.synchronize{
+          if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
+            TkNamespace::Tk_Namespace_ID_TBL[ns]
+          else
+            ns
+          end
+        }
+      else
+        super(slot)
+      end
+    end
+    def cget_strict(slot)
+      if slot == :namespace || slot == 'namespace'
+        ns = super(slot)
+        Tk_Namespace_ID_TBL.mutex.synchronize{
+          if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
+            TkNamespace::Tk_Namespace_ID_TBL[ns]
+          else
+            ns
+          end
+        }
       else
         super(slot)
       end
@@ -79,9 +102,11 @@ class TkNamespace < TkObject
       if slot
         if slot == :namespace || slot == 'namespace'
           val = super(slot)
-          if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
-            val = TkNamespace::Tk_Namespace_ID_TBL[val]
-          end
+          Tk_Namespace_ID_TBL.mutex.synchronize{
+            if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
+              val = TkNamespace::Tk_Namespace_ID_TBL[val]
+            end
+          }
         else
           val = super(slot)
         end
@@ -96,19 +121,23 @@ class TkNamespace < TkObject
         info = super()
 
         if TkComm::GET_CONFIGINFO_AS_ARRAY
-          info.map!{|inf| 
-            if inf[0] == 'namespace' && 
-                TkNamespace::Tk_Namespace_ID_TBL.key?(inf[-1])
-              [inf[0], TkNamespace::Tk_Namespace_ID_TBL[inf[-1]]]
-            else
-              inf
-            end
+          Tk_Namespace_ID_TBL.mutex.synchronize{
+            info.map!{|inf|
+              if inf[0] == 'namespace' &&
+                  TkNamespace::Tk_Namespace_ID_TBL.key?(inf[-1])
+                [inf[0], TkNamespace::Tk_Namespace_ID_TBL[inf[-1]]]
+              else
+                inf
+              end
+            }
           }
         else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
           val = info['namespace']
-          if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
-            info['namespace'] = TkNamespace::Tk_Namespace_ID_TBL[val]
-          end
+          Tk_Namespace_ID_TBL.mutex.synchronize{
+            if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
+              info['namespace'] = TkNamespace::Tk_Namespace_ID_TBL[val]
+            end
+          }
         end
 
         info
@@ -131,19 +160,19 @@ class TkNamespace < TkObject
     def tk_call(*args)
       #super('namespace', 'eval', @namespace, *args)
       args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace, 
+      super('namespace', 'eval', @namespace,
             TkCore::INTERP._merge_tklist(*args))
     end
     def tk_call_without_enc(*args)
       #super('namespace', 'eval', @namespace, *args)
       args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace, 
+      super('namespace', 'eval', @namespace,
             TkCore::INTERP._merge_tklist(*args))
     end
     def tk_call_with_enc(*args)
       #super('namespace', 'eval', @namespace, *args)
       args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace, 
+      super('namespace', 'eval', @namespace,
             TkCore::INTERP._merge_tklist(*args))
     end
 
@@ -194,19 +223,19 @@ class TkNamespace < TkObject
   def tk_call(*args)
     #super('namespace', 'eval', @fullname, *args)
     args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname, 
+    super('namespace', 'eval', @fullname,
           TkCore::INTERP._merge_tklist(*args))
   end
   def tk_call_without_enc(*args)
     #super('namespace', 'eval', @fullname, *args)
     args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname,  
+    super('namespace', 'eval', @fullname,
           TkCore::INTERP._merge_tklist(*args))
   end
   def tk_call_with_enc(*args)
     #super('namespace', 'eval', @fullname, *args)
     args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname, 
+    super('namespace', 'eval', @fullname,
           TkCore::INTERP._merge_tklist(*args))
   end
   alias ns_tk_call             tk_call
@@ -215,9 +244,11 @@ class TkNamespace < TkObject
 
   def initialize(name = nil, parent = nil)
     unless name
-      # name = Tk_Namespace_ID.join('')
-      name = Tk_Namespace_ID.join(TkCore::INTERP._ip_id_)
-      Tk_Namespace_ID[1].succ!
+      Tk_Namespace_ID.mutex.synchronize{
+        # name = Tk_Namespace_ID.join('')
+        name = Tk_Namespace_ID.join(TkCore::INTERP._ip_id_)
+        Tk_Namespace_ID[1].succ!
+      }
     end
     name = __tk_call('namespace', 'current') if name == ''
     if parent
@@ -252,7 +283,9 @@ class TkNamespace < TkObject
     # create namespace
     __tk_call('namespace', 'eval', @fullname, '')
 
-    Tk_Namespace_ID_TBL[@fullname] = self
+    Tk_Namespace_ID_TBL.mutex.synchronize{
+      Tk_Namespace_ID_TBL[@fullname] = self
+    }
   end
 
   def self.children(*args)
@@ -260,11 +293,13 @@ class TkNamespace < TkObject
     # <pattern> must be glob-style pattern
     tk_split_simplelist(tk_call('namespace', 'children', *args)).collect{|ns|
       # ns is fullname
-      if Tk_Namespace_ID_TBL.key?(ns)
-        Tk_Namespace_ID_TBL[ns]
-      else
-        ns
-      end
+      Tk_Namespace_ID_TBL.mutex.synchronize{
+        if Tk_Namespace_ID_TBL.key?(ns)
+          Tk_Namespace_ID_TBL[ns]
+        else
+          ns
+        end
+      }
     }
   end
   def children(pattern=None)
@@ -283,21 +318,31 @@ class TkNamespace < TkObject
     else
       fail ArgumentError, "String or Proc is expected"
     end
-    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code', 
+    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
                                                 _get_eval_string(cmd, false)))
   end
 =end
   def code(script = Proc.new)
     if script.kind_of?(String)
       cmd = proc{|*args|
-        ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
+        if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+          obj = ScopeArgs.new(@fullname,*args)
+          ret = obj.instance_exec(obj, script)
+        else
+          ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
+        end
         id = ret.object_id
         TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
         id
       }
     elsif script.kind_of?(Proc)
       cmd = proc{|*args|
-        ret = ScopeArgs.new(@fullname,*args).instance_eval(&script)
+        if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+          obj = ScopeArgs.new(@fullname,*args)
+          ret = obj.instance_exec(obj, &script)
+        else
+          ret = ScopeArgs.new(@fullname,*args).instance_eval(&script)
+        end
         id = ret.object_id
         TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
         id
@@ -305,8 +350,8 @@ class TkNamespace < TkObject
     else
       fail ArgumentError, "String or Proc is expected"
     end
-    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code', 
-                                                _get_eval_string(cmd, false)), 
+    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
+                                                _get_eval_string(cmd, false)),
                             true)
   end
 
@@ -319,11 +364,13 @@ class TkNamespace < TkObject
 
   def self.current
     ns = self.current_path
-    if Tk_Namespace_ID_TBL.key?(ns)
-      Tk_Namespace_ID_TBL[ns]
-    else
-      ns
-    end
+    Tk_Namespace_ID_TBL.mutex.synchronize{
+      if Tk_Namespace_ID_TBL.key?(ns)
+        Tk_Namespace_ID_TBL[ns]
+      else
+        ns
+      end
+    }
   end
   def current_namespace
     # ns_tk_call('namespace', 'current')
@@ -335,11 +382,13 @@ class TkNamespace < TkObject
   def self.delete(*ns_list)
     tk_call('namespace', 'delete', *ns_list)
     ns_list.each{|ns|
-      if ns.kind_of?(TkNamespace)
-        Tk_Namespace_ID_TBL.delete(ns.path)
-      else
-        Tk_Namespace_ID_TBL.delete(ns.to_s)
-      end
+      Tk_Namespace_ID_TBL.mutex.synchronize{
+        if ns.kind_of?(TkNamespace)
+          Tk_Namespace_ID_TBL.delete(ns.path)
+        else
+          Tk_Namespace_ID_TBL.delete(ns.to_s)
+        end
+      }
     }
   end
   def delete
@@ -371,7 +420,7 @@ class TkNamespace < TkObject
 
   def self.eval(namespace, cmd = Proc.new, *args)
     #tk_call('namespace', 'eval', namespace, cmd, *args)
-    TkNamespace.new(namespece).eval(cmd, *args)
+    TkNamespace.new(namespace).eval(cmd, *args)
   end
 =begin
   def eval(cmd = Proc.new, *args)
@@ -444,11 +493,13 @@ class TkNamespace < TkObject
 
   def self.parent(namespace=None)
     ns = tk_call('namespace', 'parent', namespace)
-    if Tk_Namespace_ID_TBL.key?(ns)
-      Tk_Namespace_ID_TBL[ns]
-    else
-      ns
-    end
+    Tk_Namespace_ID_TBL.mutex.synchronize{
+      if Tk_Namespace_ID_TBL.key?(ns)
+        Tk_Namespace_ID_TBL[ns]
+      else
+        ns
+      end
+    }
   end
   def parent
     tk_call('namespace', 'parent', @fullname)
diff --git a/ext/tk/lib/tk/optiondb.rb b/ext/tk/lib/tk/optiondb.rb
index a806f3971d..0f3be30ff7 100644
--- a/ext/tk/lib/tk/optiondb.rb
+++ b/ext/tk/lib/tk/optiondb.rb
@@ -8,7 +8,11 @@ module TkOptionDB
   extend Tk
 
   TkCommandNames = ['option'.freeze].freeze
-  CmdClassID = ['CMD_CLASS'.freeze, '00000'.taint].freeze
+  (CmdClassID = ['CMD_CLASS'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
 
   module Priority
     WidgetDefault = 20
@@ -40,7 +44,7 @@ module TkOptionDB
 
   def read_entries(file, f_enc=nil)
     if TkCore::INTERP.safe?
-      fail SecurityError, 
+      fail SecurityError,
         "can't call 'TkOptionDB.read_entries' on a safe interpreter"
     end
 
@@ -82,7 +86,7 @@ module TkOptionDB
     ent
   end
   module_function :read_entries
-      
+
   def read_with_encoding(file, f_enc=nil, pri=None)
     # try to read the file as an OptionDB file
     read_entries(file, f_enc).each{|pat, val|
@@ -132,7 +136,7 @@ module TkOptionDB
 
   @@resource_proc_class.const_set(:CARRIER, '.'.freeze)
 
-  @@resource_proc_class.instance_variable_set('@method_tbl', 
+  @@resource_proc_class.instance_variable_set('@method_tbl',
                                               TkCore::INTERP.create_table)
   @@resource_proc_class.instance_variable_set('@add_method', false)
   @@resource_proc_class.instance_variable_set('@safe_mode', 4)
@@ -140,7 +144,7 @@ module TkOptionDB
   class << @@resource_proc_class
     private :new
 
-=begin 
+=begin
     CARRIER    = '.'.freeze
     METHOD_TBL = TkCore::INTERP.create_table
     ADD_METHOD = false
@@ -167,7 +171,7 @@ module TkOptionDB
 
     def __check_proc_string__(str)
       # If you want to check the proc_string, do it in this method.
-      # Please define this in the block given to 'new_proc_class' method. 
+      # Please define this in the block given to 'new_proc_class' method.
       str
     end
 
@@ -182,20 +186,20 @@ module TkOptionDB
       unless TkComm._callback_entry?(res_proc)
         #if id == :new || !(self::METHOD_TBL.has_key?(id) || self::ADD_METHOD)
         if id == :new || !(@method_tbl.has_key?(id) || @add_method)
-          raise NoMethodError, 
+          raise NoMethodError,
                 "not support resource-proc '#{id.id2name}' for #{self.name}"
         end
         proc_str = proc_source
         proc_str = '{' + proc_str + '}' unless /\A\{.*\}\Z/ =~ proc_str
         #proc_str = __closed_block_check__(proc_str)
         proc_str = __check_proc_string__(proc_str)
-        res_proc = proc{ 
+        res_proc = proc{
           begin
             #eval("$SAFE = #{self::SAFE_MODE};\nProc.new" + proc_str)
             eval("$SAFE = #{@safe_mode};\nProc.new" + proc_str)
           rescue SyntaxError=>err
-            raise SyntaxError, 
-              TkCore::INTERP._toUTF8(err.message.gsub(/\(eval\):\d:/, 
+            raise SyntaxError,
+              TkCore::INTERP._toUTF8(err.message.gsub(/\(eval\):\d:/,
                                                       "(#{id.id2name}):"))
           end
         }.call
@@ -250,8 +254,10 @@ module TkOptionDB
   def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
     if klass.kind_of?(TkWindow)
       carrier = klass.path
-      klass = CmdClassID.join(TkCore::INTERP._ip_id_)
-      CmdClassID[1].succ!
+      CmdClassID.mutex.synchronize{
+        klass = CmdClassID.join(TkCore::INTERP._ip_id_)
+        CmdClassID[1].succ!
+      }
       parent = nil # ignore parent
     else
       klass = klass.to_s if klass.kind_of?(Symbol)
@@ -285,7 +291,7 @@ module TkOptionDB
     cmd_klass.instance_variable_set('@method_tbl', TkCore::INTERP.create_table)
     cmd_klass.instance_variable_set('@add_method', add)
     cmd_klass.instance_variable_set('@safe_mode', safe)
-    func.each{|f| 
+    func.each{|f|
       cmd_klass.instance_variable_get('@method_tbl')[f.to_s.intern] = nil
     }
 =begin
@@ -304,15 +310,15 @@ module TkOptionDB
     # for security, make these methods invalid
     class << klass
       def __null_method(*args); nil; end
-      [ :class_eval, :name, :superclass, :clone, :dup, :autoload, :autoload?, 
-        :ancestors, :const_defined?, :const_get, :const_set, :const_missing, 
-        :class_variables, :constants, :included_modules, :instance_methods, 
-        :method_defined?, :module_eval, :private_instance_methods, 
-        :protected_instance_methods, :public_instance_methods, 
-        :singleton_methods, :remove_const, :remove_method, :undef_method, 
-        :to_s, :inspect, :display, :method, :methods, :respond_to?, 
-        :instance_variable_get, :instance_variable_set, :instance_method, 
-        :instance_eval, :instance_variables, :kind_of?, :is_a?,
+      [ :class_eval, :name, :superclass, :clone, :dup, :autoload, :autoload?,
+        :ancestors, :const_defined?, :const_get, :const_set, :const_missing,
+        :class_variables, :constants, :included_modules, :instance_methods,
+        :method_defined?, :module_eval, :private_instance_methods,
+        :protected_instance_methods, :public_instance_methods,
+        :singleton_methods, :remove_const, :remove_method, :undef_method,
+        :to_s, :inspect, :display, :method, :methods, :respond_to?,
+        :instance_variable_get, :instance_variable_set, :instance_method,
+        :instance_eval, :instance_exec, :instance_variables, :kind_of?, :is_a?,
         :private_methods, :protected_methods, :public_methods ].each{|m|
         alias_method(m, :__null_method)
       }
@@ -325,7 +331,7 @@ module TkOptionDB
   RAND_BASE_HEAD = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
   RAND_BASE_CHAR = RAND_BASE_HEAD + 'abcdefghijklmnopqrstuvwxyz0123456789_'
   def __get_random_basename
-    name = '%s%03d' % [RAND_BASE_HEAD[rand(RAND_BASE_HEAD.size),1], 
+    name = '%s%03d' % [RAND_BASE_HEAD[rand(RAND_BASE_HEAD.size),1],
                        RAND_BASE_CNT[0]]
     len = RAND_BASE_CHAR.size
     (6+rand(10)).times{
@@ -338,9 +344,9 @@ module TkOptionDB
   private_class_method :__get_random_basename
 
   # define new proc class :
-  # If you want to modify the new class or create a new subclass, 
-  # you must do such operation in the block parameter. 
-  # Because the created class is flozen after evaluating the block. 
+  # If you want to modify the new class or create a new subclass,
+  # you must do such operation in the block parameter.
+  # Because the created class is flozen after evaluating the block.
   def new_proc_class(klass, func, safe = 4, add = false, parent = nil, &b)
     new_klass = __create_new_class(klass, func, safe, add, parent)
     new_klass.class_eval(&b) if block_given?
@@ -351,7 +357,7 @@ module TkOptionDB
   module_function :new_proc_class
 
   def eval_under_random_base(parent = nil, &b)
-    new_klass = __create_new_class(__get_random_basename(), 
+    new_klass = __create_new_class(__get_random_basename(),
                                    [], 4, false, parent)
     ret = new_klass.class_eval(&b) if block_given?
     __remove_methods_of_proc_class(new_klass)
@@ -362,7 +368,7 @@ module TkOptionDB
 
   def new_proc_class_random(klass, func, safe = 4, add = false, &b)
     eval_under_random_base(){
-      TkOption.new_proc_class(klass, func, safe, add, self, &b)
+      TkOptionDB.new_proc_class(klass, func, safe, add, self, &b)
     }
   end
   module_function :new_proc_class_random
diff --git a/ext/tk/lib/tk/optionobj.rb b/ext/tk/lib/tk/optionobj.rb
index 8fe7e0ee5a..29b06da0eb 100644
--- a/ext/tk/lib/tk/optionobj.rb
+++ b/ext/tk/lib/tk/optionobj.rb
@@ -1,10 +1,10 @@
 #
 # tk/optionobj.rb : control options for a group of widgets
 #
-#  NOTE: If you want to use key-only option (no value), 
-#        use Tk::None for the value of the key-only option. 
+#  NOTE: If you want to use key-only option (no value),
+#        use Tk::None for the value of the key-only option.
 #
-#        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3}) 
+#        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3})
 #                 => ["-aaa", 1, "-bbb", "-ccc", 3]
 #
 require 'tk'
@@ -36,7 +36,7 @@ module Tk
     def _remove_win(win)
       if win.kind_of?(Array)
         widget, method = win
-        @observ.delete_if{|x| 
+        @observ.delete_if{|x|
           if x.kind_of?(Array)
             x[0] == widget
           else
@@ -56,15 +56,15 @@ module Tk
     private :_remove_win
 
     def assign(*wins)
-      # win := 
+      # win :=
       #   widget             #==> call widget.configure(hash)
       #   [widget]           #==> call widget.configure(hash)
       #   [widget, nil, {src=>target, ... }]
-      #                      #==> call widget.configure(hash) 
+      #                      #==> call widget.configure(hash)
       #                               with converting hash-key
       #   [widget, method]   #==> call widget.method(hash)
       #   [widget, method, {src=>target, ... }]
-      #                      #==> call widget.method(hash) 
+      #                      #==> call widget.method(hash)
       #                               with converting hash-key
       #   [widget [receiver, method, arg, ... ]]
       #                      #==> call receiver.method(arg, ... , hash)
@@ -74,7 +74,7 @@ module Tk
       #
       # src := option_name_on_optobj
       #
-      # target := 
+      # target :=
       #   nil                #==> not use the src
       #   option_name_on_target_widget
       #   [ option_name_on_target_widget, ... ]
@@ -123,7 +123,7 @@ module Tk
                 next unless key
                 if key.kind_of?(Array)
                   key.each{|k| hash[k] = val}
-                else              
+                else
                   hash[key] = val
                 end
               }
diff --git a/ext/tk/lib/tk/pack.rb b/ext/tk/lib/tk/pack.rb
index 8fab363121..220a38e524 100644
--- a/ext/tk/lib/tk/pack.rb
+++ b/ext/tk/lib/tk/pack.rb
@@ -9,6 +9,7 @@ module TkPack
 
   TkCommandNames = ['pack'.freeze].freeze
 
+=begin
   def configure(win, *args)
     if args[-1].kind_of?(Hash)
       opts = args.pop
@@ -29,6 +30,22 @@ module TkPack
     }
     tk_call_without_enc("pack", 'configure', *params)
   end
+=end
+  def configure(*args)
+    if args[-1].kind_of?(Hash)
+      opts = args.pop
+    else
+      opts = {}
+    end
+    fail ArgumentError, 'no widget is given' if args.empty?
+    params = []
+    args.flatten(1).each{|win| params.push(_epath(win))}
+    opts.each{|k, v|
+      params.push("-#{k}")
+      params.push(_epath(v))  # have to use 'epath' (hash_kv() is unavailable)
+    }
+    tk_call_without_enc("pack", 'configure', *params)
+  end
   alias pack configure
 
   def forget(*args)
diff --git a/ext/tk/lib/tk/package.rb b/ext/tk/lib/tk/package.rb
index d1eb27674d..0c329732f5 100644
--- a/ext/tk/lib/tk/package.rb
+++ b/ext/tk/lib/tk/package.rb
@@ -136,4 +136,8 @@ module TkPackage
   def vsatisfies(version1, version2)
     bool(tk_call('package', 'vsatisfies', version1, version2))
   end
+
+  def prefer(setting = None)
+    tk_call('package', 'prefer', setting)
+  end
 end
diff --git a/ext/tk/lib/tk/palette.rb b/ext/tk/lib/tk/palette.rb
index 2b6fdf5d90..9462bb0667 100644
--- a/ext/tk/lib/tk/palette.rb
+++ b/ext/tk/lib/tk/palette.rb
@@ -9,13 +9,13 @@ module TkPalette
   extend Tk
 
   TkCommandNames = [
-    'tk_setPalette'.freeze, 
-    'tk_bisque'.freeze, 
+    'tk_setPalette'.freeze,
+    'tk_bisque'.freeze,
     'tkDarken'.freeze
   ].freeze
 
   def TkPalette.set(*args)
-    args = args.to_a.flatten if args.kind_of? Hash
+    args = args[0].to_a.flatten if args[0].kind_of? Hash
     tk_call('tk_setPalette', *args)
   end
   def TkPalette.setPalette(*args)
diff --git a/ext/tk/lib/tk/panedwindow.rb b/ext/tk/lib/tk/panedwindow.rb
index c6cf3cd11f..04407802ea 100644
--- a/ext/tk/lib/tk/panedwindow.rb
+++ b/ext/tk/lib/tk/panedwindow.rb
@@ -3,10 +3,10 @@
 #
 require 'tk'
 
-class TkPanedWindow<TkWindow
+class Tk::PanedWindow<TkWindow
   TkCommandNames = ['panedwindow'.freeze].freeze
   WidgetClassName = 'Panedwindow'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   #def create_self(keys)
   #  if keys and keys != None
   #    tk_call_without_enc('panedwindow', @path, *hash_kv(keys, true))
@@ -76,11 +76,32 @@ class TkPanedWindow<TkWindow
     self
   end
 
-  def panecget(win, key)
+  def panecget_strict(win, key)
     # win = win.epath if win.kind_of?(TkObject)
     win = _epath(win)
     tk_tcl2ruby(tk_send_without_enc('panecget', win, "-#{key}"))
   end
+  def panecget(win, key)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      panecget_strict(win, key)
+    else
+      begin
+        panecget_strict(win, key)
+      rescue => e
+        begin
+          if current_paneconfiginfo(win).has_key?(option.to_s)
+            # not tag error & option is known -> error on known option
+            fail e
+          else
+            # not tag error & option is unknown
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
+    end
+  end
 
   def paneconfigure(win, key, value=nil)
     # win = win.epath if win.kind_of?(TkObject)
@@ -107,10 +128,10 @@ class TkPanedWindow<TkWindow
       # win = win.epath if win.kind_of?(TkObject)
       win = _epath(win)
       if key
-        #conf = tk_split_list(tk_send_without_enc('paneconfigure', 
+        #conf = tk_split_list(tk_send_without_enc('paneconfigure',
         #                                         win, "-#{key}"))
-        conf = tk_split_list(tk_send_without_enc('paneconfigure', 
-                                                 win, "-#{key}"), 
+        conf = tk_split_list(tk_send_without_enc('paneconfigure',
+                                                 win, "-#{key}"),
                              false, true)
         conf[0] = conf[0][1..-1]
         if conf[0] == 'hide'
@@ -119,10 +140,10 @@ class TkPanedWindow<TkWindow
         end
         conf
       else
-        #tk_split_simplelist(tk_send_without_enc('paneconfigure', 
+        #tk_split_simplelist(tk_send_without_enc('paneconfigure',
         #                                        win)).collect{|conflist|
         #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('paneconfigure', win), 
+        tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
                             false, false).collect{|conflist|
           conf = tk_split_simplelist(conflist, false, true)
           conf[0] = conf[0][1..-1]
@@ -130,18 +151,18 @@ class TkPanedWindow<TkWindow
             if conf[0] == 'hide'
               conf[3] = bool(conf[3]) unless conf[3].empty?
             elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3]) 
+              conf[3] = tk_split_list(conf[3])
             else
-              conf[3] = tk_tcl2ruby(conf[3]) 
+              conf[3] = tk_tcl2ruby(conf[3])
             end
           end
           if conf[4]
             if conf[0] == 'hide'
               conf[4] = bool(conf[4]) unless conf[4].empty?
             elsif conf[4].index('{')
-              conf[4] = tk_split_list(conf[4]) 
+              conf[4] = tk_split_list(conf[4])
             else
-              conf[4] = tk_tcl2ruby(conf[4]) 
+              conf[4] = tk_tcl2ruby(conf[4])
             end
           end
           conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
@@ -152,10 +173,10 @@ class TkPanedWindow<TkWindow
       # win = win.epath if win.kind_of?(TkObject)
       win = _epath(win)
       if key
-        #conf = tk_split_list(tk_send_without_enc('paneconfigure', 
+        #conf = tk_split_list(tk_send_without_enc('paneconfigure',
         #                                         win, "-#{key}"))
-        conf = tk_split_list(tk_send_without_enc('paneconfigure', 
-                                                 win, "-#{key}"), 
+        conf = tk_split_list(tk_send_without_enc('paneconfigure',
+                                                 win, "-#{key}"),
                              false, true)
         key = conf.shift[1..-1]
         if key == 'hide'
@@ -165,10 +186,10 @@ class TkPanedWindow<TkWindow
         { key => conf }
       else
         ret = {}
-        #tk_split_simplelist(tk_send_without_enc('paneconfigure', 
+        #tk_split_simplelist(tk_send_without_enc('paneconfigure',
         #                                        win)).each{|conflist|
         #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('paneconfigure', win), 
+        tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
                             false, false).each{|conflist|
           conf = tk_split_simplelist(conflist, false, true)
           key = conf.shift[1..-1]
@@ -176,18 +197,18 @@ class TkPanedWindow<TkWindow
             if key == 'hide'
               conf[2] = bool(conf[2]) unless conf[2].empty?
             elsif conf[2].index('{')
-              conf[2] = tk_split_list(conf[2]) 
+              conf[2] = tk_split_list(conf[2])
             else
-              conf[2] = tk_tcl2ruby(conf[2]) 
+              conf[2] = tk_tcl2ruby(conf[2])
             end
           end
           if conf[3]
             if key == 'hide'
               conf[3] = bool(conf[3]) unless conf[3].empty?
             elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3]) 
+              conf[3] = tk_split_list(conf[3])
             else
-              conf[3] = tk_tcl2ruby(conf[3]) 
+              conf[3] = tk_tcl2ruby(conf[3])
             end
           end
           if conf.size == 1
@@ -229,4 +250,11 @@ class TkPanedWindow<TkWindow
     list(tk_send_without_enc('panes'))
   end
 end
-TkPanedwindow = TkPanedWindow
+
+Tk::Panedwindow = Tk::PanedWindow
+#TkPanedWindow = Tk::PanedWindow unless Object.const_defined? :TkPanedWindow
+#TkPanedwindow = Tk::Panedwindow unless Object.const_defined? :TkPanedwindow
+#Tk.__set_toplevel_aliases__(:Tk, Tk::PanedWindow,
+#                            :TkPanedWindow, :TkPanedwindow)
+Tk.__set_loaded_toplevel_aliases__('tk/panedwindow.rb', :Tk, Tk::PanedWindow,
+                                   :TkPanedWindow, :TkPanedwindow)
diff --git a/ext/tk/lib/tk/place.rb b/ext/tk/lib/tk/place.rb
index f7ebdfcbd6..109d866fda 100644
--- a/ext/tk/lib/tk/place.rb
+++ b/ext/tk/lib/tk/place.rb
@@ -35,9 +35,9 @@ module TkPlace
       # win = win.epath if win.kind_of?(TkObject)
       win = _epath(win)
       if slot
-        #conf = tk_split_list(tk_call_without_enc('place', 'configure', 
+        #conf = tk_split_list(tk_call_without_enc('place', 'configure',
         #                                        win, "-#{slot}") )
-        conf = tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+        conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
                                                        win, "-#{slot}") )
         conf[0] = conf[0][1..-1]
         conf[1] = tk_tcl2ruby(conf[1])
@@ -46,7 +46,7 @@ module TkPlace
         conf[4] = tk_tcl2ruby(conf[1])
         conf
       else
-        tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+        tk_split_simplelist(tk_call_without_enc('place', 'configure',
                                                 win)).collect{|conflist|
           #conf = list(conflist)
           conf = simplelist(conflist).collect!{|inf| tk_tcl2ruby(inf)}
@@ -63,16 +63,16 @@ module TkPlace
     # win = win.epath if win.kind_of?(TkObject)
     win = _epath(win)
     if slot
-      #conf = tk_split_list(tk_call_without_enc('place', 'configure', 
+      #conf = tk_split_list(tk_call_without_enc('place', 'configure',
       #                                         win, "-#{slot}") )
-      conf = tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+      conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
                                                      win, "-#{slot}") )
       # { conf[0][1..-1] => conf[1] }
       { conf[0][1..-1] => tk_tcl2ruby(conf[4]) }
     else
       ret = {}
       #tk_split_list(tk_call_without_enc('place','configure',win)).each{|conf|
-      tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+      tk_split_simplelist(tk_call_without_enc('place', 'configure',
                                               win)).each{|conf_list|
         #ret[conf[0][1..-1]] = conf[1]
         conf = simplelist(conf_list)
diff --git a/ext/tk/lib/tk/radiobutton.rb b/ext/tk/lib/tk/radiobutton.rb
index f8f67d709a..627df6d9cf 100644
--- a/ext/tk/lib/tk/radiobutton.rb
+++ b/ext/tk/lib/tk/radiobutton.rb
@@ -4,10 +4,10 @@
 require 'tk'
 require 'tk/button'
 
-class TkRadioButton<TkButton
+class Tk::RadioButton<Tk::Button
   TkCommandNames = ['radiobutton'.freeze].freeze
   WidgetClassName = 'Radiobutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
   #def create_self(keys)
   #  if keys and keys != None
   #    tk_call_without_enc('radiobutton', @path, *hash_kv(keys, true))
@@ -63,4 +63,11 @@ class TkRadioButton<TkButton
     end
   end
 end
-TkRadiobutton = TkRadioButton
+
+Tk::Radiobutton = Tk::RadioButton
+#TkRadioButton = Tk::RadioButton unless Object.const_defined? :TkRadioButton
+#TkRadiobutton = Tk::Radiobutton unless Object.const_defined? :TkRadiobutton
+#Tk.__set_toplevel_aliases__(:Tk, Tk::RadioButton,
+#                            :TkRadioButton, :TkRadiobutton)
+Tk.__set_loaded_toplevel_aliases__('tk/radiobutton.rb', :Tk, Tk::RadioButton,
+                                   :TkRadioButton, :TkRadiobutton)
diff --git a/ext/tk/lib/tk/root.rb b/ext/tk/lib/tk/root.rb
index 0e5584c7c1..b4f0bd107f 100644
--- a/ext/tk/lib/tk/root.rb
+++ b/ext/tk/lib/tk/root.rb
@@ -5,7 +5,7 @@ require 'tk'
 require 'tk/wm'
 require 'tk/menuspec'
 
-class TkRoot<TkWindow
+class Tk::Root<TkWindow
   include Wm
   include TkMenuSpec
 
@@ -14,30 +14,9 @@ class TkRoot<TkWindow
   end
   private :__methodcall_optkeys
 
-=begin
-  ROOT = []
-  def TkRoot.new(keys=nil)
-    if ROOT[0]
-      Tk_WINDOWS["."] = ROOT[0]
-      return ROOT[0]
-    end
-    new = super(:without_creating=>true, :widgetname=>'.')
-    if keys  # wm commands
-      keys.each{|k,v|
-        if v.kind_of? Array
-          new.send(k,*v)
-        else
-          new.send(k,v)
-        end
-      }
-    end
-    ROOT[0] = new
-    Tk_WINDOWS["."] = new
-  end
-=end
-  def TkRoot.new(keys=nil, &b)
+  def Root.new(keys=nil, &b)
     unless TkCore::INTERP.tk_windows['.']
-      TkCore::INTERP.tk_windows['.'] = 
+      TkCore::INTERP.tk_windows['.'] =
         super(:without_creating=>true, :widgetname=>'.'){}
     end
     root = TkCore::INTERP.tk_windows['.']
@@ -62,12 +41,18 @@ class TkRoot<TkWindow
       }
     end
 
-    root.instance_eval(&b) if block_given?
+    if block_given?
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        root.instance_exec(root, &b)
+      else
+        root.instance_eval(&b)
+      end
+    end
     root
   end
 
   WidgetClassName = 'Tk'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.to_eval
     # self::WidgetClassName
@@ -85,8 +70,8 @@ class TkRoot<TkWindow
 
   def add_menu(menu_info, tearoff=false, opts=nil)
     # See tk/menuspec.rb for menu_info.
-    # opts is a hash of default configs for all of cascade menus. 
-    # Configs of menu_info can override it. 
+    # opts is a hash of default configs for all of cascade menus.
+    # Configs of menu_info can override it.
     if tearoff.kind_of?(Hash)
       opts = tearoff
       tearoff = false
@@ -97,12 +82,14 @@ class TkRoot<TkWindow
   def add_menubar(menu_spec, tearoff=false, opts=nil)
     # See tk/menuspec.rb for menu_spec.
     # opts is a hash of default configs for all of cascade menus.
-    # Configs of menu_spec can override it. 
+    # Configs of menu_spec can override it.
     menu_spec.each{|info| add_menu(info, tearoff, opts)}
     self.menu
   end
 
-  def TkRoot.destroy
+  def Root.destroy
     TkCore::INTERP._invoke('destroy', '.')
   end
 end
+
+TkRoot = Tk::Root unless Object.const_defined? :TkRoot
diff --git a/ext/tk/lib/tk/scale.rb b/ext/tk/lib/tk/scale.rb
index 0b703aa055..0bdcead7f2 100644
--- a/ext/tk/lib/tk/scale.rb
+++ b/ext/tk/lib/tk/scale.rb
@@ -3,10 +3,10 @@
 #
 require 'tk'
 
-class TkScale<TkWindow
+class Tk::Scale<TkWindow
   TkCommandNames = ['scale'.freeze].freeze
   WidgetClassName = 'Scale'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def create_self(keys)
     if keys and keys != None
@@ -14,9 +14,31 @@ class TkScale<TkWindow
         cmd = keys.delete('command')
         keys['command'] = proc{|val| cmd.call(val.to_f)}
       end
-      #tk_call_without_enc('scale', @path, *hash_kv(keys, true))
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                          *hash_kv(keys, true))
+      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+        #tk_call_without_enc('scale', @path, *hash_kv(keys, true))
+        tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                            *hash_kv(keys, true))
+      else
+        begin
+          tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                              *hash_kv(keys, true))
+        rescue
+          tk_call_without_enc(self.class::TkCommandNames[0], @path)
+          keys = __check_available_configure_options(keys)
+          unless keys.empty?
+            begin
+              tk_call_without_enc('destroy', @path)
+            rescue
+              # cannot destroy
+              configure(keys)
+            else
+              # re-create widget
+              tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                                  *hash_kv(keys, true))
+            end
+          end
+        end
+      end
     else
       #tk_call_without_enc('scale', @path)
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -47,7 +69,7 @@ class TkScale<TkWindow
   def configure(slot, value=None)
     if (slot == 'command' || slot == :command)
       configure('command'=>value)
-    elsif slot.kind_of?(Hash) && 
+    elsif slot.kind_of?(Hash) &&
         (slot.key?('command') || slot.key?(:command))
       slot = _symbolkey2str(slot)
       slot['command'] = _wrap_command_arg(slot.delete('command'))
@@ -84,3 +106,7 @@ class TkScale<TkWindow
     val
   end
 end
+
+#TkScale = Tk::Scale unless Object.const_defined? :TkScale
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Scale, :TkScale)
+Tk.__set_loaded_toplevel_aliases__('tk/scale.rb', :Tk, Tk::Scale, :TkScale)
diff --git a/ext/tk/lib/tk/scrollbar.rb b/ext/tk/lib/tk/scrollbar.rb
index 70aadfdd4c..c0ac201acb 100644
--- a/ext/tk/lib/tk/scrollbar.rb
+++ b/ext/tk/lib/tk/scrollbar.rb
@@ -3,14 +3,14 @@
 #
 require 'tk'
 
-class TkScrollbar<TkWindow
+class Tk::Scrollbar<TkWindow
   TkCommandNames = ['scrollbar'.freeze].freeze
   WidgetClassName = 'Scrollbar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def create_self(keys)
     @assigned = []
-    @scroll_proc = proc{|*args| 
+    @scroll_proc = proc{|*args|
       if self.orient == 'horizontal'
         @assigned.each{|w| w.xview(*args)}
       else # 'vertical'
@@ -19,9 +19,31 @@ class TkScrollbar<TkWindow
     }
 
     if keys and keys != None
-      #tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                          *hash_kv(keys, true))
+      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+        #tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
+        tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                            *hash_kv(keys, true))
+      else
+        begin
+          tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                              *hash_kv(keys, true))
+        rescue
+          tk_call_without_enc(self.class::TkCommandNames[0], @path)
+          keys = __check_available_configure_options(keys)
+          unless keys.empty?
+            begin
+              tk_call_without_enc('destroy', @path)
+            rescue
+              # cannot destroy
+              configure(keys)
+            else
+              # re-create widget
+              tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                                  *hash_kv(keys, true))
+            end
+          end
+        end
+      end
     else
       #tk_call_without_enc('scrollbar', @path)
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -103,9 +125,35 @@ class TkScrollbar<TkWindow
   def activate(element=None)
     tk_send_without_enc('activate', element)
   end
+
+  def moveto(fraction)
+    tk_send_without_enc('moveto', fraction)
+    self
+  end
+
+  def scroll(*args)
+    tk_send_without_enc('scroll', *args)
+    self
+  end
+
+  def scroll_units(num)
+    scroll(num, 'units')
+    self
+  end
+
+  def scroll_pages(num)
+    scroll(num, 'pages')
+    self
+  end
 end
 
-class TkXScrollbar<TkScrollbar
+#TkScrollbar = Tk::Scrollbar unless Object.const_defined? :TkScrollbar
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Scrollbar, :TkScrollbar)
+Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::Scrollbar,
+                                   :TkScrollbar)
+
+
+class Tk::XScrollbar<Tk::Scrollbar
   def create_self(keys)
     keys = {} unless keys
     keys['orient'] = 'horizontal'
@@ -114,7 +162,13 @@ class TkXScrollbar<TkScrollbar
   private :create_self
 end
 
-class TkYScrollbar<TkScrollbar
+#TkXScrollbar = Tk::XScrollbar unless Object.const_defined? :TkXScrollbar
+#Tk.__set_toplevel_aliases__(:Tk, Tk::XScrollbar, :TkXScrollbar)
+Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::XScrollbar,
+                                   :TkXScrollbar)
+
+
+class Tk::YScrollbar<Tk::Scrollbar
   def create_self(keys)
     keys = {} unless keys
     keys['orient'] = 'vertical'
@@ -122,3 +176,8 @@ class TkYScrollbar<TkScrollbar
   end
   private :create_self
 end
+
+#TkYScrollbar = Tk::YScrollbar unless Object.const_defined? :TkYScrollbar
+#Tk.__set_toplevel_aliases__(:Tk, Tk::YScrollbar, :TkYScrollbar)
+Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::YScrollbar,
+                                   :TkYScrollbar)
diff --git a/ext/tk/lib/tk/scrollbox.rb b/ext/tk/lib/tk/scrollbox.rb
index fd04057fb6..d20742a666 100644
--- a/ext/tk/lib/tk/scrollbox.rb
+++ b/ext/tk/lib/tk/scrollbox.rb
@@ -1,16 +1,19 @@
 #
 #               tk/scrollbox.rb - Tk Listbox with Scrollbar
 #                                 as an example of Composite Widget
-#                       $Date$
 #                       by Yukihiro Matsumoto <matz@netlab.co.jp>
 #
 require 'tk'
 require 'tk/listbox'
 
-class TkScrollbox<TkListbox
+class TkScrollbox<Tk::Listbox
   include TkComposite
   def initialize_composite(keys=nil)
+    #list = Tk::Listbox.new(@frame)
+    # -> use current TkListbox class
     list = TkListbox.new(@frame)
+    #scroll = Tk::Scrollbar.new(@frame)
+    # -> use current TkScrollbar class
     scroll = TkScrollbar.new(@frame)
     @path = list.path
 
diff --git a/ext/tk/lib/tk/selection.rb b/ext/tk/lib/tk/selection.rb
index 5caa6ef8ef..ba0a6f49f9 100644
--- a/ext/tk/lib/tk/selection.rb
+++ b/ext/tk/lib/tk/selection.rb
@@ -18,7 +18,7 @@ module TkSelection
   end
   def self.clear_on_display(win, sel=nil)
     if sel
-      tk_call_without_enc('selection', 'clear', 
+      tk_call_without_enc('selection', 'clear',
                           '-displayof', win, '-selection', sel)
     else
       tk_call_without_enc('selection', 'clear', '-displayof', win)
@@ -35,7 +35,7 @@ module TkSelection
   end
   def self.get_on_display(win, keys=nil)
     #tk_call('selection', 'get', '-displayof', win, *hash_kv(keys))
-    _fromUTF8(tk_call_without_enc('selection', 'get', '-displayof', 
+    _fromUTF8(tk_call_without_enc('selection', 'get', '-displayof',
                                   win, *hash_kv(keys)))
   end
   def get(keys=nil)
@@ -65,7 +65,7 @@ module TkSelection
   end
   def self.get_owner_on_display(win, sel=nil)
     if sel
-      window(tk_call_without_enc('selection', 'own', 
+      window(tk_call_without_enc('selection', 'own',
                                  '-displayof', win, '-selection', sel))
     else
       window(tk_call_without_enc('selection', 'own', '-displayof', win))
diff --git a/ext/tk/lib/tk/spinbox.rb b/ext/tk/lib/tk/spinbox.rb
index 9a10977d12..f2917d60ca 100644
--- a/ext/tk/lib/tk/spinbox.rb
+++ b/ext/tk/lib/tk/spinbox.rb
@@ -1,28 +1,27 @@
 #
 #               tk/spinbox.rb - Tk spinbox classes
-#                       $Date$
 #                       by Yukihiro Matsumoto <matz@caelum.co.jp>
 #
 require 'tk'
 require 'tk/entry'
 
-class TkSpinbox<TkEntry
+class Tk::Spinbox<Tk::Entry
   TkCommandNames = ['spinbox'.freeze].freeze
   WidgetClassName = 'Spinbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   class SpinCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?d, ?s, :direction ], 
-        [ ?s, ?e, :current ], 
-        [ ?W, ?w, :widget ], 
+        [ ?d, ?s, :direction ],
+        [ ?s, ?e, :current ],
+        [ ?W, ?w, :widget ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
 
         [ ?e, proc{|val|
             #enc = Tk.encoding
@@ -33,11 +32,29 @@ class TkSpinbox<TkEntry
               TkComm::string(val)
             end
           }
-        ], 
+        ],
 
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -83,13 +100,36 @@ class TkSpinbox<TkEntry
     tk_send_without_enc('identify', x, y)
   end
 
+  def invoke(elem)
+    tk_send_without_enc('invoke', elem)
+    self
+  end
+
   def spinup
-    tk_send_without_enc('invoke', 'spinup')
+    begin
+      tk_send_without_enc('invoke', 'buttonup')
+    rescue RuntimeError => e
+      # old version of element?
+      begin
+        tk_send_without_enc('invoke', 'spinup')
+      rescue
+        fail e
+      end
+    end
     self
   end
 
   def spindown
-    tk_send_without_enc('invoke', 'spindown')
+    begin
+      tk_send_without_enc('invoke', 'buttondown')
+    rescue RuntimeError => e
+      # old version of element?
+      begin
+        tk_send_without_enc('invoke', 'spinup')
+      rescue
+        fail e
+      end
+    end
     self
   end
 
@@ -97,3 +137,8 @@ class TkSpinbox<TkEntry
     _fromUTF8(tk_send_without_enc('set', _get_eval_enc_str(str)))
   end
 end
+
+#TkSpinbox = Tk::Spinbox unless Object.const_defined? :TkSpinbox
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Spinbox, :TkSpinbox)
+Tk.__set_loaded_toplevel_aliases__('tk/spinbox.rb', :Tk, Tk::Spinbox,
+                                   :TkSpinbox)
diff --git a/ext/tk/lib/tk/text.rb b/ext/tk/lib/tk/text.rb
index 49d4b5625b..bc2aa0a293 100644
--- a/ext/tk/lib/tk/text.rb
+++ b/ext/tk/lib/tk/text.rb
@@ -1,6 +1,5 @@
 #
 #               tk/text.rb - Tk text classes
-#                       $Date$
 #                       by Yukihiro Matsumoto <matz@caelum.co.jp>
 require 'tk'
 require 'tk/itemfont'
@@ -30,37 +29,49 @@ module TkTextTagConfig
   end
   private :__item_pathname
 
+  def tag_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['tag', tagOrId], option)
+  end
   def tag_cget(tagOrId, option)
     itemcget(['tag', tagOrId], option)
   end
+  def tag_cget_strict(tagOrId, option)
+    itemcget_strict(['tag', tagOrId], option)
+  end
   def tag_configure(tagOrId, slot, value=None)
     itemconfigure(['tag', tagOrId], slot, value)
   end
   def tag_configinfo(tagOrId, slot=nil)
-    itemconfigure(['tag', tagOrId], slot)
+    itemconfiginfo(['tag', tagOrId], slot)
   end
   def current_tag_configinfo(tagOrId, slot=nil)
-    itemconfigure(['tag', tagOrId], slot)
+    current_itemconfiginfo(['tag', tagOrId], slot)
   end
 
+  def window_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['window', tagOrId], option)
+  end
   def window_cget(tagOrId, option)
     itemcget(['window', tagOrId], option)
   end
+  def window_cget_strict(tagOrId, option)
+    itemcget_strict(['window', tagOrId], option)
+  end
   def window_configure(tagOrId, slot, value=None)
     itemconfigure(['window', tagOrId], slot, value)
   end
   def window_configinfo(tagOrId, slot=nil)
-    itemconfigure(['window', tagOrId], slot)
+    itemconfiginfo(['window', tagOrId], slot)
   end
   def current_window_configinfo(tagOrId, slot=nil)
-    itemconfigure(['window', tagOrId], slot)
+    current_itemconfiginfo(['window', tagOrId], slot)
   end
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 end
 
-class TkText<TkTextWin
+class Tk::Text<TkTextWin
   ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
   #include TkTreatTextTagFont
   include TkTextTagConfig
@@ -74,9 +85,9 @@ class TkText<TkTextWin
 
       mod = mod.to_s
       if mod =~ /^\s*[+-]?\d/
-        TkText::IndexString.new(String.new(id) << ' + ' << mod)
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod)
       else
-        TkText::IndexString.new(String.new(id) << ' ' << mod)
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod)
       end
     end
 
@@ -85,20 +96,20 @@ class TkText<TkTextWin
 
       mod = mod.to_s
       if mod =~ /^\s*[+-]?\d/
-        TkText::IndexString.new(String.new(id) << ' - ' << mod)
+        Tk::Text::IndexString.new(String.new(id) << ' - ' << mod)
       elsif mod =~ /^\s*[-]\s+(\d.*)$/
-        TkText::IndexString.new(String.new(id) << ' - -' << $1)
+        Tk::Text::IndexString.new(String.new(id) << ' - -' << $1)
       else
-        TkText::IndexString.new(String.new(id) << ' ' << mod)
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod)
       end
     end
 
     def chars(mod)
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' chars')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' chars')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' chars')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' chars')
       end
     end
     alias char chars
@@ -107,9 +118,9 @@ class TkText<TkTextWin
       # Tk8.5 feature
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display chars')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display chars')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display chars')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display chars')
       end
     end
     alias display_char display_chars
@@ -118,9 +129,9 @@ class TkText<TkTextWin
       # Tk8.5 feature
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any chars')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any chars')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any chars')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any chars')
       end
     end
     alias any_char any_chars
@@ -129,9 +140,9 @@ class TkText<TkTextWin
       # Tk8.5 feature
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' indices')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' indices')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' indices')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' indices')
       end
     end
 
@@ -139,9 +150,9 @@ class TkText<TkTextWin
       # Tk8.5 feature
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display indices')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display indices')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display indices')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display indices')
       end
     end
 
@@ -149,18 +160,18 @@ class TkText<TkTextWin
       # Tk8.5 feature
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any indices')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any indices')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any indices')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any indices')
       end
     end
 
     def lines(mod)
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' lines')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' lines')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' lines')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' lines')
       end
     end
     alias line lines
@@ -169,9 +180,9 @@ class TkText<TkTextWin
       # Tk8.5 feature
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display_lines')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display_lines')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display lines')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display lines')
       end
     end
     alias display_line display_lines
@@ -180,43 +191,43 @@ class TkText<TkTextWin
       # Tk8.5 feature
       fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
       if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any_lines')
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any_lines')
       else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any lines')
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any lines')
       end
     end
     alias any_line any_lines
 
     def linestart
-      TkText::IndexString.new(String.new(id) << ' linestart')
+      Tk::Text::IndexString.new(String.new(id) << ' linestart')
     end
     def lineend
-      TkText::IndexString.new(String.new(id) << ' lineend')
+      Tk::Text::IndexString.new(String.new(id) << ' lineend')
     end
 
     def display_linestart
       # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display linestart')
+      Tk::Text::IndexString.new(String.new(id) << ' display linestart')
     end
     def display_lineend
       # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display lineend')
+      Tk::Text::IndexString.new(String.new(id) << ' display lineend')
     end
 
     def wordstart
-      TkText::IndexString.new(String.new(id) << ' wordstart')
+      Tk::Text::IndexString.new(String.new(id) << ' wordstart')
     end
     def wordend
-      TkText::IndexString.new(String.new(id) << ' wordend')
+      Tk::Text::IndexString.new(String.new(id) << ' wordend')
     end
 
     def display_wordstart
       # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display wordstart')
+      Tk::Text::IndexString.new(String.new(id) << ' display wordstart')
     end
     def display_wordend
       # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display wordend')
+      Tk::Text::IndexString.new(String.new(id) << ' display wordend')
     end
   end
 
@@ -246,12 +257,16 @@ class TkText<TkTextWin
 
   TkCommandNames = ['text'.freeze].freeze
   WidgetClassName = 'Text'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.new(*args, &block)
     obj = super(*args){}
     obj.init_instance_variable
-    obj.instance_eval(&block) if defined? yield
+    if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+      obj.instance_exec(obj, &block) if defined? yield
+    else
+      obj.instance_eval(&block) if defined? yield
+    end
     obj
   end
 
@@ -261,14 +276,18 @@ class TkText<TkTextWin
   end
 
   def __destroy_hook__
-    TkTextTag::TTagID_TBL.delete(@path)
-    TkTextMark::TMarkID_TBL.delete(@path)
+    TkTextTag::TTagID_TBL.mutex.synchronize{
+      TkTextTag::TTagID_TBL.delete(@path)
+    }
+    TkTextTag::TMarkID_TBL.mutex.synchronize{
+      TkTextMark::TMarkID_TBL.delete(@path)
+    }
   end
 
   def create_self(keys)
     #if keys and keys != None
     #  #tk_call_without_enc('text', @path, *hash_kv(keys, true))
-    #  tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+    #  tk_call_without_enc(self.class::TkCommandNames[0], @path,
     #                     *hash_kv(keys, true))
     #else
     #  #tk_call_without_enc('text', @path)
@@ -285,16 +304,16 @@ class TkText<TkTextWin
   private :__strval_optkeys
 
   def self.at(x, y)
-    TkText::IndexString.at(x, y)
+    Tk::Text::IndexString.at(x, y)
   end
 
   def at(x, y)
-    TkText::IndexString.at(x, y)
+    Tk::Text::IndexString.at(x, y)
   end
 
   def index(idx)
-    TkText::IndexString.new(tk_send_without_enc('index', 
-                                                _get_eval_enc_str(idx)))
+    Tk::Text::IndexString.new(tk_send_without_enc('index',
+                                                  _get_eval_enc_str(idx)))
   end
 
   def get_displaychars(*index)
@@ -362,7 +381,7 @@ class TkText<TkTextWin
 
   def mark_gravity(mark, direction=nil)
     if direction
-      tk_send_without_enc('mark', 'gravity', 
+      tk_send_without_enc('mark', 'gravity',
                           _get_eval_enc_str(mark), direction)
       self
     else
@@ -371,52 +390,74 @@ class TkText<TkTextWin
   end
 
   def mark_set(mark, index)
-    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark), 
+    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
                         _get_eval_enc_str(index))
     self
   end
   alias set_mark mark_set
 
   def mark_unset(*marks)
-    tk_send_without_enc('mark', 'unset', 
+    tk_send_without_enc('mark', 'unset',
                         *(marks.collect{|mark| _get_eval_enc_str(mark)}))
     self
   end
   alias unset_mark mark_unset
 
   def mark_next(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next', 
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
                                             _get_eval_enc_str(index))))
   end
   alias next_mark mark_next
 
   def mark_previous(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous', 
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
                                             _get_eval_enc_str(index))))
   end
   alias previous_mark mark_previous
 
-  def image_cget(index, slot)
+  def image_cget_strict(index, slot)
     case slot.to_s
     when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('image', 'cget', 
+      _fromUTF8(tk_send_without_enc('image', 'cget',
                                     _get_eval_enc_str(index), "-#{slot}"))
     else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget', 
-                                                _get_eval_enc_str(index), 
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
+                                                _get_eval_enc_str(index),
                                                 "-#{slot}")))
     end
   end
 
+  def image_cget(index, slot)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      image_cget_strict(index, slot)
+    else
+      begin
+        image_cget_strict(index, slot)
+      rescue => e
+        begin
+          if current_image_configinfo(index).has_key?(slot.to_s)
+            # not tag error & option is known -> error on known option
+            fail e
+          else
+            # not tag error & option is unknown
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
+    end
+  end
+
   def image_configure(index, slot, value=None)
     if slot.kind_of?(Hash)
-      _fromUTF8(tk_send_without_enc('image', 'configure', 
-                                    _get_eval_enc_str(index), 
+      _fromUTF8(tk_send_without_enc('image', 'configure',
+                                    _get_eval_enc_str(index),
                                     *hash_kv(slot, true)))
     else
-      _fromUTF8(tk_send_without_enc('image', 'configure', 
-                                    _get_eval_enc_str(index), 
-                                    "-#{slot}", 
+      _fromUTF8(tk_send_without_enc('image', 'configure',
+                                    _get_eval_enc_str(index),
+                                    "-#{slot}",
                                     _get_eval_enc_str(value)))
     end
     self
@@ -446,16 +487,16 @@ class TkText<TkTextWin
           else
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
             if conf[4]
               if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4]) 
+                conf[4] = tk_split_list(conf[4])
               else
-                conf[4] = tk_tcl2ruby(conf[4]) 
+                conf[4] = tk_tcl2ruby(conf[4])
               end
             end
           end
@@ -487,16 +528,16 @@ class TkText<TkTextWin
           else
             if conf[2]
               if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
+                conf[2] = tk_split_list(conf[2])
               else
-                conf[2] = tk_tcl2ruby(conf[2]) 
+                conf[2] = tk_tcl2ruby(conf[2])
               end
             end
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
           end
@@ -585,7 +626,7 @@ class TkText<TkTextWin
   end
 
   def compare(idx1, op, idx2)
-    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1), 
+    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
                              op, _get_eval_enc_str(idx2)))
   end
 
@@ -608,7 +649,7 @@ class TkText<TkTextWin
   def count_info(idx1, idx2, update=true)
     # Tk8.5 feature
     opts = [
-      :chars, :displaychars, :displayindices, :displaylines, 
+      :chars, :displaychars, :displayindices, :displaylines,
       :indices, :lines, :xpixels, :ypixels
     ]
     if update
@@ -702,8 +743,8 @@ class TkText<TkTextWin
   end
 
   def tag_add(tag, index1, index2=None)
-    tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag), 
-                        _get_eval_enc_str(index1), 
+    tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag),
+                        _get_eval_enc_str(index1),
                         _get_eval_enc_str(index2))
     self
   end
@@ -711,17 +752,19 @@ class TkText<TkTextWin
   alias add_tag tag_add
 
   def tag_delete(*tags)
-    tk_send_without_enc('tag', 'delete', 
+    tk_send_without_enc('tag', 'delete',
                         *(tags.collect{|tag| _get_eval_enc_str(tag)}))
-    if TkTextTag::TTagID_TBL[@path]
-      tags.each{|tag|
-        if tag.kind_of?(TkTextTag)
-          TkTextTag::TTagID_TBL[@path].delete(tag.id) 
-        else
-          TkTextTag::TTagID_TBL[@path].delete(tag) 
-        end
-      }
-    end
+    TkTextTag::TTagID_TBL.mutex.synchronize{
+      if TkTextTag::TTagID_TBL[@path]
+        tags.each{|tag|
+          if tag.kind_of?(TkTextTag)
+            TkTextTag::TTagID_TBL[@path].delete(tag.id)
+          else
+            TkTextTag::TTagID_TBL[@path].delete(tag)
+          end
+        }
+      end
+    }
     self
   end
   alias deltag tag_delete
@@ -770,7 +813,7 @@ class TkText<TkTextWin
   def tag_cget(tag, key)
     case key.to_s
     when 'text', 'label', 'show', 'data', 'file'
-      tk_call_without_enc(@path, 'tag', 'cget', 
+      tk_call_without_enc(@path, 'tag', 'cget',
                           _get_eval_enc_str(tag), "-#{key}")
     when 'font', 'kanjifont'
       #fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, "-#{key}"))
@@ -796,14 +839,14 @@ class TkText<TkTextWin
           || key['latinfont'] || key['asciifont'] )
         tagfont_configure(tag, key)
       else
-        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag), 
+        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
                             *hash_kv(key, true))
       end
 
     else
-      if  key == 'font' || key == :font || 
+      if  key == 'font' || key == :font ||
           key == 'kanjifont' || key == :kanjifont ||
-          key == 'latinfont' || key == :latinfont || 
+          key == 'latinfont' || key == :latinfont ||
           key == 'asciifont' || key == :asciifont
         if val == None
           tagfontobj(tag)
@@ -811,7 +854,7 @@ class TkText<TkTextWin
           tagfont_configure(tag, {key=>val})
         end
       else
-        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag), 
+        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
                             "-#{key}", _get_eval_enc_str(val))
       end
     end
@@ -841,16 +884,16 @@ class TkText<TkTextWin
           else
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
             if conf[4]
               if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4]) 
+                conf[4] = tk_split_list(conf[4])
               else
-                conf[4] = tk_tcl2ruby(conf[4]) 
+                conf[4] = tk_tcl2ruby(conf[4])
               end
             end
           end
@@ -889,16 +932,16 @@ class TkText<TkTextWin
           else
             if conf[2]
               if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
+                conf[2] = tk_split_list(conf[2])
               else
-                conf[2] = tk_tcl2ruby(conf[2]) 
+                conf[2] = tk_tcl2ruby(conf[2])
               end
             end
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
           end
@@ -943,19 +986,19 @@ class TkText<TkTextWin
 =end
 
   def tag_raise(tag, above=None)
-    tk_send_without_enc('tag', 'raise', _get_eval_enc_str(tag), 
+    tk_send_without_enc('tag', 'raise', _get_eval_enc_str(tag),
                         _get_eval_enc_str(above))
     self
   end
 
   def tag_lower(tag, below=None)
-    tk_send_without_enc('tag', 'lower', _get_eval_enc_str(tag), 
+    tk_send_without_enc('tag', 'lower', _get_eval_enc_str(tag),
                         _get_eval_enc_str(below))
     self
   end
 
   def tag_remove(tag, *indices)
-    tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag), 
+    tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag),
                         *(indices.collect{|idx| _get_eval_enc_str(idx)}))
     self
   end
@@ -964,30 +1007,30 @@ class TkText<TkTextWin
     #l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
     #                                            _get_eval_enc_str(tag)))
     l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
-                                                _get_eval_enc_str(tag)), 
+                                                _get_eval_enc_str(tag)),
                             false, true)
     r = []
     while key=l.shift
-      r.push [TkText::IndexString.new(key), TkText::IndexString.new(l.shift)]
+      r.push [Tk::Text::IndexString.new(key), Tk::Text::IndexString.new(l.shift)]
     end
     r
   end
 
   def tag_nextrange(tag, first, last=None)
-    simplelist(tk_send_without_enc('tag', 'nextrange', 
-                                   _get_eval_enc_str(tag), 
-                                   _get_eval_enc_str(first), 
+    simplelist(tk_send_without_enc('tag', 'nextrange',
+                                   _get_eval_enc_str(tag),
+                                   _get_eval_enc_str(first),
                                    _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
+      Tk::Text::IndexString.new(idx)
     }
   end
 
   def tag_prevrange(tag, first, last=None)
-    simplelist(tk_send_without_enc('tag', 'prevrange', 
-                                   _get_eval_enc_str(tag), 
-                                   _get_eval_enc_str(first), 
+    simplelist(tk_send_without_enc('tag', 'prevrange',
+                                   _get_eval_enc_str(tag),
+                                   _get_eval_enc_str(first),
                                    _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
+      Tk::Text::IndexString.new(idx)
     }
   end
 
@@ -995,7 +1038,7 @@ class TkText<TkTextWin
   def window_cget(index, slot)
     case slot.to_s
     when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('window', 'cget', 
+      _fromUTF8(tk_send_without_enc('window', 'cget',
                                     _get_eval_enc_str(index), "-#{slot}"))
     when 'font', 'kanjifont'
       #fnt = tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
@@ -1039,12 +1082,12 @@ class TkText<TkTextWin
             slot['create'] = install_cmd(proc{_epath(p_create.call)})
           end
         end
-        tk_send_without_enc('window', 'configure', 
-                            _get_eval_enc_str(index), 
+        tk_send_without_enc('window', 'configure',
+                            _get_eval_enc_str(index),
                             *hash_kv(slot, true))
       else
         if slot == 'window' || slot == :window
-          # id = value 
+          # id = value
           # value = id.epath if id.kind_of?(TkWindow)
           value = _epath(value)
         end
@@ -1064,8 +1107,8 @@ class TkText<TkTextWin
             value = install_cmd(proc{_epath(p_create.call)})
           end
         end
-        tk_send_without_enc('window', 'configure', 
-                            _get_eval_enc_str(index), 
+        tk_send_without_enc('window', 'configure',
+                            _get_eval_enc_str(index),
                             "-#{slot}", _get_eval_enc_str(value))
       end
     end
@@ -1092,16 +1135,16 @@ class TkText<TkTextWin
           else
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
             if conf[4]
               if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4]) 
+                conf[4] = tk_split_list(conf[4])
               else
-                conf[4] = tk_tcl2ruby(conf[4]) 
+                conf[4] = tk_tcl2ruby(conf[4])
               end
             end
           end
@@ -1129,16 +1172,16 @@ class TkText<TkTextWin
           else
             if conf[2]
               if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
+                conf[2] = tk_split_list(conf[2])
               else
-                conf[2] = tk_tcl2ruby(conf[2]) 
+                conf[2] = tk_tcl2ruby(conf[2])
               end
             end
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
           end
@@ -1183,17 +1226,22 @@ class TkText<TkTextWin
   end
 
   def _ktext_length(txt)
+    if TkCore::WITH_ENCODING ### Ruby 1.9 !!!!!!!!!!!!!
+      return txt.length
+    end
+    ###########################
+
     if $KCODE !~ /n/i
       return txt.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
     end
 
     # $KCODE == 'NONE'
     if JAPANIZED_TK
-      tk_call_without_enc('kstring', 'length', 
+      tk_call_without_enc('kstring', 'length',
                           _get_eval_enc_str(txt)).to_i
     else
       begin
-        tk_call_without_enc('encoding', 'convertto', 'ascii', 
+        tk_call_without_enc('encoding', 'convertto', 'ascii',
                             _get_eval_enc_str(txt)).length
       rescue StandardError, NameError
         # sorry, I have no plan
@@ -1232,7 +1280,7 @@ class TkText<TkTextWin
     if ret == ""
       nil
     else
-      TkText::IndexString.new(ret)
+      Tk::Text::IndexString.new(ret)
     end
   end
 
@@ -1267,7 +1315,7 @@ class TkText<TkTextWin
     if ret == ""
       nil
     else
-      TkText::IndexString.new(ret)
+      Tk::Text::IndexString.new(ret)
     end
   end
 
@@ -1282,11 +1330,11 @@ class TkText<TkTextWin
         pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
         if pat.kind_of?(String)
           #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(pat), pat.dup]
         else
           #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(match), match]
         end
       else
@@ -1300,11 +1348,11 @@ class TkText<TkTextWin
         pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
         if pat.kind_of?(String)
           #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(pat), pat.dup]
         else
           #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(match), match]
         end
       else
@@ -1315,7 +1363,7 @@ class TkText<TkTextWin
           pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
           if pat.kind_of?(String)
             #return [index("1.0 + #{pos} chars"), pat.split('').length]
-            return [index("1.0 + #{pos} chars"), 
+            return [index("1.0 + #{pos} chars"),
                     _ktext_length(pat), pat.dup]
           else
             #return [index("1.0 + #{pos} chars"), $&.split('').length]
@@ -1405,7 +1453,7 @@ class TkText<TkTextWin
       idx = str.index(/ /, i)
       result.push str[i..(idx-1)]
       i = idx + 1
-      
+
       # retrieve value
       case result[-1]
       when 'text'
@@ -1456,14 +1504,14 @@ class TkText<TkTextWin
       # retrieve index
       idx = str.index(/ /, i)
       if idx
-        result.push(TkText::IndexString.new(str[i..(idx-1)]))
+        result.push(Tk::Text::IndexString.new(str[i..(idx-1)]))
         i = idx + 1
       else
-        result.push(TkText::IndexString.new(str[i..-1]))
+        result.push(Tk::Text::IndexString.new(str[i..-1]))
         break
       end
     end
-    
+
     kvis = []
     until result.empty?
       kvis.push [result.shift, result.shift, result.shift]
@@ -1527,13 +1575,18 @@ class TkText<TkTextWin
   end
 end
 
+#TkText = Tk::Text unless Object.const_defined? :TkText
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Text, :TkText)
+Tk.__set_loaded_toplevel_aliases__('tk/text.rb', :Tk, Tk::Text, :TkText)
+
+
 #######################################
 
-class TkText::Peer < TkText
+class Tk::Text::Peer < Tk::Text
   # Tk8.5 feature
   def initialize(text, parent=nil, keys={})
-    unless text.kind_of?(TkText)
-      fail ArgumentError, "TkText is expected for 1st argument"
+    unless text.kind_of?(Tk::Text)
+      fail ArgumentError, "Tk::Text is expected for 1st argument"
     end
     @src_text = text
     super(parent, keys)
@@ -1541,7 +1594,8 @@ class TkText::Peer < TkText
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
+      tk_call_without_enc(@src_text.path, 'peer', 'create',
+                          @path, *hash_kv(keys, true))
     else
       tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
     end
diff --git a/ext/tk/lib/tk/textimage.rb b/ext/tk/lib/tk/textimage.rb
index a29b23c7dd..99027a06fb 100644
--- a/ext/tk/lib/tk/textimage.rb
+++ b/ext/tk/lib/tk/textimage.rb
@@ -5,36 +5,36 @@ require 'tk'
 require 'tk/text'
 
 class TkTextImage<TkObject
-  include TkText::IndexModMethods
+  include Tk::Text::IndexModMethods
 
   def initialize(parent, index, keys)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
+    #unless parent.kind_of?(Tk::Text)
+    #  fail ArgumentError, "expect Tk::Text for 1st argument"
     #end
     @t = parent
     if index == 'end' || index == :end
       @path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
     elsif index.kind_of? TkTextMark
       if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
                                                        'end - 1 chars'))
       else
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
                                                        index.path))
       end
     else
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
                                                      _get_eval_enc_str(index)))
     end
     @path.gravity = 'left'
     @index = @path.path
-    @id = tk_call_without_enc(@t.path, 'image', 'create', @index, 
+    @id = tk_call_without_enc(@t.path, 'image', 'create', @index,
                               *hash_kv(keys, true)).freeze
     @path.gravity = 'right'
   end
 
   def id
-    TkText::IndexString.new(@id)
+    Tk::Text::IndexString.new(@id)
   end
   def mark
     @path
@@ -52,6 +52,10 @@ class TkTextImage<TkObject
     @t.image_cget(@index, slot)
   end
 
+  def cget_strict(slot)
+    @t.image_cget_strict(@index, slot)
+  end
+
   def configure(slot, value=None)
     @t.image_configure(@index, slot, value)
     self
@@ -74,9 +78,11 @@ class TkTextImage<TkObject
   end
 
   def image=(value)
-    tk_call_without_enc(@t.path, 'image', 'configure', @index, '-image', 
+    tk_call_without_enc(@t.path, 'image', 'configure', @index, '-image',
                         _get_eval_enc_str(value))
     #self
     value
   end
 end
+
+TktImage = TkTextImage
diff --git a/ext/tk/lib/tk/textmark.rb b/ext/tk/lib/tk/textmark.rb
index 650d95af70..d1888c5e54 100644
--- a/ext/tk/lib/tk/textmark.rb
+++ b/ext/tk/lib/tk/textmark.rb
@@ -5,38 +5,54 @@ require 'tk'
 require 'tk/text'
 
 class TkTextMark<TkObject
-  include TkText::IndexModMethods
+  include Tk::Text::IndexModMethods
 
   TMarkID_TBL = TkCore::INTERP.create_table
-  Tk_TextMark_ID = ['mark'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ TMarkID_TBL.clear }
+  (Tk_TextMark_ID = ['mark'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    TMarkID_TBL.mutex.synchronize{ TMarkID_TBL.clear }
+  }
 
   def TkTextMark.id2obj(text, id)
     tpath = text.path
-    return id unless TMarkID_TBL[tpath]
-    TMarkID_TBL[tpath][id]? TMarkID_TBL[tpath][id]: id
+    TMarkID_TBL.mutex.synchronize{
+      if TMarkID_TBL[tpath]
+        TMarkID_TBL[tpath][id]? TMarkID_TBL[tpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, index)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
+    #unless parent.kind_of?(Tk::Text)
+    #  fail ArgumentError, "expect Tk::Text for 1st argument"
     #end
     @parent = @t = parent
     @tpath = parent.path
-    # @path = @id = Tk_TextMark_ID.join('')
-    @path = @id = Tk_TextMark_ID.join(TkCore::INTERP._ip_id_).freeze
-    TMarkID_TBL[@id] = self
-    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-    TMarkID_TBL[@tpath][@id] = self
-    Tk_TextMark_ID[1].succ!
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
+    Tk_TextMark_ID.mutex.synchronize{
+      # @path = @id = Tk_TextMark_ID.join('')
+      @path = @id = Tk_TextMark_ID.join(TkCore::INTERP._ip_id_).freeze
+      Tk_TextMark_ID[1].succ!
+    }
+    TMarkID_TBL.mutex.synchronize{
+      TMarkID_TBL[@id] = self
+      TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
+      TMarkID_TBL[@tpath][@id] = self
+    }
+    tk_call_without_enc(@t.path, 'mark', 'set', @id,
                         _get_eval_enc_str(index))
     @t._addtag id, self
   end
 
   def id
-    TkText::IndexString.new(@id)
+    Tk::Text::IndexString.new(@id)
   end
 
   def exist?
@@ -49,15 +65,15 @@ class TkTextMark<TkObject
   end
 
 =begin
-  # move to TkText::IndexModMethods module
+  # move to Tk::Text::IndexModMethods module
   def +(mod)
     return chars(mod) if mod.kind_of?(Numeric)
 
     mod = mod.to_s
     if mod =~ /^\s*[+-]?\d/
-      TkText::IndexString.new(@id + ' + ' + mod)
+      Tk::Text::IndexString.new(@id + ' + ' + mod)
     else
-      TkText::IndexString.new(@id + ' ' + mod)
+      Tk::Text::IndexString.new(@id + ' ' + mod)
     end
   end
 
@@ -66,11 +82,11 @@ class TkTextMark<TkObject
 
     mod = mod.to_s
     if mod =~ /^\s*[+-]?\d/
-      TkText::IndexString.new(@id + ' - ' + mod)
+      Tk::Text::IndexString.new(@id + ' - ' + mod)
     elsif mod =~ /^\s*[-]\s+(\d.*)$/
-      TkText::IndexString.new(@id + ' - -' + $1)
+      Tk::Text::IndexString.new(@id + ' - -' + $1)
     else
-      TkText::IndexString.new(@id + ' ' + mod)
+      Tk::Text::IndexString.new(@id + ' ' + mod)
     end
   end
 =end
@@ -84,7 +100,7 @@ class TkTextMark<TkObject
   end
 
   def set(where)
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
+    tk_call_without_enc(@t.path, 'mark', 'set', @id,
                         _get_eval_enc_str(where))
     self
   end
@@ -121,46 +137,68 @@ class TkTextMark<TkObject
     end
   end
 end
+TktMark = TkTextMark
 
 class TkTextNamedMark<TkTextMark
-  def self.new(parent, name, *args)
-    if TMarkID_TBL[parent.path] && TMarkID_TBL[parent.path][name]
-      return TMarkID_TBL[parent.path][name]
-    else
-      super(parent, name, *args)
-    end
+  def self.new(parent, name, index=nil)
+    TMarkID_TBL.mutex.synchronize{
+      if TMarkID_TBL[parent.path] && TMarkID_TBL[parent.path][name]
+        obj = TMarkID_TBL[parent.path][name]
+      else
+        # super(parent, name, *args)
+        (obj = self.allocate).instance_eval{
+          @parent = @t = parent
+          @tpath = parent.path
+          @path = @id = name
+          TMarkID_TBL[@id] = self
+          TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
+          TMarkID_TBL[@tpath][@id] = self unless TMarkID_TBL[@tpath][@id]
+          @t._addtag @id, self
+        }
+        obj
+      end
+
+      if obj && index
+        tk_call_without_enc(parent.path, 'mark', 'set', name,
+                            _get_eval_enc_str(index))
+      end
+      obj
+    }
   end
 
   def initialize(parent, name, index=nil)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
+    # dummy:: not called by 'new' method
+
+    #unless parent.kind_of?(Tk::Text)
+    #  fail ArgumentError, "expect Tk::Text for 1st argument"
     #end
     @parent = @t = parent
     @tpath = parent.path
     @path = @id = name
-    TMarkID_TBL[@id] = self
-    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-    TMarkID_TBL[@tpath][@id] = self unless TMarkID_TBL[@tpath][@id]
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
+    tk_call_without_enc(@t.path, 'mark', 'set', @id,
                         _get_eval_enc_str(index)) if index
-    @t._addtag id, self
+    @t._addtag @id, self
   end
 end
+TktNamedMark = TkTextNamedMark
 
 class TkTextMarkInsert<TkTextNamedMark
   def self.new(parent,*args)
     super(parent, 'insert', *args)
   end
 end
+TktMarkInsert = TkTextMarkInsert
 
 class TkTextMarkCurrent<TkTextNamedMark
   def self.new(parent,*args)
     super(parent, 'current', *args)
   end
 end
+TktMarkCurrent = TkTextMarkCurrent
 
 class TkTextMarkAnchor<TkTextNamedMark
   def self.new(parent,*args)
     super(parent, 'anchor', *args)
   end
 end
+TktMarkAnchor = TkTextMarkAnchor
diff --git a/ext/tk/lib/tk/texttag.rb b/ext/tk/lib/tk/texttag.rb
index cc2c56210f..96692014e4 100644
--- a/ext/tk/lib/tk/texttag.rb
+++ b/ext/tk/lib/tk/texttag.rb
@@ -7,17 +7,29 @@ require 'tk/tagfont'
 
 class TkTextTag<TkObject
   include TkTreatTagFont
-  include TkText::IndexModMethods
+  include Tk::Text::IndexModMethods
 
   TTagID_TBL = TkCore::INTERP.create_table
-  Tk_TextTag_ID = ['tag'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ TTagID_TBL.clear }
+  (Tk_TextTag_ID = ['tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    TTagID_TBL.mutex.synchronize{ TTagID_TBL.clear }
+  }
 
   def TkTextTag.id2obj(text, id)
     tpath = text.path
-    return id unless TTagID_TBL[tpath]
-    TTagID_TBL[tpath][id]? TTagID_TBL[tpath][id]: id
+    TTagID_TBL.mutex.synchronize{
+      if TTagID_TBL[tpath]
+        TTagID_TBL[tpath][id]? TTagID_TBL[tpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, *args)
@@ -26,12 +38,16 @@ class TkTextTag<TkObject
     #end
     @parent = @t = parent
     @tpath = parent.path
-    # @path = @id = Tk_TextTag_ID.join('')
-    @path = @id = Tk_TextTag_ID.join(TkCore::INTERP._ip_id_).freeze
-    # TTagID_TBL[@id] = self
-    TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-    TTagID_TBL[@tpath][@id] = self
-    Tk_TextTag_ID[1].succ!
+    Tk_TextTag_ID.mutex.synchronize{
+      # @path = @id = Tk_TextTag_ID.join('')
+      @path = @id = Tk_TextTag_ID.join(TkCore::INTERP._ip_id_).freeze
+      Tk_TextTag_ID[1].succ!
+    }
+    TTagID_TBL.mutex.synchronize{
+      TTagID_TBL[@id] = self
+      TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
+      TTagID_TBL[@tpath][@id] = self
+    }
     #tk_call @t.path, "tag", "configure", @id, *hash_kv(keys)
     if args != []
       keys = args.pop
@@ -47,7 +63,7 @@ class TkTextTag<TkObject
   end
 
   def id
-    TkText::IndexString.new(@id)
+    Tk::Text::IndexString.new(@id)
   end
 
   def exist?
@@ -60,21 +76,21 @@ class TkTextTag<TkObject
   end
 
   def first
-    TkText::IndexString.new(@id + '.first')
+    Tk::Text::IndexString.new(@id + '.first')
   end
 
   def last
-    TkText::IndexString.new(@id + '.last')
+    Tk::Text::IndexString.new(@id + '.last')
   end
 
   def add(*indices)
-    tk_call_without_enc(@t.path, 'tag', 'add', @id, 
+    tk_call_without_enc(@t.path, 'tag', 'add', @id,
                         *(indices.collect{|idx| _get_eval_enc_str(idx)}))
     self
   end
 
   def remove(*indices)
-    tk_call_without_enc(@t.path, 'tag', 'remove', @id, 
+    tk_call_without_enc(@t.path, 'tag', 'remove', @id,
                         *(indices.collect{|idx| _get_eval_enc_str(idx)}))
     self
   end
@@ -83,24 +99,24 @@ class TkTextTag<TkObject
     l = tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'ranges', @id))
     r = []
     while key=l.shift
-      r.push [TkText::IndexString.new(key), TkText::IndexString.new(l.shift)]
+      r.push [Tk::Text::IndexString.new(key), Tk::Text::IndexString.new(l.shift)]
     end
     r
   end
 
   def nextrange(first, last=None)
-    simplelist(tk_call_without_enc(@t.path, 'tag', 'nextrange', @id, 
-                                   _get_eval_enc_str(first), 
+    simplelist(tk_call_without_enc(@t.path, 'tag', 'nextrange', @id,
+                                   _get_eval_enc_str(first),
                                    _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
+      Tk::Text::IndexString.new(idx)
     }
   end
 
   def prevrange(first, last=None)
-    simplelist(tk_call_without_enc(@t.path, 'tag', 'prevrange', @id, 
-                                   _get_eval_enc_str(first), 
+    simplelist(tk_call_without_enc(@t.path, 'tag', 'prevrange', @id,
+                                   _get_eval_enc_str(first),
                                    _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
+      Tk::Text::IndexString.new(idx)
     }
   end
 
@@ -113,9 +129,15 @@ class TkTextTag<TkObject
     val
   end
 
+  def cget_tkstring(key)
+    @t.tag_cget_tkstring @id, key
+  end
   def cget(key)
     @t.tag_cget @id, key
   end
+  def cget_strict(key)
+    @t.tag_cget_strict @id, key
+  end
 =begin
   def cget(key)
     case key.to_s
@@ -123,7 +145,7 @@ class TkTextTag<TkObject
       _fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', @id, "-#{key}"))
     when 'font', 'kanjifont'
       #fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', 
+      fnt = tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
                                                       @id, '-font')))
       unless fnt.kind_of?(TkFont)
         fnt = tagfontobj(@id, fnt)
@@ -135,7 +157,7 @@ class TkTextTag<TkObject
         fnt
       end
     else
-      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', 
+      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
                                                 @id, "-#{key}")))
     end
   end
@@ -208,53 +230,71 @@ class TkTextTag<TkObject
   end
 
   def raise(above=None)
-    tk_call_without_enc(@t.path, 'tag', 'raise', @id, 
+    tk_call_without_enc(@t.path, 'tag', 'raise', @id,
                         _get_eval_enc_str(above))
     self
   end
 
   def lower(below=None)
-    tk_call_without_enc(@t.path, 'tag', 'lower', @id, 
+    tk_call_without_enc(@t.path, 'tag', 'lower', @id,
                         _get_eval_enc_str(below))
     self
   end
 
   def destroy
     tk_call_without_enc(@t.path, 'tag', 'delete', @id)
-    TTagID_TBL[@tpath].delete(@id) if TTagID_TBL[@tpath]
+    TTagID_TBL.mutex.synchronize{
+      TTagID_TBL[@tpath].delete(@id) if TTagID_TBL[@tpath]
+    }
     self
   end
 end
+TktTag = TkTextTag
 
 class TkTextNamedTag<TkTextTag
   def self.new(parent, name, *args)
-    if TTagID_TBL[parent.path] && TTagID_TBL[parent.path][name]
-      tagobj = TTagID_TBL[parent.path][name]
-      if args != []
-        keys = args.pop
-        if keys.kind_of?(Hash)
-          tagobj.add(*args) if args != []
-          tagobj.configure(keys)
-        else
-          args.push keys
-          tagobj.add(*args)
-        end
+    tagobj = nil
+    TTagID_TBL.mutex.synchronize{
+      if TTagID_TBL[parent.path] && TTagID_TBL[parent.path][name]
+        tagobj = TTagID_TBL[parent.path][name]
+      else
+        # super(parent, name, *args)
+        (tagobj = self.allocate).instance_eval{
+          @parent = @t = parent
+          @tpath = parent.path
+          @path = @id = name
+          TTagID_TBL[@id] = self
+          TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
+          TTagID_TBL[@tpath][@id] = self unless TTagID_TBL[@tpath][@id]
+          @t._addtag @id, self
+        }
+      end
+    }
+
+    if args != []
+      keys = args.pop
+      if keys.kind_of?(Hash)
+        tagobj.add(*args) if args != []
+        tagobj.configure(keys)
+      else
+        args.push keys
+        tagobj.add(*args)
       end
-      return tagobj
-    else
-      super(parent, name, *args)
     end
+
+    tagobj
   end
 
   def initialize(parent, name, *args)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
+    # dummy:: not called by 'new' method
+
+    #unless parent.kind_of?(Tk::Text)
+    #  fail ArgumentError, "expect Tk::Text for 1st argument"
     #end
     @parent = @t = parent
     @tpath = parent.path
     @path = @id = name
-    TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-    TTagID_TBL[@tpath][@id] = self unless TTagID_TBL[@tpath][@id]
+
     #if mode
     #  tk_call @t.path, "addtag", @id, *args
     #end
@@ -268,12 +308,14 @@ class TkTextNamedTag<TkTextTag
         add(*args)
       end
     end
-    @t._addtag id, self
+    @t._addtag @id, self
   end
 end
+TktNamedTag = TkTextNamedTag
 
 class TkTextTagSel<TkTextNamedTag
   def self.new(parent, *args)
     super(parent, 'sel', *args)
   end
 end
+TktTagSel = TkTextTagSel
diff --git a/ext/tk/lib/tk/textwindow.rb b/ext/tk/lib/tk/textwindow.rb
index 605c40addd..49327b2c81 100644
--- a/ext/tk/lib/tk/textwindow.rb
+++ b/ext/tk/lib/tk/textwindow.rb
@@ -5,22 +5,22 @@ require 'tk'
 require 'tk/text'
 
 class TkTextWindow<TkObject
-  include TkText::IndexModMethods
+  include Tk::Text::IndexModMethods
 
   def initialize(parent, index, keys = {})
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
+    #unless parent.kind_of?(Tk::Text)
+    #  fail ArgumentError, "expect Tk::Text for 1st argument"
     #end
     @t = parent
     if index == 'end' || index == :end
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
                                                      'end - 1 chars'))
     elsif index.kind_of?(TkTextMark)
       if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
                                                        'end - 1 chars'))
       else
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
                                                        index.path))
       end
     else
@@ -49,13 +49,13 @@ class TkTextWindow<TkObject
         keys['create'] = install_cmd(proc{@id = @p_create.call; _epath(@id)})
       end
     end
-    tk_call_without_enc(@t.path, 'window', 'create', @index, 
+    tk_call_without_enc(@t.path, 'window', 'create', @index,
                         *hash_kv(keys, true))
     @path.gravity = 'right'
   end
 
   def id
-    TkText::IndexString.new(_epath(@id))
+    Tk::Text::IndexString.new(_epath(@id))
   end
   def mark
     @path
@@ -72,12 +72,15 @@ class TkTextWindow<TkObject
   def cget(slot)
     @t.window_cget(@index, slot)
   end
+  def cget_strict(slot)
+    @t.window_cget_strict(@index, slot)
+  end
 
   def configure(slot, value=None)
     if slot.kind_of?(Hash)
       slot = _symbolkey2str(slot)
       if slot['window']
-        @id = slot['window'] 
+        @id = slot['window']
         # slot['window'] = @id.epath if @id.kind_of?(TkWindow)
         slot['window'] = _epath(@id) if @id
       end
@@ -85,19 +88,19 @@ class TkTextWindow<TkObject
         self.create=slot.delete('create')
       end
       if slot.size > 0
-        tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+        tk_call_without_enc(@t.path, 'window', 'configure', @index,
                             *hash_kv(slot, true))
       end
     else
       if slot == 'window' || slot == :window
-        @id = value 
+        @id = value
         # value = @id.epath if @id.kind_of?(TkWindow)
         value = _epath(@id) if @id
       end
       if slot == 'create' || slot == :create
         self.create=value
       else
-        tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+        tk_call_without_enc(@t.path, 'window', 'configure', @index,
                             "-#{slot}", _get_eval_enc_str(value))
       end
     end
@@ -120,7 +123,7 @@ class TkTextWindow<TkObject
     @id = value
     # value = @id.epath if @id.kind_of?(TkWindow)
     value = _epath(@id) if @id
-    tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+    tk_call_without_enc(@t.path, 'window', 'configure', @index,
                         '-window', _get_eval_enc_str(value))
     value
   end
@@ -142,8 +145,10 @@ class TkTextWindow<TkObject
                             end
                           })
     end
-    tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+    tk_call_without_enc(@t.path, 'window', 'configure', @index,
                         '-create', _get_eval_enc_str(value))
     value
   end
 end
+
+TktWindow = TkTextWindow
diff --git a/ext/tk/lib/tk/timer.rb b/ext/tk/lib/tk/timer.rb
index 47f2b79350..ddfbfce9be 100644
--- a/ext/tk/lib/tk/timer.rb
+++ b/ext/tk/lib/tk/timer.rb
@@ -11,8 +11,13 @@ class TkTimer
 
   TkCommandNames = ['after'.freeze].freeze
 
-  Tk_CBID = ['a'.freeze, '00000'.taint].freeze
-  Tk_CBTBL = {}.taint
+  (Tk_CBID = ['a'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  Tk_CBTBL = TkUtil.untrust({})
 
   TkCore::INTERP.add_tk_procs('rb_after', 'id', <<-'EOL')
     if {[set st [catch {eval {ruby_cmd TkTimer callback} $id} ret]] != 0} {
@@ -71,7 +76,7 @@ class TkTimer
     rescue Interrupt
       exit!(1)
     rescue Exception => e
-      if @cancel_on_exception && 
+      if @cancel_on_exception &&
           @cancel_on_exception.find{|exc| e.kind_of?(exc)}
         cancel
         @return_value = e
@@ -96,9 +101,9 @@ class TkTimer
       return self
     end
     @after_script = "rb_after #{@id}"
-    @after_id = tk_call_without_enc('after', sleep, @after_script)
     @current_args = args
     @current_script = [sleep, @after_script]
+    @after_id = tk_call_without_enc('after', sleep, @after_script)
     self
   end
 
@@ -106,7 +111,8 @@ class TkTimer
     if @running == false || @proc_max == 0 || @do_loop == 0
       Tk_CBTBL.delete(@id) ;# for GC
       @running = false
-      @wait_var.value = 0
+      # @wait_var.value = 0
+      __at_end__
       return
     end
     if @current_pos >= @proc_max
@@ -115,7 +121,8 @@ class TkTimer
       else
         Tk_CBTBL.delete(@id) ;# for GC
         @running = false
-        @wait_var.value = 0
+        # @wait_var.value = 0
+        __at_end__
         return
       end
     end
@@ -138,12 +145,16 @@ class TkTimer
   end
 
   def initialize(*args, &b)
-    # @id = Tk_CBID.join('')
-    @id = Tk_CBID.join(TkCore::INTERP._ip_id_)
-    Tk_CBID[1].succ!
+    Tk_CBID.mutex.synchronize{
+      # @id = Tk_CBID.join('')
+      @id = Tk_CBID.join(TkCore::INTERP._ip_id_)
+      Tk_CBID[1].succ!
+    }
 
     @wait_var = TkVariable.new(0)
 
+    @at_end_proc = nil
+
     @cb_cmd = TkCore::INTERP.get_cb_entry(self.method(:do_callback))
 
     @set_next = true
@@ -169,12 +180,12 @@ class TkTimer
     @after_script = nil
 
     @cancel_on_exception = DEFAULT_IGNORE_EXCEPTIONS
-    # Unless @cancel_on_exception, Ruby/Tk shows an error dialog box when 
-    # an excepsion is raised on TkTimer callback procedure. 
-    # If @cancel_on_exception is an array of exception classes and the raised 
-    # exception is included in the array, Ruby/Tk cancels executing TkTimer 
-    # callback procedures silently (TkTimer#cancel is called and no dialog is 
-    # shown). 
+    # Unless @cancel_on_exception, Ruby/Tk shows an error dialog box when
+    # an excepsion is raised on TkTimer callback procedure.
+    # If @cancel_on_exception is an array of exception classes and the raised
+    # exception is included in the array, Ruby/Tk cancels executing TkTimer
+    # callback procedures silently (TkTimer#cancel is called and no dialog is
+    # shown).
 
     if b
       case args.size
@@ -203,6 +214,12 @@ class TkTimer
 
   attr_accessor :loop_exec
 
+  def __at_end__
+    @at_end_proc.call(self) if @at_end_proc
+    @wait_var.value = 0  # for wait
+  end
+  private :__at_end__
+
   def cb_call
     @cb_cmd.call
   end
@@ -212,7 +229,7 @@ class TkTimer
   end
 
   def current_status
-    [@running, @current_sleep, @current_proc, @current_args, 
+    [@running, @current_sleep, @current_proc, @current_args,
       @do_loop, @cancel_on_exception]
   end
 
@@ -411,7 +428,7 @@ class TkTimer
 
   def restart(*restart_args, &b)
     cancel if @running
-    if restart_args == [] && !b
+    if restart_args.empty? && !b
       start(@init_sleep, @init_proc, *@init_args)
     else
       start(*restart_args, &b)
@@ -420,7 +437,8 @@ class TkTimer
 
   def cancel
     @running = false
-    @wait_var.value = 0
+    # @wait_var.value = 0
+    __at_end__
     tk_call 'after', 'cancel', @after_id if @after_id
     @after_id = nil
 
@@ -464,6 +482,21 @@ class TkTimer
     end
   end
 
+  def at_end(*arg, &b)
+    if arg.empty?
+      if b
+        @at_end_proc = b
+      else
+        # no proc
+        return @at_end_proc
+      end
+    else
+      fail ArgumentError, "wrong number of arguments" if arg.length != 1 || b
+      @at_end_proc = arg[0]
+    end
+    self
+  end
+
   def wait(on_thread = true, check_root = false)
     if $SAFE >= 4
       fail SecurityError, "can't wait timer at $SAFE >= 4"
@@ -471,17 +504,17 @@ class TkTimer
 
     unless @running
       if @return_value.kind_of?(Exception)
-        fail @return_value 
+        fail @return_value
       else
-        return @return_value 
+        return @return_value
       end
     end
 
     @wait_var.wait(on_thread, check_root)
     if @return_value.kind_of?(Exception)
-      fail @return_value 
+      fail @return_value
     else
-      @return_value 
+      @return_value
     end
   end
   def eventloop_wait(check_root = false)
@@ -562,7 +595,8 @@ class TkRTTimer < TkTimer
     if @running == false || @proc_max == 0 || @do_loop == 0
       Tk_CBTBL.delete(@id) ;# for GC
       @running = false
-      @wait_var.value = 0
+      # @wait_var.value = 0
+      __at_end__
       return
     end
     if @current_pos >= @proc_max
@@ -571,7 +605,8 @@ class TkRTTimer < TkTimer
       else
         Tk_CBTBL.delete(@id) ;# for GC
         @running = false
-        @wait_var.value = 0
+        # @wait_var.value = 0
+        __at_end__
         return
       end
     end
@@ -593,12 +628,12 @@ class TkRTTimer < TkTimer
     if @est_time
       @est_time = Time.at(@est_time.to_i, @est_time.usec + sleep*1000)
     else
-      @est_time = Time.at(@cb_start_time.to_i, 
+      @est_time = Time.at(@cb_start_time.to_i,
                           @cb_start_time.usec + sleep*1000)
     end
 
     now = Time.now
-    real_sleep = ((@est_time.to_i - now.to_i + @offset_s)*1000.0 + 
+    real_sleep = ((@est_time.to_i - now.to_i + @offset_s)*1000.0 +
                   (@est_time.usec - now.usec + @offset_u)/1000.0).round
     if real_sleep <= 0
       real_sleep = 0
@@ -618,7 +653,7 @@ class TkRTTimer < TkTimer
 
       if @current_sleep == 0
         @offset_list.push([
-                            @offset_s - @cb_start_time.to_i, 
+                            @offset_s - @cb_start_time.to_i,
                             @offset_u - @cb_start_time.usec
                           ])
       else
diff --git a/ext/tk/lib/tk/toplevel.rb b/ext/tk/lib/tk/toplevel.rb
index 5e199e1330..30ef009517 100644
--- a/ext/tk/lib/tk/toplevel.rb
+++ b/ext/tk/lib/tk/toplevel.rb
@@ -5,13 +5,13 @@ require 'tk'
 require 'tk/wm'
 require 'tk/menuspec'
 
-class TkToplevel<TkWindow
+class Tk::Toplevel<TkWindow
   include Wm
   include TkMenuSpec
 
   TkCommandNames = ['toplevel'.freeze].freeze
   WidgetClassName = 'Toplevel'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
 ################# old version
 #  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
@@ -38,7 +38,7 @@ class TkToplevel<TkWindow
 #    s << "-class"     << @classname if @classname
 #    s << "-colormap"  << @colormap  if @colormap
 #    s << "-container" << @container if @container
-#    s << "-screen"    << @screen    if @screen 
+#    s << "-screen"    << @screen    if @screen
 #    s << "-use"       << @use       if @use
 #    s << "-visual"    << @visual    if @visual
 #    tk_call 'toplevel', @path, *s
@@ -72,7 +72,7 @@ class TkToplevel<TkWindow
 
     conf_methods = _symbolkey2str(__methodcall_optkeys())
 
-    keys.each{|k,v|
+    keys.each{|k,v| # k is a String
       if conf_methods.key?(k)
         wm_cmds[conf_methods[k]] = v
       elsif Wm.method_defined?(k)
@@ -113,20 +113,21 @@ class TkToplevel<TkWindow
       @use       = keys['use']
       @visual    = keys['visual']
       if !@classname && my_class_name
-        keys['class'] = @classname = my_class_name 
+        keys['class'] = @classname = my_class_name
       end
       if @classname.kind_of? TkBindTag
         @db_class = @classname
-        @classname = @classname.id
+        keys['class'] = @classname = @classname.id
       elsif @classname
         @db_class = TkDatabaseClass.new(@classname)
+        keys['class'] = @classname
       else
         @db_class = self.class
         @classname = @db_class::WidgetClassName
       end
       keys, cmds = _wm_command_option_chk(keys)
       super(keys)
-      cmds.each{|k,v| 
+      cmds.each{|k,v|
         if v.kind_of? Array
           self.__send__(k,*v)
         else
@@ -161,20 +162,21 @@ class TkToplevel<TkWindow
       keys = {}
     end
     if !@classname && my_class_name
-      keys['class'] = @classname = my_class_name 
+      keys['class'] = @classname = my_class_name
     end
     if @classname.kind_of? TkBindTag
       @db_class = @classname
-      @classname = @classname.id
+      keys['class'] = @classname = @classname.id
     elsif @classname
       @db_class = TkDatabaseClass.new(@classname)
+      keys['class'] = @classname
     else
       @db_class = self.class
       @classname = @db_class::WidgetClassName
     end
     keys, cmds = _wm_command_option_chk(keys)
     super(parent, keys)
-    cmds.each{|k,v| 
+    cmds.each{|k,v|
       if v.kind_of? Array
         self.send(k,*v)
       else
@@ -198,8 +200,8 @@ class TkToplevel<TkWindow
 
   def add_menu(menu_info, tearoff=false, opts=nil)
     # See tk/menuspec.rb for menu_info.
-    # opts is a hash of default configs for all of cascade menus. 
-    # Configs of menu_info can override it. 
+    # opts is a hash of default configs for all of cascade menus.
+    # Configs of menu_info can override it.
     if tearoff.kind_of?(Hash)
       opts = tearoff
       tearoff = false
@@ -210,7 +212,7 @@ class TkToplevel<TkWindow
   def add_menubar(menu_spec, tearoff=false, opts=nil)
     # See tk/menuspec.rb for menu_spec.
     # opts is a hash of default configs for all of cascade menus.
-    # Configs of menu_spec can override it. 
+    # Configs of menu_spec can override it.
     menu_spec.each{|info| add_menu(info, tearoff, opts)}
     self.menu
   end
@@ -255,3 +257,8 @@ class TkToplevel<TkWindow
     end
   end
 end
+
+#TkToplevel = Tk::Toplevel unless Object.const_defined? :TkToplevel
+#Tk.__set_toplevel_aliases__(:Tk, Tk::Toplevel, :TkToplevel)
+Tk.__set_loaded_toplevel_aliases__('tk/toplevel.rb', :Tk, Tk::Toplevel,
+                                   :TkToplevel)
diff --git a/ext/tk/lib/tk/ttk_selector.rb b/ext/tk/lib/tk/ttk_selector.rb
new file mode 100644
index 0000000000..522249e6a9
--- /dev/null
+++ b/ext/tk/lib/tk/ttk_selector.rb
@@ -0,0 +1,98 @@
+#
+#  ttk_selector
+#
+######################################
+#  toplevel classes/modules
+module Tk
+  @TOPLEVEL_ALIAS_TABLE[:Ttk] = {
+    :TkButton       => 'tkextlib/tile/tbutton',
+
+    :TkCheckbutton  => 'tkextlib/tile/tcheckbutton',
+    :TkCheckButton  => 'tkextlib/tile/tcheckbutton',
+
+    # :TkDialog       => 'tkextlib/tile/dialog',
+
+    :TkEntry        => 'tkextlib/tile/tentry',
+
+    :TkCombobox     => 'tkextlib/tile/tcombobox',
+
+    :TkFrame        => 'tkextlib/tile/tframe',
+
+    :TkLabel        => 'tkextlib/tile/tlabel',
+
+    :TkLabelframe   => 'tkextlib/tile/tlabelframe',
+    :TkLabelFrame   => 'tkextlib/tile/tlabelframe',
+
+    :TkMenubutton   => 'tkextlib/tile/tmenubutton',
+    :TkMenuButton   => 'tkextlib/tile/tmenubutton',
+
+    :TkNotebook     => 'tkextlib/tile/tnotebook',
+
+    # :TkPaned        => 'tkextlib/tile/tpaned',
+    :TkPanedwindow  => 'tkextlib/tile/tpaned',
+    :TkPanedWindow  => 'tkextlib/tile/tpaned',
+
+    :TkProgressbar  => 'tkextlib/tile/tprogressbar',
+
+    :TkRadiobutton  => 'tkextlib/tile/tradiobutton',
+    :TkRadioButton  => 'tkextlib/tile/tradiobutton',
+
+    :TkScale        => 'tkextlib/tile/tscale',
+    # :TkProgress     => 'tkextlib/tile/tscale',
+
+    :TkScrollbar    => 'tkextlib/tile/tscrollbar',
+    :TkXScrollbar   => 'tkextlib/tile/tscrollbar',
+    :TkYScrollbar   => 'tkextlib/tile/tscrollbar',
+
+    :TkSeparator    => 'tkextlib/tile/tseparator',
+
+    :TkSizeGrip     => 'tkextlib/tile/sizegrip',
+    :TkSizegrip     => 'tkextlib/tile/sizegrip',
+
+    # :TkSquare       => 'tkextlib/tile/tsquare',
+
+    :TkTreeview     => 'tkextlib/tile/treeview',
+  }
+
+  # @TOPLEVEL_ALIAS_TABLE[:Tile] = @TOPLEVEL_ALIAS_TABLE[:Ttk]
+  Tk.__create_widget_set__(:Tile, :Ttk)
+
+  ############################################
+  #  depend on the version of Tcl/Tk
+  major, minor, type, patchlevel = TclTkLib.get_version
+
+  #  ttk::spinbox is supported on Tcl/Tk8.6b1 or later
+  if ([major,minor,type,patchlevel] <=> 
+        [8,6,TclTkLib::RELEASE_TYPE::BETA,1]) >= 0
+    @TOPLEVEL_ALIAS_TABLE[:Ttk].update(
+      :TkSpinbox => 'tkextlib/tile/tspinbox'
+    )
+  end
+
+  ################################################
+  # register some Ttk widgets as default
+  # (Ttk is a standard library on Tcl/Tk8.5+)
+  @TOPLEVEL_ALIAS_TABLE[:Ttk].each{|sym, file|
+    #unless Tk::TOPLEVEL_ALIASES.autoload?(sym) || Tk::TOPLEVEL_ALIASES.const_defined?(sym)
+    #   @TOPLEVEL_ALIAS_OWNER[sym] = :Ttk
+    #   Tk::TOPLEVEL_ALIASES.autoload(sym, file)
+    #end
+    Tk.__regist_toplevel_aliases__(:Ttk, file, sym)
+  }
+
+  ################################################
+
+  # @TOPLEVEL_ALIAS_SETUP_PROC[:Tile] =
+  #   @TOPLEVEL_ALIAS_SETUP_PROC[:Ttk] = proc{|mod|
+  #   unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile)
+  #     Object.autoload :Ttk, 'tkextlib/tile'
+  #     Tk.autoload :Tile, 'tkextlib/tile'
+  #   end
+  # }
+  Tk.__toplevel_alias_setup_proc__(:Ttk, :Tile){|mod|
+    unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile)
+      Object.autoload :Ttk, 'tkextlib/tile'
+      Tk.autoload :Tile, 'tkextlib/tile'
+    end
+  }
+end
diff --git a/ext/tk/lib/tk/validation.rb b/ext/tk/lib/tk/validation.rb
index 0c5b5c61b9..0ebd5c51b7 100644
--- a/ext/tk/lib/tk/validation.rb
+++ b/ext/tk/lib/tk/validation.rb
@@ -50,7 +50,8 @@ module Tk
       key2class.each{|key, klass|
         if keys[key].kind_of?(Array)
           cmd, *args = keys[key]
-          keys[key] = klass.new(cmd, args.join(' '))
+          #keys[key] = klass.new(cmd, args.join(' '))
+          keys[key] = klass.new(cmd, *args)
         # elsif keys[key].kind_of?(Proc) ||  keys[key].kind_of?(Method)
         elsif TkComm._callback_entry?(keys[key])
           keys[key] = klass.new(keys[key])
@@ -151,7 +152,8 @@ module Tk
       key2class.each{|key, klass|
         if keys[key].kind_of?(Array)
           cmd, *args = keys[key]
-          keys[key] = klass.new(cmd, args.join(' '))
+          #keys[key] = klass.new(cmd, args.join(' '))
+          keys[key] = klass.new(cmd, *args)
         # elsif keys[key].kind_of?(Proc) || keys[key].kind_of?(Method)
         elsif TkComm._callback_entry?(keys[key])
           keys[key] = klass.new(keys[key])
@@ -209,21 +211,21 @@ class TkValidateCommand
 
   class ValidateArgs < TkUtil::CallbackSubst
     KEY_TBL = [
-      [ ?d, ?n, :action ], 
-      [ ?i, ?x, :index ], 
-      [ ?s, ?e, :current ], 
-      [ ?v, ?s, :type ], 
-      [ ?P, ?e, :value ], 
-      [ ?S, ?e, :string ], 
-      [ ?V, ?s, :triggered ], 
-      [ ?W, ?w, :widget ], 
+      [ ?d, ?n, :action ],
+      [ ?i, ?x, :index ],
+      [ ?s, ?e, :current ],
+      [ ?v, ?s, :type ],
+      [ ?P, ?e, :value ],
+      [ ?S, ?e, :string ],
+      [ ?V, ?s, :triggered ],
+      [ ?W, ?w, :widget ],
       nil
     ]
 
     PROC_TBL = [
-      [ ?n, TkComm.method(:number) ], 
-      [ ?s, TkComm.method(:string) ], 
-      [ ?w, TkComm.method(:window) ], 
+      [ ?n, TkComm.method(:number) ],
+      [ ?s, TkComm.method(:string) ],
+      [ ?w, TkComm.method(:window) ],
 
       [ ?e, proc{|val|
           #enc = Tk.encoding
@@ -234,7 +236,7 @@ class TkValidateCommand
             TkComm::string(val)
           end
         }
-      ], 
+      ],
 
       [ ?x, proc{|val|
           idx = TkComm::number(val)
@@ -244,15 +246,33 @@ class TkValidateCommand
             idx
           end
         }
-      ], 
+      ],
 
       nil
     ]
 
+=begin
+    # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+    KEY_TBL.map!{|inf|
+      if inf.kind_of?(Array)
+        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+      end
+      inf
+    }
+
+    PROC_TBL.map!{|inf|
+      if inf.kind_of?(Array)
+        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+      end
+      inf
+    }
+=end
+
     _setup_subst_table(KEY_TBL, PROC_TBL);
 
     #
-    # NOTE: The order of parameters which passed to callback procedure is 
+    # NOTE: The order of parameters which passed to callback procedure is
     #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
     #
 
@@ -277,6 +297,7 @@ class TkValidateCommand
     extra_args_tbl = klass._get_extra_args_tbl
 
     if args.compact.size > 0
+      args.map!{|arg| klass._sym2subst(arg)}
       args = args.join(' ')
       keys = klass._get_subst_key(args)
       if cmd.kind_of?(String)
diff --git a/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb
index e5cacadc1a..0487b034bd 100644
--- a/ext/tk/lib/tk/variable.rb
+++ b/ext/tk/lib/tk/variable.rb
@@ -16,11 +16,22 @@ class TkVariable
   #TkVar_ID_TBL = {}
   TkVar_CB_TBL = TkCore::INTERP.create_table
   TkVar_ID_TBL = TkCore::INTERP.create_table
-  Tk_VARIABLE_ID = ["v".freeze, "00000".taint].freeze
-
-  #TkCore::INTERP.add_tk_procs('rb_var', 'args', 
+  (Tk_VARIABLE_ID = ["v".freeze, TkUtil.untrust("00000")]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+  TkCore::INTERP.init_ip_env{
+    TkVar_CB_TBL.mutex.synchronize{ TkVar_CB_TBL.clear }
+    TkVar_ID_TBL.mutex.synchronize{ TkVar_ID_TBL.clear }
+  }
+
+  major, minor, type, patchlevel = TclTkLib.get_version
+  USE_OLD_TRACE_OPTION_STYLE = (major < 8) || (major == 8 && minor < 4)
+
+  #TkCore::INTERP.add_tk_procs('rb_var', 'args',
   #     "ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
-TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
+  TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
     if {[set st [catch {eval {ruby_cmd TkVariable callback} $args} ret]] != 0} {
        set idx [string first "\n\n" $ret]
        if {$idx > 0} {
@@ -44,26 +55,30 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
   def TkVariable.callback(id, name1, name2, op)
     #name1,name2,op = tk_split_list(args)
     #name1,name2,op = tk_split_simplelist(args)
-    if TkVar_CB_TBL[id]
+    if cb_obj = TkVar_CB_TBL[id]
       #_get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
       begin
-        _get_eval_string(TkVar_CB_TBL[id].trace_callback(name2, op))
+        _get_eval_string(cb_obj.trace_callback(name2, op))
       rescue SystemExit
         exit(0)
       rescue Interrupt
         exit!(1)
       rescue Exception => e
         begin
-          msg = _toUTF8(e.class.inspect) + ': ' + 
-                _toUTF8(e.message) + "\n" + 
-                "\n---< backtrace of Ruby side >-----\n" + 
-                _toUTF8(e.backtrace.join("\n")) + 
+          msg = _toUTF8(e.class.inspect) + ': ' +
+                _toUTF8(e.message) + "\n" +
+                "\n---< backtrace of Ruby side >-----\n" +
+                _toUTF8(e.backtrace.join("\n")) +
                 "\n---< backtrace of Tk side >-------"
-          msg.instance_variable_set(:@encoding, 'utf-8')
+          if TkCore::WITH_ENCODING
+            msg.force_encoding('utf-8')
+          else
+            msg.instance_variable_set(:@encoding, 'utf-8')
+          end
         rescue Exception
-          msg = e.class.inspect + ': ' + e.message + "\n" + 
-                "\n---< backtrace of Ruby side >-----\n" + 
-                e.backtrace.join("\n") + 
+          msg = e.class.inspect + ': ' + e.message + "\n" +
+                "\n---< backtrace of Ruby side >-----\n" +
+                e.backtrace.join("\n") +
                 "\n---< backtrace of Tk side >-------"
         end
         fail(e, msg)
@@ -79,7 +94,7 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
         _get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
       rescue
         trace = $!.backtrace
-        raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" + 
+        raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
                   "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
       end
 =end
@@ -97,7 +112,7 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
   end
 
   #
-  # default_value is available only when the variable is an assoc array. 
+  # default_value is available only when the variable is an assoc array.
   #
   def default_value(val=nil, &b)
     if b
@@ -267,11 +282,15 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
   def initialize(val="", type=nil)
     # @id = Tk_VARIABLE_ID.join('')
     begin
-      @id = Tk_VARIABLE_ID.join(TkCore::INTERP._ip_id_)
-      Tk_VARIABLE_ID[1].succ!
+      Tk_VARIABLE_ID.mutex.synchronize{
+        @id = Tk_VARIABLE_ID.join(TkCore::INTERP._ip_id_)
+        Tk_VARIABLE_ID[1].succ!
+      }
     end until INTERP._invoke_without_enc('info', 'globals', @id).empty?
 
-    TkVar_ID_TBL[@id] = self
+    TkVar_ID_TBL.mutex.synchronize{
+      TkVar_ID_TBL[@id] = self
+    }
 
     @var  = @id
     @elem = nil
@@ -303,7 +322,7 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
 
 =begin
     if val == []
-      # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)', 
+      # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)',
       #                     @id, @id, @id))
     elsif val.kind_of?(Array)
       a = []
@@ -351,7 +370,7 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
       else
         INTERP._thread_vwait(@id)
       end
-    else 
+    else
       if check_root
         INTERP._invoke_without_enc('tkwait', 'variable', @id)
       else
@@ -402,7 +421,7 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
     else
       # array
       index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
-      TkComm.bool(tk_call('info', 'exist', "#{@id}")) && 
+      TkComm.bool(tk_call('info', 'exist', "#{@id}")) &&
         TkComm.bool(tk_call('info', 'exist', "#{@id}(#{index})"))
     end
   end
@@ -414,7 +433,7 @@ TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
     #tk_split_simplelist(INTERP._eval("global #{@id}; array get #{@id}"))
     INTERP._invoke_without_enc('global', @id)
     #tk_split_simplelist(INTERP._fromUTF8(INTERP._invoke_without_enc('array', 'names', @id)))
-    tk_split_simplelist(INTERP._invoke_without_enc('array', 'names', @id), 
+    tk_split_simplelist(INTERP._invoke_without_enc('array', 'names', @id),
                         false, true)
   end
 
@@ -465,9 +484,9 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
     if val.kind_of?(Hash)
       self.clear
       val.each{|k, v|
-        #INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(k)), 
+        #INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(k)),
         #                       _toUTF8(_get_eval_string(v)))
-        INTERP._set_global_var2(@id, _get_eval_string(k, true), 
+        INTERP._set_global_var2(@id, _get_eval_string(k, true),
                                 _get_eval_string(v, true))
       }
       self.value
@@ -475,11 +494,11 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
 =begin
       INTERP._set_global_var(@id, '')
       val.each{|v|
-        #INTERP._set_variable(@id, _toUTF8(_get_eval_string(v)), 
-        INTERP._set_variable(@id, _get_eval_string(v, true), 
-                             TclTkLib::VarAccessFlag::GLOBAL_ONLY   | 
+        #INTERP._set_variable(@id, _toUTF8(_get_eval_string(v)),
+        INTERP._set_variable(@id, _get_eval_string(v, true),
+                             TclTkLib::VarAccessFlag::GLOBAL_ONLY   |
                              TclTkLib::VarAccessFlag::LEAVE_ERR_MSG |
-                             TclTkLib::VarAccessFlag::APPEND_VALUE  | 
+                             TclTkLib::VarAccessFlag::APPEND_VALUE  |
                              TclTkLib::VarAccessFlag::LIST_ELEMENT)
       }
       self.value
@@ -516,9 +535,9 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
     val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
     index = args.collect{|idx| _get_eval_string(idx, true)}.join(',')
     _fromUTF8(INTERP._set_global_var2(@id, index, _get_eval_string(val, true)))
-    #_fromUTF8(INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(index)), 
+    #_fromUTF8(INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(index)),
     #                                 _toUTF8(_get_eval_string(val))))
-    #_fromUTF8(INTERP._set_global_var2(@id, _get_eval_string(index, true), 
+    #_fromUTF8(INTERP._set_global_var2(@id, _get_eval_string(index, true),
     #                                 _get_eval_string(val, true)))
   end
 
@@ -543,7 +562,7 @@ else
       #INTERP._eval(Kernel.format('set %s', @id))
       #INTERP._invoke_without_enc('set', @id)
     rescue
-      if INTERP._eval(Kernel.format('global %s; array exists %s', 
+      if INTERP._eval(Kernel.format('global %s; array exists %s',
                             @id, @id)) != "1"
       #if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
       #if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
@@ -564,7 +583,7 @@ else
       #INTERP._eval(Kernel.format('set %s %s', @id, s))
       #_fromUTF8(INTERP._invoke_without_enc('set', @id, _toUTF8(s)))
     rescue
-      if INTERP._eval(Kernel.format('global %s; array exists %s', 
+      if INTERP._eval(Kernel.format('global %s; array exists %s',
                             @id, @id)) != "1"
       #if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
       #if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
@@ -572,7 +591,7 @@ else
       else
         if val == []
           INTERP._eval(Kernel.format('global %s; unset %s; set %s(0) 0; unset %s(0)', @id, @id, @id, @id))
-          #INTERP._eval(Kernel.format('unset %s; set %s(0) 0; unset %s(0)', 
+          #INTERP._eval(Kernel.format('unset %s; set %s(0) 0; unset %s(0)',
           #                          @id, @id, @id))
           #INTERP._invoke_without_enc('unset', @id)
           #INTERP._invoke_without_enc('set', @id+'(0)', 0)
@@ -582,9 +601,9 @@ else
           val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e, true))}
           #s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
           s = '"' + a.join(" ").gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s', 
+          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
                                      @id, @id, @id, s))
-          #INTERP._eval(Kernel.format('unset %s; array set %s %s', 
+          #INTERP._eval(Kernel.format('unset %s; array set %s %s',
           #                          @id, @id, s))
           #INTERP._invoke_without_enc('unset', @id)
           #_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
@@ -593,9 +612,9 @@ else
           #                      .gsub(/[\[\]$"]/, '\\\\\&') + '"'
           s = '"' + val.to_a.collect{|e| array2tk_list(e, true)}.join(" ")\
                                 .gsub(/[\[\]$\\"]/, '\\\\\&') + '"'
-          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s', 
+          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
                                      @id, @id, @id, s))
-          #INTERP._eval(Kernel.format('unset %s; array set %s %s', 
+          #INTERP._eval(Kernel.format('unset %s; array set %s %s',
           #                          @id, @id, s))
           #INTERP._invoke_without_enc('unset', @id)
           #_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
@@ -621,7 +640,7 @@ else
       end
     end
     #INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
-    #INTERP._eval(Kernel.format('global %s; set %s(%s)', 
+    #INTERP._eval(Kernel.format('global %s; set %s(%s)',
     #                           @id, @id, _get_eval_string(index)))
     #INTERP._eval(Kernel.format('set %s(%s)', @id, _get_eval_string(index)))
     #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ')')
@@ -632,13 +651,13 @@ else
     type = default_element_value_type(args)
     val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
     index = args.collect{|idx| _get_eval_string(idx)}.join(',')
-    INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id, 
+    INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
                               index, _get_eval_string(val)))
-    #INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id, 
+    #INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
     #                          _get_eval_string(index), _get_eval_string(val)))
-    #INTERP._eval(Kernel.format('set %s(%s) %s', @id, 
+    #INTERP._eval(Kernel.format('set %s(%s) %s', @id,
     #                          _get_eval_string(index), _get_eval_string(val)))
-    #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ') ' + 
+    #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ') ' +
     #            _get_eval_string(val))
   end
 
@@ -650,7 +669,7 @@ else
     else
       index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
       INTERP._eval(Kernel.format('global %s; unset %s(%s)', @id, @id, index))
-      #INTERP._eval(Kernel.format('global %s; unset %s(%s)', 
+      #INTERP._eval(Kernel.format('global %s; unset %s(%s)',
       #                           @id, @id, _get_eval_string(elem)))
       #INTERP._eval(Kernel.format('unset %s(%s)', @id, tk_tcl2ruby(elem)))
       #INTERP._eval('unset ' + @id + '(' + _get_eval_string(elem) + ')')
@@ -675,6 +694,14 @@ end
     self
   end
 
+  def to_hash
+    hash = {}
+    self.keys.each{|k|
+      hash[k] = self[k]
+    }
+    hash
+  end
+
   def set_element_value(idxs, val)
     if idxs.kind_of?(Array)
       self[*idxs]=val
@@ -902,9 +929,20 @@ end
     self.set_proceure_element(idxs, cmd)
   end
 
+  def to_proc
+    cmd = self.procedure
+    if cmd.respond_to?(:call)
+      cmd
+    else
+      # cmd is a String
+      cmd.to_sym.to_proc
+    end
+  end
+
   def to_i
     number(_value).to_i
   end
+  alias to_int to_i
   def element_to_i(*idxs)
     number(_element_value(*idxs)).to_i
   end
@@ -921,6 +959,7 @@ end
     _value
   end
   alias string to_s
+  alias to_str to_s
   def element_to_s(*idxs)
     _element_value(*idxs)
   end
@@ -992,6 +1031,7 @@ end
     tk_split_simplelist(_value)
   end
   alias to_a list
+  alias to_ary list
   def list_element(*idxs)
     tk_split_simplelist(_element_value(*idxs))
   end
@@ -1124,10 +1164,8 @@ end
       [other, self.to_s]
     when Symbol
       [other, self.to_sym]
-    when Integer
-      [other, self.to_i]
-    when Float
-      [other, self.to_f]
+    when Numeric
+      [other, self.numeric]
     when Array
       [other, self.to_a]
     else
@@ -1135,6 +1173,13 @@ end
     end
   end
 
+  def +@
+    self.numeric
+  end
+  def -@
+    -(self.numeric)
+  end
+
   def &(other)
     if other.kind_of?(Array)
       self.to_a & other.to_a
@@ -1171,7 +1216,7 @@ end
     end
   end
   def *(other)
-    num_or_str(self._value) * other.to_i
+    num_or_str(self._value) * other
     #begin
     #  number(self._value) * other
     #rescue
@@ -1182,7 +1227,7 @@ end
     number(self._value) / other
   end
   def %(other)
-    num_or_str(self._value) % other.to_i
+    num_or_str(self._value) % other
     #begin
     #  number(self._value) % other
     #rescue
@@ -1220,6 +1265,14 @@ end
     end
   end
 
+  def ===(other)
+    if other.kind_of?(TkVariable)
+      self.id == other.id
+    else
+      super
+    end
+  end
+
   def zero?
     numeric.zero?
   end
@@ -1263,281 +1316,365 @@ end
     end
   end
 
+  def _check_trace_opt(opts)
+    if opts.kind_of?(Array)
+      opt_str = opts.map{|s| s.to_s}.join(' ')
+    else
+      opt_str = opts.to_s
+    end
+
+    fail ArgumentError, 'null trace option' if opt_str.empty?
+
+    if opt_str =~ /[^arwu\s]/
+      # new format (Tcl/Tk8.4+?)
+      if opts.kind_of?(Array)
+        opt_ary = opts.map{|opt| opt.to_s.strip}
+      else
+        opt_ary = opt_str.split(/\s+|\|/)
+        opt_ary.delete('')
+      end
+      if USE_OLD_TRACE_OPTION_STYLE
+        opt_ary.uniq.map{|opt|
+          case opt
+          when 'array'
+            'a'
+          when 'read'
+            'r'
+          when 'write'
+            'w'
+          when 'unset'
+            'u'
+          else
+            fail ArgumentError, "unsupported trace option '#{opt}' on Tcl/Tk#{Tk::TCL_PATCHLEVEL}"
+          end
+        }.join
+      else
+        opt_ary
+      end
+    else
+      # old format
+      opt_ary = opt_str.delete('^arwu').split(//).uniq
+      if USE_OLD_TRACE_OPTION_STYLE
+        opt_ary.join
+      else
+        opt_ary.map{|c|
+          case c
+          when 'a'
+            'array'
+          when 'r'
+            'read'
+          when 'w'
+            'write'
+          when 'u'
+            'unset'
+          end
+        }
+      end
+    end
+  end
+  private :_check_trace_opt
+
   def trace(opts, cmd = Proc.new)
-    @trace_var = [] if @trace_var == nil
-    #opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
-    opts = opts.to_s
-    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
-    @trace_var.unshift([opts,cmd])
+    opts = _check_trace_opt(opts)
+    (@trace_var ||= []).unshift([opts,cmd])
+
     if @trace_opts == nil
       TkVar_CB_TBL[@id] = self
       @trace_opts = opts.dup
-      Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
-                             'rb_var ' << @id)
-=begin
-      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-        # TCL_VERSION >= 8.4
-        Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                               @id, @trace_opts, 'rb_var')
+      if USE_OLD_TRACE_OPTION_STYLE
+        Tk.tk_call_without_enc('trace', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
       else
-        # TCL_VERSION <= 8.3
-        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 'rb_var')
+        Tk.tk_call_without_enc('trace', 'add', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
       end
-=end
     else
       newopts = @trace_opts.dup
-      #opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
-      opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
-      if newopts != @trace_opts
-        Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
-                               'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
-                               'rb_var ' << @id)
-=begin
-        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-          # TCL_VERSION >= 8.4
-          Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
+      if USE_OLD_TRACE_OPTION_STYLE
+        opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
+        if newopts != @trace_opts
+          Tk.tk_call_without_enc('trace', 'vdelete',
+                                 @id, @trace_opts, 'rb_var ' << @id)
           @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
-        else
-          # TCL_VERSION <= 8.3
-          Tk.tk_call_without_enc('trace', 'vdelete', 
-                                 @id, @trace_opts, 'rb_var')
+          Tk.tk_call_without_enc('trace', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
+        end
+      else
+        newopts |= opts
+        unless (newopts - @trace_opts).empty?
+          Tk.tk_call_without_enc('trace', 'remove', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
           @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
+          Tk.tk_call_without_enc('trace', 'add', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
         end
-=end
       end
     end
+
     self
   end
 
   def trace_element(elem, opts, cmd = Proc.new)
     if @elem
-      fail(RuntimeError, 
+      fail(RuntimeError,
            "invalid for a TkVariable which denotes an element of Tcl's array")
     end
-    @trace_elem = {} if @trace_elem == nil
-    @trace_elem[elem] = [] if @trace_elem[elem] == nil
-    opts = opts.to_s
-    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
-    @trace_elem[elem].unshift([opts,cmd])
+
+    opts = _check_trace_opt(opts)
+
+    ((@trace_elem ||= {})[elem] ||= []).unshift([opts,cmd])
+
     if @trace_opts == nil
       TkVar_CB_TBL[@id] = self
       @trace_opts = opts.dup
-      Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
-                             'rb_var ' << @id)
-=begin
-      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-        # TCL_VERSION >= 8.4
-        Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                               @id, @trace_opts, 'rb_var')
+      if USE_OLD_TRACE_OPTION_STYLE
+        Tk.tk_call_without_enc('trace', 'add', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
       else
-        # TCL_VERSION <= 8.3
-        Tk.tk_call_without_enc('trace', 'variable', 
-                               @id, @trace_opts, 'rb_var')
+        Tk.tk_call_without_enc('trace', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
       end
-=end
     else
       newopts = @trace_opts.dup
-      # opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
-      opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
-      if newopts != @trace_opts
-        Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
-                               'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
-                               'rb_var ' << @id)
-=begin
-        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-          # TCL_VERSION >= 8.4
-          Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
+      if USE_OLD_TRACE_OPTION_STYLE
+        opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
+        if newopts != @trace_opts
+          Tk.tk_call_without_enc('trace', 'vdelete',
+                                 @id, @trace_opts, 'rb_var ' << @id)
           @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
-        else
-          # TCL_VERSION <= 8.3
-          Tk.tk_call_without_enc('trace', 'vdelete', 
-                                 @id, @trace_opts, 'rb_var')
+          Tk.tk_call_without_enc('trace', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
+        end
+      else
+        newopts |= opts
+        unless (newopts - @trace_opts).empty?
+          Tk.tk_call_without_enc('trace', 'remove', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
           @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
+          Tk.tk_call_without_enc('trace', 'add', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
         end
-=end
       end
     end
+
     self
   end
 
-  def trace_vinfo
+  def trace_info
     return [] unless @trace_var
     @trace_var.dup
   end
+  alias trace_vinfo trace_info
 
-  def _trace_vinfo_for_element(elem)
+  def trace_info_for_element(elem)
     if @elem
-      fail(RuntimeError, 
+      fail(RuntimeError,
            "invalid for a TkVariable which denotes an element of Tcl's array")
     end
     return [] unless @trace_elem
     return [] unless @trace_elem[elem]
     @trace_elem[elem].dup
   end
+  alias trace_vinfo_for_element trace_info_for_element
 
-  def trace_vdelete(opts,cmd)
+  def trace_remove(opts,cmd)
     return self unless @trace_var.kind_of? Array
-    opts = opts.to_s
-    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+
+    opts = _check_trace_opt(opts)
+
     idx = -1
-    newopts = ''
-    @trace_var.each_with_index{|e,i| 
-      if idx < 0 && e[0] == opts && e[1] == cmd
-        idx = i
-        next
-      end
-      # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
-      e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
-    }
+    if USE_OLD_TRACE_OPTION_STYLE
+      newopts = ''
+      @trace_var.each_with_index{|e, i|
+        if idx < 0 && e[1] == cmd
+          diff = false
+          ['a', 'r', 'w', 'u'].each{|c|
+            break if (diff = e[0].index(c) ^ opts.index(c))
+          }
+          unless diff
+            #find
+            idx = i
+            next
+          end
+        end
+        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
+      }
+    else
+      newopts = []
+      @trace_var.each_with_index{|e, i|
+        if idx < 0 && e[1] == cmd &&
+            e[0].size == opts.size && (e[0] - opts).empty?
+          # find
+          idx = i
+          next
+        end
+        newopts |= e[0]
+      }
+    end
+
     if idx >= 0
-      @trace_var.delete_at(idx) 
+      @trace_var.delete_at(idx)
     else
       return self
     end
 
-    @trace_elem.each{|elem|
+    (@trace_elem ||= {}).each{|elem|
       @trace_elem[elem].each{|e|
-        # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
-        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+        if USE_OLD_TRACE_OPTION_STYLE
+          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
+        else
+          newopts |= e[0]
+        end
       }
     }
 
-    newopts = newopts.to_s
-    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
-    if newopts != @trace_opts
-      Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
-                             'rb_var ' << @id)
-=begin
-      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-        # TCL_VERSION >= 8.4
-        Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                               @id, @trace_opts, 'rb_var')
-      else
-        # TCL_VERSION <= 8.3
-        Tk.tk_call_without_enc('trace', 'vdelete', 
-                               @id, @trace_opts, 'rb_var')
+    if USE_OLD_TRACE_OPTION_STYLE
+      diff = false
+      @trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
+      if diff
+        Tk.tk_call_without_enc('trace', 'vdelete',
+                               @id, @trace_opts, 'rb_var ' << @id)
+        @trace_opts.replace(newopts)
+        unless @trace_opts.empty?
+          Tk.tk_call_without_enc('trace', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
+        end
       end
-=end
-      @trace_opts.replace(newopts)
-      if @trace_opts != ''
-        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
-                               'rb_var ' << @id)
-=begin
-        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-          # TCL_VERSION >= 8.4
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
-        else
-          # TCL_VERSION <= 8.3
-          Tk.tk_call_without_enc('trace', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
+    else
+      unless (@trace_opts - newopts).empty?
+        Tk.tk_call_without_enc('trace', 'remove', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
+        @trace_opts.replace(newopts)
+        unless @trace_opts.empty?
+          Tk.tk_call_without_enc('trace', 'add', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
         end
-=end
       end
     end
 
     self
   end
+  alias trace_delete  trace_remove
+  alias trace_vdelete trace_remove
 
-  def trace_vdelete_for_element(elem,opts,cmd)
+  def trace_remove_for_element(elem,opts,cmd)
     if @elem
-      fail(RuntimeError, 
+      fail(RuntimeError,
            "invalid for a TkVariable which denotes an element of Tcl's array")
     end
     return self unless @trace_elem.kind_of? Hash
     return self unless @trace_elem[elem].kind_of? Array
-    opts = opts.to_s
-    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+
+    opts = _check_trace_opt(opts)
+
     idx = -1
-    @trace_elem[elem].each_with_index{|e,i| 
-      if idx < 0 && e[0] == opts && e[1] == cmd
-        idx = i
-        next
-      end
-    }
+    if USE_OLD_TRACE_OPTION_STYLE
+      @trace_elem[elem].each_with_index{|e, i|
+        if idx < 0 && e[1] == cmd
+          diff = false
+          ['a', 'r', 'w', 'u'].each{|c|
+            break if (diff = e[0].index(c) ^ opts.index(c))
+          }
+          unless diff
+            #find
+            idx = i
+            next
+          end
+        end
+      }
+    else
+      @trace_elem[elem].each_with_index{|e, i|
+        if idx < 0 && e[1] == cmd &&
+            e[0].size == opts.size && (e[0] - opts).empty?
+          # find
+          idx = i
+          next
+        end
+      }
+    end
+
     if idx >= 0
       @trace_elem[elem].delete_at(idx)
     else
       return self
     end
 
-    newopts = ''
-    @trace_var.each{|e| 
-      # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
-      e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
-    }
-    @trace_elem.each{|elem|
-      @trace_elem[elem].each{|e|
-        # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
-        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+    if USE_OLD_TRACE_OPTION_STYLE
+      newopts = ''
+      @trace_var.each{|e|
+        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
       }
-    }
+      @trace_elem.each{|elem|
+        @trace_elem[elem].each{|e|
+          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
+        }
+      }
+    else
+      newopts = []
+      @trace_var.each{|e|
+        newopts |= e[0]
+      }
+      @trace_elem.each{|elem|
+        @trace_elem[elem].each{|e|
+          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
+        }
+      }
+    end
 
-    newopts = newopts.to_s
-    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
-    if newopts != @trace_opts
-      Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
-                             'rb_var ' << @id)
-=begin
-      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-        # TCL_VERSION >= 8.4
-        Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                               @id, @trace_opts, 'rb_var')
-      else
-        # TCL_VERSION <= 8.3
-        Tk.tk_call_without_enc('trace', 'vdelete', 
-                               @id, @trace_opts, 'rb_var')
+    if USE_OLD_TRACE_OPTION_STYLE
+      diff = false
+      @trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
+      if diff
+        Tk.tk_call_without_enc('trace', 'vdelete',
+                               @id, @trace_opts, 'rb_var ' << @id)
+        @trace_opts.replace(newopts)
+        unless @trace_opts.empty?
+          Tk.tk_call_without_enc('trace', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
+        end
       end
-=end
-      @trace_opts.replace(newopts)
-      if @trace_opts != ''
-        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
-                               'rb_var ' << @id)
-=begin
-        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
-          # TCL_VERSION >= 8.4
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var')
-        else
-          # TCL_VERSION <= 8.3
-          Tk.tk_call_without_enc('trace', 'variable', @id, 
-                                 @trace_opts, 'rb_var')
+    else
+      unless (@trace_opts - newopts).empty?
+        Tk.tk_call_without_enc('trace', 'remove', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
+        @trace_opts.replace(newopts)
+        unless @trace_opts.empty?
+          Tk.tk_call_without_enc('trace', 'add', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
         end
-=end
       end
     end
 
     self
   end
+  alias trace_delete_for_element  trace_remove_for_element
+  alias trace_vdelete_for_element trace_remove_for_element
 end
 
 class TkVarAccess<TkVariable
   def self.new(name, *args)
     if name.kind_of?(TkVariable)
       name.value = args[0] unless args.empty?
-      return name 
+      return name
     end
 
-    if v = TkVar_ID_TBL[name]
-      v.value = args[0] unless args.empty?
-      return v
-    end
+    name = name.to_s
+    v = nil
+    TkVar_ID_TBL.mutex.synchronize{
+      if v = TkVar_ID_TBL[name]
+        v.value = args[0] unless args.empty?
+        return v
+      else
+        (v = self.allocate).instance_eval{
+          @id = name
+          TkVar_ID_TBL[@id] = self
+          @var = @id
+        }
+      end
+    }
 
-    super(name, *args)
+    v.instance_eval{ initialize(name, *args) }
+    v
   end
 
   def self.new_hash(name, *args)
@@ -1546,30 +1683,41 @@ class TkVarAccess<TkVariable
         fail ArgumentError, "already exist as a scalar variable"
       end
       name.value = args[0] unless args.empty?
-      return name 
+      return name
     end
 
-    if v = TkVar_ID_TBL[name]
-      unless v.is_hash?
-        fail ArgumentError, "already exist as a scalar variable"
+    name = name.to_s
+    v = nil
+    TkVar_ID_TBL.mutex.synchronize{
+      if v = TkVar_ID_TBL[name]
+        unless v.is_hash?
+          fail ArgumentError, "already exist as a scalar variable"
+        end
+        v.value = args[0] unless args.empty?
+        return v
+      else
+        (v = self.allocate).instance_eval{
+          @id = name
+          TkVar_ID_TBL[@id] = self
+          @var = @id
+        }
       end
-      v.value = args[0] unless args.empty?
-      return v
-    end
+    }
 
     INTERP._invoke_without_enc('global', name)
     if args.empty? && INTERP._invoke_without_enc('array', 'exist', name) == '0'
-      self.new(name, {})  # force creating
+      v.instance_eval{ initialize(name, {}) }  # force creating
     else
-      self.new(name, *args)
+      v.instance_eval{ initialize(name, *args) }
     end
+    v
   end
 
   def initialize(varname, val=nil)
-    @id = varname
-    TkVar_ID_TBL[@id] = self
+    # @id = varname
+    # TkVar_ID_TBL[@id] = self
 
-    @var  = @id
+    # @var  = @id
     @elem = nil
 
     @def_default = false
diff --git a/ext/tk/lib/tk/virtevent.rb b/ext/tk/lib/tk/virtevent.rb
index d47e80aecd..c11e9692e7 100644
--- a/ext/tk/lib/tk/virtevent.rb
+++ b/ext/tk/lib/tk/virtevent.rb
@@ -9,10 +9,17 @@ class TkVirtualEvent<TkObject
 
   TkCommandNames = ['event'.freeze].freeze
 
-  TkVirtualEventID = ["VirtEvent".freeze, "00000".taint].freeze
+  (TkVirtualEventID = ["VirtEvent".freeze, TkUtil.untrust("00000")]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
   TkVirtualEventTBL = TkCore::INTERP.create_table
 
-  TkCore::INTERP.init_ip_env{ TkVirtualEventTBL.clear }
+  TkCore::INTERP.init_ip_env{
+    TkVirtualEventTBL.mutex.synchronize{ TkVirtualEventTBL.clear }
+  }
 
   class PreDefVirtEvent<self
     def self.new(event, *sequences)
@@ -21,22 +28,30 @@ class TkVirtualEvent<TkObject
       elsif event !~ /^<.*>$/
         event = '<' + event + '>'
       end
-      if TkVirtualEvent::TkVirtualEventTBL.has_key?(event)
-        TkVirtualEvent::TkVirtualEventTBL[event]
-      else
-        super(event, *sequences)
-      end
+      TkVirtualEvent::TkVirtualEventTBL.mutex.synchronize{
+        if TkVirtualEvent::TkVirtualEventTBL.has_key?(event)
+          TkVirtualEvent::TkVirtualEventTBL[event]
+        else
+          # super(event, *sequences)
+          (obj = self.allocate).instance_eval{
+            initialize(event, *sequences)
+            TkVirtualEvent::TkVirtualEventTBL[@id] = self
+          }
+        end
+      }
     end
 
     def initialize(event, *sequences)
       @path = @id = event
-      TkVirtualEvent::TkVirtualEventTBL[@id] = self
-      add(*sequences)
+      _add_sequences(sequences)
     end
   end
 
   def TkVirtualEvent.getobj(event)
-    obj = TkVirtualEventTBL[event]
+    obj = nil
+    TkVirtualEventTBL.mutex.synchronize{
+      obj = TkVirtualEventTBL[event]
+    }
     if obj
       obj
     else
@@ -55,40 +70,58 @@ class TkVirtualEvent<TkObject
   end
 
   def initialize(*sequences)
-    # @path = @id = '<' + TkVirtualEventID.join('') + '>'
-    @path = @id = '<' + TkVirtualEventID.join(TkCore::INTERP._ip_id_) + '>'
-    TkVirtualEventID[1].succ!
-    add(*sequences)
+    TkVirtualEventID.mutex.synchronize{
+      # @path = @id = '<' + TkVirtualEventID.join('') + '>'
+      @path = @id = '<' + TkVirtualEventID.join(TkCore::INTERP._ip_id_) + '>'
+      TkVirtualEventID[1].succ!
+    }
+    _add_sequences(sequences)
   end
 
-  def add(*sequences)
-    if sequences != []
-      tk_call_without_enc('event', 'add', "<#{@id}>", 
-                          *(sequences.collect{|seq| 
+  def _add_sequences(seq_ary)
+    unless seq_ary.empty?
+      tk_call_without_enc('event', 'add', "<#{@id}>",
+                          *(seq_ary.collect{|seq|
                               "<#{tk_event_sequence(seq)}>"
                             }) )
-      TkVirtualEventTBL[@id] = self
+    end
+    self
+  end
+  private :_add_sequences
+
+  def add(*sequences)
+    if sequences != []
+      _add_sequences(sequences)
+      TkVirtualEventTBL.mutex.synchronize{
+        TkVirtualEventTBL[@id] = self
+      }
     end
     self
   end
 
   def delete(*sequences)
-    if sequences == []
+    if sequences.empty?
       tk_call_without_enc('event', 'delete', "<#{@id}>")
-      TkVirtualEventTBL.delete(@id)
+      TkVirtualEventTBL.mutex.synchronize{
+        TkVirtualEventTBL.delete(@id)
+      }
     else
-      tk_call_without_enc('event', 'delete', "<#{@id}>", 
-                          *(sequences.collect{|seq| 
+      tk_call_without_enc('event', 'delete', "<#{@id}>",
+                          *(sequences.collect{|seq|
                               "<#{tk_event_sequence(seq)}>"
                             }) )
-      TkVirtualEventTBL.delete(@id) if info == []
+      if tk_call_without_enc('event','info',"<#{@id}>").empty?
+        TkVirtualEventTBL.mutex.synchronize{
+          TkVirtualEventTBL.delete(@id)
+        }
+      end
     end
     self
   end
 
   def info
     tk_call_without_enc('event','info',"<#{@id}>").split(/\s+/).collect!{|seq|
-      l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
+      lst = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
         case (subseq)
         when /^<<[^<>]+>>$/
           TkVirtualEvent.getobj(subseq[1..-2])
@@ -98,7 +131,7 @@ class TkVirtualEvent<TkObject
           subseq.split('')
         end
       }.flatten
-      (l.size == 1) ? l[0] : l
+      (lst.size == 1) ? lst[0] : lst
     }
   end
 end
diff --git a/ext/tk/lib/tk/winfo.rb b/ext/tk/lib/tk/winfo.rb
index c649b4a0c9..b10cfe6760 100644
--- a/ext/tk/lib/tk/winfo.rb
+++ b/ext/tk/lib/tk/winfo.rb
@@ -14,7 +14,7 @@ module TkWinfo
 
   def TkWinfo.atom(name, win=nil)
     if win
-      number(tk_call_without_enc('winfo', 'atom', '-displayof', win, 
+      number(tk_call_without_enc('winfo', 'atom', '-displayof', win,
                                  _get_eval_enc_str(name)))
     else
       number(tk_call_without_enc('winfo', 'atom', _get_eval_enc_str(name)))
@@ -26,7 +26,7 @@ module TkWinfo
 
   def TkWinfo.atomname(id, win=nil)
     if win
-      _fromUTF8(tk_call_without_enc('winfo', 'atomname', 
+      _fromUTF8(tk_call_without_enc('winfo', 'atomname',
                                     '-displayof', win, id))
     else
       _fromUTF8(tk_call_without_enc('winfo', 'atomname', id))
@@ -67,7 +67,7 @@ module TkWinfo
 
   def TkWinfo.containing(rootX, rootY, win=nil)
     if win
-      window(tk_call_without_enc('winfo', 'containing', 
+      window(tk_call_without_enc('winfo', 'containing',
                                  '-displayof', win, rootX, rootY))
     else
       window(tk_call_without_enc('winfo', 'containing', rootX, rootY))
@@ -128,7 +128,7 @@ module TkWinfo
                           false, true)
     else
       #tk_split_simplelist(tk_call_without_enc('winfo', 'interps'))
-      tk_split_simplelist(tk_call_without_enc('winfo', 'interps'), 
+      tk_split_simplelist(tk_call_without_enc('winfo', 'interps'),
                           false, true)
     end
   end
@@ -303,7 +303,7 @@ module TkWinfo
 
   def TkWinfo.visualsavailable(win, includeids=false)
     if includeids
-      list(tk_call_without_enc('winfo', 'visualsavailable', 
+      list(tk_call_without_enc('winfo', 'visualsavailable',
                                win, "includeids"))
     else
       list(tk_call_without_enc('winfo', 'visualsavailable', win))
diff --git a/ext/tk/lib/tk/winpkg.rb b/ext/tk/lib/tk/winpkg.rb
index 737fb959b5..80e0439ace 100644
--- a/ext/tk/lib/tk/winpkg.rb
+++ b/ext/tk/lib/tk/winpkg.rb
@@ -7,9 +7,15 @@
 #
 require 'tk'
 
-module TkWinDDE
+module Tk::WinDDE
+end
+#TkWinDDE = Tk::WinDDE
+#Tk.__set_toplevel_aliases__(:Tk, Tk::WinDDE, :TkWinDDE)
+Tk.__set_loaded_toplevel_aliases__('tk/winpkg.rb', :Tk, Tk::WinDDE, :TkWinDDE)
+
+module Tk::WinDDE
   extend Tk
-  extend TkWinDDE
+  extend Tk::WinDDE
 
   TkCommandNames = ['dde'.freeze].freeze
 
@@ -40,7 +46,7 @@ module TkWinDDE
         elsif args.size == 0
           tk_call('dde', 'servername', force, exact, *hash_kv(keys))
         else
-          tk_call('dde', 'servername', force, exact, 
+          tk_call('dde', 'servername', force, exact,
                   *((hash_kv(keys) << '--') + args))
         end
       else
@@ -81,13 +87,20 @@ module TkWinDDE
     tk_call('dde', 'eval', -async, topic, cmd, *args)
   end
 
-  module_function :servername, :execute, :async_execute, 
+  module_function :servername, :execute, :async_execute,
                   :poke, :request, :services, :eval
 end
 
-module TkWinRegistry
+module Tk::WinRegistry
+end
+#TkWinRegistry = Tk::WinRegistry
+#Tk.__set_toplevel_aliases__(:Tk, Tk::WinRegistry, :TkWinRegistry)
+Tk.__set_loaded_toplevel_aliases__('tk/winpkg.rb', :Tk, Tk::WinRegistry,
+                                   :TkWinRegistry)
+
+module Tk::WinRegistry
   extend Tk
-  extend TkWinRegistry
+  extend Tk::WinRegistry
 
   TkCommandNames = ['registry'.freeze].freeze
 
diff --git a/ext/tk/lib/tk/wm.rb b/ext/tk/lib/tk/wm.rb
index 1f432a3848..b1a2ed886a 100644
--- a/ext/tk/lib/tk/wm.rb
+++ b/ext/tk/lib/tk/wm.rb
@@ -5,273 +5,407 @@ require 'tk'
 
 module Tk
   module Wm
-    include TkComm
+    #include TkComm
+    extend TkCore
 
     TkCommandNames = ['wm'.freeze].freeze
 
     TOPLEVEL_METHODCALL_OPTKEYS = {}
 
-    def aspect(*args)
+    def Wm.aspect(win, *args)
       if args.length == 0
-        list(tk_call_without_enc('wm', 'aspect', path))
+        list(tk_call_without_enc('wm', 'aspect', win.epath))
       else
         args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call('wm', 'aspect', path, *args)
-        self
+        tk_call('wm', 'aspect', win.epath, *args)
+        win
       end
     end
+    def aspect(*args)
+      Wm.aspect(self, *args)
+    end
+    alias wm_aspect aspect
     TOPLEVEL_METHODCALL_OPTKEYS['aspect'] = 'aspect'
 
-    def attributes(slot=nil,value=None)
+    def Wm.attributes(win, slot=nil,value=TkComm::None)
       if slot == nil
-        lst = tk_split_list(tk_call('wm', 'attributes', path))
+        lst = tk_split_list(tk_call('wm', 'attributes', win.epath))
         info = {}
         while key = lst.shift
           info[key[1..-1]] = lst.shift
         end
         info
       elsif slot.kind_of? Hash
-        tk_call('wm', 'attributes', path, *hash_kv(slot))
-        self
-      elsif value == None
-        tk_call('wm', 'attributes', path, "-#{slot}")
+        tk_call('wm', 'attributes', win.epath, *hash_kv(slot))
+        win
+      elsif value == TkComm::None
+        tk_call('wm', 'attributes', win.epath, "-#{slot}")
       else
-        tk_call('wm', 'attributes', path, "-#{slot}", value)
-        self
+        tk_call('wm', 'attributes', win.epath, "-#{slot}", value)
+        win
       end
     end
+    def attributes(slot=nil,value=TkComm::None)
+      Wm.attributes(self, slot, value)
+    end
+    alias wm_attributes attributes
     TOPLEVEL_METHODCALL_OPTKEYS['attributes'] = 'attributes'
 
-    def client(name=None)
-      if name == None
-        tk_call('wm', 'client', path)
+    def Wm.client(win, name=TkComm::None)
+      if name == TkComm::None
+        tk_call('wm', 'client', win.epath)
       else
         name = '' if name == nil
-        tk_call('wm', 'client', path, name)
-        self
+        tk_call('wm', 'client', win.epath, name)
+        win
       end
     end
+    def client(name=TkComm::None)
+      Wm.client(self, name)
+    end
+    alias wm_client client
     TOPLEVEL_METHODCALL_OPTKEYS['client'] = 'client'
 
-    def colormapwindows(*args)
+    def Wm.colormapwindows(win, *args)
       if args.size == 0
-        list(tk_call_without_enc('wm', 'colormapwindows', path))
+        list(tk_call_without_enc('wm', 'colormapwindows', win.epath))
       else
         args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'colormapwindows', path, *args)
-        self
+        tk_call_without_enc('wm', 'colormapwindows', win.epath, *args)
+        win
       end
     end
+    def colormapwindows(*args)
+      Wm.colormapwindows(self, *args)
+    end
+    alias wm_colormapwindows colormapwindows
     TOPLEVEL_METHODCALL_OPTKEYS['colormapwindows'] = 'colormapwindows'
 
-    def wm_command(value=nil)
+    def Wm.command(win, value=nil)
       if value
-        tk_call('wm', 'command', path, value)
-        self
+        tk_call('wm', 'command', epath, value)
+        win
       else
-        #procedure(tk_call('wm', 'command', path))
-        tk_call('wm', 'command', path)
+        #procedure(tk_call('wm', 'command', epath))
+        tk_call('wm', 'command', epath)
       end
     end
+    def wm_command(value=nil)
+      Wm.command(self, value)
+    end
     TOPLEVEL_METHODCALL_OPTKEYS['wm_command'] = 'wm_command'
 
-    def deiconify(ex = true)
+    def Wm.deiconify(win, ex = true)
       if ex
-        tk_call_without_enc('wm', 'deiconify', path)
+        tk_call_without_enc('wm', 'deiconify', win.epath)
       else
-        self.iconify
+        Wm.iconify(win)
       end
-      self
+      win
     end
+    def deiconify(ex = true)
+      Wm.deiconify(self, ex)
+    end
+    alias wm_deiconify deiconify
 
-    def focusmodel(mode = nil)
+    def Wm.focusmodel(win, mode = nil)
       if mode
-        tk_call_without_enc('wm', 'focusmodel', path, mode)
-        self
+        tk_call_without_enc('wm', 'focusmodel', win.epath, mode)
+        win
       else
-        tk_call_without_enc('wm', 'focusmodel', path)
+        tk_call_without_enc('wm', 'focusmodel', win.epath)
       end
     end
+    def focusmodel(mode = nil)
+      Wm.focusmodel(self, mode)
+    end
+    alias wm_focusmodel focusmodel
     TOPLEVEL_METHODCALL_OPTKEYS['focusmodel'] = 'focusmodel'
 
+    def Wm.forget(win)
+      # Tcl/Tk 8.5+
+      # work with dockable frames
+      tk_call_without_enc('wm', 'forget', win.epath)
+      win
+    end
+    def wm_forget
+      Wm.forget(self)
+    end
+
+    def Wm.frame(win)
+      tk_call_without_enc('wm', 'frame', win.epath)
+    end
     def frame
-      tk_call_without_enc('wm', 'frame', path)
+      Wm.frame(self)
     end
+    alias wm_frame frame
 
-    def geometry(geom=nil)
+    def Wm.geometry(win, geom=nil)
       if geom
-        tk_call_without_enc('wm', 'geometry', path, geom)
-        self
+        tk_call_without_enc('wm', 'geometry', win.epath, geom)
+        win
       else
-        tk_call_without_enc('wm', 'geometry', path)
+        tk_call_without_enc('wm', 'geometry', win.epath)
       end
     end
+    def geometry(geom=nil)
+      Wm.geometry(self, geom)
+    end
+    alias wm_geometry geometry
     TOPLEVEL_METHODCALL_OPTKEYS['geometry'] = 'geometry'
 
-    def wm_grid(*args)
+    def Wm.grid(win, *args)
       if args.size == 0
-        list(tk_call_without_enc('wm', 'grid', path))
+        list(tk_call_without_enc('wm', 'grid', win.epath))
       else
         args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'grid', path, *args)
-        self
+        tk_call_without_enc('wm', 'grid', win.epath, *args)
+        win
       end
     end
+    def wm_grid(*args)
+      Wm.grid(self, *args)
+    end
     TOPLEVEL_METHODCALL_OPTKEYS['wm_grid'] = 'wm_grid'
 
-    def group(leader = nil)
+    def Wm.group(win, leader = nil)
       if leader
-        tk_call('wm', 'group', path, leader)
-        self
+        tk_call('wm', 'group', win.epath, leader)
+        win
       else
-        window(tk_call('wm', 'group', path))
+        window(tk_call('wm', 'group', win.epath))
       end
     end
+    def group(leader = nil)
+      Wm.group(self, leader)
+    end
+    alias wm_group group
     TOPLEVEL_METHODCALL_OPTKEYS['group'] = 'group'
 
-    def iconbitmap(bmp=nil)
+    def Wm.iconbitmap(win, bmp=nil)
       if bmp
-        tk_call_without_enc('wm', 'iconbitmap', path, bmp)
-        self
+        tk_call_without_enc('wm', 'iconbitmap', win.epath, bmp)
+        win
       else
-        image_obj(tk_call_without_enc('wm', 'iconbitmap', path))
+        image_obj(tk_call_without_enc('wm', 'iconbitmap', win.epath))
       end
     end
+    def iconbitmap(bmp=nil)
+      Wm.iconbitmap(self, bmp)
+    end
+    alias wm_iconbitmap iconbitmap
     TOPLEVEL_METHODCALL_OPTKEYS['iconbitmap'] = 'iconbitmap'
 
-    def iconphoto(*imgs)
+    def Wm.iconphoto(win, *imgs)
       if imgs.empty?
-        @wm_iconphoto = nil unless defined? @wm_iconphoto
-        return @wm_iconphoto 
+        win.instance_eval{
+          @wm_iconphoto = nil unless defined? @wm_iconphoto
+          return @wm_iconphoto
+        }
       end
 
       imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
-      tk_call_without_enc('wm', 'iconphoto', path, *imgs)
-      @wm_iconphoto = imgs
-      self
+      tk_call_without_enc('wm', 'iconphoto', win.epath, *imgs)
+      win.instance_eval{ @wm_iconphoto = imgs  }
+      win
+    end
+    def iconphoto(*imgs)
+      Wm.iconphoto(self, *imgs)
     end
+    alias wm_iconphoto iconphoto
     TOPLEVEL_METHODCALL_OPTKEYS['iconphoto'] = 'iconphoto'
 
-    def iconphoto_default(*imgs)
+    def Wm.iconphoto_default(win, *imgs)
       imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
-      tk_call_without_enc('wm', 'iconphoto', path, '-default', *imgs)
-      self
+      tk_call_without_enc('wm', 'iconphoto', win.epath, '-default', *imgs)
+      win
+    end
+    def iconphoto_default(*imgs)
+      Wm.iconphoto_default(self, *imgs)
     end
+    alias wm_iconphoto_default iconphoto_default
 
-    def iconify(ex = true)
+    def Wm.iconify(win, ex = true)
       if ex
-        tk_call_without_enc('wm', 'iconify', path)
+        tk_call_without_enc('wm', 'iconify', win.epath)
       else
-        self.deiconify
+        Wm.deiconify(win)
       end
-      self
+      win
+    end
+    def iconify(ex = true)
+      Wm.iconify(self, ex)
     end
+    alias wm_iconify iconify
 
-    def iconmask(bmp=nil)
+    def Wm.iconmask(win, bmp=nil)
       if bmp
-        tk_call_without_enc('wm', 'iconmask', path, bmp)
-        self
+        tk_call_without_enc('wm', 'iconmask', win.epath, bmp)
+        win
       else
-        image_obj(tk_call_without_enc('wm', 'iconmask', path))
+        image_obj(tk_call_without_enc('wm', 'iconmask', win.epath))
       end
     end
+    def iconmask(bmp=nil)
+      Wm.iconmask(self, bmp)
+    end
+    alias wm_iconmask iconmask
     TOPLEVEL_METHODCALL_OPTKEYS['iconmask'] = 'iconmask'
 
-    def iconname(name=nil)
+    def Wm.iconname(win, name=nil)
       if name
-        tk_call('wm', 'iconname', path, name)
-        self
+        tk_call('wm', 'iconname', win.epath, name)
+        win
       else
-        tk_call('wm', 'iconname', path)
+        tk_call('wm', 'iconname', win.epath)
       end
     end
+    def iconname(name=nil)
+      Wm.iconname(self, name)
+    end
+    alias wm_iconname iconname
     TOPLEVEL_METHODCALL_OPTKEYS['iconname'] = 'iconname'
 
-    def iconposition(*args)
+    def Wm.iconposition(win, *args)
       if args.size == 0
-        list(tk_call_without_enc('wm', 'iconposition', path))
+        list(tk_call_without_enc('wm', 'iconposition', win.epath))
       else
         args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'iconposition', path, *args)
-        self
+        tk_call_without_enc('wm', 'iconposition', win.epath, *args)
+        win
       end
     end
+    def iconposition(*args)
+      Wm.iconposition(self, *args)
+    end
+    alias wm_iconposition iconposition
     TOPLEVEL_METHODCALL_OPTKEYS['iconposition'] = 'iconposition'
 
-    def iconwindow(win = nil)
-      if win
-        tk_call_without_enc('wm', 'iconwindow', path, win)
-        self
+    def Wm.iconwindow(win, iconwin = nil)
+      if iconwin
+        tk_call_without_enc('wm', 'iconwindow', win.epath, iconwin)
+        win
       else
-        w = tk_call_without_enc('wm', 'iconwindow', path)
+        w = tk_call_without_enc('wm', 'iconwindow', win.epath)
         (w == '')? nil: window(w)
       end
     end
+    def iconwindow(iconwin = nil)
+      Wm.iconwindow(self, iconwin)
+    end
+    alias wm_iconwindow iconwindow
     TOPLEVEL_METHODCALL_OPTKEYS['iconwindow'] = 'iconwindow'
 
-    def maxsize(*args)
+    def Wm.manage(win)
+      # Tcl/Tk 8.5+ feature
+      tk_call_without_enc('wm', 'manage', win.epath)
+      win
+    end
+    def wm_manage
+      Wm.manage(self)
+    end
+=begin
+    def Wm.manage(win, use_id = nil)
+      # Tcl/Tk 8.5+ feature
+      # --------------------------------------------------------------
+      # In the future release, I want to support to embed the 'win'
+      # into the container which has window-id 'use-id'.
+      # It may give users frexibility on controlling their GUI.
+      # However, it may be difficult for current Tcl/Tk (Tcl/Tk8.5.1),
+      # because it seems to require to modify Tcl/Tk's source code.
+      # --------------------------------------------------------------
+      if use_id
+        tk_call_without_enc('wm', 'manage', win.epath, '-use', use_id)
+      else
+        tk_call_without_enc('wm', 'manage', win.epath)
+      end
+      win
+    end
+=end
+
+    def Wm.maxsize(win, *args)
       if args.size == 0
-        list(tk_call_without_enc('wm', 'maxsize', path))
+        list(tk_call_without_enc('wm', 'maxsize', win.epath))
       else
         args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'maxsize', path, *args)
-        self
+        tk_call_without_enc('wm', 'maxsize', win.epath, *args)
+        win
       end
     end
+    def maxsize(*args)
+      Wm.maxsize(self, *args)
+    end
+    alias wm_maxsize maxsize
     TOPLEVEL_METHODCALL_OPTKEYS['maxsize'] = 'maxsize'
 
-    def minsize(*args)
+    def Wm.minsize(win, *args)
       if args.size == 0
-        list(tk_call_without_enc('wm', 'minsize', path))
+        list(tk_call_without_enc('wm', 'minsize', win.epath))
       else
         args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'minsize', path, *args)
-        self
+        tk_call_without_enc('wm', 'minsize', win.path, *args)
+        win
       end
     end
+    def minsize(*args)
+      Wm.minsize(self, *args)
+    end
+    alias wm_minsize minsize
     TOPLEVEL_METHODCALL_OPTKEYS['minsize'] = 'minsize'
 
-    def overrideredirect(mode=None)
-      if mode == None
-        bool(tk_call_without_enc('wm', 'overrideredirect', path))
+    def Wm.overrideredirect(win, mode=TkComm::None)
+      if mode == TkComm::None
+        bool(tk_call_without_enc('wm', 'overrideredirect', win.epath))
       else
-        tk_call_without_enc('wm', 'overrideredirect', path, mode)
-        self
+        tk_call_without_enc('wm', 'overrideredirect', win.epath, mode)
+        win
       end
     end
+    def overrideredirect(mode=TkComm::None)
+      Wm.overrideredirect(self, mode)
+    end
+    alias wm_overrideredirect overrideredirect
     TOPLEVEL_METHODCALL_OPTKEYS['overrideredirect'] = 'overrideredirect'
 
-    def positionfrom(who=None)
-      if who == None
-        r = tk_call_without_enc('wm', 'positionfrom', path)
+    def Wm.positionfrom(win, who=TkComm::None)
+      if who == TkComm::None
+        r = tk_call_without_enc('wm', 'positionfrom', win.epath)
         (r == "")? nil: r
       else
-        tk_call_without_enc('wm', 'positionfrom', path, who)
-        self
+        tk_call_without_enc('wm', 'positionfrom', win.epath, who)
+        win
       end
     end
+    def positionfrom(who=TkComm::None)
+      Wm.positionfrom(self, who)
+    end
+    alias wm_positionfrom positionfrom
     TOPLEVEL_METHODCALL_OPTKEYS['positionfrom'] = 'positionfrom'
 
-    def protocol(name=nil, cmd=nil, &b)
+    def Wm.protocol(win, name=nil, cmd=nil, &b)
       if cmd
-        tk_call_without_enc('wm', 'protocol', path, name, cmd)
-        self
+        tk_call_without_enc('wm', 'protocol', win.epath, name, cmd)
+        win
       elsif b
-        tk_call_without_enc('wm', 'protocol', path, name, proc(&b))
-        self
+        tk_call_without_enc('wm', 'protocol', win.epath, name, proc(&b))
+        win
       elsif name
-        result = tk_call_without_enc('wm', 'protocol', path, name)
+        result = tk_call_without_enc('wm', 'protocol', win.epath, name)
         (result == "")? nil : tk_tcl2ruby(result)
       else
-        tk_split_simplelist(tk_call_without_enc('wm', 'protocol', path))
+        tk_split_simplelist(tk_call_without_enc('wm', 'protocol', win.epath))
       end
     end
+    def protocol(name=nil, cmd=nil, &b)
+      Wm.protocol(self, name, cmd, &b)
+    end
+    alias wm_protocol protocol
 
-    def protocols(kv=nil)
+    def Wm.protocols(win, kv=nil)
       unless kv
         ret = {}
-        self.protocol.each{|name|
-          ret[name] = self.protocol(name)
+        Wm.protocol(win).each{|name|
+          ret[name] = Wm.protocol(win, name)
         }
         return ret
       end
@@ -279,82 +413,140 @@ module Tk
       unless kv.kind_of?(Hash)
         fail ArgumentError, 'expect a hash of protocol=>command'
       end
-      kv.each{|k, v| self.protocol(k, v)}
-      self
+      kv.each{|k, v| Wm.protocol(win, k, v)}
+      win
     end
+    def protocols(kv=nil)
+      Wm.protocols(self, kv)
+    end
+    alias wm_protocols protocols
     TOPLEVEL_METHODCALL_OPTKEYS['protocols'] = 'protocols'
 
-    def resizable(*args)
+    def Wm.resizable(win, *args)
       if args.length == 0
-        list(tk_call_without_enc('wm', 'resizable', path)).collect{|e| bool(e)}
+        list(tk_call_without_enc('wm', 'resizable', win.epath)).map!{|e| bool(e)}
       else
         args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'resizable', path, *args)
-        self
+        tk_call_without_enc('wm', 'resizable', win.epath, *args)
+        win
       end
     end
+    def resizable(*args)
+      Wm.resizable(self, *args)
+    end
+    alias wm_resizable resizable
     TOPLEVEL_METHODCALL_OPTKEYS['resizable'] = 'resizable'
 
-    def sizefrom(who=None)
-      if who == None
-        r = tk_call_without_enc('wm', 'sizefrom', path)
+    def Wm.sizefrom(win, who=TkComm::None)
+      if who == TkComm::None
+        r = tk_call_without_enc('wm', 'sizefrom', win.epath)
         (r == "")? nil: r
       else
-        tk_call_without_enc('wm', 'sizefrom', path, who)
-        self
+        tk_call_without_enc('wm', 'sizefrom', win.epath, who)
+        win
       end
     end
+    def sizefrom(who=TkComm::None)
+      Wm.sizefrom(self, who)
+    end
+    alias wm_sizefrom sizefrom
     TOPLEVEL_METHODCALL_OPTKEYS['sizefrom'] = 'sizefrom'
 
+    def Wm.stackorder(win)
+      list(tk_call('wm', 'stackorder', win.epath))
+    end
     def stackorder
-      list(tk_call('wm', 'stackorder', path))
+      Wm.stackorder(self)
     end
+    alias wm_stackorder stackorder
 
-    def stackorder_isabove(win)
-      bool(tk_call('wm', 'stackorder', path, 'isabove', win))
+    def Wm.stackorder_isabove(win, target)
+      bool(tk_call('wm', 'stackorder', win.epath, 'isabove', target))
+    end
+    def Wm.stackorder_is_above(win, target)
+      Wm.stackorder_isabove(win, target)
+    end
+    def stackorder_isabove(target)
+      Wm.stackorder_isabove(self, target)
     end
+    alias stackorder_is_above stackorder_isabove
+    alias wm_stackorder_isabove stackorder_isabove
+    alias wm_stackorder_is_above stackorder_isabove
 
-    def stackorder_isbelow(win)
-      bool(tk_call('wm', 'stackorder', path, 'isbelow', win))
+    def Wm.stackorder_isbelow(win, target)
+      bool(tk_call('wm', 'stackorder', win.epath, 'isbelow', target))
     end
+    def Wm.stackorder_is_below(win, target)
+      Wm.stackorder_isbelow(win, target)
+    end
+    def stackorder_isbelow(target)
+      Wm.stackorder_isbelow(self, target)
+    end
+    alias stackorder_is_below stackorder_isbelow
+    alias wm_stackorder_isbelow stackorder_isbelow
+    alias wm_stackorder_is_below stackorder_isbelow
 
-    def state(st=nil)
+    def Wm.state(win, st=nil)
       if st
-        tk_call_without_enc('wm', 'state', path, st)
-        self
+        tk_call_without_enc('wm', 'state', win.epath, st)
+        win
       else
-        tk_call_without_enc('wm', 'state', path)
+        tk_call_without_enc('wm', 'state', win.epath)
       end
     end
+    def state(st=nil)
+      Wm.state(self, st)
+    end
+    alias wm_state state
     TOPLEVEL_METHODCALL_OPTKEYS['state'] = 'state'
 
-    def title(str=nil)
+    def Wm.title(win, str=nil)
       if str
-        tk_call('wm', 'title', path, str)
-        self
+        tk_call('wm', 'title', win.epath, str)
+        win
       else
-        tk_call('wm', 'title', path)
+        tk_call('wm', 'title', win.epath)
       end
     end
+    def title(str=nil)
+      Wm.title(self, str)
+    end
+    alias wm_title title
     TOPLEVEL_METHODCALL_OPTKEYS['title'] = 'title'
 
-    def transient(master=nil)
+    def Wm.transient(win, master=nil)
       if master
-        tk_call_without_enc('wm', 'transient', path, master)
-        self
+        tk_call_without_enc('wm', 'transient', win.epath, master)
+        win
       else
-        window(tk_call_without_enc('wm', 'transient', path))
+        window(tk_call_without_enc('wm', 'transient', win.epath))
       end
     end
+    def transient(master=nil)
+      Wm.transient(self, master)
+    end
+    alias wm_transient transient
     TOPLEVEL_METHODCALL_OPTKEYS['transient'] = 'transient'
 
-    def withdraw(ex = true)
+    def Wm.withdraw(win, ex = true)
       if ex
-        tk_call_without_enc('wm', 'withdraw', path)
+        tk_call_without_enc('wm', 'withdraw', win.epath)
       else
-        self.deiconify
+        Wm.deiconify(win)
       end
-      self
+      win
     end
+    def withdraw(ex = true)
+      Wm.withdraw(self, ex)
+    end
+    alias wm_withdraw withdraw
+  end
+
+  module Wm_for_General
+    Wm.instance_methods.each{|m|
+      if (m = m.to_s) =~ /^wm_(.*)$/
+        eval "def #{m}(*args, &b); Tk::Wm.#{$1}(self, *args, &b); end"
+      end
+    }
   end
 end
diff --git a/ext/tk/lib/tk/xim.rb b/ext/tk/lib/tk/xim.rb
index 0ac8559bb9..c0126c5175 100644
--- a/ext/tk/lib/tk/xim.rb
+++ b/ext/tk/lib/tk/xim.rb
@@ -12,14 +12,14 @@ module TkXIM
   def TkXIM.useinputmethods(value = None, win = nil)
     if value == None
       if win
-        bool(tk_call_without_enc('tk', 'useinputmethods', 
+        bool(tk_call_without_enc('tk', 'useinputmethods',
                                  '-displayof', win))
       else
         bool(tk_call_without_enc('tk', 'useinputmethods'))
       end
     else
       if win
-        bool(tk_call_without_enc('tk', 'useinputmethods', 
+        bool(tk_call_without_enc('tk', 'useinputmethods',
                                  '-displayof', win, value))
       else
         bool(tk_call_without_enc('tk', 'useinputmethods', value))
diff --git a/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb
index b430bae55d..bd3180aa55 100644
--- a/ext/tk/lib/tkextlib/ICONS/icons.rb
+++ b/ext/tk/lib/tkextlib/ICONS/icons.rb
@@ -34,10 +34,10 @@ module Tk
     def self.create(*args)  # icon, icon, ..., ?option=>value, ...?
       if args[-1].kind_of?(Hash)
         keys = args.pop
-        icons = simplelist(tk_call('::icons::icons', 'create', 
+        icons = simplelist(tk_call('::icons::icons', 'create',
                                    *(hash_kv(keys) << (args.flatten))))
       else
-        icons = simplelist(tk_call('::icons::icons', 'create', 
+        icons = simplelist(tk_call('::icons::icons', 'create',
                                    args.flatten))
       end
 
@@ -66,7 +66,7 @@ module Tk
     def self.query(*args)  # icon, icon, ..., ?option=>value, ...?
       if args[-1].kind_of?(Hash)
         keys = args.pop
-        simplelist(tk_call('::icons::icons', 'query', 
+        simplelist(tk_call('::icons::icons', 'query',
                            *(hash_kv(keys) << (args.flatten))))
       else
         simplelist(tk_call('::icons::icons', 'query', args.flatten))
@@ -121,7 +121,7 @@ module Tk
     end
 
     def query(keys={})
-      list(simplelist(tk_call('::icons::icons', 'query', 
+      list(simplelist(tk_call('::icons::icons', 'query',
                                *(hash_kv(keys) << @name))
                       )[0])
     end
diff --git a/ext/tk/lib/tkextlib/ICONS/setup.rb b/ext/tk/lib/tkextlib/ICONS/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/ICONS/setup.rb
+++ b/ext/tk/lib/tkextlib/ICONS/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS
index 15925cba72..6b31ababb3 100644
--- a/ext/tk/lib/tkextlib/SUPPORT_STATUS
+++ b/ext/tk/lib/tkextlib/SUPPORT_STATUS
@@ -55,18 +55,20 @@ script may give you some hints about that.
 
 ===< support with some examples (may be beta quality) >=======================
 
-Tcllib       1.8     
-Tklib        0.4.1   http://sourceforge.net/projects/tcllib      ==> tcllib
+Tcllib       1.11.1  
+Tklib        0.5     http://sourceforge.net/projects/tcllib      ==> tcllib
+                       ( partial support; primary support target is Tklib)
 
 IWidgets     4.0.2   http://sourceforge.net/projects/incrtcl     ==> iwidgets
 
-BWidgets     1.7     http://sourceforge.net/projects/tcllib      ==> bwidget
+BWidget      1.8 [ CVS/Hd(2009-07-02) ]
+                     http://sourceforge.net/projects/tcllib      ==> bwidget
 
-TkTable      2.9     http://sourceforge.net/projects/tktable     ==> tktable
+TkTable      2.10    http://sourceforge.net/projects/tktable     ==> tktable
                          * see also <http://www.korus.hu/~fery/ruby/tktable.rb>
                                     written by Ferenc Engard (ferenc@engard.hu)
 
-vu           2.3.0   http://sourceforge.net/projects/tktable     ==> vu
+Vu widgets   2.3.0   http://sourceforge.net/projects/tktable     ==> vu
 
 TkHTML       2.0     http://www.hwaci.com/sw/tkhtml/             ==> tkHTML
 
@@ -80,25 +82,25 @@ BLT          2.4z    http://sourceforge.net/projects/blt
                                 (http://raa.ruby-lang.org/)
                       ==> blt
 
-TkTreeCtrl   CVS/Hd(2005-12-02)
-                     http://sourceforge.net/projects/tktreectrl  ==> treectrl
+TkTreeCtrl   2.2.9
+                     http://tktreectrl.sourceforge.net/          ==> treectrl
 
-Tile         0.7.8
+Tile         0.8.3/8.6b1
                      http://sourceforge.net/projects/tktable     ==> tile
 
 
 
 ===< support (may be alpha or beta quality) >=================================
 
-IncrTcl      CVS/Hd(2005-02-14)
+IncrTcl      CVS/Hd(2008-12-15)
                      http://sourceforge.net/projects/incrtcl     ==> itcl, itk
 
-TclX         CVS/Hd(2005-02-07)
+TclX         CVS/Hd(2008-12-15)
                      http://sourceforge.net/projects/tclx
                        ==> tclx (partial support; infox command and 
                                                    XPG/3 message catalogs only)
 
-Trofs        0.4.3   http://math.nist.gov/~DPorter/tcltk/trofs/
+Trofs        0.4.4   http://math.nist.gov/~DPorter/tcltk/trofs/
 
 
 
diff --git a/ext/tk/lib/tkextlib/blt.rb b/ext/tk/lib/tkextlib/blt.rb
index 115eb927ba..8b132e41a7 100644
--- a/ext/tk/lib/tkextlib/blt.rb
+++ b/ext/tk/lib/tkextlib/blt.rb
@@ -19,6 +19,8 @@ TkPackage.require('BLT')
 module Tk
   module BLT
     TkComm::TkExtlibAutoloadModule.unshift(self)
+    # Require autoload-symbols which is a same name as widget classname.
+    # Those are used at  TkComm._genobj_for_tkwidget method.
 
     extend TkCore
 
@@ -26,14 +28,14 @@ module Tk
     PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
 
     begin
-      lib = INTERP._invoke('set', 'blt_library')
+      lib = TkCore::INTERP._invoke('set', 'blt_library')
     rescue
       lib = ''
     end
     LIBRARY  = TkVarAccess.new('blt_library', lib)
 
     begin
-      lib = INTERP._invoke('set', 'blt_libPath')
+      lib = TkCore::INTERP._invoke('set', 'blt_libPath')
     rescue
       lib = ''
     end
diff --git a/ext/tk/lib/tkextlib/blt/barchart.rb b/ext/tk/lib/tkextlib/blt/barchart.rb
index cb481c5889..a86b91c959 100644
--- a/ext/tk/lib/tkextlib/blt/barchart.rb
+++ b/ext/tk/lib/tkextlib/blt/barchart.rb
@@ -11,7 +11,7 @@ module Tk::BLT
   class Barchart < TkWindow
     TkCommandNames = ['::blt::barchart'.freeze].freeze
     WidgetClassName = 'Barchart'.freeze
-    WidgetClassNames[WidgetClassName] = self
+    WidgetClassNames[WidgetClassName] ||= self
 
     include PlotComponent
     include GraphCommand
@@ -22,7 +22,7 @@ module Tk::BLT
     private :__boolval_optkeys
 
     def __strval_optkeys
-      ['text', 'label', 'title', 'file', 
+      ['text', 'label', 'title', 'file',
         'background', 'plotbackground']
     end
     private :__strval_optkeys
@@ -33,7 +33,7 @@ module Tk::BLT
     private :__tkvariable_optkeys
 
 =begin
-    BarElement_ID = ['blt_barchart_bar'.freeze, '00000'.taint].freeze
+    BarElement_ID = ['blt_barchart_bar'.freeze, TkUtil.untrust('00000')].freeze
 
     def bar(elem=nil, keys={})
       if elem.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/blt/bitmap.rb b/ext/tk/lib/tkextlib/blt/bitmap.rb
index 31cf8d4229..3254b63116 100644
--- a/ext/tk/lib/tkextlib/blt/bitmap.rb
+++ b/ext/tk/lib/tkextlib/blt/bitmap.rb
@@ -13,7 +13,16 @@ module Tk::BLT
     TkCommandNames = ['::blt::bitmap'.freeze].freeze
 
     BITMAP_ID_TBL = TkCore::INTERP.create_table
-    BITMAP_ID = ['blt_bitmap_id'.freeze, '00000'.taint].freeze
+
+    (BITMAP_ID = ['blt_bitmap_id'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      @mutex = Mutex.new
+      def mutex; @mutex; end
+      freeze
+    }
+
+    TkCore::INTERP.init_ip_env{
+      BITMAP_ID_TBL.mutex.synchronize{ BITMAP_ID_TBL.clear }
+    }
 
     def self.data(name)
       dat = tk_simple_list(tk_call('::blt::bitmap', 'data', name))
@@ -64,9 +73,13 @@ module Tk::BLT
       if name
         @id = name
       else
-        @id = BITMAP_ID.join(TkCore::INTERP._ip_id_)
-        BITMAP_ID[1].succ!
-        BITMAP_ID_TBL[@id] = self
+        BITMAP_ID.mutex.synchronize{
+          @id = BITMAP_ID.join(TkCore::INTERP._ip_id_)
+          BITMAP_ID[1].succ!
+        }
+        BITMAP_ID_TBL.mutex.synchronize{
+          BITMAP_ID_TBL[@id] = self
+        }
       end
 
       @path = @id
diff --git a/ext/tk/lib/tkextlib/blt/busy.rb b/ext/tk/lib/tkextlib/blt/busy.rb
index 4726e466f4..b5287fb5b7 100644
--- a/ext/tk/lib/tkextlib/blt/busy.rb
+++ b/ext/tk/lib/tkextlib/blt/busy.rb
@@ -19,7 +19,7 @@ module Tk::BLT
     class Shield < TkWindow
       def self.shield_path(win)
         win = window(win) unless win.kind_of?(TkWindow)
-        if win.kind_of?(TkToplevel)
+        if win.kind_of?(Tk::Toplevel)
           win.path + '._Busy'
         else
           win.path + '_Busy'
@@ -44,6 +44,7 @@ class << Tk::BLT::Busy
   private :__item_config_cmd
 
   undef itemcget
+  undef itemcget_tkstring
   alias configure itemconfigure
   alias configinfo itemconfiginfo
   alias current_configinfo current_itemconfiginfo
diff --git a/ext/tk/lib/tkextlib/blt/component.rb b/ext/tk/lib/tkextlib/blt/component.rb
index ad78a5430b..a228a82246 100644
--- a/ext/tk/lib/tkextlib/blt/component.rb
+++ b/ext/tk/lib/tkextlib/blt/component.rb
@@ -22,15 +22,15 @@ module Tk::BLT
       private :__item_numstrval_optkeys
 
       def __item_boolval_optkeys(id)
-        ['hide', 'under', 'descending', 'logscale', 'loose', 'showticks', 
-          'titlealternate', 'scalesymbols', 'minor', 'raised', 
+        ['hide', 'under', 'descending', 'logscale', 'loose', 'showticks',
+          'titlealternate', 'scalesymbols', 'minor', 'raised',
           'center', 'decoration', 'landscape', 'maxpect']
       end
       private :__item_boolval_optkeys
 
       def __item_strval_optkeys(id)
-        ['text', 'label', 'limits', 'title', 
-          'show', 'file', 'maskdata', 'maskfile', 
+        ['text', 'label', 'limits', 'title',
+          'show', 'file', 'maskdata', 'maskfile',
           'color', 'titlecolor', 'fill', 'outline', 'offdash']
       end
       private :__item_strval_optkeys
@@ -82,16 +82,22 @@ module Tk::BLT
     end
     private :__item_pathname
 
+    def axis_cget_tkstring(id, option)
+      ret = itemcget_tkstring(['axis', tagid(id)], option)
+    end
     def axis_cget(id, option)
       ret = itemcget(['axis', tagid(id)], option)
     end
+    def axis_cget_strict(id, option)
+      ret = itemcget_strict(['axis', tagid(id)], option)
+    end
     def axis_configure(*args)
       slot = args.pop
       if slot.kind_of?(Hash)
         value = None
         slot = _symbolkey2str(slot)
         if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick| 
+          slot['command'] = proc{|w, tick|
             cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
           }
         end
@@ -100,7 +106,7 @@ module Tk::BLT
         slot = args.pop
         if slot == :command || slot == 'command'
           cmd = value
-          value = proc{|w, tick| 
+          value = proc{|w, tick|
             cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
           }
         end
@@ -115,9 +121,15 @@ module Tk::BLT
       current_itemconfiginfo(['axis', tagid(id)], slot)
     end
 
+    def crosshairs_cget_tkstring(option)
+      itemcget_tkstring('crosshairs', option)
+    end
     def crosshairs_cget(option)
       itemcget('crosshairs', option)
     end
+    def crosshairs_cget_strict(option)
+      itemcget_strict('crosshairs', option)
+    end
     def crosshairs_configure(slot, value=None)
       itemconfigure('crosshairs', slot, value)
     end
@@ -128,9 +140,15 @@ module Tk::BLT
       current_itemconfiginfo('crosshairs', slot)
     end
 
+    def element_cget_tkstring(id, option)
+      itemcget_tkstring(['element', tagid(id)], option)
+    end
     def element_cget(id, option)
       itemcget(['element', tagid(id)], option)
     end
+    def element_cget_strict(id, option)
+      itemcget_strict(['element', tagid(id)], option)
+    end
     def element_configure(*args)
       slot = args.pop
       if slot.kind_of?(Hash)
@@ -149,9 +167,15 @@ module Tk::BLT
       current_itemconfiginfo(['element', tagid(id)], slot)
     end
 
+    def bar_cget_tkstring(id, option)
+      itemcget_tkstring(['bar', tagid(id)], option)
+    end
     def bar_cget(id, option)
       itemcget(['bar', tagid(id)], option)
     end
+    def bar_cget_strict(id, option)
+      itemcget_strict(['bar', tagid(id)], option)
+    end
     def bar_configure(*args)
       slot = args.pop
       if slot.kind_of?(Hash)
@@ -170,9 +194,15 @@ module Tk::BLT
       current_itemconfiginfo(['bar', tagid(id)], slot)
     end
 
+    def line_cget_tkstring(id, option)
+      itemcget_tkstring(['line', tagid(id)], option)
+    end
     def line_cget(id, option)
       itemcget(['line', tagid(id)], option)
     end
+    def line_cget_strict(id, option)
+      itemcget_strict(['line', tagid(id)], option)
+    end
     def line_configure(*args)
       slot = args.pop
       if slot.kind_of?(Hash)
@@ -191,9 +221,15 @@ module Tk::BLT
       current_itemconfiginfo(['line', tagid(id)], slot)
     end
 
+    def gridline_cget_tkstring(option)
+      itemcget_tkstring('grid', option)
+    end
     def gridline_cget(option)
       itemcget('grid', option)
     end
+    def gridline_cget_strict(option)
+      itemcget_strict('grid', option)
+    end
     def gridline_configure(slot, value=None)
       itemconfigure('grid', slot, value)
     end
@@ -204,9 +240,15 @@ module Tk::BLT
       current_itemconfiginfo('grid', slot)
     end
 
+    def legend_cget_tkstring(option)
+      itemcget_tkstring('legend', option)
+    end
     def legend_cget(option)
       itemcget('legend', option)
     end
+    def legend_cget_strict(option)
+      itemcget_strict('legend', option)
+    end
     def legend_configure(slot, value=None)
       itemconfigure('legend', slot, value)
     end
@@ -217,9 +259,15 @@ module Tk::BLT
       current_itemconfiginfo('legend', slot)
     end
 
+    def pen_cget_tkstring(id, option)
+      itemcget_tkstring(['pen', tagid(id)], option)
+    end
     def pen_cget(id, option)
       itemcget(['pen', tagid(id)], option)
     end
+    def pen_cget_strict(id, option)
+      itemcget_strict(['pen', tagid(id)], option)
+    end
     def pen_configure(*args)
       slot = args.pop
       if slot.kind_of?(Hash)
@@ -238,9 +286,15 @@ module Tk::BLT
       current_itemconfiginfo(['pen', tagid(id)], slot)
     end
 
+    def postscript_cget_tkstring(option)
+      itemcget_tkstring('postscript', option)
+    end
     def postscript_cget(option)
       itemcget('postscript', option)
     end
+    def postscript_cget_strict(option)
+      itemcget_strict('postscript', option)
+    end
     def postscript_configure(slot, value=None)
       itemconfigure('postscript', slot, value)
     end
@@ -251,9 +305,15 @@ module Tk::BLT
       current_itemconfiginfo('postscript', slot)
     end
 
+    def marker_cget_tkstring(id, option)
+      itemcget_tkstring(['marker', tagid(id)], option)
+    end
     def marker_cget(id, option)
       itemcget(['marker', tagid(id)], option)
     end
+    def marker_cget_strict(id, option)
+      itemcget_strict(['marker', tagid(id)], option)
+    end
     def marker_configure(*args)
       slot = args.pop
       if slot.kind_of?(Hash)
@@ -272,12 +332,17 @@ module Tk::BLT
       current_itemconfiginfo(['marker', tagid(id)], slot)
     end
 
+    alias __itemcget_tkstring itemcget_tkstring
     alias __itemcget itemcget
+    alias __itemcget_strict itemcget_strict
     alias __itemconfiginfo itemconfiginfo
     alias __current_itemconfiginfo current_itemconfiginfo
-    private :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
+    private :__itemcget_tkstring, :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
 
-    def itemcget(tagOrId, option)
+    def itemcget_tkstring(tagOrId, option)
+      __itemcget_tkstring(tagid(tagOrId), option)
+    end
+    def itemcget_strict(tagOrId, option)
       ret = __itemcget(tagid(tagOrId), option)
       if option == 'bindtags' || option == :bindtags
         ret.collect{|tag| TkBindTag.id2obj(tag)}
@@ -285,6 +350,27 @@ module Tk::BLT
         ret
       end
     end
+    def itemcget(tagOrId, option)
+      unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+        itemcget_strict(tagOrId, option)
+      else
+        begin
+          itemcget_strict(tagOrId, option)
+        rescue => e
+          begin
+            if current_itemconfiginfo(tagOrId).has_key?(option.to_s)
+              # error on known option
+              fail e
+            else
+              # unknown option
+              nil
+            end
+          rescue
+            fail e  # tag error
+          end
+        end
+      end
+    end
     def itemconfiginfo(tagOrId, slot = nil)
       ret = __itemconfiginfo(tagid(tagOrId), slot)
 
@@ -321,19 +407,30 @@ module Tk::BLT
       ret
     end
 
-    private :itemcget, :itemconfigure
-    private :itemconfiginfo, :current_itemconfiginfo
+    private :itemcget_tkstring, :itemcget, :itemcget_strict
+    private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
     #################
 
     class Axis < TkObject
-      OBJ_ID = ['blt_chart_axis'.freeze, '00000'.taint].freeze
-      OBJ_TBL={}
+      (OBJ_ID = ['blt_chart_axis'.freeze, TkUtil.untrust('00000')]).instance_eval{
+        @mutex = Mutex.new
+        def mutex; @mutex; end
+        freeze
+      }
+
+      AxisID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        AxisID_TBL.mutex.synchronize{ AxisID_TBL.clear }
+      }
 
       def self.id2obj(chart, id)
         cpath = chart.path
-        return id unless OBJ_TBL[cpath]
-        OBJ_TBL[cpath][id]? OBJ_TBL[cpath][id]: id
+        AxisID_TBL.mutex.synchronize{
+          return id unless AxisID_TBL[cpath]
+          AxisID_TBL[cpath][id]? AxisID_TBL[cpath][id]: id
+        }
       end
 
       def self.new(chart, axis=nil, keys={})
@@ -341,12 +438,48 @@ module Tk::BLT
           keys = axis
           axis = nil
         end
-        OBJ_TBL[chart.path] = {} unless OBJ_TBL[chart.path]
-        return OBJ_TBL[chart.path][axis] if axis && OBJ_TBL[chart.path][axis]
-        super(chart, axis, keys)
+        if keys
+          keys = _symbolkey2str(keys)
+          not_create = keys.delete('without_creating')
+        else
+          not_create = false
+        end
+
+        obj = nil
+        AxisID_TBL.mutex.synchronize{
+          chart_path = chart.path
+          AxisID_TBL[chart_path] ||= {}
+          if axis && AxisID_TBL[chart_path][axis]
+            obj = AxisID_TBL[chart_path][axis]
+          else
+            (obj = self.allocate).instance_eval{
+              if axis
+                @axis = @id = axis.to_s
+              else
+                OBJ_ID.mutex.synchronize{
+                  @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+                  OBJ_ID[1].succ!
+                }
+              end
+              @path = @id
+              @parent = @chart = chart
+              @cpath = @chart.path
+              Axis::AxisID_TBL[@cpath][@axis] = self
+              unless not_create
+                tk_call(@chart, 'axis', 'create', @axis, keys)
+                return obj
+              end
+            }
+          end
+        }
+
+        obj.configure(keys) if obj && ! keys.empty?
+        obj
       end
 
       def initialize(chart, axis=nil, keys={})
+        # dummy:: not called by 'new' method
+
         if axis.kind_of?(Hash)
           keys = axis
           axis = nil
@@ -354,13 +487,15 @@ module Tk::BLT
         if axis
           @axis = @id = axis.to_s
         else
-          @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-          OBJ_ID[1].succ!
+          OBJ_ID.mutex.synchronize{
+            @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+            OBJ_ID[1].succ!
+          }
         end
         @path = @id
         @parent = @chart = chart
         @cpath = @chart.path
-        Axis::OBJ_TBL[@cpath][@axis] = self
+        # Axis::AxisID_TBL[@cpath][@axis] = self
         keys = _symbolkey2str(keys)
         unless keys.delete('without_creating')
           # @chart.axis_create(@axis, keys)
@@ -376,9 +511,15 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        @chart.axis_cget_tkstring(@id, option)
+      end
       def cget(option)
         @chart.axis_cget(@id, option)
       end
+      def cget_strict(option)
+        @chart.axis_cget_strict(@id, option)
+      end
       def configure(key, value=None)
         @chart.axis_configure(@id, key, value)
         self
@@ -416,7 +557,7 @@ module Tk::BLT
       def name
         @axis
       end
-        
+
       def transform(val)
         @chart.axis_transform(@id, val)
       end
@@ -438,17 +579,34 @@ module Tk::BLT
     #################
 
     class Crosshairs < TkObject
-      OBJ_TBL={}
+      CrosshairsID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        CrosshairsID_TBL.mutex.synchronize{ CrosshairsID_TBL.clear }
+      }
 
       def self.new(chart, keys={})
-        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
-        super(chart, keys)
+        obj = nil
+        CrosshairsID_TBL.mutex.synchronize{
+          unless (obj = CrosshairsID_TBL[chart.path])
+            (obj = self.allocate).instance_eval{
+              @parent = @chart = chart
+              @cpath = @chart.path
+              @path = @id = 'crosshairs'
+              Crosshairs::CrosshairsID_TBL[@cpath] = self
+            }
+          end
+        }
+        chart.crosshair_configure(keys) if obj && ! keys.empty?
+        obj
       end
 
       def initialize(chart, keys={})
+        # dummy:: not called by 'new' method
+
         @parent = @chart = chart
         @cpath = @chart.path
-        Crosshairs::OBJ_TBL[@cpath] = self
+        # Crosshairs::CrosshairsID_TBL[@cpath] = self
         @chart.crosshair_configure(keys) unless keys.empty?
         @path = @id = 'crosshairs'
       end
@@ -461,9 +619,15 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        @chart.crosshair_cget_tkstring(option)
+      end
       def cget(option)
         @chart.crosshair_cget(option)
       end
+      def cget_strict(option)
+        @chart.crosshair_cget_strict(option)
+      end
       def configure(key, value=None)
         @chart.crosshair_configure(key, value)
         self
@@ -500,12 +664,18 @@ module Tk::BLT
 
       ElementTypeName = 'element'
       ElementTypeToClass = { ElementTypeName=>self }
+
       ElementID_TBL = TkCore::INTERP.create_table
 
-      TkCore::INTERP.init_ip_env{ ElementID_TBL.clear }
+      TkCore::INTERP.init_ip_env{
+        ElementID_TBL.mutex.synchronize{ ElementID_TBL.clear }
+      }
 
-      OBJ_ID = ['blt_chart_element'.freeze, '00000'.taint].freeze
-      OBJ_TBL={}
+      (OBJ_ID = ['blt_chart_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
+        @mutex = Mutex.new
+        def mutex; @mutex; end
+        freeze
+      }
 
       def Element.type2class(type)
         ElementTypeToClass[type]
@@ -513,8 +683,10 @@ module Tk::BLT
 
       def Element.id2obj(chart, id)
         cpath = chart.path
-        return id unless OBJ_TBL[cpath]
-        OBJ_TBL[cpath][id]? OBJ_TBL[cpath][id]: id
+        ElementID_TBL.mutex.synchronize{
+          return id unless ElementID_TBL[cpath]
+          ElementID_TBL[cpath][id]? ElementID_TBL[cpath][id]: id
+        }
       end
 
       def self.new(chart, element=nil, keys={})
@@ -522,14 +694,49 @@ module Tk::BLT
           keys = element
           element = nil
         end
-        OBJ_TBL[chart.path] = {} unless OBJ_TBL[chart.path]
-        if element && OBJ_TBL[chart.path][element]
-          return OBJ_TBL[chart.path][element]
+        if keys
+          keys = _symbolkey2str(keys)
+          not_create = keys.delete('without_creating')
+        else
+          not_create = false
         end
-        super(chart, element, keys)
+
+        obj = nil
+        ElementID_TBL.mutex.synchronize{
+          chart_path = chart.path
+          ElementID_TBL[chart_path] ||= {}
+          if element && ElementID_TBL[chart_path][element]
+            obj = ElementID_TBL[chart_path][element]
+          else
+            (obj = self.allocate).instance_eval{
+              if element
+                @element = @id = element.to_s
+              else
+                OBJ_ID.mutex.synchronize{
+                  @element = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+                  OBJ_ID[1].succ!
+                }
+              end
+              @path = @id
+              @parent = @chart = chart
+              @cpath = @chart.path
+              @typename = self.class::ElementTypeName
+              Element::ElementID_TBL[@cpath][@element] = self
+              unless not_create
+                tk_call(@chart, @typename, 'create', @element, keys)
+                return obj
+              end
+            }
+          end
+        }
+
+        obj.configure(keys) if obj && ! keys.empty?
+        obj
       end
 
       def initialize(chart, element=nil, keys={})
+        # dummy:: not called by 'new' method
+
         if element.kind_of?(Hash)
           keys = element
           element = nil
@@ -537,14 +744,16 @@ module Tk::BLT
         if element
           @element = @id = element.to_s
         else
-          @element = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-          OBJ_ID[1].succ!
+          OBJ_ID.mutex.synchronize{
+            @element = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+            OBJ_ID[1].succ!
+          }
         end
         @path = @id
         @parent = @chart = chart
         @cpath = @chart.path
         @typename = self.class::ElementTypeName
-        Element::OBJ_TBL[@cpath][@element] = self
+        # Element::ElementID_TBL[@cpath][@element] = self
         keys = _symbolkey2str(keys)
         unless keys.delete('without_creating')
           # @chart.element_create(@element, keys)
@@ -560,10 +769,17 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        # @chart.element_cget(@id, option)
+        @chart.__send__(@typename + '_cget_tkstring', @id, option)
+      end
       def cget(option)
         # @chart.element_cget(@id, option)
         @chart.__send__(@typename + '_cget', @id, option)
       end
+      def cget_strict(option)
+        @chart.__send__(@typename + '_cget_strict', @id, option)
+      end
       def configure(key, value=None)
         # @chart.element_configure(@id, key, value)
         @chart.__send__(@typename + '_configure', @id, key, value)
@@ -622,17 +838,33 @@ module Tk::BLT
     #################
 
     class GridLine < TkObject
-      OBJ_TBL={}
+      GridLineID_TBL = TkCore::INTERP.create_table
+      TkCore::INTERP.init_ip_env{
+        GridLineID_TBL.mutex.synchronize{ GridLineID_TBL.clear }
+      }
 
       def self.new(chart, keys={})
-        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
-        super(chart, keys)
+        obj = nil
+        GridLineID_TBL.mutex.synchronize{
+          unless (obj = GridLineID_TBL[chart.path])
+            (obj = self.allocate).instance_eval{
+              @parent = @chart = chart
+              @cpath = @chart.path
+              @path = @id = 'grid'
+              GridLine::GridLineID_TBL[@cpath] = self
+            }
+          end
+        }
+        chart.gridline_configure(keys) if obj && ! keys.empty?
+        obj
       end
 
       def initialize(chart, keys={})
+        # dummy:: not called by 'new' method
+
         @parent = @chart = chart
         @cpath = @chart.path
-        GridLine::OBJ_TBL[@cpath] = self
+        # GridLine::GridLineID_TBL[@cpath] = self
         @chart.gridline_configure(keys) unless keys.empty?
         @path = @id = 'grid'
       end
@@ -645,9 +877,15 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        @chart.gridline_cget_tkstring(option)
+      end
       def cget(option)
         @chart.gridline_cget(option)
       end
+      def cget_strict(option)
+        @chart.gridline_cget_strict(option)
+      end
       def configure(key, value=None)
         @chart.gridline_configure(key, value)
         self
@@ -676,18 +914,35 @@ module Tk::BLT
     #################
 
     class Legend < TkObject
-      OBJ_TBL={}
+      LegendID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        LegendID_TBL.mutex.synchronize{ LegendID_TBL.clear }
+      }
 
       def self.new(chart, keys={})
-        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
-        super(chart, keys)
+        obj = nil
+        LegenedID_TBL.mutex.synchronize{
+          unless (obj = LegenedID_TBL[chart.path])
+            (obj = self.allocate).instance_eval{
+              @parent = @chart = chart
+              @cpath = @chart.path
+              @path = @id = 'crosshairs'
+              Legend::LegenedID_TBL[@cpath] = self
+            }
+          end
+        }
+        chart.legend_configure(keys) if obj && ! keys.empty?
+        obj
       end
 
       def initialize(chart, keys={})
+        # dummy:: not called by 'new' method
+
         @parent = @chart = chart
         @cpath = @chart.path
-        Crosshairs::OBJ_TBL[@cpath] = self
-        @chart.crosshair_configure(keys) unless keys.empty?
+        # Legend::LegendID_TBL[@cpath] = self
+        @chart.legend_configure(keys) unless keys.empty?
         @path = @id = 'legend'
       end
 
@@ -699,9 +954,15 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        @chart.legend_cget_tkstring(option)
+      end
       def cget(option)
         @chart.legend_cget(option)
       end
+      def cget_strict(option)
+        @chart.legend_cget_strict(option)
+      end
       def configure(key, value=None)
         @chart.legend_configure(key, value)
         self
@@ -729,13 +990,24 @@ module Tk::BLT
     #################
 
     class Pen < TkObject
-      OBJ_ID = ['blt_chart_pen'.freeze, '00000'.taint].freeze
-      OBJ_TBL={}
+      (OBJ_ID = ['blt_chart_pen'.freeze, TkUtil.untrust('00000')]).instance_eval{
+        @mutex = Mutex.new
+        def mutex; @mutex; end
+        freeze
+      }
+
+      PenID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        PenID_TBL.mutex.synchronize{ PenID_TBL.clear }
+      }
 
       def self.id2obj(chart, id)
         cpath = chart.path
-        return id unless OBJ_TBL[cpath]
-        OBJ_TBL[cpath][id]? OBJ_TBL[cpath][id]: id
+        PenID_TBL.mutex.synchronize{
+          return id unless PenID_TBL[cpath]
+          PenID_TBL[cpath][id]? PenID_TBL[cpath][id]: id
+        }
       end
 
       def self.new(chart, pen=nil, keys={})
@@ -743,9 +1015,43 @@ module Tk::BLT
           keys = pen
           pen = nil
         end
-        OBJ_TBL[chart.path] = {} unless OBJ_TBL[chart.path]
-        return OBJ_TBL[chart.path][pen] if pen && OBJ_TBL[chart.path][pen]
-        super(chart, pen, keys)
+        if keys
+          keys = _symbolkey2str(keys)
+          not_create = keys.delete('without_creating')
+        else
+          not_create = false
+        end
+
+        obj = nil
+        PenID_TBL.mutex.synchronize{
+          chart_path = chart.path
+          PenID_TBL[chart_path] ||= {}
+          if pen && PenID_TBL[chart_path][pen]
+            obj = PenID_TBL[chart_path][pen]
+          else
+            (obj = self.allocate).instance_eval{
+              if pen
+                @pen = @id = pen.to_s
+              else
+                OBJ_ID.mutex.synchronize{
+                  @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+                  OBJ_ID[1].succ!
+                }
+              end
+              @path = @id
+              @parent = @chart = chart
+              @cpath = @chart.path
+              Pen::PenID_TBL[@cpath][@pen] = self
+              unless not_create
+                tk_call(@chart, 'pen', 'create', @pen, keys)
+                return obj
+              end
+            }
+          end
+        }
+
+        obj.configure(keys) if obj && ! keys.empty?
+        obj
       end
 
       def initialize(chart, pen=nil, keys={})
@@ -756,13 +1062,15 @@ module Tk::BLT
         if pen
           @pen = @id = pen.to_s
         else
-          @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-          OBJ_ID[1].succ!
+          OBJ_ID.mutex.synchronize{
+            @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+            OBJ_ID[1].succ!
+          }
         end
         @path = @id
         @parent = @chart = chart
         @cpath = @chart.path
-        Pen::OBJ_TBL[@cpath][@pen] = self
+        Pen::PenID_TBL[@cpath][@pen] = self
         keys = _symbolkey2str(keys)
         unless keys.delete('without_creating')
           # @chart.pen_create(@pen, keys)
@@ -778,9 +1086,15 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        @chart.pen_cget_tkstring(@id, option)
+      end
       def cget(option)
         @chart.pen_cget(@id, option)
       end
+      def cget_strict(option)
+        @chart.pen_cget_strict(@id, option)
+      end
       def configure(key, value=None)
         @chart.pen_configure(@id, key, value)
         self
@@ -805,17 +1119,34 @@ module Tk::BLT
     #################
 
     class Postscript < TkObject
-      OBJ_TBL={}
+      PostscriptID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        PostscriptID_TBL.mutex.synchronize{ PostscriptID_TBL.clear }
+      }
 
       def self.new(chart, keys={})
-        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
-        super(chart, keys)
+        obj = nil
+        PostscriptID_TBL.mutex.synchronize{
+          unless (obj = PostscriptID_TBL[chart.path])
+            (obj = self.allocate).instance_eval{
+              @parent = @chart = chart
+              @cpath = @chart.path
+              @path = @id = 'postscript'
+              Postscript::PostscriptID_TBL[@cpath] = self
+            }
+          end
+        }
+        chart.postscript_configure(keys) if obj && ! keys.empty?
+        obj
       end
 
       def initialize(chart, keys={})
+        # dummy:: not called by 'new' method
+
         @parent = @chart = chart
         @cpath = @chart.path
-        Postscript::OBJ_TBL[@cpath] = self
+        # Postscript::PostscriptID_TBL[@cpath] = self
         @chart.postscript_configure(keys) unless keys.empty?
         @path = @id = 'postscript'
       end
@@ -828,9 +1159,15 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        @chart.postscript_cget_tkstring(option)
+      end
       def cget(option)
         @chart.postscript_cget(option)
       end
+      def cget_strict(option)
+        @chart.postscript_cget_strict(option)
+      end
       def configure(key, value=None)
         @chart.postscript_configure(key, value)
         self
@@ -870,7 +1207,9 @@ module Tk::BLT
       MarkerTypeToClass = {}
       MarkerID_TBL = TkCore::INTERP.create_table
 
-      TkCore::INTERP.init_ip_env{ MarkerID_TBL.clear }
+      TkCore::INTERP.init_ip_env{
+        MarkerID_TBL.mutex.synchronize{ MarkerID_TBL.clear }
+      }
 
       def Marker.type2class(type)
         MarkerTypeToClass[type]
@@ -878,8 +1217,13 @@ module Tk::BLT
 
       def Marker.id2obj(chart, id)
         cpath = chart.path
-        return id unless MarkerID_TBL[cpath]
-        MarkerID_TBL[cpath][id]? MarkerID_TBL[cpath][id]: id
+        MarkerID_TBL.mutex.synchronize{
+          if MarkerID_TBL[cpath]
+            MarkerID_TBL[cpath][id]? MarkerID_TBL[cpath][id]: id
+          else
+            id
+          end
+        }
       end
 
       def self._parse_create_args(keys)
@@ -902,6 +1246,13 @@ module Tk::BLT
             fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
           }
 
+          __item_optkey_aliases(nil).each{|alias_name, real_name|
+            alias_name = alias_name.to_s
+            if keys.has_key?(alias_name)
+              keys[real_name.to_s] = keys.delete(alias_name)
+            end
+          }
+
           __item_methodcall_optkeys(nil).each{|key|
             key = key.to_s
             methodkeys[key] = keys.delete(key) if keys.key?(key)
@@ -917,7 +1268,7 @@ module Tk::BLT
           args = []
         end
 
-        [args, fontkeys]
+        [args, fontkeys, methodkeys]
       end
       private_class_method :_parse_create_args
 
@@ -925,28 +1276,30 @@ module Tk::BLT
         unless self::MarkerTypeName
           fail RuntimeError, "#{self} is an abstract class"
         end
-        args, fontkeys = _parse_create_args(keys)
-        idnum = tk_call_without_enc(chart.path, 'marker', 'create', 
+        args, fontkeys, methodkeys = _parse_create_args(keys)
+        idnum = tk_call_without_enc(chart.path, 'marker', 'create',
                                     self::MarkerTypeName, *args)
         chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
+        chart.marker_configure(idnum, methodkeys) unless methodkeys.empty?
         idnum.to_i  # 'item id' is an integer number
       end
 
       def self.create_type(chart, type, keys={})
-        args, fontkeys = _parse_create_args(keys)
-        idnum = tk_call_without_enc(chart.path, 'marker', 'create', 
+        args, fontkeys, methodkeys = _parse_create_args(keys)
+        idnum = tk_call_without_enc(chart.path, 'marker', 'create',
                                     type, *args)
         chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
+        chart.marker_configure(idnum, methodkeys) unless methodkeys.empty?
         id = idnum.to_i  # 'item id' is an integer number
         obj = self.allocate
         obj.instance_eval{
           @parent = @chart = chart
           @cpath = chart.path
           @id = id
-          unless Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath]
-            Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] = {}
-          end
-          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
+          Tk::BLT::PlotComponent::Marker::MarkerID_TBL.mutex.synchronize{
+            Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] ||= {}
+            Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
+          }
         }
         obj
       end
@@ -956,10 +1309,10 @@ module Tk::BLT
         @cpath = parent.path
 
         @path = @id = create_self(*args) # an integer number as 'item id'
-        unless Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath]
-          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] = {}
-        end
-        Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
+        Tk::BLT::PlotComponent::Marker::MarkerID_TBL.mutex.synchronize{
+          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] ||= {}
+          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
+        }
       end
       def create_self(*args)
         self.class.create(@chart, *args) # return an integer as 'item id'
@@ -974,9 +1327,15 @@ module Tk::BLT
         @id
       end
 
+      def cget_tkstring(option)
+        @chart.marker_cget_tkstring(@id, option)
+      end
       def cget(option)
         @chart.marker_cget(@id, option)
       end
+      def cget_strict(option)
+        @chart.marker_cget_strict(@id, option)
+      end
       def configure(key, value=None)
         @chart.marker_configure(@id, key, value)
         self
@@ -1037,14 +1396,14 @@ module Tk::BLT
     #################
 
     def __destroy_hook__
-      Axis::OBJ_TBL.delete(@path)
-      Crosshairs::OBJ_TBL.delete(@path)
-      Element::OBJ_TBL.delete(@path)
-      GridLine::OBJ_TBL.delete(@path)
-      Legend::OBJ_TBL.delete(@path)
-      Pen::OBJ_TBL.delete(@path)
-      Postscript::OBJ_TBL.delete(@path)
-      Marker::OBJ_TBL.delete(@path)
+      Axis::AxisID_TBL.delete(@path)
+      Crosshairs::CrosshairsID_TBL.delete(@path)
+      Element::ElementID_TBL.delete(@path)
+      GridLine::GridLineID_TBL.delete(@path)
+      Legend::LegendID_TBL.delete(@path)
+      Pen::PenID_TBL.delete(@path)
+      Postscript::PostscriptID_TBL.delete(@path)
+      Marker::MarkerID_TBL.delete(@path)
       super()
     end
 
@@ -1188,7 +1547,7 @@ module Tk::BLT
       list(tk_send('axis', 'limits', tagid(id)))
     end
     def axis_names(*pats)
-      simplelist(tk_send('axis', 'names', 
+      simplelist(tk_send('axis', 'names',
                          *(pats.collect{|pat| tagid(pat)}))).collect{|axis|
         Tk::BLT::PlotComponent::Axis.id2obj(self, axis)
       }
@@ -1202,11 +1561,11 @@ module Tk::BLT
     end
     def axis_use(id, target=nil)
       if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self, 
-                                            tk_send('axis', 'use', 
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('axis', 'use',
                                                     tagid(id), tagid(target)))
       else
-        Tk::BLT::PlotComponent::Axis.id2obj(self, 
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
                                             tk_send('axis', 'use', tagid(id)))
       end
     end
@@ -1246,10 +1605,10 @@ module Tk::BLT
     def element_closest(x, y, var, *args)
       if args[-1].kind_of?(Hash)
         keys = args.pop
-        bool(tk_send('element', 'closest', x, y, var, 
+        bool(tk_send('element', 'closest', x, y, var,
                      *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
       else
-        bool(tk_send('element', 'closest', x, y, var, 
+        bool(tk_send('element', 'closest', x, y, var,
                      *(args.collect{|id| tagid(id)})))
       end
     end
@@ -1265,7 +1624,7 @@ module Tk::BLT
       bool(tk_send('element', 'exists', tagid(id)))
     end
     def element_names(*pats)
-      simplelist(tk_send('element', 'names', 
+      simplelist(tk_send('element', 'names',
                          *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
         Tk::BLT::PlotComponent::Element.id2obj(self, elem)
       }
@@ -1303,10 +1662,10 @@ module Tk::BLT
     def bar_closest(x, y, var, *args)
       if args[-1].kind_of?(Hash)
         keys = args.pop
-        bool(tk_send('bar', 'closest', x, y, var, 
+        bool(tk_send('bar', 'closest', x, y, var,
                      *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
       else
-        bool(tk_send('bar', 'closest', x, y, var, 
+        bool(tk_send('bar', 'closest', x, y, var,
                      *(args.collect{|id| tagid(id)})))
       end
     end
@@ -1322,7 +1681,7 @@ module Tk::BLT
       bool(tk_send('bar', 'exists', tagid(id)))
     end
     def bar_names(*pats)
-      simplelist(tk_send('bar', 'names', 
+      simplelist(tk_send('bar', 'names',
                          *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
         Tk::BLT::PlotComponent::Element.id2obj(self, elem)
       }
@@ -1360,10 +1719,10 @@ module Tk::BLT
     def line_closest(x, y, var, *args)
       if args[-1].kind_of?(Hash)
         keys = args.pop
-        bool(tk_send('line', 'closest', x, y, var, 
+        bool(tk_send('line', 'closest', x, y, var,
                      *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
       else
-        bool(tk_send('line', 'closest', x, y, var, 
+        bool(tk_send('line', 'closest', x, y, var,
                      *(args.collect{|id| tagid(id)})))
       end
     end
@@ -1379,7 +1738,7 @@ module Tk::BLT
       bool(tk_send('line', 'exists', tagid(id)))
     end
     def line_names(*pats)
-      simplelist(tk_send('line', 'names', 
+      simplelist(tk_send('line', 'names',
                          *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
         Tk::BLT::PlotComponent::Element.id2obj(self, elem)
       }
@@ -1425,7 +1784,7 @@ module Tk::BLT
         keys.delete('without_creating')
       end
 
-      legend = self.class.new(parent, :without_creating=>true, 
+      legend = self.class.new(parent, :without_creating=>true,
                               :widgetname=>widgetname)
       class << legend
         def __destroy_hook__
@@ -1442,24 +1801,24 @@ module Tk::BLT
     end
 
     def legend_activate(*pats)
-      list(tk_send('legend', 'activate', 
+      list(tk_send('legend', 'activate',
                    *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
         Tk::BLT::PlotComponent::Element.id2obj(self, elem)
       }
     end
     def legend_deactivate(*pats)
-      list(tk_send('legend', 'deactivate', 
+      list(tk_send('legend', 'deactivate',
                    *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
         Tk::BLT::PlotComponent::Element.id2obj(self, elem)
       }
     end
     def legend_get(pos, y=nil)
       if y
-        Tk::BLT::PlotComponent::Element.id2obj(self, 
-                                               tk_send('legend', 'get', 
+        Tk::BLT::PlotComponent::Element.id2obj(self,
+                                               tk_send('legend', 'get',
                                                        _at(pos, y)))
       else
-        Tk::BLT::PlotComponent::Element.id2obj(self, 
+        Tk::BLT::PlotComponent::Element.id2obj(self,
                                                tk_send('legend', 'get', pos))
       end
     end
@@ -1475,7 +1834,7 @@ module Tk::BLT
       self
     end
     def pen_names(*pats)
-      simplelist(tk_send('pen', 'names', 
+      simplelist(tk_send('pen', 'names',
                          *(pats.collect{|pat| tagid(pat)}))).collect{|pen|
         Tk::BLT::PlotComponent::Pen.id2obj(self, pen)
       }
@@ -1545,7 +1904,7 @@ module Tk::BLT
       bool(tk_send('marker', 'exists', tagid(id)))
     end
     def marker_names(*pats)
-      simplelist(tk_send('marker', 'names', 
+      simplelist(tk_send('marker', 'names',
                          *(pats.collect{|pat| tagid(pat)}))).collect{|id|
         Tk::BLT::PlotComponent::Marker.id2obj(self, id)
       }
@@ -1556,20 +1915,26 @@ module Tk::BLT
 
     ###################
 
+    def xaxis_cget_tkstring(option)
+      itemcget_tkstring('xaxis', option)
+    end
     def xaxis_cget(option)
       itemcget('xaxis', option)
     end
+    def xaxis_cget_strict(option)
+      itemcget_strict('xaxis', option)
+    end
     def xaxis_configure(slot, value=None)
       if slot.kind_of?(Hash)
         slot = _symbolkey2str(slot)
         if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick| 
+          slot['command'] = proc{|w, tick|
             cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
           }
         end
       elsif slot == :command || slot == 'command'
         cmd = value
-        value = proc{|w, tick| 
+        value = proc{|w, tick|
           cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
         }
       end
@@ -1617,28 +1982,34 @@ module Tk::BLT
     end
     def xaxis_use(target=nil)
       if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self, 
-                                            tk_send('xaxis', 'use', 
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('xaxis', 'use',
                                                     tagid(target)))
       else
         Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('xaxis', 'use'))
       end
     end
 
+    def x2axis_cget_tkstring(option)
+      itemcget_tkstring('x2axis', option)
+    end
     def x2axis_cget(option)
       itemcget('x2axis', option)
     end
+    def x2axis_cget_strict(option)
+      itemcget_strict('x2axis', option)
+    end
     def x2axis_configure(slot, value=None)
       if slot.kind_of?(Hash)
         slot = _symbolkey2str(slot)
         if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick| 
+          slot['command'] = proc{|w, tick|
             cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
           }
         end
       elsif slot == :command || slot == 'command'
         cmd = value
-        value = proc{|w, tick| 
+        value = proc{|w, tick|
           cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
         }
       end
@@ -1686,28 +2057,34 @@ module Tk::BLT
     end
     def x2axis_use(target=nil)
       if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self, 
-                                            tk_send('x2axis', 'use', 
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('x2axis', 'use',
                                                     tagid(target)))
       else
         Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('x2axis', 'use'))
       end
     end
 
+    def yaxis_cget_tkstring(option)
+      itemcget_tkstring('yaxis', option)
+    end
     def yaxis_cget(option)
       itemcget('yaxis', option)
     end
+    def yaxis_cget_strict(option)
+      itemcget_strict('yaxis', option)
+    end
     def yaxis_configure(slot, value=None)
       if slot.kind_of?(Hash)
         slot = _symbolkey2str(slot)
         if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick| 
+          slot['command'] = proc{|w, tick|
             cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
           }
         end
       elsif slot == :command || slot == 'command'
         cmd = value
-        value = proc{|w, tick| 
+        value = proc{|w, tick|
           cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
         }
       end
@@ -1755,28 +2132,34 @@ module Tk::BLT
     end
     def yaxis_use(target=nil)
       if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self, 
-                                            tk_send('yaxis', 'use', 
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('yaxis', 'use',
                                                     tagid(target)))
       else
         Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('yaxis', 'use'))
       end
     end
 
+    def y2axis_cget_tkstring(option)
+      itemcget_tkstring('y2axis', option)
+    end
     def y2axis_cget(option)
       itemcget('y2axis', option)
     end
+    def y2axis_cget_strict(option)
+      itemcget_strict('y2axis', option)
+    end
     def y2axis_configure(slot, value=None)
       if slot.kind_of?(Hash)
         slot = _symbolkey2str(slot)
         if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick| 
+          slot['command'] = proc{|w, tick|
             cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
           }
         end
       elsif slot == :command || slot == 'command'
         cmd = value
-        value = proc{|w, tick| 
+        value = proc{|w, tick|
           cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
         }
       end
@@ -1824,8 +2207,8 @@ module Tk::BLT
     end
     def y2axis_use(target=nil)
       if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self, 
-                                            tk_send('y2axis', 'use', 
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('y2axis', 'use',
                                                     tagid(target)))
       else
         Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('y2axis', 'use'))
diff --git a/ext/tk/lib/tkextlib/blt/container.rb b/ext/tk/lib/tkextlib/blt/container.rb
index cdbec21f25..be05828d95 100644
--- a/ext/tk/lib/tkextlib/blt/container.rb
+++ b/ext/tk/lib/tkextlib/blt/container.rb
@@ -10,7 +10,7 @@ module Tk::BLT
   class Container < TkWindow
     TkCommandNames = ['::blt::container'.freeze].freeze
     WidgetClassName = 'Container'.freeze
-    WidgetClassNames[WidgetClassName] = self
+    WidgetClassNames[WidgetClassName] ||= self
 
     def __strval_optkeys
       super() << 'name'
diff --git a/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ext/tk/lib/tkextlib/blt/dragdrop.rb
index 68fb9e591a..aa5c5654c2 100644
--- a/ext/tk/lib/tkextlib/blt/dragdrop.rb
+++ b/ext/tk/lib/tkextlib/blt/dragdrop.rb
@@ -15,7 +15,7 @@ module Tk::BLT
 
     class Token < TkWindow
       WidgetClassName = 'DragDropToken'.freeze
-      WidgetClassNames[WidgetClassName] = self
+      WidgetClassNames[WidgetClassName] ||= self
 
       def initialize(arg)
         if arg.kind_of?(Hash) # arg is a hash includes the widgetpath of token
@@ -55,6 +55,7 @@ module Tk::BLT
       private :__item_strval_optkeys
 
       undef itemcget
+      undef itemcget_tkstring
       private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
       def source_configure(win, slot, value=None)
@@ -77,10 +78,28 @@ module Tk::BLT
         ]
 
         PROC_TBL = [
-          [ ?w, TkComm.method(:window) ], 
+          [ ?w, TkComm.method(:window) ],
           nil
         ]
 
+=begin
+        # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+        KEY_TBL.map!{|inf|
+          if inf.kind_of?(Array)
+            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+            inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+          end
+          inf
+        }
+
+        PROC_TBL.map!{|inf|
+          if inf.kind_of?(Array)
+            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          end
+          inf
+        }
+=end
+
         _setup_subst_table(KEY_TBL, PROC_TBL)
 
         def self.ret_val(val)
@@ -102,11 +121,29 @@ module Tk::BLT
         ]
 
         PROC_TBL = [
-          [ ?b, TkComm.method(:bool) ], 
-          [ ?w, TkComm.method(:window) ], 
+          [ ?b, TkComm.method(:bool) ],
+          [ ?w, TkComm.method(:window) ],
           nil
         ]
 
+=begin
+        # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+        KEY_TBL.map!{|inf|
+          if inf.kind_of?(Array)
+            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+            inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+          end
+          inf
+        }
+
+        PROC_TBL.map!{|inf|
+          if inf.kind_of?(Array)
+            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          end
+          inf
+        }
+=end
+
         _setup_subst_table(KEY_TBL, PROC_TBL)
 
         def self.ret_val(val)
@@ -139,24 +176,42 @@ module Tk::BLT
       ]
 
       PROC_TBL = [
-        [ ?i, TkComm.method(:string) ], 
-        [ ?v, TkComm.method(:tk_tcl2ruby) ], 
-        [ ?w, TkComm.method(:window) ], 
+        [ ?i, TkComm.method(:string) ],
+        [ ?v, TkComm.method(:tk_tcl2ruby) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL)
     end
 
     def self.source_handler(win, datatype, cmd=Proc.new, *args)
-      _bind_for_event_class(DnD_Handle, 
-                            ['::blt::drag&drop', 'source', win, 'handler'], 
+      _bind_for_event_class(DnD_Handle,
+                            ['::blt::drag&drop', 'source', win, 'handler'],
                             cmd, *args)
     end
 
     def self.target_handler(win, datatype, cmd=Proc.new, *args)
-      _bind_for_event_class(DnD_Handle, 
-                            ['::blt::drag&drop', 'target', win, 'handler'], 
+      _bind_for_event_class(DnD_Handle,
+                            ['::blt::drag&drop', 'target', win, 'handler'],
                             cmd, *args)
     end
 
diff --git a/ext/tk/lib/tkextlib/blt/eps.rb b/ext/tk/lib/tkextlib/blt/eps.rb
index 586a42470c..0dba87a7cc 100644
--- a/ext/tk/lib/tkextlib/blt/eps.rb
+++ b/ext/tk/lib/tkextlib/blt/eps.rb
@@ -14,7 +14,7 @@ module Tk::BLT
   end
 end
 
-class TkCanvas
+class Tk::Canvas
   alias __BLT_EPS_item_strval_optkeys __item_strval_optkeys
   def __item_strval_optkeys(id)
     __BLT_EPS_item_strval_optkeys(id) + [
diff --git a/ext/tk/lib/tkextlib/blt/graph.rb b/ext/tk/lib/tkextlib/blt/graph.rb
index 9ae99bff5c..6bd4424065 100644
--- a/ext/tk/lib/tkextlib/blt/graph.rb
+++ b/ext/tk/lib/tkextlib/blt/graph.rb
@@ -11,7 +11,7 @@ module Tk::BLT
   class Graph < TkWindow
     TkCommandNames = ['::blt::graph'.freeze].freeze
     WidgetClassName = 'Graph'.freeze
-    WidgetClassNames[WidgetClassName] = self
+    WidgetClassNames[WidgetClassName] ||= self
 
     include PlotComponent
     include GraphCommand
@@ -27,7 +27,7 @@ module Tk::BLT
     private :__strval_optkeys
 
 =begin
-    BarElement_ID = ['blt_graph_bar'.freeze, '00000'.taint].freeze
+    BarElement_ID = ['blt_graph_bar'.freeze, TkUtil.untrust('00000')].freeze
 
     def bar(elem=nil, keys={})
       if elem.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/blt/htext.rb b/ext/tk/lib/tkextlib/blt/htext.rb
index a0cf3dc036..878bd9982d 100644
--- a/ext/tk/lib/tkextlib/blt/htext.rb
+++ b/ext/tk/lib/tkextlib/blt/htext.rb
@@ -19,9 +19,11 @@ module Tk::BLT
 
     TkCommandNames = ['::blt::htext'.freeze].freeze
     WidgetClassName = 'Htext'.freeze
-    WidgetClassNames[WidgetClassName] = self
+    WidgetClassNames[WidgetClassName] ||= self
 
+    alias window_cget_tkstring itemcget_tkstring
     alias window_cget itemcget
+    alias window_cget_strict itemcget_strict
     alias window_configure itemconfigure
     alias window_configuinfo itemconfiginfo
     alias current_window_configuinfo current_itemconfiginfo
diff --git a/ext/tk/lib/tkextlib/blt/setup.rb b/ext/tk/lib/tkextlib/blt/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/blt/setup.rb
+++ b/ext/tk/lib/tkextlib/blt/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/blt/stripchart.rb b/ext/tk/lib/tkextlib/blt/stripchart.rb
index fe5afbb095..74093f1868 100644
--- a/ext/tk/lib/tkextlib/blt/stripchart.rb
+++ b/ext/tk/lib/tkextlib/blt/stripchart.rb
@@ -11,7 +11,7 @@ module Tk::BLT
   class Stripchart < TkWindow
     TkCommandNames = ['::blt::stripchart'.freeze].freeze
     WidgetClassName = 'Stripchart'.freeze
-    WidgetClassNames[WidgetClassName] = self
+    WidgetClassNames[WidgetClassName] ||= self
 
     include PlotComponent
     include GraphCommand
@@ -22,13 +22,13 @@ module Tk::BLT
     private :__boolval_optkeys
 
     def __strval_optkeys
-      ['text', 'label', 'title', 'file', 
+      ['text', 'label', 'title', 'file',
         'background', 'plotbackground']
     end
     private :__strval_optkeys
 
 =begin
-    BarElement_ID = ['blt_stripchart_bar'.freeze, '00000'.taint].freeze
+    BarElement_ID = ['blt_stripchart_bar'.freeze, TkUtil.untrust('00000')].freeze
 
     def bar(elem=nil, keys={})
       if elem.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/blt/table.rb b/ext/tk/lib/tkextlib/blt/table.rb
index 0be9d8d42a..205e29e6c5 100644
--- a/ext/tk/lib/tkextlib/blt/table.rb
+++ b/ext/tk/lib/tkextlib/blt/table.rb
@@ -26,9 +26,15 @@ module Tk::BLT
         self
       end
 
+      def blt_table_cget_tkstring(*args)
+        Tk::BLT::Table.cget_tkstring(self, *args)
+      end
       def blt_table_cget(*args)
         Tk::BLT::Table.cget(self, *args)
       end
+      def blt_table_cget_strict(*args)
+        Tk::BLT::Table.cget_strict(self, *args)
+      end
 
       def blt_table_configure(*args)
         Tk::BLT::Table.configure(self, *args)
@@ -89,9 +95,15 @@ module Tk::BLT
         self
       end
 
+      def blt_table_itemcget_tkstring(*args)
+        Tk::BLT::Table.itemcget_tkstring(self, *args)
+      end
       def blt_table_itemcget(*args)
         Tk::BLT::Table.itemcget(self, *args)
       end
+      def blt_table_itemcget_strict(*args)
+        Tk::BLT::Table.itemcget_strict(self, *args)
+      end
 
       def blt_table_itemconfigure(*args)
         Tk::BLT::Table.itemconfigure(self, *args)
@@ -135,13 +147,15 @@ class << Tk::BLT::Table
   end
   private :__item_pathname
 
+  alias __itemcget_tkstring itemcget_tkstring
   alias __itemcget itemcget
+  alias __itemcget_strict itemcget_strict
   alias __itemconfigure itemconfigure
   alias __itemconfiginfo itemconfiginfo
   alias __current_itemconfiginfo current_itemconfiginfo
 
-  private :__itemcget, :__itemconfigure
-  private :__itemconfiginfo, :__current_itemconfiginfo
+  private :__itemcget_tkstring, :__itemcget, :__itemcget_strict
+  private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
 
   def __boolval_optkeys
     super() << 'propagate'
@@ -173,9 +187,15 @@ class << Tk::BLT::Table
 
   ############################################
 
+  def cget_tkstring(container, option)
+    __itemcget_tkstring([container], option)
+  end
   def cget(container, option)
     __itemcget([container], option)
   end
+  def cget_strict(container, option)
+    __itemcget_strict([container], option)
+  end
 
   def configure(container, *args)
     __itemconfigure([container], *args)
@@ -189,9 +209,15 @@ class << Tk::BLT::Table
     __current_itemconfiginfo([container], *args)
   end
 
+  def itemcget_tkstring(container, item, option)
+    __itemcget_tkstring([container, tagid(item)], option)
+  end
   def itemcget(container, item, option)
     __itemcget([container, tagid(item)], option)
   end
+  def itemcget_strict(container, item, option)
+    __itemcget_strict([container, tagid(item)], option)
+  end
 
   def itemconfigure(container, *args)
     if args[-1].kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/blt/tabnotebook.rb b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
index 508fa2b82f..82936c67d3 100644
--- a/ext/tk/lib/tkextlib/blt/tabnotebook.rb
+++ b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
@@ -11,11 +11,100 @@ module Tk::BLT
   class Tabnotebook < Tabset
     TkCommandNames = ['::blt::tabnotebook'.freeze].freeze
     WidgetClassName = 'Tabnotebook'.freeze
-    WidgetClassNames[WidgetClassName] = self
+    WidgetClassNames[WidgetClassName] ||= self
+
+    class Tab < Tk::BLT::Tabset::Tab
+      def self.new(parent, pos=nil, name=nil, keys={})
+        if pos.kind_of?(Hash)
+          keys = pos
+          name = nil
+          pos  = nil
+        end
+        if name.kind_of?(Hash)
+          keys = name
+          name = nil
+        end
+        obj = nil
+        TabID_TBL.mutex.synchronize{
+          if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
+            obj = TabID_TBL[parent.path][name]
+            if pos
+              if pos.to_s == 'end'
+                obj.move_after('end')
+              else
+                obj.move_before(pos)
+              end
+            end
+            obj.configure if keys && ! keys.empty?
+          else
+            (obj = self.allocate).instance_eval{
+              initialize(parent, pos, name, keys)
+              TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
+              TabID_TBL[@tpath][@id] = self
+            }
+          end
+        }
+        obj
+      end
+
+      def initialize(parent, pos, name, keys)
+        @t = parent
+        @tpath = parent.path
+        if name
+          @path = @id = name
+          unless (list(tk_call(@tpath, 'tab', 'names', @id)).empty?)
+            if pos
+              idx = tk_call(@tpath, 'index', @id)
+              if pos.to_s == 'end'
+                tk_call(@tpath, 'move', idx, 'after', 'end')
+              else
+                tk_call(@tpath, 'move', idx, 'before', pos)
+              end
+            end
+            tk_call(@tpath, 'tab', 'configure', @id, keys)
+          else
+            fail ArgumentError, "can't find tab \"#{@id}\" in #{@t}"
+          end
+        else
+          pos = 'end' unless pos
+          @path = @id = tk_call(@tpath, 'insert', pos, keys)
+        end
+      end
+    end
+
+    #######################################
 
     def get_tab(index)
-      Tk::BLT::Tabset::Tab.id2obj(tk_send_without_enc('id', tagindex(index)))
+      if (idx = tk_send_without_enc('id', tagindex(index))).empty?
+        nil
+      else
+        Tk::BLT::Tabset::Tab.id2obj(self, idx)
+      end
     end
     alias get_id get_tab
+
+    def get_tabobj(index)
+      if (idx = tk_send_without_enc('id', tagindex(index))).empty?
+        nil
+      else
+        Tk::BLT::Tabnotebook::Tab.new(self, nil, idx)
+      end
+    end
+
+    alias index_name index
+
+    def insert(pos=nil, keys={})
+      if pos.kind_of?(Hash)
+        keys = pos
+        pos = nil
+      end
+      pos = 'end' if pos.nil?
+      Tk::BLT::Tabnotebook::Tab.new(self, nil,
+                                    tk_send('insert', tagindex(pos), keys))
+
+    end
+    undef :insert_tabs
+
+    undef :tab_pageheight, :tab_pagewidth
   end
 end
diff --git a/ext/tk/lib/tkextlib/blt/tabset.rb b/ext/tk/lib/tkextlib/blt/tabset.rb
index c26b6ee001..c4716c7304 100644
--- a/ext/tk/lib/tkextlib/blt/tabset.rb
+++ b/ext/tk/lib/tkextlib/blt/tabset.rb
@@ -12,14 +12,26 @@ module Tk::BLT
       include TkTreatItemFont
 
       TabID_TBL = TkCore::INTERP.create_table
-      TabsetTab_ID = ['blt_tabset_tab'.freeze, '00000'.taint].freeze
 
-      TkCore::INTERP.init_ip_env{ TabID_TBL.clear }
+      (TabsetTab_ID = ['blt_tabset_tab'.freeze, TkUtil.untrust('00000')]).instance_eval{
+        @mutex = Mutex.new
+        def mutex; @mutex; end
+        freeze
+      }
+
+      TkCore::INTERP.init_ip_env{
+        TabID_TBL.mutex.synchronize{ TabID_TBL.clear }
+      }
 
       def self.id2obj(tabset, id)
         tpath = tabset.path
-        return id unless TabID_TBL[tpath]
-        TabID_TBL[tpath][id]? TabID_TBL[tpath]: id
+        TabID_TBL.mutex.synchronize{
+          if TabID_TBL[tpath]
+            TabID_TBL[tpath][id]? TabID_TBL[tpath][id]: id
+          else
+            id
+          end
+        }
       end
 
       def self.new(parent, pos=nil, name=nil, keys={})
@@ -32,12 +44,27 @@ module Tk::BLT
           keys = name
           name = nil
         end
-
-        if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
-          TabID_TBL[parent.path][name]
-        else
-          super(parent, pos, name, keys)
-        end
+        obj = nil
+        TabID_TBL.mutex.synchronize{
+          if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
+            obj = TabID_TBL[parent.path][name]
+            if pos
+              if pos.to_s == 'end'
+                obj.move_after('end')
+              else
+                obj.move_before(pos)
+              end
+            end
+            obj.configure if keys && ! keys.empty?
+          else
+            (obj = self.allocate).instance_eval{
+              initialize(parent, pos, name, keys)
+              TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
+              TabID_TBL[@tpath][@id] = self
+            }
+          end
+        }
+        obj
       end
 
       def initialize(parent, pos, name, keys)
@@ -45,31 +72,28 @@ module Tk::BLT
         @tpath = parent.path
         if name
           @path = @id = name
-          TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
-          TabID_TBL[@tpath][@id] = self
-
           unless (list(tk_call(@tpath, 'tab', 'names', @id)).empty?)
             if pos
               idx = tk_call(@tpath, 'index', '-name', @id)
               if pos.to_s == 'end'
-                tk_call(@tpath, idx, 'moveto', 'after', 'end')
+                tk_call(@tpath, 'move', idx, 'after', 'end')
               else
-                tk_call(@tpath, idx, 'moveto', 'before', pos)
+                tk_call(@tpath, 'move', idx, 'before', pos)
               end
             end
             tk_call(@tpath, 'tab', 'configure', @id, keys)
-            return
+          else
+            pos = 'end' unless pos
+            tk_call(@tpath, 'insert', pos, @id, keys)
           end
-
         else
-          @path = @id = TabsetTab_ID.join(TkCore::INTERP._ip_id_)
-          TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
-          TabID_TBL[@tpath][@id] = self
-          TabsetTab_ID[1].succ!
+          pos = 'end' unless pos
+          TabsetTab_ID.mutex.synchronize{
+            @path = @id = TabsetTab_ID.join(TkCore::INTERP._ip_id_)
+            TabsetTab_ID[1].succ!
+          }
+          tk_call(@tpath, 'insert', pos, @id, keys)
         end
-
-        pos = 'end' unless pos
-        tk_call(@tpath, 'insert', pos, @id, keys)
       end
 
       #def bind(context, cmd=Proc.new, *args)
@@ -108,9 +132,15 @@ module Tk::BLT
         @t.tab_bindinfo(@id, context)
       end
 
+      def cget_tkstring(*args)
+        @t.tab_cget_tkstring(@id, *args)
+      end
       def cget(*args)
         @t.tab_cget(@id, *args)
       end
+      def cget_strict(*args)
+        @t.tab_cget_strict(@id, *args)
+      end
       def configure(*args)
         @t.tab_configure(@id, *args)
       end
@@ -123,7 +153,9 @@ module Tk::BLT
 
       def delete()
         @t.delete(@id)
-        TabID_TBL[@tpath].delete(@id)
+        TabID_TBL.mutex.synchronize{
+          TabID_TBL[@tpath].delete(@id)
+        }
         self
       end
 
@@ -151,10 +183,10 @@ module Tk::BLT
       end
 
       def perforation_highlight(mode)
-        @t.perforation.highlight(self.index, mode)
+        @t.perforation_highlight(self.index, mode)
       end
       def perforation_invoke()
-        @t.perforation.invoke(self.index)
+        @t.perforation_invoke(self.index)
       end
 
       def see()
@@ -181,10 +213,12 @@ module Tk::BLT
 
     TkCommandNames = ['::blt::tabset'.freeze].freeze
     WidgetClassName = 'Tabset'.freeze
-    WidgetClassNames[WidgetClassName] = self
+    WidgetClassNames[WidgetClassName] ||= self
 
     def __destroy_hook__
-      Tk::BLT::Tabset::Tab::TabID_TBL.delete(@path)
+      Tk::BLT::Tabset::Tab::TabID_TBL.mutex.synchronize{
+        Tk::BLT::Tabset::Tab::TabID_TBL.delete(@path)
+      }
     end
 
     ########################################
@@ -218,7 +252,9 @@ module Tk::BLT
     end
     private :__item_pathname
 
+    alias tab_cget_tkstring itemcget_tkstring
     alias tab_cget itemcget
+    alias tab_cget_strict itemcget_strict
     alias tab_configure itemconfigure
     alias tab_configinfo itemconfiginfo
     alias current_tab_configinfo current_itemconfiginfo
@@ -291,11 +327,15 @@ module Tk::BLT
     def delete(first, last=None)
       tk_send('delete', tagindex(first), tagindex(last))
       if first.kind_of?(Tk::BLT::Tabset::Tab)
-        TabID_TBL[@path].delete(first.id)
+        TabID_TBL.mutex.synchronize{
+          TabID_TBL[@path].delete(first.id)
+        }
       end
       # middle tabs of the range are unknown
       if last.kind_of?(Tk::BLT::Tabset::Tab)
-        TabID_TBL[@path].delete(last.id)
+        TabID_TBL.mutex.synchronize{
+          TabID_TBL[@path].delete(last.id)
+        }
       end
       self
     end
@@ -306,19 +346,43 @@ module Tk::BLT
     end
 
     def get_tab(index)
-      Tk::BLT::Tabset::Tab.id2obj(tk_send_without_enc('get', tagindex(index)))
+      if (idx = tk_send_without_enc('get', tagindex(index))).empty?
+        nil
+      else
+        Tk::BLT::Tabset::Tab.id2obj(self, idx)
+      end
+    end
+    def get_tabobj(index)
+      if (idx = tk_send_without_enc('get', tagindex(index))).empty?
+        nil
+      else
+       Tk::BLT::Tabset::Tab.new(self, nil, name, {})
+      end
     end
 
     def index(str)
       num_or_str(tk_send('index', str))
     end
     def index_name(tab)
-      num_or_str(tk_send('index', '-mame', tagid(tab)))
+      num_or_str(tk_send('index', '-name', tagid(tab)))
     end
 
     def insert(pos, tab, keys={})
+      pos = 'end' if pos.nil?
       Tk::BLT::Tabset::Tab.new(self, tagindex(pos), tagid(tab), keys)
     end
+    def insert_tabs(pos, *tabs)
+      pos = 'end' if pos.nil?
+      if tabs[-1].kind_of?(Hash)
+        keys = tabs.pop
+      else
+        keys = {}
+      end
+      fail ArgumentError, 'no tabs is given' if tabs.empty?
+      tabs.map!{|tab| tagid(tab)}
+      tk_send('insert', tagindex(pos), *(tabs + [keys]))
+      tabs.collect{|tab| Tk::BLT::Tabset::Tab.new(self, nil, tagid(tab))}
+    end
 
     def invoke(index)
       tk_send('invoke', tagindex(index))
@@ -334,15 +398,31 @@ module Tk::BLT
     end
 
     def nearest(x, y)
-      Tk::BLT::Tabset::Tab.id2obj(num_or_str(tk_send_without_enc('nearest', x, y)))
+      Tk::BLT::Tabset::Tab.id2obj(self, num_or_str(tk_send_without_enc('nearest', x, y)))
     end
 
-    def perforation_highlight(index, mode)
-      tk_send('perforation', 'highlight', tagindex(index), mode)
+    def perforation_activate(mode)
+      tk_send('perforation', 'activate', mode)
       self
     end
-    def perforation_invoke(index)
-      tk_send('perforation', 'invoke', tagindex(index))
+    def perforation_highlight(index, *args)
+      if args.empty?
+        # index --> mode
+        tk_send('perforation', 'highlight', index)
+      elsif args.size == 1
+        # args[0] --> mode
+        tk_send('perforation', 'highlight', tagindex(index), args[0])
+      else # Error: call to get Tcl's error message
+        tk_send('perforation', 'highlight', tagindex(index), *args)
+      end
+      self
+    end
+    def perforation_invoke(index=nil)
+      if index
+        tk_send('perforation', 'invoke', tagindex(index))
+      else
+        tk_send('perforation', 'invoke')
+      end
     end
 
     def scan_mark(x, y)
@@ -368,14 +448,37 @@ module Tk::BLT
       self
     end
 
+    def tab_dockall
+      tk_send('tab', 'dockall')
+      self
+    end
+
     def tab_names(pat=None)
       simplelist(tk_send('tab', 'names', pat)).collect{|name|
-        Tk::BLT::Tabset::Tab.id2obj(name)
+        Tk::BLT::Tabset::Tab.id2obj(self, name)
+      }
+    end
+
+    def tab_objs(pat=None)
+      simplelist(tk_send('tab', 'names', pat)).collect{|name|
+        Tk::BLT::Tabset::Tab.new(self, nil, name, {})
       }
     end
 
-    def tab_tearoff(index, name=None)
-      window(tk_send('tab', 'tearoff', tagindex(index), name))
+    def tab_ids(pat=None)
+      simplelist(tk_send('tab', 'names', pat))
+    end
+
+    def tab_pageheight
+      number(tk_send('tab', 'pageheight'))
+    end
+
+    def tab_pagewidth
+      number(tk_send('tab', 'pagewidth'))
+    end
+
+    def tab_tearoff(index, parent=None)
+      window(tk_send('tab', 'tearoff', tagindex(index), parent))
     end
 
     def xscrollcommand(cmd=Proc.new)
diff --git a/ext/tk/lib/tkextlib/blt/ted.rb b/ext/tk/lib/tkextlib/blt/ted.rb
index 39495842b4..53ab9acdaa 100644
--- a/ext/tk/lib/tkextlib/blt/ted.rb
+++ b/ext/tk/lib/tkextlib/blt/ted.rb
@@ -30,11 +30,17 @@ module Tk::BLT
       end
       private :__item_config_cmd
 
-      private :itemcget, :itemconfigure
-      private :itemconfiginfo, :current_itemconfiginfo
+      private :itemcget_tkstring, :itemcget, :itemcget_strict
+      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
+      def cget_tkstring(master, option)
+        itemcget_tkstring(master, option)
+      end
       def cget(master, option)
-        itemconfigure(master, slot, value)
+        itemcget(master, option)
+      end
+      def cget_strict(master, option)
+        itemcget_strict(master, option)
       end
       def configure(master, slot, value=None)
         itemconfigure(master, slot, value)
diff --git a/ext/tk/lib/tkextlib/blt/tile.rb b/ext/tk/lib/tkextlib/blt/tile.rb
index 5f5242f299..c67cafd8d6 100644
--- a/ext/tk/lib/tkextlib/blt/tile.rb
+++ b/ext/tk/lib/tkextlib/blt/tile.rb
@@ -8,6 +8,10 @@ require 'tkextlib/blt.rb'
 
 module Tk::BLT
   module Tile
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+    # Require autoload-symbols which is a same name as widget classname.
+    # Those are used at  TkComm._genobj_for_tkwidget method.
+
     autoload :Button,      'tkextlib/blt/tile/button.rb'
     autoload :CheckButton, 'tkextlib/blt/tile/checkbutton.rb'
     autoload :Checkbutton, 'tkextlib/blt/tile/checkbutton.rb'
diff --git a/ext/tk/lib/tkextlib/blt/tile/button.rb b/ext/tk/lib/tkextlib/blt/tile/button.rb
index dd715c8b98..2e0863cfbe 100644
--- a/ext/tk/lib/tkextlib/blt/tile/button.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/button.rb
@@ -9,7 +9,7 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class Button < TkButton
+    class Button < Tk::Button
       TkCommandNames = ['::blt::tile::button'.freeze].freeze
     end
   end
diff --git a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
index ad58999d86..da230b5925 100644
--- a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
@@ -9,7 +9,7 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class CheckButton < TkCheckButton
+    class CheckButton < Tk::CheckButton
       TkCommandNames = ['::blt::tile::checkbutton'.freeze].freeze
     end
     Checkbutton = CheckButton
diff --git a/ext/tk/lib/tkextlib/blt/tile/frame.rb b/ext/tk/lib/tkextlib/blt/tile/frame.rb
index 10469fd35f..5434af4b72 100644
--- a/ext/tk/lib/tkextlib/blt/tile/frame.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/frame.rb
@@ -9,7 +9,7 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class Frame < TkFrame
+    class Frame < Tk::Frame
       TkCommandNames = ['::blt::tile::frame'.freeze].freeze
     end
   end
diff --git a/ext/tk/lib/tkextlib/blt/tile/label.rb b/ext/tk/lib/tkextlib/blt/tile/label.rb
index ec67babd58..f370c1403b 100644
--- a/ext/tk/lib/tkextlib/blt/tile/label.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/label.rb
@@ -9,7 +9,7 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class Label < TkLabel
+    class Label < Tk::Label
       TkCommandNames = ['::blt::tile::label'.freeze].freeze
     end
   end
diff --git a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
index 2316923b19..814f9a5cc4 100644
--- a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
@@ -9,7 +9,7 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class RadioButton < TkRadioButton
+    class RadioButton < Tk::RadioButton
       TkCommandNames = ['::blt::tile::radiobutton'.freeze].freeze
     end
     Radiobutton = RadioButton
diff --git a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb b/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
index ba3bf316f0..2ae871d518 100644
--- a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
@@ -9,7 +9,7 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class Scrollbar < TkScrollbar
+    class Scrollbar < Tk::Scrollbar
       TkCommandNames = ['::blt::tile::scrollbar'.freeze].freeze
     end
   end
diff --git a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb b/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
index 6cc2c91415..76d5f86b1b 100644
--- a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
@@ -9,7 +9,7 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class Toplevel < TkToplevel
+    class Toplevel < Tk::Toplevel
       TkCommandNames = ['::blt::tile::toplevel'.freeze].freeze
     end
   end
diff --git a/ext/tk/lib/tkextlib/blt/tree.rb b/ext/tk/lib/tkextlib/blt/tree.rb
index 07dc7ef7e8..da53a6ed04 100644
--- a/ext/tk/lib/tkextlib/blt/tree.rb
+++ b/ext/tk/lib/tkextlib/blt/tree.rb
@@ -12,53 +12,77 @@ module Tk::BLT
 
     ###################################
 
-   class Node < TkObject
+    class Node < TkObject
       TreeNodeID_TBL = TkCore::INTERP.create_table
-      TkCore::INTERP.init_ip_env{ TreeNodeID_TBL.clear }
+
+      TkCore::INTERP.init_ip_env{
+        TreeNodeID_TBL.mutex.synchronize{ TreeNodeID_TBL.clear }
+      }
 
       def self.id2obj(tree, id)
         tpath = tree.path
-        return id unless TreeNodeID_TBL[tpath]
-        if TreeNodeID_TBL[tpath][id]
-          TreeNodeID_TBL[tpath][id]
-        else
-          begin
-            self.new(tree, nil, 'node'=>Integer(id))
-          rescue
+        TreeNodeID_TBL.mutex.synchronize{
+          if TreeNodeID_TBL[tpath]
+            if TreeNodeID_TBL[tpath][id]
+              TreeNodeID_TBL[tpath][id]
+            else
+              begin
+                # self.new(tree, nil, 'node'=>Integer(id))
+                id = Integer(id)
+                if bool(tk_call(@tpath, 'exists', id))
+                  (obj = self.allocate).instance_eval{
+                    @parent = @tree = tree
+                    @tpath = tpath
+                    @path = @id = id
+                    TreeNodeID_TBL[@tpath] = {} unless TreeNodeID_TBL[@tpath]
+                    TreeNodeID_TBL[@tpath][@id] = self
+                  }
+                  obj
+                else
+                  id
+                end
+              rescue
+                id
+              end
+            end
+          else
             id
           end
-        end
+        }
       end
 
       def self.new(tree, parent, keys={})
         keys = _symbolkey2str(keys)
         tpath = tree.path
 
-        if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
-          keys.delete('node')
-          tk_call(tree.path, 'move', id, parent, keys) if parent
-          return obj
-        end
+        TreeNodeID_TBL.mutex.synchronize{
+          TreeNodeID_TBL[tpath] ||= {}
+          if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
+            keys.delete('node')
+            tk_call(tree.path, 'move', id, parent, keys) if parent
+            return obj
+          end
 
-        super(tree, parent, keys)
+          (obj = self.allocate).instance_eval{
+            initialize(tree, parent, keys)
+            TreeNodeID_TBL[tpath][@id] = self
+          }
+          obj
+        }
       end
 
       def initialize(tree, parent, keys={})
         @parent = @tree = tree
         @tpath = @parent.path
 
-        parent = tk_call(@tpath, 'root') unless parent
-
         if (id = keys['node']) && bool(tk_call(@tpath, 'exists', id))
           @path = @id = id
           keys.delete('node')
           tk_call(@tpath, 'move', @id, parent, keys) if parent
         else
+          parent = tk_call(@tpath, 'root') unless parent
           @path = @id = tk_call(@tpath, 'insert', parent, keys)
         end
-
-        TreeNodeID_TBL[@tpath] = {} unless TreeNodeID_TBL[@tpath]
-        TreeNodeID_TBL[@tpath][@id] = self
       end
 
       def id
@@ -158,7 +182,7 @@ module Tk::BLT
       def move(dest, keys={})
         @tree.keys(@id, dest, keys)
         self
-      end      
+      end
 
       def next()
         @tree.next(@id)
@@ -243,17 +267,42 @@ module Tk::BLT
 
     class Tag < TkObject
       TreeTagID_TBL = TkCore::INTERP.create_table
-      TkCore::INTERP.init_ip_env{ TreeTagID_TBL.clear }
-      TreeTag_ID = ['blt_tree_tag'.freeze, '00000'.taint].freeze
+
+      TkCore::INTERP.init_ip_env{
+        TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
+      }
+
+      (TreeTag_ID = ['blt_tree_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+        @mutex = Mutex.new
+        def mutex; @mutex; end
+        freeze
+      }
 
       def self.id2obj(tree, id)
         tpath = tree.path
-        return id unless TreeTagID_TBL[tpath]
-        if TreeTagID_TBL[tpath][id]
-          TreeTagID_TBL[tpath][id]
-        else
-          self.new(tree, id)
-        end
+        TreeTagID_TBL.mutex.synchronize{
+          if TreeTagID_TBL[tpath]
+            if TreeTagID_TBL[tpath][id]
+              TreeTagID_TBL[tpath][id]
+            else
+              begin
+                # self.new(tree, id)
+                (obj = self.allocate).instance_eval{
+                  @parent = @tree = tree
+                  @tpath = @parent.path
+                  @path = @id = id.dup.freeze if id
+                  TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+                  TreeTagID_TBL[@tpath][@id] = self
+                }
+                obj
+              rescue
+                id
+              end
+            end
+          else
+            id
+          end
+        }
       end
 
       def initialize(tree, tag_str = nil)
@@ -263,12 +312,15 @@ module Tk::BLT
         if tag_str
           @path = @id = tag_str.dup.freeze
         else
-          @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_)
-          TreeTagID_TBL[@id] = self
-          TreeTag_ID[1].succ!
+          TreeTag_ID.mutex.synchronize{
+            @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_)
+            TreeTag_ID[1].succ!
+          }
         end
-        TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-        TreeTagID_TBL[@tpath][@id] = self
+        TreeTagID_TBL.mutex.synchronize{
+          TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+          TreeTagID_TBL[@tpath][@id] = self
+        }
       end
 
       def id
@@ -287,7 +339,9 @@ module Tk::BLT
 
       def forget()
         tk_call(@tpath, 'tag', 'forget', @id)
-        TreeTagID_TBL[@tpath].delete(@id)
+        TreeTagID_TBL.mutex.synchronize{
+          TreeTagID_TBL[@tpath].delete(@id)
+        }
         self
       end
 
@@ -312,44 +366,63 @@ module Tk::BLT
 
     class Notify < TkObject
       NotifyID_TBL = TkCore::INTERP.create_table
-      TkCore::INTERP.init_ip_env{ NotifyID_TBL.clear }
+
+      TkCore::INTERP.init_ip_env{
+        NotifyID_TBL.mutex.synchronize{ NotifyID_TBL.clear }
+      }
 
       def self.id2obj(tree, id)
         tpath = tree.path
-        return id unless NotifyID_TBL[tpath]
-        if NotifyID_TBL[tpath][id]
-          NotifyID_TBL[tpath][id]
-        else
-          begin
-            self.new([tree, id])
-          rescue
-            id
+        NotifyID_TBL.mutex.synchronize{
+          if NotifyID_TBL[tpath]
+            if NotifyID_TBL[tpath][id]
+              NotifyID_TBL[tpath][id]
+            else
+              (obj = self.allocate).instance_eval{
+                @parent = @tree = tree
+                @tpath = @parent.path
+                @path = @id = id
+                NotifyID_TBL[@tpath] ||= {}
+                NotifyID_TBL[@tpath][@id] = self
+              }
+              obj
+            end
+          else
+            return id
           end
-        end
+        }
       end
 
       def self.new(tree, *args, &b)
-        if tree.kind_of?(Array)
-          # not create
-          if obj = NotifyID_TBL[tree[0].path][tree[1]]
+        NotifyID_TBL.mutex.synchronize{
+          if tree.kind_of?(Array)
+            # not create
+            tpath = tree[0].path
+            NotifyID_TBL[tpath] ||= {}
+            unless (obj = NotifyID_TBL[tpath][tree[1]])
+              (NotifyID_TBL[tpath][tree[1]] =
+                 obj = self.allocate).instance_eval{
+                @parent = @tree = tree[0]
+                @tpath = @parent.path
+                @path = @id = tree[1]
+              }
+            end
             return obj
-          else
-            return super(false, tree[0], tree[1])
           end
-        end
 
-        super(true, tree, *args, &b)
+          (obj = self.allocate).instance_eval{
+            initialize(tree, *args, &b)
+            NotifyID_TBL[@tpath] ||= {}
+            NotifyID_TBL[@tpath][@id] = self
+          }
+          return obj
+        }
       end
 
-      def initialize(create, tree, *args, &b)
+      def initialize(tree, *args, &b)
         @parent = @tree = tree
         @tpath = @parent.path
 
-        unless create
-          @path = @id = args[0]
-          return
-        end
-
         # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
         if TkComm._callback_entry?(args[0])
           cmd = args.shift
@@ -365,7 +438,7 @@ module Tk::BLT
         args = args.collect{|arg| '-' << arg.to_s}
 
         args << proc{|id, type|
-          cmd.call(Tk::BLT::Tree::Node.id2obj(@tree, id), 
+          cmd.call(Tk::BLT::Tree::Node.id2obj(@tree, id),
                    ((type[0] == ?-)? type[1..-1]: type))
         }
 
@@ -378,7 +451,9 @@ module Tk::BLT
 
       def delete()
         tk_call(@tpath, 'notify', 'delete', @id)
-        NotifyID_TBL[tpath].delete(@id)
+        NotifyID_TBL.mutex.synchronize{
+          NotifyID_TBL[@tpath].delete(@id)
+        }
         self
       end
 
@@ -395,44 +470,69 @@ module Tk::BLT
 
     class Trace < TkObject
       TraceID_TBL = TkCore::INTERP.create_table
-      TkCore::INTERP.init_ip_env{ TraceID_TBL.clear }
+
+      TkCore::INTERP.init_ip_env{
+        TraceID_TBL.mutex.synchronize{ TraceID_TBL.clear }
+      }
 
       def self.id2obj(tree, id)
         tpath = tree.path
-        return id unless TraceID_TBL[tpath]
-        if TraceID_TBL[tpath][id]
-          TraceID_TBL[tpath][id]
-        else
-          begin
-            self.new([tree, id])
-          rescue
+        TraceID_TBL.mutex.synchronize{
+          if TraceID_TBL[tpath]
+            if TraceID_TBL[tpath][id]
+              TraceID_TBL[tpath][id]
+            else
+              begin
+                # self.new([tree, id])
+                (obj = self.allocate).instance_eval{
+                  @parent = @tree = tree
+                  @tpath = @parent.path
+                  @path = @id = node  # == traceID
+                  TraceID_TBL[@tpath] ||= {}
+                  TraceID_TBL[@tpath][@id] = self
+                }
+                obj
+              rescue
+                id
+              end
+            end
+          else
             id
           end
-        end
+        }
       end
 
       def self.new(tree, *args, &b)
-        if tree.kind_of?(Array)
-          # not create
-          if obj = TraceID_TBL[tree[0].path][tree[1]]
+        TraceID_TBL.mutex.synchronize{
+          if tree.kind_of?(Array)
+            # not create
+            tpath = tree[0].path
+            TraceID_TBL[tpath] ||= {}
+            unless (obj = TraceID_TBL[tpath][tree[1]])
+              (TraceID_TBL[tpath][tree[1]] =
+                 obj = self.allocate).instance_eval{
+                @parent = @tree = tree
+                @tpath = @parent.path
+                @path = @id = tree[1]  # == traceID
+              }
+            end
             return obj
-          else
-            return super(false, tree[0], tree[1])
           end
-        end
 
-        super(true, tree, *args, &b)
+          # super(true, tree, *args, &b)
+          (obj = self.allocate).instance_eval{
+            initialize(tree, *args, &b)
+            TraceID_TBL[@tpath] ||= {}
+            TraceID_TBL[@tpath][@id] = self
+          }
+          return obj
+        }
       end
 
-      def initialize(create, tree, node, key, opts, cmd=nil, &b)
+      def initialize(tree, node, key, opts, cmd=nil, &b)
         @parent = @tree = tree
         @tpath = @parent.path
 
-        unless create
-          @path = @id = node  # == traceID
-          return
-        end
-
         if !cmd
           if b
             cmd = Proc.new(&b)
@@ -441,8 +541,8 @@ module Tk::BLT
           end
         end
 
-        @path = @id = tk_call(@tpath, 'trace', 'create', node, key, opts, 
-                              proc{|t, id, k, ops| 
+        @path = @id = tk_call(@tpath, 'trace', 'create', node, key, opts,
+                              proc{|t, id, k, ops|
                                 tobj = Tk::BLT::Tree.id2obj(t)
                                 if tobj.kind_of?(Tk::BLT::Tree)
                                   nobj = Tk::BLT::Tree::Node.id2obj(tobj, id)
@@ -459,7 +559,9 @@ module Tk::BLT
 
       def delete()
         tk_call(@tpath, 'trace', 'delete', @id)
-        TraceID_TBL[tpath].delete(@id)
+        TraceID_TBL.mutex.synchronize{
+          TraceID_TBL[tpath].delete(@id)
+        }
         self
       end
 
@@ -475,7 +577,12 @@ module Tk::BLT
     ###################################
 
     TreeID_TBL = TkCore::INTERP.create_table
-    Tree_ID = ['blt_tree'.freeze, '00000'.taint].freeze
+
+    (Tree_ID = ['blt_tree'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      @mutex = Mutex.new
+      def mutex; @mutex; end
+      freeze
+    }
 
     def __keyonly_optkeys
       {
@@ -492,13 +599,15 @@ module Tk::BLT
         'recurse'=>nil, 'tags'=>nil,
 
         # sort command
-        'ascii'=>nil, 'decreasing'=>nil, 'disctionary'=>nil, 
-        'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil, 
+        'ascii'=>nil, 'decreasing'=>nil, 'disctionary'=>nil,
+        'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil,
       }
     end
 
     def self.id2obj(id)
-      TreeID_TBL[id]? TreeID_TBL[id]: id
+      TreeID_TBL.mutex.synchronize{
+        TreeID_TBL[id]? TreeID_TBL[id]: id
+      }
     end
 
     def self.names(pat = None)
@@ -513,27 +622,45 @@ module Tk::BLT
     end
 
     def self.new(name = nil)
-      return TreeID_TBL[name] if name && TreeID_TBL[name]
-      super(name)
+      TreeID_TBL.mutex.synchronize{
+        if name && TreeID_TBL[name]
+          TreeID_TBL[name]
+        else
+          (obj = self.allocate).instance_eval{
+            initialize(name)
+            TreeID_TBL[@id] = self
+          }
+          obj
+        end
+      }
     end
 
     def initialzie(name = nil)
       if name
         @path = @id = name
       else
-        @path = @id = Tree_ID.join(TkCore::INTERP._ip_id_)
-        TreeID_TBL[@id] = self
-        Tree_ID[1].succ!
+        Tree_ID.mutex.synchronize{
+          @path = @id = Tree_ID.join(TkCore::INTERP._ip_id_)
+          Tree_ID[1].succ!
+        }
       end
-      TreeID_TBL[@id] = self
+
       tk_call('::blt::tree', 'create', @id)
     end
 
     def __destroy_hook__
-      Tk::BLT::Tree::Node::TreeNodeID_TBL.delete(@path)
-      Tk::BLT::Tree::Tag::TreeTagID_TBL.delete(@path)
-      Tk::BLT::Tree::Notify::NotifyID_TBL.delete(@path)
-      Tk::BLT::Tree::Trace::TraceID_TBL.delete(@path)
+      Tk::BLT::Tree::Node::TreeNodeID_TBL.mutex.synchronize{
+        Tk::BLT::Tree::Node::TreeNodeID_TBL.delete(@path)
+      }
+      Tk::BLT::Tree::Tag::TreeTagID_TBL.mutex.synchronize{
+        Tk::BLT::Tree::Tag::TreeTagID_TBL.delete(@path)
+      }
+      Tk::BLT::Tree::Notify::NotifyID_TBL.mutex.synchronize{
+        Tk::BLT::Tree::Notify::NotifyID_TBL.delete(@path)
+      }
+      Tk::BLT::Tree::Trace::TraceID_TBL.mutex.synchronize{
+        Tk::BLT::Tree::Trace::TraceID_TBL.delete(@path)
+      }
     end
 
     def tagid(tag)
@@ -553,7 +680,7 @@ module Tk::BLT
     end
 
     def ancestor(node1, node2)
-      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'ancestor', 
+      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'ancestor',
                                                tagid(node1), tagid(node2)))
     end
 
@@ -574,14 +701,14 @@ module Tk::BLT
     end
 
     def copy(src, parent, keys={})
-      id = tk_call('::blt::tree', 'copy', tagid(src), tagid(parent), 
+      id = tk_call('::blt::tree', 'copy', tagid(src), tagid(parent),
                    __conv_keyonly_opts(keys))
       Tk::BLT::Tree::Node.new(self, nil, 'node'=>id)
     end
     def copy_to(src, dest_tree, parent, keys={})
       return copy(src, parent, keys={}) unless dest_tree
 
-      id = tk_call('::blt::tree', 'copy', tagid(src), dest_tree, 
+      id = tk_call('::blt::tree', 'copy', tagid(src), dest_tree,
                    tagid(parent), __conv_keyonly_opts(keys))
       Tk::BLT::Tree::Node.new(dest_tree, nil, 'node'=>id)
     end
@@ -592,12 +719,14 @@ module Tk::BLT
 
     def delete(*nodes)
       tk_call('::blt::tree', 'delete', *(nodes.collect{|node| tagid(node)}))
-      nodes.each{|node|
-        if node.kind_of?(Tk::BLT::Tree::Node)
-          Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.id)
-        else
-          Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.to_s)
-        end
+      Tk::BLT::Tree::Node::TreeNodeID_TBL.mutex.synchronize{
+        nodes.each{|node|
+          if node.kind_of?(Tk::BLT::Tree::Node)
+            Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.id)
+          else
+            Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.to_s)
+          end
+        }
       }
       self
     end
@@ -622,7 +751,7 @@ module Tk::BLT
     end
 
     def find(node, keys={})
-      simplelist(tk_call('::blt::tree', 'find', tagid(node), 
+      simplelist(tk_call('::blt::tree', 'find', tagid(node),
                          __conv_keyonly_opts(keys))).collect{|n|
         Tk::BLT::Tree::Node.id2obj(self, n)
       }
@@ -646,7 +775,7 @@ module Tk::BLT
     end
 
     def index(node)
-      Tk::BLT::Tree::Node.id2obj(self, 
+      Tk::BLT::Tree::Node.id2obj(self,
                                  tk_call('::blt::tree', 'index', tagid(node)))
     end
 
@@ -656,11 +785,11 @@ module Tk::BLT
     end
 
     def ancestor?(node1, node2)
-      bool(tk_call('::blt::tree', 'is', 'ancestor', 
+      bool(tk_call('::blt::tree', 'is', 'ancestor',
                    tagid(node1), tagid(node2)))
     end
     def before?(node1, node2)
-      bool(tk_call('::blt::tree', 'is', 'before', 
+      bool(tk_call('::blt::tree', 'is', 'before',
                    tagid(node1), tagid(node2)))
     end
     def leaf?(node)
@@ -677,7 +806,7 @@ module Tk::BLT
       if nodes.empty?
         simplelist(tk_call('blt::tree', 'keys', tagid(node)))
       else
-        simplelist(tk_call('blt::tree', 'keys', tagid(node), 
+        simplelist(tk_call('blt::tree', 'keys', tagid(node),
                            *(nodes.collect{|n| tagid(n)}))).collect{|lst|
           simplelist(lst)
         }
@@ -699,7 +828,7 @@ module Tk::BLT
     end
 
     def link(parent, node, keys={})
-      ret = tk_call('::blt::tree', 'link', tagid(parent), tagid(node), 
+      ret = tk_call('::blt::tree', 'link', tagid(parent), tagid(node),
                     __conv_keyonly_opts(keys))
       (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
     end
@@ -728,7 +857,9 @@ module Tk::BLT
         id.delete
       else
         tk_call(@path, 'notify', 'delete', id)
-        Tk::BLT::Tree::Notify::NotifyID_TBL[@path].delete(id.to_s)
+        Tk::BLT::Tree::Notify::NotifyID_TBL.mutex.synchronize{
+          Tk::BLT::Tree::Notify::NotifyID_TBL[@path].delete(id.to_s)
+        }
       end
       self
     end
@@ -771,7 +902,7 @@ module Tk::BLT
     end
 
     def restore(node, str, keys={})
-      tk_call('::blt::tree', 'restore', tagid(node), str, 
+      tk_call('::blt::tree', 'restore', tagid(node), str,
               __conv_keyonly_opts(keys))
       self
     end
@@ -784,7 +915,7 @@ module Tk::BLT
     end
 
     def restore_from_file(node, file, keys={})
-      tk_call('::blt::tree', 'restorefile', tagid(node), file, 
+      tk_call('::blt::tree', 'restorefile', tagid(node), file,
               __conv_keyonly_opts(keys))
       self
     end
@@ -792,13 +923,13 @@ module Tk::BLT
       keys = __conv_keyonly_opts(keys)
       keys.delete('overwrite')
       keys.delete(:overwrite)
-      tk_call('::blt::tree', 'restorefile', tagid(node), file, 
+      tk_call('::blt::tree', 'restorefile', tagid(node), file,
               '-overwrite', keys)
       self
     end
 
     def root(node=None)
-      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'root', 
+      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'root',
                                                tagid(node)))
     end
 
@@ -827,7 +958,7 @@ module Tk::BLT
     end
 
     def tag_delete(tag, *nodes)
-      tk_call(@path, 'tag', 'delete', tagid(tag), 
+      tk_call(@path, 'tag', 'delete', tagid(tag),
               *(nodes.collect{|n| tagid(n)}))
       self
     end
@@ -835,12 +966,14 @@ module Tk::BLT
     def tag_forget(tag)
       tag = tag.id if tag.kind_of?(Tk::BLT::Tree::Tag)
       tk_call(@path, 'tag', 'forget', tag)
-      TreeTagID_TBL[@path].delete(tag)
+      TreeTagID_TBL.mutex.synchronize{
+        TreeTagID_TBL[@path].delete(tag)
+      }
       self
     end
 
     def tag_get(node, *patterns)
-      simplelist(tk_call(@tpath, 'tag', 'get', tagid(node), 
+      simplelist(tk_call(@tpath, 'tag', 'get', tagid(node),
                          *(patterns.collect{|pat| tagid(pat)}))).collect{|str|
         Tk::BLT::Tree::Tag.id2obj(self, str)
       }
@@ -864,7 +997,7 @@ module Tk::BLT
     end
 
     def tag_unset(node, *tags)
-      tk_call(@path, 'tag', 'unset', tagid(node), 
+      tk_call(@path, 'tag', 'unset', tagid(node),
               *(tags.collect{|t| tagid(t)}))
       self
     end
@@ -889,7 +1022,9 @@ module Tk::BLT
     def trace_delete(*args)
       args = args.collect{|id| tagid(id)}
       tk_call(@path, 'trace', 'delete', *args)
-      args.each{|id| Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)}
+      Tk::BLT::Tree::Trace::TraceID_TBL.mutex.synchronize{
+        args.each{|id| Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)}
+      }
       self
     end
 
diff --git a/ext/tk/lib/tkextlib/blt/treeview.rb b/ext/tk/lib/tkextlib/blt/treeview.rb
index 0343d28b9c..046cf7f837 100644
--- a/ext/tk/lib/tkextlib/blt/treeview.rb
+++ b/ext/tk/lib/tkextlib/blt/treeview.rb
@@ -95,9 +95,15 @@ module Tk::BLT::Treeview::ConfigMethod
   end
   private :__item_pathname
 
+  def column_cget_tkstring(name, option)
+    itemcget_tkstring(['column', name], option)
+  end
   def column_cget(name, option)
     itemcget(['column', name], option)
   end
+  def column_cget_strict(name, option)
+    itemcget_strict(['column', name], option)
+  end
   def column_configure(name, slot, value=None)
     itemconfigure(['column', name], slot, value)
   end
@@ -108,9 +114,15 @@ module Tk::BLT::Treeview::ConfigMethod
     current_itemconfiginfo(['column', name], slot)
   end
 
+  def button_cget_tkstring(option)
+    itemcget_tkstring('button', option)
+  end
   def button_cget(option)
     itemcget('button', option)
   end
+  def button_cget_strict(option)
+    itemcget_strict('button', option)
+  end
   def button_configure(slot, value=None)
     itemconfigure('button', slot, value)
   end
@@ -121,6 +133,9 @@ module Tk::BLT::Treeview::ConfigMethod
     current_itemconfiginfo('button', slot)
   end
 
+  def entry_cget_tkstring(option)
+    itemcget_tkstring('entry', option)
+  end
   def entry_cget(option)
     ret = itemcget('entry', option)
     if option == 'bindtags' || option == :bindtags
@@ -129,6 +144,14 @@ module Tk::BLT::Treeview::ConfigMethod
       ret
     end
   end
+  def entry_cget_strict(option)
+    ret = itemcget_strict('entry', option)
+    if option == 'bindtags' || option == :bindtags
+      ret.collect{|tag| TkBindTag.id2obj(tag)}
+    else
+      ret
+    end
+  end
   def entry_configure(slot, value=None)
     itemconfigure('entry', slot, value)
   end
@@ -167,9 +190,15 @@ module Tk::BLT::Treeview::ConfigMethod
     ret
   end
 
+  def sort_cget_tkstring(option)
+    itemcget_tkstring('sort', option)
+  end
   def sort_cget(option)
     itemcget('sort', option)
   end
+  def sort_cget_strict(option)
+    itemcget_strict('sort', option)
+  end
   def sort_configure(slot, value=None)
     itemconfigure('sort', slot, value)
   end
@@ -180,9 +209,15 @@ module Tk::BLT::Treeview::ConfigMethod
     current_itemconfiginfo('sort', slot)
   end
 
+  def text_cget_tkstring(option)
+    itemcget_tkstring('text', option)
+  end
   def text_cget(option)
     itemcget('text', option)
   end
+  def text_cget_strict(option)
+    itemcget_strict('text', option)
+  end
   def text_configure(slot, value=None)
     itemconfigure('text', slot, value)
   end
@@ -193,14 +228,14 @@ module Tk::BLT::Treeview::ConfigMethod
     current_itemconfiginfo('text', slot)
   end
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 end
 
 class Tk::BLT::Treeview
   TkCommandNames = ['::blt::treeview'.freeze].freeze
   WidgetClassName = 'TreeView'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   include Scrollable
   include ValidateConfigure
@@ -210,7 +245,7 @@ class Tk::BLT::Treeview
   ########################
 
   def __boolval_optkeys
-    ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot', 
+    ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot',
       'newtags', 'showtitles', 'sortselection']
   end
   private :__boolval_optkeys
@@ -225,20 +260,38 @@ class Tk::BLT::Treeview
   class OpenCloseCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?W, ?w, :widget ], 
-        [ ?p, ?s, :name ], 
-        [ ?P, ?s, :fullpath ], 
-        [ ?#, ?x, :node_id ], 
+        [ ?W, ?w, :widget ],
+        [ ?p, ?s, :name ],
+        [ ?P, ?s, :fullpath ],
+        [ ?#, ?x, :node_id ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?x, TkComm.method(:num_or_str) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
+        [ ?x, TkComm.method(:num_or_str) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -273,8 +326,12 @@ class Tk::BLT::Treeview
   ########################
 
   def __destroy_hook__
-    Tk::BLT::Treeview::Node::TreeNodeID_TBL.delete(@path)
-    Tk::BLT::Treeview::Tag::TreeTagID_TBL.delete(@path)
+    Tk::BLT::Treeview::Node::TreeNodeID_TBL.mutex.synchronize{
+      Tk::BLT::Treeview::Node::TreeNodeID_TBL.delete(@path)
+    }
+    Tk::BLT::Treeview::Tag::TreeTagID_TBL.mutex.synchronize{
+      Tk::BLT::Treeview::Tag::TreeTagID_TBL.delete(@path)
+    }
   end
 
   def tagid(tag)
@@ -421,7 +478,7 @@ class Tk::BLT::Treeview
     self
   end
   def entry_children(tag, first=None, last=None)
-    simplelist(tk_send('entry', 'children', tagid(tag), 
+    simplelist(tk_send('entry', 'children', tagid(tag),
                        first, last)).collect{|id| tagid2obj(id)}
   end
   def entry_delete(tag, first=None, last=None)
@@ -458,20 +515,38 @@ class Tk::BLT::Treeview
   class FindExecFlagValue < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?W, ?w, :widget ], 
-        [ ?p, ?s, :name ], 
-        [ ?P, ?s, :fullpath ], 
-        [ ?#, ?x, :node_id ], 
+        [ ?W, ?w, :widget ],
+        [ ?p, ?s, :name ],
+        [ ?P, ?s, :fullpath ],
+        [ ?#, ?x, :node_id ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?x, TkComm.method(:num_or_str) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
+        [ ?x, TkComm.method(:num_or_str) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -487,7 +562,8 @@ class Tk::BLT::Treeview
   def _find_exec_flag_value(val)
     if val.kind_of?(Array)
       cmd, *args = val
-      FindExecFlagValue.new(cmd, args.join(' '))
+      #FindExecFlagValue.new(cmd, args.join(' '))
+      FindExecFlagValue.new(cmd, *args)
     elsif TkComm._callback_entry?(val)
       FindExecFlagValue.new(val)
     else
@@ -585,7 +661,7 @@ class Tk::BLT::Treeview
     }
   end
   def range_open(first, last)
-    simplelist(tk_send('range', '-open', 
+    simplelist(tk_send('range', '-open',
                        tagid(first), tagid(last))).collect{|id|
       tagid2obj(id)
     }
@@ -967,22 +1043,47 @@ class Tk::BLT::Treeview::Node < TkObject
   include Tk::BLT::Treeview::TagOrID_Methods
 
   TreeNodeID_TBL = TkCore::INTERP.create_table
-  TreeNode_ID = ['blt_treeview_node'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ TreeNodeID_TBL.clear }
+  (TreeNode_ID = ['blt_treeview_node'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    TreeNodeID_TBL.mutex.synchronize{ TreeNodeID_TBL.clear }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless TreeNodeID_TBL[tpath]
-    if TreeNodeID_TBL[tpath][id]
-      TreeNodeID_TBL[tpath][id]
-    else
-      begin
-        self.new(tree, nil, nil, 'node'=>Integer(id))
-      rescue
+    TreeNodeID_TBL.mutex.synchronize{
+      if TreeNodeID_TBL[tpath]
+        if TreeNodeID_TBL[tpath][id]
+          TreeNodeID_TBL[tpath][id]
+        else
+          begin
+            # self.new(tree, nil, nil, 'node'=>Integer(id))
+            unless (tk_call(@tpath, 'get', id)).empty?
+              id = Integer(id)
+              (obj = self.allocate).instance_eval{
+                @parent = @tree = tree
+                @tpath = @parent.path
+                @path = @id = id
+                TreeNodeID_TBL[@tpath] ||= {}
+                TreeNodeID_TBL[@tpath][@id] = self
+              }
+              obj
+            else
+              id
+            end
+          rescue
+            id
+          end
+        end
+      else
         id
       end
-    end
+    }
   end
 
   def self.new(tree, pos, parent=nil, keys={})
@@ -994,13 +1095,21 @@ class Tk::BLT::Treeview::Node < TkObject
     keys = _symbolkey2str(keys)
     tpath = tree.path
 
-    if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
-      keys.delete('node')
-      tk_call(tree.path, 'move', id, pos, parent) if parent
-      return obj
-    end
+    TreeNodeID_TBL.mutex.synchronize{
+      TreeNodeID_TBL[tpath] ||= {}
+      if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
+        keys.delete('node')
+        tk_call(tree.path, 'move', id, pos, parent) if parent
+        return obj
+      end
 
-    super(tree, pos, parent, keys)
+      #super(tree, pos, parent, keys)
+      (obj = self.allocate).instance_eval{
+        initialize(tree, pos, parent, keys)
+        TreeNodeID_TBL[tpath][@id] = self
+      }
+      obj
+    }
   end
 
   def initialize(tree, pos, parent, keys)
@@ -1008,16 +1117,23 @@ class Tk::BLT::Treeview::Node < TkObject
     @tpath = @parent.path
 
     if (id = keys['node'])
+      # if tk_call(@tpath, 'get', id).empty?
+      #   fail RuntimeError, "not exist the node '#{id}'"
+      # end
       @path = @id = id
       tk_call(@tpath, 'move', @id, pos, tagid(parent)) if parent
+      configure(keys) if keys && ! keys.empty?
     else
-      name = TreeNode_ID.join(TkCore::INTERP._ip_id_).freeze
-      TreeNode_ID[1].succ!
+      name = nil
+      TreeNode_ID.mutex.synchronize{
+        name = TreeNode_ID.join(TkCore::INTERP._ip_id_).freeze
+        TreeNode_ID[1].succ!
+      }
 
       at = keys.delete['at']
 
       if parent
-        if parent.kind_of?(Tk::BLT::Treeview::Node) || 
+        if parent.kind_of?(Tk::BLT::Treeview::Node) ||
             parent.kind_of?(Tk::BLT::Treeview::Tag)
           path = [get_full(parent.id)[0], name]
           at = nil # ignore 'at' option
@@ -1035,9 +1151,6 @@ class Tk::BLT::Treeview::Node < TkObject
       end
       @path = @id
     end
-
-    TreeNodeID_TBL[@tpath] = {} unless TreeNodeID_TBL[@tpath]
-    TreeNodeID_TBL[@tpath][@id] = self
   end
 
   def id
@@ -1051,37 +1164,66 @@ class Tk::BLT::Treeview::Tag < TkObject
   include Tk::BLT::Treeview::TagOrID_Methods
 
   TreeTagID_TBL = TkCore::INTERP.create_table
-  TreeTag_ID = ['blt_treeview_tag'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ TreeTagID_TBL.clear }
+  (TreeTag_ID = ['blt_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
 
-  def self.id2obj(tree, id)
+  TkCore::INTERP.init_ip_env{
+    TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
+  }
+
+  def self.id2obj(tree, name)
     tpath = tree.path
-    return id unless TreeTagID_TBL[tpath]
-    if TreeTagID_TBL[tpath][id]
-      TreeTagID_TBL[tpath][id]
-    else
-      begin
-        self.new(tree, nil, nil, 'name'=>Integer(id))
-      rescue
+    TreeTagID_TBL.mutex.synchronize{
+      if TreeTagID_TBL[tpath]
+        if TreeTagID_TBL[tpath][name]
+          TreeTagID_TBL[tpath][name]
+        else
+          #self.new(tree, name)
+          (obj = self.allocate).instance_eval{
+            @parent = @tree = tree
+            @tpath = @parent.path
+            @path = @id = name
+            TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+            TreeTagID_TBL[@tpath][@id] = self
+          }
+          obj
+        end
+      else
         id
       end
-    end
+    }
   end
 
   def self.new_by_name(tree, name, *ids)
-    if (obj = TreeTagID_TBL[tree.path][name])
-      return obj
-    end
-    new([tree, name], ids)
+    TreeTagID_TBL.mutex.synchronize{
+      unless (obj = TreeTagID_TBL[tree.path][name])
+        (obj = self.allocate).instance_eval{
+          initialize(tree, name, ids)
+          TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+          TreeTagID_TBL[@tpath][@id] = self
+        }
+      end
+      obj
+    }
   end
 
   def self.new(tree, *ids)
-    if tree.kind_of?(Array)
-      super(tree[0], tree[1], ids)
-    else
-      super(tree, nil, ids)
-    end
+    TreeTagID_TBL.mutex.synchronize{
+      (obj = self.allocate).instance_eval{
+        if tree.kind_of?(Array)
+          initialize(tree[0], tree[1], ids)
+        else
+          initialize(tree, nil, ids)
+        end
+        TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+        TreeTagID_TBL[@tpath][@id] = self
+      }
+      obj
+    }
   end
 
   def initialize(tree, name, ids)
@@ -1091,13 +1233,12 @@ class Tk::BLT::Treeview::Tag < TkObject
     if name
       @path = @id = name
     else
-      @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_).freeze
-      TreeTag_ID[1].succ!
+      TreeTag_ID.mutex.synchronize{
+        @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_).freeze
+        TreeTag_ID[1].succ!
+      }
     end
 
-    TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-    TreeTagID_TBL[@tpath][@id] = self
-
     unless ids.empty?
       tk_call(@tpath, 'tag', 'add', @id, *(ids.collect{|id| tagid(id)}))
     end
@@ -1142,5 +1283,5 @@ end
 class Tk::BLT::Hiertable
   TkCommandNames = ['::blt::hiertable'.freeze].freeze
   WidgetClassName = 'Hiertable'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/blt/unix_dnd.rb b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
index 3130c1e56f..8996f7c891 100644
--- a/ext/tk/lib/tkextlib/blt/unix_dnd.rb
+++ b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
@@ -30,11 +30,17 @@ module Tk::BLT
       end
       private :__item_config_cmd
 
-      private :itemcget, :itemconfigure
-      private :itemconfiginfo, :current_itemconfiginfo
+      private :itemcget_tkstring, :itemcget, :itemcget_strict
+      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
+      def cget_tkstring(win, option)
+        itemcget_tkstring(['cget', win], option)
+      end
       def cget(win, option)
-        itemconfigure(['cget', win], slot, value)
+        itemcget(['cget', win], option)
+      end
+      def cget_strict(win, option)
+        itemcget_strict(['cget', win], option)
       end
       def configure(win, slot, value=None)
         itemconfigure(['configure', win], slot, value)
@@ -46,8 +52,14 @@ module Tk::BLT
         current_itemconfiginfo(['configure', win], slot)
       end
 
-      def tokwn_cget(win, option)
-        itemconfigure(['token', 'cget', win], slot, value)
+      def token_cget_tkstring(win, option)
+        itemcget_tkstring(['token', 'cget', win], option)
+      end
+      def token_cget(win, option)
+        itemcget(['token', 'cget', win], option)
+      end
+      def token_cget_strict(win, option)
+        itemcget_strict(['token', 'cget', win], option)
       end
       def token_configure(win, slot, value=None)
         itemconfigure(['token', 'configure', win], slot, value)
diff --git a/ext/tk/lib/tkextlib/blt/vector.rb b/ext/tk/lib/tkextlib/blt/vector.rb
index 540b6b9102..742e901d3e 100644
--- a/ext/tk/lib/tkextlib/blt/vector.rb
+++ b/ext/tk/lib/tkextlib/blt/vector.rb
@@ -23,14 +23,17 @@ module Tk::BLT
     end
 
     def self.names(pat=None)
-      simplelist(tk_call('::blt::vector', 'names', pat)).collect{|name|
-        if TkVar_ID_TBL[name]
-          TkVar_ID_TBL[name]
-        elsif name[0..1] == '::' && TkVar_ID_TBL[name[2..-1]]
-          TkVar_ID_TBL[name[2..-1]]
-        else
-          name
-        end
+      list = simplelist(tk_call('::blt::vector', 'names', pat))
+      TkVar_ID_TBL.mutex.synchronize{
+        list.collect{|name|
+          if TkVar_ID_TBL[name]
+            TkVar_ID_TBL[name]
+          elsif name[0..1] == '::' && TkVar_ID_TBL[name[2..-1]]
+            TkVar_ID_TBL[name[2..-1]]
+          else
+            name
+          end
+        }
       }
     end
 
@@ -46,14 +49,16 @@ module Tk::BLT
         size = size.join(':')
       end
       if size
-        @id = INTERP._invoke('::blt::vector', 'create', 
-                             "#auto(#{size})", *hash_kv(keys))
+        @id = TkCore::INTERP._invoke('::blt::vector', 'create',
+                                     "#auto(#{size})", *hash_kv(keys))
       else
-        @id = INTERP._invoke('::blt::vector', 'create', 
-                             "#auto", *hash_kv(keys))
+        @id = TkCore::INTERP._invoke('::blt::vector', 'create',
+                                     "#auto", *hash_kv(keys))
       end
 
-      TkVar_ID_TBL[@id] = self
+      TkVar_ID_TBL.mutex.synchronize{
+        TkVar_ID_TBL[@id] = self
+      }
 
       @def_default = false
       @default_val = nil
@@ -63,7 +68,7 @@ module Tk::BLT
       @trace_opts = nil
 
       # teach Tk-ip that @id is global var
-      INTERP._invoke_without_enc('global', @id)
+      TkCore::INTERP._invoke_without_enc('global', @id)
     end
 
     def destroy
@@ -221,13 +226,21 @@ module Tk::BLT
 
   class VectorAccess < Vector
     def self.new(name)
-      return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
-      super(name, size=nil, keys={})
+      TkVar_ID_TBL.mutex.synchronize{
+        if TkVar_ID_TBL[name]
+          TkVar_ID_TBL[name]
+        else
+          (obj = self.allocate).instance_eval{
+            initialize(name)
+            TkVar_ID_TBL[@id] = self
+          }
+          obj
+        end
+      }
     end
 
     def initialize(vec_name)
       @id = vec_name
-      TkVar_ID_TBL[@id] = self
 
       @def_default = false
       @default_val = nil
@@ -237,7 +250,7 @@ module Tk::BLT
       @trace_opts = nil
 
       # teach Tk-ip that @id is global var
-      INTERP._invoke_without_enc('global', @id)
+      TkCore::INTERP._invoke_without_enc('global', @id)
     end
   end
 end
diff --git a/ext/tk/lib/tkextlib/blt/watch.rb b/ext/tk/lib/tkextlib/blt/watch.rb
index ae5e50f126..292623ff58 100644
--- a/ext/tk/lib/tkextlib/blt/watch.rb
+++ b/ext/tk/lib/tkextlib/blt/watch.rb
@@ -13,11 +13,23 @@ module Tk::BLT
     TkCommandNames = ['::blt::watch'.freeze].freeze
 
     WATCH_ID_TBL = TkCore::INTERP.create_table
-    BLT_WATCH_ID = ['blt_watch_id'.freeze, '00000'.taint].freeze
+
+    (BLT_WATCH_ID = ['blt_watch_id'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      @mutex = Mutex.new
+      def mutex; @mutex; end
+      freeze
+    }
+
+    TkCore::INTERP.init_ip_env{
+      WATCH_ID_TBL.mutex.synchronize{ WATCH_ID_TBL.clear }
+    }
 
     def self.names(state = None)
-      tk_split_list(tk_call('::blt::watch', 'names', state)).collect{|name|
-        WATCH_ID_TBL[name] || name
+      lst = tk_split_list(tk_call('::blt::watch', 'names', state))
+      WATCH_ID_TBL.mutex.synchronize{
+        lst.collect{|name|
+          WATCH_ID_TBL[name] || name
+        }
       }
     end
 
@@ -45,13 +57,17 @@ module Tk::BLT
       if name
         @id = name.to_s
       else
-        @id = BLT_WATCH_ID.join(TkCore::INTERP._ip_id_)
-        BLT_WATCH_ID[1].succ!
+        BLT_WATCH_ID.mutex.synchronize{
+          @id = BLT_WATCH_ID.join(TkCore::INTERP._ip_id_)
+          BLT_WATCH_ID[1].succ!
+        }
       end
 
       @path = @id
 
-      WATCH_ID_TBL[@id] = self
+      WATCH_ID_TBL.mutex.synchronize{
+        WATCH_ID_TBL[@id] = self
+      }
       tk_call('::blt::watch', 'create', @id, *hash_kv(keys))
     end
 
@@ -130,7 +146,7 @@ module Tk::BLT
         end
       end
     end
-    def cget(key)
+    def cget_strict(key)
       key = key.to_s
       begin
         info.assoc(key)[1]
@@ -138,5 +154,22 @@ module Tk::BLT
         fail ArgumentError, "unknown option '#{key}'"
       end
     end
+    def cget(key)
+      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+        cget_strict(key)
+      else
+        begin
+          cget_strict(key)
+        rescue => e
+          if current_configinfo.has_key?(key.to_s)
+            # error on known option
+            fail e
+          else
+            # unknown option
+            nil
+          end
+        end
+      end
+    end
   end
 end
diff --git a/ext/tk/lib/tkextlib/blt/winop.rb b/ext/tk/lib/tkextlib/blt/winop.rb
index e371d28ab7..03bdb60810 100644
--- a/ext/tk/lib/tkextlib/blt/winop.rb
+++ b/ext/tk/lib/tkextlib/blt/winop.rb
@@ -38,7 +38,7 @@ class << Tk::BLT::Winop
     tk_call('::blt::winop', 'image', 'readjpeg', file, photo)
   end
   def image_resample(src, dest, horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'image', 'resample', 
+    tk_call('::blt::winop', 'image', 'resample',
             src, dest, horiz_filter, vert_filter)
   end
   def image_rotate(src, dest, angle)
@@ -47,9 +47,9 @@ class << Tk::BLT::Winop
   def image_snap(win, photo, width=None, height=None)
     tk_call('::blt::winop', 'image', 'snap', win, photo, width, height)
   end
-  def image_subsample(src, dest, x, y, width, height, 
+  def image_subsample(src, dest, x, y, width, height,
                       horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'image', 'subsample', 
+    tk_call('::blt::winop', 'image', 'subsample',
             src, dest, x, y, width, height, horiz_filter, vert_filter)
   end
 
@@ -66,13 +66,13 @@ class << Tk::BLT::Winop
   end
 
   def resample(src, dest, horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'resample', 
+    tk_call('::blt::winop', 'resample',
             src, dest, horiz_filter, vert_filter)
   end
 
-  def subsample(src, dest, x, y, width, height, 
+  def subsample(src, dest, x, y, width, height,
                 horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'subsample', 
+    tk_call('::blt::winop', 'subsample',
             src, dest, x, y, width, height, horiz_filter, vert_filter)
   end
 
diff --git a/ext/tk/lib/tkextlib/bwidget.rb b/ext/tk/lib/tkextlib/bwidget.rb
index 62631d8b54..7a1eff51d8 100644
--- a/ext/tk/lib/tkextlib/bwidget.rb
+++ b/ext/tk/lib/tkextlib/bwidget.rb
@@ -18,6 +18,8 @@ TkPackage.require('BWidget')
 module Tk
   module BWidget
     TkComm::TkExtlibAutoloadModule.unshift(self)
+    # Require autoload-symbols which is a same name as widget classname.
+    # Those are used at  TkComm._genobj_for_tkwidget method.
 
     extend TkCore
 
diff --git a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
index 770e5e9ef1..13fe9e59bf 100644
--- a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
+++ b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
@@ -17,5 +17,5 @@ end
 class Tk::BWidget::ArrowButton
   TkCommandNames = ['ArrowButton'.freeze].freeze
   WidgetClassName = 'ArrowButton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/button.rb b/ext/tk/lib/tkextlib/bwidget/button.rb
index 4a9d4a7948..e139fb6708 100644
--- a/ext/tk/lib/tkextlib/bwidget/button.rb
+++ b/ext/tk/lib/tkextlib/bwidget/button.rb
@@ -9,7 +9,7 @@ require 'tkextlib/bwidget.rb'
 
 module Tk
   module BWidget
-    class Button < TkButton
+    class Button < Tk::Button
     end
   end
 end
@@ -17,7 +17,7 @@ end
 class Tk::BWidget::Button
   TkCommandNames = ['Button'.freeze].freeze
   WidgetClassName = 'Button'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'helptext'
diff --git a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
index ef999239f9..a6de33c40c 100644
--- a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
@@ -17,7 +17,7 @@ end
 class Tk::BWidget::ButtonBox
   TkCommandNames = ['ButtonBox'.freeze].freeze
   WidgetClassName = 'ButtonBox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   include TkItemConfigMethod
 
@@ -31,7 +31,7 @@ class Tk::BWidget::ButtonBox
       name = tagOrId[:name]
       return index(name) unless name.empty?
     end
-    if tagOrId.kind_of?(TkButton)
+    if tagOrId.kind_of?(Tk::Button)
       return index(tagOrId[:text])
     end
     # index(tagOrId.to_s)
@@ -40,7 +40,13 @@ class Tk::BWidget::ButtonBox
 
   def add(keys={}, &b)
     win = window(tk_send('add', *hash_kv(keys)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
@@ -54,7 +60,7 @@ class Tk::BWidget::ButtonBox
       name = idx[:name]
       idx = name unless name.empty?
     end
-    if idx.kind_of?(TkButton)
+    if idx.kind_of?(Tk::Button)
       idx = idx[:text]
     end
     number(tk_send('index', idx.to_s))
@@ -62,7 +68,13 @@ class Tk::BWidget::ButtonBox
 
   def insert(idx, keys={}, &b)
     win = window(tk_send('insert', tagid(idx), *hash_kv(keys)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
diff --git a/ext/tk/lib/tkextlib/bwidget/combobox.rb b/ext/tk/lib/tkextlib/bwidget/combobox.rb
index 31f71c3aaf..16143dfbc6 100644
--- a/ext/tk/lib/tkextlib/bwidget/combobox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/combobox.rb
@@ -21,14 +21,31 @@ class Tk::BWidget::ComboBox
 
   TkCommandNames = ['ComboBox'.freeze].freeze
   WidgetClassName = 'ComboBox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'autocomplete' << 'autopost'
+  end
+  private :__boolval_optkeys
 
   def get_listbox(&b)
     win = window(tk_send_without_enc('getlistbox'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
+  def clear_value
+    tk_send_without_enc('clearvalue')
+    self
+  end
+  alias clearvalue clear_value
+
   def icursor(idx)
     tk_send_without_enc('icursor', idx)
   end
diff --git a/ext/tk/lib/tkextlib/bwidget/dialog.rb b/ext/tk/lib/tkextlib/bwidget/dialog.rb
index 2790d88d24..3b0656f021 100644
--- a/ext/tk/lib/tkextlib/bwidget/dialog.rb
+++ b/ext/tk/lib/tkextlib/bwidget/dialog.rb
@@ -18,12 +18,17 @@ end
 class Tk::BWidget::Dialog
   TkCommandNames = ['Dialog'.freeze].freeze
   WidgetClassName = 'Dialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   include TkItemConfigMethod
 
+  def __numstrval_optkeys
+    super() << 'buttonwidth'
+  end
+  private :__numstrval_optkeys
+
   def __strval_optkeys
-    super() << 'title'
+    super() << 'title' << 'geometry'
   end
   private :__strval_optkeys
 
@@ -52,13 +57,27 @@ class Tk::BWidget::Dialog
   def create_self(keys)
     cmd = self.class::TkCommandNames[0]
     if keys and keys != None
-      tk_call_without_enc(cmd, @path, '-parent', @relative, 
+      tk_call_without_enc(cmd, @path, '-parent', @relative,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(cmd, @path, '-parent', @relative)
     end
   end
 
+  def cget_tkstring(slot)
+    if slot.to_s == 'relative'
+      super('parent')
+    else
+      super(slot)
+    end
+  end
+  def cget_strict(slot)
+    if slot.to_s == 'relative'
+      super('parent')
+    else
+      super(slot)
+    end
+  end
   def cget(slot)
     if slot.to_s == 'relative'
       super('parent')
@@ -103,7 +122,7 @@ class Tk::BWidget::Dialog
       name = tagOrId[:name]
       return index(name) unless name.empty?
     end
-    if tagOrId.kind_of?(TkButton)
+    if tagOrId.kind_of?(Tk::Button)
       return index(tagOrId[:text])
     end
     # index(tagOrId.to_s)
@@ -112,19 +131,37 @@ class Tk::BWidget::Dialog
 
   def add(keys={}, &b)
     win = window(tk_send('add', *hash_kv(keys)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def get_frame(&b)
     win = window(tk_send('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def get_buttonbox(&b)
     win = window(@path + '.bbox')
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
diff --git a/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb b/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
index 224304f2ab..846e58062d 100644
--- a/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
+++ b/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
@@ -34,6 +34,13 @@ module Tk::BWidget::DynamicHelp
     ['DynamicHelp::configure']
   end
 
+  def self.cget_strict(slot)
+    slot = slot.to_s
+    info = {}
+    self.current_configinfo.each{|k,v| info[k.to_s] = v if k.to_s == slot}
+    fail RuntimeError, "unknown option \"-#{slot}\""  if info.empty?
+    info.values[0]
+  end
   def self.cget(slot)
     self.current_configinfo(slot).values[0]
   end
diff --git a/ext/tk/lib/tkextlib/bwidget/entry.rb b/ext/tk/lib/tkextlib/bwidget/entry.rb
index aafb4aa7ff..8dc4496123 100644
--- a/ext/tk/lib/tkextlib/bwidget/entry.rb
+++ b/ext/tk/lib/tkextlib/bwidget/entry.rb
@@ -9,7 +9,7 @@ require 'tkextlib/bwidget.rb'
 
 module Tk
   module BWidget
-    class Entry < TkEntry
+    class Entry < Tk::Entry
     end
   end
 end
@@ -19,7 +19,7 @@ class Tk::BWidget::Entry
 
   TkCommandNames = ['Entry'.freeze].freeze
   WidgetClassName = 'Entry'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'helptext' << 'insertbackground'
diff --git a/ext/tk/lib/tkextlib/bwidget/label.rb b/ext/tk/lib/tkextlib/bwidget/label.rb
index ce10ecaf8b..e8d9352c62 100644
--- a/ext/tk/lib/tkextlib/bwidget/label.rb
+++ b/ext/tk/lib/tkextlib/bwidget/label.rb
@@ -9,7 +9,7 @@ require 'tkextlib/bwidget.rb'
 
 module Tk
   module BWidget
-    class Label < TkLabel
+    class Label < Tk::Label
     end
   end
 end
@@ -17,7 +17,7 @@ end
 class Tk::BWidget::Label
   TkCommandNames = ['Label'.freeze].freeze
   WidgetClassName = 'Label'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'helptext'
diff --git a/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
index 931feb9b48..16e7b46933 100644
--- a/ext/tk/lib/tkextlib/bwidget/labelentry.rb
+++ b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
@@ -11,7 +11,7 @@ require 'tkextlib/bwidget/entry'
 
 module Tk
   module BWidget
-    class LabelEntry < TkEntry
+    class LabelEntry < Tk::Entry
     end
   end
 end
@@ -21,7 +21,7 @@ class Tk::BWidget::LabelEntry
 
   TkCommandNames = ['LabelEntry'.freeze].freeze
   WidgetClassName = 'LabelEntry'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
diff --git a/ext/tk/lib/tkextlib/bwidget/labelframe.rb b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
index f7b267eebb..0710f213f0 100644
--- a/ext/tk/lib/tkextlib/bwidget/labelframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
@@ -18,7 +18,7 @@ end
 class Tk::BWidget::LabelFrame
   TkCommandNames = ['LabelFrame'.freeze].freeze
   WidgetClassName = 'LabelFrame'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'helptext'
@@ -40,7 +40,13 @@ class Tk::BWidget::LabelFrame
   end
   def get_frame(&b)
     win = window(tk_send_without_enc('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/listbox.rb b/ext/tk/lib/tkextlib/bwidget/listbox.rb
index 1267500661..930491c869 100644
--- a/ext/tk/lib/tkextlib/bwidget/listbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/listbox.rb
@@ -11,7 +11,7 @@ module Tk
   module BWidget
     class ListBox < TkWindow
       # is NOT a subclass of a listbox widget class.
-      # because it constructed on a canvas widget. 
+      # because it constructed on a canvas widget.
 
       class Item < TkObject
       end
@@ -25,11 +25,11 @@ class Tk::BWidget::ListBox
 
   TkCommandNames = ['ListBox'.freeze].freeze
   WidgetClassName = 'ListBox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   class Event_for_Items < TkEvent::Event
     def self._get_extra_args_tbl
-      [ 
+      [
         TkComm.method(:string)   # item idenfier
       ]
     end
@@ -60,7 +60,7 @@ class Tk::BWidget::ListBox
     else
       cmd = Proc.new
     end
-    _bind_for_event_class(Event_for_Items, [path, 'bindImage'], 
+    _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
                           context, cmd, *args)
     self
   end
@@ -76,7 +76,7 @@ class Tk::BWidget::ListBox
     else
       cmd = Proc.new
     end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], 
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
                                  context, cmd, *args)
     self
   end
@@ -101,7 +101,7 @@ class Tk::BWidget::ListBox
     else
       cmd = Proc.new
     end
-    _bind_for_event_class(Event_for_Items, [path, 'bindText'], 
+    _bind_for_event_class(Event_for_Items, [path, 'bindText'],
                           context, cmd, *args)
     self
   end
@@ -117,7 +117,7 @@ class Tk::BWidget::ListBox
     else
       cmd = Proc.new
     end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], 
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
                                  context, cmd, *args)
     self
   end
@@ -183,19 +183,19 @@ class Tk::BWidget::ListBox
   end
 
   def selection_set(*args)
-    tk_send_without_enc('selection', 'set', 
+    tk_send_without_enc('selection', 'set',
                         *(args.collect{|item| tagid(item)}))
     self
   end
 
   def selection_add(*args)
-    tk_send_without_enc('selection', 'add', 
+    tk_send_without_enc('selection', 'add',
                         *(args.collect{|item| tagid(item)}))
     self
   end
 
   def selection_remove(*args)
-    tk_send_without_enc('selection', 'remove', 
+    tk_send_without_enc('selection', 'remove',
                         *(args.collect{|item| tagid(item)}))
     self
   end
@@ -211,21 +211,33 @@ class Tk::BWidget::ListBox::Item
   include TkTreatTagFont
 
   ListItem_TBL = TkCore::INTERP.create_table
-  ListItem_ID = ['bw:item'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ ListItem_TBL.clear }
+  (ListItem_ID = ['bw:item'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    ListItem_TBL.mutex.synchronize{ ListItem_TBL.clear }
+  }
 
   def self.id2obj(lbox, id)
     lpath = lbox.path
-    return id unless ListItem_TBL[lpath]
-    ListItem_TBL[lpath][id]? ListItem_TBL[lpath][id]: id
+    ListItem_TBL.mutex.synchronize{
+      if ListItem_TBL[lpath]
+        ListItem_TBL[lpath][id]? ListItem_TBL[lpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   def initialize(lbox, *args)
     if lbox.kind_of?(Tk::BWidget::ListBox)
       @listbox = lbox
     else
-      fail RuntimeError, 
+      fail RuntimeError,
         "expect Tk::BWidget::ListBox or Tk::BWidget::ListBox::Item for 1st argument"
     end
 
@@ -250,13 +262,17 @@ class Tk::BWidget::ListBox::Item
     if keys.key?('itemname')
       @path = @id = keys.delete('itemname')
     else
-      @path = @id = ListItem_ID.join(TkCore::INTERP._ip_id_)
-      ListItem_ID[1].succ!
+      ListItem_ID.mutex.synchronize{
+        @path = @id = ListItem_ID.join(TkCore::INTERP._ip_id_)
+        ListItem_ID[1].succ!
+      }
     end
 
-    ListItem_TBL[@id] = self
-    ListItem_TBL[@lpath] = {} unless ListItem_TBL[@lpath]
-    ListItem_TBL[@lpath][@id] = self
+    ListItem_TBL.mutex.synchronize{
+      ListItem_TBL[@id] = self
+      ListItem_TBL[@lpath] = {} unless ListItem_TBL[@lpath]
+      ListItem_TBL[@lpath][@id] = self
+    }
 
     @listbox.insert(index, @id, keys)
   end
@@ -278,9 +294,15 @@ class Tk::BWidget::ListBox::Item
     val
   end
 
+  def cget_tkstring(key)
+    @listbox.itemcget_tkstring(@id, key)
+  end
   def cget(key)
     @listbox.itemcget(@id, key)
   end
+  def cget_strict(key)
+    @listbox.itemcget_strict(@id, key)
+  end
 
   def configure(key, val=None)
     @listbox.itemconfigure(@id, key, val)
diff --git a/ext/tk/lib/tkextlib/bwidget/mainframe.rb b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
index c54e878557..92253bd8d3 100644
--- a/ext/tk/lib/tkextlib/bwidget/mainframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
@@ -18,7 +18,7 @@ end
 class Tk::BWidget::MainFrame
   TkCommandNames = ['MainFrame'.freeze].freeze
   WidgetClassName = 'MainFrame'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'progressfg'
@@ -41,40 +41,80 @@ class Tk::BWidget::MainFrame
 
   def add_indicator(keys={}, &b)
     win = window(tk_send('addindicator', *hash_kv(keys)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def add_toolbar(&b)
     win = window(tk_send('addtoolbar'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def get_frame(&b)
     win = window(tk_send('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def get_indicator(idx, &b)
     win = window(tk_send('getindicator', idx))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def get_menu(menu_id, &b)
     win = window(tk_send('getmenu', menu_id))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def get_toolbar(idx, &b)
     win = window(tk_send('gettoolbar', idx))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
+  def get_menustate(tag)
+    tk_send('getmenustate', tag) # return state name string
+  end
+
   def set_menustate(tag, state)
     tk_send('setmenustate', tag, state)
     self
diff --git a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
index 9c946d0630..7b62614737 100644
--- a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
+++ b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
@@ -17,7 +17,7 @@ end
 class Tk::BWidget::MessageDlg
   TkCommandNames = ['MessageDlg'.freeze].freeze
   WidgetClassName = 'MessageDlg'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def initialize(parent=nil, keys=nil)
     @relative = ''
@@ -65,6 +65,17 @@ class Tk::BWidget::MessageDlg
     end
     @keys[slot]
   end
+  def cget_strict(slot)
+    slot = slot.to_s
+    if slot == 'relative'
+      slot = 'parent'
+    end
+    if winfo_exist?
+      val = super(slot)
+      @keys[slot] = val
+    end
+    @keys[slot]
+  end
 
   def configure(slot, value=None)
     if winfo_exist?
@@ -173,6 +184,9 @@ class Tk::BWidget::MessageDlg
   end
 
   def create
-    num_or_str(tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys)))
+    # return the index of the pressed button, or nil if it is destroyed
+    ret = num_or_str(tk_call(self.class::TkCommandNames[0],
+                             @path, *hash_kv(@keys)))
+    (ret < 0)? nil: ret
   end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/notebook.rb b/ext/tk/lib/tkextlib/bwidget/notebook.rb
index 5146d4915d..ed28bcd86a 100644
--- a/ext/tk/lib/tkextlib/bwidget/notebook.rb
+++ b/ext/tk/lib/tkextlib/bwidget/notebook.rb
@@ -19,11 +19,11 @@ class Tk::BWidget::NoteBook
 
   TkCommandNames = ['NoteBook'.freeze].freeze
   WidgetClassName = 'NoteBook'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   class Event_for_Tabs < TkEvent::Event
     def self._get_extra_args_tbl
-      [ 
+      [
         TkComm.method(:string)   # page idenfier
       ]
     end
@@ -57,7 +57,7 @@ class Tk::BWidget::NoteBook
     else
       cmd = Proc.new
     end
-    _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'], 
+    _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
                           context, cmd, *args)
     self
   end
@@ -73,7 +73,7 @@ class Tk::BWidget::NoteBook
     else
       cmd = Proc.new
     end
-    _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'], 
+    _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
                                  context, cmd, *args)
     self
   end
@@ -89,7 +89,13 @@ class Tk::BWidget::NoteBook
 
   def add(page, &b)
     win = window(tk_send('add', tagid(page)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
@@ -105,7 +111,13 @@ class Tk::BWidget::NoteBook
 
   def get_frame(page, &b)
     win = window(tk_send('getframe', tagid(page)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
@@ -115,7 +127,13 @@ class Tk::BWidget::NoteBook
 
   def insert(index, page, keys={}, &b)
     win = window(tk_send('insert', index, tagid(page), *hash_kv(keys)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
diff --git a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
index fc01284be6..31bbf1fb8b 100644
--- a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
+++ b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
@@ -17,7 +17,7 @@ end
 class Tk::BWidget::PagesManager
   TkCommandNames = ['PagesManager'.freeze].freeze
   WidgetClassName = 'PagesManager'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def tagid(id)
     # id.to_s
@@ -26,7 +26,13 @@ class Tk::BWidget::PagesManager
 
   def add(page, &b)
     win = window(tk_send('add', tagid(page)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
@@ -42,7 +48,13 @@ class Tk::BWidget::PagesManager
 
   def get_frame(page, &b)
     win = window(tk_send('getframe', tagid(page)))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
diff --git a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
index 19982c6095..54cf06cbde 100644
--- a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
+++ b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
@@ -17,7 +17,12 @@ end
 class Tk::BWidget::PanedWindow
   TkCommandNames = ['PanedWindow'.freeze].freeze
   WidgetClassName = 'PanedWindow'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'activator'
+  end
+  private :__strval_optkeys
 
   def add(keys={})
     window(tk_send('add', *hash_kv(keys)))
@@ -25,7 +30,13 @@ class Tk::BWidget::PanedWindow
 
   def get_frame(idx, &b)
     win = window(tk_send_without_enc('getframe', idx))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/panelframe.rb b/ext/tk/lib/tkextlib/bwidget/panelframe.rb
index 13f8817d74..1cbf914425 100644
--- a/ext/tk/lib/tkextlib/bwidget/panelframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/panelframe.rb
@@ -17,7 +17,7 @@ end
 class Tk::BWidget::PanelFrame
   TkCommandNames = ['PanelFrame'.freeze].freeze
   WidgetClassName = 'PanelFrame'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() + ['panelforeground', 'panelbackground']
@@ -36,16 +36,32 @@ class Tk::BWidget::PanelFrame
 
   def get_frame(&b)
     win = window(tk_send_without_enc('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def items
-    list(tk_send('items'))
+    simplelist(tk_send('items')).map{|w| window(w)}
   end
 
   def remove(*wins)
     tk_send('remove', *wins)
     self
   end
+
+  def remove_with_destroy(*wins)
+    tk_send('remove', '-destroy', *wins)
+    self
+  end
+
+  def delete(*wins) # same to 'remove_with_destroy'
+    tk_send('delete', *wins)
+    self
+  end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb b/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
index 0b635d97bb..ea50c87cef 100644
--- a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
+++ b/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
@@ -17,10 +17,10 @@ end
 class Tk::BWidget::PasswdDlg
   TkCommandNames = ['PasswdDlg'.freeze].freeze
   WidgetClassName = 'PasswdDlg'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
-    super() << 'loginhelptext' << 'loginlabel' << 'logintext' << 
+    super() << 'loginhelptext' << 'loginlabel' << 'logintext' <<
       'passwdlabel' << 'passwdtext'
   end
   private :__strval_optkeys
@@ -31,13 +31,13 @@ class Tk::BWidget::PasswdDlg
   private :__boolval_optkeys
 
   def __tkvariable_optkeys
-    super() << 'loginhelpvar' << 'logintextvariable' << 
+    super() << 'loginhelpvar' << 'logintextvariable' <<
       'passwdhelpvar' << 'passwdtextvariable'
   end
   private :__tkvariable_optkeys
 
   def create
-    login, passwd = simplelist(tk_call(self.class::TkCommandNames[0], 
+    login, passwd = simplelist(tk_call(self.class::TkCommandNames[0],
                                        @path, *hash_kv(@keys)))
     [login, passwd]
   end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressbar.rb b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
index 0253ce2ada..18eb67349b 100644
--- a/ext/tk/lib/tkextlib/bwidget/progressbar.rb
+++ b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
@@ -16,5 +16,5 @@ end
 class Tk::BWidget::ProgressBar
   TkCommandNames = ['ProgressBar'.freeze].freeze
   WidgetClassName = 'ProgressBar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
index fbf00f3b00..0c0c4540bc 100644
--- a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
+++ b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
@@ -19,7 +19,7 @@ end
 class Tk::BWidget::ProgressDlg
   TkCommandNames = ['ProgressDlg'.freeze].freeze
   WidgetClassName = 'ProgressDlg'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def create_self(keys)
     # NOT create widget for reusing the object
@@ -51,4 +51,8 @@ class Tk::BWidget::ProgressDlg
   def value= (val)
     @keys['variable'].value = val
   end
+
+  def create
+    window(tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys)))
+  end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb b/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
index a3986681a5..5bd00d6870 100644
--- a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
@@ -19,11 +19,17 @@ class Tk::BWidget::ScrollableFrame
 
   TkCommandNames = ['ScrollableFrame'.freeze].freeze
   WidgetClassName = 'ScrollableFrame'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def get_frame(&b)
     win = window(tk_send_without_enc('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
diff --git a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
index e9e53235b7..ea5a18cc66 100644
--- a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
+++ b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
@@ -17,11 +17,27 @@ end
 class Tk::BWidget::ScrolledWindow
   TkCommandNames = ['ScrolledWindow'.freeze].freeze
   WidgetClassName = 'ScrolledWindow'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'sides'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'managed'
+  end
+  private :__boolval_optkeys
 
   def get_frame(&b)
     win = window(tk_send_without_enc('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollview.rb b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
index 0546af2c43..ab27bc91cf 100644
--- a/ext/tk/lib/tkextlib/bwidget/scrollview.rb
+++ b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
@@ -16,7 +16,7 @@ end
 class Tk::BWidget::ScrollView
   TkCommandNames = ['ScrollView'.freeze].freeze
   WidgetClassName = 'ScrollView'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'fill'
diff --git a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
index 742a84cd84..456175e87e 100644
--- a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
+++ b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
@@ -10,6 +10,11 @@ require 'tkextlib/bwidget/messagedlg'
 module Tk
   module BWidget
     class SelectColor < Tk::BWidget::MessageDlg
+      class Dialog < Tk::BWidget::SelectColor
+      end
+      class Menubutton < Tk::Menubutton
+      end
+      MenuButton = Menubutton
     end
   end
 end
@@ -19,7 +24,7 @@ class Tk::BWidget::SelectColor
 
   TkCommandNames = ['SelectColor'.freeze].freeze
   WidgetClassName = 'SelectColor'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def dialog(keys={})
     newkeys = @keys.dup
@@ -43,3 +48,26 @@ class Tk::BWidget::SelectColor
     tk_call('SelectColor::setcolor', idx, color)
   end
 end
+
+class Tk::BWidget::SelectColor::Dialog
+  def create_self(keys)
+    super(keys)
+    @keys['type'] = 'dialog'
+  end
+
+  def create
+    @keys['type'] = 'dialog'  # 'dialog' type returns color
+    tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
+            @path, *hash_kv(@keys))
+  end
+end
+
+class Tk::BWidget::SelectColor::Menubutton
+  def create_self(keys)
+    keys = {} unless keys
+    keys = _symbolkey2str(keys)
+    keys['type'] = 'menubutton'  # 'toolbar' type returns widget path
+    window(tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
+                   @path, *hash_kv(keys)))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/selectfont.rb b/ext/tk/lib/tkextlib/bwidget/selectfont.rb
index 478787602a..23419cb0fa 100644
--- a/ext/tk/lib/tkextlib/bwidget/selectfont.rb
+++ b/ext/tk/lib/tkextlib/bwidget/selectfont.rb
@@ -23,13 +23,18 @@ class Tk::BWidget::SelectFont
 
   TkCommandNames = ['SelectFont'.freeze].freeze
   WidgetClassName = 'SelectFont'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'sampletext' <<  'title'
   end
   private :__strval_optkeys
 
+  def __boolval_optkeys
+    super() << 'nosizes'
+  end
+  private :__boolval_optkeys
+
   def __font_optkeys
     [] # without fontobj operation
   end
@@ -66,7 +71,7 @@ class Tk::BWidget::SelectFont::Dialog
   end
 
   def create
-    @keys['type'] = 'dialog'
+    @keys['type'] = 'dialog'  # 'dialog' type returns font name
     tk_call(Tk::BWidget::SelectFont::TkCommandNames[0], @path, *hash_kv(@keys))
   end
 end
@@ -79,7 +84,8 @@ class Tk::BWidget::SelectFont::Toolbar
   def create_self(keys)
     keys = {} unless keys
     keys = _symbolkey2str(keys)
-    keys['type'] = 'toolbar'
-    tk_call(Tk::BWidget::SelectFont::TkCommandNames[0], @path, *hash_kv(keys))
+    keys['type'] = 'toolbar'  # 'toolbar' type returns widget path
+    window(tk_call(Tk::BWidget::SelectFont::TkCommandNames[0],
+                   @path, *hash_kv(keys)))
   end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/separator.rb b/ext/tk/lib/tkextlib/bwidget/separator.rb
index d9c3458e51..6d92321210 100644
--- a/ext/tk/lib/tkextlib/bwidget/separator.rb
+++ b/ext/tk/lib/tkextlib/bwidget/separator.rb
@@ -16,5 +16,5 @@ end
 class Tk::BWidget::Separator
   TkCommandNames = ['Separator'.freeze].freeze
   WidgetClassName = 'Separator'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/setup.rb b/ext/tk/lib/tkextlib/bwidget/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/bwidget/setup.rb
+++ b/ext/tk/lib/tkextlib/bwidget/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
index ca4c046e5c..0a45b045fb 100644
--- a/ext/tk/lib/tkextlib/bwidget/spinbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
@@ -10,7 +10,7 @@ require 'tkextlib/bwidget/entry'
 
 module Tk
   module BWidget
-    class SpinBox < TkEntry
+    class SpinBox < Tk::Entry
     end
   end
 end
@@ -20,7 +20,7 @@ class Tk::BWidget::SpinBox
 
   TkCommandNames = ['SpinBox'.freeze].freeze
   WidgetClassName = 'SpinBox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
diff --git a/ext/tk/lib/tkextlib/bwidget/statusbar.rb b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
index df16e4c0b7..5c5dd43fe4 100644
--- a/ext/tk/lib/tkextlib/bwidget/statusbar.rb
+++ b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
@@ -17,10 +17,10 @@ end
 class Tk::BWidget::StatusBar
   TkCommandNames = ['StatusBar'.freeze].freeze
   WidgetClassName = 'StatusBar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
-    super() << 'showresize'
+    super() << 'showresize' << 'showseparator' << 'showresizesep'
   end
   private :__boolval_optkeys
 
@@ -29,18 +29,34 @@ class Tk::BWidget::StatusBar
     self
   end
 
-  def delete(*wins)
+  def remove(*wins)
+    tk_send('remove', *wins)
+    self
+  end
+
+  def remove_with_destroy(*wins)
+    tk_send('remove', '-destroy', *wins)
+    self
+  end
+
+  def delete(*wins) # same to 'remove_with_destroy'
     tk_send('delete', *wins)
     self
   end
 
   def get_frame(&b)
     win = window(tk_send_without_enc('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
   def items
-    list(tk_send('items'))
+    simplelist(tk_send('items')).map{|w| window(w)}
   end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/titleframe.rb b/ext/tk/lib/tkextlib/bwidget/titleframe.rb
index f519490430..71879111c1 100644
--- a/ext/tk/lib/tkextlib/bwidget/titleframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/titleframe.rb
@@ -17,11 +17,17 @@ end
 class Tk::BWidget::TitleFrame
   TkCommandNames = ['TitleFrame'.freeze].freeze
   WidgetClassName = 'TitleFrame'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def get_frame(&b)
     win = window(tk_send_without_enc('getframe'))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 end
diff --git a/ext/tk/lib/tkextlib/bwidget/tree.rb b/ext/tk/lib/tkextlib/bwidget/tree.rb
index e7178debe2..089c482fe8 100644
--- a/ext/tk/lib/tkextlib/bwidget/tree.rb
+++ b/ext/tk/lib/tkextlib/bwidget/tree.rb
@@ -22,11 +22,11 @@ class Tk::BWidget::Tree
 
   TkCommandNames = ['Tree'.freeze].freeze
   WidgetClassName = 'Tree'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   class Event_for_Items < TkEvent::Event
     def self._get_extra_args_tbl
-      [ 
+      [
         TkComm.method(:string)   # item idenfier
       ]
     end
@@ -38,7 +38,7 @@ class Tk::BWidget::Tree
   private :__strval_optkeys
 
   def __boolval_optkeys
-    super() << 'dragenabled' << 'dropenabled' << 
+    super() << 'dragenabled' << 'dropenabled' <<
       'redraw' << 'selectfill' << 'showlines'
   end
   private :__boolval_optkeys
@@ -57,6 +57,37 @@ class Tk::BWidget::Tree
     end
   end
 
+  def areabind(context, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindArea'],
+                          context, cmd, *args)
+    self
+  end
+
+  def areabind_append(context, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindArea'],
+                                 context, cmd, *args)
+    self
+  end
+
+  def areabind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
+    self
+  end
+
+  def areabindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
+  end
+
   #def imagebind(*args)
   #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
   #  self
@@ -68,7 +99,7 @@ class Tk::BWidget::Tree
     else
       cmd = Proc.new
     end
-    _bind_for_event_class(Event_for_Items, [path, 'bindImage'], 
+    _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
                           context, cmd, *args)
     self
   end
@@ -84,7 +115,7 @@ class Tk::BWidget::Tree
     else
       cmd = Proc.new
     end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], 
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
                                  context, cmd, *args)
     self
   end
@@ -109,7 +140,7 @@ class Tk::BWidget::Tree
     else
       cmd = Proc.new
     end
-    _bind_for_event_class(Event_for_Items, [path, 'bindText'], 
+    _bind_for_event_class(Event_for_Items, [path, 'bindText'],
                           context, cmd, *args)
     self
   end
@@ -125,7 +156,7 @@ class Tk::BWidget::Tree
     else
       cmd = Proc.new
     end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], 
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
                                  context, cmd, *args)
     self
   end
@@ -158,6 +189,16 @@ class Tk::BWidget::Tree
     bool(tk_send('exists', tagid(node)))
   end
 
+  def find(findinfo, confine=None)
+    Tk::BWidget::Tree::Node.id2obj(self, tk_send(findinfo, confine))
+  end
+  def find_position(x, y, confine=None)
+    self.find(_at(x,y), confine)
+  end
+  def find_line(linenum)
+    self.find(linenum)
+  end
+
   def index(node)
     num_or_str(tk_send('index', tagid(node)))
   end
@@ -167,6 +208,10 @@ class Tk::BWidget::Tree
     self
   end
 
+  def line(node)
+    number(tk_send('line', tagid(node)))
+  end
+
   def move(parent, node, idx)
     tk_send('move', tagid(parent), tagid(node), idx)
     self
@@ -183,7 +228,7 @@ class Tk::BWidget::Tree
   end
 
   def open?(node)
-    bool(@tree.itemcget(tagid(node), 'open'))
+    bool(self.itemcget(tagid(node), 'open'))
   end
 
   def open_tree(node, recurse=None)
@@ -206,7 +251,7 @@ class Tk::BWidget::Tree
   end
 
   def selection_add(*args)
-    tk_send_without_enc('selection', 'add', 
+    tk_send_without_enc('selection', 'add',
                         *(args.collect{|node| tagid(node)}))
     self
   end
@@ -221,30 +266,30 @@ class Tk::BWidget::Tree
   end
 
   def selection_include?(*args)
-    bool(tk_send_without_enc('selection', 'get', 
+    bool(tk_send_without_enc('selection', 'get',
                              *(args.collect{|node| tagid(node)})))
   end
 
   def selection_range(*args)
-    tk_send_without_enc('selection', 'range', 
+    tk_send_without_enc('selection', 'range',
                         *(args.collect{|node| tagid(node)}))
     self
   end
 
   def selection_remove(*args)
-    tk_send_without_enc('selection', 'remove', 
+    tk_send_without_enc('selection', 'remove',
                         *(args.collect{|node| tagid(node)}))
     self
   end
 
   def selection_set(*args)
-    tk_send_without_enc('selection', 'set', 
+    tk_send_without_enc('selection', 'set',
                         *(args.collect{|node| tagid(node)}))
     self
   end
 
   def selection_toggle(*args)
-    tk_send_without_enc('selection', 'toggle', 
+    tk_send_without_enc('selection', 'toggle',
                         *(args.collect{|node| tagid(node)}))
     self
   end
@@ -263,14 +308,26 @@ class Tk::BWidget::Tree::Node
   include TkTreatTagFont
 
   TreeNode_TBL = TkCore::INTERP.create_table
-  TreeNode_ID = ['bw:node'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ TreeNode_TBL.clear }
+  (TreeNode_ID = ['bw:node'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    TreeNode_TBL.mutex.synchronize{ TreeNode_TBL.clear }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless TreeNode_TBL[tpath]
-    TreeNode_TBL[tpath][id]? TreeNode_TBL[tpath][id]: id
+    TreeNode_TBL.mutex.synchronize{
+      if TreeNode_TBL[tpath]
+        TreeNode_TBL[tpath][id]? TreeNode_TBL[tpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   def initialize(tree, *args)
@@ -286,7 +343,7 @@ class Tk::BWidget::Tree::Node
       @tree = tree.tree
       parent = tree.parent
     else
-      fail RuntimeError, 
+      fail RuntimeError,
         "expect Tk::BWidget::Tree or Tk::BWidget::Tree::Node for 1st argument"
     end
 
@@ -311,13 +368,17 @@ class Tk::BWidget::Tree::Node
     if keys.key?('nodename')
       @path = @id = keys.delete('nodename')
     else
-      @path = @id = TreeNode_ID.join(TkCore::INTERP._ip_id_)
-      TreeNode_ID[1].succ!
+      TreeNode_ID.mutex.synchronize{
+        @path = @id = TreeNode_ID.join(TkCore::INTERP._ip_id_)
+        TreeNode_ID[1].succ!
+      }
     end
 
-    TreeNode_TBL[@id] = self
-    TreeNode_TBL[@tpath] = {} unless TreeNode_TBL[@tpath]
-    TreeNode_TBL[@tpath][@id] = self
+    TreeNode_TBL.mutex.synchronize{
+      TreeNode_TBL[@id] = self
+      TreeNode_TBL[@tpath] = {} unless TreeNode_TBL[@tpath]
+      TreeNode_TBL[@tpath][@id] = self
+    }
 
     @tree.insert(index, parent, @id, keys)
   end
@@ -339,9 +400,15 @@ class Tk::BWidget::Tree::Node
     val
   end
 
+  def cget_tkstring(key)
+    @tree.itemcget_tkstring(@id, key)
+  end
   def cget(key)
     @tree.itemcget(@id, key)
   end
+  def cget_strict(key)
+    @tree.itemcget_strict(@id, key)
+  end
 
   def configure(key, val=None)
     @tree.itemconfigure(@id, key, val)
@@ -431,4 +498,3 @@ class Tk::BWidget::Tree::Node
     @tree.visible(@id)
   end
 end
-
diff --git a/ext/tk/lib/tkextlib/bwidget/widget.rb b/ext/tk/lib/tkextlib/bwidget/widget.rb
index 568e503a8b..a93364b567 100644
--- a/ext/tk/lib/tkextlib/bwidget/widget.rb
+++ b/ext/tk/lib/tkextlib/bwidget/widget.rb
@@ -29,6 +29,13 @@ module Tk::BWidget::Widget
     ['Widget::configure']
   end
 
+  def self.cget_strict(slot)
+    slot = slot.to_s
+    info = {}
+    self.current_configinfo.each{|k,v| info[k.to_s] = v if k.to_s == slot}
+    fail RuntimeError, "unknown option \"-#{slot}\""  if info.empty?
+    info.values[0]
+  end
   def self.cget(slot)
     self.current_configinfo(slot).values[0]
   end
@@ -43,7 +50,13 @@ module Tk::BWidget::Widget
 
   def self.create(klass, path, rename=None, &b)
     win = window(tk_call('Widget::create', klass, path, rename))
-    win.instance_eval(&b) if b
+    if b
+      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+        win.instance_exec(self, &b)
+      else
+        win.instance_eval(&b)
+      end
+    end
     win
   end
 
@@ -99,9 +112,12 @@ module Tk::BWidget::Widget
     tk_call('Widget::setoption', win, option, value)
   end
 
-  def self.sub_cget(win, subwidget)
+  def self.sub_cget_strict(win, subwidget)
     tk_call('Widget::subcget', win, subwidget)
   end
+  def self.sub_cget(win, subwidget)
+    self.sub_cget_strict(win, subwidget)
+  end
 
   def self.sync_options(klass, subclass, subpath, options)
     tk_call('Widget::syncoptions', klass, subclass, subpath, options)
diff --git a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
index 07abf3a7bf..8f6bb33abe 100644
--- a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
+++ b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
@@ -40,16 +40,22 @@ module Tk
     class ItclObject < TkObject
       ITCL_CLASSNAME = ''.freeze
 
-      ITCL_OBJ_ID = ['itclobj'.freeze, '00000'.taint].freeze
-      ITCL_OBJ_TBL = {}.taint
+      (ITCL_OBJ_ID = ['itclobj'.freeze, TkUtil.untrust('00000')]).instance_eval{
+        @mutex = Mutex.new
+        def mutex; @mutex; end
+        freeze
+      }
+      ITCL_OBJ_TBL = TkUtil.untrust({})
 
       def initialize(*args)
         if (@klass = self.class::ITCL_CLASSNAME).empty?
           fail RuntimeError, 'unknown itcl class (abstract class?)'
         end
-        @id = Tk::Itcl::ItclObject::TCL_OBJ_ID.join(TkCore::INTERP._ip_id_)
+        Tk::Itcl::ItclObject::ITCL_OBJ_ID.mutex.synchronize{
+          @id = Tk::Itcl::ItclObject::TCL_OBJ_ID.join(TkCore::INTERP._ip_id_)
+          Tk::Itcl::ItclObject::ITCL_OBJ_ID[1].succ!
+        }
         @path = @id
-        Tk::Itcl::ItclObject::ITCL_OBJ_ID[1].succ!
       end
 
       def self.call_proc(name, *args)
diff --git a/ext/tk/lib/tkextlib/itcl/setup.rb b/ext/tk/lib/tkextlib/itcl/setup.rb
index 5be0588703..70b38e4916 100644
--- a/ext/tk/lib/tkextlib/itcl/setup.rb
+++ b/ext/tk/lib/tkextlib/itcl/setup.rb
@@ -2,8 +2,8 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
 
diff --git a/ext/tk/lib/tkextlib/itk/incr_tk.rb b/ext/tk/lib/tkextlib/itk/incr_tk.rb
index 0626536e36..989585e33b 100644
--- a/ext/tk/lib/tkextlib/itk/incr_tk.rb
+++ b/ext/tk/lib/tkextlib/itk/incr_tk.rb
@@ -99,7 +99,7 @@ module Tk
       def itk_option_define(name, resource, klass, init, config=None)
         tk_call('itk_option', 'define', name, resource, klass, init, config)
       end
-      
+
       def itk_option_remove(*args)
         tk_call('itk_option', 'remove', *args)
       end
@@ -111,7 +111,7 @@ module Tk
     class Toplevel < Archetype
       TkCommandNames = ['::itk::Toplevel'].freeze
       WidgetClassName = 'Toplevel'.freeze
-      WidgetClassNames[WidgetClassName] = self
+      WidgetClassNames[WidgetClassName] ||= self
 
       include Wm
       include TkMenuSpec
@@ -127,7 +127,7 @@ module Tk
     class Widget < Archetype
       TkCommandNames = ['::itk::Widget'].freeze
       WidgetClassName = 'Widget'.freeze
-      WidgetClassNames[WidgetClassName] = self
+      WidgetClassNames[WidgetClassName] ||= self
     end
 
 
@@ -145,9 +145,16 @@ module Tk
       private :__config_cmd
 
       ComponentID_TBL = TkCore::INTERP.create_table
-      Itk_Component_ID = ['itk:component'.freeze, '00000'.taint].freeze
 
-      TkCore::INTERP.init_ip_env{ ComponentID_TBL.clear }
+      (Itk_Component_ID = ['itk:component'.freeze, TkUtil.untrust('00000')]).instance_eval{
+        @mutex = Mutex.new
+        def mutex; @mutex; end
+        freeze
+      }
+
+      TkCore::INTERP.init_ip_env{
+        ComponentID_TBL.mutex.synchronize{ ComponentID_TBL.clear }
+      }
 
       def self.id2obj(master, id)
         if master.kind_of?(TkObject)
@@ -155,8 +162,13 @@ module Tk
         else
           master = master.to_s
         end
-        return id unless ComponentID_TBL.key?(master)
-        (ComponentID_TBL.key?(id))? ComponentID_TBL[master][id]: id
+        ComponentID_TBL.mutex.synchronize{
+          if ComponentID_TBL.key?(master)
+            (ComponentID_TBL[master].key?(id))? ComponentID_TBL[master][id]: id
+          else
+            id
+          end
+        }
       end
 
       def self.new(master, component=nil)
@@ -171,17 +183,21 @@ module Tk
         elsif component
           component = component.to_s
         else
-          component = Itk_Component_ID.join(TkCore::INTERP._ip_id_)
-          Itk_Component_ID[1].succ!
+          Itk_Component_ID.mutex.synchronize{
+            component = Itk_Component_ID.join(TkCore::INTERP._ip_id_)
+            Itk_Component_ID[1].succ!
+          }
         end
 
-        if ComponentID_TBL.key?(master)
-          if ComponentID_TBL[master].key?(component)
-            return ComponentID_TBL[master][component] 
+        ComponentID_TBL.mutex.synchronize{
+          if ComponentID_TBL.key?(master)
+            if ComponentID_TBL[master].key?(component)
+              return ComponentID_TBL[master][component]
+            end
+          else
+            ComponentID_TBL[master] = {}
           end
-        else
-          ComponentID_TBL[master] = {}
-        end
+        }
 
         super(master, component)
       end
@@ -190,7 +206,9 @@ module Tk
         @master = master
         @component = component
 
-        ComponentID_TBL[@master][@component] = self
+        ComponentID_TBL.mutex.synchronize{
+          ComponentID_TBL[@master][@component] = self
+        }
 
         begin
           @widget = window(tk_call(@master, 'component', @component))
diff --git a/ext/tk/lib/tkextlib/itk/setup.rb b/ext/tk/lib/tkextlib/itk/setup.rb
index e47b64adae..544926efe0 100644
--- a/ext/tk/lib/tkextlib/itk/setup.rb
+++ b/ext/tk/lib/tkextlib/itk/setup.rb
@@ -2,8 +2,8 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
index a055e07ac9..91e06d1b52 100644
--- a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Buttonbox
   TkCommandNames = ['::iwidgets::buttonbox'.freeze].freeze
   WidgetClassName = 'Buttonbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -46,13 +46,15 @@ class Tk::Iwidgets::Buttonbox
     end
   end
 
+  alias buttoncget_tkstring itemcget_tkstring
   alias buttoncget itemcget
+  alias buttoncget_strict itemcget_strict
   alias buttonconfigure itemconfigure
   alias buttonconfiginfo itemconfiginfo
   alias current_buttonconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/calendar.rb b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
index 0152f8593a..a5478c7cc6 100644
--- a/ext/tk/lib/tkextlib/iwidgets/calendar.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
@@ -16,11 +16,11 @@ end
 class Tk::Iwidgets::Calendar
   TkCommandNames = ['::iwidgets::calendar'.freeze].freeze
   WidgetClassName = 'Calendar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() + [
-      'buttonforeground', 'outline', 'selectcolor', 
+      'buttonforeground', 'outline', 'selectcolor',
       'weekdaybackground', 'weekendbackground'
     ]
   end
@@ -45,6 +45,25 @@ class Tk::Iwidgets::Calendar
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL  = [ [?d, ?s, :date], nil ]
       PROC_TBL = [ [?s, TkComm.method(:string) ], nil ]
+
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
index fa5e90ad05..398eec3f1a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Canvasprintbox
   TkCommandNames = ['::iwidgets::canvasprintbox'.freeze].freeze
   WidgetClassName = 'Canvasprintbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'filename'
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
index bbf507677c..e64d8154ca 100644
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Canvasprintdialog
   TkCommandNames = ['::iwidgets::canvasprintdialog'.freeze].freeze
   WidgetClassName = 'Canvasprintdialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def get_output
     tk_call(@path, 'getoutput')
diff --git a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
index 46ca389db2..a7476c824e 100644
--- a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Checkbox
   TkCommandNames = ['::iwidgets::checkbox'.freeze].freeze
   WidgetClassName = 'Checkbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -46,13 +46,15 @@ class Tk::Iwidgets::Checkbox
     end
   end
 
+  alias buttoncget_tkstring itemcget_tkstring
   alias buttoncget itemcget
+  alias buttoncget_strict itemcget_strict
   alias buttonconfigure itemconfigure
   alias buttonconfiginfo itemconfiginfo
   alias current_buttonconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
@@ -85,12 +87,24 @@ class Tk::Iwidgets::Checkbox
     self
   end
 
-  def get(idx)
-    simplelist(tk_call(@path, 'get', index(idx))).collect{|id|
+  def get_tags
+    simplelist(tk_call_without_enc(@path, 'get'))
+  end
+
+  def get_objs
+    simplelist(tk_call_without_enc(@path, 'get')).collect{|id|
       Tk::Itk::Component.id2obj(self, id)
     }
   end
 
+  def get(idx=nil)
+    if idx
+      bool(tk_call_without_enc(@path, 'get', index(idx)))
+    else
+      get_tags
+    end
+  end
+
   def index(idx)
     number(tk_call(@path, 'index', tagid(idx)))
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/combobox.rb b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
index a6d54d78fa..82dcf25d0b 100644
--- a/ext/tk/lib/tkextlib/iwidgets/combobox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Combobox
   TkCommandNames = ['::iwidgets::combobox'.freeze].freeze
   WidgetClassName = 'Combobox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'completion' << 'dropdown' << 'editable' << 'unique'
diff --git a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
index 0a8897f50d..98a0051e55 100644
--- a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
@@ -16,5 +16,5 @@ end
 class Tk::Iwidgets::Dateentry
   TkCommandNames = ['::iwidgets::dateentry'.freeze].freeze
   WidgetClassName = 'Dateentry'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/iwidgets/datefield.rb b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
index 632f3334dc..50d5405a3b 100644
--- a/ext/tk/lib/tkextlib/iwidgets/datefield.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Datefield
   TkCommandNames = ['::iwidgets::datefield'.freeze].freeze
   WidgetClassName = 'Datefield'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'gmt'
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialog.rb b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
index 8540eae1b5..2d554ca7b5 100644
--- a/ext/tk/lib/tkextlib/iwidgets/dialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
@@ -16,5 +16,5 @@ end
 class Tk::Iwidgets::Dialog
   TkCommandNames = ['::iwidgets::dialog'.freeze].freeze
   WidgetClassName = 'Dialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
index d6c668621d..e880594532 100644
--- a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Dialogshell
   TkCommandNames = ['::iwidgets::dialogshell'.freeze].freeze
   WidgetClassName = 'Dialogshell'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -46,13 +46,15 @@ class Tk::Iwidgets::Dialogshell
     end
   end
 
+  alias buttoncget_tkstring itemcget_tkstring
   alias buttoncget itemcget
+  alias buttoncget_strict itemcget_strict
   alias buttonconfigure itemconfigure
   alias buttonconfiginfo itemconfiginfo
   alias current_buttonconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
index 9bc063ba69..07ab025cdf 100644
--- a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Disjointlistbox
   TkCommandNames = ['::iwidgets::disjointlistbox'.freeze].freeze
   WidgetClassName = 'Disjointlistbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'lhslabeltext' << 'rhslabeltext' << 'lhsbuttonlabel' << 'rhsbuttonlabel'
diff --git a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
index 6aa933ce06..3e7149a662 100644
--- a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Entryfield
   TkCommandNames = ['::iwidgets::entryfield'.freeze].freeze
   WidgetClassName = 'Entryfield'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __font_optkeys
     super() << 'textfont'
@@ -30,18 +30,37 @@ class Tk::Iwidgets::Entryfield
   class EntryfieldValidate < TkValidateCommand
     #class CalCmdArgs < TkUtil::CallbackSubst
     class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [ 
-        [ ?c, ?s, :char ], 
-        [ ?P, ?s, :post ], 
-        [ ?S, ?s, :current ], 
-        [ ?W, ?w, :widget ], 
+      KEY_TBL  = [
+        [ ?c, ?s, :char ],
+        [ ?P, ?s, :post ],
+        [ ?S, ?s, :current ],
+        [ ?W, ?w, :widget ],
         nil
       ]
-      PROC_TBL = [ 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
+      PROC_TBL = [
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
+
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
     end
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
index 158d9d474a..e744fba91a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Extbutton
   TkCommandNames = ['::iwidgets::extbutton'.freeze].freeze
   WidgetClassName = 'Extbutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'bitmapforeground' << 'ringbackground'
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
index 501f4c90a0..2ff15bb509 100644
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
@@ -16,11 +16,11 @@ end
 class Tk::Iwidgets::Extfileselectionbox
   TkCommandNames = ['::iwidgets::extfileselectionbox'.freeze].freeze
   WidgetClassName = 'Extfileselectionbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() + [
-      'dirslabel', 'fileslabel', 'filterlabel', 'mask', 'nomatchstring', 
+      'dirslabel', 'fileslabel', 'filterlabel', 'mask', 'nomatchstring',
       'selectionlabel'
     ]
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
index 14388be7c4..509fdcf636 100644
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Extfileselectiondialog
   TkCommandNames = ['::iwidgets::extfileselectiondialog'.freeze].freeze
   WidgetClassName = 'Extfileselectiondialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def child_site
     window(tk_call(@path, 'childsite'))
diff --git a/ext/tk/lib/tkextlib/iwidgets/feedback.rb b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
index 0a25237a24..29d04c8a5d 100644
--- a/ext/tk/lib/tkextlib/iwidgets/feedback.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Feedback
   TkCommandNames = ['::iwidgets::feedback'.freeze].freeze
   WidgetClassName = 'Feedback'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'barcolor'
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
index 7b331d0b40..a425b53b5f 100644
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
@@ -16,11 +16,11 @@ end
 class Tk::Iwidgets::Fileselectionbox
   TkCommandNames = ['::iwidgets::fileselectionbox'.freeze].freeze
   WidgetClassName = 'Fileselectionbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() + [
-      'directory', 'dirslabel', 'fileslabel', 'filterlabel', 'mask', 
+      'directory', 'dirslabel', 'fileslabel', 'filterlabel', 'mask',
       'nomatchstring', 'selectionlabel'
     ]
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
index 50f459e56d..ebcdaf8c0b 100644
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Fileselectiondialog
   TkCommandNames = ['::iwidgets::fileselectiondialog'.freeze].freeze
   WidgetClassName = 'Fileselectiondialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def child_site
     window(tk_call(@path, 'childsite'))
diff --git a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
index 75e219c37e..3d522e07c8 100644
--- a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
@@ -16,11 +16,11 @@ end
 class Tk::Iwidgets::Finddialog
   TkCommandNames = ['::iwidgets::finddialog'.freeze].freeze
   WidgetClassName = 'Finddialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() + [
-      'patternbackground', 'patternforeground', 
+      'patternbackground', 'patternforeground',
       'searchbackground', 'searchforeground'
     ]
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
index 4cc6aeecbd..cb9301d0c9 100644
--- a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
@@ -20,7 +20,7 @@ class Tk::Iwidgets::Hierarchy
 
   TkCommandNames = ['::iwidgets::hierarchy'.freeze].freeze
   WidgetClassName = 'Hierarchy'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -30,6 +30,25 @@ class Tk::Iwidgets::Hierarchy
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL  = [ [?n, ?s, :node], nil ]
       PROC_TBL = [ [?s, TkComm.method(:string) ], nil ]
+
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -45,18 +64,36 @@ class Tk::Iwidgets::Hierarchy
 
   class IndicatorCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [ 
-        [ ?n, ?s, :node ], 
-        [ ?s, ?b, :status ], 
+      KEY_TBL  = [
+        [ ?n, ?s, :node ],
+        [ ?s, ?b, :status ],
         nil
       ]
 
-      PROC_TBL = [ 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?b, TkComm.method(:bool) ], 
+      PROC_TBL = [
+        [ ?s, TkComm.method(:string) ],
+        [ ?b, TkComm.method(:bool) ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -72,12 +109,31 @@ class Tk::Iwidgets::Hierarchy
 
   class IconCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [ 
-        [ ?n, ?s, :node ], 
-        [ ?i, ?s, :icon ], 
+      KEY_TBL  = [
+        [ ?n, ?s, :node ],
+        [ ?i, ?s, :icon ],
         nil
       ]
       PROC_TBL = [ [ ?s, TkComm.method(:string) ], nil ]
+
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -207,14 +263,14 @@ class Tk::Iwidgets::Hierarchy
     self
   end
 
-  # based on TkText widget
+  # based on Tk::Text widget
 
   def bbox(index)
     list(tk_send_without_enc('bbox', _get_eval_enc_str(index)))
   end
 
   def compare(idx1, op, idx2)
-    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1), 
+    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
                              op, _get_eval_enc_str(idx2)))
   end
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
index 77b0e090cd..d4ea1aac65 100644
--- a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Hyperhelp
   TkCommandNames = ['::iwidgets::hyperhelp'.freeze].freeze
   WidgetClassName = 'Hyperhelp'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'helpdir'
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
index e77e85045d..6595398427 100644
--- a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Labeledframe
   TkCommandNames = ['::iwidgets::labeledframe'.freeze].freeze
   WidgetClassName = 'Labeledframe'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'labeltext'
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
index 99387710cb..d36d42878d 100644
--- a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
@@ -18,7 +18,7 @@ class Tk::Iwidgets::Labeledwidget
 
   TkCommandNames = ['::iwidgets::labeledwidget'.freeze].freeze
   WidgetClassName = 'Labeledwidget'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'labeltext'
diff --git a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
index 4b2541b997..ebf48021db 100644
--- a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Mainwindow
   TkCommandNames = ['::iwidgets::mainwindow'.freeze].freeze
   WidgetClassName = 'Mainwindow'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'helpline' << 'statusline'
diff --git a/ext/tk/lib/tkextlib/iwidgets/menubar.rb b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
index dea3d34c2a..f9a17d0b55 100644
--- a/ext/tk/lib/tkextlib/iwidgets/menubar.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Menubar
   TkCommandNames = ['::iwidgets::menubar'.freeze].freeze
   WidgetClassName = 'Menubar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'menubuttons'
@@ -61,13 +61,15 @@ class Tk::Iwidgets::Menubar
     end
   end
 
+  alias menucget_tkstring itemcget_tkstring
   alias menucget itemcget
+  alias menucget_strict itemcget_strict
   alias menuconfigure itemconfigure
   alias menuconfiginfo itemconfiginfo
   alias current_menuconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
index 2bbbec7666..6adb53d941 100644
--- a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Messagebox
   TkCommandNames = ['::iwidgets::messagebox'.freeze].freeze
   WidgetClassName = 'Messagebox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -46,13 +46,15 @@ class Tk::Iwidgets::Messagebox
   end
   private :__item_boolval_optkeys
 
+  alias typecget_tkstring itemcget_tkstring
   alias typecget itemcget
+  alias typecget_strict itemcget_strict
   alias typeconfigure itemconfigure
   alias typeconfiginfo itemconfiginfo
   alias current_typeconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
index c19b83e517..9aa590056f 100644
--- a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
@@ -16,5 +16,5 @@ end
 class Tk::Iwidgets::Messagedialog
   TkCommandNames = ['::iwidgets::messagedialog'.freeze].freeze
   WidgetClassName = 'Messagedialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/iwidgets/notebook.rb b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
index 0f9d713ea1..7ed4126a4d 100644
--- a/ext/tk/lib/tkextlib/iwidgets/notebook.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Notebook
   TkCommandNames = ['::iwidgets::notebook'.freeze].freeze
   WidgetClassName = 'Notebook'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -41,13 +41,15 @@ class Tk::Iwidgets::Notebook
     end
   end
 
+  alias pagecget_tkstring itemcget_tkstring
   alias pagecget itemcget
+  alias pagecget_strict itemcget_strict
   alias pageconfigure itemconfigure
   alias pageconfiginfo itemconfiginfo
   alias current_pageconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
@@ -146,7 +148,12 @@ class Tk::Iwidgets::Notebook
 
   def view(*idxs)
     if idxs.size == 0
-      window(tk_send_without_enc('view'))
+      idx = num_or_str(tk_send_without_enc('view'))
+      if idx.kind_of?(Fixnum) && idx < 0
+        nil
+      else
+        idx
+      end
     else
       tk_send_without_enc('view', *idxs)
       self
@@ -160,8 +167,8 @@ class Tk::Iwidgets::Notebook
   end
   alias xview_moveto view_moveto
   alias yview_moveto view_moveto
-  def view_scroll(*idxs)
-    view('scroll', *idxs)
+  def view_scroll(index, what='pages')
+    view('scroll', index, what)
   end
   alias xview_scroll view_scroll
   alias yview_scroll view_scroll
diff --git a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
index 0c74440be7..57a3cc7d2b 100644
--- a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Optionmenu
   TkCommandNames = ['::iwidgets::optionmenu'.freeze].freeze
   WidgetClassName = 'Optionmenu'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'cyclicon'
diff --git a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
index 035df0a5b8..65463cc85a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Panedwindow
   TkCommandNames = ['::iwidgets::panedwindow'.freeze].freeze
   WidgetClassName = 'Panedwindow'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -41,13 +41,15 @@ class Tk::Iwidgets::Panedwindow
     end
   end
 
+  alias panecget_tkstring itemcget_tkstring
   alias panecget itemcget
+  alias panecget_strict itemcget_strict
   alias paneconfigure itemconfigure
   alias paneconfiginfo itemconfiginfo
   alias current_paneconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
index 620b14b5d5..7c7ff7ad62 100644
--- a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Promptdialog
   TkCommandNames = ['::iwidgets::promptdialog'.freeze].freeze
   WidgetClassName = 'Promptdialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   # index method is not available, because it shows index of the entry field
   def default(name)
diff --git a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
index c21007ca6c..ae56788289 100644
--- a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Pushbutton
   TkCommandNames = ['::iwidgets::pushbutton'.freeze].freeze
   WidgetClassName = 'Pushbutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'defaultring'
diff --git a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
index 1a2821bd6a..21181777b5 100644
--- a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Radiobox
   TkCommandNames = ['::iwidgets::radiobox'.freeze].freeze
   WidgetClassName = 'Radiobox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -46,13 +46,15 @@ class Tk::Iwidgets::Radiobox
     end
   end
 
+  alias buttoncget_tkstring itemcget_tkstring
   alias buttoncget itemcget
+  alias buttoncget_strict itemcget_strict
   alias buttonconfigure itemconfigure
   alias buttonconfiginfo itemconfiginfo
   alias current_buttonconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
@@ -85,10 +87,13 @@ class Tk::Iwidgets::Radiobox
     self
   end
 
-  def get(idx)
-    simplelist(tk_call(@path, 'get', index(idx))).collect{|id|
-      Tk::Itk::Component.id2obj(self, id)
-    }
+  def get_tag
+    ((tag = tk_call_without_enc(@path, 'get')).empty?)? nil: tag
+  end
+  alias get get_tag
+
+  def get_obj
+    (tag = get_tag)? Tk::Itk::Component.id2obj(self, tag): nil
   end
 
   def index(idx)
diff --git a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
index bddef50841..056cd85322 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Scopedobject
   TkCommandNames = ['::iwidgets::scopedobject'.freeze].freeze
   WidgetClassName = 'Scopedobject'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def initialize(obj_name, keys={})
     @path = tk_call(self.class::TkCommandNames[0], obj_name, *hash_kv(keys))
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
index 407c8f2aad..935e04bbcc 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
@@ -17,7 +17,7 @@ end
 class Tk::Iwidgets::Scrolledcanvas
   TkCommandNames = ['::iwidgets::scrolledcanvas'.freeze].freeze
   WidgetClassName = 'Scrolledcanvas'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ################################
 
@@ -37,7 +37,7 @@ class Tk::Iwidgets::Scrolledcanvas
   end
 
   def method_missing(id, *args)
-    if @canvas.methods.include?(id.id2name)
+    if @canvas.respond_to?(id)
       @canvas.__send__(id, *args)
     else
       super(id, *args)
@@ -103,7 +103,7 @@ class Tk::Iwidgets::Scrolledcanvas
   end
 
   def bbox(tagOrId, *tags)
-    list(tk_send_without_enc('bbox', tagid(tagOrId), 
+    list(tk_send_without_enc('bbox', tagid(tagOrId),
                              *tags.collect{|t| tagid(t)}))
   end
 
@@ -165,16 +165,22 @@ class Tk::Iwidgets::Scrolledcanvas
   end
 
   def dchars(tag, first, last=None)
-    tk_send_without_enc('dchars', tagid(tag), 
+    tk_send_without_enc('dchars', tagid(tag),
                         _get_eval_enc_str(first), _get_eval_enc_str(last))
     self
   end
 
   def delete(*args)
-    if TkcItem::CItemID_TBL[self.path]
-      find('withtag', *args).each{|item| 
+    tbl = nil
+    TkcItem::CItemID_TBL.mutex.synchronize{
+      tbl = TkcItem::CItemID_TBL[self.path]
+    }
+    if tbl
+      find('withtag', *args).each{|item|
         if item.kind_of?(TkcItem)
-          TkcItem::CItemID_TBL[self.path].delete(item.id)
+          TkcItem::CItemID_TBL.mutex.synchronize{
+            tbl.delete(item.id)
+          }
         end
       }
     end
@@ -189,7 +195,7 @@ class Tk::Iwidgets::Scrolledcanvas
   end
 
   def find(mode, *args)
-    list(tk_send_without_enc('find', mode, *args)).collect!{|id| 
+    list(tk_send_without_enc('find', mode, *args)).collect!{|id|
       TkcItem.id2obj(self, id)
     }
   end
@@ -245,7 +251,7 @@ class Tk::Iwidgets::Scrolledcanvas
   end
 
   def insert(tagOrId, index, string)
-    tk_send_without_enc('insert', tagid(tagOrId), index, 
+    tk_send_without_enc('insert', tagid(tagOrId), index,
                         _get_eval_enc_str(string))
     self
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
index 8b47460357..7b7b95df1c 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Scrolledframe
   TkCommandNames = ['::iwidgets::scrolledframe'.freeze].freeze
   WidgetClassName = 'Scrolledframe'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def child_site
     window(tk_call(@path, 'childsite'))
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
index 9b69ef07fe..dc2966bd48 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Scrolledhtml
   TkCommandNames = ['::iwidgets::scrolledhtml'.freeze].freeze
   WidgetClassName = 'Scrolledhtml'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'update'
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
index cd1f6f0f79..20a4cd1d36 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
@@ -17,7 +17,7 @@ end
 class Tk::Iwidgets::Scrolledlistbox
   TkCommandNames = ['::iwidgets::scrolledlistbox'.freeze].freeze
   WidgetClassName = 'Scrolledlistbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'textbackground'
@@ -42,7 +42,7 @@ class Tk::Iwidgets::Scrolledlistbox
   end
 
   def method_missing(id, *args)
-    if @listbox.methods.include?(id.id2name)
+    if @listbox.respond_to?(id)
       @listbox.__send__(id, *args)
     else
       super(id, *args)
@@ -141,7 +141,7 @@ class Tk::Iwidgets::Scrolledlistbox
   def get(first, last=nil)
     if last
       # tk_split_simplelist(_fromUTF8(tk_send_without_enc('get', first, last)))
-      tk_split_simplelist(tk_send_without_enc('get', first, last), 
+      tk_split_simplelist(tk_send_without_enc('get', first, last),
                           false, true)
     else
       _fromUTF8(tk_send_without_enc('get', first))
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
index fdafc8dc7f..69b7d314fd 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
@@ -17,7 +17,7 @@ end
 class Tk::Iwidgets::Scrolledtext
   TkCommandNames = ['::iwidgets::scrolledtext'.freeze].freeze
   WidgetClassName = 'Scrolledtext'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'textbackground'
@@ -37,7 +37,7 @@ class Tk::Iwidgets::Scrolledtext
   end
 
   def method_missing(id, *args)
-    if @text.methods.include?(id.id2name)
+    if @text.respond_to?(id)
       @text.__send__(id, *args)
     else
       super(id, *args)
@@ -86,7 +86,7 @@ class Tk::Iwidgets::Scrolledtext
     list(tk_send('bbox', index))
   end
   def compare(idx1, op, idx2)
-    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1), 
+    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
                              op, _get_eval_enc_str(idx2)))
   end
 
@@ -116,27 +116,52 @@ class Tk::Iwidgets::Scrolledtext
     get('-displaychars', *index)
   end
 
-  def image_cget(index, slot)
+  def image_cget_tkstring(index, slot)
+    _fromUTF8(tk_send_without_enc('image', 'cget',
+                                  _get_eval_enc_str(index), "-#{slot.to_s}"))
+  end
+  def image_cget_strict(index, slot)
     case slot.to_s
     when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('image', 'cget', 
+      _fromUTF8(tk_send_without_enc('image', 'cget',
                                     _get_eval_enc_str(index), "-#{slot}"))
     else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget', 
-                                                _get_eval_enc_str(index), 
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
+                                                _get_eval_enc_str(index),
                                                 "-#{slot}")))
     end
   end
+  def image_cget(index, slot)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      image_cget_strict(index, slot)
+    else
+      begin
+        image_cget_strict(index, slot)
+      rescue => e
+        begin
+          if current_image_configinfo.has_key?(slot.to_s)
+            # error on known option
+            fail e
+          else
+            # unknown option
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
+    end
+  end
 
   def image_configure(index, slot, value=None)
     if slot.kind_of? Hash
-      _fromUTF8(tk_send_without_enc('image', 'configure', 
-                                    _get_eval_enc_str(index), 
+      _fromUTF8(tk_send_without_enc('image', 'configure',
+                                    _get_eval_enc_str(index),
                                     *hash_kv(slot, true)))
     else
-      _fromUTF8(tk_send_without_enc('image', 'configure', 
-                                    _get_eval_enc_str(index), 
-                                    "-#{slot}", 
+      _fromUTF8(tk_send_without_enc('image', 'configure',
+                                    _get_eval_enc_str(index),
+                                    "-#{slot}",
                                     _get_eval_enc_str(value)))
     end
     self
@@ -166,16 +191,16 @@ class Tk::Iwidgets::Scrolledtext
           else
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
             if conf[4]
               if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4]) 
+                conf[4] = tk_split_list(conf[4])
               else
-                conf[4] = tk_tcl2ruby(conf[4]) 
+                conf[4] = tk_tcl2ruby(conf[4])
               end
             end
           end
@@ -207,16 +232,16 @@ class Tk::Iwidgets::Scrolledtext
           else
             if conf[2]
               if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
+                conf[2] = tk_split_list(conf[2])
               else
-                conf[2] = tk_tcl2ruby(conf[2]) 
+                conf[2] = tk_tcl2ruby(conf[2])
               end
             end
             if conf[3]
               if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
+                conf[3] = tk_split_list(conf[3])
               else
-                conf[3] = tk_tcl2ruby(conf[3]) 
+                conf[3] = tk_tcl2ruby(conf[3])
               end
             end
           end
@@ -277,7 +302,7 @@ class Tk::Iwidgets::Scrolledtext
 
   def mark_gravity(mark, direction=nil)
     if direction
-      tk_send_without_enc('mark', 'gravity', 
+      tk_send_without_enc('mark', 'gravity',
                           _get_eval_enc_str(mark), direction)
       self
     else
@@ -286,27 +311,27 @@ class Tk::Iwidgets::Scrolledtext
   end
 
   def mark_set(mark, index)
-    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark), 
+    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
                         _get_eval_enc_str(index))
     self
   end
   alias set_mark mark_set
 
   def mark_unset(*marks)
-    tk_send_without_enc('mark', 'unset', 
+    tk_send_without_enc('mark', 'unset',
                         *(marks.collect{|mark| _get_eval_enc_str(mark)}))
     self
   end
   alias unset_mark mark_unset
 
   def mark_next(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next', 
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
                                             _get_eval_enc_str(index))))
   end
   alias next_mark mark_next
 
   def mark_previous(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous', 
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
                                             _get_eval_enc_str(index))))
   end
   alias previous_mark mark_previous
@@ -322,17 +347,22 @@ class Tk::Iwidgets::Scrolledtext
 
 
   def _ktext_length(txt)
+    if TkCore::WITH_ENCODING ### Ruby 1.9 !!!!!!!!!!!!!
+      return txt.length
+    end
+    ###########################
+
     if $KCODE !~ /n/i
       return txt.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
     end
 
     # $KCODE == 'NONE'
     if JAPANIZED_TK
-      tk_call_without_enc('kstring', 'length', 
+      tk_call_without_enc('kstring', 'length',
                           _get_eval_enc_str(txt)).to_i
     else
       begin
-        tk_call_without_enc('encoding', 'convertto', 'ascii', 
+        tk_call_without_enc('encoding', 'convertto', 'ascii',
                             _get_eval_enc_str(txt)).length
       rescue StandardError, NameError
         # sorry, I have no plan
@@ -393,11 +423,11 @@ class Tk::Iwidgets::Scrolledtext
         pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
         if pat.kind_of? String
           #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(pat), pat.dup]
         else
           #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(match), match]
         end
       else
@@ -411,11 +441,11 @@ class Tk::Iwidgets::Scrolledtext
         pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
         if pat.kind_of? String
           #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(pat), pat.dup]
         else
           #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"), 
+          return [index(start + " + #{pos} chars"),
                   _ktext_length(match), match]
         end
       else
@@ -426,7 +456,7 @@ class Tk::Iwidgets::Scrolledtext
           pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
           if pat.kind_of? String
             #return [index("1.0 + #{pos} chars"), pat.split('').length]
-            return [index("1.0 + #{pos} chars"), 
+            return [index("1.0 + #{pos} chars"),
                     _ktext_length(pat), pat.dup]
           else
             #return [index("1.0 + #{pos} chars"), $&.split('').length]
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
index eef093d314..5ecd2d72d2 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
@@ -16,5 +16,5 @@ end
 class Tk::Iwidgets::Scrolledwidget
   TkCommandNames = ['::iwidgets::scrolledwidget'.freeze].freeze
   WidgetClassName = 'Scrolledwidget'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 end
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
index bb81fcca5e..eb8fe3ad52 100644
--- a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Selectionbox
   TkCommandNames = ['::iwidgets::selectionbox'.freeze].freeze
   WidgetClassName = 'Selectionbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'itemson' << 'selectionon'
@@ -59,7 +59,7 @@ class Tk::Iwidgets::Selectionbox
     self
   end
 
-  # based on TkListbox ( and TkTextWin )
+  # based on Tk::Listbox ( and TkTextWin )
   def curselection
     list(tk_send_without_enc('curselection'))
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
index ab790e97a6..45aecf3266 100644
--- a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Selectiondialog
   TkCommandNames = ['::iwidgets::selectiondialog'.freeze].freeze
   WidgetClassName = 'Selectiondialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def child_site
     window(tk_call(@path, 'childsite'))
@@ -49,7 +49,7 @@ class Tk::Iwidgets::Selectiondialog
     self
   end
 
-  # based on TkListbox ( and TkTextWin )
+  # based on Tk::Listbox ( and TkTextWin )
   def curselection
     list(tk_send_without_enc('curselection'))
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/setup.rb b/ext/tk/lib/tkextlib/iwidgets/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/iwidgets/setup.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/iwidgets/shell.rb b/ext/tk/lib/tkextlib/iwidgets/shell.rb
index dabf2e6f25..c560e3ac29 100644
--- a/ext/tk/lib/tkextlib/iwidgets/shell.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/shell.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Shell
   TkCommandNames = ['::iwidgets::shell'.freeze].freeze
   WidgetClassName = 'Shell'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def activate
     tk_call(@path, 'activate')  # may return val of deactibate method
diff --git a/ext/tk/lib/tkextlib/iwidgets/spindate.rb b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
index 2c98eb4629..b3de9ed989 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spindate.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Spindate
   TkCommandNames = ['::iwidgets::spindate'.freeze].freeze
   WidgetClassName = 'Spindate'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'dayon' << 'monthon' << 'yearon'
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinint.rb b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
index 5eb944d081..bede3bb1bf 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spinint.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Spinint
   TkCommandNames = ['::iwidgets::spinint'.freeze].freeze
   WidgetClassName = 'Spinint'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'wrap'
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinner.rb b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
index 174b9bd506..d960996e22 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spinner.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Spinner
   TkCommandNames = ['::iwidgets::spinner'.freeze].freeze
   WidgetClassName = 'Spinner'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -25,18 +25,37 @@ class Tk::Iwidgets::Spinner
   class EntryfieldValidate < TkValidateCommand
     #class CalCmdArgs < TkUtil::CallbackSubst
     class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [ 
-        [ ?c, ?s, :char ], 
-        [ ?P, ?s, :post ], 
-        [ ?S, ?s, :current ], 
-        [ ?W, ?w, :widget ], 
+      KEY_TBL  = [
+        [ ?c, ?s, :char ],
+        [ ?P, ?s, :post ],
+        [ ?S, ?s, :current ],
+        [ ?W, ?w, :widget ],
         nil
       ]
-      PROC_TBL = [ 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
+      PROC_TBL = [
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
+
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
     end
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/spintime.rb b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
index 0ff683ab56..20f8197a09 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spintime.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Spintime
   TkCommandNames = ['::iwidgets::spintime'.freeze].freeze
   WidgetClassName = 'Spintime'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'houron' << 'militaryon' << 'minutelabel' << 'secondlabel'
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
index 0d9715f87b..f56efa9aaf 100644
--- a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Tabnotebook
   TkCommandNames = ['::iwidgets::tabnotebook'.freeze].freeze
   WidgetClassName = 'Tabnotebook'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -46,13 +46,15 @@ class Tk::Iwidgets::Tabnotebook
     end
   end
 
+  alias pagecget_tkstring itemcget_tkstring
   alias pagecget itemcget
+  alias pagecget_strict itemcget_strict
   alias pageconfigure itemconfigure
   alias pageconfiginfo itemconfiginfo
   alias current_pageconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
@@ -116,6 +118,11 @@ class Tk::Iwidgets::Tabnotebook
     self
   end
 
+  def show_tab(idx)
+    @tabset.show_tab(idx)
+    self
+  end
+
   def scrollcommand(cmd=Proc.new)
     configure_cmd 'scrollcommand', cmd
     self
@@ -147,7 +154,12 @@ class Tk::Iwidgets::Tabnotebook
 
   def view(*index)
     if index.size == 0
-      window(tk_send_without_enc('view'))
+      idx = num_or_str(tk_send_without_enc('view'))
+      if idx.kind_of?(Fixnum) && idx < 0
+        nil
+      else
+        idx
+      end
     else
       tk_send_without_enc('view', *index)
       self
@@ -161,8 +173,8 @@ class Tk::Iwidgets::Tabnotebook
   end
   alias xview_moveto view_moveto
   alias yview_moveto view_moveto
-  def view_scroll(*index)
-    view('scroll', *index)
+  def view_scroll(index, what='pages')
+    view('scroll', index, what)
   end
   alias xview_scroll view_scroll
   alias yview_scroll view_scroll
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabset.rb b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
index 54e56d0514..501ead4964 100644
--- a/ext/tk/lib/tkextlib/iwidgets/tabset.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Tabset
   TkCommandNames = ['::iwidgets::tabset'.freeze].freeze
   WidgetClassName = 'Tabset'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ####################################
 
@@ -41,13 +41,15 @@ class Tk::Iwidgets::Tabset
     end
   end
 
+  alias tabcget_tkstring itemcget_tkstring
   alias tabcget itemcget
+  alias tabcget_strict itemcget_strict
   alias tabconfigure itemconfigure
   alias tabconfiginfo itemconfiginfo
   alias current_tabconfiginfo current_itemconfiginfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 
   ####################################
 
@@ -96,4 +98,48 @@ class Tk::Iwidgets::Tabset
     tk_call(@path, 'select', index(idx))
     self
   end
+
+  def show_tab(idx)
+    if index(idx) == 0
+      self.start = 0
+      return
+    end
+
+    reutrn unless @canvas ||= self.winfo_children[0]
+
+    delta = 1 if (delta = cget(:gap)) == 'overlap' ||
+                   (delta = self.winfo_pixels(delta) + 1) <= 0
+
+    case cget(:tabpos)
+    when 's', 'n'
+      if (head = tabcget(idx, :left)) < 0
+        self.start -= head
+        return
+      end
+      tabs_size = @canvas.winfo_width
+      tab_start, tab_end = @canvas .
+        find_overlapping(head, 0, head + delta, @canvas.winfo_height) .
+        find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
+        map!{|id| bbox = @canvas.bbox(id); [bbox[0], bbox[2]]} . max
+
+    when 'e', 'w'
+      if (head = tabcget(idx, :top)) < 0
+        self.start -= head
+        return
+      end
+      tabs_size = @canvas.winfo_height
+      tab_start, tab_end = @canvas .
+        find_overlapping(0, head, @canvas.winfo_width, head + delta) .
+        find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
+        map!{|id| bbox = @canvas.bbox(id); [bbox[1], bbox[3]]} . max
+    end
+
+    if (size = tab_end - tab_start + 1) > tabs_size
+      self.start -= tab_start
+    elsif head + size > tabs_size
+      self.start -= head + size - tabs_size
+    end
+
+    self
+  end
 end
diff --git a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb b/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
index 588da77dc8..b0afb3afd9 100644
--- a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Timeentry
   TkCommandNames = ['::iwidgets::timeentry'.freeze].freeze
   WidgetClassName = 'Timeentry'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __strval_optkeys
     super() << 'closetext'
diff --git a/ext/tk/lib/tkextlib/iwidgets/timefield.rb b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
index 28e1504797..c34281d4ff 100644
--- a/ext/tk/lib/tkextlib/iwidgets/timefield.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Timefield
   TkCommandNames = ['::iwidgets::timefield'.freeze].freeze
   WidgetClassName = 'Timefield'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'gmt'
diff --git a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
index 17cfa62156..5b474c3816 100644
--- a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Toolbar
   TkCommandNames = ['::iwidgets::toolbar'.freeze].freeze
   WidgetClassName = 'Toolbar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __tkvariable_optkeys
     super() << 'helpvariable'
@@ -105,7 +105,7 @@ class Tk::Iwidgets::Toolbar
     else
       tag = Tk::Itk::Component.new(self)
     end
-    window(tk_call(@path, 'insert', index(idx), type, 
+    window(tk_call(@path, 'insert', index(idx), type,
                    tagid(tag), *hash_kv(keys)))
     tag
   end
diff --git a/ext/tk/lib/tkextlib/iwidgets/watch.rb b/ext/tk/lib/tkextlib/iwidgets/watch.rb
index ab2b687cf9..f10ec54cb2 100644
--- a/ext/tk/lib/tkextlib/iwidgets/watch.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/watch.rb
@@ -16,7 +16,7 @@ end
 class Tk::Iwidgets::Watch
   TkCommandNames = ['::iwidgets::watch'.freeze].freeze
   WidgetClassName = 'Watch'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'showampm'
@@ -24,7 +24,7 @@ class Tk::Iwidgets::Watch
   private :__boolval_optkeys
 
   def __strval_optkeys
-    super() << 'clockcolor' << 'hourcolor' << 'minutecolor' << 
+    super() << 'clockcolor' << 'hourcolor' << 'minutecolor' <<
       'pivotcolor' << 'secondcolor' << 'tickcolor'
   end
   private :__strval_optkeys
diff --git a/ext/tk/lib/tkextlib/pkg_checker.rb b/ext/tk/lib/tkextlib/pkg_checker.rb
index 5002ed7ff8..ecc6bfa131 100755
--- a/ext/tk/lib/tkextlib/pkg_checker.rb
+++ b/ext/tk/lib/tkextlib/pkg_checker.rb
@@ -151,7 +151,7 @@ def subdir_check(dir, verbose=false)
       if err.empty?
         print 'Ready : ', path, ' : require->', suc.inspect, "\n"
       else
-        print '*LACK : ', path, ' : require->', suc.inspect, 
+        print '*LACK : ', path, ' : require->', suc.inspect,
           '  FAIL->', err.inspect, "\n"
       end
     end
@@ -176,7 +176,7 @@ Dir.chdir(dir)
   if err.empty?
     print 'Ready : ', f, ' : require->', suc.inspect, "\n"
   else
-    print '*LACK : ', f, ' : require->', suc.inspect, 
+    print '*LACK : ', f, ' : require->', suc.inspect,
       '  FAIL->', err.inspect, "\n"
   end
 
diff --git a/ext/tk/lib/tkextlib/setup.rb b/ext/tk/lib/tkextlib/setup.rb
index 12867e8f9c..79facc5ee3 100644
--- a/ext/tk/lib/tkextlib/setup.rb
+++ b/ext/tk/lib/tkextlib/setup.rb
@@ -1,8 +1,8 @@
 #
 #  setup.rb   --   setup script before using Tk extension libraries
 #
-#    If you need some setup operations for Tk extensions (for example, 
-#    modify the dynamic library path) required, please write the setup 
-#    operations in this file. This file is required at the last of 
-#    "require 'tk'". 
+#    If you need some setup operations for Tk extensions (for example,
+#    modify the dynamic library path) required, please write the setup
+#    operations in this file. This file is required at the last of
+#    "require 'tk'".
 #
diff --git a/ext/tk/lib/tkextlib/tcllib.rb b/ext/tk/lib/tkextlib/tcllib.rb
index c6138f4275..2831989759 100644
--- a/ext/tk/lib/tkextlib/tcllib.rb
+++ b/ext/tk/lib/tkextlib/tcllib.rb
@@ -42,19 +42,25 @@ module Tk
   module Tcllib
     TkComm::TkExtlibAutoloadModule.unshift(self)
 
+    # package:: autoscroll
+    autoload :Autoscroll,         'tkextlib/tcllib/autoscroll'
+
     # package:: ctext
     autoload :CText,              'tkextlib/tcllib/ctext'
 
+    # package:: cursor
+    autoload :Cursor,             'tkextlib/tcllib/cursor'
+
+    # package:: datefield
+    autoload :Datefield,          'tkextlib/tcllib/datefield'
+    autoload :DateField,          'tkextlib/tcllib/datefield'
+
     # package:: getstring
     autoload :GetString_Dialog,   'tkextlib/tcllib/getstring'
 
     # package:: history
     autoload :History,            'tkextlib/tcllib/history'
 
-    # package:: datefield
-    autoload :Datefield,          'tkextlib/tcllib/datefield'
-    autoload :DateField,          'tkextlib/tcllib/datefield'
-
     # package:: ico
     autoload :ICO,                'tkextlib/tcllib/ico'
 
@@ -62,12 +68,21 @@ module Tk
     autoload :IP_Entry,           'tkextlib/tcllib/ip_entry'
     autoload :IPEntry,            'tkextlib/tcllib/ip_entry'
 
-    # package:: swaplist
-    autoload :Swaplist_Dialog,    'tkextlib/tcllib/swaplist'
+    # package:: khim
+    autoload :KHIM,               'tkextlib/tcllib/khim'
+
+    # package:: ntext
+    autoload :Ntext,              'tkextlib/tcllib/ntext'
 
     # package:: Plotchart
     autoload :Plotchart,          'tkextlib/tcllib/plotchart'
 
+    # package:: style
+    autoload :Style,              'tkextlib/tcllib/style'
+
+    # package:: swaplist
+    autoload :Swaplist_Dialog,    'tkextlib/tcllib/swaplist'
+
     # package:: tablelist
     autoload :Tablelist,           'tkextlib/tcllib/tablelist'
     autoload :TableList,           'tkextlib/tcllib/tablelist'
@@ -81,7 +96,7 @@ module Tk
     autoload :Tooltip,            'tkextlib/tcllib/tooltip'
 
     # package:: widget
-    autoload :Wdiget,             'tkextlib/tcllib/widget'
+    autoload :Widget,             'tkextlib/tcllib/widget'
   end
 end
 
diff --git a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
index 6940a9174c..2def59bf73 100644
--- a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
+++ b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
@@ -7,20 +7,20 @@
 #
 # (The following is the original description of the library.)
 #
-# This package allows scrollbars to be mapped and unmapped as needed 
-# depending on the size and content of the scrollbars scrolled widget. 
-# The scrollbar must be managed by either pack or grid, other geometry 
+# This package allows scrollbars to be mapped and unmapped as needed
+# depending on the size and content of the scrollbars scrolled widget.
+# The scrollbar must be managed by either pack or grid, other geometry
 # managers are not supported.
 #
-# When managed by pack, any geometry changes made in the scrollbars parent 
-# between the time a scrollbar is unmapped, and when it is mapped will be 
-# lost. It is an error to destroy any of the scrollbars siblings while the 
-# scrollbar is unmapped. When managed by grid, if anything becomes gridded 
-# in the same row and column the scrollbar occupied it will be replaced by 
+# When managed by pack, any geometry changes made in the scrollbars parent
+# between the time a scrollbar is unmapped, and when it is mapped will be
+# lost. It is an error to destroy any of the scrollbars siblings while the
+# scrollbar is unmapped. When managed by grid, if anything becomes gridded
+# in the same row and column the scrollbar occupied it will be replaced by
 # the scrollbar when remapped.
 #
-# This package may be used on any scrollbar-like widget as long as it 
-# supports the set subcommand in the same style as scrollbar. If the set 
+# This package may be used on any scrollbar-like widget as long as it
+# supports the set subcommand in the same style as scrollbar. If the set
 # subcommand is not used then this package will have no effect.
 #
 
@@ -108,16 +108,16 @@ module Tk
   end
 end
 
-class TkScrollbar
+class Tk::Scrollbar
   def autoscroll
-    # Arranges for the already existing scrollbar to be mapped 
+    # Arranges for the already existing scrollbar to be mapped
     # and unmapped as needed.
     #tk_call_without_enc('::autoscroll::autoscroll', @path)
     Tk::Tcllib::Autoscroll.autoscroll(self)
     self
   end
   def unautoscroll
-    #     Returns the scrollbar to its original static state. 
+    #     Returns the scrollbar to its original static state.
     #tk_call_without_enc('::autoscroll::unautoscroll', @path)
     Tk::Tcllib::Autoscroll.unautoscroll(self)
     self
diff --git a/ext/tk/lib/tkextlib/tcllib/calendar.rb b/ext/tk/lib/tkextlib/tcllib/calendar.rb
new file mode 100644
index 0000000000..b6843df176
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/calendar.rb
@@ -0,0 +1,55 @@
+#
+#  tkextlib/tcllib/calendar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * calendar widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::calendar', '0.9')
+TkPackage.require('widget::calendar')
+
+module Tk::Tcllib
+  module Widget
+    class Calendar < TkCanvas
+      PACKAGE_NAME = 'widget::calendar'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::calendar')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::Widget::Calendar
+  TkCommandNames = ['::widget::calendar'.freeze].freeze
+
+  def __boolval_optkeys
+    super() << 'showpast'
+  end
+  private :__boolval_optkeys
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def get(what = 'all')
+    tk_send('get', what)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
new file mode 100644
index 0000000000..0bd59511c1
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
@@ -0,0 +1,36 @@
+#
+#  tkextlib/tcllib/canvas.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * 
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::canvas_sqmap', '0.2')
+TkPackage.require('widget::canvas_sqmap')
+
+module Tk::Tcllib
+  module Widget
+    class Canvas_Sqmap < Canvas
+      TkCommandNames = ['::widget::canvas_sqmap'.freeze].freeze
+
+      def image_set(cell, img)
+        tk_send('image', 'set', cell, img)
+        self
+      end
+
+      def image_unset(cell)
+        tk_send('image', 'unset', cell)
+        self
+      end
+
+      def flush
+        tk_send('flush')
+        self
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
new file mode 100644
index 0000000000..e2a5061112
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
@@ -0,0 +1,21 @@
+#
+#  tkextlib/tcllib/canvas.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * 
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::canvas_zoom', '0.1')
+TkPackage.require('widget::canvas_zoom')
+
+module Tk::Tcllib
+  module Widget
+    class Canvas_Zoom < Canvas
+      TkCommandNames = ['::widget::canvas_zoom'.freeze].freeze
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
new file mode 100644
index 0000000000..860b9e899b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
@@ -0,0 +1,151 @@
+#
+#  tkextlib/tcllib/chatwidget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * chatwidget - Provides a multi-paned view suitable for display of 
+#                  chat room or irc channel information
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('chatwidget', '1.1.0')
+TkPackage.require('chatwidget')
+
+module Tk::Tcllib
+  class ChatWidget < TkText
+    PACKAGE_NAME = 'chatwidget'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('chatwidget')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::ChatWidget
+  TkCommandNames = ['::chatwidget::chatwidget'.freeze].freeze
+
+  def show_topic
+    tk_send_without_enc('topic', 'show')
+    self
+  end
+
+  def hide_topic
+    tk_send_without_enc('topic', 'hide')
+    self
+  end
+
+  def set_topic(topic)
+    tk_send('topic', 'set', topic)
+  end
+
+  def list_name
+    tk_split_simplelist(tk_send('name', 'list'))
+  end
+
+  def list_name_full
+    tk_split_simplelist(tk_send('name', 'list')).map{|lst|
+      nick, *opts = tk_split_simplelist(lst)
+      h_opt = {}
+      opts.slice(2){|k, v| h_opt[k[1..-1]] = tk_tcl2ruby(v)}
+      [nick, h_opt]
+    }
+  end
+
+  def add_name(nick, opts={})
+    tk_send('name', 'add', nick, *(hash_kv(opts)))
+  end
+
+  def delete_name(nick)
+    tk_send('name', 'delete', nick)
+  end
+
+  def get_name(nick)
+    lst = tk_send('name', 'get', nick)
+    return nil if lst.empty?
+    nick, *opts = tk_split_simplelist(lst)
+    h_opt = {}
+    opts.slice(2){|k, v| h_opt[k[1..-1]] = tk_tcl2ruby(v)}
+    [nick, h_opt]
+  end
+
+  def message(msg, opts={})
+    tk_send('message', msg, *(hash_kv(opts)))
+    self
+  end
+
+  def _parse_hook_list(lst)
+    tk_split_simplelist(lst).map{|hook|
+      cmd, prior = tk_split_simplelist(hook)
+      [procedure(cmd), number(prior)]
+    }
+  end
+  private :_parse_hook_list
+
+  def hook_add(type, *args, &blk) # args -> [prior, cmd], [prior], [cmd]
+    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
+    
+    if prior = args.shift
+      if !prior.kind_of?(Numeric)
+        cmd = prior
+        if (prior = args.shift) && !prior.kind_of?(Numeric)  # error
+          args.unshift(prior)
+        end
+        args.unshift(cmd)
+      end
+      prior ||= 50  # default priority
+    end
+
+    cmd = args.shift || blk
+
+    fail ArgumentError, "invalid arguments" unless args.empty?
+    fail ArgumentError, "no callback is given" unless cmd
+
+    _parse_hook_list(tk_send('hook', 'add', type, cmd, prior))
+  end
+
+  def hook_remove(type, cmd)
+    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
+    _parse_hook_list(tk_send('hook', 'remove', type, cmd))
+  end
+
+  def hook_run(type, *cmd_args)
+    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
+    tk_send('hook', 'run', type, *cmd_args)
+  end
+
+  def hook_list(type)
+    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
+    _parse_hook_list(tk_send('hook', 'list', type))
+  end
+
+  def show_names
+    tk_send('names', 'show')
+    self
+  end
+
+  def hide_names
+    tk_send('names', 'hide')
+    self
+  end
+
+  def names_widget
+    window(tk_send('names'))
+  end
+
+  def entry_widget
+    window(tk_send('entry'))
+  end
+
+  def chat_widget
+    window(tk_send('chat'))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/crosshair.rb b/ext/tk/lib/tkextlib/tcllib/crosshair.rb
new file mode 100644
index 0000000000..49b5361e4f
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/crosshair.rb
@@ -0,0 +1,117 @@
+#
+#  tkextlib/tcllib/crosshair.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Crosshairs for Tk canvas
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('crosshair', '1.0.2')
+TkPackage.require('crosshair')
+
+module Tk::Tcllib
+  module Crosshair
+    PACKAGE_NAME = 'crosshair'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('crosshair')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::Crosshair
+  include TkCore
+  TkCommandNames = ['::crosshair::crosshair'.freeze].freeze
+
+  def self.crosshair(w, keys={})
+    Tk.tk_call('::crosshair::crosshair', w, *hash_kv(keys))
+    w
+  end
+  def self.on(w, keys={})
+    self.crosshair(w, keys)
+  end
+
+  def self.off(w)
+    Tk.tk_call('::crosshair::off', w)
+    w
+  end
+
+  def self.track_on(w, &b)
+    Tk.tk_call('::crosshair::track_on', w, b)
+    w
+  end
+
+  def self.track_off(w)
+    Tk.tk_call('::crosshair::track_off', w)
+    w
+  end
+end
+
+class << Tk::Tcllib::Crosshair
+  include TkComm
+  include TkCanvasItemConfig
+
+  def __item_methodcall_optkeys(id)
+    {}
+  end
+  private :__item_methodcall_optkeys
+
+  def __item_config_cmd(id)
+    # maybe need to override
+    ['::crosshair::configure', id]
+  end
+  private :__item_config_cmd
+
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  def confugure(w, slot, value=None)
+    itemconfigure(w, slot, value)
+  end
+  def confuginfo(w, slot = nil)
+    itemconfiginfo(w, slot)
+  end
+  def current_configinfo(w, slot = nil)
+    current_itemconfiginfo(w, slot)
+  end
+  def cget(w, slot)
+    current_itemconfiginfo(w, slot).values[0]
+  end
+end
+
+module Tk::Tcllib::Crosshair
+  def crosshair_on(keys={})
+    Tk::Tcllib::Crosshair.on(self, keys)
+  end
+  def crosshair_off
+    Tk::Tcllib::Crosshair.off(self)
+  end
+  def crosshair_track_on(&b)
+    Tk::Tcllib::Crosshair.track_on(self, &b)
+  end
+  def crosshair_track_off
+    Tk::Tcllib::Crosshair.track_off(self)
+  end
+  def crosshair_configure(*args)
+    Tk::Tcllib::Crosshair.configure(self, *args)
+  end
+  def crosshair_configinfo(slot = nil)
+    Tk::Tcllib::Crosshair.configinfo(self, slot)
+  end
+  def crosshair_current_configinfo(slot = nil)
+    Tk::Tcllib::Crosshair.current_configinfo(self, slot)
+  end
+  def crosshair_cget(slot)
+    Tk::Tcllib::Crosshair.cget(self, slot)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/ctext.rb b/ext/tk/lib/tkextlib/tcllib/ctext.rb
index 70a45dd8e7..308847c233 100644
--- a/ext/tk/lib/tkextlib/tcllib/ctext.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ctext.rb
@@ -15,7 +15,7 @@ TkPackage.require('ctext')
 
 module Tk
   module Tcllib
-    class CText < TkText
+    class CText < Tk::Text
       PACKAGE_NAME = 'ctext'.freeze
       def self.package_name
         PACKAGE_NAME
@@ -35,11 +35,11 @@ end
 class Tk::Tcllib::CText
   TkCommandNames = ['ctext'.freeze].freeze
   WidgetClassName = 'Ctext'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -48,7 +48,7 @@ class Tk::Tcllib::CText
   private :create_self
 
   def __strval_optkeys
-    super() << 'linemapfg' << 'linemapbg' << 
+    super() << 'linemapfg' << 'linemapbg' <<
       'linemap_select_fg' << 'linemap_select_bg'
   end
   private :__strval_optkeys
@@ -96,19 +96,19 @@ class Tk::Tcllib::CText
   end
 
   def add_highlight_class_for_special_chars(klass, col, *chrs)
-    tk_call('ctext::addHighlightClassForSpecialChars', 
+    tk_call('ctext::addHighlightClassForSpecialChars',
             @path, klass, col, chrs.join(''))
     self
   end
 
   def add_highlight_class_for_regexp(klass, col, tcl_regexp)
-    tk_call('ctext::addHighlightClassForRegexp', 
+    tk_call('ctext::addHighlightClassForRegexp',
             @path, klass, col, tcl_regexp)
     self
   end
 
   def add_highlight_class_with_only_char_start(klass, col, chr)
-    tk_call('ctext::addHighlightClassWithOnlyCharStart', 
+    tk_call('ctext::addHighlightClassWithOnlyCharStart',
             @path, klass, col, chr)
     self
   end
diff --git a/ext/tk/lib/tkextlib/tcllib/cursor.rb b/ext/tk/lib/tkextlib/tcllib/cursor.rb
index 9bb828e8dd..5c47f9709b 100644
--- a/ext/tk/lib/tkextlib/tcllib/cursor.rb
+++ b/ext/tk/lib/tkextlib/tcllib/cursor.rb
@@ -44,8 +44,8 @@ module Tk
   end
 
   def self.cursor_display(parent=None)
-    # Pops up a dialog with a listbox containing all the cursor names. 
-    # Selecting a cursor name will display it in that dialog. 
+    # Pops up a dialog with a listbox containing all the cursor names.
+    # Selecting a cursor name will display it in that dialog.
     # This is simply for viewing any available cursors on the platform .
     #tk_call_without_enc('::cursor::display', parent)
     Tk::Tcllib::Cursor.cursor_display(parent)
@@ -54,15 +54,15 @@ end
 
 class TkWindow
   def cursor_propagate(cursor)
-    # Sets the cursor for self and all its descendants to cursor. 
+    # Sets the cursor for self and all its descendants to cursor.
     #tk_call_without_enc('::cursor::propagate', @path, cursor)
     Tk::Tcllib::Cursor.cursor_propagate(self, cursor)
   end
   def cursor_restore(cursor = None)
-    # Restore the original or previously set cursor for self and all its 
-    # descendants. If cursor is specified, that will be used if on any 
-    # widget that did not have a preset cursor (set by a previous call 
-    # to TkWindow#cursor_propagate). 
+    # Restore the original or previously set cursor for self and all its
+    # descendants. If cursor is specified, that will be used if on any
+    # widget that did not have a preset cursor (set by a previous call
+    # to TkWindow#cursor_propagate).
     #tk_call_without_enc('::cursor::restore', @path, cursor)
     Tk::Tcllib::Cursor.cursor_restore(self, cursor)
   end
diff --git a/ext/tk/lib/tkextlib/tcllib/dateentry.rb b/ext/tk/lib/tkextlib/tcllib/dateentry.rb
new file mode 100644
index 0000000000..77038d95bc
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/dateentry.rb
@@ -0,0 +1,62 @@
+#
+#  tkextlib/tcllib/dateentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * dateentry widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::dateentry', '0.91')
+TkPackage.require('widget::dateentry')
+
+module Tk::Tcllib
+  module Widget
+    class Dateentry < Tk::Tile::TEntry
+      PACKAGE_NAME = 'widget::dateentry'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::dateentry')
+        rescue
+          ''
+        end
+      end
+    end
+    DateEntry = Dateentry
+  end
+end
+
+class Tk::Tcllib::Widget::Dateentry
+  TkCommandNames = ['::widget::dateentry'.freeze].freeze
+
+  def __strval_optkeys
+    super() << ['dateformat']
+  end
+  private :__strval_optkeys
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def post
+    tk_send('post')
+    self
+  end
+
+  def unpost
+    tk_send('unpost')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/datefield.rb b/ext/tk/lib/tkextlib/tcllib/datefield.rb
index bd84488101..4c2eae741e 100644
--- a/ext/tk/lib/tkextlib/tcllib/datefield.rb
+++ b/ext/tk/lib/tkextlib/tcllib/datefield.rb
@@ -7,12 +7,12 @@
 #
 # (The following is the original description of the library.)
 #
-# The datefield package provides the datefield widget which is an enhanced 
-# text entry widget for the purpose of date entry. Only valid dates of the 
+# The datefield package provides the datefield widget which is an enhanced
+# text entry widget for the purpose of date entry. Only valid dates of the
 # form MM/DD/YYYY can be entered.
-# 
-# The datefield widget is, in fact, just an entry widget with specialized 
-# bindings. This means all the command and options for an entry widget apply 
+#
+# The datefield widget is, in fact, just an entry widget with specialized
+# bindings. This means all the command and options for an entry widget apply
 # equally here.
 
 require 'tk'
@@ -24,7 +24,7 @@ TkPackage.require('datefield')
 
 module Tk
   module Tcllib
-    class Datefield < TkEntry
+    class Datefield < Tk::Entry
       PACKAGE_NAME = 'datefield'.freeze
       def self.package_name
         PACKAGE_NAME
@@ -47,7 +47,7 @@ class Tk::Tcllib::Datefield
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/diagrams.rb b/ext/tk/lib/tkextlib/tcllib/diagrams.rb
new file mode 100644
index 0000000000..d24ba9d232
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/diagrams.rb
@@ -0,0 +1,224 @@
+#
+#  tkextlib/tcllib/diagrams.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Draw diagrams
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('Diagrams', '0.3')
+TkPackage.require('Diagrams')
+
+module Tk::Tcllib
+  module Diagrams
+    PACKAGE_NAME = 'Diagrams'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Diagrams')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+class << Tk::Tcllib::Diagrams
+  include TkCore
+
+  def drawin(canvas)
+    tk_call('::Diagrams::drawin', canvas)
+    canvas
+  end
+  alias draw_in drawin
+
+  def saveps(filename)
+    tk_call('::Diagrams::saveps', filename)
+    filename
+  end
+  alias save_ps saveps
+
+  def direction(dir)
+    tk_call('::Diagrams::direction', dir)
+    dir
+  end
+
+  def currentpos(pos)
+    list(tk_call('::Diagrams::currentpos', pos))
+  end
+  alias current_pos currentpos
+  alias currentpos= currentpos
+  alias current_pos= currentpos
+
+  def getpos(anchor, obj)
+    list(tk_call('::Diagrams::getpos', anchor, obj))
+  end
+  alias get_pos getpos
+
+  def position(x, y)
+    list(tk_call('::Diagrams::position', x, y))
+  end
+
+  def box(text, width=nil, height=nil)
+    if width || height
+      width  = '' unless width
+      height = '' unless height
+      list(tk_call('::Diagrams::box', text, width, height))
+    else
+      list(tk_call('::Diagrams::box', text))
+    end
+  end
+
+  def plaintext(text, width=nil, height=nil)
+    if width || height
+      width  = '' unless width
+      height = '' unless height
+      list(tk_call('::Diagrams::plaintext', text, width, height))
+    else
+      list(tk_call('::Diagrams::plaintext', text))
+    end
+  end
+
+  def circle(text, radius=nil)
+    if radius
+      list(tk_call('::Diagrams::circle', text, radius))
+    else
+      list(tk_call('::Diagrams::circle', text))
+    end
+  end
+
+  def slanted(text, width=nil, height=nil, angle=nil)
+    if width || height || angle
+      width  = '' unless width
+      height = '' unless height
+      if angle
+        list(tk_call('::Diagrams::slanted', text, width, height, angle))
+      else
+        list(tk_call('::Diagrams::slanted', text, width, height))
+      end
+    else
+      list(tk_call('::Diagrams::slanted', text))
+    end
+  end
+
+  def diamond(text, width=nil, height=nil)
+    if width || height
+      width  = '' unless width
+      height = '' unless height
+      list(tk_call('::Diagrams::diamond', text, width, height))
+    else
+      list(tk_call('::Diagrams::diamond', text))
+    end
+  end
+
+  def drum(text, width=nil, height=nil)
+    if width || height
+      width  = '' unless width
+      height = '' unless height
+      list(tk_call('::Diagrams::drum', text, width, height))
+    else
+      list(tk_call('::Diagrams::drum', text))
+    end
+  end
+
+  def arrow(text=nil, length=nil, head=nil)
+    if length || head
+      text   = '' unless text
+      length = '' unless length
+      list(tk_call('::Diagrams::arrow', text, length, head))
+    else
+      if text
+        list(tk_call('::Diagrams::arrow', text))
+      else
+        list(tk_call('::Diagrams::arrow'))
+      end
+    end
+  end
+
+  def line(*args)
+    ary = []
+    args.each{|arg|
+      if arg.kind_of?(Array) && arg.length == 2  # [length, angle]
+        ary.concat arg
+      else # ["POSITION", x, y] or length or angle
+        ary << arg
+      end
+    }
+    list(tk_call('::Diagrams::line', *ary))
+  end
+
+  def bracket(dir, dist, from_pos, to_pos)
+    list(tk_call('::Diagrams::bracket', dir, dist, from_pos, to_pos))
+  end
+
+  def attach(anchor=None)
+    tk_call('::Diagrams::attach', anchor)
+  end
+
+  def color(name=None)
+    tk_call('::Diagrams::color', name)
+  end
+
+  def fillcolor(name=None)
+    tk_call('::Diagrams::fillcolor', name)
+  end
+
+  def textcolor(name=None)
+    tk_call('::Diagrams::textcolor', name)
+  end
+
+  def usegap(mode=None)
+    bool(tk_call('::Diagrams::usegap', mode))
+  end
+  alias use_gap usegap
+
+  def xgap(val=None)
+    number(tk_call('::Diagrams::xgap', val))
+  end
+
+  def ygap(val=None)
+    number(tk_call('::Diagrams::ygap', val))
+  end
+
+  def textfont(fnt=None)
+    tk_call('::Diagrams::textfont', fnt)
+  end
+
+  def linewidth(pixels=None)
+    number(tk_call('::Diagrams::linewidth', pixels))
+  end
+
+  def linestyle(style=None)
+    tk_call('::Diagrams::linestyle', style)
+  end
+
+  def pushstate
+    tk_call('::Diagrams::pushstate')
+  end
+  alias push_state pushstate
+
+  def popstate
+    tk_call('::Diagrams::popstate')
+  end
+  alias pop_state popstate
+
+  def computepos
+    list(tk_call('::Diagrams::computepos'))
+  end
+  alias compute_pos computepos
+
+  def boxcoords(x1, y1, x2, y2)
+    list(tk_call('::Diagrams::boxcoords', x1, y1, x2, y2))
+  end
+
+  def moveobject(obj)
+    list(tk_call('::Diagrams::moveobject', obj))
+  end
+  alias move_object moveobject
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/dialog.rb b/ext/tk/lib/tkextlib/tcllib/dialog.rb
index 825621b5a1..86a0ef2269 100644
--- a/ext/tk/lib/tkextlib/tcllib/dialog.rb
+++ b/ext/tk/lib/tkextlib/tcllib/dialog.rb
@@ -41,7 +41,7 @@ class Tk::Tcllib::Widget::Dialog
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/getstring.rb b/ext/tk/lib/tkextlib/tcllib/getstring.rb
index bf5e54e8cf..48711d3b66 100644
--- a/ext/tk/lib/tkextlib/tcllib/getstring.rb
+++ b/ext/tk/lib/tkextlib/tcllib/getstring.rb
@@ -34,7 +34,7 @@ end
 class Tk::Tcllib::GetString_Dialog
   TkCommandNames = ['::getstring::tk_getString'.freeze].freeze
   WidgetClassName = 'TkSDialog'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.show(*args)
     dialog = self.new(*args)
@@ -74,7 +74,7 @@ class Tk::Tcllib::GetString_Dialog
 
   def show
     @variable.value = ''
-    @status = bool(tk_call(self.class::TkCommandNames[0], 
+    @status = bool(tk_call(self.class::TkCommandNames[0],
                            @path, @variable, @text, *hash_kv(@keys)))
   end
   alias display show
@@ -87,7 +87,7 @@ class Tk::Tcllib::GetString_Dialog
     @variable.value
   end
 
-  def cget(slot)
+  def cget_strict(slot)
     slot = slot.to_s
     if slot == 'text'
       @text
@@ -95,6 +95,9 @@ class Tk::Tcllib::GetString_Dialog
       @keys[slot]
     end
   end
+  def cget(slot)
+    cget_strict(slot)
+  end
 
   def configure(slot, value=None)
     if slot.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/tcllib/ico.rb b/ext/tk/lib/tkextlib/tcllib/ico.rb
index 3beeb11a4d..36a32c6b09 100644
--- a/ext/tk/lib/tkextlib/tcllib/ico.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ico.rb
@@ -8,7 +8,7 @@
 
 require 'tk'
 require 'tk/image'
-require 'tkextlib/tcllib.rb'
+#require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('ico', '0.3')
 TkPackage.require('ico')
@@ -38,9 +38,39 @@ class Tk::Tcllib::ICO
                                       *hash_kv(keys, true)))
   end
 
+  def self.icons(file, keys=nil)
+    tk_split_simplelist(tk_call_without_enc('::ico::icons', file,
+                                            *hash_kv(keys, true))).map{|elem|
+      num_or_str(elem)
+    }
+  end
+
+  def self.get_members(file, name, keys=nil)
+    tk_split_simplelist(tk_call_without_enc('::ico::getMembers', file, name,
+                                            *hash_kv(keys, true))).map{|elem|
+      name, width, height, bpp =  tk_split_simplelist(elem)
+      [name, number(width), number(height), number(bpp)]
+    }
+  end
+
   def self.get(file, index, keys=nil)
     tk_call_without_enc('::ico::getIcon', file, index, *hash_kv(keys, true))
   end
+  def self.get_icon(*args)
+    get(*args)
+  end
+
+  def self.get_by_name(file, name, keys=nil)
+    tk_call_without_enc('::ico::getIconByName', file, name,
+                        *hash_kv(keys, true))
+  end
+  def self.get_icon_by_name(*args)
+    get_by_name(*args)
+  end
+
+  def self.get_fileicon(file, keys=nil)
+    tk_call_without_enc('::ico::getFileIcon', file, *hash_kv(keys, true))
+  end
 
   def self.get_image(file, index, keys={})
     keys = _symbolkey2str(keys)
@@ -50,23 +80,23 @@ class Tk::Tcllib::ICO
 
   def self.get_data(file, index, keys={})
     keys['format'] = 'data'
-    tk_split_list(tk_call_without_enc('::ico::getIcon', file, index, 
+    tk_split_list(tk_call_without_enc('::ico::getIcon', file, index,
                                       *hash_kv(keys, true)))
   end
 
   def self.write(file, index, depth, data, keys=nil)
-    tk_call_without_enc('::ico::writeIcon', file, index, depth, data, 
+    tk_call_without_enc('::ico::writeIcon', file, index, depth, data,
                         *hash_kv(keys, true))
   end
 
   def self.copy(from_file, from_index, to_file, to_index, keys=nil)
-    tk_call_without_enc('::ico::copyIcon', 
-                        from_file, from_index, to_file, to_index, 
+    tk_call_without_enc('::ico::copyIcon',
+                        from_file, from_index, to_file, to_index,
                         *hash_kv(keys, true))
   end
 
   def self.exe_to_ico(exe_file, ico_file, keys=nil)
-    tk_call_without_enc('::ico::copyIcon', exe_file, ico_file, 
+    tk_call_without_enc('::ico::copyIcon', exe_file, ico_file,
                         *hash_kv(keys, true))
   end
 
@@ -76,7 +106,7 @@ class Tk::Tcllib::ICO
 
   def self.transparent_color(image, color)
     if image.kind_of?(Array)
-      tk_split_list(tk_call_without_enc('::ico::transparentColor', 
+      tk_split_list(tk_call_without_enc('::ico::transparentColor',
                                         image, color))
     else
       tk_call_without_enc('::ico::transparentColor', image, color)
@@ -94,10 +124,12 @@ class Tk::Tcllib::ICO
     if keys.key?('name')
       @path = keys['name'].to_s
     else
-      @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
-      Tk_Image_ID[1].succ!
+      Tk_Image_ID.mutex.synchronize{
+        @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
+        Tk_Image_ID[1].succ!
+      }
     end
-    tk_call_without_enc('::ico::getIcon', file, index, '-name', @path, 
+    tk_call_without_enc('::ico::getIcon', file, index, '-name', @path,
                         '-format', 'image', *hash_kv(keys, true))
     Tk_IMGTBL[@path] = self
   end
diff --git a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
index 8c9e0bd683..e5e0f8d42d 100644
--- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
@@ -7,7 +7,7 @@
 #
 # (The following is the original description of the library.)
 #
-# This package provides a widget for the entering of a IP address. 
+# This package provides a widget for the entering of a IP address.
 # It guarantees a valid address at all times.
 
 require 'tk'
@@ -18,7 +18,7 @@ TkPackage.require('ipentry')
 
 module Tk
   module Tcllib
-    class IP_Entry < TkEntry
+    class IP_Entry < Tk::Entry
       PACKAGE_NAME = 'ipentry'.freeze
       def self.package_name
         PACKAGE_NAME
@@ -33,17 +33,22 @@ module Tk
       end
     end
     IPEntry = IP_Entry
+
+    class IP_Entry6 < IP_Entry
+    end
+    IPEntry6 = IP_Entry6
+    IP6_Entry = IP_Entry6
   end
 end
 
 class Tk::Tcllib::IP_Entry
   TkCommandNames = ['::ipentry::ipentry'.freeze].freeze
   WidgetClassName = 'IPEntry'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -64,3 +69,7 @@ class Tk::Tcllib::IP_Entry
     tk_send_without_enc('insert', array2tk_list(ip.flatten))
   end
 end
+
+class Tk::Tcllib::IP_Entry6 < Tk::Tcllib::IP_Entry 
+  TkCommandNames = ['::ipentry::ipentry6'.freeze].freeze
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/khim.rb b/ext/tk/lib/tkextlib/tcllib/khim.rb
new file mode 100644
index 0000000000..00acff91d9
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/khim.rb
@@ -0,0 +1,68 @@
+#
+#  tkextlib/tcllib/khim.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Kevin's Hacky Input Method
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('khim', '1.0')
+TkPackage.require('khim')
+
+module Tk::Tcllib
+  class KHIM < TkToplevel
+    PACKAGE_NAME = 'khim'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('khim')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::KHIM
+  TkCommandNames = ['::khim::getOptions'.freeze].freeze
+
+  def self.get_options(parent='')
+    path = parent + '.tcllib_widget_khim_dialog'
+    self.new(:widgetname => path)
+  end
+
+  def self.get_config #=> cmd_string
+    Tk.tk_call_without_enc('::khim::getConfig')
+  end
+
+  def self.set_config(*args)
+    if args.length == 1
+      # cmd_string generated by 
+      #Tk.ip_eval_without_enc(cmd_string)
+      Tk.ip_eval(cmd_string)
+    else
+      # args for setConfig command 
+      #Tk.tk_call_without_enc('::khim::setConfig', *args)
+      Tk.tk_call('::khim::setConfig', *args)
+    end
+  end
+
+  def self.showHelp
+    Tk::Tcllib::KHIM::Help.new
+  end
+
+  def create_self(keys=None)
+    @db_class = @classname = nil
+    super(None) # ignore keys
+  end
+end
+
+class Tk::Tcllib::KHIM::Help < TkToplevel
+  TkCommandNames = ['::khim::showHelp'.freeze].freeze
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/menuentry.rb b/ext/tk/lib/tkextlib/tcllib/menuentry.rb
new file mode 100644
index 0000000000..f1eb2f295c
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/menuentry.rb
@@ -0,0 +1,47 @@
+#
+#  tkextlib/tcllib/menuentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * menuentry widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::menuentry', '1.0')
+TkPackage.require('widget::menuentry')
+
+module Tk::Tcllib
+  module Widget
+    class Menuentry < Tk::Tile::TEntry
+      PACKAGE_NAME = 'widget::menuentry'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::menuentry')
+        rescue
+          ''
+        end
+      end
+    end
+    MenuEntry = Menuentry
+  end
+end
+
+class Tk::Tcllib::Widget::Menuentry
+  TkCommandNames = ['::widget::menuentry'.freeze].freeze
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/ntext.rb b/ext/tk/lib/tkextlib/tcllib/ntext.rb
new file mode 100644
index 0000000000..7888ed4871
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/ntext.rb
@@ -0,0 +1,146 @@
+#
+#  tkextlib/tcllib/ntext.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Ntext bindtag
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('ntext', '0.81')
+TkPackage.require('ntext')
+
+module Tk::Tcllib
+  Ntext = TkBindTag.new_by_name('Ntext')
+end
+
+# variables
+Tk::Tcllib::Ntext.instance_eval{
+  # boolean
+  @classicAnchor = TkVarAccess.new('::ntext::classicAnchor')
+  @classicExtras  = TkVarAccess.new('::ntext::classicExtras')
+  @classicMouseSelect = TkVarAccess.new('::ntext::classicMouseSelect')
+  @classicWordBreak = TkVarAccess.new('::ntext::classicWordBreak')
+  @classicWrap = TkVarAccess.new('::ntext::classicWrap')
+  @overwrite = TkVarAccess.new('::ntext::overwrite')
+
+  # regexp
+  @newWrapRegexp = TkVarAccess.new('::ntext::newWrapRegexp')
+
+  # variables (advanced use)
+  @tcl_match_wordBreakAfter = TkVarAccess.new('::ntext::tcl_match_wordBreakAfter')
+  @tcl_match_wordBreakBefore = TkVarAccess.new('::ntext::tcl_match_wordBreakBefore')
+  @tcl_match_endOfWord = TkVarAccess.new('::ntext::tcl_match_endOfWord')
+  @tcl_match_startOfNextWord = TkVarAccess.new('::ntext::tcl_match_startOfNextWord')
+  @tcl_match_startOfPreviousWord = TkVarAccess.new('::ntext::tcl_match_startOfPreviousWord')
+}
+
+class << Tk::Tcllib::Ntext
+  def wrapIndent(txt, *args)
+    TK.tk_call('::next::wrapIndent', txt, *args)
+  end
+
+  def initializeMatchPatterns
+    TK.tk_call('::next::initializeMatchPatterns')
+    self
+  end
+
+  def createMatchPatterns(*args)
+    TK.tk_call('::next::createMatchPatterns', *args)
+    self
+  end
+
+  # functions (advanced use)
+  #ntext::new_wordBreakAfter
+  #ntext::new_wordBreakBefore
+  #ntext::new_endOfWord
+  #ntext::new_startOfNextWord
+  #ntext::new_startOfPreviousWord
+
+  # accessor
+  def classicAnchor
+    @classicAnchor.bool
+  end
+  def classicAnchor=(mode)
+    @classicAnchor.bool = mode
+  end
+
+  def classicExtras
+    @classicExtras.bool
+  end
+  def classicExtras=(mode)
+    @classicExtras.bool = mode
+  end
+
+  def classicMouseSelect
+    @classicMouseSelect.bool
+  end
+  def classicMouseSelect=(mode)
+    @classicMouseSelect.bool = mode
+  end
+
+  def classicWordBreak
+    @classicWordBreak.bool
+  end
+  def classicWordBreak=(mode)
+    @classicWordBreak.bool = mode
+  end
+
+  def classicWrap
+    @classicWrap.bool
+  end
+  def classicWrap=(mode)
+    @classicWrap.bool = mode
+  end
+
+  def overwrite
+    @overwrite.bool
+  end
+  def overwrite=(mode)
+    @classic.bool = mode
+  end
+
+  def newWrapRegexp
+    @newWrapRegexp.value
+  end
+  def newWrapRegexp=(val)
+    @newWrapRegexp.value = val
+  end
+
+  def tcl_match_wordBreakAfter
+    @tcl_match_wordBreakAfter.value
+  end
+  def tcl_match_wordBreakAfter=(val)
+    @tcl_match_wordBreakAfter.value = val
+  end
+
+  def tcl_match_wordBreakBefore
+    @tcl_match_wordBreakBefore.value
+  end
+  def tcl_match_wordBreakBefore=(val)
+    @tcl_match_wordBreakBefore.value = val
+  end
+
+  def tcl_match_endOfWord
+    @tcl_match_endOfWord.value
+  end
+  def tcl_match_endOfWord=(val)
+    @tcl_match_endOfWord.value = val
+  end
+
+  def tcl_match_startOfNextWord
+    @tcl_match_startOfNextWord.value
+  end
+  def tcl_match_startOfNextWord=(val)
+    @tcl_match_startOfNextWord.value = val
+  end
+
+  def tcl_match_startOfPreviousWord
+    @tcl_match_startOfPreviousWord.value
+  end
+  def tcl_match_startOfPreviousWord=(val)
+    @tcl_match_startOfPreviousWord.value = val
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/panelframe.rb b/ext/tk/lib/tkextlib/tcllib/panelframe.rb
index 2a4562e779..020c51cbd1 100644
--- a/ext/tk/lib/tkextlib/tcllib/panelframe.rb
+++ b/ext/tk/lib/tkextlib/tcllib/panelframe.rb
@@ -37,7 +37,7 @@ class Tk::Tcllib::Widget::PanelFrame
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -60,11 +60,17 @@ class Tk::Tcllib::Widget::PanelFrame
 
   def remove(*wins)
     tk_send('remove', *wins)
+    self
   end
   def remove_destroy(*wins)
     tk_send('remove', '-destroy', *wins)
+    self
+  end
+
+  def delete(*wins)
+    tk_send('delete', *wins)
+    self
   end
-  alias delete remove_destroy
 
   def items
     simplelist(tk_send('items')).collect!{|w| window(w)}
diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
index f5f344ceb3..3c944bb266 100644
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
@@ -7,10 +7,10 @@
 #
 # (The following is the original description of the library.)
 #
-# Plotchart is a Tcl-only package that focuses on the easy creation of 
-# xy-plots, barcharts and other common types of graphical presentations. 
-# The emphasis is on ease of use, rather than flexibility. The procedures 
-# that create a plot use the entire canvas window, making the layout of the 
+# Plotchart is a Tcl-only package that focuses on the easy creation of
+# xy-plots, barcharts and other common types of graphical presentations.
+# The emphasis is on ease of use, rather than flexibility. The procedures
+# that create a plot use the entire canvas window, making the layout of the
 # plot completely automatic.
 #
 # This results in the creation of an xy-plot in, say, ten lines of code:
@@ -32,27 +32,27 @@
 #    $s title "Data series"
 # --------------------------------------------------------------------
 #
-# A drawback of the package might be that it does not do any data management. 
-# So if the canvas that holds the plot is to be resized, the whole plot must 
-# be redrawn. The advantage, though, is that it offers a number of plot and 
+# A drawback of the package might be that it does not do any data management.
+# So if the canvas that holds the plot is to be resized, the whole plot must
+# be redrawn. The advantage, though, is that it offers a number of plot and
 # chart types:
 #
 #    * XY-plots like the one shown above with any number of data series.
-#    * Stripcharts, a kind of XY-plots where the horizontal axis is adjusted 
-#      automatically. The result is a kind of sliding window on the data 
+#    * Stripcharts, a kind of XY-plots where the horizontal axis is adjusted
+#      automatically. The result is a kind of sliding window on the data
 #      series.
 #    * Polar plots, where the coordinates are polar instead of cartesian.
-#    * Isometric plots, where the scale of the coordinates in the two 
-#      directions is always the same, i.e. a circle in world coordinates 
+#    * Isometric plots, where the scale of the coordinates in the two
+#      directions is always the same, i.e. a circle in world coordinates
 #      appears as a circle on the screen.
-#      You can zoom in and out, as well as pan with these plots (Note: this 
-#      works best if no axes are drawn, the zooming and panning routines do 
-#      not distinguish the axes), using the mouse buttons with the control 
+#      You can zoom in and out, as well as pan with these plots (Note: this
+#      works best if no axes are drawn, the zooming and panning routines do
+#      not distinguish the axes), using the mouse buttons with the control
 #      key and the arrow keys with the control key.
 #    * Piecharts, with automatic scaling to indicate the proportions.
-#    * Barcharts, with either vertical or horizontal bars, stacked bars or 
+#    * Barcharts, with either vertical or horizontal bars, stacked bars or
 #      bars side by side.
-#    * Timecharts, where bars indicate a time period and milestones or other 
+#    * Timecharts, where bars indicate a time period and milestones or other
 #      important moments in time are represented by triangles.
 #    * 3D plots (both for displaying surfaces and 3D bars)
 #
@@ -62,6 +62,7 @@ require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('Plotchart', '0.9')
 # TkPackage.require('Plotchart', '1.1')
+# TkPackage.require('Plotchart', '1.6.3')
 TkPackage.require('Plotchart')
 
 module Tk
@@ -91,13 +92,13 @@ module Tk::Tcllib::Plotchart
   end
 
   def self.world_coordinates(w, *args) # args := xmin, ymin, xmax, ymax
-    tk_call_without_enc('::Plotchart::worldCoordinates', 
+    tk_call_without_enc('::Plotchart::worldCoordinates',
                         w.path, *(args.flatten))
   end
 
-  def self.world_3D_coordinates(w, *args) 
+  def self.world_3D_coordinates(w, *args)
     # args := xmin, ymin, zmin, xmax, ymax, zmax
-    tk_call_without_enc('::Plotchart::world3DCoordinates', 
+    tk_call_without_enc('::Plotchart::world3DCoordinates',
                         w.path, *(args.flatten))
   end
 
@@ -109,6 +110,29 @@ module Tk::Tcllib::Plotchart
     list(tk_call_without_enc('::Plotchart::coords3DToPixel', w.path, x, y, z))
   end
 
+  def self.plotconfig(*args)
+    case args.length
+    when 0, 1, 2
+      # 0: (no args) --> list of chat types
+      # 1: charttype --> list of components
+      # 2: charttype, component --> list of properties
+      simplelist(tk_call('::Plotchart::plotconfig', *args))
+    when 3
+      # 3: charttype, component, property --> current value
+      tk_call('::Plotchart::plotconfig', *args)
+    else
+      # 4: charttype, component, property, value : set new value
+      # 5+: Error on Tcl/Tk
+      tk_call('::Plotchart::plotconfig', *args)
+      nil
+    end
+  end
+
+  def self.plotpack(w, dir, *plots)
+    tk_call_without_enc('::Plotchart::plotpack', w.path, dir, *plots)
+    w
+  end
+
   def self.polar_coordinates(w, radmax)
     tk_call_without_enc('::Plotchart::polarCoordinates', w.path, radmax)
   end
@@ -121,8 +145,8 @@ module Tk::Tcllib::Plotchart
     list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
   end
 
-  def self.determine_scale(w, xmax, ymax)
-    tk_call_without_enc('::Plotchart::determineScale', w.path, xmax, ymax)
+  def self.determine_scale(*args) # (xmin, xmax, inverted=false)
+    tk_call_without_enc('::Plotchart::determineScale', *args)
   end
 
   def self.set_zoom_pan(w)
@@ -157,8 +181,7 @@ module Tk::Tcllib::Plotchart
       if key.kind_of?(Hash)
         tk_call_without_enc(@chart, 'xconfig', *hash_kv(key, true))
       else
-        tk_call_without_enc(@chart, 'xconfig', 
-                            "-#{key}", _get_eval_enc_str(value))
+        tk_call(@chart, 'xconfig', "-#{key}",value)
       end
       self
     end
@@ -167,27 +190,100 @@ module Tk::Tcllib::Plotchart
       if key.kind_of?(Hash)
         tk_call_without_enc(@chart, 'yconfig', *hash_kv(key, true))
       else
-        tk_call_without_enc(@chart, 'yconfig', 
-                            "-#{key}", _get_eval_enc_str(value))
+        tk_call(@chart, 'yconfig', "-#{key}", value)
       end
       self
     end
 
+    def background(part, color_or_image, dir)
+      tk_call_without_enc(@chart, 'background',
+                          part, color_or_image, dir)
+      self
+    end
+
+    def xticklines(color=None)
+      tk_call(@chart, 'xticklines', color)
+      self
+    end
+
+    def yticklines(color=None)
+      tk_call(@chart, 'yticklines', color)
+      self
+    end
+
+    def legendconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'legendconfig', *hash_kv(key, true))
+      else
+        tk_call(@chart, 'legendconfig', "-#{key}", value)
+      end
+      self
+    end
+
+    def legend(series, text)
+      tk_call_without_enc(@chart, 'legend', 
+                          _get_eval_enc_str(series), _get_eval_enc_str(text))
+      self
+    end
+
+    def balloon(*args) # args => (x, y, text, dir) or ([x, y], text, dir)
+      if args[0].kind_of?(Array)
+        # args => ([x, y], text, dir)
+        x, y = args.shift
+      else
+        # args => (x, y, text, dir)
+        x = args.shift
+        y = args.shift
+      end
+
+      text, dir = args
+
+      tk_call_without_enc(@chart, 'balloon', x, y, 
+                          _get_eval_enc_str(text), dir)
+      self
+    end
+
+    def balloonconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'balloonconfig', *hash_kv(key, true))
+      else
+        tk_call(@chart, 'balloonconfig', "-#{key}", value)
+      end
+    end
+
+    def plaintext(*args) # args => (x, y, text, dir) or ([x, y], text, dir)
+      if args[0].kind_of?(Array)
+        # args => ([x, y], text, dir)
+        x, y = args.shift
+      else
+        # args => (x, y, text, dir)
+        x = args.shift
+        y = args.shift
+      end
+
+      text, dir = args
+
+      tk_call_without_enc(@chart, 'plaintext', x, y, 
+                          _get_eval_enc_str(text), dir)
+      self
+    end
+
     ############################
+
     def view_port(*args) # args := pxmin, pymin, pxmax, pymax
       tk_call_without_enc('::Plotchart::viewPort', @path, *(args.flatten))
       self
     end
 
     def world_coordinates(*args) # args := xmin, ymin, xmax, ymax
-      tk_call_without_enc('::Plotchart::worldCoordinates', 
+      tk_call_without_enc('::Plotchart::worldCoordinates',
                           @path, *(args.flatten))
       self
     end
 
-    def world_3D_coordinates(*args) 
+    def world_3D_coordinates(*args)
       # args := xmin, ymin, zmin, xmax, ymax, zmax
-      tk_call_without_enc('::Plotchart::world3DCoordinates', 
+      tk_call_without_enc('::Plotchart::world3DCoordinates',
                           @path, *(args.flatten))
       self
     end
@@ -200,6 +296,11 @@ module Tk::Tcllib::Plotchart
       list(tk_call_without_enc('::Plotchart::coords3DToPixel', @path, x, y, z))
     end
 
+    def plotpack(dir, *plots)
+      tk_call_without_enc('::Plotchart::plotpack', @path, dir, *plots)
+      self
+    end
+
     def polar_coordinates(radmax)
       tk_call_without_enc('::Plotchart::polarCoordinates', @path, radmax)
       self
@@ -225,11 +326,11 @@ module Tk::Tcllib::Plotchart
   end
 
   ############################
-  class XYPlot < TkCanvas
+  class XYPlot < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
       '::Plotchart::createXYPlot'.freeze
     ].freeze
 
@@ -247,7 +348,7 @@ module Tk::Tcllib::Plotchart
         @xaxis = args.shift
         @yaxis = args.shift
 
-        if parent.kind_of?(TkCanvas)
+        if parent.kind_of?(Tk::Canvas)
           @path = parent.path
         else
           super(parent, *args) # create canvas widget
@@ -259,13 +360,15 @@ module Tk::Tcllib::Plotchart
 
     def _create_chart
       p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
                           array2tk_list(@xaxis), array2tk_list(@yaxis))
     end
     private :_create_chart
 
     def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
+        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      }
     end
 
     def plot(series, x, y)
@@ -279,27 +382,27 @@ module Tk::Tcllib::Plotchart
       vals = array2tk_list(vals) if vals.kind_of?(Array)
       clss = array2tk_list(clss) if clss.kind_of?(Array)
 
-      tk_call_without_enc(@chart, 'contourlines', xcrd, ycrd, vals, clss)
+      tk_call(@chart, 'contourlines', xcrd, ycrd, vals, clss)
       self
     end
 
-    def contourfill(xcrd, ycrd, vals, klasses=None)
+    def contourfill(xcrd, ycrd, vals, clss=None)
       xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
       ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
       vals = array2tk_list(vals) if vals.kind_of?(Array)
       clss = array2tk_list(clss) if clss.kind_of?(Array)
 
-      tk_call_without_enc(@chart, 'contourfill', xcrd, ycrd, vals, clss)
+      tk_call(@chart, 'contourfill', xcrd, ycrd, vals, clss)
       self
     end
 
-    def contourbox(xcrd, ycrd, vals, klasses=None)
+    def contourbox(xcrd, ycrd, vals, clss=None)
       xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
       ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
       vals = array2tk_list(vals) if vals.kind_of?(Array)
       clss = array2tk_list(clss) if clss.kind_of?(Array)
 
-      tk_call_without_enc(@chart, 'contourbox', xcrd, ycrd, vals, clss)
+      tk_call(@chart, 'contourbox', xcrd, ycrd, vals, clss)
       self
     end
 
@@ -322,26 +425,110 @@ module Tk::Tcllib::Plotchart
       if key.kind_of?(Hash)
         tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
       else
-        tk_call_without_enc(@chart, 'dataconfig', series, 
-                            "-#{key}", _get_eval_enc_str(value))
+        tk_call(@chart, 'dataconfig', series, "-#{key}", value)
       end
     end
+
+    def rescale(xscale, yscale) # xscale|yscale => [newmin, newmax, newstep]
+      tk_call_without_enc(@chart, 'rescale', xscale, yscale)
+      self
+    end
+
+    def trend(series, xcrd, ycrd)
+      tk_call_without_enc(@chart, 'trend',
+                          _get_eval_enc_str(series), xcrd, ycrd)
+      self
+    end
+
+    def rchart(series, xcrd, ycrd)
+      tk_call_without_enc(@chart, 'rchart',
+                          _get_eval_enc_str(series), xcrd, ycrd)
+      self
+    end
+
+    def interval(series, xcrd, ymin, ymax, ycenter=None)
+      tk_call(@chart, 'interval', series, xcrd, ymin, ymax, ycenter)
+      self
+    end
+
+    def box_and_whiskers(series, xcrd, ycrd)
+      tk_call_without_enc(@chart, 'box-and-whiskers',
+                          _get_eval_enc_str(series), xcrd, ycrd)
+      self
+    end
+    alias box_whiskers box_and_whiskers
+
+    def vectorconfig(series, key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'vectorconfig',
+                            _get_eval_enc_str(series), *hash_kv(key, true))
+      else
+        tk_call(@chart, 'vectorconfig', series, "-#{key}", value)
+      end
+      self
+    end
+
+    def vector(series, xcrd, ycrd, ucmp, vcmp)
+      tk_call_without_enc(@chart, 'vector', _get_eval_enc_str(series),
+                          xcrd, ycrd, ucmp, vcmp)
+      self
+    end
+
+    def dotconfig(series, key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'dotconfig',
+                            _get_eval_enc_str(series), *hash_kv(key, true))
+      else
+        tk_call(@chart, 'dotconfig', series, "-#{key}", value)
+      end
+      self
+    end
+
+    def dot(series, xcrd, ycrd, value)
+      tk_call_without_enc(@chart, 'dot', _get_eval_enc_str(series), 
+                          xcrd, ycrd, value)
+      self
+    end
   end
 
   ############################
   class Stripchart < XYPlot
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
       '::Plotchart::createStripchart'.freeze
     ].freeze
   end
 
   ############################
-  class PolarPlot < TkCanvas
+  class TXPlot < XYPlot
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createTXPlot'.freeze
+    ].freeze
+  end
+
+  ############################
+  class XLogYPlot < XYPlot
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createXLogYPlot'.freeze
+    ].freeze
+  end
+
+  ############################
+  class Histogram < XYPlot
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createHistgram'.freeze
+    ].freeze
+  end
+
+  ############################
+  class PolarPlot < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
       '::Plotchart::createPolarplot'.freeze
     ].freeze
 
@@ -356,7 +543,7 @@ module Tk::Tcllib::Plotchart
 
         @radius_data = args.shift
 
-        if parent.kind_of?(TkCanvas)
+        if parent.kind_of?(Tk::Canvas)
           @path = parent.path
         else
           super(parent, *args) # create canvas widget
@@ -368,38 +555,40 @@ module Tk::Tcllib::Plotchart
 
     def _create_chart
       p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
                           array2tk_list(@radius_data))
     end
     private :_create_chart
 
     def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
+        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      }
     end
 
     def plot(series, radius, angle)
-      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series), 
+      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series),
                           radius, angle)
       self
     end
 
     def dataconfig(series, key, value=None)
       if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
+        tk_call_without_enc(@chart, 'dataconfig', _get_eval_enc_str(series),
+                            *hash_kv(key, true))
       else
-        tk_call_without_enc(@chart, 'dataconfig', series, 
-                            "-#{key}", _get_eval_enc_str(value))
+        tk_call(@chart, 'dataconfig', series, "-#{key}", value)
       end
     end
   end
   Polarplot = PolarPlot
 
   ############################
-  class IsometricPlot < TkCanvas
+  class IsometricPlot < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
       '::Plotchart::createIsometricPlot'.freeze
     ].freeze
 
@@ -430,7 +619,7 @@ module Tk::Tcllib::Plotchart
           @stepsize = args.shift
         end
 
-        if parent.kind_of?(TkCanvas)
+        if parent.kind_of?(Tk::Canvas)
           @path = parent.path
         else
           super(parent, *args) # create canvas widget
@@ -442,8 +631,8 @@ module Tk::Tcllib::Plotchart
 
     def _create_chart
       p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
-                          array2tk_list(@xaxis), array2tk_list(@yaxis), 
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@xaxis), array2tk_list(@yaxis),
                           @stepsize)
     end
     private :_create_chart
@@ -475,11 +664,11 @@ module Tk::Tcllib::Plotchart
   Isometricplot = IsometricPlot
 
   ############################
-  class Plot3D < TkCanvas
+  class Plot3D < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
       '::Plotchart::create3DPlot'.freeze
     ].freeze
 
@@ -500,7 +689,7 @@ module Tk::Tcllib::Plotchart
         @yaxis = args.shift
         @zaxis = args.shift
 
-        if parent.kind_of?(TkCanvas)
+        if parent.kind_of?(Tk::Canvas)
           @path = parent.path
         else
           super(parent, *args) # create canvas widget
@@ -512,9 +701,9 @@ module Tk::Tcllib::Plotchart
 
     def _create_chart
       p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
-                          array2tk_list(@xaxis), 
-                          array2tk_list(@yaxis), 
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@xaxis),
+                          array2tk_list(@yaxis),
                           array2tk_list(@zaxis))
     end
     private :_create_chart
@@ -537,15 +726,33 @@ module Tk::Tcllib::Plotchart
       self
     end
 
+    def plot_line(dat, color)
+      # dat has to be provided as a 2 level array.
+      # 1st level contains rows, drawn in y-direction,
+      # and each row is an array whose elements are drawn in x-direction,
+      # for the columns.
+      tk_call_without_enc(@chart, 'plotline', dat, color)
+      self
+    end
+
     def plot_data(dat)
-      # dat has to be provided as a 2 level array. 
-      # 1st level contains rows, drawn in y-direction, 
-      # and each row is an array whose elements are drawn in x-direction, 
-      # for the columns. 
+      # dat has to be provided as a 2 level array.
+      # 1st level contains rows, drawn in y-direction,
+      # and each row is an array whose elements are drawn in x-direction,
+      # for the columns.
       tk_call_without_enc(@chart, 'plotdata', dat)
       self
     end
 
+    def zconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'zconfig', *hash_kv(key, true))
+      else
+        tk_call(@chart, 'zconfig', "-#{key}", value)
+      end
+      self
+    end
+
     def colour(fill, border)
       # configure the colours to use for polygon borders and inner area
       tk_call_without_enc(@chart, 'colour', fill, border)
@@ -557,16 +764,142 @@ module Tk::Tcllib::Plotchart
   end
 
   ############################
-  class Piechart < TkCanvas
+  class Barchart3D < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::create3DBarchart'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] yaxis, nobars [, keys])
+                          # yaxis  := Array of [minimum, maximum, stepsize]
+                          # nobars := number of bars
+      if args[0].kind_of?(Array)
+        @yaxis = args.shift
+        @nobars = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @yaxis = args.shift
+        @nobars = args.shift
+
+        if parent.kind_of?(Tk::Canvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@yaxis), @nobars)
+    end
+    private :_create_chart
+
+    def plot(label, yvalue, color)
+      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(label), 
+                          _get_eval_enc_str(yvalue), color)
+      self
+    end
+
+    def config(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'config', *hash_kv(key, true))
+      else
+        tk_call(@chart, 'config', "-#{key}", value)
+      end
+      self
+    end
+  end
+
+  ############################
+  class RibbonChart3D < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
+      '::Plotchart::create3DRibbonChart'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] names, yaxis, zaxis [, keys])
+                          # names := Array of the series
+                          # yaxis := Array of [minimum, maximum, stepsize]
+                          # zaxis := Array of [minimum, maximum, stepsize]
+      if args[0].kind_of?(Array)
+        @names = args.shift
+        @yaxis = args.shift
+        @zaxis = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @names = args.shift
+        @yaxis = args.shift
+        @zaxis = args.shift
+
+        if parent.kind_of?(Tk::Canvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@names),
+                          array2tk_list(@yaxis),
+                          array2tk_list(@zaxis))
+    end
+    private :_create_chart
+
+    def line(*args) # xypairs, color
+      color = args.pop # last argument is a color
+      xypairs = TkComm.slice_ary(args.flatten, 2) # regenerate xypairs
+      tk_call_without_enc(@chart, 'line', xypairs, color)
+      self
+    end
+
+    def area(*args) # xypairs, color
+      color = args.pop # last argument is a color
+      xypairs = TkComm.slice_ary(args.flatten, 2) # regenerate xypairs
+      tk_call_without_enc(@chart, 'area', xypairs, color)
+      self
+    end
+
+    def zconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'zconfig', *hash_kv(key, true))
+      else
+        tk_call(@chart, 'zconfig',"-#{key}", value)
+      end
+      self
+    end
+  end
+
+
+  ############################
+  class Piechart < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
       '::Plotchart::createPiechart'.freeze
     ].freeze
 
     def initialize(*args) # args := ([parent] [, keys])
-      if args[0].kind_of?(TkCanvas)
+      if args[0].kind_of?(Tk::Canvas)
         parent = args.shift
         @path = parent.path
       else
@@ -582,21 +915,88 @@ module Tk::Tcllib::Plotchart
     private :_create_chart
 
     def plot(*dat)  # argument is a list of [label, value]
-      tk_call_without_enc(@chart, 'plot', dat.flatten)
+      tk_call(@chart, 'plot', dat.flatten)
+      self
+    end
+
+    def colours(*list)
+      tk_call_without_enc(@chart, 'colours', *list)
+      self
+    end
+    alias colors  colours
+  end
+
+
+  ############################
+  class Radialchart < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createRadialchart'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] names, scale, style [, keys])
+                          # radius_data := Array of [maximum_radius, stepsize]
+      if args[0].kind_of?(Array)
+        @names = args.shift
+        @scale = args.shift
+        @style = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @names = args.shift
+        @scale = args.shift
+        @style = args.shift
+
+        if parent.kind_of?(Tk::Canvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@names), @scale, @style)
+    end
+    private :_create_chart
+
+    def __destroy_hook__
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
+        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      }
+    end
+
+    def plot(data, color, thickness)
+      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(data),
+                          color, thickness)
       self
     end
+
+    def colours(*list)
+      tk_call_without_enc(@chart, 'colours', *list)
+      self
+    end
+    alias colors  colours
   end
 
   ############################
-  class Barchart < TkCanvas
+  class Barchart < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
       '::Plotchart::createBarchart'.freeze
     ].freeze
 
-    def initialize(*args) 
+    def initialize(*args)
       # args := ([parent,] xlabels, ylabels [, series] [, keys])
       # xlabels, ylabels := labels | axis ( depend on normal or horizontal )
       # labels := Array of [label, label, ...]
@@ -626,7 +1026,7 @@ module Tk::Tcllib::Plotchart
           @series_size  = args.shift
         end
 
-        if parent.kind_of?(TkCanvas)
+        if parent.kind_of?(Tk::Canvas)
           @path = parent.path
         else
           super(parent, *args) # create canvas widget
@@ -638,24 +1038,26 @@ module Tk::Tcllib::Plotchart
 
     def _create_chart
       p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
-                          array2tk_list(@xlabels), array2tk_list(@ylabels), 
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@xlabels), array2tk_list(@ylabels),
                           @series_size)
     end
     private :_create_chart
 
     def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
+        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      }
     end
 
     def plot(series, dat, col=None)
-      tk_call_without_enc(@chart, 'plot', series, dat, col)
+      tk_call(@chart, 'plot', series, dat, col)
       self
     end
 
     def colours(*cols)
       # set the colours to be used
-      tk_call_without_enc(@chart, 'colours', *cols)
+      tk_call(@chart, 'colours', *cols)
       self
     end
     alias colour colours
@@ -666,13 +1068,109 @@ module Tk::Tcllib::Plotchart
   ############################
   class HorizontalBarchart < Barchart
     TkCommandNames = [
-      'canvas'.freeze, 
+      'canvas'.freeze,
       '::Plotchart::createHorizontalBarchart'.freeze
     ].freeze
   end
 
   ############################
-  class Timechart < TkCanvas
+  class Boxplot < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createBoxplot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] xaxis, ylabels [, keys])
+                          # xaxis := Array of [minimum, maximum, stepsize]
+                          # yaxis := List of labels for the y-axis
+      if args[0].kind_of?(Array)
+        @xaxis   = args.shift
+        @ylabels = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xaxis   = args.shift
+        @ylabels = args.shift
+
+        if parent.kind_of?(Tk::Canvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@xaxis), array2tk_list(@ylabels))
+    end
+    private :_create_chart
+
+    def __destroy_hook__
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
+        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      }
+    end
+
+    def plot(label, *values)
+      tk_call(@chart, 'plot', label, values.flatten)
+      self
+    end
+  end
+
+  ############################
+  class RightAxis < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createRightAxis'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] yaxis [, keys])
+                          # yaxis := Array of [minimum, maximum, stepsize]
+      if args[0].kind_of?(Array)
+        @yaxis   = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @yaxis   = args.shift
+
+        if parent.kind_of?(Tk::Canvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
+                          array2tk_list(@yaxis))
+    end
+    private :_create_chart
+
+    def __destroy_hook__
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
+        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+      }
+    end
+  end
+
+  ############################
+  class Timechart < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
@@ -699,7 +1197,7 @@ module Tk::Tcllib::Plotchart
         @time_end   = args.shift
         @items      = args.shift
 
-        if parent.kind_of?(TkCanvas)
+        if parent.kind_of?(Tk::Canvas)
           @path = parent.path
         else
           super(parent, *args) # create canvas widget
@@ -711,52 +1209,66 @@ module Tk::Tcllib::Plotchart
 
     def _create_chart
       p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[1], @path,
                           @time_begin, @time_end, @items)
     end
     private :_create_chart
 
     def period(txt, time_begin, time_end, col=None)
-      tk_call_without_enc(@chart, 'period', txt, time_begin, time_end, col)
+      tk_call(@chart, 'period', txt, time_begin, time_end, col)
       self
     end
 
     def milestone(txt, time, col=None)
-      tk_call_without_enc(@chart, 'milestone', txt, time, col)
+      tk_call(@chart, 'milestone', txt, time, col)
       self
     end
 
     def vertline(txt, time)
-      tk_call_without_enc(@chart, 'vertline', txt, time)
+      tk_call(@chart, 'vertline', txt, time)
+      self
+    end
+
+    def hscroll=(scr)
+      tk_call_without_enc(@chart, 'hscroll', scr)
+      scr
+    end
+    def hscroll(scr)
+      tk_call_without_enc(@chart, 'hscroll', scr)
+      self
+    end
+
+    def vscroll=(scr)
+      tk_call_without_enc(@chart, 'vscroll', scr)
+      scr
+    end
+    def vscroll(scr)
+      tk_call_without_enc(@chart, 'vscroll', scr)
       self
     end
   end
 
   ############################
-  class Gnattchart < TkCanvas
+  class Ganttchart < Tk::Canvas
     include ChartMethod
 
     TkCommandNames = [
       'canvas'.freeze,
-      '::Plotchart::createGnattchart'.freeze
+      '::Plotchart::createGanttchart'.freeze
     ].freeze
 
     def initialize(*args)
       # args := ([parent,] time_begin, time_end, items [, text_width] [, keys])
       # time_begin := String of time format (e.g. "1 january 2004")
       # time_end   := String of time format (e.g. "1 january 2004")
-      # items := Expected/maximum number of items
-      #          ( This determines the vertical spacing. )
+      # args := Expected/maximum number of items
+      #          ( This determines the vertical spacing. ), 
+      #         Expected/maximum width of items, 
+      #         Option Hash ( { key=>value, ... } )
       if args[0].kind_of?(String)
         @time_begin = args.shift
         @time_end   = args.shift
-        @items      = args.shift
-
-        if args[0].kind_of?(Fixnum)
-          @text_width = args.shift
-        else
-          @text_width = None
-        end
+        @args  = args
 
         super(*args) # create canvas widget
       else
@@ -764,15 +1276,9 @@ module Tk::Tcllib::Plotchart
 
         @time_begin = args.shift
         @time_end   = args.shift
-        @items      = args.shift
+        @args  = args
 
-        if args[0].kind_of?(Fixnum)
-          @text_width = args.shift
-        else
-          @text_width = None
-        end
-
-        if parent.kind_of?(TkCanvas)
+        if parent.kind_of?(Tk::Canvas)
           @path = parent.path
         else
           super(parent, *args) # create canvas widget
@@ -784,25 +1290,25 @@ module Tk::Tcllib::Plotchart
 
     def _create_chart
       p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
-                          @time_begin, @time_end, @items, @text_width)
+      tk_call(self.class::TkCommandNames[1], @path,
+              @time_begin, @time_end, *args)
     end
     private :_create_chart
 
     def task(txt, time_begin, time_end, completed=0.0)
-      list(tk_call_without_enc(@chart, 'task', txt, time_begin, time_end, 
-                               completed)).collect!{|id|
+      list(tk_call(@chart, 'task', txt, time_begin, time_end,
+                   completed)).collect!{|id|
         TkcItem.id2obj(self, id)
       }
     end
 
     def milestone(txt, time, col=None)
-      tk_call_without_enc(@chart, 'milestone', txt, time, col)
+      tk_call(@chart, 'milestone', txt, time, col)
       self
     end
 
     def vertline(txt, time)
-      tk_call_without_enc(@chart, 'vertline', txt, time)
+      tk_call(@chart, 'vertline', txt, time)
       self
     end
 
@@ -810,23 +1316,41 @@ module Tk::Tcllib::Plotchart
       from_task = array2tk_list(from_task) if from_task.kind_of?(Array)
       to_task   = array2tk_list(to_task)   if to_task.kind_of?(Array)
 
-      tk_call_without_enc(@chart, 'connect', from_task, to_task)
+      tk_call(@chart, 'connect', from_task, to_task)
       self
     end
 
     def summary(txt, tasks)
       tasks = array2tk_list(tasks) if tasks.kind_of?(Array)
-      tk_call_without_enc(@chart, 'summary', tasks)
+      tk_call(@chart, 'summary', tasks)
       self
     end
 
     def color_of_part(keyword, newcolor)
-      tk_call_without_enc(@chart, 'color', keyword, newcolor)
+      tk_call(@chart, 'color', keyword, newcolor)
       self
     end
 
     def font_of_part(keyword, newfont)
-      tk_call_without_enc(@chart, 'font', keyword, newfont)
+      tk_call(@chart, 'font', keyword, newfont)
+      self
+    end
+
+    def hscroll=(scr)
+      tk_call_without_enc(@chart, 'hscroll', scr)
+      scr
+    end
+    def hscroll(scr)
+      tk_call_without_enc(@chart, 'hscroll', scr)
+      self
+    end
+
+    def vscroll=(scr)
+      tk_call_without_enc(@chart, 'vscroll', scr)
+      scr
+    end
+    def vscroll(scr)
+      tk_call_without_enc(@chart, 'vscroll', scr)
       self
     end
   end
@@ -834,23 +1358,38 @@ module Tk::Tcllib::Plotchart
   ############################
   class PlotSeries < TkObject
     SeriesID_TBL = TkCore::INTERP.create_table
-    Series_ID = ['series'.freeze, '00000'.taint].freeze
-    TkCore::INTERP.init_ip_env{ SeriesID_TBL.clear }
+
+    (Series_ID = ['series'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      @mutex = Mutex.new
+      def mutex; @mutex; end
+      freeze
+    }
+    TkCore::INTERP.init_ip_env{
+      SeriesID_TBL.mutex.synchronize{ SeriesID_TBL.clear }
+    }
 
     def self.id2obj(chart, id)
       path = chart.path
-      return id unless SeriesID_TBL[path]
-      SeriesID_TBL[path][id]? SeriesID_TBL[path][id]: id
+      SeriesID_TBL.mutex.synchronize{
+        if SeriesID_TBL[path]
+          SeriesID_TBL[path][id]? SeriesID_TBL[path][id]: id
+        else
+          id
+        end
+      }
     end
 
     def initialize(chart, keys=nil)
       @parent = @chart_obj = chart
       @ppath = @chart_obj.path
-      @path = @series = @id = Series_ID.join(TkCore::INTERP._ip_id_)
-      # SeriesID_TBL[@id] = self
-      SeriesID_TBL[@ppath] = {} unless SeriesID_TBL[@ppath]
-      SeriesID_TBL[@ppath][@id] = self
-      Series_ID[1].succ!
+      Series_ID.mutex.synchronize{
+        @path = @series = @id = Series_ID.join(TkCore::INTERP._ip_id_)
+        Series_ID[1].succ!
+      }
+      SeriesID_TBL.mutex.synchronize{
+        SeriesID_TBL[@ppath] ||= {}
+        SeriesID_TBL[@ppath][@id] = self
+      }
       dataconfig(keys) if keys.kind_of?(Hash)
     end
 
diff --git a/ext/tk/lib/tkextlib/tcllib/ruler.rb b/ext/tk/lib/tkextlib/tcllib/ruler.rb
index 88ffb2c912..d22dafa053 100644
--- a/ext/tk/lib/tkextlib/tcllib/ruler.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ruler.rb
@@ -46,7 +46,7 @@ class Tk::Tcllib::Widget::Ruler
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/screenruler.rb b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
index 1b4067e2f0..75fa36b66d 100644
--- a/ext/tk/lib/tkextlib/tcllib/screenruler.rb
+++ b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
@@ -47,7 +47,7 @@ class Tk::Tcllib::Widget::ScreenRuler
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb b/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb
new file mode 100644
index 0000000000..c9488b4686
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb
@@ -0,0 +1,57 @@
+#
+#  tkextlib/tcllib/scrolledwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * scrolledwindow widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::scrolledwindow', '1.2')
+TkPackage.require('widget::scrolledwindow')
+
+module Tk::Tcllib
+  module Widget
+    class Scrolledwindow < Tk::Tile::TFrame
+      PACKAGE_NAME = 'widget::scrolledwindow'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::scrolledwindow')
+        rescue
+          ''
+        end
+      end
+    end
+    ScrolledWindow = Scrolledwindow
+  end
+end
+
+class Tk::Tcllib::Widget::ScrolledWindow
+  TkCommandNames = ['::widget::scrolledwindow'.freeze].freeze
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def getframe
+    window(tk_send_without_enc('getframe'))
+  end
+  alias get_frame getframe
+
+  def setwidget(w)
+    window(tk_send_without_enc('setwidget', w))
+  end
+  alias set_widget setwidget
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb b/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
index 717728e34a..c9f6062fef 100644
--- a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
+++ b/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
@@ -42,7 +42,7 @@ class Tk::Tcllib::Widget::ScrolledWindow
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/setup.rb b/ext/tk/lib/tkextlib/tcllib/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tcllib/setup.rb
+++ b/ext/tk/lib/tkextlib/tcllib/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tcllib/statusbar.rb b/ext/tk/lib/tkextlib/tcllib/statusbar.rb
new file mode 100644
index 0000000000..46a4b9d8b6
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/statusbar.rb
@@ -0,0 +1,79 @@
+#
+#  tkextlib/tcllib/statusbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * statusbar widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::statusbar', '1.2')
+TkPackage.require('widget::statusbar')
+
+module Tk::Tcllib
+  module Widget
+    class Statusbar < Tk::Tile::TFrame
+      PACKAGE_NAME = 'widget::statusbar'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::statusbar')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::Widget::Statusbar
+  TkCommandNames = ['::widget::statusbar'.freeze].freeze
+
+  def __boolval_optkeys
+    super() << 'separator' << 'resize' << 'resizeseparator'
+  end
+  private :__boolval_optkeys
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def getframe
+    window(tk_send_without_enc('getframe'))
+  end
+  alias get_frame getframe
+
+  def add(w, keys={})
+    window(tk_send_without_enc('setwidget', *(hash_kv(keys))))
+  end
+
+  def remove(*wins)
+    tk_send_without_enc('remove', *wins)
+    self
+  end
+
+  def remove_with_destroy(*wins)
+    tk_send_without_enc('remove', '-destroy', *wins)
+    self
+  end
+
+  def delete(*wins)
+    tk_send_without_enc('delete', *wins)
+    self
+  end
+
+  def items(pat=None)
+    tk_split_list(tk_send('items', pat))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/superframe.rb b/ext/tk/lib/tkextlib/tcllib/superframe.rb
index 35da37efbf..adc9c4adbd 100644
--- a/ext/tk/lib/tkextlib/tcllib/superframe.rb
+++ b/ext/tk/lib/tkextlib/tcllib/superframe.rb
@@ -37,7 +37,7 @@ class Tk::Tcllib::Widget::SuperFrame
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/swaplist.rb b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
index 97de0a27c1..7698640534 100644
--- a/ext/tk/lib/tkextlib/tcllib/swaplist.rb
+++ b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
@@ -33,7 +33,7 @@ end
 class Tk::Tcllib::Swaplist_Dialog
   TkCommandNames = ['::swaplist::swaplist'.freeze].freeze
   WidgetClassName = 'Swaplist'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.show(*args)
     dialog = self.new(*args)
@@ -44,7 +44,7 @@ class Tk::Tcllib::Swaplist_Dialog
     self.show(*args)
   end
 
-  def initialize(*args) 
+  def initialize(*args)
     # args = (parent=nil, complete_list=[], selected_list=[], keys=nil)
     keys = args.pop
     if keys.kind_of?(Hash)
@@ -74,9 +74,9 @@ class Tk::Tcllib::Swaplist_Dialog
 
   def show
     @variable.value = ''
-    @status = bool(tk_call(self.class::TkCommandNames[0], 
-                           @path, @variable, 
-                           @complete_list, @selected_list, 
+    @status = bool(tk_call(self.class::TkCommandNames[0],
+                           @path, @variable,
+                           @complete_list, @selected_list,
                            *hash_kv(@keys)))
   end
   alias display show
@@ -90,7 +90,7 @@ class Tk::Tcllib::Swaplist_Dialog
   end
   alias selected value
 
-  def cget(slot)
+  def cget_strict(slot)
     slot = slot.to_s
     if slot == 'complete_list'
       @complete_list
@@ -100,6 +100,9 @@ class Tk::Tcllib::Swaplist_Dialog
       @keys[slot]
     end
   end
+  def cget(slot)
+    cget_strict(slot)
+  end
 
   def configure(slot, value=None)
     if slot.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
index efeb8fbbac..b40f7a5b8b 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
@@ -10,7 +10,8 @@ require 'tkextlib/tcllib.rb'
 
 # check Tile extension :: If already loaded, use tablelist_tile.
 unless defined? Tk::Tcllib::Tablelist_usingTile
-  Tk::Tcllib::Tablelist_usingTile = TkPackage.provide('tile')
+  Tk::Tcllib::Tablelist_usingTile = 
+    TkPackage.provide('tile') || TkPackage.provide('Ttk')
 end
 
 if Tk::Tcllib::Tablelist_usingTile
@@ -20,8 +21,8 @@ if Tk::Tcllib::Tablelist_usingTile
 else
   # without Tile
 
-  # TkPackage.require('Tablelist', '4.2')
-  TkPackage.require('Tablelist')
+  # TkPackage.require('tablelist', '4.2')
+  TkPackage.require('tablelist')
 
   require 'tkextlib/tcllib/tablelist_core'
 end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
index a939a58331..850e75d845 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
@@ -4,7 +4,7 @@
 #                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
 #   * Part of tcllib extension
-#   * This file is required by 'tkextlib/tcllib/tablelist.rb' or 
+#   * This file is required by 'tkextlib/tcllib/tablelist.rb' or
 #     'tkextlib/tcllib/tablelist_tile.rb'.
 #
 
@@ -54,7 +54,7 @@ module Tk::Tcllib::TablelistItemConfig
     elsif idx =~ /([^,]+),([^,]+)/
       row = $1, column = $2
       [num_or_str(row), num_or_str(column)]
-    else 
+    else
       num_or_str(idx)
     end
   end
@@ -67,9 +67,15 @@ module Tk::Tcllib::TablelistItemConfig
     [self.path, mixed_id[0] + 'configure', _to_idx(mixed_id[1])]
   end
 
+  def cell_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['cell', tagOrId], option)
+  end
   def cell_cget(tagOrId, option)
     itemcget(['cell', tagOrId], option)
   end
+  def cell_cget_strict(tagOrId, option)
+    itemcget_strict(['cell', tagOrId], option)
+  end
   def cell_configure(tagOrId, slot, value=None)
     itemconfigure(['cell', tagOrId], slot, value)
   end
@@ -79,14 +85,22 @@ module Tk::Tcllib::TablelistItemConfig
   def current_cell_configinfo(tagOrId, slot=nil)
     current_itemconfiginfo(['cell', tagOrId], slot)
   end
+  alias cellcget_tkstring cell_cget_tkstring
   alias cellcget cell_cget
+  alias cellcget_strict cell_cget_strict
   alias cellconfigure cell_configure
   alias cellconfiginfo cell_configinfo
   alias current_cellconfiginfo current_cell_configinfo
 
+  def column_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['column', tagOrId], option)
+  end
   def column_cget(tagOrId, option)
     itemcget(['column', tagOrId], option)
   end
+  def column_cget_strict(tagOrId, option)
+    itemcget_strict(['column', tagOrId], option)
+  end
   def column_configure(tagOrId, slot, value=None)
     itemconfigure(['column', tagOrId], slot, value)
   end
@@ -96,14 +110,22 @@ module Tk::Tcllib::TablelistItemConfig
   def current_column_configinfo(tagOrId, slot=nil)
     current_itemconfiginfo(['column', tagOrId], slot)
   end
+  alias columncget_tkstring column_cget_tkstring
   alias columncget column_cget
+  alias columncget_strict column_cget_strict
   alias columnconfigure column_configure
   alias columnconfiginfo column_configinfo
   alias current_columnconfiginfo current_column_configinfo
 
+  def row_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['row', tagOrId], option)
+  end
   def row_cget(tagOrId, option)
     itemcget(['row', tagOrId], option)
   end
+  def row_cget_strict(tagOrId, option)
+    itemcget_strict(['row', tagOrId], option)
+  end
   def row_configure(tagOrId, slot, value=None)
     itemconfigure(['row', tagOrId], slot, value)
   end
@@ -113,13 +135,15 @@ module Tk::Tcllib::TablelistItemConfig
   def current_row_configinfo(tagOrId, slot=nil)
     current_itemconfiginfo(['row', tagOrId], slot)
   end
+  alias rowcget_tkstring row_cget_tkstring
   alias rowcget row_cget
+  alias rowcget_strict row_cget_strict
   alias rowconfigure row_configure
   alias rowconfiginfo row_configinfo
   alias current_rowconfiginfo current_row_configinfo
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 end
 
 class Tk::Tcllib::Tablelist
@@ -128,11 +152,11 @@ class Tk::Tcllib::Tablelist
 
   TkCommandNames = ['::tablelist::tablelist'.freeze].freeze
   WidgetClassName = 'Tablelist'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -153,16 +177,16 @@ class Tk::Tcllib::Tablelist
   private :__strval_optkeys
 
   def __boolval_optkeys
-    super() + [
-      'forceeditendcommand', 'movablecolumns', 'movablerows', 
-      'protecttitlecolumns', 'resizablecolumns', 
+    super() - ['takefocus'] + [
+      'forceeditendcommand', 'movablecolumns', 'movablerows',
+      'protecttitlecolumns', 'resizablecolumns', 'setfocus',
       'showarrow', 'showlabels', 'showseparators'
     ]
   end
   private :__boolval_optkeys
 
   def __listval_optkeys
-    super() + ['columns']
+    super() + ['columns', 'columntitles']
   end
   private :__listval_optkeys
 
@@ -174,7 +198,21 @@ class Tk::Tcllib::Tablelist
   def __val2ruby_optkeys  # { key=>proc, ... }
     # The method is used to convert a opt-value to a ruby's object.
     # When get the value of the option "key", "proc.call(value)" is called.
-    super().update('stretch'=>proc{|v| (v == 'all')? v: simplelist(v)})
+    super().update('stretch'=>proc{|v|
+                     (v == 'all')? v: simplelist(v)
+                   },
+                   'takefocus'=>proc{|v|
+                     case v
+                     when '1'
+                       true
+                     when '0'
+                       false
+                     when ''
+                       nil
+                     else # cmd
+                       tk_tcl2ruby(cmd)
+                       end
+                   })
   end
   private :__val2ruby_optkeys
 
@@ -182,8 +220,20 @@ class Tk::Tcllib::Tablelist
     # The method is used to convert a ruby's object to a opt-value.
     # When set the value of the option "key", "proc.call(value)" is called.
     # That is, "-#{key} #{proc.call(value)}".
-    super().update('stretch'=>proc{|v| 
+    super().update('stretch'=>proc{|v|
                      (v.kind_of?(Array))? v.collect{|e| _to_idx(e)}: v
+                   },
+                   'takefocus'=>proc{|v|
+                     case v
+                     when true
+                       '1'
+                     when false
+                       '0'
+                     when nil
+                       ''
+                     else
+                       _get_eval_string(v)
+                     end
                    })
   end
   private :__ruby2val_optkeys
@@ -199,14 +249,15 @@ class Tk::Tcllib::Tablelist
     if id[0] == 'cell'
       super(id) + ['title']
     else
-      super(id) - ['text'] + ['title']
+      super(id) - ['text'] + ['title', 'name']
     end
   end
   private :__item_strval_optkeys
 
   def __item_boolval_optkeys(id)
     super(id) + [
-      'editable', 'hide', 'resizable', 'showarrow', 'stretchable', 
+      'changesnipside', 'editable', 'hide', 'resizable', 'selectable',
+      'showarrow', 'showlinenumbers', 'stretchable', 'stretchwindow', 'wrap'
     ]
   end
   private :__item_boolval_optkeys
@@ -237,7 +288,7 @@ class Tk::Tcllib::Tablelist
     tk_send('activatecell', _to_idx(index))
     self
   end
-  alias activatecell activate_cell 
+  alias activatecell activate_cell
 
   def get_attrib(name=nil)
     if name && name != None
@@ -268,12 +319,29 @@ class Tk::Tcllib::Tablelist
     TkBindTag.new_by_name(tk_send('bodytag'))
   end
 
-  def cancel_editing 
+  def cancel_editing
     tk_send('cancelediting')
     self
   end
   alias cancelediting cancel_editing
 
+  def get_cellattrib(name=nil)
+    if name && name != None
+      tk_send('cellattrib', name)
+    else
+      ret = []
+      lst = simplelist(tk_send('cellattrib'))
+      until lst.empty?
+        ret << ( [lst.shift] << lst.shift )
+      end
+      ret
+    end
+  end
+  def set_cellattrib(*args)
+    tk_send('cellattrib', *(args.flatten))
+    self
+  end
+
   def cellindex(idx)
     _from_idx(tk_send('cellindex', _to_idx(idx)))
   end
@@ -309,6 +377,23 @@ class Tk::Tcllib::Tablelist
     self
   end
 
+  def get_columnattrib(name=nil)
+    if name && name != None
+      tk_send('columnattrib', name)
+    else
+      ret = []
+      lst = simplelist(tk_send('columnattrib'))
+      until lst.empty?
+        ret << ( [lst.shift] << lst.shift )
+      end
+      ret
+    end
+  end
+  def set_columnattrib(*args)
+    tk_send('columnattrib', *(args.flatten))
+    self
+  end
+
   def columncount
     number(tk_send('columncount'))
   end
@@ -317,6 +402,83 @@ class Tk::Tcllib::Tablelist
     number(tk_send('columnindex', _to_idx(idx)))
   end
 
+  def columnwidth(idx, opt=nil)
+    if opt
+      number(tk_send('columnwidth', _to_idx(idx), "-#{opt}"))
+    else
+      number(tk_send('columnwidth', _to_idx(idx)))
+    end
+  end
+  def requested_columnwidth(idx)
+    columnwidth(idx, 'requested')
+  end
+  def stretched_columnwidth(idx)
+    columnwidth(idx, 'stretched')
+  end
+  def total_columnwidth(idx)
+    columnwidth(idx, 'total')
+  end
+
+  def configcelllist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] 
+    ary = []
+    lst.slice(3){|idx, opt, val|
+      ary << _to_idx(idx) << "-#{opt}" << val
+    }
+    tk_send('configcelllist', ary)
+    self
+  end
+  alias config_celllist configcelllist
+
+  def configcells(*args) # args ==> idx, opt, val, idx, opt, val, ...
+    ary = []
+    args.slice(3){|idx, opt, val|
+      ary << _to_idx(idx) << "-#{opt}" << val
+    }
+    tk_send('configcells', *ary)
+    self
+  end
+  alias config_cells configcells
+
+  def configcolumnlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] 
+    ary = []
+    lst.slice(3){|idx, opt, val|
+      ary << _to_idx(idx) << "-#{opt}" << val
+    }
+    tk_send('configcolumnlist', ary)
+    self
+  end
+  alias config_columnlist configcolumnlist
+
+  def configcolumns(*args) # args ==> idx, opt, val, idx, opt, val, ...
+    ary = []
+    args.slice(3){|idx, opt, val|
+      ary << _to_idx(idx) << "-#{opt}" << val
+    }
+    tk_send('configcolumns', *ary)
+    self
+  end
+  alias config_columns configcolumns
+
+  def configrowlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] 
+    ary = []
+    lst.slice(3){|idx, opt, val|
+      ary << _to_idx(idx) << "-#{opt}" << val
+    }
+    tk_send('configrowlist', ary)
+    self
+  end
+  alias config_rowlist configrowlist
+
+  def configrows(*args) # args ==> idx, opt, val, idx, opt, val, ...
+    ary = []
+    args.slice(3){|idx, opt, val|
+      ary << _to_idx(idx) << "-#{opt}" << val
+    }
+    tk_send('configrows', *ary)
+    self
+  end
+  alias config_rows configrows
+
   def containing(y)
     idx = num_or_str(tk_send('containing', y))
     (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
@@ -326,7 +488,7 @@ class Tk::Tcllib::Tablelist
     idx = _from_idx(tk_send('containingcell', x, y))
     if idx.kind_of?(Array)
       [
-        ((idx[0].kind_of?(Fixnum) && idx[0] < 0)?  nil: idx[0]), 
+        ((idx[0].kind_of?(Fixnum) && idx[0] < 0)?  nil: idx[0]),
         ((idx[1].kind_of?(Fixnum) && idx[1] < 0)?  nil: idx[1])
       ]
     else
@@ -380,6 +542,10 @@ class Tk::Tcllib::Tablelist
   end
   alias editcell edit_cell
 
+  def editwintag
+    TkBindTag.new_by_name(tk_send('editwintag'))
+  end
+
   def editwinpath
     window(tk_send('editwinpath'))
   end
@@ -400,6 +566,11 @@ class Tk::Tcllib::Tablelist
   end
   alias finishediting finish_editing
 
+  def formatinfo
+    key, row, col = simplelist(tk_send('formatinfo'))
+    [key, number(row), number(col)]
+  end
+
   def get(first, last=nil)
     if first.kind_of?(Array)
       simplelist(tk_send('get', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
@@ -443,6 +614,22 @@ class Tk::Tcllib::Tablelist
   end
   alias getkeys get_keys
 
+  def has_attrib?(name)
+    bool(tk_send('hasattrib', name))
+  end
+
+  def has_cellattrib?(idx, name)
+    bool(tk_send('hascellattrib', _to_idx(idx), name))
+  end
+
+  def has_columnattrib?(idx, name)
+    bool(tk_send('hascolumnattrib', _to_idx(idx), name))
+  end
+
+  def has_rowattrib?(idx, name)
+    bool(tk_send('hasrowattrib', _to_idx(idx), name))
+  end
+
   def imagelabelpath(idx)
     window(tk_send('imagelabelpath', _to_idx(idx)))
   end
@@ -474,6 +661,16 @@ class Tk::Tcllib::Tablelist
   end
   alias insertlist insert_list
 
+  def is_elem_snipped?(cellidx, tkvar)
+    bool(tk_send('iselemsnipped', _to_idx(cellidx), tkvar))
+  end
+  alias elem_snipped? is_elem_snipped?
+
+  def is_title_snipped?(colidx, tkvar)
+    bool(tk_send('istitlesnipped', _to_idx(colidx), tkvar))
+  end
+  alias title_snipped? is_title_snipped?
+
   def itemlistvar
     TkVarAccess.new(tk_send('itemlistvar'))
   end
@@ -486,6 +683,10 @@ class Tk::Tcllib::Tablelist
     simplelist(tk_send('labels'))
   end
 
+  def labeltag
+    TkBindTag.new_by_name(tk_send('labeltag'))
+  end
+
   def move(src, target)
     tk_send('move', _to_idx(src), _to_idx(target))
     self
@@ -523,6 +724,23 @@ class Tk::Tcllib::Tablelist
   end
   alias resetsortinfo reset_sortinfo
 
+  def get_rowattrib(name=nil)
+    if name && name != None
+      tk_send('rowattrib', name)
+    else
+      ret = []
+      lst = simplelist(tk_send('rowattrib'))
+      until lst.empty?
+        ret << ( [lst.shift] << lst.shift )
+      end
+      ret
+    end
+  end
+  def set_rowattrib(*args)
+    tk_send('rowattrib', *(args.flatten))
+    self
+  end
+
   def scan_mark(x, y)
     tk_send('scan', 'mark', x, y)
     self
@@ -621,7 +839,22 @@ class Tk::Tcllib::Tablelist
     self
   end
 
-  DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn'
+
+  # default of 'labelcommand' option
+  DEFAULT_labelcommand_value = 
+    DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn'
+
+  # default of 'labelcommand2' option
+  DEFAULT_labelcommand2_value = 
+    DEFAULT_addToSortColumns_cmd = '::tablelist::addToSortColumns'
+
+  def sortByColumn_with_event_generate(idx)
+    tk_call('::tablelist::sortByColumn', @path, _to_idx(idx))
+  end
+
+  def addToSortColumns_with_event_generate(idx)
+    tk_call('::tablelist::addToSortColumns', @path, _to_idx(idx))
+  end
 
   def sort_by_column(idx, order=nil)
     if order
@@ -647,15 +880,49 @@ class Tk::Tcllib::Tablelist
     self
   end
 
+  def sort_by_columnlist(idxlist, orderlist=None)
+    # orderlist :: list of 'increasing' or 'decreasing'
+    tk_send('sortbycolumnlist', idxlist.map{|idx| _to_idx(idx)}, orderlist)
+    self
+  end
+
   def sortcolumn
     idx = num_or_str(tk_send('sortcolum'))
     (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
   end
 
+  def sortcolumnlist
+    simplelist(tk_send('sortcolumlist')).map{|col| num_or_str(col)}
+  end
+
   def sortorder
     tk_send('sortorder')
   end
 
+  def sortorderlist
+    simplelist(tk_send('sortorderlist'))
+  end
+
+  def toggle_columnhide(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('togglecolumnhide', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('togglecolumnhide', first, last)
+    end
+  end
+
+  def toggle_rowhide(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('togglerowhide', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('togglerowhide', first, last)
+    end
+  end
+
   def toggle_visibility(first, last=nil)
     if first.kind_of?(Array)
       tk_send('togglevisibility', first.collect{|idx| _to_idx(idx)})
@@ -668,6 +935,26 @@ class Tk::Tcllib::Tablelist
   end
   alias togglevisibility toggle_visibility
 
+  def unset_attrib(name)
+    tk_send('unsetattrib', name)
+    self
+  end
+
+  def unset_cellattrib(idx, name)
+    tk_send('unsetcellattrib', _to_idx(idx), name)
+    self
+  end
+
+  def unset_columnattrib(idx, name)
+    tk_send('unsetcolumnattrib', _to_idx(idx), name)
+    self
+  end
+
+  def unset_rowattrib(idx, name)
+    tk_send('unsetrowattrib', _to_idx(idx), name)
+    self
+  end
+
   def windowpath(idx)
     window(tk_send('windowpath', _to_idx(idx)))
   end
@@ -680,13 +967,18 @@ class << Tk::Tcllib::Tablelist
     window(Tk.tk_call('::tablelist::getTablelistPath', descendant))
   end
 
+  def getTablelistColumn(descendant)
+    num_or_str(Tk.tk_call('::tablelist::getTablelistColumn', headerlabel))
+  end
+
+
   def convEventFields(descendant, x, y)
     window(Tk.tk_call('::tablelist::convEventFields', descendant, x, y))
   end
 
 
   ############################################################
-  # with the BWidget package 
+  # with the BWidget package
   def addBWidgetEntry(name=None)
     Tk.tk_call('::tablelist::addBWidgetEntry', name)
   end
@@ -701,7 +993,7 @@ class << Tk::Tcllib::Tablelist
 
 
   ############################################################
-  # with the Iwidgets ([incr Widgets]) package 
+  # with the Iwidgets ([incr Widgets]) package
   def addIncrEntryfield(name=None)
     Tk.tk_call('::tablelist::addIncrEntry', name)
   end
@@ -755,6 +1047,16 @@ class << Tk::Tcllib::Tablelist
     Tk.tk_call('::tablelist::addTimeMentry', format, separator, gmt, name)
   end
 
+  def addDateTimeMentry(format, date_sep, time_sep, gmt=false, name=None)
+    if gmt && gmt != None
+      gmt = '-gmt'
+    else
+      gmt = None
+    end
+    Tk.tk_call('::tablelist::addDateTimeMentry', 
+               format, date_sep, time_sep, gmt, name)
+  end
+
   def addFixedPointMentry(count1, count2, comma=false, name=None)
     if comma && comma != None
       comma = '-comma'
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
index 0cb4eb735d..0a1458415e 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
@@ -9,7 +9,7 @@ require 'tk'
 require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('tablelist_tile', '4.2')
-TkPackage.require('Tablelist_tile')
+TkPackage.require('tablelist_tile')
 
 unless defined? Tk::Tcllib::Tablelist_usingTile
   Tk::Tcllib::Tablelist_usingTile = true
@@ -19,6 +19,24 @@ requrie 'tkextlib/tcllib/tablelist_core'
 
 module Tk
   module Tcllib
+    class Tablelist
+      # commands related to tile Themems
+      def self.set_theme(theme)
+        Tk.tk_call('::tablelist::setTheme', theme)
+      end
+
+      def self.get_current_theme
+        Tk.tk_call('::tablelist::getCurrentTheme')
+      end
+
+      def self.get_theme_list
+        TkComm.simplelist(Tk.tk_call('::tablelist::getThemes'))
+      end
+      def self.set_theme_defaults
+        Tk.tk_call('::tablelist::setThemeDefaults')
+      end
+    end
+
     Tablelist_Tile = Tablelist
     TableList_Tile = Tablelist
   end
diff --git a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
index 92dde65ce7..2f6e4b44fc 100644
--- a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
@@ -52,7 +52,7 @@ module Tk::Tcllib::Tkpiechart
     private :__config_cmd
 
     def __configinfo_struct
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
         :default_value=>1, :current_value=>2}
     end
     private :__configinfo_struct
@@ -63,7 +63,7 @@ module Tk::Tcllib::Tkpiechart
     private :__boolval_optkeys
 
     def __strval_optkeys
-      super() << 'bordercolor' << 'textbackground' << 
+      super() << 'bordercolor' << 'textbackground' <<
         'widestvaluetext' << 'title'
     end
     private :__strval_optkeys
@@ -90,7 +90,7 @@ module Tk::Tcllib::Tkpiechart
 
     def create_self(x, y, width, height, keys=None)
       if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new', 'pie', 
+        @tag_key = tk_call_without_enc('::stooop::new', 'pie',
                                        @c, x, y, *hash_kv(keys, true))
       else
         @tag_key = tk_call_without_enc('::stooop::new', 'pie', @c, x, y)
@@ -125,7 +125,9 @@ module Tk::Tcllib::Tkpiechart
 
     def delete
       tk_call_without_enc('::stooop::delete', @tag_key)
-      CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+      CItemID_TBL.mutex.synchronize{
+        CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+      }
       self
     end
 
@@ -146,7 +148,7 @@ module Tk::Tcllib::Tkpiechart
     end
 
     def selected_slices
-      tk_split_simplelist(tk_call_without_enc('pie::selectedSlices', 
+      tk_split_simplelist(tk_call_without_enc('pie::selectedSlices',
                                               @tag_key)).collect{|slice|
         @slice_tbl[slice] || Slice.new(:no_create, self, slice)
       }
@@ -184,8 +186,10 @@ module Tk::Tcllib::Tkpiechart
       @id = "slices(#{@tag_key})"
       @tag = TkcNamedTag.new(@pie.canvas, @id)
 
-      CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
-      CItemID_TBL[@path][@id] = self
+      CItemID_TBL.mutex.synchronize{
+        CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
+        CItemID_TBL[@path][@id] = self
+      }
     end
 
     def tag_key
@@ -200,13 +204,15 @@ module Tk::Tcllib::Tkpiechart
 
     def delete
       tk_call_without_enc('pie::deleteSlice', @pie.tag_key, @tag_key)
-      CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+      CItemID_TBL.mutex.synchronize{
+        CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+      }
       @pie._delete_slice(self)
       self
     end
 
     def size(share, disp=None)
-      tk_call_without_enc('pie::sizeSlice', 
+      tk_call_without_enc('pie::sizeSlice',
                           @pie.tag_key, @tag_key, share, disp)
       self
     end
@@ -230,7 +236,7 @@ module Tk::Tcllib::Tkpiechart
 
     def create_self(keys=None)
       if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler', 
+        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler',
                                        *hash_kv(keys, true))
       else
         @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler')
@@ -262,8 +268,8 @@ module Tk::Tcllib::Tkpiechart
 
     def create_self(keys=None)
       if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new', 
-                                       'piePeripheralLabeler', 
+        @tag_key = tk_call_without_enc('::stooop::new',
+                                       'piePeripheralLabeler',
                                        *hash_kv(keys, true))
       else
         @tag_key = tk_call_without_enc('::stooop::new', 'piePeripheralLabeler')
@@ -290,11 +296,11 @@ module Tk::Tcllib::Tkpiechart
 
     def create_self(x, y, keys=None)
       if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel', 
-                                       @c, x, y, width, height, 
+        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
+                                       @c, x, y, width, height,
                                        *hash_kv(keys, true))
       else
-        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel', 
+        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
                                        @c, x, y, width, height)
       end
 
diff --git a/ext/tk/lib/tkextlib/tcllib/toolbar.rb b/ext/tk/lib/tkextlib/tcllib/toolbar.rb
new file mode 100644
index 0000000000..6eae4eb3e1
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/toolbar.rb
@@ -0,0 +1,175 @@
+#
+#  tkextlib/tcllib/toolbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * toolbar widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::toolbar', '1.2')
+TkPackage.require('widget::toolbar')
+
+module Tk::Tcllib
+  module Widget
+    class Toolbar < TkWindow
+      PACKAGE_NAME = 'widget::toolbar'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::toolbar')
+        rescue
+          ''
+        end
+      end
+    end
+
+    module ToolbarItemConfig
+      include TkItemConfigMethod
+    end
+  end
+end
+
+
+class Tk::Tcllib::Widget::ToolbarItem < TkObject
+  include TkTreatTagFont
+
+  ToolbarItemID_TBL = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{
+    TTagID_TBL.mutex.synchronize{ TTagID_TBL.clear }
+  }
+
+  def ToolbarItem.id2obj(tbar, id)
+    tpath = tbar.path
+    ToolbarItemID_TBL.mutex.synchronize{
+      if ToolbarItemID_TBL[tpath]
+        ToolbarItemID_TBL[tpath][id]? ToolbarItemID_TBL[tpath][id]: id
+      else
+        id
+      end
+    }
+  end
+
+  def initaialize(parent, *args)
+    @parent = @t = parent
+    @tpath = parent.path
+
+    @path = @id = @t.tk_send('add', *args)
+    # A same id is rejected by the Tcl function.
+
+    ToolbarItemID_TBL.mutex.synchronize{
+      ToolbarItemID_TBL[@id] = self
+      ToolbarItemID_TBL[@tpath] = {} unless ToolbarItemID_TBL[@tpath]
+      ToolbarItemID_TBL[@tpath][@id] = self
+    }
+  end
+
+  def [](key)
+    cget key
+  end
+
+  def []=(key,val)
+    configure key, val
+    val
+  end
+
+  def cget_tkstring(option)
+    @t.itemcget_tkstring(@id, option)
+  end
+  def cget(option)
+    @t.itemcget(@id, option)
+  end
+  def cget_strict(option)
+    @t.itemcget_strict(@id, option)
+  end
+
+  def configure(key, value=None)
+    @t.itemconfigure(@id, key, value)
+    self
+  end
+
+  def configinfo(key=nil)
+    @t.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @t.current_itemconfiginfo(@id, key)
+  end
+
+  def delete
+    @t.delete(@id)
+  end
+
+  def itemid
+    @t.itemid(@id)
+  end
+
+  def remove
+    @t.remove(@id)
+  end
+  def remove_with_destroy
+    @t.remove_with_destroy(@id)
+  end
+end
+
+class Tk::Tcllib::Widget::Toolbar
+  include Tk::Tcllib::Widget::ToolbarItemConfig
+
+  TkCommandNames = ['::widget::toolbar'.freeze].freeze
+
+  def __destroy_hook__
+    Tk::Tcllib::Widget::ToolbarItem::ToolbarItemID_TBL.mutex.synchronize{
+      Tk::Tcllib::Widget::ToolbarItem::ToolbarItemID_TBL.delete(@path)
+    }
+  end
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def getframe
+    window(tk_send('getframe'))
+  end
+  alias get_frame getframe
+
+  def add(*args)
+    Tk::Tcllib::Widget::Toolbar.new(self, *args)
+  end
+
+  def itemid(item)
+    window(tk_send('itemid'))
+  end
+
+  def items(pattern)
+    tk_split_simplelist(tk_send('items', pattern)).map{|id|
+      Tk::Tcllib::Widget::ToolbarItem.id2obj(self, id)
+    }
+  end
+
+  def remove(*items)
+    tk_send('remove', *items)
+    self
+  end
+
+  def remove_with_destroy(*items)
+    tk_send('remove', '-destroy', *items)
+    self
+  end
+
+  def delete(*items)
+    tk_send('delete', *items)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/tooltip.rb b/ext/tk/lib/tkextlib/tcllib/tooltip.rb
index 4301b39fd3..070e63a7b5 100644
--- a/ext/tk/lib/tkextlib/tcllib/tooltip.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tooltip.rb
@@ -3,7 +3,7 @@
 #                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
 #   * Part of tcllib extension
-#   * Provides tooltips, a small text message that is displayed when the 
+#   * Provides tooltips, a small text message that is displayed when the
 #     mouse hovers over a widget.
 #
 
@@ -34,6 +34,8 @@ module Tk::Tcllib::Tooltip
   extend TkCore
 
   WidgetClassName = 'Tooltip'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
   def self.database_classname
     self::WidgetClassName
   end
@@ -64,6 +66,13 @@ module Tk::Tcllib::Tooltip
     self.delay(millisecs)
   end
 
+  def self.fade?
+    bool(tk_call_without_enc('::tooltip::tooltip', 'fade'))
+  end
+  def self.fade(mode)
+    tk_call_without_enc('::tooltip::tooltip', 'fade', mode)
+  end
+
   def self.disable
     tk_call_without_enc('::tooltip::tooltip', 'disable')
     false
@@ -86,7 +95,7 @@ module Tk::Tcllib::Tooltip
     else
       args = msg
     end
-    tk_call_without_enc('::tooltip::tooltip', widget.path, *args)
+    tk_call('::tooltip::tooltip', widget.path, *args)
   end
 
   def self.erase(widget)
diff --git a/ext/tk/lib/tkextlib/tcllib/widget.rb b/ext/tk/lib/tkextlib/tcllib/widget.rb
index ed69f67ce6..57fdf7a575 100644
--- a/ext/tk/lib/tkextlib/tcllib/widget.rb
+++ b/ext/tk/lib/tkextlib/tcllib/widget.rb
@@ -26,10 +26,41 @@ module Tk::Tcllib
         ''
       end
     end
+
+    #--- followings may be private functions of tklib
+    def self.isa(compare_as, *args)
+      begin
+        return Tk.tk_call('::widget::isa', compare_as, *args)
+      rescue => e
+        if TkComm.bool(Tk.tk_call('info','command','::widget::isa')) ||
+            ! TkComm.bool(Tk.tk_call('info','command','::widget::validate'))
+          fail e
+        end
+      end
+      Tk.tk_call('::widget::validate', compare_as, *args)
+    end
+    def self.validate(compare_as, *args)
+      begin
+        return Tk.tk_call('::widget::validate', compare_as, *args)
+      rescue => e
+        if TkComm.bool(Tk.tk_call('info','command','::widget::validate')) ||
+            ! TkComm.bool(Tk.tk_call('info','command','::widget::isa'))
+          fail e
+        end
+      end
+      Tk.tk_call('::widget::isa', compare_as, *args)
+    end
   end
 end
 
 module Tk::Tcllib::Widget
+  TkComm::TkExtlibAutoloadModule.unshift(self)
+
+  autoload :Calendar,           'tkextlib/tcllib/calendar'
+
+  autoload :Canvas_Sqmap,       'tkextlib/tcllib/canvas_sqmap'
+  autoload :Canvas_Zoom,        'tkextlib/tcllib/canvas_zoom'
+
   autoload :Dialog,             'tkextlib/tcllib/dialog'
 
   autoload :Panelframe,         'tkextlib/tcllib/panelframe'
@@ -45,4 +76,7 @@ module Tk::Tcllib::Widget
 
   autoload :Superframe,         'tkextlib/tcllib/superframe'
   autoload :SuperFrame,         'tkextlib/tcllib/superframe'
+
+  autoload :Toolbar,            'tkextlib/tcllib/toolbar'
+  autoload :ToolbarItem,        'tkextlib/tcllib/toolbar'
 end
diff --git a/ext/tk/lib/tkextlib/tclx/setup.rb b/ext/tk/lib/tkextlib/tclx/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tclx/setup.rb
+++ b/ext/tk/lib/tkextlib/tclx/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tile.rb b/ext/tk/lib/tkextlib/tile.rb
index acc7bebe4e..6c11e212ae 100644
--- a/ext/tk/lib/tkextlib/tile.rb
+++ b/ext/tk/lib/tkextlib/tile.rb
@@ -4,6 +4,7 @@
 #
 
 require 'tk'
+require 'tk/ttk_selector'
 
 # call setup script for general 'tkextlib' libraries
 require 'tkextlib/setup.rb'
@@ -15,33 +16,93 @@ require 'tkextlib/tile/setup.rb'
 # TkPackage.require('tile', '0.4')
 # TkPackage.require('tile', '0.6')
 # TkPackage.require('tile', '0.7')
-verstr = TkPackage.require('tile')
-ver = verstr.split('.')
-if ver[0].to_i == 0 && ver[1].to_i <= 4
-  # version 0.4 or former
+if Tk::TK_MAJOR_VERSION > 8 ||
+    (Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION >= 5)
+  begin
+    TkPackage.require('tile') # for compatibility (version check of 'tile')
+  rescue RuntimeError
+    # ignore, even if cannot find package 'tile'
+  end
+  pkgname = 'Ttk'
+else
+  pkgname = 'tile'
+end
+
+begin
+  verstr = TkPackage.require(pkgname)
+rescue RuntimeError
+  # define dummy methods
   module Tk
     module Tile
-      USE_TILE_NAMESPACE = true
-      USE_TTK_NAMESPACE  = false
-      TILE_SPEC_VERSION_ID = 0
+      CANNOT_FIND_PACKAGE = true
+      def self.const_missing(sym)
+        TkPackage.require(PACKAGE_NAME)
+      end
+      def self.method_missing(*args)
+        TkPackage.require(PACKAGE_NAME)
+      end
     end
   end
-elsif ver[0].to_i == 0 && ver[1].to_i <= 6
-  # version 0.5 -- version 0.6
-  module Tk
-    module Tile
-      USE_TILE_NAMESPACE = true
-      USE_TTK_NAMESPACE  = true
-      TILE_SPEC_VERSION_ID = 5
+  Tk.__cannot_find_tk_package_for_widget_set__(:Ttk, pkgname)
+  if pkgname == 'Ttk'
+    verstr = Tk::TK_PATCHLEVEL  # dummy
+  else
+    verstr = '0.7'  # dummy
+  end
+end
+
+ver = verstr.split('.')
+if ver[0].to_i == 0
+  # Tile extension package
+  if ver[1].to_i <= 4
+    # version 0.4 or former
+    module Tk
+      module Tile
+        USE_TILE_NAMESPACE = true
+        USE_TTK_NAMESPACE  = false
+        TILE_SPEC_VERSION_ID = 0
+      end
     end
+  elsif ver[1].to_i <= 6
+    # version 0.5 -- version 0.6
+    module Tk
+      module Tile
+        USE_TILE_NAMESPACE = true
+        USE_TTK_NAMESPACE  = true
+        TILE_SPEC_VERSION_ID = 5
+      end
+    end
+  elsif ver[1].to_i <= 7
+    module Tk
+      module Tile
+        USE_TILE_NAMESPACE = false
+        USE_TTK_NAMESPACE  = true
+        TILE_SPEC_VERSION_ID = 7
+      end
+    end
+  else
+    # version 0.8 or later
+    module Tk
+      module Tile
+        USE_TILE_NAMESPACE = false
+        USE_TTK_NAMESPACE  = true
+        TILE_SPEC_VERSION_ID = 8
+      end
+    end
+  end
+
+  module Tk::Tile
+    PACKAGE_NAME = 'tile'.freeze
   end
 else
-  # version 0.7 or later
+  # Ttk package merged Tcl/Tk core (Tcl/Tk 8.5+)
   module Tk
     module Tile
       USE_TILE_NAMESPACE = false
       USE_TTK_NAMESPACE  = true
-      TILE_SPEC_VERSION_ID = 7
+      TILE_SPEC_VERSION_ID = 8
+
+      PACKAGE_NAME = 'Ttk'.freeze
     end
   end
 end
@@ -51,30 +112,114 @@ module Tk
   module Tile
     TkComm::TkExtlibAutoloadModule.unshift(self)
 
-    PACKAGE_NAME = 'tile'.freeze
     def self.package_name
       PACKAGE_NAME
     end
 
     def self.package_version
       begin
-        TkPackage.require('tile')
+        TkPackage.require(PACKAGE_NAME)
       rescue
         ''
       end
     end
 
     def self.__Import_Tile_Widgets__!
+      warn 'Warning: "Tk::Tile::__Import_Tile_Widgets__!" is obsolete.' <<
+           ' To control default widget set, use "Tk.default_widget_set = :Ttk"'
       Tk.tk_call('namespace', 'import', '-force', 'ttk::*')
     end
 
-    def self.load_images(imgdir, pat=TkComm::None)
-      images = Hash[*TkComm.simplelist(Tk.tk_call('::tile::LoadImages', 
-                                                  imgdir, pat))]
-      images.keys.each{|k|
-        images[k] = TkPhotoImage.new(:imagename=>images[k], 
-                                     :without_creating=>true)
+    def self.__define_LoadImages_proc_for_compatibility__!
+      # Ttk 8.5 (Tile 0.8) lost 'LoadImages' utility procedure.
+      # So, some old scripts doen't work, because those scripts use the
+      # procedure to define local styles.
+      # Of course, rewriting such Tcl/Tk scripts isn't difficult for
+      # Tcl/Tk users. However, it may be troublesome for Ruby/Tk users
+      # who use such Tcl/Tk scripts as it is.
+      # This method may help Ruby/Tk users who don't want to modify old
+      # Tcl/Tk scripts for the latest version of Ttk (Tile) extension.
+      # This method defines a comaptible 'LoadImages' procedure on the
+      # Tcl/Tk interpreter working under Ruby/Tk.
+      # Please give attention to use this method. It may conflict with
+      # some definitions on Tcl/Tk scripts.
+      klass_name = self.name
+      proc_name = 'LoadImages'
+      if Tk::Tile::USE_TTK_NAMESPACE
+        ns_list = ['::tile']
+        if Tk.info(:commands, "::ttk::#{proc_name}").empty?
+          ns_list << '::ttk'
+        end
+      else # Tk::Tile::USE_TILE_NAMESPACE
+        ns_list = ['::ttk']
+        if Tk.info(:commands, "::tile::#{proc_name}").empty?
+          ns_list << '::tile'
+        end
+      end
+
+      ns_list.each{|ns|
+        cmd = "#{ns}::#{proc_name}"
+        unless Tk.info(:commands, cmd).empty?
+          #fail RuntimeError, "can't define '#{cmd}' command (already exist)"
+
+          # do nothing !!!
+          warn "Warning: can't define '#{cmd}' command (already exist)" if $DEBUG
+          next
+        end
+        TkNamespace.eval(ns){
+          TkCore::INTERP.add_tk_procs(proc_name, 'imgdir {patterns {*.gif}}',
+                                      <<-'EOS')
+            foreach pattern $patterns {
+              foreach file [glob -directory $imgdir $pattern] {
+                set img [file tail [file rootname $file]]
+                if {![info exists images($img)]} {
+                  set images($img) [image create photo -file $file]
+                }
+              }
+            }
+            return [array get images]
+          EOS
+        }
       }
+    end
+
+    def self.load_images(imgdir, pat=nil)
+      if Tk::Tile::TILE_SPEC_VERSION_ID < 8
+        if Tk::Tile::USE_TTK_NAMESPACE
+          cmd = '::ttk::LoadImages'
+        else # Tk::Tile::USE_TILE_NAMESPACE
+          cmd = '::tile::LoadImages'
+        end
+        pat ||= TkComm::None
+        images = Hash[*TkComm.simplelist(Tk.tk_call(cmd, imgdir, pat))]
+        images.keys.each{|k|
+          images[k] = TkPhotoImage.new(:imagename=>images[k],
+                                       :without_creating=>true)
+        }
+      else ## TILE_SPEC_VERSION_ID >= 8
+        pat ||= '*.gif'
+        if pat.kind_of?(Array)
+          pat_list = pat
+        else
+          pat_list = [ pat ]
+        end
+        Dir.chdir(imgdir){
+          pat_list.each{|pat|
+            Dir.glob(pat).each{|f|
+              img = File.basename(f, '.*')
+              unless TkComm.bool(Tk.info('exists', "images(#{img})"))
+                Tk.tk_call('set', "images(#{img})",
+                           Tk.tk_call('image', 'create', 'photo', '-file', f))
+              end
+            }
+          }
+        }
+        images = Hash[*TkComm.simplelist(Tk.tk_call('array', 'get', 'images'))]
+        images.keys.each{|k|
+          images[k] = TkPhotoImage.new(:imagename=>images[k],
+                                       :without_creating=>true)
+        }
+      end
 
       images
     end
@@ -83,12 +228,53 @@ module Tk
       args.map!{|arg| TkComm._get_eval_string(arg)}.join('.')
     end
 
-    module KeyNav
-      def self.enableMnemonics(w)
-        Tk.tk_call('::keynav::enableMnemonics', w)
+    def self.themes(glob_ptn = nil)
+      if TILE_SPEC_VERSION_ID < 8 && Tk.info(:commands, '::ttk::themes').empty?
+        fail RuntimeError, 'not support glob option' if glob_ptn
+        cmd = ['::tile::availableThemes']
+      else
+        glob_ptn = '*' unless glob_ptn
+        cmd = ['::ttk::themes', glob_ptn]
       end
-      def self.defaultButton(w)
-        Tk.tk_call('::keynav::defaultButton', w)
+
+      begin
+        TkComm.simplelist(Tk.tk_call_without_enc(*cmd))
+      rescue
+        TkComm.simplelist(Tk.tk_call('lsearch', '-all', '-inline',
+                                     Tk::Tile::Style.theme_names,
+                                     glob_ptn))
+      end
+    end
+
+    def self.set_theme(theme)
+      if TILE_SPEC_VERSION_ID < 8 && Tk.info(:commands, '::ttk::setTheme').empty?
+        cmd = '::tile::setTheme'
+      else
+        cmd = '::ttk::setTheme'
+      end
+
+      begin
+        Tk.tk_call_without_enc(cmd, theme)
+      rescue
+        Tk::Tile::Style.theme_use(theme)
+      end
+    end
+
+    module KeyNav
+      if Tk::Tile::TILE_SPEC_VERSION_ID < 8
+        def self.enableMnemonics(w)
+          Tk.tk_call('::keynav::enableMnemonics', w)
+        end
+        def self.defaultButton(w)
+          Tk.tk_call('::keynav::defaultButton', w)
+        end
+      else # dummy
+        def self.enableMnemonics(w)
+          ""
+        end
+        def self.defaultButton(w)
+          ""
+        end
       end
     end
 
@@ -103,6 +289,12 @@ module Tk
       Menu         = 'TkMenuFont'
       SmallCaption = 'TkSmallCaptionFont'
       Icon         = 'TkIconFont'
+
+      TkFont::SYSTEM_FONT_NAMES.add [
+        'TkDefaultFont', 'TkTextFont', 'TkHeadingFont',
+        'TkCaptionFont', 'TkTooltipFont', 'TkFixedFont',
+        'TkMenuFont', 'TkSmallCaptionFont', 'TkIconFont'
+      ]
     end
 
     module ParseStyleLayout
@@ -115,7 +307,7 @@ module Tk
           until lst.empty?
             if lst[0][0] == ?-
               k = lst.shift[1..-1]
-              children = lst.shift 
+              children = lst.shift
               children = _style_layout(children) if children.kind_of?(Array)
               keys[k] = children
             else
@@ -141,7 +333,7 @@ module Tk
       end
       private :__val2ruby_optkeys
 
-      def instate(state, script=nil, &b)
+      def ttk_instate(state, script=nil, &b)
         if script
           tk_send('instate', state, script)
         elsif b
@@ -150,19 +342,30 @@ module Tk
           bool(tk_send('instate', state))
         end
       end
+      alias tile_instate ttk_instate
 
-      def state(state=nil)
+      def ttk_state(state=nil)
         if state
           tk_send('state', state)
         else
           list(tk_send('state'))
         end
       end
+      alias tile_state ttk_state
 
-      def identify(x, y)
+      def ttk_identify(x, y)
         ret = tk_send_without_enc('identify', x, y)
         (ret.empty?)? nil: ret
       end
+      alias tile_identify ttk_identify
+
+      # remove instate/state/identify method
+      # to avoid the conflict with widget options
+      if Tk.const_defined?(:USE_OBSOLETE_TILE_STATE_METHOD) && Tk::USE_OBSOLETE_TILE_STATE_METHOD
+        alias instate  ttk_instate
+        alias state    ttk_state
+        alias identify ttk_identify
+      end
     end
 
     ######################################
@@ -188,18 +391,24 @@ module Tk
 
     autoload :TLabelframe,   'tkextlib/tile/tlabelframe'
     autoload :Labelframe,    'tkextlib/tile/tlabelframe'
+    autoload :TLabelFrame,   'tkextlib/tile/tlabelframe'
+    autoload :LabelFrame,    'tkextlib/tile/tlabelframe'
 
     autoload :TLabel,        'tkextlib/tile/tlabel'
     autoload :Label,         'tkextlib/tile/tlabel'
 
     autoload :TMenubutton,   'tkextlib/tile/tmenubutton'
     autoload :Menubutton,    'tkextlib/tile/tmenubutton'
+    autoload :TMenuButton,   'tkextlib/tile/tmenubutton'
+    autoload :MenuButton,    'tkextlib/tile/tmenubutton'
 
     autoload :TNotebook,     'tkextlib/tile/tnotebook'
     autoload :Notebook,      'tkextlib/tile/tnotebook'
 
     autoload :TPaned,        'tkextlib/tile/tpaned'
     autoload :Paned,         'tkextlib/tile/tpaned'
+    autoload :PanedWindow,   'tkextlib/tile/tpaned'
+    autoload :Panedwindow,   'tkextlib/tile/tpaned'
 
     autoload :TProgressbar,  'tkextlib/tile/tprogressbar'
     autoload :Progressbar,   'tkextlib/tile/tprogressbar'
@@ -216,15 +425,25 @@ module Tk
 
     autoload :TScrollbar,    'tkextlib/tile/tscrollbar'
     autoload :Scrollbar,     'tkextlib/tile/tscrollbar'
+    autoload :XScrollbar,    'tkextlib/tile/tscrollbar'
+    autoload :YScrollbar,    'tkextlib/tile/tscrollbar'
 
     autoload :TSeparator,    'tkextlib/tile/tseparator'
     autoload :Separator,     'tkextlib/tile/tseparator'
 
+    autoload :TSpinbox,      'tkextlib/tile/tspinbox'
+    autoload :Spinbox,       'tkextlib/tile/tspinbox'
+
     autoload :TSquare,       'tkextlib/tile/tsquare'
     autoload :Square,        'tkextlib/tile/tsquare'
 
+    autoload :SizeGrip,      'tkextlib/tile/sizegrip'
+    autoload :Sizegrip,      'tkextlib/tile/sizegrip'
+
     autoload :Treeview,      'tkextlib/tile/treeview'
 
     autoload :Style,         'tkextlib/tile/style'
   end
 end
+
+Ttk = Tk::Tile
diff --git a/ext/tk/lib/tkextlib/tile/dialog.rb b/ext/tk/lib/tkextlib/tile/dialog.rb
index b10378d7de..b112e6152b 100644
--- a/ext/tk/lib/tkextlib/tile/dialog.rb
+++ b/ext/tk/lib/tkextlib/tile/dialog.rb
@@ -12,6 +12,12 @@ module Tk
   end
 end
 
+begin
+  TkPackage.require('ttk::dialog') # this may be required.
+rescue RuntimeError
+  # ignore
+end
+
 class Tk::Tile::Dialog
   TkCommandNames = ['::ttk::dialog'.freeze].freeze
 
@@ -54,9 +60,21 @@ class Tk::Tile::Dialog
     window(tk_call_without_enc('::ttk::dialog::clientframe', @path))
   end
 
+  def cget_strict(slot)
+    @keys[slot.to_s]
+  end
   def cget(slot)
-    @keys[slot]
+    @keys[slot.to_s]
+  end
+=begin
+  def cget(slot)
+    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      cget_strict(slot)
+    else
+      cget_strict(slot) rescue nil
+    end
   end
+=end
 
   def configure(slot, value=None)
     if slot.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/tile/setup.rb b/ext/tk/lib/tkextlib/tile/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tile/setup.rb
+++ b/ext/tk/lib/tkextlib/tile/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ext/tk/lib/tkextlib/tile/sizegrip.rb
index ea796583b0..d7da0a4075 100644
--- a/ext/tk/lib/tkextlib/tile/sizegrip.rb
+++ b/ext/tk/lib/tkextlib/tile/sizegrip.rb
@@ -9,6 +9,7 @@ module Tk
   module Tile
     class SizeGrip < TkWindow
     end
+    Sizegrip = SizeGrip
   end
 end
 
@@ -17,9 +18,15 @@ class Tk::Tile::SizeGrip < TkWindow
 
   TkCommandNames = ['::ttk::sizegrip'.freeze].freeze
   WidgetClassName = 'TSizegrip'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Sizegrip,
+#                            :TkSizegrip, :TkSizeGrip)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/sizegrip.rb',
+                                   :Ttk, Tk::Tile::Sizegrip, 
+                                   :TkSizegrip, :TkSizeGrip)
diff --git a/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb
index 59bc4b0d78..f38deda503 100644
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ b/ext/tk/lib/tkextlib/tile/style.rb
@@ -17,6 +17,145 @@ module Tk::Tile::Style
 end
 
 class << Tk::Tile::Style
+  if Tk::Tile::TILE_SPEC_VERSION_ID < 8
+    TkCommandNames = ['style'.freeze].freeze
+
+    # --- Tk::Tile::Style.__define_wrapper_proc_for_compatibility__! ---
+    # On Ttk (Tile) extension, 'style' command has imcompatible changes
+    # depend on the version of the extention. It requires modifying the
+    # Tcl/Tk scripts to define local styles. The rule for modification
+    # is a simple one. But, if users want to keep compatibility between
+    # versions of the extension, they will have to contrive to do that.
+    # It may be troublesome, especially for Ruby/Tk users.
+    # This method may help such work. This method make some definitions
+    # on the Tcl/Tk interpreter to work with different version of style
+    # command format. Please give attention to use this method. It may
+    # conflict with some definitions on Tcl/Tk scripts.
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 7
+      def __define_wrapper_proc_for_compatibility__!
+        __define_themes_and_setTheme_proc__!
+
+        unless Tk.info(:commands, '::ttk::style').empty?
+          # fail RuntimeError,
+          #      "can't define '::ttk::style' command (already exist)"
+
+          # do nothing !!!
+          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
+          return
+        end
+        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
+        if [string equal [lrange $args 0 1] {element create}] {
+          if [string equal [lindex $args 3] image] {
+            set spec [lindex $args 4]
+            set map  [lrange $spec 1 end]
+            if [llength $map] {
+              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
+              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]
+            }
+          }
+        }
+        # return [eval "::style $args"]
+        return [uplevel 1 ::style $args]
+      EOS
+        #########################
+      end
+    else ### TILE_SPEC_VERSION_ID == 7
+      def __define_wrapper_proc_for_compatibility__!
+        __define_themes_and_setTheme_proc__!
+
+        unless Tk.info(:commands, '::ttk::style').empty?
+          # fail RuntimeError,
+          #     "can't define '::ttk::style' command (already exist)"
+
+          # do nothing !!!
+          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
+          return
+        end
+        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
+        if [string equal [lrange $args 0 1] {element create}] {
+          if [string equal [lindex $args 3] image] {
+            set spec [lindex $args 4]
+            set map  [lrange $spec 1 end]
+            if [llength $map] {
+              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
+              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
+            }
+          }
+        } elseif [string equal [lindex $args 0] default] {
+          # return [eval "::style [lreplace $args 0 0 configure]"]
+          return [uplevel 1 ::style [lreplace $args 0 0 configure]]
+        }
+        # return [eval "::style $args"]
+        return [uplevel 1 ::style $args]
+      EOS
+        #########################
+      end
+    end
+  else ### TILE_SPEC_VERSION_ID >= 8
+    TkCommandNames = ['::ttk::style'.freeze].freeze
+
+    def __define_wrapper_proc_for_compatibility__!
+      __define_themes_and_setTheme_proc__!
+
+      unless Tk.info(:commands, '::style').empty?
+        # fail RuntimeError, "can't define '::style' command (already exist)"
+
+        # do nothing !!!
+        warn "Warning: can't define '::style' command (already exist)" if $DEBUG
+        return
+      end
+      TkCore::INTERP.add_tk_procs('::style', 'args', <<-'EOS')
+        if [string equal [lrange $args 0 1] {element create}] {
+          if [string equal [lindex $args 3] image] {
+            set name [lindex $args 4]
+            set opts [lrange $args 5 end]
+            set idx [lsearch $opts -map]
+            if {$idx >= 0 && [expr $idx % 2 == 0]} {
+             # return [eval [concat [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]]
+              return [uplevel 1 [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]
+            }
+          }
+        } elseif [string equal [lindex $args 0] default] {
+          # return [eval "::ttk::style [lreplace $args 0 0 configure]"]
+          return [uplevel 1 ::ttk::style [lreplace $args 0 0 configure]]
+        }
+        # return [eval "::ttk::style $args"]
+        return [uplevel 1 ::ttk::style $args]
+      EOS
+      #########################
+    end
+  end
+
+  def __define_themes_and_setTheme_proc__!
+    TkCore::INTERP.add_tk_procs('::ttk::themes', '{ptn *}', <<-'EOS')
+      #set themes [list]
+      set themes [::ttk::style theme names]
+      foreach pkg [lsearch -inline -all -glob [package names] ttk::theme::$ptn] {
+          set theme [namespace tail $pkg]
+          if {[lsearch -exact $themes $theme] < 0} {
+              lappend themes $theme
+          }
+      }
+      foreach pkg [lsearch -inline -all -glob [package names] tile::theme::$ptn] {
+          set theme [namespace tail $pkg]
+          if {[lsearch -exact $themes $theme] < 0} {
+              lappend themes $theme
+          }
+      }
+      return $themes
+    EOS
+    #########################
+    TkCore::INTERP.add_tk_procs('::ttk::setTheme', 'theme', <<-'EOS')
+      variable currentTheme
+      if {[lsearch -exact [::ttk::style theme names] $theme] < 0} {
+          package require [lsearch -inline -regexp [package names] (ttk|tile)::theme::$theme]
+      }
+      ::ttk::style theme use $theme
+      set currentTheme $theme
+    EOS
+  end
+  private :__define_themes_and_setTheme_proc__!
+
   def configure(style=nil, keys=nil)
     if style.kind_of?(Hash)
       keys = style
@@ -31,9 +170,9 @@ class << Tk::Tile::Style
     end
 
     if keys && keys != None
-      tk_call('style', sub_cmd, style, *hash_kv(keys))
+      tk_call(TkCommandNames[0], sub_cmd, style, *hash_kv(keys))
     else
-      tk_call('style', sub_cmd, style)
+      tk_call(TkCommandNames[0], sub_cmd, style)
     end
   end
   alias default configure
@@ -46,14 +185,33 @@ class << Tk::Tile::Style
     style = '.' unless style
 
     if keys && keys != None
-      tk_call('style', 'map', style, *hash_kv(keys))
+      if keys.kind_of?(Hash)
+        tk_call(TkCommandNames[0], 'map', style, *hash_kv(keys))
+      else
+        simplelist(tk_call(TkCommandNames[0], 'map', style, '-' << keys.to_s))
+      end
     else
-      tk_call('style', 'map', style)
+      ret = {}
+      Hash[*(simplelist(tk_call(TkCommandNames[0], 'map', style)))].each{|k, v|
+        ret[k[1..-1]] = list(v)
+      }
+      ret
     end
   end
+  alias map_configure map
+
+  def map_configinfo(style=nil, key=None)
+    style = '.' unless style
+    map(style, key)
+  end
+
+  def map_default_configinfo(key=None)
+    map('.', key)
+  end
 
   def lookup(style, opt, state=None, fallback_value=None)
-    tk_call('style', 'lookup', style, '-' << opt.to_s, state, fallback_value)
+    tk_call(TkCommandNames[0], 'lookup', style,
+            '-' << opt.to_s, state, fallback_value)
   end
 
   include Tk::Tile::ParseStyleLayout
@@ -66,42 +224,113 @@ class << Tk::Tile::Style
     style = '.' unless style
 
     if spec
-      tk_call('style', 'layout', style, spec)
+      tk_call(TkCommandNames[0], 'layout', style, spec)
     else
-      _style_layout(list(tk_call('style', 'layout', style)))
+      _style_layout(list(tk_call(TkCommandNames[0], 'layout', style)))
     end
   end
 
   def element_create(name, type, *args)
-    tk_call('style', 'element', 'create', name, type, *args)
+    if type == 'image' || type == :image
+      element_create_image(name, *args)
+    elsif type == 'vsapi' || type == :vsapi
+      element_create_vsapi(name, *args)
+    else
+      tk_call(TkCommandNames[0], 'element', 'create', name, type, *args)
+    end
+  end
+
+  def element_create_image(name, *args)
+    fail ArgumentError, 'Must supply a base image' unless (spec = args.shift)
+    if (opts = args.shift)
+      if opts.kind_of?(Hash)
+        opts = _symbolkey2str(opts)
+      else
+        fail ArgumentError, 'bad option'
+      end
+    end
+    fail ArgumentError, 'too many arguments' unless args.empty?
+
+    if spec.kind_of?(Array)
+      # probably, command format is tile 0.8+ (Tcl/Tk8.5+) style
+      if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
+        if opts
+          tk_call(TkCommandNames[0],
+                  'element', 'create', name, 'image', spec, opts)
+        else
+          tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
+        end
+      else
+        fail ArgumentError, 'illegal arguments' if opts.key?('map')
+        base = spec.shift
+        opts['map'] = spec
+        tk_call(TkCommandNames[0],
+                'element', 'create', name, 'image', base, opts)
+      end
+    else
+      # probably, command format is tile 0.7.8 or older style
+      if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
+        spec = [spec, *(opts.delete('map'))] if opts.key?('map')
+      end
+      if opts
+        tk_call(TkCommandNames[0],
+                'element', 'create', name, 'image', spec, opts)
+      else
+        tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
+      end
+    end
+  end
+
+  def element_create_vsapi(name, class_name, part_id, *args)
+    # supported on Tcl/Tk 8.6 or later
+
+    # argument check
+    if (state_map = args.shift || None)
+      if state_map.kind_of?(Hash)
+        opts = _symbolkey2str(state_map)
+        state_map = None
+      end
+    end
+    opts = args.shift || None
+    fail ArgumentError, "too many arguments" unless args.empty?
+
+    # define a Microsoft Visual Styles element
+    tk_call(TkCommandNames[0], 'element', 'create', name, 'vsapi', 
+            class_name, part_id, state_map, opts)
   end
 
   def element_names()
-    list(tk_call('style', 'element', 'names'))
+    list(tk_call(TkCommandNames[0], 'element', 'names'))
   end
 
   def element_options(elem)
-    simplelist(tk_call('style', 'element', 'options', elem))
+    simplelist(tk_call(TkCommandNames[0], 'element', 'options', elem))
   end
 
   def theme_create(name, keys=nil)
+    name = name.to_s
     if keys && keys != None
-      tk_call('style', 'theme', 'create', name, *hash_kv(keys))
+      tk_call(TkCommandNames[0], 'theme', 'create', name, *hash_kv(keys))
     else
-      tk_call('style', 'theme', 'create', name)
+      tk_call(TkCommandNames[0], 'theme', 'create', name)
     end
+    name
   end
 
   def theme_settings(name, cmd=nil, &b)
+    name = name.to_s
     cmd = Proc.new(&b) if !cmd && b
-    tk_call('style', 'theme', 'settings', name, cmd)
+    tk_call(TkCommandNames[0], 'theme', 'settings', name, cmd)
+    name
   end
 
   def theme_names()
-    list(tk_call('style', 'theme', 'names'))
+    list(tk_call(TkCommandNames[0], 'theme', 'names'))
   end
 
   def theme_use(name)
-    tk_call('style', 'theme', 'use', name)
+    name = name.to_s
+    tk_call(TkCommandNames[0], 'theme', 'use', name)
+    name
   end
 end
diff --git a/ext/tk/lib/tkextlib/tile/tbutton.rb b/ext/tk/lib/tkextlib/tile/tbutton.rb
index 1142a27100..c852024842 100644
--- a/ext/tk/lib/tkextlib/tile/tbutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tbutton.rb
@@ -7,13 +7,13 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TButton < TkButton
+    class TButton < Tk::Button
     end
     Button = TButton
   end
 end
 
-class Tk::Tile::TButton < TkButton
+class Tk::Tile::TButton < Tk::Button
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -22,9 +22,13 @@ class Tk::Tile::TButton < TkButton
     TkCommandNames = ['::tbutton'.freeze].freeze
   end
   WidgetClassName = 'TButton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Button, :TkButton)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tbutton.rb',
+                                   :Ttk, Tk::Tile::Button, :TkButton)
diff --git a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb b/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
index fce799683d..01751ede0f 100644
--- a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
@@ -7,7 +7,7 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TCheckButton < TkCheckButton
+    class TCheckButton < Tk::CheckButton
     end
     TCheckbutton = TCheckButton
     CheckButton  = TCheckButton
@@ -15,7 +15,7 @@ module Tk
   end
 end
 
-class Tk::Tile::TCheckButton < TkCheckButton
+class Tk::Tile::TCheckButton < Tk::CheckButton
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -24,9 +24,15 @@ class Tk::Tile::TCheckButton < TkCheckButton
     TkCommandNames = ['::tcheckbutton'.freeze].freeze
   end
   WidgetClassName = 'TCheckbutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Checkbutton,
+#                            :TkCheckbutton, :TkCheckButton)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tcheckbutton.rb',
+                                   :Ttk, Tk::Tile::Checkbutton,
+                                   :TkCheckbutton, :TkCheckButton)
diff --git a/ext/tk/lib/tkextlib/tile/tcombobox.rb b/ext/tk/lib/tkextlib/tile/tcombobox.rb
index e8e042fbd9..b5ab827e2d 100644
--- a/ext/tk/lib/tkextlib/tile/tcombobox.rb
+++ b/ext/tk/lib/tkextlib/tile/tcombobox.rb
@@ -22,7 +22,7 @@ class Tk::Tile::TCombobox < Tk::Tile::TEntry
     TkCommandNames = ['::tcombobox'.freeze].freeze
   end
   WidgetClassName = 'TCombobox'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __boolval_optkeys
     super() << 'exportselection'
@@ -49,3 +49,7 @@ class Tk::Tile::TCombobox < Tk::Tile::TEntry
     tk_send('set', val)
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Combobox, :TkCombobox)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tcombobox.rb',
+                                   :Ttk, Tk::Tile::Combobox, :TkCombobox)
diff --git a/ext/tk/lib/tkextlib/tile/tentry.rb b/ext/tk/lib/tkextlib/tile/tentry.rb
index 4d57ce7756..8d2633a774 100644
--- a/ext/tk/lib/tkextlib/tile/tentry.rb
+++ b/ext/tk/lib/tkextlib/tile/tentry.rb
@@ -7,13 +7,13 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TEntry < TkEntry
+    class TEntry < Tk::Entry
     end
     Entry = TEntry
   end
 end
 
-class Tk::Tile::TEntry < TkEntry
+class Tk::Tile::TEntry < Tk::Entry
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -22,7 +22,12 @@ class Tk::Tile::TEntry < TkEntry
     TkCommandNames = ['::tentry'.freeze].freeze
   end
   WidgetClassName = 'TEntry'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __optkey_aliases
+    {:vcmd=>:validatecommand, :invcmd=>:invalidcommand}
+  end
+  private :__optkey_aliases
 
   def __boolval_optkeys
     super() << 'exportselection'
@@ -38,3 +43,7 @@ class Tk::Tile::TEntry < TkEntry
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Entry, :TkEntry)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tentry.rb',
+                                   :Ttk, Tk::Tile::Entry, :TkEntry)
diff --git a/ext/tk/lib/tkextlib/tile/tframe.rb b/ext/tk/lib/tkextlib/tile/tframe.rb
index 691c9c42af..d6d4312628 100644
--- a/ext/tk/lib/tkextlib/tile/tframe.rb
+++ b/ext/tk/lib/tkextlib/tile/tframe.rb
@@ -7,13 +7,13 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TFrame < TkFrame
+    class TFrame < Tk::Frame
     end
     Frame = TFrame
   end
 end
 
-class Tk::Tile::TFrame < TkFrame
+class Tk::Tile::TFrame < Tk::Frame
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -22,9 +22,13 @@ class Tk::Tile::TFrame < TkFrame
     TkCommandNames = ['::tframe'.freeze].freeze
   end
   WidgetClassName = 'TFrame'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Frame, :TkFrame)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tframe.rb',
+                                   :Ttk, Tk::Tile::Frame, :TkFrame)
diff --git a/ext/tk/lib/tkextlib/tile/tlabel.rb b/ext/tk/lib/tkextlib/tile/tlabel.rb
index 4111d1906a..55b98acc68 100644
--- a/ext/tk/lib/tkextlib/tile/tlabel.rb
+++ b/ext/tk/lib/tkextlib/tile/tlabel.rb
@@ -7,13 +7,13 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TLabel < TkLabel
+    class TLabel < Tk::Label
     end
     Label = TLabel
   end
 end
 
-class Tk::Tile::TLabel < TkLabel
+class Tk::Tile::TLabel < Tk::Label
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -22,9 +22,13 @@ class Tk::Tile::TLabel < TkLabel
     TkCommandNames = ['::tlabel'.freeze].freeze
   end
   WidgetClassName = 'TLabel'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Label, :TkLabel)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tlabel.rb',
+                                   :Ttk, Tk::Tile::Label, :TkLabel)
diff --git a/ext/tk/lib/tkextlib/tile/tlabelframe.rb b/ext/tk/lib/tkextlib/tile/tlabelframe.rb
index 8981232b25..a34c98583f 100644
--- a/ext/tk/lib/tkextlib/tile/tlabelframe.rb
+++ b/ext/tk/lib/tkextlib/tile/tlabelframe.rb
@@ -9,7 +9,9 @@ module Tk
   module Tile
     class TLabelframe < Tk::Tile::TFrame
     end
-    Labelframe = TLabelframe
+    TLabelFrame = TLabelframe
+    Labelframe  = TLabelframe
+    LabelFrame  = TLabelframe
   end
 end
 
@@ -22,9 +24,15 @@ class Tk::Tile::TLabelframe < Tk::Tile::TFrame
     TkCommandNames = ['::tlabelframe'.freeze].freeze
   end
   WidgetClassName = 'TLabelframe'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Labelframe,
+#                            :TkLabelframe, :TkLabelFrame)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tlabelframe.rb',
+                                   :Ttk, Tk::Tile::Labelframe,
+                                   :TkLabelframe, :TkLabelFrame)
diff --git a/ext/tk/lib/tkextlib/tile/tmenubutton.rb b/ext/tk/lib/tkextlib/tile/tmenubutton.rb
index 4b81fa1c81..1cf553ec8c 100644
--- a/ext/tk/lib/tkextlib/tile/tmenubutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tmenubutton.rb
@@ -7,13 +7,15 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TMenubutton < TkMenubutton
+    class TMenubutton < Tk::Menubutton
     end
-    Menubutton = TMenubutton
+    TMenuButton = TMenubutton
+    Menubutton  = TMenubutton
+    MenuButton  = TMenubutton
   end
 end
 
-class Tk::Tile::TMenubutton < TkMenubutton
+class Tk::Tile::TMenubutton < Tk::Menubutton
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -22,9 +24,15 @@ class Tk::Tile::TMenubutton < TkMenubutton
     TkCommandNames = ['::tmenubutton'.freeze].freeze
   end
   WidgetClassName = 'TMenubutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Menubutton,
+#                            :TkMenubutton, :TkMenuButton)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tmenubutton.rb',
+                                   :Ttk, Tk::Tile::Menubutton,
+                                   :TkMenubutton, :TkMenuButton)
diff --git a/ext/tk/lib/tkextlib/tile/tnotebook.rb b/ext/tk/lib/tkextlib/tile/tnotebook.rb
index a928e64b61..9e27e2c1fd 100644
--- a/ext/tk/lib/tkextlib/tile/tnotebook.rb
+++ b/ext/tk/lib/tkextlib/tile/tnotebook.rb
@@ -16,7 +16,7 @@ end
 class Tk::Tile::TNotebook < TkWindow
   ################################
   include TkItemConfigMethod
-  
+
   def __item_cget_cmd(id)
     [self.path, 'tab', id]
   end
@@ -38,12 +38,37 @@ class Tk::Tile::TNotebook < TkWindow
   private :__item_methodcall_optkeys
 
   #alias tabcget itemcget
+  #alias tabcget_strict itemcget_strict
   alias tabconfigure itemconfigure
   alias tabconfiginfo itemconfiginfo
   alias current_tabconfiginfo current_itemconfiginfo
 
+  def tabcget_tkstring(tagOrId, option)
+    tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{option}")), false, true)[-1]
+  end
+  def tabcget_strict(tagOrId, option)
+    tabconfiginfo(tagOrId, option)[-1]
+  end
   def tabcget(tagOrId, option)
-    tabconfigure(tagOrId, option)[-1]
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      tabcget_strict(tagOrId, option)
+    else
+      begin
+        tabcget_strict(tagOrId, option)
+      rescue => e
+        begin
+          if current_tabconfiginfo(tagOrId).has_key?(option.to_s)
+            # not tag error & option is known -> error on known option
+            fail e
+          else
+            # not tag error & option is unknown
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
+    end
   end
   ################################
 
@@ -55,7 +80,7 @@ class Tk::Tile::TNotebook < TkWindow
     TkCommandNames = ['::tnotebook'.freeze].freeze
   end
   WidgetClassName = 'TNotebook'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
@@ -74,9 +99,9 @@ class Tk::Tile::TNotebook < TkWindow
 
   def add(child, keys=nil)
     if keys && keys != None
-      tk_send_without_enc('add', _epath(child), *hash_kv(keys))
+      tk_send('add', _epath(child), *hash_kv(keys))
     else
-      tk_send_without_enc('add', _epath(child))
+      tk_send('add', _epath(child))
     end
     self
   end
@@ -84,7 +109,11 @@ class Tk::Tile::TNotebook < TkWindow
   def forget(idx)
     tk_send('forget', idx)
     self
-  end    
+  end
+
+  def hide(idx)
+    tk_send('hide', idx)
+  end
 
   def index(idx)
     number(tk_send('index', idx))
@@ -112,3 +141,7 @@ class Tk::Tile::TNotebook < TkWindow
     list(tk_send('tabs'))
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Notebook, :TkNotebook)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tnotebook.rb',
+                                   :Ttk, Tk::Tile::Notebook, :TkNotebook)
diff --git a/ext/tk/lib/tkextlib/tile/tpaned.rb b/ext/tk/lib/tkextlib/tile/tpaned.rb
index 11178b19d3..d6ad234559 100644
--- a/ext/tk/lib/tkextlib/tile/tpaned.rb
+++ b/ext/tk/lib/tkextlib/tile/tpaned.rb
@@ -9,7 +9,7 @@ module Tk
   module Tile
     class TPaned < TkWindow
     end
-    Paned = TPaned
+    PanedWindow = Panedwindow = Paned = TPaned
   end
 end
 
@@ -17,20 +17,36 @@ class Tk::Tile::TPaned < TkWindow
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::paned'.freeze].freeze
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 8
+      TkCommandNames = ['::ttk::paned'.freeze].freeze
+    else
+      TkCommandNames = ['::ttk::panedwindow'.freeze].freeze
+    end
   else
     TkCommandNames = ['::tpaned'.freeze].freeze
   end
   WidgetClassName = 'TPaned'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 
-  def add(win, keys)
-    win = _epath(win)
-    tk_send_without_enc('add', win, *hash_kv(keys))
+  def add(*args)
+    keys = args.pop
+    fail ArgumentError, "no window in arguments" unless keys
+
+    if keys && keys.kind_of?(Hash)
+      fail ArgumentError, "no window in arguments" if args == []
+      opts = hash_kv(keys)
+    else
+      args.push(keys) if keys
+      opts = []
+    end
+
+    args.each{|win|
+      tk_send_without_enc('add', _epath(win), *opts)
+    }
     self
   end
 
@@ -46,10 +62,39 @@ class Tk::Tile::TPaned < TkWindow
     self
   end
 
-  def panecget(pane, slot)
+  def panecget_tkstring(pane, slot)
+    pane = _epath(pane)
+    tk_send_without_enc('pane', pane, "-#{slot}")
+  end
+  alias pane_cget_tkstring panecget_tkstring
+
+  def panecget_strict(pane, slot)
     pane = _epath(pane)
     tk_tcl2ruby(tk_send_without_enc('pane', pane, "-#{slot}"))
   end
+  alias pane_cget_strict panecget_strict
+
+  def panecget(pane, slot)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      panecget_strict(pane, slot)
+    else
+      begin
+        panecget_strict(pane, slot)
+      rescue => e
+        begin
+          if current_paneconfiginfo(pane).has_key?(slot.to_s)
+            # not tag error & option is known -> error on known option
+            fail e
+          else
+            # not tag error & option is unknown
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
+    end
+  end
   alias pane_cget panecget
 
   def paneconfigure(pane, key, value=nil)
@@ -84,7 +129,7 @@ class Tk::Tile::TPaned < TkWindow
         end
         conf
       else
-        tk_split_simplelist(tk_send_without_enc('pane', 
+        tk_split_simplelist(tk_send_without_enc('pane',
                                                 win)).collect{|conflist|
           conf = tk_split_simplelist(conflist)
           conf[0] = conf[0][1..-1]
@@ -92,18 +137,18 @@ class Tk::Tile::TPaned < TkWindow
             if conf[0] == 'hide'
               conf[3] = bool(conf[3]) unless conf[3].empty?
             elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3]) 
+              conf[3] = tk_split_list(conf[3])
             else
-              conf[3] = tk_tcl2ruby(conf[3]) 
+              conf[3] = tk_tcl2ruby(conf[3])
             end
           end
           if conf[4]
             if conf[0] == 'hide'
               conf[4] = bool(conf[4]) unless conf[4].empty?
             elsif conf[4].index('{')
-              conf[4] = tk_split_list(conf[4]) 
+              conf[4] = tk_split_list(conf[4])
             else
-              conf[4] = tk_tcl2ruby(conf[4]) 
+              conf[4] = tk_tcl2ruby(conf[4])
             end
           end
           conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
@@ -122,7 +167,7 @@ class Tk::Tile::TPaned < TkWindow
         { key => conf }
       else
         ret = {}
-        tk_split_simplelist(tk_send_without_enc('pane', 
+        tk_split_simplelist(tk_send_without_enc('pane',
                                                 win)).each{|conflist|
           conf = tk_split_simplelist(conflist)
           key = conf.shift[1..-1]
@@ -130,18 +175,18 @@ class Tk::Tile::TPaned < TkWindow
             if key == 'hide'
               conf[2] = bool(conf[2]) unless conf[2].empty?
             elsif conf[2].index('{')
-              conf[2] = tk_split_list(conf[2]) 
+              conf[2] = tk_split_list(conf[2])
             else
-              conf[2] = tk_tcl2ruby(conf[2]) 
+              conf[2] = tk_tcl2ruby(conf[2])
             end
           end
           if conf[3]
             if key == 'hide'
               conf[3] = bool(conf[3]) unless conf[3].empty?
             elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3]) 
+              conf[3] = tk_split_list(conf[3])
             else
-              conf[3] = tk_tcl2ruby(conf[3]) 
+              conf[3] = tk_tcl2ruby(conf[3])
             end
           end
           if conf.size == 1
@@ -178,11 +223,23 @@ class Tk::Tile::TPaned < TkWindow
   end
   alias current_pane_configinfo current_paneconfiginfo
 
+  def panes
+    tk_split_simplelist(tk_send_without_enc('panes')).map{|w|
+      (obj = window(w))? obj: w
+    }
+  end
+
   def identify(x, y)
-    list(tk_send_without_enc('identify', x, y))
+    num_or_nil(tk_send_without_enc('identify', x, y))
   end
 
   def sashpos(idx, newpos=None)
     num_or_str(tk_send_without_enc('sashpos', idx, newpos))
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Panedwindow,
+#                            :TkPanedwindow, :TkPanedWindow)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tpaned.rb',
+                                   :Ttk, Tk::Tile::Panedwindow,
+                                   :TkPanedwindow, :TkPanedWindow)
diff --git a/ext/tk/lib/tkextlib/tile/tprogressbar.rb b/ext/tk/lib/tkextlib/tile/tprogressbar.rb
index 36c1c75c23..0c9d15e1b9 100644
--- a/ext/tk/lib/tkextlib/tile/tprogressbar.rb
+++ b/ext/tk/lib/tkextlib/tile/tprogressbar.rb
@@ -22,7 +22,7 @@ class Tk::Tile::TProgressbar
     TkCommandNames = ['::tprogressbar'.freeze].freeze
   end
   WidgetClassName = 'TProgressbar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
@@ -51,3 +51,7 @@ class Tk::Tile::TProgressbar
     end
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Progressbar, :TkProgressbar)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tprogressbar.rb',
+                                   :Ttk, Tk::Tile::Progressbar, :TkProgressbar)
diff --git a/ext/tk/lib/tkextlib/tile/tradiobutton.rb b/ext/tk/lib/tkextlib/tile/tradiobutton.rb
index e2f614cb97..5dbf260666 100644
--- a/ext/tk/lib/tkextlib/tile/tradiobutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tradiobutton.rb
@@ -7,7 +7,7 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TRadioButton < TkRadioButton
+    class TRadioButton < Tk::RadioButton
     end
     TRadiobutton = TRadioButton
     RadioButton  = TRadioButton
@@ -15,7 +15,7 @@ module Tk
   end
 end
 
-class Tk::Tile::TRadioButton < TkRadioButton
+class Tk::Tile::TRadioButton < Tk::RadioButton
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -24,9 +24,15 @@ class Tk::Tile::TRadioButton < TkRadioButton
     TkCommandNames = ['::tradiobutton'.freeze].freeze
   end
   WidgetClassName = 'TRadiobutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Radiobutton,
+#                            :TkRadiobutton, :TkRadioButton)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tradiobutton.rb',
+                                   :Ttk, Tk::Tile::Radiobutton,
+                                   :TkRadiobutton, :TkRadioButton)
diff --git a/ext/tk/lib/tkextlib/tile/treeview.rb b/ext/tk/lib/tkextlib/tile/treeview.rb
index 68e478896c..70db3d6d78 100644
--- a/ext/tk/lib/tkextlib/tile/treeview.rb
+++ b/ext/tk/lib/tkextlib/tile/treeview.rb
@@ -17,7 +17,7 @@ module Tk::Tile::TreeviewConfig
 
   def __item_configinfo_struct(id)
     # maybe need to override
-    {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+    {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
       :default_value=>nil, :current_value=>1}
   end
   private :__item_configinfo_struct
@@ -30,6 +30,12 @@ module Tk::Tile::TreeviewConfig
       else
         if slot
           slot = slot.to_s
+
+          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          if real_name
+            slot = real_name.to_s
+          end
+
           case slot
           when /^(#{__tile_specific_item_optkeys(tagid(tagOrId)).join('|')})$/
             begin
@@ -195,6 +201,12 @@ module Tk::Tile::TreeviewConfig
       else
         if slot
           slot = slot.to_s
+
+          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          if real_name
+            slot = real_name.to_s
+          end
+
           case slot
           when /^(#{__tile_specific_item_optkeys(tagid(tagOrId)).join('|')})$/
             begin
@@ -364,12 +376,12 @@ module Tk::Tile::TreeviewConfig
   ###################
 
   def __item_cget_cmd(id)
-    [self.path, id[0], id[1]]
+    [self.path, *id]
   end
   private :__item_cget_cmd
 
   def __item_config_cmd(id)
-    [self.path, id[0], id[1]]
+    [self.path, *id]
   end
   private :__item_config_cmd
 
@@ -378,7 +390,7 @@ module Tk::Tile::TreeviewConfig
     when :item, 'item'
       ['width']
     when :column, 'column'
-      super(id[1])
+      super(id[1]) + ['minwidth']
     when :tag, 'tag'
       super(id[1])
     when :heading, 'heading'
@@ -410,7 +422,7 @@ module Tk::Tile::TreeviewConfig
     when :item, 'item'
       ['open']
     when :column, 'column'
-      super(id[1])
+      super(id[1]) + ['stretch']
     when :tag, 'tag'
       super(id[1])
     when :heading, 'heading'
@@ -436,7 +448,7 @@ module Tk::Tile::TreeviewConfig
   def __item_val2ruby_optkeys(id)
     case id[0]
     when :item, 'item'
-      { 
+      {
         'tags'=>proc{|arg_id, val|
           simplelist(val).collect{|tag|
             Tk::Tile::Treeview::Tag.id2obj(self, tag)
@@ -483,7 +495,7 @@ module Tk::Tile::TreeviewConfig
           end
           slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
         end while(org_slot != slot)
-        fail RuntimeError, 
+        fail RuntimeError,
           "there is a configure alias loop about '#{org_slot}'"
       else
         ret = {}
@@ -504,18 +516,26 @@ module Tk::Tile::TreeviewConfig
     end
   end
 
+  alias __itemcget_tkstring itemcget_tkstring
   alias __itemcget itemcget
+  alias __itemcget_strict itemcget_strict
   alias __itemconfigure itemconfigure
   alias __itemconfiginfo itemconfiginfo
   alias __current_itemconfiginfo current_itemconfiginfo
 
-  private :__itemcget, :__itemconfigure
-  private :__itemconfiginfo, :__current_itemconfiginfo
+  private :__itemcget_tkstring, :__itemcget, :__itemcget_strict
+  private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
 
   # Treeview Item
+  def itemcget_tkstring(tagOrId, option)
+    __itemcget_tkstring([:item, tagOrId], option)
+  end
   def itemcget(tagOrId, option)
     __itemcget([:item, tagOrId], option)
   end
+  def itemcget_strict(tagOrId, option)
+    __itemcget_strict([:item, tagOrId], option)
+  end
   def itemconfigure(tagOrId, slot, value=None)
     __itemconfigure([:item, tagOrId], slot, value)
   end
@@ -527,9 +547,15 @@ module Tk::Tile::TreeviewConfig
   end
 
   # Treeview Column
+  def columncget_tkstring(tagOrId, option)
+    __itemcget_tkstring([:column, tagOrId], option)
+  end
   def columncget(tagOrId, option)
     __itemcget([:column, tagOrId], option)
   end
+  def columncget_strict(tagOrId, option)
+    __itemcget_strict([:column, tagOrId], option)
+  end
   def columnconfigure(tagOrId, slot, value=None)
     __itemconfigure([:column, tagOrId], slot, value)
   end
@@ -539,13 +565,28 @@ module Tk::Tile::TreeviewConfig
   def current_columnconfiginfo(tagOrId, slot=nil)
     __current_itemconfiginfo([:column, tagOrId], slot)
   end
+  alias column_cget_tkstring columncget_tkstring
   alias column_cget columncget
+  alias column_cget_strict columncget_strict
   alias column_configure columnconfigure
   alias column_configinfo columnconfiginfo
   alias current_column_configinfo current_columnconfiginfo
 
   # Treeview Heading
-  def headingcget(tagOrId, option)
+  def headingcget_tkstring(tagOrId, option)
+    if __tile_specific_item_optkeys([:heading, tagOrId]).index(option.to_s)
+      begin
+        # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << option.to_s))
+      rescue
+        # Maybe, 'state' option has '-' in future.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{option}"))
+      end
+    else
+      __itemcget_tkstring([:heading, tagOrId], option)
+    end
+  end
+  def headingcget_strict(tagOrId, option)
     if __tile_specific_item_optkeys([:heading, tagOrId]).index(option.to_s)
       begin
         # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
@@ -555,7 +596,28 @@ module Tk::Tile::TreeviewConfig
         tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{option}"))
       end
     else
-      __itemcget([:heading, tagOrId], option)
+      __itemcget_strict([:heading, tagOrId], option)
+    end
+  end
+  def headingcget(tagOrId, option)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      headingcget_strict(tagOrId, option)
+    else
+      begin
+        headingcget_strict(tagOrId, option)
+      rescue => e
+        begin
+          if current_headingconfiginfo(tagOrId).has_key?(option.to_s)
+            # not tag error & option is known -> error on known option
+            fail e
+          else
+            # not tag error & option is unknown
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
     end
   end
   def headingconfigure(tagOrId, slot, value=None)
@@ -586,25 +648,35 @@ module Tk::Tile::TreeviewConfig
   def current_headingconfiginfo(tagOrId, slot=nil)
     __current_itemconfiginfo([:heading, tagOrId], slot)
   end
+  alias heading_cget_tkstring headingcget_tkstring
   alias heading_cget headingcget
+  alias heading_cget_strict headingcget_strict
   alias heading_configure headingconfigure
   alias heading_configinfo headingconfiginfo
   alias current_heading_configinfo current_headingconfiginfo
 
   # Treeview Tag
+  def tagcget_tkstring(tagOrId, option)
+    __itemcget_tkstring([:tag, :configure, tagOrId], option)
+  end
   def tagcget(tagOrId, option)
-    __itemcget([:tag, tagOrId], option)
+    __itemcget([:tag, :configure, tagOrId], option)
+  end
+  def tagcget_strict(tagOrId, option)
+    __itemcget_strict([:tag, :configure, tagOrId], option)
   end
   def tagconfigure(tagOrId, slot, value=None)
-    __itemconfigure([:tag, tagOrId], slot, value)
+    __itemconfigure([:tag, :configure, tagOrId], slot, value)
   end
   def tagconfiginfo(tagOrId, slot=nil)
-    __itemconfiginfo([:tag, tagOrId], slot)
+    __itemconfiginfo([:tag, :configure, tagOrId], slot)
   end
   def current_tagconfiginfo(tagOrId, slot=nil)
-    __current_itemconfiginfo([:tag, tagOrId], slot)
+    __current_itemconfiginfo([:tag, :configure, tagOrId], slot)
   end
+  alias tag_cget_tkstring tagcget_tkstring
   alias tag_cget tagcget
+  alias tag_cget_strict tagcget_strict
   alias tag_configure tagconfigure
   alias tag_configinfo tagconfiginfo
   alias current_tag_configinfo current_tagconfiginfo
@@ -614,30 +686,43 @@ end
 
 class Tk::Tile::Treeview::Item < TkObject
   ItemID_TBL = TkCore::INTERP.create_table
-  TkCore::INTERP.init_ip_env{ Tk::Tile::Treeview::Item::ItemID_TBL.clear }
+
+  TkCore::INTERP.init_ip_env{
+    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
+      Tk::Tile::Treeview::Item::ItemID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::Tile::Treeview::Item::ItemID_TBL[tpath]
-    (Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id])? \
-          Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]: id
+    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
+      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath]
+        (Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id])? \
+             Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   def self.assign(tree, id)
     tpath = tree.path
-    if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
-        Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
-      return Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
-    end
+    obj = nil
+    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
+      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
+          Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
+        return Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
+      end
 
-    obj = self.allocate
-    obj.instance_eval{
-      @parent = @t = tree
-      @tpath = tpath
-      @path = @id = id
+      obj = self.allocate
+      obj.instance_eval{
+        @parent = @t = tree
+        @tpath = tpath
+        @path = @id = id
+      }
+      Tk::Tile::Treeview::Item::ItemID_TBL[tpath] ||= {}
+      Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id] = obj
     }
-    ItemID_TBL[tpath] = {} unless ItemID_TBL[tpath]
-    Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id] = obj
     obj
   end
 
@@ -645,7 +730,7 @@ class Tk::Tile::Treeview::Item < TkObject
     keys = _symbolkey2str(keys)
     id = keys.delete('id')
     if id
-      num_or_str(tk_call(tree, 'insert', 
+      num_or_str(tk_call(tree, 'insert',
                          parent_item, idx, '-id', id, *hash_kv(keys)))
     else
       num_or_str(tk_call(tree, 'insert', parent_item, idx, *hash_kv(keys)))
@@ -666,16 +751,24 @@ class Tk::Tile::Treeview::Item < TkObject
     @parent = @t = tree
     @tpath = tree.path
     @path = @id = _insert_item(@t, parent_item, idx, keys)
-    ItemID_TBL[@tpath] = {} unless ItemID_TBL[@tpath]
-    ItemID_TBL[@tpath][@id] = self
+    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
+      ItemID_TBL[@tpath] = {} unless ItemID_TBL[@tpath]
+      ItemID_TBL[@tpath][@id] = self
+    }
   end
   def id
     @id
   end
 
+  def cget_tkstring(option)
+    @t.itemcget_tkstring(@id, option)
+  end
   def cget(option)
     @t.itemcget(@id, option)
   end
+  def cget_strict(option)
+    @t.itemcget_strict(@id, option)
+  end
 
   def configure(key, value=None)
     @t.itemconfigure(@id, key, value)
@@ -702,6 +795,11 @@ class Tk::Tile::Treeview::Item < TkObject
     self
   end
 
+  def tag_has?(tag)
+    @t.tag_has?(tag, @id)
+  end
+  alias has_tag? tag_has?
+
   def bbox(column=None)
     @t.bbox(@id, column)
   end
@@ -801,22 +899,35 @@ end
 class Tk::Tile::Treeview::Root < Tk::Tile::Treeview::Item
   def self.new(tree, keys = {})
     tpath = tree.path
-    if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
-        Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
-      Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
-    else
-      super(tree, keys)
-    end
+    obj = nil
+    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
+      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
+          Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
+        obj = Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
+      else
+        #super(tree, keys)
+        (obj = self.allocate).instance_eval{
+          @parent = @t = tree
+          @tpath = tree.path
+          @path = @id = ''
+          Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] ||= {}
+          Tk::Tile::Treeview::Item::ItemID_TBL[@tpath][@id] = self
+        }
+      end
+    }
+    obj.configure(keys) if keys && ! keys.empty?
+    obj
   end
 
   def initialize(tree, keys = {})
+    # dummy:: not called by 'new' method
     @parent = @t = tree
     @tpath = tree.path
     @path = @id = ''
-    unless Tk::Tile::Treeview::Item::ItemID_TBL[@tpath]
-      Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] = {}
-    end
-    Tk::Tile::Treeview::Item::ItemID_TBL[@tpath][@id] = self
+    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
+      Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] ||= {}
+      Tk::Tile::Treeview::Item::ItemID_TBL[@tpath][@id] = self
+    }
   end
 end
 
@@ -826,32 +937,55 @@ class Tk::Tile::Treeview::Tag < TkObject
   include TkTreatTagFont
 
   TagID_TBL = TkCore::INTERP.create_table
-  Tag_ID = ['tile_treeview_tag'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ Tk::Tile::Treeview::Tag::TagID_TBL.clear }
+  (Tag_ID = ['tile_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    Tk::Tile::Treeview::Tag::TagID_TBL.mutex.synchronize{
+      Tk::Tile::Treeview::Tag::TagID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::Tile::Treeview::Tag::TagID_TBL[tpath]
-    (Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id])? \
-          Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id]: id
+    Tk::Tile::Treeview::Tag::TagID_TBL.mutex.synchronize{
+      if Tk::Tile::Treeview::Tag::TagID_TBL[tpath]
+        (Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id])? \
+               Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id]: id
+      else
+        id
+      end
+    }
   end
 
   def initialize(tree, keys=nil)
     @parent = @t = tree
     @tpath = tree.path
-    @path = @id = Tag_ID.join(TkCore::INTERP._ip_id_)
-    TagID_TBL[@tpath] = {} unless TagID_TBL[@tpath]
-    TagID_TBL[@tpath][@id] = self
-    Tag_ID[1].succ!
+    Tag_ID.mutex.synchronize{
+      @path = @id = Tag_ID.join(TkCore::INTERP._ip_id_)
+      Tag_ID[1].succ!
+    }
+    TagID_TBL.mutex.synchronize{
+      TagID_TBL[@tpath] = {} unless TagID_TBL[@tpath]
+      TagID_TBL[@tpath][@id] = self
+    }
     if keys && keys != None
-      tk_call_without_enc(@tpath, 'tag', 'configure', *hash_kv(keys, true))
+      tk_call_without_enc(@tpath, 'tag', 'configure', @id, *hash_kv(keys,true))
     end
   end
   def id
     @id
   end
 
+  def tag_has?(item)
+    @t.tag_has?(@id, item)
+  end
+  alias added? tag_has?
+
   def bind(seq, *args)
     if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
@@ -881,9 +1015,15 @@ class Tk::Tile::Treeview::Tag < TkObject
     @t.tag_bindinfo(@id, seq)
   end
 
+  def cget_tkstring(option)
+    @t.tagcget_tkstring(@id, option)
+  end
   def cget(option)
     @t.tagcget(@id, option)
   end
+  def cget_strict(option)
+    @t.tagcget_strict(@id, option)
+  end
 
   def configure(key, value=None)
     @t.tagconfigure(@id, key, value)
@@ -913,11 +1053,15 @@ class Tk::Tile::Treeview < TkWindow
     TkCommandNames = ['::treeview'.freeze].freeze
   end
   WidgetClassName = 'Treeview'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __destroy_hook__
-    Tk::Tile::Treeview::Item::ItemID_TBL.delete(@path)
-    Tk::Tile::Treeview::Tag::ItemID_TBL.delete(@path)
+    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
+      Tk::Tile::Treeview::Item::ItemID_TBL.delete(@path)
+    }
+    Tk::Tile::Treeview::Tag::ItemID_TBL.mutex.synchronize{
+      Tk::Tile::Treeview::Tag::ItemID_TBL.delete(@path)
+    }
   end
 
   def self.style(*args)
@@ -925,11 +1069,12 @@ class Tk::Tile::Treeview < TkWindow
   end
 
   def tagid(id)
-    if id.kind_of?(Tk::Tile::Treeview::Item) || 
+    if id.kind_of?(Tk::Tile::Treeview::Item) ||
         id.kind_of?(Tk::Tile::Treeview::Tag)
       id.id
     elsif id.kind_of?(Array)
-      [id[0], _get_eval_string(id[1])]
+      # size is 2 or 3
+      id[0..-2] << _get_eval_string(id[-1])
     else
       _get_eval_string(id)
     end
@@ -949,7 +1094,7 @@ class Tk::Tile::Treeview < TkWindow
     }
   end
   def set_children(item, *items)
-    tk_send_without_enc('children', item, 
+    tk_send_without_enc('children', item,
                         array2tk_list(items.flatten, true))
     self
   end
@@ -992,14 +1137,29 @@ class Tk::Tile::Treeview < TkWindow
     end
   end
 
+  def identify_region(x, y)
+    tk_send('identify', 'region', x, y)
+  end
+
+  def identify_item(x, y)
+    id = tk_send('identify', 'item', x, y)
+    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+  end
+
+  def identify_element(x, y)
+    tk_send('identify', 'element', x, y)
+  end
+
   def row_identify(x, y)
     id = tk_send('identify', 'row', x, y)
     (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
   end
+  alias identify_row row_identify
 
   def column_identify(x, y)
     tk_send('identify', 'column', x, y)
   end
+  alias identify_column column_identify
 
   def index(item)
     number(tk_send('index', item))
@@ -1098,6 +1258,15 @@ class Tk::Tile::Treeview < TkWindow
     self
   end
 
+  def tag_has?(tag, item)
+    bool(tk_send('tag', 'has', tagid(tag), tagid(item)))
+  end
+  def tag_has(tag)
+    tk_split_simplelist(tk_send('tag', 'has', tagid(tag))).collect{|id|
+      Tk::Tile::Treeview::Item.id2obj(self, id)
+    }
+  end
+
   def tag_bind(tag, seq, *args)
     if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
@@ -1131,3 +1300,7 @@ class Tk::Tile::Treeview < TkWindow
   end
   alias tagbindinfo tag_bindinfo
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Treeview, :TkTreeview)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/treeview.rb',
+                                   :Ttk, Tk::Tile::Treeview, :TkTreeview)
diff --git a/ext/tk/lib/tkextlib/tile/tscale.rb b/ext/tk/lib/tkextlib/tile/tscale.rb
index 7ec72e3515..7eefcef731 100644
--- a/ext/tk/lib/tkextlib/tile/tscale.rb
+++ b/ext/tk/lib/tkextlib/tile/tscale.rb
@@ -7,7 +7,7 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TScale < TkScale
+    class TScale < Tk::Scale
     end
     Scale = TScale
 
@@ -17,7 +17,7 @@ module Tk
   end
 end
 
-class Tk::Tile::TScale < TkScale
+class Tk::Tile::TScale < Tk::Scale
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -26,11 +26,13 @@ class Tk::Tile::TScale < TkScale
     TkCommandNames = ['::tscale'.freeze].freeze
   end
   WidgetClassName = 'TScale'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
+
+  alias identify ttk_identify
 end
 
 class Tk::Tile::TProgress < Tk::Tile::TScale
@@ -42,9 +44,13 @@ class Tk::Tile::TProgress < Tk::Tile::TScale
     TkCommandNames = ['::tprogress'.freeze].freeze
   end
   WidgetClassName = 'TProgress'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scale, :TkScale)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscale.rb',
+                                   :Ttk, Tk::Tile::Scale, :TkScale)
diff --git a/ext/tk/lib/tkextlib/tile/tscrollbar.rb b/ext/tk/lib/tkextlib/tile/tscrollbar.rb
index bd49ae18e3..c6bba5810b 100644
--- a/ext/tk/lib/tkextlib/tile/tscrollbar.rb
+++ b/ext/tk/lib/tkextlib/tile/tscrollbar.rb
@@ -7,13 +7,13 @@ require 'tkextlib/tile.rb'
 
 module Tk
   module Tile
-    class TScrollbar < TkScrollbar
+    class TScrollbar < Tk::Scrollbar
     end
     Scrollbar = TScrollbar
   end
 end
 
-class Tk::Tile::TScrollbar < TkScrollbar
+class Tk::Tile::TScrollbar < Tk::Scrollbar
   include Tk::Tile::TileWidget
 
   if Tk::Tile::USE_TTK_NAMESPACE
@@ -22,9 +22,42 @@ class Tk::Tile::TScrollbar < TkScrollbar
     TkCommandNames = ['::tscrollbar'.freeze].freeze
   end
   WidgetClassName = 'TScrollbar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
+
+  alias identify ttk_identify
+end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
+                                   :Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
+
+#######################################################################
+
+class Tk::Tile::XScrollbar < Tk::Tile::TScrollbar
+  def create_self(keys)
+    keys = {} unless keys
+    keys['orient'] = 'horizontal'
+    super(keys)
+  end
+  private :create_self
 end
+
+class Tk::Tile::YScrollbar < Tk::Tile::TScrollbar
+  def create_self(keys)
+    keys = {} unless keys
+    keys['orient'] = 'vertical'
+    super(keys)
+  end
+  private :create_self
+end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
+                                   :Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
+                                   :Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
diff --git a/ext/tk/lib/tkextlib/tile/tseparator.rb b/ext/tk/lib/tkextlib/tile/tseparator.rb
index ca731d4e5b..ffd2f6f89f 100644
--- a/ext/tk/lib/tkextlib/tile/tseparator.rb
+++ b/ext/tk/lib/tkextlib/tile/tseparator.rb
@@ -22,9 +22,13 @@ class Tk::Tile::TSeparator < TkWindow
     TkCommandNames = ['::tseparator'.freeze].freeze
   end
   WidgetClassName = 'TSeparator'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
   end
 end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Separator, :TkSeparator)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tseparator.rb',
+                                   :Ttk, Tk::Tile::Separator, :TkSeparator)
diff --git a/ext/tk/lib/tkextlib/tile/tspinbox.rb b/ext/tk/lib/tkextlib/tile/tspinbox.rb
new file mode 100644
index 0000000000..2f2d73c5ab
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tspinbox.rb
@@ -0,0 +1,107 @@
+#
+#  ttk::spinbox widget  (Tcl/Tk 8.6b1 or later)
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TSpinbox < Tk::Tile::TEntry
+    end
+    Spinbox = TSpinbox
+  end
+end
+
+class Tk::Tile::TSpinbox < Tk::Tile::TEntry
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::spinbox'.freeze].freeze
+  else
+    TkCommandNames = ['::tspinbox'.freeze].freeze
+  end
+  WidgetClassName = 'TSpinbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  class SpinCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?d, ?s, :direction ],
+        [ ?s, ?e, :current ],
+        [ ?W, ?w, :widget ],
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
+
+        [ ?e, proc{|val|
+            #enc = Tk.encoding
+            enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
+            if enc
+              Tk.fromUTF8(TkComm::string(val), enc)
+            else
+              TkComm::string(val)
+            end
+          }
+        ],
+
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        (val)? '1': '0'
+      end
+    end
+
+    def self._config_keys
+      ['command']
+    end
+  end
+
+  def __validation_class_list
+    super() << SpinCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
+
+  def __boolval_optkeys
+    super() << 'wrap'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'buttonbackground' << 'format'
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'values'
+  end
+  private :__listval_optkeys
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def current
+    number(tk_send_without_enc('current'))
+  end
+  def current=(idx)
+    tk_send('current', idx)
+  end
+
+  def set(val)
+    tk_send('set', val)
+  end
+
+  alias identify ttk_identify
+end
+
+#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Spinbox, :TkSpinbox)
+Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tspinbox.rb',
+                                   :Ttk, Tk::Tile::Spinbox, :TkSpinbox)
diff --git a/ext/tk/lib/tkextlib/tile/tsquare.rb b/ext/tk/lib/tkextlib/tile/tsquare.rb
index 600b55e4e7..a81cd7b98a 100644
--- a/ext/tk/lib/tkextlib/tile/tsquare.rb
+++ b/ext/tk/lib/tkextlib/tile/tsquare.rb
@@ -22,7 +22,7 @@ class Tk::Tile::TSquare < TkWindow
     TkCommandNames = ['::tsquare'.freeze].freeze
   end
   WidgetClassName = 'TSquare'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def self.style(*args)
     [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
diff --git a/ext/tk/lib/tkextlib/tkDND/setup.rb b/ext/tk/lib/tkextlib/tkDND/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tkDND/setup.rb
+++ b/ext/tk/lib/tkextlib/tkDND/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tkDND/shape.rb b/ext/tk/lib/tkextlib/tkDND/shape.rb
index 570c93b0d9..d44068ed33 100644
--- a/ext/tk/lib/tkextlib/tkDND/shape.rb
+++ b/ext/tk/lib/tkextlib/tkDND/shape.rb
@@ -11,15 +11,15 @@ require 'tkextlib/setup.rb'
 # call setup script
 require 'tkextlib/tkDND/setup.rb'
 
-# TkPackage.require('shape', '0.3')
-TkPackage.require('shape')
+# TkPackage.require('Shape', '0.3')
+TkPackage.require('Shape')
 
 module Tk
   module TkDND
     module Shape
       extend TkCore
 
-      PACKAGE_NAME = 'shape'.freeze
+      PACKAGE_NAME = 'Shape'.freeze
       def self.package_name
         PACKAGE_NAME
       end
@@ -27,26 +27,28 @@ module Tk
 =begin
       def self.package_version
         begin
-          TkPackage.require('shape')
+          TkPackage.require('Shape')
         rescue
           ''
         end
       end
 =end
-      def self.package_version
-        Tk.tk_call('set', 'shape_version')
-      end
-      alias shape_version package_version
+      class << self
+        def package_version
+          Tk.tk_call('set', 'shape_version')
+        end
+        alias shape_version package_version
 
-      def self.package_patchlevel
-        Tk.tk_call('set', 'shape_patchlevel')
-      end
-      alias shape_patchlevel package_patchlevel
+        def package_patchlevel
+          Tk.tk_call('set', 'shape_patchLevel')
+        end
+        alias shape_patchlevel package_patchlevel
 
-      def self.version
-        tk_call('shape', 'version')
+        def version
+          tk_call('shape', 'version')
+        end
+        alias xshape_version version
       end
-      alias xshape_version version
 
       ############################
 
diff --git a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
index a040532eb6..97cdfc7f1c 100644
--- a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
+++ b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
@@ -30,33 +30,51 @@ module Tk
 
     class DND_Subst < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?a, ?l, :actions ], 
-        [ ?A, ?s, :action ], 
-        [ ?b, ?L, :codes ], 
-        [ ?c, ?s, :code ], 
-        [ ?d, ?l, :descriptions ], 
-        [ ?D, ?l, :data ], 
-        [ ?L, ?l, :source_types ], 
-        [ ?m, ?l, :modifiers ], 
-        [ ?t, ?l, :types ], 
-        [ ?T, ?s, :type ], 
-        [ ?W, ?w, :widget ], 
-        [ ?x, ?n, :x ], 
-        [ ?X, ?n, :x_root ], 
-        [ ?y, ?n, :y ], 
-        [ ?Y, ?n, :y_root ], 
+        [ ?a, ?l, :actions ],
+        [ ?A, ?s, :action ],
+        [ ?b, ?L, :codes ],
+        [ ?c, ?s, :code ],
+        [ ?d, ?l, :descriptions ],
+        [ ?D, ?l, :data ],
+        [ ?L, ?l, :source_types ],
+        [ ?m, ?l, :modifiers ],
+        [ ?t, ?l, :types ],
+        [ ?T, ?s, :type ],
+        [ ?W, ?w, :widget ],
+        [ ?x, ?n, :x ],
+        [ ?X, ?n, :x_root ],
+        [ ?y, ?n, :y ],
+        [ ?Y, ?n, :y_root ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?n, TkComm.method(:num_or_str) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?l, TkComm.method(:list) ], 
-        [ ?L, TkComm.method(:simplelist) ], 
-        [ ?w, TkComm.method(:window) ], 
+        [ ?n, TkComm.method(:num_or_str) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?l, TkComm.method(:list) ],
+        [ ?L, TkComm.method(:simplelist) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       # setup tables
       _setup_subst_table(KEY_TBL, PROC_TBL);
     end
@@ -83,11 +101,11 @@ module Tk
       #def dnd_bindtarget(type, event, cmd=Proc.new, prior=50, *args)
       #  event = tk_event_sequence(event)
       #  if prior.kind_of?(Numeric)
-      #    tk_call('dnd', 'bindtarget', @path, type, event, 
-      #            install_bind_for_event_class(DND_Subst, cmd, *args), 
+      #    tk_call('dnd', 'bindtarget', @path, type, event,
+      #            install_bind_for_event_class(DND_Subst, cmd, *args),
       #            prior)
       #  else
-      #    tk_call('dnd', 'bindtarget', @path, type, event, 
+      #    tk_call('dnd', 'bindtarget', @path, type, event,
       #            install_bind_for_event_class(DND_Subst, cmd, prior, *args))
       #  end
       #  self
@@ -105,11 +123,11 @@ module Tk
 
         event = tk_event_sequence(event)
         if prior.kind_of?(Numeric)
-          tk_call('dnd', 'bindtarget', @path, type, event, 
-                  install_bind_for_event_class(DND_Subst, cmd, *args), 
+          tk_call('dnd', 'bindtarget', @path, type, event,
+                  install_bind_for_event_class(DND_Subst, cmd, *args),
                   prior)
         else
-          tk_call('dnd', 'bindtarget', @path, type, event, 
+          tk_call('dnd', 'bindtarget', @path, type, event,
                   install_bind_for_event_class(DND_Subst, cmd, prior, *args))
         end
         self
diff --git a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb b/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
index 8527f61df1..b9ee90aace 100644
--- a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
+++ b/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
@@ -36,10 +36,13 @@ end
 
 class Tk::HTML_Widget::ClippingWindow
   WidgetClassName = 'HtmlClip'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   HtmlClip_TBL = TkCore::INTERP.create_table
-  TkCore::INTERP.init_ip_env{ HtmlClip_TBL.clear }
+
+  TkCore::INTERP.init_ip_env{
+    HtmlClip_TBL.mutex.synchronize{ HtmlClip_TBL.clear }
+  }
 
   def self.new(parent, keys={})
     if parent.kind_of?(Hash)
@@ -54,7 +57,9 @@ class Tk::HTML_Widget::ClippingWindow
     else
       ppath = ''
     end
-    return HtmlClip_TBL[ppath] if HtmlClip_TBL[ppath]
+    HtmlClip_TBL.mutex.synchronize{
+      return HtmlClip_TBL[ppath] if HtmlClip_TBL[ppath]
+    }
 
     widgetname = keys.delete('widgetname')
     if widgetname =~ /^(.*)\.[^.]+$/
@@ -62,11 +67,13 @@ class Tk::HTML_Widget::ClippingWindow
       if ppath2[0] != ?.
         ppath2 = ppath + '.' + ppath2
       end
-      return HtmlClip_TBL[ppath2] if HtmlClip_TBL[ppath2]
+      HtmlClip_TBL.mutex.synchronize{
+        return HtmlClip_TBL[ppath2] if HtmlClip_TBL[ppath2]
+      }
 
       ppath = ppath2
     end
-    
+
     parent = TkComm._genobj_for_tkwidget(ppath)
     unless parent.kind_of?(Tk::HTML_Widget)
       fail ArgumentError, "parent must be a Tk::HTML_Widget instance"
@@ -79,7 +86,9 @@ class Tk::HTML_Widget::ClippingWindow
     @parent = parent
     @ppath = parent.path
     @path = @id = @ppath + '.x'
-    HtmlClip_TBL[@ppath] = self
+    HtmlClip_TBL.mutex.synchronize{
+      HtmlClip_TBL[@ppath] = self
+    }
   end
 
   def method_missing(m, *args, &b)
@@ -92,11 +101,11 @@ class Tk::HTML_Widget
 
   TkCommandNames = ['html'.freeze].freeze
   WidgetClassName = 'Html'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tkHTML/setup.rb b/ext/tk/lib/tkextlib/tkHTML/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tkHTML/setup.rb
+++ b/ext/tk/lib/tkextlib/tkHTML/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tkimg/setup.rb b/ext/tk/lib/tkextlib/tkimg/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tkimg/setup.rb
+++ b/ext/tk/lib/tkextlib/tkimg/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tktable/setup.rb b/ext/tk/lib/tkextlib/tktable/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tktable/setup.rb
+++ b/ext/tk/lib/tkextlib/tktable/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tktable/tktable.rb b/ext/tk/lib/tkextlib/tktable/tktable.rb
index 4edaabc847..bc7a6c9a2e 100644
--- a/ext/tk/lib/tkextlib/tktable/tktable.rb
+++ b/ext/tk/lib/tkextlib/tktable/tktable.rb
@@ -74,9 +74,15 @@ module Tk::TkTable::ConfigMethod
   end
   private :__item_val2ruby_optkeys
 
+  def tag_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['tag', tagid(tagOrId)], option)
+  end
   def tag_cget(tagOrId, option)
     itemcget(['tag', tagid(tagOrId)], option)
   end
+  def tag_cget_strict(tagOrId, option)
+    itemcget_strict(['tag', tagid(tagOrId)], option)
+  end
   def tag_configure(tagOrId, slot, value=None)
     itemconfigure(['tag', tagid(tagOrId)], slot, value)
   end
@@ -87,9 +93,15 @@ module Tk::TkTable::ConfigMethod
     current_itemconfiginfo(['tag', tagid(tagOrId)], slot)
   end
 
+  def window_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['window', tagid(tagOrId)], option)
+  end
   def window_cget(tagOrId, option)
     itemcget(['window', tagid(tagOrId)], option)
   end
+  def window_cget_strict(tagOrId, option)
+    itemcget_strict(['window', tagid(tagOrId)], option)
+  end
   def window_configure(tagOrId, slot, value=None)
     if slot == :window || slot == 'window'
       value = _epath(value)
@@ -108,8 +120,8 @@ module Tk::TkTable::ConfigMethod
     current_itemconfiginfo(['window', tagid(tagOrId)], slot)
   end
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 end
 
 #####################################################
@@ -118,23 +130,39 @@ class Tk::TkTable::CellTag
   include TkTreatTagFont
 
   CellTagID_TBL = TkCore::INTERP.create_table
-  CellTag_ID = ['tktbl:celltag'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ CellTagID_TBL.clear }
+  (CellTag_ID = ['tktbl:celltag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    CellTagID_TBL.mutex.synchronize{ CellTagID_TBL.clear }
+  }
 
   def self.id2obj(table, id)
     tpath = table.path
-    return id unless CellTagID_TBL[tpath]
-    CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
+    CellTagID_TBL.mutex.synchronize{
+      if CellTagID_TBL[tpath]
+        CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys=nil)
     @parent = @t = parent
     @tpath - parent.path
-    @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
-    CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-    CellTagID_TBL[@tpath][@id] = self
-    CellTag_ID[1].succ!
+    CellTag_ID.mutex.synchronize{
+      @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
+      CellTag_ID[1].succ!
+    }
+    CellTagID_TBL.mutex.synchronize{
+      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+      CellTagID_TBL[@tpath][@id] = self
+    }
     configure(keys) if keys
   end
 
@@ -144,7 +172,9 @@ class Tk::TkTable::CellTag
 
   def destroy
     tk_call(@tpath, 'tag', 'delete', @id)
-    CellTagID_TBL[@tpath].delete(@id) if CellTagID_TBL[@tpath]
+    CellTagID_TBL.mutex.synchronize{
+      CellTagID_TBL[@tpath].delete(@id) if CellTagID_TBL[@tpath]
+    }
     self
   end
   alias delete destroy
@@ -173,9 +203,15 @@ class Tk::TkTable::CellTag
     @t.tag_lower(@id, target)
   end
 
+  def cget_tkstring(key)
+    @t.tag_cget_tkstring(@id, key)
+  end
   def cget(key)
     @t.tag_cget(@id, key)
   end
+  def cget_strict(key)
+    @t.tag_cget_strict(@id, key)
+  end
   def configure(key, val=None)
     @t.tag_configure(@id, key, val)
   end
@@ -189,22 +225,35 @@ end
 
 class Tk::TkTable::NamedCellTag < Tk::TkTable::CellTag
   def self.new(parent, name, keys=nil)
-    if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
-      cell = CellTagID_TBL[parent.path][name]
-      cell.configure(keys) if keys
-      return cell
-    else
-      super(parent, name, keys)
-    end
+    obj = nil
+    CellTagID_TBL.mutex.synchronize{
+      if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
+        obj = CellTagID_TBL[parent.path][name]
+      else
+        #super(parent, name, keys)
+        (obj = self.allocate).instance_eval{
+          @parent = @t = parent
+          @tpath = parent.path
+          @path = @id = name
+          CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+          CellTagID_TBL[@tpath][@id] = self
+        }
+      end
+    }
+    obj.configure(keys) if keys && ! keys.empty?
+    obj
   end
 
   def initialize(parent, name, keys=nil)
+    # dummy:: not called by 'new' method
     @parent = @t = parent
-    @tpath - parent.path
+    @tpath = parent.path
     @path = @id = name
-    CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-    CellTagID_TBL[@tpath][@id] = self
-    configure(keys) if keys
+    CellTagID_TBL.mutex.synchronize{
+      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+      CellTagID_TBL[@tpath][@id] = self
+    }
+    configure(keys) if keys && ! keys.empty?
   end
 end
 
@@ -213,14 +262,16 @@ end
 class Tk::TkTable
   TkCommandNames = ['table'.freeze].freeze
   WidgetClassName = 'Table'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   include Scrollable
   include Tk::TkTable::ConfigMethod
   include Tk::ValidateConfigure
 
   def __destroy_hook__
-    Tk::TkTable::CelTag::CellTagID_TBL.delete(@path)
+    Tk::TkTable::CelTag::CellTagID_TBL.mutex.synchronize{
+      Tk::TkTable::CelTag::CellTagID_TBL.delete(@path)
+    }
   end
 
   def __boolval_optkeys
@@ -240,24 +291,42 @@ class Tk::TkTable
   class BrowseCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?c, ?n, :column ], 
-        [ ?C, ?s, :index ], 
-        [ ?i, ?x, :cursor ], 
-        [ ?r, ?n, :row ], 
-        [ ?s, ?s, :last_index ], 
-        [ ?S, ?s, :new_index ], 
-        [ ?W, ?w, :widget ], 
+        [ ?c, ?n, :column ],
+        [ ?C, ?s, :index ],
+        [ ?i, ?x, :cursor ],
+        [ ?r, ?n, :row ],
+        [ ?s, ?s, :last_index ],
+        [ ?S, ?s, :new_index ],
+        [ ?W, ?w, :widget ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?n, TkComm.method(:number) ], 
-        [ ?x, TkComm.method(:num_or_str) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
+        [ ?n, TkComm.method(:number) ],
+        [ ?x, TkComm.method(:num_or_str) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -273,24 +342,42 @@ class Tk::TkTable
   class CellCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?c, ?n, :column ], 
-        [ ?C, ?s, :index ], 
-        [ ?i, ?m, :rw_mode ], 
-        [ ?r, ?n, :row ], 
-        [ ?s, ?v, :value ], 
-        [ ?W, ?w, :widget ], 
+        [ ?c, ?n, :column ],
+        [ ?C, ?s, :index ],
+        [ ?i, ?m, :rw_mode ],
+        [ ?r, ?n, :row ],
+        [ ?s, ?v, :value ],
+        [ ?W, ?w, :widget ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?n, TkComm.method(:number) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
-        [ ?m, proc{|val| (val == '0')? (:r) : (:w)} ], 
-        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ], 
+        [ ?n, TkComm.method(:number) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
+        [ ?m, proc{|val| (val == '0')? (:r) : (:w)} ],
+        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -306,22 +393,40 @@ class Tk::TkTable
   class SelectionCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?c, ?n, :sel_columns ], 
-        [ ?C, ?s, :sel_area ], 
-        [ ?i, ?n, :total ], 
-        [ ?r, ?n, :sel_rows ], 
-        [ ?s, ?s, :value ], 
-        [ ?W, ?w, :widget ], 
+        [ ?c, ?n, :sel_columns ],
+        [ ?C, ?s, :sel_area ],
+        [ ?i, ?n, :total ],
+        [ ?r, ?n, :sel_rows ],
+        [ ?s, ?s, :value ],
+        [ ?W, ?w, :widget ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?n, TkComm.method(:number) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
+        [ ?n, TkComm.method(:number) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -337,25 +442,43 @@ class Tk::TkTable
   class ValidateCommand < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?c, ?n, :column ], 
-        [ ?C, ?s, :index ], 
-        [ ?i, ?x, :cursor ], 
-        [ ?r, ?n, :row ], 
-        [ ?s, ?v, :current_value ], 
-        [ ?S, ?v, :new_value ], 
-        [ ?W, ?w, :widget ], 
+        [ ?c, ?n, :column ],
+        [ ?C, ?s, :index ],
+        [ ?i, ?x, :cursor ],
+        [ ?r, ?n, :row ],
+        [ ?s, ?v, :current_value ],
+        [ ?S, ?v, :new_value ],
+        [ ?W, ?w, :widget ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?n, TkComm.method(:number) ], 
-        [ ?x, TkComm.method(:num_or_str) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
-        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ], 
+        [ ?n, TkComm.method(:number) ],
+        [ ?x, TkComm.method(:num_or_str) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?w, TkComm.method(:window) ],
+        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
     end
 
@@ -367,7 +490,7 @@ class Tk::TkTable
   #################################
 
   def __validation_class_list
-    super() << 
+    super() <<
       BrowseCommand << CellCommand << SelectionCommand << ValidateCommand
   end
 
@@ -483,7 +606,7 @@ class Tk::TkTable
 
   def hidden_list
     simplelist(tk_send('hidden'))
-  end 
+  end
   def hidden?(idx, *args)
     if args.empty?
       if (ret = tk_send('hidden', tagid(idx))) == ''
@@ -587,7 +710,7 @@ class Tk::TkTable
     self
   end
 
-  def set(*pairs) # idx, val, idx, val, ... 
+  def set(*pairs) # idx, val, idx, val, ...
     args = []
     0.step(pairs.size-1, 2){|i|
       args << tagid(pairs[i])
@@ -596,7 +719,7 @@ class Tk::TkTable
     tk_send('set', *args)
     self
   end
-  def set_row(*pairs) # idx, val, idx, val, ... 
+  def set_row(*pairs) # idx, val, idx, val, ...
     args = []
     0.step(pairs.size-1, 2){|i|
       args << tagid(pairs[i])
@@ -605,7 +728,7 @@ class Tk::TkTable
     tk_send('set', 'row', *args)
     self
   end
-  def set_col(*pairs) # idx, val, idx, val, ... 
+  def set_col(*pairs) # idx, val, idx, val, ...
     args = []
     0.step(pairs.size-1, 2){|i|
       args << tagid(pairs[i])
@@ -622,7 +745,7 @@ class Tk::TkTable
       pairs.each{|idx, val| args << tagid(idx) << val }
       tk_send('set', *args)
     else
-      # idx, val, idx, val, ... 
+      # idx, val, idx, val, ...
       args = []
       0.step(pairs.size-1, 2){|i|
         args << tagid(pairs[i])
@@ -639,7 +762,7 @@ class Tk::TkTable
       pairs.each{|idx, val| args << tagid(idx) << val }
       tk_send('set', 'row', *args)
     else
-      # idx, val, idx, val, ... 
+      # idx, val, idx, val, ...
       args = []
       0.step(pairs.size-1, 2){|i|
         args << tagid(pairs[i])
@@ -656,7 +779,7 @@ class Tk::TkTable
       pairs.each{|idx, val| args << idx << val }
       tk_send('set', 'col', *args)
     else
-      # idx, val, idx, val, ... 
+      # idx, val, idx, val, ...
       args = []
       0.step(pairs.size-1, 2){|i|
         args << tagid(pairs[i])
@@ -684,7 +807,7 @@ class Tk::TkTable
     [idx [rows, cols]]
   end
   def set_spans(*pairs)
-    # idx, val, idx, val, ... 
+    # idx, val, idx, val, ...
     args = []
     0.step(pairs.size-1, 2){|i|
       args << tagid(pairs[i])
@@ -713,7 +836,7 @@ class Tk::TkTable
       }
       tk_send('spans', *args)
     else
-      # idx, val, idx, val, ... 
+      # idx, val, idx, val, ...
       args = []
       0.step(pairs.size-1, 2){|i|
         args << tagid(pairs[i])
@@ -746,15 +869,17 @@ class Tk::TkTable
   end
 
   def tagid2obj(tagid)
-    if Tk::TkTable::CellTag::CellTagID_TBL.key?(@path)
-      if Tk::TkTable::CellTag::CellTagID_TBL[@path].key?(tagid)
-        Tk::TkTable::CellTag::CellTagID_TBL[@path][tagid]
+    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
+      if Tk::TkTable::CellTag::CellTagID_TBL.key?(@path)
+        if Tk::TkTable::CellTag::CellTagID_TBL[@path].key?(tagid)
+          Tk::TkTable::CellTag::CellTagID_TBL[@path][tagid]
+        else
+          tagid
+        end
       else
         tagid
       end
-    else
-      tagid
-    end
+    }
   end
 
   def tag_cell(tag, *cells)
@@ -775,13 +900,15 @@ class Tk::TkTable
   end
   def tag_delete(tag)
     tk_send('tag', 'delete', tagid(tag))
-    if Tk::TkTable::CellTag::CellTagID_TBL[@path]
-      if tag.kind_of? Tk::TkTable::CellTag
-        Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id) 
-      else
-        Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag) 
+    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
+      if Tk::TkTable::CellTag::CellTagID_TBL[@path]
+        if tag.kind_of? Tk::TkTable::CellTag
+          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id)
+        else
+          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag)
+        end
       end
-    end
+    }
     self
   end
   def tag_exist?(tag)
diff --git a/ext/tk/lib/tkextlib/tktrans/setup.rb b/ext/tk/lib/tkextlib/tktrans/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/tktrans/setup.rb
+++ b/ext/tk/lib/tkextlib/tktrans/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/tktrans/tktrans.rb b/ext/tk/lib/tkextlib/tktrans/tktrans.rb
index 665c57af0c..e051c09211 100644
--- a/ext/tk/lib/tkextlib/tktrans/tktrans.rb
+++ b/ext/tk/lib/tkextlib/tktrans/tktrans.rb
@@ -39,7 +39,7 @@ class TkWindow
   end
 end
 
-class TkRoot
+class Tk::Root
   undef tktrans_set_image, tktrans_get_image
 
   def tktrans_set_image(img)
@@ -51,7 +51,7 @@ class TkRoot
   end
 end
 
-class TkToplevel
+class Tk::Toplevel
   undef tktrans_set_image, tktrans_get_image
 
   def tktrans_set_image(img)
diff --git a/ext/tk/lib/tkextlib/treectrl/setup.rb b/ext/tk/lib/tkextlib/treectrl/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/treectrl/setup.rb
+++ b/ext/tk/lib/tkextlib/treectrl/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
index 12f7cffabf..1879a531ae 100644
--- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
+++ b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
@@ -32,14 +32,14 @@ module Tk
       end
     end
 
-    HasColumnCreateCommand = 
+    HasColumnCreateCommand =
       (TkPackage.vcompare(self.package_version, '1.1') >= 0)
 
-    # dummy :: 
-    #  pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for 
-    #  'loupe' command (probably it is bug, I think). 
-    #  So, calling a 'treectrl' command for loading the dll with 
-    #  the auto_load facility. 
+    # dummy ::
+    #  pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for
+    #  'loupe' command (probably it is bug, I think).
+    #  So, calling a 'treectrl' command for loading the dll with
+    #  the auto_load facility.
     begin
       tk_call('treectrl')
     rescue
@@ -48,7 +48,7 @@ module Tk
       # NOTE: platform == 'unix' only
 
       # img  => TkPhotoImage
-      # x, y => screen coords 
+      # x, y => screen coords
       # w, h => magnifier width and height
       # zoom => zooming rate
       Tk.tk_call_without_enc('loupe', img, x, y, w, h, zoom)
@@ -76,28 +76,28 @@ end
 class Tk::TreeCtrl::NotifyEvent
   # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
   KEY_TBL = [
-    [ ?c, ?n, :item_num ], 
-    [ ?d, ?s, :detail ], 
-    [ ?D, ?l, :items ], 
-    [ ?e, ?e, :event ], 
-    [ ?I, ?n, :id ], 
-    [ ?l, ?n, :lower_bound ], 
-    [ ?p, ?n, :active_id ], 
-    [ ?P, ?e, :pattern ], 
-    [ ?S, ?l, :sel_items ], 
-    [ ?T, ?w, :widget ], 
-    [ ?u, ?n, :upper_bound ], 
-    [ ?W, ?o, :object ], 
-    [ ??, ?x, :parm_info ], 
+    [ ?c, ?n, :item_num ],
+    [ ?d, ?s, :detail ],
+    [ ?D, ?l, :items ],
+    [ ?e, ?e, :event ],
+    [ ?I, ?n, :id ],
+    [ ?l, ?n, :lower_bound ],
+    [ ?p, ?n, :active_id ],
+    [ ?P, ?e, :pattern ],
+    [ ?S, ?l, :sel_items ],
+    [ ?T, ?w, :widget ],
+    [ ?u, ?n, :upper_bound ],
+    [ ?W, ?o, :object ],
+    [ ??, ?x, :parm_info ],
     nil
   ]
 
   # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
   PROC_TBL = [
-    [ ?n, TkComm.method(:num_or_str) ], 
-    [ ?s, TkComm.method(:string) ], 
-    [ ?l, TkComm.method(:list) ], 
-    [ ?w, TkComm.method(:window) ], 
+    [ ?n, TkComm.method(:num_or_str) ],
+    [ ?s, TkComm.method(:string) ],
+    [ ?l, TkComm.method(:list) ],
+    [ ?w, TkComm.method(:window) ],
 
     [ ?e, proc{|val|
         case val
@@ -109,9 +109,9 @@ class Tk::TreeCtrl::NotifyEvent
           val
         end
       }
-    ], 
+    ],
 
-    [ ?o, proc{|val| TkComm.tk_tcl2ruby(val)} ], 
+    [ ?o, proc{|val| TkComm.tk_tcl2ruby(val)} ],
 
     [ ?x, proc{|val|
         begin
@@ -132,22 +132,40 @@ class Tk::TreeCtrl::NotifyEvent
         rescue
           val
         end
-      } ], 
+      } ],
 
     nil
   ]
 
+=begin
+  # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+  KEY_TBL.map!{|inf|
+    if inf.kind_of?(Array)
+      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+      inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+    end
+    inf
+  }
+
+  PROC_TBL.map!{|inf|
+    if inf.kind_of?(Array)
+      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+    end
+    inf
+  }
+=end
+
   # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
   #
-  #     _get_subst_key() and _get_all_subst_keys() generates key-string 
-  #     which describe how to convert callback arguments to ruby objects. 
-  #     When binding parameters are given, use _get_subst_key(). 
-  #     But when no parameters are given, use _get_all_subst_keys() to 
-  #     create a Event class object as a callback parameter. 
+  #     _get_subst_key() and _get_all_subst_keys() generates key-string
+  #     which describe how to convert callback arguments to ruby objects.
+  #     When binding parameters are given, use _get_subst_key().
+  #     But when no parameters are given, use _get_all_subst_keys() to
+  #     create a Event class object as a callback parameter.
   #
-  #     scan_args() is used when doing callback. It convert arguments 
-  #     ( which are Tcl strings ) to ruby objects based on the key string 
-  #     that is generated by _get_subst_key() or _get_all_subst_keys(). 
+  #     scan_args() is used when doing callback. It convert arguments
+  #     ( which are Tcl strings ) to ruby objects based on the key string
+  #     that is generated by _get_subst_key() or _get_all_subst_keys().
   #
   _setup_subst_table(KEY_TBL, PROC_TBL);
 end
@@ -167,7 +185,7 @@ module Tk::TreeCtrl::ConfigMethod
     if (obj.kind_of?(Tk::TreeCtrl::Column) ||
         obj.kind_of?(Tk::TreeCtrl::Element) ||
         obj.kind_of?(Tk::TreeCtrl::Item) ||
-        obj.kind_of?(Tk::TreeCtrl::Style)) 
+        obj.kind_of?(Tk::TreeCtrl::Style))
       obj = obj.id
     end
 
@@ -218,7 +236,7 @@ module Tk::TreeCtrl::ConfigMethod
   def __item_cget_cmd(mixed_id)
     if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
       return [self.path, 'column', 'dragcget']
-    end 
+    end
 
     if mixed_id[1].kind_of?(Array)
       id = mixed_id[1]
@@ -237,7 +255,7 @@ module Tk::TreeCtrl::ConfigMethod
   def __item_config_cmd(mixed_id)
     if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
       return [self.path, 'column', 'dragconfigure']
-    end 
+    end
 
     if mixed_id[1].kind_of?(Array)
       id = mixed_id[1]
@@ -273,10 +291,10 @@ module Tk::TreeCtrl::ConfigMethod
 
   def __item_configinfo_struct(id)
     if id.kind_of?(Array) && id[0].to_s == 'notify'
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
         :default_value=>nil, :current_value=>1}
     else
-      {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
+      {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
         :default_value=>3, :current_value=>4}
     end
   end
@@ -284,7 +302,7 @@ module Tk::TreeCtrl::ConfigMethod
 
 
   def __item_font_optkeys(id)
-    if id.kind_of?(Array) && (id[0] == 'element' || 
+    if id.kind_of?(Array) && (id[0] == 'element' ||
                               (id[0].kind_of?(Array) && id[0][1] == 'element'))
       []
     else
@@ -304,7 +322,7 @@ module Tk::TreeCtrl::ConfigMethod
 
   def __item_boolval_optkeys(id)
     if id == 'debug'
-      ['data', 'display', 'enable']
+      ['data', 'display', 'enable', 'span', 'textlayout']
     elsif id == 'dragimage'
       ['visible']
     elsif id == 'marquee'
@@ -312,20 +330,20 @@ module Tk::TreeCtrl::ConfigMethod
     elsif id.kind_of?(Array)
       case id[0]
       when 'item'
-        ['button', 'visible']
+        ['visible', 'wrap', 'open', 'returnid', 'visible']
       when 'column'
         if id[1] == 'drag'
           ['enable']
         else
-          ['button', 'expand', 'resize', 'squeeze', 'sunken', 
+          ['button', 'expand', 'resize', 'squeeze', 'sunken',
             'visible', 'widthhack']
         end
       when 'element'
-        ['draw', 'filled', 'showfocus', 'destroy']
+        ['draw', 'filled', 'showfocus', 'clip', 'destroy']
       when 'notify'
         ['active']
       when 'style'
-        ['detach']
+        ['detach', 'indent', 'visible']
       else
         if id[0].kind_of?(Array) && id[0][1] == 'element'
           ['filled', 'showfocus']
@@ -383,22 +401,42 @@ module Tk::TreeCtrl::ConfigMethod
   end
   private :__item_listval_optkeys
 
+  def __item_val2ruby_optkeys(id)
+    if id.kind_of?(Array)
+      case id[0]
+      when 'item'
+        { 'button' => proc{|id,val| (val == 'auto')? val: TkComm.bool(val)} }
+      else
+        []
+      end
+    else
+      []
+    end
+  end
+  private :__item_val2ruby_optkeys
+
   def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
     {
-      'notreally'=>nil, 
+      'notreally'=>nil,
       'increasing'=>'decreasing',
-      'decreasing'=>'increasing', 
+      'decreasing'=>'increasing',
       'ascii'=>nil,
-      'dictionary'=>nil, 
-      'integer'=>nil, 
+      'dictionary'=>nil,
+      'integer'=>nil,
       'real'=>nil
     }
   end
   private :__item_keyonly_optkeys
 
+  def column_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['column', tagOrId], option)
+  end
   def column_cget(tagOrId, option)
     itemcget(['column', tagOrId], option)
   end
+  def column_cget_strict(tagOrId, option)
+    itemcget_strict(['column', tagOrId], option)
+  end
   def column_configure(tagOrId, slot, value=None)
     itemconfigure(['column', tagOrId], slot, value)
   end
@@ -409,9 +447,15 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo(['column', tagOrId], slot)
   end
 
+  def column_dragcget_tkstring(option)
+    itemcget_tkstring(['column', 'drag'], option)
+  end
   def column_dragcget(option)
     itemcget(['column', 'drag'], option)
   end
+  def column_dragcget_strict(option)
+    itemcget_strict(['column', 'drag'], option)
+  end
   def column_dragconfigure(slot, value=None)
     itemconfigure(['column', 'drag'], slot, value)
   end
@@ -422,9 +466,15 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo(['column', 'drag'], slot)
   end
 
+  def debug_cget_tkstring(option)
+    itemcget_tkstring('debug', option)
+  end
   def debug_cget(option)
     itemcget('debug', option)
   end
+  def debug_cget_strict(option)
+    itemcget_strict('debug', option)
+  end
   def debug_configure(slot, value=None)
     itemconfigure('debug', slot, value)
   end
@@ -435,9 +485,15 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo('debug', slot)
   end
 
+  def dragimage_cget_tkstring(option)
+    itemcget_tkstring('dragimage', option)
+  end
   def dragimage_cget(option)
     itemcget('dragimage', option)
   end
+  def dragimage_cget_strict(option)
+    itemcget_strict('dragimage', option)
+  end
   def dragimage_configure(slot, value=None)
     itemconfigure('dragimage', slot, value)
   end
@@ -448,9 +504,15 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo('dragimage', slot)
   end
 
+  def element_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['element', tagOrId], option)
+  end
   def element_cget(tagOrId, option)
     itemcget(['element', tagOrId], option)
   end
+  def element_cget_strict(tagOrId, option)
+    itemcget_strict(['element', tagOrId], option)
+  end
   def element_configure(tagOrId, slot, value=None)
     itemconfigure(['element', tagOrId], slot, value)
   end
@@ -461,9 +523,15 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo(['element', tagOrId], slot)
   end
 
+  def item_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['item', tagOrId], option)
+  end
   def item_cget(tagOrId, option)
     itemcget(['item', tagOrId], option)
   end
+  def item_cget_strict(tagOrId, option)
+    itemcget_strict(['item', tagOrId], option)
+  end
   def item_configure(tagOrId, slot, value=None)
     itemconfigure(['item', tagOrId], slot, value)
   end
@@ -474,9 +542,15 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo(['item', tagOrId], slot)
   end
 
+  def item_element_cget_tkstring(item, column, elem, option)
+    itemcget_tkstring([['item', 'element'], [item, column, elem]], option)
+  end
   def item_element_cget(item, column, elem, option)
     itemcget([['item', 'element'], [item, column, elem]], option)
   end
+  def item_element_cget_strict(item, column, elem, option)
+    itemcget_strict([['item', 'element'], [item, column, elem]], option)
+  end
   def item_element_configure(item, column, elem, slot, value=None)
     itemconfigure([['item', 'element'], [item, column, elem]], slot, value)
   end
@@ -487,9 +561,15 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
   end
 
+  def marquee_cget_tkstring(option)
+    itemcget_tkstring('marquee', option)
+  end
   def marquee_cget(option)
     itemcget('marquee', option)
   end
+  def marquee_cget_strict(option)
+    itemcget_strict('marquee', option)
+  end
   def marquee_configure(slot, value=None)
     itemconfigure('marquee', slot, value)
   end
@@ -500,9 +580,26 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo('marquee', slot)
   end
 
+  def notify_cget_tkstring(win, pattern, option)
+    pattern = "<#{pattern}>"
+    # "notify" doesn't have cget subcommand.
+    tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(['notify', [win, pattern]])) << "-#{option}")), false, true)[-1]
+  end
   def notify_cget(win, pattern, option)
     pattern = "<#{pattern}>"
-    itemconfigure(['notify', [win, pattern]], option)
+    # "notify" doesn't have cget subcommand.
+    current_itemconfiginfo(['notify', [win, pattern]])[option.to_s]
+  end
+  def notify_cget_strict(win, pattern, option)
+    pattern = "<#{pattern}>"
+    # "notify" doesn't have cget subcommand.
+    info = current_itemconfiginfo(['notify', [win, pattern]])
+    option = option.to_s
+    unless info.has_key?(option)
+      fail RuntimeError, "unknown option \"#{option}\""
+    else
+      info[option]
+    end
   end
   def notify_configure(win, pattern, slot, value=None)
     pattern = "<#{pattern}>"
@@ -512,11 +609,20 @@ module Tk::TreeCtrl::ConfigMethod
     pattern = "<#{pattern}>"
     itemconfiginfo(['notify', [win, pattern]], slot)
   end
-  alias current_notify_configinfo notify_configinfo
+  def current_notify_configinfo(tagOrId, slot=nil)
+    pattern = "<#{pattern}>"
+    current_itemconfiginfo(['notify', [win, pattern]], slot)
+  end
 
+  def style_cget_tkstring(tagOrId, option)
+    itemcget_tkstring(['style', tagOrId], option)
+  end
   def style_cget(tagOrId, option)
     itemcget(['style', tagOrId], option)
   end
+  def style_cget_strict(tagOrId, option)
+    itemcget_strict(['style', tagOrId], option)
+  end
   def style_configure(tagOrId, slot, value=None)
     itemconfigure(['style', tagOrId], slot, value)
   end
@@ -527,8 +633,8 @@ module Tk::TreeCtrl::ConfigMethod
     current_itemconfiginfo(['style', tagOrId], slot)
   end
 
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
 end
 
 ##############################################
@@ -539,15 +645,23 @@ class Tk::TreeCtrl
 
   TkCommandNames = ['treectrl'.freeze].freeze
   WidgetClassName = 'TreeCtrl'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   #########################
 
   def __destroy_hook__
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.delete(@path)
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
+    }
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
+    }
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
+    }
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.delete(@path)
+    }
   end
 
   #########################
@@ -561,9 +675,9 @@ class Tk::TreeCtrl
 
   def __boolval_optkeys
     [
-      'itemwidthequal', 'usetheme', 
-      'showbuttons', 'showheader', 'showlines', 'showroot', 
-      'showrootbutton', 'showrootlines',
+      'itemwidthequal', 'usetheme',
+      'showbuttons', 'showheader', 'showlines', 'showroot',
+      'showrootbutton', 'showrootlines', 'showrootchildbuttons'
     ]
   end
   private :__boolval_optkeys
@@ -583,7 +697,7 @@ class Tk::TreeCtrl
 
   def create_self(keys)
     if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+      tk_call_without_enc(self.class::TkCommandNames[0], @path,
                           *hash_kv(keys, true))
     else
       tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -612,7 +726,7 @@ class Tk::TreeCtrl
   end
 
   def collapse_recurse(*dsc)
-    tk_send_without_enc('collapse', '-recurse', 
+    tk_send_without_enc('collapse', '-recurse',
                         *(dsc.map!{|d| _get_eval_string(d, true)}))
     self
   end
@@ -638,9 +752,11 @@ class Tk::TreeCtrl
   end
 
   def column_delete(idx)
-    if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path]
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path].delete(idx)
-    end
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path]
+        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path].delete(idx)
+      end
+    }
     tk_send('column', 'delete', idx)
     self
   end
@@ -750,11 +866,13 @@ class Tk::TreeCtrl
   end
 
   def element_delete(*elems)
-    if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path]
-      elems.each{|elem|
-        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path].delete(elem)
-      }
-    end
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path]
+        elems.each{|elem|
+          Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path].delete(elem)
+        }
+      end
+    }
     tk_send('element', 'delete', *elems)
     self
   end
@@ -859,7 +977,7 @@ class Tk::TreeCtrl
   end
 
   def item_collapse_recurse(item)
-    tk_send_without_enc('item', 'collapse', 
+    tk_send_without_enc('item', 'collapse',
                         _get_eval_string(item, true), '-recurse')
     self
   end
@@ -869,8 +987,8 @@ class Tk::TreeCtrl
   end
 
   def item_complex(item, *args)
-    tk_send_without_enc('item', 'complex', 
-                        _get_eval_string(item, true), 
+    tk_send_without_enc('item', 'complex',
+                        _get_eval_string(item, true),
                         *(args.map!{|arg| _get_eval_string(arg, true)}))
     self
   end
@@ -885,22 +1003,25 @@ class Tk::TreeCtrl
 
   def _erase_children(item)
     item_children(item).each{|i| _erase_children(i)}
+    # table is already locked
     Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].delete(item)
   end
   private :_erase_children
 
   def item_delete(first, last=None)
-    if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path]
-      if first == 'all' || first == :all || last == 'all' || last == :all
-        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].clear
-      elsif last == None
-        _erase_children(first)
-      else
-        self.range(first, last).each{|id|
-          _erase_children(id)
-        }
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path]
+        if first == 'all' || first == :all || last == 'all' || last == :all
+          Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].clear
+        elsif last == None
+          _erase_children(first)
+        else
+          self.range(first, last).each{|id|
+            _erase_children(id)
+          }
+        end
       end
-    end
+    }
     tk_send('item', 'delete', first, last)
     self
   end
@@ -933,12 +1054,12 @@ class Tk::TreeCtrl
 
   def item_firstchild(parent, child=nil)
     if child
-      tk_send_without_enc('item', 'firstchild', 
-                          _get_eval_string(parent, true), 
+      tk_send_without_enc('item', 'firstchild',
+                          _get_eval_string(parent, true),
                           _get_eval_string(child, true))
       self
     else
-      id = num_or_str(tk_send_without_enc('item', 'firstchild', 
+      id = num_or_str(tk_send_without_enc('item', 'firstchild',
                                           _get_eval_string(parent, true)))
       Tk::TreeCtrl::Item.id2obj(self, id)
     end
@@ -947,11 +1068,11 @@ class Tk::TreeCtrl
 
   def item_hasbutton(item, st=None)
     if st == None
-      bool(tk_send_without_enc('item', 'hasbutton', 
+      bool(tk_send_without_enc('item', 'hasbutton',
                                _get_eval_string(item, true)))
     else
-      tk_send_without_enc('item', 'hasbutton', 
-                          _get_eval_string(item, true), 
+      tk_send_without_enc('item', 'hasbutton',
+                          _get_eval_string(item, true),
                           _get_eval_string(st))
       self
     end
@@ -1011,12 +1132,12 @@ class Tk::TreeCtrl
 
   def item_lastchild(parent, child=nil)
     if child
-      tk_send_without_enc('item', 'lastchild', 
+      tk_send_without_enc('item', 'lastchild',
                           _get_eval_string(parent, true),
                           _get_eval_string(child, true))
       self
     else
-      id = num_or_str(tk_send_without_enc('item', 'lastchild', 
+      id = num_or_str(tk_send_without_enc('item', 'lastchild',
                                           _get_eval_string(parent, true)))
       Tk::TreeCtrl::Item.id2obj(self, id)
     end
@@ -1035,7 +1156,7 @@ class Tk::TreeCtrl
   alias item_next_sibling item_nextsibling
 
   def item_numchildren(item)
-    number(tk_send_without_enc('item', 'numchildren', 
+    number(tk_send_without_enc('item', 'numchildren',
                                _get_eval_string(item, true)))
   end
   alias item_num_children  item_numchildren
@@ -1196,20 +1317,20 @@ class Tk::TreeCtrl
   def item_style_set(item, column=nil, *args)
     if args.empty?
       if column
-        id = tk_send_without_enc('item', 'style', 'set', 
-                                 _get_eval_string(item, true), 
+        id = tk_send_without_enc('item', 'style', 'set',
+                                 _get_eval_string(item, true),
                                  _get_eval_string(column, true))
         Tk::TreeCtrl::Style.id2obj(self, id)
       else
-        list(tk_send_without_enc('item', 'style', 'set', 
+        list(tk_send_without_enc('item', 'style', 'set',
                                  _get_eval_string(item, true))).collect!{|id|
           Tk::TreeCtrl::Style.id2obj(self, id)
         }
       end
     else
-      tk_send_without_enc('item', 'style', 'set', 
-                          _get_eval_string(item, true), 
-                          _get_eval_string(column, true), 
+      tk_send_without_enc('item', 'style', 'set',
+                          _get_eval_string(item, true),
+                          _get_eval_string(column, true),
                           *(args.flatten.map!{|arg|
                               _get_eval_string(arg, true)
                             }))
@@ -1472,8 +1593,8 @@ class Tk::TreeCtrl
     self
   end
 
-  def see(item)
-    tk_send('see', item)
+  def see(item, column=None, keys={})
+    tk_send('see', item, column, *hash_kv(keys))
     self
   end
 
@@ -1520,11 +1641,13 @@ class Tk::TreeCtrl
   end
 
   def style_delete(*args)
-    if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path]
-      args.each{|sty|
-        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path].delete(sty)
-      }
-    end
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path]
+        args.each{|sty|
+          Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path].delete(sty)
+        }
+      end
+    }
     tk_send('style', 'delete', *args)
     self
   end
@@ -1563,8 +1686,8 @@ class Tk::TreeCtrl
         tk_send('style', 'layout', style, elem, *hash_kv(keys))
         self
       else
-        _conv_style_layout_val(keys, 
-                               tk_send('style', 'layout', 
+        _conv_style_layout_val(keys,
+                               tk_send('style', 'layout',
                                        style, elem, "-#{keys}"))
       end
     else
@@ -1608,15 +1731,29 @@ end
 
 class Tk::TreeCtrl::Column < TkObject
   TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
-  TreeCtrlColumnID = ['treectrl_column'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear}
+  (TreeCtrlColumnID = ['treectrl_column'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
+        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
+                   Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys={})
@@ -1625,17 +1762,19 @@ class Tk::TreeCtrl::Column < TkObject
 
     keys = _symbolkey2str(keys)
 
-    @path = @id = 
-      keys.delete('tag') ||
-      Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
+    Tk::TreeCtrl::Column::TreeCtrlColumnID.mutex.synchronize{
+      @path = @id =
+        keys.delete('tag') ||
+        Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
+      Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
+    }
 
     keys['tag'] = @id
 
-    unless Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath]
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
-    Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] ||= {}
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
+    }
 
     @tree.column_create(keys)
   end
@@ -1648,9 +1787,15 @@ class Tk::TreeCtrl::Column < TkObject
     @id.to_s.dup
   end
 
+  def cget_tkstring(opt)
+    @tree.column_cget_tkstring(@tree.column_index(@id), opt)
+  end
   def cget(opt)
     @tree.column_cget(@tree.column_index(@id), opt)
   end
+  def cget_strict(opt)
+    @tree.column_cget_strict(@tree.column_index(@id), opt)
+  end
 
   def configure(*args)
     @tree.column_configure(@tree.column_index(@id), *args)
@@ -1692,11 +1837,18 @@ end
 
 class Tk::TreeCtrl::Element < TkObject
   TreeCtrlElementID_TBL = TkCore::INTERP.create_table
-  TreeCtrlElementID = ['treectrl_element'.freeze, '00000'.taint].freeze
+
+  (TreeCtrlElementID = ['treectrl_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
   TreeCtrlElemTypeToClass = {}
 
   TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
+    }
   }
 
   def self.type2class(type)
@@ -1705,22 +1857,30 @@ class Tk::TreeCtrl::Element < TkObject
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
+        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
                  Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, type, keys=nil)
     @tree = parent
     @tpath = parent.path
     @type = type.to_s
-    @path = @id = 
-      Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
-    unless Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath]
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
-    Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
+    Tk::TreeCtrl::Element::TreeCtrlElementID.mutex.synchronize{
+      @path = @id =
+        Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
+      Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
+    }
+
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] ||= {}
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
+    }
 
     @tree.element_create(@id, @type, keys)
   end
@@ -1733,9 +1893,15 @@ class Tk::TreeCtrl::Element < TkObject
     @id.dup
   end
 
+  def cget_tkstring(opt)
+    @tree.element_cget_tkstring(@id, opt)
+  end
   def cget(opt)
     @tree.element_cget(@id, opt)
   end
+  def cget_strict(opt)
+    @tree.element_cget_strict(@id, opt)
+  end
 
   def configure(*args)
     @tree.element_configure(@id, *args)
@@ -1800,13 +1966,22 @@ end
 class Tk::TreeCtrl::Item < TkObject
   TreeCtrlItemID_TBL = TkCore::INTERP.create_table
 
-  TkCore::INTERP.init_ip_env{Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear}
+  TkCore::INTERP.init_ip_env{
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
+        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
+                        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys={})
@@ -1814,10 +1989,10 @@ class Tk::TreeCtrl::Item < TkObject
     @tpath = parent.path
     @path = @id = @tree.item_create(keys)
 
-    unless Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath]
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] ||= {}
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
+    }
   end
 
   def id
@@ -1855,9 +2030,15 @@ class Tk::TreeCtrl::Item < TkObject
     self
   end
 
+  def cget_tkstring(opt)
+    @tree.item_cget_tkstring(@id, opt)
+  end
   def cget(opt)
     @tree.item_cget(@id, opt)
   end
+  def cget_strict(opt)
+    @tree.item_cget_strict(@id, opt)
+  end
 
   def configure(*args)
     @tree.item_configure(@id, *args)
@@ -1888,9 +2069,15 @@ class Tk::TreeCtrl::Item < TkObject
     @tree.item_element_actual(@id, column, elem, key)
   end
 
-  def element_cget(opt)
+  def element_cget_tkstring(opt)
     @tree.item_element_cget(@id, opt)
   end
+  def element_cget_tkstring(opt)
+    @tree.item_element_cget(@id, opt)
+  end
+  def element_cget_strict(opt)
+    @tree.item_element_cget_strict(@id, opt)
+  end
 
   def element_configure(*args)
     @tree.item_element_configure(@id, *args)
@@ -2088,27 +2275,45 @@ end
 
 class Tk::TreeCtrl::Style < TkObject
   TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
-  TreeCtrlStyleID = ['treectrl_style'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear }
+  (TreeCtrlStyleID = ['treectrl_style'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
+        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
+                     Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys=nil)
     @tree = parent
     @tpath = parent.path
-    @path = @id = 
-      Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
-    unless Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath]
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
-    Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
+
+    Tk::TreeCtrl::Style::TreeCtrlStyleID.mutex.synchronize{
+      @path = @id =
+        Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
+      Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
+    }
+
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] ||= {}
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
+    }
 
     @tree.style_create(@id, keys)
   end
@@ -2121,9 +2326,15 @@ class Tk::TreeCtrl::Style < TkObject
     @id.dup
   end
 
+  def cget_tkstring(opt)
+    @tree.style_cget_tkstring(@id, opt)
+  end
   def cget(opt)
     @tree.style_cget(@id, opt)
   end
+  def cget_strict(opt)
+    @tree.style_cget_strict(@id, opt)
+  end
 
   def configure(*args)
     @tree.style_configure(@id, *args)
diff --git a/ext/tk/lib/tkextlib/trofs/setup.rb b/ext/tk/lib/tkextlib/trofs/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/trofs/setup.rb
+++ b/ext/tk/lib/tkextlib/trofs/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/version.rb b/ext/tk/lib/tkextlib/version.rb
index c7816fd4a5..4bef78fe54 100644
--- a/ext/tk/lib/tkextlib/version.rb
+++ b/ext/tk/lib/tkextlib/version.rb
@@ -2,5 +2,5 @@
 # release date of tkextlib
 #
 module Tk
-  Tkextlib_RELEASE_DATE = '2007-05-26'.freeze
+  Tkextlib_RELEASE_DATE = '2010-02-01'.freeze
 end
diff --git a/ext/tk/lib/tkextlib/vu/bargraph.rb b/ext/tk/lib/tkextlib/vu/bargraph.rb
index 27ff3c7cd0..b9fcf925f3 100644
--- a/ext/tk/lib/tkextlib/vu/bargraph.rb
+++ b/ext/tk/lib/tkextlib/vu/bargraph.rb
@@ -19,7 +19,7 @@ require 'tkextlib/vu.rb'
 class Tk::Vu::Bargraph < TkWindow
   TkCommandNames = ['::vu::bargraph'.freeze].freeze
   WidgetClassName = 'Bargraph'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ###############################
 
@@ -30,10 +30,10 @@ class Tk::Vu::Bargraph < TkWindow
 
   def __strval_optkeys
     super() + [
-      'title', 
-      'barbackground', 'barcolor', 'barcolour', 
-      'tickcolor', 'tickcolour', 
-      'textcolor', 'textcolour', 
+      'title',
+      'barbackground', 'barcolor', 'barcolour',
+      'tickcolor', 'tickcolour',
+      'textcolor', 'textcolour',
     ]
   end
   private :__strval_optkeys
diff --git a/ext/tk/lib/tkextlib/vu/charts.rb b/ext/tk/lib/tkextlib/vu/charts.rb
index ee4298fa1c..8569ac5541 100644
--- a/ext/tk/lib/tkextlib/vu/charts.rb
+++ b/ext/tk/lib/tkextlib/vu/charts.rb
@@ -18,7 +18,7 @@ module Tk
       private :__item_boolval_optkeys
 
       def __item_strval_optkeys(id)
-        super(id) << 'bar' << 'color' << 'outline' << 
+        super(id) << 'bar' << 'color' << 'outline' <<
           'fill' << 'scaleline' << 'stripline'
       end
       private :__item_strval_optkeys
diff --git a/ext/tk/lib/tkextlib/vu/dial.rb b/ext/tk/lib/tkextlib/vu/dial.rb
index e27a38ae42..4d04974a55 100644
--- a/ext/tk/lib/tkextlib/vu/dial.rb
+++ b/ext/tk/lib/tkextlib/vu/dial.rb
@@ -19,7 +19,7 @@ require 'tkextlib/vu.rb'
 class Tk::Vu::Dial < TkWindow
   TkCommandNames = ['::vu::dial'.freeze].freeze
   WidgetClassName = 'Dial'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   ###############################
 
@@ -32,10 +32,10 @@ class Tk::Vu::Dial < TkWindow
 
   def coords(val = nil)
     if val
-      tk_split_list(tk_send_without_enc('coords'))
-    else
       tk_send_without_enc('coords', val)
       self
+    else
+      tk_split_list(tk_send_without_enc('coords'))
     end
   end
 
diff --git a/ext/tk/lib/tkextlib/vu/pie.rb b/ext/tk/lib/tkextlib/vu/pie.rb
index 78f3fa54da..6b0c485d8a 100644
--- a/ext/tk/lib/tkextlib/vu/pie.rb
+++ b/ext/tk/lib/tkextlib/vu/pie.rb
@@ -37,7 +37,7 @@ end
 class Tk::Vu::Pie < TkWindow
   TkCommandNames = ['::vu::pie'.freeze].freeze
   WidgetClassName = 'Pie'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  WidgetClassNames[WidgetClassName] ||= self
 
   def __destroy_hook__
     Tk::Vu::PieSlice::SliceID_TBL.delete(@path)
@@ -116,13 +116,26 @@ end
 
 class Tk::Vu::PieSlice
   SliceID_TBL = TkCore::INTERP.create_table
-  Pie_Slice_ID = ['vu:pie'.freeze, '00000'.taint].freeze
-  TkCore::INTERP.init_ip_env{ SliceID_TBL.clear }
+
+  (Pie_Slice_ID = ['vu:pie'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    SliceID_TBL.mutex.synchronize{ SliceID_TBL.clear }
+  }
 
   def self.id2obj(pie, id)
     pie_path = pie.path
-    return id unless SliceID_TBL[pie_path]
-    SliceID_TBL[pie_path][id]? SliceID_TBL[pie_path][id]: id
+    SliceID_TBL.mutex.synchronize{
+      if SliceID_TBL[pie_path]
+        SliceID_TBL[pie_path][id]? SliceID_TBL[pie_path][id]: id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, *args)
@@ -131,10 +144,14 @@ class Tk::Vu::PieSlice
     end
     @parent = @pie = parent
     @ppath = parent.path
-    @path = @id = Pie_Slice_ID.join(TkCore::INTERP._ip_id_)
-    SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-    SliceID_TBL[@ppath][@id] = self
-    Pie_Slice_ID[1].succ!
+    Pie_Slice_ID.mutex.synchronize{
+      @path = @id = Pie_Slice_ID.join(TkCore::INTERP._ip_id_)
+      Pie_Slice_ID[1].succ!
+    }
+    SliceID_TBL.mutex.synchronize{
+      SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
+      SliceID_TBL[@ppath][@id] = self
+    }
 
     if args[-1].kind_of?(Hash)
       keys = args.unshift
@@ -156,10 +173,18 @@ class Tk::Vu::PieSlice
     val
   end
 
+  def cget_tkstring(slot)
+    @pie.itemcget_tkstring(@id, slot)
+  end
+
   def cget(slot)
     @pie.itemcget(@id, slot)
   end
 
+  def cget_strict(slot)
+    @pie.itemcget_strict(@id, slot)
+  end
+
   def configure(*args)
     @pie.itemconfigure(@id, *args)
     self
@@ -209,22 +234,48 @@ end
 
 class Tk::Vu::NamedPieSlice
   def self.new(parent, name, *args)
-    if SliceID_TBL[parent.path] && SliceID_TBL[parent.path][name]
-      return SliceID_TBL[parent.path][name]
-    else
-      super(parent, name, *args)
-    end
+    obj = nil
+    SliceID_TBL.mutex.synchronize{
+      if SliceID_TBL[parent.path] && SliceID_TBL[parent.path][name]
+        obj = SliceID_TBL[parent.path][name]
+      else
+        #super(parent, name, *args)
+        unless parent.kind_of?(Tk::Vu::Pie)
+          fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
+        end
+        obj = self.allocate
+        obj.instance_eval{
+          @parent = @pie = parent
+          @ppath = parent.path
+          @path = @id = name.to_s
+          SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
+          SliceID_TBL[@ppath][@id] = self
+        }
+      end
+    }
+    obj.instance_eval{
+      if args[-1].kind_of?(Hash)
+        keys = args.unshift
+      end
+      @pie.set(@id, *args)
+      configure(keys)
+    }
+
+    obj
   end
 
   def initialize(parent, name, *args)
+    # dummy:: not called by 'new' method
     unless parent.kind_of?(Tk::Vu::Pie)
       fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
     end
     @parent = @pie = parent
     @ppath = parent.path
     @path = @id = name.to_s
-    SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-    SliceID_TBL[@ppath][@id] = self
+    SliceID_TBL.mutex.synchronize{
+      SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
+      SliceID_TBL[@ppath][@id] = self
+    }
 
     if args[-1].kind_of?(Hash)
       keys = args.unshift
diff --git a/ext/tk/lib/tkextlib/vu/setup.rb b/ext/tk/lib/tkextlib/vu/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/vu/setup.rb
+++ b/ext/tk/lib/tkextlib/vu/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/vu/spinbox.rb b/ext/tk/lib/tkextlib/vu/spinbox.rb
index b6499645a3..7d6104f4d1 100644
--- a/ext/tk/lib/tkextlib/vu/spinbox.rb
+++ b/ext/tk/lib/tkextlib/vu/spinbox.rb
@@ -7,7 +7,7 @@
 #
 require 'tk'
 
-if (Tk::TK_MAJOR_VERSION < 8 || 
+if (Tk::TK_MAJOR_VERSION < 8 ||
     (Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION < 4))
   # call setup script  --  <libdir>/tkextlib/vu.rb
   require 'tkextlib/vu.rb'
@@ -17,6 +17,6 @@ end
 
 module Tk
   module Vu
-    Spinbox = TkSpinbox
+    Spinbox = Tk::Spinbox
   end
 end
diff --git a/ext/tk/lib/tkextlib/winico/setup.rb b/ext/tk/lib/tkextlib/winico/setup.rb
index ce0f0bd4d4..ee406c6ca0 100644
--- a/ext/tk/lib/tkextlib/winico/setup.rb
+++ b/ext/tk/lib/tkextlib/winico/setup.rb
@@ -2,7 +2,7 @@
 #  setup.rb   --   setup script before calling TkPackage.require()
 #
 #    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages 
-#    wrapped by Ruby scripts in this directory, please write the setup 
+#    to the library search path) before using Tcl/Tk library packages
+#    wrapped by Ruby scripts in this directory, please write the setup
 #    operations in this file.
 #
diff --git a/ext/tk/lib/tkextlib/winico/winico.rb b/ext/tk/lib/tkextlib/winico/winico.rb
index c53a3ff48c..9160c2960f 100644
--- a/ext/tk/lib/tkextlib/winico/winico.rb
+++ b/ext/tk/lib/tkextlib/winico/winico.rb
@@ -34,14 +34,19 @@ end
 
 class Tk::Winico
   WinicoID_TBL = TkCore::INTERP.create_table
-  TkCore::INTERP.init_ip_env{ WinicoID_TBL.clear }
+
+  TkCore::INTERP.init_ip_env{
+    WinicoID_TBL.mutex.synchronize{ WinicoID_TBL.clear }
+  }
 
   def self.id2obj(id)
-    (WinicoID_TBL.key?(id))? WinicoID_TBL[id] : id
+    WinicoID_TBL.mutex.synchronize{
+      (WinicoID_TBL.key?(id))? WinicoID_TBL[id] : id
+    }
   end
 
   def self.info
-    simplelist(Tk.tk_call('winico', 'info')).collect{|id| 
+    simplelist(Tk.tk_call('winico', 'info')).collect{|id|
       Tk::Winico.id2obj(id)
     }
   end
@@ -77,11 +82,13 @@ class Tk::Winico
     elsif winico_id
       @id = winico_id
     else
-      fail ArgumentError, 
+      fail ArgumentError,
            "must be given proper information from where loading icons"
     end
     @path = @id
-    WinicoID_TBL[@id] = self
+    WinicoID_TBL.mutex.synchronize{
+      WinicoID_TBL[@id] = self
+    }
   end
 
   def id
@@ -89,14 +96,16 @@ class Tk::Winico
   end
 
   def set_window(win_id, *opts) # opts := ?'big'|'small'?, ?pos?
-    # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED. 
+    # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED.
     #        If not, then this may fail or crash.
     tk_call('winico', 'setwindow', win_id, @id, *opts)
   end
 
   def delete
     tk_call('winico', 'delete', @id)
-    WinicoID_TBL.delete(@id)
+    WinicoID_TBL.mutex.synchronize{
+      WinicoID_TBL.delete(@id)
+    }
     self
   end
   alias destroy delete
@@ -110,31 +119,55 @@ class Tk::Winico
   class Winico_callback < TkValidateCommand
     class ValidateArgs < TkUtil::CallbackSubst
       KEY_TBL = [
-        [ ?m, ?s, :message ], 
-        [ ?i, ?x, :icon ], 
-        [ ?x, ?n, :x ], 
-        [ ?y, ?n, :y ], 
-        [ ?X, ?n, :last_x ], 
-        [ ?Y, ?n, :last_y ], 
-        [ ?t, ?n, :tickcount ], 
-        [ ?w, ?n, :icon_idnum ], 
-        [ ?l, ?n, :msg_idnum ], 
+        [ ?m, ?s, :message ],
+        [ ?i, ?x, :icon ],
+        [ ?x, ?n, :x ],
+        [ ?y, ?n, :y ],
+        [ ?X, ?n, :last_x ],
+        [ ?Y, ?n, :last_y ],
+        [ ?t, ?n, :tickcount ],
+        [ ?w, ?n, :icon_idnum ],
+        [ ?l, ?n, :msg_idnum ],
         nil
       ]
 
       PROC_TBL = [
-        [ ?n, TkComm.method(:number) ], 
-        [ ?s, TkComm.method(:string) ], 
-        [ ?x, proc{|id| 
-            if Tk::Winico::WinicoID_TBL.key?(id)
-              Tk::Winico::WinicoID_TBL[id]
-            else
-              Tk::Winico.new(nil, nil, id)
-            end
-          } ], 
+        [ ?n, TkComm.method(:number) ],
+        [ ?s, TkComm.method(:string) ],
+        [ ?x, proc{|id|
+            Tk::Winico::WinicoID_TBL.mutex.synchronize{
+              if Tk::Winico::WinicoID_TBL.key?(id)
+                obj = Tk::Winico::WinicoID_TBL[id]
+              else
+                # Tk::Winico.new(nil, nil, id)
+                obj = Tk::Winico.allocate
+                obj.instance_eval{ @path = @id = id }
+                Tk::Winico::WinicoID_TBL[id] = obj
+              end
+              obj
+            }
+          } ],
         nil
       ]
 
+=begin
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+=end
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -154,7 +187,8 @@ class Tk::Winico
     Winico_callback._config_keys.each{|k|
       if keys[k].kind_of?(Array)
         cmd, *args = keys[k]
-        keys[k] = Winico_callback.new(cmd, args.join(' '))
+        #keys[k] = Winico_callback.new(cmd, args.join(' '))
+        keys[k] = Winico_callback.new(cmd, *args)
        # elsif keys[k].kind_of?(Proc)
       elsif TkComm._callback_entry?(keys[k])
         keys[k] = Winico_callback.new(keys[k])
@@ -170,7 +204,8 @@ class Tk::Winico
     Winico_callback._config_keys.each{|k|
       if keys[k].kind_of?(Array)
         cmd, *args = keys[k]
-        keys[k] = Winico_callback.new(cmd, args.join(' '))
+        #keys[k] = Winico_callback.new(cmd, args.join(' '))
+        keys[k] = Winico_callback.new(cmd, *args)
       # elsif keys[k].kind_of?(Proc)
       elsif TkComm._callback_entry?(keys[k])
         keys[k] = Winico_callback.new(keys[k])
diff --git a/ext/tk/old-extconf.rb b/ext/tk/old-extconf.rb
new file mode 100644
index 0000000000..ebc83a0c0b
--- /dev/null
+++ b/ext/tk/old-extconf.rb
@@ -0,0 +1,440 @@
+# extconf.rb for tcltklib
+
+require 'mkmf'
+
+is_win32 = (/mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM)
+#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
+
+have_func("ruby_native_thread_p", "ruby.h")
+have_func("rb_errinfo", "ruby.h")
+have_func("rb_safe_level", "ruby.h")
+have_struct_member("struct RArray", "ptr", "ruby.h")
+have_struct_member("struct RArray", "len", "ruby.h")
+
+def find_framework(tcl_hdr, tk_hdr)
+  if framework_dir = with_config("tcltk-framework")
+    paths = [framework_dir]
+  else
+    unless tcl_hdr || tk_hdr ||
+        enable_config("tcltk-framework", false) ||
+        enable_config("mac-tcltk-framework", false)
+      return false
+    end
+    paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
+  end
+
+  checking_for('Tcl/Tk Framework') {
+    paths.find{|dir|
+      dir.strip!
+      dir.chomp!('/')
+      (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
+        (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
+    }
+  }
+end
+
+tcl_framework_header = with_config("tcl-framework-header")
+tk_framework_header  = with_config("tk-framework-header")
+
+tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
+
+unless is_win32
+  have_library("nsl", "t_open")
+  have_library("socket", "socket")
+  have_library("dl", "dlopen")
+  have_library("m", "log")
+end
+
+tk_idir,  tk_ldir  = dir_config("tk")
+tcl_idir, tcl_ldir = dir_config("tcl")
+x11_idir, x11_ldir = dir_config("X11")
+
+tk_ldir2  = with_config("tk-lib")
+tcl_ldir2 = with_config("tcl-lib")
+x11_ldir2 = with_config("X11-lib")
+
+tk_ldir_list  = [tk_ldir2,  tk_ldir]
+tcl_ldir_list = [tcl_ldir2, tcl_ldir]
+
+tklib = with_config("tklib")
+tcllib = with_config("tcllib")
+stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
+
+tcltk_version = with_config("tcltkversion")
+
+use_X = with_config("X11", (! is_win32))
+
+def parse_tclConfig(file)
+  # check tclConfig.sh/tkConfig.sh
+  tbl = {}
+  IO.foreach(file){|line|
+    line.strip!
+    next if line !~ /^([^\#=][^=]*)=(['"]|)(.*)\2$/
+    key, val = $1, $3
+    tbl[key] = val.gsub(/\$\{([^}]+)\}/){|s| tbl[$1]} rescue nil
+  }
+  tbl
+end
+
+def check_tcltk_version(version)
+  return [nil, nil] unless version
+
+  version = version.strip
+
+  tclver = version.dup
+  tkver  = version.dup
+
+  major = dot = minor = dot = plvl = ext = nil
+
+  if version =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
+    major = $1; minor_dot = $2; minor = $3; plvl_dot  = $4; plvl = $5; ext = $6
+    dot = ! minor_dot.empty?
+    if plvl_dot.empty? && ! plvl.empty?
+      minor << plvl
+    end
+  elsif version =~ /^(\d)(\.?)(\d?)(.*)$/
+    major = $1; minor_dot = $2; minor = $3; ext = $4
+    dot = ! minor_dot.empty?
+  else # unknown -> believe user
+    return [tclver, tkver]
+  end
+
+  # check Tcl7.6 / Tk4.2 ?
+  if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
+    # Tk4.2
+    tkver  = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
+  elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
+    # Tcl7.6
+    tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
+  end
+
+  [tclver, tkver]
+end
+
+def find_tcl(tcllib, stubs, version, *opt_paths)
+  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+  default_paths << "/Tcl/lib"  # default for ActiveTcl
+
+  if (paths = opt_paths.compact).empty?
+    paths = default_paths
+  end
+
+  if stubs
+    func = "Tcl_InitStubs"
+    lib = "tclstub"
+  else
+    func = "Tcl_FindExecutable"
+    lib = "tcl"
+  end
+
+  if version && ! version.empty?
+    versions = [version]
+  else
+    versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
+  end
+
+  if tcllib
+    st = find_library(tcllib, func, *paths)
+  else
+    st = versions.find { |ver|
+           find_library("#{lib}#{ver}", func, *paths) or
+           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+           find_library("#{lib}#{ver}g", func, *paths) or
+           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
+           find_library("tcl#{ver}", func, *paths) or
+           find_library("tcl#{ver.delete('.')}", func, *paths) or
+           find_library("tcl#{ver}g", func, *paths) or
+           find_library("tcl#{ver.delete('.')}g", func, *paths)
+         } || (!version && find_library(lib, func, *paths))
+  end
+
+  unless st
+    puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
+  end
+  st
+end
+
+def find_tk(tklib, stubs, version, *opt_paths)
+  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+  default_paths << "/Tcl/lib"  # default for ActiveTcl
+
+  if (paths = opt_paths.compact).empty?
+    paths = default_paths
+  end
+
+  if stubs
+    func = "Tk_InitStubs"
+    lib = "tkstub"
+  else
+    func = "Tk_Init"
+    lib = "tk"
+  end
+
+  if version && ! version.empty?
+    versions = [version]
+  else
+    versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
+  end
+
+  if tklib
+    st = find_library(tklib, func, *paths)
+  else
+    st = versions.find { |ver|
+           find_library("#{lib}#{ver}", func, *paths) or
+           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+           find_library("#{lib}#{ver}g", func, *paths) or
+           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
+           find_library("tk#{ver}", func, *paths) or
+           find_library("tk#{ver.delete('.')}", func, *paths) or
+           find_library("tk#{ver}g", func, *paths) or
+           find_library("tk#{ver.delete('.')}g", func, *paths)
+         } || (!version && find_library(lib, func, *paths))
+  end
+
+  unless st
+    puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
+  end
+  st
+end
+
+def find_tcltk_header(tclver, tkver)
+  base_dir = ['/usr/local/include', '/usr/pkg/include', '/usr/include']
+  base_dir << '/Tcl/include' # default for ActiveTcl
+
+  unless have_tcl_h = have_header('tcl.h')
+    if tclver && ! tclver.empty?
+      versions = [tclver]
+    else
+      versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
+    end
+    paths = base_dir.dup
+    versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tcl' + ver})}
+    have_tcl_h = find_header('tcl.h', *paths)
+  end
+
+  unless have_tk_h  = have_header("tk.h")
+    if tkver && ! tkver.empty?
+      versions = [tkver]
+    else
+      versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
+    end
+    paths = base_dir.dup
+    versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tk' + ver})}
+    have_tk_h = find_header('tk.h', *paths)
+  end
+
+  have_tcl_h && have_tk_h
+end
+
+def find_X11(*opt_paths)
+  default_paths =
+    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
+  paths = opt_paths.compact.concat(default_paths)
+  st = find_library("X11", "XOpenDisplay", *paths)
+  unless st
+    puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
+  end
+  st
+end
+
+def pthread_check()
+  tcl_major_ver = nil
+  tcl_minor_ver = nil
+
+  # Is tcl-thread given by user ?
+  case enable_config("tcl-thread")
+  when true
+    tcl_enable_thread = true
+  when false
+    tcl_enable_thread = false
+  else
+    tcl_enable_thread = nil
+  end
+
+  if (tclConfig = with_config("tclConfig-file"))
+    if tcl_enable_thread == true
+      puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
+    elsif tcl_enable_thread == false
+      puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
+    else
+      # tcl-thread is unknown and tclConfig.sh is given
+      begin
+        tbl = parse_tclConfig(tclConfig)
+        if tbl['TCL_THREADS']
+          tcl_enable_thread = (tbl['TCL_THREADS'] == "1")
+        else
+          tcl_major_ver = tbl['TCL_MAJOR_VERSION'].to_i
+          tcl_minor_ver = tbl['TCL_MINOR_VERSION'].to_i
+          if tcl_major_ver < 8 || (tcl_major_ver == 8 && tcl_minor_ver == 0)
+            tcl_enable_thread = false
+          end
+        end
+
+        if tcl_enable_thread == nil
+          # cannot find definition
+          if tcl_major_ver
+            puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
+          else
+            puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
+          end
+          tclConfig = false
+        end
+      rescue Exception
+        puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
+        tclConfig = false
+      end
+    end
+  end
+
+  if tcl_enable_thread == nil && !tclConfig
+    # tcl-thread is unknown and tclConfig is unavailable
+    begin
+      try_run_available = try_run("int main() { exit(0); }")
+    rescue Exception
+      # cannot try_run. Is CROSS-COMPILE environment?
+      puts(%Q'\
+*****************************************************************************
+**
+** PTHREAD SUPPORT CHECK WARNING:
+**
+**   We cannot check the consistency of pthread support between Ruby
+**   and the Tcl/Tk library in your environment (are you perhaps
+**   cross-compiling?). If pthread support for these 2 packages is
+**   inconsistent you may find you get errors when running Ruby/Tk
+**   (e.g. hangs or segmentation faults).  We strongly recommend
+**   you to check the consistency manually.
+**
+*****************************************************************************
+')
+      return true
+    end
+  end
+
+  if tcl_enable_thread == nil
+    # tcl-thread is unknown
+    if try_run(<<EOF)
+#include <tcl.h>
+int main() {
+   Tcl_Interp *ip;
+   ip = Tcl_CreateInterp();
+   exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
+}
+EOF
+      tcl_enable_thread = true
+    elsif try_run(<<EOF)
+#include <tcl.h>
+static Tcl_ThreadDataKey dataKey;
+int main() { exit((Tcl_GetThreadData(&dataKey, 1) == dataKey)? 1: 0); }
+EOF
+      tcl_enable_thread = true
+    else
+      tcl_enable_thread = false
+    end
+  end
+
+  # check pthread mode
+  if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
+    # ruby -> enable
+    unless tcl_enable_thread
+      # ruby -> enable && tcl -> disable
+      puts(%Q'\
+*****************************************************************************
+**
+** PTHREAD SUPPORT MODE WARNING:
+**
+**   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
+**   seems to be compiled without pthread support. Although you can
+**   create the tcltklib library, this combination may cause errors
+**   (e.g. hangs or segmentation faults). If you have no reason to
+**   keep the current pthread support status, we recommend you reconfigure
+**   and recompile the libraries so that both or neither support pthreads.
+**
+**   If you want change the status of pthread support, please recompile
+**   Ruby without "--enable-pthread" configure option or recompile Tcl/Tk
+**   with "--enable-threads" configure option (if your Tcl/Tk is later
+**   than or equal to Tcl/Tk 8.1).
+**
+*****************************************************************************
+')
+    end
+
+    # ruby -> enable && tcl -> enable/disable
+    if tcl_enable_thread
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
+    else
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
+    end
+
+    return true
+
+  else
+    # ruby -> disable
+    if tcl_enable_thread
+      # ruby -> disable && tcl -> enable
+      puts(%Q'\
+*****************************************************************************
+**
+** PTHREAD SUPPORT MODE ERROR:
+**
+**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk
+**   library seems to be compiled with pthread support. This
+**   combination may cause frequent hang or segmentation fault
+**   errors when Ruby/Tk is working. We recommend that you NEVER
+**   create the library with such a combination of pthread support.
+**
+**   Please recompile Ruby with the "--enable-pthread" configure option
+**   or recompile Tcl/Tk with the "--disable-threads" configure option.
+**
+*****************************************************************************
+')
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
+      return false
+    else
+      # ruby -> disable && tcl -> disable
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
+      return true
+    end
+  end
+end
+
+tclver, tkver = check_tcltk_version(tcltk_version)
+
+if ( tcltk_framework ||
+       ( find_tcltk_header(tclver, tkver) &&
+           ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
+           find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
+           find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
+  $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
+  $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
+
+  if tcltk_framework
+    if tcl_framework_header
+      $CPPFLAGS += " -I#{tcl_framework_header}"
+    else
+      $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
+    end
+
+    if tk_framework_header
+      $CPPFLAGS += " -I#{tk_framework_header}"
+    else
+      $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
+    end
+
+    $LDFLAGS += ' -framework Tk -framework Tcl'
+  end
+
+  if stubs or pthread_check
+    # create Makefile
+
+    # for SUPPORT_STATUS
+    $INSTALLFILES ||= []
+    $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
+
+    have_func("rb_hash_lookup", "ruby.h")
+
+    # create
+    $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
+    $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
+    create_makefile("tcltklib")
+  end
+end
diff --git a/ext/tk/sample/24hr_clock.rb b/ext/tk/sample/24hr_clock.rb
index 60d8072c57..29f84e0b40 100644
--- a/ext/tk/sample/24hr_clock.rb
+++ b/ext/tk/sample/24hr_clock.rb
@@ -19,7 +19,7 @@ class Clock
     @mark_color    = 'black'
     @submark_color = 'gray50'
 
-    @c = TkCanvas.new(:width=>2*@size, :height=>2*@size, 
+    @c = TkCanvas.new(:width=>2*@size, :height=>2*@size,
                      :scrollregion=>[-@size, -@size, @size, @size]
                      ).pack(:fill=>:both, :expand=>true)
 
@@ -59,26 +59,26 @@ class Clock
   def _create_marks
     @mark_tag = TkcTag.new(@c)
 
-    TkcLine.new(@c, 0, -0.90*@size, 0, -0.85*@size, 
-                :tags=>[@tag, @mark_tag], 
+    TkcLine.new(@c, 0, -0.90*@size, 0, -0.85*@size,
+                :tags=>[@tag, @mark_tag],
                 :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, 0.90*@size, 0, 0.85*@size, 0, 
-                :tags=>[@tag, @mark_tag], 
+    TkcLine.new(@c, 0.90*@size, 0, 0.85*@size, 0,
+                :tags=>[@tag, @mark_tag],
                 :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, 0, 0.90*@size, 0, 0.85*@size, 
-                :tags=>[@tag, @mark_tag], 
+    TkcLine.new(@c, 0, 0.90*@size, 0, 0.85*@size,
+                :tags=>[@tag, @mark_tag],
                 :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, -0.90*@size, 0, -0.85*@size, 0, 
-                :tags=>[@tag, @mark_tag], 
+    TkcLine.new(@c, -0.90*@size, 0, -0.85*@size, 0,
+                :tags=>[@tag, @mark_tag],
                 :width=>@mark_width, :fill=>@mark_color)
 
-    TkcText.new(@c, [0, -0.92*@size], :text=>0, 
+    TkcText.new(@c, [0, -0.92*@size], :text=>0,
                 :anchor=>'s', :fill=>@mark_color)
-    TkcText.new(@c, [0.92*@size, 0], :text=>@clock.div(4), 
+    TkcText.new(@c, [0.92*@size, 0], :text=>@clock.div(4),
                 :anchor=>'w', :fill=>@mark_color)
-    TkcText.new(@c, [0, 0.92*@size], :text=>@clock.div(2), 
+    TkcText.new(@c, [0, 0.92*@size], :text=>@clock.div(2),
                 :anchor=>'n', :fill=>@mark_color)
-    TkcText.new(@c, [-0.92*@size, 0], :text=>@clock.div(4)*3, 
+    TkcText.new(@c, [-0.92*@size, 0], :text=>@clock.div(4)*3,
                 :anchor=>'e', :fill=>@mark_color)
 
     [30.0, 60.0].each{|angle|
@@ -92,17 +92,17 @@ class Clock
       x2 = 0.85*x_base
       y2 = 0.85*y_base
 
-      TkcLine.new(@c, x1, y1, x2, y2, 
-                  :tags=>[@tag, @mark_tag], 
+      TkcLine.new(@c, x1, y1, x2, y2,
+                  :tags=>[@tag, @mark_tag],
                   :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, x1, -y1, x2, -y2, 
-                  :tags=>[@tag, @mark_tag], 
+      TkcLine.new(@c, x1, -y1, x2, -y2,
+                  :tags=>[@tag, @mark_tag],
                   :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, -x1, y1, -x2, y2, 
-                  :tags=>[@tag, @mark_tag], 
+      TkcLine.new(@c, -x1, y1, -x2, y2,
+                  :tags=>[@tag, @mark_tag],
                   :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, -x1, -y1, -x2, -y2, 
-                  :tags=>[@tag, @mark_tag], 
+      TkcLine.new(@c, -x1, -y1, -x2, -y2,
+                  :tags=>[@tag, @mark_tag],
                   :width=>@mark_width, :fill=>@mark_color)
 
       x3 = 0.92*x_base
@@ -114,13 +114,13 @@ class Clock
         dh = angle.to_i/30
       end
 
-      TkcText.new(@c, x3, -y3, :text=>dh, 
+      TkcText.new(@c, x3, -y3, :text=>dh,
                   :anchor=>'sw', :fill=>@mark_color)
-      TkcText.new(@c, x3, y3, :text=>@clock.div(2)-dh, 
+      TkcText.new(@c, x3, y3, :text=>@clock.div(2)-dh,
                   :anchor=>'nw', :fill=>@mark_color)
-      TkcText.new(@c, -x3, y3, :text=>@clock.div(2)+dh, 
+      TkcText.new(@c, -x3, y3, :text=>@clock.div(2)+dh,
                   :anchor=>'ne', :fill=>@mark_color)
-      TkcText.new(@c, -x3, -y3, :text=>@clock-dh, 
+      TkcText.new(@c, -x3, -y3, :text=>@clock-dh,
                   :anchor=>'se', :fill=>@mark_color)
     }
 
@@ -136,17 +136,17 @@ class Clock
         x2 = 0.875*x_base
         y2 = 0.875*y_base
 
-        TkcLine.new(@c, x1, y1, x2, y2, 
-                    :tags=>[@tag, @mark_tag], 
+        TkcLine.new(@c, x1, y1, x2, y2,
+                    :tags=>[@tag, @mark_tag],
                     :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, x1, -y1, x2, -y2, 
-                    :tags=>[@tag, @mark_tag], 
+        TkcLine.new(@c, x1, -y1, x2, -y2,
+                    :tags=>[@tag, @mark_tag],
                     :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, -x1, y1, -x2, y2, 
-                    :tags=>[@tag, @mark_tag], 
+        TkcLine.new(@c, -x1, y1, -x2, y2,
+                    :tags=>[@tag, @mark_tag],
                     :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, -x1, -y1, -x2, -y2, 
-                    :tags=>[@tag, @mark_tag], 
+        TkcLine.new(@c, -x1, -y1, -x2, -y2,
+                    :tags=>[@tag, @mark_tag],
                     :width=>@mark_width, :fill=>@submark_color)
       }
     end
@@ -162,48 +162,48 @@ class Clock
     second_hand_width = 1 # 0.4*@cdot_size
 
     @hour_hand_coords = [
-      [0, -0.5*@cdot_size], 
-      [hour_hand_width, -0.5*@cdot_size-hour_hand_width], 
-      [hour_hand_width, -hour_hand_len+hour_hand_width], 
-      [0, -hour_hand_len], 
-      [-hour_hand_width, -hour_hand_len+hour_hand_width], 
-      [-hour_hand_width, -0.5*@cdot_size-hour_hand_width], 
+      [0, -0.5*@cdot_size],
+      [hour_hand_width, -0.5*@cdot_size-hour_hand_width],
+      [hour_hand_width, -hour_hand_len+hour_hand_width],
+      [0, -hour_hand_len],
+      [-hour_hand_width, -hour_hand_len+hour_hand_width],
+      [-hour_hand_width, -0.5*@cdot_size-hour_hand_width],
     ]
     @minute_hand_coords = [
-      [0, -0.5*@cdot_size], 
-      [minute_hand_width, -0.5*@cdot_size - minute_hand_width], 
-      [minute_hand_width, -minute_hand_len+minute_hand_width], 
-      [0, -minute_hand_len], 
-      [-minute_hand_width, -minute_hand_len+minute_hand_width], 
-      [-minute_hand_width, -0.5*@cdot_size-minute_hand_width], 
+      [0, -0.5*@cdot_size],
+      [minute_hand_width, -0.5*@cdot_size - minute_hand_width],
+      [minute_hand_width, -minute_hand_len+minute_hand_width],
+      [0, -minute_hand_len],
+      [-minute_hand_width, -minute_hand_len+minute_hand_width],
+      [-minute_hand_width, -0.5*@cdot_size-minute_hand_width],
     ]
     @second_hand_coords = [
-      [0, -0.5*@cdot_size], 
-      [second_hand_width, -0.5*@cdot_size - second_hand_width], 
-      [second_hand_width, -second_hand_len+second_hand_width], 
-      [0, -second_hand_len], 
-      [-second_hand_width, -second_hand_len+second_hand_width], 
-      [-second_hand_width, -0.5*@cdot_size-second_hand_width], 
+      [0, -0.5*@cdot_size],
+      [second_hand_width, -0.5*@cdot_size - second_hand_width],
+      [second_hand_width, -second_hand_len+second_hand_width],
+      [0, -second_hand_len],
+      [-second_hand_width, -second_hand_len+second_hand_width],
+      [-second_hand_width, -0.5*@cdot_size-second_hand_width],
     ]
 
-    @hour_hand = TkcPolygon.new(@c, @hour_hand_coords, 
-                                :tags=>[@tag, @hand_tag], 
-                                :outline=>@hour_hand_color, 
+    @hour_hand = TkcPolygon.new(@c, @hour_hand_coords,
+                                :tags=>[@tag, @hand_tag],
+                                :outline=>@hour_hand_color,
                                 :fill=>@hour_hand_color)
 
-    @minute_hand = TkcPolygon.new(@c, @minute_hand_coords, 
-                                  :tags=>[@tag, @hand_tag], 
-                                  :outline=>@minute_hand_color, 
+    @minute_hand = TkcPolygon.new(@c, @minute_hand_coords,
+                                  :tags=>[@tag, @hand_tag],
+                                  :outline=>@minute_hand_color,
                                   :fill=>@minute_hand_color)
 
-    @second_hand = TkcPolygon.new(@c, @second_hand_coords, 
-                                  :tags=>[@tag, @hand_tag], 
-                                  :outline=>@second_hand_color, 
+    @second_hand = TkcPolygon.new(@c, @second_hand_coords,
+                                  :tags=>[@tag, @hand_tag],
+                                  :outline=>@second_hand_color,
                                   :fill=>@second_hand_color)
 
-    @center_dot = TkcOval.new(@c, 
-                              [-@cdot_size, -@cdot_size], 
-                              [@cdot_size, @cdot_size], 
+    @center_dot = TkcOval.new(@c,
+                              [-@cdot_size, -@cdot_size],
+                              [@cdot_size, @cdot_size],
                               :outline=>@cdot_color, :fill=>@cdot_color)
   end
   private :_create_hands
@@ -269,8 +269,8 @@ class Clock
       extent = -span/2.0
     end
 
-    pie = TkcArc.new(@c, @circle_coords, :tags=>[@tag], 
-                     :outline=>'black', 'fill'=>color, 
+    pie = TkcArc.new(@c, @circle_coords, :tags=>[@tag],
+                     :outline=>'black', 'fill'=>color,
                      :start=>start, :extent=>extent)
     _raise_hands
     _raise_marks
diff --git a/ext/tk/sample/binding_sample.rb b/ext/tk/sample/binding_sample.rb
index 693cc7de2f..3c2eb5e1cb 100644
--- a/ext/tk/sample/binding_sample.rb
+++ b/ext/tk/sample/binding_sample.rb
@@ -43,7 +43,7 @@ class Button_clone < TkLabel
 
   def invoke
     if @command
-      @command.call 
+      @command.call
     else
       ''
     end
@@ -53,7 +53,7 @@ end
 TkLabel.new(:text=><<EOT).pack
 This is a sample of 'event binding'.
 The first button is a normal button widget.
-And the second one is a normal label widget 
+And the second one is a normal label widget
 but with some bindings like a button widget.
 EOT
 
@@ -66,7 +66,7 @@ TkFrame.new{|f|
   TkLabel.new(f, :textvariable=>v).pack(:side=>:left)
 }.pack
 
-TkButton.new(:text=>'normal Button widget', 
+TkButton.new(:text=>'normal Button widget',
              :command=>proc{
                puts 'button is clicked!!'
                lbl.text 'button is clicked!!'
@@ -75,7 +75,7 @@ TkButton.new(:text=>'normal Button widget',
   pack(:fill=>:x, :expand=>true)
 }
 
-Button_clone.new(:text=>'Label with Button binding', 
+Button_clone.new(:text=>'Label with Button binding',
                  :command=>proc{
                    puts 'label is clicked!!'
                    lbl.text 'label is clicked!!'
diff --git a/ext/tk/sample/bindtag_sample.rb b/ext/tk/sample/bindtag_sample.rb
index 8c93b4a260..b13364bb68 100644
--- a/ext/tk/sample/bindtag_sample.rb
+++ b/ext/tk/sample/bindtag_sample.rb
@@ -2,18 +2,18 @@
 require 'tk'
 
 TkLabel.new(:text=><<EOT, :justify=>:left).pack
-This is a sample of bindtags and usage of 
-Tk.callback_break/Tk.callback_continue. 
-Please check the work of following buttons 
-(attend the difference between before/after 
- pressing the bottom button), and see the 
+This is a sample of bindtags and usage of
+Tk.callback_break/Tk.callback_continue.
+Please check the work of following buttons
+(attend the difference between before/after
+ pressing the bottom button), and see the
 source code.
 EOT
 
 def set_class_bind
-  TkButton.bind('ButtonPress-1', 
+  TkButton.bind('ButtonPress-1',
                 proc{puts 'bind "ButtonPress-1" of TkButton class'})
-  TkButton.bind('ButtonRelease-1', 
+  TkButton.bind('ButtonRelease-1',
                 proc{puts 'bind "ButtonRelease-1" of TkButton class'})
 end
 
@@ -23,21 +23,21 @@ r.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of root widget'})
 r.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of root widget'})
 
 # set 'all' binding
-TkBindTag::ALL.bind('ButtonPress-1', 
+TkBindTag::ALL.bind('ButtonPress-1',
                     proc{puts 'bind "ButtonPress-1" of the tag "all"'})
-TkBindTag::ALL.bind('ButtonRelease-1', 
+TkBindTag::ALL.bind('ButtonRelease-1',
                     proc{puts 'bind "ButtonRelease-1" of the tag "all"'})
 
 # create buttons
-b1 = TkButton.new(:text=>'button-1', 
+b1 = TkButton.new(:text=>'button-1',
                   :command=>proc{puts "command of button-1"}).pack
-b2 = TkButton.new(:text=>'button-2', 
+b2 = TkButton.new(:text=>'button-2',
                   :command=>proc{puts "command of button-2"}).pack
-b3 = TkButton.new(:text=>'button-3', 
+b3 = TkButton.new(:text=>'button-3',
                   :command=>proc{puts "command of button-3"}).pack
-b4 = TkButton.new(:text=>'button-4', 
+b4 = TkButton.new(:text=>'button-4',
                   :command=>proc{puts "command of button-4"}).pack
-b5 = TkButton.new(:text=>'button-5', 
+b5 = TkButton.new(:text=>'button-5',
                   :command=>proc{puts "command of button-5"}).pack
 
 # set button binding
@@ -62,14 +62,14 @@ tag1.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of tag1'})
 tag1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of tag1'})
 
 tag2 = TkBindTag.new
-tag2.bind('ButtonPress-1',   
+tag2.bind('ButtonPress-1',
           proc{
             puts 'bind "ButtonPress-1" of tag2'
             puts 'call Tk.callback_continue'
             Tk.callback_continue
             puts 'never see this message'
           })
-tag2.bind('ButtonRelease-1', 
+tag2.bind('ButtonRelease-1',
           proc{
             puts 'bind "ButtonRelease-1" of tag2'
             puts 'call Tk.callback_continue'
@@ -78,14 +78,14 @@ tag2.bind('ButtonRelease-1',
           })
 
 tag3 = TkBindTag.new
-tag3.bind('ButtonPress-1',   
+tag3.bind('ButtonPress-1',
           proc{
             puts 'bind "ButtonPress-1" of tag3'
             puts 'call Tk.callback_break'
             Tk.callback_break
             puts 'never see this message'
           })
-tag3.bind('ButtonRelease-1', 
+tag3.bind('ButtonRelease-1',
           proc{
             puts 'bind "ButtonRelease-1" of tag3'
             puts 'call Tk.callback_break'
@@ -117,7 +117,7 @@ p b4.bindtags
 b5.bindtags([tag1, TkButton, tag2, b5])
 
 # create button to set button class binding
-TkButton.new(:text=>'set binding to TkButton class', 
+TkButton.new(:text=>'set binding to TkButton class',
              :command=>proc{
                puts 'call "set_class_bind"'
                set_class_bind
diff --git a/ext/tk/sample/binstr_usage.rb b/ext/tk/sample/binstr_usage.rb
index 91692856f9..fa81f98b5e 100644
--- a/ext/tk/sample/binstr_usage.rb
+++ b/ext/tk/sample/binstr_usage.rb
@@ -13,10 +13,10 @@ However, when treats a binary sequence, the convert process makes troubles.
 
 Tk::BinaryString class (subclass of Tk::EncodedString class) is the class \
 to avoid such troubles. Please see the source code of this sample. \
-A Tk::BinaryString instance is used to create the image for the center button. 
+A Tk::BinaryString instance is used to create the image for the center button.
 EOM
 
-ImgFile=['images','tcllogo.gif'].join(File::Separator)
+ImgFile=[File.dirname(__FILE__), 'images','tcllogo.gif'].join(File::Separator)
 
 ph1 = TkPhotoImage.new(:file=>ImgFile)
 p ph1.configinfo
@@ -28,12 +28,18 @@ ph2 = TkPhotoImage.new(:data=>b_str)
 p ph2.configinfo
 p ph2.data(:grayscale=>true)
 
-ph3 = TkPhotoImage.new()
-ph3.put(ph2.data(:grayscale=>true))
+ph3 = TkPhotoImage.new(:palette=>256)
+ph3.put(ph2.data)
+
+ph4 = TkPhotoImage.new()
+ph4.put(ph2.data(:grayscale=>true))
+
+#p [b_str.encoding, b_str.rb_encoding]
 
 f = TkFrame.new.pack
 TkButton.new(:parent=>f, :image=>ph1, :command=>proc{exit}).pack(:side=>:left)
 TkButton.new(:parent=>f, :image=>ph2, :command=>proc{exit}).pack(:side=>:left)
 TkButton.new(:parent=>f, :image=>ph3, :command=>proc{exit}).pack(:side=>:left)
+TkButton.new(:parent=>f, :image=>ph4, :command=>proc{exit}).pack(:side=>:left)
 
 Tk.mainloop
diff --git a/ext/tk/sample/cd_timer.rb b/ext/tk/sample/cd_timer.rb
index 9154e89bfe..e2611fbf23 100644
--- a/ext/tk/sample/cd_timer.rb
+++ b/ext/tk/sample/cd_timer.rb
@@ -7,23 +7,23 @@
 require 'tk'
 
 if ARGV.empty?
-  $stderr.puts 'Error:: No time arguments for counting down' 
+  $stderr.puts 'Error:: No time arguments for counting down'
   exit(1)
 end
 
 width = 10
 
-TkButton.new(:text=>'exit', 
+TkButton.new(:text=>'exit',
              :command=>proc{exit}).pack(:side=>:bottom, :fill=>:x)
 
 b = TkButton.new(:text=>'start').pack(:side=>:top, :fill=>:x)
 
 f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
-TkLabel.new(f, :relief=>:flat, :pady=>3, 
-            :background=>'black', :foreground=>'white', 
+TkLabel.new(f, :relief=>:flat, :pady=>3,
+            :background=>'black', :foreground=>'white',
             :text=>'  elapsed: ').pack(:fill=>:x, :side=>:left, :expand=>true)
-now = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w, 
-                  :background=>'black', :foreground=>'white', 
+now = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
+                  :background=>'black', :foreground=>'white',
                   :text=>'%4d:%02d.00' % [0, 0]).pack(:side=>:right)
 
 timers = [ TkRTTimer.new(10){|tm|
@@ -41,9 +41,9 @@ timers = [ TkRTTimer.new(10){|tm|
 
 ARGV.collect{|arg| (Float(arg) * 60).to_i}.sort.each_with_index{|time, idx|
   f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
-  TkLabel.new(f, :relief=>:flat, :pady=>3, 
+  TkLabel.new(f, :relief=>:flat, :pady=>3,
               :text=>'  %4d:%02d  --> ' % (time.divmod(60))).pack(:side=>:left)
-  l = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w, 
+  l = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
                   :text=>'%4d:%02d' % (time.divmod(60))).pack(:side=>:right)
   timers << TkRTTimer.new(1000){|tm|
     t = (tm.return_value || time) - 1
diff --git a/ext/tk/sample/cmd_res_test.rb b/ext/tk/sample/cmd_res_test.rb
index 6e954f26ee..8df2e61af7 100644
--- a/ext/tk/sample/cmd_res_test.rb
+++ b/ext/tk/sample/cmd_res_test.rb
@@ -1,5 +1,5 @@
 require 'tk'
-TkOptionDB.readfile(File.expand_path('cmd_resource', 
+TkOptionDB.readfile(File.expand_path('cmd_resource',
                                      File.dirname(__FILE__)))
 f = TkFrame.new(:class=>'BtnFrame').pack
 b = TkButton.new(:parent=>f, :widgetname=>'hello').pack
diff --git a/ext/tk/sample/demos-en/anilabel.rb b/ext/tk/sample/demos-en/anilabel.rb
index f063bc53a4..ebd84accd2 100644
--- a/ext/tk/sample/demos-en/anilabel.rb
+++ b/ext/tk/sample/demos-en/anilabel.rb
@@ -4,7 +4,7 @@
 # based on Tcl/Tk8.5a2 widget demos
 
 if defined?($anilabel_demo) && $anilabel_demo
-  $anilabel_demo.destroy 
+  $anilabel_demo.destroy
   $anilabel_demo = nil
 end
 
@@ -15,8 +15,10 @@ $anilabel_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($anilabel_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +27,7 @@ msg = TkLabel.new($anilabel_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($anilabel_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -43,9 +45,9 @@ TkFrame.new($anilabel_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # create frame for label demo
-f_left = TkLabelFrame.new($anilabel_demo,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new($anilabel_demo, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both', 
+f_left = TkLabelFrame.new(base_frame,  :text=>'Scrolling Texts')
+f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
+Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
         'padx'=>10, 'pady'=>10)
 
 # animated label
@@ -83,7 +85,7 @@ class AnimatedImageLabel < AnimatedTextLabel
     @btag.bind_append('Destroy'){
       if @destroy_image
         begin
-          self.image.delete 
+          self.image.delete
         rescue
         end
       end
@@ -119,13 +121,13 @@ class AnimatedImageLabel < AnimatedTextLabel
 end
 
 # create labels
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge, 
+l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
                            :font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove, 
+l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
                            :font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat, 
+l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
                            :font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3, 
+Tk.pack(l1, l2, l3,
         :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
 
 limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
diff --git a/ext/tk/sample/demos-en/aniwave.rb b/ext/tk/sample/demos-en/aniwave.rb
index ebe27b875f..57d58193f6 100644
--- a/ext/tk/sample/demos-en/aniwave.rb
+++ b/ext/tk/sample/demos-en/aniwave.rb
@@ -5,7 +5,7 @@
 
 # destroy toplevel widget for this demo script
 if defined?($aniwave_demo) && $aniwave_demo
-  $aniwave_demo.destroy 
+  $aniwave_demo.destroy
   $aniwave_demo = nil
 end
 
@@ -16,8 +16,10 @@ $aniwave_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
+
 # create label
-msg = TkLabel.new($aniwave_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -26,7 +28,7 @@ msg = TkLabel.new($aniwave_demo) {
 msg.pack('side'=>'top')
 
 # create frame
-TkFrame.new($aniwave_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,25 +51,26 @@ class AnimatedWaveDemo
     @direction = dir
 
     # create canvas widget
-    @c = TkCanvas.new(frame, :width=>300, :height=>200, 
+    @c = TkCanvas.new(frame, :width=>300, :height=>200,
                       :background=>'black')
     @c.pack(:padx=>10, :pady=>10, :expand=>true)
 
-    # Creates a coordinates list of a wave. 
+    # Creates a coordinates list of a wave.
     @waveCoords = []
     @backupCoords = []
     n = 0
     (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
+    n = 305
     @waveCoords << [n, 0]; @backupCoords << [n, 0]
     @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
     @coordsLen = @waveCoords.length
 
     # Create a smoothed line and arrange for its coordinates to be the
     # contents of the variable waveCoords.
-    @line = TkcLine.new(@c, @waveCoords, 
+    @line = TkcLine.new(@c, @waveCoords,
                         :width=>1, :fill=>'green', :smooth=>true)
 
-    # Main animation "loop". 
+    # Main animation "loop".
     # Theoretically 100 frames-per-second (==10ms between frames)
     @timer = TkTimer.new(10){ basicMotion; reverser }
 
@@ -112,4 +115,4 @@ class AnimatedWaveDemo
 end
 
 # Start the animation processing
-AnimatedWaveDemo.new($aniwave_demo, :left).move
+AnimatedWaveDemo.new(base_frame, :left).move
diff --git a/ext/tk/sample/demos-en/arrow.rb b/ext/tk/sample/demos-en/arrow.rb
index b62e1966eb..452153d010 100644
--- a/ext/tk/sample/demos-en/arrow.rb
+++ b/ext/tk/sample/demos-en/arrow.rb
@@ -28,67 +28,75 @@ def arrowSetup(c)
 
   # Create the arrow and outline.
   c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y, 
-              { 'width'=>10 * v.width, 
-                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c], 
-                'arrow'=>'last' 
+  TkcLine.new(c, v.x1, v.y, v.x2, v.y,
+              { 'width'=>10 * v.width,
+                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
+                'arrow'=>'last'
               }.update(v.bigLineStyle) )
   xtip = v.x2 - 10*v.b
   deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY, 
-              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y, 
+  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
+              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
               'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
 
   # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5, 
+  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
                    {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5, 
+  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
                    {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5, 
+  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
                    {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
   c.itemconfigure cur, v.activeStyle if cur
 
   # Create three arrows in actual size with the same parameters
   TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
   tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width, 
+  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
               'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width, 
+  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
               'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width, 
+  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
               'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
 
-  # Create a bunch of other arrows and text items showing the 
+  # Create a bunch of other arrows and text items showing the
   # current dimensions.
   tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY, 
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
   tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width, 
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
   tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp, 
+  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
   tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp, 
+  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
 
-  TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
-              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  TkcText.new(c, v.x1, 330, 
-              'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]", 'anchor'=>'w', 
-              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  if $tk_version =~ /^4.*/
+    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+    TkcText.new(c, v.x1, 330,
+                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  else
+    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+                'font'=>'Helvetica 18')
+    TkcText.new(c, v.x1, 330,
+                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
+                'anchor'=>'w', 'font'=>'Helvetica 18')
+  end
 
   v.count += 1
 end
 
 # toplevel widget
 if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy 
+  $arrow_demo.destroy
   $arrow_demo = nil
 end
 
@@ -99,14 +107,16 @@ $arrow_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($arrow_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
             'text'=>"This widget allows you to experiment with different widths and arrowhead shapes for lines in canvases.  To change the line width or the shape of the arrowhead, drag any of the three boxes attached to the oversized arrow.  The arrows on the right give examples at normal scale.  The text at the bottom shows the configuration options as you'd enter them for a canvas line item."){
   pack('side'=>'top')
 }
 
 # frame
-$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
+$arrow_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -123,15 +133,15 @@ $arrow_buttons = TkFrame.new($arrow_demo) {|frame|
 }
 $arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# canvas 
-$arrow_canvas = TkCanvas.new($arrow_demo, 'width'=>500, 'height'=>350, 
+# canvas
+$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
                              'relief'=>'sunken', 'borderwidth'=>2)
 $arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
-# 
+#
 unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc, 
-                               :x1, :x2, :y, :smallTips, :count, 
+  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
+                               :x1, :x2, :y, :smallTips, :count,
                                :bigLineStyle, :boxStyle, :activeStyle).new
 end
 $demo_arrowInfo.a = 8
@@ -149,7 +159,7 @@ if TkWinfo.depth($arrow_canvas) > 1
   $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
   $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
 else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black', 
+  $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
     'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
   $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
   $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
@@ -160,16 +170,16 @@ $arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_ar
 $arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
 $arrowTag_box.bind('B1-Enter', proc{})
 $arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1', 
+$arrow_canvas.itembind('box1', '1',
                        proc{$demo_arrowInfo.motionProc \
                          = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1', 
+$arrow_canvas.itembind('box2', '1',
                        proc{$demo_arrowInfo.motionProc \
                          = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1', 
+$arrow_canvas.itembind('box3', '1',
                        proc{$demo_arrowInfo.motionProc \
                          = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion', 
+$arrowTag_box.bind('B1-Motion',
                   proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
 $arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
 
diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb
index aabe7f0849..c291e4730a 100644
--- a/ext/tk/sample/demos-en/bind.rb
+++ b/ext/tk/sample/demos-en/bind.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy 
+  $bind_demo.destroy
   $bind_demo = nil
 end
 
@@ -19,8 +19,10 @@ $bind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
+
 # frame
-TkFrame.new($bind_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -36,30 +38,30 @@ TkFrame.new($bind_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# bind 
+# bind
 def tag_binding_for_bind_demo(tag, enter_style, leave_style)
   tag.bind('Any-Enter', proc{tag.configure enter_style})
   tag.bind('Any-Leave', proc{tag.configure leave_style})
 end
 
-# text 
-TkText.new($bind_demo){|t|
-  # 
+# text
+txt = TkText.new(base_frame){|t|
+  #
   setgrid 'true'
-  width  60
-  height 24
+  #width  60
+  #height 24
   font $font
   wrap 'word'
-  TkScrollbar.new($bind_demo) {|s|
+  TkScrollbar.new(base_frame) {|s|
     pack('side'=>'right', 'fill'=>'y')
     command proc{|*args| t.yview(*args)}
     t.yscrollcommand proc{|first,last| s.set first,last}
   }
   pack('expand'=>'yes', 'fill'=>'both')
 
-  # 
+  #
   if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised', 
+    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
                      'borderwidth'=>1}
     tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
   else
@@ -75,54 +77,51 @@ TkText.new($bind_demo){|t|
   insert('end', "\n\n")
   insert('end', '2. A simple two-dimensional plot that allows you to adjust the positions of the data points.', (d2 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', '3. Anchoring and justification modes for text items.', 
+  insert('end', '3. Anchoring and justification modes for text items.',
          (d3 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', '4. An editor for arrow-head shapes for line items.', 
+  insert('end', '4. An editor for arrow-head shapes for line items.',
          (d4 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', '5. A ruler with facilities for editing tab stops.', 
+  insert('end', '5. A ruler with facilities for editing tab stops.',
          (d5 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', 
-         '6. A grid that demonstrates how canvases can be scrolled.', 
+  insert('end',
+         '6. A grid that demonstrates how canvases can be scrolled.',
          (d6 = TkTextTag.new(t)) )
 
   # binding
   [d1, d2, d3, d4, d5, d6].each{|tag|
     tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
   }
-  d1.bind('1', 
+  d1.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
           })
-  d2.bind('1', 
+  d2.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
           })
-  d3.bind('1', 
+  d3.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
           })
-  d4.bind('1', 
+  d4.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
           })
-  d5.bind('1', 
+  d5.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
           })
-  d6.bind('1', 
+  d6.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
           })
 
   TkTextMarkInsert.new(t, '0.0')
   configure('state','disabled')
 }
+
+txt.width  60
+txt.height 24
diff --git a/ext/tk/sample/demos-en/bitmap.rb b/ext/tk/sample/demos-en/bitmap.rb
index 7fd551c7a5..858d067d0d 100644
--- a/ext/tk/sample/demos-en/bitmap.rb
+++ b/ext/tk/sample/demos-en/bitmap.rb
@@ -17,11 +17,11 @@
 def bitmapRow(w,*args)
   TkFrame.new(w){|row|
     pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args 
+    for bitmap in args
       TkFrame.new(row){|base|
         pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
         TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-        TkLabel.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
+        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
       }
     end
   }
@@ -29,7 +29,7 @@ end
 
 # toplevel widget
 if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy 
+  $bitmap_demo.destroy
   $bitmap_demo = nil
 end
 
@@ -40,14 +40,16 @@ $bitmap_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($bitmap_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
             'text'=>"This window displays all of Tk's built-in bitmaps, along with the names you can use for them in Tcl scripts."){
   pack('side'=>'top')
 }
 
 # frame
-$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
+$bitmap_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -64,8 +66,8 @@ $bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
 }
 $bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# frame 
-TkFrame.new($bitmap_demo){|f|
+# frame
+TkFrame.new(base_frame){|f|
   bitmapRow(f,'error','gray25','gray50','hourglass')
   bitmapRow(f,'info','question','questhead','warning')
   pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
diff --git a/ext/tk/sample/demos-en/button.rb b/ext/tk/sample/demos-en/button.rb
index 6614d99c92..f63a2f3b06 100644
--- a/ext/tk/sample/demos-en/button.rb
+++ b/ext/tk/sample/demos-en/button.rb
@@ -6,20 +6,20 @@
 # button widget demo (called by 'widget')
 #
 
-# toplevel widget 
+# toplevel widget
 if defined?($button_demo) && $button_demo
-  $button_demo.destroy 
+  $button_demo.destroy
   $button_demo = nil
 end
 
-# demo toplevel widget 
+# demo toplevel widget
 $button_demo = TkToplevel.new {|w|
   title("Button Demonstration")
   iconname("button")
   positionWindow(w)
 }
 
-# label 
+# label
 msg = TkLabel.new($button_demo) {
   font $kanji_font
   wraplength '4i'
@@ -28,8 +28,8 @@ msg = TkLabel.new($button_demo) {
 }
 msg.pack('side'=>'top')
 
-# frame 
-$button_buttons = TkFrame.new($button_demo) {|frame|
+# frame
+$button_buttons = Tk::Frame.new($button_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
diff --git a/ext/tk/sample/demos-en/check.rb b/ext/tk/sample/demos-en/check.rb
index 971a8fea73..bf0b73476a 100644
--- a/ext/tk/sample/demos-en/check.rb
+++ b/ext/tk/sample/demos-en/check.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($check_demo) && $check_demo
-  $check_demo.destroy 
+  $check_demo.destroy
   $check_demo = nil
 end
 
@@ -19,8 +19,10 @@ $check_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# label 
-msg = TkLabel.new($check_demo) {
+base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,13 +30,13 @@ msg = TkLabel.new($check_demo) {
 }
 msg.pack('side'=>'top')
 
-# 
+#
 wipers = TkVariable.new(0)
 brakes = TkVariable.new(0)
 sober  = TkVariable.new(0)
 
-# frame 
-TkFrame.new($check_demo) {|frame|
+# frame
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -54,7 +56,7 @@ TkFrame.new($check_demo) {|frame|
   TkButton.new(frame) {
     text 'See Variables'
     command proc{
-      showVars($check_demo, 
+      showVars(base_frame,
                ['wipers', wipers], ['brakes', brakes], ['sober', sober])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
@@ -63,8 +65,8 @@ TkFrame.new($check_demo) {|frame|
 
 
 # checkbutton
-[ TkCheckButton.new($check_demo, 'text'=>'Wipers  OK', 'variable'=>wipers),
-  TkCheckButton.new($check_demo, 'text'=>'Brakes  OK', 'variable'=>brakes),
-  TkCheckButton.new($check_demo, 'text'=>'Driver Sober', 'variable'=>sober)
+[ TkCheckButton.new(base_frame, 'text'=>'Wipers  OK', 'variable'=>wipers),
+  TkCheckButton.new(base_frame, 'text'=>'Brakes  OK', 'variable'=>brakes),
+  TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
 ].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
 
diff --git a/ext/tk/sample/demos-en/check2.rb b/ext/tk/sample/demos-en/check2.rb
index 97d61fba0c..4f7b1f07bc 100644
--- a/ext/tk/sample/demos-en/check2.rb
+++ b/ext/tk/sample/demos-en/check2.rb
@@ -4,7 +4,7 @@
 
 # delete old toplevel widget
 if defined?($check2_demo) && $check2_demo
-  $check2_demo.destroy 
+  $check2_demo.destroy
   $check2_demo = nil
 end
 
@@ -15,8 +15,10 @@ $check2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($check2_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -31,44 +33,44 @@ brakes = TkVariable.new(0)
 sober  = TkVariable.new(0)
 
 # frame
-TkFrame.new($check2_demo) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+TkFrame.new(base_frame) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
          :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         TkButton.new(frame, :text=>'See Variables', 
-                      :image=>$image['view'], :compound=>:left, 
+  TkGrid('x',
+         TkButton.new(frame, :text=>'See Variables',
+                      :image=>$image['view'], :compound=>:left,
                       :command=>proc{
-                        showVars($check2_demo, 
-                                 ['safety', safety], ['wipers', wipers], 
+                        showVars($check2_demo,
+                                 ['safety', safety], ['wipers', wipers],
                                  ['brakes', brakes], ['sober', sober])
-                      }), 
-         TkButton.new(frame, :text=>'See Code', 
-                      :image=>$image['view'], :compound=>:left, 
-                      :command=>proc{showCode 'check2'}), 
-         TkButton.new(frame, :text=>'Dismiss', 
-                      :image=>$image['delete'], :compound=>:left, 
+                      }),
+         TkButton.new(frame, :text=>'See Code',
+                      :image=>$image['view'], :compound=>:left,
+                      :command=>proc{showCode 'check2'}),
+         TkButton.new(frame, :text=>'Dismiss',
+                      :image=>$image['delete'], :compound=>:left,
                       :command=>proc{
                         tmppath = $check2_demo
                         $check2_demo = nil
                         $showVarsWin[tmppath.path] = nil
                         tmppath.destroy
-                      }), 
+                      }),
          :padx=>4, :pady=>4)
   frame.grid_columnconfigure(0, :weight=>1)
 }.pack('side'=>'bottom', 'fill'=>'x')
 
 
 # checkbutton
-TkCheckButton.new($check2_demo, :text=>'Safety Check', :variable=>safety, 
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none', 
+TkCheckButton.new(base_frame, :text=>'Safety Check', :variable=>safety,
+                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
                   :tristatevalue=>'partial'){
   pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
 }
 
-[ TkCheckButton.new($check2_demo, 'text'=>'Wipers OK', 'variable'=>wipers),
-  TkCheckButton.new($check2_demo, 'text'=>'Brakes OK', 'variable'=>brakes),
-  TkCheckButton.new($check2_demo, 'text'=>'Driver Sober', 'variable'=>sober)
-].each{|w| 
+[ TkCheckButton.new(base_frame, 'text'=>'Wipers OK', 'variable'=>wipers),
+  TkCheckButton.new(base_frame, 'text'=>'Brakes OK', 'variable'=>brakes),
+  TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
+].each{|w|
   w.relief('flat')
   w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
 }
diff --git a/ext/tk/sample/demos-en/clrpick.rb b/ext/tk/sample/demos-en/clrpick.rb
index 9486fde314..6da28cb112 100644
--- a/ext/tk/sample/demos-en/clrpick.rb
+++ b/ext/tk/sample/demos-en/clrpick.rb
@@ -4,10 +4,12 @@
 #
 # widget demo prompts the user to select a color (called by 'widget')
 #
+#  Note: don't support ttk_wrapper. work with standard widgets only.
+#
 
 # toplevel widget
 if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy 
+  $clrpick_demo.destroy
   $clrpick_demo = nil
 end
 
@@ -18,13 +20,18 @@ $clrpick_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($clrpick_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
             'text'=>"Press the buttons below to choose the foreground and background colors for the widgets in this window.").pack('side'=>'top')
 
 # frame
-TkFrame.new($clrpick_demo) {|frame|
-  TkButton.new(frame) {
+#TkFrame.new($clrpick_demo) {|frame|
+Tk::Frame.new($clrpick_demo) {|frame|
+  # TkButton.new(frame) {
+  Tk::Button.new(frame) {
     text 'Dismiss'
     command proc{
       tmppath = $clrpick_demo
@@ -33,20 +40,23 @@ TkFrame.new($clrpick_demo) {|frame|
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 
-  TkButton.new(frame) {
+  # TkButton.new(frame) {
+  Tk::Button.new(frame) {
     text 'Show Code'
     command proc{showCode 'clrpick'}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# button 
-TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background', 
+# button
+# TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
+  command(proc{setColor $clrpick_demo, b, 'background',
               ['background', 'highlightbackground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
 
-TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
+# TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
@@ -54,7 +64,7 @@ TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
 def setColor(w,button,name,options)
   w.grab
   initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
+  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
                          'initialcolor'=>initialColor)
   if color != ""
     setColor_helper(w,options,color)
diff --git a/ext/tk/sample/demos-en/colors.rb b/ext/tk/sample/demos-en/colors.rb
index 66fb0afa36..b0ef9590b9 100644
--- a/ext/tk/sample/demos-en/colors.rb
+++ b/ext/tk/sample/demos-en/colors.rb
@@ -9,7 +9,7 @@
 
 # toplevel widget
 if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy 
+  $colors_demo.destroy
   $colors_demo = nil
 end
 
@@ -20,8 +20,10 @@ $colors_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($colors_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -30,7 +32,7 @@ msg = TkLabel.new($colors_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($colors_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,7 +51,7 @@ TkFrame.new($colors_demo) {|frame|
 
 # frame
 colors_lbox = nil
-TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
+TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   s = TkScrollbar.new(w)
   colors_lbox = TkListbox.new(w) {
     setgrid 1
@@ -62,7 +64,15 @@ TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
   colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
 }.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
 
-colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
+#colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
+colors_lbox.bind('Double-1', proc{
+                   begin
+                     TkPalette.setPalette TkSelection.get
+                   rescue => e
+                     p e
+                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
+                   end
+                 })
 
 ins_data = [
   'gray60','gray70','gray80','gray85','gray90','gray95',
diff --git a/ext/tk/sample/demos-en/combo.rb b/ext/tk/sample/demos-en/combo.rb
new file mode 100644
index 0000000000..d77660095c
--- /dev/null
+++ b/ext/tk/sample/demos-en/combo.rb
@@ -0,0 +1,96 @@
+# combo.rb --
+#
+# This demonstration script creates several combobox widgets.
+#
+# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($combo_demo) && $combo_demo
+  $combo_demo.destroy
+  $combo_demo = nil
+end
+
+$combo_demo = TkToplevel.new {|w|
+  title("Combobox Demonstration")
+  iconname("combo")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+Three different combo-boxes are displayed below. \
+You can add characters to the first \
+one by pointing, clicking and typing, just as with an entry; pressing \
+Return will cause the current value to be added to the list that is \
+selectable from the drop-down list, and you can choose other values \
+by pressing the Down key, using the arrow keys to pick another one, \
+and pressing Return again. The second combo-box is fixed to a \
+particular value, and cannot be modified at all. The third one only \
+allows you to select values from its drop-down list of Australian \
+cities.
+EOL
+
+## variables
+firstValue  = TkVariable.new
+secondValue = TkVariable.new
+ozCity      = TkVariable.new
+
+## See Code / Dismiss buttons
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Variables',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{
+                           showVars(base_frame,
+                                    ['firstVariable', firstValue],
+                                    ['secondVariable', secondValue],
+                                    ['ozCity', ozCity])
+                         }),
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'combo'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $combo_demo.destroy
+                           $combo_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+
+australianCities = [
+  'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 'Brisbane',
+  'Hobart', 'Darwin', 'Alice Springs'
+]
+
+
+secondValue.value = 'unchangable'
+ozCity.value = 'Sydney'
+
+Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
+          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
+            b.bind('Return', '%W'){|w|
+              w.values <<= w.value unless w.values.include?(w.value)
+            }
+          }.pack(:pady=>5, :padx=>10)
+        },
+
+        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
+          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
+            pack(:pady=>5, :padx=>10)
+        },
+
+        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
+          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
+                            :values=>australianCities) .
+            pack(:pady=>5, :padx=>10)
+        },
+
+        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-en/cscroll.rb b/ext/tk/sample/demos-en/cscroll.rb
index 0838dfbe08..40a3afc0ad 100644
--- a/ext/tk/sample/demos-en/cscroll.rb
+++ b/ext/tk/sample/demos-en/cscroll.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy 
+  $cscroll_demo.destroy
   $cscroll_demo = nil
 end
 
@@ -19,14 +19,16 @@ $cscroll_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($cscroll_demo, 'font'=>$font, 'wraplength'=>'4i', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
             'justify'=>'left', 'text'=>"This window displays a canvas widget that can be scrolled either using the scrollbars or by dragging with button 2 in the canvas.  If you click button 1 on one of the rectangles, its indices will be printed on stdout."){
   pack('side'=>'top')
 }
 
 # frame
-$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
+$cscroll_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -43,9 +45,9 @@ $cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
 }
 $cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# frame 
+# frame
 unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new($cscroll_demo) {
+  $cscroll_grid = TkFrame.new(base_frame) {
     pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
   }
   TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
@@ -53,34 +55,34 @@ unless $tk_version =~ /^4\.[01]/
 end
 
 # canvas
-$cscroll_canvas = TkCanvas.new($cscroll_demo, 
+$cscroll_canvas = TkCanvas.new(base_frame,
                                'relief'=>'sunken', 'borderwidth'=>2,
                                'scrollregion'=>['-11c', '-11c', '50c', '20c']
                                ) {|c|
   if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both') 
+    pack('expand'=>'yes', 'fill'=>'both')
   else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
          'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
   end
 
-  TkScrollbar.new($cscroll_demo, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
+  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
     c.yscrollcommand(proc{|first,last| vs.set first,last})
     if $tk_version =~ /^4\.[01]/
       pack('side'=>'right', 'fill'=>'y')
     else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
 
-  TkScrollbar.new($cscroll_demo, 'orient'=>'horiz', 
+  TkScrollbar.new(base_frame, 'orient'=>'horiz',
                   'command'=>proc{|*args| c.xview(*args)}) {|hs|
     c.xscrollcommand(proc{|first,last| hs.set first,last})
     if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x') 
+      pack('side'=>'bottom', 'fill'=>'x')
     else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
@@ -91,9 +93,9 @@ bg = $cscroll_canvas.configinfo('bg')[4]
   x = -10+3*i
   y = -10
   (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c", 
+    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
                      'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
+    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
                 'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
     y += 3
   }
@@ -104,7 +106,7 @@ $cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
 $cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
 $cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
 $cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion', 
+$cscroll_canvas.bind('B2-Motion',
                      proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
 
 def scrollEnter(c)
diff --git a/ext/tk/sample/demos-en/ctext.rb b/ext/tk/sample/demos-en/ctext.rb
index dbb5e32638..e04cb283f0 100644
--- a/ext/tk/sample/demos-en/ctext.rb
+++ b/ext/tk/sample/demos-en/ctext.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy 
+  $ctext_demo.destroy
   $ctext_demo = nil
 end
 
@@ -19,8 +19,10 @@ $ctext_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
             'text'=>"This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification.  The text also supports the following simple bindings for editing:
   1. You can point, click, and type.
   2. You can also select with button 1.
@@ -33,7 +35,7 @@ TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
 }
 
 # frame
-$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
+$ctext_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -50,46 +52,55 @@ $ctext_buttons = TkFrame.new($ctext_demo) {|frame|
 }
 $ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# canvas 
-$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
+# canvas
+$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
                              'borderwidth'=>0, 'width'=>500, 'height'=>350)
 $ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
 
-# font 
-textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+# font
+if $tk_version =~ /^4.*/
+  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+else
+  textFont = 'Helvetica 24'
+end
 
-# canvas 
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
+# canvas
+TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
                  'outline'=>'black', 'fill'=>'red')
 
+ctag_text_param = {
+  'text'=>"This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above).",
+  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
+}
+if $tk_version =~ /^4.*/
+  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+else
+  ctag_text_param['font'] = 'Helvetica 24'
+end
+
 $ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
-                               'text'=>"This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above).",
-                               'width'=>440, 'anchor'=>'n', 
-                               'font'=>'-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*', 
-                               'kanjifont'=>'-*--24-*-jisx0208.1983-0', 
-                               'justify'=>'left') )
+$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
 
 $ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
 $ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1', 
-        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"}, 
+$ctag_text.bind('Shift-1',
+        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
         "%x %y")
-$ctag_text.bind('Shift-B1-Motion', 
+$ctag_text.bind('Shift-B1-Motion',
                 proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
 $ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
 $ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
 $ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
 $ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
 $ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"}, 
+$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
                 "%x %y")
 
-# Next, create some items that allow the text's anchor position 
+# Next, create some items that allow the text's anchor position
 # to be edited.
 
 def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30, 
+  item = TkcRectangle.new(w, x, y, x+30, y+30,
                           'outline'=>'black', 'fill'=>color, 'width'=>1)
   item.bind('1', proc{$ctag_text.configure option, value})
   w.addtag_withtag('config', item)
@@ -107,12 +118,17 @@ mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
 mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
 mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
 mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50, 
+item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
                         'outline'=>'black', 'fill'=>'red')
 item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 'anchor'=>'s', 
-            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-            'fill'=>'brown')
+if $tk_version =~ /^4.*/
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+              'anchor'=>'s', 'fill'=>'brown')
+else
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
+end
 
 # Lastly, create some items that allow the text's justification to be
 # changed.
@@ -123,14 +139,19 @@ color = 'SeaGreen2'
 mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
 mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
 mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 'anchor'=>'s', 
-            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-            'fill'=>'brown')
+if $tk_version =~ /^4.*/
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+              'anchor'=>'s', 'fill'=>'brown')
+else
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
+end
 
 $ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave', 
+$ctext_canvas.itembind('config', 'Leave',
                        proc{$ctext_canvas\
-                             .itemconfigure('current', 
+                             .itemconfigure('current',
                                             'fill'=>$textConfigFill)})
 
 $textConfigFill = ''
diff --git a/ext/tk/sample/demos-en/entry1.rb b/ext/tk/sample/demos-en/entry1.rb
index 29bc693395..fac0afc243 100644
--- a/ext/tk/sample/demos-en/entry1.rb
+++ b/ext/tk/sample/demos-en/entry1.rb
@@ -4,7 +4,7 @@
 
 # toplevel widget
 if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy 
+  $entry1_demo.destroy
   $entry1_demo = nil
 end
 
@@ -15,8 +15,10 @@ $entry1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($entry1_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -25,7 +27,7 @@ msg = TkLabel.new($entry1_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($entry1_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -41,13 +43,13 @@ TkFrame.new($entry1_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# 
-e1 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e2 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e3 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+#
+e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
+e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
+e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
 [e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
 
-# 
+#
 e1.insert(0, 'Initial value')
 e2.insert('end', "This entry contains a long value, much too long ")
 e2.insert('end', "to fit in the window at one time, so long in fact ")
diff --git a/ext/tk/sample/demos-en/entry2.rb b/ext/tk/sample/demos-en/entry2.rb
index d4e58d7dd5..05a6c83cfd 100644
--- a/ext/tk/sample/demos-en/entry2.rb
+++ b/ext/tk/sample/demos-en/entry2.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy 
+  $entry2_demo.destroy
   $entry2_demo = nil
 end
 
@@ -19,8 +19,10 @@ $entry2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($entry2_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -29,7 +31,7 @@ msg = TkLabel.new($entry2_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($entry2_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -46,7 +48,7 @@ TkFrame.new($entry2_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
-TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
+TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   # entry 1
   s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
   e1 = TkEntry.new(w, 'relief'=>'sunken') {
@@ -80,7 +82,7 @@ TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
   e3.pack('side'=>'top', 'fill'=>'x')
   s3.pack('side'=>'top', 'fill'=>'x')
 
-  # 
+  #
   e1.insert(0, 'Initial value')
   e2.insert('end', "This entry contains a long value, much too long ")
   e2.insert('end', "to fit in the window at one time, so long in fact ")
diff --git a/ext/tk/sample/demos-en/entry3.rb b/ext/tk/sample/demos-en/entry3.rb
index 415b45f86c..d3bc629fdf 100644
--- a/ext/tk/sample/demos-en/entry3.rb
+++ b/ext/tk/sample/demos-en/entry3.rb
@@ -7,7 +7,7 @@
 # based on Tcl/Tk8.4.4 widget demos
 
 if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy 
+  $entry3_demo.destroy
   $entry3_demo = nil
 end
 
@@ -17,8 +17,10 @@ $entry3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($entry3_demo, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'5i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 Four different entries are displayed below.  You can add characters \
 by pointing, clicking and typing, though each is constrained in what \
@@ -28,13 +30,13 @@ problem.  The second only accepts strings with fewer than ten \
 characters and sounds the bell when an attempt to go over the limit \
 is made.  The third accepts US phone numbers, mapping letters to \
 their digit equivalent and sounding the bell on encountering an \
-illegal character or if trying to type over a character that is not \
+invalid character or if trying to type over a character that is not \
 a digit.  The fourth is a password field that accepts up to eight \
 characters (silently ignoring further ones), and displaying them as \
 asterisk characters.
 EOL
 
-TkFrame.new($entry3_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
@@ -60,24 +62,42 @@ TkFrame.new($entry3_demo){|f|
 # count -       Counter to control the number of times flashed
 def focusAndFlash(widget, fg, bg, count=5)
   return if count <= 0
-  TkTimer.new(200, count, 
-              proc{widget.configure(:foreground=>bg, :background=>fg)}, 
-              proc{widget.configure(:foreground=>fg, :background=>bg)}
-              ).start
+  if fg && !fg.empty? && bg && !bg.empty?
+    TkTimer.new(200, count,
+                proc{widget.configure(:foreground=>bg, :background=>fg)},
+                proc{widget.configure(:foreground=>fg, :background=>bg)}
+                ).start
+  else
+    # TkTimer.new(150, 3){Tk.bell}.start
+    Tk.bell
+    TkTimer.new(200, count,
+                proc{widget.configure(:foreground=>'white',
+                                      :background=>'black')},
+                proc{widget.configure(:foreground=>'black',
+                                      :background=>'white')}
+                ).at_end{begin
+                           widget.configure(:foreground=>fg,
+                                            :background=>bg)
+                         rescue
+                           # ignore
+                         end}.start
+  end
   widget.focus(true)
 end
 
-l1 = TkLabelFrame.new($entry3_demo, :text=>"Integer Entry")
-TkEntry.new(l1, :validate=>:focus, 
+l1 = TkLabelFrame.new(base_frame, :text=>"Integer Entry")
+TkEntry.new(l1, :validate=>:focus,
             :vcmd=>[
               proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
             ]) {|e|
-  invalidcommand [proc{|w| focusAndFlash(w, e.fg, e.bg)}, '%W']
+  fg = e.foreground
+  bg = e.background
+  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
   pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 }
 
-l2 = TkLabelFrame.new($entry3_demo, :text=>"Length-Constrained Entry")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell}, 
+l2 = TkLabelFrame.new(base_frame, :text=>"Length-Constrained Entry")
+TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
             :vcmd=>[proc{|s| s.length < 10}, '%P']
             ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 
@@ -151,25 +171,25 @@ end
 
 def validatePhoneChange(widget, vmode, idx, char)
   return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode, 
+  Tk.after_idle(proc{widget.configure(:validate=>vmode,
                                       :invcmd=>proc{Tk.bell})})
   if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
     widget.delete(idx)
     widget.insert(idx, $phoneNumberMap[char] || char)
     Tk.after_idle(proc{phoneSkipRight(widget, -1)})
     return true
-    # Tk.update(true) # Don't work 'update' inter validation callback.
-                      # It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1). 
+    # Tk.update(true) # <- Don't work 'update' inter validation callback.
+                      #    It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
   end
   return false
 end
 
 
-l3 = TkLabelFrame.new($entry3_demo, :text=>"US Phone-Number Entry")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell}, 
-            :textvariable=>entry3content, 
+l3 = TkLabelFrame.new(base_frame, :text=>"US Phone-Number Entry")
+TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
+            :textvariable=>entry3content,
             :vcmd=>[
-              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)}, 
+              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
               "%W %v %i %S"
             ]){|e|
   # Click to focus goes to the first editable character...
@@ -184,14 +204,14 @@ TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
   pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 }
 
-l4 = TkLabelFrame.new($entry3_demo, :text=>"Password Entry")
-TkEntry.new(l4, :validate=>:key, :show=>'*', 
+l4 = TkLabelFrame.new(base_frame, :text=>"Password Entry")
+TkEntry.new(l4, :validate=>:key, :show=>'*',
             :vcmd=>[
-              proc{|s| s.length <= 8}, 
+              proc{|s| s.length <= 8},
               '%P'
             ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 
-TkFrame.new($entry3_demo){|f|
+TkFrame.new(base_frame){|f|
   lower
   TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
   TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
diff --git a/ext/tk/sample/demos-en/filebox.rb b/ext/tk/sample/demos-en/filebox.rb
index 36b19de557..0c284c11d4 100644
--- a/ext/tk/sample/demos-en/filebox.rb
+++ b/ext/tk/sample/demos-en/filebox.rb
@@ -6,7 +6,7 @@
 
 # toplevel widget
 if defined?($filebox_demo) && $filebox_demo
-  $filebox_demo.destroy 
+  $filebox_demo.destroy
   $filebox_demo = nil
 end
 
@@ -17,12 +17,14 @@ $filebox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($filebox_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
             'text'=>"Enter a file name in the entry box or click on the \"Browse\" buttons to select a file name using the file selection dialog.").pack('side'=>'top')
 
 # frame
-TkFrame.new($filebox_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -40,15 +42,15 @@ TkFrame.new($filebox_demo) {|frame|
 
 # frame
 ['open', 'save'].each{|type|
-  TkFrame.new($filebox_demo) {|f|
+  TkFrame.new(base_frame) {|f|
     TkLabel.new(f, 'text'=>"Select a file to #{type}: ", 'anchor'=>'e')\
     .pack('side'=>'left')
 
     TkEntry.new(f, 'width'=>20) {|e|
       pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
 
-      TkButton.new(f, 'text'=>'Browse ...', 
-                   'command'=>proc{fileDialog $filebox_demo,e,type})\
+      TkButton.new(f, 'text'=>'Browse ...',
+                   'command'=>proc{fileDialog base_frame,e,type})\
       .pack('side'=>'left')
     }
 
@@ -58,9 +60,9 @@ TkFrame.new($filebox_demo) {|frame|
 
 $tk_strictMotif = TkVarAccess.new('tk_strictMotif')
 if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new($filebox_demo, 
-                    'text'=>'Use Motif Style Dialog', 
-                    'variable'=>$tk_strictMotif, 
+  TkCheckButton.new(base_frame,
+                    'text'=>'Use Motif Style Dialog',
+                    'variable'=>$tk_strictMotif,
                     'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
 end
 
@@ -69,29 +71,32 @@ def fileDialog(w,ent,operation)
   #
   #--------------------------------------------------------
   types = [
-    ['Text files',       ['.txt','.doc']          ], 
-    ['Text files',       [],                      'TEXT' ], 
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ], 
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ], 
-    ['C Source Files',   ['.c','.h']              ], 
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ], 
-    ['Image Files',      ['.gif']                 ], 
-    ['Image Files',      ['.jpeg','.jpg']         ], 
-    ['Image Files',      [],                      ['GIFF','JPEG']], 
+    ['Text files',       ['.txt','.doc']          ],
+    ['Text files',       [],                      'TEXT' ],
+    ['Ruby Scripts',     ['.rb'],                 'TEXT' ],
+    ['Tcl Scripts',      ['.tcl'],                'TEXT' ],
+    ['C Source Files',   ['.c','.h']              ],
+    ['All Source Files', ['.rb','.tcl','.c','.h'] ],
+    ['Image Files',      ['.gif']                 ],
+    ['Image Files',      ['.jpeg','.jpg']         ],
+    ['Image Files',      [],                      ['GIFF','JPEG']],
     ['All files',        '*'                      ]
   ]
 
   if operation == 'open'
     file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
   else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
-                          'initialfile'=>'Untitled', 
+    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
+                          'initialfile'=>'Untitled',
                           'defaultextension'=>'.txt')
   end
   if file != ""
     ent.delete 0, 'end'
     ent.insert 0, file
-    ent.xview 'end'
+    # ent.xview 'end'
+    Tk.update_idletasks # need this for Tk::Tile::Entry
+                        # (to find right position of 'xview').
+    ent.xview(ent.index('end'))
   end
 end
 
diff --git a/ext/tk/sample/demos-en/floor.rb b/ext/tk/sample/demos-en/floor.rb
index 53adcf96b6..eb8b23eb7d 100644
--- a/ext/tk/sample/demos-en/floor.rb
+++ b/ext/tk/sample/demos-en/floor.rb
@@ -21,7 +21,7 @@ def floorDisplay(w,active)
   w.delete('all')
   $activeFloor = active
 
-  # First go through the three floors, displaying the backgrounds for 
+  # First go through the three floors, displaying the backgrounds for
   # each floor.
 
   floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
@@ -32,12 +32,12 @@ def floorDisplay(w,active)
 
   w.raise("floor#{active}")
 
-  # Create a dummy item just to mark this point in the display list, 
+  # Create a dummy item just to mark this point in the display list,
   # so we can insert highlights here.
 
   TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
 
-  # Add the walls and labels for the active floor, along with 
+  # Add the walls and labels for the active floor, along with
   # transparent polygons that define the rooms on the floor.
   # Make sure that the room polygons are on top.
 
@@ -302,7 +302,7 @@ def floor_bg3(w,fill,outline)
   TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
   TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
   TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300, 
+  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
               'fill'=>outline, 'tags'=>['floor3','bg'])
 end
 
@@ -316,316 +316,316 @@ end
 # color -       Color to use for drawing foreground information.
 
 def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '101'
   $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color, 
+  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Pub Lift1'
   $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Priv Lift1'
   $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '110'
   $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color, 
+  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '109'
   $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color, 
+  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '111'
   $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '117B'
   $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '112'
   $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '113'
   $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '117A'
   $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color, 
+  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '117'
   $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color, 
+  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '114'
   $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color, 
+  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '115'
   $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color, 
+  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '116'
   $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color, 
+  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '118'
   $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color, 
+  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128, 
+                     163,91,163,112,149,112,149,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '120'
   $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246, 
+                     156,192,156,169,175,169,175,246,79,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '122'
   $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color, 
+  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '121'
   $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color, 
+  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '106A'
   $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '105'
   $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '106B'
   $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color, 
+  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '104'
   $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color, 
+  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '108'
   $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color, 
+  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '107'
   $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color, 
+  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Smoking'
   $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color, 
+  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '123'
   $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '103'
   $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color, 
+  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '124'
   $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color, 
+  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '125'
   $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color, 
+  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '126'
   $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209, 
+                     486,253,486,239,474,239,474,209,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '127'
   $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color, 
+  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164, 
+                     490,188,490,204,476,204,476,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'MShower'
   $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Closet'
   $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'WShower'
   $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
                      697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161, 
+                     515,174,503,174,503,161,486,161,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '130'
   $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color, 
+  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
                      342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248, 
+                     393,309,300,309,300,248,308,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '102'
   $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '128'
   $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
                      552,277,561,277,561,325,510,325,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '129'
   $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color, 
+  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277, 
+                     642,389,561,389,561,277,696,277,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '133'
   $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color, 
+  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '132'
   $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color, 
+  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '134'
   $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color, 
+  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '135'
   $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color, 
+  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
                      304,312,396,312,396,288,400,288,404,288,
                      409,290,413,292,418,297,421,302,422,309,
                      421,318,417,325,411,330,405,332,397,333,
                      344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359, 
+                     331,347,332,351,334,354,336,357,341,359,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Ramona Stair'
   $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'University Stair'
   $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
                      358,48,363,39,365,29,348,25,335,22,321,14,
                      300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34, 
+                     227,13,223,17,221,22,220,34,260,34,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Plaza Stair'
   $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
                      323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128, 
+                     386,104,386,128,220,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Plaza Deck'
   $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '106'
   $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
                      95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     112,130,97,130,97,168,175,168,175,131,146,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '119'
   $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color, 
+  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
   TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -798,321 +798,321 @@ end
 
 def floor_fg2(w,color)
   i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168, 
+                     800,222,800,168,748,168,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '238'
   $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color, 
+  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '237'
   $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color, 
+  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
                      643,324,643,291,641,291,641,205,696,205,
                      696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187, 
+                     715,205,755,205,755,190,724,190,724,187,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '246'
   $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color, 
+  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '247'
   $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
                      397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     559,274,482,274,482,278,396,278,396,274,232,274,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '202'
   $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color, 
+  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
                      306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228, 
+                     156,196,176,196,176,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '206'
   $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color, 
+  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '212'
   $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '245'
   $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '244'
   $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '243'
   $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color, 
+  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '242'
   $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = 'Barbecue Deck'
   $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '240'
   $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color, 
+  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '241'
   $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color, 
+  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '239'
   $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color, 
+  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '248'
   $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color, 
+  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '236'
   $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color, 
+  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '235'
   $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color, 
+  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185, 
+                     572,143,579,143,579,185,626,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '234'
   $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color, 
+  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131, 
+                     578,185,527,185,527,131,557,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '233'
   $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color, 
+  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '230'
   $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color, 
+  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '232'
   $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color, 
+  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '229'
   $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color, 
+  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '227'
   $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '228'
   $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color, 
+  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '226'
   $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color, 
+  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '225'
   $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color, 
+  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '224'
   $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color, 
+  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '223'
   $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color, 
+  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '222'
   $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color, 
+  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '221'
   $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color, 
+  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '204'
   $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color, 
+  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '205'
   $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color, 
+  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '207'
   $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color, 
+  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '208'
   $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color, 
+  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '209'
   $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '217'
   $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color, 
+  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '217A'
   $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color, 
+  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '216'
   $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color, 
+  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '215'
   $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color, 
+  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '214'
   $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '213'
   $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color, 
+  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '210'
   $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '211'
   $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color, 
+  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '203'
   $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169, 
+                     154,198,154,192,109,192,109,169,99,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '220'
   $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = 'Priv Lift2'
   $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = 'Pub Lift 2'
   $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '218'
   $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color, 
+  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '219'
   $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color, 
+  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '201'
   $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color, 
+  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
   TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1283,206 +1283,206 @@ def floor_fg3(w,color)
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '316'
   $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color, 
+  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '309'
   $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '308'
   $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '307'
   $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color, 
+  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '305'
   $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '324B'
   $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color, 
+  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '324A'
   $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '320'
   $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color, 
+  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '310'
   $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '312'
   $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color, 
+  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '313'
   $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color, 
+  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '314'
   $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '315'
   $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color, 
+  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '316B'
   $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color, 
+  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '316A'
   $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color, 
+  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179, 
+                     174,198,174,226,101,226,101,179,97,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '319'
   $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color, 
+  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '311'
   $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color, 
+  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '318'
   $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color, 
+  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '317'
   $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color, 
+  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '323'
   $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color, 
+  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '325'
   $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color, 
+  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '321'
   $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color, 
+  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135, 
+                     264,181,264,135,314,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '322'
   $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = 'Pub Lift3'
   $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = 'Priv Lift3'
   $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '303'
   $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203, 
+                     244,230,244,221,252,221,252,203,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '324'
   $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color, 
+  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '304'
   $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color, 
+  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '301'
   $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color, 
+  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '327'
   $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color, 
+  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '326'
   $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color, 
+  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     375,274,397,274,397,248,339,248,339,242,308,242,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '302'
   $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color, 
+  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
                      272,193,263,180,242,180,175,180,175,169,156,169,
                      156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     107,248,160,248,160,301,107,301,107,275,70,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '306'
   $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
   TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1577,7 +1577,7 @@ end
 
 # toplevel widget
 if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy 
+  $floor_demo.destroy
   $floor_demo = nil
 end
 
@@ -1590,14 +1590,16 @@ $floor_demo = TkToplevel.new {|w|
   minsize(100,100)
 }
 
+base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($floor_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
             'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
   pack('side'=>'top')
 }
 
 # frame
-$floor_buttons = TkFrame.new($floor_demo) {|frame|
+$floor_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -1614,23 +1616,23 @@ $floor_buttons = TkFrame.new($floor_demo) {|frame|
 }
 $floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# 
+#
 $floorLabels = {}
 $floorItems = {}
 
-# canvas 
+# canvas
 if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new($floor_demo,'bd'=>2,'relief'=>'sunken',
+  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
                                     'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame, 
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+  $floor_canvas = TkCanvas.new($floor_canvas_frame,
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
                                'highlightthickness'=>0) {|c|
-    TkScrollbar.new($floor_demo, 'orient'=>'horiz', 
+    TkScrollbar.new(base_frame, 'orient'=>'horiz',
                     'command'=>proc{|*args| c.xview(*args)}){|hs|
       c.xscrollcommand(proc{|first,last| hs.set first,last})
       pack('side'=>'bottom', 'fill'=>'x')
     }
-    TkScrollbar.new($floor_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
       c.yscrollcommand(proc{|first,last| vs.set first,last})
       pack('side'=>'right', 'fill'=>'y')
     }
@@ -1639,27 +1641,27 @@ if $tk_version =~ /^4\.[01]/
   $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
 else
-  TkFrame.new($floor_demo) {|f|
+  TkFrame.new(base_frame) {|f|
     pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
 
     h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
     v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
 
     TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
-                                   'borderwidth'=>0, 
+      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+                                   'borderwidth'=>0,
                                    'highlightthickness'=>0) {
         xscrollcommand(proc{|first,last| h.set first,last})
         yscrollcommand(proc{|first,last| v.set first,last})
         pack('expand'=>'yes', 'fill'=>'both')
       }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     }
 
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
 
     TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1676,7 +1678,7 @@ end
 # Create an entry for displaying and typing in current room.
 
 $currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
+$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
                            'bd'=>2, 'textvariable'=>$currentRoom)
 
 # Choose colors, then fill in the floorplan.
@@ -1713,7 +1715,7 @@ $floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
 $floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
 $floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
 $floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion', 
+$floor_canvas.bind('B2-Motion',
                    proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
 $floor_canvas.bind('Destroy', proc{$currentRoom.unset})
 $currentRoom.value = ''
diff --git a/ext/tk/sample/demos-en/floor2.rb b/ext/tk/sample/demos-en/floor2.rb
index efaf9e250d..3bfa89a920 100644
--- a/ext/tk/sample/demos-en/floor2.rb
+++ b/ext/tk/sample/demos-en/floor2.rb
@@ -21,7 +21,7 @@ def floorDisplay2(w,active)
   w.delete('all')
   $activeFloor2 = active
 
-  # First go through the three floors, displaying the backgrounds for 
+  # First go through the three floors, displaying the backgrounds for
   # each floor.
 
   floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
@@ -32,12 +32,12 @@ def floorDisplay2(w,active)
 
   w.raise("floor#{active}")
 
-  # Create a dummy item just to mark this point in the display list, 
+  # Create a dummy item just to mark this point in the display list,
   # so we can insert highlights here.
 
   w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
 
-  # Add the walls and labels for the active floor, along with 
+  # Add the walls and labels for the active floor, along with
   # transparent polygons that define the rooms on the floor.
   # Make sure that the room polygons are on top.
 
@@ -302,7 +302,7 @@ def floor2_bg3(w,fill,outline)
   w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
   w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
   w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300, 
+  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
               'fill'=>outline, 'tags'=>['floor3','bg'])
 end
 
@@ -316,316 +316,316 @@ end
 # color -       Color to use for drawing foreground information.
 
 def floor2_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '101'
   $floorItems2['101'] = i
-  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color, 
+  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Pub Lift1'
   $floorItems2['Pub Lift1'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Priv Lift1'
   $floorItems2['Priv Lift1'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '110'
   $floorItems2['110'] = i
-  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color, 
+  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '109'
   $floorItems2['109'] = i
-  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color, 
+  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '111'
   $floorItems2['111'] = i
-  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '117B'
   $floorItems2['117B'] = i
-  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '112'
   $floorItems2['112'] = i
-  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '113'
   $floorItems2['113'] = i
-  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '117A'
   $floorItems2['117A'] = i
-  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color, 
+  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '117'
   $floorItems2['117'] = i
-  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color, 
+  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '114'
   $floorItems2['114'] = i
-  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color, 
+  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '115'
   $floorItems2['115'] = i
-  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color, 
+  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '116'
   $floorItems2['116'] = i
-  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color, 
+  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '118'
   $floorItems2['118'] = i
-  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color, 
+  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128, 
+                     163,91,163,112,149,112,149,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '120'
   $floorItems2['120'] = i
-  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246, 
+                     156,192,156,169,175,169,175,246,79,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '122'
   $floorItems2['122'] = i
-  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color, 
+  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '121'
   $floorItems2['121'] = i
-  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color, 
+  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '106A'
   $floorItems2['106A'] = i
-  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '105'
   $floorItems2['105'] = i
-  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '106B'
   $floorItems2['106B'] = i
-  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color, 
+  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '104'
   $floorItems2['104'] = i
-  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color, 
+  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '108'
   $floorItems2['108'] = i
-  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color, 
+  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '107'
   $floorItems2['107'] = i
-  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color, 
+  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Smoking'
   $floorItems2['Smoking'] = i
-  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color, 
+  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '123'
   $floorItems2['123'] = i
-  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '103'
   $floorItems2['103'] = i
-  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color, 
+  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '124'
   $floorItems2['124'] = i
-  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color, 
+  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '125'
   $floorItems2['125'] = i
-  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color, 
+  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '126'
   $floorItems2['126'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209, 
+                     486,253,486,239,474,239,474,209,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '127'
   $floorItems2['127'] = i
-  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color, 
+  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164, 
+                     490,188,490,204,476,204,476,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'MShower'
   $floorItems2['MShower'] = i
-  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Closet'
   $floorItems2['Closet'] = i
-  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'WShower'
   $floorItems2['WShower'] = i
-  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
                      697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161, 
+                     515,174,503,174,503,161,486,161,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '130'
   $floorItems2['130'] = i
-  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color, 
+  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
                      342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248, 
+                     393,309,300,309,300,248,308,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '102'
   $floorItems2['102'] = i
-  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '128'
   $floorItems2['128'] = i
-  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
                      552,277,561,277,561,325,510,325,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '129'
   $floorItems2['129'] = i
-  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color, 
+  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277, 
+                     642,389,561,389,561,277,696,277,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '133'
   $floorItems2['133'] = i
-  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color, 
+  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '132'
   $floorItems2['132'] = i
-  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color, 
+  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '134'
   $floorItems2['134'] = i
-  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color, 
+  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '135'
   $floorItems2['135'] = i
-  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color, 
+  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
                      304,312,396,312,396,288,400,288,404,288,
                      409,290,413,292,418,297,421,302,422,309,
                      421,318,417,325,411,330,405,332,397,333,
                      344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359, 
+                     331,347,332,351,334,354,336,357,341,359,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Ramona Stair'
   $floorItems2['Ramona Stair'] = i
-  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'University Stair'
   $floorItems2['University Stair'] = i
-  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
                      358,48,363,39,365,29,348,25,335,22,321,14,
                      300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34, 
+                     227,13,223,17,221,22,220,34,260,34,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Plaza Stair'
   $floorItems2['Plaza Stair'] = i
-  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
                      323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128, 
+                     386,104,386,128,220,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Plaza Deck'
   $floorItems2['Plaza Deck'] = i
-  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '106'
   $floorItems2['106'] = i
-  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
                      95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     112,130,97,130,97,168,175,168,175,131,146,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '119'
   $floorItems2['119'] = i
-  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color, 
+  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
   w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -798,321 +798,321 @@ end
 
 def floor2_fg2(w,color)
   i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168, 
+                     800,222,800,168,748,168,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '238'
   $floorItems2['238'] = i
-  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color, 
+  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '237'
   $floorItems2['237'] = i
-  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color, 
+  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
                      643,324,643,291,641,291,641,205,696,205,
                      696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187, 
+                     715,205,755,205,755,190,724,190,724,187,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '246'
   $floorItems2['246'] = i
-  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color, 
+  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '247'
   $floorItems2['247'] = i
-  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
                      397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     559,274,482,274,482,278,396,278,396,274,232,274,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '202'
   $floorItems2['202'] = i
-  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color, 
+  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
                      306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228, 
+                     156,196,176,196,176,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '206'
   $floorItems2['206'] = i
-  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color, 
+  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '212'
   $floorItems2['212'] = i
-  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '245'
   $floorItems2['245'] = i
-  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '244'
   $floorItems2['244'] = i
-  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '243'
   $floorItems2['243'] = i
-  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color, 
+  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '242'
   $floorItems2['242'] = i
-  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = 'Barbecue Deck'
   $floorItems2['Barbecue Deck'] = i
-  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '240'
   $floorItems2['240'] = i
-  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color, 
+  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '241'
   $floorItems2['241'] = i
-  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color, 
+  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '239'
   $floorItems2['239'] = i
-  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color, 
+  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '248'
   $floorItems2['248'] = i
-  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color, 
+  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '236'
   $floorItems2['236'] = i
-  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color, 
+  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '235'
   $floorItems2['235'] = i
-  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color, 
+  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185, 
+                     572,143,579,143,579,185,626,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '234'
   $floorItems2['234'] = i
-  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color, 
+  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131, 
+                     578,185,527,185,527,131,557,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '233'
   $floorItems2['233'] = i
-  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color, 
+  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '230'
   $floorItems2['230'] = i
-  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color, 
+  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '232'
   $floorItems2['232'] = i
-  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color, 
+  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '229'
   $floorItems2['229'] = i
-  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color, 
+  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '227'
   $floorItems2['227'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '228'
   $floorItems2['228'] = i
-  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color, 
+  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '226'
   $floorItems2['226'] = i
-  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color, 
+  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '225'
   $floorItems2['225'] = i
-  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color, 
+  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '224'
   $floorItems2['224'] = i
-  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color, 
+  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '223'
   $floorItems2['223'] = i
-  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color, 
+  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '222'
   $floorItems2['222'] = i
-  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color, 
+  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '221'
   $floorItems2['221'] = i
-  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color, 
+  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '204'
   $floorItems2['204'] = i
-  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color, 
+  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '205'
   $floorItems2['205'] = i
-  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color, 
+  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '207'
   $floorItems2['207'] = i
-  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color, 
+  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '208'
   $floorItems2['208'] = i
-  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color, 
+  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '209'
   $floorItems2['209'] = i
-  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '217'
   $floorItems2['217'] = i
-  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color, 
+  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '217A'
   $floorItems2['217A'] = i
-  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color, 
+  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '216'
   $floorItems2['216'] = i
-  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color, 
+  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '215'
   $floorItems2['215'] = i
-  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color, 
+  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '214'
   $floorItems2['214'] = i
-  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '213'
   $floorItems2['213'] = i
-  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color, 
+  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '210'
   $floorItems2['210'] = i
-  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '211'
   $floorItems2['211'] = i
-  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color, 
+  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '203'
   $floorItems2['203'] = i
-  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169, 
+                     154,198,154,192,109,192,109,169,99,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '220'
   $floorItems2['220'] = i
-  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = 'Priv Lift2'
   $floorItems2['Priv Lift2'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = 'Pub Lift 2'
   $floorItems2['Pub Lift 2'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '218'
   $floorItems2['218'] = i
-  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color, 
+  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '219'
   $floorItems2['219'] = i
-  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color, 
+  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '201'
   $floorItems2['201'] = i
-  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color, 
+  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
   w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1283,206 +1283,206 @@ def floor2_fg3(w,color)
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '316'
   $floorItems2['316'] = i
-  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color, 
+  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '309'
   $floorItems2['309'] = i
-  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '308'
   $floorItems2['308'] = i
-  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '307'
   $floorItems2['307'] = i
-  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color, 
+  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '305'
   $floorItems2['305'] = i
-  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '324B'
   $floorItems2['324B'] = i
-  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color, 
+  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '324A'
   $floorItems2['324A'] = i
-  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '320'
   $floorItems2['320'] = i
-  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color, 
+  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '310'
   $floorItems2['310'] = i
-  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '312'
   $floorItems2['312'] = i
-  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color, 
+  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '313'
   $floorItems2['313'] = i
-  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color, 
+  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '314'
   $floorItems2['314'] = i
-  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '315'
   $floorItems2['315'] = i
-  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color, 
+  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '316B'
   $floorItems2['316B'] = i
-  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color, 
+  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '316A'
   $floorItems2['316A'] = i
-  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color, 
+  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179, 
+                     174,198,174,226,101,226,101,179,97,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '319'
   $floorItems2['319'] = i
-  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color, 
+  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '311'
   $floorItems2['311'] = i
-  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color, 
+  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '318'
   $floorItems2['318'] = i
-  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color, 
+  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '317'
   $floorItems2['317'] = i
-  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color, 
+  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '323'
   $floorItems2['323'] = i
-  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color, 
+  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '325'
   $floorItems2['325'] = i
-  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color, 
+  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '321'
   $floorItems2['321'] = i
-  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color, 
+  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135, 
+                     264,181,264,135,314,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '322'
   $floorItems2['322'] = i
-  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = 'Pub Lift3'
   $floorItems2['Pub Lift3'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = 'Priv Lift3'
   $floorItems2['Priv Lift3'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '303'
   $floorItems2['303'] = i
-  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203, 
+                     244,230,244,221,252,221,252,203,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '324'
   $floorItems2['324'] = i
-  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color, 
+  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '304'
   $floorItems2['304'] = i
-  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color, 
+  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '301'
   $floorItems2['301'] = i
-  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color, 
+  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '327'
   $floorItems2['327'] = i
-  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color, 
+  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '326'
   $floorItems2['326'] = i
-  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color, 
+  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     375,274,397,274,397,248,339,248,339,242,308,242,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '302'
   $floorItems2['302'] = i
-  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color, 
+  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
                      272,193,263,180,242,180,175,180,175,169,156,169,
                      156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     107,248,160,248,160,301,107,301,107,275,70,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '306'
   $floorItems2['306'] = i
-  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
   w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1577,7 +1577,7 @@ end
 
 # toplevel widget
 if defined?($floor2_demo) && $floor2_demo
-  $floor2_demo.destroy 
+  $floor2_demo.destroy
   $floor2_demo = nil
 end
 
@@ -1590,14 +1590,16 @@ $floor2_demo = TkToplevel.new {|w|
   minsize(100,100)
 }
 
+base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($floor2_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
             'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
   pack('side'=>'top')
 }
 
 # frame
-$floor2_buttons = TkFrame.new($floor2_demo) {|frame|
+$floor2_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -1614,23 +1616,23 @@ $floor2_buttons = TkFrame.new($floor2_demo) {|frame|
 }
 $floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# 
+#
 $floorLabels2 = {}
 $floorItems2 = {}
 
-# canvas 
+# canvas
 if $tk_version =~ /^4\.[01]/
-  $floor2_canvas_frame = TkFrame.new($floor2_demo,'bd'=>2,'relief'=>'sunken',
+  $floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
                                     'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame, 
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+  $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
                                'highlightthickness'=>0) {|c|
-    TkScrollbar.new($floor2_demo, 'orient'=>'horiz', 
+    TkScrollbar.new(base_frame, 'orient'=>'horiz',
                     'command'=>proc{|*args| c.xview(*args)}){|hs|
       c.xscrollcommand(proc{|first,last| hs.set first,last})
       pack('side'=>'bottom', 'fill'=>'x')
     }
-    TkScrollbar.new($floor2_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
       c.yscrollcommand(proc{|first,last| vs.set first,last})
       pack('side'=>'right', 'fill'=>'y')
     }
@@ -1639,27 +1641,27 @@ if $tk_version =~ /^4\.[01]/
   $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
 else
-  TkFrame.new($floor2_demo) {|f|
+  TkFrame.new(base_frame) {|f|
     pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
 
     h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
     v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
 
     TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
-                                   'borderwidth'=>0, 
+      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+                                   'borderwidth'=>0,
                                    'highlightthickness'=>0) {
         xscrollcommand(proc{|first,last| h.set first,last})
         yscrollcommand(proc{|first,last| v.set first,last})
         pack('expand'=>'yes', 'fill'=>'both')
       }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     }
 
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
 
     TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1676,7 +1678,7 @@ end
 # Create an entry for displaying and typing in current room.
 
 $currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken', 
+$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
                            'bd'=>2, 'textvariable'=>$currentRoom2)
 
 # Choose colors, then fill in the floorplan.
@@ -1713,7 +1715,7 @@ $floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
 $floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
 $floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
 $floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion', 
+$floor2_canvas.bind('B2-Motion',
                    proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
 $floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
 $currentRoom2.value = ''
diff --git a/ext/tk/sample/demos-en/form.rb b/ext/tk/sample/demos-en/form.rb
index dbb14302dc..abb3e0e10e 100644
--- a/ext/tk/sample/demos-en/form.rb
+++ b/ext/tk/sample/demos-en/form.rb
@@ -4,7 +4,7 @@
 
 # toplevel widget
 if defined?($form_demo) && $form_demo
-  $form_demo.destroy 
+  $form_demo.destroy
   $form_demo = nil
 end
 
@@ -15,8 +15,10 @@ $form_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($form_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +27,7 @@ msg = TkLabel.new($form_demo) {
 msg.pack('side'=>'top', 'fill'=>'x')
 
 # frame
-TkFrame.new($form_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -41,10 +43,10 @@ TkFrame.new($form_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# entry 
+# entry
 form_data = []
 (1..5).each{|i|
-  f = TkFrame.new($form_demo, 'bd'=>2)
+  f = TkFrame.new(base_frame, 'bd'=>2)
   e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
   l = TkLabel.new(f)
   e.pack('side'=>'right')
@@ -52,7 +54,7 @@ form_data = []
   form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
 }
 
-# 
+#
 form_data[1]['label'].text('Name:')
 form_data[2]['label'].text('Address:')
 form_data[5]['label'].text('Phone:')
diff --git a/ext/tk/sample/demos-en/goldberg.rb b/ext/tk/sample/demos-en/goldberg.rb
index 8d3f6d14f7..d3956ef78c 100644
--- a/ext/tk/sample/demos-en/goldberg.rb
+++ b/ext/tk/sample/demos-en/goldberg.rb
@@ -43,7 +43,7 @@
 #>># lots of canvas create and move calls.
 
 if defined?($goldberg_demo) && $goldberg_demo
-  $goldberg_demo.destroy 
+  $goldberg_demo.destroy
   $goldberg_demo = nil
 end
 
@@ -54,6 +54,8 @@ $goldberg_demo = TkToplevel.new {|w|
 #  positionWindow(w)
 }
 
+base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
+
 =begin
 # label
 msg = TkLabel.new($goldberg_demo) {
@@ -99,7 +101,7 @@ class TkGoldberg_Demo
     @S['pause']   = TkVariable.new
     @S['details'] = TkVariable.new(true)
 
-    @S['mode'] = TkVariable.new(:MSTART, :symbol) 
+    @S['mode'] = TkVariable.new(:MSTART, :symbol)
     #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
 
     #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
@@ -130,19 +132,19 @@ class TkGoldberg_Demo
     @XY = {}
 
     @XY6 = {
-      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192], 
+      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
       '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
-      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164], 
-      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151], 
-      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219], 
-      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324], 
-      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346], 
-      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391], 
-      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456], 
-      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443], 
-      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437], 
-      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424], 
-      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412], 
+      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
+      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
+      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
+      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
+      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
+      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
+      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
+      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
+      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
+      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
+      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
       '13,15'=>[376, 410], '13,16'=>[360, 403]
     }
 
@@ -159,11 +161,11 @@ class TkGoldberg_Demo
 
   def do_display()
     @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
-    @screen = TkFrame.new(@parent, :bd=>2, 
-                         :relief=>:raised).pack(:side=>:left, :fill=>:both, 
+    @screen = TkFrame.new(@parent, :bd=>2,
+                         :relief=>:raised).pack(:side=>:left, :fill=>:both,
                                                 :expand=>true)
 
-    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700, 
+    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
                           :bg=>@C['bg'], :highlightthickness=>0){
       scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
       yview_moveto(0.05)
@@ -175,7 +177,8 @@ class TkGoldberg_Demo
     do_ctrl_frame
     do_detail_frame
 
-    msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
+    # msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
+    msg = Tk::Label.new(@parent, :bg=>@C['bg'], :fg=>'white') {
       font 'Arial 10'
       wraplength 600
       justify 'left'
@@ -185,7 +188,8 @@ class TkGoldberg_Demo
 
     frame = TkFrame.new(@parent, :bg=>@C['bg'])
 
-    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
       text 'Dismiss'
       command proc{
         tmppath = $goldberg_demo
@@ -194,12 +198,14 @@ class TkGoldberg_Demo
       }
     }.pack('side'=>'left')
 
-    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
       text 'See Code'
       command proc{showCode 'goldberg'}
     }.pack('side'=>'left', 'padx'=>5)
 
-    @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl}, 
+    # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
+    @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
                          :bg=>@C['bg'], :activebackground=>@C['bg'])
     @show.pack('side'=>'left')
     frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
@@ -208,33 +214,34 @@ class TkGoldberg_Demo
   end
 
   def do_ctrl_frame
-    @start = TkButton.new(@parent, :text=>'Start', :bd=>6, 
+    @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
                           :command=>proc{do_button(0)})
-    @start.font(@start['font'].weight('bold'))
-    font = @start['font']
+    if font = @start['font']
+      @start.font(font.weight('bold'))
+    end
 
-    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font, 
-                               :command=>proc{do_button(1)}, :relief=>:raised, 
+    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
+                               :command=>proc{do_button(1)}, :relief=>:raised,
                                :variable=>@S['pause'])
 
-    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font, 
+    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font,
                           :command=>proc{do_button(2)})
-    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font, 
+    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
                           :command=>proc{do_button(4)})
-    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font, 
+    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
                           :command=>proc{do_button(3)})
 
     @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
-    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font, 
+    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
                                :relief=>:raised, :variable=>@S['details'])
 
-    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'], 
+    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
                              :justify=>:center)
-    @speed_scale = TkScale.new(@parent, :orient=>:horizontal, 
-                               :from=>1, :to=>10, :font=>font, 
-                               :variable=>@S['speed'], :bd=>2, 
+    @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
+                               :from=>1, :to=>10, :font=>font,
+                               :variable=>@S['speed'], :bd=>2,
                                :relief=>:ridge, :showvalue=>false)
-    @about = TkButton.new(@parent, :text=>'About', 
+    @about = TkButton.new(@parent, :text=>'About',
                           :command=>proc{about}, :font=>font)
 
     Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
@@ -262,17 +269,17 @@ class TkGoldberg_Demo
   def do_detail_frame
     @f_details = TkFrame.new(@details)
 
-    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'], 
+    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
                          :bd=>1, :relief=>:solid, :bg=>'white')
     Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
 
     idx = 1
     loop {
       break unless respond_to?("move#{idx}")
-      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e, 
+      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
                       :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
       @STEP[idx] = 0
-      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx), 
+      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
                        :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
       row = (idx + 1)/2
       col = ((idx + 1) & 1) * 2
@@ -376,7 +383,7 @@ class TkGoldberg_Demo
       who = who.to_i
       n = send("move#{who}")
       if (n & 1).nonzero?          # This guy still alive
-        alive << who 
+        alive << who
       end
       if (n & 2).nonzero?          # Next guy is active
         alive << (who + 1)
@@ -409,10 +416,10 @@ class TkGoldberg_Demo
   # START HERE! banner
   def draw0
     color = @C['0']
-    TkcText.new(@canvas, [579, 119], :text=>'START HERE!', 
-                :fill=>color, :anchor=>:w, 
+    TkcText.new(@canvas, [579, 119], :text=>'START HERE!',
+                :fill=>color, :anchor=>:w,
                 :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
-    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color, 
+    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
                 :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
     @canvas.itembind('I0', '1'){ start }
   end
@@ -426,7 +433,7 @@ class TkGoldberg_Demo
     end
 
     pos = [
-      [673, 119], [678, 119], [683, 119], [688, 119], 
+      [673, 119], [678, 119], [683, 119], [688, 119],
       [693, 119], [688, 119], [683, 119], [678, 119]
     ]
     step = step % pos.length
@@ -438,15 +445,15 @@ class TkGoldberg_Demo
   def draw1
     color = @C['1a']
     color2 = @C['1b']
-    TkcPolygon.new(@canvas, 
-                   [ 844, 133, 800, 133, 800, 346, 820, 346, 
-                     820, 168, 844, 168, 844, 133 ], 
+    TkcPolygon.new(@canvas,
+                   [ 844, 133, 800, 133, 800, 346, 820, 346,
+                     820, 168, 844, 168, 844, 133 ],
                    :width=>3, :fill=>color, :outline=>'')
-    TkcPolygon.new(@canvas, 
-                   [ 771, 133, 685, 133, 685, 168, 751, 168, 
-                     751, 346, 771, 346, 771, 133 ], 
+    TkcPolygon.new(@canvas,
+                   [ 771, 133, 685, 133, 685, 168, 751, 168,
+                     751, 346, 771, 346, 771, 133 ],
                    :width=>3, :fill=>color, :outline=>'')
-    TkcOval.new(@canvas, box(812, 122, 9), 
+    TkcOval.new(@canvas, box(812, 122, 9),
                 :tag=>'I1', :fill=>color2, :outline=>'')
 
     @canvas.itembind('I1', '1'){ start }
@@ -455,9 +462,9 @@ class TkGoldberg_Demo
   def move1(step = nil)
     step = get_step(1, step)
     pos = [
-      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153], 
-      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438], 
-      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601], 
+      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
+      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
+      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
       [-100, -100]
     ]
     return 0 if step >= pos.length
@@ -473,40 +480,40 @@ class TkGoldberg_Demo
     color = @C['2']
 
     # Fulcrum
-    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392], 
+    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
                    :fill=>@C['fg'], :outline=>@C['fg'])
 
     # Strike box
-    TkcRectangle.new(@canvas, [628, 335, 660, 383], 
+    TkcRectangle.new(@canvas, [628, 335, 660, 383],
                      :fill=>'', :outline=>@C['fg'])
     (0..2).each{|y|
       yy = 335 + y*16
-      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25', 
+      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
                     :anchor=>:nw, :foreground=>@C['fg'])
-      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25', 
+      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
                     :anchor=>:nw, :foreground=>@C['fg'])
     }
 
     # Lever
-    TkcLine.new(@canvas, [702, 366, 798, 366], 
+    TkcLine.new(@canvas, [702, 366, 798, 366],
                 :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
 
     # R strap
-    TkcLine.new(@canvas, [712, 363, 712, 355], 
+    TkcLine.new(@canvas, [712, 363, 712, 355],
                 :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
 
     # L strap
-    TkcLine.new(@canvas, [705, 363, 705, 355], 
+    TkcLine.new(@canvas, [705, 363, 705, 355],
                 :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
 
     # Match stick
-    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356], 
+    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
                 :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
 
     # Match head
-    TkcPolygon.new(@canvas, 
-                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1, 
-                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ], 
+    TkcPolygon.new(@canvas,
+                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
+                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
                    :fill=>color, :outline=>color, :tag=>'I2_4')
   end
 
@@ -516,15 +523,15 @@ class TkGoldberg_Demo
     stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
     xy = []
     xy[0] = [
-      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307, 
+      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
       662, 318, 662, 328, 671, 336
     ]
     xy[1] = [
-      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311, 
+      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
       661, 327, 671, 335
     ]
     xy[2] = [
-      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298, 
+      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
       666, 309, 660, 324, 672, 336
     ]
 
@@ -535,7 +542,7 @@ class TkGoldberg_Demo
 
     if step == 0  # Rotate the match
       beta = 20
-      
+
       ox, oy = anchor('I2_0', :s)  # Where to pivot
 
       i = 0
@@ -560,23 +567,23 @@ class TkGoldberg_Demo
 
     xy = [ [602, 296], [577, 174], [518, 174] ]
     xy.each{|x, y| # 3 Pulleys
-      TkcOval.new(@canvas, box(x, y, 13), 
+      TkcOval.new(@canvas, box(x, y, 13),
                   :fill=>color, :outline=>@C['fg'], :width=>3)
       TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
     }
 
     # Wall to flame
-    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s', 
+    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
                 :width=>3, :fill=>@C['fg'], :smooth=>true)
 
     # Flame to pulley 1
-    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0', 
+    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
                 :width=>3, :fill=>@C['fg'], :smooth=>true)
-    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1', 
+    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
                 :width=>3, :fill=>@C['fg'], :smooth=>true)
 
     # Pulley 1 half way to 2
-    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2', 
+    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
                 :width=>3, :fill=>@C['fg'])
 
     # Pulley 1 other half to 2
@@ -586,26 +593,26 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
 
     # Down to weight
-    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w', 
+    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
                 :width=>3, :fill=>@C['fg'])
 
     # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
     x1, y1, x2, y2 = [515, 207, 495, 207]
-    TkcOval.new(@canvas, box(x1, y1, 6), 
+    TkcOval.new(@canvas, box(x1, y1, 6),
                 :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcOval.new(@canvas, box(x2, y2, 6), 
+    TkcOval.new(@canvas, box(x2, y2, 6),
                 :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6, 
+    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
                      :tag=>'I3_', :fill=>color2, :outline=>color2)
-    
-    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15), 
+
+    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
                    :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
 
-    TkcLine.new(@canvas, [500, 217, 511, 217], 
+    TkcLine.new(@canvas, [500, 217, 511, 217],
                 :tag=>'I3_', :fill=>color2, :width=>10)
 
     # Bottom weight target
-    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465], 
+    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
                 :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
   end
 
@@ -648,7 +655,7 @@ class TkGoldberg_Demo
     }
 
     # Swing gate
-    TkcLine.new(@canvas, [518, 464, 518, 428], 
+    TkcLine.new(@canvas, [518, 464, 518, 428],
                 :tag=>'I4', :fill=>color, :width=>1)
   end
 
@@ -675,7 +682,7 @@ class TkGoldberg_Demo
     TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
 
     xy = [
-      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446, 
+      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
       575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
     ]
     TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
@@ -685,7 +692,7 @@ class TkGoldberg_Demo
 
     xy = box(540, 446, 2)   # Eye
     xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'], 
+    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
                    :outline=>'', :smooth=>true)
 
     xy = [538, 454, 535, 461] # Front leg
@@ -705,9 +712,9 @@ class TkGoldberg_Demo
     step = get_step(5, step)
 
     pos = [
-      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452], 
-      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414], 
-      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294], 
+      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
+      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
+      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
       [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
     ]
 
@@ -728,16 +735,16 @@ class TkGoldberg_Demo
     color = @C['6']
     xy = [324, 130, 391, 204] # Ball holder
     xy = round_rect(xy, 10)
-    TkcPolygon.new(@canvas, xy, :smooth=>true, 
+    TkcPolygon.new(@canvas, xy, :smooth=>true,
                    :outline=>@C['fg'], :width=>3, :fill=>color)
     xy = [339, 204, 376, 253] # Below the ball holder
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
                      :fill=>color, :tag=>'I6c')
     xy = box(346, 339, 28)
     TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
                :start=>80, :extent=>205)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
                :start=>-41, :extent=>85)
 
     xy = box(346, 339, 15) # Center of rotor
@@ -752,10 +759,10 @@ class TkGoldberg_Demo
     TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
 
     xy = [
-      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403, 
+      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
       352, 403, 352, 366
     ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', 
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
                    :width=>2) # Below rotor
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
     xy = box(275, 342, 7) # On/off rotor
@@ -780,7 +787,7 @@ class TkGoldberg_Demo
       loc = -i
       color = colors[i]
       x, y = @XY6["#{loc}"]
-      TkcOval.new(@canvas, box(x, y, 5), 
+      TkcOval.new(@canvas, box(x, y, 5),
                   :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
     }
     draw6a(12) # The wheel
@@ -806,7 +813,7 @@ class TkGoldberg_Demo
       @canvas.move('I6_', -7, 0)
       if step == 1  # Poke a hole
         xy = [348, 226, 365, 240]
-        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill), 
+        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
                          :outline=>'')
       end
       return 1
@@ -846,24 +853,24 @@ class TkGoldberg_Demo
   def draw7
     color = @C['7']
     xy = [198, 306, 277, 374]  # Box
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2, 
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
                      :fill=>color, :tag=>'I7z')
     @canvas.lower('I7z')
     xy = [275, 343, 230, 349]
-    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last, 
+    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
                 :arrowshape=>[23, 23, 8], :width=>6)
     xy = [225, 324]  # On button
     x, y = xy
     TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
     xy = [218, 323]  # On text
     font = ['Times Roman', 8]
-    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e, 
+    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
                 :fill=>@C['fg'], :font=>font)
     xy = [225, 350]  # Off button
     x, y = xy
     TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
     xy = [218, 349]  # Off text
-    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e, 
+    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
                 :fill=>@C['fg'], :font=>font)
   end
 
@@ -908,7 +915,7 @@ class TkGoldberg_Demo
     xy = [280, 209, 296, 248]
     TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
     xy = [
-      288, 249, 252, 249, 260, 240, 280, 234, 
+      288, 249, 252, 249, 260, 240, 280, 234,
       296, 234, 316, 240, 324, 249, 288, 249
     ]
     TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
@@ -917,16 +924,16 @@ class TkGoldberg_Demo
     TkcPolygon.new(@canvas, xy, :fill=>color)
 
     xy = [255, 206, 265, 234]  # Fan blades
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>3, :tag=>'I9_0')
     xy = [255, 176, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>3, :tag=>'I9_0')
     xy = [255, 206, 265, 220]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>1, :tag=>'I9_1')
     xy = [255, 190, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>1, :tag=>'I9_1')
   end
 
@@ -951,17 +958,17 @@ class TkGoldberg_Demo
     color  = @C['10a']
     color2 = @C['10b']
     xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
-    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'], 
+    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
                    :tag=>'I10')
     xy = box(209, 204, 31)  # Front
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
                :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>120, :extent=>120, :tag=>'I10')
     xy = box(249, 204, 31)  # Back
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
                :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>120, :extent=>120, :tag=>'I10')
 
     xy = [200, 171, 200, 249]  # Mast
@@ -981,10 +988,10 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
 
     xy = box(239, 262, 17)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>95, :extent=>103)
     xy = box(76, 266, 21)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :extent=>190)
   end
 
@@ -992,9 +999,9 @@ class TkGoldberg_Demo
     step = get_step(10, step)
 
     pos = [
-      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212], 
-      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212], 
-      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212], 
+      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
+      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
+      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
       [116, 212], [111, 212]
     ]
 
@@ -1021,21 +1028,21 @@ class TkGoldberg_Demo
     xy = [55, 504, 55, 591]  # Bottom right side
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
     xy = box(71, 460, 48)    # Outer loop
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>110, :extent=>-290, :tag=>'I11i')
     xy = box(71, 460, 16)    # Inner loop
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'', 
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
                 :width=>3, :tag=>'I11i')
     TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
 
     xy = [23, 264, 23, 591]  # Left side
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
     xy = box(1, 266, 23)     # Top left curve
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
                :style=>:arc, :extent=>90)
 
     xy = box(75, 235, 9)     # The ball
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'', 
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
                 :width=>3, :tag=>'I11')
   end
 
@@ -1043,8 +1050,8 @@ class TkGoldberg_Demo
     step = get_step(11, step)
 
     pos = [
-      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266], 
-      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472], 
+      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
+      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
       [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
     ]
 
@@ -1058,11 +1065,11 @@ class TkGoldberg_Demo
   # Hand
   def draw12
     xy = [
-      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590, 
+      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
       60, 590, 60, 610, 60, 610
     ]
     xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
-    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669, 
+    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
                 56, 669, 50, 669, 50, 662, 50, 637])
 
     y0 = 637  # Bumps for fingers
@@ -1072,7 +1079,7 @@ class TkGoldberg_Demo
       x2 = x - 10
       xy << x << y0 << x1 << y1 << x2 << y0
     }
-    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'], 
+    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
                    :smooth=>true, :tag=>'I12', :width=>3)
   end
 
@@ -1096,25 +1103,25 @@ class TkGoldberg_Demo
     ]
     radii = [2, 9, 9, 8, 5, 5, 2]
 
-    round_poly(@canvas, xy, radii, :width=>3, 
+    round_poly(@canvas, xy, radii, :width=>3,
                :outline=>@C['fg'], :fill=>color)
-    round_poly(@canvas, xy2, radii, :width=>3, 
+    round_poly(@canvas, xy2, radii, :width=>3,
                :outline=>@C['fg'], :fill=>color)
 
     xy = [56, 677]
     x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
                      :width=>3, :tag=>'I13')
     xy = [809, 677]
     x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
                      :width=>3, :tag=>'I13R')
 
     xy = [112, 687]  # Label
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
                 :font=>['Times Roman', 12, :bold])
     xy = [762, 687]
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
                 :font=>['Times Roman', 12, :bold])
 
     xy = [138, 663, 148, 636, 178, 636]  # Paper guide
@@ -1122,7 +1129,7 @@ class TkGoldberg_Demo
     xy = [732, 663, 722, 636, 692, 636]
     TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
 
-    sine([149, 688, 720, 688], 5, 15, 
+    sine([149, 688, 720, 688], 5, 15,
          :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
   end
 
@@ -1152,17 +1159,17 @@ class TkGoldberg_Demo
   def draw14
     color = @C['14']
     xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14L_0')
     xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14L_1')
     draw14a('L')
 
     xy = [
       768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
     ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14R_0')
     @canvas.lower('I14R_0')
     # NB. these numbers are VERY sensitive, you must start with final size
@@ -1170,7 +1177,7 @@ class TkGoldberg_Demo
     xy = [
       745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
     ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14R_1')
     @canvas.lower('I14R_1')
   end
@@ -1183,11 +1190,11 @@ class TkGoldberg_Demo
     x3, y3, x4, y4, x5, y5 = xy2
 
     zz = [
-      x0, y0, x0, y0, xy, x2, y2, x2, y2, 
+      x0, y0, x0, y0, xy, x2, y2, x2, y2,
       x3, y3, x3, y3, xy2, x5, y5, x5, y5
     ].flatten
     @canvas.delete("I14#{side}")
-    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true, 
+    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
                    :fill=>color, :outline=>color, :width=>3)
     @canvas.lower("I14#{side}")
   end
@@ -1240,7 +1247,7 @@ class TkGoldberg_Demo
     xy = [765, 557, 784, 583]
     TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
 
-    sine([658, 580, 765, 580], 3, 15, 
+    sine([658, 580, 765, 580], 3, 15,
          :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
   end
 
@@ -1279,7 +1286,7 @@ class TkGoldberg_Demo
     xy = [722, 485, 791, 556]
     TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
     xy = box(752, 515, 25)  # Bell
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black', 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
                 :tag=>'I16b', :width=>2)
     xy = box(752, 515, 5)   # Bell button
     TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
@@ -1318,24 +1325,24 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
 
     xy = [664, 523, 717, 549]  # Body
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
                :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
 
     xy = [709, 554, 690, 543]  # Paw
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
                 :width=>3, :tag=>'I17')
     xy = [657, 544, 676, 555]
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
                 :width=>3, :tag=>'I17')
 
     xy = box(660, 535, 15)     # Lower face
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>150, :extent=>240, :tag=>'I17_')
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
     xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1, 
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
                    :tag=>['I17_', 'I17_c'])
     xy = [652, 542, 628, 539]  # Whiskers
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
@@ -1345,23 +1352,23 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
 
     xy = [668, 543, 687, 538]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                 :tag=>['I17_', 'I17_w'])
     xy = [668, 544, 688, 546]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                 :tag=>['I17_', 'I17_w'])
     xy = [668, 547, 688, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                 :tag=>['I17_', 'I17_w'])
 
     xy = [649, 530, 654, 538, 659, 530]  # Left eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
                 :smooth=>true, :tag=>'I17')
     xy = [671, 530, 666, 538, 661, 530]  # Right eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
                 :smooth=>true, :tag=>'I17')
     xy = [655, 543, 660, 551, 665, 543]  # Mouth
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
                 :smooth=>true, :tag=>'I17')
   end
 
@@ -1374,10 +1381,10 @@ class TkGoldberg_Demo
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                   :smooth=>true, :tag=>'I17_')
       xy = box(654, 530, 4)  # Left eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
                   :tag=>'I17_')
       xy = box(666, 530, 4)  # Right eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
                   :tag=>'I17_')
 
       @canvas.move('I17_', 0, -20) # Move face up
@@ -1387,19 +1394,19 @@ class TkGoldberg_Demo
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
 
       xy = [ # Body
-        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525, 
-        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527, 
+        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
+        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
         668, 527, 668, 527, 675, 522, 676, 517, 677, 512
       ]
-      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill), 
-                     :outline=>@C['fg'], :width=>3, :smooth=>true, 
+      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
+                     :outline=>@C['fg'], :width=>3, :smooth=>true,
                      :tag=>'I17_')
       xy = [716, 514, 716, 554]  # Back leg
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
       xy = [694, 532, 694, 554]  # 2nd back leg
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
       xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                   :smooth=>true, :tag=>'I17_')
 
       @canvas.raise('I17w')       # Make whiskers visible
@@ -1428,14 +1435,14 @@ class TkGoldberg_Demo
     step = get_step(18, step)
 
     pos = [
-      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x], 
+      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
       [136, 506], [16, 506], [-100, -100]
     ]
 
     b = []
     b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
     b[1] = [
-      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525, 
+      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
       553, 536, 538, 534, 532, 519, 529, 499
     ]
     b[2] = [
@@ -1466,54 +1473,54 @@ class TkGoldberg_Demo
     color = @C['19']
     xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
     xx.each{|x1, x2|
-      TkcRectangle.new(@canvas, x1, 453, x2, 467, 
+      TkcRectangle.new(@canvas, x1, 453, x2, 467,
                        :fill=>color, :outline=>'', :tag=>'I19')
-      TkcLine.new(@canvas, x1, 453, x2, 453, 
+      TkcLine.new(@canvas, x1, 453, x2, 453,
                   :fill=>@C['fg'], :width=>1) # Pipe top
-      TkcLine.new(@canvas, x1, 467, x2, 467, 
+      TkcLine.new(@canvas, x1, 467, x2, 467,
                   :fill=>@C['fg'], :width=>1) # Pipe bottom
     }
     @canvas.raise('I11i')
 
     xy = box(168, 460, 16)  # Bulge by the joint
     TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
                :start=>21, :extent=>136)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
                :start=>-21, :extent=>-130)
 
     xy = [249, 447, 255, 473]  # First joint 26x6
     TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
 
     xy = box(257, 433, 34)     # Bend up
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:pie, :start=>0, :extent=>-91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>-90)
     xy = box(257, 433, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
                :style=>:pie, :start=>0, :extent=>-92)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>-90)
     xy = box(257, 421, 34)     # Bend left
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:pie, :start=>0, :extent=>91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>90)
     xy = box(257, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
                :style=>:pie, :start=>0, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>90)
     xy = box(243, 421, 34)     # Bend down
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>90, :extent=>90)
     xy = box(243, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
                :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>90, :extent=>90)
 
     xy = [270, 427, 296, 433]  # 2nd joint bottom
@@ -1555,7 +1562,7 @@ class TkGoldberg_Demo
     pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
     freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
     pos = [
-      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40], 
+      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
       [504, 40], [513, 40], [523, 40], [532, 40, :x]
     ]
     return 0 if step >= pos.length
@@ -1572,11 +1579,11 @@ class TkGoldberg_Demo
     color = @C['20']
     @canvas.delete('I20')
 
-    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'], 
+    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
          :width=>3, :fill=>color, :smooth=>true)
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
                 :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
                 :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
     @canvas.move('I20a', 8, 0)
     @canvas.move('I20b', 16, 0)
@@ -1592,18 +1599,18 @@ class TkGoldberg_Demo
 
     xy = [245, 490, 237, 535]  # Right side
     xy2 = [189, 535, 181, 490] # Left side
-    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'', 
+    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
                    :tag=>['I21', 'I21f'])
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
     TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
 
     xy = [182, 486, 244, 498]  # Top
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2, 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
                 :tag=>['I21', 'I21f'])
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2, 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
                 :tag=>['I21', 'I21t'])
     xy = [189, 532, 237, 540]  # Bottom
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2, 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
                 :tag=>['I21', 'I21b'])
   end
 
@@ -1626,7 +1633,7 @@ class TkGoldberg_Demo
 
     @canvas.itemconfigure('I21b', :fill=>@C['20'])
     @canvas.delete('I21w')
-    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1, 
+    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
                    :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
     @canvas.lower('I21w', 'I21')
     @canvas.raise('I21b')
@@ -1662,21 +1669,21 @@ class TkGoldberg_Demo
     color3 = @C['23c']
 
     xy = [185, 623, 253, 650]  # Block
-    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'], 
+    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
                      :width=>2, :tag=>'I23a')
     xy = [187, 592, 241, 623]  # Balloon
     TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b', 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
                :style=>:arc, :start=>12, :extent=>336)
     xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
     TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
 
     xy = [285, 611, 250, 603]  # Dart body
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
                 :width=>3, :tag=>'I23d')
     xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
-    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'], 
+    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
                    :width=>3, :tag=>'I23d')
     xy = [249, 607, 268, 607]  # Dart detail
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
@@ -1688,7 +1695,7 @@ class TkGoldberg_Demo
     step = get_step(23, step)
 
     pos = [
-      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607], 
+      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
       [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
     ]
 
@@ -1708,7 +1715,7 @@ class TkGoldberg_Demo
   def draw24
     color = @C['24a']
     xy = [366, 518, 462, 665]  # Balloon
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
                 :width=>3, :tag=>'I24')
     xy = [414, 666, 414, 729]  # String
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
@@ -1717,16 +1724,16 @@ class TkGoldberg_Demo
                    :width=>3, :tag=>'I24')
 
     xy = [387, 567, 390, 549, 404, 542]  # Reflections
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
     xy = [395, 568, 399, 554, 413, 547]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
     xy = [403, 570, 396, 555, 381, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
     xy = [408, 564, 402, 547, 386, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
   end
 
@@ -1739,16 +1746,16 @@ class TkGoldberg_Demo
     if step == 0
       @canvas.delete('I24')  # Exploding balloon
       xy = [
-        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594, 
-        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738, 
-        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613, 
-        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508, 
+        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
+        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
+        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
+        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
         431, 441, 431, 440, 400, 502, 347, 465, 347, 465
       ]
-      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'], 
+      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
                      :outline=>@C['24a'], :width=>10, :smooth=>true)
       msg = Tk.subst(@S['message'].value)
-      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'], 
+      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
                   :justify=>:center, :font=>['Times Roman', 18, :bold])
       return 1
     end
@@ -1779,8 +1786,8 @@ class TkGoldberg_Demo
 
     if step >= 3
       @canvas.delete('I24', 'I26')
-      TkcText.new(@canvas, 430, 740, :anchor=>:s, :tag=>'I26', 
-                  :text=>'click to continue', 
+      TkcText.new(@canvas, 430, 740, :anchor=>:s, :tag=>'I26',
+                  :text=>'click to continue',
                   :font=>['Times Roman', 24, :bold])
       @canvas.bind('1', proc{reset})
       return 4
@@ -1960,11 +1967,11 @@ class TkGoldberg_Demo
 
   def sparkle(oxy, tag)
     xy = [
-      [299, 283], [298, 302], [295, 314], [271, 331], 
+      [299, 283], [298, 302], [295, 314], [271, 331],
       [239, 310], [242, 292], [256, 274], [281, 273]
     ]
     xy.each{|x, y|
-      TkcLine.new(@canvas, 271, 304, x, y, 
+      TkcLine.new(@canvas, 271, 304, x, y,
                   :fill=>'white', :width=>3, :tag=>tag)
     }
     move_abs(tag, oxy)
@@ -1996,4 +2003,4 @@ class TkGoldberg_Demo
   end
 end
 
-TkGoldberg_Demo.new($goldberg_demo)
+TkGoldberg_Demo.new(base_frame)
diff --git a/ext/tk/sample/demos-en/hello b/ext/tk/sample/demos-en/hello
index f06eabe518..5e86ad7e3e 100644
--- a/ext/tk/sample/demos-en/hello
+++ b/ext/tk/sample/demos-en/hello
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 require 'tk'
 
-unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
-  require 'tkencoding'
-end
+#unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
+#  require 'tkencoding'
+#end
 
 TkButton.new(nil,
 	'text'=>"Hello Ruby world!",
diff --git a/ext/tk/sample/demos-en/hscale.rb b/ext/tk/sample/demos-en/hscale.rb
index 14e395b61a..e660216967 100644
--- a/ext/tk/sample/demos-en/hscale.rb
+++ b/ext/tk/sample/demos-en/hscale.rb
@@ -11,8 +11,9 @@ $hscale_demo = TkToplevel.new {|w|
 }
 positionWindow($hscale_demo)
 
+base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
 
-msg = TkLabel.new($hscale_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -20,7 +21,7 @@ msg = TkLabel.new($hscale_demo) {
 }
 msg.pack('side'=>'top')
 
-TkFrame.new($hscale_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc {
@@ -36,7 +37,18 @@ TkFrame.new($hscale_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-TkFrame.new($hscale_demo) {|frame|
+
+def setWidth(w, width)
+  width = width + 21
+  x2 = width - 30
+  if x2 < 21
+    x2 = 21
+  end
+  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+end
+
+TkFrame.new(base_frame) {|frame|
   canvas = TkCanvas.new(frame) {|c|
     width 50
     height 50
@@ -61,14 +73,3 @@ TkFrame.new($hscale_demo) {|frame|
   }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
   scale.set 75
 }.pack('side'=>'top', 'fill'=>'x')
-
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
diff --git a/ext/tk/sample/demos-en/icon.rb b/ext/tk/sample/demos-en/icon.rb
index 58aca2df07..bab40da214 100644
--- a/ext/tk/sample/demos-en/icon.rb
+++ b/ext/tk/sample/demos-en/icon.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy 
+  $icon_demo.destroy
   $icon_demo = nil
 end
 
@@ -19,8 +19,10 @@ $icon_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($icon_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -29,7 +31,7 @@ msg = TkLabel.new($icon_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($icon_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -46,7 +48,7 @@ TkFrame.new($icon_demo) {|frame|
 
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# image 
+# image
 flagup = \
 TkBitmapImage.new('file'=>[$demo_dir,'..',
                            'images','flagup.xbm'].join(File::Separator),
@@ -63,16 +65,18 @@ TkBitmapImage.new('file'=>[$demo_dir,'..',
 letters = TkVariable.new
 
 # frame
-TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
+TkFrame.new(base_frame, 'borderwidth'=>10){|w|
   TkFrame.new(w) {|f|
-    TkRadioButton.new(f){
+    # TkRadioButton.new(f){
+    Tk::RadioButton.new(f){
       bitmap '@' + [$demo_dir,'..',
                     'images','letters.xbm'].join(File::Separator)
       variable letters
       value 'full'
     }.pack('side'=>'top', 'expand'=>'yes')
 
-    TkRadioButton.new(f){
+    # TkRadioButton.new(f){
+    Tk::RadioButton.new(f){
       bitmap '@' + [$demo_dir,'..',
                      'images','noletter.xbm'].join(File::Separator)
       variable letters
@@ -81,14 +85,16 @@ TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
 
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
 
-  TkCheckButton.new(w) {
+  # TkCheckButton.new(w) {
+  Tk::CheckButton.new(w) {
     image flagdown
     selectimage flagup
     indicatoron 0
     selectcolor self['background']
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
 
-  TkCheckButton.new(w) {
+  # TkCheckButton.new(w) {
+  Tk::CheckButton.new(w) {
     bitmap '@' + [$demo_dir,'..',
                    'images','letters.xbm'].join(File::Separator)
     indicatoron 0
diff --git a/ext/tk/sample/demos-en/image1.rb b/ext/tk/sample/demos-en/image1.rb
index 05c9705c9c..233cb963d1 100644
--- a/ext/tk/sample/demos-en/image1.rb
+++ b/ext/tk/sample/demos-en/image1.rb
@@ -7,7 +7,7 @@
 
 # toplevel widget
 if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy 
+  $image1_demo.destroy
   $image1_demo = nil
 end
 
@@ -18,8 +18,10 @@ $image1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($image1_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,7 +30,7 @@ msg = TkLabel.new($image1_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($image1_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -54,7 +56,10 @@ TkPhotoImage.new('file'=>[$demo_dir,'..',
                           'images','earthris.gif'].join(File::Separator))
 
 # label
-[ TkLabel.new($image1_demo, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  TkLabel.new($image1_demo, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
+#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
+[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
+  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
 ].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
 
diff --git a/ext/tk/sample/demos-en/image2.rb b/ext/tk/sample/demos-en/image2.rb
index 1aff7173be..13098af1b6 100644
--- a/ext/tk/sample/demos-en/image2.rb
+++ b/ext/tk/sample/demos-en/image2.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy 
+  $image2_demo.destroy
   $image2_demo = nil
 end
 
@@ -19,8 +19,10 @@ $image2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($image2_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -29,7 +31,7 @@ msg = TkLabel.new($image2_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($image2_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -53,21 +55,21 @@ $dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
 $image2a = TkPhotoImage.new
 
 #
-TkLabel.new($image2_demo, 'text'=>'Directory:')\
+TkLabel.new(base_frame, 'text'=>'Directory:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-image2_e = TkEntry.new($image2_demo) {
+image2_e = TkEntry.new(base_frame) {
   width 30
   textvariable $dirName
 }.pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
+TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkLabel.new($image2_demo, 'text'=>'File:')\
+TkLabel.new(base_frame, 'text'=>'File:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new($image2_demo){|w|
+TkFrame.new(base_frame){|w|
   s = TkScrollbar.new(w)
   l = TkListbox.new(w) {
     width 20
@@ -85,13 +87,13 @@ TkFrame.new($image2_demo){|w|
 
 }.pack('side'=>'top', 'anchor'=>'w')
 
-# image 
-[ TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20),
-  TkLabel.new($image2_demo, 'text'=>'Image:'),
-  TkLabel.new($image2_demo, 'image'=>$image2a)
+# image
+[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
+  TkLabel.new(base_frame, 'text'=>'Image:'),
+  TkLabel.new(base_frame, 'image'=>$image2a)
 ].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
 
-# 
+#
 def loadDir(w)
   w.delete(0,'end')
   Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
diff --git a/ext/tk/sample/demos-en/image3.rb b/ext/tk/sample/demos-en/image3.rb
index e46d3796f2..edb6d231bf 100644
--- a/ext/tk/sample/demos-en/image3.rb
+++ b/ext/tk/sample/demos-en/image3.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy 
+  $image3_demo.destroy
   $image3_demo = nil
 end
 
@@ -19,27 +19,29 @@ $image3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# 
-def loadDir(w)
+base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+
+#
+def loadDir3(w)
   w.delete(0,'end')
   Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
     w.insert('end',File.basename(f))
   }
 end
 
-# selectAndLoadDir --
+# selectAndLoadDir3 --
 # This procedure pops up a dialog to ask for a directory to load into
 # the listobx and (if the user presses OK) reloads the directory
 # listbox from the directory named in the demo's entry.
 #
 # Arguments:
 # w -                   Name of the toplevel window of the demo.
-def selectAndLoadDir(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value, 
+def selectAndLoadDir3(w, lbox)
+  dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
                            :parent=>w, :mustexist=>true)
   if dir.length > 0
-    $dirName.value = dir 
-    loadDir(lbox)
+    $dirName.value = dir
+    loadDir3(lbox)
   end
 end
 
@@ -49,7 +51,7 @@ end
 
 
 # label
-msg = TkLabel.new($image3_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -58,7 +60,7 @@ msg = TkLabel.new($image3_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($image3_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -86,15 +88,15 @@ end
 $image3a = TkPhotoImage.new
 
 #
-image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
 
-image3_df = TkLabelFrame.new($image3_demo, :text=>'Directory:')
+image3_df = TkLabelFrame.new(base_frame, :text=>'Directory:')
 
-image3_ff = TkLabelFrame.new($image3_demo, :text=>'File:', 
+image3_ff = TkLabelFrame.new(base_frame, :text=>'File:',
                              :padx=>'2m', :pady=>'2m')
 image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
   pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
+  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
                                              :expand=>true))
   insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
   bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
@@ -102,21 +104,22 @@ image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
 
 image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
   pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
-  bind('Return', proc{loadDir(image3_lbx)})
+  bind('Return', proc{loadDir3(image3_lbx)})
 }
 
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.", 
-             :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.",
+             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
   pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
 }
 
-image3_if = TkLabelFrame.new($image3_demo, :text=>'Image:') {|f|
-  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+image3_if = TkLabelFrame.new(base_frame, :text=>'Image:') {|f|
+  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
 }
 
 Tk.grid(image3_df,  '-',
         :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if, 
+Tk.grid(image3_ff, image3_if,
         :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
 TkGrid.columnconfigure(image3_f, 1, :weight=>1)
 
diff --git a/ext/tk/sample/demos-en/items.rb b/ext/tk/sample/demos-en/items.rb
index 8ab7668a07..01a4072cb7 100644
--- a/ext/tk/sample/demos-en/items.rb
+++ b/ext/tk/sample/demos-en/items.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($items_demo) && $items_demo
-  $items_demo.destroy 
+  $items_demo.destroy
   $items_demo = nil
 end
 
@@ -19,8 +19,10 @@ $items_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($items_demo) {
+TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -28,7 +30,7 @@ TkLabel.new($items_demo) {
 }.pack('side'=>'top')
 
 # frame
-TkFrame.new($items_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -46,8 +48,8 @@ TkFrame.new($items_demo) {|frame|
 
 # frame
 cvs = nil
-TkFrame.new($items_demo) {|cf|
-  # canvas 
+TkFrame.new(base_frame) {|cf|
+  # canvas
   cvs = TkCanvas.new(cf) {|c|
     focus
     scrollregion '0c 0c 30c 24c'
@@ -73,11 +75,11 @@ TkFrame.new($items_demo) {|cf|
       c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
 
     else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
+      c.grid('in'=>cf, 'row'=>0, 'column'=>0,
              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1, 
+      vs.grid('row'=>0, 'column'=>1,
               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0, 
+      hs.grid('row'=>1, 'column'=>0,
               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
       TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
@@ -94,8 +96,13 @@ TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
 TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
 TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
 
-font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+if $tk_version =~ /^4.*/
+  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+else
+  font1 = 'Helvetica 12'
+  font2 = 'Helvetica 24 bold'
+end
 if TkWinfo.depth($root).to_i > 1
   blue   = 'DeepSkyBlue3'
   red    = 'red'
@@ -108,13 +115,13 @@ else
   green  = 'black'
 end
 
-# tag 
+# tag
 $tag_item = TkcGroup.new(cvs)
 
 # Set up demos within each of the areas of the grid.
 TkcText.new(cvs, '5c', '.2c', 'text'=>'Lines', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c', 
-            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt', 
+TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
+            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
             'join'=>'miter', 'tags'=>$tag_item )
 TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
 TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
@@ -122,38 +129,38 @@ TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
             '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
             '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
             'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c', 
+TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
             'stipple'=>'@'+[$demo_dir,'..',
-                            'images','gray25.xbm'].join(File::Separator), 
+                            'images','gray25.xbm'].join(File::Separator),
             'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
 TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
+            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
             'tags'=>$tag_item )
 
-TkcText.new(cvs, '15c', '.2c', 
+TkcText.new(cvs, '15c', '.2c',
             'text'=>'Curves (smoothed lines)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c', 
+TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
             'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c', 
+TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
             'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c', 
+TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
             '16.5c','4.5c','13.5c','7.5c','12c','6c',
-            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round', 
+            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
             'stipple'=>'@'+[$demo_dir, '..',
-                            'images', 'gray25.xbm'].join(File::Separator), 
+                            'images', 'gray25.xbm'].join(File::Separator),
             'fill'=>red, 'tags'=>$tag_item )
 
 TkcText.new(cvs, '25c', '.2c', 'text'=>'Polygons', 'anchor'=>'n')
 TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
                '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-               'fill'=>'green', 'outline'=>'black', 'width'=>4, 
+               'fill'=>'green', 'outline'=>'black', 'width'=>4,
                'tags'=>$tag_item )
 TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
                '28c','1c','29c','1c','29c','4c','29c','4c',
                'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
 TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
                '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-               '7.5c','22c','7.5c', 
+               '7.5c','22c','7.5c',
                'stipple'=>'@' + [$demo_dir, '..',
                                  'images', 'gray25.xbm'].join(File::Separator),
                'outline'=>'black', 'tags'=>$tag_item )
@@ -161,7 +168,7 @@ TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
 TkcText.new(cvs, '5c', '8.2c', 'text'=>'Rectangles', 'anchor'=>'n')
 TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
                  'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
+TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
                  'fill'=>green, 'tags'=>$tag_item )
 TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
                  'stipple'=>'@'+[$demo_dir,'..',
@@ -171,7 +178,7 @@ TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
 TkcText.new(cvs, '15c', '8.2c', 'text'=>'Ovals', 'anchor'=>'n')
 TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
                  'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
+TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
                  'fill'=>green, 'tags'=>$tag_item )
 TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
                  'stipple'=>'@'+[$demo_dir,'..',
@@ -180,40 +187,40 @@ TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
 
 TkcText.new(cvs, '25c', '8.2c', 'text'=>'Text', 'anchor'=>'n')
 TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c', 
+TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
             'text'=>'A short string of text, word-wrapped, justified left, and anchored north (at the top).  The rectangles show the anchor points for each piece of text.', 'tags'=>$tag_item )
 TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue, 
+TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
             'text'=>"Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge.", 'justify'=>'center', 'tags'=>$tag_item )
 TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
 if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
               'stipple'=>'@' + [$demo_dir, '..',
                                 'images', 'grey.5'].join(File::Separator),
               'text'=>'Stippled characters', 'tags'=>$tag_item )
 else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
-              'stipple'=>'gray50', 'text'=>'Stippled characters', 
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
+              'stipple'=>'gray50', 'text'=>'Stippled characters',
               'tags'=>$tag_item )
 end
 
 TkcText.new(cvs, '5c', '16.2c', 'text'=>'Arcs', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black', 
+TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
            'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-#          'outline'=>blue, 'start'=>135, 'extent'=>270, 
+#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+#          'outline'=>blue, 'start'=>135, 'extent'=>270,
 #          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
 #          'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-           'outline'=>blue, 'start'=>135, 'extent'=>270, 
+TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+           'outline'=>blue, 'start'=>135, 'extent'=>270,
            'outlinestipple'=>'@'+[$demo_dir, '..',
                                   'images','gray25.xbm'].join(File::Separator),
            'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice', 
-           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90, 
+TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
+           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
            'tags'=>$tag_item)
 TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270, 
+           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
            'tags'=>$tag_item)
 
 TkcText.new(cvs, '15c', '16.2c', 'text'=>'Bitmaps', 'anchor'=>'n')
@@ -234,7 +241,7 @@ TkcBitmap.new(cvs, '17c','18.5c',
 #TkcBitmap.new(cvs, '17c','21.5c',
 #             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
 #             'tags'=>$tag_item)
-# 
+#
 TkcBitmap.new(cvs, '17c','21.5c') {
   bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
   tags $tag_item
@@ -248,17 +255,17 @@ TkcText.new(cvs, '25c', '16.2c', 'text'=>'Windows', 'anchor'=>'n')
 TkButton.new(cvs) {|b|
   text 'Press Me'
   command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c', 
+  TkcWindow.new(cvs, '21c','18c',
                 'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
 }
 TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
   insert 'end', 'Edit this text'
-  TkcWindow.new(cvs, '21c','21c', 
+  TkcWindow.new(cvs, '21c','21c',
                 'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
 }
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
+TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
             'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c', 
+  TkcWindow.new(cvs, '28.5c','17.5c',
                 'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
 }
 TkcText.new(cvs, '21c', '17.9c', 'text'=>'Button:', 'anchor'=>'sw')
@@ -309,7 +316,7 @@ def itemLeave(c)
   $restoreCmd.call if $restoreCmd
 end
 
-# Utility methods for stroking out a rectangle and printing what's 
+# Utility methods for stroking out a rectangle and printing what's
 # underneath the rectangle's area.
 
 def itemMark(c,x,y)
@@ -323,7 +330,7 @@ def itemStroke(c,x,y)
   y = c.canvasy(y)
   if $areaX1 != x && $areaY1 != y
     c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
+    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
                                               '-outline', 'black')
     $areaX2 = x
     $areaY2 = y
@@ -364,11 +371,11 @@ def itemDrag(c,x,y)
   $lastY = y
 end
 
-# Method that's invoked when the button embedded in the canvas 
+# Method that's invoked when the button embedded in the canvas
 # is invoked.
 
 def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c', 
+  i = TkcText.new(w, '25c', '18.1c',
                   'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
   Tk.after(500, proc{w.delete i})
 end
diff --git a/ext/tk/sample/demos-en/knightstour.rb b/ext/tk/sample/demos-en/knightstour.rb
new file mode 100644
index 0000000000..6f96a5be10
--- /dev/null
+++ b/ext/tk/sample/demos-en/knightstour.rb
@@ -0,0 +1,271 @@
+# Based on the widget demo of Tcl/Tk8.5.2
+# The following is the original copyright text.
+#----------------------------------------------------------------------------
+# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+#	Calculate a Knight's tour of a chessboard.
+#
+#	This uses Warnsdorff's rule to calculate the next square each
+#	time. This specifies that the next square should be the one that
+#	has the least number of available moves.
+#
+#	Using this rule it is possible to get to a position where
+#	there are no squares available to move into. In this implementation
+#	this occurs when the starting square is d6.
+#
+#	To solve this fault an enhancement to the rule is that if we
+#	have a choice of squares with an equal score, we should choose
+#	the one nearest the edge of the board.
+#
+#	If the call to the Edgemost function is commented out you can see
+#	this occur.
+#
+#	You can drag the knight to a specific square to start if you wish.
+#	If you let it repeat then it will choose random start positions
+#	for each new tour.
+#----------------------------------------------------------------------------
+require 'tk'
+
+class Knights_Tour
+  # Return a list of accessible squares from a given square
+  def valid_moves(square)
+    moves = []
+    [
+      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
+    ].each{|col_delta, row_delta|
+      col = (square % 8) + col_delta
+      row = (square.div(8)) + row_delta
+      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
+    }
+    moves
+  end
+
+  # Return the number of available moves for this square
+  def check_square(square)
+    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
+  end
+
+  # Select the next square to move to. Returns -1 if there are no available
+  # squares remaining that we can move to.
+  def next_square(square)
+    minimum = 9
+    nxt = -1
+    valid_moves(square).each{|pos|
+      unless @visited.include?(pos)
+        cnt = check_square(pos)
+        if cnt < minimum
+          minimum = cnt
+          nxt = pos
+        elsif cnt == minimum
+          nxt = edgemost(nxt, pos)
+        end
+      end
+    }
+    nxt
+  end
+
+  # Select the square nearest the edge of the board
+  def edgemost(nxt, pos)
+    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
+    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
+    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
+    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
+    (col_A * row_A < col_B * row_B)? nxt : pos
+  end
+
+  # Display a square number as a standard chess square notation.
+  def _N(square)
+    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
+  end
+
+  # Perform a Knight's move and schedule the next move.
+  def move_piece(last, square)
+    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
+    @log.see(:end)
+    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
+    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
+    @knight.coords(@board.coords(1+square)[0..1])
+    @visited << square
+    if (nxt = next_square(square)) != -1
+      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
+    else
+      @start_btn.state :normal
+      if @visited.length == 64
+        if @initial == square
+          @log.insert :end, 'Closed tour!'
+        else
+          @log.insert :end, "Success\n", {}
+          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
+        end
+      else
+        @log.insert :end, "FAILED!\n", {}
+      end
+    end
+  end
+
+  # Begin a new tour of the board given a random start position
+  def tour(square = nil)
+    @visited.clear
+    @log.clear
+    @start_btn.state :disabled
+    1.upto(64){|n|
+      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
+    }
+    unless square
+      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
+    end
+    @initial = square
+    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
+  end
+
+  def _stop
+    Tk.after_cancel(@after_id) rescue nil
+  end
+
+  def _exit
+    _stop
+    $knightstour.destroy
+  end
+
+  def set_delay(new)
+    @delay.numeric = new.to_i
+  end
+
+  def drag_start(w, x, y)
+    w.dtag('selected')
+    w.addtag('selected', :withtag, 'current')
+    @dragging = [x, y]
+  end
+
+  def drag_motion(w, x, y)
+    return unless @dragging
+    w.move('selected', x - @dragging[0], y - @dragging[1])
+    @dragging = [x, y]
+  end
+
+  def drag_end(w, x, y)
+    square = w.find_closest(x, y, 0, 65)
+    w.coords('selected', w.coords(square)[0..1])
+    w.dtag('selected')
+    @dragging = nil
+  end
+
+  def make_SeeDismiss
+    ## See Code / Dismiss
+    frame = Ttk::Frame.new($knightstour)
+    sep = Ttk::Separator.new(frame)
+    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+    TkGrid('x',
+           Ttk::Button.new(frame, :text=>'See Code',
+                           :image=>$image['view'], :compound=>:left,
+                           :command=>proc{showCode 'knightstour'}),
+           Ttk::Button.new(frame, :text=>'Dismiss',
+                           :image=>$image['delete'], :compound=>:left,
+                           :command=>proc{
+                             $knightstour.destroy
+                             $knightstour = nil
+                           }),
+           :padx=>4, :pady=>4)
+    frame.grid_columnconfigure(0, :weight=>1)
+    frame
+  end
+
+  def create_gui(parent = nil)
+    $knightstour.destroy rescue nil
+    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
+    $knightstour.withdraw
+    base_f = Ttk::Frame.new($knightstour)
+    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
+    @log = Tk::Text.new(base_f, :width=>12, :height=>1,
+                        :font=>'Arial 8', :background=>'white')
+    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
+
+    @visited = []
+    @delay = TkVariable.new(600)
+    @continuous = TkVariable.new(false)
+
+    tool_f = Ttk::Frame.new($knightstour)
+    label = Ttk::Label.new(tool_f, :text=>'Speed')
+    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
+                           :command=>proc{|n| set_delay(n)})
+    check = Ttk::Checkbutton.new(tool_f, :text=>'Repeat',
+                                 :variable=>@continuous)
+    @start_btn = Ttk::Button.new(tool_f, :text=>'Start',
+                                 :command=>proc{tour()})
+    @exit_btn = Ttk::Button.new(tool_f, :text=>'Exit',
+                                :command=>proc{_exit()})
+
+    7.downto(0){|row|
+      0.upto(7){|col|
+        if ((col & 1) ^ (row & 1)).zero?
+          fill  = 'bisque'
+          dfill = 'bisque3'
+        else
+          fill  = 'tan3'
+          dfill = 'tan4'
+        end
+        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
+        @board.create(TkcRectangle, coords,
+                      :fill=>fill, :disabledfill=>dfill,
+                      :width=>2, :state=>:disabled)
+      }
+    }
+
+    @knight_font = TkFont.new(:size=>-24)
+    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
+                          :text=>Tk::UTF8_String.new('\u265e'),
+                          :anchor=>'nw', # :tags=>'knight',
+                          :fill=>'black', :activefill=>'#600000')
+    @knight.coords(@board.coords(rand(64)+1)[0..1])
+    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
+    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
+    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
+
+    Tk.grid(@board, @log, scr, :sticky=>'news')
+    base_f.grid_rowconfigure(0, :weight=>1)
+    base_f.grid_columnconfigure(0, :weight=>1)
+
+    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
+    widgets = [label, scale, check, @start_btn]
+    sg = nil
+    unless $RubyTk_WidgetDemo
+      widgets << @exit_btn
+      if Tk.windowingsystem != 'aqua'
+        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
+        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
+      end
+    end
+    Tk.pack(widgets, :side=>:right)
+    if Tk.windowingsystem == 'aqua'
+      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
+      TkPack.configure(widgets[0], :padx=>[4, 24])
+      TkPack.configure(widgets[-1], :padx=>[16, 4])
+    end
+
+    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
+
+    if $RubyTk_WidgetDemo
+      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
+    end
+
+    $knightstour.grid_rowconfigure(0, :weight=>1)
+    $knightstour.grid_columnconfigure(0, :weight=>1)
+
+    $knightstour.bind('Control-F2'){TkConsole.show}
+    $knightstour.bind('Return'){@start_btn.invoke}
+    $knightstour.bind('Escape'){@exit_btn.invoke}
+    $knightstour.bind('Destroy'){ _stop }
+    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
+
+    $knightstour.deiconify
+    $knightstour.tkwait_destroy
+  end
+
+  def initialize(parent = nil)
+    create_gui(parent)
+  end
+end
+
+Tk.root.withdraw unless $RubyTk_WidgetDemo
+Thread.new{Tk.mainloop} if __FILE__ == $0
+Knights_Tour.new
diff --git a/ext/tk/sample/demos-en/label.rb b/ext/tk/sample/demos-en/label.rb
index 55e07a5ebc..5be06eafee 100644
--- a/ext/tk/sample/demos-en/label.rb
+++ b/ext/tk/sample/demos-en/label.rb
@@ -8,19 +8,21 @@
 
 # toplevel widget
 if defined?($label_demo) && $label_demo
-  $label_demo.destroy 
+  $label_demo.destroy
   $label_demo = nil
 end
 
-# demo toplevel widget 
+# demo toplevel widget
 $label_demo = TkToplevel.new {|w|
   title("Label Demonstration")
   iconname("label")
   positionWindow(w)
 }
 
-# label 
-msg = TkLabel.new($label_demo) {
+base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,8 +30,8 @@ msg = TkLabel.new($label_demo) {
 }
 msg.pack('side'=>'top')
 
-# frame 
-TkFrame.new($label_demo) {|frame|
+# frame
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -46,20 +48,21 @@ TkFrame.new($label_demo) {|frame|
 
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# label demo 
-f_left = TkFrame.new($label_demo)
-f_right = TkFrame.new($label_demo)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes', 
+# label demo
+f_left = TkFrame.new(base_frame)
+f_right = TkFrame.new(base_frame)
+[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
                                   'padx'=>10, 'pady'=>10, 'fill'=>'both')}
 
-# label 
+# label
 [ TkLabel.new(f_left, 'text'=>'First label'),
-  TkLabel.new(f_left, 'text'=>'Second label, raised', 
+  TkLabel.new(f_left, 'text'=>'Second label, raised',
               'relief'=>'raised'),
   TkLabel.new(f_left, 'text'=>'Third label, sunken', 'relief'=>'sunken')
 ].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
 
-TkLabel.new(f_right) {
+# TkLabel.new(f_right) {
+Tk::Label.new(f_right) {
   bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
   borderwidth 2
   relief 'sunken'
diff --git a/ext/tk/sample/demos-en/labelframe.rb b/ext/tk/sample/demos-en/labelframe.rb
index 842a4f6c04..ad968bc061 100644
--- a/ext/tk/sample/demos-en/labelframe.rb
+++ b/ext/tk/sample/demos-en/labelframe.rb
@@ -7,7 +7,7 @@
 
 
 if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy 
+  $labelframe_demo.destroy
   $labelframe_demo = nil
 end
 
@@ -17,9 +17,11 @@ $labelframe_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
+
 # Some information
-TkLabel.new($labelframe_demo, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 Labelframes are used to group related widgets together. \
 The label may be either plain text or another widget. \
@@ -29,7 +31,7 @@ which supports a 'labelframe' widget.
 EOL
 
 # The bottom buttons
-TkFrame.new($labelframe_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
@@ -43,17 +45,17 @@ TkFrame.new($labelframe_demo){|f|
 }
 
 # Demo area
-w = TkFrame.new($labelframe_demo).pack(:side=>:bottom, :fill=>:both, 
+w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
                                        :expand=>true)
 
 # A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'Value', 
+TkLabelFrame.new(w, :text=>'Value',
                  :padx=>2, :pady=>2) {|f|
   grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
 
   v = TkVariable.new
   (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}", 
+    TkRadiobutton.new(f, :text=>"This is value #{i}",
                       :variable=>v, :value=>i) {
       pack(:side=>:top, :fill=>:x, :pady=>2)
     }
@@ -76,7 +78,7 @@ def lfEnableButtons(w)
 end
 
 TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
+  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
                     :text=>"Use this option.", :padx=>0) {|cb|
     command proc{lfEnableButtons(f)}
     f.labelwidget(cb)
diff --git a/ext/tk/sample/demos-en/mclist.rb b/ext/tk/sample/demos-en/mclist.rb
new file mode 100644
index 0000000000..17019bb15b
--- /dev/null
+++ b/ext/tk/sample/demos-en/mclist.rb
@@ -0,0 +1,117 @@
+# mclist.rb --
+#
+# This demonstration script creates a toplevel window containing a Ttk
+# tree widget configured as a multi-column listbox.
+#
+# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($mclist_demo) && $mclist_demo
+  $mclist_demo.destroy
+  $mclist_demo = nil
+end
+
+$mclist_demo = TkToplevel.new {|w|
+  title("Multi-Column List")
+  iconname("mclist")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
+
+## Explanatory text
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+               :text=><<EOL).pack(:fill=>:x)
+Ttk is the new Tk themed widget set. \
+One of the widgets it includes is a tree widget, \
+which can be configured to display multiple columns of informational data \
+without displaying the tree itself. \
+This is a simple way to build a listbox that has multiple columns. \
+Clicking on the heading for a column will sort the data by that column. \
+You can also change the width of the columns \
+by dragging the boundary between them.
+EOL
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'mclist'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $mclist_demo.destroy
+                           $mclist_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+container = Ttk::Frame.new(base_frame)
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
+                          :show=>:headings)
+if Tk.windowingsystem != 'aqua'
+  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
+else
+  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
+end
+
+container.pack(:fill=>:both, :expand=>true)
+Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
+Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
+container.grid_columnconfigure(0, :weight=>1)
+container.grid_rowconfigure(0, :weight=>1)
+
+## The data we're going to insert
+data = [
+  ['Argentina', 	'Buenos Aires', 	'ARS'],
+  ['Australia',		'Canberra',		'AUD'],
+  ['Brazil', 		'Brazilia', 		'BRL'],
+  ['Canada', 		'Ottawa', 		'CAD'],
+  ['China',		'Beijing', 		'CNY'],
+  ['France',		'Paris', 		'EUR'],
+  ['Germany', 		'Berlin',		'EUR'],
+  ['India', 		'New Delhi',		'INR'],
+  ['Italy', 		'Rome', 		'EUR'],
+  ['Japan', 		'Tokyo', 		'JPY'],
+  ['Mexico', 		'Mexico City', 		'MXN'],
+  ['Russia', 		'Moscow', 		'RUB'],
+  ['South Africa',	'Pretoria', 		'ZAR'],
+  ['United Kingdom', 	'London', 		'GBP'],
+  ['United States', 	'Washington, D.C.', 	'USD'],
+]
+
+## Code to insert the data nicely
+font = Ttk::Style.lookup(tree[:style], :font)
+cols = %w(country capital currency)
+cols.zip(%w(Country Capital Currency)).each{|col, name|
+  tree.heading_configure(col, :text=>name,
+                         :command=>proc{sort_by(tree, col, false)})
+  tree.column_configure(col, :width=>TkFont.measure(font, name))
+}
+
+data.each{|country, capital, currency|
+  #tree.insert('', :end, :values=>[country, capital, currency])
+  tree.insert(nil, :end, :values=>[country, capital, currency])
+  cols.zip([country, capital, currency]).each{|col, val|
+    len = TkFont.measure(font, "#{val}  ")
+    if tree.column_cget(col, :width) < len
+      tree.column_configure(col, :width=>len)
+    end
+  }
+}
+
+## Code to do the sorting of the tree contents when clicked on
+def sort_by(tree, col, direction)
+  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
+    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
+    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
+
+  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
+end
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
index 8370d2f5f0..a458dbbc14 100644
--- a/ext/tk/sample/demos-en/menu.rb
+++ b/ext/tk/sample/demos-en/menu.rb
@@ -4,7 +4,7 @@
 
 # toplevel widget
 if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy 
+  $menu_demo.destroy
   $menu_demo = nil
 end
 
@@ -15,8 +15,10 @@ $menu_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
+
 # menu frame
-$menu_frame = TkFrame.new($menu_demo, 'relief'=>'raised', 'bd'=>2)
+$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
 $menu_frame.pack('side'=>'top', 'fill'=>'x')
 
 begin
@@ -26,7 +28,7 @@ rescue
 end
 
 # label
-TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
   if $tk_platform['platform'] == 'macintosh' ||
       windowingsystem == "classic" || windowingsystem == "aqua"
     text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
@@ -36,7 +38,7 @@ TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 }.pack('side'=>'top')
 
 # frame
-TkFrame.new($menu_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -52,7 +54,7 @@ TkFrame.new($menu_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# menu 
+# menu
 TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
   pack('side'=>'left')
   TkMenu.new(m, 'tearoff'=>false) {|file_menu|
@@ -84,8 +86,8 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
     m.configure('menu'=>basic_menu)
     add('command', 'label'=>'Long entry that does nothing')
     ['A','B','C','D','E','F','G'].each{|c|
-      add('command', 'label'=>"Print letter \"#{c}\"", 
-          'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+      add('command', 'label'=>"Print letter \"#{c}\"",
+          'underline'=>14, 'accelerator'=>"Meta+#{c}",
           'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
       $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
     }
@@ -96,17 +98,17 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
   pack('side'=>'left')
   TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
     m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello', 
-        'command'=>proc{print "Hello\n"}, 
+    add('command', 'label'=>'Print hello',
+        'command'=>proc{print "Hello\n"},
         'accelerator'=>"#{modifier}+H", 'underline'=>6)
     $menu_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-    add('command', 'label'=>'Print goodbye', 
-        'command'=>proc{print "Goodbye\n"}, 
+    add('command', 'label'=>'Print goodbye',
+        'command'=>proc{print "Goodbye\n"},
         'accelerator'=>"#{modifier}+G", 'underline'=>6)
     $menu_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
 
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons', 
+    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
+      cascade_menu.add('cascade', 'label'=>'Check buttons',
                        'menu'=>cascade_check, 'underline'=>0)
       oil = TkVariable.new(0)
       add('check', 'label'=>'Oil checked', 'variable'=>oil)
@@ -117,18 +119,18 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       lights = TkVariable.new(0)
       add('check', 'label'=>'Lights checked', 'variable'=>lights)
       add('separator')
-      add('command', 'label'=>'Show current values', 
-          'command'=>proc{showVars($menu_demo, 
-                                   ['oil', oil], 
-                                   ['trans', trans], 
-                                   ['brakes', brakes], 
+      add('command', 'label'=>'Show current values',
+          'command'=>proc{showVars($menu_demo,
+                                   ['oil', oil],
+                                   ['trans', trans],
+                                   ['brakes', brakes],
                                    ['lights', lights])} )
       invoke 1
       invoke 3
     }
 
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons', 
+    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
+      cascade_menu.add('cascade', 'label'=>'Radio buttons',
                        'menu'=>cascade_radio, 'underline'=>0)
       pointSize = TkVariable.new
       add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
@@ -142,9 +144,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
       add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
       add('separator')
-      add('command', 'label'=>'Show current values', 
-          'command'=>proc{showVars($menu_demo, 
-                                   ['pointSize', pointSize], 
+      add('command', 'label'=>'Show current values',
+          'command'=>proc{showVars($menu_demo,
+                                   ['pointSize', pointSize],
                                    ['style', style])} )
       invoke 1
       invoke 7
@@ -156,15 +158,15 @@ TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
   pack('side'=>'left')
   TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
     m.configure('menu'=>icon_menu)
-    add('command', 
+    add('command',
         'bitmap'=>'@'+[$demo_dir,'..',
                         'images','pattern.xbm'].join(File::Separator),
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
                                      'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-                                     'bitmap'=>'', 'default'=>0, 
+                                     'bitmap'=>'', 'default'=>0,
                                      'buttons'=>'Dismiss')} )
     ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 
+      add('command', 'bitmap'=>icon,
           'command'=>proc{print "You invoked the #{icon} bitmap\n"})
     }
   }
@@ -176,7 +178,7 @@ TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
     m.configure('menu'=>more_menu)
     [ 'An entry','Another entry','Does nothing','Does almost nothing',
       'Make life meaningful' ].each{|i|
-      add('command', 'label'=>i, 
+      add('command', 'label'=>i,
           'command'=>proc{print "You invoked \"#{i}\"\n"})
     }
   }
@@ -187,7 +189,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
   TkMenu.new(m) {|colors_menu|
     m.configure('menu'=>colors_menu)
     ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c, 
+      add('command', 'label'=>c, 'background'=>c,
           'command'=>proc{print "You invoked \"#{c}\"\n"})
     }
   }
diff --git a/ext/tk/sample/demos-en/menu84.rb b/ext/tk/sample/demos-en/menu84.rb
index cb616d8461..4fc53962e7 100644
--- a/ext/tk/sample/demos-en/menu84.rb
+++ b/ext/tk/sample/demos-en/menu84.rb
@@ -4,7 +4,7 @@
 
 # toplevel widget
 if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy 
+  $menu84_demo.destroy
   $menu84_demo = nil
 end
 
@@ -15,6 +15,8 @@ $menu84_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
+
 begin
   windowingsystem = Tk.windowingsystem()
 rescue
@@ -22,7 +24,7 @@ rescue
 end
 
 # label
-TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
   if $tk_platform['platform'] == 'macintosh' ||
       windowingsystem == "classic" || windowingsystem == "aqua"
     text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
@@ -33,17 +35,17 @@ TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 
 
 menustatus = TkVariable.new("    ")
-TkFrame.new($menu84_demo) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken', 
-              'bd'=>1, 'font'=>['Helvetica', '10'], 
-              'anchor'=>'w').pack('side'=>'left', 'padx'=>2, 
+TkFrame.new(base_frame) {|frame|
+  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
+              'bd'=>1, 'font'=>['Helvetica', '10'],
+              'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
                                   'expand'=>true, 'fill'=>'both')
   pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 }
 
 
 # frame
-TkFrame.new($menu84_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -90,8 +92,8 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
   add('command', 'label'=>'Long entry that does nothing')
   ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"", 
-        'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+    add('command', 'label'=>"Print letter \"#{c}\"",
+        'underline'=>14, 'accelerator'=>"Meta+#{c}",
         'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
     $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
   }
@@ -99,17 +101,17 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 
 TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello', 
-      'command'=>proc{print "Hello\n"}, 
+  add('command', 'label'=>'Print hello',
+      'command'=>proc{print "Hello\n"},
       'accelerator'=>"#{modifier}+H", 'underline'=>6)
   $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye', 
-      'command'=>proc{print "Goodbye\n"}, 
+  add('command', 'label'=>'Print goodbye',
+      'command'=>proc{print "Goodbye\n"},
       'accelerator'=>"#{modifier}+G", 'underline'=>6)
   $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
 
   TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check buttons', 
+    m.add('cascade', 'label'=>'Check buttons',
           'menu'=>cascade_check, 'underline'=>0)
     oil = TkVariable.new(0)
     add('check', 'label'=>'Oil checked', 'variable'=>oil)
@@ -120,18 +122,18 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     lights = TkVariable.new(0)
     add('check', 'label'=>'Lights checked', 'variable'=>lights)
     add('separator')
-    add('command', 'label'=>'Show current values', 
-        'command'=>proc{showVars($menu84_demo, 
-                                 ['oil', oil], 
-                                 ['trans', trans], 
-                                 ['brakes', brakes], 
+    add('command', 'label'=>'Show current values',
+        'command'=>proc{showVars($menu84_demo,
+                                 ['oil', oil],
+                                 ['trans', trans],
+                                 ['brakes', brakes],
                                  ['lights', lights])} )
     invoke 1
     invoke 3
   }
 
   TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons', 
+    m.add('cascade', 'label'=>'Radio buttons',
           'menu'=>cascade_radio, 'underline'=>0)
     pointSize = TkVariable.new
     add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
@@ -145,9 +147,9 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
     add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
     add('separator')
-    add('command', 'label'=>'Show current values', 
-        'command'=>proc{showVars($menu84_demo, 
-                                 ['pointSize', pointSize], 
+    add('command', 'label'=>'Show current values',
+        'command'=>proc{showVars($menu84_demo,
+                                 ['pointSize', pointSize],
                                  ['style', style])} )
     invoke 1
     invoke 7
@@ -156,15 +158,15 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 
 TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1, 
+  add('command', 'hidemargin'=>1,
       'bitmap'=>'@'+[$demo_dir,'..',
                       'images','pattern.xbm'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
                                    'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-                                   'bitmap'=>'', 'default'=>0, 
+                                   'bitmap'=>'', 'default'=>0,
                                    'buttons'=>'Dismiss')} )
   ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
+    add('command', 'bitmap'=>icon, 'hidemargin'=>1,
         'command'=>proc{print "You invoked the #{icon} bitmap\n"})
   }
 
@@ -175,19 +177,19 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
   [ 'An entry','Another entry','Does nothing','Does almost nothing',
     'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i, 
+    add('command', 'label'=>i,
         'command'=>proc{print "You invoked \"#{i}\"\n"})
   }
 
-  m.entryconfigure('Does almost nothing', 
-                   'bitmap'=>'questhead', 'compound'=>'left', 
+  m.entryconfigure('Does almost nothing',
+                   'bitmap'=>'questhead', 'compound'=>'left',
                    'command'=>proc{
-                     TkDialog.new('title'=>'Compound Menu Entry', 
+                     TkDialog.new('title'=>'Compound Menu Entry',
                                   'message'=>'The menu entry you invoked'+
                                              'displays both a bitmap and '+
                                              'a text string.  Other than '+
                                              'this, it isjust like any '+
-                                             'other menu entry.', 
+                                             'other menu entry.',
                                   'buttons'=>['OK'], 'bitmap'=>'')
                    })
 }
@@ -195,7 +197,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 TkMenu.new($menu84_frame) {|m|
   $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
   ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c, 
+    add('command', 'label'=>c, 'background'=>c,
         'command'=>proc{print "You invoked \"#{c}\"\n"})
   }
 }
diff --git a/ext/tk/sample/demos-en/menubu.rb b/ext/tk/sample/demos-en/menubu.rb
index e2ddd07bc6..6e28e813b3 100644
--- a/ext/tk/sample/demos-en/menubu.rb
+++ b/ext/tk/sample/demos-en/menubu.rb
@@ -21,7 +21,7 @@ def optionMenu(menubutton, varName, firstValue, *rest)
   for i in rest
     menu.add 'radio', 'label'=>i, 'variable'=>varName
   end
-  
+
   return menu
 end
 
@@ -37,16 +37,18 @@ $menubu_demo = TkToplevel.new {|w|
 
 positionWindow($menubu_demo)
 
+base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
+
 # version check
 if $tk_version.to_f < 8.0
 
 # label
-TkLabel.new($menubu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
     text("This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette.")
 }.pack('side'=>'top')
 
 # frame
-TkFrame.new($menubu_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -64,7 +66,7 @@ TkFrame.new($menubu_demo) {|frame|
 
 else ; # Tk8.x
 
-body = TkFrame.new($menubu_demo)
+body = TkFrame.new(base_frame)
 body.pack('expand'=>'yes', 'fill'=>'both')
 
 below = TkMenubutton.new(body) {
@@ -159,7 +161,7 @@ center = TkFrame.new(body) {
   grid('row'=>1, 'column'=>1, 'sticky'=>'news')
 }
 
-TkFrame.new($menubu_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc {
@@ -186,7 +188,7 @@ msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
 TkFrame.new(center) {|f|
   menubuttonoptions = TkVariable.new
   mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions, 
+  options = optionMenu(mbutton, menubuttonoptions,
                        'one', 'two', 'three')
   mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
   paletteColor = TkVariable.new
diff --git a/ext/tk/sample/demos-en/msgbox.rb b/ext/tk/sample/demos-en/msgbox.rb
index aab1b619cf..d3d66bfeb0 100644
--- a/ext/tk/sample/demos-en/msgbox.rb
+++ b/ext/tk/sample/demos-en/msgbox.rb
@@ -7,7 +7,7 @@
 
 # toplevel widget
 if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy 
+  $msgbox_demo.destroy
   $msgbox_demo = nil
 end
 
@@ -18,12 +18,14 @@ $msgbox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($msgbox_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
             'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box.").pack('side'=>'top')
 
 # frame
-TkFrame.new($msgbox_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -45,11 +47,11 @@ TkFrame.new($msgbox_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
-$msgbox_leftframe  = TkFrame.new($msgbox_demo)
-$msgbox_rightframe = TkFrame.new($msgbox_demo)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+$msgbox_leftframe  = TkFrame.new(base_frame)
+$msgbox_rightframe = TkFrame.new(base_frame)
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
                         'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
                         'pady'=>'.5c', 'padx'=>'.5c')
 
 TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
@@ -58,9 +60,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
 
 $msgboxIcon = TkVariable.new('info')
 ['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon, 
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16, 
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
                                         'anchor'=>'w', 'fill'=>'x')
 }
 
@@ -69,20 +71,20 @@ TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
 .pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
 
 $msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel', 
+['abortretryignore', 'ok', 'okcancel',
   'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType, 
-                    'relief'=>'flat', 'value'=>type, 'width'=>16, 
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+                    'relief'=>'flat', 'value'=>type, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
                                         'anchor'=>'w', 'fill'=>'x')
 }
 
 def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
+  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
                          'title'=>'Message', 'parent'=>w,
                          'message'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon")
 
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
                 'message'=>"You have selected  \"#{button}\"")
 end
 
diff --git a/ext/tk/sample/demos-en/msgbox2.rb b/ext/tk/sample/demos-en/msgbox2.rb
new file mode 100644
index 0000000000..c227b59bb1
--- /dev/null
+++ b/ext/tk/sample/demos-en/msgbox2.rb
@@ -0,0 +1,91 @@
+# msgbox2.rb
+#
+# This demonstration script creates message boxes of various type
+#
+# message boxes widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($msgbox2_demo) && $msgbox2_demo
+  $msgbox2_demo.destroy
+  $msgbox2_demo = nil
+end
+
+# demo toplevel widget
+$msgbox2_demo = TkToplevel.new {|w|
+  title("Message Box Demonstration")
+  iconname("messagebox")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+            'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box with both of a message and a detail.").pack('side'=>'top')
+
+# frame
+TkFrame.new(base_frame) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $msgbox2_demo
+      $msgbox2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'msgbox2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Message Box'
+    command proc{showMessageBox2 $msgbox2_demo}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+$msgbox_leftframe  = TkFrame.new(base_frame)
+$msgbox_rightframe = TkFrame.new(base_frame)
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+                        'pady'=>'.5c', 'padx'=>'.5c')
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+                        'pady'=>'.5c', 'padx'=>'.5c')
+
+TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
+TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxIcon = TkVariable.new('info')
+['error', 'info', 'question', 'warning'].each {|icon|
+  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+TkLabel.new($msgbox_rightframe, 'text'=>'Type').pack('side'=>'top')
+TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxType = TkVariable.new('ok')
+['abortretryignore', 'ok', 'okcancel',
+  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
+  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+                    'relief'=>'flat', 'value'=>type, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+def showMessageBox2(w)
+  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
+                         'title'=>'Message', 'parent'=>w,
+                         'message'=>"\"#{$msgboxType.value}\" Type MessageBox",
+                         'detail'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon. Please click one of the following button.")
+
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
+                'message'=>"You have selected  \"#{button}\"")
+end
+
diff --git a/ext/tk/sample/demos-en/paned1.rb b/ext/tk/sample/demos-en/paned1.rb
index 48ba86de02..d3d66d1b16 100644
--- a/ext/tk/sample/demos-en/paned1.rb
+++ b/ext/tk/sample/demos-en/paned1.rb
@@ -6,7 +6,7 @@
 # based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
 
 if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy 
+  $paned1_demo.destroy
   $paned1_demo = nil
 end
 
@@ -16,15 +16,17 @@ $paned1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($paned1_demo, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 The sash between the two coloured windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
 If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
 EOL
 
 # The bottom buttons
-TkFrame.new($paned1_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
@@ -37,9 +39,9 @@ TkFrame.new($paned1_demo){|f|
                }).pack(:side=>:left, :expand=>true)
 }
 
-TkPanedwindow.new($paned1_demo){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
+TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
+  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
+      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
 
-  add(TkLabel.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
-      TkLabel.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
+  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
 }
diff --git a/ext/tk/sample/demos-en/paned2.rb b/ext/tk/sample/demos-en/paned2.rb
index 5911cadab6..02293b0309 100644
--- a/ext/tk/sample/demos-en/paned2.rb
+++ b/ext/tk/sample/demos-en/paned2.rb
@@ -6,7 +6,7 @@
 # based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
 
 if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy 
+  $paned2_demo.destroy
   $paned2_demo = nil
 end
 
@@ -16,15 +16,17 @@ $paned2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($paned2_demo, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 The sash between the two scrolled windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
 If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
 EOL
 
 # The bottom buttons
-TkFrame.new($paned2_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
@@ -40,40 +42,40 @@ TkFrame.new($paned2_demo){|f|
 paneList = TkVariable.new  # define as normal variable (not array)
 paneList.value = [         # ruby's array --> tcl's list
     'List of Ruby/Tk Widgets',
-    'TkButton', 
-    'TkCanvas', 
-    'TkCheckbutton', 
-    'TkEntry', 
-    'TkFrame', 
-    'TkLabel', 
-    'TkLabelframe', 
-    'TkListbox', 
-    'TkMenu', 
-    'TkMenubutton', 
-    'TkMessage', 
-    'TkPanedwindow', 
-    'TkRadiobutton', 
-    'TkScale', 
-    'TkScrollbar', 
-    'TkSpinbox', 
-    'TkText', 
+    'TkButton',
+    'TkCanvas',
+    'TkCheckbutton',
+    'TkEntry',
+    'TkFrame',
+    'TkLabel',
+    'TkLabelframe',
+    'TkListbox',
+    'TkMenu',
+    'TkMenubutton',
+    'TkMessage',
+    'TkPanedwindow',
+    'TkRadiobutton',
+    'TkScale',
+    'TkScrollbar',
+    'TkSpinbox',
+    'TkText',
     'TkToplevel'
 ]
 
 # Create the pane itself
-TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
+TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
   pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
 
   add(TkFrame.new(f){|paned2_top|
         TkListbox.new(paned2_top, :listvariable=>paneList) {
           # Invert the first item to highlight it
-          itemconfigure(0, :background=>self.cget(:foreground), 
+          itemconfigure(0, :background=>self.cget(:foreground),
                            :foreground=>self.cget(:background) )
-          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right, 
+          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
                                                       :fill=>:y))
           pack(:fill=>:both, :expand=>true)
         }
-      }, 
+      },
 
       TkFrame.new(f, :height=>120) {|paned2_bottom|
         # The bottom window is a text widget with scrollbar
diff --git a/ext/tk/sample/demos-en/patch_1.1c1 b/ext/tk/sample/demos-en/patch_1.1c1
deleted file mode 100644
index d3952e71eb..0000000000
--- a/ext/tk/sample/demos-en/patch_1.1c1
+++ /dev/null
@@ -1,93 +0,0 @@
---- /usr/src/ruby-1.1c1/lib/tkcanvas.rb	Tue Jul 21 18:18:02 1998
-+++ tkcanvas.rb	Fri Jul 24 20:38:24 1998
-@@ -310,7 +310,7 @@
- 	  || key == 'latinfont' || key == 'asciifont' )
- 	tagfont_configure(tagid(tagOrId), {key=>value})
-       else
--	tk_call 'itemconfigure', tagid(tagOrId), "-#{key}", value
-+	tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
-       end
-     end
-   end
---- /usr/src/ruby-1.1c1/lib/tkfont.rb	Fri Jul 17 23:43:28 1998
-+++ tkfont.rb	Fri Jul 24 17:46:22 1998
-@@ -42,7 +42,7 @@
-       r | []
- 
-     when /^8\.*/
--      list(tk_call('font', 'names'))
-+      tk_split_simplelist(tk_call('font', 'names'))
- 
-     end
-   end
-@@ -89,10 +89,14 @@
-       if fnt == []
- 	TkFont.new(nil, nil).call_font_configure(path, *(args + [{}]))
-       else
--	compound = Hash[*list(tk_call('font', 'configure', 
--				      fnt))].collect{|key,value|
--	  [key[1..-1], value]
--	}.assoc('compound')[1]
-+	begin
-+	  compound = Hash[*list(tk_call('font', 'configure', 
-+					fnt))].collect{|key,value|
-+	    [key[1..-1], value]
-+	  }.assoc('compound')[1]
-+	rescue
-+	  compound = []
-+	end
- 	if compound == []
- 	  TkFont.new(fnt, DEFAULT_KANJI_FONT_NAME) \
- 	  .call_font_configure(path, *(args + [{}]))
-@@ -156,14 +160,19 @@
-     elsif font.kind_of? Array
-       finfo = {}
-       finfo['family'] = font[0].to_s
--      if font[1] && font[1] != '0' && font[1] =~ /^(|\+|-)([0-9]+)$/
--	if $1 == '-'
--	  finfo['pixels'] = font[1].to_s
-+      if font[1]
-+	fsize = font[1].to_s
-+	if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
-+	  if $1 == '-'
-+	    finfo['pixels'] = $2
-+	  else
-+	    finfo['points'] = $2
-+	  end
- 	else
--	  finfo['points'] = font[1].to_s
-+	  finfo['points'] = '13'
- 	end
-       end
--      finfo[2..-1].each{|style|
-+      font[2..-1].each{|style|
- 	case (style)
- 	when 'normal'
- 	  finfo['weight'] = style
-@@ -199,16 +208,19 @@
-     elsif font.kind_of? Array
-       finfo = {}
-       finfo['family'] = font[0].to_s
--      if font[1] && font[1] != '0' && font[1] =~ /^(|\+|-)([0-9]+)$/
--	if $1 == '-'
--	  finfo['pixels'] = $2
-+      if font[1]
-+	fsize = font[1].to_s
-+	if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
-+	  if $1 == '-'
-+	    finfo['pixels'] = $2
-+	  else
-+	    finfo['points'] = $2
-+	  end
- 	else
--	  finfo['points'] = $2
-+	  finfo['points'] = '13'
- 	end
--      else
--	finfo['points'] = '13'
-       end
--      finfo[2..-1].each{|style|
-+      font[2..-1].each{|style|
- 	case (style)
- 	when 'normal'
- 	  finfo['weight'] = style
diff --git a/ext/tk/sample/demos-en/pendulum.rb b/ext/tk/sample/demos-en/pendulum.rb
index 36bb44edec..306ac94a21 100644
--- a/ext/tk/sample/demos-en/pendulum.rb
+++ b/ext/tk/sample/demos-en/pendulum.rb
@@ -7,7 +7,7 @@
 
 # destroy toplevel widget for this demo script
 if defined?($pendulum_demo) && $pendulum_demo
-  $pendulum_demo.destroy 
+  $pendulum_demo.destroy
   $pendulum_demo = nil
 end
 
@@ -18,8 +18,10 @@ $pendulum_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
+
 # create label
-msg = TkLabel.new($pendulum_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,7 +30,7 @@ msg = TkLabel.new($pendulum_demo) {
 msg.pack('side'=>'top')
 
 # create frame
-TkFrame.new($pendulum_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,20 +51,22 @@ TkFrame.new($pendulum_demo) {|frame|
 class PendulumAnimationDemo
   def initialize(frame)
     # Create some structural widgets
-    pane = TkPanedWindow.new(frame).pack(:fill=>:both, :expand=>true)
-    pane.add(@lf1 = TkLabelFrame.new(pane, :text=>'Pendulum Simulation'))
-    pane.add(@lf2 = TkLabelFrame.new(pane, :text=>'Phase Space'))
+    @pane = TkPanedWindow.new(frame, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
+#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
+#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
+    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
+    @lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space')
 
     # Create the canvas containing the graphical representation of the
     # simulated system.
-    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white', 
+    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
                       :borderwidth=>2, :relief=>:sunken)
-    TkcText.new(@c, 5, 5, :anchor=>:nw, 
+    TkcText.new(@c, 5, 5, :anchor=>:nw,
                 :text=>'Click to Adjust Bob Start Position')
     # Coordinates of these items don't matter; they will be set properly below
     @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
     @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
-    @bob = TkcOval.new(@c, 1, 1, 2, 2, 
+    @bob = TkcOval.new(@c, 1, 1, 2, 2,
                        :width=>3, :fill=>'yellow', :outline=>'black')
     TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
 
@@ -72,22 +76,22 @@ class PendulumAnimationDemo
     # Create the canvas containing the phase space graph; this consists of
     # a line that gets gradually paler as it ages, which is an extremely
     # effective visual trick.
-    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white', 
+    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
                       :borderwidth=>2, :relief=>:sunken)
     @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
     @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
 
     @graph = {}
     90.step(0, -10){|i|
-      # Coordinates of these items don't matter; 
+      # Coordinates of these items don't matter;
       # they will be set properly below
       @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
     }
 
     # labels
-    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
                                :text=>'q', :font=>'Symbol 8')
-    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
                                :text=>'dq', :font=>'Symbol 8')
 
     # pack
@@ -99,24 +103,25 @@ class PendulumAnimationDemo
     @dTheta = 0.0
     @length = 150
 
-    # init display
-    showPendulum
-
     # animation loop
     @timer = TkTimer.new(15){ repeat }
 
     # binding
     @c.bindtags_unshift(btag = TkBindTag.new)
     btag.bind('Destroy'){ @timer.stop }
-    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x, y)}, '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x, y)}, '%x %y')
-    btag.bind('ButtonRelease-1', 
-              proc{|x, y| showPendulum(x, y); @timer.start }, '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w| 
-              @psh = h/2; 
+    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
+              '%x %y')
+    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
+    btag.bind('ButtonRelease-1',
+              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
+              '%x %y')
+
+    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
+
+    @k.bind('Configure', proc{|h, w|
+              h = h.to_i
+              w = w.to_i
+              @psh = h/2;
               @psw = w/2
               @x_axis.coords(2, @psh, w-2, @psh)
               @y_axis.coords(@psw, h-2, @psw, 2)
@@ -124,14 +129,22 @@ class PendulumAnimationDemo
               @label_dtheta.coords(w-6, @psh+4)
             }, '%h %w')
 
+    # add
+    Tk.update
+    @pane.add(@lf1)
+    @pane.add(@lf2)
+
+    # init display
+    showPendulum
+
     # animation start
     @timer.start(500)
   end
 
   # This procedure makes the pendulum appear at the correct place on the
-  # canvas. If the additional arguments x, y are passed instead of computing 
-  # the position of the pendulum from the length of the pendulum rod and its 
-  # angle, the length and angle are computed in reverse from the given 
+  # canvas. If the additional arguments x, y are passed instead of computing
+  # the position of the pendulum from the length of the pendulum rod and its
+  # angle, the length and angle are computed in reverse from the given
   # location (which is taken to be the centre of the pendulum bob.)
   def showPendulum(x=nil, y=nil)
     if x && y && (x != 160 || y != 25)
@@ -154,6 +167,10 @@ class PendulumAnimationDemo
   # rate at which the angle is changing (the first derivative with
   # respect to time.)
   def showPhase
+    unless @psw && @psh
+      @psw = @k.width/2
+      @psh = @k.height/2
+    end
     @points << @theta + @psw << -20*@dTheta + @psh
     if @points.length > 100
       @points = @points[-100..-1]
@@ -220,4 +237,4 @@ class PendulumAnimationDemo
 end
 
 # Start the animation processing
-PendulumAnimationDemo.new($pendulum_demo)
+PendulumAnimationDemo.new(base_frame)
diff --git a/ext/tk/sample/demos-en/plot.rb b/ext/tk/sample/demos-en/plot.rb
index 6d01deeef5..f70daa3fb2 100644
--- a/ext/tk/sample/demos-en/plot.rb
+++ b/ext/tk/sample/demos-en/plot.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy 
+  $plot_demo.destroy
   $plot_demo = nil
 end
 
@@ -19,14 +19,16 @@ $plot_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($plot_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
             'text'=>"This window displays a canvas widget containing a simple 2-dimensional plot.  You can doctor the data by dragging any of the points with mouse button 1."){
   pack('side'=>'top')
 }
 
 # frame
-$plot_buttons = TkFrame.new($plot_demo) {|frame|
+$plot_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -43,55 +45,55 @@ $plot_buttons = TkFrame.new($plot_demo) {|frame|
 }
 $plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# font 
+# font
 plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
 
-# canvas 
-$plot_canvas = TkCanvas.new($plot_demo,'relief'=>'raised','width'=>450,'height'=>300)
+# canvas
+$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
 $plot_canvas.pack('side'=>'top', 'fill'=>'x')
 
-# plot 
+# plot
 TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
 TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20, 
+TkcText.new($plot_canvas, 225, 20,
             'text'=>"A Simple Plot", 'font'=>plotFont, 'fill'=>'brown')
 
 (0..10).each {|i|
   x = 100 + (i * 30)
   TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254, 
+  TkcText.new($plot_canvas, x, 254,
               'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
 }
 (0..5).each {|i|
   y = 250 - (i * 40)
   TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y, 
+  TkcText.new($plot_canvas, 96, y,
               'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
 }
 
 for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
   x = 100 + (3*xx)
   y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6, 
+  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
                      'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
   item.addtag 'point'
 end
 
-$plot_canvas.itembind('point', 'Any-Enter', 
+$plot_canvas.itembind('point', 'Any-Enter',
                       proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave', 
+$plot_canvas.itembind('point', 'Any-Leave',
                       proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1', 
+$plot_canvas.itembind('point', '1',
                       proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1', 
+$plot_canvas.itembind('point', 'ButtonRelease-1',
                       proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion', 
+$plot_canvas.bind('B1-Motion',
                   proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
 
 $plot = {'lastX'=>0, 'lastY'=>0}
 
 # plotDown --
-# This method is invoked when the mouse is pressed over one of the 
+# This method is invoked when the mouse is pressed over one of the
 # data points.  It sets up state to allow the point to be dragged.
 #
 # Arguments:
diff --git a/ext/tk/sample/demos-en/puzzle.rb b/ext/tk/sample/demos-en/puzzle.rb
index 0885cf2975..f16414aa4c 100644
--- a/ext/tk/sample/demos-en/puzzle.rb
+++ b/ext/tk/sample/demos-en/puzzle.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy 
+  $puzzle_demo.destroy
   $puzzle_demo = nil
 end
 
@@ -19,8 +19,10 @@ $puzzle_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($puzzle_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -29,7 +31,7 @@ msg = TkLabel.new($puzzle_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($puzzle_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -52,18 +54,27 @@ TkFrame.new($puzzle_demo) {|frame|
 # scrollbar widget and using its trough color.
 begin
   if Tk.windowingsystem() == 'aqua'
-    frameSize = 160
+    frameWidth  = 168
+    frameHeight = 168
+  elsif Tk.default_widget_set == :Ttk
+    frameWidth  = 148
+    frameHeight = 124
   else
-    frameSize = 120
+    frameWidth  = 120
+    frameHeight = 120
   end
 rescue
-  frameSize = 120
+  frameWidth  = 120
+  frameHeight = 120
 end
- 
-s = TkScrollbar.new($puzzle_demo)
-base = TkFrame.new($puzzle_demo) {
-  width  frameSize
-  height frameSize
+
+# depend_on_button_width = true
+depend_on_button_width = false
+
+s = TkScrollbar.new(base_frame)
+base = TkFrame.new(base_frame) {
+  width  frameWidth
+  height frameHeight
   borderwidth 2
   relief 'sunken'
   bg s['troughcolor']
@@ -87,7 +98,10 @@ order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
     text num
     highlightthickness 0
     command def_puzzleswitch_proc(w, num)
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
+    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
+      base.width = w.winfo_reqwidth * 4
+    end
+  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
           'relwidth'=>0.25, 'relheight'=>0.25)
 }
 $xpos['space'] = 0.75
diff --git a/ext/tk/sample/demos-en/radio.rb b/ext/tk/sample/demos-en/radio.rb
index 96cdc4c54a..bde31508e1 100644
--- a/ext/tk/sample/demos-en/radio.rb
+++ b/ext/tk/sample/demos-en/radio.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy 
+  $radio_demo.destroy
   $radio_demo = nil
 end
 
@@ -19,8 +19,10 @@ $radio_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# label 
-msg = TkLabel.new($radio_demo) {
+base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,12 +30,12 @@ msg = TkLabel.new($radio_demo) {
 }
 msg.pack('side'=>'top')
 
-# 
+#
 size = TkVariable.new
 color = TkVariable.new
 
-# frame 
-TkFrame.new($radio_demo) {|frame|
+# frame
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -52,18 +54,18 @@ TkFrame.new($radio_demo) {|frame|
   TkButton.new(frame) {
     text 'See Variables'
     command proc{
-      showVars($radio_demo, ['size', size], ['color', color])
+      showVars(base_frame, ['size', size], ['color', color])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# frame 
-f_left = TkFrame.new($radio_demo)
-f_right = TkFrame.new($radio_demo)
+# frame
+f_left = TkFrame.new(base_frame)
+f_right = TkFrame.new(base_frame)
 f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 
-# radiobutton 
+# radiobutton
 [10, 12, 18, 24].each {|sz|
   TkRadioButton.new(f_left) {
     text "Point Size #{sz}"
diff --git a/ext/tk/sample/demos-en/radio2.rb b/ext/tk/sample/demos-en/radio2.rb
index 2b56ccc9b1..72fc2c610c 100644
--- a/ext/tk/sample/demos-en/radio2.rb
+++ b/ext/tk/sample/demos-en/radio2.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy 
+  $radio2_demo.destroy
   $radio2_demo = nil
 end
 
@@ -19,8 +19,10 @@ $radio2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# label 
-msg = TkLabel.new($radio2_demo) {
+base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -28,13 +30,13 @@ msg = TkLabel.new($radio2_demo) {
 }
 msg.pack('side'=>'top')
 
-# 
+#
 size = TkVariable.new
 color = TkVariable.new
 align = TkVariable.new
 
-# frame 
-TkFrame.new($radio2_demo) {|frame|
+# frame
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -53,24 +55,24 @@ TkFrame.new($radio2_demo) {|frame|
   TkButton.new(frame) {
     text 'See Variables'
     command proc{
-      showVars($radio2_demo, 
+      showVars(base_frame,
                ['size', size], ['color', color], ['compound', align])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# frame 
-f_left  = TkLabelFrame.new($radio2_demo, 'text'=>'Point Size', 
+# frame
+f_left  = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
                            'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new($radio2_demo, 'text'=>'Color', 
+f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color',
                            'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new($radio2_demo, 'text'=>'Alignment', 
+f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
                            'pady'=>2, 'padx'=>2)
 f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 
-# radiobutton 
+# radiobutton
 [10, 12, 18, 24].each {|sz|
   TkRadioButton.new(f_left) {
     text "Point Size #{sz}"
@@ -90,14 +92,15 @@ f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
   }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
 }
 
-label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead', 
+# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
                     'compound'=>'left')
 label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
 label.height(TkWinfo.reqheight(label))
 abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
   lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
-                    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+                    'value'=>lower, 'indicatoron'=>0, 'width'=>7,
                     'command'=>proc{label.compound(align.value)})
 }
 
diff --git a/ext/tk/sample/demos-en/radio3.rb b/ext/tk/sample/demos-en/radio3.rb
index 70c4abb3b5..8a147edda7 100644
--- a/ext/tk/sample/demos-en/radio3.rb
+++ b/ext/tk/sample/demos-en/radio3.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($radio3_demo) && $radio3_demo
-  $radio3_demo.destroy 
+  $radio3_demo.destroy
   $radio3_demo = nil
 end
 
@@ -19,8 +19,10 @@ $radio3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# label 
-msg = TkLabel.new($radio3_demo) {
+base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -33,50 +35,50 @@ size = TkVariable.new
 color = TkVariable.new
 align = TkVariable.new
 
-# frame 
-TkFrame.new($radio3_demo) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+# frame
+TkFrame.new(base_frame) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
          :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         TkButton.new(frame, :text=>'See Variables', 
-                      :image=>$image['view'], :compound=>:left, 
+  TkGrid('x',
+         TkButton.new(frame, :text=>'See Variables',
+                      :image=>$image['view'], :compound=>:left,
                       :command=>proc{
-                        showVars($radio3_demo, ['size', size], 
+                        showVars(base_frame, ['size', size],
                                  ['color', color], ['compound', align])
-                      }), 
-         TkButton.new(frame, :text=>'See Code', 
-                      :image=>$image['view'], :compound=>:left, 
-                      :command=>proc{showCode 'radio3'}), 
-         TkButton.new(frame, :text=>'Dismiss', 
-                      :image=>$image['delete'], :compound=>:left, 
+                      }),
+         TkButton.new(frame, :text=>'See Code',
+                      :image=>$image['view'], :compound=>:left,
+                      :command=>proc{showCode 'radio3'}),
+         TkButton.new(frame, :text=>'Dismiss',
+                      :image=>$image['delete'], :compound=>:left,
                       :command=>proc{
                         tmppath = $radio3_demo
                         $radio3_demo = nil
                         $showVarsWin[tmppath.path] = nil
                         tmppath.destroy
-                      }), 
+                      }),
          :padx=>4, :pady=>4)
   frame.grid_columnconfigure(0, :weight=>1)
   TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
 }
 
-# frame 
-f_left  = TkLabelFrame.new($radio3_demo, 'text'=>'Point Size', 
+# frame
+f_left  = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
                            'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new($radio3_demo, 'text'=>'Color', 
+f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color',
                            'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new($radio3_demo, 'text'=>'Alignment', 
+f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
                            'pady'=>2, 'padx'=>2)
 f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
 f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
 f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
 
-TkButton.new($radio3_demo, 'text'=>'Tristate', 
+TkButton.new(base_frame, 'text'=>'Tristate',
              'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
   grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
 }
 
-# radiobutton 
+# radiobutton
 [10, 12, 14, 18, 24].each {|sz|
   TkRadioButton.new(f_left) {
     text "Point Size #{sz}"
@@ -99,13 +101,14 @@ TkButton.new($radio3_demo, 'text'=>'Tristate',
   }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
 }
 
-label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead', 
+# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
                     'compound'=>'left')
 label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
 label.height(TkWinfo.reqheight(label))
 a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
-                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7, 
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
                     'command'=>proc{label.compound(align.value)})
 }
 
diff --git a/ext/tk/sample/demos-en/rolodex-j b/ext/tk/sample/demos-en/rolodex-j
deleted file mode 100644
index 27e2bc9da0..0000000000
--- a/ext/tk/sample/demos-en/rolodex-j
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# ���Υ�����ץȤ� Tom LaStrange �� rolodex �ΰ����Ǥ���
-# 
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 14:02:04 nagai"
-#
-
-require "tk"
-
-Tk.encoding = "euc-jp"
-$font = TkFont.new('k14')
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( w.is_a?(TkWindow) )
-      if( TkWinfo.exist?(w) )
-	topic = w
-      end
-    end
-  end
-  
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "���Υȥԥå��ˤĤ��ƤΥإ�פϤޤ����ѤǤ��ޤ���"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"��#{topic}��\n\n#{msg}",
-	       "font"=>$font,
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0, "Ω�� ����")
-  $root.frame.entry[2].insert(0, "923-1292 ���")
-  $root.frame.entry[3].insert(0, "ä��Į ���� 1-1")
-  $root.frame.entry[4].insert(0, "��Φ��ü�ʳص�����ر����")
-  $root.frame.entry[5].insert(0,"private")
-  $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"����ϥե�������������������Υ��ߡ��Ǥ���\n",
-	       "font"=>$font,
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"��������Ǥ�����",
-			"font"=>$font,
-			"default_button"=>0,
-			"buttons"=>["����󥻥�"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","̾��:","����","","","����(����):","����(���):","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e",
-			      "font" => $font)
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken",
-			      "font" => $font)
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "���ꥢ��",
-			  "font" => $font)
-    @add = TkButton.new(self,
-			"text" => "�ɲ�",
-			"font" => $font)
-    @search = TkButton.new(self,
-			   "text" => "����",
-			   "font" => $font)
-    @delete = TkButton.new(self,
-			   "text" => "�õ�",
-			   "font" => $font)
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=> "�ե�����",
-			     "font"=> $font,
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "�ɤ߹��� ...",
-		   "font" => $font,
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "��λ",
-		   "font" => $font,
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=> "�إ��",
-			     "font"=> $font,
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=> "����ƥ����ȤˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("����ƥ�����")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�إ�פˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("�إ��")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "������ɥ��ˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("������ɥ�")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�������ˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("�������")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�С���������",
-		   "font" => $font,
-		   "command"=>proc{show_help("�С���������")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=> "���ꥢ��   Ctrl+C", "font" => $font)
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=> "�ɲ�   Ctrl+A", "font" => $font)
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=> "����   Ctrl+S", "font" => $font)
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=> "�õ�   Ctrl+D", "font" => $font)
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-����ϡ֥ե�����ץ�˥塼�Ǥ������ɤ߹��ߡפ�ֽ�λ�פʤɤ�
-�Ԥʤ����Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-�ե�������ɤ߹��ߤ�Ԥʤ��Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-���ץꥱ��������λ����Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-̾���������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-����������ֹ�������륨��ȥ�Ǥ�������\
-�������ʤ��Ȥ��� private �ȵ������ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-��Ҥ������ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-FAX�ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics["����ƥ�����"] = <<EOF
-Ruby/Tk�Ǥ�grab�ε������ʤ����ᤳ�Υ��ץꥱ�������Ǥ�\
-����ƥ����ȥإ�פϥ��ݡ��Ȥ���Ƥ��ޤ���
-������Ʊ���褦�ʸ��̤�bind�ȥޥ����ΰ��֤�Wedget���Τ�\
-���Ȥ����뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["�إ��"] = <<EOF
-�ޥ����򥦥���ɥ��ˤ��碌��F1�����򲡤����Ȥˤ�ä�\
-���Υإ�פ򸫤뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["������ɥ�"] = <<EOF
-���Υ�����ɥ��ϥ��ߡ��Ǥ���
-EOF
-
-$helpTopics["�������"] = <<EOF
-Ctrl+A:		�ɲ�
-Ctrl+C:		���ꥢ��
-Ctrl+D:		�õ�
-Ctrl+F:		�ե���������
-Ctrl+Q:		��λ
-Ctrl+S:		����
-EOF
-
-$helpTopics["�С���������"] = <<EOF
-�С������� 1.0.1e �Ǥ���
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/ruler.rb b/ext/tk/sample/demos-en/ruler.rb
index 4299d57b4f..a9773699f7 100644
--- a/ext/tk/sample/demos-en/ruler.rb
+++ b/ext/tk/sample/demos-en/ruler.rb
@@ -21,7 +21,7 @@ end
 
 # toplevel widget
 if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy 
+  $ruler_demo.destroy
   $ruler_demo = nil
 end
 
@@ -32,14 +32,16 @@ $ruler_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($ruler_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
             'text'=>"This canvas widget shows a mock-up of a ruler.  You can create tab stops by dragging them out of the well to the right of the ruler.  You can also drag existing tab stops.  If you drag a tab stop far enough up or down so that it turns dim, it will be deleted when you release the mouse button."){
   pack('side'=>'top')
 }
 
 # frame
-$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
+$ruler_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -56,14 +58,14 @@ $ruler_buttons = TkFrame.new($ruler_demo) {|frame|
 }
 $ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# canvas 
-$ruler_canvas = TkCanvas.new($ruler_demo, 'width'=>'14.8c', 'height'=>'2.5c')
+# canvas
+$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
 $ruler_canvas.pack('side'=>'top', 'fill'=>'x')
 
-# 
+#
 unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y, 
-                               :top, :bottom, :size, :normalStyle, 
+  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
+                               :top, :bottom, :size, :normalStyle,
                                :activeStyle, :deleteStyle).new
 end
 $demo_rulerInfo.grid = '.25c'
@@ -75,17 +77,17 @@ $demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
 $demo_rulerInfo.normalStyle = {'fill'=>'black'}
 if TkWinfo.depth($ruler_canvas) > 1
   $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red', 
-    'stipple'=>'@'+[$demo_dir, '..', 
+  $demo_rulerInfo.deleteStyle = {'fill'=>'red',
+    'stipple'=>'@'+[$demo_dir, '..',
                      'images', 'gray25.xbm'].join(File::Separator)}
 else
   $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black', 
-    'stipple'=>'@'+[$demo_dir, '..', 
+  $demo_rulerInfo.deleteStyle = {'fill'=>'black',
+    'stipple'=>'@'+[$demo_dir, '..',
                      'images', 'gray25.xbm'].join(File::Separator)}
 end
 
-TkcLine.new($ruler_canvas, 
+TkcLine.new($ruler_canvas,
             '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
 (0..11).each{|i|
   x = i+1
@@ -99,21 +101,21 @@ TkcLine.new($ruler_canvas,
 $rulerTag_well = TkcTag.new($ruler_canvas)
 $ruler_canvas\
 .addtag_withtag($rulerTag_well,
-                TkcRectangle.new($ruler_canvas, 
-                                 '13.2c', '1c', '13.8c', '0.5c', 
-                                 'outline'=>'black', 
+                TkcRectangle.new($ruler_canvas,
+                                 '13.2c', '1c', '13.8c', '0.5c',
+                                 'outline'=>'black',
                                  'fill'=>($ruler_canvas\
                                           .configinfo('background'))[4]) )
 $ruler_canvas\
 .addtag_withtag($rulerTag_well,
-                rulerMkTab($ruler_canvas, 
-                           TkWinfo.pixels($ruler_canvas, '13.5c'), 
+                rulerMkTab($ruler_canvas,
+                           TkWinfo.pixels($ruler_canvas, '13.5c'),
                            TkWinfo.pixels($ruler_canvas, '.65c') ) )
 
 $rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1', 
+$ruler_canvas.itembind('tab', '1',
                        proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion', 
+$ruler_canvas.bind('B1-Motion',
                    proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
 $ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
 
diff --git a/ext/tk/sample/demos-en/sayings.rb b/ext/tk/sample/demos-en/sayings.rb
index cef0f4ecf4..a4dcf37cdc 100644
--- a/ext/tk/sample/demos-en/sayings.rb
+++ b/ext/tk/sample/demos-en/sayings.rb
@@ -9,7 +9,7 @@
 
 # toplevel widget
 if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy 
+  $sayings_demo.destroy
   $sayings_demo = nil
 end
 
@@ -20,8 +20,10 @@ $sayings_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($sayings_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -30,7 +32,7 @@ msg = TkLabel.new($sayings_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($sayings_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,7 +51,7 @@ TkFrame.new($sayings_demo) {|frame|
 
 # frame
 sayings_lbox = nil
-TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
+TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   sv = TkScrollbar.new(w)
   sh = TkScrollbar.new(w, 'orient'=>'horizontal')
   sayings_lbox = TkListbox.new(w) {
@@ -68,11 +70,11 @@ TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
     sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
 
   else
-    sayings_lbox.grid('row'=>0, 'column'=>0, 
+    sayings_lbox.grid('row'=>0, 'column'=>0,
                       'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1, 
+    sv.grid('row'=>0, 'column'=>1,
             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0, 
+    sh.grid('row'=>1, 'column'=>0,
             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
     TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
diff --git a/ext/tk/sample/demos-en/search.rb b/ext/tk/sample/demos-en/search.rb
index 3d3b4aecc8..7fb40d88b2 100644
--- a/ext/tk/sample/demos-en/search.rb
+++ b/ext/tk/sample/demos-en/search.rb
@@ -62,13 +62,13 @@ end
 
 def textToggle(cmd1,sleep1,cmd2,sleep2)
   sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep}, 
+  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
               -1, cmd1, cmd2).start(sleep1)
 end
 
 # toplevel widget
 if defined?($search_demo) && $search_demo
-  $search_demo.destroy 
+  $search_demo.destroy
   $search_demo = nil
 end
 
@@ -79,8 +79,10 @@ $search_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
+
 # frame
-$search_buttons = TkFrame.new($search_demo) {|frame|
+$search_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -98,68 +100,68 @@ $search_buttons = TkFrame.new($search_demo) {|frame|
 $search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'File name:', 
+TkFrame.new(base_frame) {|f|
+  TkLabel.new(f, 'text'=>'File name:',
               'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40, 
+  TkEntry.new(f, 'width'=>40,
               'textvariable'=>$search_fileName) {
     pack('side'=>'left')
     bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
                         $search_string_entry.focus})
     focus
   }
-  TkButton.new(f, 'text'=>'Load File', 
-               'command'=>proc{textLoadFile($search_text, 
+  TkButton.new(f, 'text'=>'Load File',
+               'command'=>proc{textLoadFile($search_text,
                                             $search_fileName.value)})\
   .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
 }.pack('side'=>'top', 'fill'=>'x')
 
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'Search string:', 
+TkFrame.new(base_frame) {|f|
+  TkLabel.new(f, 'text'=>'Search string:',
               'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40, 
+  $search_string_entry = TkEntry.new(f, 'width'=>40,
                                      'textvariable'=>$search_searchString) {
     pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value, 
+    bind('Return', proc{textSearch($search_text, $search_searchString.value,
                                    $search_Tag)})
   }
-  TkButton.new(f, 'text'=>'Highlight', 
-               'command'=>proc{textSearch($search_text, 
-                                          $search_searchString.value, 
+  TkButton.new(f, 'text'=>'Highlight',
+               'command'=>proc{textSearch($search_text,
+                                          $search_searchString.value,
                                           $search_Tag)}) {
     pack('side'=>'left', 'pady'=>5, 'padx'=>10)
   }
 }.pack('side'=>'top', 'fill'=>'x')
 
-$search_text = TkText.new($search_demo, 'setgrid'=>true, 'wrap'=>'word') {|t|
+$search_text = TkText.new(base_frame, 'setgrid'=>true, 'wrap'=>'word') {|t|
   $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new($search_demo, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
+  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
     t.yscrollcommand(proc{|first,last| sc.set first,last})
     pack('side'=>'right', 'fill'=>'y')
   }
   pack('expand'=>'yes', 'fill'=>'both')
-}  
+}
 
 # Set up display styles for text highlighting.
 
 if TkWinfo.depth($search_demo) > 1
   textToggle(proc{
-               $search_Tag.configure('background'=>'#ce5555', 
+               $search_Tag.configure('background'=>'#ce5555',
                                      'foreground'=>'white')
              },
-             800, 
+             800,
              proc{
                $search_Tag.configure('background'=>'', 'foreground'=>'')
              },
              200 )
 else
   textToggle(proc{
-               $search_Tag.configure('background'=>'black', 
+               $search_Tag.configure('background'=>'black',
                                      'foreground'=>'white')
              },
-             800, 
+             800,
              proc{
                $search_Tag.configure('background'=>'', 'foreground'=>'')
              },
@@ -173,8 +175,13 @@ type a string in the lower entry and type <Return> or click on \
 \"Load File\".  This will cause all of the instances of the string to \
 be tagged with the tag \"search\", and it will arrange for the tag\'s \
 display attributes to change to make all of the strings blink.")
+$search_text.insert('end', "\
+The current directory to load a file is \"#{Dir.pwd}\".\
+")
 $search_text.set_insert '0.0'
 
 $search_fileName.value = ''
 $search_searchString.value = ''
 
+$search_text.width = 60
+$search_text.height = 20
diff --git a/ext/tk/sample/demos-en/spin.rb b/ext/tk/sample/demos-en/spin.rb
index 58616b1e02..d51b7e6619 100644
--- a/ext/tk/sample/demos-en/spin.rb
+++ b/ext/tk/sample/demos-en/spin.rb
@@ -5,7 +5,7 @@
 # based on Tcl/Tk8.4.4 widget demos
 
 if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy 
+  $spin_demo.destroy
   $spin_demo = nil
 end
 
@@ -15,8 +15,10 @@ $spin_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($spin_demo, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'5i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 Three different spin-boxes are displayed below.  \
 You can add characters by pointing, clicking and typing.  \
@@ -34,7 +36,7 @@ this demo doesn't work. Please use later version of Tk \
 which supports a 'spinbox' widget.
 EOL
 
-TkFrame.new($spin_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
@@ -48,16 +50,16 @@ TkFrame.new($spin_demo){|f|
 }
 
 australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 
+    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
     'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
 ]
 
 [
-  TkSpinbox.new($spin_demo, :from=>1, :to=>10, :width=>10, :validate=>:key, 
+  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
                 :validatecommand=>[
                   proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]), 
-  TkSpinbox.new($spin_demo, :from=>0, :to=>3, :increment=>0.5, 
-                :format=>'%05.2f', :width=>10), 
-  TkSpinbox.new($spin_demo, :values=>australianCities, :width=>10)
+                ]),
+  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
+                :format=>'%05.2f', :width=>10),
+  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
 ].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-en/states.rb b/ext/tk/sample/demos-en/states.rb
index d38c1245af..a5c01a867c 100644
--- a/ext/tk/sample/demos-en/states.rb
+++ b/ext/tk/sample/demos-en/states.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($states_demo) && $states_demo
-  $states_demo.destroy 
+  $states_demo.destroy
   $states_demo = nil
 end
 
@@ -19,8 +19,10 @@ $states_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-msg = TkLabel.new($states_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -29,7 +31,7 @@ msg = TkLabel.new($states_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($states_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -48,7 +50,7 @@ TkFrame.new($states_demo) {|frame|
 
 # frame
 states_lbox = nil
-TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
+TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
   s = TkScrollbar.new(w)
   states_lbox = TkListbox.new(w) {
     setgrid 1
@@ -61,16 +63,16 @@ TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
 }.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
 
 ins_data = [
-  'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 
-  'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia', 
-  'Hawaii', 'Idaho', 'Illinois', 
-  'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 
-  'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 
-  'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico', 
-  'New_York', 'North_Carolina', 'North_Dakota', 
-  'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island', 
-  'South_Carolina', 'South_Dakota', 
-  'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington', 
+  'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California',
+  'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia',
+  'Hawaii', 'Idaho', 'Illinois',
+  'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland',
+  'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri',
+  'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico',
+  'New_York', 'North_Carolina', 'North_Dakota',
+  'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island',
+  'South_Carolina', 'South_Dakota',
+  'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
   'West_Virginia', 'Wisconsin', 'Wyoming'
 ]
 
diff --git a/ext/tk/sample/demos-en/style.rb b/ext/tk/sample/demos-en/style.rb
index 5ed11aa459..5c8777379e 100644
--- a/ext/tk/sample/demos-en/style.rb
+++ b/ext/tk/sample/demos-en/style.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($style_demo) && $style_demo
-  $style_demo.destroy 
+  $style_demo.destroy
   $style_demo = nil
 end
 
@@ -19,8 +19,10 @@ $style_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
+
 # frame
-TkFrame.new($style_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -36,26 +38,36 @@ TkFrame.new($style_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# text 
-TkText.new($style_demo){|t|
-  # 
+# text
+txt = TkText.new(base_frame){|t|
+  #
   setgrid 'true'
-  width  70
-  height 32
+  #width  70
+  #height 32
   wrap 'word'
-  TkScrollbar.new($style_demo) {|s|
+  font $font
+  TkScrollbar.new(base_frame) {|s|
     pack('side'=>'right', 'fill'=>'y')
     command proc{|*args| t.yview(*args)}
     t.yscrollcommand proc{|first,last| s.set first,last}
   }
   pack('expand'=>'yes', 'fill'=>'both')
 
-  # 
-  style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-  style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
+  #
+  family = 'Courier'
+
+  if $tk_version =~ /^4.*/
+    style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
+    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
     style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
+    #    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
     style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+  else
+    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
+    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
+    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
+    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
+  end
 ###
 #  case($tk_version)
 #  when /^4.*/
@@ -64,44 +76,44 @@ TkText.new($style_demo){|t|
 #  when /^8.*/
 #    unless $style_demo_do_first
 #      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii', 
+#      Tk.tk_call('font', 'create', '@bigascii',
 #                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii', 
+#      Tk.tk_call('font', 'create', '@smallascii',
 #                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont', 
+#      Tk.tk_call('font', 'create', '@cBigFont',
 #                '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont', 
+#      Tk.tk_call('font', 'create', '@cSmallFont',
 #                '-compound', '@smallascii @kanji')
 #    end
 #    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
 #    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
 #  end
 
-  # 
+  #
   if TkWinfo.depth($root).to_i > 1
     style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
     style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
     style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
     style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
   else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
+    style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
                                      'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
+    style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
                                      'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
+    style_tag_raised = TkTextTag.new(t, 'background'=>'white',
                                      'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
+    style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
                                      'relief'=>'sunken', 'borderwidth'=>1)
   end
 
-  # 
+  #
   if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+                                        'borderwidth'=>0,
                                         'bgstipple'=>'gray25')
   else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+                                        'borderwidth'=>0,
                                         'bgstipple'=>'gray12')
   end
   style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
@@ -109,15 +121,20 @@ TkText.new($style_demo){|t|
   style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
   style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
   style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  if $tk_version =~ /^4.*/
+    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  else
+    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
+    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
+  end
   style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
                                     'rmargin'=>'10m')
   style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
                                     'lmargin1'=>'12m', 'lmargin2'=>'6m',
                                     'rmargin'=>'10m')
 
-  # 
+  #
   insert('end', 'Text widgets like this one allow you to display information in a
 variety of styles.  Display styles are controlled using a mechanism
 called ')
@@ -132,7 +149,8 @@ available display styles are:
   insert('end', "  You can choose any X font, ")
   insert('end', "large", style_tag_verybig)
   insert('end', " or ")
-  insert('end', "small.\n")
+  insert('end', "small", style_tag_small)
+  insert('end', ".\n")
   insert('end', "\n2. Color.", style_tag_big)
   insert('end', "  You can change either the ")
   insert('end', "background", style_tag_color1)
@@ -209,3 +227,5 @@ available display styles are:
 
 }
 
+txt.width 70
+txt.height 32
diff --git a/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
index 4bb4b6bc7e..5794a85e87 100644
--- a/ext/tk/sample/demos-en/text.rb
+++ b/ext/tk/sample/demos-en/text.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($text_demo) && $text_demo
-  $text_demo.destroy 
+  $text_demo.destroy
   $text_demo = nil
 end
 
@@ -19,6 +19,8 @@ $text_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
+
 # version check
 if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
   undo_support = false
@@ -27,7 +29,7 @@ else
 end
 
 # frame
-TkFrame.new($text_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -43,8 +45,8 @@ TkFrame.new($text_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# text 
-TkText.new($text_demo){|t|
+# text
+TkText.new(base_frame){|t|
   relief 'sunken'
   bd 2
   setgrid 1
@@ -53,14 +55,14 @@ TkText.new($text_demo){|t|
     undo true
     autoseparators true
   end
-  TkScrollbar.new($text_demo) {|s|
+  TkScrollbar.new(base_frame) {|s|
     pack('side'=>'right', 'fill'=>'y')
     command proc{|*args| t.yview(*args)}
     t.yscrollcommand proc{|first,last| s.set first,last}
   }
   pack('expand'=>'yes', 'fill'=>'both')
 
-  # 
+  #
   insert('0.0', <<EOT)
 This window is a text widget.  It displays one or more lines of text
 and allows you to edit the text.  Here is a summary of the things you
diff --git a/ext/tk/sample/demos-en/textpeer.rb b/ext/tk/sample/demos-en/textpeer.rb
new file mode 100644
index 0000000000..20192fcd05
--- /dev/null
+++ b/ext/tk/sample/demos-en/textpeer.rb
@@ -0,0 +1,76 @@
+#
+# text widget peering demo (called by 'widget')
+#
+# based on Tcl/Tk8.5.0 widget demos
+
+if defined?($textpeer_demo) && $textpeer_demo
+  $textpeer_demo.destroy
+  $textpeer_demo = nil
+end
+
+# demo toplevel widget
+$textpeer_demo = TkToplevel.new {|w|
+  title("Text Wdget Peering Demonstration")
+  iconname("textpeer")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
+
+count = [0]
+
+## Define a widget that we peer from; it won't ever actually be shown though
+first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
+first.insert :end,"This is a coupled pair of text widgets; they are peers to "
+first.insert :end,"each other. They have the same underlying data model, but "
+first.insert :end,"can show different locations, have different current edit "
+first.insert :end,"locations, and have different selections. You can also "
+first.insert :end,"create additional peers of any of these text widgets using "
+first.insert :end,"the Make Peer button beside the text widget to clone, and "
+first.insert :end,"delete a particular peer widget using the Delete Peer "
+first.insert :end,"button."
+
+Tk.update_idletasks  ## for 'first' widget
+
+## Procedures to make and kill clones; most of this is just so that the demo
+## looks nice...
+def makeClone(count, win, txt)
+  cnt = (count[0] += 1)
+  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
+  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
+  peer.yscrollbar sbar
+  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", :text=>'Make Peer',
+                    :command=>proc{makeClone(count, win, peer)})
+  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", :text=>'Delete Peer',
+                    :command=>proc{killClone(win, cnt)})
+  row = cnt * 2
+  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
+  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
+  TkGrid.configure(b1,  b2, :sticky=>'new')
+  TkGrid.rowconfigure(win,  b2, :weight=>1)
+end
+
+def killClone(win, cnt)
+  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}",
+             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
+end
+
+## Now set up the GUI
+makeClone(count, base_frame, first)
+makeClone(count, base_frame, first)
+first.destroy
+
+## See Code / Dismiss buttons
+TkFrame.new(base_frame){|f|
+  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
+                 $textpeer_demo.destroy
+                 $textpeer_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
+                 showCode 'textpeer'
+               }).pack(:side=>:left, :expand=>true)
+
+  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
+}
+TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/toolbar.rb b/ext/tk/sample/demos-en/toolbar.rb
new file mode 100644
index 0000000000..e7cbeb4235
--- /dev/null
+++ b/ext/tk/sample/demos-en/toolbar.rb
@@ -0,0 +1,130 @@
+# toolbar.rb --
+#
+# This demonstration script creates a toolbar that can be torn off.
+#
+# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($toolbar_demo) && $toolbar_demo
+  $toolbar_demo.destroy
+  $toolbar_demo = nil
+end
+
+$toolbar_demo = TkToplevel.new {|w|
+  title("Ttk Menu Buttons")
+  iconname("toolbar")
+  positionWindow(w)
+}
+
+base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
+
+if Tk.windowingsystem != 'aqua'
+  msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
+                       :text=>Tk::UTF8_String.new(<<EOL))
+This is a demonstration of how to do \
+a toolbar that is styled correctly \
+and which can be torn off (this feature reqrires Tcl/Tk8.5). \
+The buttons are configured to be \\u201Ctoolbar style\\u201D buttons by \
+telling them that they are to use the Toolbutton style. At the left \
+end of the toolbar is a simple marker that the cursor changes to a \
+movement icon over; drag that away from the toolbar to tear off the \
+whole toolbar into a separate toplevel widget. When the dragged-off \
+toolbar is no longer needed, just close it like any normal toplevel \
+and it will reattach to the window it was torn off from.
+EOL
+else
+  msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
+                       :text=>Tk::UTF8_String.new(<<EOL))
+This is a demonstration of how to do \
+a toolbar that is styled correctly. The buttons are configured to \
+be \\u201Ctoolbar style\\u201D buttons by telling them that they are \
+to use the Toolbutton style.
+EOL
+end
+
+## Set up the toolbar hull
+tbar_base = Tk::Frame.new(base_frame, # Must be a starndard Tk frame!
+                          :widgetname=>'toolbar') # for window title
+sep = Ttk::Separator.new(base_frame)
+to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
+if Tk.windowingsystem != 'aqua'
+  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
+  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
+  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
+  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
+end
+
+contents = Ttk::Frame.new(tbar_base)
+Tk.grid(to_base, contents, :sticky=>'nsew')
+tbar_base.grid_columnconfigure(contents, :weight=>1)
+contents.grid_columnconfigure(1000, :weight=>1)
+
+if Tk.windowingsystem != 'aqua'
+  ## Bindings so that the toolbar can be torn off and reattached
+  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
+  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
+  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
+  def tbar_base.tearoff(w, x, y)
+    on_win = TkWinfo.containing(x, y)
+    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
+    self.grid_remove
+    w.grid_remove
+    self.wm_manage
+    # self.wm_title('Toolbar') # if you don't want to use its widget name as a window title.
+    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
+  end
+  def tbar_base.untearoff(w)
+    self.wm_forget
+    w.grid
+    self.grid
+  end
+end
+
+## Some content for the rest of the toplevel
+text = TkText.new(base_frame, :width=>40, :height=>10)
+
+## Toolbar contents
+tb_btn = Ttk::Button.new(tbar_base, :text=>'Button', :style=>'Toolbutton',
+                         :command=>proc{text.insert(:end, "Button Pressed\n")})
+tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'Check', :style=>'Toolbutton',
+                              :variable=>(check = TkVariable.new),
+                              :command=>proc{
+                                text.insert(:end, "Check is #{check.value}\n")
+                              })
+tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'Menu')
+tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
+                             :state=>:readonly)
+tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
+menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
+menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
+menu.add(:command, :label=>'Example',
+         :command=>proc{text.insert(:end, "Example\n")})
+tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
+
+## Arrange contents
+Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
+        :in=>contents, :padx=>2, :sticky=>'ns')
+Tk.grid(tbar_base, :sticky=>'ew')
+Tk.grid(sep, :sticky=>'ew')
+Tk.grid(msg, :sticky=>'ew')
+Tk.grid(text, :sticky=>'nsew')
+base_frame.grid_rowconfigure(text, :weight=>1)
+base_frame.grid_columnconfigure(text, :weight=>1)
+
+## See Code / Dismiss buttons
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'toolbar'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $toolbar_demo.destroy
+                           $toolbar_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  Tk.grid(frame, :sticky=>'ew')
+}
diff --git a/ext/tk/sample/demos-en/tree.rb b/ext/tk/sample/demos-en/tree.rb
new file mode 100644
index 0000000000..cd62ba8c9b
--- /dev/null
+++ b/ext/tk/sample/demos-en/tree.rb
@@ -0,0 +1,119 @@
+# tree.rb --
+#
+# This demonstration script creates a toplevel window containing a Ttk
+# tree widget.
+#
+# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($tree_demo) && $tree_demo
+  $tree_demo.destroy
+  $tree_demo = nil
+end
+
+$tree_demo = TkToplevel.new {|w|
+  title("Directory Browser")
+  iconname("tree")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
+
+## Explanatory text
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+               :text=><<EOL).pack(:fill=>:x)
+Ttk is the new Tk themed widget set. \
+One of the widgets it includes is a tree widget, \
+which allows the user to browse a hierarchical data-set such as a filesystem. \
+The tree widget not only allows for the tree part itself, \
+but it also supports an arbitrary number of additional columns \
+which can show additional data (in this case, the size of the files \
+found in your filesystem). \
+You can also change the width of the columns \
+by dragging the boundary between them.
+EOL
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'tree'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $tree_demo.destroy
+                           $tree_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+## Code to populate the roots of the tree (can be more than one on Windows)
+def populate_roots(tree)
+  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
+    populate_tree(tree, tree.insert(nil, :end, :text=>dir,
+                                    :values=>[dir, 'directory']))
+  }
+end
+
+## Code to populate a node of the tree
+def populate_tree(tree, node)
+  return if tree.get(node, :type) != 'directory'
+
+  path = tree.get(node, :fullpath)
+  tree.delete(tree.children(node))
+  Dir.glob("#{path}/*").sort.each{|f|
+    type = File.ftype(f)
+    id = tree.insert(node, :end,
+                     :text=>File.basename(f), :values=>[f, type]).id
+    if type == 'directory'
+      ## Make it so that this node is openable
+      tree.insert(id, 0, :text=>'dummy')
+      tree.itemconfigure(id, :text=>File.basename(f))
+    elsif type == 'file'
+      size = File.size(f)
+      if size >= 1024*1024*1024
+        size = '%.1f GB' % (size.to_f/1024/1024/1024)
+      elsif size >= 1024*1024
+        size = '%.1f MB' % (size.to_f/1024/1024)
+      elsif size >= 1024
+        size = '%.1f KB' % (size.to_f/1024)
+      else
+        size = '%.1f bytes' % (size.to_f/1024)
+      end
+      tree.set(id, :size, size)
+    end
+  }
+
+  # Stop this code from rerunning on the current node
+  tree.set(node, :type, 'processed_directory')
+end
+
+## Create the tree and set it up
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
+                         :displaycolumns=>['size'])
+if Tk.windowingsystem != 'aqua'
+  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
+else
+  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
+end
+
+tree.heading_configure('#0', :text=>'Directory Structure')
+tree.heading_configure('size', :text=>'File Size')
+tree.column_configure('size', :stretch=>0, :width=>70)
+populate_roots(tree)
+tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
+
+## Arrange the tree and its scrollbars in the toplevel
+container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+container.lower
+Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
+Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
+container.grid_columnconfigure(0, :weight=>1)
+container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/ttkbut.rb b/ext/tk/sample/demos-en/ttkbut.rb
new file mode 100644
index 0000000000..a784efcc08
--- /dev/null
+++ b/ext/tk/sample/demos-en/ttkbut.rb
@@ -0,0 +1,139 @@
+# ttkbut.rb
+#
+# This demonstration script creates a toplevel window containing several
+# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
+# radiobuttons.
+#
+# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkbut_demo) && $ttkbut_demo
+  $ttkbut_demo.destroy
+  $ttkbut_demo = nil
+end
+
+$ttkbut_demo = TkToplevel.new {|w|
+  title("Simple Ttk Widgets")
+  iconname("ttkbut")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+Ttk is the new Tk themed widget set. This is a Ttk themed label, \
+and below are three groups of Ttk widgets in Ttk labelframes. \
+The first group are all buttons that set the current application theme \
+when pressed. The second group contains three sets of checkbuttons, \
+with a separator widget between the sets. Note that the "Enabled" \
+button controls whether all the other themed widgets in this toplevel are \
+in the disabled state. The third group has a collection of linked \
+radiobuttons.
+EOL
+
+## Add buttons for setting the theme
+buttons = Ttk::Labelframe.new(base_frame, :text=>'Buttons')
+# Ttk::Style.theme_names.each{|theme|
+#   Ttk::Button.new(buttons, :text=>theme,
+#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
+# }
+Ttk.themes.each{|theme|
+  Ttk::Button.new(buttons, :text=>theme,
+                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
+}
+
+## Helper procedure for the top checkbutton
+def setState(root, value, *excepts)
+  return if excepts.member?(root)
+
+  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
+  begin
+    root.state = value
+  rescue
+  end
+
+  ## Recursively invoke on all children of this root that are in the same
+  ## toplevel widget
+  root.winfo_children.each{|w|
+    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
+  }
+end
+
+## Set up the checkbutton group
+checks = Ttk::Labelframe.new(base_frame, :text=>'Checkbuttons')
+enabled = TkVariable.new(true)
+e = Ttk::Checkbutton.new(checks, :text=>'Enabled', :variable=>enabled,
+                         :command=>proc{
+                           setState($ttkbut_demo,
+                                    ((enabled.bool)? "!disabled" : "disabled"),
+                                    e)
+                         })
+
+## See ttk_widget(n) for other possible state flags
+sep1 = Ttk::Separator.new(checks)
+sep2 = Ttk::Separator.new(checks)
+
+cheese  = TkVariable.new
+tomato  = TkVariable.new
+basil   = TkVariable.new
+oregano = TkVariable.new
+
+c1 = Ttk::Checkbutton.new(checks, :text=>'Cheese',  :variable=>cheese)
+c2 = Ttk::Checkbutton.new(checks, :text=>'Tomato',  :variable=>tomato)
+c3 = Ttk::Checkbutton.new(checks, :text=>'Basil',   :variable=>basil)
+c4 = Ttk::Checkbutton.new(checks, :text=>'Oregano', :variable=>oregano)
+
+Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
+
+## Set up the radiobutton group
+radios = Ttk::Labelframe.new(base_frame, :text=>'Radiobuttons')
+
+happyness = TkVariable.new
+
+r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Great', :value=>'great')
+r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Good', :value=>'good')
+r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Ok', :value=>'ok')
+r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Poor', :value=>'poor')
+r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Awful', :value=>'awful')
+
+Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Variables',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{
+                           showVars(base_frame, ['enabled', enabled],
+                                    ['cheese', cheese], ['tomato', tomato],
+                                    ['basil', basil], ['oregano', oregano],
+                                    ['happyness', happyness])
+                         }),
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkbut'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           tmppath = $ttkbut_demo
+                           $ttkbut_demo = nil
+                           $showVarsWin[tmppath.path] = nil
+                           tmppath.destroy
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x, :expand=>true)
+}
+
+## Arrange things neatly
+f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+f.lower
+Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
+f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-en/ttkmenu.rb b/ext/tk/sample/demos-en/ttkmenu.rb
new file mode 100644
index 0000000000..9399568313
--- /dev/null
+++ b/ext/tk/sample/demos-en/ttkmenu.rb
@@ -0,0 +1,85 @@
+# ttkmenu.rb --
+#
+# This demonstration script creates a toplevel window containing several Ttk
+# menubutton widgets.
+#
+# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkmenu_demo) && $ttkmenu_demo
+  $ttkmenu_demo.destroy
+  $ttkmenu_demo = nil
+end
+
+$ttkmenu_demo = TkToplevel.new {|w|
+  title("Ttk Menu Buttons")
+  iconname("ttkmenu")
+  positionWindow(w)
+}
+
+base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+Ttk is the new Tk themed widget set, \
+and one widget that is available in themed form is the menubutton. \
+Below are some themed menu buttons \
+that allow you to pick the current theme in use. \
+Notice how picking a theme changes the way \
+that the menu buttons themselves look, \
+and that the central menu button is styled differently \
+(in a way that is normally suitable for toolbars). \
+However, there are no themed menus; the standard Tk menus were judged \
+to have a sufficiently good look-and-feel on all platforms, \
+especially as they are implemented as native controls in many places.
+EOL
+
+Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
+
+## See Code / Dismiss
+Ttk::Frame.new($ttkmenu_demo) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkmenu'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttkmenu_demo.destroy
+                           $ttkmenu_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+b1 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:above)
+b2 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:left)
+b3 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:right)
+b4 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:flush,
+                         :style=>Ttk::Menubutton.style('Toolbutton'))
+b5 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:below)
+
+b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
+b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
+b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
+b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
+b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
+
+Ttk.themes.each{|theme|
+  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+}
+
+f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
+f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+f.lower
+
+f.grid_anchor(:center)
+TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
+TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
+TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttknote.rb b/ext/tk/sample/demos-en/ttknote.rb
new file mode 100644
index 0000000000..bc0c7b369a
--- /dev/null
+++ b/ext/tk/sample/demos-en/ttknote.rb
@@ -0,0 +1,89 @@
+# ttknote.rb --
+#
+# This demonstration script creates a toplevel window containing a Ttk
+# notebook widget.
+#
+# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttknote_demo) && $ttknote_demo
+  $ttknote_demo.destroy
+  $ttknote_demo = nil
+end
+
+$ttknote_demo = TkToplevel.new {|w|
+  title("Ttk Notebook Widget")
+  iconname("ttknote")
+  positionWindow(w)
+}
+
+## See Code / Dismiss
+Ttk::Frame.new($ttknote_demo) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttknote'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttknote_demo.destroy
+                           $ttknote_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
+
+## Make the notebook and set up Ctrl+Tab traversal
+notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
+                                              :padx=>2, :pady=>3)
+notebook.enable_traversal
+
+## Popuplate the first pane
+f_msg = Ttk::Frame.new(notebook)
+msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'4i',
+                       :justify=>:left, :anchor=>'n', :text=><<EOL)
+Ttk is the new Tk themed widget set. \
+One of the widgets it includes is the notebook widget, \
+which provides a set of tabs that allow the selection of a group of panels, \
+each with distinct content. \
+They are a feature of many modern user interfaces. \
+Not only can the tabs be selected with the mouse, \
+but they can also be switched between using Ctrl+Tab \
+when the notebook page heading itself is selected. \
+Note that the second tab is disabled, and cannot be selected.
+EOL
+neat = TkVariable.new
+after_id = nil
+msg_b = Ttk::Button.new(f_msg, :text=>'Neat!', :underline=>0,
+                        :command=>proc{
+                          neat.value = 'Yeah, I know...'
+                          Tk.after_cancel(after_id) if after_id
+                          after_id = Tk.after(500){neat.value = ''}
+                        })
+msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
+msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
+notebook.add(f_msg, :text=>'Description', :underline=>0, :padding=>2)
+Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
+Tk.grid(msg_b, msg_l, :pady=>[2, 4])
+f_msg.grid_rowconfigure(1, :weight=>1)
+f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
+
+## Populate the second pane. Note that the content doesn't really matter
+f_disabled = Ttk::Frame.new(notebook)
+notebook.add(f_disabled, :text=>'Disabled', :state=>:disabled)
+
+## Popuplate the third pane
+f_editor = Ttk::Frame.new(notebook)
+notebook.add(f_editor, :text=>'Text Editor', :underline=>0)
+editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
+if Tk.windowingsystem != 'aqua'
+  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
+else
+  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
+end
+editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
+editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttkpane.rb b/ext/tk/sample/demos-en/ttkpane.rb
new file mode 100644
index 0000000000..87c4dedeb2
--- /dev/null
+++ b/ext/tk/sample/demos-en/ttkpane.rb
@@ -0,0 +1,213 @@
+# ttkpane.rb --
+#
+# This demonstration script creates a Ttk pane with some content.
+#
+# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkpane_demo) && $ttkpane_demo
+  $ttkpane_demo.destroy
+  $ttkpane_demo = nil
+end
+
+$ttkpane_demo = TkToplevel.new {|w|
+  title("Themed Nested Panes")
+  iconname("ttkpane")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+This demonstration shows off a nested set of themed paned windows. \
+Their sizes can be changed by grabbing the area \
+between each contained pane and dragging the divider.
+EOL
+
+Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkpane'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttkpane_demo.destroy
+                           $ttkpane_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+
+outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
+outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
+outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
+in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'Button'))
+in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'Clocks'))
+in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'Progress'))
+in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'Text'))
+if Tk.windowingsystem == 'aqua'
+  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
+end
+
+# Fill the button pane
+Ttk::Button.new(left_top, :text=>'Press Me',
+                :command=>proc{
+                  Tk.messageBox(:type=>'ok', :icon=>'info', :message=>'Ouch!',
+                                :detail=>'That hurt...', :parent=>base_frame,
+                                :title=>'Button Pressed')
+                }).pack(:padx=>2, :pady=>5)
+
+
+zones_list = [
+  [':Europe/Berlin'],
+  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
+  [':Africa/Johannesburg'],
+  [':Europe/London'],
+  [':America/Los_Angeles'],
+  [':Europe/Moscow'],
+  [':America/New_York'],
+  [':Asia/Singapore'],
+  [':Australia/Sydney'],
+  [':Asia/Tokyo'],
+]
+
+zones = []
+
+# Check tzinfo support
+if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
+  tzinfo = :tcl
+
+  # Force a pre-load of all the timezones needed; otherwise can end up
+  # poor-looking synch problems!
+  zones_list.each{|list|
+    list.each{|zone|
+      begin
+        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
+      rescue RuntimeError
+        # ignore
+      else
+        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
+        break
+      end
+    }
+  }
+
+else
+  begin
+    require 'tzinfo'
+    tzinfo = :tzinfo
+  rescue Exception
+    begin
+      require 'tzfile'
+      tzinfo = :tzfile
+    rescue Exception
+      tzinfo = nil
+    end
+  end
+
+  case tzinfo
+  when :tzinfo
+    zones_list.each{|list|
+      list.each{|zone|
+        begin
+          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
+        rescue Exception
+          # ignore
+        else
+          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
+          break
+        end
+      }
+    }
+
+  when :tzfile
+    zones_list.each{|list|
+      list.each{|zone|
+        begin
+          tz = TZFile.create(zone[%r<[^:]+$>])
+        rescue Exception
+          # ignore
+        else
+          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
+          break
+        end
+      }
+    }
+
+  else
+    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
+      zones << [zone, 'UTC%+03d00' % zone]
+    }
+  end
+end
+
+time = TkVariable.new_hash
+
+case tzinfo
+when :tcl
+  update_proc = proc{|now, tz, label|
+    time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
+                             '-timezone', tz, '-format', '%T')
+  }
+when :tzinfo
+  update_proc = proc{|now, tz, label|
+    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
+  }
+when :tzfile
+  update_proc = proc{|now, tz, label|
+    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
+  }
+else
+  update_proc = proc{|now, tz, label|
+    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
+  }
+end
+
+# Fill the clocks pane
+zones.each_with_index{|(zone, label), idx|
+  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
+  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
+  Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
+                 :anchor=>'w').pack(:fill=>:x)
+}
+
+# Timer start
+every = proc{
+  now = Time.now.utc
+  zones.each{|zone, label| update_proc.call(now, zone, label) }
+}
+TkRTTimer.new(1000, -1, every).start(0, every)
+
+# Fill the progress pane
+Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
+
+# Fill the text pane
+if Tk.windowingsystem != 'aqua'
+  # The trick with the ttk::frame makes the text widget look like it fits with
+  # the current Ttk theme despite not being a themed widget itself. It is done
+  # by styling the frame like an entry, turning off the border in the text
+  # widget, and putting the text widget in the frame with enough space to allow
+  # the surrounding border to show through (2 pixels seems to be enough).
+  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
+  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
+  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
+  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
+  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
+  f.pack(:fill=>:both, :expand=>true)
+  outer.pack(:fill=>:both, :expand=>true)
+else
+  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
+  scr = txt.yscrollbar(TkScrollbar.new(frame))
+  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
+  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
+  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
+end
diff --git a/ext/tk/sample/demos-en/ttkprogress.rb b/ext/tk/sample/demos-en/ttkprogress.rb
new file mode 100644
index 0000000000..c341a9385f
--- /dev/null
+++ b/ext/tk/sample/demos-en/ttkprogress.rb
@@ -0,0 +1,66 @@
+# ttkprogress.rb --
+#
+# This demonstration script creates several progress bar widgets.
+#
+# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkprogress_demo) && $ttkprogress_demo
+  $ttkprogress_demo.destroy
+  $ttkprogress_demo = nil
+end
+
+$ttkprogress_demo = TkToplevel.new {|w|
+  title("Progress Bar Demonstration")
+  iconname("ttkprogress")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=>Tk::UTF8_String.new(<<EOL)).pack(:side=>:top, :fill=>:x)
+Below are two progress bars. \
+The top one is a \\u201Cdeterminate\\u201D progress bar, \
+which is used for showing how far through a defined task the program has got. \
+The bottom one is an \\u201Cindeterminate\\u201D progress bar, \
+which is used to show that the program is busy \
+but does not know how long for. Both are run here in self-animated mode, \
+which can be turned on and off using the buttons underneath.
+EOL
+
+## See Code / Dismiss buttons
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'See Code',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkprogress'}),
+         Ttk::Button.new(frame, :text=>'Dismiss',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttkprogress_demo.destroy
+                           $ttkprogress_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+
+p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
+p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
+
+start = Ttk::Button.new(frame, :text=>'Start Progress',
+                        :command=>proc{ p1.start; p2.start })
+stop  = Ttk::Button.new(frame, :text=>'Stop Progress',
+                        :command=>proc{ p1.stop; p2.stop })
+
+Tk.grid(p1, '-', :pady=>5, :padx=>10)
+Tk.grid(p2, '-', :pady=>5, :padx=>10)
+Tk.grid(start, stop, :padx=>10, :pady=>5)
+start.grid_configure(:sticky=>'e')
+stop.grid_configure(:sticky=>'w')
+frame.grid_columnconfigure(:all, :weight=>1)
+
diff --git a/ext/tk/sample/demos-en/twind.rb b/ext/tk/sample/demos-en/twind.rb
index 24a4bcf706..60a345d0b4 100644
--- a/ext/tk/sample/demos-en/twind.rb
+++ b/ext/tk/sample/demos-en/twind.rb
@@ -8,7 +8,7 @@
 
 # toplevel widget
 if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy 
+  $twind_demo.destroy
   $twind_demo = nil
 end
 
@@ -19,8 +19,10 @@ $twind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
+
 # frame
-$twind_buttons = TkFrame.new($twind_demo) {|frame|
+$twind_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -39,24 +41,24 @@ $twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
 $twind_text = nil
-TkFrame.new($twind_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
             'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font, 
-                          'width'=>'70', 'height'=>35, 'wrap'=>'word', 
+  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
+                          'width'=>'70', 'height'=>35, 'wrap'=>'word',
                           'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
     TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(args)}
+      command proc{|*args| t.yview(*args)}
       t.yscrollcommand proc{|first,last| s.set first,last}
     }.pack('side'=>'right', 'fill'=>'y')
   }.pack('expand'=>'yes', 'fill'=>'both')
 }.pack('expand'=>'yes', 'fill'=>'both')
 
-# 
-$tag_center = TkTextTag.new($twind_text, 
+#
+$tag_center = TkTextTag.new($twind_text,
                             'justify' =>'center',
                             'spacing1'=>'5m',
                             'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text, 
+$tag_buttons = TkTextTag.new($twind_text,
                              'lmargin1'=>'1c',
                              'lmargin2'=>'1c',
                              'rmargin' =>'1c',
@@ -69,7 +71,7 @@ $twind_text.insert('end', "it.  These are called \"embedded windows\", ")
 $twind_text.insert('end', "and they can consist of arbitrary widgets.  ")
 $twind_text.insert('end', "For example, here are two embedded button ")
 $twind_text.insert('end', "widgets.  You can click on the first button to ")
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    #text 'ON'
                    text 'Turn On'
@@ -79,7 +81,7 @@ TkTextWindow.new($twind_text, 'end',
 $twind_text.insert('end', " horizontal scrolling, which also turns off ")
 $twind_text.insert('end', "word wrapping.  Or, you can click on the second ")
 $twind_text.insert('end', "button to\n")
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    #text 'OFF'
                    text 'Turn Off'
@@ -89,7 +91,7 @@ TkTextWindow.new($twind_text, 'end',
 
 $twind_text.insert('end', " horizontal scrolling and turn back on word wrapping.\n\n")
 $twind_text.insert('end', "Or, here is another example.  If you ")
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    text 'Click Here'
                    command proc{textWindPlot $twind_text}
@@ -100,7 +102,7 @@ $mark_plot = TkTextMark.new($twind_text, 'insert')
 $mark_plot.gravity='left'
 $twind_text.insert('end', "  You can drag the data points around with the mouse, ")
 $twind_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    text 'Delete'
                    command proc{textWindDel $twind_text}
@@ -122,7 +124,7 @@ $twind_text.insert('end', "changes the layout.  Click on the button again ")
 $twind_text.insert('end', "to restore the short string.\n")
 
 
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {|b|
                    text 'Default'
                    command proc{embDefBg $twind_text}
@@ -131,7 +133,7 @@ TkTextWindow.new($twind_text, 'end',
                  },
                  'padx'=>3 )
 embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkCheckButton.new($twind_text) {
                    textvariable embToggle
                    indicatoron 0
@@ -142,25 +144,25 @@ TkTextWindow.new($twind_text, 'end',
                    pady 5
                    padx 2
                  },
-                 'padx'=>3, 
+                 'padx'=>3,
                  'pady'=>2 )
 
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
 ].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end', 
+  TkTextWindow.new($twind_text, 'end',
                    'window'=>TkButton.new($twind_text) {
                      text twind_color
                      cursor 'top_left_arrow'
                      command proc{$twind_text.bg twind_color}
                    },
-                   'padx'=>3, 
+                   'padx'=>3,
                    'pady'=>2 )
 }
 
-# 
+#
 def textWindOn (w,f)
   if defined? $twind_scroll
     begin
@@ -206,43 +208,47 @@ def textWindPlot (t)
     cursor 'top_left_arrow'
   }
 
-  font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  if $tk_version =~ /^4.*/
+    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  else
+    font = 'Helvetica 18'
+  end
 
   TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
   TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20, 
+  TkcText.new($twind_plot, 225, 20,
               'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
 
   (0..10).each {|i|
     x = 100 + (i * 30)
     TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254, 
+    TkcText.new($twind_plot, x, 254,
                 'text'=>10*i, 'font'=>font, 'anchor'=>'n')
   }
   (0..5).each {|i|
     y = 250 - (i * 40)
     TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y, 
+    TkcText.new($twind_plot, 96, y,
                 'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
   }
 
   for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
     x = 100 + (3*xx)
     y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6, 
+    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
                        'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
     item.addtag 'point'
   end
 
-  $twind_plot.itembind('point', 'Any-Enter', 
+  $twind_plot.itembind('point', 'Any-Enter',
                         proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave', 
+  $twind_plot.itembind('point', 'Any-Leave',
                         proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1', 
+  $twind_plot.itembind('point', '1',
                         proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1', 
+  $twind_plot.itembind('point', 'ButtonRelease-1',
                         proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion', 
+  $twind_plot.bind('B1-Motion',
                     proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
   while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
     $twind_text.delete $mark_plot
diff --git a/ext/tk/sample/demos-en/twind2.rb b/ext/tk/sample/demos-en/twind2.rb
index c42e0999d7..af7313dd82 100644
--- a/ext/tk/sample/demos-en/twind2.rb
+++ b/ext/tk/sample/demos-en/twind2.rb
@@ -4,7 +4,7 @@
 
 # delete toplevel widget
 if defined?($twind2_demo) && $twind2_demo
-  $twind2_demo.destroy 
+  $twind2_demo.destroy
   $twind2_demo = nil
 end
 
@@ -15,22 +15,24 @@ $twind2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
+
 # frame
-$twind2_buttons = TkFrame.new($twind2_demo) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+$twind2_buttons = TkFrame.new(base_frame) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
          :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         TkButton.new(frame, :text=>'See Code', 
-                      :image=>$image['view'], :compound=>:left, 
-                      :command=>proc{showCode 'twind2'}), 
-         TkButton.new(frame, :text=>'Dismiss', 
-                      :image=>$image['delete'], :compound=>:left, 
+  TkGrid('x',
+         TkButton.new(frame, :text=>'See Code',
+                      :image=>$image['view'], :compound=>:left,
+                      :command=>proc{showCode 'twind2'}),
+         TkButton.new(frame, :text=>'Dismiss',
+                      :image=>$image['delete'], :compound=>:left,
                       :command=>proc{
                         tmppath = $twind2_demo
                         $twind2_demo = nil
                         $showVarsWin[tmppath.path] = nil
                         tmppath.destroy
-                      }), 
+                      }),
          :padx=>4, :pady=>4)
   frame.grid_columnconfigure(0, :weight=>1)
 }
@@ -38,11 +40,11 @@ $twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
 $twind2_text = nil
-TkFrame.new($twind2_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
             'relief'=>'sunken') {|f|
   $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
-                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word', 
-                            'width'=>'70', 'height'=>35, 'wrap'=>'char', 
+                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
+                            'width'=>'70', 'height'=>35, 'wrap'=>'char',
                             'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
     TkScrollbar.new(f) {|s|
       command proc{|*args| t.yview(*args)}
@@ -52,11 +54,11 @@ TkFrame.new($twind2_demo, 'highlightthickness'=>2, 'borderwidth'=>2,
 }.pack('expand'=>'yes', 'fill'=>'both')
 
 # text tags
-$tag2_center = TkTextTag.new($twind2_text, 
+$tag2_center = TkTextTag.new($twind2_text,
                             'justify' =>'center',
                             'spacing1'=>'5m',
                             'spacing3'=>'5m'  )
-$tag2_buttons = TkTextTag.new($twind2_text, 
+$tag2_buttons = TkTextTag.new($twind2_text,
                              'lmargin1'=>'1c',
                              'lmargin2'=>'1c',
                              'rmargin' =>'1c',
@@ -65,7 +67,7 @@ $tag2_buttons = TkTextTag.new($twind2_text,
                              'spacing3'=>0 )
 
 # insert text
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                   'A text widget can contain many different kinds of items, ')
 $twind2_text.insert('end',
                   "both active and passive.  It can lay these out in various ")
@@ -80,7 +82,7 @@ $twind2_text.insert('end', "it.  These are called \"embedded windows\", ")
 $twind2_text.insert('end', "and they can consist of arbitrary widgets.  ")
 $twind2_text.insert('end', "For example, here are two embedded button ")
 $twind2_text.insert('end', "widgets.  You can click on the first button to ")
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    text 'ON'
                    command proc{textWindOn2 $twind2_text,$twind2_buttons}
@@ -89,30 +91,30 @@ TkTextWindow.new($twind2_text, 'end',
 $twind2_text.insert('end', " horizontal scrolling, which also turns off ")
 $twind2_text.insert('end', "word wrapping.  Or, you can click on the second ")
 $twind2_text.insert('end', "button to\n")
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    text 'OFF'
                    command proc{textWindOff2 $twind2_text}
                    cursor 'top_left_arrow'
                  })
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                    " horizontal scrolling and turn back on word wrapping.\n\n")
 
 $twind2_text.insert('end', "Or, here is another example.  If you ")
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    text 'Click Here'
                    command proc{textWindPlot2 $twind2_text}
                    cursor 'top_left_arrow'
                  })
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     " a canvas displaying an x-y plot will appear right here.")
 $mark2_plot = TkTextMark.new($twind2_text, 'insert')
 $mark2_plot.gravity='left'
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "  You can drag the data points around with the mouse, ")
 $twind2_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    text 'Delete'
                    command proc{textWindDel2 $twind2_text}
@@ -120,19 +122,19 @@ TkTextWindow.new($twind2_text, 'end',
                  })
 $twind2_text.insert('end', " the plot again.\n\n")
 
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "You may also find it useful to put embedded windows in ")
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "a text without any actual text.  In this case the ")
 $twind2_text.insert('end', "text widget acts like a geometry manager.  For ")
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "example, here is a collection of buttons laid out ")
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "neatly into rows by the text widget.  These buttons ")
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "can be used to change the background color of the ")
 $twind2_text.insert('end', "text widget (\"Default\" restores the color to ")
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "its default).  If you click on the button labeled ")
 $twind2_text.insert('end', "\"Short\", it changes to a longer string so that ")
 $twind2_text.insert('end', "you can see how the text widget automatically ")
@@ -146,7 +148,7 @@ btn_default = TkButton.new($twind2_text) {|b|
 }
 TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
 embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkCheckButton.new($twind2_text) {
                    textvariable embToggle
                    indicatoron 0
@@ -157,21 +159,21 @@ TkTextWindow.new($twind2_text, 'end',
                    pady 5
                    padx 2
                  },
-                 'padx'=>3, 
+                 'padx'=>3,
                  'pady'=>2 )
 
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
 ].each{|twind_color|
-  TkTextWindow.new($twind2_text, 'end', 
+  TkTextWindow.new($twind2_text, 'end',
                    'window'=>TkButton.new($twind2_text) {
                      text twind_color
                      cursor 'top_left_arrow'
                      command proc{$twind2_text.bg twind_color}
                    },
-                   'padx'=>3, 
+                   'padx'=>3,
                    'pady'=>2 )
 }
 
@@ -185,54 +187,54 @@ $text_normal2['pad'] = $twind2_text.cget('padx')
 $twind2_text.insert('end', "\nYou can also change the usual border width and ")
 $twind2_text.insert('end', "highlightthickness and padding.\n")
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Big borders", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinBigB2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Small borders", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinSmallB2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinBigH2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
-                                        :cursor=>'top_left_arrow', 
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinSmallH2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Big pad", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinBigP2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Small pad", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinSmallP2 $twind2_text
                                         }))
 
-$twind2_text.insert('end', 
+$twind2_text.insert('end',
                     "\n\nFinally, images fit comfortably in text widgets too:")
 
-TkTextImage.new($twind2_text, 'end', 
+TkTextImage.new($twind2_text, 'end',
                 'image'=>TkBitmapImage.new(:file=>[
-                                             $demo_dir, '..', 
+                                             $demo_dir, '..',
                                              'images', 'face.xbm'
                                            ].join(File::Separator)))
 
@@ -307,39 +309,39 @@ def textWindPlot2 (t)
 
   TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
   TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind2_plot, 225, 20, 
+  TkcText.new($twind2_plot, 225, 20,
               'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
 
   (0..10).each {|i|
     x = 100 + (i * 30)
     TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind2_plot, x, 254, 
+    TkcText.new($twind2_plot, x, 254,
                 'text'=>10*i, 'font'=>font, 'anchor'=>'n')
   }
   (0..5).each {|i|
     y = 250 - (i * 40)
     TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind2_plot, 96, y, 
+    TkcText.new($twind2_plot, 96, y,
                 'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
   }
 
   for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
     x = 100 + (3*xx)
     y = 250 - (4*yy)/5
-    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6, 
+    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
                        'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
     item.addtag 'point'
   end
 
-  $twind2_plot.itembind('point', 'Any-Enter', 
+  $twind2_plot.itembind('point', 'Any-Enter',
                         proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind2_plot.itembind('point', 'Any-Leave', 
+  $twind2_plot.itembind('point', 'Any-Leave',
                         proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind2_plot.itembind('point', '1', 
+  $twind2_plot.itembind('point', '1',
                         proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
-  $twind2_plot.itembind('point', 'ButtonRelease-1', 
+  $twind2_plot.itembind('point', 'ButtonRelease-1',
                         proc{$twind2_plot.dtag 'selected'})
-  $twind2_plot.bind('B1-Motion', 
+  $twind2_plot.bind('B1-Motion',
                     proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
   while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
     $twind2_text.delete $mark2_plot
diff --git a/ext/tk/sample/demos-en/unicodeout.rb b/ext/tk/sample/demos-en/unicodeout.rb
index 07e3bf52b5..ee7b5afa15 100644
--- a/ext/tk/sample/demos-en/unicodeout.rb
+++ b/ext/tk/sample/demos-en/unicodeout.rb
@@ -6,7 +6,7 @@
 # based on Tcl/Tk8.4.4 widget demos
 
 if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy 
+  $unicodeout_demo.destroy
   $unicodeout_demo = nil
 end
 
@@ -16,8 +16,10 @@ $unicodeout_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($unicodeout_demo, 
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
+base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'5.4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 This is a sample of Tk's support for languages that use non-Western \
 character sets.  However, what you will actually see below depends \
@@ -30,13 +32,13 @@ the definition of @@font on the Unicodeout_SampleFrame class.
 The strings are written in Tcl using UNICODE characters \
 using the \\uXXXX escape so as to do so in a portable fashion.
 
-ATTENTION: 
+ATTENTION:
 The strings are converted to the encoded string objects \
 (completed to rewrite Tcl's escapes) by Tk::UTF8_String method. \
-And the Tk::UTF8_String objects are passed to the label widgets. 
+And the Tk::UTF8_String objects are passed to the label widgets.
 EOL
 
-TkFrame.new($unicodeout_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
@@ -49,8 +51,8 @@ TkFrame.new($unicodeout_demo){|f|
                }).pack(:side=>:left, :expand=>true)
 }
 
-wait_msg = TkLabel.new($unicodeout_demo, 
-                       :text=>"Please wait while loading fonts...", 
+wait_msg = TkLabel.new(base_frame,
+                       :text=>"Please wait while loading fonts...",
                        :font=>"Helvetica 12 italic").pack
 
 class Unicodeout_SampleFrame < TkFrame
@@ -63,23 +65,23 @@ class Unicodeout_SampleFrame < TkFrame
   # @@font = 'Newspaper 12'
   # @@font = '{New century schoolbook} 12'
 
-  def initialize()
-    super($unicodeout_demo)
+  def initialize(base)
+    super(base)
     grid_columnconfig(1, :weight=>1)
   end
 
   def add_sample(lang, *args)
     sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':', 
+    l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
                     :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt, 
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt, 
+    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
+    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
                     :anchor=>:nw, :width=>30, :pady=>0)
     Tk.grid(l, s, :sticky=>:ew, :pady=>0)
     l.grid_config(:padx, '1m')
   end
 end
-f = Unicodeout_SampleFrame.new
+f = Unicodeout_SampleFrame.new(base_frame)
 f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
 
 # Processing when some characters are missing might take a while, so make
@@ -89,23 +91,23 @@ oldCursor = $unicodeout_demo.cursor
 $unicodeout_demo.cursor('watch')
 Tk.update
 
-f.add_sample('Arabic', 
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
+f.add_sample('Arabic',
+             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
              '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
 f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
 f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek', 
-             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ', 
+f.add_sample('Greek',
+             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
              '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew', 
-             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ', 
+f.add_sample('Hebrew',
+             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
              '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese', 
-             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ', 
+f.add_sample('Japanese',
+             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
              '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
 f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian', 
-             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
+f.add_sample('Russian',
+             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
              '\u044F\u0437\u044B\u043A')
 
 wait_msg.destroy
diff --git a/ext/tk/sample/demos-en/vscale.rb b/ext/tk/sample/demos-en/vscale.rb
index 636b85813b..b05ed12072 100644
--- a/ext/tk/sample/demos-en/vscale.rb
+++ b/ext/tk/sample/demos-en/vscale.rb
@@ -15,7 +15,9 @@ $vscale_demo = TkToplevel.new {|w|
 }
 positionWindow($vscale_demo)
 
-msg = TkLabel.new($vscale_demo) {
+base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
+
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -23,7 +25,7 @@ msg = TkLabel.new($vscale_demo) {
 }
 msg.pack('side'=>'top', 'padx'=>'.5c')
 
-TkFrame.new($vscale_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc {
@@ -39,7 +41,17 @@ TkFrame.new($vscale_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-TkFrame.new($vscale_demo) {|frame|
+def setHeight(w, height)
+  height = height + 21
+  y2 = height - 30
+  if y2 < 21
+    y2 = 21
+  end
+  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+end
+
+TkFrame.new(base_frame) {|frame|
   borderwidth 10
   canvas = TkCanvas.new(frame) {|c|
     width 50
@@ -65,14 +77,3 @@ TkFrame.new($vscale_demo) {|frame|
   }.pack('side'=>'left', 'anchor'=>'ne')
   scale.set 75
 }.pack
-
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
index 3c50582211..250c589116 100644
--- a/ext/tk/sample/demos-en/widget
+++ b/ext/tk/sample/demos-en/widget
@@ -14,6 +14,8 @@ require 'tk'
 
 ### $DEBUG=1 ##########
 
+$RubyTk_WidgetDemo = true
+
 #----------------------------------------------------------------
 # The code below create the main window, consisting of a menu bar
 # and a text widget that explains how to use the program, plus lists
@@ -21,7 +23,8 @@ require 'tk'
 #----------------------------------------------------------------
 
 # widget demo directory
-$demo_dir = File.dirname($0)
+# $demo_dir = File.dirname($0)
+$demo_dir = File.dirname(__FILE__)
 
 # root 
 $root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
@@ -102,14 +105,22 @@ EOD
 end
 
 # 
-TkMenubar.new($root, 
-              [[['File', 0], 
-                  ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                  '---', 
-                  ['Quit', proc{exit}, 0, 'Meta-Q']
-                ]]).pack('side'=>'top', 'fill'=>'x')
+if $tk_major_ver >= 8
+  $root.add_menubar([[['File', 0], 
+                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
+                        '---', 
+                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
+                      ]])
+else
+  TkMenubar.new($root, 
+                [[['File', 0], 
+                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
+                    '---', 
+                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
+                  ]]).pack('side'=>'top', 'fill'=>'x')
+end
 $root.bind('F1', proc{aboutBox})
-$root.bind('Meta-q', proc{exit})
+$root.bind('Control-q', proc{exit})
 
 =begin
 TkFrame.new($root){|frame|
@@ -159,17 +170,25 @@ else
   }
   scr.command(proc{|*args| txt.yview(*args)})
 #  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
+#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
 #  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
   textFrame.pack('expand'=>'yes', 'fill'=>'both')
+  #  $root.withdraw.deiconify
+  Tk.update_idletasks
+  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
 
   statusBar = TkFrame.new($root) {|f|
+    if $tk_version =~ /^4.*/
+      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+    else
+      statusfont = 'Helvetica 10'
+    end
     $statusBarLabel = \
     TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+                'font'=>statusfont) \
         .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
     TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+                'font'=>statusfont) \
         .pack('side'=>'left', 'padx'=>2)
   }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 end
@@ -178,7 +197,11 @@ end
 # section titles and demo descriptions.  Also define the bindings for
 # tags.
   
-tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+if $tk_version =~ /^4.*/
+  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+else
+  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
+end
 
 # We put some "space" characters to the left and right of each demo description
 # so that the descriptions are highlighted only when the mouse cursor
@@ -247,7 +270,10 @@ the demonstration.  Once the demonstration window appears, you can \
 click the "See Code" button to see the Ruby/Tk code that created the \
 demonstration.  If you wish, you can edit the code and click the \
 "Rerun Demo" button in the code window to reinvoke the demonstration \
-with the modified code.
+with the modified code. \
+Don't worry about breaking the source code. \
+Your modifications are not reflected on the original file. \
+Please try many kind of changes. 
 
 Some demo scripts require the recent version of Tk library \
 (e.g. Tk8.4 or later) \
@@ -256,6 +282,20 @@ required by the demo script, the demo doesn't work. \
 In such a case, please re-compile tcltklib with the later Tk library \
 which supports the required functions.
 
+If your Tk supports Ttk (Tile) extension (included or installed), \
+please try the demo of Ttk extension (sample/tkextlib/tile/demo.rb) too.
+( Probably, Ttk extension \
+#{
+begin
+  require 'tkextlib/tile'
+  "is already installed on your environment"
+rescue
+  "is not installed on your environment yet"
+end
+}\
+. )
+Ttk extension is a standard feature of Tk8.5 or later.
+
 
 EOT
 
@@ -289,6 +329,8 @@ txt.insert('end', "13. A simple user interface for viewing images. (if supported
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "14. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "15. The simple Themed Tk widgets (require Tile/Ttk extension)\n", tag_demo, "demo-ttkbut")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 txt.insert('end', "Listboxes\n", tag_title)
@@ -299,6 +341,10 @@ txt.insert('end', "2. Colors: change the color scheme for the application.\n", "
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "3. A collection of famous sayings.\n", tag_demo, "demo-sayings")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. A multi-column list of contries. (require Tile/Ttk extension)\n", tag_demo, "demo-mclist")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. A directory browser tree. (require Tile/Ttk extension)\n", tag_demo, "demo-tree")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 txt.insert('end', "Entries and Spin-boxes\n", tag_title)
@@ -313,7 +359,9 @@ txt.insert('end',
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "4. Spin-boxes. (if supported)\n", tag_demo, "demo-spin")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Simple Rolodex-like form.\n", tag_demo, "demo-form")
+txt.insert('end', "5. Combo-boxes. (require Tile/Ttk extension)\n", tag_demo, "demo-combo")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. Simple Rolodex-like form.\n", tag_demo, "demo-form")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -331,6 +379,8 @@ txt.insert('end', "5. A text widget with embedded windows. (if supported)\n", ta
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "6. A search tool built with a text widget.\n", tag_demo, "demo-search")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "7. Peering text widgets. (if supported)\n", tag_demo, "demo-textpeer")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 txt.insert('end', "Canvases\n", tag_title)
@@ -351,31 +401,43 @@ txt.insert('end', "7. A building floor plan. (another way to create canvas items
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "8. A simple scrollable canvas.\n", tag_demo, "demo-cscroll")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "9. A Knight's tour of the chess board. (require Tile/Ttk extension)\n", tag_demo, "demo-knightstour")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-txt.insert('end', "Scales\n", tag_title)
+txt.insert('end', "Scales and Progress Bars\n", tag_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. Vertical scale.\n", tag_demo.id, "demo-vscale")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "2. Horizontal scale.\n", tag_demo.id, "demo-hscale")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Progress bar. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkprogress")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-txt.insert('end', "Paned Windows\n", tag_title)
+txt.insert('end', "Paned Windows and Notebooks\n", tag_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. Horizontal paned window. (if supported)\n", tag_demo.id, "demo-paned1")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "2. Vertical paned window. (if supported)\n", tag_demo.id, "demo-paned2")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Themed nested panes. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkpane")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. Notebook widget. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttknote")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-txt.insert('end', "Menus\n", tag_title)
+txt.insert('end', "Menus and Toolbars\n", tag_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. Menus and cascades.\n", tag_demo, "demo-menu")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "2. Menus and cascades. (if supported)\n", tag_demo, "demo-menu84")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Menubuttons\n", tag_demo, "demo-menubu")
+txt.insert('end', "3. Menubuttons.\n", tag_demo, "demo-menubu")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. Themed menu buttons. (require Tile/Ttk extension)\n", tag_demo, "demo-ttkmenu")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. Themed toolbar. (require Tile/Ttk extension)\n", tag_demo, "demo-toolbar")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -383,9 +445,11 @@ txt.insert('end', "Common Dialogs\n", tag_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. Message boxes.\n", tag_demo, "demo-msgbox")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. File selection dialog.\n", tag_demo, "demo-filebox")
+txt.insert('end', "2. Message boxes with detail text. (if supported)\n", tag_demo, "demo-msgbox2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. File selection dialog.\n", tag_demo, "demo-filebox")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Color picker.\n", tag_demo, "demo-clrpick")
+txt.insert('end', "4. Color picker.\n", tag_demo, "demo-clrpick")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -441,11 +505,16 @@ def showVars1(parent, *args)
   end
   w = TkToplevel.new(parent) {|w|
     title "Variable values"
-    TkLabel.new(w) {
+    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
+    TkLabel.new(base) {
       text "Variable values:"
       width 20
       anchor 'center'
-      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+      if $tk_version =~ /^4.*/
+        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+      else
+        font 'Helvetica 14'
+      end
     }.pack('side'=>'top', 'fill'=>'x')
     len = 1
     args.each{|vnam,vbody|
@@ -459,7 +528,7 @@ def showVars1(parent, *args)
                    .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
       }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
     }
-    TkButton.new(w) {
+    TkButton.new(base) {
       text "OK"
       command proc{w.destroy}
     }.pack('side'=>'bottom', 'pady'=>2)
@@ -474,10 +543,12 @@ def showVars2(parent, *args)
     rescue
     end
   end
-  $showVarsWin[parent.path] = TkToplevel.new(parent) {|w|
+  $showVarsWin[parent.path] = TkToplevel.new(parent) {|top|
     title "Variable values"
 
-    TkLabelFrame.new(w, :text=>"Variable values:", 
+    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
+
+    TkLabelFrame.new(base, :text=>"Variable values:", 
                      :font=>{:family=>'Helvetica', :size=>14}){|f|
       args.each{|vnam,vbody|
         TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'), 
@@ -489,15 +560,15 @@ def showVars2(parent, *args)
       f.grid_columnconfig(1, :weight=>1)
       f.grid_rowconfig(100, :weight=>1)
     }
-    TkButton.new(w, :text=>"OK", :width=>8, :default=>:active, 
-                 :command=>proc{w.destroy}){|b|
-      w.bind('Return', proc{b.invoke})
-      w.bind('Escape', proc{b.invoke})
+    TkButton.new(base, :text=>"OK", :width=>8, :default=>:active, 
+                 :command=>proc{top.destroy}){|b|
+      top.bind('Return', proc{b.invoke})
+      top.bind('Escape', proc{b.invoke})
 
       b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
     }
-    w.grid_columnconfig(0, :weight=>1)
-    w.grid_rowconfig(0, :weight=>1)
+    base.grid_columnconfig(0, :weight=>1)
+    base.grid_rowconfig(0, :weight=>1)
   }
 end
 
@@ -591,8 +662,27 @@ def _null_binding
 end
 private :_null_binding
 
-def eval_samplecode(code)
-  Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }.run
+def eval_samplecode(code, file=nil)
+  #eval(code)
+  #_null_binding.pseudo_toplevel_eval{ eval(code) }
+  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
+  Thread.new{
+    _null_binding.pseudo_toplevel_eval{
+      begin
+        if file
+          eval(code, binding, "(eval:#{file})")
+        else
+          eval(code)
+        end
+      rescue Exception=>e
+        #p e
+        TkBgError.show(e.class.inspect + ': ' + e.message + "\n" +
+                         "\n---< backtrace of Ruby side >-----\n" +
+                         e.backtrace.join("\n") +
+                         "\n---< backtrace of Tk side >-------")
+      end
+    }
+  }
   Tk.update
 end
 
@@ -612,7 +702,7 @@ def invoke(txt, idx)
   Tk.update
   # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
   # Tk.update
-  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join)
+  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
   txt.cursor(cursor)
 
   $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
@@ -669,20 +759,32 @@ def showCode1(demo)
   if $code_window == nil || TkWinfo.exist?($code_window) == false
     $code_window = TkToplevel.new(nil)
     f = TkFrame.new($code_window)
+
     TkButton.new(f) {
       text "Dismiss"
       command proc{
         $code_window.destroy
         $code_window = nil
       }
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
+    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2, 'padx'=>25)
     TkButton.new(f) {
       text "Rerun Demo"
       # command proc{eval($code_text.get('1.0','end'), _null_binding)}
-      command proc{eval_samplecode($code_text.get('1.0','end'))}
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
-#    f.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x')
-    f.pack('side'=>'bottom', 'fill'=>'x')
+      command proc{eval_samplecode($code_text.get('1.0','end'), '<viewer>')}
+    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
+
+    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
+    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
+    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
+    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
+
+    $set_linenum = proc{|w|
+      line, pos = w.index('insert').split('.')
+      linenum.text = line
+      posnum.text  = pos
+    }
+
+    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
 
     if $tk_version =~ /^4\.[01]/
       s = TkScrollbar.new($code_window, 'orient'=>'vertical')
@@ -727,10 +829,21 @@ def showCode1(demo)
         TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
       }
     end
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
   end
+
   $code_window.title("Demo code: #{file}")
   $code_window.iconname(file)
 #  fid = open(file, 'r')
@@ -741,6 +854,9 @@ def showCode1(demo)
   #$code_mark = TkTextMark.new($code_text, '1.0')
   #$code_text.set_insert('1.0')
   TkTextMarkInsert.new($code_text,'1.0')
+
+  $set_linenum.call($code_text)
+
   fid.close
 end
 
@@ -761,7 +877,19 @@ def showCode2(demo)
     tf.grid_columnconfigure(0, :weight=>1)
 
     bf = TkFrame.new($code_window)
-    
+
+    lf = TkFrame.new(bf)
+    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
+    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
+    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
+    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
+
+    $set_linenum = proc{|w|
+      line, pos = w.index('insert').split('.')
+      linenum.text = line
+      posnum.text  = pos
+    }
+
     b_dis = TkButton.new(bf, :text=>'Dismiss', :default=>:active, 
                          :command=>proc{
                            $code_window.destroy
@@ -774,12 +902,12 @@ def showCode2(demo)
     b_run = TkButton.new(bf, :text=>'Rerun Demo', 
                          :command=>proc{
                            # eval($code_text.get('1.0','end'), _null_binding)
-                           eval_samplecode($code_text.get('1.0','end'))
+                           eval_samplecode($code_text.get('1.0','end'), '<viewer>')
                          }, 
                          :image=>$image['refresh'], :compound=>:left)
 
-    TkGrid('x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(0, :weight=>1)
+    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
+    bf.grid_columnconfigure(1, :weight=>1)
 
     TkGrid(tf, :sticky=>'news')
     TkGrid(bf, :sticky=>'ew')
@@ -792,6 +920,17 @@ def showCode2(demo)
     $code_window.bindinfo('Return').each{|cmd, arg|
       $code_window.bind_append('Escape', cmd, arg)
     }
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+    btag.bind('Configure', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
@@ -803,6 +942,9 @@ def showCode2(demo)
   $code_text.delete('1.0', 'end')
   $code_text.insert('1.0', fid.read)
   TkTextMarkInsert.new($code_text,'1.0')
+
+  $set_linenum.call($code_text)
+
   fid.close
 end
 
@@ -896,12 +1038,13 @@ end
 #
 def aboutBox
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-                'message'=>"Ruby/Tk widget demonstration Ver.1.6.0-en\n\n" + 
+                'message'=>"Ruby/Tk widget demonstration Ver.1.7.1-en\n\n" + 
                            "based on demos of Tk8.1 -- 8.5  " + 
-                           "( Copyright:: " + 
+                           "( Copyright of Tcl/Tk demos:: " + 
                            "(c) 1996-1997 Sun Microsystems, Inc. / " + 
                            "(c) 1997-2000 Ajuba Solutions, Inc. / " + 
-                           "(c) 2001-2003 Donal K. Fellows )\n\n" +
+                           "(c) 2001-2007 Donal K. Fellows / " + 
+                           "(c) 2002-2007 Daniel A. Steffen )\n\n" +
                            "Your Ruby & Tk Version ::\n" + 
                            "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" + 
                            "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
@@ -923,7 +1066,7 @@ ARGV.each{|cmd|
   end
   #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, 
   #     _null_binding)
-  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join)
+  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
 }
 if no_launcher
   $root.withdraw  # hide root window
diff --git a/ext/tk/sample/demos-jp/anilabel.rb b/ext/tk/sample/demos-jp/anilabel.rb
index 97781fbe77..d2f5b12041 100644
--- a/ext/tk/sample/demos-jp/anilabel.rb
+++ b/ext/tk/sample/demos-jp/anilabel.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # animated label widget demo (called by 'widget')
 #
@@ -5,7 +6,7 @@
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($anilabel_demo) && $anilabel_demo
-  $anilabel_demo.destroy 
+  $anilabel_demo.destroy
   $anilabel_demo = nil
 end
 
@@ -16,8 +17,10 @@ $anilabel_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($anilabel_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -26,7 +29,7 @@ msg = TkLabel.new($anilabel_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($anilabel_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -45,9 +48,9 @@ TkFrame.new($anilabel_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # label demo �ѥե졼������
-f_left = TkLabelFrame.new($anilabel_demo,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new($anilabel_demo, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both', 
+f_left = TkLabelFrame.new(base_frame,  :text=>'Scrolling Texts')
+f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
+Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
         'padx'=>10, 'pady'=>10)
 
 # animated label
@@ -85,7 +88,7 @@ class AnimatedImageLabel < AnimatedTextLabel
     @btag.bind_append('Destroy'){
       if @destroy_image
         begin
-          self.image.delete 
+          self.image.delete
         rescue
         end
       end
@@ -121,13 +124,13 @@ class AnimatedImageLabel < AnimatedTextLabel
 end
 
 # label ����
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge, 
+l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
                            :font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove, 
+l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
                            :font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat, 
+l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
                            :font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3, 
+Tk.pack(l1, l2, l3,
         :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
 
 limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
diff --git a/ext/tk/sample/demos-jp/aniwave.rb b/ext/tk/sample/demos-jp/aniwave.rb
index 81e2d76b30..973c1be1e9 100644
--- a/ext/tk/sample/demos-jp/aniwave.rb
+++ b/ext/tk/sample/demos-jp/aniwave.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # animated wave demo (called by 'widget')
 #
@@ -5,7 +6,7 @@
 
 # destroy toplevel widget for this demo script
 if defined?($aniwave_demo) && $aniwave_demo
-  $aniwave_demo.destroy 
+  $aniwave_demo.destroy
   $aniwave_demo = nil
 end
 
@@ -16,8 +17,10 @@ $aniwave_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
+
 # create label
-msg = TkLabel.new($aniwave_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -26,7 +29,7 @@ msg = TkLabel.new($aniwave_demo) {
 msg.pack('side'=>'top')
 
 # create frame
-TkFrame.new($aniwave_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -50,25 +53,26 @@ class AnimatedWaveDemo
     @direction = dir
 
     # create canvas widget
-    @c = TkCanvas.new(frame, :width=>300, :height=>200, 
+    @c = TkCanvas.new(frame, :width=>300, :height=>200,
                       :background=>'black')
     @c.pack(:padx=>10, :pady=>10, :expand=>true)
 
-    # Creates a coordinates list of a wave. 
+    # Creates a coordinates list of a wave.
     @waveCoords = []
     @backupCoords = []
     n = 0
     (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
+    n = 305
     @waveCoords << [n, 0]; @backupCoords << [n, 0]
     @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
     @coordsLen = @waveCoords.length
 
     # Create a smoothed line and arrange for its coordinates to be the
     # contents of the variable waveCoords.
-    @line = TkcLine.new(@c, @waveCoords, 
+    @line = TkcLine.new(@c, @waveCoords,
                         :width=>1, :fill=>'green', :smooth=>true)
 
-    # Main animation "loop". 
+    # Main animation "loop".
     # Theoretically 100 frames-per-second (==10ms between frames)
     @timer = TkTimer.new(10){ basicMotion; reverser }
 
@@ -113,4 +117,4 @@ class AnimatedWaveDemo
 end
 
 # Start the animation processing
-AnimatedWaveDemo.new($aniwave_demo, :left).move
+AnimatedWaveDemo.new(base_frame, :left).move
diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
index 477a0abf6f..a1694d019d 100644
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ b/ext/tk/sample/demos-jp/arrow.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # arrowhead widget demo (called by 'widget')
 #
@@ -24,67 +25,75 @@ def arrowSetup(c)
 
   # Create the arrow and outline.
   c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y, 
-              { 'width'=>10 * v.width, 
-                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c], 
-                'arrow'=>'last' 
+  TkcLine.new(c, v.x1, v.y, v.x2, v.y,
+              { 'width'=>10 * v.width,
+                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
+                'arrow'=>'last'
               }.update(v.bigLineStyle) )
   xtip = v.x2 - 10*v.b
   deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY, 
-              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y, 
+  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
+              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
               'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
 
   # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5, 
+  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
                    {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5, 
+  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
                    {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5, 
+  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
                    {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
   c.itemconfigure cur, v.activeStyle if cur
 
   # Create three arrows in actual size with the same parameters
   TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
   tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width, 
+  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
               'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width, 
+  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
               'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width, 
+  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
               'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
 
-  # Create a bunch of other arrows and text items showing the 
+  # Create a bunch of other arrows and text items showing the
   # current dimensions.
   tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY, 
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
   tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width, 
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
   tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp, 
+  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
   tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp, 
+  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
 
-  TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
-              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  TkcText.new(c, v.x1, 330, 
-              'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]", 'anchor'=>'w', 
-              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  if $tk_version =~ /^4.*/
+    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+    TkcText.new(c, v.x1, 330,
+                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  else
+    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+                'font'=>'Helvetica 18')
+    TkcText.new(c, v.x1, 330,
+                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
+                'anchor'=>'w', 'font'=>'Helvetica 18')
+  end
 
   v.count += 1
 end
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy 
+  $arrow_demo.destroy
   $arrow_demo = nil
 end
 
@@ -95,14 +104,16 @@ $arrow_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($arrow_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
             'text'=>"���� widget �ǡ������Х��ǻȤ���饤��ˤĤ����͡������������Ƭ�η����Ƥߤ뤳�Ȥ��Ǥ��ޤ���������������η����Ѥ���ˤϡ����礵�줿����ˤĤ��Ƥ��� 3�ĤλͳѤ�ɥ�å����Ƥ�����������¦����������̤��礭���ǤΥ���ץ�򼨤��Ƥ��ޤ������Υƥ����Ȥϥ饤�󥢥��ƥ���Ф������ꥪ�ץ����Ǥ���"){
   pack('side'=>'top')
 }
 
 # frame ����
-$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
+$arrow_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -121,14 +132,14 @@ $arrow_buttons = TkFrame.new($arrow_demo) {|frame|
 $arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas ����
-$arrow_canvas = TkCanvas.new($arrow_demo, 'width'=>500, 'height'=>350, 
+$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
                              'relief'=>'sunken', 'borderwidth'=>2)
 $arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
 # ������
 unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc, 
-                               :x1, :x2, :y, :smallTips, :count, 
+  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
+                               :x1, :x2, :y, :smallTips, :count,
                                :bigLineStyle, :boxStyle, :activeStyle).new
 end
 $demo_arrowInfo.a = 8
@@ -146,7 +157,7 @@ if TkWinfo.depth($arrow_canvas) > 1
   $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
   $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
 else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black', 
+  $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
     'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
   $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
   $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
@@ -157,16 +168,16 @@ $arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_ar
 $arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
 $arrowTag_box.bind('B1-Enter', proc{})
 $arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1', 
+$arrow_canvas.itembind('box1', '1',
                        proc{$demo_arrowInfo.motionProc \
                          = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1', 
+$arrow_canvas.itembind('box2', '1',
                        proc{$demo_arrowInfo.motionProc \
                          = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1', 
+$arrow_canvas.itembind('box3', '1',
                        proc{$demo_arrowInfo.motionProc \
                          = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion', 
+$arrowTag_box.bind('B1-Motion',
                   proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
 $arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
 
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
index e1e23b9893..99e5c1718c 100644
--- a/ext/tk/sample/demos-jp/bind.rb
+++ b/ext/tk/sample/demos-jp/bind.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # text (tag bindings) widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy 
+  $bind_demo.destroy
   $bind_demo = nil
 end
 
@@ -15,8 +16,10 @@ $bind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
+
 # frame ����
-TkFrame.new($bind_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -40,14 +43,14 @@ def tag_binding_for_bind_demo(tag, enter_style, leave_style)
 end
 
 # text ����
-TkText.new($bind_demo){|t|
+txt = TkText.new(base_frame){|t|
   # ����
   setgrid 'true'
-  width  60
-  height 24
+  #width  60
+  #height 24
   font $font
   wrap 'word'
-  TkScrollbar.new($bind_demo) {|s|
+  TkScrollbar.new(base_frame) {|s|
     pack('side'=>'right', 'fill'=>'y')
     command proc{|*args| t.yview(*args)}
     t.yscrollcommand proc{|first,last| s.set first,last}
@@ -56,7 +59,7 @@ TkText.new($bind_demo){|t|
 
   # ������������
   if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised', 
+    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
                      'borderwidth'=>1}
     tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
   else
@@ -72,54 +75,51 @@ TkText.new($bind_demo){|t|
   insert('end', "\n\n")
   insert('end', '2. ��ñ�� 2�����Υץ��åȡ��ǡ�����ɽ������ư�������Ȥ��Ǥ��롣', (d2 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', '3. �ƥ����ȥ����ƥ�Υ��󥫡��ȹ�·����', 
+  insert('end', '3. �ƥ����ȥ����ƥ�Υ��󥫡��ȹ�·����',
          (d3 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', '4. �饤�󥢥��ƥ�Τ���������Ƭ�η��Υ��ǥ�����', 
+  insert('end', '4. �饤�󥢥��ƥ�Τ���������Ƭ�η��Υ��ǥ�����',
          (d4 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', '5. ���֥��ȥåפ��ѹ����뤿��ε�ǽ�Ĥ��Υ롼�顼��', 
+  insert('end', '5. ���֥��ȥåפ��ѹ����뤿��ε�ǽ�Ĥ��Υ롼�顼��',
          (d5 = TkTextTag.new(t)) )
   insert('end', "\n\n")
-  insert('end', 
-         '6. �����Х����ɤ���äƥ��������뤹��Τ��򼨤�����åɡ�', 
+  insert('end',
+         '6. �����Х����ɤ���äƥ��������뤹��Τ��򼨤�����åɡ�',
          (d6 = TkTextTag.new(t)) )
 
   # binding
   [d1, d2, d3, d4, d5, d6].each{|tag|
     tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
   }
-  d1.bind('1', 
+  d1.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
           })
-  d2.bind('1', 
+  d2.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
           })
-  d3.bind('1', 
+  d3.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
           })
-  d4.bind('1', 
+  d4.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
           })
-  d5.bind('1', 
+  d5.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
           })
-  d6.bind('1', 
+  d6.bind('1',
           proc{
-            eval(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 
-                 _null_binding)
+            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
           })
 
   TkTextMarkInsert.new(t, '0.0')
   configure('state','disabled')
 }
+
+txt.width  60
+txt.height 24
diff --git a/ext/tk/sample/demos-jp/bitmap.rb b/ext/tk/sample/demos-jp/bitmap.rb
index b71c67d3fd..1193e8de24 100644
--- a/ext/tk/sample/demos-jp/bitmap.rb
+++ b/ext/tk/sample/demos-jp/bitmap.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # bitmap widget demo (called by 'widget')
 #
@@ -14,11 +15,11 @@
 def bitmapRow(w,*args)
   TkFrame.new(w){|row|
     pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args 
+    for bitmap in args
       TkFrame.new(row){|base|
         pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
         TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-        TkLabel.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
+        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
       }
     end
   }
@@ -26,7 +27,7 @@ end
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy 
+  $bitmap_demo.destroy
   $bitmap_demo = nil
 end
 
@@ -37,14 +38,16 @@ $bitmap_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($bitmap_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
             'text'=>"���Υ�����ɥ��ˤϡ�Tk ���Ȥ߹��ޤ줿���٤ƤΥӥåȥޥåפ���������̾���ȶ���ɽ������Ƥ��ޤ���Tcl �Υ�����ץ���Ǥϡ����줾���̾�����Ѥ��ƻ��Ȥ��ޤ���"){
   pack('side'=>'top')
 }
 
 # frame ����
-$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
+$bitmap_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -63,7 +66,7 @@ $bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
 $bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
-TkFrame.new($bitmap_demo){|f|
+TkFrame.new(base_frame){|f|
   bitmapRow(f,'error','gray25','gray50','hourglass')
   bitmapRow(f,'info','question','questhead','warning')
   pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
diff --git a/ext/tk/sample/demos-jp/button.rb b/ext/tk/sample/demos-jp/button.rb
index 20f8cae299..87ced45810 100644
--- a/ext/tk/sample/demos-jp/button.rb
+++ b/ext/tk/sample/demos-jp/button.rb
@@ -1,10 +1,12 @@
+# -*- coding: euc-jp -*-
 #
 # button widget demo (called by 'widget')
 #
+#
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($button_demo) && $button_demo
-  $button_demo.destroy 
+  $button_demo.destroy
   $button_demo = nil
 end
 
@@ -25,7 +27,7 @@ msg = TkLabel.new($button_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-$button_buttons = TkFrame.new($button_demo) {|frame|
+$button_buttons = Tk::Frame.new($button_demo) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
diff --git a/ext/tk/sample/demos-jp/check.rb b/ext/tk/sample/demos-jp/check.rb
index be675b9042..762b99778b 100644
--- a/ext/tk/sample/demos-jp/check.rb
+++ b/ext/tk/sample/demos-jp/check.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # checkbutton widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($check_demo) && $check_demo
-  $check_demo.destroy 
+  $check_demo.destroy
   $check_demo = nil
 end
 
@@ -15,8 +16,10 @@ $check_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($check_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -30,7 +33,7 @@ brakes = TkVariable.new(0)
 sober  = TkVariable.new(0)
 
 # frame ����
-TkFrame.new($check_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -51,7 +54,7 @@ TkFrame.new($check_demo) {|frame|
   TkButton.new(frame) {
     text '�ѿ�����'
     command proc{
-      showVars($check_demo, 
+      showVars(base_frame,
                ['wipers', wipers], ['brakes', brakes], ['sober', sober])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
@@ -60,8 +63,8 @@ TkFrame.new($check_demo) {|frame|
 
 
 # checkbutton ����
-[ TkCheckButton.new($check_demo, 'text'=>'�磻�ѡ� OK', 'variable'=>wipers),
-  TkCheckButton.new($check_demo, 'text'=>'�֥졼�� OK', 'variable'=>brakes),
-  TkCheckButton.new($check_demo, 'text'=>'��ž�� ����', 'variable'=>sober)
+[ TkCheckButton.new(base_frame, 'text'=>'�磻�ѡ� OK', 'variable'=>wipers),
+  TkCheckButton.new(base_frame, 'text'=>'�֥졼�� OK', 'variable'=>brakes),
+  TkCheckButton.new(base_frame, 'text'=>'��ž�� ����', 'variable'=>sober)
 ].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
 
diff --git a/ext/tk/sample/demos-jp/check2.rb b/ext/tk/sample/demos-jp/check2.rb
index f681a4d684..9f845183f3 100644
--- a/ext/tk/sample/demos-jp/check2.rb
+++ b/ext/tk/sample/demos-jp/check2.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # checkbutton widget demo2 (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($check2_demo) && $check2_demo
-  $check2_demo.destroy 
+  $check2_demo.destroy
   $check2_demo = nil
 end
 
@@ -15,8 +16,10 @@ $check2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($check2_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -31,44 +34,44 @@ brakes = TkVariable.new(0)
 sober  = TkVariable.new(0)
 
 # frame ����
-TkFrame.new($check2_demo) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+TkFrame.new(base_frame) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
          :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         TkButton.new(frame, :text=>'�ѿ�����', 
-                      :image=>$image['view'], :compound=>:left, 
+  TkGrid('x',
+         TkButton.new(frame, :text=>'�ѿ�����',
+                      :image=>$image['view'], :compound=>:left,
                       :command=>proc{
-                        showVars($check2_demo, 
-                                 ['safety', safety], ['wipers', wipers], 
+                        showVars($check2_demo,
+                                 ['safety', safety], ['wipers', wipers],
                                  ['brakes', brakes], ['sober', sober])
-                      }), 
-         TkButton.new(frame, :text=>'�����ɻ���', 
-                      :image=>$image['view'], :compound=>:left, 
-                      :command=>proc{showCode 'check2'}), 
-         TkButton.new(frame, :text=>'�Ĥ���', 
-                      :image=>$image['delete'], :compound=>:left, 
+                      }),
+         TkButton.new(frame, :text=>'�����ɻ���',
+                      :image=>$image['view'], :compound=>:left,
+                      :command=>proc{showCode 'check2'}),
+         TkButton.new(frame, :text=>'�Ĥ���',
+                      :image=>$image['delete'], :compound=>:left,
                       :command=>proc{
                         tmppath = $check2_demo
                         $check2_demo = nil
                         $showVarsWin[tmppath.path] = nil
                         tmppath.destroy
-                      }), 
+                      }),
          :padx=>4, :pady=>4)
   frame.grid_columnconfigure(0, :weight=>1)
 }.pack('side'=>'bottom', 'fill'=>'x')
 
 
 # checkbutton ����
-TkCheckButton.new($check2_demo, :text=>'����������', :variable=>safety, 
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none', 
+TkCheckButton.new(base_frame, :text=>'����������', :variable=>safety,
+                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
                   :tristatevalue=>'partial'){
   pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
 }
 
-[ TkCheckButton.new($check2_demo, 'text'=>'�磻�ѡ� OK', 'variable'=>wipers),
-  TkCheckButton.new($check2_demo, 'text'=>'�֥졼�� OK', 'variable'=>brakes),
-  TkCheckButton.new($check2_demo, 'text'=>'��ž�� ����', 'variable'=>sober)
-].each{|w| 
+[ TkCheckButton.new(base_frame, 'text'=>'�磻�ѡ� OK', 'variable'=>wipers),
+  TkCheckButton.new(base_frame, 'text'=>'�֥졼�� OK', 'variable'=>brakes),
+  TkCheckButton.new(base_frame, 'text'=>'��ž�� ����', 'variable'=>sober)
+].each{|w|
   w.relief('flat')
   w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
 }
diff --git a/ext/tk/sample/demos-jp/clrpick.rb b/ext/tk/sample/demos-jp/clrpick.rb
index de8cd80fcd..c188723c5a 100644
--- a/ext/tk/sample/demos-jp/clrpick.rb
+++ b/ext/tk/sample/demos-jp/clrpick.rb
@@ -1,10 +1,13 @@
+# -*- coding: euc-jp -*-
 #
 # widget demo prompts the user to select a color (called by 'widget')
 #
+#  Note: don't support ttk_wrapper. work with standard widgets only.
+#
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy 
+  $clrpick_demo.destroy
   $clrpick_demo = nil
 end
 
@@ -16,12 +19,15 @@ $clrpick_demo = TkToplevel.new {|w|
 }
 
 # label ����
-TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
             'text'=>"�ʲ��Υܥ���򲡤��ơ����Υ�����ɥ���ˤ��륦�������åȤ����ʿ����طʿ������򤷤Ʋ�������").pack('side'=>'top')
 
 # frame ����
-TkFrame.new($clrpick_demo) {|frame|
-  TkButton.new(frame) {
+# TkFrame.new($clrpick_demo) {|frame|
+Tk::Frame.new($clrpick_demo) {|frame|
+  # TkButton.new(frame) {
+  Tk::Button.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
     command proc{
@@ -31,20 +37,23 @@ TkFrame.new($clrpick_demo) {|frame|
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 
-  TkButton.new(frame) {
+  # TkButton.new(frame) {
+  Tk::Button.new(frame) {
     text '�����ɻ���'
     command proc{showCode 'clrpick'}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # button ����
-TkButton.new($clrpick_demo, 'text'=>'�طʿ������� ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background', 
+# TkButton.new($clrpick_demo, 'text'=>'�طʿ������� ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'�طʿ������� ...') {|b|
+  command(proc{setColor $clrpick_demo, b, 'background',
               ['background', 'highlightbackground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
 
-TkButton.new($clrpick_demo, 'text'=>'���ʿ������� ...') {|b|
+# TkButton.new($clrpick_demo, 'text'=>'���ʿ������� ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'���ʿ������� ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
@@ -52,7 +61,7 @@ TkButton.new($clrpick_demo, 'text'=>'���ʿ������� ...') {|b|
 def setColor(w,button,name,options)
   w.grab
   initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
+  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
                          'initialcolor'=>initialColor)
   if color != ""
     setColor_helper(w,options,color)
diff --git a/ext/tk/sample/demos-jp/colors.rb b/ext/tk/sample/demos-jp/colors.rb
index c6128f9c00..9fcf0333b5 100644
--- a/ext/tk/sample/demos-jp/colors.rb
+++ b/ext/tk/sample/demos-jp/colors.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # listbox widget demo 'colors' (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy 
+  $colors_demo.destroy
   $colors_demo = nil
 end
 
@@ -15,8 +16,10 @@ $colors_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($colors_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($colors_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($colors_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -45,7 +48,7 @@ TkFrame.new($colors_demo) {|frame|
 
 # frame ����
 colors_lbox = nil
-TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
+TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   s = TkScrollbar.new(w)
   colors_lbox = TkListbox.new(w) {
     setgrid 1
@@ -58,7 +61,15 @@ TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
   colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
 }.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
 
-colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
+#colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
+colors_lbox.bind('Double-1', proc{
+                   begin
+                     TkPalette.setPalette TkSelection.get
+                   rescue => e
+                     p e
+                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
+                   end
+                   })
 
 ins_data = [
   'gray60','gray70','gray80','gray85','gray90','gray95',
diff --git a/ext/tk/sample/demos-jp/combo.rb b/ext/tk/sample/demos-jp/combo.rb
new file mode 100644
index 0000000000..2059662d48
--- /dev/null
+++ b/ext/tk/sample/demos-jp/combo.rb
@@ -0,0 +1,98 @@
+# -*- coding: euc-jp -*-
+#
+# combo.rb --
+#
+# This demonstration script creates several combobox widgets.
+#
+# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($combo_demo) && $combo_demo
+  $combo_demo.destroy
+  $combo_demo = nil
+end
+
+$combo_demo = TkToplevel.new {|w|
+  title("Combobox Demonstration")
+  iconname("combo")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+�ʲ��Ǥ�3����Υ���ܥܥå�����ɽ������Ƥ��ޤ���\
+�ǽ�Τ�Τϡ�����ȥꥦ�������åȤ�Ʊ���ͤˡ�\
+�ݥ���Ȥ����ꡤ����å������ꡤ�����פ����ꤹ�뤳�Ȥ��Ǥ��ޤ���\
+�ޤ���Return���������Ϥ���и��ߤ��ͤ��ꥹ�Ȥ��ɲä��졤\
+�ɥ��åץ�����ꥹ�Ȥ������򤹤뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ���\
+��(���������)�����򲡤���ɽ�����줿�ꥹ�Ȥ���\
+���������¾�θ���������Return�����򲡤��С��ͤ�����Ǥ��ޤ���\
+2���ܤΥ���ܥܥå�����������ͤ˸��ꤵ��Ƥ��ꡤ�����ѹ��Ǥ��ޤ���\
+3���ܤΤ�Τϥ������ȥ�ꥢ���ԻԤΥɥ��åץ�����ꥹ�Ȥ���\
+���򤹤뤳�Ȥ�������ǽ�ȤʤäƤ��ޤ���
+EOL
+
+## variables
+firstValue  = TkVariable.new
+secondValue = TkVariable.new
+ozCity      = TkVariable.new
+
+## See Code / Dismiss buttons
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�ѿ�����',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{
+                           showVars(base_frame,
+                                    ['firstVariable', firstValue],
+                                    ['secondVariable', secondValue],
+                                    ['ozCity', ozCity])
+                         }),
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'combo'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $combo_demo.destroy
+                           $combo_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+
+australianCities = [
+  '�����٥�', '���ɥˡ�', '���ܥ��', '�ѡ���', '���ǥ졼��',
+  '�֥ꥹ�١���', '�ۥС���', '����������', '���ꥹ ���ץ�󥰥�'
+]
+
+
+secondValue.value = '�ѹ��Բ�'
+ozCity.value = '���ɥˡ�'
+
+Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
+          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
+            b.bind('Return', '%W'){|w|
+              w.values <<= w.value unless w.values.include?(w.value)
+            }
+          }.pack(:pady=>5, :padx=>10)
+        },
+
+        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
+          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
+            pack(:pady=>5, :padx=>10)
+        },
+
+        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
+          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
+                            :values=>australianCities) .
+            pack(:pady=>5, :padx=>10)
+        },
+
+        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-jp/cscroll.rb b/ext/tk/sample/demos-jp/cscroll.rb
index 0d6db69af6..0a31f28b5e 100644
--- a/ext/tk/sample/demos-jp/cscroll.rb
+++ b/ext/tk/sample/demos-jp/cscroll.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # simple scrollable canvas widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy 
+  $cscroll_demo.destroy
   $cscroll_demo = nil
 end
 
@@ -15,14 +16,16 @@ $cscroll_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($cscroll_demo, 'font'=>$font, 'wraplength'=>'4i', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
             'justify'=>'left', 'text'=>"���Υ�����ɥ��ˤϥ���������С���ޥ����Υܥ���2 �ǥ���������Ǥ��륭���Х� widget ��ɽ������Ƥ��ޤ����ͳѤξ�ǥܥ���1 �򥯥�å�����ȡ����Υ���ǥå�����ɸ����Ϥ˽��Ϥ���ޤ���"){
   pack('side'=>'top')
 }
 
 # frame ����
-$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
+$cscroll_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -42,7 +45,7 @@ $cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
 unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new($cscroll_demo) {
+  $cscroll_grid = TkFrame.new(base_frame) {
     pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
   }
   TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
@@ -50,34 +53,34 @@ unless $tk_version =~ /^4\.[01]/
 end
 
 # canvas ����
-$cscroll_canvas = TkCanvas.new($cscroll_demo, 
+$cscroll_canvas = TkCanvas.new(base_frame,
                                'relief'=>'sunken', 'borderwidth'=>2,
                                'scrollregion'=>['-11c', '-11c', '50c', '20c']
                                ) {|c|
   if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both') 
+    pack('expand'=>'yes', 'fill'=>'both')
   else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
          'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
   end
 
-  TkScrollbar.new($cscroll_demo, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
+  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
     c.yscrollcommand(proc{|first,last| vs.set first,last})
     if $tk_version =~ /^4\.[01]/
       pack('side'=>'right', 'fill'=>'y')
     else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
 
-  TkScrollbar.new($cscroll_demo, 'orient'=>'horiz', 
+  TkScrollbar.new(base_frame, 'orient'=>'horiz',
                   'command'=>proc{|*args| c.xview(*args)}) {|hs|
     c.xscrollcommand(proc{|first,last| hs.set first,last})
     if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x') 
+      pack('side'=>'bottom', 'fill'=>'x')
     else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
@@ -88,9 +91,9 @@ bg = $cscroll_canvas.configinfo('bg')[4]
   x = -10+3*i
   y = -10
   (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c", 
+    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
                      'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
+    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
                 'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
     y += 3
   }
@@ -101,7 +104,7 @@ $cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
 $cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
 $cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
 $cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion', 
+$cscroll_canvas.bind('B2-Motion',
                      proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
 
 def scrollEnter(c)
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
index 66e1fe8107..70c1cad1a7 100644
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ b/ext/tk/sample/demos-jp/ctext.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # Canvas Text widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy 
+  $ctext_demo.destroy
   $ctext_demo = nil
 end
 
@@ -15,8 +16,10 @@ $ctext_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
             'text'=>"���Υ�����ɥ��ˤϥ����Х�widget�Υƥ����ȵ�ǽ��ǥ⤹�뤿��Υƥ�����ʸ����ɽ������Ƥ��ޤ����ޥ�����ͳѤ���˻��äƤ���������å�����Ȱ��֤����Ѥ�����������а��֤��Ѥ����ꡢ��·�����Ѥ����ꤹ�뤳�Ȥ��Ǥ��ޤ����ޤ��ʲ��Τ褦���Խ��Τ���δ�ñ�ʥХ���ǥ��󥰤򥵥ݡ��Ȥ��Ƥ��ޤ���
 
   1. �ޥ�������äƤ���������å��������ϤǤ��ޤ���
@@ -28,7 +31,7 @@ TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
 }
 
 # frame ����
-$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
+$ctext_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -47,45 +50,54 @@ $ctext_buttons = TkFrame.new($ctext_demo) {|frame|
 $ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas ����
-$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
+$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
                              'borderwidth'=>0, 'width'=>500, 'height'=>350)
 $ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
 
 # font ����
-textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+if $tk_version =~ /^4.*/
+  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+else
+  textFont = 'Helvetica 24'
+end
 
 # canvas ����
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
+TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
                  'outline'=>'black', 'fill'=>'red')
 
+ctag_text_param = {
+  'text'=>"����ϥ����Х�widget�Υƥ����ȵ�ǽ��ǥ⤹�뤿���ʸ����Ǥ���\n��ǽҤ٤��褦���Խ����ǽ�Ȥ��뤿��ΥХ���ǥ��󥰤�ܤ��Ƥ��ޤ���",
+  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
+}
+if $tk_version =~ /^4.*/
+  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+  ctag_text_param['kanjifont'] = '-*-r-*--24-*-jisx0208.1983-0'
+else
+  ctag_text_param['font'] = 'Helvetica 24'
+end
 $ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
-                               'text'=>"����ϥ����Х�widget�Υƥ����ȵ�ǽ��ǥ⤹�뤿���ʸ����Ǥ���\n��ǽҤ٤��褦���Խ����ǽ�Ȥ��뤿��ΥХ���ǥ��󥰤�ܤ��Ƥ��ޤ���",
-                               'width'=>440, 'anchor'=>'n', 
-                               'font'=>'-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*', 
-                               'kanjifont'=>'-*-r-*--24-*-jisx0208.1983-0', 
-                               'justify'=>'left') )
+$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
 
 $ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
 $ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1', 
-        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"}, 
+$ctag_text.bind('Shift-1',
+        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
         "%x %y")
-$ctag_text.bind('Shift-B1-Motion', 
+$ctag_text.bind('Shift-B1-Motion',
                 proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
 $ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
 $ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
 $ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
 $ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
 $ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"}, 
+$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
                 "%x %y")
 
-# Next, create some items that allow the text's anchor position 
+# Next, create some items that allow the text's anchor position
 # to be edited.
 
 def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30, 
+  item = TkcRectangle.new(w, x, y, x+30, y+30,
                           'outline'=>'black', 'fill'=>color, 'width'=>1)
   item.bind('1', proc{$ctag_text.configure option, value})
   w.addtag_withtag('config', item)
@@ -103,12 +115,17 @@ mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
 mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
 mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
 mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50, 
+item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
                         'outline'=>'black', 'fill'=>'red')
 item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 'anchor'=>'s', 
-            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-            'fill'=>'brown')
+if $tk_version =~ /^4.*/
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+              'anchor'=>'s', 'fill'=>'brown')
+else
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
+end
 
 # Lastly, create some items that allow the text's justification to be
 # changed.
@@ -119,14 +136,19 @@ color = 'SeaGreen2'
 mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
 mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
 mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 'anchor'=>'s', 
-            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-            'fill'=>'brown')
+if $tk_version =~ /^4.*/
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+              'anchor'=>'s', 'fill'=>'brown')
+else
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
+end
 
 $ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave', 
+$ctext_canvas.itembind('config', 'Leave',
                        proc{$ctext_canvas\
-                             .itemconfigure('current', 
+                             .itemconfigure('current',
                                             'fill'=>$textConfigFill)})
 
 $textConfigFill = ''
diff --git a/ext/tk/sample/demos-jp/dialog1.rb b/ext/tk/sample/demos-jp/dialog1.rb
index 0d6181bfc6..07e50306ab 100644
--- a/ext/tk/sample/demos-jp/dialog1.rb
+++ b/ext/tk/sample/demos-jp/dialog1.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # a dialog box with a local grab (called by 'widget')
 #
diff --git a/ext/tk/sample/demos-jp/dialog2.rb b/ext/tk/sample/demos-jp/dialog2.rb
index a934378dda..f747f8d6a8 100644
--- a/ext/tk/sample/demos-jp/dialog2.rb
+++ b/ext/tk/sample/demos-jp/dialog2.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # a dialog box with a global grab (called by 'widget')
 #
diff --git a/ext/tk/sample/demos-jp/entry1.rb b/ext/tk/sample/demos-jp/entry1.rb
index edf3b5f71d..eb71e87aec 100644
--- a/ext/tk/sample/demos-jp/entry1.rb
+++ b/ext/tk/sample/demos-jp/entry1.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # entry (no scrollbars) widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy 
+  $entry1_demo.destroy
   $entry1_demo = nil
 end
 
@@ -15,8 +16,10 @@ $entry1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($entry1_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($entry1_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($entry1_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -43,9 +46,9 @@ TkFrame.new($entry1_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # entry ����
-e1 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e2 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e3 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
+e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
+e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
 [e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
 
 # ���������
diff --git a/ext/tk/sample/demos-jp/entry2.rb b/ext/tk/sample/demos-jp/entry2.rb
index 7d5740e663..b5187ab508 100644
--- a/ext/tk/sample/demos-jp/entry2.rb
+++ b/ext/tk/sample/demos-jp/entry2.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # entry (with scrollbars) widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy 
+  $entry2_demo.destroy
   $entry2_demo = nil
 end
 
@@ -15,8 +16,10 @@ $entry2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($entry2_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($entry2_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($entry2_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -43,7 +46,7 @@ TkFrame.new($entry2_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
-TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
+TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   # entry 1
   s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
   e1 = TkEntry.new(w, 'relief'=>'sunken') {
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
index f57dc13553..2728de0b93 100644
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ b/ext/tk/sample/demos-jp/entry3.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 # entry3.rb --
 #
 # This demonstration script creates several entry widgets whose
@@ -7,7 +8,7 @@
 # based on Tcl/Tk8.4.4 widget demos
 
 if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy 
+  $entry3_demo.destroy
   $entry3_demo = nil
 end
 
@@ -17,8 +18,10 @@ $entry3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($entry3_demo, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'5i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 �ʲ��ˤϣ�����Υ���ȥ�ܥå�����ɽ������Ƥ��ޤ����ƥ���ȥ�ܥå����ϡ�\
 �ޥ�������å�������ʸ�����Ǥ����ळ�Ȥ���ǽ�Ǥ��������줾�줬�ɤΤ褦��\
@@ -38,7 +41,7 @@ TkLabel.new($entry3_demo,
 ���Ϥ��줿ʸ���ϥ������ꥹ��������֤�������ɽ������ޤ���
 EOL
 
-TkFrame.new($entry3_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
@@ -64,24 +67,42 @@ TkFrame.new($entry3_demo){|f|
 # count -       Counter to control the number of times flashed
 def focusAndFlash(widget, fg, bg, count=5)
   return if count <= 0
-  TkTimer.new(100, count, 
-              proc{widget.configure(:foreground=>bg, :background=>fg)}, 
-              proc{widget.configure(:foreground=>fg, :background=>bg)}
-              ).start
+  if fg && !fg.empty? && bg && !bg.empty?
+    TkTimer.new(200, count,
+                proc{widget.configure(:foreground=>bg, :background=>fg)},
+                proc{widget.configure(:foreground=>fg, :background=>bg)}
+                ).start
+  else
+    # TkTimer.new(150, 3){Tk.bell}.start
+    Tk.bell
+    TkTimer.new(200, count,
+                proc{widget.configure(:foreground=>'white',
+                                      :background=>'black')},
+                proc{widget.configure(:foreground=>'black',
+                                      :background=>'white')}
+                ).at_end{begin
+                           widget.configure(:foreground=>fg,
+                                            :background=>bg)
+                         rescue
+                           # ignore
+                         end}.start
+  end
   widget.focus(true)
 end
 
-l1 = TkLabelFrame.new($entry3_demo, :text=>"��������ȥ�")
-TkEntry.new(l1, :validate=>:focus, 
+l1 = TkLabelFrame.new(base_frame, :text=>"��������ȥ�")
+TkEntry.new(l1, :validate=>:focus,
             :vcmd=>[
               proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
             ]) {|e|
-  invalidcommand [proc{|w| focusAndFlash(w, e.fg, e.bg)}, '%W']
+  fg = e.foreground
+  bg = e.background
+  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
   pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 }
 
-l2 = TkLabelFrame.new($entry3_demo, :text=>"Ĺ�������դ�����ȥ�")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell}, 
+l2 = TkLabelFrame.new(base_frame, :text=>"Ĺ�������դ�����ȥ�")
+TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
             :vcmd=>[proc{|s| s.length < 10}, '%P']
             ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 
@@ -155,25 +176,25 @@ end
 
 def validatePhoneChange(widget, vmode, idx, char)
   return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode, 
+  Tk.after_idle(proc{widget.configure(:validate=>vmode,
                                       :invcmd=>proc{Tk.bell})})
   if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
     widget.delete(idx)
     widget.insert(idx, $phoneNumberMap[char] || char)
     Tk.after_idle(proc{phoneSkipRight(widget, -1)})
-    # Tk.update(true) # Don't work 'update' inter validation callback.
-                      # It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1). 
+    # Tk.update(true)  # <- Don't work 'update' inter validation callback.
+                       #    It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
     return true
   end
   return false
 end
 
 
-l3 = TkLabelFrame.new($entry3_demo, :text=>"�ƹ������ֹ楨��ȥ�")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell}, 
-            :textvariable=>entry3content, 
+l3 = TkLabelFrame.new(base_frame, :text=>"�ƹ������ֹ楨��ȥ�")
+TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
+            :textvariable=>entry3content,
             :vcmd=>[
-              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)}, 
+              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
               "%W %v %i %S"
             ]){|e|
   # Click to focus goes to the first editable character...
@@ -188,14 +209,14 @@ TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
   pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 }
 
-l4 = TkLabelFrame.new($entry3_demo, :text=>"�ѥ���ɥ���ȥ�")
-TkEntry.new(l4, :validate=>:key, :show=>'*', 
+l4 = TkLabelFrame.new(base_frame, :text=>"�ѥ���ɥ���ȥ�")
+TkEntry.new(l4, :validate=>:key, :show=>'*',
             :vcmd=>[
-              proc{|s| s.length <= 8}, 
+              proc{|s| s.length <= 8},
               '%P'
             ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 
-TkFrame.new($entry3_demo){|f|
+TkFrame.new(base_frame){|f|
   lower
   TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
   TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
diff --git a/ext/tk/sample/demos-jp/filebox.rb b/ext/tk/sample/demos-jp/filebox.rb
index f3608ab70f..ffe5fbc5c6 100644
--- a/ext/tk/sample/demos-jp/filebox.rb
+++ b/ext/tk/sample/demos-jp/filebox.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # widget demo prompts the user to select a file (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($filebox_demo) && $entry2_demo
-  $filebox_demo.destroy 
+  $filebox_demo.destroy
   $filebox_demo = nil
 end
 
@@ -15,12 +16,14 @@ $filebox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($filebox_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
             'text'=>"����ȥ�˥ե�����̾��ľ�����Ϥ��뤫��\"Browse\" �ܥ���򲡤��ƥե����������������������ե�����̾������ǲ�������").pack('side'=>'top')
 
 # frame ����
-TkFrame.new($filebox_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -39,15 +42,15 @@ TkFrame.new($filebox_demo) {|frame|
 
 # frame ����
 ['����', '��¸'].each{|type|
-  TkFrame.new($filebox_demo) {|f|
+  TkFrame.new(base_frame) {|f|
     TkLabel.new(f, 'text'=>"�ե������#{type}: ", 'anchor'=>'e')\
     .pack('side'=>'left')
 
     TkEntry.new(f, 'width'=>20) {|e|
       pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
 
-      TkButton.new(f, 'text'=>'Browse ...', 
-                   'command'=>proc{fileDialog $filebox_demo,e,type})\
+      TkButton.new(f, 'text'=>'Browse ...',
+                   'command'=>proc{fileDialog base_frame,e,type})\
       .pack('side'=>'left')
     }
 
@@ -57,9 +60,9 @@ TkFrame.new($filebox_demo) {|frame|
 
 $tk_strictMotif = TkVarAccess.new('tk_strictMotif')
 if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new($filebox_demo, 
-                    'text'=>'Motif��������Υ������������Ѥ���', 
-                    'variable'=>$tk_strictMotif, 
+  TkCheckButton.new(base_frame,
+                    'text'=>'Motif��������Υ������������Ѥ���',
+                    'variable'=>$tk_strictMotif,
                     'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
 end
 
@@ -68,29 +71,32 @@ def fileDialog(w,ent,operation)
   #
   #--------------------------------------------------------
   types = [
-    ['Text files',       ['.txt','.doc']          ], 
-    ['Text files',       [],                      'TEXT' ], 
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ], 
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ], 
-    ['C Source Files',   ['.c','.h']              ], 
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ], 
-    ['Image Files',      ['.gif']                 ], 
-    ['Image Files',      ['.jpeg','.jpg']         ], 
-    ['Image Files',      [],                      ['GIFF','JPEG']], 
+    ['Text files',       ['.txt','.doc']          ],
+    ['Text files',       [],                      'TEXT' ],
+    ['Ruby Scripts',     ['.rb'],                 'TEXT' ],
+    ['Tcl Scripts',      ['.tcl'],                'TEXT' ],
+    ['C Source Files',   ['.c','.h']              ],
+    ['All Source Files', ['.rb','.tcl','.c','.h'] ],
+    ['Image Files',      ['.gif']                 ],
+    ['Image Files',      ['.jpeg','.jpg']         ],
+    ['Image Files',      [],                      ['GIFF','JPEG']],
     ['All files',        '*'                      ]
   ]
 
   if operation == '����'
     file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
   else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
-                          'initialfile'=>'Untitled', 
+    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
+                          'initialfile'=>'Untitled',
                           'defaultextension'=>'.txt')
   end
   if file != ""
     ent.delete 0, 'end'
     ent.insert 0, file
-    ent.xview 'end'
+    # ent.xview 'end'
+    Tk.update_idletasks # need this for Tk::Tile::Entry
+                        # (to find right position of 'xview').
+    ent.xview(ent.index('end'))
   end
 end
 
diff --git a/ext/tk/sample/demos-jp/floor.rb b/ext/tk/sample/demos-jp/floor.rb
index b029580bd6..78cc23a245 100644
--- a/ext/tk/sample/demos-jp/floor.rb
+++ b/ext/tk/sample/demos-jp/floor.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # floorDisplay widget demo (called by 'widget')
 #
@@ -17,7 +18,7 @@ def floorDisplay(w,active)
   w.delete('all')
   $activeFloor = active
 
-  # First go through the three floors, displaying the backgrounds for 
+  # First go through the three floors, displaying the backgrounds for
   # each floor.
 
   floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
@@ -28,12 +29,12 @@ def floorDisplay(w,active)
 
   w.raise("floor#{active}")
 
-  # Create a dummy item just to mark this point in the display list, 
+  # Create a dummy item just to mark this point in the display list,
   # so we can insert highlights here.
 
   TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
 
-  # Add the walls and labels for the active floor, along with 
+  # Add the walls and labels for the active floor, along with
   # transparent polygons that define the rooms on the floor.
   # Make sure that the room polygons are on top.
 
@@ -298,7 +299,7 @@ def floor_bg3(w,fill,outline)
   TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
   TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
   TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300, 
+  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
               'fill'=>outline, 'tags'=>['floor3','bg'])
 end
 
@@ -312,316 +313,316 @@ end
 # color -       Color to use for drawing foreground information.
 
 def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '101'
   $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color, 
+  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Pub Lift1'
   $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Priv Lift1'
   $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '110'
   $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color, 
+  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '109'
   $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color, 
+  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '111'
   $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '117B'
   $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '112'
   $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '113'
   $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '117A'
   $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color, 
+  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '117'
   $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color, 
+  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '114'
   $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color, 
+  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '115'
   $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color, 
+  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '116'
   $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color, 
+  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '118'
   $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color, 
+  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128, 
+                     163,91,163,112,149,112,149,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '120'
   $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246, 
+                     156,192,156,169,175,169,175,246,79,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '122'
   $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color, 
+  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '121'
   $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color, 
+  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '106A'
   $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '105'
   $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '106B'
   $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color, 
+  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '104'
   $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color, 
+  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '108'
   $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color, 
+  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '107'
   $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color, 
+  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Smoking'
   $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color, 
+  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '123'
   $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '103'
   $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color, 
+  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '124'
   $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color, 
+  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '125'
   $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color, 
+  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '126'
   $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209, 
+                     486,253,486,239,474,239,474,209,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '127'
   $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color, 
+  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164, 
+                     490,188,490,204,476,204,476,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'MShower'
   $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Closet'
   $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'WShower'
   $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
                      697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161, 
+                     515,174,503,174,503,161,486,161,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '130'
   $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color, 
+  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
                      342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248, 
+                     393,309,300,309,300,248,308,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '102'
   $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '128'
   $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
                      552,277,561,277,561,325,510,325,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '129'
   $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color, 
+  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277, 
+                     642,389,561,389,561,277,696,277,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '133'
   $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color, 
+  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '132'
   $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color, 
+  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '134'
   $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color, 
+  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '135'
   $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color, 
+  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
                      304,312,396,312,396,288,400,288,404,288,
                      409,290,413,292,418,297,421,302,422,309,
                      421,318,417,325,411,330,405,332,397,333,
                      344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359, 
+                     331,347,332,351,334,354,336,357,341,359,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Ramona Stair'
   $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'University Stair'
   $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
                      358,48,363,39,365,29,348,25,335,22,321,14,
                      300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34, 
+                     227,13,223,17,221,22,220,34,260,34,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Plaza Stair'
   $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
                      323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128, 
+                     386,104,386,128,220,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = 'Plaza Deck'
   $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '106'
   $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
                      95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     112,130,97,130,97,168,175,168,175,131,146,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels[i.id] = '119'
   $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color, 
+  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
   TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -794,321 +795,321 @@ end
 
 def floor_fg2(w,color)
   i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168, 
+                     800,222,800,168,748,168,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '238'
   $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color, 
+  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '237'
   $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color, 
+  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
                      643,324,643,291,641,291,641,205,696,205,
                      696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187, 
+                     715,205,755,205,755,190,724,190,724,187,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '246'
   $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color, 
+  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '247'
   $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
                      397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     559,274,482,274,482,278,396,278,396,274,232,274,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '202'
   $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color, 
+  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
                      306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228, 
+                     156,196,176,196,176,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '206'
   $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color, 
+  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '212'
   $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '245'
   $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '244'
   $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '243'
   $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color, 
+  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '242'
   $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = 'Barbecue Deck'
   $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '240'
   $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color, 
+  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '241'
   $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color, 
+  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '239'
   $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color, 
+  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '248'
   $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color, 
+  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '236'
   $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color, 
+  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '235'
   $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color, 
+  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185, 
+                     572,143,579,143,579,185,626,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '234'
   $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color, 
+  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131, 
+                     578,185,527,185,527,131,557,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '233'
   $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color, 
+  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '230'
   $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color, 
+  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '232'
   $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color, 
+  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '229'
   $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color, 
+  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '227'
   $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '228'
   $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color, 
+  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '226'
   $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color, 
+  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '225'
   $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color, 
+  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '224'
   $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color, 
+  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '223'
   $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color, 
+  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '222'
   $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color, 
+  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '221'
   $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color, 
+  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '204'
   $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color, 
+  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '205'
   $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color, 
+  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '207'
   $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color, 
+  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '208'
   $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color, 
+  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '209'
   $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '217'
   $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color, 
+  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '217A'
   $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color, 
+  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '216'
   $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color, 
+  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '215'
   $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color, 
+  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '214'
   $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '213'
   $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color, 
+  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '210'
   $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '211'
   $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color, 
+  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '203'
   $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169, 
+                     154,198,154,192,109,192,109,169,99,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '220'
   $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = 'Priv Lift2'
   $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = 'Pub Lift 2'
   $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '218'
   $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color, 
+  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '219'
   $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color, 
+  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels[i.id] = '201'
   $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color, 
+  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
   TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1279,206 +1280,206 @@ def floor_fg3(w,color)
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '316'
   $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color, 
+  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '309'
   $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '308'
   $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '307'
   $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color, 
+  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '305'
   $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '324B'
   $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color, 
+  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '324A'
   $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '320'
   $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color, 
+  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '310'
   $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '312'
   $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color, 
+  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '313'
   $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color, 
+  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '314'
   $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '315'
   $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color, 
+  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '316B'
   $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color, 
+  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '316A'
   $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color, 
+  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179, 
+                     174,198,174,226,101,226,101,179,97,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '319'
   $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color, 
+  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '311'
   $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color, 
+  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '318'
   $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color, 
+  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '317'
   $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color, 
+  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '323'
   $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color, 
+  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '325'
   $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color, 
+  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '321'
   $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color, 
+  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135, 
+                     264,181,264,135,314,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '322'
   $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = 'Pub Lift3'
   $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = 'Priv Lift3'
   $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '303'
   $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203, 
+                     244,230,244,221,252,221,252,203,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '324'
   $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color, 
+  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '304'
   $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color, 
+  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '301'
   $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color, 
+  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '327'
   $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color, 
+  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '326'
   $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color, 
+  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     375,274,397,274,397,248,339,248,339,242,308,242,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '302'
   $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color, 
+  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
                      272,193,263,180,242,180,175,180,175,169,156,169,
                      156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     107,248,160,248,160,301,107,301,107,275,70,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels[i.id] = '306'
   $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
   TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1573,7 +1574,7 @@ end
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy 
+  $floor_demo.destroy
   $floor_demo = nil
 end
 
@@ -1586,14 +1587,16 @@ $floor_demo = TkToplevel.new {|w|
   minsize(100,100)
 }
 
+base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($floor_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
             'text'=>"���Υ�����ɥ��ˤϥǥ������륨�����åץ��ȼҤΥ���������ꥵ������ܥ�ȥ� (DECWRL) �δּ�꤬�񤫤줿�����Х� widget �����äƤ��ޤ�������� 3�����Ƥǡ���ˤ��Τ�����1��ʬ�����򡢤Ĥޤꤽ�δּ�꤬ɽ�������褦�ˤʤäƤ��ޤ������볬�����򤹤�ˤϡ����ξ�ǥޥ����κ��ܥ���򥯥�å����Ƥ����������ޥ��������򤵤�Ƥ��볬�ξ��ư���ȡ����β��ˤ��������ο����Ѥ�ꡢ�����ֹ椬�������ֹ�:�ץ���ȥ��ɽ������ޤ����ޤ�������ȥ�������ֹ��񤯤Ȥ��������ο����Ѥ��ޤ���"){
   pack('side'=>'top')
 }
 
 # frame ����
-$floor_buttons = TkFrame.new($floor_demo) {|frame|
+$floor_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -1617,17 +1620,17 @@ $floorItems = {}
 
 # canvas ����
 if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new($floor_demo,'bd'=>2,'relief'=>'sunken',
+  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
                                     'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame, 
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+  $floor_canvas = TkCanvas.new($floor_canvas_frame,
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
                                'highlightthickness'=>0) {|c|
-    TkScrollbar.new($floor_demo, 'orient'=>'horiz', 
+    TkScrollbar.new(base_frame, 'orient'=>'horiz',
                     'command'=>proc{|*args| c.xview(*args)}){|hs|
       c.xscrollcommand(proc{|first,last| hs.set first,last})
       pack('side'=>'bottom', 'fill'=>'x')
     }
-    TkScrollbar.new($floor_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
       c.yscrollcommand(proc{|first,last| vs.set first,last})
       pack('side'=>'right', 'fill'=>'y')
     }
@@ -1636,27 +1639,27 @@ if $tk_version =~ /^4\.[01]/
   $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
 else
-  TkFrame.new($floor_demo) {|f|
+  TkFrame.new(base_frame) {|f|
     pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
 
     h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
     v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
 
     TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
-                                   'borderwidth'=>0, 
+      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+                                   'borderwidth'=>0,
                                    'highlightthickness'=>0) {
         xscrollcommand(proc{|first,last| h.set first,last})
         yscrollcommand(proc{|first,last| v.set first,last})
         pack('expand'=>'yes', 'fill'=>'both')
       }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     }
 
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
 
     TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1673,7 +1676,7 @@ end
 # Create an entry for displaying and typing in current room.
 
 $currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
+$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
                            'bd'=>2, 'textvariable'=>$currentRoom)
 
 # Choose colors, then fill in the floorplan.
@@ -1710,7 +1713,7 @@ $floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
 $floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
 $floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
 $floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion', 
+$floor_canvas.bind('B2-Motion',
                    proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
 $floor_canvas.bind('Destroy', proc{$currentRoom.unset})
 $currentRoom.value = ''
diff --git a/ext/tk/sample/demos-jp/floor2.rb b/ext/tk/sample/demos-jp/floor2.rb
index a20b31d45c..92ace6b51a 100644
--- a/ext/tk/sample/demos-jp/floor2.rb
+++ b/ext/tk/sample/demos-jp/floor2.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # floorDisplay widget demo 2 (called by 'widget')
 #
@@ -17,7 +18,7 @@ def floorDisplay2(w,active)
   w.delete('all')
   $activeFloor2 = active
 
-  # First go through the three floors, displaying the backgrounds for 
+  # First go through the three floors, displaying the backgrounds for
   # each floor.
 
   floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
@@ -28,12 +29,12 @@ def floorDisplay2(w,active)
 
   w.raise("floor#{active}")
 
-  # Create a dummy item just to mark this point in the display list, 
+  # Create a dummy item just to mark this point in the display list,
   # so we can insert highlights here.
 
   w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
 
-  # Add the walls and labels for the active floor, along with 
+  # Add the walls and labels for the active floor, along with
   # transparent polygons that define the rooms on the floor.
   # Make sure that the room polygons are on top.
 
@@ -298,7 +299,7 @@ def floor2_bg3(w,fill,outline)
   w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
   w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
   w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300, 
+  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
               'fill'=>outline, 'tags'=>['floor3','bg'])
 end
 
@@ -312,316 +313,316 @@ end
 # color -       Color to use for drawing foreground information.
 
 def floor2_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '101'
   $floorItems2['101'] = i
-  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color, 
+  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Pub Lift1'
   $floorItems2['Pub Lift1'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Priv Lift1'
   $floorItems2['Priv Lift1'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '110'
   $floorItems2['110'] = i
-  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color, 
+  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '109'
   $floorItems2['109'] = i
-  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color, 
+  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '111'
   $floorItems2['111'] = i
-  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '117B'
   $floorItems2['117B'] = i
-  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '112'
   $floorItems2['112'] = i
-  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '113'
   $floorItems2['113'] = i
-  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '117A'
   $floorItems2['117A'] = i
-  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color, 
+  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '117'
   $floorItems2['117'] = i
-  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color, 
+  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '114'
   $floorItems2['114'] = i
-  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color, 
+  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '115'
   $floorItems2['115'] = i
-  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color, 
+  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '116'
   $floorItems2['116'] = i
-  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color, 
+  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '118'
   $floorItems2['118'] = i
-  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color, 
+  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128, 
+                     163,91,163,112,149,112,149,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '120'
   $floorItems2['120'] = i
-  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246, 
+                     156,192,156,169,175,169,175,246,79,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '122'
   $floorItems2['122'] = i
-  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color, 
+  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '121'
   $floorItems2['121'] = i
-  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color, 
+  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '106A'
   $floorItems2['106A'] = i
-  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '105'
   $floorItems2['105'] = i
-  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '106B'
   $floorItems2['106B'] = i
-  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color, 
+  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '104'
   $floorItems2['104'] = i
-  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color, 
+  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '108'
   $floorItems2['108'] = i
-  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color, 
+  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '107'
   $floorItems2['107'] = i
-  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color, 
+  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Smoking'
   $floorItems2['Smoking'] = i
-  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color, 
+  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '123'
   $floorItems2['123'] = i
-  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '103'
   $floorItems2['103'] = i
-  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color, 
+  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '124'
   $floorItems2['124'] = i
-  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color, 
+  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '125'
   $floorItems2['125'] = i
-  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color, 
+  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '126'
   $floorItems2['126'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209, 
+                     486,253,486,239,474,239,474,209,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '127'
   $floorItems2['127'] = i
-  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color, 
+  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164, 
+                     490,188,490,204,476,204,476,164,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'MShower'
   $floorItems2['MShower'] = i
-  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Closet'
   $floorItems2['Closet'] = i
-  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'WShower'
   $floorItems2['WShower'] = i
-  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
                      697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161, 
+                     515,174,503,174,503,161,486,161,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '130'
   $floorItems2['130'] = i
-  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color, 
+  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
                      342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248, 
+                     393,309,300,309,300,248,308,248,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '102'
   $floorItems2['102'] = i
-  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '128'
   $floorItems2['128'] = i
-  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
                      552,277,561,277,561,325,510,325,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '129'
   $floorItems2['129'] = i
-  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color, 
+  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277, 
+                     642,389,561,389,561,277,696,277,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '133'
   $floorItems2['133'] = i
-  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color, 
+  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '132'
   $floorItems2['132'] = i
-  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color, 
+  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '134'
   $floorItems2['134'] = i
-  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color, 
+  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '135'
   $floorItems2['135'] = i
-  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color, 
+  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
                      304,312,396,312,396,288,400,288,404,288,
                      409,290,413,292,418,297,421,302,422,309,
                      421,318,417,325,411,330,405,332,397,333,
                      344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359, 
+                     331,347,332,351,334,354,336,357,341,359,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Ramona Stair'
   $floorItems2['Ramona Stair'] = i
-  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'University Stair'
   $floorItems2['University Stair'] = i
-  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
                      358,48,363,39,365,29,348,25,335,22,321,14,
                      300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34, 
+                     227,13,223,17,221,22,220,34,260,34,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Plaza Stair'
   $floorItems2['Plaza Stair'] = i
-  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
                      323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128, 
+                     386,104,386,128,220,128,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = 'Plaza Deck'
   $floorItems2['Plaza Deck'] = i
-  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '106'
   $floorItems2['106'] = i
-  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
                      95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     112,130,97,130,97,168,175,168,175,131,146,131,
                      'fill'=>'', 'tags'=>['floor1','room'])
   $floorLabels2[i.id] = '119'
   $floorItems2['119'] = i
-  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color, 
+  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor1','label'])
   w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
   w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -794,321 +795,321 @@ end
 
 def floor2_fg2(w,color)
   i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168, 
+                     800,222,800,168,748,168,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '238'
   $floorItems2['238'] = i
-  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color, 
+  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '237'
   $floorItems2['237'] = i
-  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color, 
+  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
                      643,324,643,291,641,291,641,205,696,205,
                      696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187, 
+                     715,205,755,205,755,190,724,190,724,187,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '246'
   $floorItems2['246'] = i
-  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color, 
+  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '247'
   $floorItems2['247'] = i
-  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
                      397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     559,274,482,274,482,278,396,278,396,274,232,274,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '202'
   $floorItems2['202'] = i
-  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color, 
+  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
                      306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228, 
+                     156,196,176,196,176,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '206'
   $floorItems2['206'] = i
-  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color, 
+  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '212'
   $floorItems2['212'] = i
-  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '245'
   $floorItems2['245'] = i
-  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '244'
   $floorItems2['244'] = i
-  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '243'
   $floorItems2['243'] = i
-  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color, 
+  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '242'
   $floorItems2['242'] = i
-  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = 'Barbecue Deck'
   $floorItems2['Barbecue Deck'] = i
-  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '240'
   $floorItems2['240'] = i
-  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color, 
+  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '241'
   $floorItems2['241'] = i
-  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color, 
+  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '239'
   $floorItems2['239'] = i
-  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color, 
+  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '248'
   $floorItems2['248'] = i
-  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color, 
+  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '236'
   $floorItems2['236'] = i
-  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color, 
+  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '235'
   $floorItems2['235'] = i
-  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color, 
+  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185, 
+                     572,143,579,143,579,185,626,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '234'
   $floorItems2['234'] = i
-  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color, 
+  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131, 
+                     578,185,527,185,527,131,557,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '233'
   $floorItems2['233'] = i
-  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color, 
+  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '230'
   $floorItems2['230'] = i
-  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color, 
+  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '232'
   $floorItems2['232'] = i
-  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color, 
+  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '229'
   $floorItems2['229'] = i
-  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color, 
+  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '227'
   $floorItems2['227'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '228'
   $floorItems2['228'] = i
-  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color, 
+  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '226'
   $floorItems2['226'] = i
-  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color, 
+  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '225'
   $floorItems2['225'] = i
-  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color, 
+  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '224'
   $floorItems2['224'] = i
-  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color, 
+  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '223'
   $floorItems2['223'] = i
-  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color, 
+  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '222'
   $floorItems2['222'] = i
-  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color, 
+  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '221'
   $floorItems2['221'] = i
-  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color, 
+  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '204'
   $floorItems2['204'] = i
-  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color, 
+  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '205'
   $floorItems2['205'] = i
-  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color, 
+  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '207'
   $floorItems2['207'] = i
-  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color, 
+  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '208'
   $floorItems2['208'] = i
-  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color, 
+  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '209'
   $floorItems2['209'] = i
-  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '217'
   $floorItems2['217'] = i
-  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color, 
+  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '217A'
   $floorItems2['217A'] = i
-  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color, 
+  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '216'
   $floorItems2['216'] = i
-  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color, 
+  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '215'
   $floorItems2['215'] = i
-  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color, 
+  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '214'
   $floorItems2['214'] = i
-  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '213'
   $floorItems2['213'] = i
-  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color, 
+  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '210'
   $floorItems2['210'] = i
-  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '211'
   $floorItems2['211'] = i
-  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color, 
+  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '203'
   $floorItems2['203'] = i
-  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169, 
+                     154,198,154,192,109,192,109,169,99,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '220'
   $floorItems2['220'] = i
-  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = 'Priv Lift2'
   $floorItems2['Priv Lift2'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = 'Pub Lift 2'
   $floorItems2['Pub Lift 2'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '218'
   $floorItems2['218'] = i
-  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color, 
+  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '219'
   $floorItems2['219'] = i
-  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color, 
+  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor2','room'])
   $floorLabels2[i.id] = '201'
   $floorItems2['201'] = i
-  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color, 
+  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor2','label'])
   w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
   w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1279,206 +1280,206 @@ def floor2_fg3(w,color)
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '316'
   $floorItems2['316'] = i
-  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color, 
+  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '309'
   $floorItems2['309'] = i
-  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '308'
   $floorItems2['308'] = i
-  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '307'
   $floorItems2['307'] = i
-  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color, 
+  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '305'
   $floorItems2['305'] = i
-  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '324B'
   $floorItems2['324B'] = i
-  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color, 
+  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '324A'
   $floorItems2['324A'] = i
-  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '320'
   $floorItems2['320'] = i
-  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color, 
+  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '310'
   $floorItems2['310'] = i
-  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '312'
   $floorItems2['312'] = i
-  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color, 
+  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '313'
   $floorItems2['313'] = i
-  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color, 
+  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '314'
   $floorItems2['314'] = i
-  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '315'
   $floorItems2['315'] = i
-  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color, 
+  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '316B'
   $floorItems2['316B'] = i
-  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color, 
+  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '316A'
   $floorItems2['316A'] = i
-  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color, 
+  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179, 
+                     174,198,174,226,101,226,101,179,97,179,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '319'
   $floorItems2['319'] = i
-  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color, 
+  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '311'
   $floorItems2['311'] = i
-  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color, 
+  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '318'
   $floorItems2['318'] = i
-  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color, 
+  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '317'
   $floorItems2['317'] = i
-  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color, 
+  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '323'
   $floorItems2['323'] = i
-  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color, 
+  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '325'
   $floorItems2['325'] = i
-  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color, 
+  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '321'
   $floorItems2['321'] = i
-  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color, 
+  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135, 
+                     264,181,264,135,314,135,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '322'
   $floorItems2['322'] = i
-  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = 'Pub Lift3'
   $floorItems2['Pub Lift3'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = 'Priv Lift3'
   $floorItems2['Priv Lift3'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '303'
   $floorItems2['303'] = i
-  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203, 
+                     244,230,244,221,252,221,252,203,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '324'
   $floorItems2['324'] = i
-  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color, 
+  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '304'
   $floorItems2['304'] = i
-  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color, 
+  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '301'
   $floorItems2['301'] = i
-  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color, 
+  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '327'
   $floorItems2['327'] = i
-  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color, 
+  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '326'
   $floorItems2['326'] = i
-  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color, 
+  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     375,274,397,274,397,248,339,248,339,242,308,242,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '302'
   $floorItems2['302'] = i
-  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color, 
+  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
                      272,193,263,180,242,180,175,180,175,169,156,169,
                      156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     107,248,160,248,160,301,107,301,107,275,70,275,
                      'fill'=>'', 'tags'=>['floor3','room'])
   $floorLabels2[i.id] = '306'
   $floorItems2['306'] = i
-  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
               'anchor'=>'c', 'tags'=>['floor3','label'])
   w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
   w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1573,7 +1574,7 @@ end
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($floor2_demo) && $floor2_demo
-  $floor2_demo.destroy 
+  $floor2_demo.destroy
   $floor2_demo = nil
 end
 
@@ -1586,14 +1587,16 @@ $floor2_demo = TkToplevel.new {|w|
   minsize(100,100)
 }
 
+base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($floor2_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
             'text'=>"���Υ�����ɥ��ˤϥǥ������륨�����åץ��ȼҤΥ���������ꥵ������ܥ�ȥ� (DECWRL) �δּ�꤬�񤫤줿�����Х� widget �����äƤ��ޤ�������� 3�����Ƥǡ���ˤ��Τ�����1��ʬ�����򡢤Ĥޤꤽ�δּ�꤬ɽ�������褦�ˤʤäƤ��ޤ������볬�����򤹤�ˤϡ����ξ�ǥޥ����κ��ܥ���򥯥�å����Ƥ����������ޥ��������򤵤�Ƥ��볬�ξ��ư���ȡ����β��ˤ��������ο����Ѥ�ꡢ�����ֹ椬�������ֹ�:�ץ���ȥ��ɽ������ޤ����ޤ�������ȥ�������ֹ��񤯤Ȥ��������ο����Ѥ��ޤ���"){
   pack('side'=>'top')
 }
 
 # frame ����
-$floor2_buttons = TkFrame.new($floor2_demo) {|frame|
+$floor2_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -1617,17 +1620,17 @@ $floorItems2 = {}
 
 # canvas ����
 if $tk_version =~ /^4\.[01]/
-  $floor2_canvas_frame = TkFrame.new($floor2_demo,'bd'=>2,'relief'=>'sunken',
+  $floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
                                     'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame, 
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+  $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
                                'highlightthickness'=>0) {|c|
-    TkScrollbar.new($floor2_demo, 'orient'=>'horiz', 
+    TkScrollbar.new(base_frame, 'orient'=>'horiz',
                     'command'=>proc{|*args| c.xview(*args)}){|hs|
       c.xscrollcommand(proc{|first,last| hs.set first,last})
       pack('side'=>'bottom', 'fill'=>'x')
     }
-    TkScrollbar.new($floor2_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
       c.yscrollcommand(proc{|first,last| vs.set first,last})
       pack('side'=>'right', 'fill'=>'y')
     }
@@ -1636,27 +1639,27 @@ if $tk_version =~ /^4\.[01]/
   $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
 else
-  TkFrame.new($floor2_demo) {|f|
+  TkFrame.new(base_frame) {|f|
     pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
 
     h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
     v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
 
     TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
-                                   'borderwidth'=>0, 
+      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+                                   'borderwidth'=>0,
                                    'highlightthickness'=>0) {
         xscrollcommand(proc{|first,last| h.set first,last})
         yscrollcommand(proc{|first,last| v.set first,last})
         pack('expand'=>'yes', 'fill'=>'both')
       }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     }
 
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
 
     TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1672,7 +1675,7 @@ end
 # Create an entry for displaying and typing in current room.
 
 $currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken', 
+$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
                            'bd'=>2, 'textvariable'=>$currentRoom2)
 
 # Choose colors, then fill in the floorplan.
@@ -1709,7 +1712,7 @@ $floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
 $floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
 $floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
 $floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion', 
+$floor2_canvas.bind('B2-Motion',
                    proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
 $floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
 $currentRoom2.value = ''
diff --git a/ext/tk/sample/demos-jp/form.rb b/ext/tk/sample/demos-jp/form.rb
index fe456d3943..84ed94de88 100644
--- a/ext/tk/sample/demos-jp/form.rb
+++ b/ext/tk/sample/demos-jp/form.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # form widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($form_demo) && $form_demo
-  $form_demo.destroy 
+  $form_demo.destroy
   $form_demo = nil
 end
 
@@ -15,8 +16,10 @@ $form_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($form_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($form_demo) {
 msg.pack('side'=>'top', 'fill'=>'x')
 
 # frame ����
-TkFrame.new($form_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -45,7 +48,7 @@ TkFrame.new($form_demo) {|frame|
 # entry ����
 form_data = []
 (1..5).each{|i|
-  f = TkFrame.new($form_demo, 'bd'=>2)
+  f = TkFrame.new(base_frame, 'bd'=>2)
   e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
   l = TkLabel.new(f)
   e.pack('side'=>'right')
diff --git a/ext/tk/sample/demos-jp/goldberg.rb b/ext/tk/sample/demos-jp/goldberg.rb
index 592b69f775..ea521b82ec 100644
--- a/ext/tk/sample/demos-jp/goldberg.rb
+++ b/ext/tk/sample/demos-jp/goldberg.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # Ruby/Tk Goldverg demo (called by 'widget')
 #
@@ -43,7 +44,7 @@
 #>># lots of canvas create and move calls.
 
 if defined?($goldberg_demo) && $goldberg_demo
-  $goldberg_demo.destroy 
+  $goldberg_demo.destroy
   $goldberg_demo = nil
 end
 
@@ -54,6 +55,8 @@ $goldberg_demo = TkToplevel.new {|w|
 #  positionWindow(w)
 }
 
+base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
+
 =begin
 # label
 msg = TkLabel.new($goldberg_demo) {
@@ -100,7 +103,7 @@ class TkGoldberg_Demo
     @S['pause']   = TkVariable.new
     @S['details'] = TkVariable.new(true)
 
-    @S['mode'] = TkVariable.new(:MSTART, :symbol) 
+    @S['mode'] = TkVariable.new(:MSTART, :symbol)
     #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
 
     #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
@@ -131,19 +134,19 @@ class TkGoldberg_Demo
     @XY = {}
 
     @XY6 = {
-      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192], 
+      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
       '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
-      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164], 
-      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151], 
-      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219], 
-      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324], 
-      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346], 
-      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391], 
-      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456], 
-      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443], 
-      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437], 
-      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424], 
-      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412], 
+      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
+      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
+      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
+      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
+      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
+      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
+      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
+      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
+      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
+      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
+      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
       '13,15'=>[376, 410], '13,16'=>[360, 403]
     }
 
@@ -160,11 +163,11 @@ class TkGoldberg_Demo
 
   def do_display()
     @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
-    @screen = TkFrame.new(@parent, :bd=>2, 
-                         :relief=>:raised).pack(:side=>:left, :fill=>:both, 
+    @screen = TkFrame.new(@parent, :bd=>2,
+                         :relief=>:raised).pack(:side=>:left, :fill=>:both,
                                                 :expand=>true)
 
-    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700, 
+    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
                           :bg=>@C['bg'], :highlightthickness=>0){
       scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
       yview_moveto(0.05)
@@ -176,7 +179,8 @@ class TkGoldberg_Demo
     do_ctrl_frame
     do_detail_frame
 
-    msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
+    # msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
+    msg = Tk::Label.new(@parent, :bg=>@C['bg'], :fg=>'white') {
       font 'Arial 10'
       wraplength 600
       justify 'left'
@@ -186,7 +190,8 @@ class TkGoldberg_Demo
 
     frame = TkFrame.new(@parent, :bg=>@C['bg'])
 
-    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
       text '�Ĥ���'
       command proc{
         tmppath = $goldberg_demo
@@ -195,12 +200,14 @@ class TkGoldberg_Demo
       }
     }.pack('side'=>'left')
 
-    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
       text '�����ɻ���'
       command proc{showCode 'goldberg'}
     }.pack('side'=>'left', 'padx'=>5)
 
-    @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl}, 
+    # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
+    @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
                          :bg=>@C['bg'], :activebackground=>@C['bg'])
     @show.pack('side'=>'left')
     frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
@@ -209,33 +216,34 @@ class TkGoldberg_Demo
   end
 
   def do_ctrl_frame
-    @start = TkButton.new(@parent, :text=>'Start', :bd=>6, 
+    @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
                           :command=>proc{do_button(0)})
-    @start.font(@start['font'].weight('bold'))
-    font = @start['font']
+    if font = @start['font']
+      @start.font(font.weight('bold'))
+    end
 
-    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font, 
-                               :command=>proc{do_button(1)}, :relief=>:raised, 
+    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
+                               :command=>proc{do_button(1)}, :relief=>:raised,
                                :variable=>@S['pause'])
 
-    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font, 
+    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font,
                           :command=>proc{do_button(2)})
-    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font, 
+    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
                           :command=>proc{do_button(4)})
-    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font, 
+    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
                           :command=>proc{do_button(3)})
 
     @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
-    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font, 
+    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
                                :relief=>:raised, :variable=>@S['details'])
 
-    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'], 
+    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
                              :justify=>:center)
-    @speed_scale = TkScale.new(@parent, :orient=>:horizontal, 
-                               :from=>1, :to=>10, :font=>font, 
-                               :variable=>@S['speed'], :bd=>2, 
+    @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
+                               :from=>1, :to=>10, :font=>font,
+                               :variable=>@S['speed'], :bd=>2,
                                :relief=>:ridge, :showvalue=>false)
-    @about = TkButton.new(@parent, :text=>'About', 
+    @about = TkButton.new(@parent, :text=>'About',
                           :command=>proc{about}, :font=>font)
 
     Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
@@ -263,17 +271,17 @@ class TkGoldberg_Demo
   def do_detail_frame
     @f_details = TkFrame.new(@details)
 
-    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'], 
+    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
                          :bd=>1, :relief=>:solid, :bg=>'white')
     Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
 
     idx = 1
     loop {
       break unless respond_to?("move#{idx}")
-      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e, 
+      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
                       :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
       @STEP[idx] = 0
-      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx), 
+      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
                        :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
       row = (idx + 1)/2
       col = ((idx + 1) & 1) * 2
@@ -377,7 +385,7 @@ class TkGoldberg_Demo
       who = who.to_i
       n = send("move#{who}")
       if (n & 1).nonzero?          # This guy still alive
-        alive << who 
+        alive << who
       end
       if (n & 2).nonzero?          # Next guy is active
         alive << (who + 1)
@@ -410,12 +418,12 @@ class TkGoldberg_Demo
   # START HERE! banner
   def draw0
     color = @C['0']
-    TkcText.new(@canvas, 
-                # [579, 119], :text=>'START HERE!', 
-                [558, 119], :text=>'�������饹�����ȡ�', 
-                :fill=>color, :anchor=>:w, 
+    TkcText.new(@canvas,
+                # [579, 119], :text=>'START HERE!',
+                [558, 119], :text=>'�������饹�����ȡ�',
+                :fill=>color, :anchor=>:w,
                 :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
-    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color, 
+    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
                 :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
     @canvas.itembind('I0', '1'){ start }
   end
@@ -429,7 +437,7 @@ class TkGoldberg_Demo
     end
 
     pos = [
-      [673, 119], [678, 119], [683, 119], [688, 119], 
+      [673, 119], [678, 119], [683, 119], [688, 119],
       [693, 119], [688, 119], [683, 119], [678, 119]
     ]
     step = step % pos.length
@@ -441,15 +449,15 @@ class TkGoldberg_Demo
   def draw1
     color = @C['1a']
     color2 = @C['1b']
-    TkcPolygon.new(@canvas, 
-                   [ 844, 133, 800, 133, 800, 346, 820, 346, 
-                     820, 168, 844, 168, 844, 133 ], 
+    TkcPolygon.new(@canvas,
+                   [ 844, 133, 800, 133, 800, 346, 820, 346,
+                     820, 168, 844, 168, 844, 133 ],
                    :width=>3, :fill=>color, :outline=>'')
-    TkcPolygon.new(@canvas, 
-                   [ 771, 133, 685, 133, 685, 168, 751, 168, 
-                     751, 346, 771, 346, 771, 133 ], 
+    TkcPolygon.new(@canvas,
+                   [ 771, 133, 685, 133, 685, 168, 751, 168,
+                     751, 346, 771, 346, 771, 133 ],
                    :width=>3, :fill=>color, :outline=>'')
-    TkcOval.new(@canvas, box(812, 122, 9), 
+    TkcOval.new(@canvas, box(812, 122, 9),
                 :tag=>'I1', :fill=>color2, :outline=>'')
 
     @canvas.itembind('I1', '1'){ start }
@@ -458,9 +466,9 @@ class TkGoldberg_Demo
   def move1(step = nil)
     step = get_step(1, step)
     pos = [
-      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153], 
-      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438], 
-      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601], 
+      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
+      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
+      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
       [-100, -100]
     ]
     return 0 if step >= pos.length
@@ -476,40 +484,40 @@ class TkGoldberg_Demo
     color = @C['2']
 
     # Fulcrum
-    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392], 
+    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
                    :fill=>@C['fg'], :outline=>@C['fg'])
 
     # Strike box
-    TkcRectangle.new(@canvas, [628, 335, 660, 383], 
+    TkcRectangle.new(@canvas, [628, 335, 660, 383],
                      :fill=>'', :outline=>@C['fg'])
     (0..2).each{|y|
       yy = 335 + y*16
-      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25', 
+      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
                     :anchor=>:nw, :foreground=>@C['fg'])
-      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25', 
+      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
                     :anchor=>:nw, :foreground=>@C['fg'])
     }
 
     # Lever
-    TkcLine.new(@canvas, [702, 366, 798, 366], 
+    TkcLine.new(@canvas, [702, 366, 798, 366],
                 :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
 
     # R strap
-    TkcLine.new(@canvas, [712, 363, 712, 355], 
+    TkcLine.new(@canvas, [712, 363, 712, 355],
                 :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
 
     # L strap
-    TkcLine.new(@canvas, [705, 363, 705, 355], 
+    TkcLine.new(@canvas, [705, 363, 705, 355],
                 :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
 
     # Match stick
-    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356], 
+    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
                 :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
 
     # Match head
-    TkcPolygon.new(@canvas, 
-                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1, 
-                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ], 
+    TkcPolygon.new(@canvas,
+                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
+                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
                    :fill=>color, :outline=>color, :tag=>'I2_4')
   end
 
@@ -519,15 +527,15 @@ class TkGoldberg_Demo
     stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
     xy = []
     xy[0] = [
-      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307, 
+      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
       662, 318, 662, 328, 671, 336
     ]
     xy[1] = [
-      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311, 
+      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
       661, 327, 671, 335
     ]
     xy[2] = [
-      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298, 
+      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
       666, 309, 660, 324, 672, 336
     ]
 
@@ -538,7 +546,7 @@ class TkGoldberg_Demo
 
     if step == 0  # Rotate the match
       beta = 20
-      
+
       ox, oy = anchor('I2_0', :s)  # Where to pivot
 
       i = 0
@@ -563,23 +571,23 @@ class TkGoldberg_Demo
 
     xy = [ [602, 296], [577, 174], [518, 174] ]
     xy.each{|x, y| # 3 Pulleys
-      TkcOval.new(@canvas, box(x, y, 13), 
+      TkcOval.new(@canvas, box(x, y, 13),
                   :fill=>color, :outline=>@C['fg'], :width=>3)
       TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
     }
 
     # Wall to flame
-    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s', 
+    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
                 :width=>3, :fill=>@C['fg'], :smooth=>true)
 
     # Flame to pulley 1
-    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0', 
+    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
                 :width=>3, :fill=>@C['fg'], :smooth=>true)
-    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1', 
+    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
                 :width=>3, :fill=>@C['fg'], :smooth=>true)
 
     # Pulley 1 half way to 2
-    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2', 
+    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
                 :width=>3, :fill=>@C['fg'])
 
     # Pulley 1 other half to 2
@@ -589,26 +597,26 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
 
     # Down to weight
-    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w', 
+    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
                 :width=>3, :fill=>@C['fg'])
 
     # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
     x1, y1, x2, y2 = [515, 207, 495, 207]
-    TkcOval.new(@canvas, box(x1, y1, 6), 
+    TkcOval.new(@canvas, box(x1, y1, 6),
                 :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcOval.new(@canvas, box(x2, y2, 6), 
+    TkcOval.new(@canvas, box(x2, y2, 6),
                 :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6, 
+    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
                      :tag=>'I3_', :fill=>color2, :outline=>color2)
-    
-    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15), 
+
+    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
                    :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
 
-    TkcLine.new(@canvas, [500, 217, 511, 217], 
+    TkcLine.new(@canvas, [500, 217, 511, 217],
                 :tag=>'I3_', :fill=>color2, :width=>10)
 
     # Bottom weight target
-    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465], 
+    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
                 :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
   end
 
@@ -651,7 +659,7 @@ class TkGoldberg_Demo
     }
 
     # Swing gate
-    TkcLine.new(@canvas, [518, 464, 518, 428], 
+    TkcLine.new(@canvas, [518, 464, 518, 428],
                 :tag=>'I4', :fill=>color, :width=>1)
   end
 
@@ -678,7 +686,7 @@ class TkGoldberg_Demo
     TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
 
     xy = [
-      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446, 
+      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
       575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
     ]
     TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
@@ -688,7 +696,7 @@ class TkGoldberg_Demo
 
     xy = box(540, 446, 2)   # Eye
     xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'], 
+    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
                    :outline=>'', :smooth=>true)
 
     xy = [538, 454, 535, 461] # Front leg
@@ -708,9 +716,9 @@ class TkGoldberg_Demo
     step = get_step(5, step)
 
     pos = [
-      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452], 
-      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414], 
-      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294], 
+      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
+      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
+      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
       [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
     ]
 
@@ -731,16 +739,16 @@ class TkGoldberg_Demo
     color = @C['6']
     xy = [324, 130, 391, 204] # Ball holder
     xy = round_rect(xy, 10)
-    TkcPolygon.new(@canvas, xy, :smooth=>true, 
+    TkcPolygon.new(@canvas, xy, :smooth=>true,
                    :outline=>@C['fg'], :width=>3, :fill=>color)
     xy = [339, 204, 376, 253] # Below the ball holder
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
                      :fill=>color, :tag=>'I6c')
     xy = box(346, 339, 28)
     TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
                :start=>80, :extent=>205)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
                :start=>-41, :extent=>85)
 
     xy = box(346, 339, 15) # Center of rotor
@@ -755,10 +763,10 @@ class TkGoldberg_Demo
     TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
 
     xy = [
-      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403, 
+      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
       352, 403, 352, 366
     ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', 
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
                    :width=>2) # Below rotor
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
     xy = box(275, 342, 7) # On/off rotor
@@ -783,7 +791,7 @@ class TkGoldberg_Demo
       loc = -i
       color = colors[i]
       x, y = @XY6["#{loc}"]
-      TkcOval.new(@canvas, box(x, y, 5), 
+      TkcOval.new(@canvas, box(x, y, 5),
                   :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
     }
     draw6a(12) # The wheel
@@ -809,7 +817,7 @@ class TkGoldberg_Demo
       @canvas.move('I6_', -7, 0)
       if step == 1  # Poke a hole
         xy = [348, 226, 365, 240]
-        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill), 
+        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
                          :outline=>'')
       end
       return 1
@@ -849,24 +857,24 @@ class TkGoldberg_Demo
   def draw7
     color = @C['7']
     xy = [198, 306, 277, 374]  # Box
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2, 
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
                      :fill=>color, :tag=>'I7z')
     @canvas.lower('I7z')
     xy = [275, 343, 230, 349]
-    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last, 
+    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
                 :arrowshape=>[23, 23, 8], :width=>6)
     xy = [225, 324]  # On button
     x, y = xy
     TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
     xy = [218, 323]  # On text
     font = ['Times Roman', 8]
-    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e, 
+    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
                 :fill=>@C['fg'], :font=>font)
     xy = [225, 350]  # Off button
     x, y = xy
     TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
     xy = [218, 349]  # Off text
-    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e, 
+    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
                 :fill=>@C['fg'], :font=>font)
   end
 
@@ -911,7 +919,7 @@ class TkGoldberg_Demo
     xy = [280, 209, 296, 248]
     TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
     xy = [
-      288, 249, 252, 249, 260, 240, 280, 234, 
+      288, 249, 252, 249, 260, 240, 280, 234,
       296, 234, 316, 240, 324, 249, 288, 249
     ]
     TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
@@ -920,16 +928,16 @@ class TkGoldberg_Demo
     TkcPolygon.new(@canvas, xy, :fill=>color)
 
     xy = [255, 206, 265, 234]  # Fan blades
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>3, :tag=>'I9_0')
     xy = [255, 176, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>3, :tag=>'I9_0')
     xy = [255, 206, 265, 220]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>1, :tag=>'I9_1')
     xy = [255, 190, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
                 :width=>1, :tag=>'I9_1')
   end
 
@@ -954,17 +962,17 @@ class TkGoldberg_Demo
     color  = @C['10a']
     color2 = @C['10b']
     xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
-    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'], 
+    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
                    :tag=>'I10')
     xy = box(209, 204, 31)  # Front
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
                :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>120, :extent=>120, :tag=>'I10')
     xy = box(249, 204, 31)  # Back
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
                :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>120, :extent=>120, :tag=>'I10')
 
     xy = [200, 171, 200, 249]  # Mast
@@ -984,10 +992,10 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
 
     xy = box(239, 262, 17)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>95, :extent=>103)
     xy = box(76, 266, 21)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :extent=>190)
   end
 
@@ -995,9 +1003,9 @@ class TkGoldberg_Demo
     step = get_step(10, step)
 
     pos = [
-      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212], 
-      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212], 
-      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212], 
+      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
+      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
+      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
       [116, 212], [111, 212]
     ]
 
@@ -1024,21 +1032,21 @@ class TkGoldberg_Demo
     xy = [55, 504, 55, 591]  # Bottom right side
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
     xy = box(71, 460, 48)    # Outer loop
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>110, :extent=>-290, :tag=>'I11i')
     xy = box(71, 460, 16)    # Inner loop
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'', 
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
                 :width=>3, :tag=>'I11i')
     TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
 
     xy = [23, 264, 23, 591]  # Left side
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
     xy = box(1, 266, 23)     # Top left curve
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
                :style=>:arc, :extent=>90)
 
     xy = box(75, 235, 9)     # The ball
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'', 
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
                 :width=>3, :tag=>'I11')
   end
 
@@ -1046,8 +1054,8 @@ class TkGoldberg_Demo
     step = get_step(11, step)
 
     pos = [
-      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266], 
-      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472], 
+      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
+      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
       [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
     ]
 
@@ -1061,11 +1069,11 @@ class TkGoldberg_Demo
   # Hand
   def draw12
     xy = [
-      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590, 
+      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
       60, 590, 60, 610, 60, 610
     ]
     xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
-    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669, 
+    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
                 56, 669, 50, 669, 50, 662, 50, 637])
 
     y0 = 637  # Bumps for fingers
@@ -1075,7 +1083,7 @@ class TkGoldberg_Demo
       x2 = x - 10
       xy << x << y0 << x1 << y1 << x2 << y0
     }
-    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'], 
+    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
                    :smooth=>true, :tag=>'I12', :width=>3)
   end
 
@@ -1099,25 +1107,25 @@ class TkGoldberg_Demo
     ]
     radii = [2, 9, 9, 8, 5, 5, 2]
 
-    round_poly(@canvas, xy, radii, :width=>3, 
+    round_poly(@canvas, xy, radii, :width=>3,
                :outline=>@C['fg'], :fill=>color)
-    round_poly(@canvas, xy2, radii, :width=>3, 
+    round_poly(@canvas, xy2, radii, :width=>3,
                :outline=>@C['fg'], :fill=>color)
 
     xy = [56, 677]
     x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
                      :width=>3, :tag=>'I13')
     xy = [809, 677]
     x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
                      :width=>3, :tag=>'I13R')
 
     xy = [112, 687]  # Label
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
                 :font=>['Times Roman', 12, :bold])
     xy = [762, 687]
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
                 :font=>['Times Roman', 12, :bold])
 
     xy = [138, 663, 148, 636, 178, 636]  # Paper guide
@@ -1125,7 +1133,7 @@ class TkGoldberg_Demo
     xy = [732, 663, 722, 636, 692, 636]
     TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
 
-    sine([149, 688, 720, 688], 5, 15, 
+    sine([149, 688, 720, 688], 5, 15,
          :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
   end
 
@@ -1155,17 +1163,17 @@ class TkGoldberg_Demo
   def draw14
     color = @C['14']
     xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14L_0')
     xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14L_1')
     draw14a('L')
 
     xy = [
       768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
     ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14R_0')
     @canvas.lower('I14R_0')
     # NB. these numbers are VERY sensitive, you must start with final size
@@ -1173,7 +1181,7 @@ class TkGoldberg_Demo
     xy = [
       745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
     ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
                 :width=>3, :tag=>'I14R_1')
     @canvas.lower('I14R_1')
   end
@@ -1186,11 +1194,11 @@ class TkGoldberg_Demo
     x3, y3, x4, y4, x5, y5 = xy2
 
     zz = [
-      x0, y0, x0, y0, xy, x2, y2, x2, y2, 
+      x0, y0, x0, y0, xy, x2, y2, x2, y2,
       x3, y3, x3, y3, xy2, x5, y5, x5, y5
     ].flatten
     @canvas.delete("I14#{side}")
-    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true, 
+    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
                    :fill=>color, :outline=>color, :width=>3)
     @canvas.lower("I14#{side}")
   end
@@ -1243,7 +1251,7 @@ class TkGoldberg_Demo
     xy = [765, 557, 784, 583]
     TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
 
-    sine([658, 580, 765, 580], 3, 15, 
+    sine([658, 580, 765, 580], 3, 15,
          :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
   end
 
@@ -1282,7 +1290,7 @@ class TkGoldberg_Demo
     xy = [722, 485, 791, 556]
     TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
     xy = box(752, 515, 25)  # Bell
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black', 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
                 :tag=>'I16b', :width=>2)
     xy = box(752, 515, 5)   # Bell button
     TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
@@ -1321,24 +1329,24 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
 
     xy = [664, 523, 717, 549]  # Body
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
                :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
 
     xy = [709, 554, 690, 543]  # Paw
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
                 :width=>3, :tag=>'I17')
     xy = [657, 544, 676, 555]
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
                 :width=>3, :tag=>'I17')
 
     xy = box(660, 535, 15)     # Lower face
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
                :start=>150, :extent=>240, :tag=>'I17_')
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
     xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1, 
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
                    :tag=>['I17_', 'I17_c'])
     xy = [652, 542, 628, 539]  # Whiskers
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
@@ -1348,23 +1356,23 @@ class TkGoldberg_Demo
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
 
     xy = [668, 543, 687, 538]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                 :tag=>['I17_', 'I17_w'])
     xy = [668, 544, 688, 546]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                 :tag=>['I17_', 'I17_w'])
     xy = [668, 547, 688, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                 :tag=>['I17_', 'I17_w'])
 
     xy = [649, 530, 654, 538, 659, 530]  # Left eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
                 :smooth=>true, :tag=>'I17')
     xy = [671, 530, 666, 538, 661, 530]  # Right eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
                 :smooth=>true, :tag=>'I17')
     xy = [655, 543, 660, 551, 665, 543]  # Mouth
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
                 :smooth=>true, :tag=>'I17')
   end
 
@@ -1377,10 +1385,10 @@ class TkGoldberg_Demo
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                   :smooth=>true, :tag=>'I17_')
       xy = box(654, 530, 4)  # Left eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
                   :tag=>'I17_')
       xy = box(666, 530, 4)  # Right eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
                   :tag=>'I17_')
 
       @canvas.move('I17_', 0, -20) # Move face up
@@ -1390,19 +1398,19 @@ class TkGoldberg_Demo
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
 
       xy = [ # Body
-        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525, 
-        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527, 
+        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
+        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
         668, 527, 668, 527, 675, 522, 676, 517, 677, 512
       ]
-      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill), 
-                     :outline=>@C['fg'], :width=>3, :smooth=>true, 
+      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
+                     :outline=>@C['fg'], :width=>3, :smooth=>true,
                      :tag=>'I17_')
       xy = [716, 514, 716, 554]  # Back leg
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
       xy = [694, 532, 694, 554]  # 2nd back leg
       TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
       xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
                   :smooth=>true, :tag=>'I17_')
 
       @canvas.raise('I17w')       # Make whiskers visible
@@ -1431,14 +1439,14 @@ class TkGoldberg_Demo
     step = get_step(18, step)
 
     pos = [
-      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x], 
+      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
       [136, 506], [16, 506], [-100, -100]
     ]
 
     b = []
     b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
     b[1] = [
-      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525, 
+      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
       553, 536, 538, 534, 532, 519, 529, 499
     ]
     b[2] = [
@@ -1469,54 +1477,54 @@ class TkGoldberg_Demo
     color = @C['19']
     xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
     xx.each{|x1, x2|
-      TkcRectangle.new(@canvas, x1, 453, x2, 467, 
+      TkcRectangle.new(@canvas, x1, 453, x2, 467,
                        :fill=>color, :outline=>'', :tag=>'I19')
-      TkcLine.new(@canvas, x1, 453, x2, 453, 
+      TkcLine.new(@canvas, x1, 453, x2, 453,
                   :fill=>@C['fg'], :width=>1) # Pipe top
-      TkcLine.new(@canvas, x1, 467, x2, 467, 
+      TkcLine.new(@canvas, x1, 467, x2, 467,
                   :fill=>@C['fg'], :width=>1) # Pipe bottom
     }
     @canvas.raise('I11i')
 
     xy = box(168, 460, 16)  # Bulge by the joint
     TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
                :start=>21, :extent=>136)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
                :start=>-21, :extent=>-130)
 
     xy = [249, 447, 255, 473]  # First joint 26x6
     TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
 
     xy = box(257, 433, 34)     # Bend up
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:pie, :start=>0, :extent=>-91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>-90)
     xy = box(257, 433, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
                :style=>:pie, :start=>0, :extent=>-92)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>-90)
     xy = box(257, 421, 34)     # Bend left
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:pie, :start=>0, :extent=>91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>90)
     xy = box(257, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
                :style=>:pie, :start=>0, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>0, :extent=>90)
     xy = box(243, 421, 34)     # Bend down
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
                :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>90, :extent=>90)
     xy = box(243, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
                :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
                :style=>:arc, :start=>90, :extent=>90)
 
     xy = [270, 427, 296, 433]  # 2nd joint bottom
@@ -1558,7 +1566,7 @@ class TkGoldberg_Demo
     pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
     freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
     pos = [
-      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40], 
+      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
       [504, 40], [513, 40], [523, 40], [532, 40, :x]
     ]
     return 0 if step >= pos.length
@@ -1575,11 +1583,11 @@ class TkGoldberg_Demo
     color = @C['20']
     @canvas.delete('I20')
 
-    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'], 
+    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
          :width=>3, :fill=>color, :smooth=>true)
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
                 :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
                 :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
     @canvas.move('I20a', 8, 0)
     @canvas.move('I20b', 16, 0)
@@ -1595,18 +1603,18 @@ class TkGoldberg_Demo
 
     xy = [245, 490, 237, 535]  # Right side
     xy2 = [189, 535, 181, 490] # Left side
-    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'', 
+    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
                    :tag=>['I21', 'I21f'])
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
     TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
 
     xy = [182, 486, 244, 498]  # Top
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2, 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
                 :tag=>['I21', 'I21f'])
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2, 
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
                 :tag=>['I21', 'I21t'])
     xy = [189, 532, 237, 540]  # Bottom
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2, 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
                 :tag=>['I21', 'I21b'])
   end
 
@@ -1629,7 +1637,7 @@ class TkGoldberg_Demo
 
     @canvas.itemconfigure('I21b', :fill=>@C['20'])
     @canvas.delete('I21w')
-    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1, 
+    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
                    :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
     @canvas.lower('I21w', 'I21')
     @canvas.raise('I21b')
@@ -1665,21 +1673,21 @@ class TkGoldberg_Demo
     color3 = @C['23c']
 
     xy = [185, 623, 253, 650]  # Block
-    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'], 
+    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
                      :width=>2, :tag=>'I23a')
     xy = [187, 592, 241, 623]  # Balloon
     TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b', 
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
                :style=>:arc, :start=>12, :extent=>336)
     xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
     TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
 
     xy = [285, 611, 250, 603]  # Dart body
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
                 :width=>3, :tag=>'I23d')
     xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
-    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'], 
+    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
                    :width=>3, :tag=>'I23d')
     xy = [249, 607, 268, 607]  # Dart detail
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
@@ -1691,7 +1699,7 @@ class TkGoldberg_Demo
     step = get_step(23, step)
 
     pos = [
-      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607], 
+      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
       [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
     ]
 
@@ -1711,7 +1719,7 @@ class TkGoldberg_Demo
   def draw24
     color = @C['24a']
     xy = [366, 518, 462, 665]  # Balloon
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], 
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
                 :width=>3, :tag=>'I24')
     xy = [414, 666, 414, 729]  # String
     TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
@@ -1720,16 +1728,16 @@ class TkGoldberg_Demo
                    :width=>3, :tag=>'I24')
 
     xy = [387, 567, 390, 549, 404, 542]  # Reflections
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
     xy = [395, 568, 399, 554, 413, 547]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
     xy = [403, 570, 396, 555, 381, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
     xy = [408, 564, 402, 547, 386, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
                 :width=>2, :tag=>'I24')
   end
 
@@ -1742,16 +1750,16 @@ class TkGoldberg_Demo
     if step == 0
       @canvas.delete('I24')  # Exploding balloon
       xy = [
-        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594, 
-        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738, 
-        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613, 
-        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508, 
+        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
+        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
+        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
+        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
         431, 441, 431, 440, 400, 502, 347, 465, 347, 465
       ]
-      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'], 
+      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
                      :outline=>@C['24a'], :width=>10, :smooth=>true)
       msg = Tk.subst(@S['message'].value)
-      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'], 
+      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
                   :justify=>:center, :font=>['Times Roman', 18, :bold])
       return 1
     end
@@ -1782,9 +1790,9 @@ class TkGoldberg_Demo
 
     if step >= 3
       @canvas.delete('I24', 'I26')
-      TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26', 
-                  #:text=>'click to continue', 
-                  :text=>'����å��ǥꥻ�åȤ��ޤ�', 
+      TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26',
+                  #:text=>'click to continue',
+                  :text=>'����å��ǥꥻ�åȤ��ޤ�',
                   :font=>['Times Roman', 20, :bold])
       @canvas.bind('1', proc{reset})
       return 4
@@ -1964,11 +1972,11 @@ class TkGoldberg_Demo
 
   def sparkle(oxy, tag)
     xy = [
-      [299, 283], [298, 302], [295, 314], [271, 331], 
+      [299, 283], [298, 302], [295, 314], [271, 331],
       [239, 310], [242, 292], [256, 274], [281, 273]
     ]
     xy.each{|x, y|
-      TkcLine.new(@canvas, 271, 304, x, y, 
+      TkcLine.new(@canvas, 271, 304, x, y,
                   :fill=>'white', :width=>3, :tag=>tag)
     }
     move_abs(tag, oxy)
@@ -2000,4 +2008,4 @@ class TkGoldberg_Demo
   end
 end
 
-TkGoldberg_Demo.new($goldberg_demo)
+TkGoldberg_Demo.new(base_frame)
diff --git a/ext/tk/sample/demos-jp/hello b/ext/tk/sample/demos-jp/hello
index 859ebd950e..08f154d499 100644
--- a/ext/tk/sample/demos-jp/hello
+++ b/ext/tk/sample/demos-jp/hello
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: euc-jp -*-
 require 'tk'
 
 TkButton.new(nil,
diff --git a/ext/tk/sample/demos-jp/hscale.rb b/ext/tk/sample/demos-jp/hscale.rb
index 37d215435c..5615aa50bd 100644
--- a/ext/tk/sample/demos-jp/hscale.rb
+++ b/ext/tk/sample/demos-jp/hscale.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 require "tkcanvas"
 
 if defined?($hscale_demo) && $hscale_deom
@@ -11,8 +12,9 @@ $hscale_demo = TkToplevel.new {|w|
 }
 positionWindow($hscale_demo)
 
+base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
 
-msg = TkLabel.new($hscale_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -22,7 +24,7 @@ msg = TkLabel.new($hscale_demo) {
 }
 msg.pack('side'=>'top')
 
-TkFrame.new($hscale_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -39,7 +41,17 @@ TkFrame.new($hscale_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-TkFrame.new($hscale_demo) {|frame|
+def setWidth(w, width)
+  width = width + 21
+  x2 = width - 30
+  if x2 < 21
+    x2 = 21
+  end
+  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+end
+
+TkFrame.new(base_frame) {|frame|
   canvas = TkCanvas.new(frame) {|c|
     width 50
     height 50
@@ -64,14 +76,3 @@ TkFrame.new($hscale_demo) {|frame|
   }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
   scale.set 75
 }.pack('side'=>'top', 'fill'=>'x')
-
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
diff --git a/ext/tk/sample/demos-jp/icon.rb b/ext/tk/sample/demos-jp/icon.rb
index e4fef5cae7..935519435b 100644
--- a/ext/tk/sample/demos-jp/icon.rb
+++ b/ext/tk/sample/demos-jp/icon.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # iconic button widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy 
+  $icon_demo.destroy
   $icon_demo = nil
 end
 
@@ -15,8 +16,10 @@ $icon_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($icon_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($icon_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($icon_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -60,16 +63,18 @@ TkBitmapImage.new('file'=>[$demo_dir,'..',
 letters = TkVariable.new
 
 # frame ����
-TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
+TkFrame.new(base_frame, 'borderwidth'=>10){|w|
   TkFrame.new(w) {|f|
-    TkRadioButton.new(f){
+    # TkRadioButton.new(f){
+    Tk::RadioButton.new(f){
       bitmap '@' + [$demo_dir,'..',
                      'images','letters.xbm'].join(File::Separator)
       variable letters
       value 'full'
     }.pack('side'=>'top', 'expand'=>'yes')
 
-    TkRadioButton.new(f){
+    # TkRadioButton.new(f){
+    Tk::RadioButton.new(f){
       bitmap '@' + [$demo_dir,'..',
                      'images','noletter.xbm'].join(File::Separator)
       variable letters
@@ -78,14 +83,16 @@ TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
 
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
 
-  TkCheckButton.new(w) {
+  # TkCheckButton.new(w) {
+  Tk::CheckButton.new(w) {
     image flagdown
     selectimage flagup
     indicatoron 0
     selectcolor self['background']
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
 
-  TkCheckButton.new(w) {
+  # TkCheckButton.new(w) {
+  Tk::CheckButton.new(w) {
     bitmap '@' + [$demo_dir,'..',
                    'images','letters.xbm'].join(File::Separator)
     indicatoron 0
diff --git a/ext/tk/sample/demos-jp/image1.rb b/ext/tk/sample/demos-jp/image1.rb
index 3d47f844e5..10078c6c22 100644
--- a/ext/tk/sample/demos-jp/image1.rb
+++ b/ext/tk/sample/demos-jp/image1.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # two image widgets demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy 
+  $image1_demo.destroy
   $image1_demo = nil
 end
 
@@ -15,8 +16,10 @@ $image1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($image1_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($image1_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($image1_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -52,7 +55,10 @@ TkPhotoImage.new('file'=>[$demo_dir,'..',
                           'images','earthris.gif'].join(File::Separator))
 
 # label ����
-[ TkLabel.new($image1_demo, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  TkLabel.new($image1_demo, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
+#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
+[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
+  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
 ].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
 
diff --git a/ext/tk/sample/demos-jp/image2.rb b/ext/tk/sample/demos-jp/image2.rb
index e2e2a2b036..3e8b87461f 100644
--- a/ext/tk/sample/demos-jp/image2.rb
+++ b/ext/tk/sample/demos-jp/image2.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # widget demo 'load image' (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy 
+  $image2_demo.destroy
   $image2_demo = nil
 end
 
@@ -15,8 +16,10 @@ $image2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($image2_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($image2_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($image2_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -50,21 +53,21 @@ $dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
 $image2a = TkPhotoImage.new
 
 # �ե�����̾������
-TkLabel.new($image2_demo, 'text'=>'�ǥ��쥯�ȥ�:')\
+TkLabel.new(base_frame, 'text'=>'�ǥ��쥯�ȥ�:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-image2_e = TkEntry.new($image2_demo) {
+image2_e = TkEntry.new(base_frame) {
   width 30
   textvariable $dirName
 }.pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
+TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkLabel.new($image2_demo, 'text'=>'�ե�����:')\
+TkLabel.new(base_frame, 'text'=>'�ե�����:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new($image2_demo){|w|
+TkFrame.new(base_frame){|w|
   s = TkScrollbar.new(w)
   l = TkListbox.new(w) {
     width 20
@@ -83,9 +86,10 @@ TkFrame.new($image2_demo){|w|
 }.pack('side'=>'top', 'anchor'=>'w')
 
 # image ����
-[ TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20),
-  TkLabel.new($image2_demo, 'text'=>'����:'),
-  TkLabel.new($image2_demo, 'image'=>$image2a)
+[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
+  TkLabel.new(base_frame, 'text'=>'����:'),
+  # TkLabel.new(base_frame, 'image'=>$image2a)
+  Tk::Label.new(base_frame, 'image'=>$image2a)
 ].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
 
 # �᥽�å����
diff --git a/ext/tk/sample/demos-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
index d9f378c116..625e69a21d 100644
--- a/ext/tk/sample/demos-jp/image3.rb
+++ b/ext/tk/sample/demos-jp/image3.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 # image3.rb
 #
 # This demonstration script creates a simple collection of widgets
@@ -8,7 +9,7 @@
 
 # toplevel widget
 if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy 
+  $image3_demo.destroy
   $image3_demo = nil
 end
 
@@ -19,7 +20,9 @@ $image3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# 
+base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+
+#
 def loadDir3(w)
   w.delete(0,'end')
   Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
@@ -35,10 +38,10 @@ end
 # Arguments:
 # w -                   Name of the toplevel window of the demo.
 def selectAndLoadDir3(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value, 
+  dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
                            :parent=>w, :mustexist=>true)
   if dir.length > 0
-    $dirName.value = dir 
+    $dirName.value = dir
     loadDir3(lbox)
   end
 end
@@ -49,7 +52,7 @@ end
 
 
 # label
-msg = TkLabel.new($image3_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -58,7 +61,7 @@ msg = TkLabel.new($image3_demo) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new($image3_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -87,15 +90,15 @@ end
 $image3a = TkPhotoImage.new
 
 #
-image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
 
-image3_df = TkLabelFrame.new($image3_demo, :text=>'�ǥ��쥯�ȥ�:')
+image3_df = TkLabelFrame.new(base_frame, :text=>'�ǥ��쥯�ȥ�:')
 
-image3_ff = TkLabelFrame.new($image3_demo, :text=>'�ե�����:', 
+image3_ff = TkLabelFrame.new(base_frame, :text=>'�ե�����:',
                              :padx=>'2m', :pady=>'2m')
 image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
   pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
+  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
                                              :expand=>true))
   insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
   bind('Double-1', proc{|x,y| loadImage3(self, x, y)}, '%x %y')
@@ -106,18 +109,19 @@ image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
   bind('Return', proc{loadDir3(image3_lbx)})
 }
 
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"�ǥ��쥯�ȥ�����", 
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"�ǥ��쥯�ȥ�����",
              :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
   pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
 }
 
-image3_if = TkLabelFrame.new($image3_demo, :text=>'���᡼��:') {|f|
-  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+image3_if = TkLabelFrame.new(base_frame, :text=>'���᡼��:') {|f|
+  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
 }
 
 Tk.grid(image3_df,  '-',
         :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if, 
+Tk.grid(image3_ff, image3_if,
         :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
 TkGrid.columnconfigure(image3_f, 1, :weight=>1)
 
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
index 38774d10d2..4440905db8 100644
--- a/ext/tk/sample/demos-jp/items.rb
+++ b/ext/tk/sample/demos-jp/items.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # canvas item types widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($items_demo) && $items_demo
-  $items_demo.destroy 
+  $items_demo.destroy
   $items_demo = nil
 end
 
@@ -15,8 +16,10 @@ $items_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($items_demo) {
+TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -24,7 +27,7 @@ TkLabel.new($items_demo) {
 }.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($items_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -43,7 +46,7 @@ TkFrame.new($items_demo) {|frame|
 
 # frame ����
 cvs = nil
-TkFrame.new($items_demo) {|cf|
+TkFrame.new(base_frame) {|cf|
   # canvas ����
   cvs = TkCanvas.new(cf) {|c|
     focus
@@ -70,11 +73,11 @@ TkFrame.new($items_demo) {|cf|
       c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
 
     else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
+      c.grid('in'=>cf, 'row'=>0, 'column'=>0,
              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1, 
+      vs.grid('row'=>0, 'column'=>1,
               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0, 
+      hs.grid('row'=>1, 'column'=>0,
               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
       TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
@@ -91,8 +94,13 @@ TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
 TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
 TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
 
-font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+if $tk_version =~ /^4.*/
+  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+else
+  font1 = 'Helvetica 12'
+  font2 = 'Helvetica 24 bold'
+end
 if TkWinfo.depth($root).to_i > 1
   blue   = 'DeepSkyBlue3'
   red    = 'red'
@@ -110,8 +118,8 @@ $tag_item = TkcGroup.new(cvs)
 
 # Set up demos within each of the areas of the grid.
 TkcText.new(cvs, '5c', '.2c', 'text'=>'�饤��', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c', 
-            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt', 
+TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
+            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
             'join'=>'miter', 'tags'=>$tag_item )
 TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
 TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
@@ -119,38 +127,38 @@ TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
             '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
             '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
             'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c', 
+TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
             'stipple'=>'@'+[$demo_dir,'..',
-                            'images','gray25.xbm'].join(File::Separator), 
+                            'images','gray25.xbm'].join(File::Separator),
             'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
 TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
+            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
             'tags'=>$tag_item )
 
-TkcText.new(cvs, '15c', '.2c', 
+TkcText.new(cvs, '15c', '.2c',
             'text'=>'���� (��餫�ˤĤʤ���ľ��)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c', 
+TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
             'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c', 
+TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
             'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c', 
+TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
             '16.5c','4.5c','13.5c','7.5c','12c','6c',
-            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round', 
+            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
             'stipple'=>'@'+[$demo_dir, '..',
-                            'images', 'gray25.xbm'].join(File::Separator), 
+                            'images', 'gray25.xbm'].join(File::Separator),
             'fill'=>red, 'tags'=>$tag_item )
 
 TkcText.new(cvs, '25c', '.2c', 'text'=>'¿�ѷ�', 'anchor'=>'n')
 TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
                '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-               'fill'=>'green', 'outline'=>'black', 'width'=>4, 
+               'fill'=>'green', 'outline'=>'black', 'width'=>4,
                'tags'=>$tag_item )
 TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
                '28c','1c','29c','1c','29c','4c','29c','4c',
                'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
 TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
                '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-               '7.5c','22c','7.5c', 
+               '7.5c','22c','7.5c',
                'stipple'=>'@' + [$demo_dir, '..',
                                  'images', 'gray25.xbm'].join(File::Separator),
                'outline'=>'black', 'tags'=>$tag_item )
@@ -158,7 +166,7 @@ TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
 TkcText.new(cvs, '5c', '8.2c', 'text'=>'���', 'anchor'=>'n')
 TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
                  'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
+TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
                  'fill'=>green, 'tags'=>$tag_item )
 TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
                  'stipple'=>'@'+[$demo_dir,'..',
@@ -168,7 +176,7 @@ TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
 TkcText.new(cvs, '15c', '8.2c', 'text'=>'�ʱ�', 'anchor'=>'n')
 TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
                  'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
+TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
                  'fill'=>green, 'tags'=>$tag_item )
 TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
                  'stipple'=>'@'+[$demo_dir,'..',
@@ -177,40 +185,40 @@ TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
 
 TkcText.new(cvs, '25c', '8.2c', 'text'=>'�ƥ�����', 'anchor'=>'n')
 TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c', 
+TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
             'text'=>'û���ƥ����ȡ���ɥ�åס���·�������󥫡�����(��)�����ϳƥƥ����ȤΥ��󥫡��ݥ���Ȥ򼨤���', 'tags'=>$tag_item )
 TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue, 
+TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
             'text'=>"�����Ĥ��ιԡ�\n���줾����Ω��\n��·����\n���ƺ�ü�����󥫡�����Ƥ��롣", 'justify'=>'center', 'tags'=>$tag_item )
 TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
 if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
               'stipple'=>'@' + [$demo_dir, '..',
                                 'images', 'grey.5'].join(File::Separator),
               'text'=>'Stippled characters', 'tags'=>$tag_item )
 else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
-              'stipple'=>'gray50', 'text'=>'Stippled characters', 
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
+              'stipple'=>'gray50', 'text'=>'Stippled characters',
               'tags'=>$tag_item )
 end
 
 TkcText.new(cvs, '5c', '16.2c', 'text'=>'��', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black', 
+TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
            'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-#          'outline'=>blue, 'start'=>135, 'extent'=>270, 
+#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+#          'outline'=>blue, 'start'=>135, 'extent'=>270,
 #          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
 #          'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-           'outline'=>blue, 'start'=>135, 'extent'=>270, 
+TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+           'outline'=>blue, 'start'=>135, 'extent'=>270,
            'outlinestipple'=>'@'+[$demo_dir, '..',
                                   'images','gray25.xbm'].join(File::Separator),
            'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice', 
-           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90, 
+TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
+           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
            'tags'=>$tag_item)
 TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270, 
+           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
            'tags'=>$tag_item)
 
 TkcText.new(cvs, '15c', '16.2c', 'text'=>'�ӥåȥޥå�', 'anchor'=>'n')
@@ -245,17 +253,17 @@ TkcText.new(cvs, '25c', '16.2c', 'text'=>'������ɥ�', 'anchor'=>'n')
 TkButton.new(cvs) {|b|
   text '�����Ƥ�'
   command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c', 
+  TkcWindow.new(cvs, '21c','18c',
                 'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
 }
 TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
   insert 'end', '�Խ����Ƥ�'
-  TkcWindow.new(cvs, '21c','21c', 
+  TkcWindow.new(cvs, '21c','21c',
                 'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
 }
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
+TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
             'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c', 
+  TkcWindow.new(cvs, '28.5c','17.5c',
                 'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
 }
 TkcText.new(cvs, '21c', '17.9c', 'text'=>'�ܥ���:', 'anchor'=>'sw')
@@ -306,7 +314,7 @@ def itemLeave(c)
   $restoreCmd.call if $restoreCmd
 end
 
-# Utility methods for stroking out a rectangle and printing what's 
+# Utility methods for stroking out a rectangle and printing what's
 # underneath the rectangle's area.
 
 def itemMark(c,x,y)
@@ -320,7 +328,7 @@ def itemStroke(c,x,y)
   y = c.canvasy(y)
   if $areaX1 != x && $areaY1 != y
     c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
+    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
                                               '-outline', 'black')
     $areaX2 = x
     $areaY2 = y
@@ -361,11 +369,11 @@ def itemDrag(c,x,y)
   $lastY = y
 end
 
-# Method that's invoked when the button embedded in the canvas 
+# Method that's invoked when the button embedded in the canvas
 # is invoked.
 
 def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c', 
+  i = TkcText.new(w, '25c', '18.1c',
                   'text'=>'���Ƥ�!!', 'fill'=>color, 'anchor'=>'n')
   Tk.after(500, proc{w.delete i})
 end
diff --git a/ext/tk/sample/demos-jp/ixset2 b/ext/tk/sample/demos-jp/ixset2
index 8947daa4b4..5b816e40b1 100644
--- a/ext/tk/sample/demos-jp/ixset2
+++ b/ext/tk/sample/demos-jp/ixset2
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: euc-jp -*-
 #
 # ixset --
 # A nice interface to "xset" to change X server settings
diff --git a/ext/tk/sample/demos-jp/knightstour.rb b/ext/tk/sample/demos-jp/knightstour.rb
new file mode 100644
index 0000000000..ae0f13076e
--- /dev/null
+++ b/ext/tk/sample/demos-jp/knightstour.rb
@@ -0,0 +1,273 @@
+# -*- coding: euc-jp -*-
+#
+# Based on the widget demo of Tcl/Tk8.5.2
+# The following is the original copyright text.
+#----------------------------------------------------------------------------
+# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+#	Calculate a Knight's tour of a chessboard.
+#
+#	This uses Warnsdorff's rule to calculate the next square each
+#	time. This specifies that the next square should be the one that
+#	has the least number of available moves.
+#
+#	Using this rule it is possible to get to a position where
+#	there are no squares available to move into. In this implementation
+#	this occurs when the starting square is d6.
+#
+#	To solve this fault an enhancement to the rule is that if we
+#	have a choice of squares with an equal score, we should choose
+#	the one nearest the edge of the board.
+#
+#	If the call to the Edgemost function is commented out you can see
+#	this occur.
+#
+#	You can drag the knight to a specific square to start if you wish.
+#	If you let it repeat then it will choose random start positions
+#	for each new tour.
+#----------------------------------------------------------------------------
+require 'tk'
+
+class Knights_Tour
+  # Return a list of accessible squares from a given square
+  def valid_moves(square)
+    moves = []
+    [
+      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
+    ].each{|col_delta, row_delta|
+      col = (square % 8) + col_delta
+      row = (square.div(8)) + row_delta
+      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
+    }
+    moves
+  end
+
+  # Return the number of available moves for this square
+  def check_square(square)
+    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
+  end
+
+  # Select the next square to move to. Returns -1 if there are no available
+  # squares remaining that we can move to.
+  def next_square(square)
+    minimum = 9
+    nxt = -1
+    valid_moves(square).each{|pos|
+      unless @visited.include?(pos)
+        cnt = check_square(pos)
+        if cnt < minimum
+          minimum = cnt
+          nxt = pos
+        elsif cnt == minimum
+          nxt = edgemost(nxt, pos)
+        end
+      end
+    }
+    nxt
+  end
+
+  # Select the square nearest the edge of the board
+  def edgemost(nxt, pos)
+    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
+    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
+    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
+    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
+    (col_A * row_A < col_B * row_B)? nxt : pos
+  end
+
+  # Display a square number as a standard chess square notation.
+  def _N(square)
+    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
+  end
+
+  # Perform a Knight's move and schedule the next move.
+  def move_piece(last, square)
+    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
+    @log.see(:end)
+    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
+    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
+    @knight.coords(@board.coords(1+square)[0..1])
+    @visited << square
+    if (nxt = next_square(square)) != -1
+      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
+    else
+      @start_btn.state :normal
+      if @visited.length == 64
+        if @initial == square
+          @log.insert :end, '��ͷ(closed tour)������'
+        else
+          @log.insert :end, "����\n", {}
+          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
+        end
+      else
+        @log.insert :end, "���ԡ�\n", {}
+      end
+    end
+  end
+
+  # Begin a new tour of the board given a random start position
+  def tour(square = nil)
+    @visited.clear
+    @log.clear
+    @start_btn.state :disabled
+    1.upto(64){|n|
+      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
+    }
+    unless square
+      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
+    end
+    @initial = square
+    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
+  end
+
+  def _stop
+    Tk.after_cancel(@after_id) rescue nil
+  end
+
+  def _exit
+    _stop
+    $knightstour.destroy
+  end
+
+  def set_delay(new)
+    @delay.numeric = new.to_i
+  end
+
+  def drag_start(w, x, y)
+    w.dtag('selected')
+    w.addtag('selected', :withtag, 'current')
+    @dragging = [x, y]
+  end
+
+  def drag_motion(w, x, y)
+    return unless @dragging
+    w.move('selected', x - @dragging[0], y - @dragging[1])
+    @dragging = [x, y]
+  end
+
+  def drag_end(w, x, y)
+    square = w.find_closest(x, y, 0, 65)
+    w.coords('selected', w.coords(square)[0..1])
+    w.dtag('selected')
+    @dragging = nil
+  end
+
+  def make_SeeDismiss
+    ## See Code / Dismiss
+    frame = Ttk::Frame.new($knightstour)
+    sep = Ttk::Separator.new(frame)
+    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+    TkGrid('x',
+           Ttk::Button.new(frame, :text=>'�����ɻ���',
+                           :image=>$image['view'], :compound=>:left,
+                           :command=>proc{showCode 'knightstour'}),
+           Ttk::Button.new(frame, :text=>'�Ĥ���',
+                           :image=>$image['delete'], :compound=>:left,
+                           :command=>proc{
+                             $knightstour.destroy
+                             $knightstour = nil
+                           }),
+           :padx=>4, :pady=>4)
+    frame.grid_columnconfigure(0, :weight=>1)
+    frame
+  end
+
+  def create_gui(parent = nil)
+    $knightstour.destroy rescue nil
+    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
+    $knightstour.withdraw
+    base_f = Ttk::Frame.new($knightstour)
+    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
+    @log = Tk::Text.new(base_f, :width=>12, :height=>1,
+                        :font=>'Arial 8', :background=>'white')
+    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
+
+    @visited = []
+    @delay = TkVariable.new(600)
+    @continuous = TkVariable.new(false)
+
+    tool_f = Ttk::Frame.new($knightstour)
+    label = Ttk::Label.new(tool_f, :text=>'�¹�®��')
+    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
+                           :command=>proc{|n| set_delay(n)})
+    check = Ttk::Checkbutton.new(tool_f, :text=>'ȿ��',
+                                 :variable=>@continuous)
+    @start_btn = Ttk::Button.new(tool_f, :text=>'����',
+                                 :command=>proc{tour()})
+    @exit_btn = Ttk::Button.new(tool_f, :text=>'��λ',
+                                :command=>proc{_exit()})
+
+    7.downto(0){|row|
+      0.upto(7){|col|
+        if ((col & 1) ^ (row & 1)).zero?
+          fill  = 'bisque'
+          dfill = 'bisque3'
+        else
+          fill  = 'tan3'
+          dfill = 'tan4'
+        end
+        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
+        @board.create(TkcRectangle, coords,
+                      :fill=>fill, :disabledfill=>dfill,
+                      :width=>2, :state=>:disabled)
+      }
+    }
+
+    @knight_font = TkFont.new(:size=>-24)
+    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
+                          :text=>Tk::UTF8_String.new('\u265e'),
+                          :anchor=>'nw', # :tags=>'knight',
+                          :fill=>'black', :activefill=>'#600000')
+    @knight.coords(@board.coords(rand(64)+1)[0..1])
+    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
+    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
+    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
+
+    Tk.grid(@board, @log, scr, :sticky=>'news')
+    base_f.grid_rowconfigure(0, :weight=>1)
+    base_f.grid_columnconfigure(0, :weight=>1)
+
+    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
+    widgets = [label, scale, check, @start_btn]
+    sg = nil
+    unless $RubyTk_WidgetDemo
+      widgets << @exit_btn
+      if Tk.windowingsystem != 'aqua'
+        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
+        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
+      end
+    end
+    Tk.pack(widgets, :side=>:right)
+    if Tk.windowingsystem == 'aqua'
+      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
+      TkPack.configure(widgets[0], :padx=>[4, 24])
+      TkPack.configure(widgets[-1], :padx=>[16, 4])
+    end
+
+    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
+
+    if $RubyTk_WidgetDemo
+      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
+    end
+
+    $knightstour.grid_rowconfigure(0, :weight=>1)
+    $knightstour.grid_columnconfigure(0, :weight=>1)
+
+    $knightstour.bind('Control-F2'){TkConsole.show}
+    $knightstour.bind('Return'){@start_btn.invoke}
+    $knightstour.bind('Escape'){@exit_btn.invoke}
+    $knightstour.bind('Destroy'){ _stop }
+    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
+
+    $knightstour.deiconify
+    $knightstour.tkwait_destroy
+  end
+
+  def initialize(parent = nil)
+    create_gui(parent)
+  end
+end
+
+Tk.root.withdraw unless $RubyTk_WidgetDemo
+Thread.new{Tk.mainloop} if __FILE__ == $0
+Knights_Tour.new
diff --git a/ext/tk/sample/demos-jp/label.rb b/ext/tk/sample/demos-jp/label.rb
index 59626289fc..19105e6f71 100644
--- a/ext/tk/sample/demos-jp/label.rb
+++ b/ext/tk/sample/demos-jp/label.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # label widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($label_demo) && $label_demo
-  $label_demo.destroy 
+  $label_demo.destroy
   $label_demo = nil
 end
 
@@ -15,8 +16,10 @@ $label_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($label_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($label_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($label_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -44,19 +47,20 @@ TkFrame.new($label_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # label demo �ѥե졼������
-f_left = TkFrame.new($label_demo)
-f_right = TkFrame.new($label_demo)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes', 
+f_left = TkFrame.new(base_frame)
+f_right = TkFrame.new(base_frame)
+[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
                                   'padx'=>10, 'pady'=>10, 'fill'=>'both')}
 
 # label ����
 [ TkLabel.new(f_left, 'text'=>'�ǽ�Υ�٥�'),
-  TkLabel.new(f_left, 'text'=>'2 ���ܡ�����ä��⤭�夬�餻�Ƥߤޤ���', 
+  TkLabel.new(f_left, 'text'=>'2 ���ܡ�����ä��⤭�夬�餻�Ƥߤޤ���',
               'relief'=>'raised'),
   TkLabel.new(f_left, 'text'=>'3 ���ܡ�����Ǥ��ޤ� ', 'relief'=>'sunken')
 ].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
 
-TkLabel.new(f_right) {
+# TkLabel.new(f_right) {
+Tk::Label.new(f_right) {
   bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
   borderwidth 2
   relief 'sunken'
diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
index 23c974dcc2..cee504f4b6 100644
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ b/ext/tk/sample/demos-jp/labelframe.rb
@@ -1,3 +1,5 @@
+# -*- coding: euc-jp -*-
+#
 # labelframe.rb
 #
 # This demonstration script creates a toplevel window containing
@@ -7,7 +9,7 @@
 
 
 if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy 
+  $labelframe_demo.destroy
   $labelframe_demo = nil
 end
 
@@ -17,24 +19,26 @@ $labelframe_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
+
 # Some information
-TkLabel.new($labelframe_demo, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
-TkLabelFrame ���������åȤϴ�Ϣ���� widget 
+TkLabelFrame ���������åȤϴ�Ϣ���� widget
 ����ޤȤ�Ƽ�갷��������Ѥ����ޤ�����
 �٥���̾��ʸ����Ǥⲿ�餫�Υ��������å�
-�Ǥ⤫�ޤ��ޤ��󡣤⤷���ʤ����ȤäƤ��� 
-Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ 
+�Ǥ⤫�ޤ��ޤ��󡣤⤷���ʤ����ȤäƤ���
+Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬
 labelframe ���������åȤ�������Ƥ��ʤ�
 ��硢���Υǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ���
 ���ξ��ˤ� labelframe ���������åȤ�����
-����Ƥ���褦�ʤ�꿷�����С������� Tk 
+����Ƥ���褦�ʤ�꿷�����С������� Tk
 ���Ȥ߹�碌�ƻ�褦�ˤ��Ƥ���������
 EOL
 
 # The bottom buttons
-TkFrame.new($labelframe_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
@@ -48,17 +52,17 @@ TkFrame.new($labelframe_demo){|f|
 }
 
 # Demo area
-w = TkFrame.new($labelframe_demo).pack(:side=>:bottom, :fill=>:both, 
+w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
                                        :expand=>true)
 
 # A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'������', 
+TkLabelFrame.new(w, :text=>'������',
                  :padx=>2, :pady=>2) {|f|
   grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
 
   v = TkVariable.new
   (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}", 
+    TkRadiobutton.new(f, :text=>"This is value #{i}",
                       :variable=>v, :value=>i) {
       pack(:side=>:top, :fill=>:x, :pady=>2)
     }
@@ -81,7 +85,7 @@ def lfEnableButtons(w)
 end
 
 TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
+  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
                     :text=>"���ץ��������", :padx=>0) {|cb|
     command proc{lfEnableButtons(f)}
     f.labelwidget(cb)
diff --git a/ext/tk/sample/demos-jp/mclist.rb b/ext/tk/sample/demos-jp/mclist.rb
new file mode 100644
index 0000000000..37f5dfa8eb
--- /dev/null
+++ b/ext/tk/sample/demos-jp/mclist.rb
@@ -0,0 +1,121 @@
+# -*- coding: euc-jp -*-
+#
+# mclist.rb --
+#
+# This demonstration script creates a toplevel window containing a Ttk
+# tree widget configured as a multi-column listbox.
+#
+# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($mclist_demo) && $mclist_demo
+  $mclist_demo.destroy
+  $mclist_demo = nil
+end
+
+$mclist_demo = TkToplevel.new {|w|
+  title("Multi-Column List")
+  iconname("mclist")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
+
+## Explanatory text
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+               :text=><<EOL).pack(:fill=>:x)
+Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
+Ttk::Treeview���������åȤ�\
+Ttk���������åȥ��åȤ˴ޤޤ�륦�������åȤΰ�Ĥǡ�\
+���줬�ݻ������ڹ�¤�Υǡ������Τ�ΤޤǤ�ɽ�����뤳�Ȥʤ���\
+�������������ޥ��������ɽ�������뤳�Ȥ��Ǥ��ޤ���
+���Υ���ץ�ϡ�ʣ���Υ�������ä��ꥹ�ȥܥå�������������ñ����Ǥ���
+�ƥ����Υ����ȥ�(heading)�򥯥�å�����С�\
+���Υ����ξ���˴�Ť��ƥꥹ�Ȥ��¤��ؤ����ʤ����Ϥ��Ǥ���\
+�ޤ��������Υ����ȥ�֤ζ��ڤ���ʬ��ɥ�å����뤳�Ȥǡ�\
+�����������ѹ����뤳�Ȥ��ǽ�Ǥ���
+EOL
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'mclist'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $mclist_demo.destroy
+                           $mclist_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+container = Ttk::Frame.new(base_frame)
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
+                          :show=>:headings)
+if Tk.windowingsystem != 'aquq'
+  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
+else
+  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
+end
+
+container.pack(:fill=>:both, :expand=>true)
+Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
+Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
+container.grid_columnconfigure(0, :weight=>1)
+container.grid_rowconfigure(0, :weight=>1)
+
+## The data we're going to insert
+data = [
+  ['���를�����', 	'�֥��Υ������쥹', 	'ARS'],
+  ['�������ȥ�ꥢ',	'�����٥�',		'AUD'],
+  ['�֥饸��', 		'�֥饸�ꥢ', 		'BRL'],
+  ['���ʥ�', 		'������', 		'CAD'],
+  ['���',		'�̵�', 		'CNY'],
+  ['�ե��',		'�ѥ�', 		'EUR'],
+  ['�ɥ���', 		'�٥���',		'EUR'],
+  ['�����', 		'�˥塼�ǥ꡼',		'INR'],
+  ['�����ꥢ', 		'������', 		'EUR'],
+  ['����', 		'���', 		'JPY'],
+  ['�ᥭ����', 		'�ᥭ�������ƥ�', 	'MXN'],
+  ['������', 		'�⥹����', 		'RUB'],
+  ['��եꥫ',	'�ץ�ȥꥢ', 		'ZAR'],
+  ['�ѹ�', 		'����ɥ�', 		'GBP'],
+  ['����ꥫ', 		'�亮��ȥ� D.C.', 	'USD'],
+]
+
+## Code to insert the data nicely
+font = Ttk::Style.lookup(tree[:style], :font)
+cols = %w(country capital currency)
+cols.zip(%w(��̾ ���� �̲�)).each{|col, name|
+  tree.heading_configure(col, :text=>name,
+                         :command=>proc{sort_by(tree, col, false)})
+  tree.column_configure(col, :width=>TkFont.measure(font, name))
+}
+
+data.each{|country, capital, currency|
+  #tree.insert('', :end, :values=>[country, capital, currency])
+  tree.insert(nil, :end, :values=>[country, capital, currency])
+  cols.zip([country, capital, currency]).each{|col, val|
+    len = TkFont.measure(font, "#{val}  ")
+    if tree.column_cget(col, :width) < len
+      tree.column_configure(col, :width=>len)
+    end
+  }
+}
+
+## Code to do the sorting of the tree contents when clicked on
+def sort_by(tree, col, direction)
+  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
+    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
+    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
+
+  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
+end
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
index add85f7f7b..e38a467000 100644
--- a/ext/tk/sample/demos-jp/menu.rb
+++ b/ext/tk/sample/demos-jp/menu.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # menus widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy 
+  $menu_demo.destroy
   $menu_demo = nil
 end
 
@@ -15,8 +16,10 @@ $menu_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
+
 # menu frame ����
-$menu_frame = TkFrame.new($menu_demo, 'relief'=>'raised', 'bd'=>2)
+$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
 $menu_frame.pack('side'=>'top', 'fill'=>'x')
 
 begin
@@ -26,7 +29,7 @@ rescue
 end
 
 # label ����
-TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
   if $tk_platform['platform'] == 'macintosh' ||
       windowingsystem == "classic" || windowingsystem == "aqua"
     text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Command-X �����Ϥ���ȡ�X�����ޥ�ɥ��������³����ɽ������Ƥ���ʸ���ʤ�С���������졼����Ȥä����ܵ�ư��Ԥ����Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
@@ -36,7 +39,7 @@ TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 }.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($menu_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -85,9 +88,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
     m.configure('menu'=>basic_menu)
     add('command', 'label'=>'���⤷�ʤ�Ĺ������ȥ�')
     ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4, 
-      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)", 
-          'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4,
+      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)",
+          'underline'=>14, 'accelerator'=>"Meta+#{c}",
           'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
       $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
     }
@@ -98,17 +101,18 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
   pack('side'=>'left')
   TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
     m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello(����ˤ���)', 
-        'command'=>proc{print "Hello(����ˤ���)\n"}, 
+    add('command', 'label'=>'Print hello(����ˤ���)',
+        'command'=>proc{print "Hello(����ˤ���)\n"},
         'accelerator'=>"#{modifier}+H", 'underline'=>6)
     $menu_demo.bind("#{modifier}-h", proc{print "Hello(����ˤ���)\n"})
-    add('command', 'label'=>'Print goodbye(���褦�ʤ�)', 
-        'command'=>proc{print "Goodbye(���褦�ʤ�)\n"}, 
+    add('command', 'label'=>'Print goodbye(���褦�ʤ�)',
+        'command'=>proc{print "Goodbye(���褦�ʤ�)\n"},
         'accelerator'=>"#{modifier}+G", 'underline'=>6)
     $menu_demo.bind("#{modifier}-g", proc{print "Goodbye(���褦�ʤ�)\n"})
 
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)', 
+    # TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
+    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
+      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)',
                        'menu'=>cascade_check, 'underline'=>0)
       oil = TkVariable.new(0)
       add('check', 'label'=>'����������', 'variable'=>oil)
@@ -119,18 +123,19 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       lights = TkVariable.new(0)
       add('check', 'label'=>'�饤������', 'variable'=>lights)
       add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-          'command'=>proc{showVars($menu_demo, 
-                                   ['����������', oil], 
-                                   ['�ȥ�󥹥ߥå��������', trans], 
-                                   ['�֥졼������', brakes], 
+      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
+          'command'=>proc{showVars($menu_demo,
+                                   ['����������', oil],
+                                   ['�ȥ�󥹥ߥå��������', trans],
+                                   ['�֥졼������', brakes],
                                    ['�饤������', lights])} )
       invoke 1
       invoke 3
     }
 
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)', 
+    #TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
+    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
+      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)',
                        'menu'=>cascade_radio, 'underline'=>0)
       pointSize = TkVariable.new
       add('radio', 'label'=>'10 �ݥ����', 'variable'=>pointSize, 'value'=>10)
@@ -144,9 +149,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       add('radio', 'label'=>'�ܡ����', 'variable'=>style, 'value'=>'bold')
       add('radio', 'label'=>'������å�', 'variable'=>style, 'value'=>'italic')
       add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-          'command'=>proc{showVars($menu_demo, 
-                                   ['�ݥ���ȥ�����', pointSize], 
+      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
+          'command'=>proc{showVars($menu_demo,
+                                   ['�ݥ���ȥ�����', pointSize],
                                    ['��������', style])} )
       invoke 1
       invoke 7
@@ -158,15 +163,15 @@ TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
   pack('side'=>'left')
   TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
     m.configure('menu'=>icon_menu)
-    add('command', 
+    add('command',
         'bitmap'=>'@'+[$demo_dir,'..',
                         'images','pattern.xbm'].join(File::Separator),
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
                                      'text'=>'�����ʤ������򤷤���˥塼�ι��ܤϥƥ����ȤǤϤʤ��ӥåȥޥåפ�ɽ�����Ƥ��ޤ���������ʳ������Ǥ�¾�Υ�˥塼���ܤ��Ѥ��ޤ���',
-                                     'bitmap'=>'', 'default'=>0, 
+                                     'bitmap'=>'', 'default'=>0,
                                      'buttons'=>'λ��')} )
     ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 
+      add('command', 'bitmap'=>icon,
           'command'=>proc{print "You invoked the #{icon} bitmap\n"})
     }
   }
@@ -178,7 +183,7 @@ TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
     m.configure('menu'=>more_menu)
     [ '����ȥ�','�̤Υ���ȥ�','���⤷�ʤ�','�ۤȤ�ɲ��⤷�ʤ�',
       '������յ������Τ�' ].each{|i|
-      add('command', 'label'=>i, 
+      add('command', 'label'=>i,
           'command'=>proc{print "You invoked \"#{i}\"\n"})
     }
   }
@@ -189,7 +194,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
   TkMenu.new(m) {|colors_menu|
     m.configure('menu'=>colors_menu)
     ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c, 
+      add('command', 'label'=>c, 'background'=>c,
           'command'=>proc{print "You invoked \"#{c}\"\n"})
     }
   }
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
index 8c2a815d78..094853a728 100644
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ b/ext/tk/sample/demos-jp/menu84.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # menus widget demo (called by 'widget')
 #
 
 # toplevel widget
 if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy 
+  $menu84_demo.destroy
   $menu84_demo = nil
 end
 
@@ -15,6 +16,8 @@ $menu84_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
+
 begin
   windowingsystem = Tk.windowingsystem()
 rescue
@@ -22,7 +25,7 @@ rescue
 end
 
 # label
-TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
   if $tk_platform['platform'] == 'macintosh' ||
       windowingsystem == "classic" || windowingsystem == "aqua"
     text("���Υ�����ɥ��ˤϥ��������ɥ�˥塼����ĥ�˥塼�С����դ����Ƥ��ޤ���Command+x ('x'�ϥ��ޥ�ɥ�������ܥ��³����ɽ������Ƥ���ʸ���Ǥ�) �ȥ����פ��뤳�Ȥˤ�äƤ���ܤε�ǽ��ƤӽФ����Ȥ��Ǥ��ޤ����Ǹ�Υ�˥塼�ϡ��ޥ����ǥ�����ɥ��γ��˥ɥ�å����뤳�Ȥˤ�äơ���Ω�����ѥ�åȤȤʤ�褦���ڤ��������Ȥ���ǽ�Ǥ���")
@@ -33,17 +36,17 @@ TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 
 
 menustatus = TkVariable.new("    ")
-TkFrame.new($menu84_demo) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken', 
-              'bd'=>1, 'font'=>['Helvetica', '10'], 
-              'anchor'=>'w').pack('side'=>'left', 'padx'=>2, 
+TkFrame.new(base_frame) {|frame|
+  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
+              'bd'=>1, 'font'=>['Helvetica', '10'],
+              'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
                                   'expand'=>true, 'fill'=>'both')
   pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 }
 
 
 # frame
-TkFrame.new($menu84_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -91,8 +94,8 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
   add('command', 'label'=>'Long entry that does nothing')
   ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"", 
-        'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+    add('command', 'label'=>"Print letter \"#{c}\"",
+        'underline'=>14, 'accelerator'=>"Meta+#{c}",
         'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
     $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
   }
@@ -100,17 +103,17 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 
 TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello', 
-      'command'=>proc{print "Hello\n"}, 
+  add('command', 'label'=>'Print hello',
+      'command'=>proc{print "Hello\n"},
       'accelerator'=>"#{modifier}+H", 'underline'=>6)
   $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye', 
-      'command'=>proc{print "Goodbye\n"}, 
+  add('command', 'label'=>'Print goodbye',
+      'command'=>proc{print "Goodbye\n"},
       'accelerator'=>"#{modifier}+G", 'underline'=>6)
   $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
 
   TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check button', 
+    m.add('cascade', 'label'=>'Check button',
           'menu'=>cascade_check, 'underline'=>0)
     oil = TkVariable.new(0)
     add('check', 'label'=>'�����븡��', 'variable'=>oil)
@@ -121,18 +124,18 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     lights = TkVariable.new(0)
     add('check', 'label'=>'�饤�ȸ���', 'variable'=>lights)
     add('separator')
-    add('command', 'label'=>'Show current values', 
-        'command'=>proc{showVars($menu84_demo, 
-                                 ['������', oil], 
-                                 ['�ȥ�󥹥ߥå����', trans], 
-                                 ['�֥졼��', brakes], 
+    add('command', 'label'=>'Show current values',
+        'command'=>proc{showVars($menu84_demo,
+                                 ['������', oil],
+                                 ['�ȥ�󥹥ߥå����', trans],
+                                 ['�֥졼��', brakes],
                                  ['�饤��', lights])} )
     invoke 1
     invoke 3
   }
 
   TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons', 
+    m.add('cascade', 'label'=>'Radio buttons',
           'menu'=>cascade_radio, 'underline'=>0)
     pointSize = TkVariable.new
     add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
@@ -146,9 +149,9 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
     add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
     add('separator')
-    add('command', 'label'=>'�����ͤ�ɽ��', 
-        'command'=>proc{showVars($menu84_demo, 
-                                 ['pointSize', pointSize], 
+    add('command', 'label'=>'�����ͤ�ɽ��',
+        'command'=>proc{showVars($menu84_demo,
+                                 ['pointSize', pointSize],
                                  ['style', style])} )
     invoke 1
     invoke 7
@@ -157,15 +160,15 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 
 TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1, 
+  add('command', 'hidemargin'=>1,
       'bitmap'=>'@'+[$demo_dir,'..',
                       'images','pattern.xbm'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
                                    'text'=>'���ʤ������򤷤���˥塼���ܤϡ�ʸ���������˥ӥåȥޥåץ��᡼���ǹ��ܤ�ɽ��������ΤǤ�������ʳ������Ǥϡ��ۤ��Υ�˥塼���ܤȤδ֤��ä˰㤤������櫓�ǤϤ���ޤ���',
-                                   'bitmap'=>'', 'default'=>0, 
+                                   'bitmap'=>'', 'default'=>0,
                                    'buttons'=>'�Ĥ���')} )
   ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
+    add('command', 'bitmap'=>icon, 'hidemargin'=>1,
         'command'=>proc{print "You invoked the #{icon} bitmap\n"})
   }
 
@@ -176,14 +179,14 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
   [ 'An entry','Another entry','Does nothing','Does almost nothing',
     'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i, 
+    add('command', 'label'=>i,
         'command'=>proc{print "You invoked \"#{i}\"\n"})
   }
 
-  m.entryconfigure('Does almost nothing', 
-                   'bitmap'=>'questhead', 'compound'=>'left', 
+  m.entryconfigure('Does almost nothing',
+                   'bitmap'=>'questhead', 'compound'=>'left',
                    'command'=>proc{
-                     TkDialog.new('title'=>'Compound Menu Entry', 
+                     TkDialog.new('title'=>'Compound Menu Entry',
                                   'message'=>'���ʤ������򤷤���˥塼���ܤϡ��ӥåȥޥåץ��᡼����ʸ����Ȥ�Ʊ���˰�Ĥι��ܤ�ɽ������褦�ˤ�����ΤǤ�������ʳ������Ǥϡ��ۤ��Υ�˥塼���ܤȤδ֤��ä˰㤤������櫓�ǤϤ���ޤ���',
                                   'buttons'=>['λ��'], 'bitmap'=>'')
                    })
@@ -192,7 +195,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 TkMenu.new($menu84_frame) {|m|
   $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
   ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c, 
+    add('command', 'label'=>c, 'background'=>c,
         'command'=>proc{print "You invoked \"#{c}\"\n"})
   }
 }
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
index 050f0decb4..49aca6786d 100644
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ b/ext/tk/sample/demos-jp/menu8x.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # menus widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($menu8x_demo) && $menu8x_demo
-  $menu8x_demo.destroy 
+  $menu8x_demo.destroy
   $menu8x_demo = nil
 end
 
@@ -15,16 +16,18 @@ $menu8x_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($menu8x_demo).pack(:fill=>:both, :expand=>true)
+
 # version check
 if $tk_version.to_f < 8.0
 
 # label ����
-TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
     text("�¹Ԥ��褦�Ȥ���������ץȤ� Tk8.0 �ʾ�����ѤǤ��뵡ǽ�����Ѥ��Ƥ��뤿�ᡢ���ʤ��� Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} �Ǥ�����˼¹ԤǤ��ޤ��󡣤�äƥǥ�μ¹Ԥ���ߤ��ޤ����������������Υ����ɻ��ȥܥ���򲡤����Ȥǡ��¹Ԥ���ߤ��줿������ץȤΥ������򻲾Ȥ��뤳�Ȥϲ�ǽ�Ǥ���")
 }.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($menu8x_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -50,7 +53,7 @@ rescue
 end
 
 # label ����
-TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
   if $tk_platform['platform'] == 'macintosh' ||
       windowingsystem == "classic" || windowingsystem == "aqua"
     text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Command-X �����Ϥ���ȡ�X�����ޥ�ɥ��������³����ɽ������Ƥ���ʸ���ʤ�С���������졼����Ȥä����ܵ�ư��Ԥ����Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
@@ -61,14 +64,14 @@ TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 
 # ����ɽ��������
 $menu8xstatus = TkVariable.new("    ")
-TkFrame.new($menu8x_demo) {|frame|
-  TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken', 
+TkFrame.new(base_frame) {|frame|
+  TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken',
               'bd'=>1, 'font'=>['Helvetica', '10'], 'anchor'=>'w')\
   .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 
 # frame ����
-TkFrame.new($menu8x_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -113,9 +116,9 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
     m.add('cascade', 'label'=>'Basic', 'menu'=>basic_menu, 'underline'=>0)
     add('command', 'label'=>'���⤷�ʤ�Ĺ������ȥ�')
     ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4, 
-      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)", 
-          'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4,
+      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)",
+          'underline'=>14, 'accelerator'=>"Meta+#{c}",
           'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
       $menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
     }
@@ -123,17 +126,17 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
 
   TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
     m.add('cascade', 'label'=>'Cascades', 'menu'=>cascade_menu, 'underline'=>0)
-    add('command', 'label'=>'Print hello(����ˤ���)', 
-        'command'=>proc{print "Hello(����ˤ���)\n"}, 
+    add('command', 'label'=>'Print hello(����ˤ���)',
+        'command'=>proc{print "Hello(����ˤ���)\n"},
         'accelerator'=>"#{modifier}+H", 'underline'=>6)
     $menu8x_demo.bind("#{modifier}-h", proc{print "Hello(����ˤ���)\n"})
-    add('command', 'label'=>'Print goodbye(���褦�ʤ�)', 
-        'command'=>proc{print "Goodbye(���褦�ʤ�)\n"}, 
+    add('command', 'label'=>'Print goodbye(���褦�ʤ�)',
+        'command'=>proc{print "Goodbye(���褦�ʤ�)\n"},
         'accelerator'=>"#{modifier}+G", 'underline'=>6)
     $menu8x_demo.bind("#{modifier}-g", proc{print "Goodbye(���褦�ʤ�)\n"})
 
     TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)', 
+      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)',
                        'menu'=>cascade_check, 'underline'=>0)
       oil = TkVariable.new(0)
       add('check', 'label'=>'����������', 'variable'=>oil)
@@ -144,18 +147,18 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
       lights = TkVariable.new(0)
       add('check', 'label'=>'�饤������', 'variable'=>lights)
       add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-          'command'=>proc{showVars($menu8x_demo, 
-                                   ['����������', oil], 
-                                   ['�ȥ�󥹥ߥå��������', trans], 
-                                   ['�֥졼������', brakes], 
+      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
+          'command'=>proc{showVars($menu8x_demo,
+                                   ['����������', oil],
+                                   ['�ȥ�󥹥ߥå��������', trans],
+                                   ['�֥졼������', brakes],
                                    ['�饤������', lights])} )
       invoke 1
       invoke 3
     }
 
     TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)', 
+      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)',
                        'menu'=>cascade_radio, 'underline'=>0)
       pointSize = TkVariable.new
       add('radio', 'label'=>'10 �ݥ����', 'variable'=>pointSize, 'value'=>10)
@@ -169,9 +172,9 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
       add('radio', 'label'=>'�ܡ����', 'variable'=>style, 'value'=>'bold')
       add('radio', 'label'=>'������å�', 'variable'=>style, 'value'=>'italic')
       add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-          'command'=>proc{showVars($menu8x_demo, 
-                                   ['�ݥ���ȥ�����', pointSize], 
+      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
+          'command'=>proc{showVars($menu8x_demo,
+                                   ['�ݥ���ȥ�����', pointSize],
                                    ['��������', style])} )
       invoke 1
       invoke 7
@@ -180,16 +183,16 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
 
   TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
     m.add('cascade', 'label'=>'Icons', 'menu'=>icon_menu, 'underline'=>0)
-    add('command', 
+    add('command',
         'bitmap'=>'@'+[$demo_dir,'..',
                         'images','pattern.xbm'].join(File::Separator),
-        'hidemargin'=>1, 
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+        'hidemargin'=>1,
+        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
                                      'text'=>'�����ʤ������򤷤���˥塼�ι��ܤϥƥ����ȤǤϤʤ��ӥåȥޥåפ�ɽ�����Ƥ��ޤ���������ʳ������Ǥ�¾�Υ�˥塼���ܤ��Ѥ��ޤ���',
-                                     'bitmap'=>'', 'default'=>0, 
+                                     'bitmap'=>'', 'default'=>0,
                                      'buttons'=>'λ��')} )
     ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
+      add('command', 'bitmap'=>icon, 'hidemargin'=>1,
           'command'=>proc{print "You invoked the #{icon} bitmap\n"})
     }
 
@@ -200,7 +203,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
     m.add('cascade', 'label'=>'More', 'menu'=>more_menu, 'underline'=>0)
     [ '����ȥ�','�̤Υ���ȥ�','���⤷�ʤ�','�ۤȤ�ɲ��⤷�ʤ�',
       '������յ������Τ�' ].each{|i|
-      add('command', 'label'=>i, 
+      add('command', 'label'=>i,
           'command'=>proc{print "You invoked \"#{i}\"\n"})
     }
   }
@@ -208,7 +211,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
   TkMenu.new(m) {|colors_menu|
     m.add('cascade', 'label'=>'Colors', 'menu'=>colors_menu, 'underline'=>1)
     ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c, 
+      add('command', 'label'=>c, 'background'=>c,
           'command'=>proc{print "You invoked \"#{c}\"\n"})
     }
   }
@@ -216,8 +219,8 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
   $menu8x_demo.configure('menu'=>m)
 }
 
-TkMenu.bind('<MenuSelect>', 
-            proc{|w| 
+TkMenu.bind('<MenuSelect>',
+            proc{|w|
               begin
                 label = w.entrycget('active', 'label')
               rescue
diff --git a/ext/tk/sample/demos-jp/menubu.rb b/ext/tk/sample/demos-jp/menubu.rb
index aa90a3087f..78418ce3ea 100644
--- a/ext/tk/sample/demos-jp/menubu.rb
+++ b/ext/tk/sample/demos-jp/menubu.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 require "tkcanvas"
 
 def optionMenu(menubutton, varName, firstValue, *rest)
@@ -16,7 +17,7 @@ def optionMenu(menubutton, varName, firstValue, *rest)
   for i in rest
     menu.add 'radio', 'label'=>i, 'variable'=>varName
   end
-  
+
   return menu
 end
 
@@ -32,16 +33,18 @@ $menubu_demo = TkToplevel.new {|w|
 
 positionWindow($menubu_demo)
 
+base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
+
 # version check
 if $tk_version.to_f < 8.0
 
 # label ����
-TkLabel.new($menubu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
     text("�¹Ԥ��褦�Ȥ���������ץȤ� Tk8.0 �ʾ�����ѤǤ��뵡ǽ�����Ѥ��Ƥ��뤿�ᡢ���ʤ��� Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} �Ǥ�����˼¹ԤǤ��ޤ��󡣤�äƥǥ�μ¹Ԥ���ߤ��ޤ����������������Υ����ɻ��ȥܥ���򲡤����Ȥǡ��¹Ԥ���ߤ��줿������ץȤΥ������򻲾Ȥ��뤳�Ȥϲ�ǽ�Ǥ���")
 }.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($menubu_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -60,7 +63,7 @@ TkFrame.new($menubu_demo) {|frame|
 
 else ; # Tk8.x
 
-body = TkFrame.new($menubu_demo)
+body = TkFrame.new(base_frame)
 body.pack('expand'=>'yes', 'fill'=>'both')
 
 below = TkMenubutton.new(body) {
@@ -155,7 +158,7 @@ center = TkFrame.new(body) {
   grid('row'=>1, 'column'=>1, 'sticky'=>'news')
 }
 
-TkFrame.new($menubu_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -186,7 +189,7 @@ msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
 TkFrame.new(center) {|f|
   menubuttonoptions = TkVariable.new
   mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions, 
+  options = optionMenu(mbutton, menubuttonoptions,
                        'one', 'two', 'three')
   mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
   paletteColor = TkVariable.new
diff --git a/ext/tk/sample/demos-jp/msgbox.rb b/ext/tk/sample/demos-jp/msgbox.rb
index 983e6b6589..ed5d01252e 100644
--- a/ext/tk/sample/demos-jp/msgbox.rb
+++ b/ext/tk/sample/demos-jp/msgbox.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # message boxes widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy 
+  $msgbox_demo.destroy
   $msgbox_demo = nil
 end
 
@@ -15,12 +16,14 @@ $msgbox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($msgbox_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"ɽ�����륢������ȥ�å������ܥå����μ��������ǲ������������� \"��å������ܥå���\" �ܥ���򲡤��ȡ����ꤷ����å������ܥå�����ɽ������ޤ���").pack('side'=>'top')
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+            'text'=>"�ޤ�ɽ�����륢������ȥ�å������ܥå����μ��������ǲ����������θ��\"��å������ܥå���\"�ܥ���򲡤��ȡ����ꤷ����å������ܥå�����ɽ������ޤ���").pack('side'=>'top')
 
 # frame ����
-TkFrame.new($msgbox_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -43,11 +46,11 @@ TkFrame.new($msgbox_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
-$msgbox_leftframe  = TkFrame.new($msgbox_demo)
-$msgbox_rightframe = TkFrame.new($msgbox_demo)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+$msgbox_leftframe  = TkFrame.new(base_frame)
+$msgbox_rightframe = TkFrame.new(base_frame)
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
                         'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
                         'pady'=>'.5c', 'padx'=>'.5c')
 
 TkLabel.new($msgbox_leftframe, 'text'=>'��������').pack('side'=>'top')
@@ -56,9 +59,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
 
 $msgboxIcon = TkVariable.new('info')
 ['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon, 
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16, 
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
                                         'anchor'=>'w', 'fill'=>'x')
 }
 
@@ -67,20 +70,20 @@ TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
 .pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
 
 $msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel', 
+['abortretryignore', 'ok', 'okcancel',
   'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType, 
-                    'relief'=>'flat', 'value'=>type, 'width'=>16, 
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+                    'relief'=>'flat', 'value'=>type, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
                                         'anchor'=>'w', 'fill'=>'x')
 }
 
 def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
+  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
                          'title'=>'Message', 'parent'=>w,
-                         'message'=>"����� \"#{$msgboxType.value}\" �Ȥ�������Υ�å������ܥå����ǡ�\"#{$msgboxIcon.value}\" �Υ�������ɽ������Ƥ��ޤ���")
+                         'message'=>"�����\"#{$msgboxType.value}\"�Ȥ�������Υ�å������ܥå����ǡ�\"#{$msgboxIcon.value}\"�Υ�������ɽ������Ƥ��ޤ���")
 
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
                 'message'=>"���ʤ��� \"#{button}\" �򲡤��ޤ����͡�")
 end
 
diff --git a/ext/tk/sample/demos-jp/msgbox2.rb b/ext/tk/sample/demos-jp/msgbox2.rb
new file mode 100644
index 0000000000..8c80e08d70
--- /dev/null
+++ b/ext/tk/sample/demos-jp/msgbox2.rb
@@ -0,0 +1,90 @@
+# -*- coding: euc-jp -*-
+#
+# message boxes widget demo (called by 'widget')
+#
+
+# toplevel widget ��¸�ߤ���к������
+if defined?($msgbox2_demo) && $msgbox2_demo
+  $msgbox2_demo.destroy
+  $msgbox2_demo = nil
+end
+
+# demo �Ѥ� toplevel widget ������
+$msgbox2_demo = TkToplevel.new {|w|
+  title("Message Box Demonstration")
+  iconname("messagebox")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
+
+# label ����
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+            'text'=>"�ޤ�ɽ�����륢������ȥ�å������ܥå����μ��������ǲ����������θ��\"��å������ܥå���\"�ܥ���򲡤��ȡ����ꤵ�줿�����ǡ���å������Ⱦܺ٥ƥ����ȤȤ���ä���å������ܥå�����ɽ������ޤ���").pack('side'=>'top')
+
+# frame ����
+TkFrame.new(base_frame) {|frame|
+  TkButton.new(frame) {
+    #text 'λ��'
+    text '�Ĥ���'
+    command proc{
+      tmppath = $msgbox2_demo
+      $msgbox2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text '�����ɻ���'
+    command proc{showCode 'msgbox2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text '��å������ܥå���'
+    command proc{showMessageBox2 $msgbox2_demo}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame ����
+$msgbox_leftframe  = TkFrame.new(base_frame)
+$msgbox_rightframe = TkFrame.new(base_frame)
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+                        'pady'=>'.5c', 'padx'=>'.5c')
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+                        'pady'=>'.5c', 'padx'=>'.5c')
+
+TkLabel.new($msgbox_leftframe, 'text'=>'��������').pack('side'=>'top')
+TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxIcon = TkVariable.new('info')
+['error', 'info', 'question', 'warning'].each {|icon|
+  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+TkLabel.new($msgbox_rightframe, 'text'=>'����').pack('side'=>'top')
+TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxType = TkVariable.new('ok')
+['abortretryignore', 'ok', 'okcancel',
+  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
+  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+                    'relief'=>'flat', 'value'=>type, 'width'=>16,
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+def showMessageBox2(w)
+  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
+                         'title'=>'Message', 'parent'=>w,
+                         'message'=>"\"#{$msgboxType.value}\"�����פΥ�å������ܥå���",
+                         'detail'=>"�����\"#{$msgboxType.value}\"�Ȥ�������Υ�å������ܥå����ǡ�\"#{$msgboxIcon.value}\"�Υ�������ɽ������Ƥ��ޤ������Υܥ���Τ����줫�����򤷤ƥ���å����Ƥ���������")
+
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
+                'message'=>"���ʤ��� \"#{button}\" �򲡤��ޤ����͡�")
+end
+
diff --git a/ext/tk/sample/demos-jp/paned1.rb b/ext/tk/sample/demos-jp/paned1.rb
index 8d16d03c08..987a073086 100644
--- a/ext/tk/sample/demos-jp/paned1.rb
+++ b/ext/tk/sample/demos-jp/paned1.rb
@@ -1,3 +1,5 @@
+# -*- coding: euc-jp -*-
+#
 # paned1.rb
 #
 # This demonstration script creates a toplevel window containing
@@ -6,7 +8,7 @@
 # based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
 
 if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy 
+  $paned1_demo.destroy
   $paned1_demo = nil
 end
 
@@ -16,8 +18,10 @@ $paned1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($paned1_demo, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 ���ο��դ����줿��ĤΥ�����ɥ��δ֤λ��ڤ��Ȥϡ���Ĥ��ΰ�򤽤줾��Υ�����ɥ��Τ����ʬ�䤹�뤿��Τ�ΤǤ������ܥ���ǻ��ڤ������ȡ�ʬ�䥵�����ѹ����������ǤϺ�ɽ���Ϥʤ��줺�����ꤵ�����Ȥ���ɽ������������ޤ����ޥ����ˤ����ڤ�������ɿ路�ƥ��������ѹ�����ɽ�����ʤ���褦�ˤ��������ϡ��ޥ���������ܥ����ȤäƤ���������
 �⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ panedwindow ��������Ƥ��ʤ�
@@ -27,7 +31,7 @@ TkLabel.new($paned1_demo,
 EOL
 
 # The bottom buttons
-TkFrame.new($paned1_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
@@ -40,9 +44,9 @@ TkFrame.new($paned1_demo){|f|
                }).pack(:side=>:left, :expand=>true)
 }
 
-TkPanedwindow.new($paned1_demo){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
+TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
+  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
+      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
 
-  add(TkLabel.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
-      TkLabel.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
+  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
 }
diff --git a/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
index 1e82eddda4..a1aee81690 100644
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ b/ext/tk/sample/demos-jp/paned2.rb
@@ -1,3 +1,5 @@
+# -*- coding: euc-jp -*-
+#
 # paned2.rb --
 #
 # This demonstration script creates a toplevel window containing
@@ -6,7 +8,7 @@
 # based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
 
 if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy 
+  $paned2_demo.destroy
   $paned2_demo = nil
 end
 
@@ -16,8 +18,10 @@ $paned2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($paned2_demo, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 ���Υ���������С��դ��Υ��������åȤ��֤��줿��ĤΥ�����ɥ��δ֤λ��ڤ��Ȥϡ���Ĥ��ΰ�򤽤줾��Υ�����ɥ��Τ����ʬ�䤹�뤿��Τ�ΤǤ������ܥ���ǻ��ڤ������ȡ�ʬ�䥵�����ѹ����������ǤϺ�ɽ���Ϥʤ��줺�����ꤵ�����Ȥ���ɽ������������ޤ����ޥ����ˤ����ڤ�������ɿ路�ƥ��������ѹ�����ɽ�����ʤ���褦�ˤ��������ϡ��ޥ���������ܥ����ȤäƤ���������
 �⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ panedwindow ��������Ƥ��ʤ�
@@ -27,7 +31,7 @@ TkLabel.new($paned2_demo,
 EOL
 
 # The bottom buttons
-TkFrame.new($paned2_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
@@ -43,47 +47,47 @@ TkFrame.new($paned2_demo){|f|
 paneList = TkVariable.new  # define as normal variable (not array)
 paneList.value = [         # ruby's array --> tcl's list
     'Ruby/Tk �Υ��������åȰ���',
-    'TkButton', 
-    'TkCanvas', 
-    'TkCheckbutton', 
-    'TkEntry', 
-    'TkFrame', 
-    'TkLabel', 
-    'TkLabelframe', 
-    'TkListbox', 
-    'TkMenu', 
-    'TkMenubutton', 
-    'TkMessage', 
-    'TkPanedwindow', 
-    'TkRadiobutton', 
-    'TkScale', 
-    'TkScrollbar', 
-    'TkSpinbox', 
-    'TkText', 
+    'TkButton',
+    'TkCanvas',
+    'TkCheckbutton',
+    'TkEntry',
+    'TkFrame',
+    'TkLabel',
+    'TkLabelframe',
+    'TkListbox',
+    'TkMenu',
+    'TkMenubutton',
+    'TkMessage',
+    'TkPanedwindow',
+    'TkRadiobutton',
+    'TkScale',
+    'TkScrollbar',
+    'TkSpinbox',
+    'TkText',
     'TkToplevel'
 ]
 
 # Create the pane itself
-TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
+TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
   pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
 
   add(TkFrame.new(f){|paned2_top|
         TkListbox.new(paned2_top, :listvariable=>paneList) {
           # Invert the first item to highlight it
-          itemconfigure(0, :background=>self.cget(:foreground), 
+          itemconfigure(0, :background=>self.cget(:foreground),
                            :foreground=>self.cget(:background) )
-          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right, 
+          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
                                                       :fill=>:y))
           pack(:fill=>:both, :expand=>true)
         }
-      }, 
+      },
 
       TkFrame.new(f, :height=>120) {|paned2_bottom|
         # The bottom window is a text widget with scrollbar
         paned2_xscr = TkScrollbar.new(paned2_bottom)
         paned2_yscr = TkScrollbar.new(paned2_bottom)
         paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
-          insert('1.0', '���������֤���Ƥ���Τϡ�' + 
+          insert('1.0', '���������֤���Ƥ���Τϡ�' +
                         '�������̤Υƥ����ȥ��������åȤǤ���')
           xscrollbar(paned2_xscr)
           yscrollbar(paned2_yscr)
diff --git a/ext/tk/sample/demos-jp/pendulum.rb b/ext/tk/sample/demos-jp/pendulum.rb
index d703c74d5a..48839aa58a 100644
--- a/ext/tk/sample/demos-jp/pendulum.rb
+++ b/ext/tk/sample/demos-jp/pendulum.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # This demonstration illustrates how Tcl/Tk can be used to construct
 # simulations of physical systems.
@@ -7,7 +8,7 @@
 
 # destroy toplevel widget for this demo script
 if defined?($pendulum_demo) && $pendulum_demo
-  $pendulum_demo.destroy 
+  $pendulum_demo.destroy
   $pendulum_demo = nil
 end
 
@@ -18,8 +19,10 @@ $pendulum_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
+
 # create label
-msg = TkLabel.new($pendulum_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,7 +31,7 @@ msg = TkLabel.new($pendulum_demo) {
 msg.pack('side'=>'top')
 
 # create frame
-TkFrame.new($pendulum_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -50,20 +53,22 @@ TkFrame.new($pendulum_demo) {|frame|
 class PendulumAnimationDemo
   def initialize(frame)
     # Create some structural widgets
-    pane = TkPanedWindow.new(frame).pack(:fill=>:both, :expand=>true)
-    pane.add(@lf1 = TkLabelFrame.new(pane, :text=>'Pendulum Simulation'))
-    pane.add(@lf2 = TkLabelFrame.new(pane, :text=>'Phase Space'))
+    @pane = TkPanedWindow.new(frame, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
+#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
+#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
+    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
+    @lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space')
 
     # Create the canvas containing the graphical representation of the
     # simulated system.
-    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white', 
+    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
                       :borderwidth=>2, :relief=>:sunken)
-    TkcText.new(@c, 5, 5, :anchor=>:nw, 
+    TkcText.new(@c, 5, 5, :anchor=>:nw,
                 :text=>'Click to Adjust Bob Start Position')
     # Coordinates of these items don't matter; they will be set properly below
     @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
     @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
-    @bob = TkcOval.new(@c, 1, 1, 2, 2, 
+    @bob = TkcOval.new(@c, 1, 1, 2, 2,
                        :width=>3, :fill=>'yellow', :outline=>'black')
     TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
 
@@ -73,22 +78,22 @@ class PendulumAnimationDemo
     # Create the canvas containing the phase space graph; this consists of
     # a line that gets gradually paler as it ages, which is an extremely
     # effective visual trick.
-    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white', 
+    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
                       :borderwidth=>2, :relief=>:sunken)
     @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
     @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
 
     @graph = {}
     90.step(0, -10){|i|
-      # Coordinates of these items don't matter; 
+      # Coordinates of these items don't matter;
       # they will be set properly below
       @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
     }
 
     # labels
-    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
                                :text=>'q', :font=>'Symbol 8')
-    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
                                :text=>'dq', :font=>'Symbol 8')
 
     # pack
@@ -100,24 +105,25 @@ class PendulumAnimationDemo
     @dTheta = 0.0
     @length = 150
 
-    # init display
-    showPendulum
-
     # animation loop
     @timer = TkTimer.new(15){ repeat }
 
     # binding
     @c.bindtags_unshift(btag = TkBindTag.new)
     btag.bind('Destroy'){ @timer.stop }
-    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x, y)}, '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x, y)}, '%x %y')
-    btag.bind('ButtonRelease-1', 
-              proc{|x, y| showPendulum(x, y); @timer.start }, '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w| 
-              @psh = h/2; 
+    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
+              '%x %y')
+    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
+    btag.bind('ButtonRelease-1',
+              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
+              '%x %y')
+
+    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
+
+    @k.bind('Configure', proc{|h, w|
+              h = h.to_i
+              w = w.to_i
+              @psh = h/2;
               @psw = w/2
               @x_axis.coords(2, @psh, w-2, @psh)
               @y_axis.coords(@psw, h-2, @psw, 2)
@@ -125,14 +131,22 @@ class PendulumAnimationDemo
               @label_dtheta.coords(w-6, @psh+4)
             }, '%h %w')
 
+    # add
+    Tk.update
+    @pane.add(@lf1)
+    @pane.add(@lf2)
+
+    # init display
+    showPendulum
+
     # animation start
     @timer.start(500)
   end
 
   # This procedure makes the pendulum appear at the correct place on the
-  # canvas. If the additional arguments x, y are passed instead of computing 
-  # the position of the pendulum from the length of the pendulum rod and its 
-  # angle, the length and angle are computed in reverse from the given 
+  # canvas. If the additional arguments x, y are passed instead of computing
+  # the position of the pendulum from the length of the pendulum rod and its
+  # angle, the length and angle are computed in reverse from the given
   # location (which is taken to be the centre of the pendulum bob.)
   def showPendulum(x=nil, y=nil)
     if x && y && (x != 160 || y != 25)
@@ -155,6 +169,10 @@ class PendulumAnimationDemo
   # rate at which the angle is changing (the first derivative with
   # respect to time.)
   def showPhase
+    unless @psw && @psh
+      @psw = @k.width/2
+      @psh = @k.height/2
+    end
     @points << @theta + @psw << -20*@dTheta + @psh
     if @points.length > 100
       @points = @points[-100..-1]
@@ -221,4 +239,4 @@ class PendulumAnimationDemo
 end
 
 # Start the animation processing
-PendulumAnimationDemo.new($pendulum_demo)
+PendulumAnimationDemo.new(base_frame)
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
index 902b144f72..a49ed00df8 100644
--- a/ext/tk/sample/demos-jp/plot.rb
+++ b/ext/tk/sample/demos-jp/plot.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # 2-D plot widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy 
+  $plot_demo.destroy
   $plot_demo = nil
 end
 
@@ -15,14 +16,16 @@ $plot_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($plot_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
             'text'=>"���Υ�����ɥ��ϴ�ñ��2�����Υץ��åȤ�ޤ�������Х� widget�Ǥ���ɽ�����줿����ޥ����ܥ���1�ǥɥ�å����ƥǡ����򤤤��뤳�Ȥ��Ǥ��ޤ���"){
   pack('side'=>'top')
 }
 
 # frame ����
-$plot_buttons = TkFrame.new($plot_demo) {|frame|
+$plot_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -41,54 +44,58 @@ $plot_buttons = TkFrame.new($plot_demo) {|frame|
 $plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # font ����
-plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  if $tk_version =~ /^4.*/
+    plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  else
+    font = 'Helvetica 18'
+  end
 
 # canvas ����
-$plot_canvas = TkCanvas.new($plot_demo,'relief'=>'raised','width'=>450,'height'=>300)
+$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
 $plot_canvas.pack('side'=>'top', 'fill'=>'x')
 
 # plot ����
 TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
 TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20, 
+TkcText.new($plot_canvas, 225, 20,
             'text'=>"��ñ�ʥץ��å�", 'font'=>plotFont, 'fill'=>'brown')
 
 (0..10).each {|i|
   x = 100 + (i * 30)
   TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254, 
+  TkcText.new($plot_canvas, x, 254,
               'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
 }
 (0..5).each {|i|
   y = 250 - (i * 40)
   TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y, 
+  TkcText.new($plot_canvas, 96, y,
               'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
 }
 
 for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
   x = 100 + (3*xx)
   y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6, 
+  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
                      'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
   item.addtag 'point'
 end
 
-$plot_canvas.itembind('point', 'Any-Enter', 
+$plot_canvas.itembind('point', 'Any-Enter',
                       proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave', 
+$plot_canvas.itembind('point', 'Any-Leave',
                       proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1', 
+$plot_canvas.itembind('point', '1',
                       proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1', 
+$plot_canvas.itembind('point', 'ButtonRelease-1',
                       proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion', 
+$plot_canvas.bind('B1-Motion',
                   proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
 
 $plot = {'lastX'=>0, 'lastY'=>0}
 
 # plotDown --
-# This method is invoked when the mouse is pressed over one of the 
+# This method is invoked when the mouse is pressed over one of the
 # data points.  It sets up state to allow the point to be dragged.
 #
 # Arguments:
diff --git a/ext/tk/sample/demos-jp/puzzle.rb b/ext/tk/sample/demos-jp/puzzle.rb
index ad69775aab..16d7ce497c 100644
--- a/ext/tk/sample/demos-jp/puzzle.rb
+++ b/ext/tk/sample/demos-jp/puzzle.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # widet demo 'puzzle' (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy 
+  $puzzle_demo.destroy
   $puzzle_demo = nil
 end
 
@@ -15,8 +16,10 @@ $puzzle_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($puzzle_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($puzzle_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($puzzle_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -46,22 +49,31 @@ TkFrame.new($puzzle_demo) {|frame|
 # frame ����
 #
 # Special trick: scrollbar widget ���������Ƥ��� trough color ���Ѥ��뤳�Ȥ�
-#                ������ʬ�Τ���ΰſ������򤷡����ꤹ�� 
+#                ������ʬ�Τ���ΰſ������򤷡����ꤹ��
 #
 begin
   if Tk.windowingsystem() == 'aqua'
-    frameSize = 160
+    frameWidth  = 168
+    frameHeight = 168
+  elsif Tk.default_widget_set == :Ttk
+    frameWidth  = 148
+    frameHeight = 124
   else
-    frameSize = 120
+    frameWidth  = 120
+    frameHeight = 120
   end
 rescue
-  frameSize = 120
+  frameWidth  = 120
+  frameHeight = 120
 end
- 
-s = TkScrollbar.new($puzzle_demo)
-base = TkFrame.new($puzzle_demo) {
-  width  frameSize
-  height frameSize
+
+# depend_on_button_width = true
+depend_on_button_width = false
+
+s = TkScrollbar.new(base_frame)
+base = TkFrame.new(base_frame) {
+  width  frameWidth
+  height frameHeight
   borderwidth 2
   relief 'sunken'
   bg s['troughcolor']
@@ -88,7 +100,10 @@ order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
     text num
     highlightthickness 0
     command def_puzzleswitch_proc(w, num)
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
+    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
+      base.width = w.winfo_reqwidth * 4
+    end
+  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
           'relwidth'=>0.25, 'relheight'=>0.25)
 }
 $xpos['space'] = 0.75
diff --git a/ext/tk/sample/demos-jp/radio.rb b/ext/tk/sample/demos-jp/radio.rb
index 5858b4222a..3355f25116 100644
--- a/ext/tk/sample/demos-jp/radio.rb
+++ b/ext/tk/sample/demos-jp/radio.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # radiobutton widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy 
+  $radio_demo.destroy
   $radio_demo = nil
 end
 
@@ -15,8 +16,10 @@ $radio_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($radio_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -29,7 +32,7 @@ size = TkVariable.new
 color = TkVariable.new
 
 # frame ����
-TkFrame.new($radio_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -49,14 +52,14 @@ TkFrame.new($radio_demo) {|frame|
   TkButton.new(frame) {
     text '�ѿ�����'
     command proc{
-      showVars($radio_demo, ['size', size], ['color', color])
+      showVars(base_frame, ['size', size], ['color', color])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
-f_left = TkFrame.new($radio_demo)
-f_right = TkFrame.new($radio_demo)
+f_left = TkFrame.new(base_frame)
+f_right = TkFrame.new(base_frame)
 f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 
diff --git a/ext/tk/sample/demos-jp/radio2.rb b/ext/tk/sample/demos-jp/radio2.rb
index 5ac877d99a..91496beb6d 100644
--- a/ext/tk/sample/demos-jp/radio2.rb
+++ b/ext/tk/sample/demos-jp/radio2.rb
@@ -1,3 +1,5 @@
+# -*- coding: euc-jp -*-
+#
 # radio2.rb
 #
 # This demonstration script creates a toplevel window containing
@@ -8,7 +10,7 @@
 
 # toplevel widget
 if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy 
+  $radio2_demo.destroy
   $radio2_demo = nil
 end
 
@@ -19,8 +21,10 @@ $radio2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# label 
-msg = TkLabel.new($radio2_demo) {
+base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -28,13 +32,13 @@ msg = TkLabel.new($radio2_demo) {
 }
 msg.pack('side'=>'top')
 
-# 
+#
 size = TkVariable.new
 color = TkVariable.new
 align = TkVariable.new
 
-# frame 
-TkFrame.new($radio2_demo) {|frame|
+# frame
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -54,24 +58,24 @@ TkFrame.new($radio2_demo) {|frame|
   TkButton.new(frame) {
     text '�ѿ�����'
     command proc{
-      showVars($radio2_demo, 
+      showVars(base_frame,
                ['size', size], ['color', color], ['compound', align])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# frame 
-f_left  = TkLabelFrame.new($radio2_demo, 'text'=>'ʸ��������', 
+# frame
+f_left  = TkLabelFrame.new(base_frame, 'text'=>'ʸ��������',
                            'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new($radio2_demo, 'text'=>'��', 
+f_mid   = TkLabelFrame.new(base_frame, 'text'=>'��',
                            'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new($radio2_demo, 'text'=>'�ӥåȥޥå�����', 
+f_right = TkLabelFrame.new(base_frame, 'text'=>'�ӥåȥޥå�����',
                            'pady'=>2, 'padx'=>2)
 f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
 
-# radiobutton 
+# radiobutton
 [10, 12, 18, 24].each {|sz|
   TkRadioButton.new(f_left) {
     text "�ݥ���ȥ����� #{sz}"
@@ -91,14 +95,15 @@ f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
   }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
 }
 
-label = TkLabel.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead', 
+# label = TkLabel.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
                     'compound'=>'left')
 label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
 label.height(TkWinfo.reqheight(label))
 abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
   lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
-                    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+                    'value'=>lower, 'indicatoron'=>0, 'width'=>7,
                     'command'=>proc{label.compound(align.value)})
 }
 
diff --git a/ext/tk/sample/demos-jp/radio3.rb b/ext/tk/sample/demos-jp/radio3.rb
index 6e9a0f750b..763c522448 100644
--- a/ext/tk/sample/demos-jp/radio3.rb
+++ b/ext/tk/sample/demos-jp/radio3.rb
@@ -1,3 +1,5 @@
+# -*- coding: euc-jp -*-
+#
 # radio3.rb
 #
 # This demonstration script creates a toplevel window containing
@@ -8,7 +10,7 @@
 
 # toplevel widget
 if defined?($radio3_demo) && $radio3_demo
-  $radio3_demo.destroy 
+  $radio3_demo.destroy
   $radio3_demo = nil
 end
 
@@ -19,8 +21,10 @@ $radio3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-# label 
-msg = TkLabel.new($radio3_demo) {
+base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
+
+# label
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -33,50 +37,50 @@ size = TkVariable.new
 color = TkVariable.new
 align = TkVariable.new
 
-# frame 
-TkFrame.new($radio3_demo) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+# frame
+TkFrame.new(base_frame) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
          :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         TkButton.new(frame, :text=>'�ѿ�����', 
-                      :image=>$image['view'], :compound=>:left, 
+  TkGrid('x',
+         TkButton.new(frame, :text=>'�ѿ�����',
+                      :image=>$image['view'], :compound=>:left,
                       :command=>proc{
-                        showVars($radio3_demo, ['size', size], 
+                        showVars(base_frame, ['size', size],
                                  ['color', color], ['compound', align])
-                      }), 
-         TkButton.new(frame, :text=>'�����ɻ���', 
-                      :image=>$image['view'], :compound=>:left, 
-                      :command=>proc{showCode 'radio3'}), 
-         TkButton.new(frame, :text=>'�Ĥ���', 
-                      :image=>$image['delete'], :compound=>:left, 
+                      }),
+         TkButton.new(frame, :text=>'�����ɻ���',
+                      :image=>$image['view'], :compound=>:left,
+                      :command=>proc{showCode 'radio3'}),
+         TkButton.new(frame, :text=>'�Ĥ���',
+                      :image=>$image['delete'], :compound=>:left,
                       :command=>proc{
                         tmppath = $radio3_demo
                         $radio3_demo = nil
                         $showVarsWin[tmppath.path] = nil
                         tmppath.destroy
-                      }), 
+                      }),
          :padx=>4, :pady=>4)
   frame.grid_columnconfigure(0, :weight=>1)
   TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
 }
 
-# frame 
-f_left  = TkLabelFrame.new($radio3_demo, 'text'=>'ʸ��������', 
+# frame
+f_left  = TkLabelFrame.new(base_frame, 'text'=>'ʸ��������',
                            'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new($radio3_demo, 'text'=>'��', 
+f_mid   = TkLabelFrame.new(base_frame, 'text'=>'��',
                            'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new($radio3_demo, 'text'=>'�ӥåȥޥå�����', 
+f_right = TkLabelFrame.new(base_frame, 'text'=>'�ӥåȥޥå�����',
                            'pady'=>2, 'padx'=>2)
 f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
 f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
 f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
 
-TkButton.new($radio3_demo, 'text'=>'�ȥ饤���ơ���', 
+TkButton.new(base_frame, 'text'=>'�ȥ饤���ơ���',
              'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
   grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
 }
 
-# radiobutton 
+# radiobutton
 [10, 12, 14, 18, 24].each {|sz|
   TkRadioButton.new(f_left) {
     text "�ݥ���ȥ����� #{sz}"
@@ -99,13 +103,14 @@ TkButton.new($radio3_demo, 'text'=>'�ȥ饤���ơ���',
   }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
 }
 
-label = TkLabel.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead', 
+# label = TkLabel.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
                     'compound'=>'left')
 label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
 label.height(TkWinfo.reqheight(label))
 a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
-                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7, 
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
                     'command'=>proc{label.compound(align.value)})
 }
 
diff --git a/ext/tk/sample/demos-jp/rolodex-j b/ext/tk/sample/demos-jp/rolodex-j
index dcc18cfa51..6c3ea7a484 100644
--- a/ext/tk/sample/demos-jp/rolodex-j
+++ b/ext/tk/sample/demos-jp/rolodex-j
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: euc-jp -*-
 #
 # rolodex --
 # ���Υ�����ץȤ� Tom LaStrange �� rolodex �ΰ����Ǥ���
diff --git a/ext/tk/sample/demos-jp/ruler.rb b/ext/tk/sample/demos-jp/ruler.rb
index 94b4c921d3..a721b95a6a 100644
--- a/ext/tk/sample/demos-jp/ruler.rb
+++ b/ext/tk/sample/demos-jp/ruler.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # ruler widget demo (called by 'widget')
 #
@@ -17,7 +18,7 @@ end
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy 
+  $ruler_demo.destroy
   $ruler_demo = nil
 end
 
@@ -28,14 +29,16 @@ $ruler_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-TkLabel.new($ruler_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
             'text'=>"���Υ����Х�widget�ϥ롼�顼���Ϸ��Ǥ����롼�顼�α��ˤ���Τϥ��֥��ȥåפΰ�ͤǡ������������ĥ�äƤ��뤳�Ȥˤ�äƥ��֥��ȥåפ��뤳�Ȥ��Ǥ��ޤ����ޤ������Ǥˤ��륿�֥��ȥåפ�ư�������Ȥ�Ǥ��ޤ������֥��ȥåפ�����ޤ��ϲ����ˤ������ɽ�������ޤǥɥ�å�����ȡ��ޥ����ܥ����Υ�������ˤ��Υ��֥��ȥåפϾä��ޤ���"){
   pack('side'=>'top')
 }
 
 # frame ����
-$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
+$ruler_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -54,13 +57,13 @@ $ruler_buttons = TkFrame.new($ruler_demo) {|frame|
 $ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas ����
-$ruler_canvas = TkCanvas.new($ruler_demo, 'width'=>'14.8c', 'height'=>'2.5c')
+$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
 $ruler_canvas.pack('side'=>'top', 'fill'=>'x')
 
 # ������
 unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y, 
-                               :top, :bottom, :size, :normalStyle, 
+  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
+                               :top, :bottom, :size, :normalStyle,
                                :activeStyle, :deleteStyle).new
 end
 $demo_rulerInfo.grid = '.25c'
@@ -72,17 +75,17 @@ $demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
 $demo_rulerInfo.normalStyle = {'fill'=>'black'}
 if TkWinfo.depth($ruler_canvas) > 1
   $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red', 
-    'stipple'=>'@'+[$demo_dir, '..', 
+  $demo_rulerInfo.deleteStyle = {'fill'=>'red',
+    'stipple'=>'@'+[$demo_dir, '..',
                      'images', 'gray25.xbm'].join(File::Separator)}
 else
   $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black', 
-    'stipple'=>'@'+[$demo_dir, '..', 
+  $demo_rulerInfo.deleteStyle = {'fill'=>'black',
+    'stipple'=>'@'+[$demo_dir, '..',
                      'images', 'gray25.xbm'].join(File::Separator)}
 end
 
-TkcLine.new($ruler_canvas, 
+TkcLine.new($ruler_canvas,
             '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
 (0..11).each{|i|
   x = i+1
@@ -96,21 +99,21 @@ TkcLine.new($ruler_canvas,
 $rulerTag_well = TkcTag.new($ruler_canvas)
 $ruler_canvas\
 .addtag_withtag($rulerTag_well,
-                TkcRectangle.new($ruler_canvas, 
-                                 '13.2c', '1c', '13.8c', '0.5c', 
-                                 'outline'=>'black', 
+                TkcRectangle.new($ruler_canvas,
+                                 '13.2c', '1c', '13.8c', '0.5c',
+                                 'outline'=>'black',
                                  'fill'=>($ruler_canvas\
                                           .configinfo('background'))[4]) )
 $ruler_canvas\
 .addtag_withtag($rulerTag_well,
-                rulerMkTab($ruler_canvas, 
-                           TkWinfo.pixels($ruler_canvas, '13.5c'), 
+                rulerMkTab($ruler_canvas,
+                           TkWinfo.pixels($ruler_canvas, '13.5c'),
                            TkWinfo.pixels($ruler_canvas, '.65c') ) )
 
 $rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1', 
+$ruler_canvas.itembind('tab', '1',
                        proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion', 
+$ruler_canvas.bind('B1-Motion',
                    proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
 $ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
 
diff --git a/ext/tk/sample/demos-jp/sayings.rb b/ext/tk/sample/demos-jp/sayings.rb
index ce195a0e53..b3bdbe0bc5 100644
--- a/ext/tk/sample/demos-jp/sayings.rb
+++ b/ext/tk/sample/demos-jp/sayings.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # listbox widget demo 'sayings' (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy 
+  $sayings_demo.destroy
   $sayings_demo = nil
 end
 
@@ -15,8 +16,10 @@ $sayings_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($sayings_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($sayings_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($sayings_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -45,7 +48,7 @@ TkFrame.new($sayings_demo) {|frame|
 
 # frame ����
 sayings_lbox = nil
-TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
+TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   sv = TkScrollbar.new(w)
   sh = TkScrollbar.new(w, 'orient'=>'horizontal')
   sayings_lbox = TkListbox.new(w) {
@@ -64,11 +67,11 @@ TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
     sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
 
   else
-    sayings_lbox.grid('row'=>0, 'column'=>0, 
+    sayings_lbox.grid('row'=>0, 'column'=>0,
                       'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1, 
+    sv.grid('row'=>0, 'column'=>1,
             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0, 
+    sh.grid('row'=>1, 'column'=>0,
             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
     TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
index f5268f987f..293ae83910 100644
--- a/ext/tk/sample/demos-jp/search.rb
+++ b/ext/tk/sample/demos-jp/search.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # Text Search widget demo (called by 'widget')
 #
@@ -57,13 +58,13 @@ end
 
 def textToggle(cmd1,sleep1,cmd2,sleep2)
   sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep}, 
+  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
               -1, cmd1, cmd2).start(sleep1)
 end
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($search_demo) && $search_demo
-  $search_demo.destroy 
+  $search_demo.destroy
   $search_demo = nil
 end
 
@@ -74,8 +75,10 @@ $search_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
+
 # frame ����
-$search_buttons = TkFrame.new($search_demo) {|frame|
+$search_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -94,68 +97,68 @@ $search_buttons = TkFrame.new($search_demo) {|frame|
 $search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'�ե�����̾:', 
+TkFrame.new(base_frame) {|f|
+  TkLabel.new(f, 'text'=>'�ե�����̾:',
               'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40, 
+  TkEntry.new(f, 'width'=>40,
               'textvariable'=>$search_fileName) {
     pack('side'=>'left')
     bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
                         $search_string_entry.focus})
     focus
   }
-  TkButton.new(f, 'text'=>'�ɤ߹���', 
-               'command'=>proc{textLoadFile($search_text, 
+  TkButton.new(f, 'text'=>'�ɤ߹���',
+               'command'=>proc{textLoadFile($search_text,
                                             $search_fileName.value)})\
   .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
 }.pack('side'=>'top', 'fill'=>'x')
 
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'����ʸ����:', 
+TkFrame.new(base_frame) {|f|
+  TkLabel.new(f, 'text'=>'����ʸ����:',
               'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40, 
+  $search_string_entry = TkEntry.new(f, 'width'=>40,
                                      'textvariable'=>$search_searchString) {
     pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value, 
+    bind('Return', proc{textSearch($search_text, $search_searchString.value,
                                    $search_Tag)})
   }
-  TkButton.new(f, 'text'=>'ȿž', 
-               'command'=>proc{textSearch($search_text, 
-                                          $search_searchString.value, 
+  TkButton.new(f, 'text'=>'ȿž',
+               'command'=>proc{textSearch($search_text,
+                                          $search_searchString.value,
                                           $search_Tag)}) {
     pack('side'=>'left', 'pady'=>5, 'padx'=>10)
   }
 }.pack('side'=>'top', 'fill'=>'x')
 
-$search_text = TkText.new($search_demo, 'setgrid'=>true) {|t|
+$search_text = TkText.new(base_frame, 'setgrid'=>true) {|t|
   $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new($search_demo, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
+  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
     t.yscrollcommand(proc{|first,last| sc.set first,last})
     pack('side'=>'right', 'fill'=>'y')
   }
   pack('expand'=>'yes', 'fill'=>'both')
-}  
+}
 
 # Set up display styles for text highlighting.
 
 if TkWinfo.depth($search_demo) > 1
   textToggle(proc{
-               $search_Tag.configure('background'=>'#ce5555', 
+               $search_Tag.configure('background'=>'#ce5555',
                                      'foreground'=>'white')
              },
-             800, 
+             800,
              proc{
                $search_Tag.configure('background'=>'', 'foreground'=>'')
              },
              200 )
 else
   textToggle(proc{
-               $search_Tag.configure('background'=>'black', 
+               $search_Tag.configure('background'=>'black',
                                      'foreground'=>'white')
              },
-             800, 
+             800,
              proc{
                $search_Tag.configure('background'=>'', 'foreground'=>'')
              },
@@ -168,9 +171,14 @@ $search_text.insert('1.0', "\
 ����ȥ��ʸ��������Ϥ���<�꥿����> �򲡤�����ȿž�ץܥ���򲡤��Ƥ� \
 ������������ȥե�������Ρ�����ʸ����Ȱ��פ�����ʬ������ \"search_Tag\" \
 �Ȥ����������Ĥ���졢������ɽ��°���Ȥ��Ƥ���ʸ�������Ǥ���褦�� \
-���ꤵ��ޤ���")
+���ꤵ��ޤ���\n")
+$search_text.insert('end', "\
+�ե������ɤ߹��ߤΥ����ȥǥ��쥯�ȥ�� \"#{Dir.pwd}\" �Ǥ���\
+")
 $search_text.set_insert '0.0'
 
 $search_fileName.value = ''
 $search_searchString.value = ''
 
+$search_text.width = 60
+$search_text.height = 20
diff --git a/ext/tk/sample/demos-jp/spin.rb b/ext/tk/sample/demos-jp/spin.rb
index c7b8096723..2bcc3217e6 100644
--- a/ext/tk/sample/demos-jp/spin.rb
+++ b/ext/tk/sample/demos-jp/spin.rb
@@ -1,3 +1,5 @@
+# -*- coding: euc-jp -*-
+#
 # spin.rb --
 #
 # This demonstration script creates several spinbox widgets.
@@ -5,7 +7,7 @@
 # based on Tcl/Tk8.4.4 widget demos
 
 if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy 
+  $spin_demo.destroy
   $spin_demo = nil
 end
 
@@ -15,10 +17,12 @@ $spin_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($spin_demo, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'5i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
-���ˤϣ�����Υ��ԥ�ܥå�����ɽ������Ƥ��ޤ���\
+���ˤϣ�����Υ��ԥ�ܥå�����ɽ������Ƥ��ޤ���
 ���줾�졢�ޥ��������򤷤�ʸ�������Ϥ��뤳�Ȥ��Ǥ��ޤ���
 �Խ����Ȥ��Ƥϡ�Emacs ������¿���˲ä��ơ�����Ū��
 Motif �����Υ��������ݡ��Ȥ���Ƥ��ޤ������Ȥ��С�
@@ -34,11 +38,11 @@ Backspace �� Control-h �Ȥ����ϥ�������κ�¦��ʸ����
 �⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤
 �֥�꤬ spinbox ���������åȤ�������Ƥ��ʤ���硢����
 �ǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ������ξ��ˤ� spinbox ����
-�����åȤ���������Ƥ���褦�ʤ�꿷�����С������� Tk 
+�����åȤ���������Ƥ���褦�ʤ�꿷�����С������� Tk
 ���Ȥ߹�碌�ƻ�褦�ˤ��Ƥ���������
 EOL
 
-TkFrame.new($spin_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
@@ -52,16 +56,16 @@ TkFrame.new($spin_demo){|f|
 }
 
 australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 
+    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
     'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
 ]
 
 [
-  TkSpinbox.new($spin_demo, :from=>1, :to=>10, :width=>10, :validate=>:key, 
+  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
                 :validatecommand=>[
                   proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]), 
-  TkSpinbox.new($spin_demo, :from=>0, :to=>3, :increment=>0.5, 
-                :format=>'%05.2f', :width=>10), 
-  TkSpinbox.new($spin_demo, :values=>australianCities, :width=>10)
+                ]),
+  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
+                :format=>'%05.2f', :width=>10),
+  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
 ].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-jp/states.rb b/ext/tk/sample/demos-jp/states.rb
index dfae821261..f354d28d84 100644
--- a/ext/tk/sample/demos-jp/states.rb
+++ b/ext/tk/sample/demos-jp/states.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # listbox widget demo 'states' (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($states_demo) && $states_demo
-  $states_demo.destroy 
+  $states_demo.destroy
   $states_demo = nil
 end
 
@@ -15,8 +16,10 @@ $states_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
+
 # label ����
-msg = TkLabel.new($states_demo) {
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -25,7 +28,7 @@ msg = TkLabel.new($states_demo) {
 msg.pack('side'=>'top')
 
 # frame ����
-TkFrame.new($states_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -45,7 +48,7 @@ TkFrame.new($states_demo) {|frame|
 
 # frame ����
 states_lbox = nil
-TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
+TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
   s = TkScrollbar.new(w)
   states_lbox = TkListbox.new(w) {
     setgrid 1
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
index 59e406bc80..3189e1f6d8 100644
--- a/ext/tk/sample/demos-jp/style.rb
+++ b/ext/tk/sample/demos-jp/style.rb
@@ -1,13 +1,15 @@
+# -*- coding: euc-jp -*-
 #
 # text (display styles) widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($style_demo) && $style_demo
-  $style_demo.destroy 
+  $style_demo.destroy
   $style_demo = nil
 end
 
+
 # demo �Ѥ� toplevel widget ������
 $style_demo = TkToplevel.new {|w|
   title("Text Demonstration - Display Styles")
@@ -15,8 +17,10 @@ $style_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
+
 # frame ����
-TkFrame.new($style_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -33,14 +37,16 @@ TkFrame.new($style_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
+
 # text ����
-TkText.new($style_demo){|t|
+txt = TkText.new(base_frame){|t|
   # ����
   setgrid 'true'
-  width  70
-  height 32
+  #width  70
+  #height 32
   wrap 'word'
-  TkScrollbar.new($style_demo) {|s|
+  font $font
+  TkScrollbar.new(base_frame) {|s|
     pack('side'=>'right', 'fill'=>'y')
     command proc{|*args| t.yview(*args)}
     t.yscrollcommand proc{|first,last| s.set first,last}
@@ -48,11 +54,20 @@ TkText.new($style_demo){|t|
   pack('expand'=>'yes', 'fill'=>'both')
 
   # �ƥ����ȥ������� (�ե���ȴ�Ϣ)
-  style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-  style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
+  family = 'Courier'
+
+  if $tk_version =~ /^4.*/
+    style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
+    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
     style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
+    # style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
     style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+  else
+    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
+    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
+    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
+    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
+  end
 ###
 #  case($tk_version)
 #  when /^4.*/
@@ -61,13 +76,13 @@ TkText.new($style_demo){|t|
 #  when /^8.*/
 #    unless $style_demo_do_first
 #      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii', 
+#      Tk.tk_call('font', 'create', '@bigascii',
 #                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii', 
+#      Tk.tk_call('font', 'create', '@smallascii',
 #                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont', 
+#      Tk.tk_call('font', 'create', '@cBigFont',
 #                '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont', 
+#      Tk.tk_call('font', 'create', '@cSmallFont',
 #                '-compound', '@smallascii @kanji')
 #    end
 #    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
@@ -81,24 +96,24 @@ TkText.new($style_demo){|t|
     style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
     style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
   else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
+    style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
                                      'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
+    style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
                                      'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
+    style_tag_raised = TkTextTag.new(t, 'background'=>'white',
                                      'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
+    style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
                                      'relief'=>'sunken', 'borderwidth'=>1)
   end
 
   # �ƥ����ȥ������� (����¾)
   if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+                                        'borderwidth'=>0,
                                         'bgstipple'=>'gray25')
   else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+                                        'borderwidth'=>0,
                                         'bgstipple'=>'gray12')
   end
   style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
@@ -106,8 +121,13 @@ TkText.new($style_demo){|t|
   style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
   style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
   style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  if $tk_version =~ /^4.*/
+    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  else
+    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
+    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
+  end
   style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
                                     'rmargin'=>'10m')
   style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
@@ -197,9 +217,9 @@ X')
 9. �ޡ�����', style_tag_big)
   insert('end', '�ƥ����Ȥκ�¦��;ʬ�ʶ�����֤����Ȥ��Ǥ��ޤ�:
 ')
-  insert('end', '��������ϥޡ�����λ�����Ǥ��������꡼��', 
+  insert('end', '��������ϥޡ�����λ�����Ǥ��������꡼��',
          style_tag_margins)
-  insert('end', '����ޤ��֤����ɽ������Ƥ���1�ԤΥƥ����ȤǤ���', 
+  insert('end', '����ޤ��֤����ɽ������Ƥ���1�ԤΥƥ����ȤǤ���',
          style_tag_margins)
   insert('end', '��¦�ˤ�2����Υޡ����������ޤ���', style_tag_margins)
   insert('end', '1���ܤ��Ф����Τȡ�', style_tag_margins)
@@ -221,9 +241,9 @@ spacing3')
   insert('end', '�ζ��֤���
 �����򼨤��ޤ���
 ')
-  insert('end', '�����Υ���ǥ�Ȥ��줿����ϤɤΤ褦��', 
+  insert('end', '�����Υ���ǥ�Ȥ��줿����ϤɤΤ褦��',
          style_tag_spacing)
-  insert('end', '���ڡ����󥰤����Ԥ���Τ��򼨤��ޤ���', 
+  insert('end', '���ڡ����󥰤����Ԥ���Τ��򼨤��ޤ���',
          style_tag_spacing)
   insert('end', '������ϼºݤϥƥ�����widget', style_tag_spacing)
   insert('end', '��1�Ԥǡ�widget�ˤ�ä��ޤ���ޤ�Ƥ��ޤ���
@@ -233,11 +253,11 @@ spacing3')
   insert('end', '����ˤ�ꡢ����δ֤��礭�ʴֳ֤�', style_tag_spacing)
   insert('end', '¸�ߤ��Ƥ��ޤ���', style_tag_spacing)
   insert('end', 'Spacing2��2point�����ꤵ��Ƥ��ޤ���', style_tag_spacing)
-  insert('end', '������������ˤۤ�ξ����ֳ֤�¸�ߤ��Ƥ��ޤ���', 
+  insert('end', '������������ˤۤ�ξ����ֳ֤�¸�ߤ��Ƥ��ޤ���',
          style_tag_spacing)
   insert('end', 'Spacing3�Ϥ�����Ǥϻ��Ѥ���Ƥ��ޤ���
 ', style_tag_spacing)
-  insert('end', '�ֳ֤��ɤ��ˤ��뤫�򸫤�����С������������', 
+  insert('end', '�ֳ֤��ɤ��ˤ��뤫�򸫤�����С������������',
          style_tag_spacing)
   insert('end', '�ʤ��ǥƥ����Ȥ����򤷤Ƥ��������������', style_tag_spacing)
   insert('end', 'ȿž������ʬ�ˤ�;ʬ�ˤȤ�줿�ֳ֤�', style_tag_spacing)
@@ -246,3 +266,5 @@ spacing3')
 
 }
 
+txt.width 70
+txt.height 32
diff --git a/ext/tk/sample/demos-jp/tcolor b/ext/tk/sample/demos-jp/tcolor
index c7f7ec7289..17f7e1347e 100644
--- a/ext/tk/sample/demos-jp/tcolor
+++ b/ext/tk/sample/demos-jp/tcolor
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: euc-jp -*-
 #
 # tcolor --
 # ���Υ�����ץȤ�RGB,HSB,CYM�����򥵥ݡ��Ȥ���
diff --git a/ext/tk/sample/demos-jp/text.rb b/ext/tk/sample/demos-jp/text.rb
index 0057d5dbdc..ea15064830 100644
--- a/ext/tk/sample/demos-jp/text.rb
+++ b/ext/tk/sample/demos-jp/text.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # text (basic facilities) widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($text_demo) && $text_demo
-  $text_demo.destroy 
+  $text_demo.destroy
   $text_demo = nil
 end
 
@@ -15,6 +16,8 @@ $text_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
+
 # version check
 if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
   undo_support = false
@@ -23,7 +26,7 @@ else
 end
 
 # frame ����
-TkFrame.new($text_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -41,13 +44,13 @@ TkFrame.new($text_demo) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # text ����
-TkText.new($text_demo){|t|
+TkText.new(base_frame){|t|
   # ����
   relief 'sunken'
   bd 2
   setgrid 1
   height 30
-  TkScrollbar.new($text_demo) {|s|
+  TkScrollbar.new(base_frame) {|s|
     pack('side'=>'right', 'fill'=>'y')
     command proc{|*args| t.yview(*args)}
     t.yscrollcommand proc{|first,last| s.set first,last}
diff --git a/ext/tk/sample/demos-jp/textpeer.rb b/ext/tk/sample/demos-jp/textpeer.rb
new file mode 100644
index 0000000000..de604f1940
--- /dev/null
+++ b/ext/tk/sample/demos-jp/textpeer.rb
@@ -0,0 +1,82 @@
+# -*- coding: euc-jp -*-
+#
+# text widget peering demo (called by 'widget')
+#
+# based on Tcl/Tk8.5.0 widget demos
+
+if defined?($textpeer_demo) && $textpeer_demo
+  $textpeer_demo.destroy
+  $textpeer_demo = nil
+end
+
+# demo toplevel widget
+$textpeer_demo = TkToplevel.new {|w|
+  title("Text Wdget Peering Demonstration")
+  iconname("textpeer")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
+
+count = [0]
+
+## Define a widget that we peer from; it won't ever actually be shown though
+first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
+first.insert :end,"���Υǥ�ϰ�Ĥ��Ȥ��������ƥ����ȥ��������åȤ򼨤��ޤ���"
+first.insert :end,"�����Υƥ����ȥ��������åȤ�����(�ԥ�;peer)�δط���"
+first.insert :end,"�ʤäƤ��ޤ���"
+first.insert :end,"�����ϡ����פȤʤ�ǡ�����ǥ�϶��̤Τ�Τ�����ޤ�����"
+first.insert :end,"����ɽ�����֡��Խ����֡������ϰ�(selection)�ˤĤ��Ƥ�"
+first.insert :end,"��Ω�˻��Ĥ��Ȥ��Ǥ��ޤ���"
+first.insert :end,"�ƥƥ����ȥ��������åȤ��Ƥˤ���"
+first.insert :end,"�֥ԥ�(peer)�κ����ץܥ����Ȥ��С�"
+first.insert :end,"�����ʥԥ����ɲä��뤳�Ȥ���ǽ�Ǥ���"
+first.insert :end,"�ޤ��֥ԥ�(peer)�ξõ�ץܥ����Ȥ��С�"
+first.insert :end,"����Υԥ����������åȤ�õ�뤳�Ȥ�Ǥ��ޤ���"
+
+Tk.update_idletasks  ## for 'first' widget
+
+## Procedures to make and kill clones; most of this is just so that the demo
+## looks nice...
+def makeClone(count, win, txt)
+  cnt = (count[0] += 1)
+  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
+  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
+  peer.yscrollbar sbar
+  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}",
+                    :text=>'�ԥ�(peer)�κ���',
+                    :command=>proc{makeClone(count, win, peer)})
+  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}",
+                    :text=>'�ԥ�(peer)�ξõ�',
+                    :command=>proc{killClone(win, cnt)})
+  row = cnt * 2
+  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
+  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
+  TkGrid.configure(b1,  b2, :sticky=>'new')
+  TkGrid.rowconfigure(win,  b2, :weight=>1)
+end
+
+def killClone(win, cnt)
+  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}",
+             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
+end
+
+## Now set up the GUI
+makeClone(count, base_frame, first)
+makeClone(count, base_frame, first)
+first.destroy
+
+## See Code / Dismiss buttons
+TkFrame.new(base_frame){|f|
+  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
+                 $textpeer_demo.destroy
+                 $textpeer_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
+                 showCode 'textpeer'
+               }).pack(:side=>:left, :expand=>true)
+
+  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
+}
+TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/toolbar.rb b/ext/tk/sample/demos-jp/toolbar.rb
new file mode 100644
index 0000000000..570d52704f
--- /dev/null
+++ b/ext/tk/sample/demos-jp/toolbar.rb
@@ -0,0 +1,136 @@
+# -*- coding: euc-jp -*-
+#
+# toolbar.rb --
+#
+# This demonstration script creates a toolbar that can be torn off.
+#
+# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($toolbar_demo) && $toolbar_demo
+  $toolbar_demo.destroy
+  $toolbar_demo = nil
+end
+
+$toolbar_demo = TkToplevel.new {|w|
+  title("Ttk Menu Buttons")
+  iconname("toolbar")
+  positionWindow(w)
+}
+
+base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
+
+if Tk.windowingsystem != 'aqua'
+  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
+���Υǥ�Ǥϡ��ġ���С���ɤΤ褦�ˤ���Ŭ�ڤ˥ơ����б������뤫��\
+�ޤ����ɤΤ褦�ˤ����ڤ�Υ����ǽ�ˤ��뤫�򼨤��Ƥ��ޤ�\
+�ʤ��������ġ���С����ڤ�Υ���ˤ�Tcl/Tk8.5�ʾ�ε�ǽ��ɬ�פǤ��ˡ�\
+�ġ���С��Υܥ���ϡ�'Toolbutton'�����������Ѥ���褦���������뤳�Ȥǡ�\
+"toolbar style"�ܥ���Ȥʤ�褦��°�����ꤵ��Ƥ��ޤ���\
+�ġ���С��κ�ü�ˤϴ�ñ�ʥޡ��������֤���Ƥ��ޤ���\
+�ޡ�������˥ޥ����������뤬���Ȱ�ư��������˥������뤬�Ѳ����ޤ���\
+�����ǥġ���С���ư�����褦�˥ɥ�å�����ȡ�\
+�ġ���С����Τ��ڤ�Υ������Ω�����ȥåץ�٥륦�������åȤ�\
+���뤳�Ȥ��Ǥ��ޤ���\
+�ڤ�Υ�����ġ���С������פȤʤä����ˤϡ�\
+����Ū�ʥȥåץ�٥륦�������åȤ�Ʊ�ͤ�ñ����Ĥ��뤳�Ȥǡ�
+�ƤӸ��Υ�����ɥ���ĥ���դ�����Ǥ��礦��
+EOL
+else
+  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
+���Υǥ�Ǥϡ��ġ���С���ɤΤ褦�ˤ���Ŭ�ڤ˥ơ����б������뤫��\
+�����Ƥ��ޤ���\
+�ġ���С��Υܥ���ϡ�'Toolbutton'�����������Ѥ���褦���������뤳�Ȥǡ�\
+"toolbar style"�ܥ���Ȥʤ�褦��°�����ꤵ��Ƥ��ޤ���
+EOL
+end
+
+## Set up the toolbar hull
+tbar_base = Tk::Frame.new(base_frame,  # Tk ɸ��� frame �Ǥʤ���Фʤ�ޤ���
+                          :widgetname=>'toolbar') # ������ɥ������ȥ�ʸ����Ȥ��뤿��ˡ����������å�̾���������Ƥ��ޤ���
+sep = Ttk::Separator.new(base_frame)
+to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
+if Tk.windowingsystem != 'aqua'
+  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
+  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
+  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
+  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
+end
+
+contents = Ttk::Frame.new(tbar_base)
+Tk.grid(to_base, contents, :sticky=>'nsew')
+tbar_base.grid_columnconfigure(contents, :weight=>1)
+contents.grid_columnconfigure(1000, :weight=>1)
+
+if Tk.windowingsystem != 'aqua'
+  ## Bindings so that the toolbar can be torn off and reattached
+  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
+  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
+  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
+  def tbar_base.tearoff(w, x, y)
+    on_win = TkWinfo.containing(x, y)
+    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
+    self.grid_remove
+    w.grid_remove
+    self.wm_manage
+    # self.wm_title('Toolbar') # �⤷���������å�̾�򥦥���ɥ������ȥ�ˤ������ʤ��ʤ顤���������ꤷ�Ƥ�������
+    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
+  end
+  def tbar_base.untearoff(w)
+    self.wm_forget
+    w.grid
+    self.grid
+  end
+end
+
+## Some content for the rest of the toplevel
+text = TkText.new(base_frame, :width=>40, :height=>10)
+
+## Toolbar contents
+tb_btn = Ttk::Button.new(tbar_base, :text=>'�ܥ���', :style=>'Toolbutton',
+                         :command=>proc{
+                           text.insert(:end, "�ܥ��󤬲�����ޤ�����\n")
+                         })
+tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'�����å��ܥ���',
+                              :style=>'Toolbutton',
+                              :variable=>(check = TkVariable.new),
+                              :command=>proc{
+                                text.insert(:end, "�����å��ܥ�����ͤ�#{check.value}�Ǥ���\n")
+                              })
+tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'��˥塼')
+tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
+                             :state=>:readonly)
+tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
+menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
+menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
+menu.add(:command, :label=>'Example',
+         :command=>proc{text.insert(:end, "Example\n")})
+tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
+
+## Arrange contents
+Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
+        :in=>contents, :padx=>2, :sticky=>'ns')
+Tk.grid(tbar_base, :sticky=>'ew')
+Tk.grid(sep, :sticky=>'ew')
+Tk.grid(msg, :sticky=>'ew')
+Tk.grid(text, :sticky=>'nsew')
+base_frame.grid_rowconfigure(text, :weight=>1)
+base_frame.grid_columnconfigure(text, :weight=>1)
+
+## See Code / Dismiss buttons
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'toolbar'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $toolbar_demo.destroy
+                           $toolbar_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  Tk.grid(frame, :sticky=>'ew')
+}
diff --git a/ext/tk/sample/demos-jp/tree.rb b/ext/tk/sample/demos-jp/tree.rb
new file mode 100644
index 0000000000..00d715282b
--- /dev/null
+++ b/ext/tk/sample/demos-jp/tree.rb
@@ -0,0 +1,120 @@
+# -*- coding: euc-jp -*-
+#
+# tree.rb --
+#
+# This demonstration script creates a toplevel window containing a Ttk
+# tree widget.
+#
+# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($tree_demo) && $tree_demo
+  $tree_demo.destroy
+  $tree_demo = nil
+end
+
+$tree_demo = TkToplevel.new {|w|
+  title("Directory Browser")
+  iconname("tree")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
+
+## Explanatory text
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+               :text=><<EOL).pack(:fill=>:x)
+Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
+���Υ���ץ�ϡ��ե����륷���ƥ�Τ褦�ʳ���Ū�ʥǡ��������\
+���ȤǤ���褦�ˤ���Ttk::Treeview���������åȤ�ޤ�Ǥ��ޤ���\
+Ttk::Treeview���������åȤϡ��ڹ�¤���Τ�ɽ�����ǽ�ˤ�������Ǥʤ���\
+�ɲþ���(���Υ���ץ�ξ��ϥե����륵����)��ɽ�����뤿���\
+Ǥ�դθĿ����ɲå����ⰷ�����Ȥ�Ǥ��ޤ���\
+�ޤ��������Υ����ȥ�֤ζ��ڤ���ʬ��ɥ�å����뤳�Ȥǡ�\
+�����������ѹ����뤳�Ȥ��ǽ�Ǥ���
+EOL
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'tree'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $tree_demo.destroy
+                           $tree_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+## Code to populate the roots of the tree (can be more than one on Windows)
+def populate_roots(tree)
+  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
+    populate_tree(tree, tree.insert(nil, :end, :text=>dir,
+                                    :values=>[dir, 'directory']))
+  }
+end
+
+## Code to populate a node of the tree
+def populate_tree(tree, node)
+  return if tree.get(node, :type) != 'directory'
+
+  path = tree.get(node, :fullpath)
+  tree.delete(tree.children(node))
+  Dir.glob("#{path}/*").sort.each{|f|
+    type = File.ftype(f)
+    id = tree.insert(node, :end,
+                     :text=>File.basename(f), :values=>[f, type]).id
+    if type == 'directory'
+      ## Make it so that this node is openable
+      tree.insert(id, 0, :text=>'dummy')
+      tree.itemconfigure(id, :text=>File.basename(f))
+    elsif type == 'file'
+      size = File.size(f)
+      if size >= 1024*1024*1024
+        size = '%.1f GB' % (size.to_f/1024/1024/1024)
+      elsif size >= 1024*1024
+        size = '%.1f MB' % (size.to_f/1024/1024)
+      elsif size >= 1024
+        size = '%.1f KB' % (size.to_f/1024)
+      else
+        size = '%.1f bytes' % (size.to_f/1024)
+      end
+      tree.set(id, :size, size)
+    end
+  }
+
+  # Stop this code from rerunning on the current node
+  tree.set(node, :type, 'processed_directory')
+end
+
+## Create the tree and set it up
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
+                         :displaycolumns=>['size'])
+if Tk.windowingsystem != 'aqua'
+  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
+else
+  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
+  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
+end
+
+tree.heading_configure('#0', :text=>'Directory Structure')
+tree.heading_configure('size', :text=>'File Size')
+tree.column_configure('size', :stretch=>0, :width=>70)
+populate_roots(tree)
+tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
+
+## Arrange the tree and its scrollbars in the toplevel
+container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+container.lower
+Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
+Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
+container.grid_columnconfigure(0, :weight=>1)
+container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/ttkbut.rb b/ext/tk/sample/demos-jp/ttkbut.rb
new file mode 100644
index 0000000000..90ec3fce5b
--- /dev/null
+++ b/ext/tk/sample/demos-jp/ttkbut.rb
@@ -0,0 +1,145 @@
+# -*- coding: euc-jp -*-
+#
+# ttkbut.rb
+#
+# This demonstration script creates a toplevel window containing several
+# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
+# radiobuttons.
+#
+# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkbut_demo) && $ttkbut_demo
+  $ttkbut_demo.destroy
+  $ttkbut_demo = nil
+end
+
+$ttkbut_demo = TkToplevel.new {|w|
+  title("Simple Ttk Widgets")
+  iconname("ttkbut")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
+�������ʤ����ܤˤ��Ƥ���Τ�Ttk�Υơ��޲���٥�ǡ�\
+���ˤ�Ttk�Υ�٥�ե졼�����˻��ĤΥ��롼�פ�Ttk���������åȤ�\
+ɽ������Ƥ��ޤ���
+�ǽ�Υ��롼�פ����ƥܥ���Ǥ��ꡤ\
+���줾�쥯��å�����и��ߤΥ��ץꥱ�������Υơ��ޤ����ꤵ��ޤ���
+�����ܤΥ��롼�פϻ��ĤΥ����å��ܥ��󽸹�Ǥ���\
+�ƽ���δ֤ˤϡ����ѥ졼�����������åȤ��֤���Ƥ��ޤ���\
+�ʤ���ͭ�����ץܥ���ϡ����Υȥåץ�٥륦�������å����\
+¾�Τ��٤ƤΥơ��޲����������åȤξ���(state)��"disabled"���ɤ�����\
+����ȥ����뤹�뤳�Ȥ����դ��Ƥ���������
+�����ܤΥ��롼�פϴ�Ϣ�դ���줿�饸���ܥ��󽸹�ȤʤäƤ��ޤ���
+EOL
+
+## Add buttons for setting the theme
+buttons = Ttk::Labelframe.new(base_frame, :text=>'�ܥ���')
+# Ttk::Style.theme_names.each{|theme|
+#   Ttk::Button.new(buttons, :text=>theme,
+#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
+# }
+Ttk.themes.each{|theme|
+  Ttk::Button.new(buttons, :text=>theme,
+                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
+}
+
+## Helper procedure for the top checkbutton
+def setState(root, value, *excepts)
+  return if excepts.member?(root)
+
+  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
+  begin
+    root.state = value
+  rescue
+  end
+
+  ## Recursively invoke on all children of this root that are in the same
+  ## toplevel widget
+  root.winfo_children.each{|w|
+    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
+  }
+end
+
+## Set up the checkbutton group
+checks = Ttk::Labelframe.new(base_frame, :text=>'�����å��ܥ���')
+enabled = TkVariable.new(true)
+e = Ttk::Checkbutton.new(checks, :text=>'ͭ����', :variable=>enabled,
+                         :command=>proc{
+                           setState($ttkbut_demo,
+                                    ((enabled.bool)? "!disabled" : "disabled"),
+                                    e)
+                         })
+
+## See ttk_widget(n) for other possible state flags
+sep1 = Ttk::Separator.new(checks)
+sep2 = Ttk::Separator.new(checks)
+
+cheese  = TkVariable.new
+tomato  = TkVariable.new
+basil   = TkVariable.new
+oregano = TkVariable.new
+
+c1 = Ttk::Checkbutton.new(checks, :text=>'������',   :variable=>cheese)
+c2 = Ttk::Checkbutton.new(checks, :text=>'�ȥޥ�',   :variable=>tomato)
+c3 = Ttk::Checkbutton.new(checks, :text=>'�Х���',   :variable=>basil)
+c4 = Ttk::Checkbutton.new(checks, :text=>'���쥬��', :variable=>oregano)
+
+Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
+
+## Set up the radiobutton group
+radios = Ttk::Labelframe.new(base_frame, :text=>'�饸���ܥ���')
+
+happyness = TkVariable.new
+
+r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Great', :value=>'great')
+r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Good', :value=>'good')
+r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Ok', :value=>'ok')
+r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Poor', :value=>'poor')
+r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+                          :text=>'Awful', :value=>'awful')
+
+Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�ѿ�����',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{
+                           showVars(base_frame, ['ͭ����', enabled],
+                                    ['������', cheese], ['�ȥޥ�', tomato],
+                                    ['�Х���', basil], ['���쥬��', oregano],
+                                    ['��ʡ��', happyness])
+                         }),
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkbut'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           tmppath = $ttkbut_demo
+                           $ttkbut_demo = nil
+                           $showVarsWin[tmppath.path] = nil
+                           tmppath.destroy
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x, :expand=>true)
+}
+
+## Arrange things neatly
+f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+f.lower
+Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
+f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-jp/ttkmenu.rb b/ext/tk/sample/demos-jp/ttkmenu.rb
new file mode 100644
index 0000000000..9e78678c8e
--- /dev/null
+++ b/ext/tk/sample/demos-jp/ttkmenu.rb
@@ -0,0 +1,91 @@
+# -*- coding: euc-jp -*-
+#
+# ttkmenu.rb --
+#
+# This demonstration script creates a toplevel window containing several Ttk
+# menubutton widgets.
+#
+# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkmenu_demo) && $ttkmenu_demo
+  $ttkmenu_demo.destroy
+  $ttkmenu_demo = nil
+end
+
+$ttkmenu_demo = TkToplevel.new {|w|
+  title("Ttk Menu Buttons")
+  iconname("ttkmenu")
+  positionWindow(w)
+}
+
+base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
+����ˤ��ơ��ޤ��б����뤳�Ȥ��Ǥ���褦�ˤʤä����������åȤΤҤȤĤ�\
+��˥塼�ܥ��󤬤���ޤ���\
+�ʲ��Ǥϡ��ơ��ޤ��б�������˥塼�ܥ��󤬤����Ĥ�ɽ������Ƥ��ޤ���\
+������Ȥäơ����߻�����Υơ��ޤ��ѹ����뤳�Ȥ���ǽ�Ǥ���\
+�ơ��ޤ����򤬥�˥塼�ܥ��󼫿Ȥθ��ݤ����Ѳ��������ͻҤ䡤\
+����Υ�˥塼�ܥ���������ۤʤ륹������\
+(�ġ���С��Ǥΰ���Ū��ɽ����Ŭ�������)��ɽ������Ƥ����ͻҤ�\
+���ܤ��Ƥ���������\
+�ʤ�����˥塼�ܥ���ˤĤ��Ƥϥơ��ޤ��б��������������åȤ�����ޤ�����\
+��˥塼�ˤĤ��Ƥϥơ��ޤ��б��������������åȤϴޤޤ�Ƥ��ޤ���\
+������ͳ�ϡ�ɸ���Tk�Υ�˥塼���������åȤ�\
+���٤ƤΥץ�åȥۡ���ǽ�ʬ���ɹ��ʸ��ݤ������������äƤ��롤\
+�äˡ�¿���δĶ��Ǥ��δĶ����������ηϤȤʤ�褦�˼�������Ƥ����\
+Ƚ�Ǥ��줿���Ȥˤ��ޤ���
+EOL
+
+Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
+
+## See Code / Dismiss
+Ttk::Frame.new($ttkmenu_demo) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkmenu'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttkmenu_demo.destroy
+                           $ttkmenu_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+b1 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:above)
+b2 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:left)
+b3 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:right)
+b4 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:flush,
+                         :style=>Ttk::Menubutton.style('Toolbutton'))
+b5 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:below)
+
+b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
+b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
+b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
+b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
+b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
+
+Ttk.themes.each{|theme|
+  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
+}
+
+f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
+f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+f.lower
+
+f.grid_anchor(:center)
+TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
+TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
+TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttknote.rb b/ext/tk/sample/demos-jp/ttknote.rb
new file mode 100644
index 0000000000..f0cd258893
--- /dev/null
+++ b/ext/tk/sample/demos-jp/ttknote.rb
@@ -0,0 +1,97 @@
+# -*- coding: euc-jp -*-
+#
+# ttknote.rb --
+#
+# This demonstration script creates a toplevel window containing a Ttk
+# notebook widget.
+#
+# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttknote_demo) && $ttknote_demo
+  $ttknote_demo.destroy
+  $ttknote_demo = nil
+end
+
+$ttknote_demo = TkToplevel.new {|w|
+  title("Ttk Notebook Widget")
+  iconname("ttknote")
+  positionWindow(w)
+}
+
+## See Code / Dismiss
+Ttk::Frame.new($ttknote_demo) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttknote'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttknote_demo.destroy
+                           $ttknote_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
+
+## Make the notebook and set up Ctrl+Tab traversal
+notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
+                                              :padx=>2, :pady=>3)
+notebook.enable_traversal
+
+## Popuplate the first pane
+f_msg = Ttk::Frame.new(notebook)
+msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'5i',
+                       :justify=>:left, :anchor=>'n', :text=><<EOL)
+Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
+������˴ޤޤ�륦�������åȤΤҤȤĤ˥Ρ��ȥ֥å����������åȤ�����ޤ���\
+�Ρ��ȥ֥å����������åȤϡ�\
+���̤����Ƥ���ä��ѥͥ뤫���������ǽ�ˤ���褦��\
+���֤ν���ʥ��֥��åȡˤ����ޤ���\
+���֥��åȤϺǶ��¿���Υ桼�����󥿡��ե������Ǹ����뵡ǽ�Ǥ���\
+���֤�����ϡ��ޥ����ˤ������Ǥʤ���\
+�Ρ��ȥ֥å����������åȤΥڡ����θ��Ф������򤵤�Ƥ�����Ǥ����\
+Ctrl+Tab���������Ϥˤ�äƤ�Ԥ����Ȥ��Ǥ��ޤ���\
+���Υǥ�Ǥϡ����Ф��ǲ����դ���ʸ���Υ�����Alt�����Ȥ��Ȥ߹�碌�뤳�Ȥ�\
+�ڡ��������򤹤뤳�Ȥ��Ǥ���褦�ˤ����ꤷ�Ƥ��ޤ���\
+�������������ܤΥ��֤�̵�������������Ǥ��ʤ��褦�ˤʤäƤ��뤳�Ȥˤ�\
+���դ��Ƥ���������
+EOL
+neat = TkVariable.new
+after_id = nil
+msg_b = Ttk::Button.new(f_msg, :text=>'���Ƥ�����(Neat!)', :underline=>6,
+                        :command=>proc{
+                          neat.value = '���������ΤȤ��ꤵ������'
+                          Tk.after_cancel(after_id) if after_id
+                          after_id = Tk.after(500){neat.value = ''}
+                        })
+msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
+msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
+notebook.add(f_msg, :text=>'����(Description)', :underline=>3, :padding=>2)
+Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
+Tk.grid(msg_b, msg_l, :pady=>[2, 4], :padx=>20)
+msg_b.grid_configure(:sticky=>'e')
+msg_l.grid_configure(:sticky=>'w')
+f_msg.grid_rowconfigure(1, :weight=>1)
+f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
+
+## Populate the second pane. Note that the content doesn't really matter
+f_disabled = Ttk::Frame.new(notebook)
+notebook.add(f_disabled, :text=>'̵�������줿����', :state=>:disabled)
+
+## Popuplate the third pane
+f_editor = Ttk::Frame.new(notebook)
+notebook.add(f_editor, :text=>'�ƥ����ȥ��ǥ���(Text Editor)', :underline=>9)
+editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
+if Tk.windowingsystem != 'aqua'
+  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
+else
+  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
+end
+editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
+editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttkpane.rb b/ext/tk/sample/demos-jp/ttkpane.rb
new file mode 100644
index 0000000000..a7b458a683
--- /dev/null
+++ b/ext/tk/sample/demos-jp/ttkpane.rb
@@ -0,0 +1,216 @@
+# -*- coding: euc-jp -*-
+#
+# ttkpane.rb --
+#
+# This demonstration script creates a Ttk pane with some content.
+#
+# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkpane_demo) && $ttkpane_demo
+  $ttkpane_demo.destroy
+  $ttkpane_demo = nil
+end
+
+$ttkpane_demo = TkToplevel.new {|w|
+  title("Themed Nested Panes")
+  iconname("ttkpane")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+���Υǥ�ϡ������ߴط��ˤ���ơ����դ��ڥ���ɥ�����ɥ��򼨤��Ƥ��ޤ���\
+���줾����礭���ϡ��ޤޤ�Ƥ���ڥ���δ֤ˤ��륨�ꥢ��Ĥ����\
+������ɥ�å����뤳�Ȥ��ѹ��Ǥ��ޤ���
+EOL
+
+Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
+
+## See Code / Dismiss
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkpane'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttkpane_demo.destroy
+                           $ttkpane_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+
+outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
+outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
+outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
+in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'�ܥ���'))
+in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'����'))
+in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'�ץ����쥹'))
+in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'�ƥ�����'))
+if Tk.windowingsystem == 'aqua'
+  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
+end
+
+# Fill the button pane
+Ttk::Button.new(left_top, :text=>'�����Ƥ�',
+                :command=>proc{
+                  Tk.messageBox(:type=>'ok', :icon=>'info',
+                                :message=>'���Ƥơ�',
+                                :detail=>'That hurt...', :parent=>base_frame,
+                                :title=>'Button Pressed')
+                }).pack(:padx=>2, :pady=>5)
+
+
+zones_list = [
+  [':Europe/Berlin'],
+  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
+  [':Africa/Johannesburg'],
+  [':Europe/London'],
+  [':America/Los_Angeles'],
+  [':Europe/Moscow'],
+  [':America/New_York'],
+  [':Asia/Singapore'],
+  [':Australia/Sydney'],
+  [':Asia/Tokyo'],
+]
+
+zones = []
+
+# Check tzinfo support
+if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
+  tzinfo = :tcl
+
+  zones_list.each{|list|
+    list.each{|zone|
+      begin
+        # Force a pre-load of all the timezones needed; otherwise can end up
+        # poor-looking synch problems!
+        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
+      rescue RuntimeError
+        # ignore
+      else
+        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
+        break
+      end
+    }
+  }
+
+else
+  begin
+    require 'tzinfo'
+    tzinfo = :tzinfo
+  rescue Exception
+    begin
+      require 'tzfile'
+      tzinfo = :tzfile
+    rescue Exception
+      tzinfo = nil
+    end
+  end
+
+  case tzinfo
+  when :tzinfo
+    zones_list.each{|list|
+      list.each{|zone|
+        begin
+          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
+        rescue Exception
+          # ignore
+        else
+          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
+          break
+        end
+      }
+    }
+
+  when :tzfile
+    zones_list.each{|list|
+      list.each{|zone|
+        begin
+          tz = TZFile.create(zone[%r<[^:]+$>])
+        rescue Exception
+          # ignore
+        else
+          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
+          break
+        end
+      }
+    }
+
+  else
+    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
+      zones << [zone, 'UTC%+03d00' % zone]
+    }
+  end
+end
+
+time = TkVariable.new_hash
+
+case tzinfo
+when :tcl
+  update_proc = proc{|now, tz, label|
+    time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
+                             '-timezone', tz, '-format', '%T')
+  }
+when :tzinfo
+  update_proc = proc{|now, tz, label|
+    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
+  }
+when :tzfile
+  update_proc = proc{|now, tz, label|
+    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
+  }
+else
+  update_proc = proc{|now, tz, label|
+    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
+  }
+end
+
+# Fill the clocks pane
+zones.each_with_index{|(zone, label), idx|
+  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
+  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
+  Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
+                 :anchor=>'w').pack(:fill=>:x)
+}
+
+# Timer start
+every = proc{
+  now = Time.now.utc
+  zones.each{|zone, label| update_proc.call(now, zone, label) }
+}
+TkRTTimer.new(1000, -1, every).start(0, every)
+
+# Fill the progress pane
+Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
+
+# Fill the text pane
+if Tk.windowingsystem != 'aqua'
+  # The trick with the ttk::frame makes the text widget look like it fits with
+  # the current Ttk theme despite not being a themed widget itself. It is done
+  # by styling the frame like an entry, turning off the border in the text
+  # widget, and putting the text widget in the frame with enough space to allow
+  # the surrounding border to show through (2 pixels seems to be enough).
+  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
+  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
+  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
+  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
+  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
+  f.pack(:fill=>:both, :expand=>true)
+  outer.pack(:fill=>:both, :expand=>true)
+else
+  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
+  scr = txt.yscrollbar(TkScrollbar.new(frame))
+  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
+  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
+  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
+end
diff --git a/ext/tk/sample/demos-jp/ttkprogress.rb b/ext/tk/sample/demos-jp/ttkprogress.rb
new file mode 100644
index 0000000000..82898bf50e
--- /dev/null
+++ b/ext/tk/sample/demos-jp/ttkprogress.rb
@@ -0,0 +1,71 @@
+# -*- coding: euc-jp -*-
+#
+# ttkprogress.rb --
+#
+# This demonstration script creates several progress bar widgets.
+#
+# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
+
+if defined?($ttkprogress_demo) && $ttkprogress_demo
+  $ttkprogress_demo.destroy
+  $ttkprogress_demo = nil
+end
+
+$ttkprogress_demo = TkToplevel.new {|w|
+  title("Progress Bar Demonstration")
+  iconname("ttkprogress")
+  positionWindow(w)
+}
+
+base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
+
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+               :text=><<EOL).pack(:side=>:top, :fill=>:x)
+���ˤ���Τ���ĤΥץ����쥹�С��Ǥ���\
+��Τ�Τ�"determinate"�����פΥץ����쥹�С��ǡ�\
+�㤨�Хץ�����बͿ����줿��������λ����ޤǤˤɤΤ��餤�����뤫��\
+�����Ȥ��ʤɤ��Ѥ����ޤ���\
+���Τ�Τ�"indeterminate"�����פΥץ����쥹�С��ǡ�\
+�㤨�Хץ�����ब�¹���(busy)�Ǥ����Τ�\
+��λ�ޤǤˤɤ줯�餤�����뤫��ʬ����ʤ��Ȥ������֤�\
+�����Ȥ��ʤɤ��Ѥ����ޤ���\
+������Υץ����쥹�С��⡤�������ˤ���ܥ����Ȥ����Ȥ�\
+��ư���˥᡼�����⡼�ɤ�ON/OFF�����ؤ��뤳�Ȥ��Ǥ��ޤ���
+EOL
+
+## See Code / Dismiss buttons
+Ttk::Frame.new(base_frame) {|frame|
+  sep = Ttk::Separator.new(frame)
+  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x',
+         Ttk::Button.new(frame, :text=>'�����ɻ���',
+                         :image=>$image['view'], :compound=>:left,
+                         :command=>proc{showCode 'ttkprogress'}),
+         Ttk::Button.new(frame, :text=>'�Ĥ���',
+                         :image=>$image['delete'], :compound=>:left,
+                         :command=>proc{
+                           $ttkprogress_demo.destroy
+                           $ttkprogress_demo = nil
+                         }),
+         :padx=>4, :pady=>4)
+  grid_columnconfigure(0, :weight=>1)
+  pack(:side=>:bottom, :fill=>:x)
+}
+
+frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
+
+p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
+p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
+
+start = Ttk::Button.new(frame, :text=>'Start Progress',
+                        :command=>proc{ p1.start; p2.start })
+stop  = Ttk::Button.new(frame, :text=>'Stop Progress',
+                        :command=>proc{ p1.stop; p2.stop })
+
+Tk.grid(p1, '-', :pady=>5, :padx=>10)
+Tk.grid(p2, '-', :pady=>5, :padx=>10)
+Tk.grid(start, stop, :padx=>10, :pady=>5)
+start.grid_configure(:sticky=>'e')
+stop.grid_configure(:sticky=>'w')
+frame.grid_columnconfigure(:all, :weight=>1)
+
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
index 2b228e4acd..bd0b060754 100644
--- a/ext/tk/sample/demos-jp/twind.rb
+++ b/ext/tk/sample/demos-jp/twind.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # text (embedded windows) widget demo (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy 
+  $twind_demo.destroy
   $twind_demo = nil
 end
 
@@ -15,8 +16,10 @@ $twind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
+
 # frame ����
-$twind_buttons = TkFrame.new($twind_demo) {|frame|
+$twind_buttons = TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -36,10 +39,10 @@ $twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
 $twind_text = nil
-TkFrame.new($twind_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
             'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font, 
-                          'width'=>'70', 'height'=>35, 'wrap'=>'word', 
+  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
+                          'width'=>'70', 'height'=>35, 'wrap'=>'word',
                           'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
     TkScrollbar.new(f) {|s|
       command proc{|*args| t.yview(*args)}
@@ -49,11 +52,11 @@ TkFrame.new($twind_demo, 'highlightthickness'=>2, 'borderwidth'=>2,
 }.pack('expand'=>'yes', 'fill'=>'both')
 
 # ��������
-$tag_center = TkTextTag.new($twind_text, 
+$tag_center = TkTextTag.new($twind_text,
                             'justify' =>'center',
                             'spacing1'=>'5m',
                             'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text, 
+$tag_buttons = TkTextTag.new($twind_text,
                              'lmargin1'=>'1c',
                              'lmargin2'=>'1c',
                              'rmargin' =>'1c',
@@ -62,14 +65,14 @@ $tag_buttons = TkTextTag.new($twind_text,
                              'spacing3'=>0 )
 
 # �ƥ����Ȥ�����
-$twind_text.insert('end', 
+$twind_text.insert('end',
                   '�ƥ�����widget���¾��widget���Ȥ߹��ळ�Ȥ��Ǥ��ޤ���')
 $twind_text.insert('end',
                   '�Ȥ߹��ߥ�����ɥ��ȸƤФ졢Ǥ�դ�widget����ǽ�Ǥ���')
 $twind_text.insert('end',
                   '�㤨�С�������2�ĤΥܥ���widget���Ȥ߹��ޤ�Ƥ��ޤ���')
 $twind_text.insert('end', '�ǽ�Υܥ���򥯥�å����ȿ�ʿ�����Υ����������')
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    #text 'ON'
                    text '����'
@@ -78,7 +81,7 @@ TkTextWindow.new($twind_text, 'end',
                  })
 $twind_text.insert('end', "�ˤ��ޤ����ޤ�2�Ĥ�Υܥ���򥯥�å������\n")
 $twind_text.insert('end', '��ʿ�����Υ����������')
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    #text 'OFF'
                    text '����'
@@ -88,7 +91,7 @@ TkTextWindow.new($twind_text, 'end',
 $twind_text.insert('end', '�ˤ��ޤ���')
 
 $twind_text.insert('end', '�⤦�ҤȤĤ���Ǥ���')
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    text '�����򥯥�å�'
                    command proc{textWindPlot $twind_text}
@@ -98,7 +101,7 @@ $twind_text.insert('end', '����ȡ�x-y�ץ��åȤ������˸���ޤ���')
 $mark_plot = TkTextMark.new($twind_text, 'insert')
 $mark_plot.gravity='left'
 $twind_text.insert('end', '�ޥ����ǥǡ��������褹�뤳�Ȥ��Ǥ��ޤ���')
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {
                    text '�õ�'
                    command proc{textWindDel $twind_text}
@@ -122,7 +125,7 @@ $twind_text.insert('end', '�⤦����Ʊ���ܥ���򲡤��ȸ������ޤ���
 
 ')
 
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkButton.new($twind_text) {|b|
                    text '�ǥե����'
                    command proc{embDefBg $twind_text}
@@ -131,7 +134,7 @@ TkTextWindow.new($twind_text, 'end',
                  },
                  'padx'=>3 )
 embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end', 
+TkTextWindow.new($twind_text, 'end',
                  'window'=>TkCheckButton.new($twind_text) {
                    textvariable embToggle
                    indicatoron 0
@@ -142,21 +145,21 @@ TkTextWindow.new($twind_text, 'end',
                    pady 5
                    padx 2
                  },
-                 'padx'=>3, 
+                 'padx'=>3,
                  'pady'=>2 )
 
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
 ].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end', 
+  TkTextWindow.new($twind_text, 'end',
                    'window'=>TkButton.new($twind_text) {
                      text twind_color
                      cursor 'top_left_arrow'
                      command proc{$twind_text.bg twind_color}
                    },
-                   'padx'=>3, 
+                   'padx'=>3,
                    'pady'=>2 )
 }
 
@@ -206,43 +209,47 @@ def textWindPlot (t)
     cursor 'top_left_arrow'
   }
 
-  font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  if $tk_version =~ /^4.*/
+    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  else
+    font = 'Helvetica 18'
+  end
 
   TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
   TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20, 
+  TkcText.new($twind_plot, 225, 20,
               'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
 
   (0..10).each {|i|
     x = 100 + (i * 30)
     TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254, 
+    TkcText.new($twind_plot, x, 254,
                 'text'=>10*i, 'font'=>font, 'anchor'=>'n')
   }
   (0..5).each {|i|
     y = 250 - (i * 40)
     TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y, 
+    TkcText.new($twind_plot, 96, y,
                 'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
   }
 
   for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
     x = 100 + (3*xx)
     y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6, 
+    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
                        'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
     item.addtag 'point'
   end
 
-  $twind_plot.itembind('point', 'Any-Enter', 
+  $twind_plot.itembind('point', 'Any-Enter',
                         proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave', 
+  $twind_plot.itembind('point', 'Any-Leave',
                         proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1', 
+  $twind_plot.itembind('point', '1',
                         proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1', 
+  $twind_plot.itembind('point', 'ButtonRelease-1',
                         proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion', 
+  $twind_plot.bind('B1-Motion',
                     proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
   while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
     $twind_text.delete $mark_plot
diff --git a/ext/tk/sample/demos-jp/twind2.rb b/ext/tk/sample/demos-jp/twind2.rb
index b634f07b4b..96000b0e14 100644
--- a/ext/tk/sample/demos-jp/twind2.rb
+++ b/ext/tk/sample/demos-jp/twind2.rb
@@ -1,10 +1,11 @@
+# -*- coding: euc-jp -*-
 #
 # text (embedded windows) widget demo 2 (called by 'widget')
 #
 
 # toplevel widget ��¸�ߤ���к������
 if defined?($twind2_demo) && $twind2_demo
-  $twind2_demo.destroy 
+  $twind2_demo.destroy
   $twind2_demo = nil
 end
 
@@ -15,22 +16,24 @@ $twind2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
+
 # frame ����
-$twind2_buttons = TkFrame.new($twind2_demo) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+$twind2_buttons = TkFrame.new(base_frame) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
          :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         TkButton.new(frame, :text=>'�����ɻ���', 
-                      :image=>$image['view'], :compound=>:left, 
-                      :command=>proc{showCode 'twind2'}), 
-         TkButton.new(frame, :text=>'�Ĥ���', 
-                      :image=>$image['delete'], :compound=>:left, 
+  TkGrid('x',
+         TkButton.new(frame, :text=>'�����ɻ���',
+                      :image=>$image['view'], :compound=>:left,
+                      :command=>proc{showCode 'twind2'}),
+         TkButton.new(frame, :text=>'�Ĥ���',
+                      :image=>$image['delete'], :compound=>:left,
                       :command=>proc{
                         tmppath = $twind2_demo
                         $twind2_demo = nil
                         $showVarsWin[tmppath.path] = nil
                         tmppath.destroy
-                      }), 
+                      }),
          :padx=>4, :pady=>4)
   frame.grid_columnconfigure(0, :weight=>1)
 }
@@ -38,11 +41,11 @@ $twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ����
 $twind2_text = nil
-TkFrame.new($twind2_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
             'relief'=>'sunken') {|f|
   $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
-                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word', 
-                            'width'=>'70', 'height'=>35, 'wrap'=>'char', 
+                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
+                            'width'=>'70', 'height'=>35, 'wrap'=>'char',
                             'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
     TkScrollbar.new(f) {|s|
       command proc{|*args| t.yview(*args)}
@@ -52,11 +55,11 @@ TkFrame.new($twind2_demo, 'highlightthickness'=>2, 'borderwidth'=>2,
 }.pack('expand'=>'yes', 'fill'=>'both')
 
 # ��������
-$tag2_center = TkTextTag.new($twind2_text, 
+$tag2_center = TkTextTag.new($twind2_text,
                             'justify' =>'center',
                             'spacing1'=>'5m',
                             'spacing3'=>'5m'  )
-$tag2_buttons = TkTextTag.new($twind2_text, 
+$tag2_buttons = TkTextTag.new($twind2_text,
                              'lmargin1'=>'1c',
                              'lmargin2'=>'1c',
                              'rmargin' =>'1c',
@@ -83,7 +86,7 @@ $twind2_text.insert('end', '�㤨�С������ˤϣ��Ĥ�')
 $twind2_text.insert('end', '�ܥ��󥦥������åȤ������ޤ�Ƥ��ޤ���')
 $twind2_text.insert('end', '�ǽ�Υܥ���򥯥�å�����ȡ�')
 $twind2_text.insert('end', '��ʿ�����Υ���������� ')
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    #text 'ON'
                    text '����'
@@ -92,7 +95,7 @@ TkTextWindow.new($twind2_text, 'end',
                  })
 $twind2_text.insert('end', "�ˤ��ޤ����ޤ������Ĥ�Υܥ���򥯥�å������\n")
 $twind2_text.insert('end', '��ʿ�����Υ����������')
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    #text 'OFF'
                    text '����'
@@ -102,7 +105,7 @@ TkTextWindow.new($twind2_text, 'end',
 $twind2_text.insert('end', "�ˤ��ޤ���\n\n")
 
 $twind2_text.insert('end', '���Ϥ⤦�ҤȤĤ���Ǥ���')
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    text '�����򥯥�å�'
                    command proc{textWindPlot2 $twind2_text}
@@ -113,7 +116,7 @@ $mark2_plot = TkTextMark.new($twind2_text, 'insert')
 $mark2_plot.gravity='left'
 $twind2_text.insert('end', '�ޥ����ǥɥ�å����뤳�Ȥǡ�')
 $twind2_text.insert('end', '�ץ��åȾ�Υǡ��������ư���뤳�Ȥ��Ǥ��ޤ���')
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text) {
                    text '�õ�'
                    command proc{textWindDel2 $twind2_text}
@@ -145,7 +148,7 @@ btn_default = TkButton.new($twind2_text) {|b|
 }
 TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
 embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkCheckButton.new($twind2_text) {
                    textvariable embToggle
                    indicatoron 0
@@ -156,21 +159,21 @@ TkTextWindow.new($twind2_text, 'end',
                    pady 5
                    padx 2
                  },
-                 'padx'=>3, 
+                 'padx'=>3,
                  'pady'=>2 )
 
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
 ].each{|twind_color|
-  TkTextWindow.new($twind2_text, 'end', 
+  TkTextWindow.new($twind2_text, 'end',
                    'window'=>TkButton.new($twind2_text) {
                      text twind_color
                      cursor 'top_left_arrow'
                      command proc{$twind2_text.bg twind_color}
                    },
-                   'padx'=>3, 
+                   'padx'=>3,
                    'pady'=>2 )
 }
 
@@ -184,44 +187,44 @@ $text_normal2['pad'] = $twind2_text.cget('padx')
 $twind2_text.insert('end', "\nborder width �� highlightthickness, ")
 $twind2_text.insert('end', "padding ���̾���ͤ����ѹ����뤳�Ȥ��ǽ�Ǥ���\n")
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Big borders", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinBigB2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Small borders", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinSmallB2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinBigH2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
+TkTextWindow.new($twind2_text, 'end',
                  'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
-                                        :cursor=>'top_left_arrow', 
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinSmallH2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Big pad", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinBigP2 $twind2_text
                                         }))
 
-TkTextWindow.new($twind2_text, 'end', 
-                 'window'=>TkButton.new($twind2_text, :text=>"Small pad", 
-                                        :cursor=>'top_left_arrow', 
+TkTextWindow.new($twind2_text, 'end',
+                 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
+                                        :cursor=>'top_left_arrow',
                                         'command'=>proc{
                                           textWinSmallP2 $twind2_text
                                         }))
@@ -229,9 +232,9 @@ TkTextWindow.new($twind2_text, 'end',
 $twind2_text.insert('end', "\n\n���˥��᡼����ƥ����ȥ��������åȤ�")
 $twind2_text.insert('end', "���ޤ����֤Ǥ��ޤ���")
 
-TkTextImage.new($twind2_text, 'end', 
+TkTextImage.new($twind2_text, 'end',
                 'image'=>TkBitmapImage.new(:file=>[
-                                             $demo_dir, '..', 
+                                             $demo_dir, '..',
                                              'images', 'face.xbm'
                                            ].join(File::Separator)))
 
@@ -306,39 +309,39 @@ def textWindPlot2 (t)
 
   TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
   TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind2_plot, 225, 20, 
+  TkcText.new($twind2_plot, 225, 20,
               'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
 
   (0..10).each {|i|
     x = 100 + (i * 30)
     TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind2_plot, x, 254, 
+    TkcText.new($twind2_plot, x, 254,
                 'text'=>10*i, 'font'=>font, 'anchor'=>'n')
   }
   (0..5).each {|i|
     y = 250 - (i * 40)
     TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind2_plot, 96, y, 
+    TkcText.new($twind2_plot, 96, y,
                 'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
   }
 
   for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
     x = 100 + (3*xx)
     y = 250 - (4*yy)/5
-    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6, 
+    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
                        'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
     item.addtag 'point'
   end
 
-  $twind2_plot.itembind('point', 'Any-Enter', 
+  $twind2_plot.itembind('point', 'Any-Enter',
                         proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind2_plot.itembind('point', 'Any-Leave', 
+  $twind2_plot.itembind('point', 'Any-Leave',
                         proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind2_plot.itembind('point', '1', 
+  $twind2_plot.itembind('point', '1',
                         proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
-  $twind2_plot.itembind('point', 'ButtonRelease-1', 
+  $twind2_plot.itembind('point', 'ButtonRelease-1',
                         proc{$twind2_plot.dtag 'selected'})
-  $twind2_plot.bind('B1-Motion', 
+  $twind2_plot.bind('B1-Motion',
                     proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
   while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
     $twind2_text.delete $mark2_plot
diff --git a/ext/tk/sample/demos-jp/unicodeout.rb b/ext/tk/sample/demos-jp/unicodeout.rb
index 090cdf3059..4857cd131d 100644
--- a/ext/tk/sample/demos-jp/unicodeout.rb
+++ b/ext/tk/sample/demos-jp/unicodeout.rb
@@ -1,3 +1,5 @@
+# -*- coding: euc-jp -*-
+#
 # unicodeout.rb --
 #
 # This demonstration script shows how you can produce output (in label
@@ -6,7 +8,7 @@
 # based on Tcl/Tk8.4.4 widget demos
 
 if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy 
+  $unicodeout_demo.destroy
   $unicodeout_demo = nil
 end
 
@@ -16,8 +18,10 @@ $unicodeout_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-TkLabel.new($unicodeout_demo, 
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
+base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
+
+TkLabel.new(base_frame,
+            :font=>$font, :wraplength=>'5.4i', :justify=>:left,
             :text=><<EOL).pack(:side=>:top)
 ����ϡ�Tk�ˤ���������ʸ��������Ѥ��������Ф��륵�ݡ��ȤˤĤ��Ƥ�\
 ����ץ�Ǥ���������������ɽ���ˤ����Ƥ��ʤ����ºݤˤɤΤ褦��ɽ����\
@@ -38,7 +42,7 @@ Tcl�Υ���������ɽ�����Ѥ���UNICODEʸ����ǽ񤫤�Ƥ��ޤ���\
 EOL
 #'
 
-TkFrame.new($unicodeout_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
@@ -51,9 +55,9 @@ TkFrame.new($unicodeout_demo){|f|
                }).pack(:side=>:left, :expand=>true)
 }
 
-wait_msg = TkLabel.new($unicodeout_demo, 
-                       :text=>"�ե�����ɤ߹��ߤδ�λ�ޤ�" + 
-                              "���Ф餯���Ԥ�������������", 
+wait_msg = TkLabel.new(base_frame,
+                       :text=>"�ե�����ɤ߹��ߤδ�λ�ޤ�" +
+                              "���Ф餯���Ԥ�������������",
                        :font=>"Helvetica 12 italic").pack
 
 class Unicodeout_SampleFrame < TkFrame
@@ -66,23 +70,23 @@ class Unicodeout_SampleFrame < TkFrame
   # @@font = 'Newspaper 12'
   # @@font = '{New century schoolbook} 12'
 
-  def initialize()
-    super($unicodeout_demo)
+  def initialize(base)
+    super(base)
     grid_columnconfig(1, :weight=>1)
   end
 
   def add_sample(lang, *args)
     sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':', 
+    l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
                     :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt, 
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt, 
+    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
+    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
                     :anchor=>:nw, :width=>30, :pady=>0)
     Tk.grid(l, s, :sticky=>:ew, :pady=>0)
     l.grid_config(:padx, '1m')
   end
 end
-f = Unicodeout_SampleFrame.new
+f = Unicodeout_SampleFrame.new(base_frame)
 f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
 
 # Processing when some characters are missing might take a while, so make
@@ -92,23 +96,23 @@ oldCursor = $unicodeout_demo.cursor
 $unicodeout_demo.cursor('watch')
 Tk.update
 
-f.add_sample('Arabic', 
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
+f.add_sample('Arabic',
+             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
              '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
 f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
 f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek', 
-             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ', 
+f.add_sample('Greek',
+             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
              '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew', 
-             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ', 
+f.add_sample('Hebrew',
+             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
              '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese', 
-             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ', 
+f.add_sample('Japanese',
+             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
              '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
 f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian', 
-             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
+f.add_sample('Russian',
+             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
              '\u044F\u0437\u044B\u043A')
 
 wait_msg.destroy
diff --git a/ext/tk/sample/demos-jp/vscale.rb b/ext/tk/sample/demos-jp/vscale.rb
index 86f6f7cdee..a1097fd77f 100644
--- a/ext/tk/sample/demos-jp/vscale.rb
+++ b/ext/tk/sample/demos-jp/vscale.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 require "tkcanvas"
 
 if defined?($vscale_demo) && $vscale_demo
@@ -11,7 +12,9 @@ $vscale_demo = TkToplevel.new {|w|
 }
 positionWindow($vscale_demo)
 
-msg = TkLabel.new($vscale_demo) {
+base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
+
+msg = TkLabel.new(base_frame) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -22,7 +25,7 @@ msg = TkLabel.new($vscale_demo) {
 }
 msg.pack('side'=>'top', 'padx'=>'.5c')
 
-TkFrame.new($vscale_demo) {|frame|
+TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     #text 'λ��'
     text '�Ĥ���'
@@ -39,7 +42,17 @@ TkFrame.new($vscale_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-TkFrame.new($vscale_demo) {|frame|
+def setHeight(w, height)
+  height = height + 21
+  y2 = height - 30
+  if y2 < 21
+    y2 = 21
+  end
+  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+end
+
+TkFrame.new(base_frame) {|frame|
   borderwidth 10
   canvas = TkCanvas.new(frame) {|c|
     width 50
@@ -65,14 +78,3 @@ TkFrame.new($vscale_demo) {|frame|
   }.pack('side'=>'left', 'anchor'=>'ne')
   scale.set 75
 }.pack
-
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index 11495dda54..dfaa9c004e 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -1,14 +1,23 @@
 #!/usr/bin/env ruby
+# -*- coding: euc-jp -*-
 
 # �������������� ( tk.rb �Υ����ɻ��� encoding ����/����˻Ȥ��� )
-$KCODE = 'euc'
+#if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
+unless defined?(::Encoding.default_external)
+  $KCODE = 'euc'
+else
+  DEFAULT_TK_ENCODING = 'EUC-JP'
+end
 
 # tk �ط��饤�֥����ɤ߹���
 require 'tk'
 # require 'tkafter'
 
+$RubyTk_WidgetDemo = true
+
 # widget demo directory ���֤γ���
-$demo_dir = File.dirname($0)
+# $demo_dir = File.dirname($0)
+$demo_dir = File.dirname(__FILE__)
 
 # root ������
 $root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
@@ -43,15 +52,14 @@ when /^8.*/
   $font = TkFont.new('Helvetica -12')
   $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
   TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('Helvetica 16', 'Gothic 16 bold')
+  $msg_kanji_font=TkFont.new('Helvetica 14 bold', 'Gothic 14 bold')
 
 else
-  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
+  $font = TkFont.new('Helvetica 14', nil)
   knjfont = '-*--16-*-jisx0208.1983-0'
-  $kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-                           knjfont)
+  $kanji_font = TkFont.new('Helvetic 14', knjfont)
   TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
+  $msg_kanji_font=TkFont.new('Helvetica 14',
                              '-*--24-*-jisx0208.1983-0')
 end
 #######
@@ -116,14 +124,22 @@ EOD
 end
 
 # ��˥塼����
-TkMenubar.new($root, 
-              [[['File', 0], 
-                  ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                  '---', 
-                  ['Quit', proc{exit}, 0, 'Meta-Q']
-                ]]).pack('side'=>'top', 'fill'=>'x')
+if $tk_major_ver >= 8
+  $root.add_menubar([[['File', 0], 
+                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
+                        '---', 
+                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
+                      ]])
+else
+  TkMenubar.new($root, 
+                [[['File', 0], 
+                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
+                    '---', 
+                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
+                  ]]).pack('side'=>'top', 'fill'=>'x')
+end
 $root.bind('F1', proc{aboutBox})
-$root.bind('Meta-q', proc{exit})
+$root.bind('Control-q', proc{exit})
 
 =begin
 TkFrame.new($root){|frame|
@@ -174,24 +190,37 @@ else
     yscrollcommand proc{|first,last| scr.set first,last}
   }
   scr.command(proc{|*args| txt.yview(*args)})
+
 #  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
+#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
 #  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
   textFrame.pack('expand'=>'yes', 'fill'=>'both')
+  #  $root.withdraw.deiconify
+  Tk.update_idletasks
+  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
 
   statusBar = TkFrame.new($root) {|f|
+    if $tk_version =~ /^4.*/
+      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+    else
+      statusfont = 'Helvetica 10'
+    end
     $statusBarLabel = \
     TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+                'font'=>statusfont) \
     .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
     TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+                'font'=>statusfont) \
     .pack('side'=>'left', 'padx'=>2)
   }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 end
 
 # �ƥ����ȥ�������
-tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+if $tk_version =~ /^4.*/
+  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+else
+  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
+end
 #tag_kanji_title = TkTextTag.new(txt, 'kanjifont'=>$msg_kanji_font)
 #tag_middle = TkTextTag.new(txt, 'kanjifont'=>$kanji_font)
 tag_kanji_title = TkTextTag.new(txt, 'font'=>$msg_kanji_font)
@@ -262,14 +291,31 @@ txt.insert('end', <<"EOT")
 �뤿��ˡ�"�����ɻ���"�ܥ���򥯥�å����뤳�Ȥ��Ǥ��ޤ������ʤ���\
 ˾��ʤ顢���Υ����ɤ������뤳�Ȥ��Ǥ��ޤ����������������ɤǥǥ�\
 �󥹥ȥ졼������Ƽ¹Ԥ��뤿��ˤϡ������ɤ��񤫤줿������ɥ���\
-����"�ǥ�Ƽ¹�" �ܥ���򥯥�å����Ƥ���������
-
-�����Υǥ�Ǥϡ����Ū�Ƕ�ΥС������� Tk �Ǥʤ���Х��ݡ��Ȥ���\
-���ʤ���ǽ��ȤäƼ������Ƥ��ޤ�(�㤨�� Tk8.4 �ʾ�ʤ�)�����Τ��ᡤ\
-����������ǽ������ʤ� Tk �饤�֥���ȤäƤ�����ˤϡ���������\
-�ǥ��������ư���ޤ��󡥤��Τ褦�ʵ�ǽ��ɬ�פǤ���С�����򥵥ݡ���\
-���Ƥ��� Tk �饤�֥���Ȥ��褦�ˡ�tcltklib �򥳥�ѥ��뤷�ʤ�����\
-����������
+����"�ǥ�Ƽ¹�" �ܥ���򥯥�å����Ƥ���������\
+�����ɤ������Ƥ⥪�ꥸ�ʥ�Υե����뤬�񤭴������뤳�Ȥ�\
+����ޤ��󤫤顢���ۤ����˿������ѹ����ƤߤƤ���������
+
+�����Υǥ�Ǥϡ����Ū�Ƕ�ΥС������� Tk �Ǥʤ���Х��ݡ��Ȥ���\
+���ʤ���ǽ��ȤäƼ������Ƥ��ޤ�(�㤨�� Tk8.4 �ʾ�ʤ�)�����Τ��ᡢ\
+����������ǽ������ʤ� Tk �饤�֥���ȤäƤ�����ˤϡ���������\
+�ǥ��������ư���ޤ��󡣤��Τ褦�ʵ�ǽ��ɬ�פǤ���С�����򥵥ݡ���\
+���Ƥ��� Tk �饤�֥���Ȥ��褦�� tcltklib �򥳥�ѥ��뤷�ʤ�����\
+����������
+
+�⤷���ʤ��� Tk �� (�ǽ餫��ޤफ���󥹥ȡ��뤷�����ˤ��) \
+Ttk (Tile) ��ĥ�����ѤǤ�����֤Ǥ���ʤ顢\
+Ttk ��ĥ�Υǥ� (sample/tkextlib/tile/demo.rb) �⤼�һ�ƤߤƤ���������
+( ¿ʬ�����ߤΤ��ʤ��δĶ��ˤ� Ttk ��ĥ��\
+#{
+begin
+  require 'tkextlib/tile'
+  "���Ǥ�Ƴ������Ƥ��ޤ�"
+rescue
+  "�ޤ����󥹥ȡ��뤵��Ƥ��ޤ���"
+end
+}\
+��)
+Ttk ��ĥ�ϡ�Tk8.5 �ʾ�Ǥ�ɸ��ε�ǽ�Ȥ����Ȥ߹��ޤ�Ƥ��ޤ���
 
 
 EOT
@@ -318,6 +364,9 @@ txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "14. ��٥��դ��ե졼�� (��ǽ���б������С�������Tk��ɬ��)\n", 
            tag_demo, "demo-labelframe")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "15. �ơ��ޤ��б��������������åȤδ�ñ���� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo, "demo-ttkbut")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 #txt.insert('end', "�ꥹ�ȥܥå���\n", tag_middle)
@@ -330,6 +379,12 @@ txt.insert('end', "2. ��: ���ץꥱ�������Τ�����ۿ����Ѥ���\n",
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "3. �ʸ���\n", tag_demo, "demo-sayings")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. ��ˤĤ��ƤΥޥ�������ꥹ�� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo, "demo-mclist")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. �ǥ��쥯�ȥ�֥饦�� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo, "demo-tree")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 #txt.insert('end', "����ȥ�ȥ��ԥ�ܥå���\n", tag_middle)
@@ -345,7 +400,10 @@ txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "4. ���ԥ�ܥå��� (��ǽ���б������С�������Tk��ɬ��)\n", 
            tag_demo, "demo-spin")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ��ñ�ʥե�����\n", tag_demo, "demo-form")
+txt.insert('end', "5. ����ܥܥå��� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo, "demo-combo")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. ��ñ�ʥե�����\n", tag_demo, "demo-form")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -367,6 +425,8 @@ txt.insert('end', "5. ������ɥ�����������ƥ����� (��ǽ���б������С�������
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "6. ����\n", tag_demo, "demo-search")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "7. �ƥ����ȥ��������åȤ�������(peering) (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-textpeer")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 #txt.insert('end', "�����Х�\n", tag_middle)
@@ -389,18 +449,23 @@ txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "8. �����������ǽ�ʥ����Х�\n", 
            tag_demo, "demo-cscroll")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "9. �������ܡ��ɾ�ε��Τν�� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo, "demo-knightstour")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-#txt.insert('end', "��������\n", tag_middle)
-txt.insert('end', "��������\n", tag_kanji_title)
+#txt.insert('end', "��������ȥץ����쥹�С�\n", tag_middle)
+txt.insert('end', "��������ȥץ����쥹�С�\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. ��ľ��������\n", tag_demo.id, "demo-vscale")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��ľ\n", tag_demo.id, "demo-vscale")
+txt.insert('end', "2. ��ʿ��������\n", tag_demo.id, "demo-hscale")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��ʿ\n", tag_demo.id, "demo-hscale")
+txt.insert('end', "3. �ץ����쥹�С� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", tag_demo.id, "demo-ttkprogress")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-txt.insert('end', "�ڥ���ɥ�����ɥ�\n", tag_kanji_title)
+txt.insert('end', "�ڥ���ɥ�����ɥ��ȥΡ��ȥ֥å�\n", tag_kanji_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. ��ʿ���� (��ǽ���б������С�������Tk��ɬ��)\n", 
            tag_demo.id, "demo-paned1")
@@ -408,10 +473,16 @@ txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "2. ��ľ���� (��ǽ���б������С�������Tk��ɬ��)\n", 
            tag_demo.id, "demo-paned2")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. �ơ��ޤ��б����������ߥڥ��� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo.id, "demo-ttkpane")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. �Ρ��ȥ֥å����������å� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo.id, "demo-ttknote")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-#txt.insert('end', "��˥塼\n", tag_middle)
-txt.insert('end', "��˥塼\n", tag_kanji_title)
+#txt.insert('end', "��˥塼�ȥġ���С�\n", tag_middle)
+txt.insert('end', "��˥塼�ȥġ���С�\n", tag_kanji_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. ��˥塼�ȥ��������ɤ�ޤ��������ɥ�\n", 
            tag_demo, "demo-menu")
@@ -425,6 +496,12 @@ txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "4. ��˥塼�ܥ��� (Tk8.x ����)\n", 
            tag_demo, "demo-menubu")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. �ơ��ޤ��б�������˥塼�ܥ��� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo.id, "demo-ttkmenu")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. �ơ��ޤ��б������ġ���С� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", 
+           tag_demo.id, "demo-toolbar")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 #txt.insert('end', "����������������ɥ�\n", tag_middle)
@@ -432,9 +509,11 @@ txt.insert('end', "����������������ɥ�\n", tag_kanji_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. ��å������ܥå���\n", tag_demo, "demo-msgbox")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. �ե������������������\n", tag_demo, "demo-filebox")
+txt.insert('end', "2. �ܺ٥ƥ������դ��Υ�å������ܥå��� (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-msgbox2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. �ե������������������\n", tag_demo, "demo-filebox")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ���������������\n", tag_demo, "demo-clrpick")
+txt.insert('end', "4. ���������������\n", tag_demo, "demo-clrpick")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -483,25 +562,30 @@ def showVars1(parent, *args)
   end
   top = TkToplevel.new(parent) {|w|
     title "Variable values"
-    TkLabel.new(w) {
+    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
+    TkLabel.new(base) {
       text "�ѿ���:"
       width 20
       anchor 'center'
-      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+      if $tk_version =~ /^4.*/
+        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+      else
+        font 'Helvetica 14'
+      end
     }.pack('side'=>'top', 'fill'=>'x')
     len = 1
     args.each{|vnam,vbody|
       len = vnam.to_s.length if vnam.to_s.length > len
     }
     args.each{|vnam,vbody|
-      TkFrame.new(w){|f|
+      TkFrame.new(base){|f|
         #TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
         TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
         TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
                    .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
       }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
     }
-    TkButton.new(w) {
+    TkButton.new(base) {
       text "λ��"
       command proc{w.destroy}
     }.pack('side'=>'bottom', 'pady'=>2)
@@ -516,10 +600,12 @@ def showVars2(parent, *args)
     rescue
     end
   end
-  $showVarsWin[parent.path] = TkToplevel.new(parent) {|w|
+  $showVarsWin[parent.path] = TkToplevel.new(parent) {|top|
     title "Variable values"
 
-    TkLabelFrame.new(w, :text=>"�ѿ���:", 
+    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
+
+    TkLabelFrame.new(base, :text=>"�ѿ���:", 
                      :font=>{:family=>'Helvetica', :size=>14}){|f|
       args.each{|vnam,vbody|
         TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'), 
@@ -531,15 +617,15 @@ def showVars2(parent, *args)
       f.grid_columnconfig(1, :weight=>1)
       f.grid_rowconfig(100, :weight=>1)
     }
-    TkButton.new(w, :text=>"λ��", :width=>8, :default=>:active, 
-                 :command=>proc{w.destroy}){|b|
-      w.bind('Return', proc{b.invoke})
-      w.bind('Escape', proc{b.invoke})
+    TkButton.new(base, :text=>"λ��", :width=>8, :default=>:active, 
+                 :command=>proc{top.destroy}){|b|
+      top.bind('Return', proc{b.invoke})
+      top.bind('Escape', proc{b.invoke})
 
       b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
     }
-    w.grid_columnconfig(0, :weight=>1)
-    w.grid_rowconfig(0, :weight=>1)
+    base.grid_columnconfig(0, :weight=>1)
+    base.grid_rowconfig(0, :weight=>1)
   }
 end
 
@@ -633,8 +719,27 @@ def _null_binding
 end
 private :_null_binding
 
-def eval_samplecode(code)
-  Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }.run
+def eval_samplecode(code, file=nil)
+  #eval(code)
+  #_null_binding.pseudo_toplevel_eval{ eval(code) }
+  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
+  Thread.new{
+    _null_binding.pseudo_toplevel_eval{
+      begin
+        if file
+          eval(code, binding, "(eval:#{file})")
+        else
+          eval(code)
+        end
+      rescue Exception=>e
+        #p e
+        TkBgError.show(e.message + "\n" + 
+                         "\n---< backtrace of Ruby side >-----\n" + 
+                         e.backtrace.join("\n") + 
+                         "\n---< backtrace of Tk side >-------")
+      end
+    }
+  }
   Tk.update
 end
 
@@ -648,7 +753,7 @@ def invoke(txt, idx)
   Tk.update
   # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
   # Tk.update
-  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join)
+  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
   txt.cursor(cursor)
 
   $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
@@ -694,6 +799,7 @@ def showCode1(demo)
   if $code_window == nil || TkWinfo.exist?($code_window) == false
     $code_window = TkToplevel.new(nil)
     f = TkFrame.new($code_window)
+
     TkButton.new(f) {
       #text "λ��"
       text "�Ĥ���"
@@ -701,14 +807,25 @@ def showCode1(demo)
         $code_window.destroy
         $code_window = nil
       }
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
+    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
     TkButton.new(f) {
       text "�Ƽ¹�"
       # command proc{eval($code_text.get('1.0','end'), _null_binding)}
-      command proc{eval_samplecode($code_text.get('1.0','end'))}
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
-#    f.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x')
-    f.pack('side'=>'bottom', 'fill'=>'x')
+      command proc{eval_samplecode($code_text.get('1.0','end'), '<viewer>')}
+    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
+
+    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
+    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
+    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
+    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
+
+    $set_linenum = proc{|w|
+      line, pos = w.index('insert').split('.')
+      linenum.text = line
+      posnum.text  = pos
+    }
+
+    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
 
     if $tk_version =~ /^4\.[01]/
       s = TkScrollbar.new($code_window, 'orient'=>'vertical')
@@ -752,21 +869,29 @@ def showCode1(demo)
         TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
       }
     end
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
   end
+
   $code_window.title("Demo code: #{file}")
   $code_window.iconname(file)
-#  fid = open(file, 'r')
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
+  code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
   $code_text.delete('1.0', 'end')
-  #$code_text.insert('1.0', `cat #{file}`)
-  $code_text.insert('1.0', fid.read)
-  #$code_mark = TkTextMark.new($code_text, '1.0')
-  #$code_text.set_insert('1.0')
+  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
+  $code_text.insert('1.0', code)
   TkTextMarkInsert.new($code_text,'1.0')
-  fid.close
+  $set_linenum.call($code_text)
 end
 
 def showCode2(demo)
@@ -786,7 +911,19 @@ def showCode2(demo)
     tf.grid_columnconfigure(0, :weight=>1)
 
     bf = TkFrame.new($code_window)
-    
+
+    lf = TkFrame.new(bf)
+    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
+    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
+    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
+    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
+
+    $set_linenum = proc{|w|
+      line, pos = w.index('insert').split('.')
+      linenum.text = line
+      posnum.text  = pos
+    }
+
     #b_dis = TkButton.new(bf, :text=>'λ��', :default=>:active, 
     b_dis = TkButton.new(bf, :text=>'�Ĥ���', :default=>:active, 
                          :command=>proc{
@@ -800,12 +937,12 @@ def showCode2(demo)
     b_run = TkButton.new(bf, :text=>'�Ƽ¹�', 
                          :command=>proc{
                            # eval($code_text.get('1.0','end'), _null_binding)
-                           eval_samplecode($code_text.get('1.0','end'))
+                           eval_samplecode($code_text.get('1.0','end'), '<viewer>')
                          }, 
                          :image=>$image['refresh'], :compound=>:left)
 
-    TkGrid('x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(0, :weight=>1)
+    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
+    bf.grid_columnconfigure(1, :weight=>1)
 
     TkGrid(tf, :sticky=>'news')
     TkGrid(bf, :sticky=>'ew')
@@ -818,6 +955,16 @@ def showCode2(demo)
     $code_window.bindinfo('Return').each{|cmd, arg|
       $code_window.bind_append('Escape', cmd, arg)
     }
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
@@ -825,11 +972,12 @@ def showCode2(demo)
 
   $code_window.title("Demo code: #{file}")
   $code_window.iconname(file)
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
+  code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
   $code_text.delete('1.0', 'end')
-  $code_text.insert('1.0', fid.read)
+  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
+  $code_text.insert('1.0', code)
   TkTextMarkInsert.new($code_text,'1.0')
-  fid.close
+  $set_linenum.call($code_text)
 end
 
 if $tk_major_ver < 8
@@ -926,12 +1074,13 @@ end
 #
 def aboutBox
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-                'message'=>"Ruby/Tk ���������åȥǥ� Ver.1.6.0-jp\n\n" + 
+                'message'=>"Ruby/Tk ���������åȥǥ� Ver.1.7.1-jp\n\n" + 
                            "based on demos of Tk8.1 -- 8.5  " + 
-                           "( Copyright:: " + 
+                           "( Copyright of Tcl/Tk demos:: " + 
                            "(c) 1996-1997 Sun Microsystems, Inc. / " + 
                            "(c) 1997-2000 Ajuba Solutions, Inc. / " + 
-                           "(c) 2001-2003 Donal K. Fellows )\n\n" +
+                           "(c) 2001-2007 Donal K. Fellows / " + 
+                           "(c) 2002-2007 Daniel A. Steffen )\n\n" +
                            "Your Ruby & Tk Version ::\n" + 
                            "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" + 
                            "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
@@ -953,7 +1102,7 @@ ARGV.each{|cmd|
   end
   #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, 
   #     _null_binding)
-  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join)
+  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
 }
 if no_launcher
   $root.withdraw  # hide root window
diff --git a/ext/tk/sample/editable_listbox.rb b/ext/tk/sample/editable_listbox.rb
index 99345da380..7a9ad4450b 100644
--- a/ext/tk/sample/editable_listbox.rb
+++ b/ext/tk/sample/editable_listbox.rb
@@ -1,28 +1,115 @@
 #
-# Editable_TkListbox class
+# Tk::RbWidget::Editable_Listbox class
 #
 #   When "DoubleClick-1" on a listbox item, the entry box is opend on the
 #   item. And when hit "Return" key on the entry box after modifying the
-#   text, the entry box is closed and the item is changed. Or when hit 
+#   text, the entry box is closed and the item is changed. Or when hit
 #   "Escape" key, the entry box is closed without modification.
 #
 #                              by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
 require 'tk'
 
-class Editable_TkListbox < TkListbox
-  def _ebox_placer(coord_y)
-    idx = self.nearest(coord_y)
-    x, y, w, h = self.bbox(idx)
-    @ebox.place(:x => 0, :relwidth => 1.0, 
-                :y => y - self.selectborderwidth, 
-                :height => h + 2 * self.selectborderwidth)
+module Tk
+  module RbWidget
+    class Editable_Listbox < TkListbox
+    end
+  end
+end
+
+
+class Tk::RbWidget::Editable_Listbox < TkListbox
+  #------------------------------------
+  BindTag = TkBindTag.new_by_name(self.to_s.gsub(/::/, '#'))
+
+  BindTag.bind('FocusIn', :widget){|w|
+    w.instance_eval{
+      if idx = @ebox.pos
+        see(idx) if bbox(idx).empty?
+        @ebox.focus(true)
+      end 
+    }
+  }
+
+  BindTag.bind('Double-1', :widget, :y){|w, y|
+    w.instance_eval{ _ebox_placer(nearest(y)) }
+  }
+
+  BindTag.bind('Return', :widget){|w|
+    w.instance_eval{
+      if idx = index(:active)
+        _ebox_placer(idx)
+      end
+    }
+  }
+  #------------------------------------
+
+  def configure(*args)
+    ret = super
+
+    case cget(:state)
+    when 'normal'
+      # do nothing
+    when 'disabled'
+      _ebox_erase
+    else # unknown
+      # do nothing
+
+    end
+
+    ret
+  end
+
+  def _ebox_move(idx)
+    return nil if cget(:state) == 'disabled'
+    x, y, w, h = bbox(idx)
+    return nil unless y && h
+    @ebox.place(:x => 0, :relwidth => 1.0,
+                :y => y - selectborderwidth,
+                :height => h + 2 * selectborderwidth)
     @ebox.pos = idx
-    @ebox.value = self.listvariable.list[idx]
     @ebox.focus
   end
-  private :_ebox_placer
 
+  def _ebox_placer(idx)
+    return nil unless _ebox_move(idx)
+    @ebox.value = listvariable.list[idx]
+    @ebox.xview_moveto(self.xview[0])
+  end
+
+  def _ebox_erase
+    @ebox.place_forget
+    @ebox.pos = nil
+  end
+  private :_ebox_move, :_ebox_placer, :_ebox_erase
+
+  def _setup_ebox_bindings
+    # bindings for entry
+    @ebox.bind('Return'){
+      list = listvariable.list
+      list[@ebox.pos] = @ebox.value if @ebox.pos
+      listvariable.value = list
+      _ebox_erase
+      focus
+    }
+
+    @ebox.bind('Escape'){ _ebox_erase }
+  end
+  def _setup_listbox_bindings
+    # bindings for listbox
+    tags = bindtags
+    bindtags(tags.insert(tags.index(self) + 1, self.class::BindTag))
+  end
+  private :_setup_ebox_bindings,  :_setup_listbox_bindings
+
+  def yview(*args)
+    if !@ebox.pos || bbox(@ebox.pos).empty?
+      @ebox.place_forget
+    else
+      _ebox_move(@ebox.pos)
+    end
+    super
+  end
 
   def create_self(keys)
     super(keys)
@@ -32,38 +119,30 @@ class Editable_TkListbox < TkListbox
     end
 
     @ebox = TkEntry.new(self){
-      @pos = -1
+      @pos = nil
       def self.pos; @pos; end
       def self.pos=(idx); @pos = idx; end
     }
 
-    @ebox.bind('Return'){
-      list = self.listvariable.list
-      list[@ebox.pos] = @ebox.value
-      self.listvariable.value = list
-      @ebox.place_forget
-      @ebox.pos = -1
-    }
-
-    @ebox.bind('Escape'){
-      @ebox.place_forget
-      @ebox.pos = -1
-    }
-
-    self.bind('Double-1', '%y'){|y| _ebox_placer(y) }
+    _setup_ebox_bindings
+    _setup_listbox_bindings
   end
 end
 
 if $0 == __FILE__
+  #lbox0 = TkListbox.new.pack(:side=>:left)
+  #lbox0.insert(:end,     0,1,2,3,4,5,6,7,8,9,0,1,2,3)
+
   scr = TkScrollbar.new.pack(:side=>:right, :fill=>:y)
 
-  lbox1 = Editable_TkListbox.new.pack(:side=>:left)
-  lbox2 = Editable_TkListbox.new.pack(:side=>:left)
+  lbox1 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
+  lbox2 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
 
   scr.assign(lbox1, lbox2)
 
   lbox1.insert(:end, *%w(a b c d e f g h i j k l m n))
   lbox2.insert(:end,     0,1,2,3,4,5,6,7,8,9,0,1,2,3)
 
+
   Tk.mainloop
 end
diff --git a/ext/tk/sample/encstr_usage.rb b/ext/tk/sample/encstr_usage.rb
index 4285ec861c..39dc9c4018 100644
--- a/ext/tk/sample/encstr_usage.rb
+++ b/ext/tk/sample/encstr_usage.rb
@@ -11,19 +11,20 @@ t1 = TkText.new(:height=>5).pack
 t2 = TkText.new(:height=>5).pack
 t3 = TkText.new(:height=>5).pack
 
-src_str = IO.readlines('iso2022-kr.txt').join
+src_str = IO.readlines(File.join(File.dirname(__FILE__),'iso2022-kr.txt')).join
 
-t1.insert('end', 
+t1.insert('end',
           "use neither Tk::EncodedString class nor Tk.encoding= method\n\n")
 t1.insert('end', src_str)
 
 enc_str = Tk::EncodedString(src_str, 'iso2022-kr')
-t2.insert('end', 
+t2.insert('end',
           "use Tk::EncodedString class (Tk.encoding => '#{Tk.encoding}')\n\n")
 t2.insert('end', enc_str)
 
 Tk.encoding = 'iso2022-kr'
-t3.insert('end', "use Tk.encoding = 'iso2022-kr'\n\n")
+t3.insert('end', "use Tk.encoding = 'iso2022-kr' (Tk.force_default_encoding? == #{Tk.force_default_encoding?})\n\n")
+
 t3.insert('end', src_str)
 
 Tk.mainloop
diff --git a/ext/tk/sample/figmemo_sample.rb b/ext/tk/sample/figmemo_sample.rb
new file mode 100644
index 0000000000..25ec618fe8
--- /dev/null
+++ b/ext/tk/sample/figmemo_sample.rb
@@ -0,0 +1,456 @@
+#!/usr/bin/env ruby
+require 'tk'
+
+begin
+  # try to use Img extension
+  require 'tkextlib/tkimg'
+rescue Exception
+  # cannot use Img extention --> ignore
+end
+
+
+############################
+# scrolled_canvas
+class TkScrolledCanvas < TkCanvas
+  include TkComposite
+
+  def initialize_composite(keys={})
+    @h_scr = TkScrollbar.new(@frame)
+    @v_scr = TkScrollbar.new(@frame)
+
+    @canvas = TkCanvas.new(@frame)
+    @path = @canvas.path
+
+    @canvas.xscrollbar(@h_scr)
+    @canvas.yscrollbar(@v_scr)
+
+    TkGrid.rowconfigure(@frame, 0, :weight=>1, :minsize=>0)
+    TkGrid.columnconfigure(@frame, 0, :weight=>1, :minsize=>0)
+
+    @canvas.grid(:row=>0, :column=>0, :sticky=>'news')
+    @h_scr.grid(:row=>1, :column=>0, :sticky=>'ew')
+    @v_scr.grid(:row=>0, :column=>1, :sticky=>'ns')
+
+    delegate('DEFAULT', @canvas)
+    delegate('background', @canvas, @h_scr, @v_scr)
+    delegate('activebackground', @h_scr, @v_scr)
+    delegate('troughcolor', @h_scr, @v_scr)
+    delegate('repeatdelay', @h_scr, @v_scr)
+    delegate('repeatinterval', @h_scr, @v_scr)
+    delegate('borderwidth', @frame)
+    delegate('relief', @frame)
+
+    delegate_alias('canvasborderwidth', 'borderwidth', @canvas)
+    delegate_alias('canvasrelief', 'relief', @canvas)
+
+    delegate_alias('scrollbarborderwidth', 'borderwidth', @h_scr, @v_scr)
+    delegate_alias('scrollbarrelief', 'relief', @h_scr, @v_scr)
+
+    configure(keys) unless keys.empty?
+  end
+end
+
+############################
+class PhotoCanvas < TkScrolledCanvas
+
+USAGE = <<EOT
+--- WHAT IS ---
+You can write comments on the loaded image, and save it as a Postscipt
+file (original image file is not modified). Each comment is drawn as a
+set of an indicator circle, an arrow, and a memo text. See the following
+how to write comments.
+This can save the list of memo texts to another file. It may useful to
+search the saved Postscript file by the comments on them.
+This may not support multibyte characters (multibyte texts are broken on
+a Postscript file). It depends on features of canvas widgets of Tcl/Tk
+libraries linked your Ruby/Tk. If you use Tcl/Tk8.0-jp (Japanized Tcl/Tk),
+you can (possibly) get a Japanese Postscript file.
+
+--- BINDINGS ---
+* Button-1 : draw comments by following steps
+    1st - Set center of a indicator circle.
+    2nd - Set head position of an arrow.
+    3rd - Set tail position of an arrow, and show an entry box.
+          Input a memo text and hit 'Enter' key to entry the comment.
+
+* Button-2-drag : scroll the canvas
+
+* Button-3 : when drawing, cancel current drawing
+
+* Double-Button-3 : delete the clicked comment (text, arrow, and circle)
+EOT
+
+  def initialize(*args)
+    super(*args)
+
+    self.highlightthickness = 0
+    self.selectborderwidth = 0
+
+    @photo = TkPhotoImage.new
+    @img = TkcImage.new(self, 0, 0, :image=>@photo)
+
+    width  = self.width
+    height = self.height
+    @scr_region = [-width, -height, width, height]
+    self.scrollregion(@scr_region)
+    self.xview_moveto(0.25)
+    self.yview_moveto(0.25)
+
+    @col = 'red'
+    @font = 'Helvetica -12'
+
+    @memo_id_num = -1
+    @memo_id_head = 'memo_'
+    @memo_id_tag = nil
+    @overlap_d = 2
+
+    @state = TkVariable.new
+    @border = 2
+    @selectborder = 1
+    @delta = @border + @selectborder
+    @entry = TkEntry.new(self, :relief=>:ridge, :borderwidth=>@border,
+                         :selectborderwidth=>@selectborder,
+                         :highlightthickness=>0)
+    @entry.bind('Return'){@state.value = 0}
+
+    @mode = old_mode = 0
+
+    _state0()
+
+    bind('2', :x, :y){|x,y| scan_mark(x,y)}
+    bind('B2-Motion', :x, :y){|x,y| scan_dragto(x,y)}
+
+    bind('3'){
+      next if (old_mode = @mode) == 0
+      @items.each{|item| item.delete }
+      _state0()
+    }
+
+    bind('Double-3', :widget, :x, :y){|w, x, y|
+      next if old_mode != 0
+      x = w.canvasx(x)
+      y = w.canvasy(y)
+      tag = nil
+      w.find_overlapping(x - @overlap_d, y - @overlap_d,
+                         x + @overlap_d, y + @overlap_d).find{|item|
+        ! (item.tags.find{|name|
+             if name =~ /^(#{@memo_id_head}\d+)$/
+               tag = $1
+             end
+           }.empty?)
+      }
+      w.delete(tag) if tag
+    }
+  end
+
+  #-----------------------------------
+  private
+  def _state0() # init
+    @mode = 0
+
+    @memo_id_num += 1
+    @memo_id_tag = @memo_id_head + @memo_id_num.to_s
+
+    @target = nil
+    @items = []
+    @mark = [0, 0]
+    bind_remove('Motion')
+    bind('ButtonRelease-1', proc{|x,y| _state1(x,y)}, '%x', '%y')
+  end
+
+  def _state1(x,y) # set center
+    @mode = 1
+
+    @target = TkcOval.new(self,
+                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
+                          :outline=>@col, :width=>3, :tags=>[@memo_id_tag])
+    @items << @target
+    @mark = [x,y]
+
+    bind('Motion', proc{|x,y| _state2(x,y)}, '%x', '%y')
+    bind('ButtonRelease-1', proc{|x,y| _state3(x,y)}, '%x', '%y')
+  end
+
+  def _state2(x,y) # create circle
+    @mode = 2
+
+    r = Integer(Math.sqrt((x-@mark[0])**2 + (y-@mark[1])**2))
+    @target.coords([canvasx(@mark[0] - r), canvasy(@mark[1] - r)],
+                   [canvasx(@mark[0] + r), canvasy(@mark[1] + r)])
+  end
+
+  def _state3(x,y) # set line start
+    @mode = 3
+
+    @target = TkcLine.new(self,
+                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
+                          :arrow=>:first, :arrowshape=>[10, 14, 5],
+                          :fill=>@col, :tags=>[@memo_id_tag])
+    @items << @target
+    @mark = [x, y]
+
+    bind('Motion', proc{|x,y| _state4(x,y)}, '%x', '%y')
+    bind('ButtonRelease-1', proc{|x,y| _state5(x,y)}, '%x', '%y')
+  end
+
+  def _state4(x,y) # create line
+    @mode = 4
+
+    @target.coords([canvasx(@mark[0]), canvasy(@mark[1])],
+                   [canvasx(x), canvasy(y)])
+  end
+
+  def _state5(x,y) # set text
+    @mode = 5
+
+    if x - @mark[0] >= 0
+      justify = 'left'
+      dx = - @delta
+
+      if y - @mark[1] >= 0
+        anchor = 'nw'
+        dy = - @delta
+      else
+        anchor = 'sw'
+        dy = @delta
+      end
+    else
+      justify = 'right'
+      dx = @delta
+
+      if y - @mark[1] >= 0
+        anchor = 'ne'
+        dy = - @delta
+      else
+        anchor = 'se'
+        dy = @delta
+      end
+    end
+
+    bind_remove('Motion')
+
+    @entry.value = ''
+    @entry.configure(:justify=>justify, :font=>@font, :foreground=>@col)
+
+    ewin = TkcWindow.new(self, [canvasx(x)+dx, canvasy(y)+dy],
+                         :window=>@entry, :state=>:normal, :anchor=>anchor,
+                         :tags=>[@memo_id_tag])
+
+    @entry.focus
+    @entry.grab
+    @state.wait
+    @entry.grab_release
+
+    ewin.delete
+
+    @target = TkcText.new(self, [canvasx(x), canvasy(y)],
+                          :anchor=>anchor, :justify=>justify,
+                          :fill=>@col, :font=>@font, :text=>@entry.value,
+                          :tags=>[@memo_id_tag])
+
+    _state0()
+  end
+
+  #-----------------------------------
+  public
+  def load_photo(filename)
+    @photo.configure(:file=>filename)
+  end
+
+  def modified?
+    ! ((find_withtag('all') - [@img]).empty?)
+  end
+
+  def fig_erase
+    (find_withtag('all') - [@img]).each{|item| item.delete}
+  end
+
+  def reset_region
+    width = @photo.width
+    height = @photo.height
+
+    if width > @scr_region[2]
+      @scr_region[0] = -width
+      @scr_region[2] = width
+    end
+
+    if height > @scr_region[3]
+      @scr_region[1] = -height
+      @scr_region[3] = height
+    end
+
+    self.scrollregion(@scr_region)
+    self.xview_moveto(0.25)
+    self.yview_moveto(0.25)
+  end
+
+  def get_texts
+    ret = []
+    find_withtag('all').each{|item|
+      if item.kind_of?(TkcText)
+        ret << item[:text]
+      end
+    }
+    ret
+  end
+end
+############################
+
+# define methods for menu
+def open_file(canvas, fname)
+  if canvas.modified?
+    ret = Tk.messageBox(:icon=>'warning',:type=>'okcancel',:default=>'cancel',
+                        :message=>'Canvas may be modified. Realy erase? ')
+    return if ret == 'cancel'
+  end
+
+  filetypes = [
+    ['GIF Files', '.gif'],
+    ['GIF Files', [], 'GIFF'],
+    ['PPM Files', '.ppm'],
+    ['PGM Files', '.pgm']
+  ]
+
+  begin
+    if Tk::Img::package_version != ''
+      filetypes << ['JPEG Files', ['.jpg', '.jpeg']]
+      filetypes << ['PNG Files', '.png']
+      filetypes << ['PostScript Files', '.ps']
+      filetypes << ['PDF Files', '.pdf']
+      filetypes << ['Windows Bitmap Files', '.bmp']
+      filetypes << ['Windows Icon Files', '.ico']
+      filetypes << ['PCX Files', '.pcx']
+      filetypes << ['Pixmap Files', '.pixmap']
+      filetypes << ['SGI Files', '.sgi']
+      filetypes << ['Sun Raster Files', '.sun']
+      filetypes << ['TGA Files', '.tga']
+      filetypes << ['TIFF Files', '.tiff']
+      filetypes << ['XBM Files', '.xbm']
+      filetypes << ['XPM Files', '.xpm']
+    end
+  rescue
+  end
+
+  filetypes << ['ALL Files', '*']
+
+  fpath = Tk.getOpenFile(:filetypes=>filetypes)
+  return if fpath.empty?
+
+  begin
+    canvas.load_photo(fpath)
+  rescue => e
+    Tk.messageBox(:icon=>'error', :type=>'ok',
+                  :message=>"Fail to read '#{fpath}'.\n#{e.message}")
+  end
+
+  canvas.fig_erase
+  canvas.reset_region
+
+  fname.value = fpath
+end
+
+# --------------------------------
+def save_memo(canvas, fname)
+  initname = fname.value
+  if initname != '-'
+    initname = File.basename(initname, File.extname(initname))
+    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
+                                         ['ALL Files', '*'] ],
+                           :initialfile=>initname)
+  else
+    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
+                                         ['ALL Files', '*'] ])
+  end
+  return if fpath.empty?
+
+  begin
+    fid = open(fpath, 'w')
+  rescue => e
+    Tk.messageBox(:icon=>'error', :type=>'ok',
+                  :message=>"Fail to open '#{fname.value}'.\n#{e.message}")
+  end
+
+  begin
+    canvas.get_texts.each{|txt|
+      fid.print(txt, "\n")
+    }
+  ensure
+    fid.close
+  end
+end
+
+# --------------------------------
+def ps_print(canvas, fname)
+  initname = fname.value
+  if initname != '-'
+    initname = File.basename(initname, File.extname(initname))
+    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
+                                         ['ALL Files', '*'] ],
+                           :initialfile=>initname)
+  else
+    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
+                                         ['ALL Files', '*'] ])
+  end
+  return if fpath.empty?
+
+  bbox = canvas.bbox('all')
+  canvas.postscript(:file=>fpath, :x=>bbox[0], :y=>bbox[1],
+                    :width=>bbox[2] - bbox[0], :height=>bbox[3] - bbox[1])
+end
+
+# --------------------------------
+def quit(canvas)
+  ret = Tk.messageBox(:icon=>'warning', :type=>'okcancel',
+                      :default=>'cancel',
+                      :message=>'Realy quit? ')
+  exit if ret == 'ok'
+end
+
+# --------------------------------
+# setup root
+root = TkRoot.new(:title=>'Fig Memo')
+
+# create canvas frame
+canvas = PhotoCanvas.new(root).pack(:fill=>:both, :expand=>true)
+usage_frame = TkFrame.new(root, :relief=>:ridge, :borderwidth=>2)
+hide_btn = TkButton.new(usage_frame, :text=>'hide usage',
+                        :font=>{:size=>8}, :pady=>1,
+                        :command=>proc{usage_frame.unpack})
+hide_btn.pack(:anchor=>'e', :padx=>5)
+usage = TkLabel.new(usage_frame, :text=>PhotoCanvas::USAGE,
+                    :font=>'Helvetica 8', :justify=>:left).pack
+
+show_usage = proc{
+  usage_frame.pack(:before=>canvas, :fill=>:x, :expand=>true)
+}
+
+fname = TkVariable.new('-')
+f = TkFrame.new(root, :relief=>:sunken, :borderwidth=>1).pack(:fill=>:x)
+label = TkLabel.new(f, :textvariable=>fname,
+                    :font=>{:size=>-12, :weight=>:bold},
+                    :anchor=>'w').pack(:side=>:left, :fill=>:x, :padx=>10)
+
+# create menu
+mspec = [
+  [ ['File', 0],
+    ['Show Usage',      proc{show_usage.call}, 5],
+    '---',
+    ['Open Image File', proc{open_file(canvas, fname)}, 0],
+    ['Save Memo Texts', proc{save_memo(canvas, fname)}, 0],
+    '---',
+    ['Save Postscript', proc{ps_print(canvas, fname)}, 5],
+    '---',
+    ['Quit', proc{quit(canvas)}, 0]
+  ]
+]
+root.add_menubar(mspec)
+
+# manage wm_protocol
+root.protocol(:WM_DELETE_WINDOW){quit(canvas)}
+
+# show usage
+show_usage.call
+
+# --------------------------------
+# start eventloop
+Tk.mainloop
diff --git a/ext/tk/sample/irbtk.rb b/ext/tk/sample/irbtk.rb
index 53ef10d0d1..70dd33e4da 100644
--- a/ext/tk/sample/irbtk.rb
+++ b/ext/tk/sample/irbtk.rb
@@ -4,8 +4,8 @@
 #
 #   If you want to use 'multi-tk.rb', give option '--multi-tk'.
 #   And if you want to use 'remote-tk.rb', give option '--remote-tk'.
-#   If you want both, you don't need to give both options, because 
-#   'remote-tk.rb' includes 'multi-tk.rb'. 
+#   If you want both, you don't need to give both options, because
+#   'remote-tk.rb' includes 'multi-tk.rb'.
 #   ( There is no trouble even if you give both options. )
 #
 require 'remote-tk' if ARGV.delete('--remote-tk')
diff --git a/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw
index f6a35be6ed..04de3a2022 100644
--- a/ext/tk/sample/irbtkw.rbw
+++ b/ext/tk/sample/irbtkw.rbw
@@ -4,7 +4,7 @@
 #
 #                                 by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
-release = '2006/11/06'
+release = '2008/03/08'
 
 require 'tk'
 begin
@@ -15,10 +15,32 @@ end
 
 require 'irb'
 
+if TkCore::WITH_ENCODING
+else
+  # $KCODE setup
+  case Tk.encoding
+  when 'shiftjis', 'cp932'
+    $KCODE='SJIS'
+  when 'euc-jp'
+    $KCODE='EUC'
+  when 'utf-8', 'unicode'
+    $KCODE='UTF8'
+  else
+    # unknown
+  end
+end
+
 # console setup
 top = TkToplevel.new(:title=>'IRB console')
 top.protocol(:WM_DELETE_WINDOW){ Tk.exit }
 
+case (Tk.windowingsystem)
+when 'win32'
+  fnt = ['MS Gothic', '-12']
+else
+  fnt = ['courier', '-12']
+end
+
 console = TkTextIO.new(top, :mode=>:console, 
                        :width=>80).pack(:side=>:left, 
                                         :expand=>true, :fill=>:both)
@@ -26,10 +48,20 @@ console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console,
                                                          :side=>:right, 
                                                          :expand=>false, 
                                                          :fill=>:y))
+
+# save original I/O
+out = $stdout
+err = $stderr
+
 irb_thread = nil
 ev_loop = Thread.new{
-  Tk.mainloop
-  irb_thread.kill if irb_thread
+  begin
+    Tk.mainloop
+  ensure
+    $stdout = out
+    $stderr = err
+    irb_thread.kill if irb_thread
+  end
 }
 
 # window position control
@@ -120,5 +152,5 @@ console.bind('Control-c'){
 irb_thread.join
 
 # exit
-ev_thread.kill
+ev_loop.kill
 Tk.exit
diff --git a/ext/tk/sample/menubar1.rb b/ext/tk/sample/menubar1.rb
index 9fa1201d41..a233c6e088 100644
--- a/ext/tk/sample/menubar1.rb
+++ b/ext/tk/sample/menubar1.rb
@@ -11,21 +11,21 @@ menu_spec = [
     {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
     '---',
     ['Check_A', TkVariable.new(true), 6],
-    {:type=>'checkbutton', :label=>'Check_B', 
+    {:type=>'checkbutton', :label=>'Check_B',
                 :variable=>TkVariable.new, :underline=>6},
     '---',
     ['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
     ['Radio_Y', [radio_var, 'y'], 6],
     ['Radio_Z', [radio_var, 'z'], 6],
     '---',
-    ['cascade', [ 
-                   ['sss', proc{p 'sss'}, 0], 
-                   ['ttt', proc{p 'ttt'}, 0], 
-                   ['uuu', proc{p 'uuu'}, 0], 
-                   ['vvv', proc{p 'vvv'}, 0], 
-                ], 
-      0, '', 
-      {:font=>'Courier 16 italic', 
+    ['cascade', [
+                   ['sss', proc{p 'sss'}, 0],
+                   ['ttt', proc{p 'ttt'}, 0],
+                   ['uuu', proc{p 'uuu'}, 0],
+                   ['vvv', proc{p 'vvv'}, 0],
+                ],
+      0, '',
+      {:font=>'Courier 16 italic',
        :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
     '---',
     ['Quit', proc{exit}, 0]],
@@ -33,7 +33,7 @@ menu_spec = [
   [['Edit', 0],
     ['Cut', proc{puts('Cut clicked')}, 2],
     ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]], 
+    ['Paste', proc{puts('Paste clicked')}, 0]],
 
   [['Help', 0, {:menu_name=>'help'}],
     ['About This', proc{puts('Ruby/Tk menubar sample 1')}, 6]]
diff --git a/ext/tk/sample/menubar2.rb b/ext/tk/sample/menubar2.rb
index 4507d8b2fe..e3cd68eaef 100644
--- a/ext/tk/sample/menubar2.rb
+++ b/ext/tk/sample/menubar2.rb
@@ -11,21 +11,21 @@ menu_spec = [
     {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
     '---',
     ['Check_A', TkVariable.new(true), 6],
-    {:type=>'checkbutton', :label=>'Check_B', 
+    {:type=>'checkbutton', :label=>'Check_B',
                 :variable=>TkVariable.new, :underline=>6},
     '---',
     ['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
     ['Radio_Y', [radio_var, 'y'], 6],
     ['Radio_Z', [radio_var, 'z'], 6],
     '---',
-    ['cascade', [ 
-                   ['sss', proc{p 'sss'}, 0], 
-                   ['ttt', proc{p 'ttt'}, 0], 
-                   ['uuu', proc{p 'uuu'}, 0], 
-                   ['vvv', proc{p 'vvv'}, 0], 
-                ], 
-      0, '', 
-      {:font=>'Courier 16 italic', 
+    ['cascade', [
+                   ['sss', proc{p 'sss'}, 0],
+                   ['ttt', proc{p 'ttt'}, 0],
+                   ['uuu', proc{p 'uuu'}, 0],
+                   ['vvv', proc{p 'vvv'}, 0],
+                ],
+      0, '',
+      {:font=>'Courier 16 italic',
        :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
     '---',
     ['Quit', proc{exit}, 0]],
@@ -33,16 +33,16 @@ menu_spec = [
   [['Edit', 0],
     ['Cut', proc{puts('Cut clicked')}, 2],
     ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]], 
+    ['Paste', proc{puts('Paste clicked')}, 0]],
 
   [['Help', 0, {:menu_name=>'help'}],
     ['About This', proc{puts('Ruby/Tk menubar sample 2')}, 6]]
 ]
 
-mbar = Tk.root.add_menubar(menu_spec, 
+mbar = Tk.root.add_menubar(menu_spec,
                            # followings are default configure options
                            'tearoff'=>'false',
-                           'foreground'=>'grey40', 
+                           'foreground'=>'grey40',
                            'activeforeground'=>'red',
                            'font'=>'Helvetia 12 bold')
 # This (default configure options) is NOT same the following.
diff --git a/ext/tk/sample/menubar3.rb b/ext/tk/sample/menubar3.rb
new file mode 100644
index 0000000000..129cfd779b
--- /dev/null
+++ b/ext/tk/sample/menubar3.rb
@@ -0,0 +1,72 @@
+#
+# menubar sample 3 : vertical layout menubar; use frame and menubuttons
+#
+
+require 'tk'
+
+radio_var = TkVariable.new('y')
+
+menu_spec = [
+  [['&File', true], # when underline option is ture, '&' index is the position
+    {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
+    '---',
+    ['Check_A', TkVariable.new(true), 6],
+    {:type=>'checkbutton', :label=>'Check_B',
+                :variable=>TkVariable.new, :underline=>6},
+    '---',
+    ['Radio_X', [radio_var, 'x'], /[XYZ]/, '', {:foreground=>'black'}],
+    ['Radio_Y', [radio_var, 'y'], /[XYZ]/],
+    ['Radio_Z', [radio_var, 'z'], /[XYZ]/], # use Regexp for underline position
+    '---',
+    ['cascade', [
+                   ['sss', proc{p 'sss'}, 0],
+                   ['ttt', proc{p 'ttt'}, 0],
+                   ['uuu', proc{p 'uuu'}, 0],
+                   ['vvv', proc{p 'vvv'}, 0],
+                ],
+      0, '',
+      {:font=>'Courier 16 italic',
+       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
+    '---',
+    ['Quit', proc{exit}, 0]],
+
+  [['Edit', 0],
+    ['Cut', proc{puts('Cut clicked')}, 2],
+    ['Copy', proc{puts('Copy clicked')}, 0],
+    ['Paste', proc{puts('Paste clicked')}, 0]],
+
+  [['Help', 0, {:menu_name=>'help'}],
+    ['About This', proc{puts('Ruby/Tk menubar sample 3')}, "This"]]
+                                      # use string index for underline position
+]
+
+layout_proc = 'vertical'
+# The following procedure is same to 'layout_proc'=>'vertical'
+=begin
+layout_proc = proc{|parent, mbtn|
+  mbtn.direction :right
+  mbtn.pack(:side=>:top, :fill=>:x)
+
+  menu = mbtn.menu
+  cmd = proc{|m, dir|
+    Tk::Menu::TkInternalFunction.next_menu(m, dir) rescue nil
+    # ignore error when the internal function doesn't exist
+  }
+  menu.bind('Tab', cmd, :widget, 'forward')
+  menu.bind('Alt-Tab', cmd, :widget, 'backward')
+}
+=end
+
+menubar = TkMenubar.new(nil, menu_spec,
+                        'layout_proc'=>layout_proc, 
+                        'tearoff'=>false,
+                        'foreground'=>'grey40',
+                        'activeforeground'=>'red',
+                        'font'=>'Helvetia 12 bold')
+menubar.pack('side'=>'left', 'fill'=>'y')
+
+TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar".
+If "::tk::MenuNextMenuon" function is available  your Tcl/Tk library, you will be able to move to the next menu by Tab key on the posted menu, or the previous menu by Alt + Tab key.
+Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar3.rb).')
+
+Tk.mainloop
diff --git a/ext/tk/sample/msgs_rb/README b/ext/tk/sample/msgs_rb/README
index 2e3ff2a9c4..d986e031fd 100644
--- a/ext/tk/sample/msgs_rb/README
+++ b/ext/tk/sample/msgs_rb/README
@@ -1,3 +1,3 @@
 Message catalogs in this directory depend on Tcl/Tk's message catalogs. 
 Texts of each locale are copied from Tcl/Tk8.5a1 widget demos.
-Please refer '../msgs_tk/README'. 
+Please refer to '../msgs_tk/README'. 
diff --git a/ext/tk/sample/multi-ip_sample.rb b/ext/tk/sample/multi-ip_sample.rb
index 8d6e1bc626..eccf0201f8 100644
--- a/ext/tk/sample/multi-ip_sample.rb
+++ b/ext/tk/sample/multi-ip_sample.rb
@@ -19,7 +19,6 @@ cmd = Proc.new{|txt|
   else
     root = TkRoot.new(:title=>'timer sample')
   end
-
   label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
                   .pack(:side=>:bottom, :fill=>:both)
 
@@ -48,6 +47,7 @@ cmd = Proc.new{|txt|
   b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
     pack(:side=>:left, :fill=>:both, :expand=>true)
   }
+
   b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
     pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
   }
@@ -80,19 +80,20 @@ safe_slave2.eval_proc(cmd, 'safe2')      # label -> .w00020
 cmd.call('master')                       # label -> .w00024
 
 #second_master = MultiTkIp.new(&cmd)
+#second_master = MultiTkIp.new(:safe=>2){p [:second_master, $SAFE]}
 
 TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
 TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
 TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start
 
-TkTimer.new(5000, 1, 
+TkTimer.new(5000, 1,
             proc{
               safe_slave1.eval_proc{Tk.root.destroy}
               safe_slave1.delete
               print "*** The safe_slave1 is deleted by the timer.\n"
             }).start
 
-TkTimer.new(10000, 1, 
+TkTimer.new(10000, 1,
             proc{
               trusted_slave.eval_proc{Tk.root.destroy}
               trusted_slave.delete
diff --git a/ext/tk/sample/multi-ip_sample2.rb b/ext/tk/sample/multi-ip_sample2.rb
index f4a45d8d9a..79c78dec4a 100644
--- a/ext/tk/sample/multi-ip_sample2.rb
+++ b/ext/tk/sample/multi-ip_sample2.rb
@@ -14,7 +14,7 @@ cmd = proc{|s|
   sleep s
   TkButton.new(:text=>'b2: p $SAFE', :command=>proc{p $SAFE}).pack(:fill=>:x)
   sleep s
-  TkButton.new(:text=>'b3: p MultiTkIp.ip_name', 
+  TkButton.new(:text=>'b3: p MultiTkIp.ip_name',
                :command=>proc{p MultiTkIp.ip_name}).pack(:fill=>:x)
   sleep s
   TkButton.new(:text=>'EXIT', :command=>proc{exit}).pack(:fill=>:x)
diff --git a/ext/tk/sample/optobj_sample.rb b/ext/tk/sample/optobj_sample.rb
index cafacbdd17..a781254a28 100644
--- a/ext/tk/sample/optobj_sample.rb
+++ b/ext/tk/sample/optobj_sample.rb
@@ -12,13 +12,13 @@ b1 = TkButton.new(f, :text=>'AAA').pack(:fill=>:x)
 b2 = TkButton.new(f, :text=>'BBB').pack(:fill=>:x)
 b3 = TkButton.new(f, :text=>'CCC').pack(:fill=>:x)
 
-optobj.assign( b1, 
-              [ b2, 'configure', 
-                { 'foreground'=>'background', 
-                  'background'=>'foreground' } ], 
-              [ b3, nil, 
-                { 'foreground'=>'background', 
-                  'activeforeground'=>nil, 
+optobj.assign( b1,
+              [ b2, 'configure',
+                { 'foreground'=>'background',
+                  'background'=>'foreground' } ],
+              [ b3, nil,
+                { 'foreground'=>'background',
+                  'activeforeground'=>nil,
                   'background'=>['foreground', 'activeforeground'] } ] )
 
 optobj.update('activeforeground'=>'yellow')
@@ -29,26 +29,26 @@ TkButton.new(f){
 }
 
 TkButton.new(f){
-  configure( optobj.assign([self, nil, 
-                             {'foreground'=>'activeforeground', 
-                              'background'=>'foreground', 
+  configure( optobj.assign([self, nil,
+                             {'foreground'=>'activeforeground',
+                              'background'=>'foreground',
                               'activeforeground'=>'background'}]) \
              + {:text=>'EEE', :relief=>:groove, :borderwidth=>5} )
   pack(:fill=>:x)
 }
 
-optobj.notify  # To apply the convert_key ( 3rd element of widget info 
-               # (that is, {'foreground'=>'activeforeground', ,,, } ) 
-               # of the 'EEE' button 
+optobj.notify  # To apply the convert_key ( 3rd element of widget info
+               # (that is, {'foreground'=>'activeforeground', ,,, } )
+               # of the 'EEE' button
 
-TkButton.new(f, :text=>'toggle', 
+TkButton.new(f, :text=>'toggle',
              :command=>proc{
                fg = optobj['foreground']
                bg = optobj['background']
                optobj.configure('foreground'=>bg, 'background'=>fg)
              }).pack(:fill=>:x, :pady=>10)
 
-TkButton.new(f, :text=>'exit', 
+TkButton.new(f, :text=>'exit',
                 :command=>proc{exit}).pack(:fill=>:x, :pady=>10)
 
 TkFrame.new{|f|
diff --git a/ext/tk/sample/propagate.rb b/ext/tk/sample/propagate.rb
index 800cef553d..66f14aeb72 100644
--- a/ext/tk/sample/propagate.rb
+++ b/ext/tk/sample/propagate.rb
@@ -3,7 +3,7 @@ require 'tk'
 
 TkLabel.new(:text=>"Please click the bottom frame").pack
 
-f = TkFrame.new(:width=>400, :height=>100, :background=>'yellow', 
+f = TkFrame.new(:width=>400, :height=>100, :background=>'yellow',
                 :relief=>'ridge', :borderwidth=>5).pack
 
 # TkPack.propagate(f, false) # <== important!!
diff --git a/ext/tk/sample/remote-ip_sample.rb b/ext/tk/sample/remote-ip_sample.rb
index 3696a20852..f6eed9e985 100644
--- a/ext/tk/sample/remote-ip_sample.rb
+++ b/ext/tk/sample/remote-ip_sample.rb
@@ -3,8 +3,8 @@ require 'remote-tk'
 
 puts <<EOM
 This sample controls the other Tk interpreter (Ruby/Tk, Tcl/Tk, and so on)
-which running on the other process. For this purpose, Ruby/Tk uses Tcl/Tk's 
-'send' command. Availability of the command depends on your GUI environment. 
+which running on the other process. For this purpose, Ruby/Tk uses Tcl/Tk's
+'send' command. Availability of the command depends on your GUI environment.
 If this script doesn't work, please check your environment (see Tcl/Tk FAQ).
 EOM
 #'
@@ -19,15 +19,15 @@ ip = RemoteTkIp.new(wish)
 ip.eval_proc{TkButton.new(:command=>proc{puts 'This procesure is on the controller-ip (Ruby/Tk)'}, :text=>'print on Ruby/Tk (controller-ip)').pack(:fill=>:x)}
 ip.eval_proc{TkButton.new(:command=>'puts {This procesure is on the remote-ip (wish)}', :text=>'print on wish (remote-ip)').pack(:fill=>:x)}
 
-# If your remote-ip is Ruby/Tk, you can control the remote Ruby by 
-# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter. 
+# If your remote-ip is Ruby/Tk, you can control the remote Ruby by
+# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter.
 if ip.is_rubytk?
   ip.eval_proc{TkButton.new(:command=>'ruby {p 111; p Array.new(3,"ruby")}', :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)}
 end
 
 ip.eval_proc{TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)}
 
-TkButton.new(:command=>proc{exit}, :text=>'QUIT', 
+TkButton.new(:command=>proc{exit}, :text=>'QUIT',
              :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
 
 Tk.mainloop
diff --git a/ext/tk/sample/remote-ip_sample2.rb b/ext/tk/sample/remote-ip_sample2.rb
index e12b2a96c9..d8cf3c7650 100644
--- a/ext/tk/sample/remote-ip_sample2.rb
+++ b/ext/tk/sample/remote-ip_sample2.rb
@@ -17,23 +17,23 @@ ip = RemoteTkIp.new(app)
 # setup remote-ip window
 btns = []
 ip.eval_proc{
-  btns << 
+  btns <<
     TkButton.new(:command=>proc{
                    puts 'This procesure is on the controller-ip (Ruby-side)'
-                 }, 
+                 },
                  :text=>'print on controller-ip (Ruby-side)').pack(:fill=>:x)
 
-  btns << 
+  btns <<
     TkButton.new(:command=>
                    'puts {This procesure is on the remote-ip (Tk-side)}',
                  :text=>'print on remote-ip (Tk-side)').pack(:fill=>:x)
 
-  btns << 
+  btns <<
     TkButton.new(:command=>
                    'ruby {
                      puts "This procedure is on the remote-ip (Ruby-side)"
                      p Array.new(3,"ruby")
-                    }', 
+                    }',
                  :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)
 
   TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)
@@ -41,15 +41,15 @@ ip.eval_proc{
 
 # setup controller-ip window
 btns.each_with_index{|btn, idx|
-  # The scope of the eval-block of 'eval_proc' method is different from 
-  # the enternal. If you want to pass local values to the eval-block, 
+  # The scope of the eval-block of 'eval_proc' method is different from
+  # the enternal. If you want to pass local values to the eval-block,
   # use arguments of eval_proc method. They are passed to block-arguments.
-  TkButton.new(:command=>proc{ip.eval_proc(btn){|b| b.flash}}, 
-               :text=>"flash button-#{idx}", 
+  TkButton.new(:command=>proc{ip.eval_proc(btn){|b| b.flash}},
+               :text=>"flash button-#{idx}",
                :padx=>10).pack(:padx=>10, :pady=>2)
 }
 
-TkButton.new(:command=>proc{exit}, :text=>'QUIT', 
+TkButton.new(:command=>proc{exit}, :text=>'QUIT',
              :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
 
 # start eventloop
diff --git a/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
index e2289697e0..2aeae235df 100644
--- a/ext/tk/sample/safe-tk.rb
+++ b/ext/tk/sample/safe-tk.rb
@@ -7,29 +7,32 @@ require "multi-tk"
 
 TkLabel.new(:text=>'This is the Default Master Ipnterpreter').pack(:padx=>5, :pady=>3)
 TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack(:pady=>3)
-TkFrame.new(:borderwidth=>2, :height=>3, 
+TkFrame.new(:borderwidth=>2, :height=>3,
             :relief=>:sunken).pack(:fill=>:x, :expand=>true,
                                    :padx=>10, :pady=>7)
 
+safe0_p = proc{|*args| p args}
+
 ###############################
 
 puts "---- create a safe slave IP with Ruby's safe-level == 1 ----------"
-ip = MultiTkIp.new_safe_slave(1)
+ip = MultiTkIp.new_safe_slave(1){|*args| safe0_p["safe_slave safe_level == #{$SAFE}", args]}
 
 puts "\n---- create procs ----------"
 puts 'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}'
+#x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
 x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}', 
+TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}',
             :anchor=>:w).pack(:fill=>:x)
 
 puts 'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}'
 y = proc{|label| p ['proc y', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}
-TkLabel.new(:text=>'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}', 
+TkLabel.new(:text=>'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}',
             :anchor=>:w).pack(:fill=>:x)
 
 puts 'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}'
 z = proc{p ['proc z', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}', 
+TkLabel.new(:text=>'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}',
             :anchor=>:w).pack(:fill=>:x)
 
 puts "\n---- call 1st eval_proc ----------"
@@ -42,12 +45,14 @@ p lbl = ip.eval_proc{
   # TkLabel.new(f, :text=>" (<-- 'lbl' widget is here)").pack(:side=>:right)
   l = TkLabel.new(f).pack(:side=>:right)
 
-  TkButton.new(:text=>':command=>proc{l.text($SAFE)}', 
+  TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
                :command=>proc{l.text($SAFE)}).pack(:fill=>:x, :padx=>5)
   TkButton.new(:text=>':command=>x', :command=>x).pack(:fill=>:x, :padx=>5)
-  TkButton.new(:text=>':command=>proc{exit}', 
-               :command=>proc{exit}).pack(:fill=>:x, :padx=>5)
-  TkFrame.new(:borderwidth=>2, :height=>3, 
+  TkButton.new(:text=>':command=>proc{exit}',
+               :command=>proc{
+                 safe0_p["'exit' is called at $SAFE=#{$SAFE}"];exit}
+               ).pack(:fill=>:x, :padx=>5)
+  TkFrame.new(:borderwidth=>2, :height=>3,
               :relief=>:sunken).pack(:fill=>:x, :expand=>true,
                                      :padx=>10, :pady=>7)
   l # return the label widget
@@ -62,19 +67,33 @@ p ip.eval_proc(proc{
                  f = TkFrame.new.pack
                  TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
                  l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
-                 TkButton.new(:text=>':command=>proc{l.text($SAFE)}', 
-                              :command=>proc{l.text($SAFE)}).pack(:fill=>:x, 
+                 TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
+                              :command=>proc{l.text($SAFE)}).pack(:fill=>:x,
                                                                   :padx=>5)
-                 TkButton.new(:text=>':command=>proc{y.call(l)}', 
-                              :command=>proc{y.call(l)}).pack(:fill=>:x, 
+                 TkButton.new(:text=>':command=>proc{y.call(l)}',
+                              :command=>proc{y.call(l)}).pack(:fill=>:x,
                                                               :padx=>5)
+                 TkButton.new(:text=>':command=>proc{Proc.new(&y).call(l)}',
+                              :command=>proc{
+                                Proc.new(&y).call(l)
+                              }).pack(:fill=>:x, :padx=>5)
+                 TkButton.new(:text=>':command=>proc{MultiTkIp._proc_on_current_safelevel(y).call(l)}',
+                              :command=>proc{
+                                MultiTkIp._proc_on_current_safelevel(y).call(l)
+                              }).pack(:fill=>:x, :padx=>5)
+if false && Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
                  TkButton.new(:text=>':command=>proc{Thread.new(l, &y).value}',
                               :command=>proc{
                                 Thread.new(l, &y).value
                               }).pack(:fill=>:x, :padx=>5)
-                 TkButton.new(:text=>':command=>proc{z.call}', 
+else
+  # KNOWN BUG:: 
+  #   Current multi-tk.rb cannot support long term threads on callbacks.
+  #   Such a thread freezes the Ruby/Tk process.
+end
+                 TkButton.new(:text=>':command=>proc{z.call}',
                               :command=>proc{z.call}).pack(:fill=>:x, :padx=>5)
-                 TkFrame.new(:borderwidth=>2, :height=>3, 
+                 TkFrame.new(:borderwidth=>2, :height=>3,
                              :relief=>:sunken).pack(:fill=>:x, :expand=>true,
                                                     :padx=>10, :pady=>7)
                })
@@ -85,15 +104,15 @@ p bind = ip.eval_str('
   f = TkFrame.new.pack
   TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
   l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
-  TkButton.new(:text=>":command=>proc{y.call(l)}", 
+  TkButton.new(:text=>":command=>proc{y.call(l)}",
                :command=>proc{y.call(l)}).pack(:fill=>:x, :padx=>5)
   binding
 ', binding)
 
 p ip.eval_str("
-  TkButton.new(:text=>':command=>proc{ l.text = $SAFE }', 
+  TkButton.new(:text=>':command=>proc{ l.text = $SAFE }',
                :command=>proc{ l.text = $SAFE }).pack(:fill=>:x, :padx=>5)
-  TkFrame.new(:borderwidth=>2, :height=>3, 
+  TkFrame.new(:borderwidth=>2, :height=>3,
               :relief=>:sunken).pack(:fill=>:x, :expand=>true,
                                      :padx=>10, :pady=>7)
 ", bind)
@@ -106,7 +125,7 @@ p ip.eval_proc{
   TkLabel.new(:text=>"3rd and 4th eval_proc : $SAFE == #{$SAFE}").pack
 }
 p ip.eval_proc{
-  TkButton.new(:text=>':command=>proc{ lbl.text = $SAFE }', 
+  TkButton.new(:text=>':command=>proc{ lbl.text = $SAFE }',
                :command=>proc{ lbl.text = $SAFE }).pack(:fill=>:x, :padx=>5)
 }
 
diff --git a/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb
index b0ac6d3874..6a9381d465 100644
--- a/ext/tk/sample/scrollframe.rb
+++ b/ext/tk/sample/scrollframe.rb
@@ -1,19 +1,19 @@
 #
-#  Tk::ScrollFrame class
+#  Tk::RbWidget::ScrollFrame class
 #
 #    This widget class is a frame widget with scrollbars.
 #    The ScrollFrame doesn't propagate the size of embedded widgets.
 #    When it is configured, scrollregion of the container is changed.
 #
-#    Scrollbars can be toggled by Tk::ScrollFrame#vscroll & hscroll.
-#    If horizontal or virtical scrollbar is turned off, the horizontal 
+#    Scrollbars can be toggled by Tk::RbWidget::ScrollFrame#vscroll & hscroll.
+#    If horizontal or virtical scrollbar is turned off, the horizontal
 #    or virtical size of embedded widgets is propagated.
 #
 #                         Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
 require 'tk'
 
-class Tk::ScrollFrame < TkFrame
+class Tk::RbWidget::ScrollFrame < TkFrame
   include TkComposite
 
   DEFAULT_WIDTH  = 200
@@ -27,8 +27,8 @@ class Tk::ScrollFrame < TkFrame
     @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
 
     # create a canvas widget
-    @canvas = TkCanvas.new(@frame, 
-                           :borderwidth=>0, :selectborderwidth=>0, 
+    @canvas = TkCanvas.new(@frame,
+                           :borderwidth=>0, :selectborderwidth=>0,
                            :highlightthickness=>0)
 
     # allignment
@@ -209,28 +209,38 @@ end
 
 # test
 if __FILE__ == $0
-  f = Tk::ScrollFrame.new(:scrollbarwidth=>10, :width=>300, :height=>200)
+  f = Tk::RbWidget::ScrollFrame.new(:scrollbarwidth=>10, 
+                                    :width=>300, :height=>200)
   f.pack(:expand=>true, :fill=>:both)
 
   TkButton.new(f, :text=>'foo button', :command=>proc{puts 'foo'}).pack
   TkButton.new(f, :text=>'baaar button', :command=>proc{puts 'baaar'}).pack
   TkButton.new(f, :text=>'baz button', :command=>proc{puts 'baz'}).pack
-  TkButton.new(f, :text=>'hoge hoge button', 
+  TkButton.new(f, :text=>'hoge hoge button',
                :command=>proc{puts 'hoge hoge'}).pack(:side=>:bottom)
 
   # f.hscroll(false)
 
+  # add a text widget
   Tk.after(3000){
     t = TkText.new(f).pack(:expand=>true, :fill=>:both)
-    t.insert(:end, 'Here is a text widget')
+    t.insert(:end, "An example of Tk::RbWidget::ScrollFrame widget.\n\n")
+    t.insert(:end, "Here is a text widget.\n")
+    t.insert(:end, "Please resize the application window, ")
+    t.insert(:end, "and try the scrollbars ")
+    t.insert(:end, "to move the view of packed widgets.\n")
   }
 
+  # remove a vertical scrollbar, and then the scrollframe is not scrollable.
   Tk.after(6000){ f.vscroll(false) }
 
+  # add a vertical scrollbar, and make the scrollframe scrollable. 
   Tk.after(9000){ f.vscroll(true) }
 
+  # remove a horizontal scrollbar, and then the scrollframe is not scrollable.
   Tk.after(12000){ f.hscroll(false) }
 
+  # add a horizontal scrollbar, and make the scrollframe scrollable. 
   Tk.after(15000){ f.hscroll(true) }
 
   Tk.mainloop
diff --git a/ext/tk/sample/tcltklib/sample1.rb b/ext/tk/sample/tcltklib/sample1.rb
index 13df440751..1965781533 100644
--- a/ext/tk/sample/tcltklib/sample1.rb
+++ b/ext/tk/sample/tcltklib/sample1.rb
@@ -1,5 +1,5 @@
 #! /usr/local/bin/ruby -d
-#! /usr/local/bin/ruby
+# -*- encoding: euc-jp -*-
 # -d ���ץ������դ����, �ǥХå������ɽ������.
 
 # tcltk �饤�֥��Υ���ץ�
diff --git a/ext/tk/sample/tcltklib/sample2.rb b/ext/tk/sample/tcltklib/sample2.rb
index 444bb1eef7..f187d6ce1d 100644
--- a/ext/tk/sample/tcltklib/sample2.rb
+++ b/ext/tk/sample/tcltklib/sample2.rb
@@ -23,37 +23,37 @@ $button, $canvas, $checkbutton, $frame, $label, $pack, $update, $wm =
    "button", "canvas", "checkbutton", "frame", "label", "pack", "update", "wm")
 
 class Othello
-   
+
    EMPTY = 0
    BLACK = 1
    WHITE = - BLACK
-   
+
    attr :in_com_turn
    attr :game_over
-   
+
    class Board
-   
+
       include Observable
-      
+
       DIRECTIONS = [
          [-1, -1], [-1, 0], [-1, 1],
          [ 0, -1],          [ 0, 1],
          [ 1, -1], [ 1, 0], [ 1, 1]
       ]
-      
-      attr :com_disk, TRUE
-   
+
+      attr_accessor :com_disk
+
       def initialize(othello)
          @othello = othello
          reset
       end
-   
+
       def notify_observers(*arg)
          if @observer_peers != nil
             super(*arg)
          end
       end
-      
+
       def reset
          @data = [
             [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
@@ -68,19 +68,19 @@ class Othello
          changed
          notify_observers
       end
-      
+
       def man_disk
          return - @com_disk
       end
-      
+
       def other_disk(disk)
          return - disk
       end
-      
+
       def get_disk(row, col)
          return @data[row][col]
       end
-      
+
       def reverse_to(row, col, my_disk, dir_y, dir_x)
          y = row
          x = col
@@ -100,7 +100,7 @@ class Othello
             x -= dir_x
          end until y == row && x == col
       end
-      
+
       def put_disk(row, col, disk)
          @data[row][col] = disk
          changed
@@ -109,7 +109,7 @@ class Othello
             reverse_to(row, col, disk, *dir)
          end
       end
-      
+
       def count_disk(disk)
          num = 0
          @data.each do |rows|
@@ -121,7 +121,7 @@ class Othello
          end
          return num
       end
-      
+
       def count_point_to(row, col, my_disk, dir_y, dir_x)
          return 0 if @data[row][col] != EMPTY
          count = 0
@@ -140,7 +140,7 @@ class Othello
          end
          return 0
       end
-      
+
       def count_point(row, col, my_disk)
          count = 0
          DIRECTIONS.each do |dir|
@@ -148,14 +148,14 @@ class Othello
          end
          return count
       end
-      
+
       def corner?(row, col)
          return (row == 0 && col == 0) ||
             (row == 0 && col == 7) ||
             (row == 7 && col == 0) ||
             (row == 7 && col == 7)
       end
-      
+
       def search(my_disk)
          max = 0
          max_row = nil
@@ -173,30 +173,30 @@ class Othello
          return max_row, max_col
       end
    end #--------------------------> class Board ends here
-   
+
    class BoardView < TclTkWidget
-      
+
       BACK_GROUND_COLOR = "DarkGreen"
       HILIT_BG_COLOR = "green"
       BORDER_COLOR = "black"
       BLACK_COLOR = "black"
       WHITE_COLOR = "white"
       STOP_COLOR = "red"
-      
+
       attr :left
       attr :top
       attr :right
       attr :bottom
-      
+
       class Square
-         
+
          attr :oval, TRUE
          attr :row
          attr :col
-         
+
          def initialize(view, row, col)
             @view = view
-            @id = @view.e("create rectangle", 
+            @id = @view.e("create rectangle",
                           *(view.tk_rect(view.left + col,
                                          view.top + row,
                                          view.left + col + 1,
@@ -219,7 +219,7 @@ class Othello
                view.click_square(self)
             }))
          end
-         
+
          def blink(color)
             @view.e("itemconfigure", @id, "-fill #{color}")
             $update.e()
@@ -227,13 +227,13 @@ class Othello
             @view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
          end
       end #-----------------------> class Square ends here
-   
+
       def initialize(othello, board)
          super($ip, $root, $canvas)
          @othello = othello
          @board = board
          @board.add_observer(self)
-         
+
          @squares = Array.new(8)
          for i in 0 .. 7
             @squares[i] = Array.new(8)
@@ -242,7 +242,7 @@ class Othello
          @top = 0.5
          @right = @left + 8
          @bottom = @top + 8
-         
+
          i = self.e("create rectangle", *tk_rect(@left, @top, @right, @bottom))
          self.e("itemconfigure", i,
             "-width 1m -outline #{BORDER_COLOR} -fill #{BACK_GROUND_COLOR}")
@@ -252,15 +252,15 @@ class Othello
                @squares[row][col] = Square.new(self, row, col)
             end
          end
-         
+
          update
       end
-      
+
       def tk_rect(left, top, right, bottom)
          return left.to_s + "c", top.to_s + "c",
             right.to_s + "c", bottom.to_s + "c"
       end
-      
+
       def clear
          each_square do |square|
             if square.oval != nil
@@ -269,7 +269,7 @@ class Othello
             end
          end
       end
-      
+
       def draw_disk(row, col, disk)
          if disk == EMPTY
             if @squares[row][col].oval != nil
@@ -278,7 +278,7 @@ class Othello
             end
             return
          end
-            
+
          $update.e()
          sleep(0.05)
          oval = @squares[row][col].oval
@@ -299,7 +299,7 @@ class Othello
          end
          self.e("itemconfigure", oval, "-outline #{color} -fill #{color}")
       end
-      
+
       def update(row = nil, col = nil)
          if row && col
             draw_disk(row, col, @board.get_disk(row, col))
@@ -311,7 +311,7 @@ class Othello
          end
          @othello.show_point
       end
-      
+
       def each_square
          @squares.each do |rows|
             rows.each do |square|
@@ -319,7 +319,7 @@ class Othello
             end
          end
       end
-      
+
       def click_square(square)
          if @othello.in_com_turn || @othello.game_over ||
                @board.count_point(square.row,
@@ -331,15 +331,15 @@ class Othello
          @board.put_disk(square.row, square.col, @board.man_disk)
          @othello.com_turn
       end
-      
+
       private :draw_disk
       public :update
    end #----------------------> class BoardView ends here
-   
+
    def initialize
       @msg_label = TclTkWidget.new($ip, $root, $label)
       $pack.e(@msg_label)
-      
+
       @board = Board.new(self)
       @board_view = BoardView.new(self, @board)
       #### added by Y. Shigehiro
@@ -352,39 +352,39 @@ class Othello
          "}")
       #### �����ޤ�
       $pack.e(@board_view, "-fill both -expand true")
-      
+
       panel = TclTkWidget.new($ip, $root, $frame)
-      
+
       @play_black = TclTkWidget.new($ip, panel, $checkbutton,
         "-text {com is black} -command", TclTkCallback.new($ip, proc{
          switch_side
       }))
       $pack.e(@play_black, "-side left")
-            
+
       quit = TclTkWidget.new($ip, panel, $button, "-text Quit -command",
          TclTkCallback.new($ip, proc{
          exit
       }))
       $pack.e(quit, "-side right -fill x")
-      
+
       reset = TclTkWidget.new($ip, panel, $button, "-text Reset -command",
          TclTkCallback.new($ip, proc{
          reset_game
       }))
       $pack.e(reset, "-side right -fill x")
-      
+
       $pack.e(panel, "-side bottom -fill x")
-      
+
 #      root = Tk.root
       $wm.e("title", $root, "Othello")
       $wm.e("iconname", $root, "Othello")
-      
+
       @board.com_disk = WHITE
       @game_over = FALSE
-      
+
       TclTk.mainloop
    end
-   
+
    def switch_side
       if @in_com_turn
          @play_black.e("toggle")
@@ -393,7 +393,7 @@ class Othello
          com_turn unless @game_over
       end
    end
-   
+
    def reset_game
       if @board.com_disk == BLACK
          @board.com_disk = WHITE
@@ -404,7 +404,7 @@ class Othello
       $wm.e("title", $root, "Othello")
       @game_over = FALSE
    end
-      
+
    def com_turn
       @in_com_turn = TRUE
       $update.e()
diff --git a/ext/tk/sample/tkalignbox.rb b/ext/tk/sample/tkalignbox.rb
index 32915a5e69..fb1b58f458 100644
--- a/ext/tk/sample/tkalignbox.rb
+++ b/ext/tk/sample/tkalignbox.rb
@@ -1,19 +1,26 @@
 #
 #  tkalignbox.rb : align widgets with same width/height
-# 
+#
 #                                            by Hidetoshi NAGAI
 #
-#  The box size depends on 'reqheight' and 'reqwidth' of contained widgets. 
-#  If you want to give the box size when those requested sizes are 0, 
-#  please set box.propagate = false (See the test routine at the tail of 
+#  The box size depends on 'reqheight' and 'reqwidth' of contained widgets.
+#  If you want to give the box size when those requested sizes are 0,
+#  please set box.propagate = false (See the test routine at the tail of
 #  this file).
 
 require 'tk'
 
-class TkAlignBox < TkFrame
+module Tk
+  module RbWidget
+    class AlignBox < TkFrame
+    end
+  end
+end
+
+class Tk::RbWidget::AlignBox < TkFrame
   def initialize(*args)
-    if self.class == TkAlignBox
-      fail RuntimeError, "TkAlignBox is an abstract class"
+    if self.class == Tk::RbWidget::AlignBox
+      fail RuntimeError, "Tk::AlignBox is an abstract class"
     end
     @padx = 0
     @pady = 0
@@ -31,12 +38,12 @@ class TkAlignBox < TkFrame
   end
 
   def _set_framesize
-    fail RuntimeError, "TkAlignBox is an abstract class"
+    fail RuntimeError, "Tk::AlignBox is an abstract class"
   end
   private :_set_framesize
 
   def _place_config(widget, idx, cnt)
-    fail RuntimeError, "TkAlignBox is an abstract class"
+    fail RuntimeError, "Tk::AlignBox is an abstract class"
   end
   private :_place_config
 
@@ -117,7 +124,7 @@ class TkAlignBox < TkFrame
   attr_accessor :propagate
 end
 
-class TkHBox < TkAlignBox
+class Tk::RbWidget::HBox < Tk::RbWidget::AlignBox
   def _set_framesize
     bd = self.borderwidth
     self.width((@max_width + 2*@padx) * @widgets.size + 2*bd)
@@ -126,28 +133,28 @@ class TkHBox < TkAlignBox
   private :_set_framesize
 
   def _place_config(widget, idx, cnt)
-    widget.place_in(self, 
-                    'relx'=>idx/cnt, 'x'=>@padx, 
-                    'rely'=>0, 'y'=>@pady, 
-                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx, 
+    widget.place_in(self,
+                    'relx'=>idx/cnt, 'x'=>@padx,
+                    'rely'=>0, 'y'=>@pady,
+                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
                     'relheight'=>1.0, 'height'=>-2*@pady)
   end
   private :_place_config
 end
-TkHLBox = TkHBox
+Tk::RbWidget::HLBox = Tk::RbWidget::HBox
 
-class TkHRBox < TkHBox
+class Tk::RbWidget::HRBox < Tk::RbWidget::HBox
   def _place_config(widget, idx, cnt)
-    widget.place_in(self, 
-                    'relx'=>(cnt - idx - 1)/cnt, 'x'=>@padx, 
-                    'rely'=>0, 'y'=>@pady, 
-                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx, 
+    widget.place_in(self,
+                    'relx'=>(cnt - idx - 1)/cnt, 'x'=>@padx,
+                    'rely'=>0, 'y'=>@pady,
+                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
                     'relheight'=>1.0, 'height'=>-2*@pady)
   end
   private :_place_config
 end
 
-class TkVBox < TkAlignBox
+class Tk::RbWidget::VBox < Tk::RbWidget::AlignBox
   def _set_framesize
     bd = self.borderwidth
     self.width(@max_width + 2*@padx + 2*bd)
@@ -156,22 +163,22 @@ class TkVBox < TkAlignBox
   private :_set_framesize
 
   def _place_config(widget, idx, cnt)
-    widget.place_in(self, 
-                    'relx'=>0, 'x'=>@padx, 
-                    'rely'=>idx/cnt, 'y'=>@pady, 
-                    'relwidth'=>1.0, 'width'=>-2*@padx, 
+    widget.place_in(self,
+                    'relx'=>0, 'x'=>@padx,
+                    'rely'=>idx/cnt, 'y'=>@pady,
+                    'relwidth'=>1.0, 'width'=>-2*@padx,
                     'relheight'=>1.0/cnt, 'height'=>-2*@pady)
   end
   private :_place_config
 end
-TkVTBox = TkVBox
+Tk::RbWidget::VTBox = Tk::RbWidget::VBox
 
-class TkVBBox < TkVBox
+class Tk::RbWidget::VBBox < Tk::RbWidget::VBox
   def _place_config(widget, idx, cnt)
-    widget.place_in(self, 
-                    'relx'=>0, 'x'=>@padx, 
-                    'rely'=>(cnt - idx - 1)/cnt, 'y'=>@pady, 
-                    'relwidth'=>1.0, 'width'=>-2*@padx, 
+    widget.place_in(self,
+                    'relx'=>0, 'x'=>@padx,
+                    'rely'=>(cnt - idx - 1)/cnt, 'y'=>@pady,
+                    'relwidth'=>1.0, 'width'=>-2*@padx,
                     'relheight'=>1.0/cnt, 'height'=>-2*@pady)
   end
   private :_place_config
@@ -181,43 +188,46 @@ end
 # test
 ################################################
 if __FILE__ == $0
-  f = TkHBox.new(:borderwidth=>3, :relief=>'ridge').pack
+  f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge').pack
   f.add(TkButton.new(f, :text=>'a'),
         TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
         TkButton.new(f, :text=>'aaa'),
         TkButton.new(f, :text=>'aaaa'))
 
-  f = TkHBox.new(:borderwidth=>3, :relief=>'ridge', 
-                 :padx=>7, :pady=>3, :background=>'yellow').pack
+  f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge',
+                             :padx=>7, :pady=>3, :background=>'yellow').pack
   f.add(TkButton.new(f, :text=>'a'),
         TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
         TkButton.new(f, :text=>'aaa'),
         TkButton.new(f, :text=>'aaaa'))
 
-  f = TkVBox.new(:borderwidth=>5, :relief=>'groove').pack
+  f = Tk::RbWidget::VBox.new(:borderwidth=>5, 
+                             :relief=>'groove').pack(:fill=>:y, :expand=>true)
   f.add(TkButton.new(f, :text=>'a'),
         TkButton.new(f, :text=>'aa', :font=>'Helvetica 30'),
         TkButton.new(f, :text=>'aaa'),
         TkButton.new(f, :text=>'aaaa'))
 
-  f = TkHRBox.new(:borderwidth=>3, :relief=>'raised').pack(:fill=>:x)
+  f = Tk::RbWidget::HRBox.new(:borderwidth=>3, 
+                              :relief=>'raised').pack(:fill=>:x)
   f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa'), 
+        TkButton.new(f, :text=>'aa'),
         TkButton.new(f, :text=>'aaa'))
 
-  f = TkVBBox.new(:borderwidth=>3, :relief=>'ridge').pack(:fill=>:x)
+  f = Tk::RbWidget::VBBox.new(:borderwidth=>3, 
+                              :relief=>'ridge').pack(:fill=>:x)
   f.propagate = false
   f.height 100
-  f.add(TkFrame.new(f){|ff| 
-          TkButton.new(ff, :text=>'a').pack(:pady=>4, :padx=>6, 
+  f.add(TkFrame.new(f){|ff|
+          TkButton.new(ff, :text=>'a').pack(:pady=>4, :padx=>6,
                                             :fill=>:both, :expand=>true)
-        }, 
-        TkFrame.new(f){|ff| 
-          TkButton.new(ff, :text=>'aa').pack(:pady=>4, :padx=>6, 
+        },
+        TkFrame.new(f){|ff|
+          TkButton.new(ff, :text=>'aa').pack(:pady=>4, :padx=>6,
                                              :fill=>:both, :expand=>true)
-        }, 
-        TkFrame.new(f){|ff| 
-          TkButton.new(ff, :text=>'aaaa').pack(:pady=>4, :padx=>6, 
+        },
+        TkFrame.new(f){|ff|
+          TkButton.new(ff, :text=>'aaaa').pack(:pady=>4, :padx=>6,
                                                :fill=>:both, :expand=>true)
         })
 
diff --git a/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
index c2c95f771d..a9c00d230d 100644
--- a/ext/tk/sample/tkballoonhelp.rb
+++ b/ext/tk/sample/tkballoonhelp.rb
@@ -2,16 +2,26 @@
 # tkballoonhelp.rb : simple balloon help widget
 #                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
-# Add a balloon help to a widget. 
-# This widget has only poor featureas. If you need more useful features, 
+# Add a balloon help to a widget.
+# This widget has only poor featureas. If you need more useful features,
 # please try to use the Tix extension of Tcl/Tk under Ruby/Tk.
-# 
+#
 # The interval time to display a balloon help is defined 'interval' option
-# (default is 1000ms). 
+# (default is 750ms).
 #
 require 'tk'
 
-class TkBalloonHelp<TkLabel
+module Tk
+  module RbWidget
+    class BalloonHelp<TkLabel
+    end
+  end
+end
+class Tk::RbWidget::BalloonHelp<TkLabel
+  DEFAULT_FOREGROUND = 'black'
+  DEFAULT_BACKGROUND = 'white'
+  DEFAULT_INTERVAL   = 750
+
   def _balloon_binding(interval)
     @timer = TkAfter.new(interval, 1, proc{show})
     def @timer.interval(val)
@@ -50,10 +60,13 @@ class TkBalloonHelp<TkLabel
 
     @command = keys.delete('command')
 
-    @interval = keys.delete('interval'){1000}
+    @interval = keys.delete('interval'){DEFAULT_INTERVAL}
     _balloon_binding(@interval)
 
-    @label = TkLabel.new(@frame, 'background'=>'bisque').pack
+    # @label = TkLabel.new(@frame, 'background'=>'bisque').pack
+    @label = TkLabel.new(@frame, 
+                         'foreground'=>DEFAULT_FOREGROUND, 
+                         'background'=>DEFAULT_BACKGROUND).pack
     @label.configure(_symbolkey2str(keys)) unless keys.empty?
     @path = @label
   end
@@ -87,10 +100,10 @@ class TkBalloonHelp<TkLabel
       when 2
         @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent))
       when 3
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent), 
+        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
                       self)
       else
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent), 
+        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
                       self, @parent)
       end
     end
@@ -98,12 +111,24 @@ class TkBalloonHelp<TkLabel
     @frame.deiconify
     @frame.raise
 
-    @org_cursor = @parent['cursor']
-    @parent.cursor('crosshair') 
+    begin
+      @org_cursor = @parent.cget('cursor')
+    rescue
+      @org_cursor = @parent['cursor']
+    end
+    begin
+      @parent.configure('cursor', 'crosshair')
+    rescue
+      @parent.cursor('crosshair')
+    end
   end
 
   def erase
-    @parent.cursor(@org_cursor) 
+    begin
+      @parent.configure('cursor', @org_cursor)
+    rescue
+      @parent.cursor(@org_cursor)
+    end
     @frame.withdraw
   end
 
@@ -118,41 +143,42 @@ end
 if __FILE__ == $0
   TkButton.new('text'=>'This button has a balloon help') {|b|
     pack('fill'=>'x')
-    TkBalloonHelp.new(b, 'text'=>' Message ')
+    Tk::RbWidget::BalloonHelp.new(b, 'text'=>' Message ')
   }
   TkButton.new('text'=>'This button has another balloon help') {|b|
     pack('fill'=>'x')
-    TkBalloonHelp.new(b, 'text'=>'configured message', 
-                      'interval'=>200, 'font'=>'courier', 
-                      'background'=>'gray', 'foreground'=>'red')
+    Tk::RbWidget::BalloonHelp.new(b, 
+                        'text'=>"CONFIGURED MESSAGE\nchange colors, and so on",
+                        'interval'=>200, 'font'=>'courier',
+                        'background'=>'gray', 'foreground'=>'red')
   }
 
   sb = TkScrollbox.new.pack(:fill=>:x)
   sb.insert(:end, *%w(aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm))
 =begin
   # CASE1 : command takes no arguemnt
-  bh = TkBalloonHelp.new(sb, :interval=>500, 
-                         :relief=>:ridge, :background=>'white', 
-                         :command=>proc{
-                           y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
-                           bh.text "current index == #{sb.nearest(y)}"
-                         })
+  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                           :relief=>:ridge, :background=>'white',
+                           :command=>proc{
+                             y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
+                             bh.text "current index == #{sb.nearest(y)}"
+                           })
 =end
 =begin
   # CASE2 : command takes 2 arguemnts
-  bh = TkBalloonHelp.new(sb, :interval=>500, 
-                         :relief=>:ridge, :background=>'white', 
-                         :command=>proc{|x, y|
-                           bh.text "current index == #{sb.nearest(y)}"
-                         })
+  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                           :relief=>:ridge, :background=>'white',
+                           :command=>proc{|x, y|
+                             bh.text "current index == #{sb.nearest(y)}"
+                           })
 =end
 =begin
   # CASE3 : command takes 3 arguemnts
-  TkBalloonHelp.new(sb, :interval=>500, 
-                    :relief=>:ridge, :background=>'white', 
-                    :command=>proc{|x, y, bhelp|
-                      bhelp.text "current index == #{sb.nearest(y)}"
-                    })
+  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                      :relief=>:ridge, :background=>'white',
+                      :command=>proc{|x, y, bhelp|
+                        bhelp.text "current index == #{sb.nearest(y)}"
+                      })
 =end
 =begin
   # CASE4a : command is a Proc object and takes 4 arguemnts
@@ -160,16 +186,16 @@ if __FILE__ == $0
     bhelp.text "current index == #{parent.nearest(y)}"
   }
 
-  TkBalloonHelp.new(sb, :interval=>500, 
-                    :relief=>:ridge, :background=>'white', 
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                      :relief=>:ridge, :background=>'white',
+                      :command=>cmd)
 
   sb2 = TkScrollbox.new.pack(:fill=>:x)
   sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  TkBalloonHelp.new(sb2, :interval=>500, 
-                    :padx=>5, :relief=>:raised, 
-                    :background=>'gray25', :foreground=>'white',
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
+                      :padx=>5, :relief=>:raised,
+                      :background=>'gray25', :foreground=>'white',
+                      :command=>cmd)
 =end
 #=begin
   # CASE4b : command is a Method object and takes 4 arguemnts
@@ -178,16 +204,16 @@ if __FILE__ == $0
   end
   cmd = self.method(:set_msg)
 
-  TkBalloonHelp.new(sb, :interval=>500, 
-                    :relief=>:ridge, :background=>'white', 
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                                :relief=>:ridge, :background=>'white',
+                                :command=>cmd)
 
   sb2 = TkScrollbox.new.pack(:fill=>:x)
   sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  TkBalloonHelp.new(sb2, :interval=>500, 
-                    :padx=>5, :relief=>:raised, 
-                    :background=>'gray25', :foreground=>'white',
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
+                                :padx=>5, :relief=>:raised,
+                                :background=>'gray25', :foreground=>'white',
+                                :command=>cmd)
 #=end
 
   Tk.mainloop
diff --git a/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb
index c6699629cc..c0953a1b1b 100644
--- a/ext/tk/sample/tkbiff.rb
+++ b/ext/tk/sample/tkbiff.rb
@@ -11,10 +11,10 @@ end
 if ARGV.length == 0
   if ENV['MAIL']
     $spool = ENV['MAIL']
-  else  
+  else
     $spool = '/var/spool/mail/' + ENV['USER']
   end
-else 
+else
   $spool = ARGV[0]
 end
 
@@ -40,7 +40,7 @@ class Mail
     @body = []
     while line = f.gets()
       line.chop!
-      next if /^From / =~ line  # skip From-line  
+      next if /^From / =~ line  # skip From-line
       break if /^$/ =~ line     # end of header
       if /^(\S+):\s*(.*)/ =~ line
         @header[attr = $1.capitalize] = $2
diff --git a/ext/tk/sample/tkbrowse.rb b/ext/tk/sample/tkbrowse.rb
index 4893f57f95..56d5a80fcf 100644
--- a/ext/tk/sample/tkbrowse.rb
+++ b/ext/tk/sample/tkbrowse.rb
@@ -69,7 +69,7 @@ end
 # Fill the listbox with a list of all the files in the directory (run
 # the "ls" command to get that information).
 
-if ARGV.length>0 
+if ARGV.length>0
   dir = ARGV[0]
 else
   dir="."
diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb
index 1840270951..59db565f06 100644
--- a/ext/tk/sample/tkcombobox.rb
+++ b/ext/tk/sample/tkcombobox.rb
@@ -1,11 +1,20 @@
 #
-#  tkcombobox.rb : TkAutoScrollbox & TkCombobox
-# 
+#  tkcombobox.rb : auto scrollbox & combobox
+#
 #                         by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
 require 'tk'
 
-class TkAutoScrollbox < TkListbox
+module Tk
+  module RbWidget
+    class AutoScrollListbox < TkListbox
+    end
+    class Combobox < TkEntry
+    end
+  end
+end
+
+class Tk::RbWidget::AutoScrollListbox
   include TkComposite
 
   @@up_bmp = TkBitmapImage.new(:data=><<EOD)
@@ -44,9 +53,9 @@ EOD
     @lbox.yscrollcommand(proc{|*args| @scr.set(*args); _config_proc})
     @scr.command(proc{|*args| @lbox.yview(*args); _config_proc})
 
-    @up_arrow   = TkLabel.new(@lbox, :image=>@@up_bmp, 
+    @up_arrow   = TkLabel.new(@lbox, :image=>@@up_bmp,
                               :relief=>:raised, :borderwidth=>1)
-    @down_arrow = TkLabel.new(@lbox, :image=>@@down_bmp, 
+    @down_arrow = TkLabel.new(@lbox, :image=>@@down_bmp,
                               :relief=>:raised, :borderwidth=>1)
 
     _init_binding
@@ -78,7 +87,7 @@ EOD
 
   def _show_down_arrow
     unless @down_arrow.winfo_mapped?
-      @down_arrow.pack(:side=>:bottom, :fill=>:x) 
+      @down_arrow.pack(:side=>:bottom, :fill=>:x)
     end
   end
 
@@ -91,11 +100,11 @@ EOD
   def _check_sel(cidx, tidx = nil, bidx = nil)
     _set_sel(cidx)
     unless tidx
-      tidx = @lbox.nearest(0) 
+      tidx = @lbox.nearest(0)
       tidx += 1 if tidx > 0
     end
     unless bidx
-      bidx = @lbox.nearest(10000) 
+      bidx = @lbox.nearest(10000)
       bidx -= 1 if bidx < @lbox.index('end') - 1
     end
     if cidx > bidx
@@ -197,7 +206,7 @@ EOD
 
     @lbox.bind('Configure', proc{_config_proc})
     @lbox.bind('Enter', proc{|y| _set_sel(@lbox.nearest(y))}, '%y')
-    @lbox.bind('Motion', proc{|y| 
+    @lbox.bind('Motion', proc{|y|
                  @up_timer.stop if @up_timer.running?
                  @down_timer.stop if @down_timer.running?
                  _check_sel(@lbox.nearest(y))
@@ -221,7 +230,7 @@ end
 
 ################################################
 
-class TkCombobox < TkEntry
+class Tk::RbWidget::Combobox < TkEntry
   include TkComposite
 
   @@down_btn_bmp = TkBitmapImage.new(:data=><<EOD)
@@ -241,6 +250,7 @@ static unsigned char up_arrow_bits[] = {
 EOD
 
   def _button_proc(dir = true)
+    return if @ent.state == 'disabled'
     @btn.relief(:sunken)
     x = @frame.winfo_rootx
     y = @frame.winfo_rooty
@@ -265,9 +275,10 @@ EOD
     @top.grab
 
     begin
-      @var.tkwait
-      if (idx = @var.to_i) >= 0
-        @ent.value = @lst.get(idx)
+      @wait_var.tkwait
+      if (idx = @wait_var.to_i) >= 0
+        # @ent.value = @lst.get(idx)
+        _set_entry_value(@lst.get(idx))
       end
       @top.withdraw
       @btn.relief(:raised)
@@ -287,19 +298,66 @@ EOD
     @btn.bind('1', proc{_button_proc(true)})
     @btn.bind('3', proc{_button_proc(false)})
 
-    @lst.bind('1', proc{|y| @var.value = @lst.nearest(y)}, '%y')
-    @lst.bind('Return', proc{@var.value = @lst.curselection[0]})
+    @lst.bind('1', proc{|y| @wait_var.value = @lst.nearest(y)}, '%y')
+    @lst.bind('Return', proc{@wait_var.value = @lst.curselection[0]})
 
     cancel = TkVirtualEvent.new('2', '3', 'Escape')
-    @lst.bind(cancel, proc{@var.value = -1})
+    @lst.bind(cancel, proc{@wait_var.value = -1})
   end
   private :_init_bindings
 
+  def _set_entry_value(val)
+    @ent.textvariable.value = val
+  end
+  private :_set_entry_value
+
+  #----------------------------------------------------
+
+  def _state_control(value = None)
+    if value == None
+      # get
+      @ent.state
+    else
+      # set
+      @ent.state(value.to_s)
+      case value = @ent.state # regulate 'state' string
+      when 'normal', 'readonly'
+        @btn.state 'normal'
+      when 'disabled'
+        @btn.state 'disabled'
+      else
+        # unknown : do nothing
+      end
+    end
+  end
+  private :_state_control
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    {'state' => :_state_control}
+  end
+  private :__methodcall_optkeys
+
+  #----------------------------------------------------
+
+  def _textvariable_control(var = None)
+    if var == None
+      # get
+      ((var = @ent.textvariable) === @default_var)? nil: var
+    else
+      # set
+      @var = var
+      tk_send('configure', '-textvariable', (@var)? var: @default_var)
+    end
+  end
+  private :_textvariable_control
+
+  #----------------------------------------------------
+
   def initialize_composite(keys={})
     keys = _symbolkey2str(keys)
 
-    @btn = TkLabel.new(@frame, :relief=>:raised, :borderwidth=>3, 
-                       :image=>@@down_btn_bmp).pack(:side=>:right, 
+    @btn = TkLabel.new(@frame, :relief=>:raised, :borderwidth=>2,
+                       :image=>@@down_btn_bmp).pack(:side=>:right,
                                                     :ipadx=>2, :fill=>:y)
     @ent = TkEntry.new(@frame).pack(:side=>:left)
     @path = @ent.path
@@ -312,16 +370,21 @@ EOD
 
     startwait = keys.delete('startwait'){300}
     interval = keys.delete('interval'){150}
-    @lst = TkAutoScrollbox.new(@top, 
-                               :startwait=>startwait, 
-                               :interval=>interval).pack(:fill=>:both, 
-                                                         :expand=>true)
+    @lst = Tk::RbWidget::AutoScrollListbox.new(@top, :scrollbar=>true, 
+                                               :startwait=>startwait,
+                                               :interval=>interval)
+    @lst.pack(:fill=>:both, :expand=>true)
     @ent_list = []
 
-    @var = TkVariable.new
+    @wait_var = TkVariable.new
+    @var = @default_var = TkVariable.new
+
+    @ent.textvariable @default_var
 
     _init_bindings
 
+    option_methods('textvariable' => :_textvariable_control)
+
     delegate('DEFAULT', @ent)
     delegate('height', @lst)
     delegate('relief', @frame)
@@ -330,6 +393,8 @@ EOD
     delegate('arrowrelief', @lst)
     delegate('arrowborderwidth', @lst)
 
+    delegate('state', false)
+
     if mode = keys.delete('scrollbar')
       scrollbar(mode)
     end
@@ -395,10 +460,14 @@ end
 # test
 ################################################
 if __FILE__ == $0
+# e0 = Tk::RbWidget::Combobox.new.pack
+# e0.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
+
   v = TkVariable.new
-  e = TkCombobox.new(:height=>7, :scrollbar=>true, :textvariable=>v, 
-                     :arrowrelief=>:flat, :arrowborderwidth=>0, 
-                     :startwait=>400, :interval=>200).pack
+  e = Tk::RbWidget::Combobox.new(:height=>7, :scrollbar=>true, 
+                                 :textvariable=>v,
+                                 :arrowrelief=>:flat, :arrowborderwidth=>0,
+                                 :startwait=>400, :interval=>200).pack
   e.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
   #e.see(e.list_index('end') - 2)
   e.value = 'cc'
@@ -408,17 +477,19 @@ if __FILE__ == $0
     TkLabel.new(f, :font=>fnt, :textvariable=>v).pack(:side=>:left)
   }.pack
 
-  TkFrame.new(:relief=>:raised, :borderwidth=>2, 
+  TkFrame.new(:relief=>:raised, :borderwidth=>2,
               :height=>3).pack(:fill=>:x, :expand=>true, :padx=>5, :pady=>3)
 
-  l = TkAutoScrollbox.new(nil, :relief=>:groove, :borderwidth=>4, 
-                          :width=>20).pack(:fill=>:both, :expand=>true)
+  l = Tk::RbWidget::AutoScrollListbox.new(nil, :relief=>:groove, 
+                                          :borderwidth=>4,:height=>7, 
+                                          :width=>20).pack(:fill=>:both, 
+                                                           :expand=>true)
   (0..20).each{|i| l.insert('end', "line #{i}")}
 
   TkFrame.new(:relief=>:ridge, :borderwidth=>3){
-    TkButton.new(self, :text=>'ON', 
+    TkButton.new(self, :text=>'ON',
                  :command=>proc{l.scrollbar(true)}).pack(:side=>:left)
-    TkButton.new(self, :text=>'OFF', 
+    TkButton.new(self, :text=>'OFF',
                  :command=>proc{l.scrollbar(false)}).pack(:side=>:right)
     pack(:fill=>:x)
   }
diff --git a/ext/tk/sample/tkdialog.rb b/ext/tk/sample/tkdialog.rb
index 00cc12ab11..eb8cd04796 100644
--- a/ext/tk/sample/tkdialog.rb
+++ b/ext/tk/sample/tkdialog.rb
@@ -8,7 +8,7 @@ top = TkFrame.new(root) {
 }
 msg = TkMessage.new(top) {
   text "File main.c hasn't been saved to disk since \
-it was last modified.  What should I do?" 
+it was last modified.  What should I do?"
   justify 'center'
   aspect 200
   font '-Adobe-helvetica-medium-r-normal--*-240*'
diff --git a/ext/tk/sample/tkextlib/ICONS/viewIcons.rb b/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
index fc88eb5c85..02ba19a629 100644
--- a/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
+++ b/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
@@ -4,7 +4,7 @@
 #
 #     --  Display icons from icon library.
 #
-#     --  Copy the clicked icon data (command string of creating 
+#     --  Copy the clicked icon data (command string of creating
 #         a TkPhotoImage instance) to the clipboard.
 #
 require 'tk'
@@ -27,7 +27,7 @@ class ViewIcons
     ent_library = TkEntry.new(base, :width=>50, :textvariable=>@library)
     ent_groups  = TkEntry.new(base, :width=>50, :textvariable=>@groups)
 
-    btn_browse = TkButton.new(base, :text=>'Browse', 
+    btn_browse = TkButton.new(base, :text=>'Browse',
                                     :command=>method(:select_icons))
     btn_view   = TkButton.new(base, :text=>'View',
                                     :command=>method(:display_icons))
@@ -35,8 +35,8 @@ class ViewIcons
 
     @column_btns = {}
     6.step(20, 2){|i|
-      @column_btns[i] = TkButton.new(columns, 
-                                     :text=>i.to_s, :width=>2, 
+      @column_btns[i] = TkButton.new(columns,
+                                     :text=>i.to_s, :width=>2,
                                      :command=>proc{set_columns(i)}
                                      ).pack(:side=>:left)
     }
@@ -90,15 +90,15 @@ class ViewIcons
   end
 
   def _create_info_window
-    @info_window = TkToplevel.new(:background=>'lightyellow', :borderwidth=>1, 
+    @info_window = TkToplevel.new(:background=>'lightyellow', :borderwidth=>1,
                                   :relief=>:solid){|w|
-      lbl_name = TkLabel.new(w, :text=>'Name', :background=>'lightyellow', 
+      lbl_name = TkLabel.new(w, :text=>'Name', :background=>'lightyellow',
                              :font=>@boldfont, :justify=>:left)
-      lbl_grps = TkLabel.new(w, :text=>'Groups', :background=>'lightyellow', 
+      lbl_grps = TkLabel.new(w, :text=>'Groups', :background=>'lightyellow',
                              :font=>@boldfont, :justify=>:left)
-      lbl_type = TkLabel.new(w, :text=>'Type', :background=>'lightyellow', 
+      lbl_type = TkLabel.new(w, :text=>'Type', :background=>'lightyellow',
                              :font=>@boldfont, :justify=>:left)
-      lbl_size = TkLabel.new(w, :text=>'Size', :background=>'lightyellow', 
+      lbl_size = TkLabel.new(w, :text=>'Size', :background=>'lightyellow',
                              :font=>@boldfont, :justify=>:left)
 
       lbl_name.grid(:row=>0, :column=>0, :sticky=>:w)
@@ -192,7 +192,7 @@ class ViewIcons
 
   def cancel_info
     if @delay_timer
-      @delay_timer.cancel 
+      @delay_timer.cancel
       @delay_timer = nil
     end
     @info_window.withdraw
@@ -242,9 +242,9 @@ class ViewIcons
     TkClipboard.append(@command)
 
     if Tk::PLATFORM['platform'] == 'unix'
-      TkSelection.handle(Tk.root, method(:primary_transfer), 
+      TkSelection.handle(Tk.root, method(:primary_transfer),
                          :selection=>'PRIMARY')
-      TkSelection.set_owner(Tk.root, :selection=>'PRIMARY', 
+      TkSelection.set_owner(Tk.root, :selection=>'PRIMARY',
                             :command=>method(:lost_selection))
     end
 
@@ -256,17 +256,17 @@ class ViewIcons
     bbox = @icons_window.bbox('all')
     width = @controls.winfo_width - @icons_window.yscrollbar.winfo_width - 8
 
-    @icons_window.configure(:width=>width, :scrollregion=>bbox, 
-                            :xscrollincrement=>'0.1i', 
+    @icons_window.configure(:width=>width, :scrollregion=>bbox,
+                            :xscrollincrement=>'0.1i',
                             :yscrollincrement=>'0.1i')
   end
 
   def select_icons
-    new_lib = Tk.getOpenFile(:initialdir=>@initial_dir, 
-                             :initialfile=>'tkIcons', 
-                             :title=>'Select Icon Library', 
+    new_lib = Tk.getOpenFile(:initialdir=>@initial_dir,
+                             :initialfile=>'tkIcons',
+                             :title=>'Select Icon Library',
                              :filetypes=>[
-                               ['Icon Libraries', ['tkIcons*']], 
+                               ['Icon Libraries', ['tkIcons*']],
                                ['All Files', ['*']]
                              ])
 
@@ -280,7 +280,7 @@ class ViewIcons
     row = 0
 
     unless File.exist?(@library.value)
-      Tk.messageBox(:icon=>'warning', :message=>'File does not exist', 
+      Tk.messageBox(:icon=>'warning', :message=>'File does not exist',
                     :title=>'viewIcons')
       return
     end
diff --git a/ext/tk/sample/tkextlib/blt/barchart5.rb b/ext/tk/sample/tkextlib/blt/barchart5.rb
index db181d10ca..86101b200d 100644
--- a/ext/tk/sample/tkextlib/blt/barchart5.rb
+++ b/ext/tk/sample/tkextlib/blt/barchart5.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/blt'
 
-load File.join(File.dirname(File.expand_path(__FILE__)), 
+load File.join(File.dirname(File.expand_path(__FILE__)),
                'scripts', 'stipples.rb')
 
 TkOption.add('*graph.x.Title', 'X Axis Label')
@@ -23,27 +23,27 @@ if visual != 'staticgray' && visual != 'grayscale'
 end
 
 htext = Tk::BLT::Htext.new(:widgetname=>'.htext', :text=><<EOD)
-    This is an example of the barchart widget.  The barchart has 
-    many components; x and y axis, legend, crosshairs, elements, etc.  
+    This is an example of the barchart widget.  The barchart has
+    many components; x and y axis, legend, crosshairs, elements, etc.
     To create a postscript file "bar.ps", press the %%
 
     ruby {
-    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window, 
-                     :widgetname=>'print', :text=>'Print', 
+    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
+                     :widgetname=>'print', :text=>'Print',
                      :command=>proc{
                         $graph.postsript(:output=>'bar.ps')
                      })
     Tk::BLT::Htext::Htext_Widget.window.append(b)
     }
 
-%% button.  
+%% button.
 %%
 
     ruby {
-    $graph = Tk::BLT::Barchart.new(:widgetname=>'.htext.graph', 
+    $graph = Tk::BLT::Barchart.new(:widgetname=>'.htext.graph',
                                    :relief=>:raised, :borderwidth=>2)
     $graph.xaxis_configure(:rotate=>90, :stepsize=>0)
-    Tk::BLT::Htext::Htext_Widget.window.append($graph, 
+    Tk::BLT::Htext::Htext_Widget.window.append($graph,
                                                :fill=>:both, :padx=>4)
     }
 
@@ -51,8 +51,8 @@ htext = Tk::BLT::Htext.new(:widgetname=>'.htext', :text=><<EOD)
     Hit the %%
 
     ruby {
-    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window, 
-                     :widgetname=>'quit', :text=>'Quit', 
+    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
+                     :widgetname=>'quit', :text=>'Quit',
                      :command=>proc{ exit })
     Tk::BLT::Htext::Htext_Widget.window.append(b)
     }
@@ -86,7 +86,7 @@ x.seq(-5.0, 5.0, 0.2)
 y.expr("sin(#{x})")
 barWidth = 0.19
 
-$graph.element_create('sin', :relief=>:raised, :borderwidth=>1, 
+$graph.element_create('sin', :relief=>:raised, :borderwidth=>1,
                       :x=>x, :y=>y, :barwidth=>barWidth)
 
 Tk::BLT::Table.add(Tk.root, htext, :fill=>:both)
diff --git a/ext/tk/sample/tkextlib/blt/calendar.rb b/ext/tk/sample/tkextlib/blt/calendar.rb
index 4fc6d64d9e..86d34043dc 100644
--- a/ext/tk/sample/tkextlib/blt/calendar.rb
+++ b/ext/tk/sample/tkextlib/blt/calendar.rb
@@ -31,17 +31,17 @@ TkOption.add('*tile', texture2)
 class BLT_Calendar_sample
   @@monthInfo = [
     nil,  # dummy
-    ['January', 31], 
-    ['February', 28], 
-    ['March', 31], 
-    ['April', 30], 
-    ['May', 31], 
-    ['June', 30], 
-    ['July', 31], 
-    ['August', 31], 
-    ['Septembar', 30], 
-    ['October', 31], 
-    ['November', 30], 
+    ['January', 31],
+    ['February', 28],
+    ['March', 31],
+    ['April', 30],
+    ['May', 31],
+    ['June', 30],
+    ['July', 31],
+    ['August', 31],
+    ['Septembar', 30],
+    ['October', 31],
+    ['November', 30],
     ['December', 31]
   ]
 
@@ -53,23 +53,23 @@ class BLT_Calendar_sample
     if TkComm.bool(Tk.info(:commands, '.calendar'))
       Tk.destroy('.calendar')
     end
-    cal = Tk::BLT::Tile::Frame.new(:widgetname=>'.calendar', 
-                                   :classname=>'Calendar', 
+    cal = Tk::BLT::Tile::Frame.new(:widgetname=>'.calendar',
+                                   :classname=>'Calendar',
                                    :width=>'3i', :height=>'3i')
 
-    mon = Tk::BLT::Tile::Label.new(cal, :font=>'Courier 14 bold', 
-                                   :text=>"#{@@monthInfo[today.month][0]} " + 
+    mon = Tk::BLT::Tile::Label.new(cal, :font=>'Courier 14 bold',
+                                   :text=>"#{@@monthInfo[today.month][0]} " +
                                           "#{today.year}")
     Tk::BLT::Table.add(cal, mon, [1, 0], :cspan=>7, :pady=>10)
 
-    week_f = Tk::BLT::Tile::Frame.new(cal, :widgetname=>'weekframe', 
+    week_f = Tk::BLT::Tile::Frame.new(cal, :widgetname=>'weekframe',
                                       :relief=>:sunken, :borderwidth=>1)
     Tk::BLT::Table.add(cal, week_f, [2, 0], :columnspan=>7, :fill=>:both)
 
     @@abbrDays.each_with_index{|dayName, idx|
-      Tk::BLT::Table.add(cal, 
-                         Tk::BLT::Tile::Label.new(cal, :text=>dayName, 
-                                                  :font=>'Helvetica 12'), 
+      Tk::BLT::Table.add(cal,
+                         Tk::BLT::Tile::Label.new(cal, :text=>dayName,
+                                                  :font=>'Helvetica 12'),
                          [2, idx], :pady=>2, :padx=>2)
     }
 
@@ -83,11 +83,11 @@ class BLT_Calendar_sample
     wkday += 7 if wkday < 0
 
     while cnt <= numDays
-      Tk::BLT::Table.add(cal, 
+      Tk::BLT::Table.add(cal,
                          Tk::BLT::Tile::Label.new(cal, :text=>cnt){
-                           self.configure(:borderwidth=>1, 
+                           self.configure(:borderwidth=>1,
                                           :relief=>:sunken) if cnt == today.day
-                         }, 
+                         },
                          [week+3, wkday], :fill=>:both, :ipadx=>10, :ipady=>4)
       cnt += 1
       wkday += 1
@@ -98,11 +98,11 @@ class BLT_Calendar_sample
     end
 
     Tk::BLT::Tile::Frame.new(cal, :borderwidth=>1, :relief=>:sunken){|f|
-      Tk::BLT::Table.add(f, 
-                         Tk::BLT::Tile::Button.new(f, :widgetname=>'button', 
-                                                   :command=>proc{exit}, 
-                                                   :borderwidth=>2, 
-                                                   :text=>'Quit'), 
+      Tk::BLT::Table.add(f,
+                         Tk::BLT::Tile::Button.new(f, :widgetname=>'button',
+                                                   :command=>proc{exit},
+                                                   :borderwidth=>2,
+                                                   :text=>'Quit'),
                          :padx=>4, :pady=>4)
       Tk::BLT::Table.add(cal, f, [week+4, 5], :cspan=>2, :pady=>4)
     }
diff --git a/ext/tk/sample/tkextlib/blt/graph6.rb b/ext/tk/sample/tkextlib/blt/graph6.rb
index f899b44115..b3eeb81231 100644
--- a/ext/tk/sample/tkextlib/blt/graph6.rb
+++ b/ext/tk/sample/tkextlib/blt/graph6.rb
@@ -6,55 +6,55 @@ require 'tkextlib/blt'
 Tk::TCL_PRECISION.value = 15
 
 [
-  ['*Graph.Width', '10i'], 
-  ['*Graph.leftMargin', '.75i'], 
-  ['*Graph.Height', '6i'], 
-  ['*Graph.plotBackground', 'black'], 
-  ['*LineMarker.color', 'white'], 
-  ['*LineMarker.Dashes', 5], 
-  ['*TextMarker.foreground', 'white'], 
-  ['*TextMarker.Background', ''], 
-
-  ['*Graph.x.hide', true], 
-  ['*Graph.x.title', ''], 
-  ['*Graph.y.rotate', 90], 
-  # ['*Graph.y.stepSize', 2.0], 
-  ['*Graph.title', ''], 
-  ['*graph.Title', 'Example s27'], 
-  ['*graph.x.hide', false], 
-  ['*graph.topMargin', 0], 
-  ['*graph.bottomMargin', 0], 
-  ['*x.Title', 'Time'], 
-  ['*y.Title', 'Signals'], 
-  ['*Pixels', 1], 
-
-  ['*Reduce', 0.5], 
-  ['*bufferElements', false], 
-
-  ['*Element.color', 'green4'], 
-  ['*Element.ScaleSymbols', true], 
-  ['*Element.Color', 'grey70'], 
-  ['*Element.Symbol', :none], 
-  ['*Element.LineWidth', 1], 
-  # ['*Element.Smooth', :natural], 
-  ['*Element.Smooth', :catrom], 
-
-  ['*activeLine.LineWidth', 2], 
-  ['*activeLine.Color', 'white'], 
-  ['*activeLine.Color', 'green1'], 
-
-  # ['*Legend.Hide', true], 
-  ['*Legend.Position', :right], 
-  ['*Legend.Relief', :flat], 
-  ['*Legend.activeRelief', :sunken], 
-  ['*Legend.borderWidth', 2], 
-  #['*Legend.Font', '-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*'], 
-  ['*Legend.Font', 'Helvetica -10'], 
-  ['*Grid.hide', false], 
-  ['*Grid.dashes', [1, 5]], 
-
-  # ['*foreground', 'white'], 
-  ['*zoomOutline.outline', 'yellow'], 
+  ['*Graph.Width', '10i'],
+  ['*Graph.leftMargin', '.75i'],
+  ['*Graph.Height', '6i'],
+  ['*Graph.plotBackground', 'black'],
+  ['*LineMarker.color', 'white'],
+  ['*LineMarker.Dashes', 5],
+  ['*TextMarker.foreground', 'white'],
+  ['*TextMarker.Background', ''],
+
+  ['*Graph.x.hide', true],
+  ['*Graph.x.title', ''],
+  ['*Graph.y.rotate', 90],
+  # ['*Graph.y.stepSize', 2.0],
+  ['*Graph.title', ''],
+  ['*graph.Title', 'Example s27'],
+  ['*graph.x.hide', false],
+  ['*graph.topMargin', 0],
+  ['*graph.bottomMargin', 0],
+  ['*x.Title', 'Time'],
+  ['*y.Title', 'Signals'],
+  ['*Pixels', 1],
+
+  ['*Reduce', 0.5],
+  ['*bufferElements', false],
+
+  ['*Element.color', 'green4'],
+  ['*Element.ScaleSymbols', true],
+  ['*Element.Color', 'grey70'],
+  ['*Element.Symbol', :none],
+  ['*Element.LineWidth', 1],
+  # ['*Element.Smooth', :natural],
+  ['*Element.Smooth', :catrom],
+
+  ['*activeLine.LineWidth', 2],
+  ['*activeLine.Color', 'white'],
+  ['*activeLine.Color', 'green1'],
+
+  # ['*Legend.Hide', true],
+  ['*Legend.Position', :right],
+  ['*Legend.Relief', :flat],
+  ['*Legend.activeRelief', :sunken],
+  ['*Legend.borderWidth', 2],
+  #['*Legend.Font', '-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*'],
+  ['*Legend.Font', 'Helvetica -10'],
+  ['*Grid.hide', false],
+  ['*Grid.dashes', [1, 5]],
+
+  # ['*foreground', 'white'],
+  ['*zoomOutline.outline', 'yellow'],
 ].each{|k, v| TkOption.add(k, v)}
 
 ##############################
@@ -71,7 +71,7 @@ class BLT_Graph_Demo
 
     @top = Tk::BLT::Tile::Toplevel.new
 =begin
-    legend = Tk::BLT::Graph.new(@top, :widgetname=>'legend', 
+    legend = Tk::BLT::Graph.new(@top, :widgetname=>'legend',
                                 :without_creating=>true)
     @graph.legend_configure(:position=>legend)
 =end
@@ -81,7 +81,7 @@ class BLT_Graph_Demo
 
     Tk::BLT::Table.add(@root, @graph, [0,0], :fill=>:both)
 
-    @quit_btn = Tk::BLT::Tile::Button.new(:text=>' quit ', :background=>'red', 
+    @quit_btn = Tk::BLT::Tile::Button.new(:text=>' quit ', :background=>'red',
                                           :command=>proc{exit})
     Tk::BLT::Table.add(@root, @quit_btn, [1,0], :anchor=>:e, :padx=>10)
 
@@ -90,9 +90,9 @@ class BLT_Graph_Demo
     @graph.closest_point
     @graph.print_key
 
-    @graph.legend_bind(:all, 'ButtonRelease-1', 
+    @graph.legend_bind(:all, 'ButtonRelease-1',
                        proc{|w| highlightTrace(w)}, '%W')
-    @graph.legend_bind(:all, 'ButtonRelease-3', 
+    @graph.legend_bind(:all, 'ButtonRelease-3',
                        proc{|w|
                          w.legend_deactivate('*')
                          active = w.element_activate
@@ -108,2098 +108,2098 @@ class BLT_Graph_Demo
     (1..39).each{|i| @v[i] = Tk::BLT::Vector.new(:variable=>'')}
 
     @x.set(<<-'EOD')
-    0 1e-10 2e-10 3e-10 4e-10 5e-10 6e-10 7e-10 8e-10 9e-10 
-    1e-09 1.1e-09 1.2e-09 1.3e-09 1.4e-09 1.5e-09 1.6e-09 1.7e-09 
-    1.8e-09 1.9e-09 2e-09 2.1e-09 2.2e-09 2.3e-09 2.4e-09 2.5e-09 
-    2.6e-09 2.7e-09 2.8e-09 2.9e-09 3e-09 3.1e-09 3.2e-09 3.3e-09 
-    3.4e-09 3.5e-09 3.6e-09 3.7e-09 3.8e-09 3.9e-09 4e-09 4.1e-09 
-    4.2e-09 4.3e-09 4.4e-09 4.5e-09 4.6e-09 4.7e-09 4.8e-09 
-    4.9e-09 5e-09 5.1e-09 5.2e-09 5.3e-09 5.4e-09 5.5e-09 5.6e-09 
-    5.7e-09 5.8e-09 5.9e-09 6e-09 6.1e-09 6.2e-09 6.3e-09 6.4e-09 
-    6.5e-09 6.6e-09 6.7e-09 6.8e-09 6.9e-09 7e-09 7.1e-09 7.2e-09 
-    7.3e-09 7.4e-09 7.5e-09 7.6e-09 7.7e-09 7.8e-09 7.9e-09 
-    8e-09 8.1e-09 8.2e-09 8.3e-09 8.4e-09 8.5e-09 8.6e-09 8.7e-09 
-    8.8e-09 8.9e-09 9e-09 9.1e-09 9.2e-09 9.3e-09 9.4e-09 9.5e-09 
-    9.6e-09 9.7e-09 9.8e-09 9.9e-09 1e-08 1.01e-08 1.02e-08 
-    1.03e-08 1.04e-08 1.05e-08 1.06e-08 1.07e-08 1.08e-08 1.09e-08 
-    1.1e-08 1.11e-08 1.12e-08 1.13e-08 1.14e-08 1.15e-08 1.16e-08 
-    1.17e-08 1.18e-08 1.19e-08 1.2e-08 1.21e-08 1.22e-08 1.23e-08 
-    1.24e-08 1.25e-08 1.26e-08 1.27e-08 1.28e-08 1.29e-08 1.3e-08 
-    1.31e-08 1.32e-08 1.33e-08 1.34e-08 1.35e-08 1.36e-08 1.37e-08 
-    1.38e-08 1.39e-08 1.4e-08 1.41e-08 1.42e-08 1.43e-08 1.44e-08 
-    1.45e-08 1.46e-08 1.47e-08 1.48e-08 1.49e-08 1.5e-08 1.51e-08 
-    1.52e-08 1.53e-08 1.54e-08 1.55e-08 1.56e-08 1.57e-08 1.58e-08 
-    1.59e-08 1.6e-08 1.61e-08 1.62e-08 1.63e-08 1.64e-08 1.65e-08 
-    1.66e-08 1.67e-08 1.68e-08 1.69e-08 1.7e-08 1.71e-08 1.72e-08 
-    1.73e-08 1.74e-08 1.75e-08 1.76e-08 1.77e-08 1.78e-08 1.79e-08 
-    1.8e-08 1.81e-08 1.82e-08 1.83e-08 1.84e-08 1.85e-08 1.86e-08 
-    1.87e-08 1.88e-08 1.89e-08 1.9e-08 1.91e-08 1.92e-08 1.93e-08 
-    1.94e-08 1.95e-08 1.96e-08 1.97e-08 1.98e-08 1.99e-08 2e-08 
-    2.01e-08 2.02e-08 2.03e-08 2.04e-08 2.05e-08 2.06e-08 2.07e-08 
-    2.08e-08 2.09e-08 2.1e-08 2.11e-08 2.12e-08 2.13e-08 2.14e-08 
-    2.15e-08 2.16e-08 2.17e-08 2.18e-08 2.19e-08 2.2e-08 2.21e-08 
-    2.22e-08 2.23e-08 2.24e-08 2.25e-08 2.26e-08 2.27e-08 2.28e-08 
-    2.29e-08 2.3e-08 2.31e-08 2.32e-08 2.33e-08 2.34e-08 2.35e-08 
-    2.36e-08 2.37e-08 2.38e-08 2.39e-08 2.4e-08 2.41e-08 2.42e-08 
-    2.43e-08 2.44e-08 2.45e-08 2.46e-08 2.47e-08 2.48e-08 2.49e-08 
-    2.5e-08 2.51e-08 2.52e-08 2.53e-08 2.54e-08 2.55e-08 2.56e-08 
-    2.57e-08 2.58e-08 2.59e-08 2.6e-08 2.61e-08 2.62e-08 2.63e-08 
-    2.64e-08 2.65e-08 2.66e-08 2.67e-08 2.68e-08 2.69e-08 2.7e-08 
-    2.71e-08 2.72e-08 2.73e-08 2.74e-08 2.75e-08 2.76e-08 2.77e-08 
-    2.78e-08 2.79e-08 2.8e-08 2.81e-08 2.82e-08 2.83e-08 2.84e-08 
-    2.85e-08 2.86e-08 2.87e-08 2.88e-08 2.89e-08 2.9e-08 2.91e-08 
-    2.92e-08 2.93e-08 2.94e-08 2.95e-08 2.96e-08 2.97e-08 2.98e-08 
-    2.99e-08 3e-08 3.01e-08 3.02e-08 3.03e-08 3.04e-08 3.05e-08 
-    3.06e-08 3.07e-08 3.08e-08 3.09e-08 3.1e-08 3.11e-08 3.12e-08 
-    3.13e-08 3.14e-08 3.15e-08 3.16e-08 3.17e-08 3.18e-08 3.19e-08 
-    3.2e-08 3.21e-08 3.22e-08 3.23e-08 3.24e-08 3.25e-08 3.26e-08 
-    3.27e-08 3.28e-08 3.29e-08 3.3e-08 3.31e-08 3.32e-08 3.33e-08 
-    3.34e-08 3.35e-08 3.36e-08 3.37e-08 3.38e-08 3.39e-08 3.4e-08 
-    3.41e-08 3.42e-08 3.43e-08 3.44e-08 3.45e-08 3.46e-08 3.47e-08 
-    3.48e-08 3.49e-08 3.5e-08 3.51e-08 3.52e-08 3.53e-08 3.54e-08 
-    3.55e-08 3.56e-08 3.57e-08 3.58e-08 3.59e-08 3.6e-08 
+    0 1e-10 2e-10 3e-10 4e-10 5e-10 6e-10 7e-10 8e-10 9e-10
+    1e-09 1.1e-09 1.2e-09 1.3e-09 1.4e-09 1.5e-09 1.6e-09 1.7e-09
+    1.8e-09 1.9e-09 2e-09 2.1e-09 2.2e-09 2.3e-09 2.4e-09 2.5e-09
+    2.6e-09 2.7e-09 2.8e-09 2.9e-09 3e-09 3.1e-09 3.2e-09 3.3e-09
+    3.4e-09 3.5e-09 3.6e-09 3.7e-09 3.8e-09 3.9e-09 4e-09 4.1e-09
+    4.2e-09 4.3e-09 4.4e-09 4.5e-09 4.6e-09 4.7e-09 4.8e-09
+    4.9e-09 5e-09 5.1e-09 5.2e-09 5.3e-09 5.4e-09 5.5e-09 5.6e-09
+    5.7e-09 5.8e-09 5.9e-09 6e-09 6.1e-09 6.2e-09 6.3e-09 6.4e-09
+    6.5e-09 6.6e-09 6.7e-09 6.8e-09 6.9e-09 7e-09 7.1e-09 7.2e-09
+    7.3e-09 7.4e-09 7.5e-09 7.6e-09 7.7e-09 7.8e-09 7.9e-09
+    8e-09 8.1e-09 8.2e-09 8.3e-09 8.4e-09 8.5e-09 8.6e-09 8.7e-09
+    8.8e-09 8.9e-09 9e-09 9.1e-09 9.2e-09 9.3e-09 9.4e-09 9.5e-09
+    9.6e-09 9.7e-09 9.8e-09 9.9e-09 1e-08 1.01e-08 1.02e-08
+    1.03e-08 1.04e-08 1.05e-08 1.06e-08 1.07e-08 1.08e-08 1.09e-08
+    1.1e-08 1.11e-08 1.12e-08 1.13e-08 1.14e-08 1.15e-08 1.16e-08
+    1.17e-08 1.18e-08 1.19e-08 1.2e-08 1.21e-08 1.22e-08 1.23e-08
+    1.24e-08 1.25e-08 1.26e-08 1.27e-08 1.28e-08 1.29e-08 1.3e-08
+    1.31e-08 1.32e-08 1.33e-08 1.34e-08 1.35e-08 1.36e-08 1.37e-08
+    1.38e-08 1.39e-08 1.4e-08 1.41e-08 1.42e-08 1.43e-08 1.44e-08
+    1.45e-08 1.46e-08 1.47e-08 1.48e-08 1.49e-08 1.5e-08 1.51e-08
+    1.52e-08 1.53e-08 1.54e-08 1.55e-08 1.56e-08 1.57e-08 1.58e-08
+    1.59e-08 1.6e-08 1.61e-08 1.62e-08 1.63e-08 1.64e-08 1.65e-08
+    1.66e-08 1.67e-08 1.68e-08 1.69e-08 1.7e-08 1.71e-08 1.72e-08
+    1.73e-08 1.74e-08 1.75e-08 1.76e-08 1.77e-08 1.78e-08 1.79e-08
+    1.8e-08 1.81e-08 1.82e-08 1.83e-08 1.84e-08 1.85e-08 1.86e-08
+    1.87e-08 1.88e-08 1.89e-08 1.9e-08 1.91e-08 1.92e-08 1.93e-08
+    1.94e-08 1.95e-08 1.96e-08 1.97e-08 1.98e-08 1.99e-08 2e-08
+    2.01e-08 2.02e-08 2.03e-08 2.04e-08 2.05e-08 2.06e-08 2.07e-08
+    2.08e-08 2.09e-08 2.1e-08 2.11e-08 2.12e-08 2.13e-08 2.14e-08
+    2.15e-08 2.16e-08 2.17e-08 2.18e-08 2.19e-08 2.2e-08 2.21e-08
+    2.22e-08 2.23e-08 2.24e-08 2.25e-08 2.26e-08 2.27e-08 2.28e-08
+    2.29e-08 2.3e-08 2.31e-08 2.32e-08 2.33e-08 2.34e-08 2.35e-08
+    2.36e-08 2.37e-08 2.38e-08 2.39e-08 2.4e-08 2.41e-08 2.42e-08
+    2.43e-08 2.44e-08 2.45e-08 2.46e-08 2.47e-08 2.48e-08 2.49e-08
+    2.5e-08 2.51e-08 2.52e-08 2.53e-08 2.54e-08 2.55e-08 2.56e-08
+    2.57e-08 2.58e-08 2.59e-08 2.6e-08 2.61e-08 2.62e-08 2.63e-08
+    2.64e-08 2.65e-08 2.66e-08 2.67e-08 2.68e-08 2.69e-08 2.7e-08
+    2.71e-08 2.72e-08 2.73e-08 2.74e-08 2.75e-08 2.76e-08 2.77e-08
+    2.78e-08 2.79e-08 2.8e-08 2.81e-08 2.82e-08 2.83e-08 2.84e-08
+    2.85e-08 2.86e-08 2.87e-08 2.88e-08 2.89e-08 2.9e-08 2.91e-08
+    2.92e-08 2.93e-08 2.94e-08 2.95e-08 2.96e-08 2.97e-08 2.98e-08
+    2.99e-08 3e-08 3.01e-08 3.02e-08 3.03e-08 3.04e-08 3.05e-08
+    3.06e-08 3.07e-08 3.08e-08 3.09e-08 3.1e-08 3.11e-08 3.12e-08
+    3.13e-08 3.14e-08 3.15e-08 3.16e-08 3.17e-08 3.18e-08 3.19e-08
+    3.2e-08 3.21e-08 3.22e-08 3.23e-08 3.24e-08 3.25e-08 3.26e-08
+    3.27e-08 3.28e-08 3.29e-08 3.3e-08 3.31e-08 3.32e-08 3.33e-08
+    3.34e-08 3.35e-08 3.36e-08 3.37e-08 3.38e-08 3.39e-08 3.4e-08
+    3.41e-08 3.42e-08 3.43e-08 3.44e-08 3.45e-08 3.46e-08 3.47e-08
+    3.48e-08 3.49e-08 3.5e-08 3.51e-08 3.52e-08 3.53e-08 3.54e-08
+    3.55e-08 3.56e-08 3.57e-08 3.58e-08 3.59e-08 3.6e-08
     EOD
 
     @v[1].set(<<-'EOD')
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
     EOD
 
     @v[2].set(<<-'EOD')
-    0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 
-    5.32907e-15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 
-    5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 
+    0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1
+    5.32907e-15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5
+    5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0
     EOD
 
     @v[3].set(<<-'EOD')
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0
     EOD
 
     @v[4].set(<<-'EOD')
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
     EOD
 
     @v[5].set(<<-'EOD')
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
     EOD
 
     @v[6].set(<<-'EOD')
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-    0 0 0 0 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0
     EOD
 
     @v[7].set(<<-'EOD')
-    5 5.16904 4.84159 3.34542 0.317102 0.103304 0.0275721 0.0221534 
-    0.017689 0.0142639 0.0113974 0.00918238 0.00742541 0.00616602 
-    0.00481195 0.00397049 -0.0659889 -0.025671 0.165495 0.986891 
-    3.05229 4.55511 4.91611 4.98192 4.99428 4.99833 4.99095 
-    4.97295 4.95493 4.93428 4.90723 4.94799 4.98584 4.99566 
-    4.99813 4.99907 4.99947 4.99965 4.99976 4.99984 4.99989 
-    4.99992 4.99994 4.99996 4.99998 5.00002 5.00006 5.00002 
-    4.99996 4.99994 4.99999 5.00003 5.00002 5 4.99997 4.99997 
-    4.99997 4.99997 4.99997 4.99996 4.99997 4.99997 4.99998 
-    4.99998 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99998 4.99998 4.99998 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.16575 
-    4.69986 2.43862 0.0230224 0.035229 -0.0210607 -0.0292766 
-    -0.0172693 -0.00271479 -0.000912251 -0.000349106 -0.000116866 
-    -4.24733e-05 -1.39536e-05 -3.01179e-05 -0.0657192 -0.0204835 
-    0.183378 1.07181 3.118 4.46472 4.84158 4.94795 4.98173 4.99236 
-    4.99762 5.01939 5.0433 5.05332 5.04959 5.03955 5.02851 5.02052 
-    5.01422 5.00965 5.00631 5.00405 5.00248 5.00083 5.00012 
-    5.00209 5.00387 5.00347 4.99917 4.99213 4.98411 4.97521 
-    4.96332 4.94601 4.9304 4.94633 4.97936 4.99264 4.99685 4.99857 
-    4.99925 4.99954 4.9997 4.99973 4.9997 4.99973 4.99979 4.99983 
-    4.99986 4.99988 4.9999 4.9999 4.99992 4.99993 4.99994 4.99995 
-    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    5 5 5 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 
-    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 5 5 5.14242 4.76101 3.16003 0.299374 
-    0.0645506 -0.000498424 -2.45108e-05 -2.27986e-05 -5.24401e-05 
-    -4.9884e-05 -4.92491e-05 -2.93354e-05 -3.21402e-05 -2.11851e-05 
-    -3.37925e-05 -0.0657892 -0.020563 0.182582 1.06058 3.12484 
-    4.46552 4.84146 4.95102 4.98556 4.99472 4.99806 4.99909 
-    4.99955 4.99976 4.99994 4.99992 5.00029 4.99967 4.99849 
-    4.99736 4.99884 5.00099 5.00377 5.00215 4.99994 4.99893 
-    4.99788 4.99862 5.00055 5.00134 5.00127 5.00073 5.00039 
-    5.00018 5.00006 5.00001 4.99985 5.00026 5.00018 5.00003 
-    4.99981 4.99985 4.99987 4.99985 4.99982 4.99982 4.99982 
-    4.99983 4.99985 4.99987 4.99989 4.99991 4.99992 4.99994 
-    4.99995 4.99995 4.99994 4.99994 4.99996 4.99999 5.00002 
-    5.00008 5.00009 5.00006 5.00001 5 4.99999 4.99998 4.99997 
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999 
-    4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 4.99998 
-    4.99998 
+    5 5.16904 4.84159 3.34542 0.317102 0.103304 0.0275721 0.0221534
+    0.017689 0.0142639 0.0113974 0.00918238 0.00742541 0.00616602
+    0.00481195 0.00397049 -0.0659889 -0.025671 0.165495 0.986891
+    3.05229 4.55511 4.91611 4.98192 4.99428 4.99833 4.99095
+    4.97295 4.95493 4.93428 4.90723 4.94799 4.98584 4.99566
+    4.99813 4.99907 4.99947 4.99965 4.99976 4.99984 4.99989
+    4.99992 4.99994 4.99996 4.99998 5.00002 5.00006 5.00002
+    4.99996 4.99994 4.99999 5.00003 5.00002 5 4.99997 4.99997
+    4.99997 4.99997 4.99997 4.99996 4.99997 4.99997 4.99998
+    4.99998 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99998 4.99998 4.99998 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.16575
+    4.69986 2.43862 0.0230224 0.035229 -0.0210607 -0.0292766
+    -0.0172693 -0.00271479 -0.000912251 -0.000349106 -0.000116866
+    -4.24733e-05 -1.39536e-05 -3.01179e-05 -0.0657192 -0.0204835
+    0.183378 1.07181 3.118 4.46472 4.84158 4.94795 4.98173 4.99236
+    4.99762 5.01939 5.0433 5.05332 5.04959 5.03955 5.02851 5.02052
+    5.01422 5.00965 5.00631 5.00405 5.00248 5.00083 5.00012
+    5.00209 5.00387 5.00347 4.99917 4.99213 4.98411 4.97521
+    4.96332 4.94601 4.9304 4.94633 4.97936 4.99264 4.99685 4.99857
+    4.99925 4.99954 4.9997 4.99973 4.9997 4.99973 4.99979 4.99983
+    4.99986 4.99988 4.9999 4.9999 4.99992 4.99993 4.99994 4.99995
+    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    5 5 5 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002
+    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 5 5 5.14242 4.76101 3.16003 0.299374
+    0.0645506 -0.000498424 -2.45108e-05 -2.27986e-05 -5.24401e-05
+    -4.9884e-05 -4.92491e-05 -2.93354e-05 -3.21402e-05 -2.11851e-05
+    -3.37925e-05 -0.0657892 -0.020563 0.182582 1.06058 3.12484
+    4.46552 4.84146 4.95102 4.98556 4.99472 4.99806 4.99909
+    4.99955 4.99976 4.99994 4.99992 5.00029 4.99967 4.99849
+    4.99736 4.99884 5.00099 5.00377 5.00215 4.99994 4.99893
+    4.99788 4.99862 5.00055 5.00134 5.00127 5.00073 5.00039
+    5.00018 5.00006 5.00001 4.99985 5.00026 5.00018 5.00003
+    4.99981 4.99985 4.99987 4.99985 4.99982 4.99982 4.99982
+    4.99983 4.99985 4.99987 4.99989 4.99991 4.99992 4.99994
+    4.99995 4.99995 4.99994 4.99994 4.99996 4.99999 5.00002
+    5.00008 5.00009 5.00006 5.00001 5 4.99999 4.99998 4.99997
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
+    4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 4.99998
+    4.99998
     EOD
 
     @v[8].set(<<-'EOD')
-    5 5.03758 5.04711 4.96911 4.20882 3.96295 4.01117 4.15521 
-    4.2967 4.42274 4.5295 4.6176 4.69014 4.74831 4.7966 4.83537 
-    4.80526 4.787 4.79295 4.88588 5.08978 5.15615 5.10778 5.07718 
-    5.06652 5.08225 4.9744 4.52977 3.77452 2.69426 1.15294 0.245509 
-    0.0981544 0.0567527 0.0367487 0.0252578 0.0180599 0.0133837 
-    0.0101497 0.0078616 0.00620186 0.00499056 0.0041027 0.00344223 
-    0.00295808 0.00260089 0.00229887 0.00200817 0.00176397 0.00160116 
-    0.00147381 0.00134645 0.00125029 0.00116043 0.00107371 0.00101981 
-    0.000965921 0.000912028 0.000858135 0.000804242 0.000761669 
-    0.00072672 0.000691771 0.000656823 0.000621874 0.000588722 
-    0.00057041 0.000552098 0.000533785 0.000515473 0.000497162 
-    0.00047885 0.000460537 0.000442226 0.000423914 0.000405601 
-    0.000388399 0.000378694 0.000368989 0.000359284 0.00034958 
-    0.000339875 0.00033017 0.000320465 0.00031076 0.000301055 
-    0.00029135 0.000282207 0.000276247 0.000270287 0.000264327 
-    0.000258367 0.000252407 0.000246447 0.000240487 0.000234527 
-    0.000228567 0.000222607 0.000217086 0.000213696 0.000210307 
-    0.000206918 0.000203528 0.000200139 0.00019675 0.00019336 
-    0.000189971 0.000186582 0.000183192 0.000179803 0.000176414 
-    0.000173025 0.000169635 0.000166246 0.000162857 0.000159467 
-    0.000156078 0.000152689 0.000149299 0.00014591 0.00014255 
-    0.0316021 0.163272 0.348732 0.603651 0.35745 0.135965 0.0707354 
-    0.0314595 0.0201047 0.00994945 0.00389601 0.00138839 0.00060778 
-    0.000329648 0.000492396 -0.0732035 -0.0844077 -0.0789062 
-    -0.0390837 0.0197559 0.0183094 -0.00180099 -0.0189565 -0.0424144 
-    -0.0735904 -0.0892423 0.285039 1.13702 2.10809 2.95826 3.60164 
-    4.0435 4.35771 4.57254 4.71769 4.81329 4.87534 4.91487 4.94264 
-    4.97375 5.01526 5.06517 5.10154 5.06259 4.89005 4.5787 4.12226 
-    3.46151 2.49023 1.2586 0.32725 0.116753 0.0701865 0.0455509 
-    0.0286914 0.0178176 0.0117599 0.00902715 0.00760583 0.00637745 
-    0.00543811 0.00439377 0.00352448 0.0030151 0.00285771 0.002465 
-    0.00203114 0.00173004 0.0014839 0.00125177 0.00105327 0.000894905 
-    0.000766372 0.000658894 0.000569105 0.000492114 0.000427938 
-    0.000370217 0.000314758 0.000266569 0.000233726 0.000209048 
-    0.000191957 0.000177169 0.000166604 0.000161 0.000157314 
-    0.000143828 0.000130342 0.000116857 0.000103371 8.98855e-05 
-    7.63998e-05 6.29141e-05 5.76583e-05 5.30027e-05 4.8347e-05 
-    4.36913e-05 3.90357e-05 3.438e-05 2.97243e-05 2.72507e-05 
-    2.59083e-05 2.45659e-05 2.32235e-05 2.18811e-05 2.05387e-05 
-    1.91963e-05 1.78539e-05 1.65115e-05 1.51691e-05 1.38267e-05 
-    1.24843e-05 1.11419e-05 9.79954e-06 8.51574e-06 7.69807e-06 
-    6.8804e-06 6.06273e-06 5.24506e-06 0.0287318 0.0317111 -0.0320087 
-    -0.103609 0.0369639 0.0121128 0.00961197 0.00934971 0.00820853 
-    0.00699769 0.00607002 0.00535541 0.00476552 0.00427601 0.00376357 
-    -0.073012 -0.0866964 -0.0809538 -0.038005 0.0277001 0.0188906 
-    0.00614597 0.00373629 0.00489787 0.0146573 0.0191052 0.0151708 
-    0.0124224 0.0105859 0.00879272 0.00729464 0.0070047 0.00449575 
-    -0.00626652 -0.0252417 -0.0147287 0.022538 0.0822905 0.0947372 
-    0.0657516 0.0445506 0.0316753 0.0220971 0.0158101 0.0140971 
-    0.0161498 0.0139876 0.0122447 0.0106994 0.009397 0.00822236 
-    0.00686509 0.00797431 0.00751269 0.00671173 0.00595243 0.00524633 
-    0.00459528 0.00401688 0.00350109 0.00303954 0.00260569 0.00222792 
-    0.00191033 0.00163917 0.00140949 0.00121464 0.0010471 0.000900638 
-    0.000768847 0.000645236 0.000524807 0.000460275 0.000442237 
-    0.000446775 0.000397026 0.000301585 0.000228994 0.000190894 
-    0.000166569 0.000152261 0.000137953 0.000123644 0.000109336 
-    9.50281e-05 8.56557e-05 7.78437e-05 7.00318e-05 6.22198e-05 
-    5.44079e-05 4.87539e-05 4.57761e-05 4.27982e-05 3.98203e-05 
-    3.68425e-05 3.38646e-05 3.08868e-05 2.79089e-05 2.4931e-05 
-    2.19532e-05 1.89753e-05 1.75244e-05 1.64095e-05 1.52946e-05 
-    1.41797e-05 1.30648e-05 1.19499e-05 1.0835e-05 9.72011e-06 
-    8.60521e-06 7.4903e-06 6.5117e-06 6.10334e-06 5.69497e-06 
-    5.2866e-06 4.87824e-06 4.46987e-06 4.06151e-06 3.65314e-06 
-    3.24477e-06 
+    5 5.03758 5.04711 4.96911 4.20882 3.96295 4.01117 4.15521
+    4.2967 4.42274 4.5295 4.6176 4.69014 4.74831 4.7966 4.83537
+    4.80526 4.787 4.79295 4.88588 5.08978 5.15615 5.10778 5.07718
+    5.06652 5.08225 4.9744 4.52977 3.77452 2.69426 1.15294 0.245509
+    0.0981544 0.0567527 0.0367487 0.0252578 0.0180599 0.0133837
+    0.0101497 0.0078616 0.00620186 0.00499056 0.0041027 0.00344223
+    0.00295808 0.00260089 0.00229887 0.00200817 0.00176397 0.00160116
+    0.00147381 0.00134645 0.00125029 0.00116043 0.00107371 0.00101981
+    0.000965921 0.000912028 0.000858135 0.000804242 0.000761669
+    0.00072672 0.000691771 0.000656823 0.000621874 0.000588722
+    0.00057041 0.000552098 0.000533785 0.000515473 0.000497162
+    0.00047885 0.000460537 0.000442226 0.000423914 0.000405601
+    0.000388399 0.000378694 0.000368989 0.000359284 0.00034958
+    0.000339875 0.00033017 0.000320465 0.00031076 0.000301055
+    0.00029135 0.000282207 0.000276247 0.000270287 0.000264327
+    0.000258367 0.000252407 0.000246447 0.000240487 0.000234527
+    0.000228567 0.000222607 0.000217086 0.000213696 0.000210307
+    0.000206918 0.000203528 0.000200139 0.00019675 0.00019336
+    0.000189971 0.000186582 0.000183192 0.000179803 0.000176414
+    0.000173025 0.000169635 0.000166246 0.000162857 0.000159467
+    0.000156078 0.000152689 0.000149299 0.00014591 0.00014255
+    0.0316021 0.163272 0.348732 0.603651 0.35745 0.135965 0.0707354
+    0.0314595 0.0201047 0.00994945 0.00389601 0.00138839 0.00060778
+    0.000329648 0.000492396 -0.0732035 -0.0844077 -0.0789062
+    -0.0390837 0.0197559 0.0183094 -0.00180099 -0.0189565 -0.0424144
+    -0.0735904 -0.0892423 0.285039 1.13702 2.10809 2.95826 3.60164
+    4.0435 4.35771 4.57254 4.71769 4.81329 4.87534 4.91487 4.94264
+    4.97375 5.01526 5.06517 5.10154 5.06259 4.89005 4.5787 4.12226
+    3.46151 2.49023 1.2586 0.32725 0.116753 0.0701865 0.0455509
+    0.0286914 0.0178176 0.0117599 0.00902715 0.00760583 0.00637745
+    0.00543811 0.00439377 0.00352448 0.0030151 0.00285771 0.002465
+    0.00203114 0.00173004 0.0014839 0.00125177 0.00105327 0.000894905
+    0.000766372 0.000658894 0.000569105 0.000492114 0.000427938
+    0.000370217 0.000314758 0.000266569 0.000233726 0.000209048
+    0.000191957 0.000177169 0.000166604 0.000161 0.000157314
+    0.000143828 0.000130342 0.000116857 0.000103371 8.98855e-05
+    7.63998e-05 6.29141e-05 5.76583e-05 5.30027e-05 4.8347e-05
+    4.36913e-05 3.90357e-05 3.438e-05 2.97243e-05 2.72507e-05
+    2.59083e-05 2.45659e-05 2.32235e-05 2.18811e-05 2.05387e-05
+    1.91963e-05 1.78539e-05 1.65115e-05 1.51691e-05 1.38267e-05
+    1.24843e-05 1.11419e-05 9.79954e-06 8.51574e-06 7.69807e-06
+    6.8804e-06 6.06273e-06 5.24506e-06 0.0287318 0.0317111 -0.0320087
+    -0.103609 0.0369639 0.0121128 0.00961197 0.00934971 0.00820853
+    0.00699769 0.00607002 0.00535541 0.00476552 0.00427601 0.00376357
+    -0.073012 -0.0866964 -0.0809538 -0.038005 0.0277001 0.0188906
+    0.00614597 0.00373629 0.00489787 0.0146573 0.0191052 0.0151708
+    0.0124224 0.0105859 0.00879272 0.00729464 0.0070047 0.00449575
+    -0.00626652 -0.0252417 -0.0147287 0.022538 0.0822905 0.0947372
+    0.0657516 0.0445506 0.0316753 0.0220971 0.0158101 0.0140971
+    0.0161498 0.0139876 0.0122447 0.0106994 0.009397 0.00822236
+    0.00686509 0.00797431 0.00751269 0.00671173 0.00595243 0.00524633
+    0.00459528 0.00401688 0.00350109 0.00303954 0.00260569 0.00222792
+    0.00191033 0.00163917 0.00140949 0.00121464 0.0010471 0.000900638
+    0.000768847 0.000645236 0.000524807 0.000460275 0.000442237
+    0.000446775 0.000397026 0.000301585 0.000228994 0.000190894
+    0.000166569 0.000152261 0.000137953 0.000123644 0.000109336
+    9.50281e-05 8.56557e-05 7.78437e-05 7.00318e-05 6.22198e-05
+    5.44079e-05 4.87539e-05 4.57761e-05 4.27982e-05 3.98203e-05
+    3.68425e-05 3.38646e-05 3.08868e-05 2.79089e-05 2.4931e-05
+    2.19532e-05 1.89753e-05 1.75244e-05 1.64095e-05 1.52946e-05
+    1.41797e-05 1.30648e-05 1.19499e-05 1.0835e-05 9.72011e-06
+    8.60521e-06 7.4903e-06 6.5117e-06 6.10334e-06 5.69497e-06
+    5.2866e-06 4.87824e-06 4.46987e-06 4.06151e-06 3.65314e-06
+    3.24477e-06
     EOD
 
     @v[9].set(<<-'EOD')
-    1.86175 1.99708 2.07867 2.01211 2.43309 3.27194 3.63896 
-    3.90426 4.11074 4.27932 4.41496 4.52543 4.61491 4.68862 
-    4.7479 4.79666 4.72895 4.68886 4.70354 4.81353 5.01568 5.14184 
-    5.10482 5.07362 5.05143 5.03638 5.02323 5.01465 5.00853 
-    5.00383 4.99985 5.00454 5.00652 5.00546 5.00411 5.003 5.00214 
-    5.00151 5.00106 5.00073 5.0005 5.00034 5.00023 5.00015 5.0001 
-    5.00005 5 5.00001 5.00005 5.00005 5.00003 5 4.99998 4.99996 
-    4.99994 4.99995 4.99997 4.99998 5 5.00001 5.00002 5.00002 
-    5.00003 5.00003 5.00003 5.00003 5.00003 5.00003 5.00002 
-    5.00002 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998 
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.17392 4.94828 3.78491 
-    1.52079 0.608874 0.244031 0.127087 0.0552995 0.0361032 0.0169025 
-    0.006364 0.00217624 0.000921391 0.000457305 0.000786754 
-    -0.120016 -0.148054 -0.15898 -0.0801463 0.16463 0.174017 
-    0.0799249 0.0318788 0.0129696 0.00483397 0.0025677 0.0042079 
-    0.00350003 0.00178404 -8.72902e-05 -0.00128497 -0.00142213 
-    -0.00130018 -0.00106874 -0.000789207 -0.000824335 -0.00104518 
-    -0.00136799 -0.004366 -0.0102621 -0.0109254 -0.00649259 
-    -0.00194842 0.00029793 0.00148673 0.00221085 0.00228291 
-    0.00185261 0.00139687 0.00148183 0.00562266 0.00844119 0.00754627 
-    0.00657396 0.00591212 0.00539269 0.0049282 0.00448417 0.0040572 
-    0.00363719 0.00320392 0.00279607 0.00243938 0.00211505 0.00182302 
-    0.00156254 0.0013341 0.00113834 0.000971865 0.00082776 0.000706193 
-    0.000602499 0.000515059 0.000441401 0.00037897 0.000325459 
-    0.00028083 0.000242096 0.000207274 0.000176444 0.000150372 
-    0.000126407 0.000103373 9.05522e-05 8.53555e-05 8.63685e-05 
-    9.02593e-05 8.37346e-05 7.72099e-05 7.06852e-05 6.41605e-05 
-    5.76358e-05 5.11112e-05 4.45865e-05 4.08176e-05 3.72497e-05 
-    3.36818e-05 3.01138e-05 2.65459e-05 2.2978e-05 1.94101e-05 
-    1.76154e-05 1.67399e-05 1.58645e-05 1.4989e-05 1.41136e-05 
-    1.32381e-05 1.23626e-05 1.14872e-05 1.06117e-05 9.73629e-06 
-    8.86083e-06 7.98538e-06 7.10993e-06 6.23447e-06 5.44363e-06 
-    5.32578e-06 5.20792e-06 5.09007e-06 4.97222e-06 0.0784323 
-    0.0474527 -0.0764232 -0.151146 0.0615785 0.0144489 0.00974161 
-    0.00947176 0.00849005 0.00728201 0.00630581 0.00554032 0.00487809 
-    0.00441504 0.00384139 -0.118943 -0.149894 -0.161173 -0.0825299 
-    0.171686 0.176912 0.0816085 0.0335236 0.013791 0.0056976 
-    0.00238833 0.00105348 0.000526199 0.00025969 0.000396026 
-    0.000837835 0.00170131 0.00196699 -0.000553314 -0.0061621 
-    -0.0111895 -0.0142698 -0.0124608 -0.00795847 -0.00467822 
-    -0.0043058 -0.00874449 -0.0118584 -0.00871386 -0.00377892 
-    1.95244e-05 0.00218952 0.00325486 0.00386497 0.00422837 
-    0.00446883 0.00447065 0.00486647 0.00547838 0.00565398 0.00559092 
-    0.00538752 0.00507015 0.00466305 0.00420756 0.00373465 0.00328404 
-    0.00287059 0.00250057 0.00216124 0.00184861 0.00156815 0.00134624 
-    0.00117857 0.00103412 0.0008948 0.000761012 0.000619853 
-    0.000462614 0.000319965 0.000287666 0.000356415 0.000379946 
-    0.000339183 0.00027972 0.000252982 0.000226244 0.000199507 
-    0.000172769 0.000146031 0.000130097 0.000117578 0.000105059 
-    9.25401e-05 8.00213e-05 7.11204e-05 6.67061e-05 6.22918e-05 
-    5.78775e-05 5.34632e-05 4.90489e-05 4.46346e-05 4.02203e-05 
-    3.5806e-05 3.13916e-05 2.69773e-05 2.4827e-05 2.31747e-05 
-    2.15225e-05 1.98702e-05 1.8218e-05 1.65658e-05 1.49135e-05 
-    1.32613e-05 1.1609e-05 9.95678e-06 8.50108e-06 7.86765e-06 
-    7.23422e-06 6.60079e-06 5.96736e-06 5.33393e-06 4.7005e-06 
-    4.06707e-06 3.43363e-06 
+    1.86175 1.99708 2.07867 2.01211 2.43309 3.27194 3.63896
+    3.90426 4.11074 4.27932 4.41496 4.52543 4.61491 4.68862
+    4.7479 4.79666 4.72895 4.68886 4.70354 4.81353 5.01568 5.14184
+    5.10482 5.07362 5.05143 5.03638 5.02323 5.01465 5.00853
+    5.00383 4.99985 5.00454 5.00652 5.00546 5.00411 5.003 5.00214
+    5.00151 5.00106 5.00073 5.0005 5.00034 5.00023 5.00015 5.0001
+    5.00005 5 5.00001 5.00005 5.00005 5.00003 5 4.99998 4.99996
+    4.99994 4.99995 4.99997 4.99998 5 5.00001 5.00002 5.00002
+    5.00003 5.00003 5.00003 5.00003 5.00003 5.00003 5.00002
+    5.00002 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.17392 4.94828 3.78491
+    1.52079 0.608874 0.244031 0.127087 0.0552995 0.0361032 0.0169025
+    0.006364 0.00217624 0.000921391 0.000457305 0.000786754
+    -0.120016 -0.148054 -0.15898 -0.0801463 0.16463 0.174017
+    0.0799249 0.0318788 0.0129696 0.00483397 0.0025677 0.0042079
+    0.00350003 0.00178404 -8.72902e-05 -0.00128497 -0.00142213
+    -0.00130018 -0.00106874 -0.000789207 -0.000824335 -0.00104518
+    -0.00136799 -0.004366 -0.0102621 -0.0109254 -0.00649259
+    -0.00194842 0.00029793 0.00148673 0.00221085 0.00228291
+    0.00185261 0.00139687 0.00148183 0.00562266 0.00844119 0.00754627
+    0.00657396 0.00591212 0.00539269 0.0049282 0.00448417 0.0040572
+    0.00363719 0.00320392 0.00279607 0.00243938 0.00211505 0.00182302
+    0.00156254 0.0013341 0.00113834 0.000971865 0.00082776 0.000706193
+    0.000602499 0.000515059 0.000441401 0.00037897 0.000325459
+    0.00028083 0.000242096 0.000207274 0.000176444 0.000150372
+    0.000126407 0.000103373 9.05522e-05 8.53555e-05 8.63685e-05
+    9.02593e-05 8.37346e-05 7.72099e-05 7.06852e-05 6.41605e-05
+    5.76358e-05 5.11112e-05 4.45865e-05 4.08176e-05 3.72497e-05
+    3.36818e-05 3.01138e-05 2.65459e-05 2.2978e-05 1.94101e-05
+    1.76154e-05 1.67399e-05 1.58645e-05 1.4989e-05 1.41136e-05
+    1.32381e-05 1.23626e-05 1.14872e-05 1.06117e-05 9.73629e-06
+    8.86083e-06 7.98538e-06 7.10993e-06 6.23447e-06 5.44363e-06
+    5.32578e-06 5.20792e-06 5.09007e-06 4.97222e-06 0.0784323
+    0.0474527 -0.0764232 -0.151146 0.0615785 0.0144489 0.00974161
+    0.00947176 0.00849005 0.00728201 0.00630581 0.00554032 0.00487809
+    0.00441504 0.00384139 -0.118943 -0.149894 -0.161173 -0.0825299
+    0.171686 0.176912 0.0816085 0.0335236 0.013791 0.0056976
+    0.00238833 0.00105348 0.000526199 0.00025969 0.000396026
+    0.000837835 0.00170131 0.00196699 -0.000553314 -0.0061621
+    -0.0111895 -0.0142698 -0.0124608 -0.00795847 -0.00467822
+    -0.0043058 -0.00874449 -0.0118584 -0.00871386 -0.00377892
+    1.95244e-05 0.00218952 0.00325486 0.00386497 0.00422837
+    0.00446883 0.00447065 0.00486647 0.00547838 0.00565398 0.00559092
+    0.00538752 0.00507015 0.00466305 0.00420756 0.00373465 0.00328404
+    0.00287059 0.00250057 0.00216124 0.00184861 0.00156815 0.00134624
+    0.00117857 0.00103412 0.0008948 0.000761012 0.000619853
+    0.000462614 0.000319965 0.000287666 0.000356415 0.000379946
+    0.000339183 0.00027972 0.000252982 0.000226244 0.000199507
+    0.000172769 0.000146031 0.000130097 0.000117578 0.000105059
+    9.25401e-05 8.00213e-05 7.11204e-05 6.67061e-05 6.22918e-05
+    5.78775e-05 5.34632e-05 4.90489e-05 4.46346e-05 4.02203e-05
+    3.5806e-05 3.13916e-05 2.69773e-05 2.4827e-05 2.31747e-05
+    2.15225e-05 1.98702e-05 1.8218e-05 1.65658e-05 1.49135e-05
+    1.32613e-05 1.1609e-05 9.95678e-06 8.50108e-06 7.86765e-06
+    7.23422e-06 6.60079e-06 5.96736e-06 5.33393e-06 4.7005e-06
+    4.06707e-06 3.43363e-06
     EOD
 
     @v[10].set(<<-'EOD')
-    1.86175 1.99308 2.16619 2.46661 3.09359 3.76864 4.31299 
-    4.65564 4.83425 4.92153 4.96157 4.98063 4.98649 4.99039 
-    4.9945 4.9972 4.96206 4.89882 4.83865 4.83202 4.91016 5.04479 
-    5.06078 5.04827 5.03474 5.0246 5.01639 5.00996 5.00569 5.00239 
-    5.00043 5.00296 5.00437 5.00382 5.00287 5.00208 5.00148 
-    5.00104 5.00073 5.0005 5.00034 5.00023 5.00016 5.00011 5.00008 
-    5.00007 5.00007 5.00004 5 4.99998 4.99998 4.99997 4.99998 
-    4.99999 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001 
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5.10081 
-    5.10949 4.98359 5.00733 5.15145 4.37298 2.36126 0.470759 
-    0.0577238 0.0115884 0.00262611 0.000671499 0.000389038 0.000291291 
-    0.000317347 -0.0167823 -0.0158344 -0.0140559 0.0104849 0.0865874 
-    0.107813 0.0524688 0.0214369 0.00876443 0.00341595 0.00170778 
-    0.00259042 0.0022241 0.00118519 1.10217e-06 -0.000784506 
-    -0.000948169 -0.000856256 -0.000696719 -0.000485987 -0.000724787 
-    -0.000981491 -0.001454 -0.00552498 -0.0114992 -0.0105266 
-    -0.00543527 -0.000982798 0.00127356 0.00224212 0.00275439 
-    0.00281098 0.0025471 0.00230368 0.00222576 0.00485522 0.00729453 
-    0.00691796 0.0062615 0.00573987 0.0052688 0.00481185 0.00436934 
-    0.00394326 0.00352712 0.00309978 0.00270038 0.00235335 0.00203742 
-    0.00175256 0.00150067 0.00128126 0.00109323 0.000933619 
-    0.000795113 0.000678182 0.00057843 0.000494345 0.000423609 
-    0.000363821 0.000312766 0.000269856 0.000232389 0.000198382 
-    0.000168126 0.00014267 0.000119293 9.69034e-05 8.5669e-05 
-    8.26828e-05 8.64066e-05 9.26665e-05 8.5454e-05 7.82416e-05 
-    7.10291e-05 6.38167e-05 5.66043e-05 4.93918e-05 4.21794e-05 
-    3.86073e-05 3.53007e-05 3.19941e-05 2.86876e-05 2.5381e-05 
-    2.20744e-05 1.87678e-05 1.70933e-05 1.62648e-05 1.54363e-05 
-    1.46079e-05 1.37794e-05 1.2951e-05 1.21225e-05 1.12941e-05 
-    1.04656e-05 9.63716e-06 8.80871e-06 7.98026e-06 7.1518e-06 
-    6.32335e-06 5.5374e-06 5.08959e-06 4.64178e-06 4.19397e-06 
-    3.74616e-06 0.0438026 0.0242078 -0.0602019 -0.0840866 0.00148461 
-    -0.00292489 0.000442098 0.00219489 0.00281478 0.00290756 
-    0.00277945 0.00263896 0.00240099 0.00223283 0.001947 -0.0153629 
-    -0.0148815 -0.0128673 0.0126017 0.0905161 0.11051 0.0538958 
-    0.022562 0.00935726 0.00397422 0.00172534 0.000790207 0.000416322 
-    0.000191632 0.000469721 0.0009779 0.00192566 0.00200688 
-    -0.0016502 -0.00733932 -0.0128113 -0.0147608 -0.0115456 
-    -0.00668995 -0.00401368 -0.00463908 -0.0101197 -0.0118993 
-    -0.0076276 -0.00262656 0.000813059 0.00264455 0.00350796 
-    0.00399494 0.0043049 0.00451658 0.00444739 0.00503842 0.00559516 
-    0.00568213 0.00556459 0.0053176 0.00496654 0.00454337 0.00408592 
-    0.00362171 0.00317793 0.00277001 0.00240394 0.00207009 0.00176575 
-    0.00149725 0.00129045 0.00114257 0.00101135 0.000871672 
-    0.000723764 0.000580438 0.000427507 0.000296956 0.000281834 
-    0.000376628 0.000412266 0.000367547 0.000295305 0.000264513 
-    0.000233721 0.000202929 0.000172137 0.000141345 0.000124721 
-    0.000112577 0.000100433 8.82893e-05 7.61453e-05 6.75517e-05 
-    6.33609e-05 5.91701e-05 5.49792e-05 5.07884e-05 4.65976e-05 
-    4.24067e-05 3.82159e-05 3.40251e-05 2.98342e-05 2.56434e-05 
-    2.36401e-05 2.21181e-05 2.05961e-05 1.90741e-05 1.75521e-05 
-    1.60301e-05 1.45081e-05 1.29861e-05 1.14641e-05 9.94208e-06 
-    8.59252e-06 7.96439e-06 7.33626e-06 6.70813e-06 6.07999e-06 
-    5.45186e-06 4.82373e-06 4.1956e-06 3.56747e-06 
+    1.86175 1.99308 2.16619 2.46661 3.09359 3.76864 4.31299
+    4.65564 4.83425 4.92153 4.96157 4.98063 4.98649 4.99039
+    4.9945 4.9972 4.96206 4.89882 4.83865 4.83202 4.91016 5.04479
+    5.06078 5.04827 5.03474 5.0246 5.01639 5.00996 5.00569 5.00239
+    5.00043 5.00296 5.00437 5.00382 5.00287 5.00208 5.00148
+    5.00104 5.00073 5.0005 5.00034 5.00023 5.00016 5.00011 5.00008
+    5.00007 5.00007 5.00004 5 4.99998 4.99998 4.99997 4.99998
+    4.99999 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5.10081
+    5.10949 4.98359 5.00733 5.15145 4.37298 2.36126 0.470759
+    0.0577238 0.0115884 0.00262611 0.000671499 0.000389038 0.000291291
+    0.000317347 -0.0167823 -0.0158344 -0.0140559 0.0104849 0.0865874
+    0.107813 0.0524688 0.0214369 0.00876443 0.00341595 0.00170778
+    0.00259042 0.0022241 0.00118519 1.10217e-06 -0.000784506
+    -0.000948169 -0.000856256 -0.000696719 -0.000485987 -0.000724787
+    -0.000981491 -0.001454 -0.00552498 -0.0114992 -0.0105266
+    -0.00543527 -0.000982798 0.00127356 0.00224212 0.00275439
+    0.00281098 0.0025471 0.00230368 0.00222576 0.00485522 0.00729453
+    0.00691796 0.0062615 0.00573987 0.0052688 0.00481185 0.00436934
+    0.00394326 0.00352712 0.00309978 0.00270038 0.00235335 0.00203742
+    0.00175256 0.00150067 0.00128126 0.00109323 0.000933619
+    0.000795113 0.000678182 0.00057843 0.000494345 0.000423609
+    0.000363821 0.000312766 0.000269856 0.000232389 0.000198382
+    0.000168126 0.00014267 0.000119293 9.69034e-05 8.5669e-05
+    8.26828e-05 8.64066e-05 9.26665e-05 8.5454e-05 7.82416e-05
+    7.10291e-05 6.38167e-05 5.66043e-05 4.93918e-05 4.21794e-05
+    3.86073e-05 3.53007e-05 3.19941e-05 2.86876e-05 2.5381e-05
+    2.20744e-05 1.87678e-05 1.70933e-05 1.62648e-05 1.54363e-05
+    1.46079e-05 1.37794e-05 1.2951e-05 1.21225e-05 1.12941e-05
+    1.04656e-05 9.63716e-06 8.80871e-06 7.98026e-06 7.1518e-06
+    6.32335e-06 5.5374e-06 5.08959e-06 4.64178e-06 4.19397e-06
+    3.74616e-06 0.0438026 0.0242078 -0.0602019 -0.0840866 0.00148461
+    -0.00292489 0.000442098 0.00219489 0.00281478 0.00290756
+    0.00277945 0.00263896 0.00240099 0.00223283 0.001947 -0.0153629
+    -0.0148815 -0.0128673 0.0126017 0.0905161 0.11051 0.0538958
+    0.022562 0.00935726 0.00397422 0.00172534 0.000790207 0.000416322
+    0.000191632 0.000469721 0.0009779 0.00192566 0.00200688
+    -0.0016502 -0.00733932 -0.0128113 -0.0147608 -0.0115456
+    -0.00668995 -0.00401368 -0.00463908 -0.0101197 -0.0118993
+    -0.0076276 -0.00262656 0.000813059 0.00264455 0.00350796
+    0.00399494 0.0043049 0.00451658 0.00444739 0.00503842 0.00559516
+    0.00568213 0.00556459 0.0053176 0.00496654 0.00454337 0.00408592
+    0.00362171 0.00317793 0.00277001 0.00240394 0.00207009 0.00176575
+    0.00149725 0.00129045 0.00114257 0.00101135 0.000871672
+    0.000723764 0.000580438 0.000427507 0.000296956 0.000281834
+    0.000376628 0.000412266 0.000367547 0.000295305 0.000264513
+    0.000233721 0.000202929 0.000172137 0.000141345 0.000124721
+    0.000112577 0.000100433 8.82893e-05 7.61453e-05 6.75517e-05
+    6.33609e-05 5.91701e-05 5.49792e-05 5.07884e-05 4.65976e-05
+    4.24067e-05 3.82159e-05 3.40251e-05 2.98342e-05 2.56434e-05
+    2.36401e-05 2.21181e-05 2.05961e-05 1.90741e-05 1.75521e-05
+    1.60301e-05 1.45081e-05 1.29861e-05 1.14641e-05 9.94208e-06
+    8.59252e-06 7.96439e-06 7.33626e-06 6.70813e-06 6.07999e-06
+    5.45186e-06 4.82373e-06 4.1956e-06 3.56747e-06
     EOD
 
     @v[11].set(<<-'EOD')
-    1.86175 1.73419 1.42874 1.04055 0.943004 0.268275 0.0826455 
-    0.0388346 0.0214104 0.0135431 0.00961322 0.00712846 0.00588262 
-    0.00432397 0.00377774 0.00270134 -0.00393731 -0.00542187 
-    -0.00126596 0.0113777 0.0134522 0.00477056 -0.00211067 -0.00229253 
-    -0.00173355 -0.00122404 -0.00113426 -0.000744931 -0.000520112 
-    -0.000410048 -0.000220439 0.000508104 5.15856e-05 -0.000112593 
-    -0.000118917 -9.57394e-05 -7.15727e-05 -5.11847e-05 -3.58275e-05 
-    -2.47166e-05 -1.68866e-05 -1.14082e-05 -7.66646e-06 -5.12139e-06 
-    -3.63426e-06 -3.01815e-06 -2.64862e-06 -1.4947e-06 -1.91403e-07 
-    -2.5763e-08 -7.73699e-07 -1.52164e-06 -1.07268e-06 -3.81696e-07 
-    2.6727e-07 4.75489e-07 6.83708e-07 8.91926e-07 1.10014e-06 
-    1.30836e-06 1.2482e-06 1.00726e-06 7.66311e-07 5.25364e-07 
-    2.84417e-07 6.27857e-08 7.43904e-10 -6.12979e-08 -1.2334e-07 
-    -1.85382e-07 -2.47423e-07 -3.09465e-07 -3.71507e-07 -4.33549e-07 
-    -4.95591e-07 -5.57633e-07 -6.04571e-07 -5.4944e-07 -4.9431e-07 
-    -4.3918e-07 -3.84049e-07 -3.28919e-07 -2.73789e-07 -2.18659e-07 
-    -1.63528e-07 -1.08398e-07 -5.32678e-08 1.062e-09 5.08502e-08 
-    1.00638e-07 1.50427e-07 2.00215e-07 2.50003e-07 2.99791e-07 
-    3.4958e-07 3.99368e-07 4.49156e-07 4.98944e-07 5.34512e-07 
-    5.01032e-07 4.67553e-07 4.34073e-07 4.00593e-07 3.67113e-07 
-    3.33633e-07 3.00153e-07 2.66674e-07 2.33194e-07 1.99714e-07 
-    1.66234e-07 1.32754e-07 9.92744e-08 6.57945e-08 3.23147e-08 
-    -1.16513e-09 -3.4645e-08 -6.81248e-08 -1.01605e-07 -1.35084e-07 
-    -1.68564e-07 -2.18729e-07 0.0114926 -0.0245378 -0.111828 
-    0.0964775 1.61491 3.22668 4.22041 4.54492 4.82845 4.94868 
-    4.98588 4.99609 4.9981 4.99908 4.99788 4.98395 4.99294 4.99724 
-    5.01939 5.0471 5.00902 4.98194 4.98496 4.99188 4.99623 4.99862 
-    5.00025 4.99974 4.99953 4.99946 4.99958 5.00012 4.99997 
-    4.99992 4.99988 4.99985 4.9998 4.9997 4.9988 4.99806 4.99982 
-    5.00143 5.00159 5.00098 5.00053 5.00028 5.00007 4.99977 
-    4.99992 5.00005 5.00133 5.0009 4.99993 4.99972 4.99975 4.9998 
-    4.99982 4.99983 4.99983 4.99983 4.99983 4.99984 4.99986 
-    4.99987 4.99989 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99998 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    5 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 
-    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 5 5 5.01457 4.99482 4.96561 4.99326 
-    5.03452 5.00424 5.00101 5.00045 5.00004 4.99965 4.99997 
-    4.99994 4.99958 4.99999 4.99936 4.9839 4.99248 4.99717 5.01976 
-    5.04869 5.0087 4.98143 4.98488 4.99199 4.99622 4.9983 4.99928 
-    4.99971 4.99986 5.00031 5.00022 5.00035 5.0001 4.99884 4.99811 
-    4.99803 4.99887 5.00078 5.00151 5.00116 5.00007 4.99843 
-    4.99915 5.00107 5.00168 5.00141 5.00092 5.00055 5.0003 5.00016 
-    5.0001 5.00001 5.00016 5.0002 5.00009 4.99993 4.99975 4.99984 
-    4.99991 4.99991 4.99982 4.99974 4.99974 4.99985 4.99995 
-    4.99999 4.99998 5.00004 5.00013 5.00015 5.00007 4.99988 
-    4.99982 4.99985 4.99995 5.00006 5.0002 5.00025 5.0002 5.00009 
-    5.00006 5.00004 5.00002 5 4.99998 4.99997 4.99998 4.99998 
-    4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
-    4.99998 4.99998 4.99998 
+    1.86175 1.73419 1.42874 1.04055 0.943004 0.268275 0.0826455
+    0.0388346 0.0214104 0.0135431 0.00961322 0.00712846 0.00588262
+    0.00432397 0.00377774 0.00270134 -0.00393731 -0.00542187
+    -0.00126596 0.0113777 0.0134522 0.00477056 -0.00211067 -0.00229253
+    -0.00173355 -0.00122404 -0.00113426 -0.000744931 -0.000520112
+    -0.000410048 -0.000220439 0.000508104 5.15856e-05 -0.000112593
+    -0.000118917 -9.57394e-05 -7.15727e-05 -5.11847e-05 -3.58275e-05
+    -2.47166e-05 -1.68866e-05 -1.14082e-05 -7.66646e-06 -5.12139e-06
+    -3.63426e-06 -3.01815e-06 -2.64862e-06 -1.4947e-06 -1.91403e-07
+    -2.5763e-08 -7.73699e-07 -1.52164e-06 -1.07268e-06 -3.81696e-07
+    2.6727e-07 4.75489e-07 6.83708e-07 8.91926e-07 1.10014e-06
+    1.30836e-06 1.2482e-06 1.00726e-06 7.66311e-07 5.25364e-07
+    2.84417e-07 6.27857e-08 7.43904e-10 -6.12979e-08 -1.2334e-07
+    -1.85382e-07 -2.47423e-07 -3.09465e-07 -3.71507e-07 -4.33549e-07
+    -4.95591e-07 -5.57633e-07 -6.04571e-07 -5.4944e-07 -4.9431e-07
+    -4.3918e-07 -3.84049e-07 -3.28919e-07 -2.73789e-07 -2.18659e-07
+    -1.63528e-07 -1.08398e-07 -5.32678e-08 1.062e-09 5.08502e-08
+    1.00638e-07 1.50427e-07 2.00215e-07 2.50003e-07 2.99791e-07
+    3.4958e-07 3.99368e-07 4.49156e-07 4.98944e-07 5.34512e-07
+    5.01032e-07 4.67553e-07 4.34073e-07 4.00593e-07 3.67113e-07
+    3.33633e-07 3.00153e-07 2.66674e-07 2.33194e-07 1.99714e-07
+    1.66234e-07 1.32754e-07 9.92744e-08 6.57945e-08 3.23147e-08
+    -1.16513e-09 -3.4645e-08 -6.81248e-08 -1.01605e-07 -1.35084e-07
+    -1.68564e-07 -2.18729e-07 0.0114926 -0.0245378 -0.111828
+    0.0964775 1.61491 3.22668 4.22041 4.54492 4.82845 4.94868
+    4.98588 4.99609 4.9981 4.99908 4.99788 4.98395 4.99294 4.99724
+    5.01939 5.0471 5.00902 4.98194 4.98496 4.99188 4.99623 4.99862
+    5.00025 4.99974 4.99953 4.99946 4.99958 5.00012 4.99997
+    4.99992 4.99988 4.99985 4.9998 4.9997 4.9988 4.99806 4.99982
+    5.00143 5.00159 5.00098 5.00053 5.00028 5.00007 4.99977
+    4.99992 5.00005 5.00133 5.0009 4.99993 4.99972 4.99975 4.9998
+    4.99982 4.99983 4.99983 4.99983 4.99983 4.99984 4.99986
+    4.99987 4.99989 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99998
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    5 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
+    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 5 5 5.01457 4.99482 4.96561 4.99326
+    5.03452 5.00424 5.00101 5.00045 5.00004 4.99965 4.99997
+    4.99994 4.99958 4.99999 4.99936 4.9839 4.99248 4.99717 5.01976
+    5.04869 5.0087 4.98143 4.98488 4.99199 4.99622 4.9983 4.99928
+    4.99971 4.99986 5.00031 5.00022 5.00035 5.0001 4.99884 4.99811
+    4.99803 4.99887 5.00078 5.00151 5.00116 5.00007 4.99843
+    4.99915 5.00107 5.00168 5.00141 5.00092 5.00055 5.0003 5.00016
+    5.0001 5.00001 5.00016 5.0002 5.00009 4.99993 4.99975 4.99984
+    4.99991 4.99991 4.99982 4.99974 4.99974 4.99985 4.99995
+    4.99999 4.99998 5.00004 5.00013 5.00015 5.00007 4.99988
+    4.99982 4.99985 4.99995 5.00006 5.0002 5.00025 5.0002 5.00009
+    5.00006 5.00004 5.00002 5 4.99998 4.99997 4.99998 4.99998
+    4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+    4.99998 4.99998 4.99998
     EOD
 
     @v[12].set(<<-'EOD')
-    5 5.16975 4.78685 2.94241 0.126698 0.0487004 -0.00422591 
-    -0.00130689 -0.000486756 -0.000195875 -0.000108988 -6.66736e-05 
-    -7.26005e-05 -5.63608e-05 -3.81859e-05 -2.123e-05 -0.0646846 
-    -0.0184474 0.182248 1.06731 3.10988 4.46133 4.84133 4.95113 
-    4.98364 4.99455 4.99694 4.99727 4.9994 4.99975 5.0001 5.00132 
-    5.00089 5.00039 5.00019 5.00011 5.00006 5.00005 5.00004 
-    5.00001 4.99992 4.99992 5.00002 5.00013 5.00017 5.00009 
-    4.99992 4.99991 4.99994 4.99996 4.99998 4.99999 5.00001 
-    5.00004 5.00006 5.00005 5.00004 5.00003 5.00002 5.00001 
-    5 4.99999 4.99999 4.99998 4.99998 4.99997 4.99997 4.99998 
-    4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 
-    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5.14699 4.78074 
-    3.19424 0.305663 0.0611255 -0.00179951 -0.0012032 0.000405978 
-    0.000989399 0.000445194 0.000191447 8.30476e-05 3.96236e-05 
-    1.91866e-05 1.70665e-05 -0.0655239 -0.0210234 0.1827 1.06848 
-    3.11554 4.46518 4.84212 4.94853 4.98244 4.99434 4.9997 5.00081 
-    5.00009 4.99972 4.99985 4.99974 4.9995 4.99949 4.99958 4.99973 
-    4.99948 4.99914 4.99874 4.99946 5.00309 5.0091 5.01576 5.01835 
-    5.01852 5.0176 5.01625 5.01479 5.01345 5.01264 5.011 5.01092 
-    5.01344 5.01363 5.01289 5.01184 5.01071 5.00956 5.00848 
-    5.00751 5.00663 5.00577 5.00497 5.00427 5.00365 5.0031 5.00264 
-    5.00224 5.00191 5.00163 5.00138 5.00117 5.00099 5.00083 
-    5.00071 5.00061 5.00053 5.00045 5.00037 5.00029 5.00022 
-    5.00019 5.0002 5.00023 5.00024 5.00023 5.00023 5.00022 5.0002 
-    5.00018 5.00016 5.00014 5.00011 5.00009 5.00007 5.00006 
-    5.00005 5.00005 5.00004 5.00003 5.00002 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 
-    5.00002 5.00001 5.00001 5.00001 5.14298 4.79809 3.32704 
-    0.498385 0.105773 0.0160646 0.0319912 0.0299434 0.0240102 
-    0.0185844 0.0130411 0.0106532 0.00864871 0.00744519 0.00660887 
-    -0.0612913 -0.0203719 0.174998 0.991787 3.06292 4.60005 
-    4.93058 4.98917 5.00033 4.9999 4.99909 4.9966 4.9955 4.99488 
-    4.99374 4.9943 5.00131 5.00506 4.99311 4.96288 4.93567 4.92439 
-    4.94236 4.9732 4.98864 4.99458 5.00031 5.00694 5.01525 5.01945 
-    5.01998 5.01953 5.01874 5.01766 5.0164 5.01509 5.01326 5.01423 
-    5.01455 5.01361 5.01245 5.01122 5.01002 5.00888 5.00783 
-    5.00687 5.00596 5.00514 5.00442 5.00379 5.00325 5.00279 
-    5.0024 5.00208 5.0018 5.00153 5.00126 5.00107 5.00094 5.00085 
-    5.00078 5.00072 5.00063 5.00053 5.00042 5.00038 5.00034 
-    5.0003 5.00027 5.00023 5.00021 5.00019 5.00017 5.00015 5.00013 
-    5.00012 5.00011 5.0001 5.0001 5.00009 5.00008 5.00007 5.00007 
-    5.00006 5.00005 5.00005 5.00004 5.00004 5.00003 5.00003 
-    5.00002 5.00002 5.00002 5.00001 5.00001 5 5 5 5.00001 5.00001 
-    5.00001 5.00002 5.00002 5.00002 5.00002 
+    5 5.16975 4.78685 2.94241 0.126698 0.0487004 -0.00422591
+    -0.00130689 -0.000486756 -0.000195875 -0.000108988 -6.66736e-05
+    -7.26005e-05 -5.63608e-05 -3.81859e-05 -2.123e-05 -0.0646846
+    -0.0184474 0.182248 1.06731 3.10988 4.46133 4.84133 4.95113
+    4.98364 4.99455 4.99694 4.99727 4.9994 4.99975 5.0001 5.00132
+    5.00089 5.00039 5.00019 5.00011 5.00006 5.00005 5.00004
+    5.00001 4.99992 4.99992 5.00002 5.00013 5.00017 5.00009
+    4.99992 4.99991 4.99994 4.99996 4.99998 4.99999 5.00001
+    5.00004 5.00006 5.00005 5.00004 5.00003 5.00002 5.00001
+    5 4.99999 4.99999 4.99998 4.99998 4.99997 4.99997 4.99998
+    4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999
+    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5.14699 4.78074
+    3.19424 0.305663 0.0611255 -0.00179951 -0.0012032 0.000405978
+    0.000989399 0.000445194 0.000191447 8.30476e-05 3.96236e-05
+    1.91866e-05 1.70665e-05 -0.0655239 -0.0210234 0.1827 1.06848
+    3.11554 4.46518 4.84212 4.94853 4.98244 4.99434 4.9997 5.00081
+    5.00009 4.99972 4.99985 4.99974 4.9995 4.99949 4.99958 4.99973
+    4.99948 4.99914 4.99874 4.99946 5.00309 5.0091 5.01576 5.01835
+    5.01852 5.0176 5.01625 5.01479 5.01345 5.01264 5.011 5.01092
+    5.01344 5.01363 5.01289 5.01184 5.01071 5.00956 5.00848
+    5.00751 5.00663 5.00577 5.00497 5.00427 5.00365 5.0031 5.00264
+    5.00224 5.00191 5.00163 5.00138 5.00117 5.00099 5.00083
+    5.00071 5.00061 5.00053 5.00045 5.00037 5.00029 5.00022
+    5.00019 5.0002 5.00023 5.00024 5.00023 5.00023 5.00022 5.0002
+    5.00018 5.00016 5.00014 5.00011 5.00009 5.00007 5.00006
+    5.00005 5.00005 5.00004 5.00003 5.00002 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
+    5.00002 5.00001 5.00001 5.00001 5.14298 4.79809 3.32704
+    0.498385 0.105773 0.0160646 0.0319912 0.0299434 0.0240102
+    0.0185844 0.0130411 0.0106532 0.00864871 0.00744519 0.00660887
+    -0.0612913 -0.0203719 0.174998 0.991787 3.06292 4.60005
+    4.93058 4.98917 5.00033 4.9999 4.99909 4.9966 4.9955 4.99488
+    4.99374 4.9943 5.00131 5.00506 4.99311 4.96288 4.93567 4.92439
+    4.94236 4.9732 4.98864 4.99458 5.00031 5.00694 5.01525 5.01945
+    5.01998 5.01953 5.01874 5.01766 5.0164 5.01509 5.01326 5.01423
+    5.01455 5.01361 5.01245 5.01122 5.01002 5.00888 5.00783
+    5.00687 5.00596 5.00514 5.00442 5.00379 5.00325 5.00279
+    5.0024 5.00208 5.0018 5.00153 5.00126 5.00107 5.00094 5.00085
+    5.00078 5.00072 5.00063 5.00053 5.00042 5.00038 5.00034
+    5.0003 5.00027 5.00023 5.00021 5.00019 5.00017 5.00015 5.00013
+    5.00012 5.00011 5.0001 5.0001 5.00009 5.00008 5.00007 5.00007
+    5.00006 5.00005 5.00005 5.00004 5.00004 5.00003 5.00003
+    5.00002 5.00002 5.00002 5.00001 5.00001 5 5 5 5.00001 5.00001
+    5.00001 5.00002 5.00002 5.00002 5.00002
     EOD
 
     @v[13].set(<<-'EOD')
-    9.73784e-10 0.0189926 0.0926769 0.206309 0.111533 0.0953491 
-    0.0426966 0.0214177 0.0117943 0.00741442 0.00528816 0.00398417 
-    0.0032967 0.00266499 0.00206647 0.00158788 -0.0371391 -0.0439528 
-    -0.0408653 -0.0188706 0.0150241 0.0126852 0.00209817 -0.000239206 
-    -5.31488e-05 0.000876324 -0.00451221 -0.0165223 -0.0284127 
-    -0.0427584 -0.0502453 -0.0257366 -0.00903938 -0.00376456 
-    -0.00233385 -0.00169922 -0.00130397 -0.00102542 -0.000811435 
-    -0.000648115 -0.000529266 -0.00043795 -0.00036574 -0.00030716 
-    -0.00026221 -0.000229662 -0.000205112 -0.000181038 -0.000162045 
-    -0.000148988 -0.000137633 -0.000126278 -0.000115562 -0.000104976 
-    -9.49324e-05 -9.0585e-05 -8.62375e-05 -8.18901e-05 -7.75426e-05 
-    -7.31952e-05 -6.93752e-05 -6.59106e-05 -6.24461e-05 -5.89815e-05 
-    -5.55169e-05 -5.22412e-05 -5.05263e-05 -4.88114e-05 -4.70966e-05 
-    -4.53817e-05 -4.36668e-05 -4.19519e-05 -4.0237e-05 -3.85222e-05 
-    -3.68073e-05 -3.50924e-05 -3.34782e-05 -3.25442e-05 -3.16102e-05 
-    -3.06763e-05 -2.97423e-05 -2.88083e-05 -2.78744e-05 -2.69404e-05 
-    -2.60064e-05 -2.50725e-05 -2.41385e-05 -2.32635e-05 -2.27232e-05 
-    -2.21829e-05 -2.16426e-05 -2.11023e-05 -2.0562e-05 -2.00217e-05 
-    -1.94814e-05 -1.89411e-05 -1.84007e-05 -1.78604e-05 -1.73647e-05 
-    -1.70853e-05 -1.68059e-05 -1.65265e-05 -1.62471e-05 -1.59677e-05 
-    -1.56883e-05 -1.54089e-05 -1.51295e-05 -1.48501e-05 -1.45707e-05 
-    -1.42913e-05 -1.40119e-05 -1.37325e-05 -1.34531e-05 -1.31737e-05 
-    -1.28943e-05 -1.26149e-05 -1.23355e-05 -1.20561e-05 -1.17767e-05 
-    -1.14973e-05 -1.10954e-05 0.0152675 0.0228237 -0.00460678 
-    -0.0341525 0.0232109 -0.0138039 -0.0416538 -0.0458764 -0.0201967 
-    -0.00878316 -0.00379173 -0.00164621 -0.000785131 -0.00037575 
-    -0.000352375 -0.0545586 -0.0746881 -0.0771865 -0.05386 -0.0022199 
-    0.0136703 0.00633526 0.00138826 -0.00108934 0.0038886 0.0298077 
-    0.0475776 0.0481003 0.0464167 0.047818 0.042789 0.035207 
-    0.0264423 0.0193959 0.0151614 0.00624257 -0.00913057 -0.0310696 
-    -0.0430238 0.016426 0.189762 0.49025 0.820116 1.13919 1.43549 
-    1.70658 1.95183 2.17414 2.38506 2.5657 2.73958 2.97905 3.21403 
-    3.43025 3.62645 3.8028 3.96002 4.09996 4.22443 4.33427 4.42886 
-    4.51097 4.5817 4.64326 4.6957 4.74132 4.7797 4.81298 4.84102 
-    4.86512 4.88523 4.90224 4.91649 4.92846 4.93868 4.94755 
-    4.95483 4.96114 4.96682 4.97161 4.97502 4.9776 4.97944 4.98141 
-    4.98319 4.98467 4.98585 4.9869 4.98796 4.98902 4.99008 4.99114 
-    4.9922 4.99326 4.9938 4.99429 4.99479 4.99528 4.99578 4.99628 
-    4.99677 4.99704 4.99718 4.99733 4.99747 4.99762 4.99777 
-    4.99791 4.99806 4.9982 4.99835 4.9985 4.99864 4.99879 4.99893 
-    4.99907 4.99916 4.99925 4.99934 4.99943 5.01473 4.92293 
-    4.61974 4.0316 3.7835 3.74195 3.78344 3.87272 3.97386 4.07319 
-    4.16686 4.25256 4.33126 4.40264 4.46697 4.49249 4.51807 
-    4.55803 4.64055 4.78574 4.86074 4.88334 4.8999 4.91455 4.92814 
-    4.93926 4.94761 4.95433 4.95907 4.9654 4.98317 5.0208 5.05134 
-    4.85852 4.16041 3.00077 1.68376 0.672707 0.240838 0.0794725 
-    -0.0106347 -0.00879443 0.107196 0.368163 0.701424 1.03581 
-    1.3601 1.6678 1.95731 2.22701 2.47544 2.69099 2.92327 3.16648 
-    3.3877 3.59067 3.77344 3.93584 4.08066 4.20863 4.32065 4.41791 
-    4.50211 4.57423 4.63614 4.68888 4.73377 4.7721 4.80519 4.83338 
-    4.85732 4.87815 4.89514 4.90927 4.92108 4.93122 4.94014 
-    4.94845 4.95601 4.96251 4.96576 4.969 4.97225 4.9755 4.97874 
-    4.98087 4.98265 4.98442 4.9862 4.98797 4.98924 4.9899 4.99055 
-    4.9912 4.99186 4.99251 4.99316 4.99381 4.99447 4.99512 4.99577 
-    4.99609 4.99634 4.99659 4.99683 4.99708 4.99732 4.99757 
-    4.99782 4.99806 4.99831 4.99853 4.99863 4.99873 4.99883 
-    4.99893 4.99903 4.99913 4.99923 4.99933 
+    9.73784e-10 0.0189926 0.0926769 0.206309 0.111533 0.0953491
+    0.0426966 0.0214177 0.0117943 0.00741442 0.00528816 0.00398417
+    0.0032967 0.00266499 0.00206647 0.00158788 -0.0371391 -0.0439528
+    -0.0408653 -0.0188706 0.0150241 0.0126852 0.00209817 -0.000239206
+    -5.31488e-05 0.000876324 -0.00451221 -0.0165223 -0.0284127
+    -0.0427584 -0.0502453 -0.0257366 -0.00903938 -0.00376456
+    -0.00233385 -0.00169922 -0.00130397 -0.00102542 -0.000811435
+    -0.000648115 -0.000529266 -0.00043795 -0.00036574 -0.00030716
+    -0.00026221 -0.000229662 -0.000205112 -0.000181038 -0.000162045
+    -0.000148988 -0.000137633 -0.000126278 -0.000115562 -0.000104976
+    -9.49324e-05 -9.0585e-05 -8.62375e-05 -8.18901e-05 -7.75426e-05
+    -7.31952e-05 -6.93752e-05 -6.59106e-05 -6.24461e-05 -5.89815e-05
+    -5.55169e-05 -5.22412e-05 -5.05263e-05 -4.88114e-05 -4.70966e-05
+    -4.53817e-05 -4.36668e-05 -4.19519e-05 -4.0237e-05 -3.85222e-05
+    -3.68073e-05 -3.50924e-05 -3.34782e-05 -3.25442e-05 -3.16102e-05
+    -3.06763e-05 -2.97423e-05 -2.88083e-05 -2.78744e-05 -2.69404e-05
+    -2.60064e-05 -2.50725e-05 -2.41385e-05 -2.32635e-05 -2.27232e-05
+    -2.21829e-05 -2.16426e-05 -2.11023e-05 -2.0562e-05 -2.00217e-05
+    -1.94814e-05 -1.89411e-05 -1.84007e-05 -1.78604e-05 -1.73647e-05
+    -1.70853e-05 -1.68059e-05 -1.65265e-05 -1.62471e-05 -1.59677e-05
+    -1.56883e-05 -1.54089e-05 -1.51295e-05 -1.48501e-05 -1.45707e-05
+    -1.42913e-05 -1.40119e-05 -1.37325e-05 -1.34531e-05 -1.31737e-05
+    -1.28943e-05 -1.26149e-05 -1.23355e-05 -1.20561e-05 -1.17767e-05
+    -1.14973e-05 -1.10954e-05 0.0152675 0.0228237 -0.00460678
+    -0.0341525 0.0232109 -0.0138039 -0.0416538 -0.0458764 -0.0201967
+    -0.00878316 -0.00379173 -0.00164621 -0.000785131 -0.00037575
+    -0.000352375 -0.0545586 -0.0746881 -0.0771865 -0.05386 -0.0022199
+    0.0136703 0.00633526 0.00138826 -0.00108934 0.0038886 0.0298077
+    0.0475776 0.0481003 0.0464167 0.047818 0.042789 0.035207
+    0.0264423 0.0193959 0.0151614 0.00624257 -0.00913057 -0.0310696
+    -0.0430238 0.016426 0.189762 0.49025 0.820116 1.13919 1.43549
+    1.70658 1.95183 2.17414 2.38506 2.5657 2.73958 2.97905 3.21403
+    3.43025 3.62645 3.8028 3.96002 4.09996 4.22443 4.33427 4.42886
+    4.51097 4.5817 4.64326 4.6957 4.74132 4.7797 4.81298 4.84102
+    4.86512 4.88523 4.90224 4.91649 4.92846 4.93868 4.94755
+    4.95483 4.96114 4.96682 4.97161 4.97502 4.9776 4.97944 4.98141
+    4.98319 4.98467 4.98585 4.9869 4.98796 4.98902 4.99008 4.99114
+    4.9922 4.99326 4.9938 4.99429 4.99479 4.99528 4.99578 4.99628
+    4.99677 4.99704 4.99718 4.99733 4.99747 4.99762 4.99777
+    4.99791 4.99806 4.9982 4.99835 4.9985 4.99864 4.99879 4.99893
+    4.99907 4.99916 4.99925 4.99934 4.99943 5.01473 4.92293
+    4.61974 4.0316 3.7835 3.74195 3.78344 3.87272 3.97386 4.07319
+    4.16686 4.25256 4.33126 4.40264 4.46697 4.49249 4.51807
+    4.55803 4.64055 4.78574 4.86074 4.88334 4.8999 4.91455 4.92814
+    4.93926 4.94761 4.95433 4.95907 4.9654 4.98317 5.0208 5.05134
+    4.85852 4.16041 3.00077 1.68376 0.672707 0.240838 0.0794725
+    -0.0106347 -0.00879443 0.107196 0.368163 0.701424 1.03581
+    1.3601 1.6678 1.95731 2.22701 2.47544 2.69099 2.92327 3.16648
+    3.3877 3.59067 3.77344 3.93584 4.08066 4.20863 4.32065 4.41791
+    4.50211 4.57423 4.63614 4.68888 4.73377 4.7721 4.80519 4.83338
+    4.85732 4.87815 4.89514 4.90927 4.92108 4.93122 4.94014
+    4.94845 4.95601 4.96251 4.96576 4.969 4.97225 4.9755 4.97874
+    4.98087 4.98265 4.98442 4.9862 4.98797 4.98924 4.9899 4.99055
+    4.9912 4.99186 4.99251 4.99316 4.99381 4.99447 4.99512 4.99577
+    4.99609 4.99634 4.99659 4.99683 4.99708 4.99732 4.99757
+    4.99782 4.99806 4.99831 4.99853 4.99863 4.99873 4.99883
+    4.99893 4.99903 4.99913 4.99923 4.99933
     EOD
 
     @v[14].set(<<-'EOD')
-    1.86175 2.00147 1.85141 1.0654 0.275481 0.205547 0.0712627 
-    0.0313387 0.0151431 0.00864531 0.00593861 0.00438111 0.0037479 
-    0.00305857 0.00221221 0.0017081 -0.0896128 -0.109079 -0.121356 
-    -0.0542001 0.175821 0.177442 0.0814591 0.0333042 0.0134909 
-    0.00625777 0.00100092 -0.00552776 -0.00411139 -0.00150395 
-    -0.000564784 3.48169e-05 -0.000287014 -0.000538515 -0.000456537 
-    -0.000325677 -0.000275468 -0.000166452 -8.27481e-05 -8.28704e-05 
-    -7.47644e-05 -4.60552e-05 -2.61481e-06 2.26359e-05 2.53852e-05 
-    -1.39853e-06 -4.23456e-05 -4.0907e-05 -2.8501e-05 -1.5945e-05 
-    -9.01122e-06 -2.07747e-06 1.49328e-06 4.38398e-06 6.84248e-06 
-    4.76711e-06 2.69173e-06 6.16362e-07 -1.45901e-06 -3.53438e-06 
-    -4.14256e-06 -3.76238e-06 -3.3822e-06 -3.00202e-06 -2.62184e-06 
-    -2.24878e-06 -1.93456e-06 -1.62033e-06 -1.3061e-06 -9.91867e-07 
-    -6.77638e-07 -3.63409e-07 -4.91792e-08 2.6505e-07 5.7928e-07 
-    8.93509e-07 1.16076e-06 1.11055e-06 1.06034e-06 1.01014e-06 
-    9.59927e-07 9.09719e-07 8.59511e-07 8.09302e-07 7.59094e-07 
-    7.08886e-07 6.58678e-07 5.99251e-07 4.87523e-07 3.75795e-07 
-    2.64068e-07 1.5234e-07 4.06119e-08 -7.1116e-08 -1.82844e-07 
-    -2.94572e-07 -4.063e-07 -5.18027e-07 -6.08517e-07 -5.95879e-07 
-    -5.83241e-07 -5.70604e-07 -5.57966e-07 -5.45328e-07 -5.3269e-07 
-    -5.20053e-07 -5.07415e-07 -4.94777e-07 -4.8214e-07 -4.69502e-07 
-    -4.56864e-07 -4.44226e-07 -4.31589e-07 -4.18951e-07 -4.06313e-07 
-    -3.93676e-07 -3.81038e-07 -3.684e-07 -3.55762e-07 -3.43125e-07 
-    1.06736e-05 0.0797407 0.0437947 -0.0645098 -0.0877312 0.0653203 
-    -0.00621184 -0.0353188 -0.0491378 -0.0251957 -0.0110996 
-    -0.00481123 -0.0020941 -0.000998038 -0.000478747 -0.000445332 
-    -0.102046 -0.135753 -0.154351 -0.0827509 0.163348 0.174012 
-    0.0794822 0.0310624 0.0112213 0.00249061 0.00130764 0.00181315 
-    0.00163875 0.00101454 0.000497435 0.000195258 5.31901e-05 
-    2.4607e-05 6.62736e-05 7.90718e-05 4.0372e-05 -0.000141184 
-    -0.000280623 5.5608e-05 0.000799565 0.000920189 0.000931616 
-    0.000494527 0.000162303 -8.24884e-05 -0.000183938 -0.000203899 
-    -0.000144788 -9.87063e-05 -0.000227929 2.93932e-05 0.000208563 
-    1.88958e-06 -7.6335e-05 -0.000172472 -0.000165656 -0.000145889 
-    -0.000177311 -0.000191058 -0.000168287 -0.00015755 -0.00013142 
-    -8.10488e-05 -6.36115e-05 -7.8699e-05 -8.11282e-05 -7.98625e-05 
-    -5.98807e-05 -3.40879e-05 -1.95464e-05 -1.79247e-05 -4.45514e-05 
-    -7.47995e-05 -8.7682e-05 -7.50806e-05 -3.25561e-05 -4.34114e-05 
-    -7.69099e-05 -0.000141101 -0.00018743 -0.000148471 -5.06546e-05 
-    0.000120195 0.000177635 0.000177052 0.000146344 9.75126e-05 
-    8.31233e-05 6.8734e-05 5.43447e-05 3.99554e-05 2.55661e-05 
-    1.11768e-05 -3.21253e-06 -3.88937e-06 -3.56628e-06 -3.24318e-06 
-    -2.92008e-06 -2.59699e-06 -2.27389e-06 -1.9508e-06 -1.73227e-06 
-    -1.56796e-06 -1.40365e-06 -1.23934e-06 -1.07503e-06 -9.10722e-07 
-    -7.46412e-07 -5.82101e-07 -4.1779e-07 -2.5348e-07 -8.91694e-08 
-    7.51412e-08 2.39452e-07 4.03762e-07 5.95733e-07 1.00771e-06 
-    1.41969e-06 1.83167e-06 2.24365e-06 0.0828257 0.231038 0.465438 
-    1.54516 2.8461 3.19221 3.40395 3.6382 3.80758 3.93848 4.04882 
-    4.15428 4.247 4.32917 4.40235 4.36941 4.397 4.48862 4.64552 
-    4.86595 5.03475 5.0348 5.02627 5.01967 5.01542 5.00925 4.98613 
-    4.9519 4.91581 4.87357 4.82302 4.80403 4.82565 4.86102 4.89483 
-    4.92253 4.94428 4.96257 4.97608 4.98373 4.98823 4.99182 
-    4.99437 4.99635 4.99745 4.99802 4.99843 4.99873 4.99895 
-    4.99912 4.99925 4.99931 4.99962 4.99973 4.99972 4.99971 
-    4.9997 4.99969 4.9997 4.99971 4.99973 4.99974 4.99976 4.99978 
-    4.9998 4.99982 4.99985 4.99987 4.99989 4.9999 4.99991 4.99991 
-    4.99993 4.99994 4.99997 5.00001 5.00006 5.00008 5.00006 
-    5.00002 5 4.99999 4.99998 4.99997 4.99995 4.99995 4.99995 
-    4.99995 4.99995 4.99995 4.99995 4.99996 4.99997 4.99997 
-    4.99998 4.99999 5 5 5.00001 5.00002 5.00002 5.00002 5.00002 
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999 
+    1.86175 2.00147 1.85141 1.0654 0.275481 0.205547 0.0712627
+    0.0313387 0.0151431 0.00864531 0.00593861 0.00438111 0.0037479
+    0.00305857 0.00221221 0.0017081 -0.0896128 -0.109079 -0.121356
+    -0.0542001 0.175821 0.177442 0.0814591 0.0333042 0.0134909
+    0.00625777 0.00100092 -0.00552776 -0.00411139 -0.00150395
+    -0.000564784 3.48169e-05 -0.000287014 -0.000538515 -0.000456537
+    -0.000325677 -0.000275468 -0.000166452 -8.27481e-05 -8.28704e-05
+    -7.47644e-05 -4.60552e-05 -2.61481e-06 2.26359e-05 2.53852e-05
+    -1.39853e-06 -4.23456e-05 -4.0907e-05 -2.8501e-05 -1.5945e-05
+    -9.01122e-06 -2.07747e-06 1.49328e-06 4.38398e-06 6.84248e-06
+    4.76711e-06 2.69173e-06 6.16362e-07 -1.45901e-06 -3.53438e-06
+    -4.14256e-06 -3.76238e-06 -3.3822e-06 -3.00202e-06 -2.62184e-06
+    -2.24878e-06 -1.93456e-06 -1.62033e-06 -1.3061e-06 -9.91867e-07
+    -6.77638e-07 -3.63409e-07 -4.91792e-08 2.6505e-07 5.7928e-07
+    8.93509e-07 1.16076e-06 1.11055e-06 1.06034e-06 1.01014e-06
+    9.59927e-07 9.09719e-07 8.59511e-07 8.09302e-07 7.59094e-07
+    7.08886e-07 6.58678e-07 5.99251e-07 4.87523e-07 3.75795e-07
+    2.64068e-07 1.5234e-07 4.06119e-08 -7.1116e-08 -1.82844e-07
+    -2.94572e-07 -4.063e-07 -5.18027e-07 -6.08517e-07 -5.95879e-07
+    -5.83241e-07 -5.70604e-07 -5.57966e-07 -5.45328e-07 -5.3269e-07
+    -5.20053e-07 -5.07415e-07 -4.94777e-07 -4.8214e-07 -4.69502e-07
+    -4.56864e-07 -4.44226e-07 -4.31589e-07 -4.18951e-07 -4.06313e-07
+    -3.93676e-07 -3.81038e-07 -3.684e-07 -3.55762e-07 -3.43125e-07
+    1.06736e-05 0.0797407 0.0437947 -0.0645098 -0.0877312 0.0653203
+    -0.00621184 -0.0353188 -0.0491378 -0.0251957 -0.0110996
+    -0.00481123 -0.0020941 -0.000998038 -0.000478747 -0.000445332
+    -0.102046 -0.135753 -0.154351 -0.0827509 0.163348 0.174012
+    0.0794822 0.0310624 0.0112213 0.00249061 0.00130764 0.00181315
+    0.00163875 0.00101454 0.000497435 0.000195258 5.31901e-05
+    2.4607e-05 6.62736e-05 7.90718e-05 4.0372e-05 -0.000141184
+    -0.000280623 5.5608e-05 0.000799565 0.000920189 0.000931616
+    0.000494527 0.000162303 -8.24884e-05 -0.000183938 -0.000203899
+    -0.000144788 -9.87063e-05 -0.000227929 2.93932e-05 0.000208563
+    1.88958e-06 -7.6335e-05 -0.000172472 -0.000165656 -0.000145889
+    -0.000177311 -0.000191058 -0.000168287 -0.00015755 -0.00013142
+    -8.10488e-05 -6.36115e-05 -7.8699e-05 -8.11282e-05 -7.98625e-05
+    -5.98807e-05 -3.40879e-05 -1.95464e-05 -1.79247e-05 -4.45514e-05
+    -7.47995e-05 -8.7682e-05 -7.50806e-05 -3.25561e-05 -4.34114e-05
+    -7.69099e-05 -0.000141101 -0.00018743 -0.000148471 -5.06546e-05
+    0.000120195 0.000177635 0.000177052 0.000146344 9.75126e-05
+    8.31233e-05 6.8734e-05 5.43447e-05 3.99554e-05 2.55661e-05
+    1.11768e-05 -3.21253e-06 -3.88937e-06 -3.56628e-06 -3.24318e-06
+    -2.92008e-06 -2.59699e-06 -2.27389e-06 -1.9508e-06 -1.73227e-06
+    -1.56796e-06 -1.40365e-06 -1.23934e-06 -1.07503e-06 -9.10722e-07
+    -7.46412e-07 -5.82101e-07 -4.1779e-07 -2.5348e-07 -8.91694e-08
+    7.51412e-08 2.39452e-07 4.03762e-07 5.95733e-07 1.00771e-06
+    1.41969e-06 1.83167e-06 2.24365e-06 0.0828257 0.231038 0.465438
+    1.54516 2.8461 3.19221 3.40395 3.6382 3.80758 3.93848 4.04882
+    4.15428 4.247 4.32917 4.40235 4.36941 4.397 4.48862 4.64552
+    4.86595 5.03475 5.0348 5.02627 5.01967 5.01542 5.00925 4.98613
+    4.9519 4.91581 4.87357 4.82302 4.80403 4.82565 4.86102 4.89483
+    4.92253 4.94428 4.96257 4.97608 4.98373 4.98823 4.99182
+    4.99437 4.99635 4.99745 4.99802 4.99843 4.99873 4.99895
+    4.99912 4.99925 4.99931 4.99962 4.99973 4.99972 4.99971
+    4.9997 4.99969 4.9997 4.99971 4.99973 4.99974 4.99976 4.99978
+    4.9998 4.99982 4.99985 4.99987 4.99989 4.9999 4.99991 4.99991
+    4.99993 4.99994 4.99997 5.00001 5.00006 5.00008 5.00006
+    5.00002 5 4.99999 4.99998 4.99997 4.99995 4.99995 4.99995
+    4.99995 4.99995 4.99995 4.99995 4.99996 4.99997 4.99997
+    4.99998 4.99999 5 5 5.00001 5.00002 5.00002 5.00002 5.00002
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
+    5.00001 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
     EOD
 
     @v[15].set(<<-'EOD')
-    1.86175 2.00199 2.08919 1.84314 1.08254 0.214737 0.0377351 
-    0.00952455 0.00232763 0.000563614 0.000263477 0.000148642 
-    0.000285086 0.000242592 7.34699e-05 -1.53467e-05 -0.0161874 
-    -0.0157876 -0.0141194 0.0132576 0.0903272 0.109938 0.0535295 
-    0.0224216 0.00940945 0.00466825 -0.000649972 -0.00654752 
-    -0.00333248 -0.00103671 -0.000508276 -5.8896e-05 -0.00043938 
-    -0.000544704 -0.00044444 -0.000307093 -0.00024517 -0.000154538 
-    -8.78602e-05 -7.10461e-05 -6.06485e-05 -3.91039e-05 -8.45988e-06 
-    9.43442e-06 1.28351e-05 -2.16734e-06 -2.6142e-05 -2.54768e-05 
-    -1.88997e-05 -1.17906e-05 -7.3808e-06 -2.97101e-06 1.19146e-07 
-    2.94246e-06 5.38942e-06 3.88851e-06 2.38761e-06 8.86704e-07 
-    -6.14201e-07 -2.11511e-06 -2.59565e-06 -2.38885e-06 -2.18205e-06 
-    -1.97525e-06 -1.76845e-06 -1.56241e-06 -1.36258e-06 -1.16276e-06 
-    -9.62939e-07 -7.63116e-07 -5.63293e-07 -3.6347e-07 -1.63647e-07 
-    3.61756e-08 2.35999e-07 4.35822e-07 6.07653e-07 5.90323e-07 
-    5.72994e-07 5.55665e-07 5.38336e-07 5.21007e-07 5.03678e-07 
-    4.86349e-07 4.6902e-07 4.51691e-07 4.34361e-07 4.11899e-07 
-    3.60315e-07 3.08731e-07 2.57146e-07 2.05562e-07 1.53977e-07 
-    1.02393e-07 5.08082e-08 -7.76222e-10 -5.23607e-08 -1.03945e-07 
-    -1.47815e-07 -1.54225e-07 -1.60635e-07 -1.67045e-07 -1.73455e-07 
-    -1.79864e-07 -1.86274e-07 -1.92684e-07 -1.99094e-07 -2.05504e-07 
-    -2.11914e-07 -2.18324e-07 -2.24734e-07 -2.31144e-07 -2.37554e-07 
-    -2.43964e-07 -2.50373e-07 -2.56783e-07 -2.63193e-07 -2.69603e-07 
-    -2.76013e-07 -2.82423e-07 2.92534e-06 0.0446777 0.024278 
-    -0.0518987 -0.0636547 0.00983929 -0.000518204 -0.000265194 
-    0.000154772 0.000299538 3.12715e-05 -3.18225e-05 -2.48268e-05 
-    -1.16701e-05 -6.05117e-06 7.61116e-06 -0.0163668 -0.0158244 
-    -0.0141177 0.0100085 0.0857144 0.107784 0.051862 0.0204448 
-    0.00629858 0.000967736 0.00121674 0.00190276 0.00154009 
-    0.000860922 0.000410386 0.000164585 3.99493e-05 1.93797e-05 
-    5.67594e-05 0.000110126 2.49925e-05 -7.17815e-05 -0.000142299 
-    -1.63109e-05 0.000439529 0.000562489 0.000594599 0.000326164 
-    0.000126423 -4.26063e-05 -0.000122927 -0.000114152 -6.72706e-05 
-    -6.41242e-05 -0.000135588 2.61507e-05 0.000134036 6.43734e-06 
-    -4.6223e-05 -0.000112047 -0.000101388 -8.67847e-05 -0.000117664 
-    -0.000133957 -0.000116558 -0.000100873 -7.65448e-05 -4.44964e-05 
-    -3.6677e-05 -5.26632e-05 -5.45172e-05 -5.13545e-05 -3.73869e-05 
-    -1.99732e-05 -1.0907e-05 -1.10081e-05 -3.02609e-05 -5.18517e-05 
-    -6.13597e-05 -5.30706e-05 -2.39572e-05 -3.24146e-05 -5.70062e-05 
-    -0.000103448 -0.000135376 -0.0001024 -2.39007e-05 0.000110929 
-    0.000151226 0.000142044 0.000105922 5.62834e-05 4.78476e-05 
-    3.94117e-05 3.09759e-05 2.25401e-05 1.41042e-05 5.66837e-06 
-    -2.76747e-06 -3.08639e-06 -2.81341e-06 -2.54043e-06 -2.26745e-06 
-    -1.99447e-06 -1.72149e-06 -1.44851e-06 -1.26226e-06 -1.12096e-06 
-    -9.79661e-07 -8.38363e-07 -6.97065e-07 -5.55768e-07 -4.1447e-07 
-    -2.73173e-07 -1.31875e-07 9.42259e-09 1.5072e-07 2.92018e-07 
-    4.33315e-07 5.74613e-07 7.10363e-07 8.01984e-07 8.93604e-07 
-    9.85225e-07 1.07685e-06 0.04474 0.0928765 0.141327 0.0176048 
-    -0.071675 -0.0124613 0.989022 2.28104 3.40619 4.21417 4.67173 
-    4.87438 4.96044 4.98996 4.99858 4.96672 4.89502 4.79391 
-    4.76433 4.8387 4.98612 5.0161 5.01722 5.01437 5.01256 4.99827 
-    4.95807 4.9209 4.88217 4.83006 4.78461 4.80759 4.85548 4.89604 
-    4.9254 4.94617 4.96126 4.97374 4.98255 4.98792 4.99126 4.99361 
-    4.99554 4.99699 4.99792 4.99846 4.99881 4.99905 4.99924 
-    4.99938 4.99949 4.99955 4.9997 4.9998 4.99982 4.99982 4.99982 
-    4.99982 4.99982 4.99983 4.99984 4.99985 4.99986 4.99987 
-    4.99988 4.99989 4.9999 4.99992 4.99993 4.99994 4.99995 4.99995 
-    4.99996 4.99996 4.99998 4.99999 5.00001 5.00002 5.00002 
-    5.00001 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99998 
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
-    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    1.86175 2.00199 2.08919 1.84314 1.08254 0.214737 0.0377351
+    0.00952455 0.00232763 0.000563614 0.000263477 0.000148642
+    0.000285086 0.000242592 7.34699e-05 -1.53467e-05 -0.0161874
+    -0.0157876 -0.0141194 0.0132576 0.0903272 0.109938 0.0535295
+    0.0224216 0.00940945 0.00466825 -0.000649972 -0.00654752
+    -0.00333248 -0.00103671 -0.000508276 -5.8896e-05 -0.00043938
+    -0.000544704 -0.00044444 -0.000307093 -0.00024517 -0.000154538
+    -8.78602e-05 -7.10461e-05 -6.06485e-05 -3.91039e-05 -8.45988e-06
+    9.43442e-06 1.28351e-05 -2.16734e-06 -2.6142e-05 -2.54768e-05
+    -1.88997e-05 -1.17906e-05 -7.3808e-06 -2.97101e-06 1.19146e-07
+    2.94246e-06 5.38942e-06 3.88851e-06 2.38761e-06 8.86704e-07
+    -6.14201e-07 -2.11511e-06 -2.59565e-06 -2.38885e-06 -2.18205e-06
+    -1.97525e-06 -1.76845e-06 -1.56241e-06 -1.36258e-06 -1.16276e-06
+    -9.62939e-07 -7.63116e-07 -5.63293e-07 -3.6347e-07 -1.63647e-07
+    3.61756e-08 2.35999e-07 4.35822e-07 6.07653e-07 5.90323e-07
+    5.72994e-07 5.55665e-07 5.38336e-07 5.21007e-07 5.03678e-07
+    4.86349e-07 4.6902e-07 4.51691e-07 4.34361e-07 4.11899e-07
+    3.60315e-07 3.08731e-07 2.57146e-07 2.05562e-07 1.53977e-07
+    1.02393e-07 5.08082e-08 -7.76222e-10 -5.23607e-08 -1.03945e-07
+    -1.47815e-07 -1.54225e-07 -1.60635e-07 -1.67045e-07 -1.73455e-07
+    -1.79864e-07 -1.86274e-07 -1.92684e-07 -1.99094e-07 -2.05504e-07
+    -2.11914e-07 -2.18324e-07 -2.24734e-07 -2.31144e-07 -2.37554e-07
+    -2.43964e-07 -2.50373e-07 -2.56783e-07 -2.63193e-07 -2.69603e-07
+    -2.76013e-07 -2.82423e-07 2.92534e-06 0.0446777 0.024278
+    -0.0518987 -0.0636547 0.00983929 -0.000518204 -0.000265194
+    0.000154772 0.000299538 3.12715e-05 -3.18225e-05 -2.48268e-05
+    -1.16701e-05 -6.05117e-06 7.61116e-06 -0.0163668 -0.0158244
+    -0.0141177 0.0100085 0.0857144 0.107784 0.051862 0.0204448
+    0.00629858 0.000967736 0.00121674 0.00190276 0.00154009
+    0.000860922 0.000410386 0.000164585 3.99493e-05 1.93797e-05
+    5.67594e-05 0.000110126 2.49925e-05 -7.17815e-05 -0.000142299
+    -1.63109e-05 0.000439529 0.000562489 0.000594599 0.000326164
+    0.000126423 -4.26063e-05 -0.000122927 -0.000114152 -6.72706e-05
+    -6.41242e-05 -0.000135588 2.61507e-05 0.000134036 6.43734e-06
+    -4.6223e-05 -0.000112047 -0.000101388 -8.67847e-05 -0.000117664
+    -0.000133957 -0.000116558 -0.000100873 -7.65448e-05 -4.44964e-05
+    -3.6677e-05 -5.26632e-05 -5.45172e-05 -5.13545e-05 -3.73869e-05
+    -1.99732e-05 -1.0907e-05 -1.10081e-05 -3.02609e-05 -5.18517e-05
+    -6.13597e-05 -5.30706e-05 -2.39572e-05 -3.24146e-05 -5.70062e-05
+    -0.000103448 -0.000135376 -0.0001024 -2.39007e-05 0.000110929
+    0.000151226 0.000142044 0.000105922 5.62834e-05 4.78476e-05
+    3.94117e-05 3.09759e-05 2.25401e-05 1.41042e-05 5.66837e-06
+    -2.76747e-06 -3.08639e-06 -2.81341e-06 -2.54043e-06 -2.26745e-06
+    -1.99447e-06 -1.72149e-06 -1.44851e-06 -1.26226e-06 -1.12096e-06
+    -9.79661e-07 -8.38363e-07 -6.97065e-07 -5.55768e-07 -4.1447e-07
+    -2.73173e-07 -1.31875e-07 9.42259e-09 1.5072e-07 2.92018e-07
+    4.33315e-07 5.74613e-07 7.10363e-07 8.01984e-07 8.93604e-07
+    9.85225e-07 1.07685e-06 0.04474 0.0928765 0.141327 0.0176048
+    -0.071675 -0.0124613 0.989022 2.28104 3.40619 4.21417 4.67173
+    4.87438 4.96044 4.98996 4.99858 4.96672 4.89502 4.79391
+    4.76433 4.8387 4.98612 5.0161 5.01722 5.01437 5.01256 4.99827
+    4.95807 4.9209 4.88217 4.83006 4.78461 4.80759 4.85548 4.89604
+    4.9254 4.94617 4.96126 4.97374 4.98255 4.98792 4.99126 4.99361
+    4.99554 4.99699 4.99792 4.99846 4.99881 4.99905 4.99924
+    4.99938 4.99949 4.99955 4.9997 4.9998 4.99982 4.99982 4.99982
+    4.99982 4.99982 4.99983 4.99984 4.99985 4.99986 4.99987
+    4.99988 4.99989 4.9999 4.99992 4.99993 4.99994 4.99995 4.99995
+    4.99996 4.99996 4.99998 4.99999 5.00001 5.00002 5.00002
+    5.00001 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99998
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
     EOD
 
     @v[16].set(<<-'EOD')
-    1.86175 1.73073 1.50572 1.89001 3.39004 4.36034 4.79012 
-    4.93798 4.98305 4.99539 4.9979 4.99904 4.99772 4.9983 4.99935 
-    4.99975 4.98837 4.99456 4.99728 5.01838 5.04568 5.00759 
-    4.98112 4.98479 4.99197 4.99641 4.99747 4.99775 5.00043 
-    5.0007 5.00035 5.00023 4.99976 5.00002 5.00007 5.0002 4.99993 
-    5.00003 5.00021 5.00006 4.99993 4.99992 5.00002 5.00013 
-    5.00017 5.00009 4.99992 4.99991 4.99993 4.99996 4.99998 
-    4.99999 5.00001 5.00003 5.00005 5.00004 5.00004 5.00003 
-    5.00002 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99997 
-    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 
-    4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 5 5.01498 4.99342 4.96899 5.00301 5.02627 4.9977 
-    4.99548 4.99757 5.00277 5.00245 5.0014 5.00069 5.00032 5.00014 
-    5.00009 4.9867 4.99262 4.99607 5.01805 5.04713 5.00927 4.98184 
-    4.98483 4.9914 4.99616 4.99902 4.9999 4.99987 4.99979 4.99981 
-    4.99989 4.99994 4.99998 5.0002 5.00001 5.00008 5.00008 5.0001 
-    5.00021 5.00032 5.00025 5.00019 5.00006 5.00007 4.99994 
-    4.99997 4.99999 5.00023 5.00008 4.99993 4.99998 4.99986 
-    4.99982 5.00003 4.99985 4.99996 5.00014 5 4.99984 4.99979 
-    4.99982 4.99993 5.00008 5.00011 5.00002 4.99996 4.9999 4.99994 
-    5.00001 5.00007 5.00009 4.99995 4.99978 4.99971 4.99976 
-    4.99997 4.99996 4.99989 4.99972 4.99955 4.99953 4.99959 
-    4.99976 4.9999 5.00005 5.00023 5.00039 5.00034 5.00029 5.00024 
-    5.00019 5.00014 5.00009 5.00004 5.00003 5.00002 5.00001 
-    5 5 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
-    5.00001 5.00002 5.00003 5.00004 5.01564 5.03395 5.04932 
-    5.11868 3.92502 1.31888 0.163888 0.0946876 0.0789578 0.0565084 
-    0.0260333 0.0156986 0.00907667 0.00613629 0.00468417 -0.00174008 
-    -0.0021422 0.000586962 0.0124937 0.0147977 0.00838454 0.00039383 
-    -0.000522021 -0.000426598 -0.000290214 -0.00173713 -0.00384132 
-    -0.00382945 -0.00429219 -0.00580193 -0.00393246 0.0017543 
-    0.00423045 0.00408931 0.0031976 0.00245457 0.00187293 0.00159068 
-    0.00105697 0.000609902 0.000358825 0.000334125 0.000212708 
-    0.000168116 8.97349e-05 5.21578e-05 3.84527e-05 2.93033e-05 
-    2.10067e-05 1.59954e-05 1.13917e-05 5.49738e-06 2.77217e-05 
-    6.51259e-06 -6.65468e-06 2.09837e-06 -6.617e-06 -4.80187e-06 
-    1.55031e-06 4.26536e-06 7.69457e-07 -1.46213e-06 -7.25202e-07 
-    3.26501e-06 6.55807e-06 7.524e-06 6.07209e-06 6.00701e-06 
-    5.41166e-06 3.86573e-06 1.10651e-06 -2.74603e-06 -2.18566e-06 
-    2.3658e-06 8.59956e-06 8.35046e-06 2.90621e-06 -8.75982e-07 
-    -1.87189e-06 -2.1528e-06 -1.94875e-06 -1.74471e-06 -1.54067e-06 
-    -1.33662e-06 -1.13258e-06 -8.40567e-07 -5.20743e-07 -2.00918e-07 
-    1.18906e-07 4.38731e-07 6.11382e-07 6.01529e-07 5.91675e-07 
-    5.81822e-07 5.71968e-07 5.62115e-07 5.52261e-07 5.42407e-07 
-    5.32554e-07 5.227e-07 5.12847e-07 4.72812e-07 4.26137e-07 
-    3.79462e-07 3.32786e-07 2.86111e-07 2.39436e-07 1.92761e-07 
-    1.46086e-07 9.94107e-08 5.27356e-08 -2.77779e-10 -7.98079e-08 
-    -1.59338e-07 -2.38868e-07 -3.18398e-07 -3.97928e-07 -4.77458e-07 
-    -5.56988e-07 -6.36519e-07 
+    1.86175 1.73073 1.50572 1.89001 3.39004 4.36034 4.79012
+    4.93798 4.98305 4.99539 4.9979 4.99904 4.99772 4.9983 4.99935
+    4.99975 4.98837 4.99456 4.99728 5.01838 5.04568 5.00759
+    4.98112 4.98479 4.99197 4.99641 4.99747 4.99775 5.00043
+    5.0007 5.00035 5.00023 4.99976 5.00002 5.00007 5.0002 4.99993
+    5.00003 5.00021 5.00006 4.99993 4.99992 5.00002 5.00013
+    5.00017 5.00009 4.99992 4.99991 4.99993 4.99996 4.99998
+    4.99999 5.00001 5.00003 5.00005 5.00004 5.00004 5.00003
+    5.00002 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99997
+    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
+    4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 5 5.01498 4.99342 4.96899 5.00301 5.02627 4.9977
+    4.99548 4.99757 5.00277 5.00245 5.0014 5.00069 5.00032 5.00014
+    5.00009 4.9867 4.99262 4.99607 5.01805 5.04713 5.00927 4.98184
+    4.98483 4.9914 4.99616 4.99902 4.9999 4.99987 4.99979 4.99981
+    4.99989 4.99994 4.99998 5.0002 5.00001 5.00008 5.00008 5.0001
+    5.00021 5.00032 5.00025 5.00019 5.00006 5.00007 4.99994
+    4.99997 4.99999 5.00023 5.00008 4.99993 4.99998 4.99986
+    4.99982 5.00003 4.99985 4.99996 5.00014 5 4.99984 4.99979
+    4.99982 4.99993 5.00008 5.00011 5.00002 4.99996 4.9999 4.99994
+    5.00001 5.00007 5.00009 4.99995 4.99978 4.99971 4.99976
+    4.99997 4.99996 4.99989 4.99972 4.99955 4.99953 4.99959
+    4.99976 4.9999 5.00005 5.00023 5.00039 5.00034 5.00029 5.00024
+    5.00019 5.00014 5.00009 5.00004 5.00003 5.00002 5.00001
+    5 5 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+    5.00001 5.00002 5.00003 5.00004 5.01564 5.03395 5.04932
+    5.11868 3.92502 1.31888 0.163888 0.0946876 0.0789578 0.0565084
+    0.0260333 0.0156986 0.00907667 0.00613629 0.00468417 -0.00174008
+    -0.0021422 0.000586962 0.0124937 0.0147977 0.00838454 0.00039383
+    -0.000522021 -0.000426598 -0.000290214 -0.00173713 -0.00384132
+    -0.00382945 -0.00429219 -0.00580193 -0.00393246 0.0017543
+    0.00423045 0.00408931 0.0031976 0.00245457 0.00187293 0.00159068
+    0.00105697 0.000609902 0.000358825 0.000334125 0.000212708
+    0.000168116 8.97349e-05 5.21578e-05 3.84527e-05 2.93033e-05
+    2.10067e-05 1.59954e-05 1.13917e-05 5.49738e-06 2.77217e-05
+    6.51259e-06 -6.65468e-06 2.09837e-06 -6.617e-06 -4.80187e-06
+    1.55031e-06 4.26536e-06 7.69457e-07 -1.46213e-06 -7.25202e-07
+    3.26501e-06 6.55807e-06 7.524e-06 6.07209e-06 6.00701e-06
+    5.41166e-06 3.86573e-06 1.10651e-06 -2.74603e-06 -2.18566e-06
+    2.3658e-06 8.59956e-06 8.35046e-06 2.90621e-06 -8.75982e-07
+    -1.87189e-06 -2.1528e-06 -1.94875e-06 -1.74471e-06 -1.54067e-06
+    -1.33662e-06 -1.13258e-06 -8.40567e-07 -5.20743e-07 -2.00918e-07
+    1.18906e-07 4.38731e-07 6.11382e-07 6.01529e-07 5.91675e-07
+    5.81822e-07 5.71968e-07 5.62115e-07 5.52261e-07 5.42407e-07
+    5.32554e-07 5.227e-07 5.12847e-07 4.72812e-07 4.26137e-07
+    3.79462e-07 3.32786e-07 2.86111e-07 2.39436e-07 1.92761e-07
+    1.46086e-07 9.94107e-08 5.27356e-08 -2.77779e-10 -7.98079e-08
+    -1.59338e-07 -2.38868e-07 -3.18398e-07 -3.97928e-07 -4.77458e-07
+    -5.56988e-07 -6.36519e-07
     EOD
 
     @v[17].set(<<-'EOD')
-    5 5.16963 4.84136 3.33754 0.316206 0.103113 0.0273341 0.0221102 
-    0.0177008 0.0143758 0.0115203 0.00929231 0.00752716 0.00625439 
-    0.00489872 0.00403656 -0.0657317 -0.0256467 0.165394 0.985963 
-    3.05067 4.55799 4.89728 4.92464 4.8882 4.90592 4.97315 4.99241 
-    4.99694 4.99845 4.99905 4.99939 4.99959 4.99971 4.9998 4.99986 
-    4.9999 4.99993 4.99995 4.99996 4.99997 4.99998 4.99998 4.99999 
-    4.99999 4.99999 4.99999 4.99999 5 5.00001 5.00003 5.00005 
-    5.00004 5.00002 5 4.99999 4.99999 4.99998 4.99998 4.99997 
-    4.99997 4.99998 4.99998 4.99999 4.99999 5 5 5 5 5 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 
-    5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998 
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 5 5 5 5 5 5 5.00025 5.1657 4.69981 2.43895 
-    0.0229743 0.0351406 -0.0211974 -0.0312063 -0.0160331 -0.0021718 
-    -0.000766597 -0.000251052 -5.49363e-05 -3.36364e-06 -2.01983e-06 
-    -9.70575e-06 -0.0657007 -0.0205247 0.183332 1.07163 3.11839 
-    4.46213 4.84163 4.95195 4.99159 5.02084 5.04029 5.04138 
-    5.0271 5.00445 4.97957 4.95702 4.95231 4.97819 4.99191 4.9963 
-    4.99822 4.99878 4.99903 4.99925 4.99942 4.9995 4.99954 4.99957 
-    4.99961 4.99966 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986 
-    4.99988 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 4.99996 
-    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001 
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.14239 4.76219 
-    3.16574 0.299969 0.0631609 -0.00118611 -0.00026052 -5.96333e-05 
-    -1.44904e-05 -4.3859e-06 -2.99454e-06 1.10547e-06 4.84662e-06 
-    1.30971e-05 2.23082e-05 -0.0655844 -0.0204818 0.182507 1.05954 
-    3.12277 4.46735 4.83915 4.94512 4.97679 4.98654 4.9966 5.00833 
-    5.00776 5.00432 5.00199 5.00086 5.00033 5.00008 5 5.00001 
-    5 5.00005 5.00002 4.99981 4.99991 4.99998 4.99979 4.99979 
-    4.99984 4.9998 4.9998 5.00006 5.00002 5.00001 5 5 4.99992 
-    4.99998 4.99999 5.00002 5.00014 4.99999 4.99987 4.99993 
-    5.00003 5.00011 5.00005 4.99996 4.99987 4.99985 4.99994 
-    5.00009 5.0001 5 4.99993 4.99997 5.00008 5.00015 5.00021 
-    5.00021 5.00007 4.99978 4.99965 4.99973 4.9999 4.99992 4.99995 
-    4.99997 4.99999 5.00001 5.00002 5.00001 5.00001 5.00001 
-    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 5.00002 
-    5.00002 5.00002 
+    5 5.16963 4.84136 3.33754 0.316206 0.103113 0.0273341 0.0221102
+    0.0177008 0.0143758 0.0115203 0.00929231 0.00752716 0.00625439
+    0.00489872 0.00403656 -0.0657317 -0.0256467 0.165394 0.985963
+    3.05067 4.55799 4.89728 4.92464 4.8882 4.90592 4.97315 4.99241
+    4.99694 4.99845 4.99905 4.99939 4.99959 4.99971 4.9998 4.99986
+    4.9999 4.99993 4.99995 4.99996 4.99997 4.99998 4.99998 4.99999
+    4.99999 4.99999 4.99999 4.99999 5 5.00001 5.00003 5.00005
+    5.00004 5.00002 5 4.99999 4.99999 4.99998 4.99998 4.99997
+    4.99997 4.99998 4.99998 4.99999 4.99999 5 5 5 5 5 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
+    5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 5 5 5 5 5 5 5.00025 5.1657 4.69981 2.43895
+    0.0229743 0.0351406 -0.0211974 -0.0312063 -0.0160331 -0.0021718
+    -0.000766597 -0.000251052 -5.49363e-05 -3.36364e-06 -2.01983e-06
+    -9.70575e-06 -0.0657007 -0.0205247 0.183332 1.07163 3.11839
+    4.46213 4.84163 4.95195 4.99159 5.02084 5.04029 5.04138
+    5.0271 5.00445 4.97957 4.95702 4.95231 4.97819 4.99191 4.9963
+    4.99822 4.99878 4.99903 4.99925 4.99942 4.9995 4.99954 4.99957
+    4.99961 4.99966 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
+    4.99988 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 4.99996
+    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.14239 4.76219
+    3.16574 0.299969 0.0631609 -0.00118611 -0.00026052 -5.96333e-05
+    -1.44904e-05 -4.3859e-06 -2.99454e-06 1.10547e-06 4.84662e-06
+    1.30971e-05 2.23082e-05 -0.0655844 -0.0204818 0.182507 1.05954
+    3.12277 4.46735 4.83915 4.94512 4.97679 4.98654 4.9966 5.00833
+    5.00776 5.00432 5.00199 5.00086 5.00033 5.00008 5 5.00001
+    5 5.00005 5.00002 4.99981 4.99991 4.99998 4.99979 4.99979
+    4.99984 4.9998 4.9998 5.00006 5.00002 5.00001 5 5 4.99992
+    4.99998 4.99999 5.00002 5.00014 4.99999 4.99987 4.99993
+    5.00003 5.00011 5.00005 4.99996 4.99987 4.99985 4.99994
+    5.00009 5.0001 5 4.99993 4.99997 5.00008 5.00015 5.00021
+    5.00021 5.00007 4.99978 4.99965 4.99973 4.9999 4.99992 4.99995
+    4.99997 4.99999 5.00001 5.00002 5.00001 5.00001 5.00001
+    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 5.00002
+    5.00002 5.00002
     EOD
 
     @v[18].set(<<-'EOD')
-    5 5.0333 5.02472 4.92559 4.18383 3.93923 3.9961 4.14293 
-    4.28591 4.41336 4.52157 4.61101 4.68472 4.7439 4.79294 4.83239 
-    4.80697 4.78808 4.79322 4.8838 5.08529 5.21863 4.88852 3.90198 
-    2.14586 0.383977 0.101103 0.0525711 0.0318287 0.020895 0.0146908 
-    0.010831 0.00830272 0.00656377 0.00532066 0.00440078 0.00369956 
-    0.00315713 0.00272614 0.00237965 0.00209659 0.00186339 0.00167014 
-    0.0015081 0.00137172 0.00125607 0.00115393 0.00106076 0.000980166 
-    0.000918015 0.000862837 0.00080766 0.000763488 0.000721541 
-    0.000680825 0.000653026 0.000625226 0.000597426 0.000569627 
-    0.000541827 0.000519087 0.000499756 0.000480424 0.000461093 
-    0.000441761 0.000423291 0.000411941 0.00040059 0.00038924 
-    0.000377889 0.000366539 0.000355188 0.000343838 0.000332487 
-    0.000321137 0.000309786 0.000299055 0.000292509 0.000285963 
-    0.000279417 0.000272871 0.000266325 0.000259779 0.000253233 
-    0.000246686 0.00024014 0.000233594 0.000227387 0.0002231 
-    0.000218813 0.000214526 0.00021024 0.000205953 0.000201666 
-    0.000197379 0.000193092 0.000188805 0.000184519 0.000180526 
-    0.000177963 0.0001754 0.000172837 0.000170274 0.000167711 
-    0.000165148 0.000162585 0.000160022 0.000157459 0.000154895 
-    0.000152332 0.000149769 0.000147206 0.000144643 0.00014208 
-    0.000139517 0.000136954 0.000134391 0.000131828 0.000129265 
-    0.000126702 0.000132838 0.0311184 0.163151 0.34986 0.604501 
-    0.357125 0.136137 0.0711304 0.0346959 0.0212674 0.00872193 
-    0.00252206 0.000455269 7.59332e-05 2.91532e-05 0.000320562 
-    -0.0720911 -0.0840491 -0.0791345 -0.0404143 0.0182035 -0.0235871 
-    -0.0426072 -0.0597501 0.00824773 0.481404 1.32496 2.11949 
-    2.57317 2.58202 2.15054 1.33786 0.45702 0.153772 0.0913584 
-    0.0604989 0.0421591 0.0271456 0.0170021 0.0115815 0.00907886 
-    0.00742466 0.00626096 0.00531127 0.00450501 0.00381927 0.00323718 
-    0.00274374 0.00232494 0.00196885 0.00166686 0.00141134 0.00119437 
-    0.0010109 0.000855534 0.000723378 0.000611408 0.000516704 
-    0.000436769 0.000369523 0.000313026 0.00026526 0.000223976 
-    0.000188972 0.000159042 0.000134148 0.000112688 9.49738e-05 
-    7.97877e-05 6.721e-05 5.65115e-05 4.77194e-05 4.03591e-05 
-    3.42848e-05 2.92627e-05 2.50435e-05 2.1412e-05 1.84532e-05 
-    1.58624e-05 1.34673e-05 1.14461e-05 1.00935e-05 9.12375e-06 
-    8.50202e-06 7.81431e-06 7.20729e-06 6.73936e-06 6.3702e-06 
-    5.90049e-06 5.43077e-06 4.96105e-06 4.49133e-06 4.02162e-06 
-    3.5519e-06 3.08218e-06 2.79099e-06 2.51281e-06 2.23463e-06 
-    1.95645e-06 1.67827e-06 1.40009e-06 1.12191e-06 1.01376e-06 
-    9.9375e-07 9.73741e-07 9.53733e-07 9.33724e-07 9.13715e-07 
-    8.93707e-07 8.73698e-07 8.5369e-07 8.33681e-07 8.13673e-07 
-    7.93664e-07 7.73655e-07 7.53647e-07 7.21781e-07 5.956e-07 
-    4.69419e-07 3.43239e-07 2.17058e-07 0.0284032 0.0374438 
-    -0.0157543 -0.0680497 0.0504768 0.0100294 0.00222261 0.000528697 
-    0.000132929 3.99489e-05 2.46066e-05 4.56327e-06 -6.54853e-06 
-    1.33783e-05 -3.68221e-05 -0.0724498 -0.0843663 -0.0792935 
-    -0.0406426 0.0200019 0.0426259 0.0220753 0.00668555 -0.000968483 
-    0.024662 0.0383437 0.0911513 0.087848 0.0602076 0.0390559 
-    0.0260573 0.0180444 0.012974 0.00985409 0.00788132 0.0064228 
-    0.005545 0.00453571 0.00364245 0.00310278 0.00270523 0.00236439 
-    0.0020945 0.00186808 0.00167493 0.00151731 0.00138594 0.00126945 
-    0.00116695 0.0010762 0.000996366 0.000928387 0.000864414 
-    0.000808258 0.000759574 0.000713865 0.000666712 0.000632716 
-    0.000601262 0.000572163 0.000543986 0.000515253 0.0004897 
-    0.000468112 0.000449313 0.000432981 0.000417911 0.000401307 
-    0.000382712 0.000366678 0.000355736 0.000349171 0.000335727 
-    0.000317091 0.000296086 0.000283543 0.000277366 0.000272233 
-    0.000267001 0.000263147 0.000256699 0.000250251 0.000243803 
-    0.000237355 0.000230907 0.000225424 0.000220247 0.000215069 
-    0.000209892 0.000204714 0.000200213 0.000196548 0.000192884 
-    0.00018922 0.000185556 0.000181892 0.000178228 0.000174564 
-    0.0001709 0.000167236 0.000163572 0.000160824 0.000158279 
-    0.000155733 0.000153187 0.000150641 0.000148095 0.000145549 
-    0.000143003 0.000140457 0.000137911 0.000135457 0.000133386 
-    0.000131315 0.000129245 0.000127174 0.000125103 0.000123032 
-    0.000120961 0.000118891 
+    5 5.0333 5.02472 4.92559 4.18383 3.93923 3.9961 4.14293
+    4.28591 4.41336 4.52157 4.61101 4.68472 4.7439 4.79294 4.83239
+    4.80697 4.78808 4.79322 4.8838 5.08529 5.21863 4.88852 3.90198
+    2.14586 0.383977 0.101103 0.0525711 0.0318287 0.020895 0.0146908
+    0.010831 0.00830272 0.00656377 0.00532066 0.00440078 0.00369956
+    0.00315713 0.00272614 0.00237965 0.00209659 0.00186339 0.00167014
+    0.0015081 0.00137172 0.00125607 0.00115393 0.00106076 0.000980166
+    0.000918015 0.000862837 0.00080766 0.000763488 0.000721541
+    0.000680825 0.000653026 0.000625226 0.000597426 0.000569627
+    0.000541827 0.000519087 0.000499756 0.000480424 0.000461093
+    0.000441761 0.000423291 0.000411941 0.00040059 0.00038924
+    0.000377889 0.000366539 0.000355188 0.000343838 0.000332487
+    0.000321137 0.000309786 0.000299055 0.000292509 0.000285963
+    0.000279417 0.000272871 0.000266325 0.000259779 0.000253233
+    0.000246686 0.00024014 0.000233594 0.000227387 0.0002231
+    0.000218813 0.000214526 0.00021024 0.000205953 0.000201666
+    0.000197379 0.000193092 0.000188805 0.000184519 0.000180526
+    0.000177963 0.0001754 0.000172837 0.000170274 0.000167711
+    0.000165148 0.000162585 0.000160022 0.000157459 0.000154895
+    0.000152332 0.000149769 0.000147206 0.000144643 0.00014208
+    0.000139517 0.000136954 0.000134391 0.000131828 0.000129265
+    0.000126702 0.000132838 0.0311184 0.163151 0.34986 0.604501
+    0.357125 0.136137 0.0711304 0.0346959 0.0212674 0.00872193
+    0.00252206 0.000455269 7.59332e-05 2.91532e-05 0.000320562
+    -0.0720911 -0.0840491 -0.0791345 -0.0404143 0.0182035 -0.0235871
+    -0.0426072 -0.0597501 0.00824773 0.481404 1.32496 2.11949
+    2.57317 2.58202 2.15054 1.33786 0.45702 0.153772 0.0913584
+    0.0604989 0.0421591 0.0271456 0.0170021 0.0115815 0.00907886
+    0.00742466 0.00626096 0.00531127 0.00450501 0.00381927 0.00323718
+    0.00274374 0.00232494 0.00196885 0.00166686 0.00141134 0.00119437
+    0.0010109 0.000855534 0.000723378 0.000611408 0.000516704
+    0.000436769 0.000369523 0.000313026 0.00026526 0.000223976
+    0.000188972 0.000159042 0.000134148 0.000112688 9.49738e-05
+    7.97877e-05 6.721e-05 5.65115e-05 4.77194e-05 4.03591e-05
+    3.42848e-05 2.92627e-05 2.50435e-05 2.1412e-05 1.84532e-05
+    1.58624e-05 1.34673e-05 1.14461e-05 1.00935e-05 9.12375e-06
+    8.50202e-06 7.81431e-06 7.20729e-06 6.73936e-06 6.3702e-06
+    5.90049e-06 5.43077e-06 4.96105e-06 4.49133e-06 4.02162e-06
+    3.5519e-06 3.08218e-06 2.79099e-06 2.51281e-06 2.23463e-06
+    1.95645e-06 1.67827e-06 1.40009e-06 1.12191e-06 1.01376e-06
+    9.9375e-07 9.73741e-07 9.53733e-07 9.33724e-07 9.13715e-07
+    8.93707e-07 8.73698e-07 8.5369e-07 8.33681e-07 8.13673e-07
+    7.93664e-07 7.73655e-07 7.53647e-07 7.21781e-07 5.956e-07
+    4.69419e-07 3.43239e-07 2.17058e-07 0.0284032 0.0374438
+    -0.0157543 -0.0680497 0.0504768 0.0100294 0.00222261 0.000528697
+    0.000132929 3.99489e-05 2.46066e-05 4.56327e-06 -6.54853e-06
+    1.33783e-05 -3.68221e-05 -0.0724498 -0.0843663 -0.0792935
+    -0.0406426 0.0200019 0.0426259 0.0220753 0.00668555 -0.000968483
+    0.024662 0.0383437 0.0911513 0.087848 0.0602076 0.0390559
+    0.0260573 0.0180444 0.012974 0.00985409 0.00788132 0.0064228
+    0.005545 0.00453571 0.00364245 0.00310278 0.00270523 0.00236439
+    0.0020945 0.00186808 0.00167493 0.00151731 0.00138594 0.00126945
+    0.00116695 0.0010762 0.000996366 0.000928387 0.000864414
+    0.000808258 0.000759574 0.000713865 0.000666712 0.000632716
+    0.000601262 0.000572163 0.000543986 0.000515253 0.0004897
+    0.000468112 0.000449313 0.000432981 0.000417911 0.000401307
+    0.000382712 0.000366678 0.000355736 0.000349171 0.000335727
+    0.000317091 0.000296086 0.000283543 0.000277366 0.000272233
+    0.000267001 0.000263147 0.000256699 0.000250251 0.000243803
+    0.000237355 0.000230907 0.000225424 0.000220247 0.000215069
+    0.000209892 0.000204714 0.000200213 0.000196548 0.000192884
+    0.00018922 0.000185556 0.000181892 0.000178228 0.000174564
+    0.0001709 0.000167236 0.000163572 0.000160824 0.000158279
+    0.000155733 0.000153187 0.000150641 0.000148095 0.000145549
+    0.000143003 0.000140457 0.000137911 0.000135457 0.000133386
+    0.000131315 0.000129245 0.000127174 0.000125103 0.000123032
+    0.000120961 0.000118891
     EOD
 
     @v[19].set(<<-'EOD')
-    1.86175 1.99994 2.0833 2.01627 2.42503 3.25769 3.62134 3.88827 
-    4.09688 4.26773 4.40529 4.51734 4.60827 4.68313 4.74346 
-    4.79302 4.72815 4.68959 4.70421 4.81316 5.01375 5.14493 
-    5.10305 5.0699 5.04484 5.03751 5.03348 5.02504 5.01799 5.01271 
-    5.00895 5.00628 5.0044 5.00309 5.00216 5.00151 5.00105 5.00073 
-    5.00051 5.00034 5.00023 5.00015 5.0001 5.00007 5.00003 4.99998 
-    4.99993 4.99993 4.99995 4.99999 5.00001 5.00003 5.00002 
-    5.00001 5 5 5 5 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00017 5.17398 
-    4.94779 3.78508 1.52302 0.608808 0.244311 0.126053 0.0597175 
-    0.038422 0.0158174 0.00481338 0.00107847 0.000301256 0.000114861 
-    0.00059489 -0.118904 -0.147478 -0.158986 -0.080544 0.165361 
-    0.171378 0.0776087 0.0435738 0.0428235 0.0423755 0.0347695 
-    0.0225061 0.0155539 0.0121357 0.0107997 0.0103976 0.0124406 
-    0.016814 0.0167556 0.0149852 0.01459 0.0141182 0.0131934 
-    0.0120286 0.0108692 0.0097184 0.00855881 0.00744912 0.00643877 
-    0.00554044 0.00475165 0.00406535 0.00347158 0.00295981 0.00251995 
-    0.00214318 0.00182101 0.00154613 0.00131196 0.0011119 0.000941587 
-    0.000796999 0.000674582 0.000571283 0.000484276 0.000410649 
-    0.000347005 0.000292984 0.000246715 0.000208143 0.00017489 
-    0.000147412 0.000123854 0.000104332 8.77229e-05 7.40686e-05 
-    6.2637e-05 5.32e-05 4.53946e-05 3.88343e-05 3.31864e-05 
-    2.85905e-05 2.45725e-05 2.08671e-05 1.77301e-05 1.55911e-05 
-    1.40153e-05 1.29421e-05 1.18693e-05 1.09815e-05 1.03484e-05 
-    9.87664e-06 9.14446e-06 8.41228e-06 7.68011e-06 6.94793e-06 
-    6.21575e-06 5.48357e-06 4.7514e-06 4.38454e-06 4.04432e-06 
-    3.7041e-06 3.36388e-06 3.02366e-06 2.68344e-06 2.34322e-06 
-    2.15196e-06 2.03791e-06 1.92386e-06 1.80982e-06 1.69577e-06 
-    1.58173e-06 1.46768e-06 1.35363e-06 1.23959e-06 1.12554e-06 
-    1.0115e-06 8.9745e-07 7.83404e-07 6.69358e-07 4.76113e-07 
-    -3.47071e-07 -1.17025e-06 -1.99344e-06 -2.81662e-06 0.0783754 
-    0.0500262 -0.0659563 -0.120914 0.0815957 0.0154255 0.00347177 
-    0.000840357 0.000214582 6.54655e-05 3.91709e-05 8.07396e-06 
-    -4.44265e-07 1.74384e-05 -4.52725e-05 -0.119379 -0.147984 
-    -0.159247 -0.0824604 0.169014 0.177628 0.0758742 0.010558 
-    -0.0346506 -0.0710288 -0.0838952 -0.0599521 -0.034568 -0.0181615 
-    -0.00968034 -0.00547115 -0.00333511 -0.00232468 -0.00181159 
-    -0.00143841 -0.00116601 -0.000839755 -0.000569764 -0.000578683 
-    -0.000490551 -0.000411712 -0.000437859 -0.000408185 -0.000356644 
-    -0.000311332 -0.000269006 -0.000221396 -0.000210054 -0.0001923 
-    -0.000175122 -0.000161039 -0.0001428 -0.000126123 -0.000127893 
-    -8.14516e-05 -0.000120166 -0.000154909 -0.000112733 -8.40377e-05 
-    -7.11342e-05 -8.09538e-05 -9.77789e-05 -9.82402e-05 -7.73531e-05 
-    -5.28255e-05 -3.1096e-05 -1.87967e-05 -1.96552e-05 -4.16655e-05 
-    -5.77185e-05 -5.24142e-05 -2.83153e-05 -1.90012e-05 -1.54415e-05 
-    -2.52569e-05 -6.23747e-05 -0.000130543 -0.000149394 -0.000110886 
-    -4.35517e-05 -4.17084e-05 -3.98651e-05 -3.80218e-05 -3.61785e-05 
-    -3.43352e-05 -3.36249e-05 -3.32729e-05 -3.29208e-05 -3.25687e-05 
-    -3.22166e-05 -3.17143e-05 -3.10258e-05 -3.03372e-05 -2.96486e-05 
-    -2.89601e-05 -2.82715e-05 -2.75829e-05 -2.68944e-05 -2.62058e-05 
-    -2.55173e-05 -2.48287e-05 -2.43043e-05 -2.38159e-05 -2.33276e-05 
-    -2.28393e-05 -2.2351e-05 -2.18626e-05 -2.13743e-05 -2.0886e-05 
-    -2.03977e-05 -1.99093e-05 -1.945e-05 -1.91122e-05 -1.87744e-05 
-    -1.84366e-05 -1.80987e-05 -1.77609e-05 -1.74231e-05 -1.70853e-05 
-    -1.67474e-05 
+    1.86175 1.99994 2.0833 2.01627 2.42503 3.25769 3.62134 3.88827
+    4.09688 4.26773 4.40529 4.51734 4.60827 4.68313 4.74346
+    4.79302 4.72815 4.68959 4.70421 4.81316 5.01375 5.14493
+    5.10305 5.0699 5.04484 5.03751 5.03348 5.02504 5.01799 5.01271
+    5.00895 5.00628 5.0044 5.00309 5.00216 5.00151 5.00105 5.00073
+    5.00051 5.00034 5.00023 5.00015 5.0001 5.00007 5.00003 4.99998
+    4.99993 4.99993 4.99995 4.99999 5.00001 5.00003 5.00002
+    5.00001 5 5 5 5 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00017 5.17398
+    4.94779 3.78508 1.52302 0.608808 0.244311 0.126053 0.0597175
+    0.038422 0.0158174 0.00481338 0.00107847 0.000301256 0.000114861
+    0.00059489 -0.118904 -0.147478 -0.158986 -0.080544 0.165361
+    0.171378 0.0776087 0.0435738 0.0428235 0.0423755 0.0347695
+    0.0225061 0.0155539 0.0121357 0.0107997 0.0103976 0.0124406
+    0.016814 0.0167556 0.0149852 0.01459 0.0141182 0.0131934
+    0.0120286 0.0108692 0.0097184 0.00855881 0.00744912 0.00643877
+    0.00554044 0.00475165 0.00406535 0.00347158 0.00295981 0.00251995
+    0.00214318 0.00182101 0.00154613 0.00131196 0.0011119 0.000941587
+    0.000796999 0.000674582 0.000571283 0.000484276 0.000410649
+    0.000347005 0.000292984 0.000246715 0.000208143 0.00017489
+    0.000147412 0.000123854 0.000104332 8.77229e-05 7.40686e-05
+    6.2637e-05 5.32e-05 4.53946e-05 3.88343e-05 3.31864e-05
+    2.85905e-05 2.45725e-05 2.08671e-05 1.77301e-05 1.55911e-05
+    1.40153e-05 1.29421e-05 1.18693e-05 1.09815e-05 1.03484e-05
+    9.87664e-06 9.14446e-06 8.41228e-06 7.68011e-06 6.94793e-06
+    6.21575e-06 5.48357e-06 4.7514e-06 4.38454e-06 4.04432e-06
+    3.7041e-06 3.36388e-06 3.02366e-06 2.68344e-06 2.34322e-06
+    2.15196e-06 2.03791e-06 1.92386e-06 1.80982e-06 1.69577e-06
+    1.58173e-06 1.46768e-06 1.35363e-06 1.23959e-06 1.12554e-06
+    1.0115e-06 8.9745e-07 7.83404e-07 6.69358e-07 4.76113e-07
+    -3.47071e-07 -1.17025e-06 -1.99344e-06 -2.81662e-06 0.0783754
+    0.0500262 -0.0659563 -0.120914 0.0815957 0.0154255 0.00347177
+    0.000840357 0.000214582 6.54655e-05 3.91709e-05 8.07396e-06
+    -4.44265e-07 1.74384e-05 -4.52725e-05 -0.119379 -0.147984
+    -0.159247 -0.0824604 0.169014 0.177628 0.0758742 0.010558
+    -0.0346506 -0.0710288 -0.0838952 -0.0599521 -0.034568 -0.0181615
+    -0.00968034 -0.00547115 -0.00333511 -0.00232468 -0.00181159
+    -0.00143841 -0.00116601 -0.000839755 -0.000569764 -0.000578683
+    -0.000490551 -0.000411712 -0.000437859 -0.000408185 -0.000356644
+    -0.000311332 -0.000269006 -0.000221396 -0.000210054 -0.0001923
+    -0.000175122 -0.000161039 -0.0001428 -0.000126123 -0.000127893
+    -8.14516e-05 -0.000120166 -0.000154909 -0.000112733 -8.40377e-05
+    -7.11342e-05 -8.09538e-05 -9.77789e-05 -9.82402e-05 -7.73531e-05
+    -5.28255e-05 -3.1096e-05 -1.87967e-05 -1.96552e-05 -4.16655e-05
+    -5.77185e-05 -5.24142e-05 -2.83153e-05 -1.90012e-05 -1.54415e-05
+    -2.52569e-05 -6.23747e-05 -0.000130543 -0.000149394 -0.000110886
+    -4.35517e-05 -4.17084e-05 -3.98651e-05 -3.80218e-05 -3.61785e-05
+    -3.43352e-05 -3.36249e-05 -3.32729e-05 -3.29208e-05 -3.25687e-05
+    -3.22166e-05 -3.17143e-05 -3.10258e-05 -3.03372e-05 -2.96486e-05
+    -2.89601e-05 -2.82715e-05 -2.75829e-05 -2.68944e-05 -2.62058e-05
+    -2.55173e-05 -2.48287e-05 -2.43043e-05 -2.38159e-05 -2.33276e-05
+    -2.28393e-05 -2.2351e-05 -2.18626e-05 -2.13743e-05 -2.0886e-05
+    -2.03977e-05 -1.99093e-05 -1.945e-05 -1.91122e-05 -1.87744e-05
+    -1.84366e-05 -1.80987e-05 -1.77609e-05 -1.74231e-05 -1.70853e-05
+    -1.67474e-05
     EOD
 
     @v[20].set(<<-'EOD')
-    1.86175 1.99724 2.17266 2.48439 3.15933 3.85231 4.38091 
-    4.69033 4.85034 4.92851 4.96453 4.98188 4.98736 4.991 4.99482 
-    4.9973 4.96422 4.89989 4.83907 4.83151 4.90868 5.04854 5.06104 
-    5.04571 5.03219 5.03025 5.02273 5.01707 5.0123 5.0087 5.00611 
-    5.00429 5.00301 5.00211 5.00148 5.00103 5.00072 5.0005 5.00035 
-    5.00024 5.00016 5.00011 5.00007 5.00005 5.00003 5.00001 
-    4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999 
-    5 5 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 
-    5.00002 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 
-    5 5 4.99981 5.10081 5.10903 4.98404 5.00999 5.14946 4.36501 
-    2.23938 0.325144 0.00660272 -0.0102186 -0.0082401 -0.00556785 
-    -0.00374178 -0.00264763 -0.00202823 -0.0182241 -0.0169551 
-    -0.0150395 0.0103736 0.0877592 0.104382 0.0515938 0.0373818 
-    0.0411547 0.0397009 0.0308946 0.0205793 0.0154037 0.0129191 
-    0.0119327 0.011527 0.0124295 0.0161152 0.0161076 0.0145391 
-    0.0144541 0.0139287 0.0129215 0.0117239 0.0105795 0.00942983 
-    0.00827423 0.00718354 0.00619954 0.00532868 0.00456631 0.00390448 
-    0.00333254 0.00284003 0.00241714 0.00205524 0.0017458 0.00148202 
-    0.00125739 0.0010655 0.000902213 0.000763611 0.000646279 
-    0.000547291 0.000463934 0.000393401 0.000332424 0.000280655 
-    0.000236328 0.000199386 0.000167536 0.000141218 0.000118654 
-    9.99559e-05 8.40479e-05 7.09694e-05 6.00188e-05 5.09786e-05 
-    4.3502e-05 3.72191e-05 3.18114e-05 2.74071e-05 2.35539e-05 
-    1.99967e-05 1.69871e-05 1.49449e-05 1.3451e-05 1.24492e-05 
-    1.14256e-05 1.05669e-05 9.94487e-06 9.47514e-06 8.77318e-06 
-    8.07123e-06 7.36927e-06 6.66731e-06 5.96536e-06 5.2634e-06 
-    4.56144e-06 4.23044e-06 3.92649e-06 3.62254e-06 3.31858e-06 
-    3.01463e-06 2.71068e-06 2.40673e-06 2.23063e-06 2.12082e-06 
-    2.01102e-06 1.90121e-06 1.7914e-06 1.68159e-06 1.57178e-06 
-    1.46197e-06 1.35216e-06 1.24235e-06 1.13255e-06 1.02274e-06 
-    9.12929e-07 8.0312e-07 6.33171e-07 -1.51288e-08 -6.63428e-07 
-    -1.31173e-06 -1.96003e-06 0.0437517 0.0265689 -0.0515377 
-    -0.0658688 0.010727 -0.000511921 -8.36924e-05 2.13278e-05 
-    1.45207e-05 4.54862e-06 -6.14726e-06 2.0062e-06 1.02709e-06 
-    1.4152e-05 -3.08225e-05 -0.0166501 -0.0157139 -0.013957 
-    0.0107537 0.0873717 0.111302 0.0454129 -0.00530142 -0.0468336 
-    -0.0790063 -0.0826944 -0.0534753 -0.0288705 -0.0149009 -0.00801592 
-    -0.0046342 -0.00291835 -0.00213019 -0.00170055 -0.001352 
-    -0.00110593 -0.000742655 -0.000532042 -0.000544742 -0.000479206 
-    -0.000407307 -0.000403575 -0.000366209 -0.000324161 -0.000286183 
-    -0.000247579 -0.000214281 -0.000203435 -0.000186896 -0.000171033 
-    -0.00015779 -0.000145259 -0.000128069 -0.000122647 -9.89398e-05 
-    -0.000114926 -0.000132195 -0.000107872 -8.91015e-05 -7.87996e-05 
-    -8.14061e-05 -8.9098e-05 -8.83368e-05 -7.6122e-05 -6.14668e-05 
-    -4.75402e-05 -3.81855e-05 -3.69696e-05 -4.78656e-05 -5.61346e-05 
-    -5.35007e-05 -4.1459e-05 -3.35411e-05 -2.52374e-05 -2.37479e-05 
-    -4.6406e-05 -9.41884e-05 -0.000109222 -8.52676e-05 -4.25166e-05 
-    -4.10125e-05 -3.95085e-05 -3.80045e-05 -3.65004e-05 -3.49964e-05 
-    -3.41627e-05 -3.3541e-05 -3.29193e-05 -3.22976e-05 -3.16758e-05 
-    -3.10334e-05 -3.03653e-05 -2.96971e-05 -2.9029e-05 -2.83609e-05 
-    -2.76928e-05 -2.70246e-05 -2.63565e-05 -2.56884e-05 -2.50203e-05 
-    -2.43521e-05 -2.38716e-05 -2.34324e-05 -2.29932e-05 -2.25539e-05 
-    -2.21147e-05 -2.16755e-05 -2.12362e-05 -2.0797e-05 -2.03578e-05 
-    -1.99186e-05 -1.95079e-05 -1.9217e-05 -1.8926e-05 -1.8635e-05 
-    -1.8344e-05 -1.8053e-05 -1.7762e-05 -1.74711e-05 -1.71801e-05 
+    1.86175 1.99724 2.17266 2.48439 3.15933 3.85231 4.38091
+    4.69033 4.85034 4.92851 4.96453 4.98188 4.98736 4.991 4.99482
+    4.9973 4.96422 4.89989 4.83907 4.83151 4.90868 5.04854 5.06104
+    5.04571 5.03219 5.03025 5.02273 5.01707 5.0123 5.0087 5.00611
+    5.00429 5.00301 5.00211 5.00148 5.00103 5.00072 5.0005 5.00035
+    5.00024 5.00016 5.00011 5.00007 5.00005 5.00003 5.00001
+    4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
+    5 5 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002
+    5.00002 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
+    5 5 4.99981 5.10081 5.10903 4.98404 5.00999 5.14946 4.36501
+    2.23938 0.325144 0.00660272 -0.0102186 -0.0082401 -0.00556785
+    -0.00374178 -0.00264763 -0.00202823 -0.0182241 -0.0169551
+    -0.0150395 0.0103736 0.0877592 0.104382 0.0515938 0.0373818
+    0.0411547 0.0397009 0.0308946 0.0205793 0.0154037 0.0129191
+    0.0119327 0.011527 0.0124295 0.0161152 0.0161076 0.0145391
+    0.0144541 0.0139287 0.0129215 0.0117239 0.0105795 0.00942983
+    0.00827423 0.00718354 0.00619954 0.00532868 0.00456631 0.00390448
+    0.00333254 0.00284003 0.00241714 0.00205524 0.0017458 0.00148202
+    0.00125739 0.0010655 0.000902213 0.000763611 0.000646279
+    0.000547291 0.000463934 0.000393401 0.000332424 0.000280655
+    0.000236328 0.000199386 0.000167536 0.000141218 0.000118654
+    9.99559e-05 8.40479e-05 7.09694e-05 6.00188e-05 5.09786e-05
+    4.3502e-05 3.72191e-05 3.18114e-05 2.74071e-05 2.35539e-05
+    1.99967e-05 1.69871e-05 1.49449e-05 1.3451e-05 1.24492e-05
+    1.14256e-05 1.05669e-05 9.94487e-06 9.47514e-06 8.77318e-06
+    8.07123e-06 7.36927e-06 6.66731e-06 5.96536e-06 5.2634e-06
+    4.56144e-06 4.23044e-06 3.92649e-06 3.62254e-06 3.31858e-06
+    3.01463e-06 2.71068e-06 2.40673e-06 2.23063e-06 2.12082e-06
+    2.01102e-06 1.90121e-06 1.7914e-06 1.68159e-06 1.57178e-06
+    1.46197e-06 1.35216e-06 1.24235e-06 1.13255e-06 1.02274e-06
+    9.12929e-07 8.0312e-07 6.33171e-07 -1.51288e-08 -6.63428e-07
+    -1.31173e-06 -1.96003e-06 0.0437517 0.0265689 -0.0515377
+    -0.0658688 0.010727 -0.000511921 -8.36924e-05 2.13278e-05
+    1.45207e-05 4.54862e-06 -6.14726e-06 2.0062e-06 1.02709e-06
+    1.4152e-05 -3.08225e-05 -0.0166501 -0.0157139 -0.013957
+    0.0107537 0.0873717 0.111302 0.0454129 -0.00530142 -0.0468336
+    -0.0790063 -0.0826944 -0.0534753 -0.0288705 -0.0149009 -0.00801592
+    -0.0046342 -0.00291835 -0.00213019 -0.00170055 -0.001352
+    -0.00110593 -0.000742655 -0.000532042 -0.000544742 -0.000479206
+    -0.000407307 -0.000403575 -0.000366209 -0.000324161 -0.000286183
+    -0.000247579 -0.000214281 -0.000203435 -0.000186896 -0.000171033
+    -0.00015779 -0.000145259 -0.000128069 -0.000122647 -9.89398e-05
+    -0.000114926 -0.000132195 -0.000107872 -8.91015e-05 -7.87996e-05
+    -8.14061e-05 -8.9098e-05 -8.83368e-05 -7.6122e-05 -6.14668e-05
+    -4.75402e-05 -3.81855e-05 -3.69696e-05 -4.78656e-05 -5.61346e-05
+    -5.35007e-05 -4.1459e-05 -3.35411e-05 -2.52374e-05 -2.37479e-05
+    -4.6406e-05 -9.41884e-05 -0.000109222 -8.52676e-05 -4.25166e-05
+    -4.10125e-05 -3.95085e-05 -3.80045e-05 -3.65004e-05 -3.49964e-05
+    -3.41627e-05 -3.3541e-05 -3.29193e-05 -3.22976e-05 -3.16758e-05
+    -3.10334e-05 -3.03653e-05 -2.96971e-05 -2.9029e-05 -2.83609e-05
+    -2.76928e-05 -2.70246e-05 -2.63565e-05 -2.56884e-05 -2.50203e-05
+    -2.43521e-05 -2.38716e-05 -2.34324e-05 -2.29932e-05 -2.25539e-05
+    -2.21147e-05 -2.16755e-05 -2.12362e-05 -2.0797e-05 -2.03578e-05
+    -1.99186e-05 -1.95079e-05 -1.9217e-05 -1.8926e-05 -1.8635e-05
+    -1.8344e-05 -1.8053e-05 -1.7762e-05 -1.74711e-05 -1.71801e-05
     EOD
 
     @v[21].set(<<-'EOD')
-    1.86175 1.73273 1.42016 1.02483 0.944013 0.274107 0.0823742 
-    0.0379366 0.020816 0.0132952 0.00955525 0.00717008 0.00592286 
-    0.00437379 0.00383557 0.00273694 -0.0037467 -0.0054191 -0.00131454 
-    0.0112179 0.0133918 0.00519747 -0.00260113 -0.00252847 -0.00181292 
-    0.000183398 -0.000667607 -0.000750747 -0.000594314 -0.000433904 
-    -0.000308985 -0.000217858 -0.000152926 -0.000107454 -7.54076e-05 
-    -5.2675e-05 -3.66299e-05 -2.54341e-05 -1.75095e-05 -1.18848e-05 
-    -7.97289e-06 -5.30239e-06 -3.53615e-06 -2.38504e-06 -2.40158e-06 
-    -3.84485e-06 -5.29435e-06 -2.57099e-06 1.95189e-06 3.55083e-06 
-    2.06179e-06 5.72753e-07 3.30469e-07 3.40296e-07 3.60221e-07 
-    4.86081e-07 6.1194e-07 7.37799e-07 8.63659e-07 9.89518e-07 
-    9.21274e-07 7.22275e-07 5.23276e-07 3.24277e-07 1.25278e-07 
-    -5.59467e-08 -9.03265e-08 -1.24706e-07 -1.59086e-07 -1.93466e-07 
-    -2.27846e-07 -2.62226e-07 -2.96605e-07 -3.30985e-07 -3.65365e-07 
-    -3.99745e-07 -4.24266e-07 -3.82163e-07 -3.40061e-07 -2.97959e-07 
-    -2.55857e-07 -2.13755e-07 -1.71652e-07 -1.2955e-07 -8.7448e-08 
-    -4.53457e-08 -3.24353e-09 3.76901e-08 7.19937e-08 1.06297e-07 
-    1.40601e-07 1.74904e-07 2.09208e-07 2.43512e-07 2.77815e-07 
-    3.12119e-07 3.46422e-07 3.80726e-07 4.04507e-07 3.77191e-07 
-    3.49876e-07 3.22561e-07 2.95246e-07 2.67931e-07 2.40616e-07 
-    2.13301e-07 1.85986e-07 1.58671e-07 1.31356e-07 1.04041e-07 
-    7.67256e-08 4.94105e-08 2.20955e-08 -5.21962e-09 -3.25347e-08 
-    -5.98498e-08 -8.71649e-08 -1.1448e-07 -1.41795e-07 -1.6911e-07 
-    7.87893e-06 0.0114592 -0.0245712 -0.111637 0.0961324 1.61168 
-    3.22343 4.20442 4.53535 4.83834 4.95464 4.98874 4.99746 
-    4.99883 4.99948 4.99815 4.98431 4.99298 4.99718 5.01948 
-    5.04749 5.008 4.98243 4.98985 4.99781 4.99887 4.99679 4.99616 
-    4.99743 4.99859 4.99936 4.99972 5.00058 5.00123 5.0002 4.99945 
-    4.99983 4.9998 4.99966 4.99958 4.99956 4.99956 4.99956 4.99958 
-    4.99961 4.99965 4.99969 4.99973 4.99977 4.9998 4.99983 4.99985 
-    4.99987 4.99989 4.99991 4.99992 4.99993 4.99994 4.99995 
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 
-    5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 
-    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.01454 
-    4.99566 4.96796 4.99819 5.03232 5.00034 4.99867 4.99937 
-    4.99977 4.99992 4.99997 4.99999 5.00001 5.00021 4.99974 
-    4.98462 4.99301 4.99723 5.01936 5.04807 5.00929 4.9789 4.97876 
-    4.98244 4.9863 4.99575 5.0069 5.00863 5.00624 5.00357 5.0019 
-    5.00098 5.00048 5.00025 5.00016 5.00011 5.00013 5.00009 
-    4.99982 4.99994 5.00005 4.99994 4.99988 4.99989 4.99997 
-    5.00003 5.00005 5.00002 5.00001 5.00001 5.00001 4.99993 
-    4.99999 5 5.00021 4.99997 4.99981 5 5.00009 5.0001 5.00001 
-    4.99991 4.9999 5 5.00011 5.00017 5.00018 5.00018 5.00014 
-    5.00007 4.99999 4.9999 4.9999 5.00001 5.00016 5.00014 4.99999 
-    4.99993 4.99999 5.00009 5.00007 5.00006 5.00004 5.00003 
-    5.00001 5.00001 5 4.99999 4.99998 4.99997 4.99997 4.99997 
-    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 
-    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5 5 
+    1.86175 1.73273 1.42016 1.02483 0.944013 0.274107 0.0823742
+    0.0379366 0.020816 0.0132952 0.00955525 0.00717008 0.00592286
+    0.00437379 0.00383557 0.00273694 -0.0037467 -0.0054191 -0.00131454
+    0.0112179 0.0133918 0.00519747 -0.00260113 -0.00252847 -0.00181292
+    0.000183398 -0.000667607 -0.000750747 -0.000594314 -0.000433904
+    -0.000308985 -0.000217858 -0.000152926 -0.000107454 -7.54076e-05
+    -5.2675e-05 -3.66299e-05 -2.54341e-05 -1.75095e-05 -1.18848e-05
+    -7.97289e-06 -5.30239e-06 -3.53615e-06 -2.38504e-06 -2.40158e-06
+    -3.84485e-06 -5.29435e-06 -2.57099e-06 1.95189e-06 3.55083e-06
+    2.06179e-06 5.72753e-07 3.30469e-07 3.40296e-07 3.60221e-07
+    4.86081e-07 6.1194e-07 7.37799e-07 8.63659e-07 9.89518e-07
+    9.21274e-07 7.22275e-07 5.23276e-07 3.24277e-07 1.25278e-07
+    -5.59467e-08 -9.03265e-08 -1.24706e-07 -1.59086e-07 -1.93466e-07
+    -2.27846e-07 -2.62226e-07 -2.96605e-07 -3.30985e-07 -3.65365e-07
+    -3.99745e-07 -4.24266e-07 -3.82163e-07 -3.40061e-07 -2.97959e-07
+    -2.55857e-07 -2.13755e-07 -1.71652e-07 -1.2955e-07 -8.7448e-08
+    -4.53457e-08 -3.24353e-09 3.76901e-08 7.19937e-08 1.06297e-07
+    1.40601e-07 1.74904e-07 2.09208e-07 2.43512e-07 2.77815e-07
+    3.12119e-07 3.46422e-07 3.80726e-07 4.04507e-07 3.77191e-07
+    3.49876e-07 3.22561e-07 2.95246e-07 2.67931e-07 2.40616e-07
+    2.13301e-07 1.85986e-07 1.58671e-07 1.31356e-07 1.04041e-07
+    7.67256e-08 4.94105e-08 2.20955e-08 -5.21962e-09 -3.25347e-08
+    -5.98498e-08 -8.71649e-08 -1.1448e-07 -1.41795e-07 -1.6911e-07
+    7.87893e-06 0.0114592 -0.0245712 -0.111637 0.0961324 1.61168
+    3.22343 4.20442 4.53535 4.83834 4.95464 4.98874 4.99746
+    4.99883 4.99948 4.99815 4.98431 4.99298 4.99718 5.01948
+    5.04749 5.008 4.98243 4.98985 4.99781 4.99887 4.99679 4.99616
+    4.99743 4.99859 4.99936 4.99972 5.00058 5.00123 5.0002 4.99945
+    4.99983 4.9998 4.99966 4.99958 4.99956 4.99956 4.99956 4.99958
+    4.99961 4.99965 4.99969 4.99973 4.99977 4.9998 4.99983 4.99985
+    4.99987 4.99989 4.99991 4.99992 4.99993 4.99994 4.99995
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001
+    5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
+    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.01454
+    4.99566 4.96796 4.99819 5.03232 5.00034 4.99867 4.99937
+    4.99977 4.99992 4.99997 4.99999 5.00001 5.00021 4.99974
+    4.98462 4.99301 4.99723 5.01936 5.04807 5.00929 4.9789 4.97876
+    4.98244 4.9863 4.99575 5.0069 5.00863 5.00624 5.00357 5.0019
+    5.00098 5.00048 5.00025 5.00016 5.00011 5.00013 5.00009
+    4.99982 4.99994 5.00005 4.99994 4.99988 4.99989 4.99997
+    5.00003 5.00005 5.00002 5.00001 5.00001 5.00001 4.99993
+    4.99999 5 5.00021 4.99997 4.99981 5 5.00009 5.0001 5.00001
+    4.99991 4.9999 5 5.00011 5.00017 5.00018 5.00018 5.00014
+    5.00007 4.99999 4.9999 4.9999 5.00001 5.00016 5.00014 4.99999
+    4.99993 4.99999 5.00009 5.00007 5.00006 5.00004 5.00003
+    5.00001 5.00001 5 4.99999 4.99998 4.99997 4.99997 4.99997
+    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
+    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5 5
     EOD
 
     @v[22].set(<<-'EOD')
-    7.10441e-10 0.00107105 0.000637109 -0.00236346 -0.018079 
-    -0.0120077 -0.00217059 0.00266679 0.00403383 0.00403836 
-    0.00356705 0.00303303 0.00244716 0.00198586 0.0016855 0.00136497 
-    -3.96022e-05 -0.000367409 -3.77079e-05 0.00194085 0.00506964 
-    -0.0400214 -0.0402572 0.0524434 0.286234 0.803011 1.44795 
-    2.02473 2.54768 3.02748 3.4415 3.78287 4.09667 4.35152 4.53987 
-    4.67614 4.77407 4.84319 4.89227 4.92702 4.95119 4.96764 
-    4.97846 4.98557 4.98982 4.99209 4.99371 4.99569 4.99727 
-    4.99802 4.99834 4.99867 4.99892 4.99915 4.99936 4.99939 
-    4.99943 4.99946 4.9995 4.99953 4.99957 4.9996 4.99963 4.99967 
-    4.9997 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 4.9998 
-    4.99981 4.99982 4.99983 4.99984 4.99985 4.99986 4.99986 
-    4.99986 4.99987 4.99987 4.99988 4.99988 4.99989 4.99989 
-    4.9999 4.9999 4.9999 4.9999 4.99991 4.99991 4.99991 4.99991 
-    4.99992 4.99992 4.99992 4.99992 4.99993 4.99993 4.99993 
-    4.99993 4.99993 4.99993 4.99993 4.99993 4.99994 4.99994 
-    4.99994 4.99994 4.99994 4.99994 4.99994 4.99994 4.99995 
-    4.99995 4.99995 4.99995 4.99995 4.99995 4.99995 5.00145 
-    5.00659 5.01209 5.01931 5.00279 4.99273 4.99217 4.99295 
-    4.99471 4.99594 4.99696 4.9978 4.99844 4.99891 4.99924 4.99635 
-    4.99699 4.99813 5.00068 5.00307 5.0588 4.96365 4.54012 3.6307 
-    2.35176 1.0322 0.354379 0.115986 0.0435668 0.0245112 0.020786 
-    0.0164656 0.0118409 0.00849698 0.00597078 0.0040105 0.0026076 
-    0.0016597 0.00118185 0.00121067 0.00153587 0.00174836 0.00136519 
-    -0.000189116 -0.00315555 -0.00646603 -0.00898042 -0.010203 
-    -0.0110896 -0.0123764 -0.00953841 -0.00225795 0.000818314 
-    0.00152252 0.00150269 0.00119025 0.000767068 0.000308852 
-    -3.79272e-05 -0.00019691 -0.000186642 -9.73653e-05 -8.49784e-06 
-    2.04147e-05 -9.91086e-06 -1.55959e-05 -1.80499e-05 -1.77097e-05 
-    -1.51548e-05 -1.1978e-05 -9.84916e-06 -1.29728e-05 -1.67235e-05 
-    -1.74153e-05 -1.39958e-05 -5.92272e-06 -8.08216e-06 -1.53077e-05 
-    -2.92531e-05 -3.91049e-05 -2.98935e-05 -7.32122e-06 3.18534e-05 
-    4.39134e-05 4.18753e-05 3.22759e-05 1.86766e-05 1.58432e-05 
-    1.30098e-05 1.01765e-05 7.34312e-06 4.50975e-06 1.67639e-06 
-    -1.15697e-06 -1.23877e-06 -1.11991e-06 -1.00106e-06 -8.82208e-07 
-    -7.63355e-07 -6.44502e-07 -5.2565e-07 -4.29318e-07 -3.44661e-07 
-    -2.60004e-07 -1.75347e-07 -9.06904e-08 -6.03349e-09 7.86234e-08 
-    1.6328e-07 2.47937e-07 3.32594e-07 4.17251e-07 5.01908e-07 
-    5.86565e-07 6.71222e-07 7.36123e-07 6.43886e-07 5.5165e-07 
-    4.59414e-07 3.67178e-07 0.000334759 -4.60833e-05 -0.00106139 
-    -0.00166624 0.000859563 0.00102606 0.00410037 0.00419931 
-    0.00518997 0.00459791 0.00503125 0.00523877 0.00452158 0.00339924 
-    0.00233399 0.000876915 0.000546439 0.000444299 0.000983968 
-    0.00119304 -0.0429422 -0.0403983 0.0534896 0.288013 0.807345 
-    1.44247 2.03448 2.57021 3.05049 3.47332 3.8131 4.1009 4.34677 
-    4.53512 4.67127 4.76531 4.82526 4.86593 4.89586 4.91904 
-    4.93806 4.95348 4.96597 4.97629 4.9843 4.98983 4.99335 4.9957 
-    4.99741 4.99864 4.99946 4.99994 5.00047 5.00073 5.00086 
-    5.00092 5.00094 5.00091 5.00087 5.00081 5.00074 5.00067 
-    5.00059 5.00052 5.00046 5.0004 5.00034 5.0003 5.00026 5.00022 
-    5.00019 5.00016 5.00014 5.00012 5.0001 5.00009 5.00007 5.00006 
-    5.00006 5.00005 5.00004 5.00004 5.00004 5.00003 5.00003 
-    5.00003 5.00002 5.00002 5.00002 5.00002 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 
-    5.00001 5.00001 5.00002 5.00002 
+    7.10441e-10 0.00107105 0.000637109 -0.00236346 -0.018079
+    -0.0120077 -0.00217059 0.00266679 0.00403383 0.00403836
+    0.00356705 0.00303303 0.00244716 0.00198586 0.0016855 0.00136497
+    -3.96022e-05 -0.000367409 -3.77079e-05 0.00194085 0.00506964
+    -0.0400214 -0.0402572 0.0524434 0.286234 0.803011 1.44795
+    2.02473 2.54768 3.02748 3.4415 3.78287 4.09667 4.35152 4.53987
+    4.67614 4.77407 4.84319 4.89227 4.92702 4.95119 4.96764
+    4.97846 4.98557 4.98982 4.99209 4.99371 4.99569 4.99727
+    4.99802 4.99834 4.99867 4.99892 4.99915 4.99936 4.99939
+    4.99943 4.99946 4.9995 4.99953 4.99957 4.9996 4.99963 4.99967
+    4.9997 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 4.9998
+    4.99981 4.99982 4.99983 4.99984 4.99985 4.99986 4.99986
+    4.99986 4.99987 4.99987 4.99988 4.99988 4.99989 4.99989
+    4.9999 4.9999 4.9999 4.9999 4.99991 4.99991 4.99991 4.99991
+    4.99992 4.99992 4.99992 4.99992 4.99993 4.99993 4.99993
+    4.99993 4.99993 4.99993 4.99993 4.99993 4.99994 4.99994
+    4.99994 4.99994 4.99994 4.99994 4.99994 4.99994 4.99995
+    4.99995 4.99995 4.99995 4.99995 4.99995 4.99995 5.00145
+    5.00659 5.01209 5.01931 5.00279 4.99273 4.99217 4.99295
+    4.99471 4.99594 4.99696 4.9978 4.99844 4.99891 4.99924 4.99635
+    4.99699 4.99813 5.00068 5.00307 5.0588 4.96365 4.54012 3.6307
+    2.35176 1.0322 0.354379 0.115986 0.0435668 0.0245112 0.020786
+    0.0164656 0.0118409 0.00849698 0.00597078 0.0040105 0.0026076
+    0.0016597 0.00118185 0.00121067 0.00153587 0.00174836 0.00136519
+    -0.000189116 -0.00315555 -0.00646603 -0.00898042 -0.010203
+    -0.0110896 -0.0123764 -0.00953841 -0.00225795 0.000818314
+    0.00152252 0.00150269 0.00119025 0.000767068 0.000308852
+    -3.79272e-05 -0.00019691 -0.000186642 -9.73653e-05 -8.49784e-06
+    2.04147e-05 -9.91086e-06 -1.55959e-05 -1.80499e-05 -1.77097e-05
+    -1.51548e-05 -1.1978e-05 -9.84916e-06 -1.29728e-05 -1.67235e-05
+    -1.74153e-05 -1.39958e-05 -5.92272e-06 -8.08216e-06 -1.53077e-05
+    -2.92531e-05 -3.91049e-05 -2.98935e-05 -7.32122e-06 3.18534e-05
+    4.39134e-05 4.18753e-05 3.22759e-05 1.86766e-05 1.58432e-05
+    1.30098e-05 1.01765e-05 7.34312e-06 4.50975e-06 1.67639e-06
+    -1.15697e-06 -1.23877e-06 -1.11991e-06 -1.00106e-06 -8.82208e-07
+    -7.63355e-07 -6.44502e-07 -5.2565e-07 -4.29318e-07 -3.44661e-07
+    -2.60004e-07 -1.75347e-07 -9.06904e-08 -6.03349e-09 7.86234e-08
+    1.6328e-07 2.47937e-07 3.32594e-07 4.17251e-07 5.01908e-07
+    5.86565e-07 6.71222e-07 7.36123e-07 6.43886e-07 5.5165e-07
+    4.59414e-07 3.67178e-07 0.000334759 -4.60833e-05 -0.00106139
+    -0.00166624 0.000859563 0.00102606 0.00410037 0.00419931
+    0.00518997 0.00459791 0.00503125 0.00523877 0.00452158 0.00339924
+    0.00233399 0.000876915 0.000546439 0.000444299 0.000983968
+    0.00119304 -0.0429422 -0.0403983 0.0534896 0.288013 0.807345
+    1.44247 2.03448 2.57021 3.05049 3.47332 3.8131 4.1009 4.34677
+    4.53512 4.67127 4.76531 4.82526 4.86593 4.89586 4.91904
+    4.93806 4.95348 4.96597 4.97629 4.9843 4.98983 4.99335 4.9957
+    4.99741 4.99864 4.99946 4.99994 5.00047 5.00073 5.00086
+    5.00092 5.00094 5.00091 5.00087 5.00081 5.00074 5.00067
+    5.00059 5.00052 5.00046 5.0004 5.00034 5.0003 5.00026 5.00022
+    5.00019 5.00016 5.00014 5.00012 5.0001 5.00009 5.00007 5.00006
+    5.00006 5.00005 5.00004 5.00004 5.00004 5.00003 5.00003
+    5.00003 5.00002 5.00002 5.00002 5.00002 5.00001 5.00001
+    5.00001 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001
+    5.00001 5.00001 5.00002 5.00002
     EOD
 
     @v[23].set(<<-'EOD')
-    5 5.00284 5.01266 5.01895 4.98936 4.99575 4.99217 4.99545 
-    4.99775 4.99894 4.99946 4.99968 4.99975 4.99977 4.99986 
-    4.9999 4.99528 4.99808 5.00039 5.00392 5.00512 4.99985 4.99863 
-    4.99942 4.99992 5.00017 4.99897 4.99803 4.99784 4.99739 
-    4.99883 5.00365 5.00298 5.00133 5.00048 5.00019 5.00008 
-    5.00005 5.00004 5.00003 5.00002 5.00002 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5 5 4.99999 4.99997 4.99995 4.99996 
-    4.99998 5 5.00001 5.00001 5.00002 5.00002 5.00003 5.00003 
-    5.00002 5.00002 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99998 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5 5 5 5 5 5 5 5.00217 5.00108 4.99547 4.99658 5.00667 
-    4.99641 4.99532 4.99938 5.00328 5.00222 5.00114 5.00052 
-    5.00024 5.00011 5.00009 4.99285 4.99591 4.99897 5.00403 
-    5.00786 5.00318 4.99942 4.9992 4.99949 5.001 5.00408 5.00319 
-    5.00063 4.99995 5.00014 4.99982 4.99832 4.99838 4.99865 
-    4.99912 4.99836 4.99735 4.99606 4.99814 5.00958 5.02973 
-    5.05293 5.06103 4.99342 4.80726 4.50744 4.07509 3.41358 
-    2.37924 1.03194 0.261552 0.142392 0.0904482 0.0555071 0.0322869 
-    0.018289 0.0113802 0.00875182 0.00757055 0.00629906 0.00523 
-    0.00403349 0.0031953 0.00280864 0.00286119 0.00250389 0.00202815 
-    0.001723 0.00147312 0.0012411 0.00104401 0.000886204 0.000758277 
-    0.000651915 0.00056348 0.000487966 0.000424048 0.000365613 
-    0.000308178 0.000258725 0.000228061 0.000207976 0.000198491 
-    0.00018518 0.000172716 0.000163197 0.000155007 0.000141734 
-    0.000128461 0.000115188 0.000101915 8.86417e-05 7.53686e-05 
-    6.20956e-05 5.69164e-05 5.23275e-05 4.77385e-05 4.31495e-05 
-    3.85605e-05 3.39716e-05 2.93826e-05 2.69449e-05 2.56224e-05 
-    2.42999e-05 2.29774e-05 2.16549e-05 2.03324e-05 1.90099e-05 
-    1.76873e-05 1.63648e-05 1.50423e-05 1.37198e-05 1.23973e-05 
-    1.10748e-05 9.75232e-06 8.48447e-06 7.65129e-06 6.81811e-06 
-    5.98494e-06 5.15176e-06 0.00056893 -0.00787906 -0.0217381 
-    -0.0370066 -0.00770505 0.00659312 0.00975477 0.00949456 
-    0.00777552 0.00655645 0.00568776 0.00508782 0.00458121 0.00410187 
-    0.00365665 0.0015121 0.00160863 0.00263181 0.00638941 0.00772607 
-    0.00225583 0.0010843 0.000882939 0.000801563 0.00075632 
-    0.000554992 0.000435131 0.0003474 0.000217667 0.000491602 
-    0.0012267 0.00250446 0.000212058 -0.0174972 -0.0527527 -0.0479071 
-    0.194908 1.45838 3.40677 4.49242 4.86894 4.97215 5.01218 
-    5.04342 5.06228 5.03069 4.87169 4.57056 4.11523 3.38264 
-    2.19691 0.715839 0.172818 0.102162 0.0627162 0.0363388 0.020289 
-    0.0119414 0.00826608 0.0066417 0.00549092 0.00492505 0.00439443 
-    0.0037156 0.00306471 0.00247451 0.00195965 0.0014822 0.0010815 
-    0.000904464 0.0010514 0.00152308 0.00120752 0.000228447 
-    -0.00102833 -0.00116644 -0.00042067 4.78758e-05 5.09599e-05 
-    -4.45756e-05 -3.22966e-06 3.81163e-05 7.94622e-05 0.000120808 
-    0.000162154 0.000161895 0.000148481 0.000135068 0.000121654 
-    0.000108241 9.81453e-05 9.2164e-05 8.61827e-05 8.02014e-05 
-    7.42201e-05 6.82388e-05 6.22576e-05 5.62763e-05 5.0295e-05 
-    4.43137e-05 3.83324e-05 3.54323e-05 3.321e-05 3.09877e-05 
-    2.87654e-05 2.65431e-05 2.43209e-05 2.20986e-05 1.98763e-05 
-    1.7654e-05 1.54317e-05 1.34612e-05 1.25441e-05 1.1627e-05 
-    1.07099e-05 9.79276e-06 8.87564e-06 7.95851e-06 7.04139e-06 
-    6.12427e-06 
+    5 5.00284 5.01266 5.01895 4.98936 4.99575 4.99217 4.99545
+    4.99775 4.99894 4.99946 4.99968 4.99975 4.99977 4.99986
+    4.9999 4.99528 4.99808 5.00039 5.00392 5.00512 4.99985 4.99863
+    4.99942 4.99992 5.00017 4.99897 4.99803 4.99784 4.99739
+    4.99883 5.00365 5.00298 5.00133 5.00048 5.00019 5.00008
+    5.00005 5.00004 5.00003 5.00002 5.00002 5.00001 5.00001
+    5.00001 5.00001 5.00001 5 5 4.99999 4.99997 4.99995 4.99996
+    4.99998 5 5.00001 5.00001 5.00002 5.00002 5.00003 5.00003
+    5.00002 5.00002 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99998 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5 5 5 5 5 5 5 5.00217 5.00108 4.99547 4.99658 5.00667
+    4.99641 4.99532 4.99938 5.00328 5.00222 5.00114 5.00052
+    5.00024 5.00011 5.00009 4.99285 4.99591 4.99897 5.00403
+    5.00786 5.00318 4.99942 4.9992 4.99949 5.001 5.00408 5.00319
+    5.00063 4.99995 5.00014 4.99982 4.99832 4.99838 4.99865
+    4.99912 4.99836 4.99735 4.99606 4.99814 5.00958 5.02973
+    5.05293 5.06103 4.99342 4.80726 4.50744 4.07509 3.41358
+    2.37924 1.03194 0.261552 0.142392 0.0904482 0.0555071 0.0322869
+    0.018289 0.0113802 0.00875182 0.00757055 0.00629906 0.00523
+    0.00403349 0.0031953 0.00280864 0.00286119 0.00250389 0.00202815
+    0.001723 0.00147312 0.0012411 0.00104401 0.000886204 0.000758277
+    0.000651915 0.00056348 0.000487966 0.000424048 0.000365613
+    0.000308178 0.000258725 0.000228061 0.000207976 0.000198491
+    0.00018518 0.000172716 0.000163197 0.000155007 0.000141734
+    0.000128461 0.000115188 0.000101915 8.86417e-05 7.53686e-05
+    6.20956e-05 5.69164e-05 5.23275e-05 4.77385e-05 4.31495e-05
+    3.85605e-05 3.39716e-05 2.93826e-05 2.69449e-05 2.56224e-05
+    2.42999e-05 2.29774e-05 2.16549e-05 2.03324e-05 1.90099e-05
+    1.76873e-05 1.63648e-05 1.50423e-05 1.37198e-05 1.23973e-05
+    1.10748e-05 9.75232e-06 8.48447e-06 7.65129e-06 6.81811e-06
+    5.98494e-06 5.15176e-06 0.00056893 -0.00787906 -0.0217381
+    -0.0370066 -0.00770505 0.00659312 0.00975477 0.00949456
+    0.00777552 0.00655645 0.00568776 0.00508782 0.00458121 0.00410187
+    0.00365665 0.0015121 0.00160863 0.00263181 0.00638941 0.00772607
+    0.00225583 0.0010843 0.000882939 0.000801563 0.00075632
+    0.000554992 0.000435131 0.0003474 0.000217667 0.000491602
+    0.0012267 0.00250446 0.000212058 -0.0174972 -0.0527527 -0.0479071
+    0.194908 1.45838 3.40677 4.49242 4.86894 4.97215 5.01218
+    5.04342 5.06228 5.03069 4.87169 4.57056 4.11523 3.38264
+    2.19691 0.715839 0.172818 0.102162 0.0627162 0.0363388 0.020289
+    0.0119414 0.00826608 0.0066417 0.00549092 0.00492505 0.00439443
+    0.0037156 0.00306471 0.00247451 0.00195965 0.0014822 0.0010815
+    0.000904464 0.0010514 0.00152308 0.00120752 0.000228447
+    -0.00102833 -0.00116644 -0.00042067 4.78758e-05 5.09599e-05
+    -4.45756e-05 -3.22966e-06 3.81163e-05 7.94622e-05 0.000120808
+    0.000162154 0.000161895 0.000148481 0.000135068 0.000121654
+    0.000108241 9.81453e-05 9.2164e-05 8.61827e-05 8.02014e-05
+    7.42201e-05 6.82388e-05 6.22576e-05 5.62763e-05 5.0295e-05
+    4.43137e-05 3.83324e-05 3.54323e-05 3.321e-05 3.09877e-05
+    2.87654e-05 2.65431e-05 2.43209e-05 2.20986e-05 1.98763e-05
+    1.7654e-05 1.54317e-05 1.34612e-05 1.25441e-05 1.1627e-05
+    1.07099e-05 9.79276e-06 8.87564e-06 7.95851e-06 7.04139e-06
+    6.12427e-06
     EOD
 
     @v[24].set(<<-'EOD')
-    5 5.01099 5.00866 4.97845 4.92369 4.9273 4.97413 4.9929 
-    4.99826 4.99958 4.99978 5.00005 4.99968 4.99959 5.00014 
-    4.99979 4.99914 4.99982 5.00023 5.00295 5.00664 4.99854 
-    4.99647 5.00438 5.01722 5.03681 5.04766 5.04799 5.04867 
-    5.04873 5.04685 5.04413 5.0367 5.02505 5.01726 5.01183 5.00806 
-    5.00549 5.00371 5.00246 5.00162 5.00105 5.00069 5.00045 
-    5.00031 5.00024 5.00019 5.00012 5.00007 5.00004 5.00001 
-    4.99998 4.99999 4.99999 5 5.00001 5.00001 5.00002 5.00002 
-    5.00003 5.00003 5.00003 5.00002 5.00002 5.00001 5.00001 
-    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    5 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5.00418 4.99953 4.99152 
-    4.99807 5.00497 5.00112 5.00055 5.00038 5.00018 5.00006 
-    5.00006 5.00007 5.00006 5.00004 5.00004 4.99853 4.99945 
-    4.99998 5.00304 5.00935 5.00742 4.99181 4.97421 4.93603 
-    4.8853 4.8927 4.93984 4.97458 4.99039 4.99614 4.99801 4.99851 
-    4.99869 4.99924 5.00108 5.00181 5.00119 5.00059 5.00031 
-    5.00022 5.00018 5.00011 5.00001 5.00006 4.99981 4.99977 
-    4.99982 5.00012 4.99993 5.00008 5.00043 5.00048 5.00024 
-    5.00008 4.99984 4.99993 5.00011 4.99996 4.9998 4.99977 4.9998 
-    4.99993 5.00008 5.00011 5.00002 4.99995 4.99989 4.99993 
-    5 5.00007 5.00009 4.99994 4.99977 4.9997 4.99975 4.99996 
-    4.99996 4.99988 4.9997 4.99952 4.9995 4.99956 4.99973 4.99988 
-    5.00005 5.00025 5.00042 5.00036 5.00031 5.00025 5.0002 5.00014 
-    5.00009 5.00003 5.00002 5.00001 5.00001 5 4.99999 4.99998 
-    4.99998 4.99997 4.99998 4.99998 4.99998 4.99998 4.99998 
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5.00284 
-    5.00442 5.00381 4.98997 4.99092 5.00733 5.07791 4.98237 
-    4.86434 4.76835 4.74067 4.79278 4.85094 4.90068 4.93603 
-    4.95698 4.96984 4.97856 4.98869 4.99904 5.0005 4.99524 5.00181 
-    5.01878 5.05177 5.07986 4.98917 4.56217 3.68 2.3539 1.18541 
-    0.505772 0.221044 0.115287 0.0760938 0.0589194 0.0476784 
-    0.0457213 0.0412911 0.033889 0.0259741 0.0191452 0.0139018 
-    0.0100235 0.00711788 0.00497657 0.00349368 0.00250021 0.00176179 
-    0.00121843 0.000838368 0.000582711 0.000423458 0.000294608 
-    0.000201251 0.000133748 8.6227e-05 5.44252e-05 3.30514e-05 
-    1.93926e-05 1.09814e-05 5.29857e-06 1.92247e-06 3.08708e-07 
-    -3.74311e-07 -6.11121e-07 -7.27807e-07 -4.87604e-07 -4.80493e-07 
-    -9.15925e-07 -2.03774e-06 -4.01128e-06 -2.46644e-06 2.10626e-06 
-    8.22422e-06 1.04922e-05 9.83047e-06 7.27106e-06 3.29654e-06 
-    -2.06736e-06 -2.18019e-06 -2.29303e-06 -2.40586e-06 -2.51869e-06 
-    -2.63153e-06 -2.24615e-06 -1.70325e-06 -1.16036e-06 -6.17468e-07 
-    -7.45754e-08 2.45198e-07 2.88285e-07 3.31373e-07 3.7446e-07 
-    4.17548e-07 4.60635e-07 5.03723e-07 5.4681e-07 5.89898e-07 
-    6.32985e-07 6.76073e-07 6.19054e-07 5.4001e-07 4.60967e-07 
-    3.81923e-07 3.02879e-07 2.23836e-07 1.44792e-07 6.57488e-08 
-    -1.32948e-08 -9.23383e-08 -1.6698e-07 -2.23206e-07 -2.79432e-07 
-    -3.35658e-07 -3.91884e-07 -4.48109e-07 -5.04335e-07 -5.60561e-07 
-    -6.16787e-07 
+    5 5.01099 5.00866 4.97845 4.92369 4.9273 4.97413 4.9929
+    4.99826 4.99958 4.99978 5.00005 4.99968 4.99959 5.00014
+    4.99979 4.99914 4.99982 5.00023 5.00295 5.00664 4.99854
+    4.99647 5.00438 5.01722 5.03681 5.04766 5.04799 5.04867
+    5.04873 5.04685 5.04413 5.0367 5.02505 5.01726 5.01183 5.00806
+    5.00549 5.00371 5.00246 5.00162 5.00105 5.00069 5.00045
+    5.00031 5.00024 5.00019 5.00012 5.00007 5.00004 5.00001
+    4.99998 4.99999 4.99999 5 5.00001 5.00001 5.00002 5.00002
+    5.00003 5.00003 5.00003 5.00002 5.00002 5.00001 5.00001
+    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    5 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5.00418 4.99953 4.99152
+    4.99807 5.00497 5.00112 5.00055 5.00038 5.00018 5.00006
+    5.00006 5.00007 5.00006 5.00004 5.00004 4.99853 4.99945
+    4.99998 5.00304 5.00935 5.00742 4.99181 4.97421 4.93603
+    4.8853 4.8927 4.93984 4.97458 4.99039 4.99614 4.99801 4.99851
+    4.99869 4.99924 5.00108 5.00181 5.00119 5.00059 5.00031
+    5.00022 5.00018 5.00011 5.00001 5.00006 4.99981 4.99977
+    4.99982 5.00012 4.99993 5.00008 5.00043 5.00048 5.00024
+    5.00008 4.99984 4.99993 5.00011 4.99996 4.9998 4.99977 4.9998
+    4.99993 5.00008 5.00011 5.00002 4.99995 4.99989 4.99993
+    5 5.00007 5.00009 4.99994 4.99977 4.9997 4.99975 4.99996
+    4.99996 4.99988 4.9997 4.99952 4.9995 4.99956 4.99973 4.99988
+    5.00005 5.00025 5.00042 5.00036 5.00031 5.00025 5.0002 5.00014
+    5.00009 5.00003 5.00002 5.00001 5.00001 5 4.99999 4.99998
+    4.99998 4.99997 4.99998 4.99998 4.99998 4.99998 4.99998
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5.00284
+    5.00442 5.00381 4.98997 4.99092 5.00733 5.07791 4.98237
+    4.86434 4.76835 4.74067 4.79278 4.85094 4.90068 4.93603
+    4.95698 4.96984 4.97856 4.98869 4.99904 5.0005 4.99524 5.00181
+    5.01878 5.05177 5.07986 4.98917 4.56217 3.68 2.3539 1.18541
+    0.505772 0.221044 0.115287 0.0760938 0.0589194 0.0476784
+    0.0457213 0.0412911 0.033889 0.0259741 0.0191452 0.0139018
+    0.0100235 0.00711788 0.00497657 0.00349368 0.00250021 0.00176179
+    0.00121843 0.000838368 0.000582711 0.000423458 0.000294608
+    0.000201251 0.000133748 8.6227e-05 5.44252e-05 3.30514e-05
+    1.93926e-05 1.09814e-05 5.29857e-06 1.92247e-06 3.08708e-07
+    -3.74311e-07 -6.11121e-07 -7.27807e-07 -4.87604e-07 -4.80493e-07
+    -9.15925e-07 -2.03774e-06 -4.01128e-06 -2.46644e-06 2.10626e-06
+    8.22422e-06 1.04922e-05 9.83047e-06 7.27106e-06 3.29654e-06
+    -2.06736e-06 -2.18019e-06 -2.29303e-06 -2.40586e-06 -2.51869e-06
+    -2.63153e-06 -2.24615e-06 -1.70325e-06 -1.16036e-06 -6.17468e-07
+    -7.45754e-08 2.45198e-07 2.88285e-07 3.31373e-07 3.7446e-07
+    4.17548e-07 4.60635e-07 5.03723e-07 5.4681e-07 5.89898e-07
+    6.32985e-07 6.76073e-07 6.19054e-07 5.4001e-07 4.60967e-07
+    3.81923e-07 3.02879e-07 2.23836e-07 1.44792e-07 6.57488e-08
+    -1.32948e-08 -9.23383e-08 -1.6698e-07 -2.23206e-07 -2.79432e-07
+    -3.35658e-07 -3.91884e-07 -4.48109e-07 -5.04335e-07 -5.60561e-07
+    -6.16787e-07
     EOD
 
     @v[25].set(<<-'EOD')
-    1.34824 1.35838 1.36465 1.34675 1.29167 1.23161 1.2201 1.2185 
-    1.2181 1.21798 1.21793 1.21788 1.21785 1.21782 1.21779 1.21776 
-    1.21655 1.21656 1.21669 1.21871 1.22421 1.22247 1.21858 
-    1.2228 1.23803 1.27737 1.10647 0.395248 0.0600669 0.027687 
-    0.0192374 0.015425 0.0130881 0.00977445 0.00696598 0.00491122 
-    0.00341952 0.00237078 0.00162339 0.00109178 0.000726647 
-    0.000478886 0.00031568 0.000207902 0.000143494 0.000109768 
-    8.62987e-05 5.69775e-05 3.36547e-05 2.30356e-05 1.86108e-05 
-    1.41861e-05 1.08293e-05 7.68835e-06 4.79593e-06 4.51019e-06 
-    4.22444e-06 3.9387e-06 3.65295e-06 3.36721e-06 3.04559e-06 
-    2.69981e-06 2.35403e-06 2.00825e-06 1.66247e-06 1.34508e-06 
-    1.26225e-06 1.17941e-06 1.09657e-06 1.01373e-06 9.30893e-07 
-    8.48054e-07 7.65216e-07 6.82378e-07 5.9954e-07 5.16702e-07 
-    4.37489e-07 3.82774e-07 3.2806e-07 2.73346e-07 2.18632e-07 
-    1.63917e-07 1.09203e-07 5.4489e-08 -2.2523e-10 -5.49395e-08 
-    -1.09654e-07 -1.52862e-07 -1.3079e-07 -1.08718e-07 -8.6646e-08 
-    -6.45739e-08 -4.25019e-08 -2.04298e-08 1.64229e-09 2.37144e-08 
-    4.57864e-08 6.78585e-08 8.71693e-08 9.30725e-08 9.89758e-08 
-    1.04879e-07 1.10782e-07 1.16685e-07 1.22589e-07 1.28492e-07 
-    1.34395e-07 1.40298e-07 1.46201e-07 1.52105e-07 1.58008e-07 
-    1.63911e-07 1.69814e-07 1.75718e-07 1.81621e-07 1.87524e-07 
-    1.93427e-07 1.9933e-07 2.05234e-07 2.11137e-07 2.19788e-07 
-    0.000393944 -0.000218983 -0.00105784 0.00172403 -0.00027134 
-    -0.000204147 8.79968e-06 5.93762e-05 5.83554e-05 4.13815e-05 
-    3.71369e-05 3.03372e-05 2.25336e-05 1.5986e-05 1.07284e-05 
-    -7.5239e-05 5.60593e-05 6.97571e-05 0.000667617 0.000960856 
-    0.00131749 -0.00759564 -0.0217897 -0.0450321 -0.076646 -0.128569 
-    -0.186391 -0.202175 -0.206953 -0.2082 -0.208416 -0.208669 
-    -0.208934 -0.209111 -0.209234 -0.209329 -0.209389 -0.209416 
-    -0.2094 -0.209329 -0.20926 -0.209204 -0.209208 -0.209285 
-    -0.209454 -0.209641 -0.20977 -0.209811 -0.209833 -0.209887 
-    -0.209653 -0.209127 -0.208893 -0.208811 -0.208777 -0.208758 
-    -0.208747 -0.20874 -0.208726 -0.208697 -0.208657 -0.208611 
-    -0.208565 -0.208524 -0.208488 -0.208451 -0.208412 -0.208373 
-    -0.208333 -0.208294 -0.208256 -0.208219 -0.208183 -0.208145 
-    -0.208107 -0.208066 -0.208029 -0.207993 -0.207959 -0.207923 
-    -0.207883 -0.207838 -0.207789 -0.207747 -0.20771 -0.207675 
-    -0.207642 -0.207605 -0.207568 -0.207531 -0.207494 -0.207457 
-    -0.20742 -0.207383 -0.207346 -0.207308 -0.207271 -0.207233 
-    -0.207196 -0.207158 -0.207121 -0.207084 -0.207046 -0.207009 
-    -0.206972 -0.206935 -0.206898 -0.206861 -0.206823 -0.206786 
-    -0.206749 -0.206712 -0.206675 -0.206638 -0.2066 -0.206563 
-    -0.206526 -0.206489 -0.206452 -0.206415 -0.203384 -0.20015 
-    -0.196872 -0.205024 -0.210727 -0.206779 -0.0685263 0.586138 
-    1.4665 2.22945 2.77554 3.076 3.24926 3.34515 3.40164 3.43006 
-    3.43713 3.43075 3.42886 3.4384 3.46567 3.49025 3.51287 3.53821 
-    3.57841 3.39846 2.80753 2.22947 1.7549 1.30429 0.707786 
-    0.303206 0.131352 0.0671706 0.0429955 0.032461 0.0257161 
-    0.0239521 0.0217397 0.0179705 0.0138745 0.0102813 0.00749643 
-    0.0054328 0.00386817 0.0027004 0.00189442 0.00135552 0.000954715 
-    0.000659981 0.000453435 0.000313993 0.000231347 0.000159665 
-    0.000108122 7.10528e-05 4.50233e-05 2.77892e-05 1.62765e-05 
-    8.9893e-06 4.5471e-06 1.54614e-06 -1.6542e-07 -8.68508e-07 
-    -1.04369e-06 -9.63086e-07 -8.44294e-07 -6.57339e-07 -7.35885e-07 
-    -9.80056e-07 -1.39772e-06 -2.10199e-06 -1.37474e-06 6.13269e-07 
-    3.3028e-06 4.60941e-06 4.91053e-06 4.14186e-06 2.45258e-06 
-    -8.7388e-09 -3.59647e-07 -7.10554e-07 -1.06146e-06 -1.41237e-06 
-    -1.76328e-06 -1.63073e-06 -1.34534e-06 -1.05995e-06 -7.74561e-07 
-    -4.8917e-07 -2.95733e-07 -2.16326e-07 -1.3692e-07 -5.75135e-08 
-    2.18929e-08 1.01299e-07 1.80706e-07 2.60112e-07 3.39519e-07 
-    4.18925e-07 4.98332e-07 4.83984e-07 4.4901e-07 4.14035e-07 
-    3.79061e-07 3.44087e-07 3.09112e-07 2.74138e-07 2.39163e-07 
-    2.04189e-07 1.69215e-07 1.26002e-07 4.83213e-08 -2.9359e-08 
-    -1.07039e-07 -1.8472e-07 -2.624e-07 -3.4008e-07 -4.1776e-07 
-    -4.95441e-07 
+    1.34824 1.35838 1.36465 1.34675 1.29167 1.23161 1.2201 1.2185
+    1.2181 1.21798 1.21793 1.21788 1.21785 1.21782 1.21779 1.21776
+    1.21655 1.21656 1.21669 1.21871 1.22421 1.22247 1.21858
+    1.2228 1.23803 1.27737 1.10647 0.395248 0.0600669 0.027687
+    0.0192374 0.015425 0.0130881 0.00977445 0.00696598 0.00491122
+    0.00341952 0.00237078 0.00162339 0.00109178 0.000726647
+    0.000478886 0.00031568 0.000207902 0.000143494 0.000109768
+    8.62987e-05 5.69775e-05 3.36547e-05 2.30356e-05 1.86108e-05
+    1.41861e-05 1.08293e-05 7.68835e-06 4.79593e-06 4.51019e-06
+    4.22444e-06 3.9387e-06 3.65295e-06 3.36721e-06 3.04559e-06
+    2.69981e-06 2.35403e-06 2.00825e-06 1.66247e-06 1.34508e-06
+    1.26225e-06 1.17941e-06 1.09657e-06 1.01373e-06 9.30893e-07
+    8.48054e-07 7.65216e-07 6.82378e-07 5.9954e-07 5.16702e-07
+    4.37489e-07 3.82774e-07 3.2806e-07 2.73346e-07 2.18632e-07
+    1.63917e-07 1.09203e-07 5.4489e-08 -2.2523e-10 -5.49395e-08
+    -1.09654e-07 -1.52862e-07 -1.3079e-07 -1.08718e-07 -8.6646e-08
+    -6.45739e-08 -4.25019e-08 -2.04298e-08 1.64229e-09 2.37144e-08
+    4.57864e-08 6.78585e-08 8.71693e-08 9.30725e-08 9.89758e-08
+    1.04879e-07 1.10782e-07 1.16685e-07 1.22589e-07 1.28492e-07
+    1.34395e-07 1.40298e-07 1.46201e-07 1.52105e-07 1.58008e-07
+    1.63911e-07 1.69814e-07 1.75718e-07 1.81621e-07 1.87524e-07
+    1.93427e-07 1.9933e-07 2.05234e-07 2.11137e-07 2.19788e-07
+    0.000393944 -0.000218983 -0.00105784 0.00172403 -0.00027134
+    -0.000204147 8.79968e-06 5.93762e-05 5.83554e-05 4.13815e-05
+    3.71369e-05 3.03372e-05 2.25336e-05 1.5986e-05 1.07284e-05
+    -7.5239e-05 5.60593e-05 6.97571e-05 0.000667617 0.000960856
+    0.00131749 -0.00759564 -0.0217897 -0.0450321 -0.076646 -0.128569
+    -0.186391 -0.202175 -0.206953 -0.2082 -0.208416 -0.208669
+    -0.208934 -0.209111 -0.209234 -0.209329 -0.209389 -0.209416
+    -0.2094 -0.209329 -0.20926 -0.209204 -0.209208 -0.209285
+    -0.209454 -0.209641 -0.20977 -0.209811 -0.209833 -0.209887
+    -0.209653 -0.209127 -0.208893 -0.208811 -0.208777 -0.208758
+    -0.208747 -0.20874 -0.208726 -0.208697 -0.208657 -0.208611
+    -0.208565 -0.208524 -0.208488 -0.208451 -0.208412 -0.208373
+    -0.208333 -0.208294 -0.208256 -0.208219 -0.208183 -0.208145
+    -0.208107 -0.208066 -0.208029 -0.207993 -0.207959 -0.207923
+    -0.207883 -0.207838 -0.207789 -0.207747 -0.20771 -0.207675
+    -0.207642 -0.207605 -0.207568 -0.207531 -0.207494 -0.207457
+    -0.20742 -0.207383 -0.207346 -0.207308 -0.207271 -0.207233
+    -0.207196 -0.207158 -0.207121 -0.207084 -0.207046 -0.207009
+    -0.206972 -0.206935 -0.206898 -0.206861 -0.206823 -0.206786
+    -0.206749 -0.206712 -0.206675 -0.206638 -0.2066 -0.206563
+    -0.206526 -0.206489 -0.206452 -0.206415 -0.203384 -0.20015
+    -0.196872 -0.205024 -0.210727 -0.206779 -0.0685263 0.586138
+    1.4665 2.22945 2.77554 3.076 3.24926 3.34515 3.40164 3.43006
+    3.43713 3.43075 3.42886 3.4384 3.46567 3.49025 3.51287 3.53821
+    3.57841 3.39846 2.80753 2.22947 1.7549 1.30429 0.707786
+    0.303206 0.131352 0.0671706 0.0429955 0.032461 0.0257161
+    0.0239521 0.0217397 0.0179705 0.0138745 0.0102813 0.00749643
+    0.0054328 0.00386817 0.0027004 0.00189442 0.00135552 0.000954715
+    0.000659981 0.000453435 0.000313993 0.000231347 0.000159665
+    0.000108122 7.10528e-05 4.50233e-05 2.77892e-05 1.62765e-05
+    8.9893e-06 4.5471e-06 1.54614e-06 -1.6542e-07 -8.68508e-07
+    -1.04369e-06 -9.63086e-07 -8.44294e-07 -6.57339e-07 -7.35885e-07
+    -9.80056e-07 -1.39772e-06 -2.10199e-06 -1.37474e-06 6.13269e-07
+    3.3028e-06 4.60941e-06 4.91053e-06 4.14186e-06 2.45258e-06
+    -8.7388e-09 -3.59647e-07 -7.10554e-07 -1.06146e-06 -1.41237e-06
+    -1.76328e-06 -1.63073e-06 -1.34534e-06 -1.05995e-06 -7.74561e-07
+    -4.8917e-07 -2.95733e-07 -2.16326e-07 -1.3692e-07 -5.75135e-08
+    2.18929e-08 1.01299e-07 1.80706e-07 2.60112e-07 3.39519e-07
+    4.18925e-07 4.98332e-07 4.83984e-07 4.4901e-07 4.14035e-07
+    3.79061e-07 3.44087e-07 3.09112e-07 2.74138e-07 2.39163e-07
+    2.04189e-07 1.69215e-07 1.26002e-07 4.83213e-08 -2.9359e-08
+    -1.07039e-07 -1.8472e-07 -2.624e-07 -3.4008e-07 -4.1776e-07
+    -4.95441e-07
     EOD
 
     @v[26].set(<<-'EOD')
-    7.10441e-10 0.000309731 -0.000308186 -0.001694 -0.00360784 
-    8.40909e-05 0.00203175 0.0012896 0.000596548 0.000277191 
-    0.000161134 0.000120439 8.4915e-05 9.49929e-05 6.18812e-05 
-    1.65433e-05 1.89682e-05 3.97578e-05 4.95446e-05 0.000225325 
-    0.000214579 -0.00230134 -0.000451102 0.00997237 0.0341443 
-    0.0449314 0.0424411 0.0341996 0.0315315 0.0308892 0.0291614 
-    0.024365 0.0190282 0.0188976 0.017238 0.0138526 0.0105645 
-    0.00778548 0.00561753 0.0039871 0.00279554 0.00194075 0.0013468 
-    0.000934775 0.000664723 0.000498911 0.000377384 0.000254183 
-    0.000163421 0.000120773 9.65058e-05 7.22384e-05 5.60316e-05 
-    4.14549e-05 2.79516e-05 2.57096e-05 2.34677e-05 2.12257e-05 
-    1.89837e-05 1.67417e-05 1.46737e-05 1.27228e-05 1.07719e-05 
-    8.82099e-06 6.87009e-06 5.0896e-06 4.71705e-06 4.34451e-06 
-    3.97196e-06 3.59941e-06 3.22686e-06 2.85431e-06 2.48176e-06 
-    2.10921e-06 1.73666e-06 1.36411e-06 1.02855e-06 9.42931e-07 
-    8.57316e-07 7.71701e-07 6.86086e-07 6.00471e-07 5.14856e-07 
-    4.29241e-07 3.43626e-07 2.58011e-07 1.72396e-07 9.85409e-08 
-    9.14091e-08 8.42773e-08 7.71456e-08 7.00138e-08 6.2882e-08 
-    5.57503e-08 4.86185e-08 4.14867e-08 3.4355e-08 2.72232e-08 
-    2.05821e-08 1.63235e-08 1.2065e-08 7.80643e-09 3.54786e-09 
-    -7.10696e-10 -4.96926e-09 -9.22782e-09 -1.34864e-08 -1.77449e-08 
-    -2.20035e-08 -2.62621e-08 -3.05206e-08 -3.47792e-08 -3.90378e-08 
-    -4.32963e-08 -4.75549e-08 -5.18134e-08 -5.6072e-08 -6.03306e-08 
-    -6.45891e-08 -6.88477e-08 -8.76373e-06 0.000131607 -0.00021685 
-    -0.000433027 0.00047234 0.000211593 -0.000189601 3.2492e-05 
-    0.000575955 7.72235e-05 -0.000285172 -0.000242061 -0.000135112 
-    -3.50117e-05 -2.75868e-05 5.48974e-05 1.80604e-07 5.48911e-05 
-    3.97478e-05 0.000192909 0.000297932 0.00402253 -0.0122366 
-    -0.047853 -0.0963082 -0.108071 -0.0567275 -0.0239271 -0.0178628 
-    -0.0233027 -0.031853 -0.0400843 -0.0482725 -0.0576154 -0.0627218 
-    -0.0511236 -0.0279524 -0.0150986 -0.00931091 -0.00652876 
-    -0.00479286 -0.00344346 -0.00249578 -0.0019532 -0.00157977 
-    -0.00131848 -0.00111251 -0.000939229 -0.000797445 -0.000708384 
-    -0.000630452 -0.000539722 -0.000508862 -0.000480596 -0.000439484 
-    -0.000407217 -0.000363866 -0.000329506 -0.000318642 -0.000307362 
-    -0.000286511 -0.000266253 -0.000242943 -0.000218107 -0.000204661 
-    -0.00020241 -0.000194435 -0.000185062 -0.000173042 -0.000160549 
-    -0.000151407 -0.000145626 -0.000145976 -0.000147342 -0.000145288 
-    -0.000137979 -0.000124481 -0.000123218 -0.000127453 -0.000139006 
-    -0.000145486 -0.000129764 -9.82749e-05 -4.72596e-05 -3.08671e-05 
-    -3.28834e-05 -4.52254e-05 -6.25389e-05 -6.32516e-05 -6.39643e-05 
-    -6.4677e-05 -6.53897e-05 -6.61023e-05 -6.6815e-05 -6.75277e-05 
-    -6.61005e-05 -6.45173e-05 -6.29341e-05 -6.13509e-05 -5.97676e-05 
-    -5.81844e-05 -5.66012e-05 -5.54231e-05 -5.4455e-05 -5.3487e-05 
-    -5.25189e-05 -5.15508e-05 -5.05828e-05 -4.96147e-05 -4.86466e-05 
-    -4.76785e-05 -4.67105e-05 -4.57424e-05 -4.47743e-05 -4.38063e-05 
-    -4.28382e-05 -4.18821e-05 -4.10211e-05 -4.016e-05 -3.9299e-05 
-    -3.8438e-05 4.29885e-05 5.14113e-05 -0.000127986 -0.000611463 
-    -0.000149428 0.000882394 0.00297059 -0.00405825 -0.00591067 
-    -0.00546997 -0.00158744 0.00190677 0.00298403 0.00268595 
-    0.00196161 0.00130289 0.000783347 0.000520683 0.000565306 
-    0.00053419 -0.00224696 -0.000920818 0.0132755 0.0322504 
-    0.0442808 0.0638615 0.0701007 0.0539356 0.0247771 0.056244 
-    0.294266 0.831368 1.45424 2.02898 2.54559 2.9937 3.35333 
-    3.72609 4.06363 4.32789 4.52413 4.66504 4.7652 4.83637 4.88631 
-    4.92109 4.94464 4.96046 4.97218 4.98079 4.98679 4.99076 
-    4.99361 4.99555 4.99686 4.99783 4.99853 4.99902 4.99936 
-    4.99959 4.99973 4.99983 4.9999 4.99993 4.99996 4.99998 5 
-    5.00001 5 4.99999 4.99997 4.99994 4.99993 4.99994 4.99996 
-    4.99999 5.00004 5.00006 5.00005 5.00003 5.00002 5.00001 
-    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998 
+    7.10441e-10 0.000309731 -0.000308186 -0.001694 -0.00360784
+    8.40909e-05 0.00203175 0.0012896 0.000596548 0.000277191
+    0.000161134 0.000120439 8.4915e-05 9.49929e-05 6.18812e-05
+    1.65433e-05 1.89682e-05 3.97578e-05 4.95446e-05 0.000225325
+    0.000214579 -0.00230134 -0.000451102 0.00997237 0.0341443
+    0.0449314 0.0424411 0.0341996 0.0315315 0.0308892 0.0291614
+    0.024365 0.0190282 0.0188976 0.017238 0.0138526 0.0105645
+    0.00778548 0.00561753 0.0039871 0.00279554 0.00194075 0.0013468
+    0.000934775 0.000664723 0.000498911 0.000377384 0.000254183
+    0.000163421 0.000120773 9.65058e-05 7.22384e-05 5.60316e-05
+    4.14549e-05 2.79516e-05 2.57096e-05 2.34677e-05 2.12257e-05
+    1.89837e-05 1.67417e-05 1.46737e-05 1.27228e-05 1.07719e-05
+    8.82099e-06 6.87009e-06 5.0896e-06 4.71705e-06 4.34451e-06
+    3.97196e-06 3.59941e-06 3.22686e-06 2.85431e-06 2.48176e-06
+    2.10921e-06 1.73666e-06 1.36411e-06 1.02855e-06 9.42931e-07
+    8.57316e-07 7.71701e-07 6.86086e-07 6.00471e-07 5.14856e-07
+    4.29241e-07 3.43626e-07 2.58011e-07 1.72396e-07 9.85409e-08
+    9.14091e-08 8.42773e-08 7.71456e-08 7.00138e-08 6.2882e-08
+    5.57503e-08 4.86185e-08 4.14867e-08 3.4355e-08 2.72232e-08
+    2.05821e-08 1.63235e-08 1.2065e-08 7.80643e-09 3.54786e-09
+    -7.10696e-10 -4.96926e-09 -9.22782e-09 -1.34864e-08 -1.77449e-08
+    -2.20035e-08 -2.62621e-08 -3.05206e-08 -3.47792e-08 -3.90378e-08
+    -4.32963e-08 -4.75549e-08 -5.18134e-08 -5.6072e-08 -6.03306e-08
+    -6.45891e-08 -6.88477e-08 -8.76373e-06 0.000131607 -0.00021685
+    -0.000433027 0.00047234 0.000211593 -0.000189601 3.2492e-05
+    0.000575955 7.72235e-05 -0.000285172 -0.000242061 -0.000135112
+    -3.50117e-05 -2.75868e-05 5.48974e-05 1.80604e-07 5.48911e-05
+    3.97478e-05 0.000192909 0.000297932 0.00402253 -0.0122366
+    -0.047853 -0.0963082 -0.108071 -0.0567275 -0.0239271 -0.0178628
+    -0.0233027 -0.031853 -0.0400843 -0.0482725 -0.0576154 -0.0627218
+    -0.0511236 -0.0279524 -0.0150986 -0.00931091 -0.00652876
+    -0.00479286 -0.00344346 -0.00249578 -0.0019532 -0.00157977
+    -0.00131848 -0.00111251 -0.000939229 -0.000797445 -0.000708384
+    -0.000630452 -0.000539722 -0.000508862 -0.000480596 -0.000439484
+    -0.000407217 -0.000363866 -0.000329506 -0.000318642 -0.000307362
+    -0.000286511 -0.000266253 -0.000242943 -0.000218107 -0.000204661
+    -0.00020241 -0.000194435 -0.000185062 -0.000173042 -0.000160549
+    -0.000151407 -0.000145626 -0.000145976 -0.000147342 -0.000145288
+    -0.000137979 -0.000124481 -0.000123218 -0.000127453 -0.000139006
+    -0.000145486 -0.000129764 -9.82749e-05 -4.72596e-05 -3.08671e-05
+    -3.28834e-05 -4.52254e-05 -6.25389e-05 -6.32516e-05 -6.39643e-05
+    -6.4677e-05 -6.53897e-05 -6.61023e-05 -6.6815e-05 -6.75277e-05
+    -6.61005e-05 -6.45173e-05 -6.29341e-05 -6.13509e-05 -5.97676e-05
+    -5.81844e-05 -5.66012e-05 -5.54231e-05 -5.4455e-05 -5.3487e-05
+    -5.25189e-05 -5.15508e-05 -5.05828e-05 -4.96147e-05 -4.86466e-05
+    -4.76785e-05 -4.67105e-05 -4.57424e-05 -4.47743e-05 -4.38063e-05
+    -4.28382e-05 -4.18821e-05 -4.10211e-05 -4.016e-05 -3.9299e-05
+    -3.8438e-05 4.29885e-05 5.14113e-05 -0.000127986 -0.000611463
+    -0.000149428 0.000882394 0.00297059 -0.00405825 -0.00591067
+    -0.00546997 -0.00158744 0.00190677 0.00298403 0.00268595
+    0.00196161 0.00130289 0.000783347 0.000520683 0.000565306
+    0.00053419 -0.00224696 -0.000920818 0.0132755 0.0322504
+    0.0442808 0.0638615 0.0701007 0.0539356 0.0247771 0.056244
+    0.294266 0.831368 1.45424 2.02898 2.54559 2.9937 3.35333
+    3.72609 4.06363 4.32789 4.52413 4.66504 4.7652 4.83637 4.88631
+    4.92109 4.94464 4.96046 4.97218 4.98079 4.98679 4.99076
+    4.99361 4.99555 4.99686 4.99783 4.99853 4.99902 4.99936
+    4.99959 4.99973 4.99983 4.9999 4.99993 4.99996 4.99998 5
+    5.00001 5 4.99999 4.99997 4.99994 4.99993 4.99994 4.99996
+    4.99999 5.00004 5.00006 5.00005 5.00003 5.00002 5.00001
+    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
     EOD
 
     @v[27].set(<<-'EOD')
-    5 4.99984 4.99796 4.99478 4.9889 4.98738 4.98896 4.99087 
-    4.99262 4.99419 4.99552 4.99659 4.99743 4.99807 4.99855 
-    4.9989 4.99894 4.99908 4.99935 5.00001 5.0007 5.00132 5.00032 
-    4.99976 5.00134 5.00339 5.00315 5.00157 5.00091 5.00058 
-    5.00012 4.99944 4.99886 4.9994 4.99934 4.99899 4.99876 4.99868 
-    4.99872 4.99883 4.99898 4.99914 4.9993 4.99944 4.99956 4.99967 
-    4.99976 4.99982 4.99986 4.9999 4.99993 4.99997 4.99997 4.99998 
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
-    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00009 5.00028 5.00015 4.99983 
-    5.00036 4.99996 4.99834 4.99783 5.00383 5.00734 5.00387 
-    5.00058 4.99893 4.99836 4.99832 4.99854 4.99873 4.99905 
-    4.99927 4.99952 4.99969 4.99834 4.99536 4.99163 4.99073 
-    5.0053 5.03631 5.03103 4.9008 4.62503 4.21887 3.70902 3.09967 
-    2.35791 1.41912 0.519675 0.210458 0.131362 0.0980819 0.0708209 
-    0.0471701 0.0323272 0.0253535 0.0199144 0.0152615 0.0117228 
-    0.00917696 0.00738117 0.00609292 0.00512664 0.00436184 0.0037961 
-    0.00331639 0.00289006 0.0025477 0.00226529 0.00202925 0.00182793 
-    0.00165474 0.00150531 0.00137529 0.00125983 0.00115603 0.00106455 
-    0.000982977 0.000911255 0.000846819 0.000790092 0.000738698 
-    0.000692816 0.00065107 0.000613595 0.000579642 0.000548935 
-    0.00052106 0.000495598 0.000472174 0.000450849 0.000431118 
-    0.000412667 0.000395868 0.000381319 0.000368487 0.000357327 
-    0.000344212 0.000330334 0.00031622 0.000303298 0.000295809 
-    0.00028832 0.000280831 0.000273342 0.000265853 0.000258364 
-    0.000250875 0.000245118 0.000239488 0.000233857 0.000228227 
-    0.000222596 0.000216966 0.000211336 0.000207047 0.000203455 
-    0.000199863 0.00019627 0.000192678 0.000189085 0.000185493 
-    0.0001819 0.000178308 0.000174716 0.000171123 0.000167531 
-    0.000163938 0.000160346 0.000156835 0.000153973 0.00015111 
-    0.000148248 0.000145385 0.000296579 -3.96718e-05 -0.000449085 
-    0.000323433 0.000750086 0.000268264 0.000149028 -0.000100249 
-    7.00956e-05 0.00012605 0.00022592 0.000193036 0.000120453 
-    8.07865e-05 7.65771e-05 -3.27828e-05 0.000116759 0.000169498 
-    0.000409804 0.000414965 0.00092323 -0.00590633 -0.0175477 
-    -0.032433 -0.0559842 -0.0820373 0.0688484 0.626629 1.32929 
-    2.01657 2.60925 3.12329 3.38952 3.14128 2.38463 1.23802 
-    0.316019 0.107832 0.0694707 0.051837 0.035247 0.0209999 
-    0.0116618 0.00967674 0.00789182 0.00574566 0.00386872 0.00258612 
-    0.00167126 0.00104169 0.000641093 0.000401246 0.000277928 
-    0.000171775 0.000102266 5.89376e-05 3.29258e-05 1.80463e-05 
-    1.0057e-05 6.4571e-06 5.10093e-06 4.06791e-06 3.62716e-06 
-    3.63321e-06 3.99625e-06 4.64368e-06 5.20886e-06 4.77728e-06 
-    3.23919e-06 1.14113e-06 -1.29416e-06 -4.15607e-06 -1.88532e-06 
-    5.24411e-06 1.38678e-05 1.28823e-05 3.6758e-06 -2.52285e-06 
-    -3.97133e-06 -4.03071e-06 -3.37154e-06 -2.71238e-06 -2.05321e-06 
-    -1.39404e-06 -7.34872e-07 -3.73325e-07 -1.05873e-07 1.61578e-07 
-    4.2903e-07 6.96482e-07 8.18468e-07 7.60065e-07 7.01662e-07 
-    6.43258e-07 5.84855e-07 5.26452e-07 4.68049e-07 4.09646e-07 
-    3.51243e-07 2.9284e-07 2.34437e-07 1.71213e-07 1.06928e-07 
-    4.2644e-08 -2.16403e-08 -8.59247e-08 -1.50209e-07 -2.14493e-07 
-    -2.78778e-07 -3.43062e-07 -4.07346e-07 -4.55065e-07 -4.3348e-07 
-    -4.11896e-07 -3.90311e-07 -3.68726e-07 -3.47141e-07 -3.25556e-07 
-    -3.03971e-07 -2.82386e-07 
+    5 4.99984 4.99796 4.99478 4.9889 4.98738 4.98896 4.99087
+    4.99262 4.99419 4.99552 4.99659 4.99743 4.99807 4.99855
+    4.9989 4.99894 4.99908 4.99935 5.00001 5.0007 5.00132 5.00032
+    4.99976 5.00134 5.00339 5.00315 5.00157 5.00091 5.00058
+    5.00012 4.99944 4.99886 4.9994 4.99934 4.99899 4.99876 4.99868
+    4.99872 4.99883 4.99898 4.99914 4.9993 4.99944 4.99956 4.99967
+    4.99976 4.99982 4.99986 4.9999 4.99993 4.99997 4.99997 4.99998
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00009 5.00028 5.00015 4.99983
+    5.00036 4.99996 4.99834 4.99783 5.00383 5.00734 5.00387
+    5.00058 4.99893 4.99836 4.99832 4.99854 4.99873 4.99905
+    4.99927 4.99952 4.99969 4.99834 4.99536 4.99163 4.99073
+    5.0053 5.03631 5.03103 4.9008 4.62503 4.21887 3.70902 3.09967
+    2.35791 1.41912 0.519675 0.210458 0.131362 0.0980819 0.0708209
+    0.0471701 0.0323272 0.0253535 0.0199144 0.0152615 0.0117228
+    0.00917696 0.00738117 0.00609292 0.00512664 0.00436184 0.0037961
+    0.00331639 0.00289006 0.0025477 0.00226529 0.00202925 0.00182793
+    0.00165474 0.00150531 0.00137529 0.00125983 0.00115603 0.00106455
+    0.000982977 0.000911255 0.000846819 0.000790092 0.000738698
+    0.000692816 0.00065107 0.000613595 0.000579642 0.000548935
+    0.00052106 0.000495598 0.000472174 0.000450849 0.000431118
+    0.000412667 0.000395868 0.000381319 0.000368487 0.000357327
+    0.000344212 0.000330334 0.00031622 0.000303298 0.000295809
+    0.00028832 0.000280831 0.000273342 0.000265853 0.000258364
+    0.000250875 0.000245118 0.000239488 0.000233857 0.000228227
+    0.000222596 0.000216966 0.000211336 0.000207047 0.000203455
+    0.000199863 0.00019627 0.000192678 0.000189085 0.000185493
+    0.0001819 0.000178308 0.000174716 0.000171123 0.000167531
+    0.000163938 0.000160346 0.000156835 0.000153973 0.00015111
+    0.000148248 0.000145385 0.000296579 -3.96718e-05 -0.000449085
+    0.000323433 0.000750086 0.000268264 0.000149028 -0.000100249
+    7.00956e-05 0.00012605 0.00022592 0.000193036 0.000120453
+    8.07865e-05 7.65771e-05 -3.27828e-05 0.000116759 0.000169498
+    0.000409804 0.000414965 0.00092323 -0.00590633 -0.0175477
+    -0.032433 -0.0559842 -0.0820373 0.0688484 0.626629 1.32929
+    2.01657 2.60925 3.12329 3.38952 3.14128 2.38463 1.23802
+    0.316019 0.107832 0.0694707 0.051837 0.035247 0.0209999
+    0.0116618 0.00967674 0.00789182 0.00574566 0.00386872 0.00258612
+    0.00167126 0.00104169 0.000641093 0.000401246 0.000277928
+    0.000171775 0.000102266 5.89376e-05 3.29258e-05 1.80463e-05
+    1.0057e-05 6.4571e-06 5.10093e-06 4.06791e-06 3.62716e-06
+    3.63321e-06 3.99625e-06 4.64368e-06 5.20886e-06 4.77728e-06
+    3.23919e-06 1.14113e-06 -1.29416e-06 -4.15607e-06 -1.88532e-06
+    5.24411e-06 1.38678e-05 1.28823e-05 3.6758e-06 -2.52285e-06
+    -3.97133e-06 -4.03071e-06 -3.37154e-06 -2.71238e-06 -2.05321e-06
+    -1.39404e-06 -7.34872e-07 -3.73325e-07 -1.05873e-07 1.61578e-07
+    4.2903e-07 6.96482e-07 8.18468e-07 7.60065e-07 7.01662e-07
+    6.43258e-07 5.84855e-07 5.26452e-07 4.68049e-07 4.09646e-07
+    3.51243e-07 2.9284e-07 2.34437e-07 1.71213e-07 1.06928e-07
+    4.2644e-08 -2.16403e-08 -8.59247e-08 -1.50209e-07 -2.14493e-07
+    -2.78778e-07 -3.43062e-07 -4.07346e-07 -4.55065e-07 -4.3348e-07
+    -4.11896e-07 -3.90311e-07 -3.68726e-07 -3.47141e-07 -3.25556e-07
+    -3.03971e-07 -2.82386e-07
     EOD
 
     @v[28].set(<<-'EOD')
-    0.368163 0.361756 0.327463 0.269513 0.149476 0.0805716 0.0501146 
-    0.03403 0.0230886 0.0160474 0.0116071 0.00870013 0.00679614 
-    0.00542384 0.00432512 0.00340653 -0.00129719 -0.00399429 
-    -0.00318719 0.00443085 0.0150156 0.0334147 0.0132288 -0.0189751 
-    -0.0508377 -0.0252174 -0.0142489 -0.00675908 -0.0038653 
-    -0.00243423 -0.00168891 -0.00120901 -0.000900426 -0.000685575 
-    -0.000557595 -0.000457268 -0.000377427 -0.000315269 -0.000266613 
-    -0.000228397 -0.000198283 -0.000174248 -0.000154886 -0.00013892 
-    -0.000125864 -0.000115189 -0.000105841 -9.66611e-05 -8.84262e-05 
-    -8.23872e-05 -7.74668e-05 -7.25463e-05 -6.79992e-05 -6.35276e-05 
-    -5.92413e-05 -5.68994e-05 -5.45574e-05 -5.22154e-05 -4.98735e-05 
-    -4.75315e-05 -4.54981e-05 -4.36726e-05 -4.18471e-05 -4.00216e-05 
-    -3.81961e-05 -3.64559e-05 -3.54209e-05 -3.43858e-05 -3.33508e-05 
-    -3.23157e-05 -3.12807e-05 -3.02456e-05 -2.92105e-05 -2.81755e-05 
-    -2.71404e-05 -2.61054e-05 -2.51232e-05 -2.44984e-05 -2.38736e-05 
-    -2.32487e-05 -2.26239e-05 -2.19991e-05 -2.13742e-05 -2.07494e-05 
-    -2.01246e-05 -1.94998e-05 -1.88749e-05 -1.82865e-05 -1.79044e-05 
-    -1.75224e-05 -1.71403e-05 -1.67582e-05 -1.63762e-05 -1.59941e-05 
-    -1.56121e-05 -1.523e-05 -1.4848e-05 -1.44659e-05 -1.41138e-05 
-    -1.39075e-05 -1.37011e-05 -1.34947e-05 -1.32883e-05 -1.30819e-05 
-    -1.28755e-05 -1.26691e-05 -1.24627e-05 -1.22563e-05 -1.205e-05 
-    -1.18436e-05 -1.16372e-05 -1.14308e-05 -1.12244e-05 -1.1018e-05 
-    -1.08116e-05 -1.06052e-05 -1.03988e-05 -1.01924e-05 -9.98605e-06 
-    -9.77966e-06 -2.85319e-05 0.00281092 0.00180106 -0.000981083 
-    0.00551926 -0.00119763 -0.0295069 -0.0367677 0.064749 0.119022 
-    0.0882007 0.0552062 0.03418 0.0223243 0.015545 0.011949 
-    0.00757134 0.00667655 0.00583243 0.00644443 0.00650959 -0.0302575 
-    -0.0437806 -0.0355466 0.0381776 0.282109 0.674178 1.07582 
-    1.45189 1.789 2.08649 2.34663 2.57245 2.81211 3.04778 3.2523 
-    3.45877 3.65593 3.83396 3.9923 4.13368 4.25864 4.36719 4.46064 
-    4.54086 4.60962 4.66835 4.71838 4.76094 4.79716 4.82796 
-    4.85413 4.87634 4.89518 4.91116 4.92476 4.93631 4.94608 
-    4.95434 4.9613 4.96715 4.97211 4.97638 4.98001 4.98312 4.98571 
-    4.98795 4.98979 4.99138 4.99269 4.99381 4.99474 4.99551 
-    4.99615 4.99668 4.99713 4.99752 4.99783 4.99811 4.99836 
-    4.99858 4.99873 4.99884 4.99892 4.999 4.99907 4.99912 4.99916 
-    4.99921 4.99926 4.99932 4.99937 4.99942 4.99948 4.99953 
-    4.99956 4.99958 4.99961 4.99963 4.99966 4.99968 4.99971 
-    4.99972 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 
-    4.99979 4.9998 4.9998 4.99981 4.99982 4.99983 4.99984 4.99985 
-    4.99986 4.99986 4.99987 4.99987 5.00498 5.00354 4.99359 
-    4.98981 5.00498 5.00099 5.00041 5.00022 5.00015 5.00012 
-    5.0001 5.00008 5.00005 5.00003 5 4.99431 4.99459 4.99591 
-    5.00087 5.01029 5.03935 4.92784 4.51643 3.78356 2.68745 
-    1.43417 0.583128 0.205094 0.0777337 0.0391566 0.02723 0.023883 
-    0.018808 0.010165 0.00254623 -0.00377463 -0.0038097 0.00144145 
-    0.00267231 0.00193045 0.00144538 0.00121758 0.00112893 0.00109424 
-    0.0010226 0.000948072 0.000882573 0.000826996 0.000776391 
-    0.000729719 0.000686499 0.000647333 0.000610108 0.000575631 
-    0.000545069 0.000515485 0.000488514 0.000465316 0.000443215 
-    0.000422454 0.00040292 0.00038488 0.000368472 0.000353628 
-    0.000339643 0.000326197 0.000313483 0.000302884 0.000294038 
-    0.000284003 0.000270941 0.000254925 0.000246511 0.000244089 
-    0.000245538 0.000242099 0.000235728 0.000227482 0.000218001 
-    0.000207257 0.000202127 0.000196997 0.000191868 0.000186738 
-    0.000181608 0.00017758 0.000173899 0.000170219 0.000166538 
-    0.000162857 0.000159576 0.00015679 0.000154005 0.000151219 
-    0.000148433 0.000145647 0.000142861 0.000140076 0.00013729 
-    0.000134504 0.000131718 0.000129603 0.000127635 0.000125668 
-    0.0001237 0.000121732 0.000119765 0.000117797 0.000115829 
-    0.000113862 0.000111894 0.000109993 0.000108372 0.000106751 
-    0.00010513 0.000103509 0.000101887 0.000100266 9.86449e-05 
-    9.70237e-05 
+    0.368163 0.361756 0.327463 0.269513 0.149476 0.0805716 0.0501146
+    0.03403 0.0230886 0.0160474 0.0116071 0.00870013 0.00679614
+    0.00542384 0.00432512 0.00340653 -0.00129719 -0.00399429
+    -0.00318719 0.00443085 0.0150156 0.0334147 0.0132288 -0.0189751
+    -0.0508377 -0.0252174 -0.0142489 -0.00675908 -0.0038653
+    -0.00243423 -0.00168891 -0.00120901 -0.000900426 -0.000685575
+    -0.000557595 -0.000457268 -0.000377427 -0.000315269 -0.000266613
+    -0.000228397 -0.000198283 -0.000174248 -0.000154886 -0.00013892
+    -0.000125864 -0.000115189 -0.000105841 -9.66611e-05 -8.84262e-05
+    -8.23872e-05 -7.74668e-05 -7.25463e-05 -6.79992e-05 -6.35276e-05
+    -5.92413e-05 -5.68994e-05 -5.45574e-05 -5.22154e-05 -4.98735e-05
+    -4.75315e-05 -4.54981e-05 -4.36726e-05 -4.18471e-05 -4.00216e-05
+    -3.81961e-05 -3.64559e-05 -3.54209e-05 -3.43858e-05 -3.33508e-05
+    -3.23157e-05 -3.12807e-05 -3.02456e-05 -2.92105e-05 -2.81755e-05
+    -2.71404e-05 -2.61054e-05 -2.51232e-05 -2.44984e-05 -2.38736e-05
+    -2.32487e-05 -2.26239e-05 -2.19991e-05 -2.13742e-05 -2.07494e-05
+    -2.01246e-05 -1.94998e-05 -1.88749e-05 -1.82865e-05 -1.79044e-05
+    -1.75224e-05 -1.71403e-05 -1.67582e-05 -1.63762e-05 -1.59941e-05
+    -1.56121e-05 -1.523e-05 -1.4848e-05 -1.44659e-05 -1.41138e-05
+    -1.39075e-05 -1.37011e-05 -1.34947e-05 -1.32883e-05 -1.30819e-05
+    -1.28755e-05 -1.26691e-05 -1.24627e-05 -1.22563e-05 -1.205e-05
+    -1.18436e-05 -1.16372e-05 -1.14308e-05 -1.12244e-05 -1.1018e-05
+    -1.08116e-05 -1.06052e-05 -1.03988e-05 -1.01924e-05 -9.98605e-06
+    -9.77966e-06 -2.85319e-05 0.00281092 0.00180106 -0.000981083
+    0.00551926 -0.00119763 -0.0295069 -0.0367677 0.064749 0.119022
+    0.0882007 0.0552062 0.03418 0.0223243 0.015545 0.011949
+    0.00757134 0.00667655 0.00583243 0.00644443 0.00650959 -0.0302575
+    -0.0437806 -0.0355466 0.0381776 0.282109 0.674178 1.07582
+    1.45189 1.789 2.08649 2.34663 2.57245 2.81211 3.04778 3.2523
+    3.45877 3.65593 3.83396 3.9923 4.13368 4.25864 4.36719 4.46064
+    4.54086 4.60962 4.66835 4.71838 4.76094 4.79716 4.82796
+    4.85413 4.87634 4.89518 4.91116 4.92476 4.93631 4.94608
+    4.95434 4.9613 4.96715 4.97211 4.97638 4.98001 4.98312 4.98571
+    4.98795 4.98979 4.99138 4.99269 4.99381 4.99474 4.99551
+    4.99615 4.99668 4.99713 4.99752 4.99783 4.99811 4.99836
+    4.99858 4.99873 4.99884 4.99892 4.999 4.99907 4.99912 4.99916
+    4.99921 4.99926 4.99932 4.99937 4.99942 4.99948 4.99953
+    4.99956 4.99958 4.99961 4.99963 4.99966 4.99968 4.99971
+    4.99972 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978
+    4.99979 4.9998 4.9998 4.99981 4.99982 4.99983 4.99984 4.99985
+    4.99986 4.99986 4.99987 4.99987 5.00498 5.00354 4.99359
+    4.98981 5.00498 5.00099 5.00041 5.00022 5.00015 5.00012
+    5.0001 5.00008 5.00005 5.00003 5 4.99431 4.99459 4.99591
+    5.00087 5.01029 5.03935 4.92784 4.51643 3.78356 2.68745
+    1.43417 0.583128 0.205094 0.0777337 0.0391566 0.02723 0.023883
+    0.018808 0.010165 0.00254623 -0.00377463 -0.0038097 0.00144145
+    0.00267231 0.00193045 0.00144538 0.00121758 0.00112893 0.00109424
+    0.0010226 0.000948072 0.000882573 0.000826996 0.000776391
+    0.000729719 0.000686499 0.000647333 0.000610108 0.000575631
+    0.000545069 0.000515485 0.000488514 0.000465316 0.000443215
+    0.000422454 0.00040292 0.00038488 0.000368472 0.000353628
+    0.000339643 0.000326197 0.000313483 0.000302884 0.000294038
+    0.000284003 0.000270941 0.000254925 0.000246511 0.000244089
+    0.000245538 0.000242099 0.000235728 0.000227482 0.000218001
+    0.000207257 0.000202127 0.000196997 0.000191868 0.000186738
+    0.000181608 0.00017758 0.000173899 0.000170219 0.000166538
+    0.000162857 0.000159576 0.00015679 0.000154005 0.000151219
+    0.000148433 0.000145647 0.000142861 0.000140076 0.00013729
+    0.000134504 0.000131718 0.000129603 0.000127635 0.000125668
+    0.0001237 0.000121732 0.000119765 0.000117797 0.000115829
+    0.000113862 0.000111894 0.000109993 0.000108372 0.000106751
+    0.00010513 0.000103509 0.000101887 0.000100266 9.86449e-05
+    9.70237e-05
     EOD
 
     @v[29].set(<<-'EOD')
-    5 4.99899 4.99654 4.99327 4.9863 4.98954 4.99212 4.99378 
-    4.9951 4.99624 4.99715 4.99786 4.99839 4.99879 4.99909 4.99931 
-    4.99922 4.99933 4.99971 5.00064 5.00084 5.00123 4.99865 
-    4.99853 4.99983 5.00457 5.00242 5.00105 5.00062 5.00042 
-    4.99971 4.9994 4.9992 4.9996 4.99955 4.99932 4.99918 4.99915 
-    4.99919 4.99927 4.99937 4.99948 4.99957 4.99966 4.99974 
-    4.9998 4.99985 4.99989 4.99992 4.99993 4.99994 4.99994 4.99996 
-    4.99998 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001 
-    5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99998 4.99998 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
-    5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5 5 5 5 5 5 4.9997 4.99998 4.99954 4.99963 
-    5.00059 4.99945 4.99732 4.99957 5.00919 5.00558 5.00033 
-    4.99851 4.9983 4.99854 4.99871 4.99928 4.99914 4.99939 4.99952 
-    4.9998 4.99976 4.99744 4.99598 4.99478 4.99806 5.01911 5.04602 
-    5.05469 5.01317 4.89484 4.69655 4.42036 4.06069 3.60793 
-    3.12531 2.72975 2.45187 2.25081 2.09841 1.98509 1.90211 
-    1.84084 1.79411 1.7574 1.72763 1.70283 1.68188 1.66389 1.64823 
-    1.63438 1.62201 1.61088 1.60081 1.59163 1.58323 1.57549 
-    1.56835 1.56173 1.55558 1.54985 1.54451 1.53951 1.53479 
-    1.53035 1.52615 1.5222 1.51845 1.5149 1.51153 1.50834 1.50529 
-    1.5024 1.49964 1.497 1.49449 1.49208 1.48977 1.48755 1.48542 
-    1.48336 1.48138 1.47948 1.47765 1.4759 1.47419 1.47255 1.47096 
-    1.46949 1.46823 1.46696 1.4657 1.46444 1.46317 1.46191 1.46065 
-    1.45956 1.4585 1.45743 1.45636 1.45529 1.45422 1.45315 1.45226 
-    1.45145 1.45064 1.44983 1.44902 1.44821 1.4474 1.44659 1.44579 
-    1.44498 1.44417 1.44336 1.44255 1.44174 1.44094 1.44019 
-    1.43944 1.43868 1.43793 1.43765 1.43679 1.43515 1.43405 
-    1.43478 1.43387 1.43345 1.43184 1.43086 1.43021 1.43003 
-    1.42988 1.42944 1.42883 1.42818 1.42702 1.42642 1.42595 
-    1.42586 1.42616 1.42783 1.41733 1.38106 1.30738 1.3877 2.09819 
-    3.05285 3.58059 3.77601 3.87609 4.02557 4.24887 4.4608 4.60411 
-    4.72109 4.8255 4.90465 4.97379 5.01253 5.01532 5.01239 5.0092 
-    5.00665 5.00474 5.00333 5.00232 5.00163 5.00117 5.00082 
-    5.00057 5.00039 5.00027 5.00019 5.00013 5.00009 5.00006 
-    5.00004 5.00003 5.00002 5.00001 5.00001 5 5 5 4.99998 4.99995 
-    4.99992 4.99996 5.00005 5.00012 5.00008 4.99996 4.9999 4.99985 
-    4.99986 4.99997 5.00021 5.0003 5.00024 5.00009 5.00007 5.00005 
-    5.00003 5.00001 4.99998 4.99998 4.99998 4.99999 4.99999 
-    5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 
-    4.99998 4.99998 
+    5 4.99899 4.99654 4.99327 4.9863 4.98954 4.99212 4.99378
+    4.9951 4.99624 4.99715 4.99786 4.99839 4.99879 4.99909 4.99931
+    4.99922 4.99933 4.99971 5.00064 5.00084 5.00123 4.99865
+    4.99853 4.99983 5.00457 5.00242 5.00105 5.00062 5.00042
+    4.99971 4.9994 4.9992 4.9996 4.99955 4.99932 4.99918 4.99915
+    4.99919 4.99927 4.99937 4.99948 4.99957 4.99966 4.99974
+    4.9998 4.99985 4.99989 4.99992 4.99993 4.99994 4.99994 4.99996
+    4.99998 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
+    5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99998 4.99998 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+    5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5 5 5 5 5 5 4.9997 4.99998 4.99954 4.99963
+    5.00059 4.99945 4.99732 4.99957 5.00919 5.00558 5.00033
+    4.99851 4.9983 4.99854 4.99871 4.99928 4.99914 4.99939 4.99952
+    4.9998 4.99976 4.99744 4.99598 4.99478 4.99806 5.01911 5.04602
+    5.05469 5.01317 4.89484 4.69655 4.42036 4.06069 3.60793
+    3.12531 2.72975 2.45187 2.25081 2.09841 1.98509 1.90211
+    1.84084 1.79411 1.7574 1.72763 1.70283 1.68188 1.66389 1.64823
+    1.63438 1.62201 1.61088 1.60081 1.59163 1.58323 1.57549
+    1.56835 1.56173 1.55558 1.54985 1.54451 1.53951 1.53479
+    1.53035 1.52615 1.5222 1.51845 1.5149 1.51153 1.50834 1.50529
+    1.5024 1.49964 1.497 1.49449 1.49208 1.48977 1.48755 1.48542
+    1.48336 1.48138 1.47948 1.47765 1.4759 1.47419 1.47255 1.47096
+    1.46949 1.46823 1.46696 1.4657 1.46444 1.46317 1.46191 1.46065
+    1.45956 1.4585 1.45743 1.45636 1.45529 1.45422 1.45315 1.45226
+    1.45145 1.45064 1.44983 1.44902 1.44821 1.4474 1.44659 1.44579
+    1.44498 1.44417 1.44336 1.44255 1.44174 1.44094 1.44019
+    1.43944 1.43868 1.43793 1.43765 1.43679 1.43515 1.43405
+    1.43478 1.43387 1.43345 1.43184 1.43086 1.43021 1.43003
+    1.42988 1.42944 1.42883 1.42818 1.42702 1.42642 1.42595
+    1.42586 1.42616 1.42783 1.41733 1.38106 1.30738 1.3877 2.09819
+    3.05285 3.58059 3.77601 3.87609 4.02557 4.24887 4.4608 4.60411
+    4.72109 4.8255 4.90465 4.97379 5.01253 5.01532 5.01239 5.0092
+    5.00665 5.00474 5.00333 5.00232 5.00163 5.00117 5.00082
+    5.00057 5.00039 5.00027 5.00019 5.00013 5.00009 5.00006
+    5.00004 5.00003 5.00002 5.00001 5.00001 5 5 5 4.99998 4.99995
+    4.99992 4.99996 5.00005 5.00012 5.00008 4.99996 4.9999 4.99985
+    4.99986 4.99997 5.00021 5.0003 5.00024 5.00009 5.00007 5.00005
+    5.00003 5.00001 4.99998 4.99998 4.99998 4.99999 4.99999
+    5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998
+    4.99998 4.99998
     EOD
 
     @v[30].set(<<-'EOD')
-    7.10441e-10 5.70385e-05 0.000226143 0.000131916 -0.000887764 
-    -8.01837e-05 -3.49653e-05 9.40039e-05 0.000118663 0.000108025 
-    8.6059e-05 6.33268e-05 4.99295e-05 3.16843e-05 3.60692e-05 
-    2.07572e-05 -8.6375e-05 3.44583e-05 8.07397e-05 0.000196296 
-    0.000115615 -7.12768e-05 -0.000129812 -4.18679e-05 7.94364e-05 
-    0.000182034 -5.41226e-05 -0.000451819 -0.000713937 -0.00129863 
-    -0.00262186 -0.00213417 -0.00133767 0.000775698 0.000969902 
-    0.000549281 0.000280946 0.000140321 8.6919e-05 7.22446e-05 
-    6.5631e-05 6.45263e-05 6.63087e-05 7.17391e-05 7.59042e-05 
-    7.59172e-05 7.03353e-05 6.33558e-05 5.31136e-05 4.64278e-05 
-    4.40594e-05 4.16909e-05 4.05674e-05 3.96957e-05 3.87875e-05 
-    3.74977e-05 3.62079e-05 3.49181e-05 3.36283e-05 3.23385e-05 
-    3.12427e-05 3.02775e-05 2.93124e-05 2.83472e-05 2.7382e-05 
-    2.64613e-05 2.59077e-05 2.5354e-05 2.48004e-05 2.42468e-05 
-    2.36931e-05 2.31395e-05 2.25859e-05 2.20322e-05 2.14786e-05 
-    2.0925e-05 2.03916e-05 1.9995e-05 1.95984e-05 1.92019e-05 
-    1.88053e-05 1.84087e-05 1.80122e-05 1.76156e-05 1.7219e-05 
-    1.68225e-05 1.64259e-05 1.6051e-05 1.57991e-05 1.55471e-05 
-    1.52952e-05 1.50433e-05 1.47913e-05 1.45394e-05 1.42875e-05 
-    1.40356e-05 1.37836e-05 1.35317e-05 1.32978e-05 1.31513e-05 
-    1.30048e-05 1.28583e-05 1.27118e-05 1.25653e-05 1.24188e-05 
-    1.22724e-05 1.21259e-05 1.19794e-05 1.18329e-05 1.16864e-05 
-    1.15399e-05 1.13934e-05 1.12469e-05 1.11005e-05 1.0954e-05 
-    1.08075e-05 1.0661e-05 1.05145e-05 1.0368e-05 1.02215e-05 
-    1.76447e-05 7.21516e-05 -3.59786e-05 -0.000159618 0.000156236 
-    0.000135106 -0.000336402 -0.000302283 0.000699323 0.000473866 
-    -0.000156146 -0.000225625 -0.000123592 -3.78116e-05 8.47472e-06 
-    2.43387e-06 -7.44762e-05 7.80111e-05 9.43608e-05 0.000170159 
-    8.83919e-05 -0.00018802 -0.000373512 -0.000390597 0.000156875 
-    0.0032343 0.00776304 -0.000566905 -0.00760695 -0.0159226 
-    -0.0245989 -0.0331402 -0.0100902 0.067837 0.266702 0.910818 
-    1.82282 2.69714 3.43247 3.98325 4.32893 4.51529 4.67087 
-    4.79288 4.87574 4.92797 4.95902 4.97655 4.98622 4.99195 
-    4.99526 4.99735 4.9991 4.99974 4.99982 4.99974 4.99961 4.9995 
-    4.99943 4.9994 4.9994 4.99942 4.99944 4.99948 4.99952 4.99956 
-    4.99961 4.99965 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986 
-    4.99988 4.9999 4.99991 4.99992 4.99993 4.99994 4.99995 4.99995 
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999 
-    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5 
-    5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 5 5.00019 4.99888 4.99663 4.99457 4.99902 
-    5.00229 5.00323 5.00302 5.0023 5.0015 5.00085 5.00041 5.00013 
-    4.99993 4.99979 4.99948 4.99954 4.99983 5.00055 5.00109 
-    5.00009 4.9987 4.998 4.99755 4.99676 4.99618 5.01091 5.05272 
-    5.04156 4.80112 4.27692 3.42343 2.23953 0.967179 0.429813 
-    0.540757 1.32991 2.32147 3.14903 3.78143 4.22325 4.47978 
-    4.59448 4.69875 4.79798 4.87419 4.92339 4.95249 4.97174 
-    4.98408 4.99124 4.99478 4.99729 4.99868 4.9992 4.99941 4.99947 
-    4.99946 4.99943 4.9994 4.99939 4.9994 4.99942 4.99946 4.99951 
-    4.99956 4.99961 4.99967 4.99973 4.99977 4.9998 4.99981 4.99983 
-    4.99984 4.99987 4.99992 5.00001 5.00005 5.00001 4.99994 
-    4.99995 4.99995 4.99996 4.99996 4.99996 4.99997 4.99997 
-    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 
-    4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
-    4.99998 4.99998 4.99998 
+    7.10441e-10 5.70385e-05 0.000226143 0.000131916 -0.000887764
+    -8.01837e-05 -3.49653e-05 9.40039e-05 0.000118663 0.000108025
+    8.6059e-05 6.33268e-05 4.99295e-05 3.16843e-05 3.60692e-05
+    2.07572e-05 -8.6375e-05 3.44583e-05 8.07397e-05 0.000196296
+    0.000115615 -7.12768e-05 -0.000129812 -4.18679e-05 7.94364e-05
+    0.000182034 -5.41226e-05 -0.000451819 -0.000713937 -0.00129863
+    -0.00262186 -0.00213417 -0.00133767 0.000775698 0.000969902
+    0.000549281 0.000280946 0.000140321 8.6919e-05 7.22446e-05
+    6.5631e-05 6.45263e-05 6.63087e-05 7.17391e-05 7.59042e-05
+    7.59172e-05 7.03353e-05 6.33558e-05 5.31136e-05 4.64278e-05
+    4.40594e-05 4.16909e-05 4.05674e-05 3.96957e-05 3.87875e-05
+    3.74977e-05 3.62079e-05 3.49181e-05 3.36283e-05 3.23385e-05
+    3.12427e-05 3.02775e-05 2.93124e-05 2.83472e-05 2.7382e-05
+    2.64613e-05 2.59077e-05 2.5354e-05 2.48004e-05 2.42468e-05
+    2.36931e-05 2.31395e-05 2.25859e-05 2.20322e-05 2.14786e-05
+    2.0925e-05 2.03916e-05 1.9995e-05 1.95984e-05 1.92019e-05
+    1.88053e-05 1.84087e-05 1.80122e-05 1.76156e-05 1.7219e-05
+    1.68225e-05 1.64259e-05 1.6051e-05 1.57991e-05 1.55471e-05
+    1.52952e-05 1.50433e-05 1.47913e-05 1.45394e-05 1.42875e-05
+    1.40356e-05 1.37836e-05 1.35317e-05 1.32978e-05 1.31513e-05
+    1.30048e-05 1.28583e-05 1.27118e-05 1.25653e-05 1.24188e-05
+    1.22724e-05 1.21259e-05 1.19794e-05 1.18329e-05 1.16864e-05
+    1.15399e-05 1.13934e-05 1.12469e-05 1.11005e-05 1.0954e-05
+    1.08075e-05 1.0661e-05 1.05145e-05 1.0368e-05 1.02215e-05
+    1.76447e-05 7.21516e-05 -3.59786e-05 -0.000159618 0.000156236
+    0.000135106 -0.000336402 -0.000302283 0.000699323 0.000473866
+    -0.000156146 -0.000225625 -0.000123592 -3.78116e-05 8.47472e-06
+    2.43387e-06 -7.44762e-05 7.80111e-05 9.43608e-05 0.000170159
+    8.83919e-05 -0.00018802 -0.000373512 -0.000390597 0.000156875
+    0.0032343 0.00776304 -0.000566905 -0.00760695 -0.0159226
+    -0.0245989 -0.0331402 -0.0100902 0.067837 0.266702 0.910818
+    1.82282 2.69714 3.43247 3.98325 4.32893 4.51529 4.67087
+    4.79288 4.87574 4.92797 4.95902 4.97655 4.98622 4.99195
+    4.99526 4.99735 4.9991 4.99974 4.99982 4.99974 4.99961 4.9995
+    4.99943 4.9994 4.9994 4.99942 4.99944 4.99948 4.99952 4.99956
+    4.99961 4.99965 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
+    4.99988 4.9999 4.99991 4.99992 4.99993 4.99994 4.99995 4.99995
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
+    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5
+    5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 5 5.00019 4.99888 4.99663 4.99457 4.99902
+    5.00229 5.00323 5.00302 5.0023 5.0015 5.00085 5.00041 5.00013
+    4.99993 4.99979 4.99948 4.99954 4.99983 5.00055 5.00109
+    5.00009 4.9987 4.998 4.99755 4.99676 4.99618 5.01091 5.05272
+    5.04156 4.80112 4.27692 3.42343 2.23953 0.967179 0.429813
+    0.540757 1.32991 2.32147 3.14903 3.78143 4.22325 4.47978
+    4.59448 4.69875 4.79798 4.87419 4.92339 4.95249 4.97174
+    4.98408 4.99124 4.99478 4.99729 4.99868 4.9992 4.99941 4.99947
+    4.99946 4.99943 4.9994 4.99939 4.9994 4.99942 4.99946 4.99951
+    4.99956 4.99961 4.99967 4.99973 4.99977 4.9998 4.99981 4.99983
+    4.99984 4.99987 4.99992 5.00001 5.00005 5.00001 4.99994
+    4.99995 4.99995 4.99996 4.99996 4.99996 4.99997 4.99997
+    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
+    4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+    4.99998 4.99998 4.99998
     EOD
 
     @v[31].set(<<-'EOD')
-    1.8179e-09 -5.28841e-06 -1.44913e-05 -3.62932e-05 -9.75719e-05 
-    0.000141781 3.73396e-05 -1.65603e-05 -1.5271e-05 -6.73884e-06 
-    4.40157e-06 -4.85345e-06 -1.02964e-05 2.03126e-05 -1.89457e-05 
-    -8.75564e-06 7.67422e-06 4.71103e-06 1.29798e-05 6.13469e-06 
-    -1.14363e-05 -0.0394563 -0.0477298 -0.0622012 -0.0519225 
-    0.262499 0.943611 1.67052 2.31017 2.84028 3.28467 3.61582 
-    3.85887 4.13011 4.36511 4.54063 4.67013 4.76408 4.83263 
-    4.8825 4.91837 4.94373 4.96117 4.97318 4.98093 4.98562 4.98906 
-    4.99267 4.99539 4.99666 4.99731 4.99797 4.99844 4.99887 
-    4.99927 4.99933 4.99938 4.99944 4.99949 4.99955 4.9996 4.99965 
-    4.9997 4.99975 4.9998 4.99985 4.99986 4.99987 4.99989 4.9999 
-    4.99991 4.99992 4.99993 4.99995 4.99996 4.99997 4.99998 
-    4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001 
-    5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99997 5.00002 5.00004 5.0001 5.0001 4.99987 5.00009 
-    5.00021 5.00002 5.00004 4.99988 5.00013 4.99993 5.00026 
-    4.99973 5 5.00006 5.00009 5.00004 5.00004 5.04854 4.82711 
-    4.04208 2.64155 0.838902 0.19014 0.0982549 0.0723197 0.0576863 
-    0.0427644 0.0301979 0.020146 0.0135728 0.00980358 0.00774482 
-    0.00586604 0.0036687 0.00211511 0.00121906 0.000647581 0.000828436 
-    0.00190938 0.00224254 0.00199956 0.00165488 0.00135612 0.00113715 
-    0.000984181 0.000877175 0.000789973 0.000741139 0.000689338 
-    0.000625676 0.000586082 0.000550152 0.000529573 0.000505606 
-    0.000482117 0.000460574 0.000441649 0.000424674 0.000408398 
-    0.000391914 0.000376272 0.000361487 0.000348181 0.000336045 
-    0.000324466 0.000313545 0.000303046 0.000293056 0.00028356 
-    0.000274586 0.000266155 0.000258279 0.000250938 0.000243789 
-    0.000236912 0.000230244 0.000224186 0.000219291 0.000215346 
-    0.000212468 0.000207291 0.000200862 0.00019368 0.000186767 
-    0.000183515 0.000180263 0.00017701 0.000173758 0.000170506 
-    0.000167253 0.000164001 0.000161164 0.000158357 0.00015555 
-    0.000152743 0.000149936 0.000147129 0.000144322 0.000142066 
-    0.000140096 0.000138127 0.000136157 0.000134187 0.000132218 
-    0.000130248 0.000128278 0.000126308 0.000124339 0.000122369 
-    0.000120399 0.000118429 0.00011646 0.000114527 0.000112892 
-    0.000111258 0.000109623 0.000107988 0.000103598 6.86052e-05 
-    3.337e-05 7.00783e-05 0.000218764 0.000221318 0.000118593 
-    -0.000113962 5.78552e-05 9.42068e-05 0.000237037 0.000171302 
-    0.0001033 6.16066e-05 5.52908e-05 6.30233e-05 7.01897e-05 
-    8.48573e-05 0.000106859 8.37213e-05 -0.0391541 -0.047722 
-    -0.0618454 -0.0169804 0.345725 1.03426 1.74825 2.37152 2.88737 
-    3.32173 3.66761 3.9707 4.17762 3.98832 3.30483 2.09737 0.710892 
-    0.148159 0.0707463 0.0555808 0.045618 0.0319116 0.0199589 
-    0.0133357 0.00898528 0.00586075 0.00375478 0.00245443 0.00156038 
-    0.000962344 0.000590953 0.000375107 0.000250243 0.00015882 
-    0.000100203 6.18122e-05 3.7372e-05 2.23009e-05 1.32569e-05 
-    8.29437e-06 5.72457e-06 3.96832e-06 2.98935e-06 2.59699e-06 
-    2.75024e-06 3.38689e-06 4.0453e-06 3.50095e-06 1.64988e-06 
-    -3.84371e-07 -2.03828e-06 -3.46401e-06 -1.24301e-06 4.63458e-06 
-    1.14104e-05 1.02619e-05 2.15487e-06 -2.98487e-06 -3.67221e-06 
-    -2.94279e-06 -2.58649e-06 -2.23019e-06 -1.87389e-06 -1.5176e-06 
-    -1.1613e-06 -7.92127e-07 -4.18889e-07 -4.56502e-08 3.27588e-07 
-    7.00827e-07 8.79539e-07 8.17025e-07 7.5451e-07 6.91996e-07 
-    6.29481e-07 5.66966e-07 5.04452e-07 4.41937e-07 3.79422e-07 
-    3.16908e-07 2.54393e-07 1.90078e-07 1.25366e-07 6.0654e-08 
-    -4.05776e-09 -6.87696e-08 -1.33481e-07 -1.98193e-07 -2.62905e-07 
-    -3.27617e-07 -3.92329e-07 -4.40392e-07 -4.18802e-07 -3.97213e-07 
-    -3.75624e-07 -3.54035e-07 -3.32446e-07 -3.10856e-07 -2.89267e-07 
-    -2.67678e-07 
+    1.8179e-09 -5.28841e-06 -1.44913e-05 -3.62932e-05 -9.75719e-05
+    0.000141781 3.73396e-05 -1.65603e-05 -1.5271e-05 -6.73884e-06
+    4.40157e-06 -4.85345e-06 -1.02964e-05 2.03126e-05 -1.89457e-05
+    -8.75564e-06 7.67422e-06 4.71103e-06 1.29798e-05 6.13469e-06
+    -1.14363e-05 -0.0394563 -0.0477298 -0.0622012 -0.0519225
+    0.262499 0.943611 1.67052 2.31017 2.84028 3.28467 3.61582
+    3.85887 4.13011 4.36511 4.54063 4.67013 4.76408 4.83263
+    4.8825 4.91837 4.94373 4.96117 4.97318 4.98093 4.98562 4.98906
+    4.99267 4.99539 4.99666 4.99731 4.99797 4.99844 4.99887
+    4.99927 4.99933 4.99938 4.99944 4.99949 4.99955 4.9996 4.99965
+    4.9997 4.99975 4.9998 4.99985 4.99986 4.99987 4.99989 4.9999
+    4.99991 4.99992 4.99993 4.99995 4.99996 4.99997 4.99998
+    4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
+    5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99997 5.00002 5.00004 5.0001 5.0001 4.99987 5.00009
+    5.00021 5.00002 5.00004 4.99988 5.00013 4.99993 5.00026
+    4.99973 5 5.00006 5.00009 5.00004 5.00004 5.04854 4.82711
+    4.04208 2.64155 0.838902 0.19014 0.0982549 0.0723197 0.0576863
+    0.0427644 0.0301979 0.020146 0.0135728 0.00980358 0.00774482
+    0.00586604 0.0036687 0.00211511 0.00121906 0.000647581 0.000828436
+    0.00190938 0.00224254 0.00199956 0.00165488 0.00135612 0.00113715
+    0.000984181 0.000877175 0.000789973 0.000741139 0.000689338
+    0.000625676 0.000586082 0.000550152 0.000529573 0.000505606
+    0.000482117 0.000460574 0.000441649 0.000424674 0.000408398
+    0.000391914 0.000376272 0.000361487 0.000348181 0.000336045
+    0.000324466 0.000313545 0.000303046 0.000293056 0.00028356
+    0.000274586 0.000266155 0.000258279 0.000250938 0.000243789
+    0.000236912 0.000230244 0.000224186 0.000219291 0.000215346
+    0.000212468 0.000207291 0.000200862 0.00019368 0.000186767
+    0.000183515 0.000180263 0.00017701 0.000173758 0.000170506
+    0.000167253 0.000164001 0.000161164 0.000158357 0.00015555
+    0.000152743 0.000149936 0.000147129 0.000144322 0.000142066
+    0.000140096 0.000138127 0.000136157 0.000134187 0.000132218
+    0.000130248 0.000128278 0.000126308 0.000124339 0.000122369
+    0.000120399 0.000118429 0.00011646 0.000114527 0.000112892
+    0.000111258 0.000109623 0.000107988 0.000103598 6.86052e-05
+    3.337e-05 7.00783e-05 0.000218764 0.000221318 0.000118593
+    -0.000113962 5.78552e-05 9.42068e-05 0.000237037 0.000171302
+    0.0001033 6.16066e-05 5.52908e-05 6.30233e-05 7.01897e-05
+    8.48573e-05 0.000106859 8.37213e-05 -0.0391541 -0.047722
+    -0.0618454 -0.0169804 0.345725 1.03426 1.74825 2.37152 2.88737
+    3.32173 3.66761 3.9707 4.17762 3.98832 3.30483 2.09737 0.710892
+    0.148159 0.0707463 0.0555808 0.045618 0.0319116 0.0199589
+    0.0133357 0.00898528 0.00586075 0.00375478 0.00245443 0.00156038
+    0.000962344 0.000590953 0.000375107 0.000250243 0.00015882
+    0.000100203 6.18122e-05 3.7372e-05 2.23009e-05 1.32569e-05
+    8.29437e-06 5.72457e-06 3.96832e-06 2.98935e-06 2.59699e-06
+    2.75024e-06 3.38689e-06 4.0453e-06 3.50095e-06 1.64988e-06
+    -3.84371e-07 -2.03828e-06 -3.46401e-06 -1.24301e-06 4.63458e-06
+    1.14104e-05 1.02619e-05 2.15487e-06 -2.98487e-06 -3.67221e-06
+    -2.94279e-06 -2.58649e-06 -2.23019e-06 -1.87389e-06 -1.5176e-06
+    -1.1613e-06 -7.92127e-07 -4.18889e-07 -4.56502e-08 3.27588e-07
+    7.00827e-07 8.79539e-07 8.17025e-07 7.5451e-07 6.91996e-07
+    6.29481e-07 5.66966e-07 5.04452e-07 4.41937e-07 3.79422e-07
+    3.16908e-07 2.54393e-07 1.90078e-07 1.25366e-07 6.0654e-08
+    -4.05776e-09 -6.87696e-08 -1.33481e-07 -1.98193e-07 -2.62905e-07
+    -3.27617e-07 -3.92329e-07 -4.40392e-07 -4.18802e-07 -3.97213e-07
+    -3.75624e-07 -3.54035e-07 -3.32446e-07 -3.10856e-07 -2.89267e-07
+    -2.67678e-07
     EOD
 
     @v[32].set(<<-'EOD')
-    1.10294 1.10297 1.10291 1.10277 1.10259 1.10294 1.10313 
-    1.10306 1.10299 1.10296 1.10295 1.10295 1.10294 1.10294 
-    1.10294 1.10294 1.10294 1.10294 1.10294 1.10296 1.10296 
-    1.00547 0.998599 1.5201 2.49297 3.31258 3.73162 3.84757 
-    3.92505 4.02965 4.16599 4.30294 4.41541 4.52886 4.64414 
-    4.73865 4.81065 4.86391 4.90315 4.93188 4.95258 4.96726 
-    4.97738 4.98436 4.98888 4.99162 4.99363 4.99573 4.99731 
-    4.99804 4.99843 4.99881 4.99909 4.99934 4.99957 4.9996 4.99964 
-    4.99967 4.9997 4.99973 4.99977 4.9998 4.99983 4.99986 4.99988 
-    4.99991 4.99992 4.99992 4.99993 4.99994 4.99994 4.99995 
-    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 
-    4.99999 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 5.00028 4.99988 4.99968 
-    5.00019 4.99987 5.00021 4.99973 4.99977 4.99996 4.99997 
-    5.0002 4.99957 5.00026 4.99947 5.00074 5.00003 4.99987 4.99979 
-    5.00008 4.99997 5.08794 5.05993 4.76875 3.99197 3.10174 
-    2.5197 2.21771 2.04 1.92235 1.83874 1.77592 1.72665 1.686 
-    1.65276 1.6286 1.61299 1.60039 1.58934 1.57954 1.57083 1.56306 
-    1.55604 1.54963 1.54375 1.53832 1.53331 1.52865 1.52432 
-    1.52026 1.51645 1.51287 1.50949 1.50629 1.50327 1.50039 
-    1.49766 1.49505 1.49257 1.49019 1.48792 1.48574 1.48365 
-    1.48164 1.47971 1.47784 1.47604 1.47431 1.47264 1.47102 
-    1.46945 1.46794 1.46647 1.46505 1.46367 1.46233 1.46103 
-    1.45976 1.45853 1.45733 1.45616 1.45502 1.45392 1.45284 
-    1.45179 1.45076 1.44975 1.4488 1.44795 1.44711 1.44626 1.44541 
-    1.44457 1.44372 1.44287 1.44212 1.44138 1.44063 1.43989 
-    1.43914 1.4384 1.43766 1.43701 1.43641 1.43581 1.43522 1.43462 
-    1.43402 1.43342 1.43282 1.43223 1.43163 1.43103 1.43043 
-    1.42984 1.42924 1.42865 1.42808 1.42752 1.42695 1.42639 
-    1.42584 1.42529 1.42472 1.42412 1.42365 1.42326 1.42304 
-    1.42162 1.42082 1.42032 1.42029 1.42026 1.41995 1.41947 
-    1.41894 1.41841 1.4179 1.41742 1.41699 1.41656 1.32097 1.30963 
-    1.78765 2.64656 3.35764 3.747 3.86589 3.94217 4.04185 4.18453 
-    4.3561 4.53439 4.68621 4.74905 4.77848 4.84629 4.91261 4.97541 
-    5.01284 5.01548 5.01248 5.00924 5.00666 5.00475 5.00334 
-    5.00234 5.00164 5.00118 5.00083 5.00058 5.0004 5.00028 5.00019 
-    5.00013 5.00009 5.00007 5.00004 5.00003 5.00002 5.00001 
-    5.00001 5.00001 5 5 4.99999 4.99995 4.99992 4.99996 5.00006 
-    5.00012 5.00009 4.99997 4.9999 4.99985 4.99986 4.99997 5.00021 
-    5.00031 5.00024 5.0001 5.00007 5.00005 5.00003 5.00001 4.99998 
-    4.99998 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 
-    5 4.99999 4.99999 4.99999 4.99998 4.99998 4.99998 
+    1.10294 1.10297 1.10291 1.10277 1.10259 1.10294 1.10313
+    1.10306 1.10299 1.10296 1.10295 1.10295 1.10294 1.10294
+    1.10294 1.10294 1.10294 1.10294 1.10294 1.10296 1.10296
+    1.00547 0.998599 1.5201 2.49297 3.31258 3.73162 3.84757
+    3.92505 4.02965 4.16599 4.30294 4.41541 4.52886 4.64414
+    4.73865 4.81065 4.86391 4.90315 4.93188 4.95258 4.96726
+    4.97738 4.98436 4.98888 4.99162 4.99363 4.99573 4.99731
+    4.99804 4.99843 4.99881 4.99909 4.99934 4.99957 4.9996 4.99964
+    4.99967 4.9997 4.99973 4.99977 4.9998 4.99983 4.99986 4.99988
+    4.99991 4.99992 4.99992 4.99993 4.99994 4.99994 4.99995
+    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999
+    4.99999 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 5.00028 4.99988 4.99968
+    5.00019 4.99987 5.00021 4.99973 4.99977 4.99996 4.99997
+    5.0002 4.99957 5.00026 4.99947 5.00074 5.00003 4.99987 4.99979
+    5.00008 4.99997 5.08794 5.05993 4.76875 3.99197 3.10174
+    2.5197 2.21771 2.04 1.92235 1.83874 1.77592 1.72665 1.686
+    1.65276 1.6286 1.61299 1.60039 1.58934 1.57954 1.57083 1.56306
+    1.55604 1.54963 1.54375 1.53832 1.53331 1.52865 1.52432
+    1.52026 1.51645 1.51287 1.50949 1.50629 1.50327 1.50039
+    1.49766 1.49505 1.49257 1.49019 1.48792 1.48574 1.48365
+    1.48164 1.47971 1.47784 1.47604 1.47431 1.47264 1.47102
+    1.46945 1.46794 1.46647 1.46505 1.46367 1.46233 1.46103
+    1.45976 1.45853 1.45733 1.45616 1.45502 1.45392 1.45284
+    1.45179 1.45076 1.44975 1.4488 1.44795 1.44711 1.44626 1.44541
+    1.44457 1.44372 1.44287 1.44212 1.44138 1.44063 1.43989
+    1.43914 1.4384 1.43766 1.43701 1.43641 1.43581 1.43522 1.43462
+    1.43402 1.43342 1.43282 1.43223 1.43163 1.43103 1.43043
+    1.42984 1.42924 1.42865 1.42808 1.42752 1.42695 1.42639
+    1.42584 1.42529 1.42472 1.42412 1.42365 1.42326 1.42304
+    1.42162 1.42082 1.42032 1.42029 1.42026 1.41995 1.41947
+    1.41894 1.41841 1.4179 1.41742 1.41699 1.41656 1.32097 1.30963
+    1.78765 2.64656 3.35764 3.747 3.86589 3.94217 4.04185 4.18453
+    4.3561 4.53439 4.68621 4.74905 4.77848 4.84629 4.91261 4.97541
+    5.01284 5.01548 5.01248 5.00924 5.00666 5.00475 5.00334
+    5.00234 5.00164 5.00118 5.00083 5.00058 5.0004 5.00028 5.00019
+    5.00013 5.00009 5.00007 5.00004 5.00003 5.00002 5.00001
+    5.00001 5.00001 5 5 4.99999 4.99995 4.99992 4.99996 5.00006
+    5.00012 5.00009 4.99997 4.9999 4.99985 4.99986 4.99997 5.00021
+    5.00031 5.00024 5.0001 5.00007 5.00005 5.00003 5.00001 4.99998
+    4.99998 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
+    5 4.99999 4.99999 4.99999 4.99998 4.99998 4.99998
     EOD
 
     @v[33].set(<<-'EOD')
-    5 5.00012 5.00023 5.0003 4.99972 4.99988 4.99984 4.99991 
-    4.99996 4.99999 5.00008 5.00009 4.99986 5.00003 5.00007 
-    4.99995 4.9999 4.99997 5.00013 5.00014 5.00013 4.99701 4.99763 
-    4.99742 4.99998 5.02836 5.07262 4.96856 4.57267 3.85637 
-    2.79544 1.45942 0.408016 0.084885 0.0271375 0.0119294 0.00707546 
-    0.0051087 0.00373035 0.00264737 0.00186477 0.00130379 0.000915857 
-    0.000653121 0.000483893 0.000380852 0.000302362 0.000219498 
-    0.000154435 0.000121928 0.000104026 8.61242e-05 7.48526e-05 
-    6.49216e-05 5.56238e-05 5.29689e-05 5.03139e-05 4.7659e-05 
-    4.5004e-05 4.23491e-05 4.00356e-05 3.79522e-05 3.58687e-05 
-    3.37852e-05 3.17018e-05 2.97592e-05 2.89804e-05 2.82016e-05 
-    2.74228e-05 2.66441e-05 2.58653e-05 2.50865e-05 2.43077e-05 
-    2.35289e-05 2.27501e-05 2.19714e-05 2.12346e-05 2.07821e-05 
-    2.03295e-05 1.98769e-05 1.94244e-05 1.89718e-05 1.85192e-05 
-    1.80667e-05 1.76141e-05 1.71615e-05 1.6709e-05 1.62828e-05 
-    1.60061e-05 1.57294e-05 1.54527e-05 1.5176e-05 1.48993e-05 
-    1.46226e-05 1.43459e-05 1.40692e-05 1.37925e-05 1.35158e-05 
-    1.3262e-05 1.31191e-05 1.29761e-05 1.28332e-05 1.26903e-05 
-    1.25474e-05 1.24045e-05 1.22615e-05 1.21186e-05 1.19757e-05 
-    1.18328e-05 1.16898e-05 1.15469e-05 1.1404e-05 1.12611e-05 
-    1.11182e-05 1.09752e-05 1.08323e-05 1.06894e-05 1.05465e-05 
-    1.04036e-05 1.02606e-05 1.00185e-05 3.8343e-05 -3.06781e-05 
-    -0.000111758 0.000111673 0.000130815 -0.000210491 -0.000231304 
-    0.000310226 0.000265303 3.0878e-05 -4.48405e-05 -1.2852e-05 
-    -7.84469e-06 3.29986e-05 -1.23286e-05 -6.07871e-05 5.35082e-05 
-    7.69194e-05 0.000126221 6.57178e-05 0.00223349 -0.0148854 
-    -0.0476636 -0.0491447 0.220125 1.11174 2.03988 2.90209 3.61069 
-    4.13554 4.50679 4.71501 4.83916 4.91027 4.95284 4.98086 
-    4.99151 4.98651 4.97113 4.95075 4.93102 4.93683 4.95457 
-    4.97071 4.98212 4.98948 4.99386 4.99636 4.99785 4.9987 4.99927 
-    4.99989 5.00014 5.00007 4.99988 4.99982 4.99976 4.99973 
-    4.99972 4.99972 4.99973 4.99974 4.99975 4.99977 4.99979 
-    4.99981 4.99984 4.99986 4.99988 4.99989 4.99991 4.99992 
-    4.99993 4.99994 4.99995 4.99996 4.99996 4.99997 4.99997 
-    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 
-    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
-    4.99999 4.99999 4.99999 5 5.00012 4.99946 4.99839 4.99733 
-    4.99948 5.00114 5.00158 5.00147 5.00113 5.00073 5.00043 
-    5.0002 5.00006 4.99995 4.99986 4.99973 4.99976 4.9999 5.00029 
-    5.00055 4.99704 4.99734 4.9972 5.00278 5.03354 5.07184 4.94057 
-    4.51936 3.75638 2.60982 1.23803 0.315016 0.0796102 0.0252894 
-    0.0165723 0.0827785 0.491298 1.40686 2.33436 3.1251 3.7691 
-    4.22201 4.49976 4.68115 4.80513 4.88509 4.93208 4.95861 
-    4.97579 4.98655 4.99268 4.99571 4.99771 4.99881 4.99929 
-    4.99954 4.99965 4.9997 4.99971 4.99971 4.99971 4.99971 4.99972 
-    4.99974 4.99976 4.99978 4.99981 4.99984 4.99987 4.99989 
-    4.99991 4.99991 4.99992 4.99992 4.99993 4.99997 5.00003 
-    5.00006 5.00004 5.00001 5 4.99999 4.99998 4.99998 4.99997 
-    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999 
-    4.99999 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 4.99999 
-    4.99999 4.99999 4.99999 4.99998 4.99998 
+    5 5.00012 5.00023 5.0003 4.99972 4.99988 4.99984 4.99991
+    4.99996 4.99999 5.00008 5.00009 4.99986 5.00003 5.00007
+    4.99995 4.9999 4.99997 5.00013 5.00014 5.00013 4.99701 4.99763
+    4.99742 4.99998 5.02836 5.07262 4.96856 4.57267 3.85637
+    2.79544 1.45942 0.408016 0.084885 0.0271375 0.0119294 0.00707546
+    0.0051087 0.00373035 0.00264737 0.00186477 0.00130379 0.000915857
+    0.000653121 0.000483893 0.000380852 0.000302362 0.000219498
+    0.000154435 0.000121928 0.000104026 8.61242e-05 7.48526e-05
+    6.49216e-05 5.56238e-05 5.29689e-05 5.03139e-05 4.7659e-05
+    4.5004e-05 4.23491e-05 4.00356e-05 3.79522e-05 3.58687e-05
+    3.37852e-05 3.17018e-05 2.97592e-05 2.89804e-05 2.82016e-05
+    2.74228e-05 2.66441e-05 2.58653e-05 2.50865e-05 2.43077e-05
+    2.35289e-05 2.27501e-05 2.19714e-05 2.12346e-05 2.07821e-05
+    2.03295e-05 1.98769e-05 1.94244e-05 1.89718e-05 1.85192e-05
+    1.80667e-05 1.76141e-05 1.71615e-05 1.6709e-05 1.62828e-05
+    1.60061e-05 1.57294e-05 1.54527e-05 1.5176e-05 1.48993e-05
+    1.46226e-05 1.43459e-05 1.40692e-05 1.37925e-05 1.35158e-05
+    1.3262e-05 1.31191e-05 1.29761e-05 1.28332e-05 1.26903e-05
+    1.25474e-05 1.24045e-05 1.22615e-05 1.21186e-05 1.19757e-05
+    1.18328e-05 1.16898e-05 1.15469e-05 1.1404e-05 1.12611e-05
+    1.11182e-05 1.09752e-05 1.08323e-05 1.06894e-05 1.05465e-05
+    1.04036e-05 1.02606e-05 1.00185e-05 3.8343e-05 -3.06781e-05
+    -0.000111758 0.000111673 0.000130815 -0.000210491 -0.000231304
+    0.000310226 0.000265303 3.0878e-05 -4.48405e-05 -1.2852e-05
+    -7.84469e-06 3.29986e-05 -1.23286e-05 -6.07871e-05 5.35082e-05
+    7.69194e-05 0.000126221 6.57178e-05 0.00223349 -0.0148854
+    -0.0476636 -0.0491447 0.220125 1.11174 2.03988 2.90209 3.61069
+    4.13554 4.50679 4.71501 4.83916 4.91027 4.95284 4.98086
+    4.99151 4.98651 4.97113 4.95075 4.93102 4.93683 4.95457
+    4.97071 4.98212 4.98948 4.99386 4.99636 4.99785 4.9987 4.99927
+    4.99989 5.00014 5.00007 4.99988 4.99982 4.99976 4.99973
+    4.99972 4.99972 4.99973 4.99974 4.99975 4.99977 4.99979
+    4.99981 4.99984 4.99986 4.99988 4.99989 4.99991 4.99992
+    4.99993 4.99994 4.99995 4.99996 4.99996 4.99997 4.99997
+    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
+    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00001 5.00001
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+    4.99999 4.99999 4.99999 5 5.00012 4.99946 4.99839 4.99733
+    4.99948 5.00114 5.00158 5.00147 5.00113 5.00073 5.00043
+    5.0002 5.00006 4.99995 4.99986 4.99973 4.99976 4.9999 5.00029
+    5.00055 4.99704 4.99734 4.9972 5.00278 5.03354 5.07184 4.94057
+    4.51936 3.75638 2.60982 1.23803 0.315016 0.0796102 0.0252894
+    0.0165723 0.0827785 0.491298 1.40686 2.33436 3.1251 3.7691
+    4.22201 4.49976 4.68115 4.80513 4.88509 4.93208 4.95861
+    4.97579 4.98655 4.99268 4.99571 4.99771 4.99881 4.99929
+    4.99954 4.99965 4.9997 4.99971 4.99971 4.99971 4.99971 4.99972
+    4.99974 4.99976 4.99978 4.99981 4.99984 4.99987 4.99989
+    4.99991 4.99991 4.99992 4.99992 4.99993 4.99997 5.00003
+    5.00006 5.00004 5.00001 5 4.99999 4.99998 4.99998 4.99997
+    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
+    4.99999 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 4.99999
+    4.99999 4.99999 4.99999 4.99998 4.99998
     EOD
 
     @v[34].set(<<-'EOD')
-    5 5.00207 5.00813 5.01486 5.00156 5.0018 4.99861 4.99844 
-    4.99888 4.9993 4.99956 4.99971 4.99979 4.99983 4.99987 4.99989 
-    4.99671 4.9974 4.99864 5.00131 5.00377 5.0021 5.00039 4.99993 
-    5.00004 5.0009 5.00109 4.99636 4.98617 4.96778 4.92047 4.89528 
-    4.91112 4.9559 4.98286 4.99369 4.99812 4.99951 4.99994 5.00014 
-    5.00008 4.99994 4.99984 4.99989 4.99998 5.00004 5.00004 
-    5.00006 5.00005 5.00001 4.99997 4.99992 4.99993 4.99994 
-    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 
-    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 
-    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 
-    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 
-    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
-    4.99998 4.99998 4.99998 4.99998 5.00131 5.00072 4.9977 4.99811 
-    5.00325 4.99647 4.98948 4.99459 5.00262 5.00276 5.00156 
-    5.00072 5.0003 5.00013 4.99995 4.99668 4.99775 4.99917 5.00173 
-    5.00386 5.00188 4.99888 4.99757 4.99951 5.01712 5.0557 5.07088 
-    5.07704 5.07758 5.06958 5.04223 5.03331 5.0279 5.03408 5.07611 
-    5.01911 4.68594 3.99152 2.92195 1.69878 0.809 0.344091 0.154663 
-    0.0788717 0.0467212 0.0336168 0.0280514 0.0254947 0.024173 
-    0.0223567 0.0220555 0.0271514 0.0295872 0.0296052 0.0283971 
-    0.0264726 0.0241813 0.0218244 0.0195349 0.017368 0.0152495 
-    0.013295 0.0115444 0.00996982 0.00857091 0.00733891 0.00627261 
-    0.0053494 0.00456316 0.00388373 0.00331073 0.00282181 0.00240991 
-    0.00206389 0.00177187 0.00152283 0.00131167 0.00112558 0.000954373 
-    0.000805726 0.00069326 0.000600991 0.000525743 0.00047355 
-    0.00044359 0.000434815 0.000436053 0.000402511 0.000368969 
-    0.000335427 0.000301886 0.000268344 0.000234802 0.00020126 
-    0.000184967 0.000169932 0.000154896 0.000139861 0.000124825 
-    0.00010979 9.47546e-05 8.67896e-05 8.24901e-05 7.81906e-05 
-    7.38911e-05 6.95915e-05 6.5292e-05 6.09925e-05 5.66929e-05 
-    5.23934e-05 4.80939e-05 4.37943e-05 3.94948e-05 3.51953e-05 
-    3.08957e-05 2.67968e-05 2.42936e-05 2.17904e-05 1.92872e-05 
-    1.6784e-05 0.00125927 -0.00794344 -0.0305499 -0.0621697 
-    -0.0463796 -0.0224608 -0.00538381 0.00546086 0.0108675 0.012883 
-    0.0131787 0.0127271 0.0119702 0.0110398 0.0100635 0.00649617 
-    0.00489388 0.00545863 0.0098351 0.0167428 0.0126563 0.00697542 
-    0.00427027 0.00330002 0.00390774 0.00408999 -0.00259143 
-    -0.0160578 -0.0451849 -0.0409651 0.1301 0.597429 1.3848 
-    2.63426 3.81272 4.51373 4.8412 4.98731 4.88165 4.37165 3.40034 
-    2.17681 1.12217 0.505129 0.219703 0.104992 0.0622333 0.0448317 
-    0.0355782 0.0311867 0.0293529 0.0274615 0.0288739 0.0307845 
-    0.0304909 0.029245 0.0273602 0.0251006 0.022697 0.0202765 
-    0.0179357 0.0157106 0.0136562 0.0117951 0.0101273 0.00865784 
-    0.00739394 0.00634364 0.00551356 0.00480538 0.00415747 0.00356084 
-    0.00297585 0.00236711 0.00181853 0.00160713 0.00169822 0.00166542 
-    0.00145504 0.00120252 0.00109259 0.000982658 0.00087273 
-    0.000762802 0.000652874 0.000584068 0.000528263 0.000472458 
-    0.000416653 0.000360848 0.000321155 0.000301442 0.000281729 
-    0.000262016 0.000242303 0.00022259 0.000202877 0.000183164 
-    0.000163451 0.000143738 0.000124025 0.000114582 0.000107399 
-    0.000100216 9.30332e-05 8.58502e-05 7.86672e-05 7.14841e-05 
-    6.43011e-05 5.7118e-05 4.9935e-05 4.35378e-05 4.04281e-05 
-    3.73184e-05 3.42088e-05 3.10991e-05 2.79894e-05 2.48798e-05 
-    2.17701e-05 1.86604e-05 
+    5 5.00207 5.00813 5.01486 5.00156 5.0018 4.99861 4.99844
+    4.99888 4.9993 4.99956 4.99971 4.99979 4.99983 4.99987 4.99989
+    4.99671 4.9974 4.99864 5.00131 5.00377 5.0021 5.00039 4.99993
+    5.00004 5.0009 5.00109 4.99636 4.98617 4.96778 4.92047 4.89528
+    4.91112 4.9559 4.98286 4.99369 4.99812 4.99951 4.99994 5.00014
+    5.00008 4.99994 4.99984 4.99989 4.99998 5.00004 5.00004
+    5.00006 5.00005 5.00001 4.99997 4.99992 4.99993 4.99994
+    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
+    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
+    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
+    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
+    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+    4.99998 4.99998 4.99998 4.99998 5.00131 5.00072 4.9977 4.99811
+    5.00325 4.99647 4.98948 4.99459 5.00262 5.00276 5.00156
+    5.00072 5.0003 5.00013 4.99995 4.99668 4.99775 4.99917 5.00173
+    5.00386 5.00188 4.99888 4.99757 4.99951 5.01712 5.0557 5.07088
+    5.07704 5.07758 5.06958 5.04223 5.03331 5.0279 5.03408 5.07611
+    5.01911 4.68594 3.99152 2.92195 1.69878 0.809 0.344091 0.154663
+    0.0788717 0.0467212 0.0336168 0.0280514 0.0254947 0.024173
+    0.0223567 0.0220555 0.0271514 0.0295872 0.0296052 0.0283971
+    0.0264726 0.0241813 0.0218244 0.0195349 0.017368 0.0152495
+    0.013295 0.0115444 0.00996982 0.00857091 0.00733891 0.00627261
+    0.0053494 0.00456316 0.00388373 0.00331073 0.00282181 0.00240991
+    0.00206389 0.00177187 0.00152283 0.00131167 0.00112558 0.000954373
+    0.000805726 0.00069326 0.000600991 0.000525743 0.00047355
+    0.00044359 0.000434815 0.000436053 0.000402511 0.000368969
+    0.000335427 0.000301886 0.000268344 0.000234802 0.00020126
+    0.000184967 0.000169932 0.000154896 0.000139861 0.000124825
+    0.00010979 9.47546e-05 8.67896e-05 8.24901e-05 7.81906e-05
+    7.38911e-05 6.95915e-05 6.5292e-05 6.09925e-05 5.66929e-05
+    5.23934e-05 4.80939e-05 4.37943e-05 3.94948e-05 3.51953e-05
+    3.08957e-05 2.67968e-05 2.42936e-05 2.17904e-05 1.92872e-05
+    1.6784e-05 0.00125927 -0.00794344 -0.0305499 -0.0621697
+    -0.0463796 -0.0224608 -0.00538381 0.00546086 0.0108675 0.012883
+    0.0131787 0.0127271 0.0119702 0.0110398 0.0100635 0.00649617
+    0.00489388 0.00545863 0.0098351 0.0167428 0.0126563 0.00697542
+    0.00427027 0.00330002 0.00390774 0.00408999 -0.00259143
+    -0.0160578 -0.0451849 -0.0409651 0.1301 0.597429 1.3848
+    2.63426 3.81272 4.51373 4.8412 4.98731 4.88165 4.37165 3.40034
+    2.17681 1.12217 0.505129 0.219703 0.104992 0.0622333 0.0448317
+    0.0355782 0.0311867 0.0293529 0.0274615 0.0288739 0.0307845
+    0.0304909 0.029245 0.0273602 0.0251006 0.022697 0.0202765
+    0.0179357 0.0157106 0.0136562 0.0117951 0.0101273 0.00865784
+    0.00739394 0.00634364 0.00551356 0.00480538 0.00415747 0.00356084
+    0.00297585 0.00236711 0.00181853 0.00160713 0.00169822 0.00166542
+    0.00145504 0.00120252 0.00109259 0.000982658 0.00087273
+    0.000762802 0.000652874 0.000584068 0.000528263 0.000472458
+    0.000416653 0.000360848 0.000321155 0.000301442 0.000281729
+    0.000262016 0.000242303 0.00022259 0.000202877 0.000183164
+    0.000163451 0.000143738 0.000124025 0.000114582 0.000107399
+    0.000100216 9.30332e-05 8.58502e-05 7.86672e-05 7.14841e-05
+    6.43011e-05 5.7118e-05 4.9935e-05 4.35378e-05 4.04281e-05
+    3.73184e-05 3.42088e-05 3.10991e-05 2.79894e-05 2.48798e-05
+    2.17701e-05 1.86604e-05
     EOD
 
     @v[35].set(<<-'EOD')
-    7.24585e-12 2.21843e-05 3.20014e-05 1.25076e-05 -2.44947e-05 
-    1.8425e-05 5.50546e-06 3.53025e-05 -1.07551e-05 -3.94383e-06 
-    -2.27848e-06 -9.04789e-05 7.44215e-05 -2.7662e-05 0.000200038 
-    -2.11998e-05 -2.09011e-05 2.37098e-05 2.18751e-05 -2.28422e-05 
-    -6.23659e-05 3.58241e-05 1.76386e-05 -4.28311e-05 0.000355626 
-    0.00156903 0.00100999 -0.0085304 -0.02067 -0.0389485 -0.0651568 
-    -0.128475 -0.314362 -0.406837 -0.421558 -0.421277 -0.418176 
-    -0.414481 -0.410845 -0.407348 -0.403971 -0.400716 -0.397582 
-    -0.394563 -0.391658 -0.388866 -0.386178 -0.383585 -0.381094 
-    -0.378789 -0.376569 -0.37435 -0.372256 -0.370188 -0.36815 
-    -0.366422 -0.364694 -0.362967 -0.361239 -0.359511 -0.357888 
-    -0.356334 -0.354781 -0.353227 -0.351674 -0.350152 -0.348888 
-    -0.347625 -0.346361 -0.345098 -0.343834 -0.342571 -0.341307 
-    -0.340044 -0.33878 -0.337517 -0.336279 -0.335215 -0.334152 
-    -0.333088 -0.332024 -0.330961 -0.329897 -0.328833 -0.32777 
-    -0.326706 -0.325642 -0.324601 -0.323683 -0.322766 -0.321849 
-    -0.320932 -0.320014 -0.319097 -0.31818 -0.317263 -0.316345 
-    -0.315428 -0.314545 -0.313825 -0.313106 -0.312387 -0.311667 
-    -0.310948 -0.310228 -0.309509 -0.308789 -0.30807 -0.307351 
-    -0.306631 -0.305912 -0.305192 -0.304473 -0.303754 -0.303034 
-    -0.302315 -0.301595 -0.300876 -0.300157 -0.299437 -0.298716 
-    -0.29798 -0.297329 -0.296691 -0.295837 -0.29516 -0.294725 
-    -0.294044 -0.292917 -0.292351 -0.291965 -0.291365 -0.290687 
-    -0.290027 -0.289376 -0.288772 -0.288193 -0.287505 -0.286892 
-    -0.28626 -0.285714 -0.284545 -0.289246 -0.298717 -0.298492 
-    -0.214163 0.181451 0.0749974 0.0454707 0.0292987 0.0196837 
-    0.0124119 0.00884715 0.00527181 0.00585821 0.0296361 0.169856 
-    0.361207 0.538856 0.67469 0.685933 0.392802 0.17772 0.0813085 
-    0.0424601 0.0246654 0.0175258 0.0144256 0.0129859 0.012205 
-    0.0112846 0.010933 0.0134813 0.0147254 0.0147981 0.0142156 
-    0.0132732 0.0121355 0.0109587 0.00981238 0.00872731 0.00767007 
-    0.00669346 0.00581341 0.00502167 0.00431819 0.00369842 0.00316168 
-    0.00269663 0.00230035 0.00195801 0.00166928 0.00142286 0.00121522 
-    0.00104072 0.000893384 0.000767675 0.000661268 0.000567659 
-    0.000481766 0.000407101 0.000350044 0.000302721 0.000263424 
-    0.000236813 0.00022199 0.000218182 0.000219548 0.0002027 
-    0.000185853 0.000169006 0.000152158 0.000135311 0.000118463 
-    0.000101616 9.33782e-05 8.57685e-05 7.81588e-05 7.0549e-05 
-    6.29393e-05 5.53296e-05 4.77199e-05 4.36954e-05 4.15296e-05 
-    3.93637e-05 3.71978e-05 3.50319e-05 3.28661e-05 3.07002e-05 
-    2.85343e-05 2.63685e-05 2.42026e-05 2.20367e-05 1.98709e-05 
-    1.7705e-05 1.55391e-05 1.34772e-05 1.22416e-05 1.10061e-05 
-    9.77055e-06 8.535e-06 0.000631271 -0.00362586 -0.0146235 
-    -0.0308486 -0.0237466 -0.0117522 -0.00304171 0.00251033 
-    0.00531986 0.0063897 0.00657351 0.00636494 0.00599705 0.00553442 
-    0.00505994 0.00330925 0.00246671 0.0027006 0.00473161 0.00830333 
-    0.00649147 0.00356815 0.00217448 0.00187579 0.00270447 0.00219543 
-    -0.00546118 -0.0179576 -0.0445306 -0.0649309 0.0197935 0.473629 
-    0.87268 0.269542 0.0086094 0.0844602 0.606456 1.04929 0.906014 
-    0.916205 0.919425 0.872867 0.556244 0.262457 0.11838 0.0571226 
-    0.0333451 0.0237133 0.0185096 0.0159617 0.0148663 0.0138683 
-    0.0144081 0.0153797 0.0152551 0.0146487 0.0137192 0.0125973 
-    0.0113996 0.0101903 0.00901851 0.00790495 0.00687502 0.00593994 
-    0.00510092 0.00436111 0.00372439 0.0031945 0.00277537 0.00241888 
-    0.002095 0.00179943 0.00150419 0.00119264 0.00090934 0.000802394 
-    0.000852816 0.000838368 0.000730842 0.000601028 0.000546616 
-    0.000492205 0.000437793 0.000383381 0.000328969 0.00029454 
-    0.000266428 0.000238317 0.000210205 0.000182093 0.000162091 
-    0.000152145 0.000142198 0.000132252 0.000122306 0.000112359 
-    0.000102413 9.24665e-05 8.25201e-05 7.25738e-05 6.26274e-05 
-    5.78553e-05 5.42216e-05 5.05878e-05 4.69541e-05 4.33204e-05 
-    3.96867e-05 3.60529e-05 3.24192e-05 2.87855e-05 2.51518e-05 
-    2.19153e-05 2.03406e-05 1.8766e-05 1.71913e-05 1.56167e-05 
-    1.4042e-05 1.24674e-05 1.08927e-05 9.31806e-06 
+    7.24585e-12 2.21843e-05 3.20014e-05 1.25076e-05 -2.44947e-05
+    1.8425e-05 5.50546e-06 3.53025e-05 -1.07551e-05 -3.94383e-06
+    -2.27848e-06 -9.04789e-05 7.44215e-05 -2.7662e-05 0.000200038
+    -2.11998e-05 -2.09011e-05 2.37098e-05 2.18751e-05 -2.28422e-05
+    -6.23659e-05 3.58241e-05 1.76386e-05 -4.28311e-05 0.000355626
+    0.00156903 0.00100999 -0.0085304 -0.02067 -0.0389485 -0.0651568
+    -0.128475 -0.314362 -0.406837 -0.421558 -0.421277 -0.418176
+    -0.414481 -0.410845 -0.407348 -0.403971 -0.400716 -0.397582
+    -0.394563 -0.391658 -0.388866 -0.386178 -0.383585 -0.381094
+    -0.378789 -0.376569 -0.37435 -0.372256 -0.370188 -0.36815
+    -0.366422 -0.364694 -0.362967 -0.361239 -0.359511 -0.357888
+    -0.356334 -0.354781 -0.353227 -0.351674 -0.350152 -0.348888
+    -0.347625 -0.346361 -0.345098 -0.343834 -0.342571 -0.341307
+    -0.340044 -0.33878 -0.337517 -0.336279 -0.335215 -0.334152
+    -0.333088 -0.332024 -0.330961 -0.329897 -0.328833 -0.32777
+    -0.326706 -0.325642 -0.324601 -0.323683 -0.322766 -0.321849
+    -0.320932 -0.320014 -0.319097 -0.31818 -0.317263 -0.316345
+    -0.315428 -0.314545 -0.313825 -0.313106 -0.312387 -0.311667
+    -0.310948 -0.310228 -0.309509 -0.308789 -0.30807 -0.307351
+    -0.306631 -0.305912 -0.305192 -0.304473 -0.303754 -0.303034
+    -0.302315 -0.301595 -0.300876 -0.300157 -0.299437 -0.298716
+    -0.29798 -0.297329 -0.296691 -0.295837 -0.29516 -0.294725
+    -0.294044 -0.292917 -0.292351 -0.291965 -0.291365 -0.290687
+    -0.290027 -0.289376 -0.288772 -0.288193 -0.287505 -0.286892
+    -0.28626 -0.285714 -0.284545 -0.289246 -0.298717 -0.298492
+    -0.214163 0.181451 0.0749974 0.0454707 0.0292987 0.0196837
+    0.0124119 0.00884715 0.00527181 0.00585821 0.0296361 0.169856
+    0.361207 0.538856 0.67469 0.685933 0.392802 0.17772 0.0813085
+    0.0424601 0.0246654 0.0175258 0.0144256 0.0129859 0.012205
+    0.0112846 0.010933 0.0134813 0.0147254 0.0147981 0.0142156
+    0.0132732 0.0121355 0.0109587 0.00981238 0.00872731 0.00767007
+    0.00669346 0.00581341 0.00502167 0.00431819 0.00369842 0.00316168
+    0.00269663 0.00230035 0.00195801 0.00166928 0.00142286 0.00121522
+    0.00104072 0.000893384 0.000767675 0.000661268 0.000567659
+    0.000481766 0.000407101 0.000350044 0.000302721 0.000263424
+    0.000236813 0.00022199 0.000218182 0.000219548 0.0002027
+    0.000185853 0.000169006 0.000152158 0.000135311 0.000118463
+    0.000101616 9.33782e-05 8.57685e-05 7.81588e-05 7.0549e-05
+    6.29393e-05 5.53296e-05 4.77199e-05 4.36954e-05 4.15296e-05
+    3.93637e-05 3.71978e-05 3.50319e-05 3.28661e-05 3.07002e-05
+    2.85343e-05 2.63685e-05 2.42026e-05 2.20367e-05 1.98709e-05
+    1.7705e-05 1.55391e-05 1.34772e-05 1.22416e-05 1.10061e-05
+    9.77055e-06 8.535e-06 0.000631271 -0.00362586 -0.0146235
+    -0.0308486 -0.0237466 -0.0117522 -0.00304171 0.00251033
+    0.00531986 0.0063897 0.00657351 0.00636494 0.00599705 0.00553442
+    0.00505994 0.00330925 0.00246671 0.0027006 0.00473161 0.00830333
+    0.00649147 0.00356815 0.00217448 0.00187579 0.00270447 0.00219543
+    -0.00546118 -0.0179576 -0.0445306 -0.0649309 0.0197935 0.473629
+    0.87268 0.269542 0.0086094 0.0844602 0.606456 1.04929 0.906014
+    0.916205 0.919425 0.872867 0.556244 0.262457 0.11838 0.0571226
+    0.0333451 0.0237133 0.0185096 0.0159617 0.0148663 0.0138683
+    0.0144081 0.0153797 0.0152551 0.0146487 0.0137192 0.0125973
+    0.0113996 0.0101903 0.00901851 0.00790495 0.00687502 0.00593994
+    0.00510092 0.00436111 0.00372439 0.0031945 0.00277537 0.00241888
+    0.002095 0.00179943 0.00150419 0.00119264 0.00090934 0.000802394
+    0.000852816 0.000838368 0.000730842 0.000601028 0.000546616
+    0.000492205 0.000437793 0.000383381 0.000328969 0.00029454
+    0.000266428 0.000238317 0.000210205 0.000182093 0.000162091
+    0.000152145 0.000142198 0.000132252 0.000122306 0.000112359
+    0.000102413 9.24665e-05 8.25201e-05 7.25738e-05 6.26274e-05
+    5.78553e-05 5.42216e-05 5.05878e-05 4.69541e-05 4.33204e-05
+    3.96867e-05 3.60529e-05 3.24192e-05 2.87855e-05 2.51518e-05
+    2.19153e-05 2.03406e-05 1.8766e-05 1.71913e-05 1.56167e-05
+    1.4042e-05 1.24674e-05 1.08927e-05 9.31806e-06
     EOD
 
     @v[36].set(<<-'EOD')
-    5 5.01426 5.02852 5.01923 4.77685 4.56471 4.52338 4.56813 
-    4.63122 4.693 4.74776 4.79385 4.83258 4.86358 4.88918 4.91021 
-    4.90553 4.89733 4.89554 4.91953 5.00757 5.07101 5.06318 
-    5.05241 5.05535 5.08042 5.07251 4.90973 4.56136 3.98637 
-    3.237 2.67216 2.33678 2.13529 2.00544 1.91429 1.84638 1.79461 
-    1.75338 1.71958 1.69175 1.6686 1.64918 1.63258 1.61836 1.60607 
-    1.59506 1.58483 1.57575 1.56847 1.56193 1.55538 1.54968 
-    1.54416 1.5388 1.53523 1.53165 1.52807 1.52449 1.52091 1.51771 
-    1.51477 1.51182 1.50888 1.50593 1.50309 1.50113 1.49917 
-    1.4972 1.49524 1.49328 1.49132 1.48935 1.48739 1.48543 1.48346 
-    1.48157 1.48012 1.47868 1.47724 1.47579 1.47435 1.47291 
-    1.47146 1.47002 1.46857 1.46713 1.46574 1.46462 1.4635 1.46238 
-    1.46126 1.46014 1.45902 1.4579 1.45678 1.45567 1.45455 1.45349 
-    1.45275 1.45201 1.45127 1.45053 1.44979 1.44905 1.44831 
-    1.44757 1.44683 1.44609 1.44535 1.44461 1.44387 1.44313 
-    1.44239 1.44165 1.44091 1.44017 1.43943 1.43869 1.43795 
-    1.43721 1.43874 1.43976 1.43619 1.43182 1.43726 1.43084 
-    1.42587 1.42383 1.42642 1.42728 1.42736 1.4271 1.42669 1.42621 
-    1.42569 1.41703 1.41244 1.41019 1.41199 1.41833 1.42502 
-    1.41504 1.37535 1.28381 1.44779 2.33713 3.25835 3.67554 
-    3.84975 4.01125 4.2253 4.45433 4.62215 4.74478 4.82998 4.8868 
-    4.92396 4.94768 4.96498 4.98537 5.0128 5.04467 5.06722 5.06535 
-    5.01475 4.91956 4.80647 4.7242 4.7059 4.73552 4.76379 4.81684 
-    4.87376 4.92276 4.96112 4.9884 5.0045 5.00999 5.00933 5.00619 
-    5.00384 5.00342 5.00373 5.00362 5.00309 5.00272 5.00239 
-    5.00204 5.00172 5.00146 5.00124 5.00105 5.00089 5.00076 
-    5.00065 5.00057 5.00048 5.00041 5.00034 5.00028 5.00023 
-    5.00019 5.00015 5.00015 5.00016 5.0002 5.00023 5.00021 5.00019 
-    5.00017 5.00015 5.00012 5.0001 5.00008 5.00007 5.00006 5.00005 
-    5.00004 5.00003 5.00002 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001 
-    5.00001 5.00001 5.00062 4.99506 4.9835 4.96726 4.9728 4.97877 
-    4.98675 4.9966 5.00406 5.00679 5.00629 5.00561 5.00487 5.00429 
-    5.00384 5.002 5.00164 5.00229 5.00484 5.00769 5.00019 5.00242 
-    5.01319 5.0335 5.07265 5.10129 5.11485 5.12551 5.13953 5.16048 
-    5.18862 5.22811 5.25656 5.25627 5.19975 4.9139 4.24745 3.43732 
-    2.8202 2.43224 2.17409 2.01333 1.93951 1.94622 1.98861 2.02217 
-    2.05383 2.08376 2.11184 2.13793 2.16191 2.18267 2.20502 
-    2.22837 2.24958 2.26901 2.28648 2.302 2.31582 2.32802 2.33869 
-    2.34795 2.35596 2.36282 2.3687 2.37371 2.37797 2.38161 2.38476 
-    2.38743 2.3897 2.39168 2.39329 2.39463 2.39575 2.39671 2.39756 
-    2.39835 2.39907 2.39968 2.39999 2.4003 2.40061 2.40091 2.40122 
-    2.40142 2.40159 2.40176 2.40193 2.4021 2.40222 2.40228 2.40234 
-    2.4024 2.40247 2.40253 2.40259 2.40265 2.40271 2.40277 2.40284 
-    2.40287 2.40289 2.40291 2.40294 2.40296 2.40298 2.40301 
-    2.40303 2.40305 2.40308 2.4031 2.40311 2.40312 2.40313 2.40314 
-    2.40315 2.40316 2.40317 2.40318 
+    5 5.01426 5.02852 5.01923 4.77685 4.56471 4.52338 4.56813
+    4.63122 4.693 4.74776 4.79385 4.83258 4.86358 4.88918 4.91021
+    4.90553 4.89733 4.89554 4.91953 5.00757 5.07101 5.06318
+    5.05241 5.05535 5.08042 5.07251 4.90973 4.56136 3.98637
+    3.237 2.67216 2.33678 2.13529 2.00544 1.91429 1.84638 1.79461
+    1.75338 1.71958 1.69175 1.6686 1.64918 1.63258 1.61836 1.60607
+    1.59506 1.58483 1.57575 1.56847 1.56193 1.55538 1.54968
+    1.54416 1.5388 1.53523 1.53165 1.52807 1.52449 1.52091 1.51771
+    1.51477 1.51182 1.50888 1.50593 1.50309 1.50113 1.49917
+    1.4972 1.49524 1.49328 1.49132 1.48935 1.48739 1.48543 1.48346
+    1.48157 1.48012 1.47868 1.47724 1.47579 1.47435 1.47291
+    1.47146 1.47002 1.46857 1.46713 1.46574 1.46462 1.4635 1.46238
+    1.46126 1.46014 1.45902 1.4579 1.45678 1.45567 1.45455 1.45349
+    1.45275 1.45201 1.45127 1.45053 1.44979 1.44905 1.44831
+    1.44757 1.44683 1.44609 1.44535 1.44461 1.44387 1.44313
+    1.44239 1.44165 1.44091 1.44017 1.43943 1.43869 1.43795
+    1.43721 1.43874 1.43976 1.43619 1.43182 1.43726 1.43084
+    1.42587 1.42383 1.42642 1.42728 1.42736 1.4271 1.42669 1.42621
+    1.42569 1.41703 1.41244 1.41019 1.41199 1.41833 1.42502
+    1.41504 1.37535 1.28381 1.44779 2.33713 3.25835 3.67554
+    3.84975 4.01125 4.2253 4.45433 4.62215 4.74478 4.82998 4.8868
+    4.92396 4.94768 4.96498 4.98537 5.0128 5.04467 5.06722 5.06535
+    5.01475 4.91956 4.80647 4.7242 4.7059 4.73552 4.76379 4.81684
+    4.87376 4.92276 4.96112 4.9884 5.0045 5.00999 5.00933 5.00619
+    5.00384 5.00342 5.00373 5.00362 5.00309 5.00272 5.00239
+    5.00204 5.00172 5.00146 5.00124 5.00105 5.00089 5.00076
+    5.00065 5.00057 5.00048 5.00041 5.00034 5.00028 5.00023
+    5.00019 5.00015 5.00015 5.00016 5.0002 5.00023 5.00021 5.00019
+    5.00017 5.00015 5.00012 5.0001 5.00008 5.00007 5.00006 5.00005
+    5.00004 5.00003 5.00002 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
+    5.00001 5.00001 5.00062 4.99506 4.9835 4.96726 4.9728 4.97877
+    4.98675 4.9966 5.00406 5.00679 5.00629 5.00561 5.00487 5.00429
+    5.00384 5.002 5.00164 5.00229 5.00484 5.00769 5.00019 5.00242
+    5.01319 5.0335 5.07265 5.10129 5.11485 5.12551 5.13953 5.16048
+    5.18862 5.22811 5.25656 5.25627 5.19975 4.9139 4.24745 3.43732
+    2.8202 2.43224 2.17409 2.01333 1.93951 1.94622 1.98861 2.02217
+    2.05383 2.08376 2.11184 2.13793 2.16191 2.18267 2.20502
+    2.22837 2.24958 2.26901 2.28648 2.302 2.31582 2.32802 2.33869
+    2.34795 2.35596 2.36282 2.3687 2.37371 2.37797 2.38161 2.38476
+    2.38743 2.3897 2.39168 2.39329 2.39463 2.39575 2.39671 2.39756
+    2.39835 2.39907 2.39968 2.39999 2.4003 2.40061 2.40091 2.40122
+    2.40142 2.40159 2.40176 2.40193 2.4021 2.40222 2.40228 2.40234
+    2.4024 2.40247 2.40253 2.40259 2.40265 2.40271 2.40277 2.40284
+    2.40287 2.40289 2.40291 2.40294 2.40296 2.40298 2.40301
+    2.40303 2.40305 2.40308 2.4031 2.40311 2.40312 2.40313 2.40314
+    2.40315 2.40316 2.40317 2.40318
     EOD
 
     @v[37].set(<<-'EOD')
-    5 5.01732 5.03181 5.05944 5.12686 5.20725 5.28103 5.31254 
-    5.32901 5.33709 5.3408 5.34257 5.34311 5.34347 5.34386 5.34411 
-    5.3406 5.33484 5.32942 5.32904 5.33644 5.34869 5.35001 5.34882 
-    5.34758 5.34672 5.34599 5.34496 5.34364 5.34165 5.33712 
-    5.33502 5.3366 5.34067 5.34306 5.34398 5.34434 5.34442 5.34443 
-    5.34443 5.34441 5.34439 5.34437 5.34437 5.34438 5.34438 
-    5.34438 5.34438 5.34438 5.34437 5.34437 5.34436 5.34436 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.35377 5.35451 
-    5.34265 5.34488 5.35861 5.28622 4.90033 4.75027 4.89731 
-    4.97098 4.99293 4.99832 4.99909 4.99956 4.99858 4.99829 
-    4.9998 5.00035 5.0038 5.00989 5.00251 4.99438 4.9953 4.99761 
-    4.99985 5.00152 5.0011 5.00046 4.99996 4.99925 4.99862 4.99919 
-    4.99961 5.00048 5.00234 4.99654 4.98235 4.95936 4.83738 
-    4.53021 4.21004 4.00593 3.91207 3.88059 3.87822 3.89117 
-    3.91278 3.94044 3.97376 4.01152 4.05052 4.10679 4.17908 
-    4.25673 4.33414 4.40875 4.47879 4.54342 4.60258 4.65595 
-    4.70291 4.74414 4.78018 4.81185 4.83915 4.86291 4.88301 
-    4.90048 4.91528 4.92802 4.9387 4.94777 4.95539 4.9618 4.96725 
-    4.97195 4.97588 4.97932 4.98247 4.98512 4.98697 4.98831 
-    4.98919 4.99015 4.99101 4.99169 4.99222 4.99282 4.99341 
-    4.994 4.9946 4.99519 4.99578 4.99638 4.99667 4.99693 4.9972 
-    4.99747 4.99773 4.998 4.99827 4.99841 4.99849 4.99856 4.99864 
-    4.99872 4.9988 4.99888 4.99896 4.99904 4.99911 4.99919 4.99927 
-    4.99935 4.99943 4.9995 4.99955 4.9996 4.99965 4.9997 5.00736 
-    4.98252 4.87516 4.66727 4.49142 4.43103 4.4301 4.4571 4.49729 
-    4.5407 4.5835 4.62363 4.66114 4.69577 4.72738 4.74632 4.75971 
-    4.77576 4.80671 4.87073 4.91665 4.93252 4.94418 4.95331 
-    4.96094 4.96727 4.97148 4.97471 4.97612 4.98276 5.00247 
-    5.04086 5.08628 5.10673 5.08887 5.0564 5.02767 5.01336 4.99685 
-    4.97422 4.90866 4.67035 4.33117 4.07888 3.94432 3.89105 
-    3.88174 3.89292 3.91442 3.94564 3.98708 4.0355 4.09134 4.16315 
-    4.24088 4.31918 4.39527 4.46693 4.53337 4.59405 4.6486 4.69693 
-    4.73938 4.77617 4.80809 4.83551 4.85895 4.87894 4.89596 
-    4.91081 4.92417 4.93651 4.94552 4.95198 4.9565 4.96096 4.96523 
-    4.96972 4.97428 4.97868 4.98064 4.9826 4.98455 4.98651 4.98847 
-    4.98967 4.99064 4.9916 4.99257 4.99353 4.99422 4.99457 4.99493 
-    4.99528 4.99563 4.99598 4.99633 4.99668 4.99703 4.99738 
-    4.99773 4.9979 4.99804 4.99817 4.9983 4.99843 4.99856 4.99869 
-    4.99883 4.99896 4.99909 4.99921 4.99926 4.99931 4.99937 
-    4.99942 4.99948 4.99953 4.99959 4.99964 
+    5 5.01732 5.03181 5.05944 5.12686 5.20725 5.28103 5.31254
+    5.32901 5.33709 5.3408 5.34257 5.34311 5.34347 5.34386 5.34411
+    5.3406 5.33484 5.32942 5.32904 5.33644 5.34869 5.35001 5.34882
+    5.34758 5.34672 5.34599 5.34496 5.34364 5.34165 5.33712
+    5.33502 5.3366 5.34067 5.34306 5.34398 5.34434 5.34442 5.34443
+    5.34443 5.34441 5.34439 5.34437 5.34437 5.34438 5.34438
+    5.34438 5.34438 5.34438 5.34437 5.34437 5.34436 5.34436
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.35377 5.35451
+    5.34265 5.34488 5.35861 5.28622 4.90033 4.75027 4.89731
+    4.97098 4.99293 4.99832 4.99909 4.99956 4.99858 4.99829
+    4.9998 5.00035 5.0038 5.00989 5.00251 4.99438 4.9953 4.99761
+    4.99985 5.00152 5.0011 5.00046 4.99996 4.99925 4.99862 4.99919
+    4.99961 5.00048 5.00234 4.99654 4.98235 4.95936 4.83738
+    4.53021 4.21004 4.00593 3.91207 3.88059 3.87822 3.89117
+    3.91278 3.94044 3.97376 4.01152 4.05052 4.10679 4.17908
+    4.25673 4.33414 4.40875 4.47879 4.54342 4.60258 4.65595
+    4.70291 4.74414 4.78018 4.81185 4.83915 4.86291 4.88301
+    4.90048 4.91528 4.92802 4.9387 4.94777 4.95539 4.9618 4.96725
+    4.97195 4.97588 4.97932 4.98247 4.98512 4.98697 4.98831
+    4.98919 4.99015 4.99101 4.99169 4.99222 4.99282 4.99341
+    4.994 4.9946 4.99519 4.99578 4.99638 4.99667 4.99693 4.9972
+    4.99747 4.99773 4.998 4.99827 4.99841 4.99849 4.99856 4.99864
+    4.99872 4.9988 4.99888 4.99896 4.99904 4.99911 4.99919 4.99927
+    4.99935 4.99943 4.9995 4.99955 4.9996 4.99965 4.9997 5.00736
+    4.98252 4.87516 4.66727 4.49142 4.43103 4.4301 4.4571 4.49729
+    4.5407 4.5835 4.62363 4.66114 4.69577 4.72738 4.74632 4.75971
+    4.77576 4.80671 4.87073 4.91665 4.93252 4.94418 4.95331
+    4.96094 4.96727 4.97148 4.97471 4.97612 4.98276 5.00247
+    5.04086 5.08628 5.10673 5.08887 5.0564 5.02767 5.01336 4.99685
+    4.97422 4.90866 4.67035 4.33117 4.07888 3.94432 3.89105
+    3.88174 3.89292 3.91442 3.94564 3.98708 4.0355 4.09134 4.16315
+    4.24088 4.31918 4.39527 4.46693 4.53337 4.59405 4.6486 4.69693
+    4.73938 4.77617 4.80809 4.83551 4.85895 4.87894 4.89596
+    4.91081 4.92417 4.93651 4.94552 4.95198 4.9565 4.96096 4.96523
+    4.96972 4.97428 4.97868 4.98064 4.9826 4.98455 4.98651 4.98847
+    4.98967 4.99064 4.9916 4.99257 4.99353 4.99422 4.99457 4.99493
+    4.99528 4.99563 4.99598 4.99633 4.99668 4.99703 4.99738
+    4.99773 4.9979 4.99804 4.99817 4.9983 4.99843 4.99856 4.99869
+    4.99883 4.99896 4.99909 4.99921 4.99926 4.99931 4.99937
+    4.99942 4.99948 4.99953 4.99959 4.99964
     EOD
 
     @v[38].set(<<-'EOD')
-    4.49849 4.53282 4.58329 4.66625 4.83345 4.97823 5.0207 5.01816 
-    5.01116 5.00595 5.00296 5.00148 5.00073 5.00062 5.00033 
-    5.0003 4.99864 4.99661 4.99652 4.99928 5.00361 5.12573 5.17251 
-    5.22612 5.33479 5.44503 5.44432 5.44379 5.44334 5.443 5.44276 
-    5.44258 5.44246 5.44238 5.44232 5.44228 5.44225 5.44223 
-    5.44221 5.4422 5.44219 5.44219 5.44218 5.44218 5.44218 5.44218 
-    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 
-    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 
-    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44216 
-    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 
-    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 
-    5.44216 5.44216 5.44216 5.44216 5.44215 5.44215 5.44215 
-    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 
-    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 
-    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 
-    5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 
-    5.44214 5.44214 5.44214 5.44214 5.44212 5.45159 5.45236 
-    5.44064 5.44307 5.45616 5.38122 4.77163 3.53297 2.74466 
-    2.34448 2.11802 1.9783 1.88656 1.82001 1.77389 1.72955 1.69632 
-    1.66971 1.6526 1.65236 1.56034 1.53764 1.97139 2.75096 3.39212 
-    3.74042 3.82345 3.85696 3.88547 3.91862 3.9585 4.00467 4.05903 
-    4.1254 4.19533 4.26791 4.34517 4.42112 4.49238 4.55807 4.6179 
-    4.6713 4.71815 4.75889 4.79418 4.82456 4.85062 4.87291 4.89196 
-    4.90823 4.92209 4.93388 4.9439 4.95242 4.95968 4.96585 4.97108 
-    4.9755 4.97923 4.98237 4.98503 4.98732 4.98927 4.99094 4.99233 
-    4.99353 4.99452 4.99538 4.99608 4.99668 4.99718 4.9976 4.99794 
-    4.99822 4.99847 4.99867 4.99884 4.99899 4.99913 4.99924 
-    4.99932 4.99938 4.99943 4.99947 4.99951 4.99953 4.99955 
-    4.99958 4.99961 4.99964 4.99967 4.99969 4.99972 4.99975 
-    4.99977 4.99978 4.99979 4.99981 4.99982 4.99983 4.99985 
-    4.99986 4.99986 4.99987 4.99987 4.99988 4.99988 4.99988 
-    4.99989 4.99989 4.9999 4.9999 4.99991 4.99991 4.99992 4.99992 
-    4.99993 4.99993 4.99993 4.99994 5.00381 5.00064 4.99246 
-    4.99823 5.00349 5.00076 5.00033 5.00015 5.00009 5.00007 
-    5.00005 5.00004 5.00003 5.00002 4.99988 4.99732 4.99728 
-    4.9978 5.00187 5.00927 5.08712 5.07654 4.92855 4.4863 3.76162 
-    3.00049 2.49834 2.20883 2.03492 1.92384 1.84676 1.79021 
-    1.74716 1.7132 1.68576 1.66309 1.64406 1.62785 1.61383 1.60162 
-    1.59081 1.58117 1.57253 1.56473 1.55765 1.55117 1.54527 
-    1.53988 1.53485 1.53012 1.5257 1.5216 1.51773 1.51411 1.51071 
-    1.50746 1.50438 1.50146 1.49868 1.49603 1.4935 1.49109 1.48878 
-    1.48657 1.48445 1.48242 1.48046 1.47858 1.47677 1.47502 
-    1.47333 1.4717 1.47012 1.46859 1.46711 1.46568 1.46428 1.46292 
-    1.4616 1.46034 1.45923 1.45812 1.45701 1.4559 1.45479 1.45378 
-    1.45279 1.45181 1.45082 1.44983 1.44893 1.44813 1.44732 
-    1.44652 1.44571 1.44491 1.4441 1.4433 1.44249 1.44169 1.44089 
-    1.44019 1.43951 1.43883 1.43815 1.43747 1.4368 1.43612 1.43544 
-    1.43476 1.43408 1.43342 1.43283 1.43223 1.43163 1.43104 
-    1.43044 1.42984 1.42924 1.42865 
+    4.49849 4.53282 4.58329 4.66625 4.83345 4.97823 5.0207 5.01816
+    5.01116 5.00595 5.00296 5.00148 5.00073 5.00062 5.00033
+    5.0003 4.99864 4.99661 4.99652 4.99928 5.00361 5.12573 5.17251
+    5.22612 5.33479 5.44503 5.44432 5.44379 5.44334 5.443 5.44276
+    5.44258 5.44246 5.44238 5.44232 5.44228 5.44225 5.44223
+    5.44221 5.4422 5.44219 5.44219 5.44218 5.44218 5.44218 5.44218
+    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
+    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
+    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44216
+    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
+    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
+    5.44216 5.44216 5.44216 5.44216 5.44215 5.44215 5.44215
+    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
+    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
+    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
+    5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214
+    5.44214 5.44214 5.44214 5.44214 5.44212 5.45159 5.45236
+    5.44064 5.44307 5.45616 5.38122 4.77163 3.53297 2.74466
+    2.34448 2.11802 1.9783 1.88656 1.82001 1.77389 1.72955 1.69632
+    1.66971 1.6526 1.65236 1.56034 1.53764 1.97139 2.75096 3.39212
+    3.74042 3.82345 3.85696 3.88547 3.91862 3.9585 4.00467 4.05903
+    4.1254 4.19533 4.26791 4.34517 4.42112 4.49238 4.55807 4.6179
+    4.6713 4.71815 4.75889 4.79418 4.82456 4.85062 4.87291 4.89196
+    4.90823 4.92209 4.93388 4.9439 4.95242 4.95968 4.96585 4.97108
+    4.9755 4.97923 4.98237 4.98503 4.98732 4.98927 4.99094 4.99233
+    4.99353 4.99452 4.99538 4.99608 4.99668 4.99718 4.9976 4.99794
+    4.99822 4.99847 4.99867 4.99884 4.99899 4.99913 4.99924
+    4.99932 4.99938 4.99943 4.99947 4.99951 4.99953 4.99955
+    4.99958 4.99961 4.99964 4.99967 4.99969 4.99972 4.99975
+    4.99977 4.99978 4.99979 4.99981 4.99982 4.99983 4.99985
+    4.99986 4.99986 4.99987 4.99987 4.99988 4.99988 4.99988
+    4.99989 4.99989 4.9999 4.9999 4.99991 4.99991 4.99992 4.99992
+    4.99993 4.99993 4.99993 4.99994 5.00381 5.00064 4.99246
+    4.99823 5.00349 5.00076 5.00033 5.00015 5.00009 5.00007
+    5.00005 5.00004 5.00003 5.00002 4.99988 4.99732 4.99728
+    4.9978 5.00187 5.00927 5.08712 5.07654 4.92855 4.4863 3.76162
+    3.00049 2.49834 2.20883 2.03492 1.92384 1.84676 1.79021
+    1.74716 1.7132 1.68576 1.66309 1.64406 1.62785 1.61383 1.60162
+    1.59081 1.58117 1.57253 1.56473 1.55765 1.55117 1.54527
+    1.53988 1.53485 1.53012 1.5257 1.5216 1.51773 1.51411 1.51071
+    1.50746 1.50438 1.50146 1.49868 1.49603 1.4935 1.49109 1.48878
+    1.48657 1.48445 1.48242 1.48046 1.47858 1.47677 1.47502
+    1.47333 1.4717 1.47012 1.46859 1.46711 1.46568 1.46428 1.46292
+    1.4616 1.46034 1.45923 1.45812 1.45701 1.4559 1.45479 1.45378
+    1.45279 1.45181 1.45082 1.44983 1.44893 1.44813 1.44732
+    1.44652 1.44571 1.44491 1.4441 1.4433 1.44249 1.44169 1.44089
+    1.44019 1.43951 1.43883 1.43815 1.43747 1.4368 1.43612 1.43544
+    1.43476 1.43408 1.43342 1.43283 1.43223 1.43163 1.43104
+    1.43044 1.42984 1.42924 1.42865
     EOD
 
     @v[39].set(<<-'EOD')
-    5 5.01048 5.01221 4.98887 4.76261 4.54943 4.51564 4.56249 
-    4.62621 4.68843 4.74374 4.79044 4.82972 4.86127 4.88724 
-    4.90862 4.90791 4.89858 4.89589 4.91767 5.00405 5.16956 
-    5.12391 4.7557 3.87953 3.01124 2.48482 2.20424 2.03812 1.92679 
-    1.84956 1.79256 1.74907 1.71487 1.68724 1.6644 1.64513 1.6287 
-    1.61446 1.60197 1.59095 1.58117 1.57245 1.5646 1.55752 1.55109 
-    1.54516 1.53958 1.53444 1.53008 1.52606 1.52205 1.51843 
-    1.5149 1.51146 1.50893 1.50639 1.50387 1.50133 1.4988 1.49651 
-    1.49436 1.49222 1.49007 1.48793 1.48585 1.48433 1.4828 1.48128 
-    1.47975 1.47823 1.4767 1.47518 1.47365 1.47213 1.4706 1.46912 
-    1.46795 1.46678 1.46561 1.46444 1.46327 1.4621 1.46093 1.45976 
-    1.45859 1.45741 1.45628 1.45534 1.45441 1.45347 1.45254 
-    1.4516 1.45067 1.44973 1.4488 1.44786 1.44693 1.44604 1.44539 
-    1.44475 1.4441 1.44345 1.44281 1.44216 1.44151 1.44086 1.44022 
-    1.43957 1.43892 1.43828 1.43763 1.43698 1.43633 1.43569 
-    1.43504 1.43439 1.43375 1.4331 1.43245 1.4318 1.43157 1.43089 
-    1.43001 1.43042 1.42899 1.42439 1.42216 1.43447 1.44048 
-    1.43705 1.43314 1.43039 1.42861 1.42739 1.42651 1.42548 
-    1.42488 1.4243 1.42392 1.4235 1.32443 1.31149 1.78169 2.64844 
-    3.43211 3.95252 4.20231 4.3746 4.49948 4.58929 4.65742 4.71183 
-    4.77057 4.83196 4.88354 4.92894 4.96625 4.99235 5.00651 
-    5.00941 5.00813 5.00689 5.00588 5.00504 5.00431 5.00368 
-    5.00314 5.00268 5.00228 5.00194 5.00165 5.0014 5.00118 5.001 
-    5.00085 5.00072 5.00061 5.00052 5.00044 5.00037 5.00031 
-    5.00027 5.00022 5.00019 5.00016 5.00013 5.00011 5.00009 
-    5.00008 5.00007 5.00006 5.00005 5.00004 5.00003 5.00003 
-    5.00003 5.00002 5.00002 5.00002 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
-    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99998 
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999 
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001 
-    5.00002 5.00003 5.00004 5.00022 4.99974 4.99942 4.99997 
-    5.00063 5.00002 5.00003 4.99994 4.99998 4.99999 5 5 5 5 
-    5 4.99981 4.99998 5.00004 5.00036 5.00049 5.12012 5.16315 
-    5.19712 5.21835 4.87874 4.10151 3.31555 2.74207 2.38075 
-    2.15872 2.01614 1.91886 1.84852 1.79401 1.75052 1.71508 
-    1.68672 1.66467 1.64602 1.62985 1.61576 1.60343 1.59256 
-    1.58287 1.57418 1.56632 1.55922 1.55282 1.54687 1.54132 
-    1.53618 1.53143 1.52698 1.52282 1.51895 1.51527 1.5118 1.50851 
-    1.5054 1.50244 1.49963 1.49695 1.4944 1.49196 1.48963 1.4874 
-    1.48527 1.48322 1.48124 1.47934 1.47751 1.47574 1.47403 
-    1.47239 1.4708 1.46926 1.46777 1.46632 1.46491 1.46355 1.46237 
-    1.4612 1.46002 1.45884 1.45766 1.45659 1.45555 1.45451 1.45346 
-    1.45242 1.45147 1.45062 1.44978 1.44894 1.44809 1.44725 
-    1.4464 1.44556 1.44472 1.44387 1.44303 1.4423 1.44159 1.44088 
-    1.44017 1.43947 1.43876 1.43805 1.43734 1.43664 1.43593 
-    1.43524 1.43462 1.434 1.43338 1.43276 1.43213 1.43151 1.43089 
-    1.43027 
+    5 5.01048 5.01221 4.98887 4.76261 4.54943 4.51564 4.56249
+    4.62621 4.68843 4.74374 4.79044 4.82972 4.86127 4.88724
+    4.90862 4.90791 4.89858 4.89589 4.91767 5.00405 5.16956
+    5.12391 4.7557 3.87953 3.01124 2.48482 2.20424 2.03812 1.92679
+    1.84956 1.79256 1.74907 1.71487 1.68724 1.6644 1.64513 1.6287
+    1.61446 1.60197 1.59095 1.58117 1.57245 1.5646 1.55752 1.55109
+    1.54516 1.53958 1.53444 1.53008 1.52606 1.52205 1.51843
+    1.5149 1.51146 1.50893 1.50639 1.50387 1.50133 1.4988 1.49651
+    1.49436 1.49222 1.49007 1.48793 1.48585 1.48433 1.4828 1.48128
+    1.47975 1.47823 1.4767 1.47518 1.47365 1.47213 1.4706 1.46912
+    1.46795 1.46678 1.46561 1.46444 1.46327 1.4621 1.46093 1.45976
+    1.45859 1.45741 1.45628 1.45534 1.45441 1.45347 1.45254
+    1.4516 1.45067 1.44973 1.4488 1.44786 1.44693 1.44604 1.44539
+    1.44475 1.4441 1.44345 1.44281 1.44216 1.44151 1.44086 1.44022
+    1.43957 1.43892 1.43828 1.43763 1.43698 1.43633 1.43569
+    1.43504 1.43439 1.43375 1.4331 1.43245 1.4318 1.43157 1.43089
+    1.43001 1.43042 1.42899 1.42439 1.42216 1.43447 1.44048
+    1.43705 1.43314 1.43039 1.42861 1.42739 1.42651 1.42548
+    1.42488 1.4243 1.42392 1.4235 1.32443 1.31149 1.78169 2.64844
+    3.43211 3.95252 4.20231 4.3746 4.49948 4.58929 4.65742 4.71183
+    4.77057 4.83196 4.88354 4.92894 4.96625 4.99235 5.00651
+    5.00941 5.00813 5.00689 5.00588 5.00504 5.00431 5.00368
+    5.00314 5.00268 5.00228 5.00194 5.00165 5.0014 5.00118 5.001
+    5.00085 5.00072 5.00061 5.00052 5.00044 5.00037 5.00031
+    5.00027 5.00022 5.00019 5.00016 5.00013 5.00011 5.00009
+    5.00008 5.00007 5.00006 5.00005 5.00004 5.00003 5.00003
+    5.00003 5.00002 5.00002 5.00002 5.00001 5.00001 5.00001
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99998
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
+    5.00002 5.00003 5.00004 5.00022 4.99974 4.99942 4.99997
+    5.00063 5.00002 5.00003 4.99994 4.99998 4.99999 5 5 5 5
+    5 4.99981 4.99998 5.00004 5.00036 5.00049 5.12012 5.16315
+    5.19712 5.21835 4.87874 4.10151 3.31555 2.74207 2.38075
+    2.15872 2.01614 1.91886 1.84852 1.79401 1.75052 1.71508
+    1.68672 1.66467 1.64602 1.62985 1.61576 1.60343 1.59256
+    1.58287 1.57418 1.56632 1.55922 1.55282 1.54687 1.54132
+    1.53618 1.53143 1.52698 1.52282 1.51895 1.51527 1.5118 1.50851
+    1.5054 1.50244 1.49963 1.49695 1.4944 1.49196 1.48963 1.4874
+    1.48527 1.48322 1.48124 1.47934 1.47751 1.47574 1.47403
+    1.47239 1.4708 1.46926 1.46777 1.46632 1.46491 1.46355 1.46237
+    1.4612 1.46002 1.45884 1.45766 1.45659 1.45555 1.45451 1.45346
+    1.45242 1.45147 1.45062 1.44978 1.44894 1.44809 1.44725
+    1.4464 1.44556 1.44472 1.44387 1.44303 1.4423 1.44159 1.44088
+    1.44017 1.43947 1.43876 1.43805 1.43734 1.43664 1.43593
+    1.43524 1.43462 1.434 1.43338 1.43276 1.43213 1.43151 1.43089
+    1.43027
     EOD
   end
 
diff --git a/ext/tk/sample/tkextlib/blt/graph7.rb b/ext/tk/sample/tkextlib/blt/graph7.rb
index 27fbe53d97..8b31b28c91 100644
--- a/ext/tk/sample/tkextlib/blt/graph7.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7.rb
@@ -16,10 +16,10 @@ v_x.expr("random(#{v_x})")
 v_y.expr("random(#{v_y})")
 v_x.sort(v_y)
 
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
-                                           :color=>'green4', :fill=>'green2', 
-                                           :linewidth=>0, :outlinewidth=>1, 
-                                           :pixels=>4, :label=>'plot', 
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+                                           :color=>'green4', :fill=>'green2',
+                                           :linewidth=>0, :outlinewidth=>1,
+                                           :pixels=>4, :label=>'plot',
                                            :xdata=>v_x, :ydata=>v_y)
 
 Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/graph7a.rb b/ext/tk/sample/tkextlib/blt/graph7a.rb
index a014f72fc7..8def766060 100644
--- a/ext/tk/sample/tkextlib/blt/graph7a.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7a.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/blt'
 
-file = File.join(File.dirname(File.expand_path(__FILE__)), 
+file = File.join(File.dirname(File.expand_path(__FILE__)),
                  'images', 'buckskin.gif')
 bgTexture = TkPhotoImage.new(:file=>file)
 
@@ -39,10 +39,10 @@ v_x.expr("random(#{v_x})")
 v_y.expr("random(#{v_y})")
 v_x.sort(v_y)
 
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
-                                           :color=>'green4', :fill=>'green2', 
-                                           :linewidth=>0, :outlinewidth=>1, 
-                                           :pixels=>4, :label=>'plot', 
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+                                           :color=>'green4', :fill=>'green2',
+                                           :linewidth=>0, :outlinewidth=>1,
+                                           :pixels=>4, :label=>'plot',
                                            :xdata=>v_x, :ydata=>v_y)
 
 Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/graph7b.rb b/ext/tk/sample/tkextlib/blt/graph7b.rb
index c589f18d86..8b00f154b2 100644
--- a/ext/tk/sample/tkextlib/blt/graph7b.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7b.rb
@@ -17,10 +17,10 @@ y = Array.new(length)
   y[i] = rand
 }
 
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
-                                           :color=>'green4', :fill=>'green2', 
-                                           :linewidth=>0, :outlinewidth=>1, 
-                                           :pixels=>4, :label=>'plot', 
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+                                           :color=>'green4', :fill=>'green2',
+                                           :linewidth=>0, :outlinewidth=>1,
+                                           :pixels=>4, :label=>'plot',
                                            :xdata=>x, :ydata=>y)
 
 Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/graph7c.rb b/ext/tk/sample/tkextlib/blt/graph7c.rb
index 495b66f4af..d4ed1a66ad 100644
--- a/ext/tk/sample/tkextlib/blt/graph7c.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7c.rb
@@ -21,10 +21,10 @@ y = Array.new(length)
 v_x.set(x)
 v_y.set(y)
 
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
-                                           :color=>'green4', :fill=>'green2', 
-                                           :linewidth=>0, :outlinewidth=>1, 
-                                           :pixels=>4, :label=>'plot', 
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+                                           :color=>'green4', :fill=>'green2',
+                                           :linewidth=>0, :outlinewidth=>1,
+                                           :pixels=>4, :label=>'plot',
                                            :xdata=>v_x, :ydata=>v_y)
 
 Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/pareto.rb b/ext/tk/sample/tkextlib/blt/pareto.rb
index 94d5f3f97f..bf9a1ec749 100644
--- a/ext/tk/sample/tkextlib/blt/pareto.rb
+++ b/ext/tk/sample/tkextlib/blt/pareto.rb
@@ -8,21 +8,21 @@ require 'tkextlib/blt'
 # The pareto chart mixes line and bar elements in the same graph.
 # Each processing operating is represented by a bar element.  The
 # total accumulated defects is displayed with a single line element.
-b = Tk::BLT::Barchart.new(:title=>'Defects Found During Inspection', 
-                          :font=>'Helvetica 12', :plotpady=>[12, 4], 
+b = Tk::BLT::Barchart.new(:title=>'Defects Found During Inspection',
+                          :font=>'Helvetica 12', :plotpady=>[12, 4],
                           :width=>'6i', :height=>'5i')
 Tk::BLT::Table.add(Tk.root, b, :fill=>:both)
 
 data = [
-  ["Spot Weld",  82,   'yellow'], 
-  ["Lathe",      49,   'orange'], 
-  ["Gear Cut",   38,   'green'], 
-  ["Drill",      24,   'blue'], 
-  ["Grind",      17,   'red'], 
-  ["Lapping",    12,   'brown'], 
-  ["Press",       8,   'purple'], 
-  ["De-burr",     4,   'pink'], 
-  ["Packaging",   3,   'cyan'], 
+  ["Spot Weld",  82,   'yellow'],
+  ["Lathe",      49,   'orange'],
+  ["Gear Cut",   38,   'green'],
+  ["Drill",      24,   'blue'],
+  ["Grind",      17,   'red'],
+  ["Lapping",    12,   'brown'],
+  ["Press",       8,   'purple'],
+  ["De-burr",     4,   'pink'],
+  ["Packaging",   3,   'cyan'],
   ["Other",      12,   'magenta']
 ]
 
@@ -41,8 +41,8 @@ labels = []
 
 data.each{|label, value, color|
   count += 1
-  b.element_create(label, :xdata=>count, :ydata=>value, :foreground=>color, 
-                   :relief=>:solid, :borderwidth=>1, :stipple=>pattern1, 
+  b.element_create(label, :xdata=>count, :ydata=>value, :foreground=>color,
+                   :relief=>:solid, :borderwidth=>1, :stipple=>pattern1,
                    :background=>'lightblue')
   labels[count] = label
   # Get the total number of defects.
@@ -51,7 +51,7 @@ data.each{|label, value, color|
   xdata << count
 }
 
-# Configure the coordinates of the accumulated defects, 
+# Configure the coordinates of the accumulated defects,
 # now that we know what they are.
 b.element_configure('accum', :xdata=>xdata, :ydata=>ydata)
 
@@ -63,19 +63,19 @@ xdata.zip(ydata){|x, y|
   else
     text = '%.1f' % percent
   end
-  b.marker_create(:text, :coords=>[x, y], :text=>text, :font=>'Helvetica 10', 
+  b.marker_create(:text, :coords=>[x, y], :text=>text, :font=>'Helvetica 10',
                   :foreground=>'red4', :anchor=>:center, :yoffset=>-5)
 }
 
 # Display an auxillary y-axis for percentages.
-b.axis_configure('y2', :hide=>false, :min=>0.0, :max=>100.0, 
+b.axis_configure('y2', :hide=>false, :min=>0.0, :max=>100.0,
                  :title=>'Percentage')
 
 # Title the y-axis
 b.axis_configure('y', :title=>'Defects')
 
 # Configure the x-axis to display the process names, instead of numbers.
-b.axis_configure('x', :title=>'Process', :rotate=>90, :subdivisions=>0, 
+b.axis_configure('x', :title=>'Process', :rotate=>90, :subdivisions=>0,
                  :command=>proc{|w, val|
                    val = val.round
                    labels[val]? labels[val]: val
diff --git a/ext/tk/sample/tkextlib/blt/plot1b.rb b/ext/tk/sample/tkextlib/blt/plot1b.rb
index eb41e361f9..8a3ce8216d 100644
--- a/ext/tk/sample/tkextlib/blt/plot1b.rb
+++ b/ext/tk/sample/tkextlib/blt/plot1b.rb
@@ -4,7 +4,7 @@ require 'tkextlib/blt'
 
 graph = Tk::BLT::Graph.new.pack
 plot = graph.element_create
-plot.configure(:linewidth=>0, :label=>'foo', 
+plot.configure(:linewidth=>0, :label=>'foo',
                :data=>[[1.0, 3.4], [1.1, 2.8], [1.2, 3.1], [1.4, 2.9]].flatten)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/winop1.rb b/ext/tk/sample/tkextlib/blt/winop1.rb
index e94138cd94..97c31aa295 100644
--- a/ext/tk/sample/tkextlib/blt/winop1.rb
+++ b/ext/tk/sample/tkextlib/blt/winop1.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/blt'
 
-file = File.join(File.dirname(File.expand_path(__FILE__)), 
+file = File.join(File.dirname(File.expand_path(__FILE__)),
                  'images', 'sample.gif')
 if File.exist?(file)
   src = TkPhotoImage.new(:file=>file)
@@ -30,9 +30,9 @@ Tk.root.background('white')
   l_hdr = TkLabel.new(:text=>"#{iw} x #{ih}")
   l_ftr = TkLabel.new(:text=>"#{r}%")
   l_img = TkLabel.new(:image=>dst)
-  Tk::BLT::Table.add(Tk.root, 
-                     [0,i], l_hdr, 
-                     [1,i], l_img, 
+  Tk::BLT::Table.add(Tk.root,
+                     [0,i], l_hdr,
+                     [1,i], l_img,
                      [2,i], l_ftr)
   Tk.update
 }
diff --git a/ext/tk/sample/tkextlib/blt/winop2.rb b/ext/tk/sample/tkextlib/blt/winop2.rb
index 1f674ee893..d59c43ba22 100644
--- a/ext/tk/sample/tkextlib/blt/winop2.rb
+++ b/ext/tk/sample/tkextlib/blt/winop2.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/blt'
 
-file = File.join(File.dirname(File.expand_path(__FILE__)), 
+file = File.join(File.dirname(File.expand_path(__FILE__)),
                  'images', 'qv100.t.gif')
 if File.exist?(file)
   src = TkPhotoImage.new(:file=>file)
diff --git a/ext/tk/sample/tkextlib/bwidget/basic.rb b/ext/tk/sample/tkextlib/bwidget/basic.rb
index c1521651fd..060baf8a6c 100644
--- a/ext/tk/sample/tkextlib/bwidget/basic.rb
+++ b/ext/tk/sample/tkextlib/bwidget/basic.rb
@@ -29,37 +29,37 @@ module DemoBasic
   end
 
   def self._label(parent)
-    lab = Tk::BWidget::Label.new(parent, :text=>'This is a Label widget', 
+    lab = Tk::BWidget::Label.new(parent, :text=>'This is a Label widget',
                                  :helptext=>'Label widget')
-    chk = TkCheckbutton.new(parent, :text=>'Disabled', 
-                            :variable=>@@var.ref(lab, 'state'), 
-                            :onvalue=>'disabled', :offvalue=>'normal', 
+    chk = TkCheckbutton.new(parent, :text=>'Disabled',
+                            :variable=>@@var.ref(lab, 'state'),
+                            :onvalue=>'disabled', :offvalue=>'normal',
                             :command=>proc{lab[:state] = @@var[lab, 'state']})
     lab.pack(:anchor=>:w, :pady=>4)
     chk.pack(:anchor=>:w)
   end
 
   def self._entry(parent)
-    ent = Tk::BWidget::Entry.new(parent, :text=>'Press enter', 
-                                 :helptext=>'Entry widtet', 
+    ent = Tk::BWidget::Entry.new(parent, :text=>'Press enter',
+                                 :helptext=>'Entry widtet',
                                  :command=>proc{
                                    @@var['entcmd'] = 'command called'
                                    Tk.after(500, proc{@@var['entcmd'] = ''})
                                  })
 
-    chk1 = TkCheckbutton.new(parent, :text=>'Disabled', 
-                             :variable=>@@var.ref(ent, 'state'), 
-                             :onvalue=>'disabled', :offvalue=>'normal', 
+    chk1 = TkCheckbutton.new(parent, :text=>'Disabled',
+                             :variable=>@@var.ref(ent, 'state'),
+                             :onvalue=>'disabled', :offvalue=>'normal',
                              :command=>proc{ent.state = @@var[ent, 'state']})
 
-    chk2 = TkCheckbutton.new(parent, :text=>'Non editable', 
-                             :variable=>@@var.ref(ent, 'editable'), 
-                             :onvalue=>false, :offvalue=>true, 
+    chk2 = TkCheckbutton.new(parent, :text=>'Non editable',
+                             :variable=>@@var.ref(ent, 'editable'),
+                             :onvalue=>false, :offvalue=>true,
                              :command=>proc{
                                ent.editable = @@var[ent, 'editable']
                              })
 
-    lab = TkLabel.new(parent, :textvariable=>@@var.ref('entcmd'), 
+    lab = TkLabel.new(parent, :textvariable=>@@var.ref('entcmd'),
                       :foreground=>'red')
 
     ent.pack(:pady=>4, :anchor=>:w)
@@ -69,22 +69,22 @@ module DemoBasic
 
   def self._button(parent)
     frame = TkFrame.new(parent)
-    but  = Tk::BWidget::Button.new(frame, :text=>'Press me!', 
-                                   :repeatdelay=>300, 
-                                   :command=>proc{_butcmd('command')}, 
+    but  = Tk::BWidget::Button.new(frame, :text=>'Press me!',
+                                   :repeatdelay=>300,
+                                   :command=>proc{_butcmd('command')},
                                    :helptext=>'This is a Button widget')
 
     sep1 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
-    arr1 = Tk::BWidget::ArrowButton.new(frame, :type=>:button, 
-                :width=>25, :height=>25, :repeatdelay=>300, 
-                :command=>proc{_butcmd('command')}, 
+    arr1 = Tk::BWidget::ArrowButton.new(frame, :type=>:button,
+                :width=>25, :height=>25, :repeatdelay=>300,
+                :command=>proc{_butcmd('command')},
                 :helptext=>"This is an ArrowButton widget\nof type button")
 
     sep2 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
-    arr2 = Tk::BWidget::ArrowButton.new(frame, :type=>:arrow, 
-                :width=>25, :height=>25, :relief=>:sunken, 
-                :ipadx=>0, :ipady=>0, :repeatdelay=>300, 
-                :command=>proc{_butcmd('command')}, 
+    arr2 = Tk::BWidget::ArrowButton.new(frame, :type=>:arrow,
+                :width=>25, :height=>25, :relief=>:sunken,
+                :ipadx=>0, :ipady=>0, :repeatdelay=>300,
+                :command=>proc{_butcmd('command')},
                 :helptext=>"This is an ArrowButton widget\nof type arrow")
 
     but.pack(:side=>:left, :padx=>4)
@@ -94,49 +94,49 @@ module DemoBasic
     arr2.pack(:side=>:left, :padx=>4)
     frame.pack
 
-    Tk::BWidget::Separator.new(parent, 
+    Tk::BWidget::Separator.new(parent,
                                :orient=>:horizontal).pack(:fill=>:x, :pady=>10)
 
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Command', 
-                                        :side=>:top, :anchor=>:w, 
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Command',
+                                        :side=>:top, :anchor=>:w,
                                         :relief=>:sunken, :borderwidth=>1)
     subf = labf1.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'Disabled', 
-                             :variable=>@@var.ref('bstate'), 
-                             :onvalue=>'disabled', :offvalue=>'normal', 
-                             :command=>proc{_bstate(@@var['bstate'], 
+    chk1 = TkCheckbutton.new(subf, :text=>'Disabled',
+                             :variable=>@@var.ref('bstate'),
+                             :onvalue=>'disabled', :offvalue=>'normal',
+                             :command=>proc{_bstate(@@var['bstate'],
                                                      but, arr1, arr2)})
-    chk2 = TkCheckbutton.new(subf, :text=>"Use armcommand/\ndisarmcommand", 
-                             :variable=>@@var.ref('barmcmd'), 
-                             :command=>proc{_barmcmd(@@var['barmcmd'], 
+    chk2 = TkCheckbutton.new(subf, :text=>"Use armcommand/\ndisarmcommand",
+                             :variable=>@@var.ref('barmcmd'),
+                             :command=>proc{_barmcmd(@@var['barmcmd'],
                                                      but, arr1, arr2)})
     Tk.pack(chk1, chk2, :anchor=>:w)
 
-    label = TkLabel.new(parent, :textvariable=>@@var.ref('butcmd'), 
+    label = TkLabel.new(parent, :textvariable=>@@var.ref('butcmd'),
                         :foreground=>'red').pack(:side=>:bottom, :pady=>4)
 
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Direction', 
-                                        :side=>:top, :anchor=>:w, 
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Direction',
+                                        :side=>:top, :anchor=>:w,
                                         :relief=>:sunken, :borderwidth=>1)
     subf = labf2.get_frame
     @@var['bside'] = :top
     [:top, :left, :bottom, :right].each{|dir|
-      TkRadiobutton.new(subf, :text=>"#{dir} arrow", 
-                        :variable=>@@var.ref('bside'), :value=>dir, 
+      TkRadiobutton.new(subf, :text=>"#{dir} arrow",
+                        :variable=>@@var.ref('bside'), :value=>dir,
                         :command=>proc{_bside(@@var['bside'], arr1, arr2)}
                         ).pack(:anchor=>:w)
     }
 
-    labf3 = Tk::BWidget::LabelFrame.new(parent, :text=>'Relief', 
-                                        :side=>:top, :anchor=>:w, 
+    labf3 = Tk::BWidget::LabelFrame.new(parent, :text=>'Relief',
+                                        :side=>:top, :anchor=>:w,
                                         :relief=>:sunken, :borderwidth=>1)
     subf = labf3.get_frame
     @@var['brelief'] = :raised
     [ %w(raised sunken ridge groove), %w(flat solid link)].each{|lrelief|
       f = TkFrame.new(subf)
       lrelief.each{|relief|
-        TkRadiobutton.new(f, :text=>relief, 
-                          :variable=>@@var.ref('brelief'), :value=>relief, 
+        TkRadiobutton.new(f, :text=>relief,
+                          :variable=>@@var.ref('brelief'), :value=>relief,
                           :command=>proc{
                             _brelief(@@var['brelief'], but, arr1, arr2)
                           }).pack(:anchor=>:w)
@@ -163,19 +163,19 @@ module DemoBasic
 
   def self._barmcmd(value, but, arr1, arr2)
     if TkComm.bool(value)
-      but.configure(:armcommand=>proc{_butcmd('arm')}, 
-                    :disarmcommand=>proc{_butcmd('disarm')}, 
+      but.configure(:armcommand=>proc{_butcmd('arm')},
+                    :disarmcommand=>proc{_butcmd('disarm')},
                     :command=>'')
       [arr1, arr2].each{|arr|
-        arr.configure(:armcommand=>proc{_butcmd('arm')}, 
-                      :disarmcommand=>proc{_butcmd('disarm')}, 
+        arr.configure(:armcommand=>proc{_butcmd('arm')},
+                      :disarmcommand=>proc{_butcmd('disarm')},
                       :command=>'')
       }
     else
-      but.configure(:armcommand=>'', :disarmcommand=>'', 
+      but.configure(:armcommand=>'', :disarmcommand=>'',
                     :command=>proc{_butcmd('command')})
       [arr1, arr2].each{|arr|
-        arr.configure(:armcommand=>'', :disarmcommand=>'', 
+        arr.configure(:armcommand=>'', :disarmcommand=>'',
                       :command=>proc{_butcmd('command')})
       }
     end
diff --git a/ext/tk/sample/tkextlib/bwidget/demo.rb b/ext/tk/sample/tkextlib/bwidget/demo.rb
index 785d2681a8..3eb98818f3 100644
--- a/ext/tk/sample/tkextlib/bwidget/demo.rb
+++ b/ext/tk/sample/tkextlib/bwidget/demo.rb
@@ -54,21 +54,21 @@ class BWidget_Demo
 
     descmenu = [
       '&File', 'all', 'file', 0, [
-        ['command', 'E&xit', [], 'Exit BWidget demo', [], 
+        ['command', 'E&xit', [], 'Exit BWidget demo', [],
           {:command=>proc{exit}}]
-      ], 
+      ],
       '&Options', 'all', 'options', 0, [
-        ['checkbutton', 'Toolbar &1', ['all', 'option'], 
-          'Show/hide toolbar 1', [], 
-          { :variable=>DemoVar.toolbar1, 
+        ['checkbutton', 'Toolbar &1', ['all', 'option'],
+          'Show/hide toolbar 1', [],
+          { :variable=>DemoVar.toolbar1,
             :command=>proc{
               DemoVar.mainframe.show_toolbar(0, DemoVar.toolbar1.value)
             }
           }
-        ], 
-        ['checkbutton', 'Toolbar &2', ['all', 'option'], 
-          'Show/hide toolbar 2', [], 
-          { :variable=>DemoVar.toolbar2, 
+        ],
+        ['checkbutton', 'Toolbar &2', ['all', 'option'],
+          'Show/hide toolbar 2', [],
+          { :variable=>DemoVar.toolbar2,
             :command=>proc{
               DemoVar.mainframe.show_toolbar(1, DemoVar.toolbar2.value)
             }
@@ -81,8 +81,8 @@ class BWidget_Demo
     DemoVar.prgindic.value = 0
 
     DemoVar.mainframe = Tk::BWidget::MainFrame.new(
-                                :menu=>descmenu, 
-                                :textvariable=>DemoVar.status, 
+                                :menu=>descmenu,
+                                :textvariable=>DemoVar.status,
                                 :progressvar=>DemoVar.prgindic
                         )
 
@@ -91,22 +91,22 @@ class BWidget_Demo
 
     DemoVar.mainframe.add_toolbar{|tb1|
       Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
-        add(:image=>Tk::BWidget::Bitmap.new('new'), 
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
-            :borderwidth=>1, :padx=>1, :pady=>1, 
-            :command=>proc{puts 'select "Create a new file" icon'}, 
+        add(:image=>Tk::BWidget::Bitmap.new('new'),
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+            :borderwidth=>1, :padx=>1, :pady=>1,
+            :command=>proc{puts 'select "Create a new file" icon'},
             :helptext=>"Create a new file")
 
-        add(:image=>Tk::BWidget::Bitmap.new('open'), 
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
-            :borderwidth=>1, :padx=>1, :pady=>1, 
-            :command=>proc{puts 'select "Open an existing file" icon'}, 
+        add(:image=>Tk::BWidget::Bitmap.new('open'),
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+            :borderwidth=>1, :padx=>1, :pady=>1,
+            :command=>proc{puts 'select "Open an existing file" icon'},
             :helptext=>"Open an existing file")
 
-        add(:image=>Tk::BWidget::Bitmap.new('save'), 
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
-            :borderwidth=>1, :padx=>1, :pady=>1, 
-            :command=>proc{puts 'select "Save file" icon'}, 
+        add(:image=>Tk::BWidget::Bitmap.new('save'),
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+            :borderwidth=>1, :padx=>1, :pady=>1,
+            :command=>proc{puts 'select "Save file" icon'},
             :helptext=>"Save file")
 
         pack(:side=>:left, :anchor=>:w)
@@ -119,22 +119,22 @@ class BWidget_Demo
       DemoVar.prgindic.numeric += 1
 
       Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
-        add(:image=>Tk::BWidget::Bitmap.new('cut'), 
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
-            :borderwidth=>1, :padx=>1, :pady=>1, 
-            :command=>proc{puts 'select "Cut selection" icon'}, 
+        add(:image=>Tk::BWidget::Bitmap.new('cut'),
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+            :borderwidth=>1, :padx=>1, :pady=>1,
+            :command=>proc{puts 'select "Cut selection" icon'},
             :helptext=>"Cut selection")
 
-        add(:image=>Tk::BWidget::Bitmap.new('copy'), 
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
-            :borderwidth=>1, :padx=>1, :pady=>1, 
-            :command=>proc{puts 'select "Copy selection" icon'}, 
+        add(:image=>Tk::BWidget::Bitmap.new('copy'),
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+            :borderwidth=>1, :padx=>1, :pady=>1,
+            :command=>proc{puts 'select "Copy selection" icon'},
             :helptext=>"Copy selection")
 
-        add(:image=>Tk::BWidget::Bitmap.new('paste'), 
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
-            :borderwidth=>1, :padx=>1, :pady=>1, 
-            :command=>proc{puts 'select "Paste selection" icon'}, 
+        add(:image=>Tk::BWidget::Bitmap.new('paste'),
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+            :borderwidth=>1, :padx=>1, :pady=>1,
+            :command=>proc{puts 'select "Paste selection" icon'},
             :helptext=>"Paste selection")
 
         pack(:side=>:left, :anchor=>:w)
@@ -145,7 +145,7 @@ class BWidget_Demo
     DemoVar.prgindic.numeric += 1
 
     tb2 = DemoVar.mainframe.add_toolbar
-    DemoVar._wfont = Tk::BWidget::SelectFont::Toolbar.new(tb2, 
+    DemoVar._wfont = Tk::BWidget::SelectFont::Toolbar.new(tb2,
                        :command=>proc{update_font(DemoVar._wfont[:font])}
                      )
     DemoVar.font = DemoVar._wfont[:font]
@@ -213,18 +213,18 @@ class BWidget_Demo
     top.withdraw
     top.overrideredirect(true)
 
-    ximg  = TkLabel.new(top, :bitmap=>"@#{File.join(DEMODIR,'x1.xbm')}", 
+    ximg  = TkLabel.new(top, :bitmap=>"@#{File.join(DEMODIR,'x1.xbm')}",
                         :foreground=>'grey90', :background=>'white')
     bwimg = TkLabel.new(ximg, :bitmap=>"@#{File.join(DEMODIR,'bwidget.xbm')}",
                         :foreground=>'grey90', :background=>'white')
     frame = TkFrame.new(ximg, :background=>'white')
-    TkLabel.new(frame, :text=>'Loading demo', 
+    TkLabel.new(frame, :text=>'Loading demo',
                 :background=>'white', :font=>'times 8').pack
-    TkLabel.new(frame, :textvariable=>DemoVar.prgtext, 
+    TkLabel.new(frame, :textvariable=>DemoVar.prgtext,
                 :background=>'white', :font=>'times 8', :width=>35).pack
-    Tk::BWidget::ProgressBar.new(frame, :width=>50, :height=>10, 
-                                 :background=>'white', 
-                                 :variable=>DemoVar.prgindic, 
+    Tk::BWidget::ProgressBar.new(frame, :width=>50, :height=>10,
+                                 :background=>'white',
+                                 :variable=>DemoVar.prgindic,
                                  :maximum=>10).pack
     frame.place(:x=>0, :y=>0, :anchor=>:nw)
     bwimg.place(:relx=>1, :rely=>1, :anchor=>:se)
diff --git a/ext/tk/sample/tkextlib/bwidget/dnd.rb b/ext/tk/sample/tkextlib/bwidget/dnd.rb
index 1c8b036530..b1b1cf60ff 100644
--- a/ext/tk/sample/tkextlib/bwidget/dnd.rb
+++ b/ext/tk/sample/tkextlib/bwidget/dnd.rb
@@ -12,19 +12,19 @@ module DemoDnD
     titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drag source')
     subf = titf1.get_frame
 
-    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry', 
-                                       :labelwidth=>14, :dragenabled=>true, 
+    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
+                                       :labelwidth=>14, :dragenabled=>true,
                                        :dragevent=>3)
-    labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (text)', 
+    labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (text)',
                                         :width=>14)
     f = labf1.get_frame
-    lab = Tk::BWidget::Label.new(f, :text=>'Drag this text', 
+    lab = Tk::BWidget::Label.new(f, :text=>'Drag this text',
                                  :dragenabled=>true, :dragevent=>3).pack
 
-    labf2 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (bitmap)', 
+    labf2 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (bitmap)',
                                         :width=>14)
     f = labf2.get_frame
-    lab = Tk::BWidget::Label.new(f, :bitmap=>'info', 
+    lab = Tk::BWidget::Label.new(f, :bitmap=>'info',
                                  :dragenabled=>true, :dragevent=>3).pack
 
     Tk.pack(ent1, labf1, labf2, :side=>:top, :fill=>:x, :pady=>4)
@@ -32,11 +32,11 @@ module DemoDnD
     titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drop targets')
     subf = titf2.get_frame
 
-    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry', 
+    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
                                        :labelwidth=>14, :dropenabled=>true)
     labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label', :width=>14)
     f = labf1.get_frame
-    lab = Tk::BWidget::Label.new(f, :dropenabled=>true, 
+    lab = Tk::BWidget::Label.new(f, :dropenabled=>true,
                                  :highlightthickness=>1).pack(:fill=>:x)
     Tk.pack(ent1, labf1, :side=>:top, :fill=>:x, :pady=>4)
     Tk.pack(titf1, titf2, :pady=>4)
diff --git a/ext/tk/sample/tkextlib/bwidget/manager.rb b/ext/tk/sample/tkextlib/bwidget/manager.rb
index 776cb3065b..a59afb8b86 100644
--- a/ext/tk/sample/tkextlib/bwidget/manager.rb
+++ b/ext/tk/sample/tkextlib/bwidget/manager.rb
@@ -32,19 +32,19 @@ module DemoManager
   end
 
   def self._mainframe(parent)
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Toolbar', 
-                                        :side=>:top, :anchor=>:w, 
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Toolbar',
+                                        :side=>:top, :anchor=>:w,
                                         :relief=>:sunken, :borderwidth=>2)
     subf = labf1.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'View toolbar 1', 
-                             :variable=>DemoVar.toolbar1, 
+    chk1 = TkCheckbutton.new(subf, :text=>'View toolbar 1',
+                             :variable=>DemoVar.toolbar1,
                              :command=>proc{
                                DemoVar.mainframe.show_toolbar(
                                   0, DemoVar.toolbar1.value
                                )
                              })
-    chk2 = TkCheckbutton.new(subf, :text=>'View toolbar 2', 
-                             :variable=>DemoVar.toolbar2, 
+    chk2 = TkCheckbutton.new(subf, :text=>'View toolbar 2',
+                             :variable=>DemoVar.toolbar2,
                              :command=>proc{
                                DemoVar.mainframe.show_toolbar(
                                   1, DemoVar.toolbar2.value
@@ -54,12 +54,12 @@ module DemoManager
     Tk.pack(chk1, chk2, :anchor=>:w, :fill=>:x)
     labf1.pack(:fill=>:both)
 
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Status bar', 
-                                        :side=>:top, :anchor=>:w, 
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Status bar',
+                                        :side=>:top, :anchor=>:w,
                                         :relief=>:sunken, :borderwidth=>2)
     subf = labf2.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>"Show Progress\nindicator", 
-                             :justify=>:left, :variable=>@@progress, 
+    chk1 = TkCheckbutton.new(subf, :text=>"Show Progress\nindicator",
+                             :justify=>:left, :variable=>@@progress,
                              :command=>proc{ _show_progress })
     chk1.pack(:anchor=>:w, :fill=>:x)
 
@@ -67,8 +67,8 @@ module DemoManager
   end
 
   def self._notebook(parent)
-    TkCheckbutton.new(parent, :text=>'Homogeneous label', 
-                      :variable=>@@homogeneous, 
+    TkCheckbutton.new(parent, :text=>'Homogeneous label',
+                      :variable=>@@homogeneous,
                       :command=>proc{
                         DemoVar.notebook[:homogeneous] = @@homogeneous.value
                       }).pack(:side=>:left, :anchor=>:n, :fill=>:x)
@@ -92,13 +92,13 @@ module DemoManager
       sw.pack(:fill=>:both, :expand=>true)
     }
 
-    sw = Tk::BWidget::ScrolledWindow.new(pane3, :relief=>:sunken, 
+    sw = Tk::BWidget::ScrolledWindow.new(pane3, :relief=>:sunken,
                                          :borderwidth=>2)
     sf = Tk::BWidget::ScrollableFrame.new(sw)
     sw.set_widget(sf)
     subf = sf.get_frame
     lab = TkLabel.new(subf, :text=>'This is a ScrollableFrame')
-    chk = TkCheckbutton.new(subf, :text=>'Constrained with', 
+    chk = TkCheckbutton.new(subf, :text=>'Constrained with',
                             :variable=>@@constw, :command=>proc{
                               sf['constrainedwidth'] = @@constw.value
                             })
diff --git a/ext/tk/sample/tkextlib/bwidget/select.rb b/ext/tk/sample/tkextlib/bwidget/select.rb
index ea24b47e2e..3a1a810e14 100644
--- a/ext/tk/sample/tkextlib/bwidget/select.rb
+++ b/ext/tk/sample/tkextlib/bwidget/select.rb
@@ -13,28 +13,28 @@ module DemoSelect
 
     titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'SpinBox')
     subf = titf1.get_frame
-    spin = Tk::BWidget::SpinBox.new(subf, :range=>[1, 100, 1], 
-                                    :textvariable=>@@var.ref('spin', 'var'), 
+    spin = Tk::BWidget::SpinBox.new(subf, :range=>[1, 100, 1],
+                                    :textvariable=>@@var.ref('spin', 'var'),
                                     :helptext=>'This is the SpinBox')
-    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var', 
-                                      :labelwidth=>10, :labelanchor=>:w,  
-                                      :textvariable=>@@var.ref('spin', 'var'), 
-                                      :editable=>0, 
+    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
+                                      :labelwidth=>10, :labelanchor=>:w,
+                                      :textvariable=>@@var.ref('spin', 'var'),
+                                      :editable=>0,
                                       :helptext=>"This is an Entry reflecting\nthe linked var of SpinBox")
-    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', 
-                                       :side=>:top, :anchor=>:w, 
-                                       :relief=>:sunken, :borderwidth=>1, 
+    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options',
+                                       :side=>:top, :anchor=>:w,
+                                       :relief=>:sunken, :borderwidth=>1,
                                        :helptext=>'Modify some options of SpinBox')
     subf = labf.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'Non editable', 
-                             :variable=>@@var.ref('spin', 'editable'), 
-                             :onvalue=>false, :offvalue=>true, 
+    chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
+                             :variable=>@@var.ref('spin', 'editable'),
+                             :onvalue=>false, :offvalue=>true,
                              :command=>proc{
                                spin.editable(@@var['spin', 'editable'])
                              })
-    chk2 = TkCheckbutton.new(subf, :text=>'Disabled', 
-                             :variable=>@@var.ref('spin', 'state'), 
-                             :onvalue=>'disabled', :offvalue=>'normal', 
+    chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
+                             :variable=>@@var.ref('spin', 'state'),
+                             :onvalue=>'disabled', :offvalue=>'normal',
                              :command=>proc{
                                spin.state(@@var['spin', 'state'])
                              })
@@ -47,28 +47,28 @@ module DemoSelect
     combo = Tk::BWidget::ComboBox.new(subf,
                                       :textvariable=>@@var.ref('combo', 'var'),
                                       :values=>[
-                                        'first value', 'second value', 
-                                        'third value', 'fourth value', 
+                                        'first value', 'second value',
+                                        'third value', 'fourth value',
                                         'fifth value'
-                                      ], 
+                                      ],
                                       :helptext=>'This is the ComboBox')
-    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var', 
-                                      :labelwidth=>10, :labelanchor=>:w, 
+    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
+                                      :labelwidth=>10, :labelanchor=>:w,
                                       :textvariable=>@@var.ref('combo', 'var'),
                                       :editable=>0, :helptext=>"This is an Entry reflecting\nthe linked var of ComboBox")
-    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', :side=>:top, 
-                                       :anchor=>:w, :relief=>:sunken, 
+    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', :side=>:top,
+                                       :anchor=>:w, :relief=>:sunken,
                                        :borderwidth=>1, :helptext=>'Modify some options of ComboBox')
     subf = labf.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'Non editable', 
-                             :variable=>@@var.ref('combo', 'editable'), 
-                             :onvalue=>false, :offvalue=>true, 
+    chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
+                             :variable=>@@var.ref('combo', 'editable'),
+                             :onvalue=>false, :offvalue=>true,
                              :command=>proc{
                                combo.editable(@@var['combo', 'editable'])
                              })
-    chk2 = TkCheckbutton.new(subf, :text=>'Disabled', 
-                             :variable=>@@var.ref('combo', 'state'), 
-                             :onvalue=>'disabled', :offvalue=>'normal', 
+    chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
+                             :variable=>@@var.ref('combo', 'state'),
+                             :onvalue=>'disabled', :offvalue=>'normal',
                              :command=>proc{
                                combo.state(@@var['combo', 'state'])
                              })
diff --git a/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb b/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
index 3d19c8d092..da2c9678c0 100644
--- a/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
+++ b/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
@@ -23,14 +23,14 @@ module DemoDialog
     titf4 = Tk::BWidget::TitleFrame.new(frame, :text=>'Other dialog')
 
     subf = titf1.get_frame
-    cmd = proc{ TkOption.read_file(File.join(Tk::BWidget::LIBRARY, 'lang', 
+    cmd = proc{ TkOption.read_file(File.join(Tk::BWidget::LIBRARY, 'lang',
                                              @@resources.value + '.rc')) }
-    Tk.pack(TkRadiobutton.new(subf, :text=>'English', :value=>'en', 
-                              :variable=>@@resources, :command=>cmd), 
-            TkRadiobutton.new(subf, :text=>'French', :value=>'fr', 
-                              :variable=>@@resources, :command=>cmd), 
-            TkRadiobutton.new(subf, :text=>'German', :value=>'de', 
-                              :variable=>@@resources, :command=>cmd), 
+    Tk.pack(TkRadiobutton.new(subf, :text=>'English', :value=>'en',
+                              :variable=>@@resources, :command=>cmd),
+            TkRadiobutton.new(subf, :text=>'French', :value=>'fr',
+                              :variable=>@@resources, :command=>cmd),
+            TkRadiobutton.new(subf, :text=>'German', :value=>'de',
+                              :variable=>@@resources, :command=>cmd),
             :side=>:left)
 
     _tmpldlg(titf2.get_frame)
@@ -46,34 +46,34 @@ module DemoDialog
     @@tmpl['side'] = :bottom
     @@tmpl['anchor'] = :c
 
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button side', 
-                                        :side=>:top, :anchor=>:w, 
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button side',
+                                        :side=>:top, :anchor=>:w,
                                         :relief=>:sunken, :borderwidth=>1)
     subf = labf1.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'Bottom', :value=>:bottom, 
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Left', :value=>:left, 
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Right', :value=>:right, 
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Top', :value=>:top, 
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
+    Tk.pack(TkRadiobutton.new(subf, :text=>'Bottom', :value=>:bottom,
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Left', :value=>:left,
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Right', :value=>:right,
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Top', :value=>:top,
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
             :fill=>:x, :anchor=>:w)
 
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button anchor', 
-                                        :side=>:top, :anchor=>:w, 
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button anchor',
+                                        :side=>:top, :anchor=>:w,
                                         :relief=>:sunken, :borderwidth=>1)
     subf = labf2.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'North', :value=>:n, 
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'West', :value=>:w, 
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'East', :value=>:e, 
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'South', :value=>:s, 
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Center', :value=>:c, 
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
+    Tk.pack(TkRadiobutton.new(subf, :text=>'North', :value=>:n,
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'West', :value=>:w,
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'East', :value=>:e,
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'South', :value=>:s,
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Center', :value=>:c,
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
             :fill=>:x, :anchor=>:w)
 
     sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
@@ -88,44 +88,44 @@ module DemoDialog
     @@msg['type'] = 'ok'
     @@msg['icon'] = 'info'
 
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Type', :side=>:top, 
-                                        :anchor=>:w, :relief=>:sunken, 
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Type', :side=>:top,
+                                        :anchor=>:w, :relief=>:sunken,
                                         :borderwidth=>1)
     subf = labf1.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'Ok', :value=>'ok', 
-                              :variable=>@@msg.ref('type'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Ok, Cancel', :value=>'okcancel', 
-                              :variable=>@@msg.ref('type'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Retry, Cancel', 
-                              :value=>'retrycancel', 
-                              :variable=>@@msg.ref('type'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Yes, No', :value=>'yesno', 
-                              :variable=>@@msg.ref('type'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Yes, No, Cancel', 
-                              :value=>'yesnocancel', 
-                              :variable=>@@msg.ref('type'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Abort, Retry, Ignore', 
-                              :value=>'abortretryignore', 
-                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+    Tk.pack(TkRadiobutton.new(subf, :text=>'Ok', :value=>'ok',
+                              :variable=>@@msg.ref('type'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Ok, Cancel', :value=>'okcancel',
+                              :variable=>@@msg.ref('type'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Retry, Cancel',
+                              :value=>'retrycancel',
+                              :variable=>@@msg.ref('type'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Yes, No', :value=>'yesno',
+                              :variable=>@@msg.ref('type'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Yes, No, Cancel',
+                              :value=>'yesnocancel',
+                              :variable=>@@msg.ref('type'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Abort, Retry, Ignore',
+                              :value=>'abortretryignore',
+                              :variable=>@@msg.ref('type'), :anchor=>:w),
             :fill=>:x, :anchor=>:w)
 
-    Tk.pack(TkRadiobutton.new(subf, :text=>'User', :value=>'user', 
-                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+    Tk.pack(TkRadiobutton.new(subf, :text=>'User', :value=>'user',
+                              :variable=>@@msg.ref('type'), :anchor=>:w),
             Tk::BWidget::Entry.new(subf, :textvariable=>@@msg.ref('buttons')),
             :side=>:left)
 
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Icon', :side=>:top, 
-                                        :anchor=>:w, :relief=>:sunken, 
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Icon', :side=>:top,
+                                        :anchor=>:w, :relief=>:sunken,
                                         :borderwidth=>1)
     subf = labf2.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'Information', :value=>'info', 
-                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Question',    :value=>'question', 
-                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Warning',     :value=>'warning', 
-                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
-            TkRadiobutton.new(subf, :text=>'Error',       :value=>'error', 
-                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
+    Tk.pack(TkRadiobutton.new(subf, :text=>'Information', :value=>'info',
+                              :variable=>@@msg.ref('icon'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Question',    :value=>'question',
+                              :variable=>@@msg.ref('icon'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Warning',     :value=>'warning',
+                              :variable=>@@msg.ref('icon'), :anchor=>:w),
+            TkRadiobutton.new(subf, :text=>'Error',       :value=>'error',
+                              :variable=>@@msg.ref('icon'), :anchor=>:w),
             :fill=>:x, :anchor=>:w)
 
     sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
@@ -139,13 +139,13 @@ module DemoDialog
   def self._stddlg(parent)
     Tk.pack(TkButton.new(parent, :text=>'Select a color '){|w|
               command(proc{DemoDialog._show_color(w)})
-            }, 
-            TkButton.new(parent, :text=>'Font selector dialog', 
-                         :command=>proc{_show_fontdlg}), 
-            TkButton.new(parent, :text=>'Progression dialog', 
-                         :command=>proc{_show_progdlg}), 
-            TkButton.new(parent, :text=>'Password dialog', 
-                         :command=>proc{_show_passdlg}), 
+            },
+            TkButton.new(parent, :text=>'Font selector dialog',
+                         :command=>proc{_show_fontdlg}),
+            TkButton.new(parent, :text=>'Progression dialog',
+                         :command=>proc{_show_progdlg}),
+            TkButton.new(parent, :text=>'Password dialog',
+                         :command=>proc{_show_passdlg}),
             :side=>:left, :padx=>5, :anchor=>:w)
   end
 
@@ -158,15 +158,15 @@ module DemoDialog
   end
 
   def self._show_tmpldlg
-    dlg = Tk::BWidget::Dialog.new(:relative=>Tk.root, :modal=>:local, 
-                                  :separator=>true, :title=>'Template dialog', 
-                                  :side=>@@tmpl['side'], 
-                                  :anchor=>@@tmpl['anchor'], 
+    dlg = Tk::BWidget::Dialog.new(:relative=>Tk.root, :modal=>:local,
+                                  :separator=>true, :title=>'Template dialog',
+                                  :side=>@@tmpl['side'],
+                                  :anchor=>@@tmpl['anchor'],
                                   :default=>0, :cancel=>1)
     dlg.add('name'=>'ok')
     dlg.add('name'=>'cancel')
-    TkMessage.new(dlg.get_frame, :text=>"Template\nDialog", :justify=>:center, 
-                  :anchor=>:c, :width=>80).pack(:fill=>:both, :expand=>true, 
+    TkMessage.new(dlg.get_frame, :text=>"Template\nDialog", :justify=>:center,
+                  :anchor=>:c, :width=>80).pack(:fill=>:both, :expand=>true,
                                                 :padx=>100, :pady=>100)
     dlg.draw
     dlg.destroy
@@ -174,16 +174,16 @@ module DemoDialog
 
   def self._show_msgdlg
     @@msgdlg.destroy if @@msgdlg
-    @@msgdlg = Tk::BWidget::MessageDlg.new(:relative=>Tk.root, 
-                                           :message=>'Message for MessageBox', 
-                                           :type=>@@msg['type'], 
-                                           :icon=>@@msg['icon'], 
+    @@msgdlg = Tk::BWidget::MessageDlg.new(:relative=>Tk.root,
+                                           :message=>'Message for MessageBox',
+                                           :type=>@@msg['type'],
+                                           :icon=>@@msg['icon'],
                                            :buttons=>@@msg['buttons'])
     @@msgdlg.create
   end
 
   def self._show_fontdlg
-    font = Tk::BWidget::SelectFont.new(:relative=>Tk.root, 
+    font = Tk::BWidget::SelectFont.new(:relative=>Tk.root,
                                        :font=>DemoVar.font).create
     DemoVar::Demo.update_font(font)
   end
@@ -192,11 +192,11 @@ module DemoDialog
     @@progmsg.value = "Compute in progress..."
     @@progval.value = 0
 
-    @@progdlg = Tk::BWidget::ProgressDlg.new(:relative=>Tk.root, 
-                                             :title=>'Wait...', 
-                                             :type=>'infinite', :width=>20, 
-                                             :textvariable=>@@progmsg, 
-                                             :variable=>@@progval, 
+    @@progdlg = Tk::BWidget::ProgressDlg.new(:relative=>Tk.root,
+                                             :title=>'Wait...',
+                                             :type=>'infinite', :width=>20,
+                                             :textvariable=>@@progmsg,
+                                             :variable=>@@progval,
                                              :stop=>'Stop') {
       command(proc{self.destroy})
       create
diff --git a/ext/tk/sample/tkextlib/bwidget/tree.rb b/ext/tk/sample/tkextlib/bwidget/tree.rb
index e1fcaa774f..9ef6569d16 100644
--- a/ext/tk/sample/tkextlib/bwidget/tree.rb
+++ b/ext/tk/sample/tkextlib/bwidget/tree.rb
@@ -16,28 +16,28 @@ module DemoTree
 
     pane = pw.add(:weight=>1)
     title = Tk::BWidget::TitleFrame.new(pane, :text=>'Directory tree')
-    sw = Tk::BWidget::ScrolledWindow.new(title.get_frame, 
+    sw = Tk::BWidget::ScrolledWindow.new(title.get_frame,
                                          :relief=>:sunken, :borderwidth=>2)
-    tree = Tk::BWidget::Tree.new(sw, :relief=>:flat, :borderwidth=>0, 
-                                 :width=>15, :highlightthickness=>0, 
-                                 :redraw=>false, :dropenabled=>true, 
-                                 :dragenabled=>true, :dragevent=>3, 
+    tree = Tk::BWidget::Tree.new(sw, :relief=>:flat, :borderwidth=>0,
+                                 :width=>15, :highlightthickness=>0,
+                                 :redraw=>false, :dropenabled=>true,
+                                 :dragenabled=>true, :dragevent=>3,
                                  :droptypes=>[
                                    'TREE_NODE', [
-                                     :copy, [], 
+                                     :copy, [],
                                      :move, [],
                                      :link, []
-                                   ], 
+                                   ],
                                    'LISTBOX_ITEM', [
-                                     :copy, [], 
+                                     :copy, [],
                                      :move, [],
                                      :link, []
                                    ]
-                                 ], 
-                                 :opencmd=>proc{|node| 
+                                 ],
+                                 :opencmd=>proc{|node|
                                    moddir(1, tree, node)
-                                 }, 
-                                 :closecmd=>proc{|node| 
+                                 },
+                                 :closecmd=>proc{|node|
                                    moddir(0, tree, node)
                                  })
     sw.set_widget(tree)
@@ -47,24 +47,24 @@ module DemoTree
 
     pane = pw.add(:weight=>2)
     lf = Tk::BWidget::TitleFrame.new(pane, :text=>'Content')
-    sw = Tk::BWidget::ScrolledWindow.new(lf.get_frame, 
-                                         :scrollbar=>:horizontal, 
-                                         :auto=>:none, :relief=>:sunken, 
+    sw = Tk::BWidget::ScrolledWindow.new(lf.get_frame,
+                                         :scrollbar=>:horizontal,
+                                         :auto=>:none, :relief=>:sunken,
                                          :borderwidth=>2)
 
-    list = Tk::BWidget::ListBox.new(sw, :relief=>:flat, :borderwidth=>0, 
-                                    :highlightthickness=>0, :width=>20, 
-                                    :multicolumn=>true, :redraw=>false, 
-                                    :dragevent=>3, :dropenabled=>true, 
-                                    :dragenabled=>true, 
+    list = Tk::BWidget::ListBox.new(sw, :relief=>:flat, :borderwidth=>0,
+                                    :highlightthickness=>0, :width=>20,
+                                    :multicolumn=>true, :redraw=>false,
+                                    :dragevent=>3, :dropenabled=>true,
+                                    :dragenabled=>true,
                                  :droptypes=>[
                                       'TREE_NODE', [
-                                        :copy, [], 
+                                        :copy, [],
                                         :move, [],
                                         :link, []
-                                      ], 
+                                      ],
                                       'LISTBOX_ITEM', [
-                                        :copy, [], 
+                                        :copy, [],
                                         :move, [],
                                         :link, []
                                       ]
@@ -77,43 +77,43 @@ module DemoTree
 
     tree.textbind('ButtonPress-1',
                   proc{|node, ev| select('tree', 1, tree, list, node)})
-    tree.textbind('Double-ButtonPress-1', 
+    tree.textbind('Double-ButtonPress-1',
                   proc{|node, ev| select('tree', 2, tree, list, node)})
 
     list.textbind('ButtonPress-1',
                   proc{|node, ev| select('list', 1, tree, list, node)})
-    list.textbind('Double-ButtonPress-1', 
+    list.textbind('Double-ButtonPress-1',
                   proc{|node, ev| select('list', 2, tree, list, node)})
 
-    list.imagebind('Double-ButtonPress-1', 
+    list.imagebind('Double-ButtonPress-1',
                    proc{|node, ev| select('list', 2, tree, list, node)})
 
-    nb.itemconfigure('demoTree', 
-                     :createcmd=>proc{|*args| init(tree, list, *args)}, 
+    nb.itemconfigure('demoTree',
+                     :createcmd=>proc{|*args| init(tree, list, *args)},
                      :raisecmd=>proc{
-                       Tk.root.geometry =~ 
+                       Tk.root.geometry =~
                          /\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
                        global_w = ($1 || 0).to_i
                        global_h = ($2 || 0).to_i
                        if @@top
-                         Tk::BWidget.place(@@top, 0, 0, :at, 
+                         Tk::BWidget.place(@@top, 0, 0, :at,
                             global_w - Tk.root.winfo_screenwidth, global_h)
                          @@top.deiconify
                          Tk.root.bind('Unmap', proc{@@top.withdraw})
                          Tk.root.bind('Map',   proc{@@top.deiconify})
                          Tk.root.bind('Configure', proc{|w|
                                 if w == Tk.root
-                                  Tk.root.geometry =~ 
+                                  Tk.root.geometry =~
                                     /\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
                                   global_w = ($1 || 0).to_i
                                   global_h = ($2 || 0).to_i
-                                  Tk::BWidget.place(@@top, 0, 0, :at, 
-                                       global_w - Tk.root.winfo_screenwidth, 
+                                  Tk::BWidget.place(@@top, 0, 0, :at,
+                                       global_w - Tk.root.winfo_screenwidth,
                                        global_h)
                                 end
                          }, '%W')
                        end
-                     }, 
+                     },
                      :leavecmd=>proc{
                        @@top.withdraw if @@top
                        Tk.root.bind_remove('Unmap')
@@ -131,8 +131,8 @@ module DemoTree
       rootdir = 'c:'
     end
 
-    tree.insert('end', 'root', 'home', 
-                :text=>rootdir, :data=>rootdir, :open=>true, 
+    tree.insert('end', 'root', 'home',
+                :text=>rootdir, :data=>rootdir, :open=>true,
                 :image=>Tk::BWidget::Bitmap.new('openfold'))
     getdir(tree, 'home', rootdir)
     select('tree', 1, tree, list, 'home')
@@ -147,8 +147,8 @@ module DemoTree
     @@top.resizable(false, false)
     @@top.title('Drag rectangle to scroll directory tree')
     @@top.transient(Tk.root)
-    Tk::BWidget::ScrollView.new(@@top, :window=>tree, :fill=>'white', 
-                                :width=>300, :height=>300, :relief=>:sunken, 
+    Tk::BWidget::ScrollView.new(@@top, :window=>tree, :fill=>'white',
+                                :width=>300, :height=>300, :relief=>:sunken,
                                 :bd=>1).pack(:fill=>:both, :expand=>true)
   end
 
@@ -156,11 +156,11 @@ module DemoTree
     lentries = Dir.glob(File.join(path, '*')).sort
     lfiles = []
     lentries.each{|f|
-      basename = File.basename(f)      
+      basename = File.basename(f)
       if File.directory?(f)
-        Tk::BWidget::Tree::Node.new(tree, node, 
-                                    :index=>'end', :text=>basename, 
-                                    :image=>Tk::BWidget::Bitmap.new('folder'), 
+        Tk::BWidget::Tree::Node.new(tree, node,
+                                    :index=>'end', :text=>basename,
+                                    :image=>Tk::BWidget::Bitmap.new('folder'),
                                     :drawcross=>:allways, :data=>f)
         @@count += 1
       else
@@ -187,7 +187,7 @@ module DemoTree
   def self.select(where, num, tree, list, node)
     @@dblclick = true
     if num == 1
-      if (where == 'tree' && 
+      if (where == 'tree' &&
           tree.selection_get.find{|x|
             TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
           })
@@ -195,7 +195,7 @@ module DemoTree
         Tk.after(500, proc{edit('tree', tree, list, node)})
         return
       end
-      if (where == 'list' && 
+      if (where == 'list' &&
           list.selection_get.find{|x|
             TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
           })
@@ -230,13 +230,13 @@ module DemoTree
     end
 
     tree.nodes(node).each{|subnode|
-      list.insert('end', subnode, 
-                  :text=>tree.itemcget(subnode, :text), 
+      list.insert('end', subnode,
+                  :text=>tree.itemcget(subnode, :text),
                   :image=>Tk::BWidget::Bitmap.new('folder'))
     }
 
     TkComm.simplelist(dir).each{|f|
-      Tk::BWidget::ListBox::Item.new(list, 'end', :text=>f, 
+      Tk::BWidget::ListBox::Item.new(list, 'end', :text=>f,
                                      :image=>Tk::BWidget::Bitmap.new('file'))
     }
   end
@@ -244,7 +244,7 @@ module DemoTree
   def self.edit(where, tree, list, node)
     return if @@dblclick
 
-    if (where == 'tree' && 
+    if (where == 'tree' &&
         tree.selection_get.find{|x|
           TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
         })
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
index 4dd929c035..bb09b4dfd3 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
@@ -2,9 +2,9 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-Tk::Iwidgets::Calendar.new(:command=>proc{|arg| puts(arg.date)}, 
-                           :weekendbackground=>'mistyrose', 
-                           :weekdaybackground=>'ghostwhite', 
-                           :outline=>'black', :startday=>'wednesday', 
+Tk::Iwidgets::Calendar.new(:command=>proc{|arg| puts(arg.date)},
+                           :weekendbackground=>'mistyrose',
+                           :weekdaybackground=>'ghostwhite',
+                           :outline=>'black', :startday=>'wednesday',
                            :days=>%w(We Th Fr Sa Su Mo Tu)).pack
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
index ec9c7a1df3..36847538d6 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
@@ -5,11 +5,11 @@ require 'tkextlib/iwidgets'
 #
 # Non-editable Dropdown Combobox
 #
-cb1 = Tk::Iwidgets::Combobox.new(:labeltext=>'Month:', 
+cb1 = Tk::Iwidgets::Combobox.new(:labeltext=>'Month:',
                                  :selectioncommand=>proc{
                                    puts(cb1.get_curselection)
-                                 }, 
-                                 :editable=>false, :listheight=>185, 
+                                 },
+                                 :editable=>false, :listheight=>185,
                                  :popupcursor=>'hand1')
 
 cb1.insert_list('end', *%w(Jan Feb Mar Apr May June Jul Aug Sept Oct Nov Dec))
@@ -18,7 +18,7 @@ cb1.insert_list('end', *%w(Jan Feb Mar Apr May June Jul Aug Sept Oct Nov Dec))
 #
 # Editable Dropdown Combobox
 #
-cb2 = Tk::Iwidgets::Combobox.new(:labeltext=>'Operating System:', 
+cb2 = Tk::Iwidgets::Combobox.new(:labeltext=>'Operating System:',
                                  :selectioncommand=>proc{
                                    puts(cb2.get_curselection)
                                  })
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
index 197521e0a4..00ee99786c 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
@@ -8,7 +8,7 @@ ds.add('OK', :text=>'OK', :command=>proc{puts 'OK'; ds.deactivate})
 ds.add('Cancel', :text=>'Cancel', :command=>proc{puts 'Cancel'; ds.deactivate})
 ds.default('OK')
 
-TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7, 
+TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
              :command=>proc{puts ds.activate}).pack(:padx=>10, :pady=>10)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
index 85c5d03d17..682c853e47 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-djl = Tk::Iwidgets::Disjointlistbox.new.pack(:fill=>:both, :expand=>true, 
+djl = Tk::Iwidgets::Disjointlistbox.new.pack(:fill=>:both, :expand=>true,
                                              :padx=>10,  :pady=>10)
 djl.set_lhs(*[0,2,4,5])
 djl.set_rhs(3,6)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
index 856d883a92..8563a0894d 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
@@ -11,20 +11,20 @@ TkOption.add('*textBackground', 'white')
 
 ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
 
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:', 
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
                                    :fixed=>10, :width=>12)
 
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:', 
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
                                    :validate=>:numeric, :width=>12)
 
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:', 
-                                   :validate=>:alphabetic, :width=>12, 
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
+                                   :validate=>:alphabetic, :width=>12,
                                    :invalid=>proc{
                                      puts "Alphabetic contents invalid"
                                    })
 
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12, 
-                                   :show=>Tk::UTF8_String("\267"),  
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
+                                   :show=>Tk::UTF8_String("\267"),
                                                          ## <=== utf8 character
                                    :command=>proc{puts "Return Pressed"})
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
index 4a4c2e7eb7..d8ccdf8555 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
@@ -4,7 +4,11 @@
 #  set $KCODE to 'utf' for a utf8 charecter
 #
 #########################################################
-$KCODE='utf'
+unless defined?(::Encoding.default_external)
+  $KCODE='utf'
+else
+  DEFAULT_TK_ENCODING = 'UTF-8'
+end
 
 require 'tk'
 require 'tkextlib/iwidgets'
@@ -13,19 +17,19 @@ TkOption.add('*textBackground', 'white')
 
 ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
 
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:', 
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
                                    :fixed=>10, :width=>12)
 
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:', 
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
                                    :validate=>:numeric, :width=>12)
 
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:', 
-                                   :validate=>:alphabetic, :width=>12, 
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
+                                   :validate=>:alphabetic, :width=>12,
                                    :invalid=>proc{
                                      puts "Alphabetic contents invalid"
                                    })
 
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12, 
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
                                    :show=>"\267",  ## <=== utf8 character
                                    :command=>proc{puts "Return Pressed"})
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
index bddd542f64..327f90893c 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
@@ -13,19 +13,19 @@ TkOption.add('*textBackground', 'white')
 
 ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
 
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:', 
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
                                    :fixed=>10, :width=>12)
 
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:', 
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
                                    :validate=>:numeric, :width=>12)
 
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:', 
-                                   :validate=>:alphabetic, :width=>12, 
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
+                                   :validate=>:alphabetic, :width=>12,
                                    :invalid=>proc{
                                      puts "Alphabetic contents invalid"
                                    })
 
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12, 
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
                                    :show=>"\267",  ## <=== utf8 character
                                    :command=>proc{puts "Return Pressed"})
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
index 6971052b60..4944c72ea5 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
@@ -2,9 +2,9 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info', 
-                            :background=>'bisque',  :activeforeground=>'red', 
-                            :bitmapforeground=>'blue', :defaultring=>true, 
+Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info',
+                            :background=>'bisque',  :activeforeground=>'red',
+                            :bitmapforeground=>'blue', :defaultring=>true,
                             :command=>proc{
                               puts "Bisque is beautiful"
                             }).pack(:expand=>true)
@@ -12,9 +12,9 @@ Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info',
 #img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../../../images/earthris.gif'))
 img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/clear.gif'))
 
-Tk::Iwidgets::Extbutton.new(:text=>'Image example', :relief=>:ridge, 
-                            :image=>img, :imagepos=>:e, :font=>'9x15bold', 
-                            :activebackground=>'lightyellow', 
+Tk::Iwidgets::Extbutton.new(:text=>'Image example', :relief=>:ridge,
+                            :image=>img, :imagepos=>:e, :font=>'9x15bold',
+                            :activebackground=>'lightyellow',
                             :background=>'lightgreen').pack(:expand=>true)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
index 4738084d9d..63e4be2fee 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-Tk::Iwidgets::Extfileselectionbox.new.pack(:padx=>10, :pady=>10, 
+Tk::Iwidgets::Extfileselectionbox.new.pack(:padx=>10, :pady=>10,
                                            :fill=>:both, :expand=>true)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
index 2ad3adb974..3a5b513bde 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-Tk::Iwidgets::Fileselectionbox.new.pack(:padx=>10, :pady=>10, 
+Tk::Iwidgets::Fileselectionbox.new.pack(:padx=>10, :pady=>10,
                                         :fill=>:both, :expand=>true)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb b/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
index ddb08d8b78..085070e652 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
@@ -10,16 +10,16 @@ def get_files(file)
   }
 end
 
-Tk::Iwidgets::Hierarchy.new(:querycommand=>proc{|arg| get_files(arg.node)}, 
-                            :visibleitems=>'30x15', 
-                            :labeltext=>ENV['HOME']).pack(:side=>:left, 
-                                                          :expand=>true, 
+Tk::Iwidgets::Hierarchy.new(:querycommand=>proc{|arg| get_files(arg.node)},
+                            :visibleitems=>'30x15',
+                            :labeltext=>ENV['HOME']).pack(:side=>:left,
+                                                          :expand=>true,
                                                           :fill=>:both)
 
-# Tk::Iwidgets::Hierarchy.new(:querycommand=>[proc{|n| get_files(n)}, '%n'], 
-#                           :visibleitems=>'30x15', 
-#                           :labeltext=>ENV['HOME']).pack(:side=>:left, 
-#                                                         :expand=>true, 
+# Tk::Iwidgets::Hierarchy.new(:querycommand=>[proc{|n| get_files(n)}, '%n'],
+#                           :visibleitems=>'30x15',
+#                           :labeltext=>ENV['HOME']).pack(:side=>:left,
+#                                                         :expand=>true,
 #                                                         :fill=>:both)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb b/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
index 1d2e0a98a3..577550af55 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
@@ -2,11 +2,11 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-lw = Tk::Iwidgets::Labeledwidget.new(:labeltext=>'Canvas Widget', 
+lw = Tk::Iwidgets::Labeledwidget.new(:labeltext=>'Canvas Widget',
                                      :labelpos=>:s)
 lw.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>10)
 
-cw = TkCanvas.new(lw.child_site, :relief=>:raised, :width=>200, :height=>200, 
+cw = TkCanvas.new(lw.child_site, :relief=>:raised, :width=>200, :height=>200,
                   :borderwidth=>3, :background=>:white)
 cw.pack(:padx=>10, :pady=>10)
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
index b87a6d27f9..c9677f2270 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
@@ -4,55 +4,55 @@ require 'tkextlib/iwidgets'
 
 mw = Tk::Iwidgets::Mainwindow.new
 
-mw.menubar.add(:menubutton, 'file', :text=>'File', :underline=>0, 
+mw.menubar.add(:menubutton, 'file', :text=>'File', :underline=>0,
                :padx=>8, :pady=>2, :menu=>[
-                 [:options, {:tearoff=>false}], 
+                 [:options, {:tearoff=>false}],
 
                  [:command, 'new', {
-                     :label=>'New', :underline=>0, 
+                     :label=>'New', :underline=>0,
                      :helpstr=>'Create a new file'
                    }
-                 ], 
+                 ],
 
                  [:command, 'open', {
-                     :label=>'Open ...', :underline=>0, 
+                     :label=>'Open ...', :underline=>0,
                      :helpstr=>'Open an existing file'
                    }
-                 ], 
+                 ],
 
                  [:command, 'save', {
-                     :label=>'Save', :underline=>0, 
+                     :label=>'Save', :underline=>0,
                      :helpstr=>'Save the current file'
                    }
-                 ], 
+                 ],
 
                  [:command, 'saveas', {
-                     :label=>'Save As', :underline=>5, 
+                     :label=>'Save As', :underline=>5,
                      :helpstr=>'Save the file as a different name'
                    }
-                 ], 
+                 ],
 
                  [:command, 'print', {
-                     :label=>'Print', :underline=>0, 
+                     :label=>'Print', :underline=>0,
                      :helpstr=>'Print the file'
                    }
-                 ], 
+                 ],
 
-                 [:separator, 'sep1'], 
+                 [:separator, 'sep1'],
 
                  [:command, 'close', {
-                     :label=>'Close', :underline=>0, 
+                     :label=>'Close', :underline=>0,
                      :helpstr=>'Close the file'
                    }
-                 ], 
+                 ],
 
-                 [:separator, 'sep2'], 
+                 [:separator, 'sep2'],
 
                  [:command, 'exit', {
-                     :label=>'Exit', :underline=>1, 
+                     :label=>'Exit', :underline=>1,
                      :helpstr=>'Exit this application'
                    }
-                 ], 
+                 ],
 
                  nil
                ])
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
index 891761adc1..e01275217d 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
@@ -8,96 +8,96 @@ viewmode = TkVariable.new
 menu_spec = [
   [:menubutton, 'file', {
       :text=>'File', :menu=>[
-        [:options, {:tearoff=>false}], 
+        [:options, {:tearoff=>false}],
 
         [:command, 'new', {
-            :label=>'New', :helpstr=>'Open new document', 
+            :label=>'New', :helpstr=>'Open new document',
             :command=>proc{puts 'NEW'}
           }
-        ], 
+        ],
 
         [:command, 'close', {
-            :label=>'Close', :helpstr=>'Close current document', 
+            :label=>'Close', :helpstr=>'Close current document',
             :command=>proc{puts 'CLOSE'}
           }
-        ], 
+        ],
 
-        [:separator, 'sep1'], 
+        [:separator, 'sep1'],
 
         [:command, 'exit', {
-            :label=>'Exit', :helpstr=>'Exit application', 
+            :label=>'Exit', :helpstr=>'Exit application',
             :command=>proc{exit}
           }
         ]
       ]
     }
-  ], 
+  ],
 
   [:menubutton, 'edit', {
       :text=>'Edit', :menu=>[
-        [:options, {:tearoff=>false}], 
+        [:options, {:tearoff=>false}],
 
         [:command, 'undo', {
-            :label=>'Undo', :underline=>0, 
-            :helpstr=>'Undo last command', 
+            :label=>'Undo', :underline=>0,
+            :helpstr=>'Undo last command',
             :command=>proc{puts 'UNDO'}
           }
-        ], 
+        ],
 
-        [:separator, 'sep2'], 
+        [:separator, 'sep2'],
 
         [:command, 'cut', {
-            :label=>'Cut', :underline=>1, 
-            :helpstr=>'Cut selection to clipboard', 
+            :label=>'Cut', :underline=>1,
+            :helpstr=>'Cut selection to clipboard',
             :command=>proc{puts 'CUT'}
           }
-        ], 
+        ],
 
         [:command, 'copy', {
-            :label=>'Copy', :underline=>1, 
-            :helpstr=>'Copy selection to clipboard', 
+            :label=>'Copy', :underline=>1,
+            :helpstr=>'Copy selection to clipboard',
             :command=>proc{puts 'COPY'}
           }
-        ], 
+        ],
 
         [:command, 'paste', {
-            :label=>'Paste', :underline=>0, 
-            :helpstr=>'Paste clipboard contents', 
+            :label=>'Paste', :underline=>0,
+            :helpstr=>'Paste clipboard contents',
             :command=>proc{puts 'PASTE'}
           }
         ]
       ]
     }
-  ], 
+  ],
 
   [:menubutton, 'options', {
       :text=>'Options', :menu=>[
-        [:options, {:tearoff=>false, :selectcolor=>'blue'}], 
+        [:options, {:tearoff=>false, :selectcolor=>'blue'}],
 
         [:radiobutton, 'byName', {
-            :variable=>viewmode, :value=>'NAME', 
-            :label=>'by Name', :helpstr=>'View files by name order', 
+            :variable=>viewmode, :value=>'NAME',
+            :label=>'by Name', :helpstr=>'View files by name order',
             :command=>proc{puts 'NAME'}
           }
-        ], 
+        ],
 
         [:radiobutton, 'byDate', {
-            :variable=>viewmode, :value=>'DATE', 
-            :label=>'by Date', :helpstr=>'View files by date order', 
+            :variable=>viewmode, :value=>'DATE',
+            :label=>'by Date', :helpstr=>'View files by date order',
             :command=>proc{puts 'DATE'}
           }
-        ], 
+        ],
 
         [:cascade, 'prefs', {
             :label=>'Preferences', :menu=>[
               [:command, 'colors', {
-                  :label=>'Colors...', :helpstr=>'Change text colors', 
+                  :label=>'Colors...', :helpstr=>'Change text colors',
                   :command=>proc{puts 'COLORS'}
                 }
-              ], 
+              ],
 
               [:command, 'fonts', {
-                  :label=>'Fonts...', :helpstr=>'Change text font', 
+                  :label=>'Fonts...', :helpstr=>'Change text font',
                   :command=>proc{puts 'COLORS'}
                 }
               ]
@@ -109,7 +109,7 @@ menu_spec = [
   ]
 ]
 
-#mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar, 
+#mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar,
 #                              :menubuttons=>menu_spec)
 mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar)
 mb.configure(:menubuttons=>menu_spec)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
index d6f2292650..477c916e07 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
@@ -9,13 +9,13 @@ mb = Tk::Iwidgets::Menubar.new
 mb.menubuttons = [
   [:menubutton, 'file', {
       :text=>'File', :menu=>[
-        [:command,   'new',   {:label=>'New'}], 
-        [:command,   'close', {:label=>'Close'}], 
-        [:separator, 'sep1'], 
+        [:command,   'new',   {:label=>'New'}],
+        [:command,   'close', {:label=>'Close'}],
+        [:separator, 'sep1'],
         [:command,   'quit',  {:label=>'Quit'}]
       ]
     }
-  ], 
+  ],
   [:menubutton, 'edit', {:text=>'Edit'}]
 ]
 
@@ -28,14 +28,14 @@ mb.add(:command, '.edit.paste', :label=>'Paste', :underline=>0)
 mb.add(:menubutton, '.options', :text=>'Options', :menu=>[
          [:radiobutton, 'byName', {
              :variable=>viewmode, :value=>'NAME', :label=>'by Name'}
-         ], 
+         ],
          [:radiobutton, 'byDate', {
              :variable=>viewmode, :value=>'DATE', :label=>'by Date'}
          ]
        ])
 
 mb.add(:cascade, '.options.prefs', :label=>'Preferences', :menu=>[
-         [:command, 'colors', {:label=>'Colors...'}], 
+         [:command, 'colors', {:label=>'Colors...'}],
          [:command, 'fonts',  {:label=>'Fonts...'}]
        ])
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
index 3221dbc30c..87b2d38907 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
@@ -2,9 +2,9 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic, 
-                                  :labeltext=>'Messages', :labelpos=>:n, 
-                                  :height=>120, :width=>550, 
+mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
+                                  :labeltext=>'Messages', :labelpos=>:n,
+                                  :height=>120, :width=>550,
                                   :savedir=>'/tmp', :textbackground=>'#d9d9d9')
 mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
index 2f0e3648a6..5278883568 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
@@ -2,9 +2,9 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic, 
-                                  :labeltext=>'Messages', :labelpos=>:n, 
-                                  :height=>120, :width=>550, 
+mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
+                                  :labeltext=>'Messages', :labelpos=>:n,
+                                  :height=>120, :width=>550,
                                   :savedir=>'/tmp', :textbackground=>'#d9d9d9')
 mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
index 6c6bfbca3f..52799f206c 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
@@ -7,8 +7,8 @@ mainloop = Thread.new{Tk.mainloop}
 #
 # Standard question message dialog used for confirmation.
 #
-md = Tk::Iwidgets::Messagedialog.new(:title=>'Message Dialog', 
-                                     :text=>'Are you sure ? ', 
+md = Tk::Iwidgets::Messagedialog.new(:title=>'Message Dialog',
+                                     :text=>'Are you sure ? ',
                                      :bitmap=>'questhead', :modality=>:global)
 
 md.buttonconfigure('OK', :text=>'Yes')
@@ -32,8 +32,8 @@ md.destroy
 #
 bmp = '@' + File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/text.xbm')
 
-cr = Tk::Iwidgets::Messagedialog.new(:title=>'Copyright', 
-                                     :bitmap=>bmp, :imagepos=>:n, 
+cr = Tk::Iwidgets::Messagedialog.new(:title=>'Copyright',
+                                     :bitmap=>bmp, :imagepos=>:n,
                                      :text=>"Copyright 200x XXX Corporation\nAll rights reserved")
 
 cr.hide('Cancel')
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
index e33b81eb6f..055312ec96 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
 
 # Create the tabnotebook widget and pack it.
 nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
-nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
         :side=>:left, :padx=>10, :pady=>10)
 
 # Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
index 649de4f024..41e9ce1bfc 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
 
 # Create the tabnotebook widget and pack it.
 nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
-nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
         :side=>:top, :padx=>10, :pady=>0)
 
 # Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb b/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
index 1fd7a5bc05..2b921ffab9 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-om = Tk::Iwidgets::Optionmenu.new(:labelmargin=>5, :labelpos=>:w, 
+om = Tk::Iwidgets::Optionmenu.new(:labelmargin=>5, :labelpos=>:w,
                                   :labeltext=>"Operating System :")
 
 om.insert('end', 'Unix', 'VMS', 'Linux', 'OS/2', 'Windows NT', 'DOS')
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
index 6e4458e508..88fc401483 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
@@ -11,7 +11,7 @@ pw.add('bottom', :margin=>10, :minimum=>10)
 pw.pack(:fill=>:both, :expand=>true)
 
 pw.child_site_list.each{|pane|
-  TkButton.new(pane, :text=>pane.path, :relief=>:raised, 
+  TkButton.new(pane, :text=>pane.path, :relief=>:raised,
                :borderwidth=>2).pack(:fill=>:both, :expand=>true)
 }
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
index 6779cb57db..96987d529c 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
@@ -11,7 +11,7 @@ bottom = pw.add(:margin=>10, :minimum=>10)
 pw.pack(:fill=>:both, :expand=>true)
 
 pw.child_site_list.each{|pane|
-  TkButton.new(pane, :text=>pane.path, :relief=>:raised, 
+  TkButton.new(pane, :text=>pane.path, :relief=>:raised,
                :borderwidth=>2).pack(:fill=>:both, :expand=>true)
 }
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
index 2c643e56f7..d92a26ead9 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
@@ -6,7 +6,7 @@ mainloop = Thread.new{Tk.mainloop}
 
 TkOption.add('*textBackground', 'white')
 
-pd = Tk::Iwidgets::Promptdialog.new(:modality=>:global, :title=>'Password', 
+pd = Tk::Iwidgets::Promptdialog.new(:modality=>:global, :title=>'Password',
                                     :labeltext=>'Password:', :show=>'*')
 pd.hide('Apply')
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
index 6e1c3fffe3..e76dda88c6 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
@@ -2,8 +2,8 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-Tk::Iwidgets::Pushbutton.new(:text=>'Hello', 
-                             :command=>proc{puts 'Hello World'}, 
+Tk::Iwidgets::Pushbutton.new(:text=>'Hello',
+                             :command=>proc{puts 'Hello World'},
                              :defaultring=>true).pack(:padx=>10, :pady=>10)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
index 5219847c9c..e5bd90a1cb 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-sf = Tk::Iwidgets::Scrolledframe.new(:width=>150, :height=>180, 
+sf = Tk::Iwidgets::Scrolledframe.new(:width=>150, :height=>180,
                                      :labeltext=>'scrolledframe')
 cs = sf.child_site
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
index 04334b8da8..2b675f802c 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
 
 TkOption.add('*textBackground', 'white')
 
-sh = Tk::Iwidgets::Scrolledhtml.new(:fontname=>'helvetica', 
+sh = Tk::Iwidgets::Scrolledhtml.new(:fontname=>'helvetica',
                                     :linkcommand=>proc{|href|
                                       sh.import_link(href)
                                     })
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
index 0b69751911..bf2c60191f 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
@@ -4,13 +4,13 @@ require 'tkextlib/iwidgets'
 
 TkOption.add('*textBackground', 'white')
 
-slb = Tk::Iwidgets::Scrolledlistbox.new(:selectmode=>:single, 
+slb = Tk::Iwidgets::Scrolledlistbox.new(:selectmode=>:single,
                                         :vscrollmode=>:static,
                                         :hscrollmode=>:dynamic,
-                                        :labeltext=>'List', 
+                                        :labeltext=>'List',
                                         :selectioncommand=>proc{
                                           puts(slb.get_curselection)
-                                        }, 
+                                        },
                                         :dblclickcommand=>proc{
                                           puts('Double Click')
                                           puts(slb.get_curselection)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
index dd1a99a829..41498e67f7 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
@@ -2,7 +2,7 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-st = Tk::Iwidgets::Scrolledtext.new(:hscrollmode=>:dynamic, :wrap=>:none, 
+st = Tk::Iwidgets::Scrolledtext.new(:hscrollmode=>:dynamic, :wrap=>:none,
                                     :labeltext=>'Password File')
 st.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
 
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
index a5d623ae80..74684974b1 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
@@ -4,12 +4,12 @@ require 'tkextlib/iwidgets'
 
 TkOption.add('*textBackground', 'white')
 
-sb = Tk::Iwidgets::Selectionbox.new.pack(:padx=>10, :pady=>10, 
+sb = Tk::Iwidgets::Selectionbox.new.pack(:padx=>10, :pady=>10,
                                          :fill=>:both, :expand=>true)
 
 sb.insert_items('end', *['Hello', 'Out There', 'World'])
 
-TkLabel.new(sb.child_site, 
+TkLabel.new(sb.child_site,
             :text=>'Child Site is Here').pack(:fill=>:x, :padx=>10, :pady=>10)
 
 sb.insert_items(2, 'Cruel Cruel')
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
index f40b419180..d53391f2f3 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
 
 mainloop = Thread.new{Tk.mainloop}
 
-TkButton.new(:text=>'QUIT', 
+TkButton.new(:text=>'QUIT',
              :command=>proc{Tk.root.destroy}).pack(:padx=>10, :pady=>10)
 
 Tk::Iwidgets::Selectiondialog.new.activate
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
index c44b5554a6..6d01280141 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
@@ -2,16 +2,16 @@
 require 'tk'
 require 'tkextlib/iwidgets'
 
-sh = Tk::Iwidgets::Shell.new(:modality=>:application, 
+sh = Tk::Iwidgets::Shell.new(:modality=>:application,
                              :padx=>20, :pady=>20, :title=>'Shell')
 
-TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7, 
+TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
              :command=>proc{puts sh.activate}).pack(:padx=>10, :pady=>10)
 
 TkLabel.new(sh.child_site, :text=>'SHELL').pack
-TkButton.new(sh.child_site, :text=>'YES', 
+TkButton.new(sh.child_site, :text=>'YES',
              :command=>proc{sh.deactivate 'press YES'}).pack(:fill=>:x)
-TkButton.new(sh.child_site, :text=>'NO', 
+TkButton.new(sh.child_site, :text=>'NO',
              :command=>proc{sh.deactivate 'press NO'}).pack(:fill=>:x)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
index 0bcdefb763..e2dde01b18 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
 
 TkOption.add('*textBackground', 'white')
 
-Tk::Iwidgets::Spinint.new(:labeltext=>'Temperature', :labelpos=>:w, :width=>5, 
+Tk::Iwidgets::Spinint.new(:labeltext=>'Temperature', :labelpos=>:w, :width=>5,
                           :fixed=>true, :range=>[32, 212]).pack(:pady=>10)
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
index 295d38ee96..6a20b0eb87 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
@@ -18,10 +18,10 @@ class Spinner_demo < TkWindow
   end
 
   def initialize(parent=nil)
-    @spinner = Tk::Iwidgets::Spinner.new(parent, :labeltext=>'Month : ', 
-                                         :width=>10, :fixed=>10, 
-                                         :validate=>proc{|c| block_input}, 
-                                         :decrement=>proc{spin_month -1}, 
+    @spinner = Tk::Iwidgets::Spinner.new(parent, :labeltext=>'Month : ',
+                                         :width=>10, :fixed=>10,
+                                         :validate=>proc{|c| block_input},
+                                         :decrement=>proc{spin_month -1},
                                          :increment=>proc{spin_month 1})
     @path = @spinner
     @spinner.insert(0, Months[0])
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
index 6f1ecc4fa4..382b34d3ce 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
 
 # Create the tabnotebook widget and pack it.
 tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
-tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
         :side=>:left, :padx=>10, :pady=>10)
 
 # Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
index 4a5eef5a8f..2689759bde 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
 
 # Create the tabnotebook widget and pack it.
 tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
-tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
         :side=>:top, :padx=>10, :pady=>0)
 
 # Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
index 355466eb1a..608efd0af1 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
@@ -88,7 +88,7 @@ EOD
 
 ##########################################
 
-bmp_dir = File.join(File.dirname(File.expand_path(__FILE__)), 
+bmp_dir = File.join(File.dirname(File.expand_path(__FILE__)),
                     '../catalog_demo/images')
 
 ##########################################
@@ -102,16 +102,16 @@ tb = Tk::Iwidgets::Toolbar.new(:helpvariable=>status_var)
 
 ##########################################
 
-tb.add(:button, :helpstr=>'Copy It', :image=>editcopy22, 
+tb.add(:button, :helpstr=>'Copy It', :image=>editcopy22,
        :balloonstr=>'Copy', :command=>proc{puts 'Copy It'})
 
-tb.add(:button, :helpstr=>'Cut It', :image=>editcut22, 
+tb.add(:button, :helpstr=>'Cut It', :image=>editcut22,
        :balloonstr=>'Cut', :command=>proc{puts 'Cut It'})
 
-tb.add(:button, :helpstr=>'Paste It', :image=>editpaste22, 
+tb.add(:button, :helpstr=>'Paste It', :image=>editpaste22,
        :balloonstr=>'Paste', :command=>proc{puts 'Paste It'})
 
-tb.add(:button, :helpstr=>'Delete It', :image=>editdelete22, 
+tb.add(:button, :helpstr=>'Delete It', :image=>editdelete22,
        :balloonstr=>'Delete', :command=>proc{puts 'Delete It'})
 
 #--------------------------------
@@ -120,19 +120,19 @@ tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
 
 #--------------------------------
 
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Box', 
-       :bitmap=>"@#{bmp_dir}/box.xbm", 
-       :helpstr=>'Radio Button #1', :balloonstr=>'Radio', 
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Box',
+       :bitmap=>"@#{bmp_dir}/box.xbm",
+       :helpstr=>'Radio Button #1', :balloonstr=>'Radio',
        :command=>proc{puts 'Radio Button "Box"'})
 
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Line', 
-       :bitmap=>"@#{bmp_dir}/line.xbm", 
-       :helpstr=>'Radio Button #2', :balloonstr=>'Radio', 
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Line',
+       :bitmap=>"@#{bmp_dir}/line.xbm",
+       :helpstr=>'Radio Button #2', :balloonstr=>'Radio',
        :command=>proc{puts 'Radio Button "Line"'})
 
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Oval', 
-       :bitmap=>"@#{bmp_dir}/oval.xbm", 
-       :helpstr=>'Radio Button #3', :balloonstr=>'Radio', 
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Oval',
+       :bitmap=>"@#{bmp_dir}/oval.xbm",
+       :helpstr=>'Radio Button #3', :balloonstr=>'Radio',
        :command=>proc{puts 'Radio Button "Oval"'})
 
 #--------------------------------
@@ -141,10 +141,10 @@ tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
 
 #--------------------------------
 
-tb.add(:checkbutton, :variable=>check_var1, :onvalue=>'yes', :offvalue=>'no', 
+tb.add(:checkbutton, :variable=>check_var1, :onvalue=>'yes', :offvalue=>'no',
        :image=>text22, :command=>proc{puts 'Checkbutton 1'})
 
-tb.add(:checkbutton, :variable=>check_var2, :onvalue=>'yes', :offvalue=>'no', 
+tb.add(:checkbutton, :variable=>check_var2, :onvalue=>'yes', :offvalue=>'no',
        :bitmap=>"@#{bmp_dir}/points.xbm", :command=>proc{puts 'Checkbutton 2'})
 
 tb.pack(:side=>:top, :anchor=>:nw)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb b/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
index 808c798aec..2af53ba63b 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
@@ -8,7 +8,7 @@ Thread.new{
   trap('INT', 'DEFAULT')
 }
 
-Tk::Iwidgets::Watch.new(:state=>:disabled, :showampm=>:no, 
+Tk::Iwidgets::Watch.new(:state=>:disabled, :showampm=>:no,
                         :width=>155, :height=>155){|w|
   w.pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
   # TkTimer.new(1000, -1, proc{w.show; Tk.update}).start
diff --git a/ext/tk/sample/tkextlib/tcllib/datefield.rb b/ext/tk/sample/tkextlib/tcllib/datefield.rb
index cfeca0c6de..3550af7d23 100644
--- a/ext/tk/sample/tkextlib/tcllib/datefield.rb
+++ b/ext/tk/sample/tkextlib/tcllib/datefield.rb
@@ -20,8 +20,8 @@ my_date1.trace('w'){
 
 df = Tk::Tcllib::Datefield.new(:textvariable=>my_date1)
 Tk.grid(TkLabel.new(:text=>'Enter a date:', :anchor=>:e), df, :sticky=>:ew)
-Tk.grid(TkLabel.new(:text=>'That date ia a:', :anchor=>:e), 
-        TkLabel.new(:textvariable=>my_date2, :relief=>:sunken, :width=>12), 
+Tk.grid(TkLabel.new(:text=>'That date ia a:', :anchor=>:e),
+        TkLabel.new(:textvariable=>my_date2, :relief=>:sunken, :width=>12),
         :sticky=>:ew)
 
 df.set_focus
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
index 053b0de085..7f35a3833c 100644
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
+++ b/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
@@ -23,7 +23,7 @@ Tk.pack(vc1,vc2,vc3, :fill=>:both, :side=>:top)
 
 ###############################
 
-s = Tk::Tcllib::Plotchart::XYPlot.new(c1, [0.0, 100.0, 10.0], 
+s = Tk::Tcllib::Plotchart::XYPlot.new(c1, [0.0, 100.0, 10.0],
                                           [0.0, 100.0, 20.0])
 
 
@@ -56,7 +56,7 @@ s.save_plot "aha.ps"
 
 s = Tk::Tcllib::Plotchart::Piechart.new(c2)
 
-s.plot([ ["Long names", 10], ["Short names", 30], 
+s.plot([ ["Long names", 10], ["Short names", 30],
          ["Average", 40],    ["Ultra-short names", 5] ])
 
 #
@@ -78,7 +78,7 @@ s.title "Cardioid"
 
 ###############################
 
-s = Tk::Tcllib::Plotchart::Barchart.new(hc1, %w(A B C D E), 
+s = Tk::Tcllib::Plotchart::Barchart.new(hc1, %w(A B C D E),
                                         [0.0, 10.0, 2.0], 2)
 
 s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -87,7 +87,7 @@ s.title "Arbitrary data"
 
 ###############################
 
-s = Tk::Tcllib::Plotchart::Barchart.new(hc2, %w(A B C D E), 
+s = Tk::Tcllib::Plotchart::Barchart.new(hc2, %w(A B C D E),
                                         [0.0, 20.0, 5.0], :stacked)
 
 s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -96,7 +96,7 @@ s.title "Stacked diagram"
 
 ###############################
 
-s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc1, [0.0, 10.0, 2.0], 
+s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc1, [0.0, 10.0, 2.0],
                                                   %w(A B C D E), 2)
 
 s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -105,7 +105,7 @@ s.title "Arbitrary data"
 
 ###############################
 
-s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc2, [0.0, 20.0, 5.0], 
+s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc2, [0.0, 20.0, 5.0],
                                                   %w(A B C D E), :stacked)
 
 s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -114,7 +114,7 @@ s.title "Stacked diagram"
 
 ###############################
 
-s = Tk::Tcllib::Plotchart::Timechart.new(vc3, "1 january 2004", 
+s = Tk::Tcllib::Plotchart::Timechart.new(vc3, "1 january 2004",
                                               "31 december 2004", 4)
 
 s.period("Spring", "1 march 2004", "1 june 2004", 'green')
@@ -134,7 +134,7 @@ zc1 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>300)
 zc2 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>250)
 Tk.pack(zc1,zc2)
 
-s = Tk::Tcllib::Plotchart::Plot3D.new(zc1, 
+s = Tk::Tcllib::Plotchart::Plot3D.new(zc1,
                                       [0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
 
 s.title "3D Plot"
@@ -145,12 +145,12 @@ s.plot_function{|x, y|
   3.0 * (1.0-(x1*x1+y1*y1))*(1.0-(x1*x1+y1*y1))
 }
 
-s = Tk::Tcllib::Plotchart::Plot3D.new(zc2, 
+s = Tk::Tcllib::Plotchart::Plot3D.new(zc2,
                                       [0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
 s.title "3D Plot - data "
 s.colour("green", "black")
-s.plot_data([ [1.0, 2.0, 1.0, 0.0], 
-              [1.1, 3.0, 1.1, -0.5], 
+s.plot_data([ [1.0, 2.0, 1.0, 0.0],
+              [1.1, 3.0, 1.1, -0.5],
               [3.0, 1.0, 4.0, 5.0] ])
 
 ###############################
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
index 33a6f29940..cb657a40d8 100644
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
+++ b/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
@@ -12,7 +12,7 @@ Tk.pack(c1,c2, :fill=>:both, :side=>:top)
 ###############################
 # Set up a strip chart
 ###############################
-slipchart = Tk::Tcllib::Plotchart::Stripchart.new(c1, [0.0, 100.0, 10.0], 
+slipchart = Tk::Tcllib::Plotchart::Stripchart.new(c1, [0.0, 100.0, 10.0],
                                                       [0.0, 100.0, 20.0])
 
 TkTimer.new(500, -1, proc{|obj| # obj --> TkTimer object
@@ -34,7 +34,7 @@ slipchart.title "Aha!"
 ###############################
 # Set up an isometric plot
 ###############################
-s = Tk::Tcllib::Plotchart::IsometricPlot.new(c2, [0.0, 100.0], [0.0, 200.0], 
+s = Tk::Tcllib::Plotchart::IsometricPlot.new(c2, [0.0, 100.0], [0.0, 200.0],
                                              :noaxes)
 
 s.set_zoom_pan
@@ -50,8 +50,8 @@ s.plot('circle',           [70.0, 70.0, 42.0])
 h = TkToplevel.new(:title=>'h')
 c = TkCanvas.new(h, :bg=>'white', :width=>400, :height=>200).pack(:fill=>:both)
 
-s = Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0], 
-                                         [0.0, 100.0, 20.0]) 
+s = Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
+                                         [0.0, 100.0, 20.0])
 s.dataconfig('series1', :colour=>'red',   :type=>:symbol)
 s.dataconfig('series2', :colour=>'green', :type=>:both)
 
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
index 2b5c7642bb..66b8fe706a 100644
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
+++ b/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
@@ -7,9 +7,9 @@ require 'tkextlib/tcllib/plotchart'
 # Set up a strip chart
 ###############################
 
-Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0], 
-                                      [0.0, 100.0, 20.0], 
-                                      :background=>'white', 
+Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0],
+                                      [0.0, 100.0, 20.0],
+                                      :background=>'white',
                                       :width=>400, :height=>200){|chart|
   title "Aha!"
   pack(:fill=>:both, :side=>:top)
@@ -38,8 +38,8 @@ Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0],
 ###############################
 # Set up an isometric plot
 ###############################
-Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes, 
-                                         :background=>'white', 
+Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes,
+                                         :background=>'white',
                                          :width=>400, :height=>200){|chart|
   pack(:fill=>:both, :side=>:top)
   set_zoom_pan
@@ -54,17 +54,17 @@ Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes,
 # Check the symbols
 ###############################
 TkToplevel.new(:title=>'h'){|h|
-  Tk::Tcllib::Plotchart::XYPlot.new(h, [0.0, 100.0, 10.0], 
-                                       [0.0, 100.0, 20.0], 
-                                    :bg=>'white', 
+  Tk::Tcllib::Plotchart::XYPlot.new(h, [0.0, 100.0, 10.0],
+                                       [0.0, 100.0, 20.0],
+                                    :bg=>'white',
                                     :width=>400, :height=>200){|chart|
     pack(:fill=>:both)
 
     yconfig(:format=>"%12.2e")
 
-    series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'red', 
+    series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'red',
                                                     :type=>:symbol)
-    series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'green', 
+    series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'green',
                                                     :type=>:both)
 
     x = 5.0
diff --git a/ext/tk/sample/tkextlib/tcllib/xyplot.rb b/ext/tk/sample/tkextlib/tcllib/xyplot.rb
index 8f8c3eb880..2aa101efcb 100644
--- a/ext/tk/sample/tkextlib/tcllib/xyplot.rb
+++ b/ext/tk/sample/tkextlib/tcllib/xyplot.rb
@@ -5,7 +5,7 @@ require 'tkextlib/tcllib/plotchart'
 
 TkCanvas.new(:background=>'white', :width=>400, :height=>200){|c|
   pack(:fill=>:both)
-  Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0], 
+  Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
                                        [0.0, 100.0, 20.0]){
     [ [0.0, 32.0], [10.0, 50.0], [25.0, 60.0], [78.0, 11.0] ].each{|x, y|
       plot('series1', x, y)
diff --git a/ext/tk/sample/tkextlib/tile/demo.rb b/ext/tk/sample/tkextlib/tile/demo.rb
index b604410da4..260ca00022 100644
--- a/ext/tk/sample/tkextlib/tile/demo.rb
+++ b/ext/tk/sample/tkextlib/tile/demo.rb
@@ -20,13 +20,21 @@ def version?(ver)
   TkPackage.vcompare(Tk::Tile.package_version, ver) >= 0
 end
 
+# define Tcl/Tk procedures for compatibility
+Tk::Tile.__define_LoadImages_proc_for_compatibility__!
+Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
+
+unless Tk::Tile::Style.theme_names.include?('step')
+  Tk::Tile::Style.theme_create('step')
+end
+
 Tk.load_tclscript(File.join(demodir, 'toolbutton.tcl'))
 Tk.load_tclscript(File.join(demodir, 'repeater.tcl'))
 
 # This forces an update of the available packages list. It's required
 # for package names to find the themes in demos/themes/*.tcl
 ## Tk.tk_call(TkPackage.unknown_proc, 'Tcl', TkPackage.provide('Tcl'))
-##  --> This doesn't work. 
+##  --> This doesn't work.
 ##      Because, unknown_proc may be "command + some arguments".
 Tk.ip_eval("#{TkPackage.unknown_proc}  Tcl #{TkPackage.provide('Tcl')}")
 
@@ -37,25 +45,25 @@ TkRoot.new{
 
 # The descriptive names of the builtin themes.
 $THEMELIST = [
-  ['default', 'Default'], 
-  ['classic', 'Classic'], 
-  ['alt', 'Revitalized'], 
-  ['winnative', 'Windows native'], 
-  ['xpnative', 'XP Native'], 
-  ['aqua', 'Aqua'], 
+  ['default', 'Default'],
+  ['classic', 'Classic'],
+  ['alt', 'Revitalized'],
+  ['winnative', 'Windows native'],
+  ['xpnative', 'XP Native'],
+  ['aqua', 'Aqua'],
 ]
 
-$V = TkVariable.new_hash(:THEME      => 'default', 
-                         :COMPOUND   => 'top', 
-                         :CONSOLE    => false, 
-                         :MENURADIO1 => 'One', 
+$V = TkVariable.new_hash(:THEME      => 'default',
+                         :COMPOUND   => 'top',
+                         :CONSOLE    => false,
+                         :MENURADIO1 => 'One',
                          :MENUCHECK1 => true,
                          :PBMODE     => 'determinate',
                          :SELECTED   => true,
                          :CHOICE     => 2)
 
 # Add in any available loadable themes.
-TkPackage.names.find_all{|n| n =~ /^tile::theme::/}.each{|pkg|
+TkPackage.names.find_all{|n| n =~ /^(tile|ttk)::theme::/}.each{|pkg|
   name = pkg.split('::')[-1]
   unless $THEMELIST.assoc(name)
     $THEMELIST << [name, Tk.tk_call('string', 'totitle', name)]
@@ -66,7 +74,8 @@ TkPackage.names.find_all{|n| n =~ /^tile::theme::/}.each{|pkg|
 $RUBY_THEMELIST = []
 begin
   load(File.join(demodir, 'themes', 'kroc.rb'), true)
-rescue
+rescue => e
+raise e
   $RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', false]
 else
   $RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', true]
@@ -75,20 +84,20 @@ end
 def makeThemeControl(parent)
   c = Tk::Tile::Labelframe.new(parent, :text=>'Theme')
   $THEMELIST.each{|theme, name|
-    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme, 
-                                  :variable=>$V.ref(:THEME), 
+    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
+                                  :variable=>$V.ref(:THEME),
                                   :command=>proc{setTheme(theme)})
     b.grid(:sticky=>:ew)
-    unless (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
-      b.state(:disabled)
+    unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
+      b.ttk_state(:disabled)
     end
   }
   $RUBY_THEMELIST.each{|theme, name, available|
-    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme, 
-                                  :variable=>$V.ref(:THEME), 
+    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
+                                  :variable=>$V.ref(:THEME),
                                   :command=>proc{setTheme(theme)})
     b.grid(:sticky=>:ew)
-    b.state(:disabled) unless available
+    b.ttk_state(:disabled) unless available
   }
   c
 end
@@ -96,14 +105,14 @@ end
 def makeThemeMenu(parent)
   m = TkMenu.new(parent)
   $THEMELIST.each{|theme, name|
-    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME), 
+    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
           :value=>theme, :command=>proc{setTheme(theme)})
-    unless (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
+    unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
       m.entryconfigure(:end, :state=>:disabled)
     end
   }
   $RUBY_THEMELIST.each{|theme, name, available|
-    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME), 
+    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
           :value=>theme, :command=>proc{setTheme(theme)})
     m.entryconfigure(:end, :state=>:disabled) unless available
   }
@@ -111,8 +120,10 @@ def makeThemeMenu(parent)
 end
 
 def setTheme(theme)
-  if (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
-    TkPackage.require("tile::theme::#{theme}")
+  if (pkg = TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
+    unless Tk::Tile::Style.theme_names.find{|n| n == theme}
+      TkPackage.require(pkg)
+    end
   end
   Tk::Tile::Style.theme_use(theme)
 end
@@ -163,7 +174,7 @@ def sbstub(sb, cmd, num, units = 'units')
     current = sb.get
     sb.set(current[0] + delta * num, current[1] + delta * num)
   end
-end    
+end
 
 # ... for debugging:
 TkBindTag::ALL.bind('ButtonPress-3', proc{|w| $W = w}, '%W')
@@ -198,21 +209,21 @@ def makeToolbars
   i = 0
   $BUTTONS.each{|icon|
     i += 1
-    Tk::Tile::Button.new(tb, :text=>icon, :image=>$ICON[icon], 
-                         :compound=>$V[:COMPOUND], 
-                         :style=>:Toolbutton).grid(:row=>0, :column=>i, 
+    Tk::Tile::Button.new(tb, :text=>icon, :image=>$ICON[icon],
+                         :compound=>$V[:COMPOUND],
+                         :style=>:Toolbutton).grid(:row=>0, :column=>i,
                                                    :sticky=>:news)
   }
   $CHECKBOXES.each{|icon|
     i += 1
-    Tk::Tile::Checkbutton.new(tb, :text=>icon, :image=>$ICON[icon], 
-                              :variable=>$V.ref(icon), 
-                              :compound=>$V[:COMPOUND], 
-                              :style=>:Toolbutton).grid(:row=>0, :column=>i, 
+    Tk::Tile::Checkbutton.new(tb, :text=>icon, :image=>$ICON[icon],
+                              :variable=>$V.ref(icon),
+                              :compound=>$V[:COMPOUND],
+                              :style=>:Toolbutton).grid(:row=>0, :column=>i,
                                                         :sticky=>:news)
   }
 
-  mb = Tk::Tile::Menubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'], 
+  mb = Tk::Tile::Menubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
                                 :compound=>$V[:COMPOUND])
   mb.configure(:menu=>makeCompoundMenu(mb))
   i += 1
@@ -229,21 +240,21 @@ def makeToolbars
   i = 0
   $BUTTONS.each{|icon|
     i += 1
-    TkButton.new(tb, :text=>icon, :image=>$ICON[icon], 
-                 :compound=>$V[:COMPOUND], :relief=>:flat, 
-                 :overrelief=>:raised).grid(:row=>0, :column=>i, 
+    TkButton.new(tb, :text=>icon, :image=>$ICON[icon],
+                 :compound=>$V[:COMPOUND], :relief=>:flat,
+                 :overrelief=>:raised).grid(:row=>0, :column=>i,
                                             :sticky=>:news)
   }
   $CHECKBOXES.each{|icon|
     i += 1
-    TkCheckbutton.new(tb, :text=>icon, :image=>$ICON[icon], 
-                      :variable=>$V.ref(icon), :compound=>$V[:COMPOUND], 
-                      :indicatoron=>false, :selectcolor=>'', :relief=>:flat, 
-                      :overrelief=>:raised).grid(:row=>0, :column=>i, 
+    TkCheckbutton.new(tb, :text=>icon, :image=>$ICON[icon],
+                      :variable=>$V.ref(icon), :compound=>$V[:COMPOUND],
+                      :indicatoron=>false, :selectcolor=>'', :relief=>:flat,
+                      :overrelief=>:raised).grid(:row=>0, :column=>i,
                                                  :sticky=>:news)
   }
 
-  mb = TkMenubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'], 
+  mb = TkMenubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
                         :compound=>$V[:COMPOUND])
   mb.configure(:menu=>makeCompoundMenu(mb))
   i += 1
@@ -259,8 +270,8 @@ end
 def makeCompoundMenu(mb)
   menu = TkMenu.new(mb)
   %w(text image none top bottom left right center).each{|str|
-    menu.add(:radiobutton, :label=>Tk.tk_call('string', 'totitle', str), 
-             :variable=>$V.ref(:COMPOUND), :value=>str, 
+    menu.add(:radiobutton, :label=>Tk.tk_call('string', 'totitle', str),
+             :variable=>$V.ref(:COMPOUND), :value=>str,
              :command=>proc{ changeToolbars() })
   }
   menu
@@ -278,7 +289,7 @@ makeThemeControl(control).grid(:sticky=>:news, :padx=>6, :ipadx=>6)
 control.grid_rowconfigure(99, :weight=>1)
 
 def changeToolbars
-  foreachWidget($TOOLBARS, 
+  foreachWidget($TOOLBARS,
                 proc{|w|
                   begin
                     w.compound($V[:COMPOUND])
@@ -339,7 +350,7 @@ nb, client, scales, combo, tree, others = makeNotebook()
 #
 def fillMenu(menu)
   %w(above below left right flush).each{|dir|
-    menu.add(:command, :label=>Tk.tk_call('string', 'totitle', dir), 
+    menu.add(:command, :label=>Tk.tk_call('string', 'totitle', dir),
              :command=>proc{ menu.winfo_parent.direction(dir) })
   }
   menu.add(:cascade, :label=>'Submenu', :menu=>(submenu = TkMenu.new(menu)))
@@ -355,14 +366,14 @@ l = Tk::Tile::Labelframe.new(client, :text=>'Themed', :padding=>6)
 r = TkLabelframe.new(client, :text=>'Standard', :padx=>6, :pady=>6)
 
 ## Styled frame
-cb = Tk::Tile::Checkbutton.new(l, :text=>'Checkbutton', 
+cb = Tk::Tile::Checkbutton.new(l, :text=>'Checkbutton',
                                :variable=>$V.ref(:SELECTED), :underline=>2)
-rb1 = Tk::Tile::Radiobutton.new(l, :text=>'One', :variable=>$V.ref(:CHOICE), 
+rb1 = Tk::Tile::Radiobutton.new(l, :text=>'One', :variable=>$V.ref(:CHOICE),
                                 :value=>1, :underline=>0)
-rb2 = Tk::Tile::Radiobutton.new(l, :text=>'Two', :variable=>$V.ref(:CHOICE), 
+rb2 = Tk::Tile::Radiobutton.new(l, :text=>'Two', :variable=>$V.ref(:CHOICE),
                                 :value=>2)
-rb3 = Tk::Tile::Radiobutton.new(l, :text=>'Three', 
-                                :variable=>$V.ref(:CHOICE), 
+rb3 = Tk::Tile::Radiobutton.new(l, :text=>'Three',
+                                :variable=>$V.ref(:CHOICE),
                                 :value=>3, :underline=>0)
 btn = Tk::Tile::Button.new(l, :text=>'Button', :underline=>0)
 
@@ -375,9 +386,9 @@ $entryText = TkVariable.new('Entry widget')
 e = Tk::Tile::Entry.new(l, :textvariable=>$entryText)
 e.selection_range(6, :end)
 
-ltext_f, ltext = scrolledWidget(l, TkText, true, 
+ltext_f, ltext = scrolledWidget(l, TkText, true,
                                 :width=>12, :height=>5, :wrap=>:none)
-# NOTE TO MAINTAINERS: 
+# NOTE TO MAINTAINERS:
 # The checkbuttons are -sticky ew / -expand x  on purpose:
 # it demonstrates one of the differences between TCheckbuttons
 # and standard checkbuttons.
@@ -396,11 +407,11 @@ TkGrid.rowconfigure(l, 7, :weight=>1) # text widget (grid is a PITA)
 
 ## Orig frame
 cb = TkCheckbutton.new(r, :text=>'Checkbutton', :variable=>$V.ref(:SELECTED))
-rb1 = TkRadiobutton.new(r, :text=>'One', 
+rb1 = TkRadiobutton.new(r, :text=>'One',
                         :variable=>$V.ref(:CHOICE), :value=>1)
-rb2 = TkRadiobutton.new(r, :text=>'Two', :variable=>$V.ref(:CHOICE), 
+rb2 = TkRadiobutton.new(r, :text=>'Two', :variable=>$V.ref(:CHOICE),
                         :value=>2, :underline=>1)
-rb3 = TkRadiobutton.new(r, :text=>'Three', 
+rb3 = TkRadiobutton.new(r, :text=>'Three',
                         :variable=>$V.ref(:CHOICE), :value=>3)
 btn = TkButton.new(r, :text=>'Button')
 
@@ -409,14 +420,14 @@ m = TkMenu.new(mb)
 mb.menu(m)
 $V[:rmbIndicatoron] = mb.indicatoron
 m.add(:checkbutton, :label=>'Indicator?', #'
-      :variable=>$V.ref(:rmbIndicatoron), 
+      :variable=>$V.ref(:rmbIndicatoron),
       :command=>proc{mb.indicatoron($V[:rmbIndicatoron])})
 m.add(:separator)
 fillMenu(m)
 
 e = TkEntry.new(r, :textvariable=>$entryText)
 
-rtext_f, rtext = scrolledWidget(r, TkText, false, 
+rtext_f, rtext = scrolledWidget(r, TkText, false,
                                 :width=>12, :height=>5, :wrap=>:none)
 
 Tk.grid(cb, :sticky=>:ew)
@@ -439,9 +450,9 @@ TkGrid.columnconfigure(client, [0, 1], :weight=>1)
 # Add some text to the text boxes:
 #
 msgs = [
-"The cat crept into the crypt, crapped and crept out again", 
-"Peter Piper picked a peck of pickled peppers", 
-"How much wood would a woodchuck chuck if a woodchuck could chuck wood", 
+"The cat crept into the crypt, crapped and crept out again",
+"Peter Piper picked a peck of pickled peppers",
+"How much wood would a woodchuck chuck if a woodchuck could chuck wood",
 "He thrusts his fists against the posts and still insists he sees the ghosts",
 "Who put the bomb in the bom-b-bom-b-bom,",
 "Is this your sister's sixth zither, sir?",
@@ -482,8 +493,8 @@ if version?('0.6')
     scale.command {|value| progress.value(value)}
     vscale.command {|value| progress.inverted(vprogress, value) }
   else
-    # This would also work, but the Tk scale widgets 
-    # in the right hand pane cause some interference when 
+    # This would also work, but the Tk scale widgets
+    # in the right hand pane cause some interference when
     # in autoincrement/indeterminate mode.
     #
     progress.variable $V.ref(:SCALE)
@@ -598,10 +609,10 @@ scales.grid_rowconfigure(0, :weight=>1)
 # Command box:
 #
 cmd = Tk::Tile::Frame.new($BASE)
-b_close = Tk::Tile::Button.new(cmd, :text=>'Close', 
-                               :underline=>0, :default=>:normal, 
+b_close = Tk::Tile::Button.new(cmd, :text=>'Close',
+                               :underline=>0, :default=>:normal,
                                :command=>proc{Tk.root.destroy})
-b_help = Tk::Tile::Button.new(cmd, :text=>'Help', :underline=>0, 
+b_help = Tk::Tile::Button.new(cmd, :text=>'Help', :underline=>0,
                               :default=>:normal, :command=>proc{showHelp()})
 Tk.grid('x', b_close, b_help, :pady=>[6, 4], :padx=>4)
 TkGrid.columnconfigure(cmd, 0, :weight=>1)
@@ -628,20 +639,20 @@ menu = TkMenu.new($BASE)
 $ROOT.menu(menu)
 m_file = TkMenu.new(menu, :tearoff=>0)
 menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
-m_file.add(:command, :label=>'Open', :underline=>0, 
+m_file.add(:command, :label=>'Open', :underline=>0,
            :compound=>:left, :image=>$ICON['open'])
-m_file.add(:command, :label=>'Save', :underline=>0, 
+m_file.add(:command, :label=>'Save', :underline=>0,
            :compound=>:left, :image=>$ICON['save'])
 m_file.add(:separator)
 m_f_test = TkMenu.new(menu, :tearoff=>0)
 m_file.add(:cascade, :label=>'Test submenu', :underline=>0, :menu=>m_f_test)
-m_file.add(:checkbutton, :label=>'Text check', :underline=>5, 
+m_file.add(:checkbutton, :label=>'Text check', :underline=>5,
            :variable=>$V.ref(:MENUCHECK1))
 m_file.insert(:end, :separator)
 
 if Tk.windowingsystem != 'x11'
   TkConsole.create
-  m_file.insert(:end, :checkbutton, :label=>'Console', :underline=>5, 
+  m_file.insert(:end, :checkbutton, :label=>'Console', :underline=>5,
                 :variable=>$V.ref(:CONSOLE), :command=>proc{toggle_console()})
   def toggle_console
     if TkComm.bool($V[:CONSOLE])
@@ -652,7 +663,7 @@ if Tk.windowingsystem != 'x11'
   end
 end
 
-m_file.add(:command, :label=>'Exit', :underline=>1, 
+m_file.add(:command, :label=>'Exit', :underline=>1,
            :command=>proc{Tk.event_generate(b_close, '<Invoke>')})
 
 %w(One Two Three Four).each{|lbl|
@@ -661,7 +672,7 @@ m_file.add(:command, :label=>'Exit', :underline=>1,
 
 # Add Theme menu.
 #
-menu.add(:cascade, :label=>'Theme', :underline=>3, 
+menu.add(:cascade, :label=>'Theme', :underline=>3,
          :menu=>makeThemeMenu(menu))
 
 setTheme($V[:THEME])
@@ -675,7 +686,7 @@ values = %w(list abc def ghi jkl mno pqr stu vwx yz)
     combo, :values=>values, :textvariable=>$V.ref(:COMBO))
   cb.pack(:side=>:top, :padx=>2, :pady=>2, :expand=>false, :fill=>:x)
   if i == 1
-    cb.state :readonly
+    cb.ttk_state :readonly
     begin
       cb.current = 3 # ignore if unsupported (tile0.4)
     rescue
@@ -699,7 +710,7 @@ if version?('0.5')
   tree.grid_rowconfigure(0, :weight=>1)
   tree.grid_propagate(0)
 
-  # Add initial tree node: 
+  # Add initial tree node:
   # Later nodes will be added in <<TreeviewOpen>> binding.
   treeview.insert('', 0, :id=>'.', :text=>'Main Window', :open=>false,
       :values=>[TkWinfo.classname('.')])
@@ -747,20 +758,20 @@ showDescription.bind('Enter', proc{|w| msg.text($Desc[w.path])}, '%W')
 showDescription.bind('Leave', proc{|w| msg.text('')}, '%W')
 
 [
-  [ :trackStates, "Widget states...",  
-    "Display/modify widget state bits" ], 
+  [ :trackStates, "Widget states...",
+    "Display/modify widget state bits" ],
 
-  [ :scrollbarResizeDemo,  "Scrollbar resize behavior...", 
-    "Shows how Tile and standard scrollbars differ when they're sized too large" ], 
+  [ :scrollbarResizeDemo,  "Scrollbar resize behavior...",
+    "Shows how Tile and standard scrollbars differ when they're sized too large" ],
 
-  [ :trackFocus, "Track keyboard focus..." , 
+  [ :trackFocus, "Track keyboard focus..." ,
     "Display the name of the widget that currently has focus" ],
 
   [ :repeatDemo, "Repeating buttons...",
     "Demonstrates custom classes (see demos/repeater.tcl)" ]
 
 ].each{|demo_cmd, label, description|
-  b = Tk::Tile::Button.new(others, :text=>label, 
+  b = Tk::Tile::Button.new(others, :text=>label,
                            :command=>proc{ self.__send__(demo_cmd) })
   $Desc[b.path] = description
   b.bindtags <<= showDescription
@@ -814,16 +825,16 @@ def trackFocus
   $focus = TkToplevel.new(:title=>'Keyboard focus')
   i = 0
   [
-    ["Focus widget:", :Widget], 
-    ["Class:", :WidgetClass], 
-    ["Next:", :WidgetNext], 
-    ["Grab:", :Grab], 
+    ["Focus widget:", :Widget],
+    ["Class:", :WidgetClass],
+    ["Next:", :WidgetNext],
+    ["Grab:", :Grab],
     ["Status:", :GrabStatus]
   ].each{|label, var_index|
-    Tk.grid(Tk::Tile::Label.new($focus, :text=>label, :anchor=>:e), 
-            Tk::Tile::Label.new($focus, 
-                                :textvariable=>$FocusInf.ref(var_index), 
-                                :width=>40, :anchor=>:w, :relief=>:groove), 
+    Tk.grid(Tk::Tile::Label.new($focus, :text=>label, :anchor=>:e),
+            Tk::Tile::Label.new($focus,
+                                :textvariable=>$FocusInf.ref(var_index),
+                                :width=>40, :anchor=>:w, :relief=>:groove),
             :sticky=>:ew)
     i += 1
   }
@@ -846,7 +857,7 @@ def focusMonitor
   $FocusInf[:Grab] = grab_wins = Tk.current_grabs
   unless grab_wins.empty?
     $FocusInf[:GrabStatus] = grab_wins[0].grab_status
-  else  
+  else
     $FocusInf[:GrabStatus] = ''
   end
 
@@ -858,13 +869,13 @@ end
 #
 $Widget = TkVariable.new
 
-TkBindTag::ALL.bind('Control-Shift-ButtonPress-1', 
+TkBindTag::ALL.bind('Control-Shift-ButtonPress-1',
                     proc{|w|
                       $Widget.value = w
                       updateStates()
                       Tk.callback_break
                     }, '%W')
-$states_list = %w(active disabled focus pressed selected 
+$states_list = %w(active disabled focus pressed selected
                   background indeterminate invalid default)
 $states_btns = {}
 $states = nil
@@ -882,17 +893,17 @@ def trackStates
 
   l_inf = Tk::Tile::Label.new($states, :text=>"Press Control-Shift-Button-1 on any widget")
 
-  l_lw = Tk::Tile::Label.new($states, :text=>'Widget:', 
+  l_lw = Tk::Tile::Label.new($states, :text=>'Widget:',
                              :anchor=>:e, :relief=>:groove)
-  l_w = Tk::Tile::Label.new($states, :textvariable=>$Widget, 
+  l_w = Tk::Tile::Label.new($states, :textvariable=>$Widget,
                              :anchor=>:w, :relief=>:groove)
 
   Tk.grid(l_inf, '-', :sticky=>:ew, :padx=>6, :pady=>6)
   Tk.grid(l_lw, l_w, :sticky=>:ew)
 
   $states_list.each{|st|
-    cb = Tk::Tile::Checkbutton.new($states, :text=>st, 
-                                   :variable=>$State.ref(st), 
+    cb = Tk::Tile::Checkbutton.new($states, :text=>st,
+                                   :variable=>$State.ref(st),
                                    :command=>proc{ changeState(st) })
     $states_btns[st] = cb
     Tk.grid('x', cb, :sticky=>:nsew)
@@ -903,7 +914,7 @@ def trackStates
   f_cmd = Tk::Tile::Frame.new($states)
   Tk.grid('x', f_cmd, :sticky=>:nse)
 
-  b_close = Tk::Tile::Button.new(f_cmd, :text=>'Close', 
+  b_close = Tk::Tile::Button.new(f_cmd, :text=>'Close',
                                  :command=>proc{ $states.destroy })
   Tk.grid('x', b_close, :padx=>4, :pady=>[6,4])
   f_cmd.grid_columnconfigure(0, :weight=>1)
@@ -922,11 +933,11 @@ end
 def updateStates
   $states_list.each{|st|
     begin
-      $State[st] = $Widget.window.instate(st)
+      $State[st] = $Widget.window.ttk_instate(st)
     rescue
-      $states_btns[st].state('disabled')
+      $states_btns[st].ttk_state('disabled')
     else
-      $states_btns[st].state('!disabled')
+      $states_btns[st].ttk_state('!disabled')
     end
   }
 end
@@ -934,9 +945,9 @@ end
 def changeState(st)
   if $Widget.value != ''
     if $State.bool_element(st)
-      $Widget.window.state(st)
+      $Widget.window.ttk_state(st)
     else
-      $Widget.window.state("!#{st}")
+      $Widget.window.ttk_state("!#{st}")
     end
   end
 end
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
index 19ddda7c73..4facac70d8 100644
--- a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
+++ b/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
@@ -1,6 +1,6 @@
 # Package index for tile demo pixmap themes.
 
 if {[file isdirectory [file join $dir blue]]} {
-    package ifneeded tile::theme::blue 0.0.1 \
+    package ifneeded tile::theme::blue 0.7 \
         [list source [file join $dir blue.tcl]]
 }
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc.rb b/ext/tk/sample/tkextlib/tile/themes/kroc.rb
index f67ce7a897..72a7c6901d 100644
--- a/ext/tk/sample/tkextlib/tile/themes/kroc.rb
+++ b/ext/tk/sample/tkextlib/tile/themes/kroc.rb
@@ -1,5 +1,5 @@
 #
-# kroc.rb 
+# kroc.rb
 #
 # based on:
 #   >> kroc.tcl - Copyright (C) 2004 David Zolli <kroc@kroc.tk>
@@ -15,30 +15,30 @@ else
 end
 
 def kroc_rb_settings
-  # Tk::Tile::Style.default(TkRoot, :background=>'#FCB64F', 
+  # Tk::Tile::Style.default(TkRoot, :background=>'#FCB64F',
   #                         :troughcolor=>'#F8C278', :borderwidth=>1)
   #   or
-  # Tk::Tile::Style.default(Tk.root, :background=>'#FCB64F', 
+  # Tk::Tile::Style.default(Tk.root, :background=>'#FCB64F',
   #                         :troughcolor=>'#F8C278', :borderwidth=>1)
   #   or
-  # Tk::Tile::Style.default('.', :background=>'#FCB64F', 
+  # Tk::Tile::Style.default('.', :background=>'#FCB64F',
   #                         :troughcolor=>'#F8C278', :borderwidth=>1)
   #   or
-  # Tk::Tile::Style.default(nil, :background=>'#FCB64F', 
+  # Tk::Tile::Style.default(nil, :background=>'#FCB64F',
   #                         :troughcolor=>'#F8C278', :borderwidth=>1)
   #   or
-  Tk::Tile::Style.default(:background=>'#FCB64F', :troughcolor=>'#F8C278', 
+  Tk::Tile::Style.default(:background=>'#FCB64F', :troughcolor=>'#F8C278',
                           :borderwidth=>1)
-  # Tk::Tile::Style.default(TkRoot, :font=>Tk::Tile::Font::Default, 
+  # Tk::Tile::Style.default(TkRoot, :font=>Tk::Tile::Font::Default,
   #                         :borderwidth=>1)
   #   or
-  # Tk::Tile::Style.default(Tk.root, :font=>Tk::Tile::Font::Default, 
+  # Tk::Tile::Style.default(Tk.root, :font=>Tk::Tile::Font::Default,
   #                         :borderwidth=>1)
   #   or
-  # Tk::Tile::Style.default('.', :font=>Tk::Tile::Font::Default, 
+  # Tk::Tile::Style.default('.', :font=>Tk::Tile::Font::Default,
   #                         :borderwidth=>1)
   #   or
-  # Tk::Tile::Style.default(nil, :font=>Tk::Tile::Font::Default, 
+  # Tk::Tile::Style.default(nil, :font=>Tk::Tile::Font::Default,
   #                         :borderwidth=>1)
   #   or
   Tk::Tile::Style.default(:font=>Tk::Tile::Font::Default, :borderwidth=>1)
@@ -57,37 +57,37 @@ def kroc_rb_settings
   # Tk::Tile::Style.default('TButton', :padding=>[10,4])
   Tk::Tile::Style.default(Tk::Tile::TButton, :padding=>[10,4])
 
-  # Tk::Tile::Style.default('TNotebook.Tab', 
-  Tk::Tile::Style.default($TNotebook_Tab, 
+  # Tk::Tile::Style.default('TNotebook.Tab',
+  Tk::Tile::Style.default($TNotebook_Tab,
                           :padding=>[10, 3], :font=>Tk::Tile::Font::Default)
-  # Tk::Tile::Style.map('TNotebook.Tab', 
-  Tk::Tile::Style.map($TNotebook_Tab, 
-                      :background=>[:selected, '#FCB64F', '', '#FFE6BA'], 
-                      :foreground=>['', 'black'], 
+  # Tk::Tile::Style.map('TNotebook.Tab',
+  Tk::Tile::Style.map($TNotebook_Tab,
+                      :background=>[:selected, '#FCB64F', '', '#FFE6BA'],
+                      :foreground=>['', 'black'],
                       :padding=>[:selected, [10, 6, 10, 3]])
 
-  # Tk::Tile::Style.map('TScrollbar', 
-  Tk::Tile::Style.map(Tk::Tile::TScrollbar, 
-                      :background=>[:pressed, '#694418'], 
-                      :arrowcolor=>[:pressed, '#FEF7CB'], 
+  # Tk::Tile::Style.map('TScrollbar',
+  Tk::Tile::Style.map(Tk::Tile::TScrollbar,
+                      :background=>[:pressed, '#694418'],
+                      :arrowcolor=>[:pressed, '#FEF7CB'],
                       :relief=>[:pressed, :sunken])
 
-  # Tk::Tile::Style.layout('Vertical.TScrollbar', 
-  Tk::Tile::Style.layout(Tk::Tile.style('Vertical', Tk::Tile::TScrollbar), 
+  # Tk::Tile::Style.layout('Vertical.TScrollbar',
+  Tk::Tile::Style.layout(Tk::Tile.style('Vertical', Tk::Tile::TScrollbar),
                          ['Scrollbar.trough', {:children=>[
-                             'Scrollbar.uparrow',   {:side=>:top}, 
-                             'Scrollbar.downarrow', {:side=>:bottom}, 
-                             'Scrollbar.uparrow',   {:side=>:bottom}, 
+                             'Scrollbar.uparrow',   {:side=>:top},
+                             'Scrollbar.downarrow', {:side=>:bottom},
+                             'Scrollbar.uparrow',   {:side=>:bottom},
                              'Scrollbar.thumb',  {:side=>:top, :expand=>true}
                            ]}
                          ])
 
-  # Tk::Tile::Style.layout('Horizontal.TScrollbar', 
-  Tk::Tile::Style.layout(Tk::Tile.style('Horizontal', Tk::Tile::TScrollbar), 
+  # Tk::Tile::Style.layout('Horizontal.TScrollbar',
+  Tk::Tile::Style.layout(Tk::Tile.style('Horizontal', Tk::Tile::TScrollbar),
                          ['Scrollbar.trough', {:children=>[
-                             'Scrollbar.leftarrow',   {:side=>:left}, 
-                             'Scrollbar.rightarrow', {:side=>:right}, 
-                             'Scrollbar.leftarrow',   {:side=>:right}, 
+                             'Scrollbar.leftarrow',   {:side=>:left},
+                             'Scrollbar.rightarrow', {:side=>:right},
+                             'Scrollbar.leftarrow',   {:side=>:right},
                              'Scrollbar.thumb',  {:side=>:left, :expand=>true}
                            ]}
                          ])
@@ -95,16 +95,43 @@ def kroc_rb_settings
   #
   # Elements:
   #
-  if TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0
+  if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
+    Tk::Tile::Style.element_create('Button.button',
+                                   :image,
+                                   [ $images['button-n'],
+                                     :pressed, $images['button-p'],
+                                     :active,  $images['button-h'],
+                                   ], :border=>3, :sticky=>:ew)
 
-    Tk::Tile::Style.element_create('Button.button', 
+    Tk::Tile::Style.element_create('Checkbutton.indicator',
+                                   :image,
+                                   [ $images['check-nu'],
+                                     [:pressed, :selected],$images['check-nc'],
+                                     :pressed,             $images['check-nu'],
+                                     [:active, :selected], $images['check-hc'],
+                                     :active,              $images['check-hu'],
+                                     :selected,            $images['check-nc'],
+                                   ], :sticky=>:w)
+
+    Tk::Tile::Style.element_create('Radiobutton.indicator',
+                                   :image,
+                                   [ $images['radio-nu'],
+                                     [:pressed,:selected],$images['radio-nc'],
+                                     :pressed,            $images['radio-nu'],
+                                     [:active,:selected], $images['radio-hc'],
+                                     :active,             $images['radio-hu'],
+                                     :selected,           $images['radio-nc'],
+                                   ], :sticky=>:w)
+
+  elsif TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0
+    Tk::Tile::Style.element_create('Button.button',
                                    :image, $images['button-n'],
                                    :map=>[
-                                     :pressed, $images['button-p'], 
-                                     :active,  $images['button-h'], 
+                                     :pressed, $images['button-p'],
+                                     :active,  $images['button-h'],
                                    ], :border=>3, :sticky=>:ew)
 
-    Tk::Tile::Style.element_create('Checkbutton.indicator', 
+    Tk::Tile::Style.element_create('Checkbutton.indicator',
                                    :image, $images['check-nu'],
                                    :map=>[
                                      [:pressed, :selected],$images['check-nc'],
@@ -114,7 +141,7 @@ def kroc_rb_settings
                                      :selected,            $images['check-nc'],
                                    ], :sticky=>:w)
 
-    Tk::Tile::Style.element_create('Radiobutton.indicator', 
+    Tk::Tile::Style.element_create('Radiobutton.indicator',
                                    :image, $images['radio-nu'],
                                    :map=>[
                                      [:pressed, :selected],$images['radio-nc'],
@@ -125,15 +152,14 @@ def kroc_rb_settings
                                    ], :sticky=>:w)
 
   else # tile 0.4 or earlier
-
-    Tk::Tile::Style.element_create('Button.button', :pixmap, 
+    Tk::Tile::Style.element_create('Button.button', :pixmap,
                                    :images=>[
-                                     :pressed, $images['button-p'], 
-                                     :active,  $images['button-h'], 
+                                     :pressed, $images['button-p'],
+                                     :active,  $images['button-h'],
                                      '',       $images['button-n']
                                    ], :border=>3, :tiling=>:tile)
 
-    Tk::Tile::Style.element_create('Checkbutton.indicator', :pixmap, 
+    Tk::Tile::Style.element_create('Checkbutton.indicator', :pixmap,
                                    :images=>[
                                      [:pressed, :selected],$images['check-nc'],
                                      :pressed,             $images['check-nu'],
@@ -143,7 +169,7 @@ def kroc_rb_settings
                                      '',                   $images['check-nu'],
                                    ], :tiling=>:fixed)
 
-    Tk::Tile::Style.element_create('Radiobutton.indicator', :pixmap, 
+    Tk::Tile::Style.element_create('Radiobutton.indicator', :pixmap,
                                    :images=>[
                                      [:pressed, :selected],$images['radio-nc'],
                                      :pressed,             $images['radio-nu'],
@@ -158,7 +184,7 @@ def kroc_rb_settings
   #
   # Settings:
   #
-  # Tk::Tile::Style.layout(Tk::Tile::TButton, 
+  # Tk::Tile::Style.layout(Tk::Tile::TButton,
   Tk::Tile::Style.layout('TButton', [
       'Button.button', {:children=>[
            'Button.focus', {:children=>[
@@ -169,12 +195,12 @@ def kroc_rb_settings
       ]}
   ])
 
-  # Tk::Tile::Style.layout(Tk::Tile::TCheckbutton, 
+  # Tk::Tile::Style.layout(Tk::Tile::TCheckbutton,
   Tk::Tile::Style.layout('TCheckbutton', [
       'Checkbutton.background', # this is not needed in tile 0.5 or later
       'Checkbutton.border', {:children=>[
            'Checkbutton.padding', {:children=>[
-                'Checkbutton.indicator', {:side=>:left}, 
+                'Checkbutton.indicator', {:side=>:left},
                 'Checkbutton.focus', {:side=>:left, :children=>[
                     'Checkbutton.label'
                 ]}
@@ -182,12 +208,12 @@ def kroc_rb_settings
       ]}
   ])
 
-  # Tk::Tile::Style.layout(Tk::Tile::TRadiobutton, 
+  # Tk::Tile::Style.layout(Tk::Tile::TRadiobutton,
   Tk::Tile::Style.layout('TRadiobutton', [
       'Radiobutton.background', # this is not needed in tile 0.5 or later
       'Radiobutton.border', {:children=>[
            'Radiobutton.padding', {:children=>[
-                'Radiobutton.indicator', {:side=>:left}, 
+                'Radiobutton.indicator', {:side=>:left},
                 'Radiobutton.focus', {:expand=>true, :sticky=>:w, :children=>[
                     'Radiobutton.label', {:side=>:right, :expand=>true}
                 ]}
@@ -196,5 +222,5 @@ def kroc_rb_settings
   ])
 end
 
-Tk::Tile::Style.theme_create('kroc-rb', :parent=>'alt', 
+Tk::Tile::Style.theme_create('kroc-rb', :parent=>'alt',
                              :settings=>proc{ kroc_rb_settings() })
diff --git a/ext/tk/sample/tkextlib/tkHTML/hv.rb b/ext/tk/sample/tkextlib/tkHTML/hv.rb
index a4d78ea5b1..920eb15f5a 100644
--- a/ext/tk/sample/tkextlib/tkHTML/hv.rb
+++ b/ext/tk/sample/tkextlib/tkHTML/hv.rb
@@ -5,7 +5,7 @@
 #
 # This application is used for testing the HTML widget.  It can
 # also server as an example of how to use the HTML widget.
-# 
+#
 require 'tk'
 require 'tkextlib/tkHTML'
 
@@ -51,11 +51,11 @@ show_img = TkVariable.new(1)
 # html[:fontcommand] = pick_font
 pick_font = proc{|size, attrs|
   puts "FontCmd: #{size} #{attrs}"
-  [ ((attrs =~ /fixed/)? 'courier': 'charter'), 
-    (12 * (1.2**(size.to_f - 4.0))).to_i, 
-    ((attrs =~ /italic/)? 'italic': 'roman'), 
-    ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ') 
-} 
+  [ ((attrs =~ /fixed/)? 'courier': 'charter'),
+    (12 * (1.2**(size.to_f - 4.0))).to_i,
+    ((attrs =~ /italic/)? 'italic': 'roman'),
+    ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
+}
 
 #
 # This routine is called for each form element
@@ -126,7 +126,7 @@ script_cmd = proc{|*args|
 
 # This routine is called for every <APPLET> markup
 #
-applet_cmd = proc{|w, arglist| 
+applet_cmd = proc{|w, arglist|
   # puts "AppletCmd: w=#{w} arglist=#{arglist}"
   TkLabel.new(w, :text=>"The Applet #{w}", :bd=>2, :relief=>raised)
 }
@@ -134,12 +134,12 @@ applet_cmd = proc{|w, arglist|
 #
 # Construct the main HTML viewer
 #
-html = Tk::HTML_Widget.new(:padx=>5, :pady=>9, 
-                           :formcommand=>form_cmd, 
-                           :imagecommand=>image_cmd, 
-                           :scriptcommand=>script_cmd, 
-                           :appletcommand=>applet_cmd, 
-                           :underlinehyperlinks=>0, 
+html = Tk::HTML_Widget.new(:padx=>5, :pady=>9,
+                           :formcommand=>form_cmd,
+                           :imagecommand=>image_cmd,
+                           :scriptcommand=>script_cmd,
+                           :appletcommand=>applet_cmd,
+                           :underlinehyperlinks=>0,
                            :bg=>'white', :tablerelief=>:raised)
 vscr = html.yscrollbar(TkScrollbar.new)
 hscr = html.xscrollbar(TkScrollbar.new)
@@ -166,7 +166,7 @@ read_file = proc{|name|
   rescue
     ret = nil
     fp = nil
-    Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'", 
+    Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
                   :type=>:ok)
   ensure
     fp.close if fp
@@ -221,7 +221,7 @@ html.clipping_window.bind('1', href_binding, '%x %y')
 html.clipping_window.bind('B1-Motion', proc{|w, x, y|
                             w.selection_set(priv['mark'], "@#{x},#{y}")
                             TkClipboard.clear
-                            # avoid tkhtml0.0 errors 
+                            # avoid tkhtml0.0 errors
                             # anyone can fix this for tkhtml0.0
                             begin
                               TkClipboard.append(TkSelection.get)
@@ -235,7 +235,7 @@ html.clipping_window.bind('B1-Motion', proc{|w, x, y|
 last_dir = Dir.pwd
 sel_load = proc{
   filetypes = [
-    ['Html Files', ['.html', '.htm']], 
+    ['Html Files', ['.html', '.htm']],
     ['All Files', '*']
   ]
 
@@ -268,15 +268,15 @@ Tk::HTML_Widget::ClippingWindow.bind('Motion', proc{|w, x, y|
 # Setup menu
 #
 menu_spec = [
-  [['File', 0], 
-    ['Open',    sel_load, 0], 
-    ['Refresh', refresh,   0], 
+  [['File', 0],
+    ['Open',    sel_load, 0],
+    ['Refresh', refresh,   0],
     '---',
-    ['Exit', proc{exit}, 1]], 
+    ['Exit', proc{exit}, 1]],
 
-  [['View', 0], 
-    ['Underline Hyperlinks', ul_hyper], 
-    ['Show Table Structure', show_tbl], 
+  [['View', 0],
+    ['Underline Hyperlinks', ul_hyper],
+    ['Show Table Structure', show_tbl],
     ['Show Images',          show_img]]
 ]
 
@@ -285,7 +285,7 @@ mbar = Tk.root.add_menubar(menu_spec)
 #
 # Setup trace
 #
-ul_hyper.trace('w', proc{ 
+ul_hyper.trace('w', proc{
                  html[:underlinehyperlinks] = ul_hyper.value
                  refresh.call
                })
diff --git a/ext/tk/sample/tkextlib/tkHTML/ss.rb b/ext/tk/sample/tkextlib/tkHTML/ss.rb
index 1c13d7ac34..45d4d87d69 100644
--- a/ext/tk/sample/tkextlib/tkHTML/ss.rb
+++ b/ext/tk/sample/tkextlib/tkHTML/ss.rb
@@ -2,7 +2,7 @@
 #
 # This script implements the "ss" application.  "ss" implements
 # a presentation slide-show based on HTML slides.
-# 
+#
 require 'tk'
 require 'tkextlib/tkHTML'
 
@@ -45,18 +45,18 @@ EOD
 
     @key_block = false
 
-    Tk::HTML_Widget::ClippingWindow.bind('1', 
-                                         proc{|w, ksym| key_press(w, ksym)}, 
+    Tk::HTML_Widget::ClippingWindow.bind('1',
+                                         proc{|w, ksym| key_press(w, ksym)},
                                          '%W Down')
-    Tk::HTML_Widget::ClippingWindow.bind('3', 
-                                         proc{|w, ksym| key_press(w, ksym)}, 
+    Tk::HTML_Widget::ClippingWindow.bind('3',
+                                         proc{|w, ksym| key_press(w, ksym)},
                                          '%W Up')
-    Tk::HTML_Widget::ClippingWindow.bind('2', 
-                                         proc{|w, ksym| key_press(w, ksym)}, 
+    Tk::HTML_Widget::ClippingWindow.bind('2',
+                                         proc{|w, ksym| key_press(w, ksym)},
                                          '%W Down')
 
-    Tk::HTML_Widget::ClippingWindow.bind('KeyPress', 
-                                         proc{|w, ksym| key_press(w, ksym)}, 
+    Tk::HTML_Widget::ClippingWindow.bind('KeyPress',
+                                         proc{|w, ksym| key_press(w, ksym)},
                                          '%W %K')
 
     ############################################
@@ -64,37 +64,37 @@ EOD
     # Build the half-size view of the page
     #
     menu_spec = [
-      [['File', 0], 
-        ['Open',        proc{sel_load()},   0], 
-        ['Full Screen', proc{fullscreen()}, 0], 
-        ['Refresh',     proc{refresh()},    0], 
+      [['File', 0],
+        ['Open',        proc{sel_load()},   0],
+        ['Full Screen', proc{fullscreen()}, 0],
+        ['Refresh',     proc{refresh()},    0],
         '---',
         ['Exit', proc{exit}, 1]]
     ]
 
     mbar = @root.add_menubar(menu_spec)
 
-    @html = Tk::HTML_Widget.new(:width=>512, :height=>384, 
-                                :padx=>5, :pady=>9, 
+    @html = Tk::HTML_Widget.new(:width=>512, :height=>384,
+                                :padx=>5, :pady=>9,
                                 :formcommand=>proc{|*args| form_cmd(*args)},
                                 :imagecommand=>proc{|*args|
                                   image_cmd(1, *args)
-                                }, 
+                                },
                                 :scriptcommand=>proc{|*args|
                                   script_cmd(*args)
-                                }, 
+                                },
                                 :appletcommand=>proc{|*args|
                                   applet_cmd(*args)
-                                }, 
-                                :hyperlinkcommand=>proc{|*args| 
+                                },
+                                :hyperlinkcommand=>proc{|*args|
                                   hyper_cmd(*args)
-                                }, 
+                                },
                                 :fontcommand=>proc{|*args|
                                   pick_font(*args)
-                                }, 
+                                },
                                 :appletcommand=>proc{|*args|
                                   run_applet('small', *args)
-                                }, 
+                                },
                                 :bg=>'white', :tablerelief=>:raised)
 
     @html.token_handler('meta', proc{|*args| meta(@html, *args)})
@@ -127,9 +127,9 @@ EOD
   # html[:fontcommand] = pick_font
   def pick_font(size, attrs)
     # puts "FontCmd: #{size} #{attrs}"
-    [ ((attrs =~ /fixed/)? 'courier': 'charter'), 
-      (12 * (1.2**(size.to_f - 4.0))).to_i, 
-      ((attrs =~ /italic/)? 'italic': 'roman'), 
+    [ ((attrs =~ /fixed/)? 'courier': 'charter'),
+      (12 * (1.2**(size.to_f - 4.0))).to_i,
+      ((attrs =~ /italic/)? 'italic': 'roman'),
       ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
   end
 
@@ -139,9 +139,9 @@ EOD
     baseFontSize = 24
 
     # puts "FontCmd: #{size} #{attrs}"
-    [ ((attrs =~ /fixed/)? 'courier': 'charter'), 
-      (baseFontSize * (1.2**(size.to_f - 4.0))).to_i, 
-      ((attrs =~ /italic/)? 'italic': 'roman'), 
+    [ ((attrs =~ /fixed/)? 'courier': 'charter'),
+      (baseFontSize * (1.2**(size.to_f - 4.0))).to_i,
+      ((attrs =~ /italic/)? 'italic': 'roman'),
       ((attrs =~ /bold/)? 'bold': 'normal')  ].join(' ')
   end
 
@@ -244,7 +244,7 @@ EOD
   #
   def sel_load
     filetypes = [
-      ['Html Files', ['.html', '.htm']], 
+      ['Html Files', ['.html', '.htm']],
       ['All Files', '*']
     ]
 
@@ -280,7 +280,7 @@ EOD
     rescue
       ret = nil
       fp = nil
-      Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'", 
+      Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
                     :type=>:ok)
     ensure
       fp.close if fp
@@ -371,32 +371,32 @@ EOD
 
     width  =  @root.winfo_screenwidth
     height =  @root.winfo_screenheight
-    @fswin = TkToplevel.new(:overrideredirect=>true, 
+    @fswin = TkToplevel.new(:overrideredirect=>true,
                             :geometry=>"#{width}x#{height}+0+0")
 
-    @html_fs = Tk::HTML_Widget.new(@fswin, :padx=>5, :pady=>9, 
+    @html_fs = Tk::HTML_Widget.new(@fswin, :padx=>5, :pady=>9,
                                    :formcommand=>proc{|*args|
                                      form_cmd(*args)
                                    },
-                                   :imagecommand=>proc{|*args| 
+                                   :imagecommand=>proc{|*args|
                                      image_cmd(0, *args)
-                                   }, 
+                                   },
                                    :scriptcommand=>proc{|*args|
                                      script_cmd(*args)
-                                   }, 
+                                   },
                                    :appletcommand=>proc{|*args|
                                      applet_cmd(*args)
-                                   }, 
-                                   :hyperlinkcommand=>proc{|*args| 
+                                   },
+                                   :hyperlinkcommand=>proc{|*args|
                                      hyper_cmd(*args)
-                                   }, 
+                                   },
                                    :appletcommand=>proc{|*args|
                                      run_applet('big', *args)
-                                   }, 
+                                   },
                                    :fontcommand=>proc{|*args|
                                      pick_font_fs(*args)
-                                   }, 
-                                   :bg=>'white', :tablerelief=>:raised, 
+                                   },
+                                   :bg=>'white', :tablerelief=>:raised,
                                    :cursor=>:tcross) {
       pack(:fill=>:both, :expand=>true)
       token_handler('meta', proc{|*args| meta(self, *args)})
diff --git a/ext/tk/sample/tkextlib/tkimg/demo.rb b/ext/tk/sample/tkextlib/tkimg/demo.rb
index a0c4d1b64f..d453e8ee9d 100644
--- a/ext/tk/sample/tkextlib/tkimg/demo.rb
+++ b/ext/tk/sample/tkextlib/tkimg/demo.rb
@@ -2,7 +2,7 @@
 #
 #  Tk::Img demo
 #
-#    --  This script is based on demo.tcl of Tcl/Tk's 'Img' extention. 
+#    --  This script is based on demo.tcl of Tcl/Tk's 'Img' extention.
 #        Image data in this script is those of demo.tcl.
 #        Please read 'license_terms_of_Img_extension' file.
 #
@@ -85,7 +85,7 @@ class TkImg_demo
       Tk.update_idletasks
       Tk.after(20, proc{update_animated_gif(w, :image, 0)})
     rescue => e
-      w.configure(:text=>"error displaying animated gif:\n#{e.message}", 
+      w.configure(:text=>"error displaying animated gif:\n#{e.message}",
                   :image=>'', :relief=>:ridge)
     end
     w.pack
@@ -98,15 +98,15 @@ class TkImg_demo
       TkLabel.new(@typeFrame[fmt], :text=>"#{fmt} :  ").pack(:side=>:left)
     end
     begin
-      f = TkFrame.new(@typeFrame[fmt], 
+      f = TkFrame.new(@typeFrame[fmt],
                       :borderwidth=>2, :relief=>:ridge).pack(:side=>:left)
       im = TkPhotoImage.new(:data=>data)
       im['data'] = ''
       TkLabel.new(f, :image=>im).pack
-      TkLabel.new(f, :text=>type, :borderwidth=>0, :pady=>0, :padx=>2, 
+      TkLabel.new(f, :text=>type, :borderwidth=>0, :pady=>0, :padx=>2,
                   :font=>'Helvetica 8').pack
     rescue => e
-      TkMessage.new(f, :text=>"error displaying #{type} image: #{e.message}", 
+      TkMessage.new(f, :text=>"error displaying #{type} image: #{e.message}",
                     :aspect=>250).pack
     end
     Tk.update
diff --git a/ext/tk/sample/tkextlib/tktable/basic.rb b/ext/tk/sample/tkextlib/tktable/basic.rb
index 0d2d48893a..dddbb776dc 100644
--- a/ext/tk/sample/tkextlib/tktable/basic.rb
+++ b/ext/tk/sample/tkextlib/tktable/basic.rb
@@ -3,7 +3,7 @@
 ## basic.rb
 ##
 ## This demo shows the basic use of the table widget
-## 
+##
 ## ( based on 'basic.tcl' included source archive of tktable extension )
 ##
 require 'tk'
@@ -22,19 +22,19 @@ cols = 8
 
 lbl = TkLabel.new(:text=>"TkTable v1 Example")
 
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary, 
-                        :width=>6, :height=>6, 
-                        :titlerows=>1, :titlecols=>2, 
-                        :roworigin=>-1, :colorigin=>-2, 
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
+                        :width=>6, :height=>6,
+                        :titlerows=>1, :titlecols=>2,
+                        :roworigin=>-1, :colorigin=>-2,
                         :rowstretchmode=>:last, :colstretchmode=>:last,
                         :rowtagcommand=>proc{|row|
                           row = Integer(row)
                           (row>0 && row%2 == 1)? 'OddRow': ''
-                        }, 
+                        },
                         :coltagcommand=>proc{|col|
                           col = Integer(col)
                           (col>0 && col%2 == 1)? 'OddCol': ''
-                        }, 
+                        },
                         :selectmode=>:extended, :sparsearray=>false)
 
 sx = table.xscrollbar(TkScrollbar.new)
diff --git a/ext/tk/sample/tkextlib/tktable/buttons.rb b/ext/tk/sample/tkextlib/tktable/buttons.rb
index b21e8673c2..e35c137a28 100644
--- a/ext/tk/sample/tkextlib/tktable/buttons.rb
+++ b/ext/tk/sample/tkextlib/tktable/buttons.rb
@@ -14,11 +14,11 @@ tab  = TkVariable.new_hash
 rows = 20
 cols = 20
 
-table = Tk::TkTable.new(:rows=>rows + 1, :cols=>cols + 1, 
-                        :variable=>tab, :titlerows=>1, :titlecols=>1, 
-                        :roworigin=>-1, :colorigin=>-1, 
-                        :colwidth=>4, :width=>8, :height=>8, 
-                        :cursor=>'top_left_arrow', :borderwidth=>2, 
+table = Tk::TkTable.new(:rows=>rows + 1, :cols=>cols + 1,
+                        :variable=>tab, :titlerows=>1, :titlecols=>1,
+                        :roworigin=>-1, :colorigin=>-1,
+                        :colwidth=>4, :width=>8, :height=>8,
+                        :cursor=>'top_left_arrow', :borderwidth=>2,
                         :flashmode=>false, :state=>:disabled)
 
 sx = table.xscrollbar(TkScrollbar.new)
@@ -67,7 +67,7 @@ table.bind('1', proc{|w, x, y|
   0.step(cols){|j|
     if i == 0
       tab[-1,j] = j
-    end 
+    end
     tab[i,j] = "OFF"
     table.tag_cell('OFF', "#{i},#{j}")
   }
diff --git a/ext/tk/sample/tkextlib/tktable/command.rb b/ext/tk/sample/tkextlib/tktable/command.rb
index bf36159ccc..e697ccf3bf 100644
--- a/ext/tk/sample/tkextlib/tktable/command.rb
+++ b/ext/tk/sample/tkextlib/tktable/command.rb
@@ -27,7 +27,7 @@ current = TkLabel.new(:textvariable=>cur_var, :width=>5)
 ent_var = TkVariable.new
 entry = TkEntry.new(:textvariable=>ent_var)
 
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, 
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
                         :command=>[proc{|mode, cell, val|
                           if (mode == :w)
                             data[cell] = val
@@ -38,10 +38,10 @@ table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
                               ''          # not exist
                             end
                           end
-                        }, '%i %C %s'], 
-                        :width=>6, :height=>6, 
-                        :titlerows=>1, :titlecols=>1, 
-                        :roworigin=>-1, :colorigin=>-1, 
+                        }, '%i %C %s'],
+                        :width=>6, :height=>6,
+                        :titlerows=>1, :titlecols=>1,
+                        :roworigin=>-1, :colorigin=>-1,
                         :rowstretchmode=>:last, :colstretchmode=>:last,
                         :rowtagcommand=>proc{|row|
                           row = Integer(row)
@@ -50,20 +50,20 @@ table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
                         :coltagcommand=>proc{|col|
                           col = Integer(col)
                           (col>0 && col%2 == 1)? 'OddCol': ''
-                        }, 
-                        :selectmode=>:extended, :flashmode=>true, 
+                        },
+                        :selectmode=>:extended, :flashmode=>true,
                         :rowstretch=>:unset, :colstretch=>:unset,
                         :browsecommand=>[proc{|w, s|
                           cur_var.value = s
                           ent_var.value = w.get(s)
-                        }, '%W %S'], 
-                        :validate=>true, 
-                        :validatecommand=>proc{|e| 
+                        }, '%W %S'],
+                        :validate=>true,
+                        :validatecommand=>proc{|e|
                           ent_var.value = e.new_value; true
                         })
 =begin
                         :validatecommand=>[
-                          proc{|s| 
+                          proc{|s|
                             ent_var.value = s; true
                           }, '%S'])
 =end
diff --git a/ext/tk/sample/tkextlib/tktable/debug.rb b/ext/tk/sample/tkextlib/tktable/debug.rb
index d5cd5e49ba..016d5b353e 100644
--- a/ext/tk/sample/tkextlib/tktable/debug.rb
+++ b/ext/tk/sample/tkextlib/tktable/debug.rb
@@ -23,15 +23,15 @@ cols = 20
 
 lbl = TkLabel.new(:text=>"TkTable v2 Example")
 
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary, 
-                        :width=>6, :height=>6, 
-                        :titlerows=>1, :titlecols=>2, 
-                        :roworigin=>-5, :colorigin=>-2, 
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
+                        :width=>6, :height=>6,
+                        :titlerows=>1, :titlecols=>2,
+                        :roworigin=>-5, :colorigin=>-2,
                         :coltagcommand=>proc{|col|
                           col = Integer(col)
                           (col>0 && col%2 == 1)? 'OddCol': ''
-                        }, 
-                        :selectmode=>:extended, :flashmode=>true, 
+                        },
+                        :selectmode=>:extended, :flashmode=>true,
                         :rowstretch=>:unset, :colstretch=>:unset,
                         :selecttitles=>false, :drawmode=>:single)
 
@@ -67,8 +67,8 @@ table.tag_cell('logo', [1,2], [2,3], [4,1])
 table.tag_cell('dis', [2,1], [1,-1], [3,0])
 table.set_width([-2,8], [-1,9], [0, 12], [4, 14])
 
-table.set([1,1], "multi-line\ntext\nmight be\ninteresting", 
-          [3,2], "more\nmulti-line\nplaying\n", 
+table.set([1,1], "multi-line\ntext\nmight be\ninteresting",
+          [3,2], "more\nmulti-line\nplaying\n",
           [2,2], "null\0byte")
 
 # This is in the row span
diff --git a/ext/tk/sample/tkextlib/tktable/dynarows.rb b/ext/tk/sample/tkextlib/tktable/dynarows.rb
index d083e26559..cc72a021cf 100644
--- a/ext/tk/sample/tkextlib/tktable/dynarows.rb
+++ b/ext/tk/sample/tkextlib/tktable/dynarows.rb
@@ -5,7 +5,7 @@
 ## This demos shows the use of the validation mechanism of the table
 ## and uses the table's cache (no -command or -variable) with a cute
 ## dynamic row routine.
-## 
+##
 ## ( based on 'dynarows.tcl' included source archive of tktable extension )
 ##
 require 'tk'
@@ -24,7 +24,7 @@ def table_validate(w, idx)
   begin
     time = Tk.tk_call('clock', 'scan', val)
     date = []
-    Tk.tk_call('clock', 'format', time, 
+    Tk.tk_call('clock', 'format', time,
                :format=>'%m %d %Y').split(' ').each{|item|
       date << item.sub(/^\s*0*/,'')
     }
@@ -54,12 +54,12 @@ end
 
 lbl = TkLabel.new(:text=>"Dynamic Date Validated Rows")
 
-table = Tk::TkTable.new(:rows=>2, :cols=>3, :cache=>1, :selecttype=>:row, 
-                        :titlerows=>1, :titlecols=>1, :height=>5, 
-                        :colstretch=>:unset, :rowstretch=>:unset, 
-                        :autoclear=>true, 
+table = Tk::TkTable.new(:rows=>2, :cols=>3, :cache=>1, :selecttype=>:row,
+                        :titlerows=>1, :titlecols=>1, :height=>5,
+                        :colstretch=>:unset, :rowstretch=>:unset,
+                        :autoclear=>true,
                         :browsecommand=>[
-                          proc{|w,s| table_validate(w, s)}, 
+                          proc{|w,s| table_validate(w, s)},
                           '%W %s'
                         ])
 table.set([0,1], 'Begin', [0,2], 'End', [1,0], '*')
diff --git a/ext/tk/sample/tkextlib/tktable/maxsize.rb b/ext/tk/sample/tkextlib/tktable/maxsize.rb
index aff68ff377..74e136c49c 100644
--- a/ext/tk/sample/tkextlib/tktable/maxsize.rb
+++ b/ext/tk/sample/tkextlib/tktable/maxsize.rb
@@ -4,7 +4,7 @@
 ##
 ## This demo uses a really big table.  The big startup time is in
 ## filling the table's Tcl array var.
-## 
+##
 ## ( based on 'maxsize.tcl' included source archive of tktable extension )
 ##
 require 'tk'
@@ -23,15 +23,15 @@ cols = 10
 
 lbl = TkLabel.new(:text=>"TkTable v2 Example")
 
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary, 
-                        :width=>6, :height=>8, 
-                        :titlerows=>1, :titlecols=>1, 
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
+                        :width=>6, :height=>8,
+                        :titlerows=>1, :titlecols=>1,
                         :coltagcommand=>proc{|col|
                           col = Integer(col)
                           (col>0 && col%2 == 1)? 'OddCol': ''
-                        }, 
-                        :selectmode=>:extended, 
-                        :colstretch=>:unset, :rowstretch=>:unset, 
+                        },
+                        :selectmode=>:extended,
+                        :colstretch=>:unset, :rowstretch=>:unset,
                         :selecttitles=>false, :drawmode=>:slow)
 
 sx = table.xscrollbar(TkScrollbar.new)
diff --git a/ext/tk/sample/tkextlib/tktable/spreadsheet.rb b/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
index 9da896f5a7..2953b2e597 100644
--- a/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
+++ b/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
@@ -4,7 +4,7 @@
 ##
 ## This demos shows how you can simulate a 3D table
 ## and has other basic features to begin a basic spreadsheet
-## 
+##
 ## ( based on 'spreadsheet.tcl' included source archive of tktable extension )
 ##
 require 'tk'
@@ -67,15 +67,15 @@ optmenu = TkOptionMenubutton.new(page, *(%w(AA BB CC DD)))
 fill_table(table_list, page.value)
 fill_table(table_list, 'BB', Integer(rows/2), Integer(cols/2))
 
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :width=>5, :height=>5, 
-                        :variable=>table_list[page.value], 
-                        :titlerows=>1, :titlecols=>1, 
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :width=>5, :height=>5,
+                        :variable=>table_list[page.value],
+                        :titlerows=>1, :titlecols=>1,
                         :coltagcommand=>proc{|n| colorize(n)},
-                        :flashmode=>true, :selectmode=>:extended, 
-                        :colstretch=>:unset, :rowstretch=>:unset, 
+                        :flashmode=>true, :selectmode=>:extended,
+                        :colstretch=>:unset, :rowstretch=>:unset,
                         :browsecommand=>proc{|e| cur_var.value = e.new_index})
 
-page.trace(:w, proc{|var, elem, op| 
+page.trace(:w, proc{|var, elem, op|
              changepage(table_list, table, entry, color, var, elem, op)
            })
 
@@ -128,7 +128,7 @@ menu = TkMenu.new
 m_file = TkMenu.new(menu)
 Tk.root.menu(menu)
 menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
-m_file.add(:command, :label=>'Fill Array', 
+m_file.add(:command, :label=>'Fill Array',
            :command=>proc{ fill_table(table_list, page.value) })
 m_file.add(:command, :label=>'Quit', :command=>proc{exit})
 
diff --git a/ext/tk/sample/tkextlib/tktable/tcllogo.gif b/ext/tk/sample/tkextlib/tktable/tcllogo.gif
index 4603d4ff41..4603d4ff41 100755..100644
--- a/ext/tk/sample/tkextlib/tktable/tcllogo.gif
+++ b/ext/tk/sample/tkextlib/tktable/tcllogo.gif
diff --git a/ext/tk/sample/tkextlib/tktable/valid.rb b/ext/tk/sample/tkextlib/tktable/valid.rb
index e5d3f11d84..98e9c3855a 100644
--- a/ext/tk/sample/tkextlib/tktable/valid.rb
+++ b/ext/tk/sample/tkextlib/tktable/valid.rb
@@ -4,7 +4,7 @@
 ##
 ## This demos shows the use of the validation mechanism of the table
 ## and uses the table's cache (no -command or -variable)
-## 
+##
 ## ( based on 'valid.tcl' included source archive of tktable extension )
 ##
 require 'tk'
@@ -53,12 +53,12 @@ end
 
 lbl = TkLabel.new(:text=>"TkTable v1 Validated Table Example")
 
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :cache=>1, 
-                        :width=>5, :height=>5, :titlerows=>1, :titlecols=>1, 
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :cache=>1,
+                        :width=>5, :height=>5, :titlerows=>1, :titlecols=>1,
                         :coltagcommand=>proc{|n| colorize(n)},
-                        :flashmode=>true, :selectmode=>:extended, 
-                        :colstretch=>:unset, :rowstretch=>:unset, 
-                        :validate=>true, 
+                        :flashmode=>true, :selectmode=>:extended,
+                        :colstretch=>:unset, :rowstretch=>:unset,
+                        :validate=>true,
                         :validatecommand=>proc{|e|
                           unless e.widget.tag_include?('title', e.index)
                             validate_proc(e.column, e.new_value)
diff --git a/ext/tk/sample/tkextlib/treectrl/bitmaps.rb b/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
index 745e6a2e5b..0d8b37b81e 100644
--- a/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
+++ b/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
@@ -4,12 +4,12 @@
 def demoBitmaps(t)
   #if $Version_1_1_OrLater
   if @has_bgimg
-    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
-                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items', 
+    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
                 :showheader=>false, :backgroundimage=>@images['sky'])
   else
-    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
-                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items', 
+    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
                 :showheader=>false)
   end
 
@@ -19,15 +19,15 @@ def demoBitmaps(t)
     t.column_configure(0, :itembackground=>['gray90', []])
   end
 
-  t.element_create('elemTxt', :text, 
+  t.element_create('elemTxt', :text,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('elemSelTxt', :rect, :showfocus=>true, 
+  t.element_create('elemSelTxt', :rect, :showfocus=>true,
                    :fill=>[@SystemHighlight, ['selected', 'focus']])
-  t.element_create('elemSelBmp', :rect, :outlinewidth=>4, 
+  t.element_create('elemSelBmp', :rect, :outlinewidth=>4,
                    :outline=>[@SystemHighlight, ['selected', 'focus']])
-  t.element_create('elemBmp', :bitmap, 
-                   :foreground=>[@SystemHighlight, ['selected', 'focus']], 
-                   :background=>'linen', 
+  t.element_create('elemBmp', :bitmap,
+                   :foreground=>[@SystemHighlight, ['selected', 'focus']],
+                   :background=>'linen',
                    :bitmap=>['question' ['selected']])
 
   s = t.style_create('STYLE', :orient=>:vertical)
@@ -42,7 +42,7 @@ def demoBitmaps(t)
     t.defaultstyle = [s]
   end
 
-  bitmap_names = %w(error gray75 gray50 gray25 gray12 
+  bitmap_names = %w(error gray75 gray50 gray25 gray12
                     hourglass info questhead question warning)
 
   bitmap_names.each{|name|
@@ -60,15 +60,15 @@ def demoBitmaps(t)
     t.item_style_set(i, 0, s)
     t.item_text(i, 0, name)
     if true
-      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name, 
-                               :foreground=>['brown', ''], 
+      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
+                               :foreground=>['brown', ''],
                                :background=>['', ''])
     else
-      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name, 
+      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
                                :foreground=>[
-                                 @SystemHighlight, ['selected', 'focus'], 
+                                 @SystemHighlight, ['selected', 'focus'],
                                  'brown', []
-                               ], 
+                               ],
                                :background=>['', []])
     end
     t.item_lastchild(:root, i)
diff --git a/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb
index 50ecde91f0..564a005bdc 100644
--- a/ext/tk/sample/tkextlib/treectrl/demo.rb
+++ b/ext/tk/sample/tkextlib/treectrl/demo.rb
@@ -9,11 +9,12 @@ $HasColumnCreate = Tk::TreeCtrl::HasColumnCreateCommand
 
 $Version_1_1_OrLater = (TkPackage.vcompare(Tk::TreeCtrl.package_version, '1.1') >= 0)
 
-if Hash.instance_methods.include?('key')
-  # probably ruby 1.9.x --> use Hash#key
+#if Hash.instance_methods.include?(:key)
+if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+  # ruby 1.9.x --> use Hash#key
   # Because Hash#index show warning "Hash#index is deprecated; use Hash#key".
 else
-  # probably ruby 1.8.x --> use Hash#index
+  # ruby 1.8.x --> use Hash#index
   class Hash
     alias key index
   end
@@ -75,7 +76,7 @@ class TkTreeCtrl_demo
 
     ####################
 
-    @tree2.bind('ButtonPress-3', 
+    @tree2.bind('ButtonPress-3',
                 proc{|w, x, y, rootx, rooty|
                   show_list_popup(w, x, y, rootx, rooty)
                 }, '%W %x %y %X %Y')
@@ -93,7 +94,7 @@ class TkTreeCtrl_demo
 
     ####################
 
-    @tree1.notify_bind(@tree1, 'Selection', 
+    @tree1.notify_bind(@tree1, 'Selection',
                        proc{|c, t|
                          if c == 1
                            item = t.selection_get[0]
@@ -101,10 +102,10 @@ class TkTreeCtrl_demo
                          end
                        }, '%c %T')
 
-    # When one item is selected in the demo list, display the styles in 
+    # When one item is selected in the demo list, display the styles in
     # that item.
     # See DemoClear for why the tag "DontDelete" is used
-    @tree2.notify_bind('DontDelete', 'Selection', 
+    @tree2.notify_bind('DontDelete', 'Selection',
                        proc{|c, t|
                          display_styles_in_item(t.selection_get[0]) if c == 1
                        }, '%c %T')
@@ -155,15 +156,13 @@ class TkTreeCtrl_demo
     @src_top = TkToplevel.new
     f = TkFrame.new(@src_top, :borderwidth=>0)
     case @thisPlatform
-    when 'macintosh', 'macos'
-      font = TkFont.new(['Geneva', 9])
     when 'unix'
       font = TkFont.new(['Courier', -12])
     else
       font = TkFont.new(['Courier', 9])
     end
 
-    @src_txt = TkText.new(f, :font=>font, :tabs=>font.measure('1234'), 
+    @src_txt = TkText.new(f, :font=>font, :tabs=>font.measure('1234'),
                           :wrap=>:none)
     xscr = @src_txt.xscrollbar(TkScrollbar.new(f))
     yscr = @src_txt.yscrollbar(TkScrollbar.new(f))
@@ -197,10 +196,6 @@ class TkTreeCtrl_demo
   def tree_plus_scrollbars_in_a_frame(parent, h, v)
     f = TkFrame.new(parent, :borderwidth=>1, :relief=>:sunken)
     case @thisPlatform
-    when 'macintosh'
-      font = TkFont.new(['Geneva', 9])
-    when 'macos'
-      font = TkFont.new(['Lucida Grande', 11])
     when 'unix'
       font = TkFont.new(['Helvetica', -12])
     else
@@ -209,23 +204,23 @@ class TkTreeCtrl_demo
       font = TkFont.new(['MS Sans', 8])
     end
 
-    tree = Tk::TreeCtrl.new(f, :highlightthickness=>0, 
+    tree = Tk::TreeCtrl.new(f, :highlightthickness=>0,
                             :borderwidth=>0, :font=>font)
     tree[:xscrollincrement] = 20
     tree.debug_configure(:enable=>false, :display=>false)
 
     if h
-      h_scr = TkScrollbar.new(f, :orient=>:horizontal, 
+      h_scr = TkScrollbar.new(f, :orient=>:horizontal,
                               :command=>proc{|*args| tree.xview(*args)})
-      tree.notify_bind(h_scr, 'Scroll-x', 
+      tree.notify_bind(h_scr, 'Scroll-x',
                        proc{|w, l, u| w.set(l, u)}, '%W %l %u')
       h_scr.bind('ButtonPress-1', proc{tree.set_focus})
     end
 
     if v
-      v_scr = TkScrollbar.new(f, :orient=>:vertical, 
+      v_scr = TkScrollbar.new(f, :orient=>:vertical,
                               :command=>proc{|*args| tree.yview(*args)})
-      tree.notify_bind(v_scr, 'Scroll-y', 
+      tree.notify_bind(v_scr, 'Scroll-y',
                        proc{|w, l, u| w.set(l, u)}, '%W %l %u')
       v_scr.bind('ButtonPress-1', proc{tree.set_focus})
     end
@@ -243,7 +238,7 @@ class TkTreeCtrl_demo
     Tk.root.title('Tk::TreeCtrl Demo')
 
     case @thisPlatform
-    when 'macintosh', 'macosx'
+    when 'macosx'
       Tk.root.geometry('+40+40')
     else
       Tk.root.geometry('+0+30')
@@ -254,13 +249,13 @@ class TkTreeCtrl_demo
 
     # Tree + scrollbar: demos
     f1, @tree1 = tree_plus_scrollbars_in_a_frame(nil, false, true)
-    @tree1.configure(:showbuttons=>false, :showlines=>:false, 
+    @tree1.configure(:showbuttons=>false, :showlines=>:false,
                     :showroot=>false, :height=>100)
     if $HasColumnCreate
-      @tree1.column_create(:text=>'List of Demos', 
+      @tree1.column_create(:text=>'List of Demos',
                            :expand=>true, :button=>false)
     else
-      @tree1.column_configure(0, :text=>'List of Demos', 
+      @tree1.column_configure(0, :text=>'List of Demos',
                               :expand=>true, :button=>false)
     end
 
@@ -268,10 +263,10 @@ class TkTreeCtrl_demo
     f4, @tree4 = tree_plus_scrollbars_in_a_frame(nil, false, true)
     @tree4.configure(:showroot=>false, :height=>140)
     if $HasColumnCreate
-      @tree4.column_create(:text=>'Elements and Styles', 
+      @tree4.column_create(:text=>'Elements and Styles',
                            :expand=>true, :button=>false)
     else
-      @tree4.column_configure(0, :text=>'Elements and Styles', 
+      @tree4.column_configure(0, :text=>'Elements and Styles',
                               :expand=>true, :button=>false)
     end
 
@@ -279,10 +274,10 @@ class TkTreeCtrl_demo
     f3, @tree3 = tree_plus_scrollbars_in_a_frame(nil, false, true)
     @tree3.configure(:showroot=>false)
     if $HasColumnCreate
-      @tree3.column_create(:text=>'Styles in Item', 
+      @tree3.column_create(:text=>'Styles in Item',
                            :expand=>true, :button=>false)
     else
-      @tree3.column_configure(0, :text=>'Styles in Item', 
+      @tree3.column_configure(0, :text=>'Styles in Item',
                               :expand=>true, :button=>false)
     end
 
@@ -295,7 +290,7 @@ class TkTreeCtrl_demo
     # Tree + scrollbars
     f2, @tree2 = tree_plus_scrollbars_in_a_frame(f2_base, true, true)
     @tree2.configure(:indent=>19)
-    @tree2.debug_configure(:enable=>false, :display=>true, 
+    @tree2.debug_configure(:enable=>false, :display=>true,
                            :erasecolor=>'pink', :displaydelay=>30)
 
     # Give it a big border to debug drawing
@@ -348,7 +343,7 @@ class TkTreeCtrl_demo
     @popup[:show] = Hash.new{|h, k| h[k] = TkVariable.new}
 
     menuspec = [
-      [ 'Collapse', [], nil, '', {:menu_config=>{:tearoff=>false}} ], 
+      [ 'Collapse', [], nil, '', {:menu_config=>{:tearoff=>false}} ],
 
       [ 'Expand',   [], nil, '', {:menu_config=>{:tearoff=>false}} ]
     ]
@@ -356,61 +351,61 @@ class TkTreeCtrl_demo
     # if $Version_1_1_OrLater
     if @has_bgimg
       menuspec << \
-      [ 'Background Image', 
+      [ 'Background Image',
         [
-          [ 'none', [@popup[:bgimg], 'none'], nil, '', 
-            {:command=>proc{@tree2.backgroundimage = ''}} ], 
-          [ 'sky',  [@popup[:bgimg], 'sky'],  nil, '', 
+          [ 'none', [@popup[:bgimg], 'none'], nil, '',
+            {:command=>proc{@tree2.backgroundimage = ''}} ],
+          [ 'sky',  [@popup[:bgimg], 'sky'],  nil, '',
             {:command=>proc{
                 @tree2.backgroundimage = @images[@popup[:bgimg].value]}} ]
-        ], 
+        ],
         nil, '', {:menu_config=>{:tearoff=>false}}
       ]
     end
 
     menuspec.concat([
-      [ 'Background Mode', 
+      [ 'Background Mode',
         %w(column index row visindex).collect{|val|
-          [ val, [@popup[:bgmode], val] , nil, '', 
+          [ val, [@popup[:bgmode], val] , nil, '',
             {:command=>proc{@tree2.backgroundmode = @popup[:bgmode].value}} ]
-        }, 
+        },
         nil, '', {:menu_config=>{:tearoff=>false}}
       ],
 
-      [ 'Debug', 
+      [ 'Debug',
         [
-          [ 'Data',    @popup[:debug][:data],    nil, '', 
+          [ 'Data',    @popup[:debug][:data],    nil, '',
             {:command=>proc{
                 @tree2.debug_configure(:data=>@popup[:debug][:data].value)
               }
-            } ], 
-          [ 'Display', @popup[:debug][:display], nil, '', 
+            } ],
+          [ 'Display', @popup[:debug][:display], nil, '',
             {:command=>proc{
                 @tree2.debug_configure(:display=>@popup[:debug][:display].value)
               }
-            } ], 
-          [ 'Enable',  @popup[:debug][:enable],  nil, '', 
+            } ],
+          [ 'Enable',  @popup[:debug][:enable],  nil, '',
             {:command=>proc{
                 @tree2.debug_configure(:enable=>@popup[:debug][:enable].value)
               }
             } ]
-        ], 
+        ],
         nil, '', {:menu_config=>{:tearoff=>false}}
       ],
 
-      [ 'Buffering', 
+      [ 'Buffering',
         [
-          [ 'none',   [@popup[:doublebuffer], 'none'],   nil, '', 
+          [ 'none',   [@popup[:doublebuffer], 'none'],   nil, '',
             {:command=>proc{
                 @tree2.doublebuffer = @popup[:doublebuffer].value
               }
-            } ], 
-          [ 'item',   [@popup[:doublebuffer], 'item'],   nil, '', 
+            } ],
+          [ 'item',   [@popup[:doublebuffer], 'item'],   nil, '',
             {:command=>proc{
                 @tree2.doublebuffer = @popup[:doublebuffer].value
               }
-            } ], 
-          [ 'window', [@popup[:doublebuffer], 'window'], nil, '', 
+            } ],
+          [ 'window', [@popup[:doublebuffer], 'window'], nil, '',
             {:command=>proc{
                 @tree2.doublebuffer = @popup[:doublebuffer].value
               }
@@ -419,62 +414,62 @@ class TkTreeCtrl_demo
         nil, '', {:menu_config=>{:tearoff=>false}}
       ],
 
-      [ 'Line style', 
+      [ 'Line style',
         [
-          [ 'dot',   [@popup[:linestyle], 'dot'],   nil, '', 
-            {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ], 
-          [ 'solid', [@popup[:linestyle], 'solid'], nil, '', 
+          [ 'dot',   [@popup[:linestyle], 'dot'],   nil, '',
+            {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ],
+          [ 'solid', [@popup[:linestyle], 'solid'], nil, '',
             {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ]
-        ], 
+        ],
         nil, '', {:menu_config=>{:tearoff=>false}}
       ],
 
-      [ 'Orient', 
+      [ 'Orient',
         [
-          [ 'Horizontal', [@popup[:orient], 'horizontal'], nil, '', 
-            {:command=>proc{@tree2.orient = @popup[:orient].value}} ], 
-          [ 'Vertical',   [@popup[:orient], 'vertical'],   nil, '', 
+          [ 'Horizontal', [@popup[:orient], 'horizontal'], nil, '',
+            {:command=>proc{@tree2.orient = @popup[:orient].value}} ],
+          [ 'Vertical',   [@popup[:orient], 'vertical'],   nil, '',
             {:command=>proc{@tree2.orient = @popup[:orient].value}} ]
-        ], 
+        ],
         nil, '', {:menu_config=>{:tearoff=>false}}
       ],
 
-      [ 'Selectmode', 
+      [ 'Selectmode',
         %w(list browse extended multiple single).collect{|val|
-          [ val, [@popup[:selectmode], val] , nil, '', 
+          [ val, [@popup[:selectmode], val] , nil, '',
             {:command=>proc{@tree2.selectmode = @popup[:selectmode].value}} ]
-        }, 
+        },
         nil, '', {:menu_config=>{:tearoff=>false}}
       ],
 
-      [ 'Show', 
+      [ 'Show',
         [
-          [ 'Buttons', @popup[:show][:buttons], nil, '', 
+          [ 'Buttons', @popup[:show][:buttons], nil, '',
             {:command=>proc{
                 @tree2.showbuttons = @popup[:show][:buttons].value
               }
-            } ], 
-          [ 'Header', @popup[:show][:header], nil, '', 
+            } ],
+          [ 'Header', @popup[:show][:header], nil, '',
             {:command=>proc{
                 @tree2.showheader = @popup[:show][:header].value
               }
-            } ], 
-          [ 'Lines', @popup[:show][:lines], nil, '', 
+            } ],
+          [ 'Lines', @popup[:show][:lines], nil, '',
             {:command=>proc{
                 @tree2.showlines = @popup[:show][:lines].value
               }
-            } ], 
-          [ 'Root', @popup[:show][:root], nil, '', 
+            } ],
+          [ 'Root', @popup[:show][:root], nil, '',
             {:command=>proc{
                 @tree2.showroot = @popup[:show][:root].value
               }
-            } ], 
-          [ 'Root Button', @popup[:show][:rootbutton], nil, '', 
+            } ],
+          [ 'Root Button', @popup[:show][:rootbutton], nil, '',
             {:command=>proc{
                 @tree2.showrootbutton = @popup[:show][:rootbutton].value
               }
             } ]
-        ], 
+        ],
         nil, '', {:menu_config=>{:tearoff=>false}}
       ],
 
@@ -514,14 +509,14 @@ class TkTreeCtrl_demo
       if id[0] == 'item'
         item = id[1]
         if $Version_1_1_OrLater
-          m.add_command(:label=>"Item #{item}", 
+          m.add_command(:label=>"Item #{item}",
                         :command=>proc{w.item_collapse(item)})
-          m.add_command(:label=>"Item #{item} (recurse)", 
+          m.add_command(:label=>"Item #{item} (recurse)",
                         :command=>proc{w.item_collapse_recurse(item)})
         else
-          m.add_command(:label=>"Item #{item}", 
+          m.add_command(:label=>"Item #{item}",
                         :command=>proc{w.collapse(item)})
-          m.add_command(:label=>"Item #{item} (recurse)", 
+          m.add_command(:label=>"Item #{item} (recurse)",
                         :command=>proc{w.collapse_recurse(item)})
         end
       end
@@ -538,14 +533,14 @@ class TkTreeCtrl_demo
       if id[0] == 'item'
         item = id[1]
         if $Version_1_1_OrLater
-          m.add_command(:label=>"Item #{item}", 
+          m.add_command(:label=>"Item #{item}",
                         :command=>proc{w.item_expand(item)})
-          m.add_command(:label=>"Item #{item} (recurse)", 
+          m.add_command(:label=>"Item #{item} (recurse)",
                         :command=>proc{w.item_expand_recurse(item)})
         else
-          m.add_command(:label=>"Item #{item}", 
+          m.add_command(:label=>"Item #{item}",
                         :command=>proc{w.expand(item)})
-          m.add_command(:label=>"Item #{item} (recurse)", 
+          m.add_command(:label=>"Item #{item} (recurse)",
                         :command=>proc{w.expand_recurse(item)})
         end
       end
@@ -577,8 +572,8 @@ class TkTreeCtrl_demo
       txt = w.column_cget(i, :text)
       img_name = w.column_cget(i, :image)
       img_name = @images.key(img_name) if img_name.kind_of?(TkImage)
-      m.add_checkbutton(:variable=>@popup[:visible][i], 
-                        :label=>"Column #{i} \"#{txt}\" [#{img_name}]", 
+      m.add_checkbutton(:variable=>@popup[:visible][i],
+                        :label=>"Column #{i} \"#{txt}\" [#{img_name}]",
                         :command=>proc{w.column_configure(i, :visible=>@popup[:visible][i].value)})
     }
 
@@ -595,90 +590,90 @@ class TkTreeCtrl_demo
     @popup[:justify] = TkVariable.new
 
     menuspec = [
-      [ 'Arrow', 
+      [ 'Arrow',
         [
-          [ 'None', [@popup[:arrow], 'none'], nil, '', 
+          [ 'None', [@popup[:arrow], 'none'], nil, '',
             {:command=>proc{
                 @tree2.column_configure(@popup[:column].value, :arrow=>:none)
               }
             } ],
-          [ 'Up', [@popup[:arrow], 'up'], nil, '', 
+          [ 'Up', [@popup[:arrow], 'up'], nil, '',
             {:command=>proc{
                 @tree2.column_configure(@popup[:column].value, :arrow=>:up)
               }
             } ],
-          [ 'Down', [@popup[:arrow], 'down'], nil, '', 
+          [ 'Down', [@popup[:arrow], 'down'], nil, '',
             {:command=>proc{
                 @tree2.column_configure(@popup[:column].value, :arrow=>:down)
               }
             } ],
 
-          '---', 
+          '---',
 
-          [ 'Side Left', [@popup[:arrowside], 'left'], nil, '', 
+          [ 'Side Left', [@popup[:arrowside], 'left'], nil, '',
             {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, 
+                @tree2.column_configure(@popup[:column].value,
                                         :arrowside=>:left)
               }
             } ],
-          [ 'Side Right', [@popup[:arrowside], 'right'], nil, '', 
+          [ 'Side Right', [@popup[:arrowside], 'right'], nil, '',
             {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, 
+                @tree2.column_configure(@popup[:column].value,
                                         :arrowside=>:right)
               }
             } ],
 
-          '---', 
+          '---',
 
-          [ 'Gravity Left', [@popup[:arrowgravity], 'left'], nil, '', 
+          [ 'Gravity Left', [@popup[:arrowgravity], 'left'], nil, '',
             {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, 
+                @tree2.column_configure(@popup[:column].value,
                                         :arrowgravity=>:left)
               }
             } ],
-          [ 'Gravity Right', [@popup[:arrowgravity], 'right'], nil, '', 
+          [ 'Gravity Right', [@popup[:arrowgravity], 'right'], nil, '',
             {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, 
+                @tree2.column_configure(@popup[:column].value,
                                         :arrowgravity=>:right)
               }
             } ],
-        ], 
-        nil, '', {:menu_config=>{:tearoff=>false}} ], 
+        ],
+        nil, '', {:menu_config=>{:tearoff=>false}} ],
 
-      [ 'Expand',  @popup[:expand],  nil, '', 
+      [ 'Expand',  @popup[:expand],  nil, '',
         {:command=>proc{
-            @tree2.column_configure(@popup[:column].value, 
+            @tree2.column_configure(@popup[:column].value,
                                     :expand=>@popup[:expand].value)
           }
         } ],
 
-      [ 'Squeeze', @popup[:squeeze], nil, '', 
+      [ 'Squeeze', @popup[:squeeze], nil, '',
         {:command=>proc{
-            @tree2.column_configure(@popup[:column].value, 
+            @tree2.column_configure(@popup[:column].value,
                                     :squeeze=>@popup[:squeeze].value)
           }
         } ],
 
-      [ 'Justify', 
+      [ 'Justify',
         [
-          [ 'Left', [@popup[:justify], 'left'], nil, '', 
+          [ 'Left', [@popup[:justify], 'left'], nil, '',
             {:command=>proc{
                 @tree2.column_configure(@popup[:column].value, :justify=>:left)
               }
             } ],
-          [ 'Center', [@popup[:justify], 'center'], nil, '', 
+          [ 'Center', [@popup[:justify], 'center'], nil, '',
             {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, 
+                @tree2.column_configure(@popup[:column].value,
                                         :justify=>:center)
               }
             } ],
-          [ 'Right', [@popup[:justify], 'right'], nil, '', 
+          [ 'Right', [@popup[:justify], 'right'], nil, '',
             {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, 
+                @tree2.column_configure(@popup[:column].value,
                                         :justify=>:right)
               }
             } ]
-        ], 
+        ],
         nil, '', {:menu_config=>{:tearoff=>false}} ]
     ]
 
@@ -712,7 +707,7 @@ class TkTreeCtrl_demo
     def master._pub_display_styles_in_item(item)
       display_styles_in_item(item)
     end
-    proc_disp_styles_in_item = proc{|item| 
+    proc_disp_styles_in_item = proc{|item|
       master._pub_display_styles_in_item(item)
     }
 
@@ -776,15 +771,15 @@ class TkTreeCtrl_demo
   def load_demo_scripts
     # demo sources
     [
-      'bitmaps',  
-      'explorer', 
-      'help', 
-      'imovie', 
-      'layout', 
-      'mailwasher', 
-      'outlook-folders', 
-      'outlook-newgroup', 
-      'random', 
+      'bitmaps',
+      'explorer',
+      'help',
+      'imovie',
+      'layout',
+      'mailwasher',
+      'outlook-folders',
+      'outlook-newgroup',
+      'random',
       'www-options'
     ].each{|f|
       @demo_scripts.load_demo(File.join(@ScriptDir, "#{f}.rb"))
@@ -794,18 +789,18 @@ class TkTreeCtrl_demo
   ###########################
 
   def init_demo_list
-    @tree1.element_create('e1', :text, 
+    @tree1.element_create('e1', :text,
                           :fill=>[@SystemHighlightText, ['selected', 'focus']])
-    @tree1.element_create('e2', :rect, :showfocus=>true, 
+    @tree1.element_create('e2', :rect, :showfocus=>true,
                           :fill=>[
-                            @SystemHighlight, ['selected', 'focus'], 
-                            'gray', ['selected', '!focus'], 
+                            @SystemHighlight, ['selected', 'focus'],
+                            'gray', ['selected', '!focus'],
                           ])
     @tree1.style_create('s1')
     @tree1.style_elements('s1', ['e2', 'e1'])
 
     # Tk listbox has linespace + 1 height
-    @tree1.style_layout('s1', 'e2', :union=>['e1'], 
+    @tree1.style_layout('s1', 'e2', :union=>['e1'],
                         :ipadx=>2, :ipady=>[0, 1], :iexpand=>:e)
 
     if $Version_1_1_OrLater
@@ -814,19 +809,19 @@ class TkTreeCtrl_demo
 
     ###
     [
-      ["Random #{@RandomN[0]} Items", :demoRandom, 'random.rb'], 
-      ["Random #{@RandomN[0]} Items, Button Images", :demoRandom2, 'random.rb'], 
+      ["Random #{@RandomN[0]} Items", :demoRandom, 'random.rb'],
+      ["Random #{@RandomN[0]} Items, Button Images", :demoRandom2, 'random.rb'],
       ["Outlook Express (Folders)", :demoOutlookFolders, 'outlook-folders.rb'],
-      ["Outlook Express (Newsgroup)", :demoOutlookNewsgroup, 'outlook-newgroup.rb'], 
-      ["Explorer (Details)", :demoExplorerDetails, 'explorer.rb'], 
-      ["Explorer (List)", :demoExplorerList, 'explorer.rb'], 
-      ["Explorer (Large icons)", :demoExplorerLargeIcons, 'explorer.rb'], 
-      ["Explorer (Small icons)", :demoExplorerSmallIcons, 'explorer.rb'], 
-      ["Internet Options", :demoInternetOptions, 'www-options.rb'], 
-      ["Help Contents", :demoHelpContents, 'help.rb'], 
-      ["Layout", :demoLayout, 'layout.rb'], 
-      ["MailWasher", :demoMailWasher, 'mailwasher.rb'], 
-      ["Bitmaps", :demoBitmaps, 'bitmaps.rb'], 
+      ["Outlook Express (Newsgroup)", :demoOutlookNewsgroup, 'outlook-newgroup.rb'],
+      ["Explorer (Details)", :demoExplorerDetails, 'explorer.rb'],
+      ["Explorer (List)", :demoExplorerList, 'explorer.rb'],
+      ["Explorer (Large icons)", :demoExplorerLargeIcons, 'explorer.rb'],
+      ["Explorer (Small icons)", :demoExplorerSmallIcons, 'explorer.rb'],
+      ["Internet Options", :demoInternetOptions, 'www-options.rb'],
+      ["Help Contents", :demoHelpContents, 'help.rb'],
+      ["Layout", :demoLayout, 'layout.rb'],
+      ["MailWasher", :demoMailWasher, 'mailwasher.rb'],
+      ["Bitmaps", :demoBitmaps, 'bitmaps.rb'],
       ["iMovie", :demoIMovie, 'imovie.rb']
     ].each{|label, cmd, file|
       item = @tree1.item_create
@@ -858,15 +853,15 @@ class TkTreeCtrl_demo
   def display_styles_in_list
     # Create elements and styles the first time this is called
     if @tree4.style_names.empty?
-      @tree4.element_create('e1', :text, 
+      @tree4.element_create('e1', :text,
                             :fill=>[@SystemHighlightText,['selected','focus']])
-      @tree4.element_create('e2', :text, 
+      @tree4.element_create('e2', :text,
                             :fill=>[
-                              @SystemHighlightText, ['selected','focus'], 
-                              '', ['selected','!focus'], 
+                              @SystemHighlightText, ['selected','focus'],
+                              '', ['selected','!focus'],
                               'blue', []
                             ])
-      @tree4.element_create('e3', :rect, :showfocus=>true, 
+      @tree4.element_create('e3', :rect, :showfocus=>true,
                             :fill=>[
                               @SystemHighlight, ['selected','focus'],
                               'gray', ['selected', '!focus']
@@ -879,13 +874,13 @@ class TkTreeCtrl_demo
       @tree4.style_create('s2')
       @tree4.style_elements('s2', ['e3', 'e1', 'e2'])
       @tree4.style_layout('s2', 'e1', :padx=>[0,4])
-      @tree4.style_layout('s2', 'e3', :union=>['e1', 'e2'], 
+      @tree4.style_layout('s2', 'e3', :union=>['e1', 'e2'],
                           :ipadx=>1, :ipady=>[0,1])
     end
 
     # Clear the list
     @tree4.item_delete(:all)
-    
+
     # One item for each element in the demo list
     @tree2.element_names.sort.each{|elem|
       if $Version_1_1_OrLater
@@ -897,7 +892,7 @@ class TkTreeCtrl_demo
         @tree4.collapse(item)
       end
       @tree4.item_style_set(item, 0, 's1')
-      @tree4.item_text(item, 0, 
+      @tree4.item_text(item, 0,
                        "Element #{elem} (#{@tree2.element_type(elem)})")
 
       # One item for each configuration option for this element
@@ -912,7 +907,7 @@ class TkTreeCtrl_demo
         else
           @tree4.item_style_set(item2, 0, 's2')
           @tree4.item_complex(item2, [
-                                ['e1', {:text=>name}], 
+                                ['e1', {:text=>name}],
                                 ['e2', {:text=>current.inspect}]
                               ])
         end
@@ -947,7 +942,7 @@ class TkTreeCtrl_demo
           @tree4.collapse(item2)
         end
         @tree4.item_style_set(item2, 0, 's1')
-        @tree4.item_text(item2, 0, 
+        @tree4.item_text(item2, 0,
                          "Element #{elem} (#{@tree2.element_type(elem)})")
 
         # One item for each layout option for this element in this style
@@ -976,15 +971,15 @@ class TkTreeCtrl_demo
 
     # Create elements and styles the first time this is called
     if @tree3.style_names.empty?
-      @tree3.element_create('e1', :text, 
+      @tree3.element_create('e1', :text,
                             :fill=>[@SystemHighlightText,['selected','focus']])
-      @tree3.element_create('e2', :text, 
+      @tree3.element_create('e2', :text,
                             :fill=>[
-                              @SystemHighlightText, ['selected','focus'], 
-                              '', ['selected','!focus'], 
+                              @SystemHighlightText, ['selected','focus'],
+                              '', ['selected','!focus'],
                               'blue', []
                             ])
-      @tree3.element_create('e3', :rect, :showfocus=>true, 
+      @tree3.element_create('e3', :rect, :showfocus=>true,
                             :fill=>[
                               @SystemHighlight, ['selected','focus'],
                               'gray', ['selected', '!focus']
@@ -997,7 +992,7 @@ class TkTreeCtrl_demo
       @tree3.style_create('s2')
       @tree3.style_elements('s2', ['e3', 'e1', 'e2'])
       @tree3.style_layout('s2', 'e1', :padx=>[0,4])
-      @tree3.style_layout('s2', 'e3', :union=>['e1', 'e2'], 
+      @tree3.style_layout('s2', 'e3', :union=>['e1', 'e2'],
                           :ipadx=>1, :ipady=>[0,1])
     end
     # Clear the list
@@ -1013,7 +1008,7 @@ class TkTreeCtrl_demo
         @tree3.collapse(item2)
       end
       @tree3.item_style_set(item2, 0, 's1')
-      @tree3.item_element_configure(item2, 0, 'e1', 
+      @tree3.item_element_configure(item2, 0, 'e1',
                                     :text=>"Column #{column}: Style #{sty}")
 
       button = false
@@ -1034,7 +1029,7 @@ class TkTreeCtrl_demo
             @tree3.collapse(item3)
           end
           @tree3.item_style_set(item3, 0, 's1')
-          @tree3.item_element_configure(item3, 0, 'e1', 
+          @tree3.item_element_configure(item3, 0, 'e1',
                                         :text=>"Element #{elem} (#{@tree2.element_type(elem)})")
 
           # One item for each configuration option in this element
@@ -1051,13 +1046,13 @@ class TkTreeCtrl_demo
             if sameAsMaster
               @tree3.item_style_set(item4, 0, 's1')
               @tree3.item_complex(item4, [
-                                    ['e1', 
+                                    ['e1',
                                       {:text=>"#{name} #{current.inspect}"}]
                                   ])
             else
               @tree3.item_style_set(item4, 0, 's2')
               @tree3.item_complex(item4, [
-                                    ['e1', {:text=>name}], 
+                                    ['e1', {:text=>name}],
                                     ['e2', {:text=>current.inspect}]
                                   ])
             end
@@ -1117,28 +1112,28 @@ class TkTreeCtrl_demo
     # Restore some happy defaults to the demo list
     # if $Version_1_1_OrLater
     if @has_bgimg
-      @tree2.configure(:orient=>:vertical, :wrap=>'', 
-                       :xscrollincrement=>0, :yscrollincrement=>0, 
-                       :itemheight=>0, :showheader=>true, 
-                       :background=>'white', :scrollmargin=>0, 
-                       :xscrolldelay=>50, :yscrolldelay=>50, 
-                       :openbuttonimage=>'', :closedbuttonimage=>'', 
-                       :backgroundmode=>:row, :treecolumn=>0, :indent=>19, 
+      @tree2.configure(:orient=>:vertical, :wrap=>'',
+                       :xscrollincrement=>0, :yscrollincrement=>0,
+                       :itemheight=>0, :showheader=>true,
+                       :background=>'white', :scrollmargin=>0,
+                       :xscrolldelay=>50, :yscrolldelay=>50,
+                       :openbuttonimage=>'', :closedbuttonimage=>'',
+                       :backgroundmode=>:row, :treecolumn=>0, :indent=>19,
                        :defaultstyle=>'', :backgroundimage=>'')
     else
-      @tree2.configure(:orient=>:vertical, :wrap=>'', 
-                       :xscrollincrement=>0, :yscrollincrement=>0, 
-                       :itemheight=>0, :showheader=>true, 
-                       :background=>'white', :scrollmargin=>0, 
-                       :xscrolldelay=>50, :yscrolldelay=>50, 
-                       :openbuttonimage=>'', :closedbuttonimage=>'', 
+      @tree2.configure(:orient=>:vertical, :wrap=>'',
+                       :xscrollincrement=>0, :yscrollincrement=>0,
+                       :itemheight=>0, :showheader=>true,
+                       :background=>'white', :scrollmargin=>0,
+                       :xscrolldelay=>50, :yscrolldelay=>50,
+                       :openbuttonimage=>'', :closedbuttonimage=>'',
                        :backgroundmode=>:row, :treecolumn=>0, :indent=>19)
     end
 
     # Restore default bindings to the demo list
     @tree2.bindtags = [ @tree2, Tk::TreeCtrl, @tree2.winfo_toplevel, :all ]
 
-    @tree2.winfo_children.each{|w| 
+    @tree2.winfo_children.each{|w|
       w.destroy unless @non_clear_list.include?(w)
     }
   end
@@ -1152,8 +1147,8 @@ def cursor_window(top = nil)
   top.destroy if top.kind_of?(TkWindow) && top.winfo_exist?
   top = TkToplevel.new(:title=>'Cursor Window')
 
-  c = TkCanvas.new(top, :background=>'white', 
-                   :width=>50*10, :highlightthickness=>0, 
+  c = TkCanvas.new(top, :background=>'white',
+                   :width=>50*10, :highlightthickness=>0,
                    :borderwidth=>0).pack(:expand=>true, :fill=>:both)
   cursors = %w(
 	X_cursor
@@ -1246,7 +1241,7 @@ def cursor_window(top = nil)
     begin
       c.cursor = cur
 
-      r = TkcRectangle.new(c, x, y, x+50, y+40, 
+      r = TkcRectangle.new(c, x, y, x+50, y+40,
                            :fill=>'gray90', :outline=>'black', :width=>2)
       t = TkcText.new(c, x+50/2, y+4, :text=>cur, :anchor=>:n, :width=>42)
 
@@ -1283,10 +1278,10 @@ if Tk::PLATFORM['platform'] == 'unix' && Tk.windowingsystem != 'aqua'
     loupe[:y] = 0 unless loupe[:y]
     loupe[:auto] = true unless loupe[:auto]
     loupe[:delay] = 500 unless loupe[:delay]
-    loupe[:image] = 
+    loupe[:image] =
       TkPhotoImage.new(:width=>150, :height=>150) unless loupe[:image]
 
-    top = TkToplevel.new(:geometry=>'-0+30', 
+    top = TkToplevel.new(:geometry=>'-0+30',
                          :title=>'A little screen magnifier for X11')
     TkLabel.new(top, :image=>loupe[:image]).pack
 
diff --git a/ext/tk/sample/tkextlib/treectrl/explorer.rb b/ext/tk/sample/tkextlib/treectrl/explorer.rb
index 242777cbce..1b8c2a8287 100644
--- a/ext/tk/sample/tkextlib/treectrl/explorer.rb
+++ b/ext/tk/sample/tkextlib/treectrl/explorer.rb
@@ -49,44 +49,44 @@ def demoExplorerDetails(t)
   height = t.font.metrics(:linespace)
   height = 18 if height < 18
 
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
-              :itemheight=>height, :selectmode=>:extended, 
-              :xscrollincrement=>20, :scrollmargin=>16, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+              :itemheight=>height, :selectmode=>:extended,
+              :xscrollincrement=>20, :scrollmargin=>16,
               :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
 
   init_pics('small-*')
 
   if $HasColumnCreate
-    t.column_create(:text=>'Name', :tag=>'name', 
+    t.column_create(:text=>'Name', :tag=>'name',
                     :width=>200, :arrow=>:up, :arrowpad=>6)
-    t.column_create(:text=>'Size', :tag=>'size', :justify=>:right, 
+    t.column_create(:text=>'Size', :tag=>'size', :justify=>:right,
                     :width=>60, :arrowside=>:left, :arrowgravity=>:right)
     t.column_create(:text=>'Type', :tag=>'type', :width=>120)
     t.column_create(:text=>'Modified', :tag=>'modified', :width=>130)
   else
-    t.column_configure(0, :text=>'Name', :tag=>'name', 
+    t.column_configure(0, :text=>'Name', :tag=>'name',
                        :width=>200, :arrow=>:up, :arrowpad=>6)
-    t.column_configure(1, :text=>'Size', :tag=>'size', :justify=>:right, 
+    t.column_configure(1, :text=>'Size', :tag=>'size', :justify=>:right,
                        :width=>60, :arrowside=>:left, :arrowgravity=>:right)
     t.column_configure(2, :text=>'Type', :tag=>'type', :width=>120)
     t.column_configure(3, :text=>'Modified', :tag=>'modified', :width=>130)
   end
 
-  t.element_create('e1', :image, 
+  t.element_create('e1', :image,
                    :image=>[
-                     @sel_images['small-folder'], ['selected'], 
+                     @sel_images['small-folder'], ['selected'],
                      @images['small-folder'], []
                    ])
-  t.element_create('e2', :text, :lines=>1, 
+  t.element_create('e2', :text, :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
   t.element_create('txtType', :text, :lines=>1)
-  t.element_create('txtSize', :text, :lines=>1, 
+  t.element_create('txtSize', :text, :lines=>1,
                    :datatype=>:integer, :format=>'%dKB')
-  t.element_create('txtDate', :text, :lines=>1, 
+  t.element_create('txtDate', :text, :lines=>1,
                    :datatype=>:time, :format=>'%d/%m/%y %I:%M %p')
   t.element_create('e4', :rect, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray', ['selected', '!focus']
                    ])
 
@@ -116,23 +116,23 @@ def demoExplorerDetails(t)
   @Priv[:sensitive, t] = [ ['name', 'styName', 'e1', 'e2'] ]
   @Priv[:dragimage, t] = [ ['name', 'styName', 'e1', 'e2'] ]
 
-  t.notify_bind(t, 'Edit-accept', 
+  t.notify_bind(t, 'Edit-accept',
                 proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
 
   dir_proc = proc{|file|
     item = t.item_create
     t.item_style_set(item, 0, 'styName', 2, 'styType', 3, 'styDate')
-    t.item_complex(item, 
-                   [['e2', {:text=>File.basename(file)}]], 
-                   [], 
-                   [['txtType', {:text=>'Folder'}]], 
+    t.item_complex(item,
+                   [['e2', {:text=>File.basename(file)}]],
+                   [],
+                   [['txtType', {:text=>'Folder'}]],
                    [['txtDate', {:data=>File.mtime(file).tv_sec}]])
     t.item_lastchild(:root, item)
   }
 
   file_proc = proc{|file|
     item = t.item_create
-    t.item_style_set(item, 0, 'styName', 1, 'stySize', 
+    t.item_style_set(item, 0, 'styName', 1, 'stySize',
                            2, 'styType', 3, 'styDate')
 
     ext = File.extname(file)
@@ -151,14 +151,14 @@ def demoExplorerDetails(t)
     type = type[1..-1] << ' ' unless type.empty?
     type << 'File'
 
-    t.item_complex(item, 
-                   [ 
-                     ['e1', {:image=>[@sel_images[img], ['selected'], 
+    t.item_complex(item,
+                   [
+                     ['e1', {:image=>[@sel_images[img], ['selected'],
                                       @images[img], []]}],
                      ['e2', {:text=>File.basename(file)}]
-                   ], 
-                   [ ['txtSize', {:data=>File.size(file)/1024 + 1}] ], 
-                   [ ['txtType', {:text=>type}] ], 
+                   ],
+                   [ ['txtSize', {:data=>File.size(file)/1024 + 1}] ],
+                   [ ['txtType', {:text=>type}] ],
                    [ ['txtDate', {:data=>File.mtime(file).tv_sec}] ]
                    )
     t.item_lastchild(:root, item)
@@ -167,7 +167,7 @@ def demoExplorerDetails(t)
   demoExplorerAux(t, dir_proc, file_proc)
 
   @SortColumn = 0
-  t.notify_bind(t, 'Header-invoke', 
+  t.notify_bind(t, 'Header-invoke',
                 proc{|w, c| explorerHeaderInvoke(t, w, c)}, '%T %C')
 
   t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
@@ -200,37 +200,37 @@ def explorerHeaderInvoke(t, w, c)
   case t.column_cget(c, :tag)
   when 'name'
     if dirCount > 0
-      t.item_sort(:root, order, {:last=>"root child #{lastDir}"}, 
+      t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
                   {:column=>c, :dictionary=>true})
     end
     if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
                   {:column=>c, :dictionary=>true})
     end
 
   when 'size'
     if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
-                  {:column=>c, :integer=>true}, 
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
+                  {:column=>c, :integer=>true},
                   {:column=>'name', :dictionary=>true})
     end
 
   when 'type'
     if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
-                  {:column=>c, :dictionary=>true}, 
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
+                  {:column=>c, :dictionary=>true},
                   {:column=>'name', :dictionary=>true})
     end
 
   when 'modified'
     if dirCount > 0
-      t.item_sort(:root, order, {:last=>"root child #{lastDir}"}, 
-                  {:column=>c, :integer=>true}, 
+      t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
+                  {:column=>c, :integer=>true},
                   {:column=>'name', :dictionary=>true})
     end
     if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
-                  {:column=>c, :integer=>true}, 
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
+                  {:column=>c, :integer=>true},
                   {:column=>'name', :dictionary=>true})
     end
 
@@ -241,9 +241,9 @@ def demoExplorerLargeIcons(t)
   # Item height is 32 for icon, 4 padding, 3 lines of text
   itemHeight = 32 + 4 + t.font.metrics(:linespace) * 3
 
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
-              :selectmode=>:extended, :wrap=>:window, :orient=>:horizontal, 
-              :itemheight=>itemHeight, :showheader=>false, :scrollmargin=>16, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+              :selectmode=>:extended, :wrap=>:window, :orient=>:horizontal,
+              :itemheight=>itemHeight, :showheader=>false, :scrollmargin=>16,
               :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
 
   init_pics('big-*')
@@ -254,17 +254,17 @@ def demoExplorerLargeIcons(t)
     t.column_configure(0, :width=>75)
   end
 
-  t.element_create('elemImg', :image, 
+  t.element_create('elemImg', :image,
                    :image=>[
-                     @sel_images['big-folder'], ['selected'], 
+                     @sel_images['big-folder'], ['selected'],
                      @images['big-folder'], []
                    ])
-  t.element_create('elemTxt', :text, :justify=>:center, 
-                   :lines=>1, :width=>71, :wrap=>:word, 
+  t.element_create('elemTxt', :text, :justify=>:center,
+                   :lines=>1, :width=>71, :wrap=>:word,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('elemSel', :rect, :showfocus=>true, 
+  t.element_create('elemSel', :rect, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray', ['selected']
                    ])
 
@@ -272,7 +272,7 @@ def demoExplorerLargeIcons(t)
   s = t.style_create('STYLE', :orient=>:vertical)
   t.style_elements(s, ['elemSel', 'elemImg', 'elemTxt'])
   t.style_layout(s, 'elemImg', :expand=>:we)
-  t.style_layout(s, 'elemTxt', 
+  t.style_layout(s, 'elemTxt',
                  :pady=>[4,0], :padx=>2, :squeeze=>:x, :expand=>:we)
   t.style_layout(s, 'elemSel', :union=>['elemTxt'])
 
@@ -280,7 +280,7 @@ def demoExplorerLargeIcons(t)
   @Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
   @Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
 
-  t.notify_bind(t, 'Edit-accept', 
+  t.notify_bind(t, 'Edit-accept',
                 proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
 
   dir_proc = proc{|file|
@@ -310,9 +310,9 @@ def demoExplorerLargeIcons(t)
     type = type[1..-1] << ' ' unless type.empty?
     type << 'File'
 
-    t.item_complex(item, 
-                   [ 
-                     ['elemImg', {:image=>[@sel_images[img], ['selected'], 
+    t.item_complex(item,
+                   [
+                     ['elemImg', {:image=>[@sel_images[img], ['selected'],
                                            @images[img], []]}],
                      ['elemTxt', {:text=>File.basename(file)}]
                    ])
@@ -323,7 +323,7 @@ def demoExplorerLargeIcons(t)
 
   t.activate(t.index('root firstchild'))
 
-  t.notify_bind(t, 'ActiveItem', 
+  t.notify_bind(t, 'ActiveItem',
                 proc{|w, a, c|
                   w.item_element_configure(a, 0, 'elemTxt', :lines=>'')
                   w.item_element_configure(c, 0, 'elemTxt', :lines=>3)
@@ -346,9 +346,9 @@ def demoExplorerList(t)
   height = t.font.metrics(:linespace) + 2
   height = 18 if height < 18
 
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
-              :itemheight=>height, :selectmode=>:extended, :wrap=>:window, 
-              :showheader=>false, :scrollmargin=>16, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+              :itemheight=>height, :selectmode=>:extended, :wrap=>:window,
+              :showheader=>false, :scrollmargin=>16,
               :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
 
   init_pics('small-*')
@@ -359,16 +359,16 @@ def demoExplorerList(t)
     t.column_configure(0, :widthhack=>true)
   end
 
-  t.element_create('elemImg', :image, 
+  t.element_create('elemImg', :image,
                    :image=>[
-                     @sel_images['small-folder'], ['selected'], 
+                     @sel_images['small-folder'], ['selected'],
                      @images['small-folder'], []
                    ])
-  t.element_create('elemTxt', :text, :lines=>1, 
+  t.element_create('elemTxt', :text, :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('elemSel', :rect, :showfocus=>true, 
+  t.element_create('elemSel', :rect, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray', ['selected', '!focus']
                    ])
 
@@ -383,7 +383,7 @@ def demoExplorerList(t)
   @Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
   @Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
 
-  t.notify_bind(t, 'Edit-accept', 
+  t.notify_bind(t, 'Edit-accept',
                 proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
 
   dir_proc = proc{|file|
@@ -413,9 +413,9 @@ def demoExplorerList(t)
     type = type[1..-1] << ' ' unless type.empty?
     type << 'File'
 
-    t.item_complex(item, 
-                   [ 
-                     ['elemImg', {:image=>[@sel_images[img], ['selected'], 
+    t.item_complex(item,
+                   [
+                     ['elemImg', {:image=>[@sel_images[img], ['selected'],
                                            @images[img], []]}],
                      ['elemTxt', {:text=>File.basename(file)}]
                    ])
diff --git a/ext/tk/sample/tkextlib/treectrl/help.rb b/ext/tk/sample/tkextlib/treectrl/help.rb
index af026fc006..31ec9eb3f8 100644
--- a/ext/tk/sample/tkextlib/treectrl/help.rb
+++ b/ext/tk/sample/tkextlib/treectrl/help.rb
@@ -4,7 +4,7 @@
 def demoHelpContents(t)
   height = t.font.metrics(:linespace)
   height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
               :itemheight=>height, :selectmode=>:browse)
 
   init_pics('help-*')
@@ -20,16 +20,16 @@ def demoHelpContents(t)
 
   t.element_create('e1', :image, :image=>@images['help-page'])
   t.element_create('e2', :image, :image=>[
-                     @images['help-book-open'], ['open'], 
-                     @images['help-book-closed'], [], 
+                     @images['help-book-open'], ['open'],
+                     @images['help-book-closed'], [],
                    ])
-  t.element_create('e3', :text, 
-                   :font=>[t.font.dup.underline(true), ['mouseover']], 
+  t.element_create('e3', :text,
+                   :font=>[t.font.dup.underline(true), ['mouseover']],
                    :fill=>[
-                     @SystemHighlightText, ['selected', 'focus'], 
+                     @SystemHighlightText, ['selected', 'focus'],
                      'blue', ['mouseover']
                    ])
-  t.element_create('e4', :rect, :showfocus=>true, 
+  t.element_create('e4', :rect, :showfocus=>true,
                    :fill=>[@SystemHighlight, ['selected', 'focus']])
 
   # book
@@ -49,21 +49,21 @@ def demoHelpContents(t)
   parentList = [:root, '', '', '', '', '', '']
   parent = :root
   [
-     [0, 's1', "Welcome to Help"], 
-     [0, 's2', "Introducing Windows 98"], 
-        [1, 's2', "How to Use Help"], 
-           [2, 's1', "Find a topic"], 
+     [0, 's1', "Welcome to Help"],
+     [0, 's2', "Introducing Windows 98"],
+        [1, 's2', "How to Use Help"],
+           [2, 's1', "Find a topic"],
            [2, 's1', "Get more out of help"],
         [1, 's2', "Register Your Software"],
-           [2, 's1', "Registering Windows 98 online"], 
-        [1, 's2', "What's New in Windows 98"], 
-           [2, 's1', "Innovative, easy-to-use features"], 
-           [2, 's1', "Improved reliability"], 
-           [2, 's1', "A faster operating system"], 
-           [2, 's1', "True Web integration"], 
-           [2, 's1', "More entertaining and fun"], 
-        [1, 's2', "If You're New to Windows 98"], 
-           [2, 's2', "Tips for Macintosh Users"], 
+           [2, 's1', "Registering Windows 98 online"],
+        [1, 's2', "What's New in Windows 98"],
+           [2, 's1', "Innovative, easy-to-use features"],
+           [2, 's1', "Improved reliability"],
+           [2, 's1', "A faster operating system"],
+           [2, 's1', "True Web integration"],
+           [2, 's1', "More entertaining and fun"],
+        [1, 's2', "If You're New to Windows 98"],
+           [2, 's2', "Tips for Macintosh Users"],
               [3, 's1', "Why does the mouse have two buttons?"]
   ].each{|depth, style, text|
     item = t.item_create
@@ -81,7 +81,7 @@ def demoHelpContents(t)
 
   treeCtrlHelp = TkBindTag.new
 
-  treeCtrlHelp.bind('Double-ButtonPress-1', 
+  treeCtrlHelp.bind('Double-ButtonPress-1',
                     proc{|w, x, y|
                       if w.identify(x, y)[0] == 'header'
                         Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
@@ -91,25 +91,25 @@ def demoHelpContents(t)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('ButtonPress-1', 
+  treeCtrlHelp.bind('ButtonPress-1',
                     proc{|w, x, y|
                       helpButton1(w, x, y)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('Button1-Motion', 
+  treeCtrlHelp.bind('Button1-Motion',
                     proc{|w, x, y|
                       helpMotion1(w, x, y)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('Button1-Leave', 
+  treeCtrlHelp.bind('Button1-Leave',
                     proc{|w, x, y|
                       helpLeave1(w, x, y)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('ButtonRelease-1', 
+  treeCtrlHelp.bind('ButtonRelease-1',
                     proc{|w, x, y|
                       helpRelease1(w, x, y)
                       Tk.callback_break
@@ -119,7 +119,7 @@ def demoHelpContents(t)
 
   treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
 
-  treeCtrlHelp.bind('KeyPress-Return', 
+  treeCtrlHelp.bind('KeyPress-Return',
                     proc{|w, x, y|
                       if w.selection_get.length == 1
                         if $Version_1_1_OrLater
@@ -141,7 +141,7 @@ end
 def demoHelpContents2(t)
   height = t.font.metrics(:linespace)
   height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
               :itemheight=>height, :selectmode=>:browse)
 
   init_pics('help-*')
@@ -154,19 +154,19 @@ def demoHelpContents2(t)
 
   t.element_create('e1', :image, :image=>@images['help-page'])
   t.element_create('e2', :image, :image=>[
-                     @images['help-book-open'], ['open'], 
-                     @images['help-book-closed'], [], 
+                     @images['help-book-open'], ['open'],
+                     @images['help-book-closed'], [],
                    ])
-  t.element_create('e3', :text, 
+  t.element_create('e3', :text,
                    :fill=>[
-                     @SystemHighlightText, ['selected', 'focus'], 
+                     @SystemHighlightText, ['selected', 'focus'],
                      'blue', []
                    ])
-  t.element_create('e4', :rect, :showfocus=>true, 
+  t.element_create('e4', :rect, :showfocus=>true,
                    :fill=>[@SystemHighligh, ['selected', 'focus']])
-  t.element_create('e5', :text, :font=>t.font.dup.underline(true), 
+  t.element_create('e5', :text, :font=>t.font.dup.underline(true),
                    :fill=>[
-                     @SystemHighlightText, ['selected', 'focus'], 
+                     @SystemHighlightText, ['selected', 'focus'],
                      'blue', []
                    ])
 
@@ -201,21 +201,21 @@ def demoHelpContents2(t)
   parentList = [:root, '', '', '', '', '', '']
   parent = :root
   [
-     [0, 's1', "Welcome to Help"], 
-     [0, 's2', "Introducing Windows 98"], 
-        [1, 's2', "How to Use Help"], 
-           [2, 's1' "Find a topic"], 
+     [0, 's1', "Welcome to Help"],
+     [0, 's2', "Introducing Windows 98"],
+        [1, 's2', "How to Use Help"],
+           [2, 's1' "Find a topic"],
            [2, 's1', "Get more out of help"],
         [1, 's2', "Register Your Software"],
-           [2, 's1', "Registering Windows 98 online"], 
-        [1, 's2', "What's New in Windows 98"], 
-           [2, 's1', "Innovative, easy-to-use features"], 
-           [2, 's1', "Improved reliability"], 
-           [2, 's1', "A faster operating system"], 
-           [2, 's1', "True Web integration"], 
-           [2, 's1', "More entertaining and fun"], 
-        [1, 's2', "If You're New to Windows 98"], 
-           [2, 's2', "Tips for Macintosh Users"], 
+           [2, 's1', "Registering Windows 98 online"],
+        [1, 's2', "What's New in Windows 98"],
+           [2, 's1', "Innovative, easy-to-use features"],
+           [2, 's1', "Improved reliability"],
+           [2, 's1', "A faster operating system"],
+           [2, 's1', "True Web integration"],
+           [2, 's1', "More entertaining and fun"],
+        [1, 's2', "If You're New to Windows 98"],
+           [2, 's2', "Tips for Macintosh Users"],
               [3, 's1', "Why does the mouse have two buttons?"]
   ].each{|depth, style, text|
     item = t.item_create
@@ -233,7 +233,7 @@ def demoHelpContents2(t)
 
   treeCtrlHelp = TkBindTag.new
 
-  treeCtrlHelp.bind('Double-ButtonPress-1', 
+  treeCtrlHelp.bind('Double-ButtonPress-1',
                     proc{|w, x, y|
                       if w.identify(x, y)[0] == 'header'
                         Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
@@ -243,25 +243,25 @@ def demoHelpContents2(t)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('ButtonPress-1', 
+  treeCtrlHelp.bind('ButtonPress-1',
                     proc{|w, x, y|
                       helpButton1(w, x, y)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('Button1-Motion', 
+  treeCtrlHelp.bind('Button1-Motion',
                     proc{|w, x, y|
                       helpMotion1(w, x, y)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('Button1-Leave', 
+  treeCtrlHelp.bind('Button1-Leave',
                     proc{|w, x, y|
                       helpLeave1(w, x, y)
                       Tk.callback_break
                     }, '%W %x %y')
 
-  treeCtrlHelp.bind('ButtonRelease-1', 
+  treeCtrlHelp.bind('ButtonRelease-1',
                     proc{|w, x, y|
                       helpRelease1(w, x, y)
                       Tk.callback_break
@@ -271,7 +271,7 @@ def demoHelpContents2(t)
 
   treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
 
-  treeCtrlHelp.bind('KeyPress-Return', 
+  treeCtrlHelp.bind('KeyPress-Return',
                     proc{|w, x, y|
                       if w.selection_get.length == 1
                         w.item_toggle(w.selection_get[0])
diff --git a/ext/tk/sample/tkextlib/treectrl/imovie.rb b/ext/tk/sample/tkextlib/treectrl/imovie.rb
index d61bf9a7c3..72134ebda6 100644
--- a/ext/tk/sample/tkextlib/treectrl/imovie.rb
+++ b/ext/tk/sample/tkextlib/treectrl/imovie.rb
@@ -2,8 +2,8 @@
 # Demo: iMovie
 #
 def demoIMovie(t)
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
-              :selectmode=>:browse, :orient=>:horizontal, :wrap=>:window, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+              :selectmode=>:browse, :orient=>:horizontal, :wrap=>:window,
               :showheader=>false, :background=>'#dcdcdc')
 
   if $HasColumnCreate
@@ -26,24 +26,24 @@ def demoIMovie(t)
 
   t.element_create('elemTime', :text, :font=>font1)
   t.element_create('elemName', :text, :font=>font2, :lines=>1, :width=>80)
-  t.element_create('elemRect', :rect, :outline=>'#827878', :outlinewidth=>1, 
+  t.element_create('elemRect', :rect, :outline=>'#827878', :outlinewidth=>1,
                    :fill=>['#ffdc5a', ['selected'], 'white', []])
   t.element_create('elemImg', :image)
-  t.element_create('elemShadow', :rect, :outline=>'gray', :outlinewidth=>1, 
+  t.element_create('elemShadow', :rect, :outline=>'gray', :outlinewidth=>1,
                    :open=>:wn)
 
   s = t.style_create('STYLE', :orient=>:vertical)
   t.style_elements(s, [
-                     'elemShadow', 'elemRect', 'elemTime', 
+                     'elemShadow', 'elemRect', 'elemTime',
                      'elemImg', 'elemName'
                    ])
-  t.style_layout(s, 'elemShadow', :detach=>true, 
+  t.style_layout(s, 'elemShadow', :detach=>true,
                  :padx=>[1,2], :pady=>[1,2], :iexpand=>:es)
   t.style_layout(s, 'elemTime', :padx=>[2,0])
   t.style_layout(s, 'elemImg', :pady=>[0,1])
-  t.style_layout(s, 'elemName', :expand=>:we, :ipady=>[0,2], :padx=>[0,3], 
+  t.style_layout(s, 'elemName', :expand=>:we, :ipady=>[0,2], :padx=>[0,3],
                  :squeeze=>:x)
-  t.style_layout(s, 'elemRect', :union=>['elemTime', 'elemImg', 'elemName'], 
+  t.style_layout(s, 'elemRect', :union=>['elemTime', 'elemImg', 'elemName'],
                  :ipadx=>6, :padx=>[0,3], :pady=>[0,3])
 
   # Set default item style
@@ -53,12 +53,12 @@ def demoIMovie(t)
 
   (0..4).each{|i|
     [
-      ['15:20', 'Clip 1', @images['imovie-01']], 
-      ['19:18', 'Clip 2', @images['imovie-02']], 
-      ['07:20', 'Clip 3', @images['imovie-03']], 
-      ['07:20', 'Clip 4', @images['imovie-04']], 
-      ['07:20', 'Clip 5', @images['imovie-05']], 
-      ['07:20', 'Clip 6', @images['imovie-06']], 
+      ['15:20', 'Clip 1', @images['imovie-01']],
+      ['19:18', 'Clip 2', @images['imovie-02']],
+      ['07:20', 'Clip 3', @images['imovie-03']],
+      ['07:20', 'Clip 4', @images['imovie-04']],
+      ['07:20', 'Clip 5', @images['imovie-05']],
+      ['07:20', 'Clip 6', @images['imovie-06']],
       ['07:20', 'Clip 7', @images['imovie-07']]
     ].each{|time, name, image|
       item = t.item_create
@@ -110,7 +110,7 @@ def iMovieButton1(w, x, y)
           Tk::TreeCtrl::BindCallback.entryOpen(w, i, 0, e)
           ent = TkComm.window(w.path + '.entry')
           unless exists
-            ent.configure(:borderwidth=>0, :justify=>:center, 
+            ent.configure(:borderwidth=>0, :justify=>:center,
                           :background=>'#ffdc5a')
             x1, y1, x2, y2 = w.item_bbox(i, 0, e)
             ent.place(:y=>y1 - 1)
diff --git a/ext/tk/sample/tkextlib/treectrl/layout.rb b/ext/tk/sample/tkextlib/treectrl/layout.rb
index 745ac86f36..488abe2aa9 100644
--- a/ext/tk/sample/tkextlib/treectrl/layout.rb
+++ b/ext/tk/sample/tkextlib/treectrl/layout.rb
@@ -2,7 +2,7 @@
 # Demo: Layout
 #
 def demoLayout(t)
-  t.configure(:showroot=>false, :showrootbutton=>true, :showbuttons=>true, 
+  t.configure(:showroot=>false, :showrootbutton=>true, :showbuttons=>true,
               :showlines=>true, :itemheight=>0, :selectmode=>:browse)
 
   if $HasColumnCreate
@@ -12,10 +12,10 @@ def demoLayout(t)
   end
 
   t.element_create('e1', :rect, :width=>30, :height=>30, :fill=>'gray20')
-  t.element_create('e2', :rect, :width=>30, :height=>30, :fill=>'gray40', 
+  t.element_create('e2', :rect, :width=>30, :height=>30, :fill=>'gray40',
                    :outline=>'blue', :outlinewidth=>3)
   t.element_create('e3', :rect, :fill=>'gray60')
-  t.element_create('e4', :rect, :showfocus=>true, 
+  t.element_create('e4', :rect, :showfocus=>true,
                    :fill=>[
                      @SystemHighlight, ['selected', 'focus'], 'gray80', []
                    ])
@@ -31,9 +31,9 @@ def demoLayout(t)
   t.style_layout(s, 'e3', :union=>['e1', 'e2'], :ipadx=>4, :ipady=>4, :pady=>2)
   t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
   t.style_layout(s, 'e5', :detach=>true, :padx=>[2,0], :pady=>2, :iexpand=>:s)
-  t.style_layout(s, 'e6', :detach=>true, :expand=>:ws, 
+  t.style_layout(s, 'e6', :detach=>true, :expand=>:ws,
                  :padx=>[0,2], :pady=>[2,0])
-  t.style_layout(s, 'e7', :detach=>true, :expand=>:wn, 
+  t.style_layout(s, 'e7', :detach=>true, :expand=>:wn,
                  :padx=>[0,2], :pady=>[0,2])
 
   if $Version_1_1_OrLater
@@ -53,7 +53,7 @@ def demoLayout(t)
   t.item_style_set(i, 0, s)
   t.item_lastchild(parent, i)
 
-  ### 
+  ###
 
   s = t.style_create('s2')
   t.style_elements(s, ['e4', 'e3', 'e1'])
@@ -77,7 +77,7 @@ def demoLayout(t)
   t.item_style_set(i2, 0, s)
   t.item_lastchild(i, i2)
 
-  ### 
+  ###
 
   s = t.style_create('s3')
   t.style_elements(s, ['e4', 'e3', 'e1', 'e5', 'e6'])
@@ -101,10 +101,10 @@ def demoLayout(t)
   t.item_style_set(i2, 0, s)
   t.item_lastchild(i, i2)
 
-  ### 
+  ###
 
-  t.element_create('eb', :border, :background=>@SystemButtonFace, 
-                   :relief=>[:sunken, ['selected'], :raised, []], 
+  t.element_create('eb', :border, :background=>@SystemButtonFace,
+                   :relief=>[:sunken, ['selected'], :raised, []],
                    :thickness=>2, :filled=>true)
   t.element_create('et', :text)
 
@@ -134,11 +134,11 @@ def demoLayout(t)
   t.item_text(i, 0, text)
   t.item_lastchild(parent, i)
 
-  ### 
+  ###
 
   styleNum = 5
-  [ 
-    [:horizontal, [:s, :ns, :n]], 
+  [
+    [:horizontal, [:s, :ns, :n]],
     [:vertical,   [:e, :we, :w]]
   ].each{|orient, expandList|
     expandList.each{|expand|
diff --git a/ext/tk/sample/tkextlib/treectrl/mailwasher.rb b/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
index 836e1e87de..1b51bb9b21 100644
--- a/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
+++ b/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
@@ -7,8 +7,8 @@ def demoMailWasher(t)
   height = t.font.metrics(:linespace) + 2
   height = 18 if height < 18
 
-  t.configure(:showroot=>false, :showrootbutton=>false, :showbuttons=>false, 
-              :showlines=>false, :itemheight=>height, :selectmode=>:browse, 
+  t.configure(:showroot=>false, :showrootbutton=>false, :showbuttons=>false,
+              :showlines=>false, :itemheight=>height, :selectmode=>:browse,
               :xscrollincrement=>1)
 
   pad = 4
@@ -16,14 +16,14 @@ def demoMailWasher(t)
   if $Version_1_1_OrLater
     t.column_create(:text=>'Delete', :textpadx=>pad, :tag=>'delete')
     t.column_create(:text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
-    t.column_create(:text=>'Status', :width=>80, :textpadx=>pad, 
+    t.column_create(:text=>'Status', :width=>80, :textpadx=>pad,
                     :tag=>'status')
-    t.column_create(:text=>'Size', :width=>40, :textpadx=>pad, 
+    t.column_create(:text=>'Size', :width=>40, :textpadx=>pad,
                     :justify=>:right, :tag=>'size')
     t.column_create(:text=>'From', :width=>140, :textpadx=>pad, :tag=>'from')
-    t.column_create(:text=>'Subject', :width=>240, :textpadx=>pad, 
+    t.column_create(:text=>'Subject', :width=>240, :textpadx=>pad,
                     :tag=>'subject')
-    t.column_create(:text=>'Received', :textpadx=>pad, :arrow=>:up, 
+    t.column_create(:text=>'Received', :textpadx=>pad, :arrow=>:up,
                     :arrowpad=>[4,0], :tag=>'received')
     t.column_create(:text=>'Attachments', :textpadx=>pad, :tag=>'attachments')
 
@@ -36,38 +36,38 @@ def demoMailWasher(t)
   else # TreeCtrl 1.0
     t.column_configure(0, :text=>'Delete', :textpadx=>pad, :tag=>'delete')
     t.column_configure(1, :text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
-    t.column_configure(2, :text=>'Status', :width=>80, :textpadx=>pad, 
+    t.column_configure(2, :text=>'Status', :width=>80, :textpadx=>pad,
                        :tag=>'status')
-    t.column_configure(3, :text=>'Size', :width=>40, :textpadx=>pad, 
+    t.column_configure(3, :text=>'Size', :width=>40, :textpadx=>pad,
                        :justify=>:right, :tag=>'size')
-    t.column_configure(4, :text=>'From', :width=>140, :textpadx=>pad, 
+    t.column_configure(4, :text=>'From', :width=>140, :textpadx=>pad,
                        :tag=>'from')
-    t.column_configure(5, :text=>'Subject', :width=>240, :textpadx=>pad, 
+    t.column_configure(5, :text=>'Subject', :width=>240, :textpadx=>pad,
                        :tag=>'subject')
-    t.column_configure(6, :text=>'Received', :textpadx=>pad, :arrow=>:up, 
+    t.column_configure(6, :text=>'Received', :textpadx=>pad, :arrow=>:up,
                        :arrowpad=>[4,0], :tag=>'received')
-    t.column_configure(7, :text=>'Attachments', :textpadx=>pad, 
+    t.column_configure(7, :text=>'Attachments', :textpadx=>pad,
                        :tag=>'attachments')
 
     t.element_create('imgOff', :image, :image=>@images['unchecked'])
     t.element_create('imgOn', :image, :image=>@images['checked'])
   end
 
-  t.element_create('border', :rect, :open=>:nw, :outline=>'gray', 
+  t.element_create('border', :rect, :open=>:nw, :outline=>'gray',
                    :outlinewidth=>1, :fill=>[@SystemHighlight, ['selected']])
-  t.element_create('txtAny', :text, :lines=>1, 
+  t.element_create('txtAny', :text, :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected']])
-  t.element_create('txtNone', :text, :text=>'none', :lines=>1, 
+  t.element_create('txtNone', :text, :text=>'none', :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected']])
-  t.element_create('txtYes', :text, :text=>'yes', :lines=>1, 
+  t.element_create('txtYes', :text, :text=>'yes', :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected']])
-  t.element_create('txtNormal', :text, :text=>'Normal', :lines=>1, 
+  t.element_create('txtNormal', :text, :text=>'Normal', :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected'], '#006800', []])
-  t.element_create('txtPossSpam', :text, :text=>'Possible Spam', :lines=>1, 
+  t.element_create('txtPossSpam', :text, :text=>'Possible Spam', :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected'], '#787800', []])
-  t.element_create('txtProbSpam', :text, :text=>'Probably Spam', :lines=>1, 
+  t.element_create('txtProbSpam', :text, :text=>'Probably Spam', :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected'], '#FF9000', []])
-  t.element_create('txtBlacklist', :text, :text=>'Blacklisted', :lines=>1, 
+  t.element_create('txtBlacklist', :text, :text=>'Blacklisted', :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected'], '#FF5800', []])
 
   if $Version_1_1_OrLater
@@ -96,16 +96,16 @@ def demoMailWasher(t)
   }
 
   [
-    ['baldy@spammer.com',  "Your hair is thinning"], 
-    ['flat@spammer.com', "Your breasts are too small"], 
-    ['tiny@spammer.com',  "Your penis is too small"], 
-    ['dumbass@spammer.com', "You are not very smart"], 
-    ['bankrobber@spammer.com', "You need more money"], 
-    ['loser@spammer.com', "You need better friends"], 
-    ['gossip@spammer.com', "Find out what your coworkers think about you"], 
+    ['baldy@spammer.com',  "Your hair is thinning"],
+    ['flat@spammer.com', "Your breasts are too small"],
+    ['tiny@spammer.com',  "Your penis is too small"],
+    ['dumbass@spammer.com', "You are not very smart"],
+    ['bankrobber@spammer.com', "You need more money"],
+    ['loser@spammer.com', "You need better friends"],
+    ['gossip@spammer.com', "Find out what your coworkers think about you"],
     ['whoami@spammer.com', "Find out what you think about yourself"],
-    ['downsized@spammer.com', "You need a better job"], 
-    ['poorhouse@spammer.com', "Your mortgage is a joke"], 
+    ['downsized@spammer.com', "You need a better job"],
+    ['poorhouse@spammer.com', "Your mortgage is a joke"],
     ['spam4ever@spammer.com', "You need more spam"]
   ].each{|frm, subj|
     item = t.item_create
@@ -115,8 +115,8 @@ def demoMailWasher(t)
     if $Version_1_1_OrLater
       delete = [false, true][rand(2)]
       bounce = [false, true][rand(2)]
-      t.item_style_set(item, 
-                       0, 'styCheck', 1, 'styCheck', 2, status, 3, 'styAny', 
+      t.item_style_set(item,
+                       0, 'styCheck', 1, 'styCheck', 2, status, 3, 'styAny',
                        4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
       t.item_state_forcolumn(item, 'delete', 'CHECK') if delete
       t.item_state_forcolumn(item, 'bounce', 'CHECK') if bounce
@@ -124,8 +124,8 @@ def demoMailWasher(t)
     else # TreeCtrl 1.0
       delete = ['styOn', 'styOff'][rand(2)]
       bounce = ['styOn', 'styOff'][rand(2)]
-      t.item_style_set(item, 
-                       0, delete, 1, bounce, 2, status, 3, 'styAny', 
+      t.item_style_set(item,
+                       0, delete, 1, bounce, 2, status, 3, 'styAny',
                        4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
     end
 
@@ -138,7 +138,7 @@ def demoMailWasher(t)
   }
 
   sortColumn = 6
-  t.notify_bind(t, 'Header-invoke', 
+  t.notify_bind(t, 'Header-invoke',
                 proc{|c, w|
                   if c == sortColumn
                     if w.column_cget(sortColumn, :arrow) == 'down'
@@ -162,35 +162,35 @@ def demoMailWasher(t)
                   w.column_configure(c, :arrow=>arrow)
                   case w.column_cget(c, :tag)
                   when 'bounce', 'delete'
-                    w.item_sort(:root, order, 
-                                { 
-                                  :column=>c, 
+                    w.item_sort(:root, order,
+                                {
+                                  :column=>c,
                                   :command=>proc{|item1, item2|
                                     compareOnOff(w, c, item1, item2)
                                   }
-                                }, 
+                                },
                                 { :column=>'subject', :dictionary=>true })
                   when 'status'
-                    w.item_sort(:root, order, 
+                    w.item_sort(:root, order,
                                 { :column=>c, :dictionary=>true })
                   when 'from'
-                    w.item_sort(:root, order, 
-                                { :column=>c, :dictionary=>true }, 
+                    w.item_sort(:root, order,
+                                { :column=>c, :dictionary=>true },
                                 { :column=>'subject', :dictionary=>true })
                   when 'subject'
-                    w.item_sort(:root, order, 
+                    w.item_sort(:root, order,
                                 { :column=>c, :dictionary=>true })
                   when 'size'
-                    w.item_sort(:root, order, 
-                                { :column=>c, :dictionary=>true }, 
+                    w.item_sort(:root, order,
+                                { :column=>c, :dictionary=>true },
                                 { :column=>'subject', :dictionary=>true })
                   when 'received'
-                    w.item_sort(:root, order, 
-                                { :column=>c, :dictionary=>true }, 
+                    w.item_sort(:root, order,
+                                { :column=>c, :dictionary=>true },
                                 { :column=>'subject', :dictionary=>true })
                   when 'attachments'
-                    w.item_sort(:root, order, 
-                                { :column=>c, :dictionary=>true }, 
+                    w.item_sort(:root, order,
+                                { :column=>c, :dictionary=>true },
                                 { :column=>'subject', :dictionary=>true })
                   end
                 }, '%C %T')
@@ -198,7 +198,7 @@ def demoMailWasher(t)
   mailWasher = TkBindTag.new
 
   if $Version_1_1_OrLater
-    mailWasher.bind('ButtonPress-1', 
+    mailWasher.bind('ButtonPress-1',
                     proc{|w, x, y|
                       id = w.identify(x, y)
                       if id.empty?
@@ -214,7 +214,7 @@ def demoMailWasher(t)
                       end
                     }, '%W %x %y')
   else # TreeCtrl 1.0
-    mailWasher.bind('ButtonPress-1', 
+    mailWasher.bind('ButtonPress-1',
                     proc{|w, x, y|
                       id = w.identify(x, y)
                       if id.empty?
diff --git a/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb b/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
index c3af86868e..d966807866 100644
--- a/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
+++ b/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
@@ -7,7 +7,7 @@ def demoOutlookFolders(t)
   height = t.font.metrics(:linespace) + 2
   height = 18 if height < 18
 
-  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>true, 
+  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>true,
               :showroot=>true, :showrootbutton=>false, :showbuttons=>true)
 
   if $HasColumnCreate
@@ -17,15 +17,15 @@ def demoOutlookFolders(t)
   end
 
   t.element_create('e1', :image)
-  t.element_create('e2', :text, :lines=>1, 
+  t.element_create('e2', :text, :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e3', :text, :lines=>1, :font=>t.font.dup.weight(:bold), 
+  t.element_create('e3', :text, :lines=>1, :font=>t.font.dup.weight(:bold),
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
   t.element_create('e4', :text, :fill=>'blue')
   t.element_create('e5', :image, :image=>@images['outlook-folder'])
-  t.element_create('e6', :rect, :showfocus=>true, 
+  t.element_create('e6', :rect, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray', ['selected', '!focus']
                    ])
 
@@ -60,28 +60,28 @@ def demoOutlookFolders(t)
   t.style_layout(s, 'e6', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
 
   t.item_style_set(:root, 0, 's1')
-  t.item_complex(:root, 
+  t.item_complex(:root,
                  [
-                   ['e1', {:image=>@images['outlook-main']}], 
+                   ['e1', {:image=>@images['outlook-main']}],
                    ['e2', {:text=>'Outlook Express'}]
                  ])
 
   parentList = [:root, '', '', '', '', '', '']
   parent = :root
   [
-     [0, :local, "Local Folders", true, 0], 
-        [1, :inbox, 'Inbox', false, 5], 
-        [1, :outbox, 'Outbox', false, 0], 
-        [1, :sent, "Sent Items", false, 0], 
-        [1, :deleted, "Deleted Items", false, 50], 
-        [1, :draft, 'Drafts', false, 0], 
-        [1, :folder, "Messages to Dad", false, 0], 
-        [1, :folder, "Messages to Sis", false, 0], 
-        [1, :folder, "Messages to Me", false, 0], 
-           [2, :folder, "2001", false, 0], 
-           [2, :folder, "2000", false, 0], 
-           [2, :folder, "1999", false, 0], 
-     [0, :server, "news.gmane.org", true, 0], 
+     [0, :local, "Local Folders", true, 0],
+        [1, :inbox, 'Inbox', false, 5],
+        [1, :outbox, 'Outbox', false, 0],
+        [1, :sent, "Sent Items", false, 0],
+        [1, :deleted, "Deleted Items", false, 50],
+        [1, :draft, 'Drafts', false, 0],
+        [1, :folder, "Messages to Dad", false, 0],
+        [1, :folder, "Messages to Sis", false, 0],
+        [1, :folder, "Messages to Me", false, 0],
+           [2, :folder, "2001", false, 0],
+           [2, :folder, "2000", false, 0],
+           [2, :folder, "1999", false, 0],
+     [0, :server, "news.gmane.org", true, 0],
         [1, :group, "gmane.comp.lang.lua.general", false, 498]
   ].each{|depth, img, text, button, unread|
     if $Version_1_1_OrLater
@@ -93,7 +93,7 @@ def demoOutlookFolders(t)
     if img == :folder
       if unread != 0
         t.item_style_set(item, 0, 's4')
-        t.item_complex(item, 
+        t.item_complex(item,
                        [['e3', {:text=>text}], ['e4', {:text=>"(#{unread})"}]])
       else
         t.item_style_set(item, 0, 's3')
@@ -102,17 +102,17 @@ def demoOutlookFolders(t)
     else
       if unread != 0
         t.item_style_set(item, 0, 's2')
-        t.item_complex(item, 
+        t.item_complex(item,
                        [
-                         ['e1', {:image=>@images["outlook-#{img}"]}], 
-                         ['e3', {:text=>text}], 
+                         ['e1', {:image=>@images["outlook-#{img}"]}],
+                         ['e3', {:text=>text}],
                          ['e4', {:text=>"(#{unread})"}]
                        ])
       else
         t.item_style_set(item, 0, 's1')
-        t.item_complex(item, 
+        t.item_complex(item,
                        [
-                         ['e1', {:image=>@images["outlook-#{img}"]}], 
+                         ['e1', {:image=>@images["outlook-#{img}"]}],
                          ['e2', {:text=>text}]
                        ])
       end
diff --git a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
index d7e7f7e004..3495522e5c 100644
--- a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
+++ b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
@@ -6,7 +6,7 @@ def demoOutlookNewsgroup(t)
 
   height = t.font.metrics(:linespace)
   height = 18 if height < 18
-  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false, 
+  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
               :showroot=>false, :showrootbutton=>false, :showbuttons=>true)
 
   if $Version_1_1_OrLater
@@ -24,7 +24,7 @@ def demoOutlookNewsgroup(t)
     t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
     t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
     t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
-    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right, 
+    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
                        :tag=>'size')
   end
 
@@ -37,35 +37,35 @@ def demoOutlookNewsgroup(t)
   # State for a message with unread descendants
   t.state_define('unread')
 
-  t.element_create('elemImg', :image, 
+  t.element_create('elemImg', :image,
                    :image=>[
-                     @sel_images['outlook-read-2'], 
-                          ['selected', 'read', 'unread', '!open'], 
+                     @sel_images['outlook-read-2'],
+                          ['selected', 'read', 'unread', '!open'],
                      @images['outlook-read-2'], ['read', 'unread', '!open'],
-                     @sel_images['outlook-read'], ['selected', 'read'], 
-                     @images['outlook-read'], ['read'], 
-                     @sel_images['outlook-unread'], ['selected'], 
+                     @sel_images['outlook-read'], ['selected', 'read'],
+                     @images['outlook-read'], ['read'],
+                     @sel_images['outlook-unread'], ['selected'],
                      @images['outlook-unread'], []
                    ])
-  t.element_create('elemTxt', :text, :lines=>1, 
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']], 
+  t.element_create('elemTxt', :text, :lines=>1,
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']],
                    :font=>[
-                     t.font.dup.weight(:bold), ['read', 'unread', '!open'], 
+                     t.font.dup.weight(:bold), ['read', 'unread', '!open'],
                      t.font.dup.weight(:bold), ['!read']
                    ])
-  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true, 
+  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray',  ['selected', '!focus']
                    ])
-  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true, 
+  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray',  ['selected', '!focus']
                    ])
-  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true, 
+  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray',  ['selected', '!focus']
                    ])
 
@@ -74,7 +74,7 @@ def demoOutlookNewsgroup(t)
   t.style_elements(s, ['sel.e', 'elemImg', 'elemTxt'])
   t.style_layout(s, 'elemImg', :expand=>:ns)
   t.style_layout(s, 'elemTxt', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['elemTxt'], 
+  t.style_layout(s, 'sel.e', :union=>['elemTxt'],
                  :iexpand=>:nes, :ipadx=>[2,0])
 
   # Text
@@ -168,12 +168,12 @@ def demoOutlookNewsgroup(t)
   }
 
   # Do something when the selection changes
-  t.notify_bind(t, 'Selection', 
+  t.notify_bind(t, 'Selection',
                 proc{|w|
                   if w.selection_count == 1
                     # One item is selected
                     if @Message[:afterId][:id]
-                      Tk.after_cancel(@Message[:afterId][:id]) 
+                      Tk.after_cancel(@Message[:afterId][:id])
                     end
                     @Message[:afterId][:item] = w.selection_get[0]
                     @Message[:afterId][:id] = Tk.after(500, proc{
@@ -208,7 +208,7 @@ def demoOutlookNewsgroup2(t)
 
   height = t.font.metrics(:linespace)
   height = 18 if height < 18
-  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false, 
+  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
               :showroot=>false, :showrootbutton=>false, :showbuttons=>true)
 
   if $Version_1_1_OrLater
@@ -226,7 +226,7 @@ def demoOutlookNewsgroup2(t)
     t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
     t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
     t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
-    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right, 
+    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
                        :tag=>'size')
   end
 
@@ -235,24 +235,24 @@ def demoOutlookNewsgroup2(t)
   t.element_create('image.unread', :image, :image=>@images['outlook-unread'])
   t.element_create('image.read', :image, :image=>@images['outlook-read'])
   t.element_create('image.read2', :image, :image=>@images['outlook-read-2'])
-  t.element_create('text.read', :text, :lines=>1, 
+  t.element_create('text.read', :text, :lines=>1,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('text.unread', :text, :lines=>1, 
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']], 
+  t.element_create('text.unread', :text, :lines=>1,
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']],
                    :font=>t.font.dup.weight(:bold))
-  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true, 
+  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray',  ['selected', '!focus']
                    ])
-  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true, 
+  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray',  ['selected', '!focus']
                    ])
-  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true, 
+  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray',  ['selected', '!focus']
                    ])
 
@@ -261,7 +261,7 @@ def demoOutlookNewsgroup2(t)
   t.style_elements(s, ['sel.e', 'image.unread', 'text.unread'])
   t.style_layout(s, 'image.unread', :expand=>:ns)
   t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['text.unread'], 
+  t.style_layout(s, 'sel.e', :union=>['text.unread'],
                  :iexpand=>:nes, :ipadx=>[2,0])
 
   # Image + text
@@ -269,7 +269,7 @@ def demoOutlookNewsgroup2(t)
   t.style_elements(s, ['sel.e', 'image.read', 'text.read'])
   t.style_layout(s, 'image.read', :expand=>:ns)
   t.style_layout(s, 'text.read', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['text.read'], 
+  t.style_layout(s, 'sel.e', :union=>['text.read'],
                  :iexpand=>:nes, :ipadx=>[2,0])
 
   # Image + text
@@ -277,7 +277,7 @@ def demoOutlookNewsgroup2(t)
   t.style_elements(s, ['sel.e', 'image.read2', 'text.unread'])
   t.style_layout(s, 'image.read2', :expand=>:ns)
   t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['text.unread'], 
+  t.style_layout(s, 'sel.e', :union=>['text.unread'],
                  :iexpand=>:nes, :ipadx=>[2,0])
 
   # Text
@@ -350,7 +350,7 @@ def demoOutlookNewsgroup2(t)
       style = 'unread'
       style2 = 'unread2'
     end
-    t.item_style_set(i, 3, style, 4, "#{style2}.we", 5, "#{style2}.we", 
+    t.item_style_set(i, 3, style, 4, "#{style2}.we", 5, "#{style2}.we",
                      6, "#{style2}.w")
     t.item_text(i, 3, subject, 4, from, 5, sent, 6, size)
     if t.item_numchildren(i) > 0
@@ -359,24 +359,24 @@ def demoOutlookNewsgroup2(t)
   }
 
   # Do something when the selection changes
-  t.notify_bind(t, 'Selection', 
+  t.notify_bind(t, 'Selection',
                 proc{|w|
                   if w.selection_count == 1
                     i = t.selection_get[0]
                     unless @Message[:read][i]
                       if t.item_isopen(i) || !anyUnreadDescendants(t, i)
                         # unread -> read
-                        t.item_style_map(i, 'subject', 'read', 
+                        t.item_style_map(i, 'subject', 'read',
                                          ['text.unread', 'text.read'])
-                        t.item_style_map(i, 'from', 'read.we', 
+                        t.item_style_map(i, 'from', 'read.we',
                                          ['text.unread', 'text.read'])
-                        t.item_style_map(i, 'sent', 'read.we', 
+                        t.item_style_map(i, 'sent', 'read.we',
                                          ['text.unread', 'text.read'])
-                        t.item_style_map(i, 'size', 'read.w', 
+                        t.item_style_map(i, 'size', 'read.w',
                                          ['text.unread', 'text.read'])
                       else
                         # unread -> read2
-                        t.item_style_map(i, 'subject', 'read2', 
+                        t.item_style_map(i, 'subject', 'read2',
                                          ['text.unread', 'text.unread'])
                       end
 
@@ -386,34 +386,34 @@ def demoOutlookNewsgroup2(t)
                   end
                 }, '%T')
 
-  t.notify_bind(t, 'Expand-after', 
+  t.notify_bind(t, 'Expand-after',
                 proc{|w, i|
                   if @Messge[:read][i] && anyUnreadDescendants(t, i)
                     # read2 -> read
-                    t.item_style_map(i, 'subject', 'read', 
+                    t.item_style_map(i, 'subject', 'read',
                                      ['text.unread', 'text.read'])
                     # unread -> read
-                    t.item_style_map(i, 'from', 'read.we', 
+                    t.item_style_map(i, 'from', 'read.we',
                                      ['text.unread', 'text.read'])
-                    t.item_style_map(i, 'sent', 'read.we', 
+                    t.item_style_map(i, 'sent', 'read.we',
                                      ['text.unread', 'text.read'])
-                    t.item_style_map(i, 'size', 'read.w', 
+                    t.item_style_map(i, 'size', 'read.w',
                                      ['text.unread', 'text.read'])
                   end
                 }, '%T %I')
 
-  t.notify_bind(t, 'Collapse-after', 
+  t.notify_bind(t, 'Collapse-after',
                 proc{|w, i|
                   if @Messge[:read][i] && anyUnreadDescendants(t, i)
                     # read -> read2
-                    t.item_style_map(i, 'subject', 'read2', 
+                    t.item_style_map(i, 'subject', 'read2',
                                      ['text.read', 'text.unread'])
                     # read -> unread
-                    t.item_style_map(i, 'from', 'unread.we', 
+                    t.item_style_map(i, 'from', 'unread.we',
                                      ['text.read', 'text.unread'])
-                    t.item_style_map(i, 'sent', 'unread.we', 
+                    t.item_style_map(i, 'sent', 'unread.we',
                                      ['text.read', 'text.unread'])
-                    t.item_style_map(i, 'size', 'unread.w', 
+                    t.item_style_map(i, 'size', 'unread.w',
                                      ['text.read', 'text.unread'])
                   end
                 }, '%T %I')
diff --git a/ext/tk/sample/tkextlib/treectrl/random.rb b/ext/tk/sample/tkextlib/treectrl/random.rb
index 2c9e614aa5..43aca63283 100644
--- a/ext/tk/sample/tkextlib/treectrl/random.rb
+++ b/ext/tk/sample/tkextlib/treectrl/random.rb
@@ -1,4 +1,4 @@
-# 
+#
 def random_N
   @RandomN[0] || 500
 end
@@ -11,39 +11,39 @@ def demoRandom(t)
 
   height = t.font.metrics(:linespace)
   height = 18 if height < 18
-  t.configure(:itemheight=>height, :selectmode=>:extended, 
-              :showroot=>true, :showrootbutton=>true, :showbuttons=>true, 
-              :showlines=>true, :scrollmargin=>16, 
+  t.configure(:itemheight=>height, :selectmode=>:extended,
+              :showroot=>true, :showrootbutton=>true, :showbuttons=>true,
+              :showlines=>true, :scrollmargin=>16,
               :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
 
   if $Version_1_1_OrLater
-    t.column_create(:expand=>true, :text=>'Item', 
+    t.column_create(:expand=>true, :text=>'Item',
                     :itembackground=>['#e0e8f0', []], :tag=>'item')
-    t.column_create(:text=>'Parent', :justify=>:center, 
+    t.column_create(:text=>'Parent', :justify=>:center,
                     :itembackground=>['gray90', []], :tag=>'parent')
-    t.column_create(:text=>'Depth', :justify=>:center, 
+    t.column_create(:text=>'Depth', :justify=>:center,
                     :itembackground=>['linen', []], :tag=>'depth')
   else # TreeCtrl 1.0
-    t.column_configure(0, :expand=>true, :text=>'Item', 
+    t.column_configure(0, :expand=>true, :text=>'Item',
                        :itembackground=>['#e0e8f0', []], :tag=>'item')
-    t.column_configure(1, :text=>'Parent', :justify=>:center, 
+    t.column_configure(1, :text=>'Parent', :justify=>:center,
                        :itembackground=>['gray90', []], :tag=>'parent')
-    t.column_configure(2, :text=>'Depth', :justify=>:center, 
+    t.column_configure(2, :text=>'Depth', :justify=>:center,
                        :itembackground=>['linen', []], :tag=>'depth')
   end
 
   t.element_create('e1', :image, :image=>[
-                     @images['folder-open'], ['open'], 
+                     @images['folder-open'], ['open'],
                      @images['folder-closed'], []
                    ])
   t.element_create('e2', :image, :image=>@images['small-file'])
-  t.element_create('e3', :text, 
+  t.element_create('e3', :text,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
   t.element_create('e4', :text, :fill=>'blue')
   t.element_create('e6', :text)
-  t.element_create('e5', :rect, :showfocus=>true, 
+  t.element_create('e5', :rect, :showfocus=>true,
                    :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 
+                     @SystemHighlight, ['selected', 'focus'],
                      'gray', ['selected', '!focus']
                    ])
 
@@ -65,11 +65,11 @@ def demoRandom(t)
   t.style_layout(s, 'e6', :padx=>6, :expand=>:ns)
 
   @Priv[:sensitive, t] = [
-    [:item, 's1',  'e5', 'e1', 'e3'], 
+    [:item, 's1',  'e5', 'e1', 'e3'],
     [:item, 's2',  'e5', 'e2', 'e3']
   ]
   @Priv[:dragimage, t] = [
-    [:item, 's1',  'e1', 'e3'], 
+    [:item, 's1',  'e1', 'e3'],
     [:item, 's2',  'e2', 'e3']
   ]
 
@@ -108,16 +108,16 @@ def demoRandom(t)
         t.item_hasbutton(item_i, true)
       end
       t.item_style_set(item_i, 0, 's1', 1, 's3', 2, 's3')
-      t.item_complex(item_i, 
-                     [ ['e3', {:text=>"Item #{i}"}], 
-                       ['e4', {:text=>"(#{numChildren})"}] ], 
-                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ], 
+      t.item_complex(item_i,
+                     [ ['e3', {:text=>"Item #{i}"}],
+                       ['e4', {:text=>"(#{numChildren})"}] ],
+                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
                      [ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
     else
       t.item_style_set(item_i, 1, 's3', 2, 's3', 0, 's2')
-      t.item_complex(item_i, 
-                     [ ['e3', {:text=>"Item #{i}"}] ], 
-                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ], 
+      t.item_complex(item_i,
+                     [ ['e3', {:text=>"Item #{i}"}] ],
+                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
                      [ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
     end
   }
@@ -125,46 +125,46 @@ def demoRandom(t)
 
   treeCtrlRandom = TkBindTag.new
 
-  treeCtrlRandom.bind('Double-ButtonPress-1', 
+  treeCtrlRandom.bind('Double-ButtonPress-1',
                       proc{|w, x, y|
                         Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
                         Tk.callback_break
                       }, '%W %x %y')
 
-  treeCtrlRandom.bind('Control-ButtonPress-1', 
+  treeCtrlRandom.bind('Control-ButtonPress-1',
                       proc{|w, x, y|
                         @Priv['selectMode'] = :toggle
                         randomButton1(w, x, y)
                         Tk.callback_break
                       }, '%W %x %y')
 
-  treeCtrlRandom.bind('Shift-ButtonPress-1', 
+  treeCtrlRandom.bind('Shift-ButtonPress-1',
                       proc{|w, x, y|
                         @Priv['selectMode'] = :add
                         randomButton1(w, x, y)
                         Tk.callback_break
                       }, '%W %x %y')
 
-  treeCtrlRandom.bind('ButtonPress-1', 
+  treeCtrlRandom.bind('ButtonPress-1',
                       proc{|w, x, y|
                         @Priv['selectMode'] = :set
                         randomButton1(w, x, y)
                         Tk.callback_break
                       }, '%W %x %y')
 
-  treeCtrlRandom.bind('Button1-Motion', 
+  treeCtrlRandom.bind('Button1-Motion',
                       proc{|w, x, y|
                         randomMotion1(w, x, y)
                         Tk.callback_break
                       }, '%W %x %y')
 
-  treeCtrlRandom.bind('Button1-Leave', 
+  treeCtrlRandom.bind('Button1-Leave',
                       proc{|w, x, y|
                         randomLeave1(w, x, y)
                         Tk.callback_break
                       }, '%W %x %y')
 
-  treeCtrlRandom.bind('ButtonRelease-1', 
+  treeCtrlRandom.bind('ButtonRelease-1',
                       proc{|w, x, y|
                         randomRelease1(w, x, y)
                         Tk.callback_break
@@ -363,7 +363,7 @@ def randomRelease1(t, x, y)
     t.selection_modify('', @Priv[:drop])
     t[:cursor] = ''
     if @Priv[:drop] != ''
-      randomDrop(t, @Priv[:drop], @Priv.list_element(:selection), 
+      randomDrop(t, @Priv[:drop], @Priv.list_element(:selection),
                  @Priv[:drop, :pos])
     end
   end
@@ -479,7 +479,7 @@ def randomAutoScanCheck(t, x, y)
       when 'drag', 'marquee'
         randomMotion(t, x, y)
       end
-      @Priv[:autoscan, :afterId, t] = 
+      @Priv[:autoscan, :afterId, t] =
         Tk.after(delay, proc{ randomAutoScanCheckAux(t) })
     end
     return
@@ -502,7 +502,7 @@ def demoRandom2(t)
 
   init_pics('mac-*')
 
-  t.configure(:openbuttonimage=>@images['mac-collapse'], 
-              :closedbuttonimage=>@images['mac-expand'], 
+  t.configure(:openbuttonimage=>@images['mac-collapse'],
+              :closedbuttonimage=>@images['mac-expand'],
               :showlines=>false)
 end
diff --git a/ext/tk/sample/tkextlib/treectrl/www-options.rb b/ext/tk/sample/tkextlib/treectrl/www-options.rb
index efa55ca06c..6a3e9c2201 100644
--- a/ext/tk/sample/tkextlib/treectrl/www-options.rb
+++ b/ext/tk/sample/tkextlib/treectrl/www-options.rb
@@ -3,7 +3,7 @@ def demoInternetOptions (t)
 
   height = t.font.metrics(:linespace) + 2
   height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
               :itemheight=>height, :selectmode=>:browse)
 
   init_pics('internet-*')
@@ -19,14 +19,14 @@ def demoInternetOptions (t)
   t.state_define('on')
 
   t.element_create('e1', :image, :image=>[
-                     @images['internet-check-on'],  ['check', 'on'], 
-                     @images['internet-check-off'], ['check'], 
-                     @images['internet-radio-on'],  ['radio', 'on'], 
+                     @images['internet-check-on'],  ['check', 'on'],
+                     @images['internet-check-off'], ['check'],
+                     @images['internet-radio-on'],  ['radio', 'on'],
                      @images['internet-radio-off'], ['radio']
                    ])
-  t.element_create('e2', :text, 
+  t.element_create('e2', :text,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e3', :rect, :showfocus=>true, 
+  t.element_create('e3', :rect, :showfocus=>true,
                    :fill=>[@SystemHighlight, ['selected', 'focus']])
 
   s = t.style_create('s1')
@@ -38,18 +38,18 @@ def demoInternetOptions (t)
   parentList = [:root, '', '', '', '', '', '']
   parent = :root
   [
-    [0, :print, "Printing", "", ""], 
-        [1, :off, "Print background colors and images", "o1", ""], 
-    [0, :search, "Search from Address bar", "", ""], 
-        [1, :search, "When searching", "", ""], 
-            [2, :off, "Display results, and go to the most likely sites", 
-                                                                 "o2", "r1"], 
-            [2, :off, "Do not search from the Address bar", "o3", "r1"], 
-            [2, :off, "Just display the results in the main window", 
+    [0, :print, "Printing", "", ""],
+        [1, :off, "Print background colors and images", "o1", ""],
+    [0, :search, "Search from Address bar", "", ""],
+        [1, :search, "When searching", "", ""],
+            [2, :off, "Display results, and go to the most likely sites",
+                                                                 "o2", "r1"],
+            [2, :off, "Do not search from the Address bar", "o3", "r1"],
+            [2, :off, "Just display the results in the main window",
                                                                  "o4", "r1"],
-            [2, :on, "Just go to the most likely site", "o5", "r1"], 
-    [0, :security, "Security", "", ""], 
-        [1, :on, "Check for publisher's certificate revocation", "o5", ""], 
+            [2, :on, "Just go to the most likely site", "o5", "r1"],
+    [0, :security, "Security", "", ""],
+        [1, :on, "Check for publisher's certificate revocation", "o5", ""],
         [1, :off, "Check for server certificate revocation (requires restart)",
                                                                  "o6", ""]
   ].each{|depth, setting, text, option, group|
@@ -73,7 +73,7 @@ def demoInternetOptions (t)
         t.item_state_set(item, 'radio')
       end
     else
-      t.item_element_configure(item, 0, 'e1', 
+      t.item_element_configure(item, 0, 'e1',
                                :image=>@images["internet-#{setting}"])
     end
     t.item_lastchild(parentList[depth], item)
@@ -146,7 +146,7 @@ end
 def demoInternetOptions_2(t)
   height = t.font.metrics(:linespace) + 2
   height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
               :itemheight=>height, :selectmode=>:browse)
 
   init_pics('internet-*')
@@ -154,9 +154,9 @@ def demoInternetOptions_2(t)
   t.column_configure(0, :text=>'Internet Options')
 
   t.element_create('e1', :image)
-  t.element_create('e2', :text, 
+  t.element_create('e2', :text,
                    :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e3', :rect, :showfocus=>true, 
+  t.element_create('e3', :rect, :showfocus=>true,
                    :fill=>[@SystemHighlight, ['selected', 'focus']])
 
   s = t.style_create('s1')
@@ -168,18 +168,18 @@ def demoInternetOptions_2(t)
   parentList = [:root, '', '', '', '', '', '']
   parent = :root
   [
-    [0, :print, "Printing", "", ""], 
-        [1, :off, "Print background colors and images", "o1", ""], 
-    [0, :search, "Search from Address bar", "", ""], 
-        [1, :search, "When searching", "", ""], 
-            [2, :off, "Display results, and go to the most likely sites", 
-                                                                 "o2", "r1"], 
-            [2, :off, "Do not search from the Address bar", "o3", "r1"], 
-            [2, :off, "Just display the results in the main window", 
+    [0, :print, "Printing", "", ""],
+        [1, :off, "Print background colors and images", "o1", ""],
+    [0, :search, "Search from Address bar", "", ""],
+        [1, :search, "When searching", "", ""],
+            [2, :off, "Display results, and go to the most likely sites",
+                                                                 "o2", "r1"],
+            [2, :off, "Do not search from the Address bar", "o3", "r1"],
+            [2, :off, "Just display the results in the main window",
                                                                  "o4", "r1"],
-            [2, :on, "Just go to the most likely site", "o5", "r1"], 
-    [0, :security, "Security", "", ""], 
-        [1, :on, "Check for publisher's certificate revocation", "o5", ""], 
+            [2, :on, "Just go to the most likely site", "o5", "r1"],
+    [0, :security, "Security", "", ""],
+        [1, :on, "Check for publisher's certificate revocation", "o5", ""],
         [1, :off, "Check for server certificate revocation (requires restart)",
                                                                  "o6", ""]
   ].each{|depth, setting, text, option, group|
@@ -201,7 +201,7 @@ def demoInternetOptions_2(t)
         t.item_element_configure(item, 0, 'e1', :image=>img)
       end
     else
-      t.item_element_configure(item, 0, 'e1', 
+      t.item_element_configure(item, 0, 'e1',
                                :image=>@images["internet-#{setting}"])
     end
     t.item_lastchild(parentList[depth], item)
@@ -256,16 +256,16 @@ def optionButton1_2(w, x, y)
       else
         setting = :on
       end
-      w.item_element_configure(item, 0, 'e1', 
+      w.item_element_configure(item, 0, 'e1',
                                :image=>@images["internet-check-#{setting}"])
       @Option[:setting, item] = setting
     else
       # a radiobutton
       current = @Option[:current, group]
       return if current == item.to_s
-      w.item_element_configure(current, 0, 'e1', 
+      w.item_element_configure(current, 0, 'e1',
                                :image=>@images["internet-radio-off"])
-      w.item_element_configure(item, 0, 'e1', 
+      w.item_element_configure(item, 0, 'e1',
                                :image=>@images["internet-radio-on"])
       @Option[:setting, item] = :on
       @Option[:current, group] = item
diff --git a/ext/tk/sample/tkextlib/vu/canvItems.rb b/ext/tk/sample/tkextlib/vu/canvItems.rb
index 33acf4f7e7..364f87613b 100644
--- a/ext/tk/sample/tkextlib/vu/canvItems.rb
+++ b/ext/tk/sample/tkextlib/vu/canvItems.rb
@@ -9,63 +9,63 @@ xbm = File.join(File.dirname(File.expand_path(__FILE__)), 'm128_000.xbm')
 
 sval = [ 11, 22, 33, 44, 55, 66, 77, 88, 99 ]
 
-l0 = TkLabel.new(:width=>128, :height=>128, 
+l0 = TkLabel.new(:width=>128, :height=>128,
                  :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
 
-c0 = TkCanvas.new(:width=>80, :height=>80, 
-                  :insertwidth=>0, :highlightthickness=>0, 
-                  :selectborderwidth=>0, :borderwidth=>2, 
-                  :relief=>:ridge).place(:in=>l0, :relx=>0.5, :rely=>0.5, 
+c0 = TkCanvas.new(:width=>80, :height=>80,
+                  :insertwidth=>0, :highlightthickness=>0,
+                  :selectborderwidth=>0, :borderwidth=>2,
+                  :relief=>:ridge).place(:in=>l0, :relx=>0.5, :rely=>0.5,
                                          :anchor=>:c)
 
-st = Tk::Vu::TkcStripchart.new(c0, 3, 3, 80, 80, 
-                               :background=>"#b7c0d7", :fill=>'slategray3', 
-                               :jumpscroll=>1, :outline=>'black', 
-                               :scaleline=>'blue', :stripline=>'red', 
+st = Tk::Vu::TkcStripchart.new(c0, 3, 3, 80, 80,
+                               :background=>"#b7c0d7", :fill=>'slategray3',
+                               :jumpscroll=>1, :outline=>'black',
+                               :scaleline=>'blue', :stripline=>'red',
                                :selected=>1, :values=>sval)
 
-TkcText.create(c0, 40, 40, 
+TkcText.create(c0, 40, 40,
                :text=>Tk::TCL_PATCHLEVEL, :fill=>'cyan', :tags=>'text')
 
 
-l1 = TkLabel.new(:width=>128, :height=>128, 
+l1 = TkLabel.new(:width=>128, :height=>128,
                  :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
 
-c1 = TkCanvas.new(:width=>80, :height=>80, 
-                  :insertwidth=>0, :highlightthickness=>0, 
-                  :selectborderwidth=>0, :borderwidth=>2, 
-                  :relief=>:ridge).place(:in=>l1, :relx=>0.5, :rely=>0.5, 
+c1 = TkCanvas.new(:width=>80, :height=>80,
+                  :insertwidth=>0, :highlightthickness=>0,
+                  :selectborderwidth=>0, :borderwidth=>2,
+                  :relief=>:ridge).place(:in=>l1, :relx=>0.5, :rely=>0.5,
                                          :anchor=>:c)
 
-bar1 = Tk::Vu::TkcBarchart.new(c1, 3, 3, 80, 80, 
-                               :background=>"#b7c0d7", :scalevalue=>10.0, 
-                               :autocolor=>true, :selected=>1, 
-                               :outline=>'black', :barline=>'yellow', 
+bar1 = Tk::Vu::TkcBarchart.new(c1, 3, 3, 80, 80,
+                               :background=>"#b7c0d7", :scalevalue=>10.0,
+                               :autocolor=>true, :selected=>1,
+                               :outline=>'black', :barline=>'yellow',
                                :scalelinestyle=>0)
 
-bar2 = Tk::Vu::TkcBarchart.new(c1, 53, 3, 80, 80, 
-                               :background=>"#b7c0d7", :scalevalue=>10.0, 
-                               :autocolor=>true, :selected=>1, 
-                               :outline=>'black', :fill=>"#b7c0d7", 
+bar2 = Tk::Vu::TkcBarchart.new(c1, 53, 3, 80, 80,
+                               :background=>"#b7c0d7", :scalevalue=>10.0,
+                               :autocolor=>true, :selected=>1,
+                               :outline=>'black', :fill=>"#b7c0d7",
                                :barline=>'red', :scalelinestyle=>22)
 
 
-l2 = TkLabel.new(:width=>128, :height=>128, 
+l2 = TkLabel.new(:width=>128, :height=>128,
                  :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
 
-c2 = TkCanvas.new(:width=>80, :height=>80, 
-                  :insertwidth=>0, :highlightthickness=>0, 
-                  :selectborderwidth=>0, :borderwidth=>2, 
-                  :relief=>:ridge).place(:in=>l2, :relx=>0.5, :rely=>0.5, 
+c2 = TkCanvas.new(:width=>80, :height=>80,
+                  :insertwidth=>0, :highlightthickness=>0,
+                  :selectborderwidth=>0, :borderwidth=>2,
+                  :relief=>:ridge).place(:in=>l2, :relx=>0.5, :rely=>0.5,
                                          :anchor=>:c)
 
 begin
-  stick = Tk::Vu::TkcSticker.new(c2, 3, 3, 80, 80, 
-                                 :text=>"Tcl/Tk", :space=>0, :color=>'red', 
-                                 :outline=>'red', :font=>'Helvetica 14 bold', 
-                                 :fill=>'', :stipple=>'', :bar=>'blue', 
-                                 :orient=>:vertical, :anchor=>:s, 
-                                 :relheight=>1.0, :relwidth=>0.15, 
+  stick = Tk::Vu::TkcSticker.new(c2, 3, 3, 80, 80,
+                                 :text=>"Tcl/Tk", :space=>0, :color=>'red',
+                                 :outline=>'red', :font=>'Helvetica 14 bold',
+                                 :fill=>'', :stipple=>'', :bar=>'blue',
+                                 :orient=>:vertical, :anchor=>:s,
+                                 :relheight=>1.0, :relwidth=>0.15,
                                  :relx=>0.1, :rely=>0.0)
 rescue
   stick = nil
diff --git a/ext/tk/sample/tkextlib/vu/canvSticker.rb b/ext/tk/sample/tkextlib/vu/canvSticker.rb
index e2cd604975..85713ebcf3 100644
--- a/ext/tk/sample/tkextlib/vu/canvSticker.rb
+++ b/ext/tk/sample/tkextlib/vu/canvSticker.rb
@@ -14,7 +14,7 @@ c = TkCanvas.new.pack
 begin
   st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
 rescue
-  Tk.messageBox(:type=>'ok', :title=>"No sticker Item", 
+  Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
                 :message=>"This build of vu does not include the sticker item")
   exit
 end
@@ -56,7 +56,7 @@ steps << proc{
 
 steps << proc{
   puts 'A vertical bar appears in the lower right region and text jumps to the left.'
-  st.configure(:anchor=>:n, :relw=>0.3, :relh=>0.7, 
+  st.configure(:anchor=>:n, :relw=>0.3, :relh=>0.7,
                :relx=>0.6, :rely=>0.3, :bar=>'red')
 }
 
diff --git a/ext/tk/sample/tkextlib/vu/canvSticker2.rb b/ext/tk/sample/tkextlib/vu/canvSticker2.rb
index f54e748660..3d9495ffb0 100644
--- a/ext/tk/sample/tkextlib/vu/canvSticker2.rb
+++ b/ext/tk/sample/tkextlib/vu/canvSticker2.rb
@@ -10,7 +10,7 @@ c = TkCanvas.new.pack
 begin
   st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
 rescue
-  Tk.messageBox(:type=>'ok', :title=>"No sticker Item", 
+  Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
                 :message=>"This build of vu does not include the sticker item")
   exit
 end
@@ -20,14 +20,16 @@ c.destroy
 #---
 #--- set STRING {{x0 y0 x1 y1} {...text...} {resize point: center}
 
-#sti_conf = [ [10, 10, 180, 180], "Sticker ����@�����",  :center ]
-#txt_conf = [ [210, 210],        "Text    ����@�����",  :center ]
-sti_conf = [ [10, 10, 350, 350], 
-             Tk::UTF8_String("Sticker ����@�����"),  :center ]
+#sti_conf = [ [10, 10, 180, 180], "Sticker äöüß@²³¼½¾",  :center ]
+#txt_conf = [ [210, 210],        "Text    äöüß@²³¼½¾",  :center ]
+sti_conf = [ [10, 10, 350, 350],
+             Tk::UTF8_String('Sticker \u00E4\u00F6\u00FC\u00DF\u0040\u00B2\u00B3\u00BC\u00BD\u00BE'),
+             :center ]
 txt_conf = [ [250, 250],
-             Tk::UTF8_String("Text    ����@�����"),  :center ]
+             Tk::UTF8_String('Text    \u00E4\u00F6\u00FC\u00DF\u0040\u00B2\u00B3\u00BC\u00BD\u00BE'),
+             :center ]
 
-p sti_conf
+#p sti_conf
 
 fnt = TkFont.new('Helvetica 24 bold')
 
diff --git a/ext/tk/sample/tkextlib/vu/dial_demo.rb b/ext/tk/sample/tkextlib/vu/dial_demo.rb
index 09bd3e9186..f1f2f110b1 100644
--- a/ext/tk/sample/tkextlib/vu/dial_demo.rb
+++ b/ext/tk/sample/tkextlib/vu/dial_demo.rb
@@ -12,61 +12,61 @@ v_rot    = TkVariable.new
 v_linked = TkVariable.new
 v_needle = TkVariable.new
 
-volume = Tk::Vu::Dial.new(:label=>"Volume", :from=>-0.1, :to=>0.1, 
-                          :resolution=>0.001, :minortickinterval=>0.01, 
-                          :tickinterval=>0.1, :beginangle=>-20, 
+volume = Tk::Vu::Dial.new(:label=>"Volume", :from=>-0.1, :to=>0.1,
+                          :resolution=>0.001, :minortickinterval=>0.01,
+                          :tickinterval=>0.1, :beginangle=>-20,
                           :endangle=>260, :variable=>v_volume)
 
-speed = Tk::Vu::Dial.new(:label=>"Speed", :from=>2000, :to=>100, 
-                         :resolution=>10, :tickinterval=>100, 
-                         :minortickinterval=>0, :variable=>v_speed, 
+speed = Tk::Vu::Dial.new(:label=>"Speed", :from=>2000, :to=>100,
+                         :resolution=>10, :tickinterval=>100,
+                         :minortickinterval=>0, :variable=>v_speed,
                          :showtags=>:label, :showvalue=>false)
 
 speed.set_tag_constrain(100, 'Fast', 2000, 'Slow')
 
-fwd  = Tk::Vu::Dial.new(:from=>-10.0, :to=>-20.0, :resolution=>0.1, 
-                        :tickinterval=>5.0, :minortickinterval=>1.0, 
+fwd  = Tk::Vu::Dial.new(:from=>-10.0, :to=>-20.0, :resolution=>0.1,
+                        :tickinterval=>5.0, :minortickinterval=>1.0,
                         :variable=>v_dir)
 
-rev  = Tk::Vu::Dial.new(:from=>-20.0, :to=>-10.0, :resolution=>0.1, 
-                        :tickinterval=>5.0, :minortickinterval=>1.0, 
+rev  = Tk::Vu::Dial.new(:from=>-20.0, :to=>-10.0, :resolution=>0.1,
+                        :tickinterval=>5.0, :minortickinterval=>1.0,
                         :variable=>v_dir)
 
-small = Tk::Vu::Dial.new(:font=>"Helvetica -10", :from=>0, :to=>10, 
+small = Tk::Vu::Dial.new(:font=>"Helvetica -10", :from=>0, :to=>10,
                          :resolution=>0.05, :tickinterval=>2,
-                         :minortickinterval=>0.5, :radius=>20, 
-                         :dialcolor=>'red2', :activebackground=>'red', 
+                         :minortickinterval=>0.5, :radius=>20,
+                         :dialcolor=>'red2', :activebackground=>'red',
                          :variable=>v_rot)
 
-large = Tk::Vu::Dial.new(:font=>"Helvetica -8", :from=>0, :to=>10, 
+large = Tk::Vu::Dial.new(:font=>"Helvetica -8", :from=>0, :to=>10,
                          :resolution=>0.05, :tickinterval=>1,
-                         :minortickinterval=>0.25, :radius=>40, 
-                         :dialcolor=>'red2', :activebackground=>'red', 
+                         :minortickinterval=>0.25, :radius=>40,
+                         :dialcolor=>'red2', :activebackground=>'red',
                          :variable=>v_rot)
 
-turn = Tk::Vu::Dial.new(:needlecolor=>'red', :label=>"Linked", 
+turn = Tk::Vu::Dial.new(:needlecolor=>'red', :label=>"Linked",
                         :variable=>v_linked)
 
 scale = TkScale.new(:label=>"Linked", :variable=>v_linked)
 
-d1 = Tk::Vu::Dial.new(:resolution=>0.0001, :from=>-0.1, :to=>0.1, 
-                      :showvalue=>true, :minortickinterval=>0.01, 
-                      :tickinterval=>0.1, :radius=>30, :label=>"Dial", 
-                      :beginangle=>-20, :endangle=>260, :variable=>v_needle, 
+d1 = Tk::Vu::Dial.new(:resolution=>0.0001, :from=>-0.1, :to=>0.1,
+                      :showvalue=>true, :minortickinterval=>0.01,
+                      :tickinterval=>0.1, :radius=>30, :label=>"Dial",
+                      :beginangle=>-20, :endangle=>260, :variable=>v_needle,
                       :relief=>:raised)
 
-d2 = Tk::Vu::Dial.new(:resolution=>0.01, :from=>-0.1, :to=>0.1, 
-                      :showvalue=>true, :minortickinterval=>0.01, 
-                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 2", 
-                      :beginangle=>-20, :endangle=>260, :variable=>v_needle, 
-                      :dialrelief=>:flat, :needlecolor=>'red', 
+d2 = Tk::Vu::Dial.new(:resolution=>0.01, :from=>-0.1, :to=>0.1,
+                      :showvalue=>true, :minortickinterval=>0.01,
+                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 2",
+                      :beginangle=>-20, :endangle=>260, :variable=>v_needle,
+                      :dialrelief=>:flat, :needlecolor=>'red',
                       :needletype=>:triangle, :relief=>:sunken)
 
-d3 = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1, 
-                      :showvalue=>true, :minortickinterval=>0.01, 
-                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 3", 
-                      :beginangle=>-20, :endangle=>260, :variable=>v_needle, 
-                      :dialrelief=>:flat, :needlecolor=>'blue', 
+d3 = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
+                      :showvalue=>true, :minortickinterval=>0.01,
+                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 3",
+                      :beginangle=>-20, :endangle=>260, :variable=>v_needle,
+                      :dialrelief=>:flat, :needlecolor=>'blue',
                       :needletype=>:arc, :relief=>:ridge)
 
 f_btns = TkFrame.new
diff --git a/ext/tk/sample/tkextlib/vu/oscilloscope.rb b/ext/tk/sample/tkextlib/vu/oscilloscope.rb
index 2015e46645..1efe13ce01 100644
--- a/ext/tk/sample/tkextlib/vu/oscilloscope.rb
+++ b/ext/tk/sample/tkextlib/vu/oscilloscope.rb
@@ -22,26 +22,26 @@ geo_t1  = [15, 88]
 c = TkCanvas.new(:width=>220, :height=>190).pack(:fill=>:both, :expand=>true)
 
 #---background
-TkcRectangle.new(c, geo_fr, :width=>4, :fill=>'aquamarine3', 
+TkcRectangle.new(c, geo_fr, :width=>4, :fill=>'aquamarine3',
                  :tags=>['osc', 'frbg'])
 
 #---channel 0
-ch0 = Tk::Vu::TkcStripchart.new(c, geo_ch0, 
-                                :fill=>'', :jumpscroll=>false, 
-                                :outline=>'', :scaleline=>'', 
+ch0 = Tk::Vu::TkcStripchart.new(c, geo_ch0,
+                                :fill=>'', :jumpscroll=>false,
+                                :outline=>'', :scaleline=>'',
                                 :stripline=>'cyan', :tags=>['osc', 'ch0'])
 
 #---channel 1
-ch1 = Tk::Vu::TkcStripchart.new(c, geo_ch1, 
-                                :fill=>'', :jumpscroll=>0, 
-                                :outline=>'', :scaleline=>'', 
+ch1 = Tk::Vu::TkcStripchart.new(c, geo_ch1,
+                                :fill=>'', :jumpscroll=>0,
+                                :outline=>'', :scaleline=>'',
                                 :stripline=>'red', :tags=>['osc', 'ch1'])
 
 #---frame
 TkcRectangle.new(c, geo_fr, :width=>4, :tags=>['osc', 'frfg'])
 
 #---position
-txt1 = TkcText.new(c, geo_t1, :text=>"B1-Motion: X:%X\tY:%Y", 
+txt1 = TkcText.new(c, geo_t1, :text=>"B1-Motion: X:%X\tY:%Y",
                    :anchor=>:nw, :tags=>['osc', 'txt1'])
 
 #---BINDINGS
diff --git a/ext/tk/sample/tkextlib/vu/pie.rb b/ext/tk/sample/tkextlib/vu/pie.rb
index ed598d6233..c8f9276e4e 100644
--- a/ext/tk/sample/tkextlib/vu/pie.rb
+++ b/ext/tk/sample/tkextlib/vu/pie.rb
@@ -26,13 +26,13 @@ quit_btn = TkButton.new(f, :text=>"Exit", :command=>proc{exit})
 Tk.grid(pie, :sticky=>:news)
 Tk.grid(f, :sticky=>:ew)
 
-Tk.pack(fast_btn, slow_btn, quit_btn, 
+Tk.pack(fast_btn, slow_btn, quit_btn,
         :in=>f, :side=>:left, :fill=>:both, :expand=>true, :padx=>6, :pady=>4)
 
 Tk.root.grid_columnconfigure(0, :weight=>1)
 Tk.root.grid_rowconfigure(0, :weight=>1)
 
-priv = { 
+priv = {
   :x=>0, :y=>0, :pie_in=>false, :angle=>pie[:angle], :origin=>pie[:origin]
 }
 
@@ -46,9 +46,9 @@ pie.bind('ButtonPress-1', proc{|w, x, y|
 
 pie.bind('B1-Motion', proc{|w, x, y|
            if priv[:pie_in]
-             w.configure(:angle=>priv[:angle] + (priv[:y] - y)/3, 
-                         :origin=>(priv[:origin] + 
-                                   ((w.winfo_height/2.2 > y)? -1: 1) * 
+             w.configure(:angle=>priv[:angle] + (priv[:y] - y)/3,
+                         :origin=>(priv[:origin] +
+                                   ((w.winfo_height/2.2 > y)? -1: 1) *
                                    (priv[:x] - x)/3) % 360)
            end
          }, '%W %x %y')
diff --git a/ext/tk/sample/tkextlib/vu/vu_demo.rb b/ext/tk/sample/tkextlib/vu/vu_demo.rb
index d078ae16f2..358d32495f 100644
--- a/ext/tk/sample/tkextlib/vu/vu_demo.rb
+++ b/ext/tk/sample/tkextlib/vu/vu_demo.rb
@@ -9,13 +9,13 @@ puts "Show off barchart and dial widgets"
 
 speed = TkVariable.new(0)
 
-dial = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1, 
-                        :showvalue=>true, :minortickinterval=>0.01, 
-                        :tickinterval=>0.1, :radius=>50, :label=>"Dial", 
-                        :beginangle=>-20, :endangle=>260, :dialcolor=>'red3', 
+dial = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
+                        :showvalue=>true, :minortickinterval=>0.01,
+                        :tickinterval=>0.1, :radius=>50, :label=>"Dial",
+                        :beginangle=>-20, :endangle=>260, :dialcolor=>'red3',
                         :active=>'red2', :variable=>speed)
 
-bar = Tk::Vu::Bargraph.new(:from=>0, :to=>100, :relief=>:groove, 
+bar = Tk::Vu::Bargraph.new(:from=>0, :to=>100, :relief=>:groove,
                            :border=>2, :label=>"Bar Chart")
 
 #######################################
@@ -26,7 +26,7 @@ purple  = 75
 current = 50
 
 def rand_bool
-  
+
 end
 
 update = TkTimer.new(200, -1, proc{
@@ -61,7 +61,7 @@ Tk.grid('x', nobar, :sticky=>:ew, :padx=>4, :pady=>4)
 Tk.grid(quit, '-', '-', :sticky=>:ew, :padx=>4, :pady=>4)
 Tk.root.grid_columnconfigure(2, :weight=>1)
 Tk.root.grid_rowconfigure(1, :weight=>1)
-                       
+
 #######################################
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkfrom.rb b/ext/tk/sample/tkfrom.rb
index 2cece7337e..f51f7f5d85 100644
--- a/ext/tk/sample/tkfrom.rb
+++ b/ext/tk/sample/tkfrom.rb
@@ -22,7 +22,7 @@ class Mail
     @body = []
     while line = f.gets()
       $_.chop!
-      next if /^From / =~ line  # skip From-line  
+      next if /^From / =~ line  # skip From-line
       break if /^$/ =~ line     # end of header
       if /^(\S+):\s*(.*)/ =~ line
         @header[attr = $1.capitalize] = $2
diff --git a/ext/tk/sample/tkhello.rb b/ext/tk/sample/tkhello.rb
index 3b505f4983..597c1f6242 100644
--- a/ext/tk/sample/tkhello.rb
+++ b/ext/tk/sample/tkhello.rb
@@ -1,6 +1,6 @@
 require "tk"
 
-TkButton.new(nil, 
+TkButton.new(nil,
              :text => 'hello',
              :command => proc{print "hello\n"}).pack(:fill=>'x')
 TkButton.new(nil,
diff --git a/ext/tk/sample/tkmenubutton.rb b/ext/tk/sample/tkmenubutton.rb
index 37f6128fd9..8ae1359425 100644
--- a/ext/tk/sample/tkmenubutton.rb
+++ b/ext/tk/sample/tkmenubutton.rb
@@ -7,56 +7,56 @@ require 'tk'
 TkLabel.new(:text=>'Sample of TkMenubutton').pack(:side=>:top)
 
 TkFrame.new{|f|
-  pack(:side=>:top) 
+  pack(:side=>:top)
 
 
-  TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0, 
+  TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0,
                    :direction=>:right, :relief=>:raised){|mb|
     menu TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Right menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
+      add(:command, :label=>'Right menu: first item',
+                    :command=>proc{print 'You have selected the first item' +
                                          " from the Right menu.\n"})
-      add(:command, :label=>'Right menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
+      add(:command, :label=>'Right menu: second item',
+                    :command=>proc{print 'You have selected the second item' +
                                          " from the Right menu.\n"})
     }
     pack(:side=>:left, :padx=>25, :pady=>25)
   }
 
-  TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0, 
+  TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0,
                    :direction=>:below, :relief=>:raised){|mb|
     menu(TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Below menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
+      add(:command, :label=>'Below menu: first item',
+                    :command=>proc{print 'You have selected the first item' +
                                          " from the Below menu.\n"})
-      add(:command, :label=>'Below menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
+      add(:command, :label=>'Below menu: second item',
+                    :command=>proc{print 'You have selected the second item' +
                                          " from the Below menu.\n"})
     })
     pack(:side=>:left, :padx=>25, :pady=>25)
   }
 
-  TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0, 
+  TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0,
                    :direction=>:above, :relief=>:raised){|mb|
     menu TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Above menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
+      add(:command, :label=>'Above menu: first item',
+                    :command=>proc{print 'You have selected the first item' +
                                          " from the Above menu.\n"})
-      add(:command, :label=>'Above menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
+      add(:command, :label=>'Above menu: second item',
+                    :command=>proc{print 'You have selected the second item' +
                                          " from the Above menu.\n"})
     }
     pack(:side=>:left, :padx=>25, :pady=>25)
   }
 
-  TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0, 
+  TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0,
                    :direction=>:left, :relief=>:raised){|mb|
     menu(TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Left menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
+      add(:command, :label=>'Left menu: first item',
+                    :command=>proc{print 'You have selected the first item' +
                                          " from the Left menu.\n"})
-      add(:command, :label=>'Left menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
+      add(:command, :label=>'Left menu: second item',
+                    :command=>proc{print 'You have selected the second item' +
                                          " from the Left menu.\n"})
     })
     pack(:side=>:left, :padx=>25, :pady=>25)
@@ -64,20 +64,20 @@ TkFrame.new{|f|
 }
 
 ############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
+TkFrame.new(:borderwidth=>2, :relief=>:sunken,
             :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
 ############################
 
 TkLabel.new(:text=>'Sample of TkOptionMenu').pack(:side=>:top)
 
-colors = %w(Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50 
+colors = %w(Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50
             Yellow Cyan Magenta White Brown DarkSeaGreen DarkViolet)
 
 TkFrame.new{|f|
-  pack(:side=>:top) 
+  pack(:side=>:top)
 
-  b1 = TkOptionMenubutton . 
-    new(:parent=>f, :values=>%w(one two three)) . 
+  b1 = TkOptionMenubutton .
+    new(:parent=>f, :values=>%w(one two three)) .
     pack(:side=>:left, :padx=>25, :pady=>25)
 
   b2 = TkOptionMenubutton.new(:parent=>f, :values=>colors) {|optMB|
@@ -96,7 +96,7 @@ TkFrame.new{|f|
         put 'Black',  *[14,  2, 16, 14]
         put color,    *[ 2,  2, 14, 14]
       }
-      optMB.entryconfigure(color, :hidemargin=>1, 
+      optMB.entryconfigure(color, :hidemargin=>1,
                            :image=>no_sel, :selectimage=>sel)
     }
     optMB.menuconfigure(:tearoff, 1)
@@ -114,7 +114,7 @@ TkFrame.new{|f|
 }
 
 ############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
+TkFrame.new(:borderwidth=>2, :relief=>:sunken,
             :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
 ############################
 
diff --git a/ext/tk/sample/tkmsgcat-load_rb.rb b/ext/tk/sample/tkmsgcat-load_rb.rb
index 5373e0086f..98a91fadf4 100644
--- a/ext/tk/sample/tkmsgcat-load_rb.rb
+++ b/ext/tk/sample/tkmsgcat-load_rb.rb
@@ -15,7 +15,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
                                  TkComm.window(frame).background(color)
                                  Tk.update
                                  TkComm.window(label).text(
-                                          msgcat["%1$s:: %2$s", 'Color', 
+                                          msgcat["%1$s:: %2$s", 'Color',
                                                  color.capitalize])
                                  w.flash; w.flash
                                  Tk.callback_break;
@@ -23,7 +23,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
 
 del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
 
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError, 
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
                                         msgcat['Application Error'])})
 
 show_sample = proc{|loc|
@@ -38,10 +38,10 @@ show_sample = proc{|loc|
     pack(:pady=>10, :padx=>10)
   }
 
-  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s", 
+  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
                                            'Color', '']).pack(:anchor=>'w')
 
-  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10, 
+  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
                                  :expand=>true, :fill=>:both)
 
   TkFrame.new(bg){|f|
@@ -53,9 +53,9 @@ show_sample = proc{|loc|
   }.pack(:anchor=>'center', :pady=>15)
 
   TkFrame.new(top_win){|f|
-    TkButton.new(f, :text=>msgcat['Delete'], 
+    TkButton.new(f, :text=>msgcat['Delete'],
                  :command=>del_proc).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat['Error'], 
+    TkButton.new(f, :text=>msgcat['Error'],
                  :command=>err_proc).pack(:side=>:left, :padx=>5)
   }.pack(:side=>:bottom, :fill=>:x)
 
@@ -67,7 +67,7 @@ show_sample = proc{|loc|
 TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
 
 TkFrame.new{|f|
-  TkButton.new(f, :text=>msgcat['Exit'], 
+  TkButton.new(f, :text=>msgcat['Exit'],
                :command=>proc{exit}).pack(:side=>:right, :padx=>5)
 }.pack(:side=>:bottom, :fill=>:x)
 
@@ -90,7 +90,7 @@ lbox.bind('ButtonRelease-1'){|ev|
 
 lbox.insert('end', 'default')
 
-Dir.entries(msgcat_dir).sort.each{|f| 
+Dir.entries(msgcat_dir).sort.each{|f|
   if f =~ /^(.*).msg$/
     lbox.insert('end', $1)
   end
diff --git a/ext/tk/sample/tkmsgcat-load_rb2.rb b/ext/tk/sample/tkmsgcat-load_rb2.rb
index 55246545c8..05512a3131 100644
--- a/ext/tk/sample/tkmsgcat-load_rb2.rb
+++ b/ext/tk/sample/tkmsgcat-load_rb2.rb
@@ -15,7 +15,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
                                  TkComm.window(frame).background(color)
                                  Tk.update
                                  TkComm.window(label).text(
-                                          msgcat["%1$s:: %2$s", 'Color', 
+                                          msgcat["%1$s:: %2$s", 'Color',
                                                  color.capitalize])
                                  w.flash; w.flash
                                  Tk.callback_break;
@@ -23,7 +23,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
 
 del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
 
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError, 
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
                                         msgcat['Application Error'])})
 
 show_sample = proc{|loc|
@@ -38,10 +38,10 @@ show_sample = proc{|loc|
     pack(:pady=>10, :padx=>10)
   }
 
-  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s", 
+  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
                                            'Color', '']).pack(:anchor=>'w')
 
-  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10, 
+  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
                                  :expand=>true, :fill=>:both)
 
   TkFrame.new(bg){|f|
@@ -53,9 +53,9 @@ show_sample = proc{|loc|
   }.pack(:anchor=>'center', :pady=>15)
 
   TkFrame.new(top_win){|f|
-    TkButton.new(f, :text=>msgcat['Delete'], 
+    TkButton.new(f, :text=>msgcat['Delete'],
                  :command=>del_proc).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat['Error'], 
+    TkButton.new(f, :text=>msgcat['Error'],
                  :command=>err_proc).pack(:side=>:left, :padx=>5)
   }.pack(:side=>:bottom, :fill=>:x)
 
@@ -67,7 +67,7 @@ show_sample = proc{|loc|
 TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
 
 TkFrame.new{|f|
-  TkButton.new(f, :text=>msgcat['Exit'], 
+  TkButton.new(f, :text=>msgcat['Exit'],
                :command=>proc{exit}).pack(:side=>:right, :padx=>5)
 }.pack(:side=>:bottom, :fill=>:x)
 
@@ -90,7 +90,7 @@ lbox.bind('ButtonRelease-1'){|ev|
 
 lbox.insert('end', 'default')
 
-Dir.entries(msgcat_dir).sort.each{|f| 
+Dir.entries(msgcat_dir).sort.each{|f|
   if f =~ /^(.*).msg$/
     lbox.insert('end', $1)
   end
diff --git a/ext/tk/sample/tkmsgcat-load_tk.rb b/ext/tk/sample/tkmsgcat-load_tk.rb
index 45d68e4e0b..703f471e19 100644
--- a/ext/tk/sample/tkmsgcat-load_tk.rb
+++ b/ext/tk/sample/tkmsgcat-load_tk.rb
@@ -14,7 +14,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
                                  TkComm.window(frame).background(color)
                                  Tk.update
                                  TkComm.window(label).text(
-                                          msgcat.mc("%1$s:: %2$s", 'Color', 
+                                          msgcat.mc("%1$s:: %2$s", 'Color',
                                                     color.capitalize))
                                  w.flash; w.flash
                                  Tk.callback_break;
@@ -22,7 +22,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
 
 del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
 
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError, 
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
                                         msgcat.mc('Application Error'))})
 
 show_sample = proc{|loc|
@@ -36,10 +36,10 @@ show_sample = proc{|loc|
     pack(:pady=>10, :padx=>10)
   }
 
-  lbl = TkLabel.new(top_win, :text=>msgcat.mc("%1$s:: %2$s", 
+  lbl = TkLabel.new(top_win, :text=>msgcat.mc("%1$s:: %2$s",
                                               'Color', '')).pack(:anchor=>'w')
 
-  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10, 
+  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
                                  :expand=>true, :fill=>:both)
 
   TkFrame.new(bg){|f|
@@ -48,7 +48,7 @@ show_sample = proc{|loc|
         bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
       }.pack(:fill=>:x)
 =begin
-      TkButton.new(f, :text=>msgcat.mc(col), 
+      TkButton.new(f, :text=>msgcat.mc(col),
                    :command=>proc{
                      bg.background col
                      lbl.text msgcat.mc("%1$s:: %2$s", 'Color', col.capitalize)
@@ -58,17 +58,17 @@ show_sample = proc{|loc|
   }.pack(:anchor=>'center', :pady=>15)
 
   TkFrame.new(top_win){|f|
-    TkButton.new(f, :text=>msgcat.mc('Delete'), 
+    TkButton.new(f, :text=>msgcat.mc('Delete'),
                  :command=>del_proc).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat.mc('Error'), 
+    TkButton.new(f, :text=>msgcat.mc('Error'),
                  :command=>err_proc).pack(:side=>:left, :padx=>5)
 =begin
-    TkButton.new(f, :text=>msgcat.mc('Delete'), 
+    TkButton.new(f, :text=>msgcat.mc('Delete'),
                  :command=>proc{
                    top_win.destroy
                    top_win = nil
                  }).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat.mc('Error'), 
+    TkButton.new(f, :text=>msgcat.mc('Error'),
                  :command=>proc{
                    fail RuntimeError, msgcat.mc('Application Error')
                  }).pack(:side=>:left, :padx=>5)
@@ -83,7 +83,7 @@ show_sample = proc{|loc|
 TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
 
 TkFrame.new{|f|
-  TkButton.new(f, :text=>msgcat.mc('Exit'), 
+  TkButton.new(f, :text=>msgcat.mc('Exit'),
                :command=>proc{exit}).pack(:side=>:right, :padx=>5)
 }.pack(:side=>:bottom, :fill=>:x)
 
@@ -106,7 +106,7 @@ lbox.bind('ButtonRelease-1'){|ev|
 
 lbox.insert('end', 'default')
 
-Dir.entries(msgcat_dir).sort.each{|f| 
+Dir.entries(msgcat_dir).sort.each{|f|
   if f =~ /^(.*).msg$/
     lbox.insert('end', $1)
   end
diff --git a/ext/tk/sample/tkmulticolumnlist.rb b/ext/tk/sample/tkmulticolumnlist.rb
index 255eb691e5..a1b3a1a2fa 100644
--- a/ext/tk/sample/tkmulticolumnlist.rb
+++ b/ext/tk/sample/tkmulticolumnlist.rb
@@ -32,7 +32,7 @@ class TkMultiColumnList < TkText
     # decide total width
     @lbox_total = title_info.size
     @width_total = 0
-    title_info.each{|title, width, cmd| 
+    title_info.each{|title, width, cmd|
       @width_total += width.to_f
       @title_cmd << cmd
     }
@@ -54,28 +54,28 @@ class TkMultiColumnList < TkText
     @command = nil
 
     # virtical scrollbar
-    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
+    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+                                 'borderwidth'=>@scrbar_border,
                                  'width'=>@scrbar_width)
 
     # horizontal scrollbar
-    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
+    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+                                 'borderwidth'=>@scrbar_border,
                                  'width'=>@scrbar_width)
 
     # create base flames
-    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
                             'width'=>@window_width)
     @f_title = TkFrame.new(@c_title, 'width'=>@width_total)
-    @w_title = TkcWindow.new(@c_title, 0, 0, 
+    @w_title = TkcWindow.new(@c_title, 0, 0,
                              'window'=>@f_title, 'anchor'=>'nw')
 
-    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
                             'width'=>@window_width)
     @f_lbox  = TkFrame.new(@c_lbox, 'width'=>@width_total)
     @w_lbox  = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
 
-    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
                             'width'=>@window_width)
     @f_hscr  = TkFrame.new(@c_hscr, 'width'=>@width_total)
     @w_hscr  = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
@@ -99,28 +99,28 @@ class TkMultiColumnList < TkText
       f = TkFrame.new(@f_title, 'width'=>width)
       base = [f]
 
-      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border, 
+      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
                           'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
       title_binding(title, idx)
       title.pack('fill'=>'x')
 
       @title_list << title
 
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
-              'relheight'=>1.0, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+              'relheight'=>1.0,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
       # listbox field
       f = TkFrame.new(@f_lbox, 'width'=>width)
       base << f
-      @lbox_list << TkText.new(f, 'highlightthickness'=>@h_l_thick, 
-                               'borderwidth'=>@lbox_border, 
-                               'takefocus'=>false, 
+      @lbox_list << TkText.new(f, 'highlightthickness'=>@h_l_thick,
+                               'borderwidth'=>@lbox_border,
+                               'takefocus'=>false,
                                'wrap'=>'none') {
 
         bindtags(bindtags - [TkText])
 
-        @seltag = TkTextTag.new(self, 'background'=>'#b3b3b3', 
+        @seltag = TkTextTag.new(self, 'background'=>'#b3b3b3',
                                 'borderwidth'=>1, 'relief'=>'raised')
         def self.nearest(y)
           self.index("@1,#{y}").split('.')[0].to_i
@@ -151,17 +151,17 @@ class TkMultiColumnList < TkText
         pack('fill'=>'both', 'expand'=>true)
       }
 
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
 
       # scrollbar field
       f = TkFrame.new(@f_hscr, 'width'=>width)
       base << f
-      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width, 
-                                     'borderwidth'=>@scrbar_border, 
+      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
+                                     'borderwidth'=>@scrbar_border,
                                      'highlightthickness'=>@h_l_thick
                                     ).pack('fill'=>'x', 'anchor'=>'w')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
       @lbox_list[idx].xscrollbar(@hscr_list[idx])
@@ -171,23 +171,23 @@ class TkMultiColumnList < TkText
     }
 
     # pad
-    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised', 
-                               'borderwidth'=>@title_border, 
+    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
+                               'borderwidth'=>@title_border,
                                'highlightthickness'=>@h_l_thick)
 
-    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken', 
-                             'borderwidth'=>1, 
+    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
+                             'borderwidth'=>1,
                              'highlightthickness'=>@h_l_thick)
 
     # height check
     title_height = 0
-    @title_list.each{|w| 
+    @title_list.each{|w|
       h = w.winfo_reqheight
       title_height = h if title_height < h
     }
 
     hscr_height = 0
-    @hscr_list.each{|w| 
+    @hscr_list.each{|w|
       h = w.winfo_reqheight
       hscr_height = h if hscr_height < h
     }
@@ -203,12 +203,12 @@ class TkMultiColumnList < TkText
     @h_scroll.assign(@c_title, @c_lbox, @c_hscr)
 
     # binding for listboxes
-    @lbox_list.each_with_index{|l, idx| 
-      l.bind('Button-1', proc{|w, y| 
+    @lbox_list.each_with_index{|l, idx|
+      l.bind('Button-1', proc{|w, y|
                @frame.focus
                select_line(w, w.nearest(y))
              }, '%W %y')
-      l.bind('B1-Motion', proc{|w, y| 
+      l.bind('B1-Motion', proc{|w, y|
                select_line(w, w.nearest(y))
              }, '%W %y')
       l.bind('Double-Button-1', proc{
@@ -218,11 +218,11 @@ class TkMultiColumnList < TkText
       l.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
       l.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
 
-      l.bind('Button-2', proc{|x, y| 
+      l.bind('Button-2', proc{|x, y|
                @lbox_mark_x = x
                @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
              }, '%x %y')
-      l.bind('B2-Motion', proc{|x, y| 
+      l.bind('B2-Motion', proc{|x, y|
                @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
                l.scan_dragto(x, y)
              }, '%x %y')
@@ -265,8 +265,8 @@ class TkMultiColumnList < TkText
     @f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
 
     # binding for 'Configure' event
-    @c_lbox.bind('Configure', 
-                 proc{|height, width| reconstruct(height, width)}, 
+    @c_lbox.bind('Configure',
+                 proc{|height, width| reconstruct(height, width)},
                  '%h %w')
 
     # set default receiver of method calls
@@ -386,7 +386,7 @@ class TkMultiColumnList < TkText
   def titlefont(font)
     @title_list.each{|label| label['font'] = font}
     title_height = 0
-    @title_list.each{|w| 
+    @title_list.each{|w|
       h = w.winfo_reqheight
       title_height = h if title_height < h
     }
@@ -523,7 +523,7 @@ class TkMultiColumnList < TkText
             array[indices[0]] = line[label]
           else
             if line[label].kind_of? Array
-              indices.each_with_index{|index, num| 
+              indices.each_with_index{|index, num|
                 array[index] = line[label][num]
               }
             else
@@ -541,9 +541,9 @@ class TkMultiColumnList < TkText
           indices.each{|index| lbox_ins[index] << line[index]}
         end
       }
-    }   
+    }
 
-    @lbox_list.each_with_index{|lbox, index| 
+    @lbox_list.each_with_index{|lbox, index|
       lbox.insert(idx, cr + lbox_ins[index].join("\n")) if lbox_ins[index]
     }
   end
@@ -581,7 +581,7 @@ class TkMultiColumnList < TkText
     (0..(@rel_list.size - 2)).each{|idx|
       title, lbox, hscr = @base_list[idx]
       title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                  'relheight'=>1.0)
       hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
     }
@@ -608,11 +608,11 @@ class TkMultiColumnList < TkText
 
     # adjustment of rightside widget of the sash
     title, lbox, hscr = @base_list[idx]
-    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                 'relx'=>@rel_list[idx])
-    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                'relx'=>@rel_list[idx], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                'relx'=>@rel_list[idx])
 
     # update reference position
@@ -636,34 +636,34 @@ class TkMultiColumnList < TkText
   end
 
   def title_binding(title, index)
-    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
                "%W %x #{index}")
 
-    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
                "%W %x #{index}")
 
     title.bind('Leave', proc{|w| w.cursor ""}, "%W")
 
-    title.bind('Button-1', 
-               proc{|w, x| 
+    title.bind('Button-1',
+               proc{|w, x|
                  if @mode == :sash
                    @x = x
                    @frame_width = TkWinfo.width(@f_title).to_f
                  else
                    title.relief 'sunken'
                  end
-               }, 
+               },
                '%W %X')
 
-    title.bind('ButtonRelease-1', 
-               proc{|w, x, idx| 
+    title.bind('ButtonRelease-1',
+               proc{|w, x, idx|
                  i = idx.to_i
                  if @mode == :title && @title_cmd[i].kind_of?(Proc)
                    @title_cmd[i].call
                  end
                  title.relief 'raised'
                  motion_cb(w,x,i)
-               }, 
+               },
                "%W %x #{index}")
 
     title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
@@ -705,13 +705,13 @@ end
 # test
 ################################################
 if __FILE__ == $0
-  l = TkMultiColumnList.new(nil, 200, 
-                            [ ['L1', 200, proc{p 'click L1'}], 
-                              ['L2', 100], 
-                              ['L3', 200] ], 
-                            'width'=>350, 
-                            #'titleforeground'=>'yellow', 
-                            'titleforeground'=>'white', 
+  l = TkMultiColumnList.new(nil, 200,
+                            [ ['L1', 200, proc{p 'click L1'}],
+                              ['L2', 100],
+                              ['L3', 200] ],
+                            'width'=>350,
+                            #'titleforeground'=>'yellow',
+                            'titleforeground'=>'white',
                             #'titlebackground'=>'navy',
                             'titlebackground'=>'blue',
                             'titlefont'=>'courier'
@@ -719,7 +719,7 @@ if __FILE__ == $0
   l.insert('end', [1,2,3])
   l.insert('end', [4,5,6])
   l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 
+  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
                    'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
                    'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
   l.insert('end', [1,2,3])
diff --git a/ext/tk/sample/tkmultilistbox.rb b/ext/tk/sample/tkmultilistbox.rb
index 6f956d0edb..7791649c4b 100644
--- a/ext/tk/sample/tkmultilistbox.rb
+++ b/ext/tk/sample/tkmultilistbox.rb
@@ -35,10 +35,10 @@ class TkMultiListbox < TkListbox
 
     # create base flames
     @f_title = TkFrame.new(@frame, 'width'=>@width_total)
-    @f_lbox  = TkFrame.new(@frame, 
+    @f_lbox  = TkFrame.new(@frame,
                            'width'=>@width_total, 'height'=>lbox_height)
-    @f_hscr  = TkFrame.new(@frame, 'width'=>@width_total, 
-                           'height'=>@v_scroll.cget('width') + 
+    @f_hscr  = TkFrame.new(@frame, 'width'=>@width_total,
+                           'height'=>@v_scroll.cget('width') +
                                      2 * @v_scroll.cget('borderwidth'))
 
     # dummy label to keep the hight of title space
@@ -63,25 +63,25 @@ class TkMultiListbox < TkListbox
       f = TkFrame.new(@f_title, 'width'=>width)
       base = [f]
       @title_list << TkLabel.new(f, 'text'=>label).pack('fill'=>'x')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-6, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-6,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
       # listbox field
       f = TkFrame.new(@f_lbox, 'width'=>width)
       base << f
       @lbox_list << TkListbox.new(f).pack('fill'=>'both', 'expand'=>true)
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
 
       # scrollbar field
       f = TkFrame.new(@f_hscr, 'width'=>width)
       base << f
-      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal') . 
+      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal') .
                                               pack('fill'=>'x', 'anchor'=>'w')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
-      @lbox_list[idx].xscrollcommand proc{|first, last| 
+      @lbox_list[idx].xscrollcommand proc{|first, last|
         @hscr_list[idx].set first, last
       }
       @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
@@ -93,19 +93,19 @@ class TkMultiListbox < TkListbox
     # create tab
     @tab_list = [nil]
     (1..(@rel_list.size - 2)).each{|idx|
-      tab = TkFrame.new(@f_title, 'cursor'=>'sb_h_double_arrow', 
+      tab = TkFrame.new(@f_title, 'cursor'=>'sb_h_double_arrow',
                         'width'=>6, 'borderwidth'=>2, 'relief'=>'raised')
       @tab_list << tab
       tab.place('relx'=>@rel_list[idx], 'anchor'=>'ne', 'relheight'=>0.95)
-      tab.bind('Button-1', 
-               proc{|x| @x = x; @frame_width = TkWinfo.width(@f_title).to_f}, 
+      tab.bind('Button-1',
+               proc{|x| @x = x; @frame_width = TkWinfo.width(@f_title).to_f},
                '%X')
       tab.bind('B1-Motion', proc{|x, idx| resize(x, idx.to_i)}, "%X #{idx}")
     }
 
     # set control procedure for virtical scroll
     @lbox_list.each{|lbox|
-      lbox.yscrollcommand proc{|first, last| 
+      lbox.yscrollcommand proc{|first, last|
         @v_scroll.set first, last
       }
     }
@@ -118,17 +118,17 @@ class TkMultiListbox < TkListbox
     @mode['extended'] = extended_mode_bindtag
     @mode['multiple'] = multiple_mode_bindtag
     @current_mode = 'browse'
-    @lbox_list.each{|l| 
-      l.bind('Shift-Key-Left', 
+    @lbox_list.each{|l|
+      l.bind('Shift-Key-Left',
              proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
-      l.bind('Shift-Key-Right', 
+      l.bind('Shift-Key-Right',
              proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
 
-      l.bind('Button-2', proc{|x, y| 
+      l.bind('Button-2', proc{|x, y|
                @lbox_mark_x = x
                @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
              }, '%x %y')
-      l.bind('B2-Motion', proc{|x, y| 
+      l.bind('B2-Motion', proc{|x, y|
                @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
                l.scan_dragto(x, y)
              }, '%x %y')
@@ -189,7 +189,7 @@ class TkMultiListbox < TkListbox
 
   # set 'mode' option of listboxes
   def mode(sel_mode)
-    @lbox_list.each{|l| 
+    @lbox_list.each{|l|
       tags = l.bindtags
       tags = tags - [ @mode[@current_mode] ]
       l.bindtags(tags.unshift(@mode[sel_mode]))
@@ -282,7 +282,7 @@ class TkMultiListbox < TkListbox
             array[indices[0]] = line[label]
           else
             if line[label].kind_of? Array
-              indices.each_with_index{|index, num| 
+              indices.each_with_index{|index, num|
                 array[index] = line[label][num]
               }
             else
@@ -300,9 +300,9 @@ class TkMultiListbox < TkListbox
           indices.each{|index| lbox_ins[index] << line[index]}
         end
       }
-    }   
+    }
 
-    @lbox_list.each_with_index{|lbox, index| 
+    @lbox_list.each_with_index{|lbox, index|
       lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
     }
   end
@@ -326,7 +326,7 @@ class TkMultiListbox < TkListbox
     (0..(@rel_list.size - 2)).each{|idx|
       title, lbox, hscr = @base_list[idx]
       title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                  'relheight'=>1.0)
       hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
@@ -356,11 +356,11 @@ class TkMultiListbox < TkListbox
 
     # adjustment of rightside widget of the tab
     title, lbox, hscr = @base_list[idx]
-    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                 'relx'=>@rel_list[idx])
-    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                'relx'=>@rel_list[idx], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                'relx'=>@rel_list[idx])
 
     # update reference position
@@ -370,11 +370,11 @@ class TkMultiListbox < TkListbox
   #################################
   def browse_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
     t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Shift-Button-1', 
+    t.bind('Shift-Button-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -385,7 +385,7 @@ class TkMultiListbox < TkListbox
 
     t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
     t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash', 
+    t.bind('Control-slash',
            proc{|w| select_line(w, w.index('active').to_i)}, '%W')
 
     t
@@ -394,12 +394,12 @@ class TkMultiListbox < TkListbox
   ########################
   def single_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1', 
+    t.bind('ButtonRelease-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Shift-Button-1', 
+    t.bind('Shift-Button-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -410,9 +410,9 @@ class TkMultiListbox < TkListbox
 
     t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
     t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash', 
+    t.bind('Control-slash',
            proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-backslash', 
+    t.bind('Control-backslash',
            proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
 
     t
@@ -421,22 +421,22 @@ class TkMultiListbox < TkListbox
   ########################
   def extended_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
     t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
 
-    t.bind('ButtonRelease-1', 
+    t.bind('ButtonRelease-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Shift-Button-1', 
+    t.bind('Shift-Button-1',
            proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-    t.bind('Shift-B1-Motion', 
+    t.bind('Shift-B1-Motion',
            proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Control-Button-1', 
+    t.bind('Control-Button-1',
            proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Control-B1-Motion', 
+    t.bind('Control-B1-Motion',
            proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -462,9 +462,9 @@ class TkMultiListbox < TkListbox
   ########################
   def multiple_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1', 
+    t.bind('ButtonRelease-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -624,15 +624,15 @@ end
 # test
 ################################################
 if __FILE__ == $0
-  f = TkFrame.new(nil, 'width'=>300, 
+  f = TkFrame.new(nil, 'width'=>300,
                   'height'=>200).pack('fill'=>'both', 'expand'=>'true')
   #f = TkFrame.new.pack('fill'=>'both', 'expand'=>'true')
-  l = TkMultiListbox.new(f, 150, 
-                         [ ['L1', 100], 
-                           ['L2', 200], 
-                           ['L3', 50] ], 
-                         'titlefont'=>'courier', 
-                         'titleforeground'=>'yellow', 
+  l = TkMultiListbox.new(f, 150,
+                         [ ['L1', 100],
+                           ['L2', 200],
+                           ['L3', 50] ],
+                         'titlefont'=>'courier',
+                         'titleforeground'=>'yellow',
                          'titlebackground'=>'navy'
                          ).pack('fill'=>'both', 'expand'=>true)
   l.insert('end', [1,2,3])
diff --git a/ext/tk/sample/tkmultilistframe.rb b/ext/tk/sample/tkmultilistframe.rb
index ef1a0a824d..7c0aac9a9e 100644
--- a/ext/tk/sample/tkmultilistframe.rb
+++ b/ext/tk/sample/tkmultilistframe.rb
@@ -32,7 +32,7 @@ class TkMultiListFrame < TkListbox
     # decide total width
     @lbox_total = title_info.size
     @width_total = 0
-    title_info.each{|title, width, cmd| 
+    title_info.each{|title, width, cmd|
       @width_total += width.to_f
       @title_cmd << cmd
     }
@@ -54,37 +54,37 @@ class TkMultiListFrame < TkListbox
 
     # virtical scrollbar
 =begin
-    @v_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                'borderwidth'=>@scrbar_border, 
+    @v_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+                                'borderwidth'=>@scrbar_border,
                                 'orient'=>'vertical', 'width'=>@scrbar_width)
 =end
-    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
+    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+                                 'borderwidth'=>@scrbar_border,
                                  'width'=>@scrbar_width)
 
     # horizontal scrollbar
 =begin
-    @h_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                'borderwidth'=>@scrbar_border, 
+    @h_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+                                'borderwidth'=>@scrbar_border,
                                 'orient'=>'horizontal', 'width'=>@scrbar_width)
 =end
-    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
+    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+                                 'borderwidth'=>@scrbar_border,
                                  'width'=>@scrbar_width)
 
     # create base flames
-    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
                             'width'=>@window_width)
     @f_title = TkFrame.new(@c_title, 'width'=>@width_total)
-    @w_title = TkcWindow.new(@c_title, 0, 0, 
+    @w_title = TkcWindow.new(@c_title, 0, 0,
                              'window'=>@f_title, 'anchor'=>'nw')
 
-    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
                             'width'=>@window_width)
     @f_lbox  = TkFrame.new(@c_lbox, 'width'=>@width_total)
     @w_lbox  = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
 
-    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
                             'width'=>@window_width)
     @f_hscr  = TkFrame.new(@c_hscr, 'width'=>@width_total)
     @w_hscr  = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
@@ -108,45 +108,45 @@ class TkMultiListFrame < TkListbox
       f = TkFrame.new(@f_title, 'width'=>width)
       base = [f]
 
-      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border, 
+      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
                           'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
       title_binding(title, idx)
       title.pack('fill'=>'x')
 
       @title_list << title
 
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
-              'relheight'=>1.0, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+              'relheight'=>1.0,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
       # listbox field
       f = TkFrame.new(@f_lbox, 'width'=>width)
       base << f
-      @lbox_list << TkListbox.new(f, 'highlightthickness'=>@h_l_thick, 
+      @lbox_list << TkListbox.new(f, 'highlightthickness'=>@h_l_thick,
                                   'borderwidth'=>@lbox_border
                                   ).pack('fill'=>'both', 'expand'=>true)
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
 
       # scrollbar field
       f = TkFrame.new(@f_hscr, 'width'=>width)
       base << f
 =begin
-      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal', 
-                                    'width'=>@scrbar_width, 
-                                    'borderwidth'=>@scrbar_border, 
+      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal',
+                                    'width'=>@scrbar_width,
+                                    'borderwidth'=>@scrbar_border,
                                     'highlightthickness'=>@h_l_thick
                                     ).pack('fill'=>'x', 'anchor'=>'w')
 =end
-      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width, 
-                                     'borderwidth'=>@scrbar_border, 
+      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
+                                     'borderwidth'=>@scrbar_border,
                                      'highlightthickness'=>@h_l_thick
                                     ).pack('fill'=>'x', 'anchor'=>'w')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
               'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
 =begin
-      @lbox_list[idx].xscrollcommand proc{|first, last| 
+      @lbox_list[idx].xscrollcommand proc{|first, last|
         @hscr_list[idx].set first, last
       }
       @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
@@ -159,23 +159,23 @@ class TkMultiListFrame < TkListbox
 
     # pad
     # @f_title_pad = TkFrame.new(@frame)
-    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised', 
-                               'borderwidth'=>@title_border, 
+    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
+                               'borderwidth'=>@title_border,
                                'highlightthickness'=>@h_l_thick)
 
-    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken', 
-                             'borderwidth'=>1, 
+    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
+                             'borderwidth'=>1,
                              'highlightthickness'=>@h_l_thick)
 
     # height check
     title_height = 0
-    @title_list.each{|w| 
+    @title_list.each{|w|
       h = w.winfo_reqheight
       title_height = h if title_height < h
     }
 
     hscr_height = 0
-    @hscr_list.each{|w| 
+    @hscr_list.each{|w|
       h = w.winfo_reqheight
       hscr_height = h if hscr_height < h
     }
@@ -187,7 +187,7 @@ class TkMultiListFrame < TkListbox
     # set control procedure for virtical scroll
 =begin
     @lbox_list.each{|lbox|
-      lbox.yscrollcommand proc{|first, last| 
+      lbox.yscrollcommand proc{|first, last|
         @v_scroll.set first, last
       }
     }
@@ -197,16 +197,16 @@ class TkMultiListFrame < TkListbox
 
     # set control procedure for horizoncal scroll
 =begin
-    @c_title.xscrollcommand proc{|first, last| 
+    @c_title.xscrollcommand proc{|first, last|
       @h_scroll.set first, last
     }
-    @c_lbox.xscrollcommand proc{|first, last| 
+    @c_lbox.xscrollcommand proc{|first, last|
       @h_scroll.set first, last
     }
-    @c_hscr.xscrollcommand proc{|first, last| 
+    @c_hscr.xscrollcommand proc{|first, last|
       @h_scroll.set first, last
     }
-    @h_scroll.command proc{|*args| 
+    @h_scroll.command proc{|*args|
       @c_title.xview *args
       @c_lbox.xview *args
       @c_hscr.xview *args if @show_each_hscr
@@ -221,17 +221,17 @@ class TkMultiListFrame < TkListbox
     @lbox_mode['extended'] = extended_mode_bindtag
     @lbox_mode['multiple'] = multiple_mode_bindtag
     @current_mode = 'browse'
-    @lbox_list.each_with_index{|l, idx| 
-      l.bind('Shift-Key-Left', 
+    @lbox_list.each_with_index{|l, idx|
+      l.bind('Shift-Key-Left',
              proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
-      l.bind('Shift-Key-Right', 
+      l.bind('Shift-Key-Right',
              proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
 
-      l.bind('Button-2', proc{|x, y| 
+      l.bind('Button-2', proc{|x, y|
                @lbox_mark_x = x
                @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
              }, '%x %y')
-      l.bind('B2-Motion', proc{|x, y| 
+      l.bind('B2-Motion', proc{|x, y|
                @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
                l.scan_dragto(x, y)
              }, '%x %y')
@@ -270,8 +270,8 @@ class TkMultiListFrame < TkListbox
     @f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
 
     # binding for 'Configure' event
-    @c_lbox.bind('Configure', 
-                 proc{|height, width| reconstruct(height, width)}, 
+    @c_lbox.bind('Configure',
+                 proc{|height, width| reconstruct(height, width)},
                  '%h %w')
 
     # set default receiver of method calls
@@ -316,7 +316,7 @@ class TkMultiListFrame < TkListbox
 
   # set 'mode' option of listboxes
   def mode(sel_mode)
-    @lbox_list.each{|l| 
+    @lbox_list.each{|l|
       tags = l.bindtags
       tags = tags - [ @lbox_mode[@current_mode] ]
       l.bindtags(tags.unshift(@lbox_mode[sel_mode]))
@@ -395,7 +395,7 @@ class TkMultiListFrame < TkListbox
   def titlefont(font)
     @title_list.each{|label| label['font'] = font}
     title_height = 0
-    @title_list.each{|w| 
+    @title_list.each{|w|
       h = w.winfo_reqheight
       title_height = h if title_height < h
     }
@@ -498,7 +498,7 @@ class TkMultiListFrame < TkListbox
             array[indices[0]] = line[label]
           else
             if line[label].kind_of? Array
-              indices.each_with_index{|index, num| 
+              indices.each_with_index{|index, num|
                 array[index] = line[label][num]
               }
             else
@@ -516,9 +516,9 @@ class TkMultiListFrame < TkListbox
           indices.each{|index| lbox_ins[index] << line[index]}
         end
       }
-    }   
+    }
 
-    @lbox_list.each_with_index{|lbox, index| 
+    @lbox_list.each_with_index{|lbox, index|
       lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
     }
   end
@@ -560,7 +560,7 @@ class TkMultiListFrame < TkListbox
     (0..(@rel_list.size - 2)).each{|idx|
       title, lbox, hscr = @base_list[idx]
       title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                  'relheight'=>1.0)
       hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
     }
@@ -587,11 +587,11 @@ class TkMultiListFrame < TkListbox
 
     # adjustment of rightside widget of the sash
     title, lbox, hscr = @base_list[idx]
-    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                 'relx'=>@rel_list[idx])
-    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                'relx'=>@rel_list[idx], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
                'relx'=>@rel_list[idx])
 
     # update reference position
@@ -615,34 +615,34 @@ class TkMultiListFrame < TkListbox
   end
 
   def title_binding(title, index)
-    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
                "%W %x #{index}")
 
-    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
                "%W %x #{index}")
 
     title.bind('Leave', proc{|w| w.cursor ""}, "%W")
 
-    title.bind('Button-1', 
-               proc{|w, x| 
+    title.bind('Button-1',
+               proc{|w, x|
                  if @mode == :sash
                    @x = x
                    @frame_width = TkWinfo.width(@f_title).to_f
                  else
                    title.relief 'sunken'
                  end
-               }, 
+               },
                '%W %X')
 
-    title.bind('ButtonRelease-1', 
-               proc{|w, x, idx| 
+    title.bind('ButtonRelease-1',
+               proc{|w, x, idx|
                  i = idx.to_i
                  if @mode == :title && @title_cmd[i].kind_of?(Proc)
                    @title_cmd[i].call
                  end
                  title.relief 'raised'
                  motion_cb(w,x,i)
-               }, 
+               },
                "%W %x #{index}")
 
     title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
@@ -651,11 +651,11 @@ class TkMultiListFrame < TkListbox
   #################################
   def browse_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
     t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Shift-Button-1', 
+    t.bind('Shift-Button-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -666,7 +666,7 @@ class TkMultiListFrame < TkListbox
 
     t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
     t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash', 
+    t.bind('Control-slash',
            proc{|w| select_line(w, w.index('active').to_i)}, '%W')
 
     t
@@ -675,12 +675,12 @@ class TkMultiListFrame < TkListbox
   ########################
   def single_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1', 
+    t.bind('ButtonRelease-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Shift-Button-1', 
+    t.bind('Shift-Button-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -691,9 +691,9 @@ class TkMultiListFrame < TkListbox
 
     t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
     t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash', 
+    t.bind('Control-slash',
            proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-backslash', 
+    t.bind('Control-backslash',
            proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
 
     t
@@ -702,22 +702,22 @@ class TkMultiListFrame < TkListbox
   ########################
   def extended_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
     t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
 
-    t.bind('ButtonRelease-1', 
+    t.bind('ButtonRelease-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Shift-Button-1', 
+    t.bind('Shift-Button-1',
            proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-    t.bind('Shift-B1-Motion', 
+    t.bind('Shift-B1-Motion',
            proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Control-Button-1', 
+    t.bind('Control-Button-1',
            proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
 
-    t.bind('Control-B1-Motion', 
+    t.bind('Control-B1-Motion',
            proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -743,9 +743,9 @@ class TkMultiListFrame < TkListbox
   ########################
   def multiple_mode_bindtag
     t = TkBindTag.new
-    t.bind('Button-1', 
+    t.bind('Button-1',
            proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1', 
+    t.bind('ButtonRelease-1',
            proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
 
     t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -905,13 +905,13 @@ end
 # test
 ################################################
 if __FILE__ == $0
-  l = TkMultiListFrame.new(nil, 200, 
-                           [ ['L1', 200, proc{p 'click L1'}], 
-                             ['L2', 100], 
-                             ['L3', 200] ], 
-                           'width'=>350, 
-                           #'titleforeground'=>'yellow', 
-                           'titleforeground'=>'white', 
+  l = TkMultiListFrame.new(nil, 200,
+                           [ ['L1', 200, proc{p 'click L1'}],
+                             ['L2', 100],
+                             ['L3', 200] ],
+                           'width'=>350,
+                           #'titleforeground'=>'yellow',
+                           'titleforeground'=>'white',
                            #'titlebackground'=>'navy',
                            'titlebackground'=>'blue',
                            'titlefont'=>'courier'
@@ -919,7 +919,7 @@ if __FILE__ == $0
   l.insert('end', [1,2,3])
   l.insert('end', [4,5,6])
   l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 
+  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
                    'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
                    'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
   l.insert('end', [1,2,3])
diff --git a/ext/tk/sample/tkoptdb-safeTk.rb b/ext/tk/sample/tkoptdb-safeTk.rb
index a06098323f..3972577b0f 100644
--- a/ext/tk/sample/tkoptdb-safeTk.rb
+++ b/ext/tk/sample/tkoptdb-safeTk.rb
@@ -18,19 +18,19 @@ EOM
 
 if ENV['LANG'] =~ /^ja/
   # read Japanese resource
-  ent = TkOptionDB.read_entries(File.expand_path('resource.ja', 
+  ent = TkOptionDB.read_entries(File.expand_path('resource.ja',
                                                  File.dirname(__FILE__)),
                                 'euc-jp')
 else
   # read English resource
-  ent = TkOptionDB.read_entries(File.expand_path('resource.en', 
+  ent = TkOptionDB.read_entries(File.expand_path('resource.en',
                                                 File.dirname(__FILE__)))
 end
 
 file = File.expand_path('tkoptdb.rb', File.dirname(__FILE__))
 
 ip = MultiTkIp.new_safeTk{
-  # When a block is given to 'new_safeTk' method, 
+  # When a block is given to 'new_safeTk' method,
   # the block is evaluated on $SAFE==4.
   ent.each{|pat, val| Tk.tk_call('option', 'add', pat, val)}
 }
@@ -38,22 +38,22 @@ ip = MultiTkIp.new_safeTk{
 print "ip.eval_proc{$SAFE} ==> ", ip.eval_proc{$SAFE}, "\n"
 
 print "\ncall 'ip.wait_on_mainloop = false'\n"
-print "If 'ip.wait_on_mainloop? == true', ", 
-  "when 'mainloop' is called on 'ip.eval_proc', ", 
-  "'ip.eval_proc' does't return while the root window exists.\n", 
-  "If you want to avoid that, set wait_on_mainloop to false. ", 
-  "Then the mainloop in the eval_proc returns soon ", 
-  "and the following steps are evaluated. \n", 
-  "If you hate the both of them, use 'ip.bg_eval_proc' or ", 
+print "If 'ip.wait_on_mainloop? == true', ",
+  "when 'mainloop' is called on 'ip.eval_proc', ",
+  "'ip.eval_proc' does't return while the root window exists.\n",
+  "If you want to avoid that, set wait_on_mainloop to false. ",
+  "Then the mainloop in the eval_proc returns soon ",
+  "and the following steps are evaluated. \n",
+  "If you hate the both of them, use 'ip.bg_eval_proc' or ",
   "wrap 'ip.eval_proc' by a thread.\n"
 
 ip.wait_on_mainloop = false
 
 ret = ip.eval_proc{
-  # When a block is given to 'eval_proc' method, 
+  # When a block is given to 'eval_proc' method,
   # the block is evaluated on the IP's current safe level.
-  # So, the followings raises an exception. 
-  # An Exception object of the exception is returned as a 
+  # So, the followings raises an exception.
+  # An Exception object of the exception is returned as a
   # return value of this method.
 
   load file
@@ -64,7 +64,7 @@ print "If a proc object is given, the proc is evaluated on the safe-level which
 
 safe0_cmd = Proc.new{
   print 'safe0_cmd safe-level == ', $SAFE, "\n"
-  # This proc object keeps current safe-level ($SAFE==0). 
+  # This proc object keeps current safe-level ($SAFE==0).
   load file
 }
 ip.eval_proc{safe0_cmd.call}
diff --git a/ext/tk/sample/tkoptdb.rb b/ext/tk/sample/tkoptdb.rb
index 47784ea238..75c21e7e47 100644
--- a/ext/tk/sample/tkoptdb.rb
+++ b/ext/tk/sample/tkoptdb.rb
@@ -2,21 +2,21 @@
 #
 #  sample script of TkOptionDB
 #
-#  If 'LANG' environment variable's value is started by 'ja',  
-#  then read Japanese resource data and display Japanese button text. 
-#  In other case, read English resource data and display English text. 
+#  If 'LANG' environment variable's value is started by 'ja',
+#  then read Japanese resource data and display Japanese button text.
+#  In other case, read English resource data and display English text.
 #
 require "tk"
 
 if __FILE__ == $0 || !TkCore::INTERP.safe?
   if ENV['LANG'] =~ /^ja/
     # read Japanese resource
-    TkOptionDB.read_with_encoding(File.expand_path('resource.ja', 
-                                                   File.dirname(__FILE__)), 
+    TkOptionDB.read_with_encoding(File.expand_path('resource.ja',
+                                                   File.dirname(__FILE__)),
                                   'euc-jp')
   else
     # read English resource
-    TkOptionDB.readfile(File.expand_path('resource.en', 
+    TkOptionDB.readfile(File.expand_path('resource.en',
                                          File.dirname(__FILE__)))
   end
 end
@@ -24,7 +24,7 @@ end
 # 'show_msg' and 'bye_msg' procedures can be defined on BTN_CMD resource.
 # Those procedures are called under $SAFE==2
 cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
-  # If you want to check resource string (str), 
+  # If you want to check resource string (str),
   # please define __check_proc_string__(str) like this.
   class << self
     def __check_proc_string__(str)
@@ -40,12 +40,12 @@ cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
 # following two frame widgets use same database entry
 TkFrame.new(:class=>'BtnFrame'){|f|
   pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
+  TkButton.new(:parent=>f, :widgetname=>'hello'){
     command proc{
       print "($SAFE=#{$SAFE} >>>) : "
       cmd.show_msg(TkOptionDB.inspect)
       print "(<<< $SAFE=#{$SAFE})"
-    } 
+    }
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
   TkButton.new(:command=>proc{
@@ -53,7 +53,7 @@ TkFrame.new(:class=>'BtnFrame'){|f|
                  cmd.bye_msg
                  print "(<<< $SAFE=#{$SAFE} ) : "
                  exit
-               }, 
+               },
                :parent=>f, :widgetname=>'quit'){
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
@@ -62,12 +62,12 @@ TkFrame.new(:class=>'BtnFrame'){|f|
 class BtnFrame < TkFrame; end
 BtnFrame.new{|f|
   pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
+  TkButton.new(:parent=>f, :widgetname=>'hello'){
     command proc{
       print "($SAFE=#{$SAFE} >>>) : "
       cmd.show_msg(TkOptionDB.inspect)
       print "(<<< $SAFE=#{$SAFE})"
-    } 
+    }
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
   TkButton.new(:command=>proc{
@@ -75,7 +75,7 @@ BtnFrame.new{|f|
                  cmd.bye_msg
                  print "(<<< $SAFE=#{$SAFE})"
                  exit
-               }, 
+               },
                :parent=>f, :widgetname=>'quit'){
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
@@ -84,12 +84,12 @@ BtnFrame.new{|f|
 # if unknown class, use default option values
 TkFrame.new(:class=>'BtnFrame2'){|f|
   pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
+  TkButton.new(:parent=>f, :widgetname=>'hello'){
     command proc{
       print "($SAFE=#{$SAFE} >>>) : "
       cmd.show_msg(TkOptionDB.inspect)
       print "(<<< $SAFE=#{$SAFE})"
-    } 
+    }
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
   TkButton.new(:command=>proc{
@@ -97,7 +97,7 @@ TkFrame.new(:class=>'BtnFrame2'){|f|
                  cmd.bye_msg
                  print "(<<< $SAFE=#{$SAFE})"
                  exit
-               }, 
+               },
                :parent=>f, :widgetname=>'quit'){
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
diff --git a/ext/tk/sample/tkrttimer.rb b/ext/tk/sample/tkrttimer.rb
index 531f4a8d5a..1f9cbd9eb5 100644
--- a/ext/tk/sample/tkrttimer.rb
+++ b/ext/tk/sample/tkrttimer.rb
@@ -8,17 +8,26 @@ root = TkRoot.new(:title=>'realtime timer sample')
 f1 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
 f1.pack(:side=>:bottom, :fill=>:both)
 TkLabel.new(f1, :text=>'use TkTimer (TkAfter) class').pack(:anchor=>:center)
-label1 = TkLabel.new(:parent=>f1, :relief=>:raised, 
+label1 = TkLabel.new(:parent=>f1, :relief=>:raised,
                      :width=>10).pack(:fill=>:both)
 
 f2 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
 f2.pack(:side=>:bottom, :fill=>:both)
 TkLabel.new(f2, :text=>'use TkRTTimer class').pack
-label2 = TkLabel.new(:parent=>f2, :relief=>:raised, 
+label2 = TkLabel.new(:parent=>f2, :relief=>:raised,
                      :width=>10).pack(:fill=>:both)
 
-TkLabel.new(:text=>'Interval setting of each timer is 10 ms.', 
-            :padx=>10, :pady=>5).pack
+TkLabel.new(:padx=>10, :pady=>5, :justify=>'left', :text=><<EOT).pack
+Interval setting of each timer object is 10 ms.
+Each timer object counts up the value on each callback
+(the value is not the clock data).
+The count of the TkTimer object is delayed by execution
+time of callbacks and inaccuracy of interval.
+On the other hand, the count of the TkRTTimer object is
+not delayed. Its callback interval is not accurate too.
+But it can compute error correction about the time when
+a callback should start.
+EOT
 
 # define the procedure repeated by the TkTimer object
 tick = proc{|aobj| #<== TkTimer object
diff --git a/ext/tk/sample/tksleep_sample.rb b/ext/tk/sample/tksleep_sample.rb
new file mode 100644
index 0000000000..23f6eca54e
--- /dev/null
+++ b/ext/tk/sample/tksleep_sample.rb
@@ -0,0 +1,29 @@
+require 'tk'
+
+v = TkVariable.new(0)
+l = TkLabel.new(:textvariable=>v).pack(:pady=>[1, 10])
+
+a = TkButton.new(:text=>"button A :: proc{p ['AAA', v.value]}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
+a.command{p ['AAA', v.value]}
+
+TkLabel.new(:text=>'Callback of the button B returns LIFO order').pack
+b = TkButton.new(:text=>"button B :: proc{n = v.value; p ['B:start', n]; Tk.sleep(10000); p ['B:end', n]}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
+b.command{n = v.value; p ['B:start', n]; Tk.sleep(10000); p ['B:end', n]}
+
+TkLabel.new(:text=>'Callback of the button C returns FIFO order').pack
+c = TkButton.new(:text=>"button C :: proc{n = v.value; Thread.new{p ['C:start', n]; Tk.sleep(10000); p ['C:end', n]}}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
+c.command{n = v.value; Thread.new{p ['C:start', n]; Tk.sleep(10000); p ['C:end', n]}}
+
+TkLabel.new(:text=>'Callback of the button D blocks eventloop (no respond to event)').pack
+d = TkButton.new(:text=>"button D :: proc{n = v.value; p ['D:start', n]; sleep(10); p ['D:end', n]}").pack(:fill=>:x, :pady=>[1,15], :padx=>15)
+d.command{n = v.value; p ['D:start', n]; sleep(10); p ['D:end', n]}
+
+TkLabel.new(:text=>'Callback of the button E is another way to avoid eventloop blocking').pack
+e = TkButton.new(:text=>"button E :: proc{n = v.value; Thread.new{p ['D:start', n]; sleep(10); p ['D:end', n]}}").pack(:fill=>:x, :pady=>[1,15], :padx=>15)
+e.command{n = v.value; Thread.new{p ['D:start', n]; sleep(10); p ['D:end', n]}}
+
+TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
+
+TkTimer.new(500, -1){v.numeric += 1}.start
+
+Tk.mainloop
diff --git a/ext/tk/sample/tktextframe.rb b/ext/tk/sample/tktextframe.rb
index bdab057d34..b2b40c9138 100644
--- a/ext/tk/sample/tktextframe.rb
+++ b/ext/tk/sample/tktextframe.rb
@@ -5,9 +5,53 @@
 #
 require 'tk'
 
-class TkTextFrame < TkText
+module Tk::ScrollbarComposite
   include TkComposite
 
+  def component_construct_keys
+    # If a component requires options for construction,
+    # return an Array of option-keys.
+    []
+  end
+  private :component_construct_keys
+
+  def create_component(keys={})
+    # This method must return the created component widget.
+  end
+  private :create_component
+
+  def component_delegates
+    # if want to override defalut option-methods or delegates,
+    # please define here.
+  end
+  private :component_delegates
+
+  def define_delegates
+    # option methods for scrollbars
+    option_methods([:scrollbarwidth, :get_scrollbarwidth])
+
+    # set receiver widgets for configure methods (with alias)
+    delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
+    delegate_alias('framebackground', 'background',
+                   @frame, @h_scroll, @v_scroll)
+    delegate_alias('activeframebackground', 'activebackground',
+                   @h_scroll, @v_scroll)
+
+    # set receiver widgets for configure methods
+    delegate('DEFAULT', @component)
+    delegate('troughcolor', @h_scroll, @v_scroll)
+    delegate('repeatdelay', @h_scroll, @v_scroll)
+    delegate('repeatinterval', @h_scroll, @v_scroll)
+    delegate('borderwidth', @frame)
+    delegate('relief', @frame)
+
+    component_delegates
+  end
+  private :define_delegates
+
+  DEFAULT_VSCROLL = true
+  DEFAULT_HSCROLL = true
+
   def initialize_composite(keys={})
     keys = _symbolkey2str(keys)
 
@@ -15,55 +59,123 @@ class TkTextFrame < TkText
     @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
     @h_scroll = TkScrollbar.new(@frame, 'orient'=>'horizontal')
 
-    # create a text widget
-    @text = TkText.new(@frame, 'wrap'=>'none')
+    # create a component
+    construct_keys = {}
+    ((component_construct_keys.map{|k| k.to_s}) & keys.keys).each{|k|
+      construct_keys[k] = keys.delete(k)
+    }
+
+    # create a component (the component must be scrollable)
+    @component = create_component(construct_keys)
 
     # set default receiver of method calls
-    @path = @text.path
+    @path = @component.path
 
     # assign scrollbars
-    @text.xscrollbar(@h_scroll)
-    @text.yscrollbar(@v_scroll)
+    @component.xscrollbar(@h_scroll)
+    @component.yscrollbar(@v_scroll)
 
     # allignment
     TkGrid.rowconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
     TkGrid.columnconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
-    @text.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
+    @component.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
 
     # scrollbars ON
-    vscroll(keys.delete('vscroll'){true})
-    hscroll(keys.delete('hscroll'){true})
-
-    # set background of the text widget
-=begin
-    color = keys.delete('textbackground')
-    textbackground(color) if color
-=end
-    # please check the differences of the following definitions
+    vscroll(keys.delete('vscroll'){self.class::DEFAULT_VSCROLL})
+    hscroll(keys.delete('hscroll'){self.class::DEFAULT_HSCROLL})
+
+    # do configure
+    define_delegates
+
+    # do configure
+    configure keys unless keys.empty?
+  end
+  private :initialize_composite
+
+  # get/set width of scrollbar
+  def get_scrollbarwidth
+    @v_scroll.width
+  end
+  def set_scrollbarwidth(width)
+    @v_scroll.width(width)
+    @h_scroll.width(width)
+  end
+  alias :scrollbarwidth :set_scrollbarwidth
+
+  def hook_vscroll_on(*args); end
+  def hook_vscroll_off(*args); end
+  def hook_hscroll_on(*args); end
+  def hook_hscroll_off(*args); end
+  private :hook_vscroll_on,:hook_vscroll_off,:hook_hscroll_on,:hook_hscroll_off
+
+  # vertical scrollbar : ON/OFF
+  def vscroll(mode, *args)
+    st = TkGrid.info(@v_scroll)
+    if mode && st.size == 0 then
+      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
+      hook_vscroll_on(*args)
+    elsif !mode && st.size != 0 then
+      @v_scroll.ungrid
+      hook_vscroll_off(*args)
+    end
+    self
+  end
+
+  # horizontal scrollbar : ON/OFF
+  def hscroll(mode, *args)
+    st = TkGrid.info(@h_scroll)
+    if mode && st.size == 0 then
+      @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew')
+      hook_hscroll_on(*args)
+    elsif !mode && st.size != 0 then
+      @h_scroll.ungrid
+      hook_hscroll_off(*args)
+    end
+    self
+  end
+end
+
+################################################
+
+class TkTextFrame < TkText
+  include Tk::ScrollbarComposite
+
+  # def component_construct_keys; []; end
+  # private :component_construct_keys
+
+  def create_component(keys={})
+    # keys has options which are listed by component_construct_keys method.
+    @text = TkText.new(@frame, 'wrap'=>'none')
+    @text.configure(keys) unless keys.empty?
+
+    # option methods for component
     option_methods(
-       [:scrollbarwidth, :get_scrollbarwidth], 
-       [:textbackground, nil, :textbg_info], 
-       :textborderwidth, 
+       [:textbackground, nil, :textbg_info],
+       :textborderwidth,
        :textrelief
     )
 
-    # set receiver widgets for configure methods (with alias)
-    delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
+    # return the created componet
+    @text
+  end
+  private :create_component
 
-    # set receiver widgets for configure methods
-    delegate('DEFAULT', @text)
-    delegate('background', @frame, @h_scroll, @v_scroll)
-    delegate('activebackground', @h_scroll, @v_scroll)
-    delegate('troughcolor', @h_scroll, @v_scroll)
-    delegate('repeatdelay', @h_scroll, @v_scroll)
-    delegate('repeatinterval', @h_scroll, @v_scroll)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
+  # def component_delegates; end
+  # private :component_delegates
 
-    # do configure
-    configure keys unless keys.empty?
+  def hook_hscroll_on(wrap_mode=nil)
+    if wrap_mode
+      wrap wrap_mode
+    else
+      wrap 'none'  # => self.wrap('none')
+    end
+  end
+  def hook_hscroll_off(wrap_mode)
+    wrap wrap_mode  # => self.wrap(wrap_mode)
+  end
+  def hscroll(mode, wrap_mode="char")
+    super
   end
-  private :initialize_composite
 
   # set background color of text widget
   def textbackground(color = nil)
@@ -103,60 +215,67 @@ class TkTextFrame < TkText
   def textrelief(type)
     @text.relief(type)
   end
-
-  # get/set width of scrollbar
-  def get_scrollbarwidth
-    @v_scroll.width
-  end
-  def set_scrollbarwidth(width)
-    @v_scroll.width(width)
-    @h_scroll.width(width)
-  end
-  alias :scrollbarwidth :set_scrollbarwidth
-
-  # vertical scrollbar : ON/OFF
-  def vscroll(mode)
-    st = TkGrid.info(@v_scroll)
-    if mode && st.size == 0 then
-      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
-    elsif !mode && st.size != 0 then
-      @v_scroll.ungrid
-    end
-    self
-  end
-
-  # horizontal scrollbar : ON/OFF
-  def hscroll(mode, wrap_mode="char")
-    st = TkGrid.info(@h_scroll)
-    if mode && st.size == 0 then
-      @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew')
-      wrap 'none'  # => self.wrap('none')
-    elsif !mode && st.size != 0 then
-      @h_scroll.ungrid
-      wrap wrap_mode  # => self.wrap(wrap_mode)
-    end
-    self
-  end
 end
 
-
 ################################################
 # test
 ################################################
 if __FILE__ == $0
+  TkLabel.new(:text=>'TkTextFrame is an example of Tk::ScrollbarComposite module.').pack
   f = TkFrame.new.pack('fill'=>'x')
   #t = TkTextFrame.new.pack
-  t = TkTextFrame.new(:textborderwidth=>3, 
-                      :textrelief=>:ridge, 
+  t = TkTextFrame.new(:textborderwidth=>3,
+                      :textrelief=>:ridge,
                       :scrollbarrelief=>:ridge).pack
   p t.configinfo
-  TkButton.new(f, 'text'=>'vscr OFF', 
+  TkButton.new(f, 'text'=>'vscr OFF',
                'command'=>proc{t.vscroll(false)}).pack('side'=>'right')
-  TkButton.new(f, 'text'=>'vscr ON', 
+  TkButton.new(f, 'text'=>'vscr ON',
                'command'=>proc{t.vscroll(true)}).pack('side'=>'right')
-  TkButton.new(f, 'text'=>'hscr ON', 
+  TkButton.new(f, 'text'=>'hscr ON',
                'command'=>proc{t.hscroll(true)}).pack('side'=>'left')
-  TkButton.new(f, 'text'=>'hscr OFF', 
+  TkButton.new(f, 'text'=>'hscr OFF',
                'command'=>proc{t.hscroll(false)}).pack('side'=>'left')
+
+  ############################################
+
+  # Tk.default_widget_set = :Ttk
+
+  TkFrame.new.pack(:pady=>10)
+  TkLabel.new(:text=>'The following is another example of Tk::ScrollbarComposite module.').pack
+
+  #----------------------------------
+  class ScrListbox < TkListbox
+    include Tk::ScrollbarComposite
+
+    DEFAULT_HSCROLL = false
+
+    def create_component(keys={})
+      TkListbox.new(@frame, keys)
+    end
+    private :create_component
+  end
+  #----------------------------------
+
+  f = TkFrame.new.pack(:pady=>5)
+  lbox = ScrListbox.new(f).pack(:side=>:left)
+  lbox.value = %w(aa bb cc dd eeeeeeeeeeeeeeeeeeeeeeeeee ffffffffff gg hh ii jj kk ll mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm nn oo pp qq)
+  fb = TkFrame.new(f).pack(:expand=>true, :fill=>:y, :padx=>5)
+  TkButton.new(fb, 'text'=>'lbox hscr OFF',
+               'command'=>proc{lbox.hscroll(false)}).pack(:side=>:bottom,
+                                                          :fill=>:x)
+  TkButton.new(fb, 'text'=>'lbox hscr ON',
+               'command'=>proc{lbox.hscroll(true)}).pack(:side=>:bottom,
+                                                          :fill=>:x)
+  TkFrame.new(fb).pack(:pady=>5, :side=>:bottom)
+  TkButton.new(fb, 'text'=>'lbox vscr OFF',
+               'command'=>proc{lbox.vscroll(false)}).pack(:side=>:bottom,
+                                                          :fill=>:x)
+  TkButton.new(fb, 'text'=>'lbox vscr ON',
+               'command'=>proc{lbox.vscroll(true)}).pack(:side=>:bottom,
+                                                          :fill=>:x)
+
+  ############################################
+
   Tk.mainloop
 end
diff --git a/ext/tk/sample/tktextio.rb b/ext/tk/sample/tktextio.rb
index 4573bcebdf..679a2b7142 100644
--- a/ext/tk/sample/tktextio.rb
+++ b/ext/tk/sample/tktextio.rb
@@ -3,15 +3,15 @@
 #  TkTextIO class :: handling I/O stream on a TkText widget
 #                             by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
-#  NOTE: TkTextIO supports 'character' (not 'byte') access only. 
-#        So, for example, TkTextIO#getc returns a character, TkTextIO#pos 
-#        means the character position, TkTextIO#read(size) counts by 
+#  NOTE: TkTextIO supports 'character' (not 'byte') access only.
+#        So, for example, TkTextIO#getc returns a character, TkTextIO#pos
+#        means the character position, TkTextIO#read(size) counts by
 #        characters, and so on.
-#        Of course, it is available to make TkTextIO class to suuport 
-#        'byte' access. However, it may break multi-byte characters. 
+#        Of course, it is available to make TkTextIO class to suuport
+#        'byte' access. However, it may break multi-byte characters.
 #        and then, displayed string on the text widget may be garbled.
-#        I think that it is not good on the supposed situation of using 
-#        TkTextIO. 
+#        I think that it is not good on the supposed situation of using
+#        TkTextIO.
 #
 require 'tk'
 require 'tk/text'
@@ -24,14 +24,14 @@ class TkTextIO < TkText
 
   OPT_DEFAULTS = {
     'mode'       => nil,
-    'overwrite'  => false, 
-    'text'       => nil, 
-    'show'       => :pos, 
-    'wrap'       => 'char', 
-    'sync'       => true, 
-    'prompt'     => nil, 
-    'prompt_cmd' => nil, 
-    'hist_size'  => 1000, 
+    'overwrite'  => false,
+    'text'       => nil,
+    'show'       => :pos,
+    'wrap'       => 'char',
+    'sync'       => true,
+    'prompt'     => nil,
+    'prompt_cmd' => nil,
+    'hist_size'  => 1000,
   }
 
   def create_self(keys)
@@ -46,7 +46,7 @@ class TkTextIO < TkText
     @buf_size = 0
     @buf_max = 1024
 
-    @write_buf_queue, @write_buf_mutex, 
+    @write_buf_queue, @write_buf_mutex,
     @read_buf_queue,  @read_buf_mutex  = @@create_queues.call
 
     @idle_flush  = TkTimer.new(:idle, 1, proc{ @flusher.run rescue nil })
@@ -87,7 +87,7 @@ class TkTextIO < TkText
 
   def _get_io_params(keys)
     opts = {}
-    self.class.const_get(:OPT_DEFAULTS).each{|k, v| 
+    self.class.const_get(:OPT_DEFAULTS).each{|k, v|
       if keys.has_key?(k)
         opts[k] = keys.delete(k)
       else
@@ -254,7 +254,15 @@ class TkTextIO < TkText
       Tk.callback_break
     end
   end
-  private :_cb_up, :_cb_down, :_cb_left, :_cb_backspace, :_cb_ctrl_a
+  def _cb_ctrl_u
+    if @console_mode
+      mark_set('insert', @ins_head)
+      delete('insert', 'insert lineend')
+      Tk.callback_break
+    end
+  end
+  private :_cb_up, :_cb_down, :_cb_left, :_cb_backspace,
+          :_cb_ctrl_a, :_cb_ctrl_u
 
   def _setup_console_bindings
     @bindtag = TkBindTag.new
@@ -328,6 +336,8 @@ class TkTextIO < TkText
 
     @bindtag.bind('Home'){ _cb_ctrl_a }
     @bindtag.bind('Control-a'){ _cb_ctrl_a }
+
+    @bindtag.bind('Control-u'){ _cb_ctrl_u }
   end
   private :_setup_console_bindings
 
@@ -474,7 +484,7 @@ class TkTextIO < TkText
     Thread.pass
     if @open[:w] || ! @write_buffer.empty?
       @write_buf_mutex.synchronize {
-        _sync_write_buf(@write_buffer) 
+        _sync_write_buf(@write_buffer)
         @write_buffer[0..-1] = ''
       }
     end
@@ -656,7 +666,7 @@ class TkTextIO < TkText
       @txtpos.set('end - 1 char')
     elsif rs == ''
       @count_var.value  # make it global
-      idx = tksearch_with_count([:regexp], @count_var, 
+      idx = tksearch_with_count([:regexp], @count_var,
                                    "\n(\n)+", @txtpos, 'end - 1 char')
       if idx
         s = get(@txtpos, idx) << "\n"
@@ -769,9 +779,9 @@ class TkTextIO < TkText
   end
 
   def show_mode=(mode)
-    # define show mode  when file position is changed. 
-    #  mode == :pos or "pos" or true :: see current file position. 
-    #  mode == :insert or "insert"   :: see insert cursor position. 
+    # define show mode  when file position is changed.
+    #  mode == :pos or "pos" or true :: see current file position.
+    #  mode == :insert or "insert"   :: see insert cursor position.
     #  mode == nil or false          :: do nothing
     #  else see 'mode' position ('mode' should be text index or mark)
     case mode
@@ -911,9 +921,9 @@ if __FILE__ == $0
   ev_loop = Thread.new{Tk.mainloop}
 
   f = TkFrame.new.pack
-  #tio = TkTextIO.new(f, :show=>:nil, 
-  #tio = TkTextIO.new(f, :show=>:pos, 
-  tio = TkTextIO.new(f, :show=>:insert, 
+  #tio = TkTextIO.new(f, :show=>:nil,
+  #tio = TkTextIO.new(f, :show=>:pos,
+  tio = TkTextIO.new(f, :show=>:insert,
                      :text=>">>> This is an initial text line. <<<\n\n"){
 #    yscrollbar(TkScrollbar.new(f).pack(:side=>:right, :fill=>:y))
     pack(:side=>:left, :fill=>:both, :expand=>true)
@@ -1035,12 +1045,12 @@ if __FILE__ == $0
   num = 0
 #  io = TkTextIO.new(:mode=>:console, :prompt=>'').pack
 #=begin
-  io = TkTextIO.new(:mode=>:console, 
+  io = TkTextIO.new(:mode=>:console,
                     :prompt_cmd=>proc{
                       s = "[#{num}]"
                       num += 1
                       s
-                    }, 
+                    },
                     :prompt=>'-> ').pack
 #=end
   Thread.new{loop{sleep 2; io.puts 'hoge'}}
diff --git a/ext/tk/sample/tktimer2.rb b/ext/tk/sample/tktimer2.rb
index dd31bb098e..125115e863 100644
--- a/ext/tk/sample/tktimer2.rb
+++ b/ext/tk/sample/tktimer2.rb
@@ -5,7 +5,7 @@ require "tk"
 
 # new notation :
 #   * symbols are acceptable as keys or values of the option hash
-#   * the parent widget can be given by :parent key on the option hash 
+#   * the parent widget can be given by :parent key on the option hash
 root = TkRoot.new(:title=>'timer sample')
 label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
                .pack(:side=>:bottom, :fill=>:both)
@@ -19,11 +19,11 @@ tick = proc{|aobj| #<== TkTimer object
 }
 
 timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-        # ==> repeat-interval : (about) 50 ms,  
-        #     repeat : infinite (-1) times, 
+        # ==> repeat-interval : (about) 50 ms,
+        #     repeat : infinite (-1) times,
         #     repeat-procedure : tick (only one, in this case)
         #
-        # ==> wait-before-call-init-proc : 0 ms, 
+        # ==> wait-before-call-init-proc : 0 ms,
         #     init_proc : proc{ label.text('0.00'); 0 }
         #
         # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
diff --git a/ext/tk/sample/tktimer3.rb b/ext/tk/sample/tktimer3.rb
index e3bb4c3e4a..08e8a3cad4 100644
--- a/ext/tk/sample/tktimer3.rb
+++ b/ext/tk/sample/tktimer3.rb
@@ -5,7 +5,7 @@ require "tk"
 
 # new notation :
 #   * symbols are acceptable as keys or values of the option hash
-#   * the parent widget can be given by :parent key on the option hash 
+#   * the parent widget can be given by :parent key on the option hash
 root = TkRoot.new(:title=>'timer sample')
 label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
                .pack(:side=>:bottom, :fill=>:both)
@@ -19,11 +19,11 @@ tick = proc{|aobj| #<== TkTimer object
 }
 
 timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-        # ==> repeat-interval : (about) 50 ms,  
-        #     repeat : infinite (-1) times, 
+        # ==> repeat-interval : (about) 50 ms,
+        #     repeat : infinite (-1) times,
         #     repeat-procedure : tick (only one, in this case)
         #
-        # ==> wait-before-call-init-proc : 0 ms, 
+        # ==> wait-before-call-init-proc : 0 ms,
         #     init_proc : proc{ label.text('0.00'); 0 }
         #
         # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
diff --git a/ext/tk/sample/tktree.rb b/ext/tk/sample/tktree.rb
index 56b7211c88..4eb7f60627 100644
--- a/ext/tk/sample/tktree.rb
+++ b/ext/tk/sample/tktree.rb
@@ -3,10 +3,10 @@
 #
 #    see <http://wiki.tcl.tk/10615>
 #
-#  Note:  optional argument '-font' of the Tcl library is changed to 
-#         'itemfont' on this Ruby library, because of avoiding font 
-#         operation trouble in 'initialize' method  ( see the following 
-#         test script ). 
+#  Note:  optional argument '-font' of the Tcl library is changed to
+#         'itemfont' on this Ruby library, because of avoiding font
+#         operation trouble in 'initialize' method  ( see the following
+#         test script ).
 #
 ##########################################################################
 require 'tk'
@@ -68,9 +68,9 @@ end
 if __FILE__ == $0
   TkLabel.new(:text=><<EOL, :relief=>:ridge, :justify=>:left).pack
 
- This is a sample to use a Tcl library script on Ruby/Tk. 
- This sample loads tktree.tcl (see <http://wiki.tcl.tk/10615>) 
- and calls functions of the Tcl script. 
+ This is a sample to use a Tcl library script on Ruby/Tk.
+ This sample loads tktree.tcl (see <http://wiki.tcl.tk/10615>)
+ and calls functions of the Tcl script.
 EOL
 
   items = %w(/group1/item1 /group1/item2 /group1/subgroup/item1 /group2/item1 /item1)
@@ -79,14 +79,14 @@ EOL
   tr1.focus
 
   items.each{|item|
-    tr1.newitem(item, 
+    tr1.newitem(item,
                 :command=>proc{Tk.messageBox(:message=>"#{item} executed")})
   }
 
   f = TkFrame.new.pack(:expand=>true, :fill=>:both)
-  tr2 = TkTree.new(f, :bg=>'black', #:itemfont=>{:family=>'Times', :size=>14}, 
-                   :textcolor=>'red', :bd=>4, :relief=>:ridge, 
-                   :selectbackground=>'darkBlue', :selectforeground=>'yellow', 
+  tr2 = TkTree.new(f, :bg=>'black', #:itemfont=>{:family=>'Times', :size=>14},
+                   :textcolor=>'red', :bd=>4, :relief=>:ridge,
+                   :selectbackground=>'darkBlue', :selectforeground=>'yellow',
                    :selectborderwidth=>3, :linecolor=>'yellow') {
     yscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:right, :fill=>:y))
     xscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:bottom, :fill=>:x))
@@ -94,8 +94,8 @@ EOL
   }
 
   items.each{|item|
-    tr2.newitem(item, :textcolor=>'green', :image=>'', 
-                :itemfont=>{:family=>'Times', :size=>10}, 
+    tr2.newitem(item, :textcolor=>'green', :image=>'',
+                :itemfont=>{:family=>'Times', :size=>10},
                 :command=>proc{Tk.messageBox(:message=>"#{item} executed")})
   }
 
diff --git a/ext/tk/sample/ttk_wrapper.rb b/ext/tk/sample/ttk_wrapper.rb
new file mode 100644
index 0000000000..e4eb9c7964
--- /dev/null
+++ b/ext/tk/sample/ttk_wrapper.rb
@@ -0,0 +1,154 @@
+#!/usr/bin/env ruby
+#
+#  ttk_wrapper.rb  --  use Ttk widgets as default on old Ruby/Tk scripts
+#
+#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+version = '0.1.3'
+#
+##########################################################################
+#  parse commandline arguments
+##########################################################################
+require 'optparse'
+opt = OptionParser.new("Usage: #{$0} [options] rubytk_script" << "\n    " <<
+                         "Ruby/Tk script wrapper. Use Ttk widgets as default.")
+opt.version = version
+
+OPTS = {}
+OPTS[:themedir] = []
+OPTS[:rb_theme] = []
+OPTS[:theme] = 'default'
+
+opt.on('-l', '--list', 'list available theme names'){|v| OPTS[:list] = true}
+opt.on('-t', '--theme theme', 'theme name'){|v| OPTS[:theme] = v}
+opt.on('-d', '--themedir themes_dir', 'directory of theme definitions'){|v|
+  OPTS[:themedir] << v
+}
+opt.on('-r', '--rubytheme rb_theme', 'theme definition file (ruby script)'){|v|
+  OPTS[:rb_theme] << v
+}
+opt.on('-v', '--verbose', 'print verbose messages'){|v| OPTS[:verbose] = true}
+
+opt.parse!(ARGV)
+
+
+##########################################################################
+#  load Ttk (Tile) extension
+##########################################################################
+require 'tk'
+
+begin
+  require 'tkextlib/tile'
+  Tk.default_widget_set = :Ttk
+rescue LoadError
+  if OPTS[:verbose]
+    print "warning: fail to load 'Ttk' extension. use standard widgets.\n"
+  end
+end
+
+if OPTS[:verbose]
+  print "current default widget set is '#{Tk.default_widget_set}'\n"
+end
+
+
+##########################################################################
+# define Tcl/Tk procedures for compatibility.
+# those are required when want to use themes included
+# in "sample/tkextlib/tile/demo.rb".
+##########################################################################
+Tk::Tile.__define_LoadImages_proc_for_compatibility__!
+Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
+
+
+##########################################################################
+#  use themes defined on the demo of Ttk (Tile) extension
+##########################################################################
+demodir = File.dirname(__FILE__)
+demo_themesdir = File.expand_path(File.join(demodir, 'tkextlib', 'tile', 'themes'))
+
+Tk::AUTO_PATH.lappend(*OPTS[:themedir]) unless OPTS[:themedir].empty?
+Tk::AUTO_PATH.lappend('.', demodir, demo_themesdir)
+
+OPTS[:themedir] << demo_themesdir
+print "theme-dirs: #{OPTS[:themedir].inspect}\n" if OPTS[:verbose]
+
+OPTS[:themedir].each{|themesdir|
+  if File.directory?(themesdir)
+    Dir.foreach(themesdir){|name|
+      next if name == '.' || name == '..'
+      path = File.join(themesdir, name)
+      Tk::AUTO_PATH.lappend(path) if File.directory?(path)
+    }
+  end
+}
+
+# This forces an update of the available packages list. It's required
+# for package names to find the themes in demos/themes/*.tcl
+Tk.ip_eval("#{TkPackage.unknown_proc}  Tcl #{TkPackage.provide('Tcl')}")
+
+# load themes written in Ruby.
+themes_by_ruby = [File.join(demo_themesdir, 'kroc.rb')]
+themes_by_ruby.concat OPTS[:rb_theme]
+print "ruby-themes: #{themes_by_ruby.inspect}\n" if OPTS[:verbose]
+
+themes_by_ruby.each{|f|
+  begin
+    load(f, true)
+  rescue LoadError
+    print "fail to load \"#{f}\"\n" if OPTS[:verbose]
+  end
+}
+
+
+##########################################################################
+# ignore unsupported options of Ttk widgets
+##########################################################################
+TkConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
+TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
+
+
+##########################################################################
+#  set theme of widget style
+##########################################################################
+if OPTS[:list] || OPTS[:verbose]
+  print "supported theme names: #{Tk::Tile.themes.inspect}\n"
+  exit if OPTS[:list] && ARGV.empty?
+end
+print "use theme: \"#{OPTS[:theme]}\"\n" if OPTS[:theme] && OPTS[:verbose]
+#setTheme(OPTS[:theme]) if OPTS[:theme]
+Tk::Tile.set_theme(OPTS[:theme]) if OPTS[:theme]
+
+
+##########################################################################
+#  replace $0 and $RPAGRAM_NAME
+##########################################################################
+#  When the expand_path of the target script is long, ruby sometimes
+#  fails to set the path to $0 (the path string is trimmed).
+#  The following replaces $0 and $PROGNAME to avoid such trouble.
+progname_obj = $0.dup
+$program_name = progname_obj
+
+alias $REAL_PROGRAM_NAME $0
+alias $PROGRAM_NAME $program_name
+alias $0 $program_name
+
+trace_var(:$program_name){|val|
+  unless progname_obj.object_id == val.object_id
+    progname_obj.replace(val.to_s)
+    $program_name = progname_obj
+  end
+}
+
+
+##########################################################################
+#  load script
+##########################################################################
+if (path = ARGV.shift) && (script = File.expand_path(path))
+  print "load script \"#{script}\"\n" if OPTS[:verbose]
+  $0 = script
+  load(script)
+else
+  print "Error: no script is given.\n"
+  print opt.help
+  exit(1)
+end
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index 23ff42a4f4..4b02fdd728 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -1,5 +1,17 @@
-#include "stubs.h"
+/************************************************
+
+  stubs.c - Tcl/Tk stubs support
+
+************************************************/
+
 #include "ruby.h"
+#include "stubs.h"
+
+#if !defined(RSTRING_PTR)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
 #include <tcl.h>
 #include <tk.h>
 
@@ -34,7 +46,7 @@ _nativethread_consistency_check(ip)
         return;
     }
 
-    /* If the variable "tcl_platform(threaded)" exists,  
+    /* If the variable "tcl_platform(threaded)" exists,
        then the Tcl interpreter was compiled with threads enabled. */
     if (Tcl_GetVar2(ip, "tcl_platform", "threaded", TCL_GLOBAL_ONLY) != (char*)NULL) {
 #ifdef HAVE_NATIVETHREAD
@@ -60,7 +72,11 @@ _nativethread_consistency_check(ip)
 #if defined USE_TCL_STUBS && defined USE_TK_STUBS
 
 #if defined _WIN32 || defined __CYGWIN__
-# include "util.h"
+#  ifdef HAVE_RUBY_RUBY_H
+#    include "ruby/util.h"
+#  else
+#    include "util.h"
+#  endif
 # include <windows.h>
   typedef HINSTANCE DL_HANDLE;
 # define DL_OPEN LoadLibrary
@@ -80,14 +96,22 @@ _nativethread_consistency_check(ip)
 # define TK_INDEX 7
 # define TCL_NAME "libtcl8.9%s"
 # define TK_NAME "libtk8.9%s"
+# if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
+#  undef DLEXT
+#  define DLEXT ".dylib"
+# endif
 #endif
 
 static DL_HANDLE tcl_dll = (DL_HANDLE)0;
 static DL_HANDLE tk_dll  = (DL_HANDLE)0;
 
 int
+#ifdef HAVE_PROTOTYPES
+ruby_open_tcl_dll(char *appname)
+#else
 ruby_open_tcl_dll(appname)
     char *appname;
+#endif
 {
     void (*p_Tcl_FindExecutable)(const char *);
     int n;
@@ -141,8 +165,8 @@ ruby_open_tk_dll()
     char tk_name[20];
 
     if (!tcl_dll) {
-        /* int ret = ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
-        int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+        /* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
+        int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
         if (ret != TCLTK_STUBS_OK) return ret;
     }
 
@@ -169,19 +193,23 @@ ruby_open_tk_dll()
 }
 
 int
+#ifdef HAVE_PROTOTYPES
+ruby_open_tcltk_dll(char *appname)
+#else
 ruby_open_tcltk_dll(appname)
     char *appname;
+#endif
 {
     return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
 }
 
-int 
+int
 tcl_stubs_init_p()
 {
     return(tclStubsPtr != (TclStubs*)NULL);
 }
 
-int 
+int
 tk_stubs_init_p()
 {
     return(tkStubsPtr != (TkStubs*)NULL);
@@ -189,8 +217,12 @@ tk_stubs_init_p()
 
 
 Tcl_Interp *
+#ifdef HAVE_PROTOTYPES
+ruby_tcl_create_ip_and_stubs_init(int *st)
+#else
 ruby_tcl_create_ip_and_stubs_init(st)
     int *st;
+#endif
 {
     Tcl_Interp *tcl_ip;
 
@@ -213,8 +245,8 @@ ruby_tcl_create_ip_and_stubs_init(st)
         Tcl_Interp *(*p_Tcl_DeleteInterp)();
 
         if (!tcl_dll) {
-            /* int ret = ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
-            int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+            /* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
+            int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
 
             if (ret != TCLTK_STUBS_OK) {
                 if (st) *st = ret;
@@ -222,14 +254,14 @@ ruby_tcl_create_ip_and_stubs_init(st)
             }
         }
 
-        p_Tcl_CreateInterp 
+        p_Tcl_CreateInterp
             = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_CreateInterp");
         if (!p_Tcl_CreateInterp) {
             if (st) *st = NO_CreateInterp;
             return (Tcl_Interp*)NULL;
         }
 
-        p_Tcl_DeleteInterp 
+        p_Tcl_DeleteInterp
             = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_DeleteInterp");
         if (!p_Tcl_DeleteInterp) {
             if (st) *st = NO_DeleteInterp;
@@ -272,8 +304,12 @@ ruby_tcl_stubs_init()
 }
 
 int
+#ifdef HAVE_PROTOTYPES
+ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
+#else
 ruby_tk_stubs_init(tcl_ip)
     Tcl_Interp *tcl_ip;
+#endif
 {
     Tcl_ResetResult(tcl_ip);
 
@@ -293,10 +329,26 @@ ruby_tk_stubs_init(tcl_ip)
         if (!p_Tk_Init)
             return NO_Tk_Init;
 
+#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__) && defined(__MACH__)
+	/*
+	  FIX ME : dirty hack for Mac OS X frameworks.
+	  With stubs, fails to find Resource/Script directory of Tk.framework.
+	  So, teach it to a Tcl interpreter by an environment variable.
+	  e.g. when $tcl_library == 
+	               /Library/Frameworks/Tcl.framwwork/8.5/Resources/Scripts
+		   ==> /Library/Frameworks/Tk.framwwork/8.5/Resources/Scripts
+	*/
+	if (Tcl_Eval(tcl_ip,
+		     "if {[array get env TK_LIBRARY] == {}} { set env(TK_LIBRARY) [regsub -all -nocase {(t)cl} $tcl_library  {\\1k}] }"
+		     ) != TCL_OK) {
+	  return FAIL_Tk_Init;
+	}
+#endif
+
         if ((*p_Tk_Init)(tcl_ip) == TCL_ERROR)
             return FAIL_Tk_Init;
 
-        if (!Tk_InitStubs(tcl_ip, "8.1", 0))
+        if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
             return FAIL_Tk_InitStubs;
 
 #ifdef __MACOS__
@@ -308,8 +360,12 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
+#ifdef HAVE_PROTOTYPES
+ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
+#else
 ruby_tk_stubs_safeinit(tcl_ip)
     Tcl_Interp *tcl_ip;
+#endif
 {
     Tcl_ResetResult(tcl_ip);
 
@@ -331,7 +387,7 @@ ruby_tk_stubs_safeinit(tcl_ip)
         if ((*p_Tk_SafeInit)(tcl_ip) == TCL_ERROR)
             return FAIL_Tk_Init;
 
-        if (!Tk_InitStubs(tcl_ip, "8.1", 0))
+        if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
             return FAIL_Tk_InitStubs;
 
 #ifdef __MACOS__
@@ -348,8 +404,8 @@ ruby_tcltk_stubs()
     int st;
     Tcl_Interp *tcl_ip;
 
-    /* st = ruby_open_tcltk_dll(RSTRING(rb_argv0)->ptr); */
-    st = ruby_open_tcltk_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    /* st = ruby_open_tcltk_dll(RSTRING_PTR(rb_argv0)); */
+    st = ruby_open_tcltk_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
     switch(st) {
     case NO_FindExecutable:
         return -7;
@@ -395,8 +451,12 @@ static int open_tcl_dll = 0;
 static int call_tk_stubs_init = 0;
 
 int
+#ifdef HAVE_PROTOTYPES
+ruby_open_tcl_dll(char *appname)
+#else
 ruby_open_tcl_dll(appname)
     char *appname;
+#endif
 {
     if (appname) {
         Tcl_FindExecutable(appname);
@@ -408,43 +468,53 @@ ruby_open_tcl_dll(appname)
     return TCLTK_STUBS_OK;
 }
 
-int ruby_open_tk_dll()
+int
+ruby_open_tk_dll()
 {
     if (!open_tcl_dll) {
-        /* ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
-        ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+        /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
+        ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
     }
 
     return TCLTK_STUBS_OK;
 }
 
-int ruby_open_tcltk_dll(appname)
+int
+#ifdef HAVE_PROTOTYPES
+ruby_open_tcltk_dll(char *appname)
+#else
+ruby_open_tcltk_dll(appname)
     char *appname;
+#endif
 {
     return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
 }
 
-int 
+int
 tcl_stubs_init_p()
 {
     return 1;
 }
 
-int 
+int
 tk_stubs_init_p()
 {
     return call_tk_stubs_init;
 }
 
 Tcl_Interp *
+#ifdef HAVE_PROTOTYPES
+ruby_tcl_create_ip_and_stubs_init(int *st)
+#else
 ruby_tcl_create_ip_and_stubs_init(st)
     int *st;
+#endif
 {
     Tcl_Interp *tcl_ip;
 
     if (!open_tcl_dll) {
-        /* ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
-        ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+        /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
+        ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
     }
 
     if (st) *st = 0;
@@ -459,15 +529,19 @@ ruby_tcl_create_ip_and_stubs_init(st)
     return tcl_ip;
 }
 
-int 
+int
 ruby_tcl_stubs_init()
 {
     return TCLTK_STUBS_OK;
 }
 
-int 
+int
+#ifdef HAVE_PROTOTYPES
+ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
+#else
 ruby_tk_stubs_init(tcl_ip)
     Tcl_Interp *tcl_ip;
+#endif
 {
     if (Tk_Init(tcl_ip) == TCL_ERROR)
         return FAIL_Tk_Init;
@@ -483,8 +557,12 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
+#ifdef HAVE_PROTOTYPES
+ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
+#else
 ruby_tk_stubs_safeinit(tcl_ip)
     Tcl_Interp *tcl_ip;
+#endif
 {
 #if TCL_MAJOR_VERSION >= 8
     if (Tk_SafeInit(tcl_ip) == TCL_ERROR)
@@ -505,11 +583,11 @@ ruby_tk_stubs_safeinit(tcl_ip)
 #endif
 }
 
-int 
+int
 ruby_tcltk_stubs()
 {
-    /* Tcl_FindExecutable(RSTRING(rb_argv0)->ptr); */
-    Tcl_FindExecutable(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    /* Tcl_FindExecutable(RSTRING_PTR(rb_argv0)); */
+    Tcl_FindExecutable(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
     return 0;
 }
 
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index ff1f7640bd..6165ec8620 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4,11 +4,48 @@
  *              Oct. 24, 1997   Y. Matsumoto
  */
 
-#define TCLTKLIB_RELEASE_DATE "2006-12-01"
+#define TCLTKLIB_RELEASE_DATE "2010-03-26"
 
 #include "ruby.h"
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#endif
+#ifndef RUBY_VERSION
+#define RUBY_VERSION "(unknown version)"
+#endif
+#ifndef RUBY_RELEASE_DATE
+#define RUBY_RELEASE_DATE "unknown release-date"
+#endif
+
+#ifdef RUBY_VM
+static VALUE rb_thread_critical; /* dummy */
+int rb_thread_check_trap_pending();
+#else
+/* use rb_thread_critical on Ruby 1.8.x */
 #include "rubysig.h"
-#include "version.h"
+#endif
+
+#if !defined(RSTRING_PTR)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+#if !defined(RARRAY_PTR)
+#define RARRAY_PTR(s) (RARRAY(s)->ptr)
+#define RARRAY_LEN(s) (RARRAY(s)->len)
+#endif
+
+#ifdef OBJ_UNTRUST
+#define RbTk_OBJ_UNTRUST(x)  do {OBJ_TAINT(x); OBJ_UNTRUST(x);} while (0)
+#else
+#define RbTk_OBJ_UNTRUST(x)  OBJ_TAINT(x)
+#endif
+
+#if defined(HAVE_RB_PROC_NEW) && !defined(RUBY_VM)
+/* Ruby 1.8 :: rb_proc_new() was hidden from intern.h at 2008/04/22 */
+extern VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE));
+#endif
+
 #undef EXTERN   /* avoid conflict with tcl.h of tcl8.2 or before */
 #include <stdio.h>
 #ifdef HAVE_STDARG_PROTOTYPES
@@ -22,14 +59,46 @@
 #include <tcl.h>
 #include <tk.h>
 
+#ifndef HAVE_RUBY_NATIVE_THREAD_P
+#define ruby_native_thread_p() is_ruby_native_thread()
+#undef RUBY_USE_NATIVE_THREAD
+#else
+#define RUBY_USE_NATIVE_THREAD 1
+#endif
+
+#ifndef HAVE_RB_ERRINFO
+#define rb_errinfo() (ruby_errinfo+0) /* cannot be l-value */
+#endif
+#ifndef HAVE_RB_SAFE_LEVEL
+#define rb_safe_level() (ruby_safe_level+0) /* cannot be l-value */
+#endif
+
 #include "stubs.h"
 
 #ifndef TCL_ALPHA_RELEASE
-#define TCL_ALPHA_RELEASE       0
-#define TCL_BETA_RELEASE        1
-#define TCL_FINAL_RELEASE       2
+#define TCL_ALPHA_RELEASE       0  /* "alpha" */
+#define TCL_BETA_RELEASE        1  /* "beta"  */
+#define TCL_FINAL_RELEASE       2  /* "final" */
 #endif
 
+static struct {
+  int major;
+  int minor;
+  int type;  /* ALPHA==0, BETA==1, FINAL==2 */
+  int patchlevel;
+} tcltk_version = {0, 0, 0, 0};
+
+static void
+set_tcltk_version()
+{
+    if (tcltk_version.major) return;
+
+    Tcl_GetVersion(&(tcltk_version.major),
+		   &(tcltk_version.minor),
+		   &(tcltk_version.patchlevel),
+		   &(tcltk_version.type));
+}
+
 #if TCL_MAJOR_VERSION >= 8
 # ifndef CONST84
 #  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
@@ -51,6 +120,14 @@
 # endif
 #endif
 
+#ifndef CONST86
+# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 5 /* Tcl8.0.x -- 8.5.x */
+#  define CONST86
+# else
+#  define CONST86 CONST84
+# endif
+#endif
+
 /* copied from eval.c */
 #define TAG_RETURN      0x1
 #define TAG_BREAK       0x2
@@ -74,15 +151,35 @@ fprintf(stderr, ARG1, ARG2, ARG3); fprintf(stderr, "\n"); fflush(stderr); }
 */
 
 /* release date */
-const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
+static const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
 
 /* finalize_proc_name */
-static char *finalize_hook_name = "INTERP_FINALIZE_HOOK";
+static const char finalize_hook_name[] = "INTERP_FINALIZE_HOOK";
 
 static void ip_finalize _((Tcl_Interp*));
 
 static int at_exit = 0;
 
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE cRubyEncoding;
+
+/* encoding */
+static int ENCODING_INDEX_UTF8;
+static int ENCODING_INDEX_BINARY;
+#endif
+static VALUE ENCODING_NAME_UTF8;
+static VALUE ENCODING_NAME_BINARY;
+
+static VALUE create_dummy_encoding_for_tk_core _((VALUE, VALUE, VALUE));
+static VALUE create_dummy_encoding_for_tk _((VALUE, VALUE));
+static int update_encoding_table _((VALUE, VALUE, VALUE));
+static VALUE encoding_table_get_name_core _((VALUE, VALUE, VALUE));
+static VALUE encoding_table_get_obj_core _((VALUE, VALUE, VALUE));
+static VALUE encoding_table_get_name _((VALUE, VALUE));
+static VALUE encoding_table_get_obj _((VALUE, VALUE));
+static VALUE create_encoding_table _((VALUE));
+static VALUE ip_get_encoding_table _((VALUE));
+
 
 /* for callback break & continue */
 static VALUE eTkCallbackReturn;
@@ -101,6 +198,9 @@ static VALUE tcltkip_class;
 static ID ID_at_enc;
 static ID ID_at_interp;
 
+static ID ID_encoding_name;
+static ID ID_encoding_table;
+
 static ID ID_stop_p;
 static ID ID_alive_p;
 static ID ID_kill;
@@ -121,14 +221,38 @@ static ID ID_inspect;
 
 static VALUE ip_invoke_real _((int, VALUE*, VALUE));
 static VALUE ip_invoke _((int, VALUE*, VALUE));
-
+static VALUE ip_invoke_with_position _((int, VALUE*, VALUE, Tcl_QueuePosition));
 static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE));
+static VALUE callq_safelevel_handler _((VALUE, VALUE));
+
+/* Tcl's object type */
+#if TCL_MAJOR_VERSION >= 8
+static const char Tcl_ObjTypeName_ByteArray[] = "bytearray";
+static CONST86 Tcl_ObjType *Tcl_ObjType_ByteArray;
+
+static const char Tcl_ObjTypeName_String[]    = "string";
+static CONST86 Tcl_ObjType *Tcl_ObjType_String;
+
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
+#define IS_TCL_BYTEARRAY(obj)    ((obj)->typePtr == Tcl_ObjType_ByteArray)
+#define IS_TCL_STRING(obj)       ((obj)->typePtr == Tcl_ObjType_String)
+#define IS_TCL_VALID_STRING(obj) ((obj)->bytes != (char*)NULL)
+#endif
+#endif
+
+#ifndef HAVE_RB_HASH_LOOKUP
+#define rb_hash_lookup rb_hash_aref
+#endif
 
 /* safe Tcl_Eval and Tcl_GlobalEval */
 static int
+#ifdef HAVE_PROTOTYPES
+tcl_eval(Tcl_Interp *interp, const char *cmd)
+#else
 tcl_eval(interp, cmd)
     Tcl_Interp *interp;
     const char *cmd; /* don't have to be writable */
+#endif
 {
     char *buf = strdup(cmd);
     int ret;
@@ -143,9 +267,13 @@ tcl_eval(interp, cmd)
 #define Tcl_Eval tcl_eval
 
 static int
+#ifdef HAVE_PROTOTYPES
+tcl_global_eval(Tcl_Interp *interp, const char *cmd)
+#else
 tcl_global_eval(interp, cmd)
     Tcl_Interp *interp;
     const char *cmd; /* don't have to be writable */
+#endif
 {
     char *buf = strdup(cmd);
     int ret;
@@ -284,7 +412,7 @@ struct call_queue {
     VALUE thread;
 };
 
-void 
+void
 invoke_queue_mark(struct invoke_queue *q)
 {
     rb_gc_mark(q->interp);
@@ -292,7 +420,7 @@ invoke_queue_mark(struct invoke_queue *q)
     rb_gc_mark(q->thread);
 }
 
-void 
+void
 eval_queue_mark(struct eval_queue *q)
 {
     rb_gc_mark(q->interp);
@@ -300,7 +428,7 @@ eval_queue_mark(struct eval_queue *q)
     rb_gc_mark(q->thread);
 }
 
-void 
+void
 call_queue_mark(struct call_queue *q)
 {
     int i;
@@ -316,26 +444,61 @@ call_queue_mark(struct call_queue *q)
 
 
 static VALUE eventloop_thread;
+static Tcl_Interp *eventloop_interp;
+#ifdef RUBY_USE_NATIVE_THREAD
+Tcl_ThreadId tk_eventloop_thread_id;  /* native thread ID of Tcl interpreter */
+#endif
 static VALUE eventloop_stack;
+static int   window_event_mode = ~0;
 
 static VALUE watchdog_thread;
 
 Tcl_Interp  *current_interp;
- 
 
-/* 
- *  'event_loop_max' is a maximum events which the eventloop processes in one 
- *  term of thread scheduling. 'no_event_tick' is the count-up value when 
- *  there are no event for processing. 
- *  'timer_tick' is a limit of one term of thread scheduling. 
+/* thread control strategy */
+/* multi-tk works with the following settings only ???
+    : CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
+    : USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
+    : DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
+*/
+#ifdef RUBY_USE_NATIVE_THREAD
+#define CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
+#define USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
+#define DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 1
+#else /* ! RUBY_USE_NATIVE_THREAD */
+#define CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
+#define USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
+#define DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
+#endif
+
+#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
+static int have_rb_thread_waiting_for_value = 0;
+#endif
+
+/*
+ *  'event_loop_max' is a maximum events which the eventloop processes in one
+ *  term of thread scheduling. 'no_event_tick' is the count-up value when
+ *  there are no event for processing.
+ *  'timer_tick' is a limit of one term of thread scheduling.
  *  If 'timer_tick' == 0, then not use the timer for thread scheduling.
  */
-#define DEFAULT_EVENT_LOOP_MAX    800/*counts*/
-#define DEFAULT_NO_EVENT_TICK      10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT      20/*milliseconds ( 1 -- 999 ) */
-#define WATCHDOG_INTERVAL          10/*milliseconds ( 1 -- 999 ) */
-#define DEFAULT_TIMER_TICK          0/*milliseconds ( 0 -- 999 ) */
-#define NO_THREAD_INTERRUPT_TIME  100/*milliseconds ( 1 -- 999 ) */
+#ifdef RUBY_USE_NATIVE_THREAD
+#define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
+#define DEFAULT_NO_EVENT_TICK          10/*counts*/
+#define DEFAULT_NO_EVENT_WAIT           1/*milliseconds ( 1 -- 999 ) */
+#define WATCHDOG_INTERVAL              10/*milliseconds ( 1 -- 999 ) */
+#define DEFAULT_TIMER_TICK              0/*milliseconds ( 0 -- 999 ) */
+#define NO_THREAD_INTERRUPT_TIME      100/*milliseconds ( 1 -- 999 ) */
+#else /* ! RUBY_USE_NATIVE_THREAD */
+#define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
+#define DEFAULT_NO_EVENT_TICK          10/*counts*/
+#define DEFAULT_NO_EVENT_WAIT          20/*milliseconds ( 1 -- 999 ) */
+#define WATCHDOG_INTERVAL              10/*milliseconds ( 1 -- 999 ) */
+#define DEFAULT_TIMER_TICK              0/*milliseconds ( 0 -- 999 ) */
+#define NO_THREAD_INTERRUPT_TIME      100/*milliseconds ( 1 -- 999 ) */
+#endif
+
+#define EVENT_HANDLER_TIMEOUT         100/*milliseconds*/
 
 static int event_loop_max = DEFAULT_EVENT_LOOP_MAX;
 static int no_event_tick  = DEFAULT_NO_EVENT_TICK;
@@ -570,6 +733,9 @@ struct tcltkip {
 #if TCL_NAMESPACE_DEBUG
     Tcl_Namespace *default_ns;   /* default namespace */
 #endif
+#ifdef RUBY_USE_NATIVE_THREAD
+    Tcl_ThreadId tk_thread_id;   /* native thread ID of Tcl interpreter */
+#endif
     int has_orig_exit;           /* has original 'exit' command ? */
     Tcl_CmdInfo orig_exit_info;  /* command info of original 'exit' command */
     int ref_count;               /* reference count of rbtk_preserve_ip call */
@@ -605,9 +771,9 @@ deleted_ip(ptr)
 #endif
     ) {
         DUMP1("ip is deleted");
-        return Qtrue;
+        return 1;
     }
-    return Qfalse;
+    return 0;
 }
 
 /* increment/decrement reference count of tcltkip */
@@ -716,18 +882,18 @@ tcltkip_init_tk(interp)
         case TCLTK_STUBS_OK:
             break;
         case NO_Tk_Init:
-            return rb_exc_new2(rb_eLoadError, 
+            return rb_exc_new2(rb_eLoadError,
                                "tcltklib: can't find Tk_SafeInit()");
         case FAIL_Tk_Init:
-            return create_ip_exc(interp, rb_eRuntimeError, 
-                                 "tcltklib: fail to Tk_SafeInit(). %s", 
+            return create_ip_exc(interp, rb_eRuntimeError,
+                                 "tcltklib: fail to Tk_SafeInit(). %s",
                                  Tcl_GetStringResult(ptr->ip));
         case FAIL_Tk_InitStubs:
-            return create_ip_exc(interp, rb_eRuntimeError, 
-                                 "tcltklib: fail to Tk_InitStubs(). %s", 
+            return create_ip_exc(interp, rb_eRuntimeError,
+                                 "tcltklib: fail to Tk_InitStubs(). %s",
                                  Tcl_GetStringResult(ptr->ip));
         default:
-            return create_ip_exc(interp, rb_eRuntimeError, 
+            return create_ip_exc(interp, rb_eRuntimeError,
                                  "tcltklib: unknown error(%d) on ruby_tk_stubs_safeinit", st);
         }
     } else {
@@ -737,18 +903,18 @@ tcltkip_init_tk(interp)
         case TCLTK_STUBS_OK:
             break;
         case NO_Tk_Init:
-            return rb_exc_new2(rb_eLoadError, 
+            return rb_exc_new2(rb_eLoadError,
                                "tcltklib: can't find Tk_Init()");
         case FAIL_Tk_Init:
-            return create_ip_exc(interp, rb_eRuntimeError, 
-                                 "tcltklib: fail to Tk_Init(). %s", 
+            return create_ip_exc(interp, rb_eRuntimeError,
+                                 "tcltklib: fail to Tk_Init(). %s",
                                  Tcl_GetStringResult(ptr->ip));
         case FAIL_Tk_InitStubs:
-            return create_ip_exc(interp, rb_eRuntimeError, 
-                                 "tcltklib: fail to Tk_InitStubs(). %s", 
+            return create_ip_exc(interp, rb_eRuntimeError,
+                                 "tcltklib: fail to Tk_InitStubs(). %s",
                                  Tcl_GetStringResult(ptr->ip));
         default:
-            return create_ip_exc(interp, rb_eRuntimeError, 
+            return create_ip_exc(interp, rb_eRuntimeError,
                                  "tcltklib: unknown error(%d) on ruby_tk_stubs_init", st);
         }
     }
@@ -760,6 +926,10 @@ tcltkip_init_tk(interp)
     }
 #endif
 
+#ifdef RUBY_USE_NATIVE_THREAD
+    ptr->tk_thread_id = Tcl_GetCurrentThread();
+#endif
+
     return Qnil;
 }
 
@@ -767,6 +937,7 @@ tcltkip_init_tk(interp)
 /* treat excetiopn on Tcl side */
 static VALUE rbtk_pending_exception;
 static int rbtk_eventloop_depth = 0;
+static int rbtk_internal_eventloop_handler = 0;
 
 
 static int
@@ -776,7 +947,9 @@ pending_exception_check0()
 
     if (!NIL_P(exc) && rb_obj_is_kind_of(exc, rb_eException)) {
         DUMP1("find a pending exception");
-        if (rbtk_eventloop_depth > 0) {
+        if (rbtk_eventloop_depth > 0
+	    || rbtk_internal_eventloop_handler > 0
+	    ) {
             return 1; /* pending */
         } else {
             rbtk_pending_exception = Qnil;
@@ -809,7 +982,9 @@ pending_exception_check1(thr_crit_bup, ptr)
     if (!NIL_P(exc) && rb_obj_is_kind_of(exc, rb_eException)) {
         DUMP1("find a pending exception");
 
-        if (rbtk_eventloop_depth > 0) {
+        if (rbtk_eventloop_depth > 0
+	    || rbtk_internal_eventloop_handler > 0
+	    ) {
             return 1; /* pending */
         } else {
             rbtk_pending_exception = Qnil;
@@ -840,7 +1015,7 @@ pending_exception_check1(thr_crit_bup, ptr)
 
 
 /* call original 'exit' command */
-static void 
+static void
 call_original_exit(ptr, state)
     struct tcltkip *ptr;
     int state;
@@ -848,8 +1023,10 @@ call_original_exit(ptr, state)
     int  thr_crit_bup;
     Tcl_CmdInfo *info;
 #if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj *cmd_obj;
     Tcl_Obj *state_obj;
 #endif
+    DUMP1("original_exit is called");
 
     if (!(ptr->has_orig_exit)) return;
 
@@ -867,29 +1044,77 @@ call_original_exit(ptr, state)
 
     if (info->isNativeObjectProc) {
         Tcl_Obj **argv;
+#define USE_RUBY_ALLOC 0
+#if USE_RUBY_ALLOC
         argv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, 3);
-        argv[0] = Tcl_NewStringObj("exit", 4);
+#else /* not USE_RUBY_ALLOC */
+        argv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * 3);
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
+#endif
+#endif
+	cmd_obj = Tcl_NewStringObj("exit", 4);
+	Tcl_IncrRefCount(cmd_obj);
+
+        argv[0] = cmd_obj;
         argv[1] = state_obj;
         argv[2] = (Tcl_Obj *)NULL;
 
-        ptr->return_value 
+        ptr->return_value
             = (*(info->objProc))(info->objClientData, ptr->ip, 2, argv);
 
-        free(argv);
+	Tcl_DecrRefCount(cmd_obj);
+
+#if USE_RUBY_ALLOC
+        xfree(argv);
+#else /* not USE_RUBY_ALLOC */
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+        /* free(argv); */
+        ckfree((char*)argv);
+#endif
+#endif
+#endif
+#undef USE_RUBY_ALLOC
 
     } else {
         /* string interface */
-        char **argv;
-        argv = (char **)ALLOC_N(char *, 3);
+        CONST84 char **argv;
+#define USE_RUBY_ALLOC 0
+#if USE_RUBY_ALLOC
+        argv = ALLOC_N(char *, 3); /* XXXXXXXXXX */
+#else /* not USE_RUBY_ALLOC */
+        argv = (CONST84 char **)ckalloc(sizeof(char *) * 3);
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
+#endif
+#endif
         argv[0] = "exit";
         /* argv[1] = Tcl_GetString(state_obj); */
         argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL);
         argv[2] = (char *)NULL;
 
-        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 
-                                            2, (CONST84 char **)argv);
+        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 2, argv);
 
-        free(argv);
+#if USE_RUBY_ALLOC
+        xfree(argv);
+#else /* not USE_RUBY_ALLOC */
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+        /* free(argv); */
+        ckfree((char*)argv);
+#endif
+#endif
+#endif
+#undef USE_RUBY_ALLOC
     }
 
     Tcl_DecrRefCount(state_obj);
@@ -898,17 +1123,40 @@ call_original_exit(ptr, state)
     {
         /* string interface */
         char **argv;
+#define USE_RUBY_ALLOC 0
+#if USE_RUBY_ALLOC
         argv = (char **)ALLOC_N(char *, 3);
+#else /* not USE_RUBY_ALLOC */
+        argv = (char **)ckalloc(sizeof(char *) * 3);
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
+#endif
+#endif
         argv[0] = "exit";
-        argv[1] = RSTRING(rb_fix2str(INT2NUM(state), 10))->ptr;
+        argv[1] = RSTRING_PTR(rb_fix2str(INT2NUM(state), 10));
         argv[2] = (char *)NULL;
 
-        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 
+        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip,
                                             2, argv);
 
-        free(argv);
+#if USE_RUBY_ALLOC
+        xfree(argv);
+#else /* not USE_RUBY_ALLOC */
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+        /* free(argv); */
+        ckfree(argv);
+#endif
+#endif
+#endif
+#undef USE_RUBY_ALLOC
     }
 #endif
+    DUMP1("complete original_exit");
 
     rb_thread_critical = thr_crit_bup;
 }
@@ -937,7 +1185,7 @@ _timer_for_tcl(clientData)
     run_timer_flag = 1;
 
     if (timer_tick > 0) {
-        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl,
                                              (ClientData)0);
     } else {
         timer_token = (Tcl_TimerToken)NULL;
@@ -949,6 +1197,53 @@ _timer_for_tcl(clientData)
     /* tick_counter += event_loop_max; */
 }
 
+#ifdef RUBY_USE_NATIVE_THREAD
+#if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
+static int
+toggle_eventloop_window_mode_for_idle()
+{
+  if (window_event_mode & TCL_IDLE_EVENTS) {
+    /* idle -> event */
+    window_event_mode |= TCL_WINDOW_EVENTS;
+    window_event_mode &= ~TCL_IDLE_EVENTS;
+    return 1;
+  } else {
+    /* event -> idle */
+    window_event_mode |= TCL_IDLE_EVENTS;
+    window_event_mode &= ~TCL_WINDOW_EVENTS;
+    return 0;
+  }
+}
+#endif
+#endif
+
+static VALUE
+set_eventloop_window_mode(self, mode)
+    VALUE self;
+    VALUE mode;
+{
+    rb_secure(4);
+
+    if (RTEST(mode)) {
+      window_event_mode = ~0;
+    } else {
+      window_event_mode = ~TCL_WINDOW_EVENTS;
+    }
+
+    return mode;
+}
+
+static VALUE
+get_eventloop_window_mode(self)
+    VALUE self;
+{
+    if ( ~window_event_mode ) {
+      return Qfalse;
+    } else {
+      return Qtrue;
+    }
+}
+
 static VALUE
 set_eventloop_tick(self, tick)
     VALUE self;
@@ -960,7 +1255,7 @@ set_eventloop_tick(self, tick)
     rb_secure(4);
 
     if (ttick < 0) {
-        rb_raise(rb_eArgError, 
+        rb_raise(rb_eArgError,
                  "timer-tick parameter must be 0 or positive number");
     }
 
@@ -973,7 +1268,7 @@ set_eventloop_tick(self, tick)
     timer_tick = req_timer_tick = ttick;
     if (timer_tick > 0) {
         /* start timer callback */
-        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl,
                                              (ClientData)0);
     } else {
         timer_token = (Tcl_TimerToken)NULL;
@@ -1027,7 +1322,7 @@ set_no_event_wait(self, wait)
     rb_secure(4);
 
     if (t_wait <= 0) {
-        rb_raise(rb_eArgError, 
+        rb_raise(rb_eArgError,
                  "no_event_wait parameter must be positive number");
     }
 
@@ -1137,20 +1432,20 @@ set_max_block_time(self, time)
     case T_BIGNUM:
         /* time is micro-second value */
         divmod = rb_funcall(time, rb_intern("divmod"), 1, LONG2NUM(1000000));
-        tcl_time.sec  = NUM2LONG(RARRAY(divmod)->ptr[0]);
-        tcl_time.usec = NUM2LONG(RARRAY(divmod)->ptr[1]);
+        tcl_time.sec  = NUM2LONG(RARRAY_PTR(divmod)[0]);
+        tcl_time.usec = NUM2LONG(RARRAY_PTR(divmod)[1]);
         break;
 
     case T_FLOAT:
         /* time is second value */
         divmod = rb_funcall(time, rb_intern("divmod"), 1, INT2FIX(1));
-        tcl_time.sec  = NUM2LONG(RARRAY(divmod)->ptr[0]);
-        tcl_time.usec = (long)(NUM2DBL(RARRAY(divmod)->ptr[1]) * 1000000);
+        tcl_time.sec  = NUM2LONG(RARRAY_PTR(divmod)[0]);
+        tcl_time.usec = (long)(NUM2DBL(RARRAY_PTR(divmod)[1]) * 1000000);
 
     default:
         {
 	    VALUE tmp = rb_funcall(time, ID_inspect, 0, 0);
-	    rb_raise(rb_eArgError, "invalid value for time: '%s'", 
+	    rb_raise(rb_eArgError, "invalid value for time: '%s'",
 		     StringValuePtr(tmp));
 	}
     }
@@ -1229,8 +1524,10 @@ ip_evloop_abort_on_exc_set(self, val)
 }
 
 static VALUE
-lib_num_of_mainwindows(self)
+lib_num_of_mainwindows_core(self, argc, argv)
     VALUE self;
+    int   argc;   /* dummy */
+    VALUE *argv;  /* dummy */
 {
     if (tk_stubs_init_p()) {
         return INT2FIX(Tk_GetNumMainWindows());
@@ -1239,10 +1536,56 @@ lib_num_of_mainwindows(self)
     }
 }
 
+static VALUE
+lib_num_of_mainwindows(self)
+    VALUE self;
+{
+#ifdef RUBY_USE_NATIVE_THREAD  /* Ruby 1.9+ !!! */
+    return tk_funcall(lib_num_of_mainwindows_core, 0, (VALUE*)NULL, self);
+#else
+    return lib_num_of_mainwindows_core(self, 0, (VALUE*)NULL);
+#endif
+}
+
 
+#ifdef RUBY_USE_NATIVE_THREAD  /* Ruby 1.9+ !!! */
 static VALUE
+#ifdef HAVE_PROTOTYPES
+call_DoOneEvent_core(VALUE flag_val)
+#else
+call_DoOneEvent_core(flag_val)
+    VALUE flag_val;
+#endif
+{
+    int flag;
+
+    flag = FIX2INT(flag_val);
+    if (Tcl_DoOneEvent(flag)) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+static VALUE
+#ifdef HAVE_PROTOTYPES
+call_DoOneEvent(VALUE flag_val)
+#else
 call_DoOneEvent(flag_val)
     VALUE flag_val;
+#endif
+{
+  return tk_funcall(call_DoOneEvent_core, 0, (VALUE*)NULL, flag_val);
+}
+
+#else  /* Ruby 1.8- */
+static VALUE
+#ifdef HAVE_PROTOTYPES
+call_DoOneEvent(VALUE flag_val)
+#else
+call_DoOneEvent(flag_val)
+    VALUE flag_val;
+#endif
 {
     int flag;
 
@@ -1253,33 +1596,133 @@ call_DoOneEvent(flag_val)
         return Qfalse;
     }
 }
+#endif
+
 
 static VALUE
+#ifdef HAVE_PROTOTYPES
+eventloop_sleep(VALUE dummy)
+#else
 eventloop_sleep(dummy)
     VALUE dummy;
+#endif
 {
     struct timeval t;
 
-    t.tv_sec = (time_t)0;
-    t.tv_usec = (time_t)(no_event_wait*1000.0);
+    if (no_event_wait <= 0) {
+      return Qnil;
+    }
+
+    t.tv_sec = 0;
+    t.tv_usec = (long)(no_event_wait*1000.0);
 
 #ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
+#ifndef RUBY_USE_NATIVE_THREAD
+    if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on eventloop_sleep()");
     }
 #endif
+#endif
 
+    DUMP2("eventloop_sleep: rb_thread_wait_for() at thread : %lx", rb_thread_current());
     rb_thread_wait_for(t);
+    DUMP2("eventloop_sleep: finish at thread : %lx", rb_thread_current());
 
 #ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
+#ifndef RUBY_USE_NATIVE_THREAD
+    if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on eventloop_sleep()");
     }
 #endif
+#endif
 
     return Qnil;
 }
 
+#define USE_EVLOOP_THREAD_ALONE_CHECK_FLAG 0
+
+#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
+static int
+get_thread_alone_check_flag()
+{
+#ifdef RUBY_USE_NATIVE_THREAD
+  return 0;
+#else
+  set_tcltk_version();
+
+  if (tcltk_version.major < 8) {
+    /* Tcl/Tk 7.x */
+    return 1;
+  } else if (tcltk_version.major == 8) {
+    if (tcltk_version.minor < 5) {
+      /* Tcl/Tk 8.0 - 8.4 */
+      return 1;
+    } else if (tcltk_version.minor == 5) {
+      if (tcltk_version.type < TCL_FINAL_RELEASE) {
+	/* Tcl/Tk 8.5a? - 8.5b? */
+	return 1;
+      } else {
+	/* Tcl/Tk 8.5.x */
+	return 0;
+      }
+    } else {
+      /* Tcl/Tk 8.6 - 8.9 ?? */
+      return 0;
+    }
+  } else {
+    /* Tcl/Tk 9+ ?? */
+    return 0;
+  }
+#endif
+}
+#endif
+
+#define TRAP_CHECK() do { \
+    if (trap_check(check_var) == 0) return 0; \
+} while (0)
+
+static int
+trap_check(int *check_var)
+{
+    DUMP1("trap check");
+
+#ifdef RUBY_VM
+    if (rb_thread_check_trap_pending()) {
+	if (check_var != (int*)NULL) {
+	    /* wait command */
+	    return 0;
+	}
+	else {
+	    rb_thread_check_ints();
+	}
+    }
+#else
+    if (rb_trap_pending) {
+      run_timer_flag = 0;
+      if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+	/* pending or on wait command */
+	return 0;
+      } else {
+	rb_trap_exec();
+      }
+    }
+#endif
+
+    return 1;
+}
+
+static int
+check_eventloop_interp()
+{
+  DUMP1("check eventloop_interp");
+  if (eventloop_interp != (Tcl_Interp*)NULL
+      && Tcl_InterpDeleted(eventloop_interp)) {
+    DUMP2("eventloop_interp(%p) was deleted", eventloop_interp);
+    return 1;
+  }
+
+  return 0;
+}
 
 static int
 lib_eventloop_core(check_root, update_flag, check_var, interp)
@@ -1295,40 +1738,54 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
     int thr_crit_bup;
     int status;
     int depth = rbtk_eventloop_depth;
-
+#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
+    int thread_alone_check_flag = 1;
+#endif
 
     if (update_flag) DUMP1("update loop start!!");
 
-    t.tv_sec = (time_t)0;
-    t.tv_usec = (time_t)(no_event_wait*1000.0);
+    t.tv_sec = 0;
+    t.tv_usec = (long)(no_event_wait*1000.0);
 
     Tcl_DeleteTimerHandler(timer_token);
     run_timer_flag = 0;
     if (timer_tick > 0) {
         thr_crit_bup = rb_thread_critical;
         rb_thread_critical = Qtrue;
-        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl,
                                              (ClientData)0);
         rb_thread_critical = thr_crit_bup;
     } else {
         timer_token = (Tcl_TimerToken)NULL;
     }
 
+#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
+    /* version check */
+    thread_alone_check_flag = get_thread_alone_check_flag();
+#endif
+
     for(;;) {
+        if (check_eventloop_interp()) return 0;
+
+#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
+        if (thread_alone_check_flag && rb_thread_alone()) {
+#else
         if (rb_thread_alone()) {
+#endif
             DUMP1("no other thread");
             event_loop_wait_event = 0;
 
             if (update_flag) {
                 event_flag = update_flag | TCL_DONT_WAIT; /* for safety */
             } else {
-                event_flag = TCL_ALL_EVENTS;
+	        event_flag = TCL_ALL_EVENTS;
+	        /* event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT; */
             }
 
             if (timer_tick == 0 && update_flag == 0) {
                 timer_tick = NO_THREAD_INTERRUPT_TIME;
-                timer_token = Tcl_CreateTimerHandler(timer_tick, 
-                                                     _timer_for_tcl, 
+                timer_token = Tcl_CreateTimerHandler(timer_tick,
+                                                     _timer_for_tcl,
                                                      (ClientData)0);
             }
 
@@ -1336,7 +1793,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                 if (*check_var || !found_event) {
                     return found_event;
                 }
-                if (interp != (Tcl_Interp*)NULL 
+                if (interp != (Tcl_Interp*)NULL
                     && Tcl_InterpDeleted(interp)) {
                     /* IP for check_var is deleted */
                     return 0;
@@ -1344,16 +1801,16 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
             }
 
             /* found_event = Tcl_DoOneEvent(event_flag); */
-            found_event = RTEST(rb_protect(call_DoOneEvent, 
-                                           INT2FIX(event_flag), &status)); 
+            found_event = RTEST(rb_protect(call_DoOneEvent,
+                                           INT2FIX(event_flag), &status));
             if (status) {
                 switch (status) {
                 case TAG_RAISE:
-                    if (NIL_P(ruby_errinfo)) {
-                        rbtk_pending_exception 
+                    if (NIL_P(rb_errinfo())) {
+                        rbtk_pending_exception
                             = rb_exc_new2(rb_eException, "unknown exception");
                     } else {
-                        rbtk_pending_exception = ruby_errinfo;
+                        rbtk_pending_exception = rb_errinfo();
 
                         if (!NIL_P(rbtk_pending_exception)) {
                             if (rbtk_eventloop_depth == 0) {
@@ -1368,16 +1825,16 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                     break;
 
                 case TAG_FATAL:
-                    if (NIL_P(ruby_errinfo)) {
+                    if (NIL_P(rb_errinfo())) {
                         rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
                     } else {
-                        rb_exc_raise(ruby_errinfo);
+                        rb_exc_raise(rb_errinfo());
                     }
                 }
             }
 
             if (depth != rbtk_eventloop_depth) {
-                DUMP2("DoOneEvent(1) abnormal exit!! %d", 
+                DUMP2("DoOneEvent(1) abnormal exit!! %d",
                       rbtk_eventloop_depth);
             }
 
@@ -1401,28 +1858,13 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
               }
             }
 
-            DUMP1("trap check");
-            if (rb_trap_pending) {
-                run_timer_flag = 0;
-                if (rb_prohibit_interrupt || check_var != (int*)NULL) {
-                    /* pending or on wait command */
-                    return 0;
-                } else {
-                    rb_trap_exec();
-                }
-            }
+	    TRAP_CHECK();
+	    if (check_eventloop_interp()) return 0;
 
-            DUMP1("check Root Widget");
+	    DUMP1("check Root Widget");
             if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
                 run_timer_flag = 0;
-                if (rb_trap_pending) {
-                    if (rb_prohibit_interrupt || check_var != (int*)NULL) {
-                        /* pending or on wait command */
-                        return 0;
-                    } else {
-                        rb_trap_exec();
-                    }
-                }
+		TRAP_CHECK();
                 return 1;
             }
 
@@ -1452,7 +1894,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                     if (*check_var || !found_event) {
                         return found_event;
                     }
-                    if (interp != (Tcl_Interp*)NULL 
+                    if (interp != (Tcl_Interp*)NULL
                         && Tcl_InterpDeleted(interp)) {
                         /* IP for check_var is deleted */
                         return 0;
@@ -1462,19 +1904,48 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                 if (NIL_P(eventloop_thread) || current == eventloop_thread) {
                     int st;
                     int status;
-
+#ifdef RUBY_USE_NATIVE_THREAD
+		    if (update_flag) {
+		      st = RTEST(rb_protect(call_DoOneEvent,
+					    INT2FIX(event_flag), &status));
+		    } else {
+		      st = RTEST(rb_protect(call_DoOneEvent,
+					    INT2FIX(event_flag & window_event_mode),
+					    &status));
+#if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
+		      if (!st) {
+			if (toggle_eventloop_window_mode_for_idle()) {
+			  /* idle-mode -> event-mode*/
+			  tick_counter = event_loop_max;
+			} else {
+			  /* event-mode -> idle-mode */
+			  tick_counter = 0;
+			}
+		      }
+#endif
+		    }
+#else
                     /* st = Tcl_DoOneEvent(event_flag); */
-                    st = RTEST(rb_protect(call_DoOneEvent, 
-                                          INT2FIX(event_flag), &status)); 
+                    st = RTEST(rb_protect(call_DoOneEvent,
+                                          INT2FIX(event_flag), &status));
+#endif
+
+#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
+		    if (have_rb_thread_waiting_for_value) {
+		      have_rb_thread_waiting_for_value = 0;
+		      rb_thread_schedule();
+		    }
+#endif
+
                     if (status) {
                         switch (status) {
                         case TAG_RAISE:
-                            if (NIL_P(ruby_errinfo)) {
-                                rbtk_pending_exception 
-                                    = rb_exc_new2(rb_eException, 
+                            if (NIL_P(rb_errinfo())) {
+                                rbtk_pending_exception
+                                    = rb_exc_new2(rb_eException,
                                                   "unknown exception");
                             } else {
-                                rbtk_pending_exception = ruby_errinfo;
+                                rbtk_pending_exception = rb_errinfo();
 
                                 if (!NIL_P(rbtk_pending_exception)) {
                                     if (rbtk_eventloop_depth == 0) {
@@ -1489,32 +1960,23 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                             break;
 
                         case TAG_FATAL:
-                            if (NIL_P(ruby_errinfo)) {
+                            if (NIL_P(rb_errinfo())) {
                                 rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
                             } else {
-                                rb_exc_raise(ruby_errinfo);
+                                rb_exc_raise(rb_errinfo());
                             }
                         }
                     }
 
                     if (depth != rbtk_eventloop_depth) {
-                        DUMP2("DoOneEvent(2) abnormal exit!! %d", 
+                        DUMP2("DoOneEvent(2) abnormal exit!! %d",
                               rbtk_eventloop_depth);
                         return 0;
                     }
 
-                    DUMP1("trap check");
-                    if (rb_trap_pending) {
-                        run_timer_flag = 0;
-                        if (rb_prohibit_interrupt || check_var != (int*)NULL) {
-                            /* pending or on wait command */
-                            return 0;
-                        } else {
-                            rb_trap_exec();
-                        }
-                    }
+		    TRAP_CHECK();
 
-                    if (check_var != (int*)NULL 
+                    if (check_var != (int*)NULL
                         && !NIL_P(rbtk_pending_exception)) {
                         DUMP1("exception on wait");
                         return 0;
@@ -1536,17 +1998,18 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                         tick_counter += no_event_tick;
 
                         /* rb_thread_wait_for(t); */
+
                         rb_protect(eventloop_sleep, Qnil, &status);
 
                         if (status) {
                             switch (status) {
                             case TAG_RAISE:
-                                if (NIL_P(ruby_errinfo)) {
-                                    rbtk_pending_exception 
-                                        = rb_exc_new2(rb_eException, 
+                                if (NIL_P(rb_errinfo())) {
+                                    rbtk_pending_exception
+                                        = rb_exc_new2(rb_eException,
                                                       "unknown exception");
                                 } else {
-                                    rbtk_pending_exception = ruby_errinfo;
+                                    rbtk_pending_exception = rb_errinfo();
 
                                     if (!NIL_P(rbtk_pending_exception)) {
                                         if (rbtk_eventloop_depth == 0) {
@@ -1561,11 +2024,11 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                                 break;
 
                             case TAG_FATAL:
-                                if (NIL_P(ruby_errinfo)) {
-                                    rb_exc_raise(rb_exc_new2(rb_eFatal, 
+                                if (NIL_P(rb_errinfo())) {
+                                    rb_exc_raise(rb_exc_new2(rb_eFatal,
                                                              "FATAL"));
                                 } else {
-                                    rb_exc_raise(ruby_errinfo);
+                                    rb_exc_raise(rb_errinfo());
                                 }
                             }
                         }
@@ -1574,35 +2037,21 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                 } else {
                     DUMP2("sleep eventloop %lx", current);
                     DUMP2("eventloop thread is %lx", eventloop_thread);
-                    rb_thread_stop();
+                    /* rb_thread_stop(); */
+                    rb_thread_sleep_forever();
                 }
 
                 if (!NIL_P(watchdog_thread) && eventloop_thread != current) {
                     return 1;
                 }
 
-                DUMP1("trap check");
-                if (rb_trap_pending) {
-                    run_timer_flag = 0;
-                    if (rb_prohibit_interrupt || check_var != (int*)NULL) {
-                        /* pending or on wait command */
-                        return 0;
-                    } else {
-                        rb_trap_exec();
-                    }
-                }
+		TRAP_CHECK();
+		if (check_eventloop_interp()) return 0;
 
                 DUMP1("check Root Widget");
                 if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
                     run_timer_flag = 0;
-                    if (rb_trap_pending) {
-                        if (rb_prohibit_interrupt || check_var != (int*)NULL) {
-                            /* pending or on wait command */
-                            return 0;
-                        } else {
-                            rb_trap_exec();
-                        }
-                    }
+		    TRAP_CHECK();
                     return 1;
                 }
 
@@ -1619,10 +2068,17 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                     break; /* switch to other thread */
                 }
             }
+
+            DUMP1("thread scheduling");
+            rb_thread_schedule();
         }
 
         DUMP1("trap check & thread scheduling");
+#ifdef RUBY_USE_NATIVE_THREAD
+        /* if (update_flag == 0) CHECK_INTS; */ /*XXXXXXXXXXXXX  TODO !!!! */
+#else
         if (update_flag == 0) CHECK_INTS;
+#endif
 
     }
     return 1;
@@ -1645,9 +2101,9 @@ lib_eventloop_main_core(args)
 
     check_rootwidget_flag = params->check_root;
 
-    if (lib_eventloop_core(params->check_root, 
-                           params->update_flag, 
-                           params->check_var, 
+    if (lib_eventloop_core(params->check_root,
+                           params->update_flag,
+                           params->check_var,
                            params->interp)) {
         return Qtrue;
     } else {
@@ -1669,19 +2125,19 @@ lib_eventloop_main(args)
 
     switch (status) {
     case TAG_RAISE:
-        if (NIL_P(ruby_errinfo)) {
-            rbtk_pending_exception 
+        if (NIL_P(rb_errinfo())) {
+            rbtk_pending_exception
                 = rb_exc_new2(rb_eException, "unknown exception");
         } else {
-            rbtk_pending_exception = ruby_errinfo;
+            rbtk_pending_exception = rb_errinfo();
         }
         return Qnil;
 
     case TAG_FATAL:
-        if (NIL_P(ruby_errinfo)) {
+        if (NIL_P(rb_errinfo())) {
             rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
         } else {
-            rbtk_pending_exception = ruby_errinfo;
+            rbtk_pending_exception = rb_errinfo();
         }
         return Qnil;
     }
@@ -1704,13 +2160,14 @@ lib_eventloop_ensure(args)
 
 	rb_thread_critical = ptr->thr_crit_bup;
 
-        free(ptr);
+        xfree(ptr);
+        /* ckfree((char*)ptr); */
 
         return Qnil;
     }
 
     while((eventloop_thread = rb_ary_pop(eventloop_stack))) {
-        DUMP2("eventloop-ensure: new eventloop-thread -> %lx", 
+        DUMP2("eventloop-ensure: new eventloop-thread -> %lx",
               eventloop_thread);
 
         if (eventloop_thread == current_evloop) {
@@ -1723,10 +2180,14 @@ lib_eventloop_ensure(args)
           Tcl_DeleteTimerHandler(timer_token);
           timer_token = (Tcl_TimerToken)NULL;
 
-          break; 
+          break;
         }
 
+#ifdef RUBY_VM
         if (RTEST(rb_funcall(eventloop_thread, ID_alive_p, 0, 0))) {
+#else
+	if (RTEST(rb_thread_alive_p(eventloop_thread))) {
+#endif
             DUMP2("eventloop-enshure: wake up parent %lx", eventloop_thread);
             rb_thread_wakeup(eventloop_thread);
 
@@ -1734,9 +2195,16 @@ lib_eventloop_ensure(args)
         }
     }
 
+#ifdef RUBY_USE_NATIVE_THREAD
+    if (NIL_P(eventloop_thread)) {
+        tk_eventloop_thread_id = (Tcl_ThreadId) 0;
+    }
+#endif
+
     rb_thread_critical = ptr->thr_crit_bup;
 
-    free(ptr);
+    xfree(ptr);
+    /* ckfree((char*)ptr);*/
 
     DUMP2("finish current eventloop %lx", current_evloop);
     return Qnil;
@@ -1751,10 +2219,14 @@ lib_eventloop_launcher(check_root, update_flag, check_var, interp)
 {
     volatile VALUE parent_evloop = eventloop_thread;
     struct evloop_params *args = ALLOC(struct evloop_params);
+    /* struct evloop_params *args = (struct evloop_params *)ckalloc(sizeof(struct evloop_params)); */
 
     tcl_stubs_check();
 
     eventloop_thread = rb_thread_current();
+#ifdef RUBY_USE_NATIVE_THREAD
+    tk_eventloop_thread_id = Tcl_GetCurrentThread();
+#endif
 
     if (parent_evloop == eventloop_thread) {
         DUMP2("eventloop: recursive call on %lx", parent_evloop);
@@ -1772,7 +2244,7 @@ lib_eventloop_launcher(check_root, update_flag, check_var, interp)
 
     rb_ary_push(eventloop_stack, parent_evloop);
 
-    DUMP3("tcltklib: eventloop-thread : %lx -> %lx\n", 
+    DUMP3("tcltklib: eventloop-thread : %lx -> %lx\n",
                 parent_evloop, eventloop_thread);
 
     args->check_root   = check_root;
@@ -1784,10 +2256,10 @@ lib_eventloop_launcher(check_root, update_flag, check_var, interp)
     rb_thread_critical = Qfalse;
 
 #if 0
-    return rb_ensure(lib_eventloop_main, (VALUE)args, 
+    return rb_ensure(lib_eventloop_main, (VALUE)args,
                      lib_eventloop_ensure, (VALUE)args);
 #endif
-    return rb_ensure(lib_eventloop_main_core, (VALUE)args, 
+    return rb_ensure(lib_eventloop_main_core, (VALUE)args,
                      lib_eventloop_ensure, (VALUE)args);
 }
 
@@ -1808,7 +2280,7 @@ lib_mainloop(argc, argv, self)
         check_rootwidget = Qfalse;
     }
 
-    return lib_eventloop_launcher(RTEST(check_rootwidget), 0, 
+    return lib_eventloop_launcher(RTEST(check_rootwidget), 0,
                                   (int*)NULL, (Tcl_Interp*)NULL);
 }
 
@@ -1818,6 +2290,7 @@ ip_mainloop(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
+    volatile VALUE ret;
     struct tcltkip *ptr = get_ip(self);
 
     /* ip is deleted? */
@@ -1829,7 +2302,11 @@ ip_mainloop(argc, argv, self)
         /* slave IP */
         return Qnil;
     }
-    return lib_mainloop(argc, argv, self);
+
+    eventloop_interp = ptr->ip;
+    ret = lib_mainloop(argc, argv, self);
+    eventloop_interp = (Tcl_Interp*)NULL;
+    return ret;
 }
 
 
@@ -1837,7 +2314,7 @@ static VALUE
 watchdog_evloop_launcher(check_rootwidget)
     VALUE check_rootwidget;
 {
-    return lib_eventloop_launcher(RTEST(check_rootwidget), 0, 
+    return lib_eventloop_launcher(RTEST(check_rootwidget), 0,
                                   (int*)NULL, (Tcl_Interp*)NULL);
 }
 
@@ -1853,10 +2330,10 @@ lib_watchdog_core(check_rootwidget)
     int   check = RTEST(check_rootwidget);
     struct timeval t0, t1;
 
-    t0.tv_sec  = (time_t)0;
-    t0.tv_usec = (time_t)((NO_THREAD_INTERRUPT_TIME)*1000.0);
-    t1.tv_sec  = (time_t)0;
-    t1.tv_usec = (time_t)((WATCHDOG_INTERVAL)*1000.0);
+    t0.tv_sec  = 0;
+    t0.tv_usec = (long)((NO_THREAD_INTERRUPT_TIME)*1000.0);
+    t1.tv_sec  = 0;
+    t1.tv_usec = (long)((WATCHDOG_INTERVAL)*1000.0);
 
     /* check other watchdog thread */
     if (!NIL_P(watchdog_thread)) {
@@ -1873,9 +2350,9 @@ lib_watchdog_core(check_rootwidget)
         if (NIL_P(eventloop_thread)
             || (loop_counter == prev_val && chance >= EVLOOP_WAKEUP_CHANCE)) {
             /* start new eventloop thread */
-            DUMP2("eventloop thread %lx is sleeping or dead", 
+            DUMP2("eventloop thread %lx is sleeping or dead",
                   eventloop_thread);
-            evloop = rb_thread_create(watchdog_evloop_launcher, 
+            evloop = rb_thread_create(watchdog_evloop_launcher,
                                       (void*)&check_rootwidget);
             DUMP2("create new eventloop thread %lx", evloop);
             loop_counter = -1;
@@ -1905,6 +2382,9 @@ lib_watchdog_ensure(arg)
     VALUE arg;
 {
     eventloop_thread = Qnil; /* stop eventloops */
+#ifdef RUBY_USE_NATIVE_THREAD
+    tk_eventloop_thread_id = (Tcl_ThreadId) 0;
+#endif
     return Qnil;
 }
 
@@ -1916,6 +2396,11 @@ lib_mainloop_watchdog(argc, argv, self)
 {
     VALUE check_rootwidget;
 
+#ifdef RUBY_VM
+    rb_raise(rb_eNotImpError,
+	     "eventloop_watchdog is not implemented on Ruby VM.");
+#endif
+
     if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
         check_rootwidget = Qtrue;
     } else if (RTEST(check_rootwidget)) {
@@ -1924,7 +2409,7 @@ lib_mainloop_watchdog(argc, argv, self)
         check_rootwidget = Qfalse;
     }
 
-    return rb_ensure(lib_watchdog_core, check_rootwidget, 
+    return rb_ensure(lib_watchdog_core, check_rootwidget,
                      lib_watchdog_ensure, Qnil);
 }
 
@@ -1955,7 +2440,7 @@ struct thread_call_proc_arg {
     int *done;
 };
 
-void 
+void
 _thread_call_proc_arg_mark(struct thread_call_proc_arg *q)
 {
     rb_gc_mark(q->proc);
@@ -1984,13 +2469,17 @@ _thread_call_proc(arg)
 {
     struct thread_call_proc_arg *q = (struct thread_call_proc_arg*)arg;
 
-    return rb_ensure(_thread_call_proc_core, (VALUE)q, 
+    return rb_ensure(_thread_call_proc_core, (VALUE)q,
                      _thread_call_proc_ensure, (VALUE)q);
 }
 
 static VALUE
+#ifdef HAVE_PROTOTYPES
+_thread_call_proc_value(VALUE th)
+#else
 _thread_call_proc_value(th)
     VALUE th;
+#endif
 {
     return rb_funcall(th, ID_value, 0);
 }
@@ -2010,8 +2499,10 @@ lib_thread_callback(argc, argv, self)
     }
 
     q = (struct thread_call_proc_arg *)ALLOC(struct thread_call_proc_arg);
+    /* q = (struct thread_call_proc_arg *)ckalloc(sizeof(struct thread_call_proc_arg)); */
     q->proc = proc;
     q->done = (int*)ALLOC(int);
+    /* q->done = (int*)ckalloc(sizeof(int)); */
     *(q->done) = 0;
 
     /* create call-proc thread */
@@ -2020,23 +2511,29 @@ lib_thread_callback(argc, argv, self)
     rb_thread_schedule();
 
     /* start sub-eventloop */
-    foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0, 0, 
+    foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0, 0,
                                               q->done, (Tcl_Interp*)NULL));
 
+#ifdef RUBY_VM
     if (RTEST(rb_funcall(th, ID_alive_p, 0))) {
+#else
+    if (RTEST(rb_thread_alive_p(th))) {
+#endif
         rb_funcall(th, ID_kill, 0);
         ret = Qnil;
     } else {
         ret = rb_protect(_thread_call_proc_value, th, &status);
     }
 
-    free(q->done);
-    free(q);
+    xfree(q->done);
+    xfree(q);
+    /* ckfree((char*)q->done); */
+    /* ckfree((char*)q); */
 
     if (NIL_P(rbtk_pending_exception)) {
-        /* return ruby_errinfo; */
+        /* return rb_errinfo(); */
         if (status) {
-            rb_exc_raise(ruby_errinfo);
+            rb_exc_raise(rb_errinfo());
         }
     } else {
         VALUE exc = rbtk_pending_exception;
@@ -2155,28 +2652,35 @@ ip_set_exc_message(interp, exc)
     if (NIL_P(enc)) {
         encoding = (Tcl_Encoding)NULL;
     } else if (TYPE(enc) == T_STRING) {
-        encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
+        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc));
     } else {
         enc = rb_funcall(enc, ID_to_s, 0, 0);
-        encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
+        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc));
     }
 
     /* to avoid a garbled error message dialog */
-    buf = ALLOC_N(char, (RSTRING(msg)->len)+1);
-    memcpy(buf, RSTRING(msg)->ptr, RSTRING(msg)->len);
-    buf[RSTRING(msg)->len] = 0;
+    /* buf = ALLOC_N(char, (RSTRING(msg)->len)+1);*/
+    /* memcpy(buf, RSTRING(msg)->ptr, RSTRING(msg)->len);*/
+    /* buf[RSTRING(msg)->len] = 0; */
+    buf = ALLOC_N(char, RSTRING_LEN(msg)+1);
+    /* buf = ckalloc(sizeof(char)*((RSTRING_LEN(msg))+1)); */
+    memcpy(buf, RSTRING_PTR(msg), RSTRING_LEN(msg));
+    buf[RSTRING_LEN(msg)] = 0;
 
     Tcl_DStringInit(&dstr);
     Tcl_DStringFree(&dstr);
-    Tcl_ExternalToUtfDString(encoding, buf, RSTRING(msg)->len, &dstr);
+    Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LEN(msg), &dstr);
 
     Tcl_AppendResult(interp, Tcl_DStringValue(&dstr), (char*)NULL);
     DUMP2("error message:%s", Tcl_DStringValue(&dstr));
     Tcl_DStringFree(&dstr);
-    free(buf);
+    xfree(buf);
+    /* ckfree(buf); */
 
 #else /* TCL_VERSION <= 8.0 */
-    Tcl_AppendResult(interp, RSTRING(msg)->ptr, (char*)NULL);
+    Tcl_AppendResult(interp, RSTRING_PTR(msg), (char*)NULL);
 #endif
 
     rb_thread_critical = thr_crit_bup;
@@ -2212,21 +2716,28 @@ TkStringValue(obj)
 }
 
 static int
+#ifdef HAVE_PROTOTYPES
+tcl_protect_core(Tcl_Interp *interp, VALUE (*proc)(VALUE), VALUE data)
+#else
 tcl_protect_core(interp, proc, data) /* should not raise exception */
     Tcl_Interp *interp;
     VALUE (*proc)();
     VALUE data;
+#endif
 {
     volatile VALUE ret, exc = Qnil;
     int status = 0;
     int thr_crit_bup = rb_thread_critical;
 
+    Tcl_ResetResult(interp);
+
     rb_thread_critical = Qfalse;
     ret = rb_protect(proc, data, &status);
     rb_thread_critical = Qtrue;
     if (status) {
         char *buf;
-        VALUE old_gc, type, str;
+        VALUE old_gc;
+        volatile VALUE type, str;
 
         old_gc = rb_gc_disable();
 
@@ -2242,58 +2753,60 @@ tcl_protect_core(interp, proc, data) /* should not raise exception */
             goto error;
         error:
             str = rb_str_new2("LocalJumpError: ");
-            rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+            rb_str_append(str, rb_obj_as_string(rb_errinfo()));
             exc = rb_exc_new3(type, str);
             break;
 
         case TAG_RETRY:
-            if (NIL_P(ruby_errinfo)) {
+            if (NIL_P(rb_errinfo())) {
                 DUMP1("rb_protect: retry");
                 exc = rb_exc_new2(eTkCallbackRetry, "retry jump error");
             } else {
-                exc = ruby_errinfo;
+                exc = rb_errinfo();
             }
             break;
 
         case TAG_REDO:
-            if (NIL_P(ruby_errinfo)) {
+            if (NIL_P(rb_errinfo())) {
                 DUMP1("rb_protect: redo");
                 exc = rb_exc_new2(eTkCallbackRedo,  "redo jump error");
             } else {
-                exc = ruby_errinfo;
+                exc = rb_errinfo();
             }
             break;
 
         case TAG_RAISE:
-            if (NIL_P(ruby_errinfo)) {
+            if (NIL_P(rb_errinfo())) {
                 exc = rb_exc_new2(rb_eException, "unknown exception");
             } else {
-                exc = ruby_errinfo;
+                exc = rb_errinfo();
             }
             break;
 
         case TAG_FATAL:
-            if (NIL_P(ruby_errinfo)) {
+            if (NIL_P(rb_errinfo())) {
                 exc = rb_exc_new2(rb_eFatal, "FATAL");
             } else {
-                exc = ruby_errinfo;
+                exc = rb_errinfo();
             }
             break;
 
         case TAG_THROW:
-            if (NIL_P(ruby_errinfo)) {
+            if (NIL_P(rb_errinfo())) {
                 DUMP1("rb_protect: throw");
                 exc = rb_exc_new2(eTkCallbackThrow,  "throw jump error");
             } else {
-                exc = ruby_errinfo;
+                exc = rb_errinfo();
             }
             break;
 
         default:
             buf = ALLOC_N(char, 256);
+            /* buf = ckalloc(sizeof(char) * 256); */
             sprintf(buf, "unknown loncaljmp status %d", status);
             exc = rb_exc_new2(rb_eException, buf);
-            free(buf);
+            xfree(buf);
+            /* ckfree(buf); */
             break;
         }
 
@@ -2371,12 +2884,12 @@ tcl_protect_core(interp, proc, data) /* should not raise exception */
 
         ret = TkStringValue(ret);
         DUMP1("Tcl_AppendResult");
-        Tcl_AppendResult(interp, RSTRING(ret)->ptr, (char *)NULL);
+        Tcl_AppendResult(interp, RSTRING_PTR(ret), (char *)NULL);
 
         rb_thread_critical = thr_crit_bup;
     }
 
-    DUMP2("(result) %s", NIL_P(ret) ? "nil" : RSTRING(ret)->ptr);
+    DUMP2("(result) %s", NIL_P(ret) ? "nil" : RSTRING_PTR(ret));
 
     return TCL_OK;
 }
@@ -2387,18 +2900,26 @@ tcl_protect(interp, proc, data)
     VALUE (*proc)();
     VALUE data;
 {
-    int old_trapflag = rb_trap_immediate;
     int code;
 
 #ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
+#ifndef RUBY_USE_NATIVE_THREAD
+    if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on tcl_protect()");
     }
 #endif
+#endif
 
-    rb_trap_immediate = 0;
+#ifdef RUBY_VM
     code = tcl_protect_core(interp, proc, data);
-    rb_trap_immediate = old_trapflag;
+#else
+    do {
+      int old_trapflag = rb_trap_immediate;
+      rb_trap_immediate = 0;
+      code = tcl_protect_core(interp, proc, data);
+      rb_trap_immediate = old_trapflag;
+    } while (0);
+#endif
 
     return code;
 }
@@ -2407,7 +2928,7 @@ static int
 #if TCL_MAJOR_VERSION >= 8
 ip_ruby_eval(clientData, interp, argc, argv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int argc;
     Tcl_Obj *CONST argv[];
 #else /* TCL_MAJOR_VERSION < 8 */
@@ -2423,7 +2944,7 @@ ip_ruby_eval(clientData, interp, argc, argv)
     int code;
 
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
@@ -2431,15 +2952,15 @@ ip_ruby_eval(clientData, interp, argc, argv)
     /* ruby command has 1 arg. */
     if (argc != 2) {
 #if 0
-        rb_raise(rb_eArgError, 
+        rb_raise(rb_eArgError,
                  "wrong number of arguments (%d for 1)", argc - 1);
 #else
         char buf[sizeof(int)*8 + 1];
         Tcl_ResetResult(interp);
         sprintf(buf, "%d", argc-1);
-        Tcl_AppendResult(interp, "wrong number of arguments (", 
+        Tcl_AppendResult(interp, "wrong number of arguments (",
                          buf, " for 1)", (char *)NULL);
-        rbtk_pending_exception = rb_exc_new2(rb_eArgError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eArgError,
                                              Tcl_GetStringResult(interp));
         return TCL_ERROR;
 #endif
@@ -2456,6 +2977,7 @@ ip_ruby_eval(clientData, interp, argc, argv)
 
       str = Tcl_GetStringFromObj(argv[1], &len);
       arg = ALLOC_N(char, len + 1);
+      /* arg = ckalloc(sizeof(char) * (len + 1)); */
       memcpy(arg, str, len);
       arg[len] = 0;
 
@@ -2472,7 +2994,8 @@ ip_ruby_eval(clientData, interp, argc, argv)
     code = tcl_protect(interp, rb_eval_string, (VALUE)arg);
 
 #if TCL_MAJOR_VERSION >= 8
-    free(arg);
+    xfree(arg);
+    /* ckfree(arg); */
 #endif
 
     return code;
@@ -2491,18 +3014,112 @@ ip_ruby_cmd_core(arg)
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qfalse;
     ret = rb_apply(arg->receiver, arg->method, arg->args);
+    DUMP2("rb_apply return:%lx", ret);
     rb_thread_critical = thr_crit_bup;
     DUMP1("finish ip_ruby_cmd_core");
 
     return ret;
 }
 
+#define SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER 1
+
+static VALUE
+ip_ruby_cmd_receiver_const_get(name)
+     char *name;
+{
+  volatile VALUE klass = rb_cObject;
+#if 0
+  char *head, *tail;
+#endif
+  int state;
+
+#if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
+  klass = rb_eval_string_protect(name, &state);
+  if (state) {
+    return Qnil;
+  } else {
+    return klass;
+  }
+#else
+  return rb_const_get(klass, rb_intern(name));
+#endif
+
+  /* TODO!!!!!! */
+  /* support nest of classes/modules */
+
+  /* return rb_eval_string(name); */
+  /* return rb_eval_string_protect(name, &state); */
+
+#if 0 /* doesn't work!! (fail to autoload?) */
+  /* duplicate */
+  head = name = strdup(name);
+
+  /* has '::' at head ? */
+  if (*head == ':')  head += 2;
+  tail = head;
+
+  /* search */
+  while(*tail) {
+    if (*tail == ':') {
+      *tail = '\0';
+      klass = rb_const_get(klass, rb_intern(head));
+      tail += 2;
+      head = tail;
+    } else {
+      tail++;
+    }
+  }
+
+  free(name);
+  return rb_const_get(klass, rb_intern(head));
+#endif
+}
+
+static VALUE
+ip_ruby_cmd_receiver_get(str)
+     char *str;
+{
+  volatile VALUE receiver;
+#if !SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
+  int state;
+#endif
+
+  if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) {
+    /* class | module | constant */
+#if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
+    receiver = ip_ruby_cmd_receiver_const_get(str);
+#else
+    receiver = rb_protect(ip_ruby_cmd_receiver_const_get, (VALUE)str, &state);
+    if (state) return Qnil;
+#endif
+  } else if (str[0] == '$') {
+    /* global variable */
+    receiver = rb_gv_get(str);
+  } else {
+    /* global variable omitted '$' */
+    char *buf;
+    int len;
+
+    len = strlen(str);
+    buf = ALLOC_N(char, len + 2);
+    /* buf = ckalloc(sizeof(char) * (len + 2)); */
+    buf[0] = '$';
+    memcpy(buf + 1, str, len);
+    buf[len + 1] = 0;
+    receiver = rb_gv_get(buf);
+    xfree(buf);
+    /* ckfree(buf); */
+  }
+
+  return receiver;
+}
+
 /* ruby_cmd receiver method arg ... */
 static int
 #if TCL_MAJOR_VERSION >= 8
 ip_ruby_cmd(clientData, interp, argc, argv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int argc;
     Tcl_Obj *CONST argv[];
 #else /* TCL_MAJOR_VERSION < 8 */
@@ -2525,7 +3142,7 @@ ip_ruby_cmd(clientData, interp, argc, argv)
     int code;
 
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
@@ -2536,15 +3153,12 @@ ip_ruby_cmd(clientData, interp, argc, argv)
 #else
         Tcl_ResetResult(interp);
         Tcl_AppendResult(interp, "too few arguments", (char *)NULL);
-        rbtk_pending_exception = rb_exc_new2(rb_eArgError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eArgError,
                                              Tcl_GetStringResult(interp));
         return TCL_ERROR;
 #endif
     }
 
-    /* allocate */
-    arg = ALLOC(struct cmd_body_arg);
-
     /* get arguments from Tcl objects */
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
@@ -2557,34 +3171,19 @@ ip_ruby_cmd(clientData, interp, argc, argv)
     str = argv[1];
 #endif
     DUMP2("receiver:%s",str);
-    if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) {
-        /* class | module | constant */
-        receiver = rb_const_get(rb_cObject, rb_intern(str));
-    } else if (str[0] == '$') {
-        /* global variable */
-        receiver = rb_gv_get(str);
-    } else {
-        /* global variable omitted '$' */
-        char *buf;
-
-        len = strlen(str);
-        buf = ALLOC_N(char, len + 2);
-        buf[0] = '$';
-        memcpy(buf + 1, str, len);
-        buf[len + 1] = 0;
-        receiver = rb_gv_get(buf);
-        free(buf);
-    }
+    /* receiver = rb_protect(ip_ruby_cmd_receiver_get, (VALUE)str, &code); */
+    receiver = ip_ruby_cmd_receiver_get(str);
     if (NIL_P(receiver)) {
 #if 0
-        rb_raise(rb_eArgError, 
+        rb_raise(rb_eArgError,
                  "unknown class/module/global-variable '%s'", str);
 #else
         Tcl_ResetResult(interp);
-        Tcl_AppendResult(interp, "unknown class/module/global-variable '", 
+        Tcl_AppendResult(interp, "unknown class/module/global-variable '",
                          str, "'", (char *)NULL);
-        rbtk_pending_exception = rb_exc_new2(rb_eArgError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eArgError,
                                              Tcl_GetStringResult(interp));
+        if (old_gc == Qfalse) rb_gc_enable();
         return TCL_ERROR;
 #endif
     }
@@ -2599,21 +3198,30 @@ ip_ruby_cmd(clientData, interp, argc, argv)
 
     /* get args */
     args = rb_ary_new2(argc - 2);
-    RARRAY(args)->len = 0;
     for(i = 3; i < argc; i++) {
+        VALUE s;
 #if TCL_MAJOR_VERSION >= 8
         str = Tcl_GetStringFromObj(argv[i], &len);
-        DUMP2("arg:%s",str);
-        RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new(str, len);
+        s = rb_tainted_str_new(str, len);
 #else /* TCL_MAJOR_VERSION < 8 */
-        DUMP2("arg:%s",argv[i]);
-        RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new2(argv[i]);
+        str = argv[i];
+        s = rb_tainted_str_new2(str);
+#endif
+        DUMP2("arg:%s",str);
+#ifndef HAVE_STRUCT_RARRAY_LEN
+        rb_ary_push(args, s);
+#else
+        RARRAY(args)->ptr[RARRAY(args)->len++] = s;
 #endif
     }
 
     if (old_gc == Qfalse) rb_gc_enable();
     rb_thread_critical = thr_crit_bup;
 
+    /* allocate */
+    arg = ALLOC(struct cmd_body_arg);
+    /* arg = (struct cmd_body_arg *)ckalloc(sizeof(struct cmd_body_arg)); */
+
     arg->receiver = receiver;
     arg->method = method;
     arg->args = args;
@@ -2621,7 +3229,8 @@ ip_ruby_cmd(clientData, interp, argc, argv)
     /* evaluate the argument string by ruby */
     code = tcl_protect(interp, ip_ruby_cmd_core, (VALUE)arg);
 
-    free(arg);
+    xfree(arg);
+    /* ckfree((char*)arg); */
 
     return code;
 }
@@ -2632,21 +3241,31 @@ ip_ruby_cmd(clientData, interp, argc, argv)
 /*****************************/
 static int
 #if TCL_MAJOR_VERSION >= 8
+#ifdef HAVE_PROTOTYPES
+ip_InterpExitObjCmd(ClientData clientData, Tcl_Interp *interp,
+		    int argc, Tcl_Obj *CONST argv[])
+#else
 ip_InterpExitObjCmd(clientData, interp, argc, argv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int argc;
     Tcl_Obj *CONST argv[];
+#endif
 #else /* TCL_MAJOR_VERSION < 8 */
+#ifdef HAVE_PROTOTYPES
+ip_InterpExitCommand(ClientData clientData, Tcl_Interp *interp,
+		     int argc, char *argv[])
+#else
 ip_InterpExitCommand(clientData, interp, argc, argv)
     ClientData clientData;
     Tcl_Interp *interp;
     int argc;
     char *argv[];
 #endif
+#endif
 {
     DUMP1("start ip_InterpExitCommand");
-    if (interp != (Tcl_Interp*)NULL 
+    if (interp != (Tcl_Interp*)NULL
         && !Tcl_InterpDeleted(interp)
 #if TCL_NAMESPACE_DEBUG
         && !ip_null_namespace(interp)
@@ -2655,27 +3274,40 @@ ip_InterpExitCommand(clientData, interp, argc, argv)
         Tcl_ResetResult(interp);
         /* Tcl_Preserve(interp); */
         /* Tcl_Eval(interp, "interp eval {} {destroy .}; interp delete {}"); */
-        ip_finalize(interp);
-        Tcl_DeleteInterp(interp);
-        Tcl_Release(interp);
+	if (!Tcl_InterpDeleted(interp)) {
+	  ip_finalize(interp);
+
+	  Tcl_DeleteInterp(interp);
+	  Tcl_Release(interp);
+	}
     }
     return TCL_OK;
 }
 
 static int
 #if TCL_MAJOR_VERSION >= 8
+#ifdef HAVE_PROTOTYPES
+ip_RubyExitObjCmd(ClientData clientData, Tcl_Interp *interp,
+		  int argc, Tcl_Obj *CONST argv[])
+#else
 ip_RubyExitObjCmd(clientData, interp, argc, argv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int argc;
     Tcl_Obj *CONST argv[];
+#endif
 #else /* TCL_MAJOR_VERSION < 8 */
+#ifdef HAVE_PROTOTYPES
+ip_RubyExitCommand(ClientData clientData, Tcl_Interp *interp,
+		   int argc, char *argv[])
+#else
 ip_RubyExitCommand(clientData, interp, argc, argv)
     ClientData clientData;
     Tcl_Interp *interp;
     int argc;
     char *argv[];
 #endif
+#endif
 {
     int state;
     char *cmd, *param;
@@ -2693,8 +3325,8 @@ ip_RubyExitCommand(clientData, interp, argc, argv)
 
     if (argc < 1 || argc > 2) {
         /* arguemnt error */
-        Tcl_AppendResult(interp, 
-                         "wrong number of arguments: should be \"", 
+        Tcl_AppendResult(interp,
+                         "wrong number of arguments: should be \"",
                          cmd, " ?returnCode?\"", (char *)NULL);
         return TCL_ERROR;
     }
@@ -2704,19 +3336,22 @@ ip_RubyExitCommand(clientData, interp, argc, argv)
     Tcl_ResetResult(interp);
 
     if (rb_safe_level() >= 4 || Tcl_IsSafe(interp)) {
-        ip_finalize(interp);
-        Tcl_DeleteInterp(interp);
-        Tcl_Release(interp);
+	if (!Tcl_InterpDeleted(interp)) {
+	  ip_finalize(interp);
+
+	  Tcl_DeleteInterp(interp);
+	  Tcl_Release(interp);
+	}
         return TCL_OK;
     }
 
     switch(argc) {
     case 1:
         /* rb_exit(0); */ /* not return if succeed */
-        Tcl_AppendResult(interp, 
+        Tcl_AppendResult(interp,
                          "fail to call \"", cmd, "\"", (char *)NULL);
 
-        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit, 
+        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit,
                                              Tcl_GetStringResult(interp));
         rb_iv_set(rbtk_pending_exception, "status", INT2FIX(0));
 
@@ -2732,8 +3367,8 @@ ip_RubyExitCommand(clientData, interp, argc, argv)
 #else /* TCL_MAJOR_VERSION < 8 */
         state = (int)strtol(argv[1], &endptr, 0);
         if (*endptr) {
-            Tcl_AppendResult(interp, 
-                             "expected integer but got \"", 
+            Tcl_AppendResult(interp,
+                             "expected integer but got \"",
                              argv[1], "\"", (char *)NULL);
             return TCL_ERROR;
         }
@@ -2741,10 +3376,10 @@ ip_RubyExitCommand(clientData, interp, argc, argv)
 #endif
         /* rb_exit(state); */ /* not return if succeed */
 
-        Tcl_AppendResult(interp, "fail to call \"", cmd, " ", 
+        Tcl_AppendResult(interp, "fail to call \"", cmd, " ",
                          param, "\"", (char *)NULL);
 
-        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit, 
+        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit,
                                              Tcl_GetStringResult(interp));
         rb_iv_set(rbtk_pending_exception, "status", INT2FIX(state));
 
@@ -2752,8 +3387,8 @@ ip_RubyExitCommand(clientData, interp, argc, argv)
 
     default:
         /* arguemnt error */
-        Tcl_AppendResult(interp, 
-                         "wrong number of arguments: should be \"", 
+        Tcl_AppendResult(interp,
+                         "wrong number of arguments: should be \"",
                          cmd, " ?returnCode?\"", (char *)NULL);
         return TCL_ERROR;
     }
@@ -2773,7 +3408,7 @@ static int ip_rbUpdateObjCmd _((ClientData, Tcl_Interp *, int,
 static int
 ip_rbUpdateObjCmd(clientData, interp, objc, objv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int objc;
     Tcl_Obj *CONST objv[];
 #else /* TCL_MAJOR_VERSION < 8 */
@@ -2794,15 +3429,19 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
 
     DUMP1("Ruby's 'update' is called");
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
 #ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
+#ifndef RUBY_USE_NATIVE_THREAD
+    if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on ip_ruby_eval()");
     }
 #endif
+#endif
+
+    Tcl_ResetResult(interp);
 
     if (objc == 1) {
         flags = TCL_DONT_WAIT;
@@ -2837,8 +3476,8 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
 # if TCL_MAJOR_VERSION >= 8
         int  dummy;
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy), 
-                         " [ idletasks ]\"", 
+                         Tcl_GetStringFromObj(objv[0], &dummy),
+                         " [ idletasks ]\"",
                          (char *) NULL);
 # else /* TCL_MAJOR_VERSION < 8 */
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
@@ -2870,7 +3509,11 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
     }
 
     /* trap check */
+#ifdef RUBY_VM
+    if (rb_thread_check_trap_pending()) {
+#else
     if (rb_trap_pending) {
+#endif
         Tcl_Release(interp);
 
         return TCL_RETURN;
@@ -2899,7 +3542,7 @@ struct th_update_param {
 };
 
 static void rb_threadUpdateProc _((ClientData));
-static void 
+static void
 rb_threadUpdateProc(clientData)
     ClientData clientData;      /* Pointer to integer to set to 1. */
 {
@@ -2918,7 +3561,7 @@ static int ip_rb_threadUpdateObjCmd _((ClientData, Tcl_Interp *, int,
 static int
 ip_rb_threadUpdateObjCmd(clientData, interp, objc, objv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int objc;
     Tcl_Obj *CONST objv[];
 #else /* TCL_MAJOR_VERSION < 8 */
@@ -2938,20 +3581,23 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
     static CONST char *updateOptions[] = {"idletasks", (char *) NULL};
     enum updateOptions {REGEXP_IDLETASKS};
     volatile VALUE current_thread = rb_thread_current();
+    struct timeval t;
 
     DUMP1("Ruby's 'thread_update' is called");
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
 #ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on ip_ruby_eval()");
+#ifndef RUBY_USE_NATIVE_THREAD
+    if (!ruby_native_thread_p()) {
+        rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
     }
 #endif
+#endif
 
-    if (rb_thread_alone() 
+    if (rb_thread_alone()
         || NIL_P(eventloop_thread) || eventloop_thread == current_thread) {
 #if TCL_MAJOR_VERSION >= 8
         DUMP1("call ip_rbUpdateObjCmd");
@@ -2964,6 +3610,8 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
 
     DUMP1("start Ruby's 'thread_update' body");
 
+    Tcl_ResetResult(interp);
+
     if (objc == 1) {
         flags = TCL_DONT_WAIT;
 
@@ -2997,8 +3645,8 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
 # if TCL_MAJOR_VERSION >= 8
         int  dummy;
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy), 
-                         " [ idletasks ]\"", 
+                         Tcl_GetStringFromObj(objv[0], &dummy),
+                         " [ idletasks ]\"",
                          (char *) NULL);
 # else /* TCL_MAJOR_VERSION < 8 */
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
@@ -3010,21 +3658,40 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
 
     DUMP1("pass argument check");
 
-    param = (struct th_update_param *)Tcl_Alloc(sizeof(struct th_update_param));
-    Tcl_Preserve(param);
+    /* param = (struct th_update_param *)Tcl_Alloc(sizeof(struct th_update_param)); */
+    param = (struct th_update_param *)ckalloc(sizeof(struct th_update_param));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)param);
+#endif
     param->thread = current_thread;
     param->done = 0;
 
     DUMP1("set idle proc");
     Tcl_DoWhenIdle(rb_threadUpdateProc, (ClientData) param);
 
+    t.tv_sec  = 0;
+    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
     while(!param->done) {
-        DUMP1("wait for complete idle proc");
-        rb_thread_stop();
+      DUMP1("wait for complete idle proc");
+      /* rb_thread_stop(); */
+      /* rb_thread_sleep_forever(); */
+      rb_thread_wait_for(t);
+      if (NIL_P(eventloop_thread)) {
+	break;
+      }
     }
 
-    Tcl_Release(param);
-    Tcl_Free((char *)param);
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)param);
+#else
+    /* Tcl_Free((char *)param); */
+    ckfree((char *)param);
+#endif
+#endif
 
     DUMP1("finish Ruby's 'thread_update'");
     return TCL_OK;
@@ -3053,7 +3720,7 @@ static int ip_rb_threadTkWaitCommand _((ClientData, Tcl_Interp *, int,
 #endif
 
 #if TCL_MAJOR_VERSION >= 8
-static char *VwaitVarProc _((ClientData, Tcl_Interp *, 
+static char *VwaitVarProc _((ClientData, Tcl_Interp *,
                              CONST84 char *,CONST84 char *, int));
 static char *
 VwaitVarProc(clientData, interp, name1, name2, flags)
@@ -3082,14 +3749,14 @@ VwaitVarProc(clientData, interp, name1, name2, flags)
 #if TCL_MAJOR_VERSION >= 8
 static int
 ip_rbVwaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp; 
+    ClientData clientData; /* Not used */
+    Tcl_Interp *interp;
     int objc;
     Tcl_Obj *CONST objv[];
 #else /* TCL_MAJOR_VERSION < 8 */
 static int
 ip_rbVwaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
+    ClientData clientData; /* Not used */
     Tcl_Interp *interp;
     int objc;
     char *objv[];
@@ -3102,13 +3769,13 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
 
     DUMP1("Ruby's 'vwait' is called");
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
 
 #if 0
-    if (!rb_thread_alone() 
+    if (!rb_thread_alone()
 	&& eventloop_thread != Qnil
 	&& eventloop_thread != rb_thread_current()) {
 #if TCL_MAJOR_VERSION >= 8
@@ -3123,10 +3790,14 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
 
     Tcl_Preserve(interp);
 #ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on ip_ruby_eval()");
+#ifndef RUBY_USE_NATIVE_THREAD
+    if (!ruby_native_thread_p()) {
+        rb_bug("cross-thread violation on ip_rbVwaitCommand()");
     }
 #endif
+#endif
+
+    Tcl_ResetResult(interp);
 
     if (objc != 2) {
 #ifdef Tcl_WrongNumArgs
@@ -3162,7 +3833,7 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
     nameString = objv[1];
 #endif
 
-    /* 
+    /*
     if (Tcl_TraceVar(interp, nameString,
                      TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
                      VwaitVarProc, (ClientData) &done) != TCL_OK) {
@@ -3185,7 +3856,7 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
 
     done = 0;
 
-    foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0, 
+    foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0,
                                               0, &done, interp));
 
     thr_crit_bup = rb_thread_critical;
@@ -3216,7 +3887,11 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
     }
 
     /* trap check */
+#ifdef RUBY_VM
+    if (rb_thread_check_trap_pending()) {
+#else
     if (rb_trap_pending) {
+#endif
 #if TCL_MAJOR_VERSION >= 8
         Tcl_DecrRefCount(objv[1]);
 #endif
@@ -3259,7 +3934,7 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
 /*  based on tkCmd.c      */
 /**************************/
 #if TCL_MAJOR_VERSION >= 8
-static char *WaitVariableProc _((ClientData, Tcl_Interp *, 
+static char *WaitVariableProc _((ClientData, Tcl_Interp *,
                                  CONST84 char *,CONST84 char *, int));
 static char *
 WaitVariableProc(clientData, interp, name1, name2, flags)
@@ -3269,7 +3944,7 @@ WaitVariableProc(clientData, interp, name1, name2, flags)
     CONST84 char *name2;        /* Second part of variable name. */
     int flags;                  /* Information about what happened. */
 #else /* TCL_MAJOR_VERSION < 8 */
-static char *WaitVariableProc _((ClientData, Tcl_Interp *, 
+static char *WaitVariableProc _((ClientData, Tcl_Interp *,
                                  char *, char *, int));
 static char *
 WaitVariableProc(clientData, interp, name1, name2, flags)
@@ -3319,7 +3994,7 @@ WaitWindowProc(clientData, eventPtr)
 static int
 ip_rbTkWaitObjCmd(clientData, interp, objc, objv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int objc;
     Tcl_Obj *CONST objv[];
 #else /* TCL_MAJOR_VERSION < 8 */
@@ -3343,26 +4018,27 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
 
     DUMP1("Ruby's 'tkwait' is called");
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
 
 #if 0
-    if (!rb_thread_alone() 
+    if (!rb_thread_alone()
 	&& eventloop_thread != Qnil
 	&& eventloop_thread != rb_thread_current()) {
 #if TCL_MAJOR_VERSION >= 8
         DUMP1("call ip_rb_threadTkWaitObjCmd");
-        return ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv);
+        return ip_rb_threadTkWaitObjCmd((ClientData)tkwin, interp, objc, objv);
 #else /* TCL_MAJOR_VERSION < 8 */
         DUMP1("call ip_rb_threadTkWaitCommand");
-        return ip_rb_threadTkWwaitCommand(clientData, interp, objc, objv);
+        return ip_rb_threadTkWwaitCommand((ClientData)tkwin, interp, objc, objv);
 #endif
     }
 #endif
 
     Tcl_Preserve(interp);
+    Tcl_ResetResult(interp);
 
     if (objc != 3) {
 #ifdef Tcl_WrongNumArgs
@@ -3373,12 +4049,12 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
 
 #if TCL_MAJOR_VERSION >= 8
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy), 
-                         " variable|visibility|window name\"", 
+                         Tcl_GetStringFromObj(objv[0], &dummy),
+                         " variable|visibility|window name\"",
                          (char *) NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         objv[0], " variable|visibility|window name\"", 
+                         objv[0], " variable|visibility|window name\"",
                          (char *) NULL);
 #endif
 
@@ -3394,14 +4070,14 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
     rb_thread_critical = Qtrue;
 
     /*
-    if (Tcl_GetIndexFromObj(interp, objv[1], 
-                            (CONST84 char **)optionStrings, 
+    if (Tcl_GetIndexFromObj(interp, objv[1],
+                            (CONST84 char **)optionStrings,
                             "option", 0, &index) != TCL_OK) {
         return TCL_ERROR;
     }
     */
-    ret = Tcl_GetIndexFromObj(interp, objv[1], 
-                              (CONST84 char **)optionStrings, 
+    ret = Tcl_GetIndexFromObj(interp, objv[1],
+                              (CONST84 char **)optionStrings,
                               "option", 0, &index);
 
     rb_thread_critical = thr_crit_bup;
@@ -3425,7 +4101,7 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
             index = TKWAIT_WINDOW;
         } else {
             Tcl_AppendResult(interp, "bad option \"", objv[1],
-                             "\": must be variable, visibility, or window", 
+                             "\": must be variable, visibility, or window",
                              (char *) NULL);
             Tcl_Release(interp);
             return TCL_ERROR;
@@ -3504,7 +4180,11 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
         }
 
         /* trap check */
-        if (rb_trap_pending) {
+#ifdef RUBY_VM
+	if (rb_thread_check_trap_pending()) {
+#else
+	if (rb_trap_pending) {
+#endif
             Tcl_Release(interp);
 
             return TCL_RETURN;
@@ -3516,6 +4196,7 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
         thr_crit_bup = rb_thread_critical;
         rb_thread_critical = Qtrue;
 
+	/* This function works on the Tk eventloop thread only. */
         if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
             window = NULL;
         } else {
@@ -3523,8 +4204,8 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
         }
 
         if (window == NULL) {
-            Tcl_AppendResult(interp, "tkwait: ", 
-                             "no main-window (not Tk application?)", 
+            Tcl_AppendResult(interp, ": tkwait: ",
+                             "no main-window (not Tk application?)",
                              (char*)NULL);
             rb_thread_critical = thr_crit_bup;
 #if TCL_MAJOR_VERSION >= 8
@@ -3563,7 +4244,11 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
         }
 
         /* trap check */
-        if (rb_trap_pending) {
+#ifdef RUBY_VM
+	if (rb_thread_check_trap_pending()) {
+#else
+	if (rb_trap_pending) {
+#endif
 #if TCL_MAJOR_VERSION >= 8
             Tcl_DecrRefCount(objv[2]);
 #endif
@@ -3612,7 +4297,8 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
     case TKWAIT_WINDOW:
         thr_crit_bup = rb_thread_critical;
         rb_thread_critical = Qtrue;
-            
+
+	/* This function works on the Tk eventloop thread only. */
         if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
             window = NULL;
         } else {
@@ -3624,8 +4310,8 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
 #endif
 
         if (window == NULL) {
-            Tcl_AppendResult(interp, "tkwait: ", 
-                             "no main-window (not Tk application?)", 
+            Tcl_AppendResult(interp, ": tkwait: ",
+                             "no main-window (not Tk application?)",
                              (char*)NULL);
             rb_thread_critical = thr_crit_bup;
             Tcl_Release(interp);
@@ -3657,7 +4343,11 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
         }
 
         /* trap check */
-        if (rb_trap_pending) {
+#ifdef RUBY_VM
+	if (rb_thread_check_trap_pending()) {
+#else
+	if (rb_trap_pending) {
+#endif
             Tcl_Release(interp);
 
             return TCL_RETURN;
@@ -3689,7 +4379,7 @@ struct th_vwait_param {
 };
 
 #if TCL_MAJOR_VERSION >= 8
-static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *, 
+static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *,
                                    CONST84 char *,CONST84 char *, int));
 static char *
 rb_threadVwaitProc(clientData, interp, name1, name2, flags)
@@ -3699,7 +4389,7 @@ rb_threadVwaitProc(clientData, interp, name1, name2, flags)
     CONST84 char *name2;        /* Second part of variable name. */
     int flags;                  /* Information about what happened. */
 #else /* TCL_MAJOR_VERSION < 8 */
-static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *, 
+static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *,
                                    char *, char *, int));
 static char *
 rb_threadVwaitProc(clientData, interp, name1, name2, flags)
@@ -3717,7 +4407,7 @@ rb_threadVwaitProc(clientData, interp, name1, name2, flags)
     } else {
         param->done = 1;
     }
-    rb_thread_wakeup(param->thread);
+    if (param->done != 0) rb_thread_wakeup(param->thread);
 
     return (char *)NULL;
 }
@@ -3739,7 +4429,7 @@ rb_threadWaitVisibilityProc(clientData, eventPtr)
     if (eventPtr->type == DestroyNotify) {
         param->done = TKWAIT_MODE_DESTROY;
     }
-    rb_thread_wakeup(param->thread);
+    if (param->done != 0) rb_thread_wakeup(param->thread);
 }
 
 static void rb_threadWaitWindowProc _((ClientData, XEvent *));
@@ -3753,20 +4443,20 @@ rb_threadWaitWindowProc(clientData, eventPtr)
     if (eventPtr->type == DestroyNotify) {
         param->done = TKWAIT_MODE_DESTROY;
     }
-    rb_thread_wakeup(param->thread);
+    if (param->done != 0) rb_thread_wakeup(param->thread);
 }
 
 #if TCL_MAJOR_VERSION >= 8
 static int
 ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int objc;
     Tcl_Obj *CONST objv[];
 #else /* TCL_MAJOR_VERSION < 8 */
 static int
 ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
+    ClientData clientData; /* Not used */
     Tcl_Interp *interp;
     int objc;
     char *objv[];
@@ -3777,10 +4467,11 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
     int ret, dummy;
     int thr_crit_bup;
     volatile VALUE current_thread = rb_thread_current();
+    struct timeval t;
 
     DUMP1("Ruby's 'thread_vwait' is called");
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
@@ -3796,6 +4487,7 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
     }
 
     Tcl_Preserve(interp);
+    Tcl_ResetResult(interp);
 
     if (objc != 2) {
 #ifdef Tcl_WrongNumArgs
@@ -3830,8 +4522,11 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
 
-    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
-    Tcl_Preserve(param);
+    /* param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param)); */
+    param = (struct th_vwait_param *)ckalloc(sizeof(struct th_vwait_param));
+#if 1 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)param);
+#endif
     param->thread = current_thread;
     param->done = 0;
 
@@ -3849,8 +4544,16 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
     rb_thread_critical = thr_crit_bup;
 
     if (ret != TCL_OK) {
-        Tcl_Release(param);
-        Tcl_Free((char *)param);
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 1 /* use Tcl_Preserve/Release */
+        Tcl_Release((ClientData)param);
+#else
+        /* Tcl_Free((char *)param); */
+        ckfree((char *)param);
+#endif
+#endif
 
 #if TCL_MAJOR_VERSION >= 8
         Tcl_DecrRefCount(objv[1]);
@@ -3859,9 +4562,16 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
         return TCL_ERROR;
     }
 
-    /* if (!param->done) { */
+    t.tv_sec  = 0;
+    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
     while(!param->done) {
-        rb_thread_stop();
+      /* rb_thread_stop(); */
+      /* rb_thread_sleep_forever(); */
+      rb_thread_wait_for(t);
+      if (NIL_P(eventloop_thread)) {
+	break;
+      }
     }
 
     thr_crit_bup = rb_thread_critical;
@@ -3873,8 +4583,16 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
                        rb_threadVwaitProc, (ClientData) param);
     }
 
-    Tcl_Release(param);
-    Tcl_Free((char *)param);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 1 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)param);
+#else
+    /* Tcl_Free((char *)param); */
+    ckfree((char *)param);
+#endif
+#endif
 
     rb_thread_critical = thr_crit_bup;
 
@@ -3889,7 +4607,7 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
 static int
 ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int objc;
     Tcl_Obj *CONST objv[];
 #else /* TCL_MAJOR_VERSION < 8 */
@@ -3912,10 +4630,11 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
     int ret, dummy;
     int thr_crit_bup;
     volatile VALUE current_thread = rb_thread_current();
+    struct timeval t;
 
     DUMP1("Ruby's 'thread_tkwait' is called");
     if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
                                              "IP is deleted");
         return TCL_ERROR;
     }
@@ -3923,6 +4642,8 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
     if (rb_thread_alone() || eventloop_thread == current_thread) {
 #if TCL_MAJOR_VERSION >= 8
         DUMP1("call ip_rbTkWaitObjCmd");
+        DUMP2("eventloop_thread %lx", eventloop_thread);
+        DUMP2("current_thread %lx", current_thread);
         return ip_rbTkWaitObjCmd(clientData, interp, objc, objv);
 #else /* TCL_MAJOR_VERSION < 8 */
         DUMP1("call rb_VwaitCommand");
@@ -3933,6 +4654,8 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
     Tcl_Preserve(interp);
     Tcl_Preserve(tkwin);
 
+    Tcl_ResetResult(interp);
+
     if (objc != 3) {
 #ifdef Tcl_WrongNumArgs
         Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
@@ -3942,12 +4665,12 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
 
 #if TCL_MAJOR_VERSION >= 8
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy), 
-                         " variable|visibility|window name\"", 
+                         Tcl_GetStringFromObj(objv[0], &dummy),
+                         " variable|visibility|window name\"",
                          (char *) NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
         Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         objv[0], " variable|visibility|window name\"", 
+                         objv[0], " variable|visibility|window name\"",
                          (char *) NULL);
 #endif
 
@@ -3963,14 +4686,14 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
     /*
-    if (Tcl_GetIndexFromObj(interp, objv[1], 
-                            (CONST84 char **)optionStrings, 
+    if (Tcl_GetIndexFromObj(interp, objv[1],
+                            (CONST84 char **)optionStrings,
                             "option", 0, &index) != TCL_OK) {
         return TCL_ERROR;
     }
     */
-    ret = Tcl_GetIndexFromObj(interp, objv[1], 
-                              (CONST84 char **)optionStrings, 
+    ret = Tcl_GetIndexFromObj(interp, objv[1],
+                              (CONST84 char **)optionStrings,
                               "option", 0, &index);
 
     rb_thread_critical = thr_crit_bup;
@@ -3995,7 +4718,7 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
             index = TKWAIT_WINDOW;
         } else {
             Tcl_AppendResult(interp, "bad option \"", objv[1],
-                             "\": must be variable, visibility, or window", 
+                             "\": must be variable, visibility, or window",
                              (char *) NULL);
             Tcl_Release(tkwin);
             Tcl_Release(interp);
@@ -4015,8 +4738,11 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
     nameString = objv[2];
 #endif
 
-    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
-    Tcl_Preserve(param);
+    /* param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param)); */
+    param = (struct th_vwait_param *)ckalloc(sizeof(struct th_vwait_param));
+#if 1 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)param);
+#endif
     param->thread = current_thread;
     param->done = 0;
 
@@ -4026,7 +4752,7 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
     case TKWAIT_VARIABLE:
         thr_crit_bup = rb_thread_critical;
         rb_thread_critical = Qtrue;
-        /* 
+        /*
         if (Tcl_TraceVar(interp, nameString,
                          TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
                          rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
@@ -4040,8 +4766,16 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
         rb_thread_critical = thr_crit_bup;
 
         if (ret != TCL_OK) {
+#if 0 /* use Tcl_EventuallyFree */
+            Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 1 /* use Tcl_Preserve/Release */
             Tcl_Release(param);
-            Tcl_Free((char *)param);
+#else
+            /* Tcl_Free((char *)param); */
+            ckfree((char *)param);
+#endif
+#endif
 
 #if TCL_MAJOR_VERSION >= 8
             Tcl_DecrRefCount(objv[2]);
@@ -4052,9 +4786,16 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
             return TCL_ERROR;
         }
 
-        /* if (!param->done) { */
+	t.tv_sec  = 0;
+	t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
         while(!param->done) {
-            rb_thread_stop();
+	  /* rb_thread_stop(); */
+	  /* rb_thread_sleep_forever(); */
+	  rb_thread_wait_for(t);
+	  if (NIL_P(eventloop_thread)) {
+	    break;
+	  }
         }
 
         thr_crit_bup = rb_thread_critical;
@@ -4078,21 +4819,43 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
         thr_crit_bup = rb_thread_critical;
         rb_thread_critical = Qtrue;
 
+#if 0 /* variable 'tkwin' must keep the token of MainWindow */
         if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
             window = NULL;
         } else {
             window = Tk_NameToWindow(interp, nameString, tkwin);
         }
+#else
+        if (!tk_stubs_init_p() || tkwin == (Tk_Window)NULL) {
+            window = NULL;
+	} else {
+            /* Tk_NameToWindow() returns right token on non-eventloop thread */
+            Tcl_CmdInfo info;
+            if (Tcl_GetCommandInfo(interp, ".", &info)) { /* check root */
+                window = Tk_NameToWindow(interp, nameString, tkwin);
+            } else {
+                window = NULL;
+            }
+	}
+#endif
 
         if (window == NULL) {
-            Tcl_AppendResult(interp, "thread_tkwait: ", 
-                             "no main-window (not Tk application?)", 
+            Tcl_AppendResult(interp, ": thread_tkwait: ",
+                             "no main-window (not Tk application?)",
                              (char*)NULL);
 
             rb_thread_critical = thr_crit_bup;
 
+#if 0 /* use Tcl_EventuallyFree */
+	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 1 /* use Tcl_Preserve/Release */
             Tcl_Release(param);
-            Tcl_Free((char *)param);
+#else
+            /* Tcl_Free((char *)param); */
+            ckfree((char *)param);
+#endif
+#endif
 
 #if TCL_MAJOR_VERSION >= 8
             Tcl_DecrRefCount(objv[2]);
@@ -4109,15 +4872,17 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
 
         rb_thread_critical = thr_crit_bup;
 
-        /* if (!param->done) { */
-        /*
-        while(!param->done) {
-            rb_thread_stop();
-        }
-        */
+	t.tv_sec  = 0;
+	t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
         while(param->done != TKWAIT_MODE_VISIBILITY) {
-            if (param->done == TKWAIT_MODE_DESTROY) break;
-            rb_thread_stop();
+	  if (param->done == TKWAIT_MODE_DESTROY) break;
+	  /* rb_thread_stop(); */
+	  /* rb_thread_sleep_forever(); */
+	  rb_thread_wait_for(t);
+	  if (NIL_P(eventloop_thread)) {
+	    break;
+	  }
         }
 
         thr_crit_bup = rb_thread_critical;
@@ -4127,7 +4892,7 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
         if (param->done != TKWAIT_MODE_DESTROY) {
             Tk_DeleteEventHandler(window,
                                   VisibilityChangeMask|StructureNotifyMask,
-                                  rb_threadWaitVisibilityProc, 
+                                  rb_threadWaitVisibilityProc,
                                   (ClientData) param);
         }
 
@@ -4141,8 +4906,16 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
 
             Tcl_Release(window);
 
+#if 0 /* use Tcl_EventuallyFree */
+	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 1 /* use Tcl_Preserve/Release */
             Tcl_Release(param);
-            Tcl_Free((char *)param);
+#else
+            /* Tcl_Free((char *)param); */
+            ckfree((char *)param);
+#endif
+#endif
 
 #if TCL_MAJOR_VERSION >= 8
             Tcl_DecrRefCount(objv[2]);
@@ -4167,25 +4940,47 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
         thr_crit_bup = rb_thread_critical;
         rb_thread_critical = Qtrue;
 
+#if 0 /* variable 'tkwin' must keep the token of MainWindow */
         if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
             window = NULL;
         } else {
             window = Tk_NameToWindow(interp, nameString, tkwin);
         }
+#else
+        if (!tk_stubs_init_p() || tkwin == (Tk_Window)NULL) {
+            window = NULL;
+	} else {
+            /* Tk_NameToWindow() returns right token on non-eventloop thread */
+            Tcl_CmdInfo info;
+            if (Tcl_GetCommandInfo(interp, ".", &info)) { /* check root */
+                window = Tk_NameToWindow(interp, nameString, tkwin);
+            } else {
+                window = NULL;
+            }
+	}
+#endif
 
 #if TCL_MAJOR_VERSION >= 8
         Tcl_DecrRefCount(objv[2]);
 #endif
 
         if (window == NULL) {
-            Tcl_AppendResult(interp, "thread_tkwait: ", 
-                             "no main-window (not Tk application?)", 
+            Tcl_AppendResult(interp, ": thread_tkwait: ",
+                             "no main-window (not Tk application?)",
                              (char*)NULL);
 
             rb_thread_critical = thr_crit_bup;
 
+#if 0 /* use Tcl_EventuallyFree */
+	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 1 /* use Tcl_Preserve/Release */
             Tcl_Release(param);
-            Tcl_Free((char *)param);
+#else
+            /* Tcl_Free((char *)param); */
+            ckfree((char *)param);
+#endif
+#endif
 
             Tcl_Release(tkwin);
             Tcl_Release(interp);
@@ -4199,14 +4994,16 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
 
         rb_thread_critical = thr_crit_bup;
 
-        /* if (!param->done) { */
-        /* 
-        while(!param->done) {
-            rb_thread_stop();
-        }
-        */
+	t.tv_sec  = 0;
+	t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
         while(param->done != TKWAIT_MODE_DESTROY) {
-            rb_thread_stop();
+	  /* rb_thread_stop(); */
+	  /* rb_thread_sleep_forever(); */
+	  rb_thread_wait_for(t);
+	  if (NIL_P(eventloop_thread)) {
+	    break;
+	  }
         }
 
         Tcl_Release(window);
@@ -4224,8 +5021,16 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
         break;
     } /* end of 'switch' statement */
 
-    Tcl_Release(param);
-    Tcl_Free((char *)param);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 1 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)param);
+#else
+    /* Tcl_Free((char *)param); */
+    ckfree((char *)param);
+#endif
+#endif
 
     /*
      * Clear out the interpreter's result, since it may have been set
@@ -4250,7 +5055,7 @@ ip_thread_vwait(self, var)
     argv[0] = cmd_str;
     argv[1] = var;
 
-    return ip_invoke_real(2, argv, self);
+    return ip_invoke_with_position(2, argv, self, TCL_QUEUE_TAIL);
 }
 
 static VALUE
@@ -4266,7 +5071,7 @@ ip_thread_tkwait(self, mode, target)
     argv[1] = mode;
     argv[2] = target;
 
-    return ip_invoke_real(3, argv, self);
+    return ip_invoke_with_position(3, argv, self, TCL_QUEUE_TAIL);
 }
 
 
@@ -4308,11 +5113,13 @@ delete_slaves(ip)
                 slave = Tcl_GetSlave(ip, slave_name);
                 if (slave == (Tcl_Interp*)NULL) continue;
 
-                /* call ip_finalize */
-                ip_finalize(slave);
+		if (!Tcl_InterpDeleted(slave)) {
+		  /* call ip_finalize */
+		  ip_finalize(slave);
 
-                Tcl_DeleteInterp(slave);
-                /* Tcl_Release(slave); */
+		  Tcl_DeleteInterp(slave);
+		  /* Tcl_Release(slave); */
+		}
             }
         }
 
@@ -4340,7 +5147,7 @@ delete_slaves(ip)
 
     if (!Tcl_InterpDeleted(ip) && Tcl_Eval(ip, "interp slaves") == TCL_OK) {
         slave_list = ip->result;
-        if (Tcl_SplitList((Tcl_Interp*)NULL, 
+        if (Tcl_SplitList((Tcl_Interp*)NULL,
                           slave_list, &argc, &argv) == TCL_OK) {
             for(i = 0; i < argc; i++) {
                 slave_name = argv[i];
@@ -4350,10 +5157,12 @@ delete_slaves(ip)
                 slave = Tcl_GetSlave(ip, slave_name);
                 if (slave == (Tcl_Interp*)NULL) continue;
 
-                /* call ip_finalize */
-                ip_finalize(slave);
+		if (!Tcl_InterpDeleted(slave)) {
+		  /* call ip_finalize */
+		  ip_finalize(slave);
 
-                Tcl_DeleteInterp(slave);
+		  Tcl_DeleteInterp(slave);
+		}
             }
         }
     }
@@ -4365,26 +5174,39 @@ delete_slaves(ip)
 
 /* finalize operation */
 static void
+#ifdef HAVE_PROTOTYPES
+lib_mark_at_exit(VALUE self)
+#else
 lib_mark_at_exit(self)
     VALUE self;
+#endif
 {
     at_exit = 1;
 }
 
 static int
 #if TCL_MAJOR_VERSION >= 8
+#ifdef HAVE_PROTOTYPES
+ip_null_proc(ClientData clientData, Tcl_Interp *interp,
+	     int argc, Tcl_Obj *CONST argv[])
+#else
 ip_null_proc(clientData, interp, argc, argv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int argc;
     Tcl_Obj *CONST argv[];
+#endif
 #else /* TCL_MAJOR_VERSION < 8 */
+#ifdef HAVE_PROTOTYPES
+ip_null_proc(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
+#else
 ip_null_proc(clientData, interp, argc, argv)
     ClientData clientData;
     Tcl_Interp *interp;
     int argc;
     char *argv[];
 #endif
+#endif
 {
     Tcl_ResetResult(interp);
     return TCL_OK;
@@ -4398,10 +5220,10 @@ ip_finalize(ip)
     int  thr_crit_bup;
 
     VALUE rb_debug_bup, rb_verbose_bup;
-          /* When ruby is exiting, printing debug messages in some callback 
-             operations from Tcl-IP sometimes cause SEGV. I don't know the 
+          /* When ruby is exiting, printing debug messages in some callback
+             operations from Tcl-IP sometimes cause SEGV. I don't know the
              reason. But I got SEGV when calling "rb_io_write(rb_stdout, ...)".
-             So, in some part of this function, debug mode and verbose mode 
+             So, in some part of this function, debug mode and verbose mode
              are disabled. If you know the reason, please fix it.
                            --  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)  */
 
@@ -4437,42 +5259,64 @@ ip_finalize(ip)
 
     /* shut off some connections from Tcl-proc to Ruby */
     if (at_exit) {
-	/* NOTE: Only when at exit. 
-	   Because, ruby removes objects, which depends on the deleted 
-	   interpreter, on some callback operations. 
+	/* NOTE: Only when at exit.
+	   Because, ruby removes objects, which depends on the deleted
+	   interpreter, on some callback operations.
 	   It is important for GC. */
 #if TCL_MAJOR_VERSION >= 8
-	Tcl_CreateObjCommand(ip, "ruby", ip_null_proc, 
+	Tcl_CreateObjCommand(ip, "ruby", ip_null_proc,
 			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateObjCommand(ip, "ruby_eval", ip_null_proc, 
+	Tcl_CreateObjCommand(ip, "ruby_eval", ip_null_proc,
 			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateObjCommand(ip, "ruby_cmd", ip_null_proc, 
+	Tcl_CreateObjCommand(ip, "ruby_cmd", ip_null_proc,
 			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
-	Tcl_CreateCommand(ip, "ruby", ip_null_proc, 
+	Tcl_CreateCommand(ip, "ruby", ip_null_proc,
 			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateCommand(ip, "ruby_eval", ip_null_proc, 
+	Tcl_CreateCommand(ip, "ruby_eval", ip_null_proc,
 			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateCommand(ip, "ruby_cmd", ip_null_proc, 
+	Tcl_CreateCommand(ip, "ruby_cmd", ip_null_proc,
 			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 #endif
+	/*
+	  rb_thread_critical = thr_crit_bup;
+	  return;
+	*/
     }
 
     /* delete root widget */
-#if 0
+#ifdef RUBY_VM
+    /* cause SEGV on Ruby 1.9 */
+#else
     DUMP1("check `destroy'");
     if (Tcl_GetCommandInfo(ip, "destroy", &info)) {
-        DUMP1("call `destroy'");
-        Tcl_GlobalEval(ip, "destroy .");
+        DUMP1("call `destroy .'");
+        Tcl_GlobalEval(ip, "catch {destroy .}");
     }
 #endif
 #if 1
     DUMP1("destroy root widget");
     if (tk_stubs_init_p() && Tk_MainWindow(ip) != (Tk_Window)NULL) {
+        /*
+	 *  On Ruby VM, this code piece may be not called, because
+	 *  Tk_MainWindow() returns NULL on a native thread except
+         *  the thread which initialize Tk environment.
+         *  Of course, that is a problem. But maybe not so serious.
+         *  All widgets are destroyed when the Tcl interp is deleted.
+         *  At then, Ruby may raise exceptions on the delete hook
+         *  callbacks which registered for the deleted widgets, and
+	 *  may fail to clear objects which depends on the widgets.
+         *  Although it is the problem, it is possibly avoidable by
+         *  rescuing exceptions and the finalize hook of the interp.
+         */
+        Tk_Window win = Tk_MainWindow(ip);
+
         DUMP1("call Tk_DestroyWindow");
         ruby_debug   = Qfalse;
         ruby_verbose = Qnil;
-        Tk_DestroyWindow(Tk_MainWindow(ip));
+	if (! (((Tk_FakeWin*)win)->flags & TK_ALREADY_DEAD)) {
+	  Tk_DestroyWindow(win);
+	}
         ruby_debug   = rb_debug_bup;
         ruby_verbose = rb_verbose_bup;
     }
@@ -4495,7 +5339,7 @@ ip_finalize(ip)
         DUMP1("cancel after callbacks");
         ruby_debug   = Qfalse;
         ruby_verbose = Qnil;
-        Tcl_GlobalEval(ip, "foreach id [after info] {after cancel $id}");
+        Tcl_GlobalEval(ip, "catch {foreach id [after info] {after cancel $id}}");
         ruby_debug   = rb_debug_bup;
         ruby_verbose = rb_verbose_bup;
     }
@@ -4521,32 +5365,38 @@ ip_free(ptr)
         thr_crit_bup = rb_thread_critical;
         rb_thread_critical = Qtrue;
 
-        if ( ptr->ip != (Tcl_Interp*)NULL 
+        if ( ptr->ip != (Tcl_Interp*)NULL
              && !Tcl_InterpDeleted(ptr->ip)
-             && Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL 
+             && Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL
              && !Tcl_InterpDeleted(Tcl_GetMaster(ptr->ip)) ) {
-            DUMP2("parent IP(%lx) is not deleted", 
+            DUMP2("parent IP(%lx) is not deleted",
                   (unsigned long)Tcl_GetMaster(ptr->ip));
-            DUMP2("slave IP(%lx) should not be deleted", 
+            DUMP2("slave IP(%lx) should not be deleted",
                   (unsigned long)ptr->ip);
-            free(ptr);
+            xfree(ptr);
+            /* ckfree((char*)ptr); */
             rb_thread_critical = thr_crit_bup;
             return;
         }
 
         if (ptr->ip == (Tcl_Interp*)NULL) {
             DUMP1("ip_free is called for deleted IP");
-            free(ptr);
+            xfree(ptr);
+            /* ckfree((char*)ptr); */
             rb_thread_critical = thr_crit_bup;
             return;
         }
 
-        ip_finalize(ptr->ip);
-        Tcl_DeleteInterp(ptr->ip); 
-        Tcl_Release(ptr->ip); 
+	if (!Tcl_InterpDeleted(ptr->ip)) {
+	  ip_finalize(ptr->ip);
+
+	  Tcl_DeleteInterp(ptr->ip);
+	  Tcl_Release(ptr->ip);
+	}
 
         ptr->ip = (Tcl_Interp*)NULL;
-        free(ptr);
+        xfree(ptr);
+        /* ckfree((char*)ptr); */
 
         rb_thread_critical = thr_crit_bup;
     }
@@ -4572,71 +5422,137 @@ ip_replace_wait_commands(interp, mainWin)
     /* replace 'vwait' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"vwait\")");
-    Tcl_CreateObjCommand(interp, "vwait", ip_rbVwaitObjCmd, 
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    Tcl_CreateObjCommand(interp, "vwait", ip_rbVwaitObjCmd,
+                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"vwait\")");
-    Tcl_CreateCommand(interp, "vwait", ip_rbVwaitCommand, 
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    Tcl_CreateCommand(interp, "vwait", ip_rbVwaitCommand,
+                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
     /* replace 'tkwait' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"tkwait\")");
-    Tcl_CreateObjCommand(interp, "tkwait", ip_rbTkWaitObjCmd, 
+    Tcl_CreateObjCommand(interp, "tkwait", ip_rbTkWaitObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"tkwait\")");
-    Tcl_CreateCommand(interp, "tkwait", ip_rbTkWaitCommand, 
+    Tcl_CreateCommand(interp, "tkwait", ip_rbTkWaitCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
     /* add 'thread_vwait' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"thread_vwait\")");
-    Tcl_CreateObjCommand(interp, "thread_vwait", ip_rb_threadVwaitObjCmd, 
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    Tcl_CreateObjCommand(interp, "thread_vwait", ip_rb_threadVwaitObjCmd,
+                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"thread_vwait\")");
-    Tcl_CreateCommand(interp, "thread_vwait", ip_rb_threadVwaitCommand, 
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    Tcl_CreateCommand(interp, "thread_vwait", ip_rb_threadVwaitCommand,
+                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
     /* add 'thread_tkwait' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"thread_tkwait\")");
-    Tcl_CreateObjCommand(interp, "thread_tkwait", ip_rb_threadTkWaitObjCmd, 
+    Tcl_CreateObjCommand(interp, "thread_tkwait", ip_rb_threadTkWaitObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"thread_tkwait\")");
-    Tcl_CreateCommand(interp, "thread_tkwait", ip_rb_threadTkWaitCommand, 
+    Tcl_CreateCommand(interp, "thread_tkwait", ip_rb_threadTkWaitCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
     /* replace 'update' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"update\")");
-    Tcl_CreateObjCommand(interp, "update", ip_rbUpdateObjCmd, 
+    Tcl_CreateObjCommand(interp, "update", ip_rbUpdateObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"update\")");
-    Tcl_CreateCommand(interp, "update", ip_rbUpdateCommand, 
+    Tcl_CreateCommand(interp, "update", ip_rbUpdateCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
     /* add 'thread_update' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"thread_update\")");
-    Tcl_CreateObjCommand(interp, "thread_update", ip_rb_threadUpdateObjCmd, 
+    Tcl_CreateObjCommand(interp, "thread_update", ip_rb_threadUpdateObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"thread_update\")");
-    Tcl_CreateCommand(interp, "thread_update", ip_rb_threadUpdateCommand, 
+    Tcl_CreateCommand(interp, "thread_update", ip_rb_threadUpdateCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 }
 
 
+#if TCL_MAJOR_VERSION >= 8
+static int
+ip_rb_replaceSlaveTkCmdsObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+static int
+ip_rb_replaceSlaveTkCmdsCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    char *slave_name;
+    Tcl_Interp *slave;
+    Tk_Window mainWin;
+
+    if (objc != 2) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "slave_name");
+#else
+	char *nameString;
+#if TCL_MAJOR_VERSION >= 8
+        nameString = Tcl_GetStringFromObj(objv[0], (int*)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+        nameString = objv[0];
+#endif
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         nameString, " slave_name\"", (char *) NULL);
+#endif
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+    slave_name = Tcl_GetStringFromObj(objv[1], (int*)NULL);
+#else
+    slave_name = objv[1];
+#endif
+
+    slave = Tcl_GetSlave(interp, slave_name);
+    if (slave == NULL) {
+        Tcl_AppendResult(interp, "cannot find slave \"",
+                         slave_name, "\"", (char *)NULL);
+	return TCL_ERROR;
+    }
+    mainWin = Tk_MainWindow(slave);
+
+    /* replace 'exit' command --> 'interp_exit' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
+    Tcl_CreateObjCommand(slave, "exit", ip_InterpExitObjCmd,
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
+    Tcl_CreateCommand(slave, "exit", ip_InterpExitCommand,
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* replace vwait and tkwait */
+    ip_replace_wait_commands(slave, mainWin);
+
+    return TCL_OK;
+}
+
 
 #if TCL_MAJOR_VERSION >= 8
 static int ip_rbNamespaceObjCmd _((ClientData, Tcl_Interp *, int,
@@ -4644,7 +5560,7 @@ static int ip_rbNamespaceObjCmd _((ClientData, Tcl_Interp *, int,
 static int
 ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
     ClientData clientData;
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
     int objc;
     Tcl_Obj *CONST objv[];
 {
@@ -4653,13 +5569,13 @@ ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
 
     if (!Tcl_GetCommandInfo(interp, "__orig_namespace_command__", &(info))) {
         Tcl_ResetResult(interp);
-        Tcl_AppendResult(interp, 
+        Tcl_AppendResult(interp,
                          "invalid command name \"namespace\"", (char*)NULL);
         return TCL_ERROR;
     }
 
     rbtk_eventloop_depth++;
-    DUMP2("namespace wrapper enter depth == %d", rbtk_eventloop_depth);
+    /* DUMP2("namespace wrapper enter depth == %d", rbtk_eventloop_depth); */
 
     if (info.isNativeObjectProc) {
         ret = (*(info.objProc))(info.objClientData, interp, objc, objv);
@@ -4668,7 +5584,11 @@ ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
         int i;
         char **argv;
 
-        argv = (char **)Tcl_Alloc(sizeof(char *) * (objc + 1));
+        /* argv = (char **)Tcl_Alloc(sizeof(char *) * (objc + 1)); */
+        argv = (char **)ckalloc(sizeof(char *) * (objc + 1));
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
+#endif
 
         for(i = 0; i < objc; i++) {
             /* argv[i] = Tcl_GetString(objv[i]); */
@@ -4676,13 +5596,22 @@ ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
         }
         argv[objc] = (char *)NULL;
 
-        ret = (*(info.proc))(info.clientData, interp, 
+        ret = (*(info.proc))(info.clientData, interp,
                               objc, (CONST84 char **)argv);
 
-        Tcl_Free((char*)argv);
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+        /* Tcl_Free((char*)argv); */
+        ckfree((char*)argv);
+#endif
+#endif
     }
 
-    DUMP2("namespace wrapper exit depth == %d", rbtk_eventloop_depth);
+    /* DUMP2("namespace wrapper exit depth == %d", rbtk_eventloop_depth); */
     rbtk_eventloop_depth--;
 
     return ret;
@@ -4691,7 +5620,7 @@ ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
 
 static void
 ip_wrap_namespace_command(interp)
-    Tcl_Interp *interp; 
+    Tcl_Interp *interp;
 {
 #if TCL_MAJOR_VERSION >= 8
     Tcl_CmdInfo orig_info;
@@ -4701,16 +5630,16 @@ ip_wrap_namespace_command(interp)
     }
 
     if (orig_info.isNativeObjectProc) {
-        Tcl_CreateObjCommand(interp, "__orig_namespace_command__", 
-                             orig_info.objProc, orig_info.objClientData, 
+        Tcl_CreateObjCommand(interp, "__orig_namespace_command__",
+                             orig_info.objProc, orig_info.objClientData,
                              orig_info.deleteProc);
     } else {
-        Tcl_CreateCommand(interp, "__orig_namespace_command__", 
-                          orig_info.proc, orig_info.clientData, 
+        Tcl_CreateCommand(interp, "__orig_namespace_command__",
+                          orig_info.proc, orig_info.clientData,
                           orig_info.deleteProc);
     }
 
-    Tcl_CreateObjCommand(interp, "namespace", ip_rbNamespaceObjCmd, 
+    Tcl_CreateObjCommand(interp, "namespace", ip_rbNamespaceObjCmd,
                          (ClientData) 0, (Tcl_CmdDeleteProc *)NULL);
 #endif
 }
@@ -4718,9 +5647,13 @@ ip_wrap_namespace_command(interp)
 
 /* call when interpreter is deleted */
 static void
+#ifdef HAVE_PROTOTYPES
+ip_CallWhenDeleted(ClientData clientData, Tcl_Interp *ip)
+#else
 ip_CallWhenDeleted(clientData, ip)
     ClientData clientData;
     Tcl_Interp *ip;
+#endif
 {
     int  thr_crit_bup;
     /* Tk_Window main_win = (Tk_Window) clientData; */
@@ -4750,16 +5683,20 @@ ip_init(argc, argv, self)
     Tk_Window mainWin = (Tk_Window)NULL;
 
     /* security check */
-    if (ruby_safe_level >= 4) {
-        rb_raise(rb_eSecurityError, 
-                 "Cannot create a TclTkIp object at level %d", 
-                 ruby_safe_level);
+    if (rb_safe_level() >= 4) {
+        rb_raise(rb_eSecurityError,
+                 "Cannot create a TclTkIp object at level %d",
+                 rb_safe_level());
     }
 
     /* create object */
     Data_Get_Struct(self, struct tcltkip, ptr);
     ptr = ALLOC(struct tcltkip);
+    /* ptr = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
     DATA_PTR(self) = ptr;
+#ifdef RUBY_USE_NATIVE_THREAD
+    ptr->tk_thread_id = 0;
+#endif
     ptr->ref_count = 0;
     ptr->allow_ruby_exit = 1;
     ptr->return_value = 0;
@@ -4791,7 +5728,7 @@ ip_init(argc, argv, self)
 #if TCL_MAJOR_VERSION >= 8
 #if TCL_NAMESPACE_DEBUG
     DUMP1("get current namespace");
-    if ((ptr->default_ns = Tcl_GetCurrentNamespace(ptr->ip)) 
+    if ((ptr->default_ns = Tcl_GetCurrentNamespace(ptr->ip))
         == (Tcl_Namespace*)NULL) {
       rb_raise(rb_eRuntimeError, "a new Tk interpreter has a NULL namespace");
     }
@@ -4802,7 +5739,7 @@ ip_init(argc, argv, self)
     DUMP2("IP ref_count = %d", ptr->ref_count);
     current_interp = ptr->ip;
 
-    ptr->has_orig_exit 
+    ptr->has_orig_exit
         = Tcl_GetCommandInfo(ptr->ip, "exit", &(ptr->orig_exit_info));
 
     /* from Tcl_AppInit() */
@@ -4831,7 +5768,7 @@ ip_init(argc, argv, self)
                 Tcl_SetVar(ptr->ip, "argv0", "ruby", TCL_GLOBAL_ONLY);
             } else {
                 /* Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); */
-                Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 
+                Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0),
                            TCL_GLOBAL_ONLY);
             }
         }
@@ -4840,6 +5777,7 @@ ip_init(argc, argv, self)
         ;
     }
 
+    st = ruby_tcl_stubs_init();
     /* from Tcl_AppInit() */
     if (with_tk) {
         DUMP1("Tk_Init");
@@ -4850,10 +5788,10 @@ ip_init(argc, argv, self)
         case NO_Tk_Init:
             rb_raise(rb_eLoadError, "tcltklib: can't find Tk_Init()");
         case FAIL_Tk_Init:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_Init(). %s", 
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_Init(). %s",
                      Tcl_GetStringResult(ptr->ip));
         case FAIL_Tk_InitStubs:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_InitStubs(). %s", 
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_InitStubs(). %s",
                      Tcl_GetStringResult(ptr->ip));
         default:
             rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tk_stubs_init", st);
@@ -4867,6 +5805,10 @@ ip_init(argc, argv, self)
                           (Tcl_PackageInitProc *) NULL);
 #endif
 
+#ifdef RUBY_USE_NATIVE_THREAD
+        /* set Tk thread ID */
+        ptr->tk_thread_id = Tcl_GetCurrentThread();
+#endif
         /* get main window */
         mainWin = Tk_MainWindow(ptr->ip);
         Tk_Preserve((ClientData)mainWin);
@@ -4898,23 +5840,23 @@ ip_init(argc, argv, self)
     /* add 'interp_exit', 'ruby_exit' and replace 'exit' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"interp_exit\")");
-    Tcl_CreateObjCommand(ptr->ip, "interp_exit", ip_InterpExitObjCmd, 
+    Tcl_CreateObjCommand(ptr->ip, "interp_exit", ip_InterpExitObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
     DUMP1("Tcl_CreateObjCommand(\"ruby_exit\")");
-    Tcl_CreateObjCommand(ptr->ip, "ruby_exit", ip_RubyExitObjCmd, 
+    Tcl_CreateObjCommand(ptr->ip, "ruby_exit", ip_RubyExitObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
     DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"ruby_exit\"");
-    Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd, 
+    Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"interp_exit\")");
-    Tcl_CreateCommand(ptr->ip, "interp_exit", ip_InterpExitCommand, 
+    Tcl_CreateCommand(ptr->ip, "interp_exit", ip_InterpExitCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
     DUMP1("Tcl_CreateCommand(\"ruby_exit\")");
-    Tcl_CreateCommand(ptr->ip, "ruby_exit", ip_RubyExitCommand, 
+    Tcl_CreateCommand(ptr->ip, "ruby_exit", ip_RubyExitCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
     DUMP1("Tcl_CreateCommand(\"exit\") --> \"ruby_exit\"");
-    Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand, 
+    Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
@@ -4924,6 +5866,17 @@ ip_init(argc, argv, self)
     /* wrap namespace command */
     ip_wrap_namespace_command(ptr->ip);
 
+    /* define command to replace commands which depend on slave's MainWindow */
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_CreateObjCommand(ptr->ip, "__replace_slave_tk_commands__",
+			 ip_rb_replaceSlaveTkCmdsObjCmd,
+                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    Tcl_CreateCommand(ptr->ip, "__replace_slave_tk_commands__",
+		      ip_rb_replaceSlaveTkCmdsCommand,
+                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
     /* set finalizer */
     Tcl_CallWhenDeleted(ptr->ip, ip_CallWhenDeleted, (ClientData)mainWin);
 
@@ -4942,6 +5895,7 @@ ip_create_slave_core(interp, argc, argv)
 {
     struct tcltkip *master = get_ip(interp);
     struct tcltkip *slave = ALLOC(struct tcltkip);
+    /* struct tcltkip *slave = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
     VALUE safemode;
     VALUE name;
     int safe;
@@ -4950,7 +5904,7 @@ ip_create_slave_core(interp, argc, argv)
 
     /* ip is deleted? */
     if (deleted_ip(master)) {
-        return rb_exc_new2(rb_eRuntimeError, 
+        return rb_exc_new2(rb_eRuntimeError,
                            "deleted master cannot create a new slave");
     }
 
@@ -4984,6 +5938,10 @@ ip_create_slave_core(interp, argc, argv)
 #endif
 
     /* create slave-ip */
+#ifdef RUBY_USE_NATIVE_THREAD
+    /* slave->tk_thread_id = 0; */
+    slave->tk_thread_id = master->tk_thread_id; /* == current thread */
+#endif
     slave->ref_count = 0;
     slave->allow_ruby_exit = 0;
     slave->return_value = 0;
@@ -4991,7 +5949,7 @@ ip_create_slave_core(interp, argc, argv)
     slave->ip = Tcl_CreateSlave(master->ip, StringValuePtr(name), safe);
     if (slave->ip == NULL) {
         rb_thread_critical = thr_crit_bup;
-        return rb_exc_new2(rb_eRuntimeError, 
+        return rb_exc_new2(rb_eRuntimeError,
                            "fail to create the new slave interpreter");
     }
 #if TCL_MAJOR_VERSION >= 8
@@ -5001,18 +5959,18 @@ ip_create_slave_core(interp, argc, argv)
 #endif
     rbtk_preserve_ip(slave);
 
-    slave->has_orig_exit 
+    slave->has_orig_exit
         = Tcl_GetCommandInfo(slave->ip, "exit", &(slave->orig_exit_info));
 
     /* replace 'exit' command --> 'interp_exit' command */
     mainWin = (tk_stubs_init_p())? Tk_MainWindow(slave->ip): (Tk_Window)NULL;
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateObjCommand(slave->ip, "exit", ip_InterpExitObjCmd, 
+    Tcl_CreateObjCommand(slave->ip, "exit", ip_InterpExitObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateCommand(slave->ip, "exit", ip_InterpExitCommand, 
+    Tcl_CreateCommand(slave->ip, "exit", ip_InterpExitCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
@@ -5022,6 +5980,17 @@ ip_create_slave_core(interp, argc, argv)
     /* wrap namespace command */
     ip_wrap_namespace_command(slave->ip);
 
+    /* define command to replace cmds which depend on slave-slave's MainWin */
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_CreateObjCommand(slave->ip, "__replace_slave_tk_commands__",
+			 ip_rb_replaceSlaveTkCmdsObjCmd,
+                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    Tcl_CreateCommand(slave->ip, "__replace_slave_tk_commands__",
+		      ip_rb_replaceSlaveTkCmdsCommand,
+                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
     /* set finalizer */
     Tcl_CallWhenDeleted(slave->ip, ip_CallWhenDeleted, (ClientData)mainWin);
 
@@ -5043,7 +6012,7 @@ ip_create_slave(argc, argv, self)
 
     /* ip is deleted? */
     if (deleted_ip(master)) {
-        rb_raise(rb_eRuntimeError, 
+        rb_raise(rb_eRuntimeError,
                  "deleted master cannot create a new slave interpreter");
     }
 
@@ -5152,7 +6121,7 @@ ip_create_console(self)
     VALUE self;
 {
     struct tcltkip *ptr = get_ip(self);
-    
+
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
         rb_raise(rb_eRuntimeError, "interpreter is deleted");
@@ -5170,16 +6139,16 @@ ip_make_safe_core(interp, argc, argv)
 {
     struct tcltkip *ptr = get_ip(interp);
     Tk_Window mainWin;
-    
+
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
         return rb_exc_new2(rb_eRuntimeError, "interpreter is deleted");
     }
 
     if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
-        /* return rb_exc_new2(rb_eRuntimeError, 
+        /* return rb_exc_new2(rb_eRuntimeError,
                               Tcl_GetStringResult(ptr->ip)); */
-        return create_ip_exc(interp, rb_eRuntimeError, 
+        return create_ip_exc(interp, rb_eRuntimeError,
                              Tcl_GetStringResult(ptr->ip));
     }
 
@@ -5189,11 +6158,11 @@ ip_make_safe_core(interp, argc, argv)
     mainWin = (tk_stubs_init_p())? Tk_MainWindow(ptr->ip): (Tk_Window)NULL;
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd, 
+    Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd,
                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
     DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand, 
+    Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand,
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
@@ -5205,7 +6174,7 @@ ip_make_safe(self)
     VALUE self;
 {
     struct tcltkip *ptr = get_ip(self);
-    
+
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
         rb_raise(rb_eRuntimeError, "interpreter is deleted");
@@ -5220,7 +6189,7 @@ ip_is_safe_p(self)
     VALUE self;
 {
     struct tcltkip *ptr = get_ip(self);
-    
+
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
         rb_raise(rb_eRuntimeError, "interpreter is deleted");
@@ -5239,7 +6208,7 @@ ip_allow_ruby_exit_p(self)
     VALUE self;
 {
     struct tcltkip *ptr = get_ip(self);
-    
+
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
         rb_raise(rb_eRuntimeError, "interpreter is deleted");
@@ -5268,21 +6237,27 @@ ip_allow_ruby_exit_set(self, val)
     }
 
     if (Tcl_IsSafe(ptr->ip)) {
-        rb_raise(rb_eSecurityError, 
+        rb_raise(rb_eSecurityError,
                  "insecure operation on a safe interpreter");
     }
 
+    /*
+     *  Because of cross-threading, the following line may fail to find
+     *  the MainWindow, even if the Tcl/Tk interpreter has one or more.
+     *  But it has no problem. Current implementation of both type of
+     *  the "exit" command don't need maiinWin token.
+     */
     mainWin = (tk_stubs_init_p())? Tk_MainWindow(ptr->ip): (Tk_Window)NULL;
 
     if (RTEST(val)) {
         ptr->allow_ruby_exit = 1;
 #if TCL_MAJOR_VERSION >= 8
         DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"ruby_exit\"");
-        Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd, 
+        Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd,
                              (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
         DUMP1("Tcl_CreateCommand(\"exit\") --> \"ruby_exit\"");
-        Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand, 
+        Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand,
                           (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
         return Qtrue;
@@ -5291,11 +6266,11 @@ ip_allow_ruby_exit_set(self, val)
         ptr->allow_ruby_exit = 0;
 #if TCL_MAJOR_VERSION >= 8
         DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
-        Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd, 
+        Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd,
                              (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #else /* TCL_MAJOR_VERSION < 8 */
         DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
-        Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand, 
+        Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand,
                           (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
         return Qfalse;
@@ -5310,7 +6285,8 @@ ip_delete(self)
     int  thr_crit_bup;
     struct tcltkip *ptr = get_ip(self);
 
-    if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp*)NULL) {
+    /* if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp*)NULL) { */
+    if (deleted_ip(ptr)) {
         DUMP1("delete deleted IP");
         return Qnil;
     }
@@ -5318,12 +6294,14 @@ ip_delete(self)
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
 
-    DUMP1("call ip_finalize");
-    ip_finalize(ptr->ip);
-
     DUMP1("delete interp");
-    Tcl_DeleteInterp(ptr->ip);
-    Tcl_Release(ptr->ip);
+    if (!Tcl_InterpDeleted(ptr->ip)) {
+      DUMP1("call ip_finalize");
+      ip_finalize(ptr->ip);
+
+      Tcl_DeleteInterp(ptr->ip);
+      Tcl_Release(ptr->ip);
+    }
 
     rb_thread_critical = thr_crit_bup;
 
@@ -5368,8 +6346,10 @@ ip_is_deleted_p(self)
 }
 
 static VALUE
-ip_has_mainwindow_p(self)
+ip_has_mainwindow_p_core(self, argc, argv)
     VALUE self;
+    int   argc;   /* dummy */
+    VALUE *argv;  /* dummy */
 {
     struct tcltkip *ptr = get_ip(self);
 
@@ -5382,6 +6362,14 @@ ip_has_mainwindow_p(self)
     }
 }
 
+static VALUE
+ip_has_mainwindow_p(self)
+    VALUE self;
+{
+    return tk_funcall(ip_has_mainwindow_p_core, 0, (VALUE*)NULL, self);
+}
+
+
 /*** ruby string <=> tcl object ***/
 #if TCL_MAJOR_VERSION >= 8
 static VALUE
@@ -5394,18 +6382,41 @@ get_str_from_obj(obj)
 
 #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
     s = Tcl_GetStringFromObj(obj, &len);
-#else /* TCL_VERSION >= 8.1 */
+#else
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 3
+     /* TCL_VERSION 8.1 -- 8.3 */
     if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) {
         /* possibly binary string */
-        s = Tcl_GetByteArrayFromObj(obj, &len);
+        s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
         binary = 1;
     } else {
         /* possibly text string */
         s = Tcl_GetStringFromObj(obj, &len);
     }
+#else /* TCL_VERSION >= 8.4 */
+    if (IS_TCL_BYTEARRAY(obj)) {
+      s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
+      binary = 1;
+    } else {
+      s = Tcl_GetStringFromObj(obj, &len);
+    }
+
+#endif
 #endif
     str = s ? rb_str_new(s, len) : rb_str_new2("");
-    if (binary) rb_ivar_set(str, ID_at_enc, rb_str_new2("binary"));
+    if (binary) {
+#ifdef HAVE_RUBY_ENCODING_H
+      rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
+#endif
+      rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
+    } else {
+#ifdef HAVE_RUBY_ENCODING_H
+      rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
+#endif
+      rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
+#endif
+    }
     return str;
 }
 
@@ -5416,25 +6427,30 @@ get_obj_from_str(str)
     const char *s = StringValuePtr(str);
 
 #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
-    return Tcl_NewStringObj((char*)s, RSTRING(str)->len);
+    return Tcl_NewStringObj((char*)s, RSTRING_LEN(str));
 #else /* TCL_VERSION >= 8.1 */
     VALUE enc = rb_attr_get(str, ID_at_enc);
 
     if (!NIL_P(enc)) {
         StringValue(enc);
-        if (strcmp(RSTRING(enc)->ptr, "binary") == 0) {
+        if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
             /* binary string */
-            return Tcl_NewByteArrayObj(s, RSTRING(str)->len);
+            return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
         } else {
             /* text string */
-            return Tcl_NewStringObj(s, RSTRING(str)->len);
+            return Tcl_NewStringObj(s, RSTRING_LEN(str));
         }
-    } else if (strlen(s) != RSTRING(str)->len) {
+#ifdef HAVE_RUBY_ENCODING_H
+    } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
+        /* binary string */
+        return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
+#endif
+    } else if (memchr(s, 0, RSTRING_LEN(str))) {
         /* probably binary string */
-        return Tcl_NewByteArrayObj(s, RSTRING(str)->len);
+        return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
     } else {
         /* probably text string */
-        return Tcl_NewStringObj(s, RSTRING(str)->len);
+        return Tcl_NewStringObj(s, RSTRING_LEN(str));
     }
 #endif
 }
@@ -5451,7 +6467,8 @@ ip_get_result_string_obj(interp)
     retObj = Tcl_GetObjResult(interp);
     Tcl_IncrRefCount(retObj);
     strval = get_str_from_obj(retObj);
-    OBJ_TAINT(strval);
+    RbTk_OBJ_UNTRUST(strval);
+    Tcl_ResetResult(interp);
     Tcl_DecrRefCount(retObj);
     return strval;
 #else
@@ -5482,11 +6499,12 @@ call_queue_handler(evPtr, flags)
     struct call_queue *q = (struct call_queue *)evPtr;
     volatile VALUE ret;
     volatile VALUE q_dat;
+    volatile VALUE thread = q->thread;
     struct tcltkip *ptr;
 
     DUMP2("do_call_queue_handler : evPtr = %p", evPtr);
-    DUMP2("queue_handler thread : %lx", rb_thread_current());
-    DUMP2("added by thread : %lx", q->thread);
+    DUMP2("call_queue_handler thread : %lx", rb_thread_current());
+    DUMP2("added by thread : %lx", thread);
 
     if (*(q->done)) {
         DUMP1("processed by another event-loop");
@@ -5495,6 +6513,17 @@ call_queue_handler(evPtr, flags)
         DUMP1("process it on current event-loop");
     }
 
+#ifdef RUBY_VM
+    if (RTEST(rb_funcall(thread, ID_alive_p, 0))
+	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
+#else
+    if (RTEST(rb_thread_alive_p(thread))
+	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
+#endif
+      DUMP1("caller is not yet ready to receive the result -> pending");
+      return 0;
+    }
+
     /* process it */
     *(q->done) = 1;
 
@@ -5505,33 +6534,59 @@ call_queue_handler(evPtr, flags)
         return 1;
     }
 
+    /* incr internal handler mark */
+    rbtk_internal_eventloop_handler++;
+
     /* check safe-level */
     if (rb_safe_level() != q->safe_level) {
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
-        q_dat = Data_Wrap_Struct(rb_cData,call_queue_mark,0,q);
-        ret = rb_funcall(rb_proc_new(callq_safelevel_handler, q_dat), 
+        /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
+        q_dat = Data_Wrap_Struct(rb_cData,call_queue_mark,-1,q);
+        ret = rb_funcall(rb_proc_new(callq_safelevel_handler, q_dat),
                          ID_call, 0);
         rb_gc_force_recycle(q_dat);
+	q_dat = (VALUE)NULL;
     } else {
-        DUMP2("call function (for caller thread:%lx)", q->thread);
+        DUMP2("call function (for caller thread:%lx)", thread);
         DUMP2("call function (current thread:%lx)", rb_thread_current());
         ret = (q->func)(q->interp, q->argc, q->argv);
     }
 
     /* set result */
-    RARRAY(q->result)->ptr[0] = ret;
+    RARRAY_PTR(q->result)[0] = ret;
+    ret = (VALUE)NULL;
+
+    /* decr internal handler mark */
+    rbtk_internal_eventloop_handler--;
 
     /* complete */
     *(q->done) = -1;
 
+    /* unlink ruby objects */
+    q->argv = (VALUE*)NULL;
+    q->interp = (VALUE)NULL;
+    q->result = (VALUE)NULL;
+    q->thread = (VALUE)NULL;
+
     /* back to caller */
-    if (RTEST(rb_funcall(q->thread, ID_alive_p, 0, 0))) {
-      DUMP2("back to caller (caller thread:%lx)", q->thread);
+#ifdef RUBY_VM
+    if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
+#else
+    if (RTEST(rb_thread_alive_p(thread))) {
+#endif
+      DUMP2("back to caller (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
-      rb_thread_run(q->thread);
+#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
+      have_rb_thread_waiting_for_value = 1;
+      rb_thread_wakeup(thread);
+#else
+      rb_thread_run(thread);
+#endif
       DUMP1("finish back to caller");
+#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
+      rb_thread_schedule();
+#endif
     } else {
-      DUMP2("caller is dead (caller thread:%lx)", q->thread);
+      DUMP2("caller is dead (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
     }
 
@@ -5547,19 +6602,40 @@ tk_funcall(func, argc, argv, obj)
     VALUE obj;
 {
     struct call_queue *callq;
+    struct tcltkip *ptr;
     int  *alloc_done;
     int  thr_crit_bup;
+    int  is_tk_evloop_thread;
     volatile VALUE current = rb_thread_current();
     volatile VALUE ip_obj = obj;
     volatile VALUE result;
     volatile VALUE ret;
+    struct timeval t;
 
+    if (!NIL_P(ip_obj) && rb_obj_is_kind_of(ip_obj, tcltkip_class)) {
+        ptr = get_ip(ip_obj);
+        if (deleted_ip(ptr)) return Qnil;
+    } else {
+        ptr = (struct tcltkip *)NULL;
+    }
 
-    if (!NIL_P(ip_obj) && deleted_ip(get_ip(ip_obj))) {
-        return Qnil;
+#ifdef RUBY_USE_NATIVE_THREAD
+    if (ptr) {
+      /* on Tcl interpreter */
+      is_tk_evloop_thread = (ptr->tk_thread_id == (Tcl_ThreadId) 0
+			     || ptr->tk_thread_id == Tcl_GetCurrentThread());
+    } else {
+      /* on Tcl/Tk library */
+      is_tk_evloop_thread = (tk_eventloop_thread_id == (Tcl_ThreadId) 0
+			     || tk_eventloop_thread_id == Tcl_GetCurrentThread());
     }
+#else
+    is_tk_evloop_thread = 1;
+#endif
 
-    if (NIL_P(eventloop_thread) || current == eventloop_thread) {
+    if (is_tk_evloop_thread
+	&& (NIL_P(eventloop_thread) || current == eventloop_thread)
+        ) {
         if (NIL_P(eventloop_thread)) {
             DUMP2("tk_funcall from thread:%lx but no eventloop", current);
         } else {
@@ -5579,23 +6655,32 @@ tk_funcall(func, argc, argv, obj)
 
     /* allocate memory (argv cross over thread : must be in heap) */
     if (argv) {
-        VALUE *temp = ALLOC_N(VALUE, argc);
+        /* VALUE *temp = ALLOC_N(VALUE, argc); */
+        VALUE *temp = (VALUE*)ckalloc(sizeof(VALUE) * argc);
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Preserve((ClientData)temp); /* XXXXXXXX */
+#endif
         MEMCPY(temp, argv, VALUE, argc);
         argv = temp;
     }
 
     /* allocate memory (keep result) */
-    alloc_done = (int*)ALLOC(int);
+    /* alloc_done = (int*)ALLOC(int); */
+    alloc_done = (int*)ckalloc(sizeof(int));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
+#endif
     *alloc_done = 0;
 
     /* allocate memory (freed by Tcl_ServiceEvent) */
-    callq = (struct call_queue *)Tcl_Alloc(sizeof(struct call_queue));
+    /* callq = (struct call_queue *)Tcl_Alloc(sizeof(struct call_queue)); */
+    callq = (struct call_queue *)ckalloc(sizeof(struct call_queue));
+#if 0 /* use Tcl_Preserve/Release */
     Tcl_Preserve(callq);
+#endif
 
     /* allocate result obj */
-    result = rb_ary_new2(1);
-    RARRAY(result)->ptr[0] = Qnil;
-    RARRAY(result)->len = 1;
+    result = rb_ary_new3(1, Qnil);
 
     /* construct event data */
     callq->done = alloc_done;
@@ -5610,28 +6695,92 @@ tk_funcall(func, argc, argv, obj)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-    Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD);
+#ifdef RUBY_USE_NATIVE_THREAD
+    if (ptr && ptr->tk_thread_id) {
+      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id,
+			   &(callq->ev), TCL_QUEUE_HEAD); */
+      Tcl_ThreadQueueEvent(ptr->tk_thread_id,
+			   (Tcl_Event*)callq, TCL_QUEUE_HEAD);
+      Tcl_ThreadAlert(ptr->tk_thread_id);
+    } else if (tk_eventloop_thread_id) {
+      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
+			   &(callq->ev), TCL_QUEUE_HEAD); */
+      Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
+			   (Tcl_Event*)callq, TCL_QUEUE_HEAD);
+      Tcl_ThreadAlert(tk_eventloop_thread_id);
+    } else {
+      /* Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD); */
+      Tcl_QueueEvent((Tcl_Event*)callq, TCL_QUEUE_HEAD);
+    }
+#else
+    /* Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD); */
+    Tcl_QueueEvent((Tcl_Event*)callq, TCL_QUEUE_HEAD);
+#endif
 
     rb_thread_critical = thr_crit_bup;
 
     /* wait for the handler to be processed */
-    DUMP2("wait for handler (current thread:%lx)", current);
+    t.tv_sec  = 0;
+    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
+    DUMP2("callq wait for handler (current thread:%lx)", current);
     while(*alloc_done >= 0) {
-        rb_thread_stop();
+      DUMP2("*** callq wait for handler (current thread:%lx)", current);
+      /* rb_thread_stop(); */
+      /* rb_thread_sleep_forever(); */
+      rb_thread_wait_for(t);
+      DUMP2("*** callq wakeup (current thread:%lx)", current);
+      DUMP2("***            (eventloop thread:%lx)", eventloop_thread);
+      if (NIL_P(eventloop_thread)) {
+	DUMP1("*** callq lost eventloop thread");
+	break;
+      }
     }
     DUMP2("back from handler (current thread:%lx)", current);
 
     /* get result & free allocated memory */
-    ret = RARRAY(result)->ptr[0];
-    free(alloc_done);
-    if (argv) free(argv);
+    ret = RARRAY_PTR(result)[0];
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
+#else
+    /* free(alloc_done); */
+    ckfree((char*)alloc_done);
+#endif
+#endif
+    /* if (argv) free(argv); */
+    if (argv) {
+      /* if argv != NULL, alloc as 'temp' */
+      int i;
+      for(i = 0; i < argc; i++) { argv[i] = (VALUE)NULL; }
 
+#if 0 /* use Tcl_EventuallyFree */
+      Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+      Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+      ckfree((char*)argv);
+#endif
+#endif
+    }
+
+#if 0 /* callq is freed by Tcl_ServiceEvent */
+#if 0 /* use Tcl_Preserve/Release */
     Tcl_Release(callq);
+#else
+    ckfree((char*)callq);
+#endif
+#endif
 
     /* exception? */
     if (rb_obj_is_kind_of(ret, rb_eException)) {
         DUMP1("raise exception");
-        rb_exc_raise(ret);
+        /* rb_exc_raise(ret); */
+	rb_exc_raise(rb_exc_new3(rb_obj_class(ret),
+				 rb_funcall(ret, ID_to_s, 0, 0)));
     }
 
     DUMP1("exit tk_funcall");
@@ -5647,8 +6796,12 @@ struct call_eval_info {
 };
 
 static VALUE
+#ifdef HAVE_PROTOTYPES
+call_tcl_eval(VALUE arg)
+#else
 call_tcl_eval(arg)
     VALUE arg;
+#endif
 {
     struct call_eval_info *inf = (struct call_eval_info *)arg;
 
@@ -5702,19 +6855,19 @@ ip_eval_real(self, cmd_str, cmd_len)
           ret = rb_protect(call_tcl_eval, (VALUE)&inf, &status);
           switch(status) {
           case TAG_RAISE:
-              if (NIL_P(ruby_errinfo)) {
-                  rbtk_pending_exception = rb_exc_new2(rb_eException, 
+              if (NIL_P(rb_errinfo())) {
+                  rbtk_pending_exception = rb_exc_new2(rb_eException,
                                                        "unknown exception");
               } else {
-                  rbtk_pending_exception = ruby_errinfo;
+                  rbtk_pending_exception = rb_errinfo();
               }
               break;
 
           case TAG_FATAL:
-              if (NIL_P(ruby_errinfo)) {
+              if (NIL_P(rb_errinfo())) {
                   rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
               } else {
-                  rbtk_pending_exception = ruby_errinfo;
+                  rbtk_pending_exception = rb_errinfo();
               }
           }
 #endif
@@ -5729,11 +6882,26 @@ ip_eval_real(self, cmd_str, cmd_len)
         return rbtk_pending_exception;
     }
 
-    if (ptr->return_value == TCL_ERROR) {
+    /* if (ptr->return_value == TCL_ERROR) { */
+    if (ptr->return_value != TCL_OK) {
         if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
             volatile VALUE exc;
-            exc = create_ip_exc(self, rb_eRuntimeError, 
-                                "%s", Tcl_GetStringResult(ptr->ip));
+
+	    switch (ptr->return_value) {
+	    case TCL_RETURN:
+	      exc = create_ip_exc(self, eTkCallbackReturn,
+				  "ip_eval_real receives TCL_RETURN");
+	    case TCL_BREAK:
+	      exc = create_ip_exc(self, eTkCallbackBreak,
+				  "ip_eval_real receives TCL_BREAK");
+	    case TCL_CONTINUE:
+	      exc = create_ip_exc(self, eTkCallbackContinue,
+				  "ip_eval_real receives TCL_CONTINUE");
+	    default:
+	      exc = create_ip_exc(self, rb_eRuntimeError, "%s",
+				  Tcl_GetStringResult(ptr->ip));
+	    }
+
             rbtk_release_ip(ptr);
             rb_thread_critical = thr_crit_bup;
             return exc;
@@ -5775,10 +6943,23 @@ ip_eval_real(self, cmd_str, cmd_len)
         return rbtk_pending_exception;
     }
 
-    if (ptr->return_value == TCL_ERROR) {
+    /* if (ptr->return_value == TCL_ERROR) { */
+    if (ptr->return_value != TCL_OK) {
         volatile VALUE exc;
 
-        exc = create_ip_exc(self, rb_eRuntimeError, "%s", ptr->ip->result);
+	switch (ptr->return_value) {
+	case TCL_RETURN:
+	  exc = create_ip_exc(self, eTkCallbackReturn,
+			      "ip_eval_real receives TCL_RETURN");
+	case TCL_BREAK:
+	  exc = create_ip_exc(self, eTkCallbackBreak,
+			      "ip_eval_real receives TCL_BREAK");
+	case TCL_CONTINUE:
+	  exc = create_ip_exc(self, eTkCallbackContinue,
+			       "ip_eval_real receives TCL_CONTINUE");
+	default:
+	  exc = create_ip_exc(self, rb_eRuntimeError, "%s", ptr->ip->result);
+	}
 
         rbtk_release_ip(ptr);
         return exc;
@@ -5814,6 +6995,12 @@ eval_queue_handler(evPtr, flags)
     struct eval_queue *q = (struct eval_queue *)evPtr;
     volatile VALUE ret;
     volatile VALUE q_dat;
+    volatile VALUE thread = q->thread;
+    struct tcltkip *ptr;
+
+    DUMP2("do_eval_queue_handler : evPtr = %p", evPtr);
+    DUMP2("eval_queue_thread : %lx", rb_thread_current());
+    DUMP2("added by thread : %lx", thread);
 
     if (*(q->done)) {
         DUMP1("processed by another event-loop");
@@ -5822,39 +7009,84 @@ eval_queue_handler(evPtr, flags)
         DUMP1("process it on current event-loop");
     }
 
+#ifdef RUBY_VM
+    if (RTEST(rb_funcall(thread, ID_alive_p, 0))
+	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
+#else
+    if (RTEST(rb_thread_alive_p(thread))
+	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
+#endif
+      DUMP1("caller is not yet ready to receive the result -> pending");
+      return 0;
+    }
+
     /* process it */
     *(q->done) = 1;
 
+    /* deleted ipterp ? */
+    ptr = get_ip(q->interp);
+    if (deleted_ip(ptr)) {
+        /* deleted IP --> ignore */
+        return 1;
+    }
+
+    /* incr internal handler mark */
+    rbtk_internal_eventloop_handler++;
+
     /* check safe-level */
     if (rb_safe_level() != q->safe_level) {
 #ifdef HAVE_NATIVETHREAD
-        if (!is_ruby_native_thread()) {
-            rb_bug("cross-thread violation on eval_queue_handler()");
-        }
+#ifndef RUBY_USE_NATIVE_THREAD
+    if (!ruby_native_thread_p()) {
+      rb_bug("cross-thread violation on eval_queue_handler()");
+    }
 #endif
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
-        q_dat = Data_Wrap_Struct(rb_cData,eval_queue_mark,0,q);
-        ret = rb_funcall(rb_proc_new(evq_safelevel_handler, q_dat), 
+#endif
+        /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
+        q_dat = Data_Wrap_Struct(rb_cData,eval_queue_mark,-1,q);
+        ret = rb_funcall(rb_proc_new(evq_safelevel_handler, q_dat),
                          ID_call, 0);
         rb_gc_force_recycle(q_dat);
+	q_dat = (VALUE)NULL;
     } else {
         ret = ip_eval_real(q->interp, q->str, q->len);
     }
 
     /* set result */
-    RARRAY(q->result)->ptr[0] = ret;
+    RARRAY_PTR(q->result)[0] = ret;
+    ret = (VALUE)NULL;
+
+    /* decr internal handler mark */
+    rbtk_internal_eventloop_handler--;
 
     /* complete */
     *(q->done) = -1;
 
+    /* unlink ruby objects */
+    q->interp = (VALUE)NULL;
+    q->result = (VALUE)NULL;
+    q->thread = (VALUE)NULL;
+
     /* back to caller */
-    if (RTEST(rb_funcall(q->thread, ID_alive_p, 0, 0))) {
-      DUMP2("back to caller (caller thread:%lx)", q->thread);
+#ifdef RUBY_VM
+    if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
+#else
+    if (RTEST(rb_thread_alive_p(thread))) {
+#endif
+      DUMP2("back to caller (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
-      rb_thread_run(q->thread);
+#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
+      have_rb_thread_waiting_for_value = 1;
+      rb_thread_wakeup(thread);
+#else
+      rb_thread_run(thread);
+#endif
       DUMP1("finish back to caller");
+#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
+      rb_thread_schedule();
+#endif
     } else {
-      DUMP2("caller is dead (caller thread:%lx)", q->thread);
+      DUMP2("caller is dead (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
     }
 
@@ -5868,6 +7100,9 @@ ip_eval(self, str)
     VALUE str;
 {
     struct eval_queue *evq;
+#ifdef RUBY_USE_NATIVE_THREAD
+    struct tcltkip *ptr;
+#endif
     char *eval_str;
     int  *alloc_done;
     int  thr_crit_bup;
@@ -5876,19 +7111,35 @@ ip_eval(self, str)
     volatile VALUE result;
     volatile VALUE ret;
     Tcl_QueuePosition position;
+    struct timeval t;
 
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
     StringValue(str);
     rb_thread_critical = thr_crit_bup;
 
-    if (NIL_P(eventloop_thread) || current == eventloop_thread) {
+#ifdef RUBY_USE_NATIVE_THREAD
+    ptr = get_ip(ip_obj);
+    DUMP2("eval status: ptr->tk_thread_id %p", ptr->tk_thread_id);
+    DUMP2("eval status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
+#else
+    DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
+#endif
+    DUMP2("status: eventloopt_thread %lx", eventloop_thread);
+
+    if (
+#ifdef RUBY_USE_NATIVE_THREAD
+	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
+	&&
+#endif
+	(NIL_P(eventloop_thread) || current == eventloop_thread)
+	) {
         if (NIL_P(eventloop_thread)) {
             DUMP2("eval from thread:%lx but no eventloop", current);
         } else {
             DUMP2("eval from current eventloop %lx", current);
         }
-        result = ip_eval_real(self, RSTRING(str)->ptr, RSTRING(str)->len);
+        result = ip_eval_real(self, RSTRING_PTR(str), RSTRING_LEN(str));
         if (rb_obj_is_kind_of(result, rb_eException)) {
             rb_exc_raise(result);
         }
@@ -5900,27 +7151,36 @@ ip_eval(self, str)
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
 
-    /* allocate memory (protected from Tcl_ServiceEvent) */
-    alloc_done = (int*)ALLOC(int);
+    /* allocate memory (keep result) */
+    /* alloc_done = (int*)ALLOC(int); */
+    alloc_done = (int*)ckalloc(sizeof(int));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
+#endif
     *alloc_done = 0;
 
-    eval_str = ALLOC_N(char, RSTRING(str)->len + 1);
-    memcpy(eval_str, RSTRING(str)->ptr, RSTRING(str)->len);
-    eval_str[RSTRING(str)->len] = 0;
+    /* eval_str = ALLOC_N(char, RSTRING_LEN(str) + 1); */
+    eval_str = ckalloc(sizeof(char) * (RSTRING_LEN(str) + 1));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)eval_str); /* XXXXXXXX */
+#endif
+    memcpy(eval_str, RSTRING_PTR(str), RSTRING_LEN(str));
+    eval_str[RSTRING_LEN(str)] = 0;
 
     /* allocate memory (freed by Tcl_ServiceEvent) */
-    evq = (struct eval_queue *)Tcl_Alloc(sizeof(struct eval_queue));
+    /* evq = (struct eval_queue *)Tcl_Alloc(sizeof(struct eval_queue)); */
+    evq = (struct eval_queue *)ckalloc(sizeof(struct eval_queue));
+#if 0 /* use Tcl_Preserve/Release */
     Tcl_Preserve(evq);
+#endif
 
     /* allocate result obj */
-    result = rb_ary_new2(1);
-    RARRAY(result)->ptr[0] = Qnil;
-    RARRAY(result)->len = 1;
+    result = rb_ary_new3(1, Qnil);
 
     /* construct event data */
     evq->done = alloc_done;
     evq->str = eval_str;
-    evq->len = RSTRING(str)->len;
+    evq->len = RSTRING_LEN(str);
     evq->interp = ip_obj;
     evq->result = result;
     evq->thread = current;
@@ -5931,32 +7191,153 @@ ip_eval(self, str)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-    Tcl_QueueEvent(&(evq->ev), position);
+#ifdef RUBY_USE_NATIVE_THREAD
+    if (ptr->tk_thread_id) {
+      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(evq->ev), position); */
+      Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)evq, position);
+      Tcl_ThreadAlert(ptr->tk_thread_id);
+    } else if (tk_eventloop_thread_id) {
+      Tcl_ThreadQueueEvent(tk_eventloop_thread_id, (Tcl_Event*)evq, position);
+      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
+			   &(evq->ev), position); */
+      Tcl_ThreadAlert(tk_eventloop_thread_id);
+    } else {
+      /* Tcl_QueueEvent(&(evq->ev), position); */
+      Tcl_QueueEvent((Tcl_Event*)evq, position);
+    }
+#else
+    /* Tcl_QueueEvent(&(evq->ev), position); */
+    Tcl_QueueEvent((Tcl_Event*)evq, position);
+#endif
 
     rb_thread_critical = thr_crit_bup;
 
     /* wait for the handler to be processed */
-    DUMP2("wait for handler (current thread:%lx)", current);
+    t.tv_sec  = 0;
+    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
+    DUMP2("evq wait for handler (current thread:%lx)", current);
     while(*alloc_done >= 0) {
-        rb_thread_stop();
+      DUMP2("*** evq wait for handler (current thread:%lx)", current);
+      /* rb_thread_stop(); */
+      /* rb_thread_sleep_forever(); */
+      rb_thread_wait_for(t);
+      DUMP2("*** evq wakeup (current thread:%lx)", current);
+      DUMP2("***          (eventloop thread:%lx)", eventloop_thread);
+      if (NIL_P(eventloop_thread)) {
+	DUMP1("*** evq lost eventloop thread");
+	break;
+      }
     }
     DUMP2("back from handler (current thread:%lx)", current);
 
     /* get result & free allocated memory */
-    ret = RARRAY(result)->ptr[0];
+    ret = RARRAY_PTR(result)[0];
 
-    free(alloc_done);
-    free(eval_str);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
+#else
+    /* free(alloc_done); */
+    ckfree((char*)alloc_done);
+#endif
+#endif
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)eval_str, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)eval_str); /* XXXXXXXX */
+#else
+    /* free(eval_str); */
+    ckfree(eval_str);
+#endif
+#endif
+#if 0 /* evq is freed by Tcl_ServiceEvent */
+#if 0 /* use Tcl_Preserve/Release */
     Tcl_Release(evq);
+#else
+    ckfree((char*)evq);
+#endif
+#endif
 
     if (rb_obj_is_kind_of(ret, rb_eException)) {
-        rb_exc_raise(ret);
+        DUMP1("raise exception");
+        /* rb_exc_raise(ret); */
+	rb_exc_raise(rb_exc_new3(rb_obj_class(ret),
+				 rb_funcall(ret, ID_to_s, 0, 0)));
     }
 
     return ret;
 }
 
 
+static int
+ip_cancel_eval_core(interp, msg, flag)
+    Tcl_Interp *interp;
+    VALUE msg;
+    int flag;
+{
+#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 6)
+    rb_raise(rb_eNotImpError,
+	     "cancel_eval is supported Tcl/Tk8.6 or later.");
+#else
+    Tcl_Obj *msg_obj;
+
+    if (NIL_P(msg)) {
+      msg_obj = NULL;
+    } else {
+      msg_obj = Tcl_NewStringObj(RSTRING_PTR(msg), RSTRING_LEN(msg));
+      Tcl_IncrRefCount(msg_obj);
+    }
+
+    return Tcl_CancelEval(interp, msg_obj, 0, flag);
+#endif
+}
+
+static VALUE
+ip_cancel_eval(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE retval;
+
+    if (rb_scan_args(argc, argv, "01", &retval) == 0) {
+        retval = Qnil;
+    }
+    if (ip_cancel_eval_core(get_ip(self)->ip, retval, 0) == TCL_OK) {
+      return Qtrue;
+    } else {
+      return Qfalse;
+    }
+}
+
+#ifndef TCL_CANCEL_UNWIND
+#define TCL_CANCEL_UNWIND 0x100000
+#endif
+static VALUE
+ip_cancel_eval_unwind(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    int flag = 0;
+    VALUE retval;
+
+    if (rb_scan_args(argc, argv, "01", &retval) == 0) {
+        retval = Qnil;
+    }
+
+    flag |= TCL_CANCEL_UNWIND;
+    if (ip_cancel_eval_core(get_ip(self)->ip, retval, flag) == TCL_OK) {
+      return Qtrue;
+    } else {
+      return Qfalse;
+    }
+}
+
 /* restart Tk */
 static VALUE
 lib_restart_core(interp, argc, argv)
@@ -6105,7 +7486,12 @@ lib_toUTF8_core(ip_obj, src, encodename)
     if (NIL_P(encodename)) {
         if (TYPE(str) == T_STRING) {
             volatile VALUE enc;
+
+#ifdef HAVE_RUBY_ENCODING_H
+            enc = rb_funcall(rb_obj_encoding(str), ID_to_s, 0, 0);
+#else
             enc = rb_attr_get(str, ID_at_enc);
+#endif
             if (NIL_P(enc)) {
                 if (NIL_P(ip_obj)) {
                     encoding = (Tcl_Encoding)NULL;
@@ -6114,22 +7500,35 @@ lib_toUTF8_core(ip_obj, src, encodename)
                     if (NIL_P(enc)) {
                         encoding = (Tcl_Encoding)NULL;
                     } else {
-                        StringValue(enc);
-                        encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
-                        if (encoding == (Tcl_Encoding)NULL) {
-                            rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING(enc)->ptr);
-                        }
+                        /* StringValue(enc); */
+                        enc = rb_funcall(enc, ID_to_s, 0, 0);
+                        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
+			if (!RSTRING_LEN(enc)) {
+			  encoding = (Tcl_Encoding)NULL;
+			} else {
+			  encoding = Tcl_GetEncoding((Tcl_Interp*)NULL,
+						     RSTRING_PTR(enc));
+			  if (encoding == (Tcl_Encoding)NULL) {
+                            rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
+			  }
+			}
                     }
                 }
             } else {
                 StringValue(enc);
-                if (strcmp(RSTRING(enc)->ptr, "binary") == 0) {
+                if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
+#ifdef HAVE_RUBY_ENCODING_H
+		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
+#endif
+		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
                     rb_thread_critical = thr_crit_bup;
                     return str;
                 }
-                encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+                /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
+                encoding = Tcl_GetEncoding((Tcl_Interp*)NULL,
+					   RSTRING_PTR(enc));
                 if (encoding == (Tcl_Encoding)NULL) {
-                    rb_warning("string has unknown encoding information (@encoding:'%s')", RSTRING(enc)->ptr);
+                    rb_warning("string has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
                 }
             }
         } else {
@@ -6137,43 +7536,59 @@ lib_toUTF8_core(ip_obj, src, encodename)
         }
     } else {
         StringValue(encodename);
-        encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr);
+	if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
+#ifdef HAVE_RUBY_ENCODING_H
+	  rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
+#endif
+	  rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
+	  rb_thread_critical = thr_crit_bup;
+	  return str;
+	}
+        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(encodename)); */
+        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(encodename));
         if (encoding == (Tcl_Encoding)NULL) {
             /*
-            rb_warning("unknown encoding name '%s'", 
-                       RSTRING(encodename)->ptr);
+            rb_warning("unknown encoding name '%s'",
+                       RSTRING_PTR(encodename));
             */
-            rb_raise(rb_eArgError, "unknown encoding name '%s'", 
-                     RSTRING(encodename)->ptr);
+            rb_raise(rb_eArgError, "unknown encoding name '%s'",
+                     RSTRING_PTR(encodename));
         }
     }
 
     StringValue(str);
-    if (!RSTRING(str)->len) {
+    if (!RSTRING_LEN(str)) {
         rb_thread_critical = thr_crit_bup;
         return str;
     }
-    buf = ALLOC_N(char,(RSTRING(str)->len)+1);
-    memcpy(buf, RSTRING(str)->ptr, RSTRING(str)->len);
-    buf[RSTRING(str)->len] = 0;
+    buf = ALLOC_N(char, RSTRING_LEN(str)+1);
+    /* buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1)); */
+    memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
+    buf[RSTRING_LEN(str)] = 0;
 
     Tcl_DStringInit(&dstr);
     Tcl_DStringFree(&dstr);
     /* Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr); */
-    Tcl_ExternalToUtfDString(encoding, buf, RSTRING(str)->len, &dstr);
+    Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LEN(str), &dstr);
 
     /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-    rb_ivar_set(str, ID_at_enc, rb_tainted_str_new2("utf-8"));
-    if (taint_flag) OBJ_TAINT(str);
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
+#endif
+    if (taint_flag) RbTk_OBJ_UNTRUST(str);
+    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
 
+    /*
     if (encoding != (Tcl_Encoding)NULL) {
         Tcl_FreeEncoding(encoding);
     }
+    */
     Tcl_DStringFree(&dstr);
 
-    free(buf);
+    xfree(buf);
+    /* ckfree(buf); */
 
     rb_thread_critical = thr_crit_bup;
 #endif
@@ -6251,10 +7666,21 @@ lib_fromUTF8_core(ip_obj, src, encodename)
             enc = rb_attr_get(str, ID_at_enc);
             if (!NIL_P(enc)) {
                 StringValue(enc);
-                if (strcmp(RSTRING(enc)->ptr, "binary") == 0) {
+                if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
+#ifdef HAVE_RUBY_ENCODING_H
+		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
+#endif
+		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
                     rb_thread_critical = thr_crit_bup;
                     return str;
                 }
+#ifdef HAVE_RUBY_ENCODING_H
+	    } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
+	        rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
+		rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
+		rb_thread_critical = thr_crit_bup;
+		return str;
+#endif
             }
         }
 
@@ -6265,75 +7691,106 @@ lib_fromUTF8_core(ip_obj, src, encodename)
             if (NIL_P(enc)) {
                 encoding = (Tcl_Encoding)NULL;
             } else {
-                StringValue(enc);
-                encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
-                if (encoding == (Tcl_Encoding)NULL) {
-                    rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING(enc)->ptr);
-                } else {
-                  encodename = rb_obj_dup(enc);
-                }
+                /* StringValue(enc); */
+                enc = rb_funcall(enc, ID_to_s, 0, 0);
+                /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
+		if (!RSTRING_LEN(enc)) {
+		  encoding = (Tcl_Encoding)NULL;
+		} else {
+		  encoding = Tcl_GetEncoding((Tcl_Interp*)NULL,
+					     RSTRING_PTR(enc));
+		  if (encoding == (Tcl_Encoding)NULL) {
+                    rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
+		  } else {
+		    encodename = rb_obj_dup(enc);
+		  }
+		}
             }
         }
 
     } else {
         StringValue(encodename);
 
-        if (strcmp(RSTRING(encodename)->ptr, "binary") == 0) {
+        if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
+	    Tcl_Obj *tclstr;
             char *s;
             int  len;
 
             StringValue(str);
-            s = Tcl_GetByteArrayFromObj(Tcl_NewStringObj(RSTRING(str)->ptr, 
-                                                         RSTRING(str)->len), 
-                                        &len);
+            tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LEN(str));
+	    Tcl_IncrRefCount(tclstr);
+            s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len);
             str = rb_tainted_str_new(s, len);
-            rb_ivar_set(str, ID_at_enc, rb_tainted_str_new2("binary"));
+	    s = (char*)NULL;
+	    Tcl_DecrRefCount(tclstr);
+#ifdef HAVE_RUBY_ENCODING_H
+	    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
+#endif
+            rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
 
             rb_thread_critical = thr_crit_bup;
             return str;
         }
 
-        encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr);
+        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(encodename)); */
+        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(encodename));
         if (encoding == (Tcl_Encoding)NULL) {
-            /* 
-            rb_warning("unknown encoding name '%s'", 
-                       RSTRING(encodename)->ptr);
+            /*
+            rb_warning("unknown encoding name '%s'",
+                       RSTRING_PTR(encodename));
             encodename = Qnil;
             */
-            rb_raise(rb_eArgError, "unknown encoding name '%s'", 
-                     RSTRING(encodename)->ptr);
+            rb_raise(rb_eArgError, "unknown encoding name '%s'",
+                     RSTRING_PTR(encodename));
         }
     }
 
     StringValue(str);
 
-    if (RSTRING(str)->len == 0) {
+    if (RSTRING_LEN(str) == 0) {
         rb_thread_critical = thr_crit_bup;
         return rb_tainted_str_new2("");
     }
 
-    buf = ALLOC_N(char,strlen(RSTRING(str)->ptr)+1);
-    memcpy(buf, RSTRING(str)->ptr, RSTRING(str)->len);
-    buf[RSTRING(str)->len] = 0;
+    buf = ALLOC_N(char, RSTRING_LEN(str)+1);
+    /* buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1)); */
+    memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
+    buf[RSTRING_LEN(str)] = 0;
 
     Tcl_DStringInit(&dstr);
     Tcl_DStringFree(&dstr);
     /* Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr); */
-    Tcl_UtfToExternalDString(encoding,buf,RSTRING(str)->len,&dstr);
+    Tcl_UtfToExternalDString(encoding,buf,RSTRING_LEN(str),&dstr);
 
     /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-    rb_ivar_set(str, ID_at_enc, encodename);
+#ifdef HAVE_RUBY_ENCODING_H
+    if (interp) {
+      /* can access encoding_table of TclTkIp */
+      /*   ->  try to use encoding_table      */
+      VALUE tbl = ip_get_encoding_table(ip_obj);
+      VALUE encobj = encoding_table_get_obj(tbl, encodename);
+      rb_enc_associate_index(str, rb_to_encoding_index(encobj));
+    } else {
+      /* cannot access encoding_table of TclTkIp */
+      /*   ->  try to find on Ruby Encoding      */
+      rb_enc_associate_index(str, rb_enc_find_index(RSTRING_PTR(encodename)));
+    }
+#endif
 
-    if (taint_flag) OBJ_TAINT(str);
+    if (taint_flag) RbTk_OBJ_UNTRUST(str);
+    rb_ivar_set(str, ID_at_enc, encodename);
 
+    /*
     if (encoding != (Tcl_Encoding)NULL) {
         Tcl_FreeEncoding(encoding);
     }
+    */
     Tcl_DStringFree(&dstr);
 
-    free(buf);
+    xfree(buf);
+    /* ckfree(buf); */
 
     rb_thread_critical = thr_crit_bup;
 #endif
@@ -6384,21 +7841,29 @@ lib_UTF_backslash_core(self, str, all_bs)
     tcl_stubs_check();
 
     StringValue(str);
-    if (!RSTRING(str)->len) {
+    if (!RSTRING_LEN(str)) {
         return str;
     }
 
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
 
-    src_buf = ALLOC_N(char,(RSTRING(str)->len)+1);
-    memcpy(src_buf, RSTRING(str)->ptr, RSTRING(str)->len);
-    src_buf[RSTRING(str)->len] = 0;
+    /* src_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
+    src_buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)src_buf); /* XXXXXXXX */
+#endif
+    memcpy(src_buf, RSTRING_PTR(str), RSTRING_LEN(str));
+    src_buf[RSTRING_LEN(str)] = 0;
 
-    dst_buf = ALLOC_N(char,(RSTRING(str)->len)+1);
+    /* dst_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
+    dst_buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)dst_buf); /* XXXXXXXX */
+#endif
 
     ptr = src_buf;
-    while(RSTRING(str)->len > ptr - src_buf) {
+    while(RSTRING_LEN(str) > ptr - src_buf) {
         if (*ptr == '\\' && (all_bs || *(ptr + 1) == 'u')) {
             dst_len += Tcl_UtfBackslash(ptr, &read_len, (dst_buf + dst_len));
             ptr += read_len;
@@ -6408,10 +7873,32 @@ lib_UTF_backslash_core(self, str, all_bs)
     }
 
     str = rb_str_new(dst_buf, dst_len);
-    if (taint_flag) OBJ_TAINT(str);
+    if (taint_flag) RbTk_OBJ_UNTRUST(str);
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
+#endif
+    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
 
-    free(src_buf);
-    free(dst_buf);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)src_buf, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)src_buf); /* XXXXXXXX */
+#else
+    /* free(src_buf); */
+    ckfree(src_buf);
+#endif
+#endif
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)dst_buf, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)dst_buf); /* XXXXXXXX */
+#else
+    /* free(dst_buf); */
+    ckfree(dst_buf);
+#endif
+#endif
 
     rb_thread_critical = thr_crit_bup;
 #endif
@@ -6461,10 +7948,10 @@ lib_set_system_encoding(self, enc_name)
     }
 
     enc_name = rb_funcall(enc_name, ID_to_s, 0, 0);
-    if (Tcl_SetSystemEncoding((Tcl_Interp *)NULL, 
+    if (Tcl_SetSystemEncoding((Tcl_Interp *)NULL,
                               StringValuePtr(enc_name)) != TCL_OK) {
-        rb_raise(rb_eArgError, "unknown encoding name '%s'", 
-                 RSTRING(enc_name)->ptr);
+        rb_raise(rb_eArgError, "unknown encoding name '%s'",
+                 RSTRING_PTR(enc_name));
     }
 
     return enc_name;
@@ -6488,8 +7975,12 @@ struct invoke_info {
 };
 
 static VALUE
+#ifdef HAVE_PROTOTYPES
+invoke_tcl_proc(VALUE arg)
+#else
 invoke_tcl_proc(arg)
     VALUE arg;
+#endif
 {
     struct invoke_info *inf = (struct invoke_info *)arg;
     int i, len;
@@ -6502,7 +7993,11 @@ invoke_tcl_proc(arg)
 #if TCL_MAJOR_VERSION >= 8
     if (!inf->cmdinfo.isNativeObjectProc) {
         /* string interface */
-        argv = (char **)ALLOC_N(char *, argc+1);
+        /* argv = (char **)ALLOC_N(char *, argc+1);*/ /* XXXXXXXXXX */
+        argv = (char **)ckalloc(sizeof(char *)*(argc+1));
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
+#endif
         for (i = 0; i < argc; ++i) {
             argv[i] = Tcl_GetStringFromObj(inf->objv[i], &len);
         }
@@ -6515,23 +8010,32 @@ invoke_tcl_proc(arg)
     /* Invoke the C procedure */
 #if TCL_MAJOR_VERSION >= 8
     if (inf->cmdinfo.isNativeObjectProc) {
-        inf->ptr->return_value 
-            = (*(inf->cmdinfo.objProc))(inf->cmdinfo.objClientData, 
+        inf->ptr->return_value
+            = (*(inf->cmdinfo.objProc))(inf->cmdinfo.objClientData,
                                         inf->ptr->ip, inf->objc, inf->objv);
     }
     else
 #endif
     {
 #if TCL_MAJOR_VERSION >= 8
-        inf->ptr->return_value 
-            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip, 
+        inf->ptr->return_value
+            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip,
                                      argc, (CONST84 char **)argv);
 
-        free(argv);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+        /* free(argv); */
+        ckfree((char*)argv);
+#endif
+#endif
 
 #else /* TCL_MAJOR_VERSION < 8 */
-        inf->ptr->return_value 
-            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip, 
+        inf->ptr->return_value
+            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip,
                                      inf->argc, inf->argv);
 #endif
     }
@@ -6573,6 +8077,9 @@ ip_invoke_core(interp, argc, argv)
 #endif
 #endif
 
+    /* get the data struct */
+    ptr = get_ip(interp);
+
     /* get the command name string */
 #if TCL_MAJOR_VERSION >= 8
     cmd = Tcl_GetStringFromObj(objv[0], &len);
@@ -6596,11 +8103,11 @@ ip_invoke_core(interp, argc, argv)
     if (!Tcl_GetCommandInfo(ptr->ip, cmd, &info)) {
         DUMP1("error Tcl_GetCommandInfo");
         DUMP1("try auto_load (call 'unknown' command)");
-        if (!Tcl_GetCommandInfo(ptr->ip, 
+        if (!Tcl_GetCommandInfo(ptr->ip,
 #if TCL_MAJOR_VERSION >= 8
-                                "::unknown", 
+                                "::unknown",
 #else
-                                "unknown", 
+                                "unknown",
 #endif
                                 &info)) {
             DUMP1("fail to get 'unknown' command");
@@ -6609,7 +8116,7 @@ ip_invoke_core(interp, argc, argv)
                 /* Tcl_Release(ptr->ip); */
                 rbtk_release_ip(ptr);
                 /*rb_ip_raise(obj,rb_eNameError,"invalid command name `%s'",cmd);*/
-                return create_ip_exc(interp, rb_eNameError, 
+                return create_ip_exc(interp, rb_eNameError,
                                      "invalid command name `%s'", cmd);
             } else {
                 if (event_loop_abort_on_exc < 0) {
@@ -6632,14 +8139,22 @@ ip_invoke_core(interp, argc, argv)
             unknown_flag = 1;
 
 #if TCL_MAJOR_VERSION >= 8
-            unknown_objv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, objc+2);
+            /* unknown_objv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, objc+2); */
+            unknown_objv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * (objc+2));
+#if 0 /* use Tcl_Preserve/Release */
+	    Tcl_Preserve((ClientData)unknown_objv); /* XXXXXXXX */
+#endif
             unknown_objv[0] = Tcl_NewStringObj("::unknown", 9);
             Tcl_IncrRefCount(unknown_objv[0]);
             memcpy(unknown_objv + 1, objv, sizeof(Tcl_Obj *)*objc);
             unknown_objv[++objc] = (Tcl_Obj*)NULL;
             objv = unknown_objv;
 #else
-            unknown_argv = (char **)ALLOC_N(char *, argc+2);
+            /* unknown_argv = (char **)ALLOC_N(char *, argc+2); */
+            unknown_argv = (char **)ckalloc(sizeof(char *) * (argc+2));
+#if 0 /* use Tcl_Preserve/Release */
+	    Tcl_Preserve((ClientData)unknown_argv); /* XXXXXXXX */
+#endif
             unknown_argv[0] = strdup("unknown");
             memcpy(unknown_argv + 1, argv, sizeof(char *)*argc);
             unknown_argv[++argc] = (char *)NULL;
@@ -6652,7 +8167,6 @@ ip_invoke_core(interp, argc, argv)
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
 
-
 #if 1 /* wrap tcl-proc call */
     /* setup params */
     inf.ptr = ptr;
@@ -6669,19 +8183,19 @@ ip_invoke_core(interp, argc, argv)
     ret = rb_protect(invoke_tcl_proc, (VALUE)&inf, &status);
     switch(status) {
     case TAG_RAISE:
-        if (NIL_P(ruby_errinfo)) {
-            rbtk_pending_exception = rb_exc_new2(rb_eException, 
+        if (NIL_P(rb_errinfo())) {
+            rbtk_pending_exception = rb_exc_new2(rb_eException,
                                                  "unknown exception");
         } else {
-            rbtk_pending_exception = ruby_errinfo;
+            rbtk_pending_exception = rb_errinfo();
         }
         break;
-        
+
     case TAG_FATAL:
-        if (NIL_P(ruby_errinfo)) {
+        if (NIL_P(rb_errinfo())) {
             rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
         } else {
-            rbtk_pending_exception = ruby_errinfo;
+            rbtk_pending_exception = rb_errinfo();
         }
     }
 
@@ -6693,7 +8207,11 @@ ip_invoke_core(interp, argc, argv)
         int i;
 
         /* string interface */
-        argv = (char **)ALLOC_N(char *, argc+1);
+        /* argv = (char **)ALLOC_N(char *, argc+1); */
+        argv = (char **)ckalloc(sizeof(char *) * (argc+1));
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
+#endif
         for (i = 0; i < argc; ++i) {
             argv[i] = Tcl_GetStringFromObj(objv[i], &len);
         }
@@ -6706,7 +8224,7 @@ ip_invoke_core(interp, argc, argv)
     /* Invoke the C procedure */
 #if TCL_MAJOR_VERSION >= 8
     if (info.isNativeObjectProc) {
-        ptr->return_value = (*info.objProc)(info.objClientData, ptr->ip, 
+        ptr->return_value = (*info.objProc)(info.objClientData, ptr->ip,
                                             objc, objv);
 #if 0
         /* get the string value from the result object */
@@ -6719,13 +8237,22 @@ ip_invoke_core(interp, argc, argv)
 #endif
     {
 #if TCL_MAJOR_VERSION >= 8
-        ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
+        ptr->return_value = (*info.proc)(info.clientData, ptr->ip,
                                          argc, (CONST84 char **)argv);
 
-        free(argv);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+        /* free(argv); */
+        ckfree((char*)argv);
+#endif
+#endif
 
 #else /* TCL_MAJOR_VERSION < 8 */
-        ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
+        ptr->return_value = (*info.proc)(info.clientData, ptr->ip,
                                          argc, argv);
 #endif
     }
@@ -6735,10 +8262,29 @@ ip_invoke_core(interp, argc, argv)
     if (unknown_flag) {
 #if TCL_MAJOR_VERSION >= 8
         Tcl_DecrRefCount(objv[0]);
-        free(objv);
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)objv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)objv); /* XXXXXXXX */
 #else
+        /* free(objv); */
+        ckfree((char*)objv);
+#endif
+#endif
+#else /* TCL_MAJOR_VERSION < 8 */
         free(argv[0]);
-        free(argv);
+        /* ckfree(argv[0]); */
+#if 0 /* use Tcl_EventuallyFree */
+	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+	Tcl_Release((ClientData)argv); /* XXXXXXXX */
+#else
+        /* free(argv); */
+        ckfree((char*)argv);
+#endif
+#endif
 #endif
     }
 
@@ -6749,11 +8295,24 @@ ip_invoke_core(interp, argc, argv)
 
     rb_thread_critical = thr_crit_bup;
 
-    if (ptr->return_value == TCL_ERROR) {
+    /* if (ptr->return_value == TCL_ERROR) { */
+    if (ptr->return_value != TCL_OK) {
         if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
+	    switch (ptr->return_value) {
+	    case TCL_RETURN:
+	      return create_ip_exc(interp, eTkCallbackReturn,
+				   "ip_invoke_core receives TCL_RETURN");
+	    case TCL_BREAK:
+	      return create_ip_exc(interp, eTkCallbackBreak,
+				   "ip_invoke_core receives TCL_BREAK");
+	    case TCL_CONTINUE:
+	      return create_ip_exc(interp, eTkCallbackContinue,
+				   "ip_invoke_core receives TCL_CONTINUE");
+	    default:
+	      return create_ip_exc(interp, rb_eRuntimeError, "%s",
+				   Tcl_GetStringResult(ptr->ip));
+	    }
 
-            return create_ip_exc(interp, rb_eRuntimeError, 
-                                 "%s", Tcl_GetStringResult(ptr->ip));
         } else {
             if (event_loop_abort_on_exc < 0) {
                 rb_warning("%s (ignore)", Tcl_GetStringResult(ptr->ip));
@@ -6793,7 +8352,11 @@ alloc_invoke_arguments(argc, argv)
 
     /* memory allocation */
 #if TCL_MAJOR_VERSION >= 8
-    av = ALLOC_N(Tcl_Obj *, argc+1);
+    /* av = ALLOC_N(Tcl_Obj *, argc+1);*/ /* XXXXXXXXXX */
+    av = (Tcl_Obj**)ckalloc(sizeof(Tcl_Obj *)*(argc+1));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)av); /* XXXXXXXX */
+#endif
     for (i = 0; i < argc; ++i) {
         av[i] = get_obj_from_str(argv[i]);
         Tcl_IncrRefCount(av[i]);
@@ -6802,7 +8365,11 @@ alloc_invoke_arguments(argc, argv)
 
 #else /* TCL_MAJOR_VERSION < 8 */
     /* string interface */
-    av = ALLOC_N(char *, argc+1);
+    /* av = ALLOC_N(char *, argc+1); */
+    av = (char**)ckalloc(sizeof(char *) * (argc+1));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)av); /* XXXXXXXX */
+#endif
     for (i = 0; i < argc; ++i) {
         av[i] = strdup(StringValuePtr(argv[i]));
     }
@@ -6828,11 +8395,34 @@ free_invoke_arguments(argc, av)
     for (i = 0; i < argc; ++i) {
 #if TCL_MAJOR_VERSION >= 8
         Tcl_DecrRefCount(av[i]);
+	av[i] = (Tcl_Obj*)NULL;
 #else /* TCL_MAJOR_VERSION < 8 */
         free(av[i]);
+	av[i] = (char*)NULL;
 #endif
     }
-    free(av);
+#if TCL_MAJOR_VERSION >= 8
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)av, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)av); /* XXXXXXXX */
+#else
+    ckfree((char*)av);
+#endif
+#endif
+#else /* TCL_MAJOR_VERSION < 8 */
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)av, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)av); /* XXXXXXXX */
+#else
+    /* free(av); */
+    ckfree((char*)av);
+#endif
+#endif
+#endif
 }
 
 static VALUE
@@ -6895,10 +8485,12 @@ invoke_queue_handler(evPtr, flags)
     struct invoke_queue *q = (struct invoke_queue *)evPtr;
     volatile VALUE ret;
     volatile VALUE q_dat;
+    volatile VALUE thread = q->thread;
+    struct tcltkip *ptr;
 
     DUMP2("do_invoke_queue_handler : evPtr = %p", evPtr);
     DUMP2("invoke queue_thread : %lx", rb_thread_current());
-    DUMP2("added by thread : %lx", q->thread);
+    DUMP2("added by thread : %lx", thread);
 
     if (*(q->done)) {
         DUMP1("processed by another event-loop");
@@ -6907,36 +8499,79 @@ invoke_queue_handler(evPtr, flags)
         DUMP1("process it on current event-loop");
     }
 
+#ifdef RUBY_VM
+    if (RTEST(rb_funcall(thread, ID_alive_p, 0))
+	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
+#else
+    if (RTEST(rb_thread_alive_p(thread))
+	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
+#endif
+      DUMP1("caller is not yet ready to receive the result -> pending");
+      return 0;
+    }
+
     /* process it */
     *(q->done) = 1;
 
+    /* deleted ipterp ? */
+    ptr = get_ip(q->interp);
+    if (deleted_ip(ptr)) {
+        /* deleted IP --> ignore */
+        return 1;
+    }
+
+    /* incr internal handler mark */
+    rbtk_internal_eventloop_handler++;
+
     /* check safe-level */
     if (rb_safe_level() != q->safe_level) {
         /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
-        q_dat = Data_Wrap_Struct(rb_cData,invoke_queue_mark,0,q);
-        ret = rb_funcall(rb_proc_new(ivq_safelevel_handler, q_dat), 
+        q_dat = Data_Wrap_Struct(rb_cData,invoke_queue_mark,-1,q);
+        ret = rb_funcall(rb_proc_new(ivq_safelevel_handler, q_dat),
                          ID_call, 0);
         rb_gc_force_recycle(q_dat);
+	q_dat = (VALUE)NULL;
     } else {
-        DUMP2("call invoke_real (for caller thread:%lx)", q->thread);
+        DUMP2("call invoke_real (for caller thread:%lx)", thread);
         DUMP2("call invoke_real (current thread:%lx)", rb_thread_current());
         ret = ip_invoke_core(q->interp, q->argc, q->argv);
     }
 
     /* set result */
-    RARRAY(q->result)->ptr[0] = ret;
+    RARRAY_PTR(q->result)[0] = ret;
+    ret = (VALUE)NULL;
+
+    /* decr internal handler mark */
+    rbtk_internal_eventloop_handler--;
 
     /* complete */
     *(q->done) = -1;
 
+    /* unlink ruby objects */
+    q->interp = (VALUE)NULL;
+    q->result = (VALUE)NULL;
+    q->thread = (VALUE)NULL;
+
     /* back to caller */
-    if (RTEST(rb_funcall(q->thread, ID_alive_p, 0, 0))) {
-      DUMP2("back to caller (caller thread:%lx)", q->thread);
+#ifdef RUBY_VM
+    if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
+#else
+    if (RTEST(rb_thread_alive_p(thread))) {
+#endif
+      DUMP2("back to caller (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
-      rb_thread_run(q->thread);
+#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
+      have_rb_thread_waiting_for_value = 1;
+      rb_thread_wakeup(thread);
+#else
+      rb_thread_run(thread);
+#endif
       DUMP1("finish back to caller");
+#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
+      rb_thread_schedule();
+#endif
     } else {
-      DUMP2("caller is dead (caller thread:%lx)", q->thread);
+      DUMP2("caller is dead (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
     }
 
@@ -6952,12 +8587,16 @@ ip_invoke_with_position(argc, argv, obj, position)
     Tcl_QueuePosition position;
 {
     struct invoke_queue *ivq;
+#ifdef RUBY_USE_NATIVE_THREAD
+    struct tcltkip *ptr;
+#endif
     int  *alloc_done;
     int  thr_crit_bup;
     volatile VALUE current = rb_thread_current();
     volatile VALUE ip_obj = obj;
     volatile VALUE result;
     volatile VALUE ret;
+    struct timeval t;
 
 #if TCL_MAJOR_VERSION >= 8
     Tcl_Obj **av = (Tcl_Obj **)NULL;
@@ -6968,7 +8607,23 @@ ip_invoke_with_position(argc, argv, obj, position)
     if (argc < 1) {
         rb_raise(rb_eArgError, "command name missing");
     }
-    if (NIL_P(eventloop_thread) || current == eventloop_thread) {
+
+#ifdef RUBY_USE_NATIVE_THREAD
+    ptr = get_ip(ip_obj);
+    DUMP2("invoke status: ptr->tk_thread_id %p", ptr->tk_thread_id);
+    DUMP2("invoke status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
+#else
+    DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
+#endif
+    DUMP2("status: eventloopt_thread %lx", eventloop_thread);
+
+    if (
+#ifdef RUBY_USE_NATIVE_THREAD
+	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
+	&&
+#endif
+	(NIL_P(eventloop_thread) || current == eventloop_thread)
+	) {
         if (NIL_P(eventloop_thread)) {
             DUMP2("invoke from thread:%lx but no eventloop", current);
         } else {
@@ -6990,17 +8645,22 @@ ip_invoke_with_position(argc, argv, obj, position)
     av = alloc_invoke_arguments(argc, argv);
 
     /* allocate memory (keep result) */
-    alloc_done = (int*)ALLOC(int);
+    /* alloc_done = (int*)ALLOC(int); */
+    alloc_done = (int*)ckalloc(sizeof(int));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
+#endif
     *alloc_done = 0;
 
     /* allocate memory (freed by Tcl_ServiceEvent) */
-    ivq = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue));
-    Tcl_Preserve(ivq);
+    /* ivq = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue)); */
+    ivq = (struct invoke_queue *)ckalloc(sizeof(struct invoke_queue));
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)ivq); /* XXXXXXXX */
+#endif
 
     /* allocate result obj */
-    result = rb_ary_new2(1);
-    RARRAY(result)->ptr[0] = Qnil;
-    RARRAY(result)->len = 1;
+    result = rb_ary_new3(1, Qnil);
 
     /* construct event data */
     ivq->done = alloc_done;
@@ -7014,22 +8674,70 @@ ip_invoke_with_position(argc, argv, obj, position)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-    Tcl_QueueEvent(&(ivq->ev), position);
+#ifdef RUBY_USE_NATIVE_THREAD
+    if (ptr->tk_thread_id) {
+      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(ivq->ev), position); */
+      Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)ivq, position);
+      Tcl_ThreadAlert(ptr->tk_thread_id);
+    } else if (tk_eventloop_thread_id) {
+      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
+			   &(ivq->ev), position); */
+      Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
+			   (Tcl_Event*)ivq, position);
+      Tcl_ThreadAlert(tk_eventloop_thread_id);
+    } else {
+      /* Tcl_QueueEvent(&(ivq->ev), position); */
+      Tcl_QueueEvent((Tcl_Event*)ivq, position);
+    }
+#else
+    /* Tcl_QueueEvent(&(ivq->ev), position); */
+    Tcl_QueueEvent((Tcl_Event*)ivq, position);
+#endif
 
     rb_thread_critical = thr_crit_bup;
 
     /* wait for the handler to be processed */
-    DUMP2("wait for handler (current thread:%lx)", current);
+    t.tv_sec  = 0;
+    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
+
+    DUMP2("ivq wait for handler (current thread:%lx)", current);
     while(*alloc_done >= 0) {
-        rb_thread_stop();
+      /* rb_thread_stop(); */
+      /* rb_thread_sleep_forever(); */
+      rb_thread_wait_for(t);
+      DUMP2("*** ivq wakeup (current thread:%lx)", current);
+      DUMP2("***          (eventloop thread:%lx)", eventloop_thread);
+      if (NIL_P(eventloop_thread)) {
+	DUMP1("*** ivq lost eventloop thread");
+	break;
+      }
     }
     DUMP2("back from handler (current thread:%lx)", current);
 
     /* get result & free allocated memory */
-    ret = RARRAY(result)->ptr[0];
-    free(alloc_done);
+    ret = RARRAY_PTR(result)[0];
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
+#else
+    /* free(alloc_done); */
+    ckfree((char*)alloc_done);
+#endif
+#endif
 
+#if 0 /* ivq is freed by Tcl_ServiceEvent */
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)ivq, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
     Tcl_Release(ivq);
+#else
+    ckfree((char*)ivq);
+#endif
+#endif
+#endif
 
     /* free allocated memory */
     free_invoke_arguments(argc, av);
@@ -7037,7 +8745,9 @@ ip_invoke_with_position(argc, argv, obj, position)
     /* exception? */
     if (rb_obj_is_kind_of(ret, rb_eException)) {
         DUMP1("raise exception");
-        rb_exc_raise(ret);
+        /* rb_exc_raise(ret); */
+	rb_exc_raise(rb_exc_new3(rb_obj_class(ret),
+				 rb_funcall(ret, ID_to_s, 0, 0)));
     }
 
     DUMP1("exit ip_invoke");
@@ -7099,7 +8809,7 @@ ip_get_variable2_core(interp, argc, argv)
     index   = argv[1];
     flag    = argv[2];
 
-    /* 
+    /*
     StringValue(varname);
     if (!NIL_P(index)) StringValue(index);
     */
@@ -7119,16 +8829,16 @@ ip_get_variable2_core(interp, argc, argv)
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
-            ret = Tcl_GetVar2Ex(ptr->ip, RSTRING(varname)->ptr,
-                                NIL_P(index) ? NULL : RSTRING(index)->ptr,
+            ret = Tcl_GetVar2Ex(ptr->ip, RSTRING_PTR(varname),
+                                NIL_P(index) ? NULL : RSTRING_PTR(index),
                                 FIX2INT(flag));
         }
 
         if (ret == (Tcl_Obj*)NULL) {
             volatile VALUE exc;
-            /* exc = rb_exc_new2(rb_eRuntimeError, 
+            /* exc = rb_exc_new2(rb_eRuntimeError,
                                  Tcl_GetStringResult(ptr->ip)); */
-            exc = create_ip_exc(interp, rb_eRuntimeError, 
+            exc = create_ip_exc(interp, rb_eRuntimeError,
                                 Tcl_GetStringResult(ptr->ip));
             /* Tcl_Release(ptr->ip); */
             rbtk_release_ip(ptr);
@@ -7138,7 +8848,7 @@ ip_get_variable2_core(interp, argc, argv)
 
         Tcl_IncrRefCount(ret);
         strval = get_str_from_obj(ret);
-        OBJ_TAINT(strval);
+        RbTk_OBJ_UNTRUST(strval);
         Tcl_DecrRefCount(ret);
 
         /* Tcl_Release(ptr->ip); */
@@ -7157,8 +8867,8 @@ ip_get_variable2_core(interp, argc, argv)
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
-            ret = Tcl_GetVar2(ptr->ip, RSTRING(varname)->ptr, 
-                              NIL_P(index) ? NULL : RSTRING(index)->ptr,
+            ret = Tcl_GetVar2(ptr->ip, RSTRING_PTR(varname),
+                              NIL_P(index) ? NULL : RSTRING_PTR(index),
                               FIX2INT(flag));
         }
 
@@ -7256,8 +8966,8 @@ ip_set_variable2_core(interp, argc, argv)
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
-            ret = Tcl_SetVar2Ex(ptr->ip, RSTRING(varname)->ptr,
-                                NIL_P(index) ? NULL : RSTRING(index)->ptr,
+            ret = Tcl_SetVar2Ex(ptr->ip, RSTRING_PTR(varname),
+                                NIL_P(index) ? NULL : RSTRING_PTR(index),
                                 valobj, FIX2INT(flag));
         }
 
@@ -7265,9 +8975,9 @@ ip_set_variable2_core(interp, argc, argv)
 
         if (ret == (Tcl_Obj*)NULL) {
             volatile VALUE exc;
-            /* exc = rb_exc_new2(rb_eRuntimeError, 
+            /* exc = rb_exc_new2(rb_eRuntimeError,
                                  Tcl_GetStringResult(ptr->ip)); */
-            exc = create_ip_exc(interp, rb_eRuntimeError, 
+            exc = create_ip_exc(interp, rb_eRuntimeError,
                                 Tcl_GetStringResult(ptr->ip));
             /* Tcl_Release(ptr->ip); */
             rbtk_release_ip(ptr);
@@ -7277,7 +8987,7 @@ ip_set_variable2_core(interp, argc, argv)
 
         Tcl_IncrRefCount(ret);
         strval = get_str_from_obj(ret);
-        OBJ_TAINT(strval);
+        RbTk_OBJ_UNTRUST(strval);
         Tcl_DecrRefCount(ret);
 
         /* Tcl_Release(ptr->ip); */
@@ -7297,9 +9007,9 @@ ip_set_variable2_core(interp, argc, argv)
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
-            ret = Tcl_SetVar2(ptr->ip, RSTRING(varname)->ptr, 
-                              NIL_P(index) ? NULL : RSTRING(index)->ptr, 
-                              RSTRING(value)->ptr, FIX2INT(flag));
+            ret = Tcl_SetVar2(ptr->ip, RSTRING_PTR(varname),
+                              NIL_P(index) ? NULL : RSTRING_PTR(index),
+                              RSTRING_PTR(value), FIX2INT(flag));
         }
 
         if (ret == (char*)NULL) {
@@ -7369,7 +9079,7 @@ ip_unset_variable2_core(interp, argc, argv)
     index   = argv[1];
     flag    = argv[2];
 
-    /* 
+    /*
     StringValue(varname);
     if (!NIL_P(index)) StringValue(index);
     */
@@ -7379,15 +9089,15 @@ ip_unset_variable2_core(interp, argc, argv)
         return Qtrue;
     }
 
-    ptr->return_value = Tcl_UnsetVar2(ptr->ip, RSTRING(varname)->ptr, 
-                                      NIL_P(index) ? NULL : RSTRING(index)->ptr,
+    ptr->return_value = Tcl_UnsetVar2(ptr->ip, RSTRING_PTR(varname),
+                                      NIL_P(index) ? NULL : RSTRING_PTR(index),
                                       FIX2INT(flag));
 
     if (ptr->return_value == TCL_ERROR) {
         if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) {
-            /* return rb_exc_new2(rb_eRuntimeError, 
+            /* return rb_exc_new2(rb_eRuntimeError,
                                   Tcl_GetStringResult(ptr->ip)); */
-            return create_ip_exc(interp, rb_eRuntimeError, 
+            return create_ip_exc(interp, rb_eRuntimeError,
                                  Tcl_GetStringResult(ptr->ip));
         }
         return Qfalse;
@@ -7435,7 +9145,7 @@ ip_get_global_var(self, varname)
     VALUE self;
     VALUE varname;
 {
-    return ip_get_variable(self, varname, 
+    return ip_get_variable(self, varname,
                            INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
 }
 
@@ -7445,7 +9155,7 @@ ip_get_global_var2(self, varname, index)
     VALUE varname;
     VALUE index;
 {
-    return ip_get_variable2(self, varname, index, 
+    return ip_get_variable2(self, varname, index,
                             INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
 }
 
@@ -7455,7 +9165,7 @@ ip_set_global_var(self, varname, value)
     VALUE varname;
     VALUE value;
 {
-    return ip_set_variable(self, varname, value, 
+    return ip_set_variable(self, varname, value,
                            INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
 }
 
@@ -7466,7 +9176,7 @@ ip_set_global_var2(self, varname, index, value)
     VALUE index;
     VALUE value;
 {
-    return ip_set_variable2(self, varname, index, value, 
+    return ip_set_variable2(self, varname, index, value,
                             INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
 }
 
@@ -7475,7 +9185,7 @@ ip_unset_global_var(self, varname)
     VALUE self;
     VALUE varname;
 {
-    return ip_unset_variable(self, varname, 
+    return ip_unset_variable(self, varname,
                              INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
 }
 
@@ -7485,7 +9195,7 @@ ip_unset_global_var2(self, varname, index)
     VALUE varname;
     VALUE index;
 {
-    return ip_unset_variable2(self, varname, index, 
+    return ip_unset_variable2(self, varname, index,
                               INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
 }
 
@@ -7500,6 +9210,10 @@ lib_split_tklist_core(ip_obj, list_str)
     volatile VALUE ary, elem;
     int idx;
     int taint_flag = OBJ_TAINTED(list_str);
+#ifdef HAVE_RUBY_ENCODING_H
+    int list_enc_idx;
+    volatile VALUE list_ivar_enc;
+#endif
     int result;
     VALUE old_gc;
 
@@ -7514,6 +9228,10 @@ lib_split_tklist_core(ip_obj, list_str)
     }
 
     StringValue(list_str);
+#ifdef HAVE_RUBY_ENCODING_H
+    list_enc_idx = rb_enc_get_index(list_str);
+    list_ivar_enc = rb_ivar_get(list_str, ID_at_enc);
+#endif
 
     {
 #if TCL_MAJOR_VERSION >= 8
@@ -7546,17 +9264,28 @@ lib_split_tklist_core(ip_obj, list_str)
         rb_thread_critical = Qtrue;
 
         ary = rb_ary_new2(objc);
-        if (taint_flag) OBJ_TAINT(ary);
+        if (taint_flag) RbTk_OBJ_UNTRUST(ary);
 
         old_gc = rb_gc_disable();
 
         for(idx = 0; idx < objc; idx++) {
             elem = get_str_from_obj(objv[idx]);
-            if (taint_flag) OBJ_TAINT(elem);
-            RARRAY(ary)->ptr[idx] = elem;
+            if (taint_flag) RbTk_OBJ_UNTRUST(elem);
+
+#ifdef HAVE_RUBY_ENCODING_H
+	    if (rb_enc_get_index(elem) == ENCODING_INDEX_BINARY) {
+	        rb_enc_associate_index(elem, ENCODING_INDEX_BINARY);
+		rb_ivar_set(elem, ID_at_enc, ENCODING_NAME_BINARY);
+	    } else {
+	        rb_enc_associate_index(elem, list_enc_idx);
+		rb_ivar_set(elem, ID_at_enc, list_ivar_enc);
+	    }
+#endif
+            /* RARRAY(ary)->ptr[idx] = elem; */
+	    rb_ary_push(ary, elem);
         }
 
-        RARRAY(ary)->len = objc;
+        /* RARRAY(ary)->len = objc; */
 
         if (old_gc == Qfalse) rb_gc_enable();
 
@@ -7573,7 +9302,7 @@ lib_split_tklist_core(ip_obj, list_str)
         int  argc;
         char **argv;
 
-        if (Tcl_SplitList(interp, RSTRING(list_str)->ptr, 
+        if (Tcl_SplitList(interp, RSTRING_PTR(list_str),
                           &argc, &argv) == TCL_ERROR) {
             if (interp == (Tcl_Interp*)NULL) {
                 rb_raise(rb_eRuntimeError, "can't get elements from list");
@@ -7583,7 +9312,7 @@ lib_split_tklist_core(ip_obj, list_str)
         }
 
         ary = rb_ary_new2(argc);
-        if (taint_flag) OBJ_TAINT(ary);
+        if (taint_flag) RbTk_OBJ_UNTRUST(ary);
 
         old_gc = rb_gc_disable();
 
@@ -7594,9 +9323,10 @@ lib_split_tklist_core(ip_obj, list_str)
                 elem = rb_str_new2(argv[idx]);
             }
             /* rb_ivar_set(elem, ID_at_enc, rb_str_new2("binary")); */
-            RARRAY(ary)->ptr[idx] = elem;
+            /* RARRAY(ary)->ptr[idx] = elem; */
+	    rb_ary_push(ary, elem)
         }
-        RARRAY(ary)->len = argc;
+        /* RARRAY(ary)->len = argc; */
 
         if (old_gc == Qfalse) rb_gc_enable();
 #endif
@@ -7645,7 +9375,11 @@ lib_merge_tklist(argc, argv, obj)
     old_gc = rb_gc_disable();
 
     /* based on Tcl/Tk's Tcl_Merge() */
-    flagPtr = ALLOC_N(int, argc);
+    /* flagPtr = ALLOC_N(int, argc); */
+    flagPtr = (int *)ckalloc(sizeof(int) * argc);
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)flagPtr); /* XXXXXXXXXX */
+#endif
 
     /* pass 1 */
     len = 1;
@@ -7653,7 +9387,7 @@ lib_merge_tklist(argc, argv, obj)
         if (OBJ_TAINTED(argv[num])) taint_flag = 1;
         dst = StringValuePtr(argv[num]);
 #if TCL_MAJOR_VERSION >= 8
-        len += Tcl_ScanCountedElement(dst, RSTRING(argv[num])->len, 
+        len += Tcl_ScanCountedElement(dst, RSTRING_LEN(argv[num]),
                                       &flagPtr[num]) + 1;
 #else /* TCL_MAJOR_VERSION < 8 */
         len += Tcl_ScanElement(dst, &flagPtr[num]) + 1;
@@ -7661,15 +9395,19 @@ lib_merge_tklist(argc, argv, obj)
     }
 
     /* pass 2 */
-    result = (char *)Tcl_Alloc(len);
+    /* result = (char *)Tcl_Alloc(len); */
+    result = (char *)ckalloc(len);
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Preserve((ClientData)result);
+#endif
     dst = result;
     for(num = 0; num < argc; num++) {
 #if TCL_MAJOR_VERSION >= 8
-        len = Tcl_ConvertCountedElement(RSTRING(argv[num])->ptr, 
-                                        RSTRING(argv[num])->len, 
+        len = Tcl_ConvertCountedElement(RSTRING_PTR(argv[num]),
+                                        RSTRING_LEN(argv[num]),
                                         dst, flagPtr[num]);
 #else /* TCL_MAJOR_VERSION < 8 */
-        len = Tcl_ConvertElement(RSTRING(argv[num])->ptr, dst, flagPtr[num]);
+        len = Tcl_ConvertElement(RSTRING_PTR(argv[num]), dst, flagPtr[num]);
 #endif
         dst += len;
         *dst = ' ';
@@ -7681,12 +9419,30 @@ lib_merge_tklist(argc, argv, obj)
         dst[-1] = 0;
     }
 
-    free(flagPtr);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)flagPtr, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)flagPtr);
+#else
+    /* free(flagPtr); */
+    ckfree((char*)flagPtr);
+#endif
+#endif
 
     /* create object */
     str = rb_str_new(result, dst - result - 1);
-    if (taint_flag) OBJ_TAINT(str);
-    Tcl_Free(result);
+    if (taint_flag) RbTk_OBJ_UNTRUST(str);
+#if 0 /* use Tcl_EventuallyFree */
+    Tcl_EventuallyFree((ClientData)result, TCL_DYNAMIC); /* XXXXXXXX */
+#else
+#if 0 /* use Tcl_Preserve/Release */
+    Tcl_Release((ClientData)result); /* XXXXXXXXXXX */
+#else
+    /* Tcl_Free(result); */
+    ckfree(result);
+#endif
+#endif
 
     if (old_gc == Qfalse) rb_gc_enable();
     rb_thread_critical = thr_crit_bup;
@@ -7712,33 +9468,62 @@ lib_conv_listelement(self, src)
     StringValue(src);
 
 #if TCL_MAJOR_VERSION >= 8
-    len = Tcl_ScanCountedElement(RSTRING(src)->ptr, RSTRING(src)->len, 
+    len = Tcl_ScanCountedElement(RSTRING_PTR(src), RSTRING_LEN(src),
                                  &scan_flag);
     dst = rb_str_new(0, len + 1);
-    len = Tcl_ConvertCountedElement(RSTRING(src)->ptr, RSTRING(src)->len, 
-                                    RSTRING(dst)->ptr, scan_flag);
+    len = Tcl_ConvertCountedElement(RSTRING_PTR(src), RSTRING_LEN(src),
+                                    RSTRING_PTR(dst), scan_flag);
 #else /* TCL_MAJOR_VERSION < 8 */
-    len = Tcl_ScanElement(RSTRING(src)->ptr, &scan_flag);
+    len = Tcl_ScanElement(RSTRING_PTR(src), &scan_flag);
     dst = rb_str_new(0, len + 1);
-    len = Tcl_ConvertElement(RSTRING(src)->ptr, RSTRING(dst)->ptr, scan_flag);
+    len = Tcl_ConvertElement(RSTRING_PTR(src), RSTRING_PTR(dst), scan_flag);
 #endif
 
-    RSTRING(dst)->len = len;
-    RSTRING(dst)->ptr[len] = '\0';
-    if (taint_flag) OBJ_TAINT(dst);
+    rb_str_resize(dst, len);
+    if (taint_flag) RbTk_OBJ_UNTRUST(dst);
 
     rb_thread_critical = thr_crit_bup;
 
     return dst;
 }
 
+static VALUE
+lib_getversion(self)
+    VALUE self;
+{
+    set_tcltk_version();
+
+    return rb_ary_new3(4, INT2NUM(tcltk_version.major),
+		          INT2NUM(tcltk_version.minor),
+		          INT2NUM(tcltk_version.type),
+		          INT2NUM(tcltk_version.patchlevel));
+}
+
+static VALUE
+lib_get_reltype_name(self)
+    VALUE self;
+{
+    set_tcltk_version();
+
+    switch(tcltk_version.type) {
+    case TCL_ALPHA_RELEASE:
+      return rb_str_new2("alpha");
+    case TCL_BETA_RELEASE:
+      return rb_str_new2("beta");
+    case TCL_FINAL_RELEASE:
+      return rb_str_new2("final");
+    default:
+      rb_raise(rb_eRuntimeError, "tcltklib has invalid release type number");
+    }
+}
+
 
 static VALUE
 tcltklib_compile_info()
 {
     volatile VALUE ret;
     int size;
-    char form[] 
+    char form[]
       = "tcltklib %s :: Ruby%s (%s) %s pthread :: Tcl%s(%s)/Tk%s(%s) %s";
     char *info;
 
@@ -7746,30 +9531,31 @@ tcltklib_compile_info()
         + strlen(TCLTKLIB_RELEASE_DATE)
         + strlen(RUBY_VERSION)
         + strlen(RUBY_RELEASE_DATE)
-        + strlen("without") 
+        + strlen("without")
         + strlen(TCL_PATCH_LEVEL)
         + strlen("without stub")
         + strlen(TK_PATCH_LEVEL)
-        + strlen("without stub") 
+        + strlen("without stub")
         + strlen("unknown tcl_threads");
 
     info = ALLOC_N(char, size);
+    /* info = ckalloc(sizeof(char) * size); */ /* SEGV */
 
     sprintf(info, form,
-            TCLTKLIB_RELEASE_DATE, 
-            RUBY_VERSION, RUBY_RELEASE_DATE, 
+            TCLTKLIB_RELEASE_DATE,
+            RUBY_VERSION, RUBY_RELEASE_DATE,
 #ifdef HAVE_NATIVETHREAD
             "with",
 #else
             "without",
 #endif
-            TCL_PATCH_LEVEL, 
+            TCL_PATCH_LEVEL,
 #ifdef USE_TCL_STUBS
             "with stub",
 #else
             "without stub",
 #endif
-            TK_PATCH_LEVEL, 
+            TK_PATCH_LEVEL,
 #ifdef USE_TK_STUBS
             "with stub",
 #else
@@ -7788,16 +9574,554 @@ tcltklib_compile_info()
 
     ret = rb_obj_freeze(rb_str_new2(info));
 
-    free(info);
+    xfree(info);
+    /* ckfree(info); */
 
     return ret;
 }
 
+
+/*###############################################*/
+
+static VALUE
+create_dummy_encoding_for_tk_core(interp, name, error_mode)
+     VALUE interp;
+     VALUE name;
+     VALUE error_mode;
+{
+  get_ip(interp);
+
+  rb_secure(4);
+
+  StringValue(name);
+
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
+  if (Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(name)) == (Tcl_Encoding)NULL) {
+    if (RTEST(error_mode)) {
+      rb_raise(rb_eArgError, "invalid Tk encoding name '%s'",
+	       RSTRING_PTR(name));
+    } else {
+      return Qnil;
+    }
+  }
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+  if (RTEST(rb_define_dummy_encoding(RSTRING_PTR(name)))) {
+    int idx = rb_enc_find_index(StringValueCStr(name));
+    return rb_enc_from_encoding(rb_enc_from_index(idx));
+  } else {
+    if (RTEST(error_mode)) {
+      rb_raise(rb_eRuntimeError, "fail to create dummy encoding for '%s'",
+	       RSTRING_PTR(name));
+    } else {
+      return Qnil;
+    }
+  }
+#else
+    return name;
+#endif
+}
+static VALUE
+create_dummy_encoding_for_tk(interp, name)
+     VALUE interp;
+     VALUE name;
+{
+  return create_dummy_encoding_for_tk_core(interp, name, Qtrue);
+}
+
+
+#ifdef HAVE_RUBY_ENCODING_H
+static int
+update_encoding_table(table, interp, error_mode)
+     VALUE table;
+     VALUE interp;
+     VALUE error_mode;
+{
+  struct tcltkip *ptr;
+  int retry = 0;
+  int i, idx, objc;
+  Tcl_Obj **objv;
+  Tcl_Obj *enc_list;
+  volatile VALUE encname = Qnil;
+  volatile VALUE encobj = Qnil;
+
+  /* interpreter check */
+  if (NIL_P(interp)) return 0;
+  ptr = get_ip(interp);
+  if (ptr == (struct tcltkip *) NULL)  return 0;
+  if (deleted_ip(ptr)) return 0;
+
+  /* get Tcl's encoding list */
+  Tcl_GetEncodingNames(ptr->ip);
+  enc_list = Tcl_GetObjResult(ptr->ip);
+  Tcl_IncrRefCount(enc_list);
+
+  if (Tcl_ListObjGetElements(ptr->ip, enc_list,
+			     &objc, &objv) != TCL_OK) {
+    Tcl_DecrRefCount(enc_list);
+    /* rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");*/
+    return 0;
+  }
+
+  /* check each encoding name */
+  for(i = 0; i < objc; i++) {
+    encname = rb_str_new2(Tcl_GetString(objv[i]));
+    if (NIL_P(rb_hash_lookup(table, encname))) {
+      /* new Tk encoding -> add to table */
+      idx = rb_enc_find_index(StringValueCStr(encname));
+      if (idx < 0) {
+	encobj = create_dummy_encoding_for_tk_core(interp,encname,error_mode);
+      } else {
+	encobj = rb_enc_from_encoding(rb_enc_from_index(idx));
+      }
+      encname = rb_obj_freeze(encname);
+      rb_hash_aset(table, encname, encobj);
+      if (!NIL_P(encobj) && NIL_P(rb_hash_lookup(table, encobj))) {
+	rb_hash_aset(table, encobj, encname);
+      }
+      retry = 1;
+    }
+  }
+
+  Tcl_DecrRefCount(enc_list);
+
+  return retry;
+}
+
+static VALUE
+encoding_table_get_name_core(table, enc_arg, error_mode)
+     VALUE table;
+     VALUE enc_arg;
+     VALUE error_mode;
+{
+  volatile VALUE enc = enc_arg;
+  volatile VALUE name = Qnil;
+  volatile VALUE tmp = Qnil;
+  volatile VALUE interp = rb_ivar_get(table, ID_at_interp);
+  struct tcltkip *ptr = (struct tcltkip *) NULL;
+  int idx;
+
+  /* deleted interp ? */
+  if (!NIL_P(interp)) {
+    ptr = get_ip(interp);
+    if (deleted_ip(ptr)) {
+      ptr = (struct tcltkip *) NULL;
+    }
+  }
+
+  /* encoding argument check */
+  /* 1st: default encoding setting of interp */
+  if (ptr && NIL_P(enc)) {
+    if (rb_respond_to(interp, ID_encoding_name)) {
+      enc = rb_funcall(interp, ID_encoding_name, 0, 0);
+    }
+  }
+  /* 2nd: Encoding.default_internal */
+  if (NIL_P(enc)) {
+    enc = rb_enc_default_internal();
+  }
+  /* 3rd: encoding system of Tcl/Tk */
+  if (NIL_P(enc)) {
+    enc = rb_str_new2(Tcl_GetEncodingName((Tcl_Encoding)NULL));
+  }
+  /* 4th: Encoding.default_external */
+  if (NIL_P(enc)) {
+    enc = rb_enc_default_external();
+  }
+  /* 5th: Encoding.locale_charmap */
+  if (NIL_P(enc)) {
+    enc = rb_locale_charmap(rb_cEncoding);
+  }
+
+  if (RTEST(rb_obj_is_kind_of(enc, cRubyEncoding))) {
+    /* Ruby's Encoding object */
+    name = rb_hash_lookup(table, enc);
+    if (!NIL_P(name)) {
+      /* find */
+      return name;
+    }
+
+    /* is it new ? */
+    /* update check of Tk encoding names */
+    if (update_encoding_table(table, interp, error_mode)) {
+      /* add new relations to the table   */
+      /* RETRY: registered Ruby encoding? */
+      name = rb_hash_lookup(table, enc);
+      if (!NIL_P(name)) {
+	/* find */
+	return name;
+      }
+    }
+    /* fail to find */
+
+  } else {
+    /* String or Symbol? */
+    name = rb_funcall(enc, ID_to_s, 0, 0);
+
+    if (!NIL_P(rb_hash_lookup(table, name))) {
+      /* find */
+      return name;
+    }
+
+    /* is it new ? */
+    idx = rb_enc_find_index(StringValueCStr(name));
+    if (idx >= 0) {
+      enc = rb_enc_from_encoding(rb_enc_from_index(idx));
+
+      /* registered Ruby encoding? */
+      tmp = rb_hash_lookup(table, enc);
+      if (!NIL_P(tmp)) {
+	/* find */
+	return tmp;
+      }
+
+      /* update check of Tk encoding names */
+      if (update_encoding_table(table, interp, error_mode)) {
+	/* add new relations to the table   */
+	/* RETRY: registered Ruby encoding? */
+	tmp = rb_hash_lookup(table, enc);
+	if (!NIL_P(tmp)) {
+	  /* find */
+	  return tmp;
+	}
+      }
+    }
+    /* fail to find */
+  }
+
+  if (RTEST(error_mode)) {
+    enc = rb_funcall(enc_arg, ID_to_s, 0, 0);
+    rb_raise(rb_eArgError, "unsupported Tk encoding '%s'", RSTRING_PTR(enc));
+  }
+  return Qnil;
+}
+static VALUE
+encoding_table_get_obj_core(table, enc, error_mode)
+     VALUE table;
+     VALUE enc;
+     VALUE error_mode;
+{
+  volatile VALUE obj = Qnil;
+
+  obj = rb_hash_lookup(table,
+		       encoding_table_get_name_core(table, enc, error_mode));
+  if (RTEST(rb_obj_is_kind_of(obj, cRubyEncoding))) {
+    return obj;
+  } else {
+    return Qnil;
+  }
+}
+
+#else /* ! HAVE_RUBY_ENCODING_H */
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
+static int
+update_encoding_table(table, interp, error_mode)
+     VALUE table;
+     VALUE interp;
+     VALUE error_mode;
+{
+  struct tcltkip *ptr;
+  int retry = 0;
+  int i, objc;
+  Tcl_Obj **objv;
+  Tcl_Obj *enc_list;
+  volatile VALUE encname = Qnil;
+
+  /* interpreter check */
+  if (NIL_P(interp)) return 0;
+  ptr = get_ip(interp);
+  if (ptr == (struct tcltkip *) NULL)  return 0;
+  if (deleted_ip(ptr)) return 0;
+
+  /* get Tcl's encoding list */
+  Tcl_GetEncodingNames(ptr->ip);
+  enc_list = Tcl_GetObjResult(ptr->ip);
+  Tcl_IncrRefCount(enc_list);
+
+  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
+    Tcl_DecrRefCount(enc_list);
+    /* rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names"); */
+    return 0;
+  }
+
+  /* get encoding name and set it to table */
+  for(i = 0; i < objc; i++) {
+    encname = rb_str_new2(Tcl_GetString(objv[i]));
+    if (NIL_P(rb_hash_lookup(table, encname))) {
+      /* new Tk encoding -> add to table */
+      encname = rb_obj_freeze(encname);
+      rb_hash_aset(table, encname, encname);
+      retry = 1;
+    }
+  }
+
+  Tcl_DecrRefCount(enc_list);
+
+  return retry;
+}
+
+static VALUE
+encoding_table_get_name_core(table, enc, error_mode)
+     VALUE table;
+     VALUE enc;
+     VALUE error_mode;
+{
+  volatile VALUE name = Qnil;
+
+  enc = rb_funcall(enc, ID_to_s, 0, 0);
+  name = rb_hash_lookup(table, enc);
+
+  if (!NIL_P(name)) {
+    /* find */
+    return name;
+  }
+
+  /* update check */
+  if (update_encoding_table(table, rb_ivar_get(table, ID_at_interp),
+					       error_mode)) {
+    /* add new relations to the table   */
+    /* RETRY: registered Ruby encoding? */
+    name = rb_hash_lookup(table, enc);
+    if (!NIL_P(name)) {
+      /* find */
+      return name;
+    }
+  }
+
+  if (RTEST(error_mode)) {
+    rb_raise(rb_eArgError, "unsupported Tk encoding '%s'", RSTRING_PTR(enc));
+  }
+  return Qnil;
+}
+static VALUE
+encoding_table_get_obj_core(table, enc, error_mode)
+     VALUE table;
+     VALUE enc;
+     VALUE error_mode;
+{
+  return encoding_table_get_name_core(table, enc, error_mode);
+}
+
+#else /* Tcl/Tk 7.x or 8.0 */
+static VALUE
+encoding_table_get_name_core(table, enc, error_mode)
+     VALUE table;
+     VALUE enc;
+     VALUE error_mode;
+{
+  return Qnil;
+}
+static VALUE
+encoding_table_get_obj_core(table, enc, error_mode)
+     VALUE table;
+     VALUE enc;
+     VALUE error_mode;
+{
+  return Qnil;
+}
+#endif /* end of dependency for the version of Tcl/Tk */
+#endif
+
+static VALUE
+encoding_table_get_name(table, enc)
+     VALUE table;
+     VALUE enc;
+{
+  return encoding_table_get_name_core(table, enc, Qtrue);
+}
+static VALUE
+encoding_table_get_obj(table, enc)
+     VALUE table;
+     VALUE enc;
+{
+  return encoding_table_get_obj_core(table, enc, Qtrue);
+}
+
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+create_encoding_table_core(arg, interp)
+     VALUE arg;
+     VALUE interp;
+{
+  struct tcltkip *ptr = get_ip(interp);
+  volatile VALUE table = rb_hash_new();
+  volatile VALUE encname = Qnil;
+  volatile VALUE encobj = Qnil;
+  int i, idx, objc;
+  Tcl_Obj **objv;
+  Tcl_Obj *enc_list;
+
+#ifdef HAVE_RB_SET_SAFE_LEVEL_FORCE
+  rb_set_safe_level_force(0);
+#else
+  rb_set_safe_level(0);
+#endif
+
+  /* set 'binary' encoding */
+  encobj = rb_enc_from_encoding(rb_enc_from_index(ENCODING_INDEX_BINARY));
+  rb_hash_aset(table, ENCODING_NAME_BINARY, encobj);
+  rb_hash_aset(table, encobj, ENCODING_NAME_BINARY);
+
+
+  /* Tcl stub check */
+  tcl_stubs_check();
+
+  /* get Tcl's encoding list */
+  Tcl_GetEncodingNames(ptr->ip);
+  enc_list = Tcl_GetObjResult(ptr->ip);
+  Tcl_IncrRefCount(enc_list);
+
+  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
+    Tcl_DecrRefCount(enc_list);
+    rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");
+  }
+
+  /* get encoding name and set it to table */
+  for(i = 0; i < objc; i++) {
+    int name2obj, obj2name;
+
+    name2obj = 1; obj2name = 1;
+    encname = rb_obj_freeze(rb_str_new2(Tcl_GetString(objv[i])));
+    idx = rb_enc_find_index(StringValueCStr(encname));
+    if (idx < 0) {
+      /* fail to find ruby encoding -> check known encoding */
+      if (strcmp(RSTRING_PTR(encname), "identity") == 0) {
+	name2obj = 1; obj2name = 0;
+	idx = ENCODING_INDEX_BINARY;
+
+      } else if (strcmp(RSTRING_PTR(encname), "shiftjis") == 0) {
+	name2obj = 1; obj2name = 0;
+	idx = rb_enc_find_index("Shift_JIS");
+
+      } else if (strcmp(RSTRING_PTR(encname), "unicode") == 0) {
+	name2obj = 1; obj2name = 0;
+	idx = ENCODING_INDEX_UTF8;
+
+      } else if (strcmp(RSTRING_PTR(encname), "symbol") == 0) {
+	name2obj = 1; obj2name = 0;
+	idx = rb_enc_find_index("ASCII-8BIT");
+
+      } else {
+	/* regist dummy encoding */
+	name2obj = 1; obj2name = 1;
+      }
+    }
+
+    if (idx < 0) {
+      /* unknown encoding -> create dummy */
+      encobj = create_dummy_encoding_for_tk(interp, encname);
+    } else {
+      encobj = rb_enc_from_encoding(rb_enc_from_index(idx));
+    }
+
+    if (name2obj) {
+      DUMP2("create_encoding_table: name2obj: %s", RSTRING_PTR(encname));
+      rb_hash_aset(table, encname, encobj);
+    }
+    if (obj2name) {
+      DUMP2("create_encoding_table: obj2name: %s", RSTRING_PTR(encname));
+      rb_hash_aset(table, encobj, encname);
+    }
+  }
+
+  Tcl_DecrRefCount(enc_list);
+
+  rb_ivar_set(table, ID_at_interp, interp);
+  rb_ivar_set(interp, ID_encoding_table, table);
+
+  return table;
+}
+
+#else /* ! HAVE_RUBY_ENCODING_H */
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
+static VALUE
+create_encoding_table_core(arg, interp)
+     VALUE arg;
+     VALUE interp;
+{
+  struct tcltkip *ptr = get_ip(interp);
+  volatile VALUE table = rb_hash_new();
+  volatile VALUE encname = Qnil;
+  int i, objc;
+  Tcl_Obj **objv;
+  Tcl_Obj *enc_list;
+
+  rb_secure(4);
+
+  /* set 'binary' encoding */
+  rb_hash_aset(table, ENCODING_NAME_BINARY, ENCODING_NAME_BINARY);
+
+  /* get Tcl's encoding list */
+  Tcl_GetEncodingNames(ptr->ip);
+  enc_list = Tcl_GetObjResult(ptr->ip);
+  Tcl_IncrRefCount(enc_list);
+
+  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
+    Tcl_DecrRefCount(enc_list);
+    rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");
+  }
+
+  /* get encoding name and set it to table */
+  for(i = 0; i < objc; i++) {
+    encname = rb_obj_freeze(rb_str_new2(Tcl_GetString(objv[i])));
+    rb_hash_aset(table, encname, encname);
+  }
+
+  Tcl_DecrRefCount(enc_list);
+
+  rb_ivar_set(table, ID_at_interp, interp);
+  rb_ivar_set(interp, ID_encoding_table, table);
+
+  return table;
+}
+
+#else /* Tcl/Tk 7.x or 8.0 */
+static VALUE
+create_encoding_table_core(arg, interp)
+     VALUE arg;
+     VALUE interp;
+{
+  volatile VALUE table = rb_hash_new();
+  rb_secure(4);
+  rb_ivar_set(interp, ID_encoding_table, table);
+  return table;
+}
+#endif
+#endif
+
+static VALUE
+create_encoding_table(interp)
+     VALUE interp;
+{
+  return rb_funcall(rb_proc_new(create_encoding_table_core, interp),
+		    ID_call, 0);
+}
+
+static VALUE
+ip_get_encoding_table(interp)
+     VALUE interp;
+{
+  volatile VALUE table = Qnil;
+
+  table = rb_ivar_get(interp, ID_encoding_table);
+
+  if (NIL_P(table)) {
+    /* initialize encoding_table */
+    table = create_encoding_table(interp);
+    rb_define_singleton_method(table, "get_name", encoding_table_get_name, 1);
+    rb_define_singleton_method(table, "get_obj",  encoding_table_get_obj,  1);
+  }
+
+  return table;
+}
+
+
 /*###############################################*/
 
 /*
- *   The following is based on tkMenu.[ch] 
- *   of Tcl/Tk (>=8.0) source code.
+ *   The following is based on tkMenu.[ch]
+ *   of Tcl/Tk (Tk8.0 -- Tk8.5b1) source code.
  */
 #if TCL_MAJOR_VERSION >= 8
 
@@ -7831,33 +10155,56 @@ struct dummy_TkMenuRef {
     char *dummy3;
 };
 
+#if 0 /* was available on Tk8.0 -- Tk8.4 */
 EXTERN struct dummy_TkMenuRef *TkFindMenuReferences(Tcl_Interp*, char*);
+#else /* based on Tk8.0 -- Tk8.5.0 */
+#define MENU_HASH_KEY "tkMenus"
+#endif
 
 #endif
 
 static VALUE
-ip_make_menu_embeddable(interp, menu_path)
+ip_make_menu_embeddable_core(interp, argc, argv)
     VALUE interp;
-    VALUE menu_path;
+    int   argc;
+    VALUE *argv;
 {
 #if TCL_MAJOR_VERSION >= 8
+    volatile VALUE menu_path;
     struct tcltkip *ptr = get_ip(interp);
-    struct dummy_TkMenuRef *menuRefPtr;
+    struct dummy_TkMenuRef *menuRefPtr = NULL;
+    XEvent event;
+    Tcl_HashTable *menuTablePtr;
+    Tcl_HashEntry *hashEntryPtr;
 
+    menu_path = argv[0];
     StringValue(menu_path);
 
-    menuRefPtr = TkFindMenuReferences(ptr->ip, RSTRING(menu_path)->ptr);
+#if 0 /* was available on Tk8.0 -- Tk8.4 */
+    menuRefPtr = TkFindMenuReferences(ptr->ip, RSTRING_PTR(menu_path));
+#else /* based on Tk8.0 -- Tk8.5b1 */
+    if ((menuTablePtr
+	 = (Tcl_HashTable *) Tcl_GetAssocData(ptr->ip, MENU_HASH_KEY, NULL))
+	!= NULL) {
+      if ((hashEntryPtr
+	   = Tcl_FindHashEntry(menuTablePtr, RSTRING_PTR(menu_path)))
+	  != NULL) {
+        menuRefPtr = (struct dummy_TkMenuRef *) Tcl_GetHashValue(hashEntryPtr);
+      }
+    }
+#endif
+
     if (menuRefPtr == (struct dummy_TkMenuRef *) NULL) {
         rb_raise(rb_eArgError, "not a menu widget, or invalid widget path");
     }
 
     if (menuRefPtr->menuPtr == (struct dummy_TkMenu *) NULL) {
-        rb_raise(rb_eRuntimeError, 
+        rb_raise(rb_eRuntimeError,
 		 "invalid menu widget (maybe already destroyed)");
     }
 
     if ((menuRefPtr->menuPtr)->menuType != MENUBAR) {
-        rb_raise(rb_eRuntimeError, 
+        rb_raise(rb_eRuntimeError,
 		 "target menu widget must be a MENUBAR type");
     }
 
@@ -7868,14 +10215,26 @@ ip_make_menu_embeddable(interp, menu_path)
        char *s = "normal";
        /* Tcl_SetStringObj((menuRefPtr->menuPtr)->menuTypePtr, s, strlen(s));*/
        (menuRefPtr->menuPtr)->menuTypePtr = Tcl_NewStringObj(s, strlen(s));
+       /* Tcl_IncrRefCount((menuRefPtr->menuPtr)->menuTypePtr); */
        /* (menuRefPtr->menuPtr)->menuType = TEAROFF_MENU; */
        (menuRefPtr->menuPtr)->menuType = MASTER_MENU;
     }
 #endif
 
+#if 0 /* was available on Tk8.0 -- Tk8.4 */
     TkEventuallyRecomputeMenu(menuRefPtr->menuPtr);
-    TkEventuallyRedrawMenu(menuRefPtr->menuPtr, 
+    TkEventuallyRedrawMenu(menuRefPtr->menuPtr,
 			   (struct dummy_TkMenuEntry *)NULL);
+#else /* based on Tk8.0 -- Tk8.5b1 */
+    memset((void *) &event, 0, sizeof(event));
+    event.xany.type = ConfigureNotify;
+    event.xany.serial = NextRequest(Tk_Display((menuRefPtr->menuPtr)->tkwin));
+    event.xany.send_event = 0; /* FALSE */
+    event.xany.window = Tk_WindowId((menuRefPtr->menuPtr)->tkwin);
+    event.xany.display = Tk_Display((menuRefPtr->menuPtr)->tkwin);
+    event.xconfigure.window = event.xany.window;
+    Tk_HandleEvent(&event);
+#endif
 
 #else /* TCL_MAJOR_VERSION <= 7 */
     rb_notimplement();
@@ -7884,6 +10243,18 @@ ip_make_menu_embeddable(interp, menu_path)
     return interp;
 }
 
+static VALUE
+ip_make_menu_embeddable(interp, menu_path)
+    VALUE interp;
+    VALUE menu_path;
+{
+    VALUE argv[1];
+
+    argv[0] = menu_path;
+    return tk_funcall(ip_make_menu_embeddable_core, 1, argv, interp);
+}
+
+
 /*###############################################*/
 
 /*---- initialization ----*/
@@ -7897,6 +10268,7 @@ Init_tcltklib()
 
     VALUE ev_flag = rb_define_module_under(lib, "EventFlag");
     VALUE var_flag = rb_define_module_under(lib, "VarAccessFlag");
+    VALUE release_type = rb_define_module_under(lib, "RELEASE_TYPE");
 
     /* --------------------------------------------------------------- */
 
@@ -7904,6 +10276,22 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_global_variable(&cRubyEncoding);
+    cRubyEncoding = rb_path2class("Encoding");
+
+    ENCODING_INDEX_UTF8   = rb_enc_to_index(rb_utf8_encoding());
+    ENCODING_INDEX_BINARY = rb_enc_find_index("binary");
+#endif
+
+    rb_global_variable(&ENCODING_NAME_UTF8);
+    rb_global_variable(&ENCODING_NAME_BINARY);
+
+    ENCODING_NAME_UTF8   = rb_obj_freeze(rb_str_new2("utf-8"));
+    ENCODING_NAME_BINARY = rb_obj_freeze(rb_str_new2("binary"));
+
+    /* --------------------------------------------------------------- */
+
     rb_global_variable(&eTkCallbackReturn);
     rb_global_variable(&eTkCallbackBreak);
     rb_global_variable(&eTkCallbackContinue);
@@ -7918,14 +10306,32 @@ Init_tcltklib()
 
     rb_define_const(lib, "COMPILE_INFO", tcltklib_compile_info());
 
-    rb_define_const(lib, "RELEASE_DATE", 
+    rb_define_const(lib, "RELEASE_DATE",
                     rb_obj_freeze(rb_str_new2(tcltklib_release_date)));
 
-    rb_define_const(lib, "FINALIZE_PROC_NAME", 
+    rb_define_const(lib, "FINALIZE_PROC_NAME",
                     rb_str_new2(finalize_hook_name));
 
    /* --------------------------------------------------------------- */
 
+#ifdef __WIN32__
+#define TK_WINDOWING_SYSTEM "win32"
+#else
+#ifdef MAC_TCL
+#define TK_WINDOWING_SYSTEM "classic"
+#else
+#ifdef MAC_OSX_TK
+#define TK_WINDOWING_SYSTEM "aqua"
+#else
+#define TK_WINDOWING_SYSTEM "x11"
+#endif
+#endif
+#endif
+    rb_define_const(lib, "WINDOWING_SYSTEM",
+                    rb_obj_freeze(rb_str_new2(TK_WINDOWING_SYSTEM)));
+
+   /* --------------------------------------------------------------- */
+
     rb_define_const(ev_flag, "NONE",      INT2FIX(0));
     rb_define_const(ev_flag, "WINDOW",    INT2FIX(TCL_WINDOW_EVENTS));
     rb_define_const(ev_flag, "FILE",      INT2FIX(TCL_FILE_EVENTS));
@@ -7954,6 +10360,16 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
+    rb_define_module_function(lib, "get_version", lib_getversion, -1);
+    rb_define_module_function(lib, "get_release_type_name",
+			      lib_get_reltype_name, -1);
+
+    rb_define_const(release_type, "ALPHA", INT2FIX(TCL_ALPHA_RELEASE));
+    rb_define_const(release_type, "BETA",  INT2FIX(TCL_BETA_RELEASE));
+    rb_define_const(release_type, "FINAL", INT2FIX(TCL_FINAL_RELEASE));
+
+    /* --------------------------------------------------------------- */
+
     eTkCallbackReturn = rb_define_class("TkCallbackReturn", rb_eStandardError);
     eTkCallbackBreak = rb_define_class("TkCallbackBreak", rb_eStandardError);
     eTkCallbackContinue = rb_define_class("TkCallbackContinue",
@@ -7973,6 +10389,8 @@ Init_tcltklib()
 
     ID_at_enc = rb_intern("@encoding");
     ID_at_interp = rb_intern("@interp");
+    ID_encoding_name = rb_intern("encoding_name");
+    ID_encoding_table = rb_intern("encoding_table");
 
     ID_stop_p = rb_intern("stop?");
     ID_alive_p = rb_intern("alive?");
@@ -7995,49 +10413,53 @@ Init_tcltklib()
     /* --------------------------------------------------------------- */
 
     rb_define_module_function(lib, "mainloop", lib_mainloop, -1);
-    rb_define_module_function(lib, "mainloop_thread?", 
+    rb_define_module_function(lib, "mainloop_thread?",
                               lib_evloop_thread_p, 0);
-    rb_define_module_function(lib, "mainloop_watchdog", 
+    rb_define_module_function(lib, "mainloop_watchdog",
                               lib_mainloop_watchdog, -1);
-    rb_define_module_function(lib, "do_thread_callback", 
+    rb_define_module_function(lib, "do_thread_callback",
                               lib_thread_callback, -1);
     rb_define_module_function(lib, "do_one_event", lib_do_one_event, -1);
-    rb_define_module_function(lib, "mainloop_abort_on_exception", 
+    rb_define_module_function(lib, "mainloop_abort_on_exception",
                              lib_evloop_abort_on_exc, 0);
-    rb_define_module_function(lib, "mainloop_abort_on_exception=",  
+    rb_define_module_function(lib, "mainloop_abort_on_exception=",
                              lib_evloop_abort_on_exc_set, 1);
+    rb_define_module_function(lib, "set_eventloop_window_mode",
+			      set_eventloop_window_mode, 1);
+    rb_define_module_function(lib, "get_eventloop_window_mode",
+			      get_eventloop_window_mode, 0);
     rb_define_module_function(lib, "set_eventloop_tick",set_eventloop_tick,1);
     rb_define_module_function(lib, "get_eventloop_tick",get_eventloop_tick,0);
     rb_define_module_function(lib, "set_no_event_wait", set_no_event_wait, 1);
     rb_define_module_function(lib, "get_no_event_wait", get_no_event_wait, 0);
-    rb_define_module_function(lib, "set_eventloop_weight", 
+    rb_define_module_function(lib, "set_eventloop_weight",
                               set_eventloop_weight, 2);
     rb_define_module_function(lib, "set_max_block_time", set_max_block_time,1);
-    rb_define_module_function(lib, "get_eventloop_weight", 
+    rb_define_module_function(lib, "get_eventloop_weight",
                               get_eventloop_weight, 0);
-    rb_define_module_function(lib, "num_of_mainwindows", 
+    rb_define_module_function(lib, "num_of_mainwindows",
                               lib_num_of_mainwindows, 0);
 
     /* --------------------------------------------------------------- */
 
     rb_define_module_function(lib, "_split_tklist", lib_split_tklist, 1);
     rb_define_module_function(lib, "_merge_tklist", lib_merge_tklist, -1);
-    rb_define_module_function(lib, "_conv_listelement", 
+    rb_define_module_function(lib, "_conv_listelement",
                               lib_conv_listelement, 1);
     rb_define_module_function(lib, "_toUTF8", lib_toUTF8, -1);
     rb_define_module_function(lib, "_fromUTF8", lib_fromUTF8, -1);
-    rb_define_module_function(lib, "_subst_UTF_backslash", 
+    rb_define_module_function(lib, "_subst_UTF_backslash",
                               lib_UTF_backslash, 1);
-    rb_define_module_function(lib, "_subst_Tcl_backslash", 
+    rb_define_module_function(lib, "_subst_Tcl_backslash",
                               lib_Tcl_backslash, 1);
 
-    rb_define_module_function(lib, "encoding_system", 
+    rb_define_module_function(lib, "encoding_system",
                               lib_get_system_encoding, 0);
-    rb_define_module_function(lib, "encoding_system=", 
+    rb_define_module_function(lib, "encoding_system=",
                               lib_set_system_encoding, 1);
-    rb_define_module_function(lib, "encoding", 
+    rb_define_module_function(lib, "encoding",
                               lib_get_system_encoding, 0);
-    rb_define_module_function(lib, "encoding=", 
+    rb_define_module_function(lib, "encoding=",
                               lib_set_system_encoding, 1);
 
     /* --------------------------------------------------------------- */
@@ -8055,6 +10477,8 @@ Init_tcltklib()
     rb_define_method(ip, "has_mainwindow?", ip_has_mainwindow_p, 0);
     rb_define_method(ip, "invalid_namespace?", ip_has_invalid_namespace_p, 0);
     rb_define_method(ip, "_eval", ip_eval, 1);
+    rb_define_method(ip, "_cancel_eval", ip_cancel_eval, -1);
+    rb_define_method(ip, "_cancel_eval_unwind", ip_cancel_eval_unwind, -1);
     rb_define_method(ip, "_toUTF8", ip_toUTF8, -1);
     rb_define_method(ip, "_fromUTF8", ip_fromUTF8, -1);
     rb_define_method(ip, "_thread_vwait", ip_thread_vwait, 1);
@@ -8067,6 +10491,12 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
+    rb_define_method(ip, "create_dummy_encoding_for_tk",
+		     create_dummy_encoding_for_tk, 1);
+    rb_define_method(ip, "encoding_table", ip_get_encoding_table, 0);
+
+    /* --------------------------------------------------------------- */
+
     rb_define_method(ip, "_get_variable", ip_get_variable, 2);
     rb_define_method(ip, "_get_variable2", ip_get_variable2, 3);
     rb_define_method(ip, "_set_variable", ip_set_variable, 3);
@@ -8095,9 +10525,9 @@ Init_tcltklib()
     rb_define_method(ip, "mainloop", ip_mainloop, -1);
     rb_define_method(ip, "mainloop_watchdog", ip_mainloop_watchdog, -1);
     rb_define_method(ip, "do_one_event", ip_do_one_event, -1);
-    rb_define_method(ip, "mainloop_abort_on_exception", 
+    rb_define_method(ip, "mainloop_abort_on_exception",
                     ip_evloop_abort_on_exc, 0);
-    rb_define_method(ip, "mainloop_abort_on_exception=", 
+    rb_define_method(ip, "mainloop_abort_on_exception=",
                     ip_evloop_abort_on_exc_set, 1);
     rb_define_method(ip, "set_eventloop_tick", ip_set_eventloop_tick, 1);
     rb_define_method(ip, "get_eventloop_tick", ip_get_eventloop_tick, 0);
@@ -8111,12 +10541,13 @@ Init_tcltklib()
     /* --------------------------------------------------------------- */
 
     eventloop_thread = Qnil;
+    eventloop_interp = (Tcl_Interp*)NULL;
 
 #ifndef DEFAULT_EVENTLOOP_DEPTH
 #define DEFAULT_EVENTLOOP_DEPTH 7
-#endif 
+#endif
     eventloop_stack = rb_ary_new2(DEFAULT_EVENTLOOP_DEPTH);
-    OBJ_TAINT(eventloop_stack);
+    RbTk_OBJ_UNTRUST(eventloop_stack);
 
     watchdog_thread  = Qnil;
 
@@ -8124,9 +10555,11 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
-    /* if ruby->nativethread-supprt and tcltklib->doen't, 
+#ifdef HAVE_NATIVETHREAD
+    /* if ruby->nativethread-supprt and tcltklib->doen't,
        the following will cause link-error. */
-    is_ruby_native_thread();
+    ruby_native_thread_p();
+#endif
 
     /* --------------------------------------------------------------- */
 
@@ -8134,7 +10567,7 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
-    ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
     switch(ret) {
     case TCLTK_STUBS_OK:
         break;
@@ -8147,6 +10580,16 @@ Init_tcltklib()
     }
 
     /* --------------------------------------------------------------- */
+
+    /* Tcl stub check */
+    tcl_stubs_check();
+
+    Tcl_ObjType_ByteArray = Tcl_GetObjType(Tcl_ObjTypeName_ByteArray);
+    Tcl_ObjType_String    = Tcl_GetObjType(Tcl_ObjTypeName_String);
+
+    /* --------------------------------------------------------------- */
+
+    (void)call_original_exit;
 }
 
 /* eof */
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
index dd00d5d535..57de973c0a 100644
--- a/ext/tk/tkutil/extconf.rb
+++ b/ext/tk/tkutil/extconf.rb
@@ -7,5 +7,12 @@ end
 
 if has_tk
   require 'mkmf'
+
+  have_func("rb_obj_instance_exec", "ruby.h")
+  have_func("rb_obj_untrust", "ruby.h")
+  have_func("rb_obj_taint", "ruby.h")
+  have_func("rb_sym_to_s", "ruby.h")
+  have_func("strndup", "string.h")
+
   create_makefile('tkutil')
 end
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index f4271a724c..2f92b334bb 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -3,17 +3,41 @@
   tkutil.c -
 
   $Author$
-  $Date$
   created at: Fri Nov  3 00:47:54 JST 1995
 
 ************************************************/
 
-#define TKUTIL_RELEASE_DATE "2006-04-06"
+#define TKUTIL_RELEASE_DATE "2010-03-26"
 
 #include "ruby.h"
+
+#ifdef RUBY_VM
+static VALUE rb_thread_critical; /* dummy */
+#else
+/* On Ruby 1.8.x, use rb_thread_critical (defined at rubysig.h) */
 #include "rubysig.h"
-#include "version.h"
+#endif
+#ifdef HAVE_RUBY_ST_H
+#include "ruby/st.h"
+#else
 #include "st.h"
+#endif
+
+#if !defined(RHASH_TBL)
+#define RHASH_TBL(h) (RHASH(h)->tbl)
+#endif
+#if !defined(RSTRING_PTR)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+#if !defined(RARRAY_PTR)
+#define RARRAY_PTR(s) (RARRAY(s)->ptr)
+#define RARRAY_LEN(s) (RARRAY(s)->len)
+#endif
+
+#if defined(HAVE_STRNDUP) && !defined(_GNU_SOURCE)
+extern char *strndup(const char* _ptr, size_t _len);
+#endif
 
 static VALUE cMethod;
 
@@ -27,6 +51,8 @@ static VALUE TK_None;
 static VALUE cCB_SUBST;
 static VALUE cSUBST_INFO;
 
+static VALUE ENCODING_NAME_UTF8; /* for saving GC cost */
+
 static ID ID_split_tklist;
 static ID ID_toUTF8;
 static ID ID_fromUTF8;
@@ -50,6 +76,9 @@ static unsigned long CALLBACK_ID_NUM = 0;
 
 /*************************************/
 
+#if defined(HAVE_RB_OBJ_INSTANCE_EXEC) && !defined(RUBY_VM)
+extern VALUE rb_obj_instance_exec _((int, VALUE*, VALUE));
+#endif
 static VALUE
 tk_s_new(argc, argv, klass)
     int argc;
@@ -59,7 +88,7 @@ tk_s_new(argc, argv, klass)
     VALUE obj = rb_class_new_instance(argc, argv, klass);
 
     if (rb_block_given_p()) {
-#if RUBY_VERSION_MAJOR == 1 && RUBY_VERSION_MINOR <= 8 /* ruby 1.8.x */
+#ifndef HAVE_RB_OBJ_INSTANCE_EXEC
       rb_obj_instance_eval(0, 0, obj);
 #else
       rb_obj_instance_exec(1, &obj, obj);
@@ -74,12 +103,34 @@ static VALUE
 tkNone_to_s(self)
     VALUE self;
 {
+    return rb_str_new2("");
+}
+
+static VALUE
+tkNone_inspect(self)
+    VALUE self;
+{
     return rb_str_new2("None");
 }
 
 /*************************************/
 
 static VALUE
+tk_obj_untrust(self, obj)
+    VALUE self;
+    VALUE obj;
+{
+#ifdef HAVE_RB_OBJ_TAINT
+  rb_obj_taint(obj);
+#endif
+#ifdef HAVE_RB_OBJ_UNTRUST
+  rb_obj_untrust(obj);
+#endif
+
+  return obj;
+}
+
+static VALUE
 tk_eval_cmd(argc, argv, self)
     int argc;
     VALUE argv[];
@@ -104,12 +155,12 @@ tk_do_callback(argc, argv, self)
     rb_scan_args(argc, argv, "1*", &id, &rest);
     return rb_apply(rb_hash_aref(CALLBACK_TABLE, id), ID_call, rest);
 #endif
-    return rb_funcall2(rb_hash_aref(CALLBACK_TABLE, argv[0]), 
+    return rb_funcall2(rb_hash_aref(CALLBACK_TABLE, argv[0]),
                        ID_call, argc - 1, argv + 1);
 }
 
-static char *cmd_id_head = "ruby_cmd TkUtil callback ";
-static char *cmd_id_prefix = "cmd";
+static const char cmd_id_head[] = "ruby_cmd TkUtil callback ";
+static const char cmd_id_prefix[] = "cmd";
 
 static VALUE
 tk_install_cmd_core(cmd)
@@ -155,16 +206,16 @@ tk_uninstall_cmd(self, cmd_id)
     int prefix_len = strlen(cmd_id_prefix);
 
     StringValue(cmd_id);
-    if (strncmp(cmd_id_head, RSTRING(cmd_id)->ptr, head_len) != 0) {
+    if (strncmp(cmd_id_head, RSTRING_PTR(cmd_id), head_len) != 0) {
         return Qnil;
     }
-    if (strncmp(cmd_id_prefix, 
-                RSTRING(cmd_id)->ptr + head_len, prefix_len) != 0) {
+    if (strncmp(cmd_id_prefix,
+                RSTRING_PTR(cmd_id) + head_len, prefix_len) != 0) {
         return Qnil;
     }
 
-    return rb_hash_delete(CALLBACK_TABLE, 
-                          rb_str_new2(RSTRING(cmd_id)->ptr + head_len));
+    return rb_hash_delete(CALLBACK_TABLE,
+                          rb_str_new2(RSTRING_PTR(cmd_id) + head_len));
 }
 
 static VALUE
@@ -196,6 +247,7 @@ fromDefaultEnc_toUTF8(str, self)
     return tk_toUTF8(1, argv, self);
 }
 
+#if 0
 static VALUE
 fromUTF8_toDefaultEnc(str, self)
     VALUE str;
@@ -206,6 +258,7 @@ fromUTF8_toDefaultEnc(str, self)
     argv[0] = str;
     return tk_fromUTF8(1, argv, self);
 }
+#endif
 
 static int
 to_strkey(key, value, hash)
@@ -227,7 +280,7 @@ tk_symbolkey2str(self, keys)
 
     if NIL_P(keys) return new_keys;
     keys = rb_convert_type(keys, T_HASH, "Hash", "to_hash");
-    st_foreach(RHASH(keys)->tbl, to_strkey, new_keys);
+    st_foreach(RHASH_TBL(keys), to_strkey, new_keys);
     return new_keys;
 }
 
@@ -267,25 +320,24 @@ ary2list(ary, enc_flag, self)
         req_chk_flag = 0;
     }
 
-    /* size = RARRAY(ary)->len; */
+    /* size = RARRAY_LEN(ary); */
     size = 0;
-    for(idx = 0; idx < RARRAY(ary)->len; idx++) {
-        if (TYPE(RARRAY(ary)->ptr[idx]) == T_HASH) {
-            size += 2 * RHASH(RARRAY(ary)->ptr[idx])->tbl->num_entries;
+    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
+        if (TYPE(RARRAY_PTR(ary)[idx]) == T_HASH) {
+            size += 2 * RHASH_SIZE(RARRAY_PTR(ary)[idx]);
         } else {
             size++;
         }
     }
 
     dst = rb_ary_new2(size);
-    RARRAY(dst)->len = 0;
-    for(idx = 0; idx < RARRAY(ary)->len; idx++) {
-        val = RARRAY(ary)->ptr[idx];
+    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
+        val = RARRAY_PTR(ary)[idx];
         str_val = Qnil;
         switch(TYPE(val)) {
         case T_ARRAY:
             str_val = ary2list(val, enc_flag, self);
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+            rb_ary_push(dst, str_val);
 
             if (req_chk_flag) {
                 str_enc = rb_ivar_get(str_val, ID_at_enc);
@@ -303,19 +355,19 @@ ary2list(ary, enc_flag, self)
             break;
 
         case T_HASH:
-            /* RARRAY(dst)->ptr[RARRAY(dst)->len++] = hash2list(val, self); */
+	    /* rb_ary_push(dst, hash2list(val, self)); */
             if (RTEST(enc_flag)) {
                 val = hash2kv_enc(val, Qnil, self);
             } else {
                 val = hash2kv(val, Qnil, self);
             }
-            size2 = RARRAY(val)->len;
+            size2 = RARRAY_LEN(val);
             for(idx2 = 0; idx2 < size2; idx2++) {
-                val2 = RARRAY(val)->ptr[idx2];
+                val2 = RARRAY_PTR(val)[idx2];
                 switch(TYPE(val2)) {
                 case T_ARRAY:
                     str_val = ary2list(val2, enc_flag, self);
-                    RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+                    rb_ary_push(dst, str_val);
                     break;
 
                 case T_HASH:
@@ -324,13 +376,13 @@ ary2list(ary, enc_flag, self)
                     } else {
                         str_val = hash2list(val2, self);
                     }
-                    RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+                    rb_ary_push(dst, str_val);
                     break;
 
                 default:
                     if (val2 != TK_None) {
                         str_val = get_eval_string_core(val2, enc_flag, self);
-                        RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+                        rb_ary_push(dst, str_val);
                     }
                 }
 
@@ -352,7 +404,7 @@ ary2list(ary, enc_flag, self)
         default:
             if (val != TK_None) {
                 str_val = get_eval_string_core(val, enc_flag, self);
-                RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+                rb_ary_push(dst, str_val);
 
                 if (req_chk_flag) {
                     str_enc = rb_ivar_get(str_val, ID_at_enc);
@@ -371,21 +423,21 @@ ary2list(ary, enc_flag, self)
     }
 
     if (RTEST(dst_enc) && !NIL_P(sys_enc)) {
-        for(idx = 0; idx < RARRAY(dst)->len; idx++) {
-            str_val = RARRAY(dst)->ptr[idx];
+        for(idx = 0; idx < RARRAY_LEN(dst); idx++) {
+            str_val = RARRAY_PTR(dst)[idx];
             if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
                 str_val = rb_funcall(self, ID_toUTF8, 1, str_val);
             } else {
                 str_val = rb_funcall(cTclTkLib, ID_toUTF8, 1, str_val);
             }
-            RARRAY(dst)->ptr[idx] = str_val;
+            RARRAY_PTR(dst)[idx] = str_val;
         }
         val = rb_apply(cTclTkLib, ID_merge_tklist, dst);
         if (TYPE(dst_enc) == T_STRING) {
             val = rb_funcall(cTclTkLib, ID_fromUTF8, 2, val, dst_enc);
             rb_ivar_set(val, ID_at_enc, dst_enc);
         } else {
-            rb_ivar_set(val, ID_at_enc, rb_str_new2("utf-8"));
+            rb_ivar_set(val, ID_at_enc, ENCODING_NAME_UTF8);
         }
         return val;
     } else {
@@ -421,11 +473,10 @@ ary2list2(ary, enc_flag, self)
         req_chk_flag = 0;
     }
 
-    size = RARRAY(ary)->len;
+    size = RARRAY_LEN(ary);
     dst = rb_ary_new2(size);
-    RARRAY(dst)->len = 0;
-    for(idx = 0; idx < RARRAY(ary)->len; idx++) {
-        val = RARRAY(ary)->ptr[idx];
+    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
+        val = RARRAY_PTR(ary)[idx];
         str_val = Qnil;
         switch(TYPE(val)) {
         case T_ARRAY:
@@ -447,7 +498,7 @@ ary2list2(ary, enc_flag, self)
         }
 
         if (!NIL_P(str_val)) {
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+            rb_ary_push(dst, str_val);
 
             if (req_chk_flag) {
                 str_enc = rb_ivar_get(str_val, ID_at_enc);
@@ -465,21 +516,21 @@ ary2list2(ary, enc_flag, self)
     }
 
     if (RTEST(dst_enc) && !NIL_P(sys_enc)) {
-        for(idx = 0; idx < RARRAY(dst)->len; idx++) {
-            str_val = RARRAY(dst)->ptr[idx];
+        for(idx = 0; idx < RARRAY_LEN(dst); idx++) {
+            str_val = RARRAY_PTR(dst)[idx];
             if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
                 str_val = rb_funcall(self, ID_toUTF8, 1, str_val);
             } else {
                 str_val = rb_funcall(cTclTkLib, ID_toUTF8, 1, str_val);
             }
-            RARRAY(dst)->ptr[idx] = str_val;
+            RARRAY_PTR(dst)[idx] = str_val;
         }
         val = rb_apply(cTclTkLib, ID_merge_tklist, dst);
         if (TYPE(dst_enc) == T_STRING) {
             val = rb_funcall(cTclTkLib, ID_fromUTF8, 2, val, dst_enc);
             rb_ivar_set(val, ID_at_enc, dst_enc);
         } else {
-            rb_ivar_set(val, ID_at_enc, rb_str_new2("utf-8"));
+            rb_ivar_set(val, ID_at_enc, ENCODING_NAME_UTF8);
         }
         return val;
     } else {
@@ -503,38 +554,35 @@ assoc2kv(assoc, ary, self)
     int i, j, len;
     volatile VALUE pair;
     volatile VALUE val;
-    volatile VALUE dst = rb_ary_new2(2 * RARRAY(assoc)->len);
+    volatile VALUE dst = rb_ary_new2(2 * RARRAY_LEN(assoc));
 
-    len = RARRAY(assoc)->len;
+    len = RARRAY_LEN(assoc);
 
     for(i = 0; i < len; i++) {
-        pair = RARRAY(assoc)->ptr[i];
+        pair = RARRAY_PTR(assoc)[i];
         if (TYPE(pair) != T_ARRAY) {
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] = key2keyname(pair);
+            rb_ary_push(dst, key2keyname(pair));
             continue;
         }
-        switch(RARRAY(assoc)->len) {
+        switch(RARRAY_LEN(assoc)) {
         case 2:
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] = RARRAY(pair)->ptr[2];
+            rb_ary_push(dst, RARRAY_PTR(pair)[2]);
 
         case 1:
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = key2keyname(RARRAY(pair)->ptr[0]);
+            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
 
         case 0:
             continue;
 
         default:
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = key2keyname(RARRAY(pair)->ptr[0]);
+            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
 
-            val = rb_ary_new2(RARRAY(pair)->len - 1);
-            RARRAY(val)->len = 0;
-            for(j = 1; j < RARRAY(pair)->len; j++) {
-                RARRAY(val)->ptr[RARRAY(val)->len++] = RARRAY(pair)->ptr[j];
+            val = rb_ary_new2(RARRAY_LEN(pair) - 1);
+            for(j = 1; j < RARRAY_LEN(pair); j++) {
+                rb_ary_push(val, RARRAY_PTR(pair)[j]);
             }
 
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] = val;
+            rb_ary_push(dst, val);
         }
     }
 
@@ -554,40 +602,35 @@ assoc2kv_enc(assoc, ary, self)
     int i, j, len;
     volatile VALUE pair;
     volatile VALUE val;
-    volatile VALUE dst = rb_ary_new2(2 * RARRAY(assoc)->len);
+    volatile VALUE dst = rb_ary_new2(2 * RARRAY_LEN(assoc));
 
-    len = RARRAY(assoc)->len;
+    len = RARRAY_LEN(assoc);
 
     for(i = 0; i < len; i++) {
-        pair = RARRAY(assoc)->ptr[i];
+        pair = RARRAY_PTR(assoc)[i];
         if (TYPE(pair) != T_ARRAY) {
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] = key2keyname(pair);
+            rb_ary_push(dst, key2keyname(pair));
             continue;
         }
-        switch(RARRAY(assoc)->len) {
+        switch(RARRAY_LEN(assoc)) {
         case 2:
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = get_eval_string_core(RARRAY(pair)->ptr[2], Qtrue, self);
+            rb_ary_push(dst, get_eval_string_core(RARRAY_PTR(pair)[2], Qtrue, self));
 
         case 1:
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = key2keyname(RARRAY(pair)->ptr[0]);
+            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
 
         case 0:
             continue;
 
         default:
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = key2keyname(RARRAY(pair)->ptr[0]);
+            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
 
-            val = rb_ary_new2(RARRAY(pair)->len - 1);
-            RARRAY(val)->len = 0;
-            for(j = 1; j < RARRAY(pair)->len; j++) {
-                RARRAY(val)->ptr[RARRAY(val)->len++] = RARRAY(pair)->ptr[j];
+            val = rb_ary_new2(RARRAY_LEN(pair) - 1);
+            for(j = 1; j < RARRAY_LEN(pair); j++) {
+                rb_ary_push(val, RARRAY_PTR(pair)[j]);
             }
 
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = get_eval_string_core(val, Qtrue, self);
+            rb_ary_push(dst, get_eval_string_core(val, Qtrue, self));
         }
     }
 
@@ -606,19 +649,18 @@ push_kv(key, val, args)
 {
     volatile VALUE ary;
 
-    ary = RARRAY(args)->ptr[0];
+    ary = RARRAY_PTR(args)[0];
 
     if (key == Qundef) return ST_CONTINUE;
 #if 0
     rb_ary_push(ary, key2keyname(key));
     if (val != TK_None) rb_ary_push(ary, val);
 #endif
-    RARRAY(ary)->ptr[RARRAY(ary)->len++] = key2keyname(key);
+    rb_ary_push(ary, key2keyname(key));
 
     if (val == TK_None) return ST_CHECK;
 
-    RARRAY(ary)->ptr[RARRAY(ary)->len++]
-        = get_eval_string_core(val, Qnil, RARRAY(args)->ptr[1]);
+    rb_ary_push(ary, get_eval_string_core(val, Qnil, RARRAY_PTR(args)[1]));
 
     return ST_CHECK;
 }
@@ -629,15 +671,10 @@ hash2kv(hash, ary, self)
     VALUE ary;
     VALUE self;
 {
-    volatile VALUE args = rb_ary_new2(2);
-    volatile VALUE dst = rb_ary_new2(2 * RHASH(hash)->tbl->num_entries);
-
-    RARRAY(dst)->len = 0;
+    volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
+    volatile VALUE args = rb_ary_new3(2, dst, self);
 
-    RARRAY(args)->ptr[0] = dst;
-    RARRAY(args)->ptr[1] = self;
-    RARRAY(args)->len = 2;
-    st_foreach(RHASH(hash)->tbl, push_kv, args);
+    st_foreach(RHASH_TBL(hash), push_kv, args);
 
     if (NIL_P(ary)) {
         return dst;
@@ -654,22 +691,21 @@ push_kv_enc(key, val, args)
 {
     volatile VALUE ary;
 
-    ary = RARRAY(args)->ptr[0];
+    ary = RARRAY_PTR(args)[0];
 
     if (key == Qundef) return ST_CONTINUE;
 #if 0
     rb_ary_push(ary, key2keyname(key));
     if (val != TK_None) {
-        rb_ary_push(ary, get_eval_string_core(val, Qtrue, 
-                                              RARRAY(args)->ptr[1]));
+        rb_ary_push(ary, get_eval_string_core(val, Qtrue,
+                                              RARRAY_PTR(args)[1]));
     }
 #endif
-    RARRAY(ary)->ptr[RARRAY(ary)->len++] = key2keyname(key);
+    rb_ary_push(ary, key2keyname(key));
 
     if (val == TK_None) return ST_CHECK;
 
-    RARRAY(ary)->ptr[RARRAY(ary)->len++] 
-        = get_eval_string_core(val, Qtrue, RARRAY(args)->ptr[1]);
+    rb_ary_push(ary, get_eval_string_core(val, Qtrue, RARRAY_PTR(args)[1]));
 
     return ST_CHECK;
 }
@@ -680,15 +716,10 @@ hash2kv_enc(hash, ary, self)
     VALUE ary;
     VALUE self;
 {
-    volatile VALUE args = rb_ary_new2(2);
-    volatile VALUE dst = rb_ary_new2(2 * RHASH(hash)->tbl->num_entries);
-
-    RARRAY(dst)->len = 0;
+    volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
+    volatile VALUE args = rb_ary_new3(2, dst, self);
 
-    RARRAY(args)->ptr[0] = dst;
-    RARRAY(args)->ptr[1] = self;
-    RARRAY(args)->len = 2;
-    st_foreach(RHASH(hash)->tbl, push_kv_enc, args);
+    st_foreach(RHASH_TBL(hash), push_kv_enc, args);
 
     if (NIL_P(ary)) {
         return dst;
@@ -798,13 +829,17 @@ get_eval_string_core(obj, enc_flag, self)
     case T_SYMBOL:
         if (RTEST(enc_flag)) {
             if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
-                return rb_funcall(self, ID_toUTF8, 1, 
+                return rb_funcall(self, ID_toUTF8, 1,
                                   rb_str_new2(rb_id2name(SYM2ID(obj))));
             } else {
                 return fromDefaultEnc_toUTF8(rb_str_new2(rb_id2name(SYM2ID(obj))), self);
             }
         } else {
+#ifdef HAVE_RB_SYM_TO_S
+            return rb_sym_to_s(obj);
+#else
             return rb_str_new2(rb_id2name(SYM2ID(obj)));
+#endif
         }
 
     case T_HASH:
@@ -832,7 +867,7 @@ get_eval_string_core(obj, enc_flag, self)
     default:
         if (rb_obj_is_kind_of(obj, cTkObject)) {
             /* return rb_str_new3(rb_funcall(obj, ID_path, 0, 0)); */
-            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0), 
+            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0),
                                         enc_flag, self);
         }
 
@@ -850,19 +885,19 @@ get_eval_string_core(obj, enc_flag, self)
 
         if (rb_obj_respond_to(obj, ID_to_eval, Qtrue)) {
             /* return rb_funcall(obj, ID_to_eval, 0, 0); */
-            return get_eval_string_core(rb_funcall(obj, ID_to_eval, 0, 0), 
+            return get_eval_string_core(rb_funcall(obj, ID_to_eval, 0, 0),
                                         enc_flag, self);
         } else if (rb_obj_respond_to(obj, ID_path, Qtrue)) {
             /* return rb_funcall(obj, ID_path, 0, 0); */
-            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0), 
+            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0),
                                         enc_flag, self);
         } else if (rb_obj_respond_to(obj, ID_to_s, Qtrue)) {
             return rb_funcall(obj, ID_to_s, 0, 0);
         }
     }
 
-    rb_warning("fail to convert '%s' to string for Tk", 
-               RSTRING(rb_funcall(obj, rb_intern("inspect"), 0, 0))->ptr);
+    rb_warning("fail to convert '%s' to string for Tk",
+               RSTRING_PTR(rb_funcall(obj, rb_intern("inspect"), 0, 0)));
 
     return obj;
 }
@@ -915,14 +950,13 @@ tk_conv_args(argc, argv, self)
 
     for(size = 0, idx = 2; idx < argc; idx++) {
         if (TYPE(argv[idx]) == T_HASH) {
-            size += 2 * RHASH(argv[idx])->tbl->num_entries;
+            size += 2 * RHASH_SIZE(argv[idx]);
         } else {
             size++;
         }
     }
     /* dst = rb_ary_new2(argc - 2); */
     dst = rb_ary_new2(size);
-    RARRAY(dst)->len = 0;
     for(idx = 2; idx < argc; idx++) {
         if (TYPE(argv[idx]) == T_HASH) {
             if (RTEST(argv[1])) {
@@ -931,8 +965,7 @@ tk_conv_args(argc, argv, self)
                 hash2kv(argv[idx], dst, self);
             }
         } else if (argv[idx] != TK_None) {
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = get_eval_string_core(argv[idx], argv[1], self);
+            rb_ary_push(dst, get_eval_string_core(argv[idx], argv[1], self));
         }
     }
 
@@ -966,46 +999,48 @@ tcl2rb_bool(self, value)
 
     value = rb_funcall(value, ID_downcase, 0);
 
-    if (RSTRING(value)->ptr == (char*)NULL) return Qnil;
+    if (RSTRING_PTR(value) == (char*)NULL) return Qnil;
 
-    if (RSTRING(value)->ptr[0] == '\0'
-        || strcmp(RSTRING(value)->ptr, "0") == 0
-        || strcmp(RSTRING(value)->ptr, "no") == 0
-        || strcmp(RSTRING(value)->ptr, "off") == 0
-        || strcmp(RSTRING(value)->ptr, "false") == 0) {
+    if (RSTRING_PTR(value)[0] == '\0'
+        || strcmp(RSTRING_PTR(value), "0") == 0
+        || strcmp(RSTRING_PTR(value), "no") == 0
+        || strcmp(RSTRING_PTR(value), "off") == 0
+        || strcmp(RSTRING_PTR(value), "false") == 0) {
         return Qfalse;
     } else {
         return Qtrue;
     }
 }
 
+#if 0
 static VALUE
 tkstr_to_dec(value)
     VALUE value;
 {
-    return rb_cstr_to_inum(RSTRING(value)->ptr, 10, 1);
+    return rb_cstr_to_inum(RSTRING_PTR(value), 10, 1);
 }
+#endif
 
 static VALUE
 tkstr_to_int(value)
     VALUE value;
 {
-    return rb_cstr_to_inum(RSTRING(value)->ptr, 0, 1);
+    return rb_cstr_to_inum(RSTRING_PTR(value), 0, 1);
 }
 
 static VALUE
 tkstr_to_float(value)
     VALUE value;
 {
-    return rb_float_new(rb_cstr_to_dbl(RSTRING(value)->ptr, 1));
+    return rb_float_new(rb_cstr_to_dbl(RSTRING_PTR(value), 1));
 }
 
 static VALUE
 tkstr_invalid_numstr(value)
     VALUE value;
 {
-    rb_raise(rb_eArgError, 
-             "invalid value for Number: '%s'", RSTRING(value)->ptr);
+    rb_raise(rb_eArgError,
+             "invalid value for Number: '%s'", RSTRING_PTR(value));
     return Qnil; /*dummy*/
 }
 
@@ -1013,8 +1048,8 @@ static VALUE
 tkstr_rescue_float(value)
     VALUE value;
 {
-    return rb_rescue2(tkstr_to_float, value, 
-                      tkstr_invalid_numstr, value, 
+    return rb_rescue2(tkstr_to_float, value,
+                      tkstr_invalid_numstr, value,
                       rb_eArgError, 0);
 }
 
@@ -1024,10 +1059,10 @@ tkstr_to_number(value)
 {
     rb_check_type(value, T_STRING);
 
-    if (RSTRING(value)->ptr == (char*)NULL) return INT2FIX(0);
+    if (RSTRING_PTR(value) == (char*)NULL) return INT2FIX(0);
 
-    return rb_rescue2(tkstr_to_int, value, 
-                      tkstr_rescue_float, value, 
+    return rb_rescue2(tkstr_to_int, value,
+                      tkstr_rescue_float, value,
                       rb_eArgError, 0);
 }
 
@@ -1046,8 +1081,8 @@ tkstr_to_str(value)
     char * ptr;
     int len;
 
-    ptr = RSTRING(value)->ptr;
-    len = RSTRING(value)->len;
+    ptr = RSTRING_PTR(value);
+    len = RSTRING_LEN(value);
 
     if (len > 1 && *ptr == '{' && *(ptr + len - 1) == '}') {
         return rb_str_new(ptr + 1, len - 2);
@@ -1062,7 +1097,7 @@ tcl2rb_string(self, value)
 {
     rb_check_type(value, T_STRING);
 
-    if (RSTRING(value)->ptr == (char*)NULL) return rb_tainted_str_new2("");
+    if (RSTRING_PTR(value) == (char*)NULL) return rb_tainted_str_new2("");
 
     return tkstr_to_str(value);
 }
@@ -1074,21 +1109,35 @@ tcl2rb_num_or_str(self, value)
 {
     rb_check_type(value, T_STRING);
 
-    if (RSTRING(value)->ptr == (char*)NULL) return rb_tainted_str_new2("");
+    if (RSTRING_PTR(value) == (char*)NULL) return rb_tainted_str_new2("");
 
-    return rb_rescue2(tkstr_to_number, value, 
-                      tkstr_to_str, value, 
+    return rb_rescue2(tkstr_to_number, value,
+                      tkstr_to_str, value,
                       rb_eArgError, 0);
 }
 
+static VALUE
+tcl2rb_num_or_nil(self, value)
+    VALUE self;
+    VALUE value;
+{
+    rb_check_type(value, T_STRING);
+
+    if (RSTRING_LEN(value) == 0) return Qnil;
+
+    return tkstr_to_number(value);
+}
+
 
 /*************************************/
 
+#define CBSUBST_TBL_MAX (256)
 struct cbsubst_info {
-    int   size;
-    char  *key;
-    char  *type;
-    ID    *ivar;
+    int   full_subst_length;
+    int   keylen[CBSUBST_TBL_MAX];
+    char  *key[CBSUBST_TBL_MAX];
+    char  type[CBSUBST_TBL_MAX];
+    ID    ivar[CBSUBST_TBL_MAX];
     VALUE proc;
     VALUE aliases;
 };
@@ -1105,42 +1154,53 @@ static void
 subst_free(ptr)
     struct cbsubst_info *ptr;
 {
+    int i;
+
     if (ptr) {
-        if (ptr->key != (char*)NULL) free(ptr->key);
-        if (ptr->type != (char*)NULL) free(ptr->type);
-        if (ptr->ivar != (ID*)NULL) free(ptr->ivar);
-        free(ptr);
+      for(i = 0; i < CBSUBST_TBL_MAX; i++) {
+	if (ptr->key[i] != NULL) {
+	  free(ptr->key[i]); /* allocated by malloc */
+	  ptr->key[i] = NULL;
+	}
+      }
+      xfree(ptr); /* allocated by ALLOC */
     }
 }
 
-static void
-cbsubst_init()
+static VALUE
+allocate_cbsubst_info(struct cbsubst_info **inf_ptr)
 {
-    struct cbsubst_info *inf;
-    ID *ivar;
-    volatile VALUE proc, aliases;
+  struct cbsubst_info *inf;
+  volatile VALUE proc, aliases;
+  int idx;
 
-    inf = ALLOC(struct cbsubst_info);
+  inf = ALLOC(struct cbsubst_info);
 
-    inf->size = 0;
+  inf->full_subst_length = 0;
 
-    inf->key = ALLOC_N(char, 1);
-    inf->key[0] = '\0';
+  for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
+    inf->keylen[idx] = 0;
+    inf->key[idx]    = NULL;
+    inf->type[idx]   = '\0';
+    inf->ivar[idx]   = (ID) 0;
+  }
 
-    inf->type = ALLOC_N(char, 1);
-    inf->type[0] = '\0';
+  proc = rb_hash_new();
+  inf->proc = proc;
 
-    ivar = ALLOC_N(ID, 1);
-    inf->ivar = ivar;
+  aliases = rb_hash_new();
+  inf->aliases = aliases;
 
-    proc = rb_hash_new();
-    inf->proc = proc;
+  if (inf_ptr != (struct cbsubst_info **)NULL) *inf_ptr = inf;
 
-    aliases = rb_hash_new();
-    inf->aliases = aliases;
+  return Data_Wrap_Struct(cSUBST_INFO, subst_mark, subst_free, inf);
+}
 
-    rb_const_set(cCB_SUBST, ID_SUBST_INFO, 
-                 Data_Wrap_Struct(cSUBST_INFO, subst_mark, subst_free, inf));
+static void
+cbsubst_init()
+{
+  rb_const_set(cCB_SUBST, ID_SUBST_INFO,
+	       allocate_cbsubst_info((struct cbsubst_info **)NULL));
 }
 
 static VALUE
@@ -1150,24 +1210,29 @@ cbsubst_initialize(argc, argv, self)
     VALUE self;
 {
     struct cbsubst_info *inf;
-    int idx;
+    int idx, iv_idx;
 
-    Data_Get_Struct(rb_const_get(rb_obj_class(self), ID_SUBST_INFO), 
+    Data_Get_Struct(rb_const_get(rb_obj_class(self), ID_SUBST_INFO),
                     struct cbsubst_info, inf);
 
-    for(idx = 0; idx < argc; idx++) {
-        rb_ivar_set(self, inf->ivar[idx], argv[idx]);
+   idx = 0;
+    for(iv_idx = 0; iv_idx < CBSUBST_TBL_MAX; iv_idx++) {
+      if ( inf->ivar[iv_idx] == (ID) 0 ) continue;
+      rb_ivar_set(self, inf->ivar[iv_idx], argv[idx++]);
+      if (idx >= argc) break;
     }
 
     return self;
 }
 
-
 static VALUE
 cbsubst_ret_val(self, val)
     VALUE self;
     VALUE val;
 {
+    /* This method may be overwritten on some sub-classes.                  */
+    /* This method is used for converting from ruby's callback-return-value */
+    /* to tcl's value (e.g. validation procedure of entry widget).          */
     return val;
 }
 
@@ -1181,25 +1246,25 @@ each_attr_def(key, value, klass)
 
     switch(TYPE(key)) {
     case T_STRING:
-        key_id = rb_intern(RSTRING(key)->ptr);
+        key_id = rb_intern(RSTRING_PTR(key));
         break;
     case T_SYMBOL:
         key_id = SYM2ID(key);
         break;
     default:
-        rb_raise(rb_eArgError, 
+        rb_raise(rb_eArgError,
                  "includes invalid key(s). expected a String or a Symbol");
     }
 
     switch(TYPE(value)) {
     case T_STRING:
-        value_id = rb_intern(RSTRING(value)->ptr);
+        value_id = rb_intern(RSTRING_PTR(value));
         break;
     case T_SYMBOL:
         value_id = SYM2ID(value);
         break;
     default:
-        rb_raise(rb_eArgError, 
+        rb_raise(rb_eArgError,
                  "includes invalid value(s). expected a String or a Symbol");
     }
 
@@ -1219,7 +1284,7 @@ cbsubst_def_attr_aliases(self, tbl)
         rb_raise(rb_eArgError, "expected a Hash");
     }
 
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
                     struct cbsubst_info, inf);
 
     rb_hash_foreach(tbl, each_attr_def, self);
@@ -1228,28 +1293,80 @@ cbsubst_def_attr_aliases(self, tbl)
 }
 
 static VALUE
+cbsubst_sym_to_subst(self, sym)
+    VALUE self;
+    VALUE sym;
+{
+    struct cbsubst_info *inf;
+    const char *str;
+    char *buf, *ptr;
+    int idx, len;
+    ID id;
+    volatile VALUE ret;
+
+    if (TYPE(sym) != T_SYMBOL) return sym;
+
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
+                    struct cbsubst_info, inf);
+
+    if (!NIL_P(ret = rb_hash_aref(inf->aliases, sym))) {
+      str = rb_id2name(SYM2ID(ret));
+    } else {
+      str = rb_id2name(SYM2ID(sym));
+    }
+
+    id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str)));
+
+    for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
+      if (inf->ivar[idx] == id) break;
+    }
+    if (idx >= CBSUBST_TBL_MAX)  return sym;
+
+    ptr = buf = ALLOC_N(char, inf->full_subst_length + 1);
+
+    *(ptr++) = '%';
+
+    if (len = inf->keylen[idx]) {
+      /* longname */
+      strncpy(ptr, inf->key[idx], len);
+      ptr += len;
+    } else {
+      /* single char */
+      *(ptr++) = (unsigned char)idx;
+    }
+
+    *(ptr++) = ' ';
+    *(ptr++) = '\0';
+
+    ret = rb_str_new2(buf);
+
+    xfree(buf);
+
+    return ret;
+}
+
+static VALUE
 cbsubst_get_subst_arg(argc, argv, self)
     int   argc;
     VALUE *argv;
     VALUE self;
 {
     struct cbsubst_info *inf;
-    char *str, *buf, *ptr;
-    int i, j, len;
+    const char *str;
+    char *buf, *ptr;
+    int i, idx, len;
     ID id;
     volatile VALUE arg_sym, ret;
 
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
                     struct cbsubst_info, inf);
 
-    buf = ALLOC_N(char, 3*argc + 1);
-    ptr = buf;
-    len = strlen(inf->key);
+    ptr = buf = ALLOC_N(char, inf->full_subst_length + 1);
 
     for(i = 0; i < argc; i++) {
         switch(TYPE(argv[i])) {
         case T_STRING:
-            str = RSTRING(argv[i])->ptr;
+            str = RSTRING_PTR(argv[i]);
             arg_sym = ID2SYM(rb_intern(str));
             break;
         case T_SYMBOL:
@@ -1264,26 +1381,34 @@ cbsubst_get_subst_arg(argc, argv, self)
             str = rb_id2name(SYM2ID(ret));
         }
 
-        id = rb_intern(RSTRING(rb_str_cat2(rb_str_new2("@"), str))->ptr);
-
-        for(j = 0; j < len; j++) {
-            if (inf->ivar[j] == id) break;
-        }
+        id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str)));
 
-        if (j >= len) {
+	for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
+	  if (inf->ivar[idx] == id) break;
+	}
+        if (idx >= CBSUBST_TBL_MAX) {
             rb_raise(rb_eArgError, "cannot find attribute :%s", str);
         }
 
-        *(ptr++) = '%';
-        *(ptr++) = *(inf->key + j);
-        *(ptr++) = ' ';
+	*(ptr++) = '%';
+
+	if (len = inf->keylen[idx]) {
+	  /* longname */
+	  strncpy(ptr, inf->key[idx], len);
+	  ptr += len;
+	} else {
+	  /* single char */
+	  *(ptr++) = (unsigned char)idx;
+	}
+
+	*(ptr++) = ' ';
     }
 
     *ptr = '\0';
 
     ret = rb_str_new2(buf);
 
-    free(buf);
+    xfree(buf);
 
     return ret;
 }
@@ -1293,28 +1418,51 @@ cbsubst_get_subst_key(self, str)
     VALUE self;
     VALUE str;
 {
+    struct cbsubst_info *inf;
     volatile VALUE list;
     volatile VALUE ret;
-    int i, len;
-    char *buf, *ptr;
+    VALUE keyval;
+    int i, len, keylen, idx;
+    char *buf, *ptr, *key;
 
     list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str);
+    len = RARRAY_LEN(list);
 
-    len = RARRAY(list)->len;
-    buf = ALLOC_N(char, len + 1);
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
+                    struct cbsubst_info, inf);
+
+    ptr = buf = ALLOC_N(char, inf->full_subst_length + len + 1);
 
     for(i = 0; i < len; i++) {
-        ptr = RSTRING(RARRAY(list)->ptr[i])->ptr;
-        if (*ptr == '%' && *(ptr + 2) == '\0') {
-            *(buf + i) = *(ptr + 1);
-        } else {
-            *(buf + i) = ' ';
-        }
+      keyval = RARRAY_PTR(list)[i];
+      key = RSTRING_PTR(keyval);
+      if (*key == '%') {
+	if (*(key + 2) == '\0') {
+	  /* single char */
+	  *(ptr++) = *(key + 1);
+	} else {
+	  /* search longname-key */
+	  keylen = RSTRING_LEN(keyval) - 1;
+	  for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
+	    if (inf->keylen[idx] != keylen) continue;
+	    if ((unsigned char)inf->key[idx][0] != (unsigned char)*(key + 1)) continue;
+	    if (strncmp(inf->key[idx], key + 1, keylen)) continue;
+	    break;
+	  }
+	  if (idx < CBSUBST_TBL_MAX) {
+	    *(ptr++) = (unsigned char)idx;
+	  } else {
+	    *(ptr++) = ' ';
+	  }
+	}
+      } else {
+	*(ptr++) = ' ';
+      }
     }
-    *(buf + len) = '\0';
+    *ptr = '\0';
 
     ret = rb_str_new2(buf);
-    free(buf);
+    xfree(buf);
     return ret;
 }
 
@@ -1324,99 +1472,164 @@ cbsubst_get_all_subst_keys(self)
 {
     struct cbsubst_info *inf;
     char *buf, *ptr;
-    int i, len;
+    char *keys_buf, *keys_ptr;
+    int idx, len;
     volatile VALUE ret;
 
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
                     struct cbsubst_info, inf);
 
-    len = strlen(inf->key);
-    buf = ALLOC_N(char, 3*len + 1);
-    ptr = buf;
-    for(i = 0; i < len; i++) {
-        *(ptr++) = '%';
-        *(ptr++) = *(inf->key + i);
-        *(ptr++) = ' ';
+    ptr = buf = ALLOC_N(char, inf->full_subst_length + 1);
+    keys_ptr = keys_buf = ALLOC_N(char, CBSUBST_TBL_MAX + 1);
+
+    for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
+      if (inf->ivar[idx] == (ID) 0) continue;
+
+      *(keys_ptr++) = (unsigned char)idx;
+
+      *(ptr++) = '%';
+
+      if (len = inf->keylen[idx]) {
+	/* longname */
+	strncpy(ptr, inf->key[idx], len);
+	ptr += len;
+      } else {
+	/* single char */
+	*(ptr++) = (unsigned char)idx;
+      }
+
+      *(ptr++) = ' ';
     }
-    *(buf + 3*len) = '\0';
 
-    ret = rb_ary_new3(2, rb_str_new2(inf->key), rb_str_new2(buf));
+    *ptr = '\0';
+    *keys_ptr = '\0';
+
+    ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2(buf));
 
-    free(buf);
+    xfree(buf);
+    xfree(keys_buf);
 
     return ret;
 }
 
 static VALUE
-cbsubst_table_setup(self, key_inf, proc_inf)
-    VALUE self;
-    VALUE key_inf;
-    VALUE proc_inf;
+cbsubst_table_setup(argc, argv, self)
+     int   argc;
+     VALUE *argv;
+     VALUE self;
 {
-    struct cbsubst_info *subst_inf;
-    int idx;
-    int len = RARRAY(key_inf)->len;
-    int real_len = 0;
-    char *key = ALLOC_N(char, len + 1);
-    char *type = ALLOC_N(char, len + 1);
-    ID *ivar = ALLOC_N(ID, len + 1);
-    volatile VALUE proc = rb_hash_new();
-    volatile VALUE aliases = rb_hash_new();
-    volatile VALUE inf;
-
-    /* init */
-    subst_inf = ALLOC(struct cbsubst_info);
-    /* subst_inf->size = len; */
-    subst_inf->key  = key;
-    subst_inf->type = type;
-    subst_inf->ivar = ivar;
-    subst_inf->proc = proc;
-    subst_inf->aliases = aliases;
-
-    /*
-     * keys : array of [subst, type, ivar]
-     *         subst ==> char code 
-     *         type  ==> char code 
-     *         ivar  ==> symbol
-     */
-    for(idx = 0; idx < len; idx++) {
-        inf = RARRAY(key_inf)->ptr[idx];
-        if (TYPE(inf) != T_ARRAY) continue;
-        *(key  + real_len) = (char)NUM2INT(RARRAY(inf)->ptr[0]);
-        *(type + real_len) = (char)NUM2INT(RARRAY(inf)->ptr[1]);
-
-        *(ivar + real_len) 
-            = rb_intern(
-                RSTRING(
-                  rb_str_cat2(rb_str_new2("@"), 
-                              rb_id2name(SYM2ID(RARRAY(inf)->ptr[2])))
-                )->ptr
-              );
-
-        rb_attr(self, SYM2ID(RARRAY(inf)->ptr[2]), 1, 0, Qtrue);
-        real_len++;
+  volatile VALUE cbsubst_obj;
+  volatile VALUE key_inf;
+  volatile VALUE longkey_inf;
+  volatile VALUE proc_inf;
+  VALUE inf;
+  ID id;
+  struct cbsubst_info *subst_inf;
+  int idx, len;
+  unsigned char chr;
+
+  /* accept (key_inf, proc_inf) or (key_inf, longkey_inf, procinf) */
+  if (rb_scan_args(argc, argv, "21", &key_inf, &longkey_inf, &proc_inf) == 2) {
+    proc_inf = longkey_inf;
+    longkey_inf = rb_ary_new();
+  }
+
+  /* check the number of longkeys */
+  if (RARRAY_LEN(longkey_inf) > 125 /* from 0x80 to 0xFD */) {
+    rb_raise(rb_eArgError, "too many longname-key definitions");
+  }
+
+  /* init */
+  cbsubst_obj = allocate_cbsubst_info(&subst_inf);
+
+  /*
+   * keys : array of [subst, type, ivar]
+   *         subst ==> char code or string
+   *         type  ==> char code or string
+   *         ivar  ==> symbol
+   */
+  len = RARRAY_LEN(key_inf);
+  for(idx = 0; idx < len; idx++) {
+    inf = RARRAY_PTR(key_inf)[idx];
+    if (TYPE(inf) != T_ARRAY) continue;
+
+    if (TYPE(RARRAY_PTR(inf)[0]) == T_STRING) {
+      chr = *(RSTRING_PTR(RARRAY_PTR(inf)[0]));
+    } else {
+      chr = NUM2CHR(RARRAY_PTR(inf)[0]);
     }
-    *(key + real_len) = '\0';
-    *(type + real_len) = '\0';
-    subst_inf->size = real_len;
-
-    /*
-     * procs : array of [type, proc]
-     *         type  ==> char code 
-     *         proc  ==> proc/method/obj (must respond to 'call')
-     */
-    len = RARRAY(proc_inf)->len;
-    for(idx = 0; idx < len; idx++) {
-        inf = RARRAY(proc_inf)->ptr[idx];
-        if (TYPE(inf) != T_ARRAY) continue;
-        rb_hash_aset(proc, RARRAY(inf)->ptr[0], RARRAY(inf)->ptr[1]);
+    if (TYPE(RARRAY_PTR(inf)[1]) == T_STRING) {
+      subst_inf->type[chr] = *(RSTRING_PTR(RARRAY_PTR(inf)[1]));
+    } else {
+      subst_inf->type[chr] = NUM2CHR(RARRAY_PTR(inf)[1]);
     }
 
-    rb_const_set(self, ID_SUBST_INFO, 
-                 Data_Wrap_Struct(cSUBST_INFO, subst_mark, 
-                                  subst_free, subst_inf));
+    subst_inf->full_subst_length += 3;
 
-    return self;
+    id = SYM2ID(RARRAY_PTR(inf)[2]);
+    subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
+
+    rb_attr(self, id, 1, 0, Qtrue);
+  }
+
+
+  /*
+   * longkeys : array of [name, type, ivar]
+   *         name ==> longname key string
+   *         type ==> char code or string
+   *         ivar ==> symbol
+   */
+  len = RARRAY_LEN(longkey_inf);
+  for(idx = 0; idx < len; idx++) {
+    inf = RARRAY_PTR(longkey_inf)[idx];
+    if (TYPE(inf) != T_ARRAY) continue;
+
+    chr = (unsigned char)(0x80 + idx);
+    subst_inf->keylen[chr] = RSTRING_LEN(RARRAY_PTR(inf)[0]);
+#if HAVE_STRNDUP
+    subst_inf->key[chr] = strndup(RSTRING_PTR(RARRAY_PTR(inf)[0]),
+				  RSTRING_LEN(RARRAY_PTR(inf)[0]));
+#else
+    subst_inf->key[chr] = malloc(RSTRING_LEN(RARRAY_PTR(inf)[0]) + 1);
+    if (subst_inf->key[chr]) {
+      strncpy(subst_inf->key[chr], RSTRING_PTR(RARRAY_PTR(inf)[0]),
+	      RSTRING_LEN(RARRAY_PTR(inf)[0]) + 1);
+      subst_inf->key[chr][RSTRING_LEN(RARRAY_PTR(inf)[0])] = '\0';
+    }
+#endif
+    if (TYPE(RARRAY_PTR(inf)[1]) == T_STRING) {
+      subst_inf->type[chr] = *(RSTRING_PTR(RARRAY_PTR(inf)[1]));
+    } else {
+      subst_inf->type[chr] = NUM2CHR(RARRAY_PTR(inf)[1]);
+    }
+
+    subst_inf->full_subst_length += (subst_inf->keylen[chr] + 2);
+
+    id = SYM2ID(RARRAY_PTR(inf)[2]);
+    subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
+
+    rb_attr(self, id, 1, 0, Qtrue);
+  }
+
+  /*
+   * procs : array of [type, proc]
+   *         type  ==> char code or string
+   *         proc  ==> proc/method/obj (must respond to 'call')
+   */
+  len = RARRAY_LEN(proc_inf);
+  for(idx = 0; idx < len; idx++) {
+    inf = RARRAY_PTR(proc_inf)[idx];
+    if (TYPE(inf) != T_ARRAY) continue;
+    rb_hash_aset(subst_inf->proc,
+		 ((TYPE(RARRAY_PTR(inf)[0]) == T_STRING)?
+		  INT2FIX(*(RSTRING_PTR(RARRAY_PTR(inf)[0]))) :
+		  RARRAY_PTR(inf)[0]),
+		 RARRAY_PTR(inf)[1]);
+  }
+
+  rb_const_set(self, ID_SUBST_INFO, cbsubst_obj);
+
+  return self;
 }
 
 static VALUE
@@ -1434,10 +1647,11 @@ cbsubst_scan_args(self, arg_key, val_ary)
 {
     struct cbsubst_info *inf;
     int idx;
-    int len = RARRAY(val_ary)->len;
-    char c;
-    char *ptr;
-    volatile VALUE dst = rb_ary_new2(len);
+    unsigned char *keyptr = (unsigned char*)RSTRING_PTR(arg_key);
+    int keylen = RSTRING_LEN(arg_key);
+    int vallen = RARRAY_LEN(val_ary);
+    unsigned char type_chr;
+    volatile VALUE dst = rb_ary_new2(vallen);
     volatile VALUE proc;
     int thr_crit_bup;
     VALUE old_gc;
@@ -1447,31 +1661,28 @@ cbsubst_scan_args(self, arg_key, val_ary)
 
     old_gc = rb_gc_disable();
 
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
                     struct cbsubst_info, inf);
 
-    RARRAY(dst)->len = 0;
-    for(idx = 0; idx < len; idx++) {
-        if (idx >= RSTRING(arg_key)->len) {
-            proc = Qnil;
-        } else if (*(RSTRING(arg_key)->ptr + idx) == ' ') {
-            proc = Qnil;
-        } else {
-          ptr = strchr(inf->key, *(RSTRING(arg_key)->ptr + idx));
-          if (ptr == (char*)NULL) {
-            proc = Qnil;
-          } else {
-            c = *(inf->type + (ptr - inf->key));
-            proc = rb_hash_aref(inf->proc, INT2FIX(c));
-          }
-        }
-
-        if (NIL_P(proc)) {
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] = RARRAY(val_ary)->ptr[idx];
-        } else {
-            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
-                = rb_funcall(proc, ID_call, 1, RARRAY(val_ary)->ptr[idx]);
-        }
+    for(idx = 0; idx < vallen; idx++) {
+      if (idx >= keylen) {
+	proc = Qnil;
+      } else if (*(keyptr + idx) == ' ') {
+	proc = Qnil;
+      } else {
+	if (type_chr = inf->type[*(keyptr + idx)]) {
+	  proc = rb_hash_aref(inf->proc, INT2FIX((int)type_chr));
+	} else {
+	  proc = Qnil;
+	}
+      }
+
+      if (NIL_P(proc)) {
+	rb_ary_push(dst, RARRAY_PTR(val_ary)[idx]);
+      } else {
+	rb_ary_push(dst, rb_funcall(proc, ID_call, 1,
+				    RARRAY_PTR(val_ary)[idx]));
+      }
     }
 
     if (old_gc == Qfalse) rb_gc_enable();
@@ -1512,6 +1723,7 @@ tkobj_path(self)
     return rb_ivar_get(self, ID_at_path);
 }
 
+
 /*************************************/
 /* release date */
 const char tkutil_release_date[] = TKUTIL_RELEASE_DATE;
@@ -1524,7 +1736,7 @@ Init_tkutil()
 
     /* --------------------- */
 
-    rb_define_const(mTK, "RELEASE_DATE", 
+    rb_define_const(mTK, "RELEASE_DATE",
                     rb_obj_freeze(rb_str_new2(tkutil_release_date)));
 
     /* --------------------- */
@@ -1554,17 +1766,19 @@ Init_tkutil()
     ID_SUBST_INFO = rb_intern("SUBST_INFO");
     rb_define_singleton_method(cCB_SUBST, "ret_val", cbsubst_ret_val, 1);
     rb_define_singleton_method(cCB_SUBST, "scan_args", cbsubst_scan_args, 2);
-    rb_define_singleton_method(cCB_SUBST, "subst_arg", 
+    rb_define_singleton_method(cCB_SUBST, "_sym2subst",
+			       cbsubst_sym_to_subst, 1);
+    rb_define_singleton_method(cCB_SUBST, "subst_arg",
                                cbsubst_get_subst_arg, -1);
-    rb_define_singleton_method(cCB_SUBST, "_get_subst_key", 
+    rb_define_singleton_method(cCB_SUBST, "_get_subst_key",
                                cbsubst_get_subst_key,  1);
-    rb_define_singleton_method(cCB_SUBST, "_get_all_subst_keys", 
+    rb_define_singleton_method(cCB_SUBST, "_get_all_subst_keys",
                                cbsubst_get_all_subst_keys,  0);
-    rb_define_singleton_method(cCB_SUBST, "_setup_subst_table", 
-                               cbsubst_table_setup, 2);
-    rb_define_singleton_method(cCB_SUBST, "_get_extra_args_tbl", 
+    rb_define_singleton_method(cCB_SUBST, "_setup_subst_table",
+                               cbsubst_table_setup, -1);
+    rb_define_singleton_method(cCB_SUBST, "_get_extra_args_tbl",
                                cbsubst_get_extra_args_tbl,  0);
-    rb_define_singleton_method(cCB_SUBST, "_define_attribute_aliases", 
+    rb_define_singleton_method(cCB_SUBST, "_define_attribute_aliases",
                                cbsubst_def_attr_aliases,  1);
 
     rb_define_method(cCB_SUBST, "initialize", cbsubst_initialize, -1);
@@ -1597,7 +1811,7 @@ Init_tkutil()
     TK_None = rb_obj_alloc(rb_cObject);
     rb_define_const(mTK, "None", TK_None);
     rb_define_singleton_method(TK_None, "to_s", tkNone_to_s, 0);
-    rb_define_singleton_method(TK_None, "inspect", tkNone_to_s, 0);
+    rb_define_singleton_method(TK_None, "inspect", tkNone_inspect, 0);
     OBJ_FREEZE(TK_None);
 
     /* --------------------- */
@@ -1605,15 +1819,17 @@ Init_tkutil()
     CALLBACK_TABLE = rb_hash_new();
 
     /* --------------------- */
+    rb_define_singleton_method(mTK, "untrust", tk_obj_untrust, 1);
+
     rb_define_singleton_method(mTK, "eval_cmd", tk_eval_cmd, -1);
     rb_define_singleton_method(mTK, "callback", tk_do_callback, -1);
     rb_define_singleton_method(mTK, "install_cmd", tk_install_cmd, -1);
     rb_define_singleton_method(mTK, "uninstall_cmd", tk_uninstall_cmd, 1);
     rb_define_singleton_method(mTK, "_symbolkey2str", tk_symbolkey2str, 1);
     rb_define_singleton_method(mTK, "hash_kv", tk_hash_kv, -1);
-    rb_define_singleton_method(mTK, "_get_eval_string", 
+    rb_define_singleton_method(mTK, "_get_eval_string",
                                tk_get_eval_string, -1);
-    rb_define_singleton_method(mTK, "_get_eval_enc_str", 
+    rb_define_singleton_method(mTK, "_get_eval_enc_str",
                                tk_get_eval_enc_str, 1);
     rb_define_singleton_method(mTK, "_conv_args", tk_conv_args, -1);
 
@@ -1621,6 +1837,7 @@ Init_tkutil()
     rb_define_singleton_method(mTK, "number", tcl2rb_number, 1);
     rb_define_singleton_method(mTK, "string", tcl2rb_string, 1);
     rb_define_singleton_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
+    rb_define_singleton_method(mTK, "num_or_nil", tcl2rb_num_or_nil, 1);
 
     rb_define_method(mTK, "_toUTF8", tk_toUTF8, -1);
     rb_define_method(mTK, "_fromUTF8", tk_fromUTF8, -1);
@@ -1634,6 +1851,11 @@ Init_tkutil()
     rb_define_method(mTK, "number", tcl2rb_number, 1);
     rb_define_method(mTK, "string", tcl2rb_string, 1);
     rb_define_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
+    rb_define_method(mTK, "num_or_nil", tcl2rb_num_or_nil, 1);
+
+    /* --------------------- */
+    rb_global_variable(&ENCODING_NAME_UTF8);
+    ENCODING_NAME_UTF8 = rb_obj_freeze(rb_str_new2("utf-8"));
 
     /* --------------------- */
 }
diff --git a/ext/win32ole/doc/win32ole.rd b/ext/win32ole/doc/win32ole.rd
deleted file mode 100644
index c563ce5d5b..0000000000
--- a/ext/win32ole/doc/win32ole.rd
+++ /dev/null
@@ -1,294 +0,0 @@
-=begin
-= Win32OLE extension module
-
-== WIN32OLE 
-=== Constants
-: VERSION
-    The version number of WIN32OLE.
-
-: ARGV
-    The argument of the method invoked recently.
-    This constant is used to get value of argument 
-    when the argument is passed by reference.
-
-=== Class Method
-: connect(oleserver)
-   returns running OLE automation object or WIN32OLE object from moniker.
-
-: const_load(ole [,obj])
-   defines the constants of OLE automation
-   server as 'obj' class constants. If 'obj' omitted, the default
-   is WIN32OLE.
-
-: new(oleserver)
-   returns OLE Automation object.
-
-: ole_free(obj)
-   invokes Release method of Dispatch interface of WIN32OLE object.
-   This method should not be used because this method exists for debugging WIN32OLE.
-
-: ole_reference_count(obj)
-   returns reference counter of Dispatch interface.
-   This method should not be used because this method exists for debugging WIN32OLE.
-
-: ole_show_help(info [,helpcontext])
-   displays helpfile.
-   The first argument specifies WIN32OLE_TYPE object or WIN32OLE_METHOD object 
-   or helpfile.
-
-=== Method
-: self[property]
-   gets property of OLE object.
-
-: self[property]=
-   sets property of OLE object.
-
-: _invoke(dispid, args, types)
-   runs the early binding method.
-   The dispid specifies Dispatch ID, args specifies the array of arguments,
-   types specifies array of the type of arguments.
-
-: each {...}
-   Iterates over each item of OLE collection which has IEnumVARIANT
-   interface.
-
-: invoke(method, args,...)
-   runs OLE method.
-
-: ole_func_methods
-   returns array of WIN32OLE_METHOD object which corresponds with function.
-
-: ole_get_methods
-   returns array of WIN32OLE_METHOD object which corresponds with get properties.
-
-: ole_method(method)
-   returns WIN32OLE_METHOD object which coreesponds with method 
-   which specified by argument.
-
-: ole_method_help(method)
-   alias of ole_method.
-
-: ole_methods
-   returns WIN32OLE_METHOD object which coreesponds with method.
-
-: ole_obj_help
-   returns WIN32OLE_TYPE object.
-
-: ole_put_methods
-   returns array of WIN32OLE_METHOD object which corresponds with put properties.
-
-: setproperty(property, key, val)
-   set property of OLE object. 
-   This method is used when the property has argument.
-
-   For example, in VB
-     obj.item("key") = val
-   in Win32OLE
-     obj.setproperty("item", "key", val)
-
-
-== WIN32OLE_EVENT class
-
-=== Class Method
-
-: new(ole, interface)
-   The new class method creates OLE event sink object to connect ole.
-   The ole must be WIN32OLE object, and interface is the interface
-   name of event.
-
-: message_loop
-    The message_loop class method translates and dispatches Windows 
-    message.
-
-=== Method
-: on_event([event]){...}
-    defines the callback of event.
-    If event omitted, defines the callback of all events.
-
-: on_event_with_outargs([event]) {...}
-    defines the callback of event.
-    If you want modify argument in callback, 
-
-== WIN32OLE_METHOD
-
-=== Class Methods
-: new(win32ole_type, method)    
-   creates WIN32OLE_METHOD object.
-
-=== Methods
-: dispid
-   returns Dispatch ID.
-
-: event?
-   returns true if the method is event.
-
-: event_interface
-   returns interface name of event if the method is event.
-
-: helpcontext
-   returns help context.
-
-: helpfile
-   returns help file.
-
-: invkind
-   returns invkind.
-
-: invoke_kind
-   returns invoke kind string.
-
-: name
-   returns name of method.
-
-: offset_vtbl
-   returns the offset of Vtbl.
-
-: params
-   returns array of WIN32OLE_PARAM object.
-
-: return_type
-   returns string of return value type of method.
-
-: return_vtype
-   returns number of return value type of method.
-
-: return_type_detail
-   returns detail information of return value type of method.
-
-: size_params
-   returns the size of arguments.
-
-: size_opt_params
-   returns the size of optional arguments.
-
-: visible?
-   returns true if the method is public.
-
-== WIN32OLE_PARAM
-: default
-   returns default value.
-
-: input?
-   returns true if argument is input.
-
-: optional?
-   returns true if argument is optional.
-
-: output?
-   returns true if argument is output.
-
-: name
-   returns name.
-
-: ole_type
-   returns type of argument.
-
-: ole_type_detail
-   returns detail information of type of argument.
-
-: retval?
-   returns true if argument is return value.
-
-== WIN32OLE_TYPE
-=== Class Methods
-: new(typelibrary, class)
-    returns WIN32OLE_TYPE object.
-
-: ole_classes(typelibrary)
-    returns array of WIN32OLE_TYPE objects defined by Type Library.
-
-: progids
-    returns array of ProgID.
-
-: typelibs
-    returns array of type libraries.
-
-=== Methods
-: guid
-   returns GUID.
-
-: helpfile
-   returns helpfile.
-
-: helpcontext
-   returns helpcontext.
-
-: helpstring
-   returns help string.
-
-: major_version
-   returns major version.
-
-: minor_version
-   returns minor version.
-
-: name
-   returns name.
-
-: ole_methods
-   returns array of WIN32OLE_METHOD objects.
-
-: ole_type
-   returns type of class.
-
-: progid
-   returns ProgID if it exists. If not found, then returns nil.
-
-: src_type
-   returns source class when the OLE class is 'Alias'.
-
-: typekind
-   returns number which represents type.
-
-: variables
-   returns array of variables defined in OLE class.
-
-: visible?
-   returns true if the OLE class is public.
-
-== WIN32OLE_VARIABLE
-=== Methods
-: name
-   returns the name.
-
-: ole_type
-   returns type
-
-: ole_type_detail
-   returns detail information of type.
-
-: value
-   returns value.
-
-: variable_kind
-   returns variable kind string.
-
-: varkind
-   returns the number which represents variable kind.
-
-== WIN32OLE::VARIANT
-=== Constants
-  *VT_I4
-  *VT_R4
-  *VT_R8
-  *VT_CY
-  *VT_DATE
-  *VT_BSTR
-  *VT_USERDEFINED
-  *VT_PTR
-  *VT_DISPATCH
-  *VT_ERROR
-  *VT_BOOL
-  *VT_VARIANT
-  *VT_UNKNOWN
-  *VT_I1
-  *VT_UI1
-  *VT_UI2
-  *VT_UI4
-  *VT_INT
-  *VT_UINT
-  *VT_ARRAY
-  *VT_BYREF
-
-=end
-
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index cee922554a..893793382b 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -1,7 +1,6 @@
 #----------------------------------
 # extconf.rb
 # $Revision$
-# $Date$
 #----------------------------------
 require 'mkmf'
 
@@ -20,11 +19,14 @@ end
 def create_win32ole_makefile
   if have_library("ole32") and
      have_library("oleaut32") and
-     have_library("uuid") and 
+     have_library("uuid") and
      have_library("user32") and
      have_library("kernel32") and
      have_library("advapi32") and
      have_header("windows.h")
+    unless have_type("IMultiLanguage2", "mlang.h")
+      have_type("IMultiLanguage", "mlang.h")
+    end
     create_makefile("win32ole")
     create_docfile(SRCFILES)
   else
@@ -32,10 +34,9 @@ def create_win32ole_makefile
   end
 end
 
+
 case RUBY_PLATFORM
-when /mswin32/
+when /mswin/
   $CFLAGS += ' /W3'
-when /cygwin/, /mingw/
-  $defs << '-DNONAMELESSUNION'
 end
 create_win32ole_makefile
diff --git a/ext/win32ole/lib/win32ole.rb b/ext/win32ole/lib/win32ole.rb
new file mode 100644
index 0000000000..aaf7e7cdcf
--- /dev/null
+++ b/ext/win32ole/lib/win32ole.rb
@@ -0,0 +1,22 @@
+require 'win32ole.so'
+
+# re-define Thread#initialize
+# bug #2618(ruby-core:27634)
+
+class Thread
+  alias :org_initialize :initialize
+  def initialize(*arg, &block)
+    if block
+      org_initialize(*arg) {
+        WIN32OLE.ole_initialize
+        begin
+          block.call(*arg)
+        ensure
+          WIN32OLE.ole_uninitialize
+        end
+      }
+    else
+      org_initialize(*arg)
+    end
+  end
+end
diff --git a/ext/win32ole/sample/excel1.rb b/ext/win32ole/sample/excel1.rb
index e366a52839..c8cd38e732 100644
--- a/ext/win32ole/sample/excel1.rb
+++ b/ext/win32ole/sample/excel1.rb
@@ -1,22 +1,33 @@
 require 'win32ole'
 
-#application = WIN32OLE.new('Excel.Application.5')
 application = WIN32OLE.new('Excel.Application')
 
 application.visible = TRUE
 workbook = application.Workbooks.Add();
 worksheet = workbook.Worksheets(1);
+
+=begin
 worksheet.Range("A1:D1").value = ["North","South","East","West"];
 worksheet.Range("A2:B2").value = [5.2, 10];
+
 worksheet.Range("C2").value = 8;
 worksheet.Range("D2").value = 20;
+=end
+
+worksheet.Range("A1:B2").value = [["North","South"],
+                                  [5.2, 10]];
+
+vals = WIN32OLE_VARIANT.new([["East","West"],
+                             [8, 20]],
+                            WIN32OLE::VARIANT::VT_ARRAY)
+worksheet.Range("C1:D2").value = vals
 
 range = worksheet.Range("A1:D2");
 range.Select
 chart = workbook.Charts.Add;
 
 workbook.saved = TRUE;
-
+sleep 0.5
 application.ActiveWorkbook.Close(0);
 application.Quit();
 
diff --git a/ext/win32ole/sample/excel2.rb b/ext/win32ole/sample/excel2.rb
index 46f459b36b..dbe4178051 100644
--- a/ext/win32ole/sample/excel2.rb
+++ b/ext/win32ole/sample/excel2.rb
@@ -9,14 +9,14 @@ excel = WIN32OLE.new("excel.application")
 
 # Create and rotate the chart
 
-excel['Visible'] = TRUE;
+excel.visible = TRUE;
 excel.Workbooks.Add();
-excel.Range("a1")['Value'] = 3;
-excel.Range("a2")['Value'] = 2;
-excel.Range("a3")['Value'] = 1;
+excel.Range("a1").value = 3;
+excel.Range("a2").value = 2;
+excel.Range("a3").value = 1;
 excel.Range("a1:a3").Select();
 excelchart = excel.Charts.Add();
-excelchart['Type'] = ChartTypeVal;
+excelchart.type = ChartTypeVal;
 
 i = 30
 i.step(180, 10) do |rot|
diff --git a/ext/win32ole/sample/ieconst.rb b/ext/win32ole/sample/ieconst.rb
index 234272c7ed..2c6a7a383c 100644
--- a/ext/win32ole/sample/ieconst.rb
+++ b/ext/win32ole/sample/ieconst.rb
@@ -20,7 +20,7 @@ end
 # Remark!!! CONSTANTS has not tested enoughly!!!
 # CONSTANTS is alpha release.
 # If there are constants which first letter is not [a-zA-Z],
-# like a '_Foo', then maybe you can access the value by 
+# like a '_Foo', then maybe you can access the value by
 # using CONSTANTS['_Foo']
 #------------------------------------------------------------
 IE_CONST::CONSTANTS.each do |k, v|
diff --git a/ext/win32ole/sample/ienavi.rb b/ext/win32ole/sample/ienavi.rb
index c7fa3f5ec2..8b279ddaae 100644
--- a/ext/win32ole/sample/ienavi.rb
+++ b/ext/win32ole/sample/ienavi.rb
@@ -26,7 +26,7 @@ ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
 
 ev.on_event {|*args| default_handler(*args)}
 ev.on_event("NavigateComplete") {|url| navigate(url)}
-ev.on_event("Quit") {|*args| stop_msg_loop} 
+ev.on_event("Quit") {|*args| stop_msg_loop}
 
 $LOOP = TRUE
 while ($LOOP)
diff --git a/ext/win32ole/sample/ienavi2.rb b/ext/win32ole/sample/ienavi2.rb
new file mode 100644
index 0000000000..67977e28ab
--- /dev/null
+++ b/ext/win32ole/sample/ienavi2.rb
@@ -0,0 +1,40 @@
+require 'win32ole'
+
+class IEHandler
+  attr_reader :loop
+  def initialize
+    @urls = []
+    @loop = true
+  end
+  def method_missing(event, *args)
+    case event
+    when "BeforeNavigate2"
+      puts "Now Navigate #{args[1]}..."
+    end
+  end
+  def onNavigateComplete2(pdisp, url)
+    @urls << url
+  end
+  def onOnQuit
+    puts "Now Stop IE..."
+    @loop = false
+  end
+  def put_urls
+    puts "You Navigated the URLs ..."
+    @urls.each_with_index do |url, i|
+      puts "(#{i+1}) #{url}"
+    end
+  end
+end
+
+ie = WIN32OLE.new('InternetExplorer.Application')
+ie.visible = true
+ie.gohome
+
+ev = WIN32OLE_EVENT.new(ie)
+ev.handler = IEHandler.new
+
+while (ev.handler.loop)
+  WIN32OLE_EVENT.message_loop
+end
+ev.handler.put_urls
diff --git a/ext/win32ole/sample/oledirs.rb b/ext/win32ole/sample/oledirs.rb
index 1c77e76f14..dbacc2131d 100644
--- a/ext/win32ole/sample/oledirs.rb
+++ b/ext/win32ole/sample/oledirs.rb
@@ -7,7 +7,7 @@ require "win32ole"
 def listup(items)
 #  items.each do |i|
   for i in items
-    puts i.name 
+    puts i.name
   end
 end
 
diff --git a/ext/win32ole/sample/olegen.rb b/ext/win32ole/sample/olegen.rb
index 48d86893fe..4ec576ca50 100644
--- a/ext/win32ole/sample/olegen.rb
+++ b/ext/win32ole/sample/olegen.rb
@@ -1,6 +1,5 @@
 #-----------------------------
 # olegen.rb
-# $Date$
 # $Revision$
 #-----------------------------
 
@@ -50,7 +49,7 @@ class WIN32COMGen
     ts = ''
     typedetails.each do |t|
       case t
-      when 'CARRAY', 'VOID', 'UINT', 'RESULT', 'DECIMAL', 'I8', 'UI8' 
+      when 'CARRAY', 'VOID', 'UINT', 'RESULT', 'DECIMAL', 'I8', 'UI8'
 #	  raise "Sorry type\"" + t + "\" not supported"
       ts << "\"??? NOT SUPPORTED TYPE:`#{t}'\""
       when 'USERDEFINED', 'Unknown Type 9'
@@ -81,7 +80,7 @@ class WIN32COMGen
       generate_argtype(param.ole_type_detail)
     }.join(", ")
     if proptypes
-      types += ", " if types.size > 0 
+      types += ", " if types.size > 0
       types += generate_argtype(proptypes)
     end
     types
@@ -98,8 +97,8 @@ class WIN32COMGen
   end
 
   def generate_method_help(method, type = nil)
-    str = "  # "  
-    if type 
+    str = "  # "
+    if type
       str += type
     else
       str += method.return_type
@@ -124,7 +123,7 @@ class WIN32COMGen
   def generate_method_args_help(method)
     args = []
     method.params.each_with_index {|param, i|
-      h = "  #   #{param.ole_type} arg#{i} --- #{param.name}" 
+      h = "  #   #{param.ole_type} arg#{i} --- #{param.name}"
       inout = []
       inout.push "IN" if param.input?
       inout.push "OUT" if param.output?
@@ -167,14 +166,14 @@ class WIN32COMGen
       method.visible? &&
       method.size_params > 0
     }.each do |method|
-      types = method.return_type_detail 
+      types = method.return_type_detail
       io.puts "\n"
       io.puts  generate_method_help(method, types[0])
       io.puts  "  def #{method.name}"
       if klass.ole_type == "Class"
-        io.print "    OLEProperty.new(@dispatch, #{method.dispid}, [" 
+        io.print "    OLEProperty.new(@dispatch, #{method.dispid}, ["
       else
-        io.print "    OLEProperty.new(self, #{method.dispid}, [" 
+        io.print "    OLEProperty.new(self, #{method.dispid}, ["
       end
       io.print generate_argtypes(method, nil)
       io.print "], ["
@@ -231,7 +230,7 @@ class WIN32COMGen
       v.visible? && v.variable_kind == 'CONSTANT'
     }.each do |v|
       io.print "  "
-      io.print v.name.sub(/^./){|c| c.upcase}
+      io.print v.name.sub(/^./){$&.upcase}
       io.print " = "
       io.puts  v.value
     end
@@ -321,8 +320,8 @@ STR
 
     ole_classes(typelib).select{|klass|
       klass.visible? &&
-      (klass.ole_type == "Class" || 
-       klass.ole_type == "Interface" || 
+      (klass.ole_type == "Class" ||
+       klass.ole_type == "Interface" ||
        klass.ole_type == "Dispatch" ||
        klass.ole_type == "Enum")
     }.each do |klass|
@@ -330,7 +329,7 @@ STR
     end
     begin
       @ole.quit if @ole
-    rescue 
+    rescue
     end
   end
 end
diff --git a/ext/win32ole/sample/xml.rb b/ext/win32ole/sample/xml.rb
index b95d6d5275..4b1a54dc75 100644
--- a/ext/win32ole/sample/xml.rb
+++ b/ext/win32ole/sample/xml.rb
@@ -1,11 +1,11 @@
-# 
+#
 # This file created by olegen.rb as following.
 #    ruby olegen.rb 'Microsoft XML, version 2.0' > xml.rb
-# 
+#
 require 'win32ole'
 require 'win32ole/property'
 
-# 
+#
 module IXMLDOMImplementation
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -343,7 +343,7 @@ module OLEtagDOMNodeType
   NODE_NOTATION = 12
 end
 
-# 
+#
 module IXMLDOMNodeList
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -380,7 +380,7 @@ module IXMLDOMNodeList
   end
 end
 
-# 
+#
 module IXMLDOMNamedNodeMap
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -464,7 +464,7 @@ module IXMLDOMNamedNodeMap
   end
 end
 
-# 
+#
 module IXMLDOMDocument
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -1040,7 +1040,7 @@ module IXMLDOMDocument
   end
 end
 
-# 
+#
 module IXMLDOMDocumentType
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -1368,7 +1368,7 @@ module IXMLDOMDocumentType
   end
 end
 
-# 
+#
 module IXMLDOMElement
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -1752,7 +1752,7 @@ module IXMLDOMElement
   end
 end
 
-# 
+#
 module IXMLDOMAttribute
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -2080,7 +2080,7 @@ module IXMLDOMAttribute
   end
 end
 
-# 
+#
 module IXMLDOMDocumentFragment
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -2384,7 +2384,7 @@ module IXMLDOMDocumentFragment
   end
 end
 
-# 
+#
 module IXMLDOMText
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -2771,7 +2771,7 @@ module IXMLDOMText
   end
 end
 
-# 
+#
 module IXMLDOMCharacterData
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -3149,7 +3149,7 @@ module IXMLDOMCharacterData
   end
 end
 
-# 
+#
 module IXMLDOMComment
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -3527,7 +3527,7 @@ module IXMLDOMComment
   end
 end
 
-# 
+#
 module IXMLDOMCDATASection
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -3914,7 +3914,7 @@ module IXMLDOMCDATASection
   end
 end
 
-# 
+#
 module IXMLDOMProcessingInstruction
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -4242,7 +4242,7 @@ module IXMLDOMProcessingInstruction
   end
 end
 
-# 
+#
 module IXMLDOMEntityReference
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -4608,7 +4608,7 @@ module IXMLDOMParseError
   end
 end
 
-# 
+#
 module IXMLDOMNotation
   include WIN32OLE::VARIANT
   attr_reader :lastargs
@@ -4928,7 +4928,7 @@ module IXMLDOMNotation
   end
 end
 
-# 
+#
 module IXMLDOMEntity
   include WIN32OLE::VARIANT
   attr_reader :lastargs
diff --git a/ext/win32ole/tests/oleserver.rb b/ext/win32ole/tests/oleserver.rb
deleted file mode 100644
index bf721373e5..0000000000
--- a/ext/win32ole/tests/oleserver.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'win32ole'
-def oletypelib_name(pat)
-  WIN32OLE_TYPE.typelibs.each do |lib|
-    return lib if pat =~ lib
-  end
-end
-module OLESERVER
-  MS_EXCEL_TYPELIB = oletypelib_name(/^Microsoft Excel .* Object Library$/)
-  MS_XML_TYPELIB = oletypelib_name(/^Microsoft XML/)
-end
diff --git a/ext/win32ole/tests/testNIL2VTEMPTY.rb b/ext/win32ole/tests/testNIL2VTEMPTY.rb
deleted file mode 100644
index 555d35fbf3..0000000000
--- a/ext/win32ole/tests/testNIL2VTEMPTY.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
-# [ruby-talk:137054]
-
-require 'win32ole'
-require 'test/unit'
-
-class TestNIL2VT_EMPTY < Test::Unit::TestCase
-  def setup
-    fs = WIN32OLE.new('Scripting.FileSystemObject')
-    @path = fs.GetFolder(".").path
-  end
-  def test_openSchema
-    con = nil
-    begin
-      con = WIN32OLE.new('ADODB.Connection')
-      con.connectionString = "Provider=MSDASQL;Extended Properties="
-      con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
-      con.open
-    rescue
-      con = nil
-    end
-    if con
-      rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
-      assert(rs)
-    end
-  end
-end
-
diff --git a/ext/win32ole/tests/testOLEEVENT.rb b/ext/win32ole/tests/testOLEEVENT.rb
deleted file mode 100644
index 0901158642..0000000000
--- a/ext/win32ole/tests/testOLEEVENT.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'rubyunit'
-require 'win32ole'
-
-class TestWIN32OLE_EVENT < RUNIT::TestCase
-  def setup
-    @excel = WIN32OLE.new("Excel.Application")
-    @excel.visible = true
-    @event = ""
-    @event2 = ""
-  end
-  def test_on_event
-    book = @excel.workbooks.Add
-    value = ""
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event('SheetChange'){|arg1, arg2| 
-        begin
-          value = arg1.value
-        rescue
-          value = $!.message
-        end
-      }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("OK", value)
-  end
-
-  def handler1
-    @event += "handler1"
-  end
-  def handler2
-    @event += "handler2"
-  end
-
-  def handler3
-    @event += "handler3"
-  end
-
-  def test_on_event2
-    book = @excel.workbooks.Add
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event('SheetChange'){|arg1, arg2| 
-        handler1
-      }
-      ev.on_event('SheetChange'){|arg1, arg2| 
-        handler2
-      }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("handler2", @event)
-  end
-
-  def test_on_event3
-    book = @excel.workbooks.Add
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event{ handler1 }
-      ev.on_event{ handler2 }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("handler2", @event)
-  end
-
-  def test_on_event4
-    book = @excel.workbooks.Add
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event{ handler1 }
-      ev.on_event{ handler2 }
-      ev.on_event('SheetChange'){|arg1, arg2| handler3 }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("handler3", @event)
-  end
-
-  def teardown
-    @excel.quit
-    @excel = nil
-    GC.start
-  end
-end
-
diff --git a/ext/win32ole/tests/testOLEMETHOD.rb b/ext/win32ole/tests/testOLEMETHOD.rb
deleted file mode 100644
index 390c9999f8..0000000000
--- a/ext/win32ole/tests/testOLEMETHOD.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLEMETHOD < RUNIT::TestCase
-  include OLESERVER
-  def setup
-    @excel_app = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
-  end
-  def test_s_new
-    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
-    assert_instance_of(WIN32OLE_METHOD, m)
-    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
-    assert_instance_of(WIN32OLE_METHOD, m)
-    m =  WIN32OLE_METHOD.new(@excel_app, 'workbookopen')
-    assert_instance_of(WIN32OLE_METHOD, m)
-  end
-  def test_name
-    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
-    assert_equal('Quit', m.name)
-  end
-  def test_to_s
-    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
-    assert_equal('Quit', "#{m}")
-  end
-  def test_return_type
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal('Range', m.return_type)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
-    assert_equal('BSTR', m.return_type)
-  end
-  def test_return_vtype
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal(WIN32OLE::VARIANT::VT_PTR, m.return_vtype)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
-    assert_equal(WIN32OLE::VARIANT::VT_BSTR, m.return_vtype)
-  end
-  def test_return_type_detail
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal(['PTR', 'USERDEFINED', 'Range'], m.return_type_detail)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
-    assert_equal(['BSTR'], m.return_type_detail)
-  end
-
-  def test_invoke_kind
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal('PROPERTYGET', m.invoke_kind)
-  end
-  def test_visible
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert(m.visible?)
-    m = WIN32OLE_METHOD.new(@excel_app, 'AddRef')
-    assert(!m.visible?)
-  end
-  def test_event
-    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
-    assert(m.event?)
-    m =  WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert(!m.event?)
-  end
-  def test_event_interface
-    m = WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
-    assert_equal('AppEvents', m.event_interface)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_nil(m.event_interface)
-  end
-  def test_helpstring
-    domdoc = WIN32OLE_TYPE.new(MS_XML_TYPELIB, 'DOMDocument')
-    m =  WIN32OLE_METHOD.new(domdoc, 'abort')
-    assert_equal('abort an asynchronous download', m.helpstring)
-  end
-  def test_helpfile
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_match(/VBAXL.*\.(HLP|CHM)$/i, m.helpfile)
-  end
-  def test_helpcontext
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert(m.helpcontext > 0)
-  end
-  def test_offset_vtbl
-    m = WIN32OLE_METHOD.new(@excel_app, 'QueryInterface')
-    assert_equal(0, m.offset_vtbl)
-  end
-  def test_dispid
-    tobj = WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation', 'FolderItem2')
-    method = WIN32OLE_METHOD.new(tobj, 'InvokeVerb')
-    assert_equal(1610743824, method.dispid)
-  end
-end
diff --git a/ext/win32ole/tests/testOLEPARAM.rb b/ext/win32ole/tests/testOLEPARAM.rb
deleted file mode 100644
index 4014fadbfc..0000000000
--- a/ext/win32ole/tests/testOLEPARAM.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLEPARAM < RUNIT::TestCase
-  include OLESERVER
-  def test_name
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    sh = classes.find {|c| c.name == 'Worksheet'}
-    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
-    param_names = saveas.params.collect{|p| p.name}
-    assert(param_names.size > 0)
-    assert(param_names.include?('Filename'))
-  end
-  def test_to_s
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    sh = classes.find {|c| c.name == 'Worksheet'}
-    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
-    param_names = saveas.params.collect{|p| "#{p}"}
-    assert(param_names.include?('Filename'))
-  end
-  def test_ole_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal('BSTR', f.params[0].ole_type)
-    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal('XlSaveAsAccessMode', f.params[6].ole_type)
-  end
-  def test_ole_type_detail
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal(['BSTR'], f.params[0].ole_type_detail)
-    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal(['USERDEFINED', 'XlSaveAsAccessMode'], f.params[6].ole_type_detail)
-  end
-  def test_input
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(f.params[0].input?)
-  end
-  
-  def test_output
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(!f.params[0].output?)
-  end
-  def test_optional
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(!f.params[0].optional?)
-    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(f.params[0].optional?)
-  end
-end
diff --git a/ext/win32ole/tests/testOLETYPE.rb b/ext/win32ole/tests/testOLETYPE.rb
deleted file mode 100644
index d4eb1146e1..0000000000
--- a/ext/win32ole/tests/testOLETYPE.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLETYPE < RUNIT::TestCase
-  include OLESERVER
-  def test_s_new
-    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
-    assert_instance_of(WIN32OLE_TYPE, type)
-  end
-  def test_s_ole_classes
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    assert(classes.size > 0)
-  end
-  def test_s_typelibs
-    libs = WIN32OLE_TYPE.typelibs
-    assert(libs.include?(MS_EXCEL_TYPELIB))
-    assert(libs.include?(MS_XML_TYPELIB))
-  end
-  def test_s_progids
-    progids = WIN32OLE_TYPE.progids
-    assert(progids.include?('Excel.Application'))
-  end
-  def test_name
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    class_names = classes.collect{|c|
-      c.name
-    }
-    assert(class_names.include?('Application'))
-  end
-
-  def test_class_to_s
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    class_names = classes.collect{|c|
-      "#{c}"
-    }
-    assert(class_names.include?('Application'))
-  end
-
-  def test_ole_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    app = classes.find {|c| c.name == 'Application'}
-    assert_equal('Class', app.ole_type)
-    app = classes.find {|c| c.name == '_Application'}
-    assert_equal('Dispatch', app.ole_type)
-  end
-  def test_typekind
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    app = classes.find {|c| c.name == 'Application'}
-    assert_equal(5, app.typekind)
-  end
-  def test_visible
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    app = classes.find {|c| c.name == 'Application'}
-    assert(app.visible?)
-    app = classes.find {|c| c.name == 'IAppEvents'}
-    assert(!app.visible?)
-  end
-  def test_src_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
-    domnode = classes.find {|c| c.name == 'DOMNodeType'}
-    assert_equal('tagDOMNodeType', domnode.src_type)
-  end
-  def test_helpstring
-    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
-    domdoc = classes.find {|c| c.name == 'DOMDocument'}
-    assert_equal('W3C-DOM XML Document', domdoc.helpstring)
-  end
-  def test_variables
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    xlchart = classes.find {|c| c.name == 'XlChartType'}
-    assert(xlchart.variables.size > 0)
-  end
-  def test_ole_methods
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    worksheet = classes.find {|c| c.name == 'Worksheet'}
-    assert(worksheet.ole_methods.size > 0)
-  end
-  def test_helpfile
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    worksheet = classes.find {|c| c.name == 'Worksheet'}
-    assert_match(/VBAXL.*\.(CHM|HLP)$/, worksheet.helpfile)
-  end
-  def test_helpcontext
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    worksheet = classes.find {|c| c.name == 'Worksheet'}
-    assert_equal(131088, worksheet.helpcontext)
-  end
-  def test_to_s
-    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
-    assert_equal("Application", "#{type}");
-  end
-end
diff --git a/ext/win32ole/tests/testOLEVARIABLE.rb b/ext/win32ole/tests/testOLEVARIABLE.rb
deleted file mode 100644
index b4bb0b57d9..0000000000
--- a/ext/win32ole/tests/testOLEVARIABLE.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLEVARIABLE < RUNIT::TestCase
-  include OLESERVER
-  def test_name
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var_names = chart.variables.collect {|m| m.name}
-    assert(var_names.size > 0)
-    assert(var_names.include?('xl3DColumn'))
-  end
-  def test_to_s
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var_names = chart.variables.collect {|m| "#{m}"}
-    assert(var_names.size > 0)
-    assert(var_names.include?('xl3DColumn'))
-  end
-  def test_ole_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert_equal('INT', var.ole_type)
-  end
-  def test_ole_type_detail
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert_equal(['INT'], var.ole_type_detail)
-  end
-
-  def test_value
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert_equal(-4100, var.value)
-  end
-  def test_visible
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert(var.visible?)
-  end
-end
diff --git a/ext/win32ole/tests/testVARIANT.rb b/ext/win32ole/tests/testVARIANT.rb
deleted file mode 100644
index f274778f27..0000000000
--- a/ext/win32ole/tests/testVARIANT.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-
-class TestWin32OLE_VARIANT < RUNIT::TestCase
-  include WIN32OLE::VARIANT
-  def test_variant
-    assert_equal(2, VT_I2)
-    assert_equal(3, VT_I4)
-    assert_equal(4, VT_R4)
-    assert_equal(5, VT_R8)
-    assert_equal(6, VT_CY)
-    assert_equal(7, VT_DATE)
-    assert_equal(8, VT_BSTR)
-    assert_equal(9, VT_DISPATCH)
-    assert_equal(10, VT_ERROR)
-    assert_equal(11, VT_BOOL)
-    assert_equal(12, VT_VARIANT)
-    assert_equal(13, VT_UNKNOWN)
-    assert_equal(16, VT_I1)
-    assert_equal(17, VT_UI1)
-    assert_equal(18, VT_UI2)
-    assert_equal(19, VT_UI4)
-    assert_equal(22, VT_INT)
-    assert_equal(23, VT_UINT)
-    assert_equal(0x2000, VT_ARRAY)
-    assert_equal(0x4000, VT_BYREF)
-  end
-end
-
diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb
deleted file mode 100644
index 5c01507377..0000000000
--- a/ext/win32ole/tests/testWIN32OLE.rb
+++ /dev/null
@@ -1,372 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'runit/testcase'
-require 'runit/cui/testrunner'
-
-require 'win32ole'
-require 'oleserver'
-
-module EXCEL_CONST
-end
-
-module CONST1
-end
-
-module CONST2
-end
-
-module CONST3
-end
-
-class TestWin32OLE < RUNIT::TestCase
-  include OLESERVER
-  def setup
-    @excel = WIN32OLE.new("Excel.Application")
-    @excel.visible = true
-  end
-  def test_s_new
-    assert_instance_of(WIN32OLE, @excel)
-  end
-  def test_s_new_DCOM
-    rexcel = WIN32OLE.new("Excel.Application", "localhost")
-    assert_instance_of(WIN32OLE, rexcel)
-    rexcel.visible = true
-    rexcel.quit
-  end
-  def test_s_new_from_clsid
-    excel = WIN32OLE.new("{00024500-0000-0000-C000-000000000046}")
-    assert_instance_of(WIN32OLE, excel)
-    excel.quit
-    exc = assert_exception(WIN32OLERuntimeError) {
-      WIN32OLE.new("{000}")
-    }
-    assert_match(/unknown OLE server: `\{000\}'/, exc.message)
-  end
-  def test_s_connect
-    excel2 = WIN32OLE.connect('Excel.Application')
-    assert_instance_of(WIN32OLE, excel2)
-  end
-
-  def test_s_const_load
-    assert(!defined?(EXCEL_CONST::XlTop))
-    WIN32OLE.const_load(@excel, EXCEL_CONST)
-    assert_equal(-4160, EXCEL_CONST::XlTop)
-
-    assert(!defined?(CONST1::XlTop))
-    WIN32OLE.const_load(MS_EXCEL_TYPELIB, CONST1)
-    assert_equal(-4160, CONST1::XlTop)
-  end
-
-  def test_s_codepage
-    assert_equal(WIN32OLE::CP_ACP, WIN32OLE.codepage)
-  end
-
-  def test_s_codepage_set
-    WIN32OLE.codepage = WIN32OLE::CP_UTF8
-    assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage)
-    WIN32OLE.codepage = WIN32OLE::CP_ACP
-  end
-
-  def test_const_CP_ACP
-    assert_equal(0, WIN32OLE::CP_ACP)
-  end
-
-  def test_const_CP_OEMCP
-    assert_equal(1, WIN32OLE::CP_OEMCP)
-  end
-
-  def test_const_CP_MACCP
-    assert_equal(2, WIN32OLE::CP_MACCP)
-  end
-
-  def test_const_CP_THREAD_ACP
-    assert_equal(3, WIN32OLE::CP_THREAD_ACP)
-  end
-
-  def test_const_CP_SYMBOL
-    assert_equal(42, WIN32OLE::CP_SYMBOL)
-  end
-
-  def test_const_CP_UTF7
-    assert_equal(65000, WIN32OLE::CP_UTF7)
-  end
-
-  def test_const_CP_UTF8
-    assert_equal(65001, WIN32OLE::CP_UTF8)
-  end
-
-  def test_s_codepage_changed
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      WIN32OLE.codepage = WIN32OLE::CP_UTF8
-      sheet.range("A1").value = [0x3042].pack("U*")
-      val = sheet.range("A1").value
-      assert_equal("\343\201\202", val)
-      WIN32OLE.codepage = WIN32OLE::CP_ACP
-      val = sheet.range("A1").value
-      assert_equal("\202\240", val)
-    ensure
-      book.saved = true
-    end
-  end
-
-  def test_get_win32ole_object
-    workbooks = @excel.Workbooks;
-    assert_instance_of(WIN32OLE, workbooks)
-  end
-  def test_each
-    workbooks = @excel.Workbooks
-    assert_no_exception {
-      i = 0;
-      workbooks.each do |workbook|
-        print i += 1
-      end
-    }
-    workbooks.add
-    workbooks.add
-    i = 0
-    workbooks.each do |workbook|
-      i+=1
-    end
-    assert_equal(2, i)
-    workbooks.each do |workbook|
-      workbook.saved = true
-    end
-  end
-  def test_setproperty_bracket
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.range("A1")['Value'] = 10
-      assert_equal(10, sheet.range("A1").value)
-      sheet['Cells', 1, 2] = 10
-      assert_equal(10, sheet.range("B1").value)
-      assert_equal(10, sheet['Cells', 1, 2].value)
-    ensure
-      book.saved = true
-    end
-  end
-  def test_convert_bignum
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.range("A1").value = 999999999
-      sheet.range("A2").value = 9999999999
-      sheet.range("A3").value = "=A1*10 + 9"
-      assert_equal(9999999999, sheet.range("A2").value)
-      assert_equal(9999999999, sheet.range("A3").value)
-     
-    ensure
-      book.saved = true
-    end
-  end
-
-  def test_ole_invoke_with_named_arg
-    book = @excel.workbooks.add
-    sheets = book.worksheets
-    sheet = book.worksheets(1)
-    num = sheets.count
-    begin
-      sheets.add({'count' => 2, 'after'=>sheet})
-      assert_equal(2, sheets.count - num);
-    ensure
-      book.saved = true
-    end
-  end
-
-  def test_ole_invoke_with_named_arg_last
-    book = @excel.workbooks.add
-    sheets = book.worksheets
-    sheet = book.worksheets(1)
-    num = sheets.count
-    begin
-      sheets.add(sheet, {'count' => 2})
-      assert_equal(2, sheets.count - num);
-    ensure
-      book.saved = true
-    end
-  end
-
-  def test_setproperty
-    @excel.setproperty('Visible', false)
-    assert_equal(false, @excel.Visible)
-    @excel.setproperty('Visible', true)
-    assert_equal(true, @excel.Visible)
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.setproperty('Cells', 1, 2, 10)
-      assert_equal(10, sheet.range("B1").value)
-    ensure
-      book.saved = true
-    end
-  end
-  def test_no_exist_property
-    isok = false
-    begin
-      @excel.unknown_prop = 1
-    rescue WIN32OLERuntimeError
-      isok = true
-    end
-    assert(isok)
-
-    isok = false
-    begin
-      @excel['unknown_prop'] = 2
-    rescue WIN32OLERuntimeError
-      isok = true
-    end
-    assert(isok)
-  end
-
-  def test_setproperty_with_equal
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.range("B1").value = 10
-      assert_equal(10, sheet.range("B1").value)
-      sheet.range("C1:D1").value = [11, 12]
-      assert_equal(11, sheet.range("C1").value)
-      assert_equal(12, sheet.range("D1").value)
-    ensure
-      book.saved = true
-    end
-  end
-  def test_invoke
-    workbooks = @excel.invoke( 'workbooks' )
-    assert_instance_of(WIN32OLE, workbooks)
-    book = workbooks.invoke( 'add' )
-    assert_instance_of(WIN32OLE, book)
-  end
-  def test_ole_methods
-    methods = @excel.ole_methods
-    method_names = methods.collect{|m| m.name}
-    assert(method_names.include?("Quit"))
-  end
-  def test_ole_func_methods
-    methods = @excel.ole_func_methods
-    assert(methods.size > 0)
-    method_names = methods.collect{|m| m.name}
-    assert(method_names.include?("Quit"))
-  end
-  def test_ole_put_methods
-    methods = @excel.ole_put_methods
-    assert(methods.size > 0)
-    method_names = methods.collect{|m| m.name}
-    assert(method_names.include?("Visible"))
-  end
-  def test_ole_get_methods
-    methods = @excel.ole_get_methods
-    assert(methods.size > 0)
-    method_names = methods.collect{|m| m.name}
-    assert(method_names.include?("Visible"))
-  end
-  def test_ole_method_help
-    quit_info = @excel.ole_method_help("Quit")
-    assert_equal(0, quit_info.size_params)
-    assert_equal(0, quit_info.size_opt_params)
-
-    workbooks = @excel.Workbooks
-    add_info = workbooks.ole_method_help("Add")
-    assert_equal(1, add_info.size_params)
-    assert_equal(1, add_info.size_opt_params)
-    assert(add_info.params[0].input?)
-    assert(add_info.params[0].optional?)
-    assert_equal('VARIANT', add_info.params[0].ole_type)
-  end
-  def teardown
-    @excel.quit
-    @excel = nil
-    GC.start
-  end
-end
-
-class TestWin32OLE_WITH_MSI < RUNIT::TestCase
-  def setup
-    installer = WIN32OLE.new("WindowsInstaller.Installer")
-    @record = installer.CreateRecord(2)
-  end
-
-  # Sorry, this test fails. 
-  # Win32OLE does not support this style to set property.
-  # Use Win32OLE#setproperty or Win32OLE#[]= .
-  # def test_invoke
-  #   @record.invoke("StringData", 1, 'cccc')
-  #   assert_equal('cccc', @record.StringData(1))
-  # end
-
-  def test_setproperty
-    @record.setproperty( "StringData", 1, 'dddd')
-    assert_equal('dddd', @record.StringData(1))
-  end
-  def test_bracket_equal_with_arg
-    @record[ "StringData", 1 ] =  'ffff'
-    assert_equal('ffff', @record.StringData(1))
-  end
-
-  def test__invoke
-    shell=WIN32OLE.new('Shell.Application')
-    assert_equal(shell.NameSpace(0).title, shell._invoke(0x60020002, [0], [WIN32OLE::VARIANT::VT_VARIANT]).title)
-  end
-end
-
-# ---------------------
-#
-# a subclass of Win32OLE
-# override new() and connect()
-class MyExcel<WIN32OLE
-    def MyExcel.new 
-        super "Excel.Application"
-    end
-    def MyExcel.connect
-        super "Excel.Application"
-    end
-end
-
-class TestMyExcel < TestWin32OLE
-#
-# because we overrided new() and connect()
-# we need to change the test.
-# also, because the class will be different
-# 
-  def setup
-    @excel = MyExcel.new
-    @excel.visible = true
-  end
-  def test_s_new
-    assert_instance_of(MyExcel, @excel)
-  end
-  def test_s_connect
-    excel2 = MyExcel.connect
-    assert_instance_of(MyExcel, excel2)
-  end
-#
-# const_load didn't like to be called twice,
-# and I don't know how to undefine something in Ruby yet 
-# so, hide the test.
-#
-  private :test_s_const_load
-end
-
-if $0 == __FILE__
-  puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
-  if ARGV.size == 0
-	suite = RUNIT::TestSuite.new
-	suite.add_test(TestWin32OLE.suite)
-	suite.add_test(TestMyExcel.suite)
-    begin
-      installer = WIN32OLE.new("WindowsInstaller.Installer")
-      suite.add_test(TestWin32OLE_WITH_MSI.suite)
-    rescue
-      puts "Skip some test with MSI"
-    end
-  else
-    suite = RUNIT::TestSuite.new
-    ARGV.each do |testmethod|
-      suite.add_test(TestWin32OLE.new(testmethod))
-    end
-  end
-  RUNIT::CUI::TestRunner.quiet_mode = true
-  RUNIT::CUI::TestRunner.run(suite)
-end
diff --git a/ext/win32ole/tests/test_ole_methods.rb b/ext/win32ole/tests/test_ole_methods.rb
deleted file mode 100644
index ca1c03b010..0000000000
--- a/ext/win32ole/tests/test_ole_methods.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# This is test for [ruby-talk:196897]
-#
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_FOR_PROPERTYPUTREF < Test::Unit::TestCase
-    
-    def setup
-      @obj = WIN32OLE.new('Scripting.Dictionary')
-    end
-
-    def test_ole_methods
-      x = @obj.ole_methods.select {|m|
-        m.invoke_kind == 'PROPERTYPUTREF'
-      }
-      assert(x.size > 0)
-      assert_equal(1, x.size)
-      assert_equal('Item', x[0].name)
-    end
-
-    def test_ole_put_methods
-      x = @obj.ole_put_methods.select {|m|
-        m.invoke_kind == 'PROPERTYPUTREF'
-      }
-      assert(x.size > 0)
-      assert_equal(1, x.size)
-      assert_equal('Item', x[0].name)
-    end
-
-  end
-end
diff --git a/ext/win32ole/tests/test_propertyputref.rb b/ext/win32ole/tests/test_propertyputref.rb
deleted file mode 100644
index befc35ca9c..0000000000
--- a/ext/win32ole/tests/test_propertyputref.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'test/unit'
-require 'win32ole'
-
-class TestWIN32OLE_PROPERTYPUTREF < Test::Unit::TestCase
-  def setup
-    begin
-      @sapi = WIN32OLE.new('SAPI.SpVoice')
-    rescue WIN32OLERuntimeError
-      @sapi = nil
-    end
-  end
-  def test_sapi
-    if @sapi
-      new_id = @sapi.getvoices.item(2).Id
-      @sapi.voice = @sapi.getvoices.item(2)
-      assert_equal(new_id, @sapi.voice.Id)
-    end
-  end
-end
diff --git a/ext/win32ole/tests/test_word.rb b/ext/win32ole/tests/test_word.rb
deleted file mode 100644
index 53a6c521ba..0000000000
--- a/ext/win32ole/tests/test_word.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# This is test for [ruby-Bugs#3237]
-#
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
-    
-    def setup
-      begin
-        @obj = WIN32OLE.new('Word.Application')
-      rescue WIN32OLERuntimeError
-        @obj = nil
-      end
-    end
-
-    def test_ole_methods
-      if @obj
-        @obj.visible = true
-        @obj.wordbasic.disableAutoMacros(true)
-        assert(true)
-      end
-    end
-
-    def teardown
-      if @obj
-        @obj.quit
-        @obj = nil
-      end
-    end
-
-  end
-end
diff --git a/ext/win32ole/tests/testall.rb b/ext/win32ole/tests/testall.rb
deleted file mode 100644
index d45541f571..0000000000
--- a/ext/win32ole/tests/testall.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'rubyunit'
-require 'win32ole'
-puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
-# RUNIT::CUI::TestRunner.quiet_mode = true
-require "testWIN32OLE"
-require "testOLETYPE"
-require "testOLEPARAM"
-require "testOLEMETHOD"
-require "testOLEVARIABLE"
-require "testVARIANT"
-require "testNIL2VTEMPTY"
-require "test_ole_methods.rb"
-require "test_propertyputref.rb"
-require "test_word.rb"
-# require "testOLEEVENT"
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 0b7dddd87d..99c2fdc877 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -12,16 +12,35 @@
  */
 
 /*
-  $Date$
   modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
  */
 
-#include "ruby.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
+#include "ruby/encoding.h"
+
+#define GNUC_OLDER_3_4_4 \
+    ((__GNUC__ < 3) || \
+     ((__GNUC__ <= 3) && (__GNUC_MINOR__ < 4)) || \
+     ((__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4)))
+
+#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4) 
+#ifndef NONAMELESSUNION
+#define NONAMELESSUNION 1
+#endif
+#endif
+
+#include <ctype.h>
+
 #include <windows.h>
 #include <ocidl.h>
 #include <olectl.h>
 #include <ole2.h>
+#if defined(HAVE_TYPE_IMULTILANGUAGE2) || defined(HAVE_TYPE_IMULTILANGUAGE)
+#include <mlang.h>
+#endif
+#include <stdlib.h>
+#include <math.h>
 #ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
 #define va_init_list(a,b) va_start(a,b)
@@ -29,7 +48,7 @@
 #include <varargs.h>
 #define va_init_list(a,b) va_start(a)
 #endif
-
+#include <objidl.h>
 
 #define DOUT fprintf(stderr,"[%d]\n",__LINE__)
 #define DOUTS(x) fprintf(stderr,"[%d]:" #x "=%s\n",__LINE__,x)
@@ -37,13 +56,13 @@
 #define DOUTI(x) fprintf(stderr, "[%ld]:" #x "=%d\n",__LINE__,x)
 #define DOUTD(x) fprintf(stderr, "[%d]:" #x "=%f\n",__LINE__,x)
 
-#if defined NONAMELESSUNION && __GNUC__
+#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4) 
 #define V_UNION1(X, Y) ((X)->u.Y)
 #else
 #define V_UNION1(X, Y) ((X)->Y)
 #endif
 
-#if defined NONAMELESSUNION && __GNUC__
+#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4) 
 #undef V_UNION
 #define V_UNION(X,Y) ((X)->n1.n2.n3.Y)
 
@@ -54,6 +73,39 @@
 #define V_BOOL(X) V_UNION(X,boolVal)
 #endif
 
+#ifndef V_I1REF
+#define V_I1REF(X) V_UNION(X, pcVal)
+#endif
+
+#ifndef U_UI2REF
+#define V_UI2REF(X) V_UNION(X, puiVal)
+#endif
+
+#ifndef V_INT
+#define V_INT(X) V_UNION(X, intVal)
+#endif
+
+#ifndef V_INTREF
+#define V_INTREF(X) V_UNION(X, pintVal)
+#endif
+
+#ifndef V_UINT
+#define V_UINT(X) V_UNION(X, uintVal)
+#endif
+
+#ifndef V_UINTREF
+#define V_UINTREF(X) V_UNION(X, puintVal)
+#endif
+
+/*
+ * unfortunately IID_IMultiLanguage2 is not included in any libXXX.a
+ * in Cygwin(mingw32).
+ */
+#if defined(__CYGWIN__) ||  defined(__MINGW32__)
+#undef IID_IMultiLanguage2
+const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
+#endif
+
 #define OLE_RELEASE(X) (X) ? ((X)->lpVtbl->Release(X)) : 0
 
 #define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
@@ -62,7 +114,7 @@
 #define OLE_RELEASE_TYPEATTR(X, Y) ((X)->lpVtbl->ReleaseTypeAttr((X), (Y)))
 
 #define OLE_FREE(x) {\
-    if(gOLEInitialized == Qtrue) {\
+    if(g_ole_initialized == TRUE) {\
         if(x) {\
             OLE_RELEASE(x);\
             (x) = 0;\
@@ -77,15 +129,28 @@
     }\
 }
 
+#ifdef HAVE_LONG_LONG
+#define I8_2_NUM LL2NUM
+#define UI8_2_NUM ULL2NUM
+#define NUM2I8  NUM2LL
+#define NUM2UI8 NUM2ULL
+#else
+#define I8_2_NUM INT2NUM
+#define UI8_2_NUM UINT2NUM
+#define NUM2I8  NUM2INT
+#define NUM2UI8 NUM2UINT
+#endif
+
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
 
-#define WIN32OLE_VERSION "0.7.4"
+#define WIN32OLE_VERSION "1.4.9"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
 
 typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
                                  UINT uCommand, DWORD dwData);
+typedef BOOL (FNENUMSYSEMCODEPAGES) (CODEPAGE_ENUMPROC, DWORD);
 typedef struct {
     struct IEventSinkVtbl * lpVtbl;
 } IEventSink, *PEVENTSINK;
@@ -132,36 +197,58 @@ typedef struct tagIEVENTSINKOBJ {
     DWORD m_cRef;
     IID m_iid;
     int m_event_id;
-    DWORD m_dwCookie;
-    IConnectionPoint *pConnectionPoint;
     ITypeInfo *pTypeInfo;
-    int *ptr_freed;
 }IEVENTSINKOBJ, *PIEVENTSINKOBJ;
 
 VALUE cWIN32OLE;
+VALUE cWIN32OLE_TYPELIB;
 VALUE cWIN32OLE_TYPE;
 VALUE cWIN32OLE_VARIABLE;
 VALUE cWIN32OLE_METHOD;
 VALUE cWIN32OLE_PARAM;
 VALUE cWIN32OLE_EVENT;
-VALUE eWIN32OLE_RUNTIME_ERROR;
+VALUE cWIN32OLE_VARIANT;
+VALUE eWIN32OLERuntimeError;
 VALUE mWIN32OLE_VARIANT;
+VALUE cWIN32OLE_PROPERTY;
 
 static VALUE ary_ole_event;
 static ID id_events;
-static BOOL gOLEInitialized = Qfalse;
+static BOOL g_ole_initialized = FALSE;
+static BOOL g_cp_installed = FALSE;
+static BOOL g_lcid_installed = FALSE;
 static HINSTANCE ghhctrl = NULL;
 static HINSTANCE gole32 = NULL;
 static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
 static VALUE com_hash;
 static IDispatchVtbl com_vtbl;
-static UINT  cWIN32OLE_cp = CP_ACP;
+static UINT cWIN32OLE_cp = CP_ACP;
+static LCID cWIN32OLE_lcid = LOCALE_SYSTEM_DEFAULT;
+static rb_encoding *cWIN32OLE_enc;
+static UINT g_cp_to_check = CP_ACP;
+static char g_lcid_to_check[8 + 1];
 static VARTYPE g_nil_to = VT_ERROR;
+static st_table *enc2cp_table;
+static IMessageFilterVtbl message_filter;
+static IMessageFilter imessage_filter = { &message_filter };
+static IMessageFilter* previous_filter;
+
+#if defined(HAVE_TYPE_IMULTILANGUAGE2)
+static IMultiLanguage2 *pIMultiLanguage = NULL;
+#elif defined(HAVE_TYPE_IMULTILANGUAGE)
+static IMultiLanguage *pIMultiLanguage = NULL;
+#else
+#define pIMultiLanguage NULL /* dummy */
+#endif
 
 struct oledata {
     IDispatch *pDispatch;
 };
 
+struct oletypelibdata {
+    ITypeLib *pTypeLib;
+};
+
 struct oletypedata {
     ITypeInfo *pTypeInfo;
 };
@@ -184,8 +271,9 @@ struct oleparamdata {
 };
 
 struct oleeventdata {
-    IEVENTSINKOBJ *pEvent;
-    int freed;
+    DWORD dwCookie;
+    IConnectionPoint *pConnectionPoint;
+    long event_id;
 };
 
 struct oleparam {
@@ -193,16 +281,409 @@ struct oleparam {
     OLECHAR** pNamedArgs;
 };
 
-static VALUE folemethod_s_allocate _((VALUE));
-static VALUE olemethod_set_member _((VALUE, ITypeInfo *, ITypeInfo *, int, VALUE));
-static VALUE foletype_s_allocate _((VALUE));
-static VALUE oletype_set_member  _((VALUE, ITypeInfo *, VALUE));
-static VALUE olemethod_from_typeinfo _((VALUE, ITypeInfo *, VALUE));
-static HRESULT ole_docinfo_from_type _((ITypeInfo *, BSTR *, BSTR *, DWORD *, BSTR *));
-static char *ole_wc2mb(LPWSTR);
-static VALUE ole_variant2val(VARIANT*);
-static void ole_val2variant(VALUE, VARIANT*);
-  
+struct olevariantdata {
+    VARIANT realvar;
+    VARIANT var;
+};
+
+
+static HRESULT ( STDMETHODCALLTYPE QueryInterface )(IDispatch __RPC_FAR *, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
+static ULONG ( STDMETHODCALLTYPE AddRef )(IDispatch __RPC_FAR * This);
+static ULONG ( STDMETHODCALLTYPE Release )(IDispatch __RPC_FAR * This);
+static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )(IDispatch __RPC_FAR * This, UINT __RPC_FAR *pctinfo);
+static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )(IDispatch __RPC_FAR * This, UINT iTInfo, LCID lcid, ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
+static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(IDispatch __RPC_FAR * This, REFIID riid, LPOLESTR __RPC_FAR *rgszNames, UINT cNames, LCID lcid, DISPID __RPC_FAR *rgDispId);
+static HRESULT ( STDMETHODCALLTYPE Invoke )( IDispatch __RPC_FAR * This, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS __RPC_FAR *pDispParams, VARIANT __RPC_FAR *pVarResult, EXCEPINFO __RPC_FAR *pExcepInfo, UINT __RPC_FAR *puArgErr);
+static IDispatch* val2dispatch(VALUE val);
+static double rbtime2vtdate(VALUE tmobj);
+static VALUE vtdate2rbtime(double date);
+static rb_encoding *ole_cp2encoding(UINT cp);
+static UINT ole_encoding2cp(rb_encoding *enc);
+NORETURN(static void failed_load_conv51932(void));
+#ifndef pIMultiLanguage
+static void load_conv_function51932(void);
+#endif
+static UINT ole_init_cp(void);
+static char *ole_wc2mb(LPWSTR pw);
+static VALUE ole_hresult2msg(HRESULT hr);
+static void ole_freeexceptinfo(EXCEPINFO *pExInfo);
+static VALUE ole_excepinfo2msg(EXCEPINFO *pExInfo);
+static void ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...);
+static void ole_initialize();
+static void ole_msg_loop();
+static void ole_free(struct oledata *pole);
+static void oletypelib_free(struct oletypelibdata *poletypelib);
+static void oletype_free(struct oletypedata *poletype);
+static void olemethod_free(struct olemethoddata *polemethod);
+static void olevariable_free(struct olevariabledata *polevar);
+static void oleparam_free(struct oleparamdata *pole);
+static LPWSTR ole_vstr2wc(VALUE vstr);
+static LPWSTR ole_mb2wc(char *pm, int len);
+static VALUE ole_wc2vstr(LPWSTR pw, BOOL isfree);
+static VALUE ole_ary_m_entry(VALUE val, long *pid);
+static void * get_ptr_of_variant(VARIANT *pvar);
+static VALUE is_all_index_under(long *pid, long *pub, long dim);
+static void ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long dim,  VARTYPE vt);
+static long dimension(VALUE val);
+static long ary_len_of_dim(VALUE ary, long dim);
+static HRESULT ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt);
+static void ole_val2variant(VALUE val, VARIANT *var);
+static void ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt);
+static void ole_val2ptr_variant(VALUE val, VARIANT *var);
+static void ole_set_byref(VARIANT *realvar, VARIANT *var,  VARTYPE vt);
+static void ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar);
+static void ole_val2variant2(VALUE val, VARIANT *var);
+static VALUE make_inspect(const char *class_name, VALUE detail);
+static VALUE default_inspect(VALUE self, const char *class_name);
+static VALUE ole_set_member(VALUE self, IDispatch *dispatch);
+static VALUE fole_s_allocate(VALUE klass);
+static VALUE create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv);
+static VALUE ary_new_dim(VALUE myary, long *pid, long *plb, long dim);
+static void ary_store_dim(VALUE myary, long *pid, long *plb, long dim, VALUE val);
+static VALUE ole_variant2val(VARIANT *pvar);
+static LONG reg_open_key(HKEY hkey, const char *name, HKEY *phkey);
+static LONG reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey);
+static VALUE reg_enum_key(HKEY hkey, DWORD i);
+static VALUE reg_get_val(HKEY hkey, const char *subkey);
+static VALUE reg_get_typelib_file_path(HKEY hkey);
+static VALUE typelib_file_from_clsid(VALUE ole);
+static VALUE typelib_file_from_typelib(VALUE ole);
+static VALUE typelib_file(VALUE ole);
+static void ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self);
+static HRESULT clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid);
+static VALUE ole_create_dcom(int argc, VALUE *argv, VALUE self);
+static VALUE ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self);
+static VALUE fole_s_connect(int argc, VALUE *argv, VALUE self);
+static VALUE fole_s_const_load(int argc, VALUE *argv, VALUE self);
+static VALUE ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes);
+static ULONG reference_count(struct oledata * pole);
+static VALUE fole_s_reference_count(VALUE self, VALUE obj);
+static VALUE fole_s_free(VALUE self, VALUE obj);
+static HWND ole_show_help(VALUE helpfile, VALUE helpcontext);
+static VALUE fole_s_show_help(int argc, VALUE *argv, VALUE self);
+static VALUE fole_s_get_code_page(VALUE self);
+static BOOL CALLBACK installed_code_page_proc(LPTSTR str);
+static BOOL code_page_installed(UINT cp);
+static VALUE fole_s_set_code_page(VALUE self, VALUE vcp);
+static VALUE fole_s_get_locale(VALUE self);
+static BOOL CALLBACK installed_lcid_proc(LPTSTR str);
+static BOOL lcid_installed(LCID lcid);
+static VALUE fole_s_set_locale(VALUE self, VALUE vlcid);
+static VALUE fole_s_create_guid(VALUE self);
+static void  ole_pure_initialize();
+static VALUE fole_s_ole_initialize(VALUE self);
+static void  ole_pure_uninitialize();
+static VALUE fole_s_ole_uninitialize(VALUE self);
+static VALUE fole_initialize(int argc, VALUE *argv, VALUE self);
+static VALUE hash2named_arg(VALUE pair, struct oleparam* pOp);
+static VALUE set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end);
+static VALUE ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket);
+static VALUE fole_invoke(int argc, VALUE *argv, VALUE self);
+static VALUE ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind);
+static VALUE fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types);
+static VALUE fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
+static VALUE fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
+static VALUE fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self);
+static VALUE fole_setproperty(int argc, VALUE *argv, VALUE self);
+static VALUE fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self);
+static VALUE ole_propertyput(VALUE self, VALUE property, VALUE value);
+static VALUE fole_free(VALUE self);
+static VALUE ole_each_sub(VALUE pEnumV);
+static VALUE ole_ienum_free(VALUE pEnumV);
+static VALUE fole_each(VALUE self);
+static VALUE fole_missing(int argc, VALUE *argv, VALUE self);
+static VALUE ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name);
+static VALUE olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
+static VALUE ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask);
+static VALUE ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask);
+static HRESULT typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti);
+static VALUE ole_methods(VALUE self, int mask);
+static VALUE fole_methods(VALUE self);
+static VALUE fole_get_methods(VALUE self);
+static VALUE fole_put_methods(VALUE self);
+static VALUE fole_func_methods(VALUE self);
+static VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo);
+static VALUE fole_type(VALUE self);
+static VALUE ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo);
+static VALUE fole_typelib(VALUE self);
+static VALUE fole_query_interface(VALUE self, VALUE str_iid);
+static VALUE fole_respond_to(VALUE self, VALUE method);
+static HRESULT ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
+static VALUE ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
+static VALUE ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
+static VALUE ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
+static VALUE fole_method_help(VALUE self, VALUE cmdname);
+static VALUE fole_activex_initialize(VALUE self);
+static VALUE foletype_s_ole_classes(VALUE self, VALUE typelib);
+static VALUE foletype_s_typelibs(VALUE self);
+static VALUE foletype_s_progids(VALUE self);
+static VALUE foletype_s_allocate(VALUE klass);
+static VALUE oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
+static VALUE oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass);
+static VALUE oletypelib_set_member(VALUE self, ITypeLib *pTypeLib);
+static ITypeLib * oletypelib_get_typelib(VALUE self);
+static void oletypelib_get_libattr(ITypeLib *pTypeLib, TLIBATTR **ppTLibAttr);
+static VALUE foletypelib_s_typelibs(VALUE self);
+static VALUE make_version_str(VALUE major, VALUE minor);
+static VALUE oletypelib_search_registry2(VALUE self, VALUE args);
+static VALUE oletypelib_search_registry(VALUE self, VALUE typelib);
+static VALUE foletypelib_s_allocate(VALUE klass);
+static VALUE foletypelib_initialize(VALUE self, VALUE args);
+static VALUE foletypelib_guid(VALUE self);
+static VALUE foletypelib_name(VALUE self);
+static VALUE foletypelib_version(VALUE self);
+static VALUE foletypelib_major_version(VALUE self);
+static VALUE foletypelib_minor_version(VALUE self);
+static VALUE oletypelib_path(VALUE guid, VALUE version);
+static HRESULT oletypelib_from_guid(VALUE guid, VALUE version, ITypeLib **ppTypeLib);
+static VALUE foletypelib_path(VALUE self);
+static VALUE foletypelib_visible(VALUE self);
+static VALUE foletypelib_library_name(VALUE self);
+static VALUE foletypelib_ole_types(VALUE self);
+static VALUE foletypelib_inspect(VALUE self);
+static VALUE foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass);
+static VALUE foletype_name(VALUE self);
+static VALUE ole_ole_type(ITypeInfo *pTypeInfo);
+static VALUE foletype_ole_type(VALUE self);
+static VALUE ole_type_guid(ITypeInfo *pTypeInfo);
+static VALUE foletype_guid(VALUE self);
+static VALUE ole_type_progid(ITypeInfo *pTypeInfo);
+static VALUE foletype_progid(VALUE self);
+static VALUE ole_type_visible(ITypeInfo *pTypeInfo);
+static VALUE foletype_visible(VALUE self);
+static VALUE ole_type_major_version(ITypeInfo *pTypeInfo);
+static VALUE foletype_major_version(VALUE self);
+static VALUE ole_type_minor_version(ITypeInfo *pTypeInfo);
+static VALUE foletype_minor_version(VALUE self);
+static VALUE ole_type_typekind(ITypeInfo *pTypeInfo);
+static VALUE foletype_typekind(VALUE self);
+static VALUE ole_type_helpstring(ITypeInfo *pTypeInfo);
+static VALUE foletype_helpstring(VALUE self);
+static VALUE ole_type_src_type(ITypeInfo *pTypeInfo);
+static VALUE foletype_src_type(VALUE self);
+static VALUE ole_type_helpfile(ITypeInfo *pTypeInfo);
+static VALUE foletype_helpfile(VALUE self);
+static VALUE ole_type_helpcontext(ITypeInfo *pTypeInfo);
+static VALUE foletype_helpcontext(VALUE self);
+static VALUE foletype_ole_typelib(VALUE self);
+static VALUE ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags);
+static VALUE foletype_impl_ole_types(VALUE self);
+static VALUE foletype_source_ole_types(VALUE self);
+static VALUE foletype_default_event_sources(VALUE self);
+static VALUE foletype_default_ole_types(VALUE self);
+static VALUE foletype_inspect(VALUE self);
+static VALUE ole_variables(ITypeInfo *pTypeInfo);
+static VALUE foletype_variables(VALUE self);
+static VALUE foletype_methods(VALUE self);
+static VALUE folevariable_name(VALUE self);
+static VALUE ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index);
+static VALUE folevariable_ole_type(VALUE self);
+static VALUE ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index);
+static VALUE folevariable_ole_type_detail(VALUE self);
+static VALUE ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index);
+static VALUE folevariable_value(VALUE self);
+static VALUE ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index);
+static VALUE folevariable_visible(VALUE self);
+static VALUE ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index);
+static VALUE folevariable_variable_kind(VALUE self);
+static VALUE ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index);
+static VALUE folevariable_varkind(VALUE self);
+static VALUE folevariable_inspect(VALUE self);
+static VALUE olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name);
+static VALUE folemethod_s_allocate(VALUE klass);
+static VALUE folemethod_initialize(VALUE self, VALUE oletype, VALUE method);
+static VALUE folemethod_name(VALUE self);
+static VALUE ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_return_type(VALUE self);
+static VALUE ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_return_vtype(VALUE self);
+static VALUE ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_return_type_detail(VALUE self);
+static VALUE ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_invkind(VALUE self);
+static VALUE folemethod_invoke_kind(VALUE self);
+static VALUE ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_visible(VALUE self);
+static VALUE ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name);
+static VALUE folemethod_event(VALUE self);
+static VALUE folemethod_event_interface(VALUE self);
+static VALUE ole_method_docinfo_from_type(ITypeInfo *pTypeInfo, UINT method_index, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
+static VALUE ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_helpstring(VALUE self);
+static VALUE ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_helpfile(VALUE self);
+static VALUE ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_helpcontext(VALUE self);
+static VALUE ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_dispid(VALUE self);
+static VALUE ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_offset_vtbl(VALUE self);
+static VALUE ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_size_params(VALUE self);
+static VALUE ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_size_opt_params(VALUE self);
+static VALUE ole_method_params(ITypeInfo *pTypeInfo, UINT method_index);
+static VALUE folemethod_params(VALUE self);
+static VALUE folemethod_inspect(VALUE self);
+static VALUE foleparam_s_allocate(VALUE klass);
+static VALUE oleparam_ole_param_from_index(VALUE self, ITypeInfo *pTypeInfo, UINT method_index, int param_index);
+static VALUE oleparam_ole_param(VALUE self, VALUE olemethod, int n);
+static VALUE foleparam_initialize(VALUE self, VALUE olemethod, VALUE n);
+static VALUE foleparam_name(VALUE self);
+static VALUE ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
+static VALUE foleparam_ole_type(VALUE self);
+static VALUE ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
+static VALUE foleparam_ole_type_detail(VALUE self);
+static VALUE ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask);
+static VALUE foleparam_input(VALUE self);
+static VALUE foleparam_output(VALUE self);
+static VALUE foleparam_optional(VALUE self);
+static VALUE foleparam_retval(VALUE self);
+static VALUE ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
+static VALUE foleparam_default(VALUE self);
+static VALUE foleparam_inspect(VALUE self);
+static long ole_search_event_at(VALUE ary, VALUE ev);
+static VALUE ole_search_event(VALUE ary, VALUE ev, BOOL  *is_default);
+static VALUE ole_search_handler_method(VALUE handler, VALUE ev, BOOL *is_default_handler);
+static void ole_delete_event(VALUE ary, VALUE ev);
+static void hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams);
+static VALUE hash2result(VALUE hash);
+static void ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams);
+static VALUE exec_callback(VALUE arg);
+static VALUE rescue_callback(VALUE arg);
+static HRESULT find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo);
+static HRESULT find_coclass(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **pTypeInfo2, TYPEATTR **pTypeAttr2);
+static HRESULT find_default_source_from_typeinfo(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **ppTypeInfo);
+static HRESULT find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo);
+static void ole_event_free(struct oleeventdata *poleev);
+static VALUE fev_s_allocate(VALUE klass);
+static VALUE ev_advise(int argc, VALUE *argv, VALUE self);
+static VALUE fev_initialize(int argc, VALUE *argv, VALUE self);
+static VALUE fev_s_msg_loop(VALUE klass);
+static void add_event_call_back(VALUE obj, VALUE event, VALUE data);
+static VALUE ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg);
+static VALUE fev_on_event(int argc, VALUE *argv, VALUE self);
+static VALUE fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self);
+static VALUE fev_off_event(int argc, VALUE *argv, VALUE self);
+static VALUE fev_unadvise(VALUE self);
+static VALUE fev_set_handler(VALUE self, VALUE val);
+static VALUE fev_get_handler(VALUE self);
+static VALUE evs_push(VALUE ev);
+static VALUE evs_delete(long i);
+static VALUE evs_entry(long i);
+static VALUE evs_length();
+static void  olevariant_free(struct olevariantdata *pvar);
+static VALUE folevariant_s_allocate(VALUE klass);
+static VALUE folevariant_s_array(VALUE klass, VALUE dims, VALUE vvt);
+static VALUE folevariant_initialize(VALUE self, VALUE args);
+static long *ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa);
+static void unlock_safe_array(SAFEARRAY *psa);
+static SAFEARRAY *get_locked_safe_array(VALUE val);
+static VALUE folevariant_ary_aref(int argc, VALUE *argv, VALUE self);
+static VOID * val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt);
+static VALUE folevariant_ary_aset(int argc, VALUE *argv, VALUE self);
+static VALUE folevariant_value(VALUE self);
+static VALUE folevariant_vartype(VALUE self);
+static VALUE folevariant_set_value(VALUE self, VALUE val);
+static void init_enc2cp();
+static void free_enc2cp();
+
+static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
+    IMessageFilter __RPC_FAR * This,
+    /* [in] */ REFIID riid,
+    /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
+{
+    if (MEMCMP(riid, &IID_IUnknown, GUID, 1) == 0
+        || MEMCMP(riid, &IID_IMessageFilter, GUID, 1) == 0)
+    {
+        *ppvObject = &message_filter;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+static ULONG (STDMETHODCALLTYPE mf_AddRef)(
+    IMessageFilter __RPC_FAR * This)
+{
+    return 1;
+}
+
+static ULONG (STDMETHODCALLTYPE mf_Release)(
+    IMessageFilter __RPC_FAR * This)
+{
+    return 1;
+}
+
+static DWORD (STDMETHODCALLTYPE mf_HandleInComingCall)(
+    IMessageFilter __RPC_FAR * pThis,
+    DWORD dwCallType,      //Type of incoming call
+    HTASK threadIDCaller,  //Task handle calling this task
+    DWORD dwTickCount,     //Elapsed tick count
+    LPINTERFACEINFO lpInterfaceInfo //Pointer to INTERFACEINFO structure
+    )
+{
+#ifdef DEBUG_MESSAGEFILTER
+    printf("incoming %08X, %08X, %d\n", dwCallType, threadIDCaller, dwTickCount);
+    fflush(stdout);
+#endif
+    switch (dwCallType)
+    {
+    case CALLTYPE_ASYNC:
+    case CALLTYPE_TOPLEVEL_CALLPENDING:
+    case CALLTYPE_ASYNC_CALLPENDING:
+        if (rb_during_gc()) {
+            return SERVERCALL_RETRYLATER;
+        }
+        break;
+    default:
+        break;
+    }
+    if (previous_filter) {
+        return previous_filter->lpVtbl->HandleInComingCall(previous_filter,
+                                                   dwCallType,
+                                                   threadIDCaller,
+                                                   dwTickCount,
+                                                   lpInterfaceInfo);
+    }
+    return SERVERCALL_ISHANDLED;
+}
+
+static DWORD (STDMETHODCALLTYPE mf_RetryRejectedCall)(
+    IMessageFilter* pThis,
+    HTASK threadIDCallee,  //Server task handle
+    DWORD dwTickCount,     //Elapsed tick count
+    DWORD dwRejectType     //Returned rejection message
+    )
+{
+    if (previous_filter) {
+        return previous_filter->lpVtbl->RetryRejectedCall(previous_filter,
+                                                  threadIDCallee,
+                                                  dwTickCount,
+                                                  dwRejectType);
+    }
+    return 1000;
+}
+
+static DWORD (STDMETHODCALLTYPE mf_MessagePending)(
+    IMessageFilter* pThis,
+    HTASK threadIDCallee,  //Called applications task handle
+    DWORD dwTickCount,     //Elapsed tick count
+    DWORD dwPendingType    //Call type
+    )
+{
+    if (rb_during_gc()) {
+        return PENDINGMSG_WAITNOPROCESS;
+    }
+    if (previous_filter) {
+        return previous_filter->lpVtbl->MessagePending(previous_filter,
+                                               threadIDCallee,
+                                               dwTickCount,
+                                               dwPendingType);
+    }
+    return PENDINGMSG_WAITNOPROCESS;
+}
+
 typedef struct _Win32OLEIDispatch
 {
     IDispatch dispatch;
@@ -210,7 +691,7 @@ typedef struct _Win32OLEIDispatch
     VALUE obj;
 } Win32OLEIDispatch;
 
-static HRESULT ( STDMETHODCALLTYPE QueryInterface )( 
+static HRESULT ( STDMETHODCALLTYPE QueryInterface )(
     IDispatch __RPC_FAR * This,
     /* [in] */ REFIID riid,
     /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
@@ -225,15 +706,15 @@ static HRESULT ( STDMETHODCALLTYPE QueryInterface )(
     }
     return E_NOINTERFACE;
 }
-        
-static ULONG ( STDMETHODCALLTYPE AddRef )( 
+
+static ULONG ( STDMETHODCALLTYPE AddRef )(
     IDispatch __RPC_FAR * This)
 {
     Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
     return ++(p->refcount);
 }
-        
-static ULONG ( STDMETHODCALLTYPE Release )( 
+
+static ULONG ( STDMETHODCALLTYPE Release )(
     IDispatch __RPC_FAR * This)
 {
     Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
@@ -245,15 +726,15 @@ static ULONG ( STDMETHODCALLTYPE Release )(
     }
     return u;
 }
-        
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )( 
+
+static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )(
     IDispatch __RPC_FAR * This,
     /* [out] */ UINT __RPC_FAR *pctinfo)
 {
     return E_NOTIMPL;
 }
-        
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )( 
+
+static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )(
     IDispatch __RPC_FAR * This,
     /* [in] */ UINT iTInfo,
     /* [in] */ LCID lcid,
@@ -262,8 +743,8 @@ static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )(
     return E_NOTIMPL;
 }
 
-        
-static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )( 
+
+static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(
     IDispatch __RPC_FAR * This,
     /* [in] */ REFIID riid,
     /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
@@ -271,14 +752,16 @@ static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(
     /* [in] */ LCID lcid,
     /* [size_is][out] */ DISPID __RPC_FAR *rgDispId)
 {
+    /*
     Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
+    */
     char* psz = ole_wc2mb(*rgszNames); // support only one method
     *rgDispId = rb_intern(psz);
     free(psz);
     return S_OK;
 }
-        
-static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )( 
+
+static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )(
     IDispatch __RPC_FAR * This,
     /* [in] */ DISPID dispIdMember,
     /* [in] */ REFIID riid,
@@ -310,8 +793,7 @@ static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )(
 }
 
 static IDispatch*
-val2dispatch(val)
-    VALUE val;
+val2dispatch(VALUE val)
 {
     struct st_table *tbl = DATA_PTR(com_hash);
     Win32OLEIDispatch* pdisp;
@@ -331,153 +813,274 @@ val2dispatch(val)
     return &pdisp->dispatch;
 }
 
-static void
-time2d(hh, mm, ss, pv)
-    int hh, mm, ss;
-    double *pv;
+static double
+rbtime2vtdate(VALUE tmobj)
 {
-    *pv =  (hh * 60.0 * 60.0 + mm * 60.0 + ss) / 86400.0;
+    SYSTEMTIME st;
+    double t = 0;
+    memset(&st, 0, sizeof(SYSTEMTIME));
+    st.wYear = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
+    st.wMonth = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
+    st.wDay = FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
+    st.wHour = FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
+    st.wMinute = FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
+    st.wSecond = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
+    st.wMilliseconds = FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0)) / 1000000;
+    SystemTimeToVariantTime(&st, &t);
+    return t;
 }
 
-static void
-d2time(v, hh, mm, ss)
-    double v;
-    int *hh, *mm, *ss;
+static VALUE
+vtdate2rbtime(double date)
 {
-    double d_hh, d_mm, d_ss;
-    int    i_hh, i_mm, i_ss;
-
-    double d = v * 86400.0;
-
-    d_hh = d / 3600.0;
-    i_hh = (int)d_hh;
-
-    d = d - i_hh * 3600.0;
-
-    d_mm = d / 60.0;
-    i_mm = (int)d_mm;
-
-    d = d - i_mm * 60.0;
-
-    d_ss = d * 10.0 + 5;
-    
-    i_ss = (int)d_ss / 10;
+    SYSTEMTIME st;
+    VALUE v;
+    VariantTimeToSystemTime(date, &st);
 
-    if(i_ss == 60) {
-        i_mm += 1;
-        i_ss = 0;
+    v = rb_funcall(rb_cTime, rb_intern("new"), 6,
+		      INT2FIX(st.wYear),
+		      INT2FIX(st.wMonth),
+		      INT2FIX(st.wDay),
+		      INT2FIX(st.wHour),
+		      INT2FIX(st.wMinute),
+		      INT2FIX(st.wSecond));
+    if (st.wMilliseconds > 0) {
+	return rb_funcall(v, rb_intern("+"), 1, rb_float_new((double)(st.wMilliseconds / 1000.0)));
     }
+    return v;
+}
 
-    if (i_mm == 60) {
-        i_hh += 1;
-        i_mm = 0;
-    }
-    if (i_hh == 24) {
-        i_hh = 0;
-    }
-    
-    *hh = i_hh;
-    *mm = i_mm;
-    *ss = i_ss;
+#define ENC_MACHING_CP(enc,encname,cp) if(strcasecmp(rb_enc_name((enc)),(encname)) == 0) return cp
+
+static UINT ole_encoding2cp(rb_encoding *enc)
+{
+    /*
+     * Is there any better solution to convert
+     * Ruby encoding to Windows codepage???
+     */
+    ENC_MACHING_CP(enc, "Big5", 950);
+    ENC_MACHING_CP(enc, "CP51932", 51932);
+    ENC_MACHING_CP(enc, "CP850", 850);
+    ENC_MACHING_CP(enc, "CP852", 852);
+    ENC_MACHING_CP(enc, "CP855", 855);
+    ENC_MACHING_CP(enc, "CP949", 949);
+    ENC_MACHING_CP(enc, "EUC-JP", 20932);
+    ENC_MACHING_CP(enc, "EUC-KR", 51949);
+    ENC_MACHING_CP(enc, "EUC-TW", 51950);
+    ENC_MACHING_CP(enc, "GB18030", 54936);
+    ENC_MACHING_CP(enc, "GB2312", 20936);
+    ENC_MACHING_CP(enc, "GBK", 936);
+    ENC_MACHING_CP(enc, "IBM437", 437);
+    ENC_MACHING_CP(enc, "IBM737", 737);
+    ENC_MACHING_CP(enc, "IBM775", 775);
+    ENC_MACHING_CP(enc, "IBM852", 852);
+    ENC_MACHING_CP(enc, "IBM855", 855);
+    ENC_MACHING_CP(enc, "IBM857", 857);
+    ENC_MACHING_CP(enc, "IBM860", 860);
+    ENC_MACHING_CP(enc, "IBM861", 861);
+    ENC_MACHING_CP(enc, "IBM862", 862);
+    ENC_MACHING_CP(enc, "IBM863", 863);
+    ENC_MACHING_CP(enc, "IBM864", 864);
+    ENC_MACHING_CP(enc, "IBM865", 865);
+    ENC_MACHING_CP(enc, "IBM866", 866);
+    ENC_MACHING_CP(enc, "IBM869", 869);
+    ENC_MACHING_CP(enc, "ISO-2022-JP", 50220);
+    ENC_MACHING_CP(enc, "ISO-8859-1", 28591);
+    ENC_MACHING_CP(enc, "ISO-8859-15", 28605);
+    ENC_MACHING_CP(enc, "ISO-8859-2", 28592);
+    ENC_MACHING_CP(enc, "ISO-8859-3", 28593);
+    ENC_MACHING_CP(enc, "ISO-8859-4", 28594);
+    ENC_MACHING_CP(enc, "ISO-8859-5", 28595);
+    ENC_MACHING_CP(enc, "ISO-8859-6", 28596);
+    ENC_MACHING_CP(enc, "ISO-8859-7", 28597);
+    ENC_MACHING_CP(enc, "ISO-8859-8", 28598);
+    ENC_MACHING_CP(enc, "ISO-8859-9", 28599);
+    ENC_MACHING_CP(enc, "KOI8-R", 20866);
+    ENC_MACHING_CP(enc, "KOI8-U", 21866);
+    ENC_MACHING_CP(enc, "Shift_JIS", 932);
+    ENC_MACHING_CP(enc, "UTF-16BE", 1201);
+    ENC_MACHING_CP(enc, "UTF-16LE", 1200);
+    ENC_MACHING_CP(enc, "UTF-7", 65000);
+    ENC_MACHING_CP(enc, "UTF-8", 65001);
+    ENC_MACHING_CP(enc, "Windows-1250", 1250);
+    ENC_MACHING_CP(enc, "Windows-1251", 1251);
+    ENC_MACHING_CP(enc, "Windows-1252", 1252);
+    ENC_MACHING_CP(enc, "Windows-1253", 1253);
+    ENC_MACHING_CP(enc, "Windows-1254", 1254);
+    ENC_MACHING_CP(enc, "Windows-1255", 1255);
+    ENC_MACHING_CP(enc, "Windows-1256", 1256);
+    ENC_MACHING_CP(enc, "Windows-1257", 1257);
+    ENC_MACHING_CP(enc, "Windows-1258", 1258);
+    ENC_MACHING_CP(enc, "Windows-31J", 932);
+    ENC_MACHING_CP(enc, "Windows-874", 874);
+    ENC_MACHING_CP(enc, "eucJP-ms", 20932);
+    return CP_ACP;
 }
 
 static void
-civil2jd(y, m, d, jd)
-    int y, m, d;
-    long *jd;
+failed_load_conv51932(void)
 {
-    long a, b;
-    if (m <= 2) {
-        y -= 1;
-        m += 12;
-    }
-    a = (long)(y / 100.0);
-    b = 2 - a + (long)(a / 4.0);
-    *jd = (long)(365.25 * (double)(y + 4716))
-         + (long)(30.6001 * (m + 1))
-         + d + b - 1524;
+    rb_raise(eWIN32OLERuntimeError, "fail to load convert function for CP51932");
 }
 
+#ifndef pIMultiLanguage
 static void
-jd2civil(day, yy, mm, dd)
-    long day;
-    int *yy, *mm, *dd;
-{
-    long x, a, b, c, d, e;
-    x = (long)(((double)day - 1867216.25) / 36524.25);
-    a = day + 1 + x - (long)(x / 4.0);
-    b = a + 1524;
-    c = (long)(((double)b -122.1) /365.25);
-    d = (long)(365.25 * c);
-    e = (long)((double)(b - d) / 30.6001);
-    *dd = b - d - (long)(30.6001 * e);
-    if (e <= 13) {
-        *mm = e - 1;
-        *yy = c - 4716;
-    }
-    else {
-        *mm = e - 13;
-        *yy = c - 4715;
+load_conv_function51932(void)
+{
+    HRESULT hr = E_NOINTERFACE;
+    void *p;
+    if (!pIMultiLanguage) {
+#if defined(HAVE_TYPE_IMULTILANGUAGE2)
+	hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
+		              &IID_IMultiLanguage2, &p);
+#elif defined(HAVE_TYPE_IMULTILANGUAGE)
+	hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
+		              &IID_IMultiLanguage, &p);
+#endif
+	if (FAILED(hr)) {
+	    failed_load_conv51932();
+	}
+	pIMultiLanguage = p;
     }
 }
+#else
+#define load_conv_function51932() failed_load_conv51932()
+#endif
+
+#define conv_51932(cp) ((cp) == 51932 && (load_conv_function51932(), 1))
 
 static void
-double2time(v, y, m, d, hh, mm, ss)
-    double v;
-    int *y, *m, *d, *hh, *mm, *ss;
+set_ole_codepage(UINT cp)
 {
-    long day;
-    double t;
-
-    day = (long)v;
-    t = v - day;
-    jd2civil(2415019 + day, y, m, d);
-
-    d2time(t, hh, mm, ss);
+    if (code_page_installed(cp)) {
+        cWIN32OLE_cp = cp;
+    } else {
+        switch(cp) {
+        case CP_ACP:
+        case CP_OEMCP:
+        case CP_MACCP:
+        case CP_THREAD_ACP:
+        case CP_SYMBOL:
+        case CP_UTF7:
+        case CP_UTF8:
+            cWIN32OLE_cp = cp;
+            break;
+        case 51932:
+            cWIN32OLE_cp = cp;
+            load_conv_function51932();
+            break;
+        default:
+            rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
+            break;
+        }
+    }
+    cWIN32OLE_enc = ole_cp2encoding(cWIN32OLE_cp);
 }
 
-static double
-time_object2date(tmobj)
-    VALUE tmobj;
-{
-    long y, m, d, hh, mm, ss;
-    long day;
-    double t;
-    y = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
-    m = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
-    d = FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
-    hh = FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
-    mm = FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
-    ss = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
-    civil2jd(y, m, d, &day);
-    time2d(hh, mm, ss, &t);
-    return t + day - 2415019;
-}
 
-static VALUE
-date2time_str(date)
-    double date;
+static UINT
+ole_init_cp(void)
 {
-    int y, m, d, hh, mm, ss;
-    char szTime[20];
-    double2time(date, &y, &m, &d, &hh, &mm, &ss);
-    sprintf(szTime,
-            "%4.4d/%02.2d/%02.2d %02.2d:%02.2d:%02.2d",
-            y, m, d, hh, mm, ss);
-    return rb_str_new2(szTime);
+    UINT cp;
+    rb_encoding *encdef;
+    encdef = rb_default_internal_encoding();
+    if (!encdef) {
+	encdef = rb_default_external_encoding();
+    }
+    cp = ole_encoding2cp(encdef);
+    set_ole_codepage(cp);
+    return cp;
 }
 
-static void ole_val2variant();
+struct myCPINFOEX {
+  UINT MaxCharSize;
+  BYTE DefaultChar[2];
+  BYTE LeadByte[12];
+  WCHAR UnicodeDefaultChar;
+  UINT CodePage;
+  char CodePageName[MAX_PATH];
+};
+
+static rb_encoding *
+ole_cp2encoding(UINT cp)
+{
+    static BOOL (*pGetCPInfoEx)(UINT, DWORD, struct myCPINFOEX *) = NULL;
+    struct myCPINFOEX* buf;
+    VALUE enc_name;
+    char *enc_cstr;
+    int idx;
+
+    if (!code_page_installed(cp)) {
+	switch(cp) {
+	  case CP_ACP:
+	    cp = GetACP();
+	    break;
+	  case CP_OEMCP:
+	    cp = GetOEMCP();
+	    break;
+	  case CP_MACCP:
+	  case CP_THREAD_ACP:
+	    if (!pGetCPInfoEx) {
+		pGetCPInfoEx = (BOOL (*)(UINT, DWORD, struct myCPINFOEX *))
+		    GetProcAddress(GetModuleHandle("kernel32"), "GetCPInfoEx");
+		if (!pGetCPInfoEx) {
+		    pGetCPInfoEx = (void*)-1;
+		}
+	    }
+	    buf = ALLOCA_N(struct myCPINFOEX, 1);
+	    ZeroMemory(buf, sizeof(struct myCPINFOEX));
+	    if (pGetCPInfoEx == (void*)-1 || !pGetCPInfoEx(cp, 0, buf)) {
+		rb_raise(eWIN32OLERuntimeError, "cannot map codepage to encoding.");
+		break;	/* never reach here */
+	    }
+	    cp = buf->CodePage;
+	    break;
+	  case CP_SYMBOL:
+	  case CP_UTF7:
+	  case CP_UTF8:
+	    break;
+	  case 51932:
+	    load_conv_function51932();
+	    break;
+	  default:
+            rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
+            break;
+        }
+    }
+
+    enc_name = rb_sprintf("CP%d", cp);
+    idx = rb_enc_find_index(enc_cstr = StringValueCStr(enc_name));
+    if (idx < 0)
+	idx = rb_define_dummy_encoding(enc_cstr);
+    return rb_enc_from_index(idx);
+}
 
 static char *
-ole_wc2mb(pw)
-    LPWSTR pw;
+ole_wc2mb(LPWSTR pw)
 {
-    int size;
     LPSTR pm;
+    int size = 0;
+    if (conv_51932(cWIN32OLE_cp)) {
+#ifndef pIMultiLanguage
+	DWORD dw = 0;
+	HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
+		&dw, cWIN32OLE_cp, pw, NULL, NULL, &size);
+	if (FAILED(hr)) {
+            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp);
+	}
+	pm = ALLOC_N(char, size + 1);
+	hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
+		&dw, cWIN32OLE_cp, pw, NULL, pm, &size);
+	if (FAILED(hr)) {
+            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp);
+	}
+	pm[size] = '\0';
+#endif
+        return pm;
+    }
     size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL);
     if (size) {
-        pm = ALLOC_N(char, size + 1);    
+        pm = ALLOC_N(char, size + 1);
         WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL);
         pm[size] = '\0';
     }
@@ -486,11 +1089,10 @@ ole_wc2mb(pw)
         *pm = '\0';
     }
     return pm;
-} 
+}
 
 static VALUE
-ole_hresult2msg(hr)
-    HRESULT hr;
+ole_hresult2msg(HRESULT hr)
 {
     VALUE msg = Qnil;
     char *p_msg = NULL;
@@ -498,13 +1100,13 @@ ole_hresult2msg(hr)
     DWORD dwCount;
 
     char strhr[100];
-    sprintf(strhr, "    HRESULT error code:0x%08lx\n      ", hr);
+    sprintf(strhr, "    HRESULT error code:0x%08x\n      ", (unsigned)hr);
     msg = rb_str_new2(strhr);
 
     dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                             FORMAT_MESSAGE_FROM_SYSTEM |
                             FORMAT_MESSAGE_IGNORE_INSERTS,
-                            NULL, hr, LOCALE_SYSTEM_DEFAULT,
+                            NULL, hr, cWIN32OLE_lcid,
                             (LPTSTR)&p_msg, 0, NULL);
     if (dwCount > 0) {
 	term = p_msg + strlen(p_msg);
@@ -522,9 +1124,16 @@ ole_hresult2msg(hr)
     return msg;
 }
 
+static void
+ole_freeexceptinfo(EXCEPINFO *pExInfo)
+{
+    SysFreeString(pExInfo->bstrDescription);
+    SysFreeString(pExInfo->bstrSource);
+    SysFreeString(pExInfo->bstrHelpFile);
+}
+
 static VALUE
-ole_excepinfo2msg(pExInfo)
-    EXCEPINFO *pExInfo;
+ole_excepinfo2msg(EXCEPINFO *pExInfo)
 {
     char error_code[40];
     char *pSource = NULL;
@@ -561,22 +1170,12 @@ ole_excepinfo2msg(pExInfo)
     }
     if(pSource) free(pSource);
     if(pDescription) free(pDescription);
-    SysFreeString(pExInfo->bstrDescription);
-    SysFreeString(pExInfo->bstrSource);
-    SysFreeString(pExInfo->bstrHelpFile);
+    ole_freeexceptinfo(pExInfo);
     return error_msg;
 }
 
 static void
-#ifdef HAVE_STDARG_PROTOTYPES
 ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
-#else
-ole_raise(hr, exc, fmt, va_alist)
-    HRESULT hr;
-    VALUE exc;
-    const char *fmt;
-    va_dcl
-#endif
 {
     va_list args;
     char buf[BUFSIZ];
@@ -598,26 +1197,31 @@ void
 ole_uninitialize()
 {
     OleUninitialize();
-    gOLEInitialized = Qfalse;
+    g_ole_initialized = FALSE;
 }
 
 static void
-ole_initialize() 
+ole_initialize()
 {
     HRESULT hr;
-    
-    if(gOLEInitialized == Qfalse) {
+
+    if(g_ole_initialized == FALSE) {
         hr = OleInitialize(NULL);
         if(FAILED(hr)) {
             ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
         }
-        gOLEInitialized = Qtrue;
+        g_ole_initialized = TRUE;
         /*
          * In some situation, OleUninitialize does not work fine. ;-<
          */
         /*
         atexit((void (*)(void))ole_uninitialize);
         */
+        hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
+        if(FAILED(hr)) {
+            previous_filter = NULL;
+            ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
+        }
     }
 }
 
@@ -631,24 +1235,28 @@ ole_msg_loop() {
 }
 
 static void
-ole_free(pole)
-    struct oledata *pole;
+ole_free(struct oledata *pole)
 {
     OLE_FREE(pole->pDispatch);
     free(pole);
 }
 
 static void
-oletype_free(poletype)
-    struct oletypedata *poletype;
+oletypelib_free(struct oletypelibdata *poletypelib)
+{
+    OLE_FREE(poletypelib->pTypeLib);
+    free(poletypelib);
+}
+
+static void
+oletype_free(struct oletypedata *poletype)
 {
     OLE_FREE(poletype->pTypeInfo);
     free(poletype);
 }
 
 static void
-olemethod_free(polemethod)
-    struct olemethoddata *polemethod;
+olemethod_free(struct olemethoddata *polemethod)
 {
     OLE_FREE(polemethod->pTypeInfo);
     OLE_FREE(polemethod->pOwnerTypeInfo);
@@ -656,28 +1264,97 @@ olemethod_free(polemethod)
 }
 
 static void
-olevariable_free(polevar)
-    struct olevariabledata *polevar;
+olevariable_free(struct olevariabledata *polevar)
 {
     OLE_FREE(polevar->pTypeInfo);
     free(polevar);
 }
 
 static void
-oleparam_free(pole)
-    struct oleparamdata *pole;
+oleparam_free(struct oleparamdata *pole)
 {
     OLE_FREE(pole->pTypeInfo);
     free(pole);
 }
 
+
+static LPWSTR
+ole_vstr2wc(VALUE vstr)
+{
+    rb_encoding *enc;
+    int cp;
+    int size = 0;
+    LPWSTR pw;
+    st_data_t data;
+    enc = rb_enc_get(vstr);
+
+    if (st_lookup(enc2cp_table, (st_data_t)enc, &data)) {
+        cp = data;
+    } else {
+        cp = ole_encoding2cp(enc);
+        if (code_page_installed(cp) ||
+            cp == CP_ACP ||
+            cp == CP_OEMCP ||
+            cp == CP_MACCP ||
+            cp == CP_THREAD_ACP ||
+            cp == CP_SYMBOL ||
+            cp == CP_UTF7 ||
+            cp == CP_UTF8 ||
+            cp == 51932) {
+            st_insert(enc2cp_table, (st_data_t)enc, (st_data_t)cp);
+        } else {
+            rb_raise(eWIN32OLERuntimeError, "not installed Windows codepage(%d) according to `%s'", cp, rb_enc_name(enc));
+        }
+    }
+    if (conv_51932(cp)) {
+#ifndef pIMultiLanguage
+	DWORD dw = 0;
+	int len = RSTRING_LEN(vstr);
+	HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
+		&dw, cp, RSTRING_PTR(vstr), &len, NULL, &size);
+	if (FAILED(hr)) {
+            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
+	}
+	pw = SysAllocStringLen(NULL, size);
+	len = RSTRING_LEN(vstr);
+	hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
+		&dw, cp, RSTRING_PTR(vstr), &len, pw, &size);
+	if (FAILED(hr)) {
+            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
+	}
+#endif
+	return pw;
+    }
+    size = MultiByteToWideChar(cp, 0, RSTRING_PTR(vstr), RSTRING_LEN(vstr), NULL, 0);
+    pw = SysAllocStringLen(NULL, size);
+    MultiByteToWideChar(cp, 0, RSTRING_PTR(vstr), RSTRING_LEN(vstr), pw, size);
+    return pw;
+}
+
 static LPWSTR
-ole_mb2wc(pm, len)
-    char *pm;
-    int  len;
+ole_mb2wc(char *pm, int len)
 {
-    int size;
+    int size = 0;
     LPWSTR pw;
+
+    if (conv_51932(cWIN32OLE_cp)) {
+#ifndef pIMultiLanguage
+	DWORD dw = 0;
+	int n = len;
+	HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
+		&dw, cWIN32OLE_cp, pm, &n, NULL, &size);
+	if (FAILED(hr)) {
+            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp);
+	}
+	pw = SysAllocStringLen(NULL, size);
+	hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
+		&dw, cWIN32OLE_cp, pm, &n, pw, &size);
+	if (FAILED(hr)) {
+            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp);
+	}
+#endif
+	return pw;
+    }
     size = MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, NULL, 0);
     pw = SysAllocStringLen(NULL, size - 1);
     MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, pw, size);
@@ -685,12 +1362,10 @@ ole_mb2wc(pm, len)
 }
 
 static VALUE
-ole_wc2vstr(pw, isfree)
-    LPWSTR pw;
-    BOOL isfree;
+ole_wc2vstr(LPWSTR pw, BOOL isfree)
 {
     char *p = ole_wc2mb(pw);
-    VALUE vstr = rb_str_new2(p);
+    VALUE vstr = rb_enc_str_new(p, strlen(p), cWIN32OLE_enc);
     if(isfree)
         SysFreeString(pw);
     free(p);
@@ -698,9 +1373,7 @@ ole_wc2vstr(pw, isfree)
 }
 
 static VALUE
-ole_ary_m_entry(val, pid)
-    VALUE val;
-    long *pid;
+ole_ary_m_entry(VALUE val, long *pid)
 {
     VALUE obj = Qnil;
     int i = 0;
@@ -712,40 +1385,230 @@ ole_ary_m_entry(val, pid)
     return obj;
 }
 
+static void *
+get_ptr_of_variant(VARIANT *pvar)
+{
+    switch(V_VT(pvar)) {
+    case VT_UI1:
+        return &V_UI1(pvar);
+        break;
+    case VT_I2:
+        return &V_I2(pvar);
+        break;
+    case VT_UI2:
+        return &V_UI2(pvar);
+        break;
+    case VT_I4:
+        return &V_I4(pvar);
+        break;
+    case VT_UI4:
+        return &V_UI4(pvar);
+        break;
+    case VT_R4:
+        return &V_R4(pvar);
+        break;
+    case VT_R8:
+        return &V_R8(pvar);
+        break;
+#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
+    case VT_I8:
+        return &V_I8(pvar);
+        break;
+    case VT_UI8:
+        return &V_UI8(pvar);
+        break;
+#endif
+    case VT_INT:
+        return &V_INT(pvar);
+        break;
+    case VT_UINT:
+        return &V_UINT(pvar);
+        break;
+    case VT_CY:
+        return &V_CY(pvar);
+        break;
+    case VT_DATE:
+        return &V_DATE(pvar);
+        break;
+    case VT_BSTR:
+        return V_BSTR(pvar);
+        break;
+    case VT_DISPATCH:
+        return V_DISPATCH(pvar);
+        break;
+    case VT_ERROR:
+        return &V_ERROR(pvar);
+        break;
+    case VT_BOOL:
+        return &V_BOOL(pvar);
+        break;
+    case VT_UNKNOWN:
+        return V_UNKNOWN(pvar);
+        break;
+    case VT_ARRAY:
+        return &V_ARRAY(pvar);
+        break;
+    default:
+        return NULL;
+        break;
+    }
+}
+
+static VALUE
+is_all_index_under(long *pid, long *pub, long dim)
+{
+  long i = 0;
+  for (i = 0; i < dim; i++) {
+    if (pid[i] > pub[i]) {
+      return Qfalse;
+    }
+  }
+  return Qtrue;
+}
+
 static void
-ole_set_safe_array(n, psa, pid, pub, val, dim)
-    long n;
-    SAFEARRAY *psa;
-    long *pid;
-    long *pub;
-    VALUE val;
-    long dim;
+ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long dim,  VARTYPE vt)
 {
     VALUE val1;
+    HRESULT hr = S_OK;
     VARIANT var;
-    VariantInit(&var);
-    if(n < 0) return;
-    if(n == dim) {
+    VOID *p = NULL;
+    long i = n;
+    while(i >= 0) {
         val1 = ole_ary_m_entry(val, pid);
-        ole_val2variant(val1, &var);
-        SafeArrayPutElement(psa, pid, &var);
+        VariantInit(&var);
+        p = val2variant_ptr(val1, &var, vt);
+        if (is_all_index_under(pid, pub, dim) == Qtrue) {
+            if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
+                (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
+                rb_raise(eWIN32OLERuntimeError, "element of array does not have IDispatch or IUnknown Interface");
+            }
+            hr = SafeArrayPutElement(psa, pid, p);
+        }
+        if (FAILED(hr)) {
+            ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayPutElement");
+        }
+        pid[i] += 1;
+        if (pid[i] > pub[i]) {
+            pid[i] = 0;
+            i -= 1;
+        } else {
+            i = dim - 1;
+        }
+    }
+}
+
+static long
+dimension(VALUE val) {
+    long dim = 0;
+    long dim1 = 0;
+    long len = 0;
+    long i = 0;
+    if (TYPE(val) == T_ARRAY) {
+        len = RARRAY_LEN(val);
+        for (i = 0; i < len; i++) {
+            dim1 = dimension(rb_ary_entry(val, i));
+            if (dim < dim1) {
+                dim = dim1;
+            }
+        }
+        dim += 1;
+    }
+    return dim;
+}
+
+static long
+ary_len_of_dim(VALUE ary, long dim) {
+    long ary_len = 0;
+    long ary_len1 = 0;
+    long len = 0;
+    long i = 0;
+    VALUE val;
+    if (dim == 0) {
+        if (TYPE(ary) == T_ARRAY) {
+            ary_len = RARRAY_LEN(ary);
+        }
+    } else {
+        if (TYPE(ary) == T_ARRAY) {
+            len = RARRAY_LEN(ary);
+            for (i = 0; i < len; i++) {
+                val = rb_ary_entry(ary, i);
+                ary_len1 = ary_len_of_dim(val, dim-1);
+                if (ary_len < ary_len1) {
+                    ary_len = ary_len1;
+                }
+            }
+        }
+    }
+    return ary_len;
+}
+
+static HRESULT
+ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt)
+{
+    long dim = 0;
+    int  i = 0;
+    HRESULT hr = S_OK;
+
+    SAFEARRAYBOUND *psab = NULL;
+    SAFEARRAY *psa = NULL;
+    long      *pub, *pid;
+
+    Check_Type(val, T_ARRAY);
+
+    dim = dimension(val);
+
+    psab = ALLOC_N(SAFEARRAYBOUND, dim);
+    pub  = ALLOC_N(long, dim);
+    pid  = ALLOC_N(long, dim);
+
+    if(!psab || !pub || !pid) {
+        if(pub) free(pub);
+        if(psab) free(psab);
+        if(pid) free(pid);
+        rb_raise(rb_eRuntimeError, "memory allocation error");
+    }
+
+    for (i = 0; i < dim; i++) {
+        psab[i].cElements = ary_len_of_dim(val, i);
+        psab[i].lLbound = 0;
+        pub[i] = psab[i].cElements - 1;
+        pid[i] = 0;
+    }
+    /* Create and fill VARIANT array */
+    if ((vt & ~VT_BYREF) == VT_ARRAY) {
+        vt = (vt | VT_VARIANT);
+    }
+    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
+    if (psa == NULL)
+        hr = E_OUTOFMEMORY;
+    else
+        hr = SafeArrayLock(psa);
+    if (SUCCEEDED(hr)) {
+        ole_set_safe_array(dim-1, psa, pid, pub, val, dim, (VARTYPE)(vt & VT_TYPEMASK));
+        hr = SafeArrayUnlock(psa);
     }
-    pid[n] += 1;
-    if (pid[n] < pub[n]) {
-        ole_set_safe_array(dim, psa, pid, pub, val, dim);
+
+    if(pub) free(pub);
+    if(psab) free(psab);
+    if(pid) free(pid);
+
+    if (SUCCEEDED(hr)) {
+        V_VT(var) = vt;
+        V_ARRAY(var) = psa;
     }
     else {
-        pid[n] = 0;
-        ole_set_safe_array(n-1, psa, pid, pub, val, dim);
+        if (psa != NULL)
+            SafeArrayDestroy(psa);
     }
+    return hr;
 }
 
 static void
-ole_val2variant(val, var)
-    VALUE val;
-    VARIANT *var;
+ole_val2variant(VALUE val, VARIANT *var)
 {
     struct oledata *pole;
+    struct olevariantdata *pvar;
     if(rb_obj_is_kind_of(val, cWIN32OLE)) {
         Data_Get_Struct(val, struct oledata, pole);
         OLE_ADDREF(pole->pDispatch);
@@ -753,73 +1616,24 @@ ole_val2variant(val, var)
         V_DISPATCH(var) = pole->pDispatch;
         return;
     }
+    if (rb_obj_is_kind_of(val, cWIN32OLE_VARIANT)) {
+        Data_Get_Struct(val, struct olevariantdata, pvar);
+        VariantCopy(var, &(pvar->var));
+        return;
+    }
+
     if (rb_obj_is_kind_of(val, rb_cTime)) {
         V_VT(var) = VT_DATE;
-        V_DATE(var) = time_object2date(val);
+        V_DATE(var) = rbtime2vtdate(val);
         return;
     }
     switch (TYPE(val)) {
     case T_ARRAY:
-    {
-        VALUE val1;
-        long dim = 0;
-        int  i = 0;
-
-        HRESULT hr;
-        SAFEARRAYBOUND *psab;
-        SAFEARRAY *psa;
-        long      *pub, *pid;
-
-        val1 = val;
-        while(TYPE(val1) == T_ARRAY) {
-            val1 = rb_ary_entry(val1, 0);
-            dim += 1;
-        }
-        psab = ALLOC_N(SAFEARRAYBOUND, dim);
-        pub  = ALLOC_N(long, dim);
-        pid  = ALLOC_N(long, dim);
-
-        if(!psab || !pub || !pid) {
-            if(pub) free(pub);
-            if(psab) free(psab);
-            if(pid) free(pid);
-            rb_raise(rb_eRuntimeError, "memory allocation error");
-        }
-        val1 = val;
-        i = 0;
-        while(TYPE(val1) == T_ARRAY) {
-            psab[i].cElements = RARRAY(val1)->len;
-            psab[i].lLbound = 0;
-            pub[i] = psab[i].cElements;
-            pid[i] = 0;
-            i ++;
-            val1 = rb_ary_entry(val1, 0);
-        }
-        /* Create and fill VARIANT array */
-        psa = SafeArrayCreate(VT_VARIANT, dim, psab);
-        if (psa == NULL)
-            hr = E_OUTOFMEMORY;
-        else
-            hr = SafeArrayLock(psa);
-        if (SUCCEEDED(hr)) {
-            ole_set_safe_array(dim-1, psa, pid, pub, val, dim-1);
-            hr = SafeArrayUnlock(psa);
-        }
-        if(pub) free(pub);
-        if(psab) free(psab);
-        if(pid) free(pid);
-
-        if (SUCCEEDED(hr)) {
-            V_VT(var) = VT_VARIANT | VT_ARRAY;
-            V_ARRAY(var) = psa;
-        }
-        else if (psa != NULL)
-            SafeArrayDestroy(psa);
+        ole_val_ary2variant_ary(val, var, VT_VARIANT|VT_ARRAY);
         break;
-    }
     case T_STRING:
         V_VT(var) = VT_BSTR;
-        V_BSTR(var) = ole_mb2wc(StringValuePtr(val), -1);
+        V_BSTR(var) = ole_vstr2wc(val);
         break;
     case T_FIXNUM:
         V_VT(var) = VT_I4;
@@ -857,9 +1671,290 @@ ole_val2variant(val, var)
 }
 
 static void
-ole_val2variant2(val, var)
-    VALUE val;
-    VARIANT *var;
+ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt)
+{
+    if (val == Qnil) {
+        if (vt == VT_VARIANT) {
+            ole_val2variant2(val, var);
+        } else {
+            V_VT(var) = (vt & ~VT_BYREF);
+            if (V_VT(var) == VT_DISPATCH) {
+                V_DISPATCH(var) = NULL;
+            } else if (V_VT(var) == VT_UNKNOWN) {
+                V_UNKNOWN(var) = NULL;
+            }
+        }
+        return;
+    }
+#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
+    switch(vt & ~VT_BYREF) {
+    case VT_I8:
+        V_VT(var) = VT_I8;
+        V_I8(var) = NUM2I8 (val);
+        break;
+    case VT_UI8:
+        V_VT(var) = VT_UI8;
+        V_UI8(var) = NUM2UI8(val);
+        break;
+    default:
+        ole_val2variant2(val, var);
+        break;
+    }
+#else  /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */
+    ole_val2variant2(val, var);
+#endif
+}
+
+static void
+ole_val2ptr_variant(VALUE val, VARIANT *var)
+{
+    switch (TYPE(val)) {
+    case T_STRING:
+        if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
+            *V_BSTRREF(var) = ole_vstr2wc(val);
+        }
+        break;
+    case T_FIXNUM:
+        switch(V_VT(var)) {
+        case (VT_UI1 | VT_BYREF) :
+            *V_UI1REF(var) = NUM2CHR(val);
+            break;
+        case (VT_I2 | VT_BYREF) :
+            *V_I2REF(var) = (short)NUM2INT(val);
+            break;
+        case (VT_I4 | VT_BYREF) :
+            *V_I4REF(var) = NUM2INT(val);
+            break;
+        case (VT_R4 | VT_BYREF) :
+            *V_R4REF(var) = (float)NUM2INT(val);
+            break;
+        case (VT_R8 | VT_BYREF) :
+            *V_R8REF(var) = NUM2INT(val);
+            break;
+        default:
+            break;
+        }
+        break;
+    case T_FLOAT:
+        switch(V_VT(var)) {
+        case (VT_I2 | VT_BYREF) :
+            *V_I2REF(var) = (short)NUM2INT(val);
+            break;
+        case (VT_I4 | VT_BYREF) :
+            *V_I4REF(var) = NUM2INT(val);
+            break;
+        case (VT_R4 | VT_BYREF) :
+            *V_R4REF(var) = (float)NUM2DBL(val);
+            break;
+        case (VT_R8 | VT_BYREF) :
+            *V_R8REF(var) = NUM2DBL(val);
+            break;
+        default:
+            break;
+        }
+        break;
+    case T_BIGNUM:
+        if (V_VT(var) == (VT_R8 | VT_BYREF)) {
+            *V_R8REF(var) = rb_big2dbl(val);
+        }
+        break;
+    case T_TRUE:
+        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+            *V_BOOLREF(var) = VARIANT_TRUE;
+        }
+        break;
+    case T_FALSE:
+        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+            *V_BOOLREF(var) = VARIANT_FALSE;
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+static void
+ole_set_byref(VARIANT *realvar, VARIANT *var,  VARTYPE vt)
+{
+    V_VT(var) = vt;
+    if (vt == (VT_VARIANT|VT_BYREF)) {
+        V_VARIANTREF(var) = realvar;
+    } else {
+        if (V_VT(realvar) != (vt & ~VT_BYREF)) {
+            rb_raise(eWIN32OLERuntimeError, "variant type mismatch");
+        }
+        switch(vt & ~VT_BYREF) {
+        case VT_I1:
+            V_I1REF(var) = &V_I1(realvar);
+            break;
+        case VT_UI1:
+            V_UI1REF(var) = &V_UI1(realvar);
+            break;
+        case VT_I2:
+            V_I2REF(var) = &V_I2(realvar);
+            break;
+        case VT_UI2:
+            V_UI2REF(var) = &V_UI2(realvar);
+            break;
+        case VT_I4:
+            V_I4REF(var) = &V_I4(realvar);
+            break;
+        case VT_UI4:
+            V_UI4REF(var) = &V_UI4(realvar);
+            break;
+        case VT_R4:
+            V_R4REF(var) = &V_R4(realvar);
+            break;
+        case VT_R8:
+            V_R8REF(var) = &V_R8(realvar);
+            break;
+
+#if (_MSC_VER >= 1300)
+        case VT_I8:
+            V_I8REF(var) = &V_I8(realvar);
+            break;
+        case VT_UI8:
+            V_UI8REF(var) = &V_UI8(realvar);
+            break;
+#endif
+        case VT_INT:
+            V_INTREF(var) = &V_INT(realvar);
+            break;
+
+        case VT_UINT:
+            V_UINTREF(var) = &V_UINT(realvar);
+            break;
+
+        case VT_CY:
+            V_CYREF(var) = &V_CY(realvar);
+            break;
+        case VT_DATE:
+            V_DATEREF(var) = &V_DATE(realvar);
+            break;
+        case VT_BSTR:
+            V_BSTRREF(var) = &V_BSTR(realvar);
+            break;
+        case VT_DISPATCH:
+            V_DISPATCHREF(var) = &V_DISPATCH(realvar);
+            break;
+        case VT_ERROR:
+            V_ERRORREF(var) = &V_ERROR(realvar);
+            break;
+        case VT_BOOL:
+            V_BOOLREF(var) = &V_BOOL(realvar);
+            break;
+        case VT_UNKNOWN:
+            V_UNKNOWNREF(var) = &V_UNKNOWN(realvar);
+            break;
+        case VT_ARRAY:
+            V_ARRAYREF(var) = &V_ARRAY(realvar);
+            break;
+        default:
+            rb_raise(eWIN32OLERuntimeError, "unknown type specified(setting BYREF):%d", vt);
+            break;
+        }
+    }
+}
+
+static void
+ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar)
+{
+    HRESULT hr = S_OK;
+
+    if (((vt & ~VT_BYREF) ==  (VT_ARRAY | VT_UI1)) && TYPE(val) == T_STRING) {
+        long len = RSTRING_LEN(val);
+        void *pdest = NULL;
+        SAFEARRAY *p = NULL;
+        SAFEARRAY *psa = SafeArrayCreateVector(VT_UI1, 0, len);
+        if (!psa) {
+            rb_raise(rb_eRuntimeError, "fail to SafeArrayCreateVector");
+        }
+        hr = SafeArrayAccessData(psa, &pdest);
+        if (SUCCEEDED(hr)) {
+            memcpy(pdest, RSTRING_PTR(val), len);
+            SafeArrayUnaccessData(psa);
+            V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
+            p = V_ARRAY(&(pvar->realvar));
+            if (p != NULL) {
+                SafeArrayDestroy(p);
+            }
+            V_ARRAY(&(pvar->realvar)) = psa;
+            if (vt & VT_BYREF) {
+                V_VT(&(pvar->var)) = vt;
+                V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
+            } else {
+                hr = VariantCopy(&(pvar->var), &(pvar->realvar));
+            }
+        } else {
+            if (psa)
+                SafeArrayDestroy(psa);
+        }
+    } else if (vt & VT_ARRAY) {
+        if (val == Qnil) {
+            V_VT(&(pvar->var)) = vt;
+            if (vt & VT_BYREF) {
+                V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
+            }
+        } else {
+            hr = ole_val_ary2variant_ary(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
+            if (SUCCEEDED(hr)) {
+                if (vt & VT_BYREF) {
+                    V_VT(&(pvar->var)) = vt;
+                    V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
+                } else {
+                    hr = VariantCopy(&(pvar->var), &(pvar->realvar));
+                }
+            }
+        }
+#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
+    } else if ( (vt & ~VT_BYREF) == VT_I8 || (vt & ~VT_BYREF) == VT_UI8) {
+        ole_val2variant_ex(val, &(pvar->realvar), (vt & ~VT_BYREF));
+        ole_val2variant_ex(val, &(pvar->var), (vt & ~VT_BYREF));
+        V_VT(&(pvar->var)) = vt;
+        if (vt & VT_BYREF) {
+            ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
+        }
+#endif
+    } else {
+        if (val == Qnil) {
+            V_VT(&(pvar->var)) = vt;
+            if (vt == (VT_BYREF | VT_VARIANT)) {
+                ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
+            } else {
+                V_VT(&(pvar->realvar)) = vt & ~VT_BYREF;
+                if (vt & VT_BYREF) {
+                    ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
+                }
+            }
+        } else {
+            ole_val2variant_ex(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
+            if (vt == (VT_BYREF | VT_VARIANT)) {
+                ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
+            } else if (vt & VT_BYREF) {
+                if ( (vt & ~VT_BYREF) != V_VT(&(pvar->realvar))) {
+                    hr = VariantChangeTypeEx(&(pvar->realvar), &(pvar->realvar),
+                            cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
+                }
+                if (SUCCEEDED(hr)) {
+                    ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
+                }
+            } else {
+                if (vt == V_VT(&(pvar->realvar))) {
+                    hr = VariantCopy(&(pvar->var), &(pvar->realvar));
+                } else {
+                    hr = VariantChangeTypeEx(&(pvar->var), &(pvar->realvar),
+                            cWIN32OLE_lcid, 0, vt);
+                }
+            }
+        }
+    }
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to change type");
+    }
+}
+
+static void
+ole_val2variant2(VALUE val, VARIANT *var)
 {
     g_nil_to = VT_EMPTY;
     ole_val2variant(val, var);
@@ -867,9 +1962,26 @@ ole_val2variant2(val, var)
 }
 
 static VALUE
-ole_set_member(self, dispatch)
-    VALUE self;
-    IDispatch * dispatch;
+make_inspect(const char *class_name, VALUE detail)
+{
+    VALUE str;
+    str = rb_str_new2("#<");
+    rb_str_cat2(str, class_name);
+    rb_str_cat2(str, ":");
+    rb_str_concat(str, detail);
+    rb_str_cat2(str, ">");
+    return str;
+}
+
+static VALUE
+default_inspect(VALUE self, const char *class_name)
+{
+    VALUE detail = rb_funcall(self, rb_intern("to_s"), 0);
+    return make_inspect(class_name, detail);
+}
+
+static VALUE
+ole_set_member(VALUE self, IDispatch *dispatch)
 {
     struct oledata *pole;
     Data_Get_Struct(self, struct oledata, pole);
@@ -881,10 +1993,9 @@ ole_set_member(self, dispatch)
     return self;
 }
 
-static VALUE fole_s_allocate _((VALUE));
+
 static VALUE
-fole_s_allocate(klass)
-    VALUE klass;
+fole_s_allocate(VALUE klass)
 {
     struct oledata *pole;
     VALUE obj;
@@ -895,11 +2006,7 @@ fole_s_allocate(klass)
 }
 
 static VALUE
-create_win32ole_object(klass, pDispatch, argc, argv)
-    VALUE klass;
-    IDispatch *pDispatch;
-    int argc;
-    VALUE *argv;
+create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv)
 {
     VALUE obj = fole_s_allocate(klass);
     ole_set_member(obj, pDispatch);
@@ -907,8 +2014,40 @@ create_win32ole_object(klass, pDispatch, argc, argv)
 }
 
 static VALUE
-ole_variant2val(pvar)
-    VARIANT *pvar;
+ary_new_dim(VALUE myary, long *pid, long *plb, long dim) {
+    long i;
+    VALUE obj = Qnil;
+    VALUE pobj = Qnil;
+    long *ids = ALLOC_N(long, dim);
+    if (!ids) {
+        rb_raise(rb_eRuntimeError, "memory allocation error");
+    }
+    for(i = 0; i < dim; i++) {
+        ids[i] = pid[i] - plb[i];
+    }
+    obj = myary;
+    pobj = myary;
+    for(i = 0; i < dim-1; i++) {
+        obj = rb_ary_entry(pobj, ids[i]);
+        if (obj == Qnil) {
+            rb_ary_store(pobj, ids[i], rb_ary_new());
+        }
+        obj = rb_ary_entry(pobj, ids[i]);
+        pobj = obj;
+    }
+    if (ids) free(ids);
+    return obj;
+}
+
+static void
+ary_store_dim(VALUE myary, long *pid, long *plb, long dim, VALUE val) {
+    long id = pid[dim - 1] - plb[dim - 1];
+    VALUE obj = ary_new_dim(myary, pid, plb, dim);
+    rb_ary_store(obj, id, val);
+}
+
+static VALUE
+ole_variant2val(VARIANT *pvar)
 {
     VALUE obj = Qnil;
     HRESULT hr;
@@ -917,96 +2056,142 @@ ole_variant2val(pvar)
 
     if(V_ISARRAY(pvar)) {
         SAFEARRAY *psa = V_ISBYREF(pvar) ? *V_ARRAYREF(pvar) : V_ARRAY(pvar);
-        long i;
-        long *pID, *pLB, *pUB;
+        UINT i = 0;
+        long *pid, *plb, *pub;
         VARIANT variant;
         VALUE val;
-        VALUE val2;
-        int dim = 0;
-
+        UINT dim = 0;
         if (!psa) {
             return obj;
         }
         dim = SafeArrayGetDim(psa);
-
         VariantInit(&variant);
         V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF;
 
-        pID = ALLOC_N(long, dim);
-        pLB = ALLOC_N(long, dim);
-        pUB = ALLOC_N(long, dim);
+        pid = ALLOC_N(long, dim);
+        plb = ALLOC_N(long, dim);
+        pub = ALLOC_N(long, dim);
 
-        if(!pID || !pLB || !pUB) {
-            if(pID) free(pID);
-            if(pLB) free(pLB);
-            if(pUB) free(pUB);
+        if(!pid || !plb || !pub) {
+            if(pid) free(pid);
+            if(plb) free(plb);
+            if(pub) free(pub);
             rb_raise(rb_eRuntimeError, "memory allocation error");
         }
 
-        obj = Qnil;
-
         for(i = 0; i < dim; ++i) {
-            SafeArrayGetLBound(psa, i+1, &pLB[i]);
-            SafeArrayGetLBound(psa, i+1, &pID[i]);
-            SafeArrayGetUBound(psa, i+1, &pUB[i]);
+            SafeArrayGetLBound(psa, i+1, &plb[i]);
+            SafeArrayGetLBound(psa, i+1, &pid[i]);
+            SafeArrayGetUBound(psa, i+1, &pub[i]);
         }
-
         hr = SafeArrayLock(psa);
         if (SUCCEEDED(hr)) {
-            val2 = rb_ary_new();
-            while (i >= 0) {
-                hr = SafeArrayPtrOfIndex(psa, pID, &V_BYREF(&variant));
-                if (FAILED(hr))
-                    break;
-
-                val = ole_variant2val(&variant);
-                rb_ary_push(val2, val);
-                for (i = dim-1 ; i >= 0 ; --i) {
-                    if (++pID[i] <= pUB[i])
+            obj = rb_ary_new();
+            i = 0;
+            while (i < dim) {
+                ary_new_dim(obj, pid, plb, dim);
+                hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
+                if (SUCCEEDED(hr)) {
+                    val = ole_variant2val(&variant);
+                    ary_store_dim(obj, pid, plb, dim, val);
+                }
+                for (i = 0; i < dim; ++i) {
+                    if (++pid[i] <= pub[i])
                         break;
-
-                    pID[i] = pLB[i];
-                    if (i > 0) {
-                        if (obj == Qnil)
-                            obj = rb_ary_new();
-                        rb_ary_push(obj, val2);
-                        val2 = rb_ary_new();
-                    }
+                    pid[i] = plb[i];
                 }
             }
             SafeArrayUnlock(psa);
         }
-        if(pID) free(pID);
-        if(pLB) free(pLB);
-        if(pUB) free(pUB);
-        return (obj == Qnil) ? val2 : obj;
+        if(pid) free(pid);
+        if(plb) free(plb);
+        if(pub) free(pub);
+        return obj;
     }
     switch(V_VT(pvar) & ~VT_BYREF){
     case VT_EMPTY:
         break;
     case VT_NULL:
         break;
+    case VT_I1:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM((long)*V_I1REF(pvar));
+        else
+            obj = INT2NUM((long)V_I1(pvar));
+        break;
+
     case VT_UI1:
-        if(V_ISBYREF(pvar)) 
+        if(V_ISBYREF(pvar))
             obj = INT2NUM((long)*V_UI1REF(pvar));
-        else 
+        else
             obj = INT2NUM((long)V_UI1(pvar));
         break;
 
     case VT_I2:
         if(V_ISBYREF(pvar))
             obj = INT2NUM((long)*V_I2REF(pvar));
-        else 
+        else
             obj = INT2NUM((long)V_I2(pvar));
         break;
 
+    case VT_UI2:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM((long)*V_UI2REF(pvar));
+        else
+            obj = INT2NUM((long)V_UI2(pvar));
+        break;
+
     case VT_I4:
         if(V_ISBYREF(pvar))
             obj = INT2NUM((long)*V_I4REF(pvar));
-        else 
+        else
             obj = INT2NUM((long)V_I4(pvar));
         break;
 
+    case VT_UI4:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM((long)*V_UI4REF(pvar));
+        else
+            obj = INT2NUM((long)V_UI4(pvar));
+        break;
+
+    case VT_INT:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM((long)*V_INTREF(pvar));
+        else
+            obj = INT2NUM((long)V_INT(pvar));
+        break;
+
+    case VT_UINT:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM((long)*V_UINTREF(pvar));
+        else
+            obj = INT2NUM((long)V_UINT(pvar));
+        break;
+
+#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
+    case VT_I8:
+        if(V_ISBYREF(pvar))
+#if (_MSC_VER >= 1300)
+            obj = I8_2_NUM(*V_I8REF(pvar));
+#else
+            obj = Qnil;
+#endif
+        else
+            obj = I8_2_NUM(V_I8(pvar));
+        break;
+    case VT_UI8:
+        if(V_ISBYREF(pvar))
+#if (_MSC_VER >= 1300)
+            obj = UI8_2_NUM(*V_UI8REF(pvar));
+#else
+            obj = Qnil;
+#endif
+        else
+            obj = UI8_2_NUM(V_UI8(pvar));
+        break;
+#endif  /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */
+
     case VT_R4:
         if(V_ISBYREF(pvar))
             obj = rb_float_new(*V_R4REF(pvar));
@@ -1023,13 +2208,10 @@ ole_variant2val(pvar)
 
     case VT_BSTR:
     {
-        char *p;
         if(V_ISBYREF(pvar))
-            p = ole_wc2mb(*V_BSTRREF(pvar));
+            obj = ole_wc2vstr(*V_BSTRREF(pvar), FALSE);
         else
-            p = ole_wc2mb(V_BSTR(pvar));
-        obj = rb_str_new2(p);
-        if(p) free(p);
+            obj = ole_wc2vstr(V_BSTR(pvar), FALSE);
         break;
     }
 
@@ -1065,10 +2247,10 @@ ole_variant2val(pvar)
 
     case VT_UNKNOWN:
     {
-
         /* get IDispatch interface from IUnknown interface */
         IUnknown *punk;
         IDispatch *pDispatch;
+        void *p;
         HRESULT hr;
 
         if (V_ISBYREF(pvar))
@@ -1077,9 +2259,9 @@ ole_variant2val(pvar)
             punk = V_UNKNOWN(pvar);
 
         if(punk != NULL) {
-           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch,
-                                             (void **)&pDispatch);
+           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch, &p);
            if(SUCCEEDED(hr)) {
+               pDispatch = p;
                obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
            }
         }
@@ -1094,7 +2276,7 @@ ole_variant2val(pvar)
         else
             date = V_DATE(pvar);
 
-        obj =  date2time_str(date);
+        obj =  vtdate2rbtime(date);
         break;
     }
     case VT_CY:
@@ -1103,12 +2285,10 @@ ole_variant2val(pvar)
         HRESULT hr;
         VARIANT variant;
         VariantInit(&variant);
-        hr = VariantChangeTypeEx(&variant, pvar, 
-                                  LOCALE_SYSTEM_DEFAULT, 0, VT_BSTR);
+        hr = VariantChangeTypeEx(&variant, pvar,
+                                  cWIN32OLE_lcid, 0, VT_BSTR);
         if (SUCCEEDED(hr) && V_VT(&variant) == VT_BSTR) {
-            char *p = ole_wc2mb(V_BSTR(&variant));
-            obj = rb_str_new2(p);
-            if(p) free(p);
+            obj = ole_wc2vstr(V_BSTR(&variant), FALSE);
         }
         VariantClear(&variant);
         break;
@@ -1117,30 +2297,23 @@ ole_variant2val(pvar)
     return obj;
 }
 
-
-static LONG reg_open_key(hkey, name, phkey)
-    HKEY hkey;
-    const char *name;
-    HKEY *phkey;
+static LONG
+reg_open_key(HKEY hkey, const char *name, HKEY *phkey)
 {
     return RegOpenKeyEx(hkey, name, 0, KEY_READ, phkey);
 }
 
-static LONG reg_open_vkey(hkey, key, phkey)
-    HKEY hkey;
-    VALUE key;
-    HKEY *phkey;
+static LONG
+reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey)
 {
     return reg_open_key(hkey, StringValuePtr(key), phkey);
 }
 
 static VALUE
-reg_enum_key(hkey, i)
-    HKEY hkey;
-    DWORD i;
+reg_enum_key(HKEY hkey, DWORD i)
 {
     char buf[BUFSIZ + 1];
-    DWORD size_buf = sizeof(buf) - 1;
+    DWORD size_buf = sizeof(buf);
     FILETIME ft;
     LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
                             NULL, NULL, NULL, &ft);
@@ -1152,59 +2325,96 @@ reg_enum_key(hkey, i)
 }
 
 static VALUE
-reg_get_val(hkey, subkey)
-    HKEY hkey;
-    const char *subkey;
+reg_get_val(HKEY hkey, const char *subkey)
 {
-    char buf[BUFSIZ + 1];
-    LONG size_buf = sizeof(buf) - 1;
-    LONG err = RegQueryValue(hkey, subkey, buf, &size_buf);
+    char *pbuf;
+    DWORD dwtype = 0;
+    LONG size = 0;
+    VALUE val = Qnil;
+    LONG err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, NULL, &size);
+
     if (err == ERROR_SUCCESS) {
-        buf[BUFSIZ] = '\0';
-        return rb_str_new2(buf);
+        pbuf = ALLOC_N(char, size + 1);
+        err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, pbuf, &size);
+        if (err == ERROR_SUCCESS) {
+            pbuf[size] = '\0';
+            if (dwtype == REG_EXPAND_SZ) {
+                 char* pbuf2 = pbuf;
+                 DWORD len = ExpandEnvironmentStrings(pbuf2, NULL, 0);
+                 pbuf = ALLOC_N(char, len + 1);
+                 ExpandEnvironmentStrings(pbuf2, pbuf, len + 1);
+                 free(pbuf2);
+            }
+            val = rb_str_new2(pbuf);
+        }
+        free(pbuf);
     }
-    return Qnil;
+    return val;
 }
 
 static VALUE
-typelib_file_from_clsid(ole)
-    VALUE ole;
+reg_get_val2(HKEY hkey, const char *subkey)
+{
+    HKEY hsubkey;
+    LONG err;
+    VALUE val = Qnil;
+    err = RegOpenKeyEx(hkey, subkey, 0, KEY_READ, &hsubkey);
+    if (err == ERROR_SUCCESS) {
+        val = reg_get_val(hsubkey, NULL);
+        RegCloseKey(hsubkey);
+    }
+    if (val == Qnil) {
+        val = reg_get_val(hkey, subkey);
+    }
+    return val;
+}
+
+static VALUE
+reg_get_typelib_file_path(HKEY hkey)
+{
+    VALUE path = Qnil;
+    path = reg_get_val2(hkey, "win64");
+    if (path != Qnil) {
+        return path;
+    }
+    path = reg_get_val2(hkey, "win32");
+    if (path != Qnil) {
+        return path;
+    }
+    path = reg_get_val2(hkey, "win16");
+    return path;
+}
+
+static VALUE
+typelib_file_from_clsid(VALUE ole)
 {
-    OLECHAR *pbuf;
-    CLSID clsid;
-    HRESULT hr;
     HKEY hroot, hclsid;
     LONG err;
     VALUE typelib;
-    VALUE vclsid;
-    char *pclsid = NULL;
+    char path[MAX_PATH + 1];
 
-    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
-    hr = CLSIDFromProgID(pbuf, &clsid);
-    SysFreeString(pbuf);
-    if (FAILED(hr)) {
-        return Qnil;
-    }
-    StringFromCLSID(&clsid, &pbuf);
-    vclsid = WC2VSTR(pbuf);
     err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hroot);
     if (err != ERROR_SUCCESS) {
         return Qnil;
     }
-    err = reg_open_key(hroot, StringValuePtr(vclsid), &hclsid);
+    err = reg_open_key(hroot, StringValuePtr(ole), &hclsid);
     if (err != ERROR_SUCCESS) {
         RegCloseKey(hroot);
         return Qnil;
     }
-    typelib = reg_get_val(hclsid, "InprocServer32");
+    typelib = reg_get_val2(hclsid, "InprocServer32");
     RegCloseKey(hroot);
     RegCloseKey(hclsid);
+    if (typelib != Qnil) {
+        ExpandEnvironmentStrings(StringValuePtr(typelib), path, sizeof(path));
+        path[MAX_PATH] = '\0';
+        typelib = rb_str_new2(path);
+    }
     return typelib;
 }
 
 static VALUE
-typelib_file_from_typelib(ole)
-    VALUE ole;
+typelib_file_from_typelib(VALUE ole)
 {
     HKEY htypelib, hclsid, hversion, hlang;
     double fver;
@@ -1234,7 +2444,7 @@ typelib_file_from_typelib(ole)
             if (ver == Qnil)
                 break;
             err = reg_open_vkey(hclsid, ver, &hversion);
-            if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
+			if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
                 continue;
             fver = atof(StringValuePtr(ver));
             typelib = reg_get_val(hversion, NULL);
@@ -1247,7 +2457,7 @@ typelib_file_from_typelib(ole)
                         break;
                     err = reg_open_vkey(hversion, lang, &hlang);
                     if (err == ERROR_SUCCESS) {
-                        if ((file = reg_get_val(hlang, "win32")) != Qnil) 
+                        if ((file = reg_get_typelib_file_path(hlang)) != Qnil)
                             found = TRUE;
                         RegCloseKey(hlang);
                     }
@@ -1262,8 +2472,7 @@ typelib_file_from_typelib(ole)
 }
 
 static VALUE
-typelib_file(ole)
-    VALUE ole;
+typelib_file(VALUE ole)
 {
     VALUE file = typelib_file_from_clsid(ole);
     if (file != Qnil) {
@@ -1273,10 +2482,7 @@ typelib_file(ole)
 }
 
 static void
-ole_const_load(pTypeLib, klass, self)
-    ITypeLib *pTypeLib;
-    VALUE klass;
-    VALUE self;
+ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
 {
     unsigned int count;
     unsigned int index;
@@ -1316,7 +2522,7 @@ ole_const_load(pTypeLib, klass, self)
                     continue;
                 pName = ole_wc2mb(bstr);
                 val = ole_variant2val(V_UNION1(pVarDesc, lpvarValue));
-                *pName = toupper(*pName);
+                *pName = toupper((int)*pName);
                 id = rb_intern(pName);
                 if (rb_is_const_id(id)) {
                     rb_define_const(klass, pName, val);
@@ -1339,10 +2545,7 @@ ole_const_load(pTypeLib, klass, self)
 }
 
 static HRESULT
-clsid_from_remote(host, com, pclsid)
-    VALUE host;
-    VALUE com;
-    CLSID *pclsid;
+clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
 {
     HKEY hlm;
     HKEY hpid;
@@ -1364,7 +2567,7 @@ clsid_from_remote(host, com, pclsid)
         hr = HRESULT_FROM_WIN32(err);
     else {
         len = sizeof(clsid);
-        err = RegQueryValueEx(hpid, "", NULL, &dwtype, clsid, &len);
+        err = RegQueryValueEx(hpid, (LPBYTE)"", NULL, &dwtype, clsid, &len);
         if (err == ERROR_SUCCESS && dwtype == REG_SZ) {
             pbuf  = ole_mb2wc(clsid, -1);
             hr = CLSIDFromString(pbuf, pclsid);
@@ -1380,10 +2583,7 @@ clsid_from_remote(host, com, pclsid)
 }
 
 static VALUE
-ole_create_dcom(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+ole_create_dcom(int argc, VALUE *argv, VALUE self)
 {
     VALUE ole, host, others;
     HRESULT hr;
@@ -1405,7 +2605,7 @@ ole_create_dcom(argc, argv, self)
         rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
     rb_scan_args(argc, argv, "2*", &ole, &host, &others);
 
-    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
+    pbuf  = ole_vstr2wc(ole);
     hr = CLSIDFromProgID(pbuf, &clsid);
     if (FAILED(hr))
         hr = clsid_from_remote(host, ole, &clsid);
@@ -1413,17 +2613,17 @@ ole_create_dcom(argc, argv, self)
         hr = CLSIDFromString(pbuf, &clsid);
     SysFreeString(pbuf);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "unknown OLE server: `%s'",
                   StringValuePtr(ole));
-    memset(&serverinfo, 0, sizeof(COSERVERINFO));    
-    serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
+    memset(&serverinfo, 0, sizeof(COSERVERINFO));
+    serverinfo.pwszName = ole_vstr2wc(host);
     memset(&multi_qi, 0, sizeof(MULTI_QI));
     multi_qi.pIID = &IID_IDispatch;
     hr = gCoCreateInstanceEx(&clsid, NULL, clsctx, &serverinfo, 1, &multi_qi);
     SysFreeString(serverinfo.pwszName);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "failed to create DCOM server `%s' in `%s'",
                   StringValuePtr(ole),
                   StringValuePtr(host));
@@ -1433,44 +2633,41 @@ ole_create_dcom(argc, argv, self)
 }
 
 static VALUE
-ole_bind_obj(moniker, argc, argv, self)
-    VALUE moniker;
-    int argc;
-    VALUE *argv;
-    VALUE self;
+ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
 {
     IBindCtx *pBindCtx;
     IMoniker *pMoniker;
     IDispatch *pDispatch;
+    void *p;
     HRESULT hr;
     OLECHAR *pbuf;
     ULONG eaten = 0;
-    
+
     ole_initialize();
 
     hr = CreateBindCtx(0, &pBindCtx);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "failed to create bind context");
     }
 
-    pbuf  = ole_mb2wc(StringValuePtr(moniker), -1);
+    pbuf  = ole_vstr2wc(moniker);
     hr = MkParseDisplayName(pBindCtx, pbuf, &eaten, &pMoniker);
     SysFreeString(pbuf);
     if(FAILED(hr)) {
         OLE_RELEASE(pBindCtx);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "failed to parse display name of moniker `%s'",
                   StringValuePtr(moniker));
     }
-    hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, 
-                                        &IID_IDispatch,
-                                        (void**)&pDispatch);
+    hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL,
+                                        &IID_IDispatch, &p);
+    pDispatch = p;
     OLE_RELEASE(pMoniker);
     OLE_RELEASE(pBindCtx);
 
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "failed to bind moniker `%s'",
                   StringValuePtr(moniker));
     }
@@ -1480,17 +2677,14 @@ ole_bind_obj(moniker, argc, argv, self)
 /*
  *  call-seq:
  *     WIN32OLE.connect( ole ) --> aWIN32OLE
- * 
+ *
  *  Returns running OLE Automation object or WIN32OLE object from moniker.
  *  1st argument should be OLE program id or class id or moniker.
- *     
+ *
  *     WIN32OLE.connect('Excel.Application') # => WIN32OLE object which represents running Excel.
  */
 static VALUE
-fole_s_connect(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_s_connect(int argc, VALUE *argv, VALUE self)
 {
     VALUE svr_name;
     VALUE others;
@@ -1498,6 +2692,7 @@ fole_s_connect(argc, argv, self)
     CLSID   clsid;
     OLECHAR *pBuf;
     IDispatch *pDispatch;
+    void *p;
     IUnknown *pUnknown;
 
     rb_secure(4);
@@ -1505,13 +2700,14 @@ fole_s_connect(argc, argv, self)
     ole_initialize();
 
     rb_scan_args(argc, argv, "1*", &svr_name, &others);
-    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
+    SafeStringValue(svr_name);
+    if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
         rb_raise(rb_eSecurityError, "Insecure Object Connection - %s",
-                 StringValuePtr(svr_name));
+		 StringValuePtr(svr_name));
     }
 
     /* get CLSID from OLE server name */
-    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
+    pBuf = ole_vstr2wc(svr_name);
     hr = CLSIDFromProgID(pBuf, &clsid);
     if(FAILED(hr)) {
         hr = CLSIDFromString(pBuf, &clsid);
@@ -1523,15 +2719,15 @@ fole_s_connect(argc, argv, self)
 
     hr = GetActiveObject(&clsid, 0, &pUnknown);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "OLE server `%s' not running", StringValuePtr(svr_name));
     }
-    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
-                                             (void **)&pDispatch);
+    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch, &p);
+    pDispatch = p;
     if(FAILED(hr)) {
         OLE_RELEASE(pUnknown);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "failed to create WIN32OLE server `%s'", 
+        ole_raise(hr, eWIN32OLERuntimeError,
+                  "failed to create WIN32OLE server `%s'",
                   StringValuePtr(svr_name));
     }
 
@@ -1540,16 +2736,16 @@ fole_s_connect(argc, argv, self)
     return create_win32ole_object(self, pDispatch, argc, argv);
 }
 
-/* 
+/*
  *  call-seq:
  *     WIN32OLE.const_load( ole, mod = WIN32OLE)
- * 
+ *
  *  Defines the constants of OLE Automation server as mod's constants.
  *  The first argument is WIN32OLE object or type library name.
  *  If 2nd argument is omitted, the default is WIN32OLE.
  *  The first letter of Ruby's constant variable name is upper case,
  *  so constant variable name of WIN32OLE object is capitalized.
- *  For example, the 'xlTop' constant of Excel is changed to 'XlTop' 
+ *  For example, the 'xlTop' constant of Excel is changed to 'XlTop'
  *  in WIN32OLE.
  *  If the first letter of constant variabl is not [A-Z], then
  *  the constant is defined as CONSTANTS hash element.
@@ -1560,7 +2756,7 @@ fole_s_connect(argc, argv, self)
  *     WIN32OLE.const_load(excel, EXCEL_CONST)
  *     puts EXCEL_CONST::XlTop # => -4160
  *     puts EXCEL_CONST::CONSTANTS['_xlDialogChartSourceData'] # => 541
- *     
+ *
  *     WIN32OLE.const_load(excel)
  *     puts WIN32OLE::XlTop # => -4160
  *
@@ -1570,10 +2766,7 @@ fole_s_connect(argc, argv, self)
  *     puts MSO::MsoLineSingle # => 1
  */
 static VALUE
-fole_s_const_load(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_s_const_load(int argc, VALUE *argv, VALUE self)
 {
     VALUE ole;
     VALUE klass;
@@ -1584,8 +2777,8 @@ fole_s_const_load(argc, argv, self)
     HRESULT hr;
     OLECHAR *pBuf;
     VALUE file;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-    
+    LCID    lcid = cWIN32OLE_lcid;
+
     rb_secure(4);
     rb_scan_args(argc, argv, "11", &ole, &klass);
     if (TYPE(klass) != T_CLASS &&
@@ -1619,11 +2812,11 @@ fole_s_const_load(argc, argv, self)
         if (file == Qnil) {
             file = ole;
         }
-        pBuf = ole_mb2wc(StringValuePtr(file), -1);
+        pBuf = ole_vstr2wc(file);
         hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
         SysFreeString(pBuf);
         if (FAILED(hr))
-            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+          ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
         if(TYPE(klass) != T_NIL) {
             ole_const_load(pTypeLib, klass, self);
         }
@@ -1639,24 +2832,22 @@ fole_s_const_load(argc, argv, self)
 }
 
 static VALUE
-ole_classes_from_typelib(pTypeLib, classes)
-    ITypeLib *pTypeLib;
-    VALUE classes;
+ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes)
 {
-    
+
     long count;
     int i;
     HRESULT hr;
     BSTR bstr;
     ITypeInfo *pTypeInfo;
     VALUE type;
-  
+
     rb_secure(4);
     count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
     for (i = 0; i < count; i++) {
         hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
                                                 &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) 
+        if (FAILED(hr))
             continue;
 
         hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
@@ -1673,8 +2864,7 @@ ole_classes_from_typelib(pTypeLib, classes)
 }
 
 static ULONG
-reference_count(pole)
-    struct oledata * pole;
+reference_count(struct oledata * pole)
 {
     ULONG n = 0;
     if(pole->pDispatch) {
@@ -1687,15 +2877,13 @@ reference_count(pole)
 /*
  *  call-seq:
  *     WIN32OLE.ole_reference_count(aWIN32OLE) --> number
- * 
- *  Returns reference counter of Dispatch interface of WIN32OLE object. 
+ *
+ *  Returns reference counter of Dispatch interface of WIN32OLE object.
  *  You should not use this method because this method
  *  exists only for debugging WIN32OLE.
  */
 static VALUE
-fole_s_reference_count(self, obj)
-    VALUE self;
-    VALUE obj;
+fole_s_reference_count(VALUE self, VALUE obj)
 {
     struct oledata * pole;
     OLEData_Get_Struct(obj, pole);
@@ -1705,16 +2893,14 @@ fole_s_reference_count(self, obj)
 /*
  *  call-seq:
  *     WIN32OLE.ole_free(aWIN32OLE) --> number
- * 
- *  Invokes Release method of Dispatch interface of WIN32OLE object. 
+ *
+ *  Invokes Release method of Dispatch interface of WIN32OLE object.
  *  You should not use this method because this method
  *  exists only for debugging WIN32OLE.
  *  The return value is reference counter of OLE object.
  */
 static VALUE
-fole_s_free(self, obj)
-    VALUE self;
-    VALUE obj;
+fole_s_free(VALUE self, VALUE obj)
 {
     ULONG n = 0;
     struct oledata * pole;
@@ -1728,9 +2914,7 @@ fole_s_free(self, obj)
 }
 
 static HWND
-ole_show_help(helpfile, helpcontext)
-    VALUE helpfile;
-    VALUE helpcontext;
+ole_show_help(VALUE helpfile, VALUE helpcontext)
 {
     FNHTMLHELP *pfnHtmlHelp;
     HWND hwnd = 0;
@@ -1742,10 +2926,10 @@ ole_show_help(helpfile, helpcontext)
     pfnHtmlHelp = (FNHTMLHELP*)GetProcAddress(ghhctrl, "HtmlHelpA");
     if (!pfnHtmlHelp)
         return hwnd;
-    hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
+    hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
                     0x0f, NUM2INT(helpcontext));
     if (hwnd == 0)
-        hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
+        hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
                  0,  NUM2INT(helpcontext));
     return hwnd;
 }
@@ -1753,7 +2937,7 @@ ole_show_help(helpfile, helpcontext)
 /*
  *  call-seq:
  *     WIN32OLE.ole_show_help(obj [,helpcontext])
- * 
+ *
  *  Displays helpfile. The 1st argument specifies WIN32OLE_TYPE
  *  object or WIN32OLE_METHOD object or helpfile.
  *
@@ -1762,10 +2946,7 @@ ole_show_help(helpfile, helpcontext)
  *     WIN32OLE.ole_show_help(typeobj)
  */
 static VALUE
-fole_s_show_help(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_s_show_help(int argc, VALUE *argv, VALUE self)
 {
     VALUE target;
     VALUE helpcontext;
@@ -1796,49 +2977,55 @@ fole_s_show_help(argc, argv, self)
     return Qnil;
 }
 
-/* 
+/*
  *  call-seq:
  *     WIN32OLE.codepage
- * 
+ *
  *  Returns current codepage.
  *     WIN32OLE.codepage # => WIN32OLE::CP_ACP
  */
 static VALUE
-fole_s_get_code_page(self)
-    VALUE self;
+fole_s_get_code_page(VALUE self)
 {
     return INT2FIX(cWIN32OLE_cp);
 }
 
-/* 
+static BOOL CALLBACK
+installed_code_page_proc(LPTSTR str) {
+    if (strtoul(str, NULL, 10) == g_cp_to_check) {
+        g_cp_installed = TRUE;
+        return FALSE;
+    }
+    return TRUE;
+}
+
+static BOOL
+code_page_installed(UINT cp)
+{
+    g_cp_installed = FALSE;
+    g_cp_to_check = cp;
+    EnumSystemCodePages(installed_code_page_proc, CP_INSTALLED);
+    return g_cp_installed;
+}
+
+/*
  *  call-seq:
  *     WIN32OLE.codepage = CP
- * 
+ *
  *  Sets current codepage.
+ *  The WIN32OLE.codepage is initialized according to
+ *  Encoding.default_internal.
+ *  If Encoding.default_internal is nil then WIN32OLE.codepage
+ *  is initialized according to Encoding.default_external.
+ *
  *     WIN32OLE.codepage = WIN32OLE::CP_UTF8
+ *     WIN32OLE.codepage = 65001
  */
 static VALUE
-fole_s_set_code_page(self, vcp)
-    VALUE self;
-    VALUE vcp;
+fole_s_set_code_page(VALUE self, VALUE vcp)
 {
     UINT cp = FIX2INT(vcp);
-
-    switch(cp) {
-    case CP_ACP:
-    case CP_OEMCP:
-    case CP_MACCP:
-    case CP_THREAD_ACP:
-    case CP_SYMBOL:
-    case CP_UTF7:
-    case CP_UTF8:
-        cWIN32OLE_cp = cp;
-        break;
-    default:
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8");
-        break;
-    }
-
+    set_ole_codepage(cp);
     /*
      * Should this method return old codepage?
      */
@@ -1846,29 +3033,184 @@ fole_s_set_code_page(self, vcp)
 }
 
 /*
+ *  call-seq:
+ *     WIN32OLE.locale -> locale id.
+ *
+ *  Returns current locale id (lcid). The default locale is
+ *  LOCALE_SYSTEM_DEFAULT.
+ *
+ *     lcid = WIN32OLE.locale
+ */
+static VALUE
+fole_s_get_locale(VALUE self)
+{
+    return INT2FIX(cWIN32OLE_lcid);
+}
+
+static BOOL
+CALLBACK installed_lcid_proc(LPTSTR str)
+{
+    if (strcmp(str, g_lcid_to_check) == 0) {
+        g_lcid_installed = TRUE;
+        return FALSE;
+    }
+    return TRUE;
+}
+
+static BOOL
+lcid_installed(LCID lcid)
+{
+    g_lcid_installed = FALSE;
+    snprintf(g_lcid_to_check, sizeof(g_lcid_to_check), "%08lx", lcid);
+    EnumSystemLocales(installed_lcid_proc, LCID_INSTALLED);
+    return g_lcid_installed;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE.locale = lcid
+ *
+ *  Sets current locale id (lcid).
+ *
+ *     WIN32OLE.locale = 1033 # set locale English(U.S)
+ *     obj = WIN32OLE_VARIANT.new("$100,000", WIN32OLE::VARIANT::VT_CY)
+ *
+ */
+static VALUE
+fole_s_set_locale(VALUE self, VALUE vlcid)
+{
+    LCID lcid = FIX2INT(vlcid);
+    if (lcid_installed(lcid)) {
+        cWIN32OLE_lcid = lcid;
+    } else {
+        switch (lcid) {
+        case LOCALE_SYSTEM_DEFAULT:
+        case LOCALE_USER_DEFAULT:
+            cWIN32OLE_lcid = lcid;
+            break;
+        default:
+            rb_raise(eWIN32OLERuntimeError, "not installed locale: %u", (unsigned int)lcid);
+        }
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE.create_guid
+ *
+ *  Creates GUID.
+ *     WIN32OLE.create_guid # => {1CB530F1-F6B1-404D-BCE6-1959BF91F4A8}
+ */
+static VALUE
+fole_s_create_guid(VALUE self)
+{
+    GUID guid;
+    HRESULT hr;
+    OLECHAR bstr[80];
+    int len = 0;
+    hr = CoCreateGuid(&guid);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to create GUID");
+    }
+    len = StringFromGUID2(&guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
+    if (len == 0) {
+        rb_raise(rb_eRuntimeError, "failed to create GUID(buffer over)");
+    }
+    return ole_wc2vstr(bstr, FALSE);
+}
+
+/*
+ * WIN32OLE.ole_initialize and WIN32OLE.ole_uninitialize
+ * are used in win32ole.rb to fix the issue bug #2618 (ruby-core:27634).
+ * You must not use thease method.
+ */
+
+static void  ole_pure_initialize()
+{
+    HRESULT hr;
+    hr = OleInitialize(NULL);
+    if(FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
+    }
+}
+
+static void  ole_pure_uninitialize()
+{
+    OleUninitialize();
+}
+
+/* :nodoc */
+static VALUE
+fole_s_ole_initialize(VALUE self)
+{
+    ole_pure_initialize();
+    return Qnil;
+}
+
+/* :nodoc */
+static VALUE
+fole_s_ole_uninitialize(VALUE self)
+{
+    ole_pure_uninitialize();
+    return Qnil;
+}
+
+/*
  * Document-class: WIN32OLE
  *
  *   <code>WIN32OLE</code> objects represent OLE Automation object in Ruby.
+ *
+ *   By using WIN32OLE, you can access OLE server like VBScript.
+ *
+ *   Here is sample script.
+ *
+ *     require 'win32ole'
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     excel.visible = true
+ *     workbook = excel.Workbooks.Add();
+ *     worksheet = workbook.Worksheets(1);
+ *     worksheet.Range("A1:D1").value = ["North","South","East","West"];
+ *     worksheet.Range("A2:B2").value = [5.2, 10];
+ *     worksheet.Range("C2").value = 8;
+ *     worksheet.Range("D2").value = 20;
+ *
+ *     range = worksheet.Range("A1:D2");
+ *     range.select
+ *     chart = workbook.Charts.Add;
+ *
+ *     workbook.saved = true;
+ *
+ *     excel.ActiveWorkbook.Close(0);
+ *     excel.Quit();
+ *
+ *  Unfortunately, Win32OLE doesn't support the argument passed by
+ *  reference directly.
+ *  Instead, Win32OLE provides WIN32OLE::ARGV.
+ *  If you want to get the result value of argument passed by reference,
+ *  you can use WIN32OLE::ARGV.
+ *
+ *     oleobj.method(arg1, arg2, refargv3)
+ *     puts WIN32OLE::ARGV[2]   # the value of refargv3 after called oleobj.method
+ *
  */
 
 /*
  *  call-seq:
  *     WIN32OLE.new(server, [host]) -> WIN32OLE object
- * 
+ *
  *  Returns a new WIN32OLE object(OLE Automation object).
  *  The first argument server specifies OLE Automation server.
  *  The first argument should be CLSID or PROGID.
- *  If second argument host specified, then returns OLE Automation 
- *  object on host. 
+ *  If second argument host specified, then returns OLE Automation
+ *  object on host.
  *
  *      WIN32OLE.new('Excel.Application') # => Excel OLE Automation WIN32OLE object.
  *      WIN32OLE.new('{00024500-0000-0000-C000-000000000046}') # => Excel OLE Automation WIN32OLE object.
  */
 static VALUE
-fole_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE svr_name;
     VALUE host;
@@ -1877,17 +3219,19 @@ fole_initialize(argc, argv, self)
     CLSID   clsid;
     OLECHAR *pBuf;
     IDispatch *pDispatch;
-
+    void *p;
     rb_secure(4);
     rb_call_super(0, 0);
     rb_scan_args(argc, argv, "11*", &svr_name, &host, &others);
 
-    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
+    SafeStringValue(svr_name);
+    if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
         rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
                  StringValuePtr(svr_name));
     }
     if (!NIL_P(host)) {
-        if (ruby_safe_level > 0 && OBJ_TAINTED(host)) {
+	SafeStringValue(host);
+        if (rb_safe_level() > 0 && OBJ_TAINTED(host)) {
             rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
                      StringValuePtr(svr_name));
         }
@@ -1895,45 +3239,44 @@ fole_initialize(argc, argv, self)
     }
 
     /* get CLSID from OLE server name */
-    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
+    pBuf  = ole_vstr2wc(svr_name);
     hr = CLSIDFromProgID(pBuf, &clsid);
     if(FAILED(hr)) {
         hr = CLSIDFromString(pBuf, &clsid);
     }
     SysFreeString(pBuf);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "unknown OLE server: `%s'",
                   StringValuePtr(svr_name));
     }
 
     /* get IDispatch interface */
     hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
-                          &IID_IDispatch, (void**)&pDispatch);
+                          &IID_IDispatch, &p);
+    pDispatch = p;
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "failed to create WIN32OLE object from `%s'",
                   StringValuePtr(svr_name));
     }
-    
+
     ole_set_member(self, pDispatch);
     return self;
 }
 
 static VALUE
-hash2named_arg(pair, pOp)
-    VALUE pair;
-    struct oleparam* pOp;
+hash2named_arg(VALUE pair, struct oleparam* pOp)
 {
     unsigned int index, i;
     VALUE key, value;
     index = pOp->dp.cNamedArgs;
 
-    /*-------------------------------------
-      the data-type of key must be String
-    ---------------------------------------*/
+    /*---------------------------------------------
+      the data-type of key must be String or Symbol
+    -----------------------------------------------*/
     key = rb_ary_entry(pair, 0);
-    if(TYPE(key) != T_STRING) {
+    if(TYPE(key) != T_STRING && TYPE(key) != T_SYMBOL) {
         /* clear name of dispatch parameters */
         for(i = 1; i < index + 1; i++) {
             SysFreeString(pOp->pNamedArgs[i]);
@@ -1943,11 +3286,14 @@ hash2named_arg(pair, pOp)
             VariantClear(&(pOp->dp.rgvarg[i]));
         }
         /* raise an exception */
-        Check_Type(key, T_STRING);
+        rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
+    }
+    if (TYPE(key) == T_SYMBOL) {
+	key = rb_sym_to_s(key);
     }
 
     /* pNamedArgs[0] is <method name>, so "index + 1" */
-    pOp->pNamedArgs[index + 1] = ole_mb2wc(StringValuePtr(key), -1);
+    pOp->pNamedArgs[index + 1] = ole_vstr2wc(key);
 
     value = rb_ary_entry(pair, 1);
     VariantInit(&(pOp->dp.rgvarg[index]));
@@ -1958,9 +3304,7 @@ hash2named_arg(pair, pOp)
 }
 
 static VALUE
-set_argv(realargs, beg, end)
-    VARIANTARG* realargs;
-    unsigned int beg, end;
+set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end)
 {
     VALUE argv = rb_const_get(cWIN32OLE, rb_intern("ARGV"));
 
@@ -1974,13 +3318,9 @@ set_argv(realargs, beg, end)
 }
 
 static VALUE
-ole_invoke(argc, argv, self, wFlags)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-    USHORT wFlags;
+ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
 {
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    LCID    lcid = cWIN32OLE_lcid;
     struct oledata *pole;
     HRESULT hr;
     VALUE cmd;
@@ -2001,6 +3341,7 @@ ole_invoke(argc, argv, self, wFlags)
     unsigned int cNamedArgs;
     int n;
     struct oleparam op;
+    struct olevariantdata *pvar;
     memset(&excepinfo, 0, sizeof(EXCEPINFO));
 
     VariantInit(&result);
@@ -2011,18 +3352,30 @@ ole_invoke(argc, argv, self, wFlags)
     op.dp.cArgs = 0;
 
     rb_scan_args(argc, argv, "1*", &cmd, &paramS);
+    if(TYPE(cmd) != T_STRING && TYPE(cmd) != T_SYMBOL && !is_bracket) {
+	rb_raise(rb_eTypeError, "method is wrong type (expected String or Symbol)");
+    }
+    if (TYPE(cmd) == T_SYMBOL) {
+	cmd = rb_sym_to_s(cmd);
+    }
     OLEData_Get_Struct(self, pole);
     if(!pole->pDispatch) {
         rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
     }
-    wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
-    hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
-                                                 &wcmdname, 1, lcid, &DispID);
-    SysFreeString(wcmdname);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "unknown property or method `%s'",
-                  StringValuePtr(cmd));
+    if (is_bracket) {
+        DispID = DISPID_VALUE;
+        argc += 1;
+	rb_ary_unshift(paramS, cmd);
+    } else {
+        wcmdname = ole_vstr2wc(cmd);
+        hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
+                &wcmdname, 1, lcid, &DispID);
+        SysFreeString(wcmdname);
+        if(FAILED(hr)) {
+            ole_raise(hr, rb_eNoMethodError,
+                    "unknown property or method: `%s'",
+                    StringValuePtr(cmd));
+        }
     }
 
     /* pick up last argument of method */
@@ -2032,17 +3385,17 @@ ole_invoke(argc, argv, self, wFlags)
 
     /* if last arg is hash object */
     if(TYPE(param) == T_HASH) {
-        /*------------------------------------------ 
-          hash object ==> named dispatch parameters 
+        /*------------------------------------------
+          hash object ==> named dispatch parameters
         --------------------------------------------*/
         cNamedArgs = NUM2INT(rb_funcall(param, rb_intern("length"), 0));
         op.dp.cArgs = cNamedArgs + argc - 2;
         op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
         op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs);
-        rb_iterate(rb_each, param, hash2named_arg, (VALUE)&op);
+        rb_block_call(param, rb_intern("each"), 0, 0, hash2named_arg, (VALUE)&op);
 
         pDispID = ALLOCA_N(DISPID, cNamedArgs + 1);
-        op.pNamedArgs[0] = ole_mb2wc(StringValuePtr(cmd), -1);
+        op.pNamedArgs[0] = ole_vstr2wc(cmd);
         hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch,
                                                     &IID_NULL,
                                                     op.pNamedArgs,
@@ -2057,7 +3410,7 @@ ole_invoke(argc, argv, self, wFlags)
             for(i = 0; i < op.dp.cArgs; i++ ) {
                 VariantClear(&op.dp.rgvarg[i]);
             }
-            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+            ole_raise(hr, eWIN32OLERuntimeError,
                       "failed to get named argument info: `%s'",
                       StringValuePtr(cmd));
         }
@@ -2072,7 +3425,7 @@ ole_invoke(argc, argv, self, wFlags)
         }
     }
     /*--------------------------------------
-      non hash args ==> dispatch parameters 
+      non hash args ==> dispatch parameters
      ----------------------------------------*/
     if(op.dp.cArgs > cNamedArgs) {
         realargs = ALLOCA_N(VARIANTARG, op.dp.cArgs-cNamedArgs+1);
@@ -2081,26 +3434,30 @@ ole_invoke(argc, argv, self, wFlags)
             VariantInit(&realargs[n]);
             VariantInit(&op.dp.rgvarg[n]);
             param = rb_ary_entry(paramS, i-cNamedArgs);
-            
-             ole_val2variant(param, &realargs[n]);
-            V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
-             V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
-
+            if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
+                Data_Get_Struct(param, struct olevariantdata, pvar);
+                VariantCopy(&op.dp.rgvarg[n], &(pvar->var));
+            } else {
+                ole_val2variant(param, &realargs[n]);
+                V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
+                V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
+            }
         }
     }
     /* apparent you need to call propput, you need this */
     if (wFlags & DISPATCH_PROPERTYPUT) {
         if (op.dp.cArgs == 0)
-            return ResultFromScode(E_INVALIDARG);
+            ole_raise(ResultFromScode(E_INVALIDARG), eWIN32OLERuntimeError, "argument error");
 
         op.dp.cNamedArgs = 1;
         op.dp.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
         op.dp.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
     }
-    
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
-                                         &IID_NULL, lcid, wFlags, &op.dp, 
+
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
+                                         &IID_NULL, lcid, wFlags, &op.dp,
                                          &result, &excepinfo, &argErr);
+
     if (FAILED(hr)) {
         /* retry to call args by value */
         if(op.dp.cArgs >= cNamedArgs) {
@@ -2109,9 +3466,12 @@ ole_invoke(argc, argv, self, wFlags)
                 param = rb_ary_entry(paramS, i-cNamedArgs);
                 ole_val2variant(param, &op.dp.rgvarg[n]);
             }
+            if (hr == DISP_E_EXCEPTION) {
+                ole_freeexceptinfo(&excepinfo);
+            }
             memset(&excepinfo, 0, sizeof(EXCEPINFO));
             VariantInit(&result);
-            hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+            hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
                                                  &IID_NULL, lcid, wFlags,
                                                  &op.dp, &result,
                                                  &excepinfo, &argErr);
@@ -2121,17 +3481,22 @@ ole_invoke(argc, argv, self, wFlags)
              * hResult == DISP_E_EXCEPTION. this only happens on
              * functions whose DISPID > 0x8000 */
             if ((hr == DISP_E_EXCEPTION || hr == DISP_E_MEMBERNOTFOUND) && DispID > 0x8000) {
+                if (hr == DISP_E_EXCEPTION) {
+                    ole_freeexceptinfo(&excepinfo);
+                }
                 memset(&excepinfo, 0, sizeof(EXCEPINFO));
-                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
                         &IID_NULL, lcid, wFlags,
                         &op.dp, NULL,
                         &excepinfo, &argErr);
+
             }
             for(i = cNamedArgs; i < op.dp.cArgs; i++) {
                 n = op.dp.cArgs - i + cNamedArgs - 1;
                 VariantClear(&op.dp.rgvarg[n]);
             }
         }
+
         if (FAILED(hr)) {
             /* retry after converting nil to VT_EMPTY */
             if (op.dp.cArgs > cNamedArgs) {
@@ -2140,9 +3505,12 @@ ole_invoke(argc, argv, self, wFlags)
                     param = rb_ary_entry(paramS, i-cNamedArgs);
                     ole_val2variant2(param, &op.dp.rgvarg[n]);
                 }
+                if (hr == DISP_E_EXCEPTION) {
+                    ole_freeexceptinfo(&excepinfo);
+                }
                 memset(&excepinfo, 0, sizeof(EXCEPINFO));
                 VariantInit(&result);
-                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
                         &IID_NULL, lcid, wFlags,
                         &op.dp, &result,
                         &excepinfo, &argErr);
@@ -2156,6 +3524,13 @@ ole_invoke(argc, argv, self, wFlags)
     }
     /* clear dispatch parameter */
     if(op.dp.cArgs > cNamedArgs) {
+        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
+            n = op.dp.cArgs - i + cNamedArgs - 1;
+            param = rb_ary_entry(paramS, i-cNamedArgs);
+            if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
+                ole_val2variant(param, &realargs[n]);
+            }
+        }
         set_argv(realargs, cNamedArgs, op.dp.cArgs);
     }
     else {
@@ -2166,8 +3541,9 @@ ole_invoke(argc, argv, self, wFlags)
 
     if (FAILED(hr)) {
         v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s%s",
-                  StringValuePtr(cmd), StringValuePtr(v));
+        ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `%s': )%s",
+                  StringValuePtr(cmd),
+                  StringValuePtr(v));
     }
     obj = ole_variant2val(&result);
     VariantClear(&result);
@@ -2178,7 +3554,7 @@ ole_invoke(argc, argv, self, wFlags)
  *  call-seq:
  *     WIN32OLE#invoke(method, [arg1,...])  => return value of method.
  *
- *  Runs OLE method. 
+ *  Runs OLE method.
  *  The first argument specifies the method name of OLE Automation object.
  *  The others specify argument of the <i>method</i>.
  *  If you can not execute <i>method</i> directly, then use this method instead.
@@ -2188,21 +3564,13 @@ ole_invoke(argc, argv, self, wFlags)
  *
  */
 static VALUE
-fole_invoke(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_invoke(int argc, VALUE *argv, VALUE self)
 {
-    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
+    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
 }
 
 static VALUE
-ole_invoke2(self, dispid, args, types, dispkind)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
-    USHORT dispkind;
+ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
 {
     HRESULT hr;
     struct oledata *pole;
@@ -2219,13 +3587,13 @@ ole_invoke2(self, dispid, args, types, dispkind)
 
     Check_Type(args, T_ARRAY);
     Check_Type(types, T_ARRAY);
-    
+
     memset(&excepinfo, 0, sizeof(EXCEPINFO));
     memset(&dispParams, 0, sizeof(DISPPARAMS));
     VariantInit(&result);
     OLEData_Get_Struct(self, pole);
 
-    dispParams.cArgs = RARRAY(args)->len;
+    dispParams.cArgs = RARRAY_LEN(args);
     dispParams.rgvarg = ALLOCA_N(VARIANTARG, dispParams.cArgs);
     realargs = ALLOCA_N(VARIANTARG, dispParams.cArgs);
     for (i = 0, j = dispParams.cArgs - 1; i < (int)dispParams.cArgs; i++, j--)
@@ -2256,7 +3624,7 @@ ole_invoke2(self, dispid, args, types, dispkind)
                 SAFEARRAYBOUND rgsabound[1];
                 Check_Type(param, T_ARRAY);
                 rgsabound[0].lLbound = 0;
-                rgsabound[0].cElements = RARRAY(param)->len;
+                rgsabound[0].cElements = RARRAY_LEN(param);
                 v = vt & ~(VT_ARRAY | VT_BYREF);
                 V_ARRAY(&realargs[i]) = SafeArrayCreate(v, 1, rgsabound);
                 V_VT(&realargs[i]) = VT_ARRAY | v;
@@ -2274,7 +3642,7 @@ ole_invoke2(self, dispid, args, types, dispkind)
                     if (v != VT_VARIANT)
                     {
                         VariantChangeTypeEx(&velem, &velem,
-                            LOCALE_SYSTEM_DEFAULT, 0, v);
+                            cWIN32OLE_lcid, 0, v);
                     }
                     switch (v)
                     {
@@ -2313,7 +3681,7 @@ ole_invoke2(self, dispid, args, types, dispkind)
                 if ((vt & (~VT_BYREF)) != VT_VARIANT)
                 {
                     hr = VariantChangeTypeEx(&realargs[i], &realargs[i],
-                                             LOCALE_SYSTEM_DEFAULT, 0,
+                                             cWIN32OLE_lcid, 0,
                                              (VARTYPE)(vt & (~VT_BYREF)));
                     if (hr != S_OK)
                     {
@@ -2369,14 +3737,15 @@ ole_invoke2(self, dispid, args, types, dispkind)
     }
 
     hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, NUM2INT(dispid),
-                                         &IID_NULL, LOCALE_SYSTEM_DEFAULT,
+                                         &IID_NULL, cWIN32OLE_lcid,
                                          dispkind,
                                          &dispParams, &result,
                                          &excepinfo, &argErr);
 
     if (FAILED(hr)) {
         v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "_invoke %s",
+        ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `<dispatch id:%d>': )%s",
+                  NUM2INT(dispid),
                   StringValuePtr(v));
     }
 
@@ -2393,9 +3762,9 @@ ole_invoke2(self, dispid, args, types, dispkind)
 /*
  *   call-seq:
  *      WIN32OLE#_invoke(dispid, args, types)
- * 
+ *
  *   Runs the early binding method.
- *   The 1st argument specifies dispatch ID, 
+ *   The 1st argument specifies dispatch ID,
  *   the 2nd argument specifies the array of arguments,
  *   the 3rd argument specifies the array of the type of arguments.
  *
@@ -2403,11 +3772,7 @@ ole_invoke2(self, dispid, args, types, dispkind)
  *      excel._invoke(302, [], []) #  same effect as excel.Quit
  */
 static VALUE
-fole_invoke2(self, dispid, args, types)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
+fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types)
 {
     return ole_invoke2(self, dispid, args, types, DISPATCH_METHOD);
 }
@@ -2415,9 +3780,9 @@ fole_invoke2(self, dispid, args, types)
 /*
  *  call-seq:
  *     WIN32OLE#_getproperty(dispid, args, types)
- * 
+ *
  *  Runs the early binding method to get property.
- *  The 1st argument specifies dispatch ID, 
+ *  The 1st argument specifies dispatch ID,
  *  the 2nd argument specifies the array of arguments,
  *  the 3rd argument specifies the array of the type of arguments.
  *
@@ -2425,11 +3790,7 @@ fole_invoke2(self, dispid, args, types)
  *     puts excel._getproperty(558, [], []) # same effect as puts excel.visible
  */
 static VALUE
-fole_getproperty2(self, dispid, args, types)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
+fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
 {
     return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYGET);
 }
@@ -2437,9 +3798,9 @@ fole_getproperty2(self, dispid, args, types)
 /*
  *   call-seq:
  *      WIN32OLE#_setproperty(dispid, args, types)
- * 
+ *
  *   Runs the early binding method to set property.
- *   The 1st argument specifies dispatch ID, 
+ *   The 1st argument specifies dispatch ID,
  *   the 2nd argument specifies the array of arguments,
  *   the 3rd argument specifies the array of the type of arguments.
  *
@@ -2447,59 +3808,78 @@ fole_getproperty2(self, dispid, args, types)
  *      excel._setproperty(558, [true], [WIN32OLE::VARIANT::VT_BOOL]) # same effect as excel.visible = true
  */
 static VALUE
-fole_setproperty2(self, dispid, args, types)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
+fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
 {
     return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYPUT);
 }
 
 /*
  *  call-seq:
- *     WIN32OLE['property']=val 
+ *     WIN32OLE[a1, a2, ...]=val
+ *
+ *  Sets the value to WIN32OLE object specified by a1, a2, ...
+ *
+ *     dict = WIN32OLE.new('Scripting.Dictionary')
+ *     dict.add('ruby', 'RUBY')
+ *     dict['ruby'] = 'Ruby'
+ *     puts dict['ruby'] # => 'Ruby'
+ *
+ *  Remark: You can not use this method to set the property value.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     # excel['Visible'] = true # This is error !!!
+ *     excel.Visible = true # You should to use this style to set the property.
+ *
+ */
+static VALUE
+fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
+{
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
+}
+
+/*
+ *  call-seq:
  *     WIN32OLE.setproperty('property', [arg1, arg2,...] val)
- * 
+ *
  *  Sets property of OLE object.
  *  When you want to set property with argument, you can use this method.
  *
  *     excel = WIN32OLE.new('Excel.Application')
- *     excel['Visible'] = true
+ *     excel.Visible = true
  *     book = excel.workbooks.add
  *     sheet = book.worksheets(1)
  *     sheet.setproperty('Cells', 1, 2, 10) # => The B1 cell value is 10.
  */
 static VALUE
-fole_setproperty(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_setproperty(int argc, VALUE *argv, VALUE self)
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT);
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
 }
 
 /*
  *  call-seq:
- *     WIN32OLE['property'] 
- * 
- *  Returns property of OLE object.
+ *     WIN32OLE[a1,a2,...]
+ *
+ *  Returns the value of Collection specified by a1, a2,....
  *
+ *     dict = WIN32OLE.new('Scripting.Dictionary')
+ *     dict.add('ruby', 'Ruby')
+ *     puts dict['ruby'] # => 'Ruby' (same as `puts dict.item('ruby')')
+ *
+ *  Remark: You can not use this method to get the property.
  *     excel = WIN32OLE.new('Excel.Application')
- *     puts excel['Visible'] # => false
+ *     # puts excel['Visible']  This is error !!!
+ *     puts excel.Visible # You should to use this style to get the property.
+ *
  */
 static VALUE
-fole_getproperty(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self)
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET);
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
 }
 
 static VALUE
-ole_propertyput(self, property, value)
-    VALUE self, property, value;
+ole_propertyput(VALUE self, VALUE property, VALUE value)
 {
     struct oledata *pole;
     unsigned argErr;
@@ -2513,7 +3893,7 @@ ole_propertyput(self, property, value)
     VARIANTARG propertyValue[2];
     OLECHAR* pBuf[1];
     VALUE v;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    LCID    lcid = cWIN32OLE_lcid;
     dispParams.rgdispidNamedArgs = &dispIDParam;
     dispParams.rgvarg = propertyValue;
     dispParams.cNamedArgs = 1;
@@ -2526,20 +3906,20 @@ ole_propertyput(self, property, value)
     OLEData_Get_Struct(self, pole);
 
     /* get ID from property name */
-    pBuf[0]  = ole_mb2wc(StringValuePtr(property), -1);
+    pBuf[0]  = ole_vstr2wc(property);
     hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch, &IID_NULL,
                                                 pBuf, 1, lcid, &dispID);
     SysFreeString(pBuf[0]);
     pBuf[0] = NULL;
 
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "unknown property or method: `%s'",
                   StringValuePtr(property));
     }
     /* set property value */
     ole_val2variant(value, &propertyValue[0]);
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, dispID, &IID_NULL, 
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, dispID, &IID_NULL,
                                          lcid, wFlags, &dispParams,
                                          NULL, &excepinfo, &argErr);
 
@@ -2548,7 +3928,9 @@ ole_propertyput(self, property, value)
     }
     if (FAILED(hr)) {
         v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, StringValuePtr(v));
+        ole_raise(hr, eWIN32OLERuntimeError, "(in setting property `%s': )%s",
+                  StringValuePtr(property),
+                  StringValuePtr(v));
     }
     return Qnil;
 }
@@ -2563,8 +3945,7 @@ ole_propertyput(self, property, value)
  *
  */
 static VALUE
-fole_free(self)
-    VALUE self;
+fole_free(VALUE self)
 {
     struct oledata *pole;
     rb_secure(4);
@@ -2575,8 +3956,7 @@ fole_free(self)
 }
 
 static VALUE
-ole_each_sub(pEnumV)
-    VALUE pEnumV;
+ole_each_sub(VALUE pEnumV)
 {
     VARIANT variant;
     VALUE obj = Qnil;
@@ -2592,8 +3972,7 @@ ole_each_sub(pEnumV)
 }
 
 static VALUE
-ole_ienum_free(pEnumV)
-    VALUE pEnumV;
+ole_ienum_free(VALUE pEnumV)
 {
     IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
     OLE_RELEASE(pEnum);
@@ -2603,7 +3982,7 @@ ole_ienum_free(pEnumV)
 /*
  *  call-seq:
  *     WIN32OLE#each {|i|...}
- * 
+ *
  *  Iterates over each item of OLE collection which has IEnumVARIANT interface.
  *
  *     excel = WIN32OLE.new('Excel.Application')
@@ -2615,10 +3994,9 @@ ole_ienum_free(pEnumV)
  *     end
  */
 static VALUE
-fole_each(self)
-    VALUE self;
+fole_each(VALUE self)
 {
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    LCID    lcid = cWIN32OLE_lcid;
 
     struct oledata *pole;
 
@@ -2628,6 +4006,9 @@ fole_each(self)
     VARIANT result;
     HRESULT hr;
     IEnumVARIANT *pEnum = NULL;
+    void *p;
+
+    RETURN_ENUMERATOR(self, 0, 0);
 
     VariantInit(&result);
     dispParams.rgvarg = NULL;
@@ -2635,7 +4016,7 @@ fole_each(self)
     dispParams.cNamedArgs = 0;
     dispParams.cArgs = 0;
     memset(&excepinfo, 0, sizeof(excepinfo));
-    
+
     OLEData_Get_Struct(self, pole);
     hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DISPID_NEWENUM,
                                          &IID_NULL, lcid,
@@ -2645,17 +4026,20 @@ fole_each(self)
 
     if (FAILED(hr)) {
         VariantClear(&result);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to get IEnum Interface");
     }
 
-    if (V_VT(&result) == VT_UNKNOWN)
+    if (V_VT(&result) == VT_UNKNOWN) {
         hr = V_UNKNOWN(&result)->lpVtbl->QueryInterface(V_UNKNOWN(&result),
                                                         &IID_IEnumVARIANT,
-                                                        (void**)&pEnum);
-    else if (V_VT(&result) == VT_DISPATCH)
+                                                        &p);
+        pEnum = p;
+    } else if (V_VT(&result) == VT_DISPATCH) {
         hr = V_DISPATCH(&result)->lpVtbl->QueryInterface(V_DISPATCH(&result),
                                                          &IID_IEnumVARIANT,
-                                                         (void**)&pEnum);
+                                                         &p);
+        pEnum = p;
+    }
     if (FAILED(hr) || !pEnum) {
         VariantClear(&result);
         ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
@@ -2669,17 +4053,14 @@ fole_each(self)
 /*
  *  call-seq:
  *     WIN32OLE#method_missing(id [,arg1, arg2, ...])
- * 
+ *
  *  Calls WIN32OLE#invoke method.
  */
 static VALUE
-fole_missing(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_missing(int argc, VALUE *argv, VALUE self)
 {
     ID id;
-    char* mname;
+    const char* mname;
     int n;
     id = rb_to_id(argv[0]);
     mname = rb_id2name(id);
@@ -2688,22 +4069,18 @@ fole_missing(argc, argv, self)
     }
     n = strlen(mname);
     if(mname[n-1] == '=') {
-        argv[0] = rb_str_new(mname, n-1);
+        argv[0] = rb_enc_str_new(mname, n-1, cWIN32OLE_enc);
 
         return ole_propertyput(self, argv[0], argv[1]);
     }
     else {
-        argv[0] = rb_str_new2(mname);
-        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
+        argv[0] = rb_enc_str_new(mname, n, cWIN32OLE_enc);
+        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
     }
 }
 
 static VALUE
-ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
-    VALUE self;
-    ITypeInfo *pOwnerTypeInfo;
-    ITypeInfo *pTypeInfo;
-    VALUE name;
+ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -2714,7 +4091,7 @@ ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
@@ -2740,10 +4117,7 @@ ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
 }
 
 static VALUE
-olemethod_from_typeinfo(self, pTypeInfo, name)
-    VALUE self;
-    ITypeInfo *pTypeInfo;
-    VALUE name;
+olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -2753,7 +4127,7 @@ olemethod_from_typeinfo(self, pTypeInfo, name)
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     }
     method = ole_method_sub(self, 0, pTypeInfo, name);
     if (method != Qnil) {
@@ -2774,11 +4148,7 @@ olemethod_from_typeinfo(self, pTypeInfo, name)
 }
 
 static VALUE
-ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
-    ITypeInfo *pOwnerTypeInfo;
-    ITypeInfo *pTypeInfo;
-    VALUE     methods;
-    int       mask;
+ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -2789,14 +4159,14 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
     WORD i;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs; i++) {
         pstr = NULL;
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
         if (FAILED(hr))
              continue;
-                 
+
         hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
                                                  &bstr, NULL, NULL, NULL);
         if (FAILED(hr)) {
@@ -2805,7 +4175,7 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
         }
         if(pFuncDesc->invkind & mask) {
             method = folemethod_s_allocate(cWIN32OLE_METHOD);
-            olemethod_set_member(method, pTypeInfo, pOwnerTypeInfo, 
+            olemethod_set_member(method, pTypeInfo, pOwnerTypeInfo,
                                  i, WC2VSTR(bstr));
             rb_ary_push(methods, method);
         }
@@ -2818,9 +4188,7 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
 }
 
 static VALUE
-ole_methods_from_typeinfo(pTypeInfo, mask)
-    ITypeInfo *pTypeInfo;
-    int mask;
+ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -2830,7 +4198,7 @@ ole_methods_from_typeinfo(pTypeInfo, mask)
     VALUE methods = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     }
 
     ole_methods_sub(0, pTypeInfo, methods, mask);
@@ -2849,9 +4217,7 @@ ole_methods_from_typeinfo(pTypeInfo, mask)
 }
 
 static HRESULT
-typeinfo_from_ole(pole, ppti)
-    struct oledata *pole;
-    ITypeInfo **ppti;
+typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
 {
     ITypeInfo *pTypeInfo;
     ITypeLib *pTypeLib;
@@ -2859,7 +4225,7 @@ typeinfo_from_ole(pole, ppti)
     VALUE type;
     UINT i;
     UINT count;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    LCID    lcid = cWIN32OLE_lcid;
     HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                                       0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
@@ -2892,9 +4258,7 @@ typeinfo_from_ole(pole, ppti)
 }
 
 static VALUE
-ole_methods(self,mask)
-    VALUE self;
-    int mask;
+ole_methods(VALUE self, int mask)
 {
     ITypeInfo *pTypeInfo;
     HRESULT hr;
@@ -2915,17 +4279,16 @@ ole_methods(self,mask)
 /*
  *  call-seq:
  *     WIN32OLE#ole_methods
- * 
- *  Returns the array of WIN32OLE_METHOD object. 
+ *
+ *  Returns the array of WIN32OLE_METHOD object.
  *  The element is OLE method of WIN32OLE object.
  *
  *     excel = WIN32OLE.new('Excel.Application')
  *     methods = excel.ole_methods
- *     
+ *
  */
 static VALUE
-fole_methods( self )
-    VALUE self;
+fole_methods(VALUE self)
 {
     return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
 }
@@ -2933,7 +4296,7 @@ fole_methods( self )
 /*
  *  call-seq:
  *     WIN32OLE#ole_get_methods
- * 
+ *
  *  Returns the array of WIN32OLE_METHOD object .
  *  The element of the array is property (gettable) of WIN32OLE object.
  *
@@ -2941,8 +4304,7 @@ fole_methods( self )
  *     properties = excel.ole_get_methods
  */
 static VALUE
-fole_get_methods( self )
-    VALUE self;
+fole_get_methods(VALUE self)
 {
     return ole_methods( self, INVOKE_PROPERTYGET);
 }
@@ -2950,7 +4312,7 @@ fole_get_methods( self )
 /*
  *  call-seq:
  *     WIN32OLE#ole_put_methods
- * 
+ *
  *  Returns the array of WIN32OLE_METHOD object .
  *  The element of the array is property (settable) of WIN32OLE object.
  *
@@ -2958,50 +4320,68 @@ fole_get_methods( self )
  *     properties = excel.ole_put_methods
  */
 static VALUE
-fole_put_methods( self )
-    VALUE self;
+fole_put_methods(VALUE self)
 {
-    return ole_methods( self, INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
+    return ole_methods( self, INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF);
 }
 
 /*
  *  call-seq:
  *     WIN32OLE#ole_func_methods
- * 
+ *
  *  Returns the array of WIN32OLE_METHOD object .
- *  The element of the array is functional method of WIN32OLE object.
+ *  The element of the array is property (settable) of WIN32OLE object.
  *
  *     excel = WIN32OLE.new('Excel.Application')
  *     properties = excel.ole_func_methods
  *
  */
 static VALUE
-fole_func_methods( self )
-    VALUE self;
+fole_func_methods(VALUE self)
 {
     return ole_methods( self, INVOKE_FUNC);
 }
 
+static VALUE
+ole_type_from_itypeinfo(ITypeInfo *pTypeInfo)
+{
+    ITypeLib *pTypeLib;
+    VALUE type = Qnil;
+    HRESULT hr;
+    unsigned int index;
+    BSTR bstr;
+
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
+    if(FAILED(hr)) {
+        return Qnil;
+    }
+    hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
+                                             &bstr, NULL, NULL, NULL);
+    OLE_RELEASE(pTypeLib);
+    if (FAILED(hr)) {
+        return Qnil;
+    }
+    type = foletype_s_allocate(cWIN32OLE_TYPE);
+    oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
+    return type;
+}
+
 /*
  *   call-seq:
- *      WIN32OLE#ole_obj_help
- * 
+ *      WIN32OLE#ole_type
+ *
  *   Returns WIN32OLE_TYPE object.
  *
  *      excel = WIN32OLE.new('Excel.Application')
- *      tobj = excel.ole_obj_help
+ *      tobj = excel.ole_type
  */
 static VALUE
-fole_obj_help( self )
-    VALUE self;
+fole_type(VALUE self)
 {
-    unsigned int index;
     ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
     HRESULT hr;
     struct oledata *pole;
-    BSTR bstr;
-    LCID  lcid = LOCALE_SYSTEM_DEFAULT;
+    LCID  lcid = cWIN32OLE_lcid;
     VALUE type = Qnil;
 
     OLEData_Get_Struct(self, pole);
@@ -3010,30 +4390,144 @@ fole_obj_help( self )
     if(FAILED(hr)) {
         ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
+    type = ole_type_from_itypeinfo(pTypeInfo);
+    OLE_RELEASE(pTypeInfo);
+    if (type == Qnil) {
+        rb_raise(rb_eRuntimeError, "failed to create WIN32OLE_TYPE obj from ITypeInfo");
+    }
+    return type;
+}
+
+static VALUE
+ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo)
+{
+    HRESULT hr;
+    ITypeLib *pTypeLib;
+    unsigned int index;
+    VALUE retval = Qnil;
+
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
     if(FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+        return Qnil;
     }
-    hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
-                                             &bstr, NULL, NULL, NULL);
-    if (SUCCEEDED(hr)) {
-        type = foletype_s_allocate(cWIN32OLE_TYPE);
-        oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
+    retval = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("allocate"), 0);
+    oletypelib_set_member(retval, pTypeLib);
+    return retval;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_typelib -> The WIN32OLE_TYPELIB object
+ *
+ *  Returns the WIN32OLE_TYPELIB object. The object represents the
+ *  type library which contains the WIN32OLE object.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     tlib = excel.ole_typelib
+ *     puts tlib.name  # -> 'Microsoft Excel 9.0 Object Library'
+ */
+static VALUE
+fole_typelib(VALUE self)
+{
+    struct oledata *pole;
+    HRESULT hr;
+    ITypeInfo *pTypeInfo;
+    LCID  lcid = cWIN32OLE_lcid;
+    VALUE vtlib = Qnil;
+
+    OLEData_Get_Struct(self, pole);
+    hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
+                                              0, lcid, &pTypeInfo);
+    if(FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
-    OLE_RELEASE(pTypeLib);
+    vtlib = ole_typelib_from_itypeinfo(pTypeInfo);
     OLE_RELEASE(pTypeInfo);
+    if (vtlib == Qnil) {
+        rb_raise(rb_eRuntimeError, "failed to get type library info.");
+    }
+    return vtlib;
+}
 
-    return type;
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_query_interface(iid) -> WIN32OLE object
+ *
+ *  Returns WIN32OLE object for a specific dispatch or dual
+ *  interface specified by iid.
+ *
+ *      ie = WIN32OLE.new('InternetExplorer.Application')
+ *      ie_web_app = ie.ole_query_interface('{0002DF05-0000-0000-C000-000000000046}') # => WIN32OLE object for dispinterface IWebBrowserApp
+ */
+static VALUE
+fole_query_interface(VALUE self, VALUE str_iid)
+{
+    HRESULT hr;
+    OLECHAR *pBuf;
+    IID iid;
+    struct oledata *pole;
+    IDispatch *pDispatch;
+    void *p;
+
+    pBuf  = ole_vstr2wc(str_iid);
+    hr = CLSIDFromString(pBuf, &iid);
+    SysFreeString(pBuf);
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError,
+                  "invalid iid: `%s'",
+                  StringValuePtr(str_iid));
+    }
+
+    OLEData_Get_Struct(self, pole);
+    if(!pole->pDispatch) {
+        rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
+    }
+
+    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &iid,
+                                                 &p);
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError,
+                  "failed to get interface `%s'",
+                  StringValuePtr(str_iid));
+    }
+
+    pDispatch = p;
+    return create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_respond_to?(method) -> true or false
+ *
+ *  Returns true when OLE object has OLE method, otherwise returns false.
+ *
+ *      ie = WIN32OLE.new('InternetExplorer.Application')
+ *      ie.ole_respond_to?("gohome") => true
+ */
+static VALUE
+fole_respond_to(VALUE self, VALUE method)
+{
+    struct oledata *pole;
+    BSTR wcmdname;
+    DISPID DispID;
+    HRESULT hr;
+    rb_secure(4);
+    if(TYPE(method) != T_STRING && TYPE(method) != T_SYMBOL) {
+	rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
+    }
+    if (TYPE(method) == T_SYMBOL) {
+	method = rb_sym_to_s(method);
+    }
+    OLEData_Get_Struct(self, pole);
+    wcmdname = ole_vstr2wc(method);
+    hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
+	    &wcmdname, 1, cWIN32OLE_lcid, &DispID);
+    SysFreeString(wcmdname);
+    return SUCCEEDED(hr) ? Qtrue : Qfalse;
 }
 
 static HRESULT
-ole_docinfo_from_type(pTypeInfo, name, helpstr, helpcontext, helpfile)
-    ITypeInfo *pTypeInfo;
-    BSTR *name;
-    BSTR *helpstr; 
-    DWORD *helpcontext;
-    BSTR *helpfile;
+ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile)
 {
     HRESULT hr;
     ITypeLib *pTypeLib;
@@ -3043,9 +4537,9 @@ ole_docinfo_from_type(pTypeInfo, name, helpstr, helpcontext, helpfile)
     if (FAILED(hr)) {
         return hr;
     }
-    
+
     hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                            name, helpstr, 
+                                            name, helpstr,
                                             helpcontext, helpfile);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeLib);
@@ -3056,17 +4550,14 @@ ole_docinfo_from_type(pTypeInfo, name, helpstr, helpcontext, helpfile)
 }
 
 static VALUE
-ole_usertype2val(pTypeInfo, pTypeDesc, typedetails)
-    ITypeInfo *pTypeInfo;
-    TYPEDESC *pTypeDesc;
-    VALUE typedetails;
+ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
 {
     HRESULT hr;
     BSTR bstr;
     ITypeInfo *pRefTypeInfo;
     VALUE type = Qnil;
 
-    hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, 
+    hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
                                            V_UNION1(pTypeDesc, hreftype),
                                            &pRefTypeInfo);
     if(FAILED(hr))
@@ -3083,153 +4574,139 @@ ole_usertype2val(pTypeInfo, pTypeDesc, typedetails)
     return type;
 }
 
-static VALUE ole_typedesc2val();
 static VALUE
-ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails) 
-    ITypeInfo *pTypeInfo;
-    TYPEDESC *pTypeDesc;
-    VALUE typedetails;
-{    
+ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
+{
     TYPEDESC *p = pTypeDesc;
     VALUE type = rb_str_new2("");
-    while(p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
+
+    if (p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
         p = V_UNION1(p, lptdesc);
-        if(strlen(StringValuePtr(type)) == 0) {
-           type = ole_typedesc2val(pTypeInfo, p, typedetails);
-        } else {
-           rb_str_cat(type, ",", 1);
-           rb_str_concat(type, ole_typedesc2val(pTypeInfo, p, typedetails));
-        }
+        type = ole_typedesc2val(pTypeInfo, p, typedetails);
     }
     return type;
 }
 
 static VALUE
-ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
-    ITypeInfo *pTypeInfo;
-    TYPEDESC *pTypeDesc;
-    VALUE typedetails;
+ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
 {
     VALUE str;
+    VALUE typestr = Qnil;
     switch(pTypeDesc->vt) {
     case VT_I2:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I2"));
-        return rb_str_new2("I2");
+        typestr = rb_str_new2("I2");
+        break;
     case VT_I4:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I4"));
-        return rb_str_new2("I4");
+        typestr = rb_str_new2("I4");
+        break;
     case VT_R4:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("R4"));
-        return rb_str_new2("R4");
+        typestr = rb_str_new2("R4");
+        break;
     case VT_R8:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("R8"));
-        return rb_str_new2("R8");
+        typestr = rb_str_new2("R8");
+        break;
     case VT_CY:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("CY"));
-        return rb_str_new2("CY");
+        typestr = rb_str_new2("CY");
+        break;
     case VT_DATE:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("DATE"));
-        return rb_str_new2("DATE");
+        typestr = rb_str_new2("DATE");
+        break;
     case VT_BSTR:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("BSTR"));
-        return rb_str_new2("BSTR");
+        typestr = rb_str_new2("BSTR");
+        break;
     case VT_BOOL:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("BOOL"));
-        return rb_str_new2("BOOL");
+        typestr = rb_str_new2("BOOL");
+        break;
     case VT_VARIANT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("VARIANT"));
-        return rb_str_new2("VARIANT");
+        typestr = rb_str_new2("VARIANT");
+        break;
     case VT_DECIMAL:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("DECIMAL"));
-        return rb_str_new2("DECIMAL");
+        typestr = rb_str_new2("DECIMAL");
+        break;
     case VT_I1:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I1"));
-        return rb_str_new2("I1");
+        typestr = rb_str_new2("I1");
+        break;
     case VT_UI1:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI1"));
-        return rb_str_new2("UI1");
+        typestr = rb_str_new2("UI1");
+        break;
     case VT_UI2:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI2"));
-        return rb_str_new2("UI2");
+        typestr = rb_str_new2("UI2");
+        break;
     case VT_UI4:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI4"));
-        return rb_str_new2("UI4");
+        typestr = rb_str_new2("UI4");
+        break;
+#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
     case VT_I8:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I8"));
-        return rb_str_new2("I8");
+        typestr = rb_str_new2("I8");
+        break;
     case VT_UI8:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI8"));
-        return rb_str_new2("UI8");
+        typestr = rb_str_new2("UI8");
+        break;
+#endif
     case VT_INT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("INT"));
-        return rb_str_new2("INT");
+        typestr = rb_str_new2("INT");
+        break;
     case VT_UINT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UINT"));
-        return rb_str_new2("UINT");
+        typestr = rb_str_new2("UINT");
+        break;
     case VT_VOID:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("VOID"));
-        return rb_str_new2("VOID");
+        typestr = rb_str_new2("VOID");
+        break;
     case VT_HRESULT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("HRESULT"));
-        return rb_str_new2("HRESULT");
+        typestr = rb_str_new2("HRESULT");
+        break;
     case VT_PTR:
+        typestr = rb_str_new2("PTR");
         if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("PTR"));
+            rb_ary_push(typedetails, typestr);
         return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
     case VT_SAFEARRAY:
+        typestr = rb_str_new2("SAFEARRAY");
         if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("SAFEARRAY"));
+            rb_ary_push(typedetails, typestr);
         return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
     case VT_CARRAY:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("CARRAY"));
-        return rb_str_new2("CARRAY");
+        typestr = rb_str_new2("CARRAY");
+        break;
     case VT_USERDEFINED:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("USERDEFINED"));
+        typestr = rb_str_new2("USERDEFINED");
+        if (typedetails != Qnil)
+            rb_ary_push(typedetails, typestr);
         str = ole_usertype2val(pTypeInfo, pTypeDesc, typedetails);
         if (str != Qnil) {
             return str;
         }
-        return rb_str_new2("USERDEFINED");
+        return typestr;
     case VT_UNKNOWN:
-        return rb_str_new2("UNKNOWN");
+        typestr = rb_str_new2("UNKNOWN");
+        break;
     case VT_DISPATCH:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("DISPATCH"));
-        return rb_str_new2("DISPATCH");
+        typestr = rb_str_new2("DISPATCH");
+        break;
+    case VT_ERROR:
+        typestr = rb_str_new2("ERROR");
+        break;
+    case VT_LPWSTR:
+        typestr = rb_str_new2("LPWSTR");
+        break;
+    case VT_LPSTR:
+        typestr = rb_str_new2("LPSTR");
+        break;
     default:
-        str = rb_str_new2("Unknown Type ");
-        rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
-        return str;
+        typestr = rb_str_new2("Unknown Type ");
+        rb_str_concat(typestr, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
+        break;
     }
+    if (typedetails != Qnil)
+        rb_ary_push(typedetails, typestr);
+    return typestr;
 }
 
 /*
  *   call-seq:
  *      WIN32OLE#ole_method_help(method)
- * 
- *   Returns WIN32OLE_METHOD object corresponding with method 
+ *
+ *   Returns WIN32OLE_METHOD object corresponding with method
  *   specified by 1st argument.
  *
  *      excel = WIN32OLE.new('Excel.Application')
@@ -3237,17 +4714,14 @@ ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
  *
  */
 static VALUE
-fole_method_help( self, cmdname )
-    VALUE self;
-    VALUE cmdname;
+fole_method_help(VALUE self, VALUE cmdname)
 {
     ITypeInfo *pTypeInfo;
     HRESULT hr;
     struct oledata *pole;
     VALUE method, obj;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
 
-    Check_SafeStr(cmdname);
+    SafeStringValue(cmdname);
     OLEData_Get_Struct(self, pole);
     hr = typeinfo_from_ole(pole, &pTypeInfo);
     if(FAILED(hr))
@@ -3256,105 +4730,107 @@ fole_method_help( self, cmdname )
     obj = olemethod_from_typeinfo(method, pTypeInfo, cmdname);
     OLE_RELEASE(pTypeInfo);
     if (obj == Qnil)
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
+        rb_raise(eWIN32OLERuntimeError, "not found %s",
                  StringValuePtr(cmdname));
     return obj;
 }
 
 /*
+ *  call-seq:
+ *     WIN32OLE#ole_activex_initialize() -> Qnil
+ *
+ *  Initialize WIN32OLE object(ActiveX Control) by calling
+ *  IPersistMemory::InitNew.
+ *
+ *  Before calling OLE method, some kind of the ActiveX controls
+ *  created with MFC should be initialized by calling
+ *  IPersistXXX::InitNew.
+ *
+ *  If and only if you received the exception "HRESULT error code:
+ *  0x8000ffff catastrophic failure", try this method before
+ *  invoking any ole_method.
+ *
+ *     obj = WIN32OLE.new("ProgID_or_GUID_of_ActiveX_Control")
+ *     obj.ole_activex_initialize
+ *     obj.method(...)
+ *
+ */
+static VALUE
+fole_activex_initialize(VALUE self)
+{
+    struct oledata *pole;
+    IPersistMemory *pPersistMemory;
+    void *p;
+
+    HRESULT hr = S_OK;
+
+    OLEData_Get_Struct(self, pole);
+
+    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory, &p);
+    pPersistMemory = p;
+    if (SUCCEEDED(hr)) {
+        hr = pPersistMemory->lpVtbl->InitNew(pPersistMemory);
+        OLE_RELEASE(pPersistMemory);
+        if (SUCCEEDED(hr)) {
+            return Qnil;
+        }
+    }
+
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError, "fail to initialize ActiveX control");
+    }
+
+    return Qnil;
+}
+
+/*
  *   call-seq:
  *      WIN32OLE_TYPE.ole_classes(typelib)
- * 
+ *
  *   Returns array of WIN32OLE_TYPE objects defined by the <i>typelib</i> type library.
+ *   This method will be OBSOLETE. Use WIN32OLE_TYPELIB.new(typelib).ole_classes instead.
  */
 static VALUE
-foletype_s_ole_classes(self, typelib)
-    VALUE self;
-    VALUE typelib;
+foletype_s_ole_classes(VALUE self, VALUE typelib)
 {
-    VALUE file, classes;
-    OLECHAR * pbuf;
-    ITypeLib *pTypeLib;
-    HRESULT hr;
+    VALUE obj;
 
-    rb_secure(4);
-    classes = rb_ary_new();
-    if(TYPE(typelib) == T_STRING) {
-        file = typelib_file(typelib);
-        if (file == Qnil) {
-            file = typelib;
-        }
-        pbuf = ole_mb2wc(StringValuePtr(file), -1);
-        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
-        if (FAILED(hr))
-          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
-        SysFreeString(pbuf);
-        ole_classes_from_typelib(pTypeLib, classes);
-        OLE_RELEASE(pTypeLib);
-    } else {
-        rb_raise(rb_eTypeError, "1st argument should be TypeLib string");
-    }
-    return classes;
+    /*
+    rb_warn("%s is obsolete; use %s instead.",
+            "WIN32OLE_TYPE.ole_classes",
+            "WIN32OLE_TYPELIB.new(typelib).ole_types");
+    */
+    obj = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("new"), 1, typelib);
+    return rb_funcall(obj, rb_intern("ole_types"), 0);
 }
 
 /*
  *  call-seq:
  *     WIN32OLE_TYPE.typelibs
- * 
+ *
  *  Returns array of type libraries.
+ *  This method will be OBSOLETE. Use WIN32OLE_TYPELIB.typelibs.collect{|t| t.name} instead.
  *
  */
 static VALUE
-foletype_s_typelibs(self)
-    VALUE self;
+foletype_s_typelibs(VALUE self)
 {
-    HKEY htypelib, hclsid;
-    double fversion;
-    DWORD i, j;
-    LONG err;
-    VALUE clsid;
-    VALUE ver;
-    VALUE v = Qnil;
-    VALUE typelibs = rb_ary_new();
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return typelibs;
-    }
-    for(i = 0; ; i++) {
-        clsid = reg_enum_key(htypelib, i);
-        if (clsid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, clsid, &hclsid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        fversion = 0;
-        for(j = 0; ; j++) {
-            ver = reg_enum_key(hclsid, j);
-            if (ver == Qnil)
-                break;
-            if (fversion > atof(StringValuePtr(ver)))
-                continue;
-            fversion = atof(StringValuePtr(ver));
-            if ( (v = reg_get_val(hclsid, StringValuePtr(ver))) != Qnil ) {
-                rb_ary_push(typelibs, v);
-            }
-        }
-        RegCloseKey(hclsid);
-    }
-    RegCloseKey(htypelib);
-    return typelibs;
+    /*
+    rb_warn("%s is obsolete. use %s instead.",
+            "WIN32OLE_TYPE.typelibs",
+            "WIN32OLE_TYPELIB.typelibs.collect{t|t.name}");
+    */
+    return rb_eval_string("WIN32OLE_TYPELIB.typelibs.collect{|t|t.name}");
 }
 
 /*
  *  call-seq:
  *     WIN32OLE_TYPE.progids
- * 
+ *
  *  Returns array of ProgID.
  */
 static VALUE
-foletype_s_progids(self)
-    VALUE self;
+foletype_s_progids(VALUE self)
 {
     HKEY hclsids, hclsid;
     DWORD i;
@@ -3374,9 +4850,9 @@ foletype_s_progids(self)
         err = reg_open_vkey(hclsids, clsid, &hclsid);
         if (err != ERROR_SUCCESS)
             continue;
-        if ((v = reg_get_val(hclsid, "ProgID")) != Qnil) 
+        if ((v = reg_get_val2(hclsid, "ProgID")) != Qnil)
             rb_ary_push(progids, v);
-        if ((v = reg_get_val(hclsid, "VersionIndependentProgID")) != Qnil)
+        if ((v = reg_get_val2(hclsid, "VersionIndependentProgID")) != Qnil)
             rb_ary_push(progids, v);
         RegCloseKey(hclsid);
     }
@@ -3385,8 +4861,7 @@ foletype_s_progids(self)
 }
 
 static VALUE
-foletype_s_allocate(klass)
-    VALUE klass;
+foletype_s_allocate(VALUE klass)
 {
     struct oletypedata *poletype;
     VALUE obj;
@@ -3397,10 +4872,7 @@ foletype_s_allocate(klass)
 }
 
 static VALUE
-oletype_set_member(self, pTypeInfo, name)
-    VALUE self;
-    ITypeInfo *pTypeInfo;
-    VALUE name;
+oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3411,12 +4883,9 @@ oletype_set_member(self, pTypeInfo, name)
 }
 
 static VALUE
-oleclass_from_typelib(self, pTypeLib, oleclass)
-    VALUE self;
-    ITypeLib *pTypeLib;
-    VALUE oleclass;
+oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass)
 {
-    
+
     long count;
     int i;
     HRESULT hr;
@@ -3425,7 +4894,7 @@ oleclass_from_typelib(self, pTypeLib, oleclass)
     ITypeInfo *pTypeInfo;
 
     VALUE found = Qfalse;
-  
+
     count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
     for (i = 0; i < count && found == Qfalse; i++) {
         hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
@@ -3433,7 +4902,7 @@ oleclass_from_typelib(self, pTypeLib, oleclass)
             continue;
         hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
                                                 &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) 
+        if (FAILED(hr))
             continue;
         typelib = WC2VSTR(bstr);
         if (rb_str_cmp(oleclass, typelib) == 0) {
@@ -3446,6 +4915,616 @@ oleclass_from_typelib(self, pTypeLib, oleclass)
 }
 
 /*
+ * Document-class: WIN32OLE_TYPELIB
+ *
+ *   <code>WIN32OLE_TYPELIB</code> objects represent OLE tyblib information.
+ */
+
+static VALUE
+oletypelib_set_member(VALUE self, ITypeLib *pTypeLib)
+{
+    struct oletypelibdata *ptlib;
+    Data_Get_Struct(self, struct oletypelibdata, ptlib);
+    ptlib->pTypeLib = pTypeLib;
+    return self;
+}
+
+static ITypeLib *
+oletypelib_get_typelib(VALUE self)
+{
+    struct oletypelibdata *ptlib;
+    Data_Get_Struct(self, struct oletypelibdata, ptlib);
+    return ptlib->pTypeLib;
+}
+
+static void
+oletypelib_get_libattr(ITypeLib *pTypeLib, TLIBATTR **ppTLibAttr)
+{
+    HRESULT hr;
+    hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, ppTLibAttr);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError,
+		  "failed to get library attribute(TLIBATTR) from ITypeLib");
+    }
+}
+
+/*
+ *  call-seq:
+ *
+ *     WIN32OLE_TYPELIB.typelibs
+ *
+ *  Returns the array of WIN32OLE_TYPELIB object.
+ *
+ *     tlibs = WIN32OLE_TYPELIB.typelibs
+ *
+ */
+static VALUE
+foletypelib_s_typelibs(VALUE self)
+{
+    HKEY htypelib, hguid;
+    DWORD i, j;
+    LONG err;
+    VALUE guid;
+    VALUE version;
+    VALUE name = Qnil;
+    VALUE typelibs = rb_ary_new();
+    VALUE typelib = Qnil;
+    HRESULT hr;
+    ITypeLib *pTypeLib;
+
+    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
+    if(err != ERROR_SUCCESS) {
+        return typelibs;
+    }
+    for(i = 0; ; i++) {
+        guid = reg_enum_key(htypelib, i);
+        if (guid == Qnil)
+            break;
+        err = reg_open_vkey(htypelib, guid, &hguid);
+        if (err != ERROR_SUCCESS)
+            continue;
+        for(j = 0; ; j++) {
+            version = reg_enum_key(hguid, j);
+            if (version == Qnil)
+                break;
+            if ( (name = reg_get_val2(hguid, StringValuePtr(version))) != Qnil ) {
+		hr = oletypelib_from_guid(guid, version, &pTypeLib);
+		if (SUCCEEDED(hr)) {
+		    typelib = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("allocate"), 0);
+		    oletypelib_set_member(typelib, pTypeLib);
+		    rb_ary_push(typelibs, typelib);
+		}
+            }
+        }
+        RegCloseKey(hguid);
+    }
+    RegCloseKey(htypelib);
+    return typelibs;
+}
+
+static VALUE
+make_version_str(VALUE major, VALUE minor)
+{
+    VALUE version_str = Qnil;
+    VALUE minor_str = Qnil;
+    if (major == Qnil) {
+        return Qnil;
+    }
+    version_str = rb_String(major);
+    if (minor != Qnil) {
+        minor_str = rb_String(minor);
+        rb_str_cat2(version_str, ".");
+        rb_str_append(version_str, minor_str);
+    }
+    return version_str;
+}
+
+static VALUE
+oletypelib_search_registry2(VALUE self, VALUE args)
+{
+    HKEY htypelib, hguid, hversion;
+    double fver;
+    DWORD j;
+    LONG err;
+    VALUE found = Qfalse;
+    VALUE tlib;
+    VALUE ver;
+    VALUE version_str;
+    VALUE version = Qnil;
+    VALUE typelib = Qnil;
+    HRESULT hr;
+    ITypeLib *pTypeLib;
+
+    VALUE guid = rb_ary_entry(args, 0);
+    version_str = make_version_str(rb_ary_entry(args, 1), rb_ary_entry(args, 2));
+
+    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
+    if(err != ERROR_SUCCESS) {
+        return Qfalse;
+    }
+    err = reg_open_vkey(htypelib, guid, &hguid);
+    if (err != ERROR_SUCCESS) {
+        RegCloseKey(htypelib);
+        return Qfalse;
+    }
+    if (version_str != Qnil) {
+        err = reg_open_vkey(hguid, version_str, &hversion);
+        if (err == ERROR_SUCCESS) {
+            tlib = reg_get_val(hversion, NULL);
+            if (tlib != Qnil) {
+                typelib = tlib;
+                version = version_str;
+            }
+        }
+        RegCloseKey(hversion);
+    } else {
+        fver = 0.0;
+	    for(j = 0; ;j++) {
+	        ver = reg_enum_key(hguid, j);
+	        if (ver == Qnil)
+	            break;
+	        err = reg_open_vkey(hguid, ver, &hversion);
+	        if (err != ERROR_SUCCESS)
+	            continue;
+	        tlib = reg_get_val(hversion, NULL);
+	        if (tlib == Qnil) {
+	             RegCloseKey(hversion);
+	             continue;
+	        }
+	        if (fver < atof(StringValuePtr(ver))) {
+	            fver = atof(StringValuePtr(ver));
+	            version = ver;
+	            typelib = tlib;
+	        }
+	        RegCloseKey(hversion);
+	    }
+    }
+    RegCloseKey(hguid);
+    RegCloseKey(htypelib);
+    if (typelib != Qnil) {
+	hr = oletypelib_from_guid(guid, version, &pTypeLib);
+	if (SUCCEEDED(hr)) {
+	    found = Qtrue;
+	    oletypelib_set_member(self, pTypeLib);
+	}
+    }
+    return found;
+}
+
+static VALUE
+oletypelib_search_registry(VALUE self, VALUE typelib)
+{
+    HKEY htypelib, hguid, hversion;
+    DWORD i, j;
+    LONG err;
+    VALUE found = Qfalse;
+    VALUE tlib;
+    VALUE guid;
+    VALUE ver;
+    HRESULT hr;
+    ITypeLib *pTypeLib;
+
+    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
+    if(err != ERROR_SUCCESS) {
+        return Qfalse;
+    }
+    for(i = 0; !found; i++) {
+        guid = reg_enum_key(htypelib, i);
+        if (guid == Qnil)
+            break;
+        err = reg_open_vkey(htypelib, guid, &hguid);
+        if (err != ERROR_SUCCESS)
+            continue;
+        for(j = 0; found == Qfalse; j++) {
+            ver = reg_enum_key(hguid, j);
+            if (ver == Qnil)
+                break;
+            err = reg_open_vkey(hguid, ver, &hversion);
+            if (err != ERROR_SUCCESS)
+                continue;
+            tlib = reg_get_val(hversion, NULL);
+            if (tlib == Qnil) {
+                RegCloseKey(hversion);
+                continue;
+            }
+            if (rb_str_cmp(typelib, tlib) == 0) {
+		hr = oletypelib_from_guid(guid, ver, &pTypeLib);
+		if (SUCCEEDED(hr)) {
+		    oletypelib_set_member(self, pTypeLib);
+		    found = Qtrue;
+		}
+            }
+            RegCloseKey(hversion);
+        }
+        RegCloseKey(hguid);
+    }
+    RegCloseKey(htypelib);
+    return  found;
+}
+
+static VALUE
+foletypelib_s_allocate(VALUE klass)
+{
+    struct oletypelibdata *poletypelib;
+    VALUE obj;
+    ole_initialize();
+    obj = Data_Make_Struct(klass, struct oletypelibdata, 0, oletypelib_free, poletypelib);
+    poletypelib->pTypeLib = NULL;
+    return obj;
+}
+
+/*
+ * call-seq:
+ *    WIN32OLE_TYPELIB.new(typelib [, version1, version2]) -> WIN32OLE_TYPELIB object
+ *
+ * Returns a new WIN32OLE_TYPELIB object.
+ *
+ * The first argument <i>typelib</i>  specifies OLE type library name or GUID or
+ * OLE library file.
+ * The second argument is major version or version of the type library.
+ * The third argument is minor version.
+ * The second argument and third argument are optional.
+ * If the first argument is type library name, then the second and third argument
+ * are ignored.
+ *
+ *     tlib1 = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     tlib2 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}')
+ *     tlib3 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1.3)
+ *     tlib4 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1, 3)
+ *     tlib5 = WIN32OLE_TYPELIB.new("C:\\WINNT\\SYSTEM32\\SHELL32.DLL")
+ *     puts tlib1.name  # -> 'Microsoft Excel 9.0 Object Library'
+ *     puts tlib2.name  # -> 'Microsoft Excel 9.0 Object Library'
+ *     puts tlib3.name  # -> 'Microsoft Excel 9.0 Object Library'
+ *     puts tlib4.name  # -> 'Microsoft Excel 9.0 Object Library'
+ *     puts tlib5.name  # -> 'Microsoft Shell Controls And Automation'
+ *
+ */
+static VALUE
+foletypelib_initialize(VALUE self, VALUE args)
+{
+    VALUE found = Qfalse;
+    VALUE typelib = Qnil;
+    int len = 0;
+    OLECHAR * pbuf;
+    ITypeLib *pTypeLib;
+    HRESULT hr = S_OK;
+
+    len = RARRAY_LEN(args);
+    if (len < 1 || len > 3) {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", len);
+    }
+
+    typelib = rb_ary_entry(args, 0);
+
+    SafeStringValue(typelib);
+
+    found = oletypelib_search_registry(self, typelib);
+    if (found == Qfalse) {
+        found = oletypelib_search_registry2(self, args);
+    }
+    if (found == Qfalse) {
+        pbuf = ole_vstr2wc(typelib);
+        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
+        SysFreeString(pbuf);
+        if (SUCCEEDED(hr)) {
+	    found = Qtrue;
+	    oletypelib_set_member(self, pTypeLib);
+        }
+    }
+
+    if (found == Qfalse) {
+        rb_raise(eWIN32OLERuntimeError, "not found type library `%s`",
+                 StringValuePtr(typelib));
+    }
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#guid -> The guid string.
+ *
+ *  Returns guid string which specifies type library.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     guid = tlib.guid # -> '{00020813-0000-0000-C000-000000000046}'
+ */
+static VALUE
+foletypelib_guid(VALUE self)
+{
+    ITypeLib *pTypeLib;
+    OLECHAR bstr[80];
+    VALUE guid = Qnil;
+    int len;
+    TLIBATTR *pTLibAttr;
+
+    pTypeLib = oletypelib_get_typelib(self);
+    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
+    len = StringFromGUID2(&pTLibAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
+    if (len > 3) {
+        guid = ole_wc2vstr(bstr, FALSE);
+    }
+    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+    return guid;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#name -> The type library name
+ *
+ *  Returns the type library name.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     name = tlib.name # -> 'Microsoft Excel 9.0 Object Library'
+ */
+static VALUE
+foletypelib_name(VALUE self)
+{
+    ITypeLib *pTypeLib;
+    HRESULT hr;
+    BSTR bstr;
+    VALUE name;
+    pTypeLib = oletypelib_get_typelib(self);
+    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, -1,
+                                            NULL, &bstr, NULL, NULL);
+
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to get name from ITypeLib");
+    }
+    name = WC2VSTR(bstr);
+    return rb_enc_str_new(StringValuePtr(name), strlen(StringValuePtr(name)), cWIN32OLE_enc);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#version -> The type library version.
+ *
+ *  Returns the type library version.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     puts tlib.version #-> 1.3
+ */
+static VALUE
+foletypelib_version(VALUE self)
+{
+    TLIBATTR *pTLibAttr;
+    VALUE major;
+    VALUE minor;
+    ITypeLib *pTypeLib;
+
+    pTypeLib = oletypelib_get_typelib(self);
+    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
+    major = INT2NUM(pTLibAttr->wMajorVerNum);
+    minor = INT2NUM(pTLibAttr->wMinorVerNum);
+    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+    return rb_Float(make_version_str(major, minor));
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#major_version -> The type library major version.
+ *
+ *  Returns the type library major version.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     puts tlib.major_version # -> 1
+ */
+static VALUE
+foletypelib_major_version(VALUE self)
+{
+    TLIBATTR *pTLibAttr;
+    VALUE major;
+    ITypeLib *pTypeLib;
+    pTypeLib = oletypelib_get_typelib(self);
+    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
+
+    major =  INT2NUM(pTLibAttr->wMajorVerNum);
+    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+    return major;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#minor_version -> The type library minor version.
+ *
+ *  Returns the type library minor version.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     puts tlib.minor_version # -> 3
+ */
+static VALUE
+foletypelib_minor_version(VALUE self)
+{
+    TLIBATTR *pTLibAttr;
+    VALUE minor;
+    ITypeLib *pTypeLib;
+    pTypeLib = oletypelib_get_typelib(self);
+    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
+    minor =  INT2NUM(pTLibAttr->wMinorVerNum);
+    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+    return minor;
+}
+
+static VALUE
+oletypelib_path(VALUE guid, VALUE version)
+{
+    int k;
+    LONG err;
+    HKEY hkey;
+    HKEY hlang;
+    VALUE lang;
+    VALUE path = Qnil;
+
+    VALUE key = rb_str_new2("TypeLib\\");
+    rb_str_concat(key, guid);
+    rb_str_cat2(key, "\\");
+    rb_str_concat(key, version);
+
+    err = reg_open_vkey(HKEY_CLASSES_ROOT, key, &hkey);
+    if (err != ERROR_SUCCESS) {
+        return Qnil;
+    }
+    for(k = 0; path == Qnil; k++) {
+        lang = reg_enum_key(hkey, k);
+        if (lang == Qnil)
+            break;
+        err = reg_open_vkey(hkey, lang, &hlang);
+        if (err == ERROR_SUCCESS) {
+            path = reg_get_typelib_file_path(hlang);
+            RegCloseKey(hlang);
+        }
+    }
+    RegCloseKey(hkey);
+    return path;
+}
+
+static HRESULT
+oletypelib_from_guid(VALUE guid, VALUE version, ITypeLib **ppTypeLib)
+{
+    VALUE path;
+    OLECHAR *pBuf;
+    HRESULT hr;
+    path = oletypelib_path(guid, version);
+    if (path == Qnil) {
+	return E_UNEXPECTED;
+    }
+    pBuf = ole_vstr2wc(path);
+    hr = LoadTypeLibEx(pBuf, REGKIND_NONE, ppTypeLib);
+    SysFreeString(pBuf);
+    return hr;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#path -> The type library file path.
+ *
+ *  Returns the type library file path.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     puts tlib.path #-> 'C:\...\EXCEL9.OLB'
+ */
+static VALUE
+foletypelib_path(VALUE self)
+{
+    TLIBATTR *pTLibAttr;
+    HRESULT hr = S_OK;
+    BSTR bstr;
+    LCID lcid = cWIN32OLE_lcid;
+    VALUE path;
+    ITypeLib *pTypeLib;
+
+    pTypeLib = oletypelib_get_typelib(self);
+    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
+    hr = QueryPathOfRegTypeLib(&pTLibAttr->guid,
+	                       pTLibAttr->wMajorVerNum,
+			       pTLibAttr->wMinorVerNum,
+			       lcid,
+			       &bstr);
+    if (FAILED(hr)) {
+	pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+	ole_raise(hr, eWIN32OLERuntimeError, "failed to QueryPathOfRegTypeTypeLib");
+    }
+
+    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+    path = WC2VSTR(bstr);
+    return rb_enc_str_new(StringValuePtr(path), strlen(StringValuePtr(path)), cWIN32OLE_enc);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#visible?
+ *
+ *  Returns true if the type library information is not hidden.
+ *  If wLibFlags of TLIBATTR is 0 or LIBFLAG_FRESTRICTED or LIBFLAG_FHIDDEN,
+ *  the method returns false, otherwise, returns true.
+ *  If the method fails to access the TLIBATTR information, then
+ *  WIN32OLERuntimeError is raised.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     tlib.visible? # => true
+ */
+static VALUE
+foletypelib_visible(VALUE self)
+{
+    ITypeLib *pTypeLib = NULL;
+    VALUE visible = Qtrue;
+    TLIBATTR *pTLibAttr;
+
+    pTypeLib = oletypelib_get_typelib(self);
+    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
+
+    if ((pTLibAttr->wLibFlags == 0) ||
+        (pTLibAttr->wLibFlags & LIBFLAG_FRESTRICTED) ||
+        (pTLibAttr->wLibFlags & LIBFLAG_FHIDDEN)) {
+        visible = Qfalse;
+    }
+    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+    return visible;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#library_name
+ *
+ *  Returns library name.
+ *  If the method fails to access library name, WIN32OLERuntimeError is raised.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     tlib.library_name # => Excel
+ */
+static VALUE
+foletypelib_library_name(VALUE self)
+{
+    HRESULT hr;
+    ITypeLib *pTypeLib = NULL;
+    VALUE libname = Qnil;
+    BSTR bstr;
+
+    pTypeLib = oletypelib_get_typelib(self);
+    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, -1,
+                                            &bstr, NULL, NULL, NULL);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to get library name");
+    }
+    libname = WC2VSTR(bstr);
+    return libname;
+}
+
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#ole_types -> The array of WIN32OLE_TYPE object included the type library.
+ *
+ *  Returns the type library file path.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     classes = tlib.ole_types.collect{|k| k.name} # -> ['AddIn', 'AddIns' ...]
+ */
+static VALUE
+foletypelib_ole_types(VALUE self)
+{
+    ITypeLib *pTypeLib = NULL;
+    VALUE classes = rb_ary_new();
+    pTypeLib = oletypelib_get_typelib(self);
+    ole_types_from_typelib(pTypeLib, classes);
+    return classes;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPELIB#inspect -> String
+ *
+ *  Returns the type library name with class name.
+ *
+ *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ *     tlib.inspect # => "<#WIN32OLE_TYPELIB:Microsoft Excel 9.0 Object Library>"
+ */
+static VALUE
+foletypelib_inspect(VALUE self)
+{
+    return default_inspect(self, "WIN32OLE_TYPELIB");
+}
+
+/*
  * Document-class: WIN32OLE_TYPE
  *
  *   <code>WIN32OLE_TYPE</code> objects represent OLE type libarary information.
@@ -3459,34 +5538,31 @@ oleclass_from_typelib(self, pTypeLib, oleclass)
  *  The first argument <i>typelib</i> specifies OLE type library name.
  *  The second argument specifies OLE class name.
  *
- *      WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
- *          # => WIN32OLE_TYPE object of Application class of Excel. 
+ *      WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
+ *          # => WIN32OLE_TYPE object of Application class of Excel.
  */
 static VALUE
-foletype_initialize(self, typelib, oleclass)
-    VALUE self;
-    VALUE typelib;
-    VALUE oleclass;
+foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass)
 {
     VALUE file;
     OLECHAR * pbuf;
     ITypeLib *pTypeLib;
     HRESULT hr;
 
-    Check_SafeStr(oleclass);
-    Check_SafeStr(typelib);
+    SafeStringValue(oleclass);
+    SafeStringValue(typelib);
     file = typelib_file(typelib);
     if (file == Qnil) {
         file = typelib;
     }
-    pbuf = ole_mb2wc(StringValuePtr(file), -1);
+    pbuf = ole_vstr2wc(file);
     hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
     SysFreeString(pbuf);
     if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
         OLE_RELEASE(pTypeLib);
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found `%s` in `%s`",
+        rb_raise(eWIN32OLERuntimeError, "not found `%s` in `%s`",
                  StringValuePtr(oleclass), StringValuePtr(typelib));
     }
     OLE_RELEASE(pTypeLib);
@@ -3498,19 +5574,17 @@ foletype_initialize(self, typelib, oleclass)
  *    WIN32OLE_TYPE#name #=> OLE type name
  *
  * Returns OLE type name.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
  *    puts tobj.name  # => Application
  */
 static VALUE
-foletype_name(self)
-    VALUE self;
+foletype_name(VALUE self)
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_ole_type(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_ole_type(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -3558,14 +5632,13 @@ ole_ole_type(pTypeInfo)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#ole_type #=> OLE type string.
- * 
+ *
  *  returns type of OLE class.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
  *    puts tobj.ole_type  # => Class
  */
 static VALUE
-foletype_ole_type(self)
-    VALUE self;
+foletype_ole_type(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3573,8 +5646,7 @@ foletype_ole_type(self)
 }
 
 static VALUE
-ole_type_guid(pTypeInfo) 
-    ITypeInfo *pTypeInfo;
+ole_type_guid(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -3582,7 +5654,7 @@ ole_type_guid(pTypeInfo)
     OLECHAR bstr[80];
     VALUE guid = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
+    if (FAILED(hr))
         return guid;
     len = StringFromGUID2(&pTypeAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
     if (len > 3) {
@@ -3595,14 +5667,13 @@ ole_type_guid(pTypeInfo)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#guid  #=> GUID
- * 
+ *
  *  Returns GUID.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
  *    puts tobj.guid  # => {00024500-0000-0000-C000-000000000046}
  */
 static VALUE
-foletype_guid(self)
-    VALUE self;
+foletype_guid(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3610,18 +5681,17 @@ foletype_guid(self)
 }
 
 static VALUE
-ole_type_progid(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_progid(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
     OLECHAR *pbuf;
     VALUE progid = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
+    if (FAILED(hr))
         return progid;
     hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
-    if (SUCCEEDED(hr)) { 
+    if (SUCCEEDED(hr)) {
         progid = ole_wc2vstr(pbuf, FALSE);
         CoTaskMemFree(pbuf);
     }
@@ -3632,14 +5702,13 @@ ole_type_progid(pTypeInfo)
 /*
  * call-seq:
  *    WIN32OLE_TYPE#progid  #=> ProgID
- * 
+ *
  * Returns ProgID if it exists. If not found, then returns nil.
  *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
  *    puts tobj.progid  # =>   Excel.Application.9
  */
 static VALUE
-foletype_progid(self)
-    VALUE self;
+foletype_progid(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3648,14 +5717,13 @@ foletype_progid(self)
 
 
 static VALUE
-ole_type_visible(pTypeInfo) 
-    ITypeInfo *pTypeInfo;
+ole_type_visible(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
     VALUE visible;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
+    if (FAILED(hr))
         return Qtrue;
     if (pTypeAttr->wTypeFlags & (TYPEFLAG_FHIDDEN | TYPEFLAG_FRESTRICTED)) {
         visible = Qfalse;
@@ -3669,14 +5737,13 @@ ole_type_visible(pTypeInfo)
 /*
  *  call-seq:
  *    WIN32OLE_TYPE#visible  #=> true or false
- * 
+ *
  *  Returns true if the OLE class is public.
  *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
  *    puts tobj.visible  # => true
  */
 static VALUE
-foletype_visible(self)
-    VALUE self;
+foletype_visible(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3684,15 +5751,14 @@ foletype_visible(self)
 }
 
 static VALUE
-ole_type_major_version(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_major_version(ITypeInfo *pTypeInfo)
 {
     VALUE ver;
     TYPEATTR *pTypeAttr;
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     ver = INT2FIX(pTypeAttr->wMajorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
@@ -3701,14 +5767,13 @@ ole_type_major_version(pTypeInfo)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#major_version
- * 
+ *
  *  Returns major version.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
  *     puts tobj.major_version # => 8
  */
 static VALUE
-foletype_major_version(self)
-    VALUE self;
+foletype_major_version(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3716,15 +5781,14 @@ foletype_major_version(self)
 }
 
 static VALUE
-ole_type_minor_version(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_minor_version(ITypeInfo *pTypeInfo)
 {
     VALUE ver;
     TYPEATTR *pTypeAttr;
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     ver = INT2FIX(pTypeAttr->wMinorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
@@ -3733,14 +5797,13 @@ ole_type_minor_version(pTypeInfo)
 /*
  *  call-seq:
  *    WIN32OLE_TYPE#minor_version #=> OLE minor version
- * 
+ *
  *  Returns minor version.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
  *     puts tobj.minor_version # => 2
  */
 static VALUE
-foletype_minor_version(self)
-    VALUE self;
+foletype_minor_version(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3748,15 +5811,14 @@ foletype_minor_version(self)
 }
 
 static VALUE
-ole_type_typekind(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_typekind(ITypeInfo *pTypeInfo)
 {
     VALUE typekind;
     TYPEATTR *pTypeAttr;
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     typekind = INT2FIX(pTypeAttr->typekind);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return typekind;
@@ -3765,15 +5827,14 @@ ole_type_typekind(pTypeInfo)
 /*
  *  call-seq:
  *    WIN32OLE_TYPE#typekind #=> number of type.
- * 
+ *
  *  Returns number which represents type.
  *    tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
  *    puts tobj.typekind # => 4
  *
  */
-static VALUE 
-foletype_typekind(self)
-    VALUE self;
+static VALUE
+foletype_typekind(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3781,8 +5842,7 @@ foletype_typekind(self)
 }
 
 static VALUE
-ole_type_helpstring(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_helpstring(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     BSTR bhelpstr;
@@ -3796,14 +5856,13 @@ ole_type_helpstring(pTypeInfo)
 /*
  *  call-seq:
  *    WIN32OLE_TYPE#helpstring #=> help string.
- * 
+ *
  *  Returns help string.
  *    tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'IWebBrowser')
  *    puts tobj.helpstring # => Web Browser interface
  */
-static VALUE 
-foletype_helpstring(self)
-    VALUE self;
+static VALUE
+foletype_helpstring(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3811,8 +5870,7 @@ foletype_helpstring(self)
 }
 
 static VALUE
-ole_type_src_type(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_src_type(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -3832,15 +5890,14 @@ ole_type_src_type(pTypeInfo)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#src_type #=> OLE source class
- * 
+ *
  *  Returns source class when the OLE class is 'Alias'.
  *     tobj =  WIN32OLE_TYPE.new('Microsoft Office 9.0 Object Library', 'MsoRGBType')
  *     puts tobj.src_type # => I4
  *
  */
 static VALUE
-foletype_src_type(self)
-    VALUE self;
+foletype_src_type(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3848,8 +5905,7 @@ foletype_src_type(self)
 }
 
 static VALUE
-ole_type_helpfile(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_helpfile(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     BSTR bhelpfile;
@@ -3863,15 +5919,14 @@ ole_type_helpfile(pTypeInfo)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#helpfile
- * 
+ *
  *  Returns helpfile path. If helpfile is not found, then returns nil.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
  *     puts tobj.helpfile # => C:\...\VBAXL9.CHM
  *
  */
 static VALUE
-foletype_helpfile(self)
-    VALUE self;
+foletype_helpfile(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3879,12 +5934,11 @@ foletype_helpfile(self)
 }
 
 static VALUE
-ole_type_helpcontext(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+ole_type_helpcontext(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     DWORD helpcontext;
-    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL, 
+    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL,
                                &helpcontext, NULL);
     if(FAILED(hr))
         return Qnil;
@@ -3894,23 +5948,164 @@ ole_type_helpcontext(pTypeInfo)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#helpcontext
- * 
+ *
  *  Returns helpcontext. If helpcontext is not found, then returns nil.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
  *     puts tobj.helpfile # => 131185
  */
 static VALUE
-foletype_helpcontext(self)
-    VALUE self;
+foletype_helpcontext(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
     return ole_type_helpcontext(ptype->pTypeInfo);
 }
 
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#ole_typelib
+ *
+ *  Returns the WIN32OLE_TYPELIB object which is including the WIN32OLE_TYPE
+ *  object. If it is not found, then returns nil.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
+ *     puts tobj.ole_typelib # => 'Microsoft Excel 9.0 Object Library'
+ */
 static VALUE
-ole_variables(pTypeInfo)
-    ITypeInfo *pTypeInfo;
+foletype_ole_typelib(VALUE self)
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_typelib_from_itypeinfo(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags)
+{
+    HRESULT hr;
+    ITypeInfo *pRefTypeInfo;
+    HREFTYPE href;
+    WORD i;
+    VALUE type;
+    TYPEATTR *pTypeAttr;
+    int flags;
+
+    VALUE types = rb_ary_new();
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) {
+        return types;
+    }
+    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
+        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
+        if (FAILED(hr))
+            continue;
+
+        hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
+        if (FAILED(hr))
+            continue;
+        hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
+        if (FAILED(hr))
+            continue;
+
+        if ((flags & implflags) == implflags) {
+            type = ole_type_from_itypeinfo(pRefTypeInfo);
+            if (type != Qnil) {
+                rb_ary_push(types, type);
+            }
+        }
+
+        OLE_RELEASE(pRefTypeInfo);
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return types;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#implemented_ole_types
+ *
+ *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
+ *  object.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
+ *     p tobj.implemented_ole_types # => [_Worksheet, DocEvents]
+ */
+static VALUE
+foletype_impl_ole_types(VALUE self)
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_impl_ole_types(ptype->pTypeInfo, 0);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#source_ole_types
+ *
+ *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
+ *  object and having IMPLTYPEFLAG_FSOURCE.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
+ *     p tobj.source_ole_types
+ *     # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>, #<WIN32OLE_TYPE:DWebBrowserEvents>]
+ */
+static VALUE
+foletype_source_ole_types(VALUE self)
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FSOURCE);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#default_event_sources
+ *
+ *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
+ *  object and having IMPLTYPEFLAG_FSOURCE and IMPLTYPEFLAG_FDEFAULT.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
+ *     p tobj.default_event_sources  # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>]
+ */
+static VALUE
+foletype_default_event_sources(VALUE self)
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#default_ole_types
+ *
+ *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
+ *  object and having IMPLTYPEFLAG_FDEFAULT.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
+ *     p tobj.default_ole_types
+ *     # => [#<WIN32OLE_TYPE:IWebBrowser2>, #<WIN32OLE_TYPE:DWebBrowserEvents2>]
+ */
+static VALUE
+foletype_default_ole_types(VALUE self)
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FDEFAULT);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#inspect -> String
+ *
+ *  Returns the type name with class name.
+ *
+ *     ie = WIN32OLE.new('InternetExplorer.Application')
+ *     ie.ole_type.inspect => #<WIN32OLE_TYPE:IWebBrowser2>
+ */
+static VALUE
+foletype_inspect(VALUE self)
+{
+    return default_inspect(self, "WIN32OLE_TYPE");
+}
+
+static VALUE
+ole_variables(ITypeInfo *pTypeInfo)
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -3924,9 +6119,9 @@ ole_variables(pTypeInfo)
     VALUE variables = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
     }
-    
+
     for(i = 0; i < pTypeAttr->cVars; i++) {
         hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, i, &pVarDesc);
         if(FAILED(hr))
@@ -3956,15 +6151,15 @@ ole_variables(pTypeInfo)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#variables
- * 
- *  Returns array of WIN32OLE_VARIABLE objects which represent variables 
+ *
+ *  Returns array of WIN32OLE_VARIABLE objects which represent variables
  *  defined in OLE class.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
  *     vars = tobj.variables
  *     vars.each do |v|
  *       puts "#{v.name} = #{v.value}"
  *     end
- *     
+ *
  *     The result of above sample script is follows:
  *       xlChart = -4109
  *       xlDialogSheet = -4116
@@ -3974,8 +6169,7 @@ ole_variables(pTypeInfo)
  *
  */
 static VALUE
-foletype_variables(self)
-    VALUE self;
+foletype_variables(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -3985,20 +6179,17 @@ foletype_variables(self)
 /*
  *  call-seq:
  *     WIN32OLE_TYPE#ole_methods # the array of WIN32OLE_METHOD objects.
- * 
- *  Returns array of WIN32OLE_METHOD objects which represent OLE method defined in 
+ *
+ *  Returns array of WIN32OLE_METHOD objects which represent OLE method defined in
  *  OLE type library.
  *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
  *    methods = tobj.ole_methods.collect{|m|
  *      m.name
- *    }                                       
+ *    }
  *    # => ['Activate', 'Copy', 'Delete',....]
  */
 static VALUE
-foletype_methods(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+foletype_methods(VALUE self)
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -4014,7 +6205,7 @@ foletype_methods(argc, argv, self)
 /*
  *  call-seq:
  *     WIN32OLE_VARIABLE#name
- * 
+ *
  *  Returns the name of variable.
  *
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
@@ -4032,23 +6223,20 @@ foletype_methods(argc, argv, self)
  *
  */
 static VALUE
-folevariable_name(self)
-    VALUE self;
+folevariable_name(VALUE self)
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_variable_ole_type(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
+ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index)
 {
     VARDESC *pVarDesc;
     HRESULT hr;
     VALUE type;
     hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
     type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
     return type;
@@ -4057,7 +6245,7 @@ ole_variable_ole_type(pTypeInfo, var_index)
 /*
  *   call-seq:
  *      WIN32OLE_VARIABLE#ole_type
- * 
+ *
  *   Returns OLE type string.
  *
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
@@ -4075,8 +6263,7 @@ ole_variable_ole_type(pTypeInfo, var_index)
  *
  */
 static VALUE
-folevariable_ole_type(self)
-    VALUE self;
+folevariable_ole_type(VALUE self)
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -4084,16 +6271,14 @@ folevariable_ole_type(self)
 }
 
 static VALUE
-ole_variable_ole_type_detail(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
+ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index)
 {
     VARDESC *pVarDesc;
     HRESULT hr;
     VALUE type = rb_ary_new();
     hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
     ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
     return type;
@@ -4102,7 +6287,7 @@ ole_variable_ole_type_detail(pTypeInfo, var_index)
 /*
  *  call-seq:
  *     WIN32OLE_VARIABLE#ole_type_detail
- * 
+ *
  *  Returns detail information of type. The information is array of type.
  *
  *     tobj = WIN32OLE_TYPE.new('DirectX 7 for Visual Basic Type Library', 'D3DCLIPSTATUS')
@@ -4112,8 +6297,7 @@ ole_variable_ole_type_detail(pTypeInfo, var_index)
  *
  */
 static VALUE
-folevariable_ole_type_detail(self)
-    VALUE self;
+folevariable_ole_type_detail(VALUE self)
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -4121,9 +6305,7 @@ folevariable_ole_type_detail(self)
 }
 
 static VALUE
-ole_variable_value(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
+ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -4140,14 +6322,14 @@ ole_variable_value(pTypeInfo, var_index)
 /*
  *  call-seq:
  *     WIN32OLE_VARIABLE#value
- * 
- *  Returns value if value is exists. If the value does not exist, 
+ *
+ *  Returns value if value is exists. If the value does not exist,
  *  this method returns nil.
  *
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
  *     variables = tobj.variables
  *     variables.each do |variable|
- *       puts "#{variable.name} = #{variable.value}"
+ *       puts "#{variable.name} #{variable.value}"
  *     end
  *
  *     The result of above script is following:
@@ -4157,10 +6339,9 @@ ole_variable_value(pTypeInfo, var_index)
  *       xlExcel4MacroSheet = 3
  *       xlWorksheet = -4167
  *
- */    
+ */
 static VALUE
-folevariable_value(self)
-    VALUE self;
+folevariable_value(VALUE self)
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -4168,9 +6349,7 @@ folevariable_value(self)
 }
 
 static VALUE
-ole_variable_visible(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
+ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index)
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -4190,7 +6369,7 @@ ole_variable_visible(pTypeInfo, var_index)
 /*
  *  call-seq:
  *     WIN32OLE_VARIABLE#visible?
- * 
+ *
  *  Returns true if the variable is public.
  *
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
@@ -4205,11 +6384,10 @@ ole_variable_visible(pTypeInfo, var_index)
  *       xlExcel4IntlMacroSheet true
  *       xlExcel4MacroSheet true
  *       xlWorksheet true
- *       
+ *
  */
 static VALUE
-folevariable_visible(self)
-    VALUE self;
+folevariable_visible(VALUE self)
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -4217,9 +6395,7 @@ folevariable_visible(self)
 }
 
 static VALUE
-ole_variable_kind(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
+ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index)
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -4250,7 +6426,7 @@ ole_variable_kind(pTypeInfo, var_index)
 /*
  * call-seq:
  *   WIN32OLE_VARIABLE#variable_kind
- * 
+ *
  * Returns variable kind string.
  *
  *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
@@ -4267,8 +6443,7 @@ ole_variable_kind(pTypeInfo, var_index)
  *      xlWorksheet CONSTANT
  */
 static VALUE
-folevariable_variable_kind(self)
-    VALUE self;
+folevariable_variable_kind(VALUE self)
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -4276,9 +6451,7 @@ folevariable_variable_kind(self)
 }
 
 static VALUE
-ole_variable_varkind(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
+ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index)
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -4287,14 +6460,14 @@ ole_variable_varkind(pTypeInfo, var_index)
     if (FAILED(hr))
         return kind;
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    kind = INT2FIX(pVarDesc->varkind);    
+    kind = INT2FIX(pVarDesc->varkind);
     return kind;
 }
 
 /*
  *  call-seq:
  *     WIN32OLE_VARIABLE#varkind
- * 
+ *
  *  Returns the number which represents variable kind.
  *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
  *    variables = tobj.variables
@@ -4310,8 +6483,7 @@ ole_variable_varkind(pTypeInfo, var_index)
  *       xlWorksheet 2
  */
 static VALUE
-folevariable_varkind(self)
-    VALUE self;
+folevariable_varkind(VALUE self)
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -4319,18 +6491,29 @@ folevariable_varkind(self)
 }
 
 /*
+ *  call-seq:
+ *     WIN32OLE_VARIABLE#inspect -> String
+ *
+ *  Returns the OLE variable name and the value with class name.
+ *
+ */
+static VALUE
+folevariable_inspect(VALUE self)
+{
+    VALUE detail = rb_funcall(self, rb_intern("to_s"), 0);
+    rb_str_cat2(detail, "=");
+    rb_str_concat(detail, rb_funcall(rb_funcall(self, rb_intern("value"), 0), rb_intern("inspect"), 0));
+    return make_inspect("WIN32OLE_VARIABLE", detail);
+}
+
+/*
  * Document-class: WIN32OLE_METHOD
  *
  *   <code>WIN32OLE_METHOD</code> objects represent OLE method information.
  */
 
 static VALUE
-olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, index, name)
-    VALUE self;
-    ITypeInfo *pTypeInfo;
-    ITypeInfo *pOwnerTypeInfo;
-    int index;
-    VALUE name;
+olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4344,12 +6527,11 @@ olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, index, name)
 }
 
 static VALUE
-folemethod_s_allocate(klass)
-    VALUE klass;
+folemethod_s_allocate(VALUE klass)
 {
     struct olemethoddata *pmethod;
     VALUE obj;
-    obj = Data_Make_Struct(klass, 
+    obj = Data_Make_Struct(klass,
                            struct olemethoddata,
                            0, olemethod_free, pmethod);
     pmethod->pTypeInfo = NULL;
@@ -4361,7 +6543,7 @@ folemethod_s_allocate(klass)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD.new(ole_type,  method) -> WIN32OLE_METHOD object
- * 
+ *
  *  Returns a new WIN32OLE_METHOD object which represents the information
  *  about OLE method.
  *  The first argument <i>ole_type</i> specifies WIN32OLE_TYPE object.
@@ -4372,19 +6554,16 @@ folemethod_s_allocate(klass)
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
  */
 static VALUE
-folemethod_initialize(self, oletype, method)
-    VALUE self;
-    VALUE oletype;
-    VALUE method;
+folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
 {
     struct oletypedata *ptype;
     VALUE obj = Qnil;
     if (rb_obj_is_kind_of(oletype, cWIN32OLE_TYPE)) {
-        Check_SafeStr(method);
+        SafeStringValue(method);
         Data_Get_Struct(oletype, struct oletypedata, ptype);
         obj = olemethod_from_typeinfo(self, ptype->pTypeInfo, method);
         if (obj == Qnil) {
-            rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
+            rb_raise(eWIN32OLERuntimeError, "not found %s",
                      StringValuePtr(method));
         }
     }
@@ -4403,28 +6582,25 @@ folemethod_initialize(self, oletype, method)
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
  *     puts method.name # => SaveAs
- *     
+ *
  */
 static VALUE
-folemethod_name(self)
-    VALUE self;
+folemethod_name(VALUE self)
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_method_return_type(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
     VALUE type;
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
-    
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+
     type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return type;
@@ -4433,7 +6609,7 @@ ole_method_return_type(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#return_type
- * 
+ *
  *  Returns string of return value type of method.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
@@ -4441,8 +6617,7 @@ ole_method_return_type(pTypeInfo, method_index)
  *
  */
 static VALUE
-folemethod_return_type(self)
-    VALUE self;
+folemethod_return_type(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4450,27 +6625,25 @@ folemethod_return_type(self)
 }
 
 static VALUE
-ole_method_return_vtype(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
-    VALUE vt;
+    VALUE vvt;
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
-    
-    vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+
+    vvt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return vt;
+    return vvt;
 }
 
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#return_vtype
- * 
+ *
  *  Returns number of return value type of method.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
@@ -4478,8 +6651,7 @@ ole_method_return_vtype(pTypeInfo, method_index)
  *
  */
 static VALUE
-folemethod_return_vtype(self)
-    VALUE self;
+folemethod_return_vtype(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4487,18 +6659,16 @@ folemethod_return_vtype(self)
 }
 
 static VALUE
-ole_method_return_type_detail(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
     VALUE type = rb_ary_new();
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
+    if (FAILED(hr))
         return type;
-    
+
     ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), type);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return type;
@@ -4507,7 +6677,7 @@ ole_method_return_type_detail(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#return_type_detail
- * 
+ *
  *  Returns detail information of return value type of method.
  *  The information is array.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
@@ -4515,8 +6685,7 @@ ole_method_return_type_detail(pTypeInfo, method_index)
  *     p method.return_type_detail # => ["PTR", "USERDEFINED", "Workbook"]
  */
 static VALUE
-folemethod_return_type_detail(self)
-    VALUE self;
+folemethod_return_type_detail(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4524,25 +6693,21 @@ folemethod_return_type_detail(self)
 }
 
 static VALUE
-ole_method_invkind(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
     VALUE invkind;
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
+    if(FAILED(hr))
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
     invkind = INT2FIX(pFuncDesc->invkind);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return invkind;
 }
 
 static VALUE
-ole_method_invoke_kind(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    WORD method_index;
+ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index)
 {
     VALUE type = rb_str_new2("UNKNOWN");
     VALUE invkind = ole_method_invkind(pTypeInfo, method_index);
@@ -4564,16 +6729,15 @@ ole_method_invoke_kind(pTypeInfo, method_index)
 /*
  *   call-seq:
  *      WIN32OLE_MTHOD#invkind
- * 
- *   Returns the method invoke kind. 
+ *
+ *   Returns the method invoke kind.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
  *     puts method.invkind # => 1
  *
  */
 static VALUE
-folemethod_invkind(self)
-    VALUE self;
+folemethod_invkind(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4583,17 +6747,16 @@ folemethod_invkind(self)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#invoke_kind
- * 
- *  Returns the method kind string. The string is "UNKNOWN" or "PROPERTY" 
- *  or "PROPERTY" or "PROPERTYGET" or "PROPERTYPUT" or "PROPERTYPPUTREF" 
+ *
+ *  Returns the method kind string. The string is "UNKNOWN" or "PROPERTY"
+ *  or "PROPERTY" or "PROPERTYGET" or "PROPERTYPUT" or "PROPERTYPPUTREF"
  *  or "FUNC".
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
  *     puts method.invoke_kind # => "FUNC"
  */
 static VALUE
-folemethod_invoke_kind(self)
-    VALUE self;
+folemethod_invoke_kind(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4601,9 +6764,7 @@ folemethod_invoke_kind(self)
 }
 
 static VALUE
-ole_method_visible(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -4625,15 +6786,14 @@ ole_method_visible(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#visible?
- * 
+ *
  *  Returns true if the method is public.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
  *     puts method.visible? # => true
  */
 static VALUE
-folemethod_visible(self) 
-    VALUE self;
+folemethod_visible(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4641,10 +6801,7 @@ folemethod_visible(self)
 }
 
 static VALUE
-ole_method_event(pTypeInfo, method_index, method_name)
-    ITypeInfo *pTypeInfo;
-    WORD method_index;
-    VALUE method_name;
+ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name)
 {
     TYPEATTR *pTypeAttr;
     HRESULT hr;
@@ -4656,9 +6813,9 @@ ole_method_event(pTypeInfo, method_index, method_name)
     BSTR bstr;
     VALUE name;
     VALUE event = Qfalse;
-    
+
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
+    if (FAILED(hr))
         return event;
     if(pTypeAttr->typekind != TKIND_COCLASS) {
         pTypeInfo->lpVtbl->ReleaseTypeAttr(pTypeInfo, pTypeAttr);
@@ -4678,14 +6835,14 @@ ole_method_event(pTypeInfo, method_index, method_name)
                                                    href, &pRefTypeInfo);
             if (FAILED(hr))
                 continue;
-            hr = pRefTypeInfo->lpVtbl->GetFuncDesc(pRefTypeInfo, method_index, 
+            hr = pRefTypeInfo->lpVtbl->GetFuncDesc(pRefTypeInfo, method_index,
                                                    &pFuncDesc);
             if (FAILED(hr)) {
                 OLE_RELEASE(pRefTypeInfo);
                 continue;
             }
 
-            hr = pRefTypeInfo->lpVtbl->GetDocumentation(pRefTypeInfo, 
+            hr = pRefTypeInfo->lpVtbl->GetDocumentation(pRefTypeInfo,
                                                         pFuncDesc->memid,
                                                         &bstr, NULL, NULL, NULL);
             if (FAILED(hr)) {
@@ -4710,7 +6867,7 @@ ole_method_event(pTypeInfo, method_index, method_name)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#event?
- * 
+ *
  *  Returns true if the method is event.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SheetActivate')
@@ -4718,14 +6875,13 @@ ole_method_event(pTypeInfo, method_index, method_name)
  *
  */
 static VALUE
-folemethod_event(self)
-    VALUE self;
+folemethod_event(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
     if (!pmethod->pOwnerTypeInfo)
         return Qfalse;
-    return ole_method_event(pmethod->pOwnerTypeInfo, 
+    return ole_method_event(pmethod->pOwnerTypeInfo,
                             pmethod->index,
                             rb_ivar_get(self, rb_intern("name")));
 }
@@ -4740,8 +6896,7 @@ folemethod_event(self)
  *    puts method.event_interface # =>  WorkbookEvents
  */
 static VALUE
-folemethod_event_interface(self)
-    VALUE self;
+folemethod_event_interface(VALUE self)
 {
     BSTR name;
     struct olemethoddata *pmethod;
@@ -4756,14 +6911,14 @@ folemethod_event_interface(self)
 }
 
 static VALUE
-ole_method_docinfo_from_type(pTypeInfo, method_index, name, helpstr,
-                             helpcontext, helpfile)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    BSTR *name;
-    BSTR *helpstr;
-    DWORD *helpcontext;
-    BSTR *helpfile;
+ole_method_docinfo_from_type(
+    ITypeInfo *pTypeInfo,
+    UINT method_index,
+    BSTR *name,
+    BSTR *helpstr,
+    DWORD *helpcontext,
+    BSTR *helpfile
+    )
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -4778,14 +6933,12 @@ ole_method_docinfo_from_type(pTypeInfo, method_index, name, helpstr,
 }
 
 static VALUE
-ole_method_helpstring(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index)
 {
     HRESULT hr;
     BSTR bhelpstring;
     hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, &bhelpstring,
-                                      NULL, NULL); 
+                                      NULL, NULL);
     if (FAILED(hr))
         return Qnil;
     return WC2VSTR(bhelpstring);
@@ -4795,7 +6948,7 @@ ole_method_helpstring(pTypeInfo, method_index)
  *  call-seq:
  *     WIN32OLE_METHOD#helpstring
  *
- *  Returns help string of OLE method. If the help string is not found, 
+ *  Returns help string of OLE method. If the help string is not found,
  *  then the method returns nil.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'IWebBrowser')
  *     method = WIN32OLE_METHOD.new(tobj, 'Navigate')
@@ -4803,8 +6956,7 @@ ole_method_helpstring(pTypeInfo, method_index)
  *
  */
 static VALUE
-folemethod_helpstring(self)
-    VALUE self;
+folemethod_helpstring(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4812,14 +6964,12 @@ folemethod_helpstring(self)
 }
 
 static VALUE
-ole_method_helpfile(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index)
 {
     HRESULT hr;
     BSTR bhelpfile;
     hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
-                                      NULL, &bhelpfile); 
+                                      NULL, &bhelpfile);
     if (FAILED(hr))
         return Qnil;
     return WC2VSTR(bhelpfile);
@@ -4828,16 +6978,15 @@ ole_method_helpfile(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#helpfile
- * 
- *  Returns help file. If help file is not found, then 
+ *
+ *  Returns help file. If help file is not found, then
  *  the method returns nil.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
  *     puts method.helpfile # => C:\...\VBAXL9.CHM
  */
 static VALUE
-folemethod_helpfile(self)
-    VALUE self;
+folemethod_helpfile(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4846,31 +6995,28 @@ folemethod_helpfile(self)
 }
 
 static VALUE
-ole_method_helpcontext(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index)
 {
     HRESULT hr;
     DWORD helpcontext = 0;
     hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
-                                      &helpcontext, NULL); 
+                                      &helpcontext, NULL);
     if (FAILED(hr))
         return Qnil;
     return INT2FIX(helpcontext);
 }
 
-/* 
+/*
  *  call-seq:
  *     WIN32OLE_METHOD#helpcontext
- * 
+ *
  *  Returns help context.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
  *     puts method.helpcontext # => 65717
  */
 static VALUE
-folemethod_helpcontext(self)
-    VALUE self;
+folemethod_helpcontext(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4878,9 +7024,7 @@ folemethod_helpcontext(self)
 }
 
 static VALUE
-ole_method_dispid(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -4888,7 +7032,7 @@ ole_method_dispid(pTypeInfo, method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return dispid;
-    dispid = INT2NUM(pFuncDesc->memid); 
+    dispid = INT2NUM(pFuncDesc->memid);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return dispid;
 }
@@ -4896,15 +7040,14 @@ ole_method_dispid(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#dispid
- * 
+ *
  *  Returns dispatch ID.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
  *     puts method.dispid # => 181
  */
 static VALUE
-folemethod_dispid(self)
-    VALUE self;
+folemethod_dispid(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4912,9 +7055,7 @@ folemethod_dispid(self)
 }
 
 static VALUE
-ole_method_offset_vtbl(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -4922,7 +7063,7 @@ ole_method_offset_vtbl(pTypeInfo, method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return offset_vtbl;
-    offset_vtbl = INT2FIX(pFuncDesc->oVft); 
+    offset_vtbl = INT2FIX(pFuncDesc->oVft);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return offset_vtbl;
 }
@@ -4930,15 +7071,14 @@ ole_method_offset_vtbl(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#offset_vtbl
- * 
+ *
  *  Returns the offset ov VTBL.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
  *     method = WIN32OLE_METHOD.new(tobj, 'Add')
  *     puts method.offset_vtbl # => 40
  */
 static VALUE
-folemethod_offset_vtbl(self)
-    VALUE self;
+folemethod_offset_vtbl(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4946,9 +7086,7 @@ folemethod_offset_vtbl(self)
 }
 
 static VALUE
-ole_method_size_params(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -4964,16 +7102,15 @@ ole_method_size_params(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#size_params
- * 
+ *
  *  Returns the size of arguments of the method.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
  *     puts method.size_params # => 11
- *  
+ *
  */
 static VALUE
-folemethod_size_params(self)
-    VALUE self;
+folemethod_size_params(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -4981,9 +7118,7 @@ folemethod_size_params(self)
 }
 
 static VALUE
-ole_method_size_opt_params(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -4999,15 +7134,14 @@ ole_method_size_opt_params(pTypeInfo, method_index)
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#size_opt_params
- * 
+ *
  *  Returns the size of optional parameters.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
  *     puts method.size_opt_params # => 4
  */
 static VALUE
-folemethod_size_opt_params(self)
-    VALUE self;
+folemethod_size_opt_params(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -5015,9 +7149,7 @@ folemethod_size_opt_params(self)
 }
 
 static VALUE
-ole_method_params(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
+ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -5027,12 +7159,12 @@ ole_method_params(pTypeInfo, method_index)
     VALUE param;
     VALUE params = rb_ary_new();
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
+    if (FAILED(hr))
         return params;
 
     len = 0;
     bstrs = ALLOCA_N(BSTR, pFuncDesc->cParams + 1);
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pFuncDesc->memid, 
+    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pFuncDesc->memid,
                                      bstrs, pFuncDesc->cParams + 1,
                                      &len);
     if (FAILED(hr)) {
@@ -5056,21 +7188,21 @@ ole_method_params(pTypeInfo, method_index)
      return params;
 }
 
+
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#params
- * 
+ *
  *  returns array of WIN32OLE_PARAM object corresponding with method parameters.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     p method.params # => [Filename, FileFormat, Password, WriteResPassword, 
- *                           ReadOnlyRecommended, CreateBackup, AccessMode, 
- *                           ConflictResolution, AddToMru, TextCodepage, 
+ *     p method.params # => [Filename, FileFormat, Password, WriteResPassword,
+ *                           ReadOnlyRecommended, CreateBackup, AccessMode,
+ *                           ConflictResolution, AddToMru, TextCodepage,
  *                           TextVisualLayout]
  */
 static VALUE
-folemethod_params(self)
-    VALUE self;
+folemethod_params(VALUE self)
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -5078,16 +7210,97 @@ folemethod_params(self)
 }
 
 /*
+ *  call-seq:
+ *     WIN32OLE_METHOD#inspect -> String
+ *
+ *  Returns the method name with class name.
+ *
+ */
+static VALUE
+folemethod_inspect(VALUE self)
+{
+    return default_inspect(self, "WIN32OLE_METHOD");
+}
+
+/*
  * Document-class: WIN32OLE_PARAM
  *
- *   <code>WIN32OLE_PARAM</code> objects represent param information of 
+ *   <code>WIN32OLE_PARAM</code> objects represent param information of
  *   the OLE method.
  */
+static VALUE foleparam_s_allocate(VALUE klass)
+{
+    struct oleparamdata *pparam;
+    VALUE obj;
+    obj = Data_Make_Struct(klass,
+                           struct oleparamdata,
+                           0, oleparam_free, pparam);
+    pparam->pTypeInfo = NULL;
+    pparam->method_index = 0;
+    pparam->index = 0;
+    return obj;
+}
+
+static VALUE
+oleparam_ole_param_from_index(VALUE self, ITypeInfo *pTypeInfo, UINT method_index, int param_index)
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    BSTR *bstrs;
+    UINT len;
+    struct oleparamdata *pparam;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        ole_raise(hr, rb_eRuntimeError, "fail to ITypeInfo::GetFuncDesc");
+
+    len = 0;
+    bstrs = ALLOCA_N(BSTR, pFuncDesc->cParams + 1);
+    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pFuncDesc->memid,
+                                     bstrs, pFuncDesc->cParams + 1,
+                                     &len);
+    if (FAILED(hr)) {
+        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+        ole_raise(hr, rb_eRuntimeError, "fail to ITypeInfo::GetNames");
+    }
+    SysFreeString(bstrs[0]);
+    if (param_index < 1 || len <= (UINT)param_index)
+    {
+        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+        rb_raise(rb_eIndexError, "index of param must be in 1..%d", len);
+    }
+
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    pparam->pTypeInfo = pTypeInfo;
+    OLE_ADDREF(pTypeInfo);
+    pparam->method_index = method_index;
+    pparam->index = param_index - 1;
+    rb_ivar_set(self, rb_intern("name"), WC2VSTR(bstrs[param_index]));
+
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return self;
+}
+
+static VALUE oleparam_ole_param(VALUE self, VALUE olemethod, int n)
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(olemethod, struct olemethoddata, pmethod);
+    return oleparam_ole_param_from_index(self, pmethod->pTypeInfo, pmethod->index, n);
+}
+
+static VALUE foleparam_initialize(VALUE self, VALUE olemethod, VALUE n)
+{
+    int idx;
+    if (!rb_obj_is_kind_of(olemethod, cWIN32OLE_METHOD)) {
+        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE_METHOD object");
+    }
+    idx = FIX2INT(n);
+    return oleparam_ole_param(self, olemethod, idx);
+}
 
 /*
  *  call-seq:
  *     WIN32OLE_PARAM#name
- * 
+ *
  *  Returns name.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
@@ -5095,25 +7308,21 @@ folemethod_params(self)
  *     puts param1.name # => Filename
  */
 static VALUE
-foleparam_name(self)
-    VALUE self;
+foleparam_name(VALUE self)
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_param_ole_type(pTypeInfo, method_index, index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
+ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
-    VALUE type = rb_str_new2("UNKNOWN");
+    VALUE type = rb_str_new2("unknown type");
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return type;
-    type = ole_typedesc2val(pTypeInfo, 
+    type = ole_typedesc2val(pTypeInfo,
                             &(pFuncDesc->lprgelemdescParam[index].tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return type;
@@ -5129,21 +7338,17 @@ ole_param_ole_type(pTypeInfo, method_index, index)
  *     param1 = method.params[0]
  *     puts param1.ole_type # => VARIANT
  */
-static VALUE 
-foleparam_ole_type(self)
-    VALUE self;
+static VALUE
+foleparam_ole_type(VALUE self)
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_ole_type(pparam->pTypeInfo, pparam->method_index, 
+    return ole_param_ole_type(pparam->pTypeInfo, pparam->method_index,
                               pparam->index);
 }
 
 static VALUE
-ole_param_ole_type_detail(pTypeInfo, method_index, index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
+ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -5151,7 +7356,7 @@ ole_param_ole_type_detail(pTypeInfo, method_index, index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return typedetail;
-    ole_typedesc2val(pTypeInfo, 
+    ole_typedesc2val(pTypeInfo,
                      &(pFuncDesc->lprgelemdescParam[index].tdesc), typedetail);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return typedetail;
@@ -5167,30 +7372,25 @@ ole_param_ole_type_detail(pTypeInfo, method_index, index)
  *     param1 = method.params[0]
  *     p param1.ole_type_detail # => ["PTR", "USERDEFINED", "Range"]
  */
-static VALUE 
-foleparam_ole_type_detail(self)
-    VALUE self;
+static VALUE
+foleparam_ole_type_detail(VALUE self)
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_ole_type_detail(pparam->pTypeInfo, pparam->method_index, 
+    return ole_param_ole_type_detail(pparam->pTypeInfo, pparam->method_index,
                                      pparam->index);
 }
 
 static VALUE
-ole_param_flag_mask(pTypeInfo, method_index, index, mask)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
-    USHORT mask;
+ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask)
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
     VALUE ret = Qfalse;
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr)) 
+    if(FAILED(hr))
         return ret;
-    if (V_UNION1((&(pFuncDesc->lprgelemdescParam[index])), paramdesc).wParamFlags &mask) 
+    if (V_UNION1((&(pFuncDesc->lprgelemdescParam[index])), paramdesc).wParamFlags &mask)
         ret = Qtrue;
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return ret;
@@ -5199,26 +7399,25 @@ ole_param_flag_mask(pTypeInfo, method_index, index, mask)
 /*
  *  call-seq:
  *     WIN32OLE_PARAM#input?
- * 
+ *
  *  Returns true if the parameter is input.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
  *     param1 = method.params[0]
  *     puts param1.input? # => true
  */
-static VALUE foleparam_input(self)
-    VALUE self;
+static VALUE foleparam_input(VALUE self)
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
                                pparam->index, PARAMFLAG_FIN);
 }
 
 /*
  *  call-seq:
  *     WIN32OLE#output?
- * 
+ *
  *  Returns true if argument is output.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'DWebBrowserEvents')
  *     method = WIN32OLE_METHOD.new(tobj, 'NewWindow')
@@ -5234,31 +7433,29 @@ static VALUE foleparam_input(self)
  *       Headers false
  *       Processed true
  */
-static VALUE foleparam_output(self)
-    VALUE self;
+static VALUE foleparam_output(VALUE self)
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
                                pparam->index, PARAMFLAG_FOUT);
 }
 
 /*
  *  call-seq:
  *     WIN32OLE_PARAM#optional?
- * 
+ *
  *  Returns true if argument is optional.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
  *     param1 = method.params[0]
  *     puts "#{param1.name} #{param1.optional?}" # => Filename true
  */
-static VALUE foleparam_optional(self)
-    VALUE self;
+static VALUE foleparam_optional(VALUE self)
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
                                pparam->index, PARAMFLAG_FOPT);
 }
 
@@ -5267,26 +7464,22 @@ static VALUE foleparam_optional(self)
  *     WIN32OLE_PARAM#retval?
  *
  *  Returns true if argument is return value.
- *     tobj = WIN32OLE_TYPE.new('DirectX 7 for Visual Basic Type Library', 
+ *     tobj = WIN32OLE_TYPE.new('DirectX 7 for Visual Basic Type Library',
  *                              'DirectPlayLobbyConnection')
  *     method = WIN32OLE_METHOD.new(tobj, 'GetPlayerShortName')
  *     param = method.params[0]
  *     puts "#{param.name} #{param.retval?}"  # => name true
  */
-static VALUE foleparam_retval(self)
-    VALUE self;
+static VALUE foleparam_retval(VALUE self)
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
                                pparam->index, PARAMFLAG_FRETVAL);
 }
 
 static VALUE
-ole_param_default(pTypeInfo, method_index, index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
+ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
 {
     FUNCDESC *pFuncDesc;
     ELEMDESC *pElemDesc;
@@ -5298,7 +7491,7 @@ ole_param_default(pTypeInfo, method_index, index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return defval;
-    pElemDesc = &pFuncDesc->lprgelemdescParam[index]; 
+    pElemDesc = &pFuncDesc->lprgelemdescParam[index];
     wParamFlags = V_UNION1(pElemDesc, paramdesc).wParamFlags;
     if ((wParamFlags & mask) == mask) {
          pParamDescEx = V_UNION1(pElemDesc, paramdesc).pparamdescex;
@@ -5311,8 +7504,8 @@ ole_param_default(pTypeInfo, method_index, index)
 /*
  *  call-seq:
  *     WIN32OLE_PARAM#default
- * 
- *  Returns default value. If the default value does not exist, 
+ *
+ *  Returns default value. If the default value does not exist,
  *  this method returns nil.
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
@@ -5337,8 +7530,7 @@ ole_param_default(pTypeInfo, method_index, index)
  *         TextCodepage
  *         TextVisualLayout
  */
-static VALUE foleparam_default(self)
-    VALUE self;
+static VALUE foleparam_default(VALUE self)
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -5346,6 +7538,25 @@ static VALUE foleparam_default(self)
                              pparam->index);
 }
 
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#inspect -> String
+ *
+ *  Returns the parameter name with class name. If the parameter has default value,
+ *  then returns name=value string with class name.
+ *
+ */
+static VALUE
+foleparam_inspect(VALUE self)
+{
+    VALUE detail = foleparam_name(self);
+    VALUE defval = foleparam_default(self);
+    if (defval != Qnil) {
+        rb_str_cat2(detail, "=");
+        rb_str_concat(detail, rb_funcall(defval, rb_intern("inspect"), 0));
+    }
+    return make_inspect("WIN32OLE_PARAM", detail);
+}
 
 /*
  * Document-class: WIN32OLE_EVENT
@@ -5415,28 +7626,32 @@ STDMETHODIMP EVENTSINK_GetTypeInfo(
 }
 
 STDMETHODIMP EVENTSINK_GetIDsOfNames(
-    PEVENTSINK pEV,
+    PEVENTSINK pEventSink,
     REFIID riid,
     OLECHAR **szNames,
     UINT cNames,
     LCID lcid,
     DISPID *pDispID
     ) {
+    ITypeInfo *pTypeInfo;
+    PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
+    pTypeInfo = pEV->pTypeInfo;
+    if (pTypeInfo) {
+	return pTypeInfo->lpVtbl->GetIDsOfNames(pTypeInfo, szNames, cNames, pDispID);
+    }
     return DISP_E_UNKNOWNNAME;
 }
 
 static long
-ole_search_event_at(ary, ev)
-    VALUE ary;
-    VALUE ev;
+ole_search_event_at(VALUE ary, VALUE ev)
 {
     VALUE event;
     VALUE def_event;
     VALUE event_name;
-    long i, len; 
+    long i, len;
     long ret = -1;
     def_event = Qnil;
-    len = RARRAY(ary)->len;
+    len = RARRAY_LEN(ary);
     for(i = 0; i < len; i++) {
         event = rb_ary_entry(ary, i);
         event_name = rb_ary_entry(event, 1);
@@ -5455,18 +7670,15 @@ ole_search_event_at(ary, ev)
 }
 
 static VALUE
-ole_search_event(ary, ev, is_default)
-    VALUE ary;
-    VALUE ev;
-    BOOL  *is_default;
+ole_search_event(VALUE ary, VALUE ev, BOOL  *is_default)
 {
     VALUE event;
     VALUE def_event;
     VALUE event_name;
-    long i, len;
+    int i, len;
     *is_default = FALSE;
     def_event = Qnil;
-    len = RARRAY(ary)->len;
+    len = RARRAY_LEN(ary);
     for(i = 0; i < len; i++) {
         event = rb_ary_entry(ary, i);
         event_name = rb_ary_entry(event, 1);
@@ -5481,92 +7693,114 @@ ole_search_event(ary, ev, is_default)
     }
     return def_event;
 }
+static VALUE
+ole_search_handler_method(VALUE handler, VALUE ev, BOOL *is_default_handler)
+{
+    VALUE mid;
+
+    *is_default_handler = FALSE;
+    mid = rb_to_id(rb_sprintf("on%s", StringValuePtr(ev)));
+    if (rb_respond_to(handler, mid)) {
+	return mid;
+    }
+    mid = rb_intern("method_missing");
+    if (rb_respond_to(handler, mid)) {
+	*is_default_handler = TRUE;
+	return mid;
+    }
+    return Qnil;
+}
 
 static void
-val2ptr_variant(val, var)
-    VALUE val;
-    VARIANT *var;
+ole_delete_event(VALUE ary, VALUE ev)
 {
-    switch (TYPE(val)) {
-    case T_STRING:
-        if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
-            *V_BSTRREF(var) = ole_mb2wc(StringValuePtr(val), -1);
-        }
-        break;
-    case T_FIXNUM:
-        switch(V_VT(var)) {
-        case (VT_UI1 | VT_BYREF) :
-            *V_UI1REF(var) = NUM2CHR(val);
-            break;
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2INT(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2INT(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_FLOAT:
-        switch(V_VT(var)) {
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2DBL(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2DBL(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_BIGNUM:
-        if (V_VT(var) == (VT_R8 | VT_BYREF)) {
-            *V_R8REF(var) = rb_big2dbl(val);
-        }
-        break;
-    case T_TRUE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_TRUE;
-        }
-        break;
-    case T_FALSE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_FALSE;
-        }
-        break;
-    default:
-        break;
+    long at = -1;
+    at = ole_search_event_at(ary, ev);
+    if (at >= 0) {
+        rb_ary_delete_at(ary, at);
+    }
+}
+
+static void
+hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams)
+{
+    BSTR *bstrs;
+    HRESULT hr;
+    UINT len, i;
+    VARIANT *pvar;
+    VALUE val;
+    VALUE key;
+    len = 0;
+    bstrs = ALLOCA_N(BSTR, pdispparams->cArgs + 1);
+    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, dispid,
+                                     bstrs, pdispparams->cArgs + 1,
+                                     &len);
+    if (FAILED(hr))
+	return;
+
+    for (i = 0; i < len - 1; i++) {
+	key = WC2VSTR(bstrs[i + 1]);
+        val = rb_hash_aref(hash, INT2FIX(i));
+	if (val == Qnil)
+	    val = rb_hash_aref(hash, key);
+	if (val == Qnil)
+	    val = rb_hash_aref(hash, rb_str_intern(key));
+        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
+        ole_val2ptr_variant(val, pvar);
     }
 }
 
+static VALUE
+hash2result(VALUE hash)
+{
+    VALUE ret = Qnil;
+    ret = rb_hash_aref(hash, rb_str_new2("return"));
+    if (ret == Qnil)
+	ret = rb_hash_aref(hash, rb_str_intern(rb_str_new2("return")));
+    return ret;
+}
+
 static void
-ary2ptr_dispparams(ary, pdispparams)
-    VALUE ary;
-    DISPPARAMS *pdispparams;
+ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams)
 {
     int i;
     VALUE v;
     VARIANT *pvar;
-    for(i = 0; i < RARRAY(ary)->len && (unsigned int) i < pdispparams->cArgs; i++) {
+    for(i = 0; i < RARRAY_LEN(ary) && (unsigned int) i < pdispparams->cArgs; i++) {
         v = rb_ary_entry(ary, i);
         pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        val2ptr_variant(v, pvar);
+        ole_val2ptr_variant(v, pvar);
     }
 }
 
+static VALUE
+exec_callback(VALUE arg)
+{
+    VALUE *parg = (VALUE *)arg;
+    VALUE handler = parg[0];
+    VALUE mid = parg[1];
+    VALUE args = parg[2];
+    return rb_apply(handler, mid, args);
+}
+
+static VALUE
+rescue_callback(VALUE arg)
+{
+
+    VALUE error;
+    VALUE e = rb_errinfo();
+    VALUE bt = rb_funcall(e, rb_intern("backtrace"), 0);
+    VALUE msg = rb_funcall(e, rb_intern("message"), 0);
+    bt = rb_ary_entry(bt, 0);
+    error = rb_sprintf("%s: %s (%s)\n", StringValuePtr(bt), StringValuePtr(msg), rb_obj_classname(e));
+    rb_write_error(StringValuePtr(error));
+    rb_backtrace();
+    ruby_finalize();
+    exit(-1);
+
+    return Qnil;
+}
+
 STDMETHODIMP EVENTSINK_Invoke(
     PEVENTSINK pEventSink,
     DISPID dispid,
@@ -5585,13 +7819,17 @@ STDMETHODIMP EVENTSINK_Invoke(
     unsigned int i;
     ITypeInfo *pTypeInfo;
     VARIANT *pvar;
-    VALUE ary, obj, event, handler, args, argv, ev, result;
+    VALUE ary, obj, event, args, outargv, ev, result;
+    VALUE handler = Qnil;
+    VALUE arg[3];
+    VALUE mid;
+    VALUE is_outarg = Qfalse;
     BOOL is_default_handler = FALSE;
+    int state;
 
     PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
     pTypeInfo = pEV->pTypeInfo;
-
-    obj = rb_ary_entry(ary_ole_event, pEV->m_event_id);
+    obj = evs_entry(pEV->m_event_id);
     if (!rb_obj_is_kind_of(obj, cWIN32OLE_EVENT)) {
         return NOERROR;
     }
@@ -5607,9 +7845,21 @@ STDMETHODIMP EVENTSINK_Invoke(
     }
     ev = WC2VSTR(bstr);
     event = ole_search_event(ary, ev, &is_default_handler);
-    if (NIL_P(event)) {
-        return NOERROR;
+    if (TYPE(event) == T_ARRAY) {
+	handler = rb_ary_entry(event, 0);
+	mid = rb_intern("call");
+	is_outarg = rb_ary_entry(event, 3);
+    } else {
+	handler = rb_ivar_get(obj, rb_intern("handler"));
+	if (handler == Qnil) {
+	    return NOERROR;
+	}
+	mid = ole_search_handler_method(handler, ev, &is_default_handler);
     }
+    if (handler == Qnil || mid == Qnil) {
+	return NOERROR;
+    }
+
     args = rb_ary_new();
     if (is_default_handler) {
         rb_ary_push(args, ev);
@@ -5620,22 +7870,38 @@ STDMETHODIMP EVENTSINK_Invoke(
         pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
         rb_ary_push(args, ole_variant2val(pvar));
     }
-    handler = rb_ary_entry(event, 0);
+    outargv = Qnil;
+    if (is_outarg == Qtrue) {
+	outargv = rb_ary_new();
+        rb_ary_push(args, outargv);
+    }
 
-    if (rb_ary_entry(event, 3) == Qtrue) {
-        argv = rb_ary_new();
-        rb_ary_push(args, argv);
-        result = rb_apply(handler, rb_intern("call"), args);
-        ary2ptr_dispparams(argv, pdispparams);
+    /*
+     * if exception raised in event callback,
+     * then you receive cfp consistency error.
+     * to avoid this error we use begin rescue end.
+     * and the exception raised then error message print
+     * and exit ruby process by Win32OLE itself.
+     */
+    arg[0] = handler;
+    arg[1] = mid;
+    arg[2] = args;
+    result = rb_protect(exec_callback, (VALUE)arg, &state);
+    if (state != 0) {
+	rescue_callback(Qnil);
     }
-    else {
-        result = rb_apply(handler, rb_intern("call"), args);
+    if(TYPE(result) == T_HASH) {
+	hash2ptr_dispparams(result, pTypeInfo, dispid, pdispparams);
+	result = hash2result(result);
+    }else if (is_outarg == Qtrue && TYPE(outargv) == T_ARRAY) {
+	ary2ptr_dispparams(outargv, pdispparams);
     }
 
     if (pvarResult) {
+	VariantInit(pvarResult);
         ole_val2variant(result, pvarResult);
     }
-    
+
     return NOERROR;
 }
 
@@ -5658,10 +7924,7 @@ EVENTSINK_Constructor() {
     pEv->lpVtbl = &vtEventSink;
     pEv->m_cRef = 0;
     pEv->m_event_id = 0;
-    pEv->m_dwCookie = 0;
-    pEv->pConnectionPoint = NULL;
     pEv->pTypeInfo = NULL;
-    pEv->ptr_freed = NULL;
     return pEv;
 }
 
@@ -5669,17 +7932,14 @@ void EVENTSINK_Destructor(
     PIEVENTSINKOBJ pEVObj
     ) {
     if(pEVObj != NULL) {
-        *(pEVObj->ptr_freed) = 1;
+        OLE_RELEASE(pEVObj->pTypeInfo);
         free(pEVObj);
+        pEVObj = NULL;
     }
 }
 
 static HRESULT
-find_iid(ole, pitf, piid, ppTypeInfo)
-    VALUE ole;
-    char *pitf;
-    IID *piid;
-    ITypeInfo **ppTypeInfo;
+find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
 {
     HRESULT hr;
     IDispatch *pDispatch;
@@ -5698,7 +7958,7 @@ find_iid(ole, pitf, piid, ppTypeInfo)
     char *pstr;
 
     BOOL is_found = FALSE;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    LCID    lcid = cWIN32OLE_lcid;
 
     OLEData_Get_Struct(ole, pole);
 
@@ -5790,21 +8050,129 @@ find_iid(ole, pitf, piid, ppTypeInfo)
 }
 
 static HRESULT
-find_default_source(ole, piid, ppTypeInfo)
-    VALUE ole;
-    IID *piid;
-    ITypeInfo **ppTypeInfo;
+find_coclass(
+    ITypeInfo *pTypeInfo,
+    TYPEATTR *pTypeAttr,
+    ITypeInfo **pCOTypeInfo,
+    TYPEATTR **pCOTypeAttr)
+{
+    HRESULT hr = E_NOINTERFACE;
+    ITypeLib *pTypeLib;
+    int count;
+    BOOL found = FALSE;
+    ITypeInfo *pTypeInfo2;
+    TYPEATTR *pTypeAttr2;
+    int flags;
+    int i,j;
+    HREFTYPE href;
+    ITypeInfo *pRefTypeInfo;
+    TYPEATTR *pRefTypeAttr;
+
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, NULL);
+    if (FAILED(hr)) {
+	return hr;
+    }
+    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
+    for (i = 0; i < count && !found; i++) {
+	hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo2);
+	if (FAILED(hr))
+	    continue;
+	hr = OLE_GET_TYPEATTR(pTypeInfo2, &pTypeAttr2);
+	if (FAILED(hr)) {
+	    OLE_RELEASE(pTypeInfo2);
+	    continue;
+	}
+	if (pTypeAttr2->typekind != TKIND_COCLASS) {
+	    OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
+	    OLE_RELEASE(pTypeInfo2);
+	    continue;
+	}
+	for (j = 0; j < pTypeAttr2->cImplTypes && !found; j++) {
+	    hr = pTypeInfo2->lpVtbl->GetImplTypeFlags(pTypeInfo2, j, &flags);
+	    if (FAILED(hr))
+		continue;
+	    if (!(flags & IMPLTYPEFLAG_FDEFAULT))
+		continue;
+	    hr = pTypeInfo2->lpVtbl->GetRefTypeOfImplType(pTypeInfo2, j, &href);
+	    if (FAILED(hr))
+		continue;
+	    hr = pTypeInfo2->lpVtbl->GetRefTypeInfo(pTypeInfo2, href, &pRefTypeInfo);
+	    if (FAILED(hr))
+		continue;
+	    hr = OLE_GET_TYPEATTR(pRefTypeInfo, &pRefTypeAttr);
+	    if (FAILED(hr))  {
+		OLE_RELEASE(pRefTypeInfo);
+		continue;
+	    }
+	    if (IsEqualGUID(&(pTypeAttr->guid), &(pRefTypeAttr->guid))) {
+		found = TRUE;
+	    }
+	}
+	if (!found) {
+	    OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
+	    OLE_RELEASE(pTypeInfo2);
+	}
+    }
+    OLE_RELEASE(pTypeLib);
+    if (found) {
+	*pCOTypeInfo = pTypeInfo2;
+	*pCOTypeAttr = pTypeAttr2;
+	hr = S_OK;
+    } else {
+	hr = E_NOINTERFACE;
+    }
+    return hr;
+}
+
+static HRESULT
+find_default_source_from_typeinfo(
+    ITypeInfo *pTypeInfo,
+    TYPEATTR *pTypeAttr,
+    ITypeInfo **ppTypeInfo)
+{
+    int i = 0;
+    HRESULT hr = E_NOINTERFACE;
+    int flags;
+    HREFTYPE hRefType;
+    /* Enumerate all implemented types of the COCLASS */
+    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
+        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
+        if (FAILED(hr))
+            continue;
+
+        /*
+           looking for the [default] [source]
+           we just hope that it is a dispinterface :-)
+        */
+        if ((flags & IMPLTYPEFLAG_FDEFAULT) &&
+            (flags & IMPLTYPEFLAG_FSOURCE)) {
+
+            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
+                                                         i, &hRefType);
+            if (FAILED(hr))
+                continue;
+            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
+                                                   hRefType, ppTypeInfo);
+            if (SUCCEEDED(hr))
+                break;
+        }
+    }
+    return hr;
+}
+
+static HRESULT
+find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
 {
     HRESULT hr;
     IProvideClassInfo2 *pProvideClassInfo2;
     IProvideClassInfo *pProvideClassInfo;
+    void *p;
 
     IDispatch *pDispatch;
     ITypeInfo *pTypeInfo;
+    ITypeInfo *pTypeInfo2 = NULL;
     TYPEATTR *pTypeAttr;
-    int i;
-    int iFlags;
-    HREFTYPE hRefType;
+    TYPEATTR *pTypeAttr2 = NULL;
 
     struct oledata *pole;
 
@@ -5812,58 +8180,52 @@ find_default_source(ole, piid, ppTypeInfo)
     pDispatch = pole->pDispatch;
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
                                            &IID_IProvideClassInfo2,
-                                           (void**)&pProvideClassInfo2);
+                                           &p);
     if (SUCCEEDED(hr)) {
+        pProvideClassInfo2 = p;
         hr = pProvideClassInfo2->lpVtbl->GetGUID(pProvideClassInfo2,
                                                  GUIDKIND_DEFAULT_SOURCE_DISP_IID,
                                                  piid);
         OLE_RELEASE(pProvideClassInfo2);
-        return find_iid(ole, NULL, piid, ppTypeInfo);
+        if (SUCCEEDED(hr)) {
+            hr = find_iid(ole, NULL, piid, ppTypeInfo);
+        }
+    }
+    if (SUCCEEDED(hr)) {
+        return hr;
     }
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
                                            &IID_IProvideClassInfo,
-                                           (void**)&pProvideClassInfo);
-    if (FAILED(hr))
-        return hr;
-
-    hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
-                                                 &pTypeInfo);
-    OLE_RELEASE(pProvideClassInfo);
+					   &p);
+    if (SUCCEEDED(hr)) {
+        pProvideClassInfo = p;
+        hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
+                                                     &pTypeInfo);
+        OLE_RELEASE(pProvideClassInfo);
+    }
+    if (FAILED(hr)) {
+        hr = pDispatch->lpVtbl->GetTypeInfo(pDispatch, 0, cWIN32OLE_lcid, &pTypeInfo );
+    }
     if (FAILED(hr))
         return hr;
-
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
         return hr;
     }
-    /* Enumerate all implemented types of the COCLASS */
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &iFlags);
-        if (FAILED(hr))
-            continue;
 
-        /*
-           looking for the [default] [source]
-           we just hope that it is a dispinterface :-)
-        */
-        if ((iFlags & IMPLTYPEFLAG_FDEFAULT) &&
-            (iFlags & IMPLTYPEFLAG_FSOURCE)) {
-
-            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                         i, &hRefType);
-            if (FAILED(hr))
-                continue;
-            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                   hRefType, ppTypeInfo);
-            if (SUCCEEDED(hr))
-                break;
-        }
+    *ppTypeInfo = 0;
+    hr = find_default_source_from_typeinfo(pTypeInfo, pTypeAttr, ppTypeInfo);
+    if (!*ppTypeInfo) {
+	hr = find_coclass(pTypeInfo, pTypeAttr, &pTypeInfo2, &pTypeAttr2);
+	if (SUCCEEDED(hr)) {
+	    hr = find_default_source_from_typeinfo(pTypeInfo2, pTypeAttr2, ppTypeInfo);
+	    OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
+	    OLE_RELEASE(pTypeInfo2);
+	}
     }
-
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     OLE_RELEASE(pTypeInfo);
-
     /* Now that would be a bad surprise, if we didn't find it, wouldn't it? */
     if (!*ppTypeInfo) {
         if (SUCCEEDED(hr))
@@ -5885,72 +8247,45 @@ find_default_source(ole, piid, ppTypeInfo)
 }
 
 static void
-ole_event_free(poleev)
-    struct oleeventdata *poleev;
+ole_event_free(struct oleeventdata *poleev)
 {
-    ITypeInfo *pti = NULL;
-    IConnectionPoint *pcp = NULL;
-
-    if (poleev->freed == 1) {
-        /* 
-         * this return create memory leak.
-         * but poleev->pEvent->pConnectionPoint shoul'd not be freed
-         * until poleev-> freed == 0.
-         */
-        return;
-    }
-    if(poleev->pEvent) {
-        pti = poleev->pEvent->pTypeInfo;
-        if(pti) OLE_RELEASE(pti);
-        pcp = poleev->pEvent->pConnectionPoint;
-        if(pcp) {
-            pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie);
-            OLE_RELEASE(pcp);
-        }
-        free(poleev);
+    if (poleev->pConnectionPoint) {
+        poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie);
+        OLE_RELEASE(poleev->pConnectionPoint);
+        poleev->pConnectionPoint = NULL;
     }
+    free(poleev);
 }
 
-static VALUE fev_s_allocate _((VALUE));
 static VALUE
-fev_s_allocate(klass)
-    VALUE klass;
+fev_s_allocate(VALUE klass)
 {
     VALUE obj;
     struct oleeventdata *poleev;
     obj = Data_Make_Struct(klass,struct oleeventdata,0,ole_event_free,poleev);
-    poleev->pEvent = NULL;
+    poleev->dwCookie = 0;
+    poleev->pConnectionPoint = NULL;
+    poleev->event_id = 0;
     return obj;
 }
 
-/*
- *  call-seq:
- *     WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
- *
- *  Returns OLE event object.
- *  The first argument specifies WIN32OLE object.
- *  The second argument specifies OLE event name.
- *     ie = WIN32OLE.new('InternetExplorer.Application')
- *     ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
- */     
 static VALUE
-fev_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+ev_advise(int argc, VALUE *argv, VALUE self)
 {
+
     VALUE ole, itf;
     struct oledata *pole;
     char *pitf;
     HRESULT hr;
     IID iid;
-    ITypeInfo *pTypeInfo;
+    ITypeInfo *pTypeInfo = 0;
     IDispatch *pDispatch;
     IConnectionPointContainer *pContainer;
     IConnectionPoint *pConnectionPoint;
     IEVENTSINKOBJ *pIEV;
-    DWORD dwCookie = 0;
+    DWORD dwCookie;
     struct oleeventdata *poleev;
+    void *p;
 
     rb_secure(4);
     rb_scan_args(argc, argv, "11", &ole, &itf);
@@ -5960,11 +8295,11 @@ fev_initialize(argc, argv, self)
     }
 
     if(TYPE(itf) != T_NIL) {
-        if (ruby_safe_level > 0 && OBJ_TAINTED(itf)) {
+        if (rb_safe_level() > 0 && OBJ_TAINTED(itf)) {
             rb_raise(rb_eSecurityError, "Insecure Event Creation - %s",
                      StringValuePtr(itf));
         }
-        Check_SafeStr(itf);
+        SafeStringValue(itf);
         pitf = StringValuePtr(itf);
         hr = find_iid(ole, pitf, &iid, &pTypeInfo);
     }
@@ -5979,12 +8314,13 @@ fev_initialize(argc, argv, self)
     pDispatch = pole->pDispatch;
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
                                            &IID_IConnectionPointContainer,
-                                           (void**)&pContainer);
+                                           &p);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
         ole_raise(hr, rb_eRuntimeError,
                   "failed to query IConnectionPointContainer");
     }
+    pContainer = p;
 
     hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
                                                  &iid,
@@ -6004,27 +8340,44 @@ fev_initialize(argc, argv, self)
     }
 
     Data_Get_Struct(self, struct oleeventdata, poleev);
-    poleev->pEvent = pIEV;
-    poleev->pEvent->m_event_id
-        = NUM2INT(rb_funcall(ary_ole_event, rb_intern("length"), 0));
-    poleev->pEvent->pConnectionPoint = pConnectionPoint;
-    poleev->pEvent->pTypeInfo = pTypeInfo;
-    poleev->pEvent->m_dwCookie = dwCookie;
-    poleev->freed = 0;
-    poleev->pEvent->ptr_freed = &(poleev->freed);
-    rb_ary_push(ary_ole_event, self);
+    pIEV->m_event_id
+        = NUM2INT(evs_length());
+    pIEV->pTypeInfo = pTypeInfo;
+    poleev->dwCookie = dwCookie;
+    poleev->pConnectionPoint = pConnectionPoint;
+    poleev->event_id = pIEV->m_event_id;
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
+ *
+ *  Returns OLE event object.
+ *  The first argument specifies WIN32OLE object.
+ *  The second argument specifies OLE event name.
+ *     ie = WIN32OLE.new('InternetExplorer.Application')
+ *     ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
+ */
+static VALUE
+fev_initialize(int argc, VALUE *argv, VALUE self)
+{
+    ev_advise(argc, argv, self);
+    evs_push(self);
+    rb_ivar_set(self, id_events, rb_ary_new());
+    fev_set_handler(self, Qnil);
     return self;
 }
 
 /*
  *  call-seq:
  *     WIN32OLE_EVENT.message_loop
- * 
+ *
  *  Translates and dispatches Windows message.
  */
 static VALUE
-fev_s_msg_loop(klass)
-    VALUE klass;
+fev_s_msg_loop(VALUE klass)
 {
     ole_msg_loop();
     return Qnil;
@@ -6032,35 +8385,34 @@ fev_s_msg_loop(klass)
 
 
 static void
-add_event_call_back(obj, event, data)
-    VALUE obj;
-    VALUE event;
-    VALUE data;
+add_event_call_back(VALUE obj, VALUE event, VALUE data)
 {
-    long at;
     VALUE events = rb_ivar_get(obj, id_events);
     if (NIL_P(events) || TYPE(events) != T_ARRAY) {
         events = rb_ary_new();
         rb_ivar_set(obj, id_events, events);
     }
-    at = ole_search_event_at(events, event);
-    if (at > -1) {
-        rb_ary_delete_at(events, at);
-    }
+    ole_delete_event(events, event);
     rb_ary_push(events, data);
 }
 
 static VALUE
-ev_on_event(argc, argv, self, is_ary_arg)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-    VALUE is_ary_arg;
+ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg)
 {
+    struct oleeventdata *poleev;
     VALUE event, args, data;
+    Data_Get_Struct(self, struct oleeventdata, poleev);
+    if (poleev->pConnectionPoint == NULL) {
+        rb_raise(eWIN32OLERuntimeError, "IConnectionPoint not found. You must call advise at first.");
+    }
     rb_scan_args(argc, argv, "01*", &event, &args);
     if(!NIL_P(event)) {
-        Check_SafeStr(event);
+	if(TYPE(event) != T_STRING && TYPE(event) != T_SYMBOL) {
+	    rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
+	}
+	if (TYPE(event) == T_SYMBOL) {
+	    event = rb_sym_to_s(event);
+	}
     }
     data = rb_ary_new3(4, rb_block_proc(), event, args, is_ary_arg);
     add_event_call_back(self, event, data);
@@ -6070,18 +8422,34 @@ ev_on_event(argc, argv, self, is_ary_arg)
 /*
  *  call-seq:
  *     WIN32OLE_EVENT#on_event([event]){...}
- * 
+ *
  *  Defines the callback event.
  *  If argument is omitted, this method defines the callback of all events.
+ *  If you want to modify reference argument in callback, return hash in
+ *  callback. If you want to return value to OLE server as result of callback
+ *  use `return' or :return.
+ *
  *    ie = WIN32OLE.new('InternetExplorer.Application')
- *    ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
+ *    ev = WIN32OLE_EVENT.new(ie)
  *    ev.on_event("NavigateComplete") {|url| puts url}
+ *    ev.on_event() {|ev, *args| puts "#{ev} fired"}
+ *
+ *    ev.on_event("BeforeNavigate2") {|*args|
+ *      ...
+ *      # set true to BeforeNavigate reference argument `Cancel'.
+ *      # Cancel is 7-th argument of BeforeNavigate,
+ *      # so you can use 6 as key of hash instead of 'Cancel'.
+ *      # The argument is counted from 0.
+ *      # The hash key of 0 means first argument.)
+ *      {:Cancel => true}  # or {'Cancel' => true} or {6 => true}
+ *    }
+ *
+ *    ev.on_event(...) {|*args|
+ *      {:return => 1, :xxx => yyy}
+ *    }
  */
 static VALUE
-fev_on_event(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fev_on_event(int argc, VALUE *argv, VALUE self)
 {
     return ev_on_event(argc, argv, self, Qfalse);
 }
@@ -6089,29 +8457,622 @@ fev_on_event(argc, argv, self)
 /*
  *  call-seq:
  *     WIN32OLE_EVENT#on_event_with_outargs([event]){...}
- * 
+ *
  *  Defines the callback of event.
- *  If you want modify argument in callback, 
- *  you should use this method instead of WIN32OLE_EVENT#on_event.
+ *  If you want modify argument in callback,
+ *  you could use this method instead of WIN32OLE_EVENT#on_event.
+ *
+ *    ie = WIN32OLE.new('InternetExplorer.Application')
+ *    ev = WIN32OLE_EVENT.new(ie)
+ *    ev.on_event_with_outargs('BeforeNavigate2') {|*args|
+ *      args.last[6] = true
+ *    }
  */
 static VALUE
-fev_on_event_with_outargs(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self)
 {
     return ev_on_event(argc, argv, self, Qtrue);
 }
 
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT#off_event([event])
+ *
+ *  removes the callback of event.
+ *
+ *    ie = WIN32OLE.new('InternetExplorer.Application')
+ *    ev = WIN32OLE_EVENT.new(ie)
+ *    ev.on_event('BeforeNavigate2') {|*args|
+ *      args.last[6] = true
+ *    }
+ *      ...
+ *    ev.off_event('BeforeNavigate2')
+ *      ...
+ */
+static VALUE
+fev_off_event(int argc, VALUE *argv, VALUE self)
+{
+    VALUE event = Qnil;
+    VALUE events;
+
+    rb_secure(4);
+    rb_scan_args(argc, argv, "01", &event);
+    if(!NIL_P(event)) {
+	if(TYPE(event) != T_STRING && TYPE(event) != T_SYMBOL) {
+	    rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
+	}
+	if (TYPE(event) == T_SYMBOL) {
+	    event = rb_sym_to_s(event);
+	}
+    }
+    events = rb_ivar_get(self, id_events);
+    if (NIL_P(events)) {
+	return Qnil;
+    }
+    ole_delete_event(events, event);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT#unadvise -> nil
+ *
+ *  disconnects OLE server. If this method called, then the WIN32OLE_EVENT object
+ *  does not receive the OLE server event any more.
+ *  This method is trial implementation.
+ *
+ *      ie = WIN32OLE.new('InternetExplorer.Application')
+ *      ev = WIN32OLE_EVENT.new(ie)
+ *      ev.on_event() {...}
+ *         ...
+ *      ev.unadvise
+ *
+ */
+static VALUE
+fev_unadvise(VALUE self)
+{
+    struct oleeventdata *poleev;
+    Data_Get_Struct(self, struct oleeventdata, poleev);
+    if (poleev->pConnectionPoint) {
+        ole_msg_loop();
+        evs_delete(poleev->event_id);
+        poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie);
+        OLE_RELEASE(poleev->pConnectionPoint);
+        poleev->pConnectionPoint = NULL;
+    }
+    return Qnil;
+}
+
+static VALUE
+evs_push(VALUE ev)
+{
+    return rb_ary_push(ary_ole_event, ev);
+}
+
+static VALUE
+evs_delete(long i)
+{
+    rb_ary_store(ary_ole_event, i, Qnil);
+    return Qnil;
+}
+
+static VALUE
+evs_entry(long i)
+{
+    return rb_ary_entry(ary_ole_event, i);
+}
+
+static VALUE
+evs_length()
+{
+    return rb_funcall(ary_ole_event, rb_intern("length"), 0);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT#handler=
+ *
+ *  sets event handler object. If handler object has onXXX
+ *  method according to XXX event, then onXXX method is called
+ *  when XXX event occurs.
+ *
+ *  If handler object has method_missing and there is no
+ *  method according to the event, then method_missing
+ *  called and 1-st argument is event name.
+ *
+ *  If handler object has onXXX method and there is block
+ *  defined by WIN32OLE_EVENT#on_event('XXX'){},
+ *  then block is executed but handler object method is not called
+ *  when XXX event occurs.
+ *
+ *      class Handler
+ *        def onStatusTextChange(text)
+ *          puts "StatusTextChanged"
+ *        end
+ *        def onPropertyChange(prop)
+ *          puts "PropertyChanged"
+ *        end
+ *        def method_missing(ev, *arg)
+ *          puts "other event #{ev}"
+ *        end
+ *      end
+ *
+ *      handler = Handler.new
+ *      ie = WIN32OLE.new('InternetExplorer.Application')
+ *      ev = WIN32OLE_EVENT.new(ie)
+ *      ev.on_event("StatusTextChange") {|*args|
+ *        puts "this block executed."
+ *        puts "handler.onStatusTextChange method is not called."
+ *      }
+ *      ev.handler = handler
+ *
+ */
+static VALUE
+fev_set_handler(VALUE self, VALUE val)
+{
+    return rb_ivar_set(self, rb_intern("handler"), val);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT#handler
+ *
+ *  returns handler object.
+ *
+ */
+static VALUE
+fev_get_handler(VALUE self)
+{
+    return rb_ivar_get(self, rb_intern("handler"));
+}
+
+static void
+olevariant_free(struct olevariantdata *pvar)
+{
+    VariantClear(&(pvar->realvar));
+    VariantClear(&(pvar->var));
+    free(pvar);
+}
+
+static VALUE
+folevariant_s_allocate(VALUE klass)
+{
+    struct olevariantdata *pvar;
+    VALUE obj;
+    ole_initialize();
+    obj = Data_Make_Struct(klass,struct olevariantdata,0,olevariant_free,pvar);
+    VariantInit(&(pvar->var));
+    VariantInit(&(pvar->realvar));
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIANT.array(ary, vt)
+ *
+ *  Returns Ruby object wrapping OLE variant whose variant type is VT_ARRAY.
+ *  The first argument should be Array object which specifies dimensions
+ *  and each size of dimensions of OLE array.
+ *  The second argument specifies variant type of the element of OLE array.
+ *
+ *  The following create 2 dimensions OLE array. The first dimensions size
+ *  is 3, and the second is 4.
+ *
+ *     ole_ary = WIN32OLE_VARIANT.array([3,4], VT_I4)
+ *     ruby_ary = ole_ary.value # => [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
+ *
+ */
+static VALUE
+folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
+{
+    VALUE obj = Qnil;
+    VARTYPE vt;
+    struct olevariantdata *pvar;
+    SAFEARRAYBOUND *psab = NULL;
+    SAFEARRAY *psa = NULL;
+    UINT dim = 0;
+    UINT i = 0;
+
+    ole_initialize();
+
+    vt = NUM2UINT(vvt);
+    vt = (vt | VT_ARRAY);
+    Check_Type(elems, T_ARRAY);
+    obj = folevariant_s_allocate(klass);
+
+    Data_Get_Struct(obj, struct olevariantdata, pvar);
+    dim = RARRAY_LEN(elems);
+
+    psab = ALLOC_N(SAFEARRAYBOUND, dim);
+
+    if(!psab) {
+        rb_raise(rb_eRuntimeError, "memory allocation error");
+    }
+
+    for (i = 0; i < dim; i++) {
+        psab[i].cElements = FIX2INT(rb_ary_entry(elems, i));
+        psab[i].lLbound = 0;
+    }
+
+    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
+    if (psa == NULL) {
+        if (psab) free(psab);
+        rb_raise(rb_eRuntimeError, "memory allocation error(SafeArrayCreate)");
+    }
+
+    V_VT(&(pvar->var)) = vt;
+    if (vt & VT_BYREF) {
+        V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
+        V_ARRAY(&(pvar->realvar)) = psa;
+        V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
+    } else {
+        V_ARRAY(&(pvar->var)) = psa;
+    }
+    if (psab) free(psab);
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIANT.new(val, vartype) #=> WIN32OLE_VARIANT object.
+ *
+ *  Returns Ruby object wrapping OLE variant.
+ *  The first argument specifies Ruby object to convert OLE variant variable.
+ *  The second argument specifies VARIANT type.
+ *  In some situation, you need the WIN32OLE_VARIANT object to pass OLE method
+ *
+ *     shell = WIN32OLE.new("Shell.Application")
+ *     folder = shell.NameSpace("C:\\Windows")
+ *     item = folder.ParseName("tmp.txt")
+ *     # You can't use Ruby String object to call FolderItem.InvokeVerb.
+ *     # Instead, you have to use WIN32OLE_VARIANT object to call the method.
+ *     shortcut = WIN32OLE_VARIANT.new("Create Shortcut(\&S)")
+ *     item.invokeVerb(shortcut)
+ *
+ */
+static VALUE
+folevariant_initialize(VALUE self, VALUE args)
+{
+    int len = 0;
+    VARIANT var;
+    VALUE val;
+    VALUE vvt;
+    VARTYPE vt;
+    struct olevariantdata *pvar;
+
+    len = RARRAY_LEN(args);
+    if (len < 1 || len > 3) {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", len);
+    }
+    VariantInit(&var);
+    val = rb_ary_entry(args, 0);
+
+    if(!rb_obj_is_kind_of(val, cWIN32OLE) &&
+       !rb_obj_is_kind_of(val, cWIN32OLE_VARIANT) &&
+       !rb_obj_is_kind_of(val, rb_cTime)) {
+	switch (TYPE(val)) {
+	case T_ARRAY:
+	case T_STRING:
+	case T_FIXNUM:
+	case T_BIGNUM:
+	case T_FLOAT:
+	case T_TRUE:
+	case T_FALSE:
+	case T_NIL:
+	    break;
+	default:
+	    rb_raise(rb_eTypeError, "can not convert WIN32OLE_VARIANT from type %s",
+		     rb_obj_classname(val));
+	}
+    }
+
+    Data_Get_Struct(self, struct olevariantdata, pvar);
+    if (len == 1) {
+        ole_val2variant(val, &(pvar->var));
+    } else {
+        vvt = rb_ary_entry(args, 1);
+        vt = NUM2INT(vvt);
+        ole_val2olevariantdata(val, vt, pvar);
+    }
+    vt = V_VT(&pvar->var);
+    return self;
+}
+
+static SAFEARRAY *
+get_locked_safe_array(VALUE val)
+{
+    struct olevariantdata *pvar;
+    SAFEARRAY *psa = NULL;
+    HRESULT hr;
+    Data_Get_Struct(val, struct olevariantdata, pvar);
+    if (!(V_VT(&(pvar->var)) & VT_ARRAY)) {
+        rb_raise(rb_eTypeError, "variant type is not VT_ARRAY.");
+    }
+    psa = V_ISBYREF(&(pvar->var)) ? *V_ARRAYREF(&(pvar->var)) : V_ARRAY(&(pvar->var));
+    if (psa == NULL) {
+        return psa;
+    }
+    hr = SafeArrayLock(psa);
+    if (FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayLock");
+    }
+    return psa;
+}
+
+static long *
+ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa)
+{
+    long dim;
+    long *pid;
+    long i;
+    dim = SafeArrayGetDim(psa);
+    if (dim != ary_size) {
+        rb_raise(rb_eArgError, "unmatch number of indices");
+    }
+    pid = ALLOC_N(long, dim);
+    if (pid == NULL) {
+        rb_raise(rb_eRuntimeError, "failed to allocate memory for indices");
+    }
+    for (i = 0; i < dim; i++) {
+        pid[i] = NUM2INT(ary[i]);
+    }
+    return pid;
+}
+
+static void
+unlock_safe_array(SAFEARRAY *psa)
+{
+    HRESULT hr;
+    hr = SafeArrayUnlock(psa);
+    if (FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayUnlock");
+    }
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIANT[i,j,...] #=> element of OLE array.
+ *
+ *  Returns the element of WIN32OLE_VARIANT object(OLE array).
+ *  This method is available only when the variant type of
+ *  WIN32OLE_VARIANT object is VT_ARRAY.
+ *
+ *  REMARK:
+ *     The all indicies should be 0 or natural number and
+ *     lower than or equal to max indicies.
+ *     (This point is different with Ruby Array indicies.)
+ *
+ *     obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
+ *     p obj[0,0] # => 1
+ *     p obj[1,0] # => 4
+ *     p obj[2,0] # => WIN32OLERuntimeError
+ *     p obj[0, -1] # => WIN32OLERuntimeError
+ *
+ */
+static VALUE
+folevariant_ary_aref(int argc, VALUE *argv, VALUE self)
+{
+    struct olevariantdata *pvar;
+    SAFEARRAY *psa;
+    VALUE val = Qnil;
+    VARIANT variant;
+    long *pid;
+    HRESULT hr;
+
+    Data_Get_Struct(self, struct olevariantdata, pvar);
+    if (!V_ISARRAY(&(pvar->var))) {
+        rb_raise(eWIN32OLERuntimeError,
+                 "`[]' is not available for this variant type object");
+    }
+    psa = get_locked_safe_array(self);
+    if (psa == NULL) {
+        return val;
+    }
+
+    pid = ary2safe_array_index(argc, argv, psa);
+
+    VariantInit(&variant);
+    V_VT(&variant) = (V_VT(&(pvar->var)) & ~VT_ARRAY) | VT_BYREF;
+    hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPtrOfIndex");
+    }
+    val = ole_variant2val(&variant);
+
+    unlock_safe_array(psa);
+    if (pid) free(pid);
+    return val;
+}
+
+static VOID *
+val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt)
+{
+    VOID *p = NULL;
+    HRESULT hr = S_OK;
+    ole_val2variant_ex(val, var, vt);
+    if ((vt & ~VT_BYREF) == VT_VARIANT) {
+        p = var;
+    } else {
+        if ( (vt & ~VT_BYREF) != V_VT(var)) {
+            hr = VariantChangeTypeEx(var, var,
+                    cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
+            if (FAILED(hr)) {
+                ole_raise(hr, rb_eRuntimeError, "failed to change type");
+            }
+        }
+        p = get_ptr_of_variant(var);
+    }
+    if (p == NULL) {
+        rb_raise(rb_eRuntimeError, "failed to get pointer of variant");
+    }
+    return p;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIANT[i,j,...] = val #=> set the element of OLE array
+ *
+ *  Set the element of WIN32OLE_VARIANT object(OLE array) to val.
+ *  This method is available only when the variant type of
+ *  WIN32OLE_VARIANT object is VT_ARRAY.
+ *
+ *  REMARK:
+ *     The all indicies should be 0 or natural number and
+ *     lower than or equal to max indicies.
+ *     (This point is different with Ruby Array indicies.)
+ *
+ *     obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
+ *     obj[0,0] = 7
+ *     obj[1,0] = 8
+ *     p obj.value # => [[7,2,3], [8,5,6]]
+ *     obj[2,0] = 9 # => WIN32OLERuntimeError
+ *     obj[0, -1] = 9 # => WIN32OLERuntimeError
+ *
+ */
+static VALUE
+folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
+{
+    struct olevariantdata *pvar;
+    SAFEARRAY *psa;
+    VARIANT var;
+    VARTYPE vt;
+    long *pid;
+    HRESULT hr;
+    VOID *p = NULL;
+
+    Data_Get_Struct(self, struct olevariantdata, pvar);
+    if (!V_ISARRAY(&(pvar->var))) {
+        rb_raise(eWIN32OLERuntimeError,
+                 "`[]' is not available for this variant type object");
+    }
+    psa = get_locked_safe_array(self);
+    if (psa == NULL) {
+        rb_raise(rb_eRuntimeError, "failed to get SafeArray pointer");
+    }
+
+    pid = ary2safe_array_index(argc-1, argv, psa);
+
+    VariantInit(&var);
+    vt = (V_VT(&(pvar->var)) & ~VT_ARRAY);
+    p = val2variant_ptr(argv[argc-1], &var, vt);
+    if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
+        (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
+        rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
+    }
+    hr = SafeArrayPutElement(psa, pid, p);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPutElement");
+    }
+
+    unlock_safe_array(psa);
+    if (pid) free(pid);
+    return argv[argc-1];
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIANT.value #=> Ruby object.
+ *
+ *  Returns Ruby object value from OLE variant.
+ *     obj = WIN32OLE_VARIANT.new(1, WIN32OLE::VARIANT::VT_BSTR)
+ *     obj.value # => "1" (not Fixnum object, but String object "1")
+ *
+ */
+static VALUE
+folevariant_value(VALUE self)
+{
+    struct olevariantdata *pvar;
+    VALUE val = Qnil;
+    VARTYPE vt;
+    int dim;
+    SAFEARRAY *psa;
+    Data_Get_Struct(self, struct olevariantdata, pvar);
+
+    val = ole_variant2val(&(pvar->var));
+    vt = V_VT(&(pvar->var));
+
+    if ((vt & ~VT_BYREF) == (VT_UI1|VT_ARRAY)) {
+        if (vt & VT_BYREF) {
+            psa = *V_ARRAYREF(&(pvar->var));
+        } else {
+            psa  = V_ARRAY(&(pvar->var));
+        }
+        if (!psa) {
+            return val;
+        }
+        dim = SafeArrayGetDim(psa);
+        if (dim == 1) {
+            val = rb_funcall(val, rb_intern("pack"), 1, rb_str_new2("C*"));
+        }
+    }
+    return val;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIANT.vartype #=> OLE variant type.
+ *
+ *  Returns OLE variant type.
+ *     obj = WIN32OLE_VARIANT.new("string")
+ *     obj.vartype # => WIN32OLE::VARIANT::VT_BSTR
+ *
+ */
+static VALUE
+folevariant_vartype(VALUE self)
+{
+    struct olevariantdata *pvar;
+    Data_Get_Struct(self, struct olevariantdata, pvar);
+    return INT2FIX(V_VT(&pvar->var));
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIANT.value = val #=> set WIN32OLE_VARIANT value to val.
+ *
+ *  Sets variant value to val. If the val type does not match variant value
+ *  type(vartype), then val is changed to match variant value type(vartype)
+ *  before setting val.
+ *  Thie method is not available when vartype is VT_ARRAY(except VT_UI1|VT_ARRAY).
+ *  If the vartype is VT_UI1|VT_ARRAY, the val should be String object.
+ *
+ *     obj = WIN32OLE_VARIANT.new(1) # obj.vartype is WIN32OLE::VARIANT::VT_I4
+ *     obj.value = 3.2 # 3.2 is changed to 3 when setting value.
+ *     p obj.value # => 3
+ */
+static VALUE
+folevariant_set_value(VALUE self, VALUE val)
+{
+    struct olevariantdata *pvar;
+    VARTYPE vt;
+    Data_Get_Struct(self, struct olevariantdata, pvar);
+    vt = V_VT(&(pvar->var));
+    if (V_ISARRAY(&(pvar->var)) && ((vt & ~VT_BYREF) != (VT_UI1|VT_ARRAY) || TYPE(val) != T_STRING)) {
+        rb_raise(eWIN32OLERuntimeError,
+                 "`value=' is not available for this variant type object");
+    }
+    ole_val2olevariantdata(val, vt, pvar);
+    return Qnil;
+}
+
+static void
+init_enc2cp()
+{
+    enc2cp_table = st_init_numtable();
+}
+
+static void
+free_enc2cp()
+{
+    st_free_table(enc2cp_table);
+}
 
 void
 Init_win32ole()
 {
-    rb_global_variable(&ary_ole_event);
     ary_ole_event = rb_ary_new();
+    rb_gc_register_mark_object(ary_ole_event);
     id_events = rb_intern("events");
 
-    rb_global_variable(&com_hash);
     com_vtbl.QueryInterface = QueryInterface;
     com_vtbl.AddRef = AddRef;
     com_vtbl.Release = Release;
@@ -6119,7 +9080,16 @@ Init_win32ole()
     com_vtbl.GetTypeInfo = GetTypeInfo;
     com_vtbl.GetIDsOfNames = GetIDsOfNames;
     com_vtbl.Invoke = Invoke;
+
+    message_filter.QueryInterface = mf_QueryInterface;
+    message_filter.AddRef = mf_AddRef;
+    message_filter.Release = mf_Release;
+    message_filter.HandleInComingCall = mf_HandleInComingCall;
+    message_filter.RetryRejectedCall = mf_RetryRejectedCall;
+    message_filter.MessagePending = mf_MessagePending;
+
     com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable());
+    rb_gc_register_mark_object(com_hash);
 
     cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);
 
@@ -6135,16 +9105,20 @@ Init_win32ole()
     rb_define_singleton_method(cWIN32OLE, "ole_show_help", fole_s_show_help, -1);
     rb_define_singleton_method(cWIN32OLE, "codepage", fole_s_get_code_page, 0);
     rb_define_singleton_method(cWIN32OLE, "codepage=", fole_s_set_code_page, 1);
-
+    rb_define_singleton_method(cWIN32OLE, "locale", fole_s_get_locale, 0);
+    rb_define_singleton_method(cWIN32OLE, "locale=", fole_s_set_locale, 1);
+    rb_define_singleton_method(cWIN32OLE, "create_guid", fole_s_create_guid, 0);
+    rb_define_singleton_method(cWIN32OLE, "ole_initialize", fole_s_ole_initialize, 0);
+    rb_define_singleton_method(cWIN32OLE, "ole_uninitialize", fole_s_ole_uninitialize, 0);
 
     rb_define_method(cWIN32OLE, "invoke", fole_invoke, -1);
-    rb_define_method(cWIN32OLE, "[]", fole_getproperty, -1);
+    rb_define_method(cWIN32OLE, "[]", fole_getproperty_with_bracket, -1);
     rb_define_method(cWIN32OLE, "_invoke", fole_invoke2, 3);
     rb_define_method(cWIN32OLE, "_getproperty", fole_getproperty2, 3);
     rb_define_method(cWIN32OLE, "_setproperty", fole_setproperty2, 3);
 
     /* support propput method that takes an argument */
-    rb_define_method(cWIN32OLE, "[]=", fole_setproperty, -1); 
+    rb_define_method(cWIN32OLE, "[]=", fole_setproperty_with_bracket, -1);
 
     rb_define_method(cWIN32OLE, "ole_free", fole_free, 0);
 
@@ -6161,19 +9135,30 @@ Init_win32ole()
 
     rb_define_method(cWIN32OLE, "ole_method", fole_method_help, 1);
     rb_define_alias(cWIN32OLE, "ole_method_help", "ole_method");
-    rb_define_method(cWIN32OLE, "ole_obj_help", fole_obj_help, 0);
+    rb_define_method(cWIN32OLE, "ole_activex_initialize", fole_activex_initialize, 0);
+    rb_define_method(cWIN32OLE, "ole_type", fole_type, 0);
+    rb_define_alias(cWIN32OLE, "ole_obj_help", "ole_type");
+    rb_define_method(cWIN32OLE, "ole_typelib", fole_typelib, 0);
+    rb_define_method(cWIN32OLE, "ole_query_interface", fole_query_interface, 1);
+    rb_define_method(cWIN32OLE, "ole_respond_to?", fole_respond_to, 1);
 
     rb_define_const(cWIN32OLE, "VERSION", rb_str_new2(WIN32OLE_VERSION));
     rb_define_const(cWIN32OLE, "ARGV", rb_ary_new());
-    rb_define_const(cWIN32OLE, "CP_ACP"       ,INT2FIX(CP_ACP));
-    rb_define_const(cWIN32OLE, "CP_OEMCP"     ,INT2FIX(CP_OEMCP));
-    rb_define_const(cWIN32OLE, "CP_MACCP"     ,INT2FIX(CP_MACCP));
-    rb_define_const(cWIN32OLE, "CP_THREAD_ACP",INT2FIX(CP_THREAD_ACP));
-    rb_define_const(cWIN32OLE, "CP_SYMBOL"    ,INT2FIX(CP_SYMBOL));
-    rb_define_const(cWIN32OLE, "CP_UTF7"      ,INT2FIX(CP_UTF7));
-    rb_define_const(cWIN32OLE, "CP_UTF8"      ,INT2FIX(CP_UTF8));
+
+    rb_define_const(cWIN32OLE, "CP_ACP", INT2FIX(CP_ACP));
+    rb_define_const(cWIN32OLE, "CP_OEMCP", INT2FIX(CP_OEMCP));
+    rb_define_const(cWIN32OLE, "CP_MACCP", INT2FIX(CP_MACCP));
+    rb_define_const(cWIN32OLE, "CP_THREAD_ACP", INT2FIX(CP_THREAD_ACP));
+    rb_define_const(cWIN32OLE, "CP_SYMBOL", INT2FIX(CP_SYMBOL));
+    rb_define_const(cWIN32OLE, "CP_UTF7", INT2FIX(CP_UTF7));
+    rb_define_const(cWIN32OLE, "CP_UTF8", INT2FIX(CP_UTF8));
+
+    rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", INT2FIX(LOCALE_SYSTEM_DEFAULT));
+    rb_define_const(cWIN32OLE, "LOCALE_USER_DEFAULT", INT2FIX(LOCALE_USER_DEFAULT));
 
     mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT");
+    rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", INT2FIX(VT_EMPTY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", INT2FIX(VT_NULL));
     rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));
     rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4));
     rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4));
@@ -6192,11 +9177,32 @@ Init_win32ole()
     rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", INT2FIX(VT_UI1));
     rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", INT2FIX(VT_UI2));
     rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", INT2FIX(VT_UI4));
+#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I8", INT2FIX(VT_I8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", INT2FIX(VT_UI8));
+#endif
     rb_define_const(mWIN32OLE_VARIANT, "VT_INT", INT2FIX(VT_INT));
     rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", INT2FIX(VT_UINT));
     rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", INT2FIX(VT_ARRAY));
     rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", INT2FIX(VT_BYREF));
-    
+
+    cWIN32OLE_TYPELIB = rb_define_class("WIN32OLE_TYPELIB", rb_cObject);
+    rb_define_singleton_method(cWIN32OLE_TYPELIB, "typelibs", foletypelib_s_typelibs, 0);
+    rb_define_alloc_func(cWIN32OLE_TYPELIB, foletypelib_s_allocate);
+    rb_define_method(cWIN32OLE_TYPELIB, "initialize", foletypelib_initialize, -2);
+    rb_define_method(cWIN32OLE_TYPELIB, "guid", foletypelib_guid, 0);
+    rb_define_method(cWIN32OLE_TYPELIB, "name", foletypelib_name, 0);
+    rb_define_method(cWIN32OLE_TYPELIB, "version", foletypelib_version, 0);
+    rb_define_method(cWIN32OLE_TYPELIB, "major_version", foletypelib_major_version, 0);
+    rb_define_method(cWIN32OLE_TYPELIB, "minor_version", foletypelib_minor_version, 0);
+    rb_define_method(cWIN32OLE_TYPELIB, "path", foletypelib_path, 0);
+    rb_define_method(cWIN32OLE_TYPELIB, "ole_types", foletypelib_ole_types, 0);
+    rb_define_alias(cWIN32OLE_TYPELIB, "ole_classes", "ole_types");
+    rb_define_method(cWIN32OLE_TYPELIB, "visible?", foletypelib_visible, 0);
+    rb_define_method(cWIN32OLE_TYPELIB, "library_name", foletypelib_library_name, 0);
+    rb_define_alias(cWIN32OLE_TYPELIB, "to_s", "name");
+    rb_define_method(cWIN32OLE_TYPELIB, "inspect", foletypelib_inspect, 0);
+
     cWIN32OLE_TYPE = rb_define_class("WIN32OLE_TYPE", rb_cObject);
     rb_define_singleton_method(cWIN32OLE_TYPE, "ole_classes", foletype_s_ole_classes, 1);
     rb_define_singleton_method(cWIN32OLE_TYPE, "typelibs", foletype_s_typelibs, 0);
@@ -6209,7 +9215,6 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_TYPE, "progid", foletype_progid, 0);
     rb_define_method(cWIN32OLE_TYPE, "visible?", foletype_visible, 0);
     rb_define_alias(cWIN32OLE_TYPE, "to_s", "name");
-
     rb_define_method(cWIN32OLE_TYPE, "major_version", foletype_major_version, 0);
     rb_define_method(cWIN32OLE_TYPE, "minor_version", foletype_minor_version, 0);
     rb_define_method(cWIN32OLE_TYPE, "typekind", foletype_typekind, 0);
@@ -6218,7 +9223,13 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_TYPE, "helpfile", foletype_helpfile, 0);
     rb_define_method(cWIN32OLE_TYPE, "helpcontext", foletype_helpcontext, 0);
     rb_define_method(cWIN32OLE_TYPE, "variables", foletype_variables, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, -1);
+    rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, 0);
+    rb_define_method(cWIN32OLE_TYPE, "ole_typelib", foletype_ole_typelib, 0);
+    rb_define_method(cWIN32OLE_TYPE, "implemented_ole_types", foletype_impl_ole_types, 0);
+    rb_define_method(cWIN32OLE_TYPE, "source_ole_types", foletype_source_ole_types, 0);
+    rb_define_method(cWIN32OLE_TYPE, "default_event_sources", foletype_default_event_sources, 0);
+    rb_define_method(cWIN32OLE_TYPE, "default_ole_types", foletype_default_ole_types, 0);
+    rb_define_method(cWIN32OLE_TYPE, "inspect", foletype_inspect, 0);
 
     cWIN32OLE_VARIABLE = rb_define_class("WIN32OLE_VARIABLE", rb_cObject);
     rb_define_method(cWIN32OLE_VARIABLE, "name", folevariable_name, 0);
@@ -6228,12 +9239,12 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_VARIABLE, "visible?", folevariable_visible, 0);
     rb_define_method(cWIN32OLE_VARIABLE, "variable_kind", folevariable_variable_kind, 0);
     rb_define_method(cWIN32OLE_VARIABLE, "varkind", folevariable_varkind, 0);
+    rb_define_method(cWIN32OLE_VARIABLE, "inspect", folevariable_inspect, 0);
     rb_define_alias(cWIN32OLE_VARIABLE, "to_s", "name");
 
     cWIN32OLE_METHOD = rb_define_class("WIN32OLE_METHOD", rb_cObject);
     rb_define_alloc_func(cWIN32OLE_METHOD, folemethod_s_allocate);
     rb_define_method(cWIN32OLE_METHOD, "initialize", folemethod_initialize, 2);
-
     rb_define_method(cWIN32OLE_METHOD, "name", folemethod_name, 0);
     rb_define_method(cWIN32OLE_METHOD, "return_type", folemethod_return_type, 0);
     rb_define_method(cWIN32OLE_METHOD, "return_vtype", folemethod_return_vtype, 0);
@@ -6252,8 +9263,11 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_METHOD, "size_opt_params", folemethod_size_opt_params, 0);
     rb_define_method(cWIN32OLE_METHOD, "params", folemethod_params, 0);
     rb_define_alias(cWIN32OLE_METHOD, "to_s", "name");
+    rb_define_method(cWIN32OLE_METHOD, "inspect", folemethod_inspect, 0);
 
     cWIN32OLE_PARAM = rb_define_class("WIN32OLE_PARAM", rb_cObject);
+    rb_define_alloc_func(cWIN32OLE_PARAM, foleparam_s_allocate);
+    rb_define_method(cWIN32OLE_PARAM, "initialize", foleparam_initialize, 2);
     rb_define_method(cWIN32OLE_PARAM, "name", foleparam_name, 0);
     rb_define_method(cWIN32OLE_PARAM, "ole_type", foleparam_ole_type, 0);
     rb_define_method(cWIN32OLE_PARAM, "ole_type_detail", foleparam_ole_type_detail, 0);
@@ -6263,14 +9277,35 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_PARAM, "retval?", foleparam_retval, 0);
     rb_define_method(cWIN32OLE_PARAM, "default", foleparam_default, 0);
     rb_define_alias(cWIN32OLE_PARAM, "to_s", "name");
- 
-    cWIN32OLE_EVENT = rb_define_class("WIN32OLE_EVENT", rb_cObject);
+    rb_define_method(cWIN32OLE_PARAM, "inspect", foleparam_inspect, 0);
 
+    cWIN32OLE_EVENT = rb_define_class("WIN32OLE_EVENT", rb_cObject);
+    rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
     rb_define_alloc_func(cWIN32OLE_EVENT, fev_s_allocate);
     rb_define_method(cWIN32OLE_EVENT, "initialize", fev_initialize, -1);
-    rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
-
     rb_define_method(cWIN32OLE_EVENT, "on_event", fev_on_event, -1);
     rb_define_method(cWIN32OLE_EVENT, "on_event_with_outargs", fev_on_event_with_outargs, -1);
-    eWIN32OLE_RUNTIME_ERROR = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
+    rb_define_method(cWIN32OLE_EVENT, "off_event", fev_off_event, -1);
+    rb_define_method(cWIN32OLE_EVENT, "unadvise", fev_unadvise, 0);
+    rb_define_method(cWIN32OLE_EVENT, "handler=", fev_set_handler, 1);
+    rb_define_method(cWIN32OLE_EVENT, "handler", fev_get_handler, 0);
+
+    cWIN32OLE_VARIANT = rb_define_class("WIN32OLE_VARIANT", rb_cObject);
+    rb_define_alloc_func(cWIN32OLE_VARIANT, folevariant_s_allocate);
+    rb_define_singleton_method(cWIN32OLE_VARIANT, "array", folevariant_s_array, 2);
+    rb_define_method(cWIN32OLE_VARIANT, "initialize", folevariant_initialize, -2);
+    rb_define_method(cWIN32OLE_VARIANT, "value", folevariant_value, 0);
+    rb_define_method(cWIN32OLE_VARIANT, "value=", folevariant_set_value, 1);
+    rb_define_method(cWIN32OLE_VARIANT, "vartype", folevariant_vartype, 0);
+    rb_define_method(cWIN32OLE_VARIANT, "[]", folevariant_ary_aref, -1);
+    rb_define_method(cWIN32OLE_VARIANT, "[]=", folevariant_ary_aset, -1);
+    rb_define_const(cWIN32OLE_VARIANT, "Empty", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_EMPTY)));
+    rb_define_const(cWIN32OLE_VARIANT, "Null", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_NULL)));
+    rb_define_const(cWIN32OLE_VARIANT, "Nothing", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_DISPATCH)));
+
+    eWIN32OLERuntimeError = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
+
+    init_enc2cp();
+    atexit((void (*)(void))free_enc2cp);
+    ole_init_cp();
 }
diff --git a/ext/zlib/.cvsignore b/ext/zlib/.cvsignore
index 4088712231..814345ece8 100644
--- a/ext/zlib/.cvsignore
+++ b/ext/zlib/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mkmf.log
 *.def
+extconf.h
diff --git a/ext/zlib/doc/zlib.rd b/ext/zlib/doc/zlib.rd
deleted file mode 100644
index 6a36dc7fed..0000000000
--- a/ext/zlib/doc/zlib.rd
+++ /dev/null
@@ -1,911 +0,0 @@
-=begin
-#
-# zlib.rd.src
-#
-#   Copyright (C) UENO Katsuhiro 2000-2003
-#
-# $Id$
-#
-
-= Ruby/zlib version 0.6.0
-
-Ruby/zlib is an extension library to use zlib from Ruby.
-Ruby/zlib also provides the features for accessing gzipped files.
-
-You can modify or redistribute Ruby/zlib in the same manner of
-Ruby interpreter. The latest version of Ruby/zlib would be found
-at ((<URL:http://www.blue.sky.or.jp/>)).
-
-Any comments and suggestions are always welcome. Please send
-them to ruby-list ML, ruby-ext ML, ruby-talk ML, or the author's
-mail address ((<URL:mailto:katsu@blue.sky.or.jp>)).
-
-This document is experimental and broken English version.
-If you find some mistakes or strange expressions (including
-kidding or unnatural ones) in this document, please let me know
-for my study.
-
-* ((<Zlib>))
-
-  * ((<Zlib::Error>))
-  * ((<Zlib::ZStream>))
-  * ((<Zlib::Deflate>))
-  * ((<Zlib::Inflate>))
-  * ((<Zlib::GzipFile>))
-  * ((<Zlib::GzipFile::Error>))
-  * ((<Zlib::GzipWriter>))
-  * ((<Zlib::GzipReader>))
-
-* ((<Changes from 0.5 to 0.6>))
-* ((<Changes from 0.4 to 0.5>))
-
-== Zlib
-
-Zlib is the module which provides the other features in zlib C
-library. See zlib.h for detail of each module function.
-
-=== Module Functions:
-
---- Zlib.zlib_version
-
-    Returns the string which represents the version of zlib
-    library.
-
---- Zlib.adler32([string[, adler]])
-
-    Calculates Alder-32 checksum for ((|string|)),
-    and returns updated value of ((|alder|)).
-    If ((|string|)) is omitted, it returns the Adler-32 initial
-    value. If ((|alder|)) is omitted, it assumes that the initial
-    value is given to ((|alder|)).
-
---- Zlib.crc32([string[, crc]])
-
-    Calculates CRC checksum for ((|string|)), and returns
-    updated value of ((|crc|)). If ((|string|)) is omitted,
-    it returns the CRC initial value. ((|crc|)) is omitted,
-    it assumes that the initial value is given to ((|crc|)).
-
---- Zlib.crc_table
-
-    Returns the table for calculating CRC checksum as an array.
-
-=== Constants:
-
---- Zlib::VERSION
-
-    The Ruby/zlib version string.
-
---- Zlib::ZLIB_VERSION
-
-    The string which represents the version of zlib.h.
-
---- Zlib::BINARY
---- Zlib::ASCII
---- Zlib::UNKNOWN
-
-    The integers representing data types which
-    ((<Zlib::ZStream#data_type>)) method returns.
-
---- Zlib::NO_COMPRESSION
---- Zlib::BEST_SPEED
---- Zlib::BEST_COMPRESSION
---- Zlib::DEFAULT_COMPRESSION
-
-    The integers representing compression levels which are
-    an argument for ((<Zlib::Deflate.new>)),
-    ((<Zlib::Deflate#deflate>)), and so on.
-
---- Zlib::FILTERED
---- Zlib::HUFFMAN_ONLY
---- Zlib::DEFAULT_STRATEGY
-
-    The integers representing compression methods which are
-    an argument for ((<Zlib::Deflate.new>)) and
-    ((<Zlib::Deflate#params>)).
-
---- Zlib::DEF_MEM_LEVEL
---- Zlib::MAX_MEM_LEVEL
-
-    The integers representing memory levels which are an
-    argument for ((<Zlib::Deflate.new>)),
-    ((<Zlib::Deflate#params>)), and so on.
-
---- Zlib::MAX_WBITS
-
-    The default value of ((|windowBits|)) which is an argument for
-    ((<Zlib::Deflate.new>)) and ((<Zlib::Inflate.new>)).
-
---- Zlib::NO_FLUSH
---- Zlib::SYNC_FLUSH
---- Zlib::FULL_FLUSH
---- Zlib::FINISH
-
-    The integers to control the output of the deflate stream,
-    which are an argument for ((<Zlib::Deflate#deflate>)) and so on.
-
---- Zlib::OS_CODE
---- Zlib::OS_MSDOS
---- Zlib::OS_AMIGA
---- Zlib::OS_VMS
---- Zlib::OS_UNIX
---- Zlib::OS_VMCMS
---- Zlib::OS_ATARI
---- Zlib::OS_OS2
---- Zlib::OS_MACOS
---- Zlib::OS_ZSYSTEM
---- Zlib::OS_CPM
---- Zlib::OS_TOPS20
---- Zlib::OS_WIN32
---- Zlib::OS_QDOS
---- Zlib::OS_RISCOS
---- Zlib::OS_UNKNOWN
-
-    The return values of ((<Zlib::GzipFile#os_code>)) method.
-
-
-== Zlib::Error
-
-The superclass for all exceptions raised by Ruby/zlib.
-
-The following exceptions are defined as subclasses of Zlib::Error.
-These exceptions are raised when zlib library functions return
-with an error status.
-
-  * Zlib::StreamEnd
-  * Zlib::NeedDict
-  * Zlib::DataError
-  * Zlib::StreamError
-  * Zlib::MemError
-  * Zlib::BufError
-  * Zlib::VersionError
-
-=== SuperClass:
-
-* StandardError
-
-
-== Zlib::ZStream
-
-The abstract class for the stream which handles the compressed
-data. The operations are defined in the subclasses,
-((<Zlib::Deflate>)) for compression, and ((<Zlib::Inflate>))
-for decompression.
-
-An instance of Zlib::ZStream has one stream (struct zstream) and
-two variable-length buffers which associated to the input
-(next_in) of the stream and the output (next_out) of the stream.
-In this document, "input buffer" means the buffer for input, and
-"output buffer" means the buffer for output.
-
-Data inputed into an instance of Zlib::ZStream are temporally
-stored into the end of input buffer, and then data in input buffer
-are processed from the beginning of the buffer until no more
-output from the stream is produced (i.e. until avail_out > 0
-after processing). During processing, output buffer is allocated
-and expanded automatically to hold all output data.
-
-Some particular instance methods consume the data in output buffer
-and return them as a String.
-
-Here is an ascii art for describing above:
-
-     +================ an instance of Zlib::ZStream ================+
-     ||                                                            ||
-     ||     +--------+          +-------+          +--------+      ||
-     ||  +--| output |<---------|zstream|<---------| input  |<--+  ||
-     ||  |  | buffer |  next_out+-------+next_in   | buffer |   |  ||
-     ||  |  +--------+                             +--------+   |  ||
-     ||  |                                                      |  ||
-     +===|======================================================|===+
-         |                                                      |
-         v                                                      |
-     "output data"                                         "input data"
-
-If an error is occurred during processing input buffer,
-an exception which is a subclass of ((<Zlib::Error>)) is raised.
-At that time, both input and output buffer keeps their conditions
-at the time when the error is occurred.
-
-=== SuperClass:
-
-* Object
-
-=== Class Methods:
-
---- Zlib::ZStream.new
-
-    See ((<Zlib::Deflate.new>)) and ((<Zlib::Inflate.new>)).
-
-=== Methods:
-
---- Zlib::ZStream#avail_in
-
-    Returns bytes of data in input buffer.
-    Normally, returns 0.
-
---- Zlib::ZStream#avail_out
-
-    Returns bytes of free spaces in output buffer.
-    Because the free spaces are allocated automatically,
-    this method returns 0 normally.
-
---- Zlib::ZStream#avail_out = size
-
-    Allocates free spaces of ((|size|)) bytes in output buffer.
-    If there are more than ((|size|)) bytes spaces in the buffer,
-    the buffer is truncated.
-    Because the free spaces are allocated automatically,
-    you usually need not to use this method.
-
---- Zlib::ZStream#flush_next_in
-
-    Flushes input buffer and returns all data in that buffer.
-
---- Zlib::ZStream#flush_next_out
-
-    Flushes output buffer and returns all data in that buffer.
-
---- Zlib::ZStream#total_in
-
-    Returns the total bytes of the input data to the stream.
-
---- Zlib::ZStream#total_out
-
-    Returns the total bytes of the output data from the stream.
-
---- Zlib::ZStream#data_type
-
-    Guesses the type of the data which have been inputed into
-    the stream. The returned value is either ((<Zlib::BINARY>)),
-    ((<Zlib::ASCII>)), or ((<Zlib::UNKNOWN>)).
-
---- Zlib::ZStream#adler
-
-    Returns the alder-32 checksum.
-
---- Zlib::ZStream#reset
-
-    Resets and initializes the stream. All data in both
-    input and output buffer are discarded.
-
---- Zlib::ZStream#finish
-
-    Finishes the stream and flushes output buffer.
-    See ((<Zlib::Deflate#finish>)) and ((<Zlib::Inflate#finish>))
-    for detail of the behavior.
-
---- Zlib::ZStream#finished?
---- Zlib::ZStream#stream_end?
-
-    Returns true if the stream is finished.
-
---- Zlib::ZStream#close
---- Zlib::ZStream#end
-
-    Closes the stream. All operations on the closed stream
-    will raise an exception.
-
---- Zlib::ZStream#closed?
---- Zlib::ZStream#ended?
-
-    Returns true if the stream closed.
-
-
-== Zlib::Deflate
-
-The class for compressing string data.
-
-=== SuperClass:
-
-* ((<Zlib::ZStream>))
-
-=== Class Methods:
-
---- Zlib::Deflate.deflate(string[, level])
-
-    Compresses ((|string|)). The avail values of ((|level|)) are
-    ((<Zlib::NO_COMPRESSION>)), ((<Zlib::BEST_SPEED>)),
-    ((<Zlib::BEST_COMPRESSION>)), ((<Zlib::DEFAULT_COMPRESSION>)),
-    and the integer from 0 to 9.
-
-    This method is almost equivalent to the following code:
-
-      def deflate(string, level)
-        z = Zlib::Deflate.new(level)
-        dst = z.deflate(string, Zlib::FINISH)
-        z.close
-        dst
-      end
-
---- Zlib::Deflate.new([level[, windowBits[, memlevel[, strategy]]]])
-
-    Creates a new deflate stream for compression.
-    See zlib.h for details of each argument.
-    If an argument is nil, the default value of that
-    argument is used.
-
-=== Methods:
-
---- Zlib::Deflate#clone
-
-    Duplicates the deflate stream.
-
---- Zlib::Deflate#deflate(string[, flush])
-
-    Inputs ((|string|)) into the deflate stream and returns
-    the output from the stream. Calling this method,
-    both input and output buffer of the stream are flushed.
-    If ((|string|)) is nil, this method finishes the stream,
-    just like ((<Zlib::ZStream#finish>)).
-    The value of ((|flush|)) should be either ((<Zlib::NO_FLUSH>)),
-    ((<Zlib::SYNC_FLUSH>)), ((<Zlib::FULL_FLUSH>)), or
-    ((<Zlib::FINISH>)).
-    See zlib.h for details.
-
---- Zlib::Deflate#<< string
-
-    Inputs ((|string|)) into the deflate stream just like
-    ((<Zlib::Deflate#deflate>)), but returns Zlib::Deflate object
-    itself. The output from the stream is preserved in output
-    buffer.
-
---- Zlib::Deflate#flush([flush])
-
-    This method is equivalent to (({deflate('', ((|flush|)))})).
-    If ((|flush|)) is omitted, ((<Zlib::SYNC_FLUSH>)) is used
-    as ((|flush|)). This method is just provided for
-    readability of your Ruby script.
-
---- Zlib::Deflate#finish
-
-    Finishes the stream. This method is equivalent to
-    (({deflate('', Zlib::FINISH)})).
-
---- Zlib::Deflate#params(level, strategy)
-
-    Changes the parameters of the deflate stream.
-    See zlib.h for details. The output from the stream
-    by changing the params is preserved in output buffer.
-
---- Zlib::Deflate#set_dictionary(string)
-
-    Sets the preset dictionary and returns ((|string|)).
-    This method is available just only after
-    ((<Zlib::Deflate.new>)) or ((<Zlib::ZStream#reset>)) method
-    was called. See zlib.h for details.
-
-
-== Zlib::Inflate
-
-The class for decompressing compressed data.
-Unlike ((<Zlib::Deflate>)), an instance of this class is not able
-to duplicate (clone, dup) itself.
-
-=== SuperClass:
-
-* ((<Zlib::ZStream>))
-
-=== Class Methods:
-
---- Zlib::Inflate.inflate(string)
-
-    Decompresses ((|string|)). Raises a ((<Zlib::NeedDict>))
-    exception if a preset dictionary is needed for decompression.
-
-    This method is almost equivalent to the following code:
-
-      def inflate(string)
-        zstream = Zlib::Inflate.new
-        buf = zstream.inflate(string)
-        zstream.finish
-        zstream.close
-        buf
-      end
-
---- Zlib::Inflate.new([windowBits])
-
-    Creates a new inflate stream for decompression.
-    See zlib.h for details of the argument.
-    If ((|windowBits|)) is nil, the default value is used.
-
-=== Methods:
-
---- Zlib::Inflate#inflate(string)
-
-    Inputs ((|string|)) into the inflate stream and returns
-    the output from the stream. Calling this method,
-    both input and output buffer of the stream are flushed.
-    If ((|string|)) is nil, this method finishes the stream,
-    just like ((<Zlib::ZStream#finish>)).
-
-    Raises a ((<Zlib::NeedDict>)) exception if a preset
-    dictionary is needed to decompress. Set the dictionary
-    by ((<Zlib::Inflate#set_dictionary>)) and then call
-    this method again with an empty string.
-
---- Zlib::Inflate#<< string
-
-    Inputs ((|string|)) into the inflate stream just like
-    ((<Zlib::Inflate#inflate>)), but returns Zlib::Inflate object
-    itself. The output from the stream is preserved in output
-    buffer.
-
---- Zlib::Inflate#finish
-
-    Finishes the inflate stream and returns the garbage
-    following the compressed data. Raises an exception
-    if the stream is not finished
-    (i.e. ((<Zlib::ZStream#finished?>)) doesn't returns true).
-
-    The inflate stream finishes itself as soon as it meets
-    the end code of the compressed data, you need not to call
-    this method explicitly. However, this method is useful
-    for checking whether the data is correctly ended or not.
-
---- Zlib::Inflate#set_dictionary(string)
-
-    Sets the preset dictionary and returns ((|string|))
-    This method is available just only after a ((<Zlib::NeedDict>))
-    exception was raised. See zlib.h for details.
-
---- Zlib::Inflate#sync(string)
-
-    Inputs ((|string|)) into the end of input buffer and
-    skips data until a full flush point can be found.
-    If the point is found in the buffer, this method flushes
-    the buffer and returns false. Otherwise it returns true
-    and the following data of full flush point is preserved
-    in the buffer.
-
---- Zlib::Inflate#sync_point?
-
-    What is this?
-
-
-== Zlib::GzipFile
-
-The abstract class for handling a gzip formatted compressed file.
-The operations are defined in the subclasses,
-((<Zlib::GzipReader>)) for reading, and ((<Zlib::GzipWriter>))
-for writing.
-
-GzipReader should be used with associating an instance of IO class
-(or an object which has the same methods as IO has).
-
-=== SuperClass:
-
-* Object
-
-=== Class Methods:
-
---- Zlib::GzipFile.new(args...)
-
-    See ((<Zlib::GzipReader.new>)) and ((<Zlib::GzipWriter.new>)).
-
---- Zlib::GzipFile.wrap(args...) {|gz| ... }
-
-    See ((<Zlib::GzipReader.wrap>)) and ((<Zlib::GzipWriter.wrap>)).
-
---- Zlib::GzipFile.open(args...) {|gz| ... }
-
-    See ((<Zlib::GzipReader.open>)) and ((<Zlib::GzipWriter.open>)).
-
-=== Methods:
-
---- Zlib::GzipFile#closed?
---- Zlib::GzipFile#to_io
-
-    Same as IO.
-
---- Zlib::GzipFile#close
-
-    Closes the GzipFile object. This method calls close method
-    of the associated IO object. Returns the associated IO object.
-
---- Zlib::GzipFile#finish
-
-    Closes the GzipFile object. Unlike ((<Zlib::GzipFile#close>)),
-    this method ((*never*)) calls close method of the associated IO
-    object. Returns the associated IO object.
-
---- Zlib::GzipFile#crc
-
-    Returns CRC value of the uncompressed data.
-
---- Zlib::GzipFile#level
-
-    Returns compression level.
-
---- Zlib::GzipFile#mtime
-
-    Returns last modification time recorded in the gzip
-    file header.
-
---- Zlib::GzipFile#os_code
-
-    Returns OS code number recorded in the gzip file header.
-
---- Zlib::GzipFile#orig_name
-
-    Returns original filename recorded in the gzip file header,
-    or nil if original filename is not present.
-
---- Zlib::GzipFile#comment
-
-    Returns comments recorded in the gzip file header, or
-    nil if the comments is not present.
-
---- Zlib::GzipFile#sync
---- Zlib::GzipFile#sync= flag
-
-    Same as IO. If ((|flag|)) is true, the associated IO object
-    must respond to flush method. While `sync' mode is true,
-    the compression ratio decreases sharply.
-
-
-== Zlib::GzipFile::Error
-
-The superclass for all exceptions raised during processing a gzip
-file.
-
-The following exceptions are defined as subclasses of
-Zlib::GzipFile::Error.
-
-: Zlib::GzipFile::NoFooter
-
-    Raised when gzip file footer has not found.
-
-: Zlib::GzipFile::CRCError
-
-    Raised when the CRC checksum recorded in gzip file footer
-    is not equivalent to CRC checksum of the actually
-    uncompressed data.
-
-: Zlib::GzipFile::LengthError
-
-    Raised when the data length recorded in gzip file footer
-    is not equivalent to length of the actually uncompressed data.
-
-=== SuperClass:
-
-* ((<Zlib::Error>))
-
-
-== Zlib::GzipReader
-
-The class for reading a gzipped file. GzipReader should be used
-with associating an instance of IO class (or an object which has
-the same methods as IO has).
-
-    Zlib::GzipReader.open('hoge.gz') {|gz|
-      print gz.read
-    }
-
-    f = File.open('hoge.gz')
-    gz = Zlib::GzipReader.new(f)
-    print gz.read
-    gz.close
-
-=== SuperClass:
-
-* ((<Zlib::GzipFile>))
-
-=== Included Modules:
-
-* Enumerable
-
-=== Class Methods:
-
---- Zlib::GzipReader.new(io)
-
-    Creates a GzipReader object associated with ((|io|)).
-    The GzipReader object reads gzipped data from ((|io|)),
-    and parses/decompresses them. At least, ((|io|)) must have
-    read method that behaves same as read method in IO class.
-
-    If the gzip file header is incorrect, raises an
-    ((<Zlib::GzipFile::Error>)) exception.
-
---- Zlib::GzipReader.wrap(io) {|gz| ... }
-
-    Creates a GzipReader object associated with ((|io|)), and
-    executes the block with the newly created GzipReader object,
-    just like File::open. The GzipReader object will be closed
-    automatically after executing the block. If you want to keep
-    the associated IO object opening, you may call
-    ((<Zlib::GzipFile#finish>)) method in the block.
-
---- Zlib::GzipReader.open(filename)
---- Zlib::GzipReader.open(filename) {|gz| ... }
-
-    Opens a file specified by ((|filename|)) as a gzipped file,
-    and returns a GzipReader object associated with that file.
-    Further details of this method are same as
-    ((<Zlib::GzipReader.new>)) and ((<ZLib::GzipReader.wrap>)).
-
-=== �᥽�å�:
-
---- Zlib::GzipReader#eof
---- Zlib::GzipReader#eof?
-
-    Returns true if the object reaches the end of compressed data.
-    Note that eof? does ((*not*)) return true when reaches the
-    end of ((*file*)).
-
---- Zlib::GzipReader#pos
---- Zlib::GzipReader#tell
-
-    Returns the total bytes of data decompressed until now.
-    Not that it does ((*not*)) the position of file pointer.
-
---- Zlib::GzipReader#each([rs])
---- Zlib::GzipReader#each_line([rs])
---- Zlib::GzipReader#each_byte([rs])
---- Zlib::GzipReader#gets([rs])
---- Zlib::GzipReader#getc
---- Zlib::GzipReader#lineno
---- Zlib::GzipReader#lineno=
---- Zlib::GzipReader#read([length])
---- Zlib::GzipReader#readchar
---- Zlib::GzipReader#readline([rs])
---- Zlib::GzipReader#readlines([rs])
---- Zlib::GzipReader#ungetc(char)
-
-    Same as IO, but raises ((<Zlib::Error>)) or
-    ((<Zlib::GzipFile::Error>)) exception if an error was found
-    in the gzip file.
-
-    Be careful of the footer of gzip file. A gzip file has
-    the checksum of pre-compressed data in its footer.
-    GzipReader checks all uncompressed data against that checksum
-    at the following cases, and if failed, raises
-    ((<Zlib::GzipFile::NoFooter>)), ((<Zlib::GzipFile::CRCError>)),
-    or ((<Zlib::GzipFile::LengthError>)) exception.
-
-    * When an reading request is received beyond the end of file
-      (the end of compressed data).
-      That is, when ((<Zlib::GzipReader#read>)),
-      ((<Zlib::GzipReader#gets>)), or some other methods for reading
-      returns nil.
-
-    * When ((<Zlib::GzipFile#close>)) method is called after
-      the object reaches the end of file.
-
-    * When ((<Zlib::GzipReader#unused>)) method is called after
-      the object reaches the end of file.
-
---- Zlib::GzipReader#rewind
-
-    Resets the position of the file pointer to the point
-    created the GzipReader object.
-    The associated IO object need to respond to seek method.
-
---- Zlib::GzipReader#unused
-
-    Returns the rest of the data which had read for parsing gzip
-    format, or nil if the whole gzip file is not parsed yet.
-
-
-== Zlib::GzipWriter
-
-The class for writing a gzipped file. GzipWriter should be used
-with associate with an instance of IO class (or an object which
-has the same methods as IO has).
-
-    Zlib::GzipWriter.open('hoge.gz') {|gz|
-      gz.write 'jugemu jugemu gokou no surikire...'
-    }
-
-    f = File.open('hoge.gz', 'w')
-    gz = Zlib::GzipWriter.new(f)
-    gz.write 'jugemu jugemu gokou no surikire...'
-    gz.close
-
-NOTE: Due to the limitation in finalizer of Ruby, you must close
-explicitly GzipWriter object by ((<Zlib::GzipWriter#close>)) etc.
-Otherwise, GzipWriter should be not able to write gzip footer and
-generate broken gzip file.
-
-=== SuperClass:
-
-* ((<Zlib::GzipFile>))
-
-=== Class Methods:
-
---- Zlib::GzipWriter.new(io[, level[, strategy]])
-
-    Creates a GzipWriter object associated with ((|io|)).
-    ((|level|)) and ((|strategy|)) should be same as the
-    arguments of ((<Zlib::Deflate.new>)). The GzipWriter object
-    writes gzipped data to ((|io|)). At least, ((|io|)) must
-    respond to write method that behaves same as write method
-    in IO class.
-
---- Zlib::GzipWriter.wrap(io[, level[, strategy]]) {|gz| ... }
-
-    Creates a GzipWriter object associated with ((|io|)), and
-    executes the block with the newly created GzipWriter object,
-    just like File::open. The GzipWriter object will be closed
-    automatically after executing the block. If you want to keep
-    the associated IO object opening, you may call
-    ((<Zlib::GzipFile#finish>)) method in the block.
-
---- Zlib::GzipWriter.open(filename[, level[, strategy]])
---- Zlib::GzipWriter.open(filename[, level[, strategy]]) {|gz| ... }
-
-    Opens a file specified by ((|filename|)) for writing
-    gzip compressed data, and returns a GzipWriter object
-    associated with that file. Further details of this method
-    are same as ((<Zlib::GzipWriter.new>)) and
-    ((<Zlib::GzipWriter#wrap>)).
-
-
-=== Methods:
-
---- Zlib::GzipWriter#close
---- Zlib::GzipWriter#finish
-
-    Closes the GzipFile object. This method calls close method
-    of the associated IO object. Returns the associated IO object.
-    See ((<Zlib::GzipFile#close>)) and ((<Zlib::GzipFile#finish>))
-    for the difference between close and finish.
-
-    ((*NOTE: Due to the limitation in finalizer of Ruby, you must
-    close GzipWriter object explicitly. Otherwise, GzipWriter
-    should be not able to write gzip footer and generate broken
-    gzip file.*))
-
---- Zlib::GzipWriter#pos
---- Zlib::GzipWriter#tell
-
-    Returns the total bytes of data compressed until now.
-    Note that it does ((*not*)) the position of file pointer.
-
---- Zlib::GzipWriter#<< str
---- Zlib::GzipWriter#putc(ch)
---- Zlib::GzipWriter#puts(obj...)
---- Zlib::GzipWriter#print(arg...)
---- Zlib::GzipWriter#printf(format, arg...)
---- Zlib::GzipWriter#write(str)
-
-    Same as IO.
-
---- Zlib::GzipWriter#flush([flush])
-
-    Flushes all the internal buffers of the GzipWriter object.
-    The meaning of ((|flush|)) is same as one of the argument of
-    ((<Zlib::Deflate#deflate>)).
-    ((<Zlib::SYNC_FLUSH>)) is used if ((|flush|)) is omitted.
-    It is no use giving ((|flush|)) ((<Zlib::NO_FLUSH>)).
-
---- Zlib::GzipWriter#mtime= time
-
-    Sets last modification time to be stored in the gzip file
-    header. ((<Zlib::GzipFile::Error>)) exception will be raised
-    if this method is called after writing method (like
-    ((<Zlib::GzipWriter#write>))) was called.
-
---- Zlib::GzipWriter#orig_name= filename
-
-    Sets original filename to be stored in the gzip file header.
-    ((<Zlib::GzipFile::Error>)) exception will be raised
-    if this method is called after writing method (like
-    ((<Zlib::GzipWriter#write>))) was called.
-
---- Zlib::GzipWriter#comment= string
-
-    Sets comments to be stored in the gzip file header.
-    ((<Zlib::GzipFile::Error>)) exception will be raised
-    if this method is called after writing method (like
-    ((<Zlib::GzipWriter#write>))) was called.
-
-
-== Changes from 0.5 to 0.6
-
-* New methods:
-
-  * ((<Zlib::GzipFile.wrap>))
-  * ((<Zlib::GzipFile#finish>))
-
-* New constants:
-
-  * ((<Zlib::ZLIB_VERSION>))
-  * ((<Zlib::OS_VMCMS>))
-  * ((<Zlib::OS_ZSYSTEM>))
-  * ((<Zlib::OS_CPM>))
-  * ((<Zlib::OS_QDOS>))
-  * ((<Zlib::OS_RISCOS>))
-  * ((<Zlib::OS_UNKNOWN>))
-
-* Changed methods:
-
-  * ((<Zlib::GzipFile.new>)) now takes no block. Use
-    ((<Zlib::GzipFile.wrap>)) instead.
-
-  * ((<Zlib::GzipFile#close>)) now takes no argument. Use
-    ((<Zlib::GzipFile#finish>)) instead.
-
-* Renamed methods:
-
-  * Zlib.version is renamed to ((<Zlib.zlib_version>)).
-
-* Changed constants:
-
-  * ((<Zlib::VERSION>)) indicates the version of Ruby/zlib.
-    The zlib.h version is now in ((<Zlib::ZLIB_VERSION>)).
-
-* Backward compatibility:
-
-  * For backward compatibility for 0.5, the obsoleted methods and
-    arguments are still available.
-
-  * Obsoleted classes, methods, and constants for backward
-    compatibility for 0.4 or earlier are removed.
-
-== Changes from 0.4 to 0.5
-
-Almost all the code are rewritten.
-I hope all changes are enumerated below :-)
-
-* The names of almost classes and some methods are changed.
-  All classes and constants are now defined under module
-  ((<Zlib>)). The obsoleted names are also available for backward
-  compatibility.
-
-  * Classes
-
-    * Deflate -> ((<Zlib::Deflate>))
-    * Inflate -> ((<Zlib::Inflate>))
-    * Zlib::Gzip -> ((<Zlib::GzipFile>))
-    * GzipReader -> ((<Zlib::GzipReader>))
-    * GzipWriter -> ((<Zlib::GzipWriter>))
-    * Zlib::Gzip::Error -> ((<Zlib::GzipFile::Error>))
-    * Zlib::GzipReader::NoFooter -> ((<Zlib::GzipFile::NoFooter>))
-    * Zlib::GzipReader::CRCError -> ((<Zlib::GzipFile::CRCError>))
-    * Zlib::GzipReader::LengthError -> ((<Zlib::GzipFile::LengthError>))
-
-  * Constants
-
-    * Zlib::ZStream::BINARY -> ((<Zlib::BINARY>))
-    * Zlib::ZStream::ASCII -> ((<Zlib::ASCII>))
-    * Zlib::ZStream::UNKNOWN -> ((<Zlib::UNKNOWN>))
-    * Zlib::Deflate::NO_COMPRESSION -> ((<Zlib::NO_COMPRESSION>))
-    * Zlib::Deflate::BEST_SPEED -> ((<Zlib::BEST_SPEED>))
-    * Zlib::Deflate::BEST_COMPRESSION -> ((<Zlib::BEST_COMPRESSION>))
-    * Zlib::Deflate::DEFAULT_COMPRESSION -> ((<Zlib::DEFAULT_COMPRESSION>))
-    * Zlib::Deflate::FILTERED -> ((<Zlib::FILTERED>))
-    * Zlib::Deflate::HUFFMAN_ONLY -> ((<Zlib::HUFFMAN_ONLY>))
-    * Zlib::Deflate::DEFAULT_STRATEGY -> ((<Zlib::DEFAULT_STRATEGY>))
-    * Zlib::Deflate::MAX_WBITS -> ((<Zlib::MAX_WBITS>))
-    * Zlib::Deflate::DEF_MEM_LEVEL -> ((<Zlib::DEF_MEM_LEVEL>))
-    * Zlib::Deflate::MAX_MEM_LEVEL -> ((<Zlib::MAX_MEM_LEVEL>))
-    * Zlib::Deflate::NO_FLUSH -> ((<Zlib::NO_FLUSH>))
-    * Zlib::Deflate::SYNC_FLUSH -> ((<Zlib::SYNC_FLUSH>))
-    * Zlib::Deflate::FULL_FLUSH -> ((<Zlib::FULL_FLUSH>))
-    * Zlib::Inflate::MAX_WBITS -> ((<Zlib::MAX_WBITS>))
-    * Zlib::GzipReader::OS_* -> ((<Zlib::OS_*|Zlib::OS_CODE>))
-
-  * Methods
-
-    * Zlib::ZStream#flush_out -> ((<Zlib::ZStream#flush_next_out>))
-
-* Made buffer for input (next_in).
-
-* ((<Zlib::GzipReader#unused>)) returns nil after closing.
-
-* Now you are up to call ((<Zlib::GzipWriter#close>)) explicitly
-to avoid segv in finalizer.
-((<[ruby-dev:11915]|URL:http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-dev/11915>))
-
-* divided initialize from new.
-
-* remove sanity checks for arguments for deflateInit2 and
-  inflateInit2.
-
-* adapted the behavior of ((<Zlib::GzipWriter#puts>)) to Ruby-1.7.
-
-* Made all functions static.
-
-
-=end
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index b4e76af3c6..499f55a046 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -10,7 +10,7 @@ require 'rbconfig'
 dir_config 'zlib'
 
 
-if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
+if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
 
   defines = []
@@ -22,7 +22,7 @@ if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
       os_code = 'AMIGA'
     when /\Aos2[\-_]emx\z/ then
       os_code = 'OS2'
-    when 'mswin32', 'mingw32', 'bccwin32' then
+    when /mswin|mingw|bccwin/ then
       # NOTE: cygwin should be regarded as Unix.
       os_code = 'WIN32'
     else
@@ -56,6 +56,9 @@ if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
 
   $defs.concat(defines.collect{|d|' -D'+d})
 
+  have_func('crc32_combine', 'zlib.h')
+  have_func('adler32_combine', 'zlib.h')
+
   create_makefile('zlib')
 
 end
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 8caadaeddc..1195e6630f 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -9,6 +9,20 @@
 #include <ruby.h>
 #include <zlib.h>
 #include <time.h>
+#include <ruby/encoding.h>
+
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+# include <valgrind/memcheck.h>
+# ifndef VALGRIND_MAKE_MEM_DEFINED
+#  define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE(p, n)
+# endif
+# ifndef VALGRIND_MAKE_MEM_UNDEFINED
+#  define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE(p, n)
+# endif
+#else
+# define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
+# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) /* empty */
+#endif
 
 #define RUBY_ZLIB_VERSION  "0.6.0"
 
@@ -31,163 +45,170 @@
 
 /*--------- Prototypes --------*/
 
-static NORETURN(void raise_zlib_error _((int, const char *)));
-static VALUE rb_zlib_version _((VALUE));
-static VALUE do_checksum _((int, VALUE*, uLong (*) _((uLong, const Bytef*, uInt))));
-static VALUE rb_zlib_adler32 _((int, VALUE*, VALUE));
-static VALUE rb_zlib_crc32 _((int, VALUE*, VALUE));
-static VALUE rb_zlib_crc_table _((VALUE));
-static voidpf zlib_mem_alloc _((voidpf, uInt, uInt));
-static void zlib_mem_free _((voidpf, voidpf));
-static void finalizer_warn _((const char*));
+static NORETURN(void raise_zlib_error(int, const char*));
+static VALUE rb_zlib_version(VALUE);
+static VALUE do_checksum(int, VALUE*, uLong (*)(uLong, const Bytef*, uInt));
+static VALUE rb_zlib_adler32(int, VALUE*, VALUE);
+static VALUE rb_zlib_crc32(int, VALUE*, VALUE);
+static VALUE rb_zlib_crc_table(VALUE);
+static voidpf zlib_mem_alloc(voidpf, uInt, uInt);
+static void zlib_mem_free(voidpf, voidpf);
+static void finalizer_warn(const char*);
 
 struct zstream;
 struct zstream_funcs;
-static void zstream_init _((struct zstream*, const struct zstream_funcs *));
-static void zstream_expand_buffer _((struct zstream*));
-static void zstream_expand_buffer_into _((struct zstream*, int));
-static void zstream_append_buffer _((struct zstream*, const char*, int));
-static VALUE zstream_detach_buffer _((struct zstream*));
-static VALUE zstream_shift_buffer _((struct zstream*, int));
-static void zstream_buffer_ungetc _((struct zstream*, int));
-static void zstream_append_input _((struct zstream*, const char*, unsigned int));
-static void zstream_discard_input _((struct zstream*, unsigned int));
-static void zstream_reset_input _((struct zstream*));
-static void zstream_passthrough_input _((struct zstream*));
-static VALUE zstream_detach_input _((struct zstream*));
-static void zstream_reset _((struct zstream*));
-static VALUE zstream_end _((struct zstream*));
-static void zstream_run _((struct zstream*, Bytef*, uInt, int));
-static VALUE zstream_sync _((struct zstream*, Bytef*, uInt));
-static void zstream_mark _((struct zstream*));
-static void zstream_free _((struct zstream*));
-static VALUE zstream_new _((VALUE, const struct zstream_funcs*));
-static struct zstream *get_zstream _((VALUE));
-static void zstream_finalize _((struct zstream*));
-
-static VALUE rb_zstream_end _((VALUE));
-static VALUE rb_zstream_reset _((VALUE));
-static VALUE rb_zstream_finish _((VALUE));
-static VALUE rb_zstream_flush_next_in _((VALUE));
-static VALUE rb_zstream_flush_next_out _((VALUE));
-static VALUE rb_zstream_avail_out _((VALUE));
-static VALUE rb_zstream_set_avail_out _((VALUE, VALUE));
-static VALUE rb_zstream_avail_in _((VALUE));
-static VALUE rb_zstream_total_in _((VALUE));
-static VALUE rb_zstream_total_out _((VALUE));
-static VALUE rb_zstream_data_type _((VALUE));
-static VALUE rb_zstream_adler _((VALUE));
-static VALUE rb_zstream_finished_p _((VALUE));
-static VALUE rb_zstream_closed_p _((VALUE));
-
-static VALUE rb_deflate_s_allocate _((VALUE));
-static VALUE rb_deflate_initialize _((int, VALUE*, VALUE));
-static VALUE rb_deflate_init_copy _((VALUE, VALUE));
-static VALUE deflate_run _((VALUE));
-static VALUE rb_deflate_s_deflate _((int, VALUE*, VALUE));
-static void do_deflate _((struct zstream*, VALUE, int));
-static VALUE rb_deflate_deflate _((int, VALUE*, VALUE));
-static VALUE rb_deflate_addstr _((VALUE, VALUE));
-static VALUE rb_deflate_flush _((int, VALUE*, VALUE));
-static VALUE rb_deflate_params _((VALUE, VALUE, VALUE));
-static VALUE rb_deflate_set_dictionary _((VALUE, VALUE));
-
-static VALUE inflate_run _((VALUE));
-static VALUE rb_inflate_s_allocate _((VALUE));
-static VALUE rb_inflate_initialize _((int, VALUE*, VALUE));
-static VALUE rb_inflate_s_inflate _((VALUE, VALUE));
-static void do_inflate _((struct zstream*, VALUE));
-static VALUE rb_inflate_inflate _((VALUE, VALUE));
-static VALUE rb_inflate_addstr _((VALUE, VALUE));
-static VALUE rb_inflate_sync _((VALUE, VALUE));
-static VALUE rb_inflate_sync_point_p _((VALUE));
-static VALUE rb_inflate_set_dictionary _((VALUE, VALUE));
+static void zstream_init(struct zstream*, const struct zstream_funcs*);
+static void zstream_expand_buffer(struct zstream*);
+static void zstream_expand_buffer_into(struct zstream*, unsigned int);
+static void zstream_append_buffer(struct zstream*, const Bytef*, int);
+static VALUE zstream_detach_buffer(struct zstream*);
+static VALUE zstream_shift_buffer(struct zstream*, int);
+static void zstream_buffer_ungets(struct zstream*, const Bytef*, int);
+static void zstream_buffer_ungetbyte(struct zstream*, int);
+static void zstream_append_input(struct zstream*, const Bytef*, unsigned int);
+static void zstream_discard_input(struct zstream*, unsigned int);
+static void zstream_reset_input(struct zstream*);
+static void zstream_passthrough_input(struct zstream*);
+static VALUE zstream_detach_input(struct zstream*);
+static void zstream_reset(struct zstream*);
+static VALUE zstream_end(struct zstream*);
+static void zstream_run(struct zstream*, Bytef*, uInt, int);
+static VALUE zstream_sync(struct zstream*, Bytef*, uInt);
+static void zstream_mark(struct zstream*);
+static void zstream_free(struct zstream*);
+static VALUE zstream_new(VALUE, const struct zstream_funcs*);
+static struct zstream *get_zstream(VALUE);
+static void zstream_finalize(struct zstream*);
+
+static VALUE rb_zstream_end(VALUE);
+static VALUE rb_zstream_reset(VALUE);
+static VALUE rb_zstream_finish(VALUE);
+static VALUE rb_zstream_flush_next_in(VALUE);
+static VALUE rb_zstream_flush_next_out(VALUE);
+static VALUE rb_zstream_avail_out(VALUE);
+static VALUE rb_zstream_set_avail_out(VALUE, VALUE);
+static VALUE rb_zstream_avail_in(VALUE);
+static VALUE rb_zstream_total_in(VALUE);
+static VALUE rb_zstream_total_out(VALUE);
+static VALUE rb_zstream_data_type(VALUE);
+static VALUE rb_zstream_adler(VALUE);
+static VALUE rb_zstream_finished_p(VALUE);
+static VALUE rb_zstream_closed_p(VALUE);
+
+static VALUE rb_deflate_s_allocate(VALUE);
+static VALUE rb_deflate_initialize(int, VALUE*, VALUE);
+static VALUE rb_deflate_init_copy(VALUE, VALUE);
+static VALUE deflate_run(VALUE);
+static VALUE rb_deflate_s_deflate(int, VALUE*, VALUE);
+static void do_deflate(struct zstream*, VALUE, int);
+static VALUE rb_deflate_deflate(int, VALUE*, VALUE);
+static VALUE rb_deflate_addstr(VALUE, VALUE);
+static VALUE rb_deflate_flush(int, VALUE*, VALUE);
+static VALUE rb_deflate_params(VALUE, VALUE, VALUE);
+static VALUE rb_deflate_set_dictionary(VALUE, VALUE);
+
+static VALUE inflate_run(VALUE);
+static VALUE rb_inflate_s_allocate(VALUE);
+static VALUE rb_inflate_initialize(int, VALUE*, VALUE);
+static VALUE rb_inflate_s_inflate(VALUE, VALUE);
+static void do_inflate(struct zstream*, VALUE);
+static VALUE rb_inflate_inflate(VALUE, VALUE);
+static VALUE rb_inflate_addstr(VALUE, VALUE);
+static VALUE rb_inflate_sync(VALUE, VALUE);
+static VALUE rb_inflate_sync_point_p(VALUE);
+static VALUE rb_inflate_set_dictionary(VALUE, VALUE);
 
 #if GZIP_SUPPORT
 struct gzfile;
-static void gzfile_mark _((struct gzfile*));
-static void gzfile_free _((struct gzfile*));
-static VALUE gzfile_new _((VALUE, const struct zstream_funcs*, void (*) _((struct gzfile*))));
-static void gzfile_reset _((struct gzfile*));
-static void gzfile_close _((struct gzfile*, int));
-static void gzfile_write_raw _((struct gzfile*));
-static VALUE gzfile_read_raw _((struct gzfile*));
-static int gzfile_read_raw_ensure _((struct gzfile*, int));
-static char *gzfile_read_raw_until_zero _((struct gzfile*, long));
-static unsigned int gzfile_get16 _((const unsigned char*));
-static unsigned long gzfile_get32 _((const unsigned char*));
-static void gzfile_set32 _((unsigned long n, unsigned char*));
-static void gzfile_make_header _((struct gzfile*));
-static void gzfile_make_footer _((struct gzfile*));
-static void gzfile_read_header _((struct gzfile*));
-static void gzfile_check_footer _((struct gzfile*));
-static void gzfile_write _((struct gzfile*, Bytef*, uInt));
-static long gzfile_read_more _((struct gzfile*));
-static void gzfile_calc_crc _((struct gzfile*, VALUE));
-static VALUE gzfile_read _((struct gzfile*, int));
-static VALUE gzfile_read_all _((struct gzfile*));
-static void gzfile_ungetc _((struct gzfile*, int));
-static VALUE gzfile_writer_end_run _((VALUE));
-static void gzfile_writer_end _((struct gzfile*));
-static VALUE gzfile_reader_end_run _((VALUE));
-static void gzfile_reader_end _((struct gzfile*));
-static void gzfile_reader_rewind _((struct gzfile*));
-static VALUE gzfile_reader_get_unused _((struct gzfile*));
-static struct gzfile *get_gzfile _((VALUE));
-static VALUE gzfile_ensure_close _((VALUE));
-static VALUE rb_gzfile_s_wrap _((int, VALUE*, VALUE));
-static VALUE gzfile_s_open _((int, VALUE*, VALUE, const char*));
-
-static VALUE rb_gzfile_to_io _((VALUE));
-static VALUE rb_gzfile_crc _((VALUE));
-static VALUE rb_gzfile_mtime _((VALUE));
-static VALUE rb_gzfile_level _((VALUE));
-static VALUE rb_gzfile_os_code _((VALUE));
-static VALUE rb_gzfile_orig_name _((VALUE));
-static VALUE rb_gzfile_comment _((VALUE));
-static VALUE rb_gzfile_lineno _((VALUE));
-static VALUE rb_gzfile_set_lineno _((VALUE, VALUE));
-static VALUE rb_gzfile_set_mtime _((VALUE, VALUE));
-static VALUE rb_gzfile_set_orig_name _((VALUE, VALUE));
-static VALUE rb_gzfile_set_comment _((VALUE, VALUE));
-static VALUE rb_gzfile_close _((VALUE));
-static VALUE rb_gzfile_finish _((VALUE));
-static VALUE rb_gzfile_closed_p _((VALUE));
-static VALUE rb_gzfile_eof_p _((VALUE));
-static VALUE rb_gzfile_sync _((VALUE));
-static VALUE rb_gzfile_set_sync _((VALUE, VALUE));
-static VALUE rb_gzfile_total_in _((VALUE));
-static VALUE rb_gzfile_total_out _((VALUE));
-
-static VALUE rb_gzwriter_s_allocate _((VALUE));
-static VALUE rb_gzwriter_s_open _((int, VALUE*, VALUE));
-static VALUE rb_gzwriter_initialize _((int, VALUE*, VALUE));
-static VALUE rb_gzwriter_flush _((int, VALUE*, VALUE));
-static VALUE rb_gzwriter_write _((VALUE, VALUE));
-static VALUE rb_gzwriter_putc _((VALUE, VALUE));
-
-static VALUE rb_gzreader_s_allocate _((VALUE));
-static VALUE rb_gzreader_s_open _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_initialize _((VALUE, VALUE));
-static VALUE rb_gzreader_rewind _((VALUE));
-static VALUE rb_gzreader_unused _((VALUE));
-static VALUE rb_gzreader_read _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_getc _((VALUE));
-static VALUE rb_gzreader_readchar _((VALUE));
-static VALUE rb_gzreader_each_byte _((VALUE));
-static VALUE rb_gzreader_ungetc _((VALUE, VALUE));
-static void gzreader_skip_linebreaks _((struct gzfile*));
-static VALUE gzreader_gets _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_gets _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_readline _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_each _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_readlines _((int, VALUE*, VALUE));
+static void gzfile_mark(struct gzfile*);
+static void gzfile_free(struct gzfile*);
+static VALUE gzfile_new(VALUE, const struct zstream_funcs*, void (*) _((struct gzfile*)));
+static void gzfile_reset(struct gzfile*);
+static void gzfile_close(struct gzfile*, int);
+static void gzfile_write_raw(struct gzfile*);
+static VALUE gzfile_read_raw_partial(VALUE);
+static VALUE gzfile_read_raw_rescue(VALUE);
+static VALUE gzfile_read_raw(struct gzfile*);
+static int gzfile_read_raw_ensure(struct gzfile*, int);
+static char *gzfile_read_raw_until_zero(struct gzfile*, long);
+static unsigned int gzfile_get16(const unsigned char*);
+static unsigned long gzfile_get32(const unsigned char*);
+static void gzfile_set32(unsigned long n, unsigned char*);
+static void gzfile_make_header(struct gzfile*);
+static void gzfile_make_footer(struct gzfile*);
+static void gzfile_read_header(struct gzfile*);
+static void gzfile_check_footer(struct gzfile*);
+static void gzfile_write(struct gzfile*, Bytef*, uInt);
+static long gzfile_read_more(struct gzfile*);
+static void gzfile_calc_crc(struct gzfile*, VALUE);
+static VALUE gzfile_read(struct gzfile*, int);
+static VALUE gzfile_read_all(struct gzfile*);
+static void gzfile_ungets(struct gzfile*, const Bytef*, int);
+static void gzfile_ungetbyte(struct gzfile*, int);
+static VALUE gzfile_writer_end_run(VALUE);
+static void gzfile_writer_end(struct gzfile*);
+static VALUE gzfile_reader_end_run(VALUE);
+static void gzfile_reader_end(struct gzfile*);
+static void gzfile_reader_rewind(struct gzfile*);
+static VALUE gzfile_reader_get_unused(struct gzfile*);
+static struct gzfile *get_gzfile(VALUE);
+static VALUE gzfile_ensure_close(VALUE);
+static VALUE rb_gzfile_s_wrap(int, VALUE*, VALUE);
+static VALUE gzfile_s_open(int, VALUE*, VALUE, const char*);
+
+static VALUE rb_gzfile_to_io(VALUE);
+static VALUE rb_gzfile_crc(VALUE);
+static VALUE rb_gzfile_mtime(VALUE);
+static VALUE rb_gzfile_level(VALUE);
+static VALUE rb_gzfile_os_code(VALUE);
+static VALUE rb_gzfile_orig_name(VALUE);
+static VALUE rb_gzfile_comment(VALUE);
+static VALUE rb_gzfile_lineno(VALUE);
+static VALUE rb_gzfile_set_lineno(VALUE, VALUE);
+static VALUE rb_gzfile_set_mtime(VALUE, VALUE);
+static VALUE rb_gzfile_set_orig_name(VALUE, VALUE);
+static VALUE rb_gzfile_set_comment(VALUE, VALUE);
+static VALUE rb_gzfile_close(VALUE);
+static VALUE rb_gzfile_finish(VALUE);
+static VALUE rb_gzfile_closed_p(VALUE);
+static VALUE rb_gzfile_eof_p(VALUE);
+static VALUE rb_gzfile_sync(VALUE);
+static VALUE rb_gzfile_set_sync(VALUE, VALUE);
+static VALUE rb_gzfile_total_in(VALUE);
+static VALUE rb_gzfile_total_out(VALUE);
+static VALUE rb_gzfile_path(VALUE);
+
+static VALUE rb_gzwriter_s_allocate(VALUE);
+static VALUE rb_gzwriter_s_open(int, VALUE*, VALUE);
+static VALUE rb_gzwriter_initialize(int, VALUE*, VALUE);
+static VALUE rb_gzwriter_flush(int, VALUE*, VALUE);
+static VALUE rb_gzwriter_write(VALUE, VALUE);
+static VALUE rb_gzwriter_putc(VALUE, VALUE);
+
+static VALUE rb_gzreader_s_allocate(VALUE);
+static VALUE rb_gzreader_s_open(int, VALUE*, VALUE);
+static VALUE rb_gzreader_initialize(int, VALUE*, VALUE);
+static VALUE rb_gzreader_rewind(VALUE);
+static VALUE rb_gzreader_unused(VALUE);
+static VALUE rb_gzreader_read(int, VALUE*, VALUE);
+static VALUE rb_gzreader_getc(VALUE);
+static VALUE rb_gzreader_readchar(VALUE);
+static VALUE rb_gzreader_each_byte(VALUE);
+static VALUE rb_gzreader_ungetc(VALUE, VALUE);
+static VALUE rb_gzreader_ungetbyte(VALUE, VALUE);
+static void gzreader_skip_linebreaks(struct gzfile*);
+static VALUE gzreader_gets(int, VALUE*, VALUE);
+static VALUE rb_gzreader_gets(int, VALUE*, VALUE);
+static VALUE rb_gzreader_readline(int, VALUE*, VALUE);
+static VALUE rb_gzreader_each(int, VALUE*, VALUE);
+static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
 #endif /* GZIP_SUPPORT */
 
 
-void Init_zlib _((void));
-
+void Init_zlib(void);
 
+int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p);
+VALUE rb_str_conv_enc_opts(VALUE, rb_encoding*, rb_encoding*, int, VALUE);
 
 /*--------- Exceptions --------*/
 
@@ -195,9 +216,7 @@ static VALUE cZError, cStreamEnd, cNeedDict;
 static VALUE cStreamError, cDataError, cMemError, cBufError, cVersionError;
 
 static void
-raise_zlib_error(err, msg)
-    int err;
-    const char *msg;
+raise_zlib_error(int err, const char *msg)
 {
     VALUE exc;
 
@@ -245,8 +264,7 @@ raise_zlib_error(err, msg)
 /*--- Warning (in finalizer) ---*/
 
 static void
-finalizer_warn(msg)
-    const char *msg;
+finalizer_warn(const char *msg)
 {
     fprintf(stderr, "zlib(finalizer): %s\n", msg);
 }
@@ -258,8 +276,7 @@ finalizer_warn(msg)
  * Returns the string which represents the version of zlib library.
  */
 static VALUE
-rb_zlib_version(klass)
-    VALUE klass;
+rb_zlib_version(VALUE klass)
 {
     VALUE str;
 
@@ -272,7 +289,7 @@ static VALUE
 do_checksum(argc, argv, func)
     int argc;
     VALUE *argv;
-    uLong (*func) _((uLong, const Bytef *, uInt));
+    uLong (*func)(uLong, const Bytef*, uInt);
 {
     VALUE str, vsum;
     unsigned long sum;
@@ -294,7 +311,7 @@ do_checksum(argc, argv, func)
     }
     else {
 	StringValue(str);
-	sum = func(sum, RSTRING(str)->ptr, RSTRING(str)->len);
+	sum = func(sum, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
     }
     return rb_uint2inum(sum);
 }
@@ -302,21 +319,37 @@ do_checksum(argc, argv, func)
 /*
  * call-seq: Zlib.adler32(string, adler)
  *
- * Calculates Alder-32 checksum for +string+, and returns updated value of
+ * Calculates Adler-32 checksum for +string+, and returns updated value of
  * +adler+. If +string+ is omitted, it returns the Adler-32 initial value. If
  * +adler+ is omitted, it assumes that the initial value is given to +adler+.
  *
  * FIXME: expression.
  */
 static VALUE
-rb_zlib_adler32(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
 {
     return do_checksum(argc, argv, adler32);
 }
 
+#ifdef HAVE_ADLER32_COMBINE
+/*
+ * call-seq: Zlib.adler32_combine(adler1, adler2, len2)
+ *
+ * Combine two Adler-32 check values in to one.  +alder1+ is the first Adler-32
+ * value, +adler2+ is the second Adler-32 value.  +len2+ is the length of the
+ * string used to generate +adler2+.
+ *
+ */
+static VALUE
+rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2)
+{
+  return ULONG2NUM(
+	adler32_combine(NUM2ULONG(adler1), NUM2ULONG(adler2), NUM2LONG(len2)));
+}
+#else
+#define rb_zlib_adler32_combine rb_f_notimplement
+#endif
+
 /*
  * call-seq: Zlib.crc32(string, adler)
  *
@@ -327,20 +360,35 @@ rb_zlib_adler32(argc, argv, klass)
  * FIXME: expression.
  */
 static VALUE
-rb_zlib_crc32(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
 {
     return do_checksum(argc, argv, crc32);
 }
 
+#ifdef HAVE_CRC32_COMBINE
+/*
+ * call-seq: Zlib.crc32_combine(crc1, crc2, len2)
+ *
+ * Combine two CRC-32 check values in to one.  +crc1+ is the first CRC-32
+ * value, +crc2+ is the second CRC-32 value.  +len2+ is the length of the
+ * string used to generate +crc2+.
+ *
+ */
+static VALUE
+rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2)
+{
+  return ULONG2NUM(
+	crc32_combine(NUM2ULONG(crc1), NUM2ULONG(crc2), NUM2LONG(len2)));
+}
+#else
+#define rb_zlib_crc32_combine rb_f_notimplement
+#endif
+
 /*
  * Returns the table for calculating CRC checksum as an array.
  */
 static VALUE
-rb_zlib_crc_table(obj)
-    VALUE obj;
+rb_zlib_crc_table(VALUE obj)
 {
     const unsigned long *crctbl;
     VALUE dst;
@@ -366,9 +414,9 @@ struct zstream {
     VALUE input;
     z_stream stream;
     const struct zstream_funcs {
-	int (*reset) _((z_streamp));
-	int (*end) _((z_streamp));
-	int (*run) _((z_streamp, int));
+	int (*reset)(z_streamp);
+	int (*end)(z_streamp);
+	int (*run)(z_streamp, int);
     } *func;
 };
 
@@ -399,24 +447,25 @@ static const struct zstream_funcs inflate_funcs = {
 
 
 static voidpf
-zlib_mem_alloc(opaque, items, size)
-    voidpf opaque;
-    uInt items, size;
-{
-    return xmalloc(items * size);
+zlib_mem_alloc(voidpf opaque, uInt items, uInt size)
+{
+    voidpf p = xmalloc(items * size);
+    /* zlib FAQ: Valgrind (or some similar memory access checker) says that
+       deflate is performing a conditional jump that depends on an
+       uninitialized value.  Isn't that a bug?
+       http://www.zlib.net/zlib_faq.html#faq36 */
+    VALGRIND_MAKE_MEM_DEFINED(p, items * size);
+    return p;
 }
 
 static void
-zlib_mem_free(opaque, address)
-    voidpf opaque, address;
+zlib_mem_free(voidpf opaque, voidpf address)
 {
-    free(address);
+    xfree(address);
 }
 
 static void
-zstream_init(z, func)
-    struct zstream *z;
-    const struct zstream_funcs *func;
+zstream_init(struct zstream *z, const struct zstream_funcs *func)
 {
     z->flags = 0;
     z->buf = Qnil;
@@ -437,8 +486,7 @@ zstream_init(z, func)
 #define zstream_init_inflate(z)   zstream_init((z), &inflate_funcs)
 
 static void
-zstream_expand_buffer(z)
-    struct zstream *z;
+zstream_expand_buffer(struct zstream *z)
 {
     long inc;
 
@@ -447,13 +495,13 @@ zstream_expand_buffer(z)
 	       rb_str_buf_new makes a zero-length string. */
 	z->buf = rb_str_new(0, ZSTREAM_INITIAL_BUFSIZE);
 	z->buf_filled = 0;
-	z->stream.next_out = RSTRING(z->buf)->ptr;
+	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
 	z->stream.avail_out = ZSTREAM_INITIAL_BUFSIZE;
 	RBASIC(z->buf)->klass = 0;
 	return;
     }
 
-    if (RSTRING(z->buf)->len - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+    if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	/* to keep other threads from freezing */
 	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
@@ -466,69 +514,63 @@ zstream_expand_buffer(z)
 	z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
 	    inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
-    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
 }
 
 static void
-zstream_expand_buffer_into(z, size)
-    struct zstream *z;
-    int size;
+zstream_expand_buffer_into(struct zstream *z, unsigned int size)
 {
     if (NIL_P(z->buf)) {
 	/* I uses rb_str_new here not rb_str_buf_new because
 	   rb_str_buf_new makes a zero-length string. */
 	z->buf = rb_str_new(0, size);
 	z->buf_filled = 0;
-	z->stream.next_out = RSTRING(z->buf)->ptr;
+	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
 	z->stream.avail_out = size;
 	RBASIC(z->buf)->klass = 0;
     }
     else if (z->stream.avail_out != size) {
 	rb_str_resize(z->buf, z->buf_filled + size);
-	z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
 	z->stream.avail_out = size;
     }
 }
 
 static void
-zstream_append_buffer(z, src, len)
-    struct zstream *z;
-    const char *src;
-    int len;
+zstream_append_buffer(struct zstream *z, const Bytef *src, int len)
 {
     if (NIL_P(z->buf)) {
 	z->buf = rb_str_buf_new(len);
-	rb_str_buf_cat(z->buf, src, len);
+	rb_str_buf_cat(z->buf, (const char*)src, len);
 	z->buf_filled = len;
-	z->stream.next_out = RSTRING(z->buf)->ptr;
+	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
 	z->stream.avail_out = 0;
 	RBASIC(z->buf)->klass = 0;
 	return;
     }
 
-    if (RSTRING(z->buf)->len < z->buf_filled + len) {
+    if (RSTRING_LEN(z->buf) < z->buf_filled + len) {
 	rb_str_resize(z->buf, z->buf_filled + len);
 	z->stream.avail_out = 0;
     }
     else {
-	if (z->stream.avail_out >= len) {
+	if (z->stream.avail_out >= (uInt)len) {
 	    z->stream.avail_out -= len;
 	}
 	else {
 	    z->stream.avail_out = 0;
 	}
     }
-    memcpy(RSTRING(z->buf)->ptr + z->buf_filled, src, len);
+    memcpy(RSTRING_PTR(z->buf) + z->buf_filled, src, len);
     z->buf_filled += len;
-    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
 }
 
 #define zstream_append_buffer2(z,v) \
-    zstream_append_buffer((z),RSTRING(v)->ptr,RSTRING(v)->len)
+    zstream_append_buffer((z),(Bytef*)RSTRING_PTR(v),RSTRING_LEN(v))
 
 static VALUE
-zstream_detach_buffer(z)
-    struct zstream *z;
+zstream_detach_buffer(struct zstream *z)
 {
     VALUE dst;
 
@@ -549,9 +591,7 @@ zstream_detach_buffer(z)
 }
 
 static VALUE
-zstream_shift_buffer(z, len)
-    struct zstream *z;
-    int len;
+zstream_shift_buffer(struct zstream *z, int len)
 {
     VALUE dst;
 
@@ -559,13 +599,13 @@ zstream_shift_buffer(z, len)
 	return zstream_detach_buffer(z);
     }
 
-    dst = rb_str_substr(z->buf, 0, len);
+    dst = rb_str_subseq(z->buf, 0, len);
     RBASIC(dst)->klass = rb_cString;
     z->buf_filled -= len;
-    memmove(RSTRING(z->buf)->ptr, RSTRING(z->buf)->ptr + len,
+    memmove(RSTRING_PTR(z->buf), RSTRING_PTR(z->buf) + len,
 	    z->buf_filled);
-    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
-    z->stream.avail_out = RSTRING(z->buf)->len - z->buf_filled;
+    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+    z->stream.avail_out = RSTRING_LEN(z->buf) - z->buf_filled;
     if (z->stream.avail_out > ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
@@ -574,16 +614,30 @@ zstream_shift_buffer(z, len)
 }
 
 static void
-zstream_buffer_ungetc(z, c)
-    struct zstream *z;
-    int c;
+zstream_buffer_ungets(struct zstream *z, const Bytef *b, int len)
 {
-    if (NIL_P(z->buf) || RSTRING(z->buf)->len - z->buf_filled == 0) {
+    if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - z->buf_filled == 0) {
+	zstream_expand_buffer_into(z, len);
+    }
+
+    memmove(RSTRING_PTR(z->buf) + len, RSTRING_PTR(z->buf), z->buf_filled);
+    memmove(RSTRING_PTR(z->buf), b, len);
+    z->buf_filled+=len;
+    if (z->stream.avail_out > 0) {
+	z->stream.next_out+=len;
+	z->stream.avail_out-=len;
+    }
+}
+
+static void
+zstream_buffer_ungetbyte(struct zstream *z, int c)
+{
+    if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - z->buf_filled == 0) {
 	zstream_expand_buffer(z);
     }
 
-    memmove(RSTRING(z->buf)->ptr + 1, RSTRING(z->buf)->ptr, z->buf_filled);
-    RSTRING(z->buf)->ptr[0] = (char)c;
+    memmove(RSTRING_PTR(z->buf) + 1, RSTRING_PTR(z->buf), z->buf_filled);
+    RSTRING_PTR(z->buf)[0] = (char)c;
     z->buf_filled++;
     if (z->stream.avail_out > 0) {
 	z->stream.next_out++;
@@ -592,51 +646,45 @@ zstream_buffer_ungetc(z, c)
 }
 
 static void
-zstream_append_input(z, src, len)
-    struct zstream *z;
-    const char *src;
-    unsigned int len;
+zstream_append_input(struct zstream *z, const Bytef *src, unsigned int len)
 {
     if (len <= 0) return;
 
     if (NIL_P(z->input)) {
 	z->input = rb_str_buf_new(len);
-	rb_str_buf_cat(z->input, src, len);
+	rb_str_buf_cat(z->input, (const char*)src, len);
 	RBASIC(z->input)->klass = 0;
     }
     else {
-	rb_str_buf_cat(z->input, src, len);
+	rb_str_buf_cat(z->input, (const char*)src, len);
     }
 }
 
 #define zstream_append_input2(z,v)\
-    zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
+    RB_GC_GUARD(v),\
+    zstream_append_input((z), (Bytef*)RSTRING_PTR(v), RSTRING_LEN(v))
 
 static void
-zstream_discard_input(z, len)
-    struct zstream *z;
-    unsigned int len;
+zstream_discard_input(struct zstream *z, unsigned int len)
 {
-    if (NIL_P(z->input) || RSTRING(z->input)->len <= len) {
+    if (NIL_P(z->input) || (unsigned int)RSTRING_LEN(z->input) <= len) {
 	z->input = Qnil;
     }
     else {
-	memmove(RSTRING(z->input)->ptr, RSTRING(z->input)->ptr + len,
-		RSTRING(z->input)->len - len);
-	rb_str_resize(z->input, RSTRING(z->input)->len - len);
+	memmove(RSTRING_PTR(z->input), RSTRING_PTR(z->input) + len,
+		RSTRING_LEN(z->input) - len);
+	rb_str_resize(z->input, RSTRING_LEN(z->input) - len);
     }
 }
 
 static void
-zstream_reset_input(z)
-    struct zstream *z;
+zstream_reset_input(struct zstream *z)
 {
     z->input = Qnil;
 }
 
 static void
-zstream_passthrough_input(z)
-    struct zstream *z;
+zstream_passthrough_input(struct zstream *z)
 {
     if (!NIL_P(z->input)) {
 	zstream_append_buffer2(z, z->input);
@@ -645,8 +693,7 @@ zstream_passthrough_input(z)
 }
 
 static VALUE
-zstream_detach_input(z)
-    struct zstream *z;
+zstream_detach_input(struct zstream *z)
 {
     VALUE dst;
 
@@ -658,12 +705,12 @@ zstream_detach_input(z)
 	RBASIC(dst)->klass = rb_cString;
     }
     z->input = Qnil;
+    RBASIC(dst)->klass = rb_cString;
     return dst;
 }
 
 static void
-zstream_reset(z)
-    struct zstream *z;
+zstream_reset(struct zstream *z)
 {
     int err;
 
@@ -680,8 +727,7 @@ zstream_reset(z)
 }
 
 static VALUE
-zstream_end(z)
-    struct zstream *z;
+zstream_end(struct zstream *z)
 {
     int err;
 
@@ -704,24 +750,20 @@ zstream_end(z)
 }
 
 static void
-zstream_run(z, src, len, flush)
-    struct zstream *z;
-    Bytef *src;
-    uInt len;
-    int flush;
+zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
 {
     uInt n;
     int err;
-    volatile VALUE guard;
+    volatile VALUE guard = Qnil;
 
     if (NIL_P(z->input) && len == 0) {
-	z->stream.next_in = "";
+	z->stream.next_in = (Bytef*)"";
 	z->stream.avail_in = 0;
     }
     else {
 	zstream_append_input(z, src, len);
-	z->stream.next_in = RSTRING(z->input)->ptr;
-	z->stream.avail_in = RSTRING(z->input)->len;
+	z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
+	z->stream.avail_in = RSTRING_LEN(z->input);
 	/* keep reference to `z->input' so as not to be garbage collected
 	   after zstream_reset_input() and prevent `z->stream.next_in'
 	   from dangling. */
@@ -733,6 +775,9 @@ zstream_run(z, src, len, flush)
     }
 
     for (;;) {
+	/* VC allocates err and guard to same address.  accessing err and guard
+	   in same scope prevents it. */
+	RB_GC_GUARD(guard);
 	n = z->stream.avail_out;
 	err = z->func->run(&z->stream, flush);
 	z->buf_filled += n - z->stream.avail_out;
@@ -770,27 +815,24 @@ zstream_run(z, src, len, flush)
 }
 
 static VALUE
-zstream_sync(z, src, len)
-    struct zstream *z;
-    Bytef *src;
-    uInt len;
+zstream_sync(struct zstream *z, Bytef *src, uInt len)
 {
     VALUE rest;
     int err;
 
     if (!NIL_P(z->input)) {
-	z->stream.next_in = RSTRING(z->input)->ptr;
-	z->stream.avail_in = RSTRING(z->input)->len;
+	z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
+	z->stream.avail_in = RSTRING_LEN(z->input);
 	err = inflateSync(&z->stream);
 	if (err == Z_OK) {
 	    zstream_discard_input(z,
-				  RSTRING(z->input)->len - z->stream.avail_in);
+				  RSTRING_LEN(z->input) - z->stream.avail_in);
 	    zstream_append_input(z, src, len);
 	    return Qtrue;
 	}
 	zstream_reset_input(z);
 	if (err != Z_DATA_ERROR) {
-	    rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
+	    rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in);
 	    raise_zlib_error(err, z->stream.msg);
 	}
     }
@@ -805,23 +847,21 @@ zstream_sync(z, src, len)
 	return Qtrue;
     }
     if (err != Z_DATA_ERROR) {
-	rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
+	rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in);
 	raise_zlib_error(err, z->stream.msg);
     }
     return Qfalse;
 }
 
 static void
-zstream_mark(z)
-    struct zstream *z;
+zstream_mark(struct zstream *z)
 {
     rb_gc_mark(z->buf);
     rb_gc_mark(z->input);
 }
 
 static void
-zstream_finalize(z)
-    struct zstream *z;
+zstream_finalize(struct zstream *z)
 {
     int err = z->func->end(&z->stream);
     if (err == Z_STREAM_ERROR)
@@ -831,19 +871,16 @@ zstream_finalize(z)
 }
 
 static void
-zstream_free(z)
-    struct zstream *z;
+zstream_free(struct zstream *z)
 {
     if (ZSTREAM_IS_READY(z)) {
 	zstream_finalize(z);
     }
-    free(z);
+    xfree(z);
 }
 
 static VALUE
-zstream_new(klass, funcs)
-    VALUE klass;
-    const struct zstream_funcs *funcs;
+zstream_new(VALUE klass, const struct zstream_funcs *funcs)
 {
     VALUE obj;
     struct zstream *z;
@@ -858,8 +895,7 @@ zstream_new(klass, funcs)
 #define zstream_inflate_new(klass)  zstream_new((klass), &inflate_funcs)
 
 static struct zstream *
-get_zstream(obj)
-    VALUE obj;
+get_zstream(VALUE obj)
 {
     struct zstream *z;
 
@@ -939,8 +975,7 @@ get_zstream(obj)
  * exception.
  */
 static VALUE
-rb_zstream_end(obj)
-    VALUE obj;
+rb_zstream_end(VALUE obj)
 {
     zstream_end(get_zstream(obj));
     return Qnil;
@@ -951,8 +986,7 @@ rb_zstream_end(obj)
  * are discarded.
  */
 static VALUE
-rb_zstream_reset(obj)
-    VALUE obj;
+rb_zstream_reset(VALUE obj)
 {
     zstream_reset(get_zstream(obj));
     return Qnil;
@@ -963,13 +997,12 @@ rb_zstream_reset(obj)
  * Zlib::Inflate#finish for details of this behavior.
  */
 static VALUE
-rb_zstream_finish(obj)
-    VALUE obj;
+rb_zstream_finish(VALUE obj)
 {
     struct zstream *z = get_zstream(obj);
     VALUE dst;
 
-    zstream_run(z, "", 0, Z_FINISH);
+    zstream_run(z, (Bytef*)"", 0, Z_FINISH);
     dst = zstream_detach_buffer(z);
 
     OBJ_INFECT(dst, obj);
@@ -980,8 +1013,7 @@ rb_zstream_finish(obj)
  * Flushes input buffer and returns all data in that buffer.
  */
 static VALUE
-rb_zstream_flush_next_in(obj)
-    VALUE obj;
+rb_zstream_flush_next_in(VALUE obj)
 {
     struct zstream *z;
     VALUE dst;
@@ -996,8 +1028,7 @@ rb_zstream_flush_next_in(obj)
  * Flushes output buffer and returns all data in that buffer.
  */
 static VALUE
-rb_zstream_flush_next_out(obj)
-    VALUE obj;
+rb_zstream_flush_next_out(VALUE obj)
 {
     struct zstream *z;
     VALUE dst;
@@ -1013,8 +1044,7 @@ rb_zstream_flush_next_out(obj)
  * space is allocated automatically, this method returns 0 normally.
  */
 static VALUE
-rb_zstream_avail_out(obj)
-    VALUE obj;
+rb_zstream_avail_out(VALUE obj)
 {
     struct zstream *z;
     Data_Get_Struct(obj, struct zstream, z);
@@ -1023,13 +1053,12 @@ rb_zstream_avail_out(obj)
 
 /*
  * Allocates +size+ bytes of free space in the output buffer. If there are more
- * than +size+ bytes already in the buffer, the buffer is truncated. Because 
+ * than +size+ bytes already in the buffer, the buffer is truncated. Because
  * free space is allocated automatically, you usually don't need to use this
  * method.
  */
 static VALUE
-rb_zstream_set_avail_out(obj, size)
-    VALUE obj, size;
+rb_zstream_set_avail_out(VALUE obj, VALUE size)
 {
     struct zstream *z = get_zstream(obj);
 
@@ -1042,20 +1071,18 @@ rb_zstream_set_avail_out(obj, size)
  * Returns bytes of data in the input buffer. Normally, returns 0.
  */
 static VALUE
-rb_zstream_avail_in(obj)
-    VALUE obj;
+rb_zstream_avail_in(VALUE obj)
 {
     struct zstream *z;
     Data_Get_Struct(obj, struct zstream, z);
-    return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING(z->input)->len));
+    return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING_LEN(z->input)));
 }
 
 /*
  * Returns the total bytes of the input data to the stream.  FIXME
  */
 static VALUE
-rb_zstream_total_in(obj)
-    VALUE obj;
+rb_zstream_total_in(VALUE obj)
 {
     return rb_uint2inum(get_zstream(obj)->stream.total_in);
 }
@@ -1064,8 +1091,7 @@ rb_zstream_total_in(obj)
  * Returns the total bytes of the output data from the stream.  FIXME
  */
 static VALUE
-rb_zstream_total_out(obj)
-    VALUE obj;
+rb_zstream_total_out(VALUE obj)
 {
     return rb_uint2inum(get_zstream(obj)->stream.total_out);
 }
@@ -1076,8 +1102,7 @@ rb_zstream_total_out(obj)
  * <tt>Zlib::UNKNOWN</tt>.
  */
 static VALUE
-rb_zstream_data_type(obj)
-    VALUE obj;
+rb_zstream_data_type(VALUE obj)
 {
     return INT2FIX(get_zstream(obj)->stream.data_type);
 }
@@ -1086,8 +1111,7 @@ rb_zstream_data_type(obj)
  * Returns the adler-32 checksum.
  */
 static VALUE
-rb_zstream_adler(obj)
-    VALUE obj;
+rb_zstream_adler(VALUE obj)
 {
 	return rb_uint2inum(get_zstream(obj)->stream.adler);
 }
@@ -1096,8 +1120,7 @@ rb_zstream_adler(obj)
  * Returns true if the stream is finished.
  */
 static VALUE
-rb_zstream_finished_p(obj)
-    VALUE obj;
+rb_zstream_finished_p(VALUE obj)
 {
     return ZSTREAM_IS_FINISHED(get_zstream(obj)) ? Qtrue : Qfalse;
 }
@@ -1106,8 +1129,7 @@ rb_zstream_finished_p(obj)
  * Returns true if the stream is closed.
  */
 static VALUE
-rb_zstream_closed_p(obj)
-    VALUE obj;
+rb_zstream_closed_p(VALUE obj)
 {
     struct zstream *z;
     Data_Get_Struct(obj, struct zstream, z);
@@ -1136,8 +1158,7 @@ rb_zstream_closed_p(obj)
 
 
 static VALUE
-rb_deflate_s_allocate(klass)
-    VALUE klass;
+rb_deflate_s_allocate(VALUE klass)
 {
     return zstream_deflate_new(klass);
 }
@@ -1152,10 +1173,7 @@ rb_deflate_s_allocate(klass)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
 {
     struct zstream *z;
     VALUE level, wbits, memlevel, strategy;
@@ -1179,30 +1197,33 @@ rb_deflate_initialize(argc, argv, obj)
  * Duplicates the deflate stream.
  */
 static VALUE
-rb_deflate_init_copy(self, orig)
-    VALUE self, orig;
+rb_deflate_init_copy(VALUE self, VALUE orig)
 {
-    struct zstream *z1 = get_zstream(self);
-    struct zstream *z2 = get_zstream(orig);
+    struct zstream *z1, *z2;
     int err;
 
+    Data_Get_Struct(self, struct zstream, z1);
+    z2 = get_zstream(orig);
+
     err = deflateCopy(&z1->stream, &z2->stream);
     if (err != Z_OK) {
 	raise_zlib_error(err, 0);
     }
+    z1->input = NIL_P(z2->input) ? Qnil : rb_str_dup(z2->input);
+    z1->buf   = NIL_P(z2->buf)   ? Qnil : rb_str_dup(z2->buf);
+    z1->buf_filled = z2->buf_filled;
     z1->flags = z2->flags;
 
     return self;
 }
 
 static VALUE
-deflate_run(args)
-    VALUE args;
+deflate_run(VALUE args)
 {
-    struct zstream *z = (struct zstream *)((VALUE *)args)[0];
-    VALUE src = ((VALUE *)args)[1];
+    struct zstream *z = (struct zstream*)((VALUE*)args)[0];
+    VALUE src = ((VALUE*)args)[1];
 
-    zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_FINISH);
+    zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_FINISH);
     return zstream_detach_buffer(z);
 }
 
@@ -1227,10 +1248,7 @@ deflate_run(args)
  *
  */
 static VALUE
-rb_deflate_s_deflate(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_deflate_s_deflate(int argc, VALUE *argv, VALUE klass)
 {
     struct zstream z;
     VALUE src, level, dst, args[2];
@@ -1256,18 +1274,15 @@ rb_deflate_s_deflate(argc, argv, klass)
 }
 
 static void
-do_deflate(z, src, flush)
-    struct zstream *z;
-    VALUE src;
-    int flush;
+do_deflate(struct zstream *z, VALUE src, int flush)
 {
     if (NIL_P(src)) {
-	zstream_run(z, "", 0, Z_FINISH);
+	zstream_run(z, (Bytef*)"", 0, Z_FINISH);
 	return;
     }
     StringValue(src);
-    if (flush != Z_NO_FLUSH || RSTRING(src)->len > 0) { /* prevent BUF_ERROR */
-	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, flush);
+    if (flush != Z_NO_FLUSH || RSTRING_LEN(src) > 0) { /* prevent BUF_ERROR */
+	zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), flush);
     }
 }
 
@@ -1286,10 +1301,7 @@ do_deflate(z, src, flush)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_deflate(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
 {
     struct zstream *z = get_zstream(obj);
     VALUE src, flush, dst;
@@ -1311,8 +1323,7 @@ rb_deflate_deflate(argc, argv, obj)
  * preserved in output buffer.
  */
 static VALUE
-rb_deflate_addstr(obj, src)
-    VALUE obj, src;
+rb_deflate_addstr(VALUE obj, VALUE src)
 {
     OBJ_INFECT(obj, src);
     do_deflate(get_zstream(obj), src, Z_NO_FLUSH);
@@ -1329,10 +1340,7 @@ rb_deflate_addstr(obj, src)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_flush(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
 {
     struct zstream *z = get_zstream(obj);
     VALUE v_flush, dst;
@@ -1341,7 +1349,7 @@ rb_deflate_flush(argc, argv, obj)
     rb_scan_args(argc, argv, "01", &v_flush);
     flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
     if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
-	zstream_run(z, "", 0, flush);
+	zstream_run(z, (Bytef*)"", 0, flush);
     }
     dst = zstream_detach_buffer(z);
 
@@ -1351,7 +1359,7 @@ rb_deflate_flush(argc, argv, obj)
 
 /*
  * call-seq: params(level, strategy)
- * 
+ *
  * Changes the parameters of the deflate stream. See zlib.h for details. The
  * output from the stream by changing the params is preserved in output
  * buffer.
@@ -1359,21 +1367,25 @@ rb_deflate_flush(argc, argv, obj)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_params(obj, v_level, v_strategy)
-    VALUE obj, v_level, v_strategy;
+rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
 {
     struct zstream *z = get_zstream(obj);
     int level, strategy;
     int err;
+    uInt n;
 
     level = ARG_LEVEL(v_level);
     strategy = ARG_STRATEGY(v_strategy);
 
+    n = z->stream.avail_out;
     err = deflateParams(&z->stream, level, strategy);
+    z->buf_filled += n - z->stream.avail_out;
     while (err == Z_BUF_ERROR) {
 	rb_warning("deflateParams() returned Z_BUF_ERROR");
 	zstream_expand_buffer(z);
+	n = z->stream.avail_out;
 	err = deflateParams(&z->stream, level, strategy);
+	z->buf_filled += n - z->stream.avail_out;
     }
     if (err != Z_OK) {
 	raise_zlib_error(err, z->stream.msg);
@@ -1392,8 +1404,7 @@ rb_deflate_params(obj, v_level, v_strategy)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_set_dictionary(obj, dic)
-    VALUE obj, dic;
+rb_deflate_set_dictionary(VALUE obj, VALUE dic)
 {
     struct zstream *z = get_zstream(obj);
     VALUE src = dic;
@@ -1402,7 +1413,7 @@ rb_deflate_set_dictionary(obj, dic)
     OBJ_INFECT(obj, dic);
     StringValue(src);
     err = deflateSetDictionary(&z->stream,
-			       RSTRING(src)->ptr, RSTRING(src)->len);
+			       (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
     if (err != Z_OK) {
 	raise_zlib_error(err, z->stream.msg);
     }
@@ -1424,8 +1435,7 @@ rb_deflate_set_dictionary(obj, dic)
 
 
 static VALUE
-rb_inflate_s_allocate(klass)
-    VALUE klass;
+rb_inflate_s_allocate(VALUE klass)
 {
     return zstream_inflate_new(klass);
 }
@@ -1439,10 +1449,7 @@ rb_inflate_s_allocate(klass)
  * TODO: document better!
  */
 static VALUE
-rb_inflate_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_inflate_initialize(int argc, VALUE *argv, VALUE obj)
 {
     struct zstream *z;
     VALUE wbits;
@@ -1461,14 +1468,13 @@ rb_inflate_initialize(argc, argv, obj)
 }
 
 static VALUE
-inflate_run(args)
-    VALUE args;
+inflate_run(VALUE args)
 {
-    struct zstream *z = (struct zstream *)((VALUE *)args)[0];
-    VALUE src = ((VALUE *)args)[1];
+    struct zstream *z = (struct zstream*)((VALUE*)args)[0];
+    VALUE src = ((VALUE*)args)[1];
 
-    zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
-    zstream_run(z, "", 0, Z_FINISH);  /* for checking errors */
+    zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_SYNC_FLUSH);
+    zstream_run(z, (Bytef*)"", 0, Z_FINISH);  /* for checking errors */
     return zstream_detach_buffer(z);
 }
 
@@ -1490,8 +1496,7 @@ inflate_run(args)
  *
  */
 static VALUE
-rb_inflate_s_inflate(obj, src)
-    VALUE obj, src;
+rb_inflate_s_inflate(VALUE obj, VALUE src)
 {
     struct zstream z;
     VALUE dst, args[2];
@@ -1514,17 +1519,15 @@ rb_inflate_s_inflate(obj, src)
 }
 
 static void
-do_inflate(z, src)
-    struct zstream *z;
-    VALUE src;
+do_inflate(struct zstream *z, VALUE src)
 {
     if (NIL_P(src)) {
-	zstream_run(z, "", 0, Z_FINISH);
+	zstream_run(z, (Bytef*)"", 0, Z_FINISH);
 	return;
     }
     StringValue(src);
-    if (RSTRING(src)->len > 0) { /* prevent Z_BUF_ERROR */
-	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
+    if (RSTRING_LEN(src) > 0) { /* prevent Z_BUF_ERROR */
+	zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_SYNC_FLUSH);
     }
 }
 
@@ -1543,8 +1546,7 @@ do_inflate(z, src)
  * TODO: document better!
  */
 static VALUE
-rb_inflate_inflate(obj, src)
-    VALUE obj, src;
+rb_inflate_inflate(VALUE obj, VALUE src)
 {
     struct zstream *z = get_zstream(obj);
     VALUE dst;
@@ -1581,8 +1583,7 @@ rb_inflate_inflate(obj, src)
  * preserved in output buffer.
  */
 static VALUE
-rb_inflate_addstr(obj, src)
-    VALUE obj, src;
+rb_inflate_addstr(VALUE obj, VALUE src)
 {
     struct zstream *z = get_zstream(obj);
 
@@ -1613,14 +1614,13 @@ rb_inflate_addstr(obj, src)
  * following data of full flush point is preserved in the buffer.
  */
 static VALUE
-rb_inflate_sync(obj, src)
-    VALUE obj, src;
+rb_inflate_sync(VALUE obj, VALUE src)
 {
     struct zstream *z = get_zstream(obj);
 
     OBJ_INFECT(obj, src);
     StringValue(src);
-    return zstream_sync(z, RSTRING(src)->ptr, RSTRING(src)->len);
+    return zstream_sync(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
 }
 
 /*
@@ -1631,8 +1631,7 @@ rb_inflate_sync(obj, src)
  * <tt>:)</tt>
  */
 static VALUE
-rb_inflate_sync_point_p(obj)
-    VALUE obj;
+rb_inflate_sync_point_p(VALUE obj)
 {
     struct zstream *z = get_zstream(obj);
     int err;
@@ -1654,8 +1653,7 @@ rb_inflate_sync_point_p(obj)
  * TODO: document better!
  */
 static VALUE
-rb_inflate_set_dictionary(obj, dic)
-    VALUE obj, dic;
+rb_inflate_set_dictionary(VALUE obj, VALUE dic)
 {
     struct zstream *z = get_zstream(obj);
     VALUE src = dic;
@@ -1664,7 +1662,7 @@ rb_inflate_set_dictionary(obj, dic)
     OBJ_INFECT(obj, dic);
     StringValue(src);
     err = inflateSetDictionary(&z->stream,
-			       RSTRING(src)->ptr, RSTRING(src)->len);
+			       (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
     if (err != Z_OK) {
 	raise_zlib_error(err, z->stream.msg);
     }
@@ -1718,7 +1716,7 @@ rb_inflate_set_dictionary(obj, dic)
 #define OS_CODE  OS_UNIX
 #endif
 
-static ID id_write, id_read, id_flush, id_seek, id_close;
+static ID id_write, id_read, id_readpartial, id_flush, id_seek, id_close, id_path;
 static VALUE cGzError, cNoFooter, cCRCError, cLengthError;
 
 
@@ -1737,7 +1735,15 @@ struct gzfile {
     int lineno;
     int ungetc;
     void (*end)(struct gzfile *);
+    rb_encoding *enc;
+    rb_encoding *enc2;
+    rb_econv_t *ec;
+    int ecflags;
+    VALUE ecopts;
+    char *cbuf;
+    VALUE path;
 };
+#define GZFILE_CBUF_CAPA 10
 
 #define GZFILE_FLAG_SYNC             ZSTREAM_FLAG_UNUSED
 #define GZFILE_FLAG_HEADER_FINISHED  (ZSTREAM_FLAG_UNUSED << 1)
@@ -1750,18 +1756,18 @@ struct gzfile {
 
 
 static void
-gzfile_mark(gz)
-    struct gzfile *gz;
+gzfile_mark(struct gzfile *gz)
 {
     rb_gc_mark(gz->io);
     rb_gc_mark(gz->orig_name);
     rb_gc_mark(gz->comment);
     zstream_mark(&gz->z);
+    rb_gc_mark(gz->ecopts);
+    rb_gc_mark(gz->path);
 }
 
 static void
-gzfile_free(gz)
-    struct gzfile *gz;
+gzfile_free(struct gzfile *gz)
 {
     struct zstream *z = &gz->z;
 
@@ -1771,14 +1777,17 @@ gzfile_free(gz)
 	}
 	zstream_finalize(z);
     }
-    free(gz);
+    if (gz->cbuf) {
+	xfree(gz->cbuf);
+    }
+    xfree(gz);
 }
 
 static VALUE
 gzfile_new(klass, funcs, endfunc)
     VALUE klass;
     const struct zstream_funcs *funcs;
-    void (*endfunc) _((struct gzfile *));
+    void (*endfunc)(struct gzfile *);
 {
     VALUE obj;
     struct gzfile *gz;
@@ -1795,6 +1804,13 @@ gzfile_new(klass, funcs, endfunc)
     gz->lineno = 0;
     gz->ungetc = 0;
     gz->end = endfunc;
+    gz->enc = rb_default_external_encoding();
+    gz->enc2 = 0;
+    gz->ec = NULL;
+    gz->ecflags = 0;
+    gz->ecopts = Qnil;
+    gz->cbuf = 0;
+    gz->path = Qnil;
 
     return obj;
 }
@@ -1803,19 +1819,21 @@ gzfile_new(klass, funcs, endfunc)
 #define gzfile_reader_new(gz) gzfile_new((gz),&inflate_funcs,gzfile_reader_end)
 
 static void
-gzfile_reset(gz)
-    struct gzfile *gz;
+gzfile_reset(struct gzfile *gz)
 {
     zstream_reset(&gz->z);
     gz->crc = crc32(0, Z_NULL, 0);
     gz->lineno = 0;
     gz->ungetc = 0;
+    if (gz->ec) {
+	rb_econv_close(gz->ec);
+	gz->ec = rb_econv_open_opts(gz->enc2->name, gz->enc->name,
+				    gz->ecflags, gz->ecopts);
+    }
 }
 
 static void
-gzfile_close(gz, closeflag)
-    struct gzfile *gz;
-    int closeflag;
+gzfile_close(struct gzfile *gz, int closeflag)
 {
     VALUE io = gz->io;
 
@@ -1829,8 +1847,7 @@ gzfile_close(gz, closeflag)
 }
 
 static void
-gzfile_write_raw(gz)
-    struct gzfile *gz;
+gzfile_write_raw(struct gzfile *gz)
 {
     VALUE str;
 
@@ -1845,26 +1862,44 @@ gzfile_write_raw(gz)
 }
 
 static VALUE
-gzfile_read_raw(gz)
-    struct gzfile *gz;
+gzfile_read_raw_partial(VALUE arg)
 {
+    struct gzfile *gz = (struct gzfile*)arg;
     VALUE str;
 
-    str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
-    if (!NIL_P(str)) {
-	Check_Type(str, T_STRING);
-    }
+    str = rb_funcall(gz->io, id_readpartial, 1, INT2FIX(GZFILE_READ_SIZE));
+    Check_Type(str, T_STRING);
     return str;
 }
 
+static VALUE
+gzfile_read_raw_rescue(VALUE arg)
+{
+    struct gzfile *gz = (struct gzfile*)arg;
+    VALUE str = Qnil;
+    if (rb_obj_is_kind_of(rb_errinfo(), rb_eNoMethodError)) {
+        str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
+        if (!NIL_P(str)) {
+            Check_Type(str, T_STRING);
+        }
+    }
+    return str; /* return nil when EOFError */
+}
+
+static VALUE
+gzfile_read_raw(struct gzfile *gz)
+{
+    return rb_rescue2(gzfile_read_raw_partial, (VALUE)gz,
+                      gzfile_read_raw_rescue, (VALUE)gz,
+                      rb_eEOFError, rb_eNoMethodError, (VALUE)0);
+}
+
 static int
-gzfile_read_raw_ensure(gz, size)
-    struct gzfile *gz;
-    int size;
+gzfile_read_raw_ensure(struct gzfile *gz, int size)
 {
     VALUE str;
 
-    while (NIL_P(gz->z.input) || RSTRING(gz->z.input)->len < size) {
+    while (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size) {
 	str = gzfile_read_raw(gz);
 	if (NIL_P(str)) return Qfalse;
 	zstream_append_input2(&gz->z, str);
@@ -1873,30 +1908,27 @@ gzfile_read_raw_ensure(gz, size)
 }
 
 static char *
-gzfile_read_raw_until_zero(gz, offset)
-    struct gzfile *gz;
-    long offset;
+gzfile_read_raw_until_zero(struct gzfile *gz, long offset)
 {
     VALUE str;
     char *p;
 
     for (;;) {
-	p = memchr(RSTRING(gz->z.input)->ptr + offset, '\0',
-		   RSTRING(gz->z.input)->len - offset);
+	p = memchr(RSTRING_PTR(gz->z.input) + offset, '\0',
+		   RSTRING_LEN(gz->z.input) - offset);
 	if (p) break;
 	str = gzfile_read_raw(gz);
 	if (NIL_P(str)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
-	offset = RSTRING(gz->z.input)->len;
+	offset = RSTRING_LEN(gz->z.input);
 	zstream_append_input2(&gz->z, str);
     }
     return p;
 }
 
 static unsigned int
-gzfile_get16(src)
-    const unsigned char *src;
+gzfile_get16(const unsigned char *src)
 {
     unsigned int n;
     n  = *(src++) & 0xff;
@@ -1905,8 +1937,7 @@ gzfile_get16(src)
 }
 
 static unsigned long
-gzfile_get32(src)
-    const unsigned char *src;
+gzfile_get32(const unsigned char *src)
 {
     unsigned long n;
     n  = *(src++) & 0xff;
@@ -1917,9 +1948,7 @@ gzfile_get32(src)
 }
 
 static void
-gzfile_set32(n, dst)
-    unsigned long n;
-    unsigned char *dst;
+gzfile_set32(unsigned long n, unsigned char *dst)
 {
     *(dst++) = n & 0xff;
     *(dst++) = (n >> 8) & 0xff;
@@ -1928,10 +1957,9 @@ gzfile_set32(n, dst)
 }
 
 static void
-gzfile_make_header(gz)
-    struct gzfile *gz;
+gzfile_make_header(struct gzfile *gz)
 {
-    unsigned char buf[10];  /* the size of gzip header */
+    Bytef buf[10];  /* the size of gzip header */
     unsigned char flags = 0, extraflags = 0;
 
     if (!NIL_P(gz->orig_name)) {
@@ -1955,28 +1983,27 @@ gzfile_make_header(gz)
     buf[1] = GZ_MAGIC2;
     buf[2] = GZ_METHOD_DEFLATE;
     buf[3] = flags;
-    gzfile_set32(gz->mtime, &buf[4]);
+    gzfile_set32((unsigned long)gz->mtime, &buf[4]);
     buf[8] = extraflags;
     buf[9] = gz->os_code;
     zstream_append_buffer(&gz->z, buf, sizeof(buf));
 
     if (!NIL_P(gz->orig_name)) {
 	zstream_append_buffer2(&gz->z, gz->orig_name);
-	zstream_append_buffer(&gz->z, "\0", 1);
+	zstream_append_buffer(&gz->z, (Bytef*)"\0", 1);
     }
     if (!NIL_P(gz->comment)) {
 	zstream_append_buffer2(&gz->z, gz->comment);
-	zstream_append_buffer(&gz->z, "\0", 1);
+	zstream_append_buffer(&gz->z, (Bytef*)"\0", 1);
     }
 
     gz->z.flags |= GZFILE_FLAG_HEADER_FINISHED;
 }
 
 static void
-gzfile_make_footer(gz)
-    struct gzfile *gz;
+gzfile_make_footer(struct gzfile *gz)
 {
-    unsigned char buf[8];  /* 8 is the size of gzip footer */
+    Bytef buf[8];  /* 8 is the size of gzip footer */
 
     gzfile_set32(gz->crc, buf);
     gzfile_set32(gz->z.stream.total_in, &buf[4]);
@@ -1985,8 +2012,7 @@ gzfile_make_footer(gz)
 }
 
 static void
-gzfile_read_header(gz)
-    struct gzfile *gz;
+gzfile_read_header(struct gzfile *gz)
 {
     const unsigned char *head;
     long len;
@@ -1996,7 +2022,7 @@ gzfile_read_header(gz)
 	rb_raise(cGzError, "not in gzip format");
     }
 
-    head = RSTRING(gz->z.input)->ptr;
+    head = (unsigned char*)RSTRING_PTR(gz->z.input);
 
     if (head[0] != GZ_MAGIC1 || head[1] != GZ_MAGIC2) {
 	rb_raise(cGzError, "not in gzip format");
@@ -2034,7 +2060,7 @@ gzfile_read_header(gz)
 	if (!gzfile_read_raw_ensure(gz, 2)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
-	len = gzfile_get16(RSTRING(gz->z.input)->ptr);
+	len = gzfile_get16((Bytef*)RSTRING_PTR(gz->z.input));
 	if (!gzfile_read_raw_ensure(gz, 2 + len)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
@@ -2042,27 +2068,26 @@ gzfile_read_header(gz)
     }
     if (flags & GZ_FLAG_ORIG_NAME) {
 	p = gzfile_read_raw_until_zero(gz, 0);
-	len = p - RSTRING(gz->z.input)->ptr;
-	gz->orig_name = rb_str_new(RSTRING(gz->z.input)->ptr, len);
+	len = p - RSTRING_PTR(gz->z.input);
+	gz->orig_name = rb_str_new(RSTRING_PTR(gz->z.input), len);
 	OBJ_TAINT(gz->orig_name);  /* for safe */
 	zstream_discard_input(&gz->z, len + 1);
     }
     if (flags & GZ_FLAG_COMMENT) {
 	p = gzfile_read_raw_until_zero(gz, 0);
-	len = p - RSTRING(gz->z.input)->ptr;
-	gz->comment = rb_str_new(RSTRING(gz->z.input)->ptr, len);
+	len = p - RSTRING_PTR(gz->z.input);
+	gz->comment = rb_str_new(RSTRING_PTR(gz->z.input), len);
 	OBJ_TAINT(gz->comment);  /* for safe */
 	zstream_discard_input(&gz->z, len + 1);
     }
 
-    if (gz->z.input != Qnil && RSTRING(gz->z.input)->len > 0) {
+    if (gz->z.input != Qnil && RSTRING_LEN(gz->z.input) > 0) {
 	zstream_run(&gz->z, 0, 0, Z_SYNC_FLUSH);
     }
 }
 
 static void
-gzfile_check_footer(gz)
-    struct gzfile *gz;
+gzfile_check_footer(struct gzfile *gz)
 {
     unsigned long crc, length;
 
@@ -2072,8 +2097,8 @@ gzfile_check_footer(gz)
 	rb_raise(cNoFooter, "footer is not found");
     }
 
-    crc = gzfile_get32(RSTRING(gz->z.input)->ptr);
-    length = gzfile_get32(RSTRING(gz->z.input)->ptr + 4);
+    crc = gzfile_get32((Bytef*)RSTRING_PTR(gz->z.input));
+    length = gzfile_get32((Bytef*)RSTRING_PTR(gz->z.input) + 4);
 
     gz->z.stream.total_in += 8;  /* to rewind correctly */
     zstream_discard_input(&gz->z, 8);
@@ -2081,16 +2106,13 @@ gzfile_check_footer(gz)
     if (gz->crc != crc) {
 	rb_raise(cCRCError, "invalid compressed data -- crc error");
     }
-    if (gz->z.stream.total_out != length) {
+    if ((uint32_t)gz->z.stream.total_out != length) {
 	rb_raise(cLengthError, "invalid compressed data -- length error");
     }
 }
 
 static void
-gzfile_write(gz, str, len)
-    struct gzfile *gz;
-    Bytef *str;
-    uInt len;
+gzfile_write(struct gzfile *gz, Bytef *str, uInt len)
 {
     if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
 	gzfile_make_header(gz);
@@ -2105,8 +2127,7 @@ gzfile_write(gz, str, len)
 }
 
 static long
-gzfile_read_more(gz)
-    struct gzfile *gz;
+gzfile_read_more(struct gzfile *gz)
 {
     volatile VALUE str;
 
@@ -2118,8 +2139,8 @@ gzfile_read_more(gz)
 	    }
 	    break;
 	}
-	if (RSTRING(str)->len > 0) { /* prevent Z_BUF_ERROR */
-	    zstream_run(&gz->z, RSTRING(str)->ptr, RSTRING(str)->len,
+	if (RSTRING_LEN(str) > 0) { /* prevent Z_BUF_ERROR */
+	    zstream_run(&gz->z, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str),
 			Z_SYNC_FLUSH);
 	}
 	if (gz->z.buf_filled > 0) break;
@@ -2128,24 +2149,38 @@ gzfile_read_more(gz)
 }
 
 static void
-gzfile_calc_crc(gz, str)
-    struct gzfile *gz;
-    VALUE str;
+gzfile_calc_crc(struct gzfile *gz, VALUE str)
 {
-    if (RSTRING(str)->len <= gz->ungetc) {
-	gz->ungetc -= RSTRING(str)->len;
+    if (RSTRING_LEN(str) <= gz->ungetc) {
+	gz->ungetc -= RSTRING_LEN(str);
     }
     else {
-	gz->crc = crc32(gz->crc, RSTRING(str)->ptr + gz->ungetc,
-			RSTRING(str)->len - gz->ungetc);
+	gz->crc = crc32(gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc,
+			RSTRING_LEN(str) - gz->ungetc);
 	gz->ungetc = 0;
     }
 }
 
 static VALUE
-gzfile_read(gz, len)
-    struct gzfile *gz;
-    int len;
+gzfile_newstr(struct gzfile *gz, VALUE str)
+{
+    if (!gz->enc2) {
+	rb_enc_associate(str, gz->enc);
+	OBJ_TAINT(str);  /* for safe */
+	return str;
+    }
+    if (gz->ec && rb_enc_dummy_p(gz->enc2)) {
+        str = rb_econv_str_convert(gz->ec, str, ECONV_PARTIAL_INPUT);
+	rb_enc_associate(str, gz->enc);
+	OBJ_TAINT(str);
+	return str;
+    }
+    return rb_str_conv_enc_opts(str, gz->enc2, gz->enc,
+				gz->ecflags, gz->ecopts);
+}
+
+static VALUE
+gzfile_read(struct gzfile *gz, int len)
 {
     VALUE dst;
 
@@ -2165,14 +2200,54 @@ gzfile_read(gz, len)
 
     dst = zstream_shift_buffer(&gz->z, len);
     gzfile_calc_crc(gz, dst);
+    return dst;
+}
+
+static VALUE
+gzfile_readpartial(struct gzfile *gz, int len, VALUE outbuf)
+{
+    VALUE dst;
+
+    if (len < 0)
+        rb_raise(rb_eArgError, "negative length %d given", len);
+
+    if (!NIL_P(outbuf))
+            OBJ_TAINT(outbuf);
+
+    if (len == 0) {
+        if (NIL_P(outbuf))
+            return rb_str_new(0, 0);
+        else {
+            rb_str_resize(outbuf, 0);
+            return outbuf;
+        }
+    }
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled == 0) {
+	gzfile_read_more(gz);
+    }
+    if (GZFILE_IS_FINISHED(gz)) {
+	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
+	    gzfile_check_footer(gz);
+	}
+        if (!NIL_P(outbuf))
+            rb_str_resize(outbuf, 0);
+	rb_raise(rb_eEOFError, "end of file reached");
+    }
+
+    dst = zstream_shift_buffer(&gz->z, len);
+    gzfile_calc_crc(gz, dst);
 
+    if (!NIL_P(outbuf)) {
+        rb_str_resize(outbuf, RSTRING_LEN(dst));
+        memcpy(RSTRING_PTR(outbuf), RSTRING_PTR(dst), RSTRING_LEN(dst));
+	dst = outbuf;
+    }
     OBJ_TAINT(dst);  /* for safe */
     return dst;
 }
 
 static VALUE
-gzfile_read_all(gz)
-    struct gzfile *gz;
+gzfile_read_all(struct gzfile *gz)
 {
     VALUE dst;
 
@@ -2188,23 +2263,72 @@ gzfile_read_all(gz)
 
     dst = zstream_detach_buffer(&gz->z);
     gzfile_calc_crc(gz, dst);
+    OBJ_TAINT(dst);
+    return gzfile_newstr(gz, dst);
+}
 
-    OBJ_TAINT(dst);  /* for safe */
-    return dst;
+static VALUE
+gzfile_getc(struct gzfile *gz)
+{
+    VALUE buf, dst = 0;
+    int len;
+
+    len = rb_enc_mbmaxlen(gz->enc);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
+	gzfile_read_more(gz);
+    }
+    if (GZFILE_IS_FINISHED(gz)) {
+	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
+	    gzfile_check_footer(gz);
+	}
+	return Qnil;
+    }
+
+    if (gz->ec && rb_enc_dummy_p(gz->enc2)) {
+	const unsigned char *ss, *sp, *se;
+	unsigned char *ds, *dp, *de;
+	rb_econv_result_t res;
+
+	if (!gz->cbuf) {
+	    gz->cbuf = ALLOC_N(char, GZFILE_CBUF_CAPA);
+	}
+        ss = sp = (const unsigned char*)RSTRING_PTR(gz->z.buf);
+        se = sp + gz->z.buf_filled;
+        ds = dp = (unsigned char *)gz->cbuf;
+        de = (unsigned char *)ds + GZFILE_CBUF_CAPA;
+        res = rb_econv_convert(gz->ec, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_AFTER_OUTPUT);
+        rb_econv_check_error(gz->ec);
+	dst = zstream_shift_buffer(&gz->z, sp - ss);
+	gzfile_calc_crc(gz, dst);
+	dst = rb_str_new(gz->cbuf, dp - ds);
+	rb_enc_associate(dst, gz->enc);
+	OBJ_TAINT(dst);
+	return dst;
+    }
+    else {
+	buf = gz->z.buf;
+	len = rb_enc_mbclen(RSTRING_PTR(buf), RSTRING_END(buf), gz->enc);
+	dst = gzfile_read(gz, len);
+	return gzfile_newstr(gz, dst);
+    }
 }
 
 static void
-gzfile_ungetc(gz, c)
-    struct gzfile *gz;
-    int c;
+gzfile_ungets(struct gzfile *gz, const Bytef *b, int len)
 {
-    zstream_buffer_ungetc(&gz->z, c);
+    zstream_buffer_ungets(&gz->z, b, len);
+    gz->ungetc+=len;
+}
+
+static void
+gzfile_ungetbyte(struct gzfile *gz, int c)
+{
+    zstream_buffer_ungetbyte(&gz->z, c);
     gz->ungetc++;
 }
 
 static VALUE
-gzfile_writer_end_run(arg)
-    VALUE arg;
+gzfile_writer_end_run(VALUE arg)
 {
     struct gzfile *gz = (struct gzfile *)arg;
 
@@ -2212,7 +2336,7 @@ gzfile_writer_end_run(arg)
 	gzfile_make_header(gz);
     }
 
-    zstream_run(&gz->z, "", 0, Z_FINISH);
+    zstream_run(&gz->z, (Bytef*)"", 0, Z_FINISH);
     gzfile_make_footer(gz);
     gzfile_write_raw(gz);
 
@@ -2220,8 +2344,7 @@ gzfile_writer_end_run(arg)
 }
 
 static void
-gzfile_writer_end(gz)
-    struct gzfile *gz;
+gzfile_writer_end(struct gzfile *gz)
 {
     if (ZSTREAM_IS_CLOSING(&gz->z)) return;
     gz->z.flags |= ZSTREAM_FLAG_CLOSING;
@@ -2230,8 +2353,7 @@ gzfile_writer_end(gz)
 }
 
 static VALUE
-gzfile_reader_end_run(arg)
-    VALUE arg;
+gzfile_reader_end_run(VALUE arg)
 {
     struct gzfile *gz = (struct gzfile *)arg;
 
@@ -2244,8 +2366,7 @@ gzfile_reader_end_run(arg)
 }
 
 static void
-gzfile_reader_end(gz)
-    struct gzfile *gz;
+gzfile_reader_end(struct gzfile *gz)
 {
     if (ZSTREAM_IS_CLOSING(&gz->z)) return;
     gz->z.flags |= ZSTREAM_FLAG_CLOSING;
@@ -2254,23 +2375,23 @@ gzfile_reader_end(gz)
 }
 
 static void
-gzfile_reader_rewind(gz)
-    struct gzfile *gz;
+gzfile_reader_rewind(struct gzfile *gz)
 {
     long n;
 
     n = gz->z.stream.total_in;
     if (!NIL_P(gz->z.input)) {
-	n += RSTRING(gz->z.input)->len;
+	n += RSTRING_LEN(gz->z.input);
     }
 
     rb_funcall(gz->io, id_seek, 2, rb_int2inum(-n), INT2FIX(1));
     gzfile_reset(gz);
 }
 
+extern VALUE rb_str_resurrect(VALUE str);
+
 static VALUE
-gzfile_reader_get_unused(gz)
-    struct gzfile *gz;
+gzfile_reader_get_unused(struct gzfile *gz)
 {
     VALUE str;
 
@@ -2281,14 +2402,13 @@ gzfile_reader_get_unused(gz)
     }
     if (NIL_P(gz->z.input)) return Qnil;
 
-    str = rb_str_dup(gz->z.input);
+    str = rb_str_resurrect(gz->z.input);
     OBJ_TAINT(str);  /* for safe */
     return str;
 }
 
 static struct gzfile *
-get_gzfile(obj)
-    VALUE obj;
+get_gzfile(VALUE obj)
 {
     struct gzfile *gz;
 
@@ -2314,8 +2434,7 @@ get_gzfile(obj)
 
 
 static VALUE
-gzfile_ensure_close(obj)
-    VALUE obj;
+gzfile_ensure_close(VALUE obj)
 {
     struct gzfile *gz;
 
@@ -2327,13 +2446,17 @@ gzfile_ensure_close(obj)
 }
 
 /*
- * See Zlib::GzipReader#wrap and Zlib::GzipWriter#wrap.
+ * call-seq: Zlib::GzipFile.wrap(io) { |gz| ... }
+ *
+ * Creates a GzipFile object associated with +io+, and
+ * executes the block with the newly created GzipFile object,
+ * just like File.open. The GzipFile object will be closed
+ * automatically after executing the block. If you want to keep
+ * the associated IO object opening, you may call
+ * +Zlib::GzipFile#finish+ method in the block.
  */
 static VALUE
-rb_gzfile_s_wrap(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
 {
     VALUE obj = rb_class_new_instance(argc, argv, klass);
 
@@ -2349,11 +2472,7 @@ rb_gzfile_s_wrap(argc, argv, klass)
  * See Zlib::GzipReader#open and Zlib::GzipWriter#open.
  */
 static VALUE
-gzfile_s_open(argc, argv, klass, mode)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-    const char *mode;
+gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
 {
     VALUE io, filename;
 
@@ -2361,9 +2480,7 @@ gzfile_s_open(argc, argv, klass, mode)
 	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
     }
     filename = argv[0];
-    SafeStringValue(filename);
-    io = rb_file_open(RSTRING(filename)->ptr, mode);
-
+    io = rb_file_open_str(filename, mode);
     argv[0] = io;
     return rb_gzfile_s_wrap(argc, argv, klass);
 }
@@ -2372,8 +2489,7 @@ gzfile_s_open(argc, argv, klass, mode)
  * Same as IO.
  */
 static VALUE
-rb_gzfile_to_io(obj)
-    VALUE obj;
+rb_gzfile_to_io(VALUE obj)
 {
     return get_gzfile(obj)->io;
 }
@@ -2382,8 +2498,7 @@ rb_gzfile_to_io(obj)
  * Returns CRC value of the uncompressed data.
  */
 static VALUE
-rb_gzfile_crc(obj)
-    VALUE obj;
+rb_gzfile_crc(VALUE obj)
 {
     return rb_uint2inum(get_gzfile(obj)->crc);
 }
@@ -2392,8 +2507,7 @@ rb_gzfile_crc(obj)
  * Returns last modification time recorded in the gzip file header.
  */
 static VALUE
-rb_gzfile_mtime(obj)
-    VALUE obj;
+rb_gzfile_mtime(VALUE obj)
 {
     return rb_time_new(get_gzfile(obj)->mtime, (time_t)0);
 }
@@ -2402,8 +2516,7 @@ rb_gzfile_mtime(obj)
  * Returns compression level.
  */
 static VALUE
-rb_gzfile_level(obj)
-    VALUE obj;
+rb_gzfile_level(VALUE obj)
 {
     return INT2FIX(get_gzfile(obj)->level);
 }
@@ -2412,8 +2525,7 @@ rb_gzfile_level(obj)
  * Returns OS code number recorded in the gzip file header.
  */
 static VALUE
-rb_gzfile_os_code(obj)
-    VALUE obj;
+rb_gzfile_os_code(VALUE obj)
 {
     return INT2FIX(get_gzfile(obj)->os_code);
 }
@@ -2423,8 +2535,7 @@ rb_gzfile_os_code(obj)
  * original filename is not present.
  */
 static VALUE
-rb_gzfile_orig_name(obj)
-    VALUE obj;
+rb_gzfile_orig_name(VALUE obj)
 {
     VALUE str = get_gzfile(obj)->orig_name;
     if (!NIL_P(str)) {
@@ -2439,8 +2550,7 @@ rb_gzfile_orig_name(obj)
  * is not present.
  */
 static VALUE
-rb_gzfile_comment(obj)
-    VALUE obj;
+rb_gzfile_comment(VALUE obj)
 {
     VALUE str = get_gzfile(obj)->comment;
     if (!NIL_P(str)) {
@@ -2454,8 +2564,7 @@ rb_gzfile_comment(obj)
  * ???
  */
 static VALUE
-rb_gzfile_lineno(obj)
-    VALUE obj;
+rb_gzfile_lineno(VALUE obj)
 {
     return INT2NUM(get_gzfile(obj)->lineno);
 }
@@ -2464,8 +2573,7 @@ rb_gzfile_lineno(obj)
  * ???
  */
 static VALUE
-rb_gzfile_set_lineno(obj, lineno)
-    VALUE obj, lineno;
+rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
 {
     struct gzfile *gz = get_gzfile(obj);
     gz->lineno = NUM2INT(lineno);
@@ -2476,8 +2584,7 @@ rb_gzfile_set_lineno(obj, lineno)
  * ???
  */
 static VALUE
-rb_gzfile_set_mtime(obj, mtime)
-    VALUE obj, mtime;
+rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE val;
@@ -2486,12 +2593,12 @@ rb_gzfile_set_mtime(obj, mtime)
 	rb_raise(cGzError, "header is already written");
     }
 
-    if (FIXNUM_P(time)) {
+    if (FIXNUM_P(mtime)) {
 	gz->mtime = FIX2INT(mtime);
     }
     else {
 	val = rb_Integer(mtime);
-	gz->mtime = FIXNUM_P(val) ? FIX2INT(val) : rb_big2ulong(val);
+	gz->mtime = FIXNUM_P(val) ? FIX2UINT(val) : rb_big2ulong(val);
     }
     return mtime;
 }
@@ -2500,8 +2607,7 @@ rb_gzfile_set_mtime(obj, mtime)
  * ???
  */
 static VALUE
-rb_gzfile_set_orig_name(obj, str)
-    VALUE obj, str;
+rb_gzfile_set_orig_name(VALUE obj, VALUE str)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE s;
@@ -2511,9 +2617,9 @@ rb_gzfile_set_orig_name(obj, str)
 	rb_raise(cGzError, "header is already written");
     }
     s = rb_str_dup(rb_str_to_str(str));
-    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
+    p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s));
     if (p) {
-	rb_str_resize(s, p - RSTRING(s)->ptr);
+	rb_str_resize(s, p - RSTRING_PTR(s));
     }
     gz->orig_name = s;
     return str;
@@ -2523,8 +2629,7 @@ rb_gzfile_set_orig_name(obj, str)
  * ???
  */
 static VALUE
-rb_gzfile_set_comment(obj, str)
-    VALUE obj, str;
+rb_gzfile_set_comment(VALUE obj, VALUE str)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE s;
@@ -2534,9 +2639,9 @@ rb_gzfile_set_comment(obj, str)
 	rb_raise(cGzError, "header is already written");
     }
     s = rb_str_dup(rb_str_to_str(str));
-    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
+    p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s));
     if (p) {
-	rb_str_resize(s, p - RSTRING(s)->ptr);
+	rb_str_resize(s, p - RSTRING_PTR(s));
     }
     gz->comment = s;
     return str;
@@ -2547,8 +2652,7 @@ rb_gzfile_set_comment(obj, str)
  * associated IO object. Returns the associated IO object.
  */
 static VALUE
-rb_gzfile_close(obj)
-    VALUE obj;
+rb_gzfile_close(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE io;
@@ -2564,8 +2668,7 @@ rb_gzfile_close(obj)
  * object.
  */
 static VALUE
-rb_gzfile_finish(obj)
-    VALUE obj;
+rb_gzfile_finish(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE io;
@@ -2579,8 +2682,7 @@ rb_gzfile_finish(obj)
  * Same as IO.
  */
 static VALUE
-rb_gzfile_closed_p(obj)
-    VALUE obj;
+rb_gzfile_closed_p(VALUE obj)
 {
     struct gzfile *gz;
     Data_Get_Struct(obj, struct gzfile, gz);
@@ -2591,8 +2693,7 @@ rb_gzfile_closed_p(obj)
  * ???
  */
 static VALUE
-rb_gzfile_eof_p(obj)
-    VALUE obj;
+rb_gzfile_eof_p(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     return GZFILE_IS_FINISHED(gz) ? Qtrue : Qfalse;
@@ -2602,8 +2703,7 @@ rb_gzfile_eof_p(obj)
  * Same as IO.
  */
 static VALUE
-rb_gzfile_sync(obj)
-    VALUE obj;
+rb_gzfile_sync(VALUE obj)
 {
     return (get_gzfile(obj)->z.flags & GZFILE_FLAG_SYNC) ? Qtrue : Qfalse;
 }
@@ -2616,8 +2716,7 @@ rb_gzfile_sync(obj)
  * decreases sharply.
  */
 static VALUE
-rb_gzfile_set_sync(obj, mode)
-    VALUE obj, mode;
+rb_gzfile_set_sync(VALUE obj, VALUE mode)
 {
     struct gzfile *gz = get_gzfile(obj);
 
@@ -2634,8 +2733,7 @@ rb_gzfile_set_sync(obj, mode)
  * ???
  */
 static VALUE
-rb_gzfile_total_in(obj)
-    VALUE obj;
+rb_gzfile_total_in(VALUE obj)
 {
     return rb_uint2inum(get_gzfile(obj)->z.stream.total_in);
 }
@@ -2644,13 +2742,41 @@ rb_gzfile_total_in(obj)
  * ???
  */
 static VALUE
-rb_gzfile_total_out(obj)
-    VALUE obj;
+rb_gzfile_total_out(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     return rb_uint2inum(gz->z.stream.total_out - gz->z.buf_filled);
 }
 
+/*
+ * Document-method: path
+ *
+ * call-seq: path
+ *
+ * Returns the path string of the associated IO-like object.  This
+ * method is only defined when the IO-like object responds to #path().
+ */
+static VALUE
+rb_gzfile_path(VALUE obj)
+{
+    struct gzfile *gz;
+    Data_Get_Struct(obj, struct gzfile, gz);
+    return gz->path;
+}
+
+static void
+rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
+{
+    if (!NIL_P(opts)) {
+	rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2);
+    }
+    if (gz->enc2) {
+	gz->ecflags = rb_econv_prepare_opts(opts, &opts);
+	gz->ec = rb_econv_open_opts(gz->enc2->name, gz->enc->name,
+				    gz->ecflags, opts);
+	gz->ecopts = opts;
+    }
+}
 
 /* ------------------------------------------------------------------------- */
 
@@ -2658,7 +2784,7 @@ rb_gzfile_total_out(obj)
  * Document-class: Zlib::GzipWriter
  *
  * Zlib::GzipWriter is a class for writing gzipped files.  GzipWriter should
- * be used with an instance of IO, or IO-like, object. 
+ * be used with an instance of IO, or IO-like, object.
  *
  * For example:
  *
@@ -2682,8 +2808,7 @@ rb_gzfile_total_out(obj)
  */
 
 static VALUE
-rb_gzwriter_s_allocate(klass)
-    VALUE klass;
+rb_gzwriter_s_allocate(VALUE klass)
 {
     return gzfile_writer_new(klass);
 }
@@ -2693,13 +2818,10 @@ rb_gzwriter_s_allocate(klass)
  *
  * Opens a file specified by +filename+ for writing gzip compressed data, and
  * returns a GzipWriter object associated with that file.  Further details of
- * this method are found in Zlib::GzipWriter.new and Zlib::GzipWriter#wrap.
+ * this method are found in Zlib::GzipWriter.new and Zlib::GzipFile.wrap.
  */
 static VALUE
-rb_gzwriter_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
 {
     return gzfile_s_open(argc, argv, klass, "wb");
 }
@@ -2713,15 +2835,17 @@ rb_gzwriter_s_open(argc, argv, klass)
  * +write+ method that behaves same as write method in IO class.
  */
 static VALUE
-rb_gzwriter_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
 {
     struct gzfile *gz;
-    VALUE io, level, strategy;
+    VALUE io, level, strategy, opt = Qnil;
     int err;
 
+    if (argc > 1) {
+	opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
+	if (!NIL_P(opt)) argc--;
+    }
+
     rb_scan_args(argc, argv, "12", &io, &level, &strategy);
     Data_Get_Struct(obj, struct gzfile, gz);
 
@@ -2734,6 +2858,12 @@ rb_gzwriter_initialize(argc, argv, obj)
     }
     gz->io = io;
     ZSTREAM_READY(&gz->z);
+    rb_gzfile_ecopts(gz, opt);
+
+    if (rb_respond_to(io, id_path)) {
+	gz->path = rb_funcall(gz->io, id_path, 0);
+	rb_define_singleton_method(obj, "path", rb_gzfile_path, 0);
+    }
 
     return obj;
 }
@@ -2746,10 +2876,7 @@ rb_gzwriter_initialize(argc, argv, obj)
  * +flush+ is omitted.  It is no use giving flush <tt>Zlib::NO_FLUSH</tt>.
  */
 static VALUE
-rb_gzwriter_flush(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE v_flush;
@@ -2759,7 +2886,7 @@ rb_gzwriter_flush(argc, argv, obj)
 
     flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
     if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
-	zstream_run(&gz->z, "", 0, flush);
+	zstream_run(&gz->z, (Bytef*)"", 0, flush);
     }
 
     gzfile_write_raw(gz);
@@ -2773,29 +2900,29 @@ rb_gzwriter_flush(argc, argv, obj)
  * Same as IO.
  */
 static VALUE
-rb_gzwriter_write(obj, str)
-    VALUE obj, str;
+rb_gzwriter_write(VALUE obj, VALUE str)
 {
     struct gzfile *gz = get_gzfile(obj);
 
-    if (TYPE(str) != T_STRING) {
+    if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
+    if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
+	str = rb_str_conv_enc(str, rb_enc_get(str), gz->enc2);
     }
-    gzfile_write(gz, RSTRING(str)->ptr, RSTRING(str)->len);
-    return INT2FIX(RSTRING(str)->len);
+    gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
+    return INT2FIX(RSTRING_LEN(str));
 }
 
 /*
  * Same as IO.
  */
 static VALUE
-rb_gzwriter_putc(obj, ch)
-    VALUE obj, ch;
+rb_gzwriter_putc(VALUE obj, VALUE ch)
 {
     struct gzfile *gz = get_gzfile(obj);
     char c = NUM2CHR(ch);
 
-    gzfile_write(gz, &c, 1);
+    gzfile_write(gz, (Bytef*)&c, 1);
     return ch;
 }
 
@@ -2881,8 +3008,7 @@ rb_gzwriter_putc(obj, ch)
  */
 
 static VALUE
-rb_gzreader_s_allocate(klass)
-    VALUE klass;
+rb_gzreader_s_allocate(VALUE klass)
 {
     return gzfile_reader_new(klass);
 }
@@ -2892,13 +3018,10 @@ rb_gzreader_s_allocate(klass)
  *
  * Opens a file specified by +filename+ as a gzipped file, and returns a
  * GzipReader object associated with that file.  Further details of this method
- * are in Zlib::GzipReader.new and ZLib::GzipReader.wrap.
+ * are in Zlib::GzipReader.new and ZLib::GzipFile.wrap.
  */
 static VALUE
-rb_gzreader_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
 {
     return gzfile_s_open(argc, argv, klass, "rb");
 }
@@ -2914,13 +3037,18 @@ rb_gzreader_s_open(argc, argv, klass)
  * exception.
  */
 static VALUE
-rb_gzreader_initialize(obj, io)
-    VALUE obj, io;
+rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
 {
+    VALUE io, opt = Qnil;
     struct gzfile *gz;
     int err;
 
     Data_Get_Struct(obj, struct gzfile, gz);
+    if (argc > 1) {
+	opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
+	if (!NIL_P(opt)) argc--;
+    }
+    rb_scan_args(argc, argv, "1", &io);
 
     /* this is undocumented feature of zlib */
     err = inflateInit2(&gz->z.stream, -MAX_WBITS);
@@ -2930,6 +3058,12 @@ rb_gzreader_initialize(obj, io)
     gz->io = io;
     ZSTREAM_READY(&gz->z);
     gzfile_read_header(gz);
+    rb_gzfile_ecopts(gz, opt);
+
+    if (rb_respond_to(io, id_path)) {
+	gz->path = rb_funcall(gz->io, id_path, 0);
+	rb_define_singleton_method(obj, "path", rb_gzfile_path, 0);
+    }
 
     return obj;
 }
@@ -2939,8 +3073,7 @@ rb_gzreader_initialize(obj, io)
  * object.  The associated IO object needs to respond to the +seek+ method.
  */
 static VALUE
-rb_gzreader_rewind(obj)
-    VALUE obj;
+rb_gzreader_rewind(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     gzfile_reader_rewind(gz);
@@ -2952,8 +3085,7 @@ rb_gzreader_rewind(obj)
  * +nil+ if the whole gzip file is not parsed yet.
  */
 static VALUE
-rb_gzreader_unused(obj)
-    VALUE obj;
+rb_gzreader_unused(VALUE obj)
 {
     struct gzfile *gz;
     Data_Get_Struct(obj, struct gzfile, gz);
@@ -2964,10 +3096,7 @@ rb_gzreader_unused(obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_read(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE vlen;
@@ -2986,18 +3115,70 @@ rb_gzreader_read(argc, argv, obj)
 }
 
 /*
+ *  call-seq:
+ *     gzipreader.readpartial(maxlen [, outbuf]) => string, outbuf
+ *
+ *  Reads at most <i>maxlen</i> bytes from the gziped stream but
+ *  it blocks only if <em>gzipreader</em> has no data immediately available.
+ *  If the optional <i>outbuf</i> argument is present,
+ *  it must reference a String, which will receive the data.
+ *  It raises <code>EOFError</code> on end of file.
+ */
+static VALUE
+rb_gzreader_readpartial(int argc, VALUE *argv, VALUE obj)
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE vlen, outbuf;
+    int len;
+
+    rb_scan_args(argc, argv, "11", &vlen, &outbuf);
+
+    len = NUM2INT(vlen);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative length %d given", len);
+    }
+    if (!NIL_P(outbuf))
+        Check_Type(outbuf, T_STRING);
+    return gzfile_readpartial(gz, len, outbuf);
+}
+
+/*
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_getc(obj)
-    VALUE obj;
+rb_gzreader_getc(VALUE obj)
+{
+    struct gzfile *gz = get_gzfile(obj);
+
+    return gzfile_getc(gz);
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_readchar(VALUE obj)
+{
+    VALUE dst;
+    dst = rb_gzreader_getc(obj);
+    if (NIL_P(dst)) {
+	rb_raise(rb_eEOFError, "end of file reached");
+    }
+    return dst;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_getbyte(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE dst;
 
     dst = gzfile_read(gz, 1);
     if (!NIL_P(dst)) {
-	dst = INT2FIX((unsigned int)(RSTRING(dst)->ptr[0]) & 0xff);
+	dst = INT2FIX((unsigned int)(RSTRING_PTR(dst)[0]) & 0xff);
     }
     return dst;
 }
@@ -3006,11 +3187,10 @@ rb_gzreader_getc(obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_readchar(obj)
-    VALUE obj;
+rb_gzreader_readbyte(VALUE obj)
 {
     VALUE dst;
-    dst = rb_gzreader_getc(obj);
+    dst = rb_gzreader_getbyte(obj);
     if (NIL_P(dst)) {
 	rb_raise(rb_eEOFError, "end of file reached");
     }
@@ -3021,10 +3201,12 @@ rb_gzreader_readchar(obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_each_byte(obj)
-    VALUE obj;
+rb_gzreader_each_char(VALUE obj)
 {
     VALUE c;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     while (!NIL_P(c = rb_gzreader_getc(obj))) {
 	rb_yield(c);
     }
@@ -3035,17 +3217,50 @@ rb_gzreader_each_byte(obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_ungetc(obj, ch)
-    VALUE obj, ch;
+rb_gzreader_each_byte(VALUE obj)
+{
+    VALUE c;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
+    while (!NIL_P(c = rb_gzreader_getbyte(obj))) {
+	rb_yield(c);
+    }
+    return Qnil;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_ungetc(VALUE obj, VALUE s)
+{
+    struct gzfile *gz;
+
+    if (FIXNUM_P(s))
+	return rb_gzreader_ungetbyte(obj, s);
+    gz = get_gzfile(obj);
+    StringValue(s);
+    if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
+	s = rb_str_conv_enc(s, rb_enc_get(s), gz->enc2);
+    }
+    gzfile_ungets(gz, (const Bytef*)RSTRING_PTR(s), RSTRING_LEN(s));
+    return Qnil;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_ungetbyte(VALUE obj, VALUE ch)
 {
     struct gzfile *gz = get_gzfile(obj);
-    gzfile_ungetc(gz, NUM2CHR(ch));
+    gzfile_ungetbyte(gz, NUM2CHR(ch));
     return Qnil;
 }
 
 static void
-gzreader_skip_linebreaks(gz)
-    struct gzfile *gz;
+gzreader_skip_linebreaks(struct gzfile *gz)
 {
     VALUE str;
     char *p;
@@ -3056,7 +3271,7 @@ gzreader_skip_linebreaks(gz)
 	gzfile_read_more(gz);
     }
     n = 0;
-    p = RSTRING(gz->z.buf)->ptr;
+    p = RSTRING_PTR(gz->z.buf);
 
     while (n++, *(p++) == '\n') {
 	if (n >= gz->z.buf_filled) {
@@ -3067,7 +3282,7 @@ gzreader_skip_linebreaks(gz)
 		gzfile_read_more(gz);
 	    }
 	    n = 0;
-	    p = RSTRING(gz->z.buf)->ptr;
+	    p = RSTRING_PTR(gz->z.buf);
 	}
     }
 
@@ -3076,25 +3291,20 @@ gzreader_skip_linebreaks(gz)
 }
 
 static void
-rscheck(rsptr, rslen, rs)
-    char *rsptr;
-    long rslen;
-    VALUE rs;
+rscheck(const char *rsptr, long rslen, VALUE rs)
 {
-    if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
+    if (RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen)
 	rb_raise(rb_eRuntimeError, "rs modified");
 }
 
 static VALUE
-gzreader_gets(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+gzreader_gets(int argc, VALUE *argv, VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
     volatile VALUE rs;
     VALUE dst;
-    char *rsptr, *p, *res;
+    const char *rsptr;
+    char *p, *res;
     long rslen, n;
     int rspara;
 
@@ -3110,17 +3320,19 @@ gzreader_gets(argc, argv, obj)
 
     if (NIL_P(rs)) {
 	dst = gzfile_read_all(gz);
-	if (RSTRING(dst)->len != 0) gz->lineno++;
+	if (RSTRING_LEN(dst) != 0) gz->lineno++;
+	else
+	    return Qnil;
 	return dst;
     }
 
-    if (RSTRING(rs)->len == 0) {
+    if (RSTRING_LEN(rs) == 0) {
 	rsptr = "\n\n";
 	rslen = 2;
 	rspara = 1;
     } else {
-	rsptr = RSTRING(rs)->ptr;
-	rslen = RSTRING(rs)->len;
+	rsptr = RSTRING_PTR(rs);
+	rslen = RSTRING_LEN(rs);
 	rspara = 0;
     }
 
@@ -3136,13 +3348,13 @@ gzreader_gets(argc, argv, obj)
 	gzfile_read_more(gz);
     }
 
-    p = RSTRING(gz->z.buf)->ptr;
+    p = RSTRING_PTR(gz->z.buf);
     n = rslen;
     for (;;) {
 	if (n > gz->z.buf_filled) {
 	    if (ZSTREAM_IS_FINISHED(&gz->z)) break;
 	    gzfile_read_more(gz);
-	    p = RSTRING(gz->z.buf)->ptr + n - rslen;
+	    p = RSTRING_PTR(gz->z.buf) + n - rslen;
 	}
 	if (!rspara) rscheck(rsptr, rslen, rs);
 	res = memchr(p, rsptr[0], (gz->z.buf_filled - n + 1));
@@ -3162,17 +3374,14 @@ gzreader_gets(argc, argv, obj)
 	gzreader_skip_linebreaks(gz);
     }
 
-    return dst;
+    return gzfile_newstr(gz, dst);
 }
 
 /*
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_gets(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
 {
     VALUE dst;
     dst = gzreader_gets(argc, argv, obj);
@@ -3186,10 +3395,7 @@ rb_gzreader_gets(argc, argv, obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_readline(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
 {
     VALUE dst;
     dst = rb_gzreader_gets(argc, argv, obj);
@@ -3203,12 +3409,12 @@ rb_gzreader_readline(argc, argv, obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_each(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
 {
     VALUE str;
+
+    RETURN_ENUMERATOR(obj, 0, 0);
+
     while (!NIL_P(str = gzreader_gets(argc, argv, obj))) {
 	rb_yield(str);
     }
@@ -3219,10 +3425,7 @@ rb_gzreader_each(argc, argv, obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_readlines(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
 {
     VALUE str, dst;
     dst = rb_ary_new();
@@ -3315,7 +3518,8 @@ rb_gzreader_readlines(argc, argv, obj)
  *   Zlib::OS_UNKNOWN
  *       The return values of Zlib::GzipFile#os_code method.
  */
-void Init_zlib()
+void
+Init_zlib()
 {
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT
@@ -3335,7 +3539,9 @@ void Init_zlib()
 
     rb_define_module_function(mZlib, "zlib_version", rb_zlib_version, 0);
     rb_define_module_function(mZlib, "adler32", rb_zlib_adler32, -1);
+    rb_define_module_function(mZlib, "adler32_combine", rb_zlib_adler32_combine, 3);
     rb_define_module_function(mZlib, "crc32", rb_zlib_crc32, -1);
+    rb_define_module_function(mZlib, "crc32_combine", rb_zlib_crc32_combine, 3);
     rb_define_module_function(mZlib, "crc_table", rb_zlib_crc_table, 0);
 
     rb_define_const(mZlib, "VERSION", rb_str_new2(RUBY_ZLIB_VERSION));
@@ -3369,7 +3575,7 @@ void Init_zlib()
     rb_define_singleton_method(cDeflate, "deflate", rb_deflate_s_deflate, -1);
     rb_define_alloc_func(cDeflate, rb_deflate_s_allocate);
     rb_define_method(cDeflate, "initialize", rb_deflate_initialize, -1);
-    rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 0);
+    rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 1);
     rb_define_method(cDeflate, "deflate", rb_deflate_deflate, -1);
     rb_define_method(cDeflate, "<<", rb_deflate_addstr, 1);
     rb_define_method(cDeflate, "flush", rb_deflate_flush, -1);
@@ -3408,9 +3614,11 @@ void Init_zlib()
 #if GZIP_SUPPORT
     id_write = rb_intern("write");
     id_read = rb_intern("read");
+    id_readpartial = rb_intern("readpartial");
     id_flush = rb_intern("flush");
     id_seek = rb_intern("seek");
     id_close = rb_intern("close");
+    id_path = rb_intern("path");
 
     cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
     cGzError = rb_define_class_under(cGzipFile, "Error", cZError);
@@ -3462,18 +3670,25 @@ void Init_zlib()
 
     rb_define_singleton_method(cGzipReader, "open", rb_gzreader_s_open,-1);
     rb_define_alloc_func(cGzipReader, rb_gzreader_s_allocate);
-    rb_define_method(cGzipReader, "initialize", rb_gzreader_initialize, 1);
+    rb_define_method(cGzipReader, "initialize", rb_gzreader_initialize, -1);
     rb_define_method(cGzipReader, "rewind", rb_gzreader_rewind, 0);
     rb_define_method(cGzipReader, "unused", rb_gzreader_unused, 0);
     rb_define_method(cGzipReader, "read", rb_gzreader_read, -1);
+    rb_define_method(cGzipReader, "readpartial", rb_gzreader_readpartial, -1);
     rb_define_method(cGzipReader, "getc", rb_gzreader_getc, 0);
+    rb_define_method(cGzipReader, "getbyte", rb_gzreader_getbyte, 0);
     rb_define_method(cGzipReader, "readchar", rb_gzreader_readchar, 0);
+    rb_define_method(cGzipReader, "readbyte", rb_gzreader_readbyte, 0);
     rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0);
+    rb_define_method(cGzipReader, "each_char", rb_gzreader_each_char, 0);
+    rb_define_method(cGzipReader, "bytes", rb_gzreader_each_byte, 0);
     rb_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1);
+    rb_define_method(cGzipReader, "ungetbyte", rb_gzreader_ungetbyte, 1);
     rb_define_method(cGzipReader, "gets", rb_gzreader_gets, -1);
     rb_define_method(cGzipReader, "readline", rb_gzreader_readline, -1);
     rb_define_method(cGzipReader, "each", rb_gzreader_each, -1);
     rb_define_method(cGzipReader, "each_line", rb_gzreader_each, -1);
+    rb_define_method(cGzipReader, "lines", rb_gzreader_each, -1);
     rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1);
 
     rb_define_const(mZlib, "OS_CODE", INT2FIX(OS_CODE));
@@ -3527,21 +3742,21 @@ void Init_zlib()
 /*
  * Document-class: Zlib::GzipFile::NoFooter
  *
- * Raised when gzip file footer is not found. 
+ * Raised when gzip file footer is not found.
  */
 
 /*
  * Document-class: Zlib::GzipFile::CRCError
  *
  * Raised when the CRC checksum recorded in gzip file footer is not equivalent
- * to the CRC checksum of the actual uncompressed data. 
+ * to the CRC checksum of the actual uncompressed data.
  */
 
 /*
  * Document-class: Zlib::GzipFile::LengthError
  *
  * Raised when the data length recorded in the gzip file footer is not equivalent
- * to the length of the actual uncompressed data. 
+ * to the length of the actual uncompressed data.
  */
 
 
diff --git a/file.c b/file.c
index d0aaaf8b4e..b4675ef6a4 100644
--- a/file.c
+++ b/file.c
@@ -3,10 +3,9 @@
   file.c -
 
   $Author$
-  $Date$
   created at: Mon Nov 15 12:24:34 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
@@ -20,13 +19,10 @@
 #include <sys/cygwin.h>
 #endif
 
-#define OpenFile rb_io_t
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "ruby/util.h"
 #include "dln.h"
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -35,7 +31,7 @@
 #ifdef HAVE_SYS_FILE_H
 # include <sys/file.h>
 #else
-int flock _((int, int));
+int flock(int, int);
 #endif
 
 #ifdef HAVE_SYS_PARAM_H
@@ -45,9 +41,9 @@ int flock _((int, int));
 # define MAXPATHLEN 1024
 #endif
 
-#include <time.h>
+#include <ctype.h>
 
-VALUE rb_time_new _((time_t, time_t));
+#include <time.h>
 
 #ifdef HAVE_UTIME_H
 #include <utime.h>
@@ -59,10 +55,6 @@ VALUE rb_time_new _((time_t, time_t));
 #include <pwd.h>
 #endif
 
-#ifndef HAVE_STRING_H
-char *strrchr _((const char*,const char));
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -70,22 +62,46 @@ char *strrchr _((const char*,const char));
 #include <sys/mkdev.h>
 #endif
 
+#if defined(HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+
 #if !defined HAVE_LSTAT && !defined lstat
 #define lstat stat
 #endif
-#if !HAVE_FSEEKO && !defined(fseeko)
-# define fseeko  fseek
+
+/* define system APIs */
+#ifdef _WIN32
+#define STAT(p, s)	rb_w32_ustati64(p, s)
+#undef lstat
+#define lstat(p, s)	rb_w32_ustati64(p, s)
+#undef access
+#define access(p, m)	rb_w32_uaccess(p, m)
+#undef chmod
+#define chmod(p, m)	rb_w32_uchmod(p, m)
+#undef chown
+#define chown(p, o, g)	rb_w32_uchown(p, o, g)
+#undef utime
+#define utime(p, t)	rb_w32_uutime(p, t)
+#undef link
+#define link(f, t)	rb_w32_ulink(f, t)
+#undef unlink
+#define unlink(p)	rb_w32_uunlink(p)
+#undef rename
+#define rename(f, t)	rb_w32_urename(f, t)
+#else
+#define STAT(p, s)	stat(p, s)
 #endif
 
-#ifdef __BEOS__ /* should not change ID if -1 */
+#if defined(__BEOS__) || defined(__HAIKU__) /* should not change ID if -1 */
 static int
 be_chown(const char *path, uid_t owner, gid_t group)
 {
-    if (owner == -1 || group == -1) {
+    if (owner == (uid_t)-1 || group == (gid_t)-1) {
 	struct stat st;
-	if (stat(path, &st) < 0) return -1;
-	if (owner == -1) owner = st.st_uid;
-	if (group == -1) group = st.st_gid;
+	if (STAT(path, &st) < 0) return -1;
+	if (owner == (uid_t)-1) owner = st.st_uid;
+	if (group == (gid_t)-1) group = st.st_gid;
     }
     return chown(path, owner, group);
 }
@@ -93,69 +109,149 @@ be_chown(const char *path, uid_t owner, gid_t group)
 static int
 be_fchown(int fd, uid_t owner, gid_t group)
 {
-    if (owner == -1 || group == -1) {
+    if (owner == (uid_t)-1 || group == (gid_t)-1) {
 	struct stat st;
 	if (fstat(fd, &st) < 0) return -1;
-	if (owner == -1) owner = st.st_uid;
-	if (group == -1) group = st.st_gid;
+	if (owner == (uid_t)-1) owner = st.st_uid;
+	if (group == (gid_t)-1) group = st.st_gid;
     }
     return fchown(fd, owner, group);
 }
 #define fchown be_fchown
-#endif /* __BEOS__ */
+#endif /* __BEOS__ || __HAIKU__ */
 
 VALUE rb_cFile;
 VALUE rb_mFileTest;
 VALUE rb_cStat;
 
-static long apply2files _((void (*)(const char *, void *), VALUE, void *));
+#define insecure_obj_p(obj, level) (level >= 4 || (level > 0 && OBJ_TAINTED(obj)))
+
+static VALUE
+file_path_convert(VALUE name)
+{
+#ifndef _WIN32 /* non Windows == Unix */
+    rb_encoding *fname_encoding = rb_enc_from_index(ENCODING_GET(name));
+    rb_encoding *fs_encoding;
+    if (rb_default_internal_encoding() != NULL
+	    && rb_usascii_encoding() != fname_encoding
+	    && rb_ascii8bit_encoding() != fname_encoding
+	    && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) {
+	/* Don't call rb_filesystem_encoding() before US-ASCII and ASCII-8BIT */
+	name = rb_str_conv_enc(name, fname_encoding, fs_encoding);
+    }
+#endif
+    return name;
+}
+
+static VALUE
+rb_get_path_check(VALUE obj, int level)
+{
+    VALUE tmp;
+    ID to_path;
+
+    if (insecure_obj_p(obj, level)) {
+	rb_insecure_operation();
+    }
+
+    CONST_ID(to_path, "to_path");
+    tmp = rb_check_funcall(obj, to_path, 0, 0);
+    if (tmp == Qundef) {
+	tmp = obj;
+    }
+    StringValue(tmp);
+
+    tmp = file_path_convert(tmp);
+    StringValueCStr(tmp);
+    if (obj != tmp && insecure_obj_p(tmp, level)) {
+	rb_insecure_operation();
+    }
+    rb_enc_check(tmp, rb_enc_from_encoding(rb_usascii_encoding()));
+    return rb_str_new4(tmp);
+}
+
+VALUE
+rb_get_path_no_checksafe(VALUE obj)
+{
+    return rb_get_path_check(obj, 0);
+}
+
+VALUE
+rb_get_path(VALUE obj)
+{
+    return rb_get_path_check(obj, rb_safe_level());
+}
+
+VALUE
+rb_str_encode_ospath(VALUE path)
+{
+#ifdef _WIN32
+    rb_encoding *enc = rb_enc_get(path);
+    if (enc != rb_ascii8bit_encoding()) {
+	rb_encoding *utf8 = rb_utf8_encoding();
+	if (enc != utf8)
+	    path = rb_str_encode(path, rb_enc_from_encoding(utf8), 0, Qnil);
+    }
+    else if (RSTRING_LEN(path) > 0) {
+	path = rb_str_dup(path);
+	rb_enc_associate(path, rb_filesystem_encoding());
+	path = rb_str_encode(path, rb_enc_from_encoding(rb_utf8_encoding()), 0, Qnil);
+    }
+#endif
+    return path;
+}
+
 static long
-apply2files(func, vargs, arg)
-    void (*func)_((const char *, void *));
-    VALUE vargs;
-    void *arg;
+apply2files(void (*func)(const char *, void *), VALUE vargs, void *arg)
 {
     long i;
-    VALUE path;
-    struct RArray *args = RARRAY(vargs);
+    volatile VALUE path;
 
-    for (i=0; i<args->len; i++) {
-	path = args->ptr[i];
-	SafeStringValue(path);
+    rb_secure(4);
+    for (i=0; i<RARRAY_LEN(vargs); i++) {
+	path = rb_get_path(RARRAY_PTR(vargs)[i]);
+	path = rb_str_encode_ospath(path);
 	(*func)(StringValueCStr(path), arg);
     }
 
-    return args->len;
+    return RARRAY_LEN(vargs);
 }
 
 /*
  *  call-seq:
- *     file.path -> filename
- *  
+ *     file.path  ->  filename
+ *
  *  Returns the pathname used to create <i>file</i> as a string. Does
  *  not normalize the name.
- *     
+ *
  *     File.new("testfile").path               #=> "testfile"
  *     File.new("/tmp/../tmp/xxx", "w").path   #=> "/tmp/../tmp/xxx"
- *     
+ *
  */
 
 static VALUE
-rb_file_path(obj)
-    VALUE obj;
+rb_file_path(VALUE obj)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     fptr = RFILE(rb_io_taint_check(obj))->fptr;
     rb_io_check_initialized(fptr);
-    if (!fptr->path) return Qnil;
-    return rb_tainted_str_new2(fptr->path);
+    if (NIL_P(fptr->pathv)) return Qnil;
+    return rb_obj_taint(rb_str_dup(fptr->pathv));
+}
+
+static size_t
+stat_memsize(const void *p)
+{
+    return p ? sizeof(struct stat) : 0;
 }
 
+static const rb_data_type_t stat_data_type = {
+    "stat",
+    NULL, RUBY_TYPED_DEFAULT_FREE, stat_memsize,
+};
+
 static VALUE
-stat_new_0(klass, st)
-    VALUE klass;
-    struct stat *st;
+stat_new_0(VALUE klass, struct stat *st)
 {
     struct stat *nst = 0;
 
@@ -163,33 +259,33 @@ stat_new_0(klass, st)
 	nst = ALLOC(struct stat);
 	*nst = *st;
     }
-    return Data_Wrap_Struct(klass, NULL, free, nst);
+    return TypedData_Wrap_Struct(klass, &stat_data_type, nst);
 }
 
 static VALUE
-stat_new(st)
-    struct stat *st;
+stat_new(struct stat *st)
 {
     return stat_new_0(rb_cStat, st);
 }
 
 static struct stat*
-get_stat(self)
-    VALUE self;
+get_stat(VALUE self)
 {
     struct stat* st;
-    Data_Get_Struct(self, struct stat, st);
+    TypedData_Get_Struct(self, struct stat, &stat_data_type, st);
     if (!st) rb_raise(rb_eTypeError, "uninitialized File::Stat");
     return st;
 }
 
+static struct timespec stat_mtimespec(struct stat *st);
+
 /*
  *  call-seq:
- *     stat <=> other_stat    => -1, 0, 1
- *  
+ *     stat <=> other_stat    -> -1, 0, 1, nil
+ *
  *  Compares <code>File::Stat</code> objects by comparing their
  *  respective modification times.
- *     
+ *
  *     f1 = File.new("f1", "w")
  *     sleep 1
  *     f2 = File.new("f2", "w")
@@ -197,71 +293,66 @@ get_stat(self)
  */
 
 static VALUE
-rb_stat_cmp(self, other)
-    VALUE self, other;
+rb_stat_cmp(VALUE self, VALUE other)
 {
     if (rb_obj_is_kind_of(other, rb_obj_class(self))) {
-	time_t t1 = get_stat(self)->st_mtime;
-	time_t t2 = get_stat(other)->st_mtime;
-	if (t1 == t2)
-	    return INT2FIX(0);
-	else if (t1 < t2)
-	    return INT2FIX(-1);
-	else
-	    return INT2FIX(1);
+        struct timespec ts1 = stat_mtimespec(get_stat(self));
+        struct timespec ts2 = stat_mtimespec(get_stat(other));
+        if (ts1.tv_sec == ts2.tv_sec) {
+            if (ts1.tv_nsec == ts2.tv_nsec) return INT2FIX(0);
+            if (ts1.tv_nsec < ts2.tv_nsec) return INT2FIX(-1);
+            return INT2FIX(1);
+        }
+        if (ts1.tv_sec < ts2.tv_sec) return INT2FIX(-1);
+        return INT2FIX(1);
     }
     return Qnil;
 }
 
-static VALUE rb_stat_dev _((VALUE));
-static VALUE rb_stat_ino _((VALUE));
-static VALUE rb_stat_mode _((VALUE));
-static VALUE rb_stat_nlink _((VALUE));
-static VALUE rb_stat_uid _((VALUE));
-static VALUE rb_stat_gid _((VALUE));
-static VALUE rb_stat_rdev _((VALUE));
-static VALUE rb_stat_size _((VALUE));
-static VALUE rb_stat_blksize _((VALUE));
-static VALUE rb_stat_blocks _((VALUE));
-static VALUE rb_stat_atime _((VALUE));
-static VALUE rb_stat_mtime _((VALUE));
-static VALUE rb_stat_ctime _((VALUE));
+#define ST2UINT(val) ((val) & ~(~1UL << (sizeof(val) * CHAR_BIT - 1)))
+
+#ifndef NUM2DEVT
+# define NUM2DEVT(v) NUM2UINT(v)
+#endif
+#ifndef DEVT2NUM
+# define DEVT2NUM(v) UINT2NUM(v)
+#endif
+#ifndef PRI_DEVT_PREFIX
+# define PRI_DEVT_PREFIX ""
+#endif
 
 /*
  *  call-seq:
- *     stat.dev    => fixnum
- *  
+ *     stat.dev    -> fixnum
+ *
  *  Returns an integer representing the device on which <i>stat</i>
  *  resides.
- *     
+ *
  *     File.stat("testfile").dev   #=> 774
  */
 
 static VALUE
-rb_stat_dev(self)
-    VALUE self;
+rb_stat_dev(VALUE self)
 {
-    return INT2NUM(get_stat(self)->st_dev);
+    return DEVT2NUM(get_stat(self)->st_dev);
 }
 
 /*
  *  call-seq:
- *     stat.dev_major   => fixnum
- *  
+ *     stat.dev_major   -> fixnum
+ *
  *  Returns the major part of <code>File_Stat#dev</code> or
  *  <code>nil</code>.
- *     
+ *
  *     File.stat("/dev/fd1").dev_major   #=> 2
  *     File.stat("/dev/tty").dev_major   #=> 5
  */
 
 static VALUE
-rb_stat_dev_major(self)
-    VALUE self;
+rb_stat_dev_major(VALUE self)
 {
 #if defined(major)
-    long dev = get_stat(self)->st_dev;
-    return ULONG2NUM(major(dev));
+    return INT2NUM(major(get_stat(self)->st_dev));
 #else
     return Qnil;
 #endif
@@ -269,43 +360,39 @@ rb_stat_dev_major(self)
 
 /*
  *  call-seq:
- *     stat.dev_minor   => fixnum
- *  
+ *     stat.dev_minor   -> fixnum
+ *
  *  Returns the minor part of <code>File_Stat#dev</code> or
  *  <code>nil</code>.
- *     
+ *
  *     File.stat("/dev/fd1").dev_minor   #=> 1
  *     File.stat("/dev/tty").dev_minor   #=> 0
  */
 
 static VALUE
-rb_stat_dev_minor(self)
-    VALUE self;
+rb_stat_dev_minor(VALUE self)
 {
 #if defined(minor)
-    long dev = get_stat(self)->st_dev;
-    return ULONG2NUM(minor(dev));
+    return INT2NUM(minor(get_stat(self)->st_dev));
 #else
     return Qnil;
 #endif
 }
 
-
 /*
  *  call-seq:
- *     stat.ino   => fixnum
- *  
+ *     stat.ino   -> fixnum
+ *
  *  Returns the inode number for <i>stat</i>.
- *     
+ *
  *     File.stat("testfile").ino   #=> 1083669
- *     
+ *
  */
 
 static VALUE
-rb_stat_ino(self)
-    VALUE self;
+rb_stat_ino(VALUE self)
 {
-#ifdef HUGE_ST_INO
+#if SIZEOF_STRUCT_STAT_ST_INO > SIZEOF_LONG
     return ULL2NUM(get_stat(self)->st_ino);
 #else
     return ULONG2NUM(get_stat(self)->st_ino);
@@ -314,98 +401,87 @@ rb_stat_ino(self)
 
 /*
  *  call-seq:
- *     stat.mode   => fixnum
- *  
+ *     stat.mode   -> fixnum
+ *
  *  Returns an integer representing the permission bits of
  *  <i>stat</i>. The meaning of the bits is platform dependent; on
  *  Unix systems, see <code>stat(2)</code>.
- *     
+ *
  *     File.chmod(0644, "testfile")   #=> 1
  *     s = File.stat("testfile")
  *     sprintf("%o", s.mode)          #=> "100644"
  */
 
 static VALUE
-rb_stat_mode(self)
-    VALUE self;
+rb_stat_mode(VALUE self)
 {
-#ifdef __BORLANDC__
-    return UINT2NUM((unsigned short)(get_stat(self)->st_mode));
-#else
-    return UINT2NUM(get_stat(self)->st_mode);
-#endif
+    return UINT2NUM(ST2UINT(get_stat(self)->st_mode));
 }
 
 /*
  *  call-seq:
- *     stat.nlink   => fixnum
- *  
+ *     stat.nlink   -> fixnum
+ *
  *  Returns the number of hard links to <i>stat</i>.
- *     
+ *
  *     File.stat("testfile").nlink             #=> 1
  *     File.link("testfile", "testfile.bak")   #=> 0
  *     File.stat("testfile").nlink             #=> 2
- *     
+ *
  */
 
 static VALUE
-rb_stat_nlink(self)
-    VALUE self;
+rb_stat_nlink(VALUE self)
 {
     return UINT2NUM(get_stat(self)->st_nlink);
 }
 
-
 /*
  *  call-seq:
- *     stat.uid    => fixnum
- *  
+ *     stat.uid    -> fixnum
+ *
  *  Returns the numeric user id of the owner of <i>stat</i>.
- *     
+ *
  *     File.stat("testfile").uid   #=> 501
- *     
+ *
  */
 
 static VALUE
-rb_stat_uid(self)
-    VALUE self;
+rb_stat_uid(VALUE self)
 {
-    return UINT2NUM(get_stat(self)->st_uid);
+    return UIDT2NUM(get_stat(self)->st_uid);
 }
 
 /*
  *  call-seq:
- *     stat.gid   => fixnum
- *  
+ *     stat.gid   -> fixnum
+ *
  *  Returns the numeric group id of the owner of <i>stat</i>.
- *     
+ *
  *     File.stat("testfile").gid   #=> 500
- *     
+ *
  */
 
 static VALUE
-rb_stat_gid(self)
-    VALUE self;
+rb_stat_gid(VALUE self)
 {
-    return UINT2NUM(get_stat(self)->st_gid);
+    return GIDT2NUM(get_stat(self)->st_gid);
 }
 
-
 /*
  *  call-seq:
- *     stat.rdev   =>  fixnum or nil
- *  
+ *     stat.rdev   ->  fixnum or nil
+ *
  *  Returns an integer representing the device type on which
  *  <i>stat</i> resides. Returns <code>nil</code> if the operating
  *  system doesn't support this feature.
- *     
+ *
  *     File.stat("/dev/fd1").rdev   #=> 513
  *     File.stat("/dev/tty").rdev   #=> 1280
  */
 
 static VALUE
-rb_stat_rdev(self)
-    VALUE self;
+rb_stat_rdev(VALUE self)
 {
 #ifdef HAVE_ST_RDEV
     return ULONG2NUM(get_stat(self)->st_rdev);
@@ -416,18 +492,17 @@ rb_stat_rdev(self)
 
 /*
  *  call-seq:
- *     stat.rdev_major   => fixnum
- *  
+ *     stat.rdev_major   -> fixnum
+ *
  *  Returns the major part of <code>File_Stat#rdev</code> or
  *  <code>nil</code>.
- *     
+ *
  *     File.stat("/dev/fd1").rdev_major   #=> 2
  *     File.stat("/dev/tty").rdev_major   #=> 5
  */
 
 static VALUE
-rb_stat_rdev_major(self)
-    VALUE self;
+rb_stat_rdev_major(VALUE self)
 {
 #if defined(HAVE_ST_RDEV) && defined(major)
     long rdev = get_stat(self)->st_rdev;
@@ -439,18 +514,17 @@ rb_stat_rdev_major(self)
 
 /*
  *  call-seq:
- *     stat.rdev_minor   => fixnum
- *  
+ *     stat.rdev_minor   -> fixnum
+ *
  *  Returns the minor part of <code>File_Stat#rdev</code> or
  *  <code>nil</code>.
- *     
+ *
  *     File.stat("/dev/fd1").rdev_minor   #=> 1
  *     File.stat("/dev/tty").rdev_minor   #=> 0
  */
 
 static VALUE
-rb_stat_rdev_minor(self)
-    VALUE self;
+rb_stat_rdev_minor(VALUE self)
 {
 #if defined(HAVE_ST_RDEV) && defined(minor)
     long rdev = get_stat(self)->st_rdev;
@@ -462,34 +536,32 @@ rb_stat_rdev_minor(self)
 
 /*
  *  call-seq:
- *     stat.size    => fixnum
- *  
+ *     stat.size    -> fixnum
+ *
  *  Returns the size of <i>stat</i> in bytes.
- *     
+ *
  *     File.stat("testfile").size   #=> 66
  */
 
 static VALUE
-rb_stat_size(self)
-    VALUE self;
+rb_stat_size(VALUE self)
 {
     return OFFT2NUM(get_stat(self)->st_size);
 }
 
 /*
  *  call-seq:
- *     stat.blksize   => integer or nil
- *  
+ *     stat.blksize   -> integer or nil
+ *
  *  Returns the native file system's block size. Will return <code>nil</code>
  *  on platforms that don't support this information.
- *     
+ *
  *     File.stat("testfile").blksize   #=> 4096
- *     
+ *
  */
 
 static VALUE
-rb_stat_blksize(self)
-    VALUE self;
+rb_stat_blksize(VALUE self)
 {
 #ifdef HAVE_ST_BLKSIZE
     return ULONG2NUM(get_stat(self)->st_blksize);
@@ -500,104 +572,174 @@ rb_stat_blksize(self)
 
 /*
  *  call-seq:
- *     stat.blocks    => integer or nil
- *  
+ *     stat.blocks    -> integer or nil
+ *
  *  Returns the number of native file system blocks allocated for this
- *  file, or <code>nil</code> if the operating system doesn't 
+ *  file, or <code>nil</code> if the operating system doesn't
  *  support this feature.
- *     
+ *
  *     File.stat("testfile").blocks   #=> 2
  */
 
 static VALUE
-rb_stat_blocks(self)
-    VALUE self;
+rb_stat_blocks(VALUE self)
 {
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
+# if SIZEOF_STRUCT_STAT_ST_BLOCKS > SIZEOF_LONG
+    return ULL2NUM(get_stat(self)->st_blocks);
+# else
     return ULONG2NUM(get_stat(self)->st_blocks);
+# endif
 #else
     return Qnil;
 #endif
 }
 
+static struct timespec
+stat_atimespec(struct stat *st)
+{
+    struct timespec ts;
+    ts.tv_sec = st->st_atime;
+#if defined(HAVE_STRUCT_STAT_ST_ATIM)
+    ts.tv_nsec = st->st_atim.tv_nsec;
+#elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC)
+    ts.tv_nsec = st->st_atimespec.tv_nsec;
+#elif defined(HAVE_STRUCT_STAT_ST_ATIMENSEC)
+    ts.tv_nsec = st->st_atimensec;
+#else
+    ts.tv_nsec = 0;
+#endif
+    return ts;
+}
+
+static VALUE
+stat_atime(struct stat *st)
+{
+    struct timespec ts = stat_atimespec(st);
+    return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
+}
+
+static struct timespec
+stat_mtimespec(struct stat *st)
+{
+    struct timespec ts;
+    ts.tv_sec = st->st_mtime;
+#if defined(HAVE_STRUCT_STAT_ST_MTIM)
+    ts.tv_nsec = st->st_mtim.tv_nsec;
+#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC)
+    ts.tv_nsec = st->st_mtimespec.tv_nsec;
+#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
+    ts.tv_nsec = st->st_mtimensec;
+#else
+    ts.tv_nsec = 0;
+#endif
+    return ts;
+}
+
+static VALUE
+stat_mtime(struct stat *st)
+{
+    struct timespec ts = stat_mtimespec(st);
+    return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
+}
+
+static struct timespec
+stat_ctimespec(struct stat *st)
+{
+    struct timespec ts;
+    ts.tv_sec = st->st_ctime;
+#if defined(HAVE_STRUCT_STAT_ST_CTIM)
+    ts.tv_nsec = st->st_ctim.tv_nsec;
+#elif defined(HAVE_STRUCT_STAT_ST_CTIMESPEC)
+    ts.tv_nsec = st->st_ctimespec.tv_nsec;
+#elif defined(HAVE_STRUCT_STAT_ST_CTIMENSEC)
+    ts.tv_nsec = st->st_ctimensec;
+#else
+    ts.tv_nsec = 0;
+#endif
+    return ts;
+}
+
+static VALUE
+stat_ctime(struct stat *st)
+{
+    struct timespec ts = stat_ctimespec(st);
+    return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
+}
 
 /*
  *  call-seq:
- *     stat.atime   => time
- *  
+ *     stat.atime   -> time
+ *
  *  Returns the last access time for this file as an object of class
  *  <code>Time</code>.
- *     
+ *
  *     File.stat("testfile").atime   #=> Wed Dec 31 18:00:00 CST 1969
- *     
+ *
  */
 
 static VALUE
-rb_stat_atime(self)
-    VALUE self;
+rb_stat_atime(VALUE self)
 {
-    return rb_time_new(get_stat(self)->st_atime, 0);
+    return stat_atime(get_stat(self));
 }
 
 /*
  *  call-seq:
- *     stat.mtime -> aTime
- *  
+ *     stat.mtime  ->  aTime
+ *
  *  Returns the modification time of <i>stat</i>.
- *     
+ *
  *     File.stat("testfile").mtime   #=> Wed Apr 09 08:53:14 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_stat_mtime(self)
-    VALUE self;
+rb_stat_mtime(VALUE self)
 {
-    return rb_time_new(get_stat(self)->st_mtime, 0);
+    return stat_mtime(get_stat(self));
 }
 
 /*
  *  call-seq:
- *     stat.ctime -> aTime
- *  
+ *     stat.ctime  ->  aTime
+ *
  *  Returns the change time for <i>stat</i> (that is, the time
  *  directory information about the file was changed, not the file
  *  itself).
- *     
+ *
  *     File.stat("testfile").ctime   #=> Wed Apr 09 08:53:14 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_stat_ctime(self)
-    VALUE self;
+rb_stat_ctime(VALUE self)
 {
-    return rb_time_new(get_stat(self)->st_ctime, 0);
+    return stat_ctime(get_stat(self));
 }
 
 /*
  * call-seq:
- *   stat.inspect  =>  string
+ *   stat.inspect  ->  string
  *
  * Produce a nicely formatted description of <i>stat</i>.
  *
  *   File.stat("/etc/passwd").inspect
- *      #=> "#<File::Stat dev=0xe000005, ino=1078078, mode=0100644, 
- *           nlink=1, uid=0, gid=0, rdev=0x0, size=1374, blksize=4096, 
- *           blocks=8, atime=Wed Dec 10 10:16:12 CST 2003, 
- *           mtime=Fri Sep 12 15:41:41 CDT 2003, 
- *           ctime=Mon Oct 27 11:20:27 CST 2003>"
+ *      #=> "#<File::Stat dev=0xe000005, ino=1078078, mode=0100644,
+ *      #    nlink=1, uid=0, gid=0, rdev=0x0, size=1374, blksize=4096,
+ *      #    blocks=8, atime=Wed Dec 10 10:16:12 CST 2003,
+ *      #    mtime=Fri Sep 12 15:41:41 CDT 2003,
+ *      #    ctime=Mon Oct 27 11:20:27 CST 2003>"
  */
 
 static VALUE
-rb_stat_inspect(self)
-    VALUE self;
+rb_stat_inspect(VALUE self)
 {
     VALUE str;
-    int i;
+    size_t i;
     static const struct {
 	const char *name;
-	VALUE (*func)_((VALUE));
+	VALUE (*func)(VALUE);
     } member[] = {
 	{"dev",	    rb_stat_dev},
 	{"ino",	    rb_stat_ino},
@@ -614,6 +756,12 @@ rb_stat_inspect(self)
 	{"ctime",   rb_stat_ctime},
     };
 
+    struct stat* st;
+    TypedData_Get_Struct(self, struct stat, &stat_data_type, st);
+    if (!st) {
+        return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
+    }
+
     str = rb_str_buf_new2("#<");
     rb_str_buf_cat2(str, rb_obj_classname(self));
     rb_str_buf_cat2(str, " ");
@@ -628,16 +776,10 @@ rb_stat_inspect(self)
 	rb_str_buf_cat2(str, "=");
 	v = (*member[i].func)(self);
 	if (i == 2) {		/* mode */
-	    char buf[32];
-
-	    sprintf(buf, "0%lo", NUM2ULONG(v));
-	    rb_str_buf_cat2(str, buf);
+	    rb_str_catf(str, "0%lo", (unsigned long)NUM2ULONG(v));
 	}
 	else if (i == 0 || i == 6) { /* dev/rdev */
-	    char buf[32];
-
-	    sprintf(buf, "0x%lx", NUM2ULONG(v));
-	    rb_str_buf_cat2(str, buf);
+	    rb_str_catf(str, "0x%"PRI_DEVT_PREFIX"x", NUM2DEVT(v));
 	}
 	else {
 	    rb_str_append(str, rb_inspect(v));
@@ -650,46 +792,51 @@ rb_stat_inspect(self)
 }
 
 static int
-rb_stat(file, st)
-    VALUE file;
-    struct stat *st;
+rb_stat(VALUE file, struct stat *st)
 {
     VALUE tmp;
 
+    rb_secure(2);
     tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
     if (!NIL_P(tmp)) {
-	OpenFile *fptr;
+	rb_io_t *fptr;
 
-	rb_secure(2);
 	GetOpenFile(tmp, fptr);
-	return fstat(fileno(fptr->f), st);
+	return fstat(fptr->fd, st);
     }
-    SafeStringValue(file);
-    return stat(StringValueCStr(file), st);
+    FilePathValue(file);
+    file = rb_str_encode_ospath(file);
+    return STAT(StringValueCStr(file), st);
 }
 
 #ifdef _WIN32
 static HANDLE
-w32_io_info(file, st)
-    VALUE *file;
-    BY_HANDLE_FILE_INFORMATION *st;
+w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
 {
     VALUE tmp;
     HANDLE f, ret = 0;
 
     tmp = rb_check_convert_type(*file, T_FILE, "IO", "to_io");
     if (!NIL_P(tmp)) {
-	OpenFile *fptr;
+	rb_io_t *fptr;
 
 	GetOpenFile(tmp, fptr);
-	f = (HANDLE)rb_w32_get_osfhandle(fileno(fptr->f));
+	f = (HANDLE)rb_w32_get_osfhandle(fptr->fd);
 	if (f == (HANDLE)-1) return INVALID_HANDLE_VALUE;
     }
     else {
-	SafeStringValue(*file);
-	f = CreateFile(StringValueCStr(*file), 0,
-	               FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
-	               rb_w32_iswin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, NULL);
+	VALUE tmp;
+	WCHAR *ptr;
+	int len;
+	FilePathValue(*file);
+	tmp = rb_str_encode_ospath(*file);
+	len = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, NULL, 0);
+	ptr = ALLOCA_N(WCHAR, len);
+	MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, ptr, len);
+	f = CreateFileW(ptr, 0,
+			FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+			rb_w32_iswin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS,
+			NULL);
 	if (f == INVALID_HANDLE_VALUE) return f;
 	ret = f;
     }
@@ -704,81 +851,82 @@ w32_io_info(file, st)
 
 /*
  *  call-seq:
- *     File.stat(file_name)   =>  stat
- *  
+ *     File.stat(file_name)   ->  stat
+ *
  *  Returns a <code>File::Stat</code> object for the named file (see
  *  <code>File::Stat</code>).
- *     
+ *
  *     File.stat("testfile").mtime   #=> Tue Apr 08 12:58:04 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_file_s_stat(klass, fname)
-    VALUE klass, fname;
+rb_file_s_stat(VALUE klass, VALUE fname)
 {
     struct stat st;
 
-    SafeStringValue(fname);
+    rb_secure(4);
+    FilePathValue(fname);
     if (rb_stat(fname, &st) < 0) {
-	rb_sys_fail(StringValueCStr(fname));
+	rb_sys_fail(RSTRING_PTR(fname));
     }
     return stat_new(&st);
 }
 
 /*
  *  call-seq:
- *     ios.stat    => stat
- *  
+ *     ios.stat    -> stat
+ *
  *  Returns status information for <em>ios</em> as an object of type
  *  <code>File::Stat</code>.
- *     
+ *
  *     f = File.new("testfile")
  *     s = f.stat
  *     "%o" % s.mode   #=> "100644"
  *     s.blksize       #=> 4096
  *     s.atime         #=> Wed Apr 09 08:53:54 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_io_stat(obj)
-    VALUE obj;
+rb_io_stat(VALUE obj)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     struct stat st;
 
+#define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
     GetOpenFile(obj, fptr);
-    if (fstat(fileno(fptr->f), &st) == -1) {
-	rb_sys_fail(fptr->path);
+    if (fstat(fptr->fd, &st) == -1) {
+	rb_sys_fail_path(fptr->pathv);
     }
     return stat_new(&st);
 }
 
 /*
  *  call-seq:
- *     File.lstat(file_name)   => stat
- *  
+ *     File.lstat(file_name)   -> stat
+ *
  *  Same as <code>File::stat</code>, but does not follow the last symbolic
  *  link. Instead, reports on the link itself.
- *     
+ *
  *     File.symlink("testfile", "link2test")   #=> 0
  *     File.stat("testfile").size              #=> 66
  *     File.lstat("link2test").size            #=> 8
  *     File.stat("link2test").size             #=> 66
- *     
+ *
  */
 
 static VALUE
-rb_file_s_lstat(klass, fname)
-    VALUE klass, fname;
+rb_file_s_lstat(VALUE klass, VALUE fname)
 {
 #ifdef HAVE_LSTAT
     struct stat st;
 
-    SafeStringValue(fname);
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
     if (lstat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING(fname)->ptr);
+	rb_sys_fail(RSTRING_PTR(fname));
     }
     return stat_new(&st);
 #else
@@ -786,14 +934,13 @@ rb_file_s_lstat(klass, fname)
 #endif
 }
 
-
 /*
  *  call-seq:
- *     file.lstat   =>  stat
- *  
+ *     file.lstat   ->  stat
+ *
  *  Same as <code>IO#stat</code>, but does not follow the last symbolic
  *  link. Instead, reports on the link itself.
- *     
+ *
  *     File.symlink("testfile", "link2test")   #=> 0
  *     File.stat("testfile").size              #=> 66
  *     f = File.new("link2test")
@@ -802,18 +949,19 @@ rb_file_s_lstat(klass, fname)
  */
 
 static VALUE
-rb_file_lstat(obj)
-    VALUE obj;
+rb_file_lstat(VALUE obj)
 {
 #ifdef HAVE_LSTAT
-    OpenFile *fptr;
+    rb_io_t *fptr;
     struct stat st;
+    VALUE path;
 
     rb_secure(2);
     GetOpenFile(obj, fptr);
-    if (!fptr->path) return Qnil;
-    if (lstat(fptr->path, &st) == -1) {
-	rb_sys_fail(fptr->path);
+    if (NIL_P(fptr->pathv)) return Qnil;
+    path = rb_str_encode_ospath(fptr->pathv);
+    if (lstat(RSTRING_PTR(path), &st) == -1) {
+	rb_sys_fail_path(fptr->pathv);
     }
     return stat_new(&st);
 #else
@@ -821,14 +969,12 @@ rb_file_lstat(obj)
 #endif
 }
 
-#ifndef HAVE_GROUP_MEMBER
 static int
-group_member(gid)
-    GETGROUPS_T gid;
+rb_group_member(GETGROUPS_T gid)
 {
 #ifndef _WIN32
     if (getgid() == gid || getegid() == gid)
-	return Qtrue;
+	return TRUE;
 
 # ifdef HAVE_GETGROUPS
 #  ifndef NGROUPS
@@ -845,13 +991,12 @@ group_member(gid)
 	anum = getgroups(NGROUPS, gary);
 	while (--anum >= 0)
 	    if (gary[anum] == gid)
-		return Qtrue;
+		return TRUE;
     }
 # endif
 #endif
-    return Qfalse;
+    return FALSE;
 }
-#endif
 
 #ifndef S_IXUGO
 #  define S_IXUGO		(S_IXUSR | S_IXGRP | S_IXOTH)
@@ -863,15 +1008,14 @@ group_member(gid)
 
 #ifndef HAVE_EACCESS
 int
-eaccess(path, mode)
-     const char *path;
-     int mode;
+eaccess(const char *path, int mode)
 {
 #ifdef USE_GETEUID
     struct stat st;
-    int euid;
+    rb_uid_t euid;
 
-    if (stat(path, &st) < 0) return -1;
+    if (STAT(path, &st) < 0)
+	return -1;
 
     euid = geteuid();
 
@@ -890,21 +1034,24 @@ eaccess(path, mode)
 
     if (st.st_uid == euid)        /* owner */
 	mode <<= 6;
-    else if (group_member(st.st_gid))
+    else if (rb_group_member(st.st_gid))
 	mode <<= 3;
 
-    if ((st.st_mode & mode) == mode) return 0;
+    if ((int)(st.st_mode & mode) == mode) return 0;
 
     return -1;
 #else
-# if _MSC_VER >= 1400
-    mode &= 6;
-# endif
     return access(path, mode);
 #endif
 }
 #endif
 
+static inline int
+access_internal(const char *path, int mode)
+{
+    return access(path, mode);
+}
+
 
 /*
  * Document-class: FileTest
@@ -913,23 +1060,36 @@ eaccess(path, mode)
  *  those used in <code>File::Stat</code>. It exists as a standalone
  *  module, and its methods are also insinuated into the <code>File</code>
  *  class. (Note that this is not done by inclusion: the interpreter cheats).
- *     
+ *
  */
 
-
 /*
+ * Document-method: exist?
+ *
  * call-seq:
- *   File.directory?(file_name)   =>  true or false
+ *   Dir.exist?(file_name)   ->  true or false
+ *   Dir.exists?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file is a directory,
  * <code>false</code> otherwise.
  *
+ */
+
+/*
+ * Document-method: directory?
+ *
+ * call-seq:
+ *   File.directory?(file_name)   ->  true or false
+ *
+ * Returns <code>true</code> if the named file is a directory,
+ * or a symlink that points at a directory, and <code>false</code>
+ * otherwise.
+ *
  *    File.directory?(".")
  */
 
-static VALUE
-test_d(obj, fname)
-    VALUE obj, fname;
+VALUE
+rb_file_directory_p(VALUE obj, VALUE fname)
 {
 #ifndef S_ISDIR
 #   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
@@ -944,14 +1104,13 @@ test_d(obj, fname)
 
 /*
  * call-seq:
- *   File.pipe?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file is a pipe.
  */
 
 static VALUE
-test_p(obj, fname)
-    VALUE obj, fname;
+rb_file_pipe_p(VALUE obj, VALUE fname)
 {
 #ifdef S_IFIFO
 #  ifndef S_ISFIFO
@@ -969,26 +1128,17 @@ test_p(obj, fname)
 
 /*
  * call-seq:
- *   File.symlink?(file_name)   =>  true or false
+ *   File.symlink?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file is a symbolic link.
  */
 
 static VALUE
-test_l(obj, fname)
-    VALUE obj, fname;
+rb_file_symlink_p(VALUE obj, VALUE fname)
 {
 #ifndef S_ISLNK
 #  ifdef _S_ISLNK
 #    define S_ISLNK(m) _S_ISLNK(m)
-#  elif defined __BORLANDC__
-#    ifdef _S_IFLNK
-#      define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == _S_IFLNK)
-#    else
-#      ifdef S_IFLNK
-#        define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == S_IFLNK)
-#      endif
-#    endif
 #  else
 #    ifdef _S_IFLNK
 #      define S_ISLNK(m) ((m & S_IFMT) == _S_IFLNK)
@@ -1003,7 +1153,9 @@ test_l(obj, fname)
 #ifdef S_ISLNK
     struct stat st;
 
-    SafeStringValue(fname);
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
     if (lstat(StringValueCStr(fname), &st) < 0) return Qfalse;
     if (S_ISLNK(st.st_mode)) return Qtrue;
 #endif
@@ -1013,26 +1165,17 @@ test_l(obj, fname)
 
 /*
  * call-seq:
- *   File.socket?(file_name)   =>  true or false
+ *   File.socket?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file is a socket.
  */
 
 static VALUE
-test_S(obj, fname)
-    VALUE obj, fname;
+rb_file_socket_p(VALUE obj, VALUE fname)
 {
 #ifndef S_ISSOCK
 #  ifdef _S_ISSOCK
 #    define S_ISSOCK(m) _S_ISSOCK(m)
-#  elif defined __BORLANDC__
-#    ifdef _S_IFSOCK
-#      define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == _S_IFSOCK)
-#    else
-#      ifdef S_IFSOCK
-#        define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == S_IFSOCK)
-#      endif
-#    endif
 #  else
 #    ifdef _S_IFSOCK
 #      define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
@@ -1056,14 +1199,13 @@ test_S(obj, fname)
 
 /*
  * call-seq:
- *   File.blockdev?(file_name)   =>  true or false
+ *   File.blockdev?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file is a block device.
  */
 
 static VALUE
-test_b(obj, fname)
-    VALUE obj, fname;
+rb_file_blockdev_p(VALUE obj, VALUE fname)
 {
 #ifndef S_ISBLK
 #   ifdef S_IFBLK
@@ -1085,13 +1227,12 @@ test_b(obj, fname)
 
 /*
  * call-seq:
- *   File.chardev?(file_name)   =>  true or false
+ *   File.chardev?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file is a character device.
  */
 static VALUE
-test_c(obj, fname)
-    VALUE obj, fname;
+rb_file_chardev_p(VALUE obj, VALUE fname)
 {
 #ifndef S_ISCHR
 #   define S_ISCHR(m) ((m & S_IFMT) == S_IFCHR)
@@ -1105,18 +1246,16 @@ test_c(obj, fname)
     return Qfalse;
 }
 
-
 /*
  * call-seq:
- *    File.exist?(file_name)    =>  true or false
- *    File.exists?(file_name)   =>  true or false    (obsolete)
+ *    File.exist?(file_name)    ->  true or false
+ *    File.exists?(file_name)   ->  true or false
  *
  * Return <code>true</code> if the named file exists.
  */
 
 static VALUE
-test_e(obj, fname)
-    VALUE obj, fname;
+rb_file_exist_p(VALUE obj, VALUE fname)
 {
     struct stat st;
 
@@ -1126,104 +1265,173 @@ test_e(obj, fname)
 
 /*
  * call-seq:
- *    File.readable?(file_name)   => true or false
+ *    File.readable?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file is readable by the effective
  * user id of this process.
  */
 
 static VALUE
-test_r(obj, fname)
-    VALUE obj, fname;
+rb_file_readable_p(VALUE obj, VALUE fname)
 {
-    SafeStringValue(fname);
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
     if (eaccess(StringValueCStr(fname), R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    File.readable_real?(file_name)   => true or false
+ *    File.readable_real?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file is readable by the real
  * user id of this process.
  */
 
 static VALUE
-test_R(obj, fname)
-    VALUE obj, fname;
+rb_file_readable_real_p(VALUE obj, VALUE fname)
 {
-    SafeStringValue(fname);
-    if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (access_internal(StringValueCStr(fname), R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
+#ifndef S_IRUGO
+#  define S_IRUGO		(S_IRUSR | S_IRGRP | S_IROTH)
+#endif
+
+#ifndef S_IWUGO
+#  define S_IWUGO		(S_IWUSR | S_IWGRP | S_IWOTH)
+#endif
 
 /*
  * call-seq:
- *    File.writable?(file_name)   => true or false
+ *    File.world_readable?(file_name)   -> fixnum or nil
+ *
+ * If <i>file_name</i> is readable by others, returns an integer
+ * representing the file permission bits of <i>file_name</i>. Returns
+ * <code>nil</code> otherwise. The meaning of the bits is platform
+ * dependent; on Unix systems, see <code>stat(2)</code>.
+ *
+ *    File.world_readable?("/etc/passwd")	    #=> 420
+ *    m = File.world_readable?("/etc/passwd")
+ *    sprintf("%o", m)				    #=> "644"
+ */
+
+static VALUE
+rb_file_world_readable_p(VALUE obj, VALUE fname)
+{
+#ifdef S_IROTH
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qnil;
+    if ((st.st_mode & (S_IROTH)) == S_IROTH) {
+	return UINT2NUM(st.st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
+    }
+#endif
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *    File.writable?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file is writable by the effective
  * user id of this process.
  */
 
 static VALUE
-test_w(obj, fname)
-    VALUE obj, fname;
+rb_file_writable_p(VALUE obj, VALUE fname)
 {
-    SafeStringValue(fname);
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
     if (eaccess(StringValueCStr(fname), W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    File.writable_real?(file_name)   => true or false
+ *    File.writable_real?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file is writable by the real
  * user id of this process.
  */
 
 static VALUE
-test_W(obj, fname)
-    VALUE obj, fname;
+rb_file_writable_real_p(VALUE obj, VALUE fname)
 {
-    SafeStringValue(fname);
-    if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (access_internal(StringValueCStr(fname), W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    File.executable?(file_name)   => true or false
+ *    File.world_writable?(file_name)   -> fixnum or nil
+ *
+ * If <i>file_name</i> is writable by others, returns an integer
+ * representing the file permission bits of <i>file_name</i>. Returns
+ * <code>nil</code> otherwise. The meaning of the bits is platform
+ * dependent; on Unix systems, see <code>stat(2)</code>.
+ *
+ *    File.world_writable?("/tmp")		    #=> 511
+ *    m = File.world_writable?("/tmp")
+ *    sprintf("%o", m)				    #=> "777"
+ */
+
+static VALUE
+rb_file_world_writable_p(VALUE obj, VALUE fname)
+{
+#ifdef S_IWOTH
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qnil;
+    if ((st.st_mode & (S_IWOTH)) == S_IWOTH) {
+	return UINT2NUM(st.st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
+    }
+#endif
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *    File.executable?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file is executable by the effective
  * user id of this process.
  */
 
 static VALUE
-test_x(obj, fname)
-    VALUE obj, fname;
+rb_file_executable_p(VALUE obj, VALUE fname)
 {
-    SafeStringValue(fname);
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
     if (eaccess(StringValueCStr(fname), X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    File.executable_real?(file_name)   => true or false
+ *    File.executable_real?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file is executable by the real
  * user id of this process.
  */
 
 static VALUE
-test_X(obj, fname)
-    VALUE obj, fname;
+rb_file_executable_real_p(VALUE obj, VALUE fname)
 {
-    SafeStringValue(fname);
-    if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (access_internal(StringValueCStr(fname), X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1233,15 +1441,14 @@ test_X(obj, fname)
 
 /*
  * call-seq:
- *    File.file?(file_name)   => true or false
+ *    File.file?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file exists and is a
  * regular file.
  */
 
 static VALUE
-test_f(obj, fname)
-    VALUE obj, fname;
+rb_file_file_p(VALUE obj, VALUE fname)
 {
     struct stat st;
 
@@ -1252,15 +1459,14 @@ test_f(obj, fname)
 
 /*
  * call-seq:
- *    File.zero?(file_name)   => true or false
+ *    File.zero?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file exists and has
  * a zero size.
  */
 
 static VALUE
-test_z(obj, fname)
-    VALUE obj, fname;
+rb_file_zero_p(VALUE obj, VALUE fname)
 {
     struct stat st;
 
@@ -1271,15 +1477,14 @@ test_z(obj, fname)
 
 /*
  * call-seq:
- *    File.size?(file_name)   => Integer or nil
+ *    File.size?(file_name)   -> Integer or nil
  *
  * Returns +nil+ if +file_name+ doesn't exist or has zero size, the size of the
  * file otherwise.
  */
 
 static VALUE
-test_s(obj, fname)
-    VALUE obj, fname;
+rb_file_size_p(VALUE obj, VALUE fname)
 {
     struct stat st;
 
@@ -1290,7 +1495,7 @@ test_s(obj, fname)
 
 /*
  * call-seq:
- *    File.owned?(file_name)   => true or false
+ *    File.owned?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file exists and the
  * effective used id of the calling process is the owner of
@@ -1298,8 +1503,7 @@ test_s(obj, fname)
  */
 
 static VALUE
-test_owned(obj, fname)
-    VALUE obj, fname;
+rb_file_owned_p(VALUE obj, VALUE fname)
 {
     struct stat st;
 
@@ -1309,8 +1513,7 @@ test_owned(obj, fname)
 }
 
 static VALUE
-test_rowned(obj, fname)
-    VALUE obj, fname;
+rb_file_rowned_p(VALUE obj, VALUE fname)
 {
     struct stat st;
 
@@ -1321,7 +1524,7 @@ test_rowned(obj, fname)
 
 /*
  * call-seq:
- *    File.grpowned?(file_name)   => true or false
+ *    File.grpowned?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file exists and the
  * effective group id of the calling process is the owner of
@@ -1329,28 +1532,27 @@ test_rowned(obj, fname)
  */
 
 static VALUE
-test_grpowned(obj, fname)
-    VALUE obj, fname;
+rb_file_grpowned_p(VALUE obj, VALUE fname)
 {
 #ifndef _WIN32
     struct stat st;
 
     if (rb_stat(fname, &st) < 0) return Qfalse;
-    if (group_member(st.st_gid)) return Qtrue;
+    if (rb_group_member(st.st_gid)) return Qtrue;
 #endif
     return Qfalse;
 }
 
 #if defined(S_ISUID) || defined(S_ISGID) || defined(S_ISVTX)
 static VALUE
-check3rdbyte(fname, mode)
-    VALUE fname;
-    int mode;
+check3rdbyte(VALUE fname, int mode)
 {
     struct stat st;
 
-    SafeStringValue(fname);
-    if (stat(StringValueCStr(fname), &st) < 0) return Qfalse;
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (STAT(StringValueCStr(fname), &st) < 0) return Qfalse;
     if (st.st_mode & mode) return Qtrue;
     return Qfalse;
 }
@@ -1358,14 +1560,13 @@ check3rdbyte(fname, mode)
 
 /*
  * call-seq:
- *   File.setuid?(file_name)   =>  true or false
+ *   File.setuid?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file has the setuid bit set.
  */
 
 static VALUE
-test_suid(obj, fname)
-    VALUE obj, fname;
+rb_file_suid_p(VALUE obj, VALUE fname)
 {
 #ifdef S_ISUID
     return check3rdbyte(fname, S_ISUID);
@@ -1376,14 +1577,13 @@ test_suid(obj, fname)
 
 /*
  * call-seq:
- *   File.setgid?(file_name)   =>  true or false
+ *   File.setgid?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file has the setgid bit set.
  */
 
 static VALUE
-test_sgid(obj, fname)
-    VALUE obj, fname;
+rb_file_sgid_p(VALUE obj, VALUE fname)
 {
 #ifdef S_ISGID
     return check3rdbyte(fname, S_ISGID);
@@ -1394,14 +1594,13 @@ test_sgid(obj, fname)
 
 /*
  * call-seq:
- *   File.sticky?(file_name)   =>  true or false
+ *   File.sticky?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file has the sticky bit set.
  */
 
 static VALUE
-test_sticky(obj, fname)
-    VALUE obj, fname;
+rb_file_sticky_p(VALUE obj, VALUE fname)
 {
 #ifdef S_ISVTX
     return check3rdbyte(fname, S_ISVTX);
@@ -1412,7 +1611,7 @@ test_sticky(obj, fname)
 
 /*
  * call-seq:
- *   File.identical?(file_1, file_2)   =>  true or false
+ *   File.identical?(file_1, file_2)   ->  true or false
  *
  * Returns <code>true</code> if the named files are identical.
  *
@@ -1428,8 +1627,7 @@ test_sticky(obj, fname)
  */
 
 static VALUE
-test_identical(obj, fname1, fname2)
-    VALUE obj, fname1, fname2;
+rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
 {
 #ifndef DOSISH
     struct stat st1, st2;
@@ -1439,13 +1637,13 @@ test_identical(obj, fname1, fname2)
     if (st1.st_dev != st2.st_dev) return Qfalse;
     if (st1.st_ino != st2.st_ino) return Qfalse;
 #else
-#ifdef _WIN32
+# ifdef _WIN32
     BY_HANDLE_FILE_INFORMATION st1, st2;
     HANDLE f1 = 0, f2 = 0;
-#endif
+# endif
 
     rb_secure(2);
-#ifdef _WIN32
+# ifdef _WIN32
     f1 = w32_io_info(&fname1, &st1);
     if (f1 == INVALID_HANDLE_VALUE) return Qfalse;
     f2 = w32_io_info(&fname2, &st2);
@@ -1459,17 +1657,19 @@ test_identical(obj, fname1, fname2)
 	return Qtrue;
     if (!f1 || !f2) return Qfalse;
     if (rb_w32_iswin95()) return Qfalse;
-#else
-    SafeStringValue(fname1);
+# else
+    FilePathValue(fname1);
     fname1 = rb_str_new4(fname1);
-    SafeStringValue(fname2);
-    if (access(RSTRING(fname1)->ptr, 0)) return Qfalse;
-    if (access(RSTRING(fname2)->ptr, 0)) return Qfalse;
-#endif
+    fname1 = rb_str_encode_ospath(fname1);
+    FilePathValue(fname2);
+    fname2 = rb_str_encode_ospath(fname2);
+    if (access(RSTRING_PTR(fname1), 0)) return Qfalse;
+    if (access(RSTRING_PTR(fname2), 0)) return Qfalse;
+# endif
     fname1 = rb_file_expand_path(fname1, Qnil);
     fname2 = rb_file_expand_path(fname2, Qnil);
-    if (RSTRING(fname1)->len != RSTRING(fname2)->len) return Qfalse;
-    if (rb_memcicmp(RSTRING(fname1)->ptr, RSTRING(fname2)->ptr, RSTRING(fname1)->len))
+    if (RSTRING_LEN(fname1) != RSTRING_LEN(fname2)) return Qfalse;
+    if (rb_memcicmp(RSTRING_PTR(fname1), RSTRING_PTR(fname2), RSTRING_LEN(fname1)))
 	return Qfalse;
 #endif
     return Qtrue;
@@ -1477,27 +1677,27 @@ test_identical(obj, fname1, fname2)
 
 /*
  * call-seq:
- *    File.size(file_name)   => integer
+ *    File.size(file_name)   -> integer
  *
  * Returns the size of <code>file_name</code>.
  */
 
 static VALUE
-rb_file_s_size(klass, fname)
-    VALUE klass, fname;
+rb_file_s_size(VALUE klass, VALUE fname)
 {
     struct stat st;
 
-    if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(StringValueCStr(fname));
+    if (rb_stat(fname, &st) < 0) {
+	FilePathValue(fname);
+	rb_sys_fail(RSTRING_PTR(fname));
+    }
     return OFFT2NUM(st.st_size);
 }
 
 static VALUE
-rb_file_ftype(st)
-    struct stat *st;
+rb_file_ftype(const struct stat *st)
 {
-    char *t;
+    const char *t;
 
     if (S_ISREG(st->st_mode)) {
 	t = "file";
@@ -1532,33 +1732,34 @@ rb_file_ftype(st)
 	t = "unknown";
     }
 
-    return rb_str_new2(t);
+    return rb_usascii_str_new2(t);
 }
 
 /*
  *  call-seq:
- *     File.ftype(file_name)   => string
- *  
+ *     File.ftype(file_name)   -> string
+ *
  *  Identifies the type of the named file; the return string is one of
  *  ``<code>file</code>'', ``<code>directory</code>'',
  *  ``<code>characterSpecial</code>'', ``<code>blockSpecial</code>'',
  *  ``<code>fifo</code>'', ``<code>link</code>'',
  *  ``<code>socket</code>'', or ``<code>unknown</code>''.
- *     
+ *
  *     File.ftype("testfile")            #=> "file"
  *     File.ftype("/dev/tty")            #=> "characterSpecial"
  *     File.ftype("/tmp/.X11-unix/X0")   #=> "socket"
  */
 
 static VALUE
-rb_file_s_ftype(klass, fname)
-    VALUE klass, fname;
+rb_file_s_ftype(VALUE klass, VALUE fname)
 {
     struct stat st;
 
-    SafeStringValue(fname);
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
     if (lstat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING(fname)->ptr);
+	rb_sys_fail(RSTRING_PTR(fname));
     }
 
     return rb_file_ftype(&st);
@@ -1566,148 +1767,171 @@ rb_file_s_ftype(klass, fname)
 
 /*
  *  call-seq:
- *     File.atime(file_name)  =>  time
- *  
+ *     File.atime(file_name)  ->  time
+ *
  *  Returns the last access time for the named file as a Time object).
- *     
+ *
  *     File.atime("testfile")   #=> Wed Apr 09 08:51:48 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_file_s_atime(klass, fname)
-    VALUE klass, fname;
+rb_file_s_atime(VALUE klass, VALUE fname)
 {
     struct stat st;
 
-    if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(StringValueCStr(fname));
-    return rb_time_new(st.st_atime, 0);
+    if (rb_stat(fname, &st) < 0) {
+	FilePathValue(fname);
+	rb_sys_fail(RSTRING_PTR(fname));
+    }
+    return stat_atime(&st);
 }
 
 /*
  *  call-seq:
- *     file.atime    => time
- *  
+ *     file.atime    -> time
+ *
  *  Returns the last access time (a <code>Time</code> object)
  *   for <i>file</i>, or epoch if <i>file</i> has not been accessed.
- *     
+ *
  *     File.new("testfile").atime   #=> Wed Dec 31 18:00:00 CST 1969
- *     
+ *
  */
 
 static VALUE
-rb_file_atime(obj)
-    VALUE obj;
+rb_file_atime(VALUE obj)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fileno(fptr->f), &st) == -1) {
-	rb_sys_fail(fptr->path);
+    if (fstat(fptr->fd, &st) == -1) {
+	rb_sys_fail_path(fptr->pathv);
     }
-    return rb_time_new(st.st_atime, 0);
+    return stat_atime(&st);
 }
 
 /*
  *  call-seq:
- *     File.mtime(file_name)  =>  time
- *  
+ *     File.mtime(file_name)  ->  time
+ *
  *  Returns the modification time for the named file as a Time object.
- *     
+ *
  *     File.mtime("testfile")   #=> Tue Apr 08 12:58:04 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_file_s_mtime(klass, fname)
-    VALUE klass, fname;
+rb_file_s_mtime(VALUE klass, VALUE fname)
 {
     struct stat st;
 
-    if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(RSTRING(fname)->ptr);
-    return rb_time_new(st.st_mtime, 0);
+    if (rb_stat(fname, &st) < 0) {
+	FilePathValue(fname);
+	rb_sys_fail(RSTRING_PTR(fname));
+    }
+    return stat_mtime(&st);
 }
 
 /*
  *  call-seq:
- *     file.mtime -> time
- *  
+ *     file.mtime  ->  time
+ *
  *  Returns the modification time for <i>file</i>.
- *     
+ *
  *     File.new("testfile").mtime   #=> Wed Apr 09 08:53:14 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_file_mtime(obj)
-    VALUE obj;
+rb_file_mtime(VALUE obj)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fileno(fptr->f), &st) == -1) {
-	rb_sys_fail(fptr->path);
+    if (fstat(fptr->fd, &st) == -1) {
+	rb_sys_fail_path(fptr->pathv);
     }
-    return rb_time_new(st.st_mtime, 0);
+    return stat_mtime(&st);
 }
 
 /*
  *  call-seq:
- *     File.ctime(file_name)  => time
- *  
+ *     File.ctime(file_name)  -> time
+ *
  *  Returns the change time for the named file (the time at which
  *  directory information about the file was changed, not the file
  *  itself).
- *     
+ *
  *     File.ctime("testfile")   #=> Wed Apr 09 08:53:13 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_file_s_ctime(klass, fname)
-    VALUE klass, fname;
+rb_file_s_ctime(VALUE klass, VALUE fname)
 {
     struct stat st;
 
-    if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(RSTRING(fname)->ptr);
-    return rb_time_new(st.st_ctime, 0);
+    if (rb_stat(fname, &st) < 0) {
+	FilePathValue(fname);
+	rb_sys_fail(RSTRING_PTR(fname));
+    }
+    return stat_ctime(&st);
 }
 
 /*
  *  call-seq:
- *     file.ctime -> time
- *  
+ *     file.ctime  ->  time
+ *
  *  Returns the change time for <i>file</i> (that is, the time directory
  *  information about the file was changed, not the file itself).
- *     
+ *
  *     File.new("testfile").ctime   #=> Wed Apr 09 08:53:14 CDT 2003
- *     
+ *
  */
 
 static VALUE
-rb_file_ctime(obj)
-    VALUE obj;
+rb_file_ctime(VALUE obj)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fileno(fptr->f), &st) == -1) {
-	rb_sys_fail(fptr->path);
+    if (fstat(fptr->fd, &st) == -1) {
+	rb_sys_fail_path(fptr->pathv);
     }
-    return rb_time_new(st.st_ctime, 0);
+    return stat_ctime(&st);
+}
+
+/*
+ *  call-seq:
+ *     file.size    -> integer
+ *
+ *  Returns the size of <i>file</i> in bytes.
+ *
+ *     File.new("testfile").size   #=> 66
+ *
+ */
+
+static VALUE
+rb_file_size(VALUE obj)
+{
+    rb_io_t *fptr;
+    struct stat st;
+
+    GetOpenFile(obj, fptr);
+    if (fptr->mode & FMODE_WRITABLE) {
+	rb_io_flush(obj);
+    }
+    if (fstat(fptr->fd, &st) == -1) {
+	rb_sys_fail_path(fptr->pathv);
+    }
+    return OFFT2NUM(st.st_size);
 }
 
-static void chmod_internal _((const char *, void *));
 static void
-chmod_internal(path, mode)
-    const char *path;
-    void *mode;
+chmod_internal(const char *path, void *mode)
 {
     if (chmod(path, *(int *)mode) < 0)
 	rb_sys_fail(path);
@@ -1715,21 +1939,19 @@ chmod_internal(path, mode)
 
 /*
  *  call-seq:
- *     File.chmod(mode_int, file_name, ... ) -> integer
- *  
+ *     File.chmod(mode_int, file_name, ... )  ->  integer
+ *
  *  Changes permission bits on the named file(s) to the bit pattern
  *  represented by <i>mode_int</i>. Actual effects are operating system
  *  dependent (see the beginning of this section). On Unix systems, see
  *  <code>chmod(2)</code> for details. Returns the number of files
  *  processed.
- *     
+ *
  *     File.chmod(0644, "testfile", "out")   #=> 2
  */
 
 static VALUE
-rb_file_s_chmod(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_file_s_chmod(int argc, VALUE *argv)
 {
     VALUE vmode;
     VALUE rest;
@@ -1746,65 +1968,63 @@ rb_file_s_chmod(argc, argv)
 
 /*
  *  call-seq:
- *     file.chmod(mode_int)   => 0
- *  
+ *     file.chmod(mode_int)   -> 0
+ *
  *  Changes permission bits on <i>file</i> to the bit pattern
  *  represented by <i>mode_int</i>. Actual effects are platform
  *  dependent; on Unix systems, see <code>chmod(2)</code> for details.
  *  Follows symbolic links. Also see <code>File#lchmod</code>.
- *     
+ *
  *     f = File.new("out", "w");
  *     f.chmod(0644)   #=> 0
  */
 
 static VALUE
-rb_file_chmod(obj, vmode)
-    VALUE obj, vmode;
+rb_file_chmod(VALUE obj, VALUE vmode)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     int mode;
+#ifndef HAVE_FCHMOD
+    VALUE path;
+#endif
 
     rb_secure(2);
     mode = NUM2INT(vmode);
 
     GetOpenFile(obj, fptr);
 #ifdef HAVE_FCHMOD
-    if (fchmod(fileno(fptr->f), mode) == -1)
-	rb_sys_fail(fptr->path);
+    if (fchmod(fptr->fd, mode) == -1)
+	rb_sys_fail_path(fptr->pathv);
 #else
-    if (!fptr->path) return Qnil;
-    if (chmod(fptr->path, mode) == -1)
-	rb_sys_fail(fptr->path);
+    if (NIL_P(fptr->pathv)) return Qnil;
+    path = rb_str_encode_ospath(fptr->pathv);
+    if (chmod(RSTRING_PTR(path), mode) == -1)
+	rb_sys_fail_path(fptr->pathv);
 #endif
 
     return INT2FIX(0);
 }
 
 #if defined(HAVE_LCHMOD)
-static void lchmod_internal _((const char *, void *));
 static void
-lchmod_internal(path, mode)
-    const char *path;
-    void *mode;
+lchmod_internal(const char *path, void *mode)
 {
-    if (lchmod(path, (int)mode) < 0)
+    if (lchmod(path, (int)(VALUE)mode) < 0)
 	rb_sys_fail(path);
 }
 
 /*
  *  call-seq:
- *     File.lchmod(mode_int, file_name, ...)  => integer
- *  
+ *     File.lchmod(mode_int, file_name, ...)  -> integer
+ *
  *  Equivalent to <code>File::chmod</code>, but does not follow symbolic
  *  links (so it will change the permissions associated with the link,
  *  not the file referenced by the link). Often not available.
- *     
+ *
  */
 
 static VALUE
-rb_file_s_lchmod(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_file_s_lchmod(int argc, VALUE *argv)
 {
     VALUE vmode;
     VALUE rest;
@@ -1818,50 +2038,39 @@ rb_file_s_lchmod(argc, argv)
     return LONG2FIX(n);
 }
 #else
-static VALUE
-rb_file_s_lchmod(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    rb_notimplement();
-    return Qnil;		/* not reached */
-}
+#define rb_file_s_lchmod rb_f_notimplement
 #endif
 
 struct chown_args {
-    int owner, group;
+    rb_uid_t owner;
+    rb_gid_t group;
 };
 
-static void chown_internal _((const char *, void *));
 static void
-chown_internal(path, argp)
-    const char *path;
-    void *argp;
+chown_internal(const char *path, void *arg)
 {
-    struct chown_args *args = (struct chown_args *)argp;
+    struct chown_args *args = arg;
     if (chown(path, args->owner, args->group) < 0)
 	rb_sys_fail(path);
 }
 
 /*
  *  call-seq:
- *     File.chown(owner_int, group_int, file_name,... ) -> integer
- *  
+ *     File.chown(owner_int, group_int, file_name,... )  ->  integer
+ *
  *  Changes the owner and group of the named file(s) to the given
  *  numeric owner and group id's. Only a process with superuser
  *  privileges may change the owner of a file. The current owner of a
  *  file may change the file's group to any group to which the owner
  *  belongs. A <code>nil</code> or -1 owner or group id is ignored.
  *  Returns the number of files processed.
- *     
+ *
  *     File.chown(nil, 100, "testfile")
- *     
+ *
  */
 
 static VALUE
-rb_file_s_chown(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_file_s_chown(int argc, VALUE *argv)
 {
     VALUE o, g, rest;
     struct chown_args arg;
@@ -1873,13 +2082,13 @@ rb_file_s_chown(argc, argv)
 	arg.owner = -1;
     }
     else {
-	arg.owner = NUM2INT(o);
+	arg.owner = NUM2UIDT(o);
     }
     if (NIL_P(g)) {
 	arg.group = -1;
     }
     else {
-	arg.group = NUM2INT(g);
+	arg.group = NUM2GIDT(g);
     }
 
     n = apply2files(chown_internal, rest, &arg);
@@ -1888,70 +2097,67 @@ rb_file_s_chown(argc, argv)
 
 /*
  *  call-seq:
- *     file.chown(owner_int, group_int )   => 0
- *  
+ *     file.chown(owner_int, group_int )   -> 0
+ *
  *  Changes the owner and group of <i>file</i> to the given numeric
  *  owner and group id's. Only a process with superuser privileges may
  *  change the owner of a file. The current owner of a file may change
  *  the file's group to any group to which the owner belongs. A
  *  <code>nil</code> or -1 owner or group id is ignored. Follows
  *  symbolic links. See also <code>File#lchown</code>.
- *     
+ *
  *     File.new("testfile").chown(502, 1000)
- *     
+ *
  */
 
 static VALUE
-rb_file_chown(obj, owner, group)
-    VALUE obj, owner, group;
+rb_file_chown(VALUE obj, VALUE owner, VALUE group)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     int o, g;
+#ifndef HAVE_FCHOWN
+    VALUE path;
+#endif
 
     rb_secure(2);
     o = NIL_P(owner) ? -1 : NUM2INT(owner);
     g = NIL_P(group) ? -1 : NUM2INT(group);
     GetOpenFile(obj, fptr);
-#if defined(DJGPP) || defined(__CYGWIN32__) || defined(_WIN32) || defined(__EMX__)
-    if (!fptr->path) return Qnil;
-    if (chown(fptr->path, o, g) == -1)
-	rb_sys_fail(fptr->path);
+#ifndef HAVE_FCHOWN
+    if (NIL_P(fptr->pathv)) return Qnil;
+    path = rb_str_encode_ospath(fptr->pathv);
+    if (chown(RSTRING_PTR(path), o, g) == -1)
+	rb_sys_fail_path(fptr->pathv);
 #else
-    if (fchown(fileno(fptr->f), o, g) == -1)
-	rb_sys_fail(fptr->path);
+    if (fchown(fptr->fd, o, g) == -1)
+	rb_sys_fail_path(fptr->pathv);
 #endif
 
     return INT2FIX(0);
 }
 
-#if defined(HAVE_LCHOWN) && !defined(__CHECKER__)
-static void lchown_internal _((const char *, void *));
+#if defined(HAVE_LCHOWN)
 static void
-lchown_internal(path, argp)
-    const char *path;
-    void *argp;
+lchown_internal(const char *path, void *arg)
 {
-    struct chown_args *args = (struct chown_args *)argp;
+    struct chown_args *args = arg;
     if (lchown(path, args->owner, args->group) < 0)
 	rb_sys_fail(path);
 }
 
-
 /*
  *  call-seq:
- *     file.lchown(owner_int, group_int, file_name,..) => integer
- *  
+ *     file.lchown(owner_int, group_int, file_name,..) -> integer
+ *
  *  Equivalent to <code>File::chown</code>, but does not follow symbolic
  *  links (so it will change the owner associated with the link, not the
  *  file referenced by the link). Often not available. Returns number
  *  of files in the argument list.
- *     
+ *
  */
 
 static VALUE
-rb_file_s_lchown(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_file_s_lchown(int argc, VALUE *argv)
 {
     VALUE o, g, rest;
     struct chown_args arg;
@@ -1963,72 +2169,101 @@ rb_file_s_lchown(argc, argv)
 	arg.owner = -1;
     }
     else {
-	arg.owner = NUM2INT(o);
+	arg.owner = NUM2UIDT(o);
     }
     if (NIL_P(g)) {
 	arg.group = -1;
     }
     else {
-	arg.group = NUM2INT(g);
+	arg.group = NUM2GIDT(g);
     }
 
     n = apply2files(lchown_internal, rest, &arg);
     return LONG2FIX(n);
 }
 #else
-static VALUE
-rb_file_s_lchown(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    rb_notimplement();
-}
+#define rb_file_s_lchown rb_f_notimplement
 #endif
 
-struct timeval rb_time_timeval();
+struct timespec rb_time_timespec(VALUE time);
 
-static void utime_internal _((const char *, void *));
+struct utime_args {
+    const struct timespec* tsp;
+    VALUE atime, mtime;
+};
 
-#if defined(HAVE_UTIMES) && !defined(__CHECKER__)
+#if defined DOSISH || defined __CYGWIN__
+NORETURN(static void utime_failed(const char *, const struct timespec *, VALUE, VALUE));
 
 static void
-utime_internal(path, arg)
-    const char *path;
-    void *arg;
+utime_failed(const char *path, const struct timespec *tsp, VALUE atime, VALUE mtime)
 {
-    struct timeval *tvp = arg;
-    if (utimes(path, tvp) < 0)
-	rb_sys_fail(path);
+    if (tsp && errno == EINVAL) {
+	VALUE e[2], a = Qnil, m = Qnil;
+	int d = 0;
+	if (!NIL_P(atime)) {
+	    a = rb_inspect(atime);
+	}
+	if (!NIL_P(mtime) && mtime != atime && !rb_equal(atime, mtime)) {
+	    m = rb_inspect(mtime);
+	}
+	if (NIL_P(a)) e[0] = m;
+	else if (NIL_P(m) || rb_str_cmp(a, m) == 0) e[0] = a;
+	else {
+	    e[0] = rb_str_plus(a, rb_str_new_cstr(" or "));
+	    rb_str_append(e[0], m);
+	    d = 1;
+	}
+	if (!NIL_P(e[0])) {
+	    if (path) {
+		if (!d) e[0] = rb_str_dup(e[0]);
+		rb_str_cat2(rb_str_cat2(e[0], " for "), path);
+	    }
+	    e[1] = INT2FIX(EINVAL);
+	    rb_exc_raise(rb_class_new_instance(2, e, rb_eSystemCallError));
+	}
+	errno = EINVAL;
+    }
+    rb_sys_fail(path);
 }
+#else
+#define utime_failed(path, tsp, atime, mtime) rb_sys_fail(path)
+#endif
 
-/*
- * call-seq:
- *  File.utime(atime, mtime, file_name,...)   =>  integer
- *
- * Sets the access and modification times of each
- * named file to the first two arguments. Returns
- * the number of file names in the argument list.
- */
-
-static VALUE
-rb_file_s_utime(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE atime, mtime, rest;
-    struct timeval tvs[2], *tvp = NULL;
-    long n;
-
-    rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
+#if defined(HAVE_UTIMES)
 
-    if (!NIL_P(atime) || !NIL_P(mtime)) {
-	tvp = tvs;
-	tvp[0] = rb_time_timeval(atime);
-	tvp[1] = rb_time_timeval(mtime);
+static void
+utime_internal(const char *path, void *arg)
+{
+    struct utime_args *v = arg;
+    const struct timespec *tsp = v->tsp;
+    struct timeval tvbuf[2], *tvp = NULL;
+
+#ifdef HAVE_UTIMENSAT
+    static int try_utimensat = 1;
+
+    if (try_utimensat) {
+        if (utimensat(AT_FDCWD, path, tsp, 0) < 0) {
+            if (errno == ENOSYS) {
+                try_utimensat = 0;
+                goto no_utimensat;
+            }
+            utime_failed(path, tsp, v->atime, v->mtime);
+        }
+        return;
     }
+no_utimensat:
+#endif
 
-    n = apply2files(utime_internal, rest, tvp);
-    return LONG2FIX(n);
+    if (tsp) {
+        tvbuf[0].tv_sec = tsp[0].tv_sec;
+        tvbuf[0].tv_usec = (int)(tsp[0].tv_nsec / 1000);
+        tvbuf[1].tv_sec = tsp[1].tv_sec;
+        tvbuf[1].tv_usec = (int)(tsp[1].tv_nsec / 1000);
+        tvp = tvbuf;
+    }
+    if (utimes(path, tvp) < 0)
+	utime_failed(path, tsp, v->atime, v->mtime);
 }
 
 #else
@@ -2041,139 +2276,173 @@ struct utimbuf {
 #endif
 
 static void
-utime_internal(path, arg)
-    const char *path;
-    void *arg;
+utime_internal(const char *path, void *arg)
 {
-    struct utimbuf *utp = arg;
+    struct utime_args *v = arg;
+    const struct timespec *tsp = v->tsp;
+    struct utimbuf utbuf, *utp = NULL;
+    if (tsp) {
+        utbuf.actime = tsp[0].tv_sec;
+        utbuf.modtime = tsp[1].tv_sec;
+        utp = &utbuf;
+    }
     if (utime(path, utp) < 0)
-	rb_sys_fail(path);
+	utime_failed(path, tsp, v->atime, v->mtime);
 }
 
+#endif
+
+/*
+ * call-seq:
+ *  File.utime(atime, mtime, file_name,...)   ->  integer
+ *
+ * Sets the access and modification times of each
+ * named file to the first two arguments. Returns
+ * the number of file names in the argument list.
+ */
+
 static VALUE
-rb_file_s_utime(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_file_s_utime(int argc, VALUE *argv)
 {
-    VALUE atime, mtime, rest;
+    VALUE rest;
+    struct utime_args args;
+    struct timespec tss[2], *tsp = NULL;
     long n;
-    struct timeval tv;
-    struct utimbuf utbuf, *utp = NULL;
 
-    rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
+    rb_secure(2);
+    rb_scan_args(argc, argv, "2*", &args.atime, &args.mtime, &rest);
 
-    if (!NIL_P(atime) || !NIL_P(mtime)) {
-	utp = &utbuf;
-	tv = rb_time_timeval(atime);
-	utp->actime = tv.tv_sec;
-	tv = rb_time_timeval(mtime);
-	utp->modtime = tv.tv_sec;
+    if (!NIL_P(args.atime) || !NIL_P(args.mtime)) {
+	tsp = tss;
+	tsp[0] = rb_time_timespec(args.atime);
+	tsp[1] = rb_time_timespec(args.mtime);
     }
+    args.tsp = tsp;
 
-    n = apply2files(utime_internal, rest, utp);
+    n = apply2files(utime_internal, rest, &args);
     return LONG2FIX(n);
 }
 
-#endif
-
-NORETURN(static void sys_fail2 _((VALUE,VALUE)));
+NORETURN(static void sys_fail2(VALUE,VALUE));
 static void
-sys_fail2(s1, s2)
-    VALUE s1, s2;
+sys_fail2(VALUE s1, VALUE s2)
 {
     char *buf;
-    int len;
+#ifdef MAX_PATH
+    const int max_pathlen = MAX_PATH;
+#else
+    const int max_pathlen = MAXPATHLEN;
+#endif
+    const char *e1, *e2;
+    int len = 5;
+    long l1 = RSTRING_LEN(s1), l2 = RSTRING_LEN(s2);
 
-    len = RSTRING(s1)->len + RSTRING(s2)->len + 5;
+    e1 = e2 = "";
+    if (l1 > max_pathlen) {
+	l1 = max_pathlen - 3;
+	e1 = "...";
+	len += 3;
+    }
+    if (l2 > max_pathlen) {
+	l2 = max_pathlen - 3;
+	e2 = "...";
+	len += 3;
+    }
+    len += (int)l1 + (int)l2;
     buf = ALLOCA_N(char, len);
-    snprintf(buf, len, "%s or %s", RSTRING(s1)->ptr, RSTRING(s2)->ptr);
+    snprintf(buf, len, "(%.*s%s, %.*s%s)",
+	     (int)l1, RSTRING_PTR(s1), e1,
+	     (int)l2, RSTRING_PTR(s2), e2);
     rb_sys_fail(buf);
 }
 
+#ifdef HAVE_LINK
 /*
  *  call-seq:
- *     File.link(old_name, new_name)    => 0
- *  
+ *     File.link(old_name, new_name)    -> 0
+ *
  *  Creates a new name for an existing file using a hard link. Will not
  *  overwrite <i>new_name</i> if it already exists (raising a subclass
  *  of <code>SystemCallError</code>). Not available on all platforms.
- *     
+ *
  *     File.link("testfile", ".testfile")   #=> 0
  *     IO.readlines(".testfile")[0]         #=> "This is line one\n"
  */
 
 static VALUE
-rb_file_s_link(klass, from, to)
-    VALUE klass, from, to;
+rb_file_s_link(VALUE klass, VALUE from, VALUE to)
 {
-#ifdef HAVE_LINK
-    SafeStringValue(from);
-    SafeStringValue(to);
+    rb_secure(2);
+    FilePathValue(from);
+    FilePathValue(to);
+    from = rb_str_encode_ospath(from);
+    to = rb_str_encode_ospath(to);
 
     if (link(StringValueCStr(from), StringValueCStr(to)) < 0) {
 	sys_fail2(from, to);
     }
     return INT2FIX(0);
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define rb_file_s_link rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_SYMLINK
 /*
  *  call-seq:
- *     File.symlink(old_name, new_name)   => 0
- *  
+ *     File.symlink(old_name, new_name)   -> 0
+ *
  *  Creates a symbolic link called <i>new_name</i> for the existing file
  *  <i>old_name</i>. Raises a <code>NotImplemented</code> exception on
  *  platforms that do not support symbolic links.
- *     
+ *
  *     File.symlink("testfile", "link2test")   #=> 0
- *     
+ *
  */
 
 static VALUE
-rb_file_s_symlink(klass, from, to)
-    VALUE klass, from, to;
+rb_file_s_symlink(VALUE klass, VALUE from, VALUE to)
 {
-#ifdef HAVE_SYMLINK
-    SafeStringValue(from);
-    SafeStringValue(to);
+    rb_secure(2);
+    FilePathValue(from);
+    FilePathValue(to);
+    from = rb_str_encode_ospath(from);
+    to = rb_str_encode_ospath(to);
 
     if (symlink(StringValueCStr(from), StringValueCStr(to)) < 0) {
 	sys_fail2(from, to);
     }
     return INT2FIX(0);
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define rb_file_s_symlink rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_READLINK
 /*
  *  call-seq:
- *     File.readlink(link_name) -> file_name
- *  
+ *     File.readlink(link_name)  ->  file_name
+ *
  *  Returns the name of the file referenced by the given link.
  *  Not available on all platforms.
- *     
+ *
  *     File.symlink("testfile", "link2test")   #=> 0
  *     File.readlink("link2test")              #=> "testfile"
  */
 
 static VALUE
-rb_file_s_readlink(klass, path)
-    VALUE klass, path;
+rb_file_s_readlink(VALUE klass, VALUE path)
 {
-#ifdef HAVE_READLINK
     char *buf;
     int size = 100;
-    int rv;
+    ssize_t rv;
     VALUE v;
 
-    SafeStringValue(path);
+    rb_secure(2);
+    FilePathValue(path);
+    path = rb_str_encode_ospath(path);
     buf = xmalloc(size);
-    while ((rv = readlink(RSTRING(path)->ptr, buf, size)) == size
+    while ((rv = readlink(RSTRING_PTR(path), buf, size)) == size
 #ifdef _AIX
 	    || (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
 #endif
@@ -2182,24 +2451,20 @@ rb_file_s_readlink(klass, path)
 	buf = xrealloc(buf, size);
     }
     if (rv < 0) {
-	free(buf);
-	rb_sys_fail(RSTRING(path)->ptr);
+	xfree(buf);
+	rb_sys_fail_path(path);
     }
-    v = rb_tainted_str_new(buf, rv);
-    free(buf);
+    v = rb_filesystem_str_new(buf, rv);
+    xfree(buf);
 
     return v;
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define rb_file_s_readlink rb_f_notimplement
 #endif
-}
 
-static void unlink_internal _((const char *, void *));
 static void
-unlink_internal(path, arg)
-    const char *path;
-    void *arg;
+unlink_internal(const char *path, void *arg)
 {
     if (unlink(path) < 0)
 	rb_sys_fail(path);
@@ -2207,17 +2472,16 @@ unlink_internal(path, arg)
 
 /*
  *  call-seq:
- *     File.delete(file_name, ...)  => integer
- *     File.unlink(file_name, ...)  => integer
- *  
+ *     File.delete(file_name, ...)  -> integer
+ *     File.unlink(file_name, ...)  -> integer
+ *
  *  Deletes the named files, returning the number of names
  *  passed as arguments. Raises an exception on any error.
  *  See also <code>Dir::rmdir</code>.
  */
 
 static VALUE
-rb_file_s_unlink(klass, args)
-    VALUE klass, args;
+rb_file_s_unlink(VALUE klass, VALUE args)
 {
     long n;
 
@@ -2228,29 +2492,32 @@ rb_file_s_unlink(klass, args)
 
 /*
  *  call-seq:
- *     File.rename(old_name, new_name)   => 0
- *  
+ *     File.rename(old_name, new_name)   -> 0
+ *
  *  Renames the given file to the new name. Raises a
  *  <code>SystemCallError</code> if the file cannot be renamed.
- *     
+ *
  *     File.rename("afile", "afile.bak")   #=> 0
  */
 
 static VALUE
-rb_file_s_rename(klass, from, to)
-    VALUE klass, from, to;
+rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
 {
     const char *src, *dst;
-    SafeStringValue(from);
-    SafeStringValue(to);
+    VALUE f, t;
 
-    src = StringValueCStr(from);
-    dst = StringValueCStr(to);
+    rb_secure(2);
+    FilePathValue(from);
+    FilePathValue(to);
+    f = rb_str_encode_ospath(from);
+    t = rb_str_encode_ospath(to);
+    src = StringValueCStr(f);
+    dst = StringValueCStr(t);
 #if defined __CYGWIN__
     errno = 0;
 #endif
     if (rename(src, dst) < 0) {
-#if defined DOSISH && !defined _WIN32
+#if defined DOSISH
 	switch (errno) {
 	  case EEXIST:
 #if defined (__EMX__)
@@ -2270,23 +2537,21 @@ rb_file_s_rename(klass, from, to)
 
 /*
  *  call-seq:
- *     File.umask()          => integer
- *     File.umask(integer)   => integer
- *  
+ *     File.umask()          -> integer
+ *     File.umask(integer)   -> integer
+ *
  *  Returns the current umask value for this process. If the optional
  *  argument is given, set the umask to that value and return the
  *  previous value. Umask values are <em>subtracted</em> from the
  *  default permissions, so a umask of <code>0222</code> would make a
  *  file read-only for everyone.
- *     
+ *
  *     File.umask(0006)   #=> 18
  *     File.umask         #=> 6
  */
 
 static VALUE
-rb_file_s_umask(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_file_s_umask(int argc, VALUE *argv)
 {
     int omask = 0;
 
@@ -2299,7 +2564,7 @@ rb_file_s_umask(argc, argv)
 	omask = umask(NUM2INT(argv[0]));
     }
     else {
-	rb_raise(rb_eArgError, "wrong number of arguments");
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
     }
     return INT2FIX(omask);
 }
@@ -2310,35 +2575,42 @@ rb_file_s_umask(argc, argv)
 #if defined __CYGWIN__ || defined DOSISH
 #define DOSISH_UNC
 #define DOSISH_DRIVE_LETTER
-#define isdirsep(x) ((x) == '/' || (x) == '\\')
+#define FILE_ALT_SEPARATOR '\\'
+#endif
+#ifdef FILE_ALT_SEPARATOR
+#define isdirsep(x) ((x) == '/' || (x) == FILE_ALT_SEPARATOR)
+static const char file_alt_separator[] = {FILE_ALT_SEPARATOR, '\0'};
 #else
 #define isdirsep(x) ((x) == '/')
 #endif
 
-#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
-# if defined(DJGPP)
-#   define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
-# else
-#   define CharNext(p) ((p) + 1)
-# endif
-#endif
-
+#ifndef USE_NTFS
 #if defined _WIN32 || defined __CYGWIN__
 #define USE_NTFS 1
 #else
 #define USE_NTFS 0
 #endif
+#endif
 
 #if USE_NTFS
-#define istrailinggabage(x) ((x) == '.' || (x) == ' ')
+#define istrailinggarbage(x) ((x) == '.' || (x) == ' ')
+#else
+#define istrailinggarbage(x) 0
+#endif
+
+#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
+# define CharNext(p) ((p) + 1)
+#endif
+
+#if defined(DOSISH_UNC)
+#define has_unc(buf) (isdirsep((buf)[0]) && isdirsep((buf)[1]))
 #else
-#define istrailinggabage(x) 0
+#define has_unc(buf) 0
 #endif
 
 #ifdef DOSISH_DRIVE_LETTER
 static inline int
-has_drive_letter(buf)
-    const char *buf;
+has_drive_letter(const char *buf)
 {
     if (ISALPHA(buf[0]) && buf[1] == ':') {
 	return 1;
@@ -2349,8 +2621,7 @@ has_drive_letter(buf)
 }
 
 static char*
-getcwdofdrv(drv)
-    int drv;
+getcwdofdrv(int drv)
 {
     char drive[4];
     char *drvcwd, *oldcwd;
@@ -2367,7 +2638,7 @@ getcwdofdrv(drv)
     if (chdir(drive) == 0) {
 	drvcwd = my_getcwd();
 	chdir(oldcwd);
-	free(oldcwd);
+	xfree(oldcwd);
     }
     else {
 	/* perhaps the drive is not exist. we return only drive letter */
@@ -2375,11 +2646,23 @@ getcwdofdrv(drv)
     }
     return drvcwd;
 }
+
+static inline int
+not_same_drive(VALUE path, int drive)
+{
+    const char *p = RSTRING_PTR(path);
+    if (RSTRING_LEN(path) < 2) return 0;
+    if (has_drive_letter(p)) {
+	return TOLOWER(p[0]) != TOLOWER(drive);
+    }
+    else {
+	return has_unc(p);
+    }
+}
 #endif
 
 static inline char *
-skiproot(path)
-    const char *path;
+skiproot(const char *path)
 {
 #ifdef DOSISH_DRIVE_LETTER
     if (has_drive_letter(path)) path += 2;
@@ -2390,8 +2673,7 @@ skiproot(path)
 
 #define nextdirsep rb_path_next
 char *
-rb_path_next(s)
-    const char *s;
+rb_path_next(const char *s)
 {
     while (*s && !isdirsep(*s)) {
 	s = CharNext(s);
@@ -2399,16 +2681,15 @@ rb_path_next(s)
     return (char *)s;
 }
 
-#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) 
+#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
 #define skipprefix rb_path_skip_prefix
 #else
 #define skipprefix(path) (path)
 #endif
 char *
-rb_path_skip_prefix(path)
-    const char *path;
+rb_path_skip_prefix(const char *path)
 {
-#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) 
+#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
 #ifdef DOSISH_UNC
     if (isdirsep(path[0]) && isdirsep(path[1])) {
 	path += 2;
@@ -2426,10 +2707,21 @@ rb_path_skip_prefix(path)
     return (char *)path;
 }
 
+static inline char *
+skipprefixroot(const char *path)
+{
+#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
+    char *p = skipprefix(path);
+    while (isdirsep(*p)) p++;
+    return p;
+#else
+    return skiproot(path);
+#endif
+}
+
 #define strrdirsep rb_path_last_separator
 char *
-rb_path_last_separator(path)
-    const char *path;
+rb_path_last_separator(const char *path)
 {
     char *last = NULL;
     while (*path) {
@@ -2447,8 +2739,7 @@ rb_path_last_separator(path)
 }
 
 static char *
-chompdirsep(path)
-    const char *path;
+chompdirsep(const char *path)
 {
     while (*path) {
 	if (isdirsep(*path)) {
@@ -2464,8 +2755,7 @@ chompdirsep(path)
 }
 
 char *
-rb_path_end(path)
-    const char *path;
+rb_path_end(const char *path)
 {
     if (isdirsep(*path)) path++;
     return chompdirsep(path);
@@ -2475,10 +2765,11 @@ rb_path_end(path)
 static char *
 ntfs_tail(const char *path)
 {
+    while (*path == '.') path++;
     while (*path && *path != ':') {
-	if (istrailinggabage(*path)) {
+	if (istrailinggarbage(*path)) {
 	    const char *last = path++;
-	    while (istrailinggabage(*path)) path++;
+	    while (istrailinggarbage(*path)) path++;
 	    if (!*path || *path == ':') return (char *)last;
 	}
 	else if (isdirsep(*path)) {
@@ -2496,85 +2787,107 @@ ntfs_tail(const char *path)
 #endif
 
 #define BUFCHECK(cond) do {\
-    long bdiff = p - buf;\
-    while (cond) {\
-	buflen *= 2;\
+    bdiff = p - buf;\
+    if (cond) {\
+	do {buflen *= 2;} while (cond);\
+	rb_str_resize(result, buflen);\
+	buf = RSTRING_PTR(result);\
+	p = buf + bdiff;\
+	pend = buf + buflen;\
     }\
-    rb_str_resize(result, buflen);\
-    buf = RSTRING(result)->ptr;\
-    p = buf + bdiff;\
-    pend = buf + buflen;\
 } while (0)
 
 #define BUFINIT() (\
-    p = buf = RSTRING(result)->ptr,\
-    buflen = RSTRING(result)->len,\
+    p = buf = RSTRING_PTR(result),\
+    buflen = RSTRING_LEN(result),\
     pend = p + buflen)
 
-#if !defined(TOLOWER)
-#define TOLOWER(c) (ISUPPER(c) ? tolower(c) : (c))
+VALUE
+rb_home_dir(const char *user, VALUE result)
+{
+    const char *dir;
+    char *buf;
+#if defined DOSISH || defined __CYGWIN__
+    char *p;
 #endif
+    long dirlen;
 
-static int is_absolute_path _((const char*));
+    if (!user || !*user) {
+	if (!(dir = getenv("HOME"))) {
+	    rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
+	}
+	dirlen = strlen(dir);
+	rb_str_resize(result, dirlen);
+	memcpy(buf = RSTRING_PTR(result), dir, dirlen);
+    }
+    else {
+#ifdef HAVE_PWD_H
+	struct passwd *pwPtr = getpwnam(user);
+	if (!pwPtr) {
+	    endpwent();
+	    rb_raise(rb_eArgError, "user %s doesn't exist", user);
+	}
+	dirlen = strlen(pwPtr->pw_dir);
+	rb_str_resize(result, dirlen);
+	strcpy(buf = RSTRING_PTR(result), pwPtr->pw_dir);
+	endpwent();
+#else
+	return Qnil;
+#endif
+    }
+#if defined DOSISH || defined __CYGWIN__
+    for (p = buf; *p; p = CharNext(p)) {
+	if (*p == '\\') {
+	    *p = '/';
+	}
+    }
+#endif
+    rb_enc_associate_index(result, rb_filesystem_encindex());
+    return result;
+}
 
 static VALUE
-file_expand_path(fname, dname, result)
-    VALUE fname, dname, result;
+file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 {
     const char *s, *b;
     char *buf, *p, *pend, *root;
-    long buflen, dirlen;
+    size_t buflen, dirlen, bdiff;
     int tainted;
 
     s = StringValuePtr(fname);
     BUFINIT();
     tainted = OBJ_TAINTED(fname);
 
-    if (s[0] == '~') {
+    if (s[0] == '~' && abs_mode == 0) {      /* execute only if NOT absolute_path() */
+	long userlen = 0;
+	tainted = 1;
 	if (isdirsep(s[1]) || s[1] == '\0') {
-	    char *dir = getenv("HOME");
-
-	    if (!dir) {
-		rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `%s'", s);
-	    }
-	    dirlen = strlen(dir);
-	    BUFCHECK(dirlen > buflen);
-	    strcpy(buf, dir);
-#if defined DOSISH || defined __CYGWIN__
-	    for (p = buf; *p; p = CharNext(p)) {
-		if (*p == '\\') {
-		    *p = '/';
-		}
-	    }
-#else
-	    p = buf + strlen(dir);
-#endif
-	    s++;
-	    tainted = 1;
+	    buf = 0;
+	    rb_str_set_len(result, 0);
+	    if (*++s) ++s;
 	}
 	else {
-#ifdef HAVE_PWD_H
-	    struct passwd *pwPtr;
-	    s++;
-#endif
 	    s = nextdirsep(b = s);
-	    BUFCHECK(bdiff + (s-b) >= buflen);
-	    memcpy(p, b, s-b);
-	    p += s-b;
-	    *p = '\0';
-#ifdef HAVE_PWD_H
-	    pwPtr = getpwnam(buf);
-	    if (!pwPtr) {
-		endpwent();
-		rb_raise(rb_eArgError, "user %s doesn't exist", buf);
+	    userlen = s - b;
+	    BUFCHECK(bdiff + userlen >= buflen);
+	    memcpy(p, b, userlen);
+	    rb_str_set_len(result, userlen);
+	    buf = p + 1;
+	    p += userlen;
+	}
+	if (NIL_P(rb_home_dir(buf, result))) {
+	    rb_raise(rb_eArgError, "can't find user %s", buf);
+	}
+	if (!rb_is_absolute_path(RSTRING_PTR(result))) {
+	    if (userlen) {
+		rb_raise(rb_eArgError, "non-absolute home of %.*s", (int)userlen, b);
+	    }
+	    else {
+		rb_raise(rb_eArgError, "non-absolute home");
 	    }
-	    dirlen = strlen(pwPtr->pw_dir);
-	    BUFCHECK(dirlen > buflen);
-	    strcpy(buf, pwPtr->pw_dir);
-	    p = buf + strlen(pwPtr->pw_dir);
-	    endpwent();
-#endif
 	}
+	BUFINIT();
+	p = pend;
     }
 #ifdef DOSISH_DRIVE_LETTER
     /* skip drive letter */
@@ -2586,12 +2899,13 @@ file_expand_path(fname, dname, result)
 	    memcpy(p, s, 2);
 	    p += 2;
 	    s += 2;
+	    rb_enc_copy(result, fname);
 	}
 	else {
 	    /* specified drive, but not full path */
 	    int same = 0;
-	    if (!NIL_P(dname)) {
-		file_expand_path(dname, Qnil, result);
+	    if (!NIL_P(dname) && !not_same_drive(dname, s[0])) {
+		file_expand_path(dname, Qnil, abs_mode, result);
 		BUFINIT();
 		if (has_drive_letter(p) && TOLOWER(p[0]) == TOLOWER(s[0])) {
 		    /* ok, same drive */
@@ -2605,17 +2919,21 @@ file_expand_path(fname, dname, result)
 		dirlen = strlen(dir);
 		BUFCHECK(dirlen > buflen);
 		strcpy(buf, dir);
-		free(dir);
+		xfree(dir);
+		rb_enc_associate_index(result, rb_filesystem_encindex());
 	    }
+	    else
+		rb_enc_associate(result, rb_enc_check(result, fname));
 	    p = chompdirsep(skiproot(buf));
 	    s += 2;
 	}
     }
 #endif
-    else if (!is_absolute_path(s)) {
+    else if (!rb_is_absolute_path(s)) {
 	if (!NIL_P(dname)) {
-	    file_expand_path(dname, Qnil, result);
+	    file_expand_path(dname, Qnil, abs_mode, result);
 	    BUFINIT();
+	    rb_enc_associate(result, rb_enc_check(result, fname));
 	}
 	else {
 	    char *dir = my_getcwd();
@@ -2624,7 +2942,8 @@ file_expand_path(fname, dname, result)
 	    dirlen = strlen(dir);
 	    BUFCHECK(dirlen > buflen);
 	    strcpy(buf, dir);
-	    free(dir);
+	    xfree(dir);
+	    rb_enc_associate_index(result, rb_filesystem_encindex());
 	}
 #if defined DOSISH || defined __CYGWIN__
 	if (isdirsep(*s)) {
@@ -2637,17 +2956,26 @@ file_expand_path(fname, dname, result)
 	    p = chompdirsep(skiproot(buf));
     }
     else {
+	size_t len;
 	b = s;
 	do s++; while (isdirsep(*s));
-	p = buf + (s - b);
+	len = s - b;
+	p = buf + len;
 	BUFCHECK(bdiff >= buflen);
-	memset(buf, '/', p - buf);
+	memset(buf, '/', len);
+	rb_str_set_len(result, len);
+	rb_enc_associate(result, rb_enc_check(result, fname));
     }
     if (p > buf && p[-1] == '/')
 	--p;
-    else
+    else {
+	rb_str_set_len(result, p-buf);
+	BUFCHECK(bdiff + 1 >= buflen);
 	*p = '/';
+    }
 
+    rb_str_set_len(result, p-buf+1);
+    BUFCHECK(bdiff + 1 >= buflen);
     p[1] = 0;
     root = skipprefix(buf);
 
@@ -2675,7 +3003,7 @@ file_expand_path(fname, dname, result)
 		    }
 #if USE_NTFS
 		    else {
-			do *++s; while (istrailinggabage(*s));
+			do ++s; while (istrailinggarbage(*s));
 		    }
 #endif
 		    break;
@@ -2695,7 +3023,7 @@ file_expand_path(fname, dname, result)
 		--s;
 	      case ' ': {
 		const char *e = s;
-		while (istrailinggabage(*s)) s++;
+		while (istrailinggarbage(*s)) s++;
 		if (!*s) {
 		    s = e;
 		    goto endpath;
@@ -2710,6 +3038,7 @@ file_expand_path(fname, dname, result)
 #endif
 	    if (s > b) {
 		long rootdiff = root - buf;
+		rb_str_set_len(result, p-buf+1);
 		BUFCHECK(bdiff + (s-b+1) >= buflen);
 		root = buf + rootdiff;
 		memcpy(++p, b, s-b);
@@ -2726,92 +3055,109 @@ file_expand_path(fname, dname, result)
 
     if (s > b) {
 #if USE_NTFS
+	static const char prime[] = ":$DATA";
+	enum {prime_len = sizeof(prime) -1};
       endpath:
-	if (s > b + 6 && strncasecmp(s - 6, ":$DATA", 6) == 0) {
+	if (s > b + prime_len && strncasecmp(s - prime_len, prime, prime_len) == 0) {
 	    /* alias of stream */
 	    /* get rid of a bug of x64 VC++ */
-	    if (*(s-7) == ':') s -= 7;			/* prime */
-	    else if (memchr(b, ':', s - 6 - b)) s -= 6; /* alternative */
+	    if (*(s - (prime_len+1)) == ':') {
+		s -= prime_len + 1; /* prime */
+	    }
+	    else if (memchr(b, ':', s - prime_len - b)) {
+		s -= prime_len;	/* alternative */
+	    }
 	}
 #endif
+	rb_str_set_len(result, p-buf+1);
 	BUFCHECK(bdiff + (s-b) >= buflen);
 	memcpy(++p, b, s-b);
 	p += s-b;
     }
     if (p == skiproot(buf) - 1) p++;
-    buflen = p - buf;
 
-    RSTRING(result)->len = buflen;
-    *p = '\0';
 #if USE_NTFS
-    if (1 &&
-#ifdef __CYGWIN__
-	!(buf[0] == '/' && !buf[1]) &&
-#endif
-	!strpbrk(b = buf, "*?")) {
+    *p = '\0';
+    if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
 	size_t len;
 	WIN32_FIND_DATA wfd;
 #ifdef __CYGWIN__
 	int lnk_added = 0, is_symlink = 0;
 	struct stat st;
-	char w32buf[MAXPATHLEN], sep = 0;
-	p = 0;
+	char w32buf[MAXPATHLEN];
+	p = (char *)s;
 	if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
 	    is_symlink = 1;
-	    p = strrdirsep(buf);
-	    if (!p) p = skipprefix(buf);
-	    if (p) {
-		sep = *p;
-		*p = '\0';
-	    }
+	    *p = '\0';
 	}
-	if (cygwin_conv_to_win32_path(buf, w32buf) == 0) {
+	if (cygwin_conv_to_win32_path((*buf ? buf : "/"), w32buf) == 0) {
 	    b = w32buf;
 	}
-	if (p) *p = sep;
-	else p = buf;
 	if (is_symlink && b == w32buf) {
+	    *p = '\\';
+	    strlcat(w32buf, p, sizeof(w32buf));
 	    len = strlen(p);
-	    if (len > 4 && strcasecmp(p + len - 4, ".lnk") != 0) {
+	    if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) {
 		lnk_added = 1;
 		strlcat(w32buf, ".lnk", sizeof(w32buf));
 	    }
 	}
+	*p = '/';
 #endif
 	HANDLE h = FindFirstFile(b, &wfd);
 	if (h != INVALID_HANDLE_VALUE) {
 	    FindClose(h);
-	    p = strrdirsep(buf);
 	    len = strlen(wfd.cFileName);
 #ifdef __CYGWIN__
 	    if (lnk_added && len > 4 &&
-		strcasecmp(wfd.cFileName + len - 4, ".lnk") == 0) {
-		len -= 4;
+		STRCASECMP(wfd.cFileName + len - 4, ".lnk") == 0) {
+		wfd.cFileName[len -= 4] = '\0';
 	    }
+#else
+	    p = (char *)s;
 #endif
-	    if (!p) p = buf;
-	    buflen = ++p - buf + len;
-	    rb_str_resize(result, buflen);
+	    ++p;
+	    BUFCHECK(bdiff + len >= buflen);
 	    memcpy(p, wfd.cFileName, len + 1);
+	    p += len;
 	}
+#ifdef __CYGWIN__
+	else {
+	    p += strlen(p);
+	}
+#endif
     }
 #endif
 
     if (tainted) OBJ_TAINT(result);
+    rb_str_set_len(result, p - buf);
+    rb_enc_check(fname, result);
     return result;
 }
 
+#define EXPAND_PATH_BUFFER() rb_usascii_str_new(0, MAXPATHLEN + 2)
+
+#define check_expand_path_args(fname, dname) \
+    ((fname = rb_get_path(fname)), \
+     (NIL_P(dname) ? dname : (dname = rb_get_path(dname))))
+
+static VALUE
+file_expand_path_1(VALUE fname)
+{
+    return file_expand_path(fname, Qnil, 0, EXPAND_PATH_BUFFER());
+}
+
 VALUE
-rb_file_expand_path(fname, dname)
-    VALUE fname, dname;
+rb_file_expand_path(VALUE fname, VALUE dname)
 {
-    return file_expand_path(fname, dname, rb_str_new(0, MAXPATHLEN + 2));
+    check_expand_path_args(fname, dname);
+    return file_expand_path(fname, dname, 0, EXPAND_PATH_BUFFER());
 }
 
 /*
  *  call-seq:
- *     File.expand_path(file_name [, dir_string] ) -> abs_file_name
- *  
+ *     File.expand_path(file_name [, dir_string] )  ->  abs_file_name
+ *
  *  Converts a pathname to an absolute pathname. Relative paths are
  *  referenced from the current working directory of the process unless
  *  <i>dir_string</i> is given, in which case it will be used as the
@@ -2820,15 +3166,13 @@ rb_file_expand_path(fname, dname)
  *  directory (the environment variable <code>HOME</code> must be set
  *  correctly). ``<code>~</code><i>user</i>'' expands to the named
  *  user's home directory.
- *     
+ *
  *     File.expand_path("~oracle/bin")           #=> "/home/oracle/bin"
  *     File.expand_path("../../bin", "/tmp/x")   #=> "/bin"
  */
 
 VALUE
-rb_file_s_expand_path(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_file_s_expand_path(int argc, VALUE *argv)
 {
     VALUE fname, dname;
 
@@ -2840,64 +3184,280 @@ rb_file_s_expand_path(argc, argv)
     return rb_file_expand_path(fname, dname);
 }
 
-static int
-rmext(p, l1, e)
-    const char *p, *e;
-    int l1;
+VALUE
+rb_file_absolute_path(VALUE fname, VALUE dname)
+{
+    check_expand_path_args(fname, dname);
+    return file_expand_path(fname, dname, 1, EXPAND_PATH_BUFFER());
+}
+
+/*
+ *  call-seq:
+ *     File.absolute_path(file_name [, dir_string] )  ->  abs_file_name
+ *
+ *  Converts a pathname to an absolute pathname. Relative paths are
+ *  referenced from the current working directory of the process unless
+ *  <i>dir_string</i> is given, in which case it will be used as the
+ *  starting point. If the given pathname starts with a ``<code>~</code>''
+ *  it is NOT expanded, it is treated as a normal directory name.
+ *
+ *     File.absolute_path("~oracle/bin")       #=> "<relative_path>/~oracle/bin"
+ */
+
+VALUE
+rb_file_s_absolute_path(int argc, VALUE *argv)
+{
+    VALUE fname, dname;
+
+    if (argc == 1) {
+	return rb_file_absolute_path(argv[0], Qnil);
+    }
+    rb_scan_args(argc, argv, "11", &fname, &dname);
+
+    return rb_file_absolute_path(fname, dname);
+}
+
+static void
+realpath_rec(long *prefixlenp, VALUE *resolvedp, char *unresolved, VALUE loopcheck, int strict, int last)
+{
+    ID resolving;
+    CONST_ID(resolving, "resolving");
+    while (*unresolved) {
+        char *testname = unresolved;
+        char *unresolved_firstsep = rb_path_next(unresolved);
+        long testnamelen = unresolved_firstsep - unresolved;
+        char *unresolved_nextname = unresolved_firstsep;
+        while (isdirsep(*unresolved_nextname)) unresolved_nextname++;
+        unresolved = unresolved_nextname;
+        if (testnamelen == 1 && testname[0] == '.') {
+        }
+        else if (testnamelen == 2 && testname[0] == '.' && testname[1] == '.') {
+            if (*prefixlenp < RSTRING_LEN(*resolvedp)) {
+                char *resolved_names = RSTRING_PTR(*resolvedp) + *prefixlenp;
+                char *lastsep = rb_path_last_separator(resolved_names);
+                long len = lastsep ? lastsep - resolved_names : 0;
+                rb_str_resize(*resolvedp, *prefixlenp + len);
+            }
+        }
+        else {
+            VALUE checkval;
+            VALUE testpath = rb_str_dup(*resolvedp);
+            if (*prefixlenp < RSTRING_LEN(testpath))
+                rb_str_cat2(testpath, "/");
+            rb_str_cat(testpath, testname, testnamelen);
+            checkval = rb_hash_aref(loopcheck, testpath);
+            if (!NIL_P(checkval)) {
+                if (checkval == ID2SYM(resolving)) {
+                    errno = ELOOP;
+                    rb_sys_fail(RSTRING_PTR(testpath));
+                }
+                else {
+                    *resolvedp = rb_str_dup(checkval);
+                }
+            }
+            else {
+                struct stat sbuf;
+                int ret;
+                VALUE testpath2 = rb_str_encode_ospath(testpath);
+                ret = lstat(RSTRING_PTR(testpath2), &sbuf);
+                if (ret == -1) {
+                    if (errno == ENOENT) {
+                        if (strict || !last || *unresolved_firstsep)
+                            rb_sys_fail(RSTRING_PTR(testpath));
+                        *resolvedp = testpath;
+                        break;
+                    }
+                    else {
+                        rb_sys_fail(RSTRING_PTR(testpath));
+                    }
+                }
+#ifdef HAVE_READLINK
+                if (S_ISLNK(sbuf.st_mode)) {
+                    volatile VALUE link;
+                    char *link_prefix, *link_names;
+                    long link_prefixlen;
+                    rb_hash_aset(loopcheck, testpath, ID2SYM(resolving));
+                    link = rb_file_s_readlink(rb_cFile, testpath);
+                    link_prefix = RSTRING_PTR(link);
+                    link_names = skipprefixroot(link_prefix);
+                    link_prefixlen = link_names - link_prefix;
+                    if (link_prefixlen == 0) {
+                        realpath_rec(prefixlenp, resolvedp, link_names, loopcheck, strict, *unresolved_firstsep == '\0');
+                    }
+                    else {
+                        *resolvedp = rb_str_new(link_prefix, link_prefixlen);
+                        *prefixlenp = link_prefixlen;
+                        realpath_rec(prefixlenp, resolvedp, link_names, loopcheck, strict, *unresolved_firstsep == '\0');
+                    }
+                    rb_hash_aset(loopcheck, testpath, rb_str_dup_frozen(*resolvedp));
+                }
+                else
+#endif
+                {
+                    VALUE s = rb_str_dup_frozen(testpath);
+                    rb_hash_aset(loopcheck, s, s);
+                    *resolvedp = testpath;
+                }
+            }
+        }
+    }
+}
+
+VALUE
+rb_realpath_internal(VALUE basedir, VALUE path, int strict)
+{
+    long prefixlen;
+    VALUE resolved;
+    volatile VALUE unresolved_path;
+    VALUE loopcheck;
+    volatile VALUE curdir = Qnil;
+
+    char *path_names = NULL, *basedir_names = NULL, *curdir_names = NULL;
+    char *ptr, *prefixptr = NULL;
+
+    rb_secure(2);
+
+    FilePathValue(path);
+    unresolved_path = rb_str_dup_frozen(path);
+
+    if (!NIL_P(basedir)) {
+        FilePathValue(basedir);
+        basedir = rb_str_dup_frozen(basedir);
+    }
+
+    ptr = RSTRING_PTR(unresolved_path);
+    path_names = skipprefixroot(ptr);
+    if (ptr != path_names) {
+        resolved = rb_enc_str_new(ptr, path_names - ptr,
+				  rb_enc_get(unresolved_path));
+        goto root_found;
+    }
+
+    if (!NIL_P(basedir)) {
+        ptr = RSTRING_PTR(basedir);
+	basedir_names = skipprefixroot(ptr);
+        if (ptr != basedir_names) {
+            resolved = rb_enc_str_new(ptr, basedir_names - ptr,
+				      rb_enc_get(basedir));
+            goto root_found;
+        }
+    }
+
+    curdir = rb_dir_getwd();
+    ptr = RSTRING_PTR(curdir);
+    curdir_names = skipprefixroot(ptr);
+    resolved = rb_enc_str_new(ptr, curdir_names - ptr, rb_enc_get(curdir));
+
+  root_found:
+    prefixptr = RSTRING_PTR(resolved);
+    prefixlen = RSTRING_LEN(resolved);
+    ptr = chompdirsep(prefixptr);
+    if (*ptr) {
+        prefixlen = ++ptr - prefixptr;
+        rb_str_set_len(resolved, prefixlen);
+    }
+#ifdef FILE_ALT_SEPARATOR
+    while (prefixptr < ptr) {
+	if (*prefixptr == FILE_ALT_SEPARATOR) {
+	    *prefixptr = '/';
+	}
+	prefixptr = CharNext(prefixptr);
+    }
+#endif
+
+    loopcheck = rb_hash_new();
+    if (curdir_names)
+        realpath_rec(&prefixlen, &resolved, curdir_names, loopcheck, 1, 0);
+    if (basedir_names)
+        realpath_rec(&prefixlen, &resolved, basedir_names, loopcheck, 1, 0);
+    realpath_rec(&prefixlen, &resolved, path_names, loopcheck, strict, 1);
+
+    OBJ_TAINT(resolved);
+    return resolved;
+}
+
+/*
+ * call-seq:
+ *     File.realpath(pathname [, dir_string])  ->  real_pathname
+ *
+ *  Returns the real (absolute) pathname of _pathname_ in the actual
+ *  filesystem not containing symlinks or useless dots.
+ *
+ *  If _dir_string_ is given, it is used as a base directory
+ *  for interpreting relative pathname instead of the current directory.
+ *
+ *  All components of the pathname must exist when this method is
+ *  called.
+ */
+static VALUE
+rb_file_s_realpath(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE path, basedir;
+    rb_scan_args(argc, argv, "11", &path, &basedir);
+    return rb_realpath_internal(basedir, path, 1);
+}
+
+/*
+ * call-seq:
+ *     File.realdirpath(pathname [, dir_string])  ->  real_pathname
+ *
+ *  Returns the real (absolute) pathname of _pathname_ in the actual filesystem.
+ *  The real pathname doesn't contain symlinks or useless dots.
+ *
+ *  If _dir_string_ is given, it is used as a base directory
+ *  for interpreting relative pathname instead of the current directory.
+ *
+ *  The last component of the real pathname can be nonexistent.
+ */
+static VALUE
+rb_file_s_realdirpath(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE path, basedir;
+    rb_scan_args(argc, argv, "11", &path, &basedir);
+    return rb_realpath_internal(basedir, path, 0);
+}
+
+static size_t
+rmext(const char *p, long l1, const char *e)
 {
-    int l2;
+    long l0, l2;
 
     if (!e) return 0;
 
+    for (l0 = 0; l0 < l1; ++l0) {
+	if (p[l0] != '.') break;
+    }
     l2 = strlen(e);
     if (l2 == 2 && e[1] == '*') {
 	unsigned char c = *e;
 	e = p + l1;
 	do {
-	    if (e <= p) return 0;
+	    if (e <= p + l0) return 0;
 	} while (*--e != c);
 	return e - p;
     }
     if (l1 < l2) return l1;
 
-    if (strncmp(p+l1-l2, e, l2) == 0) {
+#if CASEFOLD_FILESYSTEM
+#define fncomp strncasecmp
+#else
+#define fncomp strncmp
+#endif
+    if (fncomp(p+l1-l2, e, l2) == 0) {
 	return l1-l2;
     }
     return 0;
 }
 
-/*
- *  call-seq:
- *     File.basename(file_name [, suffix] ) -> base_name
- *  
- *  Returns the last component of the filename given in <i>file_name</i>,
- *  which must be formed using forward slashes (``<code>/</code>'')
- *  regardless of the separator used on the local file system. If
- *  <i>suffix</i> is given and present at the end of <i>file_name</i>,
- *  it is removed.
- *     
- *     File.basename("/home/gumby/work/ruby.rb")          #=> "ruby.rb"
- *     File.basename("/home/gumby/work/ruby.rb", ".rb")   #=> "ruby"
- */
-
-static VALUE
-rb_file_s_basename(argc, argv)
-    int argc;
-    VALUE *argv;
+const char *
+ruby_find_basename(const char *name, long *len, long *ext)
 {
-    VALUE fname, fext, basename;
-    char *name, *p;
+    const char *p;
 #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
-    char *root;
+    const char *root;
 #endif
-    int f, n;
+    long f, n = -1;
 
-    if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
-	StringValue(fext);
-    }
-    StringValue(fname);
-    if (RSTRING(fname)->len == 0 || !*(name = RSTRING(fname)->ptr))
-	return fname;
     name = skipprefix(name);
 #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
     root = name;
@@ -2936,35 +3496,88 @@ rb_file_s_basename(argc, argv)
 #else
 	n = chompdirsep(p) - p;
 #endif
+    }
+
+    if (len)
+	*len = f;
+    if (ext)
+	*ext = n;
+    return p;
+}
+
+/*
+ *  call-seq:
+ *     File.basename(file_name [, suffix] )  ->  base_name
+ *
+ *  Returns the last component of the filename given in <i>file_name</i>,
+ *  which must be formed using forward slashes (``<code>/</code>'')
+ *  regardless of the separator used on the local file system. If
+ *  <i>suffix</i> is given and present at the end of <i>file_name</i>,
+ *  it is removed.
+ *
+ *     File.basename("/home/gumby/work/ruby.rb")          #=> "ruby.rb"
+ *     File.basename("/home/gumby/work/ruby.rb", ".rb")   #=> "ruby"
+ */
+
+static VALUE
+rb_file_s_basename(int argc, VALUE *argv)
+{
+    VALUE fname, fext, basename;
+    const char *name, *p;
+    long f, n;
+
+    if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
+	rb_encoding *enc;
+	StringValue(fext);
+	if (!rb_enc_asciicompat(enc = rb_enc_get(fext))) {
+	    rb_raise(rb_eEncCompatError, "ascii incompatible character encodings: %s",
+		     rb_enc_name(enc));
+	}
+    }
+    FilePathStringValue(fname);
+    if (!NIL_P(fext)) rb_enc_check(fname, fext);
+    if (RSTRING_LEN(fname) == 0 || !*(name = RSTRING_PTR(fname)))
+	return rb_str_new_shared(fname);
+
+    p = ruby_find_basename(name, &f, &n);
+    if (n >= 0) {
 	if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) {
 	    f = n;
 	}
-	if (f == RSTRING_LEN(fname)) return fname;
+	if (f == RSTRING_LEN(fname)) return rb_str_new_shared(fname);
     }
+
     basename = rb_str_new(p, f);
+    rb_enc_copy(basename, fname);
     OBJ_INFECT(basename, fname);
     return basename;
 }
 
 /*
  *  call-seq:
- *     File.dirname(file_name ) -> dir_name
- *  
+ *     File.dirname(file_name )  ->  dir_name
+ *
  *  Returns all components of the filename given in <i>file_name</i>
  *  except the last one. The filename must be formed using forward
  *  slashes (``<code>/</code>'') regardless of the separator used on the
  *  local file system.
- *     
+ *
  *     File.dirname("/home/gumby/work/ruby.rb")   #=> "/home/gumby/work"
  */
 
 static VALUE
-rb_file_s_dirname(klass, fname)
-    VALUE klass, fname;
+rb_file_s_dirname(VALUE klass, VALUE fname)
+{
+    return rb_file_dirname(fname);
+}
+
+VALUE
+rb_file_dirname(VALUE fname)
 {
     const char *name, *root, *p;
     VALUE dirname;
 
+    FilePathStringValue(fname);
     name = StringValueCStr(fname);
     root = skiproot(name);
 #ifdef DOSISH_UNC
@@ -2979,7 +3592,7 @@ rb_file_s_dirname(klass, fname)
 	p = root;
     }
     if (p == name)
-	return rb_str_new2(".");
+	return rb_usascii_str_new2(".");
 #ifdef DOSISH_DRIVE_LETTER
     if (has_drive_letter(name) && isdirsep(*(name + 2))) {
 	const char *top = skiproot(name + 2);
@@ -2993,44 +3606,41 @@ rb_file_s_dirname(klass, fname)
     if (has_drive_letter(name) && root == name + 2 && p - name == 2)
 	rb_str_cat(dirname, ".", 1);
 #endif
+    rb_enc_copy(dirname, fname);
     OBJ_INFECT(dirname, fname);
     return dirname;
 }
 
 /*
- *  call-seq:
- *     File.extname(path) -> string
- *  
- *  Returns the extension (the portion of file name in <i>path</i>
- *  after the period).
- *     
- *     File.extname("test.rb")         #=> ".rb"
- *     File.extname("a/b/d/test.rb")   #=> ".rb"
- *     File.extname("test")            #=> ""
- *     File.extname(".profile")        #=> ""
- *     
+ * accept a String, and return the pointer of the extension.
+ * if len is passed, set the length of extension to it.
+ * returned pointer is in ``name'' or NULL.
+ *                 returns   *len
+ *   no dot        NULL      0
+ *   dotfile       top       0
+ *   end with dot  dot       1
+ *   .ext          dot       len of .ext
+ *   .ext:stream   dot       len of .ext without :stream (NT only)
+ *
  */
-
-static VALUE
-rb_file_s_extname(klass, fname)
-    VALUE klass, fname;
+const char *
+ruby_find_extname(const char *name, long *len)
 {
-    const char *name, *p, *e;
-    VALUE extname;
+    const char *p, *e;
 
-    name = StringValueCStr(fname);
     p = strrdirsep(name);	/* get the last path component */
     if (!p)
 	p = name;
     else
-	name = ++p;
+	do name = ++p; while (isdirsep(*p));
 
     e = 0;
+    while (*p && *p == '.') p++;
     while (*p) {
-	if (*p == '.' || istrailinggabage(*p)) {
+	if (*p == '.' || istrailinggarbage(*p)) {
 #if USE_NTFS
 	    const char *last = p++, *dot = last;
-	    while (istrailinggabage(*p)) {
+	    while (istrailinggarbage(*p)) {
 		if (*p == '.') dot = p;
 		p++;
 	    }
@@ -3038,7 +3648,7 @@ rb_file_s_extname(klass, fname)
 		p = last;
 		break;
 	    }
-	    e = dot;
+	    if (*last == '.' || dot > last) e = dot;
 	    continue;
 #else
 	    e = p;	  /* get the last dot of the last component */
@@ -3053,188 +3663,231 @@ rb_file_s_extname(klass, fname)
 	    break;
 	p = CharNext(p);
     }
-    if (!e || e == name || e+1 == p)	/* no dot, or the only dot is first or end? */
+
+    if (len) {
+	/* no dot, or the only dot is first or end? */
+	if (!e || e == name)
+	    *len = 0;
+	else if (e+1 == p)
+	    *len = 1;
+	else
+	    *len = p - e;
+    }
+    return e;
+}
+
+/*
+ *  call-seq:
+ *     File.extname(path)  ->  string
+ *
+ *  Returns the extension (the portion of file name in <i>path</i>
+ *  after the period).
+ *
+ *     File.extname("test.rb")         #=> ".rb"
+ *     File.extname("a/b/d/test.rb")   #=> ".rb"
+ *     File.extname("test")            #=> ""
+ *     File.extname(".profile")        #=> ""
+ *
+ */
+
+static VALUE
+rb_file_s_extname(VALUE klass, VALUE fname)
+{
+    const char *name, *e;
+    long len;
+    VALUE extname;
+
+    FilePathStringValue(fname);
+    name = StringValueCStr(fname);
+    e = ruby_find_extname(name, &len);
+    if (len <= 1)
 	return rb_str_new(0, 0);
-    extname = rb_str_new(e, p - e);	/* keep the dot, too! */
+    extname = rb_str_new(e, len);	/* keep the dot, too! */
+    rb_enc_copy(extname, fname);
     OBJ_INFECT(extname, fname);
     return extname;
 }
 
 /*
  *  call-seq:
- *     File.split(file_name)   => array
- *  
+ *     File.path(path)  ->  string
+ *
+ *  Returns the string representation of the path
+ *
+ *     File.path("/dev/null")          #=> "/dev/null"
+ *     File.path(Pathname.new("/tmp")) #=> "/tmp"
+ *
+ */
+
+static VALUE
+rb_file_s_path(VALUE klass, VALUE fname)
+{
+    return rb_get_path(fname);
+}
+
+/*
+ *  call-seq:
+ *     File.split(file_name)   -> array
+ *
  *  Splits the given string into a directory and a file component and
  *  returns them in a two-element array. See also
  *  <code>File::dirname</code> and <code>File::basename</code>.
- *     
+ *
  *     File.split("/home/gumby/.profile")   #=> ["/home/gumby", ".profile"]
  */
 
 static VALUE
-rb_file_s_split(klass, path)
-    VALUE klass, path;
+rb_file_s_split(VALUE klass, VALUE path)
 {
-    StringValue(path);		/* get rid of converting twice */
+    FilePathStringValue(path);		/* get rid of converting twice */
     return rb_assoc_new(rb_file_s_dirname(Qnil, path), rb_file_s_basename(1,&path));
 }
 
 static VALUE separator;
 
-static VALUE rb_file_join _((VALUE ary, VALUE sep));
+static VALUE rb_file_join(VALUE ary, VALUE sep);
 
 static VALUE
-file_inspect_join(ary, arg)
-    VALUE ary;
-    VALUE *arg;
+file_inspect_join(VALUE ary, VALUE argp, int recur)
 {
+    VALUE *arg = (VALUE *)argp;
+    if (recur || ary == arg[0]) rb_raise(rb_eArgError, "recursive array");
     return rb_file_join(arg[0], arg[1]);
 }
 
 static VALUE
-rb_file_join(ary, sep)
-    VALUE ary, sep;
+rb_file_join(VALUE ary, VALUE sep)
 {
     long len, i;
-    int taint = 0;
     VALUE result, tmp;
-    char *name, *tail;
+    const char *name, *tail;
 
-    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    if (OBJ_TAINTED(ary)) taint = 1;
-    if (OBJ_TAINTED(sep)) taint = 1;
+    if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
 
     len = 1;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	if (TYPE(RARRAY(ary)->ptr[i]) == T_STRING) {
-	    len += RSTRING(RARRAY(ary)->ptr[i])->len;
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	if (TYPE(RARRAY_PTR(ary)[i]) == T_STRING) {
+	    len += RSTRING_LEN(RARRAY_PTR(ary)[i]);
 	}
 	else {
 	    len += 10;
 	}
     }
-    if (!NIL_P(sep) && TYPE(sep) == T_STRING) {
-	len += RSTRING(sep)->len * RARRAY(ary)->len - 1;
+    if (!NIL_P(sep)) {
+	StringValue(sep);
+	len += RSTRING_LEN(sep) * RARRAY_LEN(ary) - 1;
     }
     result = rb_str_buf_new(len);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = RARRAY(ary)->ptr[i];
+    OBJ_INFECT(result, ary);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	tmp = RARRAY_PTR(ary)[i];
 	switch (TYPE(tmp)) {
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
+	    if (ary == tmp) {
+		rb_raise(rb_eArgError, "recursive array");
 	    }
 	    else {
 		VALUE args[2];
 
 		args[0] = tmp;
 		args[1] = sep;
-		tmp = rb_protect_inspect(file_inspect_join, ary, (VALUE)args);
+		tmp = rb_exec_recursive(file_inspect_join, ary, (VALUE)args);
 	    }
 	    break;
 	  default:
-	    StringValueCStr(tmp);
+	    FilePathStringValue(tmp);
 	}
 	name = StringValueCStr(result);
 	if (i > 0 && !NIL_P(sep)) {
 	    tail = chompdirsep(name);
-	    if (RSTRING(tmp)->ptr && isdirsep(RSTRING(tmp)->ptr[0])) {
-		RSTRING(result)->len = tail - name;
+	    if (RSTRING_PTR(tmp) && isdirsep(RSTRING_PTR(tmp)[0])) {
+		rb_str_set_len(result, tail - name);
 	    }
 	    else if (!*tail) {
 		rb_str_buf_append(result, sep);
 	    }
 	}
 	rb_str_buf_append(result, tmp);
-	if (OBJ_TAINTED(tmp)) taint = 1;
     }
 
-    if (taint) OBJ_TAINT(result);
     return result;
 }
 
 /*
  *  call-seq:
- *     File.join(string, ...) -> path
- *  
+ *     File.join(string, ...)  ->  path
+ *
  *  Returns a new string formed by joining the strings using
  *  <code>File::SEPARATOR</code>.
- *     
+ *
  *     File.join("usr", "mail", "gumby")   #=> "usr/mail/gumby"
- *     
+ *
  */
 
 static VALUE
-rb_file_s_join(klass, args)
-    VALUE klass, args;
+rb_file_s_join(VALUE klass, VALUE args)
 {
     return rb_file_join(args, separator);
 }
 
+#if defined(HAVE_TRUNCATE) || defined(HAVE_CHSIZE)
 /*
  *  call-seq:
- *     File.truncate(file_name, integer)  => 0
- *  
+ *     File.truncate(file_name, integer)  -> 0
+ *
  *  Truncates the file <i>file_name</i> to be at most <i>integer</i>
  *  bytes long. Not available on all platforms.
- *     
+ *
  *     f = File.new("out", "w")
  *     f.write("1234567890")     #=> 10
  *     f.close                   #=> nil
  *     File.truncate("out", 5)   #=> 0
  *     File.size("out")          #=> 5
- *     
+ *
  */
 
 static VALUE
-rb_file_s_truncate(klass, path, len)
-    VALUE klass, path, len;
+rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
 {
     off_t pos;
 
     rb_secure(2);
     pos = NUM2OFFT(len);
-    SafeStringValue(path);
-
+    FilePathValue(path);
+    path = rb_str_encode_ospath(path);
 #ifdef HAVE_TRUNCATE
     if (truncate(StringValueCStr(path), pos) < 0)
-	rb_sys_fail(RSTRING(path)->ptr);
-#else
-# ifdef HAVE_CHSIZE
+	rb_sys_fail(RSTRING_PTR(path));
+#else /* defined(HAVE_CHSIZE) */
     {
 	int tmpfd;
 
-#  ifdef _WIN32
-	if ((tmpfd = open(StringValueCStr(path), O_RDWR)) < 0) {
-	    rb_sys_fail(RSTRING(path)->ptr);
-	}
-#  else
 	if ((tmpfd = open(StringValueCStr(path), 0)) < 0) {
-	    rb_sys_fail(RSTRING(path)->ptr);
+	    rb_sys_fail(RSTRING_PTR(path));
 	}
-#  endif
 	if (chsize(tmpfd, pos) < 0) {
 	    close(tmpfd);
-	    rb_sys_fail(RSTRING(path)->ptr);
+	    rb_sys_fail(RSTRING_PTR(path));
 	}
 	close(tmpfd);
     }
-# else
-    rb_notimplement();
-# endif
 #endif
     return INT2FIX(0);
 }
+#else
+#define rb_file_s_truncate rb_f_notimplement
+#endif
 
+#if defined(HAVE_FTRUNCATE) || defined(HAVE_CHSIZE)
 /*
  *  call-seq:
- *     file.truncate(integer)    => 0
- *  
+ *     file.truncate(integer)    -> 0
+ *
  *  Truncates <i>file</i> to at most <i>integer</i> bytes. The file
  *  must be opened for writing. Not available on all platforms.
- *     
+ *
  *     f = File.new("out", "w")
  *     f.syswrite("1234567890")   #=> 10
  *     f.truncate(5)              #=> 0
@@ -3243,11 +3896,9 @@ rb_file_s_truncate(klass, path, len)
  */
 
 static VALUE
-rb_file_truncate(obj, len)
-    VALUE obj, len;
+rb_file_truncate(VALUE obj, VALUE len)
 {
-    OpenFile *fptr;
-    FILE *f;
+    rb_io_t *fptr;
     off_t pos;
 
     rb_secure(2);
@@ -3256,22 +3907,19 @@ rb_file_truncate(obj, len)
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
-    f = GetWriteFile(fptr);
-    fflush(f);
-    fseeko(f, (off_t)0, SEEK_CUR);
+    rb_io_flush(obj);
 #ifdef HAVE_FTRUNCATE
-    if (ftruncate(fileno(f), pos) < 0)
-	rb_sys_fail(fptr->path);
-#else
-# ifdef HAVE_CHSIZE
-    if (chsize(fileno(f), pos) < 0)
-	rb_sys_fail(fptr->path);
-# else
-    rb_notimplement();
-# endif
+    if (ftruncate(fptr->fd, pos) < 0)
+	rb_sys_fail_path(fptr->pathv);
+#else /* defined(HAVE_CHSIZE) */
+    if (chsize(fptr->fd, pos) < 0)
+	rb_sys_fail_path(fptr->pathv);
 #endif
     return INT2FIX(0);
 }
+#else
+#define rb_file_truncate rb_f_notimplement
+#endif
 
 # ifndef LOCK_SH
 #  define LOCK_SH 1
@@ -3289,65 +3937,35 @@ rb_file_truncate(obj, len)
 #ifdef __CYGWIN__
 #include <winerror.h>
 extern unsigned long __attribute__((stdcall)) GetLastError(void);
+#endif
 
-static int
-cygwin_flock(int fd, int op)
+static VALUE
+rb_thread_flock(void *data)
 {
+#ifdef __CYGWIN__
     int old_errno = errno;
-    int ret = flock(fd, op);
+#endif
+    int *op = data, ret = flock(op[0], op[1]);
+
+#ifdef __CYGWIN__
     if (GetLastError() == ERROR_NOT_LOCKED) {
 	ret = 0;
 	errno = old_errno;
     }
-    return ret;
-}
-# define flock(fd, op) cygwin_flock(fd, op)
-#endif
-
-static int
-rb_thread_flock(fd, op, fptr)
-    int fd, op;
-    OpenFile *fptr;
-{
-    if (rb_thread_alone() || (op & LOCK_NB)) {
-	int ret;
-	TRAP_BEG;
-	ret = flock(fd, op);
-	TRAP_END;
-	return ret;
-    }
-    op |= LOCK_NB;
-    while (flock(fd, op) < 0) {
-	switch (errno) {
-	  case EAGAIN:
-	  case EACCES:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	  case EWOULDBLOCK:
 #endif
-	    rb_thread_polling();	/* busy wait */
-	    rb_io_check_closed(fptr);
-	    continue;
-	  default:
-	    return -1;
-	}
-    }
-    return 0;
+    return (VALUE)ret;
 }
-#ifdef __CYGWIN__
-# undef flock
-#endif
-#define flock(fd, op) rb_thread_flock(fd, op, fptr)
 
 /*
  *  call-seq:
- *     file.flock (locking_constant ) =>  0 or false
- *  
+ *     file.flock (locking_constant )-> 0 or false
+ *
  *  Locks or unlocks a file according to <i>locking_constant</i> (a
  *  logical <em>or</em> of the values in the table below).
  *  Returns <code>false</code> if <code>File::LOCK_NB</code> is
  *  specified and the operation would otherwise have blocked. Not
  *  available on all platforms.
- *     
+ *
  *  Locking constants (in class File):
  *
  *     LOCK_EX   | Exclusive lock. Only one process may hold an
@@ -3363,62 +3981,78 @@ rb_thread_flock(fd, op, fptr)
  *
  *  Example:
  *
- *     File.new("testfile").flock(File::LOCK_UN)   #=> 0
- *     
+ *     # update a counter using write lock
+ *     # don't use "w" because it truncates the file before lock.
+ *     File.open("counter", File::RDWR|File::CREAT, 0644) {|f|
+ *       f.flock(File::LOCK_EX)
+ *       value = f.read.to_i + 1
+ *       f.rewind
+ *       f.write("#{value}\n")
+ *       f.flush
+ *       f.truncate(f.pos)
+ *     }
+ *
+ *     # read the counter using read lock
+ *     File.open("counter", "r") {|f|
+ *       f.flock(File::LOCK_SH)
+ *       p f.read
+ *     }
+ *
  */
 
 static VALUE
-rb_file_flock(obj, operation)
-    VALUE obj;
-    VALUE operation;
+rb_file_flock(VALUE obj, VALUE operation)
 {
-#ifndef __CHECKER__
-    OpenFile *fptr;
-    int op;
+    rb_io_t *fptr;
+    int op[2], op1;
 
     rb_secure(2);
-    op = NUM2INT(operation);
+    op[1] = op1 = NUM2INT(operation);
     GetOpenFile(obj, fptr);
+    op[0] = fptr->fd;
 
     if (fptr->mode & FMODE_WRITABLE) {
-	fflush(GetWriteFile(fptr));
+	rb_io_flush(obj);
     }
-  retry:
-    if (flock(fileno(fptr->f), op) < 0) {
+    while ((int)rb_thread_blocking_region(rb_thread_flock, op, RUBY_UBF_IO, 0) < 0) {
 	switch (errno) {
 	  case EAGAIN:
 	  case EACCES:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
-	      return Qfalse;
+	    if (op1 & LOCK_NB) return Qfalse;
+	    rb_thread_polling();
+	    rb_io_check_closed(fptr);
+	    continue;
+
 	  case EINTR:
 #if defined(ERESTART)
 	  case ERESTART:
 #endif
-	    goto retry;
+	    break;
+
+	  default:
+	    rb_sys_fail_path(fptr->pathv);
 	}
-	rb_sys_fail(fptr->path);
     }
-#endif
     return INT2FIX(0);
 }
 #undef flock
 
 static void
-test_check(n, argc, argv)
-    int n, argc;
-    VALUE *argv;
+test_check(int n, int argc, VALUE *argv)
 {
     int i;
 
+    rb_secure(2);
     n+=1;
     if (n != argc) rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
     for (i=1; i<n; i++) {
 	switch (TYPE(argv[i])) {
 	  case T_STRING:
 	  default:
-	    SafeStringValue(argv[i]);
+	    FilePathValue(argv[i]);
 	    break;
 	  case T_FILE:
 	    break;
@@ -3430,171 +4064,166 @@ test_check(n, argc, argv)
 
 /*
  *  call-seq:
- *     test(int_cmd, file1 [, file2] ) => obj
- *  
+ *     test(int_cmd, file1 [, file2] ) -> obj
+ *
  *  Uses the integer <i>aCmd</i> to perform various tests on
  *  <i>file1</i> (first table below) or on <i>file1</i> and
  *  <i>file2</i> (second table).
- *     
+ *
  *  File tests on a single file:
  *
  *    Test   Returns   Meaning
- *     ?A  | Time    | Last access time for file1
- *     ?b  | boolean | True if file1 is a block device
- *     ?c  | boolean | True if file1 is a character device
- *     ?C  | Time    | Last change time for file1
- *     ?d  | boolean | True if file1 exists and is a directory
- *     ?e  | boolean | True if file1 exists
- *     ?f  | boolean | True if file1 exists and is a regular file
- *     ?g  | boolean | True if file1 has the \CF{setgid} bit
+ *    "A"  | Time    | Last access time for file1
+ *    "b"  | boolean | True if file1 is a block device
+ *    "c"  | boolean | True if file1 is a character device
+ *    "C"  | Time    | Last change time for file1
+ *    "d"  | boolean | True if file1 exists and is a directory
+ *    "e"  | boolean | True if file1 exists
+ *    "f"  | boolean | True if file1 exists and is a regular file
+ *    "g"  | boolean | True if file1 has the \CF{setgid} bit
  *         |         | set (false under NT)
- *     ?G  | boolean | True if file1 exists and has a group
+ *    "G"  | boolean | True if file1 exists and has a group
  *         |         | ownership equal to the caller's group
- *     ?k  | boolean | True if file1 exists and has the sticky bit set
- *     ?l  | boolean | True if file1 exists and is a symbolic link
- *     ?M  | Time    | Last modification time for file1
- *     ?o  | boolean | True if file1 exists and is owned by 
+ *    "k"  | boolean | True if file1 exists and has the sticky bit set
+ *    "l"  | boolean | True if file1 exists and is a symbolic link
+ *    "M"  | Time    | Last modification time for file1
+ *    "o"  | boolean | True if file1 exists and is owned by
  *         |         | the caller's effective uid
- *     ?O  | boolean | True if file1 exists and is owned by
+ *    "O"  | boolean | True if file1 exists and is owned by
  *         |         | the caller's real uid
- *     ?p  | boolean | True if file1 exists and is a fifo
- *     ?r  | boolean | True if file1 is readable by the effective
+ *    "p"  | boolean | True if file1 exists and is a fifo
+ *    "r"  | boolean | True if file1 is readable by the effective
  *         |         | uid/gid of the caller
- *     ?R  | boolean | True if file is readable by the real
+ *    "R"  | boolean | True if file is readable by the real
  *         |         | uid/gid of the caller
- *     ?s  | int/nil | If file1 has nonzero size, return the size,
+ *    "s"  | int/nil | If file1 has nonzero size, return the size,
  *         |         | otherwise return nil
- *     ?S  | boolean | True if file1 exists and is a socket
- *     ?u  | boolean | True if file1 has the setuid bit set
- *     ?w  | boolean | True if file1 exists and is writable by
+ *    "S"  | boolean | True if file1 exists and is a socket
+ *    "u"  | boolean | True if file1 has the setuid bit set
+ *    "w"  | boolean | True if file1 exists and is writable by
  *         |         | the effective uid/gid
- *     ?W  | boolean | True if file1 exists and is writable by
+ *    "W"  | boolean | True if file1 exists and is writable by
  *         |         | the real uid/gid
- *     ?x  | boolean | True if file1 exists and is executable by
+ *    "x"  | boolean | True if file1 exists and is executable by
  *         |         | the effective uid/gid
- *     ?X  | boolean | True if file1 exists and is executable by
+ *    "X"  | boolean | True if file1 exists and is executable by
  *         |         | the real uid/gid
- *     ?z  | boolean | True if file1 exists and has a zero length
+ *    "z"  | boolean | True if file1 exists and has a zero length
  *
  * Tests that take two files:
  *
- *     ?-  | boolean | True if file1 and file2 are identical
- *     ?=  | boolean | True if the modification times of file1
+ *    "-"  | boolean | True if file1 and file2 are identical
+ *    "="  | boolean | True if the modification times of file1
  *         |         | and file2 are equal
- *     ?<  | boolean | True if the modification time of file1
+ *    "<"  | boolean | True if the modification time of file1
  *         |         | is prior to that of file2
- *     ?>  | boolean | True if the modification time of file1
+ *    ">"  | boolean | True if the modification time of file1
  *         |         | is after that of file2
  */
 
 static VALUE
-rb_f_test(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_test(int argc, VALUE *argv)
 {
     int cmd;
 
-    if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments");
-#if 0 /* 1.7 behavior? */
-    if (argc == 1) {
-	return RTEST(argv[0]) ? Qtrue : Qfalse;
-    }
-#endif
+    if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments (0 for 2..3)");
     cmd = NUM2CHR(argv[0]);
-    if (cmd == 0) return Qfalse;
+    if (cmd == 0) goto unknown;
     if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
 	CHECK(1);
 	switch (cmd) {
 	  case 'b':
-	    return test_b(0, argv[1]);
+	    return rb_file_blockdev_p(0, argv[1]);
 
 	  case 'c':
-	    return test_c(0, argv[1]);
+	    return rb_file_chardev_p(0, argv[1]);
 
 	  case 'd':
-	    return test_d(0, argv[1]);
+	    return rb_file_directory_p(0, argv[1]);
 
 	  case 'a':
 	  case 'e':
-	    return test_e(0, argv[1]);
+	    return rb_file_exist_p(0, argv[1]);
 
 	  case 'f':
-	    return test_f(0, argv[1]);
+	    return rb_file_file_p(0, argv[1]);
 
 	  case 'g':
-	    return test_sgid(0, argv[1]);
+	    return rb_file_sgid_p(0, argv[1]);
 
 	  case 'G':
-	    return test_grpowned(0, argv[1]);
+	    return rb_file_grpowned_p(0, argv[1]);
 
 	  case 'k':
-	    return test_sticky(0, argv[1]);
+	    return rb_file_sticky_p(0, argv[1]);
 
 	  case 'l':
-	    return test_l(0, argv[1]);
+	    return rb_file_symlink_p(0, argv[1]);
 
 	  case 'o':
-	    return test_owned(0, argv[1]);
+	    return rb_file_owned_p(0, argv[1]);
 
 	  case 'O':
-	    return test_rowned(0, argv[1]);
+	    return rb_file_rowned_p(0, argv[1]);
 
 	  case 'p':
-	    return test_p(0, argv[1]);
+	    return rb_file_pipe_p(0, argv[1]);
 
 	  case 'r':
-	    return test_r(0, argv[1]);
+	    return rb_file_readable_p(0, argv[1]);
 
 	  case 'R':
-	    return test_R(0, argv[1]);
+	    return rb_file_readable_real_p(0, argv[1]);
 
 	  case 's':
-	    return test_s(0, argv[1]);
+	    return rb_file_size_p(0, argv[1]);
 
 	  case 'S':
-	    return test_S(0, argv[1]);
+	    return rb_file_socket_p(0, argv[1]);
 
 	  case 'u':
-	    return test_suid(0, argv[1]);
+	    return rb_file_suid_p(0, argv[1]);
 
 	  case 'w':
-	    return test_w(0, argv[1]);
+	    return rb_file_writable_p(0, argv[1]);
 
 	  case 'W':
-	    return test_W(0, argv[1]);
+	    return rb_file_writable_real_p(0, argv[1]);
 
 	  case 'x':
-	    return test_x(0, argv[1]);
+	    return rb_file_executable_p(0, argv[1]);
 
 	  case 'X':
-	    return test_X(0, argv[1]);
+	    return rb_file_executable_real_p(0, argv[1]);
 
 	  case 'z':
-	    return test_z(0, argv[1]);
+	    return rb_file_zero_p(0, argv[1]);
 	}
     }
 
     if (strchr("MAC", cmd)) {
 	struct stat st;
+	VALUE fname = argv[1];
 
 	CHECK(1);
-	if (rb_stat(argv[1], &st) == -1) {
-	    rb_sys_fail(RSTRING(argv[1])->ptr);
+	if (rb_stat(fname, &st) == -1) {
+	    FilePathValue(fname);
+	    rb_sys_fail(RSTRING_PTR(fname));
 	}
 
 	switch (cmd) {
 	  case 'A':
-	    return rb_time_new(st.st_atime, 0);
+	    return stat_atime(&st);
 	  case 'M':
-	    return rb_time_new(st.st_mtime, 0);
+	    return stat_mtime(&st);
 	  case 'C':
-	    return rb_time_new(st.st_ctime, 0);
+	    return stat_ctime(&st);
 	}
     }
 
     if (cmd == '-') {
 	CHECK(2);
-	return test_identical(0, argv[1], argv[2]);
+	return rb_file_identical_p(0, argv[1], argv[2]);
     }
 
     if (strchr("=<>", cmd)) {
@@ -3618,13 +4247,18 @@ rb_f_test(argc, argv)
 	    return Qfalse;
 	}
     }
+  unknown:
     /* unknown command */
-    rb_raise(rb_eArgError, "unknown command ?%c", cmd);
+    if (ISPRINT(cmd)) {
+	rb_raise(rb_eArgError, "unknown command '%s%c'", cmd == '\'' || cmd == '\\' ? "\\" : "", cmd);
+    }
+    else {
+	rb_raise(rb_eArgError, "unknown command \"\\x%02X\"", cmd);
+    }
     return Qnil;		/* not reached */
 }
 
 
-
 /*
  *  Document-class: File::Stat
  *
@@ -3639,10 +4273,8 @@ rb_f_test(argc, argv)
  *  meaningful on all systems. See also <code>Kernel#test</code>.
  */
 
-static VALUE rb_stat_s_alloc _((VALUE));
 static VALUE
-rb_stat_s_alloc(klass)
-    VALUE klass;
+rb_stat_s_alloc(VALUE klass)
 {
     return stat_new_0(klass, 0);
 }
@@ -3650,25 +4282,25 @@ rb_stat_s_alloc(klass)
 /*
  * call-seq:
  *
- *   File::Stat.new(file_name)  => stat
+ *   File::Stat.new(file_name)  -> stat
  *
  * Create a File::Stat object for the given file name (raising an
  * exception if the file doesn't exist).
  */
 
 static VALUE
-rb_stat_init(obj, fname)
-    VALUE obj, fname;
+rb_stat_init(VALUE obj, VALUE fname)
 {
     struct stat st, *nst;
 
-    SafeStringValue(fname);
-
-    if (stat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING(fname)->ptr);
+    rb_secure(2);
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (STAT(StringValueCStr(fname), &st) == -1) {
+	rb_sys_fail(RSTRING_PTR(fname));
     }
     if (DATA_PTR(obj)) {
-	free(DATA_PTR(obj));
+	xfree(DATA_PTR(obj));
 	DATA_PTR(obj) = NULL;
     }
     nst = ALLOC(struct stat);
@@ -3680,8 +4312,7 @@ rb_stat_init(obj, fname)
 
 /* :nodoc: */
 static VALUE
-rb_stat_init_copy(copy, orig)
-    VALUE copy, orig;
+rb_stat_init_copy(VALUE copy, VALUE orig)
 {
     struct stat *nst;
 
@@ -3692,7 +4323,7 @@ rb_stat_init_copy(copy, orig)
 	rb_raise(rb_eTypeError, "wrong argument class");
     }
     if (DATA_PTR(copy)) {
-	free(DATA_PTR(copy));
+	xfree(DATA_PTR(copy));
 	DATA_PTR(copy) = 0;
     }
     if (DATA_PTR(orig)) {
@@ -3706,39 +4337,37 @@ rb_stat_init_copy(copy, orig)
 
 /*
  *  call-seq:
- *     stat.ftype   => string
- *  
+ *     stat.ftype   -> string
+ *
  *  Identifies the type of <i>stat</i>. The return string is one of:
  *  ``<code>file</code>'', ``<code>directory</code>'',
  *  ``<code>characterSpecial</code>'', ``<code>blockSpecial</code>'',
  *  ``<code>fifo</code>'', ``<code>link</code>'',
  *  ``<code>socket</code>'', or ``<code>unknown</code>''.
- *     
+ *
  *     File.stat("/dev/tty").ftype   #=> "characterSpecial"
- *     
+ *
  */
 
 static VALUE
-rb_stat_ftype(obj)
-    VALUE obj;
+rb_stat_ftype(VALUE obj)
 {
     return rb_file_ftype(get_stat(obj));
 }
 
 /*
  *  call-seq:
- *     stat.directory?   => true or false
- *  
+ *     stat.directory?   -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is a directory,
  *  <code>false</code> otherwise.
- *     
+ *
  *     File.stat("testfile").directory?   #=> false
  *     File.stat(".").directory?          #=> true
  */
 
 static VALUE
-rb_stat_d(obj)
-    VALUE obj;
+rb_stat_d(VALUE obj)
 {
     if (S_ISDIR(get_stat(obj)->st_mode)) return Qtrue;
     return Qfalse;
@@ -3746,15 +4375,14 @@ rb_stat_d(obj)
 
 /*
  *  call-seq:
- *     stat.pipe?    => true or false
- *  
+ *     stat.pipe?    -> true or false
+ *
  *  Returns <code>true</code> if the operating system supports pipes and
  *  <i>stat</i> is a pipe; <code>false</code> otherwise.
  */
 
 static VALUE
-rb_stat_p(obj)
-    VALUE obj;
+rb_stat_p(VALUE obj)
 {
 #ifdef S_IFIFO
     if (S_ISFIFO(get_stat(obj)->st_mode)) return Qtrue;
@@ -3765,24 +4393,23 @@ rb_stat_p(obj)
 
 /*
  *  call-seq:
- *     stat.symlink?    => true or false
- *  
+ *     stat.symlink?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is a symbolic link,
  *  <code>false</code> if it isn't or if the operating system doesn't
  *  support this feature. As <code>File::stat</code> automatically
  *  follows symbolic links, <code>symlink?</code> will always be
  *  <code>false</code> for an object returned by
  *  <code>File::stat</code>.
- *     
+ *
  *     File.symlink("testfile", "alink")   #=> 0
  *     File.stat("alink").symlink?         #=> false
  *     File.lstat("alink").symlink?        #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_l(obj)
-    VALUE obj;
+rb_stat_l(VALUE obj)
 {
 #ifdef S_ISLNK
     if (S_ISLNK(get_stat(obj)->st_mode)) return Qtrue;
@@ -3792,19 +4419,18 @@ rb_stat_l(obj)
 
 /*
  *  call-seq:
- *     stat.socket?    => true or false
- *  
+ *     stat.socket?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is a socket,
  *  <code>false</code> if it isn't or if the operating system doesn't
  *  support this feature.
- *     
+ *
  *     File.stat("testfile").socket?   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_stat_S(obj)
-    VALUE obj;
+rb_stat_S(VALUE obj)
 {
 #ifdef S_ISSOCK
     if (S_ISSOCK(get_stat(obj)->st_mode)) return Qtrue;
@@ -3815,20 +4441,19 @@ rb_stat_S(obj)
 
 /*
  *  call-seq:
- *     stat.blockdev?   => true or false
- *  
+ *     stat.blockdev?   -> true or false
+ *
  *  Returns <code>true</code> if the file is a block device,
  *  <code>false</code> if it isn't or if the operating system doesn't
  *  support this feature.
- *     
+ *
  *     File.stat("testfile").blockdev?    #=> false
  *     File.stat("/dev/hda1").blockdev?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_b(obj)
-    VALUE obj;
+rb_stat_b(VALUE obj)
 {
 #ifdef S_ISBLK
     if (S_ISBLK(get_stat(obj)->st_mode)) return Qtrue;
@@ -3839,19 +4464,18 @@ rb_stat_b(obj)
 
 /*
  *  call-seq:
- *     stat.chardev?    => true or false
- *  
+ *     stat.chardev?    -> true or false
+ *
  *  Returns <code>true</code> if the file is a character device,
  *  <code>false</code> if it isn't or if the operating system doesn't
  *  support this feature.
- *     
+ *
  *     File.stat("/dev/tty").chardev?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_c(obj)
-    VALUE obj;
+rb_stat_c(VALUE obj)
 {
     if (S_ISCHR(get_stat(obj)->st_mode)) return Qtrue;
 
@@ -3860,27 +4484,25 @@ rb_stat_c(obj)
 
 /*
  *  call-seq:
- *     stat.owned?    => true or false
- *  
+ *     stat.owned?    -> true or false
+ *
  *  Returns <code>true</code> if the effective user id of the process is
  *  the same as the owner of <i>stat</i>.
- *     
+ *
  *     File.stat("testfile").owned?      #=> true
  *     File.stat("/etc/passwd").owned?   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_stat_owned(obj)
-    VALUE obj;
+rb_stat_owned(VALUE obj)
 {
     if (get_stat(obj)->st_uid == geteuid()) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
-rb_stat_rowned(obj)
-    VALUE obj;
+rb_stat_rowned(VALUE obj)
 {
     if (get_stat(obj)->st_uid == getuid()) return Qtrue;
     return Qfalse;
@@ -3888,40 +4510,38 @@ rb_stat_rowned(obj)
 
 /*
  *  call-seq:
- *     stat.grpowned?   => true or false
- *  
+ *     stat.grpowned?   -> true or false
+ *
  *  Returns true if the effective group id of the process is the same as
  *  the group id of <i>stat</i>. On Windows NT, returns <code>false</code>.
- *     
+ *
  *     File.stat("testfile").grpowned?      #=> true
  *     File.stat("/etc/passwd").grpowned?   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_stat_grpowned(obj)
-    VALUE obj;
+rb_stat_grpowned(VALUE obj)
 {
 #ifndef _WIN32
-    if (group_member(get_stat(obj)->st_gid)) return Qtrue;
+    if (rb_group_member(get_stat(obj)->st_gid)) return Qtrue;
 #endif
     return Qfalse;
 }
 
 /*
  *  call-seq:
- *     stat.readable?    => true or false
- *  
+ *     stat.readable?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is readable by the
  *  effective user id of this process.
- *     
+ *
  *     File.stat("testfile").readable?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_r(obj)
-    VALUE obj;
+rb_stat_r(VALUE obj)
 {
     struct stat *st = get_stat(obj);
 
@@ -3942,22 +4562,19 @@ rb_stat_r(obj)
     return Qtrue;
 }
 
-
-
 /*
  *  call-seq:
- *     stat.readable_real? -> true or false
- *  
+ *     stat.readable_real?  ->  true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is readable by the real
  *  user id of this process.
- *     
+ *
  *     File.stat("testfile").readable_real?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_R(obj)
-    VALUE obj;
+rb_stat_R(VALUE obj)
 {
     struct stat *st = get_stat(obj);
 
@@ -3969,7 +4586,7 @@ rb_stat_R(obj)
 	return st->st_mode & S_IRUSR ? Qtrue : Qfalse;
 #endif
 #ifdef S_IRGRP
-    if (group_member(get_stat(obj)->st_gid))
+    if (rb_group_member(get_stat(obj)->st_gid))
 	return st->st_mode & S_IRGRP ? Qtrue : Qfalse;
 #endif
 #ifdef S_IROTH
@@ -3979,19 +4596,44 @@ rb_stat_R(obj)
 }
 
 /*
+ * call-seq:
+ *    stat.world_readable? -> fixnum or nil
+ *
+ * If <i>stat</i> is readable by others, returns an integer
+ * representing the file permission bits of <i>stat</i>. Returns
+ * <code>nil</code> otherwise. The meaning of the bits is platform
+ * dependent; on Unix systems, see <code>stat(2)</code>.
+ *
+ *    m = File.stat("/etc/passwd").world_readable?  #=> 420
+ *    sprintf("%o", m)				    #=> "644"
+ */
+
+static VALUE
+rb_stat_wr(VALUE obj)
+{
+#ifdef S_IROTH
+    if ((get_stat(obj)->st_mode & (S_IROTH)) == S_IROTH) {
+	return UINT2NUM(get_stat(obj)->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
+    }
+    else {
+	return Qnil;
+    }
+#endif
+}
+
+/*
  *  call-seq:
- *     stat.writable? -> true or false
- *  
+ *     stat.writable?  ->  true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is writable by the
  *  effective user id of this process.
- *     
+ *
  *     File.stat("testfile").writable?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_w(obj)
-    VALUE obj;
+rb_stat_w(VALUE obj)
 {
     struct stat *st = get_stat(obj);
 
@@ -4014,18 +4656,17 @@ rb_stat_w(obj)
 
 /*
  *  call-seq:
- *     stat.writable_real? -> true or false
- *  
+ *     stat.writable_real?  ->  true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is writable by the real
  *  user id of this process.
- *     
+ *
  *     File.stat("testfile").writable_real?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_W(obj)
-    VALUE obj;
+rb_stat_W(VALUE obj)
 {
     struct stat *st = get_stat(obj);
 
@@ -4037,7 +4678,7 @@ rb_stat_W(obj)
 	return st->st_mode & S_IWUSR ? Qtrue : Qfalse;
 #endif
 #ifdef S_IWGRP
-    if (group_member(get_stat(obj)->st_gid))
+    if (rb_group_member(get_stat(obj)->st_gid))
 	return st->st_mode & S_IWGRP ? Qtrue : Qfalse;
 #endif
 #ifdef S_IWOTH
@@ -4047,21 +4688,46 @@ rb_stat_W(obj)
 }
 
 /*
+ * call-seq:
+ *    stat.world_writable?  ->  fixnum or nil
+ *
+ * If <i>stat</i> is writable by others, returns an integer
+ * representing the file permission bits of <i>stat</i>. Returns
+ * <code>nil</code> otherwise. The meaning of the bits is platform
+ * dependent; on Unix systems, see <code>stat(2)</code>.
+ *
+ *    m = File.stat("/tmp").world_writable?	    #=> 511
+ *    sprintf("%o", m)				    #=> "777"
+ */
+
+static VALUE
+rb_stat_ww(VALUE obj)
+{
+#ifdef S_IROTH
+    if ((get_stat(obj)->st_mode & (S_IWOTH)) == S_IWOTH) {
+	return UINT2NUM(get_stat(obj)->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
+    }
+    else {
+	return Qnil;
+    }
+#endif
+}
+
+/*
  *  call-seq:
- *     stat.executable?    => true or false
- *  
+ *     stat.executable?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is executable or if the
  *  operating system doesn't distinguish executable files from
  *  nonexecutable files. The tests are made using the effective owner of
  *  the process.
- *     
+ *
  *     File.stat("testfile").executable?   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_stat_x(obj)
-    VALUE obj;
+rb_stat_x(VALUE obj)
 {
     struct stat *st = get_stat(obj);
 
@@ -4086,16 +4752,14 @@ rb_stat_x(obj)
 
 /*
  *  call-seq:
- *     stat.executable_real?    => true or false
- *  
+ *     stat.executable_real?    -> true or false
+ *
  *  Same as <code>executable?</code>, but tests using the real owner of
  *  the process.
  */
 
-
 static VALUE
-rb_stat_X(obj)
-    VALUE obj;
+rb_stat_X(VALUE obj)
 {
     struct stat *st = get_stat(obj);
 
@@ -4109,7 +4773,7 @@ rb_stat_X(obj)
 	return st->st_mode & S_IXUSR ? Qtrue : Qfalse;
 #endif
 #ifdef S_IXGRP
-    if (group_member(get_stat(obj)->st_gid))
+    if (rb_group_member(get_stat(obj)->st_gid))
 	return st->st_mode & S_IXGRP ? Qtrue : Qfalse;
 #endif
 #ifdef S_IXOTH
@@ -4120,18 +4784,17 @@ rb_stat_X(obj)
 
 /*
  *  call-seq:
- *     stat.file?    => true or false
- *  
+ *     stat.file?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is a regular file (not
  *  a device file, pipe, socket, etc.).
- *     
+ *
  *     File.stat("testfile").file?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_f(obj)
-    VALUE obj;
+rb_stat_f(VALUE obj)
 {
     if (S_ISREG(get_stat(obj)->st_mode)) return Qtrue;
     return Qfalse;
@@ -4139,37 +4802,34 @@ rb_stat_f(obj)
 
 /*
  *  call-seq:
- *     stat.zero?    => true or false
- *  
+ *     stat.zero?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> is a zero-length file;
  *  <code>false</code> otherwise.
- *     
+ *
  *     File.stat("testfile").zero?   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_stat_z(obj)
-    VALUE obj;
+rb_stat_z(VALUE obj)
 {
     if (get_stat(obj)->st_size == 0) return Qtrue;
     return Qfalse;
 }
 
-
 /*
  *  call-seq:
- *     state.size    => integer
- *  
+ *     state.size    -> integer
+ *
  *  Returns the size of <i>stat</i> in bytes.
- *     
+ *
  *     File.stat("testfile").size   #=> 66
- *     
+ *
  */
 
 static VALUE
-rb_stat_s(obj)
-    VALUE obj;
+rb_stat_s(VALUE obj)
 {
     off_t size = get_stat(obj)->st_size;
 
@@ -4179,18 +4839,17 @@ rb_stat_s(obj)
 
 /*
  *  call-seq:
- *     stat.setuid?    => true or false
- *  
+ *     stat.setuid?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> has the set-user-id
  *  permission bit set, <code>false</code> if it doesn't or if the
  *  operating system doesn't support this feature.
- *     
+ *
  *     File.stat("/bin/su").setuid?   #=> true
  */
 
 static VALUE
-rb_stat_suid(obj)
-    VALUE obj;
+rb_stat_suid(VALUE obj)
 {
 #ifdef S_ISUID
     if (get_stat(obj)->st_mode & S_ISUID) return Qtrue;
@@ -4200,19 +4859,18 @@ rb_stat_suid(obj)
 
 /*
  *  call-seq:
- *     stat.setgid?   => true or false
- *  
+ *     stat.setgid?   -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> has the set-group-id
  *  permission bit set, <code>false</code> if it doesn't or if the
  *  operating system doesn't support this feature.
- *     
+ *
  *     File.stat("/usr/sbin/lpc").setgid?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_stat_sgid(obj)
-    VALUE obj;
+rb_stat_sgid(VALUE obj)
 {
 #ifdef S_ISGID
     if (get_stat(obj)->st_mode & S_ISGID) return Qtrue;
@@ -4222,19 +4880,18 @@ rb_stat_sgid(obj)
 
 /*
  *  call-seq:
- *     stat.sticky?    => true or false
- *  
+ *     stat.sticky?    -> true or false
+ *
  *  Returns <code>true</code> if <i>stat</i> has its sticky bit set,
  *  <code>false</code> if it doesn't or if the operating system doesn't
  *  support this feature.
- *     
+ *
  *     File.stat("testfile").sticky?   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_stat_sticky(obj)
-    VALUE obj;
+rb_stat_sticky(VALUE obj)
 {
 #ifdef S_ISVTX
     if (get_stat(obj)->st_mode & S_ISVTX) return Qtrue;
@@ -4245,16 +4902,13 @@ rb_stat_sticky(obj)
 VALUE rb_mFConst;
 
 void
-rb_file_const(name, value)
-    const char *name;
-    VALUE value;
+rb_file_const(const char *name, VALUE value)
 {
     rb_define_const(rb_mFConst, name, value);
 }
 
-static int
-is_absolute_path(path)
-    const char *path;
+int
+rb_is_absolute_path(const char *path)
 {
 #ifdef DOSISH_DRIVE_LETTER
     if (has_drive_letter(path) && isdirsep(path[2])) return 1;
@@ -4278,37 +4932,37 @@ is_absolute_path(path)
 
 #if ENABLE_PATH_CHECK
 static int
-path_check_0(fpath, execpath)
-     VALUE fpath;
-     int execpath;
+path_check_0(VALUE path, int execpath)
 {
     struct stat st;
-    char *p0 = StringValueCStr(fpath);
+    const char *p0 = StringValueCStr(path);
     char *p = 0, *s;
 
-    if (!is_absolute_path(p0)) {
+    if (!rb_is_absolute_path(p0)) {
 	char *buf = my_getcwd();
 	VALUE newpath;
 
 	newpath = rb_str_new2(buf);
-	free(buf);
+	xfree(buf);
 
 	rb_str_cat2(newpath, "/");
 	rb_str_cat2(newpath, p0);
-	p0 = RSTRING(fpath = newpath)->ptr;
+	path = newpath;
+	p0 = RSTRING_PTR(path);
     }
     for (;;) {
 #ifndef S_IWOTH
 # define S_IWOTH 002
 #endif
-	if (stat(p0, &st) == 0 && S_ISDIR(st.st_mode) && (st.st_mode & S_IWOTH)
+	if (STAT(p0, &st) == 0 && S_ISDIR(st.st_mode) && (st.st_mode & S_IWOTH)
 #ifdef S_ISVTX
 	    && !(p && execpath && (st.st_mode & S_ISVTX))
 #endif
-	    ) {
+	    && !access(p0, W_OK)) {
 	    rb_warn("Insecure world writable dir %s in %sPATH, mode 0%o",
 		    p0, (execpath ? "" : "LOAD_"), st.st_mode);
 	    if (p) *p = '/';
+	    RB_GC_GUARD(path);
 	    return 0;
 	}
 	s = strrdirsep(p0);
@@ -4320,23 +4974,17 @@ path_check_0(fpath, execpath)
 }
 #endif
 
-static int
-fpath_check(path)
-    char *path;
-{
 #if ENABLE_PATH_CHECK
-    return path_check_0(rb_str_new2(path), Qfalse);
+#define fpath_check(path) path_check_0(path, FALSE)
 #else
-    return 1;
+#define fpath_check(path) 1
 #endif
-}
 
 int
-rb_path_check(path)
-    char *path;
+rb_path_check(const char *path)
 {
 #if ENABLE_PATH_CHECK
-    char *p0, *p, *pend;
+    const char *p0, *p, *pend;
     const char sep = PATH_SEP_CHAR;
 
     if (!path) return 1;
@@ -4347,7 +4995,7 @@ rb_path_check(path)
     if (!p) p = pend;
 
     for (;;) {
-	if (!path_check_0(rb_str_new(p0, p - p0), Qtrue)) {
+	if (!path_check_0(rb_str_new(p0, p - p0), TRUE)) {
 	    return 0;		/* not safe */
 	}
 	p0 = p + 1;
@@ -4359,170 +5007,189 @@ rb_path_check(path)
     return 1;
 }
 
-#if defined(__MACOS__) || defined(riscos)
 static int
-is_macos_native_path(path)
-    const char *path;
+file_load_ok(const char *path)
 {
-    if (strchr(path, ':')) return 1;
-    return 0;
-}
+    int ret = 1;
+    int fd = open(path, O_RDONLY);
+    if (fd == -1) return 0;
+#if !defined DOSISH
+    {
+	struct stat st;
+	if (fstat(fd, &st) || !S_ISREG(st.st_mode)) {
+	    ret = 0;
+	}
+    }
 #endif
+    (void)close(fd);
+    return ret;
+}
+
+int
+rb_file_load_ok(const char *path)
+{
+    return file_load_ok(path);
+}
 
 static int
-file_load_ok(file)
-    char *file;
+is_explicit_relative(const char *path)
 {
-    FILE *f;
+    if (*path++ != '.') return 0;
+    if (*path == '.') path++;
+    return isdirsep(*path);
+}
 
-    if (!file) return 0;
-    f = fopen(file, "r");
-    if (f == NULL) return 0;
-    fclose(f);
-    return 1;
+VALUE rb_get_load_path(void);
+
+static VALUE
+copy_path_class(VALUE path, VALUE orig)
+{
+    RBASIC(path)->klass = rb_obj_class(orig);
+    OBJ_FREEZE(path);
+    return path;
 }
 
-extern VALUE rb_load_path;
+int
+rb_find_file_ext(VALUE *filep, const char *const *ext)
+{
+    return rb_find_file_ext_safe(filep, ext, rb_safe_level());
+}
 
 int
-rb_find_file_ext(filep, ext)
-    VALUE *filep;
-    const char * const *ext;
+rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
 {
-    char *path, *found;
-    char *f = RSTRING(*filep)->ptr;
-    VALUE fname;
-    long i, j;
+    const char *f = StringValueCStr(*filep);
+    VALUE fname = *filep, load_path, tmp;
+    long i, j, fnlen;
+    int expanded = 0;
+
+    if (!ext[0]) return 0;
 
     if (f[0] == '~') {
-	fname = rb_file_expand_path(*filep, Qnil);
-	if (rb_safe_level() >= 2 && OBJ_TAINTED(fname)) {
+	fname = file_expand_path_1(fname);
+	if (safe_level >= 1 && OBJ_TAINTED(fname)) {
 	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
 	}
-	OBJ_FREEZE(fname);
-	f = StringValueCStr(fname);
+	f = RSTRING_PTR(fname);
 	*filep = fname;
+	expanded = 1;
     }
 
-    if (is_absolute_path(f)) {
+    if (expanded || rb_is_absolute_path(f) || is_explicit_relative(f)) {
+	if (safe_level >= 1 && !fpath_check(fname)) {
+	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
+	}
+	if (!expanded) fname = file_expand_path_1(fname);
+	fnlen = RSTRING_LEN(fname);
 	for (i=0; ext[i]; i++) {
-	    fname = rb_str_dup(*filep);
 	    rb_str_cat2(fname, ext[i]);
-	    OBJ_FREEZE(fname);
-	    if (file_load_ok(StringValueCStr(fname))) {
-		*filep = fname;
-		return i+1;
+	    if (file_load_ok(RSTRING_PTR(fname))) {
+		*filep = copy_path_class(fname, *filep);
+		return (int)(i+1);
 	    }
+	    rb_str_set_len(fname, fnlen);
 	}
 	return 0;
     }
 
-    if (!rb_load_path) return 0;
-
-    Check_Type(rb_load_path, T_ARRAY);
-    for (i=0;i<RARRAY(rb_load_path)->len;i++) {
-	VALUE str = RARRAY(rb_load_path)->ptr[i];
+    if (safe_level >= 4) {
+	rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
+    }
 
-	SafeStringValue(str);
-	if (RSTRING(str)->len == 0) continue;
-	path = RSTRING(str)->ptr;
-	for (j=0; ext[j]; j++) {
-	    fname = rb_str_dup(*filep);
-	    rb_str_cat2(fname, ext[j]);
-	    OBJ_FREEZE(fname);
-	    found = dln_find_file(StringValueCStr(fname), path);
-	    if (found && file_load_ok(found)) {
-		*filep = fname;
-		return j+1;
+    RB_GC_GUARD(load_path) = rb_get_load_path();
+    if (!load_path) return 0;
+
+    fname = rb_str_dup(*filep);
+    RBASIC(fname)->klass = 0;
+    fnlen = RSTRING_LEN(fname);
+    tmp = rb_str_tmp_new(MAXPATHLEN + 2);
+    for (j=0; ext[j]; j++) {
+	rb_str_cat2(fname, ext[j]);
+	for (i = 0; i < RARRAY_LEN(load_path); i++) {
+	    VALUE str = RARRAY_PTR(load_path)[i];
+
+	    RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
+	    if (RSTRING_LEN(str) == 0) continue;
+	    file_expand_path(fname, str, 0, tmp);
+	    if (file_load_ok(RSTRING_PTR(tmp))) {
+		*filep = copy_path_class(tmp, *filep);
+		return (int)(j+1);
 	    }
+	    FL_UNSET(tmp, FL_TAINT | FL_UNTRUSTED);
 	}
+	rb_str_set_len(fname, fnlen);
     }
+    RB_GC_GUARD(load_path);
     return 0;
 }
 
 VALUE
-rb_find_file(path)
-    VALUE path;
+rb_find_file(VALUE path)
 {
-    VALUE tmp;
-    char *f = StringValueCStr(path);
-    char *lpath;
+    return rb_find_file_safe(path, rb_safe_level());
+}
 
-    if (f[0] == '~') {
-	path = rb_file_expand_path(path, Qnil);
-	if (rb_safe_level() >= 1 && OBJ_TAINTED(path)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
-	}
-	OBJ_FREEZE(path);
-	f = StringValueCStr(path);
-    }
+VALUE
+rb_find_file_safe(VALUE path, int safe_level)
+{
+    VALUE tmp, load_path;
+    const char *f = StringValueCStr(path);
+    int expanded = 0;
 
-#if defined(__MACOS__) || defined(riscos)
-    if (is_macos_native_path(f)) {
-	if (rb_safe_level() >= 1 && !fpath_check(f)) {
+    if (f[0] == '~') {
+	tmp = file_expand_path_1(path);
+	if (safe_level >= 1 && OBJ_TAINTED(tmp)) {
 	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
 	}
-	if (file_load_ok(f)) return path;
+	path = copy_path_class(tmp, path);
+	f = RSTRING_PTR(path);
+	expanded = 1;
     }
-#endif
 
-    if (is_absolute_path(f)) {
-	if (rb_safe_level() >= 1 && !fpath_check(f)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
+    if (expanded || rb_is_absolute_path(f) || is_explicit_relative(f)) {
+	if (safe_level >= 1 && !fpath_check(path)) {
+	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
 	}
-	if (file_load_ok(f)) return path;
+	if (!file_load_ok(f)) return 0;
+	if (!expanded)
+	    path = copy_path_class(file_expand_path_1(path), path);
+	return path;
     }
 
-    if (rb_safe_level() >= 4) {
+    if (safe_level >= 4) {
 	rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
     }
 
-    if (rb_load_path) {
+    RB_GC_GUARD(load_path) = rb_get_load_path();
+    if (load_path) {
 	long i;
 
-	Check_Type(rb_load_path, T_ARRAY);
-	tmp = rb_ary_new();
-	for (i=0;i<RARRAY(rb_load_path)->len;i++) {
-	    VALUE str = RARRAY(rb_load_path)->ptr[i];
-	    SafeStringValue(str);
-	    if (RSTRING(str)->len > 0) {
-		rb_ary_push(tmp, str);
+	tmp = rb_str_tmp_new(MAXPATHLEN + 2);
+	for (i = 0; i < RARRAY_LEN(load_path); i++) {
+	    VALUE str = RARRAY_PTR(load_path)[i];
+	    RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
+	    if (RSTRING_LEN(str) > 0) {
+		file_expand_path(path, str, 0, tmp);
+		f = RSTRING_PTR(tmp);
+		if (file_load_ok(f)) goto found;
 	    }
 	}
-	tmp = rb_ary_join(tmp, rb_str_new2(PATH_SEP));
-	if (RSTRING(tmp)->len == 0) {
-	    lpath = 0;
-	}
-	else {
-	    lpath = RSTRING(tmp)->ptr;
-	}
+	return 0;
     }
     else {
-	lpath = 0;
-    }
-
-    if (!lpath) {
 	return 0;		/* no path, no load */
     }
-    if (!(f = dln_find_file(f, lpath))) {
-	return 0;
-    }
-    if (rb_safe_level() >= 1 && !fpath_check(f)) {
+
+  found:
+    if (safe_level >= 1 && !fpath_check(tmp)) {
 	rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
     }
-    if (file_load_ok(f)) {
-	tmp = rb_str_new2(f);
-	OBJ_FREEZE(tmp);
-	return tmp;
-    }
-    return 0;
+
+    return copy_path_class(tmp, path);
 }
 
 static void
-define_filetest_function(name, func, argc)
-    const char *name;
-    VALUE (*func)();
-    int argc;
+define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
 {
     rb_define_module_function(rb_mFileTest, name, func, argc);
     rb_define_singleton_method(rb_cFile, name, func, argc);
@@ -4535,7 +5202,7 @@ define_filetest_function(name, func, argc)
  *  <code>File</code> includes the methods of module
  *  <code>FileTest</code> as class methods, allowing you to write (for
  *  example) <code>File.exist?("foo")</code>.
- *     
+ *
  *  In the description of File methods,
  *  <em>permission bits</em> are a platform-specific
  *  set of bits that indicate permissions of a file. On Unix-based
@@ -4543,7 +5210,7 @@ define_filetest_function(name, func, argc)
  *  owner, the group, and the rest of the world. For each of these
  *  entities, permissions may be set to read, write, or execute the
  *  file:
- *     
+ *
  *  The permission bits <code>0644</code> (in octal) would thus be
  *  interpreted as read/write for owner, and read-only for group and
  *  other. Higher-order bits may also be used to indicate the type of
@@ -4551,7 +5218,7 @@ define_filetest_function(name, func, argc)
  *  special features. If the permissions are for a directory, the
  *  meaning of the execute bit changes; when set the directory can be
  *  searched.
- *     
+ *
  *  On non-Posix operating systems, there may be only the ability to
  *  make a file read-only or read-write. In this case, the remaining
  *  permission bits will be synthesized to resemble typical values. For
@@ -4562,39 +5229,41 @@ define_filetest_function(name, func, argc)
  */
 
 void
-Init_File()
+Init_File(void)
 {
     rb_mFileTest = rb_define_module("FileTest");
     rb_cFile = rb_define_class("File", rb_cIO);
 
-    define_filetest_function("directory?", test_d, 1);
-    define_filetest_function("exist?", test_e, 1);
-    define_filetest_function("exists?", test_e, 1); /* temporary */
-    define_filetest_function("readable?", test_r, 1);
-    define_filetest_function("readable_real?", test_R, 1);
-    define_filetest_function("writable?", test_w, 1);
-    define_filetest_function("writable_real?", test_W, 1);
-    define_filetest_function("executable?", test_x, 1);
-    define_filetest_function("executable_real?", test_X, 1);
-    define_filetest_function("file?", test_f, 1);
-    define_filetest_function("zero?", test_z, 1);
-    define_filetest_function("size?", test_s, 1);
+    define_filetest_function("directory?", rb_file_directory_p, 1);
+    define_filetest_function("exist?", rb_file_exist_p, 1);
+    define_filetest_function("exists?", rb_file_exist_p, 1);
+    define_filetest_function("readable?", rb_file_readable_p, 1);
+    define_filetest_function("readable_real?", rb_file_readable_real_p, 1);
+    define_filetest_function("world_readable?", rb_file_world_readable_p, 1);
+    define_filetest_function("writable?", rb_file_writable_p, 1);
+    define_filetest_function("writable_real?", rb_file_writable_real_p, 1);
+    define_filetest_function("world_writable?", rb_file_world_writable_p, 1);
+    define_filetest_function("executable?", rb_file_executable_p, 1);
+    define_filetest_function("executable_real?", rb_file_executable_real_p, 1);
+    define_filetest_function("file?", rb_file_file_p, 1);
+    define_filetest_function("zero?", rb_file_zero_p, 1);
+    define_filetest_function("size?", rb_file_size_p, 1);
     define_filetest_function("size", rb_file_s_size, 1);
-    define_filetest_function("owned?", test_owned, 1);
-    define_filetest_function("grpowned?", test_grpowned, 1);
+    define_filetest_function("owned?", rb_file_owned_p, 1);
+    define_filetest_function("grpowned?", rb_file_grpowned_p, 1);
 
-    define_filetest_function("pipe?", test_p, 1);
-    define_filetest_function("symlink?", test_l, 1);
-    define_filetest_function("socket?", test_S, 1);
+    define_filetest_function("pipe?", rb_file_pipe_p, 1);
+    define_filetest_function("symlink?", rb_file_symlink_p, 1);
+    define_filetest_function("socket?", rb_file_socket_p, 1);
 
-    define_filetest_function("blockdev?", test_b, 1);
-    define_filetest_function("chardev?", test_c, 1);
+    define_filetest_function("blockdev?", rb_file_blockdev_p, 1);
+    define_filetest_function("chardev?", rb_file_chardev_p, 1);
 
-    define_filetest_function("setuid?", test_suid, 1);
-    define_filetest_function("setgid?", test_sgid, 1);
-    define_filetest_function("sticky?", test_sticky, 1);
+    define_filetest_function("setuid?", rb_file_suid_p, 1);
+    define_filetest_function("setgid?", rb_file_sgid_p, 1);
+    define_filetest_function("sticky?", rb_file_sticky_p, 1);
 
-    define_filetest_function("identical?", test_identical, 2);
+    define_filetest_function("identical?", rb_file_identical_p, 2);
 
     rb_define_singleton_method(rb_cFile, "stat",  rb_file_s_stat, 1);
     rb_define_singleton_method(rb_cFile, "lstat", rb_file_s_lstat, 1);
@@ -4620,18 +5289,22 @@ Init_File()
     rb_define_singleton_method(rb_cFile, "umask", rb_file_s_umask, -1);
     rb_define_singleton_method(rb_cFile, "truncate", rb_file_s_truncate, 2);
     rb_define_singleton_method(rb_cFile, "expand_path", rb_file_s_expand_path, -1);
+    rb_define_singleton_method(rb_cFile, "absolute_path", rb_file_s_absolute_path, -1);
+    rb_define_singleton_method(rb_cFile, "realpath", rb_file_s_realpath, -1);
+    rb_define_singleton_method(rb_cFile, "realdirpath", rb_file_s_realdirpath, -1);
     rb_define_singleton_method(rb_cFile, "basename", rb_file_s_basename, -1);
     rb_define_singleton_method(rb_cFile, "dirname", rb_file_s_dirname, 1);
     rb_define_singleton_method(rb_cFile, "extname", rb_file_s_extname, 1);
+    rb_define_singleton_method(rb_cFile, "path", rb_file_s_path, 1);
 
-    separator = rb_obj_freeze(rb_str_new2("/"));
+    separator = rb_obj_freeze(rb_usascii_str_new2("/"));
     rb_define_const(rb_cFile, "Separator", separator);
     rb_define_const(rb_cFile, "SEPARATOR", separator);
     rb_define_singleton_method(rb_cFile, "split",  rb_file_s_split, 1);
     rb_define_singleton_method(rb_cFile, "join",   rb_file_s_join, -2);
 
 #ifdef DOSISH
-    rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_str_new2("\\")));
+    rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_usascii_str_new2(file_alt_separator)));
 #else
     rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);
 #endif
@@ -4643,6 +5316,7 @@ Init_File()
     rb_define_method(rb_cFile, "atime", rb_file_atime, 0);
     rb_define_method(rb_cFile, "mtime", rb_file_mtime, 0);
     rb_define_method(rb_cFile, "ctime", rb_file_ctime, 0);
+    rb_define_method(rb_cFile, "size", rb_file_size, 0);
 
     rb_define_method(rb_cFile, "chmod", rb_file_chmod, 1);
     rb_define_method(rb_cFile, "chown", rb_file_chown, 2);
@@ -4658,6 +5332,7 @@ Init_File()
     rb_file_const("LOCK_NB", INT2FIX(LOCK_NB));
 
     rb_define_method(rb_cFile, "path",  rb_file_path, 0);
+    rb_define_method(rb_cFile, "to_path",  rb_file_path, 0);
     rb_define_global_function("test", rb_f_test, -1);
 
     rb_cStat = rb_define_class_under(rb_cFile, "Stat", rb_cObject);
@@ -4694,8 +5369,10 @@ Init_File()
     rb_define_method(rb_cStat, "directory?",  rb_stat_d, 0);
     rb_define_method(rb_cStat, "readable?",  rb_stat_r, 0);
     rb_define_method(rb_cStat, "readable_real?",  rb_stat_R, 0);
+    rb_define_method(rb_cStat, "world_readable?", rb_stat_wr, 0);
     rb_define_method(rb_cStat, "writable?",  rb_stat_w, 0);
     rb_define_method(rb_cStat, "writable_real?",  rb_stat_W, 0);
+    rb_define_method(rb_cStat, "world_writable?", rb_stat_ww, 0);
     rb_define_method(rb_cStat, "executable?",  rb_stat_x, 0);
     rb_define_method(rb_cStat, "executable_real?",  rb_stat_X, 0);
     rb_define_method(rb_cStat, "file?",  rb_stat_f, 0);
diff --git a/gc.c b/gc.c
index f1f065bfcb..564d260266 100644
--- a/gc.c
+++ b/gc.c
@@ -3,21 +3,22 @@
   gc.c -
 
   $Author$
-  $Date$
   created at: Tue Oct  5 09:44:46 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "rubysig.h"
-#include "st.h"
-#include "node.h"
-#include "env.h"
-#include "re.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
+#include "ruby/re.h"
+#include "ruby/io.h"
+#include "ruby/util.h"
+#include "eval_intern.h"
+#include "vm_core.h"
+#include "gc.h"
 #include <stdio.h>
 #include <setjmp.h>
 #include <sys/types.h>
@@ -34,13 +35,24 @@
 #include <windows.h>
 #endif
 
-void re_free_registers _((struct re_registers*));
-void rb_io_fptr_finalize _((struct OpenFile*));
-
-#if !defined(setjmp) && defined(HAVE__SETJMP)
-#define setjmp(env) _setjmp(env)
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+# include <valgrind/memcheck.h>
+# ifndef VALGRIND_MAKE_MEM_DEFINED
+#  define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE(p, n)
+# endif
+# ifndef VALGRIND_MAKE_MEM_UNDEFINED
+#  define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE(p, n)
+# endif
+#else
+# define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
+# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) /* empty */
 #endif
 
+int rb_io_fptr_finalize(struct rb_io_t*);
+
+#define rb_setjmp(env) RUBY_SETJMP(env)
+#define rb_jmp_buf rb_jmpbuf_t
+
 /* Make alloca work the best possible way.  */
 #ifdef __GNUC__
 # ifndef atarist
@@ -52,7 +64,9 @@ void rb_io_fptr_finalize _((struct OpenFile*));
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
-#  ifndef _AIX
+#  ifdef _AIX
+ #pragma alloca
+#  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca ();
 #   endif
@@ -61,114 +75,715 @@ void *alloca ();
 #endif /* __GNUC__ */
 
 #ifndef GC_MALLOC_LIMIT
-#if defined(MSDOS) || defined(__human68k__)
-#define GC_MALLOC_LIMIT 200000
-#else
 #define GC_MALLOC_LIMIT 8000000
 #endif
+
+#define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
+
+#define MARK_STACK_MAX 1024
+
+int ruby_gc_debug_indent = 0;
+
+/* for GC profile */
+#define GC_PROFILE_MORE_DETAIL 0
+typedef struct gc_profile_record {
+    double gc_time;
+    double gc_mark_time;
+    double gc_sweep_time;
+    double gc_invoke_time;
+
+    size_t heap_use_slots;
+    size_t heap_live_objects;
+    size_t heap_free_objects;
+    size_t heap_total_objects;
+    size_t heap_use_size;
+    size_t heap_total_size;
+
+    int have_finalize;
+
+    size_t allocate_increase;
+    size_t allocate_limit;
+} gc_profile_record;
+
+static double
+getrusage_time(void)
+{
+#ifdef RUSAGE_SELF
+    struct rusage usage;
+    struct timeval time;
+    getrusage(RUSAGE_SELF, &usage);
+    time = usage.ru_utime;
+    return time.tv_sec + time.tv_usec * 1e-6;
+#elif defined _WIN32
+    FILETIME creation_time, exit_time, kernel_time, user_time;
+    ULARGE_INTEGER ui;
+    LONG_LONG q;
+    double t;
+
+    if (GetProcessTimes(GetCurrentProcess(),
+			&creation_time, &exit_time, &kernel_time, &user_time) == 0)
+    {
+	return 0.0;
+    }
+    memcpy(&ui, &user_time, sizeof(FILETIME));
+    q = ui.QuadPart / 10L;
+    t = (DWORD)(q % 1000000L) * 1e-6;
+    q /= 1000000L;
+#ifdef __GNUC__
+    t += q;
+#else
+    t += (double)(DWORD)(q >> 16) * (1 << 16);
+    t += (DWORD)q & ~(~0 << 16);
+#endif
+    return t;
+#else
+    return 0.0;
+#endif
+}
+
+#define GC_PROF_TIMER_START do {\
+	if (objspace->profile.run) {\
+	    if (!objspace->profile.record) {\
+		objspace->profile.size = 1000;\
+		objspace->profile.record = malloc(sizeof(gc_profile_record) * objspace->profile.size);\
+	    }\
+	    if (count >= objspace->profile.size) {\
+		objspace->profile.size += 1000;\
+		objspace->profile.record = realloc(objspace->profile.record, sizeof(gc_profile_record) * objspace->profile.size);\
+	    }\
+	    if (!objspace->profile.record) {\
+		rb_bug("gc_profile malloc or realloc miss");\
+	    }\
+	    MEMZERO(&objspace->profile.record[count], gc_profile_record, 1);\
+	    gc_time = getrusage_time();\
+	    objspace->profile.record[count].gc_invoke_time = gc_time - objspace->profile.invoke_time;\
+	}\
+    } while(0)
+
+#define GC_PROF_TIMER_STOP do {\
+	if (objspace->profile.run) {\
+	    gc_time = getrusage_time() - gc_time;\
+	    if (gc_time < 0) gc_time = 0;\
+	    objspace->profile.record[count].gc_time = gc_time;\
+	    objspace->profile.count++;\
+	}\
+    } while(0)
+
+#if GC_PROFILE_MORE_DETAIL
+#define INIT_GC_PROF_PARAMS double gc_time = 0, mark_time = 0, sweep_time = 0;\
+    size_t count = objspace->profile.count
+
+#define GC_PROF_MARK_TIMER_START do {\
+	if (objspace->profile.run) {\
+	    mark_time = getrusage_time();\
+	}\
+    } while(0)
+
+#define GC_PROF_MARK_TIMER_STOP do {\
+	if (objspace->profile.run) {\
+	    mark_time = getrusage_time() - mark_time;\
+	    if (mark_time < 0) mark_time = 0;\
+	    objspace->profile.record[count].gc_mark_time = mark_time;\
+	}\
+    } while(0)
+
+#define GC_PROF_SWEEP_TIMER_START do {\
+	if (objspace->profile.run) {\
+	    sweep_time = getrusage_time();\
+	}\
+    } while(0)
+
+#define GC_PROF_SWEEP_TIMER_STOP do {\
+	if (objspace->profile.run) {\
+	    sweep_time = getrusage_time() - sweep_time;\
+	    if (sweep_time < 0) sweep_time = 0;\
+	    objspace->profile.record[count].gc_sweep_time = sweep_time;\
+	}\
+    } while(0)
+#define GC_PROF_SET_MALLOC_INFO do {\
+	if (objspace->profile.run) {\
+	    gc_profile_record *record = &objspace->profile.record[objspace->profile.count];\
+	    record->allocate_increase = malloc_increase;\
+	    record->allocate_limit = malloc_limit; \
+	}\
+    } while(0)
+#define GC_PROF_SET_HEAP_INFO do {\
+	if (objspace->profile.run) {\
+	    gc_profile_record *record = &objspace->profile.record[objspace->profile.count];\
+	    record->heap_use_slots = heaps_used;\
+	    record->heap_live_objects = live;\
+	    record->heap_free_objects = freed; \
+	    record->heap_total_objects = heaps_used * HEAP_OBJ_LIMIT;\
+	    record->have_finalize = final_list ? Qtrue : Qfalse;\
+	    record->heap_use_size = live * sizeof(RVALUE); \
+	    record->heap_total_size = heaps_used * (HEAP_OBJ_LIMIT * sizeof(RVALUE));\
+	}\
+    } while(0)
+#else
+#define INIT_GC_PROF_PARAMS double gc_time = 0;\
+    size_t count = objspace->profile.count
+#define GC_PROF_MARK_TIMER_START
+#define GC_PROF_MARK_TIMER_STOP
+#define GC_PROF_SWEEP_TIMER_START
+#define GC_PROF_SWEEP_TIMER_STOP
+#define GC_PROF_SET_MALLOC_INFO
+#define GC_PROF_SET_HEAP_INFO do {\
+	if (objspace->profile.run) {\
+	    gc_profile_record *record = &objspace->profile.record[objspace->profile.count];\
+	    record->heap_total_objects = heaps_used * HEAP_OBJ_LIMIT;\
+	    record->heap_use_size = live * sizeof(RVALUE); \
+	    record->heap_total_size = heaps_used * HEAP_SIZE;\
+	}\
+    } while(0)
+#endif
+
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
+#endif
+
+typedef struct RVALUE {
+    union {
+	struct {
+	    VALUE flags;		/* always 0 for freed obj */
+	    struct RVALUE *next;
+	} free;
+	struct RBasic  basic;
+	struct RObject object;
+	struct RClass  klass;
+	struct RFloat  flonum;
+	struct RString string;
+	struct RArray  array;
+	struct RRegexp regexp;
+	struct RHash   hash;
+	struct RData   data;
+	struct RTypedData   typeddata;
+	struct RStruct rstruct;
+	struct RBignum bignum;
+	struct RFile   file;
+	struct RNode   node;
+	struct RMatch  match;
+	struct RRational rational;
+	struct RComplex complex;
+    } as;
+#ifdef GC_DEBUG
+    const char *file;
+    int   line;
+#endif
+} RVALUE;
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(pop)
+#endif
+
+struct heaps_slot {
+    void *membase;
+    RVALUE *slot;
+    size_t limit;
+    int finalize_flag;
+};
+
+#define HEAP_MIN_SLOTS 10000
+#define FREE_MIN  4096
+
+struct gc_list {
+    VALUE *varptr;
+    struct gc_list *next;
+};
+
+#define CALC_EXACT_MALLOC_SIZE 0
+
+typedef struct rb_objspace {
+    struct {
+	size_t limit;
+	size_t increase;
+#if CALC_EXACT_MALLOC_SIZE
+	size_t allocated_size;
+	size_t allocations;
+#endif
+    } malloc_params;
+    struct {
+	size_t increment;
+	struct heaps_slot *ptr;
+	size_t length;
+	size_t used;
+	RVALUE *freelist;
+	RVALUE *range[2];
+	RVALUE *freed;
+    } heap;
+    struct {
+	int dont_gc;
+	int during_gc;
+    } flags;
+    struct {
+	st_table *table;
+	RVALUE *deferred;
+    } final;
+    struct {
+	VALUE buffer[MARK_STACK_MAX];
+	VALUE *ptr;
+	int overflow;
+    } markstack;
+    struct {
+	int run;
+	gc_profile_record *record;
+	size_t count;
+	size_t size;
+	double invoke_time;
+    } profile;
+    struct gc_list *global_list;
+    unsigned int count;
+    int gc_stress;
+} rb_objspace_t;
+
+#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
+#define rb_objspace (*GET_VM()->objspace)
+static int ruby_initial_gc_stress = 0;
+int *ruby_initial_gc_stress_ptr = &ruby_initial_gc_stress;
+#else
+static rb_objspace_t rb_objspace = {{GC_MALLOC_LIMIT}, {HEAP_MIN_SLOTS}};
+int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
+#endif
+#define malloc_limit		objspace->malloc_params.limit
+#define malloc_increase 	objspace->malloc_params.increase
+#define heap_slots		objspace->heap.slots
+#define heaps			objspace->heap.ptr
+#define heaps_length		objspace->heap.length
+#define heaps_used		objspace->heap.used
+#define freelist		objspace->heap.freelist
+#define lomem			objspace->heap.range[0]
+#define himem			objspace->heap.range[1]
+#define heaps_inc		objspace->heap.increment
+#define heaps_freed		objspace->heap.freed
+#define dont_gc 		objspace->flags.dont_gc
+#define during_gc		objspace->flags.during_gc
+#define finalizer_table 	objspace->final.table
+#define deferred_final_list	objspace->final.deferred
+#define mark_stack		objspace->markstack.buffer
+#define mark_stack_ptr		objspace->markstack.ptr
+#define mark_stack_overflow	objspace->markstack.overflow
+#define global_List		objspace->global_list
+#define ruby_gc_stress		objspace->gc_stress
+
+#define need_call_final 	(finalizer_table && finalizer_table->num_entries)
+
+static void rb_objspace_call_finalizer(rb_objspace_t *objspace);
+
+#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
+rb_objspace_t *
+rb_objspace_alloc(void)
+{
+    rb_objspace_t *objspace = malloc(sizeof(rb_objspace_t));
+    memset(objspace, 0, sizeof(*objspace));
+    malloc_limit = GC_MALLOC_LIMIT;
+    ruby_gc_stress = ruby_initial_gc_stress;
+
+    return objspace;
+}
+
+void
+rb_objspace_free(rb_objspace_t *objspace)
+{
+    rb_objspace_call_finalizer(objspace);
+    if (objspace->profile.record) {
+	free(objspace->profile.record);
+	objspace->profile.record = 0;
+    }
+    if (global_List) {
+	struct gc_list *list, *next;
+	for (list = global_List; list; list = next) {
+	    next = list->next;
+	    free(list);
+	}
+    }
+    if (heaps) {
+	size_t i;
+	for (i = 0; i < heaps_used; ++i) {
+	    free(heaps[i].membase);
+	}
+	free(heaps);
+	heaps_used = 0;
+	heaps = 0;
+    }
+    free(objspace);
+}
 #endif
 
-static unsigned long malloc_increase = 0;
-static unsigned long malloc_limit = GC_MALLOC_LIMIT;
-static void run_final();
-static VALUE nomem_error;
-static void garbage_collect();
+/* tiny heap size */
+/* 32KB */
+/*#define HEAP_SIZE 0x8000 */
+/* 128KB */
+/*#define HEAP_SIZE 0x20000 */
+/* 64KB */
+/*#define HEAP_SIZE 0x10000 */
+/* 16KB */
+#define HEAP_SIZE 0x4000
+/* 8KB */
+/*#define HEAP_SIZE 0x2000 */
+/* 4KB */
+/*#define HEAP_SIZE 0x1000 */
+/* 2KB */
+/*#define HEAP_SIZE 0x800 */
+
+#define HEAP_OBJ_LIMIT (HEAP_SIZE / sizeof(struct RVALUE))
+
+extern VALUE rb_cMutex;
+extern st_table *rb_class_tbl;
+
+int ruby_disable_gc_stress = 0;
+
+static void run_final(rb_objspace_t *objspace, VALUE obj);
+static int garbage_collect(rb_objspace_t *objspace);
 
 void
-rb_memerror()
+rb_global_variable(VALUE *var)
+{
+    rb_gc_register_address(var);
+}
+
+static void *
+ruby_memerror_body(void *dummy)
+{
+    rb_memerror();
+    return 0;
+}
+
+static void
+ruby_memerror(void)
 {
-    static int recurse = 0;
+    if (ruby_thread_has_gvl_p()) {
+	rb_memerror();
+    }
+    else {
+	if (ruby_native_thread_p()) {
+	    rb_thread_call_with_gvl(ruby_memerror_body, 0);
+	}
+	else {
+	    /* no ruby thread */
+	    fprintf(stderr, "[FATAL] failed to allocate memory\n");
+	    exit(EXIT_FAILURE);
+	}
+    }
+}
 
-    if (!nomem_error || (recurse > 0 && rb_safe_level() < 4)) {
+void
+rb_memerror(void)
+{
+    rb_thread_t *th = GET_THREAD();
+    if (!nomem_error ||
+	(rb_thread_raised_p(th, RAISED_NOMEMORY) && rb_safe_level() < 4)) {
 	fprintf(stderr, "[FATAL] failed to allocate memory\n");
-	exit(1);
+	exit(EXIT_FAILURE);
+    }
+    if (rb_thread_raised_p(th, RAISED_NOMEMORY)) {
+	rb_thread_raised_clear(th);
+	GET_THREAD()->errinfo = nomem_error;
+	JUMP_TAG(TAG_RAISE);
     }
-    recurse++;
+    rb_thread_raised_set(th, RAISED_NOMEMORY);
     rb_exc_raise(nomem_error);
 }
 
-void *
-ruby_xmalloc(size)
-    long size;
+/*
+ *  call-seq:
+ *    GC.stress                 -> true or false
+ *
+ *  returns current status of GC stress mode.
+ */
+
+static VALUE
+gc_stress_get(VALUE self)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    return ruby_gc_stress ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *    GC.stress = bool          -> bool
+ *
+ *  updates GC stress mode.
+ *
+ *  When GC.stress = true, GC is invoked for all GC opportunity:
+ *  all memory and object allocation.
+ *
+ *  Since it makes Ruby very slow, it is only for debugging.
+ */
+
+static VALUE
+gc_stress_set(VALUE self, VALUE flag)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    rb_secure(2);
+    ruby_gc_stress = RTEST(flag);
+    return flag;
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.enable?                 -> true or false
+ *
+ *  returns current status of GC profile mode.
+ */
+
+static VALUE
+gc_profile_enable_get(VALUE self)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    return objspace->profile.run;
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.enable          -> nil
+ *
+ *  updates GC profile mode.
+ *  start profiler for GC.
+ *
+ */
+
+static VALUE
+gc_profile_enable(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+
+    objspace->profile.run = TRUE;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.disable          -> nil
+ *
+ *  updates GC profile mode.
+ *  stop profiler for GC.
+ *
+ */
+
+static VALUE
+gc_profile_disable(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+
+    objspace->profile.run = FALSE;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.clear          -> nil
+ *
+ *  clear before profile data.
+ *
+ */
+
+static VALUE
+gc_profile_clear(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    MEMZERO(objspace->profile.record, gc_profile_record, objspace->profile.size);
+    objspace->profile.count = 0;
+    return Qnil;
+}
+
+static void *
+negative_size_allocation_error_with_gvl(void *ptr)
+{
+    rb_raise(rb_eNoMemError, "%s", (const char *)ptr);
+    return 0; /* should not be reached */
+}
+
+static void
+negative_size_allocation_error(const char *msg)
+{
+    if (ruby_thread_has_gvl_p()) {
+	rb_raise(rb_eNoMemError, "%s", msg);
+    }
+    else {
+	if (ruby_native_thread_p()) {
+	    rb_thread_call_with_gvl(negative_size_allocation_error_with_gvl, (void *)msg);
+	}
+	else {
+	    fprintf(stderr, "[FATAL] %s\n", msg);
+	    exit(EXIT_FAILURE);
+	}
+    }
+}
+
+static void *
+gc_with_gvl(void *ptr)
+{
+    return (void *)(VALUE)garbage_collect((rb_objspace_t *)ptr);
+}
+
+static int
+garbage_collect_with_gvl(rb_objspace_t *objspace)
+{
+    if (dont_gc) return TRUE;
+    if (ruby_thread_has_gvl_p()) {
+	return garbage_collect(objspace);
+    }
+    else {
+	if (ruby_native_thread_p()) {
+	    return (int)(VALUE)rb_thread_call_with_gvl(gc_with_gvl, (void *)objspace);
+	}
+	else {
+	    /* no ruby thread */
+	    fprintf(stderr, "[FATAL] failed to allocate memory\n");
+	    exit(EXIT_FAILURE);
+	}
+    }
+}
+
+static void vm_xfree(rb_objspace_t *objspace, void *ptr);
+
+static void *
+vm_xmalloc(rb_objspace_t *objspace, size_t size)
 {
     void *mem;
 
-    if (size < 0) {
-	rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
+    if ((ssize_t)size < 0) {
+	negative_size_allocation_error("negative allocation size (or too big)");
     }
     if (size == 0) size = 1;
-    malloc_increase += size;
 
-    if (malloc_increase > malloc_limit) {
-	garbage_collect();
+#if CALC_EXACT_MALLOC_SIZE
+    size += sizeof(size_t);
+#endif
+
+    if ((ruby_gc_stress && !ruby_disable_gc_stress) ||
+	(malloc_increase+size) > malloc_limit) {
+	garbage_collect_with_gvl(objspace);
     }
-    RUBY_CRITICAL(mem = malloc(size));
+    mem = malloc(size);
     if (!mem) {
-	garbage_collect();
-	RUBY_CRITICAL(mem = malloc(size));
+	if (garbage_collect_with_gvl(objspace)) {
+	    mem = malloc(size);
+	}
 	if (!mem) {
-	    rb_memerror();
+	    ruby_memerror();
 	}
     }
+    malloc_increase += size;
+
+#if CALC_EXACT_MALLOC_SIZE
+    objspace->malloc_params.allocated_size += size;
+    objspace->malloc_params.allocations++;
+    ((size_t *)mem)[0] = size;
+    mem = (size_t *)mem + 1;
+#endif
 
     return mem;
 }
 
-void *
-ruby_xcalloc(n, size)
-    long n, size;
+static void *
+vm_xrealloc(rb_objspace_t *objspace, void *ptr, size_t size)
 {
     void *mem;
 
-    mem = xmalloc(n * size);
-    memset(mem, 0, n * size);
+    if ((ssize_t)size < 0) {
+	negative_size_allocation_error("negative re-allocation size");
+    }
+    if (!ptr) return vm_xmalloc(objspace, size);
+    if (size == 0) {
+	vm_xfree(objspace, ptr);
+	return 0;
+    }
+    if (ruby_gc_stress && !ruby_disable_gc_stress)
+	garbage_collect_with_gvl(objspace);
+
+#if CALC_EXACT_MALLOC_SIZE
+    size += sizeof(size_t);
+    objspace->malloc_params.allocated_size -= size;
+    ptr = (size_t *)ptr - 1;
+#endif
+
+    mem = realloc(ptr, size);
+    if (!mem) {
+	if (garbage_collect_with_gvl(objspace)) {
+	    mem = realloc(ptr, size);
+	}
+	if (!mem) {
+	    ruby_memerror();
+        }
+    }
+    malloc_increase += size;
+
+#if CALC_EXACT_MALLOC_SIZE
+    objspace->malloc_params.allocated_size += size;
+    ((size_t *)mem)[0] = size;
+    mem = (size_t *)mem + 1;
+#endif
 
     return mem;
 }
 
+static void
+vm_xfree(rb_objspace_t *objspace, void *ptr)
+{
+#if CALC_EXACT_MALLOC_SIZE
+    size_t size;
+    ptr = ((size_t *)ptr) - 1;
+    size = ((size_t*)ptr)[0];
+    objspace->malloc_params.allocated_size -= size;
+    objspace->malloc_params.allocations--;
+#endif
+
+    free(ptr);
+}
+
 void *
-ruby_xrealloc(ptr, size)
-    void *ptr;
-    long size;
+ruby_xmalloc(size_t size)
 {
-    void *mem;
+    return vm_xmalloc(&rb_objspace, size);
+}
 
-    if (size < 0) {
-	rb_raise(rb_eArgError, "negative re-allocation size");
-    }
-    if (!ptr) return xmalloc(size);
-    if (size == 0) size = 1;
-    malloc_increase += size;
-    RUBY_CRITICAL(mem = realloc(ptr, size));
-    if (!mem) {
-	garbage_collect();
-	RUBY_CRITICAL(mem = realloc(ptr, size));
-	if (!mem) {
-	    rb_memerror();
-        }
+void *
+ruby_xmalloc2(size_t n, size_t size)
+{
+    size_t len = size * n;
+    if (n != 0 && size != len / n) {
+	rb_raise(rb_eArgError, "malloc: possible integer overflow");
     }
+    return vm_xmalloc(&rb_objspace, len);
+}
+
+void *
+ruby_xcalloc(size_t n, size_t size)
+{
+    void *mem = ruby_xmalloc2(n, size);
+    memset(mem, 0, n * size);
 
     return mem;
 }
 
+void *
+ruby_xrealloc(void *ptr, size_t size)
+{
+    return vm_xrealloc(&rb_objspace, ptr, size);
+}
+
+void *
+ruby_xrealloc2(void *ptr, size_t n, size_t size)
+{
+    size_t len = size * n;
+    if (n != 0 && size != len / n) {
+	rb_raise(rb_eArgError, "realloc: possible integer overflow");
+    }
+    return ruby_xrealloc(ptr, len);
+}
+
 void
-ruby_xfree(x)
-    void *x;
+ruby_xfree(void *x)
 {
     if (x)
-	RUBY_CRITICAL(free(x));
+	vm_xfree(&rb_objspace, x);
 }
 
-extern int ruby_in_compile;
-static int dont_gc;
-static int during_gc;
-static int need_call_final = 0;
-static st_table *finalizer_table = 0;
-
 
 /*
  *  call-seq:
- *     GC.enable    => true or false
+ *     GC.enable    -> true or false
  *
  *  Enables garbage collection, returning <code>true</code> if garbage
  *  collection was previously disabled.
@@ -180,17 +795,18 @@ static st_table *finalizer_table = 0;
  */
 
 VALUE
-rb_gc_enable()
+rb_gc_enable(void)
 {
+    rb_objspace_t *objspace = &rb_objspace;
     int old = dont_gc;
 
-    dont_gc = Qfalse;
-    return old;
+    dont_gc = FALSE;
+    return old ? Qtrue : Qfalse;
 }
 
 /*
  *  call-seq:
- *     GC.disable    => true or false
+ *     GC.disable    -> true or false
  *
  *  Disables garbage collection, returning <code>true</code> if garbage
  *  collection was already disabled.
@@ -201,25 +817,28 @@ rb_gc_enable()
  */
 
 VALUE
-rb_gc_disable()
+rb_gc_disable(void)
 {
+    rb_objspace_t *objspace = &rb_objspace;
     int old = dont_gc;
 
-    dont_gc = Qtrue;
-    return old;
+    dont_gc = TRUE;
+    return old ? Qtrue : Qfalse;
 }
 
 VALUE rb_mGC;
 
-static struct gc_list {
-    VALUE *varptr;
-    struct gc_list *next;
-} *global_List = 0;
+void
+rb_gc_register_mark_object(VALUE obj)
+{
+    VALUE ary = GET_THREAD()->vm->mark_object_ary;
+    rb_ary_push(ary, obj);
+}
 
 void
-rb_gc_register_address(addr)
-    VALUE *addr;
+rb_gc_register_address(VALUE *addr)
 {
+    rb_objspace_t *objspace = &rb_objspace;
     struct gc_list *tmp;
 
     tmp = ALLOC(struct gc_list);
@@ -229,14 +848,14 @@ rb_gc_register_address(addr)
 }
 
 void
-rb_gc_unregister_address(addr)
-    VALUE *addr;
+rb_gc_unregister_address(VALUE *addr)
 {
+    rb_objspace_t *objspace = &rb_objspace;
     struct gc_list *tmp = global_List;
 
     if (tmp->varptr == addr) {
 	global_List = tmp->next;
-	RUBY_CRITICAL(free(tmp));
+	xfree(tmp);
 	return;
     }
     while (tmp->next) {
@@ -244,125 +863,87 @@ rb_gc_unregister_address(addr)
 	    struct gc_list *t = tmp->next;
 
 	    tmp->next = tmp->next->next;
-	    RUBY_CRITICAL(free(t));
+	    xfree(t);
 	    break;
 	}
 	tmp = tmp->next;
     }
 }
 
-#undef GC_DEBUG
 
-void
-rb_global_variable(var)
-    VALUE *var;
+static void
+allocate_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
 {
-    rb_gc_register_address(var);
-}
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
-#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
-#endif
-
-typedef struct RVALUE {
-    union {
-	struct {
-	    unsigned long flags;	/* always 0 for freed obj */
-	    struct RVALUE *next;
-	} free;
-	struct RBasic  basic;
-	struct RObject object;
-	struct RClass  klass;
-	struct RFloat  flonum;
-	struct RString string;
-	struct RArray  array;
-	struct RRegexp regexp;
-	struct RHash   hash;
-	struct RData   data;
-	struct RStruct rstruct;
-	struct RBignum bignum;
-	struct RFile   file;
-	struct RNode   node;
-	struct RMatch  match;
-	struct RVarmap varmap;
-	struct SCOPE   scope;
-    } as;
-#ifdef GC_DEBUG
-    char *file;
-    int   line;
-#endif
-} RVALUE;
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
-#pragma pack(pop)
-#endif
-
-static RVALUE *freelist = 0;
-static RVALUE *deferred_final_list = 0;
-
-#define HEAPS_INCREMENT 10
-static struct heaps_slot {
-    void *membase;
-    RVALUE *slot;
-    int limit;
-} *heaps;
-static int heaps_length = 0;
-static int heaps_used   = 0;
+    struct heaps_slot *p;
+    size_t size;
 
-#define HEAP_MIN_SLOTS 10000
-static int heap_slots = HEAP_MIN_SLOTS;
+    size = next_heaps_length*sizeof(struct heaps_slot);
 
-#define FREE_MIN  4096
+    if (heaps_used > 0) {
+	p = (struct heaps_slot *)realloc(heaps, size);
+	if (p) heaps = p;
+    }
+    else {
+	p = heaps = (struct heaps_slot *)malloc(size);
+    }
 
-static RVALUE *himem, *lomem;
+    if (p == 0) {
+	during_gc = 0;
+	rb_memerror();
+    }
+    heaps_length = next_heaps_length;
+}
 
 static void
-add_heap()
+assign_heap_slot(rb_objspace_t *objspace)
 {
-    RVALUE *p, *pend;
+    RVALUE *p, *pend, *membase;
+    size_t hi, lo, mid;
+    size_t objs;
 
-    if (heaps_used == heaps_length) {
-	/* Realloc heaps */
-	struct heaps_slot *p;
-	int length;
-
-	heaps_length += HEAPS_INCREMENT;
-	length = heaps_length*sizeof(struct heaps_slot);
-	RUBY_CRITICAL(
-	    if (heaps_used > 0) {
-		p = (struct heaps_slot *)realloc(heaps, length);
-		if (p) heaps = p;
-	    }
-	    else {
-		p = heaps = (struct heaps_slot *)malloc(length);
-	    });
-	if (p == 0) rb_memerror();
+    objs = HEAP_OBJ_LIMIT;
+    p = (RVALUE*)malloc(HEAP_SIZE);
+
+    if (p == 0) {
+	during_gc = 0;
+	rb_memerror();
     }
 
-    for (;;) {
-	RUBY_CRITICAL(p = (RVALUE*)malloc(sizeof(RVALUE)*(heap_slots+1)));
-	if (p == 0) {
-	    if (heap_slots == HEAP_MIN_SLOTS) {
-		rb_memerror();
-	    }
-	    heap_slots = HEAP_MIN_SLOTS;
-	    continue;
+    membase = p;
+    if ((VALUE)p % sizeof(RVALUE) != 0) {
+	p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
+	if ((HEAP_SIZE - HEAP_OBJ_LIMIT * sizeof(RVALUE)) < (size_t)((char*)p - (char*)membase)) {
+	    objs--;
+	}
+    }
+
+    lo = 0;
+    hi = heaps_used;
+    while (lo < hi) {
+	register RVALUE *mid_membase;
+	mid = (lo + hi) / 2;
+	mid_membase = heaps[mid].membase;
+	if (mid_membase < membase) {
+	    lo = mid + 1;
+	}
+	else if (mid_membase > membase) {
+	    hi = mid;
+	}
+	else {
+	    rb_bug("same heap slot is allocated: %p at %"PRIuVALUE, (void *)membase, (VALUE)mid);
 	}
-        heaps[heaps_used].membase = p;
-        if ((VALUE)p % sizeof(RVALUE) == 0)
-            heap_slots += 1;
-        else
-            p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
-        heaps[heaps_used].slot = p;
-        heaps[heaps_used].limit = heap_slots;
-	break;
     }
-    pend = p + heap_slots;
+    if (hi < heaps_used) {
+	MEMMOVE(&heaps[hi+1], &heaps[hi], struct heaps_slot, heaps_used - hi);
+    }
+    heaps[hi].membase = membase;
+    heaps[hi].slot = p;
+    heaps[hi].limit = objs;
+    heaps[hi].finalize_flag = FALSE;
+    pend = p + objs;
     if (lomem == 0 || lomem > p) lomem = p;
     if (himem < pend) himem = pend;
     heaps_used++;
-    heap_slots *= 1.8;
-    if (heap_slots <= 0) heap_slots = HEAP_MIN_SLOTS;
 
     while (p < pend) {
 	p->as.free.flags = 0;
@@ -371,34 +952,169 @@ add_heap()
 	p++;
     }
 }
+
+static void
+init_heap(rb_objspace_t *objspace)
+{
+    size_t add, i;
+
+    add = HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT;
+
+    if (!add) {
+        add = 1;
+    }
+
+    if ((heaps_used + add) > heaps_length) {
+        allocate_heaps(objspace, heaps_used + add);
+    }
+
+    for (i = 0; i < add; i++) {
+        assign_heap_slot(objspace);
+    }
+    heaps_inc = 0;
+    objspace->profile.invoke_time = getrusage_time();
+}
+
+
+static void
+set_heaps_increment(rb_objspace_t *objspace)
+{
+    size_t next_heaps_length = (size_t)(heaps_used * 1.8);
+
+    if (next_heaps_length == heaps_used) {
+        next_heaps_length++;
+    }
+
+    heaps_inc = next_heaps_length - heaps_used;
+
+    if (next_heaps_length > heaps_length) {
+	allocate_heaps(objspace, next_heaps_length);
+    }
+}
+
+static int
+heaps_increment(rb_objspace_t *objspace)
+{
+    if (heaps_inc > 0) {
+        assign_heap_slot(objspace);
+	heaps_inc--;
+	return TRUE;
+    }
+    return FALSE;
+}
+
 #define RANY(o) ((RVALUE*)(o))
 
-VALUE
-rb_newobj()
+static VALUE
+rb_newobj_from_heap(rb_objspace_t *objspace)
 {
     VALUE obj;
 
-    if (during_gc)
-	rb_bug("object allocation during garbage collection phase");
-
-    if (!freelist) garbage_collect();
+    if ((ruby_gc_stress && !ruby_disable_gc_stress) || !freelist) {
+	if (!heaps_increment(objspace) && !garbage_collect(objspace)) {
+	    during_gc = 0;
+	    rb_memerror();
+	}
+    }
 
     obj = (VALUE)freelist;
     freelist = freelist->as.free.next;
+
     MEMZERO((void*)obj, RVALUE, 1);
 #ifdef GC_DEBUG
-    RANY(obj)->file = ruby_sourcefile;
-    RANY(obj)->line = ruby_sourceline;
+    RANY(obj)->file = rb_sourcefile();
+    RANY(obj)->line = rb_sourceline();
 #endif
+
     return obj;
 }
 
+#if USE_VALUE_CACHE
+static VALUE
+rb_fill_value_cache(rb_thread_t *th)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    int i;
+    VALUE rv;
+
+    /* LOCK */
+    for (i=0; i<RUBY_VM_VALUE_CACHE_SIZE; i++) {
+	VALUE v = rb_newobj_from_heap(objspace);
+
+	th->value_cache[i] = v;
+	RBASIC(v)->flags = FL_MARK;
+    }
+    th->value_cache_ptr = &th->value_cache[0];
+    rv = rb_newobj_from_heap(objspace);
+    /* UNLOCK */
+    return rv;
+}
+#endif
+
+int
+rb_during_gc(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    return during_gc;
+}
+
+VALUE
+rb_newobj(void)
+{
+#if USE_VALUE_CACHE || (defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE)
+    rb_thread_t *th = GET_THREAD();
+#endif
+#if USE_VALUE_CACHE
+    VALUE v = *th->value_cache_ptr;
+#endif
+#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
+    rb_objspace_t *objspace = th->vm->objspace;
+#else
+    rb_objspace_t *objspace = &rb_objspace;
+#endif
+
+    if (during_gc) {
+	dont_gc = 1;
+	during_gc = 0;
+	rb_bug("object allocation during garbage collection phase");
+    }
+
+#if USE_VALUE_CACHE
+    if (v) {
+	RBASIC(v)->flags = 0;
+	th->value_cache_ptr++;
+    }
+    else {
+	v = rb_fill_value_cache(th);
+    }
+
+#if defined(GC_DEBUG)
+    printf("cache index: %d, v: %p, th: %p\n",
+	   th->value_cache_ptr - th->value_cache, v, th);
+#endif
+    return v;
+#else
+    return rb_newobj_from_heap(objspace);
+#endif
+}
+
+NODE*
+rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
+{
+    NODE *n = (NODE*)rb_newobj();
+
+    n->flags |= T_NODE;
+    nd_set_type(n, type);
+
+    n->u1.value = a0;
+    n->u2.value = a1;
+    n->u3.value = a2;
+
+    return n;
+}
+
 VALUE
-rb_data_object_alloc(klass, datap, dmark, dfree)
-    VALUE klass;
-    void *datap;
-    RUBY_DATA_FUNC dmark;
-    RUBY_DATA_FUNC dfree;
+rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
 {
     NEWOBJ(data, struct RData);
     if (klass) Check_Type(klass, T_CLASS);
@@ -410,173 +1126,137 @@ rb_data_object_alloc(klass, datap, dmark, dfree)
     return (VALUE)data;
 }
 
-extern st_table *rb_class_tbl;
-VALUE *rb_gc_stack_start = 0;
-#ifdef __ia64
-VALUE *rb_gc_register_stack_start = 0;
-#endif
+VALUE
+rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type)
+{
+    NEWOBJ(data, struct RTypedData);
 
-#ifdef DJGPP
-/* set stack size (http://www.delorie.com/djgpp/v2faq/faq15_9.html) */
-unsigned int _stklen = 0x180000; /* 1.5 kB */
-#endif
+    if (klass) Check_Type(klass, T_CLASS);
 
-#if defined(DJGPP) || defined(_WIN32_WCE)
-static unsigned int STACK_LEVEL_MAX = 65535;
-#elif defined(__human68k__)
-unsigned int _stacksize = 262144;
-# define STACK_LEVEL_MAX (_stacksize - 4096)
-# undef HAVE_GETRLIMIT
-#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
-static unsigned int STACK_LEVEL_MAX = 655300;
-#else
-# define STACK_LEVEL_MAX 655300
-#endif
+    OBJSETUP(data, klass, T_DATA);
 
-#ifdef C_ALLOCA
-# define SET_STACK_END VALUE stack_end; alloca(0);
-# define STACK_END (&stack_end)
-#else
-# if defined(__GNUC__) && defined(USE_BUILTIN_FRAME_ADDRESS) && !defined(__ia64)
-#  if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
-__attribute__ ((noinline))
-#  endif
-static void
-stack_end_address(VALUE **stack_end_p)
+    data->data = datap;
+    data->typed_flag = 1;
+    data->type = type;
+
+    return (VALUE)data;
+}
+
+size_t
+rb_objspace_data_type_memsize(VALUE obj)
 {
-    VALUE stack_end;
-    *stack_end_p = &stack_end;
+    if (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj)->dsize) {
+	return RTYPEDDATA_TYPE(obj)->dsize(RTYPEDDATA_DATA(obj));
+    }
+    else {
+	return 0;
+    }
 }
-#  define  SET_STACK_END    VALUE *stack_end; stack_end_address(&stack_end)
-# else
-#  define  SET_STACK_END    VALUE *stack_end = alloca(1)
-# endif
-# define STACK_END (stack_end)
+
+const char *
+rb_objspace_data_type_name(VALUE obj)
+{
+    if (RTYPEDDATA_P(obj)) {
+	return RTYPEDDATA_TYPE(obj)->wrap_struct_name;
+    }
+    else {
+	return 0;
+    }
+}
+
+#ifdef __ia64
+#define SET_STACK_END (SET_MACHINE_STACK_END(&th->machine_stack_end), th->machine_register_stack_end = rb_ia64_bsp())
+#else
+#define SET_STACK_END SET_MACHINE_STACK_END(&th->machine_stack_end)
 #endif
+
+#define STACK_START (th->machine_stack_start)
+#define STACK_END (th->machine_stack_end)
+#define STACK_LEVEL_MAX (th->machine_stack_maxsize/sizeof(VALUE))
+
 #if STACK_GROW_DIRECTION < 0
-# define STACK_LENGTH  (rb_gc_stack_start - STACK_END)
+# define STACK_LENGTH  (size_t)(STACK_START - STACK_END)
 #elif STACK_GROW_DIRECTION > 0
-# define STACK_LENGTH  (STACK_END - rb_gc_stack_start + 1)
+# define STACK_LENGTH  (size_t)(STACK_END - STACK_START + 1)
 #else
-# define STACK_LENGTH  ((STACK_END < rb_gc_stack_start) ? rb_gc_stack_start - STACK_END\
-                                           : STACK_END - rb_gc_stack_start + 1)
+# define STACK_LENGTH  ((STACK_END < STACK_START) ? (size_t)(STACK_START - STACK_END) \
+			: (size_t)(STACK_END - STACK_START + 1))
 #endif
-#if STACK_GROW_DIRECTION > 0
-# define STACK_UPPER(x, a, b) a
-#elif STACK_GROW_DIRECTION < 0
-# define STACK_UPPER(x, a, b) b
-#else
-static int grow_direction;
-static int
-stack_grow_direction(addr)
-    VALUE *addr;
+#if !STACK_GROW_DIRECTION
+int ruby_stack_grow_direction;
+int
+ruby_get_stack_grow_direction(volatile VALUE *addr)
 {
-    SET_STACK_END;
+    VALUE *end;
+    SET_MACHINE_STACK_END(&end);
 
-    if (STACK_END > addr) return grow_direction = 1;
-    return grow_direction = -1;
+    if (end > addr) return ruby_stack_grow_direction = 1;
+    return ruby_stack_grow_direction = -1;
 }
-# define stack_growup_p(x) ((grow_direction ? grow_direction : stack_grow_direction(x)) > 0)
-# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
 #endif
 
 #define GC_WATER_MARK 512
 
-#define CHECK_STACK(ret) do {\
-    SET_STACK_END;\
-    (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
-} while (0)
-
-int
-ruby_stack_length(p)
-    VALUE **p;
+size_t
+ruby_stack_length(VALUE **p)
 {
+    rb_thread_t *th = GET_THREAD();
     SET_STACK_END;
-    if (p) *p = STACK_UPPER(STACK_END, rb_gc_stack_start, STACK_END);
+    if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
     return STACK_LENGTH;
 }
 
-int
-ruby_stack_check()
+static int
+stack_check(void)
 {
     int ret;
-
-    CHECK_STACK(ret);
+    rb_thread_t *th = GET_THREAD();
+    SET_STACK_END;
+    ret = STACK_LENGTH > STACK_LEVEL_MAX - GC_WATER_MARK;
+#ifdef __ia64
+    if (!ret) {
+        ret = (VALUE*)rb_ia64_bsp() - th->machine_register_stack_start >
+              th->machine_register_stack_maxsize/sizeof(VALUE) - GC_WATER_MARK;
+    }
+#endif
     return ret;
 }
 
-#define MARK_STACK_MAX 1024
-static VALUE mark_stack[MARK_STACK_MAX];
-static VALUE *mark_stack_ptr;
-static int mark_stack_overflow;
+int
+ruby_stack_check(void)
+{
+#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
+    return 0;
+#else
+    return stack_check();
+#endif
+}
 
 static void
-init_mark_stack()
+init_mark_stack(rb_objspace_t *objspace)
 {
     mark_stack_overflow = 0;
     mark_stack_ptr = mark_stack;
 }
 
 #define MARK_STACK_EMPTY (mark_stack_ptr == mark_stack)
-            
-static st_table *source_filenames;
-
-char *
-rb_source_filename(f)
-    const char *f;
-{
-    char *name;
-
-    if (!st_lookup(source_filenames, (st_data_t)f, (st_data_t *)&name)) {
-	long len = strlen(f) + 1;
-	char *ptr = name = ALLOC_N(char, len + 1);
-	*ptr++ = 0;
-	MEMCPY(ptr, f, char, len);
-	st_add_direct(source_filenames, (st_data_t)ptr, (st_data_t)name);
-	return ptr;
-    }
-    return name + 1;
-}
 
-static void
-mark_source_filename(f)
-    char *f;
-{
-    if (f) {
-	f[-1] = 1;
-    }
-}
-
-static int
-sweep_source_filename(key, value)
-    char *key, *value;
-{
-    if (*value) {
-	*value = 0;
-	return ST_CONTINUE;
-    }
-    else {
-	free(value);
-	return ST_DELETE;
-    }
-}
-
-static void gc_mark _((VALUE ptr, int lev));
-static void gc_mark_children _((VALUE ptr, int lev));
+static void gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev);
+static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev);
 
 static void
-gc_mark_all()
+gc_mark_all(rb_objspace_t *objspace)
 {
     RVALUE *p, *pend;
-    int i;
+    size_t i;
 
-    init_mark_stack();
+    init_mark_stack(objspace);
     for (i = 0; i < heaps_used; i++) {
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	while (p < pend) {
 	    if ((p->as.basic.flags & FL_MARK) &&
 		(p->as.basic.flags != FL_MARK)) {
-		gc_mark_children((VALUE)p, 0);
+		gc_mark_children(objspace, (VALUE)p, 0);
 	    }
 	    p++;
 	}
@@ -584,134 +1264,232 @@ gc_mark_all()
 }
 
 static void
-gc_mark_rest()
+gc_mark_rest(rb_objspace_t *objspace)
 {
     VALUE tmp_arry[MARK_STACK_MAX];
     VALUE *p;
 
     p = (mark_stack_ptr - mark_stack) + tmp_arry;
-    MEMCPY(tmp_arry, mark_stack, VALUE, MARK_STACK_MAX);
+    MEMCPY(tmp_arry, mark_stack, VALUE, p - tmp_arry);
 
-    init_mark_stack();
-    while(p != tmp_arry){
+    init_mark_stack(objspace);
+    while (p != tmp_arry) {
 	p--;
-	gc_mark_children(*p, 0);
+	gc_mark_children(objspace, *p, 0);
     }
 }
 
 static inline int
-is_pointer_to_heap(ptr)
-    void *ptr;
+is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
 {
     register RVALUE *p = RANY(ptr);
-    register RVALUE *heap_org;
-    register long i;
-
-    if (p < lomem || p > himem) return Qfalse;
-    if ((VALUE)p % sizeof(RVALUE) != 0) return Qfalse;
-
-    /* check if p looks like a pointer */
-    for (i=0; i < heaps_used; i++) {
-	heap_org = heaps[i].slot;
-	if (heap_org <= p && p < heap_org + heaps[i].limit)
-	    return Qtrue;
+    register struct heaps_slot *heap;
+    register size_t hi, lo, mid;
+
+    if (p < lomem || p > himem) return FALSE;
+    if ((VALUE)p % sizeof(RVALUE) != 0) return FALSE;
+
+    /* check if p looks like a pointer using bsearch*/
+    lo = 0;
+    hi = heaps_used;
+    while (lo < hi) {
+	mid = (lo + hi) / 2;
+	heap = &heaps[mid];
+	if (heap->slot <= p) {
+	    if (p < heap->slot + heap->limit)
+		return TRUE;
+	    lo = mid + 1;
+	}
+	else {
+	    hi = mid;
+	}
     }
-    return Qfalse;
+    return FALSE;
 }
 
 static void
-mark_locations_array(x, n)
-    register VALUE *x;
-    register long n;
+mark_locations_array(rb_objspace_t *objspace, register VALUE *x, register long n)
 {
     VALUE v;
     while (n--) {
         v = *x;
-	if (is_pointer_to_heap((void *)v)) {
-	    gc_mark(v, 0);
+        VALGRIND_MAKE_MEM_DEFINED(&v, sizeof(v));
+	if (is_pointer_to_heap(objspace, (void *)v)) {
+	    gc_mark(objspace, v, 0);
 	}
 	x++;
     }
 }
 
-void
-rb_gc_mark_locations(start, end)
-    VALUE *start, *end;
+static void
+gc_mark_locations(rb_objspace_t *objspace, VALUE *start, VALUE *end)
 {
     long n;
 
+    if (end <= start) return;
     n = end - start;
-    mark_locations_array(start,n);
+    mark_locations_array(objspace, start, n);
 }
 
-static int
-mark_entry(key, value, lev)
-    ID key;
-    VALUE value;
+void
+rb_gc_mark_locations(VALUE *start, VALUE *end)
+{
+    gc_mark_locations(&rb_objspace, start, end);
+}
+
+#define rb_gc_mark_locations(start, end) gc_mark_locations(objspace, start, end)
+
+struct mark_tbl_arg {
+    rb_objspace_t *objspace;
     int lev;
+};
+
+static int
+mark_entry(ID key, VALUE value, st_data_t data)
 {
-    gc_mark(value, lev);
+    struct mark_tbl_arg *arg = (void*)data;
+    gc_mark(arg->objspace, value, arg->lev);
     return ST_CONTINUE;
 }
 
 static void
-mark_tbl(tbl, lev)
-    st_table *tbl;
-    int lev;
+mark_tbl(rb_objspace_t *objspace, st_table *tbl, int lev)
+{
+    struct mark_tbl_arg arg;
+    if (!tbl) return;
+    arg.objspace = objspace;
+    arg.lev = lev;
+    st_foreach(tbl, mark_entry, (st_data_t)&arg);
+}
+
+static int
+mark_key(VALUE key, VALUE value, st_data_t data)
 {
+    struct mark_tbl_arg *arg = (void*)data;
+    gc_mark(arg->objspace, key, arg->lev);
+    return ST_CONTINUE;
+}
+
+static void
+mark_set(rb_objspace_t *objspace, st_table *tbl, int lev)
+{
+    struct mark_tbl_arg arg;
     if (!tbl) return;
-    st_foreach(tbl, mark_entry, lev);
+    arg.objspace = objspace;
+    arg.lev = lev;
+    st_foreach(tbl, mark_key, (st_data_t)&arg);
 }
 
 void
-rb_mark_tbl(tbl)
-    st_table *tbl;
+rb_mark_set(st_table *tbl)
 {
-    mark_tbl(tbl, 0);
+    mark_set(&rb_objspace, tbl, 0);
 }
 
 static int
-mark_keyvalue(key, value, lev)
-    VALUE key;
-    VALUE value;
-    int lev;
+mark_keyvalue(VALUE key, VALUE value, st_data_t data)
 {
-    gc_mark(key, lev);
-    gc_mark(value, lev);
+    struct mark_tbl_arg *arg = (void*)data;
+    gc_mark(arg->objspace, key, arg->lev);
+    gc_mark(arg->objspace, value, arg->lev);
     return ST_CONTINUE;
 }
 
 static void
-mark_hash(tbl, lev)
-    st_table *tbl;
-    int lev;
+mark_hash(rb_objspace_t *objspace, st_table *tbl, int lev)
 {
+    struct mark_tbl_arg arg;
     if (!tbl) return;
-    st_foreach(tbl, mark_keyvalue, lev);
+    arg.objspace = objspace;
+    arg.lev = lev;
+    st_foreach(tbl, mark_keyvalue, (st_data_t)&arg);
 }
 
 void
-rb_mark_hash(tbl)
-    st_table *tbl;
+rb_mark_hash(st_table *tbl)
+{
+    mark_hash(&rb_objspace, tbl, 0);
+}
+
+static void
+mark_method_entry(rb_objspace_t *objspace, const rb_method_entry_t *me, int lev)
 {
-    mark_hash(tbl, 0);
+    const rb_method_definition_t *def = me->def;
+
+    gc_mark(objspace, me->klass, lev);
+    if (!def) return;
+    switch (def->type) {
+      case VM_METHOD_TYPE_ISEQ:
+	gc_mark(objspace, def->body.iseq->self, lev);
+	break;
+      case VM_METHOD_TYPE_BMETHOD:
+	gc_mark(objspace, def->body.proc, lev);
+	break;
+      case VM_METHOD_TYPE_ATTRSET:
+      case VM_METHOD_TYPE_IVAR:
+	gc_mark(objspace, def->body.attr.location, lev);
+	break;
+      default:
+	break; /* ignore */
+    }
 }
 
 void
-rb_gc_mark_maybe(obj)
-    VALUE obj;
+rb_mark_method_entry(const rb_method_entry_t *me)
+{
+    mark_method_entry(&rb_objspace, me, 0);
+}
+
+static int
+mark_method_entry_i(ID key, const rb_method_entry_t *me, st_data_t data)
+{
+    struct mark_tbl_arg *arg = (void*)data;
+    mark_method_entry(arg->objspace, me, arg->lev);
+    return ST_CONTINUE;
+}
+
+static void
+mark_m_tbl(rb_objspace_t *objspace, st_table *tbl, int lev)
+{
+    struct mark_tbl_arg arg;
+    if (!tbl) return;
+    arg.objspace = objspace;
+    arg.lev = lev;
+    st_foreach(tbl, mark_method_entry_i, (st_data_t)&arg);
+}
+
+static int
+free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data)
+{
+    rb_free_method_entry(me);
+    return ST_CONTINUE;
+}
+
+void
+rb_free_m_table(st_table *tbl)
+{
+    st_foreach(tbl, free_method_entry_i, 0);
+    st_free_table(tbl);
+}
+
+void
+rb_mark_tbl(st_table *tbl)
 {
-    if (is_pointer_to_heap((void *)obj)) {
-	gc_mark(obj, 0);
+    mark_tbl(&rb_objspace, tbl, 0);
+}
+
+void
+rb_gc_mark_maybe(VALUE obj)
+{
+    if (is_pointer_to_heap(&rb_objspace, (void *)obj)) {
+	gc_mark(&rb_objspace, obj, 0);
     }
 }
 
 #define GC_LEVEL_MAX 250
 
 static void
-gc_mark(ptr, lev)
-    VALUE ptr;
-    int lev;
+gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
 {
     register RVALUE *obj;
 
@@ -721,11 +1499,11 @@ gc_mark(ptr, lev)
     if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
     obj->as.basic.flags |= FL_MARK;
 
-    if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
+    if (lev > GC_LEVEL_MAX || (lev == 0 && stack_check())) {
 	if (!mark_stack_overflow) {
 	    if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
 		*mark_stack_ptr = ptr;
-		mark_stack_ptr++;		
+		mark_stack_ptr++;
 	    }
 	    else {
 		mark_stack_overflow = 1;
@@ -733,20 +1511,17 @@ gc_mark(ptr, lev)
 	}
 	return;
     }
-    gc_mark_children(ptr, lev+1);
+    gc_mark_children(objspace, ptr, lev+1);
 }
 
 void
-rb_gc_mark(ptr)
-    VALUE ptr;
+rb_gc_mark(VALUE ptr)
 {
-    gc_mark(ptr, 0);
+    gc_mark(&rb_objspace, ptr, 0);
 }
 
 static void
-gc_mark_children(ptr, lev)
-    VALUE ptr;
-    int lev;
+gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
 {
     register RVALUE *obj = RANY(ptr);
 
@@ -764,43 +1539,43 @@ gc_mark_children(ptr, lev)
 	rb_mark_generic_ivar(ptr);
     }
 
-    switch (obj->as.basic.flags & T_MASK) {
+    switch (BUILTIN_TYPE(obj)) {
       case T_NIL:
       case T_FIXNUM:
 	rb_bug("rb_gc_mark() called for broken object");
 	break;
 
       case T_NODE:
-	mark_source_filename(obj->as.node.nd_file);
 	switch (nd_type(obj)) {
 	  case NODE_IF:		/* 1,2,3 */
 	  case NODE_FOR:
 	  case NODE_ITER:
-	  case NODE_CREF:
 	  case NODE_WHEN:
 	  case NODE_MASGN:
 	  case NODE_RESCUE:
 	  case NODE_RESBODY:
 	  case NODE_CLASS:
-	    gc_mark((VALUE)obj->as.node.u2.node, lev);
+	  case NODE_BLOCK_PASS:
+	    gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev);
 	    /* fall through */
 	  case NODE_BLOCK:	/* 1,3 */
+	  case NODE_OPTBLOCK:
 	  case NODE_ARRAY:
 	  case NODE_DSTR:
 	  case NODE_DXSTR:
 	  case NODE_DREGX:
 	  case NODE_DREGX_ONCE:
-	  case NODE_FBODY:
 	  case NODE_ENSURE:
 	  case NODE_CALL:
 	  case NODE_DEFS:
 	  case NODE_OP_ASGN1:
-	    gc_mark((VALUE)obj->as.node.u1.node, lev);
+	  case NODE_ARGS:
+	    gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
 	    /* fall through */
 	  case NODE_SUPER:	/* 3 */
 	  case NODE_FCALL:
 	  case NODE_DEFN:
-	  case NODE_NEWLINE:
+	  case NODE_ARGS_AUX:
 	    ptr = (VALUE)obj->as.node.u3.node;
 	    goto again;
 
@@ -821,22 +1596,21 @@ gc_mark_children(ptr, lev)
 	  case NODE_MODULE:
 	  case NODE_ALIAS:
 	  case NODE_VALIAS:
-	  case NODE_ARGS:
-	    gc_mark((VALUE)obj->as.node.u1.node, lev);
+	  case NODE_ARGSCAT:
+	    gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
 	    /* fall through */
-	  case NODE_METHOD:	/* 2 */
-	  case NODE_NOT:
-	  case NODE_GASGN:
+	  case NODE_GASGN:	/* 2 */
 	  case NODE_LASGN:
 	  case NODE_DASGN:
 	  case NODE_DASGN_CURR:
 	  case NODE_IASGN:
-	  case NODE_CVDECL:
+	  case NODE_IASGN2:
 	  case NODE_CVASGN:
 	  case NODE_COLON3:
 	  case NODE_OPT_N:
 	  case NODE_EVSTR:
 	  case NODE_UNDEF:
+	  case NODE_POSTEXE:
 	    ptr = (VALUE)obj->as.node.u2.node;
 	    goto again;
 
@@ -853,20 +1627,18 @@ gc_mark_children(ptr, lev)
 	  case NODE_COLON2:
 	  case NODE_SPLAT:
 	  case NODE_TO_ARY:
-	  case NODE_SVALUE:
 	    ptr = (VALUE)obj->as.node.u1.node;
 	    goto again;
 
 	  case NODE_SCOPE:	/* 2,3 */
-	  case NODE_BLOCK_PASS:
 	  case NODE_CDECL:
-	    gc_mark((VALUE)obj->as.node.u3.node, lev);
+	  case NODE_OPT_ARG:
+	    gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
 	    ptr = (VALUE)obj->as.node.u2.node;
 	    goto again;
 
 	  case NODE_ZARRAY:	/* - */
 	  case NODE_ZSUPER:
-	  case NODE_CFUNC:
 	  case NODE_VCALL:
 	  case NODE_GVAR:
 	  case NODE_LVAR:
@@ -881,150 +1653,184 @@ gc_mark_children(ptr, lev)
 	  case NODE_NIL:
 	  case NODE_TRUE:
 	  case NODE_FALSE:
-	  case NODE_ATTRSET:
+	  case NODE_ERRINFO:
 	  case NODE_BLOCK_ARG:
-	  case NODE_POSTEXE:
 	    break;
 	  case NODE_ALLOCA:
-	    mark_locations_array((VALUE*)obj->as.node.u1.value,
+	    mark_locations_array(objspace,
+				 (VALUE*)obj->as.node.u1.value,
 				 obj->as.node.u3.cnt);
 	    ptr = (VALUE)obj->as.node.u2.node;
 	    goto again;
 
 	  default:		/* unlisted NODE */
-	    if (is_pointer_to_heap(obj->as.node.u1.node)) {
-		gc_mark((VALUE)obj->as.node.u1.node, lev);
+	    if (is_pointer_to_heap(objspace, obj->as.node.u1.node)) {
+		gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
 	    }
-	    if (is_pointer_to_heap(obj->as.node.u2.node)) {
-		gc_mark((VALUE)obj->as.node.u2.node, lev);
+	    if (is_pointer_to_heap(objspace, obj->as.node.u2.node)) {
+		gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev);
 	    }
-	    if (is_pointer_to_heap(obj->as.node.u3.node)) {
-		gc_mark((VALUE)obj->as.node.u3.node, lev);
+	    if (is_pointer_to_heap(objspace, obj->as.node.u3.node)) {
+		gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
 	    }
 	}
 	return;			/* no need to mark class. */
     }
 
-    gc_mark(obj->as.basic.klass, lev);
-    switch (obj->as.basic.flags & T_MASK) {
+    gc_mark(objspace, obj->as.basic.klass, lev);
+    switch (BUILTIN_TYPE(obj)) {
       case T_ICLASS:
       case T_CLASS:
       case T_MODULE:
-	mark_tbl(obj->as.klass.m_tbl, lev);
-	mark_tbl(obj->as.klass.iv_tbl, lev);
-	ptr = obj->as.klass.super;
+	mark_m_tbl(objspace, RCLASS_M_TBL(obj), lev);
+	mark_tbl(objspace, RCLASS_IV_TBL(obj), lev);
+	ptr = RCLASS_SUPER(obj);
 	goto again;
 
       case T_ARRAY:
 	if (FL_TEST(obj, ELTS_SHARED)) {
-	    ptr = obj->as.array.aux.shared;
+	    ptr = obj->as.array.as.heap.aux.shared;
 	    goto again;
 	}
 	else {
-	    long i, len = obj->as.array.len;
-	    VALUE *ptr = obj->as.array.ptr;
-
+	    long i, len = RARRAY_LEN(obj);
+	    VALUE *ptr = RARRAY_PTR(obj);
 	    for (i=0; i < len; i++) {
-		gc_mark(*ptr++, lev);
+		gc_mark(objspace, *ptr++, lev);
 	    }
 	}
 	break;
 
       case T_HASH:
-	mark_hash(obj->as.hash.tbl, lev);
+	mark_hash(objspace, obj->as.hash.ntbl, lev);
 	ptr = obj->as.hash.ifnone;
 	goto again;
 
       case T_STRING:
 #define STR_ASSOC FL_USER3   /* copied from string.c */
-	if (FL_TEST(obj, ELTS_SHARED|STR_ASSOC)) {
-	    ptr = obj->as.string.aux.shared;
+	if (FL_TEST(obj, RSTRING_NOEMBED) && FL_ANY(obj, ELTS_SHARED|STR_ASSOC)) {
+	    ptr = obj->as.string.as.heap.aux.shared;
 	    goto again;
 	}
 	break;
 
       case T_DATA:
-	if (obj->as.data.dmark) (*obj->as.data.dmark)(DATA_PTR(obj));
+	if (RTYPEDDATA_P(obj)) {
+	    if (obj->as.typeddata.type->dmark) (*obj->as.typeddata.type->dmark)(DATA_PTR(obj));
+	}
+	else {
+	    if (obj->as.data.dmark) (*obj->as.data.dmark)(DATA_PTR(obj));
+	}
 	break;
 
       case T_OBJECT:
-	mark_tbl(obj->as.object.iv_tbl, lev);
+        {
+            long i, len = ROBJECT_NUMIV(obj);
+	    VALUE *ptr = ROBJECT_IVPTR(obj);
+            for (i  = 0; i < len; i++) {
+		gc_mark(objspace, *ptr++, lev);
+            }
+        }
 	break;
 
       case T_FILE:
+        if (obj->as.file.fptr) {
+            gc_mark(objspace, obj->as.file.fptr->pathv, lev);
+            gc_mark(objspace, obj->as.file.fptr->tied_io_for_writing, lev);
+            gc_mark(objspace, obj->as.file.fptr->writeconv_asciicompat, lev);
+            gc_mark(objspace, obj->as.file.fptr->writeconv_pre_ecopts, lev);
+            gc_mark(objspace, obj->as.file.fptr->encs.ecopts, lev);
+            gc_mark(objspace, obj->as.file.fptr->write_lock, lev);
+        }
+        break;
+
       case T_REGEXP:
+        gc_mark(objspace, obj->as.regexp.src, lev);
+        break;
+
       case T_FLOAT:
       case T_BIGNUM:
-      case T_BLKTAG:
+      case T_ZOMBIE:
 	break;
 
       case T_MATCH:
+	gc_mark(objspace, obj->as.match.regexp, lev);
 	if (obj->as.match.str) {
 	    ptr = obj->as.match.str;
 	    goto again;
 	}
 	break;
 
-      case T_VARMAP:
-	gc_mark(obj->as.varmap.val, lev);
-	ptr = (VALUE)obj->as.varmap.next;
-	goto again;
-
-      case T_SCOPE:
-	if (obj->as.scope.local_vars && (obj->as.scope.flags & SCOPE_MALLOC)) {
-	    int n = obj->as.scope.local_tbl[0]+1;
-	    VALUE *vars = &obj->as.scope.local_vars[-1];
+      case T_RATIONAL:
+	gc_mark(objspace, obj->as.rational.num, lev);
+	gc_mark(objspace, obj->as.rational.den, lev);
+	break;
 
-	    while (n--) {
-		gc_mark(*vars++, lev);
-	    }
-	}
+      case T_COMPLEX:
+	gc_mark(objspace, obj->as.complex.real, lev);
+	gc_mark(objspace, obj->as.complex.imag, lev);
 	break;
 
       case T_STRUCT:
 	{
-	    long len = obj->as.rstruct.len;
-	    VALUE *ptr = obj->as.rstruct.ptr;
+	    long len = RSTRUCT_LEN(obj);
+	    VALUE *ptr = RSTRUCT_PTR(obj);
 
 	    while (len--) {
-		gc_mark(*ptr++, lev);
+		gc_mark(objspace, *ptr++, lev);
 	    }
 	}
 	break;
 
       default:
-	rb_bug("rb_gc_mark(): unknown data type 0x%lx(0x%lx) %s",
-	       obj->as.basic.flags & T_MASK, obj,
-	       is_pointer_to_heap(obj) ? "corrupted object" : "non object");
+	rb_bug("rb_gc_mark(): unknown data type 0x%x(%p) %s",
+	       BUILTIN_TYPE(obj), (void *)obj,
+	       is_pointer_to_heap(objspace, obj) ? "corrupted object" : "non object");
     }
 }
 
-static void obj_free _((VALUE));
+static int obj_free(rb_objspace_t *, VALUE);
+
+static inline void
+add_freelist(rb_objspace_t *objspace, RVALUE *p)
+{
+    VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
+    p->as.free.flags = 0;
+    p->as.free.next = freelist;
+    freelist = p;
+}
 
 static void
-finalize_list(p)
-    RVALUE *p;
+finalize_list(rb_objspace_t *objspace, RVALUE *p)
 {
     while (p) {
 	RVALUE *tmp = p->as.free.next;
-	run_final((VALUE)p);
+	run_final(objspace, (VALUE)p);
 	if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
-	    p->as.free.flags = 0;
-	    p->as.free.next = freelist;
-	    freelist = p;
+	    add_freelist(objspace, p);
+	}
+	else {
+	    struct heaps_slot *slot = (struct heaps_slot *)(VALUE)RDATA(p)->dmark;
+	    slot->limit--;
 	}
 	p = tmp;
     }
 }
 
 static void
-free_unused_heaps()
+free_unused_heaps(rb_objspace_t *objspace)
 {
-    int i, j;
+    size_t i, j;
+    RVALUE *last = 0;
 
     for (i = j = 1; j < heaps_used; i++) {
 	if (heaps[i].limit == 0) {
-	    free(heaps[i].membase);
+	    if (!last) {
+		last = heaps[i].membase;
+	    }
+	    else {
+		free(heaps[i].membase);
+	    }
 	    heaps_used--;
 	}
 	else {
@@ -1034,71 +1840,65 @@ free_unused_heaps()
 	    j++;
 	}
     }
+    if (last) {
+	if (last < heaps_freed) {
+	    free(heaps_freed);
+	    heaps_freed = last;
+	}
+	else {
+	    free(last);
+	}
+    }
 }
 
-void rb_gc_abort_threads(void);
-
 static void
-gc_sweep()
+gc_sweep(rb_objspace_t *objspace)
 {
     RVALUE *p, *pend, *final_list;
-    int freed = 0;
-    int i;
-    unsigned long live = 0;
-    unsigned long free_min = 0;
-
-    for (i = 0; i < heaps_used; i++) {
-        free_min += heaps[i].limit;
-    }
-    free_min = free_min * 0.2;
-    if (free_min < FREE_MIN)
-        free_min = FREE_MIN;
+    size_t freed = 0;
+    size_t i;
+    size_t live = 0, free_min = 0, do_heap_free = 0;
 
-    if (ruby_in_compile && ruby_parser_stack_on_heap()) {
-	/* should not reclaim nodes during compilation
-           if yacc's semantic stack is not allocated on machine stack */
-	for (i = 0; i < heaps_used; i++) {
-	    p = heaps[i].slot; pend = p + heaps[i].limit;
-	    while (p < pend) {
-		if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
-		    gc_mark((VALUE)p, 0);
-		p++;
-	    }
-	}
-    }
+    do_heap_free = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.65);
+    free_min = (size_t)((heaps_used * HEAP_OBJ_LIMIT)  * 0.2);
 
-    mark_source_filename(ruby_sourcefile);
-    if (source_filenames) {
-        st_foreach(source_filenames, sweep_source_filename, 0);
+    if (free_min < FREE_MIN) {
+	do_heap_free = heaps_used * HEAP_OBJ_LIMIT;
+        free_min = FREE_MIN;
     }
 
     freelist = 0;
     final_list = deferred_final_list;
     deferred_final_list = 0;
     for (i = 0; i < heaps_used; i++) {
-	int n = 0;
+	size_t free_num = 0, final_num = 0;
 	RVALUE *free = freelist;
 	RVALUE *final = final_list;
+	int deferred;
+
+	if(heaps[i].finalize_flag) continue;
 
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	while (p < pend) {
 	    if (!(p->as.basic.flags & FL_MARK)) {
-		if (p->as.basic.flags) {
-		    obj_free((VALUE)p);
-		}
-		if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
-		    p->as.free.flags = FL_MARK; /* remain marked */
+		if (p->as.basic.flags &&
+		    ((deferred = obj_free(objspace, (VALUE)p)) ||
+		     ((FL_TEST(p, FL_FINALIZE)) && need_call_final))) {
+		    if (!deferred) {
+			p->as.free.flags = T_ZOMBIE;
+			RDATA(p)->dfree = 0;
+		    }
+		    p->as.free.flags |= FL_MARK;
 		    p->as.free.next = final_list;
 		    final_list = p;
+		    final_num++;
 		}
 		else {
-		    p->as.free.flags = 0;
-		    p->as.free.next = freelist;
-		    freelist = p;
+		    add_freelist(objspace, p);
+		    free_num++;
 		}
-		n++;
 	    }
-	    else if (RBASIC(p)->flags == FL_MARK) {
+	    else if (BUILTIN_TYPE(p) == T_ZOMBIE) {
 		/* objects to be finalized */
 		/* do nothing remain marked */
 	    }
@@ -1108,51 +1908,71 @@ gc_sweep()
 	    }
 	    p++;
 	}
-	if (n == heaps[i].limit && freed > free_min) {
+	if (final_num + free_num == heaps[i].limit && freed > do_heap_free) {
 	    RVALUE *pp;
 
-	    heaps[i].limit = 0;
 	    for (pp = final_list; pp != final; pp = pp->as.free.next) {
+		RDATA(pp)->dmark = (void (*)())(VALUE)&heaps[i];
 		pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */
 	    }
+	    heaps[i].limit = final_num;
+	    heaps[i].finalize_flag = TRUE;
 	    freelist = free;	/* cancel this page from freelist */
 	}
 	else {
-	    freed += n;
+	    freed += free_num;
 	}
     }
+    GC_PROF_SET_MALLOC_INFO;
     if (malloc_increase > malloc_limit) {
-	malloc_limit += (malloc_increase - malloc_limit) * (double)live / (live + freed);
+	malloc_limit += (size_t)((malloc_increase - malloc_limit) * (double)live / (live + freed));
 	if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
     }
     malloc_increase = 0;
     if (freed < free_min) {
-	add_heap();
+        set_heaps_increment(objspace);
+        heaps_increment(objspace);
     }
     during_gc = 0;
 
     /* clear finalization list */
     if (final_list) {
+	GC_PROF_SET_HEAP_INFO;
 	deferred_final_list = final_list;
-	return;
+	RUBY_VM_SET_FINALIZER_INTERRUPT(GET_THREAD());
+    }
+    else{
+	free_unused_heaps(objspace);
+	GC_PROF_SET_HEAP_INFO;
     }
-    free_unused_heaps();
 }
 
 void
-rb_gc_force_recycle(p)
-    VALUE p;
+rb_gc_force_recycle(VALUE p)
 {
-    RANY(p)->as.free.flags = 0;
-    RANY(p)->as.free.next = freelist;
-    freelist = RANY(p);
+    rb_objspace_t *objspace = &rb_objspace;
+    add_freelist(objspace, (RVALUE *)p);
 }
 
-static void
-obj_free(obj)
-    VALUE obj;
+static inline void
+make_deferred(RVALUE *p)
+{
+    p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_ZOMBIE;
+}
+
+static inline void
+make_io_deferred(RVALUE *p)
+{
+    rb_io_t *fptr = p->as.file.fptr;
+    make_deferred(p);
+    p->as.data.dfree = (void (*)(void*))rb_io_fptr_finalize;
+    p->as.data.data = fptr;
+}
+
+static int
+obj_free(rb_objspace_t *objspace, VALUE obj)
 {
-    switch (RANY(obj)->as.basic.flags & T_MASK) {
+    switch (BUILTIN_TYPE(obj)) {
       case T_NIL:
       case T_FIXNUM:
       case T_TRUE:
@@ -1163,229 +1983,202 @@ obj_free(obj)
 
     if (FL_TEST(obj, FL_EXIVAR)) {
 	rb_free_generic_ivar((VALUE)obj);
+	FL_UNSET(obj, FL_EXIVAR);
     }
 
-    switch (RANY(obj)->as.basic.flags & T_MASK) {
+    switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
-	if (RANY(obj)->as.object.iv_tbl) {
-	    st_free_table(RANY(obj)->as.object.iv_tbl);
+	if (!(RANY(obj)->as.basic.flags & ROBJECT_EMBED) &&
+            RANY(obj)->as.object.as.heap.ivptr) {
+	    xfree(RANY(obj)->as.object.as.heap.ivptr);
 	}
 	break;
       case T_MODULE:
       case T_CLASS:
 	rb_clear_cache_by_class((VALUE)obj);
-	st_free_table(RANY(obj)->as.klass.m_tbl);
-	if (RANY(obj)->as.object.iv_tbl) {
-	    st_free_table(RANY(obj)->as.object.iv_tbl);
+	rb_free_m_table(RCLASS_M_TBL(obj));
+	if (RCLASS_IV_TBL(obj)) {
+	    st_free_table(RCLASS_IV_TBL(obj));
+	}
+	if (RCLASS_IV_INDEX_TBL(obj)) {
+	    st_free_table(RCLASS_IV_INDEX_TBL(obj));
 	}
+        xfree(RANY(obj)->as.klass.ptr);
 	break;
       case T_STRING:
-	if (RANY(obj)->as.string.ptr && !FL_TEST(obj, ELTS_SHARED)) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.string.ptr));
-	}
+	rb_str_free(obj);
 	break;
       case T_ARRAY:
-	if (RANY(obj)->as.array.ptr && !FL_TEST(obj, ELTS_SHARED)) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.array.ptr));
-	}
+	rb_ary_free(obj);
 	break;
       case T_HASH:
-	if (RANY(obj)->as.hash.tbl) {
-	    st_free_table(RANY(obj)->as.hash.tbl);
+	if (RANY(obj)->as.hash.ntbl) {
+	    st_free_table(RANY(obj)->as.hash.ntbl);
 	}
 	break;
       case T_REGEXP:
 	if (RANY(obj)->as.regexp.ptr) {
-	    re_free_pattern(RANY(obj)->as.regexp.ptr);
-	}
-	if (RANY(obj)->as.regexp.str) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.regexp.str));
+	    onig_free(RANY(obj)->as.regexp.ptr);
 	}
 	break;
       case T_DATA:
 	if (DATA_PTR(obj)) {
+	    if (RTYPEDDATA_P(obj)) {
+		RDATA(obj)->dfree = RANY(obj)->as.typeddata.type->dfree;
+	    }
 	    if ((long)RANY(obj)->as.data.dfree == -1) {
-		RUBY_CRITICAL(free(DATA_PTR(obj)));
+		xfree(DATA_PTR(obj));
 	    }
 	    else if (RANY(obj)->as.data.dfree) {
-		(*RANY(obj)->as.data.dfree)(DATA_PTR(obj));
+		make_deferred(RANY(obj));
+		return 1;
 	    }
 	}
 	break;
       case T_MATCH:
-	if (RANY(obj)->as.match.regs) {
-	    re_free_registers(RANY(obj)->as.match.regs);
-	    RUBY_CRITICAL(free(RANY(obj)->as.match.regs));
+	if (RANY(obj)->as.match.rmatch) {
+            struct rmatch *rm = RANY(obj)->as.match.rmatch;
+	    onig_region_free(&rm->regs, 0);
+            if (rm->char_offset)
+		xfree(rm->char_offset);
+	    xfree(rm);
 	}
 	break;
       case T_FILE:
 	if (RANY(obj)->as.file.fptr) {
-	    rb_io_fptr_finalize(RANY(obj)->as.file.fptr);
-	    RUBY_CRITICAL(free(RANY(obj)->as.file.fptr));
+	    make_io_deferred(RANY(obj));
+	    return 1;
 	}
 	break;
+      case T_RATIONAL:
+      case T_COMPLEX:
+	break;
       case T_ICLASS:
 	/* iClass shares table with the module */
+	xfree(RANY(obj)->as.klass.ptr);
 	break;
 
       case T_FLOAT:
-      case T_VARMAP:
-      case T_BLKTAG:
 	break;
 
       case T_BIGNUM:
-	if (RANY(obj)->as.bignum.digits) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.bignum.digits));
+	if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
+	    xfree(RBIGNUM_DIGITS(obj));
 	}
 	break;
       case T_NODE:
 	switch (nd_type(obj)) {
 	  case NODE_SCOPE:
 	    if (RANY(obj)->as.node.u1.tbl) {
-		RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl));
+		xfree(RANY(obj)->as.node.u1.tbl);
 	    }
 	    break;
 	  case NODE_ALLOCA:
-	    RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node));
+	    xfree(RANY(obj)->as.node.u1.node);
 	    break;
 	}
-	return;			/* no need to free iv_tbl */
-
-      case T_SCOPE:
-	if (RANY(obj)->as.scope.local_vars &&
-            RANY(obj)->as.scope.flags != SCOPE_ALLOCA) {
-	    VALUE *vars = RANY(obj)->as.scope.local_vars-1;
-           if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0)
-		RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl));
-	    if (RANY(obj)->as.scope.flags & SCOPE_MALLOC)
-		RUBY_CRITICAL(free(vars));
-	}
-	break;
+	break;			/* no need to free iv_tbl */
 
       case T_STRUCT:
-	if (RANY(obj)->as.rstruct.ptr) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.rstruct.ptr));
+	if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
+	    RANY(obj)->as.rstruct.as.heap.ptr) {
+	    xfree(RANY(obj)->as.rstruct.as.heap.ptr);
 	}
 	break;
 
       default:
-	rb_bug("gc_sweep(): unknown data type 0x%lx(0x%lx)",
-	       RANY(obj)->as.basic.flags & T_MASK, obj);
+	rb_bug("gc_sweep(): unknown data type 0x%x(%p)",
+	       BUILTIN_TYPE(obj), (void*)obj);
     }
-}
 
-void
-rb_gc_mark_frame(frame)
-    struct FRAME *frame;
-{
-    gc_mark((VALUE)frame->node, 0);
+    return 0;
 }
 
-#ifdef __GNUC__
-#if defined(__human68k__) || defined(DJGPP)
-#if defined(__human68k__)
-typedef unsigned long rb_jmp_buf[8];
-__asm__ (".even\n\
-_rb_setjmp:\n\
-	move.l	4(sp),a0\n\
-	movem.l	d3-d7/a3-a5,(a0)\n\
-	moveq.l	#0,d0\n\
-	rts");
-#ifdef setjmp
-#undef setjmp
-#endif
+#define GC_NOTIFY 0
+
+void rb_vm_mark(void *ptr);
+
+#if STACK_GROW_DIRECTION < 0
+#define GET_STACK_BOUNDS(start, end, appendix) (start = STACK_END, end = STACK_START)
+#elif STACK_GROW_DIRECTION > 0
+#define GET_STACK_BOUNDS(start, end, appendix) (start = STACK_START, end = STACK_END+appendix)
 #else
-#if defined(DJGPP)
-typedef unsigned long rb_jmp_buf[6];
-__asm__ (".align 4\n\
-_rb_setjmp:\n\
-	pushl	%ebp\n\
-	movl	%esp,%ebp\n\
-	movl	8(%ebp),%ebp\n\
-	movl	%eax,(%ebp)\n\
-	movl	%ebx,4(%ebp)\n\
-	movl	%ecx,8(%ebp)\n\
-	movl	%edx,12(%ebp)\n\
-	movl	%esi,16(%ebp)\n\
-	movl	%edi,20(%ebp)\n\
-	popl	%ebp\n\
-	xorl	%eax,%eax\n\
-	ret");
-#endif
+#define GET_STACK_BOUNDS(start, end, appendix) \
+    ((STACK_END < STACK_START) ? \
+     (start = STACK_END, end = STACK_START) : (start = STACK_START, end = STACK_END+appendix))
 #endif
-int rb_setjmp (rb_jmp_buf);
-#define jmp_buf rb_jmp_buf
-#define setjmp rb_setjmp
-#endif /* __human68k__ or DJGPP */
-#endif /* __GNUC__ */
 
 static void
-garbage_collect()
+mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
 {
-    struct gc_list *list;
-    struct FRAME * volatile frame; /* gcc 2.7.2.3 -O2 bug??  */
-    jmp_buf save_regs_gc_mark;
+    rb_jmp_buf save_regs_gc_mark;
+    VALUE *stack_start, *stack_end;
+
+    FLUSH_REGISTER_WINDOWS;
+    /* This assumes that all registers are saved into the jmp_buf (and stack) */
+    rb_setjmp(save_regs_gc_mark);
+
     SET_STACK_END;
+    GET_STACK_BOUNDS(stack_start, stack_end, 1);
 
-#ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
-	rb_bug("cross-thread violation on rb_gc()");
-    }
+    mark_locations_array(objspace,
+			 (VALUE*)save_regs_gc_mark,
+			 sizeof(save_regs_gc_mark) / sizeof(VALUE));
+
+    rb_gc_mark_locations(stack_start, stack_end);
+#ifdef __ia64
+    rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
 #endif
+#if defined(__mc68000__)
+    mark_locations_array((VALUE*)((char*)STACK_END + 2),
+			 (STACK_START - STACK_END));
+#endif
+}
+
+void rb_gc_mark_encodings(void);
+
+static int
+garbage_collect(rb_objspace_t *objspace)
+{
+    struct gc_list *list;
+    rb_thread_t *th = GET_THREAD();
+    INIT_GC_PROF_PARAMS;
+
+    if (GC_NOTIFY) printf("start garbage_collect()\n");
+
+    if (!heaps) {
+	return FALSE;
+    }
+
     if (dont_gc || during_gc) {
 	if (!freelist) {
-	    add_heap();
+            if (!heaps_increment(objspace)) {
+                set_heaps_increment(objspace);
+                heaps_increment(objspace);
+            }
 	}
-	return;
+	return TRUE;
     }
-    if (during_gc) return;
     during_gc++;
+    objspace->count++;
+
+    GC_PROF_TIMER_START;
+    GC_PROF_MARK_TIMER_START;
+    SET_STACK_END;
 
-    init_mark_stack();
+    init_mark_stack(objspace);
 
-    gc_mark((VALUE)ruby_current_node, 0);
+    th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
 
-    /* mark frame stack */
-    for (frame = ruby_frame; frame; frame = frame->prev) {
-	rb_gc_mark_frame(frame);
-	if (frame->tmp) {
-	    struct FRAME *tmp = frame->tmp;
-	    while (tmp) {
-		rb_gc_mark_frame(tmp);
-		tmp = tmp->prev;
-	    }
-	}
-    }
-    gc_mark((VALUE)ruby_scope, 0);
-    gc_mark((VALUE)ruby_dyna_vars, 0);
     if (finalizer_table) {
-	mark_tbl(finalizer_table, 0);
+	mark_tbl(objspace, finalizer_table, 0);
     }
 
-    FLUSH_REGISTER_WINDOWS;
-    /* This assumes that all registers are saved into the jmp_buf (and stack) */
-    setjmp(save_regs_gc_mark);
-    mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *));
-#if STACK_GROW_DIRECTION < 0
-    rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
-#elif STACK_GROW_DIRECTION > 0
-    rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
-#else
-    if ((VALUE*)STACK_END < rb_gc_stack_start)
-	rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
-    else
-	rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
-#endif
-#ifdef __ia64
-    /* mark backing store (flushed register window on the stack) */
-    /* the basic idea from guile GC code                         */
-    rb_gc_mark_locations(rb_gc_register_stack_start, (VALUE*)rb_ia64_bsp());
-#endif
-#if defined(__human68k__) || defined(__mc68000__)
-    rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2),
-			 (VALUE*)((char*)rb_gc_stack_start + 2));
-#endif
+    mark_current_machine_context(objspace, th);
+
     rb_gc_mark_threads();
+    rb_gc_mark_symbols();
+    rb_gc_mark_encodings();
 
     /* mark protected global variables */
     for (list = global_List; list; list = list->next) {
@@ -1394,8 +2187,7 @@ garbage_collect()
     rb_mark_end_proc();
     rb_gc_mark_global_tbl();
 
-    rb_mark_tbl(rb_class_tbl);
-    rb_gc_mark_trap_list();
+    mark_tbl(objspace, rb_class_tbl, 0);
 
     /* mark generic instance variables for special constants */
     rb_mark_generic_ivar_tbl();
@@ -1403,161 +2195,73 @@ garbage_collect()
     rb_gc_mark_parser();
 
     /* gc_mark objects whose marking are not completed*/
-    do {
-	while (!MARK_STACK_EMPTY) {
-	    if (mark_stack_overflow){
-		gc_mark_all();
-	    }
-	    else {
-		gc_mark_rest();
-	    }
+    while (!MARK_STACK_EMPTY) {
+	if (mark_stack_overflow) {
+	    gc_mark_all(objspace);
+	}
+	else {
+	    gc_mark_rest(objspace);
 	}
-	rb_gc_abort_threads();
-    } while (!MARK_STACK_EMPTY);
+    }
+    GC_PROF_MARK_TIMER_STOP;
+
+    GC_PROF_SWEEP_TIMER_START;
+    gc_sweep(objspace);
+    GC_PROF_SWEEP_TIMER_STOP;
+
+    /* sweep unlinked method entries */
+    if (th->vm->unlinked_method_entry_list) {
+	rb_sweep_method_entry(th->vm);
+    }
 
-    gc_sweep();
+    GC_PROF_TIMER_STOP;
+    if (GC_NOTIFY) printf("end garbage_collect()\n");
+    return TRUE;
+}
+
+int
+rb_garbage_collect(void)
+{
+    return garbage_collect(&rb_objspace);
 }
 
 void
-rb_gc()
+rb_gc_mark_machine_stack(rb_thread_t *th)
 {
-    garbage_collect();
-    rb_gc_finalize_deferred();
+    rb_objspace_t *objspace = &rb_objspace;
+    VALUE *stack_start, *stack_end;
+
+    GET_STACK_BOUNDS(stack_start, stack_end, 0);
+    rb_gc_mark_locations(stack_start, stack_end);
+#ifdef __ia64
+    rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
+#endif
 }
 
+
 /*
  *  call-seq:
- *     GC.start                     => nil
- *     gc.garbage_collect           => nil
- *     ObjectSpace.garbage_collect  => nil
+ *     GC.start                     -> nil
+ *     gc.garbage_collect           -> nil
+ *     ObjectSpace.garbage_collect  -> nil
  *
  *  Initiates garbage collection, unless manually disabled.
  *
  */
 
 VALUE
-rb_gc_start()
+rb_gc_start(void)
 {
     rb_gc();
     return Qnil;
 }
 
-void
-ruby_set_stack_size(size)
-    size_t size;
-{
-#ifndef STACK_LEVEL_MAX
-    STACK_LEVEL_MAX = size / sizeof(VALUE);
-#endif
-}
+#undef Init_stack
 
 void
-Init_stack(addr)
-    VALUE *addr;
-{
-#ifdef __ia64
-    if (rb_gc_register_stack_start == 0) {
-# if defined(__FreeBSD__)
-        /*
-         * FreeBSD/ia64 currently does not have a way for a process to get the
-         * base address for the RSE backing store, so hardcode it.
-         */
-        rb_gc_register_stack_start = (4ULL<<61);
-# elif defined(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
-#  pragma weak __libc_ia64_register_backing_store_base
-        extern unsigned long __libc_ia64_register_backing_store_base;
-        rb_gc_register_stack_start = (VALUE*)__libc_ia64_register_backing_store_base;
-# endif
-    }
-    {
-        VALUE *bsp = (VALUE*)rb_ia64_bsp();
-        if (rb_gc_register_stack_start == 0 ||
-            bsp < rb_gc_register_stack_start) {
-            rb_gc_register_stack_start = bsp;
-        }
-    }
-#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
-    MEMORY_BASIC_INFORMATION m;
-    memset(&m, 0, sizeof(m));
-    VirtualQuery(&m, &m, sizeof(m));
-    rb_gc_stack_start =
-	STACK_UPPER((VALUE *)&m, (VALUE *)m.BaseAddress,
-		    (VALUE *)((char *)m.BaseAddress + m.RegionSize) - 1);
-#elif defined(STACK_END_ADDRESS)
-    {
-        extern void *STACK_END_ADDRESS;
-        rb_gc_stack_start = STACK_END_ADDRESS;
-    }
-#else
-    if (!addr) addr = (VALUE *)&addr;
-    STACK_UPPER(&addr, addr, ++addr);
-    if (rb_gc_stack_start) {
-	if (STACK_UPPER(&addr,
-			rb_gc_stack_start > addr,
-			rb_gc_stack_start < addr))
-	    rb_gc_stack_start = addr;
-	return;
-    }
-    rb_gc_stack_start = addr;
-#endif
-#ifdef HAVE_GETRLIMIT
-    {
-	struct rlimit rlim;
-
-	if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
-	    unsigned int space = rlim.rlim_cur/5;
-
-	    if (space > 1024*1024) space = 1024*1024;
-	    STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
-	}
-    }
-#endif
-}
-
-void ruby_init_stack(VALUE *addr
-#ifdef __ia64
-    , void *bsp
-#endif
-    )
+Init_stack(volatile VALUE *addr)
 {
-    if (!rb_gc_stack_start ||
-        STACK_UPPER(&addr,
-                    rb_gc_stack_start > addr,
-                    rb_gc_stack_start < addr)) {
-        rb_gc_stack_start = addr;
-    }
-#ifdef __ia64
-    if (!rb_gc_register_stack_start ||
-        (VALUE*)bsp < rb_gc_register_stack_start) {
-        rb_gc_register_stack_start = (VALUE*)bsp;
-    }
-#endif
-#ifdef HAVE_GETRLIMIT
-    {
-        struct rlimit rlim;
-
-        if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
-            unsigned int space = rlim.rlim_cur/5;
-
-            if (space > 1024*1024) space = 1024*1024;
-            STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
-        }
-    }
-#elif defined _WIN32
-    {
-	MEMORY_BASIC_INFORMATION mi;
-	DWORD size;
-	DWORD space;
-
-	if (VirtualQuery(&mi, &mi, sizeof(mi))) {
-	    size = (char *)mi.BaseAddress - (char *)mi.AllocationBase;
-	    space = size / 5;
-	    if (space > 1024*1024) space = 1024*1024;
-	    STACK_LEVEL_MAX = (size - space) / sizeof(VALUE);
-	}
-    }
-#endif
+    ruby_init_stack(addr);
 }
 
 /*
@@ -1592,53 +2296,139 @@ void ruby_init_stack(VALUE *addr
  */
 
 void
-Init_heap()
+Init_heap(void)
 {
-    if (!rb_gc_stack_start) {
-	Init_stack(0);
+    init_heap(&rb_objspace);
+}
+
+/*
+ * rb_objspace_each_objects() is special C API to walk through
+ * Ruby object space.  This C API is too difficult to use it.
+ * To be frank, you should not use it. Or you need to read the
+ * source code of this function and understand what this function does.
+ *
+ * 'callback' will be called several times (the number of heap slot,
+ * at current implementation) with:
+ *   vstart: a pointer to the first living object of the heap_slot.
+ *   vend: a pointer to next to the valid heap_slot area.
+ *   stride: a distance to next VALUE.
+ *
+ * If callback() returns non-zero, the iteration will be stopped.
+ *
+ * This is a sample callback code to iterate liveness objects:
+ *
+ *   int
+ *   sample_callback(void *vstart, void *vend, int stride, void *data) {
+ *     VALUE v = (VALUE)vstart;
+ *     for (; v != (VALUE)vend; v += stride) {
+ *       if (RBASIC(v)->flags) { // liveness check
+ *       // do something with live object 'v'
+ *     }
+ *     return 0; // continue to iteration
+ *   }
+ *
+ * Note: 'vstart' is not a top of heap_slot.  This point the first
+ *       living object to grasp at least one object to avoid GC issue.
+ *       This means that you can not walk through all Ruby object slot
+ *       including freed object slot.
+ *
+ * Note: On this implementation, 'stride' is same as sizeof(RVALUE).
+ *       However, there are possibilities to pass variable values with
+ *       'stride' with some reasons.  You must use stride instead of
+ *       use some constant value in the iteration.
+ */
+void
+rb_objspace_each_objects(int (*callback)(void *vstart, void *vend,
+					 size_t stride, void *d),
+			 void *data)
+{
+    size_t i;
+    RVALUE *membase = 0;
+    RVALUE *pstart, *pend;
+    rb_objspace_t *objspace = &rb_objspace;
+    volatile VALUE v;
+
+    i = 0;
+    while (i < heaps_used) {
+	while (0 < i && (uintptr_t)membase < (uintptr_t)heaps[i-1].membase)
+	    i--;
+	while (i < heaps_used && (uintptr_t)heaps[i].membase <= (uintptr_t)membase )
+	    i++;
+	if (heaps_used <= i)
+	    break;
+	membase = heaps[i].membase;
+
+	pstart = heaps[i].slot;
+	pend = pstart + heaps[i].limit;
+
+	for (; pstart != pend; pstart++) {
+	    if (pstart->as.basic.flags) {
+		v = (VALUE)pstart; /* acquire to save this object */
+		break;
+	    }
+	}
+	if (pstart != pend) {
+	    if ((*callback)(pstart, pend, sizeof(RVALUE), data)) {
+		return;
+	    }
+	}
     }
-    add_heap();
+
+    return;
 }
 
-static VALUE
-os_obj_of(of)
+struct os_each_struct {
+    size_t num;
     VALUE of;
-{
-    int i;
-    int n = 0;
-
-    for (i = 0; i < heaps_used; i++) {
-	RVALUE *p, *pend;
+};
 
-	p = heaps[i].slot; pend = p + heaps[i].limit;
-	for (;p < pend; p++) {
-	    if (p->as.basic.flags) {
-		switch (TYPE(p)) {
-		  case T_NONE:
-		  case T_ICLASS:
-		  case T_VARMAP:
-		  case T_SCOPE:
-		  case T_NODE:
-		    continue;
-		  case T_CLASS:
-		    if (FL_TEST(p, FL_SINGLETON)) continue;
-		  default:
-		    if (!p->as.basic.klass) continue;
-		    if (!of || rb_obj_is_kind_of((VALUE)p, of)) {
-			rb_yield((VALUE)p);
-			n++;
-		    }
+static int
+os_obj_of_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    struct os_each_struct *oes = (struct os_each_struct *)data;
+    RVALUE *p = (RVALUE *)vstart, *pend = (RVALUE *)vend;
+    volatile VALUE v;
+
+    for (; p != pend; p++) {
+	if (p->as.basic.flags) {
+	    switch (BUILTIN_TYPE(p)) {
+	      case T_NONE:
+	      case T_ICLASS:
+	      case T_NODE:
+	      case T_ZOMBIE:
+		continue;
+	      case T_CLASS:
+		if (FL_TEST(p, FL_SINGLETON))
+		  continue;
+	      default:
+		if (!p->as.basic.klass) continue;
+		v = (VALUE)p;
+		if (!oes->of || rb_obj_is_kind_of(v, oes->of)) {
+		    rb_yield(v);
+		    oes->num++;
 		}
 	    }
 	}
     }
 
-    return INT2FIX(n);
+    return 0;
+}
+
+static VALUE
+os_obj_of(VALUE of)
+{
+    struct os_each_struct oes;
+
+    oes.num = 0;
+    oes.of = of;
+    rb_objspace_each_objects(os_obj_of_i, &oes);
+    return SIZET2NUM(oes.num);
 }
 
 /*
  *  call-seq:
- *     ObjectSpace.each_object([module]) {|obj| ... } => fixnum
+ *     ObjectSpace.each_object([module]) {|obj| ... } -> fixnum
+ *     ObjectSpace.each_object([module])              -> an_enumerator
  *
  *  Calls the block once for each living, nonimmediate object in this
  *  Ruby process. If <i>module</i> is specified, calls the block
@@ -1650,6 +2440,8 @@ os_obj_of(of)
  *  returns both the numbers we defined and several constants defined in
  *  the <code>Math</code> module.
  *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     a = 102.7
  *     b = 95       # Won't be returned
  *     c = 12345678987654321
@@ -1670,71 +2462,19 @@ os_obj_of(of)
  */
 
 static VALUE
-os_each_obj(argc, argv)
-    int argc;
-    VALUE *argv;
+os_each_obj(int argc, VALUE *argv, VALUE os)
 {
     VALUE of;
 
     rb_secure(4);
-    if (rb_scan_args(argc, argv, "01", &of) == 0) {
+    if (argc == 0) {
 	of = 0;
     }
-    return os_obj_of(of);
-}
-
-static VALUE finalizers;
-
-/* deprecated
- */
-
-static VALUE
-add_final(os, block)
-    VALUE os, block;
-{
-    rb_warn("ObjectSpace::add_finalizer is deprecated; use define_finalizer");
-    if (!rb_respond_to(block, rb_intern("call"))) {
-	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
-		 rb_obj_classname(block));
+    else {
+	rb_scan_args(argc, argv, "01", &of);
     }
-    rb_ary_push(finalizers, block);
-    return block;
-}
-
-/*
- * deprecated
- */
-static VALUE
-rm_final(os, block)
-    VALUE os, block;
-{
-    rb_warn("ObjectSpace::remove_finalizer is deprecated; use undefine_finalizer");
-    rb_ary_delete(finalizers, block);
-    return block;
-}
-
-/*
- * deprecated
- */
-static VALUE
-finals()
-{
-    rb_warn("ObjectSpace::finalizers is deprecated");
-    return finalizers;
-}
-
-/*
- * deprecated
- */
-
-static VALUE
-call_final(os, obj)
-    VALUE os, obj;
-{
-    rb_warn("ObjectSpace::call_finalizer is deprecated; use define_finalizer");
-    need_call_final = 1;
-    FL_SET(obj, FL_FINALIZE);
-    return obj;
+    RETURN_ENUMERATOR(os, 1, &of);
+    return os_obj_of(of);
 }
 
 /*
@@ -1746,12 +2486,14 @@ call_final(os, obj)
  */
 
 static VALUE
-undefine_final(os, obj)
-    VALUE os, obj;
+undefine_final(VALUE os, VALUE obj)
 {
+    rb_objspace_t *objspace = &rb_objspace;
+    if (OBJ_FROZEN(obj)) rb_error_frozen("object");
     if (finalizer_table) {
 	st_delete(finalizer_table, (st_data_t*)&obj, 0);
     }
+    FL_UNSET(obj, FL_FINALIZE);
     return obj;
 }
 
@@ -1765,14 +2507,13 @@ undefine_final(os, obj)
  */
 
 static VALUE
-define_final(argc, argv, os)
-    int argc;
-    VALUE *argv;
-    VALUE os;
+define_final(int argc, VALUE *argv, VALUE os)
 {
+    rb_objspace_t *objspace = &rb_objspace;
     VALUE obj, block, table;
 
     rb_scan_args(argc, argv, "11", &obj, &block);
+    if (OBJ_FROZEN(obj)) rb_error_frozen("object");
     if (argc == 1) {
 	block = rb_block_proc();
     }
@@ -1780,10 +2521,14 @@ define_final(argc, argv, os)
 	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
 		 rb_obj_classname(block));
     }
-    need_call_final = 1;
-    FL_SET(obj, FL_FINALIZE);
+    if (!FL_ABLE(obj)) {
+	rb_raise(rb_eArgError, "cannot define finalizer for %s",
+		 rb_obj_classname(obj));
+    }
+    RBASIC(obj)->flags |= FL_FINALIZE;
 
-    block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block);
+    block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
+    OBJ_FREEZE(block);
 
     if (!finalizer_table) {
 	finalizer_table = st_init_numtable();
@@ -1792,15 +2537,17 @@ define_final(argc, argv, os)
 	rb_ary_push(table, block);
     }
     else {
-	st_add_direct(finalizer_table, obj, rb_ary_new3(1, block));
+	table = rb_ary_new3(1, block);
+	RBASIC(table)->klass = 0;
+	st_add_direct(finalizer_table, obj, table);
     }
     return block;
 }
 
 void
-rb_gc_copy_finalizer(dest, obj)
-    VALUE dest, obj;
+rb_gc_copy_finalizer(VALUE dest, VALUE obj)
 {
+    rb_objspace_t *objspace = &rb_objspace;
     VALUE table;
 
     if (!finalizer_table) return;
@@ -1808,102 +2555,201 @@ rb_gc_copy_finalizer(dest, obj)
     if (st_lookup(finalizer_table, obj, &table)) {
 	st_insert(finalizer_table, dest, table);
     }
-    RBASIC(dest)->flags |= FL_FINALIZE;
+    FL_SET(dest, FL_FINALIZE);
 }
 
 static VALUE
-run_single_final(args)
-    VALUE *args;
+run_single_final(VALUE arg)
 {
+    VALUE *args = (VALUE *)arg;
     rb_eval_cmd(args[0], args[1], (int)args[2]);
     return Qnil;
 }
 
 static void
-run_final(obj)
-    VALUE obj;
+run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE objid, VALUE table)
 {
     long i;
-    int status, critical_save = rb_thread_critical;
-    VALUE args[3], table, objid;
+    int status;
+    VALUE args[3];
 
-    objid = rb_obj_id(obj);	/* make obj into id */
-    rb_thread_critical = Qtrue;
     args[1] = 0;
-    args[2] = (VALUE)ruby_safe_level;
-    for (i=0; i<RARRAY(finalizers)->len; i++) {
-	args[0] = RARRAY(finalizers)->ptr[i];
-	if (!args[1]) args[1] = rb_ary_new3(1, objid);
-	rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
-    }
-    if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
-	for (i=0; i<RARRAY(table)->len; i++) {
-	    VALUE final = RARRAY(table)->ptr[i];
-	    args[0] = RARRAY(final)->ptr[1];
-	    if (!args[1]) args[1] = rb_ary_new3(1, objid);
-	    args[2] = FIX2INT(RARRAY(final)->ptr[0]);
-	    rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
-	}
+    args[2] = (VALUE)rb_safe_level();
+    if (!args[1] && RARRAY_LEN(table) > 0) {
+	args[1] = rb_obj_freeze(rb_ary_new3(1, objid));
+    }
+    for (i=0; i<RARRAY_LEN(table); i++) {
+	VALUE final = RARRAY_PTR(table)[i];
+	args[0] = RARRAY_PTR(final)[1];
+	args[2] = FIX2INT(RARRAY_PTR(final)[0]);
+	rb_protect(run_single_final, (VALUE)args, &status);
     }
-    rb_thread_critical = critical_save;
 }
 
-void
-rb_gc_finalize_deferred()
+static void
+run_final(rb_objspace_t *objspace, VALUE obj)
 {
-    RVALUE *p = deferred_final_list;
+    VALUE table, objid;
+    RUBY_DATA_FUNC free_func = 0;
+
+    objid = rb_obj_id(obj);	/* make obj into id */
+    RBASIC(obj)->klass = 0;
+
+    if (RTYPEDDATA_P(obj)) {
+	free_func = RTYPEDDATA_TYPE(obj)->dfree;
+    }
+    else {
+	free_func = RDATA(obj)->dfree;
+    }
+    if (free_func) {
+	(*free_func)(DATA_PTR(obj));
+    }
 
+    if (finalizer_table &&
+	st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
+	run_finalizer(objspace, obj, objid, table);
+    }
+}
+
+static void
+finalize_deferred(rb_objspace_t *objspace)
+{
+    RVALUE *p = deferred_final_list;
     deferred_final_list = 0;
+
     if (p) {
-	finalize_list(p);
-	free_unused_heaps();
+	finalize_list(objspace, p);
+    }
+}
+
+static void
+gc_finalize_deferred(rb_objspace_t *objspace)
+{
+    finalize_deferred(objspace);
+    free_unused_heaps(objspace);
+}
+
+void
+rb_gc_finalize_deferred(void)
+{
+    gc_finalize_deferred(&rb_objspace);
+}
+
+static int
+chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
+{
+    RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg;
+    if ((p->as.basic.flags & (FL_FINALIZE|FL_MARK)) == FL_FINALIZE) {
+	if (BUILTIN_TYPE(p) != T_ZOMBIE) {
+	    p->as.free.flags = FL_MARK | T_ZOMBIE; /* remain marked */
+	    RDATA(p)->dfree = 0;
+	}
+	p->as.free.next = *final_list;
+	*final_list = p;
     }
+    return ST_CONTINUE;
+}
+
+struct force_finalize_list {
+    VALUE obj;
+    VALUE table;
+    struct force_finalize_list *next;
+};
+
+static int
+force_chain_object(st_data_t key, st_data_t val, st_data_t arg)
+{
+    struct force_finalize_list **prev = (struct force_finalize_list **)arg;
+    struct force_finalize_list *curr = ALLOC(struct force_finalize_list);
+    curr->obj = key;
+    curr->table = val;
+    curr->next = *prev;
+    *prev = curr;
+    return ST_CONTINUE;
 }
 
 void
-rb_gc_call_finalizer_at_exit()
+rb_gc_call_finalizer_at_exit(void)
+{
+    rb_objspace_call_finalizer(&rb_objspace);
+}
+
+void
+rb_objspace_call_finalizer(rb_objspace_t *objspace)
 {
     RVALUE *p, *pend;
-    int i;
+    RVALUE *final_list = 0;
+    size_t i;
 
     /* run finalizers */
-    if (need_call_final) {
-	p = deferred_final_list;
-	deferred_final_list = 0;
-	finalize_list(p);
-	for (i = 0; i < heaps_used; i++) {
-	    p = heaps[i].slot; pend = p + heaps[i].limit;
-	    while (p < pend) {
-		if (FL_TEST(p, FL_FINALIZE)) {
-		    FL_UNSET(p, FL_FINALIZE);
-		    p->as.basic.klass = 0;
-		    run_final((VALUE)p);
-		}
-		p++;
+    if (finalizer_table) {
+	do {
+	    /* XXX: this loop will make no sense */
+	    /* because mark will not be removed */
+	    finalize_deferred(objspace);
+	    mark_tbl(objspace, finalizer_table, 0);
+	    st_foreach(finalizer_table, chain_finalized_object,
+		       (st_data_t)&deferred_final_list);
+	} while (deferred_final_list);
+	/* force to run finalizer */
+	while (finalizer_table->num_entries) {
+	    struct force_finalize_list *list = 0;
+	    st_foreach(finalizer_table, force_chain_object, (st_data_t)&list);
+	    while (list) {
+		struct force_finalize_list *curr = list;
+		run_finalizer(objspace, curr->obj, rb_obj_id(curr->obj), curr->table);
+		st_delete(finalizer_table, (st_data_t*)&curr->obj, 0);
+		list = curr->next;
+		xfree(curr);
 	    }
 	}
+	st_free_table(finalizer_table);
+	finalizer_table = 0;
     }
+    /* finalizers are part of garbage collection */
+    during_gc++;
     /* run data object's finalizers */
     for (i = 0; i < heaps_used; i++) {
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	while (p < pend) {
 	    if (BUILTIN_TYPE(p) == T_DATA &&
-		DATA_PTR(p) && RANY(p)->as.data.dfree) {
+		DATA_PTR(p) && RANY(p)->as.data.dfree &&
+		RANY(p)->as.basic.klass != rb_cThread && RANY(p)->as.basic.klass != rb_cMutex) {
 		p->as.free.flags = 0;
+		if (RTYPEDDATA_P(p)) {
+		    RDATA(p)->dfree = RANY(p)->as.typeddata.type->dfree;
+		}
 		if ((long)RANY(p)->as.data.dfree == -1) {
-		    RUBY_CRITICAL(free(DATA_PTR(p)));
+		    xfree(DATA_PTR(p));
 		}
 		else if (RANY(p)->as.data.dfree) {
-		    (*RANY(p)->as.data.dfree)(DATA_PTR(p));
+		    make_deferred(RANY(p));
+		    RANY(p)->as.free.next = final_list;
+		    final_list = p;
 		}
 	    }
 	    else if (BUILTIN_TYPE(p) == T_FILE) {
-		p->as.free.flags = 0;
-		rb_io_fptr_finalize(RANY(p)->as.file.fptr);
+		if (RANY(p)->as.file.fptr) {
+		    make_io_deferred(RANY(p));
+		    RANY(p)->as.free.next = final_list;
+		    final_list = p;
+		}
 	    }
 	    p++;
 	}
     }
+    during_gc = 0;
+    if (final_list) {
+	finalize_list(objspace, final_list);
+    }
+}
+
+void
+rb_gc(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    garbage_collect(objspace);
+    gc_finalize_deferred(objspace);
 }
 
 /*
@@ -1920,14 +2766,21 @@ rb_gc_call_finalizer_at_exit()
  */
 
 static VALUE
-id2ref(obj, objid)
-    VALUE obj, objid;
+id2ref(VALUE obj, VALUE objid)
 {
-    unsigned long ptr, p0;
-    int type;
+#if SIZEOF_LONG == SIZEOF_VOIDP
+#define NUM2PTR(x) NUM2ULONG(x)
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+#define NUM2PTR(x) NUM2ULL(x)
+#endif
+    rb_objspace_t *objspace = &rb_objspace;
+    VALUE ptr;
+    void *p0;
 
     rb_secure(4);
-    p0 = ptr = NUM2ULONG(objid);
+    ptr = NUM2PTR(objid);
+    p0 = (void *)ptr;
+
     if (ptr == Qtrue) return Qtrue;
     if (ptr == Qfalse) return Qfalse;
     if (ptr == Qnil) return Qnil;
@@ -1937,16 +2790,16 @@ id2ref(obj, objid)
     if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
         ID symid = ptr / sizeof(RVALUE);
         if (rb_id2name(symid) == 0)
-            rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
-        return ID2SYM(symid);
+	    rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
+	return ID2SYM(symid);
     }
 
-    if (!is_pointer_to_heap((void *)ptr)||
-	(type = BUILTIN_TYPE(ptr)) >= T_BLKTAG || type == T_ICLASS) {
-	rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
+    if (!is_pointer_to_heap(objspace, (void *)ptr) ||
+	BUILTIN_TYPE(ptr) > T_FIXNUM || BUILTIN_TYPE(ptr) == T_ICLASS) {
+	rb_raise(rb_eRangeError, "%p is not id value", p0);
     }
     if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {
-	rb_raise(rb_eRangeError, "0x%lx is recycled object", p0);
+	rb_raise(rb_eRangeError, "%p is recycled object", p0);
     }
     return (VALUE)ptr;
 }
@@ -1956,9 +2809,9 @@ id2ref(obj, objid)
  *  Document-method: object_id
  *
  *  call-seq:
- *     obj.__id__       => fixnum
- *     obj.object_id    => fixnum
- *  
+ *     obj.__id__       -> fixnum
+ *     obj.object_id    -> fixnum
+ *
  *  Returns an integer identifier for <i>obj</i>. The same number will
  *  be returned on all calls to <code>id</code> for a given object, and
  *  no two active objects will share an id.
@@ -1969,8 +2822,8 @@ id2ref(obj, objid)
 
 /*
  *  call-seq:
- *     obj.hash    => fixnum
- *  
+ *     obj.hash    -> fixnum
+ *
  *  Generates a <code>Fixnum</code> hash value for this object. This
  *  function must have the property that <code>a.eql?(b)</code> implies
  *  <code>a.hash == b.hash</code>. The hash value is used by class
@@ -2013,9 +2866,305 @@ rb_obj_id(VALUE obj)
         return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
     }
     if (SPECIAL_CONST_P(obj)) {
-        return LONG2NUM((long)obj);
+        return LONG2NUM((SIGNED_VALUE)obj);
     }
-    return (VALUE)((long)obj|FIXNUM_FLAG);
+    return (VALUE)((SIGNED_VALUE)obj|FIXNUM_FLAG);
+}
+
+static int
+set_zero(st_data_t key, st_data_t val, st_data_t arg)
+{
+    VALUE k = (VALUE)key;
+    VALUE hash = (VALUE)arg;
+    rb_hash_aset(hash, k, INT2FIX(0));
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.count_objects([result_hash]) -> hash
+ *
+ *  Counts objects for each type.
+ *
+ *  It returns a hash as:
+ *  {:TOTAL=>10000, :FREE=>3011, :T_OBJECT=>6, :T_CLASS=>404, ...}
+ *
+ *  If the optional argument, result_hash, is given,
+ *  it is overwritten and returned.
+ *  This is intended to avoid probe effect.
+ *
+ *  The contents of the returned hash is implementation defined.
+ *  It may be changed in future.
+ *
+ *  This method is not expected to work except C Ruby.
+ *
+ */
+
+static VALUE
+count_objects(int argc, VALUE *argv, VALUE os)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    size_t counts[T_MASK+1];
+    size_t freed = 0;
+    size_t total = 0;
+    size_t i;
+    VALUE hash;
+
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+        if (TYPE(hash) != T_HASH)
+            rb_raise(rb_eTypeError, "non-hash given");
+    }
+
+    for (i = 0; i <= T_MASK; i++) {
+        counts[i] = 0;
+    }
+
+    for (i = 0; i < heaps_used; i++) {
+        RVALUE *p, *pend;
+
+        p = heaps[i].slot; pend = p + heaps[i].limit;
+        for (;p < pend; p++) {
+            if (p->as.basic.flags) {
+                counts[BUILTIN_TYPE(p)]++;
+            }
+            else {
+                freed++;
+            }
+        }
+        total += heaps[i].limit;
+    }
+
+    if (hash == Qnil) {
+        hash = rb_hash_new();
+    }
+    else if (!RHASH_EMPTY_P(hash)) {
+        st_foreach(RHASH_TBL(hash), set_zero, hash);
+    }
+    rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
+    rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(freed));
+
+    for (i = 0; i <= T_MASK; i++) {
+        VALUE type;
+        switch (i) {
+#define COUNT_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
+	    COUNT_TYPE(T_NONE);
+	    COUNT_TYPE(T_OBJECT);
+	    COUNT_TYPE(T_CLASS);
+	    COUNT_TYPE(T_MODULE);
+	    COUNT_TYPE(T_FLOAT);
+	    COUNT_TYPE(T_STRING);
+	    COUNT_TYPE(T_REGEXP);
+	    COUNT_TYPE(T_ARRAY);
+	    COUNT_TYPE(T_HASH);
+	    COUNT_TYPE(T_STRUCT);
+	    COUNT_TYPE(T_BIGNUM);
+	    COUNT_TYPE(T_FILE);
+	    COUNT_TYPE(T_DATA);
+	    COUNT_TYPE(T_MATCH);
+	    COUNT_TYPE(T_COMPLEX);
+	    COUNT_TYPE(T_RATIONAL);
+	    COUNT_TYPE(T_NIL);
+	    COUNT_TYPE(T_TRUE);
+	    COUNT_TYPE(T_FALSE);
+	    COUNT_TYPE(T_SYMBOL);
+	    COUNT_TYPE(T_FIXNUM);
+	    COUNT_TYPE(T_UNDEF);
+	    COUNT_TYPE(T_NODE);
+	    COUNT_TYPE(T_ICLASS);
+	    COUNT_TYPE(T_ZOMBIE);
+#undef COUNT_TYPE
+          default:              type = INT2NUM(i); break;
+        }
+        if (counts[i])
+            rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
+    }
+
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     GC.count -> Integer
+ *
+ *  The number of times GC occurred.
+ *
+ *  It returns the number of times GC occurred since the process started.
+ *
+ */
+
+static VALUE
+gc_count(VALUE self)
+{
+    return UINT2NUM((&rb_objspace)->count);
+}
+
+#if CALC_EXACT_MALLOC_SIZE
+/*
+ *  call-seq:
+ *     GC.malloc_allocated_size -> Integer
+ *
+ *  The allocated size by malloc().
+ *
+ *  It returns the allocated size by malloc().
+ */
+
+static VALUE
+gc_malloc_allocated_size(VALUE self)
+{
+    return UINT2NUM((&rb_objspace)->malloc_params.allocated_size);
+}
+
+/*
+ *  call-seq:
+ *     GC.malloc_allocations -> Integer
+ *
+ *  The number of allocated memory object by malloc().
+ *
+ *  It returns the number of allocated memory object by malloc().
+ */
+
+static VALUE
+gc_malloc_allocations(VALUE self)
+{
+    return UINT2NUM((&rb_objspace)->malloc_params.allocations);
+}
+#endif
+
+static VALUE
+gc_profile_record_get(void)
+{
+    VALUE prof;
+    VALUE gc_profile = rb_ary_new();
+    size_t i;
+    rb_objspace_t *objspace = (&rb_objspace);
+
+    if (!objspace->profile.run) {
+	return Qnil;
+    }
+
+    for (i =0; i < objspace->profile.count; i++) {
+	prof = rb_hash_new();
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_TIME")), DBL2NUM(objspace->profile.record[i].gc_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_INVOKE_TIME")), DBL2NUM(objspace->profile.record[i].gc_invoke_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SIZE")), rb_uint2inum(objspace->profile.record[i].heap_use_size));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")), rb_uint2inum(objspace->profile.record[i].heap_total_size));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")), rb_uint2inum(objspace->profile.record[i].heap_total_objects));
+#if GC_PROFILE_MORE_DETAIL
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_MARK_TIME")), DBL2NUM(objspace->profile.record[i].gc_mark_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_SWEEP_TIME")), DBL2NUM(objspace->profile.record[i].gc_sweep_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_INCREASE")), rb_uint2inum(objspace->profile.record[i].allocate_increase));
+        rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_LIMIT")), rb_uint2inum(objspace->profile.record[i].allocate_limit));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SLOTS")), rb_uint2inum(objspace->profile.record[i].heap_use_slots));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_LIVE_OBJECTS")), rb_uint2inum(objspace->profile.record[i].heap_live_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_FREE_OBJECTS")), rb_uint2inum(objspace->profile.record[i].heap_free_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HAVE_FINALIZE")), objspace->profile.record[i].have_finalize);
+#endif
+	rb_ary_push(gc_profile, prof);
+    }
+
+    return gc_profile;
+}
+
+/*
+ *  call-seq:
+ *     GC::Profiler.result -> string
+ *
+ *  Report profile data to string.
+ *
+ *  It returns a string as:
+ *   GC 1 invokes.
+ *   Index    Invoke Time(sec)       Use Size(byte)     Total Size(byte)         Total Object                    GC time(ms)
+ *       1               0.012               159240               212940                10647         0.00000000000001530000
+ */
+
+static VALUE
+gc_profile_result(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    VALUE record;
+    VALUE result;
+    int i;
+
+    record = gc_profile_record_get();
+    if (objspace->profile.run && objspace->profile.count) {
+	result = rb_sprintf("GC %d invokes.\n", NUM2INT(gc_count(0)));
+	rb_str_cat2(result, "Index    Invoke Time(sec)       Use Size(byte)     Total Size(byte)         Total Object                    GC Time(ms)\n");
+	for (i = 0; i < (int)RARRAY_LEN(record); i++) {
+	    VALUE r = RARRAY_PTR(record)[i];
+	    rb_str_catf(result, "%5d %19.3f %20d %20d %20d %30.20f\n",
+			i+1, NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_INVOKE_TIME")))),
+			NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_USE_SIZE")))),
+			NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")))),
+			NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")))),
+			NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_TIME"))))*1000);
+	}
+#if GC_PROFILE_MORE_DETAIL
+	rb_str_cat2(result, "\n\n");
+	rb_str_cat2(result, "More detail.\n");
+	rb_str_cat2(result, "Index Allocate Increase    Allocate Limit  Use Slot  Have Finalize             Mark Time(ms)            Sweep Time(ms)\n");
+	for (i = 0; i < (int)RARRAY_LEN(record); i++) {
+	    VALUE r = RARRAY_PTR(record)[i];
+	    rb_str_catf(result, "%5d %17d %17d %9d %14s %25.20f %25.20f\n",
+			i+1, NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("ALLOCATE_INCREASE")))),
+			NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("ALLOCATE_LIMIT")))),
+			NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_USE_SLOTS")))),
+			rb_hash_aref(r, ID2SYM(rb_intern("HAVE_FINALIZE")))? "true" : "false",
+			NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_MARK_TIME"))))*1000,
+			NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_SWEEP_TIME"))))*1000);
+	}
+#endif
+    }
+    else {
+	result = rb_str_new2("");
+    }
+    return result;
+}
+
+
+/*
+ *  call-seq:
+ *     GC::Profiler.report
+ *
+ *  GC::Profiler.result display
+ *
+ */
+
+static VALUE
+gc_profile_report(int argc, VALUE *argv, VALUE self)
+{
+    VALUE out;
+
+    if (argc == 0) {
+	out = rb_stdout;
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &out);
+    }
+    rb_io_write(out, gc_profile_result());
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     GC::Profiler.total_time -> float
+ *
+ *  return total time that GC used. (msec)
+ */
+
+static VALUE
+gc_profile_total_time(VALUE self)
+{
+    double time = 0;
+    rb_objspace_t *objspace = &rb_objspace;
+    size_t i;
+
+    if (objspace->profile.run && objspace->profile.count) {
+	for (i = 0; i < objspace->profile.count; i++) {
+	    time += objspace->profile.record[i].gc_time;
+	}
+    }
+    return DBL2NUM(time);
 }
 
 /*
@@ -2025,40 +3174,50 @@ rb_obj_id(VALUE obj)
  */
 
 void
-Init_GC()
+Init_GC(void)
 {
     VALUE rb_mObSpace;
+    VALUE rb_mProfiler;
 
     rb_mGC = rb_define_module("GC");
     rb_define_singleton_method(rb_mGC, "start", rb_gc_start, 0);
     rb_define_singleton_method(rb_mGC, "enable", rb_gc_enable, 0);
     rb_define_singleton_method(rb_mGC, "disable", rb_gc_disable, 0);
+    rb_define_singleton_method(rb_mGC, "stress", gc_stress_get, 0);
+    rb_define_singleton_method(rb_mGC, "stress=", gc_stress_set, 1);
+    rb_define_singleton_method(rb_mGC, "count", gc_count, 0);
     rb_define_method(rb_mGC, "garbage_collect", rb_gc_start, 0);
 
+    rb_mProfiler = rb_define_module_under(rb_mGC, "Profiler");
+    rb_define_singleton_method(rb_mProfiler, "enabled?", gc_profile_enable_get, 0);
+    rb_define_singleton_method(rb_mProfiler, "enable", gc_profile_enable, 0);
+    rb_define_singleton_method(rb_mProfiler, "disable", gc_profile_disable, 0);
+    rb_define_singleton_method(rb_mProfiler, "clear", gc_profile_clear, 0);
+    rb_define_singleton_method(rb_mProfiler, "result", gc_profile_result, 0);
+    rb_define_singleton_method(rb_mProfiler, "report", gc_profile_report, -1);
+    rb_define_singleton_method(rb_mProfiler, "total_time", gc_profile_total_time, 0);
+
     rb_mObSpace = rb_define_module("ObjectSpace");
     rb_define_module_function(rb_mObSpace, "each_object", os_each_obj, -1);
     rb_define_module_function(rb_mObSpace, "garbage_collect", rb_gc_start, 0);
-    rb_define_module_function(rb_mObSpace, "add_finalizer", add_final, 1);
-    rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
-    rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
-    rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
 
     rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
     rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);
 
     rb_define_module_function(rb_mObSpace, "_id2ref", id2ref, 1);
 
-    rb_gc_register_address(&rb_mObSpace);
-    rb_global_variable(&finalizers);
-    rb_gc_unregister_address(&rb_mObSpace);
-    finalizers = rb_ary_new();
-
-    source_filenames = st_init_strtable();
-
-    rb_global_variable(&nomem_error);
-    nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
+    nomem_error = rb_exc_new3(rb_eNoMemError,
+			      rb_obj_freeze(rb_str_new2("failed to allocate memory")));
+    OBJ_TAINT(nomem_error);
+    OBJ_FREEZE(nomem_error);
 
-    rb_define_method(rb_mKernel, "hash", rb_obj_id, 0);
     rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
     rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
+
+    rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);
+
+#if CALC_EXACT_MALLOC_SIZE
+    rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
+    rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
+#endif
 }
diff --git a/gc.h b/gc.h
new file mode 100644
index 0000000000..d77495aa1d
--- /dev/null
+++ b/gc.h
@@ -0,0 +1,77 @@
+
+#ifndef RUBY_GC_H
+#define RUBY_GC_H 1
+
+#if defined(__x86_64__) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__("movq\t%%rsp, %0" : "=r" (*p))
+#elif defined(__i386) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__("movl\t%%esp, %0" : "=r" (*p))
+#else
+NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
+#define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
+#define USE_CONSERVATIVE_STACK_END
+#endif
+
+/* for GC debug */
+
+#ifndef RUBY_MARK_FREE_DEBUG
+#define RUBY_MARK_FREE_DEBUG 0
+#endif
+
+#if RUBY_MARK_FREE_DEBUG
+extern int ruby_gc_debug_indent;
+
+static void
+rb_gc_debug_indent(void)
+{
+    printf("%*s", ruby_gc_debug_indent, "");
+}
+
+static void
+rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
+{
+    if (st == 0) {
+	ruby_gc_debug_indent--;
+    }
+    rb_gc_debug_indent();
+    printf("%s: %s %s (%p)\n", mode, st ? "->" : "<-", msg, ptr);
+
+    if (st) {
+	ruby_gc_debug_indent++;
+    }
+
+    fflush(stdout);
+}
+
+#define RUBY_MARK_ENTER(msg) rb_gc_debug_body("mark", msg, 1, ptr)
+#define RUBY_MARK_LEAVE(msg) rb_gc_debug_body("mark", msg, 0, ptr)
+#define RUBY_FREE_ENTER(msg) rb_gc_debug_body("free", msg, 1, ptr)
+#define RUBY_FREE_LEAVE(msg) rb_gc_debug_body("free", msg, 0, ptr)
+#define RUBY_GC_INFO         rb_gc_debug_indent(); printf
+
+#else
+#define RUBY_MARK_ENTER(msg)
+#define RUBY_MARK_LEAVE(msg)
+#define RUBY_FREE_ENTER(msg)
+#define RUBY_FREE_LEAVE(msg)
+#define RUBY_GC_INFO if(0)printf
+#endif
+
+#define RUBY_MARK_UNLESS_NULL(ptr) if(RTEST(ptr)){rb_gc_mark(ptr);}
+#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);(ptr)=NULL;}
+
+#if STACK_GROW_DIRECTION > 0
+# define STACK_UPPER(x, a, b) a
+#elif STACK_GROW_DIRECTION < 0
+# define STACK_UPPER(x, a, b) b
+#else
+RUBY_EXTERN int ruby_stack_grow_direction;
+int ruby_get_stack_grow_direction(volatile VALUE *addr);
+# define stack_growup_p(x) (			\
+	(ruby_stack_grow_direction ?		\
+	 ruby_stack_grow_direction :		\
+	 ruby_get_stack_grow_direction(x)) > 0)
+# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
+#endif
+
+#endif /* RUBY_GC_H */
diff --git a/gem_prelude.rb b/gem_prelude.rb
new file mode 100644
index 0000000000..017adc2040
--- /dev/null
+++ b/gem_prelude.rb
@@ -0,0 +1,235 @@
+# depends on: array.rb dir.rb env.rb file.rb hash.rb module.rb regexp.rb
+# vim: filetype=ruby
+
+# NOTICE: Ruby is during initialization here.
+# * Encoding.default_external does not reflects -E.
+# * Should not expect Encoding.default_internal.
+# * Locale encoding is available.
+
+if defined?(Gem) then
+
+  # :stopdoc:
+
+  module Kernel
+
+    def gem(gem_name, *version_requirements)
+      Gem::QuickLoader.load_full_rubygems_library
+      gem gem_name, *version_requirements
+    end
+    private :gem
+  end
+
+  module Gem
+
+    ConfigMap = {
+      :EXEEXT            => RbConfig::CONFIG["EXEEXT"],
+      :RUBY_SO_NAME      => RbConfig::CONFIG["RUBY_SO_NAME"],
+      :arch              => RbConfig::CONFIG["arch"],
+      :bindir            => RbConfig::CONFIG["bindir"],
+      :libdir            => RbConfig::CONFIG["libdir"],
+      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
+      :ruby_version      => RbConfig::CONFIG["ruby_version"],
+      :rubylibprefix     => RbConfig::CONFIG["rubylibprefix"],
+      :sitedir           => RbConfig::CONFIG["sitedir"],
+      :sitelibdir        => RbConfig::CONFIG["sitelibdir"],
+    }
+
+    def self.dir
+      @gem_home ||= nil
+      set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
+      @gem_home
+    end
+
+    def self.path
+      @gem_path ||= nil
+      unless @gem_path
+        paths = [ENV['GEM_PATH'] || default_path]
+        paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
+        set_paths(paths.compact.join(File::PATH_SEPARATOR))
+      end
+      @gem_path
+    end
+
+    def self.post_install(&hook)
+      @post_install_hooks << hook
+    end
+
+    def self.post_uninstall(&hook)
+      @post_uninstall_hooks << hook
+    end
+
+    def self.pre_install(&hook)
+      @pre_install_hooks << hook
+    end
+
+    def self.pre_uninstall(&hook)
+      @pre_uninstall_hooks << hook
+    end
+
+    def self.set_home(home)
+      home = home.dup.force_encoding(Encoding.find('filesystem'))
+      home.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+      @gem_home = home
+    end
+
+    def self.set_paths(gpaths)
+      if gpaths
+        @gem_path = gpaths.split(File::PATH_SEPARATOR)
+
+        if File::ALT_SEPARATOR then
+          @gem_path.map! do |path|
+            path.gsub File::ALT_SEPARATOR, File::SEPARATOR
+          end
+        end
+
+        @gem_path << Gem.dir
+      else
+        # TODO: should this be Gem.default_path instead?
+        @gem_path = [Gem.dir]
+      end
+
+      @gem_path.uniq!
+      @gem_path.map!{|x|x.force_encoding(Encoding.find('filesystem'))}
+    end
+
+    def self.user_home
+      @user_home ||= File.expand_path("~").force_encoding(Encoding.find('filesystem'))
+    rescue
+      if File::ALT_SEPARATOR then
+        "C:/"
+      else
+        "/"
+      end
+    end
+
+    # begin rubygems/defaults
+    # NOTE: this require will be replaced with in-place eval before compilation.
+    require 'lib/rubygems/defaults.rb'
+    # end rubygems/defaults
+
+
+    ##
+    # Methods before this line will be removed when QuickLoader is replaced
+    # with the real RubyGems
+
+    GEM_PRELUDE_METHODS = Gem.methods(false)
+
+    begin
+      verbose, debug = $VERBOSE, $DEBUG
+      $VERBOSE = $DEBUG = nil
+
+      begin
+        require 'rubygems/defaults/operating_system'
+      rescue ::LoadError
+      end
+
+      if defined?(RUBY_ENGINE) then
+        begin
+          require "rubygems/defaults/#{RUBY_ENGINE}"
+        rescue ::LoadError
+        end
+      end
+    ensure
+      $VERBOSE, $DEBUG = verbose, debug
+    end
+
+    module QuickLoader
+
+      @loaded_full_rubygems_library = false
+
+      def self.remove
+        return if @loaded_full_rubygems_library
+
+        @loaded_full_rubygems_library = true
+
+        class << Gem
+          undef_method(*Gem::GEM_PRELUDE_METHODS)
+        end
+
+        remove_method :const_missing
+        remove_method :method_missing
+
+        Kernel.module_eval do
+          undef_method :gem if method_defined? :gem
+        end
+      end
+
+      def self.load_full_rubygems_library
+        return false if @loaded_full_rubygems_library
+
+        remove
+
+        $".delete path_to_full_rubygems_library
+        if $".any? {|path| path.end_with?('/rubygems.rb')}
+          raise LoadError, "another rubygems is already loaded from #{path}"
+        end
+
+        require 'rubygems'
+
+        return true
+      end
+
+      def self.path_to_full_rubygems_library
+        installed_path = File.join(Gem::ConfigMap[:rubylibprefix], Gem::ConfigMap[:ruby_version])
+        if $:.include?(installed_path)
+          return File.join(installed_path, 'rubygems.rb')
+        else # e.g., on test-all
+          $:.each do |dir|
+            if File.exist?( path = File.join(dir, 'rubygems.rb') )
+              return path
+            end
+          end
+          raise LoadError, 'rubygems.rb'
+        end
+      end
+
+      def const_missing(constant)
+        QuickLoader.load_full_rubygems_library
+
+        if Gem.const_defined?(constant) then
+          Gem.const_get constant
+        else
+          super
+        end
+      end
+
+      def method_missing(method, *args, &block)
+        QuickLoader.load_full_rubygems_library
+        super unless Gem.respond_to?(method)
+        Gem.send(method, *args, &block)
+      end
+    end
+
+    extend QuickLoader
+
+    def self.try_activate(path)
+      # This method is only hit when the custom require is hit the first time.
+      # So we go off and dutifully load all of rubygems and retry the call
+      # to Gem.try_activate. We retry because full rubygems replaces this
+      # method with one that actually tries to find a gem for +path+ and load it.
+      #
+      # This is conditional because in the course of loading rubygems, the custom
+      # require will call back into here before all of rubygems is loaded. So
+      # we must not always retry the call. We only redo the call when
+      # load_full_rubygems_library returns true, which it only does the first
+      # time it's called.
+      #
+      if QuickLoader.load_full_rubygems_library
+        return Gem.try_activate(path)
+      end
+
+      return false
+    end
+
+  end
+
+  begin
+    require 'lib/rubygems/custom_require.rb'
+  rescue Exception => e
+    puts "Error loading gem paths on load path in gem_prelude"
+    puts e
+    puts e.backtrace.join("\n")
+  end
+
+end
+
diff --git a/golf_prelude.rb b/golf_prelude.rb
new file mode 100644
index 0000000000..4363b496f0
--- /dev/null
+++ b/golf_prelude.rb
@@ -0,0 +1,114 @@
+class Object
+  @@golf_hash = {}
+  def method_missing m, *a, &b
+    t = @@golf_hash[ [m,self.class] ] ||= matching_methods(m)[0]
+    if t && b
+      __send__(t, *a) {|*args|
+        b.binding.eval("proc{|golf_matchdata| $~ = golf_matchdata }").call($~) if $~
+        b.call(*args)
+      }
+    else
+      t ? __send__(t, *a, &b) : super
+    end
+  end
+
+  def matching_methods(s='', m=callable_methods)
+    r=/^#{s.to_s.gsub(/./){"(.*?)"+Regexp.escape($&)}}/
+    m.grep(r).sort_by do |i|
+      i.to_s.match(r).captures.map(&:size) << i
+    end
+  end
+
+  def self.const_missing c
+    t = @@golf_hash[ [c,self.class] ] ||= matching_methods(c,constants)[0]
+    t and return const_get(t)
+    raise NameError, "uninitialized constant #{c}", caller(1)
+  end
+
+  def shortest_abbreviation(s='', m=callable_methods)
+    s=s.to_s
+    our_case = (?A..?Z)===s[0]
+    if m.index(s.to_sym)
+      1.upto(s.size){|z|s.scan(/./).combination(z).map{|trial|
+        next unless ((?A..?Z)===trial[0]) == our_case
+        trial*=''
+        return trial if matching_methods(trial,m)[0].to_s==s
+      }}
+    else
+      nil
+    end
+  end
+
+  def callable_methods
+    self.class == Object ? methods + private_methods : methods
+  end
+
+  private
+
+  def h(a='H', b='w', c='!')
+    puts "#{a}ello, #{b}orld#{c}"
+  end
+
+  alias say puts
+
+  def do_while
+    0 while yield
+  end
+
+  def do_until
+    0 until yield
+  end
+end
+
+class Array
+  alias old_to_s to_s
+  alias to_s join
+end
+
+class FalseClass
+  alias old_to_s to_s
+  def to_s
+    ""
+  end
+end
+
+class Integer
+  alias each times
+  include Enumerable
+end
+
+class String
+  alias / split
+
+  def to_a
+    split('')
+  end
+
+  (Array.instance_methods-instance_methods-[:to_ary,:transpose,:flatten,:flatten!,:compact,:compact!,:assoc,:rassoc]).each{|meth|
+    eval"
+    def #{meth}(*args, &block)
+      a=to_a
+      result = a.#{meth}(*args, &block)
+      replace(a.join)
+      if result.class == Array
+        Integer===result[0] ? result.pack('c*') : result.join
+      elsif result.class == Enumerator
+        result.map(&:join).to_enum
+      else
+        result
+      end
+    end"
+  }
+end
+
+class Enumerator
+  alias old_to_s to_s
+  (Array.instance_methods-instance_methods-[:replace]+[:to_s]).each{|meth|
+    eval"
+    def #{meth}(*args, &block)
+      to_a.#{meth}(*args, &block)
+    end"
+  }
+  alias old_inspect inspect
+  alias inspect old_to_s
+end
diff --git a/goruby.c b/goruby.c
new file mode 100644
index 0000000000..17be654800
--- /dev/null
+++ b/goruby.c
@@ -0,0 +1,24 @@
+void Init_golf(void);
+#define ruby_run_node goruby_run_node
+#include "main.c"
+#undef ruby_run_node
+
+RUBY_EXTERN int ruby_run_node(void*);
+RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
+
+static VALUE
+init_golf(VALUE arg)
+{
+    ruby_init_ext("golf", Init_golf);
+    return arg;
+}
+
+int
+goruby_run_node(void *arg)
+{
+    int state;
+    if (NIL_P(rb_protect(init_golf, Qtrue, &state))) {
+	return state == EXIT_SUCCESS ? EXIT_FAILURE : state;
+    }
+    return ruby_run_node(arg);
+}
diff --git a/hash.c b/hash.c
index 557e3c8b5a..0aa433d3cb 100644
--- a/hash.c
+++ b/hash.c
@@ -3,40 +3,30 @@
   hash.c -
 
   $Author$
-  $Date$
   created at: Mon Nov 22 18:51:18 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "st.h"
-#include "util.h"
-#include "rubysig.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
+#include "ruby/util.h"
+#include <errno.h>
 
 #ifdef __APPLE__
 #include <crt_externs.h>
 #endif
 
+static VALUE rb_hash_s_try_convert(VALUE, VALUE);
+
 #define HASH_DELETED  FL_USER1
 #define HASH_PROC_DEFAULT FL_USER2
 
-static void
-rb_hash_modify(hash)
-    VALUE hash;
-{
-    if (!RHASH(hash)->tbl) rb_raise(rb_eTypeError, "uninitialized Hash");
-    if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
-    if (!OBJ_TAINTED(hash) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
-}
-
 VALUE
-rb_hash_freeze(hash)
-    VALUE hash;
+rb_hash_freeze(VALUE hash)
 {
     return rb_obj_freeze(hash);
 }
@@ -44,86 +34,92 @@ rb_hash_freeze(hash)
 VALUE rb_cHash;
 
 static VALUE envtbl;
-static ID id_hash, id_call, id_default;
-
-static VALUE
-eql(args)
-    VALUE *args;
-{
-    return (VALUE)rb_eql(args[0], args[1]);
-}
+static ID id_hash, id_yield, id_default;
 
 static int
-rb_any_cmp(a, b)
-    VALUE a, b;
+rb_any_cmp(VALUE a, VALUE b)
 {
-    VALUE args[2];
-
     if (a == b) return 0;
     if (FIXNUM_P(a) && FIXNUM_P(b)) {
 	return a != b;
     }
     if (TYPE(a) == T_STRING && RBASIC(a)->klass == rb_cString &&
 	TYPE(b) == T_STRING && RBASIC(b)->klass == rb_cString) {
-	return rb_str_cmp(a, b);
+	return rb_str_hash_cmp(a, b);
     }
     if (a == Qundef || b == Qundef) return -1;
     if (SYMBOL_P(a) && SYMBOL_P(b)) {
 	return a != b;
     }
 
-    args[0] = a;
-    args[1] = b;
-    return !rb_with_disable_interrupt(eql, (VALUE)args);
+    return !rb_eql(a, b);
 }
 
 VALUE
-rb_hash(obj)
-    VALUE obj;
+rb_hash(VALUE obj)
 {
-    return rb_funcall(obj, id_hash, 0);
+    VALUE hval = rb_funcall(obj, id_hash, 0);
+  retry:
+    switch (TYPE(hval)) {
+      case T_FIXNUM:
+	return hval;
+
+      case T_BIGNUM:
+	return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]);
+
+      default:
+	hval = rb_to_int(hval);
+	goto retry;
+    }
 }
 
-static int
-rb_any_hash(a)
-    VALUE a;
+static st_index_t
+rb_any_hash(VALUE a)
 {
     VALUE hval;
+    st_index_t hnum;
 
     switch (TYPE(a)) {
       case T_FIXNUM:
       case T_SYMBOL:
-	return (int)a;
+      case T_NIL:
+      case T_FALSE:
+      case T_TRUE:
+	hnum = rb_hash_end(rb_hash_start((unsigned int)a));
 	break;
 
       case T_STRING:
-	return rb_str_hash(a);
+	hnum = rb_str_hash(a);
 	break;
 
       default:
-	hval = rb_funcall(a, id_hash, 0);
-	if (!FIXNUM_P(hval)) {
-	    hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
-	}
-	return (int)FIX2LONG(hval);
+        hval = rb_hash(a);
+	hnum = FIX2LONG(hval);
     }
+    hnum <<= 1;
+    return (st_index_t)RSHIFT(hnum, 1);
 }
 
-static struct st_hash_type objhash = {
+static const struct st_hash_type objhash = {
     rb_any_cmp,
     rb_any_hash,
 };
 
+static const struct st_hash_type identhash = {
+    st_numcmp,
+    st_numhash,
+};
+
+typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
+
 struct foreach_safe_arg {
     st_table *tbl;
-    int (*func)();
+    st_foreach_func *func;
     st_data_t arg;
 };
 
 static int
-foreach_safe_i(key, value, arg)
-    st_data_t key, value;
-    struct foreach_safe_arg *arg;
+foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
 {
     int status;
 
@@ -136,62 +132,58 @@ foreach_safe_i(key, value, arg)
 }
 
 void
-st_foreach_safe(table, func, a)
-    st_table *table;
-    int (*func)();
-    st_data_t a;
+st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
 {
     struct foreach_safe_arg arg;
 
     arg.tbl = table;
-    arg.func = func;
+    arg.func = (st_foreach_func *)func;
     arg.arg = a;
     if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) {
 	rb_raise(rb_eRuntimeError, "hash modified during iteration");
     }
 }
 
+typedef int rb_foreach_func(VALUE, VALUE, VALUE);
+
 struct hash_foreach_arg {
     VALUE hash;
-    int (*func)();
+    rb_foreach_func *func;
     VALUE arg;
 };
 
 static int
-hash_foreach_iter(key, value, arg)
-    VALUE key, value;
-    struct hash_foreach_arg *arg;
+hash_foreach_iter(st_data_t key, st_data_t value, struct hash_foreach_arg *arg)
 {
     int status;
     st_table *tbl;
 
-    tbl = RHASH(arg->hash)->tbl;    
-    if (key == Qundef) return ST_CONTINUE;
-    status = (*arg->func)(key, value, arg->arg);
-    if (RHASH(arg->hash)->tbl != tbl) {
+    tbl = RHASH(arg->hash)->ntbl;
+    if ((VALUE)key == Qundef) return ST_CONTINUE;
+    status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
+    if (RHASH(arg->hash)->ntbl != tbl) {
 	rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
     }
     switch (status) {
       case ST_DELETE:
- 	st_delete_safe(tbl, (st_data_t*)&key, 0, Qundef);
+	st_delete_safe(tbl, &key, 0, Qundef);
 	FL_SET(arg->hash, HASH_DELETED);
       case ST_CONTINUE:
- 	break;
+	break;
       case ST_STOP:
- 	return ST_STOP;
+	return ST_STOP;
     }
     return ST_CHECK;
 }
 
 static VALUE
-hash_foreach_ensure(hash)
-    VALUE hash;
+hash_foreach_ensure(VALUE hash)
 {
     RHASH(hash)->iter_lev--;
 
     if (RHASH(hash)->iter_lev == 0) {
 	if (FL_TEST(hash, HASH_DELETED)) {
-	    st_cleanup_safe(RHASH(hash)->tbl, Qundef);
+	    st_cleanup_safe(RHASH(hash)->ntbl, Qundef);
 	    FL_UNSET(hash, HASH_DELETED);
 	}
     }
@@ -199,67 +191,109 @@ hash_foreach_ensure(hash)
 }
 
 static VALUE
-hash_foreach_call(arg)
-    struct hash_foreach_arg *arg;
+hash_foreach_call(struct hash_foreach_arg *arg)
 {
-    if (st_foreach(RHASH(arg->hash)->tbl, hash_foreach_iter, (st_data_t)arg)) {
- 	rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    if (st_foreach(RHASH(arg->hash)->ntbl, hash_foreach_iter, (st_data_t)arg)) {
+	rb_raise(rb_eRuntimeError, "hash modified during iteration");
     }
     return Qnil;
 }
 
 void
-rb_hash_foreach(hash, func, farg)
-    VALUE hash;
-    int (*func)();
-    VALUE farg;
+rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
 {
     struct hash_foreach_arg arg;
 
+    if (!RHASH(hash)->ntbl)
+        return;
     RHASH(hash)->iter_lev++;
     arg.hash = hash;
-    arg.func = func;
+    arg.func = (rb_foreach_func *)func;
     arg.arg  = farg;
     rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
 }
 
-static VALUE hash_alloc0 _((VALUE));
-static VALUE hash_alloc _((VALUE));
 static VALUE
-hash_alloc0(klass)
-    VALUE klass;
+hash_alloc(VALUE klass)
 {
     NEWOBJ(hash, struct RHash);
     OBJSETUP(hash, klass, T_HASH);
 
-    hash->ifnone = Qnil;
+    RHASH_IFNONE(hash) = Qnil;
 
     return (VALUE)hash;
 }
 
-static VALUE
-hash_alloc(klass)
-    VALUE klass;
+VALUE
+rb_hash_new(void)
 {
-    VALUE hash = hash_alloc0(klass);
+    return hash_alloc(rb_cHash);
+}
 
-    RHASH(hash)->tbl = st_init_table(&objhash);
+VALUE
+rb_hash_dup(VALUE hash)
+{
+    NEWOBJ(ret, struct RHash);
+    DUPSETUP(ret, hash);
 
-    return hash;
+    if (!RHASH_EMPTY_P(hash))
+        ret->ntbl = st_copy(RHASH(hash)->ntbl);
+    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
+        FL_SET(ret, HASH_PROC_DEFAULT);
+    }
+    RHASH_IFNONE(ret) = RHASH_IFNONE(hash);
+    return (VALUE)ret;
 }
 
-VALUE
-rb_hash_new()
+static void
+rb_hash_modify_check(VALUE hash)
 {
-    return hash_alloc(rb_cHash);
+    if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
+    if (!OBJ_UNTRUSTED(hash) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
+}
+
+struct st_table *
+rb_hash_tbl(VALUE hash)
+{
+    if (!RHASH(hash)->ntbl) {
+        RHASH(hash)->ntbl = st_init_table(&objhash);
+    }
+    return RHASH(hash)->ntbl;
+}
+
+static void
+rb_hash_modify(VALUE hash)
+{
+    rb_hash_modify_check(hash);
+    rb_hash_tbl(hash);
+}
+
+static void
+hash_update(VALUE hash, VALUE key)
+{
+    if (RHASH(hash)->iter_lev > 0 && !st_lookup(RHASH(hash)->ntbl, key, 0)) {
+	rb_raise(rb_eRuntimeError, "can't add a new key into hash during iteration");
+    }
+}
+
+static void
+default_proc_arity_check(VALUE proc)
+{
+    int n = rb_proc_arity(proc);
+
+    if (rb_proc_lambda_p(proc) && n != 2 && (n >= 0 || n < -3)) {
+	if (n < 0) n = -n-1;
+	rb_raise(rb_eTypeError, "default_proc takes two arguments (2 for %d)", n);
+    }
 }
 
 /*
  *  call-seq:
- *     Hash.new                          => hash
- *     Hash.new(obj)                     => aHash
- *     Hash.new {|hash, key| block }     => aHash
- *  
+ *     Hash.new                          -> new_hash
+ *     Hash.new(obj)                     -> new_hash
+ *     Hash.new {|hash, key| block }     -> new_hash
+ *
  *  Returns a new, empty hash. If this hash is subsequently accessed by
  *  a key that doesn't correspond to a hash entry, the value returned
  *  depends on the style of <code>new</code> used to create the hash. In
@@ -269,7 +303,7 @@ rb_hash_new()
  *  called with the hash object and the key, and should return the
  *  default value. It is the block's responsibility to store the value
  *  in the hash if required.
- *     
+ *
  *     h = Hash.new("Go Fish")
  *     h["a"] = 100
  *     h["b"] = 200
@@ -279,21 +313,18 @@ rb_hash_new()
  *     h["c"].upcase!   #=> "GO FISH"
  *     h["d"]           #=> "GO FISH"
  *     h.keys           #=> ["a", "b"]
- *     
+ *
  *     # While this creates a new default object each time
  *     h = Hash.new { |hash, key| hash[key] = "Go Fish: #{key}" }
  *     h["c"]           #=> "Go Fish: c"
  *     h["c"].upcase!   #=> "GO FISH: C"
  *     h["d"]           #=> "Go Fish: d"
  *     h.keys           #=> ["c", "d"]
- *     
+ *
  */
 
 static VALUE
-rb_hash_initialize(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
+rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
 {
     VALUE ifnone;
 
@@ -302,12 +333,14 @@ rb_hash_initialize(argc, argv, hash)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number of arguments");
 	}
-	RHASH(hash)->ifnone = rb_block_proc();
+	ifnone = rb_block_proc();
+	default_proc_arity_check(ifnone);
+	RHASH_IFNONE(hash) = ifnone;
 	FL_SET(hash, HASH_PROC_DEFAULT);
     }
     else {
 	rb_scan_args(argc, argv, "01", &ifnone);
-	RHASH(hash)->ifnone = ifnone;
+	RHASH_IFNONE(hash) = ifnone;
     }
 
     return hash;
@@ -315,33 +348,58 @@ rb_hash_initialize(argc, argv, hash)
 
 /*
  *  call-seq:
- *     Hash[ [key =>|, value]* ]   => hash
- *  
+ *     Hash[ key, value, ... ]         -> new_hash
+ *     Hash[ [ [key, value], ... ] ]   -> new_hash
+ *     Hash[ object ]                  -> new_hash
+ *
  *  Creates a new hash populated with the given objects. Equivalent to
- *  the literal <code>{ <i>key</i>, <i>value</i>, ... }</code>. Keys and
- *  values occur in pairs, so there must be an even number of arguments.
- *     
- *     Hash["a", 100, "b", 200]       #=> {"a"=>100, "b"=>200}
- *     Hash["a" => 100, "b" => 200]   #=> {"a"=>100, "b"=>200}
- *     { "a" => 100, "b" => 200 }     #=> {"a"=>100, "b"=>200}
+ *  the literal <code>{ <i>key</i> => <i>value</i>, ... }</code>. In the first
+ *  form, keys and values occur in pairs, so there must be an even number of arguments.
+ *  The second and third form take a single argument which is either
+ *  an array of key-value pairs or an object convertible to a hash.
+ *
+ *     Hash["a", 100, "b", 200]             #=> {"a"=>100, "b"=>200}
+ *     Hash[ [ ["a", 100], ["b", 200] ] ]   #=> {"a"=>100, "b"=>200}
+ *     Hash["a" => 100, "b" => 200]         #=> {"a"=>100, "b"=>200}
  */
 
 static VALUE
-rb_hash_s_create(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE hash;
+    VALUE hash, tmp;
     int i;
 
-    if (argc == 1 && TYPE(argv[0]) == T_HASH) {
-	hash = hash_alloc0(klass);
-	RHASH(hash)->tbl = st_copy(RHASH(argv[0])->tbl);
+    if (argc == 1) {
+	tmp = rb_hash_s_try_convert(Qnil, argv[0]);
+	if (!NIL_P(tmp)) {
+	    hash = hash_alloc(klass);
+	    if (RHASH(tmp)->ntbl) {
+		RHASH(hash)->ntbl = st_copy(RHASH(tmp)->ntbl);
+	    }
+	    return hash;
+	}
 
-	return hash;
+	tmp = rb_check_array_type(argv[0]);
+	if (!NIL_P(tmp)) {
+	    long i;
+
+	    hash = hash_alloc(klass);
+	    for (i = 0; i < RARRAY_LEN(tmp); ++i) {
+		VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
+		VALUE key, val = Qnil;
+
+		if (NIL_P(v)) continue;
+		switch (RARRAY_LEN(v)) {
+		  case 2:
+		    val = RARRAY_PTR(v)[1];
+		  case 1:
+		    key = RARRAY_PTR(v)[0];
+		    rb_hash_aset(hash, key, val);
+		}
+	    }
+	    return hash;
+	}
     }
-
     if (argc % 2 != 0) {
 	rb_raise(rb_eArgError, "odd number of arguments for Hash");
     }
@@ -355,17 +413,33 @@ rb_hash_s_create(argc, argv, klass)
 }
 
 static VALUE
-to_hash(hash)
-    VALUE hash;
+to_hash(VALUE hash)
 {
     return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
 }
 
+/*
+ *  call-seq:
+ *     Hash.try_convert(obj) -> hash or nil
+ *
+ *  Try to convert <i>obj</i> into a hash, using to_hash method.
+ *  Returns converted hash or nil if <i>obj</i> cannot be converted
+ *  for any reason.
+ *
+ *     Hash.try_convert({1=>2})   # => {1=>2}
+ *     Hash.try_convert("1=>2")   # => nil
+ */
+static VALUE
+rb_hash_s_try_convert(VALUE dummy, VALUE hash)
+{
+    return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
+}
+
 static int
-rb_hash_rehash_i(key, value, tbl)
-    VALUE key, value;
-    st_table *tbl;
+rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
 {
+    st_table *tbl = (st_table *)arg;
+
     if (key != Qundef) st_insert(tbl, key, value);
     return ST_CONTINUE;
 }
@@ -373,13 +447,13 @@ rb_hash_rehash_i(key, value, tbl)
 /*
  *  call-seq:
  *     hsh.rehash -> hsh
- *  
+ *
  *  Rebuilds the hash based on the current hash values for each key. If
  *  values of key objects have changed since they were inserted, this
  *  method will reindex <i>hsh</i>. If <code>Hash#rehash</code> is
  *  called while an iterator is traversing the hash, an
- *  <code>IndexError</code> will be raised in the iterator.
- *     
+ *  <code>RuntimeError</code> will be raised in the iterator.
+ *
  *     a = [ "a", "b" ]
  *     c = [ "c", "d" ]
  *     h = { a => 100, c => 300 }
@@ -391,80 +465,97 @@ rb_hash_rehash_i(key, value, tbl)
  */
 
 static VALUE
-rb_hash_rehash(hash)
-    VALUE hash;
+rb_hash_rehash(VALUE hash)
 {
     st_table *tbl;
 
-    rb_hash_modify(hash);
-    tbl = st_init_table_with_size(&objhash, RHASH(hash)->tbl->num_entries);
-    rb_hash_foreach(hash, rb_hash_rehash_i, (st_data_t)tbl);
-    st_free_table(RHASH(hash)->tbl);
-    RHASH(hash)->tbl = tbl;
+    if (RHASH(hash)->iter_lev > 0) {
+	rb_raise(rb_eRuntimeError, "rehash during iteration");
+    }
+    rb_hash_modify_check(hash);
+    if (!RHASH(hash)->ntbl)
+        return hash;
+    tbl = st_init_table_with_size(RHASH(hash)->ntbl->type, RHASH(hash)->ntbl->num_entries);
+    rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tbl);
+    st_free_table(RHASH(hash)->ntbl);
+    RHASH(hash)->ntbl = tbl;
 
     return hash;
 }
 
 /*
  *  call-seq:
- *     hsh[key]    =>  value
- *  
+ *     hsh[key]    ->  value
+ *
  *  Element Reference---Retrieves the <i>value</i> object corresponding
- *  to the <i>key</i> object. If not found, returns the a default value (see
+ *  to the <i>key</i> object. If not found, returns the default value (see
  *  <code>Hash::new</code> for details).
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h["a"]   #=> 100
  *     h["c"]   #=> nil
- *     
+ *
  */
 
 VALUE
-rb_hash_aref(hash, key)
-    VALUE hash, key;
+rb_hash_aref(VALUE hash, VALUE key)
 {
     VALUE val;
 
-    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
+    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
 	return rb_funcall(hash, id_default, 1, key);
     }
     return val;
 }
 
+VALUE
+rb_hash_lookup2(VALUE hash, VALUE key, VALUE def)
+{
+    VALUE val;
+
+    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+	return def; /* without Hash#default */
+    }
+    return val;
+}
+
+VALUE
+rb_hash_lookup(VALUE hash, VALUE key)
+{
+    return rb_hash_lookup2(hash, key, Qnil);
+}
+
 /*
  *  call-seq:
- *     hsh.fetch(key [, default] )       => obj
- *     hsh.fetch(key) {| key | block }   => obj
- *  
+ *     hsh.fetch(key [, default] )       -> obj
+ *     hsh.fetch(key) {| key | block }   -> obj
+ *
  *  Returns a value from the hash for the given key. If the key can't be
  *  found, there are several options: With no other arguments, it will
- *  raise an <code>IndexError</code> exception; if <i>default</i> is
+ *  raise an <code>KeyError</code> exception; if <i>default</i> is
  *  given, then that will be returned; if the optional code block is
  *  specified, then that will be run and its result returned.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.fetch("a")                            #=> 100
  *     h.fetch("z", "go fish")                 #=> "go fish"
  *     h.fetch("z") { |el| "go fish, #{el}"}   #=> "go fish, z"
- *     
+ *
  *  The following example shows that an exception is raised if the key
  *  is not found and a default value is not supplied.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.fetch("z")
- *     
+ *
  *  <em>produces:</em>
- *     
- *     prog.rb:2:in `fetch': key not found (IndexError)
+ *
+ *     prog.rb:2:in `fetch': key not found (KeyError)
  *      from prog.rb:2
- *     
+ *
  */
 
 static VALUE
-rb_hash_fetch(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
+rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
 {
     VALUE key, if_none;
     VALUE val;
@@ -476,61 +567,69 @@ rb_hash_fetch(argc, argv, hash)
     if (block_given && argc == 2) {
 	rb_warn("block supersedes default value argument");
     }
-    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
+    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
 	if (block_given) return rb_yield(key);
 	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "key not found");
+	    volatile VALUE desc = rb_protect(rb_inspect, key, 0);
+	    if (NIL_P(desc) || RSTRING_LEN(desc) > 65) {
+		desc = rb_any_to_s(key);
+	    }
+	    rb_raise(rb_eKeyError, "key not found: %s", RSTRING_PTR(desc));
 	}
 	return if_none;
     }
     return val;
 }
 
+VALUE
+rb_hash_fetch(VALUE hash, VALUE key)
+{
+    return rb_hash_fetch_m(1, &key, hash);
+}
+
 /*
  *  call-seq:
- *     hsh.default(key=nil)   => obj
- *  
+ *     hsh.default(key=nil)   -> obj
+ *
  *  Returns the default value, the value that would be returned by
  *  <i>hsh</i>[<i>key</i>] if <i>key</i> did not exist in <i>hsh</i>.
  *  See also <code>Hash::new</code> and <code>Hash#default=</code>.
- *     
+ *
  *     h = Hash.new                            #=> {}
  *     h.default                               #=> nil
  *     h.default(2)                            #=> nil
- *     
+ *
  *     h = Hash.new("cat")                     #=> {}
  *     h.default                               #=> "cat"
  *     h.default(2)                            #=> "cat"
- *     
+ *
  *     h = Hash.new {|h,k| h[k] = k.to_i*10}   #=> {}
- *     h.default                               #=> 0
+ *     h.default                               #=> nil
  *     h.default(2)                            #=> 20
  */
 
 static VALUE
-rb_hash_default(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
+rb_hash_default(int argc, VALUE *argv, VALUE hash)
 {
-    VALUE key;
+    VALUE key, ifnone;
 
     rb_scan_args(argc, argv, "01", &key);
+    ifnone = RHASH_IFNONE(hash);
     if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
 	if (argc == 0) return Qnil;
-	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, key);
+	return rb_funcall(ifnone, id_yield, 2, hash, key);
     }
-    return RHASH(hash)->ifnone;
+    return ifnone;
 }
 
 /*
  *  call-seq:
- *     hsh.default = obj     => hsh
- *  
+ *     hsh.default = obj     -> obj
+ *
  *  Sets the default value, the value returned for a key that does not
- *  exist in the hash. It is not possible to set the a default to a
+ *  exist in the hash. It is not possible to set the default to a
  *  <code>Proc</code> that will be executed on each key lookup.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.default = "Go fish"
  *     h["a"]     #=> 100
@@ -544,11 +643,10 @@ rb_hash_default(argc, argv, hash)
  */
 
 static VALUE
-rb_hash_set_default(hash, ifnone)
-    VALUE hash, ifnone;
+rb_hash_set_default(VALUE hash, VALUE ifnone)
 {
     rb_hash_modify(hash);
-    RHASH(hash)->ifnone = ifnone;
+    RHASH_IFNONE(hash) = ifnone;
     FL_UNSET(hash, HASH_PROC_DEFAULT);
     return ifnone;
 }
@@ -556,10 +654,10 @@ rb_hash_set_default(hash, ifnone)
 /*
  *  call-seq:
  *     hsh.default_proc -> anObject
- *  
+ *
  *  If <code>Hash::new</code> was invoked with a block, return that
  *  block, otherwise return <code>nil</code>.
- *     
+ *
  *     h = Hash.new {|h,k| h[k] = k*k }   #=> {}
  *     p = h.default_proc                 #=> #<Proc:0x401b3d08@-:1>
  *     a = []                             #=> []
@@ -569,119 +667,131 @@ rb_hash_set_default(hash, ifnone)
 
 
 static VALUE
-rb_hash_default_proc(hash)
-    VALUE hash;
+rb_hash_default_proc(VALUE hash)
 {
     if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
-	return RHASH(hash)->ifnone;
+	return RHASH_IFNONE(hash);
     }
     return Qnil;
 }
 
-static int
-index_i(key, value, args)
-    VALUE key, value;
-    VALUE *args;
+VALUE rb_obj_is_proc(VALUE proc);
+
+/*
+ *  call-seq:
+ *     hsh.default_proc = proc_obj     -> proc_obj
+ *
+ *  Sets the default proc to be executed on each key lookup.
+ *
+ *     h.default_proc = proc do |hash, key|
+ *       hash[key] = key + key
+ *     end
+ *     h[2]       #=> 4
+ *     h["cat"]   #=> "catcat"
+ */
+
+static VALUE
+rb_hash_set_default_proc(VALUE hash, VALUE proc)
 {
-    if (rb_equal(value, args[0])) {
-	args[1] = key;
-	return ST_STOP;
+    VALUE b;
+
+    rb_hash_modify(hash);
+    b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
+    if (NIL_P(b) || !rb_obj_is_proc(b)) {
+	rb_raise(rb_eTypeError,
+		 "wrong default_proc type %s (expected Proc)",
+		 rb_obj_classname(proc));
     }
-    return ST_CONTINUE;
+    proc = b;
+    default_proc_arity_check(proc);
+    RHASH_IFNONE(hash) = proc;
+    FL_SET(hash, HASH_PROC_DEFAULT);
+    return proc;
 }
 
-static VALUE
-rb_hash_delete_key(hash, key)
-    VALUE hash, key;
+static int
+key_i(VALUE key, VALUE value, VALUE arg)
 {
-    st_data_t ktmp = (st_data_t)key, val;
+    VALUE *args = (VALUE *)arg;
 
-    if (RHASH(hash)->iter_lev > 0) {
-	if (st_delete_safe(RHASH(hash)->tbl, &ktmp, &val, Qundef)) {
-	    FL_SET(hash, HASH_DELETED);
-	    return (VALUE)val;
-	}
+    if (rb_equal(value, args[0])) {
+	args[1] = key;
+	return ST_STOP;
     }
-    else if (st_delete(RHASH(hash)->tbl, &ktmp, &val))
-	return (VALUE)val;
-    return Qundef;
+    return ST_CONTINUE;
 }
 
 /*
  *  call-seq:
- *     hsh.index(value)    => key
- *  
+ *     hsh.key(value)    -> key
+ *
  *  Returns the key for a given value. If not found, returns <code>nil</code>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
- *     h.index(200)   #=> "b"
- *     h.index(999)   #=> nil
- *     
+ *     h.key(200)   #=> "b"
+ *     h.key(999)   #=> nil
+ *
  */
 
 static VALUE
-rb_hash_index(hash, value)
-    VALUE hash, value;
+rb_hash_key(VALUE hash, VALUE value)
 {
     VALUE args[2];
 
     args[0] = value;
     args[1] = Qnil;
 
-    rb_hash_foreach(hash, index_i, (st_data_t)args);
+    rb_hash_foreach(hash, key_i, (VALUE)args);
 
     return args[1];
 }
 
-/*
- *  call-seq:
- *     hsh.indexes(key, ...)    => array
- *     hsh.indices(key, ...)    => array
- *  
- *  Deprecated in favor of <code>Hash#select</code>.
- *     
- */
+/* :nodoc: */
+static VALUE
+rb_hash_index(VALUE hash, VALUE value)
+{
+    rb_warn("Hash#index is deprecated; use Hash#key");
+    return rb_hash_key(hash, value);
+}
 
 static VALUE
-rb_hash_indexes(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
+rb_hash_delete_key(VALUE hash, VALUE key)
 {
-    VALUE indexes;
-    int i;
+    st_data_t ktmp = (st_data_t)key, val;
 
-    rb_warn("Hash#%s is deprecated; use Hash#values_at",
-	    rb_id2name(rb_frame_last_func()));
-    indexes = rb_ary_new2(argc);
-    for (i=0; i<argc; i++) {
-	RARRAY(indexes)->ptr[i] = rb_hash_aref(hash, argv[i]);
-	RARRAY(indexes)->len++;
+    if (!RHASH(hash)->ntbl)
+        return Qundef;
+    if (RHASH(hash)->iter_lev > 0) {
+	if (st_delete_safe(RHASH(hash)->ntbl, &ktmp, &val, Qundef)) {
+	    FL_SET(hash, HASH_DELETED);
+	    return (VALUE)val;
+	}
     }
-    return indexes;
+    else if (st_delete(RHASH(hash)->ntbl, &ktmp, &val))
+	return (VALUE)val;
+    return Qundef;
 }
 
 /*
  *  call-seq:
- *     hsh.delete(key)                   => value
- *     hsh.delete(key) {| key | block }  => value
- *  
+ *     hsh.delete(key)                   -> value
+ *     hsh.delete(key) {| key | block }  -> value
+ *
  *  Deletes and returns a key-value pair from <i>hsh</i> whose key is
  *  equal to <i>key</i>. If the key is not found, returns the
  *  <em>default value</em>. If the optional code block is given and the
  *  key is not found, pass in the key and return the result of
  *  <i>block</i>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.delete("a")                              #=> 100
  *     h.delete("z")                              #=> nil
  *     h.delete("z") { |el| "#{el} not found" }   #=> "z not found"
- *     
+ *
  */
 
 VALUE
-rb_hash_delete(hash, key)
-    VALUE hash, key;
+rb_hash_delete(VALUE hash, VALUE key)
 {
     VALUE val;
 
@@ -700,10 +810,10 @@ struct shift_var {
 };
 
 static int
-shift_i(key, value, var)
-    VALUE key, value;
-    struct shift_var *var;
+shift_i(VALUE key, VALUE value, VALUE arg)
 {
+    struct shift_var *var = (struct shift_var *)arg;
+
     if (key == Qundef) return ST_CONTINUE;
     if (var->key != Qundef) return ST_STOP;
     var->key = key;
@@ -712,10 +822,10 @@ shift_i(key, value, var)
 }
 
 static int
-shift_i_safe(key, value, var)
-    VALUE key, value;
-    struct shift_var *var;
+shift_i_safe(VALUE key, VALUE value, VALUE arg)
 {
+    struct shift_var *var = (struct shift_var *)arg;
+
     if (key == Qundef) return ST_CONTINUE;
     var->key = key;
     var->val = value;
@@ -725,51 +835,42 @@ shift_i_safe(key, value, var)
 /*
  *  call-seq:
  *     hsh.shift -> anArray or obj
- *  
+ *
  *  Removes a key-value pair from <i>hsh</i> and returns it as the
  *  two-item array <code>[</code> <i>key, value</i> <code>]</code>, or
  *  the hash's default value if the hash is empty.
- *     
+ *
  *     h = { 1 => "a", 2 => "b", 3 => "c" }
  *     h.shift   #=> [1, "a"]
  *     h         #=> {2=>"b", 3=>"c"}
  */
 
 static VALUE
-rb_hash_shift(hash)
-    VALUE hash;
+rb_hash_shift(VALUE hash)
 {
     struct shift_var var;
 
     rb_hash_modify(hash);
     var.key = Qundef;
-    if (RHASH(hash)->iter_lev > 0) {
-	rb_hash_foreach(hash, shift_i_safe, (st_data_t)&var);
-	if (var.key != Qundef) {
-	    st_data_t key = var.key;
-	    if (st_delete_safe(RHASH(hash)->tbl, &key, 0, Qundef)) {
-		FL_SET(hash, HASH_DELETED);
-	    }
-	}
-    }
-    else {
-	rb_hash_foreach(hash, shift_i, (st_data_t)&var);
-    }
+    rb_hash_foreach(hash, RHASH(hash)->iter_lev > 0 ? shift_i_safe : shift_i,
+		    (VALUE)&var);
 
     if (var.key != Qundef) {
+	if (RHASH(hash)->iter_lev > 0) {
+	    rb_hash_delete_key(hash, var.key);
+	}
 	return rb_assoc_new(var.key, var.val);
     }
     else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
-	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, Qnil);
+	return rb_funcall(RHASH_IFNONE(hash), id_yield, 2, hash, Qnil);
     }
     else {
-	return RHASH(hash)->ifnone;
+	return RHASH_IFNONE(hash);
     }
 }
 
 static int
-delete_if_i(key, value, hash)
-    VALUE key, value, hash;
+delete_if_i(VALUE key, VALUE value, VALUE hash)
 {
     if (key == Qundef) return ST_CONTINUE;
     if (RTEST(rb_yield_values(2, key, value))) {
@@ -781,19 +882,22 @@ delete_if_i(key, value, hash)
 /*
  *  call-seq:
  *     hsh.delete_if {| key, value | block }  -> hsh
- *  
+ *     hsh.delete_if                          -> an_enumerator
+ *
  *  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
  *  evaluates to <code>true</code>.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     h = { "a" => 100, "b" => 200, "c" => 300 }
  *     h.delete_if {|key, value| key >= "b" }   #=> {"a"=>100}
- *     
+ *
  */
 
 VALUE
-rb_hash_delete_if(hash)
-    VALUE hash;
+rb_hash_delete_if(VALUE hash)
 {
+    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_modify(hash);
     rb_hash_foreach(hash, delete_if_i, hash);
     return hash;
@@ -802,66 +906,58 @@ rb_hash_delete_if(hash)
 /*
  *  call-seq:
  *     hsh.reject! {| key, value | block }  -> hsh or nil
- *  
+ *     hsh.reject!                          -> an_enumerator
+ *
  *  Equivalent to <code>Hash#delete_if</code>, but returns
  *  <code>nil</code> if no changes were made.
  */
 
 VALUE
-rb_hash_reject_bang(hash)
-    VALUE hash;
+rb_hash_reject_bang(VALUE hash)
 {
-    int n = RHASH(hash)->tbl->num_entries;
-    rb_hash_delete_if(hash);
-    if (n == RHASH(hash)->tbl->num_entries) return Qnil;
+    st_index_t n;
+
+    RETURN_ENUMERATOR(hash, 0, 0);
+    rb_hash_modify(hash);
+    if (!RHASH(hash)->ntbl)
+        return Qnil;
+    n = RHASH(hash)->ntbl->num_entries;
+    rb_hash_foreach(hash, delete_if_i, hash);
+    if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
     return hash;
 }
 
 /*
  *  call-seq:
  *     hsh.reject {| key, value | block }  -> a_hash
- *  
+ *
  *  Same as <code>Hash#delete_if</code>, but works on (and returns) a
  *  copy of the <i>hsh</i>. Equivalent to
  *  <code><i>hsh</i>.dup.delete_if</code>.
- *     
+ *
  */
 
 static VALUE
-rb_hash_reject(hash)
-    VALUE hash;
+rb_hash_reject(VALUE hash)
 {
     return rb_hash_delete_if(rb_obj_dup(hash));
 }
 
-static int
-select_i(key, value, result)
-    VALUE key, value, result;
-{
-    if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_yield_values(2, key, value)))
-	rb_ary_push(result, rb_assoc_new(key, value));
-    return ST_CONTINUE;
-}
-
 /*
  * call-seq:
- *   hsh.values_at(key, ...)   => array
+ *   hsh.values_at(key, ...)   -> array
  *
  * Return an array containing the values associated with the given keys.
  * Also see <code>Hash.select</code>.
  *
  *   h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
  *   h.values_at("cow", "cat")  #=> ["bovine", "feline"]
-*/
+ */
 
 VALUE
-rb_hash_values_at(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
+rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
 {
-    VALUE result = rb_ary_new();
+    VALUE result = rb_ary_new2(argc);
     long i;
 
     for (i=0; i<argc; i++) {
@@ -870,38 +966,97 @@ rb_hash_values_at(argc, argv, hash)
     return result;
 }
 
+static int
+select_i(VALUE key, VALUE value, VALUE result)
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (RTEST(rb_yield_values(2, key, value)))
+	rb_hash_aset(result, key, value);
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
- *     hsh.select {|key, value| block}   => array
- *  
- *  Returns a new array consisting of <code>[key,value]</code>
- *  pairs for which the block returns true.
- *  Also see <code>Hash.values_at</code>.
- *     
+ *     hsh.select {|key, value| block}   -> a_hash
+ *     hsh.select                        -> an_enumerator
+ *
+ *  Returns a new hash consisting of entries for which the block returns true.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     h = { "a" => 100, "b" => 200, "c" => 300 }
- *     h.select {|k,v| k > "a"}  #=> [["b", 200], ["c", 300]]
- *     h.select {|k,v| v < 200}  #=> [["a", 100]]
+ *     h.select {|k,v| k > "a"}  #=> {"b" => 200, "c" => 300}
+ *     h.select {|k,v| v < 200}  #=> {"a" => 100}
  */
 
 VALUE
-rb_hash_select(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
+rb_hash_select(VALUE hash)
 {
     VALUE result;
 
-    if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
-    }
-    result = rb_ary_new();
+    RETURN_ENUMERATOR(hash, 0, 0);
+    result = rb_hash_new();
     rb_hash_foreach(hash, select_i, result);
     return result;
 }
 
 static int
-clear_i(key, value, dummy)
-    VALUE key, value, dummy;
+keep_if_i(VALUE key, VALUE value, VALUE hash)
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (!RTEST(rb_yield_values(2, key, value))) {
+	return ST_DELETE;
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.select! {| key, value | block }  -> hsh or nil
+ *     hsh.select!                          -> an_enumerator
+ *
+ *  Equivalent to <code>Hash#keep_if</code>, but returns
+ *  <code>nil</code> if no changes were made.
+ */
+
+VALUE
+rb_hash_select_bang(VALUE hash)
+{
+    st_index_t n;
+
+    RETURN_ENUMERATOR(hash, 0, 0);
+    rb_hash_modify(hash);
+    if (!RHASH(hash)->ntbl)
+        return Qnil;
+    n = RHASH(hash)->ntbl->num_entries;
+    rb_hash_foreach(hash, keep_if_i, hash);
+    if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     hsh.keep_if {| key, value | block }  -> hsh
+ *     hsh.keep_if                          -> an_enumerator
+ *
+ *  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
+ *  evaluates to false.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ */
+
+VALUE
+rb_hash_keep_if(VALUE hash)
+{
+    RETURN_ENUMERATOR(hash, 0, 0);
+    rb_hash_modify(hash);
+    rb_hash_foreach(hash, keep_if_i, hash);
+    return hash;
+}
+
+static int
+clear_i(VALUE key, VALUE value, VALUE dummy)
 {
     return ST_DELETE;
 }
@@ -909,21 +1064,25 @@ clear_i(key, value, dummy)
 /*
  *  call-seq:
  *     hsh.clear -> hsh
- *  
+ *
  *  Removes all key-value pairs from <i>hsh</i>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }   #=> {"a"=>100, "b"=>200}
  *     h.clear                          #=> {}
- *     
+ *
  */
 
 static VALUE
-rb_hash_clear(hash)
-    VALUE hash;
+rb_hash_clear(VALUE hash)
 {
-    rb_hash_modify(hash);
-    if (RHASH(hash)->tbl->num_entries > 0) {
-	rb_hash_foreach(hash, clear_i, 0);
+    rb_hash_modify_check(hash);
+    if (!RHASH(hash)->ntbl)
+        return hash;
+    if (RHASH(hash)->ntbl->num_entries > 0) {
+	if (RHASH(hash)->iter_lev > 0)
+	    rb_hash_foreach(hash, clear_i, 0);
+	else
+	    st_clear(RHASH(hash)->ntbl);
     }
 
     return hash;
@@ -931,39 +1090,38 @@ rb_hash_clear(hash)
 
 /*
  *  call-seq:
- *     hsh[key] = value        => value
- *     hsh.store(key, value)   => value
- *  
+ *     hsh[key] = value        -> value
+ *     hsh.store(key, value)   -> value
+ *
  *  Element Assignment---Associates the value given by
  *  <i>value</i> with the key given by <i>key</i>.
  *  <i>key</i> should not have its value changed while it is in
  *  use as a key (a <code>String</code> passed as a key will be
  *  duplicated and frozen).
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h["a"] = 9
  *     h["c"] = 4
  *     h   #=> {"a"=>9, "b"=>200, "c"=>4}
- *     
+ *
  */
 
 VALUE
-rb_hash_aset(hash, key, val)
-    VALUE hash, key, val;
+rb_hash_aset(VALUE hash, VALUE key, VALUE val)
 {
     rb_hash_modify(hash);
-    if (TYPE(key) != T_STRING || st_lookup(RHASH(hash)->tbl, key, 0)) {
-	st_insert(RHASH(hash)->tbl, key, val);
+    hash_update(hash, key);
+    if (RHASH(hash)->ntbl->type == &identhash || rb_obj_class(key) != rb_cString) {
+	st_insert(RHASH(hash)->ntbl, key, val);
     }
     else {
-	st_add_direct(RHASH(hash)->tbl, rb_str_new4(key), val);
+	st_insert2(RHASH(hash)->ntbl, key, val, rb_str_new4);
     }
     return val;
 }
 
 static int
-replace_i(key, val, hash)
-    VALUE key, val, hash;
+replace_i(VALUE key, VALUE val, VALUE hash)
 {
     if (key != Qundef) {
 	rb_hash_aset(hash, key, val);
@@ -975,24 +1133,28 @@ replace_i(key, val, hash)
 /*
  *  call-seq:
  *     hsh.replace(other_hash) -> hsh
- *  
+ *
  *  Replaces the contents of <i>hsh</i> with the contents of
  *  <i>other_hash</i>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.replace({ "c" => 300, "d" => 400 })   #=> {"c"=>300, "d"=>400}
- *     
+ *
  */
 
 static VALUE
-rb_hash_replace(hash, hash2)
-    VALUE hash, hash2;
+rb_hash_replace(VALUE hash, VALUE hash2)
 {
+    rb_hash_modify_check(hash);
     hash2 = to_hash(hash2);
     if (hash == hash2) return hash;
     rb_hash_clear(hash);
+    if (RHASH(hash2)->ntbl) {
+	rb_hash_tbl(hash);
+	RHASH(hash)->ntbl->type = RHASH(hash2)->ntbl->type;
+    }
     rb_hash_foreach(hash2, replace_i, hash);
-    RHASH(hash)->ifnone = RHASH(hash2)->ifnone;
+    RHASH_IFNONE(hash) = RHASH_IFNONE(hash2);
     if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
 	FL_SET(hash, HASH_PROC_DEFAULT);
     }
@@ -1005,11 +1167,11 @@ rb_hash_replace(hash, hash2)
 
 /*
  *  call-seq:
- *     hsh.length    =>  fixnum
- *     hsh.size      =>  fixnum
- *  
+ *     hsh.length    ->  fixnum
+ *     hsh.size      ->  fixnum
+ *
  *  Returns the number of key-value pairs in the hash.
- *     
+ *
  *     h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
  *     h.length        #=> 4
  *     h.delete("a")   #=> 200
@@ -1017,35 +1179,32 @@ rb_hash_replace(hash, hash2)
  */
 
 static VALUE
-rb_hash_size(hash)
-    VALUE hash;
+rb_hash_size(VALUE hash)
 {
-    return INT2FIX(RHASH(hash)->tbl->num_entries);
+    if (!RHASH(hash)->ntbl)
+        return INT2FIX(0);
+    return INT2FIX(RHASH(hash)->ntbl->num_entries);
 }
 
 
 /*
  *  call-seq:
- *     hsh.empty?    => true or false
- *  
+ *     hsh.empty?    -> true or false
+ *
  *  Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
- *     
+ *
  *     {}.empty?   #=> true
- *     
+ *
  */
 
 static VALUE
-rb_hash_empty_p(hash)
-    VALUE hash;
+rb_hash_empty_p(VALUE hash)
 {
-    if (RHASH(hash)->tbl->num_entries == 0)
-	return Qtrue;
-    return Qfalse;
+    return RHASH_EMPTY_P(hash) ? Qtrue : Qfalse;
 }
 
 static int
-each_value_i(key, value)
-    VALUE key, value;
+each_value_i(VALUE key, VALUE value)
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_yield(value);
@@ -1055,30 +1214,32 @@ each_value_i(key, value)
 /*
  *  call-seq:
  *     hsh.each_value {| value | block } -> hsh
- *  
+ *     hsh.each_value                    -> an_enumerator
+ *
  *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the
  *  value as a parameter.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.each_value {|value| puts value }
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     100
  *     200
  */
 
 static VALUE
-rb_hash_each_value(hash)
-    VALUE hash;
+rb_hash_each_value(VALUE hash)
 {
+    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_value_i, 0);
     return hash;
 }
 
 static int
-each_key_i(key, value)
-    VALUE key, value;
+each_key_i(VALUE key, VALUE value)
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_yield(key);
@@ -1088,63 +1249,31 @@ each_key_i(key, value)
 /*
  *  call-seq:
  *     hsh.each_key {| key | block } -> hsh
- *  
+ *     hsh.each_key                  -> an_enumerator
+ *
  *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
  *  as a parameter.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.each_key {|key| puts key }
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     a
  *     b
  */
 static VALUE
-rb_hash_each_key(hash)
-    VALUE hash;
+rb_hash_each_key(VALUE hash)
 {
+    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_key_i, 0);
     return hash;
 }
 
 static int
-each_pair_i(key, value)
-    VALUE key, value;
-{
-    if (key == Qundef) return ST_CONTINUE;
-    rb_yield_values(2, key, value);
-    return ST_CONTINUE;
-}
-
-/*
- *  call-seq:
- *     hsh.each_pair {| key_value_array | block } -> hsh
- *  
- *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
- *  and value as parameters.
- *     
- *     h = { "a" => 100, "b" => 200 }
- *     h.each_pair {|key, value| puts "#{key} is #{value}" }
- *     
- *  <em>produces:</em>
- *     
- *     a is 100
- *     b is 200
- *     
- */
-
-static VALUE
-rb_hash_each_pair(hash)
-    VALUE hash;
-{
-    rb_hash_foreach(hash, each_pair_i, 0);
-    return hash;
-}
-
-static int
-each_i(key, value)
-    VALUE key, value;
+each_pair_i(VALUE key, VALUE value)
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_yield(rb_assoc_new(key, value));
@@ -1153,35 +1282,36 @@ each_i(key, value)
 
 /*
  *  call-seq:
- *     hsh.each {| key, value | block } -> hsh
- *  
- *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
- *  and value to the block as a two-element array. Because of the assignment
- *  semantics of block parameters, these elements will be split out if the
- *  block has two formal parameters. Also see <code>Hash.each_pair</code>, which
- *  will be marginally more efficient for blocks with two parameters.
- *     
+ *     hsh.each      {| key, value | block } -> hsh
+ *     hsh.each_pair {| key, value | block } -> hsh
+ *     hsh.each                              -> an_enumerator
+ *     hsh.each_pair                         -> an_enumerator
+ *
+ *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key-value
+ *  pair as parameters.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.each {|key, value| puts "#{key} is #{value}" }
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     a is 100
  *     b is 200
- *     
+ *
  */
 
 static VALUE
-rb_hash_each(hash)
-    VALUE hash;
+rb_hash_each_pair(VALUE hash)
 {
-    rb_hash_foreach(hash, each_i, 0);
+    RETURN_ENUMERATOR(hash, 0, 0);
+    rb_hash_foreach(hash, each_pair_i, 0);
     return hash;
 }
 
 static int
-to_a_i(key, value, ary)
-    VALUE key, value, ary;
+to_a_i(VALUE key, VALUE value, VALUE ary)
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_ary_push(ary, rb_assoc_new(key, value));
@@ -1191,59 +1321,33 @@ to_a_i(key, value, ary)
 /*
  *  call-seq:
  *     hsh.to_a -> array
- *  
+ *
  *  Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
  *  value</i> <code>]</code> arrays.
- *     
+ *
  *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
- *     h.to_a   #=> [["a", 100], ["c", 300], ["d", 400]]
+ *     h.to_a   #=> [["c", 300], ["a", 100], ["d", 400]]
  */
 
 static VALUE
-rb_hash_to_a(hash)
-    VALUE hash;
+rb_hash_to_a(VALUE hash)
 {
     VALUE ary;
 
     ary = rb_ary_new();
     rb_hash_foreach(hash, to_a_i, ary);
-    if (OBJ_TAINTED(hash)) OBJ_TAINT(ary);
+    OBJ_INFECT(ary, hash);
 
     return ary;
 }
 
-/*
- *  call-seq:
- *     hsh.sort                    => array 
- *     hsh.sort {| a, b | block }  => array 
- * 
- *  Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
- *  value</i> <code>]</code> arrays and sorts it, using
- *  <code>Array#sort</code>.
- *     
- *     h = { "a" => 20, "b" => 30, "c" => 10  }
- *     h.sort                       #=> [["a", 20], ["b", 30], ["c", 10]]
- *     h.sort {|a,b| a[1]<=>b[1]}   #=> [["c", 10], ["a", 20], ["b", 30]]
- *     
- */
-
-static VALUE
-rb_hash_sort(hash)
-    VALUE hash;
-{
-    VALUE entries = rb_hash_to_a(hash);
-    rb_ary_sort_bang(entries);
-    return entries;
-}
-
 static int
-inspect_i(key, value, str)
-    VALUE key, value, str;
+inspect_i(VALUE key, VALUE value, VALUE str)
 {
     VALUE str2;
 
     if (key == Qundef) return ST_CONTINUE;
-    if (RSTRING(str)->len > 1) {
+    if (RSTRING_LEN(str) > 1) {
 	rb_str_cat2(str, ", ");
     }
     str2 = rb_inspect(key);
@@ -1258,11 +1362,11 @@ inspect_i(key, value, str)
 }
 
 static VALUE
-inspect_hash(hash)
-    VALUE hash;
+inspect_hash(VALUE hash, VALUE dummy, int recur)
 {
     VALUE str;
 
+    if (recur) return rb_usascii_str_new2("{...}");
     str = rb_str_buf_new2("{");
     rb_hash_foreach(hash, inspect_i, str);
     rb_str_buf_cat2(str, "}");
@@ -1273,66 +1377,38 @@ inspect_hash(hash)
 
 /*
  * call-seq:
- *   hsh.inspect  => string
+ *   hsh.to_s     -> string
+ *   hsh.inspect  -> string
  *
  * Return the contents of this hash as a string.
- */
-
-static VALUE
-rb_hash_inspect(hash)
-    VALUE hash;
-{
-    if (RHASH(hash)->tbl == 0 || RHASH(hash)->tbl->num_entries == 0)
-	return rb_str_new2("{}");
-    if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
-    return rb_protect_inspect(inspect_hash, hash, 0);
-}
-
-static VALUE
-to_s_hash(hash)
-    VALUE hash;
-{
-    return rb_ary_to_s(rb_hash_to_a(hash));
-}
-
-/*
- *  call-seq:
- *     hsh.to_s   => string
- *  
- *  Converts <i>hsh</i> to a string by converting the hash to an array
- *  of <code>[</code> <i>key, value</i> <code>]</code> pairs and then
- *  converting that array to a string using <code>Array#join</code> with
- *  the default separator.
- *     
+ *
  *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
- *     h.to_s   #=> "a100c300d400"
+ *     h.to_s   #=> "{\"c\"=>300, \"a\"=>100, \"d\"=>400}"
  */
 
 static VALUE
-rb_hash_to_s(hash)
-    VALUE hash;
+rb_hash_inspect(VALUE hash)
 {
-    if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
-    return rb_protect_inspect(to_s_hash, hash, 0);
+    if (RHASH_EMPTY_P(hash))
+	return rb_usascii_str_new2("{}");
+    return rb_exec_recursive(inspect_hash, hash, 0);
 }
 
 /*
  * call-seq:
  *    hsh.to_hash   => hsh
  *
- * Returns <i>self</i>.
+ * Returns +self+.
  */
 
 static VALUE
-rb_hash_to_hash(hash)
-    VALUE hash;
+rb_hash_to_hash(VALUE hash)
 {
     return hash;
 }
 
 static int
-keys_i(key, value, ary)
-    VALUE key, value, ary;
+keys_i(VALUE key, VALUE value, VALUE ary)
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_ary_push(ary, key);
@@ -1341,19 +1417,18 @@ keys_i(key, value, ary)
 
 /*
  *  call-seq:
- *     hsh.keys    => array
- *  
+ *     hsh.keys    -> array
+ *
  *  Returns a new array populated with the keys from this hash. See also
  *  <code>Hash#values</code>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200, "c" => 300, "d" => 400 }
  *     h.keys   #=> ["a", "b", "c", "d"]
- *     
+ *
  */
 
 static VALUE
-rb_hash_keys(hash)
-    VALUE hash;
+rb_hash_keys(VALUE hash)
 {
     VALUE ary;
 
@@ -1364,8 +1439,7 @@ rb_hash_keys(hash)
 }
 
 static int
-values_i(key, value, ary)
-    VALUE key, value, ary;
+values_i(VALUE key, VALUE value, VALUE ary)
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_ary_push(ary, value);
@@ -1374,19 +1448,18 @@ values_i(key, value, ary)
 
 /*
  *  call-seq:
- *     hsh.values    => array
- *  
+ *     hsh.values    -> array
+ *
  *  Returns a new array populated with the values from <i>hsh</i>. See
  *  also <code>Hash#keys</code>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200, "c" => 300 }
  *     h.values   #=> [100, 200, 300]
- *     
+ *
  */
 
 static VALUE
-rb_hash_values(hash)
-    VALUE hash;
+rb_hash_values(VALUE hash)
 {
     VALUE ary;
 
@@ -1398,34 +1471,35 @@ rb_hash_values(hash)
 
 /*
  *  call-seq:
- *     hsh.has_key?(key)    => true or false
- *     hsh.include?(key)    => true or false
- *     hsh.key?(key)        => true or false
- *     hsh.member?(key)     => true or false
- *  
+ *     hsh.has_key?(key)    -> true or false
+ *     hsh.include?(key)    -> true or false
+ *     hsh.key?(key)        -> true or false
+ *     hsh.member?(key)     -> true or false
+ *
  *  Returns <code>true</code> if the given key is present in <i>hsh</i>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.has_key?("a")   #=> true
  *     h.has_key?("z")   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_hash_has_key(hash, key)
-    VALUE hash;
-    VALUE key;
+rb_hash_has_key(VALUE hash, VALUE key)
 {
-    if (st_lookup(RHASH(hash)->tbl, key, 0)) {
+    if (!RHASH(hash)->ntbl)
+        return Qfalse;
+    if (st_lookup(RHASH(hash)->ntbl, key, 0)) {
 	return Qtrue;
     }
     return Qfalse;
 }
 
 static int
-rb_hash_search_value(key, value, data)
-    VALUE key, value, *data;
+rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
 {
+    VALUE *data = (VALUE *)arg;
+
     if (key == Qundef) return ST_CONTINUE;
     if (rb_equal(value, data[1])) {
 	data[0] = Qtrue;
@@ -1436,40 +1510,38 @@ rb_hash_search_value(key, value, data)
 
 /*
  *  call-seq:
- *     hsh.has_value?(value)    => true or false
- *     hsh.value?(value)        => true or false
- *  
+ *     hsh.has_value?(value)    -> true or false
+ *     hsh.value?(value)        -> true or false
+ *
  *  Returns <code>true</code> if the given value is present for some key
  *  in <i>hsh</i>.
- *     
+ *
  *     h = { "a" => 100, "b" => 200 }
  *     h.has_value?(100)   #=> true
  *     h.has_value?(999)   #=> false
  */
 
 static VALUE
-rb_hash_has_value(hash, val)
-    VALUE hash;
-    VALUE val;
+rb_hash_has_value(VALUE hash, VALUE val)
 {
     VALUE data[2];
 
     data[0] = Qfalse;
     data[1] = val;
-    rb_hash_foreach(hash, rb_hash_search_value, (st_data_t)data);
+    rb_hash_foreach(hash, rb_hash_search_value, (VALUE)data);
     return data[0];
 }
 
 struct equal_data {
-    int result;
+    VALUE result;
     st_table *tbl;
+    int eql;
 };
 
 static int
-equal_i(key, val1, data)
-    VALUE key, val1;
-    struct equal_data *data;
+eql_i(VALUE key, VALUE val1, VALUE arg)
 {
+    struct equal_data *data = (struct equal_data *)arg;
     VALUE val2;
 
     if (key == Qundef) return ST_CONTINUE;
@@ -1477,7 +1549,7 @@ equal_i(key, val1, data)
 	data->result = Qfalse;
 	return ST_STOP;
     }
-    if (!rb_equal(val1, val2)) {
+    if (!(data->eql ? rb_eql(val1, val2) : (int)rb_equal(val1, val2))) {
 	data->result = Qfalse;
 	return ST_STOP;
     }
@@ -1485,9 +1557,20 @@ equal_i(key, val1, data)
 }
 
 static VALUE
-hash_equal(hash1, hash2, eql)
-    VALUE hash1, hash2;
-    int eql;			/* compare default value if true */
+recursive_eql(VALUE hash, VALUE dt, int recur)
+{
+    struct equal_data *data;
+
+    if (recur) return Qtrue;	/* Subtle! */
+    data = (struct equal_data*)dt;
+    data->result = Qtrue;
+    rb_hash_foreach(hash, eql_i, dt);
+
+    return data->result;
+}
+
+static VALUE
+hash_equal(VALUE hash1, VALUE hash2, int eql)
 {
     struct equal_data data;
 
@@ -1496,32 +1579,37 @@ hash_equal(hash1, hash2, eql)
 	if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
 	    return Qfalse;
 	}
-	return rb_equal(hash2, hash1);
+	if (eql)
+	    return rb_eql(hash2, hash1);
+	else
+	    return rb_equal(hash2, hash1);
     }
-    if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
+    if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
 	return Qfalse;
-    if (eql) {
-	if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
-	      FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
-	    return Qfalse;
-    }
-
-    data.tbl = RHASH(hash2)->tbl;
-    data.result = Qtrue;
-    rb_hash_foreach(hash1, equal_i, (st_data_t)&data);
+    if (!RHASH(hash1)->ntbl || !RHASH(hash2)->ntbl)
+        return Qtrue;
+    if (RHASH(hash1)->ntbl->type != RHASH(hash2)->ntbl->type)
+	return Qfalse;
+#if 0
+    if (!(rb_equal(RHASH_IFNONE(hash1), RHASH_IFNONE(hash2)) &&
+	  FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
+	return Qfalse;
+#endif
 
-    return data.result;
+    data.tbl = RHASH(hash2)->ntbl;
+    data.eql = eql;
+    return rb_exec_recursive_paired(recursive_eql, hash1, hash2, (VALUE)&data);
 }
 
 /*
  *  call-seq:
- *     hsh == other_hash    => true or false
- *  
+ *     hsh == other_hash    -> true or false
+ *
  *  Equality---Two hashes are equal if they each contain the same number
  *  of keys and if each key-value pair is equal to (according to
  *  <code>Object#==</code>) the corresponding elements in the other
  *  hash.
- *     
+ *
  *     h1 = { "a" => 1, "c" => 2 }
  *     h2 = { 7 => 35, "c" => 2, "a" => 1 }
  *     h3 = { "a" => 1, "c" => 2, 7 => 35 }
@@ -1529,20 +1617,70 @@ hash_equal(hash1, hash2, eql)
  *     h1 == h2   #=> false
  *     h2 == h3   #=> true
  *     h3 == h4   #=> false
- *     
+ *
  */
 
 static VALUE
-rb_hash_equal(hash1, hash2)
-    VALUE hash1, hash2;
+rb_hash_equal(VALUE hash1, VALUE hash2)
 {
-    return hash_equal(hash1, hash2, Qfalse);
+    return hash_equal(hash1, hash2, FALSE);
+}
+
+/*
+ *  call-seq:
+ *     hash.eql?(other)  -> true or false
+ *
+ *  Returns <code>true</code> if <i>hash</i> and <i>other</i> are
+ *  both hashes with the same content.
+ */
+
+static VALUE
+rb_hash_eql(VALUE hash1, VALUE hash2)
+{
+    return hash_equal(hash1, hash2, TRUE);
 }
 
 static int
-rb_hash_invert_i(key, value, hash)
-    VALUE key, value;
-    VALUE hash;
+hash_i(VALUE key, VALUE val, VALUE arg)
+{
+    st_index_t *hval = (st_index_t *)arg;
+
+    if (key == Qundef) return ST_CONTINUE;
+    *hval ^= rb_hash_end(rb_hash_uint(rb_hash_start(rb_hash(key)), rb_hash(val)));
+    return ST_CONTINUE;
+}
+
+static VALUE
+recursive_hash(VALUE hash, VALUE dummy, int recur)
+{
+    st_index_t hval;
+
+    if (!RHASH(hash)->ntbl)
+        return LONG2FIX(0);
+    hval = RHASH(hash)->ntbl->num_entries;
+    if (recur)
+	hval = rb_hash_end(rb_hash_uint(rb_hash_start(rb_hash(rb_cHash)), hval));
+    else
+	rb_hash_foreach(hash, hash_i, (VALUE)&hval);
+    return INT2FIX(hval);
+}
+
+/*
+ *  call-seq:
+ *     hsh.hash   -> fixnum
+ *
+ *  Compute a hash-code for this hash. Two hashes with the same content
+ *  will have the same hash code (and will compare using <code>eql?</code>).
+ */
+
+static VALUE
+rb_hash_hash(VALUE hash)
+{
+    return rb_exec_recursive_outer(recursive_hash, hash, 0);
+}
+
+static int
+rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_hash_aset(hash, value, key);
@@ -1551,19 +1689,18 @@ rb_hash_invert_i(key, value, hash)
 
 /*
  *  call-seq:
- *     hsh.invert -> aHash
- *  
+ *     hsh.invert -> new_hash
+ *
  *  Returns a new hash created by using <i>hsh</i>'s values as keys, and
  *  the keys as values.
- *     
+ *
  *     h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
- *     h.invert   #=> {0=>"a", 100=>"n", 200=>"d", 300=>"y"}
- *     
+ *     h.invert   #=> {0=>"a", 100=>"m", 200=>"d", 300=>"y"}
+ *
  */
 
 static VALUE
-rb_hash_invert(hash)
-    VALUE hash;
+rb_hash_invert(VALUE hash)
 {
     VALUE h = rb_hash_new();
 
@@ -1572,47 +1709,53 @@ rb_hash_invert(hash)
 }
 
 static int
-rb_hash_update_i(key, value, hash)
-    VALUE key, value;
-    VALUE hash;
+rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
 {
     if (key == Qundef) return ST_CONTINUE;
-    rb_hash_aset(hash, key, value);
+    hash_update(hash, key);
+    st_insert(RHASH(hash)->ntbl, key, value);
     return ST_CONTINUE;
 }
 
 static int
-rb_hash_update_block_i(key, value, hash)
-    VALUE key, value;
-    VALUE hash;
+rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
 {
     if (key == Qundef) return ST_CONTINUE;
     if (rb_hash_has_key(hash, key)) {
 	value = rb_yield_values(3, key, rb_hash_aref(hash, key), value);
     }
-    rb_hash_aset(hash, key, value);
+    hash_update(hash, key);
+    st_insert(RHASH(hash)->ntbl, key, value);
     return ST_CONTINUE;
 }
 
 /*
  *  call-seq:
- *     hsh.merge!(other_hash)                                 => hsh
- *     hsh.update(other_hash)                                 => hsh
- *     hsh.merge!(other_hash){|key, oldval, newval| block}    => hsh
- *     hsh.update(other_hash){|key, oldval, newval| block}    => hsh
- *  
- *  Adds the contents of <i>other_hash</i> to <i>hsh</i>, overwriting
- *  entries with duplicate keys with those from <i>other_hash</i>.
- *     
+ *     hsh.merge!(other_hash)                                 -> hsh
+ *     hsh.update(other_hash)                                 -> hsh
+ *     hsh.merge!(other_hash){|key, oldval, newval| block}    -> hsh
+ *     hsh.update(other_hash){|key, oldval, newval| block}    -> hsh
+ *
+ *  Adds the contents of <i>other_hash</i> to <i>hsh</i>.  If no
+ *  block is specified, entries with duplicate keys are overwritten
+ *  with the values from <i>other_hash</i>, otherwise the value
+ *  of each duplicate key is determined by calling the block with
+ *  the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
+ *
  *     h1 = { "a" => 100, "b" => 200 }
  *     h2 = { "b" => 254, "c" => 300 }
  *     h1.merge!(h2)   #=> {"a"=>100, "b"=>254, "c"=>300}
+ *
+ *     h1 = { "a" => 100, "b" => 200 }
+ *     h2 = { "b" => 254, "c" => 300 }
+ *     h1.merge!(h2) { |key, v1, v2| v1 }
+ *                     #=> {"a"=>100, "b"=>200, "c"=>300}
  */
 
 static VALUE
-rb_hash_update(hash1, hash2)
-    VALUE hash1, hash2;
+rb_hash_update(VALUE hash1, VALUE hash2)
 {
+    rb_hash_modify(hash1);
     hash2 = to_hash(hash2);
     if (rb_block_given_p()) {
 	rb_hash_foreach(hash2, rb_hash_update_block_i, hash1);
@@ -1625,27 +1768,181 @@ rb_hash_update(hash1, hash2)
 
 /*
  *  call-seq:
- *     hsh.merge(other_hash)                              -> a_hash
- *     hsh.merge(other_hash){|key, oldval, newval| block} -> a_hash
- *  
+ *     hsh.merge(other_hash)                              -> new_hash
+ *     hsh.merge(other_hash){|key, oldval, newval| block} -> new_hash
+ *
  *  Returns a new hash containing the contents of <i>other_hash</i> and
- *  the contents of <i>hsh</i>, overwriting entries in <i>hsh</i> with
- *  duplicate keys with those from <i>other_hash</i>.
- *     
+ *  the contents of <i>hsh</i>. If no block is specified, the value for
+ *  entries with duplicate keys will be that of <i>other_hash</i>. Otherwise
+ *  the value for each duplicate key is determined by calling the block
+ *  with the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
+ *
  *     h1 = { "a" => 100, "b" => 200 }
  *     h2 = { "b" => 254, "c" => 300 }
  *     h1.merge(h2)   #=> {"a"=>100, "b"=>254, "c"=>300}
+ *     h1.merge(h2){|key, oldval, newval| newval - oldval}
+ *                    #=> {"a"=>100, "b"=>54,  "c"=>300}
  *     h1             #=> {"a"=>100, "b"=>200}
- *     
+ *
  */
 
 static VALUE
-rb_hash_merge(hash1, hash2)
-    VALUE hash1, hash2;
+rb_hash_merge(VALUE hash1, VALUE hash2)
 {
     return rb_hash_update(rb_obj_dup(hash1), hash2);
 }
 
+static int
+assoc_i(VALUE key, VALUE val, VALUE arg)
+{
+    VALUE *args = (VALUE *)arg;
+
+    if (key == Qundef) return ST_CONTINUE;
+    if (RTEST(rb_equal(args[0], key))) {
+	args[1] = rb_assoc_new(key, val);
+	return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hash.assoc(obj)   ->  an_array  or  nil
+ *
+ *  Searches through the hash comparing _obj_ with the key using <code>==</code>.
+ *  Returns the key-value pair (two elements array) or +nil+
+ *  if no match is found.  See <code>Array#assoc</code>.
+ *
+ *     h = {"colors"  => ["red", "blue", "green"],
+ *          "letters" => ["a", "b", "c" ]}
+ *     h.assoc("letters")  #=> ["letters", ["a", "b", "c"]]
+ *     h.assoc("foo")      #=> nil
+ */
+
+VALUE
+rb_hash_assoc(VALUE hash, VALUE obj)
+{
+    VALUE args[2];
+
+    args[0] = obj;
+    args[1] = Qnil;
+    rb_hash_foreach(hash, assoc_i, (VALUE)args);
+    return args[1];
+}
+
+static int
+rassoc_i(VALUE key, VALUE val, VALUE arg)
+{
+    VALUE *args = (VALUE *)arg;
+
+    if (key == Qundef) return ST_CONTINUE;
+    if (RTEST(rb_equal(args[0], val))) {
+	args[1] = rb_assoc_new(key, val);
+	return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hash.rassoc(key) -> an_array or nil
+ *
+ *  Searches through the hash comparing _obj_ with the value using <code>==</code>.
+ *  Returns the first key-value pair (two-element array) that matches. See
+ *  also <code>Array#rassoc</code>.
+ *
+ *     a = {1=> "one", 2 => "two", 3 => "three", "ii" => "two"}
+ *     a.rassoc("two")    #=> [2, "two"]
+ *     a.rassoc("four")   #=> nil
+ */
+
+VALUE
+rb_hash_rassoc(VALUE hash, VALUE obj)
+{
+    VALUE args[2];
+
+    args[0] = obj;
+    args[1] = Qnil;
+    rb_hash_foreach(hash, rassoc_i, (VALUE)args);
+    return args[1];
+}
+
+/*
+ *  call-seq:
+ *     hash.flatten -> an_array
+ *     hash.flatten(level) -> an_array
+ *
+ *  Returns a new array that is a one-dimensional flattening of this
+ *  hash. That is, for every key or value that is an array, extract
+ *  its elements into the new array.  Unlike Array#flatten, this
+ *  method does not flatten recursively by default.  The optional
+ *  <i>level</i> argument determines the level of recursion to flatten.
+ *
+ *     a =  {1=> "one", 2 => [2,"two"], 3 => "three"}
+ *     a.flatten    # => [1, "one", 2, [2, "two"], 3, "three"]
+ *     a.flatten(2) # => [1, "one", 2, 2, "two", 3, "three"]
+ */
+
+static VALUE
+rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
+{
+    VALUE ary, tmp;
+
+    ary = rb_hash_to_a(hash);
+    if (argc == 0) {
+	argc = 1;
+	tmp = INT2FIX(1);
+	argv = &tmp;
+    }
+    rb_funcall2(ary, rb_intern("flatten!"), argc, argv);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     hsh.compare_by_identity -> hsh
+ *
+ *  Makes <i>hsh</i> compare its keys by their identity, i.e. it
+ *  will consider exact same objects as same keys.
+ *
+ *     h1 = { "a" => 100, "b" => 200, :c => "c" }
+ *     h1["a"]        #=> 100
+ *     h1.compare_by_identity
+ *     h1.compare_by_identity? #=> true
+ *     h1["a"]        #=> nil  # different objects.
+ *     h1[:c]         #=> "c"  # same symbols are all same.
+ *
+ */
+
+static VALUE
+rb_hash_compare_by_id(VALUE hash)
+{
+    rb_hash_modify(hash);
+    RHASH(hash)->ntbl->type = &identhash;
+    rb_hash_rehash(hash);
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     hsh.compare_by_identity? -> true or false
+ *
+ *  Returns <code>true</code> if <i>hsh</i> will compare its keys by
+ *  their identity.  Also see <code>Hash#compare_by_identity</code>.
+ *
+ */
+
+static VALUE
+rb_hash_compare_by_id_p(VALUE hash)
+{
+    if (!RHASH(hash)->ntbl)
+        return Qfalse;
+    if (RHASH(hash)->ntbl->type == &identhash) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
 static int path_tainted = -1;
 
 static char **origenviron;
@@ -1665,36 +1962,39 @@ extern char **environ;
 #define GET_ENVIRON(e) (e)
 #define FREE_ENVIRON(e)
 #endif
+#ifdef ENV_IGNORECASE
+#define ENVMATCH(s1, s2) (STRCASECMP(s1, s2) == 0)
+#define ENVNMATCH(s1, s2, n) (STRNCASECMP(s1, s2, n) == 0)
+#else
+#define ENVMATCH(n1, n2) (strcmp(n1, n2) == 0)
+#define ENVNMATCH(s1, s2, n) (memcmp(s1, s2, n) == 0)
+#endif
 
 static VALUE
-env_str_new(ptr, len)
-    const char *ptr;
-    long len;
+env_str_new(const char *ptr, long len)
 {
-    VALUE str = rb_tainted_str_new(ptr, len);
+    VALUE str = rb_locale_str_new(ptr, len);
 
     rb_obj_freeze(str);
     return str;
 }
 
 static VALUE
-env_str_new2(ptr)
-    const char *ptr;
+env_str_new2(const char *ptr)
 {
     if (!ptr) return Qnil;
     return env_str_new(ptr, strlen(ptr));
 }
 
 static VALUE
-env_delete(obj, name)
-    VALUE obj, name;
+env_delete(VALUE obj, VALUE name)
 {
     char *nam, *val;
 
     rb_secure(4);
     SafeStringValue(name);
-    nam = RSTRING(name)->ptr;
-    if (strlen(nam) != RSTRING(name)->len) {
+    nam = RSTRING_PTR(name);
+    if (memchr(nam, '\0', RSTRING_LEN(name))) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     val = getenv(nam);
@@ -1702,12 +2002,7 @@ env_delete(obj, name)
 	VALUE value = env_str_new2(val);
 
 	ruby_setenv(nam, 0);
-#ifdef ENV_IGNORECASE
-	if (strcasecmp(nam, PATH_ENV) == 0)
-#else
-	if (strcmp(nam, PATH_ENV) == 0)
-#endif
-	{
+	if (ENVMATCH(nam, PATH_ENV)) {
 	    path_tainted = 0;
 	}
 	return value;
@@ -1716,8 +2011,7 @@ env_delete(obj, name)
 }
 
 static VALUE
-env_delete_m(obj, name)
-    VALUE obj, name;
+env_delete_m(VALUE obj, VALUE name)
 {
     VALUE val;
 
@@ -1726,26 +2020,23 @@ env_delete_m(obj, name)
     return val;
 }
 
+static int env_path_tainted(const char *);
+
 static VALUE
-rb_f_getenv(obj, name)
-    VALUE obj, name;
+rb_f_getenv(VALUE obj, VALUE name)
 {
     char *nam, *env;
 
-    StringValue(name);
-    nam = RSTRING(name)->ptr;
-    if (strlen(nam) != RSTRING(name)->len) {
+    rb_secure(4);
+    SafeStringValue(name);
+    nam = RSTRING_PTR(name);
+    if (memchr(nam, '\0', RSTRING_LEN(name))) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     env = getenv(nam);
     if (env) {
-#ifdef ENV_IGNORECASE
-	if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#else
-	if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#endif
-	{
-	    VALUE str = rb_str_new2(env);
+	if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) {
+	    VALUE str = rb_filesystem_str_new_cstr(env);
 
 	    rb_obj_freeze(str);
 	    return str;
@@ -1756,50 +2047,53 @@ rb_f_getenv(obj, name)
 }
 
 static VALUE
-env_fetch(argc, argv)
-    int argc;
-    VALUE *argv;
+env_fetch(int argc, VALUE *argv)
 {
     VALUE key, if_none;
     long block_given;
     char *nam, *env;
 
+    rb_secure(4);
     rb_scan_args(argc, argv, "11", &key, &if_none);
     block_given = rb_block_given_p();
     if (block_given && argc == 2) {
 	rb_warn("block supersedes default value argument");
     }
-    StringValue(key);
-    nam = RSTRING(key)->ptr;
-    if (strlen(nam) != RSTRING(key)->len) {
+    SafeStringValue(key);
+    nam = RSTRING_PTR(key);
+    if (memchr(nam, '\0', RSTRING_LEN(key))) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     env = getenv(nam);
     if (!env) {
 	if (block_given) return rb_yield(key);
 	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "key not found");
+	    rb_raise(rb_eKeyError, "key not found");
 	}
 	return if_none;
     }
-#ifdef ENV_IGNORECASE
-    if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#else
-    if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#endif
-	return rb_str_new2(env);
+    if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env))
+	return rb_filesystem_str_new_cstr(env);
     return env_str_new2(env);
 }
 
 static void
-path_tainted_p(path)
-    char *path;
+path_tainted_p(const char *path)
 {
     path_tainted = rb_path_check(path)?0:1;
 }
 
+static int
+env_path_tainted(const char *path)
+{
+    if (path_tainted < 0) {
+	path_tainted_p(path);
+    }
+    return path_tainted;
+}
+
 int
-rb_env_path_tainted()
+rb_env_path_tainted(void)
 {
     if (path_tainted < 0) {
 	path_tainted_p(getenv(PATH_ENV));
@@ -1807,62 +2101,108 @@ rb_env_path_tainted()
     return path_tainted;
 }
 
+#if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
+#elif defined __sun__
+static int
+in_origenv(const char *str)
+{
+    char **env;
+    for (env = origenviron; *env; ++env) {
+	if (*env == str) return 1;
+    }
+    return 0;
+}
+#else
 static int
-envix(nam)
-    const char *nam;
+envix(const char *nam)
 {
     register int i, len = strlen(nam);
     char **env;
 
     env = GET_ENVIRON(environ);
     for (i = 0; env[i]; i++) {
-	if (
-#ifdef ENV_IGNORECASE
-	    strncasecmp(env[i],nam,len) == 0
-#else
-	    memcmp(env[i],nam,len) == 0
-#endif
-	    && env[i][len] == '=')
+	if (ENVNMATCH(env[i],nam,len) && env[i][len] == '=')
 	    break;			/* memcmp must come first to avoid */
     }					/* potential SEGV's */
     FREE_ENVIRON(environ);
     return i;
 }
+#endif
 
 void
-ruby_setenv(name, value)
-    const char *name;
-    const char *value;
+ruby_setenv(const char *name, const char *value)
 {
 #if defined(_WIN32)
-    /* The sane way to deal with the environment.
-     * Has these advantages over putenv() & co.:
-     *  * enables us to store a truly empty value in the
-     *    environment (like in UNIX).
-     *  * we don't have to deal with RTL globals, bugs and leaks.
-     *  * Much faster.
-     * Why you may want to enable USE_WIN32_RTL_ENV:
-     *  * environ[] and RTL functions will not reflect changes,
-     *    which might be an issue if extensions want to access
-     *    the env. via RTL.  This cuts both ways, since RTL will
-     *    not see changes made by extensions that call the Win32
-     *    functions directly, either.
-     * GSAR 97-06-07
-     *
-     * REMARK: USE_WIN32_RTL_ENV is already obsoleted since we don't use
-     *         RTL's environ global variable directly yet.
-     */
-    SetEnvironmentVariable(name,value);
+    int len;
+    char *buf;
+    int failed = 0;
+    if (strchr(name, '=')) {
+	errno = EINVAL;
+	rb_sys_fail("ruby_setenv");
+    }
+    if (value) {
+	len = strlen(name) + 1 + strlen(value) + 1;
+	buf = ALLOCA_N(char, len);
+	snprintf(buf, len, "%s=%s", name, value);
+	failed = putenv(buf);
+
+	/* putenv() doesn't handle empty value */
+	if (!*value)
+	    failed = !SetEnvironmentVariable(name,value);
+    }
+    else {
+	len = strlen(name) + 1 + 1;
+	buf = ALLOCA_N(char, len);
+	snprintf(buf, len, "%s=", name);
+	putenv(buf);
+	failed = !SetEnvironmentVariable(name, 0);
+    }
+    if (failed) {
+        rb_warn("failed to set environment variable. Ruby 1.9.3 will raise SystemCallError in this case.");
+    }
 #elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
 #undef setenv
 #undef unsetenv
-    if (value)
-	setenv(name,value,1);
-    else
+    if (value) {
+	if (setenv(name, value, 1))
+	    rb_sys_fail("setenv");
+    } else {
+#ifdef VOID_UNSETENV
 	unsetenv(name);
+#else
+	if (unsetenv(name))
+	    rb_sys_fail("unsetenv");
+#endif
+    }
+#elif defined __sun__
+    size_t len;
+    char **env_ptr, *str;
+    if (strchr(name, '=')) {
+	errno = EINVAL;
+	rb_sys_fail("ruby_setenv");
+    }
+    len = strlen(name);
+    for (env_ptr = GET_ENVIRON(environ); (str = *env_ptr) != 0; ++env_ptr) {
+	if (!strncmp(str, name, len) && str[len] == '=') {
+	    if (!in_origenv(str)) free(str);
+	    while ((env_ptr[0] = env_ptr[1]) != 0) env_ptr++;
+	    break;
+	}
+    }
+    if (value) {
+	str = malloc(len += strlen(value) + 2);
+	snprintf(str, len, "%s=%s", name, value);
+	if (putenv(str))
+	    rb_sys_fail("putenv");
+    }
 #else  /* WIN32 */
     size_t len;
-    int i=envix(name);		        /* where does it go? */
+    int i;
+    if (strchr(name, '=')) {
+	errno = EINVAL;
+	rb_sys_fail("ruby_setenv");
+    }
+    i=envix(name);		        /* where does it go? */
 
     if (environ == origenviron) {	/* need we copy environment? */
 	int j;
@@ -1872,7 +2212,7 @@ ruby_setenv(name, value)
 	for (max = i; environ[max]; max++) ;
 	tmpenv = ALLOC_N(char*, max+2);
 	for (j=0; j<max; j++)		/* copy environment */
-	    tmpenv[j] = strdup(environ[j]);
+	    tmpenv[j] = ruby_strdup(environ[j]);
 	tmpenv[max] = 0;
 	environ = tmpenv;		/* tell exec where it is now */
     }
@@ -1880,7 +2220,7 @@ ruby_setenv(name, value)
 	char **envp = origenviron;
 	while (*envp && *envp != environ[i]) envp++;
 	if (!*envp)
-	    free(environ[i]);
+	    xfree(environ[i]);
 	if (!value) {
 	    while (environ[i]) {
 		environ[i] = environ[i+1];
@@ -1896,31 +2236,18 @@ ruby_setenv(name, value)
     }
     len = strlen(name) + strlen(value) + 2;
     environ[i] = ALLOC_N(char, len);
-#ifndef MSDOS
     snprintf(environ[i],len,"%s=%s",name,value); /* all that work just for this */
-#else
-    /* MS-DOS requires environment variable names to be in uppercase */
-    /* [Tom Dinger, 27 August 1990: Well, it doesn't _require_ it, but
-     * some utilities and applications may break because they only look
-     * for upper case strings. (Fixed strupr() bug here.)]
-     */
-    strcpy(environ[i],name); strupr(environ[i]);
-    sprintf(environ[i] + strlen(name),"=%s", value);
-#endif /* MSDOS */
-
 #endif /* WIN32 */
 }
 
 void
-ruby_unsetenv(name)
-    const char *name;
+ruby_unsetenv(const char *name)
 {
     ruby_setenv(name, 0);
 }
 
 static VALUE
-env_aset(obj, nm, val)
-    VALUE obj, nm, val;
+env_aset(VALUE obj, VALUE nm, VALUE val)
 {
     char *name, *value;
 
@@ -1932,22 +2259,17 @@ env_aset(obj, nm, val)
 	env_delete(obj, nm);
 	return Qnil;
     }
-
     StringValue(nm);
     StringValue(val);
-    name = RSTRING(nm)->ptr;
-    value = RSTRING(val)->ptr;
-    if (strlen(name) != RSTRING(nm)->len)
+    name = RSTRING_PTR(nm);
+    value = RSTRING_PTR(val);
+    if (memchr(name, '\0', RSTRING_LEN(nm)))
 	rb_raise(rb_eArgError, "bad environment variable name");
-    if (strlen(value) != RSTRING(val)->len)
+    if (memchr(value, '\0', RSTRING_LEN(val)))
 	rb_raise(rb_eArgError, "bad environment variable value");
 
     ruby_setenv(name, value);
-#ifdef ENV_IGNORECASE
-    if (strcasecmp(name, PATH_ENV) == 0) {
-#else
-    if (strcmp(name, PATH_ENV) == 0) {
-#endif
+    if (ENVMATCH(name, PATH_ENV)) {
 	if (OBJ_TAINTED(val)) {
 	    /* already tainted, no check */
 	    path_tainted = 1;
@@ -1961,11 +2283,13 @@ env_aset(obj, nm, val)
 }
 
 static VALUE
-env_keys()
+env_keys(void)
 {
     char **env;
-    VALUE ary = rb_ary_new();
+    VALUE ary;
 
+    rb_secure(4);
+    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -1979,24 +2303,27 @@ env_keys()
 }
 
 static VALUE
-env_each_key(ehash)
-    VALUE ehash;
+env_each_key(VALUE ehash)
 {
-    VALUE keys = env_keys();
+    VALUE keys;
     long i;
 
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	rb_yield(RARRAY(keys)->ptr[i]);
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    keys = env_keys();	/* rb_secure(4); */
+    for (i=0; i<RARRAY_LEN(keys); i++) {
+	rb_yield(RARRAY_PTR(keys)[i]);
     }
     return ehash;
 }
 
 static VALUE
-env_values()
+env_values(void)
 {
+    VALUE ary;
     char **env;
-    VALUE ary = rb_ary_new();
 
+    rb_secure(4);
+    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2010,27 +2337,30 @@ env_values()
 }
 
 static VALUE
-env_each_value(ehash)
-    VALUE ehash;
+env_each_value(VALUE ehash)
 {
-    VALUE values = env_values();
+    VALUE values;
     long i;
 
-    for (i=0; i<RARRAY(values)->len; i++) {
-	rb_yield(RARRAY(values)->ptr[i]);
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    values = env_values();	/* rb_secure(4); */
+    for (i=0; i<RARRAY_LEN(values); i++) {
+	rb_yield(RARRAY_PTR(values)[i]);
     }
     return ehash;
 }
 
 static VALUE
-env_each_i(ehash, values)
-    VALUE ehash;
-    int values;
+env_each_pair(VALUE ehash)
 {
     char **env;
-    VALUE ary = rb_ary_new();
+    VALUE ary;
     long i;
 
+    RETURN_ENUMERATOR(ehash, 0, 0);
+
+    rb_secure(4);
+    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2042,47 +2372,27 @@ env_each_i(ehash, values)
     }
     FREE_ENVIRON(environ);
 
-    for (i=0; i<RARRAY(ary)->len; i+=2) {
-	if (values) {
-	    rb_yield_values(2, RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]);
-	}
-	else {
-	    rb_yield(rb_assoc_new(RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]));
-	}
+    for (i=0; i<RARRAY_LEN(ary); i+=2) {
+	rb_yield(rb_assoc_new(RARRAY_PTR(ary)[i], RARRAY_PTR(ary)[i+1]));
     }
     return ehash;
 }
 
 static VALUE
-env_each(ehash)
-    VALUE ehash;
-{
-    return env_each_i(ehash, Qfalse);
-}
-
-static VALUE
-env_each_pair(ehash)
-    VALUE ehash;
-{
-    return env_each_i(ehash, Qtrue);
-}
-
-static VALUE
-env_reject_bang()
+env_reject_bang(VALUE ehash)
 {
     volatile VALUE keys;
     long i;
     int del = 0;
 
-    rb_secure(4);
-    keys = env_keys();
-
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    keys = env_keys();	/* rb_secure(4); */
+    for (i=0; i<RARRAY_LEN(keys); i++) {
+	VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
 	if (!NIL_P(val)) {
-	    if (RTEST(rb_yield_values(2, RARRAY(keys)->ptr[i], val))) {
-		FL_UNSET(RARRAY(keys)->ptr[i], FL_TAINT);
-		env_delete(Qnil, RARRAY(keys)->ptr[i]);
+	    if (RTEST(rb_yield_values(2, RARRAY_PTR(keys)[i], val))) {
+		FL_UNSET(RARRAY_PTR(keys)[i], FL_TAINT);
+		env_delete(Qnil, RARRAY_PTR(keys)[i]);
 		del++;
 	    }
 	}
@@ -2092,20 +2402,21 @@ env_reject_bang()
 }
 
 static VALUE
-env_delete_if()
+env_delete_if(VALUE ehash)
 {
-    env_reject_bang();
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    env_reject_bang(ehash);
     return envtbl;
 }
 
 static VALUE
-env_values_at(argc, argv)
-    int argc;
-    VALUE *argv;
+env_values_at(int argc, VALUE *argv)
 {
-    VALUE result = rb_ary_new();
+    VALUE result;
     long i;
 
+    rb_secure(4);
+    result = rb_ary_new();
     for (i=0; i<argc; i++) {
 	rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
     }
@@ -2113,17 +2424,14 @@ env_values_at(argc, argv)
 }
 
 static VALUE
-env_select(argc, argv)
-    int argc;
-    VALUE *argv;
+env_select(VALUE ehash)
 {
     VALUE result;
     char **env;
 
-    if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
-    }
-    result = rb_ary_new();
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    rb_secure(4);
+    result = rb_hash_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2131,7 +2439,7 @@ env_select(argc, argv)
 	    VALUE k = env_str_new(*env, s-*env);
 	    VALUE v = env_str_new2(s+1);
 	    if (RTEST(rb_yield_values(2, k, v))) {
-		rb_ary_push(result, rb_assoc_new(k, v));
+		rb_hash_aset(result, k, v);
 	    }
 	}
 	env++;
@@ -2142,36 +2450,66 @@ env_select(argc, argv)
 }
 
 static VALUE
-env_clear()
+env_select_bang(VALUE ehash)
 {
     volatile VALUE keys;
     long i;
-    
-    rb_secure(4);
-    keys = env_keys();
+    int del = 0;
 
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    keys = env_keys();	/* rb_secure(4); */
+    for (i=0; i<RARRAY_LEN(keys); i++) {
+	VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
 	if (!NIL_P(val)) {
-	    env_delete(Qnil, RARRAY(keys)->ptr[i]);
+	    if (!RTEST(rb_yield_values(2, RARRAY_PTR(keys)[i], val))) {
+		FL_UNSET(RARRAY_PTR(keys)[i], FL_TAINT);
+		env_delete(Qnil, RARRAY_PTR(keys)[i]);
+		del++;
+	    }
 	}
     }
+    if (del == 0) return Qnil;
     return envtbl;
 }
 
 static VALUE
-env_to_s()
+env_keep_if(VALUE ehash)
 {
-    return rb_str_new2("ENV");
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    env_select_bang(ehash);
+    return envtbl;
+}
+
+VALUE
+rb_env_clear(void)
+{
+    volatile VALUE keys;
+    long i;
+
+    keys = env_keys();	/* rb_secure(4); */
+    for (i=0; i<RARRAY_LEN(keys); i++) {
+	VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
+	if (!NIL_P(val)) {
+	    env_delete(Qnil, RARRAY_PTR(keys)[i]);
+	}
+    }
+    return envtbl;
 }
 
 static VALUE
-env_inspect()
+env_to_s(void)
+{
+    return rb_usascii_str_new2("ENV");
+}
+
+static VALUE
+env_inspect(void)
 {
     char **env;
-    VALUE str = rb_str_buf_new2("{");
-    VALUE i;
+    VALUE str, i;
 
+    rb_secure(4);
+    str = rb_str_buf_new2("{");
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2196,11 +2534,13 @@ env_inspect()
 }
 
 static VALUE
-env_to_a()
+env_to_a(void)
 {
     char **env;
-    VALUE ary = rb_ary_new();
+    VALUE ary;
 
+    rb_secure(4);
+    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2215,17 +2555,18 @@ env_to_a()
 }
 
 static VALUE
-env_none()
+env_none(void)
 {
     return Qnil;
 }
 
 static VALUE
-env_size()
+env_size(void)
 {
     int i;
     char **env;
 
+    rb_secure(4);
     env = GET_ENVIRON(environ);
     for(i=0; env[i]; i++)
 	;
@@ -2234,10 +2575,11 @@ env_size()
 }
 
 static VALUE
-env_empty_p()
+env_empty_p(void)
 {
     char **env;
 
+    rb_secure(4);
     env = GET_ENVIRON(environ);
     if (env[0] == 0) {
 	FREE_ENVIRON(environ);
@@ -2248,31 +2590,46 @@ env_empty_p()
 }
 
 static VALUE
-env_has_key(env, key)
-    VALUE env, key;
+env_has_key(VALUE env, VALUE key)
 {
     char *s;
 
+    rb_secure(4);
     s = StringValuePtr(key);
-    if (strlen(s) != RSTRING(key)->len)
+    if (memchr(s, '\0', RSTRING_LEN(key)))
 	rb_raise(rb_eArgError, "bad environment variable name");
     if (getenv(s)) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
-env_has_value(dmy, value)
-    VALUE dmy, value;
+env_assoc(VALUE env, VALUE key)
+{
+    char *s, *e;
+
+    rb_secure(4);
+    s = StringValuePtr(key);
+    if (memchr(s, '\0', RSTRING_LEN(key)))
+	rb_raise(rb_eArgError, "bad environment variable name");
+    e = getenv(s);
+    if (e) return rb_assoc_new(key, rb_tainted_str_new2(e));
+    return Qnil;
+}
+
+static VALUE
+env_has_value(VALUE dmy, VALUE obj)
 {
     char **env;
 
-    if (TYPE(value) != T_STRING) return Qfalse;
+    rb_secure(4);
+    obj = rb_check_string_type(obj);
+    if (NIL_P(obj)) return Qnil;
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s++) {
 	    long len = strlen(s);
-	    if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
+	    if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
 		FREE_ENVIRON(environ);
 		return Qtrue;
 	    }
@@ -2284,19 +2641,44 @@ env_has_value(dmy, value)
 }
 
 static VALUE
-env_index(dmy, value)
-    VALUE dmy, value;
+env_rassoc(VALUE dmy, VALUE obj)
+{
+    char **env;
+
+    rb_secure(4);
+    obj = rb_check_string_type(obj);
+    if (NIL_P(obj)) return Qnil;
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s++) {
+	    long len = strlen(s);
+	    if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
+		VALUE result = rb_assoc_new(rb_tainted_str_new(*env, s-*env-1), obj);
+		FREE_ENVIRON(environ);
+		return result;
+	    }
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    return Qnil;
+}
+
+static VALUE
+env_key(VALUE dmy, VALUE value)
 {
     char **env;
     VALUE str;
 
+    rb_secure(4);
     StringValue(value);
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s++) {
 	    long len = strlen(s);
-	    if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
+	    if (RSTRING_LEN(value) == len && strncmp(s, RSTRING_PTR(value), len) == 0) {
 		str = env_str_new(*env, s-*env-1);
 		FREE_ENVIRON(environ);
 		return str;
@@ -2309,35 +2691,20 @@ env_index(dmy, value)
 }
 
 static VALUE
-env_indexes(argc, argv)
-    int argc;
-    VALUE *argv;
+env_index(VALUE dmy, VALUE value)
 {
-    int i;
-    VALUE indexes = rb_ary_new2(argc);
-
-    rb_warn("ENV.%s is deprecated; use ENV.values_at",
-	    rb_id2name(rb_frame_last_func()));
-    for (i=0;i<argc;i++) {
-	VALUE tmp = rb_check_string_type(argv[i]);
-	if (NIL_P(tmp)) {
-	    RARRAY(indexes)->ptr[i] = Qnil;
-	}
-	else {
-	    RARRAY(indexes)->ptr[i] = env_str_new2(getenv(RSTRING(tmp)->ptr));
-	}
-	RARRAY(indexes)->len = i+1;
-    }
-
-    return indexes;
+    rb_warn("ENV.index is deprecated; use ENV.key");
+    return env_key(dmy, value);
 }
 
 static VALUE
-env_to_hash()
+env_to_hash(void)
 {
     char **env;
-    VALUE hash = rb_hash_new();
+    VALUE hash;
 
+    rb_secure(4);
+    hash = rb_hash_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2352,22 +2719,23 @@ env_to_hash()
 }
 
 static VALUE
-env_reject()
+env_reject(void)
 {
     return rb_hash_delete_if(env_to_hash());
 }
 
 static VALUE
-env_shift()
+env_shift(void)
 {
     char **env;
 
+    rb_secure(4);
     env = GET_ENVIRON(environ);
     if (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
 	    VALUE key = env_str_new(*env, s-*env);
-	    VALUE val = env_str_new2(getenv(RSTRING(key)->ptr));
+	    VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
 	    env_delete(Qnil, key);
 	    return rb_assoc_new(key, val);
 	}
@@ -2377,14 +2745,13 @@ env_shift()
 }
 
 static VALUE
-env_invert()
+env_invert(void)
 {
     return rb_hash_invert(env_to_hash());
 }
 
 static int
-env_replace_i(key, val, keys)
-    VALUE key, val, keys;
+env_replace_i(VALUE key, VALUE val, VALUE keys)
 {
     if (key != Qundef) {
 	env_aset(Qnil, key, val);
@@ -2396,25 +2763,24 @@ env_replace_i(key, val, keys)
 }
 
 static VALUE
-env_replace(env, hash)
-    VALUE env, hash;
+env_replace(VALUE env, VALUE hash)
 {
-    volatile VALUE keys = env_keys();
+    volatile VALUE keys;
     long i;
 
+    keys = env_keys();	/* rb_secure(4); */
     if (env == hash) return env;
     hash = to_hash(hash);
     rb_hash_foreach(hash, env_replace_i, keys);
 
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	env_delete(env, RARRAY(keys)->ptr[i]);
+    for (i=0; i<RARRAY_LEN(keys); i++) {
+	env_delete(env, RARRAY_PTR(keys)[i]);
     }
     return env;
 }
 
 static int
-env_update_i(key, val)
-    VALUE key, val;
+env_update_i(VALUE key, VALUE val)
 {
     if (key != Qundef) {
 	if (rb_block_given_p()) {
@@ -2426,9 +2792,9 @@ env_update_i(key, val)
 }
 
 static VALUE
-env_update(env, hash)
-    VALUE env, hash;
+env_update(VALUE env, VALUE hash)
 {
+    rb_secure(4);
     if (env == hash) return env;
     hash = to_hash(hash);
     rb_hash_foreach(hash, env_update_i, 0);
@@ -2438,53 +2804,23 @@ env_update(env, hash)
 /*
  *  A <code>Hash</code> is a collection of key-value pairs. It is
  *  similar to an <code>Array</code>, except that indexing is done via
- *  arbitrary keys of any object type, not an integer index. The order
- *  in which you traverse a hash by either key or value may seem
- *  arbitrary, and will generally not be in the insertion order.
- *     
+ *  arbitrary keys of any object type, not an integer index. Hashes enumerate
+ *  their values in the order that the corresponding keys were inserted.
+ *
  *  Hashes have a <em>default value</em> that is returned when accessing
  *  keys that do not exist in the hash. By default, that value is
  *  <code>nil</code>.
- *  
- *  <code>Hash</code> uses <code>key.eql?</code> to test keys for equality.
- *  If you need to use instances of your own classes as keys in a <code>Hash</code>,
- *  it is recommended that you define both the <code>eql?</code> and <code>hash</code>
- *  methods. The <code>hash</code> method must have the property that 
- *  <code>a.eql?(b)</code> implies <code>a.hash == b.hash</code>.
- *
- *    class MyClass
- *      attr_reader :str
- *      def initialize(str)
- *        @str = str
- *      end
- *      def eql?(o)
- *        o.is_a?(MyClass) && str == o.str
- *      end
- *      def hash
- *        @str.hash
- *      end
- *    end
- *    
- *    a = MyClass.new("some string")
- *    b = MyClass.new("some string")
- *    a.eql? b  #=> true
- *    
- *    h = {}
- *    
- *    h[a] = 1
- *    h[a]      #=> 1
- *    h[b]      #=> 1
- *    
- *    h[b] = 2
- *    h[a]      #=> 2
- *    h[b]      #=> 2
+ *
  */
 
 void
-Init_Hash()
+Init_Hash(void)
 {
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
     id_hash = rb_intern("hash");
-    id_call = rb_intern("call");
+    id_yield = rb_intern("yield");
     id_default = rb_intern("default");
 
     rb_cHash = rb_define_class("Hash", rb_cObject);
@@ -2493,35 +2829,37 @@ Init_Hash()
 
     rb_define_alloc_func(rb_cHash, hash_alloc);
     rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
+    rb_define_singleton_method(rb_cHash, "try_convert", rb_hash_s_try_convert, 1);
     rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1);
     rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1);
     rb_define_method(rb_cHash,"rehash", rb_hash_rehash, 0);
 
     rb_define_method(rb_cHash,"to_hash", rb_hash_to_hash, 0);
     rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0);
-    rb_define_method(rb_cHash,"to_s", rb_hash_to_s, 0);
     rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
+    rb_define_alias(rb_cHash, "to_s", "inspect");
 
     rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
     rb_define_method(rb_cHash,"[]", rb_hash_aref, 1);
-    rb_define_method(rb_cHash,"fetch", rb_hash_fetch, -1);
+    rb_define_method(rb_cHash,"hash", rb_hash_hash, 0);
+    rb_define_method(rb_cHash,"eql?", rb_hash_eql, 1);
+    rb_define_method(rb_cHash,"fetch", rb_hash_fetch_m, -1);
     rb_define_method(rb_cHash,"[]=", rb_hash_aset, 2);
     rb_define_method(rb_cHash,"store", rb_hash_aset, 2);
     rb_define_method(rb_cHash,"default", rb_hash_default, -1);
     rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
     rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
+    rb_define_method(rb_cHash,"default_proc=", rb_hash_set_default_proc, 1);
+    rb_define_method(rb_cHash,"key", rb_hash_key, 1);
     rb_define_method(rb_cHash,"index", rb_hash_index, 1);
-    rb_define_method(rb_cHash,"indexes", rb_hash_indexes, -1);
-    rb_define_method(rb_cHash,"indices", rb_hash_indexes, -1);
     rb_define_method(rb_cHash,"size", rb_hash_size, 0);
     rb_define_method(rb_cHash,"length", rb_hash_size, 0);
     rb_define_method(rb_cHash,"empty?", rb_hash_empty_p, 0);
 
-    rb_define_method(rb_cHash,"each", rb_hash_each, 0);
     rb_define_method(rb_cHash,"each_value", rb_hash_each_value, 0);
     rb_define_method(rb_cHash,"each_key", rb_hash_each_key, 0);
     rb_define_method(rb_cHash,"each_pair", rb_hash_each_pair, 0);
-    rb_define_method(rb_cHash,"sort", rb_hash_sort, 0);
+    rb_define_method(rb_cHash,"each", rb_hash_each_pair, 0);
 
     rb_define_method(rb_cHash,"keys", rb_hash_keys, 0);
     rb_define_method(rb_cHash,"values", rb_hash_values, 0);
@@ -2530,7 +2868,9 @@ Init_Hash()
     rb_define_method(rb_cHash,"shift", rb_hash_shift, 0);
     rb_define_method(rb_cHash,"delete", rb_hash_delete, 1);
     rb_define_method(rb_cHash,"delete_if", rb_hash_delete_if, 0);
-    rb_define_method(rb_cHash,"select", rb_hash_select, -1);
+    rb_define_method(rb_cHash,"keep_if", rb_hash_keep_if, 0);
+    rb_define_method(rb_cHash,"select", rb_hash_select, 0);
+    rb_define_method(rb_cHash,"select!", rb_hash_select_bang, 0);
     rb_define_method(rb_cHash,"reject", rb_hash_reject, 0);
     rb_define_method(rb_cHash,"reject!", rb_hash_reject_bang, 0);
     rb_define_method(rb_cHash,"clear", rb_hash_clear, 0);
@@ -2539,6 +2879,9 @@ Init_Hash()
     rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
     rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
     rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
+    rb_define_method(rb_cHash, "assoc", rb_hash_assoc, 1);
+    rb_define_method(rb_cHash, "rassoc", rb_hash_rassoc, 1);
+    rb_define_method(rb_cHash, "flatten", rb_hash_flatten, -1);
 
     rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
     rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
@@ -2547,7 +2890,9 @@ Init_Hash()
     rb_define_method(rb_cHash,"key?", rb_hash_has_key, 1);
     rb_define_method(rb_cHash,"value?", rb_hash_has_value, 1);
 
-#ifndef __MACOS__ /* environment variables nothing on MacOS. */
+    rb_define_method(rb_cHash,"compare_by_identity", rb_hash_compare_by_id, 0);
+    rb_define_method(rb_cHash,"compare_by_identity?", rb_hash_compare_by_id_p, 0);
+
     origenviron = environ;
     envtbl = rb_obj_alloc(rb_cObject);
     rb_extend_object(envtbl, rb_mEnumerable);
@@ -2556,16 +2901,18 @@ Init_Hash()
     rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
     rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
     rb_define_singleton_method(envtbl,"store", env_aset, 2);
-    rb_define_singleton_method(envtbl,"each", env_each, 0);
+    rb_define_singleton_method(envtbl,"each", env_each_pair, 0);
     rb_define_singleton_method(envtbl,"each_pair", env_each_pair, 0);
     rb_define_singleton_method(envtbl,"each_key", env_each_key, 0);
     rb_define_singleton_method(envtbl,"each_value", env_each_value, 0);
     rb_define_singleton_method(envtbl,"delete", env_delete_m, 1);
     rb_define_singleton_method(envtbl,"delete_if", env_delete_if, 0);
-    rb_define_singleton_method(envtbl,"clear", env_clear, 0);
+    rb_define_singleton_method(envtbl,"keep_if", env_keep_if, 0);
+    rb_define_singleton_method(envtbl,"clear", rb_env_clear, 0);
     rb_define_singleton_method(envtbl,"reject", env_reject, 0);
     rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
-    rb_define_singleton_method(envtbl,"select", env_select, -1);
+    rb_define_singleton_method(envtbl,"select", env_select, 0);
+    rb_define_singleton_method(envtbl,"select!", env_select_bang, 0);
     rb_define_singleton_method(envtbl,"shift", env_shift, 0);
     rb_define_singleton_method(envtbl,"invert", env_invert, 0);
     rb_define_singleton_method(envtbl,"replace", env_replace, 1);
@@ -2574,9 +2921,8 @@ Init_Hash()
     rb_define_singleton_method(envtbl,"rehash", env_none, 0);
     rb_define_singleton_method(envtbl,"to_a", env_to_a, 0);
     rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
+    rb_define_singleton_method(envtbl,"key", env_key, 1);
     rb_define_singleton_method(envtbl,"index", env_index, 1);
-    rb_define_singleton_method(envtbl,"indexes", env_indexes, -1);
-    rb_define_singleton_method(envtbl,"indices", env_indexes, -1);
     rb_define_singleton_method(envtbl,"size", env_size, 0);
     rb_define_singleton_method(envtbl,"length", env_size, 0);
     rb_define_singleton_method(envtbl,"empty?", env_empty_p, 0);
@@ -2590,10 +2936,8 @@ Init_Hash()
     rb_define_singleton_method(envtbl,"key?", env_has_key, 1);
     rb_define_singleton_method(envtbl,"value?", env_has_value, 1);
     rb_define_singleton_method(envtbl,"to_hash", env_to_hash, 0);
+    rb_define_singleton_method(envtbl,"assoc", env_assoc, 1);
+    rb_define_singleton_method(envtbl,"rassoc", env_rassoc, 1);
 
     rb_define_global_const("ENV", envtbl);
-#else /* __MACOS__ */
-	envtbl = rb_hash_s_new(0, NULL, rb_cHash);
-    rb_define_global_const("ENV", envtbl);
-#endif  /* ifndef __MACOS__  environment variables nothing on MacOS. */
 }
diff --git a/ia64.s b/ia64.s
index ba5241daf2..92415b4e97 100644
--- a/ia64.s
+++ b/ia64.s
@@ -6,6 +6,15 @@
 //   void rb_ia64_flushrs(void) { __builtin_ia64_flushrs(); }
 //   void *rb_ia64_bsp(void) { return __builtin_ia64_bsp(); }
 // 
+// Note that rb_ia64_flushrs and rb_ia64_bsp works in its own stack frame.
+// It's because BSP is updated by br.call/brl.call (not alloc instruction).
+// So rb_ia64_flushrs flushes stack frames including caller's one.
+// rb_ia64_bsp returns the address next to caller's register stack frame. 
+//
+// See also
+// Intel Itanium Architecture Software Developer's Manual
+// Volume 2: System Architecture.
+//
 	.file	"ia64.c"
 	.text
 	.align 16
diff --git a/id.c b/id.c
new file mode 100644
index 0000000000..2111751a37
--- /dev/null
+++ b/id.c
@@ -0,0 +1,50 @@
+/**********************************************************************
+
+  id.c -
+
+  $Author$
+  created at: Thu Jul 12 04:37:51 2007
+
+  Copyright (C) 2004-2007 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+
+#include "id.h"
+
+static void
+Init_id(void)
+{
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+    rb_encoding *enc = rb_usascii_encoding();
+
+    REGISTER_SYMID(idNULL, "");
+    REGISTER_SYMID(idIFUNC, "<IFUNC>");
+    REGISTER_SYMID(idCFUNC, "<CFUNC>");
+    REGISTER_SYMID(idRespond_to, "respond_to?");
+
+    REGISTER_SYMID(id_core_set_method_alias,   	    "core#set_method_alias");
+    REGISTER_SYMID(id_core_set_variable_alias, 	    "core#set_variable_alias");
+    REGISTER_SYMID(id_core_undef_method,       	    "core#undef_method");
+    REGISTER_SYMID(id_core_define_method,      	    "core#define_method");
+    REGISTER_SYMID(id_core_define_singleton_method, "core#define_singleton_method");
+    REGISTER_SYMID(id_core_set_postexe,             "core#set_postexe");
+
+    REGISTER_SYMID(idEach, "each");
+    REGISTER_SYMID(idLength, "length");
+    REGISTER_SYMID(idSize, "size");
+    REGISTER_SYMID(idLambda, "lambda");
+    REGISTER_SYMID(idIntern, "intern");
+    REGISTER_SYMID(idGets, "gets");
+    REGISTER_SYMID(idSucc, "succ");
+    REGISTER_SYMID(idMethodMissing, "method_missing");
+#if SUPPORT_JOKE
+    REGISTER_SYMID(idBitblt, "bitblt");
+    REGISTER_SYMID(idAnswer, "the_answer_to_life_the_universe_and_everything");
+#endif
+    REGISTER_SYMID(idSend, "send");
+    REGISTER_SYMID(id__send__, "__send__");
+    REGISTER_SYMID(idInitialize, "initialize");
+}
diff --git a/include/ruby.h b/include/ruby.h
new file mode 100644
index 0000000000..862b1687d4
--- /dev/null
+++ b/include/ruby.h
@@ -0,0 +1,34 @@
+/**********************************************************************
+
+  ruby.h -
+
+  $Author$
+  created at: Sun 10 12:06:15 Jun JST 2007
+
+  Copyright (C) 2007-2008 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBY_H
+#define RUBY_H 1
+
+#define HAVE_RUBY_DEFINES_H     1
+#define HAVE_RUBY_ENCODING_H    1
+#define HAVE_RUBY_INTERN_H      1
+#define HAVE_RUBY_IO_H          1
+#define HAVE_RUBY_MISSING_H     1
+#define HAVE_RUBY_ONIGURUMA_H   1
+#define HAVE_RUBY_RE_H          1
+#define HAVE_RUBY_REGEX_H       1
+#define HAVE_RUBY_RUBY_H        1
+#define HAVE_RUBY_ST_H          1
+#define HAVE_RUBY_UTIL_H        1
+#define HAVE_RUBY_VERSION_H     1
+#define HAVE_RUBY_VM_H          1
+#ifdef _WIN32
+#define HAVE_RUBY_WIN32_H       1
+#endif
+
+#include "ruby/ruby.h"
+
+#endif /* RUBY_H */
diff --git a/include/ruby/backward/rubyio.h b/include/ruby/backward/rubyio.h
new file mode 100644
index 0000000000..d5246db546
--- /dev/null
+++ b/include/ruby/backward/rubyio.h
@@ -0,0 +1,6 @@
+#if   defined __GNUC__
+#warning use "ruby/io.h" instead of "rubyio.h"
+#elif defined _MSC_VER || defined __BORLANDC__
+#pragma message("warning: use \"ruby/io.h\" instead of \"rubyio.h\"")
+#endif
+#include "ruby/io.h"
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
new file mode 100644
index 0000000000..3952f7e85e
--- /dev/null
+++ b/include/ruby/backward/rubysig.h
@@ -0,0 +1,48 @@
+/**********************************************************************
+
+  rubysig.h -
+
+  $Author$
+  $Date$
+  created at: Wed Aug 16 01:15:38 JST 1995
+
+  Copyright (C) 1993-2008 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#if   defined __GNUC__
+#warning rubysig.h is obsolete
+#elif defined _MSC_VER || defined __BORLANDC__
+#pragma message("warning: rubysig.h is obsolete")
+#endif
+
+#ifndef RUBYSIG_H
+#define RUBYSIG_H
+#include "ruby/ruby.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+struct rb_blocking_region_buffer;
+DEPRECATED(RUBY_EXTERN struct rb_blocking_region_buffer *rb_thread_blocking_region_begin(void));
+DEPRECATED(RUBY_EXTERN void rb_thread_blocking_region_end(struct rb_blocking_region_buffer *));
+#define TRAP_BEG do {struct rb_blocking_region_buffer *__region = rb_thread_blocking_region_begin();
+#define TRAP_END rb_thread_blocking_region_end(__region);} while (0)
+#define RUBY_CRITICAL(statements) do {statements;} while (0)
+#define DEFER_INTS (0)
+#define ENABLE_INTS (1)
+#define ALLOW_INTS do {CHECK_INTS;} while (0)
+#define CHECK_INTS rb_thread_check_ints()
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif
diff --git a/include/ruby/backward/st.h b/include/ruby/backward/st.h
new file mode 100644
index 0000000000..514128e616
--- /dev/null
+++ b/include/ruby/backward/st.h
@@ -0,0 +1,6 @@
+#if   defined __GNUC__
+#warning use "ruby/st.h" instead of bare "st.h"
+#elif defined _MSC_VER || defined __BORLANDC__
+#pragma message("warning: use \"ruby/st.h\" instead of bare \"st.h\"")
+#endif
+#include "ruby/st.h"
diff --git a/include/ruby/backward/util.h b/include/ruby/backward/util.h
new file mode 100644
index 0000000000..6b47940ddc
--- /dev/null
+++ b/include/ruby/backward/util.h
@@ -0,0 +1,6 @@
+#if   defined __GNUC__
+#warning use "ruby/util.h" instead of bare "util.h"
+#elif defined _MSC_VER || defined __BORLANDC__
+#pragma message("warning: use \"ruby/util.h\" instead of bare \"util.h\"")
+#endif
+#include "ruby/util.h"
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
new file mode 100644
index 0000000000..7bb2788aaf
--- /dev/null
+++ b/include/ruby/defines.h
@@ -0,0 +1,321 @@
+/************************************************
+
+  defines.h -
+
+  $Author$
+  created at: Wed May 18 00:21:44 JST 1994
+
+************************************************/
+
+#ifndef RUBY_DEFINES_H
+#define RUBY_DEFINES_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#define RUBY
+
+#include <stdlib.h>
+#ifdef __cplusplus
+# ifndef  HAVE_PROTOTYPES
+#  define HAVE_PROTOTYPES 1
+# endif
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+#undef _
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+
+#undef __
+#ifdef HAVE_STDARG_PROTOTYPES
+# define __(args) args
+#else
+# define __(args) ()
+#endif
+
+#ifdef __cplusplus
+#define ANYARGS ...
+#else
+#define ANYARGS
+#endif
+
+#define xmalloc ruby_xmalloc
+#define xmalloc2 ruby_xmalloc2
+#define xcalloc ruby_xcalloc
+#define xrealloc ruby_xrealloc
+#define xrealloc2 ruby_xrealloc2
+#define xfree ruby_xfree
+
+void *xmalloc(size_t);
+void *xmalloc2(size_t,size_t);
+void *xcalloc(size_t,size_t);
+void *xrealloc(void*,size_t);
+void *xrealloc2(void*,size_t,size_t);
+void xfree(void*);
+
+#define STRINGIZE(expr) STRINGIZE0(expr)
+#ifndef STRINGIZE0
+#define STRINGIZE0(expr) #expr
+#endif
+
+#if SIZEOF_LONG_LONG > 0
+# define LONG_LONG long long
+#elif SIZEOF___INT64 > 0
+# define HAVE_LONG_LONG 1
+# define LONG_LONG __int64
+# undef SIZEOF_LONG_LONG
+# define SIZEOF_LONG_LONG SIZEOF___INT64
+#endif
+
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned LONG_LONG
+# define BDIGIT_DBL_SIGNED LONG_LONG
+#elif SIZEOF_INT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS SIZEOF_SHORT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#else
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#endif
+
+#ifdef INFINITY
+# define HAVE_INFINITY
+#else
+/** @internal */
+extern const unsigned char rb_infinity[];
+# define INFINITY (*(float *)rb_infinity)
+#endif
+
+#ifdef NAN
+# define HAVE_NAN
+#else
+/** @internal */
+extern const unsigned char rb_nan[];
+# define NAN (*(float *)rb_nan)
+#endif
+
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
+
+#if defined(_WIN32) || defined(__EMX__)
+#define DOSISH 1
+# define DOSISH_DRIVE_LETTER
+#endif
+
+#ifdef AC_APPLE_UNIVERSAL_BUILD
+#undef WORDS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
+#define WORDS_BIGENDIAN
+#endif
+#endif
+
+#ifdef __NeXT__
+/* NextStep, OpenStep, Rhapsody */
+#ifndef S_IRUSR
+#define S_IRUSR 0000400        /* read permission, owner */
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0000040        /* read permission, group */
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0000004        /* read permission, other */
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR 0000200        /* write permission, owner */
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 0000020        /* write permission, group */
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 0000002        /* write permission, other */
+#endif
+#ifndef S_IXUSR
+#define S_IXUSR 0000100        /* execute/search permission, owner */
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0000010        /* execute/search permission, group */
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0000001        /* execute/search permission, other */
+#endif
+#ifndef S_IRWXU
+#define S_IRWXU 0000700        /* read, write, execute permissions, owner */
+#endif
+#ifndef S_IRWXG
+#define S_IRWXG 0000070        /* read, write, execute permissions, group */
+#endif
+#ifndef S_IRWXO
+#define S_IRWXO 0000007        /* read, write, execute permissions, other */
+#endif
+#ifndef S_ISBLK
+#define S_ISBLK(mode)  (((mode) & (0170000)) == (0060000))
+#endif
+#ifndef S_ISCHR
+#define S_ISCHR(mode)  (((mode) & (0170000)) == (0020000))
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(mode)  (((mode) & (0170000)) == (0040000))
+#endif
+#ifndef S_ISFIFO
+#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000))
+#endif
+#ifndef S_ISREG
+#define S_ISREG(mode)  (((mode) & (0170000)) == (0100000))
+#endif
+#ifndef __APPLE__
+/* NextStep, OpenStep (but not Rhapsody) */
+#ifndef GETPGRP_VOID
+#define GETPGRP_VOID 1
+#endif
+#ifndef WNOHANG
+#define WNOHANG 01
+#endif
+#ifndef WUNTRACED
+#define WUNTRACED 02
+#endif
+#ifndef X_OK
+#define X_OK 1
+#endif
+#endif /* __APPLE__ */
+#endif /* NeXT */
+
+#ifdef _WIN32
+#include "ruby/win32.h"
+#endif
+
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
+#include <net/socket.h> /* intern.h needs fd_set definition */
+#elif defined (__SYMBIAN32__) && defined (HAVE_SYS_SELECT_H)
+# include <sys/select.h>
+#endif
+
+#ifdef __SYMBIAN32__
+# define FALSE 0
+# define TRUE 1
+#endif
+
+#ifdef RUBY_EXPORT
+#undef RUBY_EXTERN
+
+#ifndef FALSE
+# define FALSE 0
+#elif FALSE
+# error FALSE must be false
+#endif
+#ifndef TRUE
+# define TRUE 1
+#elif !TRUE
+# error TRUE must be true
+#endif
+
+#endif
+
+#ifndef RUBY_EXTERN
+#define RUBY_EXTERN extern
+#endif
+
+#ifndef EXTERN
+#define EXTERN RUBY_EXTERN	/* deprecated */
+#endif
+
+#ifndef RUBY_MBCHAR_MAXSIZE
+#define RUBY_MBCHAR_MAXSIZE INT_MAX
+        /* MB_CUR_MAX will not work well in C locale */
+#endif
+
+#if defined(sparc) || defined(__sparc__)
+static inline void
+flush_register_windows(void)
+{
+    asm
+#ifdef __GNUC__
+	volatile
+#endif
+# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+	("flushw")
+# else
+	("ta 0x03")
+# endif /* trap always to flush register windows if we are on a Sparc system */
+	;
+}
+#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
+#elif defined(__ia64)
+void *rb_ia64_bsp(void);
+void rb_ia64_flushrs(void);
+#  define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
+#else
+#  define FLUSH_REGISTER_WINDOWS ((void)0)
+#endif
+
+#if defined(DOSISH)
+#define PATH_SEP ";"
+#else
+#define PATH_SEP ":"
+#endif
+#define PATH_SEP_CHAR PATH_SEP[0]
+
+#define PATH_ENV "PATH"
+
+#if defined(DOSISH) && !defined(__EMX__)
+#define ENV_IGNORECASE
+#endif
+
+#ifndef CASEFOLD_FILESYSTEM
+# if defined DOSISH
+#   define CASEFOLD_FILESYSTEM 1
+# else
+#   define CASEFOLD_FILESYSTEM 0
+# endif
+#endif
+
+#ifndef DLEXT_MAXLEN
+#define DLEXT_MAXLEN 4
+#endif
+
+#ifndef RUBY_PLATFORM
+#define RUBY_PLATFORM "unknown-unknown"
+#endif
+
+#ifndef RUBY_ALIAS_FUNCTION_TYPE
+#define RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args) \
+    type prot {return name args;}
+#endif
+#ifndef RUBY_ALIAS_FUNCTION_VOID
+#define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) \
+    void prot {name args;}
+#endif
+#ifndef RUBY_ALIAS_FUNCTION
+#define RUBY_ALIAS_FUNCTION(prot, name, args) \
+    RUBY_ALIAS_FUNCTION_TYPE(VALUE, prot, name, args)
+#endif
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_DEFINES_H */
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
new file mode 100644
index 0000000000..1573b5b200
--- /dev/null
+++ b/include/ruby/encoding.h
@@ -0,0 +1,323 @@
+/**********************************************************************
+
+  encoding.h -
+
+  $Author: matz $
+  created at: Thu May 24 11:49:41 JST 2007
+
+  Copyright (C) 2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBY_ENCODING_H
+#define RUBY_ENCODING_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#include <stdarg.h>
+#include "ruby/oniguruma.h"
+
+#define ENCODING_INLINE_MAX 1023
+#define ENCODING_SHIFT (FL_USHIFT+10)
+#define ENCODING_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT)
+
+#define ENCODING_SET_INLINED(obj,i) do {\
+    RBASIC(obj)->flags &= ~ENCODING_MASK;\
+    RBASIC(obj)->flags |= (VALUE)(i) << ENCODING_SHIFT;\
+} while (0)
+#define ENCODING_SET(obj,i) do {\
+    VALUE rb_encoding_set_obj = (obj); \
+    int encoding_set_enc_index = (i); \
+    if (encoding_set_enc_index < ENCODING_INLINE_MAX) \
+        ENCODING_SET_INLINED(rb_encoding_set_obj, encoding_set_enc_index); \
+    else \
+        rb_enc_set_index(rb_encoding_set_obj, encoding_set_enc_index); \
+} while (0)
+
+#define ENCODING_GET_INLINED(obj) (int)((RBASIC(obj)->flags & ENCODING_MASK)>>ENCODING_SHIFT)
+#define ENCODING_GET(obj) \
+    (ENCODING_GET_INLINED(obj) != ENCODING_INLINE_MAX ? \
+     ENCODING_GET_INLINED(obj) : \
+     rb_enc_get_index(obj))
+
+#define ENCODING_IS_ASCII8BIT(obj) (ENCODING_GET_INLINED(obj) == 0)
+
+#define ENCODING_MAXNAMELEN 42
+
+#define ENC_CODERANGE_MASK	((int)(FL_USER8|FL_USER9))
+#define ENC_CODERANGE_UNKNOWN	0
+#define ENC_CODERANGE_7BIT	((int)FL_USER8)
+#define ENC_CODERANGE_VALID	((int)FL_USER9)
+#define ENC_CODERANGE_BROKEN	((int)(FL_USER8|FL_USER9))
+#define ENC_CODERANGE(obj) ((int)RBASIC(obj)->flags & ENC_CODERANGE_MASK)
+#define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT)
+#define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \
+				   (RBASIC(obj)->flags & ~ENC_CODERANGE_MASK) | (cr))
+#define ENC_CODERANGE_CLEAR(obj) ENC_CODERANGE_SET(obj,0)
+
+/* assumed ASCII compatibility */
+#define ENC_CODERANGE_AND(a, b) \
+    (a == ENC_CODERANGE_7BIT ? b : \
+     a == ENC_CODERANGE_VALID ? (b == ENC_CODERANGE_7BIT ? ENC_CODERANGE_VALID : b) : \
+     ENC_CODERANGE_UNKNOWN)
+
+#define ENCODING_CODERANGE_SET(obj, encindex, cr) \
+    do { \
+        VALUE rb_encoding_coderange_obj = (obj); \
+        ENCODING_SET(rb_encoding_coderange_obj, (encindex)); \
+        ENC_CODERANGE_SET(rb_encoding_coderange_obj, (cr)); \
+    } while (0)
+
+typedef OnigEncodingType rb_encoding;
+
+int rb_enc_replicate(const char *, rb_encoding *);
+int rb_define_dummy_encoding(const char *);
+#define rb_enc_to_index(enc) ((enc) ? ENC_TO_ENCINDEX(enc) : 0)
+int rb_enc_get_index(VALUE obj);
+void rb_enc_set_index(VALUE obj, int encindex);
+int rb_enc_find_index(const char *name);
+int rb_to_encoding_index(VALUE);
+rb_encoding* rb_to_encoding(VALUE);
+rb_encoding* rb_enc_get(VALUE);
+rb_encoding* rb_enc_compatible(VALUE,VALUE);
+rb_encoding* rb_enc_check(VALUE,VALUE);
+VALUE rb_enc_associate_index(VALUE, int);
+VALUE rb_enc_associate(VALUE, rb_encoding*);
+void rb_enc_copy(VALUE dst, VALUE src);
+
+VALUE rb_enc_str_new(const char*, long, rb_encoding*);
+VALUE rb_enc_reg_new(const char*, long, rb_encoding*, int);
+PRINTF_ARGS(VALUE rb_enc_sprintf(rb_encoding *, const char*, ...), 2, 3);
+VALUE rb_enc_vsprintf(rb_encoding *, const char*, va_list);
+long rb_enc_strlen(const char*, const char*, rb_encoding*);
+char* rb_enc_nth(const char*, const char*, long, rb_encoding*);
+VALUE rb_obj_encoding(VALUE);
+VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *enc);
+VALUE rb_enc_uint_chr(unsigned int code, rb_encoding *enc);
+
+VALUE rb_external_str_new_with_enc(const char *ptr, long len, rb_encoding *);
+VALUE rb_str_export_to_enc(VALUE, rb_encoding *);
+VALUE rb_str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to);
+VALUE rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags, VALUE ecopts);
+
+/* index -> rb_encoding */
+rb_encoding* rb_enc_from_index(int idx);
+
+/* name -> rb_encoding */
+rb_encoding * rb_enc_find(const char *name);
+
+/* rb_encoding * -> name */
+#define rb_enc_name(enc) (enc)->name
+
+/* rb_encoding * -> minlen/maxlen */
+#define rb_enc_mbminlen(enc) (enc)->min_enc_len
+#define rb_enc_mbmaxlen(enc) (enc)->max_enc_len
+
+/* -> mbclen (no error notification: 0 < ret <= e-p, no exception) */
+int rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc);
+
+/* -> mbclen (only for valid encoding) */
+int rb_enc_fast_mbclen(const char *p, const char *e, rb_encoding *enc);
+
+/* -> chlen, invalid or needmore */
+int rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc);
+#define MBCLEN_CHARFOUND_P(ret)     ONIGENC_MBCLEN_CHARFOUND_P(ret)
+#define MBCLEN_CHARFOUND_LEN(ret)     ONIGENC_MBCLEN_CHARFOUND_LEN(ret)
+#define MBCLEN_INVALID_P(ret)       ONIGENC_MBCLEN_INVALID_P(ret)
+#define MBCLEN_NEEDMORE_P(ret)      ONIGENC_MBCLEN_NEEDMORE_P(ret)
+#define MBCLEN_NEEDMORE_LEN(ret)      ONIGENC_MBCLEN_NEEDMORE_LEN(ret)
+
+/* -> 0x00..0x7f, -1 */
+int rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc);
+
+
+/* -> code (and len) or raise exception */
+unsigned int rb_enc_codepoint_len(const char *p, const char *e, int *len, rb_encoding *enc);
+
+/* prototype for obsolete function */
+unsigned int rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc);
+/* overriding macro */
+#define rb_enc_codepoint(p,e,enc) rb_enc_codepoint_len((p),(e),0,(enc))
+#define rb_enc_mbc_to_codepoint(p, e, enc) ONIGENC_MBC_TO_CODE(enc,(UChar*)(p),(UChar*)(e))
+
+/* -> codelen>0 or raise exception */
+int rb_enc_codelen(int code, rb_encoding *enc);
+
+/* code,ptr,encoding -> write buf */
+#define rb_enc_mbcput(c,buf,enc) ONIGENC_CODE_TO_MBC(enc,c,(UChar*)(buf))
+
+/* start, ptr, end, encoding -> prev_char */
+#define rb_enc_prev_char(s,p,e,enc) (char *)onigenc_get_prev_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e))
+/* start, ptr, end, encoding -> next_char */
+#define rb_enc_left_char_head(s,p,e,enc) (char *)onigenc_get_left_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e))
+#define rb_enc_right_char_head(s,p,e,enc) (char *)onigenc_get_right_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e))
+
+/* ptr, ptr, encoding -> newline_or_not */
+#define rb_enc_is_newline(p,end,enc)  ONIGENC_IS_MBC_NEWLINE(enc,(UChar*)(p),(UChar*)(end))
+
+#define rb_enc_isctype(c,t,enc) ONIGENC_IS_CODE_CTYPE(enc,c,t)
+#define rb_enc_isascii(c,enc) ONIGENC_IS_CODE_ASCII(c)
+#define rb_enc_isalpha(c,enc) ONIGENC_IS_CODE_ALPHA(enc,c)
+#define rb_enc_islower(c,enc) ONIGENC_IS_CODE_LOWER(enc,c)
+#define rb_enc_isupper(c,enc) ONIGENC_IS_CODE_UPPER(enc,c)
+#define rb_enc_ispunct(c,enc) ONIGENC_IS_CODE_PUNCT(enc,c)
+#define rb_enc_isalnum(c,enc) ONIGENC_IS_CODE_ALNUM(enc,c)
+#define rb_enc_isprint(c,enc) ONIGENC_IS_CODE_PRINT(enc,c)
+#define rb_enc_isspace(c,enc) ONIGENC_IS_CODE_SPACE(enc,c)
+#define rb_enc_isdigit(c,enc) ONIGENC_IS_CODE_DIGIT(enc,c)
+
+#define rb_enc_asciicompat(enc) (rb_enc_mbminlen(enc)==1 && !rb_enc_dummy_p(enc))
+
+int rb_enc_casefold(char *to, const char *p, const char *e, rb_encoding *enc);
+int rb_enc_toupper(int c, rb_encoding *enc);
+int rb_enc_tolower(int c, rb_encoding *enc);
+ID rb_intern3(const char*, long, rb_encoding*);
+ID rb_interned_id_p(const char *, long, rb_encoding *);
+int rb_enc_symname_p(const char*, rb_encoding*);
+int rb_enc_symname2_p(const char*, long, rb_encoding*);
+int rb_enc_str_coderange(VALUE);
+long rb_str_coderange_scan_restartable(const char*, const char*, rb_encoding*, int*);
+int rb_enc_str_asciionly_p(VALUE);
+#define rb_enc_str_asciicompat_p(str) rb_enc_asciicompat(rb_enc_get(str))
+VALUE rb_enc_from_encoding(rb_encoding *enc);
+int rb_enc_unicode_p(rb_encoding *enc);
+rb_encoding *rb_ascii8bit_encoding(void);
+rb_encoding *rb_utf8_encoding(void);
+rb_encoding *rb_usascii_encoding(void);
+rb_encoding *rb_locale_encoding(void);
+rb_encoding *rb_filesystem_encoding(void);
+rb_encoding *rb_default_external_encoding(void);
+rb_encoding *rb_default_internal_encoding(void);
+int rb_ascii8bit_encindex(void);
+int rb_utf8_encindex(void);
+int rb_usascii_encindex(void);
+int rb_locale_encindex(void);
+int rb_filesystem_encindex(void);
+VALUE rb_enc_default_external(void);
+VALUE rb_enc_default_internal(void);
+void rb_enc_set_default_external(VALUE encoding);
+void rb_enc_set_default_internal(VALUE encoding);
+VALUE rb_locale_charmap(VALUE klass);
+long rb_memsearch(const void*,long,const void*,long,rb_encoding*);
+
+RUBY_EXTERN VALUE rb_cEncoding;
+#define ENC_DUMMY_FLAG (1<<24)
+#define ENC_INDEX_MASK (~(~0U<<24))
+
+#define ENC_TO_ENCINDEX(enc) (int)((enc)->ruby_encoding_index & ENC_INDEX_MASK)
+
+#define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG)
+#define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG)
+
+static inline int
+rb_enc_dummy_p(rb_encoding *enc)
+{
+    return ENC_DUMMY_P(enc) != 0;
+}
+
+/* econv stuff */
+
+typedef enum {
+    econv_invalid_byte_sequence,
+    econv_undefined_conversion,
+    econv_destination_buffer_full,
+    econv_source_buffer_empty,
+    econv_finished,
+    econv_after_output,
+    econv_incomplete_input
+} rb_econv_result_t;
+
+typedef struct rb_econv_t rb_econv_t;
+
+VALUE rb_str_encode(VALUE str, VALUE to, int ecflags, VALUE ecopts);
+int rb_econv_has_convpath_p(const char* from_encoding, const char* to_encoding);
+
+int rb_econv_prepare_opts(VALUE opthash, VALUE *ecopts);
+
+rb_econv_t *rb_econv_open(const char *source_encoding, const char *destination_encoding, int ecflags);
+rb_econv_t *rb_econv_open_opts(const char *source_encoding, const char *destination_encoding, int ecflags, VALUE ecopts);
+
+rb_econv_result_t rb_econv_convert(rb_econv_t *ec,
+    const unsigned char **source_buffer_ptr, const unsigned char *source_buffer_end,
+    unsigned char **destination_buffer_ptr, unsigned char *destination_buffer_end,
+    int flags);
+void rb_econv_close(rb_econv_t *ec);
+
+/* result: 0:success -1:failure */
+int rb_econv_set_replacement(rb_econv_t *ec, const unsigned char *str, size_t len, const char *encname);
+
+/* result: 0:success -1:failure */
+int rb_econv_decorate_at_first(rb_econv_t *ec, const char *decorator_name);
+int rb_econv_decorate_at_last(rb_econv_t *ec, const char *decorator_name);
+
+VALUE rb_econv_open_exc(const char *senc, const char *denc, int ecflags);
+
+/* result: 0:success -1:failure */
+int rb_econv_insert_output(rb_econv_t *ec,
+    const unsigned char *str, size_t len, const char *str_encoding);
+
+/* encoding that rb_econv_insert_output doesn't need conversion */
+const char *rb_econv_encoding_to_insert_output(rb_econv_t *ec);
+
+/* raise an error if the last rb_econv_convert is error */
+void rb_econv_check_error(rb_econv_t *ec);
+
+/* returns an exception object or nil */
+VALUE rb_econv_make_exception(rb_econv_t *ec);
+
+int rb_econv_putbackable(rb_econv_t *ec);
+void rb_econv_putback(rb_econv_t *ec, unsigned char *p, int n);
+
+/* returns the corresponding ASCII compatible encoding for encname,
+ * or NULL if encname is not ASCII incompatible encoding. */
+const char *rb_econv_asciicompat_encoding(const char *encname);
+
+VALUE rb_econv_str_convert(rb_econv_t *ec, VALUE src, int flags);
+VALUE rb_econv_substr_convert(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, int flags);
+VALUE rb_econv_str_append(rb_econv_t *ec, VALUE src, VALUE dst, int flags);
+VALUE rb_econv_substr_append(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, VALUE dst, int flags);
+
+void rb_econv_binmode(rb_econv_t *ec);
+
+/* flags for rb_econv_open */
+
+#define ECONV_ERROR_HANDLER_MASK                0x000000ff
+
+#define ECONV_INVALID_MASK                      0x0000000f
+#define ECONV_INVALID_REPLACE                   0x00000002
+
+#define ECONV_UNDEF_MASK                        0x000000f0
+#define ECONV_UNDEF_REPLACE                     0x00000020
+#define ECONV_UNDEF_HEX_CHARREF                 0x00000030
+
+#define ECONV_DECORATOR_MASK                    0x0000ff00
+
+#define ECONV_UNIVERSAL_NEWLINE_DECORATOR       0x00000100
+#define ECONV_CRLF_NEWLINE_DECORATOR            0x00001000
+#define ECONV_CR_NEWLINE_DECORATOR              0x00002000
+#define ECONV_XML_TEXT_DECORATOR                0x00004000
+#define ECONV_XML_ATTR_CONTENT_DECORATOR        0x00008000
+
+#define ECONV_STATEFUL_DECORATOR_MASK           0x00f00000
+#define ECONV_XML_ATTR_QUOTE_DECORATOR          0x00100000
+
+/* end of flags for rb_econv_open */
+
+/* flags for rb_econv_convert */
+#define ECONV_PARTIAL_INPUT                     0x00010000
+#define ECONV_AFTER_OUTPUT                      0x00020000
+/* end of flags for rb_econv_convert */
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_ENCODING_H */
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
new file mode 100644
index 0000000000..f0cff67928
--- /dev/null
+++ b/include/ruby/intern.h
@@ -0,0 +1,849 @@
+/**********************************************************************
+
+  intern.h -
+
+  $Author$
+  created at: Thu Jun 10 14:22:17 JST 1993
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#ifndef RUBY_INTERN_H
+#define RUBY_INTERN_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#ifdef HAVE_STDARG_PROTOTYPES
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+#include "ruby/st.h"
+
+/*
+ * Functions and variables that are used by more than one source file of
+ * the kernel.
+ */
+
+#define ID_ALLOCATOR 1
+
+/* array.c */
+void rb_mem_clear(register VALUE*, register long);
+VALUE rb_assoc_new(VALUE, VALUE);
+VALUE rb_check_array_type(VALUE);
+VALUE rb_ary_new(void);
+VALUE rb_ary_new2(long);
+VALUE rb_ary_new3(long,...);
+VALUE rb_ary_new4(long, const VALUE *);
+VALUE rb_ary_tmp_new(long);
+void rb_ary_free(VALUE);
+VALUE rb_ary_freeze(VALUE);
+VALUE rb_ary_aref(int, VALUE*, VALUE);
+VALUE rb_ary_subseq(VALUE, long, long);
+void rb_ary_store(VALUE, long, VALUE);
+VALUE rb_ary_dup(VALUE);
+VALUE rb_ary_to_ary(VALUE);
+VALUE rb_ary_to_s(VALUE);
+VALUE rb_ary_push(VALUE, VALUE);
+VALUE rb_ary_pop(VALUE);
+VALUE rb_ary_shift(VALUE);
+VALUE rb_ary_unshift(VALUE, VALUE);
+VALUE rb_ary_entry(VALUE, long);
+VALUE rb_ary_each(VALUE);
+VALUE rb_ary_join(VALUE, VALUE);
+VALUE rb_ary_print_on(VALUE, VALUE);
+VALUE rb_ary_reverse(VALUE);
+VALUE rb_ary_sort(VALUE);
+VALUE rb_ary_sort_bang(VALUE);
+VALUE rb_ary_delete(VALUE, VALUE);
+VALUE rb_ary_delete_at(VALUE, long);
+VALUE rb_ary_clear(VALUE);
+VALUE rb_ary_plus(VALUE, VALUE);
+VALUE rb_ary_concat(VALUE, VALUE);
+VALUE rb_ary_assoc(VALUE, VALUE);
+VALUE rb_ary_rassoc(VALUE, VALUE);
+VALUE rb_ary_includes(VALUE, VALUE);
+VALUE rb_ary_cmp(VALUE, VALUE);
+VALUE rb_ary_replace(VALUE copy, VALUE orig);
+VALUE rb_get_values_at(VALUE, long, int, VALUE*, VALUE(*)(VALUE,long));
+/* bignum.c */
+VALUE rb_big_new(long, int);
+int rb_bigzero_p(VALUE x);
+VALUE rb_big_clone(VALUE);
+void rb_big_2comp(VALUE);
+VALUE rb_big_norm(VALUE);
+void rb_big_resize(VALUE big, long len);
+VALUE rb_uint2big(VALUE);
+VALUE rb_int2big(SIGNED_VALUE);
+VALUE rb_uint2inum(VALUE);
+VALUE rb_int2inum(SIGNED_VALUE);
+VALUE rb_cstr_to_inum(const char*, int, int);
+VALUE rb_str_to_inum(VALUE, int, int);
+VALUE rb_cstr2inum(const char*, int);
+VALUE rb_str2inum(VALUE, int);
+VALUE rb_big2str(VALUE, int);
+VALUE rb_big2str0(VALUE, int, int);
+SIGNED_VALUE rb_big2long(VALUE);
+#define rb_big2int(x) rb_big2long(x)
+VALUE rb_big2ulong(VALUE);
+#define rb_big2uint(x) rb_big2ulong(x)
+#if HAVE_LONG_LONG
+VALUE rb_ll2inum(LONG_LONG);
+VALUE rb_ull2inum(unsigned LONG_LONG);
+LONG_LONG rb_big2ll(VALUE);
+unsigned LONG_LONG rb_big2ull(VALUE);
+#endif  /* HAVE_LONG_LONG */
+void rb_quad_pack(char*,VALUE);
+VALUE rb_quad_unpack(const char*,int);
+void rb_big_pack(VALUE val, unsigned long *buf, long num_longs);
+VALUE rb_big_unpack(unsigned long *buf, long num_longs);
+int rb_uv_to_utf8(char[6],unsigned long);
+VALUE rb_dbl2big(double);
+double rb_big2dbl(VALUE);
+VALUE rb_big_cmp(VALUE, VALUE);
+VALUE rb_big_eq(VALUE, VALUE);
+VALUE rb_big_plus(VALUE, VALUE);
+VALUE rb_big_minus(VALUE, VALUE);
+VALUE rb_big_mul(VALUE, VALUE);
+VALUE rb_big_div(VALUE, VALUE);
+VALUE rb_big_idiv(VALUE, VALUE);
+VALUE rb_big_modulo(VALUE, VALUE);
+VALUE rb_big_divmod(VALUE, VALUE);
+VALUE rb_big_pow(VALUE, VALUE);
+VALUE rb_big_and(VALUE, VALUE);
+VALUE rb_big_or(VALUE, VALUE);
+VALUE rb_big_xor(VALUE, VALUE);
+VALUE rb_big_lshift(VALUE, VALUE);
+VALUE rb_big_rshift(VALUE, VALUE);
+/* rational.c */
+VALUE rb_rational_raw(VALUE, VALUE);
+#define rb_rational_raw1(x) rb_rational_raw(x, INT2FIX(1))
+#define rb_rational_raw2(x,y) rb_rational_raw(x, y)
+VALUE rb_rational_new(VALUE, VALUE);
+#define rb_rational_new1(x) rb_rational_new(x, INT2FIX(1))
+#define rb_rational_new2(x,y) rb_rational_new(x, y)
+VALUE rb_Rational(VALUE, VALUE);
+#define rb_Rational1(x) rb_Rational(x, INT2FIX(1))
+#define rb_Rational2(x,y) rb_Rational(x, y)
+/* complex.c */
+VALUE rb_complex_raw(VALUE, VALUE);
+#define rb_complex_raw1(x) rb_complex_raw(x, INT2FIX(0))
+#define rb_complex_raw2(x,y) rb_complex_raw(x, y)
+VALUE rb_complex_new(VALUE, VALUE);
+#define rb_complex_new1(x) rb_complex_new(x, INT2FIX(0))
+#define rb_complex_new2(x,y) rb_complex_new(x, y)
+VALUE rb_complex_polar(VALUE, VALUE);
+VALUE rb_Complex(VALUE, VALUE);
+#define rb_Complex1(x) rb_Complex(x, INT2FIX(0))
+#define rb_Complex2(x,y) rb_Complex(x, y)
+/* class.c */
+VALUE rb_class_boot(VALUE);
+VALUE rb_class_new(VALUE);
+VALUE rb_mod_init_copy(VALUE, VALUE);
+VALUE rb_class_init_copy(VALUE, VALUE);
+VALUE rb_singleton_class_clone(VALUE);
+void rb_singleton_class_attached(VALUE,VALUE);
+VALUE rb_make_metaclass(VALUE, VALUE);
+void rb_check_inheritable(VALUE);
+VALUE rb_class_inherited(VALUE, VALUE);
+VALUE rb_define_class_id(ID, VALUE);
+VALUE rb_define_class_id_under(VALUE, ID, VALUE);
+VALUE rb_module_new(void);
+VALUE rb_define_module_id(ID);
+VALUE rb_define_module_id_under(VALUE, ID);
+VALUE rb_mod_included_modules(VALUE);
+VALUE rb_mod_include_p(VALUE, VALUE);
+VALUE rb_mod_ancestors(VALUE);
+VALUE rb_class_instance_methods(int, VALUE*, VALUE);
+VALUE rb_class_public_instance_methods(int, VALUE*, VALUE);
+VALUE rb_class_protected_instance_methods(int, VALUE*, VALUE);
+VALUE rb_class_private_instance_methods(int, VALUE*, VALUE);
+VALUE rb_obj_singleton_methods(int, VALUE*, VALUE);
+void rb_define_method_id(VALUE, ID, VALUE (*)(ANYARGS), int);
+void rb_frozen_class_p(VALUE);
+void rb_undef(VALUE, ID);
+void rb_define_protected_method(VALUE, const char*, VALUE (*)(ANYARGS), int);
+void rb_define_private_method(VALUE, const char*, VALUE (*)(ANYARGS), int);
+void rb_define_singleton_method(VALUE, const char*, VALUE(*)(ANYARGS), int);
+VALUE rb_singleton_class(VALUE);
+/* compar.c */
+int rb_cmpint(VALUE, VALUE, VALUE);
+NORETURN(void rb_cmperr(VALUE, VALUE));
+/* cont.c */
+VALUE rb_fiber_new(VALUE (*)(ANYARGS), VALUE);
+VALUE rb_fiber_resume(VALUE fib, int argc, VALUE *args);
+VALUE rb_fiber_yield(int argc, VALUE *args);
+VALUE rb_fiber_current(void);
+VALUE rb_fiber_alive_p(VALUE);
+/* enum.c */
+/* enumerator.c */
+VALUE rb_enumeratorize(VALUE, VALUE, int, VALUE *);
+#define RETURN_ENUMERATOR(obj, argc, argv) do {				\
+	if (!rb_block_given_p())					\
+	    return rb_enumeratorize(obj, ID2SYM(rb_frame_this_func()),	\
+				    argc, argv);			\
+    } while (0)
+/* error.c */
+VALUE rb_exc_new(VALUE, const char*, long);
+VALUE rb_exc_new2(VALUE, const char*);
+VALUE rb_exc_new3(VALUE, VALUE);
+PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2);
+PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
+NORETURN(void rb_invalid_str(const char*, const char*));
+PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4);
+PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2);
+NORETURN(void rb_load_fail(const char*));
+NORETURN(void rb_error_frozen(const char*));
+void rb_check_frozen(VALUE);
+/* eval.c */
+int rb_sourceline(void);
+const char *rb_sourcefile(void);
+VALUE rb_check_funcall(VALUE, ID, int, VALUE*);
+
+#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)
+typedef struct {
+    int maxfd;
+    fd_set *fdset;
+} rb_fdset_t;
+
+void rb_fd_init(volatile rb_fdset_t *);
+void rb_fd_term(rb_fdset_t *);
+void rb_fd_zero(rb_fdset_t *);
+void rb_fd_set(int, rb_fdset_t *);
+void rb_fd_clr(int, rb_fdset_t *);
+int rb_fd_isset(int, const rb_fdset_t *);
+void rb_fd_copy(rb_fdset_t *, const fd_set *, int);
+int rb_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
+
+#define rb_fd_ptr(f)	((f)->fdset)
+#define rb_fd_max(f)	((f)->maxfd)
+
+#elif defined(_WIN32)
+
+typedef struct {
+    int capa;
+    fd_set *fdset;
+} rb_fdset_t;
+
+void rb_fd_init(volatile rb_fdset_t *);
+void rb_fd_term(rb_fdset_t *);
+#define rb_fd_zero(f)		((f)->fdset->fd_count = 0)
+void rb_fd_set(int, rb_fdset_t *);
+#define rb_fd_clr(n, f)		rb_w32_fdclr(n, (f)->fdset)
+#define rb_fd_isset(n, f)	rb_w32_fdisset(n, (f)->fdset)
+#define rb_fd_select(n, rfds, wfds, efds, timeout)	rb_w32_select(n, (rfds) ? ((rb_fdset_t*)rfds)->fdset : NULL, (wfds) ? ((rb_fdset_t*)wfds)->fdset : NULL, (efds) ? ((rb_fdset_t*)efds)->fdset: NULL, timeout)
+#define rb_fd_resize(n, f)	(void)(f)
+
+#define rb_fd_ptr(f)	((f)->fdset)
+#define rb_fd_max(f)	((f)->fdset->fd_count)
+
+#else
+
+typedef fd_set rb_fdset_t;
+#define rb_fd_zero(f)	FD_ZERO(f)
+#define rb_fd_set(n, f)	FD_SET(n, f)
+#define rb_fd_clr(n, f)	FD_CLR(n, f)
+#define rb_fd_isset(n, f) FD_ISSET(n, f)
+#define rb_fd_copy(d, s, n) (*(d) = *(s))
+#define rb_fd_resize(n, f)	(void)(f)
+#define rb_fd_ptr(f)	(f)
+#define rb_fd_init(f)	FD_ZERO(f)
+#define rb_fd_term(f)	(void)(f)
+#define rb_fd_max(f)	FD_SETSIZE
+#define rb_fd_select(n, rfds, wfds, efds, timeout)	select(n, rfds, wfds, efds, timeout)
+
+#endif
+
+NORETURN(void rb_exc_raise(VALUE));
+NORETURN(void rb_exc_fatal(VALUE));
+VALUE rb_f_exit(int,VALUE*);
+VALUE rb_f_abort(int,VALUE*);
+void rb_remove_method(VALUE, const char*);
+void rb_remove_method_id(VALUE, ID);
+#define rb_disable_super(klass, name) ((void)0)
+#define rb_enable_super(klass, name) ((void)0)
+#define HAVE_RB_DEFINE_ALLOC_FUNC 1
+typedef VALUE (*rb_alloc_func_t)(VALUE);
+void rb_define_alloc_func(VALUE, rb_alloc_func_t);
+void rb_undef_alloc_func(VALUE);
+rb_alloc_func_t rb_get_alloc_func(VALUE);
+void rb_clear_cache(void);
+void rb_clear_cache_by_class(VALUE);
+void rb_alias(VALUE, ID, ID);
+void rb_attr(VALUE,ID,int,int,int);
+int rb_method_boundp(VALUE, ID, int);
+int rb_method_basic_definition_p(VALUE, ID);
+VALUE rb_eval_cmd(VALUE, VALUE, int);
+int rb_obj_respond_to(VALUE, ID, int);
+int rb_respond_to(VALUE, ID);
+VALUE rb_f_notimplement(int argc, VALUE *argv, VALUE obj);
+void rb_interrupt(void);
+VALUE rb_apply(VALUE, ID, VALUE);
+void rb_backtrace(void);
+ID rb_frame_this_func(void);
+VALUE rb_obj_instance_eval(int, VALUE*, VALUE);
+VALUE rb_obj_instance_exec(int, VALUE*, VALUE);
+VALUE rb_mod_module_eval(int, VALUE*, VALUE);
+VALUE rb_mod_module_exec(int, VALUE*, VALUE);
+void rb_load(VALUE, int);
+void rb_load_protect(VALUE, int, int*);
+NORETURN(void rb_jump_tag(int));
+int rb_provided(const char*);
+int rb_feature_provided(const char *, const char **);
+void rb_provide(const char*);
+VALUE rb_f_require(VALUE, VALUE);
+VALUE rb_require_safe(VALUE, int);
+void rb_obj_call_init(VALUE, int, VALUE*);
+VALUE rb_class_new_instance(int, VALUE*, VALUE);
+VALUE rb_block_proc(void);
+VALUE rb_f_lambda(void);
+VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
+VALUE rb_obj_is_proc(VALUE);
+VALUE rb_proc_call(VALUE, VALUE);
+VALUE rb_proc_call_with_block(VALUE, int argc, VALUE *argv, VALUE);
+int rb_proc_arity(VALUE);
+VALUE rb_proc_lambda_p(VALUE);
+VALUE rb_binding_new(void);
+VALUE rb_obj_method(VALUE, VALUE);
+VALUE rb_method_call(int, VALUE*, VALUE);
+int rb_mod_method_arity(VALUE, ID);
+int rb_obj_method_arity(VALUE, ID);
+VALUE rb_protect(VALUE (*)(VALUE), VALUE, int*);
+void rb_set_end_proc(void (*)(VALUE), VALUE);
+void rb_mark_end_proc(void);
+void rb_exec_end_proc(void);
+void ruby_finalize(void);
+NORETURN(void ruby_stop(int));
+int ruby_cleanup(volatile int);
+void rb_gc_mark_threads(void);
+void rb_thread_schedule(void);
+void rb_thread_wait_fd(int);
+int rb_thread_fd_writable(int);
+void rb_thread_fd_close(int);
+int rb_thread_alone(void);
+void rb_thread_polling(void);
+void rb_thread_sleep(int);
+void rb_thread_sleep_forever(void);
+VALUE rb_thread_stop(void);
+VALUE rb_thread_wakeup(VALUE);
+VALUE rb_thread_run(VALUE);
+VALUE rb_thread_kill(VALUE);
+VALUE rb_thread_create(VALUE (*)(ANYARGS), void*);
+int rb_thread_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+int rb_thread_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
+void rb_thread_wait_for(struct timeval);
+VALUE rb_thread_current(void);
+VALUE rb_thread_main(void);
+VALUE rb_thread_local_aref(VALUE, ID);
+VALUE rb_thread_local_aset(VALUE, ID, VALUE);
+void rb_thread_atfork(void);
+void rb_thread_atfork_before_exec(void);
+VALUE rb_exec_recursive(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE);
+VALUE rb_exec_recursive_paired(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE,VALUE);
+VALUE rb_exec_recursive_outer(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE);
+/* dir.c */
+VALUE rb_dir_getwd(void);
+/* file.c */
+VALUE rb_file_s_expand_path(int, VALUE *);
+VALUE rb_file_expand_path(VALUE, VALUE);
+VALUE rb_file_s_absolute_path(int, VALUE *);
+VALUE rb_file_absolute_path(VALUE, VALUE);
+VALUE rb_file_dirname(VALUE fname);
+void rb_file_const(const char*, VALUE);
+int rb_file_load_ok(const char *);
+int rb_find_file_ext_safe(VALUE*, const char* const*, int);
+VALUE rb_find_file_safe(VALUE, int);
+int rb_find_file_ext(VALUE*, const char* const*);
+VALUE rb_find_file(VALUE);
+char *rb_path_next(const char *);
+char *rb_path_skip_prefix(const char *);
+char *rb_path_last_separator(const char *);
+char *rb_path_end(const char *);
+VALUE rb_file_directory_p(VALUE,VALUE);
+VALUE rb_str_encode_ospath(VALUE);
+int rb_is_absolute_path(const char *);
+/* gc.c */
+void ruby_set_stack_size(size_t);
+NORETURN(void rb_memerror(void));
+int ruby_stack_check(void);
+size_t ruby_stack_length(VALUE**);
+int rb_during_gc(void);
+void rb_gc_mark_locations(VALUE*, VALUE*);
+void rb_mark_tbl(struct st_table*);
+void rb_mark_set(struct st_table*);
+void rb_mark_hash(struct st_table*);
+void rb_gc_mark_maybe(VALUE);
+void rb_gc_mark(VALUE);
+void rb_gc_force_recycle(VALUE);
+void rb_gc(void);
+void rb_gc_copy_finalizer(VALUE,VALUE);
+void rb_gc_finalize_deferred(void);
+void rb_gc_call_finalizer_at_exit(void);
+VALUE rb_gc_enable(void);
+VALUE rb_gc_disable(void);
+VALUE rb_gc_start(void);
+#define Init_stack(addr) ruby_init_stack(addr)
+/* hash.c */
+void st_foreach_safe(struct st_table *, int (*)(ANYARGS), st_data_t);
+void rb_hash_foreach(VALUE, int (*)(ANYARGS), VALUE);
+VALUE rb_hash(VALUE);
+VALUE rb_hash_new(void);
+VALUE rb_hash_dup(VALUE);
+VALUE rb_hash_freeze(VALUE);
+VALUE rb_hash_aref(VALUE, VALUE);
+VALUE rb_hash_lookup(VALUE, VALUE);
+VALUE rb_hash_lookup2(VALUE, VALUE, VALUE);
+VALUE rb_hash_fetch(VALUE, VALUE);
+VALUE rb_hash_aset(VALUE, VALUE, VALUE);
+VALUE rb_hash_delete_if(VALUE);
+VALUE rb_hash_delete(VALUE,VALUE);
+struct st_table *rb_hash_tbl(VALUE);
+int rb_path_check(const char*);
+int rb_env_path_tainted(void);
+VALUE rb_env_clear(void);
+/* io.c */
+#define rb_defout rb_stdout
+RUBY_EXTERN VALUE rb_fs;
+RUBY_EXTERN VALUE rb_output_fs;
+RUBY_EXTERN VALUE rb_rs;
+RUBY_EXTERN VALUE rb_default_rs;
+RUBY_EXTERN VALUE rb_output_rs;
+VALUE rb_io_write(VALUE, VALUE);
+VALUE rb_io_gets(VALUE);
+VALUE rb_io_getbyte(VALUE);
+VALUE rb_io_ungetc(VALUE, VALUE);
+VALUE rb_io_ungetbyte(VALUE, VALUE);
+VALUE rb_io_close(VALUE);
+VALUE rb_io_flush(VALUE);
+VALUE rb_io_eof(VALUE);
+VALUE rb_io_binmode(VALUE);
+VALUE rb_io_ascii8bit_binmode(VALUE);
+VALUE rb_io_addstr(VALUE, VALUE);
+VALUE rb_io_printf(int, VALUE*, VALUE);
+VALUE rb_io_print(int, VALUE*, VALUE);
+VALUE rb_io_puts(int, VALUE*, VALUE);
+VALUE rb_io_fdopen(int, int, const char*);
+VALUE rb_io_get_io(VALUE);
+VALUE rb_file_open(const char*, const char*);
+VALUE rb_file_open_str(VALUE, const char*);
+VALUE rb_gets(void);
+void rb_write_error(const char*);
+void rb_write_error2(const char*, long);
+void rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds);
+int rb_pipe(int *pipes);
+/* marshal.c */
+VALUE rb_marshal_dump(VALUE, VALUE);
+VALUE rb_marshal_load(VALUE);
+void rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE), VALUE (*loader)(VALUE, VALUE));
+/* numeric.c */
+void rb_num_zerodiv(void);
+#define RB_NUM_COERCE_FUNCS_NEED_OPID 1
+VALUE rb_num_coerce_bin(VALUE, VALUE, ID);
+VALUE rb_num_coerce_cmp(VALUE, VALUE, ID);
+VALUE rb_num_coerce_relop(VALUE, VALUE, ID);
+VALUE rb_float_new(double);
+VALUE rb_num2fix(VALUE);
+VALUE rb_fix2str(VALUE, int);
+VALUE rb_dbl_cmp(double, double);
+/* object.c */
+int rb_eql(VALUE, VALUE);
+VALUE rb_any_to_s(VALUE);
+VALUE rb_inspect(VALUE);
+VALUE rb_obj_is_instance_of(VALUE, VALUE);
+VALUE rb_obj_is_kind_of(VALUE, VALUE);
+VALUE rb_obj_alloc(VALUE);
+VALUE rb_obj_clone(VALUE);
+VALUE rb_obj_dup(VALUE);
+VALUE rb_obj_init_copy(VALUE,VALUE);
+VALUE rb_obj_taint(VALUE);
+VALUE rb_obj_tainted(VALUE);
+VALUE rb_obj_untaint(VALUE);
+VALUE rb_obj_untrust(VALUE);
+VALUE rb_obj_untrusted(VALUE);
+VALUE rb_obj_trust(VALUE);
+VALUE rb_obj_freeze(VALUE);
+VALUE rb_obj_frozen_p(VALUE);
+VALUE rb_obj_id(VALUE);
+VALUE rb_obj_class(VALUE);
+VALUE rb_class_real(VALUE);
+VALUE rb_class_inherited_p(VALUE, VALUE);
+VALUE rb_convert_type(VALUE,int,const char*,const char*);
+VALUE rb_check_convert_type(VALUE,int,const char*,const char*);
+VALUE rb_check_to_integer(VALUE, const char *);
+VALUE rb_check_to_float(VALUE);
+VALUE rb_to_int(VALUE);
+VALUE rb_Integer(VALUE);
+VALUE rb_to_float(VALUE);
+VALUE rb_Float(VALUE);
+VALUE rb_String(VALUE);
+VALUE rb_Array(VALUE);
+double rb_cstr_to_dbl(const char*, int);
+double rb_str_to_dbl(VALUE, int);
+/* parse.y */
+RUBY_EXTERN int   ruby_sourceline;
+RUBY_EXTERN char *ruby_sourcefile;
+ID rb_id_attrset(ID);
+void rb_gc_mark_parser(void);
+int rb_is_const_id(ID);
+int rb_is_instance_id(ID);
+int rb_is_class_id(ID);
+int rb_is_local_id(ID);
+int rb_is_junk_id(ID);
+int rb_symname_p(const char*);
+int rb_sym_interned_p(VALUE);
+void rb_gc_mark_symbols(void);
+VALUE rb_backref_get(void);
+void rb_backref_set(VALUE);
+VALUE rb_lastline_get(void);
+void rb_lastline_set(VALUE);
+VALUE rb_sym_all_symbols(void);
+/* process.c */
+void rb_last_status_set(int status, rb_pid_t pid);
+VALUE rb_last_status_get(void);
+struct rb_exec_arg {
+    int argc;
+    VALUE *argv;
+    const char *prog;
+    VALUE options;
+    VALUE redirect_fds;
+};
+int rb_proc_exec_n(int, VALUE*, const char*);
+int rb_proc_exec(const char*);
+VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e);
+int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val);
+void rb_exec_arg_fixup(struct rb_exec_arg *e);
+int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s);
+int rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char*, size_t);
+int rb_exec(const struct rb_exec_arg*);
+int rb_exec_err(const struct rb_exec_arg*, char*, size_t);
+rb_pid_t rb_fork(int*, int (*)(void*), void*, VALUE);
+rb_pid_t rb_fork_err(int*, int (*)(void*, char*, size_t), void*, VALUE, char*, size_t);
+VALUE rb_f_exec(int,VALUE*);
+rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags);
+void rb_syswait(rb_pid_t pid);
+rb_pid_t rb_spawn(int, VALUE*);
+rb_pid_t rb_spawn_err(int, VALUE*, char*, size_t);
+VALUE rb_proc_times(VALUE);
+VALUE rb_detach_process(rb_pid_t pid);
+/* range.c */
+VALUE rb_range_new(VALUE, VALUE, int);
+VALUE rb_range_beg_len(VALUE, long*, long*, long, int);
+int rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp);
+/* random.c */
+unsigned int rb_genrand_int32(void);
+double rb_genrand_real(void);
+void rb_reset_random_seed(void);
+VALUE rb_random_bytes(VALUE rnd, long n);
+VALUE rb_random_int(VALUE rnd, VALUE max);
+unsigned int rb_random_int32(VALUE rnd);
+double rb_random_real(VALUE rnd);
+/* re.c */
+#define rb_memcmp memcmp
+int rb_memcicmp(const void*,const void*,long);
+void rb_match_busy(VALUE);
+VALUE rb_reg_nth_defined(int, VALUE);
+VALUE rb_reg_nth_match(int, VALUE);
+int rb_reg_backref_number(VALUE match, VALUE backref);
+VALUE rb_reg_last_match(VALUE);
+VALUE rb_reg_match_pre(VALUE);
+VALUE rb_reg_match_post(VALUE);
+VALUE rb_reg_match_last(VALUE);
+#define HAVE_RB_REG_NEW_STR 1
+VALUE rb_reg_new_str(VALUE, int);
+VALUE rb_reg_new(const char *, long, int);
+VALUE rb_reg_alloc(void);
+VALUE rb_reg_init_str(VALUE re, VALUE s, int options);
+VALUE rb_reg_match(VALUE, VALUE);
+VALUE rb_reg_match2(VALUE);
+int rb_reg_options(VALUE);
+/* ruby.c */
+#define rb_argv rb_get_argv()
+RUBY_EXTERN VALUE rb_argv0;
+VALUE rb_get_argv(void);
+void *rb_load_file(const char*);
+void ruby_script(const char*);
+void ruby_prog_init(void);
+void ruby_set_argv(int, char**);
+void *ruby_process_options(int, char**);
+void ruby_init_loadpath(void);
+void ruby_incpush(const char*);
+/* signal.c */
+VALUE rb_f_kill(int, VALUE*);
+void rb_gc_mark_trap_list(void);
+#ifdef POSIX_SIGNAL
+#define posix_signal ruby_posix_signal
+RETSIGTYPE (*posix_signal(int, RETSIGTYPE (*)(int)))(int);
+#endif
+void ruby_sig_finalize(void);
+void rb_trap_exit(void);
+void rb_trap_exec(void);
+const char *ruby_signal_name(int);
+void ruby_default_signal(int);
+/* sprintf.c */
+VALUE rb_f_sprintf(int, const VALUE*);
+PRINTF_ARGS(VALUE rb_sprintf(const char*, ...), 1, 2);
+VALUE rb_vsprintf(const char*, va_list);
+PRINTF_ARGS(VALUE rb_str_catf(VALUE, const char*, ...), 2, 3);
+VALUE rb_str_vcatf(VALUE, const char*, va_list);
+VALUE rb_str_format(int, const VALUE *, VALUE);
+/* string.c */
+VALUE rb_str_new(const char*, long);
+VALUE rb_str_new_cstr(const char*);
+VALUE rb_str_new2(const char*);
+VALUE rb_str_new_shared(VALUE);
+VALUE rb_str_new3(VALUE);
+VALUE rb_str_new_frozen(VALUE);
+VALUE rb_str_new4(VALUE);
+VALUE rb_str_new_with_class(VALUE, const char*, long);
+VALUE rb_str_new5(VALUE, const char*, long);
+VALUE rb_tainted_str_new_cstr(const char*);
+VALUE rb_tainted_str_new(const char*, long);
+VALUE rb_tainted_str_new2(const char*);
+VALUE rb_external_str_new(const char*, long);
+VALUE rb_external_str_new_cstr(const char*);
+VALUE rb_locale_str_new(const char*, long);
+VALUE rb_locale_str_new_cstr(const char*);
+VALUE rb_filesystem_str_new(const char*, long);
+VALUE rb_filesystem_str_new_cstr(const char*);
+VALUE rb_str_buf_new(long);
+VALUE rb_str_buf_new_cstr(const char*);
+VALUE rb_str_buf_new2(const char*);
+VALUE rb_str_tmp_new(long);
+VALUE rb_usascii_str_new(const char*, long);
+VALUE rb_usascii_str_new_cstr(const char*);
+VALUE rb_usascii_str_new2(const char*);
+void rb_str_free(VALUE);
+void rb_str_shared_replace(VALUE, VALUE);
+VALUE rb_str_buf_append(VALUE, VALUE);
+VALUE rb_str_buf_cat(VALUE, const char*, long);
+VALUE rb_str_buf_cat2(VALUE, const char*);
+VALUE rb_str_buf_cat_ascii(VALUE, const char*);
+VALUE rb_obj_as_string(VALUE);
+VALUE rb_check_string_type(VALUE);
+VALUE rb_str_dup(VALUE);
+VALUE rb_str_locktmp(VALUE);
+VALUE rb_str_unlocktmp(VALUE);
+VALUE rb_str_dup_frozen(VALUE);
+#define rb_str_dup_frozen rb_str_new_frozen
+VALUE rb_str_plus(VALUE, VALUE);
+VALUE rb_str_times(VALUE, VALUE);
+long rb_str_sublen(VALUE, long);
+VALUE rb_str_substr(VALUE, long, long);
+VALUE rb_str_subseq(VALUE, long, long);
+void rb_str_modify(VALUE);
+VALUE rb_str_freeze(VALUE);
+void rb_str_set_len(VALUE, long);
+VALUE rb_str_resize(VALUE, long);
+VALUE rb_str_cat(VALUE, const char*, long);
+VALUE rb_str_cat2(VALUE, const char*);
+VALUE rb_str_append(VALUE, VALUE);
+VALUE rb_str_concat(VALUE, VALUE);
+st_index_t rb_memhash(const void *ptr, long len);
+st_index_t rb_hash_start(st_index_t);
+st_index_t rb_hash_uint32(st_index_t, uint32_t);
+st_index_t rb_hash_uint(st_index_t, st_index_t);
+st_index_t rb_hash_end(st_index_t);
+#define rb_hash_uint32(h, i) st_hash_uint32(h, i)
+#define rb_hash_uint(h, i) st_hash_uint(h, i)
+#define rb_hash_end(h) st_hash_end(h)
+st_index_t rb_str_hash(VALUE);
+int rb_str_hash_cmp(VALUE,VALUE);
+int rb_str_comparable(VALUE, VALUE);
+int rb_str_cmp(VALUE, VALUE);
+VALUE rb_str_equal(VALUE str1, VALUE str2);
+VALUE rb_str_drop_bytes(VALUE, long);
+void rb_str_update(VALUE, long, long, VALUE);
+VALUE rb_str_replace(VALUE, VALUE);
+VALUE rb_str_inspect(VALUE);
+VALUE rb_str_dump(VALUE);
+VALUE rb_str_split(VALUE, const char*);
+void rb_str_associate(VALUE, VALUE);
+VALUE rb_str_associated(VALUE);
+void rb_str_setter(VALUE, ID, VALUE*);
+VALUE rb_str_intern(VALUE);
+VALUE rb_sym_to_s(VALUE);
+long rb_str_strlen(VALUE);
+VALUE rb_str_length(VALUE);
+long rb_str_offset(VALUE, long);
+size_t rb_str_capacity(VALUE);
+#if defined __GNUC__
+#define rb_str_new_cstr(str) __extension__ (	\
+{						\
+    (__builtin_constant_p(str)) ?		\
+	rb_str_new(str, (long)strlen(str)) :	\
+	rb_str_new_cstr(str);			\
+})
+#define rb_tainted_str_new_cstr(str) __extension__ ( \
+{					       \
+    (__builtin_constant_p(str)) ?	       \
+	rb_tainted_str_new(str, (long)strlen(str)) : \
+	rb_tainted_str_new_cstr(str);	       \
+})
+#define rb_usascii_str_new_cstr(str) __extension__ ( \
+{					       \
+    (__builtin_constant_p(str)) ?	       \
+	rb_usascii_str_new(str, (long)strlen(str)) : \
+	rb_usascii_str_new_cstr(str);	       \
+})
+#define rb_external_str_new_cstr(str) __extension__ ( \
+{						\
+    (__builtin_constant_p(str)) ?		\
+	rb_external_str_new(str, (long)strlen(str)) : \
+	rb_external_str_new_cstr(str);		\
+})
+#define rb_locale_str_new_cstr(str) __extension__ ( \
+{					       \
+    (__builtin_constant_p(str)) ?	       \
+	rb_locale_str_new(str, (long)strlen(str)) :  \
+	rb_locale_str_new_cstr(str);	       \
+})
+#define rb_str_buf_new_cstr(str) __extension__ ( \
+{						\
+    (__builtin_constant_p(str)) ?		\
+	rb_str_buf_cat(rb_str_buf_new((long)strlen(str)), \
+		       str, (long)strlen(str)) : \
+	rb_str_buf_new_cstr(str);		\
+})
+#define rb_str_buf_cat2(str, ptr) __extension__ ( \
+{						\
+    (__builtin_constant_p(ptr)) ?	        \
+	rb_str_buf_cat(str, ptr, (long)strlen(ptr)) : \
+	rb_str_buf_cat2(str, ptr);		\
+})
+#define rb_str_cat2(str, ptr) __extension__ (	\
+{						\
+    (__builtin_constant_p(ptr)) ?	        \
+	rb_str_cat(str, ptr, (long)strlen(ptr)) : \
+	rb_str_cat2(str, ptr);			\
+})
+#define rb_exc_new2(klass, ptr) __extension__ ( \
+{						\
+    (__builtin_constant_p(ptr)) ?	        \
+	rb_exc_new(klass, ptr, (long)strlen(ptr)) : \
+	rb_exc_new2(klass, ptr);		\
+})
+#endif
+#define rb_str_new2 rb_str_new_cstr
+#define rb_str_new3 rb_str_new_shared
+#define rb_str_new4 rb_str_new_frozen
+#define rb_str_new5 rb_str_new_with_class
+#define rb_tainted_str_new2 rb_tainted_str_new_cstr
+#define rb_str_buf_new2 rb_str_buf_new_cstr
+#define rb_usascii_str_new2 rb_usascii_str_new_cstr
+/* struct.c */
+VALUE rb_struct_new(VALUE, ...);
+VALUE rb_struct_define(const char*, ...);
+VALUE rb_struct_alloc(VALUE, VALUE);
+VALUE rb_struct_initialize(VALUE, VALUE);
+VALUE rb_struct_aref(VALUE, VALUE);
+VALUE rb_struct_aset(VALUE, VALUE, VALUE);
+VALUE rb_struct_getmember(VALUE, ID);
+DEPRECATED(VALUE rb_struct_iv_get(VALUE, const char*));
+VALUE rb_struct_s_members(VALUE);
+VALUE rb_struct_members(VALUE);
+VALUE rb_struct_alloc_noinit(VALUE);
+VALUE rb_struct_define_without_accessor(const char *, VALUE, rb_alloc_func_t, ...);
+/* thread.c */
+typedef void rb_unblock_function_t(void *);
+typedef VALUE rb_blocking_function_t(void *);
+void rb_thread_check_ints(void);
+int rb_thread_interrupted(VALUE thval);
+VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1,
+				rb_unblock_function_t *ubf, void *data2);
+#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
+#define RUBY_UBF_PROCESS ((rb_unblock_function_t *)-1)
+VALUE rb_mutex_new(void);
+VALUE rb_mutex_locked_p(VALUE mutex);
+VALUE rb_mutex_trylock(VALUE mutex);
+VALUE rb_mutex_lock(VALUE mutex);
+VALUE rb_mutex_unlock(VALUE mutex);
+VALUE rb_mutex_sleep(VALUE self, VALUE timeout);
+VALUE rb_mutex_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg);
+VALUE rb_barrier_new(void);
+VALUE rb_barrier_wait(VALUE self);
+VALUE rb_barrier_release(VALUE self);
+VALUE rb_barrier_destroy(VALUE self);
+/* time.c */
+VALUE rb_time_new(time_t, long);
+VALUE rb_time_nano_new(time_t, long);
+VALUE rb_time_num_new(VALUE, VALUE);
+/* variable.c */
+VALUE rb_mod_name(VALUE);
+VALUE rb_class_path(VALUE);
+void rb_set_class_path(VALUE, VALUE, const char*);
+void rb_set_class_path_string(VALUE, VALUE, VALUE);
+VALUE rb_path_to_class(VALUE);
+VALUE rb_path2class(const char*);
+void rb_name_class(VALUE, ID);
+VALUE rb_class_name(VALUE);
+void rb_autoload(VALUE, ID, const char*);
+VALUE rb_autoload_load(VALUE, ID);
+VALUE rb_autoload_p(VALUE, ID);
+void rb_gc_mark_global_tbl(void);
+VALUE rb_f_trace_var(int, VALUE*);
+VALUE rb_f_untrace_var(int, VALUE*);
+VALUE rb_f_global_variables(void);
+void rb_alias_variable(ID, ID);
+struct st_table* rb_generic_ivar_table(VALUE);
+void rb_copy_generic_ivar(VALUE,VALUE);
+void rb_mark_generic_ivar(VALUE);
+void rb_mark_generic_ivar_tbl(void);
+void rb_free_generic_ivar(VALUE);
+VALUE rb_ivar_get(VALUE, ID);
+VALUE rb_ivar_set(VALUE, ID, VALUE);
+VALUE rb_ivar_defined(VALUE, ID);
+void rb_ivar_foreach(VALUE, int (*)(ANYARGS), st_data_t);
+st_index_t rb_ivar_count(VALUE);
+VALUE rb_iv_set(VALUE, const char*, VALUE);
+VALUE rb_iv_get(VALUE, const char*);
+VALUE rb_attr_get(VALUE, ID);
+VALUE rb_obj_instance_variables(VALUE);
+VALUE rb_obj_remove_instance_variable(VALUE, VALUE);
+void *rb_mod_const_at(VALUE, void*);
+void *rb_mod_const_of(VALUE, void*);
+VALUE rb_const_list(void*);
+VALUE rb_mod_constants(int, VALUE *, VALUE);
+VALUE rb_mod_remove_const(VALUE, VALUE);
+int rb_const_defined(VALUE, ID);
+int rb_const_defined_at(VALUE, ID);
+int rb_const_defined_from(VALUE, ID);
+VALUE rb_const_get(VALUE, ID);
+VALUE rb_const_get_at(VALUE, ID);
+VALUE rb_const_get_from(VALUE, ID);
+void rb_const_set(VALUE, ID, VALUE);
+VALUE rb_const_remove(VALUE, ID);
+VALUE rb_mod_const_missing(VALUE,VALUE);
+VALUE rb_cvar_defined(VALUE, ID);
+void rb_cvar_set(VALUE, ID, VALUE);
+VALUE rb_cvar_get(VALUE, ID);
+void rb_cv_set(VALUE, const char*, VALUE);
+VALUE rb_cv_get(VALUE, const char*);
+void rb_define_class_variable(VALUE, const char*, VALUE);
+VALUE rb_mod_class_variables(VALUE);
+VALUE rb_mod_remove_cvar(VALUE, VALUE);
+/* version.c */
+void ruby_show_version(void);
+void ruby_show_copyright(void);
+
+ID rb_frame_callee(void);
+VALUE rb_str_succ(VALUE);
+VALUE rb_time_succ(VALUE);
+void rb_frame_pop(void);
+int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_INTERN_H */
diff --git a/include/ruby/io.h b/include/ruby/io.h
new file mode 100644
index 0000000000..f0f83fc329
--- /dev/null
+++ b/include/ruby/io.h
@@ -0,0 +1,175 @@
+/**********************************************************************
+
+  rubyio.h -
+
+  $Author$
+  created at: Fri Nov 12 16:47:09 JST 1993
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBY_IO_H
+#define RUBY_IO_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include "ruby/encoding.h"
+
+#if defined(HAVE_STDIO_EXT_H)
+#include <stdio_ext.h>
+#endif
+
+typedef struct rb_io_t {
+    int fd;                     /* file descriptor */
+    FILE *stdio_file;		/* stdio ptr for read/write if available */
+    int mode;			/* mode flags: FMODE_XXXs */
+    rb_pid_t pid;		/* child's pid (for pipes) */
+    int lineno;			/* number of lines read */
+    VALUE pathv;		/* pathname for file */
+    void (*finalize)(struct rb_io_t*,int); /* finalize proc */
+
+    char *wbuf;                 /* wbuf_off + wbuf_len <= wbuf_capa */
+    int wbuf_off;
+    int wbuf_len;
+    int wbuf_capa;
+
+    char *rbuf;                 /* rbuf_off + rbuf_len <= rbuf_capa */
+    int rbuf_off;
+    int rbuf_len;
+    int rbuf_capa;
+
+    VALUE tied_io_for_writing;
+
+    /*
+     * enc  enc2 read action                      write action
+     * NULL NULL force_encoding(default_external) write the byte sequence of str
+     * e1   NULL force_encoding(e1)               convert str.encoding to e1
+     * e1   e2   convert from e2 to e1            convert str.encoding to e2
+     */
+    struct rb_io_enc_t {
+        rb_encoding *enc;
+        rb_encoding *enc2;
+        int ecflags;
+        VALUE ecopts;
+    } encs;
+
+    rb_econv_t *readconv;
+    char *cbuf;                /* cbuf_off + cbuf_len <= cbuf_capa */
+    int cbuf_off;
+    int cbuf_len;
+    int cbuf_capa;
+
+    rb_econv_t *writeconv;
+    VALUE writeconv_asciicompat;
+    int writeconv_pre_ecflags;
+    VALUE writeconv_pre_ecopts;
+    int writeconv_initialized;
+
+    VALUE write_lock;
+} rb_io_t;
+
+#define HAVE_RB_IO_T 1
+
+#define FMODE_READABLE              0x00000001
+#define FMODE_WRITABLE              0x00000002
+#define FMODE_READWRITE             (FMODE_READABLE|FMODE_WRITABLE)
+#define FMODE_BINMODE               0x00000004
+#define FMODE_SYNC                  0x00000008
+#define FMODE_TTY                   0x00000010
+#define FMODE_DUPLEX                0x00000020
+#define FMODE_APPEND                0x00000040
+#define FMODE_CREATE                0x00000080
+/* #define FMODE_NOREVLOOKUP        0x00000100 */
+#define FMODE_WSPLIT                0x00000200
+#define FMODE_WSPLIT_INITIALIZED    0x00000400
+#define FMODE_TRUNC                 0x00000800
+#define FMODE_TEXTMODE              0x00001000
+/* #define FMODE_PREP               0x00010000 */
+#define FMODE_SETENC_BY_BOM         0x00100000
+
+#define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
+
+#define MakeOpenFile(obj, fp) do {\
+    if (RFILE(obj)->fptr) {\
+	rb_io_close(obj);\
+	rb_io_fptr_finalize(RFILE(obj)->fptr);\
+	RFILE(obj)->fptr = 0;\
+    }\
+    fp = 0;\
+    fp = RFILE(obj)->fptr = ALLOC(rb_io_t);\
+    fp->fd = -1;\
+    fp->stdio_file = NULL;\
+    fp->mode = 0;\
+    fp->pid = 0;\
+    fp->lineno = 0;\
+    fp->pathv = Qnil;\
+    fp->finalize = 0;\
+    fp->wbuf = NULL;\
+    fp->wbuf_off = 0;\
+    fp->wbuf_len = 0;\
+    fp->wbuf_capa = 0;\
+    fp->rbuf = NULL;\
+    fp->rbuf_off = 0;\
+    fp->rbuf_len = 0;\
+    fp->rbuf_capa = 0;\
+    fp->readconv = NULL;\
+    fp->cbuf = NULL;\
+    fp->cbuf_off = 0;\
+    fp->cbuf_len = 0;\
+    fp->cbuf_capa = 0;\
+    fp->writeconv = NULL;\
+    fp->writeconv_asciicompat = Qnil;\
+    fp->writeconv_pre_ecflags = 0;\
+    fp->writeconv_pre_ecopts = Qnil;\
+    fp->writeconv_initialized = 0;\
+    fp->tied_io_for_writing = 0;\
+    fp->encs.enc = NULL;\
+    fp->encs.enc2 = NULL;\
+    fp->encs.ecflags = 0;\
+    fp->encs.ecopts = Qnil;\
+    fp->write_lock = 0;\
+} while (0)
+
+FILE *rb_io_stdio_file(rb_io_t *fptr);
+
+FILE *rb_fdopen(int, const char*);
+int rb_io_modestr_fmode(const char *modestr);
+int rb_io_modestr_oflags(const char *modestr);
+int rb_io_oflags_fmode(int oflags);
+void rb_io_check_writable(rb_io_t*);
+void rb_io_check_readable(rb_io_t*);
+int rb_io_fptr_finalize(rb_io_t*);
+void rb_io_synchronized(rb_io_t*);
+void rb_io_check_initialized(rb_io_t*);
+void rb_io_check_closed(rb_io_t*);
+int rb_io_wait_readable(int);
+int rb_io_wait_writable(int);
+void rb_io_set_nonblock(rb_io_t *fptr);
+
+/* compatibility for ruby 1.8 and older */
+#define rb_io_mode_flags(modestr) rb_io_modestr_fmode(modestr)
+#define rb_io_modenum_flags(oflags) rb_io_oflags_fmode(oflags)
+
+VALUE rb_io_taint_check(VALUE);
+NORETURN(void rb_eof_error(void));
+
+void rb_io_read_check(rb_io_t*);
+int rb_io_read_pending(rb_io_t*);
+DEPRECATED(void rb_read_check(FILE*));
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_IO_H */
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
new file mode 100644
index 0000000000..62d65b0aff
--- /dev/null
+++ b/include/ruby/missing.h
@@ -0,0 +1,188 @@
+/************************************************
+
+  missing.h - prototype for *.c in ./missing, and
+  	      for missing timeval struct
+
+  $Author$
+  created at: Sat May 11 23:46:03 JST 2002
+
+************************************************/
+
+#ifndef RUBY_MISSING_H
+#define RUBY_MISSING_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#if defined(HAVE_SYS_TIME_H)
+#  include <sys/time.h>
+#elif !defined(_WIN32)
+#  define time_t long
+struct timeval {
+    time_t tv_sec;	/* seconds */
+    long tv_usec;	/* microseconds */
+};
+#endif
+#if defined(HAVE_SYS_TYPES_H)
+#  include <sys/types.h>
+#endif
+
+#if !defined(HAVE_STRUCT_TIMESPEC)
+struct timespec {
+    time_t tv_sec;	/* seconds */
+    long tv_nsec;	/* nanoseconds */
+};
+#endif
+
+#if !defined(HAVE_STRUCT_TIMEZONE)
+struct timezone {
+    int tz_minuteswest;
+    int tz_dsttime;
+};
+#endif
+
+#ifndef RUBY_EXTERN
+#define RUBY_EXTERN extern
+#endif
+
+#ifndef HAVE_ACOSH
+RUBY_EXTERN double acosh(double);
+RUBY_EXTERN double asinh(double);
+RUBY_EXTERN double atanh(double);
+#endif
+
+#ifndef HAVE_CRYPT
+RUBY_EXTERN char *crypt(const char *, const char *);
+#endif
+
+#ifndef HAVE_DUP2
+RUBY_EXTERN int dup2(int, int);
+#endif
+
+#ifndef HAVE_EACCESS
+RUBY_EXTERN int eaccess(const char*, int);
+#endif
+
+#ifndef HAVE_FINITE
+RUBY_EXTERN int finite(double);
+#endif
+
+#ifndef HAVE_FLOCK
+RUBY_EXTERN int flock(int, int);
+#endif
+
+/*
+#ifndef HAVE_FREXP
+RUBY_EXTERN double frexp(double, int *);
+#endif
+*/
+
+#ifndef HAVE_HYPOT
+RUBY_EXTERN double hypot(double, double);
+#endif
+
+#ifndef HAVE_ERF
+RUBY_EXTERN double erf(double);
+RUBY_EXTERN double erfc(double);
+#endif
+
+#ifndef HAVE_TGAMMA
+RUBY_EXTERN double tgamma(double);
+#endif
+
+#ifndef HAVE_LGAMMA_R
+RUBY_EXTERN double lgamma_r(double, int *);
+#endif
+
+#ifndef HAVE_CBRT
+RUBY_EXTERN double cbrt(double);
+#endif
+
+#ifndef isinf
+# ifndef HAVE_ISINF
+#  if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
+#  define isinf(x) (!finite(x) && !isnan(x))
+#  else
+RUBY_EXTERN int isinf(double);
+#  endif
+# endif
+#endif
+
+#ifndef isnan
+# ifndef HAVE_ISNAN
+RUBY_EXTERN int isnan(double);
+# endif
+#endif
+
+/*
+#ifndef HAVE_MEMCMP
+RUBY_EXTERN int memcmp(const void *, const void *, size_t);
+#endif
+*/
+
+#ifndef HAVE_MEMMOVE
+RUBY_EXTERN void *memmove(void *, const void *, size_t);
+#endif
+
+/*
+#ifndef HAVE_MODF
+RUBY_EXTERN double modf(double, double *);
+#endif
+*/
+
+#ifndef HAVE_STRCHR
+RUBY_EXTERN char *strchr(const char *, int);
+RUBY_EXTERN char *strrchr(const char *, int);
+#endif
+
+#ifndef HAVE_STRERROR
+RUBY_EXTERN char *strerror(int);
+#endif
+
+#ifndef HAVE_STRSTR
+RUBY_EXTERN char *strstr(const char *, const char *);
+#endif
+
+/*
+#ifndef HAVE_STRTOL
+RUBY_EXTERN long strtol(const char *, char **, int);
+#endif
+*/
+
+#ifndef HAVE_STRLCPY
+RUBY_EXTERN size_t strlcpy(char *, const char*, size_t);
+#endif
+
+#ifndef HAVE_STRLCAT
+RUBY_EXTERN size_t strlcat(char *, const char*, size_t);
+#endif
+
+#ifndef HAVE_SIGNBIT
+RUBY_EXTERN int signbit(double x);
+#endif
+
+#ifndef HAVE_FFS
+RUBY_EXTERN int ffs(int);
+#endif
+
+#ifdef BROKEN_CLOSE
+#include <sys/types.h>
+#include <sys/socket.h>
+RUBY_EXTERN int ruby_getpeername(int, struct sockaddr *, socklen_t *);
+RUBY_EXTERN int ruby_getsockname(int, struct sockaddr *, socklen_t *);
+RUBY_EXTERN int ruby_shutdown(int, int);
+RUBY_EXTERN int ruby_close(int);
+#endif
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_MISSING_H */
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
new file mode 100644
index 0000000000..41628ed4af
--- /dev/null
+++ b/include/ruby/oniguruma.h
@@ -0,0 +1,799 @@
+#ifndef ONIGURUMA_H
+#define ONIGURUMA_H
+/**********************************************************************
+  oniguruma.h - Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#define ONIGURUMA
+#define ONIGURUMA_VERSION_MAJOR   5
+#define ONIGURUMA_VERSION_MINOR   9
+#define ONIGURUMA_VERSION_TEENY   2
+
+#ifdef __cplusplus
+# ifndef  HAVE_PROTOTYPES
+#  define HAVE_PROTOTYPES 1
+# endif
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+/* escape Mac OS X/Xcode 2.4/gcc 4.0.1 problem */
+#if defined(__APPLE__) && defined(__GNUC__) && __GNUC__ >= 4
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+#ifdef HAVE_STDARG_H
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+#ifndef P_
+#if defined(__STDC__) || defined(_WIN32)
+# define P_(args) args
+#else
+# define P_(args) ()
+#endif
+#endif
+
+#ifndef PV_
+#ifdef HAVE_STDARG_PROTOTYPES
+# define PV_(args) args
+#else
+# define PV_(args) ()
+#endif
+#endif
+
+#ifndef ONIG_EXTERN
+#ifdef RUBY_EXTERN
+#define ONIG_EXTERN   RUBY_EXTERN
+#else
+#if defined(_WIN32) && !defined(__GNUC__)
+#if defined(EXPORT) || defined(RUBY_EXPORT)
+#define ONIG_EXTERN   extern __declspec(dllexport)
+#else
+#define ONIG_EXTERN   extern __declspec(dllimport)
+#endif
+#endif
+#endif
+#endif
+
+#ifndef ONIG_EXTERN
+#define ONIG_EXTERN   extern
+#endif
+
+/* PART: character encoding */
+
+#ifndef ONIG_ESCAPE_UCHAR_COLLISION
+#define UChar OnigUChar
+#endif
+
+typedef unsigned char  OnigUChar;
+typedef unsigned int  OnigCodePoint;
+typedef unsigned int   OnigCtype;
+typedef size_t         OnigDistance;
+
+#define ONIG_INFINITE_DISTANCE  ~((OnigDistance )0)
+
+typedef unsigned int OnigCaseFoldType; /* case fold flag */
+
+ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag;
+
+/* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA  (1<<1) */
+/* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH     (1<<2) */
+#define ONIGENC_CASE_FOLD_TURKISH_AZERI         (1<<20)
+#define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR   (1<<30)
+
+#define ONIGENC_CASE_FOLD_MIN      INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR
+#define ONIGENC_CASE_FOLD_DEFAULT  OnigDefaultCaseFoldFlag
+
+
+#define ONIGENC_MAX_COMP_CASE_FOLD_CODE_LEN       3
+#define ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM      13
+/* 13 => Unicode:0x1ffc */
+
+/* code range */
+#define ONIGENC_CODE_RANGE_NUM(range)     ((int )range[0])
+#define ONIGENC_CODE_RANGE_FROM(range,i)  range[((i)*2) + 1]
+#define ONIGENC_CODE_RANGE_TO(range,i)    range[((i)*2) + 2]
+
+typedef struct {
+  int byte_len;  /* argument(original) character(s) byte length */
+  int code_len;  /* number of code */
+  OnigCodePoint code[ONIGENC_MAX_COMP_CASE_FOLD_CODE_LEN];
+} OnigCaseFoldCodeItem;
+
+typedef struct {
+  OnigCodePoint esc;
+  OnigCodePoint anychar;
+  OnigCodePoint anytime;
+  OnigCodePoint zero_or_one_time;
+  OnigCodePoint one_or_more_time;
+  OnigCodePoint anychar_anytime;
+} OnigMetaCharTableType;
+
+typedef int (*OnigApplyAllCaseFoldFunc)(OnigCodePoint from, OnigCodePoint* to, int to_len, void* arg);
+
+typedef struct OnigEncodingTypeST {
+  int    (*precise_mbc_enc_len)(const OnigUChar* p,const OnigUChar* e, struct OnigEncodingTypeST* enc);
+  const char*   name;
+  int           max_enc_len;
+  int           min_enc_len;
+  int    (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
+  OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
+  int    (*code_to_mbclen)(OnigCodePoint code, struct OnigEncodingTypeST* enc);
+  int    (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf, struct OnigEncodingTypeST* enc);
+  int    (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, struct OnigEncodingTypeST* enc);
+  int    (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, struct OnigEncodingTypeST* enc);
+  int    (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[], struct OnigEncodingTypeST* enc);
+  int    (*property_name_to_ctype)(struct OnigEncodingTypeST* enc, OnigUChar* p, OnigUChar* end);
+  int    (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype, struct OnigEncodingTypeST* enc);
+  int    (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], struct OnigEncodingTypeST* enc);
+  OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
+  int    (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
+  int ruby_encoding_index;
+} OnigEncodingType;
+
+typedef OnigEncodingType* OnigEncoding;
+
+ONIG_EXTERN OnigEncodingType OnigEncodingASCII;
+
+#define ONIG_ENCODING_ASCII        (&OnigEncodingASCII)
+
+#define ONIG_ENCODING_UNDEF    ((OnigEncoding )0)
+
+
+/* work size */
+#define ONIGENC_CODE_TO_MBC_MAXLEN       7
+#define ONIGENC_MBC_CASE_FOLD_MAXLEN    18
+/* 18: 6(max-byte) * 3(case-fold chars) */
+
+/* character types */
+#define ONIGENC_CTYPE_NEWLINE   0
+#define ONIGENC_CTYPE_ALPHA     1
+#define ONIGENC_CTYPE_BLANK     2
+#define ONIGENC_CTYPE_CNTRL     3
+#define ONIGENC_CTYPE_DIGIT     4
+#define ONIGENC_CTYPE_GRAPH     5
+#define ONIGENC_CTYPE_LOWER     6
+#define ONIGENC_CTYPE_PRINT     7
+#define ONIGENC_CTYPE_PUNCT     8
+#define ONIGENC_CTYPE_SPACE     9
+#define ONIGENC_CTYPE_UPPER    10
+#define ONIGENC_CTYPE_XDIGIT   11
+#define ONIGENC_CTYPE_WORD     12
+#define ONIGENC_CTYPE_ALNUM    13  /* alpha || digit */
+#define ONIGENC_CTYPE_ASCII    14
+#define ONIGENC_MAX_STD_CTYPE  ONIGENC_CTYPE_ASCII
+#define ONIGENC_CTYPE_SPECIAL_MASK        128
+#define ONIGENC_CTYPE_S            /* [\t\n\v\f\r\s] */ \
+    ONIGENC_CTYPE_SPECIAL_MASK | ONIGENC_CTYPE_SPACE
+#define ONIGENC_CTYPE_D            /* [0-9] */ \
+    ONIGENC_CTYPE_SPECIAL_MASK | ONIGENC_CTYPE_DIGIT
+#define ONIGENC_CTYPE_W            /* [0-9A-Za-z_] */ \
+    ONIGENC_CTYPE_SPECIAL_MASK | ONIGENC_CTYPE_WORD
+#define ONIGENC_CTYPE_SPECIAL_P(ctype) ((ctype) & ONIGENC_CTYPE_SPECIAL_MASK)
+
+
+#define onig_enc_len(enc,p,e)                ONIGENC_MBC_ENC_LEN(enc, p, e)
+
+#define ONIGENC_IS_UNDEF(enc)          ((enc) == ONIG_ENCODING_UNDEF)
+#define ONIGENC_IS_SINGLEBYTE(enc)     (ONIGENC_MBC_MAXLEN(enc) == 1)
+#define ONIGENC_IS_MBC_HEAD(enc,p,e)   (ONIGENC_MBC_ENC_LEN(enc,p,e) != 1)
+#define ONIGENC_IS_MBC_ASCII(p)           (*(p)   < 128)
+#define ONIGENC_IS_CODE_ASCII(code)       ((code) < 128)
+#define ONIGENC_IS_MBC_WORD(enc,s,end) \
+   ONIGENC_IS_CODE_WORD(enc,ONIGENC_MBC_TO_CODE(enc,s,end))
+
+
+#define ONIGENC_NAME(enc)                      ((enc)->name)
+
+#define ONIGENC_MBC_CASE_FOLD(enc,flag,pp,end,buf) \
+  (enc)->mbc_case_fold(flag,(const OnigUChar** )pp,end,buf,enc)
+#define ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc,s,end) \
+        (enc)->is_allowed_reverse_match(s,end,enc)
+#define ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc,start,s,end) \
+        (enc)->left_adjust_char_head(start, s, end, enc)
+#define ONIGENC_APPLY_ALL_CASE_FOLD(enc,case_fold_flag,f,arg) \
+        (enc)->apply_all_case_fold(case_fold_flag,f,arg,enc)
+#define ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc,case_fold_flag,p,end,acs) \
+       (enc)->get_case_fold_codes_by_str(case_fold_flag,p,end,acs,enc)
+#define ONIGENC_STEP_BACK(enc,start,s,end,n) \
+        onigenc_step_back((enc),(start),(s),(end),(n))
+
+#define ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n)   (n)
+#define ONIGENC_MBCLEN_CHARFOUND_P(r)           (0 < (r))
+#define ONIGENC_MBCLEN_CHARFOUND_LEN(r)         (r)
+
+#define ONIGENC_CONSTRUCT_MBCLEN_INVALID()      (-1)
+#define ONIGENC_MBCLEN_INVALID_P(r)             ((r) == -1)
+
+#define ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n)    (-1-(n))
+#define ONIGENC_MBCLEN_NEEDMORE_P(r)            ((r) < -1)
+#define ONIGENC_MBCLEN_NEEDMORE_LEN(r)          (-1-(r))
+
+#define ONIGENC_PRECISE_MBC_ENC_LEN(enc,p,e)   (enc)->precise_mbc_enc_len(p,e,enc)
+
+ONIG_EXTERN
+int onigenc_mbclen_approximate P_((const OnigUChar* p,const OnigUChar* e, struct OnigEncodingTypeST* enc));
+
+#define ONIGENC_MBC_ENC_LEN(enc,p,e)           onigenc_mbclen_approximate(p,e,enc)
+#define ONIGENC_MBC_MAXLEN(enc)               ((enc)->max_enc_len)
+#define ONIGENC_MBC_MAXLEN_DIST(enc)           ONIGENC_MBC_MAXLEN(enc)
+#define ONIGENC_MBC_MINLEN(enc)               ((enc)->min_enc_len)
+#define ONIGENC_IS_MBC_NEWLINE(enc,p,end)      (enc)->is_mbc_newline((p),(end),enc)
+#define ONIGENC_MBC_TO_CODE(enc,p,end)         (enc)->mbc_to_code((p),(end),enc)
+#define ONIGENC_CODE_TO_MBCLEN(enc,code)       (enc)->code_to_mbclen(code,enc)
+#define ONIGENC_CODE_TO_MBC(enc,code,buf)      (enc)->code_to_mbc(code,buf,enc)
+#define ONIGENC_PROPERTY_NAME_TO_CTYPE(enc,p,end) \
+  (enc)->property_name_to_ctype(enc,p,end)
+
+#define ONIGENC_IS_CODE_CTYPE(enc,code,ctype)  (enc)->is_code_ctype(code,ctype,enc)
+
+#define ONIGENC_IS_CODE_NEWLINE(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_NEWLINE)
+#define ONIGENC_IS_CODE_GRAPH(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_GRAPH)
+#define ONIGENC_IS_CODE_PRINT(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PRINT)
+#define ONIGENC_IS_CODE_ALNUM(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALNUM)
+#define ONIGENC_IS_CODE_ALPHA(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALPHA)
+#define ONIGENC_IS_CODE_LOWER(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_LOWER)
+#define ONIGENC_IS_CODE_UPPER(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_UPPER)
+#define ONIGENC_IS_CODE_CNTRL(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_CNTRL)
+#define ONIGENC_IS_CODE_PUNCT(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PUNCT)
+#define ONIGENC_IS_CODE_SPACE(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_SPACE)
+#define ONIGENC_IS_CODE_BLANK(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_BLANK)
+#define ONIGENC_IS_CODE_DIGIT(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_DIGIT)
+#define ONIGENC_IS_CODE_XDIGIT(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_XDIGIT)
+#define ONIGENC_IS_CODE_WORD(enc,code) \
+        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_WORD)
+
+#define ONIGENC_GET_CTYPE_CODE_RANGE(enc,ctype,sbout,ranges) \
+        (enc)->get_ctype_code_range(ctype,sbout,ranges,enc)
+
+ONIG_EXTERN
+OnigUChar* onigenc_step_back P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end, int n));
+
+
+/* encoding API */
+ONIG_EXTERN
+int onigenc_init P_((void));
+ONIG_EXTERN
+int onigenc_set_default_encoding P_((OnigEncoding enc));
+ONIG_EXTERN
+OnigEncoding onigenc_get_default_encoding P_((void));
+ONIG_EXTERN
+void  onigenc_set_default_caseconv_table P_((const OnigUChar* table));
+ONIG_EXTERN
+OnigUChar* onigenc_get_right_adjust_char_head_with_prev P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end, const OnigUChar** prev));
+ONIG_EXTERN
+OnigUChar* onigenc_get_prev_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
+ONIG_EXTERN
+OnigUChar* onigenc_get_left_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
+ONIG_EXTERN
+OnigUChar* onigenc_get_right_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
+ONIG_EXTERN
+int onigenc_strlen P_((OnigEncoding enc, const OnigUChar* p, const OnigUChar* end));
+ONIG_EXTERN
+int onigenc_strlen_null P_((OnigEncoding enc, const OnigUChar* p));
+ONIG_EXTERN
+int onigenc_str_bytelen_null P_((OnigEncoding enc, const OnigUChar* p));
+
+
+
+/* PART: regular expression */
+
+/* config parameters */
+#define ONIG_NREGION                          10
+#define ONIG_MAX_BACKREF_NUM                1000
+#define ONIG_MAX_REPEAT_NUM               100000
+#define ONIG_MAX_MULTI_BYTE_RANGES_NUM     10000
+/* constants */
+#define ONIG_MAX_ERROR_MESSAGE_LEN            90
+
+typedef unsigned int        OnigOptionType;
+
+#define ONIG_OPTION_DEFAULT            ONIG_OPTION_NONE
+
+/* options */
+#define ONIG_OPTION_NONE                 0U
+#define ONIG_OPTION_IGNORECASE           1U
+#define ONIG_OPTION_EXTEND               (ONIG_OPTION_IGNORECASE         << 1)
+#define ONIG_OPTION_MULTILINE            (ONIG_OPTION_EXTEND             << 1)
+#define ONIG_OPTION_SINGLELINE           (ONIG_OPTION_MULTILINE          << 1)
+#define ONIG_OPTION_FIND_LONGEST         (ONIG_OPTION_SINGLELINE         << 1)
+#define ONIG_OPTION_FIND_NOT_EMPTY       (ONIG_OPTION_FIND_LONGEST       << 1)
+#define ONIG_OPTION_NEGATE_SINGLELINE    (ONIG_OPTION_FIND_NOT_EMPTY     << 1)
+#define ONIG_OPTION_DONT_CAPTURE_GROUP   (ONIG_OPTION_NEGATE_SINGLELINE  << 1)
+#define ONIG_OPTION_CAPTURE_GROUP        (ONIG_OPTION_DONT_CAPTURE_GROUP << 1)
+/* options (search time) */
+#define ONIG_OPTION_NOTBOL               (ONIG_OPTION_CAPTURE_GROUP << 1)
+#define ONIG_OPTION_NOTEOL               (ONIG_OPTION_NOTBOL << 1)
+#define ONIG_OPTION_POSIX_REGION         (ONIG_OPTION_NOTEOL << 1)
+#define ONIG_OPTION_MAXBIT               ONIG_OPTION_POSIX_REGION  /* limit */
+
+#define ONIG_OPTION_ON(options,regopt)      ((options) |= (regopt))
+#define ONIG_OPTION_OFF(options,regopt)     ((options) &= ~(regopt))
+#define ONIG_IS_OPTION_ON(options,option)   ((options) & (option))
+
+/* syntax */
+typedef struct {
+  unsigned int   op;
+  unsigned int   op2;
+  unsigned int   behavior;
+  OnigOptionType options;   /* default option */
+  OnigMetaCharTableType meta_char_table;
+} OnigSyntaxType;
+
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxASIS;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixBasic;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixExtended;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxEmacs;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxGrep;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxGnuRegex;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxJava;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl_NG;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxRuby;
+
+/* predefined syntaxes (see regsyntax.c) */
+#define ONIG_SYNTAX_ASIS               (&OnigSyntaxASIS)
+#define ONIG_SYNTAX_POSIX_BASIC        (&OnigSyntaxPosixBasic)
+#define ONIG_SYNTAX_POSIX_EXTENDED     (&OnigSyntaxPosixExtended)
+#define ONIG_SYNTAX_EMACS              (&OnigSyntaxEmacs)
+#define ONIG_SYNTAX_GREP               (&OnigSyntaxGrep)
+#define ONIG_SYNTAX_GNU_REGEX          (&OnigSyntaxGnuRegex)
+#define ONIG_SYNTAX_JAVA               (&OnigSyntaxJava)
+#define ONIG_SYNTAX_PERL               (&OnigSyntaxPerl)
+#define ONIG_SYNTAX_PERL_NG            (&OnigSyntaxPerl_NG)
+#define ONIG_SYNTAX_RUBY               (&OnigSyntaxRuby)
+
+/* default syntax */
+ONIG_EXTERN const OnigSyntaxType*   OnigDefaultSyntax;
+#define ONIG_SYNTAX_DEFAULT   OnigDefaultSyntax
+
+/* syntax (operators) */
+#define ONIG_SYN_OP_VARIABLE_META_CHARACTERS    (1U<<0)
+#define ONIG_SYN_OP_DOT_ANYCHAR                 (1U<<1)   /* . */
+#define ONIG_SYN_OP_ASTERISK_ZERO_INF           (1U<<2)   /* * */
+#define ONIG_SYN_OP_ESC_ASTERISK_ZERO_INF       (1U<<3)
+#define ONIG_SYN_OP_PLUS_ONE_INF                (1U<<4)   /* + */
+#define ONIG_SYN_OP_ESC_PLUS_ONE_INF            (1U<<5)
+#define ONIG_SYN_OP_QMARK_ZERO_ONE              (1U<<6)   /* ? */
+#define ONIG_SYN_OP_ESC_QMARK_ZERO_ONE          (1U<<7)
+#define ONIG_SYN_OP_BRACE_INTERVAL              (1U<<8)   /* {lower,upper} */
+#define ONIG_SYN_OP_ESC_BRACE_INTERVAL          (1U<<9)   /* \{lower,upper\} */
+#define ONIG_SYN_OP_VBAR_ALT                    (1U<<10)   /* | */
+#define ONIG_SYN_OP_ESC_VBAR_ALT                (1U<<11)  /* \| */
+#define ONIG_SYN_OP_LPAREN_SUBEXP               (1U<<12)  /* (...)   */
+#define ONIG_SYN_OP_ESC_LPAREN_SUBEXP           (1U<<13)  /* \(...\) */
+#define ONIG_SYN_OP_ESC_AZ_BUF_ANCHOR           (1U<<14)  /* \A, \Z, \z */
+#define ONIG_SYN_OP_ESC_CAPITAL_G_BEGIN_ANCHOR  (1U<<15)  /* \G     */
+#define ONIG_SYN_OP_DECIMAL_BACKREF             (1U<<16)  /* \num   */
+#define ONIG_SYN_OP_BRACKET_CC                  (1U<<17)  /* [...]  */
+#define ONIG_SYN_OP_ESC_W_WORD                  (1U<<18)  /* \w, \W */
+#define ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END     (1U<<19)  /* \<. \> */
+#define ONIG_SYN_OP_ESC_B_WORD_BOUND            (1U<<20)  /* \b, \B */
+#define ONIG_SYN_OP_ESC_S_WHITE_SPACE           (1U<<21)  /* \s, \S */
+#define ONIG_SYN_OP_ESC_D_DIGIT                 (1U<<22)  /* \d, \D */
+#define ONIG_SYN_OP_LINE_ANCHOR                 (1U<<23)  /* ^, $   */
+#define ONIG_SYN_OP_POSIX_BRACKET               (1U<<24)  /* [:xxxx:] */
+#define ONIG_SYN_OP_QMARK_NON_GREEDY            (1U<<25)  /* ??,*?,+?,{n,m}? */
+#define ONIG_SYN_OP_ESC_CONTROL_CHARS           (1U<<26)  /* \n,\r,\t,\a ... */
+#define ONIG_SYN_OP_ESC_C_CONTROL               (1U<<27)  /* \cx  */
+#define ONIG_SYN_OP_ESC_OCTAL3                  (1U<<28)  /* \OOO */
+#define ONIG_SYN_OP_ESC_X_HEX2                  (1U<<29)  /* \xHH */
+#define ONIG_SYN_OP_ESC_X_BRACE_HEX8            (1U<<30)  /* \x{7HHHHHHH} */
+
+#define ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE        (1U<<0)  /* \Q...\E */
+#define ONIG_SYN_OP2_QMARK_GROUP_EFFECT         (1U<<1)  /* (?...) */
+#define ONIG_SYN_OP2_OPTION_PERL                (1U<<2)  /* (?imsx),(?-imsx) */
+#define ONIG_SYN_OP2_OPTION_RUBY                (1U<<3)  /* (?imx), (?-imx)  */
+#define ONIG_SYN_OP2_PLUS_POSSESSIVE_REPEAT     (1U<<4)  /* ?+,*+,++ */
+#define ONIG_SYN_OP2_PLUS_POSSESSIVE_INTERVAL   (1U<<5)  /* {n,m}+   */
+#define ONIG_SYN_OP2_CCLASS_SET_OP              (1U<<6)  /* [...&&..[..]..] */
+#define ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP       (1U<<7)  /* (?<name>...) */
+#define ONIG_SYN_OP2_ESC_K_NAMED_BACKREF        (1U<<8)  /* \k<name> */
+#define ONIG_SYN_OP2_ESC_G_SUBEXP_CALL          (1U<<9)  /* \g<name>, \g<n> */
+#define ONIG_SYN_OP2_ATMARK_CAPTURE_HISTORY     (1U<<10) /* (?@..),(?@<x>..) */
+#define ONIG_SYN_OP2_ESC_CAPITAL_C_BAR_CONTROL  (1U<<11) /* \C-x */
+#define ONIG_SYN_OP2_ESC_CAPITAL_M_BAR_META     (1U<<12) /* \M-x */
+#define ONIG_SYN_OP2_ESC_V_VTAB                 (1U<<13) /* \v as VTAB */
+#define ONIG_SYN_OP2_ESC_U_HEX4                 (1U<<14) /* \uHHHH */
+#define ONIG_SYN_OP2_ESC_GNU_BUF_ANCHOR         (1U<<15) /* \`, \' */
+#define ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY  (1U<<16) /* \p{...}, \P{...} */
+#define ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT (1U<<17) /* \p{^..}, \P{^..} */
+/* #define ONIG_SYN_OP2_CHAR_PROPERTY_PREFIX_IS (1U<<18) */
+#define ONIG_SYN_OP2_ESC_H_XDIGIT               (1U<<19) /* \h, \H */
+#define ONIG_SYN_OP2_INEFFECTIVE_ESCAPE         (1U<<20) /* \ */
+
+/* syntax (behavior) */
+#define ONIG_SYN_CONTEXT_INDEP_ANCHORS           (1U<<31) /* not implemented */
+#define ONIG_SYN_CONTEXT_INDEP_REPEAT_OPS        (1U<<0)  /* ?, *, +, {n,m} */
+#define ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS      (1U<<1)  /* error or ignore */
+#define ONIG_SYN_ALLOW_UNMATCHED_CLOSE_SUBEXP    (1U<<2)  /* ...)... */
+#define ONIG_SYN_ALLOW_INVALID_INTERVAL          (1U<<3)  /* {??? */
+#define ONIG_SYN_ALLOW_INTERVAL_LOW_ABBREV       (1U<<4)  /* {,n} => {0,n} */
+#define ONIG_SYN_STRICT_CHECK_BACKREF            (1U<<5)  /* /(\1)/,/\1()/ ..*/
+#define ONIG_SYN_DIFFERENT_LEN_ALT_LOOK_BEHIND   (1U<<6)  /* (?<=a|bc) */
+#define ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP        (1U<<7)  /* see doc/RE */
+#define ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME (1U<<8)  /* (?<x>)(?<x>) */
+#define ONIG_SYN_FIXED_INTERVAL_IS_GREEDY_ONLY   (1U<<9)  /* a{n}?=(?:a{n})? */
+
+/* syntax (behavior) in char class [...] */
+#define ONIG_SYN_NOT_NEWLINE_IN_NEGATIVE_CC      (1U<<20) /* [^...] */
+#define ONIG_SYN_BACKSLASH_ESCAPE_IN_CC          (1U<<21) /* [..\w..] etc.. */
+#define ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC         (1U<<22)
+#define ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC     (1U<<23) /* [0-9-a]=[0-9\-a] */
+/* syntax (behavior) warning */
+#define ONIG_SYN_WARN_CC_OP_NOT_ESCAPED          (1U<<24) /* [,-,] */
+#define ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT    (1U<<25) /* (?:a*)+ */
+#define ONIG_SYN_WARN_CC_DUP                     (1U<<26) /* [aa] */
+
+/* meta character specifiers (onig_set_meta_char()) */
+#define ONIG_META_CHAR_ESCAPE               0
+#define ONIG_META_CHAR_ANYCHAR              1
+#define ONIG_META_CHAR_ANYTIME              2
+#define ONIG_META_CHAR_ZERO_OR_ONE_TIME     3
+#define ONIG_META_CHAR_ONE_OR_MORE_TIME     4
+#define ONIG_META_CHAR_ANYCHAR_ANYTIME      5
+
+#define ONIG_INEFFECTIVE_META_CHAR          0
+
+/* error codes */
+#define ONIG_IS_PATTERN_ERROR(ecode)   ((ecode) <= -100 && (ecode) > -1000)
+/* normal return */
+#define ONIG_NORMAL                                            0
+#define ONIG_MISMATCH                                         -1
+#define ONIG_NO_SUPPORT_CONFIG                                -2
+
+/* internal error */
+#define ONIGERR_MEMORY                                         -5
+#define ONIGERR_TYPE_BUG                                       -6
+#define ONIGERR_PARSER_BUG                                    -11
+#define ONIGERR_STACK_BUG                                     -12
+#define ONIGERR_UNDEFINED_BYTECODE                            -13
+#define ONIGERR_UNEXPECTED_BYTECODE                           -14
+#define ONIGERR_MATCH_STACK_LIMIT_OVER                        -15
+#define ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED                -21
+#define ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR  -22
+/* general error */
+#define ONIGERR_INVALID_ARGUMENT                              -30
+/* syntax error */
+#define ONIGERR_END_PATTERN_AT_LEFT_BRACE                    -100
+#define ONIGERR_END_PATTERN_AT_LEFT_BRACKET                  -101
+#define ONIGERR_EMPTY_CHAR_CLASS                             -102
+#define ONIGERR_PREMATURE_END_OF_CHAR_CLASS                  -103
+#define ONIGERR_END_PATTERN_AT_ESCAPE                        -104
+#define ONIGERR_END_PATTERN_AT_META                          -105
+#define ONIGERR_END_PATTERN_AT_CONTROL                       -106
+#define ONIGERR_META_CODE_SYNTAX                             -108
+#define ONIGERR_CONTROL_CODE_SYNTAX                          -109
+#define ONIGERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE             -110
+#define ONIGERR_CHAR_CLASS_VALUE_AT_START_OF_RANGE           -111
+#define ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS      -112
+#define ONIGERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED      -113
+#define ONIGERR_TARGET_OF_REPEAT_OPERATOR_INVALID            -114
+#define ONIGERR_NESTED_REPEAT_OPERATOR                       -115
+#define ONIGERR_UNMATCHED_CLOSE_PARENTHESIS                  -116
+#define ONIGERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS       -117
+#define ONIGERR_END_PATTERN_IN_GROUP                         -118
+#define ONIGERR_UNDEFINED_GROUP_OPTION                       -119
+#define ONIGERR_INVALID_POSIX_BRACKET_TYPE                   -121
+#define ONIGERR_INVALID_LOOK_BEHIND_PATTERN                  -122
+#define ONIGERR_INVALID_REPEAT_RANGE_PATTERN                 -123
+/* values error (syntax error) */
+#define ONIGERR_TOO_BIG_NUMBER                               -200
+#define ONIGERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE              -201
+#define ONIGERR_UPPER_SMALLER_THAN_LOWER_IN_REPEAT_RANGE     -202
+#define ONIGERR_EMPTY_RANGE_IN_CHAR_CLASS                    -203
+#define ONIGERR_MISMATCH_CODE_LENGTH_IN_CLASS_RANGE          -204
+#define ONIGERR_TOO_MANY_MULTI_BYTE_RANGES                   -205
+#define ONIGERR_TOO_SHORT_MULTI_BYTE_STRING                  -206
+#define ONIGERR_TOO_BIG_BACKREF_NUMBER                       -207
+#define ONIGERR_INVALID_BACKREF                              -208
+#define ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED         -209
+#define ONIGERR_TOO_LONG_WIDE_CHAR_VALUE                     -212
+#define ONIGERR_EMPTY_GROUP_NAME                             -214
+#define ONIGERR_INVALID_GROUP_NAME                           -215
+#define ONIGERR_INVALID_CHAR_IN_GROUP_NAME                   -216
+#define ONIGERR_UNDEFINED_NAME_REFERENCE                     -217
+#define ONIGERR_UNDEFINED_GROUP_REFERENCE                    -218
+#define ONIGERR_MULTIPLEX_DEFINED_NAME                       -219
+#define ONIGERR_MULTIPLEX_DEFINITION_NAME_CALL               -220
+#define ONIGERR_NEVER_ENDING_RECURSION                       -221
+#define ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY        -222
+#define ONIGERR_INVALID_CHAR_PROPERTY_NAME                   -223
+#define ONIGERR_INVALID_CODE_POINT_VALUE                     -400
+#define ONIGERR_INVALID_WIDE_CHAR_VALUE                      -400
+#define ONIGERR_TOO_BIG_WIDE_CHAR_VALUE                      -401
+#define ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION           -402
+#define ONIGERR_INVALID_COMBINATION_OF_OPTIONS               -403
+
+/* errors related to thread */
+#define ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT                -1001
+
+
+/* must be smaller than BIT_STATUS_BITS_NUM (unsigned int * 8) */
+#define ONIG_MAX_CAPTURE_HISTORY_GROUP   31
+#define ONIG_IS_CAPTURE_HISTORY_GROUP(r, i) \
+  ((i) <= ONIG_MAX_CAPTURE_HISTORY_GROUP && (r)->list && (r)->list[i])
+
+typedef struct OnigCaptureTreeNodeStruct {
+  int group;   /* group number */
+  int beg;
+  int end;
+  int allocated;
+  int num_childs;
+  struct OnigCaptureTreeNodeStruct** childs;
+} OnigCaptureTreeNode;
+
+/* match result region type */
+struct re_registers {
+  int  allocated;
+  int  num_regs;
+  int* beg;
+  int* end;
+  /* extended */
+  OnigCaptureTreeNode* history_root;  /* capture history tree root */
+};
+
+/* capture tree traverse */
+#define ONIG_TRAVERSE_CALLBACK_AT_FIRST   1
+#define ONIG_TRAVERSE_CALLBACK_AT_LAST    2
+#define ONIG_TRAVERSE_CALLBACK_AT_BOTH \
+  ( ONIG_TRAVERSE_CALLBACK_AT_FIRST | ONIG_TRAVERSE_CALLBACK_AT_LAST )
+
+
+#define ONIG_REGION_NOTPOS            -1
+
+typedef struct re_registers   OnigRegion;
+
+typedef struct {
+  OnigEncoding enc;
+  OnigUChar* par;
+  OnigUChar* par_end;
+} OnigErrorInfo;
+
+typedef struct {
+  int lower;
+  int upper;
+} OnigRepeatRange;
+
+typedef void (*OnigWarnFunc) P_((const char* s));
+extern void onig_null_warn P_((const char* s));
+#define ONIG_NULL_WARN       onig_null_warn
+
+#define ONIG_CHAR_TABLE_SIZE   256
+
+/* regex_t state */
+#define ONIG_STATE_NORMAL              0
+#define ONIG_STATE_SEARCHING           1
+#define ONIG_STATE_COMPILING          -1
+#define ONIG_STATE_MODIFY             -2
+
+#define ONIG_STATE(reg) \
+  ((reg)->state > 0 ? ONIG_STATE_SEARCHING : (reg)->state)
+
+typedef struct re_pattern_buffer {
+  /* common members of BBuf(bytes-buffer) */
+  unsigned char* p;         /* compiled pattern */
+  unsigned int used;        /* used space for p */
+  unsigned int alloc;       /* allocated space for p */
+
+  int state;                     /* normal, searching, compiling */
+  int num_mem;                   /* used memory(...) num counted from 1 */
+  int num_repeat;                /* OP_REPEAT/OP_REPEAT_NG id-counter */
+  int num_null_check;            /* OP_NULL_CHECK_START/END id counter */
+  int num_comb_exp_check;        /* combination explosion check */
+  int num_call;                  /* number of subexp call */
+  unsigned int capture_history;  /* (?@...) flag (1-31) */
+  unsigned int bt_mem_start;     /* need backtrack flag */
+  unsigned int bt_mem_end;       /* need backtrack flag */
+  int stack_pop_level;
+  int repeat_range_alloc;
+  OnigRepeatRange* repeat_range;
+
+  OnigEncoding      enc;
+  OnigOptionType    options;
+  const OnigSyntaxType* syntax;
+  OnigCaseFoldType  case_fold_flag;
+  void*             name_table;
+
+  /* optimization info (string search, char-map and anchors) */
+  int            optimize;          /* optimize flag */
+  int            threshold_len;     /* search str-length for apply optimize */
+  int            anchor;            /* BEGIN_BUF, BEGIN_POS, (SEMI_)END_BUF */
+  OnigDistance   anchor_dmin;       /* (SEMI_)END_BUF anchor distance */
+  OnigDistance   anchor_dmax;       /* (SEMI_)END_BUF anchor distance */
+  int            sub_anchor;        /* start-anchor for exact or map */
+  unsigned char *exact;
+  unsigned char *exact_end;
+  unsigned char  map[ONIG_CHAR_TABLE_SIZE]; /* used as BM skip or char-map */
+  int           *int_map;                   /* BM skip for exact_len > 255 */
+  int           *int_map_backward;          /* BM skip for backward search */
+  OnigDistance   dmin;                      /* min-distance of exact or map */
+  OnigDistance   dmax;                      /* max-distance of exact or map */
+
+  /* regex_t link chain */
+  struct re_pattern_buffer* chain;  /* escape compile-conflict */
+} OnigRegexType;
+
+typedef OnigRegexType*  OnigRegex;
+
+#ifndef ONIG_ESCAPE_REGEX_T_COLLISION
+  typedef OnigRegexType  regex_t;
+#endif
+
+
+typedef struct {
+  int             num_of_elements;
+  OnigEncoding    pattern_enc;
+  OnigEncoding    target_enc;
+  OnigSyntaxType* syntax;
+  OnigOptionType  option;
+  OnigCaseFoldType   case_fold_flag;
+} OnigCompileInfo;
+
+/* Oniguruma Native API */
+ONIG_EXTERN
+int onig_init P_((void));
+ONIG_EXTERN
+int onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...));
+ONIG_EXTERN
+void onig_set_warn_func P_((OnigWarnFunc f));
+ONIG_EXTERN
+void onig_set_verb_warn_func P_((OnigWarnFunc f));
+ONIG_EXTERN
+int onig_new P_((OnigRegex*, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax, OnigErrorInfo* einfo));
+ONIG_EXTERN
+int  onig_reg_init P_((regex_t* reg, OnigOptionType option, OnigCaseFoldType case_fold_flag, OnigEncoding enc, const OnigSyntaxType* syntax));
+ONIG_EXTERN
+int onig_new_without_alloc P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, OnigSyntaxType* syntax, OnigErrorInfo* einfo));
+ONIG_EXTERN
+int onig_new_deluxe P_((OnigRegex* reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo));
+ONIG_EXTERN
+void onig_free P_((OnigRegex));
+ONIG_EXTERN
+void onig_free_body P_((OnigRegex));
+ONIG_EXTERN
+int onig_recompile P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, OnigSyntaxType* syntax, OnigErrorInfo* einfo));
+ONIG_EXTERN
+int onig_recompile_deluxe P_((OnigRegex reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo));
+ONIG_EXTERN
+long onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
+ONIG_EXTERN
+long onig_match P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* at, OnigRegion* region, OnigOptionType option));
+ONIG_EXTERN
+OnigRegion* onig_region_new P_((void));
+ONIG_EXTERN
+void onig_region_init P_((OnigRegion* region));
+ONIG_EXTERN
+void onig_region_free P_((OnigRegion* region, int free_self));
+ONIG_EXTERN
+void onig_region_copy P_((OnigRegion* to, OnigRegion* from));
+ONIG_EXTERN
+void onig_region_clear P_((OnigRegion* region));
+ONIG_EXTERN
+int onig_region_resize P_((OnigRegion* region, int n));
+ONIG_EXTERN
+int onig_region_set P_((OnigRegion* region, int at, int beg, int end));
+ONIG_EXTERN
+int onig_name_to_group_numbers P_((OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, int** nums));
+ONIG_EXTERN
+int onig_name_to_backref_number P_((OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, OnigRegion *region));
+ONIG_EXTERN
+int onig_foreach_name P_((OnigRegex reg, int (*func)(const OnigUChar*, const OnigUChar*,int,int*,OnigRegex,void*), void* arg));
+ONIG_EXTERN
+int onig_number_of_names P_((OnigRegex reg));
+ONIG_EXTERN
+int onig_number_of_captures P_((OnigRegex reg));
+ONIG_EXTERN
+int onig_number_of_capture_histories P_((OnigRegex reg));
+ONIG_EXTERN
+OnigCaptureTreeNode* onig_get_capture_tree P_((OnigRegion* region));
+ONIG_EXTERN
+int onig_capture_tree_traverse P_((OnigRegion* region, int at, int(*callback_func)(int,int,int,int,int,void*), void* arg));
+ONIG_EXTERN
+int onig_noname_group_capture_is_active P_((OnigRegex reg));
+ONIG_EXTERN
+OnigEncoding onig_get_encoding P_((OnigRegex reg));
+ONIG_EXTERN
+OnigOptionType onig_get_options P_((OnigRegex reg));
+ONIG_EXTERN
+OnigCaseFoldType onig_get_case_fold_flag P_((OnigRegex reg));
+ONIG_EXTERN
+const OnigSyntaxType* onig_get_syntax P_((OnigRegex reg));
+ONIG_EXTERN
+int onig_set_default_syntax P_((const OnigSyntaxType* syntax));
+ONIG_EXTERN
+void onig_copy_syntax P_((OnigSyntaxType* to, const OnigSyntaxType* from));
+ONIG_EXTERN
+unsigned int onig_get_syntax_op P_((OnigSyntaxType* syntax));
+ONIG_EXTERN
+unsigned int onig_get_syntax_op2 P_((OnigSyntaxType* syntax));
+ONIG_EXTERN
+unsigned int onig_get_syntax_behavior P_((OnigSyntaxType* syntax));
+ONIG_EXTERN
+OnigOptionType onig_get_syntax_options P_((OnigSyntaxType* syntax));
+ONIG_EXTERN
+void onig_set_syntax_op P_((OnigSyntaxType* syntax, unsigned int op));
+ONIG_EXTERN
+void onig_set_syntax_op2 P_((OnigSyntaxType* syntax, unsigned int op2));
+ONIG_EXTERN
+void onig_set_syntax_behavior P_((OnigSyntaxType* syntax, unsigned int behavior));
+ONIG_EXTERN
+void onig_set_syntax_options P_((OnigSyntaxType* syntax, OnigOptionType options));
+ONIG_EXTERN
+int onig_set_meta_char P_((OnigSyntaxType* syntax, unsigned int what, OnigCodePoint code));
+ONIG_EXTERN
+void onig_copy_encoding P_((OnigEncoding to, OnigEncoding from));
+ONIG_EXTERN
+OnigCaseFoldType onig_get_default_case_fold_flag P_((void));
+ONIG_EXTERN
+int onig_set_default_case_fold_flag P_((OnigCaseFoldType case_fold_flag));
+ONIG_EXTERN
+unsigned int onig_get_match_stack_limit_size P_((void));
+ONIG_EXTERN
+int onig_set_match_stack_limit_size P_((unsigned int size));
+ONIG_EXTERN
+int onig_end P_((void));
+ONIG_EXTERN
+const char* onig_version P_((void));
+ONIG_EXTERN
+const char* onig_copyright P_((void));
+
+#ifdef __cplusplus
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}
+#endif
+
+#endif /* ONIGURUMA_H */
diff --git a/include/ruby/re.h b/include/ruby/re.h
new file mode 100644
index 0000000000..c60ab96016
--- /dev/null
+++ b/include/ruby/re.h
@@ -0,0 +1,66 @@
+/**********************************************************************
+
+  re.h -
+
+  $Author$
+  created at: Thu Sep 30 14:18:32 JST 1993
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBY_RE_H
+#define RUBY_RE_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#include <sys/types.h>
+#include <stdio.h>
+
+#include "ruby/regex.h"
+
+typedef struct re_pattern_buffer Regexp;
+
+struct rmatch_offset {
+    long beg;
+    long end;
+};
+
+struct rmatch {
+    struct re_registers regs;
+
+    int char_offset_updated;
+    int char_offset_num_allocated;
+    struct rmatch_offset *char_offset;
+};
+
+struct RMatch {
+    struct RBasic basic;
+    VALUE str;
+    struct rmatch *rmatch;
+    VALUE regexp;  /* RRegexp */
+};
+
+#define RMATCH(obj)  (R_CAST(RMatch)(obj))
+#define RMATCH_REGS(obj)  (&(R_CAST(RMatch)(obj))->rmatch->regs)
+
+VALUE rb_reg_regcomp(VALUE);
+long rb_reg_search(VALUE, VALUE, long, int);
+VALUE rb_reg_regsub(VALUE, VALUE, struct re_registers *, VALUE);
+long rb_reg_adjust_startpos(VALUE, VALUE, long, int);
+void rb_match_busy(VALUE);
+VALUE rb_reg_quote(VALUE);
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_RE_H */
diff --git a/include/ruby/regex.h b/include/ruby/regex.h
new file mode 100644
index 0000000000..a63e2f6a4c
--- /dev/null
+++ b/include/ruby/regex.h
@@ -0,0 +1,42 @@
+/**********************************************************************
+
+  regex.h -
+
+  $Author$
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef ONIGURUMA_REGEX_H
+#define ONIGURUMA_REGEX_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#ifdef RUBY
+#include "ruby/oniguruma.h"
+#else
+#include "oniguruma.h"
+#endif
+
+#ifndef ONIG_RUBY_M17N
+
+ONIG_EXTERN OnigEncoding    OnigEncDefaultCharEncoding;
+
+#define mbclen(p,e,enc)  rb_enc_mbclen((p),(e),(enc))
+
+#endif /* ifndef ONIG_RUBY_M17N */
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* ONIGURUMA_REGEX_H */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
new file mode 100644
index 0000000000..0294b08363
--- /dev/null
+++ b/include/ruby/ruby.h
@@ -0,0 +1,1458 @@
+/**********************************************************************
+
+  ruby/ruby.h -
+
+  $Author$
+  created at: Thu Jun 10 14:26:32 JST 1993
+
+  Copyright (C) 1993-2008 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#ifndef RUBY_RUBY_H
+#define RUBY_RUBY_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#ifndef RUBY_LIB_PREFIX
+#include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+#endif
+
+#define NORETURN_STYLE_NEW 1
+#ifndef NORETURN
+# define NORETURN(x) x
+#endif
+#ifndef DEPRECATED
+# define DEPRECATED(x) x
+#endif
+#ifndef NOINLINE
+# define NOINLINE(x) x
+#endif
+
+#ifdef __GNUC__
+#define PRINTF_ARGS(decl, string_index, first_to_check) \
+  decl __attribute__((format(printf, string_index, first_to_check)))
+#else
+#define PRINTF_ARGS(decl, string_index, first_to_check) decl
+#endif
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#ifdef HAVE_INTRINSICS_H
+# include <intrinsics.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#include "defines.h"
+
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#else
+#  ifdef _AIX
+#pragma alloca
+#  endif
+#endif
+
+#if defined HAVE_UINTPTR_T && 0
+typedef uintptr_t VALUE;
+typedef uintptr_t ID;
+# define SIGNED_VALUE intptr_t
+# define SIZEOF_VALUE SIZEOF_UINTPTR_T
+# undef PRI_VALUE_PREFIX
+#elif SIZEOF_LONG == SIZEOF_VOIDP
+typedef unsigned long VALUE;
+typedef unsigned long ID;
+# define SIGNED_VALUE long
+# define SIZEOF_VALUE SIZEOF_LONG
+# define PRI_VALUE_PREFIX "l"
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+typedef unsigned LONG_LONG VALUE;
+typedef unsigned LONG_LONG ID;
+# define SIGNED_VALUE LONG_LONG
+# define LONG_LONG_VALUE 1
+# define SIZEOF_VALUE SIZEOF_LONG_LONG
+# define PRI_VALUE_PREFIX "ll"
+#else
+# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
+#endif
+
+typedef char ruby_check_sizeof_int[SIZEOF_INT == sizeof(int) ? 1 : -1];
+typedef char ruby_check_sizeof_long[SIZEOF_LONG == sizeof(long) ? 1 : -1];
+#ifdef SIZEOF_LONG_LONG
+typedef char ruby_check_sizeof_long_long[SIZEOF_LONG_LONG == sizeof(LONG_LONG) ? 1 : -1];
+#endif
+typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
+
+#if defined PRIdPTR && !defined PRI_VALUE_PREFIX
+#define PRIdVALUE PRIdPTR
+#define PRIiVALUE PRIiPTR
+#define PRIoVALUE PRIoPTR
+#define PRIuVALUE PRIuPTR
+#define PRIxVALUE PRIxPTR
+#define PRIXVALUE PRIXPTR
+#else
+#define PRIdVALUE PRI_VALUE_PREFIX"d"
+#define PRIiVALUE PRI_VALUE_PREFIX"i"
+#define PRIoVALUE PRI_VALUE_PREFIX"o"
+#define PRIuVALUE PRI_VALUE_PREFIX"u"
+#define PRIxVALUE PRI_VALUE_PREFIX"x"
+#define PRIXVALUE PRI_VALUE_PREFIX"X"
+#endif
+#ifndef PRI_VALUE_PREFIX
+# define PRI_VALUE_PREFIX ""
+#endif
+
+#ifndef PRI_TIMET_PREFIX
+# if SIZEOF_TIME_T == SIZEOF_INT
+#  define PRI_TIMET_PREFIX
+# elif SIZEOF_TIME_T == SIZEOF_LONG
+#  define PRI_TIMET_PREFIX "l"
+# elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
+#  define PRI_TIMET_PREFIX "ll"
+# endif
+#endif
+
+#if defined PRIdPTR
+# define PRI_PTRDIFF_PREFIX "t"
+#elif SIZEOF_PTRDIFF_T == SIZEOF_INT
+# define PRI_PTRDIFF_PREFIX
+#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
+# define PRI_PTRDIFF_PREFIX "l"
+#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
+# define PRI_PTRDIFF_PREFIX "ll"
+#endif
+#define PRIdPTRDIFF PRI_PTRDIFF_PREFIX"d"
+#define PRIiPTRDIFF PRI_PTRDIFF_PREFIX"i"
+#define PRIoPTRDIFF PRI_PTRDIFF_PREFIX"o"
+#define PRIuPTRDIFF PRI_PTRDIFF_PREFIX"u"
+#define PRIxPTRDIFF PRI_PTRDIFF_PREFIX"x"
+#define PRIXPTRDIFF PRI_PTRDIFF_PREFIX"X"
+
+#if defined PRIdPTR
+# define PRI_SIZE_PREFIX "z"
+#elif SIZEOF_SIZE_T == SIZEOF_INT
+# define PRI_SIZE_PREFIX
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+# define PRI_SIZE_PREFIX "l"
+#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+# define PRI_SIZE_PREFIX "ll"
+#endif
+#define PRIdSIZE PRI_SIZE_PREFIX"d"
+#define PRIiSIZE PRI_SIZE_PREFIX"i"
+#define PRIoSIZE PRI_SIZE_PREFIX"o"
+#define PRIuSIZE PRI_SIZE_PREFIX"u"
+#define PRIxSIZE PRI_SIZE_PREFIX"x"
+#define PRIXSIZE PRI_SIZE_PREFIX"X"
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# ifndef LONG_MAX
+#  ifdef HAVE_LIMITS_H
+#   include <limits.h>
+#  else
+    /* assuming 32bit(2's compliment) long */
+#   define LONG_MAX 2147483647
+#  endif
+# endif
+# ifndef LONG_MIN
+#  define LONG_MIN (-LONG_MAX-1)
+# endif
+# ifndef CHAR_BIT
+#  define CHAR_BIT 8
+# endif
+#endif
+
+#ifdef HAVE_LONG_LONG
+# ifndef LLONG_MAX
+#  ifdef LONG_LONG_MAX
+#   define LLONG_MAX  LONG_LONG_MAX
+#  else
+#   ifdef _I64_MAX
+#    define LLONG_MAX _I64_MAX
+#   else
+    /* assuming 64bit(2's complement) long long */
+#    define LLONG_MAX 9223372036854775807LL
+#   endif
+#  endif
+# endif
+# ifndef LLONG_MIN
+#  ifdef LONG_LONG_MIN
+#   define LLONG_MIN  LONG_LONG_MIN
+#  else
+#   ifdef _I64_MIN
+#    define LLONG_MIN _I64_MIN
+#   else
+#    define LLONG_MIN (-LLONG_MAX-1)
+#   endif
+#  endif
+# endif
+#endif
+
+#define FIXNUM_MAX (LONG_MAX>>1)
+#define FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
+
+#define INT2FIX(i) ((VALUE)(((SIGNED_VALUE)(i))<<1 | FIXNUM_FLAG))
+#define LONG2FIX(i) INT2FIX(i)
+#define rb_fix_new(v) INT2FIX(v)
+VALUE rb_int2inum(SIGNED_VALUE);
+
+#define rb_int_new(v) rb_int2inum(v)
+VALUE rb_uint2inum(VALUE);
+
+#define rb_uint_new(v) rb_uint2inum(v)
+
+#ifdef HAVE_LONG_LONG
+VALUE rb_ll2inum(LONG_LONG);
+#define LL2NUM(v) rb_ll2inum(v)
+VALUE rb_ull2inum(unsigned LONG_LONG);
+#define ULL2NUM(v) rb_ull2inum(v)
+#endif
+
+#if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+# define OFFT2NUM(v) LL2NUM(v)
+#elif SIZEOF_OFF_T == SIZEOF_LONG
+# define OFFT2NUM(v) LONG2NUM(v)
+#else
+# define OFFT2NUM(v) INT2NUM(v)
+#endif
+
+#if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+# define SIZET2NUM(v) ULL2NUM(v)
+# define SSIZET2NUM(v) LL2NUM(v)
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+# define SIZET2NUM(v) ULONG2NUM(v)
+# define SSIZET2NUM(v) LONG2NUM(v)
+#else
+# define SIZET2NUM(v) UINT2NUM(v)
+# define SSIZET2NUM(v) INT2NUM(v)
+#endif
+
+#ifndef SIZE_MAX
+# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+#   define SIZE_MAX ULLONG_MAX
+#   define SIZE_MIN ULLONG_MIN
+# elif SIZEOF_SIZE_T == SIZEOF_LONG
+#   define SIZE_MAX ULONG_MAX
+#   define SIZE_MIN ULONG_MIN
+# elif SIZEOF_SIZE_T == SIZEOF_INT
+#   define SIZE_MAX UINT_MAX
+#   define SIZE_MIN UINT_MIN
+# else
+#   define SIZE_MAX USHRT_MAX
+#   define SIZE_MIN USHRT_MIN
+# endif
+#endif
+
+#ifndef SSIZE_MAX
+# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+#   define SSIZE_MAX LLONG_MAX
+#   define SSIZE_MIN LLONG_MIN
+# elif SIZEOF_SIZE_T == SIZEOF_LONG
+#   define SSIZE_MAX LONG_MAX
+#   define SSIZE_MIN LONG_MIN
+# elif SIZEOF_SIZE_T == SIZEOF_INT
+#   define SSIZE_MAX INT_MAX
+#   define SSIZE_MIN INT_MIN
+# else
+#   define SSIZE_MAX SHRT_MAX
+#   define SSIZE_MIN SHRT_MIN
+# endif
+#endif
+
+#if SIZEOF_INT < SIZEOF_VALUE
+NORETURN(void rb_out_of_int(SIGNED_VALUE num));
+#endif
+
+#if SIZEOF_INT < SIZEOF_LONG
+#define rb_long2int_internal(n, i) \
+    int i = (int)(n); \
+    if ((long)i != (n)) rb_out_of_int(n)
+#ifdef __GNUC__
+#define rb_long2int(n) __extension__ ({long i2l_n = (n); rb_long2int_internal(i2l_n, i2l_i); i2l_i;})
+#else
+static inline int
+rb_long2int(long n) {rb_long2int_internal(n, i); return i;}
+#endif
+#else
+#define rb_long2int(n) ((int)(n))
+#endif
+
+#ifndef PIDT2NUM
+#define PIDT2NUM(v) LONG2NUM(v)
+#endif
+#ifndef NUM2PIDT
+#define NUM2PIDT(v) NUM2LONG(v)
+#endif
+#ifndef UIDT2NUM
+#define UIDT2NUM(v) LONG2NUM(v)
+#endif
+#ifndef NUM2UIDT
+#define NUM2UIDT(v) NUM2LONG(v)
+#endif
+#ifndef GIDT2NUM
+#define GIDT2NUM(v) LONG2NUM(v)
+#endif
+#ifndef NUM2GIDT
+#define NUM2GIDT(v) NUM2LONG(v)
+#endif
+
+#define FIX2LONG(x) RSHIFT((SIGNED_VALUE)x,1)
+#define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX)
+#define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG)
+#define POSFIXABLE(f) ((f) < FIXNUM_MAX+1)
+#define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
+#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
+
+#define IMMEDIATE_P(x) ((VALUE)(x) & IMMEDIATE_MASK)
+
+#define SYMBOL_P(x) (((VALUE)(x)&~(~(VALUE)0<<RUBY_SPECIAL_SHIFT))==SYMBOL_FLAG)
+#define ID2SYM(x) (((VALUE)(x)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
+#define SYM2ID(x) RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT)
+
+/* Module#methods, #singleton_methods and so on return Symbols */
+#define USE_SYMBOL_AS_METHOD_NAME 1
+
+/* special constants - i.e. non-zero and non-fixnum constants */
+enum ruby_special_consts {
+    RUBY_Qfalse = 0,
+    RUBY_Qtrue  = 2,
+    RUBY_Qnil   = 4,
+    RUBY_Qundef = 6,
+
+    RUBY_IMMEDIATE_MASK = 0x03,
+    RUBY_FIXNUM_FLAG    = 0x01,
+    RUBY_SYMBOL_FLAG    = 0x0e,
+    RUBY_SPECIAL_SHIFT  = 8
+};
+
+#define Qfalse ((VALUE)RUBY_Qfalse)
+#define Qtrue  ((VALUE)RUBY_Qtrue)
+#define Qnil   ((VALUE)RUBY_Qnil)
+#define Qundef ((VALUE)RUBY_Qundef)	/* undefined value for placeholder */
+#define IMMEDIATE_MASK RUBY_IMMEDIATE_MASK
+#define FIXNUM_FLAG RUBY_FIXNUM_FLAG
+#define SYMBOL_FLAG RUBY_SYMBOL_FLAG
+
+#define RTEST(v) (((VALUE)(v) & ~Qnil) != 0)
+#define NIL_P(v) ((VALUE)(v) == Qnil)
+
+#define CLASS_OF(v) rb_class_of((VALUE)(v))
+
+enum ruby_value_type {
+    RUBY_T_NONE   = 0x00,
+
+    RUBY_T_OBJECT = 0x01,
+    RUBY_T_CLASS  = 0x02,
+    RUBY_T_MODULE = 0x03,
+    RUBY_T_FLOAT  = 0x04,
+    RUBY_T_STRING = 0x05,
+    RUBY_T_REGEXP = 0x06,
+    RUBY_T_ARRAY  = 0x07,
+    RUBY_T_HASH   = 0x08,
+    RUBY_T_STRUCT = 0x09,
+    RUBY_T_BIGNUM = 0x0a,
+    RUBY_T_FILE   = 0x0b,
+    RUBY_T_DATA   = 0x0c,
+    RUBY_T_MATCH  = 0x0d,
+    RUBY_T_COMPLEX  = 0x0e,
+    RUBY_T_RATIONAL = 0x0f,
+
+    RUBY_T_NIL    = 0x11,
+    RUBY_T_TRUE   = 0x12,
+    RUBY_T_FALSE  = 0x13,
+    RUBY_T_SYMBOL = 0x14,
+    RUBY_T_FIXNUM = 0x15,
+
+    RUBY_T_UNDEF  = 0x1b,
+    RUBY_T_NODE   = 0x1c,
+    RUBY_T_ICLASS = 0x1d,
+    RUBY_T_ZOMBIE = 0x1e,
+
+    RUBY_T_MASK   = 0x1f
+};
+
+#define T_NONE   RUBY_T_NONE
+#define T_NIL    RUBY_T_NIL
+#define T_OBJECT RUBY_T_OBJECT
+#define T_CLASS  RUBY_T_CLASS
+#define T_ICLASS RUBY_T_ICLASS
+#define T_MODULE RUBY_T_MODULE
+#define T_FLOAT  RUBY_T_FLOAT
+#define T_STRING RUBY_T_STRING
+#define T_REGEXP RUBY_T_REGEXP
+#define T_ARRAY  RUBY_T_ARRAY
+#define T_HASH   RUBY_T_HASH
+#define T_STRUCT RUBY_T_STRUCT
+#define T_BIGNUM RUBY_T_BIGNUM
+#define T_FILE   RUBY_T_FILE
+#define T_FIXNUM RUBY_T_FIXNUM
+#define T_TRUE   RUBY_T_TRUE
+#define T_FALSE  RUBY_T_FALSE
+#define T_DATA   RUBY_T_DATA
+#define T_MATCH  RUBY_T_MATCH
+#define T_SYMBOL RUBY_T_SYMBOL
+#define T_RATIONAL RUBY_T_RATIONAL
+#define T_COMPLEX RUBY_T_COMPLEX
+#define T_UNDEF  RUBY_T_UNDEF
+#define T_NODE   RUBY_T_NODE
+#define T_ZOMBIE RUBY_T_ZOMBIE
+#define T_MASK   RUBY_T_MASK
+
+#define BUILTIN_TYPE(x) (int)(((struct RBasic*)(x))->flags & T_MASK)
+
+static inline int rb_type(VALUE obj);
+#define TYPE(x) rb_type((VALUE)(x))
+
+#ifdef __GNUC__
+#define RB_GC_GUARD_PTR(ptr) \
+    __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;})
+#else
+#ifdef _MSC_VER
+#pragma optimize("", off)
+#endif
+static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr;}
+#ifdef _MSC_VER
+#pragma optimize("", on)
+#endif
+#define RB_GC_GUARD_PTR(ptr) rb_gc_guarded_ptr(ptr)
+#endif
+#define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v)))
+
+void rb_check_type(VALUE,int);
+#define Check_Type(v,t) rb_check_type((VALUE)(v),t)
+
+VALUE rb_str_to_str(VALUE);
+VALUE rb_string_value(volatile VALUE*);
+char *rb_string_value_ptr(volatile VALUE*);
+char *rb_string_value_cstr(volatile VALUE*);
+
+#define StringValue(v) rb_string_value(&(v))
+#define StringValuePtr(v) rb_string_value_ptr(&(v))
+#define StringValueCStr(v) rb_string_value_cstr(&(v))
+
+void rb_check_safe_obj(VALUE);
+DEPRECATED(void rb_check_safe_str(VALUE));
+#define SafeStringValue(v) do {\
+    StringValue(v);\
+    rb_check_safe_obj(v);\
+} while (0)
+/* obsolete macro - use SafeStringValue(v) */
+#define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))
+
+VALUE rb_str_export(VALUE);
+#define ExportStringValue(v) do {\
+    SafeStringValue(v);\
+   (v) = rb_str_export(v);\
+} while (0)
+VALUE rb_str_export_locale(VALUE);
+
+VALUE rb_get_path(VALUE);
+#define FilePathValue(v) (RB_GC_GUARD(v) = rb_get_path(v))
+
+VALUE rb_get_path_no_checksafe(VALUE);
+#define FilePathStringValue(v) ((v) = rb_get_path_no_checksafe(v))
+
+void rb_secure(int);
+int rb_safe_level(void);
+void rb_set_safe_level(int);
+void rb_set_safe_level_force(int);
+void rb_secure_update(VALUE);
+NORETURN(void rb_insecure_operation(void));
+
+VALUE rb_errinfo(void);
+void rb_set_errinfo(VALUE);
+
+SIGNED_VALUE rb_num2long(VALUE);
+VALUE rb_num2ulong(VALUE);
+#define NUM2LONG_internal(x) (FIXNUM_P(x) ? FIX2LONG(x) : rb_num2long(x))
+#ifdef __GNUC__
+#define NUM2LONG(x) \
+    __extension__ ({VALUE num2long_x = (x); NUM2LONG_internal(num2long_x);})
+#else
+static inline long
+NUM2LONG(VALUE x)
+{
+    return NUM2LONG_internal(x);
+}
+#endif
+#define NUM2ULONG(x) rb_num2ulong((VALUE)x)
+#if SIZEOF_INT < SIZEOF_LONG
+long rb_num2int(VALUE);
+long rb_fix2int(VALUE);
+#define FIX2INT(x) ((int)rb_fix2int((VALUE)x))
+#define NUM2INT_internal(x) (FIXNUM_P(x) ? FIX2INT(x) : (int)rb_num2int(x))
+#ifdef __GNUC__
+#define NUM2INT(x) \
+    __extension__ ({VALUE num2int_x = (x); NUM2INT_internal(num2int_x);})
+#else
+static inline int
+NUM2INT(VALUE x)
+{
+    return NUM2INT_internal(x);
+}
+#endif
+unsigned long rb_num2uint(VALUE);
+#define NUM2UINT(x) ((unsigned int)rb_num2uint(x))
+unsigned long rb_fix2uint(VALUE);
+#define FIX2UINT(x) ((unsigned int)rb_fix2uint(x))
+#else
+#define NUM2INT(x) ((int)NUM2LONG(x))
+#define NUM2UINT(x) ((unsigned int)NUM2ULONG(x))
+#define FIX2INT(x) ((int)FIX2LONG(x))
+#define FIX2UINT(x) ((unsigned int)FIX2ULONG(x))
+#endif
+
+#ifdef HAVE_LONG_LONG
+LONG_LONG rb_num2ll(VALUE);
+unsigned LONG_LONG rb_num2ull(VALUE);
+# define NUM2LL_internal(x) (FIXNUM_P(x) ? FIX2LONG(x) : rb_num2ll(x))
+# ifdef __GNUC__
+#   define NUM2LL(x) \
+    __extension__ ({VALUE num2ll_x = (x); NUM2LL_internal(num2ll_x);})
+# else
+static inline LONG_LONG
+NUM2LL(VALUE x)
+{
+    return NUM2LL_internal(x);
+}
+# endif
+# define NUM2ULL(x) rb_num2ull((VALUE)x)
+#endif
+
+#if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG
+# define NUM2OFFT(x) ((off_t)NUM2LL(x))
+#else
+# define NUM2OFFT(x) NUM2LONG(x)
+#endif
+
+#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
+# define NUM2SIZET(x) ((size_t)NUM2ULL(x))
+# define NUM2SSIZET(x) ((size_t)NUM2LL(x))
+#else
+# define NUM2SIZET(x) NUM2ULONG(x)
+# define NUM2SSIZET(x) NUM2LONG(x)
+#endif
+
+double rb_num2dbl(VALUE);
+#define NUM2DBL(x) rb_num2dbl((VALUE)(x))
+
+VALUE rb_uint2big(VALUE);
+VALUE rb_int2big(SIGNED_VALUE);
+
+VALUE rb_newobj(void);
+#define NEWOBJ(obj,type) type *obj = (type*)rb_newobj()
+#define OBJSETUP(obj,c,t) do {\
+    RBASIC(obj)->flags = (t);\
+    RBASIC(obj)->klass = (c);\
+    if (rb_safe_level() >= 3) FL_SET(obj, FL_TAINT | FL_UNTRUSTED);\
+} while (0)
+#define CLONESETUP(clone,obj) do {\
+    OBJSETUP(clone,rb_singleton_class_clone((VALUE)obj),RBASIC(obj)->flags);\
+    rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);\
+    if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)clone,(VALUE)obj);\
+} while (0)
+#define DUPSETUP(dup,obj) do {\
+    OBJSETUP(dup,rb_obj_class(obj), (RBASIC(obj)->flags)&(T_MASK|FL_EXIVAR|FL_TAINT|FL_UNTRUSTED)); \
+    if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)dup,(VALUE)obj);\
+} while (0)
+
+struct RBasic {
+    VALUE flags;
+    VALUE klass;
+};
+
+#define ROBJECT_EMBED_LEN_MAX 3
+struct RObject {
+    struct RBasic basic;
+    union {
+	struct {
+	    long numiv;
+	    VALUE *ivptr;
+            struct st_table *iv_index_tbl; /* shortcut for RCLASS_IV_INDEX_TBL(rb_obj_class(obj)) */
+	} heap;
+	VALUE ary[ROBJECT_EMBED_LEN_MAX];
+    } as;
+};
+#define ROBJECT_EMBED FL_USER1
+#define ROBJECT_NUMIV(o) \
+    ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
+     ROBJECT_EMBED_LEN_MAX : \
+     ROBJECT(o)->as.heap.numiv)
+#define ROBJECT_IVPTR(o) \
+    ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
+     ROBJECT(o)->as.ary : \
+     ROBJECT(o)->as.heap.ivptr)
+#define ROBJECT_IV_INDEX_TBL(o) \
+    ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
+     RCLASS_IV_INDEX_TBL(rb_obj_class(o)) : \
+     ROBJECT(o)->as.heap.iv_index_tbl)
+
+/** @internal */
+typedef struct {
+    VALUE super;
+    struct st_table *iv_tbl;
+} rb_classext_t;
+
+struct RClass {
+    struct RBasic basic;
+    rb_classext_t *ptr;
+    struct st_table *m_tbl;
+    struct st_table *iv_index_tbl;
+};
+#define RCLASS_IV_TBL(c) (RCLASS(c)->ptr->iv_tbl)
+#define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
+#define RCLASS_SUPER(c) (RCLASS(c)->ptr->super)
+#define RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl)
+#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)
+#define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
+#define RMODULE_SUPER(m) RCLASS_SUPER(m)
+
+struct RFloat {
+    struct RBasic basic;
+    double float_value;
+};
+#define RFLOAT_VALUE(v) (RFLOAT(v)->float_value)
+#define DBL2NUM(dbl)  rb_float_new(dbl)
+
+#define ELTS_SHARED FL_USER2
+
+#define RSTRING_EMBED_LEN_MAX ((int)((sizeof(VALUE)*3)/sizeof(char)-1))
+struct RString {
+    struct RBasic basic;
+    union {
+	struct {
+	    long len;
+	    char *ptr;
+	    union {
+		long capa;
+		VALUE shared;
+	    } aux;
+	} heap;
+	char ary[RSTRING_EMBED_LEN_MAX + 1];
+    } as;
+};
+#define RSTRING_NOEMBED FL_USER1
+#define RSTRING_EMBED_LEN_MASK (FL_USER2|FL_USER3|FL_USER4|FL_USER5|FL_USER6)
+#define RSTRING_EMBED_LEN_SHIFT (FL_USHIFT+2)
+#define RSTRING_LEN(str) \
+    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
+     (long)((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \
+            (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT)) : \
+     RSTRING(str)->as.heap.len)
+#define RSTRING_PTR(str) \
+    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
+     RSTRING(str)->as.ary : \
+     RSTRING(str)->as.heap.ptr)
+#define RSTRING_END(str) \
+    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
+     (RSTRING(str)->as.ary + \
+      ((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \
+       (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT))) : \
+     (RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len))
+#define RSTRING_LENINT(str) rb_long2int(RSTRING_LEN(str))
+
+#define RARRAY_EMBED_LEN_MAX 3
+struct RArray {
+    struct RBasic basic;
+    union {
+	struct {
+	    long len;
+	    union {
+		long capa;
+		VALUE shared;
+	    } aux;
+	    VALUE *ptr;
+	} heap;
+	VALUE ary[RARRAY_EMBED_LEN_MAX];
+    } as;
+};
+#define RARRAY_EMBED_FLAG FL_USER1
+/* FL_USER2 is for ELTS_SHARED */
+#define RARRAY_EMBED_LEN_MASK (FL_USER4|FL_USER3)
+#define RARRAY_EMBED_LEN_SHIFT (FL_USHIFT+3)
+#define RARRAY_LEN(a) \
+    ((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ? \
+     (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
+	 (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)) : \
+     RARRAY(a)->as.heap.len)
+#define RARRAY_PTR(a) \
+    ((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ? \
+     RARRAY(a)->as.ary : \
+     RARRAY(a)->as.heap.ptr)
+#define RARRAY_LENINT(ary) rb_long2int(RARRAY_LEN(ary))
+
+struct RRegexp {
+    struct RBasic basic;
+    struct re_pattern_buffer *ptr;
+    VALUE src;
+    unsigned long usecnt;
+};
+#define RREGEXP_SRC(r) RREGEXP(r)->src
+#define RREGEXP_SRC_PTR(r) RSTRING_PTR(RREGEXP(r)->src)
+#define RREGEXP_SRC_LEN(r) RSTRING_LEN(RREGEXP(r)->src)
+#define RREGEXP_SRC_END(r) RSTRING_END(RREGEXP(r)->src)
+
+struct RHash {
+    struct RBasic basic;
+    struct st_table *ntbl;      /* possibly 0 */
+    int iter_lev;
+    VALUE ifnone;
+};
+/* RHASH_TBL allocates st_table if not available. */
+#define RHASH_TBL(h) rb_hash_tbl(h)
+#define RHASH_ITER_LEV(h) (RHASH(h)->iter_lev)
+#define RHASH_IFNONE(h) (RHASH(h)->ifnone)
+#define RHASH_SIZE(h) (RHASH(h)->ntbl ? RHASH(h)->ntbl->num_entries : 0)
+#define RHASH_EMPTY_P(h) (RHASH_SIZE(h) == 0)
+
+struct RFile {
+    struct RBasic basic;
+    struct rb_io_t *fptr;
+};
+
+struct RRational {
+    struct RBasic basic;
+    VALUE num;
+    VALUE den;
+};
+
+struct RComplex {
+    struct RBasic basic;
+    VALUE real;
+    VALUE imag;
+};
+
+struct RData {
+    struct RBasic basic;
+    void (*dmark)(void*);
+    void (*dfree)(void*);
+    void *data;
+};
+
+typedef struct rb_data_type_struct {
+    const char *wrap_struct_name;
+    void (*dmark)(void*);
+    void (*dfree)(void*);
+    size_t (*dsize)(const void *);
+    void *reserved[3]; /* For future extension.
+                          This array *must* be filled with ZERO. */
+    void *data;        /* This area can be used for any purpose
+                          by a programmer who define the type. */
+} rb_data_type_t;
+
+struct RTypedData {
+    struct RBasic basic;
+    const rb_data_type_t *type;
+    VALUE typed_flag; /* 1 or not */
+    void *data;
+};
+
+#define DATA_PTR(dta) (RDATA(dta)->data)
+
+#define RTYPEDDATA_P(v)    (RTYPEDDATA(v)->typed_flag == 1)
+#define RTYPEDDATA_TYPE(v) (RTYPEDDATA(v)->type)
+#define RTYPEDDATA_DATA(v) (RTYPEDDATA(v)->data)
+
+/*
+#define RUBY_DATA_FUNC(func) ((void (*)(void*))func)
+*/
+typedef void (*RUBY_DATA_FUNC)(void*);
+
+VALUE rb_data_object_alloc(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC);
+VALUE rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *);
+int rb_typeddata_is_kind_of(VALUE, const rb_data_type_t *);
+void *rb_check_typeddata(VALUE, const rb_data_type_t *);
+#define Check_TypedStruct(v,t) rb_check_typeddata((VALUE)(v),t)
+#define RUBY_DEFAULT_FREE ((RUBY_DATA_FUNC)-1)
+#define RUBY_NEVER_FREE   ((RUBY_DATA_FUNC)0)
+#define RUBY_TYPED_DEFAULT_FREE RUBY_DEFAULT_FREE
+#define RUBY_TYPED_NEVER_FREE   RUBY_NEVER_FREE
+
+#define Data_Wrap_Struct(klass,mark,free,sval)\
+    rb_data_object_alloc(klass,sval,(RUBY_DATA_FUNC)mark,(RUBY_DATA_FUNC)free)
+
+#define Data_Make_Struct(klass,type,mark,free,sval) (\
+    sval = ALLOC(type),\
+    memset(sval, 0, sizeof(type)),\
+    Data_Wrap_Struct(klass,mark,free,sval)\
+)
+
+#define TypedData_Wrap_Struct(klass,data_type,sval)\
+  rb_data_typed_object_alloc(klass,sval,data_type)
+
+#define TypedData_Make_Struct(klass, type, data_type, sval) (\
+    sval = ALLOC(type),\
+    memset(sval, 0, sizeof(type)),\
+    TypedData_Wrap_Struct(klass,data_type,sval)\
+)
+
+#define Data_Get_Struct(obj,type,sval) do {\
+    Check_Type(obj, T_DATA); \
+    sval = (type*)DATA_PTR(obj);\
+} while (0)
+
+#define TypedData_Get_Struct(obj,type,data_type,sval) do {\
+    sval = (type*)rb_check_typeddata(obj, data_type); \
+} while (0)
+
+#define RSTRUCT_EMBED_LEN_MAX 3
+struct RStruct {
+    struct RBasic basic;
+    union {
+	struct {
+	    long len;
+	    VALUE *ptr;
+	} heap;
+	VALUE ary[RSTRUCT_EMBED_LEN_MAX];
+    } as;
+};
+#define RSTRUCT_EMBED_LEN_MASK (FL_USER2|FL_USER1)
+#define RSTRUCT_EMBED_LEN_SHIFT (FL_USHIFT+1)
+#define RSTRUCT_LEN(st) \
+    ((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? \
+     (long)((RBASIC(st)->flags >> RSTRUCT_EMBED_LEN_SHIFT) & \
+            (RSTRUCT_EMBED_LEN_MASK >> RSTRUCT_EMBED_LEN_SHIFT)) : \
+     RSTRUCT(st)->as.heap.len)
+#define RSTRUCT_PTR(st) \
+    ((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? \
+     RSTRUCT(st)->as.ary : \
+     RSTRUCT(st)->as.heap.ptr)
+#define RSTRUCT_LENINT(st) rb_long2int(RSTRUCT_LEN(st))
+
+#define RBIGNUM_EMBED_LEN_MAX ((int)((sizeof(VALUE)*3)/sizeof(BDIGIT)))
+struct RBignum {
+    struct RBasic basic;
+    union {
+        struct {
+            long len;
+            BDIGIT *digits;
+        } heap;
+        BDIGIT ary[RBIGNUM_EMBED_LEN_MAX];
+    } as;
+};
+#define RBIGNUM_SIGN_BIT FL_USER1
+/* sign: positive:1, negative:0 */
+#define RBIGNUM_SIGN(b) ((RBASIC(b)->flags & RBIGNUM_SIGN_BIT) != 0)
+#define RBIGNUM_SET_SIGN(b,sign) \
+  ((sign) ? (RBASIC(b)->flags |= RBIGNUM_SIGN_BIT) \
+          : (RBASIC(b)->flags &= ~RBIGNUM_SIGN_BIT))
+#define RBIGNUM_POSITIVE_P(b) RBIGNUM_SIGN(b)
+#define RBIGNUM_NEGATIVE_P(b) (!RBIGNUM_SIGN(b))
+
+#define RBIGNUM_EMBED_FLAG FL_USER2
+#define RBIGNUM_EMBED_LEN_MASK (FL_USER5|FL_USER4|FL_USER3)
+#define RBIGNUM_EMBED_LEN_SHIFT (FL_USHIFT+3)
+#define RBIGNUM_LEN(b) \
+    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+     (long)((RBASIC(b)->flags >> RBIGNUM_EMBED_LEN_SHIFT) & \
+            (RBIGNUM_EMBED_LEN_MASK >> RBIGNUM_EMBED_LEN_SHIFT)) : \
+     RBIGNUM(b)->as.heap.len)
+/* LSB:RBIGNUM_DIGITS(b)[0], MSB:RBIGNUM_DIGITS(b)[RBIGNUM_LEN(b)-1] */
+#define RBIGNUM_DIGITS(b) \
+    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+     RBIGNUM(b)->as.ary : \
+     RBIGNUM(b)->as.heap.digits)
+#define RBIGNUM_LENINT(b) rb_long2int(RBIGNUM_LEN(b))
+
+#define R_CAST(st)   (struct st*)
+#define RBASIC(obj)  (R_CAST(RBasic)(obj))
+#define ROBJECT(obj) (R_CAST(RObject)(obj))
+#define RCLASS(obj)  (R_CAST(RClass)(obj))
+#define RMODULE(obj) RCLASS(obj)
+#define RFLOAT(obj)  (R_CAST(RFloat)(obj))
+#define RSTRING(obj) (R_CAST(RString)(obj))
+#define RREGEXP(obj) (R_CAST(RRegexp)(obj))
+#define RARRAY(obj)  (R_CAST(RArray)(obj))
+#define RHASH(obj)   (R_CAST(RHash)(obj))
+#define RDATA(obj)   (R_CAST(RData)(obj))
+#define RTYPEDDATA(obj)   (R_CAST(RTypedData)(obj))
+#define RSTRUCT(obj) (R_CAST(RStruct)(obj))
+#define RBIGNUM(obj) (R_CAST(RBignum)(obj))
+#define RFILE(obj)   (R_CAST(RFile)(obj))
+#define RRATIONAL(obj) (R_CAST(RRational)(obj))
+#define RCOMPLEX(obj) (R_CAST(RComplex)(obj))
+
+#define FL_SINGLETON FL_USER0
+#define FL_MARK      (((VALUE)1)<<5)
+#define FL_RESERVED  (((VALUE)1)<<6) /* will be used in the future GC */
+#define FL_FINALIZE  (((VALUE)1)<<7)
+#define FL_TAINT     (((VALUE)1)<<8)
+#define FL_UNTRUSTED (((VALUE)1)<<9)
+#define FL_EXIVAR    (((VALUE)1)<<10)
+#define FL_FREEZE    (((VALUE)1)<<11)
+
+#define FL_USHIFT    12
+
+#define FL_USER0     (((VALUE)1)<<(FL_USHIFT+0))
+#define FL_USER1     (((VALUE)1)<<(FL_USHIFT+1))
+#define FL_USER2     (((VALUE)1)<<(FL_USHIFT+2))
+#define FL_USER3     (((VALUE)1)<<(FL_USHIFT+3))
+#define FL_USER4     (((VALUE)1)<<(FL_USHIFT+4))
+#define FL_USER5     (((VALUE)1)<<(FL_USHIFT+5))
+#define FL_USER6     (((VALUE)1)<<(FL_USHIFT+6))
+#define FL_USER7     (((VALUE)1)<<(FL_USHIFT+7))
+#define FL_USER8     (((VALUE)1)<<(FL_USHIFT+8))
+#define FL_USER9     (((VALUE)1)<<(FL_USHIFT+9))
+#define FL_USER10    (((VALUE)1)<<(FL_USHIFT+10))
+#define FL_USER11    (((VALUE)1)<<(FL_USHIFT+11))
+#define FL_USER12    (((VALUE)1)<<(FL_USHIFT+12))
+#define FL_USER13    (((VALUE)1)<<(FL_USHIFT+13))
+#define FL_USER14    (((VALUE)1)<<(FL_USHIFT+14))
+#define FL_USER15    (((VALUE)1)<<(FL_USHIFT+15))
+#define FL_USER16    (((VALUE)1)<<(FL_USHIFT+16))
+#define FL_USER17    (((VALUE)1)<<(FL_USHIFT+17))
+#define FL_USER18    (((VALUE)1)<<(FL_USHIFT+18))
+#define FL_USER19    (((VALUE)1)<<(FL_USHIFT+19))
+
+#define SPECIAL_CONST_P(x) (IMMEDIATE_P(x) || !RTEST(x))
+
+#define FL_ABLE(x) (!SPECIAL_CONST_P(x) && BUILTIN_TYPE(x) != T_NODE)
+#define FL_TEST(x,f) (FL_ABLE(x)?(RBASIC(x)->flags&(f)):0)
+#define FL_ANY(x,f) FL_TEST(x,f)
+#define FL_ALL(x,f) (FL_TEST(x,f) == (f))
+#define FL_SET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags |= (f);} while (0)
+#define FL_UNSET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags &= ~(f);} while (0)
+#define FL_REVERSE(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags ^= (f);} while (0)
+
+#define OBJ_TAINTED(x) (!!FL_TEST((x), FL_TAINT))
+#define OBJ_TAINT(x) FL_SET((x), FL_TAINT)
+#define OBJ_UNTRUSTED(x) (!!FL_TEST((x), FL_UNTRUSTED))
+#define OBJ_UNTRUST(x) FL_SET((x), FL_UNTRUSTED)
+#define OBJ_INFECT(x,s) do {if (FL_ABLE(x) && FL_ABLE(s)) RBASIC(x)->flags |= RBASIC(s)->flags & (FL_TAINT | FL_UNTRUSTED);} while (0)
+
+#define OBJ_FROZEN(x) (!!FL_TEST((x), FL_FREEZE))
+#define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE)
+
+#if SIZEOF_INT < SIZEOF_LONG
+# define INT2NUM(v) INT2FIX((int)(v))
+# define UINT2NUM(v) LONG2FIX((unsigned int)(v))
+#else
+# define INT2NUM_internal(v) (FIXABLE(v) ? INT2FIX(v) : rb_int2big(v))
+# ifdef __GNUC__
+#   define INT2NUM(v) __extension__ ({int int2num_v = (v); INT2NUM_internal(int2num_v);})
+# else
+static inline VALUE
+INT2NUM(int v)
+{
+    return INT2NUM_internal(v);
+}
+# endif
+
+# define UINT2NUM_internal(v) (POSFIXABLE(v) ? LONG2FIX(v) : rb_uint2big(v))
+# ifdef __GNUC__
+#   define UINT2NUM(v) __extension__ ({unsigned int uint2num_v = (v); UINT2NUM_internal(uint2num_v);})
+# else
+static inline VALUE
+UINT2NUM(unsigned int v)
+{
+    return UINT2NUM_internal(v);
+}
+# endif
+#endif
+
+#define LONG2NUM_internal(v) (FIXABLE(v) ? LONG2FIX(v) : rb_int2big(v))
+#ifdef __GNUC__
+# define LONG2NUM(v) __extension__ ({long long2num_v = (v); LONG2NUM_internal(long2num_v);})
+#else
+static inline VALUE
+LONG2NUM(long v)
+{
+    return LONG2NUM_internal(v);
+}
+#endif
+
+#define ULONG2NUM_internal(v) (POSFIXABLE(v) ? LONG2FIX(v) : rb_uint2big(v))
+#ifdef __GNUC__
+# define ULONG2NUM(v) __extension__ ({unsigned long ulong2num_v = (v); ULONG2NUM_internal(ulong2num_v);})
+#else
+static inline VALUE
+ULONG2NUM(unsigned long v)
+{
+    return ULONG2NUM_internal(v);
+}
+#endif
+
+#define NUM2CHR_internal(x) (((TYPE(x) == T_STRING)&&(RSTRING_LEN(x)>=1))?\
+                     RSTRING_PTR(x)[0]:(char)(NUM2INT(x)&0xff))
+#ifdef __GNUC__
+# define NUM2CHR(x) __extension__ ({VALUE num2chr_x = (x); NUM2CHR_internal(num2chr_x);})
+#else
+static inline char
+NUM2CHR(VALUE x)
+{
+    return NUM2CHR_internal(x);
+}
+#endif
+#define CHR2FIX(x) INT2FIX((long)((x)&0xff))
+
+#define ALLOC_N(type,n) (type*)xmalloc2((n),sizeof(type))
+#define ALLOC(type) (type*)xmalloc(sizeof(type))
+#define REALLOC_N(var,type,n) (var)=(type*)xrealloc2((char*)(var),(n),sizeof(type))
+
+#define ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
+
+#define MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
+#define MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
+#define MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
+#define MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
+
+void rb_obj_infect(VALUE,VALUE);
+
+typedef int ruby_glob_func(const char*,VALUE, void*);
+void rb_glob(const char*,void(*)(const char*,VALUE,void*),VALUE);
+int ruby_glob(const char*,int,ruby_glob_func*,VALUE);
+int ruby_brace_glob(const char*,int,ruby_glob_func*,VALUE);
+
+VALUE rb_define_class(const char*,VALUE);
+VALUE rb_define_module(const char*);
+VALUE rb_define_class_under(VALUE, const char*, VALUE);
+VALUE rb_define_module_under(VALUE, const char*);
+
+void rb_include_module(VALUE,VALUE);
+void rb_extend_object(VALUE,VALUE);
+
+struct rb_global_variable;
+
+typedef VALUE rb_gvar_getter_t(ID id, void *data, struct rb_global_variable *gvar);
+typedef void  rb_gvar_setter_t(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
+typedef void  rb_gvar_marker_t(VALUE *var);
+
+VALUE rb_gvar_undef_getter(ID id, void *data, struct rb_global_variable *gvar);
+void  rb_gvar_undef_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
+void  rb_gvar_undef_marker(VALUE *var);
+
+VALUE rb_gvar_val_getter(ID id, void *data, struct rb_global_variable *gvar);
+void  rb_gvar_val_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
+void  rb_gvar_val_marker(VALUE *var);
+
+VALUE rb_gvar_var_getter(ID id, void *data, struct rb_global_variable *gvar);
+void  rb_gvar_var_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
+void  rb_gvar_var_marker(VALUE *var);
+
+void  rb_gvar_readonly_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
+
+void rb_define_variable(const char*,VALUE*);
+void rb_define_virtual_variable(const char*,VALUE(*)(ANYARGS),void(*)(ANYARGS));
+void rb_define_hooked_variable(const char*,VALUE*,VALUE(*)(ANYARGS),void(*)(ANYARGS));
+void rb_define_readonly_variable(const char*,VALUE*);
+void rb_define_const(VALUE,const char*,VALUE);
+void rb_define_global_const(const char*,VALUE);
+
+#define RUBY_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))func)
+void rb_define_method(VALUE,const char*,VALUE(*)(ANYARGS),int);
+void rb_define_module_function(VALUE,const char*,VALUE(*)(ANYARGS),int);
+void rb_define_global_function(const char*,VALUE(*)(ANYARGS),int);
+
+void rb_undef_method(VALUE,const char*);
+void rb_define_alias(VALUE,const char*,const char*);
+void rb_define_attr(VALUE,const char*,int,int);
+
+void rb_global_variable(VALUE*);
+void rb_gc_register_mark_object(VALUE);
+void rb_gc_register_address(VALUE*);
+void rb_gc_unregister_address(VALUE*);
+
+ID rb_intern(const char*);
+ID rb_intern2(const char*, long);
+ID rb_intern_str(VALUE str);
+const char *rb_id2name(ID);
+ID rb_to_id(VALUE);
+VALUE rb_id2str(ID);
+
+#define CONST_ID_CACHE(result, str)			\
+    {							\
+	static ID rb_intern_id_cache;			\
+	if (!rb_intern_id_cache)			\
+	    rb_intern_id_cache = rb_intern2(str, (long)strlen(str)); \
+	result rb_intern_id_cache;			\
+    }
+#define CONST_ID(var, str) \
+    do CONST_ID_CACHE(var =, str) while (0)
+#ifdef __GNUC__
+/* __builtin_constant_p and statement expression is available
+ * since gcc-2.7.2.3 at least. */
+#define rb_intern(str) \
+    (__builtin_constant_p(str) ? \
+        __extension__ (CONST_ID_CACHE((ID), str)) :     \
+        rb_intern(str))
+#define rb_intern_const(str) \
+    (__builtin_constant_p(str) ? \
+     __extension__ (rb_intern2(str, (long)strlen(str))) : \
+     (rb_intern)(str))
+#else
+#define rb_intern_const(str) rb_intern2(str, (long)strlen(str))
+#endif
+
+const char *rb_class2name(VALUE);
+const char *rb_obj_classname(VALUE);
+
+void rb_p(VALUE);
+
+VALUE rb_eval_string(const char*);
+VALUE rb_eval_string_protect(const char*, int*);
+VALUE rb_eval_string_wrap(const char*, int*);
+VALUE rb_funcall(VALUE, ID, int, ...);
+VALUE rb_funcall2(VALUE, ID, int, const VALUE*);
+VALUE rb_funcall3(VALUE, ID, int, const VALUE*);
+int rb_scan_args(int, const VALUE*, const char*, ...);
+VALUE rb_call_super(int, const VALUE*);
+
+VALUE rb_gv_set(const char*, VALUE);
+VALUE rb_gv_get(const char*);
+VALUE rb_iv_get(VALUE, const char*);
+VALUE rb_iv_set(VALUE, const char*, VALUE);
+
+VALUE rb_equal(VALUE,VALUE);
+
+VALUE *rb_ruby_verbose_ptr(void);
+VALUE *rb_ruby_debug_ptr(void);
+#define ruby_verbose (*rb_ruby_verbose_ptr())
+#define ruby_debug   (*rb_ruby_debug_ptr())
+
+PRINTF_ARGS(NORETURN(void rb_raise(VALUE, const char*, ...)), 2, 3);
+PRINTF_ARGS(NORETURN(void rb_fatal(const char*, ...)), 1, 2);
+PRINTF_ARGS(NORETURN(void rb_bug(const char*, ...)), 1, 2);
+NORETURN(void rb_bug_errno(const char*, int));
+NORETURN(void rb_sys_fail(const char*));
+NORETURN(void rb_mod_sys_fail(VALUE, const char*));
+NORETURN(void rb_iter_break(void));
+NORETURN(void rb_exit(int));
+NORETURN(void rb_notimplement(void));
+
+/* reports if `-W' specified */
+PRINTF_ARGS(void rb_warning(const char*, ...), 1, 2);
+PRINTF_ARGS(void rb_compile_warning(const char *, int, const char*, ...), 3, 4);
+PRINTF_ARGS(void rb_sys_warning(const char*, ...), 1, 2);
+/* reports always */
+PRINTF_ARGS(void rb_warn(const char*, ...), 1, 2);
+PRINTF_ARGS(void rb_compile_warn(const char *, int, const char*, ...), 3, 4);
+
+typedef VALUE rb_block_call_func(VALUE, VALUE, int, VALUE*);
+
+VALUE rb_each(VALUE);
+VALUE rb_yield(VALUE);
+VALUE rb_yield_values(int n, ...);
+VALUE rb_yield_values2(int n, const VALUE *argv);
+VALUE rb_yield_splat(VALUE);
+int rb_block_given_p(void);
+void rb_need_block(void);
+VALUE rb_iterate(VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE);
+VALUE rb_block_call(VALUE,ID,int,VALUE*,VALUE(*)(ANYARGS),VALUE);
+VALUE rb_rescue(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
+VALUE rb_rescue2(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...);
+VALUE rb_ensure(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
+VALUE rb_catch(const char*,VALUE(*)(ANYARGS),VALUE);
+VALUE rb_catch_obj(VALUE,VALUE(*)(ANYARGS),VALUE);
+NORETURN(void rb_throw(const char*,VALUE));
+NORETURN(void rb_throw_obj(VALUE,VALUE));
+
+VALUE rb_require(const char*);
+
+#ifdef __ia64
+void ruby_init_stack(volatile VALUE*, void*);
+#define ruby_init_stack(addr) ruby_init_stack(addr, rb_ia64_bsp())
+#else
+void ruby_init_stack(volatile VALUE*);
+#endif
+#define RUBY_INIT_STACK \
+    VALUE variable_in_this_stack_frame; \
+    ruby_init_stack(&variable_in_this_stack_frame);
+void ruby_init(void);
+void *ruby_options(int, char**);
+int ruby_run_node(void *);
+int ruby_exec_node(void *);
+
+RUBY_EXTERN VALUE rb_mKernel;
+RUBY_EXTERN VALUE rb_mComparable;
+RUBY_EXTERN VALUE rb_mEnumerable;
+RUBY_EXTERN VALUE rb_mErrno;
+RUBY_EXTERN VALUE rb_mFileTest;
+RUBY_EXTERN VALUE rb_mGC;
+RUBY_EXTERN VALUE rb_mMath;
+RUBY_EXTERN VALUE rb_mProcess;
+RUBY_EXTERN VALUE rb_mWaitReadable;
+RUBY_EXTERN VALUE rb_mWaitWritable;
+
+RUBY_EXTERN VALUE rb_cBasicObject;
+RUBY_EXTERN VALUE rb_cObject;
+RUBY_EXTERN VALUE rb_cArray;
+RUBY_EXTERN VALUE rb_cBignum;
+RUBY_EXTERN VALUE rb_cBinding;
+RUBY_EXTERN VALUE rb_cClass;
+RUBY_EXTERN VALUE rb_cCont;
+RUBY_EXTERN VALUE rb_cDir;
+RUBY_EXTERN VALUE rb_cData;
+RUBY_EXTERN VALUE rb_cFalseClass;
+RUBY_EXTERN VALUE rb_cEncoding;
+RUBY_EXTERN VALUE rb_cEnumerator;
+RUBY_EXTERN VALUE rb_cFile;
+RUBY_EXTERN VALUE rb_cFixnum;
+RUBY_EXTERN VALUE rb_cFloat;
+RUBY_EXTERN VALUE rb_cHash;
+RUBY_EXTERN VALUE rb_cInteger;
+RUBY_EXTERN VALUE rb_cIO;
+RUBY_EXTERN VALUE rb_cMatch;
+RUBY_EXTERN VALUE rb_cMethod;
+RUBY_EXTERN VALUE rb_cModule;
+RUBY_EXTERN VALUE rb_cNameErrorMesg;
+RUBY_EXTERN VALUE rb_cNilClass;
+RUBY_EXTERN VALUE rb_cNumeric;
+RUBY_EXTERN VALUE rb_cProc;
+RUBY_EXTERN VALUE rb_cRandom;
+RUBY_EXTERN VALUE rb_cRange;
+RUBY_EXTERN VALUE rb_cRational;
+RUBY_EXTERN VALUE rb_cComplex;
+RUBY_EXTERN VALUE rb_cRegexp;
+RUBY_EXTERN VALUE rb_cStat;
+RUBY_EXTERN VALUE rb_cString;
+RUBY_EXTERN VALUE rb_cStruct;
+RUBY_EXTERN VALUE rb_cSymbol;
+RUBY_EXTERN VALUE rb_cThread;
+RUBY_EXTERN VALUE rb_cTime;
+RUBY_EXTERN VALUE rb_cTrueClass;
+RUBY_EXTERN VALUE rb_cUnboundMethod;
+
+RUBY_EXTERN VALUE rb_eException;
+RUBY_EXTERN VALUE rb_eStandardError;
+RUBY_EXTERN VALUE rb_eSystemExit;
+RUBY_EXTERN VALUE rb_eInterrupt;
+RUBY_EXTERN VALUE rb_eSignal;
+RUBY_EXTERN VALUE rb_eFatal;
+RUBY_EXTERN VALUE rb_eArgError;
+RUBY_EXTERN VALUE rb_eEOFError;
+RUBY_EXTERN VALUE rb_eIndexError;
+RUBY_EXTERN VALUE rb_eStopIteration;
+RUBY_EXTERN VALUE rb_eKeyError;
+RUBY_EXTERN VALUE rb_eRangeError;
+RUBY_EXTERN VALUE rb_eIOError;
+RUBY_EXTERN VALUE rb_eRuntimeError;
+RUBY_EXTERN VALUE rb_eSecurityError;
+RUBY_EXTERN VALUE rb_eSystemCallError;
+RUBY_EXTERN VALUE rb_eThreadError;
+RUBY_EXTERN VALUE rb_eTypeError;
+RUBY_EXTERN VALUE rb_eZeroDivError;
+RUBY_EXTERN VALUE rb_eNotImpError;
+RUBY_EXTERN VALUE rb_eNoMemError;
+RUBY_EXTERN VALUE rb_eNoMethodError;
+RUBY_EXTERN VALUE rb_eFloatDomainError;
+RUBY_EXTERN VALUE rb_eLocalJumpError;
+RUBY_EXTERN VALUE rb_eSysStackError;
+RUBY_EXTERN VALUE rb_eRegexpError;
+RUBY_EXTERN VALUE rb_eEncodingError;
+RUBY_EXTERN VALUE rb_eEncCompatError;
+
+RUBY_EXTERN VALUE rb_eScriptError;
+RUBY_EXTERN VALUE rb_eNameError;
+RUBY_EXTERN VALUE rb_eSyntaxError;
+RUBY_EXTERN VALUE rb_eLoadError;
+
+RUBY_EXTERN VALUE rb_eMathDomainError;
+
+RUBY_EXTERN VALUE rb_stdin, rb_stdout, rb_stderr;
+
+static inline VALUE
+rb_class_of(VALUE obj)
+{
+    if (IMMEDIATE_P(obj)) {
+	if (FIXNUM_P(obj)) return rb_cFixnum;
+	if (obj == Qtrue)  return rb_cTrueClass;
+	if (SYMBOL_P(obj)) return rb_cSymbol;
+    }
+    else if (!RTEST(obj)) {
+	if (obj == Qnil)   return rb_cNilClass;
+	if (obj == Qfalse) return rb_cFalseClass;
+    }
+    return RBASIC(obj)->klass;
+}
+
+static inline int
+rb_type(VALUE obj)
+{
+    if (IMMEDIATE_P(obj)) {
+	if (FIXNUM_P(obj)) return T_FIXNUM;
+	if (obj == Qtrue) return T_TRUE;
+	if (SYMBOL_P(obj)) return T_SYMBOL;
+	if (obj == Qundef) return T_UNDEF;
+    }
+    else if (!RTEST(obj)) {
+	if (obj == Qnil) return T_NIL;
+	if (obj == Qfalse) return T_FALSE;
+    }
+    return BUILTIN_TYPE(obj);
+}
+
+#define RB_TYPE_P(obj, type) ( \
+	((type) == T_FIXNUM) ? FIXNUM_P(obj) : \
+	((type) == T_TRUE) ? ((obj) == Qtrue) : \
+	((type) == T_FALSE) ? ((obj) == Qfalse) : \
+	((type) == T_NIL) ? ((obj) == Qnil) : \
+	((type) == T_UNDEF) ? ((obj) == Qundef) : \
+	((type) == T_SYMBOL) ? SYMBOL_P(obj) : \
+	(!SPECIAL_CONST_P(obj) && BUILTIN_TYPE(obj) == (type)))
+
+#ifdef __GNUC__
+#define rb_type_p(obj, type) \
+    __extension__ (__builtin_constant_p(type) ? RB_TYPE_P(obj, type) : \
+		   rb_type(obj) == (type))
+#else
+#define rb_type_p(obj, type) (rb_type(obj) == (type))
+#endif
+
+#ifdef __GNUC__
+#define rb_special_const_p(obj) \
+    __extension__ ({VALUE special_const_obj = (obj); (int)(SPECIAL_CONST_P(special_const_obj) ? Qtrue : Qfalse);})
+#else
+static inline int
+rb_special_const_p(VALUE obj)
+{
+    if (SPECIAL_CONST_P(obj)) return (int)Qtrue;
+    return (int)Qfalse;
+}
+#endif
+
+#include "ruby/missing.h"
+#include "ruby/intern.h"
+
+#if defined(EXTLIB) && defined(USE_DLN_A_OUT)
+/* hook for external modules */
+static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
+#endif
+
+#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
+#define RUBY_GLOBAL_SETUP /* use linker option to link startup code with ObjC support */
+#else
+#define RUBY_GLOBAL_SETUP
+#endif
+
+void ruby_sysinit(int *, char ***);
+
+#define RUBY_VM 1 /* YARV */
+#define HAVE_NATIVETHREAD
+int ruby_native_thread_p(void);
+
+#define RUBY_EVENT_NONE      0x0000
+#define RUBY_EVENT_LINE      0x0001
+#define RUBY_EVENT_CLASS     0x0002
+#define RUBY_EVENT_END       0x0004
+#define RUBY_EVENT_CALL      0x0008
+#define RUBY_EVENT_RETURN    0x0010
+#define RUBY_EVENT_C_CALL    0x0020
+#define RUBY_EVENT_C_RETURN  0x0040
+#define RUBY_EVENT_RAISE     0x0080
+#define RUBY_EVENT_ALL       0xffff
+#define RUBY_EVENT_VM       0x10000
+#define RUBY_EVENT_SWITCH   0x20000
+#define RUBY_EVENT_COVERAGE 0x40000
+
+typedef unsigned int rb_event_flag_t;
+typedef void (*rb_event_hook_func_t)(rb_event_flag_t, VALUE data, VALUE, ID, VALUE klass);
+
+typedef struct rb_event_hook_struct {
+    rb_event_flag_t flag;
+    rb_event_hook_func_t func;
+    VALUE data;
+    struct rb_event_hook_struct *next;
+} rb_event_hook_t;
+
+#define RB_EVENT_HOOKS_HAVE_CALLBACK_DATA 1
+void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events,
+		       VALUE data);
+int rb_remove_event_hook(rb_event_hook_func_t func);
+
+/* locale insensitive functions */
+
+#define rb_isascii(c) ((unsigned long)(c) < 128)
+int rb_isalnum(int c);
+int rb_isalpha(int c);
+int rb_isblank(int c);
+int rb_iscntrl(int c);
+int rb_isdigit(int c);
+int rb_isgraph(int c);
+int rb_islower(int c);
+int rb_isprint(int c);
+int rb_ispunct(int c);
+int rb_isspace(int c);
+int rb_isupper(int c);
+int rb_isxdigit(int c);
+int rb_tolower(int c);
+int rb_toupper(int c);
+
+#ifndef ISPRINT
+#define ISASCII(c) rb_isascii((unsigned char)(c))
+#undef ISPRINT
+#define ISPRINT(c) rb_isprint((unsigned char)(c))
+#define ISSPACE(c) rb_isspace((unsigned char)(c))
+#define ISUPPER(c) rb_isupper((unsigned char)(c))
+#define ISLOWER(c) rb_islower((unsigned char)(c))
+#define ISALNUM(c) rb_isalnum((unsigned char)(c))
+#define ISALPHA(c) rb_isalpha((unsigned char)(c))
+#define ISDIGIT(c) rb_isdigit((unsigned char)(c))
+#define ISXDIGIT(c) rb_isxdigit((unsigned char)(c))
+#endif
+#define TOUPPER(c) rb_toupper((unsigned char)(c))
+#define TOLOWER(c) rb_tolower((unsigned char)(c))
+
+int st_strcasecmp(const char *s1, const char *s2);
+int st_strncasecmp(const char *s1, const char *s2, size_t n);
+#define STRCASECMP(s1, s2) (st_strcasecmp(s1, s2))
+#define STRNCASECMP(s1, s2, n) (st_strncasecmp(s1, s2, n))
+
+unsigned long ruby_strtoul(const char *str, char **endptr, int base);
+#define STRTOUL(str, endptr, base) (ruby_strtoul(str, endptr, base))
+
+#define InitVM(ext) {void InitVM_##ext(void);InitVM_##ext();}
+
+int ruby_snprintf(char *str, size_t n, char const *fmt, ...);
+int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
+#undef snprintf
+#undef vsnprintf
+#define snprintf ruby_snprintf
+#define vsnprintf ruby_vsnprintf
+
+#ifdef BROKEN_CLOSE
+#undef getpeername
+#define getpeername ruby_getpeername
+#undef getsockname
+#define getsockname ruby_getsockname
+#undef shutdown
+#define shutdown ruby_shutdown
+#undef close
+#define close ruby_close
+#endif
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+#endif /* RUBY_RUBY_H */
diff --git a/include/ruby/st.h b/include/ruby/st.h
new file mode 100644
index 0000000000..27e47b816c
--- /dev/null
+++ b/include/ruby/st.h
@@ -0,0 +1,135 @@
+/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
+
+/* @(#) st.h 5.1 89/12/14 */
+
+#ifndef RUBY_ST_H
+#define RUBY_ST_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#ifndef RUBY_LIB_PREFIX
+#include "ruby/config.h"
+#include "ruby/defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+#endif
+
+#if   defined STDC_HEADERS
+#include <stddef.h>
+#elif defined HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
+#if SIZEOF_LONG == SIZEOF_VOIDP
+typedef unsigned long st_data_t;
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+typedef unsigned LONG_LONG st_data_t;
+#else
+# error ---->> st.c requires sizeof(void*) == sizeof(long) to be compiled. <<----
+#endif
+#define ST_DATA_T_DEFINED
+
+#ifndef CHAR_BIT
+# ifdef HAVE_LIMITS_H
+#  include <limits.h>
+# else
+#  define CHAR_BIT 8
+# endif
+#endif
+#ifndef _
+# define _(args) args
+#endif
+#ifndef ANYARGS
+# ifdef __cplusplus
+#   define ANYARGS ...
+# else
+#   define ANYARGS
+# endif
+#endif
+
+typedef struct st_table st_table;
+
+typedef st_data_t st_index_t;
+typedef int st_compare_func(st_data_t, st_data_t);
+typedef st_index_t st_hash_func(st_data_t);
+
+typedef char st_check_for_sizeof_st_index_t[SIZEOF_VOIDP == (int)sizeof(st_index_t) ? 1 : -1];
+#define SIZEOF_ST_INDEX_T SIZEOF_VOIDP
+
+struct st_hash_type {
+    int (*compare)(ANYARGS /*st_data_t, st_data_t*/); /* st_compare_func* */
+    st_index_t (*hash)(ANYARGS /*st_data_t*/);        /* st_hash_func* */
+};
+
+#define ST_INDEX_BITS (sizeof(st_index_t) * CHAR_BIT)
+
+struct st_table {
+    const struct st_hash_type *type;
+    st_index_t num_bins;
+    unsigned int entries_packed : 1;
+#ifdef __GNUC__
+    __extension__
+#endif
+    st_index_t num_entries : ST_INDEX_BITS - 1;
+    struct st_table_entry **bins;
+    struct st_table_entry *head, *tail;
+};
+
+#define st_is_member(table,key) st_lookup(table,key,(st_data_t *)0)
+
+enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK};
+
+st_table *st_init_table(const struct st_hash_type *);
+st_table *st_init_table_with_size(const struct st_hash_type *, st_index_t);
+st_table *st_init_numtable(void);
+st_table *st_init_numtable_with_size(st_index_t);
+st_table *st_init_strtable(void);
+st_table *st_init_strtable_with_size(st_index_t);
+st_table *st_init_strcasetable(void);
+st_table *st_init_strcasetable_with_size(st_index_t);
+int st_delete(st_table *, st_data_t *, st_data_t *); /* returns 0:notfound 1:deleted */
+int st_delete_safe(st_table *, st_data_t *, st_data_t *, st_data_t);
+int st_insert(st_table *, st_data_t, st_data_t);
+int st_insert2(st_table *, st_data_t, st_data_t, st_data_t (*)(st_data_t));
+int st_lookup(st_table *, st_data_t, st_data_t *);
+int st_get_key(st_table *, st_data_t, st_data_t *);
+int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
+int st_reverse_foreach(st_table *, int (*)(ANYARGS), st_data_t);
+void st_add_direct(st_table *, st_data_t, st_data_t);
+void st_free_table(st_table *);
+void st_cleanup_safe(st_table *, st_data_t);
+void st_clear(st_table *);
+st_table *st_copy(st_table *);
+int st_numcmp(st_data_t, st_data_t);
+st_index_t st_numhash(st_data_t);
+int st_strcasecmp(const char *s1, const char *s2);
+int st_strncasecmp(const char *s1, const char *s2, size_t n);
+size_t st_memsize(const st_table *);
+st_index_t st_hash(const void *ptr, size_t len, st_index_t h);
+st_index_t st_hash_uint32(st_index_t h, uint32_t i);
+st_index_t st_hash_uint(st_index_t h, st_index_t i);
+st_index_t st_hash_end(st_index_t h);
+st_index_t st_hash_start(st_index_t h);
+#define st_hash_start(h) ((st_index_t)(h))
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_ST_H */
diff --git a/include/ruby/util.h b/include/ruby/util.h
new file mode 100644
index 0000000000..0c1e1c4ebc
--- /dev/null
+++ b/include/ruby/util.h
@@ -0,0 +1,90 @@
+/**********************************************************************
+
+  util.h -
+
+  $Author$
+  created at: Thu Mar  9 11:55:53 JST 1995
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBY_UTIL_H
+#define RUBY_UTIL_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#ifndef _
+#ifdef __cplusplus
+# ifndef  HAVE_PROTOTYPES
+#  define HAVE_PROTOTYPES 1
+# endif
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+#ifdef HAVE_STDARG_PROTOTYPES
+# define __(args) args
+#else
+# define __(args) ()
+#endif
+#endif
+
+#define scan_oct(s,l,e) (int)ruby_scan_oct(s,l,e)
+unsigned long ruby_scan_oct(const char *, size_t, size_t *);
+#define scan_hex(s,l,e) (int)ruby_scan_hex(s,l,e)
+unsigned long ruby_scan_hex(const char *, size_t, size_t *);
+
+#if defined(__CYGWIN32__) || defined(_WIN32)
+void ruby_add_suffix(VALUE str, const char *suffix);
+#endif
+
+void ruby_qsort(void *, const size_t, const size_t,
+		int (*)(const void *, const void *, void *), void *);
+
+void ruby_setenv(const char *, const char *);
+void ruby_unsetenv(const char *);
+#undef setenv
+#undef unsetenv
+#define setenv(name,val) ruby_setenv(name,val)
+#define unsetenv(name,val) ruby_unsetenv(name);
+
+char *ruby_strdup(const char *);
+#undef strdup
+#define strdup(s) ruby_strdup(s)
+
+char *ruby_getcwd(void);
+#define my_getcwd() ruby_getcwd()
+
+double ruby_strtod(const char *, char **);
+#undef strtod
+#define strtod(s,e) ruby_strtod(s,e)
+
+#if defined _MSC_VER && _MSC_VER >= 1300
+#pragma warning(push)
+#pragma warning(disable:4723)
+#endif
+#if defined _MSC_VER && _MSC_VER >= 1300
+#pragma warning(pop)
+#endif
+
+void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_UTIL_H */
diff --git a/include/ruby/version.h b/include/ruby/version.h
new file mode 100644
index 0000000000..32b09b3f52
--- /dev/null
+++ b/include/ruby/version.h
@@ -0,0 +1,61 @@
+/**********************************************************************
+
+  ruby/version.h -
+
+  $Author$
+  created at: Wed May 13 12:56:56 JST 2009
+
+  Copyright (C) 1993-2009 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+/*
+ * This file contains only
+ * - never-changable informations, and
+ * - interfaces accessible from extension libraries.
+ *
+ * Never try to check RUBY_VERSION_CODE etc in extension libraries,
+ * check the features with mkmf.rb instead.
+ */
+
+#ifndef RUBY_VERSION_H
+#define RUBY_VERSION_H 1
+
+/* The origin. */
+#define RUBY_AUTHOR "Yukihiro Matsumoto"
+#define RUBY_BIRTH_YEAR 1993
+#define RUBY_BIRTH_MONTH 2
+#define RUBY_BIRTH_DAY 24
+
+#ifdef RUBY_EXTERN
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+/*
+ * Interfaces from extension libraries.
+ *
+ * Before using these infos, think thrice whether they are really
+ * necessary or not, and if the answer was yes, think twice a week
+ * later again.
+ */
+RUBY_EXTERN const char ruby_version[];
+RUBY_EXTERN const char ruby_release_date[];
+RUBY_EXTERN const char ruby_platform[];
+RUBY_EXTERN const int  ruby_patchlevel;
+RUBY_EXTERN const char ruby_description[];
+RUBY_EXTERN const char ruby_copyright[];
+RUBY_EXTERN const char ruby_engine[];
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+#endif
+
+#endif
diff --git a/include/ruby/vm.h b/include/ruby/vm.h
new file mode 100644
index 0000000000..ac8e599e90
--- /dev/null
+++ b/include/ruby/vm.h
@@ -0,0 +1,42 @@
+/**********************************************************************
+
+  ruby/vm.h -
+
+  $Author$
+  created at: Sat May 31 15:17:36 2008
+
+  Copyright (C) 2008 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBY_VM_H
+#define RUBY_VM_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+/* Place holder.
+ *
+ * We will prepare VM creation/control APIs on 1.9.2 or later.
+ * If you have an interest about it, please see mvm branch.
+ * http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/
+ */
+
+/* VM type declaration */
+typedef struct rb_vm_struct ruby_vm_t;
+
+/* core API */
+int ruby_vm_destruct(ruby_vm_t *vm);
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_VM_H */
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
new file mode 100644
index 0000000000..79eb6a19df
--- /dev/null
+++ b/include/ruby/win32.h
@@ -0,0 +1,721 @@
+#ifndef RUBY_WIN32_H
+#define RUBY_WIN32_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+/*
+ *  Copyright (c) 1993, Intergraph Corporation
+ *
+ *  You may distribute under the terms of either the GNU General Public
+ *  License or the Artistic License, as specified in the perl README file.
+ *
+ */
+
+//
+// Definitions for NT port of Perl
+//
+
+
+//
+// Ok now we can include the normal include files.
+//
+
+// #include <stdarg.h> conflict with varargs.h?
+#if !defined(WSAAPI)
+#if defined(__cplusplus) && defined(_MSC_VER)
+extern "C++" {			/* template without extern "C++" */
+#endif
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#if defined(__cplusplus) && defined(_MSC_VER)
+}
+#endif
+#endif
+
+#define NT 1			/* deprecated */
+
+//
+// We're not using Microsoft's "extensions" to C for
+// Structured Exception Handling (SEH) so we can nuke these
+//
+#undef try
+#undef except
+#undef finally
+#undef leave
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <direct.h>
+#include <process.h>
+#include <time.h>
+#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
+extern "C++" {			/* template without extern "C++" */
+#endif
+#include <math.h>
+#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
+}
+#endif
+#include <signal.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_UTIME_H
+# include <sys/utime.h>
+#else
+# include <utime.h>
+#endif
+#include <io.h>
+#include <malloc.h>
+#if defined __MINGW32__ || __BORLANDC__ >= 0x0580
+# include <stdint.h>
+#else
+# if !defined(_INTPTR_T_DEFINED)
+#  ifdef _WIN64
+typedef __int64 intptr_t;
+#  else
+typedef int intptr_t;
+#  endif
+#  define _INTPTR_T_DEFINED
+# endif
+# if !defined(_UINTPTR_T_DEFINED)
+#  ifdef _WIN64
+typedef unsigned __int64 uintptr_t;
+#  else
+typedef unsigned int uintptr_t;
+#  endif
+#  define _UINTPTR_T_DEFINED
+# endif
+#endif
+#ifndef __MINGW32__
+# define mode_t int
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifdef WIN95
+extern DWORD rb_w32_osid(void);
+#define rb_w32_iswinnt()  (rb_w32_osid() == VER_PLATFORM_WIN32_NT)
+#define rb_w32_iswin95()  (rb_w32_osid() == VER_PLATFORM_WIN32_WINDOWS)
+#else
+#define rb_w32_iswinnt()  TRUE
+#define rb_w32_iswin95()  FALSE
+#endif
+
+#define WNOHANG -1
+
+#undef getc
+#undef putc
+#undef fgetc
+#undef fputc
+#undef getchar
+#undef putchar
+#undef fgetchar
+#undef fputchar
+#undef utime
+#undef lseek
+#undef fstat
+#define getc(_stream)		rb_w32_getc(_stream)
+#define getchar()		rb_w32_getc(stdin)
+#define putc(_c, _stream)	rb_w32_putc(_c, _stream)
+#define putchar(_c)		rb_w32_putc(_c, stdout)
+#ifdef RUBY_EXPORT
+#define fgetc(_stream)		getc(_stream)
+#define fputc(_c, _stream)	putc(_c, _stream)
+#define fgetchar()		getchar()
+#define fputchar(_c)		putchar(_c)
+#define utime(_p, _t)		rb_w32_utime(_p, _t)
+#define lseek(_f, _o, _w)	_lseeki64(_f, _o, _w)
+
+#define pipe(p)			rb_w32_pipe(p)
+#define open			rb_w32_open
+#define close(h)		rb_w32_close(h)
+#define fclose(f)		rb_w32_fclose(f)
+#define read(f, b, s)		rb_w32_read(f, b, s)
+#define write(f, b, s)		rb_w32_write(f, b, s)
+#define getpid()		rb_w32_getpid()
+#define getppid()		rb_w32_getppid()
+#define sleep(x)		rb_w32_Sleep((x)*1000)
+#define Sleep(msec)		(void)rb_w32_Sleep(msec)
+#ifdef __BORLANDC__
+#define creat(p, m)		_creat(p, m)
+#define eof()			_eof()
+#define filelength(h)		_filelength(h)
+#define mktemp(t)		_mktemp(t)
+#define tell(h)			_tell(h)
+#define _open			_sopen
+#define sopen			_sopen
+#define _fstati64(fd,st)	rb_w32_fstati64(fd,st)
+#undef fopen
+#define fopen(p, m)		rb_w32_fopen(p, m)
+#undef fdopen
+#define fdopen(h, m)		rb_w32_fdopen(h, m)
+#undef fsopen
+#define fsopen(p, m, sh)	rb_w32_fsopen(p, m, sh)
+#endif /* __BORLANDC__ */
+
+#undef execv
+#define execv(path,argv)	rb_w32_aspawn(P_OVERLAY,path,argv)
+#if !defined(__BORLANDC__)
+#undef isatty
+#define isatty(h)		rb_w32_isatty(h)
+#endif /* __BORLANDC__ */
+
+#undef mkdir
+#define mkdir(p, m)		rb_w32_mkdir(p, m)
+#undef rmdir
+#define rmdir(p)		rb_w32_rmdir(p)
+#undef unlink
+#define unlink(p)		rb_w32_unlink(p)
+#endif /* RUBY_EXPORT */
+
+#if SIZEOF_OFF_T == 8
+#define off_t __int64
+#define stat stati64
+#define fstat(fd,st)		_fstati64(fd,st)
+#if defined(__BORLANDC__)
+#define stati64(path, st) rb_w32_stati64(path, st)
+#elif !defined(_MSC_VER) || RT_VER < 80
+#define stati64 _stati64
+#define _stati64(path, st) rb_w32_stati64(path, st)
+#else
+#define stati64 _stat64
+#define _stat64(path, st) rb_w32_stati64(path, st)
+#define _fstati64 _fstat64
+#endif
+#else
+#define stat(path,st)		rb_w32_stat(path,st)
+#define fstat(fd,st)		rb_w32_fstat(fd,st)
+extern int rb_w32_stat(const char *, struct stat *);
+extern int rb_w32_fstat(int, struct stat *);
+#endif
+#define access(path,mode)	rb_w32_access(path,mode)
+
+#define strcasecmp		_stricmp
+#define strncasecmp		_strnicmp
+#define fsync			_commit
+
+struct timezone;
+
+#ifdef __MINGW32__
+#undef isascii
+#define isascii __isascii
+#endif
+
+struct iovec {
+    void *iov_base;
+    size_t iov_len;
+};
+struct msghdr {
+    void *msg_name;
+    int msg_namelen;
+    struct iovec *msg_iov;
+    int msg_iovlen;
+    void *msg_control;
+    int msg_controllen;
+    int msg_flags;
+};
+
+#define NtInitialize ruby_sysinit
+extern int    rb_w32_cmdvector(const char *, char ***);
+extern rb_pid_t  rb_w32_pipe_exec(const char *, const char *, int, int *, int *);
+extern int    flock(int fd, int oper);
+extern int    rb_w32_has_cancel_io(void);
+extern int    rb_w32_is_socket(int);
+extern int    WSAAPI rb_w32_accept(int, struct sockaddr *, int *);
+extern int    WSAAPI rb_w32_bind(int, const struct sockaddr *, int);
+extern int    WSAAPI rb_w32_connect(int, const struct sockaddr *, int);
+extern void   rb_w32_fdset(int, fd_set*);
+extern void   rb_w32_fdclr(int, fd_set*);
+extern int    rb_w32_fdisset(int, fd_set*);
+extern int    WSAAPI rb_w32_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+extern int    WSAAPI rb_w32_getpeername(int, struct sockaddr *, int *);
+extern int    WSAAPI rb_w32_getsockname(int, struct sockaddr *, int *);
+extern int    WSAAPI rb_w32_getsockopt(int, int, int, char *, int *);
+extern int    WSAAPI rb_w32_ioctlsocket(int, long, u_long *);
+extern int    WSAAPI rb_w32_listen(int, int);
+extern int    WSAAPI rb_w32_recv(int, char *, int, int);
+extern int    WSAAPI rb_w32_recvfrom(int, char *, int, int, struct sockaddr *, int *);
+extern int    WSAAPI rb_w32_send(int, const char *, int, int);
+extern int    WSAAPI rb_w32_sendto(int, const char *, int, int, const struct sockaddr *, int);
+extern int    recvmsg(int, struct msghdr *, int);
+extern int    sendmsg(int, const struct msghdr *, int);
+extern int    WSAAPI rb_w32_setsockopt(int, int, int, const char *, int);
+extern int    WSAAPI rb_w32_shutdown(int, int);
+extern int    WSAAPI rb_w32_socket(int, int, int);
+extern SOCKET rb_w32_get_osfhandle(int);
+extern struct hostent *WSAAPI rb_w32_gethostbyaddr(const char *, int, int);
+extern struct hostent *WSAAPI rb_w32_gethostbyname(const char *);
+extern int    WSAAPI rb_w32_gethostname(char *, int);
+extern struct protoent *WSAAPI rb_w32_getprotobyname(const char *);
+extern struct protoent *WSAAPI rb_w32_getprotobynumber(int);
+extern struct servent  *WSAAPI rb_w32_getservbyname(const char *, const char *);
+extern struct servent  *WSAAPI rb_w32_getservbyport(int, const char *);
+extern int    rb_w32_socketpair(int, int, int, int *);
+extern char * rb_w32_getcwd(char *, int);
+extern char * rb_w32_getenv(const char *);
+extern int    rb_w32_rename(const char *, const char *);
+extern int    rb_w32_urename(const char *, const char *);
+extern char **rb_w32_get_environ(void);
+extern void   rb_w32_free_environ(char **);
+extern int    rb_w32_map_errno(DWORD);
+
+extern int chown(const char *, int, int);
+extern int rb_w32_uchown(const char *, int, int);
+extern int link(const char *, const char *);
+extern int rb_w32_ulink(const char *, const char *);
+extern int gettimeofday(struct timeval *, struct timezone *);
+extern rb_pid_t waitpid (rb_pid_t, int *, int);
+extern rb_pid_t rb_w32_spawn(int, const char *, const char*);
+extern rb_pid_t rb_w32_aspawn(int, const char *, char *const *);
+extern int kill(int, int);
+extern int fcntl(int, int, ...);
+extern rb_pid_t rb_w32_getpid(void);
+extern rb_pid_t rb_w32_getppid(void);
+#if !defined(__BORLANDC__)
+extern int rb_w32_isatty(int);
+#endif
+extern int rb_w32_uchdir(const char *);
+extern int rb_w32_mkdir(const char *, int);
+extern int rb_w32_umkdir(const char *, int);
+extern int rb_w32_rmdir(const char *);
+extern int rb_w32_urmdir(const char *);
+extern int rb_w32_unlink(const char *);
+extern int rb_w32_uunlink(const char *);
+extern int rb_w32_uchmod(const char *, int);
+extern int rb_w32_stati64(const char *, struct stati64 *);
+extern int rb_w32_ustati64(const char *, struct stati64 *);
+extern int rb_w32_access(const char *, int);
+extern int rb_w32_uaccess(const char *, int);
+
+#ifdef __BORLANDC__
+extern int rb_w32_fstati64(int, struct stati64 *);
+extern off_t _lseeki64(int, off_t, int);
+extern FILE *rb_w32_fopen(const char *, const char *);
+extern FILE *rb_w32_fdopen(int, const char *);
+extern FILE *rb_w32_fsopen(const char *, const char *, int);
+#endif
+
+#include <float.h>
+#if !defined __MINGW32__ || defined __NO_ISOCEXT
+#ifndef isnan
+#define isnan(x) _isnan(x)
+#endif
+static inline int
+finite(double x)
+{
+    return _finite(x);
+}
+#ifndef copysign
+#define copysign(a, b) _copysign(a, b)
+#endif
+static inline double
+scalb(double a, long b)
+{
+    return _scalb(a, b);
+}
+#endif
+
+#if !defined S_IFIFO && defined _S_IFIFO
+#define S_IFIFO _S_IFIFO
+#endif
+
+#if 0 && defined __BORLANDC__
+#undef S_ISDIR
+#undef S_ISFIFO
+#undef S_ISBLK
+#undef S_ISCHR
+#undef S_ISREG
+#define S_ISDIR(m)  (((unsigned short)(m) & S_IFMT) == S_IFDIR)
+#define S_ISFIFO(m) (((unsigned short)(m) & S_IFMT) == S_IFIFO)
+#define S_ISBLK(m)  (((unsigned short)(m) & S_IFMT) == S_IFBLK)
+#define S_ISCHR(m)  (((unsigned short)(m) & S_IFMT) == S_IFCHR)
+#define S_ISREG(m)  (((unsigned short)(m) & S_IFMT) == S_IFREG)
+#endif
+
+#if !defined S_IRUSR && !defined __MINGW32__
+#define S_IRUSR 0400
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0040
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0004
+#endif
+
+#if !defined S_IWUSR && !defined __MINGW32__
+#define S_IWUSR 0200
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 0020
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 0002
+#endif
+
+#if !defined S_IXUSR && !defined __MINGW32__
+#define S_IXUSR 0100
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0010
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0001
+#endif
+
+//
+// define this so we can do inplace editing
+//
+
+#define SUFFIX
+
+extern int 	 rb_w32_ftruncate(int fd, off_t length);
+extern int 	 rb_w32_truncate(const char *path, off_t length);
+extern off_t	 rb_w32_ftello(FILE *stream);
+extern int 	 rb_w32_fseeko(FILE *stream, off_t offset, int whence);
+
+#undef HAVE_FTRUNCATE
+#define HAVE_FTRUNCATE 1
+#if defined HAVE_FTRUNCATE64
+#define ftruncate ftruncate64
+#else
+#define ftruncate rb_w32_ftruncate
+#endif
+
+#undef HAVE_TRUNCATE
+#define HAVE_TRUNCATE 1
+#if defined HAVE_TRUNCATE64
+#define truncate truncate64
+#else
+#define truncate rb_w32_truncate
+#endif
+
+#undef HAVE_FSEEKO
+#define HAVE_FSEEKO 1
+#if defined HAVE_FSEEKO64
+#define fseeko fseeko64
+#else
+#define fseeko rb_w32_fseeko
+#endif
+
+#undef HAVE_FTELLO
+#define HAVE_FTELLO 1
+#if defined HAVE_FTELLO64
+#define ftello ftello64
+#else
+#define ftello rb_w32_ftello
+#endif
+
+//
+// stubs
+//
+extern int       ioctl (int, int, ...);
+extern rb_uid_t  getuid (void);
+extern rb_uid_t  geteuid (void);
+extern rb_gid_t  getgid (void);
+extern rb_gid_t  getegid (void);
+extern int       setuid (rb_uid_t);
+extern int       setgid (rb_gid_t);
+
+extern char *rb_w32_strerror(int);
+
+#ifdef RUBY_EXPORT
+#define strerror(e) rb_w32_strerror(e)
+#endif
+
+#define PIPE_BUF 1024
+
+#define LOCK_SH 1
+#define LOCK_EX 2
+#define LOCK_NB 4
+#define LOCK_UN 8
+
+
+#ifndef SIGINT
+#define SIGINT 2
+#endif
+#ifndef SIGKILL
+#define SIGKILL	9
+#endif
+
+
+/* #undef va_start */
+/* #undef va_end */
+
+/* winsock error map */
+#include <errno.h>
+
+#ifndef EWOULDBLOCK
+# define EWOULDBLOCK		WSAEWOULDBLOCK
+#endif
+#ifndef EINPROGRESS
+# define EINPROGRESS		WSAEINPROGRESS
+#endif
+#ifndef EALREADY
+# define EALREADY		WSAEALREADY
+#endif
+#ifndef ENOTSOCK
+# define ENOTSOCK		WSAENOTSOCK
+#endif
+#ifndef EDESTADDRREQ
+# define EDESTADDRREQ		WSAEDESTADDRREQ
+#endif
+#ifndef EMSGSIZE
+# define EMSGSIZE		WSAEMSGSIZE
+#endif
+#ifndef EPROTOTYPE
+# define EPROTOTYPE		WSAEPROTOTYPE
+#endif
+#ifndef ENOPROTOOPT
+# define ENOPROTOOPT		WSAENOPROTOOPT
+#endif
+#ifndef EPROTONOSUPPORT
+# define EPROTONOSUPPORT	WSAEPROTONOSUPPORT
+#endif
+#ifndef ESOCKTNOSUPPORT
+# define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
+#endif
+#ifndef EOPNOTSUPP
+# define EOPNOTSUPP		WSAEOPNOTSUPP
+#endif
+#ifndef EPFNOSUPPORT
+# define EPFNOSUPPORT		WSAEPFNOSUPPORT
+#endif
+#ifndef EAFNOSUPPORT
+# define EAFNOSUPPORT		WSAEAFNOSUPPORT
+#endif
+#ifndef EADDRINUSE
+# define EADDRINUSE		WSAEADDRINUSE
+#endif
+#ifndef EADDRNOTAVAIL
+# define EADDRNOTAVAIL		WSAEADDRNOTAVAIL
+#endif
+#ifndef ENETDOWN
+# define ENETDOWN		WSAENETDOWN
+#endif
+#ifndef ENETUNREACH
+# define ENETUNREACH		WSAENETUNREACH
+#endif
+#ifndef ENETRESET
+# define ENETRESET		WSAENETRESET
+#endif
+#ifndef ECONNABORTED
+# define ECONNABORTED		WSAECONNABORTED
+#endif
+#ifndef ECONNRESET
+# define ECONNRESET		WSAECONNRESET
+#endif
+#ifndef ENOBUFS
+# define ENOBUFS		WSAENOBUFS
+#endif
+#ifndef EISCONN
+# define EISCONN		WSAEISCONN
+#endif
+#ifndef ENOTCONN
+# define ENOTCONN		WSAENOTCONN
+#endif
+#ifndef ESHUTDOWN
+# define ESHUTDOWN		WSAESHUTDOWN
+#endif
+#ifndef ETOOMANYREFS
+# define ETOOMANYREFS		WSAETOOMANYREFS
+#endif
+#ifndef ETIMEDOUT
+# define ETIMEDOUT		WSAETIMEDOUT
+#endif
+#ifndef ECONNREFUSED
+# define ECONNREFUSED		WSAECONNREFUSED
+#endif
+#ifndef ELOOP
+# define ELOOP			WSAELOOP
+#endif
+/*#define ENAMETOOLONG	WSAENAMETOOLONG*/
+#ifndef EHOSTDOWN
+# define EHOSTDOWN		WSAEHOSTDOWN
+#endif
+#ifndef EHOSTUNREACH
+# define EHOSTUNREACH		WSAEHOSTUNREACH
+#endif
+/*#define ENOTEMPTY	WSAENOTEMPTY*/
+#ifndef EPROCLIM
+# define EPROCLIM		WSAEPROCLIM
+#endif
+#ifndef EUSERS
+# define EUSERS			WSAEUSERS
+#endif
+#ifndef EDQUOT
+# define EDQUOT			WSAEDQUOT
+#endif
+#ifndef ESTALE
+# define ESTALE			WSAESTALE
+#endif
+#ifndef EREMOTE
+# define EREMOTE		WSAEREMOTE
+#endif
+
+#define F_SETFL 1
+#define O_NONBLOCK 1
+
+#undef FD_SET
+#define FD_SET(f, s)		rb_w32_fdset(f, s)
+
+#undef FD_CLR
+#define FD_CLR(f, s)		rb_w32_fdclr(f, s)
+
+#undef FD_ISSET
+#define FD_ISSET(f, s)		rb_w32_fdisset(f, s)
+
+#ifdef RUBY_EXPORT
+#undef accept
+#define accept(s, a, l)		rb_w32_accept(s, a, l)
+
+#undef bind
+#define bind(s, a, l)		rb_w32_bind(s, a, l)
+
+#undef connect
+#define connect(s, a, l)	rb_w32_connect(s, a, l)
+
+#undef select
+#define select(n, r, w, e, t)	rb_w32_select(n, r, w, e, t)
+
+#undef getpeername
+#define getpeername(s, a, l)	rb_w32_getpeername(s, a, l)
+
+#undef getsockname
+#define getsockname(s, a, l)	rb_w32_getsockname(s, a, l)
+
+#undef getsockopt
+#define getsockopt(s, v, n, o, l) rb_w32_getsockopt(s, v, n, o, l)
+
+#undef ioctlsocket
+#define ioctlsocket(s, c, a)	rb_w32_ioctlsocket(s, c, a)
+
+#undef listen
+#define listen(s, b)		rb_w32_listen(s, b)
+
+#undef recv
+#define recv(s, b, l, f)	rb_w32_recv(s, b, l, f)
+
+#undef recvfrom
+#define recvfrom(s, b, l, f, fr, frl) rb_w32_recvfrom(s, b, l, f, fr, frl)
+
+#undef send
+#define send(s, b, l, f)	rb_w32_send(s, b, l, f)
+
+#undef sendto
+#define sendto(s, b, l, f, t, tl) rb_w32_sendto(s, b, l, f, t, tl)
+
+#undef setsockopt
+#define setsockopt(s, v, n, o, l) rb_w32_setsockopt(s, v, n, o, l)
+
+#undef shutdown
+#define shutdown(s, h)		rb_w32_shutdown(s, h)
+
+#undef socket
+#define socket(s, t, p)		rb_w32_socket(s, t, p)
+
+#undef gethostbyaddr
+#define gethostbyaddr(a, l, t)	rb_w32_gethostbyaddr(a, l, t)
+
+#undef gethostbyname
+#define gethostbyname(n)	rb_w32_gethostbyname(n)
+
+#undef gethostname
+#define gethostname(n, l)	rb_w32_gethostname(n, l)
+
+#undef getprotobyname
+#define getprotobyname(n)	rb_w32_getprotobyname(n)
+
+#undef getprotobynumber
+#define getprotobynumber(n)	rb_w32_getprotobynumber(n)
+
+#undef getservbyname
+#define getservbyname(n, p)	rb_w32_getservbyname(n, p)
+
+#undef getservbyport
+#define getservbyport(p, pr)	rb_w32_getservbyport(p, pr)
+
+#undef socketpair
+#define socketpair(a, t, p, s)	rb_w32_socketpair(a, t, p, s)
+
+#undef get_osfhandle
+#define get_osfhandle(h)	rb_w32_get_osfhandle(h)
+
+#undef getcwd
+#define getcwd(b, s)		rb_w32_getcwd(b, s)
+
+#undef getenv
+#define getenv(n)		rb_w32_getenv(n)
+
+#undef rename
+#define rename(o, n)		rb_w32_rename(o, n)
+
+#undef times
+#define times(t)		rb_w32_times(t)
+#endif
+
+struct tms {
+	long	tms_utime;
+	long	tms_stime;
+	long	tms_cutime;
+	long	tms_cstime;
+};
+
+int rb_w32_times(struct tms *);
+
+/* thread stuff */
+HANDLE GetCurrentThreadHandle(void);
+int  rb_w32_sleep(unsigned long msec);
+int  rb_w32_putc(int, FILE*);
+int  rb_w32_getc(FILE*);
+int  rb_w32_open(const char *, int, ...);
+int  rb_w32_uopen(const char *, int, ...);
+int  rb_w32_wopen(const WCHAR *, int, ...);
+int  rb_w32_close(int);
+int  rb_w32_fclose(FILE*);
+int  rb_w32_pipe(int[2]);
+size_t rb_w32_read(int, void *, size_t);
+size_t rb_w32_write(int, const void *, size_t);
+int  rb_w32_utime(const char *, const struct utimbuf *);
+int  rb_w32_uutime(const char *, const struct utimbuf *);
+long rb_w32_write_console(unsigned long, int);
+int  WINAPI rb_w32_Sleep(unsigned long msec);
+int  rb_w32_wait_events_blocking(HANDLE *events, int num, DWORD timeout);
+
+/*
+== ***CAUTION***
+Since this function is very dangerous, ((*NEVER*))
+* lock any HANDLEs(i.e. Mutex, Semaphore, CriticalSection and so on) or,
+* use anything like TRAP_BEG...TRAP_END block structure,
+in asynchronous_func_t.
+*/
+typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv);
+uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval);
+
+#ifdef __MINGW_ATTRIB_PURE
+/* get rid of bugs in math.h of mingw */
+#define frexp(_X, _Y) __extension__ ({\
+    int *intptr_frexp_bug = (_Y);\
+    *intptr_frexp_bug = *intptr_frexp_bug;\
+    frexp((_X), intptr_frexp_bug);\
+})
+#define modf(_X, _Y) __extension__ ({\
+    double *intptr_modf_bug = (_Y);\
+    *intptr_modf_bug = *intptr_modf_bug;\
+    modf((_X), intptr_modf_bug);\
+})
+#endif
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* RUBY_WIN32_H */
diff --git a/inits.c b/inits.c
index 052573a443..6fb7463c57 100644
--- a/inits.c
+++ b/inits.c
@@ -3,82 +3,61 @@
   inits.c -
 
   $Author$
-  $Date$
   created at: Tue Dec 28 16:01:58 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 
-void Init_Array _((void));
-void Init_Bignum _((void));
-void Init_Binding _((void));
-void Init_Comparable _((void));
-void Init_Dir _((void));
-void Init_Enumerable _((void));
-void Init_Exception _((void));
-void Init_syserr _((void));
-void Init_eval _((void));
-void Init_load _((void));
-void Init_Proc _((void));
-void Init_Thread _((void));
-void Init_File _((void));
-void Init_GC _((void));
-void Init_Hash _((void));
-void Init_IO _((void));
-void Init_Math _((void));
-void Init_marshal _((void));
-void Init_Numeric _((void));
-void Init_Object _((void));
-void Init_pack _((void));
-void Init_Precision _((void));
-void Init_sym _((void));
-void Init_process _((void));
-void Init_Random _((void));
-void Init_Range _((void));
-void Init_Regexp _((void));
-void Init_signal _((void));
-void Init_String _((void));
-void Init_Struct _((void));
-void Init_Time _((void));
-void Init_var_tables _((void));
-void Init_version _((void));
+#define CALL(n) {void Init_##n(void); Init_##n();}
 
 void
-rb_call_inits()
+rb_call_inits(void)
 {
-    Init_sym();
-    Init_var_tables();
-    Init_Object();
-    Init_Comparable();
-    Init_Enumerable();
-    Init_Precision();
-    Init_eval();
-    Init_String();
-    Init_Exception();
-    Init_Thread();
-    Init_Numeric();
-    Init_Bignum();
-    Init_syserr();
-    Init_Array();
-    Init_Hash();
-    Init_Struct();
-    Init_Regexp();
-    Init_pack();
-    Init_Range();
-    Init_IO();
-    Init_Dir();
-    Init_Time();
-    Init_Random();
-    Init_signal();
-    Init_process();
-    Init_load();
-    Init_Proc();
-    Init_Binding();
-    Init_Math();
-    Init_GC();
-    Init_marshal();
-    Init_version();
+    CALL(RandomSeed);
+    CALL(sym);
+    CALL(var_tables);
+    CALL(Object);
+    CALL(top_self);
+    CALL(Encoding);
+    CALL(Comparable);
+    CALL(Enumerable);
+    CALL(String);
+    CALL(Exception);
+    CALL(eval);
+    CALL(safe);
+    CALL(jump);
+    CALL(Numeric);
+    CALL(Bignum);
+    CALL(syserr);
+    CALL(Array);
+    CALL(Hash);
+    CALL(Struct);
+    CALL(Regexp);
+    CALL(pack);
+    CALL(transcode);
+    CALL(marshal);
+    CALL(Range);
+    CALL(IO);
+    CALL(Dir);
+    CALL(Time);
+    CALL(Random);
+    CALL(signal);
+    CALL(process);
+    CALL(load);
+    CALL(Proc);
+    CALL(Binding);
+    CALL(Math);
+    CALL(GC);
+    CALL(Enumerator);
+    CALL(VM);
+    CALL(ISeq);
+    CALL(Thread);
+    CALL(Cont);
+    CALL(Rational);
+    CALL(Complex);
+    CALL(version);
 }
+#undef CALL
diff --git a/insns.def b/insns.def
new file mode 100644
index 0000000000..d1158e6056
--- /dev/null
+++ b/insns.def
@@ -0,0 +1,2161 @@
+/** ##skip -*- mode:c; style:ruby -*-
+  insns.def - YARV instruction definitions
+
+  $Author: $
+  created at: 04/01/01 01:17:55 JST
+
+  Copyright (C) 2004-2007 Koichi Sasada
+*/
+
+/** ##skip
+  instruction comment
+  @c: category
+  @e: english description
+  @j: japanese description
+
+  instruction form:
+    DEFINE_INSN
+    instrunction_name
+    (instruction_operands, ..)
+    (pop_values, ..)
+    (return value)
+    {
+       .. // insn body
+    }
+
+ */
+
+
+/**
+  @c nop
+  @e nop
+  @j nop
+ */
+DEFINE_INSN
+nop
+()
+()
+()
+{
+    /* none */
+}
+
+/**********************************************************/
+/* deal with variables                                    */
+/**********************************************************/
+
+/**
+  @c variable
+  @e get local variable value (which is pointed by idx).
+  @j idx �Ŏw�肳�ꂽ���[�J���ϐ����X�^�b�N�ɒu���B
+ */
+DEFINE_INSN
+getlocal
+(lindex_t idx)
+()
+(VALUE val)
+{
+    val = *(GET_LFP() - idx);
+}
+
+/**
+  @c variable
+  @e set local variable value (which is pointed by idx) as val.
+  @j idx �Ŏw�肳�ꂽ���[�J���ϐ��� val �ɐݒ肷��B
+ */
+DEFINE_INSN
+setlocal
+(lindex_t idx)
+(VALUE val)
+()
+{
+    (*(GET_LFP() - idx)) = val;
+}
+
+/**
+  @c variable
+  @e get special local variable ($~, $_, ..) value.
+  @j ����ȃ��[�J���ϐ��i$~, $_, ...�j�̒l�𓾂�B
+ */
+DEFINE_INSN
+getspecial
+(VALUE key, rb_num_t type)
+()
+(VALUE val)
+{
+    val = vm_getspecial(th, GET_LFP(), key, type);
+}
+
+/**
+  @c variable
+  @e set special local variable ($~, $_, ...) value as obj.
+  @j ���ʂȃ��[�J���ϐ��i$~, $_, ...�j�̒l��ݒ肷��B
+ */
+DEFINE_INSN
+setspecial
+(VALUE key)
+(VALUE obj)
+()
+{
+    lfp_svar_set(th, GET_LFP(), key, obj);
+}
+
+/**
+  @c variable
+  @e get block local variable(which is pointed by idx and level).
+     level means nest level of block, and specify how above this variable.
+  @j level, idx �Ŏw�肳�ꂽ�u���b�N���[�J���ϐ��̒l���X�^�b�N�ɒu���B
+     level �̓u���b�N�̃l�X�g���x���ŁA���i�ォ�������B
+ */
+DEFINE_INSN
+getdynamic
+(dindex_t idx, rb_num_t level)
+()
+(VALUE val)
+{
+    rb_num_t i;
+    VALUE *dfp2 = GET_DFP();
+    for (i = 0; i < level; i++) {
+	dfp2 = GET_PREV_DFP(dfp2);
+    }
+    val = *(dfp2 - idx);
+}
+
+/**
+  @c variable
+  @e set block local variable(which is pointed by 'idx') as val.
+     level means nest level of block, and specify how above this variable.
+  @j level, idx �Ŏw�肳�ꂽ�u���b�N���[�J���ϐ��̒l�� val �ɂ���B
+     level �̓u���b�N�̃l�X�g���x���ŁA���i�ォ�������B
+ */
+DEFINE_INSN
+setdynamic
+(dindex_t idx, rb_num_t level)
+(VALUE val)
+()
+{
+    rb_num_t i;
+    VALUE *dfp2 = GET_DFP();
+    for (i = 0; i < level; i++) {
+	dfp2 = GET_PREV_DFP(dfp2);
+    }
+    *(dfp2 - idx) = val;
+}
+
+/**
+  @c variable
+  @e get instance variable id of obj.
+     if is_local is not 0, search as class local variable.
+  @j self �̃C���X�^���X�ϐ� id �̒l�𓾂�B
+ */
+DEFINE_INSN
+getinstancevariable
+(ID id, IC ic)
+()
+(VALUE val)
+{
+    val = vm_getivar(GET_SELF(), id, ic);
+}
+
+/**
+  @c variable
+  @e set instance variable id of obj as val.
+     if is_local is not 0, search as class local variable.
+  @j self �̃C���X�^���X�ϐ� id �� val �ɂ���B
+ */
+DEFINE_INSN
+setinstancevariable
+(ID id, IC ic)
+(VALUE val)
+()
+{
+    vm_setivar(GET_SELF(), id, val, ic);
+}
+
+/**
+  @c variable
+  @e get class variable id of klass as val.
+  @j ���݂̃X�R�[�v�̃N���X�ϐ� id �̒l�𓾂�B
+ */
+DEFINE_INSN
+getclassvariable
+(ID id)
+()
+(VALUE val)
+{
+    NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
+    val = rb_cvar_get(vm_get_cvar_base(cref), id);
+}
+
+/**
+  @c variable
+  @e set class variable id of klass as val.
+  @j klass �̃N���X�ϐ� id �� val �ɂ���B
+ */
+DEFINE_INSN
+setclassvariable
+(ID id)
+(VALUE val)
+()
+{
+    NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
+    rb_cvar_set(vm_get_cvar_base(cref), id, val);
+}
+
+/**
+  @c variable
+  @e
+   get constant variable id. if klass is Qnil, constant
+   are searched in current scope. if klass is Qfalse, constant as
+   top level constant. otherwise, get constant under klass
+   class or module.
+  @j �萔 id �̒l�𓾂�B
+   klass �� Qnil �Ȃ�A���̃X�R�[�v�œ�����萔�̒l�𓾂�B
+   Qfalse �Ȃ�A�g�b�v���x���X�R�[�v�𓾂�B
+   ����ȊO�Ȃ�Aklass �N���X�̉��̒萔�𓾂�B
+ */
+DEFINE_INSN
+getconstant
+(ID id)
+(VALUE klass)
+(VALUE val)
+{
+    val = vm_get_ev_const(th, GET_ISEQ(), klass, id, 0);
+}
+
+/**
+  @c variable
+  @e
+   set constant variable id. if klass is Qfalse, constant
+   is able to access in this scope. if klass is Qnil, set
+   top level constant. otherwise, set constant under klass
+   class or module.
+
+  @j �萔 id �̒l�� val �ɂ���B
+   klass �� Qfalse �Ȃ�A���̃X�R�[�v�œ�����萔 id �̒l��ݒ肷��B
+   Qnil �Ȃ�A�g�b�v���x���X�R�[�v�̒l��ݒ肷��B
+   ����ȊO�Ȃ�Aklass �N���X�̉��̒萔��ݒ肷��B
+ */
+DEFINE_INSN
+setconstant
+(ID id)
+(VALUE val, VALUE cbase)
+()
+{
+    vm_check_if_namespace(cbase);
+    rb_const_set(cbase, id, val);
+    INC_VM_STATE_VERSION();
+}
+
+/**
+  @c variable
+  @e get global variable id.
+  @j �O���[�o���ϐ� id �̒l�𓾂�B
+ */
+DEFINE_INSN
+getglobal
+(GENTRY entry)
+()
+(VALUE val)
+{
+    val = GET_GLOBAL(entry);
+}
+
+/**
+  @c variable
+  @e set global variable id as val.
+  @j �O���[�o���ϐ� id �̒l��ݒ肷��B
+ */
+DEFINE_INSN
+setglobal
+(GENTRY entry)
+(VALUE val)
+()
+{
+    SET_GLOBAL(entry, val);
+}
+
+
+/**********************************************************/
+/* deal with values                                       */
+/**********************************************************/
+
+/**
+  @c put
+  @e put nil to stack.
+  @j �X�^�b�N�� nil ���v�b�V������B
+ */
+DEFINE_INSN
+putnil
+()
+()
+(VALUE val)
+{
+    val = Qnil;
+}
+
+/**
+  @c put
+  @e put self.
+  @j �X�^�b�N�� self ���v�b�V������B
+ */
+DEFINE_INSN
+putself
+()
+()
+(VALUE val)
+{
+    val = GET_SELF();
+}
+
+/**
+  @c put
+  @e put some object.
+     i.e. Fixnum, true, false, nil, and so on.
+  @j �I�u�W�F�N�g val ���X�^�b�N�Ƀv�b�V������B
+     i.e. Fixnum, true, false, nil, and so on.
+ */
+DEFINE_INSN
+putobject
+(VALUE val)
+()
+(VALUE val)
+{
+    /* */
+}
+
+/**
+  @c put
+  @e put special object.  "value_type" is for expansion.
+  @j ���ʂȃI�u�W�F�N�g val ���X�^�b�N�Ƀv�b�V������B
+     �I�u�W�F�N�g�̎�ނ� value_type �ɂ��D
+ */
+DEFINE_INSN
+putspecialobject
+(rb_num_t value_type)
+()
+(VALUE val)
+{
+    switch (value_type) {
+      case VM_SPECIAL_OBJECT_VMCORE:
+	val = rb_mRubyVMFrozenCore;
+	break;
+      case VM_SPECIAL_OBJECT_CBASE:
+	val = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
+	break;
+      case VM_SPECIAL_OBJECT_CONST_BASE:
+	val = vm_get_const_base(GET_ISEQ(), GET_LFP(), GET_DFP());
+	break;
+      default:
+	rb_bug("putspecialobject insn: unknown value_type");
+    }
+}
+
+/**
+  @c put
+  @e put iseq value.
+  @j put iseq value.
+ */
+DEFINE_INSN
+putiseq
+(ISEQ iseq)
+()
+(VALUE ret)
+{
+    ret = iseq->self;
+}
+
+/**
+  @c put
+  @e put string val. string will be copied.
+  @j ��������R�s�[���ăX�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+putstring
+(VALUE str)
+()
+(VALUE val)
+{
+    val = rb_str_resurrect(str);
+}
+
+/**
+  @c put
+  @e put concatenate strings
+  @j �X�^�b�N�g�b�v�̕������ n �A�����C���ʂ��X�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+concatstrings
+(rb_num_t num)
+(...)
+(VALUE val) // inc += 1 - num;
+{
+    rb_num_t i = num;
+
+    val = rb_str_new(0, 0);
+    while (i-- > 0) {
+	const VALUE v = TOPN(i);
+	rb_str_append(val, v);
+    }
+    POPN(num);
+}
+
+/**
+  @c put
+  @e to_str
+  @j to_str �̌��ʂ��X�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+tostring
+()
+(VALUE val)
+(VALUE val)
+{
+    val = rb_obj_as_string(val);
+}
+
+/**
+  @c put
+  @e to Regexp
+  @j ������ str �𐳋K�\���ɃR���p�C�����ăX�^�b�N�Ƀv�b�V������B
+     �R���p�C�����Copt �𐳋K�\���̃I�v�V�����Ƃ���B
+ */
+DEFINE_INSN
+toregexp
+(rb_num_t opt, rb_num_t cnt)
+(...)
+(VALUE val) // inc += 1 - cnt;
+{
+    VALUE rb_reg_new_ary(VALUE ary, int options);
+    rb_num_t i;
+    const VALUE ary = rb_ary_tmp_new(cnt);
+    for (i = 0; i < cnt; i++) {
+        rb_ary_store(ary, cnt-i-1, TOPN(i));
+    }
+    POPN(cnt);
+    val = rb_reg_new_ary(ary, (int)opt);
+    rb_ary_clear(ary);
+}
+
+/**
+  @c put
+  @e put new array.
+  @j �V�����z����X�^�b�N��� num �̒l�ŏ��������Đ������v�b�V������B
+ */
+DEFINE_INSN
+newarray
+(rb_num_t num)
+(...)
+(VALUE val) // inc += 1 - num;
+{
+    val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
+    POPN(num);
+}
+
+/**
+  @c put
+  @e dup array
+  @j �z�� ary �� dup ���ăX�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+duparray
+(VALUE ary)
+()
+(VALUE val)
+{
+    val = rb_ary_resurrect(ary);
+}
+
+/**
+  @c put
+  @e expand array to num objects.
+  @j �X�^�b�N�g�b�v�̃I�u�W�F�N�g���z��ł���΁A�����W�J����B
+     �z��I�u�W�F�N�g�̗v�f���� num�ȉ��Ȃ�΁A����� nil ��ςށBnum�ȏ�Ȃ�A
+     num�ȏ�̗v�f�͐؂�̂Ă�B
+     �z��I�u�W�F�N�g�łȂ���΁Anum - 1 �� nil ��ςށB
+     ���� flag ���^�Ȃ�A�c��v�f�̔z���ς�
+     flag: 0x01 - �Ō��z���
+     flag: 0x02 - postarg �p
+     flag: 0x04 - reverse?
+ */
+DEFINE_INSN
+expandarray
+(rb_num_t num, rb_num_t flag)
+(..., VALUE ary)
+(...) // inc += num - 1 + (flag & 1 ? 1 : 0);
+{
+    vm_expandarray(GET_CFP(), ary, num, (int)flag);
+}
+
+/**
+  @c put
+  @e concat two arrays
+  @j ��̔z�� ary1, ary2 ��A�����X�^�b�N�փv�b�V������B
+ */
+DEFINE_INSN
+concatarray
+()
+(VALUE ary1, VALUE ary2st)
+(VALUE ary)
+{
+    const VALUE ary2 = ary2st;
+    VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_a");
+    VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_a");
+
+    if (NIL_P(tmp1)) {
+	tmp1 = rb_ary_new3(1, ary1);
+    }
+
+    if (NIL_P(tmp2)) {
+	tmp2 = rb_ary_new3(1, ary2);
+    }
+
+    if (tmp1 == ary1) {
+	tmp1 = rb_ary_dup(ary1);
+    }
+    ary = rb_ary_concat(tmp1, tmp2);
+}
+
+/**
+  @c put
+  @e splat array
+  @j �z�� ary �ɑ΂��� to_a ���Ăяo���B
+ */
+DEFINE_INSN
+splatarray
+(VALUE flag)
+(VALUE ary)
+(VALUE obj)
+{
+    VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_a");
+    if (NIL_P(tmp)) {
+	tmp = rb_ary_new3(1, ary);
+    }
+    obj = tmp;
+}
+
+/**
+  @c put
+  @e check value is included in ary
+  @j �z�� ary �ɗv�f obj �������Ă��邩�ǂ����`�F�b�N�Bcase/when �ŗ��p����B
+ */
+DEFINE_INSN
+checkincludearray
+(VALUE flag)
+(VALUE obj, VALUE ary)
+(VALUE obj, VALUE result)
+{
+    int i;
+    result = Qfalse;
+
+    if (TYPE(ary) != T_ARRAY) {
+	ary = rb_Array(ary);
+    }
+
+    if (flag == Qtrue) {
+	/* NODE_CASE */
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    /* TODO: fix me (use another method dispatch) */
+	    if (RTEST(rb_funcall2(RARRAY_PTR(ary)[i], idEqq, 1, &obj))) {
+		result = Qtrue;
+		break;
+	    }
+	}
+    }
+    else {
+	obj = Qfalse;
+	/* NODE_WHEN */
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    if (RTEST(RARRAY_PTR(ary)[i])) {
+		obj = result = Qtrue;
+		break;
+	    }
+	}
+    }
+}
+
+/**
+  @c put
+  @e put new Hash.
+  @j �V�����n�b�V�����X�^�b�N�g�b�v�� n �������l�Ƃ��Đ�������B
+     n �̓L�[�ƒl�̃y�A�Ȃ̂� 2 �̔{���łȂ���΂Ȃ�Ȃ��B
+ */
+DEFINE_INSN
+newhash
+(rb_num_t num)
+(...)
+(VALUE val) // inc += 1 - num;
+{
+    rb_num_t i;
+    val = rb_hash_new();
+
+    for (i = num; i > 0; i -= 2) {
+	const VALUE v = TOPN(i - 2);
+	const VALUE k = TOPN(i - 1);
+	rb_hash_aset(val, k, v);
+    }
+    POPN(num);
+}
+
+/**
+  @c put
+  @e put new Range object.(Range.new(low, high, flag))
+  @j Range.new(low, high, flag) �̂悤�ȃI�u�W�F�N�g�𐶐����X�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+newrange
+(rb_num_t flag)
+(VALUE low, VALUE high)
+(VALUE val)
+{
+    val = rb_range_new(low, high, (int)flag);
+}
+
+/**********************************************************/
+/* deal with stack operation                              */
+/**********************************************************/
+
+/**
+  @c stack
+  @e pop from stack.
+  @j �X�^�b�N�����|�b�v����B
+ */
+DEFINE_INSN
+pop
+()
+(VALUE val)
+()
+{
+    val = val;
+    /* none */
+}
+
+/**
+  @c stack
+  @e duplicate stack top.
+  @j �X�^�b�N�g�b�v���R�s�[���ăX�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+dup
+()
+(VALUE val)
+(VALUE val1, VALUE val2)
+{
+    val1 = val2 = val;
+}
+
+/**
+  @c stack
+  @e duplicate stack top n elements
+  @j �X�^�b�N�g�b�v�� n ���R�s�[���ăX�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+dupn
+(rb_num_t n)
+(...)
+(...) // inc += n;
+{
+    rb_num_t i;
+    VALUE *sp = STACK_ADDR_FROM_TOP(n);
+    for (i = 0; i < n; i++) {
+	GET_SP()[i] = sp[i];
+    }
+    INC_SP(n);
+}
+
+
+/**
+  @c stack
+  @e swap top 2 vals
+  @j �X�^�b�N�g�b�v�� 2 �̒l����������B
+ */
+DEFINE_INSN
+swap
+()
+(VALUE val, VALUE obj)
+(VALUE obj, VALUE val)
+{
+    /* none */
+}
+
+/**
+  @c stack
+  @e for stack caching.
+  @j �X�^�b�N�L���b�V���O�̏�Ԃ𒲐����邽�߂ɕK�v�Ȗ��߁B
+ */
+DEFINE_INSN
+reput
+()
+(..., VALUE val)
+(VALUE val) // inc += 0;
+{
+    /* none */
+}
+
+/**
+  @c stack
+  @e get nth stack value from stack top
+  @j �X�^�b�N�g�b�v���� n �ڂ��X�^�b�N�Ƀv�b�V������B
+ */
+DEFINE_INSN
+topn
+(rb_num_t n)
+(...)
+(VALUE val) // inc += 1;
+{
+    val = TOPN(n);
+}
+
+/**
+  @c stack
+  @e set Nth stack entry to stack top
+  @j �X�^�b�N�g�b�v�̒l�� n �ڂ̃X�^�b�N�ɃR�s�[
+ */
+DEFINE_INSN
+setn
+(rb_num_t n)
+(..., VALUE val)
+(VALUE val) // inc += 0
+{
+    TOPN(n-1) = val;
+}
+
+/**
+  @c stack
+  @e empt current stack
+  @j current stack ����ɂ���B
+ */
+DEFINE_INSN
+adjuststack
+(rb_num_t n)
+(...)
+(...) // inc -= n
+{
+    DEC_SP(n);
+}
+
+
+/**********************************************************/
+/* deal with setting                                      */
+/**********************************************************/
+
+/**
+  @c setting
+  @e defined?
+  @j defined? ���s���B
+ */
+DEFINE_INSN
+defined
+(rb_num_t type, VALUE obj, VALUE needstr)
+(VALUE v)
+(VALUE val)
+{
+    VALUE klass;
+    const char *expr_type = 0;
+    val = Qnil;
+
+    switch (type) {
+      case DEFINED_IVAR:
+	if (rb_ivar_defined(GET_SELF(), SYM2ID(obj))) {
+	    expr_type = "instance-variable";
+	}
+	break;
+      case DEFINED_IVAR2:
+	klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
+	break;
+      case DEFINED_GVAR:
+	if (rb_gvar_defined(rb_global_entry(SYM2ID(obj)))) {
+	    expr_type = "global-variable";
+	}
+	break;
+      case DEFINED_CVAR:
+	klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
+	if (rb_cvar_defined(klass, SYM2ID(obj))) {
+	    expr_type = "class variable";
+	}
+	break;
+      case DEFINED_CONST:
+	klass = v;
+	if (vm_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) {
+	    expr_type = "constant";
+	}
+	break;
+      case DEFINED_FUNC:
+	klass = CLASS_OF(v);
+	if (rb_method_boundp(klass, SYM2ID(obj), 0)) {
+	    expr_type = "method";
+	}
+	break;
+      case DEFINED_METHOD:{
+	VALUE klass = CLASS_OF(v);
+	const rb_method_entry_t *me = rb_method_entry(klass, SYM2ID(obj));
+
+	if (me) {
+	    if (!(me->flag & NOEX_PRIVATE)) {
+		if (!((me->flag & NOEX_PROTECTED) &&
+		      !rb_obj_is_kind_of(GET_SELF(),
+					 rb_class_real(klass)))) {
+		    expr_type = "method";
+		}
+	    }
+	}
+	{
+	    VALUE args[2];
+	    VALUE r;
+
+	    args[0] = obj; args[1] = Qfalse;
+	    r = rb_check_funcall(v, rb_intern("respond_to_missing?"), 2, args);
+	    if (r != Qundef && RTEST(r)) 
+		expr_type = "method";
+	}
+	break;
+      }
+      case DEFINED_YIELD:
+	if (GET_BLOCK_PTR()) {
+	    expr_type = "yield";
+	}
+	break;
+      case DEFINED_ZSUPER:{
+	rb_iseq_t *ip = GET_ISEQ();
+	while (ip) {
+	    if (ip->defined_method_id) {
+		break;
+	    }
+	    ip = ip->parent_iseq;
+	}
+	if (ip) {
+	    VALUE klass = vm_search_normal_superclass(ip->klass, GET_SELF());
+	    if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
+		expr_type = "super";
+	    }
+	}
+	break;
+      }
+      case DEFINED_REF:{
+	val = vm_getspecial(th, GET_LFP(), Qfalse, FIX2INT(obj));
+	if (val != Qnil) {
+	    expr_type = "global-variable";
+	}
+	break;
+      }
+      default:
+	rb_bug("unimplemented defined? type (VM)");
+	break;
+    }
+    if (expr_type != 0) {
+	if (needstr != Qfalse) {
+	    val = rb_str_new2(expr_type);
+	}
+	else {
+	    val = Qtrue;
+	}
+    }
+}
+
+/**
+  @c setting
+  @e trace
+  @j trace �p�̖��߁B
+ */
+DEFINE_INSN
+trace
+(rb_num_t nf)
+()
+()
+{
+    rb_event_flag_t flag = (rb_event_flag_t)nf;
+
+    EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
+}
+
+/**********************************************************/
+/* deal with control flow 1: class/module                 */
+/**********************************************************/
+
+/**
+  @c class/module
+  @e
+   enter class definition scope. if super is Qfalse, and clsas
+   "klass" is defined, it's redefine. otherwise, define "klass" class.
+  @j �N���X��`�X�R�[�v�ֈڍs����B
+   ���� super �� Qfalse �� klass�N���X����`����Ă���΍Ē�`�ł���B
+   �����łȂ���΁Aklass �N���X���`����B
+ */
+DEFINE_INSN
+defineclass
+(ID id, ISEQ class_iseq, rb_num_t define_type)
+(VALUE cbase, VALUE super)
+(VALUE val)
+{
+    VALUE klass;
+
+    switch ((int)define_type) {
+      case 0:
+	/* val is dummy.  classdef returns class scope value */
+
+	if (super == Qnil) {
+	    super = rb_cObject;
+	}
+
+	vm_check_if_namespace(cbase);
+
+	/* find klass */
+	rb_autoload_load(cbase, id);
+	if (rb_const_defined_at(cbase, id)) {
+	    /* already exist */
+	    klass = rb_const_get_at(cbase, id);
+	    if (TYPE(klass) != T_CLASS) {
+		rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
+	    }
+
+	    if (super != rb_cObject) {
+		VALUE tmp;
+		tmp = rb_class_real(RCLASS_SUPER(klass));
+
+		if (tmp != super) {
+		    rb_raise(rb_eTypeError, "superclass mismatch for class %s",
+			     rb_id2name(id));
+		}
+	    }
+	}
+	else {
+	    /* new class declaration */
+	    klass = rb_define_class_id(id, super);
+	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
+	    rb_const_set(cbase, id, klass);
+	    rb_class_inherited(super, klass);
+	}
+	break;
+      case 1:
+	/* val is dummy.  classdef returns class scope value */
+	/* super is dummy */
+	klass = rb_singleton_class(cbase);
+	break;
+      case 2:
+	/* val is dummy.  classdef returns class scope value */
+	/* super is dummy */
+
+	vm_check_if_namespace(cbase);
+
+	/* find klass */
+	if (rb_const_defined_at(cbase, id)) {
+	    klass = rb_const_get_at(cbase, id);
+	    /* already exist */
+	    if (TYPE(klass) != T_MODULE) {
+		rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));
+	    }
+	}
+	else {
+	    /* new module declaration */
+	    klass = rb_define_module_id(id);
+	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
+	    rb_const_set(cbase, id, klass);
+	}
+	break;
+      default:
+	rb_bug("unknown defineclass type: %d", (int)define_type);
+    }
+
+    COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC, NULL));
+
+    /* enter scope */
+    vm_push_frame(th, class_iseq,
+		  VM_FRAME_MAGIC_CLASS, klass, (VALUE) GET_BLOCK_PTR(),
+		  class_iseq->iseq_encoded, GET_SP(), 0,
+		  class_iseq->local_size);
+    RESTORE_REGS();
+
+    INC_VM_STATE_VERSION();
+    NEXT_INSN();
+}
+
+
+/**********************************************************/
+/* deal with control flow 2: method/iterator              */
+/**********************************************************/
+
+/**
+  @c method/iterator
+  @e obj.send(id, args..) # args.size => num
+  @j ���\�b�h�Ăяo�����s���B
+  obj.send(id, args..) # args.size => num
+    flag & VM_CALL_ARGS_SPLAT_BIT    != 0 -> splat last arg
+    flag & VM_CALL_ARGS_BLOCKARG_BIT != 0 -> Proc as Block
+    flag & VM_CALL_FCALL_BIT         != 0 -> FCALL ( func() )
+    flag & VM_CALL_VCALL_BIT         != 0 -> VCALL ( func   )
+    ...
+ */
+DEFINE_INSN
+send
+(ID op_id, rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag, IC ic)
+(...)
+(VALUE val) // inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
+{
+    const rb_method_entry_t *me;
+    VALUE recv, klass;
+    rb_block_t *blockptr = 0;
+    int num = caller_setup_args(th, GET_CFP(), op_flag, (int)op_argc,
+				(rb_iseq_t *)blockiseq, &blockptr);
+    rb_num_t flag = op_flag;
+    ID id = op_id;
+
+    /* get receiver */
+    recv = (flag & VM_CALL_FCALL_BIT) ? GET_SELF() : TOPN(num);
+    klass = CLASS_OF(recv);
+    me = vm_method_search(id, klass, ic);
+    CALL_METHOD(num, blockptr, flag, id, me, recv);
+}
+
+/**
+  @c method/iterator
+  @e super(args) # args.size => num
+  @j super �����s����B
+     super(args) # args.size => num
+     flag ���I�y�����h�̈Ӗ��� send �Ɠ����B
+ */
+DEFINE_INSN
+invokesuper
+(rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag)
+(...)
+(VALUE val) // inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
+{
+    rb_block_t *blockptr = !(op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? GET_BLOCK_PTR() : 0;
+    int num = caller_setup_args(th, GET_CFP(), op_flag,
+				(int)op_argc, blockiseq, &blockptr);
+    VALUE recv, klass;
+    ID id;
+    VALUE flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
+    const rb_method_entry_t *me;
+
+    recv = GET_SELF();
+    vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass);
+
+    /* temporary measure for [Bug #2402] [Bug #2502] [Bug #3136] */
+    if (!rb_obj_is_kind_of(recv, klass)) {
+	rb_raise(rb_eNotImpError, "super from singleton method that is defined to multiple classes is not supported; this will be fixed in 1.9.3 or later");
+    }
+
+    me = rb_method_entry(klass, id);
+
+    CALL_METHOD(num, blockptr, flag, id, me, recv);
+}
+
+/**
+  @c method/iterator
+  @e yield(args) # args.size => num, flag shows expand argument or not
+  @j yield �����s����B
+     yield(args) # args.size => num
+ */
+DEFINE_INSN
+invokeblock
+(rb_num_t num, rb_num_t flag)
+(...)
+(VALUE val)  // inc += 1 - num;
+{
+    val = vm_invoke_block(th, GET_CFP(), num, flag);
+    if (val == Qundef) {
+	RESTORE_REGS();
+	NEXT_INSN();
+    }
+}
+
+/**
+  @c method/iterator
+  @e return from this scope.
+  @j ���̃X�R�[�v���甲����B
+ */
+DEFINE_INSN
+leave
+()
+(VALUE val)
+(VALUE val)
+{
+    if (OPT_CHECKED_RUN) {
+	if (reg_cfp->sp != reg_cfp->bp) {
+	    rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
+		   VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, reg_cfp->bp));
+	}
+    }
+
+    RUBY_VM_CHECK_INTS();
+    vm_pop_frame(th);
+    RESTORE_REGS();
+}
+
+/**
+  @c method/iterator
+  @e return from this vm loop
+  @j VM loop ���甲����B
+ */
+DEFINE_INSN
+finish
+()
+(VALUE val)
+(VALUE val)
+{
+#if OPT_CALL_THREADED_CODE
+    rb_bug("unused instruction on OPT_CALL_THREADED_CODE");
+#else
+    th->cfp++;
+    return val;
+#endif
+}
+
+/**********************************************************/
+/* deal with control flow 3: exception                    */
+/**********************************************************/
+
+/**
+  @c exception
+  @e longjump
+  @j ���W�����v���s���B
+ */
+DEFINE_INSN
+throw
+(rb_num_t throw_state)
+(VALUE throwobj)
+(VALUE val)
+{
+    RUBY_VM_CHECK_INTS();
+    val = vm_throw(th, GET_CFP(), throw_state, throwobj);
+    THROW_EXCEPTION(val);
+    /* unreachable */
+}
+
+/**********************************************************/
+/* deal with control flow 4: local jump                   */
+/**********************************************************/
+
+/**
+  @c jump
+  @e set PC to (PC + dst).
+  @j PC �� (PC + dst) �ɂ���B
+ */
+DEFINE_INSN
+jump
+(OFFSET dst)
+()
+()
+{
+    RUBY_VM_CHECK_INTS();
+    JUMP(dst);
+}
+
+/**
+  @c jump
+  @e if val is not false or nil, set PC to (PC + dst).
+  @j ���� val �� false �� nil �łȂ���΁APC �� (PC + dst) �ɂ���B
+ */
+DEFINE_INSN
+branchif
+(OFFSET dst)
+(VALUE val)
+()
+{
+    if (RTEST(val)) {
+	RUBY_VM_CHECK_INTS();
+	JUMP(dst);
+    }
+}
+
+/**
+  @c jump
+  @e if val is false or nil, set PC to (PC + dst).
+  @j ���� val �� false �� nil �Ȃ�΁APC �� (PC + dst) �ɂ���B
+ */
+DEFINE_INSN
+branchunless
+(OFFSET dst)
+(VALUE val)
+()
+{
+    if (!RTEST(val)) {
+	RUBY_VM_CHECK_INTS();
+	JUMP(dst);
+    }
+}
+
+
+/**********************************************************/
+/* for optimize                                           */
+/**********************************************************/
+
+/**
+  @c optimize
+  @e inline cache
+  @j �C�����C���L���b�V�����L���Ȃ�A�l���X�^�b�N�Ƀv�b�V������ dst �փW�����v����B
+ */
+DEFINE_INSN
+getinlinecache
+(OFFSET dst, IC ic)
+()
+(VALUE val)
+{
+    if (ic->ic_vmstat == GET_VM_STATE_VERSION()) {
+	val = ic->ic_value.value;
+	JUMP(dst);
+    }
+    else {
+	/* none */
+	val = Qnil;
+    }
+}
+
+/**
+  @c optimize
+  @e inline cache (once)
+  @j once ����������B
+ */
+DEFINE_INSN
+onceinlinecache
+(OFFSET dst, IC ic)
+()
+(VALUE val)
+{
+  retry:
+    if (ic->ic_vmstat) {
+	val = ic->ic_value.value;
+	JUMP(dst);
+    }
+    else if (ic->ic_value.value == Qundef)
+    {
+    	RUBY_VM_CHECK_INTS();
+    	rb_thread_schedule();
+	goto retry;
+    }
+    else {
+	/* none */
+	ic->ic_value.value = Qundef;
+	val = Qnil;
+    }
+}
+
+/**
+  @c optimize
+  @e set inline cache
+  @j �C�����C���L���b�V���̒l��ݒ肷��B
+ */
+DEFINE_INSN
+setinlinecache
+(IC ic)
+(VALUE val)
+(VALUE val)
+{
+    if (ic->ic_value.value == Qundef) {
+	rb_ary_push(GET_ISEQ()->mark_ary, val);
+    }
+    ic->ic_value.value = val;
+    ic->ic_vmstat = GET_VM_STATE_VERSION() - ruby_vm_const_missing_count;
+    ruby_vm_const_missing_count = 0;
+}
+
+/**
+  @c optimize
+  @e case dispatcher
+  @j case ���ŁA�\�Ȃ�\�����ŃW�����v����B
+ */
+DEFINE_INSN
+opt_case_dispatch
+(CDHASH hash, OFFSET else_offset)
+(..., VALUE key)
+() // inc += -1;
+{
+    if (BASIC_OP_UNREDEFINED_P(BOP_EQQ)) {
+	VALUE val;
+	if (st_lookup(RHASH_TBL(hash), key, &val)) {
+	    JUMP(FIX2INT(val));
+	}
+	else {
+	    JUMP(else_offset);
+	}
+    }
+    else {
+	struct opt_case_dispatch_i_arg arg;
+
+	arg.obj = key;
+	arg.label = -1;
+	st_foreach(RHASH_TBL(hash), opt_case_dispatch_i, (st_data_t)&arg);
+
+	if (arg.label != -1) {
+	    JUMP(arg.label);
+	}
+	else {
+	    JUMP(else_offset);
+	}
+    }
+}
+
+/**
+  @c optimize
+  @e check environment
+  @j �����̊g���p�B
+ */
+DEFINE_INSN
+opt_checkenv
+()
+()
+()
+{
+    if (GET_CFP()->bp != GET_DFP() + 1) {
+	VALUE *new_dfp = GET_CFP()->bp - 1;
+	/* TODO: copy env and clean stack at creating env? */
+	*new_dfp = *GET_DFP();
+	SET_DFP(new_dfp);
+    }
+}
+
+
+/** simple functions */
+
+/**
+  @c optimize
+  @e optimized X+Y.
+  @j �œK�����ꂽ X+Y�B
+ */
+DEFINE_INSN
+opt_plus
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (0) {
+
+    }
+#if 1
+    else if (FIXNUM_2_P(recv, obj) &&
+	     BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+	/* fixnum + fixnum */
+#ifndef LONG_LONG_VALUE
+	val = (recv + (obj & (~1)));
+	if ((~(recv ^ obj) & (recv ^ val)) &
+	    ((VALUE)0x01 << ((sizeof(VALUE) * CHAR_BIT) - 1))) {
+	    val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
+			      rb_int2big(FIX2LONG(obj)));
+	}
+#else
+	long a, b, c;
+	a = FIX2LONG(recv);
+	b = FIX2LONG(obj);
+	c = a + b;
+	if (FIXABLE(c)) {
+	    val = LONG2FIX(c);
+	}
+	else {
+	    val = rb_big_plus(rb_int2big(a), rb_int2big(b));
+	}
+#endif
+    }
+#endif
+
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat &&
+		 BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+	    val = DBL2NUM(RFLOAT_VALUE(recv) + RFLOAT_VALUE(obj));
+	}
+#endif
+
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cString &&
+		 HEAP_CLASS_OF(obj) == rb_cString &&
+		 BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+	    val = rb_str_plus(recv, obj);
+	}
+#endif
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cArray &&
+		 BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+	    val = rb_ary_plus(recv, obj);
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idPLUS, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X-Y.
+  @j �œK�����ꂽ X-Y�B
+ */
+DEFINE_INSN
+opt_minus
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
+	long a, b, c;
+
+	a = FIX2LONG(recv);
+	b = FIX2LONG(obj);
+	c = a - b;
+
+	if (FIXABLE(c)) {
+	    val = LONG2FIX(c);
+	}
+	else {
+	    val = rb_big_minus(rb_int2big(a), rb_int2big(b));
+	}
+    }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
+	    val = DBL2NUM(RFLOAT_VALUE(recv) - RFLOAT_VALUE(obj));
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+	/* other */
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idMINUS, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X*Y.
+  @j �œK�����ꂽ X*Y�B
+ */
+DEFINE_INSN
+opt_mult
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
+	long a, b;
+
+	a = FIX2LONG(recv);
+	if (a == 0) {
+	    val = recv;
+	}
+	else {
+	    volatile long c;
+	    b = FIX2LONG(obj);
+	    c = a * b;
+
+	    if (FIXABLE(c) && c / a == b) {
+		val = LONG2FIX(c);
+	    }
+	    else {
+		val = rb_big_mul(rb_int2big(a), rb_int2big(b));
+	    }
+	}
+    }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
+	    val = DBL2NUM(RFLOAT_VALUE(recv) * RFLOAT_VALUE(obj));
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idMULT, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X/Y.
+  @j �œK�����ꂽ X/Y�B
+ */
+DEFINE_INSN
+opt_div
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
+	long x, y, div;
+
+	x = FIX2LONG(recv);
+	y = FIX2LONG(obj);
+	{
+	    /* copied from numeric.c#fixdivmod */
+	    long mod;
+	    if (y == 0)
+		goto INSN_LABEL(normal_dispatch);
+	    if (y < 0) {
+		if (x < 0)
+		    div = -x / -y;
+		else
+		    div = -(x / -y);
+	    }
+	    else {
+		if (x < 0)
+		    div = -(-x / y);
+		else
+		    div = x / y;
+	    }
+	    mod = x - div * y;
+	    if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
+		mod += y;
+		div -= 1;
+	    }
+	}
+	val = LONG2NUM(div);
+    }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
+	    val = DBL2NUM(RFLOAT_VALUE(recv) / RFLOAT_VALUE(obj));
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idDIV, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X%Y.
+  @j �œK�����ꂽ X%Y�B
+ */
+DEFINE_INSN
+opt_mod
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
+	long x, y, mod;
+
+	x = FIX2LONG(recv);
+	y = FIX2LONG(obj);
+	{
+	    /* copied from numeric.c#fixdivmod */
+	    long div;
+
+	    if (y == 0)
+		rb_num_zerodiv();
+	    if (y < 0) {
+		if (x < 0)
+		    div = -x / -y;
+		else
+		    div = -(x / -y);
+	    }
+	    else {
+		if (x < 0)
+		    div = -(-x / y);
+		else
+		    div = x / y;
+	    }
+	    mod = x - div * y;
+	    if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
+		mod += y;
+		div -= 1;
+	    }
+	}
+	val = LONG2FIX(mod);
+    }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat &&
+		 BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
+	    double x = RFLOAT_VALUE(recv);
+	    double y = RFLOAT_VALUE(obj);
+	    double div, mod;
+
+	    {
+		double z;
+
+		modf(x / y, &z);
+		mod = x - z * y;
+	    }
+
+	    div = (x - mod) / y;
+	    if (y * mod < 0) {
+		mod += y;
+		div -= 1.0;
+	    }
+	    val = DBL2NUM(mod);
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idMOD, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X==Y.
+  @j �œK�����ꂽ X==Y�B
+ */
+DEFINE_INSN
+opt_eq
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    val = opt_eq_func(recv, obj, ic);
+
+    if (val == Qundef) {
+	/* other */
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idEq, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X!=Y.
+  @j �œK�����ꂽ X!=Y�B
+ */
+DEFINE_INSN
+opt_neq
+(IC ic, IC ic_eq)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    extern VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
+    const rb_method_entry_t *me = vm_method_search(idNeq, CLASS_OF(recv), ic);
+    val = Qundef;
+
+    if (check_cfunc(me, rb_obj_not_equal)) {
+	val = opt_eq_func(recv, obj, ic_eq);
+
+	if (val != Qundef) {
+	    val = RTEST(val) ? Qfalse : Qtrue;
+	}
+    }
+
+    if (val == Qundef) {
+	/* other */
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idNeq, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X<Y.
+  @j �œK�����ꂽ X<Y�B
+ */
+DEFINE_INSN
+opt_lt
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_LT)) {
+	SIGNED_VALUE a = recv, b = obj;
+
+	if (a < b) {
+	    val = Qtrue;
+	}
+	else {
+	    val = Qfalse;
+	}
+    }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_LT)) {
+	    double a = RFLOAT_VALUE(recv);
+	    double b = RFLOAT_VALUE(obj);
+#if defined(_MSC_VER) && _MSC_VER < 1300
+	    if (isnan(a) || isnan(b)) val = Qfalse;
+	    else
+#endif
+	    val = a < b ? Qtrue : Qfalse;
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idLT, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X<=Y.
+  @j �œK�����ꂽ X<=Y�B
+ */
+DEFINE_INSN
+opt_le
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_LE)) {
+	SIGNED_VALUE a = recv, b = obj;
+
+	if (a <= b) {
+	    val = Qtrue;
+	}
+	else {
+	    val = Qfalse;
+	}
+    }
+    else {
+	/* other */
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idLE, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X>Y.
+  @j �œK�����ꂽ X>Y�B
+ */
+DEFINE_INSN
+opt_gt
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_GT)) {
+	SIGNED_VALUE a = recv, b = obj;
+
+	if (a > b) {
+	    val = Qtrue;
+	}
+	else {
+	    val = Qfalse;
+	}
+    }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_GT)) {
+	    double a = RFLOAT_VALUE(recv);
+	    double b = RFLOAT_VALUE(obj);
+#if defined(_MSC_VER) && _MSC_VER < 1300
+	    if (isnan(a) || isnan(b)) val = Qfalse;
+	    else
+#endif
+	    val = a > b ? Qtrue : Qfalse;
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idGT, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized X>=Y.
+  @j �œK�����ꂽ X>=Y�B
+ */
+DEFINE_INSN
+opt_ge
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_GE)) {
+	SIGNED_VALUE a = recv, b = obj;
+
+	if (a >= b) {
+	    val = Qtrue;
+	}
+	else {
+	    val = Qfalse;
+	}
+    }
+    else {
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idGE, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e <<
+  @j �œK�����ꂽ X<<Y�B
+ */
+DEFINE_INSN
+opt_ltlt
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (!SPECIAL_CONST_P(recv)) {
+	if (0) {
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cString &&
+		 BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
+	    val = rb_str_concat(recv, obj);
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cArray &&
+		 BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
+	    val = rb_ary_push(recv, obj);
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idLTLT, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e []
+  @j �œK�����ꂽ recv[obj]�B
+ */
+DEFINE_INSN
+opt_aref
+(IC ic)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_AREF)) {
+	if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
+	    val = rb_ary_entry(recv, FIX2LONG(obj));
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+	    val = rb_hash_aref(recv, obj);
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(1, idAREF, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e recv[obj] = set
+  @j �œK�����ꂽ recv[obj] = set�B
+ */
+DEFINE_INSN
+opt_aset
+(IC ic)
+(VALUE recv, VALUE obj, VALUE set)
+(VALUE val)
+{
+    if (!SPECIAL_CONST_P(recv) &&
+	BASIC_OP_UNREDEFINED_P(BOP_ASET)) {
+	if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
+	    rb_ary_store(recv, FIX2LONG(obj), set);
+	    val = set;
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+	    rb_hash_aset(recv, obj, set);
+	    val = set;
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	PUSH(set);
+	CALL_SIMPLE_METHOD(2, idASET, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized length
+  @j �œK�����ꂽ recv.length()�B
+ */
+DEFINE_INSN
+opt_length
+(IC ic)
+(VALUE recv)
+(VALUE val)
+{
+    if (LIKELY(!SPECIAL_CONST_P(recv) &&
+	       BASIC_OP_UNREDEFINED_P(BOP_LENGTH))) {
+	if (HEAP_CLASS_OF(recv) == rb_cString) {
+	    val = rb_str_length(recv);
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cArray) {
+	    val = LONG2NUM(RARRAY_LEN(recv));
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+	    val = INT2FIX(RHASH_SIZE(recv));
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	CALL_SIMPLE_METHOD(0, idLength, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized size
+  @j �œK�����ꂽ recv.size()�B
+ */
+DEFINE_INSN
+opt_size
+(IC ic)
+(VALUE recv)
+(VALUE val)
+{
+    if (LIKELY(BASIC_OP_UNREDEFINED_P(BOP_SIZE) &&
+	       !SPECIAL_CONST_P(recv))) {
+	if (HEAP_CLASS_OF(recv) == rb_cString) {
+	    val = rb_str_length(recv);
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cArray) {
+	    val = LONG2NUM(RARRAY_LEN(recv));
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+	    val = INT2FIX(RHASH_SIZE(recv));
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	CALL_SIMPLE_METHOD(0, idSize, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized succ
+  @j �œK�����ꂽ recv.succ()�B
+ */
+DEFINE_INSN
+opt_succ
+(IC ic)
+(VALUE recv)
+(VALUE val)
+{
+    if (SPECIAL_CONST_P(recv)) {
+	if (FIXNUM_P(recv) &&
+	    BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
+	    const VALUE obj = INT2FIX(1);
+	    /* fixnum + INT2FIX(1) */
+	    val = (recv + (obj & (~1)));
+	    if ((~(recv ^ obj) & (recv ^ val)) & ((unsigned long)LONG_MAX + 1)) {
+		val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
+				  rb_int2big(FIX2LONG(obj)));
+	    }
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+	if (HEAP_CLASS_OF(recv) == rb_cString &&
+	    BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
+	    val = rb_str_succ(recv);
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cTime &&
+		 BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
+	    val = rb_time_succ(recv);
+	}
+	else
+	  {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    if (0) {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	CALL_SIMPLE_METHOD(0, idSucc, recv);
+    }
+}
+
+/**
+  @c optimize
+  @e optimized not
+  @j �œK�����ꂽ recv.!()�B
+ */
+DEFINE_INSN
+opt_not
+(IC ic)
+(VALUE recv)
+(VALUE val)
+{
+    extern VALUE rb_obj_not(VALUE obj);
+    const rb_method_entry_t *me = vm_method_search(idNot, CLASS_OF(recv), ic);
+
+    if (check_cfunc(me, rb_obj_not)) {
+	val = RTEST(recv) ? Qfalse : Qtrue;
+    }
+    else {
+	PUSH(recv);
+	CALL_SIMPLE_METHOD(0, idNot, recv);
+    }
+}
+
+
+/**
+  @c optimize
+  @e optimized regexp match
+  @j �œK�����ꂽ���K�\���}�b�`�B
+ */
+DEFINE_INSN
+opt_regexpmatch1
+(VALUE r)
+(VALUE obj)
+(VALUE val)
+{
+    val = rb_reg_match(r, obj);
+}
+
+/**
+  @c optimize
+  @e optimized regexp match 2
+  @j �œK�����ꂽ���K�\���}�b�` 2
+ */
+DEFINE_INSN
+opt_regexpmatch2
+()
+(VALUE obj2, VALUE obj1)
+(VALUE val)
+{
+    if (TYPE(obj2) == T_STRING) {
+	val = rb_reg_match(obj1, obj2);
+    }
+    else {
+	val = rb_funcall(obj2, idEqTilde, 1, obj1);
+    }
+}
+
+/**
+  @c optimize
+  @e call native compiled method
+  @j �l�C�e�B�u�R���p�C���������\�b�h���N���B
+ */
+DEFINE_INSN
+opt_call_c_function
+(rb_insn_func_t funcptr)
+()
+()
+{
+    reg_cfp = (funcptr)(th, reg_cfp);
+
+    if (reg_cfp == 0) {
+	VALUE err = th->errinfo;
+	th->errinfo = Qnil;
+	THROW_EXCEPTION(err);
+    }
+
+    RESTORE_REGS();
+    NEXT_INSN();
+}
+
+/**
+  @c joke
+  @e BLT
+  @j BLT
+ */
+DEFINE_INSN
+bitblt
+()
+()
+(VALUE ret)
+{
+    ret = rb_str_new2("a bit of bacon, lettuce and tomato");
+}
+
+/**
+  @c joke
+  @e The Answer to Life, the Universe, and Everything
+  @j �l���A�F���A���ׂĂ̓����B
+ */
+DEFINE_INSN
+answer
+()
+()
+(VALUE ret)
+{
+    ret = INT2FIX(42);
+}
+
diff --git a/instruby.rb b/instruby.rb
deleted file mode 100755
index a5606e8452..0000000000
--- a/instruby.rb
+++ /dev/null
@@ -1,355 +0,0 @@
-#!./miniruby
-
-load "./rbconfig.rb"
-include RbConfig
-
-srcdir = File.dirname(__FILE__)
-$:.unshift File.expand_path("lib", srcdir)
-require 'fileutils'
-require 'shellwords'
-require 'optparse'
-require 'optparse/shellwords'
-require 'tempfile'
-
-STDOUT.sync = true
-File.umask(0)
-
-def parse_args()
-  $mantype = 'doc'
-  $destdir = nil
-  $extout = nil
-  $make = 'make'
-  $mflags = []
-  $install = []
-  $installed_list = nil
-  $dryrun = false
-  $rdocdir = nil
-  opt = OptionParser.new
-  opt.on('-n') {$dryrun = true}
-  opt.on('--dest-dir=DIR') {|dir| $destdir = dir}
-  opt.on('--extout=DIR') {|dir| $extout = (dir unless dir.empty?)}
-  opt.on('--make=COMMAND') {|make| $make = make}
-  opt.on('--mantype=MAN') {|man| $mantype = man}
-  opt.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
-    if arg = v.first
-      arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
-    end
-    $mflags.concat(v)
-  end
-  opt.on('-i', '--install=TYPE',
-         [:local, :bin, :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc]) do |ins|
-    $install << ins
-  end
-  opt.on('--installed-list [FILENAME]') {|name| $installed_list = name}
-  opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir}
-
-  opt.parse! rescue abort [$!.message, opt].join("\n")
-
-  $make, *rest = Shellwords.shellwords($make)
-  $mflags.unshift(*rest) unless rest.empty?
-
-  def $mflags.set?(flag)
-    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
-    false
-  end
-  def $mflags.defined?(var)
-    grep(/\A#{var}=(.*)/) {return $1}
-    false
-  end
-
-  if $mflags.set?(?n)
-    $dryrun = true
-  else
-    $mflags << '-n' if $dryrun
-  end
-
-  $destdir ||= $mflags.defined?("DESTDIR")
-  if $extout ||= $mflags.defined?("EXTOUT")
-    Config.expand($extout)
-  end
-
-  $continue = $mflags.set?(?k)
-
-  if $installed_list ||= $mflags.defined?('INSTALLED_LIST')
-    Config.expand($installed_list, Config::CONFIG)
-    $installed_list = open($installed_list, "ab")
-    $installed_list.sync = true
-  end
-
-  $rdocdir ||= $mflags.defined?('RDOCOUT')
-end
-
-parse_args()
-
-include FileUtils
-include FileUtils::NoWrite if $dryrun
-@fileutils_output = STDOUT
-@fileutils_label = ''
-
-$install_procs = Hash.new {[]}
-def install?(*types, &block)
-  $install_procs[:all] <<= block
-  types.each do |type|
-    $install_procs[type] <<= block
-  end
-end
-
-def install(src, dest, options = {})
-  options[:preserve] = true
-  super(src, with_destdir(dest), options)
-  if $installed_list
-    dest = File.join(dest, File.basename(src)) if $made_dirs[dest]
-    $installed_list.puts dest
-  end
-end
-
-def ln_sf(src, dest)
-  super(src, with_destdir(dest))
-  $installed_list.puts dest if $installed_list
-end
-
-$made_dirs = {}
-def makedirs(dirs)
-  dirs = fu_list(dirs)
-  dirs.collect! do |dir|
-    realdir = with_destdir(dir)
-    realdir unless $made_dirs.fetch(dir) do
-      $made_dirs[dir] = true
-      $installed_list.puts(File.join(dir, "")) if $installed_list
-      File.directory?(realdir)
-    end
-  end.compact!
-  super(dirs, :mode => 0755) unless dirs.empty?
-end
-
-def install_recursive(src, dest, options = {})
-  noinst = options.delete(:no_install)
-  subpath = src.size..-1
-  Dir.glob("#{src}/**/*", File::FNM_DOTMATCH) do |src|
-    next if /\A\.{1,2}\z/ =~ (base = File.basename(src))
-    next if noinst and File.fnmatch?(noinst, File.basename(src))
-    d = dest + src[subpath]
-    if File.directory?(src)
-      makedirs(d)
-    else
-      install src, d
-    end
-  end
-end
-
-def open_for_install(path, mode, &block)
-  unless $dryrun
-    open(with_destdir(path), mode, &block)
-  end
-  $installed_list.puts path if /^w/ =~ mode and $installed_list
-end
-
-def with_destdir(dir)
-  return dir if !$destdir or $destdir.empty?
-  dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
-  $destdir + dir
-end
-
-exeext = CONFIG["EXEEXT"]
-
-ruby_install_name = CONFIG["ruby_install_name"]
-rubyw_install_name = CONFIG["rubyw_install_name"]
-
-version = CONFIG["ruby_version"]
-bindir = CONFIG["bindir"]
-libdir = CONFIG["libdir"]
-rubylibdir = CONFIG["rubylibdir"]
-archlibdir = CONFIG["archdir"]
-sitelibdir = CONFIG["sitelibdir"]
-sitearchlibdir = CONFIG["sitearchdir"]
-mandir = File.join(CONFIG["mandir"], "man")
-configure_args = Shellwords.shellwords(CONFIG["configure_args"])
-enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-dll = CONFIG["LIBRUBY_SO"]
-lib = CONFIG["LIBRUBY"]
-arc = CONFIG["LIBRUBY_A"]
-
-install?(:local, :arch, :bin) do
-  puts "installing binary commands"
-
-  makedirs [bindir, libdir, archlibdir]
-
-  install ruby_install_name+exeext, bindir, :mode => 0755
-  if rubyw_install_name and !rubyw_install_name.empty?
-    install rubyw_install_name+exeext, bindir, :mode => 0755
-  end
-  if enable_shared and dll != lib
-    install dll, bindir, :mode => 0755
-  end
-  install lib, libdir, :mode => 0755 unless lib == arc
-  install arc, libdir, :mode => 0644
-  install "config.h", archlibdir, :mode => 0644
-  install "rbconfig.rb", archlibdir, :mode => 0644
-  if CONFIG["ARCHFILE"]
-    for file in CONFIG["ARCHFILE"].split
-      install file, archlibdir, :mode => 0644
-    end
-  end
-
-  if dll == lib and dll != arc
-    for link in CONFIG["LIBRUBY_ALIASES"].split
-      ln_sf(dll, File.join(libdir, link))
-    end
-  end
-end
-
-if $extout
-  extout = "#$extout"
-  install?(:ext, :arch, :'ext-arch') do
-    puts "installing extension objects"
-    makedirs [archlibdir, sitearchlibdir]
-    if noinst = CONFIG["no_install_files"] and noinst.empty?
-      noinst = nil
-    end
-    install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst)
-  end
-  install?(:ext, :comm, :'ext-comm') do
-    puts "installing extension scripts"
-    makedirs [rubylibdir, sitelibdir]
-    install_recursive("#{extout}/common", rubylibdir)
-  end
-end
-
-install?(:rdoc) do
-  if $rdocdir
-    puts "installing rdoc"
-
-    ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR)/system')
-    Config.expand(ridatadir)
-    makedirs [ridatadir]
-    install_recursive($rdocdir, ridatadir)
-  end
-end
-
-install?(:local, :comm, :bin) do
-  puts "installing command scripts"
-
-  Dir.chdir srcdir
-  makedirs [bindir, rubylibdir]
-
-  ruby_shebang = File.join(bindir, ruby_install_name)
-  if File::ALT_SEPARATOR
-    ruby_bin_dosish = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)
-  end
-  for src in Dir["bin/*"]
-    next unless File.file?(src)
-    next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
-
-    name = ruby_install_name.sub(/ruby/, File.basename(src))
-    dest = File.join(bindir, name)
-
-    install src, dest, :mode => 0755
-
-    next if $dryrun
-
-    shebang = ''
-    body = ''
-    open_for_install(dest, "r+") { |f|
-      shebang = f.gets
-      body = f.read
-
-      if shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
-        f.rewind
-        f.print shebang, body
-        f.truncate(f.pos)
-      end
-    }
-
-    if ruby_bin_dosish
-      batfile = File.join(bindir, name + ".bat")
-      open_for_install(batfile, "wb") {|b|
-        b.print((<<EOH+shebang+body+<<EOF).gsub(/\r?\n/, "\r\n"))
-@echo off
-@if not "%~d0" == "~d0" goto WinNT
-#{ruby_bin_dosish} -x "#{batfile}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-@goto endofruby
-:WinNT
-"%~dp0#{ruby_install_name}" -x "%~f0" %*
-@goto endofruby
-EOH
-__END__
-:endofruby
-EOF
-      }
-    end
-  end
-end
-
-install?(:local, :comm, :lib) do
-  puts "installing library scripts"
-
-  Dir.chdir srcdir
-  makedirs [rubylibdir]
-
-  for f in Dir["lib/**/*{.rb,help-message}"]
-    dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir
-    makedirs dir
-    install f, dir, :mode => 0644
-  end
-end
-
-install?(:local, :arch, :lib) do
-  puts "installing headers"
-
-  Dir.chdir(srcdir)
-  makedirs [archlibdir]
-  for f in Dir["*.h"]
-    install f, archlibdir, :mode => 0644
-  end
-
-  if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
-    win32libdir = File.join(archlibdir, "win32")
-    makedirs win32libdir
-    install "win32/win32.h", win32libdir, :mode => 0644
-  end
-end
-
-install?(:local, :comm, :man) do
-  puts "installing manpages"
-
-  Dir.chdir(srcdir)
-  for mdoc in Dir["*.[1-9]"]
-    next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
-
-    destdir = mandir + mdoc[/(\d+)$/]
-    destfile = File.join(destdir, mdoc.sub(/ruby/, ruby_install_name))
-
-    makedirs destdir
-
-    if $mantype == "doc"
-      install mdoc, destfile, :mode => 0644
-    else
-      require 'mdoc2man.rb'
-
-      w = Tempfile.open(mdoc)
-
-      open(mdoc) { |r|
-        Mdoc2Man.mdoc2man(r, w)
-      }
-
-      w.close
-
-      install w.path, destfile, :mode => 0644
-    end
-  end
-end
-
-$install.concat ARGV.collect {|n| n.intern}
-$install << :local << :ext if $install.empty?
-$install.each do |inst|
-  $install_procs[inst].each do |block|
-    dir = Dir.pwd
-    begin
-      block.call
-    ensure
-      Dir.chdir(dir)
-    end
-  end
-end
-
-# vi:set sw=2:
diff --git a/intern.h b/intern.h
deleted file mode 100644
index 47da14bb7a..0000000000
--- a/intern.h
+++ /dev/null
@@ -1,508 +0,0 @@
-/**********************************************************************
-
-  intern.h -
-
-  $Author$
-  $Date$
-  created at: Thu Jun 10 14:22:17 JST 1993
-
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-/* 
- * Functions and variables that are used by more than one source file of
- * the kernel.
- */
-
-#define ID_ALLOCATOR 1
-
-/* array.c */
-void rb_mem_clear _((register VALUE*, register long));
-VALUE rb_assoc_new _((VALUE, VALUE));
-VALUE rb_check_array_type _((VALUE));
-VALUE rb_ary_new _((void));
-VALUE rb_ary_new2 _((long));
-VALUE rb_ary_new3 __((long,...));
-VALUE rb_ary_new4 _((long, const VALUE *));
-VALUE rb_ary_freeze _((VALUE));
-VALUE rb_ary_aref _((int, VALUE*, VALUE));
-void rb_ary_store _((VALUE, long, VALUE));
-VALUE rb_ary_dup _((VALUE));
-VALUE rb_ary_to_ary _((VALUE));
-VALUE rb_ary_to_s _((VALUE));
-VALUE rb_ary_push _((VALUE, VALUE));
-VALUE rb_ary_pop _((VALUE));
-VALUE rb_ary_shift _((VALUE));
-VALUE rb_ary_unshift _((VALUE, VALUE));
-VALUE rb_ary_entry _((VALUE, long));
-VALUE rb_ary_each _((VALUE));
-VALUE rb_ary_join _((VALUE, VALUE));
-VALUE rb_ary_print_on _((VALUE, VALUE));
-VALUE rb_ary_reverse _((VALUE));
-VALUE rb_ary_sort _((VALUE));
-VALUE rb_ary_sort_bang _((VALUE));
-VALUE rb_ary_delete _((VALUE, VALUE));
-VALUE rb_ary_delete_at _((VALUE, long));
-VALUE rb_ary_clear _((VALUE));
-VALUE rb_ary_plus _((VALUE, VALUE));
-VALUE rb_ary_concat _((VALUE, VALUE));
-VALUE rb_ary_assoc _((VALUE, VALUE));
-VALUE rb_ary_rassoc _((VALUE, VALUE));
-VALUE rb_ary_includes _((VALUE, VALUE));
-VALUE rb_ary_cmp _((VALUE, VALUE));
-VALUE rb_protect_inspect _((VALUE(*)(ANYARGS),VALUE,VALUE));
-VALUE rb_inspecting_p _((VALUE));
-VALUE rb_check_array_value _((VALUE));
-VALUE rb_values_at _((VALUE, long, int, VALUE*, VALUE(*) _((VALUE,long))));
-/* bignum.c */
-VALUE rb_big_clone _((VALUE));
-void rb_big_2comp _((VALUE));
-VALUE rb_big_norm _((VALUE));
-VALUE rb_uint2big _((unsigned long));
-VALUE rb_int2big _((long));
-VALUE rb_uint2inum _((unsigned long));
-VALUE rb_int2inum _((long));
-VALUE rb_cstr_to_inum _((const char*, int, int));
-VALUE rb_str_to_inum _((VALUE, int, int));
-VALUE rb_cstr2inum _((const char*, int));
-VALUE rb_str2inum _((VALUE, int));
-VALUE rb_big2str _((VALUE, int));
-VALUE rb_big2str0 _((VALUE, int, int));
-long rb_big2long _((VALUE));
-#define rb_big2int(x) rb_big2long(x)
-unsigned long rb_big2ulong _((VALUE));
-#define rb_big2uint(x) rb_big2ulong(x)
-#if HAVE_LONG_LONG
-VALUE rb_ll2inum _((LONG_LONG));
-VALUE rb_ull2inum _((unsigned LONG_LONG));
-LONG_LONG rb_big2ll _((VALUE));
-unsigned LONG_LONG rb_big2ull _((VALUE));
-#endif  /* HAVE_LONG_LONG */
-void rb_quad_pack _((char*,VALUE));
-VALUE rb_quad_unpack _((const char*,int));
-VALUE rb_dbl2big _((double));
-double rb_big2dbl _((VALUE));
-VALUE rb_big_plus _((VALUE, VALUE));
-VALUE rb_big_minus _((VALUE, VALUE));
-VALUE rb_big_mul _((VALUE, VALUE));
-VALUE rb_big_divmod _((VALUE, VALUE));
-VALUE rb_big_pow _((VALUE, VALUE));
-VALUE rb_big_and _((VALUE, VALUE));
-VALUE rb_big_or _((VALUE, VALUE));
-VALUE rb_big_xor _((VALUE, VALUE));
-VALUE rb_big_lshift _((VALUE, VALUE));
-VALUE rb_big_rand _((VALUE, double*));
-/* class.c */
-VALUE rb_class_boot _((VALUE));
-VALUE rb_class_new _((VALUE));
-VALUE rb_mod_init_copy _((VALUE, VALUE));
-VALUE rb_class_init_copy _((VALUE, VALUE));
-VALUE rb_singleton_class_clone _((VALUE));
-void rb_singleton_class_attached _((VALUE,VALUE));
-VALUE rb_make_metaclass _((VALUE, VALUE));
-void rb_check_inheritable _((VALUE));
-VALUE rb_class_inherited _((VALUE, VALUE));
-VALUE rb_define_class_id _((ID, VALUE));
-VALUE rb_module_new _((void));
-VALUE rb_define_module_id _((ID));
-VALUE rb_mod_included_modules _((VALUE));
-VALUE rb_mod_include_p _((VALUE, VALUE));
-VALUE rb_mod_ancestors _((VALUE));
-VALUE rb_class_instance_methods _((int, VALUE*, VALUE));
-VALUE rb_class_public_instance_methods _((int, VALUE*, VALUE));
-VALUE rb_class_protected_instance_methods _((int, VALUE*, VALUE));
-VALUE rb_big_rshift(VALUE, VALUE);
-VALUE rb_class_private_instance_methods _((int, VALUE*, VALUE));
-VALUE rb_obj_singleton_methods _((int, VALUE*, VALUE));
-void rb_define_method_id _((VALUE, ID, VALUE (*)(ANYARGS), int));
-void rb_frozen_class_p _((VALUE));
-void rb_undef _((VALUE, ID));
-void rb_define_protected_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
-void rb_define_private_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
-void rb_define_singleton_method _((VALUE, const char*, VALUE(*)(ANYARGS), int));
-VALUE rb_singleton_class _((VALUE));
-/* compar.c */
-int rb_cmpint _((VALUE, VALUE, VALUE));
-NORETURN(void rb_cmperr _((VALUE, VALUE)));
-/* enum.c */
-/* error.c */
-RUBY_EXTERN int ruby_nerrs;
-VALUE rb_exc_new _((VALUE, const char*, long));
-VALUE rb_exc_new2 _((VALUE, const char*));
-VALUE rb_exc_new3 _((VALUE, VALUE));
-NORETURN(void rb_loaderror __((const char*, ...)));
-NORETURN(void rb_name_error __((ID, const char*, ...)));
-NORETURN(void rb_invalid_str _((const char*, const char*)));
-void rb_compile_error __((const char*, ...));
-void rb_compile_error_append __((const char*, ...));
-NORETURN(void rb_load_fail _((const char*)));
-NORETURN(void rb_error_frozen _((const char*)));
-void rb_check_frozen _((VALUE));
-/* eval.c */
-RUBY_EXTERN struct RNode *ruby_current_node;
-void ruby_set_current_source _((void));
-NORETURN(void rb_exc_raise _((VALUE)));
-NORETURN(void rb_exc_fatal _((VALUE)));
-VALUE rb_f_exit _((int,VALUE*));
-VALUE rb_f_abort _((int,VALUE*));
-void rb_remove_method _((VALUE, const char*));
-#define rb_disable_super(klass, name) ((void)0)
-#define rb_enable_super(klass, name) ((void)0)
-#define HAVE_RB_DEFINE_ALLOC_FUNC 1
-void rb_define_alloc_func _((VALUE, VALUE (*)(VALUE)));
-void rb_undef_alloc_func _((VALUE));
-void rb_clear_cache _((void));
-void rb_clear_cache_by_class _((VALUE));
-void rb_alias _((VALUE, ID, ID));
-void rb_attr _((VALUE,ID,int,int,int));
-int rb_method_boundp _((VALUE, ID, int));
-VALUE rb_dvar_defined _((ID));
-VALUE rb_dvar_curr _((ID));
-VALUE rb_dvar_ref _((ID));
-void rb_dvar_asgn _((ID, VALUE));
-void rb_dvar_push _((ID, VALUE));
-VALUE *rb_svar _((int));
-VALUE rb_eval_cmd _((VALUE, VALUE, int));
-int rb_obj_respond_to _((VALUE, ID, int));
-int rb_respond_to _((VALUE, ID));
-void rb_interrupt _((void));
-VALUE rb_apply _((VALUE, ID, VALUE));
-void rb_backtrace _((void));
-ID rb_frame_last_func _((void));
-VALUE rb_obj_instance_eval _((int, VALUE*, VALUE));
-VALUE rb_mod_module_eval _((int, VALUE*, VALUE));
-void rb_load _((VALUE, int));
-void rb_load_protect _((VALUE, int, int*));
-NORETURN(void rb_jump_tag _((int)));
-int rb_provided _((const char*));
-void rb_provide _((const char*));
-VALUE rb_f_require _((VALUE, VALUE));
-VALUE rb_require_safe _((VALUE, int));
-void rb_obj_call_init _((VALUE, int, VALUE*));
-VALUE rb_class_new_instance _((int, VALUE*, VALUE));
-VALUE rb_block_proc _((void));
-VALUE rb_f_lambda _((void));
-VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE));
-VALUE rb_protect _((VALUE (*)(VALUE), VALUE, int*));
-void rb_set_end_proc _((void (*)(VALUE), VALUE));
-void rb_mark_end_proc _((void));
-void rb_exec_end_proc _((void));
-void ruby_finalize _((void));
-NORETURN(void ruby_stop _((int)));
-int ruby_cleanup _((int));
-int ruby_exec _((void));
-void rb_gc_mark_threads _((void));
-void rb_thread_start_timer _((void));
-void rb_thread_stop_timer _((void));
-void rb_thread_schedule _((void));
-void rb_thread_wait_fd _((int));
-int rb_thread_fd_writable _((int));
-void rb_thread_fd_close _((int));
-int rb_thread_alone _((void));
-void rb_thread_polling _((void));
-void rb_thread_sleep _((int));
-void rb_thread_sleep_forever _((void));
-VALUE rb_thread_stop _((void));
-VALUE rb_thread_wakeup _((VALUE));
-VALUE rb_thread_wakeup_alive _((VALUE));
-VALUE rb_thread_run _((VALUE));
-VALUE rb_thread_kill _((VALUE));
-VALUE rb_thread_alive_p _((VALUE));
-VALUE rb_thread_create _((VALUE (*)(ANYARGS), void*));
-void rb_thread_interrupt _((void));
-void rb_thread_trap_eval _((VALUE, int, int));
-void rb_thread_signal_raise _((int));
-void rb_thread_signal_exit _((void));
-int rb_thread_select _((int, fd_set *, fd_set *, fd_set *, struct timeval *));
-void rb_thread_wait_for _((struct timeval));
-VALUE rb_thread_current _((void));
-VALUE rb_thread_main _((void));
-VALUE rb_thread_local_aref _((VALUE, ID));
-VALUE rb_thread_local_aset _((VALUE, ID, VALUE));
-void rb_thread_atfork _((void));
-VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
-/* file.c */
-VALUE rb_file_s_expand_path _((int, VALUE *));
-VALUE rb_file_expand_path _((VALUE, VALUE));
-void rb_file_const _((const char*, VALUE));
-int rb_find_file_ext _((VALUE*, const char* const*));
-VALUE rb_find_file _((VALUE));
-char *rb_path_next _((const char *));
-char *rb_path_skip_prefix _((const char *));
-char *rb_path_last_separator _((const char *));
-char *rb_path_end _((const char *));
-VALUE rb_file_directory_p _((VALUE,VALUE));
-/* gc.c */
-NORETURN(void rb_memerror __((void)));
-int ruby_stack_check _((void));
-int ruby_stack_length _((VALUE**));
-char *rb_source_filename _((const char*));
-void rb_gc_mark_locations _((VALUE*, VALUE*));
-void rb_mark_tbl _((struct st_table*));
-void rb_mark_hash _((struct st_table*));
-void rb_gc_mark_maybe _((VALUE));
-void rb_gc_mark _((VALUE));
-void rb_gc_force_recycle _((VALUE));
-void rb_gc _((void));
-void rb_gc_copy_finalizer _((VALUE,VALUE));
-void rb_gc_finalize_deferred _((void));
-void rb_gc_call_finalizer_at_exit _((void));
-VALUE rb_gc_enable _((void));
-VALUE rb_gc_disable _((void));
-VALUE rb_gc_start _((void));
-/* hash.c */
-void st_foreach_safe _((struct st_table *, int (*)(ANYARGS), unsigned long));
-void rb_hash_foreach _((VALUE, int (*)(ANYARGS), VALUE));
-VALUE rb_hash _((VALUE));
-VALUE rb_hash_new _((void));
-VALUE rb_hash_freeze _((VALUE));
-VALUE rb_hash_aref _((VALUE, VALUE));
-VALUE rb_hash_aset _((VALUE, VALUE, VALUE));
-VALUE rb_hash_delete_if _((VALUE));
-VALUE rb_hash_delete _((VALUE,VALUE));
-int rb_path_check _((char*));
-int rb_env_path_tainted _((void));
-/* io.c */
-#define rb_defout rb_stdout
-RUBY_EXTERN VALUE rb_fs;
-RUBY_EXTERN VALUE rb_output_fs;
-RUBY_EXTERN VALUE rb_rs;
-RUBY_EXTERN VALUE rb_default_rs;
-RUBY_EXTERN VALUE rb_output_rs;
-VALUE rb_io_write _((VALUE, VALUE));
-VALUE rb_io_gets _((VALUE));
-VALUE rb_io_getc _((VALUE));
-VALUE rb_io_ungetc _((VALUE, VALUE));
-VALUE rb_io_close _((VALUE));
-VALUE rb_io_eof _((VALUE));
-VALUE rb_io_binmode _((VALUE));
-VALUE rb_io_addstr _((VALUE, VALUE));
-VALUE rb_io_printf _((int, VALUE*, VALUE));
-VALUE rb_io_print _((int, VALUE*, VALUE));
-VALUE rb_io_puts _((int, VALUE*, VALUE));
-VALUE rb_file_open _((const char*, const char*));
-VALUE rb_gets _((void));
-void rb_write_error _((const char*));
-void rb_write_error2 _((const char*, long));
-/* marshal.c */
-VALUE rb_marshal_dump _((VALUE, VALUE));
-VALUE rb_marshal_load _((VALUE));
-/* numeric.c */
-void rb_num_zerodiv _((void));
-VALUE rb_num_coerce_bin _((VALUE, VALUE));
-VALUE rb_num_coerce_cmp _((VALUE, VALUE));
-VALUE rb_num_coerce_relop _((VALUE, VALUE));
-VALUE rb_float_new _((double));
-VALUE rb_num2fix _((VALUE));
-VALUE rb_fix2str _((VALUE, int));
-VALUE rb_dbl_cmp _((double, double));
-/* object.c */
-int rb_eql _((VALUE, VALUE));
-VALUE rb_any_to_s _((VALUE));
-VALUE rb_inspect _((VALUE));
-VALUE rb_obj_is_instance_of _((VALUE, VALUE));
-VALUE rb_obj_is_kind_of _((VALUE, VALUE));
-VALUE rb_obj_alloc _((VALUE));
-VALUE rb_obj_clone _((VALUE));
-VALUE rb_obj_dup _((VALUE));
-VALUE rb_obj_init_copy _((VALUE,VALUE));
-VALUE rb_obj_taint _((VALUE));
-VALUE rb_obj_tainted _((VALUE));
-VALUE rb_obj_untaint _((VALUE));
-VALUE rb_obj_freeze _((VALUE));
-VALUE rb_obj_id _((VALUE));
-VALUE rb_obj_class _((VALUE));
-VALUE rb_class_real _((VALUE));
-VALUE rb_class_inherited_p _((VALUE, VALUE));
-VALUE rb_convert_type _((VALUE,int,const char*,const char*));
-VALUE rb_check_convert_type _((VALUE,int,const char*,const char*));
-VALUE rb_to_int _((VALUE));
-VALUE rb_Integer _((VALUE));
-VALUE rb_Float _((VALUE));
-VALUE rb_String _((VALUE));
-VALUE rb_Array _((VALUE));
-double rb_cstr_to_dbl _((const char*, int));
-double rb_str_to_dbl _((VALUE, int));
-/* parse.y */
-RUBY_EXTERN int   ruby_sourceline;
-RUBY_EXTERN char *ruby_sourcefile;
-int ruby_yyparse _((void));
-ID rb_id_attrset _((ID));
-void rb_parser_append_print _((void));
-void rb_parser_while_loop _((int, int));
-int ruby_parser_stack_on_heap _((void));
-void rb_gc_mark_parser _((void));
-int rb_is_const_id _((ID));
-int rb_is_instance_id _((ID));
-int rb_is_class_id _((ID));
-int rb_is_local_id _((ID));
-int rb_is_junk_id _((ID));
-int rb_symname_p _((const char*));
-int rb_sym_interned_p _((VALUE));
-VALUE rb_backref_get _((void));
-void rb_backref_set _((VALUE));
-VALUE rb_lastline_get _((void));
-void rb_lastline_set _((VALUE));
-VALUE rb_sym_all_symbols _((void));
-/* process.c */
-int rb_proc_exec _((const char*));
-VALUE rb_f_exec _((int,VALUE*));
-int rb_waitpid _((int,int*,int));
-void rb_syswait _((int));
-VALUE rb_proc_times _((VALUE));
-VALUE rb_detach_process _((int));
-/* range.c */
-VALUE rb_range_new _((VALUE, VALUE, int));
-VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
-VALUE rb_length_by_each _((VALUE));
-/* re.c */
-int rb_memcmp _((const void*,const void*,long));
-int rb_memcicmp _((const void*,const void*,long));
-long rb_memsearch _((const void*,long,const void*,long));
-VALUE rb_reg_nth_defined _((int, VALUE));
-VALUE rb_reg_nth_match _((int, VALUE));
-VALUE rb_reg_last_match _((VALUE));
-VALUE rb_reg_match_pre _((VALUE));
-VALUE rb_reg_match_post _((VALUE));
-VALUE rb_reg_match_last _((VALUE));
-VALUE rb_reg_new _((const char*, long, int));
-VALUE rb_reg_match _((VALUE, VALUE));
-VALUE rb_reg_match2 _((VALUE));
-int rb_reg_options _((VALUE));
-void rb_set_kcode _((const char*));
-const char* rb_get_kcode _((void));
-void rb_kcode_set_option _((VALUE));
-void rb_kcode_reset_option _((void));
-/* ruby.c */
-RUBY_EXTERN VALUE rb_argv;
-RUBY_EXTERN VALUE rb_argv0;
-void rb_load_file _((const char*));
-void ruby_script _((const char*));
-void ruby_prog_init _((void));
-void ruby_set_argv _((int, char**));
-void ruby_process_options _((int, char**));
-void ruby_load_script _((void));
-void ruby_init_loadpath _((void));
-void ruby_incpush _((const char*));
-/* signal.c */
-VALUE rb_f_kill _((int, VALUE*));
-void rb_gc_mark_trap_list _((void));
-#ifdef POSIX_SIGNAL
-#define posix_signal ruby_posix_signal
-void posix_signal _((int, RETSIGTYPE (*)(int)));
-#endif
-void rb_trap_exit _((void));
-void rb_trap_exec _((void));
-const char *ruby_signal_name _((int));
-void ruby_default_signal _((int));
-/* sprintf.c */
-VALUE rb_f_sprintf _((int, VALUE*));
-/* string.c */
-VALUE rb_str_new _((const char*, long));
-VALUE rb_str_new2 _((const char*));
-VALUE rb_str_new3 _((VALUE));
-VALUE rb_str_new4 _((VALUE));
-VALUE rb_str_new5 _((VALUE, const char*, long));
-VALUE rb_tainted_str_new _((const char*, long));
-VALUE rb_tainted_str_new2 _((const char*));
-VALUE rb_str_buf_new _((long));
-VALUE rb_str_buf_new2 _((const char*));
-VALUE rb_str_buf_append _((VALUE, VALUE));
-VALUE rb_str_buf_cat _((VALUE, const char*, long));
-VALUE rb_str_buf_cat2 _((VALUE, const char*));
-VALUE rb_obj_as_string _((VALUE));
-VALUE rb_check_string_type _((VALUE));
-VALUE rb_str_dup _((VALUE));
-VALUE rb_str_locktmp _((VALUE));
-VALUE rb_str_unlocktmp _((VALUE));
-VALUE rb_str_dup_frozen _((VALUE));
-VALUE rb_str_plus _((VALUE, VALUE));
-VALUE rb_str_times _((VALUE, VALUE));
-VALUE rb_str_substr _((VALUE, long, long));
-void rb_str_modify _((VALUE));
-VALUE rb_str_freeze _((VALUE));
-VALUE rb_str_resize _((VALUE, long));
-VALUE rb_str_cat _((VALUE, const char*, long));
-VALUE rb_str_cat2 _((VALUE, const char*));
-VALUE rb_str_append _((VALUE, VALUE));
-VALUE rb_str_concat _((VALUE, VALUE));
-int rb_str_hash _((VALUE));
-int rb_str_cmp _((VALUE, VALUE));
-VALUE rb_str_upto _((VALUE, VALUE, int));
-void rb_str_update _((VALUE, long, long, VALUE));
-VALUE rb_str_inspect _((VALUE));
-VALUE rb_str_dump _((VALUE));
-VALUE rb_str_split _((VALUE, const char*));
-void rb_str_associate _((VALUE, VALUE));
-VALUE rb_str_associated _((VALUE));
-void rb_str_setter _((VALUE, ID, VALUE*));
-VALUE rb_str_intern _((VALUE));
-/* struct.c */
-VALUE rb_struct_new __((VALUE, ...));
-VALUE rb_struct_define __((const char*, ...));
-VALUE rb_struct_alloc _((VALUE, VALUE));
-VALUE rb_struct_aref _((VALUE, VALUE));
-VALUE rb_struct_aset _((VALUE, VALUE, VALUE));
-VALUE rb_struct_getmember _((VALUE, ID));
-VALUE rb_struct_iv_get _((VALUE, char*));
-VALUE rb_struct_s_members _((VALUE));
-VALUE rb_struct_members _((VALUE));
-/* time.c */
-VALUE rb_time_new _((time_t, time_t));
-/* variable.c */
-VALUE rb_mod_name _((VALUE));
-VALUE rb_class_path _((VALUE));
-void rb_set_class_path _((VALUE, VALUE, const char*));
-VALUE rb_path2class _((const char*));
-void rb_name_class _((VALUE, ID));
-VALUE rb_class_name _((VALUE));
-void rb_autoload _((VALUE, ID, const char*));
-VALUE rb_autoload_load _((VALUE, ID));
-VALUE rb_autoload_p _((VALUE, ID));
-void rb_gc_mark_global_tbl _((void));
-VALUE rb_f_trace_var _((int, VALUE*));
-VALUE rb_f_untrace_var _((int, VALUE*));
-VALUE rb_f_global_variables _((void));
-void rb_alias_variable _((ID, ID));
-struct st_table* rb_generic_ivar_table _((VALUE));
-void rb_copy_generic_ivar _((VALUE,VALUE));
-void rb_mark_generic_ivar _((VALUE));
-void rb_mark_generic_ivar_tbl _((void));
-void rb_free_generic_ivar _((VALUE));
-VALUE rb_ivar_get _((VALUE, ID));
-VALUE rb_ivar_set _((VALUE, ID, VALUE));
-VALUE rb_ivar_defined _((VALUE, ID));
-VALUE rb_iv_set _((VALUE, const char*, VALUE));
-VALUE rb_iv_get _((VALUE, const char*));
-VALUE rb_attr_get _((VALUE, ID));
-VALUE rb_obj_instance_variables _((VALUE));
-VALUE rb_obj_remove_instance_variable _((VALUE, VALUE));
-void *rb_mod_const_at _((VALUE, void*));
-void *rb_mod_const_of _((VALUE, void*));
-VALUE rb_const_list _((void*));
-VALUE rb_mod_constants _((VALUE));
-VALUE rb_mod_remove_const _((VALUE, VALUE));
-int rb_const_defined _((VALUE, ID));
-int rb_const_defined_at _((VALUE, ID));
-int rb_const_defined_from _((VALUE, ID));
-VALUE rb_const_get _((VALUE, ID));
-VALUE rb_const_get_at _((VALUE, ID));
-VALUE rb_const_get_from _((VALUE, ID));
-void rb_const_set _((VALUE, ID, VALUE));
-VALUE rb_mod_constants _((VALUE));
-VALUE rb_mod_const_missing _((VALUE,VALUE));
-VALUE rb_cvar_defined _((VALUE, ID));
-#define RB_CVAR_SET_4ARGS 1
-void rb_cvar_set _((VALUE, ID, VALUE, int));
-VALUE rb_cvar_get _((VALUE, ID));
-void rb_cv_set _((VALUE, const char*, VALUE));
-VALUE rb_cv_get _((VALUE, const char*));
-void rb_define_class_variable _((VALUE, const char*, VALUE));
-VALUE rb_mod_class_variables _((VALUE));
-VALUE rb_mod_remove_cvar _((VALUE, VALUE));
-/* version.c */
-void ruby_show_version _((void));
-void ruby_show_copyright _((void));
diff --git a/io.c b/io.c
index 00514c86f8..065b165906 100644
--- a/io.c
+++ b/io.c
@@ -3,32 +3,38 @@
   io.c -
 
   $Author$
-  $Date$
   created at: Fri Oct 15 18:08:59 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#if defined(__VMS)
-#define _XOPEN_SOURCE
-#define _POSIX_C_SOURCE 2
-#endif
-
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
-#include "env.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "dln.h"
 #include <ctype.h>
 #include <errno.h>
 
-#if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__) || defined(__BEOS__)
+#define free(x) xfree(x)
+
+#if defined(DOSISH) || defined(__CYGWIN__)
+#include <io.h>
+#endif
+
+#include <sys/types.h>
+#if defined HAVE_NET_SOCKET_H
+# include <net/socket.h>
+#elif defined HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+
+#if defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__EMX__) || defined(__BEOS__) || defined(__HAIKU__)
 # define NO_SAFE_RENAME
 #endif
 
-#if defined(MSDOS) || defined(__CYGWIN__) || defined(_WIN32)
+#if defined(__CYGWIN__) || defined(_WIN32)
 # define NO_LONG_FNAME
 #endif
 
@@ -41,7 +47,7 @@
 #endif
 
 #include <sys/types.h>
-#if defined(HAVE_SYS_IOCTL_H) && !defined(DJGPP) && !defined(_WIN32) && !defined(__human68k__)
+#if defined(HAVE_SYS_IOCTL_H) && !defined(_WIN32)
 #include <sys/ioctl.h>
 #endif
 #if defined(HAVE_FCNTL_H) || defined(_WIN32)
@@ -53,12 +59,6 @@
 #if !HAVE_OFF_T && !defined(off_t)
 # define off_t  long
 #endif
-#if !HAVE_FSEEKO && !defined(fseeko)
-# define fseeko  fseek
-#endif
-#if !HAVE_FTELLO && !defined(ftello)
-# define ftello  ftell
-#endif
 
 #include <sys/stat.h>
 
@@ -72,25 +72,24 @@
 #endif
 
 #ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifdef HAVE_SYSCALL_H
 #include <syscall.h>
 #elif defined HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
 
-#include <unistd.h>
-#endif
-
-extern void Init_File _((void));
+extern void Init_File(void);
 
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__HAIKU__)
 # ifndef NOFILE
 #  define NOFILE (OPEN_MAX)
 # endif
-#include <net/socket.h>
 #endif
 
-#include "util.h"
+#include "ruby/util.h"
 
 #ifndef O_ACCMODE
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
@@ -108,9 +107,24 @@ extern void Init_File _((void));
 # endif
 #endif
 
+#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+
+#define IO_RBUF_CAPA_MIN  8192
+#define IO_CBUF_CAPA_MIN  (128*1024)
+#define IO_RBUF_CAPA_FOR(fptr) (NEED_READCONV(fptr) ? IO_CBUF_CAPA_MIN : IO_RBUF_CAPA_MIN)
+#define IO_WBUF_CAPA_MIN  8192
+
+/* define system APIs */
+#ifdef _WIN32
+#undef open
+#define open	rb_w32_uopen
+#endif
+
 VALUE rb_cIO;
 VALUE rb_eEOFError;
 VALUE rb_eIOError;
+VALUE rb_mWaitReadable;
+VALUE rb_mWaitWritable;
 
 VALUE rb_stdin, rb_stdout, rb_stderr;
 VALUE rb_deferr;		/* rescue VIM plugin */
@@ -123,103 +137,138 @@ VALUE rb_default_rs;
 
 static VALUE argf;
 
-static ID id_write, id_read, id_getc;
-
-extern char *ruby_inplace_mode;
+static ID id_write, id_read, id_getc, id_flush, id_readpartial, id_set_encoding;
+static VALUE sym_mode, sym_perm, sym_extenc, sym_intenc, sym_encoding, sym_open_args;
+static VALUE sym_textmode, sym_binmode, sym_autoclose;
+
+struct timeval rb_time_interval(VALUE);
+
+struct argf {
+    VALUE filename, current_file;
+    int last_lineno;		/* $. */
+    int lineno;
+    int init_p, next_p;
+    VALUE argv;
+    char *inplace;
+    int binmode;
+    struct rb_io_enc_t encs;
+};
 
-struct timeval rb_time_interval _((VALUE));
+static int max_file_descriptor = NOFILE;
+#define UPDATE_MAXFD(fd) \
+    do { \
+        if (max_file_descriptor < (fd)) max_file_descriptor = (fd); \
+    } while (0)
 
-static VALUE filename, current_file;
-static int gets_lineno;
-static int init_p = 0, next_p = 0;
-static VALUE lineno = INT2FIX(0);
+#define argf_of(obj) (*(struct argf *)DATA_PTR(obj))
+#define ARGF argf_of(argf)
 
 #ifdef _STDIO_USES_IOSTREAM  /* GNU libc */
 #  ifdef _IO_fpos_t
-#    define READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
-#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_IO_read_end - (fp)->_IO_read_ptr)
-#    define READ_DATA_PENDING_PTR(fp) ((fp)->_IO_read_ptr)
+#    define STDIO_READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
 #  else
-#    define READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
-#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_egptr - (fp)->_gptr)
-#    define READ_DATA_PENDING_PTR(fp) ((fp)->_gptr)
+#    define STDIO_READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
 #  endif
-#elif defined(_LP64) && (defined(__sun__) || defined(__sun))
-typedef struct _FILE64 {
-  unsigned char        *_ptr;  /* next character from/to here in buffer */
-  unsigned char        *_base; /* the buffer */
-  unsigned char        *_end;  /* the end of the buffer */
-  ssize_t      _cnt;   /* number of available characters in buffer */
-  int          _file;  /* UNIX System file descriptor */
-  unsigned int _flag;  /* the state of the stream */
-  char         __fill[80];     /* filler to bring size to 128 bytes */
-} FILE64;
-#  define READ_DATA_PENDING(fp) (((FILE64*)(fp))->_cnt > 0)
-#  define READ_DATA_PENDING_COUNT(fp) (((FILE64*)(fp))->_cnt)
-#  define READ_DATA_PENDING_PTR(fp) ((char *)((FILE64*)(fp))->_ptr)
 #elif defined(FILE_COUNT)
-#  define READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
-#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_COUNT)
+#  define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
 #elif defined(FILE_READEND)
-#  define READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
-#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_READEND - (fp)->FILE_READPTR)
-#elif defined(__BEOS__)
-#  define READ_DATA_PENDING(fp) (fp->_state._eof == 0)
-#elif defined(__VMS)
-#  define READ_DATA_PENDING_COUNT(fp) ((unsigned int)(*(fp))->_cnt)
-#  define READ_DATA_PENDING(fp)       (((unsigned int)(*(fp))->_cnt) > 0)
-#  define READ_DATA_BUFFERED(fp) 0
-#elif defined(__DragonFly__)
-/* FILE is an incomplete struct type since DragonFly BSD 1.4.0 */
-#  define READ_DATA_PENDING(fp) (((struct __FILE_public *)(fp))->_r > 0)
-#  define READ_DATA_PENDING_COUNT(fp) (((struct __FILE_public *)(fp))->_r)
+#  define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
+#elif defined(__BEOS__) || defined(__HAIKU__)
+#  define STDIO_READ_DATA_PENDING(fp) (fp->_state._eof == 0)
 #else
-/* requires systems own version of the ReadDataPending() */
-extern int ReadDataPending();
-#  define READ_DATA_PENDING(fp) (!feof(fp))
-#  define READ_DATA_BUFFERED(fp) 0
-#endif
-#ifndef READ_DATA_BUFFERED
-#  define READ_DATA_BUFFERED(fp) READ_DATA_PENDING(fp)
+#  define STDIO_READ_DATA_PENDING(fp) (!feof(fp))
 #endif
 
-#ifndef READ_DATA_PENDING_PTR
-# ifdef FILE_READPTR
-#  define READ_DATA_PENDING_PTR(fp) ((char *)(fp)->FILE_READPTR)
-# endif
-#endif
+#define GetWriteIO(io) rb_io_get_write_io(io)
 
-#if defined __DJGPP__
-# undef READ_DATA_PENDING_COUNT
-# undef READ_DATA_PENDING_PTR
+#define READ_DATA_PENDING(fptr) ((fptr)->rbuf_len)
+#define READ_DATA_PENDING_COUNT(fptr) ((fptr)->rbuf_len)
+#define READ_DATA_PENDING_PTR(fptr) ((fptr)->rbuf+(fptr)->rbuf_off)
+#define READ_DATA_BUFFERED(fptr) READ_DATA_PENDING(fptr)
+
+#define READ_CHAR_PENDING(fptr) ((fptr)->cbuf_len)
+#define READ_CHAR_PENDING_COUNT(fptr) ((fptr)->cbuf_len)
+#define READ_CHAR_PENDING_PTR(fptr) ((fptr)->cbuf+(fptr)->cbuf_off)
+
+#if defined(_WIN32)
+#define WAIT_FD_IN_WIN32(fptr) \
+    (rb_w32_has_cancel_io() ? 0 : rb_thread_wait_fd((fptr)->fd))
+#else
+#define WAIT_FD_IN_WIN32(fptr)
 #endif
 
-#define READ_CHECK(fp) do {\
-    if (!READ_DATA_PENDING(fp)) {\
-	rb_thread_wait_fd(fileno(fp));\
-        rb_io_check_closed(fptr);\
+#define READ_CHECK(fptr) do {\
+    if (!READ_DATA_PENDING(fptr)) {\
+	WAIT_FD_IN_WIN32(fptr);\
+	rb_io_check_closed(fptr);\
      }\
 } while(0)
 
+#ifndef S_ISSOCK
+#  ifdef _S_ISSOCK
+#    define S_ISSOCK(m) _S_ISSOCK(m)
+#  else
+#    ifdef _S_IFSOCK
+#      define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
+#    else
+#      ifdef S_IFSOCK
+#	 define S_ISSOCK(m) ((m & S_IFMT) == S_IFSOCK)
+#      endif
+#    endif
+#  endif
+#endif
+
+#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
+/* Windows */
+# define NEED_NEWLINE_DECORATOR_ON_READ(fptr) (!(fptr->mode & FMODE_BINMODE))
+# define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) (!(fptr->mode & FMODE_BINMODE))
+# define TEXTMODE_NEWLINE_DECORATOR_ON_WRITE ECONV_CRLF_NEWLINE_DECORATOR
+#else
+/* Unix */
+# define NEED_NEWLINE_DECORATOR_ON_READ(fptr) (fptr->mode & FMODE_TEXTMODE)
+# define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) 0
+#endif
+#define NEED_READCONV(fptr) (fptr->encs.enc2 != NULL || NEED_NEWLINE_DECORATOR_ON_READ(fptr))
+#define NEED_WRITECONV(fptr) ((fptr->encs.enc != NULL && fptr->encs.enc != rb_ascii8bit_encoding()) || NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) || (fptr->encs.ecflags & (ECONV_DECORATOR_MASK|ECONV_STATEFUL_DECORATOR_MASK)))
+
+#if !defined HAVE_SHUTDOWN && !defined shutdown
+#define shutdown(a,b)	0
+#endif
+
+#define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
+
+#if defined(_WIN32)
+#define is_socket(fd, path)	rb_w32_is_socket(fd)
+#elif !defined(S_ISSOCK)
+#define is_socket(fd, path)	0
+#else
+static int
+is_socket(int fd, VALUE path)
+{
+    struct stat sbuf;
+    if (fstat(fd, &sbuf) < 0)
+        rb_sys_fail_path(path);
+    return S_ISSOCK(sbuf.st_mode);
+}
+#endif
+
 void
-rb_eof_error()
+rb_eof_error(void)
 {
     rb_raise(rb_eEOFError, "end of file reached");
 }
 
 VALUE
-rb_io_taint_check(io)
-    VALUE io;
+rb_io_taint_check(VALUE io)
 {
-    if (!OBJ_TAINTED(io) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
+    if (!OBJ_UNTRUSTED(io) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: operation on trusted IO");
     rb_check_frozen(io);
     return io;
 }
 
 void
-rb_io_check_initialized(fptr)
-    OpenFile *fptr;
+rb_io_check_initialized(rb_io_t *fptr)
 {
     if (!fptr) {
 	rb_raise(rb_eIOError, "uninitialized stream");
@@ -227,30 +276,130 @@ rb_io_check_initialized(fptr)
 }
 
 void
-rb_io_check_closed(fptr)
-    OpenFile *fptr;
+rb_io_check_closed(rb_io_t *fptr)
 {
     rb_io_check_initialized(fptr);
-    if (!fptr->f && !fptr->f2) {
+    if (fptr->fd < 0) {
 	rb_raise(rb_eIOError, "closed stream");
     }
 }
 
-static void io_fflush _((FILE *, OpenFile *));
+static int io_fflush(rb_io_t *);
 
-static OpenFile *
-flush_before_seek(fptr)
-    OpenFile *fptr;
+VALUE
+rb_io_get_io(VALUE io)
+{
+    return rb_convert_type(io, T_FILE, "IO", "to_io");
+}
+
+static VALUE
+rb_io_check_io(VALUE io)
 {
-    if (fptr->mode & FMODE_WBUF) {
-	io_fflush(GetWriteFile(fptr), fptr);
+    return rb_check_convert_type(io, T_FILE, "IO", "to_io");
+}
+
+VALUE
+rb_io_get_write_io(VALUE io)
+{
+    VALUE write_io;
+    rb_io_check_initialized(RFILE(io)->fptr);
+    write_io = RFILE(io)->fptr->tied_io_for_writing;
+    if (write_io) {
+        return write_io;
     }
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     IO.try_convert(obj)  ->  io or nil
+ *
+ *  Try to convert <i>obj</i> into an IO, using to_io method.
+ *  Returns converted IO or nil if <i>obj</i> cannot be converted
+ *  for any reason.
+ *
+ *     IO.try_convert(STDOUT)     #=> STDOUT
+ *     IO.try_convert("STDOUT")   #=> nil
+ *
+ *     require 'zlib'
+ *     f = open("/tmp/zz.gz")       #=> #<File:/tmp/zz.gz>
+ *     z = Zlib::GzipReader.open(f) #=> #<Zlib::GzipReader:0x81d8744>
+ *     IO.try_convert(z)            #=> #<File:/tmp/zz.gz>
+ *
+ */
+static VALUE
+rb_io_s_try_convert(VALUE dummy, VALUE io)
+{
+    return rb_io_check_io(io);
+}
+
+static void
+io_unread(rb_io_t *fptr)
+{
+    off_t r;
+    rb_io_check_closed(fptr);
+    if (fptr->rbuf_len == 0 || fptr->mode & FMODE_DUPLEX)
+        return;
+    /* xxx: target position may be negative if buffer is filled by ungetc */
+    errno = 0;
+    r = lseek(fptr->fd, -fptr->rbuf_len, SEEK_CUR);
+    if (r < 0 && errno) {
+        if (errno == ESPIPE)
+            fptr->mode |= FMODE_DUPLEX;
+        return;
+    }
+    fptr->rbuf_off = 0;
+    fptr->rbuf_len = 0;
+    return;
+}
+
+static rb_encoding *io_input_encoding(rb_io_t *fptr);
+
+static void
+io_ungetbyte(VALUE str, rb_io_t *fptr)
+{
+    long len = RSTRING_LEN(str);
+
+    if (fptr->rbuf == NULL) {
+        const int min_capa = IO_RBUF_CAPA_FOR(fptr);
+        fptr->rbuf_off = 0;
+        fptr->rbuf_len = 0;
+#if SIZEOF_LONG > SIZEOF_INT
+	if (len > INT_MAX)
+	    rb_raise(rb_eIOError, "ungetbyte failed");
+#endif
+	if (len > min_capa)
+	    fptr->rbuf_capa = (int)len;
+	else
+	    fptr->rbuf_capa = min_capa;
+        fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
+    }
+    if (fptr->rbuf_capa < len + fptr->rbuf_len) {
+	rb_raise(rb_eIOError, "ungetbyte failed");
+    }
+    if (fptr->rbuf_off < len) {
+        MEMMOVE(fptr->rbuf+fptr->rbuf_capa-fptr->rbuf_len,
+                fptr->rbuf+fptr->rbuf_off,
+                char, fptr->rbuf_len);
+        fptr->rbuf_off = fptr->rbuf_capa-fptr->rbuf_len;
+    }
+    fptr->rbuf_off-=(int)len;
+    fptr->rbuf_len+=(int)len;
+    MEMMOVE(fptr->rbuf+fptr->rbuf_off, RSTRING_PTR(str), char, len);
+}
+
+static rb_io_t *
+flush_before_seek(rb_io_t *fptr)
+{
+    if (io_fflush(fptr) < 0)
+        rb_sys_fail(0);
+    io_unread(fptr);
     errno = 0;
     return fptr;
 }
 
-#define io_seek(fptr, ofs, whence) fseeko(flush_before_seek(fptr)->f, ofs, whence)
-#define io_tell(fptr) ftello(flush_before_seek(fptr)->f)
+#define io_seek(fptr, ofs, whence) (errno = 0, lseek(flush_before_seek(fptr)->fd, ofs, whence))
+#define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR)
 
 #ifndef SEEK_CUR
 # define SEEK_SET 0
@@ -261,59 +410,97 @@ flush_before_seek(fptr)
 #define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
 
 void
-rb_io_check_readable(fptr)
-    OpenFile *fptr;
+rb_io_check_char_readable(rb_io_t *fptr)
 {
     rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_READABLE)) {
 	rb_raise(rb_eIOError, "not opened for reading");
     }
-#ifdef NEED_IO_SEEK_BETWEEN_RW
-    if (((fptr->mode & FMODE_WBUF) ||
-	 (fptr->mode & (FMODE_SYNCWRITE|FMODE_RBUF)) == FMODE_SYNCWRITE) &&
-	!feof(fptr->f) &&
-	!fptr->f2) {
-	io_seek(fptr, 0, SEEK_CUR);
+    if (fptr->wbuf_len) {
+        if (io_fflush(fptr) < 0)
+            rb_sys_fail(0);
+    }
+    if (fptr->tied_io_for_writing) {
+	rb_io_t *wfptr;
+	GetOpenFile(fptr->tied_io_for_writing, wfptr);
+        if (io_fflush(wfptr) < 0)
+            rb_sys_fail(0);
     }
-#endif
-    fptr->mode |= FMODE_RBUF;
 }
 
 void
-rb_io_check_writable(fptr)
-    OpenFile *fptr;
+rb_io_check_byte_readable(rb_io_t *fptr)
+{
+    rb_io_check_char_readable(fptr);
+    if (READ_CHAR_PENDING(fptr)) {
+	rb_raise(rb_eIOError, "byte oriented read for character buffered IO");
+    }
+}
+
+void
+rb_io_check_readable(rb_io_t *fptr)
+{
+    rb_io_check_byte_readable(fptr);
+}
+
+static rb_encoding*
+io_read_encoding(rb_io_t *fptr)
+{
+    if (fptr->encs.enc) {
+	return fptr->encs.enc;
+    }
+    return rb_default_external_encoding();
+}
+
+static rb_encoding*
+io_input_encoding(rb_io_t *fptr)
+{
+    if (fptr->encs.enc2) {
+	return fptr->encs.enc2;
+    }
+    return io_read_encoding(fptr);
+}
+
+void
+rb_io_check_writable(rb_io_t *fptr)
 {
     rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
-    if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2) {
-	io_seek(fptr, 0, SEEK_CUR);
-    }
-    if (!fptr->f2) {
-	fptr->mode &= ~FMODE_RBUF;
+    if (fptr->rbuf_len) {
+        io_unread(fptr);
     }
 }
 
 int
-rb_read_pending(fp)
-    FILE *fp;
+rb_io_read_pending(rb_io_t *fptr)
 {
-    return READ_DATA_PENDING(fp);
+    /* This function is used for bytes and chars.  Confusing. */
+    if (READ_CHAR_PENDING(fptr))
+        return 1; /* should raise? */
+    return READ_DATA_PENDING(fptr);
 }
 
 void
-rb_read_check(fp)
-    FILE *fp;
+rb_read_check(FILE *fp)
 {
-    if (!READ_DATA_PENDING(fp)) {
+    if (!STDIO_READ_DATA_PENDING(fp)) {
 	rb_thread_wait_fd(fileno(fp));
     }
 }
 
+void
+rb_io_read_check(rb_io_t *fptr)
+{
+    if (!READ_DATA_PENDING(fptr)) {
+	rb_thread_wait_fd(fptr->fd);
+    }
+    return;
+}
+
 static int
-ruby_dup(orig)
-    int orig;
+ruby_dup(int orig)
 {
     int fd;
 
@@ -327,13 +514,12 @@ ruby_dup(orig)
 	    rb_sys_fail(0);
 	}
     }
+    UPDATE_MAXFD(fd);
     return fd;
 }
 
-static VALUE io_alloc _((VALUE));
 static VALUE
-io_alloc(klass)
-    VALUE klass;
+io_alloc(VALUE klass)
 {
     NEWOBJ(io, struct RFile);
     OBJSETUP(io, klass, T_FILE);
@@ -343,273 +529,496 @@ io_alloc(klass)
     return (VALUE)io;
 }
 
-static void
-io_fflush(f, fptr)
-    FILE *f;
-    OpenFile *fptr;
+#ifndef S_ISREG
+#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
+#endif
+
+static int
+wsplit_p(rb_io_t *fptr)
 {
-    int n;
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+    int r;
+#endif
 
-    if (!rb_thread_fd_writable(fileno(f))) {
+    if (!(fptr->mode & FMODE_WSPLIT_INITIALIZED)) {
+        struct stat buf;
+        if (fstat(fptr->fd, &buf) == 0 &&
+            !S_ISREG(buf.st_mode)
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+            && (r = fcntl(fptr->fd, F_GETFL)) != -1 &&
+            !(r & O_NONBLOCK)
+#endif
+            ) {
+            fptr->mode |= FMODE_WSPLIT;
+        }
+        fptr->mode |= FMODE_WSPLIT_INITIALIZED;
+    }
+    return fptr->mode & FMODE_WSPLIT;
+}
+
+struct io_internal_struct {
+    int fd;
+    void *buf;
+    size_t capa;
+};
+
+static VALUE
+internal_read_func(void *ptr)
+{
+    struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
+    return read(iis->fd, iis->buf, iis->capa);
+}
+
+static VALUE
+internal_write_func(void *ptr)
+{
+    struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
+    return write(iis->fd, iis->buf, iis->capa);
+}
+
+static ssize_t
+rb_read_internal(int fd, void *buf, size_t count)
+{
+    struct io_internal_struct iis;
+    iis.fd = fd;
+    iis.buf = buf;
+    iis.capa = count;
+
+    return (ssize_t)rb_thread_blocking_region(internal_read_func, &iis, RUBY_UBF_IO, 0);
+}
+
+static ssize_t
+rb_write_internal(int fd, void *buf, size_t count)
+{
+    struct io_internal_struct iis;
+    iis.fd = fd;
+    iis.buf = buf;
+    iis.capa = count;
+
+    return (ssize_t)rb_thread_blocking_region(internal_write_func, &iis, RUBY_UBF_IO, 0);
+}
+
+static long
+io_writable_length(rb_io_t *fptr, long l)
+{
+    if (PIPE_BUF < l &&
+        !rb_thread_alone() &&
+        wsplit_p(fptr)) {
+        l = PIPE_BUF;
+    }
+    return l;
+}
+
+static VALUE
+io_flush_buffer_sync(void *arg)
+{
+    rb_io_t *fptr = arg;
+    long l = io_writable_length(fptr, fptr->wbuf_len);
+    ssize_t r = write(fptr->fd, fptr->wbuf+fptr->wbuf_off, (size_t)l);
+
+    if (fptr->wbuf_len <= r) {
+	fptr->wbuf_off = 0;
+	fptr->wbuf_len = 0;
+	return 0;
+    }
+    if (0 <= r) {
+	fptr->wbuf_off += (int)r;
+	fptr->wbuf_len -= (int)r;
+	errno = EAGAIN;
+    }
+    return (VALUE)-1;
+}
+
+static VALUE
+io_flush_buffer_async(VALUE arg)
+{
+    return rb_thread_blocking_region(io_flush_buffer_sync, (void *)arg, RUBY_UBF_IO, 0);
+}
+
+static inline int
+io_flush_buffer(rb_io_t *fptr)
+{
+    if (fptr->write_lock) {
+	return (int)rb_mutex_synchronize(fptr->write_lock, io_flush_buffer_async, (VALUE)fptr);
+    }
+    else {
+	return (int)io_flush_buffer_async((VALUE)fptr);
+    }
+}
+
+static int
+io_fflush(rb_io_t *fptr)
+{
+    rb_io_check_closed(fptr);
+    if (fptr->wbuf_len == 0)
+        return 0;
+    if (!rb_thread_fd_writable(fptr->fd)) {
         rb_io_check_closed(fptr);
     }
-    for (;;) {
-	TRAP_BEG;
-	n = fflush(f);
-	TRAP_END;
-	if (n != EOF) break;
-	if (!rb_io_wait_writable(fileno(f)))
-	    rb_sys_fail(fptr->path);
+    while (fptr->wbuf_len > 0 && io_flush_buffer(fptr) != 0) {
+	if (!rb_io_wait_writable(fptr->fd))
+	    return -1;
+        rb_io_check_closed(fptr);
     }
-    fptr->mode &= ~FMODE_WBUF;
+    return 0;
+}
+
+#ifdef HAVE_RB_FD_INIT
+static VALUE
+wait_readable(VALUE p)
+{
+    rb_fdset_t *rfds = (rb_fdset_t *)p;
+
+    return rb_thread_select(rb_fd_max(rfds), rb_fd_ptr(rfds), NULL, NULL, NULL);
 }
+#endif
 
 int
-rb_io_wait_readable(f)
-    int f;
+rb_io_wait_readable(int f)
 {
-    fd_set rfds;
+    rb_fdset_t rfds;
 
+    if (f < 0) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
       case ERESTART:
 #endif
 	rb_thread_wait_fd(f);
-	return Qtrue;
+	return TRUE;
 
       case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
       case EWOULDBLOCK:
 #endif
-	FD_ZERO(&rfds);
-	FD_SET(f, &rfds);
-	rb_thread_select(f + 1, &rfds, NULL, NULL, NULL);
-	return Qtrue;
+	rb_fd_init(&rfds);
+	rb_fd_set(f, &rfds);
+#ifdef HAVE_RB_FD_INIT
+	rb_ensure(wait_readable, (VALUE)&rfds,
+		  (VALUE (*)(VALUE))rb_fd_term, (VALUE)&rfds);
+#else
+	rb_thread_select(f + 1, rb_fd_ptr(&rfds), NULL, NULL, NULL);
+#endif
+	return TRUE;
 
       default:
-	return Qfalse;
+	return FALSE;
     }
 }
 
+#ifdef HAVE_RB_FD_INIT
+static VALUE
+wait_writable(VALUE p)
+{
+    rb_fdset_t *wfds = (rb_fdset_t *)p;
+
+    return rb_thread_select(rb_fd_max(wfds), NULL, rb_fd_ptr(wfds), NULL, NULL);
+}
+#endif
+
 int
-rb_io_wait_writable(f)
-    int f;
+rb_io_wait_writable(int f)
 {
-    fd_set wfds;
+    rb_fdset_t wfds;
 
+    if (f < 0) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
       case ERESTART:
 #endif
 	rb_thread_fd_writable(f);
-	return Qtrue;
+	return TRUE;
 
       case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
       case EWOULDBLOCK:
 #endif
-	FD_ZERO(&wfds);
-	FD_SET(f, &wfds);
-	rb_thread_select(f + 1, NULL, &wfds, NULL, NULL);
-	return Qtrue;
+	rb_fd_init(&wfds);
+	rb_fd_set(f, &wfds);
+#ifdef HAVE_RB_FD_INIT
+	rb_ensure(wait_writable, (VALUE)&wfds,
+		  (VALUE (*)(VALUE))rb_fd_term, (VALUE)&wfds);
+#else
+	rb_thread_select(f + 1, NULL, rb_fd_ptr(&wfds), NULL, NULL);
+#endif
+	return TRUE;
 
       default:
-	return Qfalse;
+	return FALSE;
     }
 }
 
-#ifndef S_ISREG
-#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
-#endif
-
-static int
-wsplit_p(OpenFile *fptr)
+static void
+make_writeconv(rb_io_t *fptr)
 {
-    FILE *f = GetWriteFile(fptr);
-    int r;
-    if (!(fptr->mode & FMODE_WSPLIT_INITIALIZED)) {
-        struct stat buf;
-        if (fstat(fileno(f), &buf) == 0 &&
-            !S_ISREG(buf.st_mode)
-#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
-            && (r = fcntl(fileno(f), F_GETFL)) != -1 &&
-            !(r & O_NONBLOCK)
+    if (!fptr->writeconv_initialized) {
+        const char *senc, *denc;
+        rb_encoding *enc;
+        int ecflags;
+        VALUE ecopts;
+
+        fptr->writeconv_initialized = 1;
+
+        ecflags = fptr->encs.ecflags;
+        ecopts = fptr->encs.ecopts;
+#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
+        if (NEED_NEWLINE_DECORATOR_ON_WRITE(fptr))
+            ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE;
 #endif
-            ) {
-            fptr->mode |= FMODE_WSPLIT;
+
+        if (!fptr->encs.enc || (fptr->encs.enc == rb_ascii8bit_encoding() && !fptr->encs.enc2)) {
+            /* no encoding conversion */
+            fptr->writeconv_pre_ecflags = 0;
+            fptr->writeconv_pre_ecopts = Qnil;
+            fptr->writeconv = rb_econv_open_opts("", "", ecflags, ecopts);
+            if (!fptr->writeconv)
+                rb_exc_raise(rb_econv_open_exc("", "", ecflags));
+            fptr->writeconv_asciicompat = Qnil;
+        }
+        else {
+            enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc;
+            senc = rb_econv_asciicompat_encoding(rb_enc_name(enc));
+            if (!senc && !(fptr->encs.ecflags & ECONV_STATEFUL_DECORATOR_MASK)) {
+                /* single conversion */
+                fptr->writeconv_pre_ecflags = ecflags;
+                fptr->writeconv_pre_ecopts = ecopts;
+                fptr->writeconv = NULL;
+                fptr->writeconv_asciicompat = Qnil;
+            }
+            else {
+                /* double conversion */
+                fptr->writeconv_pre_ecflags = ecflags & ~ECONV_STATEFUL_DECORATOR_MASK;
+                fptr->writeconv_pre_ecopts = ecopts;
+                if (senc) {
+                    denc = rb_enc_name(enc);
+                    fptr->writeconv_asciicompat = rb_str_new2(senc);
+                }
+                else {
+                    senc = denc = "";
+                    fptr->writeconv_asciicompat = rb_str_new2(rb_enc_name(enc));
+                }
+                ecflags = fptr->encs.ecflags & (ECONV_ERROR_HANDLER_MASK|ECONV_STATEFUL_DECORATOR_MASK);
+                ecopts = fptr->encs.ecopts;
+                fptr->writeconv = rb_econv_open_opts(senc, denc, ecflags, ecopts);
+                if (!fptr->writeconv)
+                    rb_exc_raise(rb_econv_open_exc(senc, denc, ecflags));
+            }
         }
-        fptr->mode |= FMODE_WSPLIT_INITIALIZED;
     }
-    return fptr->mode & FMODE_WSPLIT;
 }
 
 /* writing functions */
-static long
-io_fwrite(str, fptr)
+struct binwrite_arg {
+    rb_io_t *fptr;
     VALUE str;
-    OpenFile *fptr;
+    long offset;
+    long length;
+};
+
+static VALUE
+io_binwrite_string(VALUE arg)
 {
-    long len, n, r, l, offset = 0;
-    FILE *f = GetWriteFile(fptr);
+    struct binwrite_arg *p = (struct binwrite_arg *)arg;
+    long l = io_writable_length(p->fptr, p->length);
+    return rb_write_internal(p->fptr->fd, RSTRING_PTR(p->str)+p->offset, l);
+}
 
-    len = RSTRING(str)->len;
+static long
+io_binwrite(VALUE str, rb_io_t *fptr, int nosync)
+{
+    long len, n, r, offset = 0;
+
+    len = RSTRING_LEN(str);
     if ((n = len) <= 0) return n;
-    if (fptr->mode & FMODE_SYNC) {
-	io_fflush(f, fptr);
-	if (!rb_thread_fd_writable(fileno(f))) {
+    if (fptr->wbuf == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) {
+        fptr->wbuf_off = 0;
+        fptr->wbuf_len = 0;
+        fptr->wbuf_capa = IO_WBUF_CAPA_MIN;
+        fptr->wbuf = ALLOC_N(char, fptr->wbuf_capa);
+	fptr->write_lock = rb_mutex_new();
+    }
+    if ((!nosync && (fptr->mode & (FMODE_SYNC|FMODE_TTY))) ||
+        (fptr->wbuf && fptr->wbuf_capa <= fptr->wbuf_len + len)) {
+	struct binwrite_arg arg;
+
+        /* xxx: use writev to avoid double write if available */
+        if (fptr->wbuf_len && fptr->wbuf_len+len <= fptr->wbuf_capa) {
+            if (fptr->wbuf_capa < fptr->wbuf_off+fptr->wbuf_len+len) {
+                MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len);
+                fptr->wbuf_off = 0;
+            }
+            MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len);
+            fptr->wbuf_len += (int)len;
+            n = 0;
+        }
+        if (io_fflush(fptr) < 0)
+            return -1L;
+        if (n == 0)
+            return len;
+        /* avoid context switch between "a" and "\n" in STDERR.puts "a".
+           [ruby-dev:25080] */
+	if (fptr->stdio_file != stderr && !rb_thread_fd_writable(fptr->fd)) {
 	    rb_io_check_closed(fptr);
 	}
+	arg.fptr = fptr;
+	arg.str = str;
       retry:
-        l = n;
-        if (PIPE_BUF < l &&
-            !rb_thread_critical &&
-            !rb_thread_alone() &&
-            wsplit_p(fptr)) {
-            l = PIPE_BUF;
-        }
-        TRAP_BEG;
-	r = write(fileno(f), RSTRING(str)->ptr+offset, l);
-        TRAP_END;
+	arg.offset = offset;
+	arg.length = n;
+	if (fptr->write_lock) {
+	    r = rb_mutex_synchronize(fptr->write_lock, io_binwrite_string, (VALUE)&arg);
+	}
+	else {
+	    long l = io_writable_length(fptr, n);
+	    r = rb_write_internal(fptr->fd, RSTRING_PTR(str)+offset, l);
+	}
+	/* xxx: other threads may modify given string. */
         if (r == n) return len;
         if (0 <= r) {
             offset += r;
             n -= r;
             errno = EAGAIN;
         }
-        if (rb_io_wait_writable(fileno(f))) {
+        if (rb_io_wait_writable(fptr->fd)) {
             rb_io_check_closed(fptr);
-	    if (offset < RSTRING(str)->len)
+	    if (offset < RSTRING_LEN(str))
 		goto retry;
         }
         return -1L;
     }
-#if defined(__human68k__) || defined(__vms)
-    do {
-	if (fputc(RSTRING(str)->ptr[offset++], f) == EOF) {
-	    if (ferror(f)) return -1L;
-	    break;
-	}
-    } while (--n > 0);
-#else
-    while (errno = 0, offset += (r = fwrite(RSTRING(str)->ptr+offset, 1, n, f)), (n -= r) > 0) {
-	if (ferror(f)
-#if defined __BORLANDC__
-	    || errno
-#endif
-	) {
-#ifdef __hpux
-	    if (!errno) errno = EAGAIN;
-#elif defined(_WIN32) && !defined(__BORLANDC__)
-	    /* workaround for MSVCRT's bug */
-	    if (!errno) {
-		if (GetLastError() == ERROR_NO_DATA)
-		    errno = EPIPE;
-		else
-		    errno = EBADF;
-	    }
-#endif
-	    if (rb_io_wait_writable(fileno(f))) {
-		rb_io_check_closed(fptr);
-		clearerr(f);
-		if (offset < RSTRING(str)->len)
-		    continue;
-	    }
-	    return -1L;
-	}
+
+    if (fptr->wbuf_off) {
+        if (fptr->wbuf_len)
+            MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len);
+        fptr->wbuf_off = 0;
     }
-#endif
-    return len - n;
+    MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len);
+    fptr->wbuf_len += (int)len;
+    return len;
 }
 
-long
-rb_io_fwrite(ptr, len, f)
-    const char *ptr;
-    long len;
-    FILE *f;
+static VALUE
+do_writeconv(VALUE str, rb_io_t *fptr)
 {
-    OpenFile of;
+    if (NEED_WRITECONV(fptr)) {
+        VALUE common_encoding = Qnil;
 
-    of.f = f;
-    of.f2 = NULL;
-    of.mode = FMODE_WRITABLE;
-    of.path = NULL;
-    return io_fwrite(rb_str_new(ptr, len), &of);
+        make_writeconv(fptr);
+
+        if (fptr->writeconv) {
+            if (!NIL_P(fptr->writeconv_asciicompat))
+                common_encoding = fptr->writeconv_asciicompat;
+            else if (!rb_enc_asciicompat(rb_enc_get(str))) {
+                rb_raise(rb_eArgError, "ASCII incompatible string written for text mode IO without encoding conversion: %s",
+                         rb_enc_name(rb_enc_get(str)));
+            }
+        }
+        else {
+            if (fptr->encs.enc2)
+                common_encoding = rb_enc_from_encoding(fptr->encs.enc2);
+            else if (fptr->encs.enc != rb_ascii8bit_encoding())
+                common_encoding = rb_enc_from_encoding(fptr->encs.enc);
+        }
+
+        if (!NIL_P(common_encoding)) {
+            str = rb_str_encode(str, common_encoding,
+                fptr->writeconv_pre_ecflags, fptr->writeconv_pre_ecopts);
+        }
+
+        if (fptr->writeconv) {
+            str = rb_econv_str_convert(fptr->writeconv, str, ECONV_PARTIAL_INPUT);
+        }
+    }
+    return str;
 }
 
-/*
- *  call-seq:
- *     ios.write(string)    => integer
- *  
- *  Writes the given string to <em>ios</em>. The stream must be opened
- *  for writing. If the argument is not a string, it will be converted
- *  to a string using <code>to_s</code>. Returns the number of bytes
- *  written.
- *     
- *     count = $stdout.write( "This is a test\n" )
- *     puts "That was #{count} bytes of data"
- *     
- *  <em>produces:</em>
- *     
- *     This is a test
- *     That was 15 bytes of data
- */
+static long
+io_fwrite(VALUE str, rb_io_t *fptr, int nosync)
+{
+    str = do_writeconv(str, fptr);
+    return io_binwrite(str, fptr, nosync);
+}
 
 static VALUE
-io_write(io, str)
-    VALUE io, str;
+io_write(VALUE io, VALUE str, int nosync)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     long n;
+    VALUE tmp;
 
     rb_secure(4);
-    if (TYPE(str) != T_STRING)
-	str = rb_obj_as_string(str);
-
-    if (TYPE(io) != T_FILE) {
+    io = GetWriteIO(io);
+    str = rb_obj_as_string(str);
+    tmp = rb_io_check_io(io);
+    if (NIL_P(tmp)) {
 	/* port is not IO, call write method for it. */
 	return rb_funcall(io, id_write, 1, str);
     }
-    if (RSTRING(str)->len == 0) return INT2FIX(0);
+    io = tmp;
+    if (RSTRING_LEN(str) == 0) return INT2FIX(0);
 
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
 
-    n = io_fwrite(str, fptr);
-    if (n == -1L) rb_sys_fail(fptr->path);
-    if (!(fptr->mode & FMODE_SYNC)) {
-	fptr->mode |= FMODE_WBUF;
-    }
+    n = io_fwrite(str, fptr, nosync);
+    if (n == -1L) rb_sys_fail_path(fptr->pathv);
 
     return LONG2FIX(n);
 }
 
+/*
+ *  call-seq:
+ *     ios.write(string)    -> integer
+ *
+ *  Writes the given string to <em>ios</em>. The stream must be opened
+ *  for writing. If the argument is not a string, it will be converted
+ *  to a string using <code>to_s</code>. Returns the number of bytes
+ *  written.
+ *
+ *     count = $stdout.write( "This is a test\n" )
+ *     puts "That was #{count} bytes of data"
+ *
+ *  <em>produces:</em>
+ *
+ *     This is a test
+ *     That was 15 bytes of data
+ */
+
+static VALUE
+io_write_m(VALUE io, VALUE str)
+{
+    return io_write(io, str, 0);
+}
+
 VALUE
-rb_io_write(io, str)
-    VALUE io, str;
+rb_io_write(VALUE io, VALUE str)
 {
     return rb_funcall(io, id_write, 1, str);
 }
 
 /*
  *  call-seq:
- *     ios << obj     => ios
- *  
+ *     ios << obj     -> ios
+ *
  *  String Output---Writes <i>obj</i> to <em>ios</em>.
  *  <i>obj</i> will be converted to a string using
  *  <code>to_s</code>.
- *     
+ *
  *     $stdout << "Hello " << "world!\n"
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Hello world!
  */
 
+
 VALUE
-rb_io_addstr(io, str)
-    VALUE io, str;
+rb_io_addstr(VALUE io, VALUE str)
 {
     rb_io_write(io, str);
     return io;
@@ -617,43 +1026,53 @@ rb_io_addstr(io, str)
 
 /*
  *  call-seq:
- *     ios.flush    => ios
- *  
+ *     ios.flush    -> ios
+ *
  *  Flushes any buffered data within <em>ios</em> to the underlying
  *  operating system (note that this is Ruby internal buffering only;
  *  the OS may buffer the data as well).
- *     
+ *
  *     $stdout.print "no newline"
  *     $stdout.flush
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     no newline
  */
 
-static VALUE
-rb_io_flush(io)
-    VALUE io;
+VALUE
+rb_io_flush(VALUE io)
 {
-    OpenFile *fptr;
-    FILE *f;
+    rb_io_t *fptr;
+
+    if (TYPE(io) != T_FILE) {
+        return rb_funcall(io, id_flush, 0);
+    }
 
+    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
-    rb_io_check_writable(fptr);
-    f = GetWriteFile(fptr);
 
-    io_fflush(f, fptr);
+    if (fptr->mode & FMODE_WRITABLE) {
+        if (io_fflush(fptr) < 0)
+            rb_sys_fail(0);
+#ifdef _WIN32
+	fsync(fptr->fd);
+#endif
+    }
+    if (fptr->mode & FMODE_READABLE) {
+        io_unread(fptr);
+    }
 
     return io;
 }
 
 /*
  *  call-seq:
- *     ios.pos     => integer
- *     ios.tell    => integer
- *  
+ *     ios.pos     -> integer
+ *     ios.tell    -> integer
+ *
  *  Returns the current offset (in bytes) of <em>ios</em>.
- *     
+ *
  *     f = File.new("testfile")
  *     f.pos    #=> 0
  *     f.gets   #=> "This is line one\n"
@@ -661,61 +1080,55 @@ rb_io_flush(io)
  */
 
 static VALUE
-rb_io_tell(io)
-     VALUE io;
+rb_io_tell(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     off_t pos;
 
     GetOpenFile(io, fptr);
     pos = io_tell(fptr);
-    if (pos < 0 && errno) rb_sys_fail(fptr->path);
+    if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
+    pos -= fptr->rbuf_len;
     return OFFT2NUM(pos);
 }
 
 static VALUE
-rb_io_seek(io, offset, whence)
-    VALUE io, offset;
-    int whence;
+rb_io_seek(VALUE io, VALUE offset, int whence)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     off_t pos;
 
     pos = NUM2OFFT(offset);
     GetOpenFile(io, fptr);
     pos = io_seek(fptr, pos, whence);
-    if (pos < 0 && errno) rb_sys_fail(fptr->path);
-    clearerr(fptr->f);
+    if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
 
     return INT2FIX(0);
 }
 
 /*
  *  call-seq:
- *     ios.seek(amount, whence=SEEK_SET) -> 0
- *  
+ *     ios.seek(amount, whence=IO::SEEK_SET)  ->  0
+ *
  *  Seeks to a given offset <i>anInteger</i> in the stream according to
  *  the value of <i>whence</i>:
  *
  *    IO::SEEK_CUR  | Seeks to _amount_ plus current position
  *    --------------+----------------------------------------------------
- *    IO::SEEK_END  | Seeks to _amount_ plus end of stream (you probably 
+ *    IO::SEEK_END  | Seeks to _amount_ plus end of stream (you probably
  *                  | want a negative value for _amount_)
  *    --------------+----------------------------------------------------
  *    IO::SEEK_SET  | Seeks to the absolute location given by _amount_
  *
  *  Example:
- *     
+ *
  *     f = File.new("testfile")
  *     f.seek(-13, IO::SEEK_END)   #=> 0
  *     f.readline                  #=> "And so on...\n"
  */
 
 static VALUE
-rb_io_seek_m(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_seek_m(int argc, VALUE *argv, VALUE io)
 {
     VALUE offset, ptrname;
     int whence = SEEK_SET;
@@ -729,66 +1142,101 @@ rb_io_seek_m(argc, argv, io)
 
 /*
  *  call-seq:
- *     ios.pos = integer    => integer
- *  
+ *     ios.pos = integer    -> integer
+ *
  *  Seeks to the given position (in bytes) in <em>ios</em>.
- *     
+ *
  *     f = File.new("testfile")
  *     f.pos = 17
  *     f.gets   #=> "This is line two\n"
  */
 
 static VALUE
-rb_io_set_pos(io, offset)
-     VALUE io, offset;
+rb_io_set_pos(VALUE io, VALUE offset)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     off_t pos;
 
     pos = NUM2OFFT(offset);
     GetOpenFile(io, fptr);
     pos = io_seek(fptr, pos, SEEK_SET);
-    if (pos != 0) rb_sys_fail(fptr->path);
-    clearerr(fptr->f);
+    if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
 
     return OFFT2NUM(pos);
 }
 
+static void clear_readconv(rb_io_t *fptr);
+
 /*
  *  call-seq:
- *     ios.rewind    => 0
- *  
+ *     ios.rewind    -> 0
+ *
  *  Positions <em>ios</em> to the beginning of input, resetting
  *  <code>lineno</code> to zero.
- *     
+ *
  *     f = File.new("testfile")
  *     f.readline   #=> "This is line one\n"
  *     f.rewind     #=> 0
  *     f.lineno     #=> 0
  *     f.readline   #=> "This is line one\n"
+ *
+ *  Note that it cannot be used with streams such as pipes, ttys, and sockets.
  */
 
 static VALUE
-rb_io_rewind(io)
-    VALUE io;
+rb_io_rewind(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
-    if (io_seek(fptr, 0L, 0) != 0) rb_sys_fail(fptr->path);
-    clearerr(fptr->f);
-    if (io == current_file) {
-	gets_lineno -= fptr->lineno;
+    if (io_seek(fptr, 0L, 0) < 0 && errno) rb_sys_fail_path(fptr->pathv);
+    if (io == ARGF.current_file) {
+	ARGF.lineno -= fptr->lineno;
     }
     fptr->lineno = 0;
+    if (fptr->readconv) {
+	clear_readconv(fptr);
+    }
 
     return INT2FIX(0);
 }
 
+static int
+io_fillbuf(rb_io_t *fptr)
+{
+    ssize_t r;
+
+    if (fptr->rbuf == NULL) {
+        fptr->rbuf_off = 0;
+        fptr->rbuf_len = 0;
+        fptr->rbuf_capa = IO_RBUF_CAPA_FOR(fptr);
+        fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
+#ifdef _WIN32
+	fptr->rbuf_capa--;
+#endif
+    }
+    if (fptr->rbuf_len == 0) {
+      retry:
+	{
+	    r = rb_read_internal(fptr->fd, fptr->rbuf, fptr->rbuf_capa);
+	}
+        if (r < 0) {
+            if (rb_io_wait_readable(fptr->fd))
+                goto retry;
+            rb_sys_fail_path(fptr->pathv);
+        }
+        fptr->rbuf_off = 0;
+        fptr->rbuf_len = (int)r; /* r should be <= rbuf_capa */
+        if (r == 0)
+            return -1; /* EOF */
+    }
+    return 0;
+}
+
 /*
  *  call-seq:
- *     ios.eof     => true or false
- *     ios.eof?    => true or false
+ *     ios.eof     -> true or false
+ *     ios.eof?    -> true or false
  *
  *  Returns true if <em>ios</em> is at end of file that means
  *  there are no more data to read.
@@ -813,410 +1261,587 @@ rb_io_rewind(io)
  *     r, w = IO.pipe
  *     r.eof?  # blocks forever
  *
- *  Note that <code>IO#eof?</code> reads data to a input buffer.
- *  So <code>IO#sysread</code> doesn't work with <code>IO#eof?</code>.
+ *  Note that <code>IO#eof?</code> reads data to the input byte buffer.
+ *  So <code>IO#sysread</code> may not behave as you intend with
+ *  <code>IO#eof?</code>, unless you call <code>IO#rewind</code>
+ *  first (which is not available for some streams).
  */
 
 VALUE
-rb_io_eof(io)
-    VALUE io;
+rb_io_eof(VALUE io)
 {
-    OpenFile *fptr;
-    int ch;
+    rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-
-    if (feof(fptr->f)) return Qtrue;
-    if (READ_DATA_PENDING(fptr->f)) return Qfalse;
-    READ_CHECK(fptr->f);
-    clearerr(fptr->f);
-    TRAP_BEG;
-    ch = getc(fptr->f);
-    TRAP_END;
-
-    if (ch != EOF) {
-	ungetc(ch, fptr->f);
-	return Qfalse;
+    rb_io_check_char_readable(fptr);
+
+    if (READ_CHAR_PENDING(fptr)) return Qfalse;
+    if (READ_DATA_PENDING(fptr)) return Qfalse;
+    READ_CHECK(fptr);
+    if (io_fillbuf(fptr) < 0) {
+	return Qtrue;
     }
-    rb_io_check_closed(fptr);
-    clearerr(fptr->f);
-    return Qtrue;
+    return Qfalse;
 }
 
 /*
  *  call-seq:
- *     ios.sync    => true or false
- *  
+ *     ios.sync    -> true or false
+ *
  *  Returns the current ``sync mode'' of <em>ios</em>. When sync mode is
  *  true, all output is immediately flushed to the underlying operating
  *  system and is not buffered by Ruby internally. See also
  *  <code>IO#fsync</code>.
- *     
+ *
  *     f = File.new("testfile")
  *     f.sync   #=> false
  */
 
 static VALUE
-rb_io_sync(io)
-    VALUE io;
+rb_io_sync(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
+    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse;
 }
 
 /*
  *  call-seq:
- *     ios.sync = boolean   => boolean
- *  
+ *     ios.sync = boolean   -> boolean
+ *
  *  Sets the ``sync mode'' to <code>true</code> or <code>false</code>.
  *  When sync mode is true, all output is immediately flushed to the
  *  underlying operating system and is not buffered internally. Returns
  *  the new state. See also <code>IO#fsync</code>.
- *     
+ *
  *     f = File.new("testfile")
  *     f.sync = true
- *     
+ *
  *  <em>(produces no output)</em>
  */
 
 static VALUE
-rb_io_set_sync(io, mode)
-    VALUE io, mode;
+rb_io_set_sync(VALUE io, VALUE sync)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
+    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
-    if (RTEST(mode)) {
+    if (RTEST(sync)) {
 	fptr->mode |= FMODE_SYNC;
     }
     else {
 	fptr->mode &= ~FMODE_SYNC;
     }
-    return mode;
+    return sync;
 }
 
+#ifdef HAVE_FSYNC
 /*
  *  call-seq:
- *     ios.fsync   => 0 or nil
- *  
+ *     ios.fsync   -> 0 or nil
+ *
  *  Immediately writes all buffered data in <em>ios</em> to disk.
- *  Returns <code>nil</code> if the underlying operating system does not
- *  support <em>fsync(2)</em>. Note that <code>fsync</code> differs from
+ *  Note that <code>fsync</code> differs from
  *  using <code>IO#sync=</code>. The latter ensures that data is flushed
  *  from Ruby's buffers, but doesn't not guarantee that the underlying
  *  operating system actually writes it to disk.
+ *
+ *  <code>NotImplementedError</code> is raised
+ *  if the underlying operating system does not support <em>fsync(2)</em>.
  */
 
 static VALUE
-rb_io_fsync(io)
-    VALUE io;
+rb_io_fsync(VALUE io)
 {
-#ifdef HAVE_FSYNC
-    OpenFile *fptr;
-    FILE *f;
+    rb_io_t *fptr;
 
+    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
-    f = GetWriteFile(fptr);
 
-    io_fflush(f, fptr);
-    if (fsync(fileno(f)) < 0)
-	rb_sys_fail(fptr->path);
+    if (io_fflush(fptr) < 0)
+        rb_sys_fail(0);
+    if (fsync(fptr->fd) < 0)
+	rb_sys_fail_path(fptr->pathv);
     return INT2FIX(0);
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define rb_io_fsync rb_f_notimplement
 #endif
+
+#ifdef HAVE_FDATASYNC
+/*
+ *  call-seq:
+ *     ios.fdatasync   -> 0 or nil
+ *
+ *  Immediately writes all buffered data in <em>ios</em> to disk.
+ *
+ *  <code>NotImplementedError</code> is raised
+ *  if the underlying operating system does not support <em>fdatasync(2)</em>.
+ */
+
+static VALUE
+rb_io_fdatasync(VALUE io)
+{
+    rb_io_t *fptr;
+
+    io = GetWriteIO(io);
+    GetOpenFile(io, fptr);
+
+    if (io_fflush(fptr) < 0)
+        rb_sys_fail(0);
+    if (fdatasync(fptr->fd) < 0)
+	rb_sys_fail_path(fptr->pathv);
+    return INT2FIX(0);
 }
+#else
+#define rb_io_fdatasync rb_f_notimplement
+#endif
 
 /*
  *  call-seq:
- *     ios.fileno    => fixnum
- *     ios.to_i      => fixnum
- *  
+ *     ios.fileno    -> fixnum
+ *     ios.to_i      -> fixnum
+ *
  *  Returns an integer representing the numeric file descriptor for
  *  <em>ios</em>.
- *     
+ *
  *     $stdin.fileno    #=> 0
  *     $stdout.fileno   #=> 1
  */
 
 static VALUE
-rb_io_fileno(io)
-    VALUE io;
+rb_io_fileno(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     int fd;
 
     GetOpenFile(io, fptr);
-    fd = fileno(fptr->f);
+    fd = fptr->fd;
     return INT2FIX(fd);
 }
 
+
 /*
  *  call-seq:
- *     ios.pid    => fixnum
- *  
+ *     ios.pid    -> fixnum
+ *
  *  Returns the process ID of a child process associated with
- *  <em>ios</em>. This will be set by <code>IO::popen</code>.
- *     
+ *  <em>ios</em>. This will be set by <code>IO.popen</code>.
+ *
  *     pipe = IO.popen("-")
  *     if pipe
  *       $stderr.puts "In parent, child pid is #{pipe.pid}"
  *     else
  *       $stderr.puts "In child, pid is #{$$}"
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     In child, pid is 26209
  *     In parent, child pid is 26209
  */
 
 static VALUE
-rb_io_pid(io)
-    VALUE io;
+rb_io_pid(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
     if (!fptr->pid)
 	return Qnil;
-    return INT2FIX(fptr->pid);
+    return PIDT2NUM(fptr->pid);
 }
 
+
 /*
  * call-seq:
- *   ios.inspect   => string
+ *   ios.inspect   -> string
  *
  * Return a string describing this IO object.
  */
 
 static VALUE
-rb_io_inspect(obj)
-    VALUE obj;
+rb_io_inspect(VALUE obj)
 {
-    OpenFile *fptr;
-    char *buf, *cname, *st = "";
-    long len;
+    rb_io_t *fptr;
+    const char *cname;
+    char fd_desc[4+sizeof(int)*3];
+    const char *path;
+    const char *st = "";
 
     fptr = RFILE(rb_io_taint_check(obj))->fptr;
-    if (!fptr || !fptr->path) return rb_any_to_s(obj);
+    if (!fptr) return rb_any_to_s(obj);
     cname = rb_obj_classname(obj);
-    len = strlen(cname) + strlen(fptr->path) + 5;
-    if (!(fptr->f || fptr->f2)) {
-	st = " (closed)";
-	len += 9;
+    if (NIL_P(fptr->pathv)) {
+        if (fptr->fd < 0) {
+            path = "";
+            st = "(closed)";
+        }
+        else {
+            snprintf(fd_desc, sizeof(fd_desc), "fd %d", fptr->fd);
+            path = fd_desc;
+        }
+    }
+    else {
+        path = RSTRING_PTR(fptr->pathv);
+        if (fptr->fd < 0) {
+            st = " (closed)";
+        }
     }
-    buf = ALLOCA_N(char, len);
-    snprintf(buf, len, "#<%s:%s%s>", cname, fptr->path, st);
-    return rb_str_new2(buf);
+    return rb_sprintf("#<%s:%s%s>", cname, path, st);
 }
 
 /*
  *  call-seq:
- *     ios.to_io -> ios
- *  
+ *     ios.to_io  ->  ios
+ *
  *  Returns <em>ios</em>.
  */
 
 static VALUE
-rb_io_to_io(io)
-    VALUE io;
+rb_io_to_io(VALUE io)
 {
     return io;
 }
 
 /* reading functions */
 static long
-read_buffered_data(ptr, len, f)
-    char *ptr;
-    long len;
-    FILE *f;
+read_buffered_data(char *ptr, long len, rb_io_t *fptr)
 {
-    long n;
+    int n;
 
-#ifdef READ_DATA_PENDING_COUNT
-    n = READ_DATA_PENDING_COUNT(f);
+    n = READ_DATA_PENDING_COUNT(fptr);
     if (n <= 0) return 0;
-    if (n > len) n = len;
-    return fread(ptr, 1, n, f);
-#else
-    int c;
-
-    for (n = 0; n < len && READ_DATA_PENDING(f) && (c = getc(f)) != EOF; ++n) {
-	*ptr++ = c;
-    }
+    if (n > len) n = (int)len;
+    MEMMOVE(ptr, fptr->rbuf+fptr->rbuf_off, char, n);
+    fptr->rbuf_off += n;
+    fptr->rbuf_len -= n;
     return n;
-#endif
 }
 
 static long
-io_fread(ptr, len, fptr)
-    char *ptr;
-    long len;
-    OpenFile *fptr;
+io_fread(VALUE str, long offset, rb_io_t *fptr)
 {
+    long len = RSTRING_LEN(str) - offset;
     long n = len;
-    int c;
-    int saved_errno;
+    long c;
 
-    while (n > 0) {
-        c = read_buffered_data(ptr, n, fptr->f);
-        if (c < 0) goto eof;
-        if (c > 0) {
-            ptr += c;
-            if ((n -= c) <= 0) break;
-        }
-        rb_thread_wait_fd(fileno(fptr->f));
-        rb_io_check_closed(fptr);
-	clearerr(fptr->f);
-	TRAP_BEG;
-	c = getc(fptr->f);
-	TRAP_END;
-	if (c == EOF) {
-	  eof:
-	    if (ferror(fptr->f)) {
-		switch (errno) {
-		  case EINTR:
-#if defined(ERESTART)
-		  case ERESTART:
-#endif
-		    clearerr(fptr->f);
-		    continue;
-		  case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-		  case EWOULDBLOCK:
-#endif
-		    if (len > n) {
-			clearerr(fptr->f);
-		    }
-                    saved_errno = errno;
-                    rb_warning("nonblocking IO#read is obsolete; use IO#readpartial or IO#sysread");
-                    errno = saved_errno;
-		}
-		if (len == n) return 0;
+    rb_str_locktmp(str);
+    if (READ_DATA_PENDING(fptr) == 0) {
+	while (n > 0) {
+          again:
+	    c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n);
+	    if (c == 0) break;
+	    if (c < 0) {
+                if (rb_io_wait_readable(fptr->fd))
+                    goto again;
+		rb_sys_fail_path(fptr->pathv);
 	    }
+	    offset += c;
+	    if ((n -= c) <= 0) break;
+	    rb_thread_wait_fd(fptr->fd);
+	}
+	rb_str_unlocktmp(str);
+	return len - n;
+    }
+
+    while (n > 0) {
+	c = read_buffered_data(RSTRING_PTR(str)+offset, n, fptr);
+	if (c > 0) {
+	    offset += c;
+	    if ((n -= c) <= 0) break;
+	}
+	rb_thread_wait_fd(fptr->fd);
+	rb_io_check_closed(fptr);
+	if (io_fillbuf(fptr) < 0) {
 	    break;
 	}
-	*ptr++ = c;
-	n--;
     }
+    rb_str_unlocktmp(str);
     return len - n;
 }
 
-long
-rb_io_fread(ptr, len, f)
-    char *ptr;
-    long len;
-    FILE *f;
-{
-    OpenFile of;
-
-    of.f = f;
-    of.f2 = NULL;
-    return io_fread(ptr, len, &of);
-}
-
 #define SMALLBUF 100
 
 static long
-remain_size(fptr)
-    OpenFile *fptr;
+remain_size(rb_io_t *fptr)
 {
     struct stat st;
-    off_t siz = BUFSIZ;
+    off_t siz = READ_DATA_PENDING_COUNT(fptr);
     off_t pos;
 
-    if (feof(fptr->f)) return 0;
-    if (fstat(fileno(fptr->f), &st) == 0  && S_ISREG(st.st_mode)
-#ifdef __BEOS__
+    if (fstat(fptr->fd, &st) == 0  && S_ISREG(st.st_mode)
+#if defined(__BEOS__) || defined(__HAIKU__)
 	&& (st.st_dev > 3)
 #endif
 	)
     {
-	pos = io_tell(fptr);
+        if (io_fflush(fptr) < 0)
+            rb_sys_fail(0);
+	pos = lseek(fptr->fd, 0, SEEK_CUR);
 	if (st.st_size >= pos && pos >= 0) {
-	    siz = st.st_size - pos + 1;
+	    siz += st.st_size - pos;
 	    if (siz > LONG_MAX) {
 		rb_raise(rb_eIOError, "file too big for single read");
 	    }
 	}
     }
+    else {
+	siz += BUFSIZ;
+    }
     return (long)siz;
 }
 
 static VALUE
-read_all(fptr, siz, str)
-    OpenFile *fptr;
-    long siz;
-    VALUE str;
+io_enc_str(VALUE str, rb_io_t *fptr)
 {
-    long bytes = 0;
-    long n;
+    OBJ_TAINT(str);
+    rb_enc_associate(str, io_read_encoding(fptr));
+    return str;
+}
 
-    if (siz == 0) siz = BUFSIZ;
-    if (NIL_P(str)) {
-	str = rb_str_new(0, siz);
+static void
+make_readconv(rb_io_t *fptr, int size)
+{
+    if (!fptr->readconv) {
+        int ecflags;
+        VALUE ecopts;
+        const char *sname, *dname;
+        ecflags = fptr->encs.ecflags;
+        ecopts = fptr->encs.ecopts;
+        if (NEED_NEWLINE_DECORATOR_ON_READ(fptr))
+            ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR;
+        if (fptr->encs.enc2) {
+            sname = rb_enc_name(fptr->encs.enc2);
+            dname = rb_enc_name(fptr->encs.enc);
+        }
+        else {
+            sname = dname = "";
+        }
+        fptr->readconv = rb_econv_open_opts(sname, dname, ecflags, ecopts);
+        if (!fptr->readconv)
+            rb_exc_raise(rb_econv_open_exc(sname, dname, ecflags));
+        fptr->cbuf_off = 0;
+        fptr->cbuf_len = 0;
+	if (size < IO_CBUF_CAPA_MIN) size = IO_CBUF_CAPA_MIN;
+        fptr->cbuf_capa = size;
+        fptr->cbuf = ALLOC_N(char, fptr->cbuf_capa);
+    }
+}
+
+#define MORE_CHAR_SUSPENDED Qtrue
+#define MORE_CHAR_FINISHED Qnil
+static VALUE
+fill_cbuf(rb_io_t *fptr, int ec_flags)
+{
+    const unsigned char *ss, *sp, *se;
+    unsigned char *ds, *dp, *de;
+    rb_econv_result_t res;
+    int putbackable;
+    int cbuf_len0;
+    VALUE exc;
+
+    ec_flags |= ECONV_PARTIAL_INPUT;
+
+    if (fptr->cbuf_len == fptr->cbuf_capa)
+        return MORE_CHAR_SUSPENDED; /* cbuf full */
+    if (fptr->cbuf_len == 0)
+        fptr->cbuf_off = 0;
+    else if (fptr->cbuf_off + fptr->cbuf_len == fptr->cbuf_capa) {
+        memmove(fptr->cbuf, fptr->cbuf+fptr->cbuf_off, fptr->cbuf_len);
+        fptr->cbuf_off = 0;
+    }
+
+    cbuf_len0 = fptr->cbuf_len;
+
+    while (1) {
+        ss = sp = (const unsigned char *)fptr->rbuf + fptr->rbuf_off;
+        se = sp + fptr->rbuf_len;
+        ds = dp = (unsigned char *)fptr->cbuf + fptr->cbuf_off + fptr->cbuf_len;
+        de = (unsigned char *)fptr->cbuf + fptr->cbuf_capa;
+        res = rb_econv_convert(fptr->readconv, &sp, se, &dp, de, ec_flags);
+        fptr->rbuf_off += (int)(sp - ss);
+        fptr->rbuf_len -= (int)(sp - ss);
+        fptr->cbuf_len += (int)(dp - ds);
+
+        putbackable = rb_econv_putbackable(fptr->readconv);
+        if (putbackable) {
+            rb_econv_putback(fptr->readconv, (unsigned char *)fptr->rbuf + fptr->rbuf_off - putbackable, putbackable);
+            fptr->rbuf_off -= putbackable;
+            fptr->rbuf_len += putbackable;
+        }
+
+        exc = rb_econv_make_exception(fptr->readconv);
+        if (!NIL_P(exc))
+            return exc;
+
+        if (cbuf_len0 != fptr->cbuf_len)
+            return MORE_CHAR_SUSPENDED;
+
+        if (res == econv_finished) {
+            return MORE_CHAR_FINISHED;
+	}
+
+        if (res == econv_source_buffer_empty) {
+            if (fptr->rbuf_len == 0) {
+		READ_CHECK(fptr);
+                if (io_fillbuf(fptr) == -1) {
+                    ds = dp = (unsigned char *)fptr->cbuf + fptr->cbuf_off + fptr->cbuf_len;
+                    de = (unsigned char *)fptr->cbuf + fptr->cbuf_capa;
+                    res = rb_econv_convert(fptr->readconv, NULL, NULL, &dp, de, 0);
+                    fptr->cbuf_len += (int)(dp - ds);
+                    rb_econv_check_error(fptr->readconv);
+                    break;
+                }
+            }
+        }
+    }
+    if (cbuf_len0 != fptr->cbuf_len)
+	return MORE_CHAR_SUSPENDED;
+
+    return MORE_CHAR_FINISHED;
+}
+
+static VALUE
+more_char(rb_io_t *fptr)
+{
+    VALUE v;
+    v = fill_cbuf(fptr, ECONV_AFTER_OUTPUT);
+    if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED)
+        rb_exc_raise(v);
+    return v;
+}
+
+static VALUE
+io_shift_cbuf(rb_io_t *fptr, int len, VALUE *strp)
+{
+    VALUE str = Qnil;
+    if (strp) {
+	str = *strp;
+	if (NIL_P(str)) {
+	    *strp = str = rb_str_new(fptr->cbuf+fptr->cbuf_off, len);
+	}
+	else {
+	    rb_str_cat(str, fptr->cbuf+fptr->cbuf_off, len);
+	}
+	OBJ_TAINT(str);
+	rb_enc_associate(str, fptr->encs.enc);
+    }
+    fptr->cbuf_off += len;
+    fptr->cbuf_len -= len;
+    /* xxx: set coderange */
+    if (fptr->cbuf_len == 0)
+        fptr->cbuf_off = 0;
+    else if (fptr->cbuf_capa/2 < fptr->cbuf_off) {
+        memmove(fptr->cbuf, fptr->cbuf+fptr->cbuf_off, fptr->cbuf_len);
+        fptr->cbuf_off = 0;
+    }
+    return str;
+}
+
+static void
+io_setstrbuf(VALUE *str,long len)
+{
+#ifdef _WIN32
+    if (NIL_P(*str)) {
+	*str = rb_str_new(0, len+1);
+	rb_str_set_len(*str,len);
     }
     else {
-	rb_str_resize(str, siz);
+	StringValue(*str);
+	rb_str_modify(*str);
+	rb_str_resize(*str, len+1);
+	rb_str_set_len(*str,len);
     }
+#else
+    if (NIL_P(*str)) {
+	*str = rb_str_new(0, len);
+    }
+    else {
+	StringValue(*str);
+	rb_str_modify(*str);
+	rb_str_resize(*str, len);
+    }
+#endif
+}
+
+static VALUE
+read_all(rb_io_t *fptr, long siz, VALUE str)
+{
+    long bytes;
+    long n;
+    long pos;
+    rb_encoding *enc;
+    int cr;
+
+    if (NEED_READCONV(fptr)) {
+	io_setstrbuf(&str,0);
+        make_readconv(fptr, 0);
+        while (1) {
+            VALUE v;
+            if (fptr->cbuf_len) {
+                io_shift_cbuf(fptr, fptr->cbuf_len, &str);
+            }
+            v = fill_cbuf(fptr, 0);
+            if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED) {
+                if (fptr->cbuf_len) {
+                    io_shift_cbuf(fptr, fptr->cbuf_len, &str);
+                }
+                rb_exc_raise(v);
+            }
+            if (v == MORE_CHAR_FINISHED) {
+                clear_readconv(fptr);
+                return io_enc_str(str, fptr);
+            }
+        }
+    }
+
+    bytes = 0;
+    pos = 0;
+
+    enc = io_read_encoding(fptr);
+    cr = 0;
+
+    if (siz == 0) siz = BUFSIZ;
+    io_setstrbuf(&str,siz);
     for (;;) {
-	rb_str_locktmp(str);
-	READ_CHECK(fptr->f);
-	n = io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr);
-	rb_str_unlocktmp(str);
+	READ_CHECK(fptr);
+	n = io_fread(str, bytes, fptr);
 	if (n == 0 && bytes == 0) {
-	    if (!fptr->f) break;
-	    if (feof(fptr->f)) break;
-	    if (!ferror(fptr->f)) break;
-	    rb_sys_fail(fptr->path);
+	    break;
 	}
 	bytes += n;
+	if (cr != ENC_CODERANGE_BROKEN)
+	    pos += rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + bytes, enc, &cr);
 	if (bytes < siz) break;
 	siz += BUFSIZ;
 	rb_str_resize(str, siz);
     }
     if (bytes != siz) rb_str_resize(str, bytes);
-    OBJ_TAINT(str);
-
+    str = io_enc_str(str, fptr);
+    ENC_CODERANGE_SET(str, cr);
     return str;
 }
 
-void rb_io_set_nonblock(OpenFile *fptr)
+void
+rb_io_set_nonblock(rb_io_t *fptr)
 {
-    int flags;
+    int oflags;
 #ifdef F_GETFL
-    flags = fcntl(fileno(fptr->f), F_GETFL);
-    if (flags == -1) {
-        rb_sys_fail(fptr->path);
+    oflags = fcntl(fptr->fd, F_GETFL);
+    if (oflags == -1) {
+        rb_sys_fail_path(fptr->pathv);
     }
 #else
-    flags = 0;
+    oflags = 0;
 #endif
-    if ((flags & O_NONBLOCK) == 0) {
-        flags |= O_NONBLOCK;
-        if (fcntl(fileno(fptr->f), F_SETFL, flags) == -1) {
-            rb_sys_fail(fptr->path);
-        }
-    }
-    if (fptr->f2) {
-#ifdef F_GETFL
-        flags = fcntl(fileno(fptr->f2), F_GETFL);
-        if (flags == -1) {
-            rb_sys_fail(fptr->path);
-        }
-#else
-        flags = 0;
-#endif
-        if ((flags & O_NONBLOCK) == 0) {
-            flags |= O_NONBLOCK;
-            if (fcntl(fileno(fptr->f2), F_SETFL, flags) == -1) {
-                rb_sys_fail(fptr->path);
-            }
+    if ((oflags & O_NONBLOCK) == 0) {
+        oflags |= O_NONBLOCK;
+        if (fcntl(fptr->fd, F_SETFL, oflags) == -1) {
+            rb_sys_fail_path(fptr->pathv);
         }
     }
 }
@@ -1224,56 +1849,42 @@ void rb_io_set_nonblock(OpenFile *fptr)
 static VALUE
 io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     VALUE length, str;
     long n, len;
 
     rb_scan_args(argc, argv, "11", &length, &str);
 
     if ((len = NUM2LONG(length)) < 0) {
-        rb_raise(rb_eArgError, "negative length %ld given", len);
+	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    if (NIL_P(str)) {
-        str = rb_str_new(0, len);
-    }
-    else {
-        StringValue(str);
-        rb_str_modify(str);
-        rb_str_resize(str, len);
-    }
+    io_setstrbuf(&str,len);
     OBJ_TAINT(str);
 
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
+    rb_io_check_byte_readable(fptr);
 
     if (len == 0)
-        return str;
+	return str;
 
-    if (!nonblock) {
-        READ_CHECK(fptr->f);
-    }
-    if (RSTRING(str)->len != len) {
-      modified:
-        rb_raise(rb_eRuntimeError, "buffer string modified");
-    }
-    n = read_buffered_data(RSTRING(str)->ptr, len, fptr->f);
+    if (!nonblock)
+        READ_CHECK(fptr);
+    n = read_buffered_data(RSTRING_PTR(str), len, fptr);
     if (n <= 0) {
       again:
-        if (RSTRING(str)->len != len) goto modified;
         if (nonblock) {
             rb_io_set_nonblock(fptr);
-            n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
-        }
-        else {
-            TRAP_BEG;
-            n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
-            TRAP_END;
         }
+	rb_str_locktmp(str);
+	n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
+	rb_str_unlocktmp(str);
         if (n < 0) {
-            if (!nonblock && rb_io_wait_readable(fileno(fptr->f)))
+            if (!nonblock && rb_io_wait_readable(fptr->fd))
                 goto again;
-            rb_sys_fail(fptr->path);
+            if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
+                rb_mod_sys_fail(rb_mWaitReadable, "read would block");
+            rb_sys_fail_path(fptr->pathv);
         }
     }
     rb_str_resize(str, n);
@@ -1286,8 +1897,8 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
 
 /*
  *  call-seq:
- *     ios.readpartial(maxlen)              => string
- *     ios.readpartial(maxlen, outbuf)      => outbuf
+ *     ios.readpartial(maxlen)              -> string
+ *     ios.readpartial(maxlen, outbuf)      -> outbuf
  *
  *  Reads at most <i>maxlen</i> bytes from the I/O stream.
  *  It blocks only if <em>ios</em> has no data immediately available.
@@ -1299,7 +1910,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
  *  readpartial is designed for streams such as pipe, socket, tty, etc.
  *  It blocks only when no data immediately available.
  *  This means that it blocks only when following all conditions hold.
- *  * the buffer in the IO object is empty.
+ *  * the byte buffer in the IO object is empty.
  *  * the content of the stream is empty.
  *  * the stream is not reached to EOF.
  *
@@ -1308,9 +1919,9 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
  *  If EOF is reached, readpartial raises EOFError.
  *
  *  When readpartial doesn't blocks, it returns or raises immediately.
- *  If the buffer is not empty, it returns the data in the buffer.
+ *  If the byte buffer is not empty, it returns the data in the buffer.
  *  Otherwise if the stream has some content,
- *  it returns the data in the stream. 
+ *  it returns the data in the stream.
  *  Otherwise if the stream is reached to EOF, it raises EOFError.
  *
  *     r, w = IO.pipe           #               buffer          pipe content
@@ -1333,11 +1944,11 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
  *
  *  Note that readpartial behaves similar to sysread.
  *  The differences are:
- *  * If the buffer is not empty, read from the buffer instead of "sysread for buffered IO (IOError)".
- *  * It doesn't cause Errno::EAGAIN and Errno::EINTR.  When readpartial meets EAGAIN and EINTR by read system call, readpartial retry the system call.
+ *  * If the byte buffer is not empty, read from the byte buffer instead of "sysread for buffered IO (IOError)".
+ *  * It doesn't cause Errno::EWOULDBLOCK and Errno::EINTR.  When readpartial meets EWOULDBLOCK and EINTR by read system call, readpartial retry the system call.
  *
  *  The later means that readpartial is nonblocking-flag insensitive.
- *  It blocks on the situation IO#sysread causes Errno::EAGAIN as if the fd is blocking mode.
+ *  It blocks on the situation IO#sysread causes Errno::EWOULDBLOCK as if the fd is blocking mode.
  *
  */
 
@@ -1355,26 +1966,51 @@ io_readpartial(int argc, VALUE *argv, VALUE io)
 
 /*
  *  call-seq:
- *     ios.read_nonblock(maxlen)              => string
- *     ios.read_nonblock(maxlen, outbuf)      => outbuf
+ *     ios.read_nonblock(maxlen)              -> string
+ *     ios.read_nonblock(maxlen, outbuf)      -> outbuf
  *
  *  Reads at most <i>maxlen</i> bytes from <em>ios</em> using
- *  read(2) system call after O_NONBLOCK is set for
+ *  the read(2) system call after O_NONBLOCK is set for
  *  the underlying file descriptor.
  *
  *  If the optional <i>outbuf</i> argument is present,
  *  it must reference a String, which will receive the data.
  *
- *  read_nonblock just calls read(2).
- *  It causes all errors read(2) causes: EAGAIN, EINTR, etc.
+ *  read_nonblock just calls the read(2) system call.
+ *  It causes all errors the read(2) system call causes: Errno::EWOULDBLOCK, Errno::EINTR, etc.
  *  The caller should care such errors.
  *
+ *  If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
+ *  it is extended by IO::WaitReadable.
+ *  So IO::WaitReadable can be used to rescue the exceptions for retrying read_nonblock.
+ *
  *  read_nonblock causes EOFError on EOF.
  *
- *  If the read buffer is not empty,
+ *  If the read byte buffer is not empty,
  *  read_nonblock reads from the buffer like readpartial.
- *  In this case, read(2) is not called.
+ *  In this case, the read(2) system call is not called.
  *
+ *  When read_nonblock raises an exception kind of IO::WaitReadable,
+ *  read_nonblock should not be called
+ *  until io is readable for avoiding busy loop.
+ *  This can be done as follows.
+ *
+ *    # emulates blocking read (readpartial).
+ *    begin
+ *      result = io.read_nonblock(maxlen)
+ *    rescue IO::WaitReadable
+ *      IO.select([io])
+ *      retry
+ *    end
+ *
+ *  Although IO#read_nonblock doesn't raise IO::WaitWritable.
+ *  OpenSSL::Buffering#read_nonblock can raise IO::WaitWritable.
+ *  If IO and SSL should be used polymorphically,
+ *  IO::WaitWritable should be rescued too.
+ *  See the document of OpenSSL::Buffering#read_nonblock for sample code.
+ *
+ *  Note that this method is identical to readpartial
+ *  except the non-blocking flag is set.
  */
 
 static VALUE
@@ -1391,50 +2027,108 @@ io_read_nonblock(int argc, VALUE *argv, VALUE io)
 
 /*
  *  call-seq:
- *     ios.write_nonblock(string)   => integer
+ *     ios.write_nonblock(string)   -> integer
  *
  *  Writes the given string to <em>ios</em> using
- *  write(2) system call after O_NONBLOCK is set for
+ *  the write(2) system call after O_NONBLOCK is set for
  *  the underlying file descriptor.
  *
- *  write_nonblock just calls write(2).
- *  It causes all errors write(2) causes: EAGAIN, EINTR, etc.
+ *  It returns the number of bytes written.
+ *
+ *  write_nonblock just calls the write(2) system call.
+ *  It causes all errors the write(2) system call causes: Errno::EWOULDBLOCK, Errno::EINTR, etc.
  *  The result may also be smaller than string.length (partial write).
  *  The caller should care such errors and partial write.
  *
+ *  If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
+ *  it is extended by IO::WaitWritable.
+ *  So IO::WaitWritable can be used to rescue the exceptions for retrying write_nonblock.
+ *
+ *    # Creates a pipe.
+ *    r, w = IO.pipe
+ *
+ *    # write_nonblock writes only 65536 bytes and return 65536.
+ *    # (The pipe size is 65536 bytes on this environment.)
+ *    s = "a" * 100000
+ *    p w.write_nonblock(s)     #=> 65536
+ *
+ *    # write_nonblock cannot write a byte and raise EWOULDBLOCK (EAGAIN).
+ *    p w.write_nonblock("b")   # Resource temporarily unavailable (Errno::EAGAIN)
+ *
+ *  If the write buffer is not empty, it is flushed at first.
+ *
+ *  When write_nonblock raises an exception kind of IO::WaitWritable,
+ *  write_nonblock should not be called
+ *  until io is writable for avoiding busy loop.
+ *  This can be done as follows.
+ *
+ *    begin
+ *      result = io.write_nonblock(string)
+ *    rescue IO::WaitWritable, Errno::EINTR
+ *      IO.select(nil, [io])
+ *      retry
+ *    end
+ *
+ *  Note that this doesn't guarantee to write all data in string.
+ *  The length written is reported as result and it should be checked later.
+ *
+ *  On some platforms such as Windows, write_nonblock is not supported
+ *  according to the kind of the IO object.
+ *  In such cases, write_nonblock raises <code>Errno::EBADF</code>.
+ *
  */
 
 static VALUE
 rb_io_write_nonblock(VALUE io, VALUE str)
 {
-    OpenFile *fptr;
-    FILE *f;
+    rb_io_t *fptr;
     long n;
 
     rb_secure(4);
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
 
+    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
 
-    f = GetWriteFile(fptr);
+    if (io_fflush(fptr) < 0)
+        rb_sys_fail(0);
 
     rb_io_set_nonblock(fptr);
-    n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
+    n = write(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
 
-    if (n == -1) rb_sys_fail(fptr->path);
+    if (n == -1) {
+        if (errno == EWOULDBLOCK || errno == EAGAIN)
+            rb_mod_sys_fail(rb_mWaitWritable, "write would block");
+        rb_sys_fail_path(fptr->pathv);
+    }
 
     return LONG2FIX(n);
 }
 
 /*
  *  call-seq:
- *     ios.read([length [, buffer]])    => string, buffer, or nil
+ *     ios.read([length [, buffer]])    -> string, buffer, or nil
+ *
+ *  Reads <i>length</i> bytes from the I/O stream.
+ *
+ *  <i>length</i> must be a non-negative integer or <code>nil</code>.
+ *
+ *  If <i>length</i> is a positive integer,
+ *  it try to read <i>length</i> bytes without any conversion (binary mode).
+ *  It returns <code>nil</code> or a string whose length is 1 to <i>length</i> bytes.
+ *  <code>nil</code> means it met EOF at beginning.
+ *  The 1 to <i>length</i>-1 bytes string means it met EOF after reading the result.
+ *  The <i>length</i> bytes string means it doesn't meet EOF.
+ *  The resulted string is always ASCII-8BIT encoding.
+ *
+ *  If <i>length</i> is omitted or is <code>nil</code>,
+ *  it reads until EOF and the encoding conversion is applied.
+ *  It returns a string even if EOF is met at beginning.
+ *
+ *  If <i>length</i> is zero, it returns <code>""</code>.
  *
- *  Reads at most <i>length</i> bytes from the I/O stream, or to the
- *  end of file if <i>length</i> is omitted or is <code>nil</code>.
- *  <i>length</i> must be a non-negative integer or nil.
  *  If the optional <i>buffer</i> argument is present, it must reference
  *  a String, which will receive the data.
  *
@@ -1442,28 +2136,50 @@ rb_io_write_nonblock(VALUE io, VALUE str)
  *  depend on <i>length</i>.
  *  <code><i>ios</i>.read()</code> and
  *  <code><i>ios</i>.read(nil)</code> returns <code>""</code>.
- *  <code><i>ios</i>.read(<i>positive-integer</i>)</code> returns nil.
+ *  <code><i>ios</i>.read(<i>positive-integer</i>)</code> returns <code>nil</code>.
  *
  *     f = File.new("testfile")
  *     f.read(16)   #=> "This is line one"
+ *
+ *     # reads whole file
+ *     open("file") {|f|
+ *       data = f.read # This returns a string even if the file is empty.
+ *       ...
+ *     }
+ *
+ *     # iterate over fixed length records.
+ *     open("fixed-record-file") {|f|
+ *       while record = f.read(256)
+ *         ...
+ *       end
+ *     }
+ *
+ *     # iterate over variable length records.
+ *     # record is prefixed by 32-bit length.
+ *     open("variable-record-file") {|f|
+ *       while len = f.read(4)
+ *         len = len.unpack("N")[0] # 32-bit length
+ *         record = f.read(len) # This returns a string even if len is 0.
+ *       end
+ *     }
+ *
+ *  Note that this method behaves like fread() function in C.
+ *  If you need the behavior like read(2) system call,
+ *  consider readpartial, read_nonblock and sysread.
  */
 
 static VALUE
-io_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+io_read(int argc, VALUE *argv, VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     long n, len;
     VALUE length, str;
 
     rb_scan_args(argc, argv, "02", &length, &str);
 
     if (NIL_P(length)) {
-	if (!NIL_P(str)) StringValue(str);
 	GetOpenFile(io, fptr);
-	rb_io_check_readable(fptr);	
+	rb_io_check_char_readable(fptr);
 	return read_all(fptr, remain_size(fptr), str);
     }
     len = NUM2LONG(length);
@@ -1471,321 +2187,412 @@ io_read(argc, argv, io)
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    if (NIL_P(str)) {
-	str = rb_tainted_str_new(0, len);
-    }
-    else {
-	StringValue(str);
-	rb_str_modify(str);
-	rb_str_resize(str,len);
-    }
+    io_setstrbuf(&str,len);
 
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    if (feof(fptr->f)) return Qnil;
+    rb_io_check_byte_readable(fptr);
     if (len == 0) return str;
 
-    rb_str_locktmp(str);
-    READ_CHECK(fptr->f);
-    if (RSTRING(str)->len != len) {
-	rb_raise(rb_eRuntimeError, "buffer string modified");
-    }
-    n = io_fread(RSTRING(str)->ptr, len, fptr);
-    rb_str_unlocktmp(str);
+    READ_CHECK(fptr);
+    n = io_fread(str, 0, fptr);
     if (n == 0) {
-	if (!fptr->f) return Qnil;
-	if (feof(fptr->f)) {
-	    rb_str_resize(str, 0);
-	    return Qnil;
-	}
-	if (len > 0) rb_sys_fail(fptr->path);
+	if (fptr->fd < 0) return Qnil;
+        rb_str_resize(str, 0);
+        return Qnil;
     }
     rb_str_resize(str, n);
-    RSTRING(str)->len = n;
-    RSTRING(str)->ptr[n] = '\0';
     OBJ_TAINT(str);
 
     return str;
 }
 
+static void
+rscheck(const char *rsptr, long rslen, VALUE rs)
+{
+    if (!rs) return;
+    if (RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen)
+	rb_raise(rb_eRuntimeError, "rs modified");
+}
+
 static int
-appendline(fptr, delim, strp)
-    OpenFile *fptr;
-    int delim;
-    VALUE *strp;
+appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
 {
-    FILE *f = fptr->f;
     VALUE str = *strp;
-    int c = EOF;
-#ifndef READ_DATA_PENDING_PTR
-    char buf[8192];
-    char *bp = buf, *bpe = buf + sizeof buf - 3;
-    int update = Qfalse;
-#endif
+    long limit = *lp;
+
+    if (NEED_READCONV(fptr)) {
+        make_readconv(fptr, 0);
+        do {
+            const char *p, *e;
+            int searchlen;
+            if (fptr->cbuf_len) {
+                p = fptr->cbuf+fptr->cbuf_off;
+                searchlen = fptr->cbuf_len;
+                if (0 < limit && limit < searchlen)
+                    searchlen = (int)limit;
+                e = memchr(p, delim, searchlen);
+                if (e) {
+		    int len = (int)(e-p+1);
+                    if (NIL_P(str))
+                        *strp = str = rb_str_new(p, len);
+                    else
+                        rb_str_buf_cat(str, p, len);
+                    fptr->cbuf_off += len;
+                    fptr->cbuf_len -= len;
+                    limit -= len;
+                    *lp = limit;
+                    return delim;
+                }
+
+                if (NIL_P(str))
+                    *strp = str = rb_str_new(p, searchlen);
+                else
+                    rb_str_buf_cat(str, p, searchlen);
+                fptr->cbuf_off += searchlen;
+                fptr->cbuf_len -= searchlen;
+                limit -= searchlen;
+
+                if (limit == 0) {
+                    *lp = limit;
+                    return (unsigned char)RSTRING_PTR(str)[RSTRING_LEN(str)-1];
+                }
+            }
+        } while (more_char(fptr) != MORE_CHAR_FINISHED);
+        clear_readconv(fptr);
+        *lp = limit;
+        return EOF;
+    }
 
     do {
-#ifdef READ_DATA_PENDING_PTR
-	long pending = READ_DATA_PENDING_COUNT(f);
+	long pending = READ_DATA_PENDING_COUNT(fptr);
 	if (pending > 0) {
-	    const char *p = READ_DATA_PENDING_PTR(f);
-	    const char *e = memchr(p, delim, pending);
-	    long last = 0, len = (c != EOF);
+	    const char *p = READ_DATA_PENDING_PTR(fptr);
+	    const char *e;
+	    long last;
+
+	    if (limit > 0 && pending > limit) pending = limit;
+	    e = memchr(p, delim, pending);
 	    if (e) pending = e - p + 1;
-	    len += pending;
 	    if (!NIL_P(str)) {
-		last = RSTRING(str)->len;
-		rb_str_resize(str, last + len);
+		last = RSTRING_LEN(str);
+		rb_str_resize(str, last + pending);
 	    }
 	    else {
-		*strp = str = rb_str_buf_new(len);
-		RSTRING(str)->len = len;
-		RSTRING(str)->ptr[len] = '\0';
+                last = 0;
+		*strp = str = rb_str_buf_new(pending);
+		rb_str_set_len(str, pending);
 	    }
-	    if (c != EOF) {
-		RSTRING(str)->ptr[last++] = c;
-	    }
-	    fread(RSTRING(str)->ptr + last, 1, pending, f); /* must not fail */
+	    read_buffered_data(RSTRING_PTR(str) + last, pending, fptr); /* must not fail */
+	    limit -= pending;
+	    *lp = limit;
 	    if (e) return delim;
+	    if (limit == 0)
+		return (unsigned char)RSTRING_PTR(str)[RSTRING_LEN(str)-1];
 	}
-	else if (c != EOF) {
-	    if (!NIL_P(str)) {
-		char ch = c;
-		rb_str_buf_cat(str, &ch, 1);
-	    }
-	    else {
-		*strp = str = rb_str_buf_new(1);
-		RSTRING(str)->ptr[RSTRING(str)->len++] = c;
-	    }
-	}
-	rb_thread_wait_fd(fileno(f));
-	rb_io_check_closed(fptr);
-#else
-	READ_CHECK(f);
-#endif
-	clearerr(f);
-	TRAP_BEG;
-	c = getc(f);
-	TRAP_END;
-	if (c == EOF) {
-	    if (ferror(f)) {
-		clearerr(f);
-		if (!rb_io_wait_readable(fileno(f)))
-		    rb_sys_fail(fptr->path);
-		continue;
-	    }
-#ifdef READ_DATA_PENDING_PTR
-	    return c;
-#endif
-	}
-#ifndef READ_DATA_PENDING_PTR
-	if (c == EOF || (*bp++ = c) == delim || bp == bpe) {
-	    int cnt = bp - buf;
-
-	    if (cnt > 0) {
-		if (!NIL_P(str))
-		    rb_str_cat(str, buf, cnt);
-		else
-		    *strp = str = rb_str_new(buf, cnt);
-	    }
-	    if (c == EOF) {
-		if (update)
-		    return (int)RSTRING(str)->ptr[RSTRING(str)->len-1];
-		return c;
-	    }
-	    bp = buf;
-	}
-	update = Qtrue;
-#endif
-    } while (c != delim);
-
-#ifdef READ_DATA_PENDING_PTR
-    {
-	char ch = c;
-	if (!NIL_P(str)) {
-	    rb_str_cat(str, &ch, 1);
-	}
-	else {
-	    *strp = str = rb_str_new(&ch, 1);
-	}
-    }
-#endif
-
-    return c;
+	READ_CHECK(fptr);
+    } while (io_fillbuf(fptr) >= 0);
+    *lp = limit;
+    return EOF;
 }
 
 static inline int
-swallow(fptr, term)
-    OpenFile *fptr;
-    int term;
-{
-    FILE *f = fptr->f;
-    int c;
+swallow(rb_io_t *fptr, int term)
+{
+    if (NEED_READCONV(fptr)) {
+	rb_encoding *enc = io_read_encoding(fptr);
+	int needconv = rb_enc_mbminlen(enc) != 1;
+	make_readconv(fptr, 0);
+	do {
+	    size_t cnt;
+	    while ((cnt = READ_CHAR_PENDING_COUNT(fptr)) > 0) {
+		const char *p = READ_CHAR_PENDING_PTR(fptr);
+		int i;
+		if (!needconv) {
+		    if (*p != term) return TRUE;
+		    i = (int)cnt;
+		    while (--i && *++p == term);
+		}
+		else {
+		    const char *e = p + cnt;
+		    if (rb_enc_ascget(p, e, &i, enc) != term) return TRUE;
+		    while ((p += i) < e && rb_enc_ascget(p, e, &i, enc) == term);
+		    i = (int)(e - p);
+		}
+		io_shift_cbuf(fptr, (int)cnt - i, NULL);
+	    }
+	} while (more_char(fptr) != MORE_CHAR_FINISHED);
+	return FALSE;
+    }
 
     do {
-#ifdef READ_DATA_PENDING_PTR
-	long cnt;
-	while ((cnt = READ_DATA_PENDING_COUNT(f)) > 0) {
+	size_t cnt;
+	while ((cnt = READ_DATA_PENDING_COUNT(fptr)) > 0) {
 	    char buf[1024];
-	    const char *p = READ_DATA_PENDING_PTR(f);
+	    const char *p = READ_DATA_PENDING_PTR(fptr);
 	    int i;
 	    if (cnt > sizeof buf) cnt = sizeof buf;
-	    if (*p != term) return Qtrue;
-	    i = cnt;
+	    if (*p != term) return TRUE;
+	    i = (int)cnt;
 	    while (--i && *++p == term);
-	    if (!fread(buf, 1, cnt - i, f)) /* must not fail */
-		rb_sys_fail(fptr->path);
-	}
-	rb_thread_wait_fd(fileno(f));
-	rb_io_check_closed(fptr);
-#else
-	READ_CHECK(f);
-#endif
-	clearerr(f);
-	TRAP_BEG;
-	c = getc(f);
-	TRAP_END;
-	if (c != term) {
-	    ungetc(c, f);
-	    return Qtrue;
+	    if (!read_buffered_data(buf, cnt - i, fptr)) /* must not fail */
+		rb_sys_fail_path(fptr->pathv);
 	}
-    } while (c != EOF);
-    return Qfalse;
+	READ_CHECK(fptr);
+    } while (io_fillbuf(fptr) == 0);
+    return FALSE;
 }
 
 static VALUE
-rb_io_getline_fast(fptr, delim)
-    OpenFile *fptr;
-    unsigned char delim;
+rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc, VALUE io)
 {
     VALUE str = Qnil;
-    int c;
+    int len = 0;
+    long pos = 0;
+    int cr = 0;
 
-    while ((c = appendline(fptr, delim, &str)) != EOF && c != delim);
+    for (;;) {
+	int pending = READ_DATA_PENDING_COUNT(fptr);
 
-    if (!NIL_P(str)) {
-	fptr->lineno++;
-	lineno = INT2FIX(fptr->lineno);
-	OBJ_TAINT(str);
+	if (pending > 0) {
+	    const char *p = READ_DATA_PENDING_PTR(fptr);
+	    const char *e;
+
+	    e = memchr(p, '\n', pending);
+	    if (e) {
+                pending = (int)(e - p + 1);
+	    }
+	    if (NIL_P(str)) {
+		str = rb_str_new(p, pending);
+		fptr->rbuf_off += pending;
+		fptr->rbuf_len -= pending;
+	    }
+	    else {
+		rb_str_resize(str, len + pending);
+		read_buffered_data(RSTRING_PTR(str)+len, pending, fptr);
+	    }
+	    len += pending;
+	    if (cr != ENC_CODERANGE_BROKEN)
+		pos += rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + len, enc, &cr);
+	    if (e) break;
+	}
+	READ_CHECK(fptr);
+	if (io_fillbuf(fptr) < 0) {
+	    if (NIL_P(str)) return Qnil;
+	    break;
+	}
+    }
+
+    str = io_enc_str(str, fptr);
+    ENC_CODERANGE_SET(str, cr);
+    fptr->lineno++;
+    if (io == ARGF.current_file) {
+	ARGF.lineno++;
+	ARGF.last_lineno = ARGF.lineno;
+    }
+    else {
+	ARGF.last_lineno = fptr->lineno;
     }
 
     return str;
 }
 
-static int
-rscheck(rsptr, rslen, rs)
-    char *rsptr;
-    long rslen;
-    VALUE rs;
+static void
+prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, VALUE io)
 {
-    if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
-	rb_raise(rb_eRuntimeError, "rs modified");
-    return 1;
-}
+    VALUE rs = rb_rs, lim = Qnil;
+    rb_io_t *fptr;
 
-static VALUE rb_io_getline(VALUE rs, VALUE io);
+    if (argc == 1) {
+        VALUE tmp = Qnil;
+
+        if (NIL_P(argv[0]) || !NIL_P(tmp = rb_check_string_type(argv[0]))) {
+            rs = tmp;
+        }
+        else {
+            lim = argv[0];
+        }
+    }
+    else if (2 <= argc) {
+        rb_scan_args(argc, argv, "2", &rs, &lim);
+        if (!NIL_P(rs))
+            StringValue(rs);
+    }
+    if (!NIL_P(rs)) {
+	rb_encoding *enc_rs, *enc_io;
+
+	GetOpenFile(io, fptr);
+	enc_rs = rb_enc_get(rs);
+	enc_io = io_read_encoding(fptr);
+	if (enc_io != enc_rs &&
+	    (rb_enc_str_coderange(rs) != ENC_CODERANGE_7BIT ||
+	     (RSTRING_LEN(rs) > 0 && !rb_enc_asciicompat(enc_io)))) {
+            if (rs == rb_default_rs) {
+                rs = rb_enc_str_new(0, 0, enc_io);
+                rb_str_buf_cat_ascii(rs, "\n");
+            }
+            else {
+                rb_raise(rb_eArgError, "encoding mismatch: %s IO with %s RS",
+                         rb_enc_name(enc_io),
+                         rb_enc_name(enc_rs));
+            }
+	}
+    }
+    *rsp = rs;
+    *limit = NIL_P(lim) ? -1L : NUM2LONG(lim);
+}
 
 static VALUE
-rb_io_getline(rs, io)
-    VALUE rs, io;
+rb_io_getline_1(VALUE rs, long limit, VALUE io)
 {
     VALUE str = Qnil;
-    OpenFile *fptr;
+    rb_io_t *fptr;
+    int nolimit = 0;
+    rb_encoding *enc;
 
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    if (NIL_P(rs)) {
+    rb_io_check_char_readable(fptr);
+    if (NIL_P(rs) && limit < 0) {
 	str = read_all(fptr, 0, Qnil);
-	if (RSTRING(str)->len == 0) return Qnil;
+	if (RSTRING_LEN(str) == 0) return Qnil;
     }
-    else if (rs == rb_default_rs) {
-	return rb_io_getline_fast(fptr, '\n');
+    else if (limit == 0) {
+	return rb_enc_str_new(0, 0, io_read_encoding(fptr));
+    }
+    else if (rs == rb_default_rs && limit < 0 && !NEED_READCONV(fptr) &&
+             rb_enc_asciicompat(enc = io_read_encoding(fptr))) {
+	return rb_io_getline_fast(fptr, enc, io);
     }
     else {
-	int c, newline;
-	char *rsptr;
-	long rslen;
+	int c, newline = -1;
+	const char *rsptr = 0;
+	long rslen = 0;
 	int rspara = 0;
+        int extra_limit = 16;
 
-	rslen = RSTRING(rs)->len;
-	if (rslen == 0) {
-	    rsptr = "\n\n";
-	    rslen = 2;
-	    rspara = 1;
-	    swallow(fptr, '\n');
-	}
-	else if (rslen == 1) {
-	    return rb_io_getline_fast(fptr, (unsigned char)RSTRING(rs)->ptr[0]);
-	}
-	else {
-	    rsptr = RSTRING(rs)->ptr;
+        enc = io_read_encoding(fptr);
+
+	if (!NIL_P(rs)) {
+	    rslen = RSTRING_LEN(rs);
+	    if (rslen == 0) {
+		rsptr = "\n\n";
+		rslen = 2;
+		rspara = 1;
+		swallow(fptr, '\n');
+		rs = 0;
+		if (!rb_enc_asciicompat(enc)) {
+		    rs = rb_usascii_str_new(rsptr, rslen);
+		    rs = rb_str_encode(rs, rb_enc_from_encoding(enc), 0, Qnil);
+		    OBJ_FREEZE(rs);
+		    rsptr = RSTRING_PTR(rs);
+		    rslen = RSTRING_LEN(rs);
+		}
+	    }
+	    else {
+		rsptr = RSTRING_PTR(rs);
+	    }
+	    newline = (unsigned char)rsptr[rslen - 1];
 	}
-	newline = rsptr[rslen - 1];
 
-	while ((c = appendline(fptr, newline, &str)) != EOF &&
-	       (c != newline || RSTRING(str)->len < rslen ||
-		(rspara || rscheck(rsptr,rslen,rs), 0) ||
-		memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen)));
+	/* MS - Optimisation */
+	while ((c = appendline(fptr, newline, &str, &limit)) != EOF) {
+            const char *s, *p, *pp, *e;
+
+	    if (c == newline) {
+		if (RSTRING_LEN(str) < rslen) continue;
+		s = RSTRING_PTR(str);
+                e = s + RSTRING_LEN(str);
+		p = e - rslen;
+		pp = rb_enc_left_char_head(s, p, e, enc);
+		if (pp != p) continue;
+		if (!rspara) rscheck(rsptr, rslen, rs);
+		if (memcmp(p, rsptr, rslen) == 0) break;
+	    }
+	    if (limit == 0) {
+		s = RSTRING_PTR(str);
+		p = s + RSTRING_LEN(str);
+		pp = rb_enc_left_char_head(s, p-1, p, enc);
+                if (extra_limit &&
+                    MBCLEN_NEEDMORE_P(rb_enc_precise_mbclen(pp, p, enc))) {
+                    /* relax the limit while incomplete character.
+                     * extra_limit limits the relax length */
+                    limit = 1;
+                    extra_limit--;
+                }
+                else {
+                    nolimit = 1;
+                    break;
+                }
+	    }
+	}
 
 	if (rspara) {
 	    if (c != EOF) {
 		swallow(fptr, '\n');
 	    }
 	}
+	if (!NIL_P(str))
+            str = io_enc_str(str, fptr);
     }
 
     if (!NIL_P(str)) {
-	fptr->lineno++;
-	lineno = INT2FIX(fptr->lineno);
-	OBJ_TAINT(str);
+	if (!nolimit) {
+	    fptr->lineno++;
+	    if (io == ARGF.current_file) {
+		ARGF.lineno++;
+		ARGF.last_lineno = ARGF.lineno;
+	    }
+	    else {
+		ARGF.last_lineno = fptr->lineno;
+	    }
+	}
     }
 
     return str;
 }
 
-VALUE
-rb_io_gets(io)
-    VALUE io;
+static VALUE
+rb_io_getline(int argc, VALUE *argv, VALUE io)
 {
-    OpenFile *fptr;
+    VALUE rs;
+    long limit;
 
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    return rb_io_getline_fast(fptr, '\n');
+    prepare_getline_args(argc, argv, &rs, &limit, io);
+    return rb_io_getline_1(rs, limit, io);
+}
+
+VALUE
+rb_io_gets(VALUE io)
+{
+    return rb_io_getline_1(rb_default_rs, -1, io);
 }
 
 /*
  *  call-seq:
- *     ios.gets(sep_string=$/)   => string or nil
- *  
+ *     ios.gets(sep=$/)     -> string or nil
+ *     ios.gets(limit)      -> string or nil
+ *     ios.gets(sep, limit) -> string or nil
+ *
  *  Reads the next ``line'' from the I/O stream; lines are separated by
- *  <i>sep_string</i>. A separator of <code>nil</code> reads the entire
+ *  <i>sep</i>. A separator of <code>nil</code> reads the entire
  *  contents, and a zero-length separator reads the input a paragraph at
  *  a time (two successive newlines in the input separate paragraphs).
  *  The stream must be opened for reading or an <code>IOError</code>
  *  will be raised. The line read in will be returned and also assigned
  *  to <code>$_</code>. Returns <code>nil</code> if called at end of
- *  file.
- *     
+ *  file.  If the first argument is an integer, or optional second
+ *  argument is given, the returning string would not be longer than the
+ *  given value in bytes.
+ *
  *     File.new("testfile").gets   #=> "This is line one\n"
  *     $_                          #=> "This is line one\n"
  */
 
 static VALUE
-rb_io_gets_m(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_gets_m(int argc, VALUE *argv, VALUE io)
 {
-    VALUE rs, str;
+    VALUE str;
 
-    if (argc == 0) {
-	rs = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &rs);
-	if (!NIL_P(rs)) StringValue(rs);
-    }
-    str = rb_io_getline(rs, io);
+    str = rb_io_getline(argc, argv, io);
     rb_lastline_set(str);
 
     return str;
@@ -1793,15 +2600,15 @@ rb_io_gets_m(argc, argv, io)
 
 /*
  *  call-seq:
- *     ios.lineno    => integer
- *  
+ *     ios.lineno    -> integer
+ *
  *  Returns the current line number in <em>ios</em>. The stream must be
  *  opened for reading. <code>lineno</code> counts the number of times
  *  <code>gets</code> is called, rather than the number of newlines
  *  encountered. The two values will differ if <code>gets</code> is
  *  called with a separator other than newline. See also the
  *  <code>$.</code> variable.
- *     
+ *
  *     f = File.new("testfile")
  *     f.lineno   #=> 0
  *     f.gets     #=> "This is line one\n"
@@ -1811,83 +2618,55 @@ rb_io_gets_m(argc, argv, io)
  */
 
 static VALUE
-rb_io_lineno(io)
-    VALUE io;
+rb_io_lineno(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
+    rb_io_check_char_readable(fptr);
     return INT2NUM(fptr->lineno);
 }
 
 /*
  *  call-seq:
- *     ios.lineno = integer    => integer
- *  
+ *     ios.lineno = integer    -> integer
+ *
  *  Manually sets the current line number to the given value.
  *  <code>$.</code> is updated only on the next read.
- *     
+ *
  *     f = File.new("testfile")
  *     f.gets                     #=> "This is line one\n"
  *     $.                         #=> 1
  *     f.lineno = 1000
  *     f.lineno                   #=> 1000
- *     $. # lineno of last read   #=> 1
+ *     $.                         #=> 1         # lineno of last read
  *     f.gets                     #=> "This is line two\n"
- *     $. # lineno of last read   #=> 1001
+ *     $.                         #=> 1001      # lineno of last read
  */
 
 static VALUE
-rb_io_set_lineno(io, lineno)
-    VALUE io, lineno;
+rb_io_set_lineno(VALUE io, VALUE lineno)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
+    rb_io_check_char_readable(fptr);
     fptr->lineno = NUM2INT(lineno);
     return lineno;
 }
 
-static void
-lineno_setter(val, id, var)
-    VALUE val;
-    ID id;
-    VALUE *var;
-{
-    gets_lineno = NUM2INT(val);
-    *var = INT2FIX(gets_lineno);
-}
-
-static VALUE
-argf_set_lineno(argf, val)
-    VALUE argf, val;
-{
-    gets_lineno = NUM2INT(val);
-    lineno = INT2FIX(gets_lineno);
-    return Qnil;
-}
-
-static VALUE
-argf_lineno()
-{
-    return lineno;
-}
-
 /*
  *  call-seq:
- *     ios.readline(sep_string=$/)   => string
- *  
+ *     ios.readline(sep=$/)     -> string
+ *     ios.readline(limit)      -> string
+ *     ios.readline(sep, limit) -> string
+ *
  *  Reads a line as with <code>IO#gets</code>, but raises an
  *  <code>EOFError</code> on end of file.
  */
 
 static VALUE
-rb_io_readline(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_readline(int argc, VALUE *argv, VALUE io)
 {
     VALUE line = rb_io_gets_m(argc, argv, io);
 
@@ -1899,37 +2678,31 @@ rb_io_readline(argc, argv, io)
 
 /*
  *  call-seq:
- *     ios.readlines(sep_string=$/)  =>   array
- *  
+ *     ios.readlines(sep=$/)     -> array
+ *     ios.readlines(limit)      -> array
+ *     ios.readlines(sep, limit) -> array
+ *
  *  Reads all of the lines in <em>ios</em>, and returns them in
- *  <i>anArray</i>. Lines are separated by the optional
- *  <i>sep_string</i>. If <i>sep_string</i> is <code>nil</code>, the
- *  rest of the stream is returned as a single record.
- *  The stream must be opened for reading or an
- *  <code>IOError</code> will be raised.
- *     
+ *  <i>anArray</i>. Lines are separated by the optional <i>sep</i>. If
+ *  <i>sep</i> is <code>nil</code>, the rest of the stream is returned
+ *  as a single record.  If the first argument is an integer, or
+ *  optional second argument is given, the returning string would not be
+ *  longer than the given value in bytes. The stream must be opened for
+ *  reading or an <code>IOError</code> will be raised.
+ *
  *     f = File.new("testfile")
  *     f.readlines[0]   #=> "This is line one\n"
  */
 
 static VALUE
-rb_io_readlines(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_readlines(int argc, VALUE *argv, VALUE io)
 {
-    VALUE line, ary;
-    VALUE rs;
+    VALUE line, ary, rs;
+    long limit;
 
-    if (argc == 0) {
-	rs = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &rs);
-	if (!NIL_P(rs)) StringValue(rs);
-    }
+    prepare_getline_args(argc, argv, &rs, &limit, io);
     ary = rb_ary_new();
-    while (!NIL_P(line = rb_io_getline(rs, io))) {
+    while (!NIL_P(line = rb_io_getline_1(rs, limit, io))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -1937,18 +2710,32 @@ rb_io_readlines(argc, argv, io)
 
 /*
  *  call-seq:
- *     ios.each(sep_string=$/)      {|line| block }  => ios
- *     ios.each_line(sep_string=$/) {|line| block }  => ios
- *  
+ *     ios.each(sep=$/) {|line| block }         -> ios
+ *     ios.each(limit) {|line| block }          -> ios
+ *     ios.each(sep,limit) {|line| block }      -> ios
+ *     ios.each(...)                            -> an_enumerator
+ *
+ *     ios.each_line(sep=$/) {|line| block }    -> ios
+ *     ios.each_line(limit) {|line| block }     -> ios
+ *     ios.each_line(sep,limit) {|line| block } -> ios
+ *     ios.each_line(...)                       -> an_enumerator
+ *
+ *     ios.lines(sep=$/) {|line| block }        -> ios
+ *     ios.lines(limit) {|line| block }         -> ios
+ *     ios.lines(sep,limit) {|line| block }     -> ios
+ *     ios.lines(...)                           -> an_enumerator
+ *
  *  Executes the block for every line in <em>ios</em>, where lines are
- *  separated by <i>sep_string</i>. <em>ios</em> must be opened for
+ *  separated by <i>sep</i>. <em>ios</em> must be opened for
  *  reading or an <code>IOError</code> will be raised.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     f = File.new("testfile")
  *     f.each {|line| puts "#{f.lineno}: #{line}" }
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     1: This is line one
  *     2: This is line two
  *     3: This is line three
@@ -1956,22 +2743,14 @@ rb_io_readlines(argc, argv, io)
  */
 
 static VALUE
-rb_io_each_line(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_each_line(int argc, VALUE *argv, VALUE io)
 {
-    VALUE str;
-    VALUE rs;
+    VALUE str, rs;
+    long limit;
 
-    if (argc == 0) {
-	rs = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &rs);
-	if (!NIL_P(rs)) StringValue(rs);
-    }
-    while (!NIL_P(str = rb_io_getline(rs, io))) {
+    RETURN_ENUMERATOR(io, argc, argv);
+    prepare_getline_args(argc, argv, &rs, &limit, io);
+    while (!NIL_P(str = rb_io_getline_1(rs, limit, io))) {
 	rb_yield(str);
     }
     return io;
@@ -1979,12 +2758,18 @@ rb_io_each_line(argc, argv, io)
 
 /*
  *  call-seq:
- *     ios.each_byte {|byte| block }  => nil
- *  
+ *     ios.bytes {|byte| block }      -> ios
+ *     ios.bytes                      -> an_enumerator
+ *
+ *     ios.each_byte {|byte| block }  -> ios
+ *     ios.each_byte                  -> an_enumerator
+ *
  *  Calls the given block once for each byte (0..255) in <em>ios</em>,
  *  passing the byte as an argument. The stream must be opened for
  *  reading or an <code>IOError</code> will be raised.
- *     
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     f = File.new("testfile")
  *     checksum = 0
  *     f.each_byte {|x| checksum ^= x }   #=> #<File:testfile>
@@ -1992,109 +2777,308 @@ rb_io_each_line(argc, argv, io)
  */
 
 static VALUE
-rb_io_each_byte(io)
-    VALUE io;
+rb_io_each_byte(VALUE io)
 {
-    OpenFile *fptr;
-    FILE *f;
-    int c;
+    rb_io_t *fptr;
+    char *p, *e;
 
+    RETURN_ENUMERATOR(io, 0, 0);
     GetOpenFile(io, fptr);
 
     for (;;) {
-	rb_io_check_readable(fptr);
-	f = fptr->f;
-	READ_CHECK(f);
-	clearerr(f);
-	TRAP_BEG;
-	c = getc(f);
-	TRAP_END;
-	if (c == EOF) {
-	    if (ferror(f)) {
-		clearerr(f);
-		if (!rb_io_wait_readable(fileno(f)))
-		    rb_sys_fail(fptr->path);
-		continue;
-	    }
+	p = fptr->rbuf+fptr->rbuf_off;
+	e = p + fptr->rbuf_len;
+	while (p < e) {
+	    fptr->rbuf_off++;
+	    fptr->rbuf_len--;
+	    rb_yield(INT2FIX(*p & 0xff));
+	    p++;
+	    errno = 0;
+	}
+	rb_io_check_byte_readable(fptr);
+	READ_CHECK(fptr);
+	if (io_fillbuf(fptr) < 0) {
 	    break;
 	}
-	rb_yield(INT2FIX(c & 0xff));
     }
-    if (ferror(f)) rb_sys_fail(fptr->path);
     return io;
 }
 
+static VALUE
+io_getc(rb_io_t *fptr, rb_encoding *enc)
+{
+    int r, n, cr = 0;
+    VALUE str;
+
+    if (NEED_READCONV(fptr)) {
+        VALUE str = Qnil;
+	rb_encoding *read_enc = io_read_encoding(fptr);
+
+        make_readconv(fptr, 0);
+
+        while (1) {
+            if (fptr->cbuf_len) {
+		r = rb_enc_precise_mbclen(fptr->cbuf+fptr->cbuf_off,
+			fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
+			read_enc);
+                if (!MBCLEN_NEEDMORE_P(r))
+                    break;
+                if (fptr->cbuf_len == fptr->cbuf_capa) {
+                    rb_raise(rb_eIOError, "too long character");
+                }
+            }
+
+            if (more_char(fptr) == MORE_CHAR_FINISHED) {
+                if (fptr->cbuf_len == 0) {
+		    clear_readconv(fptr);
+		    return Qnil;
+		}
+                /* return an unit of an incomplete character just before EOF */
+		str = rb_enc_str_new(fptr->cbuf+fptr->cbuf_off, 1, read_enc);
+		fptr->cbuf_off += 1;
+		fptr->cbuf_len -= 1;
+                if (fptr->cbuf_len == 0) clear_readconv(fptr);
+		ENC_CODERANGE_SET(str, ENC_CODERANGE_BROKEN);
+		return str;
+            }
+        }
+        if (MBCLEN_INVALID_P(r)) {
+            r = rb_enc_mbclen(fptr->cbuf+fptr->cbuf_off,
+                              fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
+                              read_enc);
+            io_shift_cbuf(fptr, r, &str);
+	    cr = ENC_CODERANGE_BROKEN;
+	}
+	else {
+	    io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str);
+	    cr = ISASCII(r) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID;
+	}
+	str = io_enc_str(str, fptr);
+	ENC_CODERANGE_SET(str, cr);
+	return str;
+    }
+
+    if (io_fillbuf(fptr) < 0) {
+	return Qnil;
+    }
+    if (rb_enc_asciicompat(enc) && ISASCII(fptr->rbuf[fptr->rbuf_off])) {
+	str = rb_str_new(fptr->rbuf+fptr->rbuf_off, 1);
+	fptr->rbuf_off += 1;
+	fptr->rbuf_len -= 1;
+	cr = ENC_CODERANGE_7BIT;
+    }
+    else {
+	r = rb_enc_precise_mbclen(fptr->rbuf+fptr->rbuf_off, fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc);
+	if (MBCLEN_CHARFOUND_P(r) &&
+	    (n = MBCLEN_CHARFOUND_LEN(r)) <= fptr->rbuf_len) {
+	    str = rb_str_new(fptr->rbuf+fptr->rbuf_off, n);
+	    fptr->rbuf_off += n;
+	    fptr->rbuf_len -= n;
+	    cr = ENC_CODERANGE_VALID;
+	}
+	else if (MBCLEN_NEEDMORE_P(r)) {
+	    str = rb_str_new(fptr->rbuf+fptr->rbuf_off, fptr->rbuf_len);
+	    fptr->rbuf_len = 0;
+	  getc_needmore:
+	    if (io_fillbuf(fptr) != -1) {
+		rb_str_cat(str, fptr->rbuf+fptr->rbuf_off, 1);
+		fptr->rbuf_off++;
+		fptr->rbuf_len--;
+		r = rb_enc_precise_mbclen(RSTRING_PTR(str), RSTRING_PTR(str)+RSTRING_LEN(str), enc);
+		if (MBCLEN_NEEDMORE_P(r)) {
+		    goto getc_needmore;
+		}
+		else if (MBCLEN_CHARFOUND_P(r)) {
+		    cr = ENC_CODERANGE_VALID;
+		}
+	    }
+	}
+	else {
+	    str = rb_str_new(fptr->rbuf+fptr->rbuf_off, 1);
+	    fptr->rbuf_off++;
+	    fptr->rbuf_len--;
+	}
+    }
+    if (!cr) cr = ENC_CODERANGE_BROKEN;
+    str = io_enc_str(str, fptr);
+    ENC_CODERANGE_SET(str, cr);
+    return str;
+}
+
 /*
  *  call-seq:
- *     ios.getc   => fixnum or nil
- *  
- *  Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
- *  <code>nil</code> if called at end of file.
- *     
+ *     ios.chars {|c| block }      -> ios
+ *     ios.chars                   -> an_enumerator
+ *
+ *     ios.each_char {|c| block }  -> ios
+ *     ios.each_char               -> an_enumerator
+ *
+ *  Calls the given block once for each character in <em>ios</em>,
+ *  passing the character as an argument. The stream must be opened for
+ *  reading or an <code>IOError</code> will be raised.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     f = File.new("testfile")
- *     f.getc   #=> 84
- *     f.getc   #=> 104
+ *     f.each_char {|c| print c, ' ' }   #=> #<File:testfile>
  */
 
-VALUE
-rb_io_getc(io)
-    VALUE io;
+static VALUE
+rb_io_each_char(VALUE io)
 {
-    OpenFile *fptr;
-    FILE *f;
-    int c;
+    rb_io_t *fptr;
+    rb_encoding *enc;
+    VALUE c;
 
+    RETURN_ENUMERATOR(io, 0, 0);
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    f = fptr->f;
+    rb_io_check_char_readable(fptr);
 
-  retry:
-    READ_CHECK(f);
-    clearerr(f);
-    TRAP_BEG;
-    c = getc(f);
-    TRAP_END;
-
-    if (c == EOF) {
-	if (ferror(f)) {
-	    clearerr(f);
-	    if (!rb_io_wait_readable(fileno(f)))
-		rb_sys_fail(fptr->path);
-	    goto retry;
-	}
-	return Qnil;
+    enc = io_input_encoding(fptr);
+    READ_CHECK(fptr);
+    while (!NIL_P(c = io_getc(fptr, enc))) {
+        rb_yield(c);
     }
-    return INT2FIX(c & 0xff);
+    return io;
 }
 
-int
-rb_getc(f)
-    FILE *f;
+
+/*
+ *  call-seq:
+ *     ios.each_codepoint {|c| block }  -> ios
+ *     ios.codepoints     {|c| block }  -> ios
+ *     ios.each_codepoint               -> an_enumerator
+ *     ios.codepoints                   -> an_enumerator
+ *
+ *  Passes the <code>Integer</code> ordinal of each character in <i>ios</i>,
+ *  passing the codepoint as an argument. The stream must be opened for
+ *  reading or an <code>IOError</code> will be raised.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ */
+
+static VALUE
+rb_io_each_codepoint(VALUE io)
 {
-    int c;
+    rb_io_t *fptr;
+    rb_encoding *enc;
+    unsigned int c;
+    int r, n;
+
+    RETURN_ENUMERATOR(io, 0, 0);
+    GetOpenFile(io, fptr);
+    rb_io_check_char_readable(fptr);
 
-    if (!READ_DATA_PENDING(f)) {
-	rb_thread_wait_fd(fileno(f));
+    READ_CHECK(fptr);
+    if (NEED_READCONV(fptr)) {
+	for (;;) {
+	    make_readconv(fptr, 0);
+	    for (;;) {
+		if (fptr->cbuf_len) {
+		    if (fptr->encs.enc)
+			r = rb_enc_precise_mbclen(fptr->cbuf+fptr->cbuf_off,
+						  fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
+						  fptr->encs.enc);
+		    else
+			r = ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
+		    if (!MBCLEN_NEEDMORE_P(r))
+			break;
+		    if (fptr->cbuf_len == fptr->cbuf_capa) {
+			rb_raise(rb_eIOError, "too long character");
+		    }
+		}
+		if (more_char(fptr) == MORE_CHAR_FINISHED) {
+                    clear_readconv(fptr);
+		    /* ignore an incomplete character before EOF */
+		    return io;
+		}
+	    }
+	    if (MBCLEN_INVALID_P(r)) {
+		rb_raise(rb_eArgError, "invalid byte sequence in %s",
+			 rb_enc_name(fptr->encs.enc));
+	    }
+	    n = MBCLEN_CHARFOUND_LEN(r);
+	    if (fptr->encs.enc) {
+		c = rb_enc_codepoint(fptr->cbuf+fptr->cbuf_off,
+				     fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
+				     fptr->encs.enc);
+	    }
+	    else {
+		c = (unsigned char)fptr->cbuf[fptr->cbuf_off];
+	    }
+	    fptr->cbuf_off += n;
+	    fptr->cbuf_len -= n;
+	    rb_yield(UINT2NUM(c));
+	}
+    }
+    enc = io_input_encoding(fptr);
+    for (;;) {
+	if (io_fillbuf(fptr) < 0) {
+	    return io;
+	}
+	r = rb_enc_precise_mbclen(fptr->rbuf+fptr->rbuf_off,
+				  fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc);
+	if (MBCLEN_CHARFOUND_P(r) &&
+	    (n = MBCLEN_CHARFOUND_LEN(r)) <= fptr->rbuf_len) {
+	    c = rb_enc_codepoint(fptr->rbuf+fptr->rbuf_off,
+				 fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc);
+	    fptr->rbuf_off += n;
+	    fptr->rbuf_len -= n;
+	    rb_yield(UINT2NUM(c));
+	}
+	else if (MBCLEN_INVALID_P(r)) {
+	    rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+	}
+	else {
+	    continue;
+	}
     }
-    clearerr(f);
-    TRAP_BEG;
-    c = getc(f);
-    TRAP_END;
+    return io;
+}
 
-    return c;
+
+
+/*
+ *  call-seq:
+ *     ios.getc   -> string or nil
+ *
+ *  Reads a one-character string from <em>ios</em>. Returns
+ *  <code>nil</code> if called at end of file.
+ *
+ *     f = File.new("testfile")
+ *     f.getc   #=> "h"
+ *     f.getc   #=> "e"
+ */
+
+static VALUE
+rb_io_getc(VALUE io)
+{
+    rb_io_t *fptr;
+    rb_encoding *enc;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_char_readable(fptr);
+
+    enc = io_input_encoding(fptr);
+    READ_CHECK(fptr);
+    return io_getc(fptr, enc);
 }
 
 /*
  *  call-seq:
- *     ios.readchar   => fixnum
- *  
- *  Reads a character as with <code>IO#getc</code>, but raises an
+ *     ios.readchar   -> string
+ *
+ *  Reads a one-character string from <em>ios</em>. Raises an
  *  <code>EOFError</code> on end of file.
+ *
+ *     f = File.new("testfile")
+ *     f.readchar   #=> "h"
+ *     f.readchar   #=> "e"
  */
 
 static VALUE
-rb_io_readchar(io)
-    VALUE io;
+rb_io_readchar(VALUE io)
 {
     VALUE c = rb_io_getc(io);
 
@@ -2106,111 +3090,407 @@ rb_io_readchar(io)
 
 /*
  *  call-seq:
- *     ios.ungetc(integer)   => nil
- *  
+ *     ios.getbyte   -> fixnum or nil
+ *
+ *  Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
+ *  <code>nil</code> if called at end of file.
+ *
+ *     f = File.new("testfile")
+ *     f.getbyte   #=> 84
+ *     f.getbyte   #=> 104
+ */
+
+VALUE
+rb_io_getbyte(VALUE io)
+{
+    rb_io_t *fptr;
+    int c;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_byte_readable(fptr);
+    READ_CHECK(fptr);
+    if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) && TYPE(rb_stdout) == T_FILE) {
+        rb_io_t *ofp;
+        GetOpenFile(rb_stdout, ofp);
+        if (ofp->mode & FMODE_TTY) {
+            rb_io_flush(rb_stdout);
+        }
+    }
+    if (io_fillbuf(fptr) < 0) {
+	return Qnil;
+    }
+    fptr->rbuf_off++;
+    fptr->rbuf_len--;
+    c = (unsigned char)fptr->rbuf[fptr->rbuf_off-1];
+    return INT2FIX(c & 0xff);
+}
+
+/*
+ *  call-seq:
+ *     ios.readbyte   -> fixnum
+ *
+ *  Reads a byte as with <code>IO#getbyte</code>, but raises an
+ *  <code>EOFError</code> on end of file.
+ */
+
+static VALUE
+rb_io_readbyte(VALUE io)
+{
+    VALUE c = rb_io_getbyte(io);
+
+    if (NIL_P(c)) {
+	rb_eof_error();
+    }
+    return c;
+}
+
+/*
+ *  call-seq:
+ *     ios.ungetbyte(string)   -> nil
+ *     ios.ungetbyte(integer)   -> nil
+ *
+ *  Pushes back bytes (passed as a parameter) onto <em>ios</em>,
+ *  such that a subsequent buffered read will return it. Only one byte
+ *  may be pushed back before a subsequent read operation (that is,
+ *  you will be able to read only the last of several bytes that have been pushed
+ *  back). Has no effect with unbuffered reads (such as <code>IO#sysread</code>).
+ *
+ *     f = File.new("testfile")   #=> #<File:testfile>
+ *     b = f.getbyte              #=> 0x38
+ *     f.ungetbyte(b)             #=> nil
+ *     f.getbyte                  #=> 0x38
+ */
+
+VALUE
+rb_io_ungetbyte(VALUE io, VALUE b)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_byte_readable(fptr);
+    if (NIL_P(b)) return Qnil;
+    if (FIXNUM_P(b)) {
+	char cc = FIX2INT(b);
+	b = rb_str_new(&cc, 1);
+    }
+    else {
+	SafeStringValue(b);
+    }
+    io_ungetbyte(b, fptr);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.ungetc(string)   -> nil
+ *
  *  Pushes back one character (passed as a parameter) onto <em>ios</em>,
- *  such that a subsequent buffered read will return it. Only one character
+ *  such that a subsequent buffered character read will return it. Only one character
  *  may be pushed back before a subsequent read operation (that is,
  *  you will be able to read only the last of several characters that have been pushed
  *  back). Has no effect with unbuffered reads (such as <code>IO#sysread</code>).
- *     
+ *
  *     f = File.new("testfile")   #=> #<File:testfile>
- *     c = f.getc                 #=> 84
+ *     c = f.getc                 #=> "8"
  *     f.ungetc(c)                #=> nil
- *     f.getc                     #=> 84
+ *     f.getc                     #=> "8"
  */
 
 VALUE
-rb_io_ungetc(io, c)
-    VALUE io, c;
+rb_io_ungetc(VALUE io, VALUE c)
 {
-    OpenFile *fptr;
-    int cc = NUM2INT(c);
+    rb_io_t *fptr;
+    long len;
 
     GetOpenFile(io, fptr);
-    if (!(fptr->mode & FMODE_RBUF))
-	rb_raise(rb_eIOError, "unread stream");
-    rb_io_check_readable(fptr);
-
-    if (ungetc(cc, fptr->f) == EOF && cc != EOF) {
-	rb_raise(rb_eIOError, "ungetc failed");
+    rb_io_check_char_readable(fptr);
+    if (NIL_P(c)) return Qnil;
+    if (FIXNUM_P(c)) {
+	c = rb_enc_uint_chr(FIX2UINT(c), io_read_encoding(fptr));
+    }
+    else if (TYPE(c) == T_BIGNUM) {
+	c = rb_enc_uint_chr(NUM2UINT(c), io_read_encoding(fptr));
+    }
+    else {
+	SafeStringValue(c);
+    }
+    if (NEED_READCONV(fptr)) {
+        len = RSTRING_LEN(c);
+#if SIZEOF_LONG > SIZEOF_INT
+	if (len > INT_MAX)
+	    rb_raise(rb_eIOError, "ungetc failed");
+#endif
+        make_readconv(fptr, (int)len);
+        if (fptr->cbuf_capa - fptr->cbuf_len < len)
+            rb_raise(rb_eIOError, "ungetc failed");
+        if (fptr->cbuf_off < len) {
+            MEMMOVE(fptr->cbuf+fptr->cbuf_capa-fptr->cbuf_len,
+                    fptr->cbuf+fptr->cbuf_off,
+                    char, fptr->cbuf_len);
+            fptr->cbuf_off = fptr->cbuf_capa-fptr->cbuf_len;
+        }
+        fptr->cbuf_off -= (int)len;
+        fptr->cbuf_len += (int)len;
+        MEMMOVE(fptr->cbuf+fptr->cbuf_off, RSTRING_PTR(c), char, len);
+    }
+    else {
+        io_ungetbyte(c, fptr);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     ios.isatty   => true or false
- *     ios.tty?     => true or false
- *  
+ *     ios.isatty   -> true or false
+ *     ios.tty?     -> true or false
+ *
  *  Returns <code>true</code> if <em>ios</em> is associated with a
  *  terminal device (tty), <code>false</code> otherwise.
- *     
+ *
  *     File.new("testfile").isatty   #=> false
  *     File.new("/dev/tty").isatty   #=> true
  */
 
 static VALUE
-rb_io_isatty(io)
-    VALUE io;
+rb_io_isatty(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
-    if (isatty(fileno(fptr->f)) == 0)
+    if (isatty(fptr->fd) == 0)
 	return Qfalse;
     return Qtrue;
 }
 
-static void
-fptr_finalize(fptr, noraise)
-    OpenFile *fptr;
-    int noraise;
+#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
+/*
+ *  call-seq:
+ *     ios.close_on_exec?   -> true or false
+ *
+ *  Returns <code>true</code> if <em>ios</em> will be closed on exec.
+ *
+ *     f = open("/dev/null")
+ *     f.close_on_exec?                 #=> false
+ *     f.close_on_exec = true
+ *     f.close_on_exec?                 #=> true
+ *     f.close_on_exec = false
+ *     f.close_on_exec?                 #=> false
+ */
+
+static VALUE
+rb_io_close_on_exec_p(VALUE io)
+{
+    rb_io_t *fptr;
+    VALUE write_io;
+    int fd, ret;
+
+    write_io = GetWriteIO(io);
+    if (io != write_io) {
+        GetOpenFile(write_io, fptr);
+        if (fptr && 0 <= (fd = fptr->fd)) {
+            if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
+            if (!(ret & FD_CLOEXEC)) return Qfalse;
+        }
+    }
+
+    GetOpenFile(io, fptr);
+    if (fptr && 0 <= (fd = fptr->fd)) {
+        if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
+        if (!(ret & FD_CLOEXEC)) return Qfalse;
+    }
+    return Qtrue;
+}
+#else
+#define rb_io_close_on_exec_p rb_f_notimplement
+#endif
+
+#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
+/*
+ *  call-seq:
+ *     ios.close_on_exec = bool    -> true or false
+ *
+ *  Sets a close-on-exec flag.
+ *
+ *     f = open("/dev/null")
+ *     f.close_on_exec = true
+ *     system("cat", "/proc/self/fd/#{f.fileno}") # cat: /proc/self/fd/3: No such file or directory
+ *     f.closed?                #=> false
+ */
+
+static VALUE
+rb_io_set_close_on_exec(VALUE io, VALUE arg)
+{
+    int flag = RTEST(arg) ? FD_CLOEXEC : 0;
+    rb_io_t *fptr;
+    VALUE write_io;
+    int fd, ret;
+
+    write_io = GetWriteIO(io);
+    if (io != write_io) {
+        GetOpenFile(write_io, fptr);
+        if (fptr && 0 <= (fd = fptr->fd)) {
+            if ((ret = fcntl(fptr->fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
+            if ((ret & FD_CLOEXEC) != flag) {
+                ret = (ret & ~FD_CLOEXEC) | flag;
+                ret = fcntl(fd, F_SETFD, ret);
+                if (ret == -1) rb_sys_fail_path(fptr->pathv);
+            }
+        }
+
+    }
+
+    GetOpenFile(io, fptr);
+    if (fptr && 0 <= (fd = fptr->fd)) {
+        if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
+        if ((ret & FD_CLOEXEC) != flag) {
+            ret = (ret & ~FD_CLOEXEC) | flag;
+            ret = fcntl(fd, F_SETFD, ret);
+            if (ret == -1) rb_sys_fail_path(fptr->pathv);
+        }
+    }
+    return Qnil;
+}
+#else
+#define rb_io_set_close_on_exec rb_f_notimplement
+#endif
+
+#define FMODE_PREP (1<<16)
+#define IS_PREP_STDIO(f) ((f)->mode & FMODE_PREP)
+#define PREP_STDIO_NAME(f) (RSTRING_PTR((f)->pathv))
+
+static VALUE
+finish_writeconv(rb_io_t *fptr, int noalloc)
+{
+    unsigned char *ds, *dp, *de;
+    rb_econv_result_t res;
+
+    if (!fptr->wbuf) {
+        unsigned char buf[1024];
+        long r;
+
+        res = econv_destination_buffer_full;
+        while (res == econv_destination_buffer_full) {
+            ds = dp = buf;
+            de = buf + sizeof(buf);
+            res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0);
+            while (dp-ds) {
+              retry:
+                r = rb_write_internal(fptr->fd, ds, dp-ds);
+                if (r == dp-ds)
+                    break;
+                if (0 <= r) {
+                    ds += r;
+                }
+                if (rb_io_wait_writable(fptr->fd)) {
+                    if (fptr->fd < 0)
+                        return noalloc ? Qtrue : rb_exc_new3(rb_eIOError, rb_str_new_cstr("closed stream"));
+                    goto retry;
+                }
+                return noalloc ? Qtrue : INT2NUM(errno);
+            }
+            if (res == econv_invalid_byte_sequence ||
+                res == econv_incomplete_input ||
+                res == econv_undefined_conversion) {
+                return noalloc ? Qtrue : rb_econv_make_exception(fptr->writeconv);
+            }
+        }
+
+        return Qnil;
+    }
+
+    res = econv_destination_buffer_full;
+    while (res == econv_destination_buffer_full) {
+        if (fptr->wbuf_len == fptr->wbuf_capa) {
+            if (io_fflush(fptr) < 0)
+                return noalloc ? Qtrue : INT2NUM(errno);
+        }
+
+        ds = dp = (unsigned char *)fptr->wbuf + fptr->wbuf_off + fptr->wbuf_len;
+        de = (unsigned char *)fptr->wbuf + fptr->wbuf_capa;
+        res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0);
+        fptr->wbuf_len += (int)(dp - ds);
+        if (res == econv_invalid_byte_sequence ||
+            res == econv_incomplete_input ||
+            res == econv_undefined_conversion) {
+            return noalloc ? Qtrue : rb_econv_make_exception(fptr->writeconv);
+        }
+    }
+    return Qnil;
+}
+
+struct finish_writeconv_arg {
+    rb_io_t *fptr;
+    int noalloc;
+};
+
+static VALUE
+finish_writeconv_sync(VALUE arg)
 {
-    int n1 = 0, n2 = 0, f1, f2 = -1;
+    struct finish_writeconv_arg *p = (struct finish_writeconv_arg *)arg;
+    return finish_writeconv(p->fptr, p->noalloc);
+}
 
-    errno = 0;
-    if (fptr->f2) {
-	f2 = fileno(fptr->f2);
-	while (n2 = 0, fflush(fptr->f2) < 0) {
-	    n2 = errno;
-	    if (!rb_io_wait_writable(f2)) {
-		break;
-	    }
-	    if (!fptr->f2) break;
-	}
-	if (fclose(fptr->f2) < 0 && n2 == 0) {
-	    n2 = errno;
+static void
+fptr_finalize(rb_io_t *fptr, int noraise)
+{
+    VALUE err = Qnil;
+    if (fptr->writeconv) {
+	if (fptr->write_lock && !noraise) {
+            struct finish_writeconv_arg arg;
+            arg.fptr = fptr;
+            arg.noalloc = noraise;
+            err = rb_mutex_synchronize(fptr->write_lock, finish_writeconv_sync, (VALUE)&arg);
 	}
-	fptr->f2 = 0;
-    }
-    if (fptr->f) {
-	f1 = fileno(fptr->f);
-	if ((f2 == -1) && (fptr->mode & FMODE_WBUF)) {
-	    while (n1 = 0, fflush(fptr->f) < 0) {
-		n1 = errno;
-		if (!rb_io_wait_writable(f1)) break;
-		if (!fptr->f) break;
-	    }
+	else {
+	    err = finish_writeconv(fptr, noraise);
 	}
-	if (fclose(fptr->f) < 0 && n1 == 0) {
-	    n1 = errno;
+    }
+    if (fptr->wbuf_len) {
+	if (noraise) {
+	    if ((int)io_flush_buffer_sync(fptr) < 0 && NIL_P(err))
+		err = Qtrue;
 	}
-	fptr->f = 0;
-	if (n1 == EBADF && f1 == f2) {
-	    n1 = 0;
+	else {
+	    if (io_fflush(fptr) < 0 && NIL_P(err))
+		err = INT2NUM(errno);
 	}
     }
-    if (!noraise && (n1 || n2)) {
-	errno = (n1 ? n1 : n2);
-	rb_sys_fail(fptr->path);
+    if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
+        goto skip_fd_close;
+    }
+    if (fptr->stdio_file) {
+        /* fptr->stdio_file is deallocated anyway
+         * even if fclose failed.  */
+        if (fclose(fptr->stdio_file) < 0 && NIL_P(err))
+            err = noraise ? Qtrue : INT2NUM(errno);
+    }
+    else if (0 <= fptr->fd) {
+        /* fptr->fd may be closed even if close fails.
+         * POSIX doesn't specify it.
+         * We assumes it is closed.  */
+        if (close(fptr->fd) < 0 && NIL_P(err))
+            err = noraise ? Qtrue : INT2NUM(errno);
+    }
+  skip_fd_close:
+    fptr->fd = -1;
+    fptr->stdio_file = 0;
+    fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
+
+    if (!NIL_P(err) && !noraise) {
+        switch(TYPE(err)) {
+          case T_FIXNUM:
+          case T_BIGNUM:
+            errno = NUM2INT(err);
+            rb_sys_fail_path(fptr->pathv);
+
+          default:
+            rb_exc_raise(err);
+        }
     }
 }
 
 static void
-rb_io_fptr_cleanup(fptr, noraise)
-    OpenFile *fptr;
-    int noraise;
+rb_io_fptr_cleanup(rb_io_t *fptr, int noraise)
 {
     if (fptr->finalize) {
 	(*fptr->finalize)(fptr, noraise);
@@ -2220,41 +3500,94 @@ rb_io_fptr_cleanup(fptr, noraise)
     }
 }
 
-void
-rb_io_fptr_finalize(fptr)
-    OpenFile *fptr;
+static void
+clear_readconv(rb_io_t *fptr)
 {
-    if (!fptr) return;
-    if (fptr->path) {
-	free(fptr->path);
+    if (fptr->readconv) {
+        rb_econv_close(fptr->readconv);
+        fptr->readconv = NULL;
+    }
+    if (fptr->cbuf) {
+        free(fptr->cbuf);
+        fptr->cbuf = NULL;
     }
-    if (!fptr->f && !fptr->f2) return;
-    if (fileno(fptr->f) < 3) return;
+}
 
-    rb_io_fptr_cleanup(fptr, Qtrue);
+static void
+clear_writeconv(rb_io_t *fptr)
+{
+    if (fptr->writeconv) {
+        rb_econv_close(fptr->writeconv);
+        fptr->writeconv = NULL;
+    }
+    fptr->writeconv_initialized = 0;
+}
+
+static void
+clear_codeconv(rb_io_t *fptr)
+{
+    clear_readconv(fptr);
+    clear_writeconv(fptr);
+}
+
+int
+rb_io_fptr_finalize(rb_io_t *fptr)
+{
+    if (!fptr) return 0;
+    fptr->pathv = Qnil;
+    if (0 <= fptr->fd)
+	rb_io_fptr_cleanup(fptr, TRUE);
+    fptr->write_lock = 0;
+    if (fptr->rbuf) {
+        free(fptr->rbuf);
+        fptr->rbuf = 0;
+    }
+    if (fptr->wbuf) {
+        free(fptr->wbuf);
+        fptr->wbuf = 0;
+    }
+    clear_codeconv(fptr);
+    free(fptr);
+    return 1;
+}
+
+size_t rb_econv_memsize(rb_econv_t *);
+
+size_t
+rb_io_memsize(rb_io_t *fptr)
+{
+    size_t size = sizeof(rb_io_t);
+    size += fptr->rbuf_capa;
+    size += fptr->wbuf_capa;
+    size += fptr->cbuf_capa;
+    if (fptr->readconv) size += rb_econv_memsize(fptr->readconv);
+    if (fptr->writeconv) size += rb_econv_memsize(fptr->writeconv);
+    return size;
 }
 
 VALUE
-rb_io_close(io)
-    VALUE io;
+rb_io_close(VALUE io)
 {
-    OpenFile *fptr;
-    int fd, fd2;
+    rb_io_t *fptr;
+    int fd;
+    VALUE write_io;
+    rb_io_t *write_fptr;
+
+    write_io = GetWriteIO(io);
+    if (io != write_io) {
+        write_fptr = RFILE(write_io)->fptr;
+        if (write_fptr && 0 <= write_fptr->fd) {
+            rb_io_fptr_cleanup(write_fptr, TRUE);
+        }
+    }
 
     fptr = RFILE(io)->fptr;
     if (!fptr) return Qnil;
-    if (fptr->f2) {
-	fd2 = fileno(fptr->f2);
-    }
-    else {
-	if (!fptr->f) return Qnil;
-	fd2 = -1;
-    }
+    if (fptr->fd < 0) return Qnil;
 
-    fd = fileno(fptr->f);
-    rb_io_fptr_cleanup(fptr, Qfalse);
+    fd = fptr->fd;
+    rb_io_fptr_cleanup(fptr, FALSE);
     rb_thread_fd_close(fd);
-    if (fd2 >= 0) rb_thread_fd_close(fd2);
 
     if (fptr->pid) {
 	rb_syswait(fptr->pid);
@@ -2266,8 +3599,8 @@ rb_io_close(io)
 
 /*
  *  call-seq:
- *     ios.close   => nil
- *  
+ *     ios.close   -> nil
+ *
  *  Closes <em>ios</em> and flushes any pending writes to the operating
  *  system. The stream is unavailable for any further data operations;
  *  an <code>IOError</code> is raised if such an attempt is made. I/O
@@ -2279,10 +3612,9 @@ rb_io_close(io)
  */
 
 static VALUE
-rb_io_close_m(io)
-    VALUE io;
+rb_io_close_m(VALUE io)
 {
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
+    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
     }
     rb_io_check_closed(RFILE(io)->fptr);
@@ -2291,27 +3623,25 @@ rb_io_close_m(io)
 }
 
 static VALUE
-io_call_close(io)
-    VALUE io;
+io_call_close(VALUE io)
 {
     return rb_funcall(io, rb_intern("close"), 0, 0);
 }
 
 static VALUE
-io_close(io)
-    VALUE io;
+io_close(VALUE io)
 {
     return rb_rescue(io_call_close, io, 0, 0);
 }
 
 /*
  *  call-seq:
- *     ios.closed?    => true or false
- *  
+ *     ios.closed?    -> true or false
+ *
  *  Returns <code>true</code> if <em>ios</em> is completely closed (for
  *  duplex streams, both reader and writer), <code>false</code>
  *  otherwise.
- *     
+ *
  *     f = File.new("testfile")
  *     f.close         #=> nil
  *     f.closed?       #=> true
@@ -2322,127 +3652,158 @@ io_close(io)
  *     f.closed?       #=> true
  */
 
+
 static VALUE
-rb_io_closed(io)
-    VALUE io;
+rb_io_closed(VALUE io)
 {
-    OpenFile *fptr;
+    rb_io_t *fptr;
+    VALUE write_io;
+    rb_io_t *write_fptr;
+
+    write_io = GetWriteIO(io);
+    if (io != write_io) {
+        write_fptr = RFILE(write_io)->fptr;
+        if (write_fptr && 0 <= write_fptr->fd) {
+            return Qfalse;
+        }
+    }
 
     fptr = RFILE(io)->fptr;
     rb_io_check_initialized(fptr);
-    return (fptr->f || fptr->f2)?Qfalse:Qtrue;
+    return 0 <= fptr->fd ? Qfalse : Qtrue;
 }
 
 /*
  *  call-seq:
- *     ios.close_read    => nil
- *  
+ *     ios.close_read    -> nil
+ *
  *  Closes the read end of a duplex I/O stream (i.e., one that contains
  *  both a read and a write stream, such as a pipe). Will raise an
  *  <code>IOError</code> if the stream is not duplexed.
- *     
+ *
  *     f = IO.popen("/bin/sh","r+")
  *     f.close_read
  *     f.readlines
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     prog.rb:3:in `readlines': not opened for reading (IOError)
  *     	from prog.rb:3
  */
 
 static VALUE
-rb_io_close_read(io)
-    VALUE io;
+rb_io_close_read(VALUE io)
 {
-    OpenFile *fptr;
-    int n;
+    rb_io_t *fptr;
+    VALUE write_io;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
+    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
     }
     GetOpenFile(io, fptr);
-    if (fptr->f2 == 0 && (fptr->mode & FMODE_WRITABLE)) {
-	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
+    if (is_socket(fptr->fd, fptr->pathv)) {
+#ifndef SHUT_RD
+# define SHUT_RD 0
+#endif
+        if (shutdown(fptr->fd, SHUT_RD) < 0)
+            rb_sys_fail_path(fptr->pathv);
+        fptr->mode &= ~FMODE_READABLE;
+        if (!(fptr->mode & FMODE_WRITABLE))
+            return rb_io_close(io);
+        return Qnil;
     }
-    if (fptr->f2 == 0) {
-	return rb_io_close(io);
+
+    write_io = GetWriteIO(io);
+    if (io != write_io) {
+	rb_io_t *wfptr;
+        rb_io_fptr_cleanup(fptr, FALSE);
+	GetOpenFile(write_io, wfptr);
+        RFILE(io)->fptr = wfptr;
+        RFILE(write_io)->fptr = NULL;
+        rb_io_fptr_finalize(fptr);
+        return Qnil;
     }
-    n = fclose(fptr->f);
-    fptr->mode &= ~FMODE_READABLE;
-    fptr->f = fptr->f2;
-    fptr->f2 = 0;
-    if (n != 0) rb_sys_fail(fptr->path);
 
-    return Qnil;
+    if (fptr->mode & FMODE_WRITABLE) {
+	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
+    }
+    return rb_io_close(io);
 }
 
 /*
  *  call-seq:
- *     ios.close_write   => nil
- *  
+ *     ios.close_write   -> nil
+ *
  *  Closes the write end of a duplex I/O stream (i.e., one that contains
  *  both a read and a write stream, such as a pipe). Will raise an
  *  <code>IOError</code> if the stream is not duplexed.
- *     
+ *
  *     f = IO.popen("/bin/sh","r+")
  *     f.close_write
  *     f.print "nowhere"
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     prog.rb:3:in `write': not opened for writing (IOError)
  *     	from prog.rb:3:in `print'
  *     	from prog.rb:3
  */
 
 static VALUE
-rb_io_close_write(io)
-    VALUE io;
+rb_io_close_write(VALUE io)
 {
-    OpenFile *fptr;
-    int n;
+    rb_io_t *fptr;
+    VALUE write_io;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
+    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
     }
-    GetOpenFile(io, fptr);
-    if (fptr->f2 == 0 && (fptr->mode & FMODE_READABLE)) {
-	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
+    write_io = GetWriteIO(io);
+    GetOpenFile(write_io, fptr);
+    if (is_socket(fptr->fd, fptr->pathv)) {
+#ifndef SHUT_WR
+# define SHUT_WR 1
+#endif
+        if (shutdown(fptr->fd, SHUT_WR) < 0)
+            rb_sys_fail_path(fptr->pathv);
+        fptr->mode &= ~FMODE_WRITABLE;
+        if (!(fptr->mode & FMODE_READABLE))
+	    return rb_io_close(write_io);
+        return Qnil;
     }
-    if (fptr->f2 == 0) {
-	return rb_io_close(io);
+
+    if (fptr->mode & FMODE_READABLE) {
+	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
     }
-    n = fclose(fptr->f2);
-    fptr->f2 = 0;
-    fptr->mode &= ~FMODE_WRITABLE;
-    if (n != 0) rb_sys_fail(fptr->path);
 
+    rb_io_close(write_io);
+    if (io != write_io) {
+	GetOpenFile(io, fptr);
+	fptr->tied_io_for_writing = 0;
+	fptr->mode &= ~FMODE_DUPLEX;
+    }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     ios.sysseek(offset, whence=SEEK_SET)   => integer
- *  
+ *     ios.sysseek(offset, whence=IO::SEEK_SET)   -> integer
+ *
  *  Seeks to a given <i>offset</i> in the stream according to the value
  *  of <i>whence</i> (see <code>IO#seek</code> for values of
  *  <i>whence</i>). Returns the new offset into the file.
- *     
+ *
  *     f = File.new("testfile")
  *     f.sysseek(-13, IO::SEEK_END)   #=> 53
  *     f.sysread(10)                  #=> "And so on."
  */
 
 static VALUE
-rb_io_sysseek(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_sysseek(int argc, VALUE *argv, VALUE io)
 {
     VALUE offset, ptrname;
     int whence = SEEK_SET;
-    OpenFile *fptr;
+    rb_io_t *fptr;
     off_t pos;
 
     if (rb_scan_args(argc, argv, "11", &offset, &ptrname) == 2) {
@@ -2450,326 +3811,381 @@ rb_io_sysseek(argc, argv, io)
     }
     pos = NUM2OFFT(offset);
     GetOpenFile(io, fptr);
-    if ((fptr->mode & FMODE_READABLE) && READ_DATA_BUFFERED(fptr->f)) {
+    if ((fptr->mode & FMODE_READABLE) &&
+        (READ_DATA_BUFFERED(fptr) || READ_CHAR_PENDING(fptr))) {
 	rb_raise(rb_eIOError, "sysseek for buffered IO");
     }
-    if ((fptr->mode & FMODE_WRITABLE) && (fptr->mode & FMODE_WBUF)) {
+    if ((fptr->mode & FMODE_WRITABLE) && fptr->wbuf_len) {
 	rb_warn("sysseek for buffered IO");
     }
-    pos = lseek(fileno(fptr->f), pos, whence);
-    if (pos == -1) rb_sys_fail(fptr->path);
-    clearerr(fptr->f);
+    errno = 0;
+    pos = lseek(fptr->fd, pos, whence);
+    if (pos == -1 && errno) rb_sys_fail_path(fptr->pathv);
 
     return OFFT2NUM(pos);
 }
 
 /*
  *  call-seq:
- *     ios.syswrite(string)   => integer
- *  
+ *     ios.syswrite(string)   -> integer
+ *
  *  Writes the given string to <em>ios</em> using a low-level write.
  *  Returns the number of bytes written. Do not mix with other methods
  *  that write to <em>ios</em> or you may get unpredictable results.
  *  Raises <code>SystemCallError</code> on error.
- *     
+ *
  *     f = File.new("out", "w")
  *     f.syswrite("ABCDEF")   #=> 6
  */
 
 static VALUE
-rb_io_syswrite(io, str)
-    VALUE io, str;
+rb_io_syswrite(VALUE io, VALUE str)
 {
-    OpenFile *fptr;
-    FILE *f;
+    rb_io_t *fptr;
     long n;
 
     rb_secure(4);
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
 
+    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
-    f = GetWriteFile(fptr);
 
-    if (fptr->mode & FMODE_WBUF) {
+    if (fptr->wbuf_len) {
 	rb_warn("syswrite for buffered IO");
     }
-    if (!rb_thread_fd_writable(fileno(f))) {
+    if (!rb_thread_fd_writable(fptr->fd)) {
         rb_io_check_closed(fptr);
     }
-    TRAP_BEG;
-    n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
-    TRAP_END;
 
-    if (n == -1) rb_sys_fail(fptr->path);
+    n = rb_write_internal(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
+
+    if (n == -1) rb_sys_fail_path(fptr->pathv);
 
     return LONG2FIX(n);
 }
 
 /*
  *  call-seq:
- *     ios.sysread(integer )    => string
- *  
+ *     ios.sysread(integer[, outbuf])    -> string
+ *
  *  Reads <i>integer</i> bytes from <em>ios</em> using a low-level
  *  read and returns them as a string. Do not mix with other methods
  *  that read from <em>ios</em> or you may get unpredictable results.
+ *  If the optional <i>outbuf</i> argument is present, it must reference
+ *  a String, which will receive the data.
  *  Raises <code>SystemCallError</code> on error and
  *  <code>EOFError</code> at end of file.
- *     
+ *
  *     f = File.new("testfile")
  *     f.sysread(16)   #=> "This is line one"
  */
 
 static VALUE
-rb_io_sysread(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_sysread(int argc, VALUE *argv, VALUE io)
 {
     VALUE len, str;
-    OpenFile *fptr;
+    rb_io_t *fptr;
     long n, ilen;
 
     rb_scan_args(argc, argv, "11", &len, &str);
     ilen = NUM2LONG(len);
 
-    if (NIL_P(str)) {
-	str = rb_str_new(0, ilen);
-    }
-    else {
-	StringValue(str);
-	rb_str_modify(str);
-	rb_str_resize(str, ilen);
-    }
+    io_setstrbuf(&str,ilen);
     if (ilen == 0) return str;
 
     GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
+    rb_io_check_byte_readable(fptr);
 
-    if (READ_DATA_BUFFERED(fptr->f)) {
+    if (READ_DATA_BUFFERED(fptr)) {
 	rb_raise(rb_eIOError, "sysread for buffered IO");
     }
-    rb_str_locktmp(str);
 
-    n = fileno(fptr->f);
-    rb_thread_wait_fd(fileno(fptr->f));
+    n = fptr->fd;
+    rb_thread_wait_fd(fptr->fd);
     rb_io_check_closed(fptr);
-    if (RSTRING(str)->len != ilen) {
-	rb_raise(rb_eRuntimeError, "buffer string modified");
-    }
-    TRAP_BEG;
-    n = read(fileno(fptr->f), RSTRING(str)->ptr, ilen);
-    TRAP_END;
 
+    rb_str_locktmp(str);
+    n = rb_read_internal(fptr->fd, RSTRING_PTR(str), ilen);
     rb_str_unlocktmp(str);
+
     if (n == -1) {
-	rb_sys_fail(fptr->path);
+	rb_sys_fail_path(fptr->pathv);
     }
-    rb_str_resize(str, n);
+    rb_str_set_len(str, n);
     if (n == 0 && ilen > 0) {
 	rb_eof_error();
     }
-    RSTRING(str)->len = n;
-    RSTRING(str)->ptr[n] = '\0';
+    rb_str_resize(str, n);
     OBJ_TAINT(str);
 
     return str;
 }
 
+VALUE
+rb_io_binmode(VALUE io)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(io, fptr);
+    if (fptr->readconv)
+        rb_econv_binmode(fptr->readconv);
+    if (fptr->writeconv)
+        rb_econv_binmode(fptr->writeconv);
+    fptr->mode |= FMODE_BINMODE;
+    fptr->mode &= ~FMODE_TEXTMODE;
+    fptr->writeconv_pre_ecflags &= ~(ECONV_UNIVERSAL_NEWLINE_DECORATOR|ECONV_CRLF_NEWLINE_DECORATOR|ECONV_CR_NEWLINE_DECORATOR);
+    return io;
+}
+
+VALUE
+rb_io_ascii8bit_binmode(VALUE io)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(io, fptr);
+    if (fptr->readconv) {
+        rb_econv_close(fptr->readconv);
+        fptr->readconv = NULL;
+    }
+    if (fptr->writeconv) {
+        rb_econv_close(fptr->writeconv);
+        fptr->writeconv = NULL;
+    }
+    fptr->mode |= FMODE_BINMODE;
+    fptr->mode &= ~FMODE_TEXTMODE;
+
+    fptr->encs.enc = rb_ascii8bit_encoding();
+    fptr->encs.enc2 = NULL;
+    fptr->encs.ecflags = 0;
+    fptr->encs.ecopts = Qnil;
+    clear_codeconv(fptr);
+
+    return io;
+}
+
 /*
  *  call-seq:
- *     ios.binmode    => ios
- *  
- *  Puts <em>ios</em> into binary mode. This is useful only in
- *  MS-DOS/Windows environments. Once a stream is in binary mode, it
- *  cannot be reset to nonbinary mode.
+ *     ios.binmode    -> ios
+ *
+ *  Puts <em>ios</em> into binary mode.
+ *  Once a stream is in binary mode, it cannot be reset to nonbinary mode.
+ *
+ *  - newline conversion disabled
+ *  - encoding conversion disabled
+ *  - content is treated as ASCII-8BIT
+ *
  */
 
-VALUE
-rb_io_binmode(io)
-    VALUE io;
+static VALUE
+rb_io_binmode_m(VALUE io)
 {
-#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
-    OpenFile *fptr;
+    VALUE write_io;
 
-    GetOpenFile(io, fptr);
-#ifdef __human68k__
-    if (fptr->f)
-	fmode(fptr->f, _IOBIN);
-    if (fptr->f2)
-	fmode(fptr->f2, _IOBIN);
-#else
-    if (fptr->f && setmode(fileno(fptr->f), O_BINARY) == -1)
-	rb_sys_fail(fptr->path);
-    if (fptr->f2 && setmode(fileno(fptr->f2), O_BINARY) == -1)
-	rb_sys_fail(fptr->path);
-#endif
+    rb_io_ascii8bit_binmode(io);
 
-    fptr->mode |= FMODE_BINMODE;
-#endif
+    write_io = GetWriteIO(io);
+    if (write_io != io)
+        rb_io_ascii8bit_binmode(write_io);
     return io;
 }
 
-char*
-rb_io_flags_mode(flags)
-    int flags;
+/*
+ *  call-seq:
+ *     ios.binmode?    -> true or false
+ *
+ *  Returns <code>true</code> if <em>ios</em> is binmode.
+ */
+static VALUE
+rb_io_binmode_p(VALUE io)
 {
-#ifdef O_BINARY
-# define MODE_BINMODE(a,b) ((flags & FMODE_BINMODE) ? (b) : (a))
-#else
-# define MODE_BINMODE(a,b) (a)
-#endif
-    if (flags & FMODE_APPEND) {
-	if ((flags & FMODE_READWRITE) == FMODE_READWRITE) {
-	    return MODE_BINMODE("a+", "ab+");
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    return fptr->mode & FMODE_BINMODE ? Qtrue : Qfalse;
+}
+
+static const char*
+rb_io_fmode_modestr(int fmode)
+{
+# define MODE_BTMODE(a,b,c) ((fmode & FMODE_BINMODE) ? (b) : \
+                             (fmode & FMODE_TEXTMODE) ? (c) : (a))
+    if (fmode & FMODE_APPEND) {
+	if ((fmode & FMODE_READWRITE) == FMODE_READWRITE) {
+	    return MODE_BTMODE("a+", "ab+", "at+");
 	}
-	return MODE_BINMODE("a", "ab");
+	return MODE_BTMODE("a", "ab", "at");
     }
-    switch (flags & FMODE_READWRITE) {
+    switch (fmode & FMODE_READWRITE) {
       case FMODE_READABLE:
-	return MODE_BINMODE("r", "rb");
+	return MODE_BTMODE("r", "rb", "rt");
       case FMODE_WRITABLE:
-	return MODE_BINMODE("w", "wb");
+	return MODE_BTMODE("w", "wb", "wt");
       case FMODE_READWRITE:
-	if (flags & FMODE_CREATE) {
-	    return MODE_BINMODE("w+", "wb+");
+	if (fmode & FMODE_CREATE) {
+	    return MODE_BTMODE("w+", "wb+", "wt+");
 	}
-	return MODE_BINMODE("r+", "rb+");
+	return MODE_BTMODE("r+", "rb+", "rt+");
     }
-    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
+    rb_raise(rb_eArgError, "invalid access fmode 0x%x", fmode);
     return NULL;		/* not reached */
 }
 
+static int
+io_encname_bom_p(const char *name, long len)
+{
+    static const char bom_prefix[] = "bom|utf-";
+    enum {bom_prefix_len = (int)sizeof(bom_prefix) - 1};
+    if (!len) {
+	const char *p = strchr(name, ':');
+	len = p ? (long)(p - name) : (long)strlen(name);
+    }
+    return len > bom_prefix_len && STRNCASECMP(name, bom_prefix, bom_prefix_len) == 0;
+}
+
 int
-rb_io_mode_flags(mode)
-    const char *mode;
+rb_io_modestr_fmode(const char *modestr)
 {
-    int flags = 0;
-    const char *m = mode;
+    int fmode = 0;
+    const char *m = modestr, *p = NULL;
 
     switch (*m++) {
       case 'r':
-	flags |= FMODE_READABLE;
+	fmode |= FMODE_READABLE;
 	break;
       case 'w':
-	flags |= FMODE_WRITABLE | FMODE_CREATE;
+	fmode |= FMODE_WRITABLE | FMODE_TRUNC | FMODE_CREATE;
 	break;
       case 'a':
-	flags |= FMODE_WRITABLE | FMODE_APPEND | FMODE_CREATE;
+	fmode |= FMODE_WRITABLE | FMODE_APPEND | FMODE_CREATE;
 	break;
       default:
       error:
-	rb_raise(rb_eArgError, "illegal access mode %s", mode);
+	rb_raise(rb_eArgError, "invalid access mode %s", modestr);
     }
 
     while (*m) {
         switch (*m++) {
-        case 'b':
-            flags |= FMODE_BINMODE;
+	  case 'b':
+            fmode |= FMODE_BINMODE;
+            break;
+	  case 't':
+            fmode |= FMODE_TEXTMODE;
             break;
-        case '+':
-            flags |= FMODE_READWRITE;
+	  case '+':
+            fmode |= FMODE_READWRITE;
             break;
-        default:
+	  default:
             goto error;
+	  case ':':
+	    p = m;
+            goto finished;
         }
     }
 
-    return flags;
+  finished:
+    if ((fmode & FMODE_BINMODE) && (fmode & FMODE_TEXTMODE))
+        goto error;
+    if (p && io_encname_bom_p(p, 0))
+	fmode |= FMODE_SETENC_BY_BOM;
+
+    return fmode;
 }
 
 int
-rb_io_modenum_flags(mode)
-    int mode;
+rb_io_oflags_fmode(int oflags)
 {
-    int flags = 0;
+    int fmode = 0;
 
-    switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) {
+    switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
       case O_RDONLY:
-	flags = FMODE_READABLE;
+	fmode = FMODE_READABLE;
 	break;
       case O_WRONLY:
-	flags = FMODE_WRITABLE;
+	fmode = FMODE_WRITABLE;
 	break;
       case O_RDWR:
-	flags = FMODE_READWRITE;
+	fmode = FMODE_READWRITE;
 	break;
     }
 
-    if (mode & O_APPEND) {
-	flags |= FMODE_APPEND;
+    if (oflags & O_APPEND) {
+	fmode |= FMODE_APPEND;
+    }
+    if (oflags & O_TRUNC) {
+	fmode |= FMODE_TRUNC;
     }
-    if (mode & O_CREAT) {
-	flags |= FMODE_CREATE;
+    if (oflags & O_CREAT) {
+	fmode |= FMODE_CREATE;
     }
 #ifdef O_BINARY
-    if (mode & O_BINARY) {
-	flags |= FMODE_BINMODE;
+    if (oflags & O_BINARY) {
+	fmode |= FMODE_BINMODE;
     }
 #endif
 
-    return flags;
+    return fmode;
 }
 
 static int
-rb_io_mode_modenum(mode)
-    const char *mode;
+rb_io_fmode_oflags(int fmode)
 {
-    int flags = 0;
-    const char *m = mode;
+    int oflags = 0;
 
-    switch (*m++) {
-      case 'r':
-	flags |= O_RDONLY;
-	break;
-      case 'w':
-	flags |= O_WRONLY | O_CREAT | O_TRUNC;
-	break;
-      case 'a':
-	flags |= O_WRONLY | O_CREAT | O_APPEND;
-	break;
-      default:
-      error:
-	rb_raise(rb_eArgError, "illegal access mode %s", mode);
+    switch (fmode & FMODE_READWRITE) {
+      case FMODE_READABLE:
+        oflags |= O_RDONLY;
+        break;
+      case FMODE_WRITABLE:
+        oflags |= O_WRONLY;
+        break;
+      case FMODE_READWRITE:
+        oflags |= O_RDWR;
+        break;
     }
 
-    while (*m) {
-        switch (*m++) {
-        case 'b':
+    if (fmode & FMODE_APPEND) {
+        oflags |= O_APPEND;
+    }
+    if (fmode & FMODE_TRUNC) {
+        oflags |= O_TRUNC;
+    }
+    if (fmode & FMODE_CREATE) {
+        oflags |= O_CREAT;
+    }
 #ifdef O_BINARY
-            flags |= O_BINARY;
-#endif
-            break;
-        case '+':
-            flags = (flags & ~O_ACCMODE) | O_RDWR;
-            break;
-        default:
-            goto error;
-        }
+    if (fmode & FMODE_BINMODE) {
+        oflags |= O_BINARY;
     }
+#endif
 
-    return flags;
+    return oflags;
 }
 
-#define MODENUM_MAX 4
+int
+rb_io_modestr_oflags(const char *modestr)
+{
+    return rb_io_fmode_oflags(rb_io_modestr_fmode(modestr));
+}
 
-static char*
-rb_io_modenum_mode(flags)
-    int flags;
+static const char*
+rb_io_oflags_modestr(int oflags)
 {
 #ifdef O_BINARY
-# define MODE_BINARY(a,b) ((flags & O_BINARY) ? (b) : (a))
+# define MODE_BINARY(a,b) ((oflags & O_BINARY) ? (b) : (a))
 #else
 # define MODE_BINARY(a,b) (a)
 #endif
-    if (flags & O_APPEND) {
-	if ((flags & O_RDWR) == O_RDWR) {
+    int accmode = oflags & (O_RDONLY|O_WRONLY|O_RDWR);
+    if (oflags & O_APPEND) {
+	if (accmode == O_WRONLY) {
+	    return MODE_BINARY("a", "ab");
+	}
+	if (accmode == O_RDWR) {
 	    return MODE_BINARY("a+", "ab+");
 	}
-	return MODE_BINARY("a", "ab");
     }
-    switch (flags & (O_RDONLY|O_WRONLY|O_RDWR)) {
+    switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
       case O_RDONLY:
 	return MODE_BINARY("r", "rb");
       case O_WRONLY:
@@ -2777,92 +4193,403 @@ rb_io_modenum_mode(flags)
       case O_RDWR:
 	return MODE_BINARY("r+", "rb+");
     }
-    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
+    rb_raise(rb_eArgError, "invalid access oflags 0x%x", oflags);
     return NULL;		/* not reached */
 }
 
-static int
-rb_sysopen(fname, flags, mode)
-    char *fname;
-    int flags;
-    unsigned int mode;
+/*
+ * Convert external/internal encodings to enc/enc2
+ * NULL => use default encoding
+ * Qnil => no encoding specified (internal only)
+ */
+static void
+rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc, rb_encoding **enc2)
 {
-    int fd;
+    int default_ext = 0;
 
-    fd = open(fname, flags, mode);
-    if (fd < 0) {
-	if (errno == EMFILE || errno == ENFILE) {
-	    rb_gc();
-	    fd = open(fname, flags, mode);
+    if (ext == NULL) {
+	ext = rb_default_external_encoding();
+	default_ext = 1;
+    }
+    if (intern == NULL && ext != rb_ascii8bit_encoding())
+	/* If external is ASCII-8BIT, no default transcoding */
+	intern = rb_default_internal_encoding();
+    if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) {
+	/* No internal encoding => use external + no transcoding */
+	*enc = (default_ext && intern != ext) ? NULL : ext;
+	*enc2 = NULL;
+    }
+    else {
+	*enc = intern;
+	*enc2 = ext;
+    }
+}
+
+static void
+parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p)
+{
+    const char *p;
+    char encname[ENCODING_MAXNAMELEN+1];
+    int idx, idx2;
+    rb_encoding *ext_enc, *int_enc;
+
+    /* parse estr as "enc" or "enc2:enc" or "enc:-" */
+
+    p = strrchr(estr, ':');
+    if (p) {
+	long len = (p++) - estr;
+	if (len == 0 || len > ENCODING_MAXNAMELEN)
+	    idx = -1;
+	else {
+	    if (io_encname_bom_p(estr, len)) {
+		if (fmode_p) *fmode_p |= FMODE_SETENC_BY_BOM;
+		estr += 4;
+                len -= 4;
+            }
+	    memcpy(encname, estr, len);
+	    encname[len] = '\0';
+	    estr = encname;
+	    idx = rb_enc_find_index(encname);
 	}
-	if (fd < 0) {
-	    rb_sys_fail(fname);
+    }
+    else {
+	long len = strlen(estr);
+	if (io_encname_bom_p(estr, len)) {
+	    if (fmode_p) *fmode_p |= FMODE_SETENC_BY_BOM;
+	    estr += 4;
+            len -= 4;
+	    memcpy(encname, estr, len);
+	    encname[len] = '\0';
+	    estr = encname;
 	}
+	idx = rb_enc_find_index(estr);
     }
-    return fd;
+
+    if (idx >= 0)
+	ext_enc = rb_enc_from_index(idx);
+    else {
+	if (idx != -2)
+	    rb_warn("Unsupported encoding %s ignored", estr);
+	ext_enc = NULL;
+    }
+
+    int_enc = NULL;
+    if (p) {
+	if (*p == '-' && *(p+1) == '\0') {
+	    /* Special case - "-" => no transcoding */
+	    int_enc = (rb_encoding *)Qnil;
+	}
+	else {
+	    idx2 = rb_enc_find_index(p);
+	    if (idx2 < 0)
+		rb_warn("Unsupported encoding %s ignored", p);
+	    else if (idx2 == idx) {
+		rb_warn("Ignoring internal encoding %s: it is identical to external encoding %s", p, estr);
+		int_enc = (rb_encoding *)Qnil;
+	    }
+	    else
+		int_enc = rb_enc_from_index(idx2);
+	}
+    }
+
+    rb_io_ext_int_to_encs(ext_enc, int_enc, enc_p, enc2_p);
 }
 
-FILE *
-rb_fopen(fname, mode)
-    const char *fname;
-    const char *mode;
+static void
+mode_enc(rb_io_t *fptr, const char *estr)
 {
-    FILE *file;
+    clear_codeconv(fptr);
 
-    file = fopen(fname, mode);
-    if (!file) {
-	if (errno == EMFILE || errno == ENFILE) {
-	    rb_gc();
-	    file = fopen(fname, mode);
+    parse_mode_enc(estr, &fptr->encs.enc, &fptr->encs.enc2, NULL);
+}
+
+static void
+rb_io_mode_enc(rb_io_t *fptr, const char *modestr)
+{
+    const char *p = strchr(modestr, ':');
+    if (p) {
+	mode_enc(fptr, p+1);
+    }
+}
+
+int
+rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p)
+{
+    VALUE encoding=Qnil, extenc=Qundef, intenc=Qundef, tmp;
+    int extracted = 0;
+    rb_encoding *extencoding = NULL;
+    rb_encoding *intencoding = NULL;
+
+    if (!NIL_P(opt)) {
+	VALUE v;
+	v = rb_hash_lookup2(opt, sym_encoding, Qnil);
+	if (v != Qnil) encoding = v;
+	v = rb_hash_lookup2(opt, sym_extenc, Qundef);
+	if (v != Qnil) extenc = v;
+	v = rb_hash_lookup2(opt, sym_intenc, Qundef);
+	if (v != Qundef) intenc = v;
+    }
+    if ((extenc != Qundef || intenc != Qundef) && !NIL_P(encoding)) {
+	if (!NIL_P(ruby_verbose)) {
+	    int idx = rb_to_encoding_index(encoding);
+	    rb_warn("Ignoring encoding parameter '%s': %s_encoding is used",
+		    idx < 0 ? StringValueCStr(encoding) : rb_enc_name(rb_enc_from_index(idx)),
+		    extenc == Qundef ? "internal" : "external");
 	}
-	if (!file) {
-	    rb_sys_fail(fname);
+	encoding = Qnil;
+    }
+    if (extenc != Qundef && !NIL_P(extenc)) {
+	extencoding = rb_to_encoding(extenc);
+    }
+    if (intenc != Qundef) {
+	if (NIL_P(intenc)) {
+	    /* internal_encoding: nil => no transcoding */
+	    intencoding = (rb_encoding *)Qnil;
+	}
+	else if (!NIL_P(tmp = rb_check_string_type(intenc))) {
+	    char *p = StringValueCStr(tmp);
+
+	    if (*p == '-' && *(p+1) == '\0') {
+		/* Special case - "-" => no transcoding */
+		intencoding = (rb_encoding *)Qnil;
+	    }
+	    else {
+		intencoding = rb_to_encoding(intenc);
+	    }
+	}
+	else {
+	    intencoding = rb_to_encoding(intenc);
+	}
+	if (extencoding == intencoding) {
+	    intencoding = (rb_encoding *)Qnil;
 	}
     }
-#ifdef USE_SETVBUF
-    if (setvbuf(file, NULL, _IOFBF, 0) != 0)
-	rb_warn("setvbuf() can't be honoured for %s", fname);
+    if (!NIL_P(encoding)) {
+	extracted = 1;
+	if (!NIL_P(tmp = rb_check_string_type(encoding))) {
+	    parse_mode_enc(StringValueCStr(tmp), enc_p, enc2_p, fmode_p);
+	}
+	else {
+	    rb_io_ext_int_to_encs(rb_to_encoding(encoding), NULL, enc_p, enc2_p);
+	}
+    }
+    else if (extenc != Qundef || intenc != Qundef) {
+        extracted = 1;
+	rb_io_ext_int_to_encs(extencoding, intencoding, enc_p, enc2_p);
+    }
+    return extracted;
+}
+
+typedef struct rb_io_enc_t convconfig_t;
+
+static void
+validate_enc_binmode(int fmode, rb_encoding *enc, rb_encoding *enc2)
+{
+    if ((fmode & FMODE_READABLE) &&
+        !enc2 &&
+        !(fmode & FMODE_BINMODE) &&
+        !rb_enc_asciicompat(enc ? enc : rb_default_external_encoding()))
+        rb_raise(rb_eArgError, "ASCII incompatible encoding needs binmode");
+}
+
+static void
+extract_binmode(VALUE opthash, int *fmode)
+{
+    if (!NIL_P(opthash)) {
+	VALUE v;
+	v = rb_hash_aref(opthash, sym_textmode);
+	if (!NIL_P(v) && RTEST(v))
+            *fmode |= FMODE_TEXTMODE;
+	v = rb_hash_aref(opthash, sym_binmode);
+	if (!NIL_P(v) && RTEST(v))
+            *fmode |= FMODE_BINMODE;
+
+	if ((*fmode & FMODE_BINMODE) && (*fmode & FMODE_TEXTMODE))
+	    rb_raise(rb_eArgError, "both textmode and binmode specified");
+    }
+}
+
+static void
+rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
+        int *oflags_p, int *fmode_p, convconfig_t *convconfig_p)
+{
+    VALUE vmode;
+    int oflags, fmode;
+    rb_encoding *enc, *enc2;
+    int ecflags;
+    VALUE ecopts;
+    int has_enc = 0, has_vmode = 0;
+    VALUE intmode;
+
+    vmode = *vmode_p;
+
+    /* Set to defaults */
+    rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2);
+
+    if (NIL_P(vmode)) {
+        fmode = FMODE_READABLE;
+        oflags = O_RDONLY;
+    }
+    else if (!NIL_P(intmode = rb_check_to_integer(vmode, "to_int"))) {
+        vmode = intmode;
+        oflags = NUM2INT(intmode);
+        fmode = rb_io_oflags_fmode(oflags);
+    }
+    else {
+        const char *p;
+
+      vmode_handle:
+        SafeStringValue(vmode);
+        p = StringValueCStr(vmode);
+        fmode = rb_io_modestr_fmode(p);
+        oflags = rb_io_fmode_oflags(fmode);
+        p = strchr(p, ':');
+        if (p) {
+            has_enc = 1;
+            parse_mode_enc(p+1, &enc, &enc2, &fmode);
+        }
+	else {
+	    rb_encoding *e;
+
+	    e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
+	    rb_io_ext_int_to_encs(e, NULL, &enc, &enc2);
+	}
+    }
+
+    if (NIL_P(opthash)) {
+        ecflags = 0;
+        ecopts = Qnil;
+    }
+    else {
+	VALUE v;
+	extract_binmode(opthash, &fmode);
+#ifdef O_BINARY
+	if (fmode & FMODE_BINMODE)
+            oflags |= O_BINARY;
 #endif
-#ifdef __human68k__
-    fmode(file, _IOTEXT);
+	if (!has_vmode) {
+	    v = rb_hash_aref(opthash, sym_mode);
+	    if (!NIL_P(v)) {
+		if (!NIL_P(vmode)) {
+		    rb_raise(rb_eArgError, "mode specified twice");
+		}
+		has_vmode = 1;
+		vmode = v;
+		goto vmode_handle;
+	    }
+	}
+	v = rb_hash_aref(opthash, sym_perm);
+	if (!NIL_P(v)) {
+	    if (vperm_p) {
+		if (!NIL_P(*vperm_p)) {
+		    rb_raise(rb_eArgError, "perm specified twice");
+		}
+		*vperm_p = v;
+	    }
+	    else {
+		/* perm no use, just ignore */
+	    }
+	}
+        ecflags = rb_econv_prepare_opts(opthash, &ecopts);
+
+        if (rb_io_extract_encoding_option(opthash, &enc, &enc2, &fmode)) {
+            if (has_enc) {
+                rb_raise(rb_eArgError, "encoding specified twice");
+            }
+        }
+    }
+
+    validate_enc_binmode(fmode, enc, enc2);
+
+    *vmode_p = vmode;
+
+    *oflags_p = oflags;
+    *fmode_p = fmode;
+    convconfig_p->enc = enc;
+    convconfig_p->enc2 = enc2;
+    convconfig_p->ecflags = ecflags;
+    convconfig_p->ecopts = ecopts;
+}
+
+struct sysopen_struct {
+    VALUE fname;
+    int oflags;
+    mode_t perm;
+};
+
+static VALUE
+sysopen_func(void *ptr)
+{
+    const struct sysopen_struct *data = ptr;
+    const char *fname = RSTRING_PTR(data->fname);
+    return (VALUE)open(fname, data->oflags, data->perm);
+}
+
+static inline int
+rb_sysopen_internal(struct sysopen_struct *data)
+{
+    return (int)rb_thread_blocking_region(sysopen_func, data, RUBY_UBF_IO, 0);
+}
+
+static int
+rb_sysopen(VALUE fname, int oflags, mode_t perm)
+{
+    int fd;
+    struct sysopen_struct data;
+
+#ifdef O_BINARY
+    oflags |= O_BINARY;
 #endif
-    return file;
+    data.fname = rb_str_encode_ospath(fname);
+    data.oflags = oflags;
+    data.perm = perm;
+
+    fd = rb_sysopen_internal(&data);
+    if (fd < 0) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    fd = rb_sysopen_internal(&data);
+	}
+	if (fd < 0) {
+	    rb_sys_fail(RSTRING_PTR(fname));
+	}
+    }
+    UPDATE_MAXFD(fd);
+    return fd;
 }
 
 FILE *
-rb_fdopen(fd, mode)
-    int fd;
-    const char *mode;
+rb_fdopen(int fd, const char *modestr)
 {
     FILE *file;
 
 #if defined(sun)
     errno = 0;
 #endif
-    file = fdopen(fd, mode);
+    file = fdopen(fd, modestr);
     if (!file) {
+	if (
 #if defined(sun)
-	if (errno == 0 || errno == EMFILE || errno == ENFILE) {
-#else
-	if (errno == EMFILE || errno == ENFILE) {
+	    errno == 0 ||
 #endif
+	    errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
 #if defined(sun)
 	    errno = 0;
 #endif
-	    file = fdopen(fd, mode);
+	    file = fdopen(fd, modestr);
 	}
 	if (!file) {
 #ifdef _WIN32
 	    if (errno == 0) errno = EINVAL;
-#endif
-#if defined(sun)
+#elif defined(sun)
 	    if (errno == 0) errno = EMFILE;
 #endif
 	    rb_sys_fail(0);
 	}
     }
 
+    /* xxx: should be _IONBF?  A buffer in FILE may have trouble. */
 #ifdef USE_SETVBUF
     if (setvbuf(file, NULL, _IOFBF, 0) != 0)
 	rb_warn("setvbuf() can't be honoured (fd=%d)", fd);
@@ -2870,67 +4597,167 @@ rb_fdopen(fd, mode)
     return file;
 }
 
-static VALUE
-rb_file_open_internal(io, fname, mode)
-    VALUE io;
-    const char *fname, *mode;
+static void
+io_check_tty(rb_io_t *fptr)
 {
-    OpenFile *fptr;
+    if (isatty(fptr->fd))
+        fptr->mode |= FMODE_TTY|FMODE_DUPLEX;
+}
 
-    MakeOpenFile(io, fptr);
+static VALUE rb_io_internal_encoding(VALUE);
+static void io_encoding_set(rb_io_t *, VALUE, VALUE, VALUE);
 
-    fptr->mode = rb_io_mode_flags(mode);
-    fptr->path = strdup(fname);
-    fptr->f = rb_fopen(fptr->path, rb_io_flags_mode(fptr->mode));
+static int
+io_strip_bom(VALUE io)
+{
+    int b1, b2, b3, b4;
+    switch (b1 = FIX2INT(rb_io_getbyte(io))) {
+      case 0xEF:
+	b2 = FIX2INT(rb_io_getbyte(io));
+	if (b2 == 0xBB) {
+	    b3 = FIX2INT(rb_io_getbyte(io));
+	    if (b3 == 0xBF) {
+		return rb_utf8_encindex();
+	    }
+	    rb_io_ungetbyte(io, INT2FIX(b3));
+	}
+	rb_io_ungetbyte(io, INT2FIX(b2));
+	break;
 
-    return io;
+      case 0xFE:
+	b2 = FIX2INT(rb_io_getbyte(io));
+	if (b2 == 0xFF) {
+	    return rb_enc_find_index("UTF-16BE");
+	}
+	rb_io_ungetbyte(io, INT2FIX(b2));
+	break;
+
+      case 0xFF:
+	b2 = FIX2INT(rb_io_getbyte(io));
+	if (b2 == 0xFE) {
+	    b3 = FIX2INT(rb_io_getbyte(io));
+	    if (b3 == 0) {
+		b4 = FIX2INT(rb_io_getbyte(io));
+		if (b4 == 0) {
+		    return rb_enc_find_index("UTF-32LE");
+		}
+		rb_io_ungetbyte(io, INT2FIX(b4));
+	    }
+	    else {
+		rb_io_ungetbyte(io, INT2FIX(b3));
+		return rb_enc_find_index("UTF-16LE");
+	    }
+	    rb_io_ungetbyte(io, INT2FIX(b3));
+	}
+	rb_io_ungetbyte(io, INT2FIX(b2));
+	break;
+
+      case 0:
+	b2 = FIX2INT(rb_io_getbyte(io));
+	if (b2 == 0) {
+	    b3 = FIX2INT(rb_io_getbyte(io));
+	    if (b3 == 0xFE) {
+		b4 = FIX2INT(rb_io_getbyte(io));
+		if (b4 == 0xFF) {
+		    return rb_enc_find_index("UTF-32BE");
+		}
+		rb_io_ungetbyte(io, INT2FIX(b4));
+	    }
+	    rb_io_ungetbyte(io, INT2FIX(b3));
+	}
+	rb_io_ungetbyte(io, INT2FIX(b2));
+	break;
+    }
+    rb_io_ungetbyte(io, INT2FIX(b1));
+    return 0;
 }
 
-VALUE
-rb_file_open(fname, mode)
-    const char *fname, *mode;
+static void
+io_set_encoding_by_bom(VALUE io)
 {
-    return rb_file_open_internal(io_alloc(rb_cFile), fname, mode);
+    int idx = io_strip_bom(io);
+
+    if (idx) {
+	rb_io_t *fptr;
+	GetOpenFile(io, fptr);
+	io_encoding_set(fptr, rb_enc_from_encoding(rb_enc_from_index(idx)),
+		rb_io_internal_encoding(io), Qnil);
+    }
 }
 
 static VALUE
-rb_file_sysopen_internal(io, fname, flags, mode)
-    VALUE io;
-    char *fname;
-    int flags, mode;
+rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode, convconfig_t *convconfig, mode_t perm)
 {
-    OpenFile *fptr;
-    int fd;
-    char *m;
+    rb_io_t *fptr;
+    convconfig_t cc;
+    if (!convconfig) {
+	/* Set to default encodings */
+	rb_io_ext_int_to_encs(NULL, NULL, &cc.enc, &cc.enc2);
+        cc.ecflags = 0;
+        cc.ecopts = Qnil;
+        convconfig = &cc;
+    }
+    validate_enc_binmode(fmode, convconfig->enc, convconfig->enc2);
 
     MakeOpenFile(io, fptr);
-
-    fptr->path = strdup(fname);
-    m = rb_io_modenum_mode(flags);
-    fptr->mode = rb_io_modenum_flags(flags);
-    fd = rb_sysopen(fptr->path, flags, mode);
-    fptr->f = rb_fdopen(fd, m);
+    fptr->mode = fmode;
+    fptr->encs = *convconfig;
+    fptr->pathv = rb_str_new_frozen(filename);
+    fptr->fd = rb_sysopen(fptr->pathv, oflags, perm);
+    io_check_tty(fptr);
+    if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io);
 
     return io;
 }
 
+static VALUE
+rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
+{
+    int fmode = rb_io_modestr_fmode(modestr);
+    const char *p = strchr(modestr, ':');
+    convconfig_t convconfig;
+
+    if (p) {
+        parse_mode_enc(p+1, &convconfig.enc, &convconfig.enc2, &fmode);
+    }
+    else {
+	rb_encoding *e;
+	/* Set to default encodings */
+
+	e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
+	rb_io_ext_int_to_encs(e, NULL, &convconfig.enc, &convconfig.enc2);
+        convconfig.ecflags = 0;
+        convconfig.ecopts = Qnil;
+    }
+
+    return rb_file_open_generic(io, filename,
+            rb_io_fmode_oflags(fmode),
+            fmode,
+            &convconfig,
+            0666);
+}
+
+VALUE
+rb_file_open_str(VALUE fname, const char *modestr)
+{
+    FilePathValue(fname);
+    return rb_file_open_internal(io_alloc(rb_cFile), fname, modestr);
+}
+
 VALUE
-rb_file_sysopen(fname, flags, mode)
-    const char *fname;
-    int flags, mode;
+rb_file_open(const char *fname, const char *modestr)
 {
-    return rb_file_sysopen_internal(io_alloc(rb_cFile), fname, flags, mode);
+    return rb_file_open_internal(io_alloc(rb_cFile), rb_str_new_cstr(fname), modestr);
 }
 
-#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__VMS)
+#if defined(__CYGWIN__) || !defined(HAVE_FORK)
 static struct pipe_list {
-    OpenFile *fptr;
+    rb_io_t *fptr;
     struct pipe_list *next;
 } *pipe_list;
 
 static void
-pipe_add_fptr(fptr)
-    OpenFile *fptr;
+pipe_add_fptr(rb_io_t *fptr)
 {
     struct pipe_list *list;
 
@@ -2941,8 +4768,7 @@ pipe_add_fptr(fptr)
 }
 
 static void
-pipe_del_fptr(fptr)
-    OpenFile *fptr;
+pipe_del_fptr(rb_io_t *fptr)
 {
     struct pipe_list *list = pipe_list;
     struct pipe_list *tmp;
@@ -2965,7 +4791,7 @@ pipe_del_fptr(fptr)
 }
 
 static void
-pipe_atexit _((void))
+pipe_atexit(void)
 {
     struct pipe_list *list = pipe_list;
     struct pipe_list *tmp;
@@ -2977,27 +4803,17 @@ pipe_atexit _((void))
     }
 }
 
-static void pipe_finalize _((OpenFile *fptr,int));
-
 static void
-pipe_finalize(fptr, noraise)
-    OpenFile *fptr;
-    int noraise;
+pipe_finalize(rb_io_t *fptr, int noraise)
 {
-#if !defined (__CYGWIN__) && !defined(_WIN32)
-    extern VALUE rb_last_status;
-    int status;
-    if (fptr->f) {
-	status = pclose(fptr->f);
-    }
-    if (fptr->f2) {
-	status = pclose(fptr->f2);
+#if !defined(HAVE_FORK) && !defined(_WIN32)
+    int status = 0;
+    if (fptr->stdio_file) {
+	status = pclose(fptr->stdio_file);
     }
-    fptr->f = fptr->f2 = 0;
-#if defined DJGPP
-    status <<= 8;
-#endif
-    rb_last_status = INT2FIX(status);
+    fptr->fd = -1;
+    fptr->stdio_file = 0;
+    rb_last_status_set(status, fptr->pid);
 #else
     fptr_finalize(fptr, noraise);
 #endif
@@ -3006,266 +4822,541 @@ pipe_finalize(fptr, noraise)
 #endif
 
 void
-rb_io_synchronized(fptr)
-    OpenFile *fptr;
+rb_io_synchronized(rb_io_t *fptr)
 {
+    rb_io_check_initialized(fptr);
     fptr->mode |= FMODE_SYNC;
 }
 
 void
-rb_io_unbuffered(fptr)
-    OpenFile *fptr;
+rb_io_unbuffered(rb_io_t *fptr)
 {
     rb_io_synchronized(fptr);
 }
 
-static VALUE pipe_open(VALUE pstr, char *pname, char *mode);
+int
+rb_pipe(int *pipes)
+{
+    int ret;
+    ret = pipe(pipes);
+    if (ret == -1) {
+        if (errno == EMFILE || errno == ENFILE) {
+            rb_gc();
+            ret = pipe(pipes);
+        }
+    }
+    if (ret == 0) {
+        UPDATE_MAXFD(pipes[0]);
+        UPDATE_MAXFD(pipes[1]);
+    }
+    return ret;
+}
 
-static VALUE
-pipe_open(pstr, pname, mode)
-    VALUE pstr;
-    char *pname, *mode;
+#ifdef HAVE_FORK
+struct popen_arg {
+    struct rb_exec_arg *execp;
+    int modef;
+    int pair[2];
+    int write_pair[2];
+};
+
+static void
+popen_redirect(struct popen_arg *p)
 {
-    int modef = rb_io_mode_flags(mode);
-    OpenFile *fptr;
-#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
-    FILE *f;
-#else
-    int pid;
-#ifdef _WIN32
-    FILE *fpr, *fpw;
+    if ((p->modef & FMODE_READABLE) && (p->modef & FMODE_WRITABLE)) {
+        close(p->write_pair[1]);
+        if (p->write_pair[0] != 0) {
+            dup2(p->write_pair[0], 0);
+            close(p->write_pair[0]);
+        }
+        close(p->pair[0]);
+        if (p->pair[1] != 1) {
+            dup2(p->pair[1], 1);
+            close(p->pair[1]);
+        }
+    }
+    else if (p->modef & FMODE_READABLE) {
+        close(p->pair[0]);
+        if (p->pair[1] != 1) {
+            dup2(p->pair[1], 1);
+            close(p->pair[1]);
+        }
+    }
+    else {
+        close(p->pair[1]);
+        if (p->pair[0] != 0) {
+            dup2(p->pair[0], 0);
+            close(p->pair[0]);
+        }
+    }
+}
+
+void
+rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
+{
+    int fd, ret;
+    int max = max_file_descriptor;
+    if (max < maxhint)
+        max = maxhint;
+    for (fd = lowfd; fd <= max; fd++) {
+        if (!NIL_P(noclose_fds) &&
+            RTEST(rb_hash_lookup(noclose_fds, INT2FIX(fd))))
+            continue;
+#ifdef FD_CLOEXEC
+	ret = fcntl(fd, F_GETFD);
+	if (ret != -1 && !(ret & FD_CLOEXEC)) {
+            fcntl(fd, F_SETFD, ret|FD_CLOEXEC);
+        }
 #else
-    int pr[2], pw[2];
+	ret = close(fd);
 #endif
-#endif
-    volatile int doexec;
+#define CONTIGUOUS_CLOSED_FDS 20
+        if (ret != -1) {
+	    if (max < fd + CONTIGUOUS_CLOSED_FDS)
+		max = fd + CONTIGUOUS_CLOSED_FDS;
+	}
+    }
+}
 
-    if (!pname) pname = StringValueCStr(pstr);
-    doexec = (strcmp("-", pname) != 0);
+static int
+popen_exec(void *pp, char *errmsg, size_t errmsg_len)
+{
+    struct popen_arg *p = (struct popen_arg*)pp;
 
-#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) || defined(_WIN32)
-    if (!doexec) {
-	rb_raise(rb_eNotImpError,
-		 "fork() function is unimplemented on this machine");
-    }
+    rb_thread_atfork_before_exec();
+    return rb_exec_err(p->execp, errmsg, errmsg_len);
+}
 #endif
 
-#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
-    f = popen(pname, mode);
-    
-    if (!f) rb_sys_fail(pname);
-    else {
-	VALUE port = io_alloc(rb_cIO);
+static VALUE
+pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig)
+{
+    rb_pid_t pid = 0;
+    rb_io_t *fptr;
+    VALUE port;
+    rb_io_t *write_fptr;
+    VALUE write_port;
+#if defined(HAVE_FORK)
+    int status;
+    struct popen_arg arg;
+    char errmsg[80] = { '\0' };
+#elif defined(_WIN32)
+    volatile VALUE argbuf;
+    char **args = NULL;
+    int pair[2], write_pair[2];
+#endif
+#if !defined(HAVE_FORK)
+    struct rb_exec_arg sarg;
+#endif
+    FILE *fp = 0;
+    int fd = -1;
+    int write_fd = -1;
+    const char *cmd = 0;
+    int argc;
+    VALUE *argv;
 
-	MakeOpenFile(port, fptr);
-	fptr->finalize = pipe_finalize;
-	fptr->mode = modef;
+    if (prog)
+        cmd = StringValueCStr(prog);
 
-	pipe_add_fptr(fptr);
-	if (modef & FMODE_READABLE) fptr->f  = f;
-	if (modef & FMODE_WRITABLE) {
-	    if (fptr->f) fptr->f2 = f;
-	    else fptr->f = f;
-	    rb_io_synchronized(fptr);
-	}
-	return (VALUE)port;
+    if (!eargp) {
+        /* fork : IO.popen("-") */
+        argc = 0;
+        argv = 0;
     }
-#else
-#ifdef _WIN32
-retry:
-    pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
-    if (pid == -1) {		/* exec failed */
-	if (errno == EAGAIN) {
-	    rb_thread_sleep(1);
-	    goto retry;
-	}
-	rb_sys_fail(pname);
+    else if (eargp->argc) {
+        /* no shell : IO.popen([prog, arg0], arg1, ...) */
+        argc = eargp->argc;
+        argv = eargp->argv;
     }
     else {
-        VALUE port = io_alloc(rb_cIO);
-
-	MakeOpenFile(port, fptr);
-	fptr->mode = modef;
-	fptr->mode |= FMODE_SYNC;
-	fptr->pid = pid;
-
-	if (modef & FMODE_READABLE) {
-	    fptr->f = fpr;
-	}
-	if (modef & FMODE_WRITABLE) {
-	    if (fptr->f) fptr->f2 = fpw;
-	    else fptr->f = fpw;
+        /* with shell : IO.popen(prog) */
+        argc = 0;
+        argv = 0;
+    }
+
+#if defined(HAVE_FORK)
+    arg.execp = eargp;
+    arg.modef = fmode;
+    arg.pair[0] = arg.pair[1] = -1;
+    arg.write_pair[0] = arg.write_pair[1] = -1;
+    switch (fmode & (FMODE_READABLE|FMODE_WRITABLE)) {
+      case FMODE_READABLE|FMODE_WRITABLE:
+        if (rb_pipe(arg.write_pair) < 0)
+            rb_sys_fail(cmd);
+        if (rb_pipe(arg.pair) < 0) {
+            int e = errno;
+            close(arg.write_pair[0]);
+            close(arg.write_pair[1]);
+            errno = e;
+            rb_sys_fail(cmd);
+        }
+        if (eargp) {
+            rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(arg.write_pair[0]));
+            rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
+        }
+	break;
+      case FMODE_READABLE:
+        if (rb_pipe(arg.pair) < 0)
+            rb_sys_fail(cmd);
+        if (eargp)
+            rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
+	break;
+      case FMODE_WRITABLE:
+        if (rb_pipe(arg.pair) < 0)
+            rb_sys_fail(cmd);
+        if (eargp)
+            rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(arg.pair[0]));
+	break;
+      default:
+        rb_sys_fail(cmd);
+    }
+    if (eargp) {
+        rb_exec_arg_fixup(arg.execp);
+	pid = rb_fork_err(&status, popen_exec, &arg, arg.execp->redirect_fds, errmsg, sizeof(errmsg));
+    }
+    else {
+	fflush(stdin);		/* is it really needed? */
+	pid = rb_fork(&status, 0, 0, Qnil);
+	if (pid == 0) {		/* child */
+	    rb_thread_atfork();
+	    popen_redirect(&arg);
+	    rb_io_synchronized(RFILE(orig_stdout)->fptr);
+	    rb_io_synchronized(RFILE(orig_stderr)->fptr);
+	    return Qnil;
 	}
-	fptr->finalize = pipe_finalize;
-	pipe_add_fptr(fptr);
-	return (VALUE)port;
     }
-#else
-    if (((modef & FMODE_READABLE) && pipe(pr) == -1) ||
-	((modef & FMODE_WRITABLE) && pipe(pw) == -1))
-	rb_sys_fail(pname);
 
-    if (!doexec) {
-	fflush(stdin);		/* is it really needed? */
-	fflush(stdout);
-	fflush(stderr);
+    /* parent */
+    if (pid == -1) {
+	int e = errno;
+	close(arg.pair[0]);
+	close(arg.pair[1]);
+        if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
+            close(arg.write_pair[0]);
+            close(arg.write_pair[1]);
+        }
+	errno = e;
+        if (errmsg[0])
+            rb_sys_fail(errmsg);
+	rb_sys_fail(cmd);
     }
+    if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) {
+        close(arg.pair[1]);
+        fd = arg.pair[0];
+        close(arg.write_pair[0]);
+        write_fd = arg.write_pair[1];
+    }
+    else if (fmode & FMODE_READABLE) {
+        close(arg.pair[1]);
+        fd = arg.pair[0];
+    }
+    else {
+        close(arg.pair[0]);
+        fd = arg.pair[1];
+    }
+#elif defined(_WIN32)
+    if (argc) {
+	int i;
 
-  retry:
-    switch ((pid = fork())) {
-      case 0:			/* child */
-	if (modef & FMODE_READABLE) {
-	    close(pr[0]);
-	    if (pr[1] != 1) {
-		dup2(pr[1], 1);
-		close(pr[1]);
-	    }
-	}
-	if (modef & FMODE_WRITABLE) {
-	    close(pw[1]);
-	    if (pw[0] != 0) {
-		dup2(pw[0], 0);
-		close(pw[0]);
-	    }
+	if (argc >= (int)(FIXNUM_MAX / sizeof(char *))) {
+	    rb_raise(rb_eArgError, "too many arguments");
 	}
-
-	if (doexec) {
-	    int fd;
-
-	    for (fd = 3; fd < NOFILE; fd++)
-		close(fd);
-	    rb_proc_exec(pname);
-	    fprintf(stderr, "%s:%d: command not found: %s\n",
-		    ruby_sourcefile, ruby_sourceline, pname);
-	    _exit(127);
+	argbuf = rb_str_tmp_new((argc+1) * sizeof(char *));
+	args = (void *)RSTRING_PTR(argbuf);
+	for (i = 0; i < argc; ++i) {
+	    args[i] = StringValueCStr(argv[i]);
 	}
-	rb_io_synchronized(RFILE(orig_stdout)->fptr);
-	rb_io_synchronized(RFILE(orig_stderr)->fptr);
-	return Qnil;
-
-      case -1:			/* fork failed */
-	if (errno == EAGAIN) {
+	args[i] = NULL;
+    }
+    switch (fmode & (FMODE_READABLE|FMODE_WRITABLE)) {
+      case FMODE_READABLE|FMODE_WRITABLE:
+        if (rb_pipe(write_pair) < 0)
+            rb_sys_fail(cmd);
+        if (rb_pipe(pair) < 0) {
+            int e = errno;
+            close(write_pair[0]);
+            close(write_pair[1]);
+            errno = e;
+            rb_sys_fail(cmd);
+        }
+        if (eargp) {
+            rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(write_pair[0]));
+            rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(pair[1]));
+        }
+	break;
+      case FMODE_READABLE:
+        if (rb_pipe(pair) < 0)
+            rb_sys_fail(cmd);
+        if (eargp)
+            rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(pair[1]));
+	break;
+      case FMODE_WRITABLE:
+        if (rb_pipe(pair) < 0)
+            rb_sys_fail(cmd);
+        if (eargp)
+            rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(pair[0]));
+	break;
+      default:
+        rb_sys_fail(cmd);
+    }
+    if (eargp) {
+	rb_exec_arg_fixup(eargp);
+	rb_run_exec_options(eargp, &sarg);
+    }
+    while ((pid = (args ?
+		   rb_w32_aspawn(P_NOWAIT, cmd, args) :
+		   rb_w32_spawn(P_NOWAIT, cmd, 0))) == -1) {
+	/* exec failed */
+	switch (errno) {
+	  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
 	    rb_thread_sleep(1);
-	    goto retry;
-	}
-	else {
-	    int e = errno;
-	    if ((modef & FMODE_READABLE)) {
-		close(pr[0]);
-		close(pr[1]);
-	    }
-	    if ((modef & FMODE_WRITABLE)) {
-		close(pw[0]);
-		close(pw[1]);
+	    break;
+	  default:
+	    {
+		int e = errno;
+		if (eargp)
+		    rb_run_exec_options(&sarg, NULL);
+		close(pair[0]);
+		close(pair[1]);
+		if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
+		    close(write_pair[0]);
+		    close(write_pair[1]);
+		}
+		errno = e;
+		rb_sys_fail(cmd);
 	    }
-	    errno = e;
-	    rb_sys_fail(pname);
+	    break;
 	}
-	break;
+    }
 
-      default:			/* parent */
-	if (pid < 0) rb_sys_fail(pname);
-	else {
-	    VALUE port = io_alloc(rb_cIO);
+    RB_GC_GUARD(argbuf);
 
-	    MakeOpenFile(port, fptr);
-	    fptr->mode = modef;
-	    fptr->mode |= FMODE_SYNC;
-	    fptr->pid = pid;
+    if (eargp)
+	rb_run_exec_options(&sarg, NULL);
+    if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) {
+        close(pair[1]);
+        fd = pair[0];
+        close(write_pair[0]);
+        write_fd = write_pair[1];
+    }
+    else if (fmode & FMODE_READABLE) {
+        close(pair[1]);
+        fd = pair[0];
+    }
+    else {
+        close(pair[0]);
+        fd = pair[1];
+    }
+#else
+    if (argc) {
+	prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
+	cmd = StringValueCStr(prog);
+    }
+    if (eargp) {
+	rb_exec_arg_fixup(eargp);
+	rb_run_exec_options(eargp, &sarg);
+    }
+    fp = popen(cmd, modestr);
+    if (eargp)
+	rb_run_exec_options(&sarg, NULL);
+    if (!fp) rb_sys_fail(RSTRING_PTR(prog));
+    fd = fileno(fp);
+#endif
 
-	    if (modef & FMODE_READABLE) {
-		close(pr[1]);
-		fptr->f  = rb_fdopen(pr[0], "r");
-	    }
-	    if (modef & FMODE_WRITABLE) {
-		FILE *f = rb_fdopen(pw[1], "w");
+    port = io_alloc(rb_cIO);
+    MakeOpenFile(port, fptr);
+    fptr->fd = fd;
+    fptr->stdio_file = fp;
+    fptr->mode = fmode | FMODE_SYNC|FMODE_DUPLEX;
+    if (convconfig) {
+        fptr->encs = *convconfig;
+    }
+    fptr->pid = pid;
+
+    if (0 <= write_fd) {
+        write_port = io_alloc(rb_cIO);
+        MakeOpenFile(write_port, write_fptr);
+        write_fptr->fd = write_fd;
+        write_fptr->mode = (fmode & ~FMODE_READABLE)| FMODE_SYNC|FMODE_DUPLEX;
+        fptr->mode &= ~FMODE_WRITABLE;
+        fptr->tied_io_for_writing = write_port;
+        rb_ivar_set(port, rb_intern("@tied_io_for_writing"), write_port);
+    }
+
+#if defined (__CYGWIN__) || !defined(HAVE_FORK)
+    fptr->finalize = pipe_finalize;
+    pipe_add_fptr(fptr);
+#endif
+    return port;
+}
 
-		close(pw[0]);
-		if (fptr->f) fptr->f2 = f;
-		else fptr->f = f;
-	    }
-#if defined (__CYGWIN__)
-	    fptr->finalize = pipe_finalize;
-	    pipe_add_fptr(fptr);
+static VALUE
+pipe_open_v(int argc, VALUE *argv, const char *modestr, int fmode, convconfig_t *convconfig)
+{
+    VALUE prog;
+    struct rb_exec_arg earg;
+    prog = rb_exec_arg_init(argc, argv, FALSE, &earg);
+    return pipe_open(&earg, prog, modestr, fmode, convconfig);
+}
+
+static VALUE
+pipe_open_s(VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig)
+{
+    const char *cmd = RSTRING_PTR(prog);
+    int argc = 1;
+    VALUE *argv = &prog;
+    struct rb_exec_arg earg;
+
+    if (RSTRING_LEN(prog) == 1 && cmd[0] == '-') {
+#if !defined(HAVE_FORK)
+	rb_raise(rb_eNotImpError,
+		 "fork() function is unimplemented on this machine");
 #endif
-	    return port;
-	}
+        return pipe_open(0, 0, modestr, fmode, convconfig);
     }
-#endif
-#endif
+
+    rb_exec_arg_init(argc, argv, TRUE, &earg);
+    return pipe_open(&earg, prog, modestr, fmode, convconfig);
+}
+
+static VALUE
+pop_last_hash(int *argc_p, VALUE *argv)
+{
+    VALUE last, tmp;
+    if (*argc_p == 0)
+        return Qnil;
+    last = argv[*argc_p-1];
+    if (NIL_P(last)) return Qnil;
+    tmp = rb_check_convert_type(last, T_HASH, "Hash", "to_hash");
+    if (NIL_P(tmp))
+        return Qnil;
+    (*argc_p)--;
+    return tmp;
 }
 
 /*
  *  call-seq:
- *     IO.popen(cmd_string, mode="r" )               => io
- *     IO.popen(cmd_string, mode="r" ) {|io| block } => obj
- *  
- *  Runs the specified command string as a subprocess; the subprocess's
+ *     IO.popen(cmd, mode="r" [, opt])               -> io
+ *     IO.popen(cmd, mode="r" [, opt]) {|io| block } -> obj
+ *
+ *  Runs the specified command as a subprocess; the subprocess's
  *  standard input and output will be connected to the returned
- *  <code>IO</code> object. If <i>cmd_string</i> starts with a
- *  ``<code>-</code>'', then a new instance of Ruby is started as the
- *  subprocess. The default mode for the new file object is ``r'', but
- *  <i>mode</i> may be set to any of the modes listed in the description
- *  for class IO.
- *     
+ *  <code>IO</code> object.
+ *
+ *  The PID of the started process can be obtained by IO#pid method.
+ *
+ *  _cmd_ is a string or an array as follows.
+ *
+ *    cmd:
+ *      "-"                                      : fork
+ *      commandline                              : command line string which is passed to a shell
+ *      [env, cmdname, arg1, ..., opts]          : command name and zero or more arguments (no shell)
+ *      [env, [cmdname, argv0], arg1, ..., opts] : command name, argv[0] and zero or more arguments (no shell)
+ *    (env and opts are optional.)
+ *
+ *  If _cmd_ is a +String+ ``<code>-</code>'',
+ *  then a new instance of Ruby is started as the subprocess.
+ *
+ *  If <i>cmd</i> is an +Array+ of +String+,
+ *  then it will be used as the subprocess's +argv+ bypassing a shell.
+ *  The array can contains a hash at first for environments and
+ *  a hash at last for options similar to <code>spawn</code>.
+ *
+ *  The default mode for the new file object is ``r'',
+ *  but <i>mode</i> may be set to any of the modes listed in the description for class IO.
+ *  The last argument <i>opt</i> qualifies <i>mode</i>.
+ *
+ *    # set IO encoding
+ *    IO.popen("nkf -e filename", :external_encoding=>"EUC-JP") {|nkf_io|
+ *      euc_jp_string = nkf_io.read
+ *    }
+ *
+ *    # merge standard output and standard error using
+ *    # spawn option.  See the document of Kernel.spawn.
+ *    IO.popen(["ls", "/", :err=>[:child, :out]]) {|ls_io|
+ *      ls_result_with_error = ls_io.read
+ *    }
+ *
+ *  Raises exceptions which <code>IO.pipe</code> and
+ *  <code>Kernel.spawn</code> raise.
+ *
  *  If a block is given, Ruby will run the command as a child connected
  *  to Ruby with a pipe. Ruby's end of the pipe will be passed as a
  *  parameter to the block.
  *  At the end of block, Ruby close the pipe and sets <code>$?</code>.
- *  In this case <code>IO::popen</code> returns
+ *  In this case <code>IO.popen</code> returns
  *  the value of the block.
- *     
- *  If a block is given with a <i>cmd_string</i> of ``<code>-</code>'',
+ *
+ *  If a block is given with a _cmd_ of ``<code>-</code>'',
  *  the block will be run in two separate processes: once in the parent,
  *  and once in a child. The parent process will be passed the pipe
  *  object as a parameter to the block, the child version of the block
  *  will be passed <code>nil</code>, and the child's standard in and
  *  standard out will be connected to the parent through the pipe. Not
  *  available on all platforms.
- *     
+ *
  *     f = IO.popen("uname")
  *     p f.readlines
+ *     f.close
  *     puts "Parent is #{Process.pid}"
- *     IO.popen ("date") { |f| puts f.gets }
- *     IO.popen("-") {|f| $stderr.puts "#{Process.pid} is here, f is #{f}"}
+ *     IO.popen("date") { |f| puts f.gets }
+ *     IO.popen("-") {|f| $stderr.puts "#{Process.pid} is here, f is #{f.inspect}"}
  *     p $?
- *     
+ *     IO.popen(%w"sed -e s|^|<foo>| -e s&$&;zot;&", "r+") {|f|
+ *       f.puts "bar"; f.close_write; puts f.gets
+ *     }
+ *
  *  <em>produces:</em>
- *     
+ *
  *     ["Linux\n"]
- *     Parent is 26166
- *     Wed Apr  9 08:53:52 CDT 2003
- *     26169 is here, f is
- *     26166 is here, f is #<IO:0x401b3d44>
- *     #<Process::Status: pid=26166,exited(0)>
+ *     Parent is 21346
+ *     Thu Jan 15 22:41:19 JST 2009
+ *     21346 is here, f is #<IO:fd 3>
+ *     21352 is here, f is nil
+ *     #<Process::Status: pid 21352 exit 0>
+ *     <foo>bar;zot;
  */
 
 static VALUE
-rb_io_s_popen(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
 {
-    char *mode;
-    VALUE pname, pmode, port;
+    const char *modestr;
+    VALUE pname, pmode, port, tmp, opt;
+    int oflags, fmode;
+    convconfig_t convconfig;
 
-    if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
-	mode = "r";
-    }
-    else if (FIXNUM_P(pmode)) {
-	mode = rb_io_modenum_mode(FIX2INT(pmode));
+    opt = pop_last_hash(&argc, argv);
+    rb_scan_args(argc, argv, "11", &pname, &pmode);
+
+    rb_io_extract_modeenc(&pmode, 0, opt, &oflags, &fmode, &convconfig);
+    modestr = rb_io_oflags_modestr(oflags);
+
+    tmp = rb_check_array_type(pname);
+    if (!NIL_P(tmp)) {
+	long len = RARRAY_LEN(tmp);
+#if SIZEOF_LONG > SIZEOF_INT
+	if (len > INT_MAX) {
+	    rb_raise(rb_eArgError, "too many arguments");
+	}
+#endif
+	tmp = rb_ary_dup(tmp);
+	RBASIC(tmp)->klass = 0;
+	port = pipe_open_v((int)len, RARRAY_PTR(tmp), modestr, fmode, &convconfig);
+	rb_ary_clear(tmp);
     }
     else {
-	mode = rb_io_flags_mode(rb_io_mode_flags(StringValueCStr(pmode)));
+	SafeStringValue(pname);
+	port = pipe_open_s(pname, modestr, fmode, &convconfig);
     }
-    SafeStringValue(pname);
-    port = pipe_open(pname, 0, mode);
     if (NIL_P(port)) {
 	/* child */
 	if (rb_block_given_p()) {
 	    rb_yield(Qnil);
-	    fflush(stdout);
-	    fflush(stderr);
+            rb_io_flush(rb_stdout);
+            rb_io_flush(rb_stderr);
 	    _exit(0);
 	}
 	return Qnil;
@@ -3277,57 +5368,77 @@ rb_io_s_popen(argc, argv, klass)
     return port;
 }
 
-static VALUE
-rb_open_file(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+static void
+rb_scan_open_args(int argc, VALUE *argv,
+        VALUE *fname_p, int *oflags_p, int *fmode_p,
+        convconfig_t *convconfig_p, mode_t *perm_p)
 {
-    VALUE fname, vmode, perm;
-    char *path, *mode;
-    int flags, fmode;
+    VALUE opt=Qnil, fname, vmode, vperm;
+    int oflags, fmode;
+    mode_t perm;
 
-    rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
-    SafeStringValue(fname);
+    opt = pop_last_hash(&argc, argv);
+    rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
+    FilePathValue(fname);
 
-    path = StringValueCStr(fname);
-    if (FIXNUM_P(vmode) || !NIL_P(perm)) {
-	if (FIXNUM_P(vmode)) {
-	    flags = FIX2INT(vmode);
-	}
-	else {
-	    SafeStringValue(vmode);
-	    flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
-	}
-	fmode = NIL_P(perm) ? 0666 :  NUM2INT(perm);
+    rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, convconfig_p);
+
+    perm = NIL_P(vperm) ? 0666 :  NUM2UINT(vperm);
+
+    *fname_p = fname;
+    *oflags_p = oflags;
+    *fmode_p = fmode;
+    *perm_p = perm;
+}
+
+static VALUE
+rb_open_file(int argc, VALUE *argv, VALUE io)
+{
+    VALUE fname;
+    int oflags, fmode;
+    convconfig_t convconfig;
+    mode_t perm;
+
+    rb_scan_open_args(argc, argv, &fname, &oflags, &fmode, &convconfig, &perm);
+    rb_file_open_generic(io, fname, oflags, fmode, &convconfig, perm);
 
-	rb_file_sysopen_internal(io, path, flags, fmode);
-    }
-    else {
-	mode = NIL_P(vmode) ? "r" : StringValueCStr(vmode);
-	rb_file_open_internal(io, path, mode);
-    }
     return io;
 }
 
+
 /*
+ *  Document-method: File::open
+ *
  *  call-seq:
- *     IO.open(fd, mode_string="r" )               => io
- *     IO.open(fd, mode_string="r" ) {|io| block } => obj
- *  
+ *     File.open(filename, mode="r" [, opt])                 -> file
+ *     File.open(filename [, mode [, perm]] [, opt])         -> file
+ *     File.open(filename, mode="r" [, opt]) {|file| block } -> obj
+ *     File.open(filename [, mode [, perm]] [, opt]) {|file| block } -> obj
+ *
  *  With no associated block, <code>open</code> is a synonym for
- *  <code>IO::new</code>. If the optional code block is given, it will
+ *  <code>File.new</code>. If the optional code block is given, it will
+ *  be passed <i>file</i> as an argument, and the File object will
+ *  automatically be closed when the block terminates. In this instance,
+ *  <code>File.open</code> returns the value of the block.
+ */
+
+/*
+ *  Document-method: IO::open
+ *
+ *  call-seq:
+ *     IO.open(fd, mode_string="r" [, opt] )               -> io
+ *     IO.open(fd, mode_string="r" [, opt] ) {|io| block } -> obj
+ *
+ *  With no associated block, <code>open</code> is a synonym for
+ *  <code>IO.new</code>. If the optional code block is given, it will
  *  be passed <i>io</i> as an argument, and the IO object will
  *  automatically be closed when the block terminates. In this instance,
- *  <code>IO::open</code> returns the value of the block.
- *     
+ *  <code>IO.open</code> returns the value of the block.
+ *
  */
 
 static VALUE
-rb_io_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_io_s_open(int argc, VALUE *argv, VALUE klass)
 {
     VALUE io = rb_class_new_instance(argc, argv, klass);
 
@@ -3340,61 +5451,105 @@ rb_io_s_open(argc, argv, klass)
 
 /*
  *  call-seq:
- *     IO.sysopen(path, [mode, [perm]])  => fixnum
- *  
+ *     IO.sysopen(path, [mode, [perm]])  -> fixnum
+ *
  *  Opens the given path, returning the underlying file descriptor as a
  *  <code>Fixnum</code>.
- *     
+ *
  *     IO.sysopen("testfile")   #=> 3
- *     
+ *
  */
 
 static VALUE
-rb_io_s_sysopen(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_io_s_sysopen(int argc, VALUE *argv)
 {
-    VALUE fname, vmode, perm;
-    int flags, fmode, fd;
-    char *path;
+    VALUE fname, vmode, vperm;
+    VALUE intmode;
+    int oflags, fd;
+    mode_t perm;
 
-    rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
-    SafeStringValue(fname);
+    rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
+    FilePathValue(fname);
 
-    if (NIL_P(vmode)) flags = O_RDONLY;
-    else if (FIXNUM_P(vmode)) flags = FIX2INT(vmode);
+    if (NIL_P(vmode))
+        oflags = O_RDONLY;
+    else if (!NIL_P(intmode = rb_check_to_integer(vmode, "to_int")))
+        oflags = NUM2INT(intmode);
     else {
 	SafeStringValue(vmode);
-	flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
+	oflags = rb_io_modestr_oflags(StringValueCStr(vmode));
     }
-    if (NIL_P(perm)) fmode = 0666;
-    else             fmode = NUM2INT(perm);
+    if (NIL_P(vperm)) perm = 0666;
+    else              perm = NUM2UINT(vperm);
 
-    path = ALLOCA_N(char, strlen(RSTRING(fname)->ptr)+1);
-    strcpy(path, RSTRING(fname)->ptr);
-    fd = rb_sysopen(path, flags, fmode);
+    RB_GC_GUARD(fname) = rb_str_new4(fname);
+    fd = rb_sysopen(fname, oflags, perm);
     return INT2NUM(fd);
 }
 
+static VALUE
+check_pipe_command(VALUE filename_or_command)
+{
+    char *s = RSTRING_PTR(filename_or_command);
+    long l = RSTRING_LEN(filename_or_command);
+    char *e = s + l;
+    int chlen;
+
+    if (rb_enc_ascget(s, e, &chlen, rb_enc_get(filename_or_command)) == '|') {
+        VALUE cmd = rb_str_new(s+chlen, l-chlen);
+        OBJ_INFECT(cmd, filename_or_command);
+        return cmd;
+    }
+    return Qnil;
+}
+
 /*
  *  call-seq:
- *     open(path [, mode [, perm]] )                => io or nil
- *     open(path [, mode [, perm]] ) {|io| block }  => obj
- *  
+ *     open(path [, mode_enc [, perm]] [, opt] )                -> io or nil
+ *     open(path [, mode_enc [, perm]] [, opt] ) {|io| block }  -> obj
+ *
  *  Creates an <code>IO</code> object connected to the given stream,
  *  file, or subprocess.
- *     
+ *
  *  If <i>path</i> does not start with a pipe character
  *  (``<code>|</code>''), treat it as the name of a file to open using
- *  the specified mode (defaulting to ``<code>r</code>''). (See the table
- *  of valid modes on page 331.) If a file is being created, its initial
- *  permissions may be set using the integer third parameter.
- *     
+ *  the specified mode (defaulting to ``<code>r</code>'').
+ *
+ *  The mode_enc is
+ *  either a string or an integer.  If it is an integer, it must be
+ *  bitwise-or of open(2) flags, such as File::RDWR or File::EXCL.
+ *  If it is a string, it is either "mode", "mode:ext_enc", or
+ *  "mode:ext_enc:int_enc".
+ *  The mode is one of the following:
+ *
+ *   r: read (default)
+ *   w: write
+ *   a: append
+ *
+ *  The mode can be followed by "b" (means binary-mode), or "+"
+ *  (means both reading and writing allowed) or both.
+ *  If ext_enc (external encoding) is specified,
+ *  read string will be tagged by the encoding in reading,
+ *  and output string will be converted
+ *  to the specified encoding in writing.
+ *  If ext_enc starts with 'BOM|', check whether the input has a BOM. If
+ *  there is a BOM, strip it and set external encoding as
+ *  what the BOM tells. If there is no BOM, use ext_enc without 'BOM|'.
+ *  If two encoding names,
+ *  ext_enc and int_enc (external encoding and internal encoding),
+ *  are specified, the read string is converted from ext_enc
+ *  to int_enc then tagged with the int_enc in read mode,
+ *  and in write mode, the output string will be
+ *  converted from int_enc to ext_enc before writing.
+ *
+ *  If a file is being created, its initial permissions may be
+ *  set using the integer third parameter.
+ *
  *  If a block is specified, it will be invoked with the
  *  <code>File</code> object as a parameter, and the file will be
  *  automatically closed when the block terminates. The call
  *  returns the value of the block.
- *     
+ *
  *  If <i>path</i> starts with a pipe character, a subprocess is
  *  created, connected to the caller by a pair of pipes. The returned
  *  <code>IO</code> object may be used to write to the standard input
@@ -3410,27 +5565,27 @@ rb_io_s_sysopen(argc, argv)
  *  will be connected to the child's <code>$stdin</code> and
  *  <code>$stdout</code>. The subprocess will be terminated at the end
  *  of the block.
- *     
+ *
  *     open("testfile") do |f|
  *       print f.gets
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     This is line one
- *     
+ *
  *  Open a subprocess and read its output:
- *     
+ *
  *     cmd = open("|date")
  *     print cmd.gets
  *     cmd.close
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Wed Apr  9 08:56:31 CDT 2003
- *     
+ *
  *  Open a subprocess running the same Ruby program:
- *     
+ *
  *     f = open("|-", "w+")
  *     if f == nil
  *       puts "in Child"
@@ -3438,13 +5593,13 @@ rb_io_s_sysopen(argc, argv)
  *     else
  *       puts "Got: #{f.gets}"
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Got: in Child
- *     
+ *
  *  Open a subprocess using a block to receive the I/O object:
- *     
+ *
  *     open("|-") do |f|
  *       if f == nil
  *         puts "in Child"
@@ -3452,158 +5607,156 @@ rb_io_s_sysopen(argc, argv)
  *         puts "Got: #{f.gets}"
  *       end
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Got: in Child
  */
 
 static VALUE
-rb_f_open(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_open(int argc, VALUE *argv)
 {
+    ID to_open = 0;
+    int redirect = FALSE;
+
     if (argc >= 1) {
-	char *str = StringValuePtr(argv[0]);
+	CONST_ID(to_open, "to_open");
+	if (rb_respond_to(argv[0], to_open)) {
+	    redirect = TRUE;
+	}
+	else {
+	    VALUE tmp = argv[0];
+	    FilePathValue(tmp);
+	    if (NIL_P(tmp)) {
+		redirect = TRUE;
+	    }
+	    else {
+                VALUE cmd = check_pipe_command(tmp);
+                if (!NIL_P(cmd)) {
+		    argv[0] = cmd;
+		    return rb_io_s_popen(argc, argv, rb_cIO);
+		}
+	    }
+	}
+    }
+    if (redirect) {
+	VALUE io = rb_funcall2(argv[0], to_open, argc-1, argv+1);
 
-	if (str[0] == '|') {
-	    VALUE tmp = rb_str_new(str+1, RSTRING(argv[0])->len-1);
-	    OBJ_INFECT(tmp, argv[0]);
-	    argv[0] = tmp;
-	    return rb_io_s_popen(argc, argv, rb_cIO);
+	if (rb_block_given_p()) {
+	    return rb_ensure(rb_yield, io, io_close, io);
 	}
+	return io;
     }
     return rb_io_s_open(argc, argv, rb_cFile);
 }
 
 static VALUE
-rb_io_open(fname, mode)
-    char *fname, *mode;
+rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
 {
-    if (fname[0] == '|') {
-	return pipe_open(0, fname+1, mode);
+    VALUE cmd;
+    int oflags, fmode;
+    convconfig_t convconfig;
+    mode_t perm;
+
+    rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
+    perm = NIL_P(vperm) ? 0666 :  NUM2UINT(vperm);
+
+    if (!NIL_P(cmd = check_pipe_command(filename))) {
+	return pipe_open_s(cmd, rb_io_oflags_modestr(oflags), fmode, &convconfig);
     }
     else {
-	return rb_file_open(fname, mode);
+        return rb_file_open_generic(io_alloc(rb_cFile), filename,
+                oflags, fmode, &convconfig, perm);
     }
 }
 
 static VALUE
-rb_io_get_io(io)
-    VALUE io;
+rb_io_open_with_args(int argc, VALUE *argv)
 {
-    return rb_convert_type(io, T_FILE, "IO", "to_io");
-}
-
-static VALUE
-rb_io_check_io(io)
     VALUE io;
-{
-    return rb_check_convert_type(io, T_FILE, "IO", "to_io");
-}
 
-static char*
-rb_io_mode_string(fptr)
-    OpenFile *fptr;
-{
-    switch (fptr->mode & FMODE_READWRITE) {
-      case FMODE_READABLE:
-      default:
-	return "r";
-      case FMODE_WRITABLE:
-	return "w";
-      case FMODE_READWRITE:
-	return "r+";
-    }
+    io = io_alloc(rb_cFile);
+    rb_open_file(argc, argv, io);
+    return io;
 }
 
 static VALUE
-io_reopen(io, nfile)
-    VALUE io, nfile;
+io_reopen(VALUE io, VALUE nfile)
 {
-    OpenFile *fptr, *orig;
-    char *mode;
+    rb_io_t *fptr, *orig;
     int fd, fd2;
     off_t pos = 0;
 
     nfile = rb_io_get_io(nfile);
-    if (rb_safe_level() >= 4 && (!OBJ_TAINTED(io) || !OBJ_TAINTED(nfile))) {
+    if (rb_safe_level() >= 4 &&
+	(!OBJ_UNTRUSTED(io) || !OBJ_UNTRUSTED(nfile))) {
 	rb_raise(rb_eSecurityError, "Insecure: can't reopen");
     }
     GetOpenFile(io, fptr);
     GetOpenFile(nfile, orig);
 
     if (fptr == orig) return io;
-    if (orig->mode & FMODE_READABLE) {
-	pos = io_tell(orig);
+    if (IS_PREP_STDIO(fptr)) {
+        if ((fptr->stdio_file == stdin && !(orig->mode & FMODE_READABLE)) ||
+            (fptr->stdio_file == stdout && !(orig->mode & FMODE_WRITABLE)) ||
+            (fptr->stdio_file == stderr && !(orig->mode & FMODE_WRITABLE))) {
+	    rb_raise(rb_eArgError,
+		     "%s can't change access mode from \"%s\" to \"%s\"",
+		     PREP_STDIO_NAME(fptr), rb_io_fmode_modestr(fptr->mode),
+		     rb_io_fmode_modestr(orig->mode));
+	}
     }
-    if (orig->f2) {
-	io_fflush(orig->f2, orig);
+    if (fptr->mode & FMODE_WRITABLE) {
+        if (io_fflush(fptr) < 0)
+            rb_sys_fail(0);
     }
-    else if (orig->mode & FMODE_WRITABLE) {
-	io_fflush(orig->f, orig);
+    else {
+	io_tell(fptr);
     }
-    if (fptr->mode & FMODE_WRITABLE) {
-	io_fflush(GetWriteFile(fptr), fptr);
+    if (orig->mode & FMODE_READABLE) {
+	pos = io_tell(orig);
+    }
+    if (orig->mode & FMODE_WRITABLE) {
+        if (io_fflush(orig) < 0)
+            rb_sys_fail(0);
     }
 
-    /* copy OpenFile structure */
-    fptr->mode = orig->mode;
+    /* copy rb_io_t structure */
+    fptr->mode = orig->mode | (fptr->mode & FMODE_PREP);
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
-    if (fptr->path) free(fptr->path);
-    if (orig->path) fptr->path = strdup(orig->path);
-    else fptr->path = 0;
+    if (RTEST(orig->pathv)) fptr->pathv = orig->pathv;
+    else if (!IS_PREP_STDIO(fptr)) fptr->pathv = Qnil;
     fptr->finalize = orig->finalize;
+#if defined (__CYGWIN__) || !defined(HAVE_FORK)
+    if (fptr->finalize == pipe_finalize)
+	pipe_add_fptr(fptr);
+#endif
 
-    mode = rb_io_mode_string(fptr);
-    fd = fileno(fptr->f);
-    fd2 = fileno(orig->f);
+    fd = fptr->fd;
+    fd2 = orig->fd;
     if (fd != fd2) {
-	if (fptr->f == stdin || fptr->f == stdout || fptr->f == stderr) {
-	    clearerr(fptr->f);
-	    /* need to keep stdio objects */
+	if (IS_PREP_STDIO(fptr) || fd <= 2 || !fptr->stdio_file) {
+	    /* need to keep FILE objects of stdin, stdout and stderr */
 	    if (dup2(fd2, fd) < 0)
-		rb_sys_fail(orig->path);
+		rb_sys_fail_path(orig->pathv);
 	}
 	else {
-	    FILE *f2 = fptr->f2;
-	    int m = fptr->mode;
-	    fclose(fptr->f);
-	    fptr->f = f2;
-	    fptr->f2 = NULL;
-	    fptr->mode &= (m & FMODE_READABLE) ? ~FMODE_READABLE : ~FMODE_WRITABLE;
-	    if (dup2(fd2, fd) < 0)
-		rb_sys_fail(orig->path);
-	    if (f2) {
-		fptr->f = rb_fdopen(fd, "r");
-		fptr->f2 = f2;
-	    }
-	    else {
-		fptr->f = rb_fdopen(fd, mode);
-	    }
-	    fptr->mode = m;
+            fclose(fptr->stdio_file);
+            fptr->stdio_file = 0;
+            fptr->fd = -1;
+            if (dup2(fd2, fd) < 0)
+                rb_sys_fail_path(orig->pathv);
+            fptr->fd = fd;
 	}
 	rb_thread_fd_close(fd);
 	if ((orig->mode & FMODE_READABLE) && pos >= 0) {
-	    io_seek(fptr, pos, SEEK_SET);
-	    io_seek(orig, pos, SEEK_SET);
-	}
-    }
-
-    if (fptr->f2 && fd != fileno(fptr->f2)) {
-	fd = fileno(fptr->f2);
-	if (!orig->f2) {
-	    fclose(fptr->f2);
-	    rb_thread_fd_close(fd);
-	    fptr->f2 = 0;
-	}
-	else if (fd != (fd2 = fileno(orig->f2))) {
-	    fclose(fptr->f2);
-	    rb_thread_fd_close(fd);
-	    if (dup2(fd2, fd) < 0)
-		rb_sys_fail(orig->path);
-	    fptr->f2 = rb_fdopen(fd, "w");
+	    if (io_seek(fptr, pos, SEEK_SET) < 0 && errno) {
+		rb_sys_fail_path(fptr->pathv);
+	    }
+	    if (io_seek(orig, pos, SEEK_SET) < 0 && errno) {
+		rb_sys_fail_path(orig->pathv);
+	    }
 	}
     }
 
@@ -3611,19 +5764,19 @@ io_reopen(io, nfile)
 	rb_io_binmode(io);
     }
 
-    RBASIC(io)->klass = RBASIC(nfile)->klass;
+    RBASIC(io)->klass = rb_obj_class(nfile);
     return io;
 }
 
 /*
  *  call-seq:
- *     ios.reopen(other_IO)         => ios 
- *     ios.reopen(path, mode_str)   => ios
- *  
+ *     ios.reopen(other_IO)         -> ios
+ *     ios.reopen(path, mode_str)   -> ios
+ *
  *  Reassociates <em>ios</em> with the I/O stream given in
  *  <i>other_IO</i> or to a new stream opened on <i>path</i>. This may
  *  dynamically change the actual class of this stream.
- *     
+ *
  *     f1 = File.new("testfile")
  *     f2 = File.new("testfile")
  *     f2.readlines[0]   #=> "This is line one\n"
@@ -3632,14 +5785,11 @@ io_reopen(io, nfile)
  */
 
 static VALUE
-rb_io_reopen(argc, argv, file)
-    int argc;
-    VALUE *argv;
-    VALUE file;
+rb_io_reopen(int argc, VALUE *argv, VALUE file)
 {
     VALUE fname, nmode;
-    char *mode;
-    OpenFile *fptr;
+    int oflags;
+    rb_io_t *fptr;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "11", &fname, &nmode) == 1) {
@@ -3649,46 +5799,59 @@ rb_io_reopen(argc, argv, file)
 	}
     }
 
-    SafeStringValue(fname);
+    FilePathValue(fname);
     rb_io_taint_check(file);
     fptr = RFILE(file)->fptr;
     if (!fptr) {
-	fptr = RFILE(file)->fptr = ALLOC(OpenFile);
-	MEMZERO(fptr, OpenFile, 1);
+	fptr = RFILE(file)->fptr = ALLOC(rb_io_t);
+	MEMZERO(fptr, rb_io_t, 1);
     }
 
     if (!NIL_P(nmode)) {
-	fptr->mode = rb_io_mode_flags(StringValueCStr(nmode));
-    }
-
-    if (fptr->path) {
-	free(fptr->path);
-	fptr->path = 0;
+	int fmode = rb_io_modestr_fmode(StringValueCStr(nmode));
+	if (IS_PREP_STDIO(fptr) &&
+            ((fptr->mode & FMODE_READWRITE) & (fmode & FMODE_READWRITE)) !=
+            (fptr->mode & FMODE_READWRITE)) {
+	    rb_raise(rb_eArgError,
+		     "%s can't change access mode from \"%s\" to \"%s\"",
+		     PREP_STDIO_NAME(fptr), rb_io_fmode_modestr(fptr->mode),
+		     rb_io_fmode_modestr(fmode));
+	}
+	fptr->mode = fmode;
+	rb_io_mode_enc(fptr, StringValueCStr(nmode));
+        fptr->encs.ecflags = 0;
+        fptr->encs.ecopts = Qnil;
     }
 
-    fptr->path = strdup(StringValueCStr(fname));
-    mode = rb_io_flags_mode(fptr->mode);
-    if (!fptr->f) {
-	fptr->f = rb_fopen(fptr->path, mode);
-	if (fptr->f2) {
-	    fclose(fptr->f2);
-	    fptr->f2 = 0;
-	}
+    fptr->pathv = rb_str_new_frozen(fname);
+    oflags = rb_io_fmode_oflags(fptr->mode);
+    if (fptr->fd < 0) {
+        fptr->fd = rb_sysopen(fptr->pathv, oflags, 0666);
+	fptr->stdio_file = 0;
 	return file;
     }
 
-    if (freopen(fptr->path, mode, fptr->f) == 0) {
-	rb_sys_fail(fptr->path);
+    if (fptr->mode & FMODE_WRITABLE) {
+        if (io_fflush(fptr) < 0)
+            rb_sys_fail(0);
     }
+    fptr->rbuf_off = fptr->rbuf_len = 0;
+
+    if (fptr->stdio_file) {
+        if (freopen(RSTRING_PTR(fptr->pathv), rb_io_oflags_modestr(oflags), fptr->stdio_file) == 0) {
+            rb_sys_fail_path(fptr->pathv);
+        }
+        fptr->fd = fileno(fptr->stdio_file);
 #ifdef USE_SETVBUF
-    if (setvbuf(fptr->f, NULL, _IOFBF, 0) != 0)
-	rb_warn("setvbuf() can't be honoured for %s", fptr->path);
+        if (setvbuf(fptr->stdio_file, NULL, _IOFBF, 0) != 0)
+            rb_warn("setvbuf() can't be honoured for %s", RSTRING_PTR(fptr->pathv));
 #endif
-
-    if (fptr->f2) {
-	if (freopen(fptr->path, "w", fptr->f2) == 0) {
-	    rb_sys_fail(fptr->path);
-	}
+    }
+    else {
+        if (close(fptr->fd) < 0)
+            rb_sys_fail_path(fptr->pathv);
+        fptr->fd = -1;
+        fptr->fd = rb_sysopen(fptr->pathv, oflags, 0666);
     }
 
     return file;
@@ -3696,78 +5859,62 @@ rb_io_reopen(argc, argv, file)
 
 /* :nodoc: */
 static VALUE
-rb_io_init_copy(dest, io)
-    VALUE dest, io;
+rb_io_init_copy(VALUE dest, VALUE io)
 {
-    OpenFile *fptr, *orig;
+    rb_io_t *fptr, *orig;
     int fd;
-    char *mode;
+    VALUE write_io;
+    off_t pos;
 
     io = rb_io_get_io(io);
     if (dest == io) return dest;
     GetOpenFile(io, orig);
     MakeOpenFile(dest, fptr);
 
-    if (orig->f2) {
-	io_fflush(orig->f2, orig);
-	fseeko(orig->f, 0L, SEEK_CUR);
-    }
-    else if (orig->mode & FMODE_WRITABLE) {
-	io_fflush(orig->f, orig);
-    }
-    else {
-	fseeko(orig->f, 0L, SEEK_CUR);
-    }
+    rb_io_flush(io);
 
-    /* copy OpenFile structure */
-    fptr->mode = orig->mode;
+    /* copy rb_io_t structure */
+    fptr->mode = orig->mode & ~FMODE_PREP;
+    fptr->encs = orig->encs;
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
-    if (orig->path) fptr->path = strdup(orig->path);
+    if (!NIL_P(orig->pathv)) fptr->pathv = orig->pathv;
     fptr->finalize = orig->finalize;
+#if defined (__CYGWIN__) || !defined(HAVE_FORK)
+    if (fptr->finalize == pipe_finalize)
+	pipe_add_fptr(fptr);
+#endif
 
-    switch (fptr->mode & FMODE_READWRITE) {
-      case FMODE_READABLE:
-      default:
-	mode = "r"; break;
-      case FMODE_WRITABLE:
-	mode = "w"; break;
-      case FMODE_READWRITE:
-	if (orig->f2) mode = "r";
-	else          mode = "r+";
-	break;
-    }
-    fd = ruby_dup(fileno(orig->f));
-    fptr->f = rb_fdopen(fd, mode);
-    fseeko(fptr->f, ftello(orig->f), SEEK_SET);
-    if (orig->f2) {
-	if (fileno(orig->f) != fileno(orig->f2)) {
-	    fd = ruby_dup(fileno(orig->f2));
-	}
-	fptr->f2 = rb_fdopen(fd, "w");
-	fseeko(fptr->f2, ftello(orig->f2), SEEK_SET);
-    }
+    fd = ruby_dup(orig->fd);
+    fptr->fd = fd;
+    pos = io_tell(orig);
+    if (0 <= pos)
+        io_seek(fptr, pos, SEEK_SET);
     if (fptr->mode & FMODE_BINMODE) {
 	rb_io_binmode(dest);
     }
 
+    write_io = GetWriteIO(io);
+    if (io != write_io) {
+        write_io = rb_obj_dup(write_io);
+        fptr->tied_io_for_writing = write_io;
+        rb_ivar_set(dest, rb_intern("@tied_io_for_writing"), write_io);
+    }
+
     return dest;
 }
 
 /*
  *  call-seq:
- *     ios.printf(format_string [, obj, ...] )   => nil
- *  
+ *     ios.printf(format_string [, obj, ...] )   -> nil
+ *
  *  Formats and writes to <em>ios</em>, converting parameters under
  *  control of the format string. See <code>Kernel#sprintf</code>
  *  for details.
  */
 
 VALUE
-rb_io_printf(argc, argv, out)
-    int argc;
-    VALUE argv[];
-    VALUE out;
+rb_io_printf(int argc, VALUE *argv, VALUE out)
 {
     rb_io_write(out, rb_f_sprintf(argc, argv));
     return Qnil;
@@ -3775,9 +5922,9 @@ rb_io_printf(argc, argv, out)
 
 /*
  *  call-seq:
- *     printf(io, string [, obj ... ] )    => nil
- *     printf(string [, obj ... ] )        => nil
- *  
+ *     printf(io, string [, obj ... ] )    -> nil
+ *     printf(string [, obj ... ] )        -> nil
+ *
  *  Equivalent to:
  *     io.write(sprintf(string, obj, ...)
  *  or
@@ -3785,9 +5932,7 @@ rb_io_printf(argc, argv, out)
  */
 
 static VALUE
-rb_f_printf(argc, argv)
-    int argc;
-    VALUE argv[];
+rb_f_printf(int argc, VALUE *argv)
 {
     VALUE out;
 
@@ -3807,29 +5952,28 @@ rb_f_printf(argc, argv)
 
 /*
  *  call-seq:
- *     ios.print()             => nil
- *     ios.print(obj, ...)     => nil
- *  
+ *     ios.print()             -> nil
+ *     ios.print(obj, ...)     -> nil
+ *
  *  Writes the given object(s) to <em>ios</em>. The stream must be
- *  opened for writing. If the output record separator (<code>$\\</code>)
+ *  opened for writing. If the output field separator (<code>$,</code>)
+ *  is not <code>nil</code>, it will be inserted between each object.
+ *  If the output record separator (<code>$\\</code>)
  *  is not <code>nil</code>, it will be appended to the output. If no
  *  arguments are given, prints <code>$_</code>. Objects that aren't
  *  strings will be converted by calling their <code>to_s</code> method.
  *  With no argument, prints the contents of the variable <code>$_</code>.
  *  Returns <code>nil</code>.
- *     
+ *
  *     $stdout.print("This is ", 100, " percent.\n")
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     This is 100 percent.
  */
 
 VALUE
-rb_io_print(argc, argv, out)
-    int argc;
-    VALUE *argv;
-    VALUE out;
+rb_io_print(int argc, VALUE *argv, VALUE out)
 {
     int i;
     VALUE line;
@@ -3844,16 +5988,9 @@ rb_io_print(argc, argv, out)
 	if (!NIL_P(rb_output_fs) && i>0) {
 	    rb_io_write(out, rb_output_fs);
 	}
-	switch (TYPE(argv[i])) {
-	  case T_NIL:
-	    rb_io_write(out, rb_str_new2("nil"));
-	    break;
-	  default:
-	    rb_io_write(out, argv[i]);
-	    break;
-	}
+	rb_io_write(out, argv[i]);
     }
-    if (!NIL_P(rb_output_rs)) {
+    if (argc > 0 && !NIL_P(rb_output_rs)) {
 	rb_io_write(out, rb_output_rs);
     }
 
@@ -3862,8 +5999,8 @@ rb_io_print(argc, argv, out)
 
 /*
  *  call-seq:
- *     print(obj, ...)    => nil
- *  
+ *     print(obj, ...)    -> nil
+ *
  *  Prints each object in turn to <code>$stdout</code>. If the output
  *  field separator (<code>$,</code>) is not +nil+, its
  *  contents will appear between each field. If the output record
@@ -3871,22 +6008,20 @@ rb_io_print(argc, argv, out)
  *  appended to the output. If no arguments are given, prints
  *  <code>$_</code>. Objects that aren't strings will be converted by
  *  calling their <code>to_s</code> method.
- *     
+ *
  *     print "cat", [1,2,3], 99, "\n"
  *     $, = ", "
  *     $\ = "\n"
  *     print "cat", [1,2,3], 99
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     cat12399
  *     cat, 1, 2, 3, 99
  */
 
 static VALUE
-rb_f_print(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_print(int argc, VALUE *argv)
 {
     rb_io_print(argc, argv, rb_stdout);
     return Qnil;
@@ -3894,23 +6029,24 @@ rb_f_print(argc, argv)
 
 /*
  *  call-seq:
- *     ios.putc(obj)    => obj
- *  
- *  If <i>obj</i> is <code>Numeric</code>, write the character whose
- *  code is <i>obj</i>, otherwise write the first character of the
- *  string representation of  <i>obj</i> to <em>ios</em>.
- *     
+ *     ios.putc(obj)    -> obj
+ *
+ *  If <i>obj</i> is <code>Numeric</code>, write the character whose code is
+ *  the least-significant byte of <i>obj</i>, otherwise write the first byte
+ *  of the string representation of <i>obj</i> to <em>ios</em>. Note: This
+ *  method is not safe for use with multi-byte characters as it will truncate
+ *  them.
+ *
  *     $stdout.putc "A"
  *     $stdout.putc 65
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     AA
  */
 
 static VALUE
-rb_io_putc(io, ch)
-    VALUE io, ch;
+rb_io_putc(VALUE io, VALUE ch)
 {
     char c = NUM2CHR(ch);
 
@@ -3920,32 +6056,54 @@ rb_io_putc(io, ch)
 
 /*
  *  call-seq:
- *     putc(int)   => int
- *  
+ *     putc(int)   -> int
+ *
  *  Equivalent to:
  *
  *    $stdout.putc(int)
+ * 
+ * Refer to the documentation for IO#putc for important information regarding
+ * multi-byte characters.
  */
 
 static VALUE
-rb_f_putc(recv, ch)
-    VALUE recv, ch;
+rb_f_putc(VALUE recv, VALUE ch)
+{
+    if (recv == rb_stdout) {
+	return rb_io_putc(recv, ch);
+    }
+    return rb_funcall2(rb_stdout, rb_intern("putc"), 1, &ch);
+}
+
+
+static int
+str_end_with_asciichar(VALUE str, int c)
 {
-    return rb_io_putc(rb_stdout, ch);
+    long len = RSTRING_LEN(str);
+    const char *ptr = RSTRING_PTR(str);
+    rb_encoding *enc = rb_enc_from_index(ENCODING_GET(str));
+    int n;
+
+    if (len == 0) return 0;
+    if ((n = rb_enc_mbminlen(enc)) == 1) {
+	return ptr[len - 1] == c;
+    }
+    return rb_enc_ascget(ptr + ((len - 1) / n) * n, ptr + len, &n, enc) == c;
 }
 
 static VALUE
-io_puts_ary(ary, out)
-    VALUE ary, out;
+io_puts_ary(VALUE ary, VALUE out, int recur)
 {
     VALUE tmp;
     long i;
 
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = RARRAY(ary)->ptr[i];
-	if (rb_inspecting_p(tmp)) {
-	    tmp = rb_str_new2("[...]");
-	}
+    if (recur) {
+	tmp = rb_str_new2("[...]");
+	rb_io_puts(1, &tmp, out);
+	return Qnil;
+    }
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	tmp = RARRAY_PTR(ary)[i];
 	rb_io_puts(1, &tmp, out);
     }
     return Qnil;
@@ -3953,18 +6111,18 @@ io_puts_ary(ary, out)
 
 /*
  *  call-seq:
- *     ios.puts(obj, ...)    => nil
- *  
+ *     ios.puts(obj, ...)    -> nil
+ *
  *  Writes the given objects to <em>ios</em> as with
  *  <code>IO#print</code>. Writes a record separator (typically a
  *  newline) after any that do not already end with a newline sequence.
  *  If called with an array argument, writes each element on a new line.
  *  If called without arguments, outputs a single record separator.
- *     
+ *
  *     $stdout.puts("this", "is", "a", "test")
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     this
  *     is
  *     a
@@ -3972,10 +6130,7 @@ io_puts_ary(ary, out)
  */
 
 VALUE
-rb_io_puts(argc, argv, out)
-    int argc;
-    VALUE *argv;
-    VALUE out;
+rb_io_puts(int argc, VALUE *argv, VALUE out)
 {
     int i;
     VALUE line;
@@ -3986,20 +6141,20 @@ rb_io_puts(argc, argv, out)
 	return Qnil;
     }
     for (i=0; i<argc; i++) {
-	if (NIL_P(argv[i])) {
-	    line = rb_str_new2("nil");
+	if (TYPE(argv[i]) == T_STRING) {
+	    line = argv[i];
+	    goto string;
 	}
-	else {
-	    line = rb_check_array_type(argv[i]);
-	    if (!NIL_P(line)) {
-		rb_protect_inspect(io_puts_ary, line, out);
-		continue;
-	    }
-	    line = rb_obj_as_string(argv[i]);
+	line = rb_check_array_type(argv[i]);
+	if (!NIL_P(line)) {
+	    rb_exec_recursive(io_puts_ary, line, out);
+	    continue;
 	}
+	line = rb_obj_as_string(argv[i]);
+      string:
 	rb_io_write(out, line);
-	if (RSTRING(line)->len == 0 ||
-            RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
+	if (RSTRING_LEN(line) == 0 ||
+            !str_end_with_asciichar(line, '\n')) {
 	    rb_io_write(out, rb_default_rs);
 	}
     }
@@ -4009,123 +6164,135 @@ rb_io_puts(argc, argv, out)
 
 /*
  *  call-seq:
- *     puts(obj, ...)    => nil
- *  
- *  Equivalent to 
+ *     puts(obj, ...)    -> nil
+ *
+ *  Equivalent to
  *
  *      $stdout.puts(obj, ...)
  */
 
 static VALUE
-rb_f_puts(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_puts(int argc, VALUE *argv, VALUE recv)
 {
-    rb_io_puts(argc, argv, rb_stdout);
-    return Qnil;
+    if (recv == rb_stdout) {
+	return rb_io_puts(argc, argv, recv);
+    }
+    return rb_funcall2(rb_stdout, rb_intern("puts"), argc, argv);
 }
 
 void
-rb_p(obj)			/* for debug print within C code */
-    VALUE obj;
+rb_p(VALUE obj) /* for debug print within C code */
 {
-    rb_io_write(rb_stdout, rb_obj_as_string(rb_inspect(obj)));
-    rb_io_write(rb_stdout, rb_default_rs);
+    VALUE str = rb_obj_as_string(rb_inspect(obj));
+    if (TYPE(rb_stdout) == T_FILE &&
+        rb_method_basic_definition_p(CLASS_OF(rb_stdout), id_write)) {
+        io_write(rb_stdout, str, 1);
+        io_write(rb_stdout, rb_default_rs, 0);
+    }
+    else {
+        rb_io_write(rb_stdout, str);
+        rb_io_write(rb_stdout, rb_default_rs);
+    }
 }
 
 /*
  *  call-seq:
- *     p(obj, ...)    => nil
- *  
+ *     p(obj)              -> obj
+ *     p(obj1, obj2, ...)  -> [obj, ...]
+ *     p()                 -> nil
+ *
  *  For each object, directly writes
  *  _obj_.+inspect+ followed by the current output
  *  record separator to the program's standard output.
- *     
+ *
  *     S = Struct.new(:name, :state)
  *     s = S['dave', 'TX']
  *     p s
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     #<S name="dave", state="TX">
  */
 
 static VALUE
-rb_f_p(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_p(int argc, VALUE *argv, VALUE self)
 {
     int i;
+    VALUE ret = Qnil;
 
     for (i=0; i<argc; i++) {
 	rb_p(argv[i]);
     }
+    if (argc == 1) {
+	ret = argv[0];
+    }
+    else if (argc > 1) {
+	ret = rb_ary_new4(argc, argv);
+    }
     if (TYPE(rb_stdout) == T_FILE) {
 	rb_io_flush(rb_stdout);
     }
-    return Qnil;
+    return ret;
 }
 
 /*
  *  call-seq:
- *     obj.display(port=$>)    => nil
- *  
+ *     obj.display(port=$>)    -> nil
+ *
  *  Prints <i>obj</i> on the given port (default <code>$></code>).
  *  Equivalent to:
- *     
+ *
  *     def display(port=$>)
  *       port.write self
  *     end
- *     
+ *
  *  For example:
- *     
+ *
  *     1.display
  *     "cat".display
  *     [ 4, 5, 6 ].display
  *     puts
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     1cat456
  */
 
 static VALUE
-rb_obj_display(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rb_obj_display(int argc, VALUE *argv, VALUE self)
 {
     VALUE out;
 
-    if (rb_scan_args(argc, argv, "01", &out) == 0) {
+    if (argc == 0) {
 	out = rb_stdout;
     }
-
+    else {
+	rb_scan_args(argc, argv, "01", &out);
+    }
     rb_io_write(out, self);
 
     return Qnil;
 }
 
 void
-rb_write_error2(mesg, len)
-    const char *mesg;
-    long len;
+rb_write_error2(const char *mesg, long len)
 {
-    rb_io_write(rb_stderr, rb_str_new(mesg, len));
+    if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
+	(void)fwrite(mesg, sizeof(char), len, stderr);
+    }
+    else {
+	rb_io_write(rb_stderr, rb_str_new(mesg, len));
+    }
 }
 
 void
-rb_write_error(mesg)
-    const char *mesg;
+rb_write_error(const char *mesg)
 {
     rb_write_error2(mesg, strlen(mesg));
 }
 
 static void
-must_respond_to(mid, val, id)
-    ID mid;
-    VALUE val;
-    ID id;
+must_respond_to(ID mid, VALUE val, ID id)
 {
     if (!rb_respond_to(val, mid)) {
 	rb_raise(rb_eTypeError, "%s must have %s method, %s given",
@@ -4135,139 +6302,230 @@ must_respond_to(mid, val, id)
 }
 
 static void
-stdout_setter(val, id, variable)
-    VALUE val;
-    ID id;
-    VALUE *variable;
+stdout_setter(VALUE val, ID id, VALUE *variable)
 {
     must_respond_to(id_write, val, id);
     *variable = val;
 }
 
-static void
-defout_setter(val, id, variable)
-    VALUE val;
-    ID id;
-    VALUE *variable;
-{
-    stdout_setter(val, id, variable);
-    rb_warn("$defout is obsolete; use $stdout instead");
-}
-
-static void
-deferr_setter(val, id, variable)
-    VALUE val;
-    ID id;
-    VALUE *variable;
-{
-    stdout_setter(val, id, variable);
-    rb_warn("$deferr is obsolete; use $stderr instead");
-}
-
 static VALUE
-prep_stdio(f, mode, klass)
-    FILE *f;
-    int mode;
-    VALUE klass;
+prep_io(int fd, int fmode, VALUE klass, const char *path)
 {
-    OpenFile *fp;
+    rb_io_t *fp;
     VALUE io = io_alloc(klass);
 
     MakeOpenFile(io, fp);
+    fp->fd = fd;
 #ifdef __CYGWIN__
-    if (!isatty(fileno(f))) {
-	mode |= O_BINARY;
-	setmode(fileno(f), O_BINARY);
+    if (!isatty(fd)) {
+        fmode |= FMODE_BINMODE;
+	setmode(fd, O_BINARY);
     }
 #endif
-    fp->f = f;
-    fp->mode = mode;
+    fp->mode = fmode;
+    io_check_tty(fp);
+    if (path) fp->pathv = rb_obj_freeze(rb_str_new_cstr(path));
 
     return io;
 }
 
-static void
-prep_path(io, path)
-    VALUE io;
-    char *path;
+VALUE
+rb_io_fdopen(int fd, int oflags, const char *path)
 {
-    OpenFile *fptr;
+    VALUE klass = rb_cIO;
+
+    if (path && strcmp(path, "-")) klass = rb_cFile;
+    return prep_io(fd, rb_io_oflags_fmode(oflags), klass, path);
+}
+
+static VALUE
+prep_stdio(FILE *f, int fmode, VALUE klass, const char *path)
+{
+    rb_io_t *fptr;
+    VALUE io = prep_io(fileno(f), fmode|FMODE_PREP, klass, path);
 
     GetOpenFile(io, fptr);
-    if (fptr->path) rb_bug("illegal prep_path() call");
-    fptr->path = strdup(path);
+    fptr->stdio_file = f;
+
+    return io;
+}
+
+FILE *
+rb_io_stdio_file(rb_io_t *fptr)
+{
+    if (!fptr->stdio_file) {
+        int oflags = rb_io_fmode_oflags(fptr->mode);
+        fptr->stdio_file = rb_fdopen(fptr->fd, rb_io_oflags_modestr(oflags));
+    }
+    return fptr->stdio_file;
 }
 
 /*
  *  call-seq:
- *     IO.new(fd, mode)   => io
- *  
+ *     IO.new(fd [, mode] [, opt])   -> io
+ *
  *  Returns a new <code>IO</code> object (a stream) for the given
- *  integer file descriptor and mode string. See also
- *  <code>IO#fileno</code> and <code>IO::for_fd</code>.
- *     
- *     a = IO.new(2,"w")      # '2' is standard error
+ *  <code>IO</code> object or integer file descriptor and mode
+ *  string. See also <code>IO.sysopen</code> and
+ *  <code>IO.for_fd</code>.
+ *
+ *  === Parameters
+ *  fd:: numeric file descriptor
+ *  mode:: file mode. a string or an integer
+ *  opt:: hash for specifying mode by name.
+ *
+ *  ==== Mode
+ *  When <code>mode</code> is an integer it must be combination of
+ *  the modes defined in <code>File::Constants</code>.
+ *
+ *  When <code>mode</code> is a string it must be in one of the
+ *  following forms:
+ *  - "fmode",
+ *  - "fmode:extern",
+ *  - "fmode:extern:intern".
+ *  <code>extern</code> is the external encoding name for the IO.
+ *  <code>intern</code> is the internal encoding.
+ *  <code>fmode</code> must be combination of the directives. See
+ *  the description of class +IO+ for a description of the directives.
+ *
+ *  When the mode of original IO is read only, the mode cannot be changed to
+ *  be writable.  Similarly, the mode cannot be changed from write only to
+ *  readable.
+ *  If such a wrong change is directed, timing where the error actually occurs
+ *  is different according to the platform.
+ *
+ *  ==== Options
+ *  <code>opt</code> can have the following keys
+ *  :mode ::
+ *    same as <code>mode</code> parameter
+ *  :external_encoding ::
+ *    external encoding for the IO. "-" is a
+ *    synonym for the default external encoding.
+ *  :internal_encoding ::
+ *    internal encoding for the IO.
+ *    "-" is a synonym for the default internal encoding.
+ *    If the value is nil no conversion occurs.
+ *  :encoding ::
+ *    specifies external and internal encodings as "extern:intern".
+ *  :textmode ::
+ *    If the value is truth value, same as "t" in argument <code>mode</code>.
+ *  :binmode ::
+ *    If the value is truth value, same as "b" in argument <code>mode</code>.
+ *  :autoclose ::
+ *    If the value is +false+, the _fd_ will be kept open after this
+ *    +IO+ instance gets finalized.
+ *
+ *  Also <code>opt</code> can have same keys in <code>String#encode</code> for
+ *  controlling conversion between the external encoding and the internal encoding.
+ *
+ *  === Example1
+ *
+ *     fd = IO.sysopen("/dev/tty", "w")
+ *     a = IO.new(fd,"w")
  *     $stderr.puts "Hello"
  *     a.puts "World"
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Hello
  *     World
+ *
+ *  === Example2
+ *
+ *     require 'fcntl'
+ *
+ *     fd = STDERR.fcntl(Fcntl::F_DUPFD)
+ *     io = IO.new(fd, mode: 'w:UTF-16LE', cr_newline: true)
+ *     io.puts "Hello, World!"
+ *
+ *     fd = STDERR.fcntl(Fcntl::F_DUPFD)
+ *     io = IO.new(fd, mode: 'w', cr_newline: true, external_encoding: Encoding::UTF_16LE)
+ *     io.puts "Hello, World!"
+ *
+ *  both of above print "Hello, World!" in UTF-16LE to standard error output with
+ *  converting EOL generated by <code>puts</code> to CR.
  */
 
 static VALUE
-rb_io_initialize(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_initialize(int argc, VALUE *argv, VALUE io)
 {
-    VALUE fnum, mode;
-    OpenFile *fp;
-    int fd, flags;
+    VALUE fnum, vmode;
+    rb_io_t *fp;
+    int fd, fmode, oflags = O_RDONLY;
+    convconfig_t convconfig;
+    VALUE opt;
+#if defined(HAVE_FCNTL) && defined(F_GETFL)
+    int ofmode;
+#else
+    struct stat st;
+#endif
 
     rb_secure(4);
-    rb_scan_args(argc, argv, "11", &fnum, &mode);
+
+    opt = pop_last_hash(&argc, argv);
+    rb_scan_args(argc, argv, "11", &fnum, &vmode);
+    rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &fmode, &convconfig);
+
     fd = NUM2INT(fnum);
-    if (argc == 2) {
-	if (FIXNUM_P(mode)) {
-	    flags = FIX2LONG(mode);
-	}
-	else {
-	    SafeStringValue(mode);
-	    flags = rb_io_mode_modenum(StringValueCStr(mode));
-	}
-    }
-    else {
 #if defined(HAVE_FCNTL) && defined(F_GETFL)
-	flags = fcntl(fd, F_GETFL);
-	if (flags == -1) rb_sys_fail(0);
+    oflags = fcntl(fd, F_GETFL);
+    if (oflags == -1) rb_sys_fail(0);
 #else
-	flags = O_RDONLY;
+    if (fstat(fd, &st) == -1) rb_sys_fail(0);
+#endif
+    UPDATE_MAXFD(fd);
+#if defined(HAVE_FCNTL) && defined(F_GETFL)
+    ofmode = rb_io_oflags_fmode(oflags);
+    if (NIL_P(vmode)) {
+	fmode = ofmode;
+    }
+    else if ((~ofmode & fmode) & FMODE_READWRITE) {
+	VALUE error = INT2FIX(EINVAL);
+	rb_exc_raise(rb_class_new_instance(1, &error, rb_eSystemCallError));
+    }
 #endif
+    if (!NIL_P(opt) && rb_hash_aref(opt, sym_autoclose) == Qfalse) {
+	fmode |= FMODE_PREP;
     }
     MakeOpenFile(io, fp);
-    fp->mode = rb_io_modenum_flags(flags);
-    fp->f = rb_fdopen(fd, rb_io_modenum_mode(flags));
-
+    fp->fd = fd;
+    fp->mode = fmode;
+    fp->encs = convconfig;
+    clear_codeconv(fp);
+    io_check_tty(fp);
+    if (fileno(stdin) == fd)
+	fp->stdio_file = stdin;
+    else if (fileno(stdout) == fd)
+	fp->stdio_file = stdout;
+    else if (fileno(stderr) == fd)
+	fp->stdio_file = stderr;
+
+    if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io);
     return io;
 }
 
 /*
  *  call-seq:
- *     File.new(filename, mode="r")            => file
- *     File.new(filename [, mode [, perm]])    => file
- *  
-
+ *     File.new(filename, mode="r" [, opt])            -> file
+ *     File.new(filename [, mode [, perm]] [, opt])    -> file
+ *
  *  Opens the file named by _filename_ according to
  *  _mode_ (default is ``r'') and returns a new
- *  <code>File</code> object. See the description of class +IO+ for
- *  a description of _mode_. The file mode may optionally be
- *  specified as a +Fixnum+ by _or_-ing together the
- *  flags (O_RDONLY etc, again described under +IO+). Optional
- *  permission bits may be given in _perm_. These mode and permission
- *  bits are platform dependent; on Unix systems, see
- *  <code>open(2)</code> for details.
+ *  <code>File</code> object.
+ *
+ *  === Parameters
+ *  See the description of class +IO+ for a description of _mode_.
+ *  The file mode may optionally be specified as a +Fixnum+
+ *  by _or_-ing together the flags (O_RDONLY etc,
+ *  again described under +IO+).
+ *
+ *  Optional permission bits may be given in _perm_.
+ *  These mode and permission bits are platform dependent;
+ *  on Unix systems, see <code>open(2)</code> for details.
+ *
+ *  Optional _opt_ parameter is same as in <code.IO.open</code>.
+ *
+ *  === Examples
  *
  *     f = File.new("testfile", "r")
  *     f = File.new("newfile",  "w+")
@@ -4275,10 +6533,7 @@ rb_io_initialize(argc, argv, io)
  */
 
 static VALUE
-rb_file_initialize(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_file_initialize(int argc, VALUE *argv, VALUE io)
 {
     if (RFILE(io)->fptr) {
 	rb_raise(rb_eRuntimeError, "reinitializing File");
@@ -4296,32 +6551,12 @@ rb_file_initialize(argc, argv, io)
     return io;
 }
 
-/*
- *  call-seq:
- *     IO.new(fd, mode_string)   => io
- *  
- *  Returns a new <code>IO</code> object (a stream) for the given
- *  integer file descriptor and mode string. See also
- *  <code>IO#fileno</code> and <code>IO::for_fd</code>.
- *     
- *     a = IO.new(2,"w")      # '2' is standard error
- *     $stderr.puts "Hello"
- *     a.puts "World"
- *     
- *  <em>produces:</em>
- *     
- *     Hello
- *     World
- */
-
+/* :nodoc: */
 static VALUE
-rb_io_s_new(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_io_s_new(int argc, VALUE *argv, VALUE klass)
 {
     if (rb_block_given_p()) {
-	char *cname = rb_class2name(klass);
+	const char *cname = rb_class2name(klass);
 
 	rb_warn("%s::new() does not take block; use %s::open() instead",
 		cname, cname);
@@ -4329,58 +6564,207 @@ rb_io_s_new(argc, argv, klass)
     return rb_class_new_instance(argc, argv, klass);
 }
 
+
 /*
  *  call-seq:
- *     IO.for_fd(fd, mode)    => io
- *  
- *  Synonym for <code>IO::new</code>.
- *     
+ *     IO.for_fd(fd, mode [, opt])    -> io
+ *
+ *  Synonym for <code>IO.new</code>.
+ *
  */
 
 static VALUE
-rb_io_s_for_fd(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_io_s_for_fd(int argc, VALUE *argv, VALUE klass)
 {
     VALUE io = rb_obj_alloc(klass);
     rb_io_initialize(argc, argv, io);
     return io;
 }
 
-static int binmode = 0;
+/*
+ *  call-seq:
+ *     ios.autoclose?   -> true or false
+ *
+ *  Returns +true+ if the underlying file descriptor of _ios_ will be
+ *  closed automatically at its finalization, otherwise +false+.
+ */
+
+static VALUE
+rb_io_autoclose_p(VALUE io)
+{
+    rb_io_t *fptr;
+    rb_secure(4);
+    GetOpenFile(io, fptr);
+    return (fptr->mode & FMODE_PREP) ? Qfalse : Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     io.autoclose = bool    -> true or false
+ *
+ *  Sets auto-close flag.
+ *
+ *     f = open("/dev/null")
+ *     IO.for_fd(f.fileno)
+ *     # ...
+ *     f.gets # may cause IOError
+ *
+ *     f = open("/dev/null")
+ *     IO.for_fd(f.fileno).autoclose = true
+ *     # ...
+ *     f.gets # won't cause IOError
+ */
+
+static VALUE
+rb_io_set_autoclose(VALUE io, VALUE autoclose)
+{
+    rb_io_t *fptr;
+    rb_secure(4);
+    GetOpenFile(io, fptr);
+    if (!RTEST(autoclose))
+	fptr->mode |= FMODE_PREP;
+    else
+	fptr->mode &= ~FMODE_PREP;
+    return io;
+}
+
+static void
+argf_mark(void *ptr)
+{
+    struct argf *p = ptr;
+    rb_gc_mark(p->filename);
+    rb_gc_mark(p->current_file);
+    rb_gc_mark(p->argv);
+    rb_gc_mark(p->encs.ecopts);
+}
+
+static void
+argf_free(void *ptr)
+{
+    struct argf *p = ptr;
+    xfree(p->inplace);
+    xfree(p);
+}
+
+static inline void
+argf_init(struct argf *p, VALUE v)
+{
+    p->filename = Qnil;
+    p->current_file = Qnil;
+    p->lineno = 0;
+    p->argv = v;
+}
+
+static VALUE
+argf_alloc(VALUE klass)
+{
+    struct argf *p;
+    VALUE argf = Data_Make_Struct(klass, struct argf, argf_mark, argf_free, p);
+
+    argf_init(p, Qnil);
+    return argf;
+}
+
+#undef rb_argv
+
+/* :nodoc: */
+static VALUE
+argf_initialize(VALUE argf, VALUE argv)
+{
+    memset(&ARGF, 0, sizeof(ARGF));
+    argf_init(&ARGF, argv);
+
+    return argf;
+}
+
+/* :nodoc: */
+static VALUE
+argf_initialize_copy(VALUE argf, VALUE orig)
+{
+    ARGF = argf_of(orig);
+    ARGF.argv = rb_obj_dup(ARGF.argv);
+    if (ARGF.inplace) {
+	const char *inplace = ARGF.inplace;
+	ARGF.inplace = 0;
+	ARGF.inplace = ruby_strdup(inplace);
+    }
+    return argf;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.lineno = number  -> nil
+ *
+ *  Sets the line number of +ARGF+ as a whole to the given +Integer+.
+ *
+ *  +ARGF+ sets the line number automatically as you read data, so normally
+ *  you will not need to set it explicitly. To access the current line number
+ *  use +ARGF.lineno+.
+ *
+ *  For example:
+ *
+ *      ARGF.lineno      #=> 0
+ *      ARGF.readline    #=> "This is line 1\n"
+ *      ARGF.lineno      #=> 1
+ *      ARGF.lineno = 0  #=> nil
+ *      ARGF.lineno      #=> 0
+ */
+static VALUE
+argf_set_lineno(VALUE argf, VALUE val)
+{
+    ARGF.lineno = NUM2INT(val);
+    ARGF.last_lineno = ARGF.lineno;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.lineno -> integer
+ *
+ *  Returns the current line number of ARGF as a whole. This value
+ *  can be set manually with +ARGF.lineno=+.
+ *
+ *  For example:
+ *
+ *      ARGF.lineno   #=> 0
+ *      ARGF.readline #=> "This is line 1\n"
+ *      ARGF.lineno   #=> 1
+ */
+static VALUE
+argf_lineno(VALUE argf)
+{
+    return INT2FIX(ARGF.lineno);
+}
 
 static VALUE
-argf_forward(int argc, VALUE *argv)
+argf_forward(int argc, VALUE *argv, VALUE argf)
 {
-    return rb_funcall3(current_file, ruby_frame->last_func, argc, argv);
+    return rb_funcall3(ARGF.current_file, rb_frame_this_func(), argc, argv);
 }
 
+#define next_argv() argf_next_argv(argf)
+#define ARGF_GENERIC_INPUT_P() \
+    (ARGF.current_file == rb_stdin && TYPE(ARGF.current_file) != T_FILE)
 #define ARGF_FORWARD(argc, argv) do {\
-  if (TYPE(current_file) != T_FILE)\
-     return argf_forward(argc, argv);\
+    if (ARGF_GENERIC_INPUT_P())\
+	return argf_forward(argc, argv, argf);\
 } while (0)
 #define NEXT_ARGF_FORWARD(argc, argv) do {\
-     if (!next_argv()) return Qnil;\
-     ARGF_FORWARD(argc, argv);\
+    if (!next_argv()) return Qnil;\
+    ARGF_FORWARD(argc, argv);\
 } while (0)
 
 static void
-argf_close(file)
-    VALUE file;
+argf_close(VALUE file)
 {
-    if (TYPE(file) == T_FILE)
-	rb_io_close(file);
-    else
-	rb_funcall3(file, rb_intern("close"), 0, 0);
+    rb_funcall3(file, rb_intern("close"), 0, 0);
 }
 
 static int
-next_argv()
+argf_next_argv(VALUE argf)
 {
-    extern VALUE rb_argv;
     char *fn;
-    OpenFile *fptr;
+    rb_io_t *fptr;
     int stdout_binmode = 0;
 
     if (TYPE(rb_stdout) == T_FILE) {
@@ -4389,59 +6773,60 @@ next_argv()
             stdout_binmode = 1;
     }
 
-    if (init_p == 0) {
-	if (RARRAY(rb_argv)->len > 0) {
-	    next_p = 1;
+    if (ARGF.init_p == 0) {
+	if (!NIL_P(ARGF.argv) && RARRAY_LEN(ARGF.argv) > 0) {
+	    ARGF.next_p = 1;
 	}
 	else {
-	    next_p = -1;
+	    ARGF.next_p = -1;
 	}
-	init_p = 1;
-	gets_lineno = 0;
+	ARGF.init_p = 1;
     }
 
-    if (next_p == 1) {
-	next_p = 0;
+    if (ARGF.next_p == 1) {
       retry:
-	if (RARRAY(rb_argv)->len > 0) {
-	    filename = rb_ary_shift(rb_argv);
-	    fn = StringValueCStr(filename);
+	if (RARRAY_LEN(ARGF.argv) > 0) {
+	    ARGF.filename = rb_ary_shift(ARGF.argv);
+	    fn = StringValueCStr(ARGF.filename);
 	    if (strlen(fn) == 1 && fn[0] == '-') {
-		current_file = rb_stdin;
-		if (ruby_inplace_mode) {
+		ARGF.current_file = rb_stdin;
+		if (ARGF.inplace) {
 		    rb_warn("Can't do inplace edit for stdio; skipping");
 		    goto retry;
 		}
 	    }
 	    else {
-		FILE *fr = rb_fopen(fn, "r");
+		int fr = rb_sysopen(ARGF.filename, O_RDONLY, 0);
 
-		if (ruby_inplace_mode) {
-		    struct stat st, st2;
+		if (ARGF.inplace) {
+		    struct stat st;
+#ifndef NO_SAFE_RENAME
+		    struct stat st2;
+#endif
 		    VALUE str;
-		    FILE *fw;
+		    int fw;
 
 		    if (TYPE(rb_stdout) == T_FILE && rb_stdout != orig_stdout) {
 			rb_io_close(rb_stdout);
 		    }
-		    fstat(fileno(fr), &st);
-		    if (*ruby_inplace_mode) {
+		    fstat(fr, &st);
+		    if (*ARGF.inplace) {
 			str = rb_str_new2(fn);
 #ifdef NO_LONG_FNAME
-                        ruby_add_suffix(str, ruby_inplace_mode);
+                        ruby_add_suffix(str, ARGF.inplace);
 #else
-			rb_str_cat2(str, ruby_inplace_mode);
+			rb_str_cat2(str, ARGF.inplace);
 #endif
 #ifdef NO_SAFE_RENAME
-			(void)fclose(fr);
-			(void)unlink(RSTRING(str)->ptr);
-			(void)rename(fn, RSTRING(str)->ptr);
-			fr = rb_fopen(RSTRING(str)->ptr, "r");
+			(void)close(fr);
+			(void)unlink(RSTRING_PTR(str));
+			(void)rename(fn, RSTRING_PTR(str));
+			fr = rb_sysopen(str, O_RDONLY, 0);
 #else
-			if (rename(fn, RSTRING(str)->ptr) < 0) {
+			if (rename(fn, RSTRING_PTR(str)) < 0) {
 			    rb_warn("Can't rename %s to %s: %s, skipping file",
-				    fn, RSTRING(str)->ptr, strerror(errno));
-			    fclose(fr);
+				    fn, RSTRING_PTR(str), strerror(errno));
+			    close(fr);
 			    goto retry;
 			}
 #endif
@@ -4453,175 +6838,246 @@ next_argv()
 			if (unlink(fn) < 0) {
 			    rb_warn("Can't remove %s: %s, skipping file",
 				    fn, strerror(errno));
-			    fclose(fr);
+			    close(fr);
 			    goto retry;
 			}
 #endif
 		    }
-		    fw = rb_fopen(fn, "w");
+		    fw = rb_sysopen(ARGF.filename, O_WRONLY|O_CREAT|O_TRUNC, 0666);
 #ifndef NO_SAFE_RENAME
-		    fstat(fileno(fw), &st2);
+		    fstat(fw, &st2);
 #ifdef HAVE_FCHMOD
-		    fchmod(fileno(fw), st.st_mode);
+		    fchmod(fw, st.st_mode);
 #else
 		    chmod(fn, st.st_mode);
 #endif
 		    if (st.st_uid!=st2.st_uid || st.st_gid!=st2.st_gid) {
-			fchown(fileno(fw), st.st_uid, st.st_gid);
+#ifdef HAVE_FCHOWN
+			(void)fchown(fw, st.st_uid, st.st_gid);
+#else
+			(void)chown(fn, st.st_uid, st.st_gid);
+#endif
 		    }
 #endif
-		    rb_stdout = prep_stdio(fw, FMODE_WRITABLE, rb_cFile);
-		    prep_path(rb_stdout, fn);
+		    rb_stdout = prep_io(fw, FMODE_WRITABLE, rb_cFile, fn);
 		    if (stdout_binmode) rb_io_binmode(rb_stdout);
 		}
-		current_file = prep_stdio(fr, FMODE_READABLE, rb_cFile);
-		prep_path(current_file, fn);
+		ARGF.current_file = prep_io(fr, FMODE_READABLE, rb_cFile, fn);
+	    }
+	    if (ARGF.binmode) rb_io_ascii8bit_binmode(ARGF.current_file);
+	    if (ARGF.encs.enc) {
+		rb_io_t *fptr;
+
+		GetOpenFile(ARGF.current_file, fptr);
+		fptr->encs = ARGF.encs;
+                clear_codeconv(fptr);
 	    }
-	    if (binmode) rb_io_binmode(current_file);
+	    ARGF.next_p = 0;
 	}
 	else {
-	    next_p = 1;
-	    return Qfalse;
+	    ARGF.next_p = 1;
+	    return FALSE;
 	}
     }
-    else if (next_p == -1) {
-	current_file = rb_stdin;
-	filename = rb_str_new2("-");
-	if (ruby_inplace_mode) {
+    else if (ARGF.next_p == -1) {
+	ARGF.current_file = rb_stdin;
+	ARGF.filename = rb_str_new2("-");
+	if (ARGF.inplace) {
 	    rb_warn("Can't do inplace edit for stdio");
 	    rb_stdout = orig_stdout;
 	}
     }
-    return Qtrue;
+    return TRUE;
 }
 
 static VALUE
-argf_getline(argc, argv)
-    int argc;
-    VALUE *argv;
+argf_getline(int argc, VALUE *argv, VALUE argf)
 {
     VALUE line;
+    int lineno = ARGF.lineno;
 
   retry:
     if (!next_argv()) return Qnil;
-    if (argc == 0 && rb_rs == rb_default_rs) {
-	line = rb_io_gets(current_file);
+    if (ARGF_GENERIC_INPUT_P()) {
+	line = rb_funcall3(ARGF.current_file, rb_intern("gets"), argc, argv);
     }
     else {
-	VALUE rs;
-
-	if (argc == 0) {
-	    rs = rb_rs;
+	if (argc == 0 && rb_rs == rb_default_rs) {
+	    line = rb_io_gets(ARGF.current_file);
 	}
 	else {
-	    rb_scan_args(argc, argv, "1", &rs);
-	    if (!NIL_P(rs)) StringValue(rs);
+	    line = rb_io_getline(argc, argv, ARGF.current_file);
+	}
+	if (NIL_P(line) && ARGF.next_p != -1) {
+	    argf_close(ARGF.current_file);
+	    ARGF.next_p = 1;
+	    goto retry;
 	}
-	line = rb_io_getline(rs, current_file);
-    }
-    if (NIL_P(line) && next_p != -1) {
-	argf_close(current_file);
-	next_p = 1;
-	goto retry;
     }
     if (!NIL_P(line)) {
-	gets_lineno++;
-	lineno = INT2FIX(gets_lineno);
+	ARGF.lineno = ++lineno;
+	ARGF.last_lineno = ARGF.lineno;
     }
     return line;
 }
 
+static VALUE
+argf_lineno_getter(ID id, VALUE *var)
+{
+    VALUE argf = *var;
+    return INT2FIX(ARGF.last_lineno);
+}
+
+static void
+argf_lineno_setter(VALUE val, ID id, VALUE *var)
+{
+    VALUE argf = *var;
+    int n = NUM2INT(val);
+    ARGF.last_lineno = ARGF.lineno = n;
+}
+
+static VALUE argf_gets(int, VALUE *, VALUE);
+
 /*
  *  call-seq:
- *     gets(separator=$/)    => string or nil
- *  
+ *     gets(sep=$/)    -> string or nil
+ *     gets(limit)     -> string or nil
+ *     gets(sep,limit) -> string or nil
+ *
  *  Returns (and assigns to <code>$_</code>) the next line from the list
- *  of files in +ARGV+ (or <code>$*</code>), or from standard
- *  input if no files are present on the command line. Returns
- *  +nil+ at end of file. The optional argument specifies the
- *  record separator. The separator is included with the contents of
- *  each record. A separator of +nil+ reads the entire
- *  contents, and a zero-length separator reads the input one paragraph
- *  at a time, where paragraphs are divided by two consecutive newlines.
- *  If multiple filenames are present in +ARGV+,
- *  +gets(nil)+ will read the contents one file at a time.
- *     
+ *  of files in +ARGV+ (or <code>$*</code>), or from standard input if
+ *  no files are present on the command line. Returns +nil+ at end of
+ *  file. The optional argument specifies the record separator. The
+ *  separator is included with the contents of each record. A separator
+ *  of +nil+ reads the entire contents, and a zero-length separator
+ *  reads the input one paragraph at a time, where paragraphs are
+ *  divided by two consecutive newlines.  If the first argument is an
+ *  integer, or optional second argument is given, the returning string
+ *  would not be longer than the given value in bytes.  If multiple
+ *  filenames are present in +ARGV+, +gets(nil)+ will read the contents
+ *  one file at a time.
+ *
  *     ARGV << "testfile"
  *     print while gets
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     This is line one
  *     This is line two
  *     This is line three
  *     And so on...
- *     
+ *
  *  The style of programming using <code>$_</code> as an implicit
  *  parameter is gradually losing favor in the Ruby community.
  */
 
 static VALUE
-rb_f_gets(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_gets(int argc, VALUE *argv, VALUE recv)
+{
+    if (recv == argf) {
+	return argf_gets(argc, argv, argf);
+    }
+    return rb_funcall2(argf, rb_intern("gets"), argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     ARGF.gets(sep=$/)     -> string
+ *     ARGF.gets(limit)      -> string
+ *     ARGF.gets(sep, limit) -> string
+ *
+ *  Returns the next line from the current file in +ARGF+.
+ *
+ *  By default lines are assumed to be separated by +$/+; to use a different
+ *  character as a separator, supply it as a +String+ for the _sep_ argument.
+ *
+ *  The optional  _limit_ argument specifies how many characters of each line
+ *  to return. By default all characters are returned.
+ *
+ */
+static VALUE
+argf_gets(int argc, VALUE *argv, VALUE argf)
 {
     VALUE line;
 
-    if (!next_argv()) return Qnil;
-    if (TYPE(current_file) != T_FILE) {
-	line = rb_funcall3(current_file, rb_intern("gets"), argc, argv);
-    }
-    else {
-	line = argf_getline(argc, argv);
-    }
+    line = argf_getline(argc, argv, argf);
     rb_lastline_set(line);
+
     return line;
 }
 
 VALUE
-rb_gets()
+rb_gets(void)
 {
     VALUE line;
 
     if (rb_rs != rb_default_rs) {
-	return rb_f_gets(0, 0);
+	return rb_f_gets(0, 0, argf);
     }
 
   retry:
     if (!next_argv()) return Qnil;
-    line = rb_io_gets(current_file);
-    if (NIL_P(line) && next_p != -1) {
-	argf_close(current_file);
-	next_p = 1;
+    line = rb_io_gets(ARGF.current_file);
+    if (NIL_P(line) && ARGF.next_p != -1) {
+	rb_io_close(ARGF.current_file);
+	ARGF.next_p = 1;
 	goto retry;
     }
     rb_lastline_set(line);
     if (!NIL_P(line)) {
-	gets_lineno++;
-	lineno = INT2FIX(gets_lineno);
+	ARGF.lineno++;
+	ARGF.last_lineno = ARGF.lineno;
     }
 
     return line;
 }
 
+static VALUE argf_readline(int, VALUE *, VALUE);
+
 /*
  *  call-seq:
- *     readline(separator=$/)   => string
- *  
+ *     readline(sep=$/)     -> string
+ *     readline(limit)      -> string
+ *     readline(sep, limit) -> string
+ *
  *  Equivalent to <code>Kernel::gets</code>, except
  *  +readline+ raises +EOFError+ at end of file.
  */
 
 static VALUE
-rb_f_readline(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_readline(int argc, VALUE *argv, VALUE recv)
+{
+    if (recv == argf) {
+	return argf_readline(argc, argv, argf);
+    }
+    return rb_funcall2(argf, rb_intern("readline"), argc, argv);
+}
+
+
+/*
+ *  call-seq:
+ *     ARGF.readline(sep=$/)     -> string
+ *     ARGF.readline(limit)      -> string
+ *     ARGF.readline(sep, limit) -> string
+ *
+ *  Returns the next line from the current file in +ARGF+.
+ *
+ *  By default lines are assumed to be separated by +$/+; to use a different
+ *  character as a separator, supply it as a +String+ for the _sep_ argument.
+ *
+ *  The optional  _limit_ argument specifies how many characters of each line
+ *  to return. By default all characters are returned.
+ *
+ *  An +EOFError+ is raised at the end of the file.
+ */
+static VALUE
+argf_readline(int argc, VALUE *argv, VALUE argf)
 {
     VALUE line;
 
     if (!next_argv()) rb_eof_error();
     ARGF_FORWARD(argc, argv);
-    line = rb_f_gets(argc, argv);
+    line = argf_gets(argc, argv, argf);
     if (NIL_P(line)) {
 	rb_eof_error();
     }
@@ -4629,38 +7085,50 @@ rb_f_readline(argc, argv)
     return line;
 }
 
+static VALUE argf_readlines(int, VALUE *, VALUE);
+
 /*
- * obsolete
+ *  call-seq:
+ *     readlines(sep=$/)    -> array
+ *     readlines(limit)     -> array
+ *     readlines(sep,limit) -> array
+ *
+ *  Returns an array containing the lines returned by calling
+ *  <code>Kernel.gets(<i>sep</i>)</code> until the end of file.
  */
 
 static VALUE
-rb_f_getc()
+rb_f_readlines(int argc, VALUE *argv, VALUE recv)
 {
-    rb_warn("getc is obsolete; use STDIN.getc instead");
-    if (TYPE(rb_stdin) != T_FILE) {
-	return rb_funcall3(rb_stdin, rb_intern("getc"), 0, 0);
+    if (recv == argf) {
+	return argf_readlines(argc, argv, argf);
     }
-    return rb_io_getc(rb_stdin);
+    return rb_funcall2(argf, rb_intern("readlines"), argc, argv);
 }
 
 /*
  *  call-seq:
- *     readlines(separator=$/)    => array
- *  
- *  Returns an array containing the lines returned by calling
- *  <code>Kernel.gets(<i>separator</i>)</code> until the end of file.
+ *     ARGF.readlines(sep=$/)     -> array
+ *     ARGF.readlines(limit)      -> array
+ *     ARGF.readlines(sep, limit) -> array
+ *
+ *     ARGF.to_a(sep=$/)     -> array
+ *     ARGF.to_a(limit)      -> array
+ *     ARGF.to_a(sep, limit) -> array
+ *
+ *  Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
+ *  lines, one line per element. Lines are assumed to be separated by _sep_.
+ *
+ *     lines = ARGF.readlines
+ *     lines[0]                #=> "This is line one\n"
  */
-
 static VALUE
-rb_f_readlines(argc, argv)
-    int argc;
-    VALUE *argv;
+argf_readlines(int argc, VALUE *argv, VALUE argf)
 {
     VALUE line, ary;
 
-    NEXT_ARGF_FORWARD(argc, argv);
     ary = rb_ary_new();
-    while (!NIL_P(line = argf_getline(argc, argv))) {
+    while (!NIL_P(line = argf_getline(argc, argv, argf))) {
 	rb_ary_push(ary, line);
     }
 
@@ -4669,12 +7137,12 @@ rb_f_readlines(argc, argv)
 
 /*
  *  call-seq:
- *     `cmd`    => string
- *  
+ *     `cmd`    -> string
+ *
  *  Returns the standard output of running _cmd_ in a subshell.
  *  The built-in syntax <code>%x{...}</code> uses
  *  this method. Sets <code>$?</code> to the process status.
- *     
+ *
  *     `date`                   #=> "Wed Apr  9 08:56:30 CDT 2003\n"
  *     `ls testdir`.split[1]    #=> "main.rb"
  *     `echo oops && exit 99`   #=> "oops\n"
@@ -4682,15 +7150,14 @@ rb_f_readlines(argc, argv)
  */
 
 static VALUE
-rb_f_backquote(obj, str)
-    VALUE obj, str;
+rb_f_backquote(VALUE obj, VALUE str)
 {
     volatile VALUE port;
     VALUE result;
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     SafeStringValue(str);
-    port = pipe_open(str, 0, "r");
+    port = pipe_open_s(str, "r", FMODE_READABLE, NULL);
     if (NIL_P(port)) return rb_str_new(0,0);
 
     GetOpenFile(port, fptr);
@@ -4704,93 +7171,66 @@ rb_f_backquote(obj, str)
 #include <sys/select.h>
 #endif
 
-/*
- *  call-seq:
- *     IO.select(read_array 
- *               [, write_array 
- *               [, error_array 
- *               [, timeout]]] ) =>  array  or  nil
- *  
- *  See <code>Kernel#select</code>.
- */
-
 static VALUE
-rb_f_select(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fdset_t *fds)
 {
-    VALUE read, write, except, timeout, res, list;
-    fd_set rset, wset, eset, pset;
-    fd_set *rp, *wp, *ep;
-    struct timeval *tp, timerec;
-    OpenFile *fptr;
+    VALUE res, list;
+    rb_fdset_t *rp, *wp, *ep;
+    rb_io_t *fptr;
     long i;
     int max = 0, n;
     int interrupt_flag = 0;
     int pending = 0;
+    struct timeval timerec;
 
-    rb_scan_args(argc, argv, "13", &read, &write, &except, &timeout);
-    if (NIL_P(timeout)) {
-	tp = 0;
-    }
-    else {
-	timerec = rb_time_interval(timeout);
-	tp = &timerec;
-    }
-
-    FD_ZERO(&pset);
     if (!NIL_P(read)) {
 	Check_Type(read, T_ARRAY);
-	rp = &rset;
-	FD_ZERO(rp);
-	for (i=0; i<RARRAY(read)->len; i++) {
-	    GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
-	    FD_SET(fileno(fptr->f), rp);
-	    if (READ_DATA_PENDING(fptr->f)) { /* check for buffered data */
+	for (i=0; i<RARRAY_LEN(read); i++) {
+	    GetOpenFile(rb_io_get_io(RARRAY_PTR(read)[i]), fptr);
+	    rb_fd_set(fptr->fd, &fds[0]);
+	    if (READ_DATA_PENDING(fptr) || READ_CHAR_PENDING(fptr)) { /* check for buffered data */
 		pending++;
-		FD_SET(fileno(fptr->f), &pset);
+		rb_fd_set(fptr->fd, &fds[3]);
 	    }
-	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
+	    if (max < fptr->fd) max = fptr->fd;
 	}
 	if (pending) {		/* no blocking if there's buffered data */
 	    timerec.tv_sec = timerec.tv_usec = 0;
 	    tp = &timerec;
 	}
+	rp = &fds[0];
     }
     else
 	rp = 0;
 
     if (!NIL_P(write)) {
 	Check_Type(write, T_ARRAY);
-	wp = &wset;
-	FD_ZERO(wp);
-	for (i=0; i<RARRAY(write)->len; i++) {
-	    GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
-	    FD_SET(fileno(fptr->f), wp);
-	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
-	    if (fptr->f2) {
-		FD_SET(fileno(fptr->f2), wp);
-		if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
-	    }
+	for (i=0; i<RARRAY_LEN(write); i++) {
+            VALUE write_io = GetWriteIO(rb_io_get_io(RARRAY_PTR(write)[i]));
+	    GetOpenFile(write_io, fptr);
+	    rb_fd_set(fptr->fd, &fds[1]);
+	    if (max < fptr->fd) max = fptr->fd;
 	}
+	wp = &fds[1];
     }
     else
 	wp = 0;
 
     if (!NIL_P(except)) {
 	Check_Type(except, T_ARRAY);
-	ep = &eset;
-	FD_ZERO(ep);
-	for (i=0; i<RARRAY(except)->len; i++) {
-	    GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
-	    FD_SET(fileno(fptr->f), ep);
-	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
-	    if (fptr->f2) {
-		FD_SET(fileno(fptr->f2), ep);
-		if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
-	    }
+	for (i=0; i<RARRAY_LEN(except); i++) {
+            VALUE io = rb_io_get_io(RARRAY_PTR(except)[i]);
+            VALUE write_io = GetWriteIO(io);
+	    GetOpenFile(io, fptr);
+	    rb_fd_set(fptr->fd, &fds[2]);
+	    if (max < fptr->fd) max = fptr->fd;
+            if (io != write_io) {
+                GetOpenFile(write_io, fptr);
+                rb_fd_set(fptr->fd, &fds[2]);
+                if (max < fptr->fd) max = fptr->fd;
+            }
 	}
+	ep = &fds[2];
     }
     else {
 	ep = 0;
@@ -4798,7 +7238,7 @@ rb_f_select(argc, argv, obj)
 
     max++;
 
-    n = rb_thread_select(max, rp, wp, ep, tp);
+    n = rb_thread_fd_select(max, rp, wp, ep, tp);
     if (n < 0) {
 	rb_sys_fail(0);
     }
@@ -4811,39 +7251,47 @@ rb_f_select(argc, argv, obj)
 
     if (interrupt_flag == 0) {
 	if (rp) {
-	    list = RARRAY(res)->ptr[0];
-	    for (i=0; i< RARRAY(read)->len; i++) {
-		GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
-		if (FD_ISSET(fileno(fptr->f), rp)
-		    || FD_ISSET(fileno(fptr->f), &pset)) {
-		    rb_ary_push(list, rb_ary_entry(read, i));
+	    list = RARRAY_PTR(res)[0];
+	    for (i=0; i< RARRAY_LEN(read); i++) {
+                VALUE obj = rb_ary_entry(read, i);
+                VALUE io = rb_io_get_io(obj);
+		GetOpenFile(io, fptr);
+		if (rb_fd_isset(fptr->fd, &fds[0]) ||
+		    rb_fd_isset(fptr->fd, &fds[3])) {
+		    rb_ary_push(list, obj);
 		}
 	    }
 	}
 
 	if (wp) {
-	    list = RARRAY(res)->ptr[1];
-	    for (i=0; i< RARRAY(write)->len; i++) {
-		GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
-		if (FD_ISSET(fileno(fptr->f), wp)) {
-		    rb_ary_push(list, rb_ary_entry(write, i));
-		}
-		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), wp)) {
-		    rb_ary_push(list, rb_ary_entry(write, i));
+	    list = RARRAY_PTR(res)[1];
+	    for (i=0; i< RARRAY_LEN(write); i++) {
+                VALUE obj = rb_ary_entry(write, i);
+                VALUE io = rb_io_get_io(obj);
+                VALUE write_io = GetWriteIO(io);
+		GetOpenFile(write_io, fptr);
+		if (rb_fd_isset(fptr->fd, &fds[1])) {
+		    rb_ary_push(list, obj);
 		}
 	    }
 	}
 
 	if (ep) {
-	    list = RARRAY(res)->ptr[2];
-	    for (i=0; i< RARRAY(except)->len; i++) {
-		GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
-		if (FD_ISSET(fileno(fptr->f), ep)) {
-		    rb_ary_push(list, rb_ary_entry(except, i));
-		}
-		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), ep)) {
-		    rb_ary_push(list, rb_ary_entry(except, i));
+	    list = RARRAY_PTR(res)[2];
+	    for (i=0; i< RARRAY_LEN(except); i++) {
+                VALUE obj = rb_ary_entry(except, i);
+                VALUE io = rb_io_get_io(obj);
+                VALUE write_io = GetWriteIO(io);
+		GetOpenFile(io, fptr);
+		if (rb_fd_isset(fptr->fd, &fds[2])) {
+		    rb_ary_push(list, obj);
 		}
+                else if (io != write_io) {
+                    GetOpenFile(write_io, fptr);
+                    if (rb_fd_isset(fptr->fd, &fds[2])) {
+                        rb_ary_push(list, obj);
+                    }
+                }
 	    }
 	}
     }
@@ -4851,42 +7299,102 @@ rb_f_select(argc, argv, obj)
     return res;			/* returns an empty array on interrupt */
 }
 
-#if !defined(MSDOS) && !defined(__human68k__)
+struct select_args {
+    VALUE read, write, except;
+    struct timeval *timeout;
+    rb_fdset_t fdsets[4];
+};
+
+#ifdef HAVE_RB_FD_INIT
+static VALUE
+select_call(VALUE arg)
+{
+    struct select_args *p = (struct select_args *)arg;
+
+    return select_internal(p->read, p->write, p->except, p->timeout, p->fdsets);
+}
+
+static VALUE
+select_end(VALUE arg)
+{
+    struct select_args *p = (struct select_args *)arg;
+    int i;
+
+    for (i = 0; i < numberof(p->fdsets); ++i)
+	rb_fd_term(&p->fdsets[i]);
+    return Qnil;
+}
+#endif
+
+/*
+ *  call-seq:
+ *     IO.select(read_array
+ *               [, write_array
+ *               [, error_array
+ *               [, timeout]]] )-> array  or  nil
+ *
+ *  See <code>Kernel#select</code>.
+ */
+
+static VALUE
+rb_f_select(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE timeout;
+    struct select_args args;
+    struct timeval timerec;
+    int i;
+
+    rb_scan_args(argc, argv, "13", &args.read, &args.write, &args.except, &timeout);
+    if (NIL_P(timeout)) {
+	args.timeout = 0;
+    }
+    else {
+	timerec = rb_time_interval(timeout);
+	args.timeout = &timerec;
+    }
+
+    for (i = 0; i < numberof(args.fdsets); ++i)
+	rb_fd_init(&args.fdsets[i]);
+
+#ifdef HAVE_RB_FD_INIT
+    return rb_ensure(select_call, (VALUE)&args, select_end, (VALUE)&args);
+#else
+    return select_internal(args.read, args.write, args.except,
+			   args.timeout, args.fdsets);
+#endif
+
+}
+
 static int
-io_cntl(fd, cmd, narg, io_p)
-    int fd, cmd, io_p;
-    long narg;
+io_cntl(int fd, unsigned long cmd, long narg, int io_p)
 {
     int retval;
 
 #ifdef HAVE_FCNTL
-    TRAP_BEG;
 # if defined(__CYGWIN__)
     retval = io_p?ioctl(fd, cmd, (void*)narg):fcntl(fd, cmd, narg);
 # else
-    retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, cmd, narg);
+    retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, (int)cmd, narg);
+# endif
+# if defined(F_DUPFD)
+    if (!io_p && retval != -1 && cmd == F_DUPFD) {
+        UPDATE_MAXFD(retval);
+    }
 # endif
-    TRAP_END;
 #else
     if (!io_p) {
 	rb_notimplement();
     }
-    TRAP_BEG;
     retval = ioctl(fd, cmd, narg);
-    TRAP_END;
 #endif
     return retval;
 }
-#endif
 
 static VALUE
-rb_io_ctl(io, req, arg, io_p)
-    VALUE io, req, arg;
-    int io_p;
+rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
 {
-#if !defined(MSDOS) && !defined(__human68k__)
-    int cmd = NUM2ULONG(req);
-    OpenFile *fptr;
+    unsigned long cmd = NUM2ULONG(req);
+    rb_io_t *fptr;
     long len = 0;
     long narg = 0;
     int retval;
@@ -4922,49 +7430,41 @@ rb_io_ctl(io, req, arg, io_p)
 #endif
 	    rb_str_modify(arg);
 
-	    if (len <= RSTRING(arg)->len) {
-		len = RSTRING(arg)->len;
+	    if (len <= RSTRING_LEN(arg)) {
+		len = RSTRING_LEN(arg);
 	    }
-	    if (RSTRING(arg)->len < len) {
+	    if (RSTRING_LEN(arg) < len) {
 		rb_str_resize(arg, len+1);
 	    }
-	    RSTRING(arg)->ptr[len] = 17;	/* a little sanity check here */
-	    narg = (long)RSTRING(arg)->ptr;
+	    RSTRING_PTR(arg)[len] = 17;	/* a little sanity check here */
+	    narg = (long)RSTRING_PTR(arg);
 	}
     }
     GetOpenFile(io, fptr);
-    retval = io_cntl(fileno(fptr->f), cmd, narg, io_p);
-    if (retval < 0) rb_sys_fail(fptr->path);
-    if (TYPE(arg) == T_STRING && RSTRING(arg)->ptr[len] != 17) {
+    retval = io_cntl(fptr->fd, cmd, narg, io_p);
+    if (retval < 0) rb_sys_fail_path(fptr->pathv);
+    if (TYPE(arg) == T_STRING && RSTRING_PTR(arg)[len] != 17) {
 	rb_raise(rb_eArgError, "return value overflowed string");
     }
 
-    if (fptr->f2 && fileno(fptr->f) != fileno(fptr->f2)) {
-	/* call on f2 too; ignore result */
-	io_cntl(fileno(fptr->f2), cmd, narg, io_p);
-    }
-
     if (!io_p && cmd == F_SETFL) {
-      if (narg & O_NONBLOCK) {
-        fptr->mode |= FMODE_WSPLIT_INITIALIZED;
-        fptr->mode &= ~FMODE_WSPLIT;
-      }
-      else {
-        fptr->mode &= ~(FMODE_WSPLIT_INITIALIZED|FMODE_WSPLIT);
-      }
+	if (narg & O_NONBLOCK) {
+	    fptr->mode |= FMODE_WSPLIT_INITIALIZED;
+	    fptr->mode &= ~FMODE_WSPLIT;
+	}
+	else {
+	    fptr->mode &= ~(FMODE_WSPLIT_INITIALIZED|FMODE_WSPLIT);
+	}
     }
 
     return INT2NUM(retval);
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
 }
 
+
 /*
  *  call-seq:
- *     ios.ioctl(integer_cmd, arg)    => integer
- *  
+ *     ios.ioctl(integer_cmd, arg)    -> integer
+ *
  *  Provides a mechanism for issuing low-level commands to control or
  *  query I/O devices. Arguments and results are platform dependent. If
  *  <i>arg</i> is a number, its value is passed directly. If it is a
@@ -4974,10 +7474,7 @@ rb_io_ctl(io, req, arg, io_p)
  */
 
 static VALUE
-rb_io_ioctl(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_ioctl(int argc, VALUE *argv, VALUE io)
 {
     VALUE req, arg;
 
@@ -4985,10 +7482,11 @@ rb_io_ioctl(argc, argv, io)
     return rb_io_ctl(io, req, arg, 1);
 }
 
+#ifdef HAVE_FCNTL
 /*
  *  call-seq:
- *     ios.fcntl(integer_cmd, arg)    => integer
- *  
+ *     ios.fcntl(integer_cmd, arg)    -> integer
+ *
  *  Provides a mechanism for issuing low-level commands to control or
  *  query file-oriented I/O streams. Arguments and results are platform
  *  dependent. If <i>arg</i> is a number, its value is passed
@@ -4999,170 +7497,288 @@ rb_io_ioctl(argc, argv, io)
  */
 
 static VALUE
-rb_io_fcntl(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_fcntl(int argc, VALUE *argv, VALUE io)
 {
-#ifdef HAVE_FCNTL
     VALUE req, arg;
 
     rb_scan_args(argc, argv, "11", &req, &arg);
     return rb_io_ctl(io, req, arg, 0);
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define rb_io_fcntl rb_f_notimplement
 #endif
-}
 
+#if defined(HAVE_SYSCALL) || defined(HAVE___SYSCALL)
 /*
  *  call-seq:
- *     syscall(fixnum [, args...])   => integer
- *  
- *  Calls the operating system function identified by _fixnum_,
- *  passing in the arguments, which must be either +String+
- *  objects, or +Integer+ objects that ultimately fit within
- *  a native +long+. Up to nine parameters may be passed (14
- *  on the Atari-ST). The function identified by _fixnum_ is system
+ *     syscall(num [, args...])   -> integer
+ *
+ *  Calls the operating system function identified by _num_ and
+ *  returns the result of the function or raises SystemCallError if
+ *  it failed.
+ *
+ *  Arguments for the function can follow _num_. They must be either
+ *  +String+ objects or +Integer+ objects. A +String+ object is passed
+ *  as a pointer to the byte sequence. An +Integer+ object is passed
+ *  as an integer whose bit size is same as a pointer.
+ *  Up to nine parameters may be passed (14 on the Atari-ST). 
+ *
+ *  The function identified by _num_ is system
  *  dependent. On some Unix systems, the numbers may be obtained from a
  *  header file called <code>syscall.h</code>.
- *     
+ *
  *     syscall 4, 1, "hello\n", 6   # '4' is write(2) on our box
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     hello
+ *
+ *
+ *  Calling +syscall+ on a platform which does not have any way to
+ *  an arbitrary system function just fails with NotImplementedError.
+ *
+ * Note::
+ *   +syscall+ is essentially unsafe and unportable. Feel free to shoot your foot.
+ *   DL (Fiddle) library is preferred for safer and a bit more portable programming.
  */
 
 static VALUE
-rb_f_syscall(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_f_syscall(int argc, VALUE *argv)
 {
-#if defined(HAVE_SYSCALL) && !defined(__CHECKER__)
 #ifdef atarist
-    unsigned long arg[14]; /* yes, we really need that many ! */
+    VALUE arg[13]; /* yes, we really need that many ! */
 #else
-    unsigned long arg[8];
+    VALUE arg[8];
 #endif
-    int retval = -1;
-    int i = 1;
-    int items = argc - 1;
-
-    /* This probably won't work on machines where sizeof(long) != sizeof(int)
-     * or where sizeof(long) != sizeof(char*).  But such machines will
-     * not likely have syscall implemented either, so who cares?
+#if SIZEOF_VOIDP == 8 && defined(HAVE___SYSCALL) && SIZEOF_INT != 8 /* mainly *BSD */
+# define SYSCALL __syscall
+# define NUM2SYSCALLID(x) NUM2LONG(x)
+# define RETVAL2NUM(x) LONG2NUM(x)
+# if SIZEOF_LONG == 8
+    long num, retval = -1;
+# elif SIZEOF_LONG_LONG == 8
+    long long num, retval = -1;
+# else
+#  error ---->> it is asserted that __syscall takes the first argument and returns retval in 64bit signed integer. <<----
+# endif
+#elif defined linux
+# define SYSCALL syscall
+# define NUM2SYSCALLID(x) NUM2LONG(x)
+# define RETVAL2NUM(x) LONG2NUM(x)
+    /*
+     * Linux man page says, syscall(2) function prototype is below.
+     *
+     *     int syscall(int number, ...);
+     *
+     * But, it's incorrect. Actual one takes and returned long. (see unistd.h)
      */
+    long num, retval = -1;
+#else
+# define SYSCALL syscall
+# define NUM2SYSCALLID(x) NUM2INT(x)
+# define RETVAL2NUM(x) INT2NUM(x)
+    int num, retval = -1;
+#endif
+    int i;
+ 
+    if (RTEST(ruby_verbose)) {
+	rb_warning("We plan to remove a syscall function at future release. DL(Fiddle) provides safer alternative.");
+    }
 
     rb_secure(2);
     if (argc == 0)
 	rb_raise(rb_eArgError, "too few arguments for syscall");
-    if (argc > sizeof(arg) / sizeof(arg[0]))
+    if (argc > numberof(arg))
 	rb_raise(rb_eArgError, "too many arguments for syscall");
-    arg[0] = NUM2LONG(argv[0]); argv++;
-    while (items--) {
-	VALUE v = rb_check_string_type(*argv);
+    num = NUM2SYSCALLID(argv[0]); ++argv;
+    for (i = argc - 1; i--; ) {
+	VALUE v = rb_check_string_type(argv[i]);
 
 	if (!NIL_P(v)) {
 	    StringValue(v);
 	    rb_str_modify(v);
-	    arg[i] = (unsigned long)StringValueCStr(v);
+	    arg[i] = (VALUE)StringValueCStr(v);
 	}
 	else {
-	    arg[i] = (unsigned long)NUM2LONG(*argv);
+	    arg[i] = (VALUE)NUM2LONG(argv[i]);
 	}
-	argv++;
-	i++;
     }
-    TRAP_BEG;
+
     switch (argc) {
       case 1:
-	retval = syscall(arg[0]);
+	retval = SYSCALL(num);
 	break;
       case 2:
-	retval = syscall(arg[0],arg[1]);
+	retval = SYSCALL(num, arg[0]);
 	break;
       case 3:
-	retval = syscall(arg[0],arg[1],arg[2]);
+	retval = SYSCALL(num, arg[0],arg[1]);
 	break;
       case 4:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2]);
 	break;
       case 5:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3]);
 	break;
       case 6:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4]);
 	break;
       case 7:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5]);
 	break;
       case 8:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
-	  arg[7]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]);
 	break;
 #ifdef atarist
       case 9:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
-	  arg[7], arg[8]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7]);
 	break;
       case 10:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
-	  arg[7], arg[8], arg[9]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8]);
 	break;
       case 11:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
-	  arg[7], arg[8], arg[9], arg[10]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9]);
 	break;
       case 12:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
-	  arg[7], arg[8], arg[9], arg[10], arg[11]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9], arg[10]);
 	break;
       case 13:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
-	  arg[7], arg[8], arg[9], arg[10], arg[11], arg[12]);
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9], arg[10], arg[11]);
 	break;
       case 14:
-	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
-	  arg[7], arg[8], arg[9], arg[10], arg[11], arg[12], arg[13]);
-	break;
-#endif /* atarist */
+	retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9], arg[10], arg[11], arg[12]);
+        break;
+#endif
     }
-    TRAP_END;
-    if (retval < 0) rb_sys_fail(0);
-    return INT2NUM(retval);
+
+    if (retval == -1)
+	rb_sys_fail(0);
+    return RETVAL2NUM(retval);
+#undef SYSCALL
+#undef NUM2SYSCALLID
+#undef RETVAL2NUM
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define rb_f_syscall rb_f_notimplement
 #endif
-}
 
-static VALUE io_new_instance _((VALUE));
 static VALUE
-io_new_instance(args)
-    VALUE args;
+io_new_instance(VALUE args)
 {
     return rb_class_new_instance(2, (VALUE*)args+1, *(VALUE*)args);
 }
 
+static void
+io_encoding_set(rb_io_t *fptr, VALUE v1, VALUE v2, VALUE opt)
+{
+    rb_encoding *enc, *enc2;
+    int ecflags;
+    VALUE ecopts, tmp;
+
+    if (!NIL_P(v2)) {
+	enc2 = rb_to_encoding(v1);
+	tmp = rb_check_string_type(v2);
+	if (!NIL_P(tmp)) {
+	    if (RSTRING_LEN(tmp) == 1 && RSTRING_PTR(tmp)[0] == '-') {
+		/* Special case - "-" => no transcoding */
+		enc = enc2;
+		enc2 = NULL;
+	    }
+	    else
+		enc = rb_to_encoding(v2);
+	    if (enc == enc2) {
+		/* Special case - "-" => no transcoding */
+		enc2 = NULL;
+	    }
+	}
+	else
+	    enc = rb_to_encoding(v2);
+        ecflags = rb_econv_prepare_opts(opt, &ecopts);
+    }
+    else {
+	if (NIL_P(v1)) {
+	    /* Set to default encodings */
+	    rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2);
+            ecflags = 0;
+            ecopts = Qnil;
+	}
+	else {
+	    tmp = rb_check_string_type(v1);
+	    if (!NIL_P(tmp) && rb_enc_asciicompat(rb_enc_get(tmp))) {
+                parse_mode_enc(RSTRING_PTR(tmp), &enc, &enc2, NULL);
+                ecflags = rb_econv_prepare_opts(opt, &ecopts);
+	    }
+	    else {
+		rb_io_ext_int_to_encs(rb_to_encoding(v1), NULL, &enc, &enc2);
+                ecflags = 0;
+                ecopts = Qnil;
+	    }
+	}
+    }
+    validate_enc_binmode(fptr->mode, enc, enc2);
+    fptr->encs.enc = enc;
+    fptr->encs.enc2 = enc2;
+    fptr->encs.ecflags = ecflags;
+    fptr->encs.ecopts = ecopts;
+    clear_codeconv(fptr);
+
+}
+
+static VALUE
+pipe_pair_close(VALUE rw)
+{
+    VALUE *rwp = (VALUE *)rw;
+    return rb_ensure(io_close, rwp[0], io_close, rwp[1]);
+}
+
 /*
  *  call-seq:
- *     IO.pipe -> array
- *  
+ *     IO.pipe                             ->  [read_io, write_io]
+ *     IO.pipe(ext_enc)                    ->  [read_io, write_io]
+ *     IO.pipe("ext_enc:int_enc" [, opt])  ->  [read_io, write_io]
+ *     IO.pipe(ext_enc, int_enc [, opt])   ->  [read_io, write_io]
+ *
+ *     IO.pipe(...) {|read_io, write_io| ... }
+ *
  *  Creates a pair of pipe endpoints (connected to each other) and
  *  returns them as a two-element array of <code>IO</code> objects:
- *  <code>[</code> <i>read_file</i>, <i>write_file</i> <code>]</code>. Not
- *  available on all platforms.
- *     
+ *  <code>[</code> <i>read_io</i>, <i>write_io</i> <code>]</code>.
+ *
+ *  If a block is given, the block is called and
+ *  returns the value of the block.
+ *  <i>read_io</i> and <i>write_io</i> are sent to the block as arguments.
+ *  If read_io and write_io are not closed when the block exits, they are closed.
+ *  i.e. closing read_io and/or write_io doesn't cause an error.
+ *
+ *  Not available on all platforms.
+ *
+ *  If an encoding (encoding name or encoding object) is specified as an optional argument,
+ *  read string from pipe is tagged with the encoding specified.
+ *  If the argument is a colon separated two encoding names "A:B",
+ *  the read string is converted from encoding A (external encoding)
+ *  to encoding B (internal encoding), then tagged with B.
+ *  If two optional arguments are specified, those must be
+ *  encoding objects or encoding names,
+ *  and the first one is the external encoding,
+ *  and the second one is the internal encoding.
+ *  If the external encoding and the internal encoding is specified,
+ *  optional hash argument specify the conversion option.
+ *
  *  In the example below, the two processes close the ends of the pipe
  *  that they are not using. This is not just a cosmetic nicety. The
  *  read end of a pipe will not generate an end of file condition if
  *  there are any writers with the pipe still open. In the case of the
  *  parent process, the <code>rd.read</code> will never return if it
  *  does not first issue a <code>wr.close</code>.
- *     
+ *
  *     rd, wr = IO.pipe
- *     
+ *
  *     if fork
  *       wr.close
  *       puts "Parent got: <#{rd.read}>"
@@ -5174,27 +7790,27 @@ io_new_instance(args)
  *       wr.write "Hi Dad"
  *       wr.close
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Sending message to parent
  *     Parent got: <Hi Dad>
  */
 
 static VALUE
-rb_io_s_pipe(klass)
-    VALUE klass;
+rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
 {
-#ifndef __human68k__
     int pipes[2], state;
-    VALUE r, w, args[3];
+    VALUE r, w, args[3], v1, v2;
+    VALUE opt;
+    rb_io_t *fptr, *fptr2;
+    int fmode = 0;
+    VALUE ret;
 
-#ifdef _WIN32
-    if (_pipe(pipes, 1024, O_BINARY) == -1)
-#else
-    if (pipe(pipes) == -1)
-#endif
-	rb_sys_fail(0);
+    opt = pop_last_hash(&argc, argv);
+    rb_scan_args(argc, argv, "02", &v1, &v2);
+    if (rb_pipe(pipes) == -1)
+        rb_sys_fail(0);
 
     args[0] = klass;
     args[1] = INT2NUM(pipes[0]);
@@ -5205,6 +7821,8 @@ rb_io_s_pipe(klass)
 	close(pipes[1]);
 	rb_jump_tag(state);
     }
+    GetOpenFile(r, fptr);
+    io_encoding_set(fptr, v1, v2, opt);
     args[1] = INT2NUM(pipes[1]);
     args[2] = INT2FIX(O_WRONLY);
     w = rb_protect(io_new_instance, (VALUE)args, &state);
@@ -5213,28 +7831,74 @@ rb_io_s_pipe(klass)
 	if (!NIL_P(r)) rb_io_close(r);
 	rb_jump_tag(state);
     }
-    rb_io_synchronized(RFILE(w)->fptr);
+    GetOpenFile(w, fptr2);
+    rb_io_synchronized(fptr2);
 
-    return rb_assoc_new(r, w);
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
+    extract_binmode(opt, &fmode);
+    fptr->mode |= fmode;
+    fptr2->mode |= fmode;
+
+    ret = rb_assoc_new(r, w);
+    if (rb_block_given_p()) {
+	VALUE rw[2];
+	rw[0] = r;
+	rw[1] = w;
+	return rb_ensure(rb_yield, ret, pipe_pair_close, (VALUE)rw);
+    }
+    return ret;
 }
 
 struct foreach_arg {
     int argc;
-    VALUE sep;
+    VALUE *argv;
     VALUE io;
 };
 
+static void
+open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
+{
+    VALUE opt, v;
+
+    FilePathValue(argv[0]);
+    arg->io = 0;
+    arg->argc = argc - 1;
+    arg->argv = argv + 1;
+    if (argc == 1) {
+      no_key:
+	arg->io = rb_io_open(argv[0], INT2NUM(O_RDONLY), INT2FIX(0666), Qnil);
+	return;
+    }
+    opt = pop_last_hash(&arg->argc, arg->argv);
+    if (NIL_P(opt)) goto no_key;
+
+    v = rb_hash_aref(opt, sym_open_args);
+    if (!NIL_P(v)) {
+	VALUE args;
+	long n;
+
+	v = rb_convert_type(v, T_ARRAY, "Array", "to_ary");
+	n = RARRAY_LEN(v) + 1;
+#if SIZEOF_LONG > SIZEOF_INT
+	if (n > INT_MAX) {
+	    rb_raise(rb_eArgError, "too many arguments");
+	}
+#endif
+	args = rb_ary_tmp_new(n);
+	rb_ary_push(args, argv[0]);
+	rb_ary_concat(args, v);
+	arg->io = rb_io_open_with_args((int)n, RARRAY_PTR(args));
+	rb_ary_clear(args);	/* prevent from GC */
+	return;
+    }
+    arg->io = rb_io_open(argv[0], Qnil, Qnil, opt);
+}
+
 static VALUE
-io_s_foreach(arg)
-    struct foreach_arg *arg;
+io_s_foreach(struct foreach_arg *arg)
 {
     VALUE str;
 
-    while (!NIL_P(str = rb_io_getline(arg->sep, arg->io))) {
+    while (!NIL_P(str = rb_io_gets_m(arg->argc, arg->argv, arg->io))) {
 	rb_yield(str);
     }
     return Qnil;
@@ -5242,202 +7906,1123 @@ io_s_foreach(arg)
 
 /*
  *  call-seq:
- *     IO.foreach(name, sep_string=$/) {|line| block }   => nil
- *  
+ *     IO.foreach(name, sep=$/ [, open_args]) {|line| block }     -> nil
+ *     IO.foreach(name, limit [, open_args]) {|line| block }      -> nil
+ *     IO.foreach(name, sep, limit [, open_args]) {|line| block } -> nil
+ *     IO.foreach(...)                                            -> an_enumerator
+ *
  *  Executes the block for every line in the named I/O port, where lines
- *  are separated by <em>sep_string</em>.
- *     
+ *  are separated by <em>sep</em>.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     IO.foreach("testfile") {|x| print "GOT ", x }
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     GOT This is line one
  *     GOT This is line two
  *     GOT This is line three
  *     GOT And so on...
- */     
+ *
+ *  If the last argument is a hash, it's the keyword argument to open.
+ *  See <code>IO.read</code> for detail.
+ *
+ */
 
 static VALUE
-rb_io_s_foreach(argc, argv)
-    int argc;
-    VALUE *argv;
+rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
 {
-    VALUE fname;
     struct foreach_arg arg;
 
-    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
-    SafeStringValue(fname);
-
-    if (argc == 1) {
-	arg.sep = rb_default_rs;
-    }
-    else if (!NIL_P(arg.sep)) {
-	StringValue(arg.sep);
-    }
-    arg.io = rb_io_open(StringValueCStr(fname), "r");
+    rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
+    RETURN_ENUMERATOR(self, argc, argv);
+    open_key_args(argc, argv, &arg);
     if (NIL_P(arg.io)) return Qnil;
-
     return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
 }
 
 static VALUE
-io_s_readlines(arg)
-    struct foreach_arg *arg;
+io_s_readlines(struct foreach_arg *arg)
 {
-    return rb_io_readlines(arg->argc, &arg->sep, arg->io);
+    return rb_io_readlines(arg->argc, arg->argv, arg->io);
 }
 
 /*
  *  call-seq:
- *     IO.readlines(name, sep_string=$/)   => array
- *  
+ *     IO.readlines(name, sep=$/ [, open_args])     -> array
+ *     IO.readlines(name, limit [, open_args])      -> array
+ *     IO.readlines(name, sep, limit [, open_args]) -> array
+ *
  *  Reads the entire file specified by <i>name</i> as individual
  *  lines, and returns those lines in an array. Lines are separated by
- *  <i>sep_string</i>.
- *     
+ *  <i>sep</i>.
+ *
  *     a = IO.readlines("testfile")
  *     a[0]   #=> "This is line one\n"
- *     
+ *
+ *  If the last argument is a hash, it's the keyword argument to open.
+ *  See <code>IO.read</code> for detail.
+ *
  */
 
 static VALUE
-rb_io_s_readlines(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_s_readlines(int argc, VALUE *argv, VALUE io)
 {
-    VALUE fname;
     struct foreach_arg arg;
 
-    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
-    SafeStringValue(fname);
-
-    arg.argc = argc - 1;
-    arg.io = rb_io_open(StringValueCStr(fname), "r");
+    rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
+    open_key_args(argc, argv, &arg);
     if (NIL_P(arg.io)) return Qnil;
     return rb_ensure(io_s_readlines, (VALUE)&arg, rb_io_close, arg.io);
 }
 
 static VALUE
-io_s_read(arg)
-    struct foreach_arg *arg;
+io_s_read(struct foreach_arg *arg)
 {
-    return io_read(arg->argc, &arg->sep, arg->io);
+    return io_read(arg->argc, arg->argv, arg->io);
+}
+
+struct seek_arg {
+    VALUE io;
+    VALUE offset;
+    int mode;
+};
+
+static VALUE
+seek_before_access(VALUE argp)
+{
+    struct seek_arg *arg = (struct seek_arg *)argp;
+    rb_io_binmode(arg->io);
+    return rb_io_seek(arg->io, arg->offset, arg->mode);
 }
 
 /*
  *  call-seq:
- *     IO.read(name, [length [, offset]] )   => string
- *  
- *  Opens the file, optionally seeks to the given offset, then returns
+ *     IO.read(name, [length [, offset]] )   -> string
+ *     IO.read(name, [length [, offset]], open_args)   -> string
+ *
+ *  Opens the file, optionally seeks to the given <i>offset</i>, then returns
  *  <i>length</i> bytes (defaulting to the rest of the file).
  *  <code>read</code> ensures the file is closed before returning.
- *     
+ *
+ *  If the last argument is a hash, it specifies option for internal
+ *  open().  The key would be the following.  open_args: is exclusive
+ *  to others.
+ *
+ *   encoding: string or encoding
+ *
+ *    specifies encoding of the read string.  encoding will be ignored
+ *    if length is specified.
+ *
+ *   mode: string
+ *
+ *    specifies mode argument for open().  it should start with "r"
+ *    otherwise it would cause error.
+ *
+ *   open_args: array of strings
+ *
+ *    specifies arguments for open() as an array.
+ *
  *     IO.read("testfile")           #=> "This is line one\nThis is line two\nThis is line three\nAnd so on...\n"
  *     IO.read("testfile", 20)       #=> "This is line one\nThi"
  *     IO.read("testfile", 20, 10)   #=> "ne one\nThis is line "
  */
 
 static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_s_read(int argc, VALUE *argv, VALUE io)
 {
-    VALUE fname, offset;
+    VALUE offset;
     struct foreach_arg arg;
 
-    rb_scan_args(argc, argv, "12", &fname, &arg.sep, &offset);
-    SafeStringValue(fname);
+    rb_scan_args(argc, argv, "13", NULL, NULL, &offset, NULL);
+    open_key_args(argc, argv, &arg);
+    if (NIL_P(arg.io)) return Qnil;
+    if (!NIL_P(offset)) {
+	struct seek_arg sarg;
+	int state = 0;
+	sarg.io = arg.io;
+	sarg.offset = offset;
+	sarg.mode = SEEK_SET;
+	rb_protect(seek_before_access, (VALUE)&sarg, &state);
+	if (state) {
+	    rb_io_close(arg.io);
+	    rb_jump_tag(state);
+	}
+	if (arg.argc == 2) arg.argc = 1;
+    }
+    return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
+}
 
-    arg.argc = argc ? 1 : 0;
-    arg.io = rb_io_open(StringValueCStr(fname), "r");
+/*
+ *  call-seq:
+ *     IO.binread(name, [length [, offset]] )   -> string
+ *
+ *  Opens the file, optionally seeks to the given <i>offset</i>, then returns
+ *  <i>length</i> bytes (defaulting to the rest of the file).
+ *  <code>binread</code> ensures the file is closed before returning.
+ *  The open mode would be "rb:ASCII-8BIT".
+ *
+ *     IO.binread("testfile")           #=> "This is line one\nThis is line two\nThis is line three\nAnd so on...\n"
+ *     IO.binread("testfile", 20)       #=> "This is line one\nThi"
+ *     IO.binread("testfile", 20, 10)   #=> "ne one\nThis is line "
+ */
+
+static VALUE
+rb_io_s_binread(int argc, VALUE *argv, VALUE io)
+{
+    VALUE offset;
+    struct foreach_arg arg;
+
+    rb_scan_args(argc, argv, "12", NULL, NULL, &offset);
+    FilePathValue(argv[0]);
+    arg.io = rb_io_open(argv[0], rb_str_new_cstr("rb:ASCII-8BIT"), Qnil, Qnil);
     if (NIL_P(arg.io)) return Qnil;
+    arg.argv = argv+1;
+    arg.argc = (argc > 1) ? 1 : 0;
     if (!NIL_P(offset)) {
 	rb_io_seek(arg.io, offset, SEEK_SET);
     }
     return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
 }
 
+struct copy_stream_struct {
+    VALUE src;
+    VALUE dst;
+    off_t copy_length; /* (off_t)-1 if not specified */
+    off_t src_offset; /* (off_t)-1 if not specified */
+
+    int src_fd;
+    int dst_fd;
+    int close_src;
+    int close_dst;
+    off_t total;
+    const char *syserr;
+    int error_no;
+    const char *notimp;
+    rb_fdset_t fds;
+    VALUE th;
+};
+
+static int
+maygvl_copy_stream_wait_read(struct copy_stream_struct *stp)
+{
+    int ret;
+    rb_fd_zero(&stp->fds);
+    rb_fd_set(stp->src_fd, &stp->fds);
+    ret = rb_fd_select(rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
+    if (ret == -1) {
+        stp->syserr = "select";
+        stp->error_no = errno;
+        return -1;
+    }
+    return 0;
+}
+
+static int
+nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
+{
+    int ret;
+    rb_fd_zero(&stp->fds);
+    rb_fd_set(stp->dst_fd, &stp->fds);
+    ret = rb_fd_select(rb_fd_max(&stp->fds), NULL, &stp->fds, NULL, NULL);
+    if (ret == -1) {
+        stp->syserr = "select";
+        stp->error_no = errno;
+        return -1;
+    }
+    return 0;
+}
+
+#ifdef HAVE_SENDFILE
+
+#ifdef __linux__
+#define USE_SENDFILE
+
+#ifdef HAVE_SYS_SENDFILE_H
+#include <sys/sendfile.h>
+#endif
+
+static ssize_t
+simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
+{
+#if SIZEOF_OFF_T > SIZEOF_SIZE_T
+    /* we are limited by the 32-bit ssize_t return value on 32-bit */
+    if (count > (off_t)SSIZE_MAX)
+        count = SSIZE_MAX;
+#endif
+    return sendfile(out_fd, in_fd, offset, (size_t)count);
+}
+
+#endif
+
+#endif
+
+#ifdef USE_SENDFILE
+static int
+nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
+{
+    struct stat src_stat, dst_stat;
+    ssize_t ss;
+    int ret;
+
+    off_t copy_length;
+    off_t src_offset;
+    int use_pread;
+
+    ret = fstat(stp->src_fd, &src_stat);
+    if (ret == -1) {
+        stp->syserr = "fstat";
+        stp->error_no = errno;
+        return -1;
+    }
+    if (!S_ISREG(src_stat.st_mode))
+        return 0;
+
+    ret = fstat(stp->dst_fd, &dst_stat);
+    if (ret == -1) {
+        stp->syserr = "fstat";
+        stp->error_no = errno;
+        return -1;
+    }
+    if ((dst_stat.st_mode & S_IFMT) != S_IFSOCK)
+        return 0;
+
+    src_offset = stp->src_offset;
+    use_pread = src_offset != (off_t)-1;
+
+    copy_length = stp->copy_length;
+    if (copy_length == (off_t)-1) {
+        if (use_pread)
+            copy_length = src_stat.st_size - src_offset;
+        else {
+	    off_t cur;
+	    errno = 0;
+            cur = lseek(stp->src_fd, 0, SEEK_CUR);
+            if (cur == (off_t)-1 && errno) {
+                stp->syserr = "lseek";
+                stp->error_no = errno;
+                return -1;
+            }
+            copy_length = src_stat.st_size - cur;
+        }
+    }
+
+  retry_sendfile:
+    if (use_pread) {
+        ss = simple_sendfile(stp->dst_fd, stp->src_fd, &src_offset, copy_length);
+    }
+    else {
+        ss = simple_sendfile(stp->dst_fd, stp->src_fd, NULL, copy_length);
+    }
+    if (0 < ss) {
+        stp->total += ss;
+        copy_length -= ss;
+        if (0 < copy_length) {
+            goto retry_sendfile;
+        }
+    }
+    if (ss == -1) {
+        switch (errno) {
+	  case EINVAL:
+#ifdef ENOSYS
+	  case ENOSYS:
+#endif
+            return 0;
+	  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
+            if (nogvl_copy_stream_wait_write(stp) == -1)
+                return -1;
+            if (rb_thread_interrupted(stp->th))
+                return -1;
+            goto retry_sendfile;
+        }
+        stp->syserr = "sendfile";
+        stp->error_no = errno;
+        return -1;
+    }
+    return 1;
+}
+#endif
+
+static ssize_t
+maygvl_copy_stream_read(struct copy_stream_struct *stp, char *buf, size_t len, off_t offset)
+{
+    ssize_t ss;
+  retry_read:
+    if (offset == (off_t)-1)
+        ss = read(stp->src_fd, buf, len);
+    else {
+#ifdef HAVE_PREAD
+        ss = pread(stp->src_fd, buf, len, offset);
+#else
+        stp->notimp = "pread";
+        return -1;
+#endif
+    }
+    if (ss == 0) {
+        return 0;
+    }
+    if (ss == -1) {
+        switch (errno) {
+	  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
+            if (maygvl_copy_stream_wait_read(stp) == -1)
+                return -1;
+            goto retry_read;
+#ifdef ENOSYS
+	  case ENOSYS:
+#endif
+            stp->notimp = "pread";
+            return -1;
+        }
+        stp->syserr = offset == (off_t)-1 ?  "read" : "pread";
+        stp->error_no = errno;
+        return -1;
+    }
+    return ss;
+}
+
+static int
+nogvl_copy_stream_write(struct copy_stream_struct *stp, char *buf, size_t len)
+{
+    ssize_t ss;
+    int off = 0;
+    while (len) {
+        ss = write(stp->dst_fd, buf+off, len);
+        if (ss == -1) {
+            if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                if (nogvl_copy_stream_wait_write(stp) == -1)
+                    return -1;
+                continue;
+            }
+            stp->syserr = "write";
+            stp->error_no = errno;
+            return -1;
+        }
+        off += (int)ss;
+        len -= (int)ss;
+        stp->total += ss;
+    }
+    return 0;
+}
+
+static void
+nogvl_copy_stream_read_write(struct copy_stream_struct *stp)
+{
+    char buf[1024*16];
+    size_t len;
+    ssize_t ss;
+    int ret;
+    off_t copy_length;
+    int use_eof;
+    off_t src_offset;
+    int use_pread;
+
+    copy_length = stp->copy_length;
+    use_eof = copy_length == (off_t)-1;
+    src_offset = stp->src_offset;
+    use_pread = src_offset != (off_t)-1;
+
+    if (use_pread && stp->close_src) {
+        off_t r;
+	errno = 0;
+        r = lseek(stp->src_fd, src_offset, SEEK_SET);
+        if (r == (off_t)-1 && errno) {
+            stp->syserr = "lseek";
+            stp->error_no = errno;
+            return;
+        }
+        src_offset = (off_t)-1;
+        use_pread = 0;
+    }
+
+    while (use_eof || 0 < copy_length) {
+        if (!use_eof && copy_length < (off_t)sizeof(buf)) {
+            len = (size_t)copy_length;
+        }
+        else {
+            len = sizeof(buf);
+        }
+        if (use_pread) {
+            ss = maygvl_copy_stream_read(stp, buf, len, src_offset);
+            if (0 < ss)
+                src_offset += ss;
+        }
+        else {
+            ss = maygvl_copy_stream_read(stp, buf, len, (off_t)-1);
+        }
+        if (ss <= 0) /* EOF or error */
+            return;
+
+        ret = nogvl_copy_stream_write(stp, buf, ss);
+        if (ret < 0)
+            return;
+
+        if (!use_eof)
+            copy_length -= ss;
+
+        if (rb_thread_interrupted(stp->th))
+            return;
+    }
+}
+
 static VALUE
-argf_tell()
+nogvl_copy_stream_func(void *arg)
+{
+    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
+#ifdef USE_SENDFILE
+    int ret;
+#endif
+
+#ifdef USE_SENDFILE
+    ret = nogvl_copy_stream_sendfile(stp);
+    if (ret != 0)
+        goto finish; /* error or success */
+#endif
+
+    nogvl_copy_stream_read_write(stp);
+
+#ifdef USE_SENDFILE
+  finish:
+#endif
+    return Qnil;
+}
+
+static VALUE
+copy_stream_fallback_body(VALUE arg)
+{
+    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
+    const int buflen = 16*1024;
+    VALUE n;
+    VALUE buf = rb_str_buf_new(buflen);
+    off_t rest = stp->copy_length;
+    off_t off = stp->src_offset;
+    ID read_method = id_readpartial;
+
+    if (stp->src_fd == -1) {
+	if (!rb_respond_to(stp->src, read_method)) {
+	    read_method = id_read;
+	}
+    }
+
+    while (1) {
+        long numwrote;
+        long l;
+        if (stp->copy_length == (off_t)-1) {
+            l = buflen;
+        }
+        else {
+            if (rest == 0)
+                break;
+            l = buflen < rest ? buflen : (long)rest;
+        }
+        if (stp->src_fd == -1) {
+            rb_funcall(stp->src, read_method, 2, INT2FIX(l), buf);
+        }
+        else {
+            ssize_t ss;
+            rb_thread_wait_fd(stp->src_fd);
+            rb_str_resize(buf, buflen);
+            ss = maygvl_copy_stream_read(stp, RSTRING_PTR(buf), l, off);
+            if (ss == -1)
+                return Qnil;
+            if (ss == 0)
+                rb_eof_error();
+            rb_str_resize(buf, ss);
+            if (off != (off_t)-1)
+                off += ss;
+        }
+        n = rb_io_write(stp->dst, buf);
+        numwrote = NUM2LONG(n);
+        stp->total += numwrote;
+        rest -= numwrote;
+	if (read_method == id_read && RSTRING_LEN(buf) == 0) {
+	    break;
+	}
+    }
+
+    return Qnil;
+}
+
+static VALUE
+copy_stream_fallback(struct copy_stream_struct *stp)
+{
+    if (stp->src_fd == -1 && stp->src_offset != (off_t)-1) {
+	rb_raise(rb_eArgError, "cannot specify src_offset for non-IO");
+    }
+    rb_rescue2(copy_stream_fallback_body, (VALUE)stp,
+               (VALUE (*) (ANYARGS))0, (VALUE)0,
+               rb_eEOFError, (VALUE)0);
+    return Qnil;
+}
+
+static VALUE
+copy_stream_body(VALUE arg)
+{
+    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
+    VALUE src_io, dst_io;
+    rb_io_t *src_fptr = 0, *dst_fptr = 0;
+    int src_fd, dst_fd;
+
+    stp->th = rb_thread_current();
+
+    stp->total = 0;
+
+    if (stp->src == argf ||
+        !(TYPE(stp->src) == T_FILE ||
+          TYPE(stp->src) == T_STRING ||
+          rb_respond_to(stp->src, rb_intern("to_path")))) {
+        src_fd = -1;
+    }
+    else {
+        src_io = TYPE(stp->src) == T_FILE ? stp->src : Qnil;
+        if (NIL_P(src_io)) {
+            VALUE args[2];
+            int oflags = O_RDONLY;
+#ifdef O_NOCTTY
+            oflags |= O_NOCTTY;
+#endif
+            FilePathValue(stp->src);
+            args[0] = stp->src;
+            args[1] = INT2NUM(oflags);
+            src_io = rb_class_new_instance(2, args, rb_cFile);
+            stp->src = src_io;
+            stp->close_src = 1;
+        }
+        GetOpenFile(src_io, src_fptr);
+        rb_io_check_byte_readable(src_fptr);
+        src_fd = src_fptr->fd;
+    }
+    stp->src_fd = src_fd;
+
+    if (stp->dst == argf ||
+        !(TYPE(stp->dst) == T_FILE ||
+          TYPE(stp->dst) == T_STRING ||
+          rb_respond_to(stp->dst, rb_intern("to_path")))) {
+        dst_fd = -1;
+    }
+    else {
+        dst_io = TYPE(stp->dst) == T_FILE ? stp->dst : Qnil;
+        if (NIL_P(dst_io)) {
+            VALUE args[3];
+            int oflags = O_WRONLY|O_CREAT|O_TRUNC;
+#ifdef O_NOCTTY
+            oflags |= O_NOCTTY;
+#endif
+            FilePathValue(stp->dst);
+            args[0] = stp->dst;
+            args[1] = INT2NUM(oflags);
+            args[2] = INT2FIX(0600);
+            dst_io = rb_class_new_instance(3, args, rb_cFile);
+            stp->dst = dst_io;
+            stp->close_dst = 1;
+        }
+        else {
+            dst_io = GetWriteIO(dst_io);
+            stp->dst = dst_io;
+        }
+        GetOpenFile(dst_io, dst_fptr);
+        rb_io_check_writable(dst_fptr);
+        dst_fd = dst_fptr->fd;
+    }
+    stp->dst_fd = dst_fd;
+
+    if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf_len) {
+        size_t len = src_fptr->rbuf_len;
+        VALUE str;
+        if (stp->copy_length != (off_t)-1 && stp->copy_length < (off_t)len) {
+            len = (size_t)stp->copy_length;
+        }
+        str = rb_str_buf_new(len);
+        rb_str_resize(str,len);
+        read_buffered_data(RSTRING_PTR(str), len, src_fptr);
+        if (dst_fptr) { /* IO or filename */
+            if (io_binwrite(str, dst_fptr, 0) < 0)
+                rb_sys_fail(0);
+        }
+        else /* others such as StringIO */
+            rb_io_write(stp->dst, str);
+        stp->total += len;
+        if (stp->copy_length != (off_t)-1)
+            stp->copy_length -= len;
+    }
+
+    if (dst_fptr && io_fflush(dst_fptr) < 0) {
+	rb_raise(rb_eIOError, "flush failed");
+    }
+
+    if (stp->copy_length == 0)
+        return Qnil;
+
+    if (src_fd == -1 || dst_fd == -1) {
+        return copy_stream_fallback(stp);
+    }
+
+    rb_fd_init(&stp->fds);
+    rb_fd_set(src_fd, &stp->fds);
+    rb_fd_set(dst_fd, &stp->fds);
+
+    return rb_thread_blocking_region(nogvl_copy_stream_func, (void*)stp, RUBY_UBF_IO, 0);
+}
+
+static VALUE
+copy_stream_finalize(VALUE arg)
+{
+    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
+    if (stp->close_src) {
+        rb_io_close_m(stp->src);
+    }
+    if (stp->close_dst) {
+        rb_io_close_m(stp->dst);
+    }
+    rb_fd_term(&stp->fds);
+    if (stp->syserr) {
+        errno = stp->error_no;
+        rb_sys_fail(stp->syserr);
+    }
+    if (stp->notimp) {
+	rb_raise(rb_eNotImpError, "%s() not implemented", stp->notimp);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     IO.copy_stream(src, dst)
+ *     IO.copy_stream(src, dst, copy_length)
+ *     IO.copy_stream(src, dst, copy_length, src_offset)
+ *
+ *  IO.copy_stream copies <i>src</i> to <i>dst</i>.
+ *  <i>src</i> and <i>dst</i> is either a filename or an IO.
+ *
+ *  This method returns the number of bytes copied.
+ *
+ *  If optional arguments are not given,
+ *  the start position of the copy is
+ *  the beginning of the filename or
+ *  the current file offset of the IO.
+ *  The end position of the copy is the end of file.
+ *
+ *  If <i>copy_length</i> is given,
+ *  No more than <i>copy_length</i> bytes are copied.
+ *
+ *  If <i>src_offset</i> is given,
+ *  it specifies the start position of the copy.
+ *
+ *  When <i>src_offset</i> is specified and
+ *  <i>src</i> is an IO,
+ *  IO.copy_stream doesn't move the current file offset.
+ *
+ */
+static VALUE
+rb_io_s_copy_stream(int argc, VALUE *argv, VALUE io)
+{
+    VALUE src, dst, length, src_offset;
+    struct copy_stream_struct st;
+
+    MEMZERO(&st, struct copy_stream_struct, 1);
+
+    rb_scan_args(argc, argv, "22", &src, &dst, &length, &src_offset);
+
+    st.src = src;
+    st.dst = dst;
+
+    if (NIL_P(length))
+        st.copy_length = (off_t)-1;
+    else
+        st.copy_length = NUM2OFFT(length);
+
+    if (NIL_P(src_offset))
+        st.src_offset = (off_t)-1;
+    else
+        st.src_offset = NUM2OFFT(src_offset);
+
+    rb_ensure(copy_stream_body, (VALUE)&st, copy_stream_finalize, (VALUE)&st);
+
+    return OFFT2NUM(st.total);
+}
+
+/*
+ *  call-seq:
+ *     io.external_encoding   -> encoding
+ *
+ *  Returns the Encoding object that represents the encoding of the file.
+ *  If io is write mode and no encoding is specified, returns <code>nil</code>.
+ */
+
+static VALUE
+rb_io_external_encoding(VALUE io)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(io, fptr);
+    if (fptr->encs.enc2) {
+	return rb_enc_from_encoding(fptr->encs.enc2);
+    }
+    if (fptr->mode & FMODE_WRITABLE) {
+	if (fptr->encs.enc)
+	    return rb_enc_from_encoding(fptr->encs.enc);
+	return Qnil;
+    }
+    return rb_enc_from_encoding(io_read_encoding(fptr));
+}
+
+/*
+ *  call-seq:
+ *     io.internal_encoding   -> encoding
+ *
+ *  Returns the Encoding of the internal string if conversion is
+ *  specified.  Otherwise returns nil.
+ */
+
+static VALUE
+rb_io_internal_encoding(VALUE io)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(io, fptr);
+    if (!fptr->encs.enc2) return Qnil;
+    return rb_enc_from_encoding(io_read_encoding(fptr));
+}
+
+/*
+ *  call-seq:
+ *     io.set_encoding(ext_enc)                -> io
+ *     io.set_encoding("ext_enc:int_enc")      -> io
+ *     io.set_encoding(ext_enc, int_enc)       -> io
+ *     io.set_encoding("ext_enc:int_enc", opt) -> io
+ *     io.set_encoding(ext_enc, int_enc, opt)  -> io
+ *
+ *  If single argument is specified, read string from io is tagged
+ *  with the encoding specified.  If encoding is a colon separated two
+ *  encoding names "A:B", the read string is converted from encoding A
+ *  (external encoding) to encoding B (internal encoding), then tagged
+ *  with B.  If two arguments are specified, those must be encoding
+ *  objects or encoding names, and the first one is the external encoding, and the
+ *  second one is the internal encoding.
+ *  If the external encoding and the internal encoding is specified,
+ *  optional hash argument specify the conversion option.
+ */
+
+static VALUE
+rb_io_set_encoding(int argc, VALUE *argv, VALUE io)
+{
+    rb_io_t *fptr;
+    VALUE v1, v2, opt;
+
+    if (TYPE(io) != T_FILE) {
+        return rb_funcall2(io, id_set_encoding, argc, argv);
+    }
+
+    opt = pop_last_hash(&argc, argv);
+    rb_scan_args(argc, argv, "11", &v1, &v2);
+    GetOpenFile(io, fptr);
+    io_encoding_set(fptr, v1, v2, opt);
+    return io;
+}
+
+void
+rb_stdio_set_default_encoding(void)
+{
+    extern VALUE rb_stdin, rb_stdout, rb_stderr;
+    VALUE val = Qnil;
+
+    rb_io_set_encoding(1, &val, rb_stdin);
+    rb_io_set_encoding(1, &val, rb_stdout);
+    rb_io_set_encoding(1, &val, rb_stderr);
+}
+
+/*
+ *  call-seq:
+ *     ARGF.external_encoding   -> encoding
+ *
+ *  Returns the external encoding for files read from +ARGF+ as an +Encoding+
+ *  object. The external encoding is the encoding of the text as stored in a
+ *  file. Contrast with +ARGF.internal_encoding+, which is the encoding used
+ *  to represent this text within Ruby.
+ *
+ *  To set the external encoding use +ARGF.set_encoding+.
+ *
+ * For example:
+ *
+ *     ARGF.external_encoding  #=>  #<Encoding:UTF-8>
+ *
+ */
+static VALUE
+argf_external_encoding(VALUE argf)
+{
+    if (!RTEST(ARGF.current_file)) {
+	return rb_enc_from_encoding(rb_default_external_encoding());
+    }
+    return rb_io_external_encoding(rb_io_check_io(ARGF.current_file));
+}
+
+/*
+ *  call-seq:
+ *     ARGF.internal_encoding   -> encoding
+ *
+ *  Returns the internal encoding for strings read from +ARGF+ as an
+ *  +Encoding+ object.
+ *
+ *  If +ARGF.set_encoding+ has been called with two encoding names, the second
+ *  is returned. Otherwise, if +Encoding.default_external+ has been set, that
+ *  value is returned. Failing that, if a default external encoding was
+ *  specified on the command-line, that value is used. If the encoding is
+ *  unknown, nil is returned.
+ */
+static VALUE
+argf_internal_encoding(VALUE argf)
+{
+    if (!RTEST(ARGF.current_file)) {
+	return rb_enc_from_encoding(rb_default_external_encoding());
+    }
+    return rb_io_internal_encoding(rb_io_check_io(ARGF.current_file));
+}
+
+/*
+ *  call-seq:
+ *     ARGF.set_encoding(ext_enc)                -> ARGF
+ *     ARGF.set_encoding("ext_enc:int_enc")      -> ARGF
+ *     ARGF.set_encoding(ext_enc, int_enc)       -> ARGF
+ *     ARGF.set_encoding("ext_enc:int_enc", opt) -> ARGF
+ *     ARGF.set_encoding(ext_enc, int_enc, opt)  -> ARGF
+ *
+ *  If single argument is specified, strings read from ARGF are tagged with
+ *  the encoding specified.
+ *
+ *  If two encoding names separated by a colon are given, e.g. "ascii:utf-8",
+ *  the read string is converted from the first encoding (external encoding)
+ *  to the second encoding (internal encoding), then tagged with the second
+ *  encoding.
+ *
+ *  If two arguments are specified, they must be encoding objects or encoding
+ *  names. Again, the first specifies the external encoding; the second
+ *  specifies the internal encoding.
+ *
+ *  If the external encoding and the internal encoding are specified, the
+ *  optional +Hash+ argument can be used to adjust the conversion process. The
+ *  structure of this hash is explained in the +String#encode+ documentation.
+ *
+ *  For example:
+ *
+ *      ARGF.set_encoding('ascii')         # Tag the input as US-ASCII text
+ *      ARGF.set_encoding(Encoding::UTF_8) # Tag the input as UTF-8 text
+ *      ARGF.set_encoding('utf-8','ascii') # Transcode the input from US-ASCII
+ *                                         # to UTF-8.
+ */
+static VALUE
+argf_set_encoding(int argc, VALUE *argv, VALUE argf)
+{
+    rb_io_t *fptr;
+
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to set encoding");
+    }
+    rb_io_set_encoding(argc, argv, ARGF.current_file);
+    GetOpenFile(ARGF.current_file, fptr);
+    ARGF.encs = fptr->encs;
+    return argf;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.tell  -> Integer
+ *     ARGF.pos   -> Integer
+ *
+ *  Returns the current offset (in bytes) of the current file in +ARGF+.
+ *
+ *     ARGF.pos    #=> 0
+ *     ARGF.gets   #=> "This is line one\n"
+ *     ARGF.pos    #=> 17
+ *
+ */
+static VALUE
+argf_tell(VALUE argf)
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to tell");
     }
     ARGF_FORWARD(0, 0);
-    return rb_io_tell(current_file);
+    return rb_io_tell(ARGF.current_file);
 }
 
+/*
+ *  call-seq:
+ *     ARGF.seek(amount, whence=IO::SEEK_SET)  ->  0
+ *
+ *  Seeks to offset _amount_ (an +Integer+) in the +ARGF+ stream according to
+ *  the value of _whence_. See +IO#seek+ for further details.
+ */
 static VALUE
-argf_seek_m(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+argf_seek_m(int argc, VALUE *argv, VALUE argf)
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to seek");
     }
     ARGF_FORWARD(argc, argv);
-    return rb_io_seek_m(argc, argv, current_file);
+    return rb_io_seek_m(argc, argv, ARGF.current_file);
 }
 
+/*
+ *  call-seq:
+ *     ARGF.pos = position  -> Integer
+ *
+ *  Seeks to the position given by _position_ (in bytes) in +ARGF+.
+ *
+ *  For example:
+ *
+ *      ARGF.pos = 17
+ *      ARGF.gets   #=> "This is line two\n"
+ */
 static VALUE
-argf_set_pos(self, offset)
-     VALUE self, offset;
+argf_set_pos(VALUE argf, VALUE offset)
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to set position");
     }
     ARGF_FORWARD(1, &offset);
-    return rb_io_set_pos(current_file, offset);
+    return rb_io_set_pos(ARGF.current_file, offset);
 }
 
+/*
+ *  call-seq:
+ *     ARGF.rewind   -> 0
+ *
+ *  Positions the current file to the beginning of input, resetting
+ *  +ARGF.lineno+ to zero.
+ *
+ *     ARGF.readline   #=> "This is line one\n"
+ *     ARGF.rewind     #=> 0
+ *     ARGF.lineno     #=> 0
+ *     ARGF.readline   #=> "This is line one\n"
+ */
 static VALUE
-argf_rewind()
+argf_rewind(VALUE argf)
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to rewind");
     }
     ARGF_FORWARD(0, 0);
-    return rb_io_rewind(current_file);
+    return rb_io_rewind(ARGF.current_file);
 }
 
+/*
+ *  call-seq:
+ *     ARGF.fileno    -> fixnum
+ *     ARGF.to_i      -> fixnum
+ *
+ *  Returns an integer representing the numeric file descriptor for
+ *  the current file. Raises an +ArgumentError+ if there isn't a current file.
+ *
+ *     ARGF.fileno    #=> 3
+ */
 static VALUE
-argf_fileno()
+argf_fileno(VALUE argf)
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream");
     }
     ARGF_FORWARD(0, 0);
-    return rb_io_fileno(current_file);
+    return rb_io_fileno(ARGF.current_file);
 }
 
+/*
+ *  call-seq:
+ *     ARGF.to_io     -> IO
+ *
+ *  Returns an +IO+ object representing the current file. This will be a
+ *  +File+ object unless the current file is a stream such as STDIN.
+ *
+ *  For example:
+ *
+ *     ARGF.to_io    #=> #<File:glark.txt>
+ *     ARGF.to_io    #=> #<IO:<STDIN>>
+ */
 static VALUE
-argf_to_io()
+argf_to_io(VALUE argf)
 {
     next_argv();
     ARGF_FORWARD(0, 0);
-    return current_file;
+    return ARGF.current_file;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.eof?  -> true or false
+ *     ARGF.eof   -> true or false
+ *
+ *  Returns true if the current file in +ARGF+ is at end of file, i.e. it has
+ *  no data to read. The stream must be opened for reading or an +IOError+
+ *  will be raised.
+ *
+ *     $ echo "eof" | ruby argf.rb
+ *
+ *     ARGF.eof?                 #=> false
+ *     3.times { ARGF.readchar }
+ *     ARGF.eof?                 #=> false
+ *     ARGF.readchar             #=> "\n"
+ *     ARGF.eof?                 #=> true
+ */
+
 static VALUE
-argf_eof()
+argf_eof(VALUE argf)
 {
-    if (current_file) {
-	if (init_p == 0) return Qtrue;
+    next_argv();
+    if (RTEST(ARGF.current_file)) {
+	if (ARGF.init_p == 0) return Qtrue;
+	next_argv();
 	ARGF_FORWARD(0, 0);
-	if (rb_io_eof(current_file)) {
+	if (rb_io_eof(ARGF.current_file)) {
 	    return Qtrue;
 	}
     }
     return Qfalse;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.read([length [, buffer]])    -> string, buffer, or nil
+ *
+ *  Reads _length_ bytes from ARGF. The files named on the command line
+ *  are concatenated and treated as a single file by this method, so when
+ *  called without arguments the contents of this pseudo file are returned in
+ *  their entirety.
+ *
+ *  _length_ must be a non-negative integer or nil. If it is a positive
+ *  integer, +read+ tries to read at most _length_ bytes. It returns nil
+ *  if an EOF was encountered before anything could be read. Fewer than
+ *  _length_ bytes may be returned if an EOF is encountered during the read.
+ *
+ *  If _length_ is omitted or is _nil_, it reads until EOF. A String is
+ *  returned even if EOF is encountered before any data is read.
+ *
+ *  If _length_ is zero, it returns _""_.
+ *
+ *  If the optional _buffer_ argument is present, it must reference a String,
+ *  which will receive the data.
+ *
+ * For example:
+ *
+ *     $ echo "small" > small.txt
+ *     $ echo "large" > large.txt
+ *     $ ./glark.rb small.txt large.txt
+ *
+ *     ARGF.read      #=> "small\nlarge"
+ *     ARGF.read(200) #=> "small\nlarge"
+ *     ARGF.read(2)   #=> "sm"
+ *     ARGF.read(0)   #=> ""
+ *
+ *  Note that this method behaves like fread() function in C.  If you need the
+ *  behavior like read(2) system call, consider +ARGF.readpartial+.
+ */
+
 static VALUE
-argf_read(argc, argv)
-    int argc;
-    VALUE *argv;
+argf_read(int argc, VALUE *argv, VALUE argf)
 {
     VALUE tmp, str, length;
     long len = 0;
@@ -5456,24 +9041,24 @@ argf_read(argc, argv)
     if (!next_argv()) {
 	return str;
     }
-    if (TYPE(current_file) != T_FILE) {
-	tmp = argf_forward(argc, argv);
+    if (ARGF_GENERIC_INPUT_P()) {
+	tmp = argf_forward(argc, argv, argf);
     }
     else {
-	tmp = io_read(argc, argv, current_file);
+	tmp = io_read(argc, argv, ARGF.current_file);
     }
     if (NIL_P(str)) str = tmp;
     else if (!NIL_P(tmp)) rb_str_append(str, tmp);
     if (NIL_P(tmp) || NIL_P(length)) {
-	if (next_p != -1) {
-	    argf_close(current_file);
-	    next_p = 1;
+	if (ARGF.next_p != -1) {
+	    argf_close(ARGF.current_file);
+	    ARGF.next_p = 1;
 	    goto retry;
 	}
     }
     else if (argc >= 1) {
-	if (RSTRING(str)->len < len) {
-	    len -= RSTRING(str)->len;
+	if (RSTRING_LEN(str) < len) {
+	    len -= RSTRING_LEN(str);
 	    argv[0] = INT2NUM(len);
 	    goto retry;
 	}
@@ -5481,191 +9066,762 @@ argf_read(argc, argv)
     return str;
 }
 
+struct argf_call_arg {
+    int argc;
+    VALUE *argv;
+    VALUE argf;
+};
+
 static VALUE
-argf_getc()
+argf_forward_call(VALUE arg)
 {
-    VALUE byte;
+    struct argf_call_arg *p = (struct argf_call_arg *)arg;
+    argf_forward(p->argc, p->argv, p->argf);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.readpartial(maxlen)              -> string
+ *     ARGF.readpartial(maxlen, outbuf)      -> outbuf
+ *
+ *  Reads at most _maxlen_ bytes from the ARGF stream. It blocks only if
+ *  +ARGF+ has no data immediately available. If the optional _outbuf_
+ *  argument is present, it must reference a String, which will receive the
+ *  data. It raises <code>EOFError</code> on end of file.
+ *
+ *  +readpartial+ is designed for streams such as pipes, sockets, and ttys. It
+ *  blocks only when no data is immediately available. This means that it
+ *  blocks only when following all conditions hold:
+ *
+ *  * The byte buffer in the +IO+ object is empty.
+ *  * The content of the stream is empty.
+ *  * The stream has not reached EOF.
+ *
+ *  When +readpartial+ blocks, it waits for data or EOF. If some data is read,
+ *  +readpartial+ returns with the data. If EOF is reached, readpartial raises
+ *  an +EOFError+.
+ *
+ *  When +readpartial+ doesn't block, it returns or raises immediately.  If
+ *  the byte buffer is not empty, it returns the data in the buffer. Otherwise, if
+ *  the stream has some content, it returns the data in the stream. If the
+ *  stream reaches EOF an +EOFError+ is raised.
+ */
+
+static VALUE
+argf_readpartial(int argc, VALUE *argv, VALUE argf)
+{
+    VALUE tmp, str, length;
+
+    rb_scan_args(argc, argv, "11", &length, &str);
+    if (!NIL_P(str)) {
+        StringValue(str);
+        argv[1] = str;
+    }
+
+    if (!next_argv()) {
+        rb_str_resize(str, 0);
+        rb_eof_error();
+    }
+    if (ARGF_GENERIC_INPUT_P()) {
+	struct argf_call_arg arg;
+	arg.argc = argc;
+	arg.argv = argv;
+	arg.argf = argf;
+	tmp = rb_rescue2(argf_forward_call, (VALUE)&arg,
+			 RUBY_METHOD_FUNC(0), Qnil, rb_eEOFError, (VALUE)0);
+    }
+    else {
+        tmp = io_getpartial(argc, argv, ARGF.current_file, 0);
+    }
+    if (NIL_P(tmp)) {
+        if (ARGF.next_p == -1) {
+            rb_eof_error();
+        }
+        argf_close(ARGF.current_file);
+        ARGF.next_p = 1;
+        if (RARRAY_LEN(ARGF.argv) == 0)
+            rb_eof_error();
+        if (NIL_P(str))
+            str = rb_str_new(NULL, 0);
+        return str;
+    }
+    return tmp;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.getc  -> String or nil
+ *
+ *  Reads the next character from +ARGF+ and returns it as a +String+. Returns
+ *  +nil+ at the end of the stream.
+ *
+ *  +ARGF+ treats the files named on the command line as a single file created
+ *  by concatenating their contents. After returning the last character of the
+ *  first file, it returns the first character of the second file, and so on.
+ *
+ *  For example:
+ *
+ *     $ echo "foo" > file
+ *     $ ruby argf.rb file
+ *
+ *     ARGF.getc  #=> "f"
+ *     ARGF.getc  #=> "o"
+ *     ARGF.getc  #=> "o"
+ *     ARGF.getc  #=> "\n"
+ *     ARGF.getc  #=> nil
+ *     ARGF.getc  #=> nil
+ */
+static VALUE
+argf_getc(VALUE argf)
+{
+    VALUE ch;
 
   retry:
     if (!next_argv()) return Qnil;
-    if (TYPE(current_file) != T_FILE) {
-	byte = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
+    if (ARGF_GENERIC_INPUT_P()) {
+	ch = rb_funcall3(ARGF.current_file, rb_intern("getc"), 0, 0);
     }
     else {
-	byte = rb_io_getc(current_file);
+	ch = rb_io_getc(ARGF.current_file);
     }
-    if (NIL_P(byte) && next_p != -1) {
-	argf_close(current_file);
-	next_p = 1;
+    if (NIL_P(ch) && ARGF.next_p != -1) {
+	argf_close(ARGF.current_file);
+	ARGF.next_p = 1;
 	goto retry;
     }
 
-    return byte;
+    return ch;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.getbyte  -> Fixnum or nil
+ *
+ *  Gets the next 8-bit byte (0..255) from +ARGF+. Returns +nil+ if called at
+ *  the end of the stream.
+ *
+ *  For example:
+ *
+ *     $ echo "foo" > file
+ *     $ ruby argf.rb file
+ *
+ *     ARGF.getbyte #=> 102
+ *     ARGF.getbyte #=> 111
+ *     ARGF.getbyte #=> 111
+ *     ARGF.getbyte #=> 10
+ *     ARGF.getbyte #=> nil
+ */
+static VALUE
+argf_getbyte(VALUE argf)
+{
+    VALUE ch;
+
+  retry:
+    if (!next_argv()) return Qnil;
+    if (TYPE(ARGF.current_file) != T_FILE) {
+	ch = rb_funcall3(ARGF.current_file, rb_intern("getbyte"), 0, 0);
+    }
+    else {
+	ch = rb_io_getbyte(ARGF.current_file);
+    }
+    if (NIL_P(ch) && ARGF.next_p != -1) {
+	argf_close(ARGF.current_file);
+	ARGF.next_p = 1;
+	goto retry;
+    }
+
+    return ch;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.readchar  -> String or nil
+ *
+ *  Reads the next character from +ARGF+ and returns it as a +String+. Raises
+ *  an +EOFError+ after the last character of the last file has been read.
+ *
+ *  For example:
+ *
+ *     $ echo "foo" > file
+ *     $ ruby argf.rb file
+ *
+ *     ARGF.readchar  #=> "f"
+ *     ARGF.readchar  #=> "o"
+ *     ARGF.readchar  #=> "o"
+ *     ARGF.readchar  #=> "\n"
+ *     ARGF.readchar  #=> end of file reached (EOFError)
+ */
+static VALUE
+argf_readchar(VALUE argf)
+{
+    VALUE ch;
+
+  retry:
+    if (!next_argv()) rb_eof_error();
+    if (TYPE(ARGF.current_file) != T_FILE) {
+	ch = rb_funcall3(ARGF.current_file, rb_intern("getc"), 0, 0);
+    }
+    else {
+	ch = rb_io_getc(ARGF.current_file);
+    }
+    if (NIL_P(ch) && ARGF.next_p != -1) {
+	argf_close(ARGF.current_file);
+	ARGF.next_p = 1;
+	goto retry;
+    }
+
+    return ch;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.readbyte  -> Fixnum
+ *
+ *  Reads the next 8-bit byte from ARGF and returns it as a +Fixnum+. Raises
+ *  an +EOFError+ after the last byte of the last file has been read.
+ *
+ *  For example:
+ *
+ *     $ echo "foo" > file
+ *     $ ruby argf.rb file
+ *
+ *     ARGF.readbyte  #=> 102
+ *     ARGF.readbyte  #=> 111
+ *     ARGF.readbyte  #=> 111
+ *     ARGF.readbyte  #=> 10
+ *     ARGF.readbyte  #=> end of file reached (EOFError)
+ */
 static VALUE
-argf_readchar()
+argf_readbyte(VALUE argf)
 {
     VALUE c;
 
     NEXT_ARGF_FORWARD(0, 0);
-    c = argf_getc();
+    c = argf_getbyte(argf);
     if (NIL_P(c)) {
 	rb_eof_error();
     }
     return c;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.each(sep=$/)            {|line| block }  -> ARGF
+ *     ARGF.each(sep=$/,limit)      {|line| block }  -> ARGF
+ *     ARGF.each(...)                                -> an_enumerator
+ *
+ *     ARGF.each_line(sep=$/)       {|line| block }  -> ARGF
+ *     ARGF.each_line(sep=$/,limit) {|line| block }  -> ARGF
+ *     ARGF.each_line(...)                           -> an_enumerator
+ *
+ *     ARGF.lines(sep=$/)           {|line| block }   -> ARGF
+ *     ARGF.lines(sep=$/,limit)     {|line| block }   -> ARGF
+ *     ARGF.lines(...)                                -> an_enumerator
+ *
+ *  Returns an enumerator which iterates over each line (separated by _sep_,
+ *  which defaults to your platform's newline character) of each file in
+ *  +ARGV+. If a block is supplied, each line in turn will be yielded to the
+ *  block, otherwise an enumerator is returned.
+ *  The optional _limit_ argument is a +Fixnum+ specifying the maximum
+ *  length of each line; longer lines will be split according to this limit.
+ *
+ *  This method allows you to treat the files supplied on the command line as
+ *  a single file consisting of the concatenation of each named file. After
+ *  the last line of the first file has been returned, the first line of the
+ *  second file is returned. The +ARGF.filename+ and +ARGF.lineno+ methods can
+ *  be used to determine the filename and line number, respectively, of the
+ *  current line.
+ *
+ *  For example, the following code prints out each line of each named file
+ *  prefixed with its line number, displaying the filename once per file:
+ *
+ *     ARGF.lines do |line|
+ *       puts ARGF.filename if ARGF.lineno == 1
+ *       puts "#{ARGF.lineno}: #{line}"
+ *     end
+ */
 static VALUE
-argf_each_line(argc, argv)
-    int argc;
-    VALUE *argv;
+argf_each_line(int argc, VALUE *argv, VALUE argf)
 {
-    VALUE str;
-
-    if (!next_argv()) return Qnil;
-    if (TYPE(current_file) != T_FILE) {
-	for (;;) {
-	    if (!next_argv()) return argf;
-	    rb_iterate(rb_each, current_file, rb_yield, 0);
-	    next_p = 1;
-	}
-    }
-    while (!NIL_P(str = argf_getline(argc, argv))) {
-	rb_yield(str);
+    RETURN_ENUMERATOR(argf, argc, argv);
+    for (;;) {
+	if (!next_argv()) return argf;
+	rb_block_call(ARGF.current_file, rb_intern("each_line"), argc, argv, 0, 0);
+	ARGF.next_p = 1;
     }
-    return argf;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.bytes     {|byte| block }  -> ARGF
+ *     ARGF.bytes                      -> an_enumerator
+ *
+ *     ARGF.each_byte {|byte| block }  -> ARGF
+ *     ARGF.each_byte                  -> an_enumerator
+ *
+ *  Iterates over each byte of each file in +ARGV+.
+ *  A byte is returned as a +Fixnum+ in the range 0..255.
+ *
+ *  This method allows you to treat the files supplied on the command line as
+ *  a single file consisting of the concatenation of each named file. After
+ *  the last byte of the first file has been returned, the first byte of the
+ *  second file is returned. The +ARGF.filename+ method can be used to
+ *  determine the filename of the current byte.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ * For example:
+ *
+ *     ARGF.bytes.to_a  #=> [35, 32, ... 95, 10]
+ *
+ */
 static VALUE
-argf_each_byte()
+argf_each_byte(VALUE argf)
 {
-    VALUE byte;
+    RETURN_ENUMERATOR(argf, 0, 0);
+    for (;;) {
+	if (!next_argv()) return argf;
+	rb_block_call(ARGF.current_file, rb_intern("each_byte"), 0, 0, 0, 0);
+	ARGF.next_p = 1;
+    }
+}
 
-    while (!NIL_P(byte = argf_getc())) {
-	rb_yield(byte);
+/*
+ *  call-seq:
+ *     ARGF.chars      {|char| block }  -> ARGF
+ *     ARGF.chars                       -> an_enumerator
+ *
+ *     ARGF.each_char  {|char| block }  -> ARGF
+ *     ARGF.each_char                   -> an_enumerator
+ *
+ *  Iterates over each character of each file in +ARGF+.
+ *
+ *  This method allows you to treat the files supplied on the command line as
+ *  a single file consisting of the concatenation of each named file. After
+ *  the last character of the first file has been returned, the first
+ *  character of the second file is returned. The +ARGF.filename+ method can
+ *  be used to determine the name of the file in which the current character
+ *  appears.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ */
+static VALUE
+argf_each_char(VALUE argf)
+{
+    RETURN_ENUMERATOR(argf, 0, 0);
+    for (;;) {
+	if (!next_argv()) return argf;
+	rb_block_call(ARGF.current_file, rb_intern("each_char"), 0, 0, 0, 0);
+	ARGF.next_p = 1;
     }
-    return argf;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.filename  -> String
+ *     ARGF.path      -> String
+ *
+ *  Returns the current filename. "-" is returned when the current file is
+ *  STDIN.
+ *
+ *  For example:
+ *
+ *     $ echo "foo" > foo
+ *     $ echo "bar" > bar
+ *     $ echo "glark" > glark
+ *
+ *     $ ruby argf.rb foo bar glark
+ *
+ *     ARGF.filename  #=> "foo"
+ *     ARGF.read(5)   #=> "foo\nb"
+ *     ARGF.filename  #=> "bar"
+ *     ARGF.skip
+ *     ARGF.filename  #=> "glark"
+ */
 static VALUE
-argf_filename()
+argf_filename(VALUE argf)
 {
     next_argv();
-    return filename;
+    return ARGF.filename;
 }
 
 static VALUE
-argf_file()
+argf_filename_getter(ID id, VALUE *var)
+{
+    return argf_filename(*var);
+}
+
+/*
+ *  call-seq:
+ *     ARGF.file  -> IO or File object
+ *
+ *  Returns the current file as an +IO+ or +File+ object. #<IO:<STDIN>> is
+ *  returned when the current file is STDIN.
+ *
+ *  For example:
+ *
+ *     $ echo "foo" > foo
+ *     $ echo "bar" > bar
+ *
+ *     $ ruby argf.rb foo bar
+ *
+ *     ARGF.file      #=> #<File:foo>
+ *     ARGF.read(5)   #=> "foo\nb"
+ *     ARGF.file      #=> #<File:bar>
+ */
+static VALUE
+argf_file(VALUE argf)
 {
     next_argv();
-    return current_file;
+    return ARGF.current_file;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.binmode  -> ARGF
+ *
+ *  Puts +ARGF+ into binary mode. Once a stream is in binary mode, it cannot
+ *  be reset to non-binary mode. This option has the following effects:
+ *
+ *  *  Newline conversion is disabled.
+ *  *  Encoding conversion is disabled.
+ *  *  Content is treated as ASCII-8BIT.
+ */
 static VALUE
-argf_binmode()
+argf_binmode_m(VALUE argf)
 {
-    binmode = 1;
+    ARGF.binmode = 1;
     next_argv();
     ARGF_FORWARD(0, 0);
-    rb_io_binmode(current_file);
+    rb_io_ascii8bit_binmode(ARGF.current_file);
     return argf;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.binmode?  -> true or false
+ *
+ *  Returns true if +ARGF+ is being read in binary mode; false otherwise. (To
+ *  enable binary mode use +ARGF.binmode+.
+ *
+ * For example:
+ *
+ *     ARGF.binmode?  #=> false
+ *     ARGF.binmode
+ *     ARGF.binmode?  #=> true
+ */
 static VALUE
-argf_skip()
+argf_binmode_p(VALUE argf)
 {
-    if (next_p != -1) {
-	argf_close(current_file);
-	next_p = 1;
+    return ARGF.binmode ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     ARGF.skip  -> ARGF
+ *
+ *  Sets the current file to the next file in ARGV. If there aren't any more
+ *  files it has no effect.
+ *
+ * For example:
+ *
+ *     $ ruby argf.rb foo bar
+ *     ARGF.filename  #=> "foo"
+ *     ARGF.skip
+ *     ARGF.filename  #=> "bar"
+ */
+static VALUE
+argf_skip(VALUE argf)
+{
+    if (ARGF.init_p && ARGF.next_p == 0) {
+	argf_close(ARGF.current_file);
+	ARGF.next_p = 1;
     }
     return argf;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.close  -> ARGF
+ *
+ *  Closes the current file and skips to the next in the stream. Trying to
+ *  close a file that has already been closed causes an +IOError+ to be
+ *  raised.
+ *
+ * For example:
+ *
+ *     $ ruby argf.rb foo bar
+ *
+ *     ARGF.filename  #=> "foo"
+ *     ARGF.close
+ *     ARGF.filename  #=> "bar"
+ *     ARGF.close
+ *     ARGF.close     #=> closed stream (IOError)
+ */
 static VALUE
-argf_close_m()
+argf_close_m(VALUE argf)
 {
     next_argv();
-    argf_close(current_file);
-    if (next_p != -1) {
-	next_p = 1;
+    argf_close(ARGF.current_file);
+    if (ARGF.next_p != -1) {
+	ARGF.next_p = 1;
     }
-    gets_lineno = 0;
+    ARGF.lineno = 0;
     return argf;
 }
 
+/*
+ *  call-seq:
+ *     ARGF.closed?  -> true or false
+ *
+ *  Returns _true_ if the current file has been closed; _false_ otherwise. Use
+ *  +ARGF.close+ to actually close the current file.
+ */
 static VALUE
-argf_closed()
+argf_closed(VALUE argf)
 {
     next_argv();
     ARGF_FORWARD(0, 0);
-    return rb_io_closed(current_file);
+    return rb_io_closed(ARGF.current_file);
 }
 
+/*
+ *  call-seq:
+ *     ARGF.to_s  -> String
+ *
+ *  Returns "ARGF".
+ */
 static VALUE
-argf_to_s()
+argf_to_s(VALUE argf)
 {
     return rb_str_new2("ARGF");
 }
 
+/*
+ *  call-seq:
+ *     ARGF.inplace_mode  -> String
+ *
+ *  Returns the file extension appended to the names of modified files under
+ *  inplace-edit mode. This value can be set using +ARGF.inplace_mode=+ or
+ *  passing the +-i+ switch to the Ruby binary.
+ */
 static VALUE
-opt_i_get()
+argf_inplace_mode_get(VALUE argf)
 {
-    if (!ruby_inplace_mode) return Qnil;
-    return rb_str_new2(ruby_inplace_mode);
+    if (!ARGF.inplace) return Qnil;
+    return rb_str_new2(ARGF.inplace);
 }
 
-static void
-opt_i_set(val)
-    VALUE val;
+static VALUE
+opt_i_get(ID id, VALUE *var)
+{
+    return argf_inplace_mode_get(*var);
+}
+
+/*
+ *  call-seq:
+ *     ARGF.inplace_mode = ext  -> ARGF
+ *
+ *  Sets the filename extension for inplace editing mode to the given String.
+ *  Each file being edited has this value appended to its filename. The
+ *  modified file is saved under this new name.
+ *
+ *  For example:
+ *
+ *      $ ruby argf.rb file.txt
+ *
+ *      ARGF.inplace_mode = '.bak'
+ *      ARGF.lines do |line|
+ *        print line.sub("foo","bar")
+ *      end
+ *
+ * Each line of _file.txt_ has the first occurrence of "foo" replaced with
+ * "bar", then the new line is written out to _file.txt.bak_.
+ */
+static VALUE
+argf_inplace_mode_set(VALUE argf, VALUE val)
 {
+    if (rb_safe_level() >= 1 && OBJ_TAINTED(val))
+	rb_insecure_operation();
+
     if (!RTEST(val)) {
-	if (ruby_inplace_mode) free(ruby_inplace_mode);
-	ruby_inplace_mode = 0;
-	return;
+	if (ARGF.inplace) free(ARGF.inplace);
+	ARGF.inplace = 0;
+    }
+    else {
+	StringValue(val);
+	if (ARGF.inplace) free(ARGF.inplace);
+	ARGF.inplace = 0;
+	ARGF.inplace = strdup(RSTRING_PTR(val));
     }
-    StringValue(val);
-    if (ruby_inplace_mode) free(ruby_inplace_mode);
-    ruby_inplace_mode = 0;
-    ruby_inplace_mode = strdup(StringValueCStr(val));
+    return argf;
 }
 
+static void
+opt_i_set(VALUE val, ID id, VALUE *var)
+{
+    argf_inplace_mode_set(*var, val);
+}
+
+const char *
+ruby_get_inplace_mode(void)
+{
+    return ARGF.inplace;
+}
+
+void
+ruby_set_inplace_mode(const char *suffix)
+{
+    if (ARGF.inplace) free(ARGF.inplace);
+    ARGF.inplace = 0;
+    if (suffix) ARGF.inplace = strdup(suffix);
+}
+
+/*
+ *  call-seq:
+ *     ARGF.argv  -> ARGV
+ *
+ *  Returns the +ARGV+ array, which contains the arguments passed to your
+ *  script, one per element.
+ *
+ *  For example:
+ *
+ *      $ ruby argf.rb -v glark.txt
+ *
+ *      ARGF.argv   #=> ["-v", "glark.txt"]
+ *
+ */
+static VALUE
+argf_argv(VALUE argf)
+{
+    return ARGF.argv;
+}
+
+static VALUE
+argf_argv_getter(ID id, VALUE *var)
+{
+    return argf_argv(*var);
+}
+
+VALUE
+rb_get_argv(void)
+{
+    return ARGF.argv;
+}
+
+/*
+ * Document-class: IOError
+ *
+ * Raised when an IO operation fails.
+ *
+ *    File.open("/etc/hosts") {|f| f << "example"}
+ *      #=> IOError: not opened for writing
+ *
+ *    File.open("/etc/hosts") {|f| f.close; f.read }
+ *      #=> IOError: closed stream
+ *
+ * Note that some IO failures raise +SystemCallError+s and these are not
+ * subclasses of IOError:
+ *
+ *    File.open("does/not/exist")
+ *      #=> Errno::ENOENT: No such file or directory - does/not/exist
+ */
+
+/*
+* Document-class: EOFError
+*
+ * Raised by some IO operations when reaching the end of file. Many IO
+ * methods exist in two forms,
+ *
+ * one that returns +nil+ when the end of file is reached, the other
+ * raises EOFError +EOFError+.
+ *
+ * +EOFError+ is a subclass of +IOError+.
+ *
+ *    file = File.open("/etc/hosts")
+ *    file.read
+ *    file.gets     #=> nil
+ *    file.readline #=> EOFError: end of file reached
+ */
+
+/*
+ * Document-class:  ARGF
+ *
+ * +ARGF+ is a stream designed for use in scripts that process files given as
+ * command-line arguments, or passed in via STDIN.
+ *
+ * The arguments passed to your script are stored in the +ARGV+ Array, one
+ * argument per element. +ARGF+ assumes that any arguments that aren't
+ * filenames have been removed from +ARGV+. For example:
+ *
+ *     $ ruby argf.rb --verbose file1 file2
+ *
+ *     ARGV  #=> ["--verbose", "file1", "file2"]
+ *     option = ARGV.shift #=> "--verbose"
+ *     ARGV  #=> ["file1", "file2"]
+ *
+ * You can now use +ARGF+ to work with a concatenation of each of these named
+ * files. For instance, +ARGF.read+ will return the contents of _file1_
+ * followed by the contents of _file2_.
+ *
+ * After a file in +ARGV+ has been read, +ARGF+ removes it from the Array.
+ * Thus, after all files have been read +ARGV+ will be empty.
+ *
+ * You can manipulate +ARGV+ yourself to control what +ARGF+ operates on. If
+ * you remove a file from +ARGV+, it is ignored by +ARGF+; if you add files to
+ * +ARGV+, they are treated as if they were named on the command line. For
+ * example:
+ *
+ *     ARGV.replace ["file1"]
+ *     ARGF.readlines # Returns the contents of file1 as an Array
+ *     ARGV           #=> []
+ *     ARGV.replace ["file2", "file3"]
+ *     ARGF.read      # Returns the contents of file2 and file3
+ *
+ * If +ARGV+ is empty, +ARGF+ acts as if it contained STDIN, i.e. the data
+ * piped to your script. For example:
+ *
+ *     $ echo "glark" | ruby -e 'p ARGF.read'
+ *     "glark\n"
+ */
+
 /*
  *  Class <code>IO</code> is the basis for all input and output in Ruby.
  *  An I/O stream may be <em>duplexed</em> (that is, bidirectional), and
  *  so may use more than one native operating system stream.
- *     
+ *
  *  Many of the examples in this section use class <code>File</code>,
  *  the only standard subclass of <code>IO</code>. The two classes are
  *  closely associated.
- *     
+ *
  *  As used in this section, <em>portname</em> may take any of the
  *  following forms.
- *     
+ *
  *  * A plain string represents a filename suitable for the underlying
  *    operating system.
- *     
+ *
  *  * A string starting with ``<code>|</code>'' indicates a subprocess.
  *    The remainder of the string following the ``<code>|</code>'' is
  *    invoked as a process with appropriate input/output channels
  *    connected to it.
- *     
+ *
  *  * A string equal to ``<code>|-</code>'' will create another Ruby
  *    instance as a subprocess.
- *     
+ *
  *  Ruby will convert pathnames between different operating system
  *  conventions if possible. For instance, on a Windows system the
  *  filename ``<code>/gumby/ruby/test.rb</code>'' will be opened as
  *  ``<code>\gumby\ruby\test.rb</code>''. When specifying a
  *  Windows-style filename in a Ruby string, remember to escape the
  *  backslashes:
- *     
+ *
  *     "c:\\gumby\\ruby\\test.rb"
- *     
+ *
  *  Our examples here will use the Unix-style forward slashes;
  *  <code>File::SEPARATOR</code> can be used to get the
  *  platform-specific separator character.
- *     
+ *
  *  I/O ports may be opened in any one of several different modes, which
  *  are shown in this section as <em>mode</em>. The mode may
  *  either be a Fixnum or a String. If numeric, it should be
@@ -5682,7 +9838,7 @@ opt_i_set(val)
  *    -----+--------------------------------------------------------
  *    "r+" |  Read-write, starts at beginning of file.
  *    -----+--------------------------------------------------------
- *    "w"  |  Write-only, truncates existing file 
+ *    "w"  |  Write-only, truncates existing file
  *         |  to zero length or creates a new file for writing.
  *    -----+--------------------------------------------------------
  *    "w+" |  Read-write, truncates existing file to zero length
@@ -5692,11 +9848,17 @@ opt_i_set(val)
  *         |  otherwise creates a new file for writing.
  *    -----+--------------------------------------------------------
  *    "a+" |  Read-write, starts at end of file if file exists,
- *         |  otherwise creates a new file for reading and 
+ *         |  otherwise creates a new file for reading and
  *         |  writing.
  *    -----+--------------------------------------------------------
- *     "b" |  (DOS/Windows only) Binary file mode (may appear with 
+ *     "b" |  Binary file mode (may appear with
  *         |  any of the key letters listed above).
+ *         |  Suppresses EOL <-> CRLF conversion on Windows. And
+ *         |  sets external encoding to ASCII-8BIT unless explicitly
+ *         |  specified.
+ *    -----+--------------------------------------------------------
+ *     "t" |  Text file mode (may appear with
+ *         |  any of the key letters listed above except "b").
  *
  *
  *  The global constant ARGF (also accessible as $<) provides an
@@ -5707,9 +9869,13 @@ opt_i_set(val)
  */
 
 void
-Init_IO()
+Init_IO(void)
 {
-#ifdef __CYGWIN__ 
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
+    VALUE rb_cARGF;
+#ifdef __CYGWIN__
 #include <sys/cygwin.h>
     static struct __cygwin_perfile pf[] =
     {
@@ -5728,6 +9894,9 @@ Init_IO()
     id_write = rb_intern("write");
     id_read = rb_intern("read");
     id_getc = rb_intern("getc");
+    id_flush = rb_intern("flush");
+    id_readpartial = rb_intern("readpartial");
+    id_set_encoding = rb_intern("set_encoding");
 
     rb_define_global_function("syscall", rb_f_syscall, -1);
 
@@ -5738,7 +9907,6 @@ Init_IO()
     rb_define_global_function("puts", rb_f_puts, -1);
     rb_define_global_function("gets", rb_f_gets, -1);
     rb_define_global_function("readline", rb_f_readline, -1);
-    rb_define_global_function("getc", rb_f_getc, 0);
     rb_define_global_function("select", rb_f_select, -1);
 
     rb_define_global_function("readlines", rb_f_readlines, -1);
@@ -5751,6 +9919,14 @@ Init_IO()
     rb_cIO = rb_define_class("IO", rb_cObject);
     rb_include_module(rb_cIO, rb_mEnumerable);
 
+    rb_mWaitReadable = rb_define_module_under(rb_cIO, "WaitReadable");
+    rb_mWaitWritable = rb_define_module_under(rb_cIO, "WaitWritable");
+
+#if 0
+    /* This is necessary only for forcing rdoc handle File::open */
+    rb_define_singleton_method(rb_cFile, "open",  rb_io_s_open, -1);
+#endif
+
     rb_define_alloc_func(rb_cIO, io_alloc);
     rb_define_singleton_method(rb_cIO, "new", rb_io_s_new, -1);
     rb_define_singleton_method(rb_cIO, "open",  rb_io_s_open, -1);
@@ -5760,23 +9936,25 @@ Init_IO()
     rb_define_singleton_method(rb_cIO, "foreach", rb_io_s_foreach, -1);
     rb_define_singleton_method(rb_cIO, "readlines", rb_io_s_readlines, -1);
     rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
+    rb_define_singleton_method(rb_cIO, "binread", rb_io_s_binread, -1);
     rb_define_singleton_method(rb_cIO, "select", rb_f_select, -1);
-    rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, 0);
+    rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, -1);
+    rb_define_singleton_method(rb_cIO, "try_convert", rb_io_s_try_convert, 1);
+    rb_define_singleton_method(rb_cIO, "copy_stream", rb_io_s_copy_stream, -1);
 
     rb_define_method(rb_cIO, "initialize", rb_io_initialize, -1);
 
     rb_output_fs = Qnil;
     rb_define_hooked_variable("$,", &rb_output_fs, 0, rb_str_setter);
 
-    rb_global_variable(&rb_default_rs);
-    rb_rs = rb_default_rs = rb_str_new2("\n");
+    rb_rs = rb_default_rs = rb_usascii_str_new2("\n");
+    rb_gc_register_mark_object(rb_default_rs);
     rb_output_rs = Qnil;
     OBJ_FREEZE(rb_default_rs);	/* avoid modifying RS_default */
     rb_define_hooked_variable("$/", &rb_rs, 0, rb_str_setter);
     rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter);
     rb_define_hooked_variable("$\\", &rb_output_rs, 0, rb_str_setter);
 
-    rb_define_hooked_variable("$.", &lineno, 0, lineno_setter);
     rb_define_virtual_variable("$_", rb_lastline_get, rb_lastline_set);
 
     rb_define_method(rb_cIO, "initialize_copy", rb_io_init_copy, 1);
@@ -5790,6 +9968,12 @@ Init_IO()
     rb_define_method(rb_cIO, "each",  rb_io_each_line, -1);
     rb_define_method(rb_cIO, "each_line",  rb_io_each_line, -1);
     rb_define_method(rb_cIO, "each_byte",  rb_io_each_byte, 0);
+    rb_define_method(rb_cIO, "each_char",  rb_io_each_char, 0);
+    rb_define_method(rb_cIO, "each_codepoint",  rb_io_each_codepoint, 0);
+    rb_define_method(rb_cIO, "lines",  rb_io_each_line, -1);
+    rb_define_method(rb_cIO, "bytes",  rb_io_each_byte, 0);
+    rb_define_method(rb_cIO, "chars",  rb_io_each_char, 0);
+    rb_define_method(rb_cIO, "codepoints",  rb_io_each_codepoint, 0);
 
     rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
     rb_define_method(rb_cIO, "sysread",  rb_io_sysread, -1);
@@ -5799,6 +9983,7 @@ Init_IO()
     rb_define_method(rb_cIO, "to_io", rb_io_to_io, 0);
 
     rb_define_method(rb_cIO, "fsync",   rb_io_fsync, 0);
+    rb_define_method(rb_cIO, "fdatasync",   rb_io_fdatasync, 0);
     rb_define_method(rb_cIO, "sync",   rb_io_sync, 0);
     rb_define_method(rb_cIO, "sync=",  rb_io_set_sync, 1);
 
@@ -5811,11 +9996,14 @@ Init_IO()
     rb_define_method(rb_cIO, "write_nonblock", rb_io_write_nonblock, 1);
     rb_define_method(rb_cIO, "readpartial",  io_readpartial, -1);
     rb_define_method(rb_cIO, "read",  io_read, -1);
-    rb_define_method(rb_cIO, "write", io_write, 1);
+    rb_define_method(rb_cIO, "write", io_write_m, 1);
     rb_define_method(rb_cIO, "gets",  rb_io_gets_m, -1);
     rb_define_method(rb_cIO, "readline",  rb_io_readline, -1);
     rb_define_method(rb_cIO, "getc",  rb_io_getc, 0);
+    rb_define_method(rb_cIO, "getbyte",  rb_io_getbyte, 0);
     rb_define_method(rb_cIO, "readchar",  rb_io_readchar, 0);
+    rb_define_method(rb_cIO, "readbyte",  rb_io_readbyte, 0);
+    rb_define_method(rb_cIO, "ungetbyte",rb_io_ungetbyte, 1);
     rb_define_method(rb_cIO, "ungetc",rb_io_ungetc, 1);
     rb_define_method(rb_cIO, "<<",    rb_io_addstr, 1);
     rb_define_method(rb_cIO, "flush", rb_io_flush, 0);
@@ -5830,6 +10018,9 @@ Init_IO()
     rb_define_method(rb_cIO, "eof", rb_io_eof, 0);
     rb_define_method(rb_cIO, "eof?", rb_io_eof, 0);
 
+    rb_define_method(rb_cIO, "close_on_exec?", rb_io_close_on_exec_p, 0);
+    rb_define_method(rb_cIO, "close_on_exec=", rb_io_set_close_on_exec, 1);
+
     rb_define_method(rb_cIO, "close", rb_io_close_m, 0);
     rb_define_method(rb_cIO, "closed?", rb_io_closed, 0);
     rb_define_method(rb_cIO, "close_read", rb_io_close_read, 0);
@@ -5837,7 +10028,8 @@ Init_IO()
 
     rb_define_method(rb_cIO, "isatty", rb_io_isatty, 0);
     rb_define_method(rb_cIO, "tty?", rb_io_isatty, 0);
-    rb_define_method(rb_cIO, "binmode",  rb_io_binmode, 0);
+    rb_define_method(rb_cIO, "binmode",  rb_io_binmode_m, 0);
+    rb_define_method(rb_cIO, "binmode?", rb_io_binmode_p, 0);
     rb_define_method(rb_cIO, "sysseek", rb_io_sysseek, -1);
 
     rb_define_method(rb_cIO, "ioctl", rb_io_ioctl, -1);
@@ -5845,72 +10037,104 @@ Init_IO()
     rb_define_method(rb_cIO, "pid", rb_io_pid, 0);
     rb_define_method(rb_cIO, "inspect",  rb_io_inspect, 0);
 
+    rb_define_method(rb_cIO, "external_encoding", rb_io_external_encoding, 0);
+    rb_define_method(rb_cIO, "internal_encoding", rb_io_internal_encoding, 0);
+    rb_define_method(rb_cIO, "set_encoding", rb_io_set_encoding, -1);
+
+    rb_define_method(rb_cIO, "autoclose?", rb_io_autoclose_p, 0);
+    rb_define_method(rb_cIO, "autoclose=", rb_io_set_autoclose, 1);
+
     rb_define_variable("$stdin", &rb_stdin);
-    rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO);
+    rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO, "<STDIN>");
     rb_define_hooked_variable("$stdout", &rb_stdout, 0, stdout_setter);
-    rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO);
+    rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO, "<STDOUT>");
     rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
-    rb_stderr = prep_stdio(stderr, FMODE_WRITABLE, rb_cIO);
+    rb_stderr = prep_stdio(stderr, FMODE_WRITABLE|FMODE_SYNC, rb_cIO, "<STDERR>");
     rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
     orig_stdout = rb_stdout;
     rb_deferr = orig_stderr = rb_stderr;
 
-    /* variables to be removed in 1.8.1 */
-    rb_define_hooked_variable("$defout", &rb_stdout, 0, defout_setter);
-    rb_define_hooked_variable("$deferr", &rb_stderr, 0, deferr_setter);
-
     /* constants to hold original stdin/stdout/stderr */
     rb_define_global_const("STDIN", rb_stdin);
     rb_define_global_const("STDOUT", rb_stdout);
     rb_define_global_const("STDERR", rb_stderr);
 
+    /*
+     * Hack to get rdoc to regard ARGF as a class:
+     * rb_cARGF = rb_define_class("ARGF", rb_cObject);
+     */
+    rb_cARGF = rb_class_new(rb_cObject);
+    rb_set_class_path(rb_cARGF, rb_cObject, "ARGF.class");
+    rb_define_alloc_func(rb_cARGF, argf_alloc);
+
+    rb_include_module(rb_cARGF, rb_mEnumerable);
+
+    rb_define_method(rb_cARGF, "initialize", argf_initialize, -2);
+    rb_define_method(rb_cARGF, "initialize_copy", argf_initialize_copy, 1);
+    rb_define_method(rb_cARGF, "to_s", argf_to_s, 0);
+    rb_define_method(rb_cARGF, "argv", argf_argv, 0);
+
+    rb_define_method(rb_cARGF, "fileno", argf_fileno, 0);
+    rb_define_method(rb_cARGF, "to_i", argf_fileno, 0);
+    rb_define_method(rb_cARGF, "to_io", argf_to_io, 0);
+    rb_define_method(rb_cARGF, "each",  argf_each_line, -1);
+    rb_define_method(rb_cARGF, "each_line",  argf_each_line, -1);
+    rb_define_method(rb_cARGF, "each_byte",  argf_each_byte, 0);
+    rb_define_method(rb_cARGF, "each_char",  argf_each_char, 0);
+    rb_define_method(rb_cARGF, "lines", argf_each_line, -1);
+    rb_define_method(rb_cARGF, "bytes", argf_each_byte, 0);
+    rb_define_method(rb_cARGF, "chars", argf_each_char, 0);
+
+    rb_define_method(rb_cARGF, "read",  argf_read, -1);
+    rb_define_method(rb_cARGF, "readpartial",  argf_readpartial, -1);
+    rb_define_method(rb_cARGF, "readlines", argf_readlines, -1);
+    rb_define_method(rb_cARGF, "to_a", argf_readlines, -1);
+    rb_define_method(rb_cARGF, "gets", argf_gets, -1);
+    rb_define_method(rb_cARGF, "readline", argf_readline, -1);
+    rb_define_method(rb_cARGF, "getc", argf_getc, 0);
+    rb_define_method(rb_cARGF, "getbyte", argf_getbyte, 0);
+    rb_define_method(rb_cARGF, "readchar", argf_readchar, 0);
+    rb_define_method(rb_cARGF, "readbyte", argf_readbyte, 0);
+    rb_define_method(rb_cARGF, "tell", argf_tell, 0);
+    rb_define_method(rb_cARGF, "seek", argf_seek_m, -1);
+    rb_define_method(rb_cARGF, "rewind", argf_rewind, 0);
+    rb_define_method(rb_cARGF, "pos", argf_tell, 0);
+    rb_define_method(rb_cARGF, "pos=", argf_set_pos, 1);
+    rb_define_method(rb_cARGF, "eof", argf_eof, 0);
+    rb_define_method(rb_cARGF, "eof?", argf_eof, 0);
+    rb_define_method(rb_cARGF, "binmode", argf_binmode_m, 0);
+    rb_define_method(rb_cARGF, "binmode?", argf_binmode_p, 0);
+
+    rb_define_method(rb_cARGF, "filename", argf_filename, 0);
+    rb_define_method(rb_cARGF, "path", argf_filename, 0);
+    rb_define_method(rb_cARGF, "file", argf_file, 0);
+    rb_define_method(rb_cARGF, "skip", argf_skip, 0);
+    rb_define_method(rb_cARGF, "close", argf_close_m, 0);
+    rb_define_method(rb_cARGF, "closed?", argf_closed, 0);
+
+    rb_define_method(rb_cARGF, "lineno",   argf_lineno, 0);
+    rb_define_method(rb_cARGF, "lineno=",  argf_set_lineno, 1);
+
+    rb_define_method(rb_cARGF, "inplace_mode", argf_inplace_mode_get, 0);
+    rb_define_method(rb_cARGF, "inplace_mode=", argf_inplace_mode_set, 1);
+
+    rb_define_method(rb_cARGF, "external_encoding", argf_external_encoding, 0);
+    rb_define_method(rb_cARGF, "internal_encoding", argf_internal_encoding, 0);
+    rb_define_method(rb_cARGF, "set_encoding", argf_set_encoding, -1);
+
+    argf = rb_class_new_instance(0, 0, rb_cARGF);
+
     rb_define_readonly_variable("$<", &argf);
-    argf = rb_obj_alloc(rb_cObject);
-    rb_extend_object(argf, rb_mEnumerable);
     rb_define_global_const("ARGF", argf);
 
-    rb_define_singleton_method(argf, "to_s", argf_to_s, 0);
-
-    rb_define_singleton_method(argf, "fileno", argf_fileno, 0);
-    rb_define_singleton_method(argf, "to_i", argf_fileno, 0);
-    rb_define_singleton_method(argf, "to_io", argf_to_io, 0);
-    rb_define_singleton_method(argf, "each",  argf_each_line, -1);
-    rb_define_singleton_method(argf, "each_line",  argf_each_line, -1);
-    rb_define_singleton_method(argf, "each_byte",  argf_each_byte, 0);
-
-    rb_define_singleton_method(argf, "read",  argf_read, -1);
-    rb_define_singleton_method(argf, "readlines", rb_f_readlines, -1);
-    rb_define_singleton_method(argf, "to_a", rb_f_readlines, -1);
-    rb_define_singleton_method(argf, "gets", rb_f_gets, -1);
-    rb_define_singleton_method(argf, "readline", rb_f_readline, -1);
-    rb_define_singleton_method(argf, "getc", argf_getc, 0);
-    rb_define_singleton_method(argf, "readchar", argf_readchar, 0);
-    rb_define_singleton_method(argf, "tell", argf_tell, 0);
-    rb_define_singleton_method(argf, "seek", argf_seek_m, -1);
-    rb_define_singleton_method(argf, "rewind", argf_rewind, 0);
-    rb_define_singleton_method(argf, "pos", argf_tell, 0);
-    rb_define_singleton_method(argf, "pos=", argf_set_pos, 1);
-    rb_define_singleton_method(argf, "eof", argf_eof, 0);
-    rb_define_singleton_method(argf, "eof?", argf_eof, 0);
-    rb_define_singleton_method(argf, "binmode", argf_binmode, 0);
-
-    rb_define_singleton_method(argf, "filename", argf_filename, 0);
-    rb_define_singleton_method(argf, "path", argf_filename, 0);
-    rb_define_singleton_method(argf, "file", argf_file, 0);
-    rb_define_singleton_method(argf, "skip", argf_skip, 0);
-    rb_define_singleton_method(argf, "close", argf_close_m, 0);
-    rb_define_singleton_method(argf, "closed?", argf_closed, 0);
-
-    rb_define_singleton_method(argf, "lineno",   argf_lineno, 0);
-    rb_define_singleton_method(argf, "lineno=",  argf_set_lineno, 1);
-
-    rb_global_variable(&current_file);
-    rb_define_readonly_variable("$FILENAME", &filename);
-    filename = rb_str_new2("-");
-
-    rb_define_virtual_variable("$-i", opt_i_get, opt_i_set);
-
-#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__)
+    rb_define_hooked_variable("$.", &argf, argf_lineno_getter, argf_lineno_setter);
+    rb_define_hooked_variable("$FILENAME", &argf, argf_filename_getter, rb_gvar_readonly_setter);
+    ARGF.filename = rb_str_new2("-");
+
+    rb_define_hooked_variable("$-i", &argf, opt_i_get, opt_i_set);
+    rb_define_hooked_variable("$*", &argf, argf_argv_getter, rb_gvar_readonly_setter);
+
+#if defined (_WIN32) || defined(__CYGWIN__)
     atexit(pipe_atexit);
 #endif
 
@@ -5918,27 +10142,61 @@ Init_IO()
 
     rb_define_method(rb_cFile, "initialize",  rb_file_initialize, -1);
 
+    /* open for reading only */
     rb_file_const("RDONLY", INT2FIX(O_RDONLY));
+    /* open for writing only */
     rb_file_const("WRONLY", INT2FIX(O_WRONLY));
+    /* open for reading and writing */
     rb_file_const("RDWR", INT2FIX(O_RDWR));
+    /* append on each write */
     rb_file_const("APPEND", INT2FIX(O_APPEND));
+    /* create file if it does not exist */
     rb_file_const("CREAT", INT2FIX(O_CREAT));
+    /* error if CREAT and the file exists */
     rb_file_const("EXCL", INT2FIX(O_EXCL));
 #if defined(O_NDELAY) || defined(O_NONBLOCK)
-#   ifdef O_NONBLOCK
+# ifndef O_NONBLOCK
+#   define O_NONBLOCK O_NDELAY
+# endif
+    /* do not block on open or for data to become available */
     rb_file_const("NONBLOCK", INT2FIX(O_NONBLOCK));
-#   else
-    rb_file_const("NONBLOCK", INT2FIX(O_NDELAY));
-#   endif
 #endif
+    /* truncate size to 0 */
     rb_file_const("TRUNC", INT2FIX(O_TRUNC));
 #ifdef O_NOCTTY
+    /* not to make opened IO the controlling terminal device */
     rb_file_const("NOCTTY", INT2FIX(O_NOCTTY));
 #endif
-#ifdef O_BINARY
-    rb_file_const("BINARY", INT2FIX(O_BINARY));
+#ifndef O_BINARY
+# define  O_BINARY 0
 #endif
+    /* disable line code conversion and make ASCII-8BIT */
+    rb_file_const("BINARY", INT2FIX(O_BINARY));
 #ifdef O_SYNC
     rb_file_const("SYNC", INT2FIX(O_SYNC));
 #endif
+#ifdef O_DSYNC
+    rb_file_const("DSYNC", INT2FIX(O_DSYNC));
+#endif
+#ifdef O_RSYNC
+    rb_file_const("RSYNC", INT2FIX(O_RSYNC));
+#endif
+#ifdef O_NOFOLLOW
+    /* do not follow symlinks */
+    rb_file_const("NOFOLLOW", INT2FIX(O_NOFOLLOW)); /* FreeBSD, Linux */
+#endif
+#ifdef O_NOATIME
+    /* do not change atime */
+    rb_file_const("NOATIME", INT2FIX(O_NOATIME)); /* Linux */
+#endif
+
+    sym_mode = ID2SYM(rb_intern("mode"));
+    sym_perm = ID2SYM(rb_intern("perm"));
+    sym_extenc = ID2SYM(rb_intern("external_encoding"));
+    sym_intenc = ID2SYM(rb_intern("internal_encoding"));
+    sym_encoding = ID2SYM(rb_intern("encoding"));
+    sym_open_args = ID2SYM(rb_intern("open_args"));
+    sym_textmode = ID2SYM(rb_intern("textmode"));
+    sym_binmode = ID2SYM(rb_intern("binmode"));
+    sym_autoclose = ID2SYM(rb_intern("autoclose"));
 }
diff --git a/iseq.c b/iseq.c
new file mode 100644
index 0000000000..372a773742
--- /dev/null
+++ b/iseq.c
@@ -0,0 +1,1520 @@
+/**********************************************************************
+
+  iseq.c -
+
+  $Author$
+  created at: 2006-07-11(Tue) 09:00:03 +0900
+
+  Copyright (C) 2006 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+
+/* #define RUBY_MARK_FREE_DEBUG 1 */
+#include "gc.h"
+#include "vm_core.h"
+#include "iseq.h"
+
+#include "insns.inc"
+#include "insns_info.inc"
+
+VALUE rb_cISeq;
+
+#define hidden_obj_p(obj) (!SPECIAL_CONST_P(obj) && !RBASIC(obj)->klass)
+
+static inline VALUE
+obj_resurrect(VALUE obj)
+{
+    if (hidden_obj_p(obj)) {
+	switch (BUILTIN_TYPE(obj)) {
+	  case T_STRING:
+	    obj = rb_str_resurrect(obj);
+	    break;
+	  case T_ARRAY:
+	    obj = rb_ary_resurrect(obj);
+	    break;
+	}
+    }
+    return obj;
+}
+
+static void
+compile_data_free(struct iseq_compile_data *compile_data)
+{
+    if (compile_data) {
+	struct iseq_compile_data_storage *cur, *next;
+	cur = compile_data->storage_head;
+	while (cur) {
+	    next = cur->next;
+	    ruby_xfree(cur);
+	    cur = next;
+	}
+	ruby_xfree(compile_data);
+    }
+}
+
+static void
+iseq_free(void *ptr)
+{
+    rb_iseq_t *iseq;
+    RUBY_FREE_ENTER("iseq");
+
+    if (ptr) {
+	iseq = ptr;
+	if (!iseq->orig) {
+	    /* It's possible that strings are freed */
+	    if (0) {
+		RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name),
+					  RSTRING_PTR(iseq->filename));
+	    }
+
+	    if (iseq->iseq != iseq->iseq_encoded) {
+		RUBY_FREE_UNLESS_NULL(iseq->iseq_encoded);
+	    }
+
+	    RUBY_FREE_UNLESS_NULL(iseq->iseq);
+	    RUBY_FREE_UNLESS_NULL(iseq->insn_info_table);
+	    RUBY_FREE_UNLESS_NULL(iseq->local_table);
+	    RUBY_FREE_UNLESS_NULL(iseq->ic_entries);
+	    RUBY_FREE_UNLESS_NULL(iseq->catch_table);
+	    RUBY_FREE_UNLESS_NULL(iseq->arg_opt_table);
+	    compile_data_free(iseq->compile_data);
+	}
+	ruby_xfree(ptr);
+    }
+    RUBY_FREE_LEAVE("iseq");
+}
+
+static void
+iseq_mark(void *ptr)
+{
+    RUBY_MARK_ENTER("iseq");
+
+    if (ptr) {
+	rb_iseq_t *iseq = ptr;
+
+	RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->filename));
+	RUBY_MARK_UNLESS_NULL(iseq->mark_ary);
+	RUBY_MARK_UNLESS_NULL(iseq->name);
+	RUBY_MARK_UNLESS_NULL(iseq->filename);
+	RUBY_MARK_UNLESS_NULL(iseq->filepath);
+	RUBY_MARK_UNLESS_NULL((VALUE)iseq->cref_stack);
+	RUBY_MARK_UNLESS_NULL(iseq->klass);
+	RUBY_MARK_UNLESS_NULL(iseq->coverage);
+#if 0
+	RUBY_MARK_UNLESS_NULL((VALUE)iseq->node);
+	RUBY_MARK_UNLESS_NULL(iseq->cached_special_block);
+#endif
+	RUBY_MARK_UNLESS_NULL(iseq->orig);
+
+	if (iseq->compile_data != 0) {
+	    struct iseq_compile_data *const compile_data = iseq->compile_data;
+	    RUBY_MARK_UNLESS_NULL(compile_data->mark_ary);
+	    RUBY_MARK_UNLESS_NULL(compile_data->err_info);
+	    RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
+	}
+    }
+    RUBY_MARK_LEAVE("iseq");
+}
+
+static size_t
+iseq_memsize(const void *ptr)
+{
+    size_t size = sizeof(rb_iseq_t);
+    const rb_iseq_t *iseq;
+
+    if (ptr) {
+	iseq = ptr;
+	if (!iseq->orig) {
+	    if (iseq->iseq != iseq->iseq_encoded) {
+		size += iseq->iseq_size * sizeof(VALUE);
+	    }
+
+	    size += iseq->iseq_size * sizeof(VALUE);
+	    size += iseq->insn_info_size * sizeof(struct iseq_insn_info_entry);
+	    size += iseq->local_table_size * sizeof(ID);
+	    size += iseq->catch_table_size * sizeof(struct iseq_catch_table_entry);
+	    size += iseq->arg_opts * sizeof(VALUE);
+	    size += iseq->ic_size * sizeof(struct iseq_inline_cache_entry);
+
+	    if (iseq->compile_data) {
+		struct iseq_compile_data_storage *cur;
+
+		cur = iseq->compile_data->storage_head;
+		while (cur) {
+		    size += cur->size + sizeof(struct iseq_compile_data_storage);
+		    cur = cur->next;
+		}
+		size += sizeof(struct iseq_compile_data);
+	    }
+	}
+    }
+
+    return size;
+}
+
+static const rb_data_type_t iseq_data_type = {
+    "iseq",
+    iseq_mark,
+    iseq_free,
+    iseq_memsize,
+};
+
+static VALUE
+iseq_alloc(VALUE klass)
+{
+    rb_iseq_t *iseq;
+    return TypedData_Make_Struct(klass, rb_iseq_t, &iseq_data_type, iseq);
+}
+
+static void
+set_relation(rb_iseq_t *iseq, const VALUE parent)
+{
+    const VALUE type = iseq->type;
+    rb_thread_t *th = GET_THREAD();
+
+    /* set class nest stack */
+    if (type == ISEQ_TYPE_TOP) {
+	/* toplevel is private */
+	iseq->cref_stack = NEW_BLOCK(rb_cObject);
+	iseq->cref_stack->nd_file = 0;
+	iseq->cref_stack->nd_visi = NOEX_PRIVATE;
+	if (th->top_wrapper) {
+	    NODE *cref = NEW_BLOCK(th->top_wrapper);
+	    cref->nd_file = 0;
+	    cref->nd_visi = NOEX_PRIVATE;
+	    cref->nd_next = iseq->cref_stack;
+	    iseq->cref_stack = cref;
+	}
+    }
+    else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
+	iseq->cref_stack = NEW_BLOCK(0); /* place holder */
+	iseq->cref_stack->nd_file = 0;
+    }
+    else if (RTEST(parent)) {
+	rb_iseq_t *piseq;
+	GetISeqPtr(parent, piseq);
+	iseq->cref_stack = piseq->cref_stack;
+    }
+
+    if (type == ISEQ_TYPE_TOP ||
+	type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
+	iseq->local_iseq = iseq;
+    }
+    else if (RTEST(parent)) {
+	rb_iseq_t *piseq;
+	GetISeqPtr(parent, piseq);
+	iseq->local_iseq = piseq->local_iseq;
+    }
+
+    if (RTEST(parent)) {
+	rb_iseq_t *piseq;
+	GetISeqPtr(parent, piseq);
+	iseq->parent_iseq = piseq;
+    }
+}
+
+VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict);
+
+static VALUE
+prepare_iseq_build(rb_iseq_t *iseq,
+		   VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
+		   VALUE parent, VALUE type, VALUE block_opt,
+		   const rb_compile_option_t *option)
+{
+    OBJ_FREEZE(name);
+    OBJ_FREEZE(filename);
+
+    iseq->name = name;
+    iseq->filename = filename;
+    iseq->filepath = filepath == Qnil ? Qnil : rb_realpath_internal(Qnil, filepath, 1);
+    iseq->line_no = line_no;
+    iseq->defined_method_id = 0;
+    iseq->mark_ary = rb_ary_tmp_new(3);
+    OBJ_UNTRUST(iseq->mark_ary);
+    RBASIC(iseq->mark_ary)->klass = 0;
+
+    iseq->type = type;
+    iseq->arg_rest = -1;
+    iseq->arg_block = -1;
+    iseq->klass = 0;
+
+    /*
+     * iseq->special_block_builder = GC_GUARDED_PTR_REF(block_opt);
+     * iseq->cached_special_block_builder = 0;
+     * iseq->cached_special_block = 0;
+     */
+
+    iseq->compile_data = ALLOC(struct iseq_compile_data);
+    MEMZERO(iseq->compile_data, struct iseq_compile_data, 1);
+    iseq->compile_data->mark_ary = rb_ary_tmp_new(3);
+
+    iseq->compile_data->storage_head = iseq->compile_data->storage_current =
+      (struct iseq_compile_data_storage *)
+	ALLOC_N(char, INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE +
+		sizeof(struct iseq_compile_data_storage));
+
+    iseq->compile_data->catch_table_ary = rb_ary_new();
+    iseq->compile_data->storage_head->pos = 0;
+    iseq->compile_data->storage_head->next = 0;
+    iseq->compile_data->storage_head->size =
+      INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE;
+    iseq->compile_data->storage_head->buff =
+      (char *)(&iseq->compile_data->storage_head->buff + 1);
+    iseq->compile_data->option = option;
+    iseq->compile_data->last_coverable_line = -1;
+
+    set_relation(iseq, parent);
+
+    iseq->coverage = Qfalse;
+    if (!GET_THREAD()->parse_in_eval) {
+	extern VALUE rb_get_coverages(void);
+	VALUE coverages = rb_get_coverages();
+	if (RTEST(coverages)) {
+	    iseq->coverage = rb_hash_lookup(coverages, filename);
+	    if (NIL_P(iseq->coverage)) iseq->coverage = Qfalse;
+	}
+    }
+
+    return Qtrue;
+}
+
+static VALUE
+cleanup_iseq_build(rb_iseq_t *iseq)
+{
+    struct iseq_compile_data *data = iseq->compile_data;
+    VALUE err = data->err_info;
+    iseq->compile_data = 0;
+    compile_data_free(data);
+
+    if (RTEST(err)) {
+	rb_funcall2(err, rb_intern("set_backtrace"), 1, &iseq->filename);
+	rb_exc_raise(err);
+    }
+    return Qtrue;
+}
+
+static rb_compile_option_t COMPILE_OPTION_DEFAULT = {
+    OPT_INLINE_CONST_CACHE, /* int inline_const_cache; */
+    OPT_PEEPHOLE_OPTIMIZATION, /* int peephole_optimization; */
+    OPT_TAILCALL_OPTIMIZATION, /* int tailcall_optimization */
+    OPT_SPECIALISED_INSTRUCTION, /* int specialized_instruction; */
+    OPT_OPERANDS_UNIFICATION, /* int operands_unification; */
+    OPT_INSTRUCTIONS_UNIFICATION, /* int instructions_unification; */
+    OPT_STACK_CACHING, /* int stack_caching; */
+    OPT_TRACE_INSTRUCTION, /* int trace_instruction */
+};
+static const rb_compile_option_t COMPILE_OPTION_FALSE = {0};
+
+static void
+make_compile_option(rb_compile_option_t *option, VALUE opt)
+{
+    if (opt == Qnil) {
+	*option = COMPILE_OPTION_DEFAULT;
+    }
+    else if (opt == Qfalse) {
+	*option = COMPILE_OPTION_FALSE;
+    }
+    else if (opt == Qtrue) {
+	memset(option, 1, sizeof(rb_compile_option_t));
+    }
+    else if (CLASS_OF(opt) == rb_cHash) {
+	*option = COMPILE_OPTION_DEFAULT;
+
+#define SET_COMPILE_OPTION(o, h, mem) \
+  { VALUE flag = rb_hash_aref(h, ID2SYM(rb_intern(#mem))); \
+      if (flag == Qtrue)  { o->mem = 1; } \
+      else if (flag == Qfalse)  { o->mem = 0; } \
+  }
+#define SET_COMPILE_OPTION_NUM(o, h, mem) \
+  { VALUE num = rb_hash_aref(opt, ID2SYM(rb_intern(#mem))); \
+      if (!NIL_P(num)) o->mem = NUM2INT(num); \
+  }
+	SET_COMPILE_OPTION(option, opt, inline_const_cache);
+	SET_COMPILE_OPTION(option, opt, peephole_optimization);
+	SET_COMPILE_OPTION(option, opt, tailcall_optimization);
+	SET_COMPILE_OPTION(option, opt, specialized_instruction);
+	SET_COMPILE_OPTION(option, opt, operands_unification);
+	SET_COMPILE_OPTION(option, opt, instructions_unification);
+	SET_COMPILE_OPTION(option, opt, stack_caching);
+	SET_COMPILE_OPTION(option, opt, trace_instruction);
+	SET_COMPILE_OPTION_NUM(option, opt, debug_level);
+#undef SET_COMPILE_OPTION
+#undef SET_COMPILE_OPTION_NUM
+    }
+    else {
+	rb_raise(rb_eTypeError, "Compile option must be Hash/true/false/nil");
+    }
+}
+
+static VALUE
+make_compile_option_value(rb_compile_option_t *option)
+{
+    VALUE opt = rb_hash_new();
+#define SET_COMPILE_OPTION(o, h, mem) \
+  rb_hash_aset(h, ID2SYM(rb_intern(#mem)), o->mem ? Qtrue : Qfalse)
+#define SET_COMPILE_OPTION_NUM(o, h, mem) \
+  rb_hash_aset(h, ID2SYM(rb_intern(#mem)), INT2NUM(o->mem))
+    {
+	SET_COMPILE_OPTION(option, opt, inline_const_cache);
+	SET_COMPILE_OPTION(option, opt, peephole_optimization);
+	SET_COMPILE_OPTION(option, opt, tailcall_optimization);
+	SET_COMPILE_OPTION(option, opt, specialized_instruction);
+	SET_COMPILE_OPTION(option, opt, operands_unification);
+	SET_COMPILE_OPTION(option, opt, instructions_unification);
+	SET_COMPILE_OPTION(option, opt, stack_caching);
+	SET_COMPILE_OPTION_NUM(option, opt, debug_level);
+    }
+#undef SET_COMPILE_OPTION
+#undef SET_COMPILE_OPTION_NUM
+    return opt;
+}
+
+VALUE
+rb_iseq_new(NODE *node, VALUE name, VALUE filename, VALUE filepath,
+	      VALUE parent, VALUE type)
+{
+    return rb_iseq_new_with_opt(node, name, filename, filepath, INT2FIX(0), parent, type,
+				&COMPILE_OPTION_DEFAULT);
+}
+
+VALUE
+rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE parent)
+{
+    return rb_iseq_new_with_opt(node, name, filename, filepath, INT2FIX(0), parent, ISEQ_TYPE_TOP,
+				&COMPILE_OPTION_DEFAULT);
+}
+
+VALUE
+rb_iseq_new_main(NODE *node, VALUE filename, VALUE filepath)
+{
+    rb_thread_t *th = GET_THREAD();
+    VALUE parent = th->base_block->iseq->self;
+    return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), filename, filepath, INT2FIX(0),
+				parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
+}
+
+static VALUE
+rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
+				VALUE parent, VALUE type, VALUE bopt,
+				const rb_compile_option_t *option)
+{
+    rb_iseq_t *iseq;
+    VALUE self = iseq_alloc(rb_cISeq);
+
+    GetISeqPtr(self, iseq);
+    iseq->self = self;
+
+    prepare_iseq_build(iseq, name, filename, filepath, line_no, parent, type, bopt, option);
+    rb_iseq_compile_node(self, node);
+    cleanup_iseq_build(iseq);
+    return self;
+}
+
+VALUE
+rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
+		     VALUE parent, VALUE type,
+		     const rb_compile_option_t *option)
+{
+    /* TODO: argument check */
+    return rb_iseq_new_with_bopt_and_opt(node, name, filename, filepath, line_no, parent, type,
+					   Qfalse, option);
+}
+
+VALUE
+rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
+		       VALUE parent, VALUE type, VALUE bopt)
+{
+    /* TODO: argument check */
+    return rb_iseq_new_with_bopt_and_opt(node, name, filename, filepath, line_no, parent, type,
+					   bopt, &COMPILE_OPTION_DEFAULT);
+}
+
+#define CHECK_ARRAY(v)   rb_convert_type(v, T_ARRAY, "Array", "to_ary")
+#define CHECK_STRING(v)  rb_convert_type(v, T_STRING, "String", "to_str")
+#define CHECK_SYMBOL(v)  rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym")
+static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;}
+static VALUE
+iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
+{
+    VALUE iseqval = iseq_alloc(self);
+
+    VALUE magic, version1, version2, format_type, misc;
+    VALUE name, filename, filepath, line_no;
+    VALUE type, body, locals, args, exception;
+
+    VALUE iseq_type;
+    struct st_table *type_map = 0;
+    rb_iseq_t *iseq;
+    rb_compile_option_t option;
+    int i = 0;
+
+    /* [magic, major_version, minor_version, format_type, misc,
+     *  name, filename, line_no,
+     *  type, locals, args, exception_table, body]
+     */
+
+    data        = CHECK_ARRAY(data);
+
+    magic       = CHECK_STRING(rb_ary_entry(data, i++));
+    version1    = CHECK_INTEGER(rb_ary_entry(data, i++));
+    version2    = CHECK_INTEGER(rb_ary_entry(data, i++));
+    format_type = CHECK_INTEGER(rb_ary_entry(data, i++));
+    misc        = rb_ary_entry(data, i++); /* TODO */
+
+    name        = CHECK_STRING(rb_ary_entry(data, i++));
+    filename    = CHECK_STRING(rb_ary_entry(data, i++));
+    filepath    = rb_ary_entry(data, i++);
+    filepath    = NIL_P(filepath) ? Qnil : CHECK_STRING(filepath);
+    line_no     = CHECK_INTEGER(rb_ary_entry(data, i++));
+
+    type        = CHECK_SYMBOL(rb_ary_entry(data, i++));
+    locals      = CHECK_ARRAY(rb_ary_entry(data, i++));
+
+    args        = rb_ary_entry(data, i++);
+    if (FIXNUM_P(args) || (args = CHECK_ARRAY(args))) {
+	/* */
+    }
+
+    exception   = CHECK_ARRAY(rb_ary_entry(data, i++));
+    body        = CHECK_ARRAY(rb_ary_entry(data, i++));
+
+    GetISeqPtr(iseqval, iseq);
+    iseq->self = iseqval;
+
+    if (type_map == 0) {
+	type_map = st_init_numtable();
+	st_insert(type_map, ID2SYM(rb_intern("top")), ISEQ_TYPE_TOP);
+	st_insert(type_map, ID2SYM(rb_intern("method")), ISEQ_TYPE_METHOD);
+	st_insert(type_map, ID2SYM(rb_intern("block")), ISEQ_TYPE_BLOCK);
+	st_insert(type_map, ID2SYM(rb_intern("class")), ISEQ_TYPE_CLASS);
+	st_insert(type_map, ID2SYM(rb_intern("rescue")), ISEQ_TYPE_RESCUE);
+	st_insert(type_map, ID2SYM(rb_intern("ensure")), ISEQ_TYPE_ENSURE);
+	st_insert(type_map, ID2SYM(rb_intern("eval")), ISEQ_TYPE_EVAL);
+	st_insert(type_map, ID2SYM(rb_intern("main")), ISEQ_TYPE_MAIN);
+	st_insert(type_map, ID2SYM(rb_intern("defined_guard")), ISEQ_TYPE_DEFINED_GUARD);
+    }
+
+    if (st_lookup(type_map, type, &iseq_type) == 0) {
+	const char *typename = rb_id2name(type);
+	if (typename)
+	    rb_raise(rb_eTypeError, "unsupport type: :%s", typename);
+	else
+	    rb_raise(rb_eTypeError, "unsupport type: %p", (void *)type);
+    }
+
+    if (parent == Qnil) {
+	parent = 0;
+    }
+
+    make_compile_option(&option, opt);
+    prepare_iseq_build(iseq, name, filename, filepath, line_no,
+		       parent, iseq_type, 0, &option);
+
+    rb_iseq_build_from_ary(iseq, locals, args, exception, body);
+
+    cleanup_iseq_build(iseq);
+    return iseqval;
+}
+
+static VALUE
+iseq_s_load(int argc, VALUE *argv, VALUE self)
+{
+    VALUE data, opt=Qnil;
+    rb_scan_args(argc, argv, "11", &data, &opt);
+
+    return iseq_load(self, data, 0, opt);
+}
+
+VALUE
+rb_iseq_load(VALUE data, VALUE parent, VALUE opt)
+{
+    return iseq_load(rb_cISeq, data, parent, opt);
+}
+
+static NODE *
+parse_string(VALUE str, const char *file, int line)
+{
+    VALUE parser = rb_parser_new();
+    NODE *node = rb_parser_compile_string(parser, file, str, line);
+
+    if (!node) {
+	rb_exc_raise(GET_THREAD()->errinfo);	/* TODO: check err */
+    }
+    return node;
+}
+
+VALUE
+rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE filepath, VALUE line, VALUE opt)
+{
+    rb_compile_option_t option;
+    const char *fn = StringValueCStr(file);
+    int ln = NUM2INT(line);
+    NODE *node = parse_string(StringValue(src), fn, ln);
+    rb_thread_t *th = GET_THREAD();
+    make_compile_option(&option, opt);
+
+    if (th->base_block && th->base_block->iseq) {
+	return rb_iseq_new_with_opt(node, th->base_block->iseq->name,
+				    file, filepath, line, th->base_block->iseq->self,
+				    ISEQ_TYPE_EVAL, &option);
+    }
+    else {
+	return rb_iseq_new_with_opt(node, rb_str_new2("<compiled>"), file, filepath, line, Qfalse,
+				    ISEQ_TYPE_TOP, &option);
+    }
+}
+
+VALUE
+rb_iseq_compile(VALUE src, VALUE file, VALUE line)
+{
+    return rb_iseq_compile_with_option(src, file, Qnil, line, Qnil);
+}
+
+static VALUE
+iseq_s_compile(int argc, VALUE *argv, VALUE self)
+{
+    VALUE src, file = Qnil, path = Qnil, line = INT2FIX(1), opt = Qnil;
+
+    rb_secure(1);
+
+    rb_scan_args(argc, argv, "14", &src, &file, &path, &line, &opt);
+    if (NIL_P(file)) file = rb_str_new2("<compiled>");
+    if (NIL_P(line)) line = INT2FIX(1);
+
+    return rb_iseq_compile_with_option(src, file, path, line, opt);
+}
+
+static VALUE
+iseq_s_compile_file(int argc, VALUE *argv, VALUE self)
+{
+    VALUE file, line = INT2FIX(1), opt = Qnil;
+    VALUE parser;
+    VALUE f;
+    NODE *node;
+    const char *fname;
+    rb_compile_option_t option;
+
+    rb_secure(1);
+    rb_scan_args(argc, argv, "11", &file, &opt);
+    FilePathValue(file);
+    fname = StringValueCStr(file);
+
+    f = rb_file_open_str(file, "r");
+
+    parser = rb_parser_new();
+    node = rb_parser_compile_file(parser, fname, f, NUM2INT(line));
+    make_compile_option(&option, opt);
+    return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), file, file, line, Qfalse,
+				ISEQ_TYPE_TOP, &option);
+}
+
+static VALUE
+iseq_s_compile_option_set(VALUE self, VALUE opt)
+{
+    rb_compile_option_t option;
+    rb_secure(1);
+    make_compile_option(&option, opt);
+    COMPILE_OPTION_DEFAULT = option;
+    return opt;
+}
+
+static VALUE
+iseq_s_compile_option_get(VALUE self)
+{
+    return make_compile_option_value(&COMPILE_OPTION_DEFAULT);
+}
+
+static rb_iseq_t *
+iseq_check(VALUE val)
+{
+    rb_iseq_t *iseq;
+    GetISeqPtr(val, iseq);
+    if (!iseq->name) {
+	rb_raise(rb_eTypeError, "uninitialized InstructionSequence");
+    }
+    return iseq;
+}
+
+static VALUE
+iseq_eval(VALUE self)
+{
+    rb_secure(1);
+    return rb_iseq_eval(self);
+}
+
+static VALUE
+iseq_inspect(VALUE self)
+{
+    rb_iseq_t *iseq;
+    GetISeqPtr(self, iseq);
+    if (!iseq->name) {
+        return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
+    }
+
+    return rb_sprintf("<%s:%s@%s>",
+                      rb_obj_classname(self),
+		      RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->filename));
+}
+
+static
+VALUE iseq_data_to_ary(rb_iseq_t *iseq);
+
+static VALUE
+iseq_to_a(VALUE self)
+{
+    rb_iseq_t *iseq = iseq_check(self);
+    rb_secure(1);
+    return iseq_data_to_ary(iseq);
+}
+
+int
+rb_iseq_first_lineno(rb_iseq_t *iseq)
+{
+    return FIX2INT(iseq->line_no);
+}
+
+/* TODO: search algorithm is brute force.
+         this should be binary search or so. */
+
+static struct iseq_insn_info_entry *
+get_insn_info(const rb_iseq_t *iseq, const unsigned long pos)
+{
+    unsigned long i, size = iseq->insn_info_size;
+    struct iseq_insn_info_entry *table = iseq->insn_info_table;
+
+    for (i = 0; i < size; i++) {
+	if (table[i].position == pos) {
+	    return &table[i];
+	}
+    }
+
+    return 0;
+}
+
+static unsigned short
+find_line_no(rb_iseq_t *iseq, unsigned long pos)
+{
+    struct iseq_insn_info_entry *entry = get_insn_info(iseq, pos);
+    if (entry) {
+	return entry->line_no;
+    }
+    else {
+	return 0;
+    }
+}
+
+static unsigned short
+find_prev_line_no(rb_iseq_t *iseqdat, unsigned long pos)
+{
+    unsigned long i, size = iseqdat->insn_info_size;
+    struct iseq_insn_info_entry *iiary = iseqdat->insn_info_table;
+
+    for (i = 0; i < size; i++) {
+	if (iiary[i].position == pos) {
+	    if (i > 0) {
+		return iiary[i - 1].line_no;
+	    }
+	    else {
+		return 0;
+	    }
+	}
+    }
+
+    return 0;
+}
+
+static VALUE
+insn_operand_intern(rb_iseq_t *iseq,
+		    VALUE insn, int op_no, VALUE op,
+		    int len, size_t pos, VALUE *pnop, VALUE child)
+{
+    const char *types = insn_op_types(insn);
+    char type = types[op_no];
+    VALUE ret;
+
+    switch (type) {
+      case TS_OFFSET:		/* LONG */
+	ret = rb_sprintf("%ld", pos + len + op);
+	break;
+
+      case TS_NUM:		/* ULONG */
+	ret = rb_sprintf("%lu", op);
+	break;
+
+      case TS_LINDEX:
+	{
+	    rb_iseq_t *ip = iseq->local_iseq;
+	    int lidx = ip->local_size - (int)op;
+	    const char *name = rb_id2name(ip->local_table[lidx]);
+
+	    if (name) {
+		ret = rb_str_new2(name);
+	    }
+	    else {
+		ret = rb_str_new2("*");
+	    }
+	    break;
+	}
+      case TS_DINDEX:{
+	if (insn == BIN(getdynamic) || insn == BIN(setdynamic)) {
+	    rb_iseq_t *ip = iseq;
+	    VALUE level = *pnop, i;
+	    const char *name;
+	    for (i = 0; i < level; i++) {
+		ip = ip->parent_iseq;
+	    }
+	    name = rb_id2name(ip->local_table[ip->local_size - op]);
+
+	    if (!name) {
+		name = "*";
+	    }
+	    ret = rb_str_new2(name);
+	}
+	else {
+	    ret = rb_inspect(INT2FIX(op));
+	}
+	break;
+      }
+      case TS_ID:		/* ID (symbol) */
+	op = ID2SYM(op);
+
+      case TS_VALUE:		/* VALUE */
+	op = obj_resurrect(op);
+	ret = rb_inspect(op);
+	if (CLASS_OF(op) == rb_cISeq) {
+	    rb_ary_push(child, op);
+	}
+	break;
+
+      case TS_ISEQ:		/* iseq */
+	{
+	    rb_iseq_t *iseq = (rb_iseq_t *)op;
+	    if (iseq) {
+		ret = iseq->name;
+		if (child) {
+		    rb_ary_push(child, iseq->self);
+		}
+	    }
+	    else {
+		ret = rb_str_new2("nil");
+	    }
+	    break;
+	}
+      case TS_GENTRY:
+	{
+	    struct rb_global_entry *entry = (struct rb_global_entry *)op;
+	    ret = rb_str_dup(rb_id2str(entry->id));
+	}
+	break;
+
+      case TS_IC:
+	ret = rb_sprintf("<ic:%"PRIdPTRDIFF">", (struct iseq_inline_cache_entry *)op - iseq->ic_entries);
+	break;
+
+      case TS_CDHASH:
+	ret = rb_str_new2("<cdhash>");
+	break;
+
+      case TS_FUNCPTR:
+	ret = rb_str_new2("<funcptr>");
+	break;
+
+      default:
+	rb_bug("rb_iseq_disasm: unknown operand type: %c", type);
+    }
+    return ret;
+}
+
+/**
+ * Disassemble a instruction
+ * Iseq -> Iseq inspect object
+ */
+int
+rb_iseq_disasm_insn(VALUE ret, VALUE *iseq, size_t pos,
+		    rb_iseq_t *iseqdat, VALUE child)
+{
+    VALUE insn = iseq[pos];
+    int len = insn_len(insn);
+    int j;
+    const char *types = insn_op_types(insn);
+    VALUE str = rb_str_new(0, 0);
+    const char *insn_name_buff;
+
+    insn_name_buff = insn_name(insn);
+    if (1) {
+	rb_str_catf(str, "%04"PRIdSIZE" %-16s ", pos, insn_name_buff);
+    }
+    else {
+	rb_str_catf(str, "%04"PRIdSIZE" %-16.*s ", pos,
+		    (int)strcspn(insn_name_buff, "_"), insn_name_buff);
+    }
+
+    for (j = 0; types[j]; j++) {
+	const char *types = insn_op_types(insn);
+	VALUE opstr = insn_operand_intern(iseqdat, insn, j, iseq[pos + j + 1],
+					  len, pos, &iseq[pos + j + 2],
+					  child);
+	rb_str_concat(str, opstr);
+
+	if (types[j + 1]) {
+	    rb_str_cat2(str, ", ");
+	}
+    }
+
+    if (1) {
+	int line_no = find_line_no(iseqdat, pos);
+	int prev = find_prev_line_no(iseqdat, pos);
+	if (line_no && line_no != prev) {
+	    long slen = RSTRING_LEN(str);
+	    slen = (slen > 70) ? 0 : (70 - slen);
+	    str = rb_str_catf(str, "%*s(%4d)", (int)slen, "", line_no);
+	}
+    }
+    else {
+	/* for debug */
+	struct iseq_insn_info_entry *entry = get_insn_info(iseqdat, pos);
+	long slen = RSTRING_LEN(str);
+	slen = (slen > 60) ? 0 : (60 - slen);
+	str = rb_str_catf(str, "%*s(line: %d, sp: %d)",
+			  (int)slen, "", entry->line_no, entry->sp);
+    }
+
+    if (ret) {
+	rb_str_cat2(str, "\n");
+	rb_str_concat(ret, str);
+    }
+    else {
+	printf("%s\n", RSTRING_PTR(str));
+    }
+    return len;
+}
+
+static const char *
+catch_type(int type)
+{
+    switch (type) {
+      case CATCH_TYPE_RESCUE:
+	return "rescue";
+      case CATCH_TYPE_ENSURE:
+	return "ensure";
+      case CATCH_TYPE_RETRY:
+	return "retry";
+      case CATCH_TYPE_BREAK:
+	return "break";
+      case CATCH_TYPE_REDO:
+	return "redo";
+      case CATCH_TYPE_NEXT:
+	return "next";
+      default:
+	rb_bug("unknown catch type (%d)", type);
+	return 0;
+    }
+}
+
+VALUE
+rb_iseq_disasm(VALUE self)
+{
+    rb_iseq_t *iseqdat = iseq_check(self);
+    VALUE *iseq;
+    VALUE str = rb_str_new(0, 0);
+    VALUE child = rb_ary_new();
+    unsigned long size;
+    int i;
+    long l;
+    ID *tbl;
+    size_t n;
+    enum {header_minlen = 72};
+
+    rb_secure(1);
+
+    iseq = iseqdat->iseq;
+    size = iseqdat->iseq_size;
+
+    rb_str_cat2(str, "== disasm: ");
+
+    rb_str_concat(str, iseq_inspect(iseqdat->self));
+    if ((l = RSTRING_LEN(str)) < header_minlen) {
+	rb_str_resize(str, header_minlen);
+	memset(RSTRING_PTR(str) + l, '=', header_minlen - l);
+    }
+    rb_str_cat2(str, "\n");
+
+    /* show catch table information */
+    if (iseqdat->catch_table_size != 0) {
+	rb_str_cat2(str, "== catch table\n");
+    }
+    for (i = 0; i < iseqdat->catch_table_size; i++) {
+	struct iseq_catch_table_entry *entry = &iseqdat->catch_table[i];
+	rb_str_catf(str,
+		    "| catch type: %-6s st: %04d ed: %04d sp: %04d cont: %04d\n",
+		    catch_type((int)entry->type), (int)entry->start,
+		    (int)entry->end, (int)entry->sp, (int)entry->cont);
+	if (entry->iseq) {
+	    rb_str_concat(str, rb_iseq_disasm(entry->iseq));
+	}
+    }
+    if (iseqdat->catch_table_size != 0) {
+	rb_str_cat2(str, "|-------------------------------------"
+		    "-----------------------------------\n");
+    }
+
+    /* show local table information */
+    tbl = iseqdat->local_table;
+
+    if (tbl) {
+	rb_str_catf(str,
+		    "local table (size: %d, argc: %d "
+		    "[opts: %d, rest: %d, post: %d, block: %d] s%d)\n",
+		    iseqdat->local_size, iseqdat->argc,
+		    iseqdat->arg_opts, iseqdat->arg_rest,
+		    iseqdat->arg_post_len, iseqdat->arg_block,
+		    iseqdat->arg_simple);
+
+	for (i = 0; i < iseqdat->local_table_size; i++) {
+	    const char *name = rb_id2name(tbl[i]);
+	    char info[0x100];
+	    char argi[0x100] = "";
+	    char opti[0x100] = "";
+
+	    if (iseqdat->arg_opts) {
+		int argc = iseqdat->argc;
+		int opts = iseqdat->arg_opts;
+		if (i >= argc && i < argc + opts - 1) {
+		    snprintf(opti, sizeof(opti), "Opt=%ld",
+			     iseqdat->arg_opt_table[i - argc]);
+		}
+	    }
+
+	    snprintf(argi, sizeof(argi), "%s%s%s%s%s",	/* arg, opts, rest, post  block */
+		     iseqdat->argc > i ? "Arg" : "",
+		     opti,
+		     iseqdat->arg_rest == i ? "Rest" : "",
+		     (iseqdat->arg_post_start <= i &&
+		      i < iseqdat->arg_post_start + iseqdat->arg_post_len) ? "Post" : "",
+		     iseqdat->arg_block == i ? "Block" : "");
+
+	    snprintf(info, sizeof(info), "%s%s%s%s", name ? name : "?",
+		     *argi ? "<" : "", argi, *argi ? ">" : "");
+
+	    rb_str_catf(str, "[%2d] %-11s", iseqdat->local_size - i, info);
+	}
+	rb_str_cat2(str, "\n");
+    }
+
+    /* show each line */
+    for (n = 0; n < size;) {
+	n += rb_iseq_disasm_insn(str, iseq, n, iseqdat, child);
+    }
+
+    for (i = 0; i < RARRAY_LEN(child); i++) {
+	VALUE isv = rb_ary_entry(child, i);
+	rb_str_concat(str, rb_iseq_disasm(isv));
+    }
+
+    return str;
+}
+
+static VALUE
+iseq_s_disasm(VALUE klass, VALUE body)
+{
+    VALUE ret = Qnil;
+    rb_iseq_t *iseq;
+    extern rb_iseq_t *rb_method_get_iseq(VALUE body);
+
+    rb_secure(1);
+
+    if (rb_obj_is_proc(body)) {
+	rb_proc_t *proc;
+	VALUE iseqval;
+	GetProcPtr(body, proc);
+	iseqval = proc->block.iseq->self;
+	if (RUBY_VM_NORMAL_ISEQ_P(iseqval)) {
+	    ret = rb_iseq_disasm(iseqval);
+	}
+    }
+    else if ((iseq = rb_method_get_iseq(body)) != 0) {
+	ret = rb_iseq_disasm(iseq->self);
+    }
+
+    return ret;
+}
+
+const char *
+ruby_node_name(int node)
+{
+    switch (node) {
+#include "node_name.inc"
+      default:
+	rb_bug("unknown node (%d)", node);
+	return 0;
+    }
+}
+
+#define DECL_SYMBOL(name) \
+  static VALUE sym_##name
+
+#define INIT_SYMBOL(name) \
+  sym_##name = ID2SYM(rb_intern(#name))
+
+static VALUE
+register_label(struct st_table *table, unsigned long idx)
+{
+    VALUE sym;
+    char buff[8 + (sizeof(idx) * CHAR_BIT * 32 / 100)];
+
+    snprintf(buff, sizeof(buff), "label_%lu", idx);
+    sym = ID2SYM(rb_intern(buff));
+    st_insert(table, idx, sym);
+    return sym;
+}
+
+static VALUE
+exception_type2symbol(VALUE type)
+{
+    ID id;
+    switch(type) {
+      case CATCH_TYPE_RESCUE: CONST_ID(id, "rescue"); break;
+      case CATCH_TYPE_ENSURE: CONST_ID(id, "ensure"); break;
+      case CATCH_TYPE_RETRY:  CONST_ID(id, "retry");  break;
+      case CATCH_TYPE_BREAK:  CONST_ID(id, "break");  break;
+      case CATCH_TYPE_REDO:   CONST_ID(id, "redo");   break;
+      case CATCH_TYPE_NEXT:   CONST_ID(id, "next");   break;
+      default:
+	rb_bug("...");
+    }
+    return ID2SYM(id);
+}
+
+static int
+cdhash_each(VALUE key, VALUE value, VALUE ary)
+{
+    rb_ary_push(ary, obj_resurrect(key));
+    rb_ary_push(ary, value);
+    return ST_CONTINUE;
+}
+
+static VALUE
+iseq_data_to_ary(rb_iseq_t *iseq)
+{
+    long i, pos;
+    int line = 0;
+    VALUE *seq;
+
+    VALUE val = rb_ary_new();
+    VALUE type; /* Symbol */
+    VALUE locals = rb_ary_new();
+    VALUE args = rb_ary_new();
+    VALUE body = rb_ary_new(); /* [[:insn1, ...], ...] */
+    VALUE nbody;
+    VALUE exception = rb_ary_new(); /* [[....]] */
+    VALUE misc = rb_hash_new();
+
+    static VALUE insn_syms[VM_INSTRUCTION_SIZE];
+    struct st_table *labels_table = st_init_numtable();
+
+    DECL_SYMBOL(top);
+    DECL_SYMBOL(method);
+    DECL_SYMBOL(block);
+    DECL_SYMBOL(class);
+    DECL_SYMBOL(rescue);
+    DECL_SYMBOL(ensure);
+    DECL_SYMBOL(eval);
+    DECL_SYMBOL(main);
+    DECL_SYMBOL(defined_guard);
+
+    if (sym_top == 0) {
+	int i;
+	for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
+	    insn_syms[i] = ID2SYM(rb_intern(insn_name(i)));
+	}
+	INIT_SYMBOL(top);
+	INIT_SYMBOL(method);
+	INIT_SYMBOL(block);
+	INIT_SYMBOL(class);
+	INIT_SYMBOL(rescue);
+	INIT_SYMBOL(ensure);
+	INIT_SYMBOL(eval);
+	INIT_SYMBOL(main);
+	INIT_SYMBOL(defined_guard);
+    }
+
+    /* type */
+    switch(iseq->type) {
+      case ISEQ_TYPE_TOP:    type = sym_top;    break;
+      case ISEQ_TYPE_METHOD: type = sym_method; break;
+      case ISEQ_TYPE_BLOCK:  type = sym_block;  break;
+      case ISEQ_TYPE_CLASS:  type = sym_class;  break;
+      case ISEQ_TYPE_RESCUE: type = sym_rescue; break;
+      case ISEQ_TYPE_ENSURE: type = sym_ensure; break;
+      case ISEQ_TYPE_EVAL:   type = sym_eval;   break;
+      case ISEQ_TYPE_MAIN:   type = sym_main;   break;
+      case ISEQ_TYPE_DEFINED_GUARD: type = sym_defined_guard; break;
+      default: rb_bug("unsupported iseq type");
+    };
+
+    /* locals */
+    for (i=0; i<iseq->local_table_size; i++) {
+	ID lid = iseq->local_table[i];
+	if (lid) {
+	    if (rb_id2str(lid)) rb_ary_push(locals, ID2SYM(lid));
+	}
+	else {
+	    rb_ary_push(locals, ID2SYM(rb_intern("#arg_rest")));
+	}
+    }
+
+    /* args */
+    {
+	/*
+	 * [argc,                 # argc
+	 *  [label1, label2, ...] # opts
+	 *  rest index,
+	 *  post_len
+	 *  post_start
+	 *  block index,
+	 *  simple,
+         * ]
+	 */
+	VALUE arg_opt_labels = rb_ary_new();
+	int j;
+
+	for (j=0; j<iseq->arg_opts; j++) {
+	    rb_ary_push(arg_opt_labels,
+			register_label(labels_table, iseq->arg_opt_table[j]));
+	}
+
+	/* commit */
+	if (iseq->arg_simple == 1) {
+	    args = INT2FIX(iseq->argc);
+	}
+	else {
+	    rb_ary_push(args, INT2FIX(iseq->argc));
+	    rb_ary_push(args, arg_opt_labels);
+	    rb_ary_push(args, INT2FIX(iseq->arg_post_len));
+	    rb_ary_push(args, INT2FIX(iseq->arg_post_start));
+	    rb_ary_push(args, INT2FIX(iseq->arg_rest));
+	    rb_ary_push(args, INT2FIX(iseq->arg_block));
+	    rb_ary_push(args, INT2FIX(iseq->arg_simple));
+	}
+    }
+
+    /* body */
+    for (seq = iseq->iseq; seq < iseq->iseq + iseq->iseq_size; ) {
+	VALUE insn = *seq++;
+	int j, len = insn_len(insn);
+	VALUE *nseq = seq + len - 1;
+	VALUE ary = rb_ary_new2(len);
+
+	rb_ary_push(ary, insn_syms[insn]);
+	for (j=0; j<len-1; j++, seq++) {
+	    switch (insn_op_type(insn, j)) {
+	      case TS_OFFSET: {
+		unsigned long idx = nseq - iseq->iseq + *seq;
+		rb_ary_push(ary, register_label(labels_table, idx));
+		break;
+	      }
+	      case TS_LINDEX:
+	      case TS_DINDEX:
+	      case TS_NUM:
+		rb_ary_push(ary, INT2FIX(*seq));
+		break;
+	      case TS_VALUE:
+		rb_ary_push(ary, obj_resurrect(*seq));
+		break;
+	      case TS_ISEQ:
+		{
+		    rb_iseq_t *iseq = (rb_iseq_t *)*seq;
+		    if (iseq) {
+			VALUE val = iseq_data_to_ary(iseq);
+			rb_ary_push(ary, val);
+		    }
+		    else {
+			rb_ary_push(ary, Qnil);
+		    }
+		}
+		break;
+	      case TS_GENTRY:
+		{
+		    struct rb_global_entry *entry = (struct rb_global_entry *)*seq;
+		    rb_ary_push(ary, ID2SYM(entry->id));
+		}
+		break;
+	      case TS_IC: {
+		  struct iseq_inline_cache_entry *ic = (struct iseq_inline_cache_entry *)*seq;
+		    rb_ary_push(ary, INT2FIX(ic - iseq->ic_entries));
+	        }
+		break;
+	      case TS_ID:
+		rb_ary_push(ary, ID2SYM(*seq));
+		break;
+	      case TS_CDHASH:
+		{
+		    VALUE hash = *seq;
+		    VALUE val = rb_ary_new();
+		    int i;
+
+		    rb_hash_foreach(hash, cdhash_each, val);
+
+		    for (i=0; i<RARRAY_LEN(val); i+=2) {
+			VALUE pos = FIX2INT(rb_ary_entry(val, i+1));
+			unsigned long idx = nseq - iseq->iseq + pos;
+
+			rb_ary_store(val, i+1,
+				     register_label(labels_table, idx));
+		    }
+		    rb_ary_push(ary, val);
+		}
+		break;
+	      default:
+		rb_bug("unknown operand: %c", insn_op_type(insn, j));
+	    }
+	}
+	rb_ary_push(body, ary);
+    }
+
+    nbody = body;
+
+    /* exception */
+    for (i=0; i<iseq->catch_table_size; i++) {
+	VALUE ary = rb_ary_new();
+	struct iseq_catch_table_entry *entry = &iseq->catch_table[i];
+	rb_ary_push(ary, exception_type2symbol(entry->type));
+	if (entry->iseq) {
+	    rb_iseq_t *eiseq;
+	    GetISeqPtr(entry->iseq, eiseq);
+	    rb_ary_push(ary, iseq_data_to_ary(eiseq));
+	}
+	else {
+	    rb_ary_push(ary, Qnil);
+	}
+	rb_ary_push(ary, register_label(labels_table, entry->start));
+	rb_ary_push(ary, register_label(labels_table, entry->end));
+	rb_ary_push(ary, register_label(labels_table, entry->cont));
+	rb_ary_push(ary, INT2FIX(entry->sp));
+	rb_ary_push(exception, ary);
+    }
+
+    /* make body with labels and insert line number */
+    body = rb_ary_new();
+
+    for (i=0, pos=0; i<RARRAY_LEN(nbody); i++) {
+	VALUE ary = RARRAY_PTR(nbody)[i];
+	VALUE label;
+
+	if (st_lookup(labels_table, pos, &label)) {
+	    rb_ary_push(body, label);
+	}
+
+	if (iseq->insn_info_table[i].line_no != line) {
+	    line = iseq->insn_info_table[i].line_no;
+	    rb_ary_push(body, INT2FIX(line));
+	}
+
+	rb_ary_push(body, ary);
+	pos += RARRAY_LEN(ary);
+    }
+
+    st_free_table(labels_table);
+
+    rb_hash_aset(misc, ID2SYM(rb_intern("arg_size")), INT2FIX(iseq->arg_size));
+    rb_hash_aset(misc, ID2SYM(rb_intern("local_size")), INT2FIX(iseq->local_size));
+    rb_hash_aset(misc, ID2SYM(rb_intern("stack_max")), INT2FIX(iseq->stack_max));
+
+    /*
+     * [:magic, :major_version, :minor_version, :format_type, :misc,
+     *  :name, :filename, :filepath, :line_no, :type, :locals, :args,
+     *  :catch_table, :bytecode]
+     */
+    rb_ary_push(val, rb_str_new2("YARVInstructionSequence/SimpleDataFormat"));
+    rb_ary_push(val, INT2FIX(1)); /* major */
+    rb_ary_push(val, INT2FIX(2)); /* minor */
+    rb_ary_push(val, INT2FIX(1));
+    rb_ary_push(val, misc);
+    rb_ary_push(val, iseq->name);
+    rb_ary_push(val, iseq->filename);
+    rb_ary_push(val, iseq->filepath);
+    rb_ary_push(val, iseq->line_no);
+    rb_ary_push(val, type);
+    rb_ary_push(val, locals);
+    rb_ary_push(val, args);
+    rb_ary_push(val, exception);
+    rb_ary_push(val, body);
+    return val;
+}
+
+VALUE
+rb_iseq_clone(VALUE iseqval, VALUE newcbase)
+{
+    VALUE newiseq = iseq_alloc(rb_cISeq);
+    rb_iseq_t *iseq0, *iseq1;
+
+    GetISeqPtr(iseqval, iseq0);
+    GetISeqPtr(newiseq, iseq1);
+
+    *iseq1 = *iseq0;
+    iseq1->self = newiseq;
+    if (!iseq1->orig) {
+	iseq1->orig = iseqval;
+    }
+    if (iseq0->local_iseq == iseq0) {
+	iseq1->local_iseq = iseq1;
+    }
+    if (newcbase) {
+	iseq1->cref_stack = NEW_BLOCK(newcbase);
+	if (iseq0->cref_stack->nd_next) {
+	    iseq1->cref_stack->nd_next = iseq0->cref_stack->nd_next;
+	}
+	iseq1->klass = newcbase;
+    }
+
+    return newiseq;
+}
+
+VALUE
+rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
+{
+    int i, r, s;
+    VALUE a, args = rb_ary_new2(iseq->arg_size);
+    ID req, opt, rest, block;
+#define PARAM_TYPE(type) rb_ary_push(a = rb_ary_new2(2), ID2SYM(type))
+#define PARAM_ID(i) iseq->local_table[i]
+#define PARAM(i, type) (		      \
+	PARAM_TYPE(type),		      \
+	rb_id2name(PARAM_ID(i)) ?	      \
+	rb_ary_push(a, ID2SYM(PARAM_ID(i))) : \
+	a)
+
+    CONST_ID(req, "req");
+    CONST_ID(opt, "opt");
+    if (is_proc) {
+	for (i = 0; i < iseq->argc; i++) {
+	    PARAM_TYPE(opt);
+	    rb_ary_push(a, rb_id2name(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
+	    rb_ary_push(args, a);
+	}
+    }
+    else {
+	for (i = 0; i < iseq->argc; i++) {
+	    rb_ary_push(args, PARAM(i, req));
+	}
+    }
+    r = iseq->arg_rest != -1 ? iseq->arg_rest :
+	iseq->arg_post_len > 0 ? iseq->arg_post_start :
+	iseq->arg_block != -1 ? iseq->arg_block :
+	iseq->arg_size;
+    for (s = i; i < r; i++) {
+	PARAM_TYPE(opt);
+	if (rb_id2name(PARAM_ID(i))) {
+	    rb_ary_push(a, ID2SYM(PARAM_ID(i)));
+	}
+	rb_ary_push(args, a);
+    }
+    if (iseq->arg_rest != -1) {
+	CONST_ID(rest, "rest");
+	rb_ary_push(args, PARAM(iseq->arg_rest, rest));
+    }
+    r = iseq->arg_post_start + iseq->arg_post_len;
+    if (is_proc) {
+	for (i = iseq->arg_post_start; i < r; i++) {
+	    PARAM_TYPE(opt);
+	    rb_ary_push(a, rb_id2name(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
+	    rb_ary_push(args, a);
+	}
+    }
+    else {
+	for (i = iseq->arg_post_start; i < r; i++) {
+	    rb_ary_push(args, PARAM(i, req));
+	}
+    }
+    if (iseq->arg_block != -1) {
+	CONST_ID(block, "block");
+	rb_ary_push(args, PARAM(iseq->arg_block, block));
+    }
+    return args;
+}
+
+/* ruby2cext */
+
+VALUE
+rb_iseq_build_for_ruby2cext(
+    const rb_iseq_t *iseq_template,
+    const rb_insn_func_t *func,
+    const struct iseq_insn_info_entry *insn_info_table,
+    const char **local_table,
+    const VALUE *arg_opt_table,
+    const struct iseq_catch_table_entry *catch_table,
+    const char *name,
+    const char *filename,
+    const unsigned short line_no)
+{
+    unsigned long i;
+    VALUE iseqval = iseq_alloc(rb_cISeq);
+    rb_iseq_t *iseq;
+    GetISeqPtr(iseqval, iseq);
+
+    /* copy iseq */
+    *iseq = *iseq_template;
+    iseq->name = rb_str_new2(name);
+    iseq->filename = rb_str_new2(filename);
+    iseq->line_no = line_no;
+    iseq->mark_ary = rb_ary_tmp_new(3);
+    OBJ_UNTRUST(iseq->mark_ary);
+    iseq->self = iseqval;
+
+    iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size);
+
+    for (i=0; i<iseq->iseq_size; i+=2) {
+	iseq->iseq[i] = BIN(opt_call_c_function);
+	iseq->iseq[i+1] = (VALUE)func;
+    }
+
+    rb_iseq_translate_threaded_code(iseq);
+
+#define ALLOC_AND_COPY(dst, src, type, size) do { \
+  if (size) { \
+      (dst) = ALLOC_N(type, (size)); \
+      MEMCPY((dst), (src), type, (size)); \
+  } \
+} while (0)
+
+    ALLOC_AND_COPY(iseq->insn_info_table, insn_info_table,
+		   struct iseq_insn_info_entry, iseq->insn_info_size);
+
+    ALLOC_AND_COPY(iseq->catch_table, catch_table,
+		   struct iseq_catch_table_entry, iseq->catch_table_size);
+
+    ALLOC_AND_COPY(iseq->arg_opt_table, arg_opt_table,
+		   VALUE, iseq->arg_opts);
+
+    set_relation(iseq, 0);
+
+    return iseqval;
+}
+
+void
+Init_ISeq(void)
+{
+    /* declare ::VM::InstructionSequence */
+    rb_cISeq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", rb_cObject);
+    rb_define_alloc_func(rb_cISeq, iseq_alloc);
+    rb_define_method(rb_cISeq, "inspect", iseq_inspect, 0);
+    rb_define_method(rb_cISeq, "disasm", rb_iseq_disasm, 0);
+    rb_define_method(rb_cISeq, "disassemble", rb_iseq_disasm, 0);
+    rb_define_method(rb_cISeq, "to_a", iseq_to_a, 0);
+    rb_define_method(rb_cISeq, "eval", iseq_eval, 0);
+
+    /* disable this feature because there is no verifier. */
+    /* rb_define_singleton_method(rb_cISeq, "load", iseq_s_load, -1); */
+    (void)iseq_s_load;
+
+    rb_define_singleton_method(rb_cISeq, "compile", iseq_s_compile, -1);
+    rb_define_singleton_method(rb_cISeq, "new", iseq_s_compile, -1);
+    rb_define_singleton_method(rb_cISeq, "compile_file", iseq_s_compile_file, -1);
+    rb_define_singleton_method(rb_cISeq, "compile_option", iseq_s_compile_option_get, 0);
+    rb_define_singleton_method(rb_cISeq, "compile_option=", iseq_s_compile_option_set, 1);
+    rb_define_singleton_method(rb_cISeq, "disasm", iseq_s_disasm, 1);
+    rb_define_singleton_method(rb_cISeq, "disassemble", iseq_s_disasm, 1);
+}
+
diff --git a/iseq.h b/iseq.h
new file mode 100644
index 0000000000..d09cdd5414
--- /dev/null
+++ b/iseq.h
@@ -0,0 +1,104 @@
+/**********************************************************************
+
+  iseq.h -
+
+  $Author$
+  created at: 04/01/01 23:36:57 JST
+
+  Copyright (C) 2004-2008 Koichi Sasada
+
+**********************************************************************/
+
+#ifndef RUBY_COMPILE_H
+#define RUBY_COMPILE_H
+
+/* compile.c */
+VALUE rb_iseq_compile_node(VALUE self, NODE *node);
+int rb_iseq_translate_threaded_code(rb_iseq_t *iseq);
+VALUE rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
+			     VALUE exception, VALUE body);
+
+/* iseq.c */
+VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
+struct st_table *ruby_insn_make_insn_table(void);
+
+#define ISEQ_TYPE_TOP    INT2FIX(1)
+#define ISEQ_TYPE_METHOD INT2FIX(2)
+#define ISEQ_TYPE_BLOCK  INT2FIX(3)
+#define ISEQ_TYPE_CLASS  INT2FIX(4)
+#define ISEQ_TYPE_RESCUE INT2FIX(5)
+#define ISEQ_TYPE_ENSURE INT2FIX(6)
+#define ISEQ_TYPE_EVAL   INT2FIX(7)
+#define ISEQ_TYPE_MAIN   INT2FIX(8)
+#define ISEQ_TYPE_DEFINED_GUARD INT2FIX(9)
+
+#define CATCH_TYPE_RESCUE ((int)INT2FIX(1))
+#define CATCH_TYPE_ENSURE ((int)INT2FIX(2))
+#define CATCH_TYPE_RETRY  ((int)INT2FIX(3))
+#define CATCH_TYPE_BREAK  ((int)INT2FIX(4))
+#define CATCH_TYPE_REDO   ((int)INT2FIX(5))
+#define CATCH_TYPE_NEXT   ((int)INT2FIX(6))
+
+struct iseq_insn_info_entry {
+    unsigned short position;
+    unsigned short line_no;
+    unsigned short sp;
+};
+
+struct iseq_catch_table_entry {
+    VALUE type;
+    VALUE iseq;
+    unsigned long start;
+    unsigned long end;
+    unsigned long cont;
+    unsigned long sp;
+};
+
+#define INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE (512)
+
+struct iseq_compile_data_storage {
+    struct iseq_compile_data_storage *next;
+    unsigned long pos;
+    unsigned long size;
+    char *buff;
+};
+
+struct iseq_compile_data {
+    /* GC is needed */
+    VALUE err_info;
+    VALUE mark_ary;
+    VALUE catch_table_ary;	/* Array */
+
+    /* GC is not needed */
+    struct iseq_label_data *start_label;
+    struct iseq_label_data *end_label;
+    struct iseq_label_data *redo_label;
+    VALUE current_block;
+    VALUE ensure_node;
+    VALUE for_iseq;
+    struct iseq_compile_data_ensure_node_stack *ensure_node_stack;
+    int loopval_popped;	/* used by NODE_BREAK */
+    int cached_const;
+    struct iseq_compile_data_storage *storage_head;
+    struct iseq_compile_data_storage *storage_current;
+    int last_line;
+    int last_coverable_line;
+    int flip_cnt;
+    int label_no;
+    int node_level;
+    const rb_compile_option_t *option;
+};
+
+/* defined? */
+#define DEFINED_IVAR   INT2FIX(1)
+#define DEFINED_IVAR2  INT2FIX(2)
+#define DEFINED_GVAR   INT2FIX(3)
+#define DEFINED_CVAR   INT2FIX(4)
+#define DEFINED_CONST  INT2FIX(5)
+#define DEFINED_METHOD INT2FIX(6)
+#define DEFINED_YIELD  INT2FIX(7)
+#define DEFINED_REF    INT2FIX(8)
+#define DEFINED_ZSUPER INT2FIX(9)
+#define DEFINED_FUNC   INT2FIX(10)
+
+#endif /* RUBY_COMPILE_H */
diff --git a/keywords b/keywords
deleted file mode 100644
index 04be992857..0000000000
--- a/keywords
+++ /dev/null
@@ -1,42 +0,0 @@
-struct kwtable {char *name; int id[2]; enum lex_state state;};
-%%
-__LINE__, {k__LINE__, k__LINE__}, EXPR_END
-__FILE__, {k__FILE__, k__FILE__}, EXPR_END
-BEGIN, {klBEGIN, klBEGIN}, EXPR_END
-END, {klEND, klEND}, EXPR_END
-alias, {kALIAS, kALIAS}, EXPR_FNAME
-and, {kAND, kAND}, EXPR_BEG
-begin, {kBEGIN, kBEGIN}, EXPR_BEG
-break, {kBREAK, kBREAK}, EXPR_MID
-case, {kCASE, kCASE}, EXPR_BEG
-class, {kCLASS, kCLASS}, EXPR_CLASS
-def, {kDEF, kDEF}, EXPR_FNAME
-defined?, {kDEFINED, kDEFINED}, EXPR_ARG
-do, {kDO, kDO}, EXPR_BEG
-else, {kELSE, kELSE}, EXPR_BEG
-elsif, {kELSIF, kELSIF}, EXPR_BEG
-end, {kEND, kEND}, EXPR_END
-ensure, {kENSURE, kENSURE}, EXPR_BEG
-false, {kFALSE, kFALSE}, EXPR_END
-for, {kFOR, kFOR}, EXPR_BEG
-if, {kIF, kIF_MOD}, EXPR_BEG
-in, {kIN, kIN}, EXPR_BEG
-module, {kMODULE, kMODULE}, EXPR_BEG
-next, {kNEXT, kNEXT}, EXPR_MID
-nil, {kNIL, kNIL}, EXPR_END
-not, {kNOT, kNOT}, EXPR_BEG
-or, {kOR, kOR}, EXPR_BEG
-redo, {kREDO, kREDO}, EXPR_END
-rescue, {kRESCUE, kRESCUE_MOD}, EXPR_MID
-retry, {kRETRY, kRETRY}, EXPR_END
-return, {kRETURN, kRETURN}, EXPR_MID
-self, {kSELF, kSELF}, EXPR_END
-super, {kSUPER, kSUPER}, EXPR_ARG
-then, {kTHEN, kTHEN}, EXPR_BEG
-true, {kTRUE, kTRUE}, EXPR_END
-undef, {kUNDEF, kUNDEF}, EXPR_FNAME
-unless, {kUNLESS, kUNLESS_MOD}, EXPR_BEG
-until, {kUNTIL, kUNTIL_MOD}, EXPR_BEG
-when, {kWHEN, kWHEN}, EXPR_BEG
-while, {kWHILE, kWHILE_MOD}, EXPR_BEG
-yield, {kYIELD, kYIELD}, EXPR_ARG
diff --git a/lex.c b/lex.c
deleted file mode 100644
index 79d9448dae..0000000000
--- a/lex.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' ./keywords  */
-struct kwtable {char *name; int id[2]; enum lex_state state;};
-
-#define TOTAL_KEYWORDS 40
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 8
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 55
-/* maximum key range = 50, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static unsigned char asso_values[] =
-    {
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 11, 56, 56, 36, 56,  1, 37,
-      31,  1, 56, 56, 56, 56, 29, 56,  1, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56,  1, 56, 32,  1,  2,
-       1,  1,  4, 23, 56, 17, 56, 20,  9,  2,
-       9, 26, 14, 56,  5,  1,  1, 16, 56, 21,
-      20,  9, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-      56, 56, 56, 56, 56, 56
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-      case 3:
-        hval += asso_values[(unsigned char)str[2]];
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-struct kwtable *
-rb_reserved_word (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static struct kwtable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""},
-      {"end", {kEND, kEND}, EXPR_END},
-      {"else", {kELSE, kELSE}, EXPR_BEG},
-      {"case", {kCASE, kCASE}, EXPR_BEG},
-      {"ensure", {kENSURE, kENSURE}, EXPR_BEG},
-      {"module", {kMODULE, kMODULE}, EXPR_BEG},
-      {"elsif", {kELSIF, kELSIF}, EXPR_BEG},
-      {"def", {kDEF, kDEF}, EXPR_FNAME},
-      {"rescue", {kRESCUE, kRESCUE_MOD}, EXPR_MID},
-      {"not", {kNOT, kNOT}, EXPR_BEG},
-      {"then", {kTHEN, kTHEN}, EXPR_BEG},
-      {"yield", {kYIELD, kYIELD}, EXPR_ARG},
-      {"for", {kFOR, kFOR}, EXPR_BEG},
-      {"self", {kSELF, kSELF}, EXPR_END},
-      {"false", {kFALSE, kFALSE}, EXPR_END},
-      {"retry", {kRETRY, kRETRY}, EXPR_END},
-      {"return", {kRETURN, kRETURN}, EXPR_MID},
-      {"true", {kTRUE, kTRUE}, EXPR_END},
-      {"if", {kIF, kIF_MOD}, EXPR_BEG},
-      {"defined?", {kDEFINED, kDEFINED}, EXPR_ARG},
-      {"super", {kSUPER, kSUPER}, EXPR_ARG},
-      {"undef", {kUNDEF, kUNDEF}, EXPR_FNAME},
-      {"break", {kBREAK, kBREAK}, EXPR_MID},
-      {"in", {kIN, kIN}, EXPR_BEG},
-      {"do", {kDO, kDO}, EXPR_BEG},
-      {"nil", {kNIL, kNIL}, EXPR_END},
-      {"until", {kUNTIL, kUNTIL_MOD}, EXPR_BEG},
-      {"unless", {kUNLESS, kUNLESS_MOD}, EXPR_BEG},
-      {"or", {kOR, kOR}, EXPR_BEG},
-      {"next", {kNEXT, kNEXT}, EXPR_MID},
-      {"when", {kWHEN, kWHEN}, EXPR_BEG},
-      {"redo", {kREDO, kREDO}, EXPR_END},
-      {"and", {kAND, kAND}, EXPR_BEG},
-      {"begin", {kBEGIN, kBEGIN}, EXPR_BEG},
-      {"__LINE__", {k__LINE__, k__LINE__}, EXPR_END},
-      {"class", {kCLASS, kCLASS}, EXPR_CLASS},
-      {"__FILE__", {k__FILE__, k__FILE__}, EXPR_END},
-      {"END", {klEND, klEND}, EXPR_END},
-      {"BEGIN", {klBEGIN, klBEGIN}, EXPR_END},
-      {"while", {kWHILE, kWHILE_MOD}, EXPR_BEG},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""},
-      {"alias", {kALIAS, kALIAS}, EXPR_FNAME}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
diff --git a/lex.c.blt b/lex.c.blt
new file mode 100644
index 0000000000..1ae80990b9
--- /dev/null
+++ b/lex.c.blt
@@ -0,0 +1,219 @@
+/* C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' defs/keywords  */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "defs/keywords"
+
+struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word(const char *, unsigned int);
+#ifndef RIPPER
+static const struct kwtable *reserved_word(const char *, unsigned int);
+#define rb_reserved_word(str, len) reserved_word(str, len)
+#line 9 "defs/keywords"
+struct kwtable;
+
+#define TOTAL_KEYWORDS 41
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 12
+#define MIN_HASH_VALUE 8
+#define MAX_HASH_VALUE 50
+/* maximum key range = 43, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const unsigned char asso_values[] =
+    {
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 26, 51, 51, 14, 51, 16,  8,
+      11, 13, 51, 51, 51, 51, 10, 51, 13, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 11, 51, 13,  1, 26,
+       4,  1,  8, 28, 51, 23, 51,  1,  1, 27,
+       5, 19, 21, 51,  8,  3,  3, 11, 51, 21,
+      24, 16, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval + asso_values[(unsigned char)str[len - 1]];
+}
+
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct kwtable *
+rb_reserved_word (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const struct kwtable wordlist[] =
+    {
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 19 "defs/keywords"
+      {"break", {keyword_break, keyword_break}, EXPR_MID},
+#line 25 "defs/keywords"
+      {"else", {keyword_else, keyword_else}, EXPR_BEG},
+#line 35 "defs/keywords"
+      {"nil", {keyword_nil, keyword_nil}, EXPR_END},
+#line 28 "defs/keywords"
+      {"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
+#line 27 "defs/keywords"
+      {"end", {keyword_end, keyword_end}, EXPR_END},
+#line 44 "defs/keywords"
+      {"then", {keyword_then, keyword_then}, EXPR_BEG},
+#line 36 "defs/keywords"
+      {"not", {keyword_not, keyword_not}, EXPR_ARG},
+#line 29 "defs/keywords"
+      {"false", {keyword_false, keyword_false}, EXPR_END},
+#line 42 "defs/keywords"
+      {"self", {keyword_self, keyword_self}, EXPR_END},
+#line 26 "defs/keywords"
+      {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
+#line 39 "defs/keywords"
+      {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
+#line 45 "defs/keywords"
+      {"true", {keyword_true, keyword_true}, EXPR_END},
+#line 48 "defs/keywords"
+      {"until", {keyword_until, modifier_until}, EXPR_VALUE},
+#line 47 "defs/keywords"
+      {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
+#line 41 "defs/keywords"
+      {"return", {keyword_return, keyword_return}, EXPR_MID},
+#line 22 "defs/keywords"
+      {"def", {keyword_def, keyword_def}, EXPR_FNAME},
+#line 17 "defs/keywords"
+      {"and", {keyword_and, keyword_and}, EXPR_VALUE},
+#line 24 "defs/keywords"
+      {"do", {keyword_do, keyword_do}, EXPR_BEG},
+#line 51 "defs/keywords"
+      {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
+#line 30 "defs/keywords"
+      {"for", {keyword_for, keyword_for}, EXPR_VALUE},
+#line 46 "defs/keywords"
+      {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
+#line 37 "defs/keywords"
+      {"or", {keyword_or, keyword_or}, EXPR_VALUE},
+#line 32 "defs/keywords"
+      {"in", {keyword_in, keyword_in}, EXPR_VALUE},
+#line 49 "defs/keywords"
+      {"when", {keyword_when, keyword_when}, EXPR_VALUE},
+#line 40 "defs/keywords"
+      {"retry", {keyword_retry, keyword_retry}, EXPR_END},
+#line 31 "defs/keywords"
+      {"if", {keyword_if, modifier_if}, EXPR_VALUE},
+#line 20 "defs/keywords"
+      {"case", {keyword_case, keyword_case}, EXPR_VALUE},
+#line 38 "defs/keywords"
+      {"redo", {keyword_redo, keyword_redo}, EXPR_END},
+#line 34 "defs/keywords"
+      {"next", {keyword_next, keyword_next}, EXPR_MID},
+#line 43 "defs/keywords"
+      {"super", {keyword_super, keyword_super}, EXPR_ARG},
+#line 33 "defs/keywords"
+      {"module", {keyword_module, keyword_module}, EXPR_VALUE},
+#line 18 "defs/keywords"
+      {"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
+#line 12 "defs/keywords"
+      {"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
+#line 13 "defs/keywords"
+      {"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
+#line 11 "defs/keywords"
+      {"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
+#line 15 "defs/keywords"
+      {"END", {keyword_END, keyword_END}, EXPR_END},
+#line 16 "defs/keywords"
+      {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
+#line 14 "defs/keywords"
+      {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
+#line 23 "defs/keywords"
+      {"defined?", {keyword_defined, keyword_defined}, EXPR_ARG},
+#line 21 "defs/keywords"
+      {"class", {keyword_class, keyword_class}, EXPR_CLASS},
+      {""}, {""},
+#line 50 "defs/keywords"
+      {"while", {keyword_while, modifier_while}, EXPR_VALUE}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].name;
+
+          if (*str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
+#line 52 "defs/keywords"
+
+#endif
diff --git a/lib/.document b/lib/.document
index 2159be8360..d3c4a1369b 100644
--- a/lib/.document
+++ b/lib/.document
@@ -14,7 +14,6 @@ base64.rb
 benchmark.rb
 cgi
 cgi.rb
-cgi-lib.rb
 complex.rb
 csv.rb
 date
@@ -24,7 +23,6 @@ debug.rb
 delegate.rb
 drb
 drb.rb
-e2mmap.rb
 erb.rb
 eregex.rb
 fileutils.rb
@@ -61,11 +59,13 @@ pathname.rb
 ping.rb
 pp.rb
 prettyprint.rb
+prime.rb
 profile.rb
 profiler.rb
 pstore.rb
 racc
 rational.rb
+rdoc.rb
 rdoc
 readbytes.rb
 resolv-replace.rb
@@ -81,7 +81,8 @@ set.rb
 shell
 shell.rb
 shellwords.rb
-singleton.rb
+# TODO: YARV cause error. why ...?
+# singleton.rb
 soap
 sync.rb
 tempfile.rb
diff --git a/lib/English.rb b/lib/English.rb
index 1a0e11de74..4fd53c5ec6 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -11,7 +11,7 @@
 #  With English:
 #
 #      require "English"
-#      
+#
 #      $OUTPUT_FIELD_SEPARATOR = ' -- '
 #      "waterbuffalo" =~ /buff/
 #      print $LOADED_FEATURES, $POSTMATCH, $PID, "\n"
@@ -83,7 +83,7 @@ alias $DEFAULT_OUTPUT          $>
 # of the contents of all the files
 # given as command-line arguments, or <tt>$stdin</tt>
 # (in the case where there are no
-# arguments). <tt>$<</tt> supports methods similar to a 
+# arguments). <tt>$<</tt> supports methods similar to a
 # +File+ object:
 # +inmode+, +close+,
 # <tt>closed?</tt>, +each+,
@@ -91,7 +91,7 @@ alias $DEFAULT_OUTPUT          $>
 # +eof+, <tt>eof?</tt>, +file+,
 # +filename+, +fileno+,
 # +getc+, +gets+, +lineno+,
-# <tt>lineno=</tt>, +path+, 
+# <tt>lineno=</tt>, +path+,
 # +pos+, <tt>pos=</tt>,
 # +read+, +readchar+,
 # +readline+, +readlines+,
@@ -139,12 +139,12 @@ alias $ARGV                    $*
 alias $MATCH                   $&
 
 # The string preceding the match in the last
-# successful pattern match. This variable is local to 
+# successful pattern match. This variable is local to
 # the current scope. Read only. Thread local.
 alias $PREMATCH                $`
 
 # The string following the match in the last
-# successful pattern match. This variable is local to 
+# successful pattern match. This variable is local to
 # the current scope. Read only. Thread local.
 alias $POSTMATCH               $'
 
diff --git a/lib/Env.rb b/lib/Env.rb
deleted file mode 100644
index 452a28659e..0000000000
--- a/lib/Env.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Env.rb -- imports environment variables as global variables, Perlish ;(
-# Usage:
-#
-#  require 'Env'
-#  p $USER
-#  $USER = "matz"
-#  p ENV["USER"]
-
-require 'importenv'
-
-if __FILE__ == $0
-  p $TERM
-  $TERM = nil
-  p $TERM
-  p ENV["TERM"]
-  $TERM = "foo"
-  p ENV["TERM"]
-end
diff --git a/lib/README b/lib/README
index d60c5cb1e9..a8bb9c8d3d 100644
--- a/lib/README
+++ b/lib/README
@@ -1,43 +1,38 @@
 English.rb	lets Perl'ish global variables have English names
-Env.rb		loads importenv.rb
 README		this file
-base64.rb	encodes/decodes base64 (obsolete)
+abbrev.rb	abbreviation calculator
+base64.rb	Base64 de- and encoder
 benchmark.rb	a benchmark utility
-cgi-lib.rb	simple CGI support library (old style)
 cgi.rb		CGI support library
 cgi/session.rb	CGI session class
-complex.rb	complex number support
+cmath.rb	math support for complex numbers
+complex.rb	includes cmath and set complex arithemtic as default (obsolete)
 csv.rb		CSV parser/generator
 date.rb		date object
 date/format.rb	date parsing and formatting
-date2.rb	date object (obsolete; use date)
 debug.rb	ruby debugger
 delegate.rb	delegates messages to other object
 drb.rb		distributed Ruby
 e2mmap.rb	exception utilities
 erb.rb		tiny eRuby library
-eregex.rb	extended regular expression (just a proof of concept)
 fileutils.rb	file utilities
-finalize.rb	adds finalizer to the object
 find.rb		traverses directory tree
 forwardable.rb	explicit delegation library
-ftools.rb	file tools
+gauntlet_rubygems.rb 	Gem package validator
 getoptlong.rb	GNU getoptlong compatible
-getopts.rb	parses command line options (use getoptlong)
 gserver.rb	general TCP server
-importenv.rb	imports environment variables as global variables
 ipaddr.rb	defines the IPAddr class
 irb.rb		interactive ruby
-jcode.rb	Japanese text handling (replace String methods)
 logger.rb	simple logging utility
-mailread.rb	reads mail headers
-mathn.rb	extended math operation
+mathn.rb	extended math operation (obsolete)
 matrix.rb	matrix calculation library
+minitest/unit	minimal drop-in replacement for test-unit	
 mkmf.rb		Makefile maker
 monitor.rb	exclusive region monitor for thread
 mutex_m.rb	mutex mixin
 net/ftp.rb	ftp access
 net/http.rb	HTTP access
+net/https.rb	HTTPS access
 net/imap.rb	IMAP4 access
 net/pop.rb	POP3 access
 net/protocol.rb	abstract class for net library (DO NOT USE)
@@ -48,29 +43,31 @@ open-uri.rb	easy-to-use network interface using URI and Net
 open3.rb	opens subprocess connection stdin/stdout/stderr
 optparse.rb	command line option analysis
 ostruct.rb	python style object
-parsearg.rb	argument parser using getopts
-parsedate.rb	parses date string
 pathname.rb	Object-Oriented Pathname Class
-ping.rb		checks whether host is up, using TCP echo.
 pp.rb		pretty print objects
 prettyprint.rb	pretty printing algorithm
+prime.rb        prime numbers and factorization
 profile.rb	runs ruby profiler
 profiler.rb	ruby profiler module
 pstore.rb	persistent object strage using marshal
 racc/parser.rb	racc (Ruby yACC) runtime
-rational.rb	rational number support
-rdoc            source-code documentation tool
-readbytes.rb	define IO#readbytes
+rake.rb		Ruby Make
+rational.rb	rational number support (obsolete)
+rdoc		source-code documentation tool
 resolv-replace.rb	replace Socket DNS by resolve.rb
 resolv.rb	DNS resolver in Ruby
 rexml		an XML parser for Ruby, in Ruby
-rubyunit.rb	original Ruby Unit testing framework
+rinda/rinda.rb	Linda distributed computing paradigm for drb
+rinda/ring.rb	RingServer for tuplespace
+rinda/tuplespace.rb	tuplespace for drb
+rss.rb		RSS parser/generator
+rubygems	Ruby package management system
 scanf.rb	scanf for Ruby
+securerandom.rb	Secure random number generator interface
 set.rb		defines the Set class
 shell.rb	runs commands and does pipeline operations like shell
 shellwords.rb	split into words like shell
 singleton.rb	singleton design pattern library
-soap		SOAP 1.1 implementation
 sync.rb		2 phase lock
 tempfile.rb	temporary file with automatic removal
 test/unit	Ruby Unit Testing Framework
@@ -81,16 +78,16 @@ timeout.rb	provides timeout
 tmpdir.rb	retrieve temporary directory path
 tracer.rb	execution tracer
 tsort.rb	topological sorting
+ubygems.rb	command line shortcut for RubyGems
 un.rb		Utilities to replace common UNIX commands in Makefiles etc
 uri.rb		URI support
 uri/ftp.rb	ftp scheme support
 uri/http.rb	http scheme support
 uri/https.rb	https scheme support
 uri/ldap.rb	ldap scheme support
+uri/ldaps.rb	ldaps scheme support
 uri/mailto.rb	mailto scheme support
 weakref.rb	weak reference class
 webrick.rb	WEB server toolkit
-wsdl		WSDL 1.1 implementation
 xmlrpc		XML-RPC implementation
-xsd		XML Schema Datatypes implementation
 yaml.rb		YAML implementation
diff --git a/lib/base64.rb b/lib/base64.rb
index 8628d611b2..a240b730b4 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -1,46 +1,46 @@
 #
-# = base64.rb: methods for base64-encoding and -decoding stings
-#
-# Author:: Yukihiro Matsumoto 
-# Documentation:: Dave Thomas and Gavin Sinclair
-#
-# Until Ruby 1.8.1, these methods were defined at the top-level.  Now
-# they are in the Base64 module but included in the top-level, where
-# their usage is deprecated.
-#
-# See Base64 for documentation.
+# = base64.rb: methods for base64-encoding and -decoding strings
 #
 
-require "kconv"
-
-
-# The Base64 module provides for the encoding (#encode64) and decoding
-# (#decode64) of binary data using a Base64 representation.
-# 
-# The following particular features are also provided:
-# - encode into lines of a given length (#b64encode)
-# - decode the special format specified in RFC2047 for the
-#   representation of email headers (decode_b)
+# The Base64 module provides for the encoding (#encode64, #strict_encode64,
+# #urlsafe_encode64) and decoding (#decode64, #strict_decode64,
+# #urlsafe_decode64) of binary data using a Base64 representation.
 #
 # == Example
 #
-# A simple encoding and decoding. 
-# 
+# A simple encoding and decoding.
+#
 #     require "base64"
 #
 #     enc   = Base64.encode64('Send reinforcements')
-#                         # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n" 
+#                         # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n"
 #     plain = Base64.decode64(enc)
 #                         # -> "Send reinforcements"
 #
 # The purpose of using base64 to encode data is that it translates any
-# binary data into purely printable characters.  It is specified in
-# RFC 2045 (http://www.faqs.org/rfcs/rfc2045.html).
+# binary data into purely printable characters.
 
 module Base64
   module_function
 
+  # Returns the Base64-encoded version of +bin+.
+  # This method complies with RFC 2045.
+  # Line feeds are added to every 60 encoded charactors.
+  #
+  #    require 'base64'
+  #    Base64.encode64("Now is the time for all good coders\nto learn Ruby")
+  #
+  # <i>Generates:</i>
+  #
+  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
+  #    UnVieQ==
+  def encode64(bin)
+    [bin].pack("m")
+  end
+
   # Returns the Base64-decoded version of +str+.
+  # This method complies with RFC 2045.
+  # Characters outside the base alphabet are ignored.
   #
   #   require 'base64'
   #   str = 'VGhpcyBpcyBsaW5lIG9uZQpUaGlzIG' +
@@ -54,80 +54,38 @@ module Base64
   #    This is line two
   #    This is line three
   #    And so on...
-
   def decode64(str)
-    str.unpack("m")[0]
+    str.unpack("m").first
   end
 
-
-  # Decodes text formatted using a subset of RFC2047 (the one used for
-  # mime-encoding mail headers).
-  #
-  # Only supports an encoding type of 'b' (base 64), and only supports
-  # the character sets ISO-2022-JP and SHIFT_JIS (so the only two
-  # encoded word sequences recognized are <tt>=?ISO-2022-JP?B?...=</tt> and
-  # <tt>=?SHIFT_JIS?B?...=</tt>).  Recognition of these sequences is case
-  # insensitive.
-
-  def decode_b(str)
-    str.gsub!(/=\?ISO-2022-JP\?B\?([!->@-~]+)\?=/i) {
-      decode64($1)
-    }
-    str = Kconv::toeuc(str)
-    str.gsub!(/=\?SHIFT_JIS\?B\?([!->@-~]+)\?=/i) {
-      decode64($1)
-    }
-    str = Kconv::toeuc(str)
-    str.gsub!(/\n/, ' ') 
-    str.gsub!(/\0/, '')
-    str
+  # Returns the Base64-encoded version of +bin+.
+  # This method complies with RFC 4648.
+  # No line feeds are added.
+  def strict_encode64(bin)
+    [bin].pack("m0")
   end
 
-  # Returns the Base64-encoded version of +str+.
-  #
-  #    require 'base64'
-  #    Base64.b64encode("Now is the time for all good coders\nto learn Ruby")
-  #
-  # <i>Generates:</i>
-  #
-  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
-  #    UnVieQ==
-
-  def encode64(bin)
-    [bin].pack("m")
+  # Returns the Base64-decoded version of +str+.
+  # This method complies with RFC 4648.
+  # ArgumentError is raised if +str+ is incorrectly padded or contains
+  # non-alphabet characters.  Note that CR or LF are also rejected.
+  def strict_decode64(str)
+    str.unpack("m0").first
   end
 
-  # _Prints_ the Base64 encoded version of +bin+ (a +String+) in lines of
-  # +len+ (default 60) characters.
-  #
-  #    require 'base64'
-  #    data = "Now is the time for all good coders\nto learn Ruby" 
-  #    Base64.b64encode(data)
-  #
-  # <i>Generates:</i>
-  #
-  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
-  #    UnVieQ==
-
-  def b64encode(bin, len = 60)
-    encode64(bin).scan(/.{1,#{len}}/) do
-      print $&, "\n"
-    end
-  end 
-
-
-  module Deprecated # :nodoc:
-    include Base64
+  # Returns the Base64-encoded version of +bin+.
+  # This method complies with ``Base 64 Encoding with URL and Filename Safe
+  # Alphabet'' in RFC 4648.
+  # The alphabet uses '-' instead of '+' and '_' instead of '/'.
+  def urlsafe_encode64(bin)
+    strict_encode64(bin).tr("+/", "-_")
+  end
 
-    for m in Base64.private_instance_methods(false)
-      module_eval %{
-        def #{m}(*args)
-          warn("\#{caller(1)[0]}: #{m} is deprecated; use Base64.#{m} instead")
-          super
-        end
-      }
-    end
+  # Returns the Base64-decoded version of +str+.
+  # This method complies with ``Base 64 Encoding with URL and Filename Safe
+  # Alphabet'' in RFC 4648.
+  # The alphabet uses '-' instead of '+' and '_' instead of '/'.
+  def urlsafe_decode64(str)
+    strict_decode64(str.tr("-_", "+/"))
   end
 end
-
-include Base64::Deprecated
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index 6ab0755613..d06b434c65 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -1,13 +1,13 @@
 =begin
 #
-# benchmark.rb - a performance benchmarking library 
-# 
+# benchmark.rb - a performance benchmarking library
+#
 # $Id$
-# 
-# Created by Gotoken (gotoken@notwork.org). 
+#
+# Created by Gotoken (gotoken@notwork.org).
 #
 # Documentation by Gotoken (original RD), Lyle Johnson (RDoc conversion), and
-# Gavin Sinclair (editing). 
+# Gavin Sinclair (editing).
 #
 =end
 
@@ -26,15 +26,15 @@
 #       require 'benchmark'
 #
 #       puts Benchmark.measure { "a"*1_000_000 }
-# 
+#
 #   On my machine (FreeBSD 3.2 on P5, 100MHz) this generates:
-# 
+#
 #       1.166667   0.050000   1.216667 (  0.571355)
-# 
+#
 #   This report shows the user CPU time, system CPU time, the sum of
 #   the user and system CPU times, and the elapsed real time. The unit
 #   of time is seconds.
-# 
+#
 # * Do some experiments sequentially using the #bm method:
 #
 #       require 'benchmark'
@@ -45,7 +45,7 @@
 #         x.report { n.times do   ; a = "1"; end }
 #         x.report { 1.upto(n) do ; a = "1"; end }
 #       end
-# 
+#
 #   The result:
 #
 #              user     system      total        real
@@ -63,14 +63,14 @@
 #         x.report("times:") { n.times do   ; a = "1"; end }
 #         x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
 #       end
-# 
+#
 # The result:
-# 
+#
 #                     user     system      total        real
 #        for:     1.050000   0.000000   1.050000 (  0.503462)
 #        times:   1.533333   0.016667   1.550000 (  0.735473)
 #        upto:    1.500000   0.016667   1.516667 (  0.711239)
-# 
+#
 #
 # * The times for some benchmarks depend on the order in which items
 #   are run.  These differences are due to the cost of memory
@@ -79,21 +79,21 @@
 #   sort an array of floats:
 #
 #       require 'benchmark'
-#       
+#
 #       array = (1..1000000).map { rand }
-#       
+#
 #       Benchmark.bmbm do |x|
 #         x.report("sort!") { array.dup.sort! }
 #         x.report("sort")  { array.dup.sort  }
 #       end
-# 
+#
 #   The result:
-# 
+#
 #        Rehearsal -----------------------------------------
 #        sort!  11.928000   0.010000  11.938000 ( 12.756000)
 #        sort   13.048000   0.020000  13.068000 ( 13.857000)
 #        ------------------------------- total: 25.006000sec
-#        
+#
 #                    user     system      total        real
 #        sort!  12.959000   0.010000  12.969000 ( 13.793000)
 #        sort   12.007000   0.000000  12.007000 ( 12.791000)
@@ -103,6 +103,7 @@
 #   using the #benchmark method:
 #
 #       require 'benchmark'
+#       include Benchmark         # we need the CAPTION and FMTSTR constants
 #
 #       n = 50000
 #       Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
@@ -111,9 +112,9 @@
 #         tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
 #         [tf+tt+tu, (tf+tt+tu)/3]
 #       end
-# 
+#
 #   The result:
-# 
+#
 #                     user     system      total        real
 #        for:     1.016667   0.016667   1.033333 (  0.485749)
 #        times:   1.450000   0.016667   1.466667 (  0.681367)
@@ -144,10 +145,10 @@ module Benchmark
   # suitable for nearly all benchmarking requirements.  See the examples in
   # Benchmark, and the #bm and #bmbm methods.
   #
-  # Example: 
+  # Example:
   #
   #     require 'benchmark'
-  #     include Benchmark          # we need the CAPTION and FMTSTR constants 
+  #     include Benchmark          # we need the CAPTION and FMTSTR constants
   #
   #     n = 50000
   #     Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
@@ -156,16 +157,16 @@ module Benchmark
   #       tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
   #       [tf+tt+tu, (tf+tt+tu)/3]
   #     end
-  # 
+  #
   # <i>Generates:</i>
-  # 
+  #
   #                     user     system      total        real
   #        for:     1.016667   0.016667   1.033333 (  0.485749)
   #        times:   1.450000   0.016667   1.466667 (  0.681367)
   #        upto:    1.533333   0.000000   1.533333 (  0.722166)
   #        >total:  4.000000   0.033333   4.033333 (  1.889282)
   #        >avg:    1.333333   0.011111   1.344444 (  0.629761)
-  # 
+  #
 
   def benchmark(caption = "", label_width = nil, fmtstr = nil, *labels) # :yield: report
     sync = STDOUT.sync
@@ -176,7 +177,7 @@ module Benchmark
     print caption
     results = yield(Report.new(label_width, fmtstr))
     Array === results and results.grep(Tms).each {|t|
-      print((labels.shift || t.label || "").ljust(label_width), 
+      print((labels.shift || t.label || "").ljust(label_width),
             t.format(fmtstr))
     }
     STDOUT.sync = sync
@@ -185,7 +186,7 @@ module Benchmark
 
   # A simple interface to the #benchmark method, #bm is generates sequential reports
   # with labels.  The parameters have the same meaning as for #benchmark.
-  # 
+  #
   #     require 'benchmark'
   #
   #     n = 50000
@@ -194,9 +195,9 @@ module Benchmark
   #       x.report("times:") { n.times do   ; a = "1"; end }
   #       x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
   #     end
-  # 
+  #
   # <i>Generates:</i>
-  # 
+  #
   #                     user     system      total        real
   #        for:     1.050000   0.000000   1.050000 (  0.503462)
   #        times:   1.533333   0.016667   1.550000 (  0.735473)
@@ -223,21 +224,21 @@ module Benchmark
   # calculate the required label width.
   #
   #       require 'benchmark'
-  #       
+  #
   #       array = (1..1000000).map { rand }
-  #       
+  #
   #       Benchmark.bmbm do |x|
   #         x.report("sort!") { array.dup.sort! }
   #         x.report("sort")  { array.dup.sort  }
   #       end
-  # 
+  #
   # <i>Generates:</i>
-  # 
+  #
   #        Rehearsal -----------------------------------------
   #        sort!  11.928000   0.010000  11.938000 ( 12.756000)
   #        sort   13.048000   0.020000  13.068000 ( 13.857000)
   #        ------------------------------- total: 25.006000sec
-  #        
+  #
   #                    user     system      total        real
   #        sort!  12.959000   0.010000  12.969000 ( 13.793000)
   #        sort   12.007000   0.000000  12.007000 ( 12.791000)
@@ -266,7 +267,7 @@ module Benchmark
     ets = sum.format("total: %tsec")
     printf("%s %s\n\n",
            "-"*(width+CAPTION.length-ets.length-1), ets)
-    
+
     # take
     print ' '*width, CAPTION
     list = []
@@ -280,11 +281,12 @@ module Benchmark
       list.push [label, res]
     }
 
-    STDOUT.sync = sync
     ary
+  ensure
+    STDOUT.sync = sync unless sync.nil?
   end
 
-  # 
+  #
   # Returns the time used to execute the given block as a
   # Benchmark::Tms object.
   #
@@ -292,10 +294,10 @@ module Benchmark
     t0, r0 = Benchmark.times, Time.now
     yield
     t1, r1 = Benchmark.times, Time.now
-    Benchmark::Tms.new(t1.utime  - t0.utime, 
-                       t1.stime  - t0.stime, 
-                       t1.cutime - t0.cutime, 
-                       t1.cstime - t0.cstime, 
+    Benchmark::Tms.new(t1.utime  - t0.utime,
+                       t1.stime  - t0.stime,
+                       t1.cutime - t0.cutime,
+                       t1.cstime - t0.cstime,
                        r1.to_f - r0.to_f,
                        label)
   end
@@ -322,8 +324,8 @@ module Benchmark
     # Usually, one doesn't call this method directly, as new
     # Job objects are created by the #bmbm method.
     # _width_ is a initial value for the label offset used in formatting;
-    # the #bmbm method passes its _width_ argument to this constructor. 
-    # 
+    # the #bmbm method passes its _width_ argument to this constructor.
+    #
     def initialize(width)
       @width = width
       @list = []
@@ -334,7 +336,7 @@ module Benchmark
     #
     def item(label = "", &blk) # :yield:
       raise ArgumentError, "no block" unless block_given?
-      label.concat ' '
+      label += ' '
       w = label.length
       @width = w if @width < w
       @list.push [label, blk]
@@ -342,11 +344,11 @@ module Benchmark
     end
 
     alias report item
-    
+
     # An array of 2-element arrays, consisting of label and block pairs.
     attr_reader :list
-    
-    # Length of the widest label in the #list, plus one.  
+
+    # Length of the widest label in the #list, plus one.
     attr_reader :width
   end
 
@@ -362,10 +364,10 @@ module Benchmark
     #
     # Returns an initialized Report instance.
     # Usually, one doesn't call this method directly, as new
-    # Report objects are created by the #benchmark and #bm methods. 
-    # _width_ and _fmtstr_ are the label offset and 
-    # format string used by Tms#format. 
-    # 
+    # Report objects are created by the #benchmark and #bm methods.
+    # _width_ and _fmtstr_ are the label offset and
+    # format string used by Tms#format.
+    #
     def initialize(width = 0, fmtstr = nil)
       @width, @fmtstr = width, fmtstr
     end
@@ -397,50 +399,50 @@ module Benchmark
 
     # User CPU time
     attr_reader :utime
-    
+
     # System CPU time
     attr_reader :stime
-   
+
     # User CPU time of children
     attr_reader :cutime
-    
+
     # System CPU time of children
     attr_reader :cstime
-    
+
     # Elapsed real time
     attr_reader :real
-    
-    # Total time, that is _utime_ + _stime_ + _cutime_ + _cstime_ 
+
+    # Total time, that is _utime_ + _stime_ + _cutime_ + _cstime_
     attr_reader :total
-    
+
     # Label
     attr_reader :label
 
     #
     # Returns an initialized Tms object which has
-    # _u_ as the user CPU time, _s_ as the system CPU time, 
+    # _u_ as the user CPU time, _s_ as the system CPU time,
     # _cu_ as the children's user CPU time, _cs_ as the children's
     # system CPU time, _real_ as the elapsed real time and _l_
-    # as the label. 
-    # 
+    # as the label.
+    #
     def initialize(u = 0.0, s = 0.0, cu = 0.0, cs = 0.0, real = 0.0, l = nil)
       @utime, @stime, @cutime, @cstime, @real, @label = u, s, cu, cs, real, l
       @total = @utime + @stime + @cutime + @cstime
     end
 
-    # 
+    #
     # Returns a new Tms object whose times are the sum of the times for this
     # Tms object, plus the time required to execute the code block (_blk_).
-    # 
+    #
     def add(&blk) # :yield:
-      self + Benchmark::measure(&blk) 
+      self + Benchmark::measure(&blk)
     end
 
-    # 
+    #
     # An in-place version of #add.
-    # 
-    def add!
-      t = Benchmark::measure(&blk) 
+    #
+    def add!(&blk)
+      t = Benchmark::measure(&blk)
       @utime  = utime + t.utime
       @stime  = stime + t.stime
       @cutime = cutime + t.cutime
@@ -449,32 +451,32 @@ module Benchmark
       self
     end
 
-    # 
+    #
     # Returns a new Tms object obtained by memberwise summation
     # of the individual times for this Tms object with those of the other
     # Tms object.
-    # This method and #/() are useful for taking statistics. 
-    # 
+    # This method and #/() are useful for taking statistics.
+    #
     def +(other); memberwise(:+, other) end
-    
+
     #
     # Returns a new Tms object obtained by memberwise subtraction
     # of the individual times for the other Tms object from those of this
     # Tms object.
     #
     def -(other); memberwise(:-, other) end
-    
+
     #
     # Returns a new Tms object obtained by memberwise multiplication
     # of the individual times for this Tms object by _x_.
     #
     def *(x); memberwise(:*, x) end
 
-    # 
+    #
     # Returns a new Tms object obtained by memberwise division
     # of the individual times for this Tms object by _x_.
-    # This method and #+() are useful for taking statistics. 
-    # 
+    # This method and #+() are useful for taking statistics.
+    #
     def /(x); memberwise(:/, x) end
 
     #
@@ -485,15 +487,15 @@ module Benchmark
     #
     # <tt>%u</tt>::     Replaced by the user CPU time, as reported by Tms#utime.
     # <tt>%y</tt>::     Replaced by the system CPU time, as reported by #stime (Mnemonic: y of "s*y*stem")
-    # <tt>%U</tt>::     Replaced by the children's user CPU time, as reported by Tms#cutime 
+    # <tt>%U</tt>::     Replaced by the children's user CPU time, as reported by Tms#cutime
     # <tt>%Y</tt>::     Replaced by the children's system CPU time, as reported by Tms#cstime
     # <tt>%t</tt>::     Replaced by the total CPU time, as reported by Tms#total
     # <tt>%r</tt>::     Replaced by the elapsed real time, as reported by Tms#real
     # <tt>%n</tt>::     Replaced by the label string, as reported by Tms#label (Mnemonic: n of "*n*ame")
-    # 
+    #
     # If _fmtstr_ is not given, FMTSTR is used as default value, detailing the
     # user, system and real elapsed time.
-    # 
+    #
     def format(arg0 = nil, *args)
       fmtstr = (arg0 || FMTSTR).dup
       fmtstr.gsub!(/(%[-+\.\d]*)n/){"#{$1}s" % label}
@@ -506,19 +508,19 @@ module Benchmark
       arg0 ? Kernel::format(fmtstr, *args) : fmtstr
     end
 
-    # 
+    #
     # Same as #format.
-    # 
+    #
     def to_s
       format
     end
 
-    # 
+    #
     # Returns a new 6-element array, consisting of the
     # label, user CPU time, system CPU time, children's
     # user CPU time, children's system CPU time and elapsed
     # real time.
-    # 
+    #
     def to_a
       [@label, @utime, @stime, @cutime, @cstime, @real]
     end
@@ -547,7 +549,7 @@ module Benchmark
   # The default caption string (heading above the output times).
   CAPTION = Benchmark::Tms::CAPTION
 
-  # The default format string used to display times.  See also Benchmark::Tms#format. 
+  # The default format string used to display times.  See also Benchmark::Tms#format.
   FMTSTR = Benchmark::Tms::FMTSTR
 end
 
diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb
deleted file mode 100644
index d6b60d66cc..0000000000
--- a/lib/cgi-lib.rb
+++ /dev/null
@@ -1,272 +0,0 @@
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
-
-=begin
-
-= simple CGI support library
-
-= example
-
-== get form values
-
-	require "cgi-lib.rb"
-	query = CGI.new
-	query['field']   # <== value of 'field'
-	query.keys       # <== array of fields
-
-and query has Hash class methods
-
-
-== get cookie values
-
-	require "cgi-lib.rb"
-	query = CGI.new
-	query.cookie['name']  # <== cookie value of 'name'
-	query.cookie.keys     # <== all cookie names
-
-and query.cookie has Hash class methods
-
-
-== print HTTP header and HTML string to $>
-
-	require "cgi-lib.rb"
-	CGI::print{
-	  CGI::tag("HTML"){
-	    CGI::tag("HEAD"){ CGI::tag("TITLE"){"TITLE"} } +
-	    CGI::tag("BODY"){
-	      CGI::tag("FORM", {"ACTION"=>"test.rb", "METHOD"=>"POST"}){
-	        CGI::tag("INPUT", {"TYPE"=>"submit", "VALUE"=>"submit"})
-	      } +
-	      CGI::tag("HR")
-	    }
-	  }
-	}
-
-
-== make raw cookie string
-
-	require "cgi-lib.rb"
-	cookie1 = CGI::cookie({'name'    => 'name',
-	                       'value'   => 'value',
-	                       'path'    => 'path',   # optional
-	                       'domain'  => 'domain', # optional
-	                       'expires' => Time.now, # optional
-	                       'secure'  => true      # optional
-	                      })
-
-	CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
-
-
-== print HTTP header and string to $>
-
-	require "cgi-lib.rb"
-	CGI::print{ "string" }
-	  # == CGI::print("Content-Type: text/html"){ "string" }
-	CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
-
-
-=== NPH (no-parse-header) mode
-
-	require "cgi-lib.rb"
-	CGI::print("nph"){ "string" }
-	  # == CGI::print("nph", "Content-Type: text/html"){ "string" }
-	CGI::print("nph", "Content-Type: text/html", cookie1, cookie2){ "string" }
-
-
-== make HTML tag string
-
-	require "cgi-lib.rb"
-	CGI::tag("element", {"attribute_name"=>"attribute_value"}){"content"}
-
-
-== make HTTP header string
-
-	require "cgi-lib.rb"
-	CGI::header # == CGI::header("Content-Type: text/html")
-	CGI::header("Content-Type: text/html", cookie1, cookie2)
-
-
-=== NPH (no-parse-header) mode
-
-	CGI::header("nph") # == CGI::header("nph", "Content-Type: text/html")
-	CGI::header("nph", "Content-Type: text/html", cookie1, cookie2)
-
-
-== escape url encode
-
-	require "cgi-lib.rb"
-	url_encoded_string = CGI::escape("string")
-
-
-== unescape url encoded
-
-	require "cgi-lib.rb"
-	string = CGI::unescape("url encoded string")
-
-
-== escape HTML &"<>
-
-	require "cgi-lib.rb"
-	CGI::escapeHTML("string")
-
-
-=end
-
-require "delegate"
-
-class CGI < SimpleDelegator
-
-  CR  = "\015"
-  LF  = "\012"
-  EOL = CR + LF
-
-  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
-  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
-
-  # make rfc1123 date string
-  def CGI::rfc1123_date(time)
-    t = time.clone.gmtime
-    return format("%s, %.2d %s %d %.2d:%.2d:%.2d GMT",
-                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
-                t.hour, t.min, t.sec)
-  end
-
-  # escape url encode
-  def CGI::escape(str)
-    str.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
-  end
-
-  # unescape url encoded
-  def CGI::unescape(str)
-    str.gsub(/\+/, ' ').gsub(/%([0-9a-fA-F]{2})/){ [$1.hex].pack("c") }
-  end
-
-  # escape HTML
-  def CGI::escapeHTML(str)
-    str.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
-  end
-
-  # offline mode. read name=value pairs on standard input.
-  def read_from_cmdline
-    require "shellwords.rb"
-    words = Shellwords.shellwords(
-              if not ARGV.empty?
-                ARGV.join(' ')
-              else
-                STDERR.print "(offline mode: enter name=value pairs on standard input)\n" if STDIN.tty?
-                readlines.join(' ').gsub(/\n/, '')
-              end.gsub(/\\=/, '%3D').gsub(/\\&/, '%26'))
-
-    if words.find{|x| x =~ /=/} then words.join('&') else words.join('+') end
-  end
-
-  def initialize(input = $stdin)
-
-    @inputs = {}
-    @cookie = {}
-
-    case ENV['REQUEST_METHOD']
-    when "GET"
-      ENV['QUERY_STRING'] or ""
-    when "POST"
-      input.read(Integer(ENV['CONTENT_LENGTH'])) or ""
-    else
-      read_from_cmdline
-    end.split(/[&;]/).each do |x|
-      key, val = x.split(/=/,2).collect{|x|CGI::unescape(x)}
-      if @inputs.include?(key)
-        @inputs[key] += "\0" + (val or "")
-      else
-        @inputs[key] = (val or "")
-      end
-    end
-
-    super(@inputs)
-
-    if ENV.has_key?('HTTP_COOKIE') or ENV.has_key?('COOKIE')
-      (ENV['HTTP_COOKIE'] or ENV['COOKIE']).split(/; /).each do |x|
-        key, val = x.split(/=/,2)
-        key = CGI::unescape(key)
-        val = val.split(/&/).collect{|x|CGI::unescape(x)}.join("\0")
-        if @cookie.include?(key)
-          @cookie[key] += "\0" + val
-        else
-          @cookie[key] = val
-        end
-      end
-    end
-  end
-
-  attr("inputs")
-  attr("cookie")
-
-  # make HTML tag string
-  def CGI::tag(element, attributes = {})
-    "<" + escapeHTML(element) + attributes.collect{|name, value|
-      " " + escapeHTML(name) + '="' + escapeHTML(value) + '"'
-    }.to_s + ">" +
-    (iterator? ? yield.to_s + "</" + escapeHTML(element) + ">" : "")
-  end
-
-  # make raw cookie string
-  def CGI::cookie(options)
-    "Set-Cookie: " + options['name'] + '=' + escape(options['value']) +
-    (options['domain']  ? '; domain='  + options['domain'] : '') +
-    (options['path']    ? '; path='    + options['path']   : '') +
-    (options['expires'] ? '; expires=' + rfc1123_date(options['expires']) : '') +
-    (options['secure']  ? '; secure' : '')
-  end
-
-  # make HTTP header string
-  def CGI::header(*options)
-    if defined?(MOD_RUBY)
-      options.each{|option|
-        option.sub(/(.*?): (.*)/){
-          Apache::request.headers_out[$1] = $2
-        }
-      }
-      Apache::request.send_http_header
-      ''
-    else
-      if options.delete("nph") or (ENV['SERVER_SOFTWARE'] =~ /IIS/)
-        [(ENV['SERVER_PROTOCOL'] or "HTTP/1.0") + " 200 OK",
-         "Date: " + rfc1123_date(Time.now),
-         "Server: " + (ENV['SERVER_SOFTWARE'] or ""),
-         "Connection: close"] +
-        (options.empty? ? ["Content-Type: text/html"] : options)
-      else
-        options.empty? ? ["Content-Type: text/html"] : options
-      end.join(EOL) + EOL + EOL
-    end
-  end
-
-  # print HTTP header and string to $>
-  def CGI::print(*options)
-    $>.print CGI::header(*options) + yield.to_s
-  end
-
-  # print message to $>
-  def CGI::message(message, title = "", header = ["Content-Type: text/html"])
-    if message.kind_of?(Hash)
-      title   = message['title']
-      header  = message['header']
-      message = message['body']
-    end
-    CGI::print(*header){
-      CGI::tag("HTML"){
-        CGI::tag("HEAD"){ CGI.tag("TITLE"){ title } } +
-        CGI::tag("BODY"){ message }
-      }
-    }
-    true
-  end
-
-  # print error message to $> and exit
-  def CGI::error
-    CGI::message({'title'=>'ERROR', 'body'=>
-      CGI::tag("PRE"){
-        "ERROR: " + CGI::tag("STRONG"){ escapeHTML($!.to_s) } + "\n" + escapeHTML($@.join("\n"))
-      }
-    })
-    exit
-  end
-end
diff --git a/lib/cgi.rb b/lib/cgi.rb
index ccc48d8836..3af271523b 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1,14 +1,14 @@
-# 
+#
 # cgi.rb - cgi support library
-# 
+#
 # Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-# 
+#
 # Copyright (C) 2000  Information-technology Promotion Agency, Japan
 #
 # Author: Wakou Aoyama <wakou@ruby-lang.org>
 #
-# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber) 
-# 
+# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber)
+#
 # == Overview
 #
 # The Common Gateway Interface (CGI) is a simple protocol
@@ -18,7 +18,7 @@
 # parameters of the request passed in either in the
 # environment (GET) or via $stdin (POST), and everything
 # it prints to $stdout is returned to the client.
-# 
+#
 # This file holds the +CGI+ class.  This class provides
 # functionality for retrieving HTTP request parameters,
 # managing cookies, and generating HTML output.  See the
@@ -30,9 +30,7 @@
 # See http://www.w3.org/CGI/ for more information on the CGI
 # protocol.
 
-raise "Please, use ruby 1.5.4 or later." if RUBY_VERSION < "1.5.4"
-
-require 'English'
+raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
 
 # CGI class.  See documentation for the file cgi.rb for an overview
 # of the CGI protocol.
@@ -77,18 +75,18 @@ require 'English'
 #
 #
 # For each of these variables, there is a corresponding attribute with the
-# same name, except all lower case and without a preceding HTTP_.  
+# same name, except all lower case and without a preceding HTTP_.
 # +content_length+ and +server_port+ are integers; the rest are strings.
 #
 # === Parameters
 #
 # The method #params() returns a hash of all parameters in the request as
 # name/value-list pairs, where the value-list is an Array of one or more
-# values.  The CGI object itself also behaves as a hash of parameter names 
-# to values, but only returns a single value (as a String) for each 
+# values.  The CGI object itself also behaves as a hash of parameter names
+# to values, but only returns a single value (as a String) for each
 # parameter name.
 #
-# For instance, suppose the request contains the parameter 
+# For instance, suppose the request contains the parameter
 # "favourite_colours" with the multiple values "blue" and "green".  The
 # following behaviour would occur:
 #
@@ -107,7 +105,7 @@ require 'English'
 #
 # === Multipart requests
 #
-# If a request's method is POST and its content type is multipart/form-data, 
+# If a request's method is POST and its content type is multipart/form-data,
 # then it may contain uploaded files.  These are stored by the QueryExtension
 # module in the parameters of the request.  The parameter name is the name
 # attribute of the file input field, as usual.  However, the value is not
@@ -138,7 +136,7 @@ require 'English'
 #
 # Each HTML element has a corresponding method for generating that
 # element as a String.  The name of this method is the same as that
-# of the element, all lowercase.  The attributes of the element are 
+# of the element, all lowercase.  The attributes of the element are
 # passed in as a hash, and the body as a no-argument block that evaluates
 # to a String.  The HTML generation module knows which elements are
 # always empty, and silently drops any passed-in body.  It also knows
@@ -152,57 +150,57 @@ require 'English'
 # as arguments, rather than via a hash.
 #
 # == Examples of use
-# 
+#
 # === Get form values
-# 
+#
 #   require "cgi"
 #   cgi = CGI.new
 #   value = cgi['field_name']   # <== value string for 'field_name'
 #     # if not 'field_name' included, then return "".
 #   fields = cgi.keys            # <== array of field names
-# 
+#
 #   # returns true if form has 'field_name'
 #   cgi.has_key?('field_name')
 #   cgi.has_key?('field_name')
 #   cgi.include?('field_name')
-# 
-# CAUTION! cgi['field_name'] returned an Array with the old 
+#
+# CAUTION! cgi['field_name'] returned an Array with the old
 # cgi.rb(included in ruby 1.6)
-# 
+#
 # === Get form values as hash
-# 
+#
 #   require "cgi"
 #   cgi = CGI.new
 #   params = cgi.params
-# 
+#
 # cgi.params is a hash.
-# 
+#
 #   cgi.params['new_field_name'] = ["value"]  # add new param
 #   cgi.params['field_name'] = ["new_value"]  # change value
 #   cgi.params.delete('field_name')           # delete param
 #   cgi.params.clear                          # delete all params
-# 
-# 
+#
+#
 # === Save form values to file
-# 
+#
 #   require "pstore"
 #   db = PStore.new("query.db")
 #   db.transaction do
 #     db["params"] = cgi.params
 #   end
-# 
-# 
+#
+#
 # === Restore form values from file
-# 
+#
 #   require "pstore"
 #   db = PStore.new("query.db")
 #   db.transaction do
 #     cgi.params = db["params"]
 #   end
-# 
-# 
+#
+#
 # === Get multipart form values
-# 
+#
 #   require "cgi"
 #   cgi = CGI.new
 #   value = cgi['field_name']   # <== value string for 'field_name'
@@ -210,37 +208,37 @@ require 'English'
 #   value.local_path            # <== path to local file of value
 #   value.original_filename     # <== original filename of value
 #   value.content_type          # <== content_type of value
-# 
+#
 # and value has StringIO or Tempfile class methods.
-# 
+#
 # === Get cookie values
-# 
+#
 #   require "cgi"
 #   cgi = CGI.new
 #   values = cgi.cookies['name']  # <== array of 'name'
 #     # if not 'name' included, then return [].
 #   names = cgi.cookies.keys      # <== array of cookie names
-# 
+#
 # and cgi.cookies is a hash.
-# 
+#
 # === Get cookie objects
-# 
+#
 #   require "cgi"
 #   cgi = CGI.new
 #   for name, cookie in cgi.cookies
 #     cookie.expires = Time.now + 30
 #   end
 #   cgi.out("cookie" => cgi.cookies) {"string"}
-# 
+#
 #   cgi.cookies # { "name1" => cookie1, "name2" => cookie2, ... }
-# 
+#
 #   require "cgi"
 #   cgi = CGI.new
 #   cgi.cookies['name'].expires = Time.now + 30
 #   cgi.out("cookie" => cgi.cookies['name']) {"string"}
-# 
+#
 # === Print http header and html string to $DEFAULT_OUTPUT ($>)
-# 
+#
 #   require "cgi"
 #   cgi = CGI.new("html3")  # add HTML generation methods
 #   cgi.out() do
@@ -264,2040 +262,14 @@ require 'English'
 #       end
 #     end
 #   end
-# 
+#
 #   # add HTML generation methods
 #   CGI.new("html3")    # html3.2
 #   CGI.new("html4")    # html4.01 (Strict)
 #   CGI.new("html4Tr")  # html4.01 Transitional
 #   CGI.new("html4Fr")  # html4.01 Frameset
 #
-class CGI
-
-  # :stopdoc:
-
-  # String for carriage return
-  CR  = "\015"
-
-  # String for linefeed
-  LF  = "\012"
-
-  # Standard internet newline sequence
-  EOL = CR + LF
-
-  REVISION = '$Id$' #:nodoc:
-
-  NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM) 
-
-  # Path separators in different environments.
-  PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
-
-  # HTTP status codes.
-  HTTP_STATUS = {
-    "OK"                  => "200 OK",
-    "PARTIAL_CONTENT"     => "206 Partial Content",
-    "MULTIPLE_CHOICES"    => "300 Multiple Choices",
-    "MOVED"               => "301 Moved Permanently",
-    "REDIRECT"            => "302 Found",
-    "NOT_MODIFIED"        => "304 Not Modified",
-    "BAD_REQUEST"         => "400 Bad Request",
-    "AUTH_REQUIRED"       => "401 Authorization Required",
-    "FORBIDDEN"           => "403 Forbidden",
-    "NOT_FOUND"           => "404 Not Found",
-    "METHOD_NOT_ALLOWED"  => "405 Method Not Allowed",
-    "NOT_ACCEPTABLE"      => "406 Not Acceptable",
-    "LENGTH_REQUIRED"     => "411 Length Required",
-    "PRECONDITION_FAILED" => "412 Rrecondition Failed",
-    "SERVER_ERROR"        => "500 Internal Server Error",
-    "NOT_IMPLEMENTED"     => "501 Method Not Implemented",
-    "BAD_GATEWAY"         => "502 Bad Gateway",
-    "VARIANT_ALSO_VARIES" => "506 Variant Also Negotiates"
-  }
-
-  # Abbreviated day-of-week names specified by RFC 822
-  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
-
-  # Abbreviated month names specified by RFC 822
-  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
-
-  # :startdoc:
-
-  def env_table 
-    ENV
-  end
-
-  def stdinput
-    $stdin
-  end
-
-  def stdoutput
-    $DEFAULT_OUTPUT
-  end
-
-  private :env_table, :stdinput, :stdoutput
-
-  # URL-encode a string.
-  #   url_encoded_string = CGI::escape("'Stop!' said Fred")
-  #      # => "%27Stop%21%27+said+Fred"
-  def CGI::escape(string)
-    string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
-      '%' + $1.unpack('H2' * $1.size).join('%').upcase
-    end.tr(' ', '+')
-  end
-
-
-  # URL-decode a string.
-  #   string = CGI::unescape("%27Stop%21%27+said+Fred")
-  #      # => "'Stop!' said Fred"
-  def CGI::unescape(string)
-    string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
-      [$1.delete('%')].pack('H*')
-    end
-  end
-
-
-  # Escape special characters in HTML, namely &\"<>
-  #   CGI::escapeHTML('Usage: foo "bar" <baz>')
-  #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
-  def CGI::escapeHTML(string)
-    string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
-  end
-
-
-  # Unescape a string that has been HTML-escaped
-  #   CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
-  #      # => "Usage: foo \"bar\" <baz>"
-  def CGI::unescapeHTML(string)
-    string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/n) do
-      match = $1.dup
-      case match
-      when 'amp'                 then '&'
-      when 'quot'                then '"'
-      when 'gt'                  then '>'
-      when 'lt'                  then '<'
-      when /\A#0*(\d+)\z/n       then
-        if Integer($1) < 256
-          Integer($1).chr
-        else
-          if Integer($1) < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
-            [Integer($1)].pack("U")
-          else
-            "&##{$1};"
-          end
-        end
-      when /\A#x([0-9a-f]+)\z/ni then
-        if $1.hex < 256
-          $1.hex.chr
-        else
-          if $1.hex < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
-            [$1.hex].pack("U")
-          else
-            "&#x#{$1};"
-          end
-        end
-      else
-        "&#{match};"
-      end
-    end
-  end
-
-
-  # Escape only the tags of certain HTML elements in +string+.
-  #
-  # Takes an element or elements or array of elements.  Each element
-  # is specified by the name of the element, without angle brackets.
-  # This matches both the start and the end tag of that element.
-  # The attribute list of the open tag will also be escaped (for
-  # instance, the double-quotes surrounding attribute values).
-  #
-  #   print CGI::escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
-  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
-  #
-  #   print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
-  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
-  def CGI::escapeElement(string, *elements)
-    elements = elements[0] if elements[0].kind_of?(Array)
-    unless elements.empty?
-      string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/ni) do
-        CGI::escapeHTML($&)
-      end
-    else
-      string
-    end
-  end
-
-
-  # Undo escaping such as that done by CGI::escapeElement()
-  #
-  #   print CGI::unescapeElement(
-  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
-  #     # "&lt;BR&gt;<A HREF="url"></A>"
-  # 
-  #   print CGI::unescapeElement(
-  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
-  #     # "&lt;BR&gt;<A HREF="url"></A>"
-  def CGI::unescapeElement(string, *elements)
-    elements = elements[0] if elements[0].kind_of?(Array)
-    unless elements.empty?
-      string.gsub(/&lt;\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?&gt;/ni) do
-        CGI::unescapeHTML($&)
-      end
-    else
-      string
-    end
-  end
-
-
-  # Format a +Time+ object as a String using the format specified by RFC 1123.
-  #
-  #   CGI::rfc1123_date(Time.now)
-  #     # Sat, 01 Jan 2000 00:00:00 GMT
-  def CGI::rfc1123_date(time)
-    t = time.clone.gmtime
-    return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
-                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
-                t.hour, t.min, t.sec)
-  end
-
-
-  # Create an HTTP header block as a string.
-  #
-  # Includes the empty line that ends the header block.
-  #
-  # +options+ can be a string specifying the Content-Type (defaults
-  # to text/html), or a hash of header key/value pairs.  The following
-  # header keys are recognized:
-  #
-  # type:: the Content-Type header.  Defaults to "text/html"
-  # charset:: the charset of the body, appended to the Content-Type header.
-  # nph:: a boolean value.  If true, prepend protocol string and status code, and
-  #       date; and sets default values for "server" and "connection" if not
-  #       explicitly set.
-  # status:: the HTTP status code, returned as the Status header.  See the
-  #          list of available status codes below.
-  # server:: the server software, returned as the Server header.
-  # connection:: the connection type, returned as the Connection header (for 
-  #              instance, "close".
-  # length:: the length of the content that will be sent, returned as the
-  #          Content-Length header.
-  # language:: the language of the content, returned as the Content-Language
-  #            header.
-  # expires:: the time on which the current content expires, as a +Time+
-  #           object, returned as the Expires header.
-  # cookie:: a cookie or cookies, returned as one or more Set-Cookie headers.
-  #          The value can be the literal string of the cookie; a CGI::Cookie
-  #          object; an Array of literal cookie strings or Cookie objects; or a 
-  #          hash all of whose values are literal cookie strings or Cookie objects.
-  #          These cookies are in addition to the cookies held in the
-  #          @output_cookies field.
-  #
-  # Other header lines can also be set; they are appended as key: value.
-  # 
-  #   header
-  #     # Content-Type: text/html
-  # 
-  #   header("text/plain")
-  #     # Content-Type: text/plain
-  # 
-  #   header("nph"        => true,
-  #          "status"     => "OK",  # == "200 OK"
-  #            # "status"     => "200 GOOD",
-  #          "server"     => ENV['SERVER_SOFTWARE'],
-  #          "connection" => "close",
-  #          "type"       => "text/html",
-  #          "charset"    => "iso-2022-jp",
-  #            # Content-Type: text/html; charset=iso-2022-jp
-  #          "length"     => 103,
-  #          "language"   => "ja",
-  #          "expires"    => Time.now + 30,
-  #          "cookie"     => [cookie1, cookie2],
-  #          "my_header1" => "my_value"
-  #          "my_header2" => "my_value")
-  # 
-  # The status codes are:
-  # 
-  #   "OK"                  --> "200 OK"
-  #   "PARTIAL_CONTENT"     --> "206 Partial Content"
-  #   "MULTIPLE_CHOICES"    --> "300 Multiple Choices"
-  #   "MOVED"               --> "301 Moved Permanently"
-  #   "REDIRECT"            --> "302 Found"
-  #   "NOT_MODIFIED"        --> "304 Not Modified"
-  #   "BAD_REQUEST"         --> "400 Bad Request"
-  #   "AUTH_REQUIRED"       --> "401 Authorization Required"
-  #   "FORBIDDEN"           --> "403 Forbidden"
-  #   "NOT_FOUND"           --> "404 Not Found"
-  #   "METHOD_NOT_ALLOWED"  --> "405 Method Not Allowed"
-  #   "NOT_ACCEPTABLE"      --> "406 Not Acceptable"
-  #   "LENGTH_REQUIRED"     --> "411 Length Required"
-  #   "PRECONDITION_FAILED" --> "412 Precondition Failed"
-  #   "SERVER_ERROR"        --> "500 Internal Server Error"
-  #   "NOT_IMPLEMENTED"     --> "501 Method Not Implemented"
-  #   "BAD_GATEWAY"         --> "502 Bad Gateway"
-  #   "VARIANT_ALSO_VARIES" --> "506 Variant Also Negotiates"
-  # 
-  # This method does not perform charset conversion. 
-  #
-  def header(options = "text/html")
-
-    buf = ""
-
-    case options
-    when String
-      options = { "type" => options }
-    when Hash
-      options = options.dup
-    end
-
-    unless options.has_key?("type")
-      options["type"] = "text/html"
-    end
-
-    if options.has_key?("charset")
-      options["type"] += "; charset=" + options.delete("charset")
-    end
-
-    options.delete("nph") if defined?(MOD_RUBY)
-    if options.delete("nph") or
-        (/IIS\/(\d+)/n.match(env_table['SERVER_SOFTWARE']) and $1.to_i < 5)
-      buf += (env_table["SERVER_PROTOCOL"] or "HTTP/1.0")  + " " +
-             (HTTP_STATUS[options["status"]] or options["status"] or "200 OK") +
-             EOL +
-             "Date: " + CGI::rfc1123_date(Time.now) + EOL
-
-      unless options.has_key?("server")
-        options["server"] = (env_table['SERVER_SOFTWARE'] or "")
-      end
-
-      unless options.has_key?("connection")
-        options["connection"] = "close"
-      end
-
-      options.delete("status")
-    end
-
-    if options.has_key?("status")
-      buf += "Status: " +
-             (HTTP_STATUS[options["status"]] or options["status"]) + EOL
-      options.delete("status")
-    end
-
-    if options.has_key?("server")
-      buf += "Server: " + options.delete("server") + EOL
-    end
-
-    if options.has_key?("connection")
-      buf += "Connection: " + options.delete("connection") + EOL
-    end
-
-    buf += "Content-Type: " + options.delete("type") + EOL
-
-    if options.has_key?("length")
-      buf += "Content-Length: " + options.delete("length").to_s + EOL
-    end
-
-    if options.has_key?("language")
-      buf += "Content-Language: " + options.delete("language") + EOL
-    end
-
-    if options.has_key?("expires")
-      buf += "Expires: " + CGI::rfc1123_date( options.delete("expires") ) + EOL
-    end
-
-    if options.has_key?("cookie")
-      if options["cookie"].kind_of?(String) or
-           options["cookie"].kind_of?(Cookie)
-        buf += "Set-Cookie: " + options.delete("cookie").to_s + EOL
-      elsif options["cookie"].kind_of?(Array)
-        options.delete("cookie").each{|cookie|
-          buf += "Set-Cookie: " + cookie.to_s + EOL
-        }
-      elsif options["cookie"].kind_of?(Hash)
-        options.delete("cookie").each_value{|cookie|
-          buf += "Set-Cookie: " + cookie.to_s + EOL
-        }
-      end
-    end
-    if @output_cookies
-      for cookie in @output_cookies
-        buf += "Set-Cookie: " + cookie.to_s + EOL
-      end
-    end
-
-    options.each{|key, value|
-      buf += key + ": " + value.to_s + EOL
-    }
-
-    if defined?(MOD_RUBY)
-      table = Apache::request.headers_out
-      buf.scan(/([^:]+): (.+)#{EOL}/n){ |name, value|
-        warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
-        case name
-        when 'Set-Cookie'
-          table.add(name, value)
-        when /^status$/ni
-          Apache::request.status_line = value
-          Apache::request.status = value.to_i
-        when /^content-type$/ni
-          Apache::request.content_type = value
-        when /^content-encoding$/ni
-          Apache::request.content_encoding = value
-        when /^location$/ni
-	  if Apache::request.status == 200
-	    Apache::request.status = 302
-	  end
-          Apache::request.headers_out[name] = value
-        else
-          Apache::request.headers_out[name] = value
-        end
-      }
-      Apache::request.send_http_header
-      ''
-    else
-      buf + EOL
-    end
-
-  end # header()
-
-
-  # Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
-  #
-  # The header is provided by +options+, as for #header().
-  # The body of the document is that returned by the passed-
-  # in block.  This block takes no arguments.  It is required.
-  #
-  #   cgi = CGI.new
-  #   cgi.out{ "string" }
-  #     # Content-Type: text/html
-  #     # Content-Length: 6
-  #     #
-  #     # string
-  # 
-  #   cgi.out("text/plain") { "string" }
-  #     # Content-Type: text/plain
-  #     # Content-Length: 6
-  #     #
-  #     # string
-  # 
-  #   cgi.out("nph"        => true,
-  #           "status"     => "OK",  # == "200 OK"
-  #           "server"     => ENV['SERVER_SOFTWARE'],
-  #           "connection" => "close",
-  #           "type"       => "text/html",
-  #           "charset"    => "iso-2022-jp",
-  #             # Content-Type: text/html; charset=iso-2022-jp
-  #           "language"   => "ja",
-  #           "expires"    => Time.now + (3600 * 24 * 30),
-  #           "cookie"     => [cookie1, cookie2],
-  #           "my_header1" => "my_value",
-  #           "my_header2" => "my_value") { "string" }
-  # 
-  # Content-Length is automatically calculated from the size of
-  # the String returned by the content block.
-  #
-  # If ENV['REQUEST_METHOD'] == "HEAD", then only the header
-  # is outputted (the content block is still required, but it
-  # is ignored).
-  # 
-  # If the charset is "iso-2022-jp" or "euc-jp" or "shift_jis" then
-  # the content is converted to this charset, and the language is set 
-  # to "ja".
-  def out(options = "text/html") # :yield:
-
-    options = { "type" => options } if options.kind_of?(String)
-    content = yield
-
-    if options.has_key?("charset")
-      require "nkf"
-      case options["charset"]
-      when /iso-2022-jp/ni
-        content = NKF::nkf('-m0 -x -j', content)
-        options["language"] = "ja" unless options.has_key?("language")
-      when /euc-jp/ni
-        content = NKF::nkf('-m0 -x -e', content)
-        options["language"] = "ja" unless options.has_key?("language")
-      when /shift_jis/ni
-        content = NKF::nkf('-m0 -x -s', content)
-        options["language"] = "ja" unless options.has_key?("language")
-      end
-    end
-
-    options["length"] = content.length.to_s
-    output = stdoutput
-    output.binmode if defined? output.binmode
-    output.print header(options)
-    output.print content unless "HEAD" == env_table['REQUEST_METHOD']
-  end
-
-
-  # Print an argument or list of arguments to the default output stream
-  #
-  #   cgi = CGI.new
-  #   cgi.print    # default:  cgi.print == $DEFAULT_OUTPUT.print
-  def print(*options)
-    stdoutput.print(*options)
-  end
-
-  require "delegate"
-
-  # Class representing an HTTP cookie.
-  #
-  # In addition to its specific fields and methods, a Cookie instance
-  # is a delegator to the array of its values.
-  #
-  # See RFC 2965.
-  #
-  # == Examples of use
-  #   cookie1 = CGI::Cookie::new("name", "value1", "value2", ...)
-  #   cookie1 = CGI::Cookie::new("name" => "name", "value" => "value")
-  #   cookie1 = CGI::Cookie::new('name'    => 'name',
-  #                              'value'   => ['value1', 'value2', ...],
-  #                              'path'    => 'path',   # optional
-  #                              'domain'  => 'domain', # optional
-  #                              'expires' => Time.now, # optional
-  #                              'secure'  => true      # optional
-  #                             )
-  # 
-  #   cgi.out("cookie" => [cookie1, cookie2]) { "string" }
-  # 
-  #   name    = cookie1.name
-  #   values  = cookie1.value
-  #   path    = cookie1.path
-  #   domain  = cookie1.domain
-  #   expires = cookie1.expires
-  #   secure  = cookie1.secure
-  # 
-  #   cookie1.name    = 'name'
-  #   cookie1.value   = ['value1', 'value2', ...]
-  #   cookie1.path    = 'path'
-  #   cookie1.domain  = 'domain'
-  #   cookie1.expires = Time.now + 30
-  #   cookie1.secure  = true
-  class Cookie < DelegateClass(Array)
-
-    # Create a new CGI::Cookie object.
-    #
-    # The contents of the cookie can be specified as a +name+ and one
-    # or more +value+ arguments.  Alternatively, the contents can
-    # be specified as a single hash argument.  The possible keywords of
-    # this hash are as follows:
-    #
-    # name:: the name of the cookie.  Required.
-    # value:: the cookie's value or list of values.
-    # path:: the path for which this cookie applies.  Defaults to the
-    #        base directory of the CGI script.
-    # domain:: the domain for which this cookie applies.
-    # expires:: the time at which this cookie expires, as a +Time+ object.
-    # secure:: whether this cookie is a secure cookie or not (default to
-    #          false).  Secure cookies are only transmitted to HTTPS 
-    #          servers.
-    #
-    # These keywords correspond to attributes of the cookie object.
-    def initialize(name = "", *value)
-      options = if name.kind_of?(String)
-                  { "name" => name, "value" => value }
-                else
-                  name
-                end
-      unless options.has_key?("name")
-        raise ArgumentError, "`name' required"
-      end
-
-      @name = options["name"]
-      @value = Array(options["value"])
-      # simple support for IE
-      if options["path"]
-        @path = options["path"]
-      else
-        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
-        @path = ($1 or "")
-      end
-      @domain = options["domain"]
-      @expires = options["expires"]
-      @secure = options["secure"] == true ? true : false
-
-      super(@value)
-    end
-
-    attr_accessor("name", "value", "path", "domain", "expires")
-    attr_reader("secure")
-
-    # Set whether the Cookie is a secure cookie or not.
-    #
-    # +val+ must be a boolean.
-    def secure=(val)
-      @secure = val if val == true or val == false
-      @secure
-    end
-
-    # Convert the Cookie to its string representation.
-    def to_s
-      buf = ""
-      buf += @name + '='
-
-      if @value.kind_of?(String)
-        buf += CGI::escape(@value)
-      else
-        buf += @value.collect{|v| CGI::escape(v) }.join("&")
-      end
-
-      if @domain
-        buf += '; domain=' + @domain
-      end
-
-      if @path
-        buf += '; path=' + @path
-      end
-
-      if @expires
-        buf += '; expires=' + CGI::rfc1123_date(@expires)
-      end
-
-      if @secure == true
-        buf += '; secure'
-      end
-
-      buf
-    end
-
-  end # class Cookie
-
-
-  # Parse a raw cookie string into a hash of cookie-name=>Cookie
-  # pairs.
-  #
-  #   cookies = CGI::Cookie::parse("raw_cookie_string")
-  #     # { "name1" => cookie1, "name2" => cookie2, ... }
-  #
-  def Cookie::parse(raw_cookie)
-    cookies = Hash.new([])
-    return cookies unless raw_cookie
-
-    raw_cookie.split(/[;,]\s?/).each do |pairs|
-      name, values = pairs.split('=',2)
-      next unless name and values
-      name = CGI::unescape(name)
-      values ||= ""
-      values = values.split('&').collect{|v| CGI::unescape(v) }
-      if cookies.has_key?(name)
-        values = cookies[name].value + values
-      end
-      cookies[name] = Cookie::new({ "name" => name, "value" => values })
-    end
-
-    cookies
-  end
-
-  # Parse an HTTP query string into a hash of key=>value pairs.
-  #
-  #   params = CGI::parse("query_string")
-  #     # {"name1" => ["value1", "value2", ...],
-  #     #  "name2" => ["value1", "value2", ...], ... }
-  #
-  def CGI::parse(query)
-    params = Hash.new([].freeze)
-
-    query.split(/[&;]/n).each do |pairs|
-      key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
-      if params.has_key?(key)
-        params[key].push(value)
-      else
-        params[key] = [value]
-      end
-    end
-
-    params
-  end
-
-  # Mixin module. It provides the follow functionality groups:
-  #
-  # 1. Access to CGI environment variables as methods.  See 
-  #    documentation to the CGI class for a list of these variables.
-  #
-  # 2. Access to cookies, including the cookies attribute.
-  #
-  # 3. Access to parameters, including the params attribute, and overloading
-  #    [] to perform parameter value lookup by key.
-  #
-  # 4. The initialize_query method, for initialising the above
-  #    mechanisms, handling multipart forms, and allowing the
-  #    class to be used in "offline" mode.
-  #
-  module QueryExtension
-
-    %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
-      define_method(env.sub(/^HTTP_/n, '').downcase) do
-        (val = env_table[env]) && Integer(val)
-      end
-    end
-
-    %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
-        PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
-        REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
-        SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
-
-        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
-        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
-        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
-      define_method(env.sub(/^HTTP_/n, '').downcase) do
-        env_table[env]
-      end
-    end
-
-    # Get the raw cookies as a string.
-    def raw_cookie
-      env_table["HTTP_COOKIE"]
-    end
-
-    # Get the raw RFC2965 cookies as a string.
-    def raw_cookie2
-      env_table["HTTP_COOKIE2"]
-    end
-
-    # Get the cookies as a hash of cookie-name=>Cookie pairs.
-    attr_accessor("cookies")
-
-    # Get the parameters as a hash of name=>values pairs, where
-    # values is an Array.
-    attr("params")
-
-    # Set all the parameters.
-    def params=(hash)
-      @params.clear
-      @params.update(hash)
-    end
-
-    def read_multipart(boundary, content_length)
-      params = Hash.new([])
-      boundary = "--" + boundary
-      quoted_boundary = Regexp.quote(boundary, "n")
-      buf = ""
-      bufsize = 10 * 1024
-      boundary_end=""
-
-      # start multipart/form-data
-      stdinput.binmode if defined? stdinput.binmode
-      boundary_size = boundary.size + EOL.size
-      content_length -= boundary_size
-      status = stdinput.read(boundary_size)
-      if nil == status
-        raise EOFError, "no content body"
-      elsif boundary + EOL != status
-        raise EOFError, "bad content body"
-      end
-
-      loop do
-        head = nil
-        if 10240 < content_length
-          require "tempfile"
-          body = Tempfile.new("CGI")
-        else
-          begin
-            require "stringio"
-            body = StringIO.new
-          rescue LoadError
-            require "tempfile"
-            body = Tempfile.new("CGI")
-          end
-        end
-        body.binmode if defined? body.binmode
-
-        until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
-
-          if (not head) and /#{EOL}#{EOL}/n.match(buf)
-            buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
-              head = $1.dup
-              ""
-            end
-            next
-          end
-
-          if head and ( (EOL + boundary + EOL).size < buf.size )
-            body.print buf[0 ... (buf.size - (EOL + boundary + EOL).size)]
-            buf[0 ... (buf.size - (EOL + boundary + EOL).size)] = ""
-          end
-
-          c = if bufsize < content_length
-                stdinput.read(bufsize)
-              else
-                stdinput.read(content_length)
-              end
-          if c.nil? || c.empty?
-            raise EOFError, "bad content body"
-          end
-          buf.concat(c)
-          content_length -= c.size
-        end
-
-        buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do
-          body.print $1
-          if "--" == $2
-            content_length = -1
-          end
-          boundary_end = $2.dup
-          ""
-        end
-
-        body.rewind
-
-        /Content-Disposition:.* filename=(?:"((?:\\.|[^\"\s])*)"|([^;\s]*))/ni.match(head)
-	filename = ($1 or $2 or "")
-	if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
-	    /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and
-	    (not /MSIE/ni.match(env_table['HTTP_USER_AGENT']))
-	  filename = CGI::unescape(filename)
-	end
-        
-        /Content-Type: ([^\s]*)/ni.match(head)
-        content_type = ($1 or "")
-
-        (class << body; self; end).class_eval do
-          alias local_path path
-          define_method(:original_filename) {filename.dup.taint}
-          define_method(:content_type) {content_type.dup.taint}
-        end
-
-        /Content-Disposition:.* name="?([^\";\s]*)"?/ni.match(head)
-        name = $1.dup
-
-        if params.has_key?(name)
-          params[name].push(body)
-        else
-          params[name] = [body]
-        end
-        break if buf.size == 0
-        break if content_length == -1
-      end
-      raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
-
-      params
-    end # read_multipart
-    private :read_multipart
-
-    # offline mode. read name=value pairs on standard input.
-    def read_from_cmdline
-      require "shellwords"
-
-      string = unless ARGV.empty?
-        ARGV.join(' ')
-      else
-        if STDIN.tty?
-          STDERR.print(
-            %|(offline mode: enter name=value pairs on standard input)\n|
-          )
-        end
-        readlines.join(' ').gsub(/\n/n, '')
-      end.gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26')
-
-      words = Shellwords.shellwords(string)
-
-      if words.find{|x| /=/n.match(x) }
-        words.join('&')
-      else
-        words.join('+')
-      end
-    end
-    private :read_from_cmdline
-
-    # Initialize the data from the query.
-    #
-    # Handles multipart forms (in particular, forms that involve file uploads).
-    # Reads query parameters in the @params field, and cookies into @cookies.
-    def initialize_query()
-      if ("POST" == env_table['REQUEST_METHOD']) and
-         %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(env_table['CONTENT_TYPE'])
-        boundary = $1.dup
-        @multipart = true
-        @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
-      else
-        @multipart = false
-        @params = CGI::parse(
-                    case env_table['REQUEST_METHOD']
-                    when "GET", "HEAD"
-                      if defined?(MOD_RUBY)
-                        Apache::request.args or ""
-                      else
-                        env_table['QUERY_STRING'] or ""
-                      end
-                    when "POST"
-                      stdinput.binmode if defined? stdinput.binmode
-                      stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
-                    else
-                      read_from_cmdline
-                    end
-                  )
-      end
-
-      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
-    end
-    private :initialize_query
-
-    def multipart?
-      @multipart
-    end
-
-    module Value    # :nodoc:
-      def set_params(params)
-        @params = params
-      end
-      def [](idx, *args)
-        if args.size == 0
-          warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
-          @params[idx]
-        else
-          super[idx,*args]
-        end
-      end
-      def first
-        warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
-        self
-      end
-      alias last first
-      def to_a
-        @params || [self]
-      end
-      alias to_ary to_a   	# to be rhs of multiple assignment
-    end
-
-    # Get the value for the parameter with a given key.
-    #
-    # If the parameter has multiple values, only the first will be 
-    # retrieved; use #params() to get the array of values.
-    def [](key)
-      params = @params[key]
-      return '' unless params
-      value = params[0]
-      if @multipart
-        if value
-          return value
-        elsif defined? StringIO
-          StringIO.new("")
-        else
-          Tempfile.new("CGI")
-        end
-      else
-        str = if value then value.dup else "" end
-        str.extend(Value)
-        str.set_params(params)
-        str
-      end
-    end
-
-    # Return all parameter keys as an array.
-    def keys(*args)
-      @params.keys(*args)
-    end
-
-    # Returns true if a given parameter key exists in the query.
-    def has_key?(*args)
-      @params.has_key?(*args)
-    end
-    alias key? has_key?
-    alias include? has_key?
-
-  end # QueryExtension
-
-
-  # Prettify (indent) an HTML string.
-  #
-  # +string+ is the HTML string to indent.  +shift+ is the indentation
-  # unit to use; it defaults to two spaces.
-  #
-  #   print CGI::pretty("<HTML><BODY></BODY></HTML>")
-  #     # <HTML>
-  #     #   <BODY>
-  #     #   </BODY>
-  #     # </HTML>
-  # 
-  #   print CGI::pretty("<HTML><BODY></BODY></HTML>", "\t")
-  #     # <HTML>
-  #     #         <BODY>
-  #     #         </BODY>
-  #     # </HTML>
-  #
-  def CGI::pretty(string, shift = "  ")
-    lines = string.gsub(/(?!\A)<(?:.|\n)*?>/n, "\n\\0").gsub(/<(?:.|\n)*?>(?!\n)/n, "\\0\n")
-    end_pos = 0
-    while end_pos = lines.index(/^<\/(\w+)/n, end_pos)
-      element = $1.dup
-      start_pos = lines.rindex(/^\s*<#{element}/ni, end_pos)
-      lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/n, "\n" + shift) + "__"
-    end
-    lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/n, '\1')
-  end
-
-
-  # Base module for HTML-generation mixins.
-  #
-  # Provides methods for code generation for tags following
-  # the various DTD element types.
-  module TagMaker # :nodoc:
-
-    # Generate code for an element with required start and end tags.
-    #
-    #   - -
-    def nn_element_def(element)
-      nOE_element_def(element, <<-END)
-          if block_given?
-            yield.to_s
-          else
-            ""
-          end +
-          "</#{element.upcase}>"
-      END
-    end
-
-    # Generate code for an empty element.
-    #
-    #   - O EMPTY
-    def nOE_element_def(element, append = nil)
-      s = <<-END
-          "<#{element.upcase}" + attributes.collect{|name, value|
-            next unless value
-            " " + CGI::escapeHTML(name) +
-            if true == value
-              ""
-            else
-              '="' + CGI::escapeHTML(value) + '"'
-            end
-          }.to_s + ">"
-      END
-      s.sub!(/\Z/, " +") << append if append
-      s
-    end
-
-    # Generate code for an element for which the end (and possibly the
-    # start) tag is optional.
-    #
-    #   O O or - O
-    def nO_element_def(element)
-      nOE_element_def(element, <<-END)
-          if block_given?
-            yield.to_s + "</#{element.upcase}>"
-          else
-            ""
-          end
-      END
-    end
-
-  end # TagMaker
-
-
-  #
-  # Mixin module providing HTML generation methods.
-  #
-  # For example,
-  #   cgi.a("http://www.example.com") { "Example" }
-  #     # => "<A HREF=\"http://www.example.com\">Example</A>"
-  #
-  # Modules Http3, Http4, etc., contain more basic HTML-generation methods
-  # (:title, :center, etc.).
-  #
-  # See class CGI for a detailed example. 
-  #
-  module HtmlExtension
-
-
-    # Generate an Anchor element as a string.
-    #
-    # +href+ can either be a string, giving the URL
-    # for the HREF attribute, or it can be a hash of
-    # the element's attributes.
-    #
-    # The body of the element is the string returned by the no-argument
-    # block passed in.
-    #
-    #   a("http://www.example.com") { "Example" }
-    #     # => "<A HREF=\"http://www.example.com\">Example</A>"
-    #
-    #   a("HREF" => "http://www.example.com", "TARGET" => "_top") { "Example" }
-    #     # => "<A HREF=\"http://www.example.com\" TARGET=\"_top\">Example</A>"
-    #
-    def a(href = "") # :yield:
-      attributes = if href.kind_of?(String)
-                     { "HREF" => href }
-                   else
-                     href
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-    # Generate a Document Base URI element as a String. 
-    #
-    # +href+ can either by a string, giving the base URL for the HREF
-    # attribute, or it can be a has of the element's attributes.
-    #
-    # The passed-in no-argument block is ignored.
-    #
-    #   base("http://www.example.com/cgi")
-    #     # => "<BASE HREF=\"http://www.example.com/cgi\">"
-    def base(href = "") # :yield:
-      attributes = if href.kind_of?(String)
-                     { "HREF" => href }
-                   else
-                     href
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-    # Generate a BlockQuote element as a string.
-    #
-    # +cite+ can either be a string, give the URI for the source of
-    # the quoted text, or a hash, giving all attributes of the element,
-    # or it can be omitted, in which case the element has no attributes.
-    #
-    # The body is provided by the passed-in no-argument block
-    #
-    #   blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
-    #     #=> "<BLOCKQUOTE CITE=\"http://www.example.com/quotes/foo.html\">Foo!</BLOCKQUOTE>
-    def blockquote(cite = nil)  # :yield:
-      attributes = if cite.kind_of?(String)
-                     { "CITE" => cite }
-                   else
-                     cite or ""
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-
-    # Generate a Table Caption element as a string.
-    #
-    # +align+ can be a string, giving the alignment of the caption
-    # (one of top, bottom, left, or right).  It can be a hash of
-    # all the attributes of the element.  Or it can be omitted.
-    #
-    # The body of the element is provided by the passed-in no-argument block.
-    #
-    #   caption("left") { "Capital Cities" }
-    #     # => <CAPTION ALIGN=\"left\">Capital Cities</CAPTION>
-    def caption(align = nil) # :yield:
-      attributes = if align.kind_of?(String)
-                     { "ALIGN" => align }
-                   else
-                     align or ""
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-
-    # Generate a Checkbox Input element as a string.
-    #
-    # The attributes of the element can be specified as three arguments,
-    # +name+, +value+, and +checked+.  +checked+ is a boolean value;
-    # if true, the CHECKED attribute will be included in the element.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   checkbox("name")
-    #     # = checkbox("NAME" => "name")
-    # 
-    #   checkbox("name", "value")
-    #     # = checkbox("NAME" => "name", "VALUE" => "value")
-    # 
-    #   checkbox("name", "value", true)
-    #     # = checkbox("NAME" => "name", "VALUE" => "value", "CHECKED" => true)
-    def checkbox(name = "", value = nil, checked = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "checkbox", "NAME" => name,
-                       "VALUE" => value, "CHECKED" => checked }
-                   else
-                     name["TYPE"] = "checkbox"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a sequence of checkbox elements, as a String.
-    #
-    # The checkboxes will all have the same +name+ attribute.
-    # Each checkbox is followed by a label.
-    # There will be one checkbox for each value.  Each value
-    # can be specified as a String, which will be used both
-    # as the value of the VALUE attribute and as the label
-    # for that checkbox.  A single-element array has the
-    # same effect.
-    #
-    # Each value can also be specified as a three-element array.
-    # The first element is the VALUE attribute; the second is the
-    # label; and the third is a boolean specifying whether this
-    # checkbox is CHECKED.
-    #
-    # Each value can also be specified as a two-element
-    # array, by omitting either the value element (defaults
-    # to the same as the label), or the boolean checked element
-    # (defaults to false).
-    #
-    #   checkbox_group("name", "foo", "bar", "baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
-    # 
-    #   checkbox_group("name", ["foo"], ["bar", true], "baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
-    # 
-    #   checkbox_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="1">Foo
-    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="2">Bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="Baz">Baz
-    # 
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => ["foo", "bar", "baz"])
-    # 
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => [["foo"], ["bar", true], "baz"])
-    # 
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    def checkbox_group(name = "", *values)
-      if name.kind_of?(Hash)
-        values = name["VALUES"]
-        name = name["NAME"]
-      end
-      values.collect{|value|
-        if value.kind_of?(String)
-          checkbox(name, value) + value
-        else
-          if value[value.size - 1] == true
-            checkbox(name, value[0], true) +
-            value[value.size - 2]
-          else
-            checkbox(name, value[0]) +
-            value[value.size - 1]
-          end
-        end
-      }.to_s
-    end
-
-
-    # Generate an File Upload Input element as a string.
-    #
-    # The attributes of the element can be specified as three arguments,
-    # +name+, +size+, and +maxlength+.  +maxlength+ is the maximum length
-    # of the file's _name_, not of the file's _contents_.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # See #multipart_form() for forms that include file uploads.
-    #
-    #   file_field("name")
-    #     # <INPUT TYPE="file" NAME="name" SIZE="20">
-    # 
-    #   file_field("name", 40)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
-    # 
-    #   file_field("name", 40, 100)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40" MAXLENGTH="100">
-    # 
-    #   file_field("NAME" => "name", "SIZE" => 40)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
-    def file_field(name = "", size = 20, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "file", "NAME" => name,
-                       "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "file"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-
-    # Generate a Form element as a string.
-    #
-    # +method+ should be either "get" or "post", and defaults to the latter.
-    # +action+ defaults to the current CGI script name.  +enctype+
-    # defaults to "application/x-www-form-urlencoded".  
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # See also #multipart_form() for forms that include file uploads.
-    #
-    #   form{ "string" }
-    #     # <FORM METHOD="post" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    # 
-    #   form("get") { "string" }
-    #     # <FORM METHOD="get" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    # 
-    #   form("get", "url") { "string" }
-    #     # <FORM METHOD="get" ACTION="url" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    # 
-    #   form("METHOD" => "post", "ENCTYPE" => "enctype") { "string" }
-    #     # <FORM METHOD="post" ENCTYPE="enctype">string</FORM>
-    def form(method = "post", action = script_name, enctype = "application/x-www-form-urlencoded")
-      attributes = if method.kind_of?(String)
-                     { "METHOD" => method, "ACTION" => action,
-                       "ENCTYPE" => enctype } 
-                   else
-                     unless method.has_key?("METHOD")
-                       method["METHOD"] = "post"
-                     end
-                     unless method.has_key?("ENCTYPE")
-                       method["ENCTYPE"] = enctype
-                     end
-                     method
-                   end
-      if block_given?
-        body = yield
-      else
-        body = ""
-      end
-      if @output_hidden
-        body += @output_hidden.collect{|k,v|
-          "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
-        }.to_s
-      end
-      super(attributes){body}
-    end
-
-    # Generate a Hidden Input element as a string.
-    #
-    # The attributes of the element can be specified as two arguments,
-    # +name+ and +value+.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   hidden("name")
-    #     # <INPUT TYPE="hidden" NAME="name">
-    # 
-    #   hidden("name", "value")
-    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value">
-    # 
-    #   hidden("NAME" => "name", "VALUE" => "reset", "ID" => "foo")
-    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value" ID="foo">
-    def hidden(name = "", value = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "hidden", "NAME" => name, "VALUE" => value }
-                   else
-                     name["TYPE"] = "hidden"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a top-level HTML element as a string.
-    #
-    # The attributes of the element are specified as a hash.  The
-    # pseudo-attribute "PRETTY" can be used to specify that the generated
-    # HTML string should be indented.  "PRETTY" can also be specified as
-    # a string as the sole argument to this method.  The pseudo-attribute
-    # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
-    # should include the entire text of this tag, including angle brackets.
-    #
-    # The body of the html element is supplied as a block.
-    # 
-    #   html{ "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>string</HTML>
-    # 
-    #   html("LANG" => "ja") { "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML LANG="ja">string</HTML>
-    # 
-    #   html("DOCTYPE" => false) { "string" }
-    #     # <HTML>string</HTML>
-    # 
-    #   html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">') { "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML>string</HTML>
-    # 
-    #   html("PRETTY" => "  ") { "<BODY></BODY>" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-    #     # <HTML>
-    #     #   <BODY>
-    #     #   </BODY>
-    #     # </HTML>
-    # 
-    #   html("PRETTY" => "\t") { "<BODY></BODY>" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-    #     # <HTML>
-    #     #         <BODY>
-    #     #         </BODY>
-    #     # </HTML>
-    # 
-    #   html("PRETTY") { "<BODY></BODY>" }
-    #     # = html("PRETTY" => "  ") { "<BODY></BODY>" }
-    # 
-    #   html(if $VERBOSE then "PRETTY" end) { "HTML string" }
-    #
-    def html(attributes = {}) # :yield:
-      if nil == attributes
-        attributes = {}
-      elsif "PRETTY" == attributes
-        attributes = { "PRETTY" => true }
-      end
-      pretty = attributes.delete("PRETTY")
-      pretty = "  " if true == pretty
-      buf = ""
-
-      if attributes.has_key?("DOCTYPE")
-        if attributes["DOCTYPE"]
-          buf += attributes.delete("DOCTYPE")
-        else
-          attributes.delete("DOCTYPE")
-        end
-      else
-        buf += doctype
-      end
-
-      if block_given?
-        buf += super(attributes){ yield }
-      else
-        buf += super(attributes)
-      end
-
-      if pretty
-        CGI::pretty(buf, pretty)
-      else
-        buf
-      end
-
-    end
-
-    # Generate an Image Button Input element as a string.
-    #
-    # +src+ is the URL of the image to use for the button.  +name+ 
-    # is the input name.  +alt+ is the alternative text for the image.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    # 
-    #   image_button("url")
-    #     # <INPUT TYPE="image" SRC="url">
-    # 
-    #   image_button("url", "name", "string")
-    #     # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
-    # 
-    #   image_button("SRC" => "url", "ATL" => "strng")
-    #     # <INPUT TYPE="image" SRC="url" ALT="string">
-    def image_button(src = "", name = nil, alt = nil)
-      attributes = if src.kind_of?(String)
-                     { "TYPE" => "image", "SRC" => src, "NAME" => name,
-                       "ALT" => alt }
-                   else
-                     src["TYPE"] = "image"
-                     src["SRC"] ||= ""
-                     src
-                   end
-      input(attributes)
-    end
-
-
-    # Generate an Image element as a string.
-    #
-    # +src+ is the URL of the image.  +alt+ is the alternative text for
-    # the image.  +width+ is the width of the image, and +height+ is
-    # its height.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   img("src", "alt", 100, 50)
-    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
-    # 
-    #   img("SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50)
-    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
-    def img(src = "", alt = "", width = nil, height = nil)
-      attributes = if src.kind_of?(String)
-                     { "SRC" => src, "ALT" => alt }
-                   else
-                     src
-                   end
-      attributes["WIDTH"] = width.to_s if width
-      attributes["HEIGHT"] = height.to_s if height
-      super(attributes)
-    end
-
-
-    # Generate a Form element with multipart encoding as a String.
-    #
-    # Multipart encoding is used for forms that include file uploads.
-    #
-    # +action+ is the action to perform.  +enctype+ is the encoding
-    # type, which defaults to "multipart/form-data".
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   multipart_form{ "string" }
-    #     # <FORM METHOD="post" ENCTYPE="multipart/form-data">string</FORM>
-    # 
-    #   multipart_form("url") { "string" }
-    #     # <FORM METHOD="post" ACTION="url" ENCTYPE="multipart/form-data">string</FORM>
-    def multipart_form(action = nil, enctype = "multipart/form-data")
-      attributes = if action == nil
-                     { "METHOD" => "post", "ENCTYPE" => enctype } 
-                   elsif action.kind_of?(String)
-                     { "METHOD" => "post", "ACTION" => action,
-                       "ENCTYPE" => enctype } 
-                   else
-                     unless action.has_key?("METHOD")
-                       action["METHOD"] = "post"
-                     end
-                     unless action.has_key?("ENCTYPE")
-                       action["ENCTYPE"] = enctype
-                     end
-                     action
-                   end
-      if block_given?
-        form(attributes){ yield }
-      else
-        form(attributes)
-      end
-    end
-
-
-    # Generate a Password Input element as a string.
-    #
-    # +name+ is the name of the input field.  +value+ is its default
-    # value.  +size+ is the size of the input field display.  +maxlength+
-    # is the maximum length of the inputted password.
-    #
-    # Alternatively, attributes can be specified as a hash.
-    #
-    #   password_field("name")
-    #     # <INPUT TYPE="password" NAME="name" SIZE="40">
-    # 
-    #   password_field("name", "value")
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="40">
-    # 
-    #   password_field("password", "value", 80, 200)
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
-    # 
-    #   password_field("NAME" => "name", "VALUE" => "value")
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value">
-    def password_field(name = "", value = nil, size = 40, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "password", "NAME" => name,
-                       "VALUE" => value, "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "password"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-    # Generate a Select element as a string.
-    #
-    # +name+ is the name of the element.  The +values+ are the options that
-    # can be selected from the Select menu.  Each value can be a String or
-    # a one, two, or three-element Array.  If a String or a one-element
-    # Array, this is both the value of that option and the text displayed for
-    # it.  If a three-element Array, the elements are the option value, displayed
-    # text, and a boolean value specifying whether this option starts as selected.
-    # The two-element version omits either the option value (defaults to the same
-    # as the display text) or the boolean selected specifier (defaults to false).
-    #
-    # The attributes and options can also be specified as a hash.  In this
-    # case, options are specified as an array of values as described above,
-    # with the hash key of "VALUES".
-    #
-    #   popup_menu("name", "foo", "bar", "baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="foo">foo</OPTION>
-    #     #   <OPTION VALUE="bar">bar</OPTION>
-    #     #   <OPTION VALUE="baz">baz</OPTION>
-    #     # </SELECT>
-    # 
-    #   popup_menu("name", ["foo"], ["bar", true], "baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="foo">foo</OPTION>
-    #     #   <OPTION VALUE="bar" SELECTED>bar</OPTION>
-    #     #   <OPTION VALUE="baz">baz</OPTION>
-    #     # </SELECT>
-    # 
-    #   popup_menu("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="1">Foo</OPTION>
-    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
-    #     #   <OPTION VALUE="Baz">Baz</OPTION>
-    #     # </SELECT>
-    # 
-    #   popup_menu("NAME" => "name", "SIZE" => 2, "MULTIPLE" => true,
-    #               "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    #     # <SELECT NAME="name" MULTIPLE SIZE="2">
-    #     #   <OPTION VALUE="1">Foo</OPTION>
-    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
-    #     #   <OPTION VALUE="Baz">Baz</OPTION>
-    #     # </SELECT>
-    def popup_menu(name = "", *values)
-
-      if name.kind_of?(Hash)
-        values   = name["VALUES"]
-        size     = name["SIZE"].to_s if name["SIZE"]
-        multiple = name["MULTIPLE"]
-        name     = name["NAME"]
-      else
-        size = nil
-        multiple = nil
-      end
-
-      select({ "NAME" => name, "SIZE" => size,
-               "MULTIPLE" => multiple }){
-        values.collect{|value|
-          if value.kind_of?(String)
-            option({ "VALUE" => value }){ value }
-          else
-            if value[value.size - 1] == true
-              option({ "VALUE" => value[0], "SELECTED" => true }){
-                value[value.size - 2]
-              }
-            else
-              option({ "VALUE" => value[0] }){
-                value[value.size - 1]
-              }
-            end
-          end
-        }.to_s
-      }
-
-    end
-
-    # Generates a radio-button Input element.
-    #
-    # +name+ is the name of the input field.  +value+ is the value of
-    # the field if checked.  +checked+ specifies whether the field
-    # starts off checked.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   radio_button("name", "value")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value">
-    # 
-    #   radio_button("name", "value", true)
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" CHECKED>
-    # 
-    #   radio_button("NAME" => "name", "VALUE" => "value", "ID" => "foo")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" ID="foo">
-    def radio_button(name = "", value = nil, checked = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "radio", "NAME" => name,
-                       "VALUE" => value, "CHECKED" => checked }
-                   else
-                     name["TYPE"] = "radio"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a sequence of radio button Input elements, as a String.
-    #
-    # This works the same as #checkbox_group().  However, it is not valid
-    # to have more than one radiobutton in a group checked.
-    # 
-    #   radio_group("name", "foo", "bar", "baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
-    # 
-    #   radio_group("name", ["foo"], ["bar", true], "baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
-    # 
-    #   radio_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="1">Foo
-    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="2">Bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="Baz">Baz
-    # 
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => ["foo", "bar", "baz"])
-    # 
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => [["foo"], ["bar", true], "baz"])
-    # 
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    def radio_group(name = "", *values)
-      if name.kind_of?(Hash)
-        values = name["VALUES"]
-        name = name["NAME"]
-      end
-      values.collect{|value|
-        if value.kind_of?(String)
-          radio_button(name, value) + value
-        else
-          if value[value.size - 1] == true
-            radio_button(name, value[0], true) +
-            value[value.size - 2]
-          else
-            radio_button(name, value[0]) +
-            value[value.size - 1]
-          end
-        end
-      }.to_s
-    end
-
-    # Generate a reset button Input element, as a String.
-    #
-    # This resets the values on a form to their initial values.  +value+
-    # is the text displayed on the button. +name+ is the name of this button.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   reset
-    #     # <INPUT TYPE="reset">
-    # 
-    #   reset("reset")
-    #     # <INPUT TYPE="reset" VALUE="reset">
-    # 
-    #   reset("VALUE" => "reset", "ID" => "foo")
-    #     # <INPUT TYPE="reset" VALUE="reset" ID="foo">
-    def reset(value = nil, name = nil)
-      attributes = if (not value) or value.kind_of?(String)
-                     { "TYPE" => "reset", "VALUE" => value, "NAME" => name }
-                   else
-                     value["TYPE"] = "reset"
-                     value
-                   end
-      input(attributes)
-    end
-
-    alias scrolling_list popup_menu
-
-    # Generate a submit button Input element, as a String.
-    #
-    # +value+ is the text to display on the button.  +name+ is the name
-    # of the input.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   submit
-    #     # <INPUT TYPE="submit">
-    # 
-    #   submit("ok")
-    #     # <INPUT TYPE="submit" VALUE="ok">
-    # 
-    #   submit("ok", "button1")
-    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1">
-    # 
-    #   submit("VALUE" => "ok", "NAME" => "button1", "ID" => "foo")
-    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1" ID="foo">
-    def submit(value = nil, name = nil)
-      attributes = if (not value) or value.kind_of?(String)
-                     { "TYPE" => "submit", "VALUE" => value, "NAME" => name }
-                   else
-                     value["TYPE"] = "submit"
-                     value
-                   end
-      input(attributes)
-    end
-
-    # Generate a text field Input element, as a String.
-    #
-    # +name+ is the name of the input field.  +value+ is its initial
-    # value.  +size+ is the size of the input area.  +maxlength+
-    # is the maximum length of input accepted.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   text_field("name")
-    #     # <INPUT TYPE="text" NAME="name" SIZE="40">
-    # 
-    #   text_field("name", "value")
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="40">
-    # 
-    #   text_field("name", "value", 80)
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80">
-    # 
-    #   text_field("name", "value", 80, 200)
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
-    # 
-    #   text_field("NAME" => "name", "VALUE" => "value")
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value">
-    def text_field(name = "", value = nil, size = 40, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "text", "NAME" => name, "VALUE" => value,
-                       "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "text"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-    # Generate a TextArea element, as a String.
-    #
-    # +name+ is the name of the textarea.  +cols+ is the number of
-    # columns and +rows+ is the number of rows in the display.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # The body is provided by the passed-in no-argument block
-    #
-    #   textarea("name")
-    #      # = textarea("NAME" => "name", "COLS" => 70, "ROWS" => 10)
-    #
-    #   textarea("name", 40, 5)
-    #      # = textarea("NAME" => "name", "COLS" => 40, "ROWS" => 5)
-    def textarea(name = "", cols = 70, rows = 10)  # :yield:
-      attributes = if name.kind_of?(String)
-                     { "NAME" => name, "COLS" => cols.to_s,
-                       "ROWS" => rows.to_s }
-                   else
-                     name
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-  end # HtmlExtension
-
-
-  # Mixin module for HTML version 3 generation methods.
-  module Html3 # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      extend TagMaker
-      methods = ""
-      # - -
-      for element in %w[ A TT I B U STRIKE BIG SMALL SUB SUP EM STRONG
-          DFN CODE SAMP KBD VAR CITE FONT ADDRESS DIV center MAP
-          APPLET PRE XMP LISTING DL OL UL DIR MENU SELECT table TITLE
-          STYLE SCRIPT H1 H2 H3 H4 H5 H6 TEXTAREA FORM BLOCKQUOTE
-          CAPTION ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
-          ISINDEX META ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # O O or - O
-      for element in %w[ HTML HEAD BODY P PLAINTEXT DT DD LI OPTION tr
-          th td ]
-        methods += <<-BEGIN + nO_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html3
-
-
-  # Mixin module for HTML version 4 generation methods.
-  module Html4 # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      extend TagMaker
-      methods = ""
-      # - -
-      for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
-        VAR CITE ABBR ACRONYM SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
-        H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT OPTGROUP
-        FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
-        TEXTAREA FORM A BLOCKQUOTE CAPTION ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # O O or - O
-      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
-          COLGROUP TR TH TD HEAD]
-        methods += <<-BEGIN + nO_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html4
-
-
-  # Mixin module for HTML version 4 transitional generation methods.
-  module Html4Tr # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      extend TagMaker
-      methods = ""
-      # - -
-      for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
-          CODE SAMP KBD VAR CITE ABBR ACRONYM FONT SUB SUP SPAN BDO
-          ADDRESS DIV CENTER MAP OBJECT APPLET H1 H2 H3 H4 H5 H6 PRE Q
-          INS DEL DL OL UL DIR MENU LABEL SELECT OPTGROUP FIELDSET
-          LEGEND BUTTON TABLE IFRAME NOFRAMES TITLE STYLE SCRIPT
-          NOSCRIPT TEXTAREA FORM A BLOCKQUOTE CAPTION ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
-          COL ISINDEX META ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # O O or - O
-      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
-          COLGROUP TR TH TD HEAD ]
-        methods += <<-BEGIN + nO_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html4Tr
-
-
-  # Mixin module for generating HTML version 4 with framesets.
-  module Html4Fr # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      methods = ""
-      # - -
-      for element in %w[ FRAMESET ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ FRAME ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html4Fr
-
-
-  # Creates a new CGI instance.
-  #
-  # +type+ specifies which version of HTML to load the HTML generation
-  # methods for.  The following versions of HTML are supported:
-  #
-  # html3:: HTML 3.x
-  # html4:: HTML 4.0
-  # html4Tr:: HTML 4.0 Transitional
-  # html4Fr:: HTML 4.0 with Framesets
-  #
-  # If not specified, no HTML generation methods will be loaded.
-  #
-  # If the CGI object is not created in a standard CGI call environment
-  # (that is, it can't locate REQUEST_METHOD in its environment), then
-  # it will run in "offline" mode.  In this mode, it reads its parameters
-  # from the command line or (failing that) from standard input.  Otherwise,
-  # cookies and other parameters are parsed automatically from the standard
-  # CGI locations, which varies according to the REQUEST_METHOD.
-  def initialize(type = "query")
-    if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
-      Apache.request.setup_cgi_env
-    end
-
-    extend QueryExtension
-    @multipart = false
-    if defined?(CGI_PARAMS)
-      warn "do not use CGI_PARAMS and CGI_COOKIES"
-      @params = CGI_PARAMS.dup
-      @cookies = CGI_COOKIES.dup
-    else
-      initialize_query()  # set @params, @cookies
-    end
-    @output_cookies = nil
-    @output_hidden = nil
-
-    case type
-    when "html3"
-      extend Html3
-      element_init()
-      extend HtmlExtension
-    when "html4"
-      extend Html4
-      element_init()
-      extend HtmlExtension
-    when "html4Tr"
-      extend Html4Tr
-      element_init()
-      extend HtmlExtension
-    when "html4Fr"
-      extend Html4Tr
-      element_init()
-      extend Html4Fr
-      element_init()
-      extend HtmlExtension
-    end
-  end
-
-end   # class CGI
+require 'cgi/core'
+require 'cgi/cookie'
+require 'cgi/util'
+CGI.autoload(:HtmlExtension, 'cgi/html')
diff --git a/lib/cgi/.document b/lib/cgi/.document
index 107f2f317c..4153f97aa5 100644
--- a/lib/cgi/.document
+++ b/lib/cgi/.document
@@ -1,2 +1 @@
-session.rb
-
+session.rb
+\ No newline at end of file
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
new file mode 100644
index 0000000000..97a92efc3a
--- /dev/null
+++ b/lib/cgi/cookie.rb
@@ -0,0 +1,147 @@
+# Class representing an HTTP cookie.
+#
+# In addition to its specific fields and methods, a Cookie instance
+# is a delegator to the array of its values.
+#
+# See RFC 2965.
+#
+# == Examples of use
+#   cookie1 = CGI::Cookie::new("name", "value1", "value2", ...)
+#   cookie1 = CGI::Cookie::new("name" => "name", "value" => "value")
+#   cookie1 = CGI::Cookie::new('name'    => 'name',
+#                              'value'   => ['value1', 'value2', ...],
+#                              'path'    => 'path',   # optional
+#                              'domain'  => 'domain', # optional
+#                              'expires' => Time.now, # optional
+#                              'secure'  => true      # optional
+#                             )
+#
+#   cgi.out("cookie" => [cookie1, cookie2]) { "string" }
+#
+#   name    = cookie1.name
+#   values  = cookie1.value
+#   path    = cookie1.path
+#   domain  = cookie1.domain
+#   expires = cookie1.expires
+#   secure  = cookie1.secure
+#
+#   cookie1.name    = 'name'
+#   cookie1.value   = ['value1', 'value2', ...]
+#   cookie1.path    = 'path'
+#   cookie1.domain  = 'domain'
+#   cookie1.expires = Time.now + 30
+#   cookie1.secure  = true
+class CGI
+  @@accept_charset="UTF-8" unless defined?(@@accept_charset)
+  class Cookie < Array
+
+    # Create a new CGI::Cookie object.
+    #
+    # The contents of the cookie can be specified as a +name+ and one
+    # or more +value+ arguments.  Alternatively, the contents can
+    # be specified as a single hash argument.  The possible keywords of
+    # this hash are as follows:
+    #
+    # name:: the name of the cookie.  Required.
+    # value:: the cookie's value or list of values.
+    # path:: the path for which this cookie applies.  Defaults to the
+    #        base directory of the CGI script.
+    # domain:: the domain for which this cookie applies.
+    # expires:: the time at which this cookie expires, as a +Time+ object.
+    # secure:: whether this cookie is a secure cookie or not (default to
+    #          false).  Secure cookies are only transmitted to HTTPS
+    #          servers.
+    #
+    # These keywords correspond to attributes of the cookie object.
+    def initialize(name = "", *value)
+      @domain = nil
+      @expires = nil
+      if name.kind_of?(String)
+        @name = name
+        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
+        @path = ($1 or "")
+        @secure = false
+        return super(value)
+      end
+
+      options = name
+      unless options.has_key?("name")
+        raise ArgumentError, "`name' required"
+      end
+
+      @name = options["name"]
+      value = Array(options["value"])
+      # simple support for IE
+      if options["path"]
+        @path = options["path"]
+      else
+        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
+        @path = ($1 or "")
+      end
+      @domain = options["domain"]
+      @expires = options["expires"]
+      @secure = options["secure"] == true ? true : false
+
+      super(value)
+    end
+
+    attr_accessor("name", "path", "domain", "expires")
+    attr_reader("secure")
+
+    def value
+      self
+    end
+
+    def value=(val)
+      replace(Array(val))
+    end
+
+    # Set whether the Cookie is a secure cookie or not.
+    #
+    # +val+ must be a boolean.
+    def secure=(val)
+      @secure = val if val == true or val == false
+      @secure
+    end
+
+    # Convert the Cookie to its string representation.
+    def to_s
+      val = collect{|v| CGI::escape(v) }.join("&")
+      buf = "#{@name}=#{val}"
+      buf << "; domain=#{@domain}" if @domain
+      buf << "; path=#{@path}"     if @path
+      buf << "; expires=#{CGI::rfc1123_date(@expires)}" if @expires
+      buf << "; secure"            if @secure == true
+      buf
+    end
+
+  end # class Cookie
+
+
+  # Parse a raw cookie string into a hash of cookie-name=>Cookie
+  # pairs.
+  #
+  #   cookies = CGI::Cookie::parse("raw_cookie_string")
+  #     # { "name1" => cookie1, "name2" => cookie2, ... }
+  #
+  def Cookie::parse(raw_cookie)
+    cookies = Hash.new([])
+    return cookies unless raw_cookie
+
+    raw_cookie.split(/[;,]\s?/).each do |pairs|
+      name, values = pairs.split('=',2)
+      next unless name and values
+      name = CGI::unescape(name)
+      values ||= ""
+      values = values.split('&').collect{|v| CGI::unescape(v,@@accept_charset) }
+      if cookies.has_key?(name)
+        values = cookies[name].value + values
+      end
+      cookies[name] = Cookie::new(name, *values)
+    end
+
+    cookies
+  end
+end
+
+
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
new file mode 100644
index 0000000000..41efea9c72
--- /dev/null
+++ b/lib/cgi/core.rb
@@ -0,0 +1,791 @@
+class CGI
+
+  $CGI_ENV = ENV    # for FCGI support
+
+  # String for carriage return
+  CR  = "\015"
+
+  # String for linefeed
+  LF  = "\012"
+
+  # Standard internet newline sequence
+  EOL = CR + LF
+
+  REVISION = '$Id$' #:nodoc:
+
+  NEEDS_BINMODE = File::BINARY != 0
+
+  # Path separators in different environments.
+  PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
+
+  # HTTP status codes.
+  HTTP_STATUS = {
+    "OK"                  => "200 OK",
+    "PARTIAL_CONTENT"     => "206 Partial Content",
+    "MULTIPLE_CHOICES"    => "300 Multiple Choices",
+    "MOVED"               => "301 Moved Permanently",
+    "REDIRECT"            => "302 Found",
+    "NOT_MODIFIED"        => "304 Not Modified",
+    "BAD_REQUEST"         => "400 Bad Request",
+    "AUTH_REQUIRED"       => "401 Authorization Required",
+    "FORBIDDEN"           => "403 Forbidden",
+    "NOT_FOUND"           => "404 Not Found",
+    "METHOD_NOT_ALLOWED"  => "405 Method Not Allowed",
+    "NOT_ACCEPTABLE"      => "406 Not Acceptable",
+    "LENGTH_REQUIRED"     => "411 Length Required",
+    "PRECONDITION_FAILED" => "412 Precondition Failed",
+    "SERVER_ERROR"        => "500 Internal Server Error",
+    "NOT_IMPLEMENTED"     => "501 Method Not Implemented",
+    "BAD_GATEWAY"         => "502 Bad Gateway",
+    "VARIANT_ALSO_VARIES" => "506 Variant Also Negotiates"
+  }
+
+  # :startdoc:
+
+  def env_table
+    ENV
+  end
+
+  def stdinput
+    $stdin
+  end
+
+  def stdoutput
+    $stdout
+  end
+
+  private :env_table, :stdinput, :stdoutput
+
+
+  # Create an HTTP header block as a string.
+  #
+  # Includes the empty line that ends the header block.
+  #
+  # +options+ can be a string specifying the Content-Type (defaults
+  # to text/html), or a hash of header key/value pairs.  The following
+  # header keys are recognized:
+  #
+  # type:: the Content-Type header.  Defaults to "text/html"
+  # charset:: the charset of the body, appended to the Content-Type header.
+  # nph:: a boolean value.  If true, prepend protocol string and status code, and
+  #       date; and sets default values for "server" and "connection" if not
+  #       explicitly set.
+  # status:: the HTTP status code, returned as the Status header.  See the
+  #          list of available status codes below.
+  # server:: the server software, returned as the Server header.
+  # connection:: the connection type, returned as the Connection header (for
+  #              instance, "close".
+  # length:: the length of the content that will be sent, returned as the
+  #          Content-Length header.
+  # language:: the language of the content, returned as the Content-Language
+  #            header.
+  # expires:: the time on which the current content expires, as a +Time+
+  #           object, returned as the Expires header.
+  # cookie:: a cookie or cookies, returned as one or more Set-Cookie headers.
+  #          The value can be the literal string of the cookie; a CGI::Cookie
+  #          object; an Array of literal cookie strings or Cookie objects; or a
+  #          hash all of whose values are literal cookie strings or Cookie objects.
+  #          These cookies are in addition to the cookies held in the
+  #          @output_cookies field.
+  #
+  # Other header lines can also be set; they are appended as key: value.
+  #
+  #   header
+  #     # Content-Type: text/html
+  #
+  #   header("text/plain")
+  #     # Content-Type: text/plain
+  #
+  #   header("nph"        => true,
+  #          "status"     => "OK",  # == "200 OK"
+  #            # "status"     => "200 GOOD",
+  #          "server"     => ENV['SERVER_SOFTWARE'],
+  #          "connection" => "close",
+  #          "type"       => "text/html",
+  #          "charset"    => "iso-2022-jp",
+  #            # Content-Type: text/html; charset=iso-2022-jp
+  #          "length"     => 103,
+  #          "language"   => "ja",
+  #          "expires"    => Time.now + 30,
+  #          "cookie"     => [cookie1, cookie2],
+  #          "my_header1" => "my_value"
+  #          "my_header2" => "my_value")
+  #
+  # The status codes are:
+  #
+  #   "OK"                  --> "200 OK"
+  #   "PARTIAL_CONTENT"     --> "206 Partial Content"
+  #   "MULTIPLE_CHOICES"    --> "300 Multiple Choices"
+  #   "MOVED"               --> "301 Moved Permanently"
+  #   "REDIRECT"            --> "302 Found"
+  #   "NOT_MODIFIED"        --> "304 Not Modified"
+  #   "BAD_REQUEST"         --> "400 Bad Request"
+  #   "AUTH_REQUIRED"       --> "401 Authorization Required"
+  #   "FORBIDDEN"           --> "403 Forbidden"
+  #   "NOT_FOUND"           --> "404 Not Found"
+  #   "METHOD_NOT_ALLOWED"  --> "405 Method Not Allowed"
+  #   "NOT_ACCEPTABLE"      --> "406 Not Acceptable"
+  #   "LENGTH_REQUIRED"     --> "411 Length Required"
+  #   "PRECONDITION_FAILED" --> "412 Precondition Failed"
+  #   "SERVER_ERROR"        --> "500 Internal Server Error"
+  #   "NOT_IMPLEMENTED"     --> "501 Method Not Implemented"
+  #   "BAD_GATEWAY"         --> "502 Bad Gateway"
+  #   "VARIANT_ALSO_VARIES" --> "506 Variant Also Negotiates"
+  #
+  # This method does not perform charset conversion.
+  def header(options='text/html')
+    if options.is_a?(String)
+      content_type = options
+      buf = _header_for_string(content_type)
+    elsif options.is_a?(Hash)
+      if options.size == 1 && options.has_key?('type')
+        content_type = options['type']
+        buf = _header_for_string(content_type)
+      else
+        buf = _header_for_hash(options.dup)
+      end
+    else
+      raise ArgumentError.new("expected String or Hash but got #{options.class}")
+    end
+    if defined?(MOD_RUBY)
+      _header_for_modruby(buf)
+      return ''
+    else
+      buf << EOL    # empty line of separator
+      return buf
+    end
+  end # header()
+
+  def _header_for_string(content_type) #:nodoc:
+    buf = ''
+    if nph?()
+      buf << "#{$CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'} 200 OK#{EOL}"
+      buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
+      buf << "Server: #{$CGI_ENV['SERVER_SOFTWARE']}#{EOL}"
+      buf << "Connection: close#{EOL}"
+    end
+    buf << "Content-Type: #{content_type}#{EOL}"
+    if @output_cookies
+      @output_cookies.each {|cookie| buf << "Set-Cookie: #{cookie}#{EOL}" }
+    end
+    return buf
+  end # _header_for_string
+  private :_header_for_string
+
+  def _header_for_hash(options)  #:nodoc:
+    buf = ''
+    ## add charset to option['type']
+    options['type'] ||= 'text/html'
+    charset = options.delete('charset')
+    options['type'] += "; charset=#{charset}" if charset
+    ## NPH
+    options.delete('nph') if defined?(MOD_RUBY)
+    if options.delete('nph') || nph?()
+      protocol = $CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'
+      status = options.delete('status')
+      status = HTTP_STATUS[status] || status || '200 OK'
+      buf << "#{protocol} #{status}#{EOL}"
+      buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
+      options['server'] ||= $CGI_ENV['SERVER_SOFTWARE'] || ''
+      options['connection'] ||= 'close'
+    end
+    ## common headers
+    status = options.delete('status')
+    buf << "Status: #{HTTP_STATUS[status] || status}#{EOL}" if status
+    server = options.delete('server')
+    buf << "Server: #{server}#{EOL}" if server
+    connection = options.delete('connection')
+    buf << "Connection: #{connection}#{EOL}" if connection
+    type = options.delete('type')
+    buf << "Content-Type: #{type}#{EOL}" #if type
+    length = options.delete('length')
+    buf << "Content-Length: #{length}#{EOL}" if length
+    language = options.delete('language')
+    buf << "Content-Language: #{language}#{EOL}" if language
+    expires = options.delete('expires')
+    buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
+    ## cookie
+    if cookie = options.delete('cookie')
+      case cookie
+      when String, Cookie
+        buf << "Set-Cookie: #{cookie}#{EOL}"
+      when Array
+        arr = cookie
+        arr.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+      when Hash
+        hash = cookie
+        hash.each {|name, c| buf << "Set-Cookie: #{c}#{EOL}" }
+      end
+    end
+    if @output_cookies
+      @output_cookies.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+    end
+    ## other headers
+    options.each do |key, value|
+      buf << "#{key}: #{value}#{EOL}"
+    end
+    return buf
+  end # _header_for_hash
+  private :_header_for_hash
+
+  def nph?  #:nodoc:
+    return /IIS\/(\d+)/.match($CGI_ENV['SERVER_SOFTWARE']) && $1.to_i < 5
+  end
+
+  def _header_for_modruby(buf)  #:nodoc:
+    request = Apache::request
+    buf.scan(/([^:]+): (.+)#{EOL}/o) do |name, value|
+      warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
+      case name
+      when 'Set-Cookie'
+        request.headers_out.add(name, value)
+      when /^status$/i
+        request.status_line = value
+        request.status = value.to_i
+      when /^content-type$/i
+        request.content_type = value
+      when /^content-encoding$/i
+        request.content_encoding = value
+      when /^location$/i
+        request.status = 302 if request.status == 200
+        request.headers_out[name] = value
+      else
+        request.headers_out[name] = value
+      end
+    end
+    request.send_http_header
+    return ''
+  end
+  private :_header_for_modruby
+  #
+
+  # Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
+  #
+  # The header is provided by +options+, as for #header().
+  # The body of the document is that returned by the passed-
+  # in block.  This block takes no arguments.  It is required.
+  #
+  #   cgi = CGI.new
+  #   cgi.out{ "string" }
+  #     # Content-Type: text/html
+  #     # Content-Length: 6
+  #     #
+  #     # string
+  #
+  #   cgi.out("text/plain") { "string" }
+  #     # Content-Type: text/plain
+  #     # Content-Length: 6
+  #     #
+  #     # string
+  #
+  #   cgi.out("nph"        => true,
+  #           "status"     => "OK",  # == "200 OK"
+  #           "server"     => ENV['SERVER_SOFTWARE'],
+  #           "connection" => "close",
+  #           "type"       => "text/html",
+  #           "charset"    => "iso-2022-jp",
+  #             # Content-Type: text/html; charset=iso-2022-jp
+  #           "language"   => "ja",
+  #           "expires"    => Time.now + (3600 * 24 * 30),
+  #           "cookie"     => [cookie1, cookie2],
+  #           "my_header1" => "my_value",
+  #           "my_header2" => "my_value") { "string" }
+  #
+  # Content-Length is automatically calculated from the size of
+  # the String returned by the content block.
+  #
+  # If ENV['REQUEST_METHOD'] == "HEAD", then only the header
+  # is outputted (the content block is still required, but it
+  # is ignored).
+  #
+  # If the charset is "iso-2022-jp" or "euc-jp" or "shift_jis" then
+  # the content is converted to this charset, and the language is set
+  # to "ja".
+  def out(options = "text/html") # :yield:
+
+    options = { "type" => options } if options.kind_of?(String)
+    content = yield
+    options["length"] = content.bytesize.to_s
+    output = stdoutput
+    output.binmode if defined? output.binmode
+    output.print header(options)
+    output.print content unless "HEAD" == env_table['REQUEST_METHOD']
+  end
+
+
+  # Print an argument or list of arguments to the default output stream
+  #
+  #   cgi = CGI.new
+  #   cgi.print    # default:  cgi.print == $DEFAULT_OUTPUT.print
+  def print(*options)
+    stdoutput.print(*options)
+  end
+
+  # Parse an HTTP query string into a hash of key=>value pairs.
+  #
+  #   params = CGI::parse("query_string")
+  #     # {"name1" => ["value1", "value2", ...],
+  #     #  "name2" => ["value1", "value2", ...], ... }
+  #
+  def CGI::parse(query)
+    params = {}
+    query.split(/[&;]/).each do |pairs|
+      key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
+      if key && value
+        params.has_key?(key) ? params[key].push(value) : params[key] = [value]
+      elsif key
+        params[key]=[]
+      end
+    end
+    params.default=[].freeze
+    params
+  end
+
+  # Maximum content length of post data
+  ##MAX_CONTENT_LENGTH  = 2 * 1024 * 1024
+
+  # Maximum content length of multipart data
+  MAX_MULTIPART_LENGTH  = 128 * 1024 * 1024
+
+  # Maximum number of request parameters when multipart
+  MAX_MULTIPART_COUNT = 128
+
+  # Mixin module. It provides the follow functionality groups:
+  #
+  # 1. Access to CGI environment variables as methods.  See
+  #    documentation to the CGI class for a list of these variables.
+  #
+  # 2. Access to cookies, including the cookies attribute.
+  #
+  # 3. Access to parameters, including the params attribute, and overloading
+  #    [] to perform parameter value lookup by key.
+  #
+  # 4. The initialize_query method, for initialising the above
+  #    mechanisms, handling multipart forms, and allowing the
+  #    class to be used in "offline" mode.
+  #
+  module QueryExtension
+
+    %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
+      define_method(env.sub(/^HTTP_/, '').downcase) do
+        (val = env_table[env]) && Integer(val)
+      end
+    end
+
+    %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
+        PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
+        REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
+        SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
+
+        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
+        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
+        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
+      define_method(env.sub(/^HTTP_/, '').downcase) do
+        env_table[env]
+      end
+    end
+
+    # Get the raw cookies as a string.
+    def raw_cookie
+      env_table["HTTP_COOKIE"]
+    end
+
+    # Get the raw RFC2965 cookies as a string.
+    def raw_cookie2
+      env_table["HTTP_COOKIE2"]
+    end
+
+    # Get the cookies as a hash of cookie-name=>Cookie pairs.
+    attr_accessor :cookies
+
+    # Get the parameters as a hash of name=>values pairs, where
+    # values is an Array.
+    attr_reader :params
+
+    # Get the uploaded files as a hash of name=>values pairs
+    attr_reader :files
+
+    # Set all the parameters.
+    def params=(hash)
+      @params.clear
+      @params.update(hash)
+    end
+
+    def read_multipart(boundary, content_length)
+      ## read first boundary
+      stdin = $stdin
+      first_line = "--#{boundary}#{EOL}"
+      content_length -= first_line.bytesize
+      status = stdin.read(first_line.bytesize)
+      raise EOFError.new("no content body")  unless status
+      raise EOFError.new("bad content body") unless first_line == status
+      ## parse and set params
+      params = {}
+      @files = {}
+      boundary_rexp = /--#{Regexp.quote(boundary)}(#{EOL}|--)/
+      boundary_size = "#{EOL}--#{boundary}#{EOL}".bytesize
+      boundary_end  = nil
+      buf = ''
+      bufsize = 10 * 1024
+      max_count = MAX_MULTIPART_COUNT
+      n = 0
+      while true
+        (n += 1) < max_count or raise StandardError.new("too many parameters.")
+        ## create body (StringIO or Tempfile)
+        body = create_body(bufsize < content_length)
+        class << body
+          if method_defined?(:path)
+            alias local_path path
+          else
+            def local_path
+              nil
+            end
+          end
+          attr_reader :original_filename, :content_type
+        end
+        ## find head and boundary
+        head = nil
+        separator = EOL * 2
+        until head && matched = boundary_rexp.match(buf)
+          if !head && pos = buf.index(separator)
+            len  = pos + EOL.bytesize
+            head = buf[0, len]
+            buf  = buf[(pos+separator.bytesize)..-1]
+          else
+            if head && buf.size > boundary_size
+              len = buf.size - boundary_size
+              body.print(buf[0, len])
+              buf[0, len] = ''
+            end
+            c = stdin.read(bufsize < content_length ? bufsize : content_length)
+            raise EOFError.new("bad content body") if c.nil? || c.empty?
+            buf << c
+            content_length -= c.bytesize
+          end
+        end
+        ## read to end of boundary
+        m = matched
+        len = m.begin(0)
+        s = buf[0, len]
+        if s =~ /(\r?\n)\z/
+          s = buf[0, len - $1.bytesize]
+        end
+        body.print(s)
+        buf = buf[m.end(0)..-1]
+        boundary_end = m[1]
+        content_length = -1 if boundary_end == '--'
+        ## reset file cursor position
+        body.rewind
+        ## original filename
+        /Content-Disposition:.* filename=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
+        filename = $1 || $2 || ''
+        filename = CGI.unescape(filename) if unescape_filename?()
+        body.instance_variable_set('@original_filename', filename.taint)
+        ## content type
+        /Content-Type: (.*)/i.match(head)
+        (content_type = $1 || '').chomp!
+        body.instance_variable_set('@content_type', content_type.taint)
+        ## query parameter name
+        /Content-Disposition:.* name=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
+        name = $1 || $2 || ''
+        if body.original_filename.empty?
+          value=body.read.dup.force_encoding(@accept_charset)
+          (params[name] ||= []) << value
+          unless value.valid_encoding?
+            if @accept_charset_error_block
+              @accept_charset_error_block.call(name,value)
+            else
+              raise InvalidEncoding,"Accept-Charset encoding error"
+            end
+          end
+          class << params[name].last;self;end.class_eval do
+            define_method(:read){self}
+            define_method(:original_filename){""}
+            define_method(:content_type){""}
+          end
+        else
+          (params[name] ||= []) << body
+          @files[name]=body
+        end
+        ## break loop
+        break if buf.size == 0
+        break if content_length == -1
+      end
+      raise EOFError, "bad boundary end of body part" unless boundary_end =~ /--/
+      params.default = []
+      params
+    end # read_multipart
+    private :read_multipart
+    def create_body(is_large)  #:nodoc:
+      if is_large
+        require 'tempfile'
+        body = Tempfile.new('CGI', encoding: "ascii-8bit")
+      else
+        begin
+          require 'stringio'
+          body = StringIO.new("".force_encoding("ascii-8bit"))
+        rescue LoadError
+          require 'tempfile'
+          body = Tempfile.new('CGI', encoding: "ascii-8bit")
+        end
+      end
+      body.binmode if defined? body.binmode
+      return body
+    end
+    def unescape_filename?  #:nodoc:
+      user_agent = $CGI_ENV['HTTP_USER_AGENT']
+      return /Mac/i.match(user_agent) && /Mozilla/i.match(user_agent) && !/MSIE/i.match(user_agent)
+    end
+
+    # offline mode. read name=value pairs on standard input.
+    def read_from_cmdline
+      require "shellwords"
+
+      string = unless ARGV.empty?
+        ARGV.join(' ')
+      else
+        if STDIN.tty?
+          STDERR.print(
+            %|(offline mode: enter name=value pairs on standard input)\n|
+          )
+        end
+        array = readlines rescue nil
+        if not array.nil?
+            array.join(' ').gsub(/\n/n, '')
+        else
+            ""
+        end
+      end.gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26')
+
+      words = Shellwords.shellwords(string)
+
+      if words.find{|x| /=/n.match(x) }
+        words.join('&')
+      else
+        words.join('+')
+      end
+    end
+    private :read_from_cmdline
+
+    # A wrapper class to use a StringIO object as the body and switch
+    # to a TempFile when the passed threshold is passed.
+    # Initialize the data from the query.
+    #
+    # Handles multipart forms (in particular, forms that involve file uploads).
+    # Reads query parameters in the @params field, and cookies into @cookies.
+    def initialize_query()
+      if ("POST" == env_table['REQUEST_METHOD']) and
+         %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|.match(env_table['CONTENT_TYPE'])
+        raise StandardError.new("too large multipart data.") if env_table['CONTENT_LENGTH'].to_i > MAX_MULTIPART_LENGTH
+        boundary = $1.dup
+        @multipart = true
+        @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
+      else
+        @multipart = false
+        @params = CGI::parse(
+                    case env_table['REQUEST_METHOD']
+                    when "GET", "HEAD"
+                      if defined?(MOD_RUBY)
+                        Apache::request.args or ""
+                      else
+                        env_table['QUERY_STRING'] or ""
+                      end
+                    when "POST"
+                      stdinput.binmode if defined? stdinput.binmode
+                      stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
+                    else
+                      read_from_cmdline
+                    end.dup.force_encoding(@accept_charset)
+                  )
+        unless Encoding.find(@accept_charset) == Encoding::ASCII_8BIT
+          @params.each do |key,values|
+            values.each do |value|
+              unless value.valid_encoding?
+                if @accept_charset_error_block
+                  @accept_charset_error_block.call(key,value)
+                else
+                  raise InvalidEncoding,"Accept-Charset encoding error"
+                end
+              end
+            end
+          end
+        end
+      end
+
+      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
+    end
+    private :initialize_query
+
+    def multipart?
+      @multipart
+    end
+
+    # Get the value for the parameter with a given key.
+    #
+    # If the parameter has multiple values, only the first will be
+    # retrieved; use #params() to get the array of values.
+    def [](key)
+      params = @params[key]
+      return '' unless params
+      value = params[0]
+      if @multipart
+        if value
+          return value
+        elsif defined? StringIO
+          StringIO.new("".force_encoding("ascii-8bit"))
+        else
+          Tempfile.new("CGI",encoding:"ascii-8bit")
+        end
+      else
+        str = if value then value.dup else "" end
+        str
+      end
+    end
+
+    # Return all parameter keys as an array.
+    def keys(*args)
+      @params.keys(*args)
+    end
+
+    # Returns true if a given parameter key exists in the query.
+    def has_key?(*args)
+      @params.has_key?(*args)
+    end
+    alias key? has_key?
+    alias include? has_key?
+
+  end # QueryExtension
+
+  # InvalidEncoding Exception class
+  class InvalidEncoding < Exception; end
+
+  # @@accept_charset is default accept character set.
+  # This default value default is "UTF-8"
+  # If you want to change the default accept character set
+  # when create a new CGI instance, set this:
+  #
+  #   CGI.accept_charset = "EUC-JP"
+  #
+
+  @@accept_charset="UTF-8"
+
+  def self.accept_charset
+    @@accept_charset
+  end
+
+  def self.accept_charset=(accept_charset)
+    @@accept_charset=accept_charset
+  end
+
+  # Create a new CGI instance.
+  #
+  # CGI accept constructor parameters either in a hash, string as a block.
+  # But string is as same as using :tag_maker of hash.
+  #
+  #   CGI.new("html3") #=>  CGI.new(:tag_maker=>"html3")
+  #
+  # And, if you specify string, @accept_charset cannot be changed.
+  # Instead, please use hash parameter.
+  #
+  # == accept_charset
+  #
+  # :accept_charset specifies encoding of received query string.
+  # ( Default value is @@accept_charset. )
+  # If not valid, raise CGI::InvalidEncoding
+  #
+  # Example. Suppose @@accept_charset # => "UTF-8"
+  #
+  # when not specified:
+  #
+  #   cgi=CGI.new      # @accept_charset # => "UTF-8"
+  #
+  # when specified "EUC-JP":
+  #
+  #   cgi=CGI.new(:accept_charset => "EUC-JP") # => "EUC-JP"
+  #
+  # == block
+  #
+  # When you use a block, you can write a process
+  # that query encoding is invalid. Example:
+  #
+  #   encoding_error={}
+  #   cgi=CGI.new(:accept_charset=>"EUC-JP") do |name,value|
+  #     encoding_error[key] = value
+  #   end
+  #
+  # == tag_maker
+  #
+  # :tag_maker specifies which version of HTML to load the HTML generation
+  # methods for.  The following versions of HTML are supported:
+  #
+  # html3:: HTML 3.x
+  # html4:: HTML 4.0
+  # html4Tr:: HTML 4.0 Transitional
+  # html4Fr:: HTML 4.0 with Framesets
+  #
+  # If not specified, no HTML generation methods will be loaded.
+  #
+  # If the CGI object is not created in a standard CGI call environment
+  # (that is, it can't locate REQUEST_METHOD in its environment), then
+  # it will run in "offline" mode.  In this mode, it reads its parameters
+  # from the command line or (failing that) from standard input.  Otherwise,
+  # cookies and other parameters are parsed automatically from the standard
+  # CGI locations, which varies according to the REQUEST_METHOD. It works this:
+  #
+  #   CGI.new(:tag_maker=>"html3")
+  #
+  # This will be obsolete:
+  #
+  #   CGI.new("html3")
+  #
+  attr_reader :accept_charset
+  def initialize(options = {},&block)
+    @accept_charset_error_block=block if block_given?
+    @options={:accept_charset=>@@accept_charset}
+    case options
+    when Hash
+      @options.merge!(options)
+    when String
+      @options[:tag_maker]=options
+    end
+    @accept_charset=@options[:accept_charset]
+    if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
+      Apache.request.setup_cgi_env
+    end
+
+    extend QueryExtension
+    @multipart = false
+
+    initialize_query()  # set @params, @cookies
+    @output_cookies = nil
+    @output_hidden = nil
+
+    case @options[:tag_maker]
+    when "html3"
+      require 'cgi/html'
+      extend Html3
+      element_init()
+      extend HtmlExtension
+    when "html4"
+      require 'cgi/html'
+      extend Html4
+      element_init()
+      extend HtmlExtension
+    when "html4Tr"
+      require 'cgi/html'
+      extend Html4Tr
+      element_init()
+      extend HtmlExtension
+    when "html4Fr"
+      require 'cgi/html'
+      extend Html4Tr
+      element_init()
+      extend Html4Fr
+      element_init()
+      extend HtmlExtension
+    end
+  end
+
+end   # class CGI
+
+
diff --git a/lib/cgi/html.rb b/lib/cgi/html.rb
new file mode 100644
index 0000000000..28642198fd
--- /dev/null
+++ b/lib/cgi/html.rb
@@ -0,0 +1,1021 @@
+  # Base module for HTML-generation mixins.
+  #
+  # Provides methods for code generation for tags following
+  # the various DTD element types.
+class CGI
+  module TagMaker # :nodoc:
+
+    # Generate code for an element with required start and end tags.
+    #
+    #   - -
+    def nn_element_def(element)
+      nOE_element_def(element, <<-END)
+          if block_given?
+            yield.to_s
+          else
+            ""
+          end +
+          "</#{element.upcase}>"
+      END
+    end
+
+    # Generate code for an empty element.
+    #
+    #   - O EMPTY
+    def nOE_element_def(element, append = nil)
+      s = <<-END
+          attributes={attributes=>nil} if attributes.kind_of?(String)
+          "<#{element.upcase}" + attributes.collect{|name, value|
+            next unless value
+            " " + CGI::escapeHTML(name.to_s) +
+            if true == value
+              ""
+            else
+              '="' + CGI::escapeHTML(value.to_s) + '"'
+            end
+          }.join + ">"
+      END
+      s.sub!(/\Z/, " +") << append if append
+      s
+    end
+
+    # Generate code for an element for which the end (and possibly the
+    # start) tag is optional.
+    #
+    #   O O or - O
+    def nO_element_def(element)
+      nOE_element_def(element, <<-END)
+          if block_given?
+            yield.to_s + "</#{element.upcase}>"
+          else
+            ""
+          end
+      END
+    end
+
+  end # TagMaker
+
+
+  #
+  # Mixin module providing HTML generation methods.
+  #
+  # For example,
+  #   cgi.a("http://www.example.com") { "Example" }
+  #     # => "<A HREF=\"http://www.example.com\">Example</A>"
+  #
+  # Modules Http3, Http4, etc., contain more basic HTML-generation methods
+  # (:title, :center, etc.).
+  #
+  # See class CGI for a detailed example.
+  #
+  module HtmlExtension
+
+
+    # Generate an Anchor element as a string.
+    #
+    # +href+ can either be a string, giving the URL
+    # for the HREF attribute, or it can be a hash of
+    # the element's attributes.
+    #
+    # The body of the element is the string returned by the no-argument
+    # block passed in.
+    #
+    #   a("http://www.example.com") { "Example" }
+    #     # => "<A HREF=\"http://www.example.com\">Example</A>"
+    #
+    #   a("HREF" => "http://www.example.com", "TARGET" => "_top") { "Example" }
+    #     # => "<A HREF=\"http://www.example.com\" TARGET=\"_top\">Example</A>"
+    #
+    def a(href = "") # :yield:
+      attributes = if href.kind_of?(String)
+                     { "HREF" => href }
+                   else
+                     href
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+    # Generate a Document Base URI element as a String.
+    #
+    # +href+ can either by a string, giving the base URL for the HREF
+    # attribute, or it can be a has of the element's attributes.
+    #
+    # The passed-in no-argument block is ignored.
+    #
+    #   base("http://www.example.com/cgi")
+    #     # => "<BASE HREF=\"http://www.example.com/cgi\">"
+    def base(href = "") # :yield:
+      attributes = if href.kind_of?(String)
+                     { "HREF" => href }
+                   else
+                     href
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+    # Generate a BlockQuote element as a string.
+    #
+    # +cite+ can either be a string, give the URI for the source of
+    # the quoted text, or a hash, giving all attributes of the element,
+    # or it can be omitted, in which case the element has no attributes.
+    #
+    # The body is provided by the passed-in no-argument block
+    #
+    #   blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
+    #     #=> "<BLOCKQUOTE CITE=\"http://www.example.com/quotes/foo.html\">Foo!</BLOCKQUOTE>
+    def blockquote(cite = {})  # :yield:
+      attributes = if cite.kind_of?(String)
+                     { "CITE" => cite }
+                   else
+                     cite
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+
+    # Generate a Table Caption element as a string.
+    #
+    # +align+ can be a string, giving the alignment of the caption
+    # (one of top, bottom, left, or right).  It can be a hash of
+    # all the attributes of the element.  Or it can be omitted.
+    #
+    # The body of the element is provided by the passed-in no-argument block.
+    #
+    #   caption("left") { "Capital Cities" }
+    #     # => <CAPTION ALIGN=\"left\">Capital Cities</CAPTION>
+    def caption(align = {}) # :yield:
+      attributes = if align.kind_of?(String)
+                     { "ALIGN" => align }
+                   else
+                     align
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+
+    # Generate a Checkbox Input element as a string.
+    #
+    # The attributes of the element can be specified as three arguments,
+    # +name+, +value+, and +checked+.  +checked+ is a boolean value;
+    # if true, the CHECKED attribute will be included in the element.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   checkbox("name")
+    #     # = checkbox("NAME" => "name")
+    #
+    #   checkbox("name", "value")
+    #     # = checkbox("NAME" => "name", "VALUE" => "value")
+    #
+    #   checkbox("name", "value", true)
+    #     # = checkbox("NAME" => "name", "VALUE" => "value", "CHECKED" => true)
+    def checkbox(name = "", value = nil, checked = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "checkbox", "NAME" => name,
+                       "VALUE" => value, "CHECKED" => checked }
+                   else
+                     name["TYPE"] = "checkbox"
+                     name
+                   end
+      input(attributes)
+    end
+
+    # Generate a sequence of checkbox elements, as a String.
+    #
+    # The checkboxes will all have the same +name+ attribute.
+    # Each checkbox is followed by a label.
+    # There will be one checkbox for each value.  Each value
+    # can be specified as a String, which will be used both
+    # as the value of the VALUE attribute and as the label
+    # for that checkbox.  A single-element array has the
+    # same effect.
+    #
+    # Each value can also be specified as a three-element array.
+    # The first element is the VALUE attribute; the second is the
+    # label; and the third is a boolean specifying whether this
+    # checkbox is CHECKED.
+    #
+    # Each value can also be specified as a two-element
+    # array, by omitting either the value element (defaults
+    # to the same as the label), or the boolean checked element
+    # (defaults to false).
+    #
+    #   checkbox_group("name", "foo", "bar", "baz")
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
+    #
+    #   checkbox_group("name", ["foo"], ["bar", true], "baz")
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
+    #
+    #   checkbox_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="1">Foo
+    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="2">Bar
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="Baz">Baz
+    #
+    #   checkbox_group("NAME" => "name",
+    #                    "VALUES" => ["foo", "bar", "baz"])
+    #
+    #   checkbox_group("NAME" => "name",
+    #                    "VALUES" => [["foo"], ["bar", true], "baz"])
+    #
+    #   checkbox_group("NAME" => "name",
+    #                    "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+    def checkbox_group(name = "", *values)
+      if name.kind_of?(Hash)
+        values = name["VALUES"]
+        name = name["NAME"]
+      end
+      values.collect{|value|
+        if value.kind_of?(String)
+          checkbox(name, value) + value
+        else
+          if value[-1] == true || value[-1] == false
+            checkbox(name, value[0],  value[-1]) +
+            value[-2]
+          else
+            checkbox(name, value[0]) +
+            value[-1]
+          end
+        end
+      }.join
+    end
+
+
+    # Generate an File Upload Input element as a string.
+    #
+    # The attributes of the element can be specified as three arguments,
+    # +name+, +size+, and +maxlength+.  +maxlength+ is the maximum length
+    # of the file's _name_, not of the file's _contents_.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    # See #multipart_form() for forms that include file uploads.
+    #
+    #   file_field("name")
+    #     # <INPUT TYPE="file" NAME="name" SIZE="20">
+    #
+    #   file_field("name", 40)
+    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
+    #
+    #   file_field("name", 40, 100)
+    #     # <INPUT TYPE="file" NAME="name" SIZE="40" MAXLENGTH="100">
+    #
+    #   file_field("NAME" => "name", "SIZE" => 40)
+    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
+    def file_field(name = "", size = 20, maxlength = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "file", "NAME" => name,
+                       "SIZE" => size.to_s }
+                   else
+                     name["TYPE"] = "file"
+                     name
+                   end
+      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+      input(attributes)
+    end
+
+
+    # Generate a Form element as a string.
+    #
+    # +method+ should be either "get" or "post", and defaults to the latter.
+    # +action+ defaults to the current CGI script name.  +enctype+
+    # defaults to "application/x-www-form-urlencoded".
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    # See also #multipart_form() for forms that include file uploads.
+    #
+    #   form{ "string" }
+    #     # <FORM METHOD="post" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+    #
+    #   form("get") { "string" }
+    #     # <FORM METHOD="get" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+    #
+    #   form("get", "url") { "string" }
+    #     # <FORM METHOD="get" ACTION="url" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+    #
+    #   form("METHOD" => "post", "ENCTYPE" => "enctype") { "string" }
+    #     # <FORM METHOD="post" ENCTYPE="enctype">string</FORM>
+    def form(method = "post", action = script_name, enctype = "application/x-www-form-urlencoded")
+      attributes = if method.kind_of?(String)
+                     { "METHOD" => method, "ACTION" => action,
+                       "ENCTYPE" => enctype }
+                   else
+                     unless method.has_key?("METHOD")
+                       method["METHOD"] = "post"
+                     end
+                     unless method.has_key?("ENCTYPE")
+                       method["ENCTYPE"] = enctype
+                     end
+                     method
+                   end
+      if block_given?
+        body = yield
+      else
+        body = ""
+      end
+      if @output_hidden
+        body += @output_hidden.collect{|k,v|
+          "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
+        }.join
+      end
+      super(attributes){body}
+    end
+
+    # Generate a Hidden Input element as a string.
+    #
+    # The attributes of the element can be specified as two arguments,
+    # +name+ and +value+.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   hidden("name")
+    #     # <INPUT TYPE="hidden" NAME="name">
+    #
+    #   hidden("name", "value")
+    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value">
+    #
+    #   hidden("NAME" => "name", "VALUE" => "reset", "ID" => "foo")
+    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value" ID="foo">
+    def hidden(name = "", value = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "hidden", "NAME" => name, "VALUE" => value }
+                   else
+                     name["TYPE"] = "hidden"
+                     name
+                   end
+      input(attributes)
+    end
+
+    # Generate a top-level HTML element as a string.
+    #
+    # The attributes of the element are specified as a hash.  The
+    # pseudo-attribute "PRETTY" can be used to specify that the generated
+    # HTML string should be indented.  "PRETTY" can also be specified as
+    # a string as the sole argument to this method.  The pseudo-attribute
+    # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
+    # should include the entire text of this tag, including angle brackets.
+    #
+    # The body of the html element is supplied as a block.
+    #
+    #   html{ "string" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>string</HTML>
+    #
+    #   html("LANG" => "ja") { "string" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML LANG="ja">string</HTML>
+    #
+    #   html("DOCTYPE" => false) { "string" }
+    #     # <HTML>string</HTML>
+    #
+    #   html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">') { "string" }
+    #     # <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML>string</HTML>
+    #
+    #   html("PRETTY" => "  ") { "<BODY></BODY>" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+    #     # <HTML>
+    #     #   <BODY>
+    #     #   </BODY>
+    #     # </HTML>
+    #
+    #   html("PRETTY" => "\t") { "<BODY></BODY>" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+    #     # <HTML>
+    #     #         <BODY>
+    #     #         </BODY>
+    #     # </HTML>
+    #
+    #   html("PRETTY") { "<BODY></BODY>" }
+    #     # = html("PRETTY" => "  ") { "<BODY></BODY>" }
+    #
+    #   html(if $VERBOSE then "PRETTY" end) { "HTML string" }
+    #
+    def html(attributes = {}) # :yield:
+      if nil == attributes
+        attributes = {}
+      elsif "PRETTY" == attributes
+        attributes = { "PRETTY" => true }
+      end
+      pretty = attributes.delete("PRETTY")
+      pretty = "  " if true == pretty
+      buf = ""
+
+      if attributes.has_key?("DOCTYPE")
+        if attributes["DOCTYPE"]
+          buf += attributes.delete("DOCTYPE")
+        else
+          attributes.delete("DOCTYPE")
+        end
+      else
+        buf += doctype
+      end
+
+      if block_given?
+        buf += super(attributes){ yield }
+      else
+        buf += super(attributes)
+      end
+
+      if pretty
+        CGI::pretty(buf, pretty)
+      else
+        buf
+      end
+
+    end
+
+    # Generate an Image Button Input element as a string.
+    #
+    # +src+ is the URL of the image to use for the button.  +name+
+    # is the input name.  +alt+ is the alternative text for the image.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   image_button("url")
+    #     # <INPUT TYPE="image" SRC="url">
+    #
+    #   image_button("url", "name", "string")
+    #     # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
+    #
+    #   image_button("SRC" => "url", "ALT" => "string")
+    #     # <INPUT TYPE="image" SRC="url" ALT="string">
+    def image_button(src = "", name = nil, alt = nil)
+      attributes = if src.kind_of?(String)
+                     { "TYPE" => "image", "SRC" => src, "NAME" => name,
+                       "ALT" => alt }
+                   else
+                     src["TYPE"] = "image"
+                     src["SRC"] ||= ""
+                     src
+                   end
+      input(attributes)
+    end
+
+
+    # Generate an Image element as a string.
+    #
+    # +src+ is the URL of the image.  +alt+ is the alternative text for
+    # the image.  +width+ is the width of the image, and +height+ is
+    # its height.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   img("src", "alt", 100, 50)
+    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
+    #
+    #   img("SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50)
+    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
+    def img(src = "", alt = "", width = nil, height = nil)
+      attributes = if src.kind_of?(String)
+                     { "SRC" => src, "ALT" => alt }
+                   else
+                     src
+                   end
+      attributes["WIDTH"] = width.to_s if width
+      attributes["HEIGHT"] = height.to_s if height
+      super(attributes)
+    end
+
+
+    # Generate a Form element with multipart encoding as a String.
+    #
+    # Multipart encoding is used for forms that include file uploads.
+    #
+    # +action+ is the action to perform.  +enctype+ is the encoding
+    # type, which defaults to "multipart/form-data".
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   multipart_form{ "string" }
+    #     # <FORM METHOD="post" ENCTYPE="multipart/form-data">string</FORM>
+    #
+    #   multipart_form("url") { "string" }
+    #     # <FORM METHOD="post" ACTION="url" ENCTYPE="multipart/form-data">string</FORM>
+    def multipart_form(action = nil, enctype = "multipart/form-data")
+      attributes = if action == nil
+                     { "METHOD" => "post", "ENCTYPE" => enctype }
+                   elsif action.kind_of?(String)
+                     { "METHOD" => "post", "ACTION" => action,
+                       "ENCTYPE" => enctype }
+                   else
+                     unless action.has_key?("METHOD")
+                       action["METHOD"] = "post"
+                     end
+                     unless action.has_key?("ENCTYPE")
+                       action["ENCTYPE"] = enctype
+                     end
+                     action
+                   end
+      if block_given?
+        form(attributes){ yield }
+      else
+        form(attributes)
+      end
+    end
+
+
+    # Generate a Password Input element as a string.
+    #
+    # +name+ is the name of the input field.  +value+ is its default
+    # value.  +size+ is the size of the input field display.  +maxlength+
+    # is the maximum length of the inputted password.
+    #
+    # Alternatively, attributes can be specified as a hash.
+    #
+    #   password_field("name")
+    #     # <INPUT TYPE="password" NAME="name" SIZE="40">
+    #
+    #   password_field("name", "value")
+    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="40">
+    #
+    #   password_field("password", "value", 80, 200)
+    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
+    #
+    #   password_field("NAME" => "name", "VALUE" => "value")
+    #     # <INPUT TYPE="password" NAME="name" VALUE="value">
+    def password_field(name = "", value = nil, size = 40, maxlength = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "password", "NAME" => name,
+                       "VALUE" => value, "SIZE" => size.to_s }
+                   else
+                     name["TYPE"] = "password"
+                     name
+                   end
+      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+      input(attributes)
+    end
+
+    # Generate a Select element as a string.
+    #
+    # +name+ is the name of the element.  The +values+ are the options that
+    # can be selected from the Select menu.  Each value can be a String or
+    # a one, two, or three-element Array.  If a String or a one-element
+    # Array, this is both the value of that option and the text displayed for
+    # it.  If a three-element Array, the elements are the option value, displayed
+    # text, and a boolean value specifying whether this option starts as selected.
+    # The two-element version omits either the option value (defaults to the same
+    # as the display text) or the boolean selected specifier (defaults to false).
+    #
+    # The attributes and options can also be specified as a hash.  In this
+    # case, options are specified as an array of values as described above,
+    # with the hash key of "VALUES".
+    #
+    #   popup_menu("name", "foo", "bar", "baz")
+    #     # <SELECT NAME="name">
+    #     #   <OPTION VALUE="foo">foo</OPTION>
+    #     #   <OPTION VALUE="bar">bar</OPTION>
+    #     #   <OPTION VALUE="baz">baz</OPTION>
+    #     # </SELECT>
+    #
+    #   popup_menu("name", ["foo"], ["bar", true], "baz")
+    #     # <SELECT NAME="name">
+    #     #   <OPTION VALUE="foo">foo</OPTION>
+    #     #   <OPTION VALUE="bar" SELECTED>bar</OPTION>
+    #     #   <OPTION VALUE="baz">baz</OPTION>
+    #     # </SELECT>
+    #
+    #   popup_menu("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+    #     # <SELECT NAME="name">
+    #     #   <OPTION VALUE="1">Foo</OPTION>
+    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
+    #     #   <OPTION VALUE="Baz">Baz</OPTION>
+    #     # </SELECT>
+    #
+    #   popup_menu("NAME" => "name", "SIZE" => 2, "MULTIPLE" => true,
+    #               "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+    #     # <SELECT NAME="name" MULTIPLE SIZE="2">
+    #     #   <OPTION VALUE="1">Foo</OPTION>
+    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
+    #     #   <OPTION VALUE="Baz">Baz</OPTION>
+    #     # </SELECT>
+    def popup_menu(name = "", *values)
+
+      if name.kind_of?(Hash)
+        values   = name["VALUES"]
+        size     = name["SIZE"].to_s if name["SIZE"]
+        multiple = name["MULTIPLE"]
+        name     = name["NAME"]
+      else
+        size = nil
+        multiple = nil
+      end
+
+      select({ "NAME" => name, "SIZE" => size,
+               "MULTIPLE" => multiple }){
+        values.collect{|value|
+          if value.kind_of?(String)
+            option({ "VALUE" => value }){ value }
+          else
+            if value[value.size - 1] == true
+              option({ "VALUE" => value[0], "SELECTED" => true }){
+                value[value.size - 2]
+              }
+            else
+              option({ "VALUE" => value[0] }){
+                value[value.size - 1]
+              }
+            end
+          end
+        }.join
+      }
+
+    end
+
+    # Generates a radio-button Input element.
+    #
+    # +name+ is the name of the input field.  +value+ is the value of
+    # the field if checked.  +checked+ specifies whether the field
+    # starts off checked.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   radio_button("name", "value")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="value">
+    #
+    #   radio_button("name", "value", true)
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" CHECKED>
+    #
+    #   radio_button("NAME" => "name", "VALUE" => "value", "ID" => "foo")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" ID="foo">
+    def radio_button(name = "", value = nil, checked = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "radio", "NAME" => name,
+                       "VALUE" => value, "CHECKED" => checked }
+                   else
+                     name["TYPE"] = "radio"
+                     name
+                   end
+      input(attributes)
+    end
+
+    # Generate a sequence of radio button Input elements, as a String.
+    #
+    # This works the same as #checkbox_group().  However, it is not valid
+    # to have more than one radiobutton in a group checked.
+    #
+    #   radio_group("name", "foo", "bar", "baz")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
+    #
+    #   radio_group("name", ["foo"], ["bar", true], "baz")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
+    #
+    #   radio_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="1">Foo
+    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="2">Bar
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="Baz">Baz
+    #
+    #   radio_group("NAME" => "name",
+    #                 "VALUES" => ["foo", "bar", "baz"])
+    #
+    #   radio_group("NAME" => "name",
+    #                 "VALUES" => [["foo"], ["bar", true], "baz"])
+    #
+    #   radio_group("NAME" => "name",
+    #                 "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+    def radio_group(name = "", *values)
+      if name.kind_of?(Hash)
+        values = name["VALUES"]
+        name = name["NAME"]
+      end
+      values.collect{|value|
+        if value.kind_of?(String)
+          radio_button(name, value) + value
+        else
+          if value[-1] == true || value[-1] == false
+            radio_button(name, value[0],  value[-1]) +
+            value[-2]
+          else
+            radio_button(name, value[0]) +
+            value[-1]
+          end
+        end
+      }.join
+    end
+
+    # Generate a reset button Input element, as a String.
+    #
+    # This resets the values on a form to their initial values.  +value+
+    # is the text displayed on the button. +name+ is the name of this button.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   reset
+    #     # <INPUT TYPE="reset">
+    #
+    #   reset("reset")
+    #     # <INPUT TYPE="reset" VALUE="reset">
+    #
+    #   reset("VALUE" => "reset", "ID" => "foo")
+    #     # <INPUT TYPE="reset" VALUE="reset" ID="foo">
+    def reset(value = nil, name = nil)
+      attributes = if (not value) or value.kind_of?(String)
+                     { "TYPE" => "reset", "VALUE" => value, "NAME" => name }
+                   else
+                     value["TYPE"] = "reset"
+                     value
+                   end
+      input(attributes)
+    end
+
+    alias scrolling_list popup_menu
+
+    # Generate a submit button Input element, as a String.
+    #
+    # +value+ is the text to display on the button.  +name+ is the name
+    # of the input.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   submit
+    #     # <INPUT TYPE="submit">
+    #
+    #   submit("ok")
+    #     # <INPUT TYPE="submit" VALUE="ok">
+    #
+    #   submit("ok", "button1")
+    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1">
+    #
+    #   submit("VALUE" => "ok", "NAME" => "button1", "ID" => "foo")
+    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1" ID="foo">
+    def submit(value = nil, name = nil)
+      attributes = if (not value) or value.kind_of?(String)
+                     { "TYPE" => "submit", "VALUE" => value, "NAME" => name }
+                   else
+                     value["TYPE"] = "submit"
+                     value
+                   end
+      input(attributes)
+    end
+
+    # Generate a text field Input element, as a String.
+    #
+    # +name+ is the name of the input field.  +value+ is its initial
+    # value.  +size+ is the size of the input area.  +maxlength+
+    # is the maximum length of input accepted.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   text_field("name")
+    #     # <INPUT TYPE="text" NAME="name" SIZE="40">
+    #
+    #   text_field("name", "value")
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="40">
+    #
+    #   text_field("name", "value", 80)
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80">
+    #
+    #   text_field("name", "value", 80, 200)
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
+    #
+    #   text_field("NAME" => "name", "VALUE" => "value")
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value">
+    def text_field(name = "", value = nil, size = 40, maxlength = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "text", "NAME" => name, "VALUE" => value,
+                       "SIZE" => size.to_s }
+                   else
+                     name["TYPE"] = "text"
+                     name
+                   end
+      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+      input(attributes)
+    end
+
+    # Generate a TextArea element, as a String.
+    #
+    # +name+ is the name of the textarea.  +cols+ is the number of
+    # columns and +rows+ is the number of rows in the display.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    # The body is provided by the passed-in no-argument block
+    #
+    #   textarea("name")
+    #      # = textarea("NAME" => "name", "COLS" => 70, "ROWS" => 10)
+    #
+    #   textarea("name", 40, 5)
+    #      # = textarea("NAME" => "name", "COLS" => 40, "ROWS" => 5)
+    def textarea(name = "", cols = 70, rows = 10)  # :yield:
+      attributes = if name.kind_of?(String)
+                     { "NAME" => name, "COLS" => cols.to_s,
+                       "ROWS" => rows.to_s }
+                   else
+                     name
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+  end # HtmlExtension
+
+
+  # Mixin module for HTML version 3 generation methods.
+  module Html3 # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      extend TagMaker
+      methods = ""
+      # - -
+      for element in %w[ A TT I B U STRIKE BIG SMALL SUB SUP EM STRONG
+          DFN CODE SAMP KBD VAR CITE FONT ADDRESS DIV center MAP
+          APPLET PRE XMP LISTING DL OL UL DIR MENU SELECT table TITLE
+          STYLE SCRIPT H1 H2 H3 H4 H5 H6 TEXTAREA FORM BLOCKQUOTE
+          CAPTION ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
+          ISINDEX META ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # O O or - O
+      for element in %w[ HTML HEAD BODY P PLAINTEXT DT DD LI OPTION tr
+          th td ]
+        methods += <<-BEGIN + nO_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html3
+
+
+  # Mixin module for HTML version 4 generation methods.
+  module Html4 # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      extend TagMaker
+      methods = ""
+      # - -
+      for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
+        VAR CITE ABBR ACRONYM SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
+        H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT OPTGROUP
+        FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
+        TEXTAREA FORM A BLOCKQUOTE CAPTION ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # O O or - O
+      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
+          COLGROUP TR TH TD HEAD]
+        methods += <<-BEGIN + nO_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html4
+
+
+  # Mixin module for HTML version 4 transitional generation methods.
+  module Html4Tr # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      extend TagMaker
+      methods = ""
+      # - -
+      for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
+          CODE SAMP KBD VAR CITE ABBR ACRONYM FONT SUB SUP SPAN BDO
+          ADDRESS DIV CENTER MAP OBJECT APPLET H1 H2 H3 H4 H5 H6 PRE Q
+          INS DEL DL OL UL DIR MENU LABEL SELECT OPTGROUP FIELDSET
+          LEGEND BUTTON TABLE IFRAME NOFRAMES TITLE STYLE SCRIPT
+          NOSCRIPT TEXTAREA FORM A BLOCKQUOTE CAPTION ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
+          COL ISINDEX META ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # O O or - O
+      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
+          COLGROUP TR TH TD HEAD ]
+        methods += <<-BEGIN + nO_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html4Tr
+
+
+  # Mixin module for generating HTML version 4 with framesets.
+  module Html4Fr # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      methods = ""
+      # - -
+      for element in %w[ FRAMESET ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ FRAME ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html4Fr
+end
+
+
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 5568b28dce..65d6442b37 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -13,7 +13,7 @@
 #
 # This file provides the +CGI::Session+ class, which provides session
 # support for CGI scripts.  A session is a sequence of HTTP requests
-# and responses linked together and associated with a single client.  
+# and responses linked together and associated with a single client.
 # Information associated with the session is stored
 # on the server between requests.  A session id is passed between client
 # and server with every request and response, transparently
@@ -28,7 +28,7 @@ require 'tmpdir'
 
 class CGI
 
-  # Class representing an HTTP session.  See documentation for the file 
+  # Class representing an HTTP session.  See documentation for the file
   # cgi/session.rb for an introduction to HTTP sessions.
   #
   # == Lifecycle
@@ -47,7 +47,7 @@ class CGI
   # == Setting and retrieving session data.
   #
   # The Session class associates data with a session as key-value pairs.
-  # This data can be set and retrieved by indexing the Session instance 
+  # This data can be set and retrieved by indexing the Session instance
   # using '[]', much the same as hashes (although other hash methods
   # are not supported).
   #
@@ -60,21 +60,21 @@ class CGI
   #
   # == Storing session state
   #
-  # The caller can specify what form of storage to use for the session's 
+  # The caller can specify what form of storage to use for the session's
   # data with the +database_manager+ option to CGI::Session::new.  The
   # following storage classes are provided as part of the standard library:
   #
-  # CGI::Session::FileStore:: stores data as plain text in a flat file.  Only 
-  #                           works with String data.  This is the default 
+  # CGI::Session::FileStore:: stores data as plain text in a flat file.  Only
+  #                           works with String data.  This is the default
   #                           storage type.
-  # CGI::Session::MemoryStore:: stores data in an in-memory hash.  The data 
-  #                             only persists for as long as the current ruby 
+  # CGI::Session::MemoryStore:: stores data in an in-memory hash.  The data
+  #                             only persists for as long as the current ruby
   #                             interpreter instance does.
   # CGI::Session::PStore:: stores data in Marshalled format.  Provided by
-  #                        cgi/session/pstore.rb.  Supports data of any type, 
+  #                        cgi/session/pstore.rb.  Supports data of any type,
   #                        and provides file-locking and transaction support.
   #
-  # Custom storage types can also be created by defining a class with 
+  # Custom storage types can also be created by defining a class with
   # the following methods:
   #
   #    new(session, options)
@@ -99,14 +99,14 @@ class CGI
   # The simplest way to do this is via cookies.  The CGI::Session class
   # provides transparent support for session id communication via cookies
   # if the client has cookies enabled.
-  # 
+  #
   # If the client has cookies disabled, the session id must be included
   # as a parameter of all requests sent by the client to the server.  The
   # CGI::Session class in conjunction with the CGI class will transparently
   # add the session id as a hidden input field to all forms generated
   # using the CGI#form() HTML generation method.  No built-in support is
   # provided for other mechanisms, such as URL re-writing.  The caller is
-  # responsible for extracting the session id from the session_id 
+  # responsible for extracting the session id from the session_id
   # attribute and manually encoding it in URLs and adding it as a hidden
   # input to HTML forms created by other mechanisms.  Also, session expiry
   # is not automatically handled.
@@ -124,10 +124,10 @@ class CGI
   #   session = CGI::Session.new(cgi,
   #       'database_manager' => CGI::Session::PStore,  # use PStore
   #       'session_key' => '_rb_sess_id',              # custom session key
-  #       'session_expires' => Time.now + 30 * 60,     # 30 minute timeout 
+  #       'session_expires' => Time.now + 30 * 60,     # 30 minute timeout
   #       'prefix' => 'pstore_sid_')                   # PStore option
   #   if cgi.has_key?('user_name') and cgi['user_name'] != ''
-  #       # coerce to String: cgi[] returns the 
+  #       # coerce to String: cgi[] returns the
   #       # string-like CGI::QueryExtension::Value
   #       session['user_name'] = cgi['user_name'].to_s
   #   elsif !session['user_name']
@@ -143,11 +143,11 @@ class CGI
   #   cgi = CGI.new("html4")
   #
   #   # We make sure to delete an old session if one exists,
-  #   # not just to free resources, but to prevent the session 
+  #   # not just to free resources, but to prevent the session
   #   # from being maliciously hijacked later on.
   #   begin
-  #       session = CGI::Session.new(cgi, 'new_session' => false)      
-  #       session.delete                 
+  #       session = CGI::Session.new(cgi, 'new_session' => false)
+  #       session.delete
   #   rescue ArgumentError  # if no old session
   #   end
   #   session = CGI::Session.new(cgi, 'new_session' => true)
@@ -163,7 +163,7 @@ class CGI
 
     def Session::callback(dbman)  #:nodoc:
       Proc.new{
-	dbman[0].close unless dbman.empty?
+        dbman[0].close unless dbman.empty?
       }
     end
 
@@ -172,18 +172,23 @@ class CGI
     # The session id is an MD5 hash based upon the time,
     # a random number, and a constant string.  This routine
     # is used internally for automatically generated
-    # session ids. 
+    # session ids.
     def create_new_id
-      require 'digest/md5'
-      md5 = Digest::MD5::new
-      now = Time::now
-      md5.update(now.to_s)
-      md5.update(String(now.usec))
-      md5.update(String(rand(0)))
-      md5.update(String($$))
-      md5.update('foobar')
-      @new_session = true
-      md5.hexdigest
+      require 'securerandom'
+      begin
+        session_id = SecureRandom.hex(16)
+      rescue NotImplementedError
+        require 'digest/md5'
+        md5 = Digest::MD5::new
+        now = Time::now
+        md5.update(now.to_s)
+        md5.update(String(now.usec))
+        md5.update(String(rand(0)))
+        md5.update(String($$))
+        md5.update('foobar')
+        session_id = md5.hexdigest
+      end
+      session_id
     end
     private :create_new_id
 
@@ -200,7 +205,7 @@ class CGI
     #              it is retrieved from the +session_key+ parameter
     #              of the request, or automatically generated for
     #              a new session.
-    # new_session:: if true, force creation of a new session.  If not set, 
+    # new_session:: if true, force creation of a new session.  If not set,
     #               a new session is only created if none currently
     #               exists.  If false, a new session is never created,
     #               and if none currently exists and the +session_id+
@@ -215,7 +220,7 @@ class CGI
     # The following options are also recognised, but only apply if the
     # session id is stored in a cookie.
     #
-    # session_expires:: the time the current session expires, as a 
+    # session_expires:: the time the current session expires, as a
     #                   +Time+ object.  If not set, the session will terminate
     #                   when the user's browser is closed.
     # session_domain:: the hostname domain for which this session is valid.
@@ -224,13 +229,13 @@ class CGI
     # session_path:: the path for which this session applies.  Defaults
     #                to the directory of the CGI script.
     #
-    # +option+ is also passed on to the session storage class initialiser; see
+    # +option+ is also passed on to the session storage class initializer; see
     # the documentation for each session storage class for the options
     # they support.
-    #                  
+    #
     # The retrieved or created session is automatically added to +request+
     # as a cookie, and also to its +output_hidden+ table, which is used
-    # to add hidden input elements to forms.  
+    # to add hidden input elements to forms.
     #
     # *WARNING* the +output_hidden+
     # fields are surrounded by a <fieldset> tag in HTML 4 generation, which
@@ -248,24 +253,26 @@ class CGI
       session_key = option['session_key'] || '_session_id'
       session_id = option['session_id']
       unless session_id
-	if option['new_session']
-	  session_id = create_new_id
-	end
+        if option['new_session']
+          session_id = create_new_id
+          @new_session = true
+        end
       end
       unless session_id
-	if request.key?(session_key)
-	  session_id = request[session_key]
-	  session_id = session_id.read if session_id.respond_to?(:read)
-	end
-	unless session_id
-	  session_id, = request.cookies[session_key]
-	end
-	unless session_id
-	  unless option.fetch('new_session', true)
-	    raise ArgumentError, "session_key `%s' should be supplied"%session_key
-	  end
-	  session_id = create_new_id
-	end
+        if request.key?(session_key)
+          session_id = request[session_key]
+          session_id = session_id.read if session_id.respond_to?(:read)
+        end
+        unless session_id
+          session_id, = request.cookies[session_key]
+        end
+        unless session_id
+          unless option.fetch('new_session', true)
+            raise ArgumentError, "session_key `%s' should be supplied"%session_key
+          end
+          session_id = create_new_id
+          @new_session = true
+        end
       end
       @session_id = session_id
       dbman = option['database_manager'] || FileStore
@@ -275,24 +282,26 @@ class CGI
         unless option.fetch('new_session', true)
           raise ArgumentError, "invalid session_id `%s'"%session_id
         end
-        session_id = @session_id = create_new_id
+        session_id = @session_id = create_new_id unless session_id
+        @new_session=true
         retry
       end
       request.instance_eval do
-	@output_hidden = {session_key => session_id} unless option['no_hidden']
-	@output_cookies =  [
+        @output_hidden = {session_key => session_id} unless option['no_hidden']
+        @output_cookies =  [
           Cookie::new("name" => session_key,
-		      "value" => session_id,
-		      "expires" => option['session_expires'],
-		      "domain" => option['session_domain'],
-		      "secure" => option['session_secure'],
-		      "path" => if option['session_path'] then
-				  option['session_path']
-		                elsif ENV["SCRIPT_NAME"] then
-				  File::dirname(ENV["SCRIPT_NAME"])
-				else
-				  ""
-				end)
+          "value" => session_id,
+          "expires" => option['session_expires'],
+          "domain" => option['session_domain'],
+          "secure" => option['session_secure'],
+          "path" =>
+          if option['session_path']
+            option['session_path']
+          elsif ENV["SCRIPT_NAME"]
+            File::dirname(ENV["SCRIPT_NAME"])
+          else
+          ""
+          end)
         ] unless option['no_cookies']
       end
       @dbprot = [@dbman]
@@ -314,11 +323,11 @@ class CGI
 
     # Store session data on the server.  For some session storage types,
     # this is a no-op.
-    def update  
+    def update
       @dbman.update
     end
 
-    # Store session data on the server and close the session storage.  
+    # Store session data on the server and close the session storage.
     # For some session storage types, this is a no-op.
     def close
       @dbman.close
@@ -350,8 +359,8 @@ class CGI
       # created.  The session id must only contain alphanumeric
       # characters; automatically generated session ids observe
       # this requirement.
-      # 
-      # +option+ is a hash of options for the initialiser.  The
+      #
+      # +option+ is a hash of options for the initializer.  The
       # following options are recognised:
       #
       # tmpdir:: the directory to use for storing the FileStore
@@ -359,7 +368,7 @@ class CGI
       #          on Unix systems).
       # prefix:: the prefix to add to the session id when generating
       #          the filename for this session's FileStore file.
-      #          Defaults to the empty string.
+      #          Defaults to "cgi_sid_".
       # suffix:: the prefix to add to the session id when generating
       #          the filename for this session's FileStore file.
       #          Defaults to the empty string.
@@ -367,56 +376,56 @@ class CGI
       # This session's FileStore file will be created if it does
       # not exist, or opened if it does.
       def initialize(session, option={})
-	dir = option['tmpdir'] || Dir::tmpdir
-	prefix = option['prefix'] || ''
-	suffix = option['suffix'] || ''
-	id = session.session_id
+        dir = option['tmpdir'] || Dir::tmpdir
+        prefix = option['prefix'] || 'cgi_sid_'
+        suffix = option['suffix'] || ''
+        id = session.session_id
         require 'digest/md5'
         md5 = Digest::MD5.hexdigest(id)[0,16]
-	@path = dir+"/"+prefix+md5+suffix
-	if File::exist? @path
-	  @hash = nil
-	else
+        @path = dir+"/"+prefix+md5+suffix
+        if File::exist? @path
+          @hash = nil
+        else
           unless session.new_session
             raise CGI::Session::NoSession, "uninitialized session"
           end
-	  @hash = {}
-	end
+          @hash = {}
+        end
       end
 
       # Restore session state from the session's FileStore file.
       #
       # Returns the session state as a hash.
       def restore
-	unless @hash
-	  @hash = {}
+        unless @hash
+          @hash = {}
           begin
             lockf = File.open(@path+".lock", "r")
             lockf.flock File::LOCK_SH
-	    f = File.open(@path, 'r')
-	    for line in f
-	      line.chomp!
-	      k, v = line.split('=',2)
-	      @hash[CGI::unescape(k)] = CGI::unescape(v)
-	    end
+            f = File.open(@path, 'r')
+            for line in f
+              line.chomp!
+              k, v = line.split('=',2)
+              @hash[CGI::unescape(k)] = Marshal.restore(CGI::unescape(v))
+            end
           ensure
-	    f.close unless f.nil?
+            f.close unless f.nil?
             lockf.close if lockf
           end
-	end
-	@hash
+        end
+        @hash
       end
 
       # Save session state to the session's FileStore file.
       def update
-	return unless @hash
+        return unless @hash
         begin
           lockf = File.open(@path+".lock", File::CREAT|File::RDWR, 0600)
-	  lockf.flock File::LOCK_EX
+          lockf.flock File::LOCK_EX
           f = File.open(@path+".new", File::CREAT|File::TRUNC|File::WRONLY, 0600)
-   	  for k,v in @hash
-	    f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v))
-	  end
+          for k,v in @hash
+            f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(Marshal.dump(v)))
+          end
           f.close
           File.rename @path+".new", @path
         ensure
@@ -427,22 +436,21 @@ class CGI
 
       # Update and close the session's FileStore file.
       def close
-	update
+        update
       end
 
       # Close and delete the session's FileStore file.
       def delete
         File::unlink @path+".lock" rescue nil
         File::unlink @path+".new" rescue nil
-        File::unlink @path
-      rescue Errno::ENOENT
+        File::unlink @path rescue Errno::ENOENT
       end
     end
 
     # In-memory session storage class.
     #
     # Implements session storage as a global in-memory hash.  Session
-    # data will only persist for as long as the ruby interpreter 
+    # data will only persist for as long as the ruby interpreter
     # instance does.
     class MemoryStore
       GLOBAL_HASH_TABLE = {} #:nodoc:
@@ -453,7 +461,7 @@ class CGI
       # +option+ is a list of initialisation options.  None are
       # currently recognised.
       def initialize(session, option=nil)
-	@session_id = session.session_id
+        @session_id = session.session_id
         unless GLOBAL_HASH_TABLE.key?(@session_id)
           unless session.new_session
             raise CGI::Session::NoSession, "uninitialized session"
@@ -466,26 +474,63 @@ class CGI
       #
       # Returns session data as a hash.
       def restore
-	GLOBAL_HASH_TABLE[@session_id]
+        GLOBAL_HASH_TABLE[@session_id]
       end
 
       # Update session state.
       #
       # A no-op.
       def update
-	# don't need to update; hash is shared
+        # don't need to update; hash is shared
       end
 
       # Close session storage.
       #
       # A no-op.
       def close
-	# don't need to close
+        # don't need to close
       end
 
       # Delete the session state.
       def delete
-	GLOBAL_HASH_TABLE.delete(@session_id)
+        GLOBAL_HASH_TABLE.delete(@session_id)
+      end
+    end
+
+    # Dummy session storage class.
+    #
+    # Implements session storage place holder.  No actual storage
+    # will be done.
+    class NullStore
+      # Create a new NullStore instance.
+      #
+      # +session+ is the session this instance is associated with.
+      # +option+ is a list of initialisation options.  None are
+      # currently recognised.
+      def initialize(session, option=nil)
+      end
+
+      # Restore (empty) session state.
+      def restore
+        {}
+      end
+
+      # Update session state.
+      #
+      # A no-op.
+      def update
+      end
+
+      # Close session storage.
+      #
+      # A no-op.
+      def close
+      end
+
+      # Delete the session state.
+      #
+      # A no-op.
+      def delete
       end
     end
   end
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
index bd93d0a6ff..a63d7d3984 100644
--- a/lib/cgi/session/pstore.rb
+++ b/lib/cgi/session/pstore.rb
@@ -2,7 +2,7 @@
 # cgi/session/pstore.rb - persistent storage of marshalled session data
 #
 # Documentation: William Webber (william@williamwebber.com)
-# 
+#
 # == Overview
 #
 # This file provides the CGI::Session::PStore class, which builds
@@ -29,8 +29,8 @@ class CGI
       # created.  The session id must only contain alphanumeric
       # characters; automatically generated session ids observe
       # this requirement.
-      # 
-      # +option+ is a hash of options for the initialiser.  The
+      #
+      # +option+ is a hash of options for the initializer.  The
       # following options are recognised:
       #
       # tmpdir:: the directory to use for storing the PStore
@@ -43,55 +43,55 @@ class CGI
       # This session's PStore file will be created if it does
       # not exist, or opened if it does.
       def initialize(session, option={})
-	dir = option['tmpdir'] || Dir::tmpdir
-	prefix = option['prefix'] || ''
-	id = session.session_id
+        dir = option['tmpdir'] || Dir::tmpdir
+        prefix = option['prefix'] || ''
+        id = session.session_id
         require 'digest/md5'
         md5 = Digest::MD5.hexdigest(id)[0,16]
-	path = dir+"/"+prefix+md5
-	path.untaint
-	if File::exist?(path)
-	  @hash = nil
-	else
+        path = dir+"/"+prefix+md5
+        path.untaint
+        if File::exist?(path)
+          @hash = nil
+        else
           unless session.new_session
             raise CGI::Session::NoSession, "uninitialized session"
           end
-	  @hash = {}
-	end
-	@p = ::PStore.new(path)
-	@p.transaction do |p|
-	  File.chmod(0600, p.path)
-	end
+          @hash = {}
+        end
+        @p = ::PStore.new(path)
+        @p.transaction do |p|
+          File.chmod(0600, p.path)
+        end
       end
 
       # Restore session state from the session's PStore file.
       #
       # Returns the session state as a hash.
       def restore
-	unless @hash
-	  @p.transaction do
-           @hash = @p['hash'] || {}
-	  end
-	end
-	@hash
+        unless @hash
+          @p.transaction do
+            @hash = @p['hash'] || {}
+          end
+        end
+        @hash
       end
 
       # Save session state to the session's PStore file.
-      def update 
-	@p.transaction do
-	    @p['hash'] = @hash
-	end
+      def update
+        @p.transaction do
+          @p['hash'] = @hash
+        end
       end
 
       # Update and close the session's PStore file.
       def close
-	update
+        update
       end
 
       # Close and delete the session's PStore file.
       def delete
-	path = @p.path
-	File::unlink path
+        path = @p.path
+        File::unlink path
       end
 
     end
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
new file mode 100644
index 0000000000..9f8a63ac92
--- /dev/null
+++ b/lib/cgi/util.rb
@@ -0,0 +1,188 @@
+class CGI
+  @@accept_charset="UTF-8" unless defined?(@@accept_charset)
+  # URL-encode a string.
+  #   url_encoded_string = CGI::escape("'Stop!' said Fred")
+  #      # => "%27Stop%21%27+said+Fred"
+  def CGI::escape(string)
+    string.gsub(/([^ a-zA-Z0-9_.-]+)/) do
+      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+    end.tr(' ', '+')
+  end
+
+
+  # URL-decode a string with encoding(optional).
+  #   string = CGI::unescape("%27Stop%21%27+said+Fred")
+  #      # => "'Stop!' said Fred"
+  def CGI::unescape(string,encoding=@@accept_charset)
+    str=string.tr('+', ' ').force_encoding(Encoding::ASCII_8BIT).gsub(/((?:%[0-9a-fA-F]{2})+)/) do
+      [$1.delete('%')].pack('H*')
+    end.force_encoding(encoding)
+    str.valid_encoding? ? str : str.force_encoding(string.encoding)
+  end
+
+  TABLE_FOR_ESCAPE_HTML__ = {
+    '&' => '&amp;',
+    '"' => '&quot;',
+    '<' => '&lt;',
+    '>' => '&gt;',
+  }
+
+  # Escape special characters in HTML, namely &\"<>
+  #   CGI::escapeHTML('Usage: foo "bar" <baz>')
+  #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
+  def CGI::escapeHTML(string)
+    string.gsub(/[&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+  end
+
+
+  # Unescape a string that has been HTML-escaped
+  #   CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
+  #      # => "Usage: foo \"bar\" <baz>"
+  def CGI::unescapeHTML(string)
+    enc = string.encoding
+    if [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].include?(enc)
+      return string.gsub(Regexp.new('&(amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do
+        case $1.encode("US-ASCII")
+        when 'amp'                 then '&'.encode(enc)
+        when 'quot'                then '"'.encode(enc)
+        when 'gt'                  then '>'.encode(enc)
+        when 'lt'                  then '<'.encode(enc)
+        when /\A#0*(\d+)\z/        then $1.to_i.chr(enc)
+        when /\A#x([0-9a-f]+)\z/i  then $1.hex.chr(enc)
+        end
+      end
+    end
+    asciicompat = Encoding.compatible?(string, "a")
+    string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/) do
+      match = $1.dup
+      case match
+      when 'amp'                 then '&'
+      when 'quot'                then '"'
+      when 'gt'                  then '>'
+      when 'lt'                  then '<'
+      when /\A#0*(\d+)\z/
+        n = $1.to_i
+        if enc == Encoding::UTF_8 or
+          enc == Encoding::ISO_8859_1 && n < 256 or
+          asciicompat && n < 128
+          n.chr(enc)
+        else
+          "&##{$1};"
+        end
+      when /\A#x([0-9a-f]+)\z/i
+        n = $1.hex
+        if enc == Encoding::UTF_8 or
+          enc == Encoding::ISO_8859_1 && n < 256 or
+          asciicompat && n < 128
+          n.chr(enc)
+        else
+          "&#x#{$1};"
+        end
+      else
+        "&#{match};"
+      end
+    end
+  end
+  def CGI::escape_html(str)
+    escapeHTML(str)
+  end
+  def CGI::unescape_html(str)
+    unescapeHTML(str)
+  end
+
+  # Escape only the tags of certain HTML elements in +string+.
+  #
+  # Takes an element or elements or array of elements.  Each element
+  # is specified by the name of the element, without angle brackets.
+  # This matches both the start and the end tag of that element.
+  # The attribute list of the open tag will also be escaped (for
+  # instance, the double-quotes surrounding attribute values).
+  #
+  #   print CGI::escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  #
+  #   print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  def CGI::escapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/i) do
+        CGI::escapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+
+
+  # Undo escaping such as that done by CGI::escapeElement()
+  #
+  #   print CGI::unescapeElement(
+  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  #
+  #   print CGI::unescapeElement(
+  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  def CGI::unescapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/&lt;\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?&gt;/i) do
+        CGI::unescapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+  def CGI::escape_element(str)
+    escapeElement(str)
+  end
+  def CGI::unescape_element(str)
+    unescapeElement(str)
+  end
+
+  # Abbreviated day-of-week names specified by RFC 822
+  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
+
+  # Abbreviated month names specified by RFC 822
+  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
+
+  # Format a +Time+ object as a String using the format specified by RFC 1123.
+  #
+  #   CGI::rfc1123_date(Time.now)
+  #     # Sat, 01 Jan 2000 00:00:00 GMT
+  def CGI::rfc1123_date(time)
+    t = time.clone.gmtime
+    return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
+                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
+                t.hour, t.min, t.sec)
+  end
+
+  # Prettify (indent) an HTML string.
+  #
+  # +string+ is the HTML string to indent.  +shift+ is the indentation
+  # unit to use; it defaults to two spaces.
+  #
+  #   print CGI::pretty("<HTML><BODY></BODY></HTML>")
+  #     # <HTML>
+  #     #   <BODY>
+  #     #   </BODY>
+  #     # </HTML>
+  #
+  #   print CGI::pretty("<HTML><BODY></BODY></HTML>", "\t")
+  #     # <HTML>
+  #     #         <BODY>
+  #     #         </BODY>
+  #     # </HTML>
+  #
+  def CGI::pretty(string, shift = "  ")
+    lines = string.gsub(/(?!\A)<.*?>/m, "\n\\0").gsub(/<.*?>(?!\n)/m, "\\0\n")
+    end_pos = 0
+    while end_pos = lines.index(/^<\/(\w+)/, end_pos)
+      element = $1.dup
+      start_pos = lines.rindex(/^\s*<#{element}/i, end_pos)
+      lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/, "\n" + shift) + "__"
+    end
+    lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/, '\1')
+  end
+end
diff --git a/lib/cmath.rb b/lib/cmath.rb
new file mode 100644
index 0000000000..976f269299
--- /dev/null
+++ b/lib/cmath.rb
@@ -0,0 +1,254 @@
+module CMath
+
+  include Math
+
+  alias exp! exp
+  alias log! log
+  alias log2! log2
+  alias log10! log10
+  alias sqrt! sqrt
+  alias cbrt! cbrt
+
+  alias sin! sin
+  alias cos! cos
+  alias tan! tan
+
+  alias sinh! sinh
+  alias cosh! cosh
+  alias tanh! tanh
+
+  alias asin! asin
+  alias acos! acos
+  alias atan! atan
+  alias atan2! atan2
+
+  alias asinh! asinh
+  alias acosh! acosh
+  alias atanh! atanh
+
+  def exp(z)
+    if z.real?
+      exp!(z)
+    else
+      ere = exp!(z.real)
+      Complex(ere * cos!(z.imag),
+	      ere * sin!(z.imag))
+    end
+  end
+
+  def log(*args)
+    z, b = args
+    if z.real? and z >= 0 and (b.nil? or b >= 0)
+      log!(*args)
+    else
+      a = Complex(log!(z.abs), z.arg)
+      if b
+	a /= log(b)
+      end
+      a
+    end
+  end
+
+  def log2(z)
+    if z.real? and z >= 0
+      log2!(z)
+    else
+      log(z) / log!(2)
+    end
+  end
+
+  def log10(z)
+    if z.real? and z >= 0
+      log10!(z)
+    else
+      log(z) / log!(10)
+    end
+  end
+
+  def sqrt(z)
+    if z.real?
+      if z < 0
+	Complex(0, sqrt!(-z))
+      else
+	sqrt!(z)
+      end
+    else
+      if z.imag < 0 ||
+	  (z.imag == 0 && z.imag.to_s[0] == '-')
+	sqrt(z.conjugate).conjugate
+      else
+	r = z.abs
+	x = z.real
+	Complex(sqrt!((r + x) / 2), sqrt!((r - x) / 2))
+      end
+    end
+  end
+
+  def cbrt(z)
+    if z.real?
+      cbrt!(z)
+    else
+      Complex(z) ** (1.0/3)
+    end
+  end
+
+  def sin(z)
+    if z.real?
+      sin!(z)
+    else
+      Complex(sin!(z.real) * cosh!(z.imag),
+	      cos!(z.real) * sinh!(z.imag))
+    end
+  end
+
+  def cos(z)
+    if z.real?
+      cos!(z)
+    else
+      Complex(cos!(z.real) * cosh!(z.imag),
+	      -sin!(z.real) * sinh!(z.imag))
+    end
+  end
+
+  def tan(z)
+    if z.real?
+      tan!(z)
+    else
+      sin(z) / cos(z)
+    end
+  end
+
+  def sinh(z)
+    if z.real?
+      sinh!(z)
+    else
+      Complex(sinh!(z.real) * cos!(z.imag),
+	      cosh!(z.real) * sin!(z.imag))
+    end
+  end
+
+  def cosh(z)
+    if z.real?
+      cosh!(z)
+    else
+      Complex(cosh!(z.real) * cos!(z.imag),
+	      sinh!(z.real) * sin!(z.imag))
+    end
+  end
+
+  def tanh(z)
+    if z.real?
+      tanh!(z)
+    else
+      sinh(z) / cosh(z)
+    end
+  end
+
+  def asin(z)
+    if z.real? and z >= -1 and z <= 1
+      asin!(z)
+    else
+      (-1.0).i * log(1.0.i * z + sqrt(1.0 - z * z))
+    end
+  end
+
+  def acos(z)
+    if z.real? and z >= -1 and z <= 1
+      acos!(z)
+    else
+      (-1.0).i * log(z + 1.0.i * sqrt(1.0 - z * z))
+    end
+  end
+
+  def atan(z)
+    if z.real?
+      atan!(z)
+    else
+      1.0.i * log((1.0.i + z) / (1.0.i - z)) / 2.0
+    end
+  end
+
+  def atan2(y,x)
+    if y.real? and x.real?
+      atan2!(y,x)
+    else
+      (-1.0).i * log((x + 1.0.i * y) / sqrt(x * x + y * y))
+    end
+  end
+
+  def asinh(z)
+    if z.real?
+      asinh!(z)
+    else
+      log(z + sqrt(1.0 + z * z))
+    end
+  end
+
+  def acosh(z)
+    if z.real? and z >= 1
+      acosh!(z)
+    else
+      log(z + sqrt(z * z - 1.0))
+    end
+  end
+
+  def atanh(z)
+    if z.real? and z >= -1 and z <= 1
+      atanh!(z)
+    else
+      log((1.0 + z) / (1.0 - z)) / 2.0
+    end
+  end
+
+  module_function :exp!
+  module_function :exp
+  module_function :log!
+  module_function :log
+  module_function :log2!
+  module_function :log2
+  module_function :log10!
+  module_function :log10
+  module_function :sqrt!
+  module_function :sqrt
+  module_function :cbrt!
+  module_function :cbrt
+
+  module_function :sin!
+  module_function :sin
+  module_function :cos!
+  module_function :cos
+  module_function :tan!
+  module_function :tan
+
+  module_function :sinh!
+  module_function :sinh
+  module_function :cosh!
+  module_function :cosh
+  module_function :tanh!
+  module_function :tanh
+
+  module_function :asin!
+  module_function :asin
+  module_function :acos!
+  module_function :acos
+  module_function :atan!
+  module_function :atan
+  module_function :atan2!
+  module_function :atan2
+
+  module_function :asinh!
+  module_function :asinh
+  module_function :acosh!
+  module_function :acosh
+  module_function :atanh!
+  module_function :atanh
+
+  module_function :frexp
+  module_function :ldexp
+  module_function :hypot
+  module_function :erf
+  module_function :erfc
+  module_function :gamma
+  module_function :lgamma
+
+end
diff --git a/lib/complex.rb b/lib/complex.rb
index 9300f391e8..9c57ecdf7a 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -1,631 +1,28 @@
-#
-#   complex.rb - 
-#   	$Release Version: 0.5 $
-#   	$Revision: 1.3 $
-#   	$Date: 1998/07/08 10:05:28 $
-#   	by Keiju ISHITSUKA(SHL Japan Inc.)
-#
-# ----
-#
-# complex.rb implements the Complex class for complex numbers.  Additionally,
-# some methods in other Numeric classes are redefined or added to allow greater
-# interoperability with Complex numbers.
-#
-# Complex numbers can be created in the following manner:
-# - <tt>Complex(a, b)</tt>
-# - <tt>Complex.polar(radius, theta)</tt>
-#   
-# Additionally, note the following:
-# - <tt>Complex::I</tt> (the mathematical constant <i>i</i>)
-# - <tt>Numeric#im</tt> (e.g. <tt>5.im -> 0+5i</tt>)
-#
-# The following +Math+ module methods are redefined to handle Complex arguments.
-# They will work as normal with non-Complex arguments.
-#    sqrt exp cos sin tan log log10
-#    cosh sinh tanh acos asin atan atan2 acosh asinh atanh
-#
+# :enddoc:
 
+warn('lib/complex.rb is deprecated') if $VERBOSE
 
-#
-# Numeric is a built-in class on which Fixnum, Bignum, etc., are based.  Here
-# some methods are added so that all number types can be treated to some extent
-# as Complex numbers.
-#
-class Numeric
-  #
-  # Returns a Complex number <tt>(0,<i>self</i>)</tt>.
-  #
-  def im
-    Complex(0, self)
-  end
-  
-  #
-  # The real part of a complex number, i.e. <i>self</i>.
-  #
-  def real
-    self
-  end
-  
-  #
-  # The imaginary part of a complex number, i.e. 0.
-  #
-  def image
-    0
-  end
-  alias imag image
-  
-  #
-  # See Complex#arg.
-  #
-  def arg
-    if self >= 0
-      return 0
-    else
-      return Math::PI
-    end
-  end
-  alias angle arg
-  
-  #
-  # See Complex#polar.
-  #
-  def polar
-    return abs, arg
-  end
-  
-  #
-  # See Complex#conjugate (short answer: returns <i>self</i>).
-  #
-  def conjugate
-    self
-  end
-  alias conj conjugate
-end
+require 'cmath'
 
-
-#
-# Creates a Complex number.  +a+ and +b+ should be Numeric.  The result will be
-# <tt>a+bi</tt>.
-#
-def Complex(a, b = 0)
-  if b == 0 and (a.kind_of?(Complex) or defined? Complex::Unify)
-    a
-  else
-    Complex.new( a.real-b.imag, a.imag+b.real )
-  end
+unless defined?(Math.exp!)
+  Object.instance_eval{remove_const :Math}
+  Math = CMath
 end
 
-#
-# The complex number class.  See complex.rb for an overview.
-#
-class Complex < Numeric
-  @RCS_ID='-$Id: complex.rb,v 1.3 1998/07/08 10:05:28 keiju Exp keiju $-'
-
-  undef step
-
-  def Complex.generic?(other) # :nodoc:
-    other.kind_of?(Integer) or
-    other.kind_of?(Float) or
-    (defined?(Rational) and other.kind_of?(Rational))
-  end
-
-  #
-  # Creates a +Complex+ number in terms of +r+ (radius) and +theta+ (angle).
-  #
-  def Complex.polar(r, theta)
-    Complex(r*Math.cos(theta), r*Math.sin(theta))
-  end
-
-  #
-  # Creates a +Complex+ number <tt>a</tt>+<tt>b</tt><i>i</i>.
-  #
-  def Complex.new!(a, b=0)
-    new(a,b)
-  end
-
-  def initialize(a, b)
-    raise TypeError, "non numeric 1st arg `#{a.inspect}'" if !a.kind_of? Numeric
-    raise TypeError, "`#{a.inspect}' for 1st arg" if a.kind_of? Complex
-    raise TypeError, "non numeric 2nd arg `#{b.inspect}'" if !b.kind_of? Numeric
-    raise TypeError, "`#{b.inspect}' for 2nd arg" if b.kind_of? Complex
-    @real = a
-    @image = b
-  end
-
-  #
-  # Addition with real or complex number.
-  #
-  def + (other)
-    if other.kind_of?(Complex)
-      re = @real + other.real
-      im = @image + other.image
-      Complex(re, im)
-    elsif Complex.generic?(other)
-      Complex(@real + other, @image)
-    else
-      x , y = other.coerce(self)
-      x + y
-    end
-  end
-  
-  #
-  # Subtraction with real or complex number.
-  #
-  def - (other)
-    if other.kind_of?(Complex)
-      re = @real - other.real
-      im = @image - other.image
-      Complex(re, im)
-    elsif Complex.generic?(other)
-      Complex(@real - other, @image)
-    else
-      x , y = other.coerce(self)
-      x - y
-    end
-  end
-  
-  #
-  # Multiplication with real or complex number.
-  #
-  def * (other)
-    if other.kind_of?(Complex)
-      re = @real*other.real - @image*other.image
-      im = @real*other.image + @image*other.real
-      Complex(re, im)
-    elsif Complex.generic?(other)
-      Complex(@real * other, @image * other)
-    else
-      x , y = other.coerce(self)
-      x * y
-    end
-  end
-  
-  #
-  # Division by real or complex number.
-  #
-  def / (other)
-    if other.kind_of?(Complex)
-      self*other.conjugate/other.abs2
-    elsif Complex.generic?(other)
-      Complex(@real/other, @image/other)
-    else
-      x, y = other.coerce(self)
-      x/y
-    end
-  end
-  
-  #
-  # Raise this complex number to the given (real or complex) power.
-  #
-  def ** (other)
-    if other == 0
-      return Complex(1)
-    end
-    if other.kind_of?(Complex)
-      r, theta = polar
-      ore = other.real
-      oim = other.image
-      nr = Math.exp!(ore*Math.log!(r) - oim * theta)
-      ntheta = theta*ore + oim*Math.log!(r)
-      Complex.polar(nr, ntheta)
-    elsif other.kind_of?(Integer)
-      if other > 0
-	x = self
-	z = x
-	n = other - 1
-	while n != 0
-	  while (div, mod = n.divmod(2)
-		 mod == 0)
-	    x = Complex(x.real*x.real - x.image*x.image, 2*x.real*x.image)
-	    n = div
-	  end
-	  z *= x
-	  n -= 1
-	end
-	z
-      else
-	if defined? Rational
-	  (Rational(1) / self) ** -other
-	else
-	  self ** Float(other)
-	end
-      end
-    elsif Complex.generic?(other)
-      r, theta = polar
-      Complex.polar(r**other, theta*other)
-    else
-      x, y = other.coerce(self)
-      x**y
-    end
-  end
-  
-  #
-  # Remainder after division by a real or complex number.
-  #
-  def % (other)
-    if other.kind_of?(Complex)
-      Complex(@real % other.real, @image % other.image)
-    elsif Complex.generic?(other)
-      Complex(@real % other, @image % other)
-    else
-      x , y = other.coerce(self)
-      x % y
-    end
-  end
-  
-#--
-#    def divmod(other)
-#      if other.kind_of?(Complex)
-#        rdiv, rmod = @real.divmod(other.real)
-#        idiv, imod = @image.divmod(other.image)
-#        return Complex(rdiv, idiv), Complex(rmod, rmod)
-#      elsif Complex.generic?(other)
-#        Complex(@real.divmod(other), @image.divmod(other))
-#      else
-#        x , y = other.coerce(self)
-#        x.divmod(y)
-#      end
-#    end
-#++
-  
-  #
-  # Absolute value (aka modulus): distance from the zero point on the complex
-  # plane.
-  #
-  def abs
-    Math.hypot(@real, @image)
-  end
-  
-  #
-  # Square of the absolute value.
-  #
-  def abs2
-    @real*@real + @image*@image
-  end
-  
-  #
-  # Argument (angle from (1,0) on the complex plane).
-  #
-  def arg
-    Math.atan2!(@image, @real)
-  end
-  alias angle arg
-  
-  #
-  # Returns the absolute value _and_ the argument.
-  #
-  def polar
-    return abs, arg
-  end
-  
-  #
-  # Complex conjugate (<tt>z + z.conjugate = 2 * z.real</tt>).
-  #
-  def conjugate
-    Complex(@real, -@image)
-  end
-  alias conj conjugate
-  
-  #
-  # Compares the absolute values of the two numbers.
-  #
-  def <=> (other)
-    self.abs <=> other.abs
-  end
-  
-  #
-  # Test for numerical equality (<tt>a == a + 0<i>i</i></tt>).
-  #
-  def == (other)
-    if other.kind_of?(Complex)
-      @real == other.real and @image == other.image
-    elsif Complex.generic?(other)
-      @real == other and @image == 0
-    else
-      other == self
-    end
-  end
-
-  #
-  # Attempts to coerce +other+ to a Complex number.
-  #
-  def coerce(other)
-    if Complex.generic?(other)
-      return Complex.new!(other), self
-    else
-      super
-    end
-  end
-
-  #
-  # FIXME
-  #
-  def denominator
-    @real.denominator.lcm(@image.denominator)
-  end
-  
-  #
-  # FIXME
-  #
-  def numerator
-    cd = denominator
-    Complex(@real.numerator*(cd/@real.denominator),
-	    @image.numerator*(cd/@image.denominator))
-  end
-  
-  #
-  # Standard string representation of the complex number.
-  #
-  def to_s
-    if @real != 0
-      if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
-	if @image >= 0
-	  @real.to_s+"+("+@image.to_s+")i"
-	else
-	  @real.to_s+"-("+(-@image).to_s+")i"
-	end
-      else
-	if @image >= 0
-	  @real.to_s+"+"+@image.to_s+"i"
-	else
-	  @real.to_s+"-"+(-@image).to_s+"i"
-	end
-      end
-    else
-      if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
-	"("+@image.to_s+")i"
-      else
-	@image.to_s+"i"
-      end
-    end
-  end
-  
-  #
-  # Returns a hash code for the complex number.
-  #
-  def hash
-    @real.hash ^ @image.hash
-  end
-  
-  #
-  # Returns "<tt>Complex(<i>real</i>, <i>image</i>)</tt>".
-  #
-  def inspect
-    sprintf("Complex(%s, %s)", @real.inspect, @image.inspect)
-  end
-
-  
-  #
-  # +I+ is the imaginary number.  It exists at point (0,1) on the complex plane.
-  #
-  I = Complex(0,1)
-  
-  # The real part of a complex number.
-  attr :real
-
-  # The imaginary part of a complex number.
-  attr :image
-  alias imag image
-  
+def Complex.generic? (other)
+  other.kind_of?(Integer) ||
+  other.kind_of?(Float)   ||
+  other.kind_of?(Rational)
 end
 
+class Complex
 
+  alias image imag
 
+end
 
-module Math
-  alias sqrt! sqrt
-  alias exp! exp
-  alias log! log
-  alias log10! log10
-  alias cos! cos
-  alias sin! sin
-  alias tan! tan
-  alias cosh! cosh
-  alias sinh! sinh
-  alias tanh! tanh
-  alias acos! acos
-  alias asin! asin
-  alias atan! atan
-  alias atan2! atan2
-  alias acosh! acosh
-  alias asinh! asinh
-  alias atanh! atanh  
-
-  # Redefined to handle a Complex argument.
-  def sqrt(z)
-    if Complex.generic?(z)
-      if z >= 0
-	sqrt!(z)
-      else
-	Complex(0,sqrt!(-z))
-      end
-    else
-      if z.image < 0
-	sqrt(z.conjugate).conjugate
-      else
-	r = z.abs
-	x = z.real
-	Complex( sqrt!((r+x)/2), sqrt!((r-x)/2) )
-      end
-    end
-  end
-  
-  # Redefined to handle a Complex argument.
-  def exp(z)
-    if Complex.generic?(z)
-      exp!(z)
-    else
-      Complex(exp!(z.real) * cos!(z.image), exp!(z.real) * sin!(z.image))
-    end
-  end
-  
-  # Redefined to handle a Complex argument.
-  def cos(z)
-    if Complex.generic?(z)
-      cos!(z)
-    else
-      Complex(cos!(z.real)*cosh!(z.image),
-	      -sin!(z.real)*sinh!(z.image))
-    end
-  end
-    
-  # Redefined to handle a Complex argument.
-  def sin(z)
-    if Complex.generic?(z)
-      sin!(z)
-    else
-      Complex(sin!(z.real)*cosh!(z.image),
-	      cos!(z.real)*sinh!(z.image))
-    end
-  end
-  
-  # Redefined to handle a Complex argument.
-  def tan(z)
-    if Complex.generic?(z)
-      tan!(z)
-    else
-      sin(z)/cos(z)
-    end
-  end
-
-  def sinh(z)
-    if Complex.generic?(z)
-      sinh!(z)
-    else
-      Complex( sinh!(z.real)*cos!(z.image), cosh!(z.real)*sin!(z.image) )
-    end
-  end
-
-  def cosh(z)
-    if Complex.generic?(z)
-      cosh!(z)
-    else
-      Complex( cosh!(z.real)*cos!(z.image), sinh!(z.real)*sin!(z.image) )
-    end
-  end
-
-  def tanh(z)
-    if Complex.generic?(z)
-      tanh!(z)
-    else
-      sinh(z)/cosh(z)
-    end
-  end
-  
-  # Redefined to handle a Complex argument.
-  def log(z)
-    if Complex.generic?(z) and z >= 0
-      log!(z)
-    else
-      r, theta = z.polar
-      Complex(log!(r.abs), theta)
-    end
-  end
-  
-  # Redefined to handle a Complex argument.
-  def log10(z)
-    if Complex.generic?(z)
-      log10!(z)
-    else
-      log(z)/log!(10)
-    end
-  end
-
-  def acos(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      acos!(z)
-    else
-      -1.0.im * log( z + 1.0.im * sqrt(1.0-z*z) )
-    end
-  end
-
-  def asin(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      asin!(z)
-    else
-      -1.0.im * log( 1.0.im * z + sqrt(1.0-z*z) )
-    end
-  end
-
-  def atan(z)
-    if Complex.generic?(z)
-      atan!(z)
-    else
-      1.0.im * log( (1.0.im+z) / (1.0.im-z) ) / 2.0
-    end
-  end
-
-  def atan2(y,x)
-    if Complex.generic?(y) and Complex.generic?(x)
-      atan2!(y,x)
-    else
-      -1.0.im * log( (x+1.0.im*y) / sqrt(x*x+y*y) )
-    end
-  end
-
-  def acosh(z)
-    if Complex.generic?(z) and z >= 1
-      acosh!(z)
-    else
-      log( z + sqrt(z*z-1.0) )
-    end
-  end
-
-  def asinh(z)
-    if Complex.generic?(z)
-      asinh!(z)
-    else
-      log( z + sqrt(1.0+z*z) )
-    end
-  end
+class Numeric
 
-  def atanh(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      atanh!(z)
-    else
-      log( (1.0+z) / (1.0-z) ) / 2.0
-    end
-  end
+  def im() Complex(0, self) end
 
-  module_function :sqrt!
-  module_function :sqrt
-  module_function :exp!
-  module_function :exp
-  module_function :log!
-  module_function :log
-  module_function :log10!
-  module_function :log10
-  module_function :cosh!
-  module_function :cosh
-  module_function :cos!
-  module_function :cos
-  module_function :sinh!
-  module_function :sinh
-  module_function :sin!
-  module_function :sin
-  module_function :tan!
-  module_function :tan
-  module_function :tanh!
-  module_function :tanh
-  module_function :acos!
-  module_function :acos
-  module_function :asin!
-  module_function :asin
-  module_function :atan!
-  module_function :atan
-  module_function :atan2!
-  module_function :atan2
-  module_function :acosh!
-  module_function :acosh
-  module_function :asinh!
-  module_function :asinh
-  module_function :atanh!
-  module_function :atanh
-  
 end
-
-# Documentation comments:
-#  - source: original (researched from pickaxe)
-#  - a couple of fixme's
-#  - RDoc output for Bignum etc. is a bit short, with nothing but an
-#    (undocumented) alias.  No big deal.
diff --git a/lib/csv.rb b/lib/csv.rb
index f6c12fa285..9942802c3e 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1,992 +1,2339 @@
-# CSV -- module for generating/parsing CSV data.
-# Copyright (C) 2000-2004  NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>.
-  
-# $Id$
-  
-# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
-# redistribute it and/or modify it under the same terms of Ruby's license;
-# either the dual license version in 2003, or any later version.
-  
-  
-class CSV
-  class IllegalFormatError < RuntimeError; end
-
-  # deprecated
-  class Cell < String
-    def initialize(data = "", is_null = false)
-      super(is_null ? "" : data)
-    end
+# encoding: US-ASCII
+# = csv.rb -- CSV Reading and Writing
+#
+#  Created by James Edward Gray II on 2005-10-31.
+#  Copyright 2005 James Edward Gray II. You can redistribute or modify this code
+#  under the terms of Ruby's license.
+#
+# See CSV for documentation.
+#
+# == Description
+#
+# Welcome to the new and improved CSV.
+#
+# This version of the CSV library began its life as FasterCSV.  FasterCSV was
+# intended as a replacement to Ruby's then standard CSV library.  It was
+# designed to address concerns users of that library had and it had three
+# primary goals:
+#
+# 1.  Be significantly faster than CSV while remaining a pure Ruby library.
+# 2.  Use a smaller and easier to maintain code base.  (FasterCSV eventually
+#     grew larger, was also but considerably richer in features.  The parsing
+#     core remains quite small.)
+# 3.  Improve on the CSV interface.
+#
+# Obviously, the last one is subjective.  I did try to defer to the original
+# interface whenever I didn't have a compelling reason to change it though, so
+# hopefully this won't be too radically different.
+#
+# We must have met our goals because FasterCSV was renamed to CSV and replaced
+# the original library.
+#
+# == What's Different From the Old CSV?
+#
+# I'm sure I'll miss something, but I'll try to mention most of the major
+# differences I am aware of, to help others quickly get up to speed:
+#
+# === CSV Parsing
+#
+# * This parser is m17n aware.  See CSV for full details.
+# * This library has a stricter parser and will throw MalformedCSVErrors on
+#   problematic data.
+# * This library has a less liberal idea of a line ending than CSV.  What you
+#   set as the <tt>:row_sep</tt> is law.  It can auto-detect your line endings
+#   though.
+# * The old library returned empty lines as <tt>[nil]</tt>.  This library calls
+#   them <tt>[]</tt>.
+# * This library has a much faster parser.
+#
+# === Interface
+#
+# * CSV now uses Hash-style parameters to set options.
+# * CSV no longer has generate_row() or parse_row().
+# * The old CSV's Reader and Writer classes have been dropped.
+# * CSV::open() is now more like Ruby's open().
+# * CSV objects now support most standard IO methods.
+# * CSV now has a new() method used to wrap objects like String and IO for
+#   reading and writing.
+# * CSV::generate() is different from the old method.
+# * CSV no longer supports partial reads.  It works line-by-line.
+# * CSV no longer allows the instance methods to override the separators for
+#   performance reasons.  They must be set in the constructor.
+#
+# If you use this library and find yourself missing any functionality I have
+# trimmed, please {let me know}[mailto:james@grayproductions.net].
+#
+# == Documentation
+#
+# See CSV for documentation.
+#
+# == What is CSV, really?
+#
+# CSV maintains a pretty strict definition of CSV taken directly from
+# {the RFC}[http://www.ietf.org/rfc/rfc4180.txt].  I relax the rules in only one
+# place and that is to make using this library easier.  CSV will parse all valid
+# CSV.
+#
+# What you don't want to do is feed CSV invalid data.  Because of the way the
+# CSV format works, it's common for a parser to need to read until the end of
+# the file to be sure a field is invalid.  This eats a lot of time and memory.
+#
+# Luckily, when working with invalid CSV, Ruby's built-in methods will almost
+# always be superior in every way.  For example, parsing non-quoted fields is as
+# easy as:
+#
+#   data.split(",")
+#
+# == Questions and/or Comments
+#
+# Feel free to email {James Edward Gray II}[mailto:james@grayproductions.net]
+# with any questions.
 
-    def data
-      to_s
-    end
-  end
+require "forwardable"
+require "English"
+require "date"
+require "stringio"
 
-  # deprecated
-  class Row < Array
-  end
+#
+# This class provides a complete interface to CSV files and data.  It offers
+# tools to enable you to read and write to and from Strings or IO objects, as
+# needed.
+#
+# == Reading
+#
+# === From a File
+#
+# ==== A Line at a Time
+#
+#   CSV.foreach("path/to/file.csv") do |row|
+#     # use row here...
+#   end
+#
+# ==== All at Once
+#
+#   arr_of_arrs = CSV.read("path/to/file.csv")
+#
+# === From a String
+#
+# ==== A Line at a Time
+#
+#   CSV.parse("CSV,data,String") do |row|
+#     # use row here...
+#   end
+#
+# ==== All at Once
+#
+#   arr_of_arrs = CSV.parse("CSV,data,String")
+#
+# == Writing
+#
+# === To a File
+#
+#   CSV.open("path/to/file.csv", "wb") do |csv|
+#     csv << ["row", "of", "CSV", "data"]
+#     csv << ["another", "row"]
+#     # ...
+#   end
+#
+# === To a String
+#
+#   csv_string = CSV.generate do |csv|
+#     csv << ["row", "of", "CSV", "data"]
+#     csv << ["another", "row"]
+#     # ...
+#   end
+#
+# == Convert a Single Line
+#
+#   csv_string = ["CSV", "data"].to_csv   # to CSV
+#   csv_array  = "CSV,String".parse_csv   # from CSV
+#
+# == Shortcut Interface
+#
+#   CSV             { |csv_out| csv_out << %w{my data here} }  # to $stdout
+#   CSV(csv = "")   { |csv_str| csv_str << %w{my data here} }  # to a String
+#   CSV($stderr)    { |csv_err| csv_err << %w{my data here} }  # to $stderr
+#
+# == CSV and Character Encodings (M17n or Multilingualization)
+#
+# This new CSV parser is m17n savvy.  The parser works in the Encoding of the IO
+# or String object being read from or written to.  Your data is never transcoded
+# (unless you ask Ruby to transcode it for you) and will literally be parsed in
+# the Encoding it is in.  Thus CSV will return Arrays or Rows of Strings in the
+# Encoding of your data.  This is accomplished by transcoding the parser itself
+# into your Encoding.
+#
+# Some transcoding must take place, of course, to accomplish this multiencoding
+# support.  For example, <tt>:col_sep</tt>, <tt>:row_sep</tt>, and
+# <tt>:quote_char</tt> must be transcoded to match your data.  Hopefully this
+# makes the entire process feel transparent, since CSV's defaults should just
+# magically work for you data.  However, you can set these values manually in
+# the target Encoding to avoid the translation.
+#
+# It's also important to note that while all of CSV's core parser is now
+# Encoding agnostic, some features are not.  For example, the built-in
+# converters will try to transcode data to UTF-8 before making conversions.
+# Again, you can provide custom converters that are aware of your Encodings to
+# avoid this translation.  It's just too hard for me to support native
+# conversions in all of Ruby's Encodings.
+#
+# Anyway, the practical side of this is simple:  make sure IO and String objects
+# passed into CSV have the proper Encoding set and everything should just work.
+# CSV methods that allow you to open IO objects (CSV::foreach(), CSV::open(),
+# CSV::read(), and CSV::readlines()) do allow you to specify the Encoding.
+#
+# One minor exception comes when generating CSV into a String with an Encoding
+# that is not ASCII compatible.  There's no existing data for CSV to use to
+# prepare itself and thus you will probably need to manually specify the desired
+# Encoding for most of those cases.  It will try to guess using the fields in a
+# row of output though, when using CSV::generate_line() or Array#to_csv().
+#
+# I try to point out any other Encoding issues in the documentation of methods
+# as they come up.
+#
+# This has been tested to the best of my ability with all non-"dummy" Encodings
+# Ruby ships with.  However, it is brave new code and may have some bugs.
+# Please feel free to {report}[mailto:james@grayproductions.net] any issues you
+# find with it.
+#
+class CSV
+  # The version of the installed library.
+  VERSION = "2.4.7".freeze
 
-  # Open a CSV formatted file for reading or writing.
-  #
-  # For reading.
-  #
-  # EXAMPLE 1
-  #   CSV.open('csvfile.csv', 'r') do |row|
-  #     p row
-  #   end
   #
-  # EXAMPLE 2
-  #   reader = CSV.open('csvfile.csv', 'r')
-  #   row1 = reader.shift
-  #   row2 = reader.shift
-  #   if row2.empty?
-  #     p 'row2 not find.'
-  #   end
-  #   reader.close
+  # A CSV::Row is part Array and part Hash.  It retains an order for the fields
+  # and allows duplicates just as an Array would, but also allows you to access
+  # fields by name just as you could if they were in a Hash.
   #
-  # ARGS
-  #   filename: filename to parse.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
+  # All rows returned by CSV will be constructed from this class, if header row
+  # processing is activated.
   #
-  # RETURNS
-  #   reader instance.  To get parse result, see CSV::Reader#each.
-  #
-  #
-  # For writing.
-  #
-  # EXAMPLE 1
-  #   CSV.open('csvfile.csv', 'w') do |writer|
-  #     writer << ['r1c1', 'r1c2']
-  #     writer << ['r2c1', 'r2c2']
-  #     writer << [nil, nil]
-  #   end
-  #
-  # EXAMPLE 2
-  #   writer = CSV.open('csvfile.csv', 'w')
-  #   writer << ['r1c1', 'r1c2'] << ['r2c1', 'r2c2'] << [nil, nil]
-  #   writer.close
-  #
-  # ARGS
-  #   filename: filename to generate.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
-  #
-  # RETURNS
-  #   writer instance.  See CSV::Writer#<< and CSV::Writer#add_row to know how
-  #   to generate CSV string.
-  #
-  def CSV.open(path, mode, fs = nil, rs = nil, &block)
-    if mode == 'r' or mode == 'rb'
-      open_reader(path, mode, fs, rs, &block)
-    elsif mode == 'w' or mode == 'wb'
-      open_writer(path, mode, fs, rs, &block)
-    else
-      raise ArgumentError.new("'mode' must be 'r', 'rb', 'w', or 'wb'")
+  class Row
+    #
+    # Construct a new CSV::Row from +headers+ and +fields+, which are expected
+    # to be Arrays.  If one Array is shorter than the other, it will be padded
+    # with +nil+ objects.
+    #
+    # The optional +header_row+ parameter can be set to +true+ to indicate, via
+    # CSV::Row.header_row?() and CSV::Row.field_row?(), that this is a header
+    # row.  Otherwise, the row is assumes to be a field row.
+    #
+    # A CSV::Row object supports the following Array methods through delegation:
+    #
+    # * empty?()
+    # * length()
+    # * size()
+    #
+    def initialize(headers, fields, header_row = false)
+      @header_row = header_row
+
+      # handle extra headers or fields
+      @row = if headers.size > fields.size
+        headers.zip(fields)
+      else
+        fields.zip(headers).map { |pair| pair.reverse }
+      end
     end
-  end
 
-  def CSV.foreach(path, rs = nil, &block)
-    open_reader(path, 'r', ',', rs, &block)
-  end
+    # Internal data format used to compare equality.
+    attr_reader :row
+    protected   :row
 
-  def CSV.read(path, length = nil, offset = nil)
-    CSV.parse(IO.read(path, length, offset))
-  end
-  
-  def CSV.readlines(path, rs = nil)
-    reader = open_reader(path, 'r', ',', rs)
-    begin
-      reader.collect { |row| row }
-    ensure
-      reader.close
+    ### Array Delegation ###
+
+    extend Forwardable
+    def_delegators :@row, :empty?, :length, :size
+
+    # Returns +true+ if this is a header row.
+    def header_row?
+      @header_row
     end
-  end
 
-  def CSV.generate(path, fs = nil, rs = nil, &block)
-    open_writer(path, 'w', fs, rs, &block)
-  end
+    # Returns +true+ if this is a field row.
+    def field_row?
+      not header_row?
+    end
 
-  # Parse lines from given string or stream.  Return rows as an Array of Arrays.
-  def CSV.parse(str_or_readable, fs = nil, rs = nil, &block)
-    if File.exist?(str_or_readable)
-      STDERR.puts("CSV.parse(filename) is deprecated." +
-        "  Use CSV.open(filename, 'r') instead.")
-      return open_reader(str_or_readable, 'r', fs, rs, &block)
+    # Returns the headers of this row.
+    def headers
+      @row.map { |pair| pair.first }
     end
-    if block
-      CSV::Reader.parse(str_or_readable, fs, rs) do |row|
-        yield(row)
+
+    #
+    # :call-seq:
+    #   field( header )
+    #   field( header, offset )
+    #   field( index )
+    #
+    # This method will fetch the field value by +header+ or +index+.  If a field
+    # is not found, +nil+ is returned.
+    #
+    # When provided, +offset+ ensures that a header match occurrs on or later
+    # than the +offset+ index.  You can use this to find duplicate headers,
+    # without resorting to hard-coding exact indices.
+    #
+    def field(header_or_index, minimum_index = 0)
+      # locate the pair
+      finder = header_or_index.is_a?(Integer) ? :[] : :assoc
+      pair   = @row[minimum_index..-1].send(finder, header_or_index)
+
+      # return the field if we have a pair
+      pair.nil? ? nil : pair.last
+    end
+    alias_method :[], :field
+
+    #
+    # :call-seq:
+    #   []=( header, value )
+    #   []=( header, offset, value )
+    #   []=( index, value )
+    #
+    # Looks up the field by the semantics described in CSV::Row.field() and
+    # assigns the +value+.
+    #
+    # Assigning past the end of the row with an index will set all pairs between
+    # to <tt>[nil, nil]</tt>.  Assigning to an unused header appends the new
+    # pair.
+    #
+    def []=(*args)
+      value = args.pop
+
+      if args.first.is_a? Integer
+        if @row[args.first].nil?  # extending past the end with index
+          @row[args.first] = [nil, value]
+          @row.map! { |pair| pair.nil? ? [nil, nil] : pair }
+        else                      # normal index assignment
+          @row[args.first][1] = value
+        end
+      else
+        index = index(*args)
+        if index.nil?             # appending a field
+          self << [args.first, value]
+        else                      # normal header assignment
+          @row[index][1] = value
+        end
       end
-      nil
-    else
-      CSV::Reader.create(str_or_readable, fs, rs).collect { |row| row }
     end
-  end
 
-  # Parse a line from given string.  Bear in mind it parses ONE LINE.  Rest of
-  # the string is ignored for example "a,b\r\nc,d" => ['a', 'b'] and the
-  # second line 'c,d' is ignored.
-  #
-  # If you don't know whether a target string to parse is exactly 1 line or
-  # not, use CSV.parse_row instead of this method.
-  def CSV.parse_line(src, fs = nil, rs = nil)
-    fs ||= ','
-    if fs.is_a?(Fixnum)
-      fs = fs.chr
+    #
+    # :call-seq:
+    #   <<( field )
+    #   <<( header_and_field_array )
+    #   <<( header_and_field_hash )
+    #
+    # If a two-element Array is provided, it is assumed to be a header and field
+    # and the pair is appended.  A Hash works the same way with the key being
+    # the header and the value being the field.  Anything else is assumed to be
+    # a lone field which is appended with a +nil+ header.
+    #
+    # This method returns the row for chaining.
+    #
+    def <<(arg)
+      if arg.is_a?(Array) and arg.size == 2  # appending a header and name
+        @row << arg
+      elsif arg.is_a?(Hash)                  # append header and name pairs
+        arg.each { |pair| @row << pair }
+      else                                   # append field value
+        @row << [nil, arg]
+      end
+
+      self  # for chaining
     end
-    if !rs.nil? and rs.is_a?(Fixnum)
-      rs = rs.chr
+
+    #
+    # A shortcut for appending multiple fields.  Equivalent to:
+    #
+    #   args.each { |arg| csv_row << arg }
+    #
+    # This method returns the row for chaining.
+    #
+    def push(*args)
+      args.each { |arg| self << arg }
+
+      self  # for chaining
     end
-    idx = 0
-    res_type = :DT_COLSEP
-    row = []
-    begin
-      while res_type == :DT_COLSEP
-        res_type, idx, cell = parse_body(src, idx, fs, rs)
-        row << cell
+
+    #
+    # :call-seq:
+    #   delete( header )
+    #   delete( header, offset )
+    #   delete( index )
+    #
+    # Used to remove a pair from the row by +header+ or +index+.  The pair is
+    # located as described in CSV::Row.field().  The deleted pair is returned,
+    # or +nil+ if a pair could not be found.
+    #
+    def delete(header_or_index, minimum_index = 0)
+      if header_or_index.is_a? Integer                 # by index
+        @row.delete_at(header_or_index)
+      elsif i = index(header_or_index, minimum_index)  # by header
+        @row.delete_at(i)
+      else
+        [ ]
       end
-    rescue IllegalFormatError
-      return []
     end
-    row
-  end
 
-  # Create a line from cells.  each cell is stringified by to_s.
-  def CSV.generate_line(row, fs = nil, rs = nil)
-    if row.size == 0
-      return ''
-    end
-    fs ||= ','
-    if fs.is_a?(Fixnum)
-      fs = fs.chr
-    end
-    if !rs.nil? and rs.is_a?(Fixnum)
-      rs = rs.chr
-    end
-    res_type = :DT_COLSEP
-    result_str = ''
-    idx = 0
-    while true
-      generate_body(row[idx], result_str, fs, rs)
-      idx += 1
-      if (idx == row.size)
-        break
-      end
-      generate_separator(:DT_COLSEP, result_str, fs, rs)
-    end
-    result_str
-  end
-  
-  # Parse a line from string.  Consider using CSV.parse_line instead.
-  # To parse lines in CSV string, see EXAMPLE below.
-  #
-  # EXAMPLE
-  #   src = "a,b\r\nc,d\r\ne,f"
-  #   idx = 0
-  #   begin
-  #     parsed = []
-  #     parsed_cells, idx = CSV.parse_row(src, idx, parsed)
-  #     puts "Parsed #{ parsed_cells } cells."
-  #     p parsed
-  #   end while parsed_cells > 0
-  #
-  # ARGS
-  #   src: a CSV data to be parsed.  Must respond '[](idx)'.
-  #     src[](idx) must return a char. (Not a string such as 'a', but 97).
-  #     src[](idx_out_of_bounds) must return nil.  A String satisfies this
-  #     requirement.
-  #   idx: index of parsing location of 'src'.  0 origin.
-  #   out_dev: buffer for parsed cells.  Must respond '<<(aString)'.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
-  #
-  # RETURNS
-  #   parsed_cells: num of parsed cells.
-  #   idx: index of next parsing location of 'src'.
-  #
-  def CSV.parse_row(src, idx, out_dev, fs = nil, rs = nil)
-    fs ||= ','
-    if fs.is_a?(Fixnum)
-      fs = fs.chr
-    end
-    if !rs.nil? and rs.is_a?(Fixnum)
-      rs = rs.chr
-    end
-    idx_backup = idx
-    parsed_cells = 0
-    res_type = :DT_COLSEP
-    begin
-      while res_type != :DT_ROWSEP
-        res_type, idx, cell = parse_body(src, idx, fs, rs)
-        if res_type == :DT_EOS
-          if idx == idx_backup #((parsed_cells == 0) and cell.nil?)
-            return 0, 0
+    #
+    # The provided +block+ is passed a header and field for each pair in the row
+    # and expected to return +true+ or +false+, depending on whether the pair
+    # should be deleted.
+    #
+    # This method returns the row for chaining.
+    #
+    def delete_if(&block)
+      @row.delete_if(&block)
+
+      self  # for chaining
+    end
+
+    #
+    # This method accepts any number of arguments which can be headers, indices,
+    # Ranges of either, or two-element Arrays containing a header and offset.
+    # Each argument will be replaced with a field lookup as described in
+    # CSV::Row.field().
+    #
+    # If called with no arguments, all fields are returned.
+    #
+    def fields(*headers_and_or_indices)
+      if headers_and_or_indices.empty?  # return all fields--no arguments
+        @row.map { |pair| pair.last }
+      else                              # or work like values_at()
+        headers_and_or_indices.inject(Array.new) do |all, h_or_i|
+          all + if h_or_i.is_a? Range
+            index_begin = h_or_i.begin.is_a?(Integer) ? h_or_i.begin :
+                                                        index(h_or_i.begin)
+            index_end   = h_or_i.end.is_a?(Integer)   ? h_or_i.end :
+                                                        index(h_or_i.end)
+            new_range   = h_or_i.exclude_end? ? (index_begin...index_end) :
+                                                (index_begin..index_end)
+            fields.values_at(new_range)
+          else
+            [field(*Array(h_or_i))]
           end
-          res_type = :DT_ROWSEP
         end
-        parsed_cells += 1
-        out_dev << cell
-      end
-    rescue IllegalFormatError
-      return 0, 0
-    end
-    return parsed_cells, idx
-  end
-  
-  # Convert a line from cells data to string.  Consider using CSV.generate_line
-  # instead.  To generate multi-row CSV string, see EXAMPLE below.
-  #
-  # EXAMPLE
-  #   row1 = ['a', 'b']
-  #   row2 = ['c', 'd']
-  #   row3 = ['e', 'f']
-  #   src = [row1, row2, row3]
-  #   buf = ''
-  #   src.each do |row|
-  #     parsed_cells = CSV.generate_row(row, 2, buf)
-  #     puts "Created #{ parsed_cells } cells."
-  #   end
-  #   p buf
-  #
-  # ARGS
-  #   src: an Array of String to be converted to CSV string.  Must respond to
-  #     'size' and '[](idx)'.  src[idx] must return String.
-  #   cells: num of cells in a line.
-  #   out_dev: buffer for generated CSV string.  Must respond to '<<(string)'.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
-  #
-  # RETURNS
-  #   parsed_cells: num of converted cells.
-  #
-  def CSV.generate_row(src, cells, out_dev, fs = nil, rs = nil)
-    fs ||= ','
-    if fs.is_a?(Fixnum)
-      fs = fs.chr
-    end
-    if !rs.nil? and rs.is_a?(Fixnum)
-      rs = rs.chr
-    end
-    src_size = src.size
-    if (src_size == 0)
-      if cells == 0
-        generate_separator(:DT_ROWSEP, out_dev, fs, rs)
-      end
-      return 0
-    end
-    res_type = :DT_COLSEP
-    parsed_cells = 0
-    generate_body(src[parsed_cells], out_dev, fs, rs)
-    parsed_cells += 1
-    while ((parsed_cells < cells) and (parsed_cells != src_size))
-      generate_separator(:DT_COLSEP, out_dev, fs, rs)
-      generate_body(src[parsed_cells], out_dev, fs, rs)
-      parsed_cells += 1
-    end
-    if (parsed_cells == cells)
-      generate_separator(:DT_ROWSEP, out_dev, fs, rs)
-    else
-      generate_separator(:DT_COLSEP, out_dev, fs, rs)
+      end
+    end
+    alias_method :values_at, :fields
+
+    #
+    # :call-seq:
+    #   index( header )
+    #   index( header, offset )
+    #
+    # This method will return the index of a field with the provided +header+.
+    # The +offset+ can be used to locate duplicate header names, as described in
+    # CSV::Row.field().
+    #
+    def index(header, minimum_index = 0)
+      # find the pair
+      index = headers[minimum_index..-1].index(header)
+      # return the index at the right offset, if we found one
+      index.nil? ? nil : index + minimum_index
+    end
+
+    # Returns +true+ if +name+ is a header for this row, and +false+ otherwise.
+    def header?(name)
+      headers.include? name
+    end
+    alias_method :include?, :header?
+
+    #
+    # Returns +true+ if +data+ matches a field in this row, and +false+
+    # otherwise.
+    #
+    def field?(data)
+      fields.include? data
+    end
+
+    include Enumerable
+
+    #
+    # Yields each pair of the row as header and field tuples (much like
+    # iterating over a Hash).
+    #
+    # Support for Enumerable.
+    #
+    # This method returns the row for chaining.
+    #
+    def each(&block)
+      @row.each(&block)
+
+      self  # for chaining
+    end
+
+    #
+    # Returns +true+ if this row contains the same headers and fields in the
+    # same order as +other+.
+    #
+    def ==(other)
+      @row == other.row
+    end
+
+    #
+    # Collapses the row into a simple Hash.  Be warning that this discards field
+    # order and clobbers duplicate fields.
+    #
+    def to_hash
+      # flatten just one level of the internal Array
+      Hash[*@row.inject(Array.new) { |ary, pair| ary.push(*pair) }]
+    end
+
+    #
+    # Returns the row as a CSV String.  Headers are not used.  Equivalent to:
+    #
+    #   csv_row.fields.to_csv( options )
+    #
+    def to_csv(options = Hash.new)
+      fields.to_csv(options)
+    end
+    alias_method :to_s, :to_csv
+
+    # A summary of fields, by header, in an ASCII compatible String.
+    def inspect
+      str = ["#<", self.class.to_s]
+      each do |header, field|
+        str << " " << (header.is_a?(Symbol) ? header.to_s : header.inspect) <<
+               ":" << field.inspect
+      end
+      str << ">"
+      begin
+        str.join
+      rescue  # any encoding error
+        str.map do |s|
+          e = Encoding::Converter.asciicompat_encoding(s.encoding)
+          e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
+        end.join
+      end
     end
-    parsed_cells
   end
-  
-  # Private class methods.
-  class << self
-  private
 
-    def open_reader(path, mode, fs, rs, &block)
-      file = File.open(path, mode)
-      if block
-        begin
-          CSV::Reader.parse(file, fs, rs) do |row|
-            yield(row)
-          end
-        ensure
-          file.close
-        end
-        nil
+  #
+  # A CSV::Table is a two-dimensional data structure for representing CSV
+  # documents.  Tables allow you to work with the data by row or column,
+  # manipulate the data, and even convert the results back to CSV, if needed.
+  #
+  # All tables returned by CSV will be constructed from this class, if header
+  # row processing is activated.
+  #
+  class Table
+    #
+    # Construct a new CSV::Table from +array_of_rows+, which are expected
+    # to be CSV::Row objects.  All rows are assumed to have the same headers.
+    #
+    # A CSV::Table object supports the following Array methods through
+    # delegation:
+    #
+    # * empty?()
+    # * length()
+    # * size()
+    #
+    def initialize(array_of_rows)
+      @table = array_of_rows
+      @mode  = :col_or_row
+    end
+
+    # The current access mode for indexing and iteration.
+    attr_reader :mode
+
+    # Internal data format used to compare equality.
+    attr_reader :table
+    protected   :table
+
+    ### Array Delegation ###
+
+    extend Forwardable
+    def_delegators :@table, :empty?, :length, :size
+
+    #
+    # Returns a duplicate table object, in column mode.  This is handy for
+    # chaining in a single call without changing the table mode, but be aware
+    # that this method can consume a fair amount of memory for bigger data sets.
+    #
+    # This method returns the duplicate table for chaining.  Don't chain
+    # destructive methods (like []=()) this way though, since you are working
+    # with a duplicate.
+    #
+    def by_col
+      self.class.new(@table.dup).by_col!
+    end
+
+    #
+    # Switches the mode of this table to column mode.  All calls to indexing and
+    # iteration methods will work with columns until the mode is changed again.
+    #
+    # This method returns the table and is safe to chain.
+    #
+    def by_col!
+      @mode = :col
+
+      self
+    end
+
+    #
+    # Returns a duplicate table object, in mixed mode.  This is handy for
+    # chaining in a single call without changing the table mode, but be aware
+    # that this method can consume a fair amount of memory for bigger data sets.
+    #
+    # This method returns the duplicate table for chaining.  Don't chain
+    # destructive methods (like []=()) this way though, since you are working
+    # with a duplicate.
+    #
+    def by_col_or_row
+      self.class.new(@table.dup).by_col_or_row!
+    end
+
+    #
+    # Switches the mode of this table to mixed mode.  All calls to indexing and
+    # iteration methods will use the default intelligent indexing system until
+    # the mode is changed again.  In mixed mode an index is assumed to be a row
+    # reference while anything else is assumed to be column access by headers.
+    #
+    # This method returns the table and is safe to chain.
+    #
+    def by_col_or_row!
+      @mode = :col_or_row
+
+      self
+    end
+
+    #
+    # Returns a duplicate table object, in row mode.  This is handy for chaining
+    # in a single call without changing the table mode, but be aware that this
+    # method can consume a fair amount of memory for bigger data sets.
+    #
+    # This method returns the duplicate table for chaining.  Don't chain
+    # destructive methods (like []=()) this way though, since you are working
+    # with a duplicate.
+    #
+    def by_row
+      self.class.new(@table.dup).by_row!
+    end
+
+    #
+    # Switches the mode of this table to row mode.  All calls to indexing and
+    # iteration methods will work with rows until the mode is changed again.
+    #
+    # This method returns the table and is safe to chain.
+    #
+    def by_row!
+      @mode = :row
+
+      self
+    end
+
+    #
+    # Returns the headers for the first row of this table (assumed to match all
+    # other rows).  An empty Array is returned for empty tables.
+    #
+    def headers
+      if @table.empty?
+        Array.new
       else
-        reader = CSV::Reader.create(file, fs, rs)
-        reader.close_on_terminate
-        reader
+        @table.first.headers
       end
     end
 
-    def open_writer(path, mode, fs, rs, &block)
-      file = File.open(path, mode)
-      if block
-        begin
-          CSV::Writer.generate(file, fs, rs) do |writer|
-            yield(writer)
-          end
-        ensure
-          file.close
-        end
-        nil
-      else
-        writer = CSV::Writer.create(file, fs, rs) 
-        writer.close_on_terminate
-        writer
-      end
-    end
-
-    def parse_body(src, idx, fs, rs)
-      fs_str = fs
-      fs_size = fs_str.size
-      rs_str = rs || "\n"
-      rs_size = rs_str.size
-      fs_idx = rs_idx = 0
-      cell = Cell.new
-      state = :ST_START
-      quoted = cr = false
-      c = nil
-      last_idx = idx
-      while c = src[idx]
-        unless quoted
-          fschar = (c == fs_str[fs_idx])
-          rschar = (c == rs_str[rs_idx])
-          # simple 1 char backtrack
-          if !fschar and c == fs_str[0]
-            fs_idx = 0
-            fschar = true
-            if state == :ST_START
-              state = :ST_DATA
-            elsif state == :ST_QUOTE
-              raise IllegalFormatError
-            end
-          end
-          if !rschar and c == rs_str[0]
-            rs_idx = 0
-            rschar = true
-            if state == :ST_START
-              state = :ST_DATA
-            elsif state == :ST_QUOTE
-              raise IllegalFormatError
-            end
-          end
+    #
+    # In the default mixed mode, this method returns rows for index access and
+    # columns for header access.  You can force the index association by first
+    # calling by_col!() or by_row!().
+    #
+    # Columns are returned as an Array of values.  Altering that Array has no
+    # effect on the table.
+    #
+    def [](index_or_header)
+      if @mode == :row or  # by index
+         (@mode == :col_or_row and index_or_header.is_a? Integer)
+        @table[index_or_header]
+      else                 # by header
+        @table.map { |row| row[index_or_header] }
+      end
+    end
+
+    #
+    # In the default mixed mode, this method assigns rows for index access and
+    # columns for header access.  You can force the index association by first
+    # calling by_col!() or by_row!().
+    #
+    # Rows may be set to an Array of values (which will inherit the table's
+    # headers()) or a CSV::Row.
+    #
+    # Columns may be set to a single value, which is copied to each row of the
+    # column, or an Array of values.  Arrays of values are assigned to rows top
+    # to bottom in row major order.  Excess values are ignored and if the Array
+    # does not have a value for each row the extra rows will receive a +nil+.
+    #
+    # Assigning to an existing column or row clobbers the data.  Assigning to
+    # new columns creates them at the right end of the table.
+    #
+    def []=(index_or_header, value)
+      if @mode == :row or  # by index
+         (@mode == :col_or_row and index_or_header.is_a? Integer)
+        if value.is_a? Array
+          @table[index_or_header] = Row.new(headers, value)
+        else
+          @table[index_or_header] = value
         end
-        if c == ?"
-          fs_idx = rs_idx = 0
-          if cr
-            raise IllegalFormatError
-          end
-          cell << src[last_idx, (idx - last_idx)]
-          last_idx = idx
-          if state == :ST_DATA
-            if quoted
-              last_idx += 1
-              quoted = false
-              state = :ST_QUOTE
+      else                 # set column
+        if value.is_a? Array  # multiple values
+          @table.each_with_index do |row, i|
+            if row.header_row?
+              row[index_or_header] = index_or_header
             else
-              raise IllegalFormatError
-            end
-          elsif state == :ST_QUOTE
-            cell << c.chr
-            last_idx += 1
-            quoted = true
-            state = :ST_DATA
-          else  # :ST_START
-            quoted = true
-            last_idx += 1
-            state = :ST_DATA
-          end
-        elsif fschar or rschar
-          if fschar
-            fs_idx += 1
-          end
-          if rschar
-            rs_idx += 1
-          end
-          sep = nil
-          if fs_idx == fs_size
-            if state == :ST_START and rs_idx > 0 and fs_idx < rs_idx
-              state = :ST_DATA
-            end
-            cell << src[last_idx, (idx - last_idx - (fs_size - 1))]
-            last_idx = idx
-            fs_idx = rs_idx = 0
-            if cr
-              raise IllegalFormatError
-            end
-            sep = :DT_COLSEP
-          elsif rs_idx == rs_size
-            if state == :ST_START and fs_idx > 0 and rs_idx < fs_idx
-              state = :ST_DATA
-            end
-            if !(rs.nil? and cr)
-              cell << src[last_idx, (idx - last_idx - (rs_size - 1))]
-              last_idx = idx
-            end
-            fs_idx = rs_idx = 0
-            sep = :DT_ROWSEP
-          end
-          if sep
-            if state == :ST_DATA
-              return sep, idx + 1, cell;
-            elsif state == :ST_QUOTE
-              return sep, idx + 1, cell;
-            else  # :ST_START
-              return sep, idx + 1, nil
+              row[index_or_header] = value[i]
             end
           end
-        elsif rs.nil? and c == ?\r
-          # special \r treatment for backward compatibility
-          fs_idx = rs_idx = 0
-          if cr
-            raise IllegalFormatError
-          end
-          cell << src[last_idx, (idx - last_idx)]
-          last_idx = idx
-          if quoted
-            state = :ST_DATA
-          else
-            cr = true
-          end
-        else
-          fs_idx = rs_idx = 0
-          if state == :ST_DATA or state == :ST_START
-            if cr
-              raise IllegalFormatError
+        else                  # repeated value
+          @table.each do |row|
+            if row.header_row?
+              row[index_or_header] = index_or_header
+            else
+              row[index_or_header] = value
             end
-            state = :ST_DATA
-          else  # :ST_QUOTE
-            raise IllegalFormatError
           end
         end
-        idx += 1
       end
-      if state == :ST_START
-        if fs_idx > 0 or rs_idx > 0
-          state = :ST_DATA
-        else
-          return :DT_EOS, idx, nil
-        end
-      elsif quoted
-        raise IllegalFormatError
-      elsif cr
-        raise IllegalFormatError
-      end
-      cell << src[last_idx, (idx - last_idx)]
-      last_idx = idx
-      return :DT_EOS, idx, cell
-    end
-  
-    def generate_body(cell, out_dev, fs, rs)
-      if cell.nil?
-        # empty
-      else
-        cell = cell.to_s
-        row_data = cell.dup
-        if (row_data.gsub!('"', '""') or
-            row_data.index(fs) or
-            (rs and row_data.index(rs)) or
-            (/[\r\n]/ =~ row_data) or
-            (cell.empty?))
-          out_dev << '"' << row_data << '"'
-        else
-          out_dev << row_data
-        end
+    end
+
+    #
+    # The mixed mode default is to treat a list of indices as row access,
+    # returning the rows indicated.  Anything else is considered columnar
+    # access.  For columnar access, the return set has an Array for each row
+    # with the values indicated by the headers in each Array.  You can force
+    # column or row mode using by_col!() or by_row!().
+    #
+    # You cannot mix column and row access.
+    #
+    def values_at(*indices_or_headers)
+      if @mode == :row or  # by indices
+         ( @mode == :col_or_row and indices_or_headers.all? do |index|
+                                      index.is_a?(Integer)         or
+                                      ( index.is_a?(Range)         and
+                                        index.first.is_a?(Integer) and
+                                        index.last.is_a?(Integer) )
+                                    end )
+        @table.values_at(*indices_or_headers)
+      else                 # by headers
+        @table.map { |row| row.values_at(*indices_or_headers) }
       end
     end
-    
-    def generate_separator(type, out_dev, fs, rs)
-      case type
-      when :DT_COLSEP
-        out_dev << fs
-      when :DT_ROWSEP
-        out_dev << (rs || "\n")
+
+    #
+    # Adds a new row to the bottom end of this table.  You can provide an Array,
+    # which will be converted to a CSV::Row (inheriting the table's headers()),
+    # or a CSV::Row.
+    #
+    # This method returns the table for chaining.
+    #
+    def <<(row_or_array)
+      if row_or_array.is_a? Array  # append Array
+        @table << Row.new(headers, row_or_array)
+      else                         # append Row
+        @table << row_or_array
       end
+
+      self  # for chaining
     end
-  end
 
+    #
+    # A shortcut for appending multiple rows.  Equivalent to:
+    #
+    #   rows.each { |row| self << row }
+    #
+    # This method returns the table for chaining.
+    #
+    def push(*rows)
+      rows.each { |row| self << row }
 
-  # CSV formatted string/stream reader.
-  #
-  # EXAMPLE
-  #   read CSV lines untill the first column is 'stop'.
-  #
-  #   CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
-  #     p row
-  #     break if !row[0].is_null && row[0].data == 'stop'
-  #   end
-  #
-  class Reader
-    include Enumerable
+      self  # for chaining
+    end
 
-    # Parse CSV data and get lines.  Given block is called for each parsed row.
-    # Block value is always nil.  Rows are not cached for performance reason.
-    def Reader.parse(str_or_readable, fs = ',', rs = nil, &block)
-      reader = Reader.create(str_or_readable, fs, rs)
-      if block
-        reader.each do |row|
-          yield(row)
+    #
+    # Removes and returns the indicated column or row.  In the default mixed
+    # mode indices refer to rows and everything else is assumed to be a column
+    # header.  Use by_col!() or by_row!() to force the lookup.
+    #
+    def delete(index_or_header)
+      if @mode == :row or  # by index
+         (@mode == :col_or_row and index_or_header.is_a? Integer)
+        @table.delete_at(index_or_header)
+      else                 # by header
+        @table.map { |row| row.delete(index_or_header).last }
+      end
+    end
+
+    #
+    # Removes any column or row for which the block returns +true+.  In the
+    # default mixed mode or row mode, iteration is the standard row major
+    # walking of rows.  In column mode, interation will +yield+ two element
+    # tuples containing the column name and an Array of values for that column.
+    #
+    # This method returns the table for chaining.
+    #
+    def delete_if(&block)
+      if @mode == :row or @mode == :col_or_row  # by index
+        @table.delete_if(&block)
+      else                                      # by header
+        to_delete = Array.new
+        headers.each_with_index do |header, i|
+          to_delete << header if block[[header, self[header]]]
         end
-        reader.close
-        nil
-      else
-        reader
+        to_delete.map { |header| delete(header) }
       end
+
+      self  # for chaining
     end
 
-    # Returns reader instance.
-    def Reader.create(str_or_readable, fs = ',', rs = nil)
-      case str_or_readable
-      when IO
-        IOReader.new(str_or_readable, fs, rs)
-      when String
-        StringReader.new(str_or_readable, fs, rs)
+    include Enumerable
+
+    #
+    # In the default mixed mode or row mode, iteration is the standard row major
+    # walking of rows.  In column mode, interation will +yield+ two element
+    # tuples containing the column name and an Array of values for that column.
+    #
+    # This method returns the table for chaining.
+    #
+    def each(&block)
+      if @mode == :col
+        headers.each { |header| block[[header, self[header]]] }
       else
-        IOReader.new(str_or_readable, fs, rs)
+        @table.each(&block)
       end
+
+      self  # for chaining
     end
 
-    def each
-      while true
-        row = []
-        parsed_cells = get_row(row)
-        if parsed_cells == 0
-          break
+    # Returns +true+ if all rows of this table ==() +other+'s rows.
+    def ==(other)
+      @table == other.table
+    end
+
+    #
+    # Returns the table as an Array of Arrays.  Headers will be the first row,
+    # then all of the field rows will follow.
+    #
+    def to_a
+      @table.inject([headers]) do |array, row|
+        if row.header_row?
+          array
+        else
+          array + [row.fields]
         end
-        yield(row)
       end
-      nil
     end
 
-    def shift
-      row = []
-      parsed_cells = get_row(row)
-      row
+    #
+    # Returns the table as a complete CSV String.  Headers will be listed first,
+    # then all of the field rows.
+    #
+    # This method assumes you want the Table.headers(), unless you explicitly
+    # pass <tt>:write_headers => false</tt>.
+    # 
+    def to_csv(options = Hash.new)
+      wh = options.fetch(:write_headers, true)
+      @table.inject(wh ? [headers.to_csv(options)] : [ ]) do |rows, row|
+        if row.header_row?
+          rows
+        else
+          rows + [row.fields.to_csv(options)]
+        end
+      end.join
     end
+    alias_method :to_s, :to_csv
 
-    def close
-      terminate
+    # Shows the mode and size of this table in a US-ASCII String.
+    def inspect
+      "#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>".encode("US-ASCII")
     end
+  end
 
-  private
+  # The error thrown when the parser encounters illegal CSV formatting.
+  class MalformedCSVError < RuntimeError; end
+
+  #
+  # A FieldInfo Struct contains details about a field's position in the data
+  # source it was read from.  CSV will pass this Struct to some blocks that make
+  # decisions based on field structure.  See CSV.convert_fields() for an
+  # example.
+  #
+  # <b><tt>index</tt></b>::  The zero-based index of the field in its row.
+  # <b><tt>line</tt></b>::   The line of the data source this row is from.
+  # <b><tt>header</tt></b>:: The header for the column, when available.
+  #
+  FieldInfo = Struct.new(:index, :line, :header)
+
+  # A Regexp used to find and convert some common Date formats.
+  DateMatcher     = / \A(?: (\w+,?\s+)?\w+\s+\d{1,2},?\s+\d{2,4} |
+                            \d{4}-\d{2}-\d{2} )\z /x
+  # A Regexp used to find and convert some common DateTime formats.
+  DateTimeMatcher =
+    / \A(?: (\w+,?\s+)?\w+\s+\d{1,2}\s+\d{1,2}:\d{1,2}:\d{1,2},?\s+\d{2,4} |
+            \d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2} )\z /x
+
+  # The encoding used by all converters.
+  ConverterEncoding = Encoding.find("UTF-8")
+
+  #
+  # This Hash holds the built-in converters of CSV that can be accessed by name.
+  # You can select Converters with CSV.convert() or through the +options+ Hash
+  # passed to CSV::new().
+  #
+  # <b><tt>:integer</tt></b>::    Converts any field Integer() accepts.
+  # <b><tt>:float</tt></b>::      Converts any field Float() accepts.
+  # <b><tt>:numeric</tt></b>::    A combination of <tt>:integer</tt>
+  #                               and <tt>:float</tt>.
+  # <b><tt>:date</tt></b>::       Converts any field Date::parse() accepts.
+  # <b><tt>:date_time</tt></b>::  Converts any field DateTime::parse() accepts.
+  # <b><tt>:all</tt></b>::        All built-in converters.  A combination of
+  #                               <tt>:date_time</tt> and <tt>:numeric</tt>.
+  #
+  # All built-in converters transcode field data to UTF-8 before attempting a
+  # conversion.  If your data cannot be transcoded to UTF-8 the conversion will
+  # fail and the field will remain unchanged.
+  #
+  # This Hash is intentionally left unfrozen and users should feel free to add
+  # values to it that can be accessed by all CSV objects.
+  #
+  # To add a combo field, the value should be an Array of names.  Combo fields
+  # can be nested with other combo fields.
+  #
+  Converters  = { integer:   lambda { |f|
+                    Integer(f.encode(ConverterEncoding)) rescue f
+                  },
+                  float:     lambda { |f|
+                    Float(f.encode(ConverterEncoding)) rescue f
+                  },
+                  numeric:   [:integer, :float],
+                  date:      lambda { |f|
+                    begin
+                      e = f.encode(ConverterEncoding)
+                      e =~ DateMatcher ? Date.parse(e) : f
+                    rescue  # encoding conversion or date parse errors
+                      f
+                    end
+                  },
+                  date_time: lambda { |f|
+                    begin
+                      e = f.encode(ConverterEncoding)
+                      e =~ DateTimeMatcher ? DateTime.parse(e) : f
+                    rescue  # encoding conversion or date parse errors
+                      f
+                    end
+                  },
+                  all:       [:date_time, :numeric] }
+
+  #
+  # This Hash holds the built-in header converters of CSV that can be accessed
+  # by name.  You can select HeaderConverters with CSV.header_convert() or
+  # through the +options+ Hash passed to CSV::new().
+  #
+  # <b><tt>:downcase</tt></b>::  Calls downcase() on the header String.
+  # <b><tt>:symbol</tt></b>::    The header String is downcased, spaces are
+  #                              replaced with underscores, non-word characters
+  #                              are dropped, and finally to_sym() is called.
+  #
+  # All built-in header converters transcode header data to UTF-8 before
+  # attempting a conversion.  If your data cannot be transcoded to UTF-8 the
+  # conversion will fail and the header will remain unchanged.
+  #
+  # This Hash is intetionally left unfrozen and users should feel free to add
+  # values to it that can be accessed by all CSV objects.
+  #
+  # To add a combo field, the value should be an Array of names.  Combo fields
+  # can be nested with other combo fields.
+  #
+  HeaderConverters = {
+    downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
+    symbol:   lambda { |h|
+      h.encode(ConverterEncoding).downcase.gsub(/\s+/, "_").
+                                           gsub(/\W+/, "").to_sym
+    }
+  }
+
+  #
+  # The options used when no overrides are given by calling code.  They are:
+  #
+  # <b><tt>:col_sep</tt></b>::            <tt>","</tt>
+  # <b><tt>:row_sep</tt></b>::            <tt>:auto</tt>
+  # <b><tt>:quote_char</tt></b>::         <tt>'"'</tt>
+  # <b><tt>:field_size_limit</tt></b>::   +nil+
+  # <b><tt>:converters</tt></b>::         +nil+
+  # <b><tt>:unconverted_fields</tt></b>:: +nil+
+  # <b><tt>:headers</tt></b>::            +false+
+  # <b><tt>:return_headers</tt></b>::     +false+
+  # <b><tt>:header_converters</tt></b>::  +nil+
+  # <b><tt>:skip_blanks</tt></b>::        +false+
+  # <b><tt>:force_quotes</tt></b>::       +false+
+  #
+  DEFAULT_OPTIONS = { col_sep:            ",",
+                      row_sep:            :auto,
+                      quote_char:         '"',
+                      field_size_limit:   nil,
+                      converters:         nil,
+                      unconverted_fields: nil,
+                      headers:            false,
+                      return_headers:     false,
+                      header_converters:  nil,
+                      skip_blanks:        false,
+                      force_quotes:       false }.freeze
+
+  #
+  # This method will return a CSV instance, just like CSV::new(), but the
+  # instance will be cached and returned for all future calls to this method for
+  # the same +data+ object (tested by Object#object_id()) with the same
+  # +options+.
+  #
+  # If a block is given, the instance is passed to the block and the return
+  # value becomes the return value of the block.
+  #
+  def self.instance(data = $stdout, options = Hash.new)
+    # create a _signature_ for this method call, data object and options
+    sig = [data.object_id] +
+          options.values_at(*DEFAULT_OPTIONS.keys.sort_by { |sym| sym.to_s })
+
+    # fetch or create the instance for this signature
+    @@instances ||= Hash.new
+    instance    =   (@@instances[sig] ||= new(data, options))
 
-    def initialize(dev)
-      raise RuntimeError.new('Do not instanciate this class directly.')
+    if block_given?
+      yield instance  # run block, if given, returning result
+    else
+      instance        # or return the instance
     end
+  end
 
-    def get_row(row)
-      raise NotImplementedError.new('Method get_row must be defined in a derived class.')
+  #
+  # This method allows you to serialize an Array of Ruby objects to a String or
+  # File of CSV data.  This is not as powerful as Marshal or YAML, but perhaps
+  # useful for spreadsheet and database interaction.
+  #
+  # Out of the box, this method is intended to work with simple data objects or
+  # Structs.  It will serialize a list of instance variables and/or
+  # Struct.members().
+  #
+  # If you need need more complicated serialization, you can control the process
+  # by adding methods to the class to be serialized.
+  #
+  # A class method csv_meta() is responsible for returning the first row of the
+  # document (as an Array).  This row is considered to be a Hash of the form
+  # key_1,value_1,key_2,value_2,...  CSV::load() expects to find a class key
+  # with a value of the stringified class name and CSV::dump() will create this,
+  # if you do not define this method.  This method is only called on the first
+  # object of the Array.
+  #
+  # The next method you can provide is an instance method called csv_headers().
+  # This method is expected to return the second line of the document (again as
+  # an Array), which is to be used to give each column a header.  By default,
+  # CSV::load() will set an instance variable if the field header starts with an
+  # @ character or call send() passing the header as the method name and
+  # the field value as an argument.  This method is only called on the first
+  # object of the Array.
+  #
+  # Finally, you can provide an instance method called csv_dump(), which will
+  # be passed the headers.  This should return an Array of fields that can be
+  # serialized for this object.  This method is called once for every object in
+  # the Array.
+  #
+  # The +io+ parameter can be used to serialize to a File, and +options+ can be
+  # anything CSV::new() accepts.
+  #
+  def self.dump(ary_of_objs, io = "", options = Hash.new)
+    obj_template = ary_of_objs.first
+
+    csv = new(io, options)
+
+    # write meta information
+    begin
+      csv << obj_template.class.csv_meta
+    rescue NoMethodError
+      csv << [:class, obj_template.class]
     end
 
-    def terminate
-      # Define if needed.
+    # write headers
+    begin
+      headers = obj_template.csv_headers
+    rescue NoMethodError
+      headers = obj_template.instance_variables.sort
+      if obj_template.class.ancestors.find { |cls| cls.to_s =~ /\AStruct\b/ }
+        headers += obj_template.members.map { |mem| "#{mem}=" }.sort
+      end
     end
-  end
-  
+    csv << headers
 
-  class StringReader < Reader
-    def initialize(string, fs = ',', rs = nil)
-      @fs = fs
-      @rs = rs
-      @dev = string
-      @idx = 0
-      if @dev[0, 3] == "\xef\xbb\xbf"
-        @idx += 3
+    # serialize each object
+    ary_of_objs.each do |obj|
+      begin
+        csv << obj.csv_dump(headers)
+      rescue NoMethodError
+        csv << headers.map do |var|
+          if var[0] == ?@
+            obj.instance_variable_get(var)
+          else
+            obj[var[0..-2]]
+          end
+        end
       end
     end
 
-  private
+    if io.is_a? String
+      csv.string
+    else
+      csv.close
+    end
+  end
+
+  #
+  # This method is the reading counterpart to CSV::dump().  See that method for
+  # a detailed description of the process.
+  #
+  # You can customize loading by adding a class method called csv_load() which
+  # will be passed a Hash of meta information, an Array of headers, and an Array
+  # of fields for the object the method is expected to return.
+  #
+  # Remember that all fields will be Strings after this load.  If you need
+  # something else, use +options+ to setup converters or provide a custom
+  # csv_load() implementation.
+  #
+  def self.load(io_or_str, options = Hash.new)
+    csv = new(io_or_str, options)
 
-    def get_row(row)
-      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
-      if parsed_cells == 0 and next_idx == 0 and @idx != @dev.size
-        raise IllegalFormatError.new
+    # load meta information
+    meta = Hash[*csv.shift]
+    cls  = meta["class".encode(csv.encoding)].split("::".encode(csv.encoding)).
+                                              inject(Object) do |c, const|
+      c.const_get(const)
+    end
+
+    # load headers
+    headers = csv.shift
+
+    # unserialize each object stored in the file
+    results = csv.inject(Array.new) do |all, row|
+      begin
+        obj = cls.csv_load(meta, headers, row)
+      rescue NoMethodError
+        obj = cls.allocate
+        headers.zip(row) do |name, value|
+          if name[0] == ?@
+            obj.instance_variable_set(name, value)
+          else
+            obj.send(name, value)
+          end
+        end
       end
-      @idx = next_idx
-      parsed_cells
+      all << obj
     end
-  end
 
+    csv.close unless io_or_str.is_a? String
 
-  class IOReader < Reader
-    def initialize(io, fs = ',', rs = nil)
-      @io = io
-      @fs = fs
-      @rs = rs
-      @dev = CSV::IOBuf.new(@io)
-      @idx = 0
-      if @dev[0] == 0xef and @dev[1] == 0xbb and @dev[2] == 0xbf
-        @idx += 3
+    results
+  end
+
+  #
+  # :call-seq:
+  #   filter( options = Hash.new ) { |row| ... }
+  #   filter( input, options = Hash.new ) { |row| ... }
+  #   filter( input, output, options = Hash.new ) { |row| ... }
+  #
+  # This method is a convenience for building Unix-like filters for CSV data.
+  # Each row is yielded to the provided block which can alter it as needed.
+  # After the block returns, the row is appended to +output+ altered or not.
+  #
+  # The +input+ and +output+ arguments can be anything CSV::new() accepts
+  # (generally String or IO objects).  If not given, they default to
+  # <tt>ARGF</tt> and <tt>$stdout</tt>.
+  #
+  # The +options+ parameter is also filtered down to CSV::new() after some
+  # clever key parsing.  Any key beginning with <tt>:in_</tt> or
+  # <tt>:input_</tt> will have that leading identifier stripped and will only
+  # be used in the +options+ Hash for the +input+ object.  Keys starting with
+  # <tt>:out_</tt> or <tt>:output_</tt> affect only +output+.  All other keys
+  # are assigned to both objects.
+  #
+  # The <tt>:output_row_sep</tt> +option+ defaults to
+  # <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
+  #
+  def self.filter(*args)
+    # parse options for input, output, or both
+    in_options, out_options = Hash.new, {row_sep: $INPUT_RECORD_SEPARATOR}
+    if args.last.is_a? Hash
+      args.pop.each do |key, value|
+        case key.to_s
+        when /\Ain(?:put)?_(.+)\Z/
+          in_options[$1.to_sym] = value
+        when /\Aout(?:put)?_(.+)\Z/
+          out_options[$1.to_sym] = value
+        else
+          in_options[key]  = value
+          out_options[key] = value
+        end
       end
-      @close_on_terminate = false
     end
+    # build input and output wrappers
+    input  = new(args.shift || ARGF,    in_options)
+    output = new(args.shift || $stdout, out_options)
 
-    # Tell this reader to close the IO when terminated (Triggered by invoking
-    # CSV::IOReader#close).
-    def close_on_terminate
-      @close_on_terminate = true
+    # read, yield, write
+    input.each do |row|
+      yield row
+      output << row
     end
+  end
 
-  private
+  #
+  # This method is intended as the primary interface for reading CSV files.  You
+  # pass a +path+ and any +options+ you wish to set for the read.  Each row of
+  # file will be passed to the provided +block+ in turn.
+  #
+  # The +options+ parameter can be anything CSV::new() understands.  This method
+  # also understands an additional <tt>:encoding</tt> parameter that you can use
+  # to specify the Encoding of the data in the file to be read. You must provide
+  # this unless your data is in Encoding::default_external().  CSV will use this
+  # to determine how to parse the data.  You may provide a second Encoding to
+  # have the data transcoded as it is read.  For example,
+  # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
+  # but transcode it to UTF-8 before CSV parses it.
+  #
+  def self.foreach(path, options = Hash.new, &block)
+    encoding =  options.delete(:encoding)
+    mode     =  "rb"
+    mode     << ":#{encoding}" if encoding
+    open(path, mode, options) do |csv|
+      csv.each(&block)
+    end
+  end
 
-    def get_row(row)
-      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
-      if parsed_cells == 0 and next_idx == 0 and !@dev.is_eos?
-        raise IllegalFormatError.new
-      end
-      dropped = @dev.drop(next_idx)
-      @idx = next_idx - dropped
-      parsed_cells
+  #
+  # :call-seq:
+  #   generate( str, options = Hash.new ) { |csv| ... }
+  #   generate( options = Hash.new ) { |csv| ... }
+  #
+  # This method wraps a String you provide, or an empty default String, in a
+  # CSV object which is passed to the provided block.  You can use the block to
+  # append CSV rows to the String and when the block exits, the final String
+  # will be returned.
+  #
+  # Note that a passed String *is* modfied by this method.  Call dup() before
+  # passing if you need a new String.
+  #
+  # The +options+ parameter can be anything CSV::new() understands.  This method
+  # understands an additional <tt>:encoding</tt> parameter when not passed a
+  # String to set the base Encoding for the output.  CSV needs this hint if you
+  # plan to output non-ASCII compatible data.
+  #
+  def self.generate(*args)
+    # add a default empty String, if none was given
+    if args.first.is_a? String
+      io = StringIO.new(args.shift)
+      io.seek(0, IO::SEEK_END)
+      args.unshift(io)
+    else
+      encoding = args.last.is_a?(Hash) ? args.last.delete(:encoding) : nil
+      str      = ""
+      str.encode!(encoding) if encoding
+      args.unshift(str)
+    end
+    csv = new(*args)  # wrap
+    yield csv         # yield for appending
+    csv.string        # return final String
+  end
+
+  #
+  # This method is a shortcut for converting a single row (Array) into a CSV
+  # String.
+  #
+  # The +options+ parameter can be anything CSV::new() understands.  This method
+  # understands an additional <tt>:encoding</tt> parameter to set the base
+  # Encoding for the output.  This method will try to guess your Encoding from
+  # the first non-+nil+ field in +row+, if possible, but you may need to use
+  # this parameter as a backup plan.
+  #
+  # The <tt>:row_sep</tt> +option+ defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>
+  # (<tt>$/</tt>) when calling this method.
+  #
+  def self.generate_line(row, options = Hash.new)
+    options  = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
+    encoding = options.delete(:encoding)
+    str      = ""
+    if encoding
+      str.force_encoding(encoding)
+    elsif field = row.find { |f| not f.nil? }
+      str.force_encoding(String(field).encoding)
     end
+    (new(str, options) << row).string
+  end
 
-    def terminate
-      if @close_on_terminate
-        @io.close
+  #
+  # :call-seq:
+  #   open( filename, mode = "rb", options = Hash.new ) { |faster_csv| ... }
+  #   open( filename, options = Hash.new ) { |faster_csv| ... }
+  #   open( filename, mode = "rb", options = Hash.new )
+  #   open( filename, options = Hash.new )
+  #
+  # This method opens an IO object, and wraps that with CSV.  This is intended
+  # as the primary interface for writing a CSV file.
+  #
+  # You must pass a +filename+ and may optionally add a +mode+ for Ruby's
+  # open().  You may also pass an optional Hash containing any +options+
+  # CSV::new() understands as the final argument.
+  #
+  # This method works like Ruby's open() call, in that it will pass a CSV object
+  # to a provided block and close it when the block terminates, or it will
+  # return the CSV object when no block is provided.  (*Note*: This is different
+  # from the Ruby 1.8 CSV library which passed rows to the block.  Use
+  # CSV::foreach() for that behavior.)
+  #
+  # You must provide a +mode+ with an embedded Encoding designator unless your
+  # data is in Encoding::default_external().  CSV will check the Encoding of the
+  # underlying IO object (set by the +mode+ you pass) to determine how to parse
+  # the data.   You may provide a second Encoding to have the data transcoded as
+  # it is read just as you can with a normal call to IO::open().  For example,
+  # <tt>"rb:UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file but
+  # transcode it to UTF-8 before CSV parses it.
+  #
+  # An opened CSV object will delegate to many IO methods for convenience.  You
+  # may call:
+  #
+  # * binmode()
+  # * binmode?()
+  # * close()
+  # * close_read()
+  # * close_write()
+  # * closed?()
+  # * eof()
+  # * eof?()
+  # * external_encoding()
+  # * fcntl()
+  # * fileno()
+  # * flock()
+  # * flush()
+  # * fsync()
+  # * internal_encoding()
+  # * ioctl()
+  # * isatty()
+  # * path()
+  # * pid()
+  # * pos()
+  # * pos=()
+  # * reopen()
+  # * seek()
+  # * stat()
+  # * sync()
+  # * sync=()
+  # * tell()
+  # * to_i()
+  # * to_io()
+  # * truncate()
+  # * tty?()
+  #
+  def self.open(*args)
+    # find the +options+ Hash
+    options = if args.last.is_a? Hash then args.pop else Hash.new end
+    # default to a binary open mode
+    args << "rb" if args.size == 1
+    # wrap a File opened with the remaining +args+
+    csv     = new(File.open(*args), options)
+
+    # handle blocks like Ruby's open(), not like the CSV library
+    if block_given?
+      begin
+        yield csv
+      ensure
+        csv.close
       end
+    else
+      csv
+    end
+  end
 
-      if @dev
-        @dev.close
+  #
+  # :call-seq:
+  #   parse( str, options = Hash.new ) { |row| ... }
+  #   parse( str, options = Hash.new )
+  #
+  # This method can be used to easily parse CSV out of a String.  You may either
+  # provide a +block+ which will be called with each row of the String in turn,
+  # or just use the returned Array of Arrays (when no +block+ is given).
+  #
+  # You pass your +str+ to read from, and an optional +options+ Hash containing
+  # anything CSV::new() understands.
+  #
+  def self.parse(*args, &block)
+    csv = new(*args)
+    if block.nil?  # slurp contents, if no block is given
+      begin
+        csv.read
+      ensure
+        csv.close
       end
+    else           # or pass each row to a provided block
+      csv.each(&block)
     end
   end
 
+  #
+  # This method is a shortcut for converting a single line of a CSV String into
+  # a into an Array.  Note that if +line+ contains multiple rows, anything
+  # beyond the first row is ignored.
+  #
+  # The +options+ parameter can be anything CSV::new() understands.
+  #
+  def self.parse_line(line, options = Hash.new)
+    new(line, options).shift
+  end
 
-  # CSV formatted string/stream writer.
   #
-  # EXAMPLE
-  #   Write rows to 'csvout' file.
+  # Use to slurp a CSV file into an Array of Arrays.  Pass the +path+ to the
+  # file and any +options+ CSV::new() understands.  This method also understands
+  # an additional <tt>:encoding</tt> parameter that you can use to specify the
+  # Encoding of the data in the file to be read. You must provide this unless
+  # your data is in Encoding::default_external().  CSV will use this to determine
+  # how to parse the data.  You may provide a second Encoding to have the data
+  # transcoded as it is read.  For example,
+  # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
+  # but transcode it to UTF-8 before CSV parses it.
+  #
+  def self.read(path, options = Hash.new)
+    encoding =  options.delete(:encoding)
+    mode     =  "rb"
+    mode     << ":#{encoding}" if encoding
+    open(path, mode, options) { |csv| csv.read }
+  end
+
+  # Alias for CSV::read().
+  def self.readlines(*args)
+    read(*args)
+  end
+
   #
-  #   outfile = File.open('csvout', 'wb')
-  #   CSV::Writer.generate(outfile) do |csv|
-  #     csv << ['c1', nil, '', '"', "\r\n", 'c2']
-  #     ...
-  #   end
+  # A shortcut for:
   #
-  #   outfile.close
+  #   CSV.read( path, { headers:           true,
+  #                     converters:        :numeric,
+  #                     header_converters: :symbol }.merge(options) )
   #
-  class Writer
-    # Given block is called with the writer instance.  str_or_writable must
-    # handle '<<(string)'.
-    def Writer.generate(str_or_writable, fs = ',', rs = nil, &block)
-      writer = Writer.create(str_or_writable, fs, rs)
-      if block
-        yield(writer)
-        writer.close
-        nil
-      else
-        writer
-      end
+  def self.table(path, options = Hash.new)
+    read( path, { headers:           true,
+                  converters:        :numeric,
+                  header_converters: :symbol }.merge(options) )
+  end
+
+  #
+  # This constructor will wrap either a String or IO object passed in +data+ for
+  # reading and/or writing.  In addition to the CSV instance methods, several IO
+  # methods are delegated.  (See CSV::open() for a complete list.)  If you pass
+  # a String for +data+, you can later retrieve it (after writing to it, for
+  # example) with CSV.string().
+  #
+  # Note that a wrapped String will be positioned at at the beginning (for
+  # reading).  If you want it at the end (for writing), use CSV::generate().
+  # If you want any other positioning, pass a preset StringIO object instead.
+  #
+  # You may set any reading and/or writing preferences in the +options+ Hash.
+  # Available options are:
+  #
+  # <b><tt>:col_sep</tt></b>::            The String placed between each field.
+  #                                       This String will be transcoded into
+  #                                       the data's Encoding before parsing.
+  # <b><tt>:row_sep</tt></b>::            The String appended to the end of each
+  #                                       row.  This can be set to the special
+  #                                       <tt>:auto</tt> setting, which requests
+  #                                       that CSV automatically discover this
+  #                                       from the data.  Auto-discovery reads
+  #                                       ahead in the data looking for the next
+  #                                       <tt>"\r\n"</tt>, <tt>"\n"</tt>, or
+  #                                       <tt>"\r"</tt> sequence.  A sequence
+  #                                       will be selected even if it occurs in
+  #                                       a quoted field, assuming that you
+  #                                       would have the same line endings
+  #                                       there.  If none of those sequences is
+  #                                       found, +data+ is <tt>ARGF</tt>,
+  #                                       <tt>STDIN</tt>, <tt>STDOUT</tt>, or
+  #                                       <tt>STDERR</tt>, or the stream is only
+  #                                       available for output, the default
+  #                                       <tt>$INPUT_RECORD_SEPARATOR</tt>
+  #                                       (<tt>$/</tt>) is used.  Obviously,
+  #                                       discovery takes a little time.  Set
+  #                                       manually if speed is important.  Also
+  #                                       note that IO objects should be opened
+  #                                       in binary mode on Windows if this
+  #                                       feature will be used as the
+  #                                       line-ending translation can cause
+  #                                       problems with resetting the document
+  #                                       position to where it was before the
+  #                                       read ahead. This String will be
+  #                                       transcoded into the data's Encoding
+  #                                       before parsing.
+  # <b><tt>:quote_char</tt></b>::         The character used to quote fields.
+  #                                       This has to be a single character
+  #                                       String.  This is useful for
+  #                                       application that incorrectly use
+  #                                       <tt>'</tt> as the quote character
+  #                                       instead of the correct <tt>"</tt>.
+  #                                       CSV will always consider a double
+  #                                       sequence this character to be an
+  #                                       escaped quote. This String will be
+  #                                       transcoded into the data's Encoding
+  #                                       before parsing.
+  # <b><tt>:field_size_limit</tt></b>::   This is a maximum size CSV will read
+  #                                       ahead looking for the closing quote
+  #                                       for a field.  (In truth, it reads to
+  #                                       the first line ending beyond this
+  #                                       size.)  If a quote cannot be found
+  #                                       within the limit CSV will raise a
+  #                                       MalformedCSVError, assuming the data
+  #                                       is faulty.  You can use this limit to
+  #                                       prevent what are effectively DoS
+  #                                       attacks on the parser.  However, this
+  #                                       limit can cause a legitimate parse to
+  #                                       fail and thus is set to +nil+, or off,
+  #                                       by default.
+  # <b><tt>:converters</tt></b>::         An Array of names from the Converters
+  #                                       Hash and/or lambdas that handle custom
+  #                                       conversion.  A single converter
+  #                                       doesn't have to be in an Array.  All
+  #                                       built-in converters try to transcode
+  #                                       fields to UTF-8 before converting.
+  #                                       The conversion will fail if the data
+  #                                       cannot be transcoded, leaving the
+  #                                       field unchanged.
+  # <b><tt>:unconverted_fields</tt></b>:: If set to +true+, an
+  #                                       unconverted_fields() method will be
+  #                                       added to all returned rows (Array or
+  #                                       CSV::Row) that will return the fields
+  #                                       as they were before conversion.  Note
+  #                                       that <tt>:headers</tt> supplied by
+  #                                       Array or String were not fields of the
+  #                                       document and thus will have an empty
+  #                                       Array attached.
+  # <b><tt>:headers</tt></b>::            If set to <tt>:first_row</tt> or
+  #                                       +true+, the initial row of the CSV
+  #                                       file will be treated as a row of
+  #                                       headers.  If set to an Array, the
+  #                                       contents will be used as the headers.
+  #                                       If set to a String, the String is run
+  #                                       through a call of CSV::parse_line()
+  #                                       with the same <tt>:col_sep</tt>,
+  #                                       <tt>:row_sep</tt>, and
+  #                                       <tt>:quote_char</tt> as this instance
+  #                                       to produce an Array of headers.  This
+  #                                       setting causes CSV#shift() to return
+  #                                       rows as CSV::Row objects instead of
+  #                                       Arrays and CSV#read() to return
+  #                                       CSV::Table objects instead of an Array
+  #                                       of Arrays.
+  # <b><tt>:return_headers</tt></b>::     When +false+, header rows are silently
+  #                                       swallowed.  If set to +true+, header
+  #                                       rows are returned in a CSV::Row object
+  #                                       with identical headers and
+  #                                       fields (save that the fields do not go
+  #                                       through the converters).
+  # <b><tt>:write_headers</tt></b>::      When +true+ and <tt>:headers</tt> is
+  #                                       set, a header row will be added to the
+  #                                       output.
+  # <b><tt>:header_converters</tt></b>::  Identical in functionality to
+  #                                       <tt>:converters</tt> save that the
+  #                                       conversions are only made to header
+  #                                       rows.  All built-in converters try to
+  #                                       transcode headers to UTF-8 before
+  #                                       converting.  The conversion will fail
+  #                                       if the data cannot be transcoded,
+  #                                       leaving the header unchanged.
+  # <b><tt>:skip_blanks</tt></b>::        When set to a +true+ value, CSV will
+  #                                       skip over any rows with no content.
+  # <b><tt>:force_quotes</tt></b>::       When set to a +true+ value, CSV will
+  #                                       quote all CSV fields it creates.
+  #
+  # See CSV::DEFAULT_OPTIONS for the default settings.
+  #
+  # Options cannot be overriden in the instance methods for performance reasons,
+  # so be sure to set what you want here.
+  #
+  def initialize(data, options = Hash.new)
+    # build the options for this read/write
+    options = DEFAULT_OPTIONS.merge(options)
+
+    # create the IO object we will read from
+    @io       =   if data.is_a? String then StringIO.new(data) else data end
+    # honor the IO encoding if we can, otherwise default to ASCII-8BIT
+    @encoding = raw_encoding || Encoding.default_internal || Encoding.default_external
+    #
+    # prepare for building safe regular expressions in the target encoding,
+    # if we can transcode the needed characters
+    #
+    @re_esc   =   "\\".encode(@encoding) rescue ""
+    @re_chars =   %w[ \\ .  [  ]  -  ^  $  ?
+                      *  +  {  }  (  )  |  #
+                      \  \r \n \t \f \v ].
+                  map { |s| s.encode(@encoding) rescue nil }.compact
+
+    init_separators(options)
+    init_parsers(options)
+    init_converters(options)
+    init_headers(options)
+
+    unless options.empty?
+      raise ArgumentError, "Unknown options:  #{options.keys.join(', ')}."
     end
 
-    # str_or_writable must handle '<<(string)'.
-    def Writer.create(str_or_writable, fs = ',', rs = nil)
-      BasicWriter.new(str_or_writable, fs, rs)
+    # track our own lineno since IO gets confused about line-ends is CSV fields
+    @lineno = 0
+  end
+
+  #
+  # The encoded <tt>:col_sep</tt> used in parsing and writing.  See CSV::new
+  # for details.
+  #
+  attr_reader :col_sep
+  #
+  # The encoded <tt>:row_sep</tt> used in parsing and writing.  See CSV::new
+  # for details.
+  #
+  attr_reader :row_sep
+  #
+  # The encoded <tt>:quote_char</tt> used in parsing and writing.  See CSV::new
+  # for details.
+  #
+  attr_reader :quote_char
+  # The limit for field size, if any.  See CSV::new for details.
+  attr_reader :field_size_limit
+  #
+  # Returns the current list of converters in effect.  See CSV::new for details.
+  # Built-in converters will be returned by name, while others will be returned
+  # as is.
+  #
+  def converters
+    @converters.map do |converter|
+      name = Converters.rassoc(converter)
+      name ? name.first : converter
+    end
+  end
+  #
+  # Returns +true+ if unconverted_fields() to parsed results.  See CSV::new
+  # for details.
+  #
+  def unconverted_fields?() @unconverted_fields end
+  #
+  # Returns +nil+ if headers will not be used, +true+ if they will but have not
+  # yet been read, or the actual headers after they have been read.  See
+  # CSV::new for details.
+  #
+  def headers
+    @headers || true if @use_headers
+  end
+  #
+  # Returns +true+ if headers will be returned as a row of results.
+  # See CSV::new for details.
+  #
+  def return_headers?()     @return_headers     end
+  # Returns +true+ if headers are written in output. See CSV::new for details.
+  def write_headers?()      @write_headers      end
+  #
+  # Returns the current list of converters in effect for headers.  See CSV::new
+  # for details.  Built-in converters will be returned by name, while others
+  # will be returned as is.
+  #
+  def header_converters
+    @header_converters.map do |converter|
+      name = HeaderConverters.rassoc(converter)
+      name ? name.first : converter
     end
+  end
+  #
+  # Returns +true+ blank lines are skipped by the parser. See CSV::new
+  # for details.
+  #
+  def skip_blanks?()        @skip_blanks        end
+  # Returns +true+ if all output fields are quoted. See CSV::new for details.
+  def force_quotes?()       @force_quotes       end
 
-    # dump CSV stream to the device.  argument must be an Array of String.
-    def <<(row)
-      CSV.generate_row(row, row.size, @dev, @fs, @rs)
-      self
+  #
+  # The Encoding CSV is parsing or writing in.  This will be the Encoding you
+  # receive parsed data in and/or the Encoding data will be written in.
+  #
+  attr_reader :encoding
+
+  #
+  # The line number of the last row read from this file.  Fields with nested
+  # line-end characters will not affect this count.
+  #
+  attr_reader :lineno
+
+  ### IO and StringIO Delegation ###
+
+  extend Forwardable
+  def_delegators :@io, :binmode, :binmode?, :close, :close_read, :close_write,
+                       :closed?, :eof, :eof?, :external_encoding, :fcntl,
+                       :fileno, :flock, :flush, :fsync, :internal_encoding,
+                       :ioctl, :isatty, :path, :pid, :pos, :pos=, :reopen,
+                       :seek, :stat, :string, :sync, :sync=, :tell, :to_i,
+                       :to_io, :truncate, :tty?
+
+  # Rewinds the underlying IO object and resets CSV's lineno() counter.
+  def rewind
+    @headers = nil
+    @lineno  = 0
+
+    @io.rewind
+  end
+
+  ### End Delegation ###
+
+  #
+  # The primary write method for wrapped Strings and IOs, +row+ (an Array or
+  # CSV::Row) is converted to CSV and appended to the data source.  When a
+  # CSV::Row is passed, only the row's fields() are appended to the output.
+  #
+  # The data source must be open for writing.
+  #
+  def <<(row)
+    # make sure headers have been assigned
+    if header_row? and [Array, String].include? @use_headers.class
+      parse_headers  # won't read data for Array or String
+      self << @headers if @write_headers
     end
-    alias add_row <<
 
-    def close
-      terminate
+    # handle CSV::Row objects and Hashes
+    row = case row
+          when self.class::Row then row.fields
+          when Hash            then @headers.map { |header| row[header] }
+          else                      row
+          end
+
+    @headers =  row if header_row?
+    @lineno  += 1
+
+    output = row.map(&@quote).join(@col_sep) + @row_sep  # quote and separate
+    if @io.is_a?(StringIO)             and
+       output.encoding != raw_encoding and
+       (compatible_encoding = Encoding.compatible?(@io.string, output))
+      @io = StringIO.new(@io.string.force_encoding(compatible_encoding))
+      @io.seek(0, IO::SEEK_END)
     end
+    @io << output
 
-  private
+    self  # for chaining
+  end
+  alias_method :add_row, :<<
+  alias_method :puts,    :<<
 
-    def initialize(dev)
-      raise RuntimeError.new('Do not instanciate this class directly.')
+  #
+  # :call-seq:
+  #   convert( name )
+  #   convert { |field| ... }
+  #   convert { |field, field_info| ... }
+  #
+  # You can use this method to install a CSV::Converters built-in, or provide a
+  # block that handles a custom conversion.
+  #
+  # If you provide a block that takes one argument, it will be passed the field
+  # and is expected to return the converted value or the field itself.  If your
+  # block takes two arguments, it will also be passed a CSV::FieldInfo Struct,
+  # containing details about the field.  Again, the block should return a
+  # converted field or the field itself.
+  #
+  def convert(name = nil, &converter)
+    add_converter(:converters, self.class::Converters, name, &converter)
+  end
+
+  #
+  # :call-seq:
+  #   header_convert( name )
+  #   header_convert { |field| ... }
+  #   header_convert { |field, field_info| ... }
+  #
+  # Identical to CSV#convert(), but for header rows.
+  #
+  # Note that this method must be called before header rows are read to have any
+  # effect.
+  #
+  def header_convert(name = nil, &converter)
+    add_converter( :header_converters,
+                   self.class::HeaderConverters,
+                   name,
+                   &converter )
+  end
+
+  include Enumerable
+
+  #
+  # Yields each row of the data source in turn.
+  #
+  # Support for Enumerable.
+  #
+  # The data source must be open for reading.
+  #
+  def each
+    while row = shift
+      yield row
     end
+  end
 
-    def terminate
-      # Define if needed.
+  #
+  # Slurps the remaining rows and returns an Array of Arrays.
+  #
+  # The data source must be open for reading.
+  #
+  def read
+    rows = to_a
+    if @use_headers
+      Table.new(rows)
+    else
+      rows
     end
   end
+  alias_method :readlines, :read
 
+  # Returns +true+ if the next row read will be a header row.
+  def header_row?
+    @use_headers and @headers.nil?
+  end
 
-  class BasicWriter < Writer
-    def initialize(str_or_writable, fs = ',', rs = nil)
-      @fs = fs
-      @rs = rs
-      @dev = str_or_writable
-      @close_on_terminate = false
-    end
+  #
+  # The primary read method for wrapped Strings and IOs, a single row is pulled
+  # from the data source, parsed and returned as an Array of fields (if header
+  # rows are not used) or a CSV::Row (when header rows are used).
+  #
+  # The data source must be open for reading.
+  #
+  def shift
+    #########################################################################
+    ### This method is purposefully kept a bit long as simple conditional ###
+    ### checks are faster than numerous (expensive) method calls.         ###
+    #########################################################################
 
-    # Tell this writer to close the IO when terminated (Triggered by invoking
-    # CSV::BasicWriter#close).
-    def close_on_terminate
-      @close_on_terminate = true
+    # handle headers not based on document content
+    if header_row? and @return_headers and
+       [Array, String].include? @use_headers.class
+      if @unconverted_fields
+        return add_unconverted_fields(parse_headers, Array.new)
+      else
+        return parse_headers
+      end
     end
 
-  private
+    # begin with a blank line, so we can always add to it
+    line = ""
 
-    def terminate
-      if @close_on_terminate
-        @dev.close
-      end
-    end
-  end
-
-private
-
-  # Buffered stream.
-  #
-  # EXAMPLE 1 -- an IO.
-  #   class MyBuf < StreamBuf
-  #     # Do initialize myself before a super class.  Super class might call my
-  #     # method 'read'. (Could be awful for C++ user. :-)
-  #     def initialize(s)
-  #       @s = s
-  #       super()
-  #     end
-  #
-  #     # define my own 'read' method.
-  #     # CAUTION: Returning nil means EnfOfStream.
-  #     def read(size)
-  #       @s.read(size)
-  #     end
-  #
-  #     # release buffers. in Ruby which has GC, you do not have to call this...
-  #     def terminate
-  #       @s = nil
-  #       super()
-  #     end
-  #   end
-  #
-  #   buf = MyBuf.new(STDIN)
-  #   my_str = ''
-  #   p buf[0, 0]               # => '' (null string)
-  #   p buf[0]                  # => 97 (char code of 'a')
-  #   p buf[0, 1]               # => 'a'
-  #   my_str = buf[0, 5]
-  #   p my_str                  # => 'abcde' (5 chars)
-  #   p buf[0, 6]               # => "abcde\n" (6 chars)
-  #   p buf[0, 7]               # => "abcde\n" (6 chars)
-  #   p buf.drop(3)             # => 3 (dropped chars)
-  #   p buf.get(0, 2)           # => 'de' (2 chars)
-  #   p buf.is_eos?             # => false (is not EOS here)
-  #   p buf.drop(5)             # => 3 (dropped chars)
-  #   p buf.is_eos?             # => true (is EOS here)
-  #   p buf[0]                  # => nil (is EOS here)
-  #
-  # EXAMPLE 2 -- String.
-  #   This is a conceptual example.  No pros with this.
-  #
-  #   class StrBuf < StreamBuf
-  #     def initialize(s)
-  #       @str = s
-  #       @idx = 0
-  #       super()
-  #     end
-  #
-  #     def read(size)
-  #       str = @str[@idx, size]
-  #       @idx += str.size
-  #       str
-  #     end
-  #   end
-  #
-  class StreamBuf
-    # get a char or a partial string from the stream.
-    # idx: index of a string to specify a start point of a string to get.
-    # unlike String instance, idx < 0 returns nil.
-    # n: size of a string to get.
-    # returns char at idx if n == nil.
-    # returns a partial string, from idx to (idx + n) if n != nil.  at EOF,
-    # the string size could not equal to arg n.
-    def [](idx, n = nil) 
-      if idx < 0
+    #
+    # it can take multiple calls to <tt>@io.gets()</tt> to get a full line,
+    # because of \r and/or \n characters embedded in quoted fields
+    #
+    in_extended_col = false
+    csv             = Array.new
+
+    loop do
+      # add another read to the line
+      unless parse = @io.gets(@row_sep)
         return nil
       end
-      if (idx_is_eos?(idx))
-        if n and (@offset + idx == buf_size(@cur_buf))
-          # Like a String, 'abc'[4, 1] returns nil and
-          # 'abc'[3, 1] returns '' not nil.
-          return ''
+
+      parse.sub!(@parsers[:line_end], "")
+
+      if csv.empty?
+        #
+        # I believe a blank line should be an <tt>Array.new</tt>, not Ruby 1.8
+        # CSV's <tt>[nil]</tt>
+        #
+        if parse.empty?
+          @lineno += 1
+          if @skip_blanks
+            next
+          elsif @unconverted_fields
+            return add_unconverted_fields(Array.new, Array.new)
+          elsif @use_headers
+            return self.class::Row.new(Array.new, Array.new)
+          else
+            return Array.new
+          end
+        end
+      end
+
+      parts =  parse.split(@col_sep, -1)
+      if parts.empty?
+        if in_extended_col
+          csv[-1] << @col_sep   # will be replaced with a @row_sep after the parts.each loop
         else
-          return nil
+          csv << nil
         end
       end
-      my_buf = @cur_buf
-      my_offset = @offset
-      next_idx = idx
-      while (my_offset + next_idx >= buf_size(my_buf))
-        if (my_buf == @buf_tail_idx)
-          unless add_buf
-            break
+
+      # This loop is the hot path of csv parsing. Some things may be non-dry
+      # for a reason. Make sure to benchmark when refactoring.
+      parts.each do |part|
+        if in_extended_col
+          # If we are continuing a previous column
+          if part[-1] == @quote_char && part.count(@quote_char) % 2 != 0
+            # extended column ends
+            csv.last << part[0..-2]
+            raise MalformedCSVError if csv.last =~ @parsers[:stray_quote]
+            csv.last.gsub!(@quote_char * 2, @quote_char)
+            in_extended_col = false
+          else
+            csv.last << part
+            csv.last << @col_sep
           end
-        end
-        next_idx = my_offset + next_idx - buf_size(my_buf)
-        my_buf += 1
-        my_offset = 0
-      end
-      loc = my_offset + next_idx
-      if !n
-        return @buf_list[my_buf][loc]           # Fixnum of char code.
-      elsif (loc + n - 1 < buf_size(my_buf))
-        return @buf_list[my_buf][loc, n]        # String.
-      else # should do loop insted of (tail) recursive call...
-        res = @buf_list[my_buf][loc, BufSize]
-        size_added = buf_size(my_buf) - loc
-        if size_added > 0
-          idx += size_added
-          n -= size_added
-          ret = self[idx, n]
-          if ret
-            res << ret
+        elsif part[0] == @quote_char
+          # If we are staring a new quoted column
+          if part[-1] != @quote_char || part.count(@quote_char) % 2 != 0
+            # start an extended column
+            csv             << part[1..-1]
+            csv.last        << @col_sep
+            in_extended_col =  true
+          else
+            # regular quoted column
+            csv << part[1..-2]
+            raise MalformedCSVError if csv.last =~ @parsers[:stray_quote]
+            csv.last.gsub!(@quote_char * 2, @quote_char)
           end
-        end
-        return res
-      end
-    end
-    alias get []
-  
-    # drop a string from the stream.
-    # returns dropped size.  at EOF, dropped size might not equals to arg n.
-    # Once you drop the head of the stream, access to the dropped part via []
-    # or get returns nil.
-    def drop(n)
-      if is_eos?
-        return 0
-      end
-      size_dropped = 0
-      while (n > 0)
-        if !@is_eos or (@cur_buf != @buf_tail_idx)
-          if (@offset + n < buf_size(@cur_buf))
-            size_dropped += n
-            @offset += n
-            n = 0
+        elsif part =~ @parsers[:quote_or_nl]
+          # Unquoted field with bad characters.
+          if part =~ @parsers[:nl_or_lf]
+            raise MalformedCSVError, "Unquoted fields do not allow " +
+                                     "\\r or \\n (line #{lineno + 1})."
           else
-            size = buf_size(@cur_buf) - @offset
-            size_dropped += size
-            n -= size
-            @offset = 0
-            unless rel_buf
-              unless add_buf
-                break
-              end
-              @cur_buf = @buf_tail_idx
-            end
+            raise MalformedCSVError, "Illegal quoting on line #{lineno + 1}."
           end
+        else
+          # Regular ole unquoted field.
+          csv << (part.empty? ? nil : part)
         end
       end
-      size_dropped
-    end
-  
-    def is_eos?
-      return idx_is_eos?(0)
-    end
-  
-    # WARN: Do not instantiate this class directly.  Define your own class
-    # which derives this class and define 'read' instance method.
-    def initialize
-      @buf_list = []
-      @cur_buf = @buf_tail_idx = -1
-      @offset = 0
-      @is_eos = false
-      add_buf
-      @cur_buf = @buf_tail_idx
-    end
-  
-  protected
-
-    def terminate
-      while (rel_buf); end
-    end
-  
-    # protected method 'read' must be defined in derived classes.
-    # CAUTION: Returning a string which size is not equal to 'size' means
-    # EnfOfStream.  When it is not at EOS, you must block the callee, try to
-    # read and return the sized string.
-    def read(size) # raise EOFError
-      raise NotImplementedError.new('Method read must be defined in a derived class.')
-    end
-  
-  private
-  
-    def buf_size(idx)
-      @buf_list[idx].size
+
+      # Replace tacked on @col_sep with @row_sep if we are still in an extended
+      # column.
+      csv[-1][-1] = @row_sep if in_extended_col
+
+      if in_extended_col
+        # if we're at eof?(), a quoted field wasn't closed...
+        if @io.eof?
+          raise MalformedCSVError,
+                "Unclosed quoted field on line #{lineno + 1}."
+        elsif @field_size_limit and csv.last.size >= @field_size_limit
+          raise MalformedCSVError, "Field size exceeded on line #{lineno + 1}."
+        end
+        # otherwise, we need to loop and pull some more data to complete the row
+      else
+        @lineno += 1
+
+        # save fields unconverted fields, if needed...
+        unconverted = csv.dup if @unconverted_fields
+
+        # convert fields, if needed...
+        csv = convert_fields(csv) unless @use_headers or @converters.empty?
+        # parse out header rows and handle CSV::Row conversions...
+        csv = parse_headers(csv)  if     @use_headers
+
+        # inject unconverted fields and accessor, if requested...
+        if @unconverted_fields and not csv.respond_to? :unconverted_fields
+          add_unconverted_fields(csv, unconverted)
+        end
+
+        # return the results
+        break csv
+      end
     end
+  end
+  alias_method :gets,     :shift
+  alias_method :readline, :shift
 
-    def add_buf
-      if @is_eos
-        return false
+  #
+  # Returns a simplified description of the key CSV attributes in an
+  # ASCII compatible String.
+  #
+  def inspect
+    str = ["<#", self.class.to_s, " io_type:"]
+    # show type of wrapped IO
+    if    @io == $stdout then str << "$stdout"
+    elsif @io == $stdin  then str << "$stdin"
+    elsif @io == $stderr then str << "$stderr"
+    else                      str << @io.class.to_s
+    end
+    # show IO.path(), if available
+    if @io.respond_to?(:path) and (p = @io.path)
+      str << " io_path:" << p.inspect
+    end
+    # show encoding
+    str << " encoding:" << @encoding.name
+    # show other attributes
+    %w[ lineno     col_sep     row_sep
+        quote_char skip_blanks ].each do |attr_name|
+      if a = instance_variable_get("@#{attr_name}")
+        str << " " << attr_name << ":" << a.inspect
       end
-      begin
-        str_read = read(BufSize)
-      rescue EOFError
-        str_read = nil
-      rescue
-        terminate
-        raise
-      end
-      if str_read.nil?
-        @is_eos = true
-        @buf_list.push('')
-        @buf_tail_idx += 1
-        false
+    end
+    if @use_headers
+      str << " headers:" << headers.inspect
+    end
+    str << ">"
+    begin
+      str.join
+    rescue  # any encoding error
+      str.map do |s|
+        e = Encoding::Converter.asciicompat_encoding(s.encoding)
+        e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
+      end.join
+    end
+  end
+
+  private
+
+  #
+  # Stores the indicated separators for later use.
+  #
+  # If auto-discovery was requested for <tt>@row_sep</tt>, this method will read
+  # ahead in the <tt>@io</tt> and try to find one.  +ARGF+, +STDIN+, +STDOUT+,
+  # +STDERR+ and any stream open for output only with a default
+  # <tt>@row_sep</tt> of <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
+  #
+  # This method also establishes the quoting rules used for CSV output.
+  #
+  def init_separators(options)
+    # store the selected separators
+    @col_sep    = options.delete(:col_sep).to_s.encode(@encoding)
+    @row_sep    = options.delete(:row_sep)  # encode after resolving :auto
+    @quote_char = options.delete(:quote_char).to_s.encode(@encoding)
+
+    if @quote_char.length != 1
+      raise ArgumentError, ":quote_char has to be a single character String"
+    end
+
+    #
+    # automatically discover row separator when requested
+    # (not fully encoding safe)
+    #
+    if @row_sep == :auto
+      if [ARGF, STDIN, STDOUT, STDERR].include?(@io) or
+         (defined?(Zlib) and @io.class == Zlib::GzipWriter)
+        @row_sep = $INPUT_RECORD_SEPARATOR
       else
-        @buf_list.push(str_read)
-        @buf_tail_idx += 1
-        true
+        begin
+          saved_pos = @io.pos  # remember where we were
+          while @row_sep == :auto
+            #
+            # if we run out of data, it's probably a single line
+            # (use a sensible default)
+            #
+            if @io.eof?
+              @row_sep = $INPUT_RECORD_SEPARATOR
+              break
+            end
+
+            # read ahead a bit
+            sample =  read_to_char(1024)
+            sample += read_to_char(1) if sample[-1..-1] == encode_str("\r") and
+                                         not @io.eof?
+            # try to find a standard separator
+            if sample =~ encode_re("\r\n?|\n")
+              @row_sep = $&
+              break
+            end
+          end
+          # tricky seek() clone to work around GzipReader's lack of seek()
+          @io.rewind
+          # reset back to the remembered position
+          while saved_pos > 1024  # avoid loading a lot of data into memory
+            @io.read(1024)
+            saved_pos -= 1024
+          end
+          @io.read(saved_pos) if saved_pos.nonzero?
+        rescue IOError  # stream not opened for reading
+          @row_sep = $INPUT_RECORD_SEPARATOR
+        end
       end
     end
-  
-    def rel_buf
-      if (@cur_buf < 0)
-        return false
+    @row_sep = @row_sep.to_s.encode(@encoding)
+
+    # establish quoting rules
+    @force_quotes   = options.delete(:force_quotes)
+    do_quote        = lambda do |field|
+      field         = String(field)
+      encoded_quote = @quote_char.encode(field.encoding)
+      encoded_quote                                +
+      field.gsub(encoded_quote, encoded_quote * 2) +
+      encoded_quote
+    end
+    quotable_chars = encode_str("\r\n", @col_sep, @quote_char)
+    @quote         = if @force_quotes
+      do_quote
+    else
+      lambda do |field|
+        if field.nil?  # represent +nil+ fields as empty unquoted fields
+          ""
+        else
+          field = String(field)  # Stringify fields
+          # represent empty fields as empty quoted fields
+          if field.empty? or
+             field.count(quotable_chars).nonzero?
+            do_quote.call(field)
+          else
+            field  # unquoted field
+          end
+        end
       end
-      @buf_list[@cur_buf] = nil
-      if (@cur_buf == @buf_tail_idx)
-        @cur_buf = -1
-        return false
-      else
-        @cur_buf += 1
-        return true
+    end
+  end
+
+  # Pre-compiles parsers and stores them by name for access during reads.
+  def init_parsers(options)
+    # store the parser behaviors
+    @skip_blanks      = options.delete(:skip_blanks)
+    @field_size_limit = options.delete(:field_size_limit)
+
+    # prebuild Regexps for faster parsing
+    esc_col_sep = escape_re(@col_sep)
+    esc_row_sep = escape_re(@row_sep)
+    esc_quote   = escape_re(@quote_char)
+    @parsers = {
+      # for detecting parse errors
+      quote_or_nl:    encode_re("[", esc_quote, "\r\n]"),
+      nl_or_lf:       encode_re("[\r\n]"),
+      stray_quote:    encode_re( "[^", esc_quote, "]", esc_quote,
+                                 "[^", esc_quote, "]" ),
+      # safer than chomp!()
+      line_end:       encode_re(esc_row_sep, "\\z"),
+      # illegal unquoted characters
+      return_newline: encode_str("\r\n")
+    }
+  end
+
+  #
+  # Loads any converters requested during construction.
+  #
+  # If +field_name+ is set <tt>:converters</tt> (the default) field converters
+  # are set.  When +field_name+ is <tt>:header_converters</tt> header converters
+  # are added instead.
+  #
+  # The <tt>:unconverted_fields</tt> option is also actived for
+  # <tt>:converters</tt> calls, if requested.
+  #
+  def init_converters(options, field_name = :converters)
+    if field_name == :converters
+      @unconverted_fields = options.delete(:unconverted_fields)
+    end
+
+    instance_variable_set("@#{field_name}", Array.new)
+
+    # find the correct method to add the converters
+    convert = method(field_name.to_s.sub(/ers\Z/, ""))
+
+    # load converters
+    unless options[field_name].nil?
+      # allow a single converter not wrapped in an Array
+      unless options[field_name].is_a? Array
+        options[field_name] = [options[field_name]]
+      end
+      # load each converter...
+      options[field_name].each do |converter|
+        if converter.is_a? Proc  # custom code block
+          convert.call(&converter)
+        else                     # by name
+          convert.call(converter)
+        end
       end
     end
-  
-    def idx_is_eos?(idx)
-      (@is_eos and ((@cur_buf < 0) or (@cur_buf == @buf_tail_idx)))
+
+    options.delete(field_name)
+  end
+
+  # Stores header row settings and loads header converters, if needed.
+  def init_headers(options)
+    @use_headers    = options.delete(:headers)
+    @return_headers = options.delete(:return_headers)
+    @write_headers  = options.delete(:write_headers)
+
+    # headers must be delayed until shift(), in case they need a row of content
+    @headers = nil
+
+    init_converters(options, :header_converters)
+  end
+
+  #
+  # The actual work method for adding converters, used by both CSV.convert() and
+  # CSV.header_convert().
+  #
+  # This method requires the +var_name+ of the instance variable to place the
+  # converters in, the +const+ Hash to lookup named converters in, and the
+  # normal parameters of the CSV.convert() and CSV.header_convert() methods.
+  #
+  def add_converter(var_name, const, name = nil, &converter)
+    if name.nil?  # custom converter
+      instance_variable_get("@#{var_name}") << converter
+    else          # named converter
+      combo = const[name]
+      case combo
+      when Array  # combo converter
+        combo.each do |converter_name|
+          add_converter(var_name, const, converter_name)
+        end
+      else        # individual named converter
+        instance_variable_get("@#{var_name}") << combo
+      end
     end
-  
-    BufSize = 1024 * 8
   end
 
-  # Buffered IO.
   #
-  # EXAMPLE
-  #   # File 'bigdata' could be a giga-byte size one!
-  #   buf = CSV::IOBuf.new(File.open('bigdata', 'rb'))
-  #   CSV::Reader.new(buf).each do |row|
-  #     p row
-  #     break if row[0].data == 'admin'
-  #   end
+  # Processes +fields+ with <tt>@converters</tt>, or <tt>@header_converters</tt>
+  # if +headers+ is passed as +true+, returning the converted field set.  Any
+  # converter that changes the field into something other than a String halts
+  # the pipeline of conversion for that field.  This is primarily an efficiency
+  # shortcut.
   #
-  class IOBuf < StreamBuf
-    def initialize(s)
-      @s = s
-      super()
+  def convert_fields(fields, headers = false)
+    # see if we are converting headers or fields
+    converters = headers ? @header_converters : @converters
+
+    fields.map.with_index do |field, index|
+      converters.each do |converter|
+        field = if converter.arity == 1  # straight field converter
+          converter[field]
+        else                             # FieldInfo converter
+          header = @use_headers && !headers ? @headers[index] : nil
+          converter[field, FieldInfo.new(index, lineno, header)]
+        end
+        break unless field.is_a? String  # short-curcuit pipeline for speed
+      end
+      field  # final state of each field, converted or original
     end
-  
-    def close
-      terminate
+  end
+
+  #
+  # This methods is used to turn a finished +row+ into a CSV::Row.  Header rows
+  # are also dealt with here, either by returning a CSV::Row with identical
+  # headers and fields (save that the fields do not go through the converters)
+  # or by reading past them to return a field row. Headers are also saved in
+  # <tt>@headers</tt> for use in future rows.
+  #
+  # When +nil+, +row+ is assumed to be a header row not based on an actual row
+  # of the stream.
+  #
+  def parse_headers(row = nil)
+    if @headers.nil?                # header row
+      @headers = case @use_headers  # save headers
+                 # Array of headers
+                 when Array then @use_headers
+                 # CSV header String
+                 when String
+                   self.class.parse_line( @use_headers,
+                                          col_sep:    @col_sep,
+                                          row_sep:    @row_sep,
+                                          quote_char: @quote_char )
+                 # first row is headers
+                 else            row
+                 end
+
+      # prepare converted and unconverted copies
+      row      = @headers                       if row.nil?
+      @headers = convert_fields(@headers, true)
+
+      if @return_headers                                     # return headers
+        return self.class::Row.new(@headers, row, true)
+      elsif not [Array, String].include? @use_headers.class  # skip to field row
+        return shift
+      end
     end
 
-  private
+    self.class::Row.new(@headers, convert_fields(row))  # field row
+  end
 
-    def read(size)
-      @s.read(size)
+  #
+  # Thiw methods injects an instance variable <tt>unconverted_fields</tt> into
+  # +row+ and an accessor method for it called unconverted_fields().  The
+  # variable is set to the contents of +fields+.
+  #
+  def add_unconverted_fields(row, fields)
+    class << row
+      attr_reader :unconverted_fields
     end
- 
-    def terminate
-      super()
+    row.instance_eval { @unconverted_fields = fields }
+    row
+  end
+
+  #
+  # This method is an encoding safe version of Regexp::escape().  It will escape
+  # any characters that would change the meaning of a regular expression in the
+  # encoding of +str+.  Regular expression characters that cannot be transcoded
+  # to the target encoding will be skipped and no escaping will be performed if
+  # a backslash cannot be transcoded.
+  #
+  def escape_re(str)
+    str.chars.map { |c| @re_chars.include?(c) ? @re_esc + c : c }.join
+  end
+
+  #
+  # Builds a regular expression in <tt>@encoding</tt>.  All +chunks+ will be
+  # transcoded to that encoding.
+  #
+  def encode_re(*chunks)
+    Regexp.new(encode_str(*chunks))
+  end
+
+  #
+  # Builds a String in <tt>@encoding</tt>.  All +chunks+ will be transcoded to
+  # that encoding.
+  #
+  def encode_str(*chunks)
+    chunks.map { |chunk| chunk.encode(@encoding.name) }.join
+  end
+
+  #
+  # Reads at least +bytes+ from <tt>@io</tt>, but will read up 10 bytes ahead if
+  # needed to ensure the data read is valid in the ecoding of that data.  This
+  # should ensure that it is safe to use regular expressions on the read data,
+  # unless it is actually a broken encoding.  The read data will be returned in
+  # <tt>@encoding</tt>.
+  #
+  def read_to_char(bytes)
+    return "" if @io.eof?
+    data = read_io(bytes)
+    begin
+      raise unless data.valid_encoding?
+      encoded = encode_str(data)
+      raise unless encoded.valid_encoding?
+      return encoded
+    rescue  # encoding error or my invalid data raise
+      if @io.eof? or data.size >= bytes + 10
+        return data
+      else
+        data += read_io(1)
+        retry
+      end
+    end
+  end
+
+  private
+  def raw_encoding
+    if @io.respond_to? :internal_encoding
+      @io.internal_encoding || @io.external_encoding
+    elsif @io.is_a? StringIO
+      @io.string.encoding
+    elsif @io.respond_to? :encoding
+      @io.encoding
+    else
+      Encoding::ASCII_8BIT
     end
   end
+
+  def read_io(bytes)
+    @io.read(bytes).force_encoding(raw_encoding)
+  end
+end
+
+# Another name for CSV::instance().
+def CSV(*args, &block)
+  CSV.instance(*args, &block)
+end
+
+class Array
+  # Equivalent to <tt>CSV::generate_line(self, options)</tt>.
+  def to_csv(options = Hash.new)
+    CSV.generate_line(self, options)
+  end
+end
+
+class String
+  # Equivalent to <tt>CSV::parse_line(self, options)</tt>.
+  def parse_csv(options = Hash.new)
+    CSV.parse_line(self, options)
+  end
 end
diff --git a/lib/date.rb b/lib/date.rb
index 10d8c94ae3..ebbc8b581e 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1,12 +1,12 @@
 #
 # date.rb - date and time library
 #
-# Author: Tadayoshi Funaba 1998-2006
+# Author: Tadayoshi Funaba 1998-2011
 #
 # Documentation: William Webber <william@williamwebber.com>
 #
 #--
-# $Id: date.rb,v 2.33 2007-12-22 14:41:34+09 tadf Exp $
+# $Id: date.rb,v 2.37 2008-01-17 20:16:31+09 tadf Exp $
 #++
 #
 # == Overview
@@ -193,7 +193,6 @@
 #
 #     puts secs_to_new_year()
 
-require 'rational'
 require 'date/format'
 
 # Class representing a date.
@@ -275,8 +274,8 @@ class Date
 
     def <=> (other)
       case other
-      when Infinity; d <=> other.d
-      when Numeric; d
+      when Infinity; return d <=> other.d
+      when Numeric; return d
       else
 	begin
 	  l, r = other.coerce(self)
@@ -313,225 +312,407 @@ class Date
   # Gregorian calendar.
   GREGORIAN = -Infinity.new
 
-  UNIXEPOCH = 2440588 # 1970-01-01 :nodoc:
-
-  # Does a given Julian Day Number fall inside the old-style (Julian)
-  # calendar?
-  #
-  # +jd+ is the Julian Day Number in question. +sg+ may be Date::GREGORIAN,
-  # in which case the answer is false; it may be Date::JULIAN, in which case
-  # the answer is true; or it may a number representing the Day of
-  # Calendar Reform. Date::ENGLAND and Date::ITALY are two possible such
-  # days.
-
-  def self.julian? (jd, sg)
-    case sg
-    when Numeric
-      jd < sg
-    else
-      if $VERBOSE
-	warn("#{caller.shift.sub(/:in .*/, '')}: " \
-"warning: do not use non-numerical object as julian day number anymore")
+  HALF_DAYS_IN_DAY       = Rational(1, 2) # :nodoc:
+  HOURS_IN_DAY           = Rational(1, 24) # :nodoc:
+  MINUTES_IN_DAY         = Rational(1, 1440) # :nodoc:
+  SECONDS_IN_DAY         = Rational(1, 86400) # :nodoc:
+  MILLISECONDS_IN_DAY    = Rational(1, 86400*10**3) # :nodoc:
+  NANOSECONDS_IN_DAY     = Rational(1, 86400*10**9) # :nodoc:
+  MILLISECONDS_IN_SECOND = Rational(1, 10**3) # :nodoc:
+  NANOSECONDS_IN_SECOND  = Rational(1, 10**9) # :nodoc:
+
+  MJD_EPOCH_IN_AJD       = Rational(4800001, 2) # 1858-11-17 # :nodoc:
+  UNIX_EPOCH_IN_AJD      = Rational(4881175, 2) # 1970-01-01 # :nodoc:
+  MJD_EPOCH_IN_CJD       = 2400001 # :nodoc:
+  UNIX_EPOCH_IN_CJD      = 2440588 # :nodoc:
+  LD_EPOCH_IN_CJD        = 2299160 # :nodoc:
+
+  t = Module.new do
+
+    private
+
+    def find_fdoy(y, sg) # :nodoc:
+      j = nil
+      1.upto(31) do |d|
+	break if j = _valid_civil?(y, 1, d, sg)
       end
-      not sg
+      j
     end
-  end
 
-  # Does a given Julian Day Number fall inside the new-style (Gregorian)
-  # calendar?
-  #
-  # The reverse of self.os?  See the documentation for that method for
-  # more details.
-  def self.gregorian? (jd, sg) !julian?(jd, sg) end
-
-  def self.fix_style(jd, sg) # :nodoc:
-    if julian?(jd, sg)
-    then JULIAN
-    else GREGORIAN end
-  end
+    def find_ldoy(y, sg) # :nodoc:
+      j = nil
+      31.downto(1) do |d|
+	break if j = _valid_civil?(y, 12, d, sg)
+      end
+      j
+    end
 
-  private_class_method :fix_style
+    def find_fdom(y, m, sg) # :nodoc:
+      j = nil
+      1.upto(31) do |d|
+	break if j = _valid_civil?(y, m, d, sg)
+      end
+      j
+    end
 
-  # Convert an Ordinal Date to a Julian Day Number.
-  #
-  # +y+ and +d+ are the year and day-of-year to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Julian Day Number.
-  def self.ordinal_to_jd(y, d, sg=GREGORIAN)
-    civil_to_jd(y, 1, d, sg)
-  end
+    def find_ldom(y, m, sg) # :nodoc:
+      j = nil
+      31.downto(1) do |d|
+	break if j = _valid_civil?(y, m, d, sg)
+      end
+      j
+    end
 
-  # Convert a Julian Day Number to an Ordinal Date.
-  #
-  # +jd+ is the Julian Day Number to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Ordinal Date as
-  # [year, day_of_year]
-  def self.jd_to_ordinal(jd, sg=GREGORIAN)
-    y = jd_to_civil(jd, sg)[0]
-    doy = jd - civil_to_jd(y - 1, 12, 31, fix_style(jd, sg))
-    return y, doy
-  end
+    # Convert an Ordinal Date to a Julian Day Number.
+    #
+    # +y+ and +d+ are the year and day-of-year to convert.
+    # +sg+ specifies the Day of Calendar Reform.
+    #
+    # Returns the corresponding Julian Day Number.
+    def ordinal_to_jd(y, d, sg=GREGORIAN) # :nodoc:
+      find_fdoy(y, sg) + d - 1
+    end
 
-  # Convert a Civil Date to a Julian Day Number.
-  # +y+, +m+, and +d+ are the year, month, and day of the
-  # month.  +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Julian Day Number.
-  def self.civil_to_jd(y, m, d, sg=GREGORIAN)
-    if m <= 2
-      y -= 1
-      m += 12
+    # Convert a Julian Day Number to an Ordinal Date.
+    #
+    # +jd+ is the Julian Day Number to convert.
+    # +sg+ specifies the Day of Calendar Reform.
+    #
+    # Returns the corresponding Ordinal Date as
+    # [year, day_of_year]
+    def jd_to_ordinal(jd, sg=GREGORIAN) # :nodoc:
+      y = jd_to_civil(jd, sg)[0]
+      j = find_fdoy(y, sg)
+      doy = jd - j + 1
+      return y, doy
     end
-    a = (y / 100.0).floor
-    b = 2 - a + (a / 4.0).floor
-    jd = (365.25 * (y + 4716)).floor +
-      (30.6001 * (m + 1)).floor +
-      d + b - 1524
-    if julian?(jd, sg)
-      jd -= b
+
+    # Convert a Civil Date to a Julian Day Number.
+    # +y+, +m+, and +d+ are the year, month, and day of the
+    # month.  +sg+ specifies the Day of Calendar Reform.
+    #
+    # Returns the corresponding Julian Day Number.
+    def civil_to_jd(y, m, d, sg=GREGORIAN) # :nodoc:
+      if m <= 2
+	y -= 1
+	m += 12
+      end
+      a = (y / 100.0).floor
+      b = 2 - a + (a / 4.0).floor
+      jd = (365.25 * (y + 4716)).floor +
+	(30.6001 * (m + 1)).floor +
+	d + b - 1524
+      if jd < sg
+	jd -= b
+      end
+      jd
     end
-    jd
-  end
 
-  # Convert a Julian Day Number to a Civil Date.  +jd+ is
-  # the Julian Day Number. +sg+ specifies the Day of
-  # Calendar Reform.
-  #
-  # Returns the corresponding [year, month, day_of_month]
-  # as a three-element array.
-  def self.jd_to_civil(jd, sg=GREGORIAN)
-    if julian?(jd, sg)
-      a = jd
-    else
-      x = ((jd - 1867216.25) / 36524.25).floor
-      a = jd + 1 + x - (x / 4.0).floor
+    # Convert a Julian Day Number to a Civil Date.  +jd+ is
+    # the Julian Day Number. +sg+ specifies the Day of
+    # Calendar Reform.
+    #
+    # Returns the corresponding [year, month, day_of_month]
+    # as a three-element array.
+    def jd_to_civil(jd, sg=GREGORIAN) # :nodoc:
+      if jd < sg
+	a = jd
+      else
+	x = ((jd - 1867216.25) / 36524.25).floor
+	a = jd + 1 + x - (x / 4.0).floor
+      end
+      b = a + 1524
+      c = ((b - 122.1) / 365.25).floor
+      d = (365.25 * c).floor
+      e = ((b - d) / 30.6001).floor
+      dom = b - d - (30.6001 * e).floor
+      if e <= 13
+	m = e - 1
+	y = c - 4716
+      else
+	m = e - 13
+	y = c - 4715
+      end
+      return y, m, dom
     end
-    b = a + 1524
-    c = ((b - 122.1) / 365.25).floor
-    d = (365.25 * c).floor
-    e = ((b - d) / 30.6001).floor
-    dom = b - d - (30.6001 * e).floor
-    if e <= 13
-      m = e - 1
-      y = c - 4716
-    else
-      m = e - 13
-      y = c - 4715
+
+    # Convert a Commercial Date to a Julian Day Number.
+    #
+    # +y+, +w+, and +d+ are the (commercial) year, week of the year,
+    # and day of the week of the Commercial Date to convert.
+    # +sg+ specifies the Day of Calendar Reform.
+    def commercial_to_jd(y, w, d, sg=GREGORIAN) # :nodoc:
+      j = find_fdoy(y, sg) + 3
+      (j - (((j - 1) + 1) % 7)) +
+	7 * (w - 1) +
+	(d - 1)
     end
-    return y, m, dom
-  end
 
-  # Convert a Commercial Date to a Julian Day Number.
-  #
-  # +y+, +w+, and +d+ are the (commercial) year, week of the year,
-  # and day of the week of the Commercial Date to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.commercial_to_jd(y, w, d, ns=GREGORIAN)
-    jd = civil_to_jd(y, 1, 4, ns)
-    (jd - (((jd - 1) + 1) % 7)) +
-      7 * (w - 1) +
-      (d - 1)
-  end
+    # Convert a Julian Day Number to a Commercial Date
+    #
+    # +jd+ is the Julian Day Number to convert.
+    # +sg+ specifies the Day of Calendar Reform.
+    #
+    # Returns the corresponding Commercial Date as
+    # [commercial_year, week_of_year, day_of_week]
+    def jd_to_commercial(jd, sg=GREGORIAN) # :nodoc:
+      a = jd_to_civil(jd - 3, sg)[0]
+      y = if jd >= commercial_to_jd(a + 1, 1, 1, sg) then a + 1 else a end
+      w = 1 + ((jd - commercial_to_jd(y, 1, 1, sg)) / 7).floor
+      d = (jd + 1) % 7
+      d = 7 if d == 0
+      return y, w, d
+    end
 
-  # Convert a Julian Day Number to a Commercial Date
-  #
-  # +jd+ is the Julian Day Number to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Commercial Date as
-  # [commercial_year, week_of_year, day_of_week]
-  def self.jd_to_commercial(jd, sg=GREGORIAN)
-    ns = fix_style(jd, sg)
-    a = jd_to_civil(jd - 3, ns)[0]
-    y = if jd >= commercial_to_jd(a + 1, 1, 1, ns) then a + 1 else a end
-    w = 1 + ((jd - commercial_to_jd(y, 1, 1, ns)) / 7).floor
-    d = (jd + 1) % 7
-    d = 7 if d == 0
-    return y, w, d
-  end
+    def weeknum_to_jd(y, w, d, f=0, sg=GREGORIAN) # :nodoc:
+      a = find_fdoy(y, sg) + 6
+      (a - ((a - f) + 1) % 7 - 7) + 7 * w + d
+    end
 
-  def self.weeknum_to_jd(y, w, d, f=0, ns=GREGORIAN) # :nodoc:
-    a = civil_to_jd(y, 1, 1, ns) + 6
-    (a - ((a - f) + 1) % 7 - 7) + 7 * w + d
-  end
+    def jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
+      y, m, d = jd_to_civil(jd, sg)
+      a = find_fdoy(y, sg) + 6
+      w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
+      return y, w, d
+    end
 
-  def self.jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
-    ns = fix_style(jd, sg)
-    y, m, d = jd_to_civil(jd, ns)
-    a = civil_to_jd(y, 1, 1, ns) + 6
-    w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
-    return y, w, d
-  end
+    def nth_kday_to_jd(y, m, n, k, sg=GREGORIAN) # :nodoc:
+      j = if n > 0
+	    find_fdom(y, m, sg) - 1
+	  else
+	    find_ldom(y, m, sg) + 7
+	  end
+      (j - (((j - k) + 1) % 7)) + 7 * n
+    end
 
-  private_class_method :weeknum_to_jd, :jd_to_weeknum
+    def jd_to_nth_kday(jd, sg=GREGORIAN) # :nodoc:
+      y, m, d = jd_to_civil(jd, sg)
+      j = find_fdom(y, m, sg)
+      return y, m, ((jd - j) / 7).floor + 1, jd_to_wday(jd)
+    end
 
-  # Convert an Astronomical Julian Day Number to a (civil) Julian
-  # Day Number.
-  #
-  # +ajd+ is the Astronomical Julian Day Number to convert.
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  #
-  # Returns the (civil) Julian Day Number as [day_number,
-  # fraction] where +fraction+ is always 1/2.
-  def self.ajd_to_jd(ajd, of=0) (ajd + of + 1.to_r/2).divmod(1) end
+    # Convert an Astronomical Julian Day Number to a (civil) Julian
+    # Day Number.
+    #
+    # +ajd+ is the Astronomical Julian Day Number to convert.
+    # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+    #
+    # Returns the (civil) Julian Day Number as [day_number,
+    # fraction] where +fraction+ is always 1/2.
+    def ajd_to_jd(ajd, of=0) (ajd + of + HALF_DAYS_IN_DAY).divmod(1) end # :nodoc:
+
+    # Convert a (civil) Julian Day Number to an Astronomical Julian
+    # Day Number.
+    #
+    # +jd+ is the Julian Day Number to convert, and +fr+ is a
+    # fractional day.
+    # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+    #
+    # Returns the Astronomical Julian Day Number as a single
+    # numeric value.
+    def jd_to_ajd(jd, fr, of=0) jd + fr - of - HALF_DAYS_IN_DAY end # :nodoc:
+
+    # Convert a fractional day +fr+ to [hours, minutes, seconds,
+    # fraction_of_a_second]
+    def day_fraction_to_time(fr) # :nodoc:
+      ss,  fr = fr.divmod(SECONDS_IN_DAY) # 4p
+      h,   ss = ss.divmod(3600)
+      min, s  = ss.divmod(60)
+      return h, min, s, fr * 86400
+    end
 
-  # Convert a (civil) Julian Day Number to an Astronomical Julian
-  # Day Number.
-  #
-  # +jd+ is the Julian Day Number to convert, and +fr+ is a
-  # fractional day.
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  #
-  # Returns the Astronomical Julian Day Number as a single
-  # numeric value.
-  def self.jd_to_ajd(jd, fr, of=0) jd + fr - of - 1.to_r/2 end
+    # Convert an +h+ hour, +min+ minutes, +s+ seconds period
+    # to a fractional day.
+    begin
+      Rational(Rational(1, 2), 2) # a challenge
 
-  # Convert a fractional day +fr+ to [hours, minutes, seconds,
-  # fraction_of_a_second]
-  def self.day_fraction_to_time(fr)
-    h,   fr = fr.divmod(1.to_r/24)
-    min, fr = fr.divmod(1.to_r/1440)
-    s,   fr = fr.divmod(1.to_r/86400)
-    return h, min, s, fr
-  end
+      def time_to_day_fraction(h, min, s)
+	Rational(h * 3600 + min * 60 + s, 86400) # 4p
+      end
+    rescue
+      def time_to_day_fraction(h, min, s)
+	if Integer === h && Integer === min && Integer === s
+	  Rational(h * 3600 + min * 60 + s, 86400) # 4p
+	else
+	  (h * 3600 + min * 60 + s).to_r/86400 # 4p
+	end
+      end
+    end
 
-  # Convert an +h+ hour, +min+ minutes, +s+ seconds period
-  # to a fractional day.
-  def self.time_to_day_fraction(h, min, s)
-    h.to_r/24 + min.to_r/1440 + s.to_r/86400
-  end
+    # Convert an Astronomical Modified Julian Day Number to an
+    # Astronomical Julian Day Number.
+    def amjd_to_ajd(amjd) amjd + MJD_EPOCH_IN_AJD end # :nodoc:
+
+    # Convert an Astronomical Julian Day Number to an
+    # Astronomical Modified Julian Day Number.
+    def ajd_to_amjd(ajd) ajd - MJD_EPOCH_IN_AJD end # :nodoc:
+
+    # Convert a Modified Julian Day Number to a Julian
+    # Day Number.
+    def mjd_to_jd(mjd) mjd + MJD_EPOCH_IN_CJD end # :nodoc:
+
+    # Convert a Julian Day Number to a Modified Julian Day
+    # Number.
+    def jd_to_mjd(jd) jd - MJD_EPOCH_IN_CJD end # :nodoc:
+
+    # Convert a count of the number of days since the adoption
+    # of the Gregorian Calendar (in Italy) to a Julian Day Number.
+    def ld_to_jd(ld) ld +  LD_EPOCH_IN_CJD end # :nodoc:
+
+    # Convert a Julian Day Number to the number of days since
+    # the adoption of the Gregorian Calendar (in Italy).
+    def jd_to_ld(jd) jd -  LD_EPOCH_IN_CJD end # :nodoc:
+
+    # Convert a Julian Day Number to the day of the week.
+    #
+    # Sunday is day-of-week 0; Saturday is day-of-week 6.
+    def jd_to_wday(jd) (jd + 1) % 7 end # :nodoc:
+
+    # Is +jd+ a valid Julian Day Number?
+    #
+    # If it is, returns it.  In fact, any value is treated as a valid
+    # Julian Day Number.
+    def _valid_jd? (jd, sg=GREGORIAN) jd end # :nodoc:
+
+    # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
+    # Returns the corresponding Julian Day Number if they do, or
+    # nil if they don't.
+    #
+    # +d+ can be a negative number, in which case it counts backwards
+    # from the end of the year (-1 being the last day of the year).
+    # No year wraparound is performed, however, so valid values of
+    # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year,
+    # -366 .. -1, 1 .. 366 on a leap year.
+    # A date falling in the period skipped in the Day of Calendar Reform
+    # adjustment is not valid.
+    #
+    # +sg+ specifies the Day of Calendar Reform.
+    def _valid_ordinal? (y, d, sg=GREGORIAN) # :nodoc:
+      if d < 0
+	return unless j = find_ldoy(y, sg)
+	ny, nd = jd_to_ordinal(j + d + 1, sg)
+	return unless ny == y
+	d = nd
+      end
+      jd = ordinal_to_jd(y, d, sg)
+      return unless [y, d] == jd_to_ordinal(jd, sg)
+      jd
+    end
 
-  # Convert an Astronomical Modified Julian Day Number to an
-  # Astronomical Julian Day Number.
-  def self.amjd_to_ajd(amjd) amjd + 4800001.to_r/2 end
+    # Do year +y+, month +m+, and day-of-month +d+ make a
+    # valid Civil Date?  Returns the corresponding Julian
+    # Day Number if they do, nil if they don't.
+    #
+    # +m+ and +d+ can be negative, in which case they count
+    # backwards from the end of the year and the end of the
+    # month respectively.  No wraparound is performed, however,
+    # and invalid values cause an ArgumentError to be raised.
+    # A date falling in the period skipped in the Day of Calendar
+    # Reform adjustment is not valid.
+    #
+    # +sg+ specifies the Day of Calendar Reform.
+    def _valid_civil? (y, m, d, sg=GREGORIAN) # :nodoc:
+      if m < 0
+	m += 13
+      end
+      if d < 0
+	return unless j = find_ldom(y, m, sg)
+	ny, nm, nd = jd_to_civil(j + d + 1, sg)
+	return unless [ny, nm] == [y, m]
+	d = nd
+      end
+      jd = civil_to_jd(y, m, d, sg)
+      return unless [y, m, d] == jd_to_civil(jd, sg)
+      jd
+    end
 
-  # Convert an Astronomical Julian Day Number to an
-  # Astronomical Modified Julian Day Number.
-  def self.ajd_to_amjd(ajd) ajd - 4800001.to_r/2 end
+    # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
+    # valid Commercial Date?  Returns the corresponding Julian
+    # Day Number if they do, nil if they don't.
+    #
+    # Monday is day-of-week 1; Sunday is day-of-week 7.
+    #
+    # +w+ and +d+ can be negative, in which case they count
+    # backwards from the end of the year and the end of the
+    # week respectively.  No wraparound is performed, however,
+    # and invalid values cause an ArgumentError to be raised.
+    # A date falling in the period skipped in the Day of Calendar
+    # Reform adjustment is not valid.
+    #
+    # +sg+ specifies the Day of Calendar Reform.
+    def _valid_commercial? (y, w, d, sg=GREGORIAN) # :nodoc:
+      if d < 0
+	d += 8
+      end
+      if w < 0
+	ny, nw, nd =
+	  jd_to_commercial(commercial_to_jd(y + 1, 1, 1, sg) + w * 7, sg)
+	return unless ny == y
+	w = nw
+      end
+      jd = commercial_to_jd(y, w, d, sg)
+      return unless [y, w, d] == jd_to_commercial(jd, sg)
+      jd
+    end
 
-  # Convert a Modified Julian Day Number to a Julian
-  # Day Number.
-  def self.mjd_to_jd(mjd) mjd + 2400001 end
+    def _valid_weeknum? (y, w, d, f, sg=GREGORIAN) # :nodoc:
+      if d < 0
+	d += 7
+      end
+      if w < 0
+	ny, nw, nd, nf =
+	  jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f, sg) + w * 7, f, sg)
+	return unless ny == y
+	w = nw
+      end
+      jd = weeknum_to_jd(y, w, d, f, sg)
+      return unless [y, w, d] == jd_to_weeknum(jd, f, sg)
+      jd
+    end
 
-  # Convert a Julian Day Number to a Modified Julian Day
-  # Number.
-  def self.jd_to_mjd(jd) jd - 2400001 end
+    def _valid_nth_kday? (y, m, n, k, sg=GREGORIAN) # :nodoc:
+      if k < 0
+	k += 7
+      end
+      if n < 0
+	ny, nm = (y * 12 + m).divmod(12)
+	nm,    = (nm + 1)    .divmod(1)
+	ny, nm, nn, nk =
+	  jd_to_nth_kday(nth_kday_to_jd(ny, nm, 1, k, sg) + n * 7, sg)
+	return unless [ny, nm] == [y, m]
+	n = nn
+      end
+      jd = nth_kday_to_jd(y, m, n, k, sg)
+      return unless [y, m, n, k] == jd_to_nth_kday(jd, sg)
+      jd
+    end
 
-  # Convert a count of the number of days since the adoption
-  # of the Gregorian Calendar (in Italy) to a Julian Day Number.
-  def self.ld_to_jd(ld) ld + 2299160 end
+    # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
+    #
+    # If they do, returns their value as a fraction of a day.  If not,
+    # returns nil.
+    #
+    # The 24-hour clock is used.  Negative values of +h+, +min+, and
+    # +sec+ are treating as counting backwards from the end of the
+    # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
+    # wraparound is performed.
+    def _valid_time? (h, min, s) # :nodoc:
+      h   += 24 if h   < 0
+      min += 60 if min < 0
+      s   += 60 if s   < 0
+      return unless ((0...24) === h &&
+		     (0...60) === min &&
+		     (0...60) === s) ||
+		     (24 == h &&
+		       0 == min &&
+		       0 == s)
+      time_to_day_fraction(h, min, s)
+    end
 
-  # Convert a Julian Day Number to the number of days since
-  # the adoption of the Gregorian Calendar (in Italy).
-  def self.jd_to_ld(jd) jd - 2299160 end
+  end
 
-  # Convert a Julian Day Number to the day of the week.
-  #
-  # Sunday is day-of-week 0; Saturday is day-of-week 6.
-  def self.jd_to_wday(jd) (jd + 1) % 7 end
+  extend  t
+  include t
 
   # Is a year a leap year in the Julian calendar?
   #
@@ -547,148 +728,49 @@ class Date
   class << self; alias_method :leap?, :gregorian_leap? end
   class << self; alias_method :new!, :new end
 
-  # Is +jd+ a valid Julian Day Number?
-  #
-  # If it is, returns it.  In fact, any value is treated as a valid
-  # Julian Day Number.
-  def self.valid_jd? (jd, sg=ITALY) jd end
+  def self.valid_jd? (jd, sg=ITALY)
+    !!_valid_jd?(jd, sg)
+  end
 
-  # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
-  # Returns the corresponding Julian Day Number if they do, or
-  # nil if they don't.
-  #
-  # +d+ can be a negative number, in which case it counts backwards
-  # from the end of the year (-1 being the last day of the year).
-  # No year wraparound is performed, however, so valid values of
-  # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year,
-  # -366 .. -1, 1 .. 366 on a leap year.
-  # A date falling in the period skipped in the Day of Calendar Reform
-  # adjustment is not valid.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
   def self.valid_ordinal? (y, d, sg=ITALY)
-    if d < 0
-      ny, = (y + 1).divmod(1)
-      jd = ordinal_to_jd(ny, d + 1, sg)
-      ns = fix_style(jd, sg)
-      return unless [y] == jd_to_ordinal(jd, sg)[0..0]
-      return unless [ny, 1] == jd_to_ordinal(jd - d, ns)
-    else
-      jd = ordinal_to_jd(y, d, sg)
-      return unless [y, d] == jd_to_ordinal(jd, sg)
-    end
-    jd
+    !!_valid_ordinal?(y, d, sg)
   end
 
-  # Do year +y+, month +m+, and day-of-month +d+ make a
-  # valid Civil Date?  Returns the corresponding Julian
-  # Day Number if they do, nil if they don't.
-  #
-  # +m+ and +d+ can be negative, in which case they count
-  # backwards from the end of the year and the end of the
-  # month respectively.  No wraparound is performed, however,
-  # and invalid values cause an ArgumentError to be raised.
-  # A date falling in the period skipped in the Day of Calendar
-  # Reform adjustment is not valid.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
   def self.valid_civil? (y, m, d, sg=ITALY)
-    if m < 0
-      m += 13
-    end
-    if d < 0
-      ny, nm = (y * 12 + m).divmod(12)
-      nm,    = (nm + 1).divmod(1)
-      jd = civil_to_jd(ny, nm, d + 1, sg)
-      ns = fix_style(jd, sg)
-      return unless [y, m] == jd_to_civil(jd, sg)[0..1]
-      return unless [ny, nm, 1] == jd_to_civil(jd - d, ns)
-    else
-      jd = civil_to_jd(y, m, d, sg)
-      return unless [y, m, d] == jd_to_civil(jd, sg)
-    end
-    jd
+    !!_valid_civil?(y, m, d, sg)
   end
 
   class << self; alias_method :valid_date?, :valid_civil? end
 
-  # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
-  # valid Commercial Date?  Returns the corresponding Julian
-  # Day Number if they do, nil if they don't.
-  #
-  # Monday is day-of-week 1; Sunday is day-of-week 7.
-  #
-  # +w+ and +d+ can be negative, in which case they count
-  # backwards from the end of the year and the end of the
-  # week respectively.  No wraparound is performed, however,
-  # and invalid values cause an ArgumentError to be raised.
-  # A date falling in the period skipped in the Day of Calendar
-  # Reform adjustment is not valid.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
   def self.valid_commercial? (y, w, d, sg=ITALY)
-    if d < 0
-      d += 8
-    end
-    if w < 0
-      ny, nw, nd =
-	jd_to_commercial(commercial_to_jd(y + 1, 1, 1) + w * 7)
-      return unless ny == y
-      w = nw
-    end
-    jd = commercial_to_jd(y, w, d)
-    return unless gregorian?(jd, sg)
-    return unless [y, w, d] == jd_to_commercial(jd)
-    jd
+    !!_valid_commercial?(y, w, d, sg)
   end
 
   def self.valid_weeknum? (y, w, d, f, sg=ITALY) # :nodoc:
-    if d < 0
-      d += 7
-    end
-    if w < 0
-      ny, nw, nd, nf =
-	jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f) + w * 7, f)
-      return unless ny == y
-      w = nw
-    end
-    jd = weeknum_to_jd(y, w, d, f)
-    return unless gregorian?(jd, sg)
-    return unless [y, w, d] == jd_to_weeknum(jd, f)
-    jd
+    !!_valid_weeknum?(y, w, d, f, sg)
   end
 
   private_class_method :valid_weeknum?
 
-  # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
-  #
-  # If they do, returns their value as a fraction of a day.  If not,
-  # returns nil.
-  #
-  # The 24-hour clock is used.  Negative values of +h+, +min+, and
-  # +sec+ are treating as counting backwards from the end of the
-  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
-  # wraparound is performed.
-  def self.valid_time? (h, min, s)
-    h   += 24 if h   < 0
-    min += 60 if min < 0
-    s   += 60 if s   < 0
-    return unless ((0..23) === h &&
-		   (0..59) === min &&
-		   (0..59) === s) ||
-		  (24 == h &&
-		    0 == min &&
-		    0 == s)
-    time_to_day_fraction(h, min, s)
+  def self.valid_nth_kday? (y, m, n, k, sg=ITALY) # :nodoc:
+    !!_valid_nth_kday?(y, m, n, k, sg)
   end
 
+  private_class_method :valid_nth_kday?
+
+  def self.valid_time? (h, min, s) # :nodoc:
+    !!_valid_time?(h, min, s)
+  end
+
+  private_class_method :valid_time?
+
   # Create a new Date object from a Julian Day Number.
   #
   # +jd+ is the Julian Day Number; if not specified, it defaults to
   # 0.
   # +sg+ specifies the Day of Calendar Reform.
   def self.jd(jd=0, sg=ITALY)
-    jd = valid_jd?(jd, sg)
+    jd = _valid_jd?(jd, sg)
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
   end
 
@@ -703,7 +785,7 @@ class Date
   #
   # +sg+ specifies the Day of Calendar Reform.
   def self.ordinal(y=-4712, d=1, sg=ITALY)
-    unless jd = valid_ordinal?(y, d, sg)
+    unless jd = _valid_ordinal?(y, d, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -723,7 +805,7 @@ class Date
   #
   # +sg+ specifies the Day of Calendar Reform.
   def self.civil(y=-4712, m=1, d=1, sg=ITALY)
-    unless jd = valid_civil?(y, m, d, sg)
+    unless jd = _valid_civil?(y, m, d, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -741,19 +823,19 @@ class Date
   # week respectively.  No wraparound is performed, however,
   # and invalid values cause an ArgumentError to be raised.
   #
-  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5, the Day of
-  # Calendar Reform for Italy and the Catholic countries.
+  # +y+ defaults to -4712, +w+ to 1, and +d+ to 1; this is
+  # Julian Day Number day 0.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.commercial(y=1582, w=41, d=5, sg=ITALY)
-    unless jd = valid_commercial?(y, w, d, sg)
+  def self.commercial(y=-4712, w=1, d=1, sg=ITALY)
+    unless jd = _valid_commercial?(y, w, d, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
   end
 
-  def self.weeknum(y=1582, w=41, d=5, f=0, sg=ITALY) # :nodoc:
-    unless jd = valid_weeknum?(y, w, d, f, sg)
+  def self.weeknum(y=-4712, w=0, d=1, f=0, sg=ITALY)
+    unless jd = _valid_weeknum?(y, w, d, f, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -761,6 +843,15 @@ class Date
 
   private_class_method :weeknum
 
+  def self.nth_kday(y=-4712, m=1, n=1, k=1, sg=ITALY)
+    unless jd = _valid_nth_kday?(y, m, n, k, sg)
+      raise ArgumentError, 'invalid date'
+    end
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  private_class_method :nth_kday
+
   def self.rewrite_frags(elem) # :nodoc:
     elem ||= {}
     if seconds = elem[:seconds]
@@ -768,7 +859,7 @@ class Date
       h,   fr = fr.divmod(3600)
       min, fr = fr.divmod(60)
       s,   fr = fr.divmod(1)
-      elem[:jd] = UNIXEPOCH + d
+      elem[:jd] = UNIX_EPOCH_IN_CJD + d
       elem[:hour] = h
       elem[:min] = min
       elem[:sec] = s
@@ -836,7 +927,7 @@ class Date
 	  elem[e] = d.__send__(e)
 	end
 	elem[:wnum1] ||= 0
-	elem[:wday]  ||= 0
+	elem[:wday]  ||= 1
       end
     end
 
@@ -861,21 +952,21 @@ class Date
     catch :jd do
       a = elem.values_at(:jd)
       if a.all?
-	if jd = valid_jd?(*(a << sg))
+	if jd = _valid_jd?(*(a << sg))
 	  throw :jd, jd
 	end
       end
 
       a = elem.values_at(:year, :yday)
       if a.all?
-	if jd = valid_ordinal?(*(a << sg))
+	if jd = _valid_ordinal?(*(a << sg))
 	  throw :jd, jd
 	end
       end
 
       a = elem.values_at(:year, :mon, :mday)
       if a.all?
-	if jd = valid_civil?(*(a << sg))
+	if jd = _valid_civil?(*(a << sg))
 	  throw :jd, jd
 	end
       end
@@ -885,7 +976,7 @@ class Date
 	a[2] = elem[:wday].nonzero? || 7
       end
       if a.all?
-	if jd = valid_commercial?(*(a << sg))
+	if jd = _valid_commercial?(*(a << sg))
 	  throw :jd, jd
 	end
       end
@@ -895,7 +986,7 @@ class Date
 	a[2] = elem[:cwday] % 7
       end
       if a.all?
-	if jd = valid_weeknum?(*(a << 0 << sg))
+	if jd = _valid_weeknum?(*(a << 0 << sg))
 	  throw :jd, jd
 	end
       end
@@ -908,7 +999,7 @@ class Date
 	a[2] = (elem[:cwday] - 1) % 7
       end
       if a.all?
-	if jd = valid_weeknum?(*(a << 1 << sg))
+	if jd = _valid_weeknum?(*(a << 1 << sg))
 	  throw :jd, jd
 	end
       end
@@ -919,7 +1010,7 @@ class Date
 
   def self.valid_time_frags? (elem) # :nodoc:
     h, min, s = elem.values_at(:hour, :min, :sec)
-    valid_time?(h, min, s)
+    _valid_time?(h, min, s)
   end
 
   private_class_method :valid_time_frags?
@@ -970,24 +1061,56 @@ class Date
   # Day Number day 0.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.parse(str='-4712-01-01', comp=false, sg=ITALY)
+  def self.parse(str='-4712-01-01', comp=true, sg=ITALY)
     elem = _parse(str, comp)
     new_by_frags(elem, sg)
   end
 
+  def self.iso8601(str='-4712-01-01', sg=ITALY) # :nodoc:
+    elem = _iso8601(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.rfc3339(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
+    elem = _rfc3339(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.xmlschema(str='-4712-01-01', sg=ITALY) # :nodoc:
+    elem = _xmlschema(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.rfc2822(str='Mon, 1 Jan -4712 00:00:00 +0000', sg=ITALY) # :nodoc:
+    elem = _rfc2822(str)
+    new_by_frags(elem, sg)
+  end
+
+  class << self; alias_method :rfc822, :rfc2822 end
+
+  def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT', sg=ITALY) # :nodoc:
+    elem = _httpdate(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.jisx0301(str='-4712-01-01', sg=ITALY) # :nodoc:
+    elem = _jisx0301(str)
+    new_by_frags(elem, sg)
+  end
+
   class << self
 
-    def once(*ids) # :nodoc:
+    def once(*ids) # :nodoc: -- restricted
       for id in ids
 	module_eval <<-"end;"
-	  alias_method :__#{id.to_i}__, :#{id.to_s}
-	  private :__#{id.to_i}__
-	  def #{id.to_s}(*args, &block)
-	    (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0]
+	  alias_method :__#{id.object_id}__, :#{id.to_s}
+	  private :__#{id.object_id}__
+	  def #{id.to_s}(*args)
+	    @__ca__[#{id.object_id}] ||= __#{id.object_id}__(*args)
 	  end
 	end;
       end
-    end
+    end # <<dummy
 
     private :once
 
@@ -1012,42 +1135,45 @@ class Date
   #
   # Using one of the factory methods such as Date::civil is
   # generally easier and safer.
-  def initialize(ajd=0, of=0, sg=ITALY) @ajd, @of, @sg = ajd, of, sg end
+  def initialize(ajd=0, of=0, sg=ITALY)
+    @ajd, @of, @sg = ajd, of, sg
+    @__ca__ = {}
+  end
 
   # Get the date as an Astronomical Julian Day Number.
   def ajd() @ajd end
 
   # Get the date as an Astronomical Modified Julian Day Number.
-  def amjd() self.class.ajd_to_amjd(@ajd) end
+  def amjd() ajd_to_amjd(@ajd) end
 
   once :amjd
 
   # Get the date as a Julian Day Number.
-  def jd() self.class.ajd_to_jd(@ajd, @of)[0] end
+  def jd() ajd_to_jd(@ajd, @of)[0] end
 
   # Get any fractional day part of the date.
-  def day_fraction() self.class.ajd_to_jd(@ajd, @of)[1] end
+  def day_fraction() ajd_to_jd(@ajd, @of)[1] end
 
   # Get the date as a Modified Julian Day Number.
-  def mjd() self.class.jd_to_mjd(jd) end
+  def mjd() jd_to_mjd(jd) end
 
   # Get the date as the number of days since the Day of Calendar
   # Reform (in Italy and the Catholic countries).
-  def ld() self.class.jd_to_ld(jd) end
+  def ld() jd_to_ld(jd) end
 
   once :jd, :day_fraction, :mjd, :ld
 
   # Get the date as a Civil Date, [year, month, day_of_month]
-  def civil() self.class.jd_to_civil(jd, @sg) end # :nodoc:
+  def civil() jd_to_civil(jd, @sg) end # :nodoc:
 
   # Get the date as an Ordinal Date, [year, day_of_year]
-  def ordinal() self.class.jd_to_ordinal(jd, @sg) end # :nodoc:
+  def ordinal() jd_to_ordinal(jd, @sg) end # :nodoc:
 
   # Get the date as a Commercial Date, [year, week_of_year, day_of_week]
-  def commercial() self.class.jd_to_commercial(jd, @sg) end # :nodoc:
+  def commercial() jd_to_commercial(jd, @sg) end # :nodoc:
 
-  def weeknum0() self.class.__send__(:jd_to_weeknum, jd, 0, @sg) end # :nodoc:
-  def weeknum1() self.class.__send__(:jd_to_weeknum, jd, 1, @sg) end # :nodoc:
+  def weeknum0() jd_to_weeknum(jd, 0, @sg) end # :nodoc:
+  def weeknum1() jd_to_weeknum(jd, 1, @sg) end # :nodoc:
 
   once :civil, :ordinal, :commercial, :weeknum0, :weeknum1
   private :civil, :ordinal, :commercial, :weeknum0, :weeknum1
@@ -1078,7 +1204,7 @@ class Date
 
   # Get the time of this date as [hours, minutes, seconds,
   # fraction_of_a_second]
-  def time() self.class.day_fraction_to_time(day_fraction) end # :nodoc:
+  def time() day_fraction_to_time(day_fraction) end # :nodoc:
 
   once :time
   private :time
@@ -1092,11 +1218,15 @@ class Date
   # Get the second of this date.
   def sec() time[2] end
 
-  # Get the fraction-of-a-second of this date.  The unit is in days.
-  # I do NOT recommend you to use this method.
+  # Get the fraction-of-a-second of this date.
   def sec_fraction() time[3] end
 
-  private :hour, :min, :sec, :sec_fraction
+  alias_method :minute, :min
+  alias_method :second, :sec
+  alias_method :second_fraction, :sec_fraction
+
+  private :hour, :min, :sec, :sec_fraction,
+	  :minute, :second, :second_fraction
 
   def zone() strftime('%:z') end
 
@@ -1115,7 +1245,7 @@ class Date
 
   # Get the week day of this date.  Sunday is day-of-week 0;
   # Saturday is day-of-week 6.
-  def wday() self.class.jd_to_wday(jd) end
+  def wday() jd_to_wday(jd) end
 
   once :wday
 
@@ -1125,17 +1255,23 @@ class Date
       define_method(n.downcase + '?'){mon == i}
     end
   end
+=end
 
   DAYNAMES.each_with_index do |n, i|
     define_method(n.downcase + '?'){wday == i}
   end
-=end
+
+  def nth_kday? (n, k)
+    k == wday && jd === nth_kday_to_jd(year, mon, n, k, start)
+  end
+
+  private :nth_kday?
 
   # Is the current date old-style (Julian Calendar)?
-  def julian? () self.class.julian?(jd, @sg) end
+  def julian? () jd < @sg end
 
   # Is the current date new-style (Gregorian Calendar)?
-  def gregorian? () self.class.gregorian?(jd, @sg) end
+  def gregorian? () !julian? end
 
   once :julian?, :gregorian?
 
@@ -1149,8 +1285,8 @@ class Date
 
   # Is this a leap year?
   def leap?
-    self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, fix_style) - 1,
-		     fix_style)[-1] == 29
+    jd_to_civil(civil_to_jd(year, 3, 1, fix_style) - 1,
+		fix_style)[-1] == 29
   end
 
   once :leap?
@@ -1181,7 +1317,7 @@ class Date
 
   def new_offset(of=0)
     if String === of
-      of = (self.class.zone_to_diff(of) || 0).to_r/86400
+      of = Rational(zone_to_diff(of) || 0, 86400)
     end
     self.class.new!(@ajd, of, @sg)
   end
@@ -1235,6 +1371,12 @@ class Date
     case other
     when Numeric; return @ajd <=> other
     when Date;    return @ajd <=> other.ajd
+    else
+      begin
+        l, r = other.coerce(self)
+        return l <=> r
+      rescue NoMethodError
+      end
     end
     nil
   end
@@ -1249,14 +1391,18 @@ class Date
     case other
     when Numeric; return jd == other
     when Date;    return jd == other.jd
+    else
+      begin
+	l, r = other.coerce(self)
+	return l === r
+      rescue NoMethodError
+      end
     end
     false
   end
 
   def next_day(n=1) self + n end
-# def prev_day(n=1) self - n end
-
-  private :next_day
+  def prev_day(n=1) self - n end
 
   # Return a new Date one day after this one.
   def next() next_day end
@@ -1273,7 +1419,10 @@ class Date
     y, m = (year * 12 + (mon - 1) + n).divmod(12)
     m,   = (m + 1)                    .divmod(1)
     d = mday
-    d -= 1 until jd2 = self.class.valid_civil?(y, m, d, fix_style)
+    until jd2 = _valid_civil?(y, m, d, @sg)
+      d -= 1
+      raise ArgumentError, 'invalid date' unless d > 0
+    end
     self + (jd2 - jd)
   end
 
@@ -1285,15 +1434,13 @@ class Date
   # of the returned Date will be the last day of the target month.
   def << (n) self >> -n end
 
-=begin
   def next_month(n=1) self >> n end
   def prev_month(n=1) self << n end
 
   def next_year(n=1) self >> n * 12 end
   def prev_year(n=1) self << n * 12 end
-=end
 
-#  require 'enumerator'
+  require 'enumerator'
 
   # Step the current date forward +step+ days at a
   # time (or backward, if +step+ is negative) until
@@ -1301,10 +1448,13 @@ class Date
   # date at each step.
   def step(limit, step=1) # :yield: date
 =begin
+    if step.zero?
+      raise ArgumentError, "step can't be 0"
+    end
+=end
     unless block_given?
       return to_enum(:step, limit, step)
     end
-=end
     da = self
     op = %w(- <= >=)[step <=> 0]
     while da.__send__(op, limit)
@@ -1335,29 +1485,22 @@ class Date
   def hash() @ajd.hash end
 
   # Return internal object state as a programmer-readable string.
-  def inspect() format('#<%s: %s,%s,%s>', self.class, @ajd, @of, @sg) end
+  def inspect
+    format('#<%s: %s (%s,%s,%s)>', self.class, to_s, @ajd, @of, @sg)
+  end
 
   # Return the date as a human-readable string.
   #
   # The format used is YYYY-MM-DD.
-  def to_s() strftime end
+  def to_s() format('%.4d-%02d-%02d', year, mon, mday) end # 4p
 
   # Dump to Marshal format.
-  def _dump(limit) Marshal.dump([@ajd, @of, @sg], -1) end
+  def marshal_dump() [@ajd, @of, @sg] end
 
-# def self._load(str) new!(*Marshal.load(str)) end
-
-  # Load from Marshall format.
-  def self._load(str)
-    a = Marshal.load(str)
-    if a.size == 2
-      ajd,     sg = a
-           of = 0
-      ajd -= 1.to_r/2
-    else
-      ajd, of, sg = a
-    end
-    new!(ajd, of, sg)
+  # Load from Marshal format.
+  def marshal_load(a)
+    @ajd, @of, @sg, = a
+    @__ca__ = {}
   end
 
 end
@@ -1392,8 +1535,7 @@ end
 # === sec_fraction()
 #
 # Get the fraction of a second of the time.  This is returned as
-# a +Rational+.  The unit is in days.
-# I do NOT recommend you to use this method.
+# a +Rational+.
 #
 # === zone()
 #
@@ -1427,12 +1569,12 @@ class DateTime < Date
   #
   # All day/time values default to 0.
   def self.jd(jd=0, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_jd?(jd, sg)) &&
-	   (fr = valid_time?(h, min, s))
+    unless (jd = _valid_jd?(jd, sg)) &&
+	   (fr = _valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
-      of = (zone_to_diff(of) || 0).to_r/86400
+      of = Rational(zone_to_diff(of) || 0, 86400)
     end
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end
@@ -1452,12 +1594,12 @@ class DateTime < Date
   # +y+ defaults to -4712, and +d+ to 1; this is Julian Day Number
   # day 0.  The time values default to 0.
   def self.ordinal(y=-4712, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_ordinal?(y, d, sg)) &&
-	   (fr = valid_time?(h, min, s))
+    unless (jd = _valid_ordinal?(y, d, sg)) &&
+	   (fr = _valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
-      of = (zone_to_diff(of) || 0).to_r/86400
+      of = Rational(zone_to_diff(of) || 0, 86400)
     end
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end
@@ -1477,12 +1619,12 @@ class DateTime < Date
   # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is Julian Day
   # Number day 0.  The time values default to 0.
   def self.civil(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_civil?(y, m, d, sg)) &&
-	   (fr = valid_time?(h, min, s))
+    unless (jd = _valid_civil?(y, m, d, sg)) &&
+	   (fr = _valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
-      of = (zone_to_diff(of) || 0).to_r/86400
+      of = Rational(zone_to_diff(of) || 0, 86400)
     end
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end
@@ -1501,33 +1643,46 @@ class DateTime < Date
   # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
   # +sg+ specifies the Day of Calendar Reform.
   #
-  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5; this is the Day of
-  # Calendar Reform for Italy and the Catholic countries.
+  # +y+ defaults to -4712, +w+ to 1, and +d+ to 1; this is
+  # Julian Day Number day 0.
   # The time values default to 0.
-  def self.commercial(y=1582, w=41, d=5, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_commercial?(y, w, d, sg)) &&
-	   (fr = valid_time?(h, min, s))
+  def self.commercial(y=-4712, w=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
+    unless (jd = _valid_commercial?(y, w, d, sg)) &&
+	   (fr = _valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
-      of = (zone_to_diff(of) || 0).to_r/86400
+      of = Rational(zone_to_diff(of) || 0, 86400)
     end
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end
 
-  def self.weeknum(y=1582, w=41, d=5, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
-    unless (jd = valid_weeknum?(y, w, d, f, sg)) &&
-	   (fr = valid_time?(h, min, s))
+  def self.weeknum(y=-4712, w=0, d=1, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
+    unless (jd = _valid_weeknum?(y, w, d, f, sg)) &&
+	   (fr = _valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
-      of = (zone_to_diff(of) || 0).to_r/86400
+      of = Rational(zone_to_diff(of) || 0, 86400)
     end
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end
 
   private_class_method :weeknum
 
+  def self.nth_kday(y=-4712, m=1, n=1, k=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
+    unless (jd = _valid_nth_kday?(y, m, n, k, sg)) &&
+	   (fr = _valid_time?(h, min, s))
+      raise ArgumentError, 'invalid date'
+    end
+    if String === of
+      of = Rational(zone_to_diff(of) || 0, 86400)
+    end
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
+
+  private_class_method :nth_kday
+
   def self.new_by_frags(elem, sg) # :nodoc:
     elem = rewrite_frags(elem)
     elem = complete_frags(elem)
@@ -1535,10 +1690,8 @@ class DateTime < Date
 	   (fr = valid_time_frags?(elem))
       raise ArgumentError, 'invalid date'
     end
-    sf = (elem[:sec_fraction] || 0)
-    fr += sf/86400
-    of = (elem[:offset] || 0)
-    of = of.to_r/86400
+    fr += (elem[:sec_fraction] || 0) / 86400
+    of = Rational(elem[:offset] || 0, 86400)
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end
 
@@ -1578,53 +1731,99 @@ class DateTime < Date
   # Day Number day 0.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.parse(str='-4712-01-01T00:00:00+00:00', comp=false, sg=ITALY)
+  def self.parse(str='-4712-01-01T00:00:00+00:00', comp=true, sg=ITALY)
     elem = _parse(str, comp)
     new_by_frags(elem, sg)
   end
 
-  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset
+  def self.iso8601(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
+    elem = _iso8601(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.rfc3339(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
+    elem = _rfc3339(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.xmlschema(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
+    elem = _xmlschema(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.rfc2822(str='Mon, 1 Jan -4712 00:00:00 +0000', sg=ITALY) # :nodoc:
+    elem = _rfc2822(str)
+    new_by_frags(elem, sg)
+  end
+
+  class << self; alias_method :rfc822, :rfc2822 end
+
+  def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT', sg=ITALY) # :nodoc:
+    elem = _httpdate(str)
+    new_by_frags(elem, sg)
+  end
+
+  def self.jisx0301(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
+    elem = _jisx0301(str)
+    new_by_frags(elem, sg)
+  end
+
+  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset,
+	 :minute, :second, :second_fraction
+
+  def to_s # 4p
+    format('%.4d-%02d-%02dT%02d:%02d:%02d%s',
+	   year, mon, mday, hour, min, sec, zone)
+  end
 
 end
 
 class Time
 
-#  def to_time() getlocal end
+  def to_time() getlocal end
 
   def to_date
-    jd = Date.civil_to_jd(year, mon, mday, Date::ITALY)
-    Date.new!(Date.jd_to_ajd(jd, 0, 0), 0, Date::ITALY)
+    jd = Date.__send__(:civil_to_jd, year, mon, mday, Date::ITALY)
+    Date.new!(Date.__send__(:jd_to_ajd, jd, 0, 0), 0, Date::ITALY)
   end
 
   def to_datetime
-    jd = DateTime.civil_to_jd(year, mon, mday, DateTime::ITALY)
-    fr = DateTime.time_to_day_fraction(hour, min, [sec, 59].min) +
-	 usec.to_r/86400000000
-    of = utc_offset.to_r/86400
-    DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY)
+    jd = DateTime.__send__(:civil_to_jd, year, mon, mday, DateTime::ITALY)
+    fr = DateTime.__send__(:time_to_day_fraction, hour, min, [sec, 59].min) +
+      Rational(subsec, 86400)
+    of = Rational(utc_offset, 86400)
+    DateTime.new!(DateTime.__send__(:jd_to_ajd, jd, fr, of),
+		  of, DateTime::ITALY)
   end
 
-  private :to_date, :to_datetime
-
 end
 
 class Date
 
-=begin
   def to_time() Time.local(year, mon, mday) end
   def to_date() self end
-  def to_datetime() DateTime.new!(self.class.jd_to_ajd(jd, 0, 0), @of, @sg) end
-=end
+  def to_datetime() DateTime.new!(jd_to_ajd(jd, 0, 0), @of, @sg) end
 
   # Create a new Date object representing today.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.today(sg=ITALY) Time.now.__send__(:to_date)    .new_start(sg) end
+  def self.today(sg=ITALY)
+    t = Time.now
+    jd = civil_to_jd(t.year, t.mon, t.mday, sg)
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
 
   # Create a new DateTime object representing the current time.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.now  (sg=ITALY) Time.now.__send__(:to_datetime).new_start(sg) end
+  def self.now(sg=ITALY)
+    t = Time.now
+    jd = civil_to_jd(t.year, t.mon, t.mday, sg)
+    fr = time_to_day_fraction(t.hour, t.min, [t.sec, 59].min) +
+      Rational(t.subsec, 86400)
+    of = Rational(t.utc_offset, 86400)
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
 
   private_class_method :now
 
@@ -1632,77 +1831,19 @@ end
 
 class DateTime < Date
 
-=begin
   def to_time
     d = new_offset(0)
     d.instance_eval do
-      Time.utc(year, mon, mday, hour, min, sec,
-	       (sec_fraction * 86400000000).to_i)
+      Time.utc(year, mon, mday, hour, min, sec +
+	       sec_fraction)
     end.
 	getlocal
   end
 
-  def to_date() Date.new!(self.class.jd_to_ajd(jd, 0, 0), 0, @sg) end
+  def to_date() Date.new!(jd_to_ajd(jd, 0, 0), 0, @sg) end
   def to_datetime() self end
-=end
 
   private_class_method :today
   public_class_method  :now
 
 end
-
-class Date
-
-  [ %w(os?	julian?),
-    %w(ns?	gregorian?),
-    %w(exist1?	valid_jd?),
-    %w(exist2?	valid_ordinal?),
-    %w(exist3?	valid_date?),
-    %w(exist?	valid_date?),
-    %w(existw?	valid_commercial?),
-    %w(new0	new!),
-    %w(new1	jd),
-    %w(new2	ordinal),
-    %w(new3	new),
-    %w(neww	commercial)
-  ].each do |old, new|
-    module_eval <<-"end;"
-      def self.#{old}(*args, &block)
-	if $VERBOSE
-	  warn("\#{caller.shift.sub(/:in .*/, '')}: " \
-	       "warning: \#{self}::#{old} is deprecated; " \
-	       "use \#{self}::#{new}")
-	end
-	#{new}(*args, &block)
-      end
-    end;
-  end
-
-  [ %w(os?	julian?),
-    %w(ns?	gregorian?),
-    %w(sg	start),
-    %w(newsg	new_start),
-    %w(of	offset),
-    %w(newof	new_offset)
-  ].each do |old, new|
-    module_eval <<-"end;"
-      def #{old}(*args, &block)
-	if $VERBOSE
-	  warn("\#{caller.shift.sub(/:in .*/, '')}: " \
-	       "warning: \#{self.class}\##{old} is deprecated; " \
-	       "use \#{self.class}\##{new}")
-	end
-	#{new}(*args, &block)
-      end
-    end;
-  end
-
-  private :of, :newof
-
-end
-
-class DateTime < Date
-
-  public :of, :newof
-
-end
diff --git a/lib/date/delta.rb b/lib/date/delta.rb
new file mode 100644
index 0000000000..d2ed5e86d3
--- /dev/null
+++ b/lib/date/delta.rb
@@ -0,0 +1,431 @@
+# delta.rb: Written by Tadayoshi Funaba 2004-2009
+
+require 'date'
+require 'date/delta/parser'
+
+class Date
+
+  class Delta
+
+    include Comparable
+
+    UNIT_PREFIXES = {
+      'yotta'      => Rational(10**24),
+      'zetta'      => Rational(10**21),
+      'exa'        => Rational(10**18),
+      'peta'       => Rational(10**15),
+      'tera'       => Rational(10**12),
+      'giga'       => Rational(10**9),
+      'mega'       => Rational(10**6),
+      'kilo'       => Rational(10**3),
+      'hecto'      => Rational(10**2),
+      'deca'       => Rational(10**1),
+      'deka'       => Rational(10**1),
+      'deci'       => Rational(1, 10**1),
+      'centi'      => Rational(1, 10**2),
+      'milli'      => Rational(1, 10**3),
+      'decimilli'  => Rational(1, 10**4),
+      'centimilli' => Rational(1, 10**5),
+      'micro'      => Rational(1, 10**6),
+      'nano'       => Rational(1, 10**9),
+      'millimicro' => Rational(1, 10**9),
+      'pico'       => Rational(1, 10**12),
+      'micromicro' => Rational(1, 10**12),
+      'femto'      => Rational(1, 10**15),
+      'atto'       => Rational(1, 10**18),
+      'zepto'      => Rational(1, 10**21),
+      'yocto'      => Rational(1, 10**24)
+    }
+
+    IUNITS = {
+      'year'       => Complex(0, 12),
+      'month'      => Complex(0, 1)
+    }
+
+    RUNITS = {
+      'day'        => Rational(1),
+      'week'       => Rational(7),
+      'sennight'   => Rational(7),
+      'fortnight'  => Rational(14),
+      'hour'       => Rational(1, 24),
+      'minute'     => Rational(1, 1440),
+      'second'     => Rational(1, 86400)
+    }
+
+    UNIT_PREFIXES.each do |k, v|
+      RUNITS[k + 'second'] = v * RUNITS['second']
+    end
+
+    remove_const :UNIT_PREFIXES
+
+    UNITS = {}
+
+    IUNITS.each do |k, v|
+      UNITS[k] = v
+    end
+
+    RUNITS.each do |k, v|
+      UNITS[k] = v
+    end
+
+    UNITS4KEY = {}
+
+    UNITS.each do |k, v|
+      UNITS4KEY[k] = UNITS4KEY[k + 's'] = v
+    end
+
+    UNITS4KEY['y'] = UNITS4KEY['years']
+    UNITS4KEY['yr'] = UNITS4KEY['years']
+    UNITS4KEY['yrs'] = UNITS4KEY['years']
+    UNITS4KEY['m'] = UNITS4KEY['months']
+    UNITS4KEY['mo'] = UNITS4KEY['months']
+    UNITS4KEY['mon'] = UNITS4KEY['months']
+    UNITS4KEY['mnth'] = UNITS4KEY['months']
+    UNITS4KEY['mnths'] = UNITS4KEY['months']
+    UNITS4KEY['w'] = UNITS4KEY['weeks']
+    UNITS4KEY['wk'] = UNITS4KEY['weeks']
+    UNITS4KEY['d'] = UNITS4KEY['days']
+    UNITS4KEY['dy'] = UNITS4KEY['days']
+    UNITS4KEY['dys'] = UNITS4KEY['days']
+    UNITS4KEY['h'] = UNITS4KEY['hours']
+    UNITS4KEY['hr'] = UNITS4KEY['hours']
+    UNITS4KEY['hrs'] = UNITS4KEY['hours']
+    UNITS4KEY['min'] = UNITS4KEY['minutes']
+    UNITS4KEY['mins'] = UNITS4KEY['minutes']
+    UNITS4KEY['s'] = UNITS4KEY['seconds']
+    UNITS4KEY['sec'] = UNITS4KEY['seconds']
+    UNITS4KEY['secs'] = UNITS4KEY['seconds']
+    UNITS4KEY['ms'] = UNITS4KEY['milliseconds']
+    UNITS4KEY['msec'] = UNITS4KEY['milliseconds']
+    UNITS4KEY['msecs'] = UNITS4KEY['milliseconds']
+    UNITS4KEY['milli'] = UNITS4KEY['milliseconds']
+    UNITS4KEY['us'] = UNITS4KEY['microseconds']
+    UNITS4KEY['usec'] = UNITS4KEY['microseconds']
+    UNITS4KEY['usecs'] = UNITS4KEY['microseconds']
+    UNITS4KEY['micro'] = UNITS4KEY['microseconds']
+    UNITS4KEY['ns'] = UNITS4KEY['nanoseconds']
+    UNITS4KEY['nsec'] = UNITS4KEY['nanoseconds']
+    UNITS4KEY['nsecs'] = UNITS4KEY['nanoseconds']
+    UNITS4KEY['nano'] = UNITS4KEY['nanoseconds']
+
+    def self.delta_to_dhms(delta)
+      fr = delta.imag.abs
+      y,   fr = fr.divmod(12)
+      m,   fr = fr.divmod(1)
+
+      if delta.imag < 0
+	y = -y
+	m = -m
+      end
+
+      fr = delta.real.abs
+      ss,  fr = fr.divmod(SECONDS_IN_DAY) # 4p
+      d,   ss = ss.divmod(86400)
+      h,   ss = ss.divmod(3600)
+      min, s  = ss.divmod(60)
+
+      if delta.real < 0
+	d = -d
+	h = -h
+	min = -min
+	s = -s
+      end
+
+      return y, m, d, h, min, s, fr
+    end
+
+    def self.dhms_to_delta(y, m, d, h, min, s, fr)
+      fr = 0 if fr == 0
+      Complex(0, y.to_i * 12 + m.to_i) +
+	Rational(d * 86400 + h * 3600 + min * 60 + (s + fr), 86400) # 4p
+    end
+
+    def initialize(delta)
+      @delta = delta
+      @__ca__ = {}
+    end
+
+    class << self; alias_method :new!, :new end
+
+    def self.new(arg=0, h=0, min=0, s=0)
+      if Hash === arg
+	d = Complex(0)
+	arg.each do |k, v|
+	  k = k.to_s.downcase
+	  unless UNITS4KEY[k]
+	    raise ArgumentError, "unknown keyword #{k}"
+	  end
+	  d += v * UNITS4KEY[k]
+	end
+      else
+	d = dhms_to_delta(0, 0, arg, h, min, s, 0)
+      end
+      new!(d)
+    end
+
+    UNITS.each_key do |k|
+      module_eval <<-"end;"
+	def self.#{k}s(n=1)
+	  new(:d=>n * UNITS['#{k}'])
+	end
+      end;
+    end
+
+    class << self; alias_method :mins, :minutes end
+    class << self; alias_method :secs, :seconds end
+
+    def self.parse(str)
+      d = begin (@@pa ||= Parser.new).parse(str)
+	  rescue Racc::ParseError
+	    raise ArgumentError, 'syntax error'
+	  end
+      new!(d)
+    end
+
+    def self.diff(d1, d2) new(d1.ajd - d2.ajd) end
+
+    class << self
+
+      def once(*ids) # :nodoc: -- restricted
+	for id in ids
+	  module_eval <<-"end;"
+	    alias_method :__#{id.object_id}__, :#{id.to_s}
+	    private :__#{id.object_id}__
+	    def #{id.to_s}(*args)
+	      @__ca__[#{id.object_id}] ||= __#{id.object_id}__(*args)
+	    end
+	  end;
+        end
+      end
+
+      private :once
+
+    end
+
+    def dhms() self.class.delta_to_dhms(@delta) end
+
+    once :dhms
+
+    def delta() @delta end
+
+    protected :delta
+
+    def years() dhms[0] end
+    def months() dhms[1] end
+    def days() dhms[2] end
+    def hours() dhms[3] end
+    def minutes() dhms[4] end
+    def seconds() dhms[5] end
+    def second_fractions() dhms[6] end
+
+    alias_method :mins, :minutes
+    alias_method :secs, :seconds
+    alias_method :sec_fractions, :second_fractions
+
+    RUNITS.each_key do |k|
+      module_eval <<-"end;"
+	def in_#{k}s(u=1)
+	  if @delta.imag != 0
+	    raise ArgumentError, "#{k}: #{self} has month"
+	  end
+	  @delta.real / (u * RUNITS['#{k}'])
+	end
+      end;
+    end # <<dummy
+
+    alias_method :in_mins, :in_minutes
+    alias_method :in_secs, :in_seconds
+
+    def zero?() @delta.zero? end
+    def nonzero?() unless zero? then self end end
+
+    def integer? () @delta.imag == 0 && @delta.real.integer? end
+
+    def -@ () self.class.new!(-@delta) end
+    def +@ () self.class.new!(+@delta) end
+
+    def dx_addsub(m, n)
+      case n
+      when Numeric; return self.class.new!(@delta.__send__(m, n))
+      when Delta; return self.class.new!(@delta.__send__(m, n.delta))
+      else
+	l, r = n.coerce(self)
+	return l.__send__(m, r)
+      end
+    end
+
+    private :dx_addsub
+
+    def + (n) dx_addsub(:+, n) end
+    def - (n) dx_addsub(:-, n) end
+
+    def dx_muldiv(m, n)
+      case n
+      when Numeric
+	return self.class.new!(@delta.__send__(m, n))
+      else
+	l, r = n.coerce(self)
+	return l.__send__(m, r)
+      end
+    end
+
+    private :dx_muldiv
+
+    def * (n) dx_muldiv(:*, n) end
+    def / (n) dx_muldiv(:/, n) end
+
+    def dx_conv1(m, n)
+      if @delta.imag != 0
+	raise ArgumentError, "#{m}: #{self} has month"
+      end
+      case n
+      when Numeric
+	return self.class.new!(Complex(@delta.real.__send__(m, n), 0))
+      else
+	l, r = n.coerce(self)
+	return l.__send__(m, r)
+      end
+    end
+
+    private :dx_conv1
+
+    def % (n) dx_conv1(:%, n) end
+
+    def div(n) dx_conv1(:div, n) end
+    def modulo(n) dx_conv1(:modulo, n) end
+    def divmod(n) [div(n), modulo(n)] end
+
+    def quotient(n)
+      if @delta.imag != 0
+	raise ArgumentError, "quotient: #{self} has month"
+      end
+      case n
+      when Numeric
+	return self.class.new!(Complex((@delta.real / n).truncate))
+      else
+	l, r = n.coerce(self)
+	return l.__send__(m, r)
+      end
+    end
+
+    def remainder(n) dx_conv1(:remainder, n) end
+    def quotrem(n) [quotient(n), remainder(n)] end
+
+    def ** (n) dx_conv1(:**, n) end
+    def quo(n) dx_muldiv(:quo, n) end
+
+    def <=> (other)
+      if @delta.imag != 0
+	raise ArgumentError, "<=>: #{self} has month"
+      end
+      case other
+      when Numeric; return @delta.real <=> other
+      when Delta;   return @delta.real <=> other.delta.real
+      else
+	begin
+	  l, r = other.coerce(self)
+	  return l <=> r
+	rescue NoMethodError
+	end
+      end
+      nil
+    end
+
+    def == (other)
+      case other
+      when Numeric; return @delta == other
+      when Delta;   return @delta == other
+      else
+	begin
+	  l, r = other.coerce(self)
+	  return l == r
+	rescue NoMethodError
+	end
+      end
+      nil
+    end
+
+    def coerce(other)
+      case other
+      when Numeric; return other, @delta
+      else
+	super
+      end
+    end
+
+    def eql? (other) Delta === other && self == other end
+    def hash() @delta.hash end
+
+    def dx_conv0(m)
+      if @delta.imag != 0
+	raise ArgumentError, "#{m}: #{self} has month"
+      end
+      @delta.real.__send__(m)
+    end
+
+    private :dx_conv0
+
+    def abs() dx_conv0(:abs) end
+
+    def ceil() dx_conv0(:ceil) end
+    def floor() dx_conv0(:floor) end
+    def round() dx_conv0(:round) end
+    def truncate() dx_conv0(:truncate) end
+
+    def to_i() dx_conv0(:to_i) end
+    def to_f() dx_conv0(:to_f) end
+    def to_r() dx_conv0(:to_r) end
+    def to_c() @delta end
+
+    alias_method :to_int, :to_i
+
+    def inspect() format('#<%s: %s (%s)>', self.class, to_s, @delta) end
+
+    def to_s
+      format(%(%s(%dd %.02d:%02d'%02d"%03d)%s(%dy %dm)), # '
+	     if @delta.real < 0 then '-' else '+' end,
+	     days.abs, hours.abs, mins.abs, secs.abs, sec_fractions.abs * 1000,
+	     if @delta.imag < 0 then '-' else '+' end,
+	     years.abs, months.abs)
+    end
+
+    def marshal_dump() @delta end
+
+    def marshal_load(a)
+      @delta = a
+      @__ca__ = {}
+    end
+
+  end
+
+end
+
+vsave = $VERBOSE
+$VERBOSE = false
+
+class Date
+
+  def + (n)
+    case n
+    when Numeric; return self.class.new!(@ajd + n, @of, @sg)
+    when Delta
+      d = n.__send__(:delta)
+      return (self >> d.imag) + d.real
+    end
+    raise TypeError, 'expected numeric'
+  end
+
+  def - (x)
+    case x
+    when Numeric; return self.class.new!(@ajd - x, @of, @sg)
+    when Date;    return @ajd - x.ajd
+    when Delta
+      d = x.__send__(:delta)
+      return (self << d.imag) - d.real
+    end
+    raise TypeError, 'expected numeric'
+  end
+
+end
+
+$VERBOSE = vsave
diff --git a/lib/date/delta/parser.rb b/lib/date/delta/parser.rb
new file mode 100644
index 0000000000..7efe29f4c2
--- /dev/null
+++ b/lib/date/delta/parser.rb
@@ -0,0 +1,301 @@
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by racc 1.4.5
+# from racc grammer file "parser.ry".
+#
+
+require 'racc/parser'
+
+
+class Date
+
+  class Delta
+
+    class Parser < Racc::Parser
+
+module_eval <<'..end parser.ry modeval..id43bff5dec9', 'parser.ry', 42
+
+  def lookup(str)
+    t = str.downcase
+    k = UNITS4KEY[t]
+    return [:UNIT, k] if k
+    return [:AND, nil] if t == 'and'
+    return [:UNKNOWNWORD, nil]
+  end
+
+  def parse(str)
+    @q = []
+    until str.empty?
+      case str
+      when /\A\s+/
+      when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
+	y, m, d, h, min, s, w =
+	  [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
+	y *= UNITS4KEY['years']
+	m *= UNITS4KEY['months']
+	d *= UNITS4KEY['days']
+	h *= UNITS4KEY['hours']
+	min *= UNITS4KEY['minutes']
+	s *= UNITS4KEY['seconds']
+	w *= UNITS4KEY['weeks']
+	@q.push [:DURATION, y + m + d + h + min + s + w]
+      when /\A\d+/
+	@q.push [:DIGITS, $&.to_i]
+      when /\A[a-z]+/i
+	@q.push lookup($&)
+      when /\A.|\n/
+	@q.push [$&, $&]
+      end
+      str = $'
+    end
+    @q.push [false, false]
+    do_parse
+  end
+
+  def next_token
+    @q.shift
+  end
+
+..end parser.ry modeval..id43bff5dec9
+
+##### racc 1.4.5 generates ###
+
+racc_reduce_table = [
+ 0, 0, :racc_error,
+ 1, 16, :_reduce_none,
+ 1, 17, :_reduce_none,
+ 1, 17, :_reduce_none,
+ 3, 17, :_reduce_4,
+ 3, 17, :_reduce_5,
+ 3, 17, :_reduce_6,
+ 3, 17, :_reduce_7,
+ 3, 17, :_reduce_8,
+ 3, 17, :_reduce_9,
+ 3, 17, :_reduce_10,
+ 2, 17, :_reduce_11,
+ 2, 17, :_reduce_12,
+ 3, 17, :_reduce_13,
+ 2, 18, :_reduce_14,
+ 0, 20, :_reduce_15,
+ 1, 20, :_reduce_none,
+ 1, 19, :_reduce_none ]
+
+racc_reduce_n = 18
+
+racc_shift_n = 32
+
+racc_action_table = [
+    13,    14,    15,    16,    17,    18,    19,     4,    27,    23,
+     8,     9,     1,     4,    25,     2,     8,     9,     1,     4,
+    24,     2,     8,     9,     1,     4,    21,     2,     8,     9,
+     1,     4,    11,     2,     8,     9,     1,     4,    26,     2,
+     8,     9,     1,     4,   nil,     2,     8,     9,     1,     4,
+   nil,     2,     8,     9,     1,   nil,   nil,     2,    13,    14,
+    15,    16,    17,    18,    19,    13,    14,    15,    13,    14,
+    15,    13,    14,    15,    13,    14,    15 ]
+
+racc_action_check = [
+    10,    10,    10,    10,    10,    10,    10,    17,    15,    10,
+    17,    17,    17,    18,    13,    17,    18,    18,    18,     4,
+    11,    18,     4,     4,     4,     1,     9,     4,     1,     1,
+     1,     8,     3,     1,     8,     8,     8,    19,    14,     8,
+    19,    19,    19,     0,   nil,    19,     0,     0,     0,    16,
+   nil,     0,    16,    16,    16,   nil,   nil,    16,     5,     5,
+     5,     5,     5,     5,     5,    30,    30,    30,    28,    28,
+    28,    29,    29,    29,    31,    31,    31 ]
+
+racc_action_pointer = [
+    37,    19,   nil,    32,    13,    55,   nil,   nil,    25,    13,
+    -3,    20,   nil,     4,    28,    -2,    43,     1,     7,    31,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    65,    68,
+    62,    71 ]
+
+racc_action_default = [
+   -18,   -18,   -17,   -18,   -18,    -1,    -2,    -3,   -18,   -15,
+   -18,   -18,   -12,   -18,   -18,   -18,   -18,   -18,   -18,   -18,
+   -11,   -16,   -14,   -13,    32,   -10,    -8,    -9,    -4,    -5,
+    -6,    -7 ]
+
+racc_goto_table = [
+     5,    10,     3,    22,    12,   nil,   nil,   nil,    20,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    28,    29,    30,    31 ]
+
+racc_goto_check = [
+     2,     2,     1,     5,     2,   nil,   nil,   nil,     2,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     2,     2,     2,     2 ]
+
+racc_goto_pointer = [
+   nil,     2,     0,   nil,   nil,    -6 ]
+
+racc_goto_default = [
+   nil,   nil,   nil,     6,     7,   nil ]
+
+racc_token_table = {
+ false => 0,
+ Object.new => 1,
+ :UNARY => 2,
+ "^" => 3,
+ "*" => 4,
+ "/" => 5,
+ "+" => 6,
+ "," => 7,
+ :AND => 8,
+ "-" => 9,
+ :DIGITS => 10,
+ "(" => 11,
+ ")" => 12,
+ :UNIT => 13,
+ :DURATION => 14 }
+
+racc_use_result_var = true
+
+racc_nt_base = 15
+
+Racc_arg = [
+ racc_action_table,
+ racc_action_check,
+ racc_action_default,
+ racc_action_pointer,
+ racc_goto_table,
+ racc_goto_check,
+ racc_goto_default,
+ racc_goto_pointer,
+ racc_nt_base,
+ racc_reduce_table,
+ racc_token_table,
+ racc_shift_n,
+ racc_reduce_n,
+ racc_use_result_var ]
+
+Racc_token_to_s_table = [
+'$end',
+'error',
+'UNARY',
+'"^"',
+'"*"',
+'"/"',
+'"+"',
+'","',
+'AND',
+'"-"',
+'DIGITS',
+'"("',
+'")"',
+'UNIT',
+'DURATION',
+'$start',
+'stmt',
+'expr',
+'time',
+'iso',
+'unit']
+
+Racc_debug_parser = false
+
+##### racc system variables end #####
+
+ # reduce 0 omitted
+
+ # reduce 1 omitted
+
+ # reduce 2 omitted
+
+ # reduce 3 omitted
+
+module_eval <<'.,.,', 'parser.ry', 18
+  def _reduce_4( val, _values, result )
+result += val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 19
+  def _reduce_5( val, _values, result )
+result += val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 20
+  def _reduce_6( val, _values, result )
+result += val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 21
+  def _reduce_7( val, _values, result )
+result -= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 22
+  def _reduce_8( val, _values, result )
+result *= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 23
+  def _reduce_9( val, _values, result )
+result /= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 24
+  def _reduce_10( val, _values, result )
+result **= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 25
+  def _reduce_11( val, _values, result )
+result = -val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 26
+  def _reduce_12( val, _values, result )
+result = +val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 27
+  def _reduce_13( val, _values, result )
+result =  val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 30
+  def _reduce_14( val, _values, result )
+result = val[0] * val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 33
+  def _reduce_15( val, _values, result )
+result = 1
+   result
+  end
+.,.,
+
+ # reduce 16 omitted
+
+ # reduce 17 omitted
+
+ def _reduce_none( val, _values, result )
+  result
+ end
+
+    end   # class Parser
+
+  end   # class Delta
+
+end   # class Date
diff --git a/lib/date/delta/parser.ry b/lib/date/delta/parser.ry
new file mode 100644
index 0000000000..84d4c22c3c
--- /dev/null
+++ b/lib/date/delta/parser.ry
@@ -0,0 +1,84 @@
+# parser.ry: Written by Tadayoshi Funaba 2006,2008,2009 -*- ruby -*-
+
+class Date::Delta::Parser
+
+  prechigh
+    nonassoc UNARY
+    left '^'
+    left '*' '/'
+    left '+' ',' AND '-'
+  preclow
+
+  rule
+
+  stmt	: expr
+	;
+
+  expr	: time
+	| iso
+	| expr '+' expr   {result += val[2]}
+	| expr ',' expr   {result += val[2]}
+	| expr AND expr   {result += val[2]}
+	| expr '-' expr   {result -= val[2]}
+	| expr '*' DIGITS {result *= val[2]}
+	| expr '/' DIGITS {result /= val[2]}
+	| expr '^' DIGITS {result **= val[2]}
+	| '-' expr =UNARY {result = -val[1]}
+	| '+' expr =UNARY {result = +val[1]}
+	| '(' expr ')'    {result =  val[1]}
+	;
+
+  time	: DIGITS unit {result = val[0] * val[1]}
+	;
+
+  unit	: {result = 1} | UNIT
+	;
+
+  iso	: DURATION
+	;
+
+---- header ----
+---- inner ----
+
+  def lookup(str)
+    t = str.downcase
+    k = UNITS4KEY[t]
+    return [:UNIT, k] if k
+    return [:AND, nil] if t == 'and'
+    return [:UNKNOWNWORD, nil]
+  end
+
+  def parse(str)
+    @q = []
+    until str.empty?
+      case str
+      when /\A\s+/
+      when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
+	y, m, d, h, min, s, w =
+	  [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
+	y *= UNITS4KEY['years']
+	m *= UNITS4KEY['months']
+	d *= UNITS4KEY['days']
+	h *= UNITS4KEY['hours']
+	min *= UNITS4KEY['minutes']
+	s *= UNITS4KEY['seconds']
+	w *= UNITS4KEY['weeks']
+	@q.push [:DURATION, y + m + d + h + min + s + w]
+      when /\A\d+/
+	@q.push [:DIGITS, $&.to_i]
+      when /\A[a-z]+/i
+	@q.push lookup($&)
+      when /\A.|\n/
+	@q.push [$&, $&]
+      end
+      str = $'
+    end
+    @q.push [false, false]
+    do_parse
+  end
+
+  def next_token
+    @q.shift
+  end
+
+---- footer ----
diff --git a/lib/date/format.rb b/lib/date/format.rb
index 8bd14c7fd0..b30cf3a41e 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -1,7 +1,5 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2007
-# $Id: format.rb,v 2.30 2007-01-07 09:16:24+09 tadf Exp $
-
-require 'rational'
+# format.rb: Written by Tadayoshi Funaba 1999-2009
+# $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $
 
 class Date
 
@@ -40,16 +38,33 @@ class Date
       'r'   => -5*3600, 's'   => -6*3600, 't'   => -7*3600, 'u'   => -8*3600,
       'v'   => -9*3600, 'w'   =>-10*3600, 'x'   =>-11*3600, 'y'   =>-12*3600,
       'z'   =>  0*3600,
-      'utc' =>  0*3600, 'wet' =>  0*3600, 'bst' =>  1*3600, 'wat' => -1*3600,
-      'at'  => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600,
-      'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600,
-      'ahst'=>-10*3600, 'nt'  =>-11*3600, 'idlw'=>-12*3600, 'cet' =>  1*3600,
-      'met' =>  1*3600, 'mewt'=>  1*3600, 'mest'=>  2*3600, 'mesz'=>  2*3600,
-      'swt' =>  1*3600, 'sst' =>  2*3600, 'fwt' =>  1*3600, 'fst' =>  2*3600,
-      'eet' =>  2*3600, 'bt'  =>  3*3600, 'zp4' =>  4*3600, 'zp5' =>  5*3600,
-      'zp6' =>  6*3600, 'wast'=>  7*3600, 'wadt'=>  8*3600, 'cct' =>  8*3600,
-      'jst' =>  9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600,
-      'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600,
+
+      'utc' =>  0*3600, 'wet' =>  0*3600,
+      'at'  => -2*3600, 'brst'=> -2*3600, 'ndt' => -(2*3600+1800),
+      'art' => -3*3600, 'adt' => -3*3600, 'brt' => -3*3600, 'clst'=> -3*3600,
+      'nst' => -(3*3600+1800),
+      'ast' => -4*3600, 'clt' => -4*3600,
+      'akdt'=> -8*3600, 'ydt' => -8*3600,
+      'akst'=> -9*3600, 'hadt'=> -9*3600, 'hdt' => -9*3600, 'yst' => -9*3600,
+      'ahst'=>-10*3600, 'cat' =>-10*3600, 'hast'=>-10*3600, 'hst' =>-10*3600,
+      'nt'  =>-11*3600,
+      'idlw'=>-12*3600,
+      'bst' =>  1*3600, 'cet' =>  1*3600, 'fwt' =>  1*3600, 'met' =>  1*3600,
+      'mewt'=>  1*3600, 'mez' =>  1*3600, 'swt' =>  1*3600, 'wat' =>  1*3600,
+      'west'=>  1*3600,
+      'cest'=>  2*3600, 'eet' =>  2*3600, 'fst' =>  2*3600, 'mest'=>  2*3600,
+      'mesz'=>  2*3600, 'sast'=>  2*3600, 'sst' =>  2*3600,
+      'bt'  =>  3*3600, 'eat' =>  3*3600, 'eest'=>  3*3600, 'msk' =>  3*3600,
+      'msd' =>  4*3600, 'zp4' =>  4*3600,
+      'zp5' =>  5*3600, 'ist' =>  (5*3600+1800),
+      'zp6' =>  6*3600,
+      'wast'=>  7*3600,
+      'cct' =>  8*3600, 'sgt' =>  8*3600, 'wadt'=>  8*3600,
+      'jst' =>  9*3600, 'kst' =>  9*3600,
+      'east'=> 10*3600, 'gst' => 10*3600,
+      'eadt'=> 11*3600,
+      'idle'=> 12*3600, 'nzst'=> 12*3600, 'nzt' => 12*3600,
+      'nzdt'=> 13*3600,
 
       'afghanistan'           =>   16200, 'alaskan'               =>  -32400,
       'arab'                  =>   10800, 'arabian'               =>   14400,
@@ -198,8 +213,9 @@ class Date
 	  :emit_a, :emit_ad, :emit_au
 
   def strftime(fmt='%F')
-    fmt.gsub(/%([-_0^#]+)?(\d+)?[EO]?(:{1,3}z|.)/m) do |m|
+    fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
       f = {}
+      m = $&
       s, w, c = $1, $2, $3
       if s
 	s.scan(/./) do |k|
@@ -220,11 +236,11 @@ class Date
       when 'a'; emit_ad(ABBR_DAYNAMES[wday], 0, f)
       when 'B'; emit_ad(MONTHNAMES[mon], 0, f)
       when 'b'; emit_ad(ABBR_MONTHNAMES[mon], 0, f)
-      when 'C'; emit_sn((year / 100).floor, 2, f)
-      when 'c'; emit_a(strftime('%a %b %e %H:%M:%S %Y'), 0, f)
+      when 'C', 'EC'; emit_sn((year / 100).floor, 2, f)
+      when 'c', 'Ec'; emit_a(strftime('%a %b %e %H:%M:%S %Y'), 0, f)
       when 'D'; emit_a(strftime('%m/%d/%y'), 0, f)
-      when 'd'; emit_n(mday, 2, f)
-      when 'e'; emit_a(mday, 2, f)
+      when 'd', 'Od'; emit_n(mday, 2, f)
+      when 'e', 'Oe'; emit_a(mday, 2, f)
       when 'F'
 	if m == '%F'
 	  format('%.4d-%02d-%02d', year, mon, mday) # 4p
@@ -233,31 +249,35 @@ class Date
 	end
       when 'G'; emit_sn(cwyear, 4, f)
       when 'g'; emit_n(cwyear % 100, 2, f)
-      when 'H'; emit_n(hour, 2, f)
+      when 'H', 'OH'; emit_n(hour, 2, f)
       when 'h'; emit_ad(strftime('%b'), 0, f)
-      when 'I'; emit_n((hour % 12).nonzero? || 12, 2, f)
+      when 'I', 'OI'; emit_n((hour % 12).nonzero? || 12, 2, f)
       when 'j'; emit_n(yday, 3, f)
       when 'k'; emit_a(hour, 2, f)
       when 'L'
-	emit_n((sec_fraction / (1.to_r/86400/(10**3))).round, 3, f)
+	f[:p] = nil
+	w = f[:w] || 3
+	u = 10**w
+	emit_n((sec_fraction * u).floor, w, f)
       when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
-      when 'M'; emit_n(min, 2, f)
-      when 'm'; emit_n(mon, 2, f)
+      when 'M', 'OM'; emit_n(min, 2, f)
+      when 'm', 'Om'; emit_n(mon, 2, f)
       when 'N'
-	emit_n((sec_fraction / (1.to_r/86400/(10**9))).round, 9, f)
-      when 'n'; "\n"
+	f[:p] = nil
+	w = f[:w] || 9
+	u = 10**w
+	emit_n((sec_fraction * u).floor, w, f)
+      when 'n'; emit_a("\n", 0, f)
       when 'P'; emit_ad(strftime('%p').downcase, 0, f)
       when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)
       when 'Q'
-	d = ajd - self.class.jd_to_ajd(self.class::UNIXEPOCH, 0)
-	s = (d * 86400*10**3).to_i
+	s = ((ajd - UNIX_EPOCH_IN_AJD) / MILLISECONDS_IN_DAY).round
 	emit_sn(s, 1, f)
       when 'R'; emit_a(strftime('%H:%M'), 0, f)
       when 'r'; emit_a(strftime('%I:%M:%S %p'), 0, f)
-      when 'S'; emit_n(sec, 2, f)
+      when 'S', 'OS'; emit_n(sec, 2, f)
       when 's'
-	d = ajd - self.class.jd_to_ajd(self.class::UNIXEPOCH, 0)
-	s = (d * 86400).to_i
+	s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
 	emit_sn(s, 1, f)
       when 'T'
 	if m == '%T'
@@ -265,25 +285,25 @@ class Date
 	else
 	  emit_a(strftime('%H:%M:%S'), 0, f)
 	end
-      when 't'; "\t"
-      when 'U', 'W'
-	emit_n(if c == 'U' then wnum0 else wnum1 end, 2, f)
-      when 'u'; emit_n(cwday, 1, f)
-      when 'V'; emit_n(cweek, 2, f)
+      when 't'; emit_a("\t", 0, f)
+      when 'U', 'W', 'OU', 'OW'
+	emit_n(if c[-1,1] == 'U' then wnum0 else wnum1 end, 2, f)
+      when 'u', 'Ou'; emit_n(cwday, 1, f)
+      when 'V', 'OV'; emit_n(cweek, 2, f)
       when 'v'; emit_a(strftime('%e-%b-%Y'), 0, f)
-      when 'w'; emit_n(wday, 1, f)
-      when 'X'; emit_a(strftime('%H:%M:%S'), 0, f)
-      when 'x'; emit_a(strftime('%m/%d/%y'), 0, f)
-      when 'Y'; emit_sn(year, 4, f)
-      when 'y'; emit_n(year % 100, 2, f)
+      when 'w', 'Ow'; emit_n(wday, 1, f)
+      when 'X', 'EX'; emit_a(strftime('%H:%M:%S'), 0, f)
+      when 'x', 'Ex'; emit_a(strftime('%m/%d/%y'), 0, f)
+      when 'Y', 'EY'; emit_sn(year, 4, f)
+      when 'y', 'Ey', 'Oy'; emit_n(year % 100, 2, f)
       when 'Z'; emit_au(strftime('%:z'), 0, f)
       when /\A(:{0,3})z/
 	t = $1.size
 	sign = if offset < 0 then -1 else +1 end
 	fr = offset.abs
-	hh, fr = fr.divmod(1.to_r/24)
-	mm, fr = fr.divmod(1.to_r/1440)
-	ss, fr = fr.divmod(1.to_r/86400)
+	ss = fr.div(SECONDS_IN_DAY) # 4p
+	hh, ss = ss.divmod(3600)
+	mm, ss = ss.divmod(60)
 	if t == 3
 	  if    ss.nonzero? then t =  2
 	  elsif mm.nonzero? then t =  1
@@ -310,23 +330,8 @@ class Date
 	([emit_z(sign * hh, 2, f)] + tail).join(sep)
       when '%'; emit_a('%', 0, f)
       when '+'; emit_a(strftime('%a %b %e %H:%M:%S %Z %Y'), 0, f)
-      when '1'
-	if $VERBOSE
-	  warn("warning: strftime: %1 is deprecated; forget this")
-	end
-	emit_n(jd, 1, f)
-      when '2'
-	if $VERBOSE
-	  warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
-	end
-	emit_a(strftime('%Y-%j'), 0, f)
-      when '3'
-	if $VERBOSE
-	  warn("warning: strftime: %3 is deprecated; use '%F'")
-	end
-	emit_a(strftime('%F'), 0, f)
       else
-	c
+	m
       end
     end
   end
@@ -337,15 +342,18 @@ class Date
 
   alias_method :ctime, :asctime
 
-=begin
   def iso8601() strftime('%F') end
 
   def rfc3339() iso8601 end
 
+  def xmlschema() iso8601 end # :nodoc:
+
   def rfc2822() strftime('%a, %-d %b %Y %T %z') end
 
   alias_method :rfc822, :rfc2822
 
+  def httpdate() new_offset(0).strftime('%a, %d %b %Y %T GMT') end # :nodoc:
+
   def jisx0301
     if jd < 2405160
       iso8601
@@ -364,13 +372,14 @@ class Date
     end
   end
 
+=begin
   def beat(n=0)
-    i, f = (new_offset(1.to_r/24).day_fraction * 1000).divmod(1)
+    i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
     ('@%03d' % i) +
       if n < 1
 	''
       else
-	'.%0*d' % [n, (f / (1.to_r/(10**n))).round]
+	'.%0*d' % [n, (f / Rational(1, 10**n)).round]
       end
   end
 =end
@@ -382,7 +391,8 @@ class Date
   private_class_method :num_pattern?
 
   def self._strptime_i(str, fmt, e) # :nodoc:
-    fmt.scan(/%[EO]?(:{1,3}z|.)|(.)/m) do |s, c|
+    fmt.scan(/%([EO]?(?::{1,3}z|.))|(.)/m) do |s, c|
+      a = $&
       if s
 	case s
 	when 'A', 'a'
@@ -397,18 +407,18 @@ class Date
 	  val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
 	  return unless val
 	  e.mon = val
-	when 'C'
+	when 'C', 'EC'
 	  return unless str.sub!(if num_pattern?($')
 				 then /\A([-+]?\d{1,2})/
 				 else /\A([-+]?\d{1,})/
 				 end, '')
 	  val = $1.to_i
 	  e._cent = val
-	when 'c'
+	when 'c', 'Ec'
 	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
 	when 'D'
 	  return unless _strptime_i(str, '%m/%d/%y', e)
-	when 'd', 'e'
+	when 'd', 'e', 'Od', 'Oe'
 	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (1..31) === val
@@ -428,12 +438,12 @@ class Date
 	  return unless (0..99) === val
 	  e.cwyear = val
 	  e._cent ||= if val >= 69 then 19 else 20 end
-	when 'H', 'k'
+	when 'H', 'k', 'OH'
 	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (0..24) === val
 	  e.hour = val
-	when 'I', 'l'
+	when 'I', 'l', 'OI'
 	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (1..12) === val
@@ -448,15 +458,15 @@ class Date
 				 then /\A([-+]?\d{1,3})/
 				 else /\A([-+]?\d{1,})/
 				 end, '')
-#	  val = $1.to_i.to_r / (10**3)
-	  val = $1.to_i.to_r / (10**$1.size)
+#	  val = Rational($1.to_i, 10**3)
+	  val = Rational($1.to_i, 10**$1.size)
 	  e.sec_fraction = val
-	when 'M'
+	when 'M', 'OM'
 	  return unless str.sub!(/\A(\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (0..59) === val
 	  e.min = val
-	when 'm'
+	when 'm', 'Om'
 	  return unless str.sub!(/\A(\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (1..12) === val
@@ -466,8 +476,8 @@ class Date
 				 then /\A([-+]?\d{1,9})/
 				 else /\A([-+]?\d{1,})/
 				 end, '')
-#	  val = $1.to_i.to_r / (10**9)
-	  val = $1.to_i.to_r / (10**$1.size)
+#	  val = Rational($1.to_i, 10**9)
+	  val = Rational($1.to_i, 10**$1.size)
 	  e.sec_fraction = val
 	when 'n', 't'
 	  return unless _strptime_i(str, "\s", e)
@@ -476,13 +486,13 @@ class Date
 	  e._merid = if $1.downcase == 'a' then 0 else 12 end
 	when 'Q'
 	  return unless str.sub!(/\A(-?\d{1,})/, '')
-	  val = $1.to_i.to_r / 10**3
+	  val = Rational($1.to_i, 10**3)
 	  e.seconds = val
 	when 'R'
 	  return unless _strptime_i(str, '%H:%M', e)
 	when 'r'
 	  return unless _strptime_i(str, '%I:%M:%S %p', e)
-	when 'S'
+	when 'S', 'OS'
 	  return unless str.sub!(/\A(\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (0..60) === val
@@ -493,17 +503,17 @@ class Date
 	  e.seconds = val
 	when 'T'
 	  return unless _strptime_i(str, '%H:%M:%S', e)
-	when 'U', 'W'
+	when 'U', 'W', 'OU', 'OW'
 	  return unless str.sub!(/\A(\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (0..53) === val
-	  e.__send__(if s == 'U' then :wnum0= else :wnum1= end, val)
-	when 'u'
+	  e.__send__(if s[-1,1] == 'U' then :wnum0= else :wnum1= end, val)
+	when 'u', 'Ou'
 	  return unless str.sub!(/\A(\d{1})/, '')
 	  val = $1.to_i
 	  return unless (1..7) === val
 	  e.cwday = val
-	when 'V'
+	when 'V', 'OV'
 	  return unless str.sub!(/\A(\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (1..53) === val
@@ -515,18 +525,18 @@ class Date
 	  val = $1.to_i
 	  return unless (0..6) === val
 	  e.wday = val
-	when 'X'
+	when 'X', 'EX'
 	  return unless _strptime_i(str, '%H:%M:%S', e)
-	when 'x'
+	when 'x', 'Ex'
 	  return unless _strptime_i(str, '%m/%d/%y', e)
-	when 'Y'
+	when 'Y', 'EY'
 	  return unless str.sub!(if num_pattern?($')
 				 then /\A([-+]?\d{1,4})/
 				 else /\A([-+]?\d{1,})/
 				 end, '')
 	  val = $1.to_i
 	  e.year = val
-	when 'y'
+	when 'y', 'Ey', 'Oy'
 	  return unless str.sub!(/\A(\d{1,2})/, '')
 	  val = $1.to_i
 	  return unless (0..99) === val
@@ -534,8 +544,8 @@ class Date
 	  e._cent ||= if val >= 69 then 19 else 20 end
 	when 'Z', /\A:{0,3}z/
 	  return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
-				    |[a-z.\s]+(?:standard|daylight)\s+time\b
-				    |[a-z]+(?:\s+dst)?\b
+				    |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
+				    |[[:alpha:]]+(?:\s+dst)?\b
 				    )/ix, '')
 	  val = $1
 	  e.zone = val
@@ -545,32 +555,15 @@ class Date
 	  return unless str.sub!(/\A%/, '')
 	when '+'
 	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
-	when '1'
-	  if $VERBOSE
-	    warn("warning: strptime: %1 is deprecated; forget this")
-	  end
-	  return unless str.sub!(/\A(\d+)/, '')
-	  val = $1.to_i
-	  e.jd = val
-	when '2'
-	  if $VERBOSE
-	    warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
-	  end
-	  return unless _strptime_i(str, '%Y-%j', e)
-	when '3'
-	  if $VERBOSE
-	    warn("warning: strptime: %3 is deprecated; use '%F'")
-	  end
-	  return unless _strptime_i(str, '%F', e)
 	else
-	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(s)), '')
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
 	end
       else
 	case c
-	when /\A[\s\v]/
-	  str.sub!(/\A[\s\v]+/, '')
+	when /\A\s/
+	  str.sub!(/\A\s+/, '')
 	else
-	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
 	end
       end
     end
@@ -579,8 +572,9 @@ class Date
   private_class_method :_strptime_i
 
   def self._strptime(str, fmt='%F')
+    str = str.dup
     e = Format::Bag.new
-    return unless _strptime_i(str.dup, fmt, e)
+    return unless _strptime_i(str, fmt, e)
 
     if e._cent
       if e.cwyear
@@ -598,6 +592,10 @@ class Date
       end
     end
 
+    unless str.empty?
+      e.leftover = str
+    end
+
     e.to_hash
   end
 
@@ -606,6 +604,10 @@ class Date
       m = m.to_s
     end
 
+    if y && m && !d
+      y, m, d = d, y, m
+    end
+
     if y == nil
       if d && d.size > 2
 	y = d
@@ -667,11 +669,11 @@ class Date
   private_class_method :s3e
 
   def self._parse_day(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/ino, ' ')
+    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/io, ' ')
       e.wday = Format::ABBR_DAYS[$1.downcase]
       true
 =begin
-    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/in, ' ')
+    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/i, ' ')
       e.wday = %w(su mo tu we th fr sa).index($1.downcase)
       true
 =end
@@ -701,12 +703,12 @@ class Date
 		   (
 		     (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
 		   |
-		     [a-z.\s]+(?:standard|daylight)\stime\b
+		     [[:alpha:].\s]+(?:standard|daylight)\stime\b
 		   |
-		     [a-z]+(?:\sdst)?\b
+		     [[:alpha:]]+(?:\sdst)?\b
 		   )
 		 )?
-		/inx,
+		/ix,
 		' ')
 
       t = $1
@@ -718,12 +720,12 @@ class Date
 		  \s*:?\s*(\d+)(?:[,.](\d+))?s?
 		)?
 	      )?
-	    (?:\s*([ap])(?:m\b|\.m\.))?/inx
+	    (?:\s*([ap])(?:m\b|\.m\.))?/ix
 
       e.hour = $1.to_i
       e.min = $2.to_i if $2
       e.sec = $3.to_i if $3
-      e.sec_fraction = $4.to_i.to_r / (10**$4.size) if $4
+      e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
 
       if $5
 	e.hour %= 12
@@ -735,11 +737,12 @@ class Date
     end
   end
 
+=begin
   def self._parse_beat(str, e) # :nodoc:
     if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ')
-      beat = $1.to_i.to_r
-      beat += $2.to_i.to_r / (10**$2.size) if $2
-      secs = beat.to_r / 1000
+      beat = Rational($1.to_i)
+      beat += Rational($2.to_i, 10**$2.size) if $2
+      secs = Rational(beat, 1000)
       h, min, s, fr = self.day_fraction_to_time(secs)
       e.hour = h
       e.min = min
@@ -749,6 +752,7 @@ class Date
       true
     end
   end
+=end
 
   def self._parse_eu(str, e) # :nodoc:
     if str.sub!(
@@ -761,7 +765,7 @@ class Date
 		   \s*
 		   ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
 		 )?
-		/inox,
+		/iox,
 		' ') # '
       s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
 	  $3 && $3[0,1].downcase == 'b')
@@ -780,7 +784,7 @@ class Date
 		   \s*
 		   ('?-?\d+)
 		 )?
-		/inox,
+		/iox,
 		' ') # '
       s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
 	  $3 && $3[0,1].downcase == 'b')
@@ -789,35 +793,43 @@ class Date
   end
 
   def self._parse_iso(str, e) # :nodoc:
-    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/n, ' ')
+    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/, ' ')
       s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_iso2(str, e) # :nodoc:
-    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d+))?/in, ' ')
+    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/i, ' ')
       e.cwyear = $1.to_i if $1
       e.cweek = $2.to_i
       e.cwday = $3.to_i if $3
       true
-    elsif str.sub!(/--(\d{2})-(\d{2})\b/n, ' ')
-      e.mon = $1.to_i
+    elsif str.sub!(/-w-(\d)\b/i, ' ')
+      e.cwday = $1.to_i
+      true
+    elsif str.sub!(/--(\d{2})?-(\d{2})\b/, ' ')
+      e.mon = $1.to_i if $1
       e.mday = $2.to_i
       true
-    elsif str.sub!(/\b(\d{2}|\d{4})-(\d{2,3})\b/n, ' ')
+    elsif str.sub!(/--(\d{2})(\d{2})?\b/, ' ')
+      e.mon = $1.to_i
+      e.mday = $2.to_i if $2
+      true
+    elsif /[,.](\d{2}|\d{4})-\d{3}\b/ !~ str &&
+	str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/, ' ')
       e.year = $1.to_i
-      if $2.size < 3
-	e.mon = $2.to_i
-      else
-	e.yday = $2.to_i
-      end
+      e.yday = $2.to_i
+      true
+    elsif /\d-\d{3}\b/ !~ str &&
+	str.sub!(/\b-(\d{3})\b/, ' ')
+      e.yday = $1.to_i
       true
     end
   end
 
   def self._parse_jis(str, e) # :nodoc:
-    if str.sub!(/\b([MTSH])(\d+)\.(\d+)\.(\d+)/in, ' ')
+    if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/i, ' ')
       era = { 'm'=>1867,
 	      't'=>1911,
 	      's'=>1925,
@@ -832,53 +844,46 @@ class Date
 
   def self._parse_vms(str, e) # :nodoc:
     if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-		-('?-?\d+)/inox, ' ')
+		-('?-?\d+)/iox, ' ')
       s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
       true
     elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-		-('?-?\d+)(?:-('?-?\d+))?/inox, ' ')
+		-('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
       s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
       true
     end
   end
 
-  def self._parse_sla_ja(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
+  def self._parse_sla(str, e) # :nodoc:
+    if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|, ' ') # '
       s3e(e, $1, $2, $3)
       true
     end
   end
 
-  def self._parse_sla_eu(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
-      s3e(e, $3, $2, $1)
-      true
-    end
-  end
-
-  def self._parse_sla_us(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
-      s3e(e, $3, $1, $2)
+  def self._parse_dot(str, e) # :nodoc:
+    if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|, ' ') # '
+      s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_year(str, e) # :nodoc:
-    if str.sub!(/'(\d+)\b/in, ' ')
+    if str.sub!(/'(\d+)\b/, ' ')
       e.year = $1.to_i
       true
     end
   end
 
   def self._parse_mon(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/ino, ' ')
+    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/io, ' ')
       e.mon = Format::ABBR_MONTHS[$1.downcase]
       true
     end
   end
 
   def self._parse_mday(str, e) # :nodoc:
-    if str.sub!(/(\d+)(st|nd|rd|th)\b/in, ' ')
+    if str.sub!(/(\d+)(st|nd|rd|th)\b/i, ' ')
       e.mday = $1.to_i
       true
     end
@@ -889,80 +894,147 @@ class Date
 		/([-+]?)(\d{2,14})
 		  (?:
 		    \s*
-		    T?
+		    t?
 		    \s*
-		    (\d{2,6})(?:[,.](\d*))?
+		    (\d{2,6})?(?:[,.](\d*))?
 		  )?
 		  (?:
 		    \s*
 		    (
-		      Z
+		      z\b
 		    |
-		      [-+]\d{1,4}
+		      [-+]\d{1,4}\b
+		    |
+		      \[[-+]?\d[^\]]*\]
 		    )
-		    \b
 		  )?
-		/inx,
+		/ix,
 		' ')
       case $2.size
       when 2
-	e.mday = $2[ 0, 2].to_i
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	else
+	  e.mday = $2[ 0, 2].to_i
+	end
       when 4
-	e.mon  = $2[ 0, 2].to_i
-	e.mday = $2[ 2, 2].to_i
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	else
+	  e.mon  = $2[ 0, 2].to_i
+	  e.mday = $2[ 2, 2].to_i
+	end
       when 6
-	e.year = ($1 + $2[ 0, 2]).to_i
-	e.mon  = $2[ 2, 2].to_i
-	e.mday = $2[ 4, 2].to_i
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-6, 2].to_i
+	else
+	  e.year = ($1 + $2[ 0, 2]).to_i
+	  e.mon  = $2[ 2, 2].to_i
+	  e.mday = $2[ 4, 2].to_i
+	end
       when 8, 10, 12, 14
-	e.year = ($1 + $2[ 0, 4]).to_i
-	e.mon  = $2[ 4, 2].to_i
-	e.mday = $2[ 6, 2].to_i
-	e.hour = $2[ 8, 2].to_i if $2.size >= 10
-	e.min  = $2[10, 2].to_i if $2.size >= 12
-	e.sec  = $2[12, 2].to_i if $2.size >= 14
-	e._comp = false
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-6, 2].to_i
+	  e.mday = $2[-8, 2].to_i
+	  if $2.size >= 10
+	    e.mon  = $2[-10, 2].to_i
+	  end
+	  if $2.size == 12
+	    e.year = ($1 + $2[-12, 2]).to_i
+	  end
+	  if $2.size == 14
+	    e.year = ($1 + $2[-14, 4]).to_i
+	    e._comp = false
+	  end
+	else
+	  e.year = ($1 + $2[ 0, 4]).to_i
+	  e.mon  = $2[ 4, 2].to_i
+	  e.mday = $2[ 6, 2].to_i
+	  e.hour = $2[ 8, 2].to_i if $2.size >= 10
+	  e.min  = $2[10, 2].to_i if $2.size >= 12
+	  e.sec  = $2[12, 2].to_i if $2.size >= 14
+	  e._comp = false
+	end
       when 3
-	e.yday = $2[ 0, 3].to_i
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-3, 1].to_i
+	else
+	  e.yday = $2[ 0, 3].to_i
+	end
       when 5
-	e.year = ($1 + $2[ 0, 2]).to_i
-	e.yday = $2[ 2, 3].to_i
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-5, 1].to_i
+	else
+	  e.year = ($1 + $2[ 0, 2]).to_i
+	  e.yday = $2[ 2, 3].to_i
+	end
       when 7
-	e.year = ($1 + $2[ 0, 4]).to_i
-	e.yday = $2[ 4, 3].to_i
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-6, 2].to_i
+	  e.mday = $2[-7, 1].to_i
+	else
+	  e.year = ($1 + $2[ 0, 4]).to_i
+	  e.yday = $2[ 4, 3].to_i
+	end
       end
       if $3
-	case $3.size
-	when 2, 4, 6
-	  e.hour = $3[ 0, 2].to_i
-	  e.min  = $3[ 2, 2].to_i if $3.size >= 4
-	  e.sec  = $3[ 4, 2].to_i if $3.size >= 6
+	if $4
+	  case $3.size
+	  when 2, 4, 6
+	    e.sec  = $3[-2, 2].to_i
+	    e.min  = $3[-4, 2].to_i if $3.size >= 4
+	    e.hour = $3[-6, 2].to_i if $3.size >= 6
+	  end
+	else
+	  case $3.size
+	  when 2, 4, 6
+	    e.hour = $3[ 0, 2].to_i
+	    e.min  = $3[ 2, 2].to_i if $3.size >= 4
+	    e.sec  = $3[ 4, 2].to_i if $3.size >= 6
+	  end
 	end
       end
       if $4
-	e.sec_fraction = $4.to_i.to_r / (10**$4.size)
+	e.sec_fraction = Rational($4.to_i, 10**$4.size)
       end
       if $5
 	e.zone = $5
+	if e.zone[0,1] == '['
+	  o, n, = e.zone[1..-2].split(':')
+	  e.zone = n || o
+	  if /\A\d/ =~ o
+	    o = format('+%s', o)
+	  end
+	  e.offset = zone_to_diff(o)
+	end
       end
       true
     end
   end
 
-  private_class_method :_parse_day, :_parse_time, :_parse_beat,
+  private_class_method :_parse_day, :_parse_time, # :_parse_beat,
 	:_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
-	:_parse_jis, :_parse_vms,
-	:_parse_sla_ja, :_parse_sla_eu, :_parse_sla_us,
+	:_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
 	:_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
 
-  def self._parse(str, comp=false)
+  def self._parse(str, comp=true)
     str = str.dup
 
     e = Format::Bag.new
 
     e._comp = comp
 
-    str.gsub!(/[^-+',.\/:0-9@a-z\x80-\xff]+/in, ' ')
+    str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
 
     _parse_time(str, e) # || _parse_beat(str, e)
     _parse_day(str, e)
@@ -972,20 +1044,21 @@ class Date
     _parse_iso(str, e)    ||
     _parse_jis(str, e)    ||
     _parse_vms(str, e)    ||
-    _parse_sla_us(str, e) ||
+    _parse_sla(str, e)    ||
+    _parse_dot(str, e)    ||
     _parse_iso2(str, e)   ||
     _parse_year(str, e)   ||
     _parse_mon(str, e)    ||
     _parse_mday(str, e)   ||
     _parse_ddd(str, e)
 
-    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/in, ' ')
+    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/i, ' ')
       if e.year
 	e.year = -e.year + 1
       end
     end
 
-    if str.sub!(/\A\s*(\d{1,2})\s*\z/n, ' ')
+    if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
       if e.hour && !e.mday
 	v = $1.to_i
 	if (1..31) === v
@@ -1000,12 +1073,17 @@ class Date
       end
     end
 
-    if e._comp and e.year
-      if e.year >= 0 and e.year <= 99
-	if e.year >= 69
-	  e.year += 1900
-	else
-	  e.year += 2000
+    if e._comp
+      if e.cwyear
+	if e.cwyear >= 0 && e.cwyear <= 99
+	  e.cwyear += if e.cwyear >= 69
+		      then 1900 else 2000 end
+	end
+      end
+      if e.year
+	if e.year >= 0 && e.year <= 99
+	  e.year += if e.year >= 69
+		    then 1900 else 2000 end
 	end
       end
     end
@@ -1015,40 +1093,187 @@ class Date
     e.to_hash
   end
 
-  def self.zone_to_diff(zone) # :nodoc:
-    zone = zone.downcase
-    if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
-      dst = $1 == 'daylight'
+  def self._iso8601(str) # :nodoc:
+    if /\A\s*(([-+]?\d{2,}|-)-\d{2}-\d{2}|
+	      ([-+]?\d{2,})?-\d{3}|
+	      (\d{2}|\d{4})?-w\d{2}-\d|
+	      -w-\d)
+	(t
+	\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    elsif /\A\s*(([-+]?(\d{2}|\d{4})|--)\d{2}\d{2}|
+	      ([-+]?(\d{2}|\d{4}))?\d{3}|-\d{3}|
+	      (\d{2}|\d{4})?w\d{2}\d)
+	(t?
+	\d{2}\d{2}(\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    elsif /\A\s*(\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    elsif /\A\s*(\d{2}\d{2}(\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    end
+  end
+
+  def self._rfc3339(str) # :nodoc:
+    if /\A\s*-?\d{4}-\d{2}-\d{2} # allow minus, anyway
+	(t|\s)
+	\d{2}:\d{2}:\d{2}(\.\d+)?
+	(z|[-+]\d{2}:\d{2})\s*\z/ix =~ str
+      _parse(str)
+    end
+  end
+
+  def self._xmlschema(str) # :nodoc:
+    if /\A\s*(-?\d{4,})(?:-(\d{2})(?:-(\d{2}))?)?
+	(?:t
+	  (\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+      e = Format::Bag.new
+      e.year = $1.to_i
+      e.mon = $2.to_i if $2
+      e.mday = $3.to_i if $3
+      e.hour = $4.to_i if $4
+      e.min = $5.to_i if $5
+      e.sec = $6.to_i if $6
+      e.sec_fraction = Rational($7.to_i, 10**$7.size) if $7
+      if $8
+	e.zone = $8
+	e.offset = zone_to_diff($8)
+      end
+      e.to_hash
+    elsif /\A\s*(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+      e = Format::Bag.new
+      e.hour = $1.to_i if $1
+      e.min = $2.to_i if $2
+      e.sec = $3.to_i if $3
+      e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
+      if $5
+	e.zone = $5
+	e.offset = zone_to_diff($5)
+      end
+      e.to_hash
+    elsif /\A\s*(?:--(\d{2})(?:-(\d{2}))?|---(\d{2}))
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+      e = Format::Bag.new
+      e.mon = $1.to_i if $1
+      e.mday = $2.to_i if $2
+      e.mday = $3.to_i if $3
+      if $4
+	e.zone = $4
+	e.offset = zone_to_diff($4)
+      end
+      e.to_hash
+    end
+  end
+
+  def self._rfc2822(str) # :nodoc:
+    if /\A\s*(?:(?:#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+)?
+	\d{1,2}\s+
+	(?:#{Format::ABBR_MONTHS.keys.join('|')})\s+
+	-?(\d{2,})\s+ # allow minus, anyway
+	\d{2}:\d{2}(:\d{2})?\s*
+	(?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/iox =~ str
+      e = _parse(str, false)
+      if $1.size < 4
+	if e[:year] < 50
+	  e[:year] += 2000
+	elsif e[:year] < 1000
+	  e[:year] += 1900
+	end
+      end
+      e
+    end
+  end
+
+  class << self; alias_method :_rfc822, :_rfc2822 end
+
+  def self._httpdate(str) # :nodoc:
+    if /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+
+	\d{2}\s+
+	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
+	-?\d{4}\s+ # allow minus, anyway
+	\d{2}:\d{2}:\d{2}\s+
+	gmt\s*\z/iox =~ str
+      _rfc2822(str)
+    elsif /\A\s*(#{Format::DAYS.keys.join('|')})\s*,\s+
+	\d{2}\s*-\s*
+	(#{Format::ABBR_MONTHS.keys.join('|')})\s*-\s*
+	\d{2}\s+
+	\d{2}:\d{2}:\d{2}\s+
+	gmt\s*\z/iox =~ str
+      _parse(str)
+    elsif /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s+
+	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
+	\d{1,2}\s+
+	\d{2}:\d{2}:\d{2}\s+
+	\d{4}\s*\z/iox =~ str
+      _parse(str)
+    end
+  end
+
+  def self._jisx0301(str) # :nodoc:
+    if /\A\s*[mtsh]?\d{2}\.\d{2}\.\d{2}
+	(t
+	(\d{2}:\d{2}(:\d{2}([,.]\d*)?)?
+	(z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/ix =~ str
+      if /\A\s*\d/ =~ str
+	_parse(str.sub(/\A\s*(\d)/, 'h\1'))
+      else
+	_parse(str)
+      end
     else
-      dst = zone.sub!(/\s+dst\z/, '')
+      _iso8601(str)
     end
-    if Format::ZONES.include?(zone)
-      offset = Format::ZONES[zone]
-      offset += 3600 if dst
-    elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
-      sign = $1
-      if zone.include?(':')
-	hour, min, sec, = zone.split(':')
-      elsif zone.include?(',') || zone.include?('.')
-	hour, fr, = zone.split(/[,.]/)
-	min = fr.to_i.to_r / (10**fr.size) * 60
+  end
+
+  t = Module.new do
+
+    private
+
+    def zone_to_diff(zone) # :nodoc:
+      zone = zone.downcase
+      if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
+	dst = $1 == 'daylight'
       else
-	case zone.size
-	when 3
-	  hour = zone[0,1]
-	  min = zone[1,2]
+	dst = zone.sub!(/\s+dst\z/, '')
+      end
+      if Format::ZONES.include?(zone)
+	offset = Format::ZONES[zone]
+	offset += 3600 if dst
+      elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
+	sign = $1
+	if zone.include?(':')
+	  hour, min, sec, = zone.split(':')
+	elsif zone.include?(',') || zone.include?('.')
+	  hour, fr, = zone.split(/[,.]/)
+	  min = Rational(fr.to_i, 10**fr.size) * 60
 	else
-	  hour = zone[0,2]
-	  min = zone[2,2]
-	  sec = zone[4,2]
+	  case zone.size
+	  when 3
+	    hour = zone[0,1]
+	    min = zone[1,2]
+	  else
+	    hour = zone[0,2]
+	    min = zone[2,2]
+	    sec = zone[4,2]
+	  end
 	end
+	offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+	offset *= -1 if sign == '-'
       end
-      offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
-      offset *= -1 if sign == '-'
+      offset
     end
-    offset
+
   end
 
+  extend  t
+  include t
+
 end
 
 class DateTime < Date
@@ -1061,13 +1286,12 @@ class DateTime < Date
     super(str, fmt)
   end
 
-=begin
   def iso8601_timediv(n) # :nodoc:
     strftime('T%T' +
 	     if n < 1
 	       ''
 	     else
-	       '.%0*d' % [n, (sec_fraction / (1.to_r/86400/(10**n))).round]
+	       '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
 	     end +
 	     '%:z')
   end
@@ -1080,9 +1304,10 @@ class DateTime < Date
 
   def rfc3339(n=0) iso8601(n) end
 
+  def xmlschema(n=0) iso8601(n) end # :nodoc:
+
   def jisx0301(n=0)
     super() + iso8601_timediv(n)
   end
-=end
 
 end
diff --git a/lib/date2.rb b/lib/date2.rb
deleted file mode 100644
index f7da78f650..0000000000
--- a/lib/date2.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# date2 was overridden by date.
-# To be precise, date was overridden by date2,
-# and date2 was renamed to date.
-
-require 'date'
diff --git a/lib/debug.rb b/lib/debug.rb
index 9ae119f8fb..5cbd7f7aab 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -2,6 +2,8 @@
 # Copyright (C) 2000  Information-technology Promotion Agency, Japan
 # Copyright (C) 2000-2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
+require 'continuation'
+
 if $SAFE > 0
   STDERR.print "-r debug.rb is not available in safe mode\n"
   exit 1
@@ -19,45 +21,6 @@ end
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 
 class DEBUGGER__
-class Mutex
-  def initialize
-    @locker = nil
-    @waiting = []
-    @locked = false;
-  end
-
-  def locked?
-    @locked
-  end
-
-  def lock
-    return if Thread.critical
-    return if @locker == Thread.current
-    while (Thread.critical = true; @locked)
-      @waiting.push Thread.current
-      Thread.stop
-    end
-    @locked = true
-    @locker = Thread.current
-    Thread.critical = false
-    self
-  end
-
-  def unlock
-    return if Thread.critical
-    return unless @locked
-    unless @locker == Thread.current
-      raise RuntimeError, "unlocked by other"
-    end
-    Thread.critical = true
-    t = @waiting.shift
-    @locked = false
-    @locker = nil
-    Thread.critical = false
-    t.run if t
-    self
-  end
-end
 MUTEX = Mutex.new
 
 class Context
@@ -118,13 +81,14 @@ class Context
   end
 
   def check_suspend
-    return if Thread.critical
-    while (Thread.critical = true; @suspend_next)
-      DEBUGGER__.waiting.push Thread.current
-      @suspend_next = false
-      Thread.stop
+    while MUTEX.synchronize {
+	if @suspend_next
+	  DEBUGGER__.waiting.push Thread.current
+	  @suspend_next = false
+	  true
+	end
+      }
     end
-    Thread.critical = false
   end
 
   def trace?
@@ -183,7 +147,7 @@ class Context
   def var_list(ary, binding)
     ary.sort!
     for v in ary
-      stdout.printf "  %s => %s\n", v, eval(v, binding).inspect
+      stdout.printf "  %s => %s\n", v, eval(v.to_s, binding).inspect
     end
   end
 
@@ -256,7 +220,7 @@ class Context
   def debug_command(file, line, id, binding)
     MUTEX.lock
     unless defined?($debugger_restart) and $debugger_restart
-      callcc{|c| $debugger_restart = c} 
+      callcc{|c| $debugger_restart = c}
     end
     set_last_thread(Thread.current)
     frame_pos = 0
@@ -333,9 +297,9 @@ class Context
 	  if break_points.find{|b| b[1] == 0}
 	    n = 1
 	    stdout.print "Breakpoints:\n"
-	    for b in break_points
+	    break_points.each do |b|
 	      if b[0] and b[1] == 0
-		stdout.printf "  %d %s:%s\n", n, b[2], b[3] 
+		stdout.printf "  %d %s:%s\n", n, b[2], b[3]
 	      end
 	      n += 1
 	    end
@@ -629,7 +593,6 @@ EOHELP
   def display_list(b, e, file, line)
     stdout.printf "[%d, %d] in %s\n", b, e, file
     if lines = SCRIPT_LINES__[file] and lines != true
-      n = 0
       b.upto(e) do |n|
 	if n > 0 && lines[n-1]
 	  if n == line
@@ -748,10 +711,7 @@ EOHELP
       end
       @frames.shift
 
-    when 'end'
-      @frames.shift
-
-    when 'raise' 
+    when 'raise'
       excn_handle(file, line, id, binding)
 
     end
@@ -790,13 +750,12 @@ class << DEBUGGER__
   end
 
   def set_trace( arg )
-    saved_crit = Thread.critical
-    Thread.critical = true
-    make_thread_list
-    for th, in @thread_list
-      context(th).set_trace arg
+    MUTEX.synchronize do
+      make_thread_list
+      for th, in @thread_list
+	context(th).set_trace arg
+      end
     end
-    Thread.critical = saved_crit
     arg
   end
 
@@ -805,31 +764,29 @@ class << DEBUGGER__
   end
 
   def suspend
-    saved_crit = Thread.critical
-    Thread.critical = true
-    make_thread_list
-    for th, in @thread_list
-      next if th == Thread.current
-      context(th).set_suspend
-    end
-    Thread.critical = saved_crit
+    MUTEX.synchronize do
+      make_thread_list
+      for th, in @thread_list
+	next if th == Thread.current
+	context(th).set_suspend
+      end
+    end
     # Schedule other threads to suspend as soon as possible.
-    Thread.pass unless Thread.critical
+    Thread.pass
   end
 
   def resume
-    saved_crit = Thread.critical
-    Thread.critical = true
-    make_thread_list
-    for th, in @thread_list
-      next if th == Thread.current
-      context(th).clear_suspend
-    end
-    waiting.each do |th|
-      th.run
-    end
-    waiting.clear
-    Thread.critical = saved_crit
+    MUTEX.synchronize do
+      make_thread_list
+      @thread_list.each do |th,|
+	next if th == Thread.current
+	context(th).clear_suspend
+      end
+      waiting.each do |th|
+	th.run
+      end
+      waiting.clear
+    end
     # Schedule other threads to restart as soon as possible.
     Thread.pass
   end
@@ -847,7 +804,7 @@ class << DEBUGGER__
   end
 
   def get_thread(num)
-    th = @thread_list.index(num)
+    th = @thread_list.key(num)
     unless th
       @stdout.print "No thread ##{num}\n"
       throw :debug_error
@@ -921,7 +878,7 @@ class << DEBUGGER__
 	@stdout.print "Already stopped.\n"
       else
 	thread_list(@thread_list[th])
-	context(th).suspend 
+	context(th).suspend
       end
 
     when /^resume\s+(\d+)/
@@ -941,6 +898,9 @@ end
 
 stdout.printf "Debug.rb\n"
 stdout.printf "Emacs support available.\n\n"
+RubyVM::InstructionSequence.compile_option = {
+  trace_instruction: true
+}
 set_trace_func proc { |event, file, line, id, binding, klass, *rest|
   DEBUGGER__.context.trace_func event, file, line, id, binding, klass
 }
diff --git a/lib/delegate.rb b/lib/delegate.rb
index d810ccad42..973b0a4b95 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -37,16 +37,16 @@
 #     def initialize
 #       @source = SimpleDelegator.new([])
 #     end
-#     
+#
 #     def stats( records )
 #       @source.__setobj__(records)
-#       	
+#
 #       "Elements:  #{@source.size}\n" +
 #       " Non-Nil:  #{@source.compact.size}\n" +
 #       "  Unique:  #{@source.uniq.size}\n"
 #     end
 #   end
-#   
+#
 #   s = Stats.new
 #   puts s.stats(%w{James Edward Gray II})
 #   puts
@@ -57,7 +57,7 @@
 #   Elements:  4
 #    Non-Nil:  4
 #     Unique:  4
-# 
+#
 #   Elements:  8
 #    Non-Nil:  7
 #     Unique:  6
@@ -72,19 +72,19 @@
 #
 #   class Tempfile < DelegateClass(File)
 #     # constant and class member data initialization...
-#   
+#
 #     def initialize(basename, tmpdir=Dir::tmpdir)
 #       # build up file path/name in var tmpname...
-#     
+#
 #       @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600)
-#     
+#
 #       # ...
-#     
+#
 #       super(@tmpfile)
-#     
+#
 #       # below this point, all methods of File are supported...
 #     end
-#   
+#
 #     # ...
 #   end
 #
@@ -95,17 +95,17 @@
 #    class SimpleDelegator < Delegator
 #      def initialize(obj)
 #        super             # pass obj to Delegator constructor, required
-#        @_sd_obj = obj    # store obj for future use
+#        @delegate_sd_obj = obj    # store obj for future use
 #      end
-# 
+#
 #      def __getobj__
-#        @_sd_obj          # return object we are delegating to, required
+#        @delegate_sd_obj          # return object we are delegating to, required
 #      end
-# 
+#
 #      def __setobj__(obj)
-#        @_sd_obj = obj    # change delegation object, a feature we're providing
+#        @delegate_sd_obj = obj    # change delegation object, a feature we're providing
 #      end
-# 
+#
 #      # ...
 #    end
 
@@ -114,59 +114,98 @@
 # subclasses.  Subclasses should redefine \_\_getobj\_\_.  For a concrete
 # implementation, see SimpleDelegator.
 #
-class Delegator
+class Delegator < BasicObject
+  kernel = ::Kernel.dup
+  kernel.class_eval do
+    [:to_s,:inspect,:=~,:!~,:===,:<=>,:eql?,:hash].each do |m|
+      undef_method m
+    end
+  end
+  include kernel
+
+  # :stopdoc:
+  def self.const_missing(n)
+    ::Object.const_get(n)
+  end
+  # :startdoc:
 
   #
   # Pass in the _obj_ to delegate method calls to.  All methods supported by
   # _obj_ will be delegated to.
   #
   def initialize(obj)
-    preserved = ::Kernel.public_instance_methods(false)
-    preserved -= ["to_s","to_a","inspect","==","=~","==="]
-    for t in self.class.ancestors
-      preserved |= t.public_instance_methods(false)
-      preserved |= t.private_instance_methods(false)
-      preserved |= t.protected_instance_methods(false)
-      break if t == Delegator
-    end
-    preserved << "singleton_method_added"
-    for method in obj.methods
-      next if preserved.include? method
-      begin
-	eval <<-EOS
-	  def self.#{method}(*args, &block)
-	    begin
-	      __getobj__.__send__(:#{method}, *args, &block)
-	    rescue Exception
-	      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
-	      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
-	      Kernel::raise
-	    end
-	  end
-	EOS
-      rescue SyntaxError
-        raise NameError, "invalid identifier %s" % method, caller(4)
-      end
-    end
+    __setobj__(obj)
   end
-  alias initialize_methods initialize
 
+  #
   # Handles the magic of delegation through \_\_getobj\_\_.
-  def method_missing(m, *args)
+  #
+  def method_missing(m, *args, &block)
     target = self.__getobj__
-    unless target.respond_to?(m)
-      super(m, *args)
+    begin
+      target.respond_to?(m) ? target.__send__(m, *args, &block) : super(m, *args, &block)
+    ensure
+      $@.delete_if {|t| %r"\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:"o =~ t} if $@
     end
-    target.__send__(m, *args)
   end
 
-  # 
-  # Checks for a method provided by this the delegate object by fowarding the 
+  #
+  # Checks for a method provided by this the delegate object by forwarding the
   # call through \_\_getobj\_\_.
-  # 
-  def respond_to?(m)
-    return true if super
-    return self.__getobj__.respond_to?(m)
+  #
+  def respond_to_missing?(m, include_private)
+    r = self.__getobj__.respond_to?(m, include_private)
+    if r && include_private && !self.__getobj__.respond_to?(m, false)
+      warn "#{caller(3)[0]}: delegator does not forward private method \##{m}"
+      return false
+    end
+    r
+  end
+
+  #
+  # Returns the methods available to this delegate object as the union
+  # of this object's and \_\_getobj\_\_ methods.
+  #
+  def methods
+    __getobj__.methods | super
+  end
+
+  #
+  # Returns the methods available to this delegate object as the union
+  # of this object's and \_\_getobj\_\_ public methods.
+  #
+  def public_methods(all=true)
+    __getobj__.public_methods(all) | super
+  end
+
+  #
+  # Returns the methods available to this delegate object as the union
+  # of this object's and \_\_getobj\_\_ protected methods.
+  #
+  def protected_methods(all=true)
+    __getobj__.protected_methods(all) | super
+  end
+
+  # Note: no need to specialize private_methods, since they are not forwarded
+
+  #
+  # Returns true if two objects are considered of equal value.
+  #
+  def ==(obj)
+    return true if obj.equal?(self)
+    self.__getobj__ == obj
+  end
+
+  #
+  # Returns true if two objects are not considered of equal value.
+  #
+  def !=(obj)
+    return false if obj.equal?(self)
+    __getobj__ != obj
+  end
+
+  def !
+    !__getobj__
   end
 
   #
@@ -177,14 +216,85 @@ class Delegator
     raise NotImplementedError, "need to define `__getobj__'"
   end
 
+  #
+  # This method must be overridden by subclasses and change the object delegate
+  # to _obj_.
+  #
+  def __setobj__(obj)
+    raise NotImplementedError, "need to define `__setobj__'"
+  end
+
+  #
   # Serialization support for the object returned by \_\_getobj\_\_.
+  #
   def marshal_dump
-    __getobj__
+    ivars = instance_variables.reject {|var| /\A@delegate_/ =~ var}
+    [
+      :__v2__,
+      ivars, ivars.map{|var| instance_variable_get(var)},
+      __getobj__
+    ]
   end
+
+  #
   # Reinitializes delegation from a serialized object.
-  def marshal_load(obj)
-    initialize_methods(obj)
-    __setobj__(obj)
+  #
+  def marshal_load(data)
+    version, vars, values, obj = data
+    if version == :__v2__
+      vars.each_with_index{|var, i| instance_variable_set(var, values[i])}
+      __setobj__(obj)
+    else
+      __setobj__(data)
+    end
+  end
+
+  def initialize_clone(obj) # :nodoc:
+    self.__setobj__(obj.__getobj__.clone)
+  end
+  def initialize_dup(obj) # :nodoc:
+    self.__setobj__(obj.__getobj__.dup)
+  end
+  private :initialize_clone, :initialize_dup
+
+  ##
+  # :method: trust
+  # Trust both the object returned by \_\_getobj\_\_ and self.
+  #
+
+  ##
+  # :method: untrust
+  # Untrust both the object returned by \_\_getobj\_\_ and self.
+  #
+
+  ##
+  # :method: taint
+  # Taint both the object returned by \_\_getobj\_\_ and self.
+  #
+
+  ##
+  # :method: untaint
+  # Untaint both the object returned by \_\_getobj\_\_ and self.
+  #
+
+  [:trust, :untrust, :taint, :untaint].each do |method|
+    define_method method do
+      __getobj__.send(method)
+      super()
+    end
+  end
+
+  #
+  # Freeze self and target at once.
+  #
+  def freeze
+    __getobj__.freeze
+    super
+  end
+
+  @delegator_api = self.public_instance_methods
+  def self.public_api   # :nodoc:
+    @delegator_api
   end
 end
 
@@ -195,16 +305,9 @@ end
 # \_\_setobj\_\_ .
 #
 class SimpleDelegator<Delegator
-
-  # Pass in the _obj_ you would like to delegate method calls to.
-  def initialize(obj)
-    super
-    @_sd_obj = obj
-  end
-
   # Returns the current object method calls are being delegated to.
   def __getobj__
-    @_sd_obj
+    @delegate_sd_obj
   end
 
   #
@@ -223,25 +326,21 @@ class SimpleDelegator<Delegator
   #
   def __setobj__(obj)
     raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
-    @_sd_obj = obj
-  end
-
-  # Clone support for the object returned by \_\_getobj\_\_.
-  def clone
-    super
-    __setobj__(__getobj__.clone)
-  end
-  # Duplication support for the object returned by \_\_getobj\_\_.
-  def dup(obj)
-    super
-    __setobj__(__getobj__.dup)
+    @delegate_sd_obj = obj
   end
 end
 
 # :stopdoc:
-# backward compatibility ^_^;;;
-Delegater = Delegator
-SimpleDelegater = SimpleDelegator
+def Delegator.delegating_block(mid)
+  lambda do |*args, &block|
+    target = self.__getobj__
+    begin
+      target.__send__(mid, *args, &block)
+    ensure
+      $@.delete_if {|t| /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o =~ t} if $@
+    end
+  end
+end
 # :startdoc:
 
 #
@@ -249,62 +348,34 @@ SimpleDelegater = SimpleDelegator
 # your class.
 #
 #   class MyClass < DelegateClass( ClassToDelegateTo )    # Step 1
-#     def initiaize
+#     def initialize
 #       super(obj_of_ClassToDelegateTo)                   # Step 2
 #     end
 #   end
 #
 def DelegateClass(superclass)
-  klass = Class.new
-  methods = superclass.public_instance_methods(true)
-  methods -= ::Kernel.public_instance_methods(false)
-  methods |= ["to_s","to_a","inspect","==","=~","==="]
-  klass.module_eval {
-    def initialize(obj)  # :nodoc:
-      @_dc_obj = obj
-    end
-    def method_missing(m, *args)  # :nodoc:
-      unless @_dc_obj.respond_to?(m)
-        super(m, *args)
-      end
-      @_dc_obj.__send__(m, *args)
-    end
-    def respond_to?(m)  # :nodoc:
-      return true if super
-      return @_dc_obj.respond_to?(m)
-    end
+  klass = Class.new(Delegator)
+  methods = superclass.instance_methods
+  methods -= ::Delegator.public_api
+  methods -= [:to_s,:inspect,:=~,:!~,:===]
+  klass.module_eval do
     def __getobj__  # :nodoc:
-      @_dc_obj
+      @delegate_dc_obj
     end
     def __setobj__(obj)  # :nodoc:
       raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
-      @_dc_obj = obj
+      @delegate_dc_obj = obj
     end
-    def clone  # :nodoc:
-      super
-      __setobj__(__getobj__.clone)
-    end
-    def dup  # :nodoc:
-      super
-      __setobj__(__getobj__.dup)
-    end
-  }
-  for method in methods
-    begin
-      klass.module_eval <<-EOS
-        def #{method}(*args, &block)
-	  begin
-	    @_dc_obj.__send__(:#{method}, *args, &block)
-	  rescue
-	    $@[0,2] = nil
-	    raise
-	  end
-	end
-      EOS
-    rescue SyntaxError
-      raise NameError, "invalid identifier %s" % method, caller(3)
+    methods.each do |method|
+      define_method(method, Delegator.delegating_block(method))
     end
   end
+  klass.define_singleton_method :public_instance_methods do |all=true|
+    super(all) - superclass.protected_instance_methods
+  end
+  klass.define_singleton_method :protected_instance_methods do |all=true|
+    super(all) | superclass.protected_instance_methods
+  end
   return klass
 end
 
@@ -321,15 +392,23 @@ if __FILE__ == $0
   p ary.class
   ary.push 25
   p ary
+  ary.push 42
+  ary.each {|x| p x}
 
   foo = Object.new
   def foo.test
     25
   end
+  def foo.iter
+    yield self
+  end
   def foo.error
     raise 'this is OK'
   end
   foo2 = SimpleDelegator.new(foo)
+  p foo2
+  foo2.instance_eval{print "foo\n"}
   p foo.test == foo2.test	# => true
+  p foo2.iter{[55,true]}        # => true
   foo2.error			# raise error!
 end
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 25fbb3f788..8970f35648 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -18,7 +18,7 @@
 #
 # The Ruby standard library contains the core classes of the dRuby package.
 # However, the full package also includes access control lists and the
-# Rinda tuple-space distributed task management system, as well as a 
+# Rinda tuple-space distributed task management system, as well as a
 # large number of samples.  The full dRuby package can be downloaded from
 # the dRuby home page (see *References*).
 #
@@ -121,7 +121,7 @@ require 'drb/eq'
 # are forwarded to the local object, as described in the discussion of
 # DRbObjects.  This has semantics similar to the normal Ruby
 # pass-by-reference.
-# 
+#
 # The easiest way to signal that we want an otherwise marshallable
 # object to be passed or returned as a DRbObject reference, rather
 # than marshalled and sent as a copy, is to include the
@@ -135,7 +135,7 @@ require 'drb/eq'
 # passed back to the remote execution context to be collected, before
 # the collected values are finally returned to the local context as
 # the return value of the method invocation.
-# 
+#
 # == Examples of usage
 #
 # For more dRuby samples, see the +samples+ directory in the full
@@ -148,33 +148,33 @@ require 'drb/eq'
 # starting the server code first.
 #
 # ==== Server code
-#    
+#
 #   require 'drb/drb'
-#     
+#
 #   # The URI for the server to connect to
-#   URI="druby://localhost:8787" 
-#     
+#   URI="druby://localhost:8787"
+#
 #   class TimeServer
-#     
+#
 #     def get_current_time
 #       return Time.now
 #     end
-#     
+#
 #   end
-#     
+#
 #   # The object that handles requests on the server
 #   FRONT_OBJECT=TimeServer.new
 #
 #   $SAFE = 1   # disable eval() and friends
-#   
+#
 #   DRb.start_service(URI, FRONT_OBJECT)
 #   # Wait for the drb server thread to finish before exiting.
 #   DRb.thread.join
 #
 # ==== Client code
-#     
+#
 #   require 'drb/drb'
-#   
+#
 #   # The URI to connect to
 #   SERVER_URI="druby://localhost:8787"
 #
@@ -184,43 +184,43 @@ require 'drb/eq'
 #   # as soon as we pass a non-marshallable object as an argument
 #   # to a dRuby call.
 #   DRb.start_service
-#   
+#
 #   timeserver = DRbObject.new_with_uri(SERVER_URI)
-#   puts timeserver.get_current_time 
+#   puts timeserver.get_current_time
 #
 # === Remote objects under dRuby
 #
 # This example illustrates returning a reference to an object
 # from a dRuby call.  The Logger instances live in the server
 # process.  References to them are returned to the client process,
-# where methods can be invoked upon them.  These methods are 
+# where methods can be invoked upon them.  These methods are
 # executed in the server process.
 #
 # ==== Server code
-#   
+#
 #   require 'drb/drb'
-#   
+#
 #   URI="druby://localhost:8787"
-#   
+#
 #   class Logger
 #
 #       # Make dRuby send Logger instances as dRuby references,
 #       # not copies.
 #       include DRb::DRbUndumped
-#   
+#
 #       def initialize(n, fname)
 #           @name = n
 #           @filename = fname
 #       end
-#   
+#
 #       def log(message)
 #           File.open(@filename, "a") do |f|
 #               f.puts("#{Time.now}: #{@name}: #{message}")
 #           end
 #       end
-#   
+#
 #   end
-#   
+#
 #   # We have a central object for creating and retrieving loggers.
 #   # This retains a local reference to all loggers created.  This
 #   # is so an existing logger can be looked up by name, but also
@@ -228,12 +228,12 @@ require 'drb/eq'
 #   # reference to an object is not sufficient to prevent it being
 #   # garbage collected!
 #   class LoggerFactory
-#   
+#
 #       def initialize(bdir)
 #           @basedir = bdir
 #           @loggers = {}
 #       end
-#   
+#
 #       def get_logger(name)
 #           if !@loggers.has_key? name
 #               # make the filename safe, then declare it to be so
@@ -242,34 +242,34 @@ require 'drb/eq'
 #           end
 #           return @loggers[name]
 #       end
-#   
+#
 #   end
-#   
+#
 #   FRONT_OBJECT=LoggerFactory.new("/tmp/dlog")
 #
 #   $SAFE = 1   # disable eval() and friends
-#   
+#
 #   DRb.start_service(URI, FRONT_OBJECT)
 #   DRb.thread.join
 #
 # ==== Client code
 #
 #   require 'drb/drb'
-#   
+#
 #   SERVER_URI="druby://localhost:8787"
 #
 #   DRb.start_service
-#   
+#
 #   log_service=DRbObject.new_with_uri(SERVER_URI)
-#   
+#
 #   ["loga", "logb", "logc"].each do |logname|
-#   
+#
 #       logger=log_service.get_logger(logname)
-#   
+#
 #       logger.log("Hello, world!")
 #       logger.log("Goodbye, world!")
 #       logger.log("=== EOT ===")
-#   
+#
 #   end
 #
 # == Security
@@ -288,9 +288,9 @@ require 'drb/eq'
 #    ro.instance_eval("`rm -rf *`")
 #
 # The dangers posed by instance_eval and friends are such that a
-# DRbServer should generally be run with $SAFE set to at least 
-# level 1.  This will disable eval() and related calls on strings 
-# passed across the wire.  The sample usage code given above follows 
+# DRbServer should generally be run with $SAFE set to at least
+# level 1.  This will disable eval() and related calls on strings
+# passed across the wire.  The sample usage code given above follows
 # this practice.
 #
 # A DRbServer can be configured with an access control list to
@@ -360,7 +360,7 @@ module DRb
   #
   # This, the default implementation, uses an object's local ObjectSpace
   # __id__ as its id.  This means that an object's identification over
-  # drb remains valid only while that object instance remains alive 
+  # drb remains valid only while that object instance remains alive
   # within the server runtime.
   #
   # For alternative mechanisms, see DRb::TimerIdConv in rdb/timeridconv.rb
@@ -374,7 +374,7 @@ module DRb
     def to_obj(ref)
       ObjectSpace._id2ref(ref)
     end
-    
+
     # Convert an object into a reference id.
     #
     # This implementation returns the object's __id__ in the local
@@ -390,7 +390,7 @@ module DRb
   # called over drb, then the object remains in the server space
   # and a reference to the object is returned, rather than the
   # object being marshalled and moved into the client space.
-  module DRbUndumped 
+  module DRbUndumped
     def _dump(dummy)  # :nodoc:
       raise TypeError, 'can\'t dump'
     end
@@ -424,7 +424,7 @@ module DRb
     def self._load(s)  # :nodoc:
       Marshal::load(s)
     end
-    
+
     def _dump(lv) # :nodoc:
       Marshal::dump(@unknown)
     end
@@ -456,11 +456,11 @@ module DRb
   # +name+ attribute.  The marshalled object is held in the +buf+
   # attribute.
   class DRbUnknown
-    
+
     # Create a new DRbUnknown object.
     #
     # +buf+ is a string containing a marshalled object that could not
-    # be unmarshalled.  +err+ is the error message that was raised 
+    # be unmarshalled.  +err+ is the error message that was raised
     # when the unmarshalling failed.  It is used to determine the
     # name of the unmarshalled object.
     def initialize(err, buf)
@@ -499,7 +499,7 @@ module DRb
     # Attempt to load the wrapped marshalled object again.
     #
     # If the class of the object is now known locally, the object
-    # will be unmarshalled and returned.  Otherwise, a new 
+    # will be unmarshalled and returned.  Otherwise, a new
     # but identical DRbUnknown object will be returned.
     def reload
       self.class._load(@buf)
@@ -513,7 +513,7 @@ module DRb
 
   class DRbArray
     def initialize(ary)
-      @ary = ary.collect { |obj| 
+      @ary = ary.collect { |obj|
 	if obj.kind_of? DRbUndumped
 	  DRbObject.new(obj)
 	else
@@ -578,7 +578,7 @@ module DRb
       end
       raise(DRbConnError, 'connection closed') if str.nil?
       raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
-      Thread.exclusive do
+      DRb.mutex.synchronize do
         begin
           save = Thread.current[:drb_untaint]
           Thread.current[:drb_untaint] = []
@@ -607,13 +607,13 @@ module DRb
     rescue
       raise(DRbConnError, $!.message, $!.backtrace)
     end
-    
+
     def recv_request(stream) # :nodoc:
       ref = load(stream)
       ro = DRb.to_obj(ref)
       msg = load(stream)
       argc = load(stream)
-      raise ArgumentError, 'too many arguments' if @argc_limit < argc
+      raise(DRbConnError, "too many arguments") if @argc_limit < argc
       argv = Array.new(argc, nil)
       argc.times do |n|
 	argv[n] = load(stream)
@@ -656,10 +656,10 @@ module DRb
   #                              using configuration +config+.  Return a
   #                              protocol instance for this listener.
   #   [uri_option(uri, config)] Take a URI, possibly containing an option
-  #                             component (e.g. a trailing '?param=val'), 
+  #                             component (e.g. a trailing '?param=val'),
   #                             and return a [uri, option] tuple.
   #
-  # All of these methods should raise a DRbBadScheme error if the URI 
+  # All of these methods should raise a DRbBadScheme error if the URI
   # does not identify the protocol they support (e.g. "druby:" for
   # the standard Ruby protocol).  This is how the DRbProtocol module,
   # given a URI, determines which protocol implementation serves that
@@ -675,14 +675,14 @@ module DRb
   #
   # The protocol instance returned by #open must have the following methods:
   #
-  # [send_request (ref, msg_id, arg, b)] 
+  # [send_request (ref, msg_id, arg, b)]
   #      Send a request to +ref+ with the given message id and arguments.
   #      This is most easily implemented by calling DRbMessage.send_request,
   #      providing a stream that sits on top of the current protocol.
   # [recv_reply]
   #      Receive a reply from the server and return it as a [success-boolean,
   #      reply-value] pair.  This is most easily implemented by calling
-  #      DRb.recv_reply, providing a stream that sits on top of the 
+  #      DRb.recv_reply, providing a stream that sits on top of the
   #      current protocol.
   # [alive?]
   #      Is this connection still alive?
@@ -725,7 +725,7 @@ module DRb
     # URI by raising a DRbBadScheme error.  If no protocol recognises the
     # URI, then a DRbBadURI error is raised.  If a protocol accepts the
     # URI, but an error occurs in opening it, a DRbConnError is raised.
-    def open(uri, config, first=true) 
+    def open(uri, config, first=true)
       @protocol.each do |prot|
 	begin
 	  return prot.open(uri, config)
@@ -744,14 +744,14 @@ module DRb
     end
     module_function :open
 
-    # Open a server listening for connections at +uri+ with 
+    # Open a server listening for connections at +uri+ with
     # configuration +config+.
     #
     # The DRbProtocol module asks each registered protocol in turn to
-    # try to open a server at the URI.  Each protocol signals that it does 
-    # not handle that URI by raising a DRbBadScheme error.  If no protocol 
-    # recognises the URI, then a DRbBadURI error is raised.  If a protocol 
-    # accepts the URI, but an error occurs in opening it, the underlying 
+    # try to open a server at the URI.  Each protocol signals that it does
+    # not handle that URI by raising a DRbBadScheme error.  If no protocol
+    # recognises the URI, then a DRbBadURI error is raised.  If a protocol
+    # accepts the URI, but an error occurs in opening it, the underlying
     # error is passed on to the caller.
     def open_server(uri, config, first=true)
       @protocol.each do |prot|
@@ -773,7 +773,7 @@ module DRb
     # The DRbProtocol module asks each registered protocol in turn to
     # try to parse the URI.  Each protocol signals that it does not handle that
     # URI by raising a DRbBadScheme error.  If no protocol recognises the
-    # URI, then a DRbBadURI error is raised.  
+    # URI, then a DRbBadURI error is raised.
     def uri_option(uri, config, first=true)
       @protocol.each do |prot|
 	begin
@@ -837,27 +837,23 @@ module DRb
     end
 
     def self.open_server_inaddr_any(host, port)
-      infos = Socket::getaddrinfo(host, nil, 
+      infos = Socket::getaddrinfo(host, nil,
                                   Socket::AF_UNSPEC,
-                                  Socket::SOCK_STREAM, 
+                                  Socket::SOCK_STREAM,
                                   0,
                                   Socket::AI_PASSIVE)
-      family = infos.collect { |af, *_| af }.uniq
-      case family
-      when ['AF_INET']
-        return TCPServer.open('0.0.0.0', port)
-      when ['AF_INET6']
-        return TCPServer.open('::', port)
-      else
-        return TCPServer.open(port)
-      end
+      families = Hash[*infos.collect { |af, *_| af }.uniq.zip([]).flatten]
+      return TCPServer.open('0.0.0.0', port) if families.has_key?('AF_INET')
+      return TCPServer.open('::', port) if families.has_key?('AF_INET6')
+      return TCPServer.open(port)
     end
 
-    # Open a server listening for connections at +uri+ using 
+    # Open a server listening for connections at +uri+ using
     # configuration +config+.
     def self.open_server(uri, config)
       uri = 'druby://:0' unless uri
       host, port, opt = parse_uri(uri)
+      config = {:tcp_original_host => host}.update(config)
       if host.size == 0
         host = getservername
         soc = open_server_inaddr_any(host, port)
@@ -865,6 +861,7 @@ module DRb
 	soc = TCPServer.open(host, port)
       end
       port = soc.addr[1] if port == 0
+      config[:tcp_port] = port
       uri = "druby://#{host}:#{port}"
       self.new(uri, soc, config)
     end
@@ -897,7 +894,7 @@ module DRb
     def peeraddr
       @socket.peeraddr
     end
-    
+
     # Get the socket.
     def stream; @socket; end
 
@@ -905,7 +902,7 @@ module DRb
     def send_request(ref, msg_id, arg, b)
       @msg.send_request(stream, ref, msg_id, arg, b)
     end
-    
+
     # On the server side, receive a request from the client.
     def recv_request
       @msg.recv_request(stream)
@@ -935,17 +932,22 @@ module DRb
 	@socket = nil
       end
     end
-    
-    # On the server side, for an instance returned by #open_server, 
+
+    # On the server side, for an instance returned by #open_server,
     # accept a client connection and return a new instance to handle
     # the server's side of this client-server session.
     def accept
       while true
 	s = @socket.accept
-	break if (@acl ? @acl.allow_socket?(s) : true) 
+	break if (@acl ? @acl.allow_socket?(s) : true)
 	s.close
       end
-      self.class.new(nil, s, @config)
+      if @config[:tcp_original_host].to_s.size == 0
+        uri = "druby://#{s.addr[3]}:#{@config[:tcp_port]}"
+      else
+        uri = @uri
+      end
+      self.class.new(uri, s, @config)
     end
 
     # Check to see if this connection is alive.
@@ -974,16 +976,16 @@ module DRb
     end
     attr :option
     def to_s; @option; end
-    
+
     def ==(other)
       return false unless DRbURIOption === other
       @option == other.option
     end
-    
+
     def hash
       @option.hash
     end
-    
+
     alias eql? ==
   end
 
@@ -1000,7 +1002,7 @@ module DRb
     # created to act as a stub for the remote referenced object.
     def self._load(s)
       uri, ref = Marshal.load(s)
-      
+
       if DRb.here?(uri)
 	obj = DRb.to_obj(ref)
         if ((! obj.tainted?) && Thread.current[:drb_untaint])
@@ -1050,7 +1052,7 @@ module DRb
     end
 
     # Get the URI of the remote object.
-    def __drburi 
+    def __drburi
       @uri
     end
 
@@ -1078,7 +1080,7 @@ module DRb
       if DRb.here?(@uri)
 	obj = DRb.to_obj(@ref)
 	DRb.current_server.check_insecure_method(obj, msg_id)
-	return obj.__send__(msg_id, *a, &b) 
+	return obj.__send__(msg_id, *a, &b)
       end
 
       succ, result = self.class.with_friend(@uri) do
@@ -1101,7 +1103,7 @@ module DRb
     def self.with_friend(uri)
       friend = DRb.fetch_server(uri)
       return yield() unless friend
-      
+
       save = Thread.current['DRb']
       Thread.current['DRb'] = { 'server' => friend }
       return yield
@@ -1113,7 +1115,7 @@ module DRb
       prefix = "(#{uri}) "
       bt = []
       result.backtrace.each do |x|
-        break if /`__send__'$/ =~ x 
+        break if /`__send__'$/ =~ x
         if /^\(druby:\/\// =~ x
           bt.push(x)
         else
@@ -1201,6 +1203,7 @@ module DRb
     end
 
     def alive?  # :nodoc:
+      return false unless @protocol
       @protocol.alive?
     end
   end
@@ -1263,14 +1266,14 @@ module DRb
     def self.verbose=(on)
       @@verbose = on
     end
-    
+
     # Get the default value of the :verbose option.
     def self.verbose
       @@verbose
     end
 
     def self.make_config(hash={})  # :nodoc:
-      default_config = { 
+      default_config = {
 	:idconv => @@idconv,
 	:verbose => @@verbose,
 	:tcp_acl => @@acl,
@@ -1338,6 +1341,7 @@ module DRb
 
       @protocol = DRbProtocol.open_server(uri, @config)
       @uri = @protocol.uri
+      @exported_uri = [@uri]
 
       @front = front
       @idconv = @config[:idconv]
@@ -1360,7 +1364,7 @@ module DRb
     attr_reader :thread
 
     # The front object of the DRbServer.
-    # 
+    #
     # This object receives remote method calls made on the server's
     # URI alone, with an object id.
     attr_reader :front
@@ -1384,6 +1388,10 @@ module DRb
     def alive?
       @thread.alive?
     end
+    
+    def here?(uri)
+      @exported_uri.include?(uri)
+    end
 
     # Stop this server.
     def stop_service
@@ -1391,7 +1399,7 @@ module DRb
       if  Thread.current['DRb'] && Thread.current['DRb']['server'] == self
         Thread.current['DRb']['stop_service'] = true
       else
-        @thread.kill
+        @thread.kill.join
       end
     end
 
@@ -1453,7 +1461,7 @@ module DRb
     def any_to_s(obj)
       obj.to_s + ":#{obj.class}"
     rescue
-      sprintf("#<%s:0x%lx>", obj.class, obj.__id__)      
+      sprintf("#<%s:0x%lx>", obj.class, obj.__id__)
     end
 
     # Check that a method is callable via dRuby.
@@ -1461,18 +1469,18 @@ module DRb
     # +obj+ is the object we want to invoke the method on. +msg_id+ is the
     # method name, as a Symbol.
     #
-    # If the method is an insecure method (see #insecure_method?) a 
+    # If the method is an insecure method (see #insecure_method?) a
     # SecurityError is thrown.  If the method is private or undefined,
     # a NameError is thrown.
     def check_insecure_method(obj, msg_id)
       return true if Proc === obj && msg_id == :__drb_yield
       raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
       raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
-      
-      if obj.private_methods.include?(msg_id.to_s)
+
+      if obj.private_methods.include?(msg_id)
 	desc = any_to_s(obj)
         raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
-      elsif obj.protected_methods.include?(msg_id.to_s)
+      elsif obj.protected_methods.include?(msg_id)
 	desc = any_to_s(obj)
         raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
       else
@@ -1480,7 +1488,7 @@ module DRb
       end
     end
     public :check_insecure_method
-    
+
     class InvokeMethod  # :nodoc:
       def initialize(drb_server, client)
 	@drb_server = drb_server
@@ -1502,7 +1510,7 @@ module DRb
               perform_with_block
             }.value
           else
-            @result = Thread.new { 
+            @result = Thread.new {
               Thread.current['DRb'] = info
               $SAFE = @safe_level
               perform_without_block
@@ -1517,7 +1525,7 @@ module DRb
         end
 	@succ = true
 	if @msg_id == :to_ary && @result.class == Array
-	  @result = DRbArray.new(@result) 
+	  @result = DRbArray.new(@result)
 	end
 	return @succ, @result
       rescue StandardError, ScriptError, Interrupt
@@ -1533,7 +1541,7 @@ module DRb
         @argv = argv
         @block = block
       end
-      
+
       def check_insecure_method
         @drb_server.check_insecure_method(@obj, @msg_id)
       end
@@ -1542,7 +1550,7 @@ module DRb
 	init_with_client
 	check_insecure_method
       end
-      
+
       def perform_without_block
 	if Proc === @obj && @msg_id == :__drb_yield
           if @argv.size == 1
@@ -1582,6 +1590,10 @@ module DRb
 	@grp.add Thread.current
 	Thread.current['DRb'] = { 'client' => client ,
 	                          'server' => self }
+        DRb.mutex.synchronize do
+          client_uri = client.uri
+          @exported_uri << client_uri unless @exported_uri.include?(client_uri)
+        end
 	loop do
 	  begin
 	    succ = false
@@ -1630,7 +1642,7 @@ module DRb
 
   # The primary local dRuby server.
   #
-  # This is the server created by the #start_service call.  
+  # This is the server created by the #start_service call.
   attr_accessor :primary_server
   module_function :primary_server=, :primary_server
 
@@ -1645,8 +1657,8 @@ module DRb
   # If the above rule fails to find a server, a DRbServerNotFound
   # error is raised.
   def current_server
-    drb = Thread.current['DRb'] 
-    server = (drb && drb['server']) ? drb['server'] : @primary_server 
+    drb = Thread.current['DRb']
+    server = (drb && drb['server']) ? drb['server'] : @primary_server
     raise DRbServerNotFound unless server
     return server
   end
@@ -1666,13 +1678,20 @@ module DRb
   #
   # This is the URI of the current server.  See #current_server.
   def uri
+    drb = Thread.current['DRb']
+    client = (drb && drb['client'])
+    if client
+      uri = client.uri
+      return uri if uri
+    end
     current_server.uri
   end
   module_function :uri
 
   # Is +uri+ the URI for the current local server?
   def here?(uri)
-    (current_server.uri rescue nil) == uri
+    current_server.here?(uri) rescue false
+    # (current_server.uri rescue nil) == uri
   end
   module_function :here?
 
@@ -1686,7 +1705,7 @@ module DRb
     DRbServer.make_config
   end
   module_function :config
-  
+
   # Get the front object of the current server.
   #
   # This raises a DRbServerNotFound error if there is no current server.
@@ -1738,10 +1757,16 @@ module DRb
   end
   module_function :install_acl
 
+  @mutex = Mutex.new
+  def mutex
+    @mutex
+  end
+  module_function :mutex
+
   @server = {}
   def regist_server(server)
     @server[server.uri] = server
-    Thread.exclusive do
+    mutex.synchronize do
       @primary_server = server unless @primary_server
     end
   end
@@ -1751,7 +1776,7 @@ module DRb
     @server.delete(server.uri)
   end
   module_function :remove_server
-  
+
   def fetch_server(uri)
     @server[uri]
   end
diff --git a/lib/drb/eq.rb b/lib/drb/eq.rb
index e24512d6a7..6328c81202 100644
--- a/lib/drb/eq.rb
+++ b/lib/drb/eq.rb
@@ -1,5 +1,3 @@
-require 'drb/drb'
-
 module DRb
   class DRbObject
     def ==(other)
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
index 7da8130c2b..5996626492 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -1,19 +1,24 @@
 =begin
  external service
- 	Copyright (c) 2000,2002 Masatoshi SEKI 
+ 	Copyright (c) 2000,2002 Masatoshi SEKI
 =end
 
 require 'drb/drb'
+require 'monitor'
 
 module DRb
   class ExtServ
+    include MonitorMixin
     include DRbUndumped
 
     def initialize(there, name, server=nil)
+      super()
       @server = server || DRb::primary_server
       @name = name
       ro = DRbObject.new(nil, there)
-      @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
+      synchronize do
+        @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
+      end
     end
     attr_reader :server
 
@@ -22,11 +27,13 @@ module DRb
     end
 
     def stop_service
-      @invoker.unregist(@name)
-      server = @server
-      @server = nil
-      server.stop_service
-      true
+      synchronize do
+        @invoker.unregist(@name)
+        server = @server
+        @server = nil
+        server.stop_service
+        true
+      end
     end
 
     def alive?
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 7066f84c65..5937cb0c50 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -1,14 +1,16 @@
 =begin
  external service manager
- 	Copyright (c) 2000 Masatoshi SEKI 
+ 	Copyright (c) 2000 Masatoshi SEKI
 =end
 
 require 'drb/drb'
 require 'thread'
+require 'monitor'
 
 module DRb
   class ExtServManager
     include DRbUndumped
+    include MonitorMixin
 
     @@command = {}
 
@@ -19,8 +21,10 @@ module DRb
     def self.command=(cmd)
       @@command = cmd
     end
-      
+
     def initialize
+      super()
+      @cond = new_cond
       @servers = {}
       @waiting = []
       @queue = Queue.new
@@ -30,34 +34,26 @@ module DRb
     attr_accessor :uri
 
     def service(name)
-      while true
-	server = nil
-	Thread.exclusive do
-	  server = @servers[name] if @servers[name]
-	end
-	return server if server && server.alive?
-	invoke_service(name)
+      synchronize do
+        while true
+          server = @servers[name]
+          return server if server && server.alive?
+          invoke_service(name)
+          @cond.wait
+        end
       end
     end
 
     def regist(name, ro)
-      ary = nil
-      Thread.exclusive do
-	@servers[name] = ro
-	ary = @waiting
-	@waiting = []
-      end
-      ary.each do |th|
-	begin
-	  th.run
-	rescue ThreadError
-	end
+      synchronize do
+        @servers[name] = ro
+        @cond.signal
       end
       self
     end
-    
+
     def unregist(name)
-      Thread.exclusive do
+      synchronize do
 	@servers.delete(name)
       end
     end
@@ -73,24 +69,17 @@ module DRb
     end
 
     def invoke_service(name)
-      Thread.critical = true
-      @waiting.push Thread.current
-      @queue.push name
-      Thread.stop
+      @queue.push(name)
     end
 
     def invoke_service_command(name, command)
       raise "invalid command. name: #{name}" unless command
-      Thread.exclusive do
+      synchronize do
 	return if @servers.include?(name)
 	@servers[name] = false
       end
       uri = @uri || DRb.uri
-      if RUBY_PLATFORM =~ /mswin32/ && /NT/ =~ ENV["OS"]
-        system(%Q'cmd /c start "ruby" /b #{command} #{uri} #{name}')
-      else
-	system("#{command} #{uri} #{name} &")
-      end
+      Process.detach spawn("#{command} #{uri} #{name}")
     end
   end
 end
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
index 412b2ab9b5..220d0ad68d 100644
--- a/lib/drb/invokemethod.rb
+++ b/lib/drb/invokemethod.rb
@@ -9,7 +9,7 @@ module DRb
 	end
         block_value = @block.call(*x)
       end
-      
+
       def perform_with_block
         @obj.__send__(@msg_id, *@argv) do |*x|
           jump_error = nil
@@ -20,8 +20,6 @@ module DRb
           end
           if jump_error
             case jump_error.reason
-            when :retry
-              retry
             when :break
               break(jump_error.exit_value)
             else
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
index e7f1668c52..149426db7b 100644
--- a/lib/drb/observer.rb
+++ b/lib/drb/observer.rb
@@ -6,16 +6,16 @@ module DRb
 
     def notify_observers(*arg)
       if defined? @observer_state and @observer_state
-	if defined? @observer_peers
-	  for i in @observer_peers.dup
-	    begin
-	      i.update(*arg)
-	    rescue
-	      delete_observer(i)
-	    end
-	  end
-	end
-	@observer_state = false
+        if defined? @observer_peers
+          @observer_peers.each do |observer, method|
+            begin
+              observer.send(method, *arg)
+            rescue
+              delete_observer(observer)
+            end
+          end
+        end
+        @observer_state = false
       end
     end
   end
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 58d6b7d1e0..08f97f4bc6 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -15,7 +15,7 @@ module DRb
 	:SSLClientCA          => nil,
 	:SSLCACertificatePath => nil,
 	:SSLCACertificateFile => nil,
-	:SSLVerifyMode        => ::OpenSSL::SSL::VERIFY_NONE, 
+	:SSLVerifyMode        => ::OpenSSL::SSL::VERIFY_NONE,
 	:SSLVerifyDepth       => nil,
 	:SSLVerifyCallback    => nil,   # custom verification
         :SSLCertificateStore  => nil,
@@ -31,7 +31,7 @@ module DRb
         @ssl_ctx = nil
       end
 
-      def [](key); 
+      def [](key);
 	@config[key] || DEFAULT[key]
       end
 
@@ -41,14 +41,14 @@ module DRb
 	ssl.connect
 	ssl
       end
-      
+
       def accept(tcp)
 	ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
 	ssl.sync = true
 	ssl.accept
 	ssl
       end
-      
+
       def setup_certificate
         if @cert && @pkey
           return
@@ -77,7 +77,7 @@ module DRb
 	cert.not_before = Time.now
 	cert.not_after = Time.now + (365*24*60*60)
 	cert.public_key = rsa.public_key
-	
+
 	ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
 	cert.extensions = [
 	  ef.create_extension("basicConstraints","CA:FALSE"),
@@ -89,7 +89,7 @@ module DRb
 	  cert.add_extension(ef.create_extension("nsComment", comment))
 	end
 	cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-	
+
 	@cert = cert
         @pkey = rsa
       end
@@ -143,7 +143,7 @@ module DRb
       end
       port = soc.addr[1] if port == 0
       @uri = "drbssl://#{host}:#{port}"
-      
+
       ssl_conf = SSLConfig.new(config)
       ssl_conf.setup_certificate
       ssl_conf.setup_ssl_context
@@ -159,7 +159,7 @@ module DRb
       @ssl = is_established ? soc : nil
       super(uri, soc.to_io, config)
     end
-    
+
     def stream; @ssl; end
 
     def close
@@ -169,12 +169,12 @@ module DRb
       end
       super
     end
-      
+
     def accept
       begin
       while true
 	soc = @socket.accept
-	break if (@acl ? @acl.allow_socket?(soc) : true) 
+	break if (@acl ? @acl.allow_socket?(soc) : true)
 	soc.close
       end
       ssl = @config.accept(soc)
@@ -185,6 +185,6 @@ module DRb
       end
     end
   end
-  
+
   DRbProtocol.add_protocol(DRbSSLSocket)
 end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
index bb2c48d528..6d8935b1ef 100644
--- a/lib/drb/timeridconv.rb
+++ b/lib/drb/timeridconv.rb
@@ -19,7 +19,7 @@ module DRb
       end
 
       def add(obj)
-	synchronize do 
+	synchronize do
 	  key = obj.__id__
 	  @curr[key] = obj
 	  return key
@@ -27,7 +27,7 @@ module DRb
       end
 
       def fetch(key, dv=@sentinel)
-	synchronize do 
+	synchronize do
 	  obj = peek(key)
 	  if obj == @sentinel
 	    return dv unless dv == @sentinel
@@ -39,7 +39,7 @@ module DRb
       end
 
       def include?(key)
-	synchronize do 
+	synchronize do
 	  obj = peek(key)
 	  return false if obj == @sentinel
 	  true
@@ -47,7 +47,7 @@ module DRb
       end
 
       def peek(key)
-	synchronize do 
+	synchronize do
 	  return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
 	end
       end
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 57feed8301..ebecc22901 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -8,7 +8,7 @@ module DRb
 
   class DRbUNIXSocket < DRbTCPSocket
     def self.parse_uri(uri)
-      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri 
+      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
 	filename = $1
 	option = $3
 	[filename, option]
@@ -59,7 +59,7 @@ module DRb
       @server_mode = server_mode
       @acl = nil
     end
-    
+
     # import from tempfile.rb
     Max_try = 10
     private
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index 3e2604af5d..74e0f36577 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -2,7 +2,6 @@
 #   e2mmap.rb - for ruby 1.1
 #   	$Release Version: 2.0$
 #   	$Revision: 1.10 $
-#   	$Date: 1999/02/17 12:33:17 $
 #   	by Keiju ISHITSUKA
 #
 # --
@@ -48,8 +47,6 @@
 #   Foo.Fail ExistingExceptionClass, arg...
 #
 #
-fail "Use Ruby 1.1" if VERSION < "1.1"
-
 module Exception2MessageMapper
   @RCS_ID='-$Id: e2mmap.rb,v 1.10 1999/02/17 12:33:17 keiju Exp keiju $-'
 
@@ -57,13 +54,7 @@ module Exception2MessageMapper
 
   def E2MM.extend_object(cl)
     super
-    cl.bind(self) unless cl == E2MM
-  end
-  
-  # backward compatibility
-  def E2MM.extend_to(b)
-    c = eval("self", b)
-    c.extend(self)
+    cl.bind(self) unless cl < E2MM
   end
 
   def bind(cl)
@@ -87,21 +78,8 @@ module Exception2MessageMapper
     E2MM.Raise(self, err, *rest)
   end
   alias Fail Raise
+  alias fail Raise
 
-  # backward compatibility
-  alias fail! fail
-  def fail(err = nil, *rest)
-    begin 
-      E2MM.Fail(self, err, *rest)
-    rescue E2MM::ErrNotRegisteredException
-      super
-    end
-  end
-  class << self
-    public :fail
-  end
-
-  
   # def_e2message(c, m)
   #	    c:  exception
   #	    m:  message_form
@@ -110,7 +88,7 @@ module Exception2MessageMapper
   def def_e2message(c, m)
     E2MM.def_e2message(self, c, m)
   end
-  
+
   # def_exception(n, m, s)
   #	    n:  exception_name
   #	    m:  message_form
@@ -127,7 +105,7 @@ module Exception2MessageMapper
   # {[class, exp] => message, ...}
   @MessageMap = {}
 
-  # E2MM.def_exception(k, e, m)
+  # E2MM.def_e2message(k, e, m)
   #	    k:  class to define exception under.
   #	    e:  exception
   #	    m:  message_form
@@ -137,7 +115,7 @@ module Exception2MessageMapper
     E2MM.instance_eval{@MessageMap[[k, c]] = m}
     c
   end
-  
+
   # E2MM.def_exception(k, n, m, s)
   #	    k:  class to define exception under.
   #	    n:  exception_name
@@ -159,17 +137,16 @@ module Exception2MessageMapper
   #
   def E2MM.Raise(klass = E2MM, err = nil, *rest)
     if form = e2mm_message(klass, err)
-      $! = err.new(sprintf(form, *rest))
-      $@ = caller(1) if $@.nil?
+      b = $@.nil? ? caller(1) : $@
       #p $@
       #p __FILE__
-      $@.shift if $@[0] =~ /^#{Regexp.quote(__FILE__)}:/
-      raise
+      b.shift if b[0] =~ /^#{Regexp.quote(__FILE__)}:/
+      raise err, sprintf(form, *rest), b
     else
       E2MM.Fail E2MM, ErrNotRegisteredException, err.inspect
     end
   end
-  class <<E2MM
+  class << E2MM
     alias Fail Raise
   end
 
@@ -183,12 +160,12 @@ module Exception2MessageMapper
     end
     nil
   end
-  class <<self
+  class << self
     alias message e2mm_message
   end
 
-  E2MM.def_exception(E2MM, 
-		     :ErrNotRegisteredException, 
+  E2MM.def_exception(E2MM,
+		     :ErrNotRegisteredException,
 		     "not registerd exception(%s)")
 end
 
diff --git a/lib/erb.rb b/lib/erb.rb
index b714aa1ea6..5e9feb9ba5 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -20,7 +20,7 @@
 # purposes of generating document information details and/or flow control.
 #
 # A very simple example is this:
-# 
+#
 #   require 'erb'
 #
 #   x = 42
@@ -58,6 +58,24 @@
 #
 # See the ERB.new and ERB#result methods for more detail.
 #
+# == Character encodings
+#
+# ERB (or ruby code generated by ERB) returns a string in the same
+# character encoding as the input string.  When the input string has
+# a magic comment, however, it returns a string in the encoding specified
+# by the magic comment.
+#
+#   # -*- coding: UTF-8 -*-
+#   require 'erb'
+#
+#   template = ERB.new <<EOF
+#   <%#-*- coding: Big5 -*-%>
+#     \_\_ENCODING\_\_ is <%= \_\_ENCODING\_\_ %>.
+#   EOF
+#   puts template.result
+#
+# <em>Prints:</em> \_\_ENCODING\_\_ is Big5.
+#
 #
 # == Examples
 #
@@ -68,39 +86,39 @@
 # <tt>%q{...}</tt> to avoid trouble with the backslash.
 #
 #   require "erb"
-#   
+#
 #   # Create template.
 #   template = %q{
 #     From:  James Edward Gray II <james@grayproductions.net>
 #     To:  <%= to %>
 #     Subject:  Addressing Needs
-#   
+#
 #     <%= to[/\w+/] %>:
-#   
+#
 #     Just wanted to send a quick note assuring that your needs are being
 #     addressed.
-#   
+#
 #     I want you to know that my team will keep working on the issues,
 #     especially:
-#   
+#
 #     <%# ignore numerous minor requests -- focus on priorities %>
 #     % priorities.each do |priority|
 #       * <%= priority %>
 #     % end
-#   
+#
 #     Thanks for your patience.
-#   
+#
 #     James Edward Gray II
 #   }.gsub(/^  /, '')
-#   
+#
 #   message = ERB.new(template, 0, "%<>")
-#   
+#
 #   # Set up template data.
 #   to = "Community Spokesman <spokesman@ruby_community.org>"
 #   priorities = [ "Run Ruby Quiz",
 #                  "Document Modules",
 #                  "Answer Questions on Ruby Talk" ]
-#   
+#
 #   # Produce result.
 #   email = message.result
 #   puts email
@@ -110,19 +128,19 @@
 #   From:  James Edward Gray II <james@grayproductions.net>
 #   To:  Community Spokesman <spokesman@ruby_community.org>
 #   Subject:  Addressing Needs
-#   
+#
 #   Community:
-#   
+#
 #   Just wanted to send a quick note assuring that your needs are being addressed.
-#   
+#
 #   I want you to know that my team will keep working on the issues, especially:
-#   
+#
 #       * Run Ruby Quiz
 #       * Document Modules
 #       * Answer Questions on Ruby Talk
-#   
+#
 #   Thanks for your patience.
-#   
+#
 #   James Edward Gray II
 #
 # === Ruby in HTML
@@ -132,7 +150,7 @@
 # variables in the Product object can be resolved.
 #
 #   require "erb"
-#   
+#
 #   # Build template data class.
 #   class Product
 #     def initialize( code, name, desc, cost )
@@ -140,37 +158,37 @@
 #       @name = name
 #       @desc = desc
 #       @cost = cost
-#        	
+#
 #       @features = [ ]
 #     end
-#   
+#
 #     def add_feature( feature )
 #       @features << feature
 #     end
-#   
+#
 #     # Support templating of member data.
 #     def get_binding
 #       binding
 #     end
-#   
+#
 #     # ...
 #   end
-#   
+#
 #   # Create template.
 #   template = %{
 #     <html>
 #       <head><title>Ruby Toys -- <%= @name %></title></head>
 #       <body>
-#   
+#
 #         <h1><%= @name %> (<%= @code %>)</h1>
 #         <p><%= @desc %></p>
-#   
+#
 #         <ul>
 #           <% @features.each do |f| %>
 #             <li><b><%= f %></b></li>
 #           <% end %>
 #         </ul>
-#   
+#
 #         <p>
 #           <% if @cost < 10 %>
 #             <b>Only <%= @cost %>!!!</b>
@@ -178,13 +196,13 @@
 #              Call for a price, today!
 #           <% end %>
 #         </p>
-#    
+#
 #       </body>
 #     </html>
 #   }.gsub(/^  /, '')
-#   
+#
 #   rhtml = ERB.new(template)
-#   
+#
 #   # Set up template data.
 #   toy = Product.new( "TZ-1002",
 #                      "Rubysapien",
@@ -195,7 +213,7 @@
 #   toy.add_feature("Karate-Chop Action!!!")
 #   toy.add_feature("Matz signature on left leg.")
 #   toy.add_feature("Gem studded eyes... Rubies, of course!")
-#   
+#
 #   # Produce result.
 #   rhtml.run(toy.get_binding)
 #
@@ -204,10 +222,10 @@
 #    <html>
 #      <head><title>Ruby Toys -- Rubysapien</title></head>
 #      <body>
-#    
+#
 #        <h1>Rubysapien (TZ-1002)</h1>
 #        <p>Geek's Best Friend!  Responds to Ruby commands...</p>
-#    
+#
 #        <ul>
 #            <li><b>Listens for verbal commands in the Ruby language!</b></li>
 #            <li><b>Ignores Perl, Java, and all C variants.</b></li>
@@ -215,15 +233,15 @@
 #            <li><b>Matz signature on left leg.</b></li>
 #            <li><b>Gem studded eyes... Rubies, of course!</b></li>
 #        </ul>
-#    
+#
 #        <p>
 #             Call for a price, today!
 #        </p>
-#    
+#
 #      </body>
 #    </html>
 #
-# 
+#
 # == Notes
 #
 # There are a variety of templating solutions available in various Ruby projects:
@@ -236,11 +254,11 @@
 # Rails, the web application framework, uses ERB to create views.
 #
 class ERB
-  Revision = '$Date$' 	#'
+  Revision = '$Date::                           $' 	#'
 
   # Returns revision information for the erb.rb module.
   def self.version
-    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
+    "erb.rb [2.1.0 #{ERB::Revision.split[1]}]"
   end
 end
 
@@ -254,11 +272,13 @@ class ERB
       end
       attr_reader :value
       alias :to_s :value
+
+      def empty?
+        @value.empty?
+      end
     end
 
     class Scanner # :nodoc:
-      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-
       @scanner_map = {}
       def self.regist_scanner(klass, trim_mode, percent)
 	@scanner_map[[trim_mode, percent]] = klass
@@ -283,8 +303,6 @@ class ERB
     end
 
     class TrimScanner < Scanner # :nodoc:
-      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
-
       def initialize(src, trim_mode, percent)
 	super
 	@trim_mode = trim_mode
@@ -300,17 +318,15 @@ class ERB
 	end
       end
       attr_accessor :stag
-      
+
       def scan(&block)
 	@stag = nil
 	if @percent
-	  @src.each do |line|
+	  @src.each_line do |line|
 	    percent_line(line, &block)
 	  end
 	else
-	  @src.each do |line|
-	    @scan_line.call(line, &block)
-	  end
+          @scan_line.call(@src, &block)
 	end
 	nil
       end
@@ -329,57 +345,66 @@ class ERB
       end
 
       def scan_line(line)
-	line.split(SplitRegexp).each do |token|
-	  next if token.empty?
-	  yield(token)
+        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            yield(token)
+          end
 	end
       end
 
       def trim_line1(line)
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  if token == "%>\n"
-	    yield('%>')
-	    yield(:cr)
-	    break
-	  end
-	  yield(token)
+        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            if token == "%>\n"
+              yield('%>')
+              yield(:cr)
+            else
+              yield(token)
+            end
+          end
 	end
       end
 
       def trim_line2(line)
 	head = nil
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  head = token unless head
-	  if token == "%>\n"
-	    yield('%>')
-	    if  is_erb_stag?(head)
-	      yield(:cr)
-	    else
-	      yield("\n")
-	    end
-	    break
-	  end
-	  yield(token)
+        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            head = token unless head
+            if token == "%>\n"
+              yield('%>')
+              if is_erb_stag?(head)
+                yield(:cr)
+              else
+                yield("\n")
+              end
+              head = nil
+            else
+              yield(token)
+              head = nil if token == "\n"
+            end
+          end
 	end
       end
 
-      ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
       def explicit_trim_line(line)
-	line.split(ExplicitTrimRegexp).each do |token|
-	  next if token.empty?
-	  if @stag.nil? && /[ \t]*<%-/ =~ token
-	    yield('<%')
-	  elsif @stag && /-%>\n/ =~ token
-	    yield('%>')
-	    yield(:cr)
-	  elsif @stag && token == '-%>'
-	    yield('%>')
-	  else
-	    yield(token)
-	  end
-	end
+        line.scan(/(.*?)(^[ \t]*<%\-|<%\-|<%%|%%>|<%=|<%#|<%|-%>\n|-%>|%>|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            if @stag.nil? && /[ \t]*<%-/ =~ token
+              yield('<%')
+            elsif @stag && token == "-%>\n"
+              yield('%>')
+              yield(:cr)
+            elsif @stag && token == '-%>'
+              yield('%>')
+            else
+              yield(token)
+            end
+          end
+        end
       end
 
       ERB_STAG = %w(<%= <%# <%)
@@ -392,90 +417,50 @@ class ERB
 
     class SimpleScanner < Scanner # :nodoc:
       def scan
-	@src.each do |line|
-	  line.split(SplitRegexp).each do |token|
-	    next if token.empty?
-	    yield(token)
-	  end
+        @src.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            yield(token)
+          end
 	end
       end
     end
-    
+
     Scanner.regist_scanner(SimpleScanner, nil, false)
 
     begin
       require 'strscan'
       class SimpleScanner2 < Scanner # :nodoc:
         def scan
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m
+          etag_reg = /(.*?)(%%>|%>|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
             scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
+            yield(scanner[1])
+            yield(scanner[2])
           end
         end
       end
       Scanner.regist_scanner(SimpleScanner2, nil, false)
 
-      class PercentScanner < Scanner # :nodoc:
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil?
-	      if scanner.scan(/%%/)
-		yield('%')
-		new_line = false
-		next
-	      elsif scanner.scan(/%/)
-		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-		next
-	      end
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-	    new_line = (elem == "\n")
-          end
-        end
-      end
-      Scanner.regist_scanner(PercentScanner, nil, true)
-
       class ExplicitScanner < Scanner # :nodoc:
 	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
+          stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m
+          etag_reg = /(.*?)(%%>|-%>|%>|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
-	    if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
-	      yield('<%')
-	      new_line = false
-	      next
-	    end
 	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
+            yield(scanner[1])
+
             elem = scanner[2]
-	    new_line = (elem == "\n")
-            yield(text) unless text.empty?
-	    if elem == '-%>'
+            if /[ \t]*<%-/ =~ elem
+              yield('<%')
+            elsif elem == '-%>'
 	      yield('%>')
-	      if scanner.scan(/(\n|\z)/)
-		yield(:cr)
-		new_line = true
-	      end
-	    elsif elem == '<%-'
-	      yield('<%')
+	      yield(:cr) if scanner.scan(/(\n|\z)/)
 	    else
-	      yield(elem) unless elem.empty?
+	      yield(elem)
 	    end
           end
         end
@@ -486,10 +471,10 @@ class ERB
     end
 
     class Buffer # :nodoc:
-      def initialize(compiler)
+      def initialize(compiler, enc=nil)
 	@compiler = compiler
 	@line = []
-	@script = ""
+        @script = enc ? "#coding:#{enc.to_s}\n" : ""
 	@compiler.pre_cmd.each do |x|
 	  push(x)
 	end
@@ -499,13 +484,13 @@ class ERB
       def push(cmd)
 	@line << cmd
       end
-      
+
       def cr
 	@script << (@line.join('; '))
 	@line = []
 	@script << "\n"
       end
-      
+
       def close
 	return unless @line
 	@compiler.post_cmd.each do |x|
@@ -516,16 +501,31 @@ class ERB
       end
     end
 
+    def content_dump(s)
+      n = s.count("\n")
+      if n > 0
+        s.dump + "\n" * n
+      else
+        s.dump
+      end
+    end
+
     def compile(s)
-      out = Buffer.new(self)
+      enc = s.encoding
+      raise ArgumentError, "#{enc} is not ASCII compatible" if enc.dummy?
+      s = s.dup.force_encoding("ASCII-8BIT") # don't use constant Enoding::ASCII_8BIT for miniruby
+      enc = detect_magic_comment(s) || enc
+      out = Buffer.new(self, enc)
 
       content = ''
       scanner = make_scanner(s)
       scanner.scan do |token|
+        next if token.nil?
+        next if token == ''
 	if scanner.stag.nil?
 	  case token
           when PercentLine
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+	    out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
 	    content = ''
             out.push(token.to_s)
             out.cr
@@ -533,12 +533,11 @@ class ERB
 	    out.cr
 	  when '<%', '<%=', '<%#'
 	    scanner.stag = token
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+	    out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
 	    content = ''
 	  when "\n"
 	    content << "\n"
-	    out.push("#{@put_cmd} #{content.dump}")
-	    out.cr
+	    out.push("#{@put_cmd} #{content_dump(content)}")
 	    content = ''
 	  when '<%%'
 	    content << '<%'
@@ -560,7 +559,7 @@ class ERB
 	    when '<%='
 	      out.push("#{@insert_cmd}((#{content}).to_s)")
 	    when '<%#'
-	      # out.push("# #{content.dump}")
+	      # out.push("# #{content_dump(content)}")
 	    end
 	    scanner.stag = nil
 	    content = ''
@@ -571,9 +570,9 @@ class ERB
 	  end
 	end
       end
-      out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+      out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
       out.close
-      out.script
+      return out.script, enc
     end
 
     def prepare_trim_mode(mode)
@@ -613,6 +612,18 @@ class ERB
     end
     attr_reader :percent, :trim_mode
     attr_accessor :put_cmd, :insert_cmd, :pre_cmd, :post_cmd
+
+    private
+    def detect_magic_comment(s)
+      if /\A<%#(.*)%>/ =~ s or (@percent and /\A%#(.*)/ =~ s)
+	comment = $1
+	comment = $1 if comment[/-\*-\s*(.*?)\s*-*-$/]
+	if %r"coding\s*[=:]\s*([[:alnum:]\-_]+)" =~ comment
+	  enc = $1.sub(/-(?:mac|dos|unix)/i, '')
+	  enc = Encoding.find(enc)
+	end
+      end
+    end
   end
 end
 
@@ -621,19 +632,19 @@ end
 class ERB
   #
   # Constructs a new ERB object with the template specified in _str_.
-  # 
+  #
   # An ERB object works by building a chunk of Ruby code that will output
   # the completed template when run. If _safe_level_ is set to a non-nil value,
   # ERB code will be run in a separate thread with <b>$SAFE</b> set to the
   # provided level.
-  # 
+  #
   # If _trim_mode_ is passed a String containing one or more of the following
   # modifiers, ERB will adjust its code generation as listed:
-  # 
+  #
   # 	%  enables Ruby code processing for lines beginning with %
   # 	<> omit newline for lines starting with <% and ending in %>
   # 	>  omit newline for lines ending in %>
-  # 
+  #
   # _eoutvar_ can be used to set the name of the variable ERB will build up
   # its output in.  This is useful when you need to run multiple ERB
   # templates through the same binding and/or when you want to control where
@@ -642,23 +653,23 @@ class ERB
   # === Example
   #
   #  require "erb"
-  #  
+  #
   #  # build data class
   #  class Listings
   #    PRODUCT = { :name => "Chicken Fried Steak",
   #                :desc => "A well messages pattie, breaded and fried.",
   #                :cost => 9.95 }
-  #  
+  #
   #    attr_reader :product, :price
-  #    
+  #
   #    def initialize( product = "", price = "" )
   #      @product = product
   #      @price = price
   #    end
-  #    
+  #
   #    def build
   #      b = binding
-  #      # create and run templates, filling member data variebles
+  #      # create and run templates, filling member data variables
   #      ERB.new(<<-'END_PRODUCT'.gsub(/^\s+/, ""), 0, "", "@product").result b
   #        <%= PRODUCT[:name] %>
   #        <%= PRODUCT[:desc] %>
@@ -669,26 +680,26 @@ class ERB
   #      END_PRICE
   #    end
   #  end
-  #  
+  #
   #  # setup template data
   #  listings = Listings.new
   #  listings.build
-  #  
+  #
   #  puts listings.product + "\n" + listings.price
   #
   # _Generates_
   #
   #  Chicken Fried Steak
   #  A well messages pattie, breaded and fried.
-  #  
+  #
   #  Chicken Fried Steak -- 9.95
   #  A well messages pattie, breaded and fried.
-  #  
+  #
   def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
     @safe_level = safe_level
     compiler = ERB::Compiler.new(trim_mode)
     set_eoutvar(compiler, eoutvar)
-    @src = compiler.compile(str)
+    @src, @enc = *compiler.compile(str)
     @filename = nil
   end
 
@@ -710,11 +721,11 @@ class ERB
 
     cmd = []
     cmd.push "#{eoutvar} = ''"
-    
+
     compiler.pre_cmd = cmd
 
     cmd = []
-    cmd.push(eoutvar)
+    cmd.push("#{eoutvar}.force_encoding(__ENCODING__)")
 
     compiler.post_cmd = cmd
   end
@@ -728,35 +739,68 @@ class ERB
   # Executes the generated ERB code to produce a completed template, returning
   # the results of that code.  (See ERB#new for details on how this process can
   # be affected by _safe_level_.)
-  # 
+  #
   # _b_ accepts a Binding or Proc object which is used to set the context of
   # code evaluation.
   #
   def result(b=TOPLEVEL_BINDING)
     if @safe_level
-      th = Thread.start { 
+      proc {
 	$SAFE = @safe_level
-	eval(@src, b, (@filename || '(erb)'), 1)
-      }
-      return th.value
+	eval(@src, b, (@filename || '(erb)'), 0)
+      }.call
     else
-      return eval(@src, b, (@filename || '(erb)'), 1)
+      eval(@src, b, (@filename || '(erb)'), 0)
     end
   end
 
-  def def_method(mod, methodname, fname='(ERB)')  # :nodoc:
-    mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
+  # Define _methodname_ as instance method of _mod_ from compiled ruby source.
+  #
+  # example:
+  #   filename = 'example.rhtml'   # 'arg1' and 'arg2' are used in example.rhtml
+  #   erb = ERB.new(File.read(filename))
+  #   erb.def_method(MyClass, 'render(arg1, arg2)', filename)
+  #   print MyClass.new.render('foo', 123)
+  def def_method(mod, methodname, fname='(ERB)')
+    src = self.src
+    magic_comment = "#coding:#{@enc}\n"
+    mod.module_eval do
+      eval(magic_comment + "def #{methodname}\n" + src + "\nend\n", binding, fname, -2)
+    end
   end
 
-  def def_module(methodname='erb')  # :nodoc:
+  # Create unnamed module, define _methodname_ as instance method of it, and return it.
+  #
+  # example:
+  #   filename = 'example.rhtml'   # 'arg1' and 'arg2' are used in example.rhtml
+  #   erb = ERB.new(File.read(filename))
+  #   erb.filename = filename
+  #   MyModule = erb.def_module('render(arg1, arg2)')
+  #   class MyClass
+  #     include MyModule
+  #   end
+  def def_module(methodname='erb')
     mod = Module.new
-    def_method(mod, methodname)
+    def_method(mod, methodname, @filename || '(ERB)')
     mod
   end
 
-  def def_class(superklass=Object, methodname='result')  # :nodoc:
+  # Define unnamed class which has _methodname_ as instance method, and return it.
+  #
+  # example:
+  #   class MyClass_
+  #     def initialize(arg1, arg2)
+  #       @arg1 = arg1;  @arg2 = arg2
+  #     end
+  #   end
+  #   filename = 'example.rhtml'  # @arg1 and @arg2 are used in example.rhtml
+  #   erb = ERB.new(File.read(filename))
+  #   erb.filename = filename
+  #   MyClass = erb.def_class(MyClass_, 'render()')
+  #   print MyClass.new('foo', 123).render()
+  def def_class(superklass=Object, methodname='result')
     cls = Class.new(superklass)
-    def_method(cls, methodname)
+    def_method(cls, methodname, @filename || '(ERB)')
     cls
   end
 end
@@ -769,14 +813,14 @@ class ERB
     public
     #
     # A utility method for escaping HTML tag characters in _s_.
-    # 
+    #
     # 	require "erb"
     # 	include ERB::Util
-    # 	
+    #
     # 	puts html_escape("is a > 0 & a < 10?")
-    # 
+    #
     # _Generates_
-    # 
+    #
     # 	is a &gt; 0 &amp; a &lt; 10?
     #
     def html_escape(s)
@@ -785,21 +829,23 @@ class ERB
     alias h html_escape
     module_function :h
     module_function :html_escape
-    
+
     #
     # A utility method for encoding the String _s_ as a URL.
-    # 
+    #
     # 	require "erb"
     # 	include ERB::Util
-    # 	
+    #
     # 	puts url_encode("Programming Ruby:  The Pragmatic Programmer's Guide")
-    # 
+    #
     # _Generates_
-    # 
+    #
     # 	Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
     #
     def url_encode(s)
-      s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+      s.to_s.dup.force_encoding("ASCII-8BIT").gsub(/[^a-zA-Z0-9_\-.]/n) {
+        sprintf("%%%02X", $&.unpack("C")[0])
+      }
     end
     alias u url_encode
     module_function :u
@@ -810,15 +856,45 @@ end
 #--
 # ERB::DefMethod
 class ERB
-  module DefMethod  # :nodoc:
+  # Utility module to define eRuby script as instance method.
+  #
+  # === Example
+  #
+  # example.rhtml:
+  #   <% for item in @items %>
+  #   <b><%= item %></b>
+  #   <% end %>
+  #
+  # example.rb:
+  #   require 'erb'
+  #   class MyClass
+  #     extend ERB::DefMethod
+  #     def_erb_method('render()', 'example.rhtml')
+  #     def initialize(items)
+  #       @items = items
+  #     end
+  #   end
+  #   print MyClass.new([10,20,30]).render()
+  #
+  # result:
+  #
+  #   <b>10</b>
+  #
+  #   <b>20</b>
+  #
+  #   <b>30</b>
+  #
+  module DefMethod
     public
-    def def_erb_method(methodname, erb)
-      if erb.kind_of? String
-	fname = erb
-	File.open(fname) {|f| erb = ERB.new(f.read) }
-	erb.def_method(self, methodname, fname)
+  # define _methodname_ as instance method of current module, using ERB object or eRuby file
+    def def_erb_method(methodname, erb_or_fname)
+      if erb_or_fname.kind_of? String
+        fname = erb_or_fname
+        erb = ERB.new(File.read(fname))
+        erb.def_method(self, methodname, fname)
       else
-	erb.def_method(self, methodname)
+        erb = erb_or_fname
+        erb.def_method(self, methodname, erb.filename || '(ERB)')
       end
     end
     module_function :def_erb_method
diff --git a/lib/eregex.rb b/lib/eregex.rb
deleted file mode 100644
index cc7a7f6f46..0000000000
--- a/lib/eregex.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# this is just a proof of concept toy.
-
-class RegOr
-  def initialize(re1, re2)
-    @re1 = re1
-    @re2 = re2
-  end
-
-  def =~ (str)
-    @re1 =~ str or @re2 =~ str
-  end
-end
-
-class RegAnd
-  def initialize(re1, re2)
-    @re1 = re1
-    @re2 = re2
-  end
-
-  def =~ (str)
-    @re1 =~ str and @re2 =~ str
-  end
-end
-
-class Regexp
-  def |(other)
-    RegOr.new(self, other)
-  end
-  def &(other)
-    RegAnd.new(self, other)
-  end
-end
-
-if __FILE__ == $0
-  p "abc" =~ /b/|/c/
-  p "abc" =~ /b/&/c/
-end
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 3fdb6cbfe6..5218b57d5b 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1,17 +1,17 @@
-# 
+#
 # = fileutils.rb
-# 
-# Copyright (c) 2000-2006 Minero Aoki
-# 
+#
+# Copyright (c) 2000-2007 Minero Aoki
+#
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
-# 
+#
 # == module FileUtils
-# 
+#
 # Namespace for several file utility methods for copying, moving, removing, etc.
-# 
+#
 # === Module Functions
-# 
+#
 #   cd(dir, options)
 #   cd(dir, options) {|dir| .... }
 #   pwd()
@@ -64,23 +64,23 @@
 #   uptodate?(file, cmp_list)
 #
 # == module FileUtils::Verbose
-# 
+#
 # This module has all methods of FileUtils module, but it outputs messages
 # before acting.  This equates to passing the <tt>:verbose</tt> flag to methods
 # in FileUtils.
-# 
+#
 # == module FileUtils::NoWrite
-# 
+#
 # This module has all methods of FileUtils module, but never changes
 # files/directories.  This equates to passing the <tt>:noop</tt> flag to methods
 # in FileUtils.
-# 
+#
 # == module FileUtils::DryRun
-# 
+#
 # This module has all methods of FileUtils module, but never changes
 # files/directories.  This equates to passing the <tt>:noop</tt> and
 # <tt>:verbose</tt> flags to methods in FileUtils.
-# 
+#
 
 module FileUtils
 
@@ -107,14 +107,14 @@ module FileUtils
 
   #
   # Options: verbose
-  # 
+  #
   # Changes the current directory to the directory +dir+.
-  # 
+  #
   # If this method is called with block, resumes to the old
   # working directory after the block execution finished.
-  # 
+  #
   #   FileUtils.cd('/', :verbose => true)   # chdir and report it
-  # 
+  #
   def cd(dir, options = {}, &block) # :yield: dir
     fu_check_options options, OPT_TABLE['cd']
     fu_output_message "cd #{dir}" if options[:verbose]
@@ -131,13 +131,13 @@ module FileUtils
 
   #
   # Options: (none)
-  # 
+  #
   # Returns true if +newer+ is newer than all +old_list+.
   # Non-existent files are older than any file.
-  # 
+  #
   #   FileUtils.uptodate?('hello.o', %w(hello.c hello.h)) or \
   #       system 'make hello.o'
-  # 
+  #
   def uptodate?(new, old_list, options = nil)
     raise ArgumentError, 'uptodate? does not accept any option' if options
 
@@ -154,14 +154,14 @@ module FileUtils
 
   #
   # Options: mode noop verbose
-  # 
+  #
   # Creates one or more directories.
-  # 
+  #
   #   FileUtils.mkdir 'test'
   #   FileUtils.mkdir %w( tmp data )
   #   FileUtils.mkdir 'notexist', :noop => true  # Does not really create.
   #   FileUtils.mkdir 'tmp', :mode => 0700
-  # 
+  #
   def mkdir(list, options = {})
     fu_check_options options, OPT_TABLE['mkdir']
     list = fu_list(list)
@@ -178,12 +178,12 @@ module FileUtils
 
   #
   # Options: mode noop verbose
-  # 
+  #
   # Creates a directory and all its parent directories.
   # For example,
-  # 
+  #
   #   FileUtils.mkdir_p '/usr/local/lib/ruby'
-  # 
+  #
   # causes to make following directories, if it does not exist.
   #     * /usr
   #     * /usr/local
@@ -191,7 +191,7 @@ module FileUtils
   #     * /usr/local/lib/ruby
   #
   # You can pass several directories at a time in a list.
-  # 
+  #
   def mkdir_p(list, options = {})
     fu_check_options options, OPT_TABLE['mkdir_p']
     list = fu_list(list)
@@ -212,11 +212,11 @@ module FileUtils
         stack.push path
         path = File.dirname(path)
       end
-      stack.reverse_each do |path|
+      stack.reverse_each do |dir|
         begin
-          fu_mkdir path, options[:mode]
-        rescue SystemCallError => err
-          raise unless File.directory?(path)
+          fu_mkdir dir, options[:mode]
+        rescue SystemCallError
+          raise unless File.directory?(dir)
         end
       end
     end
@@ -247,26 +247,35 @@ module FileUtils
 
   #
   # Options: noop, verbose
-  # 
+  #
   # Removes one or more directories.
-  # 
+  #
   #   FileUtils.rmdir 'somedir'
   #   FileUtils.rmdir %w(somedir anydir otherdir)
   #   # Does not really remove directory; outputs message.
   #   FileUtils.rmdir 'somedir', :verbose => true, :noop => true
-  # 
+  #
   def rmdir(list, options = {})
     fu_check_options options, OPT_TABLE['rmdir']
     list = fu_list(list)
-    fu_output_message "rmdir #{list.join ' '}" if options[:verbose]
+    parents = options[:parents]
+    fu_output_message "rmdir #{parents ? '-p ' : ''}#{list.join ' '}" if options[:verbose]
     return if options[:noop]
     list.each do |dir|
-      Dir.rmdir dir.sub(%r</\z>, '')
+      begin
+        Dir.rmdir(dir = dir.sub(%r</\z>, ''))
+        if parents
+          until (parent = File.dirname(dir)) == '.' or parent == dir
+            Dir.rmdir(dir)
+          end
+        end
+      rescue Errno::ENOTEMPTY, Errno::ENOENT
+      end
     end
   end
   module_function :rmdir
 
-  OPT_TABLE['rmdir'] = [:noop, :verbose]
+  OPT_TABLE['rmdir'] = [:parents, :noop, :verbose]
 
   #
   # Options: force noop verbose
@@ -277,19 +286,19 @@ module FileUtils
   # If +new+ already exists and it is a directory, creates a link +new/old+.
   # If +new+ already exists and it is not a directory, raises Errno::EEXIST.
   # But if :force option is set, overwrite +new+.
-  # 
+  #
   #   FileUtils.ln 'gcc', 'cc', :verbose => true
   #   FileUtils.ln '/usr/bin/emacs21', '/usr/bin/emacs'
-  # 
+  #
   # <b><tt>ln(list, destdir, options = {})</tt></b>
-  # 
+  #
   # Creates several hard links in a directory, with each one pointing to the
   # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
-  # 
+  #
   #   include FileUtils
   #   cd '/sbin'
   #   FileUtils.ln %w(cp mv mkdir), '/bin'   # Now /sbin/cp and /bin/cp are linked.
-  # 
+  #
   def ln(src, dest, options = {})
     fu_check_options options, OPT_TABLE['ln']
     fu_output_message "ln#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -311,24 +320,24 @@ module FileUtils
   # Options: force noop verbose
   #
   # <b><tt>ln_s(old, new, options = {})</tt></b>
-  # 
+  #
   # Creates a symbolic link +new+ which points to +old+.  If +new+ already
   # exists and it is a directory, creates a symbolic link +new/old+.  If +new+
   # already exists and it is not a directory, raises Errno::EEXIST.  But if
   # :force option is set, overwrite +new+.
-  # 
+  #
   #   FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
   #   FileUtils.ln_s 'verylongsourcefilename.c', 'c', :force => true
-  # 
+  #
   # <b><tt>ln_s(list, destdir, options = {})</tt></b>
-  # 
+  #
   # Creates several symbolic links in a directory, with each one pointing to the
   # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
   #
   # If +destdir+ is not a directory, raises Errno::ENOTDIR.
-  # 
+  #
   #   FileUtils.ln_s Dir.glob('bin/*.rb'), '/home/aamine/bin'
-  # 
+  #
   def ln_s(src, dest, options = {})
     fu_check_options options, OPT_TABLE['ln_s']
     fu_output_message "ln -s#{options[:force] ? 'f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -348,10 +357,10 @@ module FileUtils
 
   #
   # Options: noop verbose
-  # 
+  #
   # Same as
   #   #ln_s(src, dest, :force)
-  # 
+  #
   def ln_sf(src, dest, options = {})
     fu_check_options options, OPT_TABLE['ln_sf']
     options = options.dup
@@ -374,7 +383,7 @@ module FileUtils
   #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6'
   #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6', :verbose => true
   #   FileUtils.cp 'symlink', 'dest'   # copy content, "dest" is not a symlink
-  # 
+  #
   def cp(src, dest, options = {})
     fu_check_options options, OPT_TABLE['cp']
     fu_output_message "cp#{options[:preserve] ? ' -p' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -393,17 +402,17 @@ module FileUtils
 
   #
   # Options: preserve noop verbose dereference_root remove_destination
-  # 
+  #
   # Copies +src+ to +dest+. If +src+ is a directory, this method copies
   # all its contents recursively. If +dest+ is a directory, copies
   # +src+ to +dest/src+.
   #
   # +src+ can be a list of files.
-  # 
+  #
   #   # Installing ruby library "mylib" under the site_ruby
   #   FileUtils.rm_r site_ruby + '/mylib', :force
   #   FileUtils.cp_r 'lib/', site_ruby + '/mylib'
-  # 
+  #
   #   # Examples of copying several files to target directory.
   #   FileUtils.cp_r %w(mail.rb field.rb debug/), site_ruby + '/tmail'
   #   FileUtils.cp_r Dir.glob('*.rb'), '/home/aamine/lib/ruby', :noop => true, :verbose => true
@@ -413,11 +422,12 @@ module FileUtils
   #   # use following code.
   #   FileUtils.cp_r 'src/.', 'dest'     # cp_r('src', 'dest') makes src/dest,
   #                                      # but this doesn't.
-  # 
+  #
   def cp_r(src, dest, options = {})
     fu_check_options options, OPT_TABLE['cp_r']
     fu_output_message "cp -r#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
     return if options[:noop]
+    options = options.dup
     options[:dereference_root] = true unless options.key?(:dereference_root)
     fu_each_src_dest(src, dest) do |s, d|
       copy_entry s, d, options[:preserve], options[:dereference_root], options[:remove_destination]
@@ -471,22 +481,22 @@ module FileUtils
   # +dest+ must respond to #write(str).
   #
   def copy_stream(src, dest)
-    fu_copy_stream0 src, dest, fu_stream_blksize(src, dest)
+    IO.copy_stream(src, dest)
   end
   module_function :copy_stream
 
   #
   # Options: force noop verbose
-  # 
+  #
   # Moves file(s) +src+ to +dest+.  If +file+ and +dest+ exist on the different
-  # disk partition, the file is copied instead.
-  # 
+  # disk partition, the file is copied then the original file is removed.
+  #
   #   FileUtils.mv 'badname.rb', 'goodname.rb'
   #   FileUtils.mv 'stuff.rb', '/notexist/lib/ruby', :force => true  # no error
-  # 
+  #
   #   FileUtils.mv %w(junk.txt dust.txt), '/home/aamine/.trash/'
   #   FileUtils.mv Dir.glob('test*.rb'), 'test', :noop => true, :verbose => true
-  # 
+  #
   def mv(src, dest, options = {})
     fu_check_options options, OPT_TABLE['mv']
     fu_output_message "mv#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -525,20 +535,20 @@ module FileUtils
   OPT_TABLE['move'] = [:force, :noop, :verbose, :secure]
 
   def rename_cannot_overwrite_file?   #:nodoc:
-    /djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+    /cygwin|mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM
   end
   private_module_function :rename_cannot_overwrite_file?
 
   #
   # Options: force noop verbose
-  # 
+  #
   # Remove file(s) specified in +list+.  This method cannot remove directories.
   # All StandardErrors are ignored when the :force option is set.
-  # 
+  #
   #   FileUtils.rm %w( junk.txt dust.txt )
   #   FileUtils.rm Dir.glob('*.so')
   #   FileUtils.rm 'NotExistFile', :force => true   # never raises exception
-  # 
+  #
   def rm(list, options = {})
     fu_check_options options, OPT_TABLE['rm']
     list = fu_list(list)
@@ -559,7 +569,7 @@ module FileUtils
 
   #
   # Options: noop verbose
-  # 
+  #
   # Equivalent to
   #
   #   #rm(list, :force => true)
@@ -580,11 +590,11 @@ module FileUtils
 
   #
   # Options: force noop verbose secure
-  # 
+  #
   # remove files +list+[0] +list+[1]... If +list+[n] is a directory,
   # removes its all contents recursively. This method ignores
   # StandardError when :force option is set.
-  # 
+  #
   #   FileUtils.rm_r Dir.glob('/tmp/*')
   #   FileUtils.rm_r '/', :force => true          #  :-)
   #
@@ -598,7 +608,7 @@ module FileUtils
   #
   # NOTE: This method calls #remove_entry_secure if :secure option is set.
   # See also #remove_entry_secure.
-  # 
+  #
   def rm_r(list, options = {})
     fu_check_options options, OPT_TABLE['rm_r']
     # options[:secure] = true unless options.key?(:secure)
@@ -619,14 +629,14 @@ module FileUtils
 
   #
   # Options: noop verbose secure
-  # 
+  #
   # Equivalent to
   #
   #   #rm_r(list, :force => true)
   #
   # WARNING: This method causes local vulnerability.
   # Read the documentation of #rm_r first.
-  # 
+  #
   def rm_rf(list, options = {})
     fu_check_options options, OPT_TABLE['rm_rf']
     options = options.dup
@@ -657,10 +667,10 @@ module FileUtils
   # removing directories.  This requires the current process is the
   # owner of the removing whole directory tree, or is the super user (root).
   #
-  # WARNING: You must ensure that *ALL* parent directories are not
-  # world writable.  Otherwise this method does not work.
-  # Only exception is temporary directory like /tmp and /var/tmp,
-  # whose permission is 1777.
+  # WARNING: You must ensure that *ALL* parent directories cannot be
+  # moved by other untrusted users.  For example, parent directories
+  # should not be owned by untrusted users, and should not be world
+  # writable except when the sticky bit set.
   #
   # WARNING: Only the owner of the removing directory tree, or Unix super
   # user (root) should invoke this method.  Otherwise this method does not
@@ -686,7 +696,7 @@ module FileUtils
     end
     # is a directory.
     parent_st = File.stat(File.dirname(fullpath))
-    unless fu_world_writable?(parent_st)
+    unless parent_st.world_writable?
       remove_entry path, force
       return
     end
@@ -703,6 +713,11 @@ module FileUtils
       end
       f.chown euid, -1
       f.chmod 0700
+      unless fu_stat_identical_entry?(st, File.lstat(fullpath))
+        # TOC-to-TOU attack?
+        File.unlink fullpath
+        return
+      end
     }
     # ---- tree root is frozen ----
     root = Entry_.new(path)
@@ -724,11 +739,6 @@ module FileUtils
   end
   module_function :remove_entry_secure
 
-  def fu_world_writable?(st)
-    (st.mode & 0002) != 0
-  end
-  private_module_function :fu_world_writable?
-
   def fu_have_symlink?   #:nodoc
     File.symlink nil, nil
   rescue NotImplementedError
@@ -785,7 +795,7 @@ module FileUtils
 
   #
   # Returns true if the contents of a file A and a file B are identical.
-  # 
+  #
   #   FileUtils.compare_file('somefile', 'somefile')  #=> true
   #   FileUtils.compare_file('/bin/cp', '/bin/mv')    #=> maybe false
   #
@@ -825,22 +835,21 @@ module FileUtils
 
   #
   # Options: mode preserve noop verbose
-  # 
+  #
   # If +src+ is not same as +dest+, copies it and changes the permission
   # mode to +mode+.  If +dest+ is a directory, destination is +dest+/+src+.
   # This method removes destination before copy.
-  # 
+  #
   #   FileUtils.install 'ruby', '/usr/local/bin/ruby', :mode => 0755, :verbose => true
   #   FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', :verbose => true
-  # 
+  #
   def install(src, dest, options = {})
     fu_check_options options, OPT_TABLE['install']
     fu_output_message "install -c#{options[:preserve] && ' -p'}#{options[:mode] ? (' -m 0%o' % options[:mode]) : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
     return if options[:noop]
-    fu_each_src_dest(src, dest) do |s, d|
+    fu_each_src_dest(src, dest) do |s, d, st|
       unless File.exist?(d) and compare_file(s, d)
         remove_file d, true
-        st = File.stat(s) if options[:preserve]
         copy_file s, d
         File.utime st.atime, st.mtime, d if options[:preserve]
         File.chmod options[:mode], d if options[:mode]
@@ -853,14 +862,14 @@ module FileUtils
 
   #
   # Options: noop verbose
-  # 
+  #
   # Changes permission bits on the named files (in +list+) to the bit pattern
   # represented by +mode+.
-  # 
+  #
   #   FileUtils.chmod 0755, 'somecommand'
   #   FileUtils.chmod 0644, %w(my.rb your.rb his.rb her.rb)
   #   FileUtils.chmod 0755, '/usr/bin/ruby', :verbose => true
-  # 
+  #
   def chmod(mode, list, options = {})
     fu_check_options options, OPT_TABLE['chmod']
     list = fu_list(list)
@@ -876,12 +885,12 @@ module FileUtils
 
   #
   # Options: noop verbose force
-  # 
+  #
   # Changes permission bits on the named files (in +list+)
   # to the bit pattern represented by +mode+.
-  # 
+  #
   #   FileUtils.chmod_R 0700, "/tmp/app.#{$$}"
-  # 
+  #
   def chmod_R(mode, list, options = {})
     fu_check_options options, OPT_TABLE['chmod_R']
     list = fu_list(list)
@@ -905,16 +914,16 @@ module FileUtils
 
   #
   # Options: noop verbose
-  # 
+  #
   # Changes owner and group on the named files (in +list+)
   # to the user +user+ and the group +group+.  +user+ and +group+
   # may be an ID (Integer/String) or a name (String).
   # If +user+ or +group+ is nil, this method does not change
   # the attribute.
-  # 
+  #
   #   FileUtils.chown 'root', 'staff', '/usr/local/bin/ruby'
   #   FileUtils.chown nil, 'bin', Dir.glob('/usr/bin/*'), :verbose => true
-  # 
+  #
   def chown(user, group, list, options = {})
     fu_check_options options, OPT_TABLE['chown']
     list = fu_list(list)
@@ -934,16 +943,16 @@ module FileUtils
 
   #
   # Options: noop verbose force
-  # 
+  #
   # Changes owner and group on the named files (in +list+)
   # to the user +user+ and the group +group+ recursively.
   # +user+ and +group+ may be an ID (Integer/String) or
   # a name (String).  If +user+ or +group+ is nil, this
   # method does not change the attribute.
-  # 
+  #
   #   FileUtils.chown_R 'www', 'www', '/var/www/htdocs'
   #   FileUtils.chown_R 'cvs', 'cvs', '/var/cvs', :verbose => true
-  # 
+  #
   def chown_R(user, group, list, options = {})
     fu_check_options options, OPT_TABLE['chown_R']
     list = fu_list(list)
@@ -974,19 +983,26 @@ module FileUtils
 
     def fu_get_uid(user)   #:nodoc:
       return nil unless user
-      user = user.to_s
-      if /\A\d+\z/ =~ user
-      then user.to_i
-      else Etc.getpwnam(user).uid
+      case user
+      when Integer
+        user
+      when /\A\d+\z/
+        user.to_i
+      else
+        Etc.getpwnam(user).uid
       end
     end
     private_module_function :fu_get_uid
 
     def fu_get_gid(group)   #:nodoc:
       return nil unless group
-      if /\A\d+\z/ =~ group
-      then group.to_i
-      else Etc.getgrnam(group).gid
+      case group
+      when Integer
+        group
+      when /\A\d+\z/
+        group.to_i
+      else
+        Etc.getgrnam(group).gid
       end
     end
     private_module_function :fu_get_gid
@@ -1007,13 +1023,13 @@ module FileUtils
 
   #
   # Options: noop verbose
-  # 
+  #
   # Updates modification time (mtime) and access time (atime) of file(s) in
   # +list+.  Files are created if they don't exist.
-  # 
+  #
   #   FileUtils.touch 'timestamp'
   #   FileUtils.touch Dir.glob('*.c');  system 'make'
-  # 
+  #
   def touch(list, options = {})
     fu_check_options options, OPT_TABLE['touch']
     list = fu_list(list)
@@ -1047,14 +1063,11 @@ module FileUtils
     private
 
     def fu_windows?
-      /mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+      /mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM
     end
 
-    def fu_copy_stream0(src, dest, blksize)   #:nodoc:
-      # FIXME: readpartial?
-      while s = src.read(blksize)
-        dest.write s
-      end
+    def fu_copy_stream0(src, dest, blksize = nil)   #:nodoc:
+      IO.copy_stream(src, dest)
     end
 
     def fu_stream_blksize(*streams)
@@ -1103,7 +1116,7 @@ module FileUtils
 
     def path
       if @path
-        @path.to_str
+        File.path(@path)
       else
         join(@prefix, @rel)
       end
@@ -1168,7 +1181,9 @@ module FileUtils
     end
 
     def entries
-      Dir.entries(path())\
+      opts = {}
+      opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
+      Dir.entries(path(), opts)\
           .reject {|n| n == '.' or n == '..' }\
           .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }
     end
@@ -1230,6 +1245,9 @@ module FileUtils
       when file?
         copy_file dest
       when directory?
+        if !File.exist?(dest) and descendant_diretory?(dest, path)
+          raise ArgumentError, "cannot copy directory %s to itself %s" % [path, dest]
+        end
         begin
           Dir.mkdir dest
         rescue
@@ -1257,12 +1275,11 @@ module FileUtils
     end
 
     def copy_file(dest)
-      st = stat()
-      File.open(path(),  'rb') {|r|
-        File.open(dest, 'wb', st.mode) {|w|
-          fu_copy_stream0 r, w, (fu_blksize(st) || fu_default_blksize())
-        }
-      }
+      File.open(path()) do |s|
+        File.open(dest, 'wb') do |f|
+          IO.copy_stream(s, f)
+        end
+      end
     end
 
     def copy_metadata(path)
@@ -1378,60 +1395,58 @@ module FileUtils
     end
 
     def join(dir, base)
-      return dir.to_str if not base or base == '.'
-      return base.to_str if not dir or dir == '.'
+      return File.path(dir) if not base or base == '.'
+      return File.path(base) if not dir or dir == '.'
       File.join(dir, base)
     end
+
+    if File::ALT_SEPARATOR
+      DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)".freeze
+    else
+      DIRECTORY_TERM = "(?=/|\\z)".freeze
+    end
+    SYSCASE = File::FNM_SYSCASE.nonzero? ? "-i" : ""
+
+    def descendant_diretory?(descendant, ascendant)
+      /\A(?#{SYSCASE}:#{Regexp.quote(ascendant)})#{DIRECTORY_TERM}/ =~ File.dirname(descendant)
+    end
   end   # class Entry_
 
   def fu_list(arg)   #:nodoc:
-    [arg].flatten.map {|path| path.to_str }
+    [arg].flatten.map {|path| File.path(path) }
   end
   private_module_function :fu_list
 
   def fu_each_src_dest(src, dest)   #:nodoc:
     fu_each_src_dest0(src, dest) do |s, d|
       raise ArgumentError, "same file: #{s} and #{d}" if fu_same?(s, d)
-      yield s, d
+      yield s, d, File.stat(s)
     end
   end
   private_module_function :fu_each_src_dest
 
   def fu_each_src_dest0(src, dest)   #:nodoc:
-    if src.is_a?(Array)
-      src.each do |s|
-        s = s.to_str
+    if tmp = Array.try_convert(src)
+      tmp.each do |s|
+        s = File.path(s)
         yield s, File.join(dest, File.basename(s))
       end
     else
-      src = src.to_str
+      src = File.path(src)
       if File.directory?(dest)
         yield src, File.join(dest, File.basename(src))
       else
-        yield src, dest.to_str
+        yield src, File.path(dest)
       end
     end
   end
   private_module_function :fu_each_src_dest0
 
   def fu_same?(a, b)   #:nodoc:
-    if fu_have_st_ino?
-      st1 = File.stat(a)
-      st2 = File.stat(b)
-      st1.dev == st2.dev and st1.ino == st2.ino
-    else
-      File.expand_path(a) == File.expand_path(b)
-    end
-  rescue Errno::ENOENT
-    return false
+    File.identical?(a, b)
   end
   private_module_function :fu_same?
 
-  def fu_have_st_ino?   #:nodoc:
-    not fu_windows?
-  end
-  private_module_function :fu_have_st_ino?
-
   def fu_check_options(options, optdecl)   #:nodoc:
     h = options.dup
     optdecl.each do |opt|
@@ -1442,8 +1457,8 @@ module FileUtils
   private_module_function :fu_check_options
 
   def fu_update_option(args, new)   #:nodoc:
-    if args.last.is_a?(Hash)
-      args[-1] = args.last.dup.update(new)
+    if tmp = Hash.try_convert(args.last)
+      args[-1] = tmp.dup.update(new)
     else
       args.push new
     end
@@ -1509,14 +1524,20 @@ module FileUtils
     OPT_TABLE.keys.select {|m| OPT_TABLE[m].include?(opt) }
   end
 
-  METHODS = singleton_methods() - %w( private_module_function
-      commands options have_option? options_of collect_method )
+  LOW_METHODS = singleton_methods(false) - collect_method(:noop).map(&:intern)
+  module LowMethods
+    module_eval("private\n" + ::FileUtils::LOW_METHODS.map {|name| "def #{name}(*)end"}.join("\n"),
+                __FILE__, __LINE__)
+  end
+
+  METHODS = singleton_methods() - [:private_module_function,
+      :commands, :options, :have_option?, :options_of, :collect_method]
 
-  # 
+  #
   # This module has all methods of FileUtils module, but it outputs messages
   # before acting.  This equates to passing the <tt>:verbose</tt> flag to
   # methods in FileUtils.
-  # 
+  #
   module Verbose
     include FileUtils
     @fileutils_output  = $stderr
@@ -1537,13 +1558,14 @@ module FileUtils
     end
   end
 
-  # 
+  #
   # This module has all methods of FileUtils module, but never changes
   # files/directories.  This equates to passing the <tt>:noop</tt> flag
   # to methods in FileUtils.
-  # 
+  #
   module NoWrite
     include FileUtils
+    include LowMethods
     @fileutils_output  = $stderr
     @fileutils_label   = ''
     ::FileUtils.collect_method(:noop).each do |name|
@@ -1562,14 +1584,15 @@ module FileUtils
     end
   end
 
-  # 
+  #
   # This module has all methods of FileUtils module, but never changes
   # files/directories, with printing message before acting.
   # This equates to passing the <tt>:noop</tt> and <tt>:verbose</tt> flag
   # to methods in FileUtils.
-  # 
+  #
   module DryRun
     include FileUtils
+    include LowMethods
     @fileutils_output  = $stderr
     @fileutils_label   = ''
     ::FileUtils.collect_method(:noop).each do |name|
diff --git a/lib/finalize.rb b/lib/finalize.rb
deleted file mode 100644
index 9b6b302cac..0000000000
--- a/lib/finalize.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-#--
-#   finalizer.rb - 
-#   	$Release Version: 0.3$
-#   	$Revision: 1.4 $
-#   	$Date: 1998/02/27 05:34:33 $
-#   	by Keiju ISHITSUKA
-#++
-#
-# Usage:
-#
-# add dependency R_method(obj, dependant)
-#   add(obj, dependant, method = :finalize, *opt)
-#   add_dependency(obj, dependant, method = :finalize, *opt)
-#
-# delete dependency R_method(obj, dependant)
-#   delete(obj_or_id, dependant, method = :finalize)
-#   delete_dependency(obj_or_id, dependant, method = :finalize)
-#
-# delete dependency R_*(obj, dependant)
-#   delete_all_dependency(obj_or_id, dependant)
-#
-# delete dependency R_method(*, dependant)
-#   delete_by_dependant(dependant, method = :finalize)
-#
-# delete dependency R_*(*, dependant)
-#   delete_all_by_dependant(dependant)
-#
-# delete all dependency R_*(*, *)
-#   delete_all
-#
-# finalize the dependant connected by dependency R_method(obj, dependtant).
-#   finalize(obj_or_id, dependant, method = :finalize)
-#   finalize_dependency(obj_or_id, dependant, method = :finalize)
-#
-# finalize all dependants connected by dependency R_*(obj, dependtant).
-#   finalize_all_dependency(obj_or_id, dependant)
-#
-# finalize the dependant connected by dependency R_method(*, dependtant).
-#   finalize_by_dependant(dependant, method = :finalize)
-#
-# finalize all dependants connected by dependency R_*(*, dependant).
-#   finalize_all_by_dependant(dependant)
-#
-# finalize all dependency registered to the Finalizer.
-#   finalize_all
-#
-# stop invoking Finalizer on GC.
-#   safe{..}
-#
-
-module Finalizer
-  RCS_ID='-$Id: finalize.rb,v 1.4 1998/02/27 05:34:33 keiju Exp keiju $-'
-
-  class <<self
-    # @dependency: {id => [[dependant, method, *opt], ...], ...}
-
-    # add dependency R_method(obj, dependant)
-    def add_dependency(obj, dependant, method = :finalize, *opt)
-      ObjectSpace.call_finalizer(obj)
-      method = method.intern unless method.kind_of?(Integer)
-      assoc = [dependant, method].concat(opt)
-      if dep = @dependency[obj.object_id]
-	dep.push assoc
-      else
-	@dependency[obj.object_id] = [assoc]
-      end
-    end
-    alias add add_dependency
-
-    # delete dependency R_method(obj, dependant)
-    def delete_dependency(id, dependant, method = :finalize)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assoc in @dependency[id]
-	assoc.delete_if do
-	  |d, m, *o|
-	  d == dependant && m == method
-	end
-	@dependency.delete(id) if assoc.empty?
-      end
-    end
-    alias delete delete_dependency
-
-    # delete dependency R_*(obj, dependant)
-    def delete_all_dependency(id, dependant)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assoc in @dependency[id]
-	assoc.delete_if do
-	  |d, m, *o|
-	  d == dependant
-	end
-	@dependency.delete(id) if assoc.empty?
-      end
-    end
-
-    # delete dependency R_method(*, dependant)
-    def delete_by_dependant(dependant, method = :finalize)
-      method = method.intern unless method.kind_of?(Integer)
-      for id in @dependency.keys
-	delete(id, dependant, method)
-      end
-    end
-
-    # delete dependency R_*(*, dependant)
-    def delete_all_by_dependant(dependant)
-      for id in @dependency.keys
-	delete_all_dependency(id, dependant)
-      end
-    end
-
-    # finalize the depandant connected by dependency R_method(obj, dependtant)
-    def finalize_dependency(id, dependant, method = :finalize)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assocs in @dependency[id]
-	assocs.delete_if do
-	  |d, m, *o|
-	  d.send(m, id, *o) if ret = d == dependant && m == method
-	  ret
-	end
-	@dependency.delete(id) if assoc.empty?
-      end
-    end
-    alias finalize finalize_dependency
-
-    # finalize all dependants connected by dependency R_*(obj, dependtant)
-    def finalize_all_dependency(id, dependant)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assoc in @dependency[id]
-	assoc.delete_if do
-	  |d, m, *o|
-	  d.send(m, id, *o) if ret = d == dependant
-	end
-	@dependency.delete(id) if assoc.empty?
-      end
-    end
-
-    # finalize the dependant connected by dependency R_method(*, dependtant)
-    def finalize_by_dependant(dependant, method = :finalize)
-      method = method.intern unless method.kind_of?(Integer)
-      for id in @dependency.keys
-	finalize(id, dependant, method)
-      end
-    end
-
-    # finalize all dependants connected by dependency R_*(*, dependtant)
-    def finalize_all_by_dependant(dependant)
-      for id in @dependency.keys
-	finalize_all_dependency(id, dependant)
-      end
-    end
-
-    # finalize all dependants registered to the Finalizer.
-    def finalize_all
-      for id, assocs in @dependency
-	for dependant, method, *opt in assocs
-	  dependant.send(method, id, *opt)
-	end
-	assocs.clear
-      end
-    end
-
-    # method to call finalize_* safely.
-    def safe
-      old_status = Thread.critical
-      Thread.critical = true
-      ObjectSpace.remove_finalizer(@proc)
-      begin
-	yield
-      ensure
-	ObjectSpace.add_finalizer(@proc)
-	Thread.critical = old_status
-      end
-    end
-
-    private
-
-    # registering function to ObjectSpace#add_finalizer
-    def final_of(id)
-      if assocs = @dependency.delete(id)
-	for dependant, method, *opt in assocs
-	  dependant.send(method, id, *opt)
-	end
-      end
-    end
-
-  end
-  @dependency = Hash.new
-  @proc = proc{|id| final_of(id)}
-  ObjectSpace.add_finalizer(@proc)
-end
diff --git a/lib/find.rb b/lib/find.rb
index 0d22dd62d6..591020ea04 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -33,32 +33,30 @@ module Find
   # See the +Find+ module documentation for an example.
   #
   def find(*paths) # :yield: path
-    paths.collect!{|d| d.dup}
+    block_given? or return enum_for(__method__, *paths)
+
+    paths.collect!{|d| raise Errno::ENOENT unless File.exist?(d); d.dup}
     while file = paths.shift
       catch(:prune) do
 	yield file.dup.taint
-        next unless File.exist? file
-	begin
-	  if File.lstat(file).directory? then
-	    d = Dir.open(file)
-	    begin
-	      for f in d
-		next if f == "." or f == ".."
-		if File::ALT_SEPARATOR and file =~ /^(?:[\/\\]|[A-Za-z]:[\/\\]?)$/ then
-		  f = file + f
-		elsif file == "/" then
-		  f = "/" + f
-		else
-		  f = File.join(file, f)
-		end
-		paths.unshift f.untaint
-	      end
-	    ensure
-	      d.close
-	    end
-	  end
-        rescue Errno::ENOENT, Errno::EACCES
-	end
+        begin
+          s = File.lstat(file)
+        rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
+          next
+        end
+        if s.directory? then
+          begin
+            fs = Dir.entries(file)
+          rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
+            next
+          end
+          fs.sort!
+          fs.reverse_each {|f|
+            next if f == "." or f == ".."
+            f = File.join(file, f)
+            paths.unshift f.untaint
+          }
+        end
       end
     end
   end
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index b6344cd4f6..a29dd71589 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -1,17 +1,17 @@
-# = forwardable - Support for the Delegation Pattern
 #
-#    $Release Version: 1.1$
-#    $Revision$
-#    $Date$
-#    by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#   forwardable.rb -
+#   	$Release Version: 1.1$
+#   	$Revision$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#	original definition by delegator.rb
+#       Revised by Daniel J. Berger with suggestions from Florian Gross.
 #
-#    Documentation by James Edward Gray II and Gavin Sinclair
+#       Documentation by James Edward Gray II and Gavin Sinclair
 #
 # == Introduction
 #
 # This library allows you delegate method calls to an object, on a method by
-# method basis.  You can use Forwardable to setup this delegation at the class
-# level, or SingleForwardable to handle it at the object level.
+# method basis.
 #
 # == Notes
 #
@@ -33,28 +33,28 @@
 #
 #   class Queue
 #     extend Forwardable
-#     
+#
 #     def initialize
 #       @q = [ ]    # prepare delegate object
 #     end
-#     
-#     # setup prefered interface, enq() and deq()...
+#
+#     # setup preferred interface, enq() and deq()...
 #     def_delegator :@q, :push, :enq
 #     def_delegator :@q, :shift, :deq
-#     
+#
 #     # support some general Array methods that fit Queues well
 #     def_delegators :@q, :clear, :first, :push, :shift, :size
 #   end
-# 
+#
 #   q = Queue.new
 #   q.enq 1, 2, 3, 4, 5
 #   q.push 6
-# 
+#
 #   q.shift    # => 1
 #   while q.size > 0
 #     puts q.deq
 #   end
-# 
+#
 #   q.enq "Ruby", "Perl", "Python"
 #   puts q.first
 #   q.clear
@@ -70,13 +70,34 @@
 #   Ruby
 #   nil
 #
-# === SingleForwardable
+# SingleForwardable can be used to setup delegation at the object level as well.
 #
 #    printer = String.new
 #    printer.extend SingleForwardable        # prepare object for delegation
 #    printer.def_delegator "STDOUT", "puts"  # add delegation for STDOUT.puts()
 #    printer.puts "Howdy!"
 #
+# Also, SingleForwardable can be use to Class or Module.
+#
+#    module Facade
+#      extend SingleForwardable
+#      def_delegator :Implementation, :service
+#
+#      class Implementation
+#	  def service...
+#      end
+#    end
+#
+# If you want to use both Forwardable and SingleForwardable, you can
+# use methods def_instance_delegator and def_single_delegator, etc.
+#
+# If the object isn't a Module and Class, You can too extend
+# Forwardable module.
+#    printer = String.new
+#    printer.extend Forwardable              # prepare object for delegation
+#    printer.def_delegator "STDOUT", "puts"  # add delegation for STDOUT.puts()
+#    printer.puts "Howdy!"
+#
 # <i>Prints:</i>
 #
 #    Howdy!
@@ -103,17 +124,38 @@
 #     # extend Forwardable, but we did that above
 #     def_delegators :@records, :size, :<<, :map
 #   end
+#   f = Foo.new
+#   f.printf ...
+#   f.gets
+#   f.content_at(1)
 #
 # Also see the example at forwardable.rb.
-#
+
 module Forwardable
+  FORWARDABLE_VERSION = "1.1.0"
 
   @debug = nil
-  class<<self
-    # force Forwardable to show up in stack backtraces of delegated methods
+  class << self
     attr_accessor :debug
   end
 
+  # Takes a hash as its argument.  The key is a symbol or an array of
+  # symbols.  These symbols correspond to method names.  The value is
+  # the accessor to which the methods will be delegated.
+  #
+  # :call-seq:
+  #    delegate method => accessor
+  #    delegate [method, method, ...] => accessor
+  #
+  def instance_delegate(hash)
+    hash.each{ |methods, accessor|
+      methods = [methods] unless methods.respond_to?(:each)
+      methods.each{ |method|
+        def_instance_delegator(accessor, method)
+      }
+    }
+  end
+
   #
   # Shortcut for defining multiple delegator methods, but with no
   # provision for using a different name.  The following two code
@@ -125,67 +167,76 @@ module Forwardable
   #   def_delegator :@records, :<<
   #   def_delegator :@records, :map
   #
-  # See the examples at Forwardable and forwardable.rb.
-  #
   def def_instance_delegators(accessor, *methods)
+    methods.delete("__send__")
+    methods.delete("__id__")
     for method in methods
       def_instance_delegator(accessor, method)
     end
   end
 
-  #
-  # Defines a method _method_ which delegates to _obj_ (i.e. it calls
-  # the method of the same name in _obj_).  If _new_name_ is
-  # provided, it is used as the name for the delegate method.
-  #
-  # See the examples at Forwardable and forwardable.rb.
-  #
   def def_instance_delegator(accessor, method, ali = method)
-    accessor = accessor.id2name if accessor.kind_of?(Integer)
-    method = method.id2name if method.kind_of?(Integer)
-    ali = ali.id2name if ali.kind_of?(Integer)
-
-    module_eval(<<-EOS, "(__FORWARDABLE__)", 1)
+    line_no = __LINE__; str = %{
       def #{ali}(*args, &block)
 	begin
 	  #{accessor}.__send__(:#{method}, *args, &block)
 	rescue Exception
-	  $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
-	  Kernel::raise
+	  $@.delete_if{|s| %r"#{Regexp.quote(__FILE__)}"o =~ s} unless Forwardable::debug
+	  ::Kernel::raise
 	end
       end
-    EOS
+    }
+    # If it's not a class or module, it's an instance
+    begin
+      module_eval(str, __FILE__, line_no)
+    rescue
+      instance_eval(str, __FILE__, line_no)
+    end
+
   end
 
+  alias delegate instance_delegate
   alias def_delegators def_instance_delegators
   alias def_delegator def_instance_delegator
 end
 
 #
-# The SingleForwardable module provides delegation of specified
-# methods to a designated object, using the methods #def_delegator
-# and #def_delegators.  This module is similar to Forwardable, but it works on
-# objects themselves, instead of their defining classes.
-#
-# Also see the example at forwardable.rb.
+# Usage of The SingleForwardable is like Fowadable module.
 #
 module SingleForwardable
+  # Takes a hash as its argument.  The key is a symbol or an array of
+  # symbols.  These symbols correspond to method names.  The value is
+  # the accessor to which the methods will be delegated.
+  #
+  # :call-seq:
+  #    delegate method => accessor
+  #    delegate [method, method, ...] => accessor
+  #
+  def single_delegate(hash)
+    hash.each{ |methods, accessor|
+      methods = [methods] unless methods.respond_to?(:each)
+      methods.each{ |method|
+        def_single_delegator(accessor, method)
+      }
+    }
+  end
+
   #
   # Shortcut for defining multiple delegator methods, but with no
   # provision for using a different name.  The following two code
   # samples have the same effect:
   #
-  #   single_forwardable.def_delegators :@records, :size, :<<, :map
-  #
-  #   single_forwardable.def_delegator :@records, :size
-  #   single_forwardable.def_delegator :@records, :<<
-  #   single_forwardable.def_delegator :@records, :map
+  #   def_delegators :@records, :size, :<<, :map
   #
-  # See the example at forwardable.rb.
+  #   def_delegator :@records, :size
+  #   def_delegator :@records, :<<
+  #   def_delegator :@records, :map
   #
-  def def_singleton_delegators(accessor, *methods)
+  def def_single_delegators(accessor, *methods)
+    methods.delete("__send__")
+    methods.delete("__id__")
     for method in methods
-      def_singleton_delegator(accessor, method)
+      def_single_delegator(accessor, method)
     end
   end
 
@@ -194,25 +245,26 @@ module SingleForwardable
   # the method of the same name in _obj_).  If _new_name_ is
   # provided, it is used as the name for the delegate method.
   #
-  # See the example at forwardable.rb.
-  #
-  def def_singleton_delegator(accessor, method, ali = method)
-    accessor = accessor.id2name if accessor.kind_of?(Integer)
-    method = method.id2name if method.kind_of?(Integer)
-    ali = ali.id2name if ali.kind_of?(Integer)
-
-    instance_eval(<<-EOS, "(__FORWARDABLE__)", 1)
-       def #{ali}(*args, &block)
-	 begin
-	   #{accessor}.__send__(:#{method}, *args,&block)
-	 rescue Exception
-	   $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
-	   Kernel::raise
-	 end
-       end
-    EOS
+  def def_single_delegator(accessor, method, ali = method)
+    line_no = __LINE__; str = %{
+      def #{ali}(*args, &block)
+	begin
+	  #{accessor}.__send__(:#{method}, *args, &block)
+	rescue Exception
+	  $@.delete_if{|s| %r"#{Regexp.quote(__FILE__)}"o =~ s} unless Forwardable::debug
+	  ::Kernel::raise
+	end
+      end
+    }
+
+    instance_eval(str, __FILE__, __LINE__)
   end
 
-  alias def_delegators def_singleton_delegators
-  alias def_delegator def_singleton_delegator
+  alias delegate single_delegate
+  alias def_delegators def_single_delegators
+  alias def_delegator def_single_delegator
 end
+
+
+
+
diff --git a/lib/ftools.rb b/lib/ftools.rb
deleted file mode 100644
index 5f082331fb..0000000000
--- a/lib/ftools.rb
+++ /dev/null
@@ -1,261 +0,0 @@
-# 
-# = ftools.rb: Extra tools for the File class
-#
-# Author:: WATANABE, Hirofumi
-# Documentation:: Zachary Landau
-#
-# This library can be distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-# It is included in the Ruby standard library.
-#
-# == Description
-#
-# ftools adds several (class, not instance) methods to the File class, for
-# copying, moving, deleting, installing, and comparing files, as well as
-# creating a directory path.  See the File class for details.
-#
-# FileUtils contains all or nearly all the same functionality and more, and
-# is a recommended option over ftools 
-#
-# When you
-#
-#   require 'ftools'
-#
-# then the File class aquires some utility methods for copying, moving, and
-# deleting files, and more.
-#
-# See the method descriptions below, and consider using FileUtils as it is
-# more comprehensive.
-#
-class File
-end
-
-class << File
-
-  BUFSIZE = 8 * 1024
-
-  #
-  # If +to+ is a valid directory, +from+ will be appended to +to+, adding
-  # and escaping backslashes as necessary. Otherwise, +to+ will be returned.
-  # Useful for appending +from+ to +to+ only if the filename was not specified
-  # in +to+. 
-  #
-  def catname(from, to)
-    if directory? to
-      join to.sub(%r([/\\]$), ''), basename(from)
-    else
-      to
-    end
-  end
-
-  #
-  # Copies a file +from+ to +to+. If +to+ is a directory, copies +from+
-  # to <tt>to/from</tt>.
-  #
-  def syscopy(from, to)
-    to = catname(from, to)
-
-    fmode = stat(from).mode
-    tpath = to
-    not_exist = !exist?(tpath)
-
-    from = open(from, "rb")
-    to = open(to, "wb")
-
-    begin
-      while true
-	to.syswrite from.sysread(BUFSIZE)
-      end
-    rescue EOFError
-      ret = true
-    rescue
-      ret = false
-    ensure
-      to.close
-      from.close
-    end
-    chmod(fmode, tpath) if not_exist
-    ret
-  end
-
-  #
-  # Copies a file +from+ to +to+ using #syscopy. If +to+ is a directory,
-  # copies +from+ to <tt>to/from</tt>. If +verbose+ is true, <tt>from -> to</tt>
-  # is printed.
-  #
-  def copy(from, to, verbose = false)
-    $stderr.print from, " -> ", catname(from, to), "\n" if verbose
-    syscopy from, to
-  end
-
-  alias cp copy
-
-  #
-  # Moves a file +from+ to +to+ using #syscopy. If +to+ is a directory,
-  # copies from +from+ to <tt>to/from</tt>. If +verbose+ is true, <tt>from ->
-  # to</tt> is printed.
-  #
-  def move(from, to, verbose = false)
-    to = catname(from, to)
-    $stderr.print from, " -> ", to, "\n" if verbose
-
-    if RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ and file? to
-      unlink to
-    end
-    fstat = stat(from)
-    begin
-      rename from, to
-    rescue
-      begin
-        symlink readlink(from), to and unlink from
-      rescue
-	from_stat = stat(from)
-	syscopy from, to and unlink from
-	utime(from_stat.atime, from_stat.mtime, to)
-	begin
-	  chown(fstat.uid, fstat.gid, to)
-	rescue
-	end
-      end
-    end
-  end
-
-  alias mv move
-
-  #
-  # Returns +true+ if and only if the contents of files +from+ and +to+ are
-  # identical. If +verbose+ is +true+, <tt>from <=> to</tt> is printed.
-  #
-  def compare(from, to, verbose = false)
-    $stderr.print from, " <=> ", to, "\n" if verbose
-
-    return false if stat(from).size != stat(to).size
-
-    from = open(from, "rb")
-    to = open(to, "rb")
-
-    ret = false
-    fr = tr = ''
-
-    begin
-      while fr == tr
-	fr = from.read(BUFSIZE)
-	if fr
-	  tr = to.read(fr.size)
-	else
-	  ret = to.read(BUFSIZE)
-	  ret = !ret || ret.length == 0
-	  break
-	end
-      end
-    rescue
-      ret = false
-    ensure
-      to.close
-      from.close
-    end
-    ret
-  end
-
-  alias cmp compare
-
-  #
-  # Removes a list of files. Each parameter should be the name of the file to
-  # delete. If the last parameter isn't a String, verbose mode will be enabled.
-  # Returns the number of files deleted.
-  #
-  def safe_unlink(*files)
-    verbose = if files[-1].is_a? String then false else files.pop end
-    files.each do |file|
-      begin
-        unlink file
-        $stderr.print "removing ", file, "\n" if verbose
-      rescue Errno::EACCES # for Windows
-        continue if symlink? file
-        begin
-          mode = stat(file).mode
-          o_chmod mode | 0200, file
-          unlink file
-          $stderr.print "removing ", file, "\n" if verbose
-        rescue
-          o_chmod mode, file rescue nil
-        end
-      rescue
-      end
-    end
-  end
-
-  alias rm_f safe_unlink
-
-  #
-  # Creates a directory and all its parent directories.
-  # For example,
-  #
-  #	File.makedirs '/usr/lib/ruby'
-  #
-  # causes the following directories to be made, if they do not exist.
-  #	* /usr
-  #	* /usr/lib
-  #	* /usr/lib/ruby
-  #
-  # You can pass several directories, each as a parameter. If the last
-  # parameter isn't a String, verbose mode will be enabled.
-  #
-  def makedirs(*dirs)
-    verbose = if dirs[-1].is_a? String then false else dirs.pop end
-    mode = 0755
-    for dir in dirs
-      parent = dirname(dir)
-      next if parent == dir or directory? dir
-      makedirs parent unless directory? parent
-      $stderr.print "mkdir ", dir, "\n" if verbose
-      if basename(dir) != ""
-        begin
-          Dir.mkdir dir, mode
-        rescue SystemCallError
-          raise unless directory? dir
-        end
-      end
-    end
-  end
-
-  alias mkpath makedirs
-
-  alias o_chmod chmod
-
-  vsave, $VERBOSE = $VERBOSE, false
-
-  #
-  # Changes permission bits on +files+ to the bit pattern represented
-  # by +mode+. If the last parameter isn't a String, verbose mode will
-  # be enabled.
-  #
-  #   File.chmod 0755, 'somecommand'
-  #   File.chmod 0644, 'my.rb', 'your.rb', true
-  #
-  def chmod(mode, *files)
-    verbose = if files[-1].is_a? String then false else files.pop end
-    $stderr.printf "chmod %04o %s\n", mode, files.join(" ") if verbose
-    o_chmod mode, *files
-  end
-  $VERBOSE = vsave
-
-  #
-  # If +src+ is not the same as +dest+, copies it and changes the permission
-  # mode to +mode+. If +dest+ is a directory, destination is <tt>dest/src</tt>.
-  # If +mode+ is not set, default is used. If +verbose+ is set to true, the
-  # name of each file copied will be printed.
-  #
-  def install(from, to, mode = nil, verbose = false)
-    to = catname(from, to)
-    unless exist? to and cmp from, to
-      safe_unlink to if exist? to
-      cp from, to, verbose
-      chmod mode, to, verbose if mode
-    end
-  end
-
-end
-
-# vi:set sw=2:
diff --git a/lib/generator.rb b/lib/generator.rb
deleted file mode 100644
index a010559b60..0000000000
--- a/lib/generator.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# $Idaemons: /home/cvs/rb/generator.rb,v 1.8 2001/10/03 08:54:32 knu Exp $
-# $RoughId: generator.rb,v 1.10 2003/10/14 19:36:58 knu Exp $
-# $Id$
-#++
-#
-# = generator.rb: convert an internal iterator to an external one
-#
-# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
-#
-# All rights reserved.  You can redistribute and/or modify it under
-# the same terms as Ruby.
-#
-# == Overview
-#
-# This library provides the Generator class, which converts an
-# internal iterator (i.e. an Enumerable object) to an external
-# iterator.  In that form, you can roll many iterators independently.
-#
-# The SyncEnumerator class, which is implemented using Generator,
-# makes it easy to roll many Enumerable objects synchronously.
-#
-# See the respective classes for examples of usage.
-
-
-#
-# Generator converts an internal iterator (i.e. an Enumerable object)
-# to an external iterator.
-#
-# Note that it is not very fast since it is implemented using
-# continuations, which are currently slow.
-#
-# == Example
-#
-#   require 'generator'
-#
-#   # Generator from an Enumerable object
-#   g = Generator.new(['A', 'B', 'C', 'Z'])
-#
-#   while g.next?
-#     puts g.next
-#   end
-#
-#   # Generator from a block
-#   g = Generator.new { |g|
-#     for i in 'A'..'C'
-#       g.yield i
-#     end
-#
-#     g.yield 'Z'
-#   }
-#
-#   # The same result as above
-#   while g.next?
-#     puts g.next
-#   end
-#   
-class Generator
-  include Enumerable
-
-  # Creates a new generator either from an Enumerable object or from a
-  # block.
-  #
-  # In the former, block is ignored even if given.
-  #
-  # In the latter, the given block is called with the generator
-  # itself, and expected to call the +yield+ method for each element.
-  def initialize(enum = nil, &block)
-    if enum
-      @block = proc { |g|
-	enum.each { |x| g.yield x }
-      }
-    else
-      @block = block
-    end
-
-    @index = 0
-    @queue = []
-    @cont_next = @cont_yield = @cont_endp = nil
-
-    if @cont_next = callcc { |c| c }
-      @block.call(self)
-
-      @cont_endp.call(nil) if @cont_endp
-    end
-
-    self
-  end
-
-  # Yields an element to the generator.
-  def yield(value)
-    if @cont_yield = callcc { |c| c }
-      @queue << value
-      @cont_next.call(nil)
-    end
-
-    self
-  end
-
-  # Returns true if the generator has reached the end.
-  def end?()
-    if @cont_endp = callcc { |c| c }
-      @cont_yield.nil? && @queue.empty?
-    else
-      @queue.empty?
-    end
-  end
-
-  # Returns true if the generator has not reached the end yet.
-  def next?()
-    !end?
-  end
-
-  # Returns the current index (position) counting from zero.
-  def index()
-    @index
-  end
-
-  # Returns the current index (position) counting from zero.
-  def pos()
-    @index
-  end
-
-  # Returns the element at the current position and moves forward.
-  def next()
-    if end?
-      raise EOFError, "no more elements available"
-    end
-
-    if @cont_next = callcc { |c| c }
-      @cont_yield.call(nil) if @cont_yield
-    end
-
-    @index += 1
-
-    @queue.shift
-  end
-
-  # Returns the element at the current position.
-  def current()
-    if @queue.empty?
-      raise EOFError, "no more elements available"
-    end
-
-    @queue.first
-  end
-
-  # Rewinds the generator.
-  def rewind()
-    initialize(nil, &@block) if @index.nonzero?
-
-    self
-  end
-
-  # Rewinds the generator and enumerates the elements.
-  def each
-    rewind
-
-    until end?
-      yield self.next
-    end
-
-    self
-  end
-end
-
-#
-# SyncEnumerator creates an Enumerable object from multiple Enumerable
-# objects and enumerates them synchronously.
-#
-# == Example
-#
-#   require 'generator'
-#
-#   s = SyncEnumerator.new([1,2,3], ['a', 'b', 'c'])
-#
-#   # Yields [1, 'a'], [2, 'b'], and [3,'c']
-#   s.each { |row| puts row.join(', ') }
-#
-class SyncEnumerator
-  include Enumerable
-
-  # Creates a new SyncEnumerator which enumerates rows of given
-  # Enumerable objects.
-  def initialize(*enums)
-    @gens = enums.map { |e| Generator.new(e) }
-  end
-
-  # Returns the number of enumerated Enumerable objects, i.e. the size
-  # of each row.
-  def size
-    @gens.size
-  end
-
-  # Returns the number of enumerated Enumerable objects, i.e. the size
-  # of each row.
-  def length
-    @gens.length
-  end
-
-  # Returns true if the given nth Enumerable object has reached the
-  # end.  If no argument is given, returns true if any of the
-  # Enumerable objects has reached the end.
-  def end?(i = nil)
-    if i.nil?
-      @gens.detect { |g| g.end? } ? true : false
-    else
-      @gens[i].end?
-    end
-  end
-
-  # Enumerates rows of the Enumerable objects.
-  def each
-    @gens.each { |g| g.rewind }
-
-    loop do
-      count = 0
-
-      ret = @gens.map { |g|
-	if g.end?
-	  count += 1
-	  nil
-	else
-	  g.next
-	end
-      }
-
-      if count == @gens.size
-	break
-      end
-
-      yield ret
-    end
-
-    self
-  end
-end
-
-if $0 == __FILE__
-  eval DATA.read, nil, $0, __LINE__+4
-end
-
-__END__
-
-require 'test/unit'
-
-class TC_Generator < Test::Unit::TestCase
-  def test_block1
-    g = Generator.new { |g|
-      # no yield's
-    }
-
-    assert_equal(0, g.pos)
-    assert_raises(EOFError) { g.current }
-  end
-
-  def test_block2
-    g = Generator.new { |g|
-      for i in 'A'..'C'
-        g.yield i
-      end
-
-      g.yield 'Z'
-    }
-
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-
-    assert_equal(true, g.next?)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.next)
-
-    assert_equal(1, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.current)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.next)
-
-    assert_equal(g, g.rewind)
-
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-
-    assert_equal(true, g.next?)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.next)
-
-    assert_equal(1, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.current)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.next)
-
-    assert_equal(2, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(2, g.pos)
-    assert_equal('C', g.current)
-    assert_equal(2, g.pos)
-    assert_equal('C', g.next)
-
-    assert_equal(3, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(3, g.pos)
-    assert_equal('Z', g.current)
-    assert_equal(3, g.pos)
-    assert_equal('Z', g.next)
-
-    assert_equal(4, g.pos)
-    assert_equal(false, g.next?)
-    assert_raises(EOFError) { g.next }
-  end
-
-  def test_each
-    a = [5, 6, 7, 8, 9]
-
-    g = Generator.new(a)
-
-    i = 0
-
-    g.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-
-      break if i == 3
-    }
-
-    assert_equal(3, i)
-
-    i = 0
-
-    g.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-    }
-
-    assert_equal(5, i)
-  end
-end
-
-class TC_SyncEnumerator < Test::Unit::TestCase
-  def test_each
-    r = ['a'..'f', 1..10, 10..20]
-    ra = r.map { |x| x.to_a }
-
-    a = (0...(ra.map {|x| x.size}.max)).map { |i| ra.map { |x| x[i] } }
-
-    s = SyncEnumerator.new(*r)
-
-    i = 0
-
-    s.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-
-      break if i == 3
-    }
-
-    assert_equal(3, i)
-
-    i = 0
-
-    s.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-    }
-
-    assert_equal(a.size, i)
-  end
-end
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index 4d004419b1..7bd9ee55cc 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -12,10 +12,10 @@
 # found at http://www.sra.co.jp/people/m-kasahr/ruby/getoptlong/
 
 # The GetoptLong class allows you to parse command line options similarly to
-# the GNU getopt_long() C library call. Note, however, that GetoptLong is a 
+# the GNU getopt_long() C library call. Note, however, that GetoptLong is a
 # pure Ruby implementation.
 #
-# GetoptLong allows for POSIX-style options like <tt>--file</tt> as well 
+# GetoptLong allows for POSIX-style options like <tt>--file</tt> as well
 # as single letter options like <tt>-f</tt>
 #
 # The empty option <tt>--</tt> (two minus symbols) is used to end option
@@ -24,41 +24,34 @@
 #
 # Here is a simple example of usage:
 #
-#     # == Synopsis
-#     #
-#     # hello: greets user, demonstrates command line parsing
-#     #
-#     # == Usage
-#     #
-#     # hello [OPTION] ... DIR
-#     #
-#     # -h, --help:
-#     #    show help
-#     #
-#     # --repeat x, -n x:
-#     #    repeat x times
-#     #
-#     # --name [name]:
-#     #    greet user by name, if name not supplied default is John
-#     #
-#     # DIR: The directory in which to issue the greeting.
-#     
 #     require 'getoptlong'
-#     require 'rdoc/usage'
-#     
+#
 #     opts = GetoptLong.new(
 #       [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
 #       [ '--repeat', '-n', GetoptLong::REQUIRED_ARGUMENT ],
 #       [ '--name', GetoptLong::OPTIONAL_ARGUMENT ]
 #     )
-#     
+#
 #     dir = nil
 #     name = nil
 #     repetitions = 1
 #     opts.each do |opt, arg|
 #       case opt
 #         when '--help'
-#           RDoc::usage
+#           puts <<-EOF
+#     hello [OPTION] ... DIR
+#
+#     -h, --help:
+#        show help
+#
+#     --repeat x, -n x:
+#        repeat x times
+#
+#     --name [name]:
+#        greet user by name, if name not supplied default is John
+#
+#     DIR: The directory in which to issue the greeting.
+#           EOF
 #         when '--repeat'
 #           repetitions = arg.to_i
 #         when '--name'
@@ -69,14 +62,14 @@
 #           end
 #       end
 #     end
-#     
+#
 #     if ARGV.length != 1
 #       puts "Missing dir argument (try --help)"
 #       exit 0
 #     end
-#     
+#
 #     dir = ARGV.shift
-#     
+#
 #     Dir.chdir(dir)
 #     for i in (1..repetitions)
 #       print "Hello"
@@ -111,7 +104,7 @@ class GetoptLong
   # Error types.
   #
   class Error  < StandardError; end
-  class AmbigousOption   < Error; end
+  class AmbiguousOption   < Error; end
   class NeedlessArgument < Error; end
   class MissingArgument  < Error; end
   class InvalidOption    < Error; end
@@ -120,7 +113,7 @@ class GetoptLong
   # Set up option processing.
   #
   # The options to support are passed to new() as an array of arrays.
-  # Each sub-array contains any number of String option names which carry 
+  # Each sub-array contains any number of String option names which carry
   # the same meaning, and one of the following flags:
   #
   # GetoptLong::NO_ARGUMENT :: Option does not take an argument.
@@ -157,7 +150,7 @@ class GetoptLong
     @argument_flags = Hash.new
 
     #
-    # Whether error messages are output to $deferr.
+    # Whether error messages are output to $stderr.
     #
     @quiet = FALSE
 
@@ -200,23 +193,23 @@ class GetoptLong
   # the processing of options as follows:
   #
   # <b>REQUIRE_ORDER</b> :
-  # 
+  #
   # Options are required to occur before non-options.
   #
   # Processing of options ends as soon as a word is encountered that has not
   # been preceded by an appropriate option flag.
   #
   # For example, if -a and -b are options which do not take arguments,
-  # parsing command line arguments of '-a one -b two' would result in 
-  # 'one', '-b', 'two' being left in ARGV, and only ('-a', '') being 
+  # parsing command line arguments of '-a one -b two' would result in
+  # 'one', '-b', 'two' being left in ARGV, and only ('-a', '') being
   # processed as an option/arg pair.
   #
   # This is the default ordering, if the environment variable
   # POSIXLY_CORRECT is set. (This is for compatibility with GNU getopt_long.)
   #
   # <b>PERMUTE</b> :
-  #  
-  # Options can occur anywhere in the command line parsed. This is the 
+  #
+  # Options can occur anywhere in the command line parsed. This is the
   # default behavior.
   #
   # Every sequence of words which can be interpreted as an option (with or
@@ -233,7 +226,7 @@ class GetoptLong
   #
   # <b>RETURN_IN_ORDER</b> :
   #
-  # All words on the command line are processed as options. Words not 
+  # All words on the command line are processed as options. Words not
   # preceded by a short or long option flag are passed as arguments
   # with an option of '' (empty string).
   #
@@ -279,7 +272,7 @@ class GetoptLong
     # The method is failed if option processing has already started.
     #
     if @status != STATUS_YET
-      raise RuntimeError, 
+      raise RuntimeError,
 	"invoke set_options, but option processing has already started"
     end
 
@@ -290,11 +283,8 @@ class GetoptLong
     @argument_flags.clear
 
     arguments.each do |arg|
-      #
-      # Each argument must be an Array.
-      #
       if !arg.is_a?(Array)
-	raise ArgumentError, "the option list contains non-Array argument"
+       raise ArgumentError, "the option list contains non-Array argument"
       end
 
       #
@@ -309,6 +299,7 @@ class GetoptLong
 	  argument_flag = i
 	end
       end
+
       raise ArgumentError, "no argument-flag" if argument_flag == nil
 
       canonical_name = nil
@@ -331,7 +322,7 @@ class GetoptLong
 	end
 
 	#
-	# Register the option (`i') to the `@canonical_names' and 
+	# Register the option (`i') to the `@canonical_names' and
 	# `@canonical_names' Hashes.
 	#
 	if canonical_name == nil
@@ -388,10 +379,10 @@ class GetoptLong
   end
 
   #
-  # Set an error (protected).
+  # Set an error (a protected method).
   #
   def set_error(type, message)
-    $deferr.print("#{$0}: #{message}\n") if !@quiet
+    $stderr.print("#{$0}: #{message}\n") if !@quiet
 
     @error = type
     @error_message = message
@@ -463,7 +454,7 @@ class GetoptLong
 	return nil
       end
       argument = ARGV.shift
-    elsif @ordering == REQUIRE_ORDER 
+    elsif @ordering == REQUIRE_ORDER
       if (ARGV[0] !~ /^-./)
 	terminate
 	return nil
@@ -497,16 +488,16 @@ class GetoptLong
 	# The option `option_name' is not registered in `@canonical_names'.
 	# It may be an abbreviated.
 	#
-	match_count = 0
+	matches = []
 	@canonical_names.each_key do |key|
 	  if key.index(pattern) == 0
 	    option_name = key
-	    match_count += 1
+	    matches << key
 	  end
 	end
-	if 2 <= match_count
-	  set_error(AmbigousOption, "option `#{argument}' is ambiguous")
-	elsif match_count == 0
+	if 2 <= matches.length
+	  set_error(AmbiguousOption, "option `#{argument}' is ambiguous between #{matches.join(', ')}")
+	elsif matches.length == 0
 	  set_error(InvalidOption, "unrecognized option `#{argument}'")
 	end
       end
@@ -575,7 +566,7 @@ class GetoptLong
 	# 1003.2 specifies the format of this message.
 	#
 	if ENV.include?('POSIXLY_CORRECT')
-	  set_error(InvalidOption, "illegal option -- #{ch}")
+	  set_error(InvalidOption, "invalid option -- #{ch}")
 	else
 	  set_error(InvalidOption, "invalid option -- #{ch}")
 	end
@@ -600,7 +591,7 @@ class GetoptLong
   #
   # The block is called repeatedly with two arguments:
   # The first is the option name.
-  # The second is the argument which followed it (if any). 
+  # The second is the argument which followed it (if any).
   # Example: ('--opt', 'value')
   #
   # The option name is always converted to the first (preferred)
diff --git a/lib/getopts.rb b/lib/getopts.rb
deleted file mode 100644
index 7124269351..0000000000
--- a/lib/getopts.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-#               getopts.rb - 
-#                       $Release Version: $
-#                       $Revision$
-#                       $Date$
-#                       by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
-#
-# --
-# this is obsolete; use getoptlong
-#
-# 2000-03-21
-# modified by Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-#
-# 2002-03-05
-# rewritten by Akinori MUSHA <knu@ruby-lang.org>
-#
-
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: getopts is deprecated after Ruby 1.8.1; use optparse instead" if caller[0] and $VERBOSE
-
-$RCS_ID=%q$Header$
-
-# getopts is obsolete. Use GetoptLong.
-
-def getopts(single_options, *options)
-  boolopts = {}
-  valopts = {}
-
-  #
-  # set defaults
-  #
-  single_options.scan(/.:?/) do |opt|
-    if opt.size == 1
-      boolopts[opt] = false
-    else
-      valopts[opt[0, 1]] = nil
-    end
-  end if single_options
-
-  options.each do |arg|
-    opt, val = arg.split(':', 2)
-
-    if val
-      valopts[opt] = val.empty? ? nil : val
-    else
-      boolopts[opt] = false
-    end
-  end
-
-  #
-  # scan
-  #
-  c = 0
-  argv = ARGV
-
-  while arg = argv.shift
-    case arg
-    when /\A--(.*)/
-      if $1.empty?			# xinit -- -bpp 24
-	break
-      end
-
-      opt, val = $1.split('=', 2)
-
-      if opt.size == 1
-	argv.unshift arg
-	return nil
-      elsif valopts.key? opt		# imclean --src +trash
-	valopts[opt] = val || argv.shift or return nil
-      elsif boolopts.key? opt		# ruby --verbose
-	boolopts[opt] = true
-      else
-	argv.unshift arg
-	return nil
-      end
-
-      c += 1
-    when /\A-(.+)/
-      opts = $1
-
-      until opts.empty?
-	opt = opts.slice!(0, 1)
-
-	if valopts.key? opt
-	  val = opts
-
-	  if val.empty?			# ruby -e 'p $:'
-	    valopts[opt] = argv.shift or return nil
-	  else				# cc -ohello ...
-	    valopts[opt] = val
-	  end
-
-	  c += 1
-	  break
-	elsif boolopts.key? opt
-	  boolopts[opt] = true		# ruby -h
-	  c += 1
-	else
-	  argv.unshift arg
-	  return nil
-	end
-      end
-    else
-      argv.unshift arg
-      break
-    end
-  end
-
-  #
-  # set
-  #
-  $OPT = {}
-
-  boolopts.each do |opt, val|
-    $OPT[opt] = val
-
-    sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
-    eval "$OPT_#{sopt} = val"
-  end
-  valopts.each do |opt, val|
-    $OPT[opt] = val
-
-    sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
-    eval "$OPT_#{sopt} = val"
-  end
-
-  c
-end
diff --git a/lib/gserver.rb b/lib/gserver.rb
index eb5f31b7b3..2ab6e42bce 100644
--- a/lib/gserver.rb
+++ b/lib/gserver.rb
@@ -13,7 +13,7 @@ require "thread"
 
 #
 # GServer implements a generic server, featuring thread pool management,
-# simple logging, and multi-server management.  See HttpServer in 
+# simple logging, and multi-server management.  See HttpServer in
 # <tt>xmlrpc/httpserver.rb</tt> in the Ruby standard library for an example of
 # GServer in action.
 #
@@ -34,30 +34,30 @@ require "thread"
 #
 #   #
 #   # A server that returns the time in seconds since 1970.
-#   # 
+#   #
 #   class TimeServer < GServer
 #     def initialize(port=10001, *args)
 #       super(port, *args)
 #     end
 #     def serve(io)
-#       io.puts(Time.now.to_i)
+#       io.puts(Time.now.to_s)
 #     end
 #   end
 #
 #   # Run the server with logging enabled (it's a separate thread).
 #   server = TimeServer.new
 #   server.audit = true                  # Turn logging on.
-#   server.start 
+#   server.start
 #
 #   # *** Now point your browser to http://localhost:10001 to see it working ***
 #
-#   # See if it's still running. 
+#   # See if it's still running.
 #   GServer.in_service?(10001)           # -> true
 #   server.stopped?                      # -> false
 #
 #   # Shut the server down gracefully.
 #   server.shutdown
-#   
+#
 #   # Alternatively, stop it immediately.
 #   GServer.stop(10001)
 #   # or, of course, "server.stop".
diff --git a/lib/importenv.rb b/lib/importenv.rb
deleted file mode 100644
index 8e1ba33b1d..0000000000
--- a/lib/importenv.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# importenv.rb -- imports environment variables as global variables, Perlish ;(
-#
-# Usage:
-#
-#  require 'importenv'
-#  p $USER
-#  $USER = "matz"
-#  p ENV["USER"]
-
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: importenv is deprecated after Ruby 1.8.1 (no replacement)"
-
-for k,v in ENV
-  next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k
-  eval <<EOS
-  $#{k} = v
-  trace_var "$#{k}", proc{|v|
-    ENV[%q!#{k}!] = v
-    $#{k} = v
-    if v == nil
-      untrace_var "$#{k}"
-    end
-  }
-EOS
-end
-
-if __FILE__ == $0
-  p $TERM
-  $TERM = nil
-  p $TERM
-  p ENV["TERM"]
-  $TERM = "foo"
-  p ENV["TERM"]
-end
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 17e47f016f..226a996021 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -2,18 +2,23 @@
 # ipaddr.rb - A class to manipulate an IP address
 #
 # Copyright (c) 2002 Hajimu UMEMOTO <ume@mahoroba.org>.
+# Copyright (c) 2007 Akinori MUSHA <knu@iDaemons.org>.
 # All rights reserved.
 #
 # You can redistribute and/or modify it under the same terms as Ruby.
 #
 # $Id$
 #
+# Contact:
+#   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
+#
 # TODO:
 #   - scope_id support
+#
 require 'socket'
 
 unless Socket.const_defined? "AF_INET6"
-  class Socket
+  class Socket < BasicSocket
     AF_INET6 = Object.new
   end
 
@@ -61,19 +66,19 @@ end
 # == Example
 #
 #   require 'ipaddr'
-#   
+#
 #   ipaddr1 = IPAddr.new "3ffe:505:2::1"
-#   
+#
 #   p ipaddr1			#=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0001/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>
-#   
+#
 #   p ipaddr1.to_s		#=> "3ffe:505:2::1"
-#   
+#
 #   ipaddr2 = ipaddr1.mask(48)	#=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>
-#   
+#
 #   p ipaddr2.to_s		#=> "3ffe:505:2::"
-#   
+#
 #   ipaddr3 = IPAddr.new "192.168.2.0/24"
-#   
+#
 #   p ipaddr3			#=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
 
 class IPAddr
@@ -83,7 +88,7 @@ class IPAddr
   IN6FORMAT = (["%.4x"] * 8).join(':')
 
   # Returns the address family of this IP address.
-  attr :family
+  attr_reader :family
 
   # Creates a new ipaddr containing the given network byte ordered
   # string form of an IP address.
@@ -107,12 +112,12 @@ class IPAddr
 
   # Returns a new ipaddr built by bitwise AND.
   def &(other)
-    return self.clone.set(@addr & other.to_i)
+    return self.clone.set(@addr & coerce_other(other).to_i)
   end
 
   # Returns a new ipaddr built by bitwise OR.
   def |(other)
-    return self.clone.set(@addr | other.to_i)
+    return self.clone.set(@addr | coerce_other(other).to_i)
   end
 
   # Returns a new ipaddr built by bitwise right-shift.
@@ -130,12 +135,10 @@ class IPAddr
     return self.clone.set(addr_mask(~@addr))
   end
 
-  # Returns true if two ipaddr are equal.
+  # Returns true if two ipaddrs are equal.
   def ==(other)
-    if other.kind_of?(IPAddr) && @family != other.family
-      return false
-    end
-    return (@addr == other.to_i)
+    other = coerce_other(other)
+    return @family == other.family && @addr == other.to_i
   end
 
   # Returns a new ipaddr built by masking IP address with the given
@@ -149,10 +152,12 @@ class IPAddr
   # e.g.:
   #   require 'ipaddr'
   #   net1 = IPAddr.new("192.168.2.0/24")
-  #   p net1.include?(IPAddr.new("192.168.2.0"))	#=> true
-  #   p net1.include?(IPAddr.new("192.168.2.255"))	#=> true
-  #   p net1.include?(IPAddr.new("192.168.3.0"))	#=> false
+  #   net2 = IPAddr.new("192.168.2.100")
+  #   net3 = IPAddr.new("192.168.3.0")
+  #   p net1.include?(net2)	#=> true
+  #   p net1.include?(net3)	#=> false
   def include?(other)
+    other = coerce_other(other)
     if ipv4_mapped?
       if (@mask_addr >> 32) != 0xffffffffffffffffffffffff
 	return false
@@ -165,17 +170,12 @@ class IPAddr
       addr = @addr
       family = @family
     end
-    if other.kind_of?(IPAddr)
-      if other.ipv4_mapped?
-	other_addr = (other.to_i & IN4MASK)
-	other_family = Socket::AF_INET
-      else
-	other_addr = other.to_i
-	other_family = other.family
-      end
-    else # Not IPAddr - assume integer in same family as us
-      other_addr   = other.to_i
-      other_family = family
+    if other.ipv4_mapped?
+      other_addr = (other.to_i & IN4MASK)
+      other_family = Socket::AF_INET
+    else
+      other_addr = other.to_i
+      other_family = other.family
     end
 
     if family != other_family
@@ -316,6 +316,47 @@ class IPAddr
     return _reverse + ".ip6.int"
   end
 
+  # Returns the successor to the ipaddr.
+  def succ
+    return self.clone.set(@addr + 1, @family)
+  end
+
+  # Compares the ipaddr with another.
+  def <=>(other)
+    other = coerce_other(other)
+
+    return nil if other.family != @family
+
+    return @addr <=> other.to_i
+  end
+  include Comparable
+
+  # Checks equality used by Hash.
+  def eql?(other)
+    return self.class == other.class && self.hash == other.hash && self == other
+  end
+
+  # Returns a hash value used by Hash, Set, and Array classes
+  def hash
+    return ([@addr, @mask_addr].hash << 1) | (ipv4? ? 0 : 1)
+  end
+
+  # Creates a Range object for the network address.
+  def to_range
+    begin_addr = (@addr & @mask_addr)
+
+    case @family
+    when Socket::AF_INET
+      end_addr = (@addr | (IN4MASK ^ @mask_addr))
+    when Socket::AF_INET6
+      end_addr = (@addr | (IN6MASK ^ @mask_addr))
+    else
+      raise "unsupported address family"
+    end
+
+    return clone.set(begin_addr, @family)..clone.set(end_addr, @family)
+  end
+
   # Returns a string containing a human-readable representation of the
   # ipaddr. ("#<IPAddr: family:address/mask>")
   def inspect
@@ -391,22 +432,36 @@ class IPAddr
 
   private
 
-  # Creates a new ipaddr containing the given human readable form of
-  # an IP address.  It also accepts `address/prefixlen' and
-  # `address/mask'.  When prefixlen or mask is specified, it returns a
-  # masked ipaddr.  IPv6 address may beenclosed with `[' and `]'.
+  # Creates a new ipaddr object either from a human readable IP
+  # address representation in string, or from a packed in_addr value
+  # followed by an address family.
+  #
+  # In the former case, the following are the valid formats that will
+  # be recognized: "address", "address/prefixlen" and "address/mask",
+  # where IPv6 address may be enclosed in square brackets (`[' and
+  # `]').  If a prefixlen or a mask is specified, it returns a masked
+  # IP address.  Although the address family is determined
+  # automatically from a specified string, you can specify one
+  # explicitly by the optional second argument.
   #
-  # Although an address family is determined automatically from a
-  # specified address, you can specify an address family explicitly by
-  # the optional second argument.
+  # Otherwise an IP address is generated from a packed in_addr value
+  # and an address family.
+  #
+  # The IPAddr class defines many methods and operators, and some of
+  # those, such as &, |, include? and ==, accept a string, or a packed
+  # in_addr value instead of an IPAddr object.
   def initialize(addr = '::', family = Socket::AF_UNSPEC)
     if !addr.kind_of?(String)
-      if family != Socket::AF_INET6 && family != Socket::AF_INET
-	raise ArgumentError, "unsupported address family"
+      case family
+      when Socket::AF_INET, Socket::AF_INET6
+        set(addr.to_i, family)
+        @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+        return
+      when Socket::AF_UNSPEC
+	raise ArgumentError, "address family must be specified"
+      else
+	raise ArgumentError, "unsupported address family: #{family}"
       end
-      set(addr, family)
-      @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
-      return
     end
     prefix, prefixlen = addr.split('/')
     if prefix =~ /^\[(.*)\]$/i
@@ -417,7 +472,7 @@ class IPAddr
     #Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil,
     #		       Socket::AI_NUMERICHOST)
     begin
-      IPSocket.getaddress(prefix)		# test if address is vaild
+      IPSocket.getaddress(prefix)		# test if address is valid
     rescue
       raise ArgumentError, "invalid address"
     end
@@ -433,23 +488,31 @@ class IPAddr
       @family = Socket::AF_INET6
     end
     if family != Socket::AF_UNSPEC && @family != family
-      raise ArgumentError, "address family unmatch"
+      raise ArgumentError, "address family mismatch"
     end
     if prefixlen
       mask!(prefixlen)
     else
-      @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+      @mask_addr = (@family == Socket::AF_INET) ? IN4MASK : IN6MASK
+    end
+  end
+
+  def coerce_other(other)
+    case other
+    when IPAddr
+      other
+    when String
+      self.class.new(other)
+    else
+      self.class.new(other, @family)
     end
   end
 
   def in_addr(addr)
     if addr =~ /^\d+\.\d+\.\d+\.\d+$/
-      n = 0
-      addr.split('.').each { |i|
-	n <<= 8
-	n += i.to_i
+      return addr.split('.').inject(0) { |i, s|
+        i << 8 | s.to_i
       }
-      return n
     end
     return nil
   end
@@ -473,25 +536,20 @@ class IPAddr
     if rest < 0
       return nil
     end
-    a = [l, Array.new(rest, '0'), r].flatten!
-    n = 0
-    a.each { |i|
-      n <<= 16
-      n += i.hex
+    return (l + Array.new(rest, '0') + r).inject(0) { |i, s|
+      i << 16 | s.hex
     }
-    return n
   end
 
   def addr_mask(addr)
     case @family
     when Socket::AF_INET
-      addr &= IN4MASK
+      return addr & IN4MASK
     when Socket::AF_INET6
-      addr &= IN6MASK
+      return addr & IN6MASK
     else
       raise "unsupported address family"
     end
-    return addr
   end
 
   def _reverse
@@ -529,7 +587,6 @@ end
 __END__
 
 require 'test/unit'
-require 'test/unit/ui/console/testrunner'
 
 class TC_IPAddr < Test::Unit::TestCase
   def test_s_new
@@ -763,4 +820,31 @@ class TC_Operator < Test::Unit::TestCase
 
   end
 
+  def test_hash
+    a1 = IPAddr.new('192.168.2.0')
+    a2 = IPAddr.new('192.168.2.0')
+    a3 = IPAddr.new('3ffe:505:2::1')
+    a4 = IPAddr.new('3ffe:505:2::1')
+    a5 = IPAddr.new('127.0.0.1')
+    a6 = IPAddr.new('::1')
+    a7 = IPAddr.new('192.168.2.0/25')
+    a8 = IPAddr.new('192.168.2.0/25')
+
+    h = { a1 => 'ipv4', a2 => 'ipv4', a3 => 'ipv6', a4 => 'ipv6', a5 => 'ipv4', a6 => 'ipv6', a7 => 'ipv4', a8 => 'ipv4'}
+    assert_equal(5, h.size)
+    assert_equal('ipv4', h[a1])
+    assert_equal('ipv4', h[a2])
+    assert_equal('ipv6', h[a3])
+    assert_equal('ipv6', h[a4])
+
+    require 'set'
+    s = Set[a1, a2, a3, a4, a5, a6, a7, a8]
+    assert_equal(5, s.size)
+    assert_equal(true, s.include?(a1))
+    assert_equal(true, s.include?(a2))
+    assert_equal(true, s.include?(a3))
+    assert_equal(true, s.include?(a4))
+    assert_equal(true, s.include?(a5))
+    assert_equal(true, s.include?(a6))
+  end
 end
diff --git a/lib/irb.rb b/lib/irb.rb
index 7580e39d43..7a9d438b5b 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -1,8 +1,7 @@
 #
 #   irb.rb - irb main module
-#   	$Release Version: 0.9.5 $
+#   	$Release Version: 0.9.6 $
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
@@ -65,13 +64,21 @@ module IRB
     trap("SIGINT") do
       irb.signal_handle
     end
-    
-    catch(:IRB_EXIT) do
-      irb.eval_input
+
+    begin
+      catch(:IRB_EXIT) do
+	irb.eval_input
+      end
+    ensure
+      irb_at_exit
     end
 #    print "\n"
   end
 
+  def IRB.irb_at_exit
+    @CONF[:AT_EXIT].each{|hook| hook.call}
+  end
+
   def IRB.irb_exit(irb, ret)
     throw :IRB_EXIT, ret
   end
@@ -85,7 +92,7 @@ module IRB
   end
 
   #
-  # irb interpriter main routine 
+  # irb interpreter main routine
   #
   class Irb
     def initialize(workspace = nil, input_method = nil, output_method = nil)
@@ -108,7 +115,7 @@ module IRB
 	  f = @context.prompt_c
 	elsif indent > 0
 	  f = @context.prompt_n
-	else @context.prompt_i
+	else
 	  f = @context.prompt_i
 	end
 	f = "" unless f
@@ -126,7 +133,7 @@ module IRB
 	  end
 	end
       end
-       
+
       @scanner.set_input(@context.io) do
 	signal_status(:IN_INPUT) do
 	  if l = @context.io.gets
@@ -137,6 +144,8 @@ module IRB
 	      if @context.verbose?
 		printf "Use \"exit\" to leave %s\n", @context.ap_name
 	      end
+	    else
+	      print "\n"
 	    end
 	  end
 	  l
@@ -157,12 +166,13 @@ module IRB
 	  end
 	  if exc
 	    print exc.class, ": ", exc, "\n"
-	    if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/
-	      irb_bug = true 
+	    if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
+                !(SyntaxError === exc)
+	      irb_bug = true
 	    else
 	      irb_bug = false
 	    end
-	    
+
 	    messages = []
 	    lasts = []
 	    levels = 0
@@ -174,7 +184,7 @@ module IRB
 		else
 		  lasts.push "\tfrom "+m
 		  if lasts.size > @context.back_trace_limit
-		    lasts.shift 
+		    lasts.shift
 		    levels += 1
 		  end
 		end
@@ -279,13 +289,13 @@ module IRB
 	when "l"
 	  ltype
 	when "i"
-	  if $1 
+	  if $1
 	    format("%" + $1 + "d", indent)
 	  else
 	    indent.to_s
 	  end
 	when "n"
-	  if $1 
+	  if $1
 	    format("%" + $1 + "d", line_no)
 	  else
 	    line_no.to_s
@@ -298,17 +308,13 @@ module IRB
     end
 
     def output_value
-      if @context.inspect?
-        printf @context.return_format, @context.last_value.inspect
-      else
-        printf @context.return_format, @context.last_value
-      end
+      printf @context.return_format, @context.inspect_last_value
     end
 
     def inspect
       ary = []
       for iv in instance_variables
-	case iv
+	case (iv = iv.to_s)
 	when "@signal_status"
 	  ary.push format("%s=:%s", iv, @signal_status.id2name)
 	when "@context"
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
index 88585b778b..65c977016b 100644
--- a/lib/irb/cmd/chws.rb
+++ b/lib/irb/cmd/chws.rb
@@ -1,13 +1,12 @@
 #
-#   change-ws.rb - 
-#   	$Release Version: 0.9.5$
+#   change-ws.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
diff --git a/lib/irb/cmd/fork.rb b/lib/irb/cmd/fork.rb
index 2866b1373b..c2664626ae 100644
--- a/lib/irb/cmd/fork.rb
+++ b/lib/irb/cmd/fork.rb
@@ -1,13 +1,12 @@
 #
-#   fork.rb - 
-#   	$Release Version: 0.9.5 $
+#   fork.rb -
+#   	$Release Version: 0.9.6 $
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 @RCS_ID='-$Id$-'
@@ -18,8 +17,8 @@ module IRB
     class Fork<Nop
       def execute(&block)
 	pid = send ExtendCommand.irb_original_method_name("fork")
-	unless pid 
-	  class<<self
+	unless pid
+	  class << self
 	    alias_method :exit, ExtendCommand.irb_original_method_name('exit')
 	  end
 	  if iterator?
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index 3e8d1388e0..b946ec01fc 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -1,28 +1,33 @@
 #
 #   help.rb - helper using ri
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #
 # --
 #
-#   
 #
+#
+
+require 'rdoc/ri/driver'
 
-require 'rdoc/ri/ri_driver'
+require "irb/cmd/nop.rb"
 
 module IRB
   module ExtendCommand
-    module Help
+    class Help<Nop
       begin
-        @ri = RiDriver.new
+        Ri = RDoc::RI::Driver.new
       rescue SystemExit
       else
-        def self.execute(context, *names)
+        def execute(*names)
+          if names.empty?
+            Ri.interactive
+            return
+          end
           names.each do |name|
             begin
-              @ri.get_info_for(name.to_s)
-            rescue RiError
+              Ri.get_info_for(name.to_s)
+            rescue RDoc::RI::Error
               puts $!.message
             end
           end
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
index cbc5d91d03..2a6de21ed7 100644
--- a/lib/irb/cmd/load.rb
+++ b/lib/irb/cmd/load.rb
@@ -1,13 +1,12 @@
 #
-#   load.rb - 
-#   	$Release Version: 0.9.5$
+#   load.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
@@ -26,7 +25,7 @@ module IRB
 
     class Require<Nop
       include IrbLoader
-      
+
       def execute(file_name)
 #	return ruby_require(file_name) unless IRB.conf[:USE_LOADER]
 
@@ -45,7 +44,7 @@ module IRB
 	when /\.(so|o|sl)$/
 	  return ruby_require(file_name)
 	end
-	
+
 	begin
 	  irb_load(f = file_name + ".rb")
 	  $".push f
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb
index aa553c959e..2b028975c8 100644
--- a/lib/irb/cmd/nop.rb
+++ b/lib/irb/cmd/nop.rb
@@ -1,18 +1,17 @@
 #
-#   nop.rb - 
-#   	$Release Version: 0.9.5$
+#   nop.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 module IRB
   module ExtendCommand
     class Nop
-      
+
       @RCS_ID='-$Id$-'
 
       def self.execute(conf, *opts)
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
index eddaeae631..5fd567731c 100644
--- a/lib/irb/cmd/pushws.rb
+++ b/lib/irb/cmd/pushws.rb
@@ -1,13 +1,12 @@
 #
-#   change-ws.rb - 
-#   	$Release Version: 0.9.5$
+#   change-ws.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
index 79d654b172..4d54a72b6f 100644
--- a/lib/irb/cmd/subirb.rb
+++ b/lib/irb/cmd/subirb.rb
@@ -1,14 +1,11 @@
-#!/usr/local/bin/ruby
-#
-#   multi.rb - 
-#   	$Release Version: 0.9.5$
+#   multi.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index 000658e2a3..adc41ecea5 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -1,8 +1,7 @@
 #
-#   irb/completor.rb - 
+#   irb/completor.rb -
 #   	$Release Version: 0.9$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #       From Original Idea of shugo@ruby-lang.org
 #
@@ -16,16 +15,16 @@ module IRB
 
     ReservedWords = [
       "BEGIN", "END",
-      "alias", "and", 
-      "begin", "break", 
+      "alias", "and",
+      "begin", "break",
       "case", "class",
       "def", "defined", "do",
       "else", "elsif", "end", "ensure",
-      "false", "for", 
-      "if", "in", 
-      "module", 
+      "false", "for",
+      "if", "in",
+      "module",
       "next", "nil", "not",
-      "or", 
+      "or",
       "redo", "rescue", "retry", "return",
       "self", "super",
       "then", "true",
@@ -33,19 +32,27 @@ module IRB
       "when", "while",
       "yield",
     ]
-      
+
     CompletionProc = proc { |input|
       bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
-      
+
 #      puts "input: #{input}"
 
       case input
+      when /^((["'`]).*\2)\.([^.]*)$/
+	# String
+	receiver = $1
+	message = $3
+
+	candidates = String.instance_methods.collect{|m| m.to_s}
+	select_message(receiver, message, candidates)
+
       when /^(\/[^\/]*\/)\.([^.]*)$/
 	# Regexp
 	receiver = $1
 	message = Regexp.quote($2)
 
-	candidates = Regexp.instance_methods(true)
+	candidates = Regexp.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
 
       when /^([^\]]*\])\.([^.]*)$/
@@ -53,7 +60,7 @@ module IRB
 	receiver = $1
 	message = Regexp.quote($2)
 
-	candidates = Array.instance_methods(true)
+	candidates = Array.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
 
       when /^([^\}]*\})\.([^.]*)$/
@@ -61,9 +68,10 @@ module IRB
 	receiver = $1
 	message = Regexp.quote($2)
 
-	candidates = Proc.instance_methods(true) | Hash.instance_methods(true)
+	candidates = Proc.instance_methods.collect{|m| m.to_s}
+	candidates |= Hash.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
-	
+
       when /^(:[^:.]*)$/
  	# Symbol
 	if Symbol.respond_to?(:all_symbols)
@@ -77,15 +85,17 @@ module IRB
       when /^::([A-Z][^:\.\(]*)$/
 	# Absolute Constant or class methods
 	receiver = $1
-	candidates = Object.constants
+	candidates = Object.constants.collect{|m| m.to_s}
 	candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
 
-      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
+#      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
+      when /^([A-Z].*)::([^:.]*)$/
 	# Constant or class methods
 	receiver = $1
-	message = Regexp.quote($4)
+	message = Regexp.quote($2)
 	begin
-	  candidates = eval("#{receiver}.constants | #{receiver}.methods", bind)
+	  candidates = eval("#{receiver}.constants.collect{|m| m.to_s}", bind)
+	  candidates |= eval("#{receiver}.methods.collect{|m| m.to_s}", bind)
 	rescue Exception
 	  candidates = []
 	end
@@ -96,7 +106,7 @@ module IRB
 	receiver = $1
 	message = Regexp.quote($2)
 
-	candidates = Symbol.instance_methods(true)
+	candidates = Symbol.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
 
       when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)\.([^.]*)$/
@@ -105,7 +115,7 @@ module IRB
 	message = Regexp.quote($5)
 
 	begin
-	  candidates = eval(receiver, bind).methods
+	  candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
 	rescue Exception
 	  candidates = []
 	end
@@ -117,32 +127,32 @@ module IRB
 	message = Regexp.quote($2)
 
 	begin
-	  candidates = eval(receiver, bind).methods
+	  candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
 	rescue Exception
 	  candidates = []
 	end
 	select_message(receiver, message, candidates)
 
       when /^(\$[^.]*)$/
-	candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
+	regmessage = Regexp.new(Regexp.quote($1))
+	candidates = global_variables.collect{|m| m.to_s}.grep(regmessage)
 
 #      when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
-      when /^((\.?[^.]+)+)\.([^.]*)$/
+#      when /^((\.?[^.]+)+)\.([^.]*)$/
+      when /^([^."].*)\.([^.]*)$/
 	# variable
 	receiver = $1
-	message = Regexp.quote($3)
-
-	gv = eval("global_variables", bind)
-	lv = eval("local_variables", bind)
-	cv = eval("self.class.constants", bind)
-	
-	if (gv | lv | cv).include?(receiver)
-	  # foo.func and foo is local var.
-	  candidates = eval("#{receiver}.methods", bind)
-	elsif /^[A-Z]/ =~ receiver and /\./ !~ receiver
+	message = Regexp.quote($2)
+
+	gv = eval("global_variables", bind).collect{|m| m.to_s}
+	lv = eval("local_variables", bind).collect{|m| m.to_s}
+	cv = eval("self.class.constants", bind).collect{|m| m.to_s}
+
+	if (gv | lv | cv).include?(receiver) or /^[A-Z]/ =~ receiver && /\./ !~ receiver
+	  # foo.func and foo is local var. OR
 	  # Foo::Bar.func
 	  begin
-	    candidates = eval("#{receiver}.methods", bind)
+	    candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}
 	  rescue Exception
 	    candidates = []
 	  end
@@ -155,9 +165,9 @@ module IRB
 	    rescue Exception
 	      name = ""
 	    end
-	    next if name != "IRB::Context" and 
+	    next if name != "IRB::Context" and
 	      /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
-	    candidates.concat m.instance_methods(false)
+	    candidates.concat m.instance_methods(false).collect{|x| x.to_s}
 	  }
 	  candidates.sort!
 	  candidates.uniq!
@@ -170,19 +180,19 @@ module IRB
 	receiver = ""
 	message = Regexp.quote($1)
 
-	candidates = String.instance_methods(true)
+	candidates = String.instance_methods(true).collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
 
       else
-	candidates = eval("methods | private_methods | local_variables | self.class.constants", bind)
-			  
+	candidates = eval("methods | private_methods | local_variables | self.class.constants", bind).collect{|m| m.to_s}
+
 	(candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
       end
     }
 
     Operators = ["%", "&", "*", "**", "+",  "-",  "/",
       "<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
-      "[]", "[]=", "^",]
+      "[]", "[]=", "^", "!", "!=", "!~"]
 
     def self.select_message(receiver, message, candidates)
       candidates.grep(/^#{message}/).collect do |e|
@@ -199,7 +209,8 @@ module IRB
 end
 
 if Readline.respond_to?("basic_word_break_characters=")
-  Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{("
+#  Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{("
+  Readline.basic_word_break_characters= " \t\n`><=;|&{("
 end
 Readline.completion_append_character = nil
 Readline.completion_proc = IRB::InputCompletor::CompletionProc
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index d01bd4aefa..61b519170d 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -1,15 +1,15 @@
 #
 #   irb/context.rb - irb context
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 require "irb/workspace"
+require "irb/inspector"
 
 module IRB
   class Context
@@ -35,8 +35,10 @@ module IRB
       @load_modules = IRB.conf[:LOAD_MODULES]
 
       @use_readline = IRB.conf[:USE_READLINE]
-      @inspect_mode = IRB.conf[:INSPECT_MODE]
+      @verbose = IRB.conf[:VERBOSE]
+      @io = nil
 
+      self.inspect_mode = IRB.conf[:INSPECT_MODE]
       self.math_mode = IRB.conf[:MATH_MODE] if IRB.conf[:MATH_MODE]
       self.use_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRACER]
       self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
@@ -46,7 +48,7 @@ module IRB
       @ignore_eof = IRB.conf[:IGNORE_EOF]
 
       @back_trace_limit = IRB.conf[:BACK_TRACE_LIMIT]
-      
+
       self.prompt_mode = IRB.conf[:PROMPT_MODE]
 
       if IRB.conf[:SINGLE_IRB] or !defined?(JobManager)
@@ -91,7 +93,6 @@ module IRB
 	@output_method = StdioOutputMethod.new
       end
 
-      @verbose = IRB.conf[:VERBOSE] 
       @echo = IRB.conf[:ECHO]
       if @echo.nil?
 	@echo = true
@@ -107,7 +108,7 @@ module IRB
     attr_accessor :workspace
     attr_reader :thread
     attr_accessor :io
-    
+
     attr_accessor :irb
     attr_accessor :ap_name
     attr_accessor :rc
@@ -142,13 +143,15 @@ module IRB
 
     def verbose?
       if @verbose.nil?
-	if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod) 
+	if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
 	  false
 	elsif !STDIN.tty? or @io.kind_of?(FileInputMethod)
 	  true
 	else
 	  false
 	end
+      else
+	@verbose
       end
     end
 
@@ -164,8 +167,6 @@ module IRB
       @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
     end
 
-    attr_reader :irb_name
-
     def prompt_mode=(mode)
       @prompt_mode = mode
       pconf = IRB.conf[:PROMPT][mode]
@@ -180,7 +181,7 @@ module IRB
 	@auto_indent_mode = IRB.conf[:AUTO_INDENT]
       end
     end
-    
+
     def inspect?
       @inspect_mode.nil? or @inspect_mode
     end
@@ -190,15 +191,49 @@ module IRB
     end
 
     def inspect_mode=(opt)
-      if opt
+
+      if i = INSPECTORS[opt]
 	@inspect_mode = opt
+	@inspect_method = i
+	i.init
       else
-	@inspect_mode = !@inspect_mode
+	case opt
+	when nil
+	  if INSPECTORS.keys_with_inspector(INSPECTORS[true]).include?(@inspect_mode)
+	    self.inspect_mode = false
+	  elsif INSPECTORS.keys_with_inspector(INSPECTORS[false]).include?(@inspect_mode)
+	    self.inspect_mode = true
+	  else
+	    puts "Can't switch inspect mode."
+	    return
+	  end
+	when /^\s*\{.*\}\s*$/
+	  begin
+	    inspector = eval "proc#{opt}"
+	  rescue Exception
+	    puts "Can't switch inspect mode(#{opt})."
+	    return
+	  end
+	  self.inspect_mode = inspector
+	when Proc
+	  self.inspect_mode = IRB::Inspector(opt)
+	when Inspector
+	  prefix = "usr%d"
+	  i = 1
+	  while INSPECTORS[format(prefix, i)]; i += 1; end
+	  @inspect_mode = format(prefix, i)
+	  @inspect_method = opt
+	  INSPECTORS.def_inspector(format(prefix, i), @inspect_method)
+	else
+	  puts "Can't switch inspect mode(#{opt})."
+	  return
+	end
       end
       print "Switch to#{unless @inspect_mode; ' non';end} inspect mode.\n" if verbose?
       @inspect_mode
     end
 
+
     def use_readline=(opt)
       @use_readline = opt
       print "use readline module\n" if @use_readline
@@ -221,6 +256,10 @@ module IRB
 #      @_ = @workspace.evaluate(line, irb_path, line_no)
     end
 
+    def inspect_last_value
+      @inspect_method.inspect_value(@last_value)
+    end
+
     alias __exit__ exit
     def exit(ret = 0)
       IRB.irb_exit(@irb, ret)
@@ -234,7 +273,8 @@ module IRB
     def inspect
       array = []
       for ivar in instance_variables.sort{|e1, e2| e1 <=> e2}
-	name = ivar.sub(/^@(.*)$/){$1}
+	ivar = ivar.to_s
+	name = ivar.sub(/^@(.*)$/, '\1')
 	val = instance_eval(ivar)
 	case ivar
 	when *NOPRINTING_IVARS
diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb
index fff8f58fe5..dea969d384 100644
--- a/lib/irb/ext/change-ws.rb
+++ b/lib/irb/ext/change-ws.rb
@@ -1,13 +1,12 @@
 #
-#   irb/ext/cb.rb - 
-#   	$Release Version: 0.9.5$
+#   irb/ext/cb.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 module IRB
@@ -23,12 +22,12 @@ module IRB
 
     def change_workspace(*_main)
       if _main.empty?
-	@workspace = home_workspace 
+	@workspace = home_workspace
 	return main
       end
-      
+
       @workspace = WorkSpace.new(_main[0])
-      
+
       if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
 	main.extend ExtendCommandBundle
       end
@@ -57,6 +56,6 @@ module IRB
 #       end
 #     end
 #     alias change_workspace change_binding
-   end
+  end
 end
 
diff --git a/lib/irb/ext/history.rb b/lib/irb/ext/history.rb
index 40f8692e8b..1495f9eb14 100644
--- a/lib/irb/ext/history.rb
+++ b/lib/irb/ext/history.rb
@@ -1,13 +1,12 @@
 #
-#   history.rb - 
-#   	$Release Version: 0.9.5$
+#   history.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 module IRB
@@ -57,7 +56,7 @@ module IRB
     end
 
     def size(size)
-      if size != 0 && size < @size 
+      if size != 0 && size < @size
 	@contents = @contents[@size - size .. @size]
       end
       @size = size
@@ -79,7 +78,7 @@ module IRB
       @contents.push [no, val]
       @contents.shift if @size != 0 && @contents.size > @size
     end
-    
+
     alias real_inspect inspect
 
     def inspect
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
index 837e2553ac..26a3203676 100644
--- a/lib/irb/ext/loader.rb
+++ b/lib/irb/ext/loader.rb
@@ -1,13 +1,12 @@
 #
-#   loader.rb - 
-#   	$Release Version: 0.9.5$
+#   loader.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 
@@ -45,7 +44,7 @@ module IRB
       irb.suspend_name(path, File.basename(path)) do
 	irb.suspend_input_method(FileInputMethod.new(path)) do
 	  |back_io|
-	  irb.signal_status(:IN_LOAD) do 
+	  irb.signal_status(:IN_LOAD) do
 	    if back_io.kind_of?(FileInputMethod)
 	      irb.eval_input
 	    else
@@ -62,7 +61,7 @@ module IRB
 
     def load_file(path, priv = nil)
       irb.suspend_name(path, File.basename(path)) do
-	
+
 	if priv
 	  ws = WorkSpace.new(Module.new)
 	else
@@ -71,7 +70,7 @@ module IRB
 	irb.suspend_workspace(ws) do
 	  irb.suspend_input_method(FileInputMethod.new(path)) do
 	    |back_io|
-	    irb.signal_status(:IN_LOAD) do 
+	    irb.signal_status(:IN_LOAD) do
 #	      p irb.conf
 	      if back_io.kind_of?(FileInputMethod)
 		irb.eval_input
diff --git a/lib/irb/ext/math-mode.rb b/lib/irb/ext/math-mode.rb
index bd443b96ed..41be79841c 100644
--- a/lib/irb/ext/math-mode.rb
+++ b/lib/irb/ext/math-mode.rb
@@ -1,13 +1,12 @@
 #
-#   math-mode.rb - 
-#   	$Release Version: 0.9.5$
+#   math-mode.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 require "mathn"
 
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
index 4589b1d554..0152d38ffd 100644
--- a/lib/irb/ext/multi-irb.rb
+++ b/lib/irb/ext/multi-irb.rb
@@ -1,13 +1,12 @@
 #
 #   irb/multi-irb.rb - multiple irb module
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
 require "thread"
@@ -67,10 +66,10 @@ module IRB
 	IRB.fail IrbAlreadyDead unless th.alive?
 	th.exit
       end
-    end    
+    end
 
     def search(key)
-      case key
+      job = case key
       when Integer
 	@jobs[key]
       when Irb
@@ -78,10 +77,10 @@ module IRB
       when Thread
 	@jobs.assoc(key)
       else
-	assoc = @jobs.find{|k, v| v.context.main.equal?(key)}
-	IRB.fail NoSuchJob, key if assoc.nil?
-	assoc
+	@jobs.find{|k, v| v.context.main.equal?(key)}
       end
+      IRB.fail NoSuchJob, key if job.nil?
+      job
     end
 
     def delete(key)
@@ -124,8 +123,8 @@ module IRB
 	  t_status = "exited"
 	end
 	ary.push format("#%d->%s on %s (%s: %s)",
-			i, 
-			irb.context.irb_name, 
+			i,
+			irb.context.irb_name,
 			irb.context.main,
 			th,
 			t_status)
@@ -144,14 +143,14 @@ module IRB
     IRB.JobManager.irb(Thread.current).context
   end
 
-  # invoke multi-irb 
+  # invoke multi-irb
   def IRB.irb(file = nil, *main)
     workspace = WorkSpace.new(*main)
     parent_thread = Thread.current
     Thread.start do
       begin
 	irb = Irb.new(workspace, file)
-      rescue 
+      rescue
 	print "Subirb can't start with context(self): ", workspace.main.inspect, "\n"
 	print "return to main irb\n"
 	Thread.pass
@@ -173,12 +172,14 @@ module IRB
       ensure
 	unless system_exit
 	  @JobManager.delete(irb)
-	  if parent_thread.alive?
-	    @JobManager.current_job = @JobManager.irb(parent_thread)
-	    parent_thread.run
-	  else
-	    @JobManager.current_job = @JobManager.main_irb
-	    @JobManager.main_thread.run
+	  if @JobManager.current_job == irb
+	    if parent_thread.alive?
+	      @JobManager.current_job = @JobManager.irb(parent_thread)
+	      parent_thread.run
+	    else
+	      @JobManager.current_job = @JobManager.main_irb
+	      @JobManager.main_thread.run
+	    end
 	  end
 	end
       end
diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb
index 5260bfcdd8..f9c983ac11 100644
--- a/lib/irb/ext/save-history.rb
+++ b/lib/irb/ext/save-history.rb
@@ -1,14 +1,11 @@
-#!/usr/local/bin/ruby
-#
-#   save-history.rb - 
-#   	$Release Version: 0.9.5$
+#   save-history.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKAkeiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "readline"
@@ -50,36 +47,51 @@ module IRB
   module HistorySavingAbility
     include Readline
 
-    def HistorySavingAbility.create_finalizer
-      proc do
-	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
-	  if hf = IRB.conf[:HISTORY_FILE]
-	    file = File.expand_path(hf)
-	  end
-	  file = IRB.rc_file("_history") unless file
-	  open(file, 'w' ) do |f|
-	    hist = HISTORY.to_a
-	    f.puts(hist[-num..-1] || hist)
-	  end
-	end
-      end
-    end
+#     def HistorySavingAbility.create_finalizer
+#       proc do
+# 	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+# 	  if hf = IRB.conf[:HISTORY_FILE]
+# 	    file = File.expand_path(hf)
+# 	  end
+# 	  file = IRB.rc_file("_history") unless file
+# 	  open(file, 'w' ) do |f|
+# 	    hist = HISTORY.to_a
+# 	    f.puts(hist[-num..-1] || hist)
+# 	  end
+# 	end
+#       end
+#     end
 
     def HistorySavingAbility.extended(obj)
-      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+#      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+      IRB.conf[:AT_EXIT].push proc{obj.save_history}
       obj.load_history
       obj
     end
 
     def load_history
-      hist = IRB.conf[:HISTORY_FILE]
-      hist = IRB.rc_file("_history") unless hist
-      if File.exist?(hist)
-	open(hist) do |f|
+      if history_file = IRB.conf[:HISTORY_FILE]
+	history_file = File.expand_path(history_file)
+      end
+      history_file = IRB.rc_file("_history") unless history_file
+      if File.exist?(history_file)
+	open(history_file) do |f|
 	  f.each {|l| HISTORY << l.chomp}
 	end
       end
     end
+
+    def save_history
+      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+	if history_file = IRB.conf[:HISTORY_FILE]
+	  history_file = File.expand_path(history_file)
+	end
+	history_file = IRB.rc_file("_history") unless history_file
+	open(history_file, 'w' ) do |f|
+	  hist = HISTORY.to_a
+	  f.puts(hist[-num..-1] || hist)
+	end
+      end
+    end
   end
 end
-
diff --git a/lib/irb/ext/tracer.rb b/lib/irb/ext/tracer.rb
index 805f630a4d..46a9d53a2e 100644
--- a/lib/irb/ext/tracer.rb
+++ b/lib/irb/ext/tracer.rb
@@ -1,13 +1,12 @@
 #
-#   irb/lib/tracer.rb - 
-#   	$Release Version: 0.9.5$
+#   irb/lib/tracer.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 require "tracer"
 
@@ -44,7 +43,7 @@ module IRB
     alias __evaluate__ evaluate
     def evaluate(context, statements, file = nil, line = nil)
       if context.use_tracer? && file != nil && line != nil
-	Tracer.on 
+	Tracer.on
 	begin
 	  __evaluate__(context, statements, file, line)
 	ensure
@@ -58,4 +57,4 @@ module IRB
 
   IRB.initialize_tracer
 end
-	
+
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
index 1b4d480fcd..64283b8989 100644
--- a/lib/irb/ext/use-loader.rb
+++ b/lib/irb/ext/use-loader.rb
@@ -1,13 +1,12 @@
 #
-#   use-loader.rb - 
-#   	$Release Version: 0.9.5$
+#   use-loader.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/load"
@@ -31,7 +30,7 @@ module IRB
   class Context
 
     IRB.conf[:USE_LOADER] = false
-    
+
     def use_loader
       IRB.conf[:USE_LOADER]
     end
diff --git a/lib/irb/ext/workspaces.rb b/lib/irb/ext/workspaces.rb
index 79098570dc..118ea598c0 100644
--- a/lib/irb/ext/workspaces.rb
+++ b/lib/irb/ext/workspaces.rb
@@ -1,13 +1,12 @@
 #
-#   push-ws.rb - 
-#   	$Release Version: 0.9.5$
+#   push-ws.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 module IRB
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 8994f2f8d2..190c49ae78 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -1,13 +1,12 @@
 #
-#   irb/extend-command.rb - irb extend command 
-#   	$Release Version: 0.9.5$
+#   irb/extend-command.rb - irb extend command
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 module IRB
   #
@@ -90,15 +89,15 @@ module IRB
 
       [:irb_load, :Load, "irb/cmd/load"],
       [:irb_require, :Require, "irb/cmd/load"],
-      [:irb_source, :Source, "irb/cmd/load", 
+      [:irb_source, :Source, "irb/cmd/load",
 	[:source, NO_OVERRIDE]],
 
       [:irb, :IrbCommand, "irb/cmd/subirb"],
-      [:irb_jobs, :Jobs, "irb/cmd/subirb", 
+      [:irb_jobs, :Jobs, "irb/cmd/subirb",
 	[:jobs, NO_OVERRIDE]],
-      [:irb_fg, :Foreground, "irb/cmd/subirb", 
+      [:irb_fg, :Foreground, "irb/cmd/subirb",
 	[:fg, NO_OVERRIDE]],
-      [:irb_kill, :Kill, "irb/cmd/subirb", 
+      [:irb_kill, :Kill, "irb/cmd/subirb",
 	[:kill, OVERRIDE_PRIVATE_ONLY]],
 
       [:irb_help, :Help, "irb/cmd/help",
@@ -112,7 +111,7 @@ module IRB
       end
     end
 
-    # aliases = [commans_alias, flag], ...
+    # aliases = [commands_alias, flag], ...
     def self.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
       case cmd_class
       when Symbol
@@ -123,23 +122,28 @@ module IRB
       end
 
       if load_file
-	eval %[
+	line = __LINE__; eval %[
 	  def #{cmd_name}(*opts, &b)
 	    require "#{load_file}"
-	    eval %[
-	      def #{cmd_name}(*opts, &b)
-		ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
+	    arity = ExtendCommand::#{cmd_class}.instance_method(:execute).arity
+	    args = (1..(arity < 0 ? ~arity : arity)).map {|i| "arg" + i.to_s }
+	    args << "*opts" if arity < 0
+	    args << "&block"
+	    args = args.join(", ")
+	    line = __LINE__; eval %[
+	      def #{cmd_name}(\#{args})
+		ExtendCommand::#{cmd_class}.execute(irb_context, \#{args})
 	      end
-	    ]
+	    ], nil, __FILE__, line
 	    send :#{cmd_name}, *opts, &b
 	  end
-	]
+	], nil, __FILE__, line
       else
-	eval %[
+	line = __LINE__; eval %[
 	  def #{cmd_name}(*opts, &b)
 	    ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
 	  end
-	]
+	], nil, __FILE__, line
       end
 
       for ali, flag in aliases
@@ -156,10 +160,10 @@ module IRB
 	  (override == OVERRIDE_PRIVATE_ONLY) && !respond_to?(to) or
 	  (override == NO_OVERRIDE) &&  !respond_to?(to, true)
 	target = self
-	(class<<self;self;end).instance_eval{
-	  if target.respond_to?(to, true) && 
+	(class << self; self; end).instance_eval{
+	  if target.respond_to?(to, true) &&
 	      !target.respond_to?(EXCB.irb_original_method_name(to), true)
-	    alias_method(EXCB.irb_original_method_name(to), to) 
+	    alias_method(EXCB.irb_original_method_name(to), to)
 	  end
 	  alias_method to, from
 	}
@@ -173,7 +177,7 @@ module IRB
     end
 
     def self.extend_object(obj)
-      unless (class<<obj;ancestors;end).include?(EXCB)
+      unless (class << obj; ancestors; end).include?(EXCB)
 	super
 	for ali, com, flg in @ALIASES
 	  obj.install_alias_method(ali, com, flg)
@@ -203,7 +207,7 @@ module IRB
     end
 
     def self.def_extend_command(cmd_name, load_file, *aliases)
-      Context.module_eval %[
+      line = __LINE__; Context.module_eval %[
         def #{cmd_name}(*opts, &b)
 	  Context.module_eval {remove_method(:#{cmd_name})}
 	  require "#{load_file}"
@@ -212,7 +216,7 @@ module IRB
 	for ali in aliases
 	  alias_method ali, cmd_name
 	end
-      ]
+      ], __FILE__, line
     end
 
     CE.install_extend_commands
diff --git a/lib/irb/frame.rb b/lib/irb/frame.rb
index f0b0a9abf3..8814b47a9d 100644
--- a/lib/irb/frame.rb
+++ b/lib/irb/frame.rb
@@ -1,13 +1,12 @@
 #
-#   frame.rb - 
+#   frame.rb -
 #   	$Release Version: 0.9$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
-#   
+#
 #
 
 require "e2mmap"
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
index f091999bd1..4a308b6e46 100644
--- a/lib/irb/help.rb
+++ b/lib/irb/help.rb
@@ -1,33 +1,35 @@
 #
-#   irb/help.rb - print usase module
-#   	$Release Version: 0.9.5$
+#   irb/help.rb - print usage module
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
-#   
 #
+#
+
+require 'irb/magic-file'
 
 module IRB
   def IRB.print_usage
     lc = IRB.conf[:LC_MESSAGES]
     path = lc.find("irb/help-message")
     space_line = false
-    File.foreach(path) do
-      |l|
-      if /^\s*$/ =~ l
-	lc.puts l unless space_line
-	space_line = true
-	next
+    IRB::MagicFile.open(path){|f|
+      f.each_line do |l|
+	if /^\s*$/ =~ l
+	  lc.puts l unless space_line
+	  space_line = true
+	  next
+	end
+	space_line = false
+
+	l.sub!(/#.*$/, "")
+	  next if /^\s*$/ =~ l
+	lc.puts l
       end
-      space_line = false
-      
-      l.sub!(/#.*$/, "")
-      next if /^\s*$/ =~ l
-      lc.puts l
-    end
+    }
   end
 end
 
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index db22ca639b..2d7ff3146e 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -1,13 +1,12 @@
 #
 #   irb/init.rb - irb initialize module
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 module IRB
@@ -21,7 +20,7 @@ module IRB
     IRB.load_modules
 
     unless @CONF[:PROMPT][@CONF[:PROMPT_MODE]]
-      IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE]) 
+      IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE])
     end
   end
 
@@ -45,7 +44,7 @@ module IRB
 
     @CONF[:MATH_MODE] = false
     @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
-    @CONF[:INSPECT_MODE] = nil
+    @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
     @CONF[:USE_LOADER] = false
     @CONF[:IGNORE_SIGINT] = true
@@ -114,6 +113,8 @@ module IRB
 #    @CONF[:LC_MESSAGES] = "en"
     @CONF[:LC_MESSAGES] = Locale.new
     
+    @CONF[:AT_EXIT] = []
+    
     @CONF[:DEBUG_LEVEL] = 1
   end
 
@@ -134,16 +135,36 @@ module IRB
 	@CONF[:MATH_MODE] = true
       when "-d"
 	$DEBUG = true
+	$VERBOSE = true
+      when "-w"
+	$VERBOSE = true
+      when /^-W(.+)?/
+	opt = $1 || ARGV.shift
+	case opt
+	when "0"
+	  $VERBOSE = nil
+	when "1"
+	  $VERBOSE = false
+	else
+	  $VERBOSE = true
+	end
       when /^-r(.+)?/
 	opt = $1 || ARGV.shift
 	@CONF[:LOAD_MODULES].push opt if opt
       when /^-I(.+)?/
         opt = $1 || ARGV.shift
 	load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
-      when /^-K(.)/
-	$KCODE = $1
+      when '-U'
+	set_encoding("UTF-8", "UTF-8")
+      when /^-E(.+)?/, /^--encoding(?:=(.+))?/
+	opt = $1 || ARGV.shift
+	set_encoding(*opt.split(':', 2))
       when "--inspect"
-	@CONF[:INSPECT_MODE] = true
+	if /^-/ !~ ARGV.first 
+	  @CONF[:INSPECT_MODE] = ARGV.shift
+	else
+	  @CONF[:INSPECT_MODE] = true
+	end
       when "--noinspect"
 	@CONF[:INSPECT_MODE] = false
       when "--readline"
@@ -158,8 +179,9 @@ module IRB
 	@CONF[:VERBOSE] = true
       when "--noverbose"
 	@CONF[:VERBOSE] = false
-      when "--prompt-mode", "--prompt"
-	prompt_mode = ARGV.shift.upcase.tr("-", "_").intern
+      when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
+	opt = $1 || ARGV.shift
+	prompt_mode = opt.upcase.tr("-", "_").intern
 	@CONF[:PROMPT_MODE] = prompt_mode
       when "--noprompt"
 	@CONF[:PROMPT_MODE] = :NULL
@@ -169,14 +191,14 @@ module IRB
 	@CONF[:PROMPT_MODE] = :SIMPLE
       when "--tracer"
 	@CONF[:USE_TRACER] = true
-      when "--back-trace-limit"
-	@CONF[:BACK_TRACE_LIMIT] = ARGV.shift.to_i
-      when "--context-mode"
-	@CONF[:CONTEXT_MODE] = ARGV.shift.to_i
+      when /^--back-trace-limit(?:=(.+))?/
+	@CONF[:BACK_TRACE_LIMIT] = ($1 || ARGV.shift).to_i
+      when /^--context-mode(?:=(.+))?/
+	@CONF[:CONTEXT_MODE] = ($1 || ARGV.shift).to_i
       when "--single-irb"
 	@CONF[:SINGLE_IRB] = true
-      when "--irb_debug"
-	@CONF[:DEBUG_LEVEL] = ARGV.shift.to_i
+      when /^--irb_debug=(?:=(.+))?/
+	@CONF[:DEBUG_LEVEL] = ($1 || ARGV.shift).to_i
       when "-v", "--version"
 	print IRB.version, "\n"
 	exit 0
@@ -184,6 +206,12 @@ module IRB
 	require "irb/help"
 	IRB.print_usage
 	exit 0
+      when "--"
+	if opt = ARGV.shift
+	  @CONF[:SCRIPT] = opt
+	  $0 = opt
+	end
+        break
       when /^-/
 	IRB.fail UnrecognizedSwitch, opt
       else
@@ -198,6 +226,7 @@ module IRB
       end
     end
     $LOAD_PATH.unshift(*load_path)
+
   end
 
   # running config
@@ -206,7 +235,7 @@ module IRB
       begin
 	load rc_file
       rescue LoadError, Errno::ENOENT
-      rescue
+      rescue # StandardError, ScriptError
 	print "load error: #{rc_file}\n"
 	print $!.class, ": ", $!, "\n"
 	for err in $@[0, $@.size - 2]
@@ -233,10 +262,10 @@ module IRB
   # enumerate possible rc-file base name generators
   def IRB.rc_file_generators
     if irbrc = ENV["IRBRC"]
-      yield proc{|rc|  rc == "rc" ? irbrc : irbrc+rc}
+      yield proc{|rc| rc == "rc" ? irbrc : irbrc+rc}
     end
     if home = ENV["HOME"]
-      yield proc{|rc| home+"/.irb#{rc}"} 
+      yield proc{|rc| home+"/.irb#{rc}"}
     end
     home = Dir.pwd
     yield proc{|rc| home+"/.irb#{rc}"}
@@ -250,10 +279,27 @@ module IRB
     for m in @CONF[:LOAD_MODULES]
       begin
 	require m
-      rescue
-	print $@[0], ":", $!.class, ": ", $!, "\n"
+      rescue LoadError => err
+	warn err.backtrace[0] << ":#{err.class}: #{err}"
       end
     end
   end
 
+
+  DefaultEncodings = Struct.new(:external, :internal)
+  class << IRB
+    private
+    def set_encoding(extern, intern = nil)
+      verbose, $VERBOSE = $VERBOSE, nil
+      Encoding.default_external = extern unless extern.nil? || extern.empty?
+      Encoding.default_internal = intern unless intern.nil? || intern.empty?
+      @CONF[:ENCODINGS] = IRB::DefaultEncodings.new(extern, intern)
+      [$stdin, $stdout, $stderr].each do |io|
+	io.set_encoding(extern, intern)
+      end
+      @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern)
+    ensure
+      $VERBOSE = verbose
+    end
+  end
 end
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index bfb90fa59a..7227df4ca0 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -1,16 +1,18 @@
 #
 #   irb/input-method.rb - input methods used irb
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
 #
+#
+require 'irb/src_encoding'
+require 'irb/magic-file'
+
 module IRB
-  # 
+  #
   # InputMethod
   #	StdioInputMethod
   #	FileInputMethod
@@ -26,7 +28,7 @@ module IRB
     attr_reader :file_name
 
     attr_accessor :prompt
-    
+
     def gets
       IRB.fail NotImplementedError, "gets"
     end
@@ -36,21 +38,24 @@ module IRB
       false
     end
   end
-  
+
   class StdioInputMethod < InputMethod
     def initialize
       super
       @line_no = 0
       @line = []
+      @stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+      @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
     end
 
     def gets
       print @prompt
-      @line[@line_no += 1] = $stdin.gets
+      line = @stdin.gets
+      @line[@line_no += 1] = line
     end
 
     def eof?
-      $stdin.eof?
+      @stdin.eof?
     end
 
     def readable_atfer_eof?
@@ -60,12 +65,16 @@ module IRB
     def line(line_no)
       @line[line_no]
     end
+
+    def encoding
+      @stdin.external_encoding
+    end
   end
-  
+
   class FileInputMethod < InputMethod
     def initialize(file)
       super
-      @io = open(file)
+      @io = IRB::MagicFile.open(file)
     end
     attr_reader :file_name
 
@@ -79,23 +88,32 @@ module IRB
 #      print @prompt, l
       l
     end
+
+    def encoding
+      @io.external_encoding
+    end
   end
 
   begin
     require "readline"
     class ReadlineInputMethod < InputMethod
-      include Readline 
+      include Readline
       def initialize
 	super
 
 	@line_no = 0
 	@line = []
 	@eof = false
+
+	@stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+	@stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
       end
 
       def gets
+        Readline.input = @stdin
+        Readline.output = @stdout
 	if l = readline(@prompt, false)
-          HISTORY.push(l) if !l.empty?
+	  HISTORY.push(l) if !l.empty?
 	  @line[@line_no += 1] = l + "\n"
 	else
 	  @eof = true
@@ -114,6 +132,10 @@ module IRB
       def line(line_no)
 	@line[line_no]
       end
+
+      def encoding
+	@stdin.external_encoding
+      end
     end
   rescue LoadError
   end
diff --git a/lib/irb/inspector.rb b/lib/irb/inspector.rb
new file mode 100644
index 0000000000..ab5128399e
--- /dev/null
+++ b/lib/irb/inspector.rb
@@ -0,0 +1,109 @@
+#
+#   irb/inspector.rb - inspect methods
+#   	$Release Version: 0.9.6$
+#   	$Revision: 1.19 $
+#   	$Date: 2002/06/11 07:51:31 $
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+module IRB
+
+  def IRB::Inspector(inspect, init = nil)
+    Inspector.new(inspect, init)
+  end
+
+  class Inspector
+    def initialize(inspect_proc, init_proc = nil)
+      @init = init_proc
+      @inspect = inspect_proc
+    end
+
+    def init
+      @init.call if @init
+    end
+
+    def inspect_value(v)
+      @inspect.call(v)
+    end
+  end
+
+  INSPECTORS = {}
+
+  def INSPECTORS.keys_with_inspector(inspector)
+    select{|k,v| v == inspector}.collect{|k, v| k}
+  end
+
+  # ex)
+  # INSPECTORS.def_inspector(key, init_p=nil){|v| v.inspect}
+  # INSPECTORS.def_inspector([key1,..], init_p=nil){|v| v.inspect}
+  # INSPECTORS.def_inspector(key, inspector)
+  # INSPECTORS.def_inspector([key1,...], inspector)
+
+  def INSPECTORS.def_inspector(key, arg=nil, &block)
+#     if !block_given?
+#       case arg
+#       when nil, Proc
+# 	inspector = IRB::Inspector(init_p)
+#       when Inspector
+# 	inspector = init_p
+#       else
+# 	IRB.Raise IllegalParameter, init_p
+#       end
+#       init_p = nil
+#     else
+#       inspector = IRB::Inspector(block, init_p)
+#     end
+      
+    if block_given?
+      inspector = IRB::Inspector(block, arg)
+    else
+      inspector = arg
+    end
+    
+    case key
+    when Array
+      for k in key
+	def_inspector(k, inspector)
+      end
+    when Symbol
+      self[key] = inspector
+      self[key.to_s] = inspector
+    when String
+      self[key] = inspector
+      self[key.intern] = inspector
+    else
+      self[key] = inspector
+    end
+  end
+
+  INSPECTORS.def_inspector([false, :to_s, :raw]){|v| v.to_s}
+  INSPECTORS.def_inspector([true, :p, :inspect]){|v| 
+    begin
+      v.inspect
+    rescue NoMethodError
+      puts "(Object doesn't support #inspect)"
+    end
+  }
+  INSPECTORS.def_inspector([:pp, :pretty_inspect], proc{require "pp"}){|v| v.pretty_inspect.chomp}
+  INSPECTORS.def_inspector([:yaml, :YAML], proc{require "yaml"}){|v| 
+    begin
+      YAML.dump(v)
+    rescue
+      puts "(can't dump yaml. use inspect)"
+      v.inspect
+    end
+  }
+
+  INSPECTORS.def_inspector([:marshal, :Marshal, :MARSHAL, Marshal]){|v| 
+    Marshal.dump(v)
+  }
+end
+
+
+  
+    
+
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
index 247596b7fe..742821e3af 100644
--- a/lib/irb/lc/error.rb
+++ b/lib/irb/lc/error.rb
@@ -1,13 +1,12 @@
 #
-#   irb/lc/error.rb - 
-#   	$Release Version: 0.9.5$
+#   irb/lc/error.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 require "e2mmap"
 
@@ -18,7 +17,7 @@ module IRB
   def_exception :UnrecognizedSwitch, "Unrecognized switch: %s"
   def_exception :NotImplementedError, "Need to define `%s'"
   def_exception :CantReturnToNormalMode, "Can't return to normal mode."
-  def_exception :IllegalParameter, "Illegal parameter(%s)."
+  def_exception :IllegalParameter, "Invalid parameter(%s)."
   def_exception :IrbAlreadyDead, "Irb is already dead."
   def_exception :IrbSwitchedToCurrentThread, "Switched to current thread."
   def_exception :NoSuchJob, "No such job(%s)."
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
index 32087d113c..18aea149bc 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -1,8 +1,8 @@
+# -*- coding: US-ASCII -*-
 #
 #   irb/lc/help-message.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
@@ -15,6 +15,10 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -d                Set $DEBUG to true (same as `ruby -d')
   -r load-module    Same as `ruby -r'
   -I path           Specify $LOAD_PATH directory
+  -U                Same as `ruby -U`
+  -E enc            Same as `ruby -E`
+  -w                Same as `ruby -w`
+  -W[level=2]       Same as `ruby -W`
   --inspect	    Use `inspect' for output (default except for bc mode)
   --noinspect	    Don't use inspect for output
   --readline	    Use Readline extension module
@@ -33,3 +37,4 @@ Usage:  irb.rb [options] [programfile] [arguments]
 		    value is 16. 
   --irb_debug n	    Set internal debug level to n (not for popular use)
   -v, --version	    Print the version of irb
+# vim:fileencoding=us-ascii
diff --git a/lib/irb/lc/ja/encoding_aliases.rb b/lib/irb/lc/ja/encoding_aliases.rb
new file mode 100644
index 0000000000..a713dff4be
--- /dev/null
+++ b/lib/irb/lc/ja/encoding_aliases.rb
@@ -0,0 +1,8 @@
+module IRB
+  class Locale
+    @@legacy_encoding_alias_map = {
+      'ujis' => Encoding::EUC_JP,
+      'euc' => Encoding::EUC_JP
+    }.freeze
+  end
+end
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
index 4c2fb3b839..9a7670f459 100644
--- a/lib/irb/lc/ja/error.rb
+++ b/lib/irb/lc/ja/error.rb
@@ -1,27 +1,27 @@
-#
-#   irb/lc/ja/error.rb - 
-#   	$Release Version: 0.9.5$
+# -*- coding: utf-8 -*-
+#   irb/lc/ja/error.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 require "e2mmap"
 
 module IRB
   # exceptions
   extend Exception2MessageMapper
-  def_exception :UnrecognizedSwitch, '$B%9%$%C%A(B(%s)$B$,J,$j$^$;$s(B'
-  def_exception :NotImplementedError, '`%s\'$B$NDj5A$,I,MW$G$9(B'
-  def_exception :CantReturnToNormalMode, 'Normal$B%b!<%I$KLa$l$^$;$s(B.'
-  def_exception :IllegalParameter, '$B%Q%i%a!<%?(B(%s)$B$,4V0c$C$F$$$^$9(B.'
-  def_exception :IrbAlreadyDead, 'Irb$B$O4{$K;`$s$G$$$^$9(B.'
-  def_exception :IrbSwitchedToCurrentThread, '$B%+%l%s%H%9%l%C%I$K@Z$jBX$o$j$^$7$?(B.'
-  def_exception :NoSuchJob, '$B$=$N$h$&$J%8%g%V(B(%s)$B$O$"$j$^$;$s(B.'
-  def_exception :CantShiftToMultiIrbMode, 'multi-irb mode$B$K0\$l$^$;$s(B.'
-  def_exception :CantChangeBinding, '$B%P%$%s%G%#%s%0(B(%s)$B$KJQ99$G$-$^$;$s(B.'
-  def_exception :UndefinedPromptMode, '$B%W%m%s%W%H%b!<%I(B(%s)$B$ODj5A$5$l$F$$$^$;$s(B.'
+  def_exception :UnrecognizedSwitch, 'スイッチ(%s)が分りません'
+  def_exception :NotImplementedError, '`%s\'の定義が必要です'
+  def_exception :CantReturnToNormalMode, 'Normalモードに戻れません.'
+  def_exception :IllegalParameter, 'パラメータ(%s)が間違っています.'
+  def_exception :IrbAlreadyDead, 'Irbは既に死んでいます.'
+  def_exception :IrbSwitchedToCurrentThread, 'カレントスレッドに切り替わりました.'
+  def_exception :NoSuchJob, 'そのようなジョブ(%s)はありません.'
+  def_exception :CantShiftToMultiIrbMode, 'multi-irb modeに移れません.'
+  def_exception :CantChangeBinding, 'バインディング(%s)に変更できません.'
+  def_exception :UndefinedPromptMode, 'プロンプトモード(%s)は定義されていません.'
 end
+# vim:fileencoding=utf-8
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index debbfe9355..78ba72ed35 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -1,8 +1,7 @@
-#
+# -*- coding: utf-8 -*-
 #   irb/lc/ja/help-message.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
@@ -10,27 +9,33 @@
 #   
 #
 Usage:  irb.rb [options] [programfile] [arguments]
-  -f		    ~/.irbrc $B$rFI$_9~$^$J$$(B.
-  -m		    bc$B%b!<%I(B($BJ,?t(B, $B9TNs$N7W;;$,$G$-$k(B)
-  -d                $DEBUG $B$r(Btrue$B$K$9$k(B(ruby -d $B$HF1$8(B)
-  -r load-module    ruby -r $B$HF1$8(B.
-  -I path           $LOAD_PATH $B$K(B path $B$rDI2C$9$k(B.
-  --inspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$k(B(bc$B%b!<%I0J30$O%G%U%)%k%H(B). 
-  --noinspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$J$$(B.
-  --readline	    readline$B%i%$%V%i%j$rMxMQ$9$k(B.
-  --noreadline	    readline$B%i%$%V%i%j$rMxMQ$7$J$$(B. 
+  -f		    ~/.irbrc を読み込まない.
+  -m		    bcモード(分数, 行列の計算ができる)
+  -d                $DEBUG をtrueにする(ruby -d と同じ)
+  -r load-module    ruby -r と同じ.
+  -I path           $LOAD_PATH に path を追加する.
+  -U                ruby -U と同じ.
+  -E enc            ruby -E と同じ.
+  -w                ruby -w と同じ.
+  -W[level=2]       ruby -W と同じ.
+  --inspect	    結果出力にinspectを用いる(bcモード以外はデフォルト). 
+  --noinspect	    結果出力にinspectを用いない.
+  --readline	    readlineライブラリを利用する.
+  --noreadline	    readlineライブラリを利用しない. 
   --prompt prompt-mode/--prompt-mode prompt-mode
-		    $B%W%m%s%W%H%b!<%I$r@ZBX$($^$9(B. $B8=:_Dj5A$5$l$F$$$k%W(B
-		    $B%m%s%W%H%b!<%I$O(B, default, simple, xmp, inf-ruby$B$,(B
-		    $BMQ0U$5$l$F$$$^$9(B. 
-  --inf-ruby-mode   emacs$B$N(Binf-ruby-mode$BMQ$N%W%m%s%W%HI=<($r9T$J$&(B. $BFC(B
-		    $B$K;XDj$,$J$$8B$j(B, readline$B%i%$%V%i%j$O;H$o$J$/$J$k(B.
-  --simple-prompt   $BHs>o$K%7%s%W%k$J%W%m%s%W%H$rMQ$$$k%b!<%I$G$9(B.
-  --noprompt	    $B%W%m%s%W%HI=<($r9T$J$o$J$$(B.
-  --tracer	    $B%3%^%s%I<B9T;~$K%H%l!<%9$r9T$J$&(B.
+		    プロンプトモードを切替えます. 現在定義されているプ
+		    ロンプトモードは, default, simple, xmp, inf-rubyが
+		    用意されています. 
+  --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
+		    に指定がない限り, readlineライブラリは使わなくなる.
+  --simple-prompt   非常にシンプルなプロンプトを用いるモードです.
+  --noprompt	    プロンプト表示を行なわない.
+  --tracer	    コマンド実行時にトレースを行なう.
   --back-trace-limit n
-		    $B%P%C%/%H%l!<%9I=<($r%P%C%/%H%l!<%9$NF,$+$i(B n, $B8e$m(B
-		    $B$+$i(Bn$B$@$19T$J$&(B. $B%G%U%)%k%H$O(B16 
-  --irb_debug n	    irb$B$N%G%P%C%0%G%P%C%0%l%Y%k$r(Bn$B$K@_Dj$9$k(B($BMxMQ$7$J(B
-		    $B$$J}$,L5Fq$G$7$g$&(B).
-  -v, --version	    irb$B$N%P!<%8%g%s$rI=<($9$k(B
+		    バックトレース表示をバックトレースの頭から n, 後ろ
+		    からnだけ行なう. デフォルトは16 
+  --irb_debug n	    irbのデバッグデバッグレベルをnに設定する(利用しな
+		    い方が無難でしょう).
+  -v, --version	    irbのバージョンを表示する
+
+# vim:fileencoding=utf-8
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index 5ed9f54507..77cc06ed30 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -1,51 +1,53 @@
 #
 #   irb/locale.rb - internationalization module
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
 #
-
-autoload :Kconv, "kconv"
-
+#
 module IRB
   class Locale
     @RCS_ID='-$Id$-'
 
-    JPDefaultLocale = "ja"
+    LOCALE_NAME_RE = %r[
+      (?<language>[[:alpha:]]{2,3})
+      (?:_  (?<territory>[[:alpha:]]{2,3}) )?
+      (?:\. (?<codeset>[^@]+) )?
+      (?:@  (?<modifier>.*) )?
+    ]x
     LOCALE_DIR = "/lc/"
 
-    def initialize(locale = nil)
-      @lang = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C" 
-    end
-
-    attr_reader :lang
+    @@legacy_encoding_alias_map = {}.freeze
 
-    def lc2kconv(lang)
-      case lang
-      when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP"
-        Kconv::EUC
-      when "ja_JP.sjis", "ja_JP.SJIS"
-        Kconv::SJIS
-      when /ja_JP.utf-?8/i
-	Kconv::UTF8
+    def initialize(locale = nil)
+      @lang = @territory = @encoding_name = @modifier = nil
+      @locale = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C"
+      if m = LOCALE_NAME_RE.match(@locale)
+	@lang, @territory, @encoding_name, @modifier = m[:language], m[:territory], m[:codeset], m[:modifier]
+
+	if @encoding_name
+	  begin load 'irb/encoding_aliases.rb'; rescue LoadError; end
+	  if @encoding = @@legacy_encoding_alias_map[@encoding_name]
+	    warn "%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"]
+	  end
+	  @encoding = Encoding.find(@encoding_name) rescue nil
+	end
       end
+      @encoding ||= (Encoding.find('locale') rescue Encoding::ASCII_8BIT)
     end
-    private :lc2kconv
+
+    attr_reader :lang, :territory, :encoding, :modifieer
 
     def String(mes)
       mes = super(mes)
-      case @lang
-      when /^ja/
-	mes = Kconv::kconv(mes, lc2kconv(@lang))
+      if @encoding
+	mes.encode(@encoding, undef: :replace)
       else
 	mes
       end
-      mes
     end
 
     def format(*opts)
@@ -101,84 +103,80 @@ module IRB
     end
 
     alias toplevel_load load
-    
+
     def load(file, priv=nil)
+      found = find(file)
+      if found
+        return real_load(found, priv)
+      else
+        raise LoadError, "No such file to load -- #{file}"
+      end
+    end
+
+    def find(file , paths = $:)
       dir = File.dirname(file)
       dir = "" if dir == "."
       base = File.basename(file)
 
-      if /^ja(_JP)?$/ =~ @lang
- 	back, @lang = @lang, "C"
-      end
-      begin
-	if dir[0] == ?/ #/
-	  lc_path = search_file(dir, base)
-	  return real_load(lc_path, priv) if lc_path
-	end
-	
-	for path in $:
-	  lc_path = search_file(path + "/" + dir, base)
-	  return real_load(lc_path, priv) if lc_path
-	end
-      ensure
-	@lang = back if back
+      if dir.start_with?('/')
+        return each_localized_path(dir, base).find{|full_path| File.readable? full_path}
+      else
+        return search_file(paths, dir, base)
       end
-      raise LoadError, "No such file to load -- #{file}"
-    end 
+    end
 
+    private
     def real_load(path, priv)
-      src = self.String(File.read(path))
+      src = MagicFile.open(path){|f| f.read}
       if priv
 	eval("self", TOPLEVEL_BINDING).extend(Module.new {eval(src, nil, path)})
       else
 	eval(src, TOPLEVEL_BINDING, path)
       end
     end
-    private :real_load
 
-    def find(file , paths = $:)
-      dir = File.dirname(file)
-      dir = "" if dir == "."
-      base = File.basename(file)
-      if dir[0] == ?/ #/
-	  return lc_path = search_file(dir, base)
-      else
-	for path in $:
-	  if lc_path = search_file(path + "/" + dir, base)
-	    return lc_path
-	  end
-	end
+    # @param paths load paths in which IRB find a localized file.
+    # @param dir directory 
+    # @param file basename to be localized
+    #
+    # typically, for the parameters and a <path> in paths, it searches
+    #   <path>/<dir>/<locale>/<file>
+    def search_file(lib_paths, dir, file)
+      each_localized_path(dir, file) do |lc_path|
+        lib_paths.each do |libpath|
+          full_path = File.join(libpath, lc_path)
+          return full_path if File.readable?(full_path)
+        end
+        redo if defined?(Gem) and Gem.try_activate(lc_path)
       end
       nil
     end
 
-    def search_file(path, file)
-      if File.exist?(p1 = path + lc_path(file, "C"))
-	if File.exist?(p2 = path + lc_path(file))
-	  return p2
-	else
-	end
-	return p1
-      else
+    def each_localized_path(dir, file)
+      return enum_for(:each_localized_path) unless block_given?
+      each_sublocale do |lc|
+        yield lc.nil? ? File.join(dir, LOCALE_DIR, file) : File.join(dir, LOCALE_DIR, lc, file)
       end
-      nil
     end
-    private :search_file
-
-    def lc_path(file = "", lc = @lang)
-      case lc
-      when "C"
-	LOCALE_DIR + file
-      when /^ja/
-	LOCALE_DIR + "ja/" + file
-      else
-	LOCALE_DIR + @lang + "/" + file
+
+    def each_sublocale
+      if @lang
+	if @territory
+	  if @encoding_name
+	    yield "#{@lang}_#{@territory}.#{@encoding_name}@#{@modifier}" if @modifier
+	    yield "#{@lang}_#{@territory}.#{@encoding_name}"
+	  end
+	  yield "#{@lang}_#{@territory}@#{@modifier}" if @modifier
+	  yield "#{@lang}_#{@territory}"
+	end
+        if @encoding_name
+          yield "#{@lang}.#{@encoding_name}@#{@modifier}" if @modifier
+          yield "#{@lang}.#{@encoding_name}"
+        end
+	yield "#{@lang}@#{@modifier}" if @modifier
+	yield "#{@lang}"
       end
+      yield nil
     end
-    private :lc_path
   end
 end
-
-
-
-
diff --git a/lib/irb/magic-file.rb b/lib/irb/magic-file.rb
new file mode 100644
index 0000000000..861262050e
--- /dev/null
+++ b/lib/irb/magic-file.rb
@@ -0,0 +1,36 @@
+module IRB
+  class << (MagicFile = Object.new)
+    # see parser_magic_comment in parse.y
+    ENCODING_SPEC_RE = %r"coding\s*[=:]\s*([[:alnum:]\-_]+)"
+
+    def open(path)
+      io = File.open(path, 'rb')
+      line = io.gets
+      line = io.gets if line[0,2] == "#!"
+      encoding = detect_encoding(line)
+      encoding ||= default_src_encoding
+      io.rewind
+      io.set_encoding(encoding, nil)
+
+      if block_given?
+        begin
+          return (yield io)
+        ensure
+          io.close
+        end
+      else
+        return io
+      end
+    end
+
+    private
+    def detect_encoding(line)
+      return unless line[0] == ?#
+      line = line[1..-1]
+      line = $1 if line[/-\*-\s*(.*?)\s*-*-$/]
+      return nil unless ENCODING_SPEC_RE =~ line
+      encoding = $1
+      return encoding.sub(/-(?:mac|dos|unix)/i, '')
+    end
+  end
+end
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
index c8e66fa859..d20679da4a 100644
--- a/lib/irb/notifier.rb
+++ b/lib/irb/notifier.rb
@@ -1,13 +1,12 @@
 #
-#   notifier.rb - optput methods used by irb 
-#   	$Release Version: 0.9.5$
+#   notifier.rb - output methods used by irb
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "e2mmap"
@@ -16,17 +15,17 @@ require "irb/output-method"
 module IRB
   module Notifier
     extend Exception2MessageMapper
-    def_exception :ErrUndefinedNotifier, 
+    def_exception :ErrUndefinedNotifier,
       "undefined notifier level: %d is specified"
-    def_exception :ErrUnrecognizedLevel, 
+    def_exception :ErrUnrecognizedLevel,
       "unrecognized notifier level: %s is specified"
 
     def def_notifier(prefix = "", output_method = StdioOutputMethod.new)
       CompositeNotifier.new(prefix, output_method)
     end
     module_function :def_notifier
-  
-    class AbstructNotifier
+
+    class AbstractNotifier
       def initialize(prefix, base_notifier)
 	@prefix = prefix
 	@base_notifier = base_notifier
@@ -73,7 +72,7 @@ module IRB
       end
     end
 
-    class CompositeNotifier<AbstructNotifier
+    class CompositeNotifier<AbstractNotifier
       def initialize(prefix, base_notifier)
 	super
 
@@ -94,7 +93,7 @@ module IRB
 
       def level_notifier=(value)
 	case value
-	when AbstructNotifier
+	when AbstractNotifier
 	  @level_notifier = value
 	when Integer
 	  l = @notifiers[value]
@@ -108,12 +107,12 @@ module IRB
       alias level= level_notifier=
     end
 
-    class LeveledNotifier<AbstructNotifier
+    class LeveledNotifier<AbstractNotifier
       include Comparable
 
       def initialize(base, level, prefix)
 	super(prefix, base)
-	
+
 	@level = level
       end
 
@@ -122,7 +121,7 @@ module IRB
       def <=>(other)
 	@level <=> other.level
       end
-      
+
       def notify?
 	@base_notifier.level >= self
       end
diff --git a/lib/irb/output-method.rb b/lib/irb/output-method.rb
index b9a3a8851e..9cccda1c6a 100644
--- a/lib/irb/output-method.rb
+++ b/lib/irb/output-method.rb
@@ -1,13 +1,12 @@
 #
-#   output-method.rb - optput methods used by irb 
-#   	$Release Version: 0.9.5$
+#   output-method.rb - output methods used by irb
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "e2mmap"
@@ -36,30 +35,15 @@ module IRB
     end
 
     # %
-    # <�ե饰>  [#0- +]
-    # <�Ǿ��ե��������> (\*|\*[1-9][0-9]*\$|[1-9][0-9]*)
-    # <����>.(\*|\*[1-9][0-9]*\$|[1-9][0-9]*|)?
-    # #<Ĺ������ʸ��>(hh|h|l|ll|L|q|j|z|t)
-    # <�Ѵ�����ʸ��>[diouxXeEfgGcsb%] 
+    # <flag>  [#0- +]
+    # <minimum field width> (\*|\*[1-9][0-9]*\$|[1-9][0-9]*)
+    # <precision>.(\*|\*[1-9][0-9]*\$|[1-9][0-9]*|)?
+    # #<length modifier>(hh|h|l|ll|L|q|j|z|t)
+    # <conversion specifier>[diouxXeEfgGcsb%]
     def parse_printf_format(format, opts)
       return format, opts if $1.size % 2 == 1
     end
 
-    def foo(format)
-      pos = 0
-      inspects = []
-      format.scan(/%[#0\-+ ]?(\*(?=[^0-9])|\*[1-9][0-9]*\$|[1-9][0-9]*(?=[^0-9]))?(\.(\*(?=[^0-9])|\*[1-9][0-9]*\$|[1-9][0-9]*(?=[^0-9])))?(([1-9][0-9]*\$)*)([diouxXeEfgGcsb%])/) {|f, p, pp, pos, new_pos, c|
-	puts [f, p, pp, pos, new_pos, c].join("!")
-	pos = new_pos if new_pos
-	if c == "I"
-	  inspects.push pos.to_i 
-	  (f||"")+(p||"")+(pp||"")+(pos||"")+"s"
-	else
-	  $&
-	end
-      }
-    end
-
     def puts(*objs)
       for obj in objs
 	print(*obj)
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index ab584d5253..6a5859111d 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -1,13 +1,12 @@
 #
-#   irb/ruby-lex.rb - ruby lexcal analizer
-#   	$Release Version: 0.9.5$
+#   irb/ruby-lex.rb - ruby lexcal analyzer
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "e2mmap"
@@ -21,12 +20,12 @@ class RubyLex
   def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
   def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
   def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
-  def_exception(:TkReading2TokenDuplicateError, 
+  def_exception(:TkReading2TokenDuplicateError,
 		"key duplicate(token_n='%s', key='%s')")
   def_exception(:SyntaxError, "%s")
 
   def_exception(:TerminateLineInput, "Terminate Line Input")
-  
+
   include RubyToken
 
   class << self
@@ -54,7 +53,7 @@ class RubyLex
     @lex_state = EXPR_BEG
     @space_seen = false
     @here_header = false
-    
+
     @continue = false
     @line = ""
 
@@ -92,7 +91,7 @@ class RubyLex
     else
       @base_char_no += @readed.size
     end
-    
+
     readed = @readed.join("")
     @readed = []
     readed
@@ -111,7 +110,7 @@ class RubyLex
     end
     @seek += 1
     if c == "\n"
-      @line_no += 1 
+      @line_no += 1
       @char_no = 0
     else
       @char_no += 1
@@ -148,10 +147,10 @@ class RubyLex
       c2 = @here_readed.pop
     end
     c = c2 unless c
-    @rests.unshift c #c = 
+    @rests.unshift c #c =
       @seek -= 1
     if c == "\n"
-      @line_no -= 1 
+      @line_no -= 1
       if idx = @readed.reverse.index("\n")
 	@char_no = @readed.size - idx
       else
@@ -188,7 +187,7 @@ class RubyLex
     prompt
     line = @input.call
     return nil unless line
-    @rests.concat line.split(//)
+    @rests.concat line.chars.to_a
     true
   end
   private :buf_input
@@ -216,14 +215,14 @@ class RubyLex
     @lex_state = EXPR_BEG
     @space_seen = false
     @here_header = false
-    
+
     @continue = false
     prompt
 
     @line = ""
     @exp_line_no = @line_no
   end
-  
+
   def each_top_level_statement
     initialize_input
     catch(:TERM_INPUT) do
@@ -234,13 +233,13 @@ class RubyLex
 	  unless l = lex
 	    throw :TERM_INPUT if @line == ''
 	  else
-	    #p l
 	    @line.concat l
 	    if @ltype or @continue or @indent > 0
 	      next
 	    end
 	  end
 	  if @line != "\n"
+      @line.force_encoding(@io.encoding)
 	    yield @line, @exp_line_no
 	  end
 	  break unless l
@@ -297,7 +296,7 @@ class RubyLex
     #      Tracer.off
     tk
   end
-  
+
   ENINDENT_CLAUSE = [
     "case", "class", "def", "do", "for", "if",
     "module", "unless", "until", "while", "begin" #, "when"
@@ -314,7 +313,7 @@ class RubyLex
     "W" => "]",
     "s" => ":"
   }
-  
+
   PERCENT_PAREN = {
     "{" => "}",
     "[" => "]",
@@ -354,7 +353,7 @@ class RubyLex
     end
 
     @OP.def_rule("=begin",
-		 proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do 
+		 proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do
       |op, io|
       @ltype = "="
       until getc == "\n"; end
@@ -374,8 +373,8 @@ class RubyLex
       else
 	@continue = false
 	@lex_state = EXPR_BEG
-	until (@indent_stack.empty? || 
-	       [TkLPAREN, TkLBRACK, TkLBRACE, 
+	until (@indent_stack.empty? ||
+	       [TkLPAREN, TkLBRACK, TkLBRACE,
 		 TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
 	  @indent_stack.pop
 	end
@@ -385,11 +384,12 @@ class RubyLex
       Token(TkNL)
     end
 
-    @OP.def_rules("*", "**",	
-		  "=", "==", "===", 
-		  "=~", "<=>",	
+    @OP.def_rules("*", "**",
+		  "=", "==", "===",
+		  "=~", "<=>",
 		  "<", "<=",
-		  ">", ">=", ">>") do
+		  ">", ">=", ">>",
+		  "!", "!=", "!~") do
       |op, io|
       case @lex_state
       when EXPR_FNAME, EXPR_DOT
@@ -400,19 +400,13 @@ class RubyLex
       Token(op)
     end
 
-    @OP.def_rules("!", "!=", "!~") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-
     @OP.def_rules("<<") do
       |op, io|
       tk = nil
       if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
 	  (@lex_state != EXPR_ARG || @space_seen)
 	c = peek(0)
-	if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c || c == "-")
+	if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
 	  tk = identify_here_document
 	end
       end
@@ -455,7 +449,7 @@ class RubyLex
 	  @lex_state = EXPR_BEG;
 	  Token(TkQUESTION)
 	else
-	  if (ch == '\\') 
+	  if (ch == '\\')
 	    read_escape
 	  end
 	  @lex_state = EXPR_END
@@ -469,8 +463,8 @@ class RubyLex
       @lex_state = EXPR_BEG
       Token(op)
     end
-    
-    @OP.def_rules("+=", "-=", "*=", "**=", 
+
+    @OP.def_rules("+=", "-=", "*=", "**=",
 		  "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
       |op, io|
       @lex_state = EXPR_BEG
@@ -529,7 +523,7 @@ class RubyLex
 
     lex_int2
   end
-  
+
   def lex_int2
     @OP.def_rules("]", "}", ")") do
       |op, io|
@@ -572,7 +566,7 @@ class RubyLex
 	Token(TkOPASGN, "/") #/)
       elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
 	identify_string(op)
-      else 
+      else
 	@lex_state = EXPR_BEG
 	Token("/") #/)
       end
@@ -588,7 +582,7 @@ class RubyLex
     # 	@lex_state = EXPR_BEG
     # 	Token(OP_ASGN, :^)
     #       end
-    
+
     @OP.def_rules(",") do
       |op, io|
       @lex_state = EXPR_BEG
@@ -598,8 +592,8 @@ class RubyLex
     @OP.def_rules(";") do
       |op, io|
       @lex_state = EXPR_BEG
-      until (@indent_stack.empty? || 
-	     [TkLPAREN, TkLBRACK, TkLBRACE, 
+      until (@indent_stack.empty? ||
+	     [TkLPAREN, TkLBRACK, TkLBRACE,
 	       TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
 	@indent_stack.pop
       end
@@ -617,7 +611,7 @@ class RubyLex
       @lex_state = EXPR_BEG
       Token("~")
     end
-    
+
     @OP.def_rule("(") do
       |op, io|
       @indent += 1
@@ -683,7 +677,7 @@ class RubyLex
 	@continue = true
 	Token(TkSPACE)
       else
-	ungetc
+	read_escape
 	Token("\\")
       end
     end
@@ -710,7 +704,7 @@ class RubyLex
 
     @OP.def_rule('@') do
       |op, io|
-      if peek(0) =~ /[\w_@]/
+      if peek(0) =~ /[\w@]/
 	ungetc
 	identify_identifier
       else
@@ -718,7 +712,7 @@ class RubyLex
       end
     end
 
-    #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do 
+    #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do
     # 	|op, io|
     # 	@indent += 1
     # 	@lex_state = EXPR_FNAME
@@ -733,19 +727,19 @@ class RubyLex
       printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
       if peek(0) =~ /[0-9]/
 	t = identify_number
-      elsif peek(0) =~ /[\w_]/
+      elsif peek(0) =~ /[^\x00-\/:-@\[-^`{-\x7F]/
 	t = identify_identifier
       end
       printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
       t
     end
-    
+
     p @OP if RubyLex.debug?
   end
-  
+
   def identify_gvar
     @lex_state = EXPR_END
-    
+
     case ch = getc
     when /[~_*$?!@\/\\;,=:<>".]/   #"
       Token(TkGVAR, "$" + ch)
@@ -761,12 +755,12 @@ class RubyLex
       ungetc
       ungetc
       identify_identifier
-    else 
+    else
       ungetc
       Token("$")
     end
   end
-  
+
   def identify_identifier
     token = ""
     if peek(0) =~ /[$@]/
@@ -776,12 +770,12 @@ class RubyLex
       end
     end
 
-    while (ch = getc) =~ /\w|_/
+    while (ch = getc) =~ /[^\x00-\/:-@\[-^`{-\x7F]/
       print ":", ch, ":" if RubyLex.debug?
       token.concat ch
     end
     ungetc
-    
+
     if (ch == "!" || ch == "?") && token[0,1] =~ /\w/ && peek(0) != "="
       token.concat getc
     end
@@ -799,7 +793,7 @@ class RubyLex
       @lex_state = EXPR_END
       return Token(TkIVAR, token)
     end
-    
+
     if @lex_state != EXPR_DOT
       print token, "\n" if RubyLex.debug?
 
@@ -822,11 +816,11 @@ class RubyLex
 	      when "class"
 		valid = false unless peek_match?(/^\s*(<<|\w|::)/)
 	      when "def"
-		valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
+		valid = false if peek_match?(/^\s*(([+\-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
 	      when "do"
-		valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&)/)
+		valid = false if peek_match?(/^\s*([+\-\/*]?=|\*|<|>|\&)/)
 	      when *ENINDENT_CLAUSE
-		valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&|\|)/)
+		valid = false if peek_match?(/^\s*([+\-\/*]?=|\*|<|>|\&|\|)/)
 	      else
 		# no nothing
 	      end
@@ -927,7 +921,7 @@ class RubyLex
     @lex_state = EXPR_END
     Token(Ltype2Token[lt])
   end
-  
+
   def identify_quotation
     ch = getc
     if lt = PERCENT_LTYPE[ch]
@@ -967,11 +961,11 @@ class RubyLex
       when /[0-7]/
 	match = /[0-7_]/
       when /[89]/
-	RubyLex.fail SyntaxError, "Illegal octal digit"
-      else 
+	RubyLex.fail SyntaxError, "Invalid octal digit"
+      else
 	return Token(TkINTEGER)
       end
-      
+
       len0 = true
       non_digit = false
       while ch = getc
@@ -999,7 +993,7 @@ class RubyLex
       end
       return Token(TkINTEGER)
     end
-    
+
     type = TkINTEGER
     allow_point = true
     allow_e = true
@@ -1042,7 +1036,7 @@ class RubyLex
     end
     Token(type)
   end
-  
+
   def identify_string(ltype, quoted = ltype)
     @ltype = ltype
     @quoted = quoted
@@ -1052,12 +1046,20 @@ class RubyLex
       while ch = getc
 	if @quoted == ch and nest == 0
 	  break
+	elsif @ltype != "'" && ch == "#" && peek(0) == "{"
+	  identify_string_dvar
 	elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
 	  subtype = true
+	elsif ch == '\\' and @ltype == "'" #'
+	  case ch = getc
+	  when "\\", "\n", "'"
+	  else
+	    ungetc
+	  end
 	elsif ch == '\\' #'
 	  read_escape
 	end
-	if PERCENT_PAREN.values.include?(@quoted) 
+	if PERCENT_PAREN.values.include?(@quoted)
 	  if PERCENT_PAREN[ch] == @quoted
 	    nest += 1
 	  elsif ch == @quoted
@@ -1066,7 +1068,7 @@ class RubyLex
 	end
       end
       if @ltype == "/"
-	if peek(0) =~ /i|m|x|o|e|s|u|n/
+       while peek(0) =~ /i|m|x|o|e|s|u|n/
 	  getc
 	end
       end
@@ -1081,6 +1083,42 @@ class RubyLex
       @lex_state = EXPR_END
     end
   end
+
+  def identify_string_dvar
+    begin
+      getc
+
+      reserve_continue = @continue
+      reserve_ltype = @ltype
+      reserve_indent = @indent
+      reserve_indent_stack = @indent_stack
+      reserve_state = @lex_state
+      reserve_quoted = @quoted
+
+      @ltype = nil
+      @quoted = nil
+      @indent = 0
+      @indent_stack = []
+      @lex_state = EXPR_BEG
+      
+      loop do
+	@continue = false
+	prompt
+	tk = token
+	if @ltype or @continue or @indent > 0
+	  next
+	end
+	break if tk.kind_of?(TkRBRACE)
+      end
+    ensure
+      @continue = reserve_continue
+      @ltype = reserve_ltype
+      @indent = reserve_indent
+      @indent_stack = reserve_indent_stack
+      @lex_state = reserve_state
+      @quoted = reserve_quoted
+    end
+  end
   
   def identify_comment
     @ltype = "#"
@@ -1097,7 +1135,7 @@ class RubyLex
     end
     return Token(TkCOMMENT)
   end
-  
+
   def read_escape
     case ch = getc
     when "\n", "\r", "\f"
@@ -1114,7 +1152,7 @@ class RubyLex
 	  break
 	end
       end
-      
+
     when "x"
       2.times do
 	case ch = getc
@@ -1143,7 +1181,7 @@ class RubyLex
 	read_escape
       end
     else
-      # other characters 
+      # other characters
     end
   end
 end
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
index 525d4df14c..9b06eab21b 100644
--- a/lib/irb/ruby-token.rb
+++ b/lib/irb/ruby-token.rb
@@ -1,13 +1,12 @@
 #
-#   irb/ruby-token.rb - ruby tokens 
-#   	$Release Version: 0.9.5$
+#   irb/ruby-token.rb - ruby tokens
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 module RubyToken
   EXPR_BEG = :EXPR_BEG
@@ -22,16 +21,14 @@ module RubyToken
   if !defined?(Symbol)
     Symbol = Integer
   end
-  
+
   class Token
     def initialize(seek, line_no, char_no)
       @seek = seek
       @line_no = line_no
       @char_no = char_no
     end
-    attr :seek
-    attr :line_no
-    attr :char_no
+    attr :seek, :line_no, :char_no
   end
 
   class TkNode < Token
@@ -58,7 +55,7 @@ module RubyToken
   end
 
   class TkOp < Token
-    attr :name, true
+    attr_accessor :name
   end
 
   class TkOPASGN < TkOp
@@ -87,7 +84,7 @@ module RubyToken
       if (tk = TkReading2Token[token]).nil?
 	IRB.fail TkReading2TokenNoKey, token
       end
-      tk = Token(tk[0], value) 
+      tk = Token(tk[0], value)
       if tk.kind_of?(TkOp)
 	tk.name = token
       end
@@ -96,8 +93,8 @@ module RubyToken
       if (tk = TkSymbol2Token[token]).nil?
 	IRB.fail TkSymbol2TokenNoKey, token
       end
-      return Token(tk[0], value) 
-    else 
+      return Token(tk[0], value)
+    else
       if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
 	token.new(@prev_seek, @prev_line_no, @prev_char_no)
       else
@@ -197,7 +194,7 @@ module RubyToken
     [:TkASSOC,      TkOp,   "=>"],
     [:TkQUESTION,   TkOp,   "?"],	 #?
     [:TkCOLON,      TkOp,   ":"],        #:
-    
+
     [:TkfLPAREN],         # func( #
     [:TkfLBRACK],         # func[ #
     [:TkfLBRACE],         # func{ #
@@ -253,7 +250,7 @@ module RubyToken
       IRB.fail AlreadyDefinedToken, token_n
     end
     token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
-    
+
     if reading
       if TkReading2Token[reading]
 	IRB.fail TkReading2TokenDuplicateError, token_n, reading
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
index a6ea6fb473..fac62bfd93 100644
--- a/lib/irb/slex.rb
+++ b/lib/irb/slex.rb
@@ -1,13 +1,12 @@
 #
-#   irb/slex.rb - symple lex analizer
-#   	$Release Version: 0.9.5$
+#   irb/slex.rb - simple lex analyzer
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "e2mmap"
@@ -25,20 +24,20 @@ module IRB
     D_WARN = DOUT::def_notifier(1, "Warn: ")
     D_DEBUG = DOUT::def_notifier(2, "Debug: ")
     D_DETAIL = DOUT::def_notifier(4, "Detail: ")
-    
+
     DOUT.level = Notifier::D_NOMSG
 
     def initialize
       @head = Node.new("")
     end
-    
+
     def def_rule(token, preproc = nil, postproc = nil, &block)
       D_DETAIL.pp token
 
       postproc = block if block_given?
       node = create(token, preproc, postproc)
     end
-    
+
     def def_rules(*tokens, &block)
       if block_given?
 	p = block
@@ -47,18 +46,18 @@ module IRB
 	def_rule(token, nil, p)
       end
     end
-    
+
     def preproc(token, proc)
       node = search(token)
       node.preproc=proc
     end
-    
-    #$BMW%A%'%C%/(B? 
+
+    #$BMW%A%'%C%/(B?
     def postproc(token)
       node = search(token, proc)
       node.postproc=proc
     end
-    
+
     def search(token)
       @head.search(token.split(//))
     end
@@ -66,7 +65,7 @@ module IRB
     def create(token, preproc = nil, postproc = nil)
       @head.create_subnode(token.split(//), preproc, postproc)
     end
-    
+
     def match(token)
       case token
       when Array
@@ -79,14 +78,14 @@ module IRB
       D_DETAIL.exec_if{D_DEATIL.printf "match end: %s:%s\n", ret, token.inspect}
       ret
     end
-    
+
     def inspect
       format("<SLex: @head = %s>", @head.inspect)
     end
 
     #----------------------------------------------------------------------
     #
-    #   class Node - 
+    #   class Node -
     #
     #----------------------------------------------------------------------
     class Node
@@ -100,7 +99,7 @@ module IRB
 
       attr_accessor :preproc
       attr_accessor :postproc
-      
+
       def search(chrs, opt = nil)
 	return self if chrs.empty?
 	ch = chrs.shift
@@ -115,7 +114,7 @@ module IRB
 	  end
 	end
       end
-      
+
       def create_subnode(chrs, preproc = nil, postproc = nil)
 	if chrs.empty?
 	  if @postproc
@@ -128,7 +127,7 @@ module IRB
 	  end
 	  return self
 	end
-	
+
 	ch = chrs.shift
 	if node = @Tree[ch]
 	  if chrs.empty?
@@ -162,7 +161,7 @@ module IRB
       # chrs: String
       #       character array
       #       io must have getc()/ungetc(); and ungetc() must be
-      #       able to be called arbitrary number of times. 
+      #       able to be called arbitrary number of times.
       #
       def match(chrs, op = "")
 	D_DETAIL.print "match>: ", chrs, "op:", op, "\n"
@@ -245,8 +244,6 @@ module IRB
   end
 end
 
-SLex=IRB::SLex
-
 if $0 == __FILE__
   #    Tracer.on
   case $1
@@ -257,14 +254,14 @@ if $0 == __FILE__
     print "1: ", tr.inspect, "\n"
     tr.def_rule("==") {print "==\n"}
     print "2: ", tr.inspect, "\n"
-    
+
     print "case 1:\n"
     print tr.match("="), "\n"
     print "case 2:\n"
     print tr.match("=="), "\n"
     print "case 3:\n"
     print tr.match("=>"), "\n"
-    
+
   when "2"
     tr = SLex.new
     print "0: ", tr.inspect, "\n"
@@ -272,7 +269,7 @@ if $0 == __FILE__
     print "1: ", tr.inspect, "\n"
     tr.def_rule("==", proc{false}) {print "==\n"}
     print "2: ", tr.inspect, "\n"
-    
+
     print "case 1:\n"
     print tr.match("="), "\n"
     print "case 2:\n"
diff --git a/lib/irb/src_encoding.rb b/lib/irb/src_encoding.rb
new file mode 100644
index 0000000000..958cef104c
--- /dev/null
+++ b/lib/irb/src_encoding.rb
@@ -0,0 +1,4 @@
+# DO NOT WRITE ANY MAGIC COMMENT HERE.
+def default_src_encoding
+  return __ENCODING__
+end
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
index 28b079740a..621a127ebd 100644
--- a/lib/irb/version.rb
+++ b/lib/irb/version.rb
@@ -1,16 +1,15 @@
 #
 #   irb/version.rb - irb version definition file
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
-#   
+#
 #
 
 module IRB
-  @RELEASE_VERSION = "0.9.5"
-  @LAST_UPDATE_DATE = "05/04/13"
+  @RELEASE_VERSION = "0.9.6"
+  @LAST_UPDATE_DATE = "09/06/30"
 end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index 7d1794cd7b..edc0d3b147 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -1,13 +1,12 @@
 #
-#   irb/workspace-binding.rb - 
-#   	$Release Version: 0.9.5$
+#   irb/workspace-binding.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 module IRB
   class WorkSpace
@@ -22,7 +21,7 @@ module IRB
 	case IRB.conf[:CONTEXT_MODE]
 	when 0	# binding in proc on TOPLEVEL_BINDING
 	  @binding = eval("proc{binding}.call",
-		      TOPLEVEL_BINDING, 
+		      TOPLEVEL_BINDING,
 		      __FILE__,
 		      __LINE__)
 	when 1	# binding in loaded file
@@ -38,7 +37,7 @@ EOF
 	when 2	# binding in loaded file(thread use)
 	  unless defined? BINDING_QUEUE
 	    require "thread"
-	    
+
 	    IRB.const_set("BINDING_QUEUE", SizedQueue.new(1))
 	    Thread.abort_on_exception = true
 	    Thread.start do
@@ -50,7 +49,7 @@ EOF
 
 	when 3	# binging in function on TOPLEVEL_BINDING(default)
 	  @binding = eval("def irb_binding; binding; end; irb_binding",
-		      TOPLEVEL_BINDING, 
+		      TOPLEVEL_BINDING,
 		      __FILE__,
 		      __LINE__ - 3)
 	end
@@ -64,7 +63,7 @@ EOF
 	when Module
 	  @binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
 	else
-	  begin 
+	  begin
 	    @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
 	  rescue TypeError
 	    IRB.fail CantChangeBinding, @main.inspect
@@ -80,7 +79,7 @@ EOF
     def evaluate(context, statements, file = __FILE__, line = __LINE__)
       eval(statements, @binding, file, line)
     end
-  
+
     # error message manipulator
     def filter_backtrace(bt)
       case IRB.conf[:CONTEXT_MODE]
@@ -94,9 +93,11 @@ EOF
 	end
       when 2
 	return nil if bt =~ /irb\/.*\.rb/
+	return nil if bt =~ /irb\.rb/
       when 3
 	return nil if bt =~ /irb\/.*\.rb/
-	bt.sub!(/:\s*in `irb_binding'/){""} 
+	return nil if bt =~ /irb\.rb/
+	bt = bt.sub(/:\s*in `irb_binding'/, '')
       end
       bt
     end
diff --git a/lib/irb/ws-for-case-2.rb b/lib/irb/ws-for-case-2.rb
index afd49d23e1..bb3932ad62 100644
--- a/lib/irb/ws-for-case-2.rb
+++ b/lib/irb/ws-for-case-2.rb
@@ -1,13 +1,12 @@
 #
-#   irb/ws-for-case-2.rb - 
-#   	$Release Version: 0.9.5$
+#   irb/ws-for-case-2.rb -
+#   	$Release Version: 0.9.6$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 while true
diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
index 4bcc2ca22f..bcef964020 100644
--- a/lib/irb/xmp.rb
+++ b/lib/irb/xmp.rb
@@ -2,12 +2,11 @@
 #   xmp.rb - irb version of gotoken xmp
 #   	$Release Version: 0.9$
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(Nippon Rational Inc.)
 #
 # --
 #
-#   
+#
 #
 
 require "irb"
@@ -73,8 +72,20 @@ class XMP
     end
 
     def puts(exps)
+      if @encoding and exps.encoding != @encoding
+	enc = Encoding.compatible?(@exps.join("\n"), exps)
+	if enc.nil?
+	  raise Encoding::CompatibilityError, "Encoding in which the passed expression is encoded is not compatible to the preceding's one"
+	else
+	  @encoding = enc
+	end
+      else
+	@encoding = exps.encoding
+      end
       @exps.concat exps.split(/\n/)
     end
+
+    attr_reader :encoding
   end
 end
 
diff --git a/lib/jcode.rb b/lib/jcode.rb
deleted file mode 100644
index 78422f296f..0000000000
--- a/lib/jcode.rb
+++ /dev/null
@@ -1,220 +0,0 @@
-# jcode.rb - ruby code to handle japanese (EUC/SJIS) string
-
-if $VERBOSE && $KCODE == "NONE"
-  warn "Warning: $KCODE is NONE."
-end
-
-$vsave, $VERBOSE = $VERBOSE, false
-class String
-  warn "feel free for some warnings:\n" if $VERBOSE
-
-  def _regex_quote(str)
-    str.gsub(/(\\[\[\]\-\\])|\\(.)|([\[\]\\])/) do
-      $1 || $2 || '\\' + $3
-    end
-  end
-  private :_regex_quote
-
-  PATTERN_SJIS = '[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc]'
-  PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]'
-  PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]'
-
-  RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n')
-  RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n')
-  RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n')
-
-  SUCC = {}
-  SUCC['s'] = Hash.new(1)
-  for i in 0 .. 0x3f
-    SUCC['s'][i.chr] = 0x40 - i
-  end
-  SUCC['s']["\x7e"] = 0x80 - 0x7e
-  SUCC['s']["\xfd"] = 0x100 - 0xfd
-  SUCC['s']["\xfe"] = 0x100 - 0xfe
-  SUCC['s']["\xff"] = 0x100 - 0xff
-  SUCC['e'] = Hash.new(1)
-  for i in 0 .. 0xa0
-    SUCC['e'][i.chr] = 0xa1 - i
-  end
-  SUCC['e']["\xfe"] = 2
-  SUCC['u'] = Hash.new(1)
-  for i in 0 .. 0x7f
-    SUCC['u'][i.chr] = 0x80 - i
-  end
-  SUCC['u']["\xbf"] = 0x100 - 0xbf
-
-  def mbchar?
-    case $KCODE[0]
-    when ?s, ?S
-      self =~ RE_SJIS
-    when ?e, ?E
-      self =~ RE_EUC
-    when ?u, ?U
-      self =~ RE_UTF8
-    else
-      nil
-    end
-  end
-
-  def end_regexp
-    case $KCODE[0]
-    when ?s, ?S
-      /#{PATTERN_SJIS}$/on
-    when ?e, ?E
-      /#{PATTERN_EUC}$/on
-    when ?u, ?U
-      /#{PATTERN_UTF8}$/on
-    else
-      /.$/on
-    end
-  end
-
-  alias original_succ! succ!
-  private :original_succ!
-
-  alias original_succ succ
-  private :original_succ
-
-  def succ!
-    reg = end_regexp
-    if  $KCODE != 'NONE' && self =~ reg
-      succ_table = SUCC[$KCODE[0,1].downcase]
-      begin
-	self[-1] += succ_table[self[-1]]
-	self[-2] += 1 if self[-1] == 0
-      end while self !~ reg
-      self
-    else
-      original_succ!
-    end
-  end
-
-  def succ
-    str = self.dup
-    str.succ! or str
-  end
-
-  private
-
-  def _expand_ch str
-    a = []
-    str.scan(/(?:\\(.)|([^\\]))-(?:\\(.)|([^\\]))|(?:\\(.)|(.))/m) do
-      from = $1 || $2
-      to = $3 || $4
-      one = $5 || $6
-      if one
-	a.push one
-      elsif from.length != to.length
-	next
-      elsif from.length == 1
-	from[0].upto(to[0]) { |c| a.push c.chr }
-      else
-	from.upto(to) { |c| a.push c }
-      end
-    end
-    a
-  end
-
-  def expand_ch_hash from, to
-    h = {}
-    afrom = _expand_ch(from)
-    ato = _expand_ch(to)
-    afrom.each_with_index do |x,i| h[x] = ato[i] || ato[-1] end
-    h
-  end
-
-  HashCache = {}
-  TrPatternCache = {}
-  DeletePatternCache = {}
-  SqueezePatternCache = {}
-
-  public
-
-  def tr!(from, to)
-    return nil if from == ""
-    return self.delete!(from) if to == ""
-
-    pattern = TrPatternCache[from] ||= /[#{_regex_quote(from)}]/
-    if from[0] == ?^
-      last = /.$/.match(to)[0]
-      self.gsub!(pattern, last)
-    else
-      h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
-      self.gsub!(pattern) do |c| h[c] end
-    end
-  end
-
-  def tr(from, to)
-    (str = self.dup).tr!(from, to) or str
-  end
-
-  def delete!(del)
-    return nil if del == ""
-    self.gsub!(DeletePatternCache[del] ||= /[#{_regex_quote(del)}]+/, '')
-  end
-
-  def delete(del)
-    (str = self.dup).delete!(del) or str
-  end
-
-  def squeeze!(del=nil)
-    return nil if del == ""
-    pattern =
-      if del
-	SqueezePatternCache[del] ||= /([#{_regex_quote(del)}])\1+/
-      else
-	/(.|\n)\1+/
-      end
-    self.gsub!(pattern, '\1')
-  end
-
-  def squeeze(del=nil)
-    (str = self.dup).squeeze!(del) or str
-  end
-
-  def tr_s!(from, to)
-    return self.delete!(from) if to.length == 0
-
-    pattern = SqueezePatternCache[from] ||= /([#{_regex_quote(from)}])\1*/
-    if from[0] == ?^
-      last = /.$/.match(to)[0]
-      self.gsub!(pattern, last)
-    else
-      h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
-      self.gsub!(pattern) do h[$1] end
-    end
-  end
-
-  def tr_s(from, to)
-    (str = self.dup).tr_s!(from,to) or str
-  end
-
-  def chop!
-    self.gsub!(/(?:.|\r?\n)\z/, '')
-  end
-
-  def chop
-    (str = self.dup).chop! or str
-  end
-
-  def jlength
-    self.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
-  end
-  alias jsize jlength
-
-  def jcount(str)
-    self.delete("^#{str}").jlength
-  end
-
-  def each_char
-    if block_given?
-      scan(/./m) do |x|
-        yield x
-      end
-    else
-      scan(/./m)
-    end
-  end
-
-end
-$VERBOSE = $vsave
diff --git a/lib/logger.rb b/lib/logger.rb
index 60e72424ad..6c33f7b3be 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -1,9 +1,5 @@
-# logger.rb - saimple logging utility
-# Copyright (C) 2000-2003, 2005  NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>.
-
-require 'monitor'
-
-# Simple logging utility.
+# logger.rb - simple logging utility
+# Copyright (C) 2000-2003, 2005, 2008  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 #
 # Author:: NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 # Documentation:: NAKAMURA, Hiroshi and Gavin Sinclair
@@ -12,6 +8,12 @@ require 'monitor'
 #   license; either the dual license version in 2003, or any later version.
 # Revision:: $Id$
 #
+# See Logger for documentation.
+
+
+require 'monitor'
+
+
 # == Description
 #
 # The Logger class provides a simple but sophisticated logging utility that
@@ -143,14 +145,14 @@ require 'monitor'
 # 2. Log4r (somewhat) compatible interface.
 #
 #      logger.level = Logger::INFO
-#      
+#
 #      DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
 #
 #
 # == Format
 #
-# Log messages are rendered in the output stream in a certain format.  The
-# default format and a sample are shown below:
+# Log messages are rendered in the output stream in a certain format by
+# default.  The default format and a sample are shown below:
 #
 # Log format:
 #   SeverityID, [Date Time mSec #pid] SeverityLabel -- ProgName: message
@@ -163,18 +165,28 @@ require 'monitor'
 #   logger.datetime_format = "%Y-%m-%d %H:%M:%S"
 #         # e.g. "2004-01-03 00:54:26"
 #
-# There is currently no supported way to change the overall format, but you may
-# have some luck hacking the Format constant.
+# You may change the overall format with Logger#formatter= method.
+#
+#   logger.formatter = proc { |severity, datetime, progname, msg|
+#     "#{datetime}: #{msg}\n"
+#   }
+#         # e.g. "Thu Sep 22 08:51:08 GMT+9:00 2005: hello world"
 #
 
 
 class Logger
-  VERSION = "1.2.6"
-  /: (\S+),v (\S+)/ =~ %q$Id$
-  ProgName = "#{$1}/#{$2}"
+  VERSION = "1.2.7"
+  id, name, rev = %w$Id$
+  if name
+    name = name.chomp(",v")
+  else
+    name = File.basename(__FILE__)
+  end
+  rev ||= "v#{VERSION}"
+  ProgName = "#{name}/#{rev}"
 
   class Error < RuntimeError; end
-  class ShiftingError < Error; end
+  class ShiftingError < Error; end # not used after 1.2.7. just for compat.
 
   # Logging severity.
   module Severity
@@ -317,10 +329,10 @@ class Logger
     progname ||= @progname
     if message.nil?
       if block_given?
-	message = yield
+        message = yield
       else
-	message = progname
-	progname = @progname
+        message = progname
+        progname = @progname
       end
     end
     @logdev.write(
@@ -482,32 +494,44 @@ private
       @dev = @filename = @shift_age = @shift_size = nil
       @mutex = LogDeviceMutex.new
       if log.respond_to?(:write) and log.respond_to?(:close)
-	@dev = log
+        @dev = log
       else
-	@dev = open_logfile(log)
-	@dev.sync = true
-	@filename = log
-	@shift_age = opt[:shift_age] || 7
-	@shift_size = opt[:shift_size] || 1048576
+        @dev = open_logfile(log)
+        @dev.sync = true
+        @filename = log
+        @shift_age = opt[:shift_age] || 7
+        @shift_size = opt[:shift_size] || 1048576
       end
     end
 
     def write(message)
-      @mutex.synchronize do
-        if @shift_age and @dev.respond_to?(:stat)
+      begin
+        @mutex.synchronize do
+          if @shift_age and @dev.respond_to?(:stat)
+            begin
+              check_shift_log
+            rescue
+              warn("log shifting failed. #{$!}")
+            end
+          end
           begin
-            check_shift_log
+            @dev.write(message)
           rescue
-            raise Logger::ShiftingError.new("Shifting failed. #{$!}")
+            warn("log writing failed. #{$!}")
           end
         end
-        @dev.write(message)
+      rescue Exception => ignored
+        warn("log writing failed. #{ignored}")
       end
     end
 
     def close
-      @mutex.synchronize do
-        @dev.close
+      begin
+        @mutex.synchronize do
+          @dev.close rescue nil
+        end
+      rescue Exception => ignored
+        @dev.close rescue nil
       end
     end
 
@@ -515,9 +539,9 @@ private
 
     def open_logfile(filename)
       if (FileTest.exist?(filename))
-     	open(filename, (File::WRONLY | File::APPEND))
+        open(filename, (File::WRONLY | File::APPEND))
       else
-       	create_logfile(filename)
+        create_logfile(filename)
       end
     end
 
@@ -530,8 +554,8 @@ private
 
     def add_log_header(file)
       file.write(
-     	"# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
-    )
+        "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
+      )
     end
 
     SiD = 24 * 60 * 60
@@ -544,8 +568,9 @@ private
         end
       else
         now = Time.now
-        if @dev.stat.mtime <= previous_period_end(now)
-          shift_log_period(now)
+        period_end = previous_period_end(now)
+        if @dev.stat.mtime <= period_end
+          shift_log_period(period_end)
         end
       end
     end
@@ -556,19 +581,26 @@ private
           File.rename("#{@filename}.#{i}", "#{@filename}.#{i+1}")
         end
       end
-      @dev.close
+      @dev.close rescue nil
       File.rename("#{@filename}", "#{@filename}.0")
       @dev = create_logfile(@filename)
       return true
     end
 
-    def shift_log_period(now)
-      postfix = previous_period_end(now).strftime("%Y%m%d")	# YYYYMMDD
+    def shift_log_period(period_end)
+      postfix = period_end.strftime("%Y%m%d") # YYYYMMDD
       age_file = "#{@filename}.#{postfix}"
       if FileTest.exist?(age_file)
-        raise RuntimeError.new("'#{ age_file }' already exists.")
+        # try to avoid filename crash caused by Timestamp change.
+        idx = 0
+        # .99 can be overriden; avoid too much file search with 'loop do'
+        while idx < 100
+          idx += 1
+          age_file = "#{@filename}.#{postfix}.#{idx}"
+          break unless FileTest.exist?(age_file)
+        end
       end
-      @dev.close
+      @dev.close rescue nil
       File.rename("#{@filename}", age_file)
       @dev = create_logfile(@filename)
       return true
@@ -625,8 +657,8 @@ private
   class Application
     include Logger::Severity
 
+    # Name of the application given at initialize.
     attr_reader :appname
-    attr_reader :logdev
 
     #
     # == Synopsis
@@ -655,19 +687,33 @@ private
     def start
       status = -1
       begin
-	log(INFO, "Start of #{ @appname }.")
-	status = run
+        log(INFO, "Start of #{ @appname }.")
+        status = run
       rescue
-	log(FATAL, "Detected an exception. Stopping ... #{$!} (#{$!.class})\n" << $@.join("\n"))
+        log(FATAL, "Detected an exception. Stopping ... #{$!} (#{$!.class})\n" << $@.join("\n"))
       ensure
-	log(INFO, "End of #{ @appname }. (status: #{ status.to_s })")
+        log(INFO, "End of #{ @appname }. (status: #{ status.to_s })")
       end
       status
     end
 
+    # Logger for this application.  See the class Logger for an explanation.
+    def logger
+      @log
+    end
+
+    #
+    # Sets the logger for this application.  See the class Logger for an explanation.
+    #
+    def logger=(logger)
+      @log = logger
+      @log.progname = @appname
+      @log.level = @level
+    end
+
     #
-    # Sets the log device for this application.  See the class Logger for an
-    # explanation of the arguments.
+    # Sets the log device for this application.  See <tt>Logger.new</tt> for an explanation
+    # of the arguments.
     #
     def set_log(logdev, shift_age = 0, shift_size = 1024000)
       @log = Logger.new(logdev, shift_age, shift_size)
@@ -697,6 +743,7 @@ private
   private
 
     def run
+      # TODO: should be an NotImplementedError
       raise RuntimeError.new('Method run must be defined in the derived class.')
     end
   end
diff --git a/lib/mailread.rb b/lib/mailread.rb
deleted file mode 100644
index 08b33c92a4..0000000000
--- a/lib/mailread.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# The Mail class represents an internet mail message (as per RFC822, RFC2822)
-# with headers and a body. 
-class Mail
-
-  # Create a new Mail where +f+ is either a stream which responds to gets(),
-  # or a path to a file.  If +f+ is a path it will be opened.
-  #
-  # The whole message is read so it can be made available through the #header,
-  # #[] and #body methods.
-  #
-  # The "From " line is ignored if the mail is in mbox format.
-  def initialize(f)
-    unless defined? f.gets
-      f = open(f, "r")
-      opened = true
-    end
-
-    @header = {}
-    @body = []
-    begin
-      while line = f.gets()
-	line.chop!
-	next if /^From /=~line	# skip From-line
-	break if /^$/=~line	# end of header
-
-	if /^(\S+?):\s*(.*)/=~line
-	  (attr = $1).capitalize!
-	  @header[attr] = $2
-	elsif attr
-	  line.sub!(/^\s*/, '')
-	  @header[attr] += "\n" + line
-	end
-      end
-  
-      return unless line
-
-      while line = f.gets()
-	break if /^From /=~line
-	@body.push(line)
-      end
-    ensure
-      f.close if opened
-    end
-  end
-
-  # Return the headers as a Hash.
-  def header
-    return @header
-  end
-
-  # Return the message body as an Array of lines
-  def body
-    return @body
-  end
-
-  # Return the header corresponding to +field+. 
-  #
-  # Matching is case-insensitive.
-  def [](field)
-    @header[field.capitalize]
-  end
-end
diff --git a/lib/mathn.rb b/lib/mathn.rb
index a5a121c6c6..716b48602d 100644
--- a/lib/mathn.rb
+++ b/lib/mathn.rb
@@ -1,133 +1,65 @@
 #
-#   mathn.rb - 
+#   mathn.rb -
 #   	$Release Version: 0.5 $
 #   	$Revision: 1.1.1.1.4.1 $
-#   	$Date: 1998/01/16 12:36:05 $
 #   	by Keiju ISHITSUKA(SHL Japan Inc.)
 #
 # --
 #
-#   
+#
 #
 
-require "complex.rb"
-require "rational.rb"
+require "cmath.rb"
 require "matrix.rb"
+require "prime.rb"
 
-class Integer
+require "mathn/rational"
+require "mathn/complex"
 
-  def gcd2(int)
-    a = self.abs
-    b = int.abs
-    a, b = b, a if a < b
-    
-    pd_a = a.prime_division
-    pd_b = b.prime_division
-    
-    gcd = 1
-    for pair in pd_a
-      as = pd_b.assoc(pair[0])
-      if as
-	gcd *= as[0] ** [as[1], pair[1]].min
-      end
-    end
-    return gcd
-  end
-  
-  def Integer.from_prime_division(pd)
-    value = 1
-    for prime, index in pd
-      value *= prime**index
-    end
-    value
-  end
-  
-  def prime_division
-    raise ZeroDivisionError if self == 0
-    ps = Prime.new
-    value = self
-    pv = []
-    for prime in ps
-      count = 0
-      while (value1, mod = value.divmod(prime)
-	     mod) == 0
-	value = value1
-	count += 1
-      end
-      if count != 0
-	pv.push [prime, count]
-      end
-      break if prime * prime  >= value
-    end
-    if value > 1
-      pv.push [value, 1]
-    end
-    return pv
-  end
+unless defined?(Math.exp!)
+  Object.instance_eval{remove_const :Math}
+  Math = CMath
 end
-  
-class Prime
-  include Enumerable
 
-  def initialize
-    @seed = 1
-    @primes = []
-    @counts = []
-  end
-  
-  def succ
-    i = -1
-    size = @primes.size
-    while i < size
-      if i == -1
-	@seed += 1
-	i += 1
-      else
-	while @seed > @counts[i]
-	  @counts[i] += @primes[i]
-	end
-	if @seed != @counts[i]
-	  i += 1
-	else
-	  i = -1
-	end
-      end
-    end
-    @primes.push @seed
-    @counts.push @seed + @seed
-    return @seed
-  end
-  alias next succ
+class Fixnum
+  remove_method :/
+  alias / quo
 
-  def each
-    loop do
-      yield succ
+  alias power! ** unless method_defined? :power!
+
+  def ** (other)
+    if self < 0 && other.round != other
+      Complex(self, 0.0) ** other
+    else
+      power!(other)
     end
   end
-end
 
-class Fixnum
-  alias / quo
 end
 
 class Bignum
+  remove_method :/
   alias / quo
-end
 
-class Rational
-  Unify = true
+  alias power! ** unless method_defined? :power!
 
-  def inspect
-    format "%s/%s", numerator.inspect, denominator.inspect
+  def ** (other)
+    if self < 0 && other.round != other
+      Complex(self, 0.0) ** other
+    else
+      power!(other)
+    end
   end
 
-  alias power! **
+end
 
+class Rational
+  remove_method :**
   def ** (other)
     if other.kind_of?(Rational)
       other2 = other
       if self < 0
-	return Complex.new!(self, 0) ** other
+	return Complex(self, 0.0) ** other
       elsif other == 0
 	return Rational(1,1)
       elsif self == 0
@@ -135,14 +67,14 @@ class Rational
       elsif self == 1
 	return Rational(1,1)
       end
-      
+
       npd = numerator.prime_division
       dpd = denominator.prime_division
       if other < 0
 	other = -other
 	npd, dpd = dpd, npd
       end
-      
+
       for elm in npd
 	elm[1] = elm[1] * other
 	if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
@@ -150,7 +82,7 @@ class Rational
 	end
 	elm[1] = elm[1].to_i
       end
-      
+
       for elm in dpd
 	elm[1] = elm[1] * other
 	if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
@@ -158,56 +90,12 @@ class Rational
 	end
 	elm[1] = elm[1].to_i
       end
-      
+
       num = Integer.from_prime_division(npd)
       den = Integer.from_prime_division(dpd)
-      
-      Rational(num,den)
-      
-    elsif other.kind_of?(Integer)
-      if other > 0
-	num = numerator ** other
-	den = denominator ** other
-      elsif other < 0
-	num = denominator ** -other
-	den = numerator ** -other
-      elsif other == 0
-	num = 1
-	den = 1
-      end
-      Rational.new!(num, den)
-    elsif other.kind_of?(Float)
-      Float(self) ** other
-    else
-      x , y = other.coerce(self)
-      x ** y
-    end
-  end
 
-  def power2(other)
-    if other.kind_of?(Rational)
-      if self < 0
-	return Complex(self, 0) ** other
-      elsif other == 0
-	return Rational(1,1)
-      elsif self == 0
-	return Rational(0,1)
-      elsif self == 1
-	return Rational(1,1)
-      end
-      
-      dem = nil
-      x = self.denominator.to_f.to_i
-      neard = self.denominator.to_f ** (1.0/other.denominator.to_f)
-      loop do
-	if (neard**other.denominator == self.denominator)
-	  dem = neaed
-	  break
-	end
-      end
-      nearn = self.numerator.to_f ** (1.0/other.denominator.to_f)
       Rational(num,den)
-      
+
     elsif other.kind_of?(Integer)
       if other > 0
 	num = numerator ** other
@@ -219,7 +107,7 @@ class Rational
 	num = 1
 	den = 1
       end
-      Rational.new!(num, den)
+      Rational(num, den)
     elsif other.kind_of?(Float)
       Float(self) ** other
     else
@@ -230,9 +118,10 @@ class Rational
 end
 
 module Math
+  remove_method(:sqrt)
   def sqrt(a)
     if a.kind_of?(Complex)
-      abs = sqrt(a.real*a.real + a.image*a.image)
+      abs = sqrt(a.real*a.real + a.imag*a.imag)
 #      if not abs.kind_of?(Rational)
 #	return a**Rational(1,2)
 #      end
@@ -241,18 +130,20 @@ module Math
 #      if !(x.kind_of?(Rational) and y.kind_of?(Rational))
 #	return a**Rational(1,2)
 #      end
-      if a.image >= 0 
+      if a.imag >= 0
 	Complex(x, y)
       else
 	Complex(x, -y)
       end
+    elsif a.respond_to?(:nan?) and a.nan?
+      a
     elsif a >= 0
       rsqrt(a)
     else
       Complex(0,rsqrt(-a))
     end
   end
-  
+
   def rsqrt(a)
     if a.kind_of?(Float)
       sqrt!(a)
@@ -266,7 +157,7 @@ module Math
       while (src >= max) and (src >>= 32)
 	byte_a.unshift src & 0xffffffff
       end
-      
+
       answer = 0
       main = 0
       side = 0
@@ -276,13 +167,13 @@ module Math
 	if answer != 0
 	  if main * 4  < side * side
 	    applo = main.div(side)
-	  else 
+	  else
 	    applo = ((sqrt!(side * side + 4 * main) - side)/2.0).to_i + 1
 	  end
 	else
 	  applo = sqrt!(main).to_i + 1
 	end
-	
+
 	while (x = (side + applo) * applo) > main
 	  applo -= 1
 	end
@@ -298,11 +189,22 @@ module Math
     end
   end
 
+  class << self
+    remove_method(:sqrt)
+  end
   module_function :sqrt
   module_function :rsqrt
 end
 
-class Complex
-  Unify = true
-end
+class Float
+  alias power! **
+
+  def ** (other)
+    if self < 0 && other.round != other
+      Complex(self, 0.0) ** other
+    else
+      power!(other)
+    end
+  end
 
+end
diff --git a/lib/matrix.rb b/lib/matrix.rb
index c62acdf9aa..8e6b08c3c6 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -1,24 +1,15 @@
-#!/usr/local/bin/ruby
-#--
-#   matrix.rb - 
-#       $Release Version: 1.0$
-#       $Revision: 1.11 $
-#       $Date: 1999/10/06 11:01:53 $
-#       Original Version from Smalltalk-80 version
-#          on July 23, 1985 at 8:37:17 am
-#       by Keiju ISHITSUKA
-#++
+# encoding: utf-8
 #
 # = matrix.rb
 #
 # An implementation of Matrix and Vector classes.
 #
-# Author:: Keiju ISHITSUKA
-# Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly)) 
+# See classes Matrix and Vector for documentation.
 #
-# See classes Matrix and Vector for documentation. 
-#
-
+# Current Maintainer:: Marc-André Lafortune
+# Original Author:: Keiju ISHITSUKA
+# Original Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly))
+##
 
 require "e2mmap.rb"
 
@@ -26,23 +17,17 @@ module ExceptionForMatrix # :nodoc:
   extend Exception2MessageMapper
   def_e2message(TypeError, "wrong argument type %s (expected %s)")
   def_e2message(ArgumentError, "Wrong # of arguments(%d for %d)")
-  
+
   def_exception("ErrDimensionMismatch", "\#{self.name} dimension mismatch")
   def_exception("ErrNotRegular", "Not Regular Matrix")
-  def_exception("ErrOperationNotDefined", "This operation(%s) can\\'t defined")
+  def_exception("ErrOperationNotDefined", "Operation(%s) can\\'t be defined: %s op %s")
+  def_exception("ErrOperationNotImplemented", "Sorry, Operation(%s) not implemented: %s op %s")
 end
 
 #
-# The +Matrix+ class represents a mathematical matrix, and provides methods for creating
-# special-case matrices (zero, identity, diagonal, singular, vector), operating on them
-# arithmetically and algebraically, and determining their mathematical properties (trace, rank,
-# inverse, determinant).
-#
-# Note that although matrices should theoretically be rectangular, this is not
-# enforced by the class.
-#
-# Also note that the determinant of integer matrices may be incorrectly calculated unless you
-# also <tt>require 'mathn'</tt>.  This may be fixed in the future.
+# The +Matrix+ class represents a mathematical matrix. It provides methods for creating
+# matrices, operating on them arithmetically and algebraically,
+# and determining their mathematical properties (trace, rank, inverse, determinant).
 #
 # == Method Catalogue
 #
@@ -51,9 +36,9 @@ end
 # * <tt> Matrix.[](*rows)               </tt>
 # * <tt> Matrix.rows(rows, copy = true) </tt>
 # * <tt> Matrix.columns(columns)        </tt>
+# * <tt> Matrix.build(row_size, column_size, &block) </tt>
 # * <tt> Matrix.diagonal(*values)       </tt>
 # * <tt> Matrix.scalar(n, value)        </tt>
-# * <tt> Matrix.scalar(n, value)        </tt>
 # * <tt> Matrix.identity(n)             </tt>
 # * <tt> Matrix.unit(n)                 </tt>
 # * <tt> Matrix.I(n)                    </tt>
@@ -61,7 +46,7 @@ end
 # * <tt> Matrix.row_vector(row)         </tt>
 # * <tt> Matrix.column_vector(column)   </tt>
 #
-# To access Matrix elements/columns/rows/submatrices/properties: 
+# To access Matrix elements/columns/rows/submatrices/properties:
 # * <tt>  [](i, j)                      </tt>
 # * <tt> #row_size                      </tt>
 # * <tt> #column_size                   </tt>
@@ -69,9 +54,13 @@ end
 # * <tt> #column(j)                     </tt>
 # * <tt> #collect                       </tt>
 # * <tt> #map                           </tt>
+# * <tt> #each                          </tt>
+# * <tt> #each_with_index               </tt>
 # * <tt> #minor(*param)                 </tt>
 #
 # Properties of a matrix:
+# * <tt> #empty?                        </tt>
+# * <tt> #real?                         </tt>
 # * <tt> #regular?                      </tt>
 # * <tt> #singular?                     </tt>
 # * <tt> #square?                       </tt>
@@ -94,6 +83,15 @@ end
 # * <tt> #transpose                     </tt>
 # * <tt> #t                             </tt>
 #
+# Complex arithmetic:
+# * <tt> conj                           </tt>
+# * <tt> conjugate                      </tt>
+# * <tt> imag                           </tt>
+# * <tt> imaginary                      </tt>
+# * <tt> real                           </tt>
+# * <tt> rect                           </tt>
+# * <tt> rectangular                    </tt>
+#
 # Conversion to other data types:
 # * <tt> #coerce(other)                 </tt>
 # * <tt> #row_vectors                   </tt>
@@ -105,14 +103,14 @@ end
 # * <tt> #inspect                       </tt>
 #
 class Matrix
-  @RCS_ID='-$Id: matrix.rb,v 1.11 1999/10/06 11:01:53 keiju Exp keiju $-'
-  
-#  extend Exception2MessageMapper
+  include Enumerable
   include ExceptionForMatrix
-  
+
   # instance creations
   private_class_method :new
-  
+  attr_reader :rows
+  protected :rows
+
   #
   # Creates a matrix where each argument is a row.
   #   Matrix[ [25, 93], [-1, 66] ]
@@ -120,38 +118,63 @@ class Matrix
   #          -1 66
   #
   def Matrix.[](*rows)
-    new(:init_rows, rows, false)
+    Matrix.rows(rows, false)
   end
-  
+
   #
   # Creates a matrix where +rows+ is an array of arrays, each of which is a row
-  # to the matrix.  If the optional argument +copy+ is false, use the given
+  # of the matrix.  If the optional argument +copy+ is false, use the given
   # arrays as the internal structure of the matrix without copying.
   #   Matrix.rows([[25, 93], [-1, 66]])
   #      =>  25 93
   #          -1 66
+  #
   def Matrix.rows(rows, copy = true)
-    new(:init_rows, rows, copy)
+    rows = convert_to_array(rows)
+    rows.map! do |row|
+      convert_to_array(row, copy)
+    end
+    size = (rows[0] || []).size
+    rows.each do |row|
+      Matrix.Raise ErrDimensionMismatch, "row size differs (#{row.size} should be #{size})" unless row.size == size
+    end
+    new rows, size
   end
-  
+
   #
   # Creates a matrix using +columns+ as an array of column vectors.
   #   Matrix.columns([[25, 93], [-1, 66]])
   #      =>  25 -1
   #          93 66
   #
-  #
   def Matrix.columns(columns)
-    rows = (0 .. columns[0].size - 1).collect {
-      |i|
-      (0 .. columns.size - 1).collect {
-        |j|
-        columns[j][i]
-      }
-    }
-    Matrix.rows(rows, false)
+    Matrix.rows(columns, false).transpose
   end
-  
+
+  #
+  # Creates a matrix of size +row_size+ x +column_size+.
+  # It fills the values by calling the given block,
+  # passing the current row and column.
+  # Returns an enumerator if no block is given.
+  #
+  #   m = Matrix.build(2, 4) {|row, col| col - row }
+  #     => Matrix[[0, 1, 2, 3], [-1, 0, 1, 2]]
+  #   m = Matrix.build(3) { rand }
+  #     => a 3x3 matrix with random elements
+  #
+  def Matrix.build(row_size, column_size = row_size)
+    row_size = CoercionHelper.coerce_to_int(row_size)
+    column_size = CoercionHelper.coerce_to_int(column_size)
+    raise ArgumentError if row_size < 0 || column_size < 0
+    return to_enum :build, row_size, column_size unless block_given?
+    rows = Array.new(row_size) do |i|
+      Array.new(column_size) do |j|
+        yield i, j
+      end
+    end
+    new rows, column_size
+  end
+
   #
   # Creates a matrix where the diagonal elements are composed of +values+.
   #   Matrix.diagonal(9, 5, -3)
@@ -161,15 +184,14 @@ class Matrix
   #
   def Matrix.diagonal(*values)
     size = values.size
-    rows = (0 .. size  - 1).collect {
-      |j|
-      row = Array.new(size).fill(0, 0, size)
+    rows = Array.new(size) {|j|
+      row = Array.new(size, 0)
       row[j] = values[j]
       row
     }
-    rows(rows, false)
+    new rows
   end
-  
+
   #
   # Creates an +n+ by +n+ diagonal matrix where each diagonal element is
   # +value+.
@@ -178,7 +200,7 @@ class Matrix
   #        0 5
   #
   def Matrix.scalar(n, value)
-    Matrix.diagonal(*Array.new(n).fill(value, 0, n))
+    Matrix.diagonal(*Array.new(n, value))
   end
 
   #
@@ -190,11 +212,11 @@ class Matrix
   def Matrix.identity(n)
     Matrix.scalar(n, 1)
   end
-  class << Matrix 
+  class << Matrix
     alias unit identity
     alias I identity
   end
-  
+
   #
   # Creates an +n+ by +n+ zero matrix.
   #   Matrix.zero(2)
@@ -204,7 +226,7 @@ class Matrix
   def Matrix.zero(n)
     Matrix.scalar(n, 0)
   end
-  
+
   #
   # Creates a single-row matrix where the values of that row are as given in
   # +row+.
@@ -212,16 +234,10 @@ class Matrix
   #     => 4 5 6
   #
   def Matrix.row_vector(row)
-    case row
-    when Vector
-      Matrix.rows([row.to_a], false)
-    when Array
-      Matrix.rows([row.dup], false)
-    else
-      Matrix.rows([[row]], false)
-    end
+    row = convert_to_array(row)
+    new [row]
   end
-  
+
   #
   # Creates a single-column matrix where the values of that column are as given
   # in +column+.
@@ -231,40 +247,61 @@ class Matrix
   #        6
   #
   def Matrix.column_vector(column)
-    case column
-    when Vector
-      Matrix.columns([column.to_a])
-    when Array
-      Matrix.columns([column])
-    else
-      Matrix.columns([[column]])
-    end
+    column = convert_to_array(column)
+    new [column].transpose, 1
   end
 
   #
-  # This method is used by the other methods that create matrices, and is of no
-  # use to general users.
+  # Creates a empty matrix of +row_size+ x +column_size+.
+  # At least one of +row_size+ or +column_size+ must be 0.
+  #
+  #   m = Matrix.empty(2, 0)
+  #   m == Matrix[ [], [] ]
+  #     => true
+  #   n = Matrix.empty(0, 3)
+  #   n == Matrix.columns([ [], [], [] ])
+  #     => true
+  #   m * n
+  #     => Matrix[[0, 0, 0], [0, 0, 0]]
+  #
+  def Matrix.empty(row_size = 0, column_size = 0)
+    Matrix.Raise ArgumentError, "One size must be 0" if column_size != 0 && row_size != 0
+    Matrix.Raise ArgumentError, "Negative size" if column_size < 0 || row_size < 0
+
+    new([[]]*row_size, column_size)
+  end
+
+  #
+  # Matrix.new is private; use Matrix.rows, columns, [], etc... to create.
   #
-  def initialize(init_method, *argv)
-    self.send(init_method, *argv)
+  def initialize(rows, column_size = rows[0].size)
+    # No checking is done at this point. rows must be an Array of Arrays.
+    # column_size must be the size of the first row, if there is one,
+    # otherwise it *must* be specified and can be any integer >= 0
+    @rows = rows
+    @column_size = column_size
   end
-  
-  def init_rows(rows, copy)
-    if copy
-      @rows = rows.collect{|row| row.dup}
-    else
-      @rows = rows
-    end
-    self
+
+  def new_matrix(rows, column_size = rows[0].size) # :nodoc:
+    Matrix.send(:new, rows, column_size) # bypass privacy of Matrix.new
   end
-  private :init_rows
-  
+  private :new_matrix
+
   #
   # Returns element (+i+,+j+) of the matrix.  That is: row +i+, column +j+.
   #
   def [](i, j)
-    @rows[i][j]
+    @rows.fetch(i){return nil}[j]
+  end
+  alias element []
+  alias component []
+
+  def []=(i, j, v)
+    @rows[i][j] = v
   end
+  alias set_element []=
+  alias set_component []=
+  private :[]=, :set_element, :set_component
 
   #
   # Returns the number of rows.
@@ -272,28 +309,22 @@ class Matrix
   def row_size
     @rows.size
   end
-  
+
   #
-  # Returns the number of columns.  Note that it is possible to construct a
-  # matrix with uneven columns (e.g. Matrix[ [1,2,3], [4,5] ]), but this is
-  # mathematically unsound.  This method uses the first row to determine the
-  # result.
+  # Returns the number of columns.
   #
-  def column_size
-    @rows[0].size
-  end
+  attr_reader :column_size
 
   #
   # Returns row vector number +i+ of the matrix as a Vector (starting at 0 like
   # an array).  When a block is given, the elements of that vector are iterated.
   #
-  def row(i) # :yield: e
+  def row(i, &block) # :yield: e
     if block_given?
-      for e in @rows[i]
-        yield e
-      end
+      @rows.fetch(i){return self}.each(&block)
+      self
     else
-      Vector.elements(@rows[i])
+      Vector.elements(@rows.fetch(i){return nil})
     end
   end
 
@@ -304,92 +335,156 @@ class Matrix
   #
   def column(j) # :yield: e
     if block_given?
-      0.upto(row_size - 1) do
-        |i|
+      return self if j >= column_size || j < -column_size
+      row_size.times do |i|
         yield @rows[i][j]
       end
+      self
     else
-      col = (0 .. row_size - 1).collect {
-        |i|
+      return nil if j >= column_size || j < -column_size
+      col = Array.new(row_size) {|i|
         @rows[i][j]
       }
       Vector.elements(col, false)
     end
   end
-  
+
   #
   # Returns a matrix that is the result of iteration of the given block over all
   # elements of the matrix.
-  #   Matrix[ [1,2], [3,4] ].collect { |i| i**2 }
+  #   Matrix[ [1,2], [3,4] ].collect { |e| e**2 }
   #     => 1  4
   #        9 16
   #
-  def collect # :yield: e
-    rows = @rows.collect{|row| row.collect{|e| yield e}}
-    Matrix.rows(rows, false)
+  def collect(&block) # :yield: e
+    return to_enum(:collect) unless block_given?
+    rows = @rows.collect{|row| row.collect(&block)}
+    new_matrix rows, column_size
   end
   alias map collect
-  
+
+  #
+  # Yields all elements of the matrix, starting with those of the first row,
+  # or returns an Enumerator is no block given
+  #   Matrix[ [1,2], [3,4] ].each { |e| puts e }
+  #     # => prints the numbers 1 to 4
+  #
+  def each(&block) # :yield: e
+    return to_enum(:each) unless block_given?
+    @rows.each do |row|
+      row.each(&block)
+    end
+    self
+  end
+
+  #
+  # Yields all elements of the matrix, starting with those of the first row,
+  # along with the row index and column index,
+  # or returns an Enumerator is no block given
+  #   Matrix[ [1,2], [3,4] ].each_with_index do |e, row, col|
+  #     puts "#{e} at #{row}, #{col}"
+  #   end
+  #     # => 1 at 0, 0
+  #     # => 2 at 0, 1
+  #     # => 3 at 1, 0
+  #     # => 4 at 1, 1
+  #
+  def each_with_index(&block) # :yield: e, row, column
+    return to_enum(:each_with_index) unless block_given?
+    @rows.each_with_index do |row, row_index|
+      row.each_with_index do |e, col_index|
+        yield e, row_index, col_index
+      end
+    end
+    self
+  end
+
   #
   # Returns a section of the matrix.  The parameters are either:
   # *  start_row, nrows, start_col, ncols; OR
-  # *  col_range, row_range
+  # *  row_range, col_range
   #
   #   Matrix.diagonal(9, 5, -3).minor(0..1, 0..2)
   #     => 9 0 0
   #        0 5 0
   #
+  # Like Array#[], negative indices count backward from the end of the
+  # row or column (-1 is the last element). Returns nil if the starting
+  # row or column is greater than row_size or column_size respectively.
+  #
   def minor(*param)
     case param.size
     when 2
-      from_row = param[0].first
-      size_row = param[0].end - from_row
-      size_row += 1 unless param[0].exclude_end?
-      from_col = param[1].first
-      size_col = param[1].end - from_col
-      size_col += 1 unless param[1].exclude_end?
+      row_range, col_range = param
+      from_row = row_range.first
+      from_row += row_size if from_row < 0
+      to_row = row_range.end
+      to_row += row_size if to_row < 0
+      to_row += 1 unless row_range.exclude_end?
+      size_row = to_row - from_row
+
+      from_col = col_range.first
+      from_col += column_size if from_col < 0
+      to_col = col_range.end
+      to_col += column_size if to_col < 0
+      to_col += 1 unless col_range.exclude_end?
+      size_col = to_col - from_col
     when 4
-      from_row = param[0]
-      size_row = param[1]
-      from_col = param[2]
-      size_col = param[3]
+      from_row, size_row, from_col, size_col = param
+      return nil if size_row < 0 || size_col < 0
+      from_row += row_size if from_row < 0
+      from_col += column_size if from_col < 0
     else
       Matrix.Raise ArgumentError, param.inspect
     end
-    
-    rows = @rows[from_row, size_row].collect{
-      |row|
+
+    return nil if from_row > row_size || from_col > column_size || from_row < 0 || from_col < 0
+    rows = @rows[from_row, size_row].collect{|row|
       row[from_col, size_col]
     }
-    Matrix.rows(rows, false)
+    new_matrix rows, [column_size - from_col, size_col].min
   end
- 
+
   #--
   # TESTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
 
   #
-  # Returns +true+ if this is a regular matrix.
+  # Returns +true+ if this is an empty matrix, i.e. if the number of rows
+  # or the number of columns is 0.
+  #
+  def empty?
+    column_size == 0 || row_size == 0
+  end
+
+  #
+  # Returns +true+ if all entries of the matrix are real.
+  #
+  def real?
+    all?(&:real?)
+  end
+
+  #
+  # Returns +true+ if this is a regular (i.e. non-singular) matrix.
   #
   def regular?
-    square? and rank == column_size
+    not singular?
   end
-  
+
   #
-  # Returns +true+ is this is a singular (i.e. non-regular) matrix.
+  # Returns +true+ is this is a singular matrix.
   #
   def singular?
-    not regular?
+    determinant == 0
   end
 
   #
-  # Returns +true+ is this is a square matrix.  See note in column_size about this
-  # being unreliable, though.
+  # Returns +true+ is this is a square matrix.
   #
   def square?
     column_size == row_size
   end
-  
+
   #--
   # OBJECT METHODS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
@@ -398,50 +493,37 @@ class Matrix
   # Returns +true+ if and only if the two matrices contain equal elements.
   #
   def ==(other)
-    return false unless Matrix === other
-    
-    other.compare_by_row_vectors(@rows)
+    return false unless Matrix === other &&
+                        column_size == other.column_size # necessary for empty matrices
+    rows == other.rows
   end
-  alias eql? ==
-  
-  #
-  # Not really intended for general consumption.
-  #
-  def compare_by_row_vectors(rows)
-    return false unless @rows.size == rows.size
-    
-    0.upto(@rows.size - 1) do
-      |i|
-      return false unless @rows[i] == rows[i]
-    end
-    true
+
+  def eql?(other)
+    return false unless Matrix === other &&
+                        column_size == other.column_size # necessary for empty matrices
+    rows.eql? other.rows
   end
-  
+
   #
   # Returns a clone of the matrix, so that the contents of each do not reference
   # identical objects.
+  # There should be no good reason to do this since Matrices are immutable.
   #
   def clone
-    Matrix.rows(@rows)
+    new_matrix @rows.map(&:dup), column_size
   end
-  
+
   #
   # Returns a hash-code for the matrix.
   #
   def hash
-    value = 0
-    for row in @rows
-      for e in row
-        value ^= e.hash
-      end
-    end
-    return value
+    @rows.hash
   end
-  
+
   #--
   # ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
-  
+
   #
   # Matrix multiplication.
   #   Matrix[[2,4], [6,8]] * Matrix.identity(2)
@@ -451,40 +533,30 @@ class Matrix
   def *(m) # m is matrix or vector or number
     case(m)
     when Numeric
-      rows = @rows.collect {
-        |row|
-        row.collect {
-          |e|
-          e * m
-        }
+      rows = @rows.collect {|row|
+        row.collect {|e| e * m }
       }
-      return Matrix.rows(rows, false)
+      return new_matrix rows, column_size
     when Vector
       m = Matrix.column_vector(m)
       r = self * m
       return r.column(0)
     when Matrix
       Matrix.Raise ErrDimensionMismatch if column_size != m.row_size
-    
-      rows = (0 .. row_size - 1).collect {
-        |i|
-        (0 .. m.column_size - 1).collect {
-          |j|
-          vij = 0
-          0.upto(column_size - 1) do
-            |k|
-            vij += self[i, k] * m[k, j]
+
+      rows = Array.new(row_size) {|i|
+        Array.new(m.column_size) {|j|
+          (0 ... column_size).inject(0) do |vij, k|
+            vij + self[i, k] * m[k, j]
           end
-          vij
         }
       }
-      return Matrix.rows(rows, false)
+      return new_matrix rows, m.column_size
     else
-      x, y = m.coerce(self)
-      return x * y
+      return apply_through_coercion(m, __method__)
     end
   end
-  
+
   #
   # Matrix addition.
   #   Matrix.scalar(2,5) + Matrix[[1,0], [-4,7]]
@@ -494,25 +566,22 @@ class Matrix
   def +(m)
     case m
     when Numeric
-      Matrix.Raise ErrOperationNotDefined, "+"
+      Matrix.Raise ErrOperationNotDefined, "+", self.class, m.class
     when Vector
       m = Matrix.column_vector(m)
     when Matrix
     else
-      x, y = m.coerce(self)
-      return x + y
+      return apply_through_coercion(m, __method__)
     end
-    
+
     Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
-    
-    rows = (0 .. row_size - 1).collect {
-      |i|
-      (0 .. column_size - 1).collect {
-        |j|
+
+    rows = Array.new(row_size) {|i|
+      Array.new(column_size) {|j|
         self[i, j] + m[i, j]
       }
     }
-    Matrix.rows(rows, false)
+    new_matrix rows, column_size
   end
 
   #
@@ -524,27 +593,24 @@ class Matrix
   def -(m)
     case m
     when Numeric
-      Matrix.Raise ErrOperationNotDefined, "-"
+      Matrix.Raise ErrOperationNotDefined, "-", self.class, m.class
     when Vector
       m = Matrix.column_vector(m)
     when Matrix
     else
-      x, y = m.coerce(self)
-      return x - y
+      return apply_through_coercion(m, __method__)
     end
-    
+
     Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
-    
-    rows = (0 .. row_size - 1).collect {
-      |i|
-      (0 .. column_size - 1).collect {
-        |j|
+
+    rows = Array.new(row_size) {|i|
+      Array.new(column_size) {|j|
         self[i, j] - m[i, j]
       }
     }
-    Matrix.rows(rows, false)
+    new_matrix rows, column_size
   end
-  
+
   #
   # Matrix division (multiplication by the inverse).
   #   Matrix[[7,6], [3,9]] / Matrix[[2,9], [3,1]]
@@ -554,236 +620,265 @@ class Matrix
   def /(other)
     case other
     when Numeric
-      rows = @rows.collect {
-        |row|
-        row.collect {
-          |e|
-          e / other
-        }
+      rows = @rows.collect {|row|
+        row.collect {|e| e / other }
       }
-      return Matrix.rows(rows, false)
+      return new_matrix rows, column_size
     when Matrix
       return self * other.inverse
     else
-      x, y = other.coerce(self)
-      rerurn x / y
+      return apply_through_coercion(other, __method__)
     end
   end
 
   #
   # Returns the inverse of the matrix.
-  #   Matrix[[1, 2], [2, 1]].inverse
+  #   Matrix[[-1, -1], [0, -1]].inverse
   #     => -1  1
   #         0 -1
   #
   def inverse
     Matrix.Raise ErrDimensionMismatch unless square?
-    Matrix.I(row_size).inverse_from(self)
+    Matrix.I(row_size).send(:inverse_from, self)
   end
   alias inv inverse
 
-  #
-  # Not for public consumption?
-  #
-  def inverse_from(src)
-    size = row_size - 1
+  def inverse_from(src) # :nodoc:
+    last = row_size - 1
     a = src.to_a
-    
-    for k in 0..size
-      if (akk = a[k][k]) == 0
-        i = k
-        begin
-          Matrix.Raise ErrNotRegular if (i += 1) > size
-        end while a[i][k] == 0
+
+    0.upto(last) do |k|
+      i = k
+      akk = a[k][k].abs
+      (k+1).upto(last) do |j|
+        v = a[j][k].abs
+        if v > akk
+          i = j
+          akk = v
+        end
+      end
+      Matrix.Raise ErrNotRegular if akk == 0
+      if i != k
         a[i], a[k] = a[k], a[i]
         @rows[i], @rows[k] = @rows[k], @rows[i]
-        akk = a[k][k]
       end
-      
-      for i in 0 .. size
-        next if i == k
-        q = a[i][k] / akk
-        a[i][k] = 0
-        
-        (k + 1).upto(size) do   
-          |j|
-          a[i][j] -= a[k][j] * q
+      akk = a[k][k]
+
+      0.upto(last) do |ii|
+        next if ii == k
+        q = a[ii][k].quo(akk)
+        a[ii][k] = 0
+
+        (k + 1).upto(last) do |j|
+          a[ii][j] -= a[k][j] * q
         end
-        0.upto(size) do
-          |j|
-          @rows[i][j] -= @rows[k][j] * q
+        0.upto(last) do |j|
+          @rows[ii][j] -= @rows[k][j] * q
         end
       end
-      
-      (k + 1).upto(size) do
-        |j|
-        a[k][j] /= akk
+
+      (k+1).upto(last) do |j|
+        a[k][j] = a[k][j].quo(akk)
       end
-      0.upto(size) do
-        |j|
-        @rows[k][j] /= akk
+      0.upto(last) do |j|
+        @rows[k][j] = @rows[k][j].quo(akk)
       end
     end
     self
   end
-  #alias reciprocal inverse
-  
+  private :inverse_from
+
   #
-  # Matrix exponentiation.  Defined for integer powers only.  Equivalent to
-  # multiplying the matrix by itself N times.
+  # Matrix exponentiation.  Currently implemented for integer powers only.
+  # Equivalent to multiplying the matrix by itself N times.
   #   Matrix[[7,6], [3,9]] ** 2
   #     => 67 96
   #        48 99
   #
   def ** (other)
-    if other.kind_of?(Integer)
+    case other
+    when Integer
       x = self
       if other <= 0
         x = self.inverse
         return Matrix.identity(self.column_size) if other == 0
         other = -other
       end
-      z = x
-      n = other  - 1
-      while n != 0
-        while (div, mod = n.divmod(2)
-               mod == 0)
-          x = x * x
-          n = div
-        end
-        z *= x
-        n -= 1
+      z = nil
+      loop do
+        z = z ? z * x : x if other[0] == 1
+        return z if (other >>= 1).zero?
+        x *= x
       end
-      z
-    elsif other.kind_of?(Float) || defined?(Rational) && other.kind_of?(Rational)
-      Matrix.Raise ErrOperationNotDefined, "**"
+    when Float, Rational
+      Matrix.Raise ErrOperationNotImplemented, "**", self.class, other.class
     else
-      Matrix.Raise ErrOperationNotDefined, "**"
+      Matrix.Raise ErrOperationNotDefined, "**", self.class, other.class
     end
   end
-  
+
   #--
   # MATRIX FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
-  
+
+  #
+  # Returns the determinant of the matrix.
+  #
+  # Beware that using Float values can yield erroneous results
+  # because of their lack of precision.
+  # Consider using exact types like Rational or BigDecimal instead.
   #
-  # Returns the determinant of the matrix.  If the matrix is not square, the
-  # result is 0.
   #   Matrix[[7,6], [3,9]].determinant
-  #     => 63
+  #     => 45
   #
   def determinant
-    return 0 unless square?
-    
-    size = row_size - 1
+    Matrix.Raise ErrDimensionMismatch unless square?
+    m = @rows
+    case row_size
+      # Up to 4x4, give result using Laplacian expansion by minors.
+      # This will typically be faster, as well as giving good results
+      # in case of Floats
+    when 0
+      +1
+    when 1
+      + m[0][0]
+    when 2
+      + m[0][0] * m[1][1] - m[0][1] * m[1][0]
+    when 3
+      m0, m1, m2 = m
+      + m0[0] * m1[1] * m2[2] - m0[0] * m1[2] * m2[1] \
+      - m0[1] * m1[0] * m2[2] + m0[1] * m1[2] * m2[0] \
+      + m0[2] * m1[0] * m2[1] - m0[2] * m1[1] * m2[0]
+    when 4
+      m0, m1, m2, m3 = m
+      + m0[0] * m1[1] * m2[2] * m3[3] - m0[0] * m1[1] * m2[3] * m3[2] \
+      - m0[0] * m1[2] * m2[1] * m3[3] + m0[0] * m1[2] * m2[3] * m3[1] \
+      + m0[0] * m1[3] * m2[1] * m3[2] - m0[0] * m1[3] * m2[2] * m3[1] \
+      - m0[1] * m1[0] * m2[2] * m3[3] + m0[1] * m1[0] * m2[3] * m3[2] \
+      + m0[1] * m1[2] * m2[0] * m3[3] - m0[1] * m1[2] * m2[3] * m3[0] \
+      - m0[1] * m1[3] * m2[0] * m3[2] + m0[1] * m1[3] * m2[2] * m3[0] \
+      + m0[2] * m1[0] * m2[1] * m3[3] - m0[2] * m1[0] * m2[3] * m3[1] \
+      - m0[2] * m1[1] * m2[0] * m3[3] + m0[2] * m1[1] * m2[3] * m3[0] \
+      + m0[2] * m1[3] * m2[0] * m3[1] - m0[2] * m1[3] * m2[1] * m3[0] \
+      - m0[3] * m1[0] * m2[1] * m3[2] + m0[3] * m1[0] * m2[2] * m3[1] \
+      + m0[3] * m1[1] * m2[0] * m3[2] - m0[3] * m1[1] * m2[2] * m3[0] \
+      - m0[3] * m1[2] * m2[0] * m3[1] + m0[3] * m1[2] * m2[1] * m3[0]
+    else
+      # For bigger matrices, use an efficient and general algorithm.
+      # Currently, we use the Gauss-Bareiss algorithm
+      determinant_bareiss
+    end
+  end
+  alias_method :det, :determinant
+
+  #
+  # Private. Use Matrix#determinant
+  #
+  # Returns the determinant of the matrix, using
+  # Bareiss' multistep integer-preserving gaussian elimination.
+  # It has the same computational cost order O(n^3) as standard Gaussian elimination.
+  # Intermediate results are fraction free and of lower complexity.
+  # A matrix of Integers will have thus intermediate results that are also Integers,
+  # with smaller bignums (if any), while a matrix of Float will usually have
+  # intermediate results with better precision.
+  #
+  def determinant_bareiss
+    size = row_size
+    last = size - 1
     a = to_a
-    
-    det = 1
-    k = 0
-    begin 
-      if (akk = a[k][k]) == 0
-        i = k
-        begin
-          return 0 if (i += 1) > size
-        end while a[i][k] == 0
-        a[i], a[k] = a[k], a[i]
-        akk = a[k][k]
-        det *= -1
+    no_pivot = Proc.new{ return 0 }
+    sign = +1
+    pivot = 1
+    size.times do |k|
+      previous_pivot = pivot
+      if (pivot = a[k][k]) == 0
+        switch = (k+1 ... size).find(no_pivot) {|row|
+          a[row][k] != 0
+        }
+        a[switch], a[k] = a[k], a[switch]
+        pivot = a[k][k]
+        sign = -sign
       end
-      (k + 1).upto(size) do
-        |i|
-        q = a[i][k] / akk
-        (k + 1).upto(size) do
-          |j|
-          a[i][j] -= a[k][j] * q
+      (k+1).upto(last) do |i|
+        ai = a[i]
+        (k+1).upto(last) do |j|
+          ai[j] =  (pivot * ai[j] - ai[k] * a[k][j]) / previous_pivot
         end
       end
-      det *= akk
-    end while (k += 1) <= size
-    det
+    end
+    sign * pivot
   end
-  alias det determinant
-        
+  private :determinant_bareiss
+
+  #
+  # deprecated; use Matrix#determinant
+  #
+  def determinant_e
+    warn "#{caller(1)[0]}: warning: Matrix#determinant_e is deprecated; use #determinant"
+    rank
+  end
+  alias det_e determinant_e
+
+  #
+  # Returns the rank of the matrix.
+  # Beware that using Float values can yield erroneous results
+  # because of their lack of precision.
+  # Consider using exact types like Rational or BigDecimal instead.
   #
-  # Returns the rank of the matrix.  Beware that using Float values, with their
-  # usual lack of precision, can affect the value returned by this method.  Use
-  # Rational values instead if this is important to you.
   #   Matrix[[7,6], [3,9]].rank
   #     => 2
   #
   def rank
-    if column_size > row_size
-      a = transpose.to_a
-      a_column_size = row_size
-      a_row_size = column_size
-    else
-      a = to_a
-      a_column_size = column_size
-      a_row_size = row_size
-    end
+    # We currently use Bareiss' multistep integer-preserving gaussian elimination
+    # (see comments on determinant)
+    a = to_a
+    last_column = column_size - 1
+    last_row = row_size - 1
     rank = 0
-    k = 0
-    begin
-      if (akk = a[k][k]) == 0
-        i = k
-        exists = true
-        begin
-          if (i += 1) > a_column_size - 1
-            exists = false
-            break
-          end
-        end while a[i][k] == 0
-        if exists
-          a[i], a[k] = a[k], a[i]
-          akk = a[k][k]
-        else
-          i = k
-          exists = true
-          begin
-            if (i += 1) > a_row_size - 1
-              exists = false
-              break
-            end
-          end while a[k][i] == 0
-          if exists
-            k.upto(a_column_size - 1) do
-              |j|
-              a[j][k], a[j][i] = a[j][i], a[j][k]
-            end
-            akk = a[k][k]
-          else
-            next
-          end
-        end
-      end
-      (k + 1).upto(a_row_size - 1) do
-        |i|
-        q = a[i][k] / akk
-        (k + 1).upto(a_column_size - 1) do
-          |j|
-          a[i][j] -= a[k][j] * q
-        end
+    pivot_row = 0
+    previous_pivot = 1
+    0.upto(last_column) do |k|
+      switch_row = (pivot_row .. last_row).find {|row|
+        a[row][k] != 0
+      }
+      if switch_row
+        a[switch_row], a[pivot_row] = a[pivot_row], a[switch_row] unless pivot_row == switch_row
+        pivot = a[pivot_row][k]
+        (pivot_row+1).upto(last_row) do |i|
+           ai = a[i]
+           (k+1).upto(last_column) do |j|
+             ai[j] =  (pivot * ai[j] - ai[k] * a[pivot_row][j]) / previous_pivot
+           end
+         end
+        pivot_row += 1
+        previous_pivot = pivot
       end
-      rank += 1
-    end while (k += 1) <= a_column_size - 1
-    return rank
+    end
+    pivot_row
+  end
+
+  #
+  # deprecated; use Matrix#rank
+  #
+  def rank_e
+    warn "#{caller(1)[0]}: warning: Matrix#rank_e is deprecated; use #rank"
+    rank
   end
 
+
   #
   # Returns the trace (sum of diagonal elements) of the matrix.
   #   Matrix[[7,6], [3,9]].trace
   #     => 16
   #
   def trace
-    tr = 0
-    0.upto(column_size - 1) do
-      |i|
-      tr += @rows[i][i]
+    Matrix.Raise ErrDimensionMismatch unless square?
+    (0...column_size).inject(0) do |tr, i|
+      tr + @rows[i][i]
     end
-    tr
   end
   alias tr trace
-  
+
   #
   # Returns the transpose of the matrix.
   #   Matrix[[1,2], [3,4], [5,6]]
@@ -795,16 +890,77 @@ class Matrix
   #        2 4 6
   #
   def transpose
-    Matrix.columns(@rows)
+    return Matrix.empty(column_size, 0) if row_size.zero?
+    new_matrix @rows.transpose, row_size
   end
   alias t transpose
-  
+
+  #--
+  # COMPLEX ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+  #++
+
+  #
+  # Returns the conjugate of the matrix.
+  #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]]
+  #     => 1+2i   i  0
+  #           1   2  3
+  #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]].conjugate
+  #     => 1-2i  -i  0
+  #           1   2  3
+  #
+  def conjugate
+    collect(&:conjugate)
+  end
+  alias conj conjugate
+
+  #
+  # Returns the imaginary part of the matrix.
+  #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]]
+  #     => 1+2i  i  0
+  #           1  2  3
+  #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]].imaginary
+  #     =>   2i  i  0
+  #           0  0  0
+  #
+  def imaginary
+    collect(&:imaginary)
+  end
+  alias imag imaginary
+
+  #
+  # Returns the real part of the matrix.
+  #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]]
+  #     => 1+2i  i  0
+  #           1  2  3
+  #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]].real
+  #     =>    1  0  0
+  #           1  2  3
+  #
+  def real
+    collect(&:real)
+  end
+
+  #
+  # Returns an array containing matrices corresponding to the real and imaginary
+  # parts of the matrix
+  #
+  # m.rect == [m.real, m.imag]  # ==> true for all matrices m
+  #
+  def rect
+    [real, imag]
+  end
+  alias rectangular rect
+
   #--
   # CONVERTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
-  
+
   #
-  # FIXME: describe #coerce.
+  # The coerce method provides support for Ruby type coercion.
+  # This coercion mechanism is used by Ruby to handle mixed-type
+  # numeric operations: it is intended to find a compatible common
+  # type between the two operands of the operator.
+  # See also Numeric#coerce.
   #
   def coerce(other)
     case other
@@ -819,90 +975,171 @@ class Matrix
   # Returns an array of the row vectors of the matrix.  See Vector.
   #
   def row_vectors
-    rows = (0 .. row_size - 1).collect {
-      |i|
+    Array.new(row_size) {|i|
       row(i)
     }
-    rows
   end
-  
+
   #
   # Returns an array of the column vectors of the matrix.  See Vector.
   #
   def column_vectors
-    columns = (0 .. column_size - 1).collect {
-      |i|
+    Array.new(column_size) {|i|
       column(i)
     }
-    columns
   end
-  
+
   #
   # Returns an array of arrays that describe the rows of the matrix.
   #
   def to_a
-    @rows.collect{|row| row.collect{|e| e}}
+    @rows.collect(&:dup)
   end
-  
+
+  def elements_to_f
+    warn "#{caller(1)[0]}: warning: Matrix#elements_to_f is deprecated, use map(&:to_f)"
+    map(&:to_f)
+  end
+
+  def elements_to_i
+    warn "#{caller(1)[0]}: warning: Matrix#elements_to_i is deprecated, use map(&:to_i)"
+    map(&:to_i)
+  end
+
+  def elements_to_r
+    warn "#{caller(1)[0]}: warning: Matrix#elements_to_r is deprecated, use map(&:to_r)"
+    map(&:to_r)
+  end
+
   #--
   # PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
-  
+
   #
   # Overrides Object#to_s
   #
   def to_s
-    "Matrix[" + @rows.collect{
-      |row|
-      "[" + row.collect{|e| e.to_s}.join(", ") + "]"
-    }.join(", ")+"]"
+    if empty?
+      "Matrix.empty(#{row_size}, #{column_size})"
+    else
+      "Matrix[" + @rows.collect{|row|
+        "[" + row.collect{|e| e.to_s}.join(", ") + "]"
+      }.join(", ")+"]"
+    end
   end
-  
+
   #
   # Overrides Object#inspect
   #
   def inspect
-    "Matrix"+@rows.inspect
+    if empty?
+      "Matrix.empty(#{row_size}, #{column_size})"
+    else
+      "Matrix#{@rows.inspect}"
+    end
   end
-  
+
+  # Private helper modules
+
+  module ConversionHelper # :nodoc:
+    #
+    # Converts the obj to an Array. If copy is set to true
+    # a copy of obj will be made if necessary.
+    #
+    def convert_to_array(obj, copy = false) # :nodoc:
+      case obj
+      when Array
+        copy ? obj.dup : obj
+      when Vector
+        obj.to_a
+      else
+        begin
+          converted = obj.to_ary
+        rescue Exception => e
+          raise TypeError, "can't convert #{obj.class} into an Array (#{e.message})"
+        end
+        raise TypeError, "#{obj.class}#to_ary should return an Array" unless converted.is_a? Array
+        converted
+      end
+    end
+    private :convert_to_array
+  end
+
+  extend ConversionHelper
+
+  module CoercionHelper # :nodoc:
+    #
+    # Applies the operator +oper+ with argument +obj+
+    # through coercion of +obj+
+    #
+    def apply_through_coercion(obj, oper)
+      coercion = obj.coerce(self)
+      raise TypeError unless coercion.is_a?(Array) && coercion.length == 2
+      coercion[0].public_send(oper, coercion[1])
+    rescue
+      raise TypeError, "#{obj.inspect} can't be coerced into #{self.class}"
+    end
+    private :apply_through_coercion
+
+    #
+    # Helper method to coerce a value into a specific class.
+    # Raises a TypeError if the coercion fails or the returned value
+    # is not of the right class.
+    # (from Rubinius)
+    #
+    def self.coerce_to(obj, cls, meth) # :nodoc:
+      return obj if obj.kind_of?(cls)
+
+      begin
+        ret = obj.__send__(meth)
+      rescue Exception => e
+        raise TypeError, "Coercion error: #{obj.inspect}.#{meth} => #{cls} failed:\n" \
+                         "(#{e.message})"
+      end
+      raise TypeError, "Coercion error: obj.#{meth} did NOT return a #{cls} (was #{ret.class})" unless ret.kind_of? cls
+      ret
+    end
+
+    def self.coerce_to_int(obj)
+      coerce_to(obj, Integer, :to_int)
+    end
+  end
+
+  include CoercionHelper
+
   # Private CLASS
-  
+
   class Scalar < Numeric # :nodoc:
     include ExceptionForMatrix
-    
+    include CoercionHelper
+
     def initialize(value)
       @value = value
     end
-    
+
     # ARITHMETIC
     def +(other)
       case other
       when Numeric
         Scalar.new(@value + other)
       when Vector, Matrix
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
-      when Scalar
-        Scalar.new(@value + other.value)
+        Scalar.Raise ErrOperationNotDefined, "+", @value.class, other.class
       else
-        x, y = other.coerce(self)
-        x + y
+        apply_through_coercion(other, __method__)
       end
     end
-    
+
     def -(other)
       case other
       when Numeric
         Scalar.new(@value - other)
       when Vector, Matrix
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
-      when Scalar
-        Scalar.new(@value - other.value)
+        Scalar.Raise ErrOperationNotDefined, "-", @value.class, other.class
       else
-        x, y = other.coerce(self)
-        x - y
+        apply_through_coercion(other, __method__)
       end
     end
-    
+
     def *(other)
       case other
       when Numeric
@@ -910,39 +1147,38 @@ class Matrix
       when Vector, Matrix
         other.collect{|e| @value * e}
       else
-        x, y = other.coerce(self)
-        x * y
+        apply_through_coercion(other, __method__)
       end
     end
-    
+
     def / (other)
       case other
       when Numeric
         Scalar.new(@value / other)
       when Vector
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+        Scalar.Raise ErrOperationNotDefined, "/", @value.class, other.class
       when Matrix
-        self * _M.inverse
+        self * other.inverse
       else
-        x, y = other.coerce(self)
-        x / y
+        apply_through_coercion(other, __method__)
       end
     end
-    
+
     def ** (other)
       case other
       when Numeric
         Scalar.new(@value ** other)
       when Vector
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+        Scalar.Raise ErrOperationNotDefined, "**", @value.class, other.class
       when Matrix
-        other.powered_by(self)
+        #other.powered_by(self)
+        Scalar.Raise ErrOperationNotImplemented, "**", @value.class, other.class
       else
-        x, y = other.coerce(self)
-        x ** y
+        apply_through_coercion(other, __method__)
       end
     end
   end
+
 end
 
 
@@ -987,84 +1223,99 @@ end
 #
 class Vector
   include ExceptionForMatrix
-  
+  include Enumerable
+  include Matrix::CoercionHelper
+  extend Matrix::ConversionHelper
   #INSTANCE CREATION
-  
+
   private_class_method :new
+  attr_reader :elements
+  protected :elements
 
   #
   # Creates a Vector from a list of elements.
   #   Vector[7, 4, ...]
   #
   def Vector.[](*array)
-    new(:init_elements, array, copy = false)
+    new convert_to_array(array, copy = false)
   end
-  
+
   #
   # Creates a vector from an Array.  The optional second argument specifies
   # whether the array itself or a copy is used internally.
   #
   def Vector.elements(array, copy = true)
-    new(:init_elements, array, copy)
+    new convert_to_array(array, copy)
   end
-  
+
   #
-  # For internal use.
+  # Vector.new is private; use Vector[] or Vector.elements to create.
   #
-  def initialize(method, array, copy)
-    self.send(method, array, copy)
+  def initialize(array)
+    # No checking is done at this point.
+    @elements = array
   end
-  
-  #
-  # For internal use.
-  #
-  def init_elements(array, copy)
-    if copy
-      @elements = array.dup
-    else
-      @elements = array
-    end
-  end
-  
+
   # ACCESSING
-         
+
   #
   # Returns element number +i+ (starting at zero) of the vector.
   #
   def [](i)
     @elements[i]
   end
-  
+  alias element []
+  alias component []
+
+  def []=(i, v)
+    @elements[i]= v
+  end
+  alias set_element []=
+  alias set_component []=
+  private :[]=, :set_element, :set_component
+
   #
   # Returns the number of elements in the vector.
   #
   def size
     @elements.size
   end
-  
+
   #--
   # ENUMERATIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
 
   #
+  # Iterate over the elements of this vector
+  #
+  def each(&block)
+    return to_enum(:each) unless block_given?
+    @elements.each(&block)
+    self
+  end
+
+  #
   # Iterate over the elements of this vector and +v+ in conjunction.
   #
   def each2(v) # :yield: e1, e2
+    raise TypeError, "Integer is not like Vector" if v.kind_of?(Integer)
     Vector.Raise ErrDimensionMismatch if size != v.size
-    0.upto(size - 1) do
-      |i|
+    return to_enum(:each2, v) unless block_given?
+    size.times do |i|
       yield @elements[i], v[i]
     end
+    self
   end
-  
+
   #
   # Collects (as in Enumerable#collect) over the elements of this vector and +v+
   # in conjunction.
   #
   def collect2(v) # :yield: e1, e2
+    raise TypeError, "Integer is not like Vector" if v.kind_of?(Integer)
     Vector.Raise ErrDimensionMismatch if size != v.size
-    (0 .. size - 1).collect do
-      |i|
+    return to_enum(:collect2, v) unless block_given?
+    Array.new(size) do |i|
       yield @elements[i], v[i]
     end
   end
@@ -1078,36 +1329,32 @@ class Vector
   #
   def ==(other)
     return false unless Vector === other
-    
-    other.compare_by(@elements)
+    @elements == other.elements
   end
-  alias eqn? ==
-  
-  #
-  # For internal use.
-  #
-  def compare_by(elements)
-    @elements == elements
+
+  def eql?(other)
+    return false unless Vector === other
+    @elements.eql? other.elements
   end
-  
+
   #
   # Return a copy of the vector.
   #
   def clone
     Vector.elements(@elements)
   end
-  
+
   #
   # Return a hash-code for the vector.
   #
   def hash
     @elements.hash
   end
-  
+
   #--
   # ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
-  
+
   #
   # Multiplies the vector by +x+, where +x+ is a number or another vector.
   #
@@ -1118,9 +1365,10 @@ class Vector
       Vector.elements(els, false)
     when Matrix
       Matrix.column_vector(self) * x
+    when Vector
+      Vector.Raise ErrOperationNotDefined, "*", self.class, x.class
     else
-      s, x = x.coerce(self)
-      s * x
+      apply_through_coercion(x, __method__)
     end
   end
 
@@ -1131,16 +1379,14 @@ class Vector
     case v
     when Vector
       Vector.Raise ErrDimensionMismatch if size != v.size
-      els = collect2(v) {
-        |v1, v2|
+      els = collect2(v) {|v1, v2|
         v1 + v2
       }
       Vector.elements(els, false)
     when Matrix
       Matrix.column_vector(self) + v
     else
-      s, x = v.coerce(self)
-      s + x
+      apply_through_coercion(v, __method__)
     end
   end
 
@@ -1151,73 +1397,77 @@ class Vector
     case v
     when Vector
       Vector.Raise ErrDimensionMismatch if size != v.size
-      els = collect2(v) {
-        |v1, v2|
+      els = collect2(v) {|v1, v2|
         v1 - v2
       }
       Vector.elements(els, false)
     when Matrix
       Matrix.column_vector(self) - v
     else
-      s, x = v.coerce(self)
-      s - x
+      apply_through_coercion(v, __method__)
+    end
+  end
+
+  #
+  # Vector division.
+  #
+  def /(x)
+    case x
+    when Numeric
+      els = @elements.collect{|e| e / x}
+      Vector.elements(els, false)
+    when Matrix, Vector
+      Vector.Raise ErrOperationNotDefined, "/", self.class, x.class
+    else
+      apply_through_coercion(x, __method__)
     end
   end
-  
+
   #--
   # VECTOR FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
-  
+
   #
   # Returns the inner product of this vector with the other.
   #   Vector[4,7].inner_product Vector[10,1]  => 47
   #
   def inner_product(v)
     Vector.Raise ErrDimensionMismatch if size != v.size
-    
+
     p = 0
-    each2(v) {
-      |v1, v2|
+    each2(v) {|v1, v2|
       p += v1 * v2
     }
     p
   end
-  
+
   #
   # Like Array#collect.
   #
-  def collect # :yield: e
-    els = @elements.collect {
-      |v|
-      yield v
-    }
+  def collect(&block) # :yield: e
+    return to_enum(:collect) unless block_given?
+    els = @elements.collect(&block)
     Vector.elements(els, false)
   end
   alias map collect
-  
+
   #
   # Like Vector#collect2, but returns a Vector instead of an Array.
   #
-  def map2(v) # :yield: e1, e2
-    els = collect2(v) {
-      |v1, v2|
-      yield v1, v2
-    }
+  def map2(v, &block) # :yield: e1, e2
+    return to_enum(:map2, v) unless block_given?
+    els = collect2(v, &block)
     Vector.elements(els, false)
   end
-  
+
   #
   # Returns the modulus (Pythagorean distance) of the vector.
   #   Vector[5,8,2].r => 9.643650761
   #
   def r
-    v = 0
-    for e in @elements
-      v += e*e
-    end
-    return Math.sqrt(v)
+    Math.sqrt(@elements.inject(0) {|v, e| v + e*e})
   end
-  
+
   #--
   # CONVERTING
   #++
@@ -1228,37 +1478,56 @@ class Vector
   def covector
     Matrix.row_vector(self)
   end
-  
+
   #
   # Returns the elements of the vector in an array.
   #
   def to_a
     @elements.dup
   end
-  
+
+  def elements_to_f
+    warn "#{caller(1)[0]}: warning: Vector#elements_to_f is deprecated"
+    map(&:to_f)
+  end
+
+  def elements_to_i
+    warn "#{caller(1)[0]}: warning: Vector#elements_to_i is deprecated"
+    map(&:to_i)
+  end
+
+  def elements_to_r
+    warn "#{caller(1)[0]}: warning: Vector#elements_to_r is deprecated"
+    map(&:to_r)
+  end
+
   #
-  # FIXME: describe Vector#coerce.
+  # The coerce method provides support for Ruby type coercion.
+  # This coercion mechanism is used by Ruby to handle mixed-type
+  # numeric operations: it is intended to find a compatible common
+  # type between the two operands of the operator.
+  # See also Numeric#coerce.
   #
   def coerce(other)
     case other
     when Numeric
-      return Scalar.new(other), self
+      return Matrix::Scalar.new(other), self
     else
       raise TypeError, "#{self.class} can't be coerced into #{other.class}"
     end
   end
-  
+
   #--
   # PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
-  
+
   #
   # Overrides Object#to_s
   #
   def to_s
     "Vector[" + @elements.join(", ") + "]"
   end
-  
+
   #
   # Overrides Object#inspect
   #
@@ -1266,7 +1535,3 @@ class Vector
     str = "Vector"+@elements.inspect
   end
 end
-
-
-# Documentation comments:
-#  - Matrix#coerce and Vector#coerce need to be documented
diff --git a/lib/minitest/autorun.rb b/lib/minitest/autorun.rb
new file mode 100644
index 0000000000..5bf35f6ab8
--- /dev/null
+++ b/lib/minitest/autorun.rb
@@ -0,0 +1,11 @@
+############################################################
+# This file is imported from a different project.
+# DO NOT make modifications in this repo.
+# File a patch instead and assign it to Ryan Davis
+############################################################
+
+require 'minitest/unit'
+require 'minitest/spec'
+require 'minitest/mock'
+
+MiniTest::Unit.autorun
diff --git a/lib/minitest/mock.rb b/lib/minitest/mock.rb
new file mode 100644
index 0000000000..ed44164448
--- /dev/null
+++ b/lib/minitest/mock.rb
@@ -0,0 +1,38 @@
+############################################################
+# This file is imported from a different project.
+# DO NOT make modifications in this repo.
+# File a patch instead and assign it to Ryan Davis
+############################################################
+
+class MockExpectationError < StandardError; end
+
+module MiniTest
+  class Mock
+    def initialize
+      @expected_calls = {}
+      @actual_calls = Hash.new {|h,k| h[k] = [] }
+    end
+
+    def expect(name, retval, args=[])
+      n, r, a = name, retval, args # for the closure below
+      @expected_calls[name] = { :retval => retval, :args => args }
+      self.class.__send__ :remove_method, name if respond_to? name
+      self.class.__send__(:define_method, name) { |*x|
+        raise ArgumentError unless @expected_calls[n][:args].size == x.size
+        @actual_calls[n] << { :retval => r, :args => x }
+        retval
+      }
+      self
+    end
+
+    def verify
+      @expected_calls.each_key do |name|
+        expected = @expected_calls[name]
+        msg = "expected #{name}, #{expected.inspect}"
+        raise MockExpectationError, msg unless
+          @actual_calls.has_key? name and @actual_calls[name].include?(expected)
+      end
+      true
+    end
+  end
+end
diff --git a/lib/minitest/spec.rb b/lib/minitest/spec.rb
new file mode 100644
index 0000000000..59b4c6536c
--- /dev/null
+++ b/lib/minitest/spec.rb
@@ -0,0 +1,292 @@
+############################################################
+# This file is imported from a different project.
+# DO NOT make modifications in this repo.
+# File a patch instead and assign it to Ryan Davis
+############################################################
+
+#!/usr/bin/ruby -w
+
+require 'minitest/unit'
+
+class Module
+  def infect_an_assertion meth, new_name, dont_flip = false
+    # warn "%-22p -> %p %p" % [meth, new_name, dont_flip]
+    self.class_eval <<-EOM
+      def #{new_name} *args, &block
+        return MiniTest::Spec.current.#{meth}(*args, &self) if
+          Proc === self
+        return MiniTest::Spec.current.#{meth}(args.first, self) if
+          args.size == 1 unless #{!!dont_flip}
+        return MiniTest::Spec.current.#{meth}(self, *args)
+      end
+    EOM
+  end
+
+  def infect_with_assertions(pos_prefix, neg_prefix,
+                             skip_re,
+                             dont_flip_re = /\c0/,
+                             map = {})
+    MiniTest::Assertions.public_instance_methods(false).each do |meth|
+      meth = meth.to_s
+
+      new_name = case meth
+                 when /^assert/ then
+                   meth.sub(/^assert/, pos_prefix.to_s)
+                 when /^refute/ then
+                   meth.sub(/^refute/, neg_prefix.to_s)
+                 end
+      next unless new_name
+      next if new_name =~ skip_re
+
+      regexp, replacement = map.find { |re, _| new_name =~ re }
+      new_name.sub! regexp, replacement if replacement
+
+      infect_an_assertion meth, new_name, new_name =~ dont_flip_re
+    end
+  end
+end
+
+Object.infect_with_assertions(:must, :wont,
+                              /^(must|wont)$|wont_(throw)|
+                                 must_(block|not?_|nothing|raise$)/x,
+                              /(must|wont)_(include|respond_to)/,
+                              /(must_throw)s/                 => '\1',
+                              /(?!not)_same/                  => '_be_same_as',
+                              /_in_/                          => '_be_within_',
+                              /_operator/                     => '_be',
+                              /_includes/                     => '_include',
+                              /(must|wont)_(.*_of|nil|empty)/ => '\1_be_\2',
+                              /must_raises/                   => 'must_raise')
+
+class Object
+  alias :must_be_close_to :must_be_within_delta
+  alias :wont_be_close_to :wont_be_within_delta
+end
+
+module Kernel
+  ##
+  # Describe a series of expectations for a given target +desc+.
+  #
+  # TODO: find good tutorial url.
+  #
+  # Defines a test class subclassing from either
+  # MiniTest::Unit::TestCase or from the surrounding describe's class.
+
+  def describe desc, &block
+    stack = MiniTest::Spec.describe_stack
+    name  = desc.to_s.split(/\W+/).map { |s| s.capitalize }.join + "Spec"
+    prev  = stack.last
+    name  = "#{prev == MiniTest::Spec ? nil : prev}::#{name}"
+    cls   = Object.class_eval "class #{name} < #{prev}; end; #{name}"
+
+    cls.nuke_test_methods!
+
+    stack.push cls
+    cls.class_eval(&block)
+    stack.pop
+  end
+  private :describe
+end
+
+class Module
+  def classes type = Object # :nodoc:
+    constants.map { |n| const_get n }.find_all { |c|
+      c.class == Class and type > c
+    } - [self]
+  end
+end
+
+class MiniTest::Spec < MiniTest::Unit::TestCase
+  @@describe_stack = [MiniTest::Spec]
+  def self.describe_stack # :nodoc:
+    @@describe_stack
+  end
+
+  def self.current # :nodoc:
+    @@current_spec
+  end
+
+  def initialize name # :nodoc:
+    super
+    @@current_spec = self
+  end
+
+  def self.nuke_test_methods! # :nodoc:
+    self.public_instance_methods.grep(/^test_/).each do |name|
+      self.send :undef_method, name
+    end
+  end
+
+  def self.define_inheritable_method name, &block # :nodoc:
+    super_method = self.superclass.instance_method name
+
+    define_method name do
+      super_method.bind(self).call if super_method # regular super() warns
+      instance_eval(&block)
+    end
+  end
+
+  ##
+  # Define a 'before' action. Inherits the way normal methods should.
+  #
+  # NOTE: +type+ is ignored and is only there to make porting easier.
+  #
+  # Equivalent to MiniTest::Unit::TestCase#setup.
+
+  def self.before type = :each, &block
+    raise "unsupported before type: #{type}" unless type == :each
+    define_inheritable_method :setup, &block
+  end
+
+  ##
+  # Define an 'after' action. Inherits the way normal methods should.
+  #
+  # NOTE: +type+ is ignored and is only there to make porting easier.
+  #
+  # Equivalent to MiniTest::Unit::TestCase#teardown.
+
+  def self.after type = :each, &block
+    raise "unsupported after type: #{type}" unless type == :each
+    define_inheritable_method :teardown, &block
+  end
+
+  ##
+  # Define an expectation with name +desc+. Name gets morphed to a
+  # proper test method name. For some freakish reason, people who
+  # write specs don't like class inheritence, so this goes way out of
+  # its way to make sure that expectations aren't inherited.
+  #
+  # Hint: If you _do_ want inheritence, use minitest/unit. You can mix
+  # and match between assertions and expectations as much as you want.
+
+  def self.it desc, &block
+    block ||= proc { skip "(no tests defined)" }
+
+    @specs ||= 0
+    @specs += 1
+
+    name = "test_%04d_%s" % [ @specs, desc.gsub(/\W+/, '_').downcase ]
+
+    define_method name, &block
+
+    classes(MiniTest::Spec).each do |mod|
+      mod.send :undef_method, name if mod.respond_to? name
+    end
+  end
+
+  ##
+  # :method: must_be
+  # See MiniTest::Assertions#assert
+
+  ##
+  # :method: must_be_close_to
+  # See MiniTest::Assertions#assert_in_delta
+
+  ##
+  # :method: must_be_empty
+  # See MiniTest::Assertions#assert_empty
+
+  ##
+  # :method: must_be_instance_of
+  # See MiniTest::Assertions#assert_instance_of
+
+  ##
+  # :method: must_be_kind_of
+  # See MiniTest::Assertions#assert_kind_of
+
+  ##
+  # :method: must_be_nil
+  # See MiniTest::Assertions#assert_nil
+
+  ##
+  # :method: must_be_same_as
+  # See MiniTest::Assertions#assert_same
+
+  ##
+  # :method: must_be_within_delta
+  # See MiniTest::Assertions#assert_in_delta
+
+  ##
+  # :method: must_be_within_epsilon
+  # See MiniTest::Assertions#assert_in_epsilon
+
+  ##
+  # :method: must_equal
+  # See MiniTest::Assertions#assert_equal
+
+  ##
+  # :method: must_include
+  # See MiniTest::Assertions#assert_includes
+
+  ##
+  # :method: must_match
+  # See MiniTest::Assertions#assert_match
+
+  ##
+  # :method: must_raise
+  # See MiniTest::Assertions#assert_raises
+
+  ##
+  # :method: must_respond_to
+  # See MiniTest::Assertions#assert_respond_to
+
+  ##
+  # :method: must_send
+  # See MiniTest::Assertions#assert_send
+
+  ##
+  # :method: must_throw
+  # See MiniTest::Assertions#assert_throw
+
+  ##
+  # :method: wont_be
+  # See MiniTest::Assertions#refute
+
+  ##
+  # :method: wont_be_close_to
+  # See MiniTest::Assertions#refute_in_delta
+
+  ##
+  # :method: wont_be_empty
+  # See MiniTest::Assertions#refute_empty
+
+  ##
+  # :method: wont_be_instance_of
+  # See MiniTest::Assertions#refute_instance_of
+
+  ##
+  # :method: wont_be_kind_of
+  # See MiniTest::Assertions#refute_kind_of
+
+  ##
+  # :method: wont_be_nil
+  # See MiniTest::Assertions#refute_nil
+
+  ##
+  # :method: wont_be_same_as
+  # See MiniTest::Assertions#refute_same
+
+  ##
+  # :method: wont_be_within_delta
+  # See MiniTest::Assertions#refute_in_delta
+
+  ##
+  # :method: wont_be_within_epsilon
+  # See MiniTest::Assertions#refute_in_epsilon
+
+  ##
+  # :method: wont_equal
+  # See MiniTest::Assertions#refute_equal
+
+  ##
+  # :method: wont_include
+  # See MiniTest::Assertions#refute_includes
+
+  ##
+  # :method: wont_match
+  # See MiniTest::Assertions#refute_match
+
+  ##
+  # :method: wont_respond_to
+  # See MiniTest::Assertions#refute_respond_to
+end
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
new file mode 100644
index 0000000000..0a45932079
--- /dev/null
+++ b/lib/minitest/unit.rb
@@ -0,0 +1,791 @@
+############################################################
+# This file is imported from a different project.
+# DO NOT make modifications in this repo.
+# File a patch instead and assign it to Ryan Davis
+############################################################
+
+require 'optparse'
+
+##
+# Minimal (mostly drop-in) replacement for test-unit.
+
+module MiniTest
+
+  ##
+  # Assertion base class
+
+  class Assertion < Exception; end
+
+  ##
+  # Assertion raised when skipping a test
+
+  class Skip < Assertion; end
+
+  file = if RUBY_VERSION =~ /^1\.9/ then  # bt's expanded, but __FILE__ isn't :(
+           File.expand_path __FILE__
+         elsif  __FILE__ =~ /^[^\.]/ then # assume both relative
+           require 'pathname'
+           pwd = Pathname.new Dir.pwd
+           pn = Pathname.new File.expand_path(__FILE__)
+           pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
+           pn.to_s
+         else                             # assume both are expanded
+           __FILE__
+         end
+
+  # './lib' in project dir, or '/usr/local/blahblah' if installed
+  MINI_DIR = File.dirname(File.dirname(file)) # :nodoc:
+
+  def self.filter_backtrace bt # :nodoc:
+    return ["No backtrace"] unless bt
+
+    new_bt = []
+    bt.each do |line|
+      break if line.rindex(MINI_DIR, 0)
+      new_bt << line
+    end
+
+    new_bt = bt.reject { |line| line.rindex(MINI_DIR, 0) } if new_bt.empty?
+    new_bt = bt.dup if new_bt.empty?
+    new_bt
+  end
+
+  ##
+  # MiniTest Assertions.  All assertion methods accept a +msg+ which is
+  # printed if the assertion fails.
+
+  module Assertions
+
+    ##
+    # mu_pp gives a human-readable version of +obj+.  By default #inspect is
+    # called.  You can override this to use #pretty_print if you want.
+
+    def mu_pp obj
+      s = obj.inspect
+      s = s.force_encoding(Encoding.default_external) if defined? Encoding
+      s
+    end
+
+    def _assertions= n # :nodoc:
+      @_assertions = n
+    end
+
+    def _assertions # :nodoc:
+      @_assertions ||= 0
+    end
+
+    ##
+    # Fails unless +test+ is a true value.
+
+    def assert test, msg = nil
+      msg ||= "Failed assertion, no message given."
+      self._assertions += 1
+      unless test then
+        msg = msg.call if Proc === msg
+        raise MiniTest::Assertion, msg
+      end
+      true
+    end
+
+    ##
+    # Fails unless the block returns a true value.
+
+    def assert_block msg = nil
+      assert yield, "Expected block to return true value."
+    end
+
+    ##
+    # Fails unless +obj+ is empty.
+
+    def assert_empty obj, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(obj)} to be empty" }
+      assert_respond_to obj, :empty?
+      assert obj.empty?, msg
+    end
+
+    ##
+    # Fails unless <tt>exp == act</tt>.
+    #
+    # For floats use assert_in_delta
+
+    def assert_equal exp, act, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(exp)}, not #{mu_pp(act)}" }
+      assert(exp == act, msg)
+    end
+
+    ##
+    # For comparing Floats.  Fails unless +exp+ and +act+ are within +delta+
+    # of each other.
+    #
+    #   assert_in_delta Math::PI, (22.0 / 7.0), 0.01
+
+    def assert_in_delta exp, act, delta = 0.001, msg = nil
+      n = (exp - act).abs
+      msg = message(msg) { "Expected #{exp} - #{act} (#{n}) to be < #{delta}" }
+      assert delta >= n, msg
+    end
+
+    ##
+    # For comparing Floats.  Fails unless +exp+ and +act+ have a relative
+    # error less than +epsilon+.
+
+    def assert_in_epsilon a, b, epsilon = 0.001, msg = nil
+      assert_in_delta a, b, [a, b].min * epsilon, msg
+    end
+
+    ##
+    # Fails unless +collection+ includes +obj+.
+
+    def assert_includes collection, obj, msg = nil
+      msg = message(msg) {
+        "Expected #{mu_pp(collection)} to include #{mu_pp(obj)}"
+      }
+      assert_respond_to collection, :include?
+      assert collection.include?(obj), msg
+    end
+
+    ##
+    # Fails unless +obj+ is an instace of +cls+.
+
+    def assert_instance_of cls, obj, msg = nil
+      msg = message(msg) {
+        "Expected #{mu_pp(obj)} to be an instance of #{cls}, not #{obj.class}"
+      }
+
+      assert obj.instance_of?(cls), msg
+    end
+
+    ##
+    # Fails unless +obj+ is a kind of +cls+.
+
+    def assert_kind_of cls, obj, msg = nil # TODO: merge with instance_of
+      msg = message(msg) {
+        "Expected #{mu_pp(obj)} to be a kind of #{cls}, not #{obj.class}" }
+
+      assert obj.kind_of?(cls), msg
+    end
+
+    ##
+    # Fails unless +exp+ is <tt>=~</tt> +act+.
+
+    def assert_match exp, act, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(exp)} to match #{mu_pp(act)}" }
+      assert_respond_to act, :"=~"
+      exp = /#{Regexp.escape exp}/ if String === exp && String === act
+      assert exp =~ act, msg
+    end
+
+    ##
+    # Fails unless +obj+ is nil
+
+    def assert_nil obj, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(obj)} to be nil" }
+      assert obj.nil?, msg
+    end
+
+    ##
+    # For testing equality operators and so-forth.
+    #
+    #   assert_operator 5, :<=, 4
+
+    def assert_operator o1, op, o2, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(o1)} to be #{op} #{mu_pp(o2)}" }
+      assert o1.__send__(op, o2), msg
+    end
+
+    ##
+    # Fails unless the block raises one of +exp+
+
+    def assert_raises *exp
+      msg = String === exp.last ? exp.pop : nil
+      msg = msg.to_s + "\n" if msg
+      should_raise = false
+      begin
+        yield
+        should_raise = true
+      rescue MiniTest::Skip => e
+        details = "#{msg}#{mu_pp(exp)} exception expected, not"
+
+        if exp.include? MiniTest::Skip then
+          return e
+        else
+          raise e
+        end
+      rescue Exception => e
+        details = "#{msg}#{mu_pp(exp)} exception expected, not"
+        assert(exp.any? { |ex|
+                 ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class
+               }, exception_details(e, details))
+
+        return e
+      end
+
+      exp = exp.first if exp.size == 1
+      flunk "#{msg}#{mu_pp(exp)} expected but nothing was raised." if
+        should_raise
+    end
+
+    ##
+    # Fails unless +obj+ responds to +meth+.
+
+    def assert_respond_to obj, meth, msg = nil
+      msg = message(msg) {
+          "Expected #{mu_pp(obj)} (#{obj.class}) to respond to ##{meth}"
+        }
+      assert obj.respond_to?(meth), msg
+    end
+
+    ##
+    # Fails unless +exp+ and +act+ are #equal?
+
+    def assert_same exp, act, msg = nil
+      msg = message(msg) {
+        data = [mu_pp(act), act.object_id, mu_pp(exp), exp.object_id]
+        "Expected %s (oid=%d) to be the same as %s (oid=%d)" % data
+      }
+      assert exp.equal?(act), msg
+    end
+
+    ##
+    # +send_ary+ is a receiver, message and arguments.
+    #
+    # Fails unless the call returns a true value
+    # TODO: I should prolly remove this from specs
+
+    def assert_send send_ary, m = nil
+      recv, msg, *args = send_ary
+      m = message(m) {
+        "Expected #{mu_pp(recv)}.#{msg}(*#{mu_pp(args)}) to return true" }
+      assert recv.__send__(msg, *args), m
+    end
+
+    ##
+    # Fails unless the block throws +sym+
+
+    def assert_throws sym, msg = nil
+      default = "Expected #{mu_pp(sym)} to have been thrown"
+      caught = true
+      catch(sym) do
+        begin
+          yield
+        rescue ArgumentError => e     # 1.9 exception
+          default += ", not #{e.message.split(/ /).last}"
+        rescue NameError => e         # 1.8 exception
+          default += ", not #{e.name.inspect}"
+        end
+        caught = false
+      end
+
+      assert caught, message(msg) { default }
+    end
+
+    ##
+    # Captures $stdout and $stderr into strings:
+    #
+    #   out, err = capture_io do
+    #     warn "You did a bad thing"
+    #   end
+    #
+    #   assert_match %r%bad%, err
+
+    def capture_io
+      require 'stringio'
+
+      orig_stdout, orig_stderr         = $stdout, $stderr
+      captured_stdout, captured_stderr = StringIO.new, StringIO.new
+      $stdout, $stderr                 = captured_stdout, captured_stderr
+
+      yield
+
+      return captured_stdout.string, captured_stderr.string
+    ensure
+      $stdout = orig_stdout
+      $stderr = orig_stderr
+    end
+
+    ##
+    # Returns details for exception +e+
+
+    def exception_details e, msg
+      "#{msg}\nClass: <#{e.class}>\nMessage: <#{e.message.inspect}>\n---Backtrace---\n#{MiniTest::filter_backtrace(e.backtrace).join("\n")}\n---------------"
+    end
+
+    ##
+    # Fails with +msg+
+
+    def flunk msg = nil
+      msg ||= "Epic Fail!"
+      assert false, msg
+    end
+
+    ##
+    # Returns a proc that will output +msg+ along with the default message.
+
+    def message msg = nil, &default
+      proc {
+        if msg then
+          msg = msg.to_s unless String === msg
+          msg += '.' unless msg.empty?
+          msg += "\n#{default.call}."
+          msg.strip
+        else
+          "#{default.call}."
+        end
+      }
+    end
+
+    ##
+    # used for counting assertions
+
+    def pass msg = nil
+      assert true
+    end
+
+    ##
+    # Fails if +test+ is a true value
+
+    def refute test, msg = nil
+      msg ||= "Failed refutation, no message given"
+      not assert(! test, msg)
+    end
+
+    ##
+    # Fails if +obj+ is empty.
+
+    def refute_empty obj, msg = nil
+      msg = message(msg) { "Expected #{obj.inspect} to not be empty" }
+      assert_respond_to obj, :empty?
+      refute obj.empty?, msg
+    end
+
+    ##
+    # Fails if <tt>exp == act</tt>.
+    #
+    # For floats use refute_in_delta.
+
+    def refute_equal exp, act, msg = nil
+      msg = message(msg) {
+        "Expected #{mu_pp(act)} to not be equal to #{mu_pp(exp)}"
+      }
+      refute exp == act, msg
+    end
+
+    ##
+    # For comparing Floats.  Fails if +exp+ is within +delta+ of +act+
+    #
+    #   refute_in_delta Math::PI, (22.0 / 7.0)
+
+    def refute_in_delta exp, act, delta = 0.001, msg = nil
+      n = (exp - act).abs
+      msg = message(msg) {
+        "Expected #{exp} - #{act} (#{n}) to not be < #{delta}"
+      }
+      refute delta > n, msg
+    end
+
+    ##
+    # For comparing Floats.  Fails if +exp+ and +act+ have a relative error
+    # less than +epsilon+.
+
+    def refute_in_epsilon a, b, epsilon = 0.001, msg = nil
+      refute_in_delta a, b, a * epsilon, msg
+    end
+
+    ##
+    # Fails if +collection+ includes +obj+
+
+    def refute_includes collection, obj, msg = nil
+      msg = message(msg) {
+        "Expected #{mu_pp(collection)} to not include #{mu_pp(obj)}"
+      }
+      assert_respond_to collection, :include?
+      refute collection.include?(obj), msg
+    end
+
+    ##
+    # Fails if +obj+ is an instance of +cls+
+
+    def refute_instance_of cls, obj, msg = nil
+      msg = message(msg) {
+        "Expected #{mu_pp(obj)} to not be an instance of #{cls}"
+      }
+      refute obj.instance_of?(cls), msg
+    end
+
+    ##
+    # Fails if +obj+ is a kind of +cls+
+
+    def refute_kind_of cls, obj, msg = nil # TODO: merge with instance_of
+      msg = message(msg) { "Expected #{mu_pp(obj)} to not be a kind of #{cls}" }
+      refute obj.kind_of?(cls), msg
+    end
+
+    ##
+    # Fails if +exp+ <tt>=~</tt> +act+
+
+    def refute_match exp, act, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(exp)} to not match #{mu_pp(act)}" }
+      assert_respond_to act, :"=~"
+      exp = (/#{Regexp.escape exp}/) if String === exp and String === act
+      refute exp =~ act, msg
+    end
+
+    ##
+    # Fails if +obj+ is nil.
+
+    def refute_nil obj, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(obj)} to not be nil" }
+      refute obj.nil?, msg
+    end
+
+    ##
+    # Fails if +o1+ is not +op+ +o2+ nil. eg:
+    #
+    #   refute_operator 1, :>, 2 #=> pass
+    #   refute_operator 1, :<, 2 #=> fail
+
+    def refute_operator o1, op, o2, msg = nil
+      msg = message(msg) {
+        "Expected #{mu_pp(o1)} to not be #{op} #{mu_pp(o2)}"
+      }
+      refute o1.__send__(op, o2), msg
+    end
+
+    ##
+    # Fails if +obj+ responds to the message +meth+.
+
+    def refute_respond_to obj, meth, msg = nil
+      msg = message(msg) { "Expected #{mu_pp(obj)} to not respond to #{meth}" }
+
+      refute obj.respond_to?(meth), msg
+    end
+
+    ##
+    # Fails if +exp+ is the same (by object identity) as +act+.
+
+    def refute_same exp, act, msg = nil
+      msg = message(msg) {
+        data = [mu_pp(act), act.object_id, mu_pp(exp), exp.object_id]
+        "Expected %s (oid=%d) to not be the same as %s (oid=%d)" % data
+      }
+      refute exp.equal?(act), msg
+    end
+
+    ##
+    # Skips the current test. Gets listed at the end of the run but
+    # doesn't cause a failure exit code.
+
+    def skip msg = nil, bt = caller
+      msg ||= "Skipped, no message given"
+      raise MiniTest::Skip, msg, bt
+    end
+  end
+
+  class Unit
+    VERSION = "1.6.0" # :nodoc:
+
+    attr_accessor :report, :failures, :errors, :skips # :nodoc:
+    attr_accessor :test_count, :assertion_count       # :nodoc:
+    attr_accessor :start_time                         # :nodoc:
+
+    @@installed_at_exit ||= false
+    @@out = $stdout
+
+    ##
+    # Registers MiniTest::Unit to run tests at process exit
+
+    def self.autorun
+      at_exit {
+        next if $! # don't run if there was an exception
+
+        # the order here is important. The at_exit handler must be
+        # installed before anyone else gets a chance to install their
+        # own, that way we can be assured that our exit will be last
+        # to run (at_exit stacks).
+        exit_code = nil
+
+        at_exit { exit false if exit_code && exit_code != 0 }
+        exit_code = MiniTest::Unit.new.run(ARGV)
+      } unless @@installed_at_exit
+      @@installed_at_exit = true
+    end
+
+    ##
+    # Sets MiniTest::Unit to write output to +stream+.  $stdout is the default
+    # output
+
+    def self.output= stream
+      @@out = stream
+    end
+
+    def location e # :nodoc:
+      last_before_assertion = ""
+      e.backtrace.reverse_each do |s|
+        break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
+        last_before_assertion = s
+      end
+      last_before_assertion.sub(/:in .*$/, '')
+    end
+
+    ##
+    # Writes status for failed test +meth+ in +klass+ which finished with
+    # exception +e+
+
+    def puke klass, meth, e
+      e = case e
+          when MiniTest::Skip then
+            @skips += 1
+            "Skipped:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+          when MiniTest::Assertion then
+            @failures += 1
+            "Failure:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+          else
+            @errors += 1
+            bt = MiniTest::filter_backtrace(e.backtrace).join("\n    ")
+            "Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n    #{bt}\n"
+          end
+      @report << e
+      e[0, 1]
+    end
+
+    def initialize # :nodoc:
+      @report = []
+      @errors = @failures = @skips = 0
+      @verbose = false
+    end
+
+    def process_args args = []
+      options = {}
+
+      OptionParser.new do |opts|
+        opts.banner  = 'minitest options:'
+        opts.version = MiniTest::Unit::VERSION
+
+        opts.on '-h', '--help', 'Display this help.' do
+          puts opts
+          exit
+        end
+
+        opts.on '-s', '--seed SEED', Integer, "Sets random seed" do |m|
+          options[:seed] = m.to_i
+        end
+
+        opts.on '-v', '--verbose', "Verbose. Show progress processing files." do
+          options[:verbose] = true
+        end
+
+        opts.on '-n', '--name PATTERN', "Filter test names on pattern." do |a|
+          options[:filter] = a
+        end
+
+        opts.parse args
+      end
+
+      options
+    end
+
+    ##
+    # Top level driver, controls all output and filtering.
+
+    def run args = []
+      options = process_args args
+
+      @verbose = options[:verbose]
+
+      filter = options[:filter] || '/./'
+      filter = Regexp.new $1 if filter and filter =~ /\/(.*)\//
+
+      seed = options[:seed]
+      unless seed then
+        srand
+        seed = srand % 0xFFFF
+      end
+
+      srand seed
+
+      @@out.puts "Loaded suite #{$0.sub(/\.rb$/, '')}\nStarted"
+
+      start = Time.now
+      run_test_suites filter
+
+      @@out.puts
+      @@out.puts "Finished in #{'%.6f' % (Time.now - start)} seconds."
+
+      @report.each_with_index do |msg, i|
+        @@out.puts "\n%3d) %s" % [i + 1, msg]
+      end
+
+      @@out.puts
+
+      status
+
+      @@out.puts
+
+      help = ["--seed", seed]
+      help.push "--verbose" if @verbose
+      help.push("--name", options[:filter].inspect) if options[:filter]
+
+      @@out.puts "Test run options: #{help.join(" ")}"
+
+      return failures + errors if @test_count > 0 # or return nil...
+    rescue Interrupt
+      abort 'Interrupted'
+    end
+
+    ##
+    # Writes status to +io+
+
+    def status io = @@out
+      format = "%d tests, %d assertions, %d failures, %d errors, %d skips"
+      io.puts format % [test_count, assertion_count, failures, errors, skips]
+    end
+
+    ##
+    # Runs test suites matching +filter+
+
+    def run_test_suites filter = /./
+      @test_count, @assertion_count = 0, 0
+      old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync=
+      TestCase.test_suites.each do |suite|
+        suite.test_methods.grep(filter).each do |test|
+          inst = suite.new test
+          inst._assertions = 0
+          @@out.print "#{suite}##{test}: " if @verbose
+
+          @start_time = Time.now
+          result = inst.run(self)
+
+          @@out.print "%.2f s: " % (Time.now - @start_time) if @verbose
+          @@out.print result
+          @@out.puts if @verbose
+          @test_count += 1
+          @assertion_count += inst._assertions
+        end
+      end
+      @@out.sync = old_sync if @@out.respond_to? :sync=
+      [@test_count, @assertion_count]
+    end
+
+    ##
+    # Subclass TestCase to create your own tests.  Typically you'll want a
+    # TestCase subclass per implementation class.
+
+    class TestCase
+      attr_reader :__name__ # :nodoc:
+
+      PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException,
+                                Interrupt, SystemExit] # :nodoc:
+
+      SUPPORTS_INFO_SIGNAL = Signal.list['INFO'] # :nodoc:
+
+      ##
+      # Runs the tests reporting the status to +runner+
+
+      def run runner
+        trap 'INFO' do
+          warn '%s#%s %.2fs' % [self.class, self.__name__,
+            (Time.now - runner.start_time)]
+          runner.status $stderr
+        end if SUPPORTS_INFO_SIGNAL
+
+        result = '.'
+        begin
+          @passed = nil
+          self.setup
+          self.__send__ self.__name__
+          @passed = true
+        rescue *PASSTHROUGH_EXCEPTIONS
+          raise
+        rescue Exception => e
+          @passed = false
+          result = runner.puke(self.class, self.__name__, e)
+        ensure
+          begin
+            self.teardown
+          rescue *PASSTHROUGH_EXCEPTIONS
+            raise
+          rescue Exception => e
+            result = runner.puke(self.class, self.__name__, e)
+          end
+          trap 'INFO', 'DEFAULT' if SUPPORTS_INFO_SIGNAL
+        end
+        result
+      end
+
+      def initialize name # :nodoc:
+        @__name__ = name
+        @passed = nil
+      end
+
+      def self.reset # :nodoc:
+        @@test_suites = {}
+      end
+
+      reset
+
+      def self.inherited klass # :nodoc:
+        @@test_suites[klass] = true
+      end
+
+      ##
+      # Defines test order and is subclassable. Defaults to :random
+      # but can be overridden to return :alpha if your tests are order
+      # dependent (read: weak).
+
+      def self.test_order
+        :random
+      end
+
+      def self.test_suites # :nodoc:
+        @@test_suites.keys.sort_by { |ts| ts.name }
+      end
+
+      def self.test_methods # :nodoc:
+        methods = public_instance_methods(true).grep(/^test/).map { |m| m.to_s }
+
+        case self.test_order
+        when :random then
+          max = methods.size
+          methods.sort.sort_by { rand(max) }
+        when :alpha, :sorted then
+          methods.sort
+        else
+          raise "Unknown test_order: #{self.test_order.inspect}"
+        end
+      end
+
+      ##
+      # Returns true if the test passed.
+
+      def passed?
+        @passed
+      end
+
+      ##
+      # Runs before every test. Use this to refactor test initialization.
+
+      def setup; end
+
+      ##
+      # Runs after every test. Use this to refactor test cleanup.
+
+      def teardown; end
+
+      include MiniTest::Assertions
+    end # class TestCase
+  end # class Unit
+end # module MiniTest
+
+if $DEBUG then
+  module Test                # :nodoc:
+    module Unit              # :nodoc:
+      class TestCase         # :nodoc:
+        def self.inherited x # :nodoc:
+          # this helps me ferret out porting issues
+          raise "Using minitest and test/unit in the same process: #{x}"
+        end
+      end
+    end
+  end
+end
+
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 31f4878b8b..1019a5d92e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1,3 +1,4 @@
+# -*- indent-tabs-mode: t -*-
 # module to create Makefile for extension modules
 # invoke like: ruby -r mkmf extconf.rb
 
@@ -5,15 +6,16 @@ require 'rbconfig'
 require 'fileutils'
 require 'shellwords'
 
-CONFIG = Config::MAKEFILE_CONFIG
+CONFIG = RbConfig::MAKEFILE_CONFIG
 ORIG_LIBPATH = ENV['LIB']
 
 CXX_EXT = %w[cc cxx cpp]
-if /mswin|bccwin|mingw|msdosdjgpp|human|os2/ !~ CONFIG['build_os']
+if File::FNM_SYSCASE.zero?
   CXX_EXT.concat(%w[C])
 end
-SRC_EXT = %w[c m] << CXX_EXT
-$static = $config_h = nil
+SRC_EXT = %w[c m].concat(CXX_EXT)
+$static = nil
+$config_h = '$(arch_hdrdir)/ruby/config.h'
 $default_static = $static
 
 unless defined? $configure_args
@@ -51,18 +53,24 @@ $archdir = CONFIG["archdir"]
 $sitedir = CONFIG["sitedir"]
 $sitelibdir = CONFIG["sitelibdir"]
 $sitearchdir = CONFIG["sitearchdir"]
+$vendordir = CONFIG["vendordir"]
+$vendorlibdir = CONFIG["vendorlibdir"]
+$vendorarchdir = CONFIG["vendorarchdir"]
 
 $mswin = /mswin/ =~ RUBY_PLATFORM
 $bccwin = /bccwin/ =~ RUBY_PLATFORM
 $mingw = /mingw/ =~ RUBY_PLATFORM
 $cygwin = /cygwin/ =~ RUBY_PLATFORM
-$human = /human/ =~ RUBY_PLATFORM
 $netbsd = /netbsd/ =~ RUBY_PLATFORM
 $os2 = /os2/ =~ RUBY_PLATFORM
 $beos = /beos/ =~ RUBY_PLATFORM
+$haiku = /haiku/ =~ RUBY_PLATFORM
 $solaris = /solaris/ =~ RUBY_PLATFORM
+$universal = /universal/ =~ RUBY_PLATFORM
 $dest_prefix_pattern = (File::PATH_SEPARATOR == ';' ? /\A([[:alpha:]]:)?/ : /\A/)
 
+# :stopdoc:
+
 def config_string(key, config = CONFIG)
   s = config[key] and !s.empty? and block_given? ? yield(s) : s
 end
@@ -71,35 +79,69 @@ def dir_re(dir)
   Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$(?:\(target_prefix\)|\{target_prefix\}))?')
 end
 
+def relative_from(path, base)
+  dir = File.join(path, "")
+  if File.expand_path(dir) == File.expand_path(dir, base)
+    path
+  else
+    File.join(base, path)
+  end
+end
+
 INSTALL_DIRS = [
   [dir_re('commondir'), "$(RUBYCOMMONDIR)"],
-  [dir_re("sitedir"), "$(RUBYCOMMONDIR)"],
+  [dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
+  [dir_re('vendordir'), "$(RUBYCOMMONDIR)"],
   [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
   [dir_re('archdir'), "$(RUBYARCHDIR)"],
   [dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
-  [dir_re('sitearchdir'), "$(RUBYARCHDIR)"]
+  [dir_re('vendorlibdir'), "$(RUBYLIBDIR)"],
+  [dir_re('sitearchdir'), "$(RUBYARCHDIR)"],
+  [dir_re('vendorarchdir'), "$(RUBYARCHDIR)"],
+  [dir_re('rubyhdrdir'), "$(RUBYHDRDIR)"],
+  [dir_re('sitehdrdir'), "$(SITEHDRDIR)"],
+  [dir_re('vendorhdrdir'), "$(VENDORHDRDIR)"],
+  [dir_re('bindir'), "$(BINDIR)"],
 ]
 
 def install_dirs(target_prefix = nil)
   if $extout
     dirs = [
+      ['BINDIR',        '$(extout)/bin'],
       ['RUBYCOMMONDIR', '$(extout)/common'],
       ['RUBYLIBDIR',    '$(RUBYCOMMONDIR)$(target_prefix)'],
       ['RUBYARCHDIR',   '$(extout)/$(arch)$(target_prefix)'],
+      ['HDRDIR',        '$(extout)/include/ruby$(target_prefix)'],
+      ['ARCHHDRDIR',    '$(extout)/include/$(arch)/ruby$(target_prefix)'],
       ['extout',        "#$extout"],
       ['extout_prefix', "#$extout_prefix"],
     ]
   elsif $extmk
     dirs = [
+      ['BINDIR',        '$(bindir)'],
       ['RUBYCOMMONDIR', '$(rubylibdir)'],
       ['RUBYLIBDIR',    '$(rubylibdir)$(target_prefix)'],
       ['RUBYARCHDIR',   '$(archdir)$(target_prefix)'],
+      ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
+      ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+    ]
+  elsif $configure_args.has_key?('--vendor')
+    dirs = [
+      ['BINDIR',        '$(bindir)'],
+      ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
+      ['RUBYLIBDIR',    '$(vendorlibdir)$(target_prefix)'],
+      ['RUBYARCHDIR',   '$(vendorarchdir)$(target_prefix)'],
+      ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
+      ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
     ]
   else
     dirs = [
+      ['BINDIR',        '$(bindir)'],
       ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
       ['RUBYLIBDIR',    '$(sitelibdir)$(target_prefix)'],
       ['RUBYARCHDIR',   '$(sitearchdir)$(target_prefix)'],
+      ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
+      ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
     ]
   end
   dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
@@ -108,41 +150,62 @@ end
 
 def map_dir(dir, map = nil)
   map ||= INSTALL_DIRS
-  map.inject(dir) {|dir, (orig, new)| dir.gsub(orig, new)}
+  map.inject(dir) {|d, (orig, new)| d.gsub(orig, new)}
 end
 
 topdir = File.dirname(libdir = File.dirname(__FILE__))
 extdir = File.expand_path("ext", topdir)
-$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
-if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h")
-  $hdrdir = $topdir = Config::CONFIG["archdir"]
-elsif File.exist?(($top_srcdir ||= topdir)  + "/ruby.h") and
-    File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h")
-  $hdrdir = $top_srcdir
+path = File.expand_path($0)
+$extmk = path[0, topdir.size+1] == topdir+"/"
+$extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+))\z" =~ File.dirname(path[topdir.size+1..-1])
+$extmk &&= true
+if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
+  $topdir = $hdrdir
+  $top_srcdir = $hdrdir
+  $arch_hdrdir = $hdrdir + "/$(arch)"
+elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include")  + "/ruby.h")
+  $topdir ||= RbConfig::CONFIG["topdir"]
+  $arch_hdrdir = "$(extout)/include/$(arch)"
 else
-  abort "can't find header files for ruby."
+  abort "mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h"
 end
 
 OUTFLAG = CONFIG['OUTFLAG']
+COUTFLAG = CONFIG['COUTFLAG']
 CPPOUTFILE = CONFIG['CPPOUTFILE']
 
-CONFTEST_C = "conftest.c"
+CONFTEST_C = "conftest.c".freeze
 
 class String
+  # Wraps a string in escaped quotes if it contains whitespace.
   def quote
-    /\s/ =~ self ? "\"#{self}\"" : self
+    /\s/ =~ self ? "\"#{self}\"" : "#{self}"
+  end
+
+  # Generates a string used as cpp macro name.
+  def tr_cpp
+    strip.upcase.tr_s("^A-Z0-9_", "_")
   end
 end
 class Array
+  # Wraps all strings in escaped quotes if they contain whitespace.
   def quote
     map {|s| s.quote}
   end
 end
 
 def rm_f(*files)
-  FileUtils.rm_f(Dir[files.join("\0")])
+  opt = (Hash === files.last ? [files.pop] : [])
+  FileUtils.rm_f(Dir[*files.flatten], *opt)
+end
+
+def rm_rf(*files)
+  opt = (Hash === files.last ? [files.pop] : [])
+  FileUtils.rm_rf(Dir[*files.flatten], *opt)
 end
 
+# Returns time stamp of the +target+ file if it exists and is newer
+# than or equal to all of +times+.
 def modified?(target, times)
   (t = File.mtime(target)) rescue return nil
   Array === times or times = [times]
@@ -165,16 +228,27 @@ def merge_libs(*libs)
   end
 end
 
+# This is a custom logging module. It generates an mkmf.log file when you
+# run your extconf.rb script. This can be useful for debugging unexpected
+# failures.
+#
+# This module and its associated methods are meant for internal use only.
+#
 module Logging
   @log = nil
   @logfile = 'mkmf.log'
   @orgerr = $stderr.dup
   @orgout = $stdout.dup
   @postpone = 0
+  @quiet = $extmk
 
-  def self::open
-    @log ||= File::open(@logfile, 'w')
+  def self::log_open
+    @log ||= File::open(@logfile, 'wb')
     @log.sync = true
+  end
+
+  def self::open
+    log_open
     $stderr.reopen(@log)
     $stdout.reopen(@log)
     yield
@@ -184,8 +258,7 @@ module Logging
   end
 
   def self::message(*s)
-    @log ||= File::open(@logfile, 'w')
-    @log.sync = true
+    log_open
     @log.printf(*s)
   end
 
@@ -197,7 +270,7 @@ module Logging
       @log = nil
     end
   end
-  
+
   def self::postpone
     tmplog = "mkmftmp#{@postpone += 1}.log"
     open do
@@ -205,18 +278,28 @@ module Logging
       @log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
       begin
         log.print(open {yield})
+      ensure
         @log.close
         File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
-      ensure
         @log, @logfile, @orgout, @orgerr = log, *save
         @postpone -= 1
         rm_f tmplog
       end
     end
   end
+
+  class << self
+    attr_accessor :quiet
+  end
 end
 
 def xsystem command
+  varpat = /\$\((\w+)\)|\$\{(\w+)\}/
+  if varpat =~ command
+    vars = Hash.new {|h, k| h[k] = ''; ENV[k]}
+    command = command.dup
+    nil while command.gsub!(varpat) {vars[$1||$2]}
+  end
   Logging::open do
     puts command.quote
     system(command)
@@ -250,45 +333,79 @@ EOM
 end
 
 def create_tmpsrc(src)
+  src = "#{COMMON_HEADERS}\n#{src}"
   src = yield(src) if block_given?
-  src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
-  open(CONFTEST_C, "wb") do |cfile|
-    cfile.print src
+  src.gsub!(/[ \t]+$/, '')
+  src.gsub!(/\A\n+|^\n+$/, '')
+  src.sub!(/[^\n]\z/, "\\&\n")
+  count = 0
+  begin
+    open(CONFTEST_C, "wb") do |cfile|
+      cfile.print src
+    end
+  rescue Errno::EACCES
+    if (count += 1) < 5
+      sleep 0.2
+      retry
+    end
   end
   src
 end
 
+def have_devel?
+  unless defined? $have_devel
+    $have_devel = true
+    $have_devel = try_link(MAIN_DOES_NOTHING)
+  end
+  $have_devel
+end
+
 def try_do(src, command, &b)
-  src = create_tmpsrc(src, &b)
-  xsystem(command)
-ensure
-  log_src(src)
+  unless have_devel?
+    raise <<MSG
+The complier failed to generate an executable file.
+You have to install development tools first.
+MSG
+  end
+  begin
+    src = create_tmpsrc(src, &b)
+    xsystem(command)
+  ensure
+    log_src(src)
+    rm_rf 'conftest.dSYM'
+  end
 end
 
 def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
-  conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote,
-                              'src' => CONFTEST_C,
-                              'INCFLAGS' => $INCFLAGS,
-                              'CPPFLAGS' => $CPPFLAGS,
-                              'CFLAGS' => "#$CFLAGS",
-                              'ARCH_FLAG' => "#$ARCH_FLAG",
-                              'LDFLAGS' => "#$LDFLAGS #{ldflags}",
-                              'LIBPATH' => libpathflag(libpath),
-                              'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
-                              'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
-  Config::expand(TRY_LINK.dup, conf)
+  conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
+                                'src' => "#{CONFTEST_C}",
+                                'arch_hdrdir' => "#$arch_hdrdir",
+                                'top_srcdir' => $top_srcdir.quote,
+                                'INCFLAGS' => "#$INCFLAGS",
+                                'CPPFLAGS' => "#$CPPFLAGS",
+                                'CFLAGS' => "#$CFLAGS",
+                                'ARCH_FLAG' => "#$ARCH_FLAG",
+                                'LDFLAGS' => "#$LDFLAGS #{ldflags}",
+                                'LIBPATH' => libpathflag(libpath),
+                                'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
+                                'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
+  RbConfig::expand(TRY_LINK.dup, conf)
 end
 
 def cc_command(opt="")
-  conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
-  Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
-		 conf)
+  conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
+                                'arch_hdrdir' => "#$arch_hdrdir",
+                                'top_srcdir' => $top_srcdir.quote)
+  RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
+		   conf)
 end
 
 def cpp_command(outfile, opt="")
-  conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
-  Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
-		 conf)
+  conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
+                                'arch_hdrdir' => "#$arch_hdrdir",
+                                'top_srcdir' => $top_srcdir.quote)
+  RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
+		   conf)
 end
 
 def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
@@ -303,7 +420,20 @@ def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
 end
 
 def try_link0(src, opt="", &b)
-  try_do(src, link_command("", opt), &b)
+  cmd = link_command("", opt)
+  if $universal
+    require 'tmpdir'
+    Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir|
+      begin
+        ENV["TMPDIR"] = tmpdir
+        try_do(src, cmd, &b)
+      ensure
+        ENV["TMPDIR"] = oldtmpdir
+      end
+    end
+  else
+    try_do(src, cmd, &b)
+  end
 end
 
 def try_link(src, opt="", &b)
@@ -324,10 +454,14 @@ ensure
   rm_f "conftest*"
 end
 
+class Object
+  alias_method :try_header, (config_string('try_header') || :try_cpp)
+end
+
 def cpp_include(header)
   if header
     header = [header] unless header.kind_of? Array
-    header.map {|h| "#include <#{h}>\n"}.join
+    header.map {|h| String === h ? "#include <#{h}>\n" : h}.join
   else
     ""
   end
@@ -360,7 +494,6 @@ end
 def try_static_assert(expr, headers = nil, opt = "", &b)
   headers = cpp_include(headers)
   try_compile(<<SRC, opt, &b)
-#{COMMON_HEADERS}
 #{headers}
 /*top*/
 int conftest_const[(#{expr}) ? 1 : -1];
@@ -399,8 +532,7 @@ def try_constant(const, headers = nil, opt = "", &b)
     upper = -upper if neg
     return upper
   else
-    src = %{#{COMMON_HEADERS}
-#{includes}
+    src = %{#{includes}
 #include <stdio.h>
 /*top*/
 int conftest_const = (int)(#{const});
@@ -417,16 +549,16 @@ end
 
 def try_func(func, libs, headers = nil, &b)
   headers = cpp_include(headers)
-  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
-#{COMMON_HEADERS}
+  try_link(<<"SRC", libs, &b) or
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
+  try_link(<<"SRC", libs, &b)
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { #{func}(); return 0; }
 SRC
 end
@@ -434,10 +566,9 @@ end
 def try_var(var, headers = nil, &b)
   headers = cpp_include(headers)
   try_compile(<<"SRC", &b)
-#{COMMON_HEADERS}
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { const volatile void *volatile p; p = &(&#{var})[0]; return 0; }
 SRC
 end
@@ -468,6 +599,7 @@ ensure
   log_src(src)
 end
 
+# This is used internally by the have_macro? method.
 def macro_defined?(macro, src, opt = "", &b)
   src = src.sub(/[^\n]\z/, "\\&\n")
   try_compile(src + <<"SRC", opt, &b)
@@ -491,13 +623,14 @@ end
 
 def install_files(mfile, ifiles, map = nil, srcprefix = nil)
   ifiles or return
-  srcprefix ||= '$(srcdir)'
-  Config::expand(srcdir = srcprefix.dup)
+  ifiles.empty? and return
+  srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
+  RbConfig::expand(srcdir = srcprefix.dup)
   dirs = []
   path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
   ifiles.each do |files, dir, prefix|
     dir = map_dir(dir, map)
-    prefix = %r|\A#{Regexp.quote(prefix)}/?| if prefix
+    prefix &&= %r|\A#{Regexp.quote(prefix)}/?|
     if /\A\.\// =~ files
       # install files which are in current working directory.
       files = files[2..-1]
@@ -508,8 +641,13 @@ def install_files(mfile, ifiles, map = nil, srcprefix = nil)
       len = srcdir.size
     end
     f = nil
-    Dir.glob(files) do |f|
+    Dir.glob(files) do |fx|
+      f = fx
       f[0..len] = "" if len
+      case File.basename(f)
+      when *$NONINSTALLFILES
+        next
+      end
       d = File.dirname(f)
       d.sub!(prefix, "") if prefix
       d = (d.empty? || d == ".") ? dir : File.join(dir, d)
@@ -530,19 +668,24 @@ def install_rb(mfile, dest, srcdir = nil)
   install_files(mfile, [["lib/**/*.rb", dest, "lib"]], nil, srcdir)
 end
 
-def append_library(libs, lib)
+def append_library(libs, lib) # :no-doc:
   format(LIBARG, lib) + " " + libs
 end
 
 def message(*s)
-  unless $extmk and not $VERBOSE
+  unless Logging.quiet and not $VERBOSE
     printf(*s)
     $stdout.flush
   end
 end
 
+# This emits a string to stdout that allows users to see the results of the
+# various have* and find* methods as they are tested.
+#
+# Internal use only.
+#
 def checking_for(m, fmt = nil)
-  f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim
+  f = caller[0][/in `([^<].*)'$/, 1] and f << ": " #` for vim #'
   m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
   message "%s", m
   a = r = nil
@@ -570,6 +713,8 @@ def checking_message(target, place = nil, opt = nil)
   end
 end
 
+# :startdoc:
+
 # Returns whether or not +macro+ is defined either in the common header
 # files or within any +headers+ you provide.
 #
@@ -589,7 +734,7 @@ end
 # If +headers+ are provided, it will include those header files as the
 # header files it looks in when searching for +func+.
 #
-# Real name of the library to be linked can be altered by
+# The real name of the library to be linked can be altered by
 # '--with-FOOlib' configuration option.
 #
 def have_library(lib, func = nil, headers = nil, &b)
@@ -650,7 +795,7 @@ end
 def have_func(func, headers = nil, &b)
   checking_for checking_message("#{func}()", headers) do
     if try_func(func, $libs, headers, &b)
-      $defs.push(format("-DHAVE_%s", func.upcase))
+      $defs.push(format("-DHAVE_%s", func.tr_cpp))
       true
     else
       false
@@ -669,7 +814,7 @@ end
 def have_var(var, headers = nil, &b)
   checking_for checking_message(var, headers) do
     if try_var(var, headers, &b)
-      $defs.push(format("-DHAVE_%s", var.upcase))
+      $defs.push(format("-DHAVE_%s", var.tr_cpp))
       true
     else
       false
@@ -684,10 +829,10 @@ end
 # For example, if have_header('foo.h') returned true, then the HAVE_FOO_H
 # preprocessor macro would be passed to the compiler.
 #
-def have_header(header, &b)
+def have_header(header, preheaders = nil, &b)
   checking_for header do
-    if try_cpp(cpp_include(header), &b)
-      $defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___")))
+    if try_header(cpp_include(preheaders)+cpp_include(header), &b)
+      $defs.push(format("-DHAVE_%s", header.tr_cpp))
       true
     else
       false
@@ -702,15 +847,16 @@ end
 # of included directories that are sent to the compiler (via the -I switch).
 #
 def find_header(header, *paths)
+  message = checking_message(header, paths)
   header = cpp_include(header)
-  checking_for header do
-    if try_cpp(header)
+  checking_for message do
+    if try_header(header)
       true
     else
       found = false
       paths.each do |dir|
         opt = "-I#{dir}".quote
-        if try_cpp(header, opt)
+        if try_header(header, opt)
           $INCFLAGS << " " << opt
           found = true
           break
@@ -727,21 +873,23 @@ end
 # (in addition to the common header files).
 #
 # If found, a macro is passed as a preprocessor constant to the compiler using
-# the member name, in uppercase, prepended with 'HAVE_ST_'.
+# the type name and the member name, in uppercase, prepended with 'HAVE_'.
+#
+# For example, if have_struct_member('struct foo', 'bar') returned true, then the
+# HAVE_STRUCT_FOO_BAR preprocessor macro would be passed to the compiler.
+#
+# HAVE_ST_BAR is also defined for backward compatibility.
 #
-# For example, if have_struct_member('foo', 'bar') returned true, then the
-# HAVE_ST_BAR preprocessor macro would be passed to the compiler.
-# 
 def have_struct_member(type, member, headers = nil, &b)
   checking_for checking_message("#{type}.#{member}", headers) do
     if try_compile(<<"SRC", &b)
-#{COMMON_HEADERS}
 #{cpp_include(headers)}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
 SRC
-      $defs.push(format("-DHAVE_ST_%s", member.upcase))
+      $defs.push(format("-DHAVE_%s_%s", type.tr_cpp, member.tr_cpp))
+      $defs.push(format("-DHAVE_ST_%s", member.tr_cpp)) # backward compatibility
       true
     else
       false
@@ -749,6 +897,20 @@ SRC
   end
 end
 
+def try_type(type, headers = nil, opt = "", &b)
+  if try_compile(<<"SRC", opt, &b)
+#{cpp_include(headers)}
+/*top*/
+typedef #{type} conftest_type;
+int conftestval[sizeof(conftest_type)?1:-1];
+SRC
+    $defs.push(format("-DHAVE_TYPE_%s", type.tr_cpp))
+    true
+  else
+    false
+  end
+end
+
 # Returns whether or not the static type +type+ is defined.  You may
 # optionally pass additional +headers+ to check against in addition to the
 # common header files.
@@ -764,22 +926,74 @@ end
 #
 def have_type(type, headers = nil, opt = "", &b)
   checking_for checking_message(type, headers, opt) do
-    headers = cpp_include(headers)
-    if try_compile(<<"SRC", opt, &b)
-#{COMMON_HEADERS}
-#{headers}
+    try_type(type, headers, opt, &b)
+  end
+end
+
+# Returns where the static type +type+ is defined.
+#
+# You may also pass additional flags to +opt+ which are then passed along to
+# the compiler.
+#
+# See also +have_type+.
+#
+def find_type(type, opt, *headers, &b)
+  opt ||= ""
+  fmt = "not found"
+  def fmt.%(x)
+    x ? x.respond_to?(:join) ? x.join(",") : x : self
+  end
+  checking_for checking_message(type, nil, opt), fmt do
+    headers.find do |h|
+      try_type(type, h, opt, &b)
+    end
+  end
+end
+
+def try_const(const, headers = nil, opt = "", &b)
+  const, type = *const
+  if try_compile(<<"SRC", opt, &b)
+#{cpp_include(headers)}
 /*top*/
-typedef #{type} conftest_type;
-static conftest_type conftestval[sizeof(conftest_type)?1:-1];
+typedef #{type || 'int'} conftest_type;
+conftest_type conftestval = #{type ? '' : '(int)'}#{const};
 SRC
-      $defs.push(format("-DHAVE_TYPE_%s", type.strip.upcase.tr_s("^A-Z0-9_", "_")))
-      true
-    else
-      false
-    end
+    $defs.push(format("-DHAVE_CONST_%s", const.tr_cpp))
+    true
+  else
+    false
   end
 end
 
+# Returns whether or not the constant +const+ is defined.  You may
+# optionally pass the +type+ of +const+ as <code>[const, type]</code>,
+# like as:
+#
+#   have_const(%w[PTHREAD_MUTEX_INITIALIZER pthread_mutex_t], "pthread.h")
+#
+# You may also pass additional +headers+ to check against in addition
+# to the common header files, and additional flags to +opt+ which are
+# then passed along to the compiler.
+#
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the type name, in uppercase, prepended with 'HAVE_CONST_'.
+#
+# For example, if have_const('foo') returned true, then the HAVE_CONST_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_const(const, headers = nil, opt = "", &b)
+  checking_for checking_message([*const].compact.join(' '), headers, opt) do
+    try_const(const, headers, opt, &b)
+  end
+end
+
+STRING_OR_FAILED_FORMAT = "%s"
+# :stopdoc:
+def STRING_OR_FAILED_FORMAT.%(x)
+  x ? super : "failed"
+end
+# :startdoc:
+
 # Returns the size of the given +type+.  You may optionally specify additional
 # +headers+ to search in for the +type+.
 #
@@ -790,79 +1004,168 @@ end
 # For example, if check_sizeof('mystruct') returned 12, then the
 # SIZEOF_MYSTRUCT=12 preprocessor macro would be passed to the compiler.
 #
-def check_sizeof(type, headers = nil, &b)
-  expr = "sizeof(#{type})"
-  fmt = "%d"
-  def fmt.%(x)
-    x ? super : "failed"
-  end
+def check_sizeof(type, headers = nil, opts = "", &b)
+  typename, member = type.split('.', 2)
+  prelude = cpp_include(headers).split(/$/)
+  prelude << "typedef #{typename} rbcv_typedef_;\n"
+  prelude << "static rbcv_typedef_ *rbcv_ptr_;\n"
+  prelude = [prelude]
+  expr = "sizeof((*rbcv_ptr_)#{"." << member if member})"
+  fmt = STRING_OR_FAILED_FORMAT
   checking_for checking_message("size of #{type}", headers), fmt do
-    if size = try_constant(expr, headers, &b)
-      $defs.push(format("-DSIZEOF_%s=%d", type.upcase.tr_s("^A-Z0-9_", "_"), size))
+    if UNIVERSAL_INTS.include?(type)
+      type
+    elsif size = UNIVERSAL_INTS.find {|t|
+        try_static_assert("#{expr} == sizeof(#{t})", prelude, opts, &b)
+      }
+      $defs.push(format("-DSIZEOF_%s=SIZEOF_%s", type.tr_cpp, size.tr_cpp))
       size
+    elsif size = try_constant(expr, prelude, opts, &b)
+      $defs.push(format("-DSIZEOF_%s=%s", type.tr_cpp, size))
+      size
+    end
+  end
+end
+
+# Returns the signedness of the given +type+.  You may optionally
+# specify additional +headers+ to search in for the +type+.
+#
+# If the +type+ is found and is a numeric type, a macro is passed as a
+# preprocessor constant to the compiler using the +type+ name, in
+# uppercase, prepended with 'SIGNEDNESS_OF_', followed by the +type+
+# name, followed by '=X' where 'X' is positive integer if the +type+ is
+# unsigned, or negative integer if the +type+ is signed.
+#
+# For example, if size_t is defined as unsigned, then
+# check_signedness('size_t') would returned +1 and the
+# SIGNEDNESS_OF_SIZE_T=+1 preprocessor macro would be passed to the
+# compiler, and SIGNEDNESS_OF_INT=-1 if check_signedness('int') is
+# done.
+#
+def check_signedness(type, headers = nil)
+  signed = nil
+  checking_for("signedness of #{type}", STRING_OR_FAILED_FORMAT) do
+    if try_static_assert("(#{type})-1 < 0")
+      signed = -1
+    elsif try_static_assert("(#{type})-1 > 0")
+      signed = +1
+    else
+      next nil
     end
+    $defs.push("-DSIGNEDNESS_OF_%s=%+d" % [type.tr_cpp, signed])
+    signed < 0 ? "signed" : "unsigned"
   end
+  signed
 end
 
+# :stopdoc:
+
+# Used internally by the what_type? method to determine if +type+ is a scalar
+# pointer.
 def scalar_ptr_type?(type, member = nil, headers = nil, &b)
   try_compile(<<"SRC", &b)   # pointer
-#{COMMON_HEADERS}
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));}
 SRC
 end
 
+# Used internally by the what_type? method to determine if +type+ is a scalar
+# pointer.
 def scalar_type?(type, member = nil, headers = nil, &b)
   try_compile(<<"SRC", &b)   # pointer
-#{COMMON_HEADERS}
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));}
 SRC
 end
 
+# Used internally by the what_type? method to check if _typeof_ GCC
+# extension is available.
+def have_typeof?
+  return $typeof if defined?($typeof)
+  $typeof = %w[__typeof__ typeof].find do |t|
+    try_compile(<<SRC)
+int rbcv_foo;
+#{t}(rbcv_foo) rbcv_bar;
+SRC
+  end
+end
+
 def what_type?(type, member = nil, headers = nil, &b)
   m = "#{type}"
-  name = type
+  var = val = "*rbcv_var_"
+  func = "rbcv_func_(void)"
   if member
     m << "." << member
-    name = "(((#{type} *)0)->#{member})"
+  else
+    type, member = type.split('.', 2)
+  end
+  if member
+    val = "(#{var}).#{member}"
+  end
+  prelude = [cpp_include(headers).split(/^/)]
+  prelude << ["typedef #{type} rbcv_typedef_;\n",
+              "extern rbcv_typedef_ *#{func};\n",
+              "static rbcv_typedef_ #{var};\n",
+             ]
+  type = "rbcv_typedef_"
+  fmt = member && !(typeof = have_typeof?) ? "seems %s" : "%s"
+  if typeof
+    var = "*rbcv_member_"
+    func = "rbcv_mem_func_(void)"
+    member = nil
+    type = "rbcv_mem_typedef_"
+    prelude[-1] << "typedef #{typeof}(#{val}) #{type};\n"
+    prelude[-1] << "extern #{type} *#{func};\n"
+    prelude[-1] << "static #{type} #{var};\n"
+    val = var
   end
-  fmt = "seems %s"
   def fmt.%(x)
     x ? super : "unknown"
   end
   checking_for checking_message(m, headers), fmt do
-    if scalar_ptr_type?(type, member, headers, &b)
-      if try_static_assert("sizeof(*#{name}) == 1", headers)
-        "string"
+    if scalar_ptr_type?(type, member, prelude, &b)
+      if try_static_assert("sizeof(*#{var}) == 1", prelude)
+        return "string"
       end
-    elsif scalar_type?(type, member, headers, &b)
-      if try_static_assert("sizeof(#{name}) > sizeof(long)", headers)
-        "long long"
-      elsif try_static_assert("sizeof(#{name}) > sizeof(int)", headers)
-        "long"
-      elsif try_static_assert("sizeof(#{name}) > sizeof(short)", headers)
-        "int"
-      elsif try_static_assert("sizeof(#{name}) > 1", headers)
-        "short"
-      else
-        "char"
+      ptr = "*"
+    elsif scalar_type?(type, member, prelude, &b)
+      unless member and !typeof or try_static_assert("(#{type})-1 < 0", prelude)
+        unsigned = "unsigned"
       end
+      ptr = ""
+    else
+      next
     end
+    type = UNIVERSAL_INTS.find do |t|
+      pre = prelude
+      unless member
+        pre += [["static #{unsigned} #{t} #{ptr}#{var};\n",
+                 "extern #{unsigned} #{t} #{ptr}*#{func};\n"]]
+      end
+      try_static_assert("sizeof(#{ptr}#{val}) == sizeof(#{unsigned} #{t})", pre)
+    end
+    type or next
+    [unsigned, type, ptr].join(" ").strip
   end
 end
 
+# This method is used internally by the find_executable method.
+#
+# Internal use only.
+#
 def find_executable0(bin, path = nil)
-  ext = config_string('EXEEXT')
+  exts = config_string('EXECUTABLE_EXTS') {|s| s.split} || config_string('EXEEXT') {|s| [s]}
   if File.expand_path(bin) == bin
     return bin if File.executable?(bin)
-    ext and File.executable?(file = bin + ext) and return file
+    if exts
+      exts.each {|ext| File.executable?(file = bin + ext) and return file}
+    end
     return nil
   end
   if path ||= ENV['PATH']
@@ -873,32 +1176,66 @@ def find_executable0(bin, path = nil)
   file = nil
   path.each do |dir|
     return file if File.executable?(file = File.join(dir, bin))
-    return file if ext and File.executable?(file << ext)
+    if exts
+      exts.each {|ext| File.executable?(ext = file + ext) and return ext}
+    end
   end
   nil
 end
 
+# :startdoc:
+
+# Searches for the executable +bin+ on +path+. The default path is your
+# PATH environment variable. If that isn't defined, it will resort to
+# searching /usr/local/bin, /usr/ucb, /usr/bin and /bin.
+#
+# If found, it will return the full path, including the executable name,
+# of where it was found.
+#
+# Note that this method does not actually affect the generated Makefile.
+#
 def find_executable(bin, path = nil)
   checking_for checking_message(bin, path) do
     find_executable0(bin, path)
   end
 end
 
-def arg_config(config, *defaults, &block)
-  $arg_config << [config, *defaults]
-  defaults << nil if !block and defaults.empty?
+# :stopdoc:
+
+def arg_config(config, default=nil, &block)
+  $arg_config << [config, default]
+  defaults = []
+  if default
+    defaults << default
+  elsif !block
+    defaults << nil
+  end
   $configure_args.fetch(config.tr('_', '-'), *defaults, &block)
 end
 
-def with_config(config, *defaults)
+# :startdoc:
+
+# Tests for the presence of a --with-<tt>config</tt> or --without-<tt>config</tt>
+# option. Returns true if the with option is given, false if the without
+# option is given, and the default value otherwise.
+#
+# This can be useful for adding custom definitions, such as debug information.
+#
+# Example:
+#
+#    if with_config("debug")
+#       $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
+#    end
+#
+def with_config(config, default=nil)
   config = config.sub(/^--with[-_]/, '')
   val = arg_config("--with-"+config) do
     if arg_config("--without-"+config)
       false
     elsif block_given?
-      yield(config, *defaults)
+      yield(config, default)
     else
-      break *defaults
+      break default
     end
   end
   case val
@@ -911,26 +1248,64 @@ def with_config(config, *defaults)
   end
 end
 
-def enable_config(config, *defaults)
+# Tests for the presence of an --enable-<tt>config</tt> or
+# --disable-<tt>config</tt> option. Returns true if the enable option is given,
+# false if the disable option is given, and the default value otherwise.
+#
+# This can be useful for adding custom definitions, such as debug information.
+#
+# Example:
+#
+#    if enable_config("debug")
+#       $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
+#    end
+#
+def enable_config(config, default=nil)
   if arg_config("--enable-"+config)
     true
   elsif arg_config("--disable-"+config)
     false
   elsif block_given?
-    yield(config, *defaults)
+    yield(config, default)
   else
-    return *defaults
+    return default
   end
 end
 
+# Generates a header file consisting of the various macro definitions generated
+# by other methods such as have_func and have_header. These are then wrapped in
+# a custom #ifndef based on the +header+ file name, which defaults to
+# 'extconf.h'.
+#
+# For example:
+#
+#    # extconf.rb
+#    require 'mkmf'
+#    have_func('realpath')
+#    have_header('sys/utime.h')
+#    create_header
+#    create_makefile('foo')
+#
+# The above script would generate the following extconf.h file:
+#
+#    #ifndef EXTCONF_H
+#    #define EXTCONF_H
+#    #define HAVE_REALPATH 1
+#    #define HAVE_SYS_UTIME_H 1
+#    #endif
+#
+# Given that the create_header method generates a file based on definitions
+# set earlier in your extconf.rb file, you will probably want to make this
+# one of the last methods you call in your script.
+#
 def create_header(header = "extconf.h")
   message "creating %s\n", header
-  sym = header.tr("a-z./\055", "A-Z___")
+  sym = header.tr_cpp
   hdr = ["#ifndef #{sym}\n#define #{sym}\n"]
   for line in $defs
     case line
     when /^-D([^=]+)(?:=(.*))?/
-      hdr << "#define #$1 #{$2 ? Shellwords.shellwords($2)[0] : 1}\n"
+      hdr << "#define #$1 #{$2 ? Shellwords.shellwords($2)[0].gsub(/(?=\t+)/, "\\\n") : 1}\n"
     when /^-U(.*)/
       hdr << "#undef #$1\n"
     end
@@ -938,7 +1313,7 @@ def create_header(header = "extconf.h")
   hdr << "#endif\n"
   hdr = hdr.join
   unless (IO.read(header) == hdr rescue false)
-    open(header, "w") do |hfile|
+    open(header, "wb") do |hfile|
       hfile.write(hdr)
     end
   end
@@ -967,22 +1342,22 @@ def dir_config(target, idefault=nil, ldefault=nil)
   ldir = with_config(target + "-lib", ldefault)
   $arg_config.last[1] ||= "${#{target}-dir}/lib"
 
-  idirs = idir ? Array === idir ? idir : idir.split(File::PATH_SEPARATOR) : []
+  idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
   if defaults
-    idirs.concat(defaults.collect {|dir| dir + "/include"})
+    idirs.concat(defaults.collect {|d| d + "/include"})
     idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
   end
   unless idirs.empty?
-    idirs.collect! {|dir| "-I" + dir}
+    idirs.collect! {|d| "-I" + d}
     idirs -= Shellwords.shellwords($CPPFLAGS)
     unless idirs.empty?
       $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
     end
   end
 
-  ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
+  ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
   if defaults
-    ldirs.concat(defaults.collect {|dir| dir + "/lib"})
+    ldirs.concat(defaults.collect {|d| d + "/lib"})
     ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
   end
   $LIBPATH = ldirs | $LIBPATH
@@ -990,11 +1365,15 @@ def dir_config(target, idefault=nil, ldefault=nil)
   [idir, ldir]
 end
 
+# :stopdoc:
+
+# Handles meta information about installed libraries. Uses your platform's
+# pkg-config program if it has one.
 def pkg_config(pkg)
   if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
     # iff package specific config command is given
     get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp}
-  elsif ($PKGCONFIG ||= 
+  elsif ($PKGCONFIG ||=
          (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
          find_executable0(pkgconfig) && pkgconfig) and
       system("#{$PKGCONFIG} --exists #{pkg}")
@@ -1027,35 +1406,62 @@ def with_destdir(dir)
   /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
 end
 
+# Converts forward slashes to backslashes. Aimed at MS Windows.
+#
+# Internal use only.
+#
 def winsep(s)
   s.tr('/', '\\')
 end
 
+# Converts native path to format acceptable in Makefile
+#
+# Internal use only.
+#
+if !CROSS_COMPILING
+  case CONFIG['build_os']
+  when 'mingw32'
+    def mkintpath(path)
+      # mingw uses make from msys and it needs special care
+      # converts from C:\some\path to /C/some/path
+      path = path.dup
+      path.tr!('\\', '/')
+      path.sub!(/\A([A-Za-z]):(?=\/)/, '/\1')
+      path
+    end
+  end
+end
+unless defined?(mkintpath)
+  def mkintpath(path)
+    path
+  end
+end
+
 def configuration(srcdir)
   mk = []
-  vpath = %w[$(srcdir) $(topdir) $(hdrdir)]
+  vpath = $VPATH.dup
   if !CROSS_COMPILING
     case CONFIG['build_os']
     when 'cygwin'
       if CONFIG['target_os'] != 'cygwin'
-        vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')}
+        vpath = vpath.map {|p| p.sub(/.*/, '$(shell cygpath -u \&)')}
       end
-    when 'msdosdjgpp', 'mingw32'
-      CONFIG['PATH_SEPARATOR'] = ';'
     end
   end
+  CONFIG["hdrdir"] ||= $hdrdir
   mk << %{
 SHELL = /bin/sh
 
 #### Start of system configuration section. ####
-
-srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
-topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
-hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}
+#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
+srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2])}.quote}
+topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).quote}
+hdrdir = #{mkintpath(CONFIG["hdrdir"]).quote}
+arch_hdrdir = #{$arch_hdrdir}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
   if $extmk
-    mk << "RUBYLIB = -\nRUBYOPT = -rpurelib.rb\n"
+    mk << "RUBYLIB = -\nRUBYOPT = -r$(top_srcdir)/ext/purelib.rb\n"
   end
   if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
     mk << "\nDESTDIR = #{destdir}\n"
@@ -1066,7 +1472,8 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
   end
   CONFIG.each do |key, var|
     next if /^abs_/ =~ key
-    next unless /^(?:src|top|hdr|(.*))dir$/ =~ key and $1
+    next if /^(?:src|top|hdr)dir$/ =~ key
+    next unless /dir$/ =~ key
     mk << "#{key} = #{with_destdir(var)}\n"
   end
   if !$extmk and !$configure_args.has_key?('--ruby') and
@@ -1075,42 +1482,58 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
   else
     sep = ""
   end
-  extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ")<<" "
+  possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
+  extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
   mk << %{
 CC = #{CONFIG['CC']}
+CXX = #{CONFIG['CXX']}
 LIBRUBY = #{CONFIG['LIBRUBY']}
 LIBRUBY_A = #{CONFIG['LIBRUBY_A']}
 LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED
 LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
+empty =
+OUTFLAG = #{OUTFLAG}$(empty)
+COUTFLAG = #{COUTFLAG}$(empty)
 
 RUBY_EXTCONF_H = #{$extconf_h}
+cflags   = #{CONFIG['cflags']}
+optflags = #{CONFIG['optflags']}
+debugflags = #{CONFIG['debugflags']}
+warnflags = #{CONFIG['warnflags']}
 CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
 INCFLAGS = -I. #$INCFLAGS
 DEFS     = #{CONFIG['DEFS']}
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
 CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
-DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG
+ldflags  = #{$LDFLAGS}
+dldflags = #{$DLDFLAGS}
+ARCH_FLAG = #{$ARCH_FLAG}
+DLDFLAGS = $(ldflags) $(dldflags)
 LDSHARED = #{CONFIG['LDSHARED']}
+LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
 AR = #{CONFIG['AR']}
 EXEEXT = #{CONFIG['EXEEXT']}
 
+RUBY_BASE_NAME = #{CONFIG['RUBY_BASE_NAME']}
 RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}
 RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
 arch = #{CONFIG['arch']}
 sitearch = #{CONFIG['sitearch']}
-ruby_version = #{Config::CONFIG['ruby_version']}
+ruby_version = #{RbConfig::CONFIG['ruby_version']}
 ruby = #{$ruby}
 RUBY = $(ruby#{sep})
-RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
-MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'}
-INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'}
+RM = #{config_string('RM', &possible_command) || '$(RUBY) -run -e rm -- -f'}
+RM_RF = #{'$(RUBY) -run -e rm -- -rf'}
+RMDIRS = #{config_string('RMDIRS', &possible_command) || '$(RUBY) -run -e rmdir -- -p'}
+MAKEDIRS = #{config_string('MAKEDIRS', &possible_command) || '@$(RUBY) -run -e mkdir -- -p'}
+INSTALL = #{config_string('INSTALL', &possible_command) || '@$(RUBY) -run -e install -- -vp'}
 INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'}
 INSTALL_DATA = #{config_string('INSTALL_DATA') || '$(INSTALL) -m 0644'}
-COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
+COPY = #{config_string('CP', &possible_command) || '@$(RUBY) -run -e cp -- -v'}
 
 #### End of system configuration section. ####
 
-preload = #{$preload ? $preload.join(' ') : ''}
+preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
 }
   if $nmake == ?b
     mk.each do |x|
@@ -1123,6 +1546,7 @@ preload = #{$preload ? $preload.join(' ') : ''}
   end
   mk
 end
+# :startdoc:
 
 def dummy_makefile(srcdir)
   configuration(srcdir) << <<RULES << CLEANINGS
@@ -1130,10 +1554,68 @@ CLEANFILES = #{$cleanfiles.join(' ')}
 DISTCLEANFILES = #{$distcleanfiles.join(' ')}
 
 all install static install-so install-rb: Makefile
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
 
 RULES
 end
 
+def depend_rules(depend)
+  suffixes = []
+  depout = []
+  cont = implicit = nil
+  impconv = proc do
+    COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
+    implicit = nil
+  end
+  ruleconv = proc do |line|
+    if implicit
+      if /\A\t/ =~ line
+        implicit[1] << line
+        next
+      else
+        impconv[]
+      end
+    end
+    if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
+      suffixes << m[1] << m[2]
+      implicit = [[m[1], m[2]], [m.post_match]]
+      next
+    elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
+      line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
+    end
+    depout << line
+  end
+  depend.each_line do |line|
+    line.gsub!(/\.o\b/, ".#{$OBJEXT}")
+    line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h)
+    line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))(?=[-\w]+\.h)", '\&ruby/')
+    if $nmake && /\A\s*\$\(RM|COPY\)/ =~ line
+      line.gsub!(%r"[-\w\./]{2,}"){$&.tr("/", "\\")}
+      line.gsub!(/(\$\((?!RM|COPY)[^:)]+)(?=\))/, '\1:/=\\')
+    end
+    if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
+      (cont ||= []) << line
+      next
+    elsif cont
+      line = (cont << line).join
+      cont = nil
+    end
+    ruleconv.call(line)
+  end
+  if cont
+    ruleconv.call(cont.join)
+  elsif implicit
+    impconv.call
+  end
+  unless suffixes.empty?
+    depout.unshift(".SUFFIXES: ." + suffixes.uniq.join(" .") + "\n\n")
+  end
+  depout.unshift("$(OBJS): $(RUBY_EXTCONF_H)\n\n") if $extconf_h
+  depout.flatten!
+  depout
+end
+
 # Generates the Makefile for your extension, passing along any options and
 # preprocessor constants that you may have generated through other methods.
 #
@@ -1151,6 +1633,41 @@ end
 # load the file within a Ruby program later, that directory structure will
 # have to be followed, e.g. "require 'test/foo'".
 #
+# The +srcprefix+ should be used when your source files are not in the same
+# directory as your build script. This will not only eliminate the need for
+# you to manually copy the source files into the same directory as your build
+# script, but it also sets the proper +target_prefix+ in the generated
+# Makefile.
+#
+# Setting the +target_prefix+ will, in turn, install the generated binary in
+# a directory under your RbConfig::CONFIG['sitearchdir'] that mimics your local
+# filesystem when you run 'make install'.
+#
+# For example, given the following file tree:
+#
+#    ext/
+#       extconf.rb
+#       test/
+#          foo.c
+#
+# And given the following code:
+#
+#    create_makefile('test/foo', 'test')
+#
+# That will set the +target_prefix+ in the generated Makefile to 'test'. That,
+# in turn, will create the following file tree when installed via the
+# 'make install' command:
+#
+#    /path/to/ruby/sitearchdir/test/foo.so
+#
+# It is recommended that you use this approach to generate your makefiles,
+# instead of copying files around manually, because some third party
+# libraries may depend on the +target_prefix+ being set properly.
+#
+# The +srcprefix+ argument can be used to override the default source
+# directory, i.e. the current directory . It is included as part of the VPATH
+# and added to the list of INCFLAGS.
+#
 def create_makefile(target, srcprefix = nil)
   $target = target
   libpath = $DEFLIBPATH|$LIBPATH
@@ -1170,50 +1687,62 @@ def create_makefile(target, srcprefix = nil)
     target_prefix = ""
   end
 
-  srcprefix ||= '$(srcdir)'
-  Config::expand(srcdir = srcprefix.dup)
+  srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
+  RbConfig.expand(srcdir = srcprefix.dup)
 
+  ext = ".#{$OBJEXT}"
   if not $objs
-    $objs = []
-    srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-    for f in srcs
-      obj = File.basename(f, ".*") << ".o"
-      $objs.push(obj) unless $objs.index(obj)
+    srcs = $srcs || Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
+    objs = srcs.inject(Hash.new {[]}) {|h, f| h[File.basename(f, ".*") << ext] <<= f; h}
+    $objs = objs.keys
+    unless objs.delete_if {|b, f| f.size == 1}.empty?
+      dups = objs.sort.map {|b, f|
+        "#{b[/.*\./]}{#{f.collect {|n| n[/([^.]+)\z/]}.join(',')}}"
+      }
+      abort "source files duplication - #{dups.join(", ")}"
     end
-  elsif !(srcs = $srcs)
-    srcs = $objs.collect {|obj| obj.sub(/\.o\z/, '.c')}
+  else
+    $objs.collect! {|o| File.basename(o, ".*") << ext} unless $OBJEXT == "o"
+    srcs = $srcs || $objs.collect {|o| o.chomp(ext) << ".c"}
   end
   $srcs = srcs
-  for i in $objs
-    i.sub!(/\.o\z/, ".#{$OBJEXT}")
-  end
-  $objs = $objs.join(" ")
 
-  target = nil if $objs == ""
+  target = nil if $objs.empty?
 
   if target and EXPORT_PREFIX
     if File.exist?(File.join(srcdir, target + '.def'))
       deffile = "$(srcdir)/$(TARGET).def"
       unless EXPORT_PREFIX.empty?
-        makedef = %{-pe "sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
+        makedef = %{-pe "$_.sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
       end
     else
       makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}Init_$(TARGET)'"}
     end
     if makedef
-      $distcleanfiles << '$(DEFFILE)'
+      $cleanfiles << '$(DEFFILE)'
       origdef = deffile
       deffile = "$(TARGET)-$(arch).def"
     end
   end
   origdef ||= ''
 
+  if $extout and $INSTALLFILES
+    $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.sub(/\A\.\//, ''))})
+    $distcleandirs.concat($INSTALLFILES.collect {|files, dir| dir})
+  end
+
+  if $extmk and not $extconf_h
+    create_header
+  end
+
   libpath = libpathflag(libpath)
 
   dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
   staticlib = target ? "$(TARGET).#$LIBEXT" : ""
   mfile = open("Makefile", "wb")
-  mfile.print configuration(srcprefix)
+  conf = configuration(srcprefix)
+  conf = yield(conf) if block_given?
+  mfile.puts(conf)
   mfile.print "
 libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
 LIBPATH = #{libpath}
@@ -1221,55 +1750,68 @@ DEFFILE = #{deffile}
 
 CLEANFILES = #{$cleanfiles.join(' ')}
 DISTCLEANFILES = #{$distcleanfiles.join(' ')}
+DISTCLEANDIRS = #{$distcleandirs.join(' ')}
 
-extout = #{$extout}
+extout = #{$extout && $extout.quote}
 extout_prefix = #{$extout_prefix}
 target_prefix = #{target_prefix}
 LOCAL_LIBS = #{$LOCAL_LIBS}
 LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
 SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
-OBJS = #{$objs}
+OBJS = #{$objs.join(" ")}
 TARGET = #{target}
 DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
 #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
-"
+" #"
+  # TODO: fixme
   install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
-  n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET).'
+  n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET)'
   mfile.print "
 TARGET_SO     = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB)
-CLEANLIBS     = #{n}#{CONFIG['DLEXT']} #{n}il? #{n}tds #{n}map
-CLEANOBJS     = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.exp *.bak
+CLEANLIBS     = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
+CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak
 
-all:		#{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
-static:		$(STATIC_LIB)#{$extout ? " install-rb" : ""}
+all:    #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
+static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
 "
   mfile.print CLEANINGS
+  fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"}
+  if fsep
+    sep = ":/=#{fsep}"
+    fseprepl = proc {|s|
+      s = s.gsub("/", fsep)
+      s = s.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
+      s = s.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
+    }
+  else
+    fseprepl = proc {|s| s}
+    sep = ""
+  end
   dirs = []
   mfile.print "install: install-so install-rb\n\n"
   sodir = (dir = "$(RUBYARCHDIR)").dup
-  mfile.print("install-so: #{dir}\n")
+  mfile.print("install-so: ")
   if target
     f = "$(DLLIB)"
     dest = "#{dir}/#{f}"
-    mfile.print "install-so: #{dest}\n"
-    unless $extout
-      mfile.print "#{dest}: #{f}\n"
-      if (sep = config_string('BUILD_FILE_SEPARATOR'))
-        f.gsub!("/", sep)
-        dir.gsub!("/", sep)
-        sep = ":/="+sep
-        f.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
-        f.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
-        dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
-        dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
-      end
-      mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
+    mfile.puts dir, "install-so: #{dest}"
+    if $extout
+      mfile.print "clean-so::\n"
+      mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
+      mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}\n"
+    else
+      mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n"
+      mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n"
       if defined?($installed_list)
 	mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
       end
     end
+  else
+    mfile.puts "Makefile"
   end
   mfile.print("install-rb: pre-install-rb install-rb-default\n")
   mfile.print("install-rb-default: pre-install-rb-default\n")
@@ -1282,28 +1824,32 @@ static:		$(STATIC_LIB)#{$extout ? " install-rb" : ""}
 	dirs << dir
 	mfile.print "pre-install-rb#{sfx}: #{dir}\n"
       end
-      files.each do |f|
+      for f in files
 	dest = "#{dir}/#{File.basename(f)}"
 	mfile.print("install-rb#{sfx}: #{dest}\n")
-	mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
-	sep = config_string('BUILD_FILE_SEPARATOR')
-	if sep
-	  f = f.gsub("/", sep)
-	  sep = ":/="+sep
-	  f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
-	  f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
-	else
-	  sep = ""
-	end
-	mfile.print("#{f} $(@D#{sep})\n")
+	mfile.print("#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n")
+	mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
 	if defined?($installed_list) and !$extout
 	  mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
 	end
+        if $extout
+          mfile.print("clean-rb#{sfx}::\n")
+          mfile.print("\t@-$(RM) #{fseprepl[dest]}\n")
+        end
+      end
+    end
+    if $extout
+      dirs.uniq!
+      unless dirs.empty?
+        mfile.print("clean-rb#{sfx}::\n")
+        for dir in dirs.sort_by {|d| -d.count('/')}
+          mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}\n")
+        end
       end
     end
   end
   dirs.unshift(sodir) if target and !dirs.include?(sodir)
-  dirs.each {|dir| mfile.print "#{dir}:\n\t$(MAKEDIRS) $@\n"}
+  dirs.each {|d| mfile.print "#{d}:\n\t$(MAKEDIRS) $@\n"}
 
   mfile.print <<-SITEINSTALL
 
@@ -1315,31 +1861,36 @@ site-install-rb: install-rb
 
   return unless target
 
-  mfile.puts SRC_EXT.collect {|ext| ".path.#{ext} = $(VPATH)"} if $nmake == ?b
+  mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b
   mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
   mfile.print "\n"
 
-  CXX_EXT.each do |ext|
+  CXX_EXT.each do |e|
     COMPILE_RULES.each do |rule|
-      mfile.printf(rule, ext, $OBJEXT)
+      mfile.printf(rule, e, $OBJEXT)
       mfile.printf("\n\t%s\n\n", COMPILE_CXX)
     end
   end
-  %w[c].each do |ext|
+  %w[c].each do |e|
     COMPILE_RULES.each do |rule|
-      mfile.printf(rule, ext, $OBJEXT)
+      mfile.printf(rule, e, $OBJEXT)
       mfile.printf("\n\t%s\n\n", COMPILE_C)
     end
   end
 
   mfile.print "$(RUBYARCHDIR)/" if $extout
-  mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n"
-  mfile.print "\t@-$(RM) $@\n"
+  mfile.print "$(DLLIB): "
+  mfile.print "$(DEFFILE) " if makedef
+  mfile.print "$(OBJS) Makefile\n"
+  mfile.print "\t@-$(RM) $(@#{sep})\n"
   mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout
   link_so = LINK_SO.gsub(/^/, "\t")
+  if srcs.any?(&%r"\.(?:#{CXX_EXT.join('|')})\z".method(:===))
+    link_so = link_so.sub(/\bLDSHARED\b/, '\&XX')
+  end
   mfile.print link_so, "\n\n"
   unless $static.nil?
-    mfile.print "$(STATIC_LIB): $(OBJS)\n\t"
+    mfile.print "$(STATIC_LIB): $(OBJS)\n\t@-$(RM) $(@#{sep})\n\t"
     mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
     config_string('RANLIB') do |ranlib|
       mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
@@ -1353,63 +1904,14 @@ site-install-rb: install-rb
 
   depend = File.join(srcdir, "depend")
   if File.exist?(depend)
-    suffixes = []
-    depout = []
-    open(depend, "r") do |dfile|
-      mfile.printf "###\n"
-      cont = implicit = nil
-      impconv = proc do
-	COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
-	implicit = nil
-      end
-      ruleconv = proc do |line|
-	if implicit
-	  if /\A\t/ =~ line
-	    implicit[1] << line
-	    next
-	  else
-	    impconv[]
-	  end
-	end
-	if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
-	  suffixes << m[1] << m[2]
-	  implicit = [[m[1], m[2]], [m.post_match]]
-	  next
-	elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
-	  line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
-	end
-	depout << line
-      end
-      while line = dfile.gets()
-	line.gsub!(/\.o\b/, ".#{$OBJEXT}")
-	line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h
-	if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
-	  (cont ||= []) << line
-	  next
-	elsif cont
-	  line = (cont << line).join
-	  cont = nil
-	end
-	ruleconv.call(line)
-      end
-      if cont
-	ruleconv.call(cont.join)
-      elsif implicit
-	impconv.call
-      end
-    end
-    unless suffixes.empty?
-      mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n"
-    end
-    mfile.print "$(OBJS): $(RUBY_EXTCONF_H)\n\n" if $extconf_h
-    mfile.print depout
+    mfile.print("###\n", *depend_rules(File.read(depend)))
   else
-    headers = %w[ruby.h defines.h]
+    headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
     if RULE_SUBST
-      headers.each {|h| h.sub!(/.*/) {|*m| RULE_SUBST % m}}
+      headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
     end
-    headers << $config_h if $config_h
-    headers << "$(RUBY_EXTCONF_H)" if $extconf_h
+    headers << $config_h
+    headers << '$(RUBY_EXTCONF_H)' if $extconf_h
     mfile.print "$(OBJS): ", headers.join(' '), "\n"
   end
 
@@ -1418,6 +1920,8 @@ ensure
   mfile.close if mfile
 end
 
+# :stopdoc:
+
 def init_mkmf(config = CONFIG)
   $makefile_created = false
   $arg_config = []
@@ -1428,7 +1932,9 @@ def init_mkmf(config = CONFIG)
   $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
   $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
   $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
-  $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)"
+  $INCFLAGS = "-I$(arch_hdrdir)"
+  $INCFLAGS << " -I$(hdrdir)/ruby/backward" unless $extmk
+  $INCFLAGS << " -I$(hdrdir) -I$(srcdir)"
   $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup
@@ -1436,15 +1942,17 @@ def init_mkmf(config = CONFIG)
   $LIBRUBYARG = ""
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
-  $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
+  $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"]
   $DEFLIBPATH.unshift(".")
   $LIBPATH = []
-  $INSTALLFILES = nil
+  $INSTALLFILES = []
+  $NONINSTALLFILES = [/~\z/, /\A#.*#\z/, /\A\.#/, /\.bak\z/i, /\.orig\z/, /\.rej\z/, /\.l[ao]\z/, /\.o\z/]
+  $VPATH = %w[$(srcdir) $(arch_hdrdir)/ruby $(hdrdir)/ruby]
 
   $objs = nil
   $srcs = nil
   $libs = ""
-  if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
+  if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup)
     $LIBRUBYARG = config['LIBRUBYARG']
   end
 
@@ -1453,6 +1961,7 @@ def init_mkmf(config = CONFIG)
   $cleanfiles = config_string('CLEANFILES') {|s| Shellwords.shellwords(s)} || []
   $cleanfiles << "mkmf.log"
   $distcleanfiles = config_string('DISTCLEANFILES') {|s| Shellwords.shellwords(s)} || []
+  $distcleandirs = config_string('DISTCLEANDIRS') {|s| Shellwords.shellwords(s)} || []
 
   $extout ||= nil
   $extout_prefix ||= nil
@@ -1469,6 +1978,11 @@ details.  You may need configuration options.
 Provided configuration options:
 MESSAGE
 
+# Returns whether or not the Makefile was successfully generated. If not,
+# the script will abort with an error message.
+#
+# Internal use only.
+#
 def mkmf_failed(path)
   unless $makefile_created or File.exist?("Makefile")
     opts = $arg_config.collect {|t, n| "\t#{t}#{n ? "=#{n}" : ""}\n"}
@@ -1476,6 +1990,8 @@ def mkmf_failed(path)
   end
 end
 
+# :startdoc:
+
 init_mkmf
 
 $make = with_config("make-prog", ENV["MAKE"] || "make")
@@ -1488,41 +2004,41 @@ when $bccwin
   $nmake = ?b if /Borland/i =~ `#{make} -h`
 end
 
-Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
+RbConfig::CONFIG["srcdir"] = CONFIG["srcdir"] =
   $srcdir = arg_config("--srcdir", File.dirname($0))
 $configure_args["--topsrcdir"] ||= $srcdir
 if $curdir = arg_config("--curdir")
-  Config.expand(curdir = $curdir.dup)
+  RbConfig.expand(curdir = $curdir.dup)
 else
   curdir = $curdir = "."
 end
-unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
+unless File.expand_path(RbConfig::CONFIG["topdir"]) == File.expand_path(curdir)
   CONFIG["topdir"] = $curdir
-  Config::CONFIG["topdir"] = curdir
+  RbConfig::CONFIG["topdir"] = curdir
 end
 $configure_args["--topdir"] ||= $curdir
-$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"]))
+$ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
 
 split = Shellwords.method(:shellwords).to_proc
 
 EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
 
-hdr = []
+hdr = ['#include "ruby.h"' "\n"]
 config_string('COMMON_MACROS') do |s|
   Shellwords.shellwords(s).each do |w|
     hdr << "#define " + w.split(/=/, 2).join(" ")
   end
 end
 config_string('COMMON_HEADERS') do |s|
-  Shellwords.shellwords(s).each {|s| hdr << "#include <#{s}>"}
+  Shellwords.shellwords(s).each {|w| hdr << "#include <#{w}>"}
 end
 COMMON_HEADERS = hdr.join("\n")
 COMMON_LIBS = config_string('COMMON_LIBS', &split) || []
 
 COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
 RULE_SUBST = config_string('RULE_SUBST')
-COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<'
-COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<'
+COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
+COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
 TRY_LINK = config_string('TRY_LINK') ||
   "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
   "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
@@ -1536,17 +2052,27 @@ LINK_SO = config_string('LINK_SO') ||
 LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
 RPATHFLAG = config_string('RPATHFLAG') || ''
 LIBARG = config_string('LIBARG') || '-l%s'
+MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main() {return 0;}'
+UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)} ||
+  %w[int short long long\ long]
 
-sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
+sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
 CLEANINGS = "
-clean:
-		@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
-
-realclean:	distclean
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
+\t\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
+\t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+\t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
+\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})
+
+realclean: distclean
 "
 
 if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 4c146c8086..d4bfb670b2 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -12,11 +12,11 @@ You can freely distribute/modify this library.
 This is a simple example.
 
   require 'monitor.rb'
-  
+
   buf = []
   buf.extend(MonitorMixin)
   empty_cond = buf.new_cond
-  
+
   # consumer
   Thread.start do
     loop do
@@ -26,7 +26,7 @@ This is a simple example.
       end
     end
   end
-  
+
   # producer
   while line = ARGF.gets
     buf.synchronize do
@@ -41,18 +41,19 @@ reads a line from ARGF and push it to buf, then call
 empty_cond.signal.
 
 =end
-  
+
+require 'thread'
 
 #
 # Adds monitor functionality to an arbitrary object by mixing the module with
 # +include+.  For example:
 #
-#    require 'monitor.rb'
-#    
+#    require 'monitor'
+#
 #    buf = []
 #    buf.extend(MonitorMixin)
 #    empty_cond = buf.new_cond
-#    
+#
 #    # consumer
 #    Thread.start do
 #      loop do
@@ -62,7 +63,7 @@ empty_cond.signal.
 #        end
 #      end
 #    end
-#    
+#
 #    # producer
 #    while line = ARGF.gets
 #      buf.synchronize do
@@ -70,7 +71,7 @@ empty_cond.signal.
 #        empty_cond.signal
 #      end
 #    end
-# 
+#
 # The consumer thread waits for the producer thread to push a line
 # to buf while buf.empty?, and the producer thread (main thread)
 # reads a line from ARGF and push it to buf, then call
@@ -85,123 +86,83 @@ module MonitorMixin
   #
   class ConditionVariable
     class Timeout < Exception; end
-    
-    # Create a new timer with the argument timeout, and add the
-    # current thread to the list of waiters.  Then the thread is
-    # stopped.  It will be resumed when a corresponding #signal 
-    # occurs.
-    def wait(timeout = nil)
-      @monitor.instance_eval {mon_check_owner()}
-      timer = create_timer(timeout)
-      
-      Thread.critical = true
-      count = @monitor.instance_eval {mon_exit_for_cond()}
-      @waiters.push(Thread.current)
 
+    #
+    # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
+    #
+    # If +timeout+ is given, this method returns after +timeout+ seconds passed,
+    # even if no other thread doesn't signal.
+    #
+    def wait(timeout = nil)
+      @monitor.__send__(:mon_check_owner)
+      count = @monitor.__send__(:mon_exit_for_cond)
       begin
-	Thread.stop
+        @cond.wait(@monitor.instance_variable_get("@mon_mutex"), timeout)
         return true
-      rescue Timeout
-        return false
       ensure
-	Thread.critical = true
-	begin
-	  if timer && timer.alive?
-	    Thread.kill(timer)
-	  end
-	  if @waiters.include?(Thread.current)  # interrupted?
-	    @waiters.delete(Thread.current)
-	  end
-	  @monitor.instance_eval {mon_enter_for_cond(count)}
-	ensure
-	  Thread.critical = false
-	end
+        @monitor.__send__(:mon_enter_for_cond, count)
       end
     end
-    
 
-    # call #wait while the supplied block returns +true+.
+    #
+    # Calls wait repeatedly while the given block yields a truthy value.
+    #
     def wait_while
       while yield
 	wait
       end
     end
-    
-    # call #wait until the supplied block returns +true+.
+
+    #
+    # Calls wait repeatedly until the given block yields a truthy value.
+    #
     def wait_until
       until yield
 	wait
       end
     end
-    
-    # Wake up and run the next waiter
+
+    #
+    # Wakes up the first thread in line waiting for this lock.
+    #
     def signal
-      @monitor.instance_eval {mon_check_owner()}
-      Thread.critical = true
-      t = @waiters.shift
-      t.wakeup if t
-      Thread.critical = false
-      Thread.pass
+      @monitor.__send__(:mon_check_owner)
+      @cond.signal
     end
-    
-    # Wake up all the waiters.
+
+    #
+    # Wakes up all threads waiting for this lock.
+    #
     def broadcast
-      @monitor.instance_eval {mon_check_owner()}
-      Thread.critical = true
-      for t in @waiters
-	t.wakeup
-      end
-      @waiters.clear
-      Thread.critical = false
-      Thread.pass
-    end
-    
-    def count_waiters
-      return @waiters.length
+      @monitor.__send__(:mon_check_owner)
+      @cond.broadcast
     end
-    
+
     private
 
     def initialize(monitor)
       @monitor = monitor
-      @waiters = []
-    end
-
-    def create_timer(timeout)
-      if timeout
-	waiter = Thread.current
-	return Thread.start {
-	  Thread.pass
-	  sleep(timeout)
-	  Thread.critical = true
-	  waiter.raise(Timeout.new)
-	}
-      else
-        return nil
-      end
+      @cond = ::ConditionVariable.new
     end
   end
-  
+
   def self.extend_object(obj)
     super(obj)
-    obj.instance_eval {mon_initialize()}
+    obj.__send__(:mon_initialize)
   end
-  
+
   #
   # Attempts to enter exclusive section.  Returns +false+ if lock fails.
   #
   def mon_try_enter
-    result = false
-    Thread.critical = true
-    if @mon_owner.nil?
+    if @mon_owner != Thread.current
+      unless @mon_mutex.try_lock
+        return false
+      end
       @mon_owner = Thread.current
     end
-    if @mon_owner == Thread.current
-      @mon_count += 1
-      result = true
-    end
-    Thread.critical = false
-    return result
+    @mon_count += 1
+    return true
   end
   # For backward compatibility
   alias try_mon_enter mon_try_enter
@@ -210,25 +171,23 @@ module MonitorMixin
   # Enters exclusive section.
   #
   def mon_enter
-    Thread.critical = true
-    mon_acquire(@mon_entering_queue)
+    if @mon_owner != Thread.current
+      @mon_mutex.lock
+      @mon_owner = Thread.current
+    end
     @mon_count += 1
-  ensure
-    Thread.critical = false
   end
-  
+
   #
   # Leaves exclusive section.
   #
   def mon_exit
     mon_check_owner
-    Thread.critical = true
-    @mon_count -= 1
+    @mon_count -=1
     if @mon_count == 0
-      mon_release
+      @mon_owner = nil
+      @mon_mutex.unlock
     end
-    Thread.critical = false
-    Thread.pass
   end
 
   #
@@ -245,12 +204,10 @@ module MonitorMixin
     end
   end
   alias synchronize mon_synchronize
-  
+
   #
-  # FIXME: This isn't documented in Nutshell.
-  # 
-  # Create a new condition variable for this monitor.
-  # This facilitates control of the monitor with #signal and #wait.
+  # Creates a new MonitorMixin::ConditionVariable associated with the
+  # receiver.
   #
   def new_cond
     return ConditionVariable.new(self)
@@ -263,63 +220,31 @@ module MonitorMixin
     mon_initialize
   end
 
-  # called by initialize method to set defaults for instance variables.
   def mon_initialize
     @mon_owner = nil
     @mon_count = 0
-    @mon_entering_queue = []
-    @mon_waiting_queue = []
+    @mon_mutex = Mutex.new
   end
 
-  # Throw a ThreadError exception if the current thread
-  # does't own the monitor
   def mon_check_owner
     if @mon_owner != Thread.current
       raise ThreadError, "current thread not owner"
     end
   end
 
-  def mon_acquire(queue)
-    while @mon_owner && @mon_owner != Thread.current
-      queue.push(Thread.current)
-      Thread.stop
-      Thread.critical = true
-    end
-    @mon_owner = Thread.current
-  end
-
-  def mon_release
-    @mon_owner = nil
-    t = @mon_waiting_queue.shift
-    t = @mon_entering_queue.shift unless t
-    t.wakeup if t
-  end
-
   def mon_enter_for_cond(count)
-    mon_acquire(@mon_waiting_queue)
+    @mon_owner = Thread.current
     @mon_count = count
   end
 
   def mon_exit_for_cond
     count = @mon_count
+    @mon_owner = nil
     @mon_count = 0
     return count
-  ensure
-    mon_release
   end
 end
 
-# Monitors provide means of mutual exclusion for Thread programming.
-# A critical region is created by means of the synchronize method,
-# which takes a block.
-# The condition variables (created with #new_cond) may be used 
-# to control the execution of a monitor with #signal and #wait.
-#
-# the Monitor class wraps MonitorMixin, and provides aliases
-#  alias try_enter try_mon_enter
-#  alias enter mon_enter
-#  alias exit mon_exit
-# to access its methods more concisely.
 class Monitor
   include MonitorMixin
   alias try_enter try_mon_enter
diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
index 8e0d42bc8d..081bb788e4 100644
--- a/lib/mutex_m.rb
+++ b/lib/mutex_m.rb
@@ -1,32 +1,29 @@
-#--
-#   mutex_m.rb - 
+#
+#   mutex_m.rb -
 #   	$Release Version: 3.0$
 #   	$Revision: 1.7 $
-#   	$Date: 1998/02/27 04:28:57 $
 #       Original from mutex.rb
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #       modified by matz
 #       patched by akira yamada
-#++
-#
-# == Usage
-#
-# Extend an object and use it like a Mutex object:
 #
-#   require "mutex_m.rb"
-#   obj = Object.new
-#   obj.extend Mutex_m
-#   # ...
+# --
+#   Usage:
+#	require "mutex_m.rb"
+#	obj = Object.new
+#	obj.extend Mutex_m
+#	...
+#	extended object can be handled like Mutex
+#       or
+#	class Foo
+#	  include Mutex_m
+#	  ...
+#	end
+#	obj = Foo.new
+#	this obj can be handled like Mutex
 #
-# Or, include Mutex_m in a class to have its instances behave like a Mutex
-# object:
-#
-#   class Foo
-#     include Mutex_m
-#     # ...
-#   end
-#   
-#   obj = Foo.new
+
+require 'thread'
 
 module Mutex_m
   def Mutex_m.define_aliases(cl)
@@ -37,13 +34,13 @@ module Mutex_m
       alias try_lock mu_try_lock
       alias synchronize mu_synchronize
     }
-  end  
+  end
 
   def Mutex_m.append_features(cl)
     super
     define_aliases(cl) unless cl.instance_of?(Module)
   end
-  
+
   def Mutex_m.extend_object(obj)
     super
     obj.mu_extended
@@ -55,64 +52,36 @@ module Mutex_m
 	    defined? unlock and
 	    defined? try_lock and
 	    defined? synchronize)
-      Mutex_m.define_aliases(class<<self;self;end)
+      Mutex_m.define_aliases(singleton_class)
     end
     mu_initialize
   end
-  
-  # locking 
-  def mu_synchronize
-    begin
-      mu_lock
-      yield
-    ensure
-      mu_unlock
-    end
+
+  # locking
+  def mu_synchronize(&block)
+    @_mutex.synchronize(&block)
   end
-  
+
   def mu_locked?
-    @mu_locked
+    @_mutex.locked?
   end
-  
+
   def mu_try_lock
-    result = false
-    Thread.critical = true
-    unless @mu_locked
-      @mu_locked = true
-      result = true
-    end
-    Thread.critical = false
-    result
+    @_mutex.try_lock
   end
-  
+
   def mu_lock
-    while (Thread.critical = true; @mu_locked)
-      @mu_waiting.push Thread.current
-      Thread.stop
-    end
-    @mu_locked = true
-    Thread.critical = false
-    self
+    @_mutex.lock
   end
-  
+
   def mu_unlock
-    return unless @mu_locked
-    Thread.critical = true
-    wait = @mu_waiting
-    @mu_waiting = []
-    @mu_locked = false
-    Thread.critical = false
-    for w in wait
-      w.run
-    end
-    self
+    @_mutex.unlock
   end
-  
+
   private
-  
+
   def mu_initialize
-    @mu_waiting = []
-    @mu_locked = false;
+    @_mutex = Mutex.new
   end
 
   def initialize(*args)
diff --git a/lib/net/.document b/lib/net/.document
new file mode 100644
index 0000000000..6332bb9e7e
--- /dev/null
+++ b/lib/net/.document
@@ -0,0 +1,8 @@
+ftp.rb
+http.rb
+https.rb
+imap.rb
+pop.rb
+smtp.rb
+smtps.rb
+telnet.rb
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index dfbcf1499f..f393a15bff 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -1,11 +1,11 @@
-# 
+#
 # = net/ftp.rb - FTP Client Library
-# 
+#
 # Written by Shugo Maeda <shugo@ruby-lang.org>.
 #
 # Documentation by Gavin Sinclair, sourced from "Programming Ruby" (Hunt/Thomas)
 # and "Ruby In a Nutshell" (Matsumoto), used with permission.
-# 
+#
 # This library is distributed under the terms of the Ruby license.
 # You can freely distribute/modify this library.
 #
@@ -22,9 +22,10 @@ module Net
   # :stopdoc:
   class FTPError < StandardError; end
   class FTPReplyError < FTPError; end
-  class FTPTempError < FTPError; end 
-  class FTPPermError < FTPError; end 
+  class FTPTempError < FTPError; end
+  class FTPPermError < FTPError; end
   class FTPProtoError < FTPError; end
+  class FTPConnectionError < FTPError; end
   # :startdoc:
 
   #
@@ -34,11 +35,11 @@ module Net
   # advantage of Ruby's style and strengths.
   #
   # == Example
-  # 
+  #
   #   require 'net/ftp'
   #
   # === Example 1
-  #  
+  #
   #   ftp = Net::FTP.new('ftp.netlab.co.jp')
   #   ftp.login
   #   files = ftp.chdir('pub/lang/ruby/contrib')
@@ -71,15 +72,15 @@ module Net
   #
   class FTP
     include MonitorMixin
-    
+
     # :stopdoc:
     FTP_PORT = 21
     CRLF = "\r\n"
     DEFAULT_BLOCKSIZE = 4096
     # :startdoc:
-    
+
     # When +true+, transfers are performed in binary mode.  Default: +true+.
-    attr_accessor :binary
+    attr_reader :binary
 
     # When +true+, the connection is in passive mode.  Default: +false+.
     attr_accessor :passive
@@ -101,7 +102,7 @@ module Net
 
     # The server's last response.
     attr_reader :last_response
-    
+
     #
     # A synonym for <tt>FTP.new</tt>, but with a mandatory host parameter.
     #
@@ -120,7 +121,7 @@ module Net
         new(host, user, passwd, acct)
       end
     end
-    
+
     #
     # Creates and returns a new +FTP+ object. If a +host+ is given, a connection
     # is made. Additionally, if the +user+ is given, the given user name,
@@ -132,6 +133,8 @@ module Net
       @passive = false
       @debug_mode = false
       @resume = false
+      @sock = NullSocket.new
+      @logged_in = false
       if host
 	connect(host)
 	if user
@@ -140,6 +143,33 @@ module Net
       end
     end
 
+    def binary=(newmode)
+      if newmode != @binary
+        @binary = newmode
+        send_type_command if @logged_in
+      end
+    end
+
+    def send_type_command
+      if @binary
+        voidcmd("TYPE I")
+      else
+        voidcmd("TYPE A")
+      end
+    end
+    private :send_type_command
+
+    def with_binary(newmode)
+      oldmode = binary
+      self.binary = newmode
+      begin
+        yield
+      ensure
+        self.binary = oldmode
+      end
+    end
+    private :with_binary
+
     # Obsolete
     def return_code
       $stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing")
@@ -152,15 +182,15 @@ module Net
     end
 
     def open_socket(host, port)
-      if defined? SOCKSsocket and ENV["SOCKS_SERVER"]
+      if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
 	@passive = true
-	return SOCKSsocket.open(host, port)
+	return SOCKSSocket.open(host, port)
       else
 	return TCPSocket.open(host, port)
       end
     end
     private :open_socket
-    
+
     #
     # Establishes an FTP connection to host, optionally overriding the default
     # port. If the environment variable +SOCKS_SERVER+ is set, sets up the
@@ -197,7 +227,7 @@ module Net
       end
     end
     private :sanitize
-    
+
     def putline(line)
       if @debug_mode
 	print "put: ", sanitize(line), "\n"
@@ -206,7 +236,7 @@ module Net
       @sock.write(line)
     end
     private :putline
-    
+
     def getline
       line = @sock.readline # if get EOF, raise EOFError
       line.sub!(/(\r\n|\n|\r)\z/n, "")
@@ -216,7 +246,7 @@ module Net
       return line
     end
     private :getline
-    
+
     def getmultiline
       line = getline
       buff = line
@@ -230,7 +260,7 @@ module Net
       return buff << "\n"
     end
     private :getmultiline
-    
+
     def getresp
       @last_response = getmultiline
       @last_response_code = @last_response[0, 3]
@@ -246,7 +276,7 @@ module Net
       end
     end
     private :getresp
-    
+
     def voidresp
       resp = getresp
       if resp[0] != ?2
@@ -254,7 +284,7 @@ module Net
       end
     end
     private :voidresp
-    
+
     #
     # Sends a command and returns the response.
     #
@@ -264,7 +294,7 @@ module Net
 	return getresp
       end
     end
-    
+
     #
     # Sends a command and expect a response beginning with '2'.
     #
@@ -274,23 +304,20 @@ module Net
 	voidresp
       end
     end
-    
+
     def sendport(host, port)
       af = (@sock.peeraddr)[0]
       if af == "AF_INET"
-	hbytes = host.split(".")
-	pbytes = [port / 256, port % 256]
-	bytes = hbytes + pbytes
-	cmd = "PORT " + bytes.join(",")
+	cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
       elsif af == "AF_INET6"
-	cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|"
+	cmd = sprintf("EPRT |2|%s|%d|", host, port)
       else
 	raise FTPProtoError, host
       end
       voidcmd(cmd)
     end
     private :sendport
-    
+
     def makeport
       sock = TCPServer.open(@sock.addr[3], 0)
       port = sock.addr[1]
@@ -299,7 +326,7 @@ module Net
       return sock
     end
     private :makeport
-    
+
     def makepasv
       if @sock.peeraddr[0] == "AF_INET"
 	host, port = parse227(sendcmd("PASV"))
@@ -310,30 +337,34 @@ module Net
       return host, port
     end
     private :makepasv
-    
+
     def transfercmd(cmd, rest_offset = nil)
       if @passive
 	host, port = makepasv
 	conn = open_socket(host, port)
 	if @resume and rest_offset
-	  resp = sendcmd("REST " + rest_offset.to_s) 
+	  resp = sendcmd("REST " + rest_offset.to_s)
 	  if resp[0] != ?3
 	    raise FTPReplyError, resp
 	  end
 	end
 	resp = sendcmd(cmd)
+        # skip 2XX for some ftp servers
+        resp = getresp if resp[0] == ?2
 	if resp[0] != ?1
 	  raise FTPReplyError, resp
 	end
       else
 	sock = makeport
 	if @resume and rest_offset
-	  resp = sendcmd("REST " + rest_offset.to_s) 
+	  resp = sendcmd("REST " + rest_offset.to_s)
 	  if resp[0] != ?3
 	    raise FTPReplyError, resp
 	  end
 	end
 	resp = sendcmd(cmd)
+        # skip 2XX for some ftp servers
+        resp = getresp if resp[0] == ?2
 	if resp[0] != ?1
 	  raise FTPReplyError, resp
 	end
@@ -343,23 +374,7 @@ module Net
       return conn
     end
     private :transfercmd
-    
-    def getaddress
-      thishost = Socket.gethostname
-      if not thishost.index(".")
-	thishost = Socket.gethostbyname(thishost)[0]
-      end
-      if ENV.has_key?("LOGNAME")
-	realuser = ENV["LOGNAME"]
-      elsif ENV.has_key?("USER")
-	realuser = ENV["USER"]
-      else
-	realuser = "anonymous"
-      end
-      return realuser + "@" + thishost
-    end
-    private :getaddress
-    
+
     #
     # Logs in to the remote host. The session must have been previously
     # connected.  If +user+ is the string "anonymous" and the +password+ is
@@ -370,16 +385,18 @@ module Net
     #
     def login(user = "anonymous", passwd = nil, acct = nil)
       if user == "anonymous" and passwd == nil
-	passwd = getaddress
+	passwd = "anonymous@"
       end
-      
+
       resp = ""
       synchronize do
 	resp = sendcmd('USER ' + user)
 	if resp[0] == ?3
+          raise FTPReplyError, resp if passwd.nil?
 	  resp = sendcmd('PASS ' + passwd)
 	end
 	if resp[0] == ?3
+          raise FTPReplyError, resp if acct.nil?
 	  resp = sendcmd('ACCT ' + acct)
 	end
       end
@@ -387,8 +404,10 @@ module Net
 	raise FTPReplyError, resp
       end
       @welcome = resp
+      send_type_command
+      @logged_in = true
     end
-    
+
     #
     # Puts the connection into binary (image) mode, issues the given command,
     # and fetches the data returned, passing it to the associated block in
@@ -397,18 +416,19 @@ module Net
     #
     def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data
       synchronize do
-	voidcmd("TYPE I")
-	conn = transfercmd(cmd, rest_offset)
-	loop do
-	  data = conn.read(blocksize)
-	  break if data == nil
-	  yield(data)
-	end
-	conn.close
-	voidresp
+	with_binary(true) do
+          conn = transfercmd(cmd, rest_offset)
+          loop do
+            data = conn.read(blocksize)
+            break if data == nil
+            yield(data)
+          end
+          conn.close
+          voidresp
+        end
       end
     end
-    
+
     #
     # Puts the connection into ASCII (text) mode, issues the given command, and
     # passes the resulting data, one line at a time, to the associated block. If
@@ -417,23 +437,19 @@ module Net
     #
     def retrlines(cmd) # :yield: line
       synchronize do
-	voidcmd("TYPE A")
-	conn = transfercmd(cmd)
-	loop do
-	  line = conn.gets
-	  break if line == nil
-	  if line[-2, 2] == CRLF
-	    line = line[0 .. -3]
-	  elsif line[-1] == ?\n
-	    line = line[0 .. -2]
-	  end
-	  yield(line)
-	end
-	conn.close
-	voidresp
+	with_binary(false) do
+          conn = transfercmd(cmd)
+          loop do
+            line = conn.gets
+            break if line == nil
+            yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?)
+          end
+          conn.close
+          voidresp
+        end
       end
     end
-    
+
     #
     # Puts the connection into binary (image) mode, issues the given server-side
     # command (such as "STOR myfile"), and sends the contents of the file named
@@ -445,19 +461,27 @@ module Net
         file.seek(rest_offset, IO::SEEK_SET)
       end
       synchronize do
-	voidcmd("TYPE I")
-	conn = transfercmd(cmd, rest_offset)
-	loop do
-	  buf = file.read(blocksize)
-	  break if buf == nil
-	  conn.write(buf)
-	  yield(buf) if block
-	end
-	conn.close
-	voidresp
+	with_binary(true) do
+          conn = transfercmd(cmd)
+          loop do
+            buf = file.read(blocksize)
+            break if buf == nil
+            conn.write(buf)
+            yield(buf) if block
+          end
+          conn.close
+          voidresp
+        end
       end
+    rescue Errno::EPIPE
+      # EPIPE, in this case, means that the data connection was unexpectedly
+      # terminated.  Rather than just raising EPIPE to the caller, check the
+      # response on the control connection.  If getresp doesn't raise a more
+      # appropriate exception, re-raise the original exception.
+      getresp
+      raise
     end
-    
+
     #
     # Puts the connection into ASCII (text) mode, issues the given server-side
     # command (such as "STOR myfile"), and sends the contents of the file
@@ -466,61 +490,87 @@ module Net
     #
     def storlines(cmd, file, &block) # :yield: line
       synchronize do
-	voidcmd("TYPE A")
-	conn = transfercmd(cmd)
-	loop do
-	  buf = file.gets
-	  break if buf == nil
-	  if buf[-2, 2] != CRLF
-	    buf = buf.chomp + CRLF
-	  end
-	  conn.write(buf)
-	  yield(buf) if block
-	end
-	conn.close
-	voidresp
+	with_binary(false) do
+          conn = transfercmd(cmd)
+          loop do
+            buf = file.gets
+            break if buf == nil
+            if buf[-2, 2] != CRLF
+              buf = buf.chomp + CRLF
+            end
+            conn.write(buf)
+            yield(buf) if block
+          end
+          conn.close
+          voidresp
+        end
       end
+    rescue Errno::EPIPE
+      # EPIPE, in this case, means that the data connection was unexpectedly
+      # terminated.  Rather than just raising EPIPE to the caller, check the
+      # response on the control connection.  If getresp doesn't raise a more
+      # appropriate exception, re-raise the original exception.
+      getresp
+      raise
     end
 
     #
     # Retrieves +remotefile+ in binary mode, storing the result in +localfile+.
+    # If +localfile+ is nil, returns retrieved data.
     # If a block is supplied, it is passed the retrieved data in +blocksize+
     # chunks.
     #
     def getbinaryfile(remotefile, localfile = File.basename(remotefile),
-		      blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
-      if @resume
-	rest_offset = File.size?(localfile)
-	f = open(localfile, "a")
-      else
-	rest_offset = nil
-	f = open(localfile, "w")
+		      blocksize = DEFAULT_BLOCKSIZE) # :yield: data
+      result = nil
+      if localfile
+        if @resume
+          rest_offset = File.size?(localfile)
+          f = open(localfile, "a")
+        else
+          rest_offset = nil
+          f = open(localfile, "w")
+        end
+      elsif !block_given?
+        result = ""
       end
       begin
-	f.binmode
-	retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
-	  f.write(data)
-	  yield(data) if block
+	f.binmode if localfile
+	retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
+	  f.write(data) if localfile
+	  yield(data) if block_given?
+          result.concat(data) if result
 	end
+        return result
       ensure
-	f.close
+	f.close if localfile
       end
     end
-    
+
     #
     # Retrieves +remotefile+ in ASCII (text) mode, storing the result in
-    # +localfile+. If a block is supplied, it is passed the retrieved data one
+    # +localfile+.
+    # If +localfile+ is nil, returns retrieved data.
+    # If a block is supplied, it is passed the retrieved data one
     # line at a time.
     #
-    def gettextfile(remotefile, localfile = File.basename(remotefile), &block) # :yield: line
-      f = open(localfile, "w")
+    def gettextfile(remotefile, localfile = File.basename(remotefile)) # :yield: line
+      result = nil
+      if localfile
+        f = open(localfile, "w")
+      elsif !block_given?
+        result = ""
+      end
       begin
-	retrlines("RETR " + remotefile) do |line|
-	  f.puts(line)
-	  yield(line) if block
+	retrlines("RETR " + remotefile) do |line, newline|
+          l = newline ? line + "\n" : line
+	  f.print(l) if localfile
+	  yield(line, newline) if block_given?
+          result.concat(l) if result
 	end
+        return result
       ensure
-	f.close
+	f.close if localfile
       end
     end
 
@@ -530,13 +580,13 @@ module Net
     #
     def get(remotefile, localfile = File.basename(remotefile),
 	    blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
-      unless @binary
-	gettextfile(remotefile, localfile, &block)
-      else
+      if @binary
 	getbinaryfile(remotefile, localfile, blocksize, &block)
+      else
+	gettextfile(remotefile, localfile, &block)
       end
     end
-    
+
     #
     # Transfers +localfile+ to the server in binary mode, storing the result in
     # +remotefile+. If a block is supplied, calls it, passing in the transmitted
@@ -556,12 +606,16 @@ module Net
       f = open(localfile)
       begin
 	f.binmode
-	storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
+        if rest_offset
+          storbinary("APPE " + remotefile, f, blocksize, rest_offset, &block)
+        else
+          storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
+        end
       ensure
 	f.close
       end
     end
-    
+
     #
     # Transfers +localfile+ to the server in ASCII (text) mode, storing the result
     # in +remotefile+. If callback or an associated block is supplied, calls it,
@@ -582,10 +636,10 @@ module Net
     #
     def put(localfile, remotefile = File.basename(localfile),
 	    blocksize = DEFAULT_BLOCKSIZE, &block)
-      unless @binary
-	puttextfile(localfile, remotefile, &block)
-      else
+      if @binary
 	putbinaryfile(localfile, remotefile, blocksize, &block)
+      else
+	puttextfile(localfile, remotefile, &block)
       end
     end
 
@@ -596,7 +650,7 @@ module Net
       cmd = "ACCT " + account
       voidcmd(cmd)
     end
-    
+
     #
     # Returns an array of filenames in the remote directory.
     #
@@ -611,7 +665,7 @@ module Net
       end
       return files
     end
-    
+
     #
     # Returns an array of file information in the directory (the output is like
     # `ls -l`).  If a block is given, it iterates through the listing.
@@ -619,7 +673,7 @@ module Net
     def list(*args, &block) # :yield: line
       cmd = "LIST"
       args.each do |arg|
-	cmd = cmd + " " + arg
+	cmd = cmd + " " + arg.to_s
       end
       if block
 	retrlines(cmd, &block)
@@ -633,7 +687,7 @@ module Net
     end
     alias ls list
     alias dir list
-    
+
     #
     # Renames a file on the server.
     #
@@ -644,7 +698,7 @@ module Net
       end
       voidcmd("RNTO " + toname)
     end
-    
+
     #
     # Deletes a file on the server.
     #
@@ -658,7 +712,7 @@ module Net
 	raise FTPReplyError, resp
       end
     end
-    
+
     #
     # Changes the (remote) directory.
     #
@@ -667,30 +721,31 @@ module Net
 	begin
 	  voidcmd("CDUP")
 	  return
-	rescue FTPPermError
-	  if $![0, 3] != "500"
-	    raise FTPPermError, $!
+	rescue FTPPermError => e
+	  if e.message[0, 3] != "500"
+	    raise e
 	  end
 	end
       end
       cmd = "CWD " + dirname
       voidcmd(cmd)
     end
-    
+
     #
     # Returns the size of the given (remote) filename.
     #
     def size(filename)
-      voidcmd("TYPE I")
-      resp = sendcmd("SIZE " + filename)
-      if resp[0, 3] != "213" 
-	raise FTPReplyError, resp
+      with_binary(true) do
+        resp = sendcmd("SIZE " + filename)
+        if resp[0, 3] != "213"
+          raise FTPReplyError, resp
+        end
+        return resp[3..-1].strip.to_i
       end
-      return resp[3..-1].strip.to_i
     end
-    
+
     MDTM_REGEXP = /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)/  # :nodoc:
-    
+
     #
     # Returns the last modification time of the (remote) file.  If +local+ is
     # +true+, it is returned as a local time, otherwise it's a UTC time.
@@ -700,7 +755,7 @@ module Net
       ary = str.scan(MDTM_REGEXP)[0].collect {|i| i.to_i}
       return local ? Time.local(*ary) : Time.gm(*ary)
     end
-    
+
     #
     # Creates a remote directory.
     #
@@ -708,14 +763,14 @@ module Net
       resp = sendcmd("MKD " + dirname)
       return parse257(resp)
     end
-    
+
     #
     # Removes a remote directory.
     #
     def rmdir(dirname)
       voidcmd("RMD " + dirname)
     end
-    
+
     #
     # Returns the current remote directory.
     #
@@ -724,7 +779,7 @@ module Net
       return parse257(resp)
     end
     alias getdir pwd
-    
+
     #
     # Returns system information.
     #
@@ -735,7 +790,7 @@ module Net
       end
       return resp[4 .. -1]
     end
-    
+
     #
     # Aborts the previous command (ABOR command).
     #
@@ -749,7 +804,7 @@ module Net
       end
       return resp
     end
-    
+
     #
     # Returns the status (STAT command).
     #
@@ -759,7 +814,7 @@ module Net
       @sock.send(line, Socket::MSG_OOB)
       return getresp
     end
-    
+
     #
     # Issues the MDTM command.  TODO: more info.
     #
@@ -769,7 +824,7 @@ module Net
 	return resp[3 .. -1].strip
       end
     end
-    
+
     #
     # Issues the HELP command.
     #
@@ -780,7 +835,7 @@ module Net
       end
       sendcmd(cmd)
     end
-    
+
     #
     # Exits the FTP session.
     #
@@ -802,7 +857,7 @@ module Net
       cmd = "SITE " + arg
       voidcmd(cmd)
     end
-    
+
     #
     # Closes the connection.  Further operations are impossible until you open
     # a new connection with #connect.
@@ -810,14 +865,14 @@ module Net
     def close
       @sock.close if @sock and not @sock.closed?
     end
-    
+
     #
     # Returns +true+ iff the connection is closed.
     #
     def closed?
       @sock == nil or @sock.closed?
     end
-    
+
     def parse227(resp)
       if resp[0, 3] != "227"
 	raise FTPReplyError, resp
@@ -836,7 +891,7 @@ module Net
       return host, port
     end
     private :parse227
-    
+
     def parse228(resp)
       if resp[0, 3] != "228"
 	raise FTPReplyError, resp
@@ -864,11 +919,11 @@ module Net
 	end
 	host = v6[0, 8].join(":")
 	port = (numbers[19].to_i << 8) + numbers[20].to_i
-      end 
+      end
       return host, port
     end
     private :parse228
-    
+
     def parse229(resp)
       if resp[0, 3] != "229"
 	raise FTPReplyError, resp
@@ -887,7 +942,7 @@ module Net
       return host, port
     end
     private :parse229
-    
+
     def parse257(resp)
       if resp[0, 3] != "257"
 	raise FTPReplyError, resp
@@ -912,8 +967,15 @@ module Net
       return dirname
     end
     private :parse257
-  end
 
+    # :stopdoc:
+    class NullSocket
+      def method_missing(mid, *args)
+        raise FTPConnectionError, "not connected"
+      end
+    end
+    # :startdoc:
+  end
 end
 
 
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 7dd1f24d4c..ea5e449fcd 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1,31 +1,32 @@
 #
 # = net/http.rb
 #
-# Copyright (c) 1999-2006 Yukihiro Matsumoto
-# Copyright (c) 1999-2006 Minero Aoki
+# Copyright (c) 1999-2007 Yukihiro Matsumoto
+# Copyright (c) 1999-2007 Minero Aoki
 # Copyright (c) 2001 GOTOU Yuuzou
-# 
+#
 # Written and maintained by Minero Aoki <aamine@loveruby.net>.
 # HTTPS support added by GOTOU Yuuzou <gotoyuzo@notwork.org>.
 #
 # This file is derived from "http-access.rb".
 #
 # Documented by Minero Aoki; converted to RDoc by William Webber.
-# 
+#
 # This program is free software. You can re-distribute and/or
 # modify this program under the same terms of ruby itself ---
 # Ruby Distribution License or GNU General Public License.
 #
-# See Net::HTTP for an overview and examples. 
-# 
+# See Net::HTTP for an overview and examples.
+#
 # NOTE: You can find Japanese version of this document here:
-# http://www.ruby-lang.org/ja/man/?cmd=view;name=net%2Fhttp.rb
-# 
+# http://www.ruby-lang.org/ja/man/html/net_http.html
+#
 #--
 # $Id$
-#++ 
+#++
 
 require 'net/protocol'
+autoload :OpenSSL, 'openssl'
 require 'uri'
 
 module Net   #:nodoc:
@@ -36,29 +37,29 @@ module Net   #:nodoc:
   # :startdoc:
 
   # == What Is This Library?
-  # 
+  #
   # This library provides your program functions to access WWW
   # documents via HTTP, Hyper Text Transfer Protocol version 1.1.
-  # For details of HTTP, refer [RFC2616]
+  # For details of HTTP, refer to [RFC2616]
   # (http://www.ietf.org/rfc/rfc2616.txt).
-  # 
+  #
   # == Examples
-  # 
+  #
   # === Getting Document From WWW Server
-  # 
+  #
   # Example #1: Simple GET+print
-  # 
+  #
   #     require 'net/http'
   #     Net::HTTP.get_print 'www.example.com', '/index.html'
-  # 
+  #
   # Example #2: Simple GET+print by URL
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
   #     Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
-  # 
+  #
   # Example #3: More generic GET+print
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
   #
@@ -69,7 +70,7 @@ module Net   #:nodoc:
   #     puts res.body
   #
   # Example #4: More generic GET+print
-  # 
+  #
   #     require 'net/http'
   #
   #     url = URI.parse('http://www.example.com/index.html')
@@ -78,27 +79,28 @@ module Net   #:nodoc:
   #       http.request(req)
   #     }
   #     puts res.body
-  # 
+  #
   # === Posting Form Data
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
   #
   #     #1: Simple POST
   #     res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
-  #                               {'q'=>'ruby', 'max'=>'50'})
+  #                               {'q' => 'ruby', 'max' => '50'})
   #     puts res.body
   #
   #     #2: POST with basic authentication
   #     res = Net::HTTP.post_form(URI.parse('http://jack:pass@www.example.com/todo.cgi'),
-  #                                         {'from'=>'2005-01-01', 'to'=>'2005-03-31'})
+  #                                         {'from' => '2005-01-01',
+  #                                          'to' => '2005-03-31'})
   #     puts res.body
   #
   #     #3: Detailed control
   #     url = URI.parse('http://www.example.com/todo.cgi')
   #     req = Net::HTTP::Post.new(url.path)
   #     req.basic_auth 'jack', 'pass'
-  #     req.set_form_data({'from'=>'2005-01-01', 'to'=>'2005-03-31'}, ';')
+  #     req.set_form_data({'from' => '2005-01-01', 'to' => '2005-03-31'}, ';')
   #     res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
   #     case res
   #     when Net::HTTPSuccess, Net::HTTPRedirection
@@ -106,15 +108,20 @@ module Net   #:nodoc:
   #     else
   #       res.error!
   #     end
-  # 
+  #
+  #     #4: Multiple values
+  #     res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
+  #                               {'q' => ['ruby', 'perl'], 'max' => '50'})
+  #     puts res.body
+  #
   # === Accessing via Proxy
-  # 
+  #
   # Net::HTTP.Proxy creates http proxy class. It has same
   # methods of Net::HTTP but its instances always connect to
   # proxy, instead of given host.
-  # 
+  #
   #     require 'net/http'
-  # 
+  #
   #     proxy_addr = 'your.proxy.host'
   #     proxy_port = 8080
   #             :
@@ -122,20 +129,20 @@ module Net   #:nodoc:
   #       # always connect to your.proxy.addr:8080
   #             :
   #     }
-  # 
+  #
   # Since Net::HTTP.Proxy returns Net::HTTP itself when proxy_addr is nil,
   # there's no need to change code if there's proxy or not.
-  # 
+  #
   # There are two additional parameters in Net::HTTP.Proxy which allow to
   # specify proxy user name and password:
-  # 
+  #
   #     Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user = nil, proxy_pass = nil)
-  # 
+  #
   # You may use them to work with authorization-enabled proxies:
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
-  #     
+  #
   #     proxy_host = 'your.proxy.host'
   #     proxy_port = 8080
   #     uri = URI.parse(ENV['http_proxy'])
@@ -148,16 +155,16 @@ module Net   #:nodoc:
   #
   # Note that net/http never rely on HTTP_PROXY environment variable.
   # If you want to use proxy, set it explicitly.
-  # 
+  #
   # === Following Redirection
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
-  # 
+  #
   #     def fetch(uri_str, limit = 10)
-  #       # You should choose better exception. 
+  #       # You should choose better exception.
   #       raise ArgumentError, 'HTTP redirect too deep' if limit == 0
-  # 
+  #
   #       response = Net::HTTP.get_response(URI.parse(uri_str))
   #       case response
   #       when Net::HTTPSuccess     then response
@@ -166,25 +173,25 @@ module Net   #:nodoc:
   #         response.error!
   #       end
   #     end
-  # 
+  #
   #     print fetch('http://www.ruby-lang.org')
-  # 
+  #
   # Net::HTTPSuccess and Net::HTTPRedirection is a HTTPResponse class.
   # All HTTPResponse objects belong to its own response class which
   # indicate HTTP result status. For details of response classes,
   # see section "HTTP Response Classes".
-  # 
+  #
   # === Basic Authentication
-  # 
+  #
   #     require 'net/http'
-  # 
+  #
   #     Net::HTTP.start('www.example.com') {|http|
   #       req = Net::HTTP::Get.new('/secret-page.html')
   #       req.basic_auth 'account', 'password'
   #       response = http.request(req)
   #       print response.body
   #     }
-  # 
+  #
   # === HTTP Request Classes
   #
   # Here is HTTP request class hierarchy.
@@ -214,7 +221,7 @@ module Net   #:nodoc:
   #       HTTPUnknownResponse
   #       HTTPInformation                    # 1xx
   #           HTTPContinue                       # 100
-  #           HTTPSwitchProtocl                  # 101
+  #           HTTPSwitchProtocol                 # 101
   #       HTTPSuccess                        # 2xx
   #           HTTPOK                             # 200
   #           HTTPCreated                        # 201
@@ -257,22 +264,22 @@ module Net   #:nodoc:
   #           HTTPServiceUnavailable             # 503
   #           HTTPGatewayTimeOut                 # 504
   #           HTTPVersionNotSupported            # 505
-  # 
+  #
   # == Switching Net::HTTP versions
-  # 
+  #
   # You can use net/http.rb 1.1 features (bundled with Ruby 1.6)
   # by calling HTTP.version_1_1. Calling Net::HTTP.version_1_2
   # allows you to use 1.2 features again.
-  # 
+  #
   #     # example
   #     Net::HTTP.start {|http1| ...(http1 has 1.2 features)... }
-  # 
+  #
   #     Net::HTTP.version_1_1
   #     Net::HTTP.start {|http2| ...(http2 has 1.1 features)... }
-  # 
+  #
   #     Net::HTTP.version_1_2
   #     Net::HTTP.start {|http3| ...(http3 has 1.2 features)... }
-  # 
+  #
   # This function is NOT thread-safe.
   #
   class HTTP < Protocol
@@ -281,6 +288,13 @@ module Net   #:nodoc:
     Revision = %q$Revision$.split[1]
     HTTPVersion = '1.1'
     @newimpl = true
+    begin
+      require 'zlib'
+      require 'stringio'  #for our purposes (unpacking gzip) lump these together
+      HAVE_ZLIB=true
+    rescue LoadError
+      HAVE_ZLIB=false
+    end
     # :startdoc:
 
     # Turns on net/http 1.2 (ruby 1.8) features.
@@ -325,7 +339,7 @@ module Net   #:nodoc:
     #
     # Get body from target and output it to +$stdout+.  The
     # target can either be specified as (+uri+), or as
-    # (+host+, +path+, +port+ = 80); so: 
+    # (+host+, +path+, +port+ = 80); so:
     #
     #    Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
     #
@@ -345,7 +359,7 @@ module Net   #:nodoc:
     # Send a GET request to the target and return the response
     # as a string.  The target can either be specified as
     # (+uri+), or as (+host+, +path+, +port+ = 80); so:
-    # 
+    #
     #    print Net::HTTP.get(URI.parse('http://www.example.com/index.html'))
     #
     # or:
@@ -359,7 +373,7 @@ module Net   #:nodoc:
     # Send a GET request to the target and return the response
     # as a Net::HTTPResponse object.  The target can either be specified as
     # (+uri+), or as (+host+, +path+, +port+ = 80); so:
-    # 
+    #
     #    res = Net::HTTP.get_response(URI.parse('http://www.example.com/index.html'))
     #    print res.body
     #
@@ -429,15 +443,51 @@ module Net   #:nodoc:
       BufferedIO
     end
 
-    # creates a new Net::HTTP object and opens its TCP connection and 
-    # HTTP session.  If the optional block is given, the newly 
-    # created Net::HTTP object is passed to it and closed when the 
+    # call-seq:
+    #   HTTP.start(address, port, p_addr, p_port, p_user, p_pass, &block)
+    #   HTTP.start(address, port=nil, p_addr=nil, p_port=nil, p_user=nil, p_pass=nil, opt, &block)
+    #
+    # creates a new Net::HTTP object and opens its TCP connection and
+    # HTTP session.
+    #
+    # Argments are following:
+    # _address_ :: hostname or IP address of the server
+    # _port_    :: port of the server
+    # _p_addr_  :: address of proxy
+    # _p_port_  :: port of proxy
+    # _p_user_  :: user of proxy
+    # _p_pass_  :: pass of proxy
+    # _opt_     :: optional hash
+    #
+    # _opt_ sets following values by its accessor.
+    # The keys are ca_file, ca_path, cert, cert_store, ciphers,
+    # close_on_empty_response, key, open_timeout, read_timeout, ssl_timeout,
+    # ssl_version, use_ssl, verify_callback, verify_depth and verify_mode.
+    # If you set :use_ssl as true, you can use https and default value of
+    # verify_mode is set as OpenSSL::SSL::VERIFY_PEER.
+    #
+    # If the optional block is given, the newly
+    # created Net::HTTP object is passed to it and closed when the
     # block finishes.  In this case, the return value of this method
     # is the return value of the block.  If no block is given, the
     # return value of this method is the newly created Net::HTTP object
     # itself, and the caller is responsible for closing it upon completion.
-    def HTTP.start(address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil, &block) # :yield: +http+
-      new(address, port, p_addr, p_port, p_user, p_pass).start(&block)
+    def HTTP.start(address, *arg, &block) # :yield: +http+
+      arg.pop if opt = Hash.try_convert(arg[-1])
+      port, p_addr, p_port, p_user, p_pass = *arg
+      port = https_default_port if !port && opt && opt[:use_ssl]
+      http = new(address, port, p_addr, p_port, p_user, p_pass)
+
+      if opt
+        opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
+        http.methods.grep(/\A(\w+)=\z/) do |meth|
+          key = $1.to_sym
+          opt.key?(key) or next
+          http.__send__(meth, opt[key])
+        end
+      end
+
+      http.start(&block)
     end
 
     class << HTTP
@@ -461,7 +511,7 @@ module Net   #:nodoc:
       @address = address
       @port    = (port || HTTP.default_port)
       @curr_http_version = HTTPVersion
-      @seems_1_0_server = false
+      @no_keepalive_server = false
       @close_on_empty_response = false
       @socket  = nil
       @started = false
@@ -470,6 +520,14 @@ module Net   #:nodoc:
       @debug_output = nil
       @use_ssl = false
       @ssl_context = nil
+      @enable_post_connection_check = true
+      @compression = nil
+      @sspi_enabled = false
+      if defined?(SSL_ATTRIBUTES)
+        SSL_ATTRIBUTES.each do |name|
+          instance_variable_set "@#{name}", nil
+        end
+      end
     end
 
     def inspect
@@ -523,11 +581,37 @@ module Net   #:nodoc:
 
     # returns true if use SSL/TLS with HTTP.
     def use_ssl?
-      false   # redefined in net/https
+      @use_ssl
+    end
+
+    # Turn on/off SSL.
+    # This flag must be set before starting session.
+    # If you change use_ssl value after session started,
+    # a Net::HTTP object raises IOError.
+    def use_ssl=(flag)
+      flag = (flag ? true : false)
+      if started? and @use_ssl != flag
+        raise IOError, "use_ssl value changed, but session already started"
+      end
+      @use_ssl = flag
+    end
+
+    SSL_ATTRIBUTES = %w(
+      ssl_version key cert ca_file ca_path cert_store ciphers
+      verify_mode verify_callback verify_depth ssl_timeout
+    )
+    attr_accessor(*SSL_ATTRIBUTES)
+
+    # return the X.509 certificates the server presented.
+    def peer_cert
+      if not use_ssl? or not @socket
+        return nil
+      end
+      @socket.io.peer_cert
     end
 
     # Opens TCP connection and HTTP session.
-    # 
+    #
     # When this method is called with block, gives a HTTP object
     # to the block and closes the TCP connection / HTTP session
     # after the block executed.
@@ -560,10 +644,17 @@ module Net   #:nodoc:
       s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
       D "opened"
       if use_ssl?
-        unless @ssl_context.verify_mode
-          warn "warning: peer certificate won't be verified in this SSL session"
-          @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        ssl_parameters = Hash.new
+        iv_list = instance_variables
+        SSL_ATTRIBUTES.each do |name|
+          ivname = "@#{name}".intern
+          if iv_list.include?(ivname) and
+             value = instance_variable_get(ivname)
+            ssl_parameters[name] = value
+          end
         end
+        @ssl_context = OpenSSL::SSL::SSLContext.new
+        @ssl_context.set_params(ssl_parameters)
         s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
         s.sync_close = true
       end
@@ -571,21 +662,27 @@ module Net   #:nodoc:
       @socket.read_timeout = @read_timeout
       @socket.debug_output = @debug_output
       if use_ssl?
-        if proxy?
-          @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
-                                    @address, @port, HTTPVersion)
-          @socket.writeline "Host: #{@address}:#{@port}"
-          if proxy_user
-            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
-            credential.delete!("\r\n")
-            @socket.writeline "Proxy-Authorization: Basic #{credential}"
+        begin
+          if proxy?
+            @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
+                                      @address, @port, HTTPVersion)
+            @socket.writeline "Host: #{@address}:#{@port}"
+            if proxy_user
+              credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
+              credential.delete!("\r\n")
+              @socket.writeline "Proxy-Authorization: Basic #{credential}"
+            end
+            @socket.writeline ''
+            HTTPResponse.read_new(@socket).value
           end
-          @socket.writeline ''
-          HTTPResponse.read_new(@socket).value
-        end
-        s.connect
-        if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          s.post_connection_check(@address)
+          timeout(@open_timeout) { s.connect }
+          if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
+            s.post_connection_check(@address)
+          end
+        rescue => exception
+          D "Conn close because of connect error #{exception}"
+          @socket.close if @socket and not @socket.closed?
+          raise exception
         end
       end
       on_connect
@@ -627,9 +724,9 @@ module Net   #:nodoc:
     # Arguments are address/port of proxy host and username/password
     # if authorization on proxy server is required.
     # You can replace the HTTP class with created proxy class.
-    # 
+    #
     # If ADDRESS is nil, this method returns self (Net::HTTP).
-    # 
+    #
     #     # Example
     #     proxy_class = Net::HTTP::Proxy('proxy.example.com', 8080)
     #                     :
@@ -637,7 +734,7 @@ module Net   #:nodoc:
     #       # connecting proxy.foo.org:8080
     #                     :
     #     }
-    # 
+    #
     def HTTP.Proxy(p_addr, p_port = nil, p_user = nil, p_pass = nil)
       return self unless p_addr
       delta = ProxyDelta
@@ -733,7 +830,18 @@ module Net   #:nodoc:
     public
 
     # Gets data from +path+ on the connected-to host.
-    # +header+ must be a Hash like { 'Accept' => '*/*', ... }.
+    # +initheader+ must be a Hash like { 'Accept' => '*/*', ... },
+    # and it defaults to an empty hash.
+    # If +initheader+ doesn't have the key 'accept-encoding', then
+    # a value of "gzip;q=1.0,deflate;q=0.6,identity;q=0.3" is used,
+    # so that gzip compression is used in preference to deflate
+    # compression, which is used in preference to no compression.
+    # Ruby doesn't have libraries to support the compress (Lempel-Ziv)
+    # compression, so that is not supported.  The intent of this is
+    # to reduce bandwidth by default.   If this routine sets up
+    # compression, then it does the decompression also, removing
+    # the header as well to prevent confusion.  Otherwise
+    # it leaves the body as it found it.
     #
     # In version 1.1 (ruby 1.6), this method returns a pair of objects,
     # a Net::HTTPResponse object and the entity body string.
@@ -748,7 +856,7 @@ module Net   #:nodoc:
     # +dest+ argument is obsolete.
     # It still works but you must not use it.
     #
-    # In version 1.1, this method might raise an exception for 
+    # In version 1.1, this method might raise an exception for
     # 3xx (redirect). In this case you can get a HTTPResponse object
     # by "anException.response".
     #
@@ -759,7 +867,7 @@ module Net   #:nodoc:
     #
     #     # version 1.2 (bundled with Ruby 1.8 or later)
     #     response = http.get('/index.html')
-    #     
+    #
     #     # using block
     #     File.open('result.txt', 'w') {|f|
     #       http.get('/~foo/') do |str|
@@ -767,10 +875,35 @@ module Net   #:nodoc:
     #       end
     #     }
     #
-    def get(path, initheader = nil, dest = nil, &block) # :yield: +body_segment+
+    def get(path, initheader = {}, dest = nil, &block) # :yield: +body_segment+
       res = nil
+      if HAVE_ZLIB
+        unless  initheader.keys.any?{|k| k.downcase == "accept-encoding"}
+          initheader = initheader.merge({
+            "accept-encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+          })
+          @compression = true
+        end
+      end
       request(Get.new(path, initheader)) {|r|
-        r.read_body dest, &block
+        if r.key?("content-encoding") and @compression
+          @compression = nil # Clear it till next set.
+          the_body = r.read_body dest, &block
+          case r["content-encoding"]
+          when "gzip"
+            r.body= Zlib::GzipReader.new(StringIO.new(the_body), encoding: "ASCII-8BIT").read
+            r.delete("content-encoding")
+          when "deflate"
+            r.body= Zlib::Inflate.inflate(the_body);
+            r.delete("content-encoding")
+          when "identity"
+            ; # nothing needed
+          else
+            ; # Don't do anything dramatic, unless we need to later
+          end
+        else
+          r.read_body dest, &block
+        end
         res = r
       }
       unless @newimpl
@@ -783,21 +916,21 @@ module Net   #:nodoc:
 
     # Gets only the header from +path+ on the connected-to host.
     # +header+ is a Hash like { 'Accept' => '*/*', ... }.
-    # 
+    #
     # This method returns a Net::HTTPResponse object.
-    # 
-    # In version 1.1, this method might raise an exception for 
+    #
+    # In version 1.1, this method might raise an exception for
     # 3xx (redirect). On the case you can get a HTTPResponse object
     # by "anException.response".
     # In version 1.2, this method never raises an exception.
-    # 
+    #
     #     response = nil
     #     Net::HTTP.start('some.www.server', 80) {|http|
     #       response = http.head('/index.html')
     #     }
     #     p response['content-type']
     #
-    def head(path, initheader = nil) 
+    def head(path, initheader = nil)
       res = request(Head.new(path, initheader))
       res.value unless @newimpl
       res
@@ -805,11 +938,11 @@ module Net   #:nodoc:
 
     # Posts +data+ (must be a String) to +path+. +header+ must be a Hash
     # like { 'Accept' => '*/*', ... }.
-    # 
+    #
     # In version 1.1 (ruby 1.6), this method returns a pair of objects, a
     # Net::HTTPResponse object and an entity body string.
     # In version 1.2 (ruby 1.8), this method returns a Net::HTTPResponse object.
-    # 
+    #
     # If called with a block, yields each fragment of the
     # entity body in turn as a string as it are read from
     # the socket.  Note that in this case, the returned response
@@ -817,18 +950,18 @@ module Net   #:nodoc:
     #
     # +dest+ argument is obsolete.
     # It still works but you must not use it.
-    # 
-    # In version 1.1, this method might raise an exception for 
+    #
+    # In version 1.1, this method might raise an exception for
     # 3xx (redirect). In this case you can get an HTTPResponse object
     # by "anException.response".
     # In version 1.2, this method never raises exception.
-    # 
+    #
     #     # version 1.1
     #     response, body = http.post('/cgi-bin/search.rb', 'query=foo')
-    # 
+    #
     #     # version 1.2
     #     response = http.post('/cgi-bin/search.rb', 'query=foo')
-    # 
+    #
     #     # using block
     #     File.open('result.txt', 'w') {|f|
     #       http.post('/cgi-bin/search.rb', 'query=foo') do |str|
@@ -921,21 +1054,21 @@ module Net   #:nodoc:
 
     # Sends a GET request to the +path+ and gets a response,
     # as an HTTPResponse object.
-    # 
+    #
     # When called with a block, yields an HTTPResponse object.
     # The body of this response will not have been read yet;
     # the caller can process it using HTTPResponse#read_body,
     # if desired.
     #
     # Returns the response.
-    # 
+    #
     # This method never raises Net::* exceptions.
-    # 
+    #
     #     response = http.request_get('/index.html')
     #     # The entity body is already read here.
     #     p response['content-type']
     #     puts response.body
-    # 
+    #
     #     # using block
     #     http.request_get('/index.html') {|response|
     #       p response['content-type']
@@ -952,9 +1085,9 @@ module Net   #:nodoc:
     # as an HTTPResponse object.
     #
     # Returns the response.
-    # 
+    #
     # This method never raises Net::* exceptions.
-    # 
+    #
     #     response = http.request_head('/index.html')
     #     p response['content-type']
     #
@@ -964,21 +1097,21 @@ module Net   #:nodoc:
 
     # Sends a POST request to the +path+ and gets a response,
     # as an HTTPResponse object.
-    # 
+    #
     # When called with a block, yields an HTTPResponse object.
     # The body of this response will not have been read yet;
     # the caller can process it using HTTPResponse#read_body,
     # if desired.
     #
     # Returns the response.
-    # 
+    #
     # This method never raises Net::* exceptions.
-    # 
+    #
     #     # example
     #     response = http.request_post('/cgi-bin/nice.rb', 'datadatadata...')
     #     p response.status
     #     puts response.body          # body is already read
-    # 
+    #
     #     # using block
     #     http.request_post('/cgi-bin/nice.rb', 'datadatadata...') {|response|
     #       p response.status
@@ -1006,7 +1139,7 @@ module Net   #:nodoc:
     # This method also sends DATA string if DATA is given.
     #
     # Returns a HTTPResponse object.
-    # 
+    #
     # This method never raises Net::* exceptions.
     #
     #    response = http.send_request('GET', '/index.html')
@@ -1020,14 +1153,14 @@ module Net   #:nodoc:
     # Sends an HTTPRequest object REQUEST to the HTTP server.
     # This method also sends DATA string if REQUEST is a post/put request.
     # Giving DATA for get/head request causes ArgumentError.
-    # 
+    #
     # When called with a block, yields an HTTPResponse object.
     # The body of this response will not have been read yet;
     # the caller can process it using HTTPResponse#read_body,
     # if desired.
     #
     # Returns a HTTPResponse object.
-    # 
+    #
     # This method never raises Net::* exceptions.
     #
     def request(req, body = nil, &block)  # :yield: +response+
@@ -1038,34 +1171,38 @@ module Net   #:nodoc:
         }
       end
       if proxy_user()
-        unless use_ssl?
-          req.proxy_basic_auth proxy_user(), proxy_pass()
-        end
+        req.proxy_basic_auth proxy_user(), proxy_pass() unless use_ssl?
       end
-
       req.set_body_internal body
-      begin_transport req
-        req.exec @socket, @curr_http_version, edit_path(req.path)
-        begin
-          res = HTTPResponse.read_new(@socket)
-        end while res.kind_of?(HTTPContinue)
-        res.reading_body(@socket, req.response_body_permitted?) {
-          yield res if block_given?
-        }
-      end_transport req, res
-
+      res = transport_request(req, &block)
+      if sspi_auth?(res)
+        sspi_auth(req)
+        res = transport_request(req, &block)
+      end
       res
     end
 
     private
 
+    def transport_request(req)
+      begin_transport req
+      req.exec @socket, @curr_http_version, edit_path(req.path)
+      begin
+        res = HTTPResponse.read_new(@socket)
+      end while res.kind_of?(HTTPContinue)
+      res.reading_body(@socket, req.response_body_permitted?) {
+        yield res if block_given?
+      }
+      end_transport req, res
+      res
+    rescue => exception
+      D "Conn close because of error #{exception}"
+      @socket.close if @socket and not @socket.closed?
+      raise exception
+    end
+
     def begin_transport(req)
-      if @socket.closed?
-        connect
-      end
-      if @seems_1_0_server
-        req['connection'] ||= 'close'
-      end
+      connect if @socket.closed?
       if not req.response_body_permitted? and @close_on_empty_response
         req['connection'] ||= 'close'
       end
@@ -1074,15 +1211,13 @@ module Net   #:nodoc:
 
     def end_transport(req, res)
       @curr_http_version = res.http_version
-      if not res.body and @close_on_empty_response
+      if @socket.closed?
+        D 'Conn socket closed'
+      elsif not res.body and @close_on_empty_response
         D 'Conn close'
         @socket.close
       elsif keep_alive?(req, res)
         D 'Conn keep-alive'
-        if @socket.closed?
-          D 'Conn (but seems 1.0 server)'
-          @seems_1_0_server = true
-        end
       else
         D 'Conn close'
         @socket.close
@@ -1090,13 +1225,40 @@ module Net   #:nodoc:
     end
 
     def keep_alive?(req, res)
-      return false if /close/i =~ req['connection'].to_s
-      return false if @seems_1_0_server
-      return true  if /keep-alive/i =~ res['connection'].to_s
-      return false if /close/i      =~ res['connection'].to_s
-      return true  if /keep-alive/i =~ res['proxy-connection'].to_s
-      return false if /close/i      =~ res['proxy-connection'].to_s
-      (@curr_http_version == '1.1')
+      return false if req.connection_close?
+      if @curr_http_version <= '1.0'
+        res.connection_keep_alive?
+      else   # HTTP/1.1 or later
+        not res.connection_close?
+      end
+    end
+
+    def sspi_auth?(res)
+      return false unless @sspi_enabled
+      if res.kind_of?(HTTPProxyAuthenticationRequired) and
+          proxy? and res["Proxy-Authenticate"].include?("Negotiate")
+        begin
+          require 'win32/sspi'
+          true
+        rescue LoadError
+          false
+        end
+      else
+        false
+      end
+    end
+
+    def sspi_auth(req)
+      n = Win32::SSPI::NegotiateAuth.new
+      req["Proxy-Authorization"] = "Negotiate #{n.get_initial_token}"
+      # Some versions of ISA will close the connection if this isn't present.
+      req["Connection"] = "Keep-Alive"
+      req["Proxy-Connection"] = "Keep-Alive"
+      res = transport_request(req)
+      authphrase = res["Proxy-Authenticate"]  or return res
+      req["Proxy-Authorization"] = "Negotiate #{n.complete_authentication(authphrase)}"
+    rescue => err
+      raise HTTPAuthenticationError.new('HTTP authentication failed', err)
     end
 
     #
@@ -1205,15 +1367,17 @@ module Net   #:nodoc:
     end
 
     # Returns the header field corresponding to the case-insensitive key.
-    # Returns the default value +args+, or the result of the block, or nil,
-    # if there's no header field named key.  See Hash#fetch
+    # Returns the default value +args+, or the result of the block, or
+    # raises an IndexErrror if there's no header field named +key+
+    # See Hash#fetch
     def fetch(key, *args, &block)   #:yield: +key+
       a = @header.fetch(key.downcase, *args, &block)
-      a.join(', ')
+      a.kind_of?(Array) ? a.join(', ') : a
     end
 
     # Iterates for each header names and values.
     def each_header   #:yield: +key+, +value+
+      block_given? or return enum_for(__method__)
       @header.each do |k,va|
         yield k, va.join(', ')
       end
@@ -1223,13 +1387,15 @@ module Net   #:nodoc:
 
     # Iterates for each header names.
     def each_name(&block)   #:yield: +key+
+      block_given? or return enum_for(__method__)
       @header.each_key(&block)
     end
 
     alias each_key each_name
 
     # Iterates for each capitalized header names.
-    def each_capitalized_name(&block)   #:yield: +key+
+    def each_capitalized_name  #:yield: +key+
+      block_given? or return enum_for(__method__)
       @header.each_key do |k|
         yield capitalize(k)
       end
@@ -1237,6 +1403,7 @@ module Net   #:nodoc:
 
     # Iterates for each header values.
     def each_value   #:yield: +value+
+      block_given? or return enum_for(__method__)
       @header.each_value do |va|
         yield va.join(', ')
       end
@@ -1259,6 +1426,7 @@ module Net   #:nodoc:
 
     # As for #each_header, except the keys are provided in capitalized form.
     def each_capitalized
+      block_given? or return enum_for(__method__)
       @header.each do |k,v|
         yield capitalize(k), v.join(', ')
       end
@@ -1334,7 +1502,7 @@ module Net   #:nodoc:
           raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
       len.to_i
     end
-    
+
     def content_length=(len)
       unless len
         @header.delete 'content-length'
@@ -1344,7 +1512,7 @@ module Net   #:nodoc:
     end
 
     # Returns "true" if the "transfer-encoding" header is present and
-    # set to "chunked".  This is an HTTP/1.1 feature, allowing the 
+    # set to "chunked".  This is an HTTP/1.1 feature, allowing the
     # the content to be sent in "chunks" without at the outset
     # stating the entire content length.
     def chunked?
@@ -1360,13 +1528,13 @@ module Net   #:nodoc:
       return nil unless @header['content-range']
       m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
           raise HTTPHeaderSyntaxError, 'wrong Content-Range format'
-      m[1].to_i .. m[2].to_i + 1
+      m[1].to_i .. m[2].to_i
     end
 
     # The length of the range represented in Content-Range: header.
     def range_length
       r = content_range() or return nil
-      r.end - r.begin
+      r.end - r.begin + 1
     end
 
     # Returns a content type string such as "text/html".
@@ -1385,7 +1553,7 @@ module Net   #:nodoc:
       return nil unless @header['content-type']
       self['Content-Type'].split(';').first.to_s.split('/')[0].to_s.strip
     end
-    
+
     # Returns a content type string such as "html".
     # This method returns nil if Content-Type: header field does not exist
     # or sub-type is not given (e.g. "Content-Type: text").
@@ -1423,15 +1591,26 @@ module Net   #:nodoc:
     #
     # This method also set Content-Type: header field to
     # application/x-www-form-urlencoded.
+    #
+    # Example:
+    #    http.form_data = {"q" => "ruby", "lang" => "en"}
+    #    http.form_data = {"q" => ["ruby", "perl"], "lang" => "en"}
+    #    http.set_form_data({"q" => "ruby", "lang" => "en"}, ';')
+    #
     def set_form_data(params, sep = '&')
-      self.body = params.map {|k,v| "#{urlencode(k.to_s)}=#{urlencode(v.to_s)}" }.join(sep)
+      self.body = params.map {|k, v| encode_kvpair(k, v) }.flatten.join(sep)
       self.content_type = 'application/x-www-form-urlencoded'
     end
 
     alias form_data= set_form_data
 
+    def encode_kvpair(k, vs)
+      Array(vs).map {|v| "#{urlencode(k.to_s)}=#{urlencode(v.to_s)}" }
+    end
+    private :encode_kvpair
+
     def urlencode(str)
-      str.gsub(/[^a-zA-Z0-9_\.\-]/n) {|s| sprintf('%%%02x', s[0]) }
+      str.dup.force_encoding('ASCII-8BIT').gsub(/[^a-zA-Z0-9_\.\-]/){'%%%02x' % $&.ord}
     end
     private :urlencode
 
@@ -1450,6 +1629,24 @@ module Net   #:nodoc:
     end
     private :basic_encode
 
+    def connection_close?
+      tokens(@header['connection']).include?('close') or
+      tokens(@header['proxy-connection']).include?('close')
+    end
+
+    def connection_keep_alive?
+      tokens(@header['connection']).include?('keep-alive') or
+      tokens(@header['proxy-connection']).include?('keep-alive')
+    end
+
+    def tokens(vals)
+      return [] unless vals
+      vals.map {|v| v.split(',') }.flatten\
+          .reject {|str| str.strip.empty? }\
+          .map {|tok| tok.strip.downcase }
+    end
+    private :tokens
+
   end
 
 
@@ -1467,10 +1664,12 @@ module Net   #:nodoc:
       @method = m
       @request_has_body = reqbody
       @response_has_body = resbody
+      raise ArgumentError, "no HTTP request path given" unless path
       raise ArgumentError, "HTTP request path is empty" if path.empty?
       @path = path
       initialize_http_header initheader
       self['Accept'] ||= '*/*'
+      self['User-Agent'] ||= 'Ruby'
       @body = nil
       @body_stream = nil
     end
@@ -1533,7 +1732,7 @@ module Net   #:nodoc:
     private
 
     def send_request_with_body(sock, ver, path, body)
-      self.content_length = body.length
+      self.content_length = body.bytesize
       delete 'Transfer-Encoding'
       supply_default_content_type
       write_header sock, ver, path
@@ -1573,14 +1772,14 @@ module Net   #:nodoc:
       buf << "\r\n"
       sock.write buf
     end
-  
+
   end
 
 
-  # 
+  #
   # HTTP request class. This class wraps request header and entity path.
   # You *must* use its subclass, Net::HTTP::Get, Post, Head.
-  # 
+  #
   class HTTPRequest < HTTPGenericRequest
 
     # Creates HTTP request object.
@@ -1720,17 +1919,17 @@ module Net   #:nodoc:
   # HTTP response class. This class wraps response header and entity.
   # Mixes in the HTTPHeader module, which provides access to response
   # header values both via hash-like methods and individual readers.
-  # Note that each possible HTTP response code defines its own 
+  # Note that each possible HTTP response code defines its own
   # HTTPResponse subclass.  These are listed below.
   # All classes are
   # defined under the Net module. Indentation indicates inheritance.
-  # 
+  #
   #   xxx        HTTPResponse
-  # 
+  #
   #     1xx        HTTPInformation
-  #       100        HTTPContinue    
+  #       100        HTTPContinue
   #       101        HTTPSwitchProtocol
-  # 
+  #
   #     2xx        HTTPSuccess
   #       200        HTTPOK
   #       201        HTTPCreated
@@ -1739,7 +1938,7 @@ module Net   #:nodoc:
   #       204        HTTPNoContent
   #       205        HTTPResetContent
   #       206        HTTPPartialContent
-  # 
+  #
   #     3xx        HTTPRedirection
   #       300        HTTPMultipleChoice
   #       301        HTTPMovedPermanently
@@ -1748,7 +1947,7 @@ module Net   #:nodoc:
   #       304        HTTPNotModified
   #       305        HTTPUseProxy
   #       307        HTTPTemporaryRedirect
-  # 
+  #
   #     4xx        HTTPClientError
   #       400        HTTPBadRequest
   #       401        HTTPUnauthorized
@@ -1768,7 +1967,7 @@ module Net   #:nodoc:
   #       415        HTTPUnsupportedMediaType
   #       416        HTTPRequestedRangeNotSatisfiable
   #       417        HTTPExpectationFailed
-  # 
+  #
   #     5xx        HTTPServerError
   #       500        HTTPInternalServerError
   #       501        HTTPNotImplemented
@@ -1776,7 +1975,7 @@ module Net   #:nodoc:
   #       503        HTTPServiceUnavailable
   #       504        HTTPGatewayTimeOut
   #       505        HTTPVersionNotSupported
-  # 
+  #
   #     xxx        HTTPUnknownResponse
   #
   class HTTPResponse
@@ -2030,19 +2229,26 @@ module Net   #:nodoc:
       end
 
       def each_response_header(sock)
+        key = value = nil
         while true
           line = sock.readuntil("\n", true).sub(/\s+\z/, '')
           break if line.empty?
-          m = /\A([^:]+):\s*/.match(line) or
-              raise HTTPBadResponse, 'wrong header line format'
-          yield m[1], m.post_match
+          if line[0] == ?\s or line[0] == ?\t and value
+            value << ' ' unless value.empty?
+            value << line.strip
+          else
+            yield key, value if key
+            key, value = line.strip.split(/\s*:\s*/, 2)
+            raise HTTPBadResponse, 'wrong header line format' if value.nil?
+          end
         end
+        yield key, value if key
       end
     end
 
     # next is to fix bug in RDoc, where the private inside class << self
     # spills out.
-    public 
+    public
 
     include HTTPHeader
 
@@ -2075,7 +2281,7 @@ module Net   #:nodoc:
     # To allow Net::HTTP 1.1 style assignment
     # e.g.
     #    response, body = Net::HTTP.get(....)
-    # 
+    #
     def to_ary
       warn "net/http.rb: warning: Net::HTTP v1.1 style assignment found at #{caller(1)[0]}; use `response = http.get(...)' instead." if $VERBOSE
       res = self.dup
@@ -2198,6 +2404,12 @@ module Net   #:nodoc:
       read_body()
     end
 
+    # Because it may be necessary to modify the body, Eg, decompression
+    # this method facilitates that.
+    def body=(value)
+      @body = value
+    end
+
     alias entity body   #:nodoc: obsolete
 
     private
@@ -2229,8 +2441,12 @@ module Net   #:nodoc:
             raise HTTPBadResponse, "wrong chunk size line: #{line}"
         len = hexlen.hex
         break if len == 0
-        @socket.read len, dest; total += len
-        @socket.read 2   # \r\n
+        begin
+          @socket.read len, dest
+        ensure
+          total += len
+          @socket.read 2   # \r\n
+        end
       end
       until @socket.readline.empty?
         # none
diff --git a/lib/net/https.rb b/lib/net/https.rb
index e296dbbed4..7454279508 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -1,6 +1,6 @@
 =begin
 
-= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
+= net/https -- SSL/TLS enhancement for Net::HTTP.
 
 == Info
   'OpenSSL for Ruby 2' project
@@ -11,16 +11,6 @@
   This program is licenced under the same licence as Ruby.
   (See the file 'LICENCE'.)
 
-== Requirements
-  This program requires Net 1.2.0 or higher version.
-  You can get it from RAA or Ruby's CVS repository.
-
-== Version
-  $Id$
-  
-  2001-11-06: Contiributed to Ruby/OpenSSL project.
-  2004-03-06: Some code is merged in to net/http.
-
 == Example
 
 Here is a simple HTTP client:
@@ -65,15 +55,15 @@ It can be replaced by the following code:
 
 : key, key=((|key|))
     Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
-    (This method is appeared in Michal Rokos's OpenSSL extention.)
+    (This method is appeared in Michal Rokos's OpenSSL extension.)
 
 : cert, cert=((|cert|))
     Sets an OpenSSL::X509::Certificate object as client certificate
-    (This method is appeared in Michal Rokos's OpenSSL extention).
+    (This method is appeared in Michal Rokos's OpenSSL extension).
 
 : ca_file, ca_file=((|path|))
     Sets path of a CA certification file in PEM format.
-    The file can contrain several CA certificats.
+    The file can contrain several CA certificates.
 
 : ca_path, ca_path=((|path|))
     Sets path of a CA certification directory containing certifications
@@ -81,7 +71,7 @@ It can be replaced by the following code:
 
 : verify_mode, verify_mode=((|mode|))
     Sets the flags for server the certification verification at
-    begining of SSL/TLS session.
+    beginning of SSL/TLS session.
     OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable.
 
 : verify_callback, verify_callback=((|proc|))
@@ -100,74 +90,3 @@ It can be replaced by the following code:
 
 require 'net/http'
 require 'openssl'
-
-module Net
-
-  class HTTP
-    remove_method :use_ssl?
-    def use_ssl?
-      @use_ssl
-    end
-
-    # For backward compatibility.
-    alias use_ssl use_ssl?
-
-    # Turn on/off SSL.
-    # This flag must be set before starting session.
-    # If you change use_ssl value after session started,
-    # a Net::HTTP object raises IOError.
-    def use_ssl=(flag)
-      flag = (flag ? true : false)
-      raise IOError, "use_ssl value changed, but session already started" \
-          if started? and @use_ssl != flag
-      if flag and not @ssl_context
-        @ssl_context = OpenSSL::SSL::SSLContext.new
-      end
-      @use_ssl = flag
-    end
-
-    def self.ssl_context_accessor(name)
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-        def #{name}
-          return nil unless @ssl_context
-          @ssl_context.#{name}
-        end
-
-        def #{name}=(val)
-          @ssl_context ||= OpenSSL::SSL::SSLContext.new
-          @ssl_context.#{name} = val
-        end
-      End
-    end
-
-    ssl_context_accessor :key
-    ssl_context_accessor :cert
-    ssl_context_accessor :ca_file
-    ssl_context_accessor :ca_path
-    ssl_context_accessor :verify_mode
-    ssl_context_accessor :verify_callback
-    ssl_context_accessor :verify_depth
-    ssl_context_accessor :cert_store
-
-    def ssl_timeout
-      return nil unless @ssl_context
-      @ssl_context.timeout
-    end
-
-    def ssl_timeout=(sec)
-      raise ArgumentError, 'Net::HTTP#ssl_timeout= called but use_ssl=false' \
-          unless use_ssl?
-      @ssl_context ||= OpenSSL::SSL::SSLContext.new
-      @ssl_context.timeout = sec
-    end
-
-    # For backward compatibility
-    alias timeout= ssl_timeout=
-
-    def peer_cert
-      return nil if not use_ssl? or not @socket
-      @socket.io.peer_cert
-    end
-  end
-
-end
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index f8c0d3be4c..f28c99e679 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -9,13 +9,14 @@
 # Documentation: Shugo Maeda, with RDoc conversion and overview by William
 # Webber.
 #
-# See Net::IMAP for documentation. 
+# See Net::IMAP for documentation.
 #
 
 
 require "socket"
 require "monitor"
 require "digest/md5"
+require "strscan"
 begin
   require "openssl"
 rescue LoadError
@@ -44,12 +45,12 @@ module Net
   # read-only access) #examine().  Once the client has successfully
   # selected a mailbox, they enter _selected_ state, and that
   # mailbox becomes the _current_ mailbox, on which mail-item
-  # related commands implicitly operate.  
+  # related commands implicitly operate.
   #
   # Messages have two sorts of identifiers: message sequence
-  # numbers, and UIDs.  
+  # numbers, and UIDs.
   #
-  # Message sequence numbers number messages within a mail box 
+  # Message sequence numbers number messages within a mail box
   # from 1 up to the number of items in the mail box.  If new
   # message arrives during a session, it receives a sequence
   # number equal to the new size of the mail box.  If messages
@@ -57,7 +58,7 @@ module Net
   # sequence numbers "shuffled down" to fill the gaps.
   #
   # UIDs, on the other hand, are permanently guaranteed not to
-  # identify another message within the same mailbox, even if 
+  # identify another message within the same mailbox, even if
   # the existing message is deleted.  UIDs are required to
   # be assigned in ascending (but not necessarily sequential)
   # order within a mailbox; this means that if a non-IMAP client
@@ -90,11 +91,11 @@ module Net
   #     imap.store(message_id, "+FLAGS", [:Deleted])
   #   end
   #   imap.expunge
-  # 
+  #
   # == Thread Safety
   #
   # Net::IMAP supports concurrent threads. For example,
-  # 
+  #
   #   imap = Net::IMAP.new("imap.foo.net", "imap2")
   #   imap.authenticate("cram-md5", "bar", "password")
   #   imap.select("inbox")
@@ -102,7 +103,7 @@ module Net
   #   search_result = imap.search(["BODY", "hello"])
   #   fetch_result = fetch_thread.value
   #   imap.disconnect
-  # 
+  #
   # This script invokes the FETCH command and the SEARCH command concurrently.
   #
   # == Errors
@@ -112,9 +113,9 @@ module Net
   #
   # NO:: the attempted command could not be successfully completed.  For
   #      instance, the username/password used for logging in are incorrect;
-  #      the selected mailbox does not exists; etc.  
+  #      the selected mailbox does not exists; etc.
   #
-  # BAD:: the request from the client does not follow the server's 
+  # BAD:: the request from the client does not follow the server's
   #       understanding of the IMAP protocol.  This includes attempting
   #       commands from the wrong client state; for instance, attempting
   #       to perform a SEARCH command without having SELECTed a current
@@ -146,8 +147,8 @@ module Net
   #
   # Finally, a Net::IMAP::DataFormatError is thrown if low-level data
   # is found to be in an incorrect format (for instance, when converting
-  # between UTF-8 and UTF-16), and Net::IMAP::ResponseParseError is 
-  # thrown if a server response is non-parseable. 
+  # between UTF-8 and UTF-16), and Net::IMAP::ResponseParseError is
+  # thrown if a server response is non-parseable.
   #
   #
   # == References
@@ -269,12 +270,24 @@ module Net
       return @@debug = val
     end
 
+    # Returns the max number of flags interned to symbols.
+    def self.max_flag_count
+      return @@max_flag_count
+    end
+
+    # Sets the max number of flags interned to symbols.
+    def self.max_flag_count=(count)
+      @@max_flag_count = count
+    end
+
     # Adds an authenticator for Net::IMAP#authenticate.  +auth_type+
     # is the type of authentication this authenticator supports
     # (for instance, "LOGIN").  The +authenticator+ is an object
     # which defines a process() method to handle authentication with
-    # the server.  See Net::IMAP::LoginAuthenticator and 
-    # Net::IMAP::CramMD5Authenticator for examples.
+    # the server.  See Net::IMAP::LoginAuthenticator,
+    # Net::IMAP::CramMD5Authenticator, and Net::IMAP::DigestMD5Authenticator
+    # for examples.
+    #
     #
     # If +auth_type+ refers to an existing authenticator, it will be
     # replaced by the new one.
@@ -284,13 +297,26 @@ module Net
 
     # Disconnects from the server.
     def disconnect
-      if SSL::SSLSocket === @sock
-        @sock.io.shutdown
-      else
-        @sock.shutdown
+      begin
+        begin
+          # try to call SSL::SSLSocket#io.
+          @sock.io.shutdown
+        rescue NoMethodError
+          # @sock is not an SSL::SSLSocket.
+          @sock.shutdown
+        end
+      rescue Errno::ENOTCONN
+        # ignore `Errno::ENOTCONN: Socket is not connected' on some platforms.
+      rescue Exception => e
+        @receiver_thread.raise(e)
       end
       @receiver_thread.join
-      @sock.close
+      synchronize do
+        unless @sock.closed?
+          @sock.close 
+        end
+      end
+      raise e if e
     end
 
     # Returns true if disconnected from the server.
@@ -305,7 +331,7 @@ module Net
     #
     # Note that the Net::IMAP class does not modify its
     # behaviour according to the capabilities of the server;
-    # it is up to the user of the class to ensure that 
+    # it is up to the user of the class to ensure that
     # a certain capability is supported by a server before
     # using it.
     def capability
@@ -326,12 +352,27 @@ module Net
       send_command("LOGOUT")
     end
 
+    # Sends a STARTTLS command to start TLS session.
+    def starttls(options = {}, verify = true)
+      send_command("STARTTLS") do |resp|
+        if resp.kind_of?(TaggedResponse) && resp.name == "OK"
+          begin
+            # for backward compatibility
+            certs = options.to_str
+            options = create_ssl_params(certs, verify)
+          rescue NoMethodError
+          end
+          start_tls_session(options)
+        end
+      end
+    end
+
     # Sends an AUTHENTICATE command to authenticate the client.
     # The +auth_type+ parameter is a string that represents
     # the authentication mechanism to be used. Currently Net::IMAP
     # supports authentication mechanisms:
     #
-    #   LOGIN:: login using cleartext user and password. 
+    #   LOGIN:: login using cleartext user and password.
     #   CRAM-MD5:: login with cleartext user and encrypted password
     #              (see [RFC-2195] for a full description).  This
     #              mechanism requires that the server have the user's
@@ -379,7 +420,7 @@ module Net
     end
 
     # Sends a SELECT command to select a +mailbox+ so that messages
-    # in the +mailbox+ can be accessed. 
+    # in the +mailbox+ can be accessed.
     #
     # After you have selected a mailbox, you may retrieve the
     # number of items in that mailbox from @responses["EXISTS"][-1],
@@ -430,7 +471,7 @@ module Net
     # Sends a RENAME command to change the name of the +mailbox+ to
     # +newname+.
     #
-    # A Net::IMAP::NoResponseError is raised if a mailbox with the 
+    # A Net::IMAP::NoResponseError is raised if a mailbox with the
     # name +mailbox+ cannot be renamed to +newname+ for whatever
     # reason; for instance, because +mailbox+ does not exist, or
     # because there is already a mailbox with the name +newname+.
@@ -477,8 +518,8 @@ module Net
     #   imap.create("foo/bar")
     #   imap.create("foo/baz")
     #   p imap.list("", "foo/%")
-    #   #=> [#<Net::IMAP::MailboxList attr=[:Noselect], delim="/", name="foo/">, \\ 
-    #        #<Net::IMAP::MailboxList attr=[:Noinferiors, :Marked], delim="/", name="foo/bar">, \\ 
+    #   #=> [#<Net::IMAP::MailboxList attr=[:Noselect], delim="/", name="foo/">, \\
+    #        #<Net::IMAP::MailboxList attr=[:Noinferiors, :Marked], delim="/", name="foo/bar">, \\
     #        #<Net::IMAP::MailboxList attr=[:Noinferiors], delim="/", name="foo/baz">]
     def list(refname, mailbox)
       synchronize do
@@ -531,7 +572,7 @@ module Net
     # then that user will be stripped of any rights to that mailbox.
     # The IMAP ACL commands are described in [RFC-2086].
     def setacl(mailbox, user, rights)
-      if rights.nil? 
+      if rights.nil?
         send_command("SETACL", mailbox, user, "")
       else
         send_command("SETACL", mailbox, user, rights)
@@ -550,7 +591,7 @@ module Net
 
     # Sends a LSUB command, and returns a subset of names from the set
     # of names that the user has declared as being "active" or
-    # "subscribed".  +refname+ and +mailbox+ are interpreted as 
+    # "subscribed".  +refname+ and +mailbox+ are interpreted as
     # for #list().
     # The return value is an array of +Net::IMAP::MailboxList+.
     def lsub(refname, mailbox)
@@ -573,7 +614,7 @@ module Net
     #   p imap.status("inbox", ["MESSAGES", "RECENT"])
     #   #=> {"RECENT"=>0, "MESSAGES"=>44}
     #
-    # A Net::IMAP::NoResponseError is raised if status values 
+    # A Net::IMAP::NoResponseError is raised if status values
     # for +mailbox+ cannot be returned, for instance because it
     # does not exist.
     def status(mailbox, attr)
@@ -584,9 +625,9 @@ module Net
     end
 
     # Sends a APPEND command to append the +message+ to the end of
-    # the +mailbox+. The optional +flags+ argument is an array of 
+    # the +mailbox+. The optional +flags+ argument is an array of
     # flags to initially passing to the new message.  The optional
-    # +date_time+ argument specifies the creation time to assign to the 
+    # +date_time+ argument specifies the creation time to assign to the
     # new message; it defaults to the current time.
     # For example:
     #
@@ -594,7 +635,7 @@ module Net
     #   Subject: hello
     #   From: shugo@ruby-lang.org
     #   To: shugo@ruby-lang.org
-    #   
+    #
     #   hello world
     #   EOF
     #
@@ -613,7 +654,7 @@ module Net
 
     # Sends a CHECK command to request a checkpoint of the currently
     # selected mailbox.  This performs implementation-specific
-    # housekeeping, for instance, reconciling the mailbox's 
+    # housekeeping, for instance, reconciling the mailbox's
     # in-memory and on-disk state.
     def check
       send_command("CHECK")
@@ -637,8 +678,8 @@ module Net
 
     # Sends a SEARCH command to search the mailbox for messages that
     # match the given searching criteria, and returns message sequence
-    # numbers.  +keys+ can either be a string holding the entire 
-    # search string, or a single-dimension array of search keywords and 
+    # numbers.  +keys+ can either be a string holding the entire
+    # search string, or a single-dimension array of search keywords and
     # arguments.  The following are some common search criteria;
     # see [IMAP] section 6.4.4 for a full list.
     #
@@ -662,7 +703,7 @@ module Net
     #
     # OR <search-key> <search-key>:: "or" two search keys together.
     #
-    # ON <date>:: messages with an internal date exactly equal to <date>, 
+    # ON <date>:: messages with an internal date exactly equal to <date>,
     #             which has a format similar to 8-Aug-2002.
     #
     # SINCE <date>:: messages with an internal date on or after <date>.
@@ -670,7 +711,7 @@ module Net
     # SUBJECT <string>:: messages with <string> in their subject.
     #
     # TO <string>:: messages with <string> in their TO field.
-    # 
+    #
     # For example:
     #
     #   p imap.search(["SUBJECT", "hello", "NOT", "NEW"])
@@ -693,8 +734,8 @@ module Net
     # The return value is an array of Net::IMAP::FetchData. For example:
     #
     #   p imap.fetch(6..8, "UID")
-    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"UID"=>98}>, \\ 
-    #        #<Net::IMAP::FetchData seqno=7, attr={"UID"=>99}>, \\ 
+    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"UID"=>98}>, \\
+    #        #<Net::IMAP::FetchData seqno=7, attr={"UID"=>99}>, \\
     #        #<Net::IMAP::FetchData seqno=8, attr={"UID"=>100}>]
     #   p imap.fetch(6, "BODY[HEADER.FIELDS (SUBJECT)]")
     #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"BODY[HEADER.FIELDS (SUBJECT)]"=>"Subject: test\r\n\r\n"}>]
@@ -717,9 +758,9 @@ module Net
     end
 
     # Sends a STORE command to alter data associated with messages
-    # in the mailbox, in particular their flags. The +set+ parameter 
-    # is a number or an array of numbers or a Range object. Each number 
-    # is a message sequence number.  +attr+ is the name of a data item 
+    # in the mailbox, in particular their flags. The +set+ parameter
+    # is a number or an array of numbers or a Range object. Each number
+    # is a message sequence number.  +attr+ is the name of a data item
     # to store: 'FLAGS' means to replace the message's flag list
     # with the provided one; '+FLAGS' means to add the provided flags;
     # and '-FLAGS' means to remove them.  +flags+ is a list of flags.
@@ -727,8 +768,8 @@ module Net
     # The return value is an array of Net::IMAP::FetchData. For example:
     #
     #   p imap.store(6..8, "+FLAGS", [:Deleted])
-    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\ 
-    #        #<Net::IMAP::FetchData seqno=7, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\  
+    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\
+    #        #<Net::IMAP::FetchData seqno=7, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\
     #        #<Net::IMAP::FetchData seqno=8, attr={"FLAGS"=>[:Seen, :Deleted]}>]
     def store(set, attr, flags)
       return store_internal("STORE", set, attr, flags)
@@ -770,9 +811,9 @@ module Net
       return sort_internal("UID SORT", sort_keys, search_keys, charset)
     end
 
-    # Adds a response handler. For example, to detect when 
+    # Adds a response handler. For example, to detect when
     # the server sends us a new EXISTS response (which normally
-    # indicates new messages being added to the mail box), 
+    # indicates new messages being added to the mail box),
     # you could add the following handler after selecting the
     # mailbox.
     #
@@ -808,12 +849,50 @@ module Net
       return thread_internal("THREAD", algorithm, search_keys, charset)
     end
 
-    # As for #thread(), but returns unique identifiers instead of 
+    # As for #thread(), but returns unique identifiers instead of
     # message sequence numbers.
     def uid_thread(algorithm, search_keys, charset)
       return thread_internal("UID THREAD", algorithm, search_keys, charset)
     end
 
+    # Sends an IDLE command that waits for notifications of new or expunged
+    # messages.  Yields responses from the server during the IDLE.
+    #
+    # Use #idle_done() to leave IDLE.
+    def idle(&response_handler)
+      raise LocalJumpError, "no block given" unless response_handler
+
+      response = nil
+
+      synchronize do
+        tag = Thread.current[:net_imap_tag] = generate_tag
+        put_string("#{tag} IDLE#{CRLF}")
+
+        begin
+          add_response_handler(response_handler)
+          @idle_done_cond = new_cond
+          @idle_done_cond.wait
+          @idle_done_cond = nil
+        ensure
+          remove_response_handler(response_handler)
+          put_string("DONE#{CRLF}")
+          response = get_tagged_response(tag, "IDLE")
+        end
+      end
+
+      return response
+    end
+
+    # Leaves IDLE.
+    def idle_done
+      synchronize do
+        if @idle_done_cond.nil?
+          raise Net::IMAP::Error, "not during IDLE"
+        end
+        @idle_done_cond.signal
+      end
+    end
+
     # Decode a string from modified UTF-7 format to UTF-8.
     #
     # UTF-7 is a 7-bit encoding of Unicode [UTF7].  IMAP uses a
@@ -832,39 +911,60 @@ module Net
           if x > 0
             base64.concat("=" * (4 - x))
           end
-          u16tou8(base64.unpack("m")[0])
+          base64.unpack("m")[0].unpack("n*").pack("U*")
         end
-      }
+      }.force_encoding("UTF-8")
     end
 
     # Encode a string from UTF-8 format to modified UTF-7.
     def self.encode_utf7(s)
-      return s.gsub(/(&)|([^\x20-\x25\x27-\x7e]+)/n) { |x|
+      return s.gsub(/(&)|([^\x20-\x7e]+)/u) {
         if $1
           "&-"
         else
-          base64 = [u8tou16(x)].pack("m")
+          base64 = [$&.unpack("U*").pack("n*")].pack("m")
           "&" + base64.delete("=\n").tr("/", ",") + "-"
         end
-      }
+      }.force_encoding("ASCII-8BIT")
+    end
+
+    # Formats +time+ as an IMAP-style date.
+    def self.format_date(time)
+      return time.strftime('%d-%b-%Y')
+    end
+
+    # Formats +time+ as an IMAP-style date-time.
+    def self.format_datetime(time)
+      return time.strftime('%d-%b-%Y %H:%M %z')
     end
 
     private
 
     CRLF = "\r\n"      # :nodoc:
     PORT = 143         # :nodoc:
+    SSL_PORT = 993   # :nodoc:
 
     @@debug = false
     @@authenticators = {}
+    @@max_flag_count = 10000
 
+    # call-seq:
+    #    Net::IMAP.new(host, options = {})
+    #
     # Creates a new Net::IMAP object and connects it to the specified
-    # +port+ (143 by default) on the named +host+.  If +usessl+ is true, 
-    # then an attempt will
-    # be made to use SSL (now TLS) to connect to the server.  For this
-    # to work OpenSSL [OSSL] and the Ruby OpenSSL [RSSL]
-    # extensions need to be installed.  The +certs+ parameter indicates
-    # the path or file containing the CA cert of the server, and the
-    # +verify+ parameter is for the OpenSSL verification callback.
+    # +host+.
+    #
+    # +options+ is an option hash, each key of which is a symbol.
+    #
+    # The available options are:
+    #
+    # port::  port number (default value is 143 for imap, or 993 for imaps)
+    # ssl::   if options[:ssl] is true, then an attempt will be made
+    #         to use SSL (now TLS) to connect to the server.  For this to work
+    #         OpenSSL [OSSL] and the Ruby OpenSSL [RSSL] extensions need to
+    #         be installed.
+    #         if options[:ssl] is a hash, it's passed to
+    #         OpenSSL::SSL::SSLContext#set_params as parameters.
     #
     # The most common errors are:
     #
@@ -874,72 +974,85 @@ module Net
     #                    being dropped by an intervening firewall).
     # Errno::ENETUNREACH:: there is no route to that network.
     # SocketError:: hostname not known or other socket error.
-    # Net::IMAP::ByeResponseError:: we connected to the host, but they 
+    # Net::IMAP::ByeResponseError:: we connected to the host, but they
     #                               immediately said goodbye to us.
-    def initialize(host, port = PORT, usessl = false, certs = nil, verify = false)
+    def initialize(host, port_or_options = {},
+                   usessl = false, certs = nil, verify = true)
       super()
       @host = host
-      @port = port
+      begin
+        options = port_or_options.to_hash
+      rescue NoMethodError
+        # for backward compatibility
+        options = {}
+        options[:port] = port_or_options
+        if usessl
+          options[:ssl] = create_ssl_params(certs, verify)
+        end
+      end
+      @port = options[:port] || (options[:ssl] ? SSL_PORT : PORT)
       @tag_prefix = "RUBY"
       @tagno = 0
       @parser = ResponseParser.new
-      @sock = TCPSocket.open(host, port)
-      if usessl
-        unless defined?(OpenSSL)
-          raise "SSL extension not installed"
-        end
+      @sock = TCPSocket.open(@host, @port)
+      if options[:ssl]
+        start_tls_session(options[:ssl])
         @usessl = true
-
-        # verify the server.
-        context = SSLContext::new()
-        context.ca_file = certs if certs && FileTest::file?(certs)
-        context.ca_path = certs if certs && FileTest::directory?(certs)
-        context.verify_mode = VERIFY_PEER if verify
-        if defined?(VerifyCallbackProc)
-          context.verify_callback = VerifyCallbackProc 
-        end
-        @sock = SSLSocket.new(@sock, context)
-        @sock.connect   # start ssl session.
-        @sock.post_connection_check(@host) if verify
       else
         @usessl = false
       end
       @responses = Hash.new([].freeze)
       @tagged_responses = {}
       @response_handlers = []
-      @response_arrival = new_cond
-      @continuation_request = nil
+      @tagged_response_arrival = new_cond
+      @continuation_request_arrival = new_cond
+      @idle_done_cond = nil
       @logout_command_tag = nil
       @debug_output_bol = true
+      @exception = nil
 
       @greeting = get_response
       if @greeting.name == "BYE"
         @sock.close
-        raise ByeResponseError, @greeting.raw_data
+        raise ByeResponseError, @greeting
       end
 
       @client_thread = Thread.current
       @receiver_thread = Thread.start {
-        receive_responses
+        begin
+          receive_responses
+        rescue Exception
+        end
       }
     end
 
     def receive_responses
-      while true
+      connection_closed = false
+      until connection_closed
+        synchronize do
+          @exception = nil
+        end
         begin
           resp = get_response
-        rescue Exception
-          @sock.close
-          @client_thread.raise($!)
+        rescue Exception => e
+          synchronize do
+            @sock.close
+            @exception = e
+          end
+          break
+        end
+        unless resp
+          synchronize do
+            @exception = EOFError.new("end of file reached")
+          end
           break
         end
-        break unless resp
         begin
           synchronize do
             case resp
             when TaggedResponse
               @tagged_responses[resp.tag] = resp
-              @response_arrival.broadcast
+              @tagged_response_arrival.broadcast
               if resp.tag == @logout_command_tag
                 return
               end
@@ -951,36 +1064,41 @@ module Net
               end
               if resp.name == "BYE" && @logout_command_tag.nil?
                 @sock.close
-                raise ByeResponseError, resp.raw_data
+                @exception = ByeResponseError.new(resp)
+                connection_closed = true
               end
             when ContinuationRequest
-              @continuation_request = resp
-              @response_arrival.broadcast
+              @continuation_request_arrival.signal
             end
             @response_handlers.each do |handler|
               handler.call(resp)
             end
           end
-        rescue Exception
-          @client_thread.raise($!)
+        rescue Exception => e
+          @exception = e
+          synchronize do
+            @tagged_response_arrival.broadcast
+            @continuation_request_arrival.broadcast
+          end
         end
       end
+      synchronize do
+        @tagged_response_arrival.broadcast
+        @continuation_request_arrival.broadcast
+      end
     end
 
-    def get_tagged_response(tag)
+    def get_tagged_response(tag, cmd)
       until @tagged_responses.key?(tag)
-        @response_arrival.wait
+        raise @exception if @exception
+        @tagged_response_arrival.wait
       end
-      return pick_up_tagged_response(tag)
-    end
-
-    def pick_up_tagged_response(tag)
       resp = @tagged_responses.delete(tag)
       case resp.name
       when /\A(?:NO)\z/ni
-        raise NoResponseError, resp.data.text
+        raise NoResponseError, resp
       when /\A(?:BAD)\z/ni
-        raise BadResponseError, resp.data.text
+        raise BadResponseError, resp
       else
         return resp
       end
@@ -1015,7 +1133,10 @@ module Net
 
     def send_command(cmd, *args, &block)
       synchronize do
-        tag = Thread.current[:net_imap_tag] = generate_tag
+        args.each do |i|
+          validate_data(i)
+        end
+        tag = generate_tag
         put_string(tag + " " + cmd)
         args.each do |i|
           put_string(" ")
@@ -1029,7 +1150,7 @@ module Net
           add_response_handler(block)
         end
         begin
-          return get_tagged_response(tag)
+          return get_tagged_response(tag, cmd)
         ensure
           if block
             remove_response_handler(block)
@@ -1042,7 +1163,7 @@ module Net
       @tagno += 1
       return format("%s%04d", @tag_prefix, @tagno)
     end
-    
+
     def put_string(str)
       @sock.print(str)
       if @@debug
@@ -1058,6 +1179,25 @@ module Net
       end
     end
 
+    def validate_data(data)
+      case data
+      when nil
+      when String
+      when Integer
+        if data < 0 || data >= 4294967296
+          raise DataFormatError, num.to_s
+        end
+      when Array
+        data.each do |i|
+          validate_data(i)
+        end
+      when Time
+      when Symbol
+      else
+        data.validate
+      end
+    end
+
     def send_data(data)
       case data
       when nil
@@ -1091,29 +1231,19 @@ module Net
         put_string(str)
       end
     end
-    
+
     def send_quoted_string(str)
       put_string('"' + str.gsub(/["\\]/n, "\\\\\\&") + '"')
     end
 
     def send_literal(str)
-      put_string("{" + str.length.to_s + "}" + CRLF)
-      while @continuation_request.nil? &&
-        !@tagged_responses.key?(Thread.current[:net_imap_tag])
-        @response_arrival.wait
-      end
-      if @continuation_request.nil?
-        pick_up_tagged_response(Thread.current[:net_imap_tag])
-        raise ResponseError.new("expected continuation request")
-      end
-      @continuation_request = nil
+      put_string("{" + str.bytesize.to_s + "}" + CRLF)
+      @continuation_request_arrival.wait
+      raise @exception if @exception
       put_string(str)
     end
 
     def send_number_data(num)
-      if num < 0 || num >= 4294967296
-        raise DataFormatError, num.to_s
-      end
       put_string(num.to_s)
     end
 
@@ -1162,9 +1292,15 @@ module Net
     end
 
     def fetch_internal(cmd, set, attr)
-      if attr.instance_of?(String)
+      case attr
+      when String then
         attr = RawData.new(attr)
+      when Array then
+        attr = attr.map { |arg|
+          arg.is_a?(String) ? RawData.new(arg) : arg
+        }
       end
+
       synchronize do
         @responses.delete("FETCH")
         send_command(cmd, MessageSet.new(set), attr)
@@ -1222,130 +1358,56 @@ module Net
       end
     end
 
-    def self.u16tou8(s)
-      len = s.length
-      if len < 2
-        return ""
-      end
-      buf = ""
-      i = 0
-      while i < len
-        c = s[i] << 8 | s[i + 1]
-        i += 2
-        if c == 0xfeff
-          next
-        elsif c < 0x0080
-          buf.concat(c)
-        elsif c < 0x0800
-          b2 = c & 0x003f
-          b1 = c >> 6
-          buf.concat(b1 | 0xc0)
-          buf.concat(b2 | 0x80)
-        elsif c >= 0xdc00 && c < 0xe000
-          raise DataFormatError, "invalid surrogate detected"
-        elsif c >= 0xd800 && c < 0xdc00
-          if i + 2 > len
-            raise DataFormatError, "invalid surrogate detected"
-          end
-          low = s[i] << 8 | s[i + 1]
-          i += 2
-          if low < 0xdc00 || low > 0xdfff
-            raise DataFormatError, "invalid surrogate detected"
-          end
-          c = (((c & 0x03ff)) << 10 | (low & 0x03ff)) + 0x10000
-          b4 = c & 0x003f
-          b3 = (c >> 6) & 0x003f
-          b2 = (c >> 12) & 0x003f
-          b1 = c >> 18;
-          buf.concat(b1 | 0xf0)
-          buf.concat(b2 | 0x80)
-          buf.concat(b3 | 0x80)
-          buf.concat(b4 | 0x80)
-        else # 0x0800-0xffff
-          b3 = c & 0x003f
-          b2 = (c >> 6) & 0x003f
-          b1 = c >> 12
-          buf.concat(b1 | 0xe0)
-          buf.concat(b2 | 0x80)
-          buf.concat(b3 | 0x80)
-        end
-      end
-      return buf
-    end
-    private_class_method :u16tou8
-
-    def self.u8tou16(s)
-      len = s.length
-      buf = ""
-      i = 0
-      while i < len
-        c = s[i]
-        if (c & 0x80) == 0
-          buf.concat(0x00)
-          buf.concat(c)
-          i += 1
-        elsif (c & 0xe0) == 0xc0 &&
-            len >= 2 &&
-            (s[i + 1] & 0xc0) == 0x80
-          if c == 0xc0 || c == 0xc1
-            raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
-          end
-          u = ((c & 0x1f) << 6) | (s[i + 1] & 0x3f)
-          buf.concat(u >> 8)
-          buf.concat(u & 0x00ff)
-          i += 2
-        elsif (c & 0xf0) == 0xe0 &&
-            i + 2 < len &&
-            (s[i + 1] & 0xc0) == 0x80 &&
-            (s[i + 2] & 0xc0) == 0x80
-          if c == 0xe0 && s[i + 1] < 0xa0
-            raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
-          end
-          u = ((c & 0x0f) << 12) | ((s[i + 1] & 0x3f) << 6) | (s[i + 2] & 0x3f)
-          # surrogate chars
-          if u >= 0xd800 && u <= 0xdfff
-            raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
-          end
-          buf.concat(u >> 8)
-          buf.concat(u & 0x00ff)
-          i += 3
-        elsif (c & 0xf8) == 0xf0 &&
-            i + 3 < len &&
-            (s[i + 1] & 0xc0) == 0x80 &&
-            (s[i + 2] & 0xc0) == 0x80 &&
-            (s[i + 3] & 0xc0) == 0x80
-          if c == 0xf0 && s[i + 1] < 0x90
-            raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
-          end
-          u = ((c & 0x07) << 18) | ((s[i + 1] & 0x3f) << 12) |
-            ((s[i + 2] & 0x3f) << 6) | (s[i + 3] & 0x3f)
-          if u < 0x10000
-            buf.concat(u >> 8)
-            buf.concat(u & 0x00ff)
-          elsif u < 0x110000
-            high = ((u - 0x10000) >> 10) | 0xd800
-            low = (u & 0x03ff) | 0xdc00
-            buf.concat(high >> 8)
-            buf.concat(high & 0x00ff)
-            buf.concat(low >> 8)
-            buf.concat(low & 0x00ff)
-          else
-            raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
-          end
-          i += 4
-        else
-          raise DataFormatError, format("illegal UTF-8 sequence (%02x)", c)
+    def create_ssl_params(certs = nil, verify = true)
+      params = {}
+      if certs
+        if File.file?(certs)
+          params[:ca_file] = certs
+        elsif File.directory?(certs)
+          params[:ca_path] = certs
         end
       end
-      return buf
+      if verify
+        params[:verify_mode] = VERIFY_PEER
+      else
+        params[:verify_mode] = VERIFY_NONE
+      end
+      return params
+    end
+
+    def start_tls_session(params = {})
+      unless defined?(OpenSSL)
+        raise "SSL extension not installed"
+      end
+      if @sock.kind_of?(OpenSSL::SSL::SSLSocket)
+        raise RuntimeError, "already using SSL"
+      end
+      begin
+        params = params.to_hash
+      rescue NoMethodError
+        params = {}
+      end
+      context = SSLContext.new
+      context.set_params(params)
+      if defined?(VerifyCallbackProc)
+        context.verify_callback = VerifyCallbackProc
+      end
+      @sock = SSLSocket.new(@sock, context)
+      @sock.sync_close = true
+      @sock.connect
+      if context.verify_mode != VERIFY_NONE
+        @sock.post_connection_check(@host)
+      end
     end
-    private_class_method :u8tou16
 
     class RawData # :nodoc:
       def send_data(imap)
         imap.send(:put_string, @data)
       end
 
+      def validate
+      end
+
       private
 
       def initialize(data)
@@ -1358,6 +1420,9 @@ module Net
         imap.send(:put_string, @data)
       end
 
+      def validate
+      end
+
       private
 
       def initialize(data)
@@ -1370,6 +1435,9 @@ module Net
         imap.send(:send_quoted_string, @data)
       end
 
+      def validate
+      end
+
       private
 
       def initialize(data)
@@ -1382,6 +1450,9 @@ module Net
         imap.send(:send_literal, @data)
       end
 
+      def validate
+      end
+
       private
 
       def initialize(data)
@@ -1394,6 +1465,10 @@ module Net
         imap.send(:put_string, format_internal(@data))
       end
 
+      def validate
+        validate_internal(@data)
+      end
+
       private
 
       def initialize(data)
@@ -1405,7 +1480,6 @@ module Net
         when "*"
           return data
         when Integer
-          ensure_nz_number(data)
           if data == -1
             return "*"
           else
@@ -1419,6 +1493,23 @@ module Net
         when ThreadMember
           return data.seqno.to_s +
             ":" + data.children.collect {|i| format_internal(i).join(",")}
+        end
+      end
+
+      def validate_internal(data)
+        case data
+        when "*"
+        when Integer
+          ensure_nz_number(data)
+        when Range
+        when Array
+          data.each do |i|
+            validate_internal(i)
+          end
+        when ThreadMember
+          data.children.each do |i|
+            validate_internal(i)
+          end
         else
           raise DataFormatError, data.inspect
         end
@@ -1434,109 +1525,109 @@ module Net
     end
 
     # Net::IMAP::ContinuationRequest represents command continuation requests.
-    # 
+    #
     # The command continuation request response is indicated by a "+" token
     # instead of a tag.  This form of response indicates that the server is
     # ready to accept the continuation of a command from the client.  The
     # remainder of this response is a line of text.
-    # 
+    #
     #   continue_req    ::= "+" SPACE (resp_text / base64)
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # data:: Returns the data (Net::IMAP::ResponseText).
-    # 
+    #
     # raw_data:: Returns the raw data string.
     ContinuationRequest = Struct.new(:data, :raw_data)
 
     # Net::IMAP::UntaggedResponse represents untagged responses.
-    # 
+    #
     # Data transmitted by the server to the client and status responses
     # that do not indicate command completion are prefixed with the token
     # "*", and are called untagged responses.
-    # 
+    #
     #   response_data   ::= "*" SPACE (resp_cond_state / resp_cond_bye /
     #                       mailbox_data / message_data / capability_data)
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # name:: Returns the name such as "FLAGS", "LIST", "FETCH"....
-    # 
+    #
     # data:: Returns the data such as an array of flag symbols,
     #         a ((<Net::IMAP::MailboxList>)) object....
-    # 
+    #
     # raw_data:: Returns the raw data string.
     UntaggedResponse = Struct.new(:name, :data, :raw_data)
-     
+
     # Net::IMAP::TaggedResponse represents tagged responses.
-    # 
+    #
     # The server completion result response indicates the success or
     # failure of the operation.  It is tagged with the same tag as the
     # client command which began the operation.
-    # 
+    #
     #   response_tagged ::= tag SPACE resp_cond_state CRLF
-    #   
+    #
     #   tag             ::= 1*<any ATOM_CHAR except "+">
-    #   
+    #
     #   resp_cond_state ::= ("OK" / "NO" / "BAD") SPACE resp_text
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # tag:: Returns the tag.
-    # 
+    #
     # name:: Returns the name. the name is one of "OK", "NO", "BAD".
-    # 
+    #
     # data:: Returns the data. See ((<Net::IMAP::ResponseText>)).
-    # 
+    #
     # raw_data:: Returns the raw data string.
     #
     TaggedResponse = Struct.new(:tag, :name, :data, :raw_data)
-     
+
     # Net::IMAP::ResponseText represents texts of responses.
     # The text may be prefixed by the response code.
-    # 
+    #
     #   resp_text       ::= ["[" resp_text_code "]" SPACE] (text_mime2 / text)
     #                       ;; text SHOULD NOT begin with "[" or "="
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # code:: Returns the response code. See ((<Net::IMAP::ResponseCode>)).
-    #       
+    #
     # text:: Returns the text.
-    # 
+    #
     ResponseText = Struct.new(:code, :text)
 
-    # 
+    #
     # Net::IMAP::ResponseCode represents response codes.
-    # 
+    #
     #   resp_text_code  ::= "ALERT" / "PARSE" /
     #                       "PERMANENTFLAGS" SPACE "(" #(flag / "\*") ")" /
     #                       "READ-ONLY" / "READ-WRITE" / "TRYCREATE" /
     #                       "UIDVALIDITY" SPACE nz_number /
     #                       "UNSEEN" SPACE nz_number /
     #                       atom [SPACE 1*<any TEXT_CHAR except "]">]
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # name:: Returns the name such as "ALERT", "PERMANENTFLAGS", "UIDVALIDITY"....
-    # 
+    #
     # data:: Returns the data if it exists.
     #
     ResponseCode = Struct.new(:name, :data)
 
     # Net::IMAP::MailboxList represents contents of the LIST response.
-    # 
+    #
     #   mailbox_list    ::= "(" #("\Marked" / "\Noinferiors" /
     #                       "\Noselect" / "\Unmarked" / flag_extension) ")"
     #                       SPACE (<"> QUOTED_CHAR <"> / nil) SPACE mailbox
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # attr:: Returns the name attributes. Each name attribute is a symbol
     #        capitalized by String#capitalize, such as :Noselect (not :NoSelect).
-    # 
+    #
     # delim:: Returns the hierarchy delimiter
-    # 
+    #
     # name:: Returns the mailbox name.
     #
     MailboxList = Struct.new(:attr, :delim, :name)
@@ -1545,78 +1636,78 @@ module Net
     # This object can also be a response to GETQUOTAROOT.  In the syntax
     # specification below, the delimiter used with the "#" construct is a
     # single space (SPACE).
-    # 
+    #
     #    quota_list      ::= "(" #quota_resource ")"
-    # 
+    #
     #    quota_resource  ::= atom SPACE number SPACE number
-    # 
+    #
     #    quota_response  ::= "QUOTA" SPACE astring SPACE quota_list
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # mailbox:: The mailbox with the associated quota.
-    # 
+    #
     # usage:: Current storage usage of mailbox.
-    # 
+    #
     # quota:: Quota limit imposed on mailbox.
     #
     MailboxQuota = Struct.new(:mailbox, :usage, :quota)
 
     # Net::IMAP::MailboxQuotaRoot represents part of the GETQUOTAROOT
     # response. (GETQUOTAROOT can also return Net::IMAP::MailboxQuota.)
-    # 
+    #
     #    quotaroot_response ::= "QUOTAROOT" SPACE astring *(SPACE astring)
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # mailbox:: The mailbox with the associated quota.
-    # 
+    #
     # quotaroots:: Zero or more quotaroots that effect the quota on the
     #              specified mailbox.
     #
     MailboxQuotaRoot = Struct.new(:mailbox, :quotaroots)
 
     # Net::IMAP::MailboxACLItem represents response from GETACL.
-    # 
+    #
     #    acl_data        ::= "ACL" SPACE mailbox *(SPACE identifier SPACE rights)
-    # 
+    #
     #    identifier      ::= astring
-    # 
+    #
     #    rights          ::= astring
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # user:: Login name that has certain rights to the mailbox
     #        that was specified with the getacl command.
-    # 
+    #
     # rights:: The access rights the indicated user has to the
     #          mailbox.
     #
     MailboxACLItem = Struct.new(:user, :rights)
 
     # Net::IMAP::StatusData represents contents of the STATUS response.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # mailbox:: Returns the mailbox name.
-    # 
+    #
     # attr:: Returns a hash. Each key is one of "MESSAGES", "RECENT", "UIDNEXT",
     #        "UIDVALIDITY", "UNSEEN". Each value is a number.
-    # 
+    #
     StatusData = Struct.new(:mailbox, :attr)
 
     # Net::IMAP::FetchData represents contents of the FETCH response.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # seqno:: Returns the message sequence number.
     #         (Note: not the unique identifier, even for the UID command response.)
-    # 
+    #
     # attr:: Returns a hash. Each key is a data item name, and each value is
     #        its value.
-    # 
+    #
     #        The current data items are:
-    # 
+    #
     #        [BODY]
     #           A form of BODYSTRUCTURE without extension data.
     #        [BODY[<section>]<<origin_octet>>]
@@ -1643,67 +1734,67 @@ module Net
     #           Equivalent to BODY[TEXT].
     #        [UID]
     #           A number expressing the unique identifier of the message.
-    # 
+    #
     FetchData = Struct.new(:seqno, :attr)
 
     # Net::IMAP::Envelope represents envelope structures of messages.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # date:: Returns a string that represents the date.
-    # 
+    #
     # subject:: Returns a string that represents the subject.
-    # 
+    #
     # from:: Returns an array of Net::IMAP::Address that represents the from.
-    # 
+    #
     # sender:: Returns an array of Net::IMAP::Address that represents the sender.
-    # 
+    #
     # reply_to:: Returns an array of Net::IMAP::Address that represents the reply-to.
-    # 
+    #
     # to:: Returns an array of Net::IMAP::Address that represents the to.
-    # 
+    #
     # cc:: Returns an array of Net::IMAP::Address that represents the cc.
-    # 
+    #
     # bcc:: Returns an array of Net::IMAP::Address that represents the bcc.
-    # 
+    #
     # in_reply_to:: Returns a string that represents the in-reply-to.
-    # 
+    #
     # message_id:: Returns a string that represents the message-id.
-    # 
+    #
     Envelope = Struct.new(:date, :subject, :from, :sender, :reply_to,
                           :to, :cc, :bcc, :in_reply_to, :message_id)
 
-    # 
+    #
     # Net::IMAP::Address represents electronic mail addresses.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # name:: Returns the phrase from [RFC-822] mailbox.
-    # 
+    #
     # route:: Returns the route from [RFC-822] route-addr.
-    # 
+    #
     # mailbox:: nil indicates end of [RFC-822] group.
     #           If non-nil and host is nil, returns [RFC-822] group name.
     #           Otherwise, returns [RFC-822] local-part
-    # 
+    #
     # host:: nil indicates [RFC-822] group syntax.
     #        Otherwise, returns [RFC-822] domain name.
     #
     Address = Struct.new(:name, :route, :mailbox, :host)
 
-    # 
+    #
     # Net::IMAP::ContentDisposition represents Content-Disposition fields.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # dsp_type:: Returns the disposition type.
-    # 
+    #
     # param:: Returns a hash that represents parameters of the Content-Disposition
     #         field.
-    # 
+    #
     ContentDisposition = Struct.new(:dsp_type, :param)
 
-    # Net::IMAP::ThreadMember represents a thread-node returned 
+    # Net::IMAP::ThreadMember represents a thread-node returned
     # by Net::IMAP#thread
     #
     # ==== Fields:
@@ -1716,37 +1807,37 @@ module Net
     ThreadMember = Struct.new(:seqno, :children)
 
     # Net::IMAP::BodyTypeBasic represents basic body structures of messages.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # media_type:: Returns the content media type name as defined in [MIME-IMB].
-    # 
+    #
     # subtype:: Returns the content subtype name as defined in [MIME-IMB].
-    # 
+    #
     # param:: Returns a hash that represents parameters as defined in [MIME-IMB].
-    # 
+    #
     # content_id:: Returns a string giving the content id as defined in [MIME-IMB].
-    # 
+    #
     # description:: Returns a string giving the content description as defined in
     #               [MIME-IMB].
-    # 
+    #
     # encoding:: Returns a string giving the content transfer encoding as defined in
     #            [MIME-IMB].
-    # 
+    #
     # size:: Returns a number giving the size of the body in octets.
-    # 
+    #
     # md5:: Returns a string giving the body MD5 value as defined in [MD5].
-    # 
+    #
     # disposition:: Returns a Net::IMAP::ContentDisposition object giving
     #               the content disposition.
-    # 
+    #
     # language:: Returns a string or an array of strings giving the body
     #            language value as defined in [LANGUAGE-TAGS].
-    # 
+    #
     # extension:: Returns extension data.
-    # 
+    #
     # multipart?:: Returns false.
-    # 
+    #
     class BodyTypeBasic < Struct.new(:media_type, :subtype,
                                      :param, :content_id,
                                      :description, :encoding, :size,
@@ -1757,7 +1848,7 @@ module Net
       end
 
       # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
+      # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
         $stderr.printf("warning: media_subtype is obsolete.\n")
@@ -1767,13 +1858,13 @@ module Net
     end
 
     # Net::IMAP::BodyTypeText represents TEXT body structures of messages.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # lines:: Returns the size of the body in text lines.
-    # 
+    #
     # And Net::IMAP::BodyTypeText has all fields of Net::IMAP::BodyTypeBasic.
-    # 
+    #
     class BodyTypeText < Struct.new(:media_type, :subtype,
                                     :param, :content_id,
                                     :description, :encoding, :size,
@@ -1785,7 +1876,7 @@ module Net
       end
 
       # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
+      # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
         $stderr.printf("warning: media_subtype is obsolete.\n")
@@ -1795,13 +1886,13 @@ module Net
     end
 
     # Net::IMAP::BodyTypeMessage represents MESSAGE/RFC822 body structures of messages.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # envelope:: Returns a Net::IMAP::Envelope giving the envelope structure.
-    # 
+    #
     # body:: Returns an object giving the body structure.
-    # 
+    #
     # And Net::IMAP::BodyTypeMessage has all methods of Net::IMAP::BodyTypeText.
     #
     class BodyTypeMessage < Struct.new(:media_type, :subtype,
@@ -1815,7 +1906,7 @@ module Net
       end
 
       # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
+      # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
         $stderr.printf("warning: media_subtype is obsolete.\n")
@@ -1824,29 +1915,29 @@ module Net
       end
     end
 
-    # Net::IMAP::BodyTypeMultipart represents multipart body structures 
+    # Net::IMAP::BodyTypeMultipart represents multipart body structures
     # of messages.
-    # 
+    #
     # ==== Fields:
-    # 
+    #
     # media_type:: Returns the content media type name as defined in [MIME-IMB].
-    # 
+    #
     # subtype:: Returns the content subtype name as defined in [MIME-IMB].
-    # 
+    #
     # parts:: Returns multiple parts.
-    # 
+    #
     # param:: Returns a hash that represents parameters as defined in [MIME-IMB].
-    # 
+    #
     # disposition:: Returns a Net::IMAP::ContentDisposition object giving
     #               the content disposition.
-    # 
+    #
     # language:: Returns a string or an array of strings giving the body
     #            language value as defined in [LANGUAGE-TAGS].
-    # 
+    #
     # extension:: Returns extension data.
-    # 
+    #
     # multipart?:: Returns true.
-    # 
+    #
     class BodyTypeMultipart < Struct.new(:media_type, :subtype,
                                          :parts,
                                          :param, :disposition, :language,
@@ -1856,7 +1947,7 @@ module Net
       end
 
       # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
+      # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
         $stderr.printf("warning: media_subtype is obsolete.\n")
@@ -1866,6 +1957,14 @@ module Net
     end
 
     class ResponseParser # :nodoc:
+      def initialize
+        @str = nil
+        @pos = nil
+        @lex_state = nil
+        @token = nil
+        @flag_symbols = {}
+      end
+
       def parse(str)
         @str = str
         @pos = 0
@@ -2472,7 +2571,7 @@ module Net
           return '""'
         when /[\x80-\xff\r\n]/n
           # literal
-          return "{" + str.length.to_s + "}" + CRLF + str
+          return "{" + str.bytesize.to_s + "}" + CRLF + str
         when /[(){ \x00-\x1f\x7f%*"\\]/n
           # quoted string
           return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
@@ -2657,35 +2756,35 @@ module Net
       def thread_branch(token)
         rootmember = nil
         lastmember = nil
-        
+
         while true
           shift_token    # ignore first T_LPAR
           token = lookahead
-          
+
           case token.symbol
           when T_NUMBER
             # new member
             newmember = ThreadMember.new(number, [])
             if rootmember.nil?
               rootmember = newmember
-            else    
+            else
               lastmember.children << newmember
-            end     
+            end
             lastmember = newmember
-          when T_SPACE 
-            # do nothing 
+          when T_SPACE
+            # do nothing
           when T_LPAR
             if rootmember.nil?
               # dummy member
               lastmember = rootmember = ThreadMember.new(nil, [])
-            end     
-            
+            end
+
             lastmember.children << thread_branch(token)
           when T_RPAR
-            break   
-          end     
+            break
+          end
         end
-        
+
         return rootmember
       end
 
@@ -2762,11 +2861,16 @@ module Net
           match(T_SPACE)
           result = ResponseCode.new(name, number)
         else
-          match(T_SPACE)
-          @lex_state = EXPR_CTEXT
-          token = match(T_TEXT)
-          @lex_state = EXPR_BEG
-          result = ResponseCode.new(name, token.value)
+          token = lookahead
+          if token.symbol == T_SPACE
+            shift_token
+            @lex_state = EXPR_CTEXT
+            token = match(T_TEXT)
+            @lex_state = EXPR_BEG
+            result = ResponseCode.new(name, token.value)
+          else
+            result = ResponseCode.new(name, nil)
+          end
         end
         match(T_RBRA)
         @lex_state = EXPR_RTEXT
@@ -2871,7 +2975,16 @@ module Net
         if @str.index(/\(([^)]*)\)/ni, @pos)
           @pos = $~.end(0)
           return $1.scan(FLAG_REGEXP).collect { |flag, atom|
-            atom || flag.capitalize.intern
+            if atom
+              atom
+            else
+              symbol = flag.capitalize.untaint.intern
+              @flag_symbols[symbol] = true
+              if @flag_symbols.length > IMAP.max_flag_count
+                raise FlagCountError, "number of flag symbols exceeded"
+              end
+              symbol
+            end
           }
         else
           parse_error("invalid flag list")
@@ -3105,7 +3218,7 @@ module Net
             parse_error("unknown token - %s", $&.dump)
           end
         else
-          parse_error("illegal @lex_state - %s", @lex_state.inspect)
+          parse_error("invalid @lex_state - %s", @lex_state.inspect)
         end
       end
 
@@ -3149,6 +3262,22 @@ module Net
     end
     add_authenticator "LOGIN", LoginAuthenticator
 
+    # Authenticator for the "PLAIN" authentication type.  See
+    # #authenticate().
+    class PlainAuthenticator
+      def process(data)
+        return "\0#{@user}\0#{@password}"
+      end
+
+      private
+
+      def initialize(user, password)
+        @user = user
+        @password = password
+      end
+    end
+    add_authenticator "PLAIN", PlainAuthenticator
+
     # Authenticator for the "CRAM-MD5" authentication type.  See
     # #authenticate().
     class CramMD5Authenticator
@@ -3172,8 +3301,8 @@ module Net
         k_ipad = key + "\0" * (64 - key.length)
         k_opad = key + "\0" * (64 - key.length)
         for i in 0..63
-          k_ipad[i] ^= 0x36
-          k_opad[i] ^= 0x5c
+          k_ipad[i] = (k_ipad[i].ord ^ 0x36).chr
+          k_opad[i] = (k_opad[i].ord ^ 0x5c).chr
         end
 
         digest = Digest::MD5.digest(k_ipad + text)
@@ -3183,6 +3312,106 @@ module Net
     end
     add_authenticator "CRAM-MD5", CramMD5Authenticator
 
+    # Authenticator for the "DIGEST-MD5" authentication type.  See
+    # #authenticate().
+    class DigestMD5Authenticator
+      def process(challenge)
+	case @stage
+	when STAGE_ONE
+	  @stage = STAGE_TWO
+	  sparams = {}
+	  c = StringScanner.new(challenge)
+	  while c.scan(/(?:\s*,)?\s*(\w+)=("(?:[^\\"]+|\\.)*"|[^,]+)\s*/)
+	    k, v = c[1], c[2]
+	    if v =~ /^"(.*)"$/
+	      v = $1
+	      if v =~ /,/
+		v = v.split(',')
+	      end
+	    end
+	    sparams[k] = v
+	  end
+
+	  raise DataFormatError, "Bad Challenge: '#{challenge}'" unless c.rest.size == 0
+	  raise Error, "Server does not support auth (qop = #{sparams['qop'].join(',')})" unless sparams['qop'].include?("auth")
+
+	  response = {
+	    :nonce => sparams['nonce'],
+	    :username => @user,
+	    :realm => sparams['realm'],
+	    :cnonce => Digest::MD5.hexdigest("%.15f:%.15f:%d" % [Time.now.to_f, rand, Process.pid.to_s]),
+	    :'digest-uri' => 'imap/' + sparams['realm'],
+	    :qop => 'auth',
+	    :maxbuf => 65535,
+	    :nc => "%08d" % nc(sparams['nonce']),
+	    :charset => sparams['charset'],
+	  }
+
+	  response[:authzid] = @authname unless @authname.nil?
+
+	  # now, the real thing
+	  a0 = Digest::MD5.digest( [ response.values_at(:username, :realm), @password ].join(':') )
+
+	  a1 = [ a0, response.values_at(:nonce,:cnonce) ].join(':')
+	  a1 << ':' + response[:authzid] unless response[:authzid].nil?
+
+	  a2 = "AUTHENTICATE:" + response[:'digest-uri']
+	  a2 << ":00000000000000000000000000000000" if response[:qop] and response[:qop] =~ /^auth-(?:conf|int)$/
+
+	  response[:response] = Digest::MD5.hexdigest(
+	    [
+	     Digest::MD5.hexdigest(a1),
+	     response.values_at(:nonce, :nc, :cnonce, :qop),
+	     Digest::MD5.hexdigest(a2)
+	    ].join(':')
+	  )
+
+	  return response.keys.map {|key| qdval(key.to_s, response[key]) }.join(',')
+	when STAGE_TWO
+	  @stage = nil
+	  # if at the second stage, return an empty string
+	  if challenge =~ /rspauth=/
+	    return ''
+	  else
+	    raise ResponseParseError, challenge
+	  end
+	else
+	  raise ResponseParseError, challenge
+	end
+      end
+
+      def initialize(user, password, authname = nil)
+	@user, @password, @authname = user, password, authname
+	@nc, @stage = {}, STAGE_ONE
+      end
+
+      private
+
+      STAGE_ONE = :stage_one
+      STAGE_TWO = :stage_two
+
+      def nc(nonce)
+	if @nc.has_key? nonce
+	  @nc[nonce] = @nc[nonce] + 1
+	else
+	  @nc[nonce] = 1
+	end
+	return @nc[nonce]
+      end
+
+      # some responses need quoting
+      def qdval(k, v)
+	return if k.nil? or v.nil?
+	if %w"username authzid realm nonce cnonce digest-uri qop".include? k
+	  v.gsub!(/([\\"])/, "\\\1")
+	  return '%s="%s"' % [k, v]
+	else
+	  return '%s=%s' % [k, v]
+	end
+      end
+    end
+    add_authenticator "DIGEST-MD5", DigestMD5Authenticator
+
     # Superclass of IMAP errors.
     class Error < StandardError
     end
@@ -3198,6 +3427,16 @@ module Net
     # Superclass of all errors used to encapsulate "fail" responses
     # from the server.
     class ResponseError < Error
+
+      # The response that caused this error
+      attr_accessor :response
+
+      def initialize(response)
+        @response = response
+
+        super @response.data.text
+      end
+
     end
 
     # Error raised upon a "NO" response from the server, indicating
@@ -3211,11 +3450,15 @@ module Net
     class BadResponseError < ResponseError
     end
 
-    # Error raised upon a "BYE" response from the server, indicating 
+    # Error raised upon a "BYE" response from the server, indicating
     # that the client is not being allowed to login, or has been timed
     # out due to inactivity.
     class ByeResponseError < ResponseError
     end
+
+    # Error raised when too many flags are interned to symbols.
+    class FlagCountError < Error
+    end
   end
 end
 
@@ -3296,9 +3539,8 @@ EOF
     usage
     exit(1)
   end
-  $port ||= $ssl ? 993 : 143
-    
-  imap = Net::IMAP.new($host, $port, $ssl)
+
+  imap = Net::IMAP.new($host, :port => $port, :ssl => $ssl)
   begin
     password = get_password
     imap.authenticate($auth, $user, password)
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 6d1343eded..6a45e3b5f0 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -1,20 +1,20 @@
 # = net/pop.rb
 #
-# Copyright (c) 1999-2003 Yukihiro Matsumoto.
+# Copyright (c) 1999-2007 Yukihiro Matsumoto.
+#
+# Copyright (c) 1999-2007 Minero Aoki.
 #
-# Copyright (c) 1999-2003 Minero Aoki.
-# 
 # Written & maintained by Minero Aoki <aamine@loveruby.net>.
 #
 # Documented by William Webber and Minero Aoki.
-# 
+#
 # This program is free software. You can re-distribute and/or
 # modify this program under the same terms as Ruby itself,
-# Ruby Distribute License or GNU General Public License.
-# 
-# NOTE: You can find Japanese version of this document in
-# the doc/net directory of the standard ruby interpreter package.
-# 
+# Ruby Distribute License.
+#
+# NOTE: You can find Japanese version of this document at:
+# http://www.ruby-lang.org/ja/man/html/net_pop.html
+#
 #   $Id$
 #
 # See Net::POP3 for documentation.
@@ -22,6 +22,12 @@
 
 require 'net/protocol'
 require 'digest/md5'
+require 'timeout'
+
+begin
+  require "openssl"
+rescue LoadError
+end
 
 module Net
 
@@ -39,25 +45,25 @@ module Net
   # = Net::POP3
   #
   # == What is This Library?
-  # 
-  # This library provides functionality for retrieving 
+  #
+  # This library provides functionality for retrieving
   # email via POP3, the Post Office Protocol version 3. For details
   # of POP3, see [RFC1939] (http://www.ietf.org/rfc/rfc1939.txt).
-  # 
+  #
   # == Examples
-  # 
-  # === Retrieving Messages 
-  # 
-  # This example retrieves messages from the server and deletes them 
+  #
+  # === Retrieving Messages
+  #
+  # This example retrieves messages from the server and deletes them
   # on the server.
   #
   # Messages are written to files named 'inbox/1', 'inbox/2', ....
   # Replace 'pop.example.com' with your POP3 server address, and
   # 'YourAccount' and 'YourPassword' with the appropriate account
   # details.
-  # 
+  #
   #     require 'net/pop'
-  # 
+  #
   #     pop = Net::POP3.new('pop.example.com')
   #     pop.start('YourAccount', 'YourPassword')             # (1)
   #     if pop.mails.empty?
@@ -74,19 +80,19 @@ module Net
   #       puts "#{pop.mails.size} mails popped."
   #     end
   #     pop.finish                                           # (3)
-  # 
+  #
   # 1. Call Net::POP3#start and start POP session.
   # 2. Access messages by using POP3#each_mail and/or POP3#mails.
   # 3. Close POP session by calling POP3#finish or use the block form of #start.
-  # 
+  #
   # === Shortened Code
-  # 
+  #
   # The example above is very verbose. You can shorten the code by using
   # some utility methods. First, the block form of Net::POP3.start can
   # be used instead of POP3.new, POP3#start and POP3#finish.
-  # 
+  #
   #     require 'net/pop'
-  # 
+  #
   #     Net::POP3.start('pop.example.com', 110,
   #                     'YourAccount', 'YourPassword') do |pop|
   #       if pop.mails.empty?
@@ -103,11 +109,11 @@ module Net
   #         puts "#{pop.mails.size} mails popped."
   #       end
   #     end
-  # 
+  #
   # POP3#delete_all is an alternative for #each_mail and #delete.
-  # 
+  #
   #     require 'net/pop'
-  # 
+  #
   #     Net::POP3.start('pop.example.com', 110,
   #                     'YourAccount', 'YourPassword') do |pop|
   #       if pop.mails.empty?
@@ -122,11 +128,11 @@ module Net
   #         end
   #       end
   #     end
-  # 
+  #
   # And here is an even shorter example.
-  # 
+  #
   #     require 'net/pop'
-  # 
+  #
   #     i = 0
   #     Net::POP3.delete_all('pop.example.com', 110,
   #                          'YourAccount', 'YourPassword') do |m|
@@ -135,14 +141,14 @@ module Net
   #       end
   #       i += 1
   #     end
-  # 
+  #
   # === Memory Space Issues
-  # 
+  #
   # All the examples above get each message as one big string.
   # This example avoids this.
-  # 
+  #
   #     require 'net/pop'
-  # 
+  #
   #     i = 1
   #     Net::POP3.delete_all('pop.example.com', 110,
   #                          'YourAccount', 'YourPassword') do |m|
@@ -153,41 +159,41 @@ module Net
   #         i += 1
   #       end
   #     end
-  # 
+  #
   # === Using APOP
-  # 
+  #
   # The net/pop library supports APOP authentication.
   # To use APOP, use the Net::APOP class instead of the Net::POP3 class.
   # You can use the utility method, Net::POP3.APOP(). For example:
-  # 
+  #
   #     require 'net/pop'
-  # 
+  #
   #     # Use APOP authentication if $isapop == true
   #     pop = Net::POP3.APOP($is_apop).new('apop.example.com', 110)
   #     pop.start(YourAccount', 'YourPassword') do |pop|
   #       # Rest of the code is the same.
   #     end
-  # 
+  #
   # === Fetch Only Selected Mail Using 'UIDL' POP Command
-  # 
+  #
   # If your POP server provides UIDL functionality,
   # you can grab only selected mails from the POP server.
   # e.g.
-  # 
+  #
   #     def need_pop?( id )
   #       # determine if we need pop this mail...
   #     end
-  # 
+  #
   #     Net::POP3.start('pop.example.com', 110,
   #                     'Your account', 'Your password') do |pop|
   #       pop.mails.select { |m| need_pop?(m.unique_id) }.each do |m|
   #         do_something(m.pop)
   #       end
   #     end
-  # 
+  #
   # The POPMail#unique_id() method returns the unique-id of the message as a
   # String. Normally the unique-id is a hash of the message.
-  # 
+  #
   class POP3 < Protocol
 
     Revision = %q$Revision$.split[1]
@@ -196,11 +202,20 @@ module Net
     # Class Parameters
     #
 
-    # The default port for POP3 connections, port 110
     def POP3.default_port
+      default_pop3_port()
+    end
+
+    # The default port for POP3 connections, port 110
+    def POP3.default_pop3_port
       110
     end
 
+    # The default port for POP3S connections, port 995
+    def POP3.default_pop3s_port
+      995
+    end
+
     def POP3.socket_type   #:nodoc: obsolete
       Net::InternetMessageIO
     end
@@ -220,7 +235,7 @@ module Net
     #       ....
     #     end
     #
-    def POP3.APOP( isapop )
+    def POP3.APOP(isapop)
       isapop ? APOP : POP3
     end
 
@@ -244,9 +259,9 @@ module Net
     #       m.delete if $DELETE
     #     end
     #
-    def POP3.foreach( address, port = nil,
-                      account = nil, password = nil,
-                      isapop = false, &block )  # :yields: message
+    def POP3.foreach(address, port = nil,
+                     account = nil, password = nil,
+                     isapop = false, &block)  # :yields: message
       start(address, port, account, password, isapop) {|pop|
         pop.each_mail(&block)
       }
@@ -265,9 +280,9 @@ module Net
     #       file.write m.pop
     #     end
     #
-    def POP3.delete_all( address, port = nil,
-                         account = nil, password = nil,
-                         isapop = false, &block )
+    def POP3.delete_all(address, port = nil,
+                        account = nil, password = nil,
+                        isapop = false, &block)
       start(address, port, account, password, isapop) {|pop|
         pop.delete_all(&block)
       }
@@ -287,16 +302,16 @@ module Net
     #     Net::POP3.auth_only('pop.example.com', 110,
     #                         'YourAccount', 'YourPassword', true)
     #
-    def POP3.auth_only( address, port = nil,
-                        account = nil, password = nil,
-                        isapop = false )
+    def POP3.auth_only(address, port = nil,
+                       account = nil, password = nil,
+                       isapop = false)
       new(address, port, isapop).auth_only account, password
     end
 
     # Starts a pop3 session, attempts authentication, and quits.
     # This method must not be called while POP3 session is opened.
     # This method raises POPAuthenticationError if authentication fails.
-    def auth_only( account, password )
+    def auth_only(account, password)
       raise IOError, 'opening previously opened POP session' if started?
       start(account, password) {
         ;
@@ -304,10 +319,63 @@ module Net
     end
 
     #
+    # SSL
+    #
+
+    @ssl_params = nil
+
+    # call-seq:
+    #    Net::POP.enable_ssl(params = {})
+    #
+    # Enable SSL for all new instances.
+    # +params+ is passed to OpenSSL::SSLContext#set_params.
+    def POP3.enable_ssl(*args)
+      @ssl_params = create_ssl_params(*args)
+    end
+
+    def POP3.create_ssl_params(verify_or_params = {}, certs = nil)
+      begin
+        params = verify_or_params.to_hash
+      rescue NoMethodError
+        params = {}
+        params[:verify_mode] = verify_or_params
+        if certs
+          if File.file?(certs)
+            params[:ca_file] = certs
+          elsif File.directory?(certs)
+            params[:ca_path] = certs
+          end
+        end
+      end
+      return params
+    end
+
+    # Disable SSL for all new instances.
+    def POP3.disable_ssl
+      @ssl_params = nil
+    end
+
+    def POP3.ssl_params
+      return @ssl_params
+    end
+
+    def POP3.use_ssl?
+      return !@ssl_params.nil?
+    end
+
+    def POP3.verify
+      return @ssl_params[:verify_mode]
+    end
+
+    def POP3.certs
+      return @ssl_params[:ca_file] || @ssl_params[:ca_path]
+    end
+
+    #
     # Session management
     #
 
-    # Creates a new POP3 object and open the connection.  Equivalent to 
+    # Creates a new POP3 object and open the connection.  Equivalent to
     #
     #   Net::POP3.new(address, port, isapop).start(account, password)
     #
@@ -323,9 +391,9 @@ module Net
     #      end
     #    end
     #
-    def POP3.start( address, port = nil,
-                    account = nil, password = nil,
-                    isapop = false, &block ) # :yield: pop
+    def POP3.start(address, port = nil,
+                   account = nil, password = nil,
+                   isapop = false, &block)   # :yield: pop
       new(address, port, isapop).start(account, password, &block)
     end
 
@@ -333,15 +401,16 @@ module Net
     #
     # +address+ is the hostname or ip address of your POP3 server.
     #
-    # The optional +port+ is the port to connect to; it defaults to 110.
+    # The optional +port+ is the port to connect to.
     #
     # The optional +isapop+ specifies whether this connection is going
     # to use APOP authentication; it defaults to +false+.
     #
     # This method does *not* open the TCP connection.
-    def initialize( addr, port = nil, isapop = false )
+    def initialize(addr, port = nil, isapop = false)
       @address = addr
-      @port = port || self.class.default_port
+      @ssl_params = POP3.ssl_params
+      @port = port
       @apop = isapop
 
       @command = nil
@@ -361,6 +430,32 @@ module Net
       @apop
     end
 
+    # does this instance use SSL?
+    def use_ssl?
+      return !@ssl_params.nil?
+    end
+
+    # call-seq:
+    #    Net::POP#enable_ssl(params = {})
+    #
+    # Enables SSL for this instance.  Must be called before the connection is
+    # established to have any effect.
+    # +params[:port]+ is port to establish the SSL connection on; Defaults to 995.
+    # +params+ (except :port) is passed to OpenSSL::SSLContext#set_params.
+    def enable_ssl(verify_or_params = {}, certs = nil, port = nil)
+      begin
+        @ssl_params = verify_or_params.to_hash.dup
+        @port = @ssl_params.delete(:port) || @port
+      rescue NoMethodError
+        @ssl_params = POP3.create_ssl_params(verify_or_params, certs)
+        @port = port || @port
+      end
+    end
+
+    def disable_ssl
+      @ssl_params = nil
+    end
+
     # Provide human-readable stringification of class state.
     def inspect
       "#<#{self.class} #{@address}:#{@port} open=#{@started}>"
@@ -379,7 +474,7 @@ module Net
     #     ....
     #   end
     #
-    def set_debug_output( arg )
+    def set_debug_output(arg)
       @debug_output = arg
     end
 
@@ -387,7 +482,9 @@ module Net
     attr_reader :address
 
     # The port number to connect to.
-    attr_reader :port
+    def port
+      return @port || (use_ssl? ? POP3.default_pop3s_port : POP3.default_pop3_port)
+    end
 
     # Seconds to wait until a connection is opened.
     # If the POP3 object cannot open a connection within this time,
@@ -400,7 +497,7 @@ module Net
     attr_reader :read_timeout
 
     # Set the read timeout.
-    def read_timeout=( sec )
+    def read_timeout=(sec)
       @command.socket.read_timeout = sec if @command
       @read_timeout = sec
     end
@@ -418,9 +515,8 @@ module Net
     # closes the session after block call finishes.
     #
     # This method raises a POPAuthenticationError if authentication fails.
-    def start( account, password ) # :yield: pop
+    def start(account, password) # :yield: pop
       raise IOError, 'POP session already started' if @started
-
       if block_given?
         begin
           do_start account, password
@@ -434,9 +530,23 @@ module Net
       end
     end
 
-    def do_start( account, password )
-      @socket = self.class.socket_type.old_open(@address, @port,
-                                   @open_timeout, @read_timeout, @debug_output)
+    def do_start(account, password)
+      s = timeout(@open_timeout) { TCPSocket.open(@address, port) }
+      if use_ssl?
+        raise 'openssl library not installed' unless defined?(OpenSSL)
+        context = OpenSSL::SSL::SSLContext.new
+        context.set_params(@ssl_params)
+        s = OpenSSL::SSL::SSLSocket.new(s, context)
+        s.sync_close = true
+        s.connect
+        if context.verify_mode != OpenSSL::SSL::VERIFY_NONE
+          s.post_connection_check(@address)
+        end
+      end
+      @socket = InternetMessageIO.new(s)
+      logging "POP session started: #{@address}:#{@port} (#{@apop ? 'APOP' : 'POP'})"
+      @socket.read_timeout = @read_timeout
+      @socket.debug_output = @debug_output
       on_connect
       @command = POP3Command.new(@socket)
       if apop?
@@ -446,7 +556,12 @@ module Net
       end
       @started = true
     ensure
-      do_finish if not @started
+      # Authentication failed, clean up connection.
+      unless @started
+        s.close if s and not s.closed?
+        @socket = nil
+        @command = nil
+      end
     end
     private :do_start
 
@@ -520,13 +635,13 @@ module Net
 
     # Yields each message to the passed-in block in turn.
     # Equivalent to:
-    # 
+    #
     #   pop3.mails.each do |popmail|
     #     ....
     #   end
     #
     # This method raises a POPError if an error occurs.
-    def each_mail( &block )  # :yield: message
+    def each_mail(&block)  # :yield: message
       mails().each(&block)
     end
 
@@ -568,9 +683,12 @@ module Net
     end
 
     def set_all_uids   #:nodoc: internal use only (called from POPMail#uidl)
-      command().uidl.each do |num, uid|
-        @mails.find {|m| m.number == num }.uid = uid
-      end
+      uidl = command().uidl
+      @mails.each {|m| m.uid = uidl[m.number] }
+    end
+
+    def logging(msg)
+      @debug_output << msg + "\n" if @debug_output
     end
 
   end   # class POP3
@@ -600,7 +718,7 @@ module Net
   #
   class POPMail
 
-    def initialize( num, len, pop, cmd )   #:nodoc:
+    def initialize(num, len, pop, cmd)   #:nodoc:
       @number = num
       @length = len
       @pop = pop
@@ -624,7 +742,7 @@ module Net
     #
     # This method fetches the message.  If called with a block, the
     # message is yielded to the block one chunk at a time.  If called
-    # without a block, the message is returned as a String.  The optional 
+    # without a block, the message is returned as a String.  The optional
     # +dest+ argument will be prepended to the returned String; this
     # argument is essentially obsolete.
     #
@@ -635,7 +753,7 @@ module Net
     #       n = 1
     #       pop.mails.each do |popmail|
     #         File.open("inbox/#{n}", 'w') do |f|
-    #           f.write popmail.pop              
+    #           f.write popmail.pop
     #         end
     #         popmail.delete
     #         n += 1
@@ -674,24 +792,24 @@ module Net
     alias all pop    #:nodoc: obsolete
     alias mail pop   #:nodoc: obsolete
 
-    # Fetches the message header and +lines+ lines of body. 
+    # Fetches the message header and +lines+ lines of body.
     #
     # The optional +dest+ argument is obsolete.
     #
     # This method raises a POPError if an error occurs.
-    def top( lines, dest = '' )
+    def top(lines, dest = '')
       @command.top(@number, lines) do |chunk|
         dest << chunk
       end
       dest
     end
 
-    # Fetches the message header.     
+    # Fetches the message header.
     #
     # The optional +dest+ argument is obsolete.
     #
     # This method raises a POPError if an error occurs.
-    def header( dest = '' )
+    def header(dest = '')
       top(0, dest)
     end
 
@@ -739,7 +857,7 @@ module Net
 
     alias uidl unique_id
 
-    def uid=( uid )   #:nodoc: internal use only (used from POP3#set_all_uids)
+    def uid=(uid)   #:nodoc: internal use only
       @uid = uid
     end
 
@@ -748,25 +866,27 @@ module Net
 
   class POP3Command   #:nodoc: internal use only
 
-    def initialize( sock )
+    def initialize(sock)
       @socket = sock
       @error_occured = false
       res = check_response(critical { recv_response() })
-      @apop_stamp = res.slice(/<.+>/)
+      @apop_stamp = res.slice(/<[!-~]+@[!-~]+>/)
     end
 
+    attr_reader :socket
+
     def inspect
       "#<#{self.class} socket=#{@socket}>"
     end
 
-    def auth( account, password )
+    def auth(account, password)
       check_response_auth(critical {
         check_response_auth(get_response('USER %s', account))
         get_response('PASS %s', password)
       })
     end
 
-    def apop( account, password )
+    def apop(account, password)
       raise POPAuthenticationError, 'not APOP server; cannot login' \
                                                       unless @apop_stamp
       check_response_auth(critical {
@@ -797,28 +917,28 @@ module Net
     end
 
     def rset
-      check_response(critical { get_response 'RSET' })
+      check_response(critical { get_response('RSET') })
     end
 
-    def top( num, lines = 0, &block )
+    def top(num, lines = 0, &block)
       critical {
         getok('TOP %d %d', num, lines)
         @socket.each_message_chunk(&block)
       }
     end
 
-    def retr( num, &block )
+    def retr(num, &block)
       critical {
         getok('RETR %d', num)
         @socket.each_message_chunk(&block)
       }
     end
-    
-    def dele( num )
+
+    def dele(num)
       check_response(critical { get_response('DELE %d', num) })
     end
 
-    def uidl( num = nil )
+    def uidl(num = nil)
       if num
         res = check_response(critical { get_response('UIDL %d', num) })
         return res.split(/ /)[1]
@@ -841,12 +961,12 @@ module Net
 
     private
 
-    def getok( fmt, *fargs )
+    def getok(fmt, *fargs)
       @socket.writeline sprintf(fmt, *fargs)
       check_response(recv_response())
     end
 
-    def get_response( fmt, *fargs )
+    def get_response(fmt, *fargs)
       @socket.writeline sprintf(fmt, *fargs)
       recv_response()
     end
@@ -855,13 +975,13 @@ module Net
       @socket.readline
     end
 
-    def check_response( res )
-      raise POPError, res unless /\A\+OK/i === res
+    def check_response(res)
+      raise POPError, res unless /\A\+OK/i =~ res
       res
     end
 
-    def check_response_auth( res )
-      raise POPAuthenticationError, res unless /\A\+OK/i === res
+    def check_response_auth(res)
+      raise POPAuthenticationError, res unless /\A\+OK/i =~ res
       res
     end
 
@@ -878,4 +998,3 @@ module Net
   end   # class POP3Command
 
 end   # module Net
-
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index d722fdcbd4..2a6cfb4f61 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -2,8 +2,8 @@
 # = net/protocol.rb
 #
 #--
-# Copyright (c) 1999-2005 Yukihiro Matsumoto
-# Copyright (c) 1999-2005 Minero Aoki
+# Copyright (c) 1999-2004 Yukihiro Matsumoto
+# Copyright (c) 1999-2004 Minero Aoki
 #
 # written and maintained by Minero Aoki <aamine@loveruby.net>
 #
@@ -121,17 +121,33 @@ module Net # :nodoc:
         return rbuf_consume(@rbuf.size)
       end
     end
-        
+
     def readline
       readuntil("\n").chop
     end
 
     private
 
+    BUFSIZE = 1024 * 16
+
     def rbuf_fill
-      timeout(@read_timeout) {
-        @rbuf << @io.sysread(1024)
-      }
+      begin
+        @rbuf << @io.read_nonblock(BUFSIZE)
+      rescue IO::WaitReadable
+        if IO.select([@io], nil, nil, @read_timeout)
+          retry
+        else
+          raise Timeout::Error
+        end
+      rescue IO::WaitWritable
+        # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
+        # http://www.openssl.org/support/faq.html#PROG10
+        if IO.select(nil, [@io], nil, @read_timeout)
+          retry
+        else
+          raise Timeout::Error
+        end
+      end
     end
 
     def rbuf_consume(len)
@@ -200,16 +216,6 @@ module Net # :nodoc:
 
 
   class InternetMessageIO < BufferedIO   #:nodoc: internal use only
-    def InternetMessageIO.old_open(addr, port,
-        open_timeout = nil, read_timeout = nil, debug_output = nil)
-      debug_output << "opening connection to #{addr}...\n" if debug_output
-      s = timeout(open_timeout) { TCPsocket.new(addr, port) }
-      io = new(s)
-      io.read_timeout = read_timeout
-      io.debug_output = debug_output
-      io
-    end
-
     def initialize(io)
       super
       @wbuf = nil
@@ -230,7 +236,7 @@ module Net # :nodoc:
       LOG_on()
       LOG "read message (#{read_bytes} bytes)"
     end
-  
+
     # *library private* (cannot handle 'break')
     def each_list_item
       while (str = readuntil("\r\n")) != ".\r\n"
@@ -315,8 +321,8 @@ module Net # :nodoc:
           yield
         end
       else    # generic reader
-        src.each do |s|
-          buf << s
+        src.each do |str|
+          buf << str
           yield if buf.size > 1024
         end
         yield unless buf.empty?
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index dda9dab072..79211d1aee 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -1,34 +1,38 @@
 # = net/smtp.rb
-# 
-# Copyright (c) 1999-2003 Yukihiro Matsumoto.
 #
-# Copyright (c) 1999-2003 Minero Aoki.
-# 
+# Copyright (c) 1999-2007 Yukihiro Matsumoto.
+#
+# Copyright (c) 1999-2007 Minero Aoki.
+#
 # Written & maintained by Minero Aoki <aamine@loveruby.net>.
 #
 # Documented by William Webber and Minero Aoki.
-# 
+#
 # This program is free software. You can re-distribute and/or
-# modify this program under the same terms as Ruby itself,
-# Ruby Distribute License or GNU General Public License.
-# 
-# NOTE: You can find Japanese version of this document in
-# the doc/net directory of the standard ruby interpreter package.
-# 
+# modify this program under the same terms as Ruby itself.
+#
+# NOTE: You can find Japanese version of this document at:
+# http://www.ruby-lang.org/ja/man/html/net_smtp.html
+#
 # $Id$
 #
-# See Net::SMTP for documentation. 
-# 
+# See Net::SMTP for documentation.
+#
 
 require 'net/protocol'
 require 'digest/md5'
+require 'timeout'
+begin
+  require 'openssl'
+rescue LoadError
+end
 
 module Net
 
   # Module mixed in to all SMTP error classes
   module SMTPError
-    # This *class* is module for some reason.
-    # In ruby 1.9.x, this module becomes a class.
+    # This *class* is a module for backward compatibility.
+    # In later release, this module becomes a class.
   end
 
   # Represents an SMTP authentication error.
@@ -56,107 +60,112 @@ module Net
     include SMTPError
   end
 
+  # Command is not supported on server.
+  class SMTPUnsupportedCommand < ProtocolError
+    include SMTPError
+  end
+
   #
   # = Net::SMTP
   #
   # == What is This Library?
-  # 
+  #
   # This library provides functionality to send internet
   # mail via SMTP, the Simple Mail Transfer Protocol. For details of
   # SMTP itself, see [RFC2821] (http://www.ietf.org/rfc/rfc2821.txt).
-  # 
+  #
   # == What is This Library NOT?
-  # 
+  #
   # This library does NOT provide functions to compose internet mails.
   # You must create them by yourself. If you want better mail support,
   # try RubyMail or TMail. You can get both libraries from RAA.
   # (http://www.ruby-lang.org/en/raa.html)
-  # 
+  #
   # FYI: the official documentation on internet mail is: [RFC2822] (http://www.ietf.org/rfc/rfc2822.txt).
-  # 
+  #
   # == Examples
-  # 
+  #
   # === Sending Messages
-  # 
+  #
   # You must open a connection to an SMTP server before sending messages.
-  # The first argument is the address of your SMTP server, and the second 
-  # argument is the port number. Using SMTP.start with a block is the simplest 
-  # way to do this. This way, the SMTP connection is closed automatically 
+  # The first argument is the address of your SMTP server, and the second
+  # argument is the port number. Using SMTP.start with a block is the simplest
+  # way to do this. This way, the SMTP connection is closed automatically
   # after the block is executed.
-  # 
+  #
   #     require 'net/smtp'
   #     Net::SMTP.start('your.smtp.server', 25) do |smtp|
   #       # Use the SMTP object smtp only in this block.
   #     end
-  # 
+  #
   # Replace 'your.smtp.server' with your SMTP server. Normally
   # your system manager or internet provider supplies a server
   # for you.
-  # 
+  #
   # Then you can send messages.
-  # 
+  #
   #     msgstr = <<END_OF_MESSAGE
   #     From: Your Name <your@mail.address>
   #     To: Destination Address <someone@example.com>
   #     Subject: test message
   #     Date: Sat, 23 Jun 2001 16:26:43 +0900
   #     Message-Id: <unique.message.id.string@example.com>
-  # 
+  #
   #     This is a test message.
   #     END_OF_MESSAGE
-  # 
+  #
   #     require 'net/smtp'
   #     Net::SMTP.start('your.smtp.server', 25) do |smtp|
   #       smtp.send_message msgstr,
   #                         'your@mail.address',
-  #                         'his_addess@example.com'
+  #                         'his_address@example.com'
   #     end
-  # 
+  #
   # === Closing the Session
-  # 
-  # You MUST close the SMTP session after sending messages, by calling 
+  #
+  # You MUST close the SMTP session after sending messages, by calling
   # the #finish method:
-  # 
+  #
   #     # using SMTP#finish
   #     smtp = Net::SMTP.start('your.smtp.server', 25)
   #     smtp.send_message msgstr, 'from@address', 'to@address'
   #     smtp.finish
-  # 
+  #
   # You can also use the block form of SMTP.start/SMTP#start.  This closes
   # the SMTP session automatically:
-  # 
+  #
   #     # using block form of SMTP.start
   #     Net::SMTP.start('your.smtp.server', 25) do |smtp|
   #       smtp.send_message msgstr, 'from@address', 'to@address'
   #     end
-  # 
+  #
   # I strongly recommend this scheme.  This form is simpler and more robust.
-  # 
+  #
   # === HELO domain
-  # 
+  #
   # In almost all situations, you must provide a third argument
   # to SMTP.start/SMTP#start. This is the domain name which you are on
   # (the host to send mail from). It is called the "HELO domain".
   # The SMTP server will judge whether it should send or reject
   # the SMTP session by inspecting the HELO domain.
-  # 
+  #
   #     Net::SMTP.start('your.smtp.server', 25,
   #                     'mail.from.domain') { |smtp| ... }
-  # 
+  #
   # === SMTP Authentication
-  # 
+  #
   # The Net::SMTP class supports three authentication schemes;
   # PLAIN, LOGIN and CRAM MD5.  (SMTP Authentication: [RFC2554])
-  # To use SMTP authentication, pass extra arguments to 
+  # To use SMTP authentication, pass extra arguments to
   # SMTP.start/SMTP#start.
-  # 
+  #
   #     # PLAIN
   #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
   #                     'Your Account', 'Your Password', :plain)
   #     # LOGIN
   #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
   #                     'Your Account', 'Your Password', :login)
-  # 
+  #
   #     # CRAM MD5
   #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
   #                     'Your Account', 'Your Password', :cram_md5)
@@ -165,11 +174,29 @@ module Net
 
     Revision = %q$Revision$.split[1]
 
-    # The default SMTP port, port 25.
+    # The default SMTP port number, 25.
     def SMTP.default_port
       25
     end
 
+    # The default mail submission port number, 587.
+    def SMTP.default_submission_port
+      587
+    end
+
+    # The default SMTPS port number, 465.
+    def SMTP.default_tls_port
+      465
+    end
+
+    class << self
+      alias default_ssl_port default_tls_port
+    end
+
+    def SMTP.default_ssl_context
+      OpenSSL::SSL::SSLContext.new
+    end
+
     #
     # Creates a new Net::SMTP object.
     #
@@ -181,16 +208,20 @@ module Net
     # SMTP.start instead of SMTP.new if you want to do everything
     # at once.  Otherwise, follow SMTP.new with SMTP#start.
     #
-    def initialize( address, port = nil )
+    def initialize(address, port = nil)
       @address = address
       @port = (port || SMTP.default_port)
       @esmtp = true
+      @capabilities = nil
       @socket = nil
       @started = false
       @open_timeout = 30
       @read_timeout = 60
       @error_occured = false
       @debug_output = nil
+      @tls = false
+      @starttls = false
+      @ssl_context = nil
     end
 
     # Provide human-readable stringification of class state.
@@ -204,18 +235,133 @@ module Net
     end
 
     #
-    # Set whether to use ESMTP or not.  This should be done before 
+    # Set whether to use ESMTP or not.  This should be done before
     # calling #start.  Note that if #start is called in ESMTP mode,
     # and the connection fails due to a ProtocolError, the SMTP
     # object will automatically switch to plain SMTP mode and
     # retry (but not vice versa).
     #
-    def esmtp=( bool )
+    def esmtp=(bool)
       @esmtp = bool
     end
 
     alias esmtp esmtp?
 
+    # true if server advertises STARTTLS.
+    # You cannot get valid value before opening SMTP session.
+    def capable_starttls?
+      capable?('STARTTLS')
+    end
+
+    def capable?(key)
+      return nil unless @capabilities
+      @capabilities[key] ? true : false
+    end
+    private :capable?
+
+    # true if server advertises AUTH PLAIN.
+    # You cannot get valid value before opening SMTP session.
+    def capable_plain_auth?
+      auth_capable?('PLAIN')
+    end
+
+    # true if server advertises AUTH LOGIN.
+    # You cannot get valid value before opening SMTP session.
+    def capable_login_auth?
+      auth_capable?('LOGIN')
+    end
+
+    # true if server advertises AUTH CRAM-MD5.
+    # You cannot get valid value before opening SMTP session.
+    def capable_cram_md5_auth?
+      auth_capable?('CRAM-MD5')
+    end
+
+    def auth_capable?(type)
+      return nil unless @capabilities
+      return false unless @capabilities['AUTH']
+      @capabilities['AUTH'].include?(type)
+    end
+    private :auth_capable?
+
+    # Returns supported authentication methods on this server.
+    # You cannot get valid value before opening SMTP session.
+    def capable_auth_types
+      return [] unless @capabilities
+      return [] unless @capabilities['AUTH']
+      @capabilities['AUTH']
+    end
+
+    # true if this object uses SMTP/TLS (SMTPS).
+    def tls?
+      @tls
+    end
+
+    alias ssl? tls?
+
+    # Enables SMTP/TLS (SMTPS: SMTP over direct TLS connection) for
+    # this object.  Must be called before the connection is established
+    # to have any effect.  +context+ is a OpenSSL::SSL::SSLContext object.
+    def enable_tls(context = SMTP.default_ssl_context)
+      raise 'openssl library not installed' unless defined?(OpenSSL)
+      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @starttls
+      @tls = true
+      @ssl_context = context
+    end
+
+    alias enable_ssl enable_tls
+
+    # Disables SMTP/TLS for this object.  Must be called before the
+    # connection is established to have any effect.
+    def disable_tls
+      @tls = false
+      @ssl_context = nil
+    end
+
+    alias disable_ssl disable_tls
+
+    # Returns truth value if this object uses STARTTLS.
+    # If this object always uses STARTTLS, returns :always.
+    # If this object uses STARTTLS when the server support TLS, returns :auto.
+    def starttls?
+      @starttls
+    end
+
+    # true if this object uses STARTTLS.
+    def starttls_always?
+      @starttls == :always
+    end
+
+    # true if this object uses STARTTLS when server advertises STARTTLS.
+    def starttls_auto?
+      @starttls == :auto
+    end
+
+    # Enables SMTP/TLS (STARTTLS) for this object.
+    # +context+ is a OpenSSL::SSL::SSLContext object.
+    def enable_starttls(context = SMTP.default_ssl_context)
+      raise 'openssl library not installed' unless defined?(OpenSSL)
+      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @tls
+      @starttls = :always
+      @ssl_context = context
+    end
+
+    # Enables SMTP/TLS (STARTTLS) for this object if server accepts.
+    # +context+ is a OpenSSL::SSL::SSLContext object.
+    def enable_starttls_auto(context = SMTP.default_ssl_context)
+      raise 'openssl library not installed' unless defined?(OpenSSL)
+      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @tls
+      @starttls = :auto
+      @ssl_context = context
+    end
+
+    # Disables SMTP/TLS (STARTTLS) for this object.  Must be called
+    # before the connection is established to have any effect.
+    def disable_starttls
+      @starttls = false
+      @ssl_context = nil
+    end
+
     # The address of the SMTP server to connect to.
     attr_reader :address
 
@@ -234,7 +380,7 @@ module Net
 
     # Set the number of seconds to wait until timing-out a read(2)
     # call.
-    def read_timeout=( sec )
+    def read_timeout=(sec)
       @socket.read_timeout = sec if @socket
       @read_timeout = sec
     end
@@ -253,10 +399,12 @@ module Net
     #     ....
     #   end
     #
-    def set_debug_output( arg )
+    def debug_output=(arg)
       @debug_output = arg
     end
 
+    alias set_debug_output debug_output=
+
     #
     # SMTP session control
     #
@@ -265,7 +413,7 @@ module Net
     # Creates a new Net::SMTP object and connects to the server.
     #
     # This method is equivalent to:
-    # 
+    #
     #   Net::SMTP.new(address, port).start(helo_domain, account, password, authtype)
     #
     # === Example
@@ -289,7 +437,7 @@ module Net
     # +port+ is the port to connect to; it defaults to port 25.
     #
     # +helo+ is the _HELO_ _domain_ provided by the client to the
-    # server (see overview comments); it defaults to 'localhost.localdomain'. 
+    # server (see overview comments); it defaults to 'localhost'.
     #
     # The remaining arguments are used for SMTP authentication, if required
     # or desired.  +user+ is the account name; +secret+ is your password
@@ -309,10 +457,9 @@ module Net
     # * IOError
     # * TimeoutError
     #
-    def SMTP.start( address, port = nil,
-                    helo = 'localhost.localdomain',
-                    user = nil, secret = nil, authtype = nil,
-                    &block) # :yield: smtp
+    def SMTP.start(address, port = nil, helo = 'localhost',
+                   user = nil, secret = nil, authtype = nil,
+                   &block)   # :yield: smtp
       new(address, port).start(helo, user, secret, authtype, &block)
     end
 
@@ -329,33 +476,33 @@ module Net
     # +helo+ is the _HELO_ _domain_ that you'll dispatch mails from; see
     # the discussion in the overview notes.
     #
-    # If both of +user+ and +secret+ are given, SMTP authentication 
-    # will be attempted using the AUTH command.  +authtype+ specifies 
+    # If both of +user+ and +secret+ are given, SMTP authentication
+    # will be attempted using the AUTH command.  +authtype+ specifies
     # the type of authentication to attempt; it must be one of
     # :login, :plain, and :cram_md5.  See the notes on SMTP Authentication
-    # in the overview. 
+    # in the overview.
     #
     # === Block Usage
     #
     # When this methods is called with a block, the newly-started SMTP
     # object is yielded to the block, and automatically closed after
-    # the block call finishes.  Otherwise, it is the caller's 
+    # the block call finishes.  Otherwise, it is the caller's
     # responsibility to close the session when finished.
     #
     # === Example
     #
     # This is very similar to the class method SMTP.start.
     #
-    #     require 'net/smtp' 
+    #     require 'net/smtp'
     #     smtp = Net::SMTP.new('smtp.mail.server', 25)
     #     smtp.start(helo_domain, account, password, authtype) do |smtp|
     #       smtp.send_message msgstr, 'from@example.com', ['dest@example.com']
-    #     end 
+    #     end
     #
     # The primary use of this method (as opposed to SMTP.start)
     # is probably to set debugging (#set_debug_output) or ESMTP
     # (#esmtp=), which must be done before the session is
-    # started.  
+    # started.
     #
     # === Errors
     #
@@ -371,55 +518,101 @@ module Net
     # * IOError
     # * TimeoutError
     #
-    def start( helo = 'localhost.localdomain',
-               user = nil, secret = nil, authtype = nil ) # :yield: smtp
+    def start(helo = 'localhost',
+              user = nil, secret = nil, authtype = nil)   # :yield: smtp
       if block_given?
         begin
-          do_start(helo, user, secret, authtype)
+          do_start helo, user, secret, authtype
           return yield(self)
         ensure
           do_finish
         end
       else
-        do_start(helo, user, secret, authtype)
+        do_start helo, user, secret, authtype
         return self
       end
     end
 
-    def do_start( helodomain, user, secret, authtype )
-      raise IOError, 'SMTP session already started' if @started
-      check_auth_args user, secret, authtype if user or secret
+    # Finishes the SMTP session and closes TCP connection.
+    # Raises IOError if not started.
+    def finish
+      raise IOError, 'not yet started' unless started?
+      do_finish
+    end
 
-      @socket = InternetMessageIO.old_open(@address, @port,
-                                       @open_timeout, @read_timeout,
-                                       @debug_output)
-      check_response(critical { recv_response() })
-      begin
-        if @esmtp
-          ehlo helodomain
-        else
-          helo helodomain
-        end
-      rescue ProtocolError
-        if @esmtp
-          @esmtp = false
-          @error_occured = false
-          retry
+    private
+
+    def tcp_socket(address, port)
+      TCPSocket.open address, port
+    end
+
+    def do_start(helo_domain, user, secret, authtype)
+      raise IOError, 'SMTP session already started' if @started
+      if user or secret
+        check_auth_method(authtype || DEFAULT_AUTH_TYPE)
+        check_auth_args user, secret
+      end
+      s = timeout(@open_timeout) { tcp_socket(@address, @port) }
+      logging "Connection opened: #{@address}:#{@port}"
+      @socket = new_internet_message_io(tls? ? tlsconnect(s) : s)
+      check_response critical { recv_response() }
+      do_helo helo_domain
+      if starttls_always? or (capable_starttls? and starttls_auto?)
+        unless capable_starttls?
+          raise SMTPUnsupportedCommand,
+              "STARTTLS is not supported on this server"
         end
-        raise
+        starttls
+        @socket = new_internet_message_io(tlsconnect(s))
+        # helo response may be different after STARTTLS
+        do_helo helo_domain
       end
-      authenticate user, secret, authtype if user
+      authenticate user, secret, (authtype || DEFAULT_AUTH_TYPE) if user
       @started = true
     ensure
-      @socket.close if not @started and @socket and not @socket.closed?
+      unless @started
+        # authentication failed, cancel connection.
+        s.close if s and not s.closed?
+        @socket = nil
+      end
     end
-    private :do_start
 
-    # Finishes the SMTP session and closes TCP connection.
-    # Raises IOError if not started.
-    def finish
-      raise IOError, 'not yet started' unless started?
-      do_finish
+    def ssl_socket(socket, context)
+      OpenSSL::SSL::SSLSocket.new socket, context
+    end
+
+    def tlsconnect(s)
+      verified = false
+      s = ssl_socket(s, @ssl_context)
+      logging "TLS connection started"
+      s.sync_close = true
+      s.connect
+      if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
+        s.post_connection_check(@address)
+      end
+      verified = true
+      s
+    ensure
+      s.close unless verified
+    end
+
+    def new_internet_message_io(s)
+      io = InternetMessageIO.new(s)
+      io.read_timeout = @read_timeout
+      io.debug_output = @debug_output
+      io
+    end
+
+    def do_helo(helo_domain)
+      res = @esmtp ? ehlo(helo_domain) : helo(helo_domain)
+      @capabilities = res.capabilities
+    rescue SMTPError
+      if @esmtp
+        @esmtp = false
+        @error_occured = false
+        retry
+      end
+      raise
     end
 
     def do_finish
@@ -430,10 +623,9 @@ module Net
       @socket.close if @socket and not @socket.closed?
       @socket = nil
     end
-    private :do_finish
 
     #
-    # message send
+    # Message Sending
     #
 
     public
@@ -441,7 +633,7 @@ module Net
     #
     # Sends +msgstr+ as a message.  Single CR ("\r") and LF ("\n") found
     # in the +msgstr+, are converted into the CR LF pair.  You cannot send a
-    # binary message with this method. +msgstr+ should include both 
+    # binary message with this method. +msgstr+ should include both
     # the message headers and body.
     #
     # +from_addr+ is a String representing the source mail address.
@@ -468,10 +660,10 @@ module Net
     # * IOError
     # * TimeoutError
     #
-    def send_message( msgstr, from_addr, *to_addrs )
-      send0(from_addr, to_addrs.flatten) {
-        @socket.write_message msgstr
-      }
+    def send_message(msgstr, from_addr, *to_addrs)
+      raise IOError, 'closed session' unless @socket
+      mailfrom from_addr
+      rcptto_list(to_addrs) {data msgstr}
     end
 
     alias send_mail send_message
@@ -521,166 +713,233 @@ module Net
     # * IOError
     # * TimeoutError
     #
-    def open_message_stream( from_addr, *to_addrs, &block ) # :yield: stream
-      send0(from_addr, to_addrs.flatten) {
-        @socket.write_message_by_block(&block)
-      }
-    end
-
-    alias ready open_message_stream   # obsolete
-
-    private
-
-    def send0( from_addr, to_addrs )
+    def open_message_stream(from_addr, *to_addrs, &block)   # :yield: stream
       raise IOError, 'closed session' unless @socket
-      raise ArgumentError, 'mail destination not given' if to_addrs.empty?
-      if $SAFE > 0
-        raise SecurityError, 'tainted from_addr' if from_addr.tainted?
-        to_addrs.each do |to| 
-          raise SecurityError, 'tainted to_addr' if to.tainted?
-        end
-      end
-
       mailfrom from_addr
-      to_addrs.each do |to|
-        rcptto to
-      end
-      res = critical {
-        check_response(get_response('DATA'), true)
-        yield
-        recv_response()
-      }
-      check_response(res)
+      rcptto_list(to_addrs) {data(&block)}
     end
 
+    alias ready open_message_stream   # obsolete
+
     #
-    # auth
+    # Authentication
     #
 
-    private
+    public
 
-    def check_auth_args( user, secret, authtype )
-      raise ArgumentError, 'both user and secret are required'\
-                      unless user and secret
-      auth_method = "auth_#{authtype || 'cram_md5'}"
-      raise ArgumentError, "wrong auth type #{authtype}"\
-                      unless respond_to?(auth_method, true)
-    end
+    DEFAULT_AUTH_TYPE = :plain
 
-    def authenticate( user, secret, authtype )
-      __send__("auth_#{authtype || 'cram_md5'}", user, secret)
+    def authenticate(user, secret, authtype = DEFAULT_AUTH_TYPE)
+      check_auth_method authtype
+      check_auth_args user, secret
+      send auth_method(authtype), user, secret
     end
 
-    def auth_plain( user, secret )
-      res = critical { get_response('AUTH PLAIN %s',
-                                    base64_encode("\0#{user}\0#{secret}")) }
-      raise SMTPAuthenticationError, res unless /\A2../ === res
+    def auth_plain(user, secret)
+      check_auth_args user, secret
+      res = critical {
+        get_response('AUTH PLAIN ' + base64_encode("\0#{user}\0#{secret}"))
+      }
+      check_auth_response res
+      res
     end
 
-    def auth_login( user, secret )
+    def auth_login(user, secret)
+      check_auth_args user, secret
       res = critical {
-        check_response(get_response('AUTH LOGIN'), true)
-        check_response(get_response(base64_encode(user)), true)
+        check_auth_continue get_response('AUTH LOGIN')
+        check_auth_continue get_response(base64_encode(user))
         get_response(base64_encode(secret))
       }
-      raise SMTPAuthenticationError, res unless /\A2../ === res
-    end
-
-    def auth_cram_md5( user, secret )
-      # CRAM-MD5: [RFC2195]
-      res = nil
-      critical {
-        res = check_response(get_response('AUTH CRAM-MD5'), true)
-        challenge = res.split(/ /)[1].unpack('m')[0]
-        secret = Digest::MD5.digest(secret) if secret.size > 64
-
-        isecret = secret + "\0" * (64 - secret.size)
-        osecret = isecret.dup
-        0.upto(63) do |i|
-          isecret[i] ^= 0x36
-          osecret[i] ^= 0x5c
-        end
-        tmp = Digest::MD5.digest(isecret + challenge)
-        tmp = Digest::MD5.hexdigest(osecret + tmp)
+      check_auth_response res
+      res
+    end
 
-        res = get_response(base64_encode(user + ' ' + tmp))
+    def auth_cram_md5(user, secret)
+      check_auth_args user, secret
+      res = critical {
+        res0 = get_response('AUTH CRAM-MD5')
+        check_auth_continue res0
+        crammed = cram_md5_response(secret, res0.cram_md5_challenge)
+        get_response(base64_encode("#{user} #{crammed}"))
       }
-      raise SMTPAuthenticationError, res unless /\A2../ === res
+      check_auth_response res
+      res
+    end
+
+    private
+
+    def check_auth_method(type)
+      unless respond_to?(auth_method(type), true)
+        raise ArgumentError, "wrong authentication type #{type}"
+      end
     end
 
-    def base64_encode( str )
+    def auth_method(type)
+      "auth_#{type.to_s.downcase}".intern
+    end
+
+    def check_auth_args(user, secret, authtype = DEFAULT_AUTH_TYPE)
+      unless user
+        raise ArgumentError, 'SMTP-AUTH requested but missing user name'
+      end
+      unless secret
+        raise ArgumentError, 'SMTP-AUTH requested but missing secret phrase'
+      end
+    end
+
+    def base64_encode(str)
       # expects "str" may not become too long
       [str].pack('m').gsub(/\s+/, '')
     end
 
+    IMASK = 0x36
+    OMASK = 0x5c
+
+    # CRAM-MD5: [RFC2195]
+    def cram_md5_response(secret, challenge)
+      tmp = Digest::MD5.digest(cram_secret(secret, IMASK) + challenge)
+      Digest::MD5.hexdigest(cram_secret(secret, OMASK) + tmp)
+    end
+
+    CRAM_BUFSIZE = 64
+
+    def cram_secret(secret, mask)
+      secret = Digest::MD5.digest(secret) if secret.size > CRAM_BUFSIZE
+      buf = secret.ljust(CRAM_BUFSIZE, "\0")
+      0.upto(buf.size - 1) do |i|
+        buf[i] = (buf[i].ord ^ mask).chr
+      end
+      buf
+    end
+
     #
     # SMTP command dispatcher
     #
 
-    private
+    public
+
+    def starttls
+      getok('STARTTLS')
+    end
+
+    def helo(domain)
+      getok("HELO #{domain}")
+    end
 
-    def helo( domain )
-      getok('HELO %s', domain)
+    def ehlo(domain)
+      getok("EHLO #{domain}")
     end
 
-    def ehlo( domain )
-      getok('EHLO %s', domain)
+    def mailfrom(from_addr)
+      if $SAFE > 0
+        raise SecurityError, 'tainted from_addr' if from_addr.tainted?
+      end
+      getok("MAIL FROM:<#{from_addr}>")
+    end
+
+    def rcptto_list(to_addrs)
+      raise ArgumentError, 'mail destination not given' if to_addrs.empty?
+      ok_users = []
+      unknown_users = []
+      to_addrs.flatten.each do |addr|
+        begin
+          rcptto addr
+        rescue SMTPAuthenticationError
+          unknown_users << addr.dump
+        else
+          ok_users << addr
+        end
+      end
+      raise ArgumentError, 'mail destination not given' if ok_users.empty?
+      ret = yield
+      unless unknown_users.empty?
+        raise SMTPAuthenticationError, "failed to deliver for #{unknown_users.join(', ')}"
+      end
+      ret
     end
 
-    def mailfrom( fromaddr )
-      getok('MAIL FROM:<%s>', fromaddr)
+    def rcptto(to_addr)
+      if $SAFE > 0
+        raise SecurityError, 'tainted to_addr' if to_addr.tainted?
+      end
+      getok("RCPT TO:<#{to_addr}>")
     end
 
-    def rcptto( to )
-      getok('RCPT TO:<%s>', to)
+    # This method sends a message.
+    # If +msgstr+ is given, sends it as a message.
+    # If block is given, yield a message writer stream.
+    # You must write message before the block is closed.
+    #
+    #   # Example 1 (by string)
+    #   smtp.data(<<EndMessage)
+    #   From: john@example.com
+    #   To: betty@example.com
+    #   Subject: I found a bug
+    #
+    #   Check vm.c:58879.
+    #   EndMessage
+    #
+    #   # Example 2 (by block)
+    #   smtp.data {|f|
+    #     f.puts "From: john@example.com"
+    #     f.puts "To: betty@example.com"
+    #     f.puts "Subject: I found a bug"
+    #     f.puts ""
+    #     f.puts "Check vm.c:58879."
+    #   }
+    #
+    def data(msgstr = nil, &block)   #:yield: stream
+      if msgstr and block
+        raise ArgumentError, "message and block are exclusive"
+      end
+      unless msgstr or block
+        raise ArgumentError, "message or block is required"
+      end
+      res = critical {
+        check_continue get_response('DATA')
+        if msgstr
+          @socket.write_message msgstr
+        else
+          @socket.write_message_by_block(&block)
+        end
+        recv_response()
+      }
+      check_response res
+      res
     end
 
     def quit
       getok('QUIT')
     end
 
-    #
-    # row level library
-    #
-
     private
 
-    def getok( fmt, *args )
+    def getok(reqline)
       res = critical {
-        @socket.writeline sprintf(fmt, *args)
+        @socket.writeline reqline
         recv_response()
       }
-      return check_response(res)
+      check_response res
+      res
     end
 
-    def get_response( fmt, *args )
-      @socket.writeline sprintf(fmt, *args)
+    def get_response(reqline)
+      @socket.writeline reqline
       recv_response()
     end
 
     def recv_response
-      res = ''
+      buf = ''
       while true
         line = @socket.readline
-        res << line << "\n"
-        break unless line[3] == ?-   # "210-PIPELINING"
+        buf << line << "\n"
+        break unless line[3,1] == '-'   # "210-PIPELINING"
       end
-      res
-    end
-
-    def check_response( res, allow_continue = false )
-      return res if /\A2/ === res
-      return res if allow_continue and /\A3/ === res
-      err = case res
-            when /\A4/  then SMTPServerBusy
-            when /\A50/ then SMTPSyntaxError
-            when /\A55/ then SMTPFatalError
-            else SMTPUnknownError
-            end
-      raise err, res
+      Response.parse(buf)
     end
 
-    def critical( &block )
+    def critical(&block)
       return '200 dummy reply code' if @error_occured
       begin
         return yield()
@@ -690,8 +949,90 @@ module Net
       end
     end
 
+    def check_response(res)
+      unless res.success?
+        raise res.exception_class, res.message
+      end
+    end
+
+    def check_continue(res)
+      unless res.continue?
+        raise SMTPUnknownError, "could not get 3xx (#{res.status})"
+      end
+    end
+
+    def check_auth_response(res)
+      unless res.success?
+        raise SMTPAuthenticationError, res.message
+      end
+    end
+
+    def check_auth_continue(res)
+      unless res.continue?
+        raise res.exception_class, res.message
+      end
+    end
+
+    class Response
+      def self.parse(str)
+        new(str[0,3], str)
+      end
+
+      def initialize(status, string)
+        @status = status
+        @string = string
+      end
+
+      attr_reader :status
+      attr_reader :string
+
+      def status_type_char
+        @status[0, 1]
+      end
+
+      def success?
+        status_type_char() == '2'
+      end
+
+      def continue?
+        status_type_char() == '3'
+      end
+
+      def message
+        @string.lines.first
+      end
+
+      def cram_md5_challenge
+        @string.split(/ /)[1].unpack('m')[0]
+      end
+
+      def capabilities
+        return {} unless @string[3, 1] == '-'
+        h = {}
+        @string.lines.drop(1).each do |line|
+          k, *v = line[4..-1].chomp.split(nil)
+          h[k] = v
+        end
+        h
+      end
+
+      def exception_class
+        case @status
+        when /\A4/  then SMTPServerBusy
+        when /\A50/ then SMTPSyntaxError
+        when /\A53/ then SMTPAuthenticationError
+        when /\A5/  then SMTPFatalError
+        else             SMTPUnknownError
+        end
+      end
+    end
+
+    def logging(msg)
+      @debug_output << msg + "\n" if @debug_output
+    end
+
   end   # class SMTP
 
   SMTPSession = SMTP
 
-end   # module Net
+end
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index a55527f15e..a8ded93b9d 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -1,7 +1,7 @@
 # = net/telnet.rb - Simple Telnet Client Library
-# 
+#
 # Author:: Wakou Aoyama <wakou@ruby-lang.org>
-# Documentation:: William Webber and Wakou Aoyama 
+# Documentation:: William Webber and Wakou Aoyama
 #
 # This file holds the class Net::Telnet, which provides client-side
 # telnet functionality.
@@ -10,10 +10,9 @@
 #
 
 require "socket"
-require "delegate"
 require "timeout"
 require "English"
- 
+
 module Net
 
   #
@@ -50,11 +49,11 @@ module Net
   # have to handle authentication yourself.
   #
   # For some protocols, it will be possible to specify the +Prompt+
-  # option once when you create the Telnet object and use #cmd() calls; 
+  # option once when you create the Telnet object and use #cmd() calls;
   # for others, you will have to specify the response sequence to
   # look for as the Match option to every #cmd() call, or call
-  # #puts() and #waitfor() directly; for yet others, you will have 
-  # to use #sysread() instead of #waitfor() and parse server 
+  # #puts() and #waitfor() directly; for yet others, you will have
+  # to use #sysread() instead of #waitfor() and parse server
   # responses yourself.
   #
   # It is worth noting that when you create a new Net::Telnet object,
@@ -63,21 +62,21 @@ module Net
   # to already open sockets, or to any read-write IO object.  This
   # can be useful, for instance, for setting up a test fixture for
   # unit testing.
-  # 
+  #
   # == Examples
-  # 
+  #
   # === Log in and send a command, echoing all output to stdout
-  # 
+  #
   #   localhost = Net::Telnet::new("Host" => "localhost",
   #                                "Timeout" => 10,
   #                                "Prompt" => /[$%#>] \z/n)
   #   localhost.login("username", "password") { |c| print c }
   #   localhost.cmd("command") { |c| print c }
   #   localhost.close
-  # 
-  # 
+  #
+  #
   # === Check a POP server to see if you have mail
-  # 
+  #
   #   pop = Net::Telnet::new("Host" => "your_destination_host_here",
   #                          "Port" => 110,
   #                          "Telnetmode" => false,
@@ -93,77 +92,77 @@ module Net
   # of relevant RFCs, see
   # http://www.omnifarious.org/~hopper/technical/telnet-rfc.html
   #
-  class Telnet < SimpleDelegator
+  class Telnet
 
     # :stopdoc:
     IAC   = 255.chr # "\377" # "\xff" # interpret as command
-    DONT  = 254.chr # "\376" # "\xfe" # you are not to use option 
-    DO    = 253.chr # "\375" # "\xfd" # please, you use option 
-    WONT  = 252.chr # "\374" # "\xfc" # I won't use option 
-    WILL  = 251.chr # "\373" # "\xfb" # I will use option 
-    SB    = 250.chr # "\372" # "\xfa" # interpret as subnegotiation 
-    GA    = 249.chr # "\371" # "\xf9" # you may reverse the line 
-    EL    = 248.chr # "\370" # "\xf8" # erase the current line 
-    EC    = 247.chr # "\367" # "\xf7" # erase the current character 
-    AYT   = 246.chr # "\366" # "\xf6" # are you there 
-    AO    = 245.chr # "\365" # "\xf5" # abort output--but let prog finish 
-    IP    = 244.chr # "\364" # "\xf4" # interrupt process--permanently 
-    BREAK = 243.chr # "\363" # "\xf3" # break 
-    DM    = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning 
-    NOP   = 241.chr # "\361" # "\xf1" # nop 
-    SE    = 240.chr # "\360" # "\xf0" # end sub negotiation 
-    EOR   = 239.chr # "\357" # "\xef" # end of record (transparent mode) 
-    ABORT = 238.chr # "\356" # "\xee" # Abort process 
-    SUSP  = 237.chr # "\355" # "\xed" # Suspend process 
-    EOF   = 236.chr # "\354" # "\xec" # End of file 
-    SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls 
-
-    OPT_BINARY         =   0.chr # "\000" # "\x00" # Binary Transmission 
-    OPT_ECHO           =   1.chr # "\001" # "\x01" # Echo 
-    OPT_RCP            =   2.chr # "\002" # "\x02" # Reconnection 
-    OPT_SGA            =   3.chr # "\003" # "\x03" # Suppress Go Ahead 
-    OPT_NAMS           =   4.chr # "\004" # "\x04" # Approx Message Size Negotiation 
-    OPT_STATUS         =   5.chr # "\005" # "\x05" # Status 
-    OPT_TM             =   6.chr # "\006" # "\x06" # Timing Mark 
-    OPT_RCTE           =   7.chr # "\a"   # "\x07" # Remote Controlled Trans and Echo 
-    OPT_NAOL           =   8.chr # "\010" # "\x08" # Output Line Width 
-    OPT_NAOP           =   9.chr # "\t"   # "\x09" # Output Page Size 
-    OPT_NAOCRD         =  10.chr # "\n"   # "\x0a" # Output Carriage-Return Disposition 
-    OPT_NAOHTS         =  11.chr # "\v"   # "\x0b" # Output Horizontal Tab Stops 
-    OPT_NAOHTD         =  12.chr # "\f"   # "\x0c" # Output Horizontal Tab Disposition 
-    OPT_NAOFFD         =  13.chr # "\r"   # "\x0d" # Output Formfeed Disposition 
-    OPT_NAOVTS         =  14.chr # "\016" # "\x0e" # Output Vertical Tabstops 
-    OPT_NAOVTD         =  15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition 
-    OPT_NAOLFD         =  16.chr # "\020" # "\x10" # Output Linefeed Disposition 
-    OPT_XASCII         =  17.chr # "\021" # "\x11" # Extended ASCII 
-    OPT_LOGOUT         =  18.chr # "\022" # "\x12" # Logout 
-    OPT_BM             =  19.chr # "\023" # "\x13" # Byte Macro 
-    OPT_DET            =  20.chr # "\024" # "\x14" # Data Entry Terminal 
-    OPT_SUPDUP         =  21.chr # "\025" # "\x15" # SUPDUP 
-    OPT_SUPDUPOUTPUT   =  22.chr # "\026" # "\x16" # SUPDUP Output 
-    OPT_SNDLOC         =  23.chr # "\027" # "\x17" # Send Location 
-    OPT_TTYPE          =  24.chr # "\030" # "\x18" # Terminal Type 
-    OPT_EOR            =  25.chr # "\031" # "\x19" # End of Record 
-    OPT_TUID           =  26.chr # "\032" # "\x1a" # TACACS User Identification 
-    OPT_OUTMRK         =  27.chr # "\e"   # "\x1b" # Output Marking 
-    OPT_TTYLOC         =  28.chr # "\034" # "\x1c" # Terminal Location Number 
-    OPT_3270REGIME     =  29.chr # "\035" # "\x1d" # Telnet 3270 Regime 
-    OPT_X3PAD          =  30.chr # "\036" # "\x1e" # X.3 PAD 
-    OPT_NAWS           =  31.chr # "\037" # "\x1f" # Negotiate About Window Size 
-    OPT_TSPEED         =  32.chr # " "    # "\x20" # Terminal Speed 
-    OPT_LFLOW          =  33.chr # "!"    # "\x21" # Remote Flow Control 
-    OPT_LINEMODE       =  34.chr # "\""   # "\x22" # Linemode 
-    OPT_XDISPLOC       =  35.chr # "#"    # "\x23" # X Display Location 
-    OPT_OLD_ENVIRON    =  36.chr # "$"    # "\x24" # Environment Option 
-    OPT_AUTHENTICATION =  37.chr # "%"    # "\x25" # Authentication Option 
-    OPT_ENCRYPT        =  38.chr # "&"    # "\x26" # Encryption Option 
-    OPT_NEW_ENVIRON    =  39.chr # "'"    # "\x27" # New Environment Option 
-    OPT_EXOPL          = 255.chr # "\377" # "\xff" # Extended-Options-List 
-
-    NULL = "\000" 
-    CR   = "\015"   
-    LF   = "\012" 
-    EOL  = CR + LF 
+    DONT  = 254.chr # "\376" # "\xfe" # you are not to use option
+    DO    = 253.chr # "\375" # "\xfd" # please, you use option
+    WONT  = 252.chr # "\374" # "\xfc" # I won't use option
+    WILL  = 251.chr # "\373" # "\xfb" # I will use option
+    SB    = 250.chr # "\372" # "\xfa" # interpret as subnegotiation
+    GA    = 249.chr # "\371" # "\xf9" # you may reverse the line
+    EL    = 248.chr # "\370" # "\xf8" # erase the current line
+    EC    = 247.chr # "\367" # "\xf7" # erase the current character
+    AYT   = 246.chr # "\366" # "\xf6" # are you there
+    AO    = 245.chr # "\365" # "\xf5" # abort output--but let prog finish
+    IP    = 244.chr # "\364" # "\xf4" # interrupt process--permanently
+    BREAK = 243.chr # "\363" # "\xf3" # break
+    DM    = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning
+    NOP   = 241.chr # "\361" # "\xf1" # nop
+    SE    = 240.chr # "\360" # "\xf0" # end sub negotiation
+    EOR   = 239.chr # "\357" # "\xef" # end of record (transparent mode)
+    ABORT = 238.chr # "\356" # "\xee" # Abort process
+    SUSP  = 237.chr # "\355" # "\xed" # Suspend process
+    EOF   = 236.chr # "\354" # "\xec" # End of file
+    SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls
+
+    OPT_BINARY         =   0.chr # "\000" # "\x00" # Binary Transmission
+    OPT_ECHO           =   1.chr # "\001" # "\x01" # Echo
+    OPT_RCP            =   2.chr # "\002" # "\x02" # Reconnection
+    OPT_SGA            =   3.chr # "\003" # "\x03" # Suppress Go Ahead
+    OPT_NAMS           =   4.chr # "\004" # "\x04" # Approx Message Size Negotiation
+    OPT_STATUS         =   5.chr # "\005" # "\x05" # Status
+    OPT_TM             =   6.chr # "\006" # "\x06" # Timing Mark
+    OPT_RCTE           =   7.chr # "\a"   # "\x07" # Remote Controlled Trans and Echo
+    OPT_NAOL           =   8.chr # "\010" # "\x08" # Output Line Width
+    OPT_NAOP           =   9.chr # "\t"   # "\x09" # Output Page Size
+    OPT_NAOCRD         =  10.chr # "\n"   # "\x0a" # Output Carriage-Return Disposition
+    OPT_NAOHTS         =  11.chr # "\v"   # "\x0b" # Output Horizontal Tab Stops
+    OPT_NAOHTD         =  12.chr # "\f"   # "\x0c" # Output Horizontal Tab Disposition
+    OPT_NAOFFD         =  13.chr # "\r"   # "\x0d" # Output Formfeed Disposition
+    OPT_NAOVTS         =  14.chr # "\016" # "\x0e" # Output Vertical Tabstops
+    OPT_NAOVTD         =  15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition
+    OPT_NAOLFD         =  16.chr # "\020" # "\x10" # Output Linefeed Disposition
+    OPT_XASCII         =  17.chr # "\021" # "\x11" # Extended ASCII
+    OPT_LOGOUT         =  18.chr # "\022" # "\x12" # Logout
+    OPT_BM             =  19.chr # "\023" # "\x13" # Byte Macro
+    OPT_DET            =  20.chr # "\024" # "\x14" # Data Entry Terminal
+    OPT_SUPDUP         =  21.chr # "\025" # "\x15" # SUPDUP
+    OPT_SUPDUPOUTPUT   =  22.chr # "\026" # "\x16" # SUPDUP Output
+    OPT_SNDLOC         =  23.chr # "\027" # "\x17" # Send Location
+    OPT_TTYPE          =  24.chr # "\030" # "\x18" # Terminal Type
+    OPT_EOR            =  25.chr # "\031" # "\x19" # End of Record
+    OPT_TUID           =  26.chr # "\032" # "\x1a" # TACACS User Identification
+    OPT_OUTMRK         =  27.chr # "\e"   # "\x1b" # Output Marking
+    OPT_TTYLOC         =  28.chr # "\034" # "\x1c" # Terminal Location Number
+    OPT_3270REGIME     =  29.chr # "\035" # "\x1d" # Telnet 3270 Regime
+    OPT_X3PAD          =  30.chr # "\036" # "\x1e" # X.3 PAD
+    OPT_NAWS           =  31.chr # "\037" # "\x1f" # Negotiate About Window Size
+    OPT_TSPEED         =  32.chr # " "    # "\x20" # Terminal Speed
+    OPT_LFLOW          =  33.chr # "!"    # "\x21" # Remote Flow Control
+    OPT_LINEMODE       =  34.chr # "\""   # "\x22" # Linemode
+    OPT_XDISPLOC       =  35.chr # "#"    # "\x23" # X Display Location
+    OPT_OLD_ENVIRON    =  36.chr # "$"    # "\x24" # Environment Option
+    OPT_AUTHENTICATION =  37.chr # "%"    # "\x25" # Authentication Option
+    OPT_ENCRYPT        =  38.chr # "&"    # "\x26" # Encryption Option
+    OPT_NEW_ENVIRON    =  39.chr # "'"    # "\x27" # New Environment Option
+    OPT_EXOPL          = 255.chr # "\377" # "\xff" # Extended-Options-List
+
+    NULL = "\000"
+    CR   = "\015"
+    LF   = "\012"
+    EOL  = CR + LF
     REVISION = '$Id$'
     # :startdoc:
 
@@ -174,13 +173,13 @@ module Net
     # provided: see below).  If a block is provided, it is yielded
     # status messages on the attempt to connect to the server, of
     # the form:
-    # 
+    #
     #   Trying localhost...
     #   Connected to localhost.
     #
     # +options+ is a hash of options.  The following example lists
     # all options and their default values.
-    # 
+    #
     #   host = Net::Telnet::new(
     #            "Host"       => "localhost",  # default: "localhost"
     #            "Port"       => 23,           # default: 23
@@ -198,16 +197,16 @@ module Net
     #
     # The options have the following meanings:
     #
-    # Host:: the hostname or IP address of the host to connect to, as a String. 
+    # Host:: the hostname or IP address of the host to connect to, as a String.
     #        Defaults to "localhost".
     #
     # Port:: the port to connect to.  Defaults to 23.
     #
-    # Binmode:: if false (the default), newline substitution is performed.  
+    # Binmode:: if false (the default), newline substitution is performed.
     #           Outgoing LF is
     #           converted to CRLF, and incoming CRLF is converted to LF.  If
     #           true, this substitution is not performed.  This value can
-    #           also be set with the #binmode() method.  The 
+    #           also be set with the #binmode() method.  The
     #           outgoing conversion only applies to the #puts() and #print()
     #           methods, not the #write() method.  The precise nature of
     #           the newline conversion is also affected by the telnet options
@@ -217,13 +216,13 @@ module Net
     #              and all received traffic to.  In the case of a proper
     #              Telnet session, this will include the client input as
     #              echoed by the host; otherwise, it only includes server
-    #              responses.  Output is appended verbatim to this file.  
+    #              responses.  Output is appended verbatim to this file.
     #              By default, no output log is kept.
     #
     # Dump_log:: as for Output_log, except that output is written in hexdump
     #            format (16 bytes per line as hex pairs, followed by their
     #            printable equivalent), with connection status messages
-    #            preceded by '#', sent traffic preceded by '>', and 
+    #            preceded by '#', sent traffic preceded by '>', and
     #            received traffic preceded by '<'.  By default, not dump log
     #            is kept.
     #
@@ -233,7 +232,7 @@ module Net
     #          ready to receive a new command.  By default, this regular
     #          expression is /[$%#>] \z/n.
     #
-    # Telnetmode:: a boolean value, true by default.  In telnet mode, 
+    # Telnetmode:: a boolean value, true by default.  In telnet mode,
     #              traffic received from the host is parsed for special
     #              command sequences, and these sequences are escaped
     #              in outgoing traffic sent using #puts() or #print()
@@ -255,11 +254,11 @@ module Net
     #           minutes), but other attempts to read data from the host
     #           will hand indefinitely if no data is forthcoming.
     #
-    # Waittime:: the amount of time to wait after seeing what looks like a 
+    # Waittime:: the amount of time to wait after seeing what looks like a
     #            prompt (that is, received data that matches the Prompt
     #            option regular expression) to see if more data arrives.
     #            If more data does arrive in this time, Net::Telnet assumes
-    #            that what it saw was not really a prompt.  This is to try to 
+    #            that what it saw was not really a prompt.  This is to try to
     #            avoid false matches, but it can also lead to missing real
     #            prompts (if, for instance, a background process writes to
     #            the terminal soon after the prompt is displayed).  By
@@ -267,12 +266,12 @@ module Net
     #
     # Proxy:: a proxy object to used instead of opening a direct connection
     #         to the host.  Must be either another Net::Telnet object or
-    #         an IO object.  If it is another Net::Telnet object, this 
+    #         an IO object.  If it is another Net::Telnet object, this
     #         instance will use that one's socket for communication.  If an
     #         IO object, it is used directly for communication.  Any other
     #         kind of object will cause an error to be raised.
     #
-    def initialize(options) # :yield: mesg 
+    def initialize(options) # :yield: mesg
       @options = options
       @options["Host"]       = "localhost"   unless @options.has_key?("Host")
       @options["Port"]       = 23            unless @options.has_key?("Port")
@@ -280,7 +279,7 @@ module Net
       @options["Timeout"]    = 10            unless @options.has_key?("Timeout")
       @options["Waittime"]   = 0             unless @options.has_key?("Waittime")
       unless @options.has_key?("Binmode")
-        @options["Binmode"]    = false         
+        @options["Binmode"]    = false
       else
         unless (true == @options["Binmode"] or false == @options["Binmode"])
           raise ArgumentError, "Binmode option must be true or false"
@@ -288,7 +287,7 @@ module Net
       end
 
       unless @options.has_key?("Telnetmode")
-        @options["Telnetmode"] = true          
+        @options["Telnetmode"] = true
       else
         unless (true == @options["Telnetmode"] or false == @options["Telnetmode"])
           raise ArgumentError, "Telnetmode option must be true or false"
@@ -368,13 +367,12 @@ module Net
         @dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
       end
 
-      super(@sock)
     end # initialize
 
     # The socket the Telnet object is using.  Note that this object becomes
     # a delegate of the Telnet object, so normally you invoke its methods
     # directly on the Telnet object.
-    attr :sock 
+    attr :sock
 
     # Set telnet command interpretation on (+mode+ == true) or off
     # (+mode+ == false), or return the current value (+mode+ not
@@ -408,7 +406,7 @@ module Net
     def binmode(mode = nil)
       case mode
       when nil
-        @options["Binmode"] 
+        @options["Binmode"]
       when true, false
         @options["Binmode"] = mode
       else
@@ -428,7 +426,7 @@ module Net
     # Preprocess received data from the host.
     #
     # Performs newline conversion and detects telnet command sequences.
-    # Called automatically by #waitfor().  You should only use this 
+    # Called automatically by #waitfor().  You should only use this
     # method yourself if you have read input directly using sysread()
     # or similar, and even then only if in telnet mode.
     def preprocess(string)
@@ -438,6 +436,9 @@ module Net
       # combine EOL into "\n"
       string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
 
+      # remove NULL
+      string = string.gsub(/#{NULL}/no, '') unless @options["Binmode"]
+
       string.gsub(/#{IAC}(
                    [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
                    [#{DO}#{DONT}#{WILL}#{WONT}]
@@ -491,9 +492,9 @@ module Net
     # Read data from the host until a certain sequence is matched.
     #
     # If a block is given, the received data will be yielded as it
-    # is read in (not necessarily all in one go), or nil if EOF 
+    # is read in (not necessarily all in one go), or nil if EOF
     # occurs before any data is received.  Whether a block is given
-    # or not, all data read will be returned in a single string, or again 
+    # or not, all data read will be returned in a single string, or again
     # nil if EOF occurs before any data is received.  Note that
     # received data includes the matched sequence we were looking for.
     #
@@ -507,7 +508,7 @@ module Net
     #          into a regular expression.  Used only if Match and
     #          Prompt are not specified.
     # Timeout:: the number of seconds to wait for data from the host
-    #           before raising a TimeoutError.  If set to false, 
+    #           before raising a TimeoutError.  If set to false,
     #           no timeout will occur.  If not specified, the
     #           Timeout option value specified when this instance
     #           was created will be used, or, failing that, the
@@ -520,10 +521,15 @@ module Net
     #            value specified when this instance was created will be
     #            used, or, failing that, the default value of 0 seconds,
     #            which means not to wait for more input.
-    #           
+    # FailEOF:: if true, when the remote end closes the connection then an
+    #           EOFError will be raised. Otherwise, defaults to the old
+    #           behaviour that the function will return whatever data
+    #           has been received already, or nil if nothing was received.
+    #
     def waitfor(options) # :yield: recvdata
       time_out = @options["Timeout"]
       waittime = @options["Waittime"]
+      fail_eof = @options["FailEOF"]
 
       if options.kind_of?(Hash)
         prompt   = if options.has_key?("Match")
@@ -535,6 +541,7 @@ module Net
                    end
         time_out = options["Timeout"]  if options.has_key?("Timeout")
         waittime = options["Waittime"] if options.has_key?("Waittime")
+        fail_eof = options["FailEOF"]  if options.has_key?("FailEOF")
       else
         prompt = options
       end
@@ -555,8 +562,8 @@ module Net
           @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
           if @options["Telnetmode"]
             c = rest + c
-            if Integer(c.rindex(/#{IAC}#{SE}/no)) <
-               Integer(c.rindex(/#{IAC}#{SB}/no))
+            if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
+               Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
               buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
               rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
             elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
@@ -586,6 +593,7 @@ module Net
           line += buf
           yield buf if block_given?
         rescue EOFError # End of file reached
+          raise if fail_eof
           if line == ''
             line = nil
             yield nil if block_given?
@@ -612,7 +620,7 @@ module Net
     # Sends a string to the host.
     #
     # This does _not_ automatically append a newline to the string.  Embedded
-    # newlines may be converted and telnet command sequences escaped 
+    # newlines may be converted and telnet command sequences escaped
     # depending upon the values of telnetmode, binmode, and telnet options
     # set by the host.
     def print(string)
@@ -647,7 +655,7 @@ module Net
     # data until is sees the prompt or other matched sequence.
     #
     # If a block is given, the received data will be yielded to it as
-    # it is read in.  Whether a block is given or not, the received data 
+    # it is read in.  Whether a block is given or not, the received data
     # will be return as a string.  Note that the received data includes
     # the prompt and in most cases the host's echo of our command.
     #
@@ -671,20 +679,22 @@ module Net
     def cmd(options) # :yield: recvdata
       match    = @options["Prompt"]
       time_out = @options["Timeout"]
+      fail_eof = @options["FailEOF"]
 
       if options.kind_of?(Hash)
         string   = options["String"]
         match    = options["Match"]   if options.has_key?("Match")
         time_out = options["Timeout"] if options.has_key?("Timeout")
+        fail_eof = options["FailEOF"] if options.has_key?("FailEOF")
       else
         string = options
       end
 
       self.puts(string)
       if block_given?
-        waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c }
+        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof}){|c| yield c }
       else
-        waitfor({"Prompt" => match, "Timeout" => time_out})
+        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof})
       end
     end
 
@@ -692,7 +702,7 @@ module Net
     #
     # The username and password can either be provided as two string
     # arguments in that order, or as a hash with keys "Name" and
-    # "Password".    
+    # "Password".
     #
     # This method looks for the strings "login" and "Password" from the
     # host to determine when to send the username and password.  If the
@@ -744,6 +754,10 @@ module Net
       line
     end
 
+    def close
+      @sock.close
+    end
+
   end  # class Telnet
 end  # module Net
 
diff --git a/lib/observer.rb b/lib/observer.rb
index 64c7d81351..ee3f01b793 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -7,7 +7,7 @@
 #
 # The Observer pattern, also known as Publish/Subscribe, provides a simple
 # mechanism for one object to inform a set of interested third-party objects
-# when its state changes. 
+# when its state changes.
 #
 # == Mechanism
 #
@@ -39,14 +39,14 @@
 # contracts are correct, nothing else can warn you.
 #
 #   require "observer"
-#   
+#
 #   class Ticker          ### Periodically fetch a stock price.
 #     include Observable
-#   
+#
 #     def initialize(symbol)
 #       @symbol = symbol
 #     end
-#   
+#
 #     def run
 #       lastPrice = nil
 #       loop do
@@ -67,14 +67,14 @@
 #       60 + rand(80)
 #     end
 #   end
-#   
+#
 #   class Warner          ### An abstract observer of Ticker objects.
 #     def initialize(ticker, limit)
 #       @limit = limit
 #       ticker.add_observer(self)
 #     end
 #   end
-#   
+#
 #   class WarnLow < Warner
 #     def update(time, price)       # callback for observer
 #       if price < @limit
@@ -82,7 +82,7 @@
 #       end
 #     end
 #   end
-#   
+#
 #   class WarnHigh < Warner
 #     def update(time, price)       # callback for observer
 #       if price > @limit
@@ -118,14 +118,15 @@ module Observable
 
   #
   # Add +observer+ as an observer on this object. +observer+ will now receive
-  # notifications.
+  # notifications.  The second optional argument specifies a method to notify
+  # updates, of which default value is +update+.
   #
-  def add_observer(observer)
-    @observer_peers = [] unless defined? @observer_peers
-    unless observer.respond_to? :update
-      raise NoMethodError, "observer needs to respond to `update'" 
+  def add_observer(observer, func=:update)
+    @observer_peers = {} unless defined? @observer_peers
+    unless observer.respond_to? func
+      raise NoMethodError, "observer does not respond to `#{func.to_s}'"
     end
-    @observer_peers.push observer
+    @observer_peers[observer] = func
   end
 
   #
@@ -181,9 +182,9 @@ module Observable
   def notify_observers(*arg)
     if defined? @observer_state and @observer_state
       if defined? @observer_peers
-	for i in @observer_peers.dup
-	  i.update(*arg)
-	end
+       @observer_peers.each { |k, v|
+      k.send v, *arg
+    }
       end
       @observer_state = false
     end
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 0dae95b6e6..bb45d63ae6 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -5,6 +5,9 @@ require 'time'
 module Kernel
   private
   alias open_uri_original_open open # :nodoc:
+  class << self
+    alias open_uri_original_open open # :nodoc:
+  end
 
   # makes possible to open various resources including URIs.
   # If the first argument respond to `open' method,
@@ -91,9 +94,15 @@ end
 module OpenURI
   Options = {
     :proxy => true,
+    :proxy_http_basic_authentication => true,
     :progress_proc => true,
     :content_length_proc => true,
     :http_basic_authentication => true,
+    :read_timeout => true,
+    :ssl_ca_cert => nil,
+    :ssl_verify_mode => nil,
+    :ftp_active_mode => false,
+    :redirect => true,
   }
 
   def OpenURI.check_options(options) # :nodoc:
@@ -123,6 +132,11 @@ module OpenURI
     options ||= {}
     OpenURI.check_options(options)
 
+    if /\Arb?(?:\Z|:([^:]+))/ =~ mode
+      encoding, = $1,Encoding.find($1) if $1
+      mode = nil
+    end
+
     unless mode == nil ||
            mode == 'r' || mode == 'rb' ||
            mode == File::RDONLY
@@ -130,6 +144,7 @@ module OpenURI
     end
 
     io = open_loop(uri, options)
+    io.set_encoding(encoding) if encoding
     if block_given?
       begin
         yield io
@@ -142,16 +157,40 @@ module OpenURI
   end
 
   def OpenURI.open_loop(uri, options) # :nodoc:
-    case opt_proxy = options.fetch(:proxy, true)
+    proxy_opts = []
+    proxy_opts << :proxy_http_basic_authentication if options.include? :proxy_http_basic_authentication
+    proxy_opts << :proxy if options.include? :proxy
+    proxy_opts.compact!
+    if 1 < proxy_opts.length
+      raise ArgumentError, "multiple proxy options specified"
+    end
+    case proxy_opts.first
+    when :proxy_http_basic_authentication
+      opt_proxy, proxy_user, proxy_pass = options.fetch(:proxy_http_basic_authentication)
+      proxy_user = proxy_user.to_str
+      proxy_pass = proxy_pass.to_str
+      if opt_proxy == true
+        raise ArgumentError.new("Invalid authenticated proxy option: #{options[:proxy_http_basic_authentication].inspect}")
+      end
+    when :proxy
+      opt_proxy = options.fetch(:proxy)
+      proxy_user = nil
+      proxy_pass = nil
+    when nil
+      opt_proxy = true
+      proxy_user = nil
+      proxy_pass = nil
+    end
+    case opt_proxy
     when true
-      find_proxy = lambda {|u| u.find_proxy}
+      find_proxy = lambda {|u| pxy = u.find_proxy; pxy ? [pxy, nil, nil] : nil}
     when nil, false
       find_proxy = lambda {|u| nil}
     when String
       opt_proxy = URI.parse(opt_proxy)
-      find_proxy = lambda {|u| opt_proxy}
+      find_proxy = lambda {|u| [opt_proxy, proxy_user, proxy_pass]}
     when URI::Generic
-      find_proxy = lambda {|u| opt_proxy}
+      find_proxy = lambda {|u| [opt_proxy, proxy_user, proxy_pass]}
     else
       raise ArgumentError.new("Invalid proxy option: #{opt_proxy}")
     end
@@ -170,6 +209,9 @@ module OpenURI
           # URI.  It is converted to absolute URI using uri as a base URI.
           redirect = uri + redirect
         end
+        if !options.fetch(:redirect, true)
+          raise HTTPRedirect.new(buf.io.status.join(' '), buf.io, redirect)
+        end
         unless OpenURI.redirectable?(uri, redirect)
           raise "redirection forbidden: #{uri} -> #{redirect}"
         end
@@ -193,6 +235,9 @@ module OpenURI
   def OpenURI.redirectable?(uri1, uri2) # :nodoc:
     # This test is intended to forbid a redirection from http://... to
     # file:///etc/passwd.
+    # https to http redirect is also forbidden intentionally.
+    # It avoids sending secure cookie or referer by non-secure HTTP protocol.
+    # (RFC 2109 4.3.1, RFC 2965 3.3, RFC 2616 15.1.3)
     # However this is ad hoc.  It should be extensible/configurable.
     uri1.scheme.downcase == uri2.scheme.downcase ||
     (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:http|ftp)\z/i =~ uri2.scheme)
@@ -200,7 +245,8 @@ module OpenURI
 
   def OpenURI.open_http(buf, target, proxy, options) # :nodoc:
     if proxy
-      raise "Non-HTTP proxy URI: #{proxy}" if proxy.class != URI::HTTP
+      proxy_uri, proxy_user, proxy_pass = proxy
+      raise "Non-HTTP proxy URI: #{proxy_uri}" if proxy_uri.class != URI::HTTP
     end
 
     if target.userinfo && "1.9.0" <= RUBY_VERSION
@@ -208,35 +254,53 @@ module OpenURI
       raise ArgumentError, "userinfo not supported.  [RFC3986]"
     end
 
+    header = {}
+    options.each {|k, v| header[k] = v if String === k }
+
     require 'net/http'
     klass = Net::HTTP
     if URI::HTTP === target
       # HTTP or HTTPS
       if proxy
-        klass = Net::HTTP::Proxy(proxy.host, proxy.port)
+        if proxy_user && proxy_pass
+          klass = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_user, proxy_pass)
+        else
+          klass = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port)
+        end
       end
       target_host = target.host
       target_port = target.port
       request_uri = target.request_uri
     else
       # FTP over HTTP proxy
-      target_host = proxy.host
-      target_port = proxy.port
+      target_host = proxy_uri.host
+      target_port = proxy_uri.port
       request_uri = target.to_s
+      if proxy_user && proxy_pass
+        header["Proxy-Authorization"] = 'Basic ' + ["#{proxy_user}:#{proxy_pass}"].pack('m').delete("\r\n")
+      end
     end
 
     http = klass.new(target_host, target_port)
     if target.class == URI::HTTPS
       require 'net/https'
       http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.verify_mode = options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_PEER
       store = OpenSSL::X509::Store.new
-      store.set_default_paths
+      if options[:ssl_ca_cert]
+        if File.directory? options[:ssl_ca_cert]
+          store.add_path options[:ssl_ca_cert]
+        else
+          store.add_file options[:ssl_ca_cert]
+        end
+      else
+        store.set_default_paths
+      end
       http.cert_store = store
     end
-
-    header = {}
-    options.each {|k, v| header[k] = v if String === k }
+    if options.include? :read_timeout
+      http.read_timeout = options[:read_timeout]
+    end
 
     resp = nil
     http.start {
@@ -272,7 +336,12 @@ module OpenURI
          Net::HTTPFound, # 302
          Net::HTTPSeeOther, # 303
          Net::HTTPTemporaryRedirect # 307
-      throw :open_uri_redirect, URI.parse(resp['location'])
+      begin
+        loc_uri = URI.parse(resp['location'])
+      rescue URI::InvalidURIError
+        raise OpenURI::HTTPError.new(io.status.join(' ') + ' (Invalid Location URI)', io)
+      end
+      throw :open_uri_redirect, loc_uri
     else
       raise OpenURI::HTTPError.new(io.status.join(' '), io)
     end
@@ -286,6 +355,14 @@ module OpenURI
     attr_reader :io
   end
 
+  class HTTPRedirect < HTTPError
+    def initialize(message, io, uri)
+      super(message, io)
+      @uri = uri
+    end
+    attr_reader :uri
+  end
+
   class Buffer # :nodoc:
     def initialize
       @io = StringIO.new
@@ -301,14 +378,14 @@ module OpenURI
         require 'tempfile'
         io = Tempfile.new('open-uri')
         io.binmode
-        Meta.init io, @io if @io.respond_to? :meta
+        Meta.init io, @io if Meta === @io
         io << @io.string
         @io = io
       end
     end
 
     def io
-      Meta.init @io unless @io.respond_to? :meta
+      Meta.init @io unless Meta === @io
       @io
     end
   end
@@ -341,8 +418,29 @@ module OpenURI
     # The Hash keys are downcased for canonicalization.
     attr_reader :meta
 
+    def meta_setup_encoding # :nodoc:
+      charset = self.charset
+      enc = nil
+      if charset
+        begin
+          enc = Encoding.find(charset)
+        rescue ArgumentError
+        end
+      end
+      enc = Encoding::ASCII_8BIT unless enc
+      if self.respond_to? :force_encoding
+        self.force_encoding(enc)
+      elsif self.respond_to? :string
+        self.string.force_encoding(enc)
+      else # Tempfile
+        self.set_encoding enc
+      end
+    end
+
     def meta_add_field(name, value) # :nodoc:
-      @meta[name.downcase] = value
+      name = name.downcase
+      @meta[name] = value
+      meta_setup_encoding if name == 'content-type'
     end
 
     # returns a Time which represents Last-Modified field.
@@ -367,7 +465,9 @@ module OpenURI
         subtype = $2.downcase
         parameters = []
         $3.scan(/;#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?=#{RE_LWS}?(?:(#{RE_TOKEN})|(#{RE_QUOTED_STRING}))/no) {|att, val, qval|
-          val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/) { $1 ? $1[1,1] : $& } if qval
+          if qval
+            val = qval[1...-1].gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/n) { $1 ? $1[1,1] : $& }
+          end
           parameters << [att.downcase, val]
         }
         ["#{type}/#{subtype}", *parameters]
@@ -450,7 +550,7 @@ module OpenURI
     #    :proxy => true
     #    :proxy => false
     #    :proxy => nil
-    #   
+    #
     #  If :proxy option is specified, the value should be String, URI,
     #  boolean or nil.
     #  When String or URI is given, it is treated as proxy URI.
@@ -460,6 +560,21 @@ module OpenURI
     #  When false or nil is given, the environment variables are ignored and
     #  connection will be made to a server directly.
     #
+    # [:proxy_http_basic_authentication]
+    #  Synopsis:
+    #    :proxy_http_basic_authentication => ["http://proxy.foo.com:8000/", "proxy-user", "proxy-password"]
+    #    :proxy_http_basic_authentication => [URI.parse("http://proxy.foo.com:8000/"), "proxy-user", "proxy-password"]
+    #
+    #  If :proxy option is specified, the value should be an Array with 3 elements.
+    #  It should contain a proxy URI, a proxy user name and a proxy password.
+    #  The proxy URI should be a String, an URI or nil.
+    #  The proxy user name and password should be a String.
+    #
+    #  If nil is given for the proxy URI, this option is just ignored.
+    #
+    #  If :proxy and :proxy_http_basic_authentication is specified,
+    #  ArgumentError is raised.
+    #
     # [:http_basic_authentication]
     #  Synopsis:
     #    :http_basic_authentication=>[user, password]
@@ -472,14 +587,14 @@ module OpenURI
     # [:content_length_proc]
     #  Synopsis:
     #    :content_length_proc => lambda {|content_length| ... }
-    # 
+    #
     #  If :content_length_proc option is specified, the option value procedure
     #  is called before actual transfer is started.
     #  It takes one argument which is expected content length in bytes.
-    # 
+    #
     #  If two or more transfer is done by HTTP redirection, the procedure
     #  is called only one for a last transfer.
-    # 
+    #
     #  When expected content length is unknown, the procedure is called with
     #  nil.
     #  It is happen when HTTP response has no Content-Length header.
@@ -490,7 +605,7 @@ module OpenURI
     #
     #  If :progress_proc option is specified, the proc is called with one
     #  argument each time when `open' gets content fragment from network.
-    #  The argument `size' `size' is a accumulated transfered size in bytes.
+    #  The argument `size' `size' is a accumulated transferred size in bytes.
     #
     #  If two or more transfer is done by HTTP redirection, the procedure
     #  is called only one for a last transfer.
@@ -511,9 +626,47 @@ module OpenURI
     #        pbar.set s if pbar
     #      }) {|f| ... }
     #
+    # [:read_timeout]
+    #  Synopsis:
+    #    :read_timeout=>nil     (no timeout)
+    #    :read_timeout=>10      (10 second)
+    #
+    #  :read_timeout option specifies a timeout of read for http connections.
+    #
+    # [:ssl_ca_cert]
+    #  Synopsis:
+    #    :ssl_ca_cert=>filename
+    #
+    #  :ssl_ca_cert is used to specify CA certificate for SSL.
+    #  If it is given, default certificates are not used.
+    #
+    # [:ssl_verify_mode]
+    #  Synopsis:
+    #    :ssl_verify_mode=>mode
+    #
+    #  :ssl_verify_mode is used to specify openssl verify mode.
+    #
     # OpenURI::OpenRead#open returns an IO like object if block is not given.
     # Otherwise it yields the IO object and return the value of the block.
     # The IO object is extended with OpenURI::Meta.
+    #
+    # [:ftp_active_mode]
+    #  Synopsis:
+    #    :ftp_active_mode=>bool
+    #
+    # :ftp_active_mode=>true is used to make ftp active mode.
+    # Note that the active mode is default in Ruby 1.8 or prior.
+    # Ruby 1.9 uses passive mode by default.
+    #
+    # [:redirect]
+    #  Synopsis:
+    #    :redirect=>bool
+    #
+    # :redirect=>false is used to disable HTTP redirects at all.
+    # OpenURI::HTTPRedirect exception raised on redirection.
+    # It is true by default.
+    # The true means redirections between http and ftp is permitted.
+    #
     def open(*rest, &block)
       OpenURI.open_uri(self, *rest, &block)
     end
@@ -567,7 +720,7 @@ module URI
             proxy_uri = nil
           end
         else # http_proxy is safe to use because ENV is case sensitive.
-          proxy_uri = ENV[name]
+          proxy_uri = ENV.to_hash[name]
         end
         if !proxy_uri
           # Use CGI_HTTP_PROXY.  cf. libwww-perl.
@@ -627,8 +780,9 @@ module URI
       end
       require 'net/ftp'
 
-      directories = self.path.split(%r{/}, -1)
-      directories.shift if directories[0] == '' # strip a field before leading slash
+      path = self.path
+      path = path.sub(%r{\A/}, '%2F') # re-encode the beginning slash because uri library decodes it.
+      directories = path.split(%r{/}, -1)
       directories.each {|d|
         d.gsub!(/%([0-9A-Fa-f][0-9A-Fa-f])/) { [$1].pack("H2") }
       }
@@ -649,7 +803,9 @@ module URI
       end
 
       # The access sequence is defined by RFC 1738
-      ftp = Net::FTP.open(self.host)
+      ftp = Net::FTP.new
+      ftp.connect(self.host, self.port)
+      ftp.passive = true if !options[:ftp_active_mode]
       # todo: extract user/passwd from .netrc.
       user = 'anonymous'
       passwd = nil
diff --git a/lib/open3.rb b/lib/open3.rb
index c4dacc9473..9e435f83f8 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -9,82 +9,710 @@
 #
 
 #
-# Open3 grants you access to stdin, stdout, and stderr when running another
-# program. Example:
+# Open3 grants you access to stdin, stdout, stderr and a thread to wait the
+# child process when running another program.
+# You can specify various attributes, redirections, current directory, etc., of
+# the program as Process.spawn.
 #
-#   require "open3"
-#   include Open3
-#   
-#   stdin, stdout, stderr = popen3('nroff -man')
-#
-# Open3.popen3 can also take a block which will receive stdin, stdout and
-# stderr as parameters.  This ensures stdin, stdout and stderr are closed
-# once the block exits. Example:
-#
-#   require "open3"
-#
-#   Open3.popen3('nroff -man') { |stdin, stdout, stderr| ... }
+# - Open3.popen3 : pipes for stdin, stdout, stderr
+# - Open3.popen2 : pipes for stdin, stdout
+# - Open3.popen2e : pipes for stdin, merged stdout and stderr
+# - Open3.capture3 : give a string for stdin.  get strings for stdout, stderr
+# - Open3.capture2 : give a string for stdin.  get a string for stdout
+# - Open3.capture2e : give a string for stdin.  get a string for merged stdout and stderr
+# - Open3.pipeline_rw : pipes for first stdin and last stdout of a pipeline
+# - Open3.pipeline_r : pipe for last stdout of a pipeline
+# - Open3.pipeline_w : pipe for first stdin of a pipeline
+# - Open3.pipeline_start : a pipeline
+# - Open3.pipeline : run a pipline and wait
 #
 
 module Open3
-  # 
+
   # Open stdin, stdout, and stderr streams and start external executable.
+  # In addition, a thread for waiting the started process is noticed.
+  # The thread has a pid method and thread variable :pid which is the pid of
+  # the started process.
+  #
+  # Block form:
+  #
+  #   Open3.popen3([env,] cmd... [, opts]) {|stdin, stdout, stderr, wait_thr|
+  #     pid = wait_thr.pid # pid of the started process.
+  #     ...
+  #     exit_status = wait_thr.value # Process::Status object returned.
+  #   }
+  #
   # Non-block form:
-  #   
-  #   require 'open3'
   #
-  #   [stdin, stdout, stderr] = Open3.popen3(cmd)
+  #   stdin, stdout, stderr, wait_thr = Open3.popen3([env,] cmd... [, opts])
+  #   pid = wait_thr[:pid]  # pid of the started process.
+  #   ...
+  #   stdin.close  # stdin, stdout and stderr should be closed explicitly in this form.
+  #   stdout.close
+  #   stderr.close
+  #   exit_status = wait_thr.value  # Process::Status object returned.
+  #
+  # The parameters +cmd...+ is passed to Process.spawn.
+  # So a commandline string and list of argument strings can be accepted as follows.
+  #
+  #   Open3.popen3("echo a") {|i, o, e, t| ... }
+  #   Open3.popen3("echo", "a") {|i, o, e, t| ... }
+  #   Open3.popen3(["echo", "argv0"], "a") {|i, o, e, t| ... }
+  #
+  # If the last parameter, opts, is a Hash, it is recognized as an option for Process.spawn.
+  #
+  #   Open3.popen3("pwd", :chdir=>"/") {|i,o,e,t|
+  #     p o.read.chomp #=> "/"
+  #   }
+  #
+  # wait_thr.value waits the termination of the process.
+  # The block form also waits the process when it returns.
+  #
+  # Closing stdin, stdout and stderr does not wait the process.
+  #
+  def popen3(*cmd, &block)
+    if Hash === cmd.last
+      opts = cmd.pop.dup
+    else
+      opts = {}
+    end
+
+    in_r, in_w = IO.pipe
+    opts[:in] = in_r
+    in_w.sync = true
+
+    out_r, out_w = IO.pipe
+    opts[:out] = out_w
+
+    err_r, err_w = IO.pipe
+    opts[:err] = err_w
+
+    popen_run(cmd, opts, [in_r, out_w, err_w], [in_w, out_r, err_r], &block)
+  end
+  module_function :popen3
+
+  # Open3.popen2 is similer to Open3.popen3 except it doesn't make a pipe for
+  # the standard error stream.
   #
   # Block form:
   #
-  #   require 'open3'
+  #   Open3.popen2([env,] cmd... [, opts]) {|stdin, stdout, wait_thr|
+  #     pid = wait_thr.pid # pid of the started process.
+  #     ...
+  #     exit_status = wait_thr.value # Process::Status object returned.
+  #   }
+  #
+  # Non-block form:
+  #
+  #   stdin, stdout, wait_thr = Open3.popen2([env,] cmd... [, opts])
+  #   ...
+  #   stdin.close  # stdin and stdout should be closed explicitly in this form.
+  #   stdout.close
+  #
+  # See Process.spawn for the optional hash arguments _env_ and _opts_.
+  #
+  # Example:
+  #
+  #   Open3.popen2("wc -c") {|i,o,t|
+  #     i.print "answer to life the universe and everything"
+  #     i.close
+  #     p o.gets #=> "42\n"
+  #   }
+  #
+  #   Open3.popen2("bc -q") {|i,o,t|
+  #     i.puts "obase=13"
+  #     i.puts "6 * 9"
+  #     p o.gets #=> "42\n"
+  #   }
+  #
+  #   Open3.popen2("dc") {|i,o,t|
+  #     i.print "42P"
+  #     i.close
+  #     p o.read #=> "*"
+  #   }
+  #
+  def popen2(*cmd, &block)
+    if Hash === cmd.last
+      opts = cmd.pop.dup
+    else
+      opts = {}
+    end
+
+    in_r, in_w = IO.pipe
+    opts[:in] = in_r
+    in_w.sync = true
+
+    out_r, out_w = IO.pipe
+    opts[:out] = out_w
+
+    popen_run(cmd, opts, [in_r, out_w], [in_w, out_r], &block)
+  end
+  module_function :popen2
+
+  # Open3.popen2e is similer to Open3.popen3 except it merges
+  # the standard output stream and the standard error stream.
+  #
+  # Block form:
+  #
+  #   Open3.popen2e([env,] cmd... [, opts]) {|stdin, stdout_and_stderr, wait_thr|
+  #     pid = wait_thr.pid # pid of the started process.
+  #     ...
+  #     exit_status = wait_thr.value # Process::Status object returned.
+  #   }
+  #
+  # Non-block form:
+  #
+  #   stdin, stdout_and_stderr, wait_thr = Open3.popen2e([env,] cmd... [, opts])
+  #   ...
+  #   stdin.close  # stdin and stdout_and_stderr should be closed explicitly in this form.
+  #   stdout_and_stderr.close
+  #
+  # See Process.spawn for the optional hash arguments _env_ and _opts_.
   #
-  #   Open3.popen3(cmd) { |stdin, stdout, stderr| ... }
+  # Example:
+  #   # check gcc warnings
+  #   source = "foo.c"
+  #   Open3.popen2e("gcc", "-Wall", source) {|i,oe,t|
+  #     oe.each {|line|
+  #       if /warning/ =~ line
+  #         ...
+  #       end
+  #     }
+  #   }
   #
-  # The parameter +cmd+ is passed directly to Kernel#exec.
+  def popen2e(*cmd, &block)
+    if Hash === cmd.last
+      opts = cmd.pop.dup
+    else
+      opts = {}
+    end
+
+    in_r, in_w = IO.pipe
+    opts[:in] = in_r
+    in_w.sync = true
+
+    out_r, out_w = IO.pipe
+    opts[[:out, :err]] = out_w
+
+    popen_run(cmd, opts, [in_r, out_w], [in_w, out_r], &block)
+  end
+  module_function :popen2e
+
+  def popen_run(cmd, opts, child_io, parent_io) # :nodoc:
+    pid = spawn(*cmd, opts)
+    wait_thr = Process.detach(pid)
+    child_io.each {|io| io.close }
+    result = [*parent_io, wait_thr]
+    if defined? yield
+      begin
+	return yield(*result)
+      ensure
+	parent_io.each{|io| io.close unless io.closed?}
+        wait_thr.join
+      end
+    end
+    result
+  end
+  module_function :popen_run
+  class << self
+    private :popen_run
+  end
+
+  # Open3.capture3 captures the standard output and the standard error of a command.
+  #
+  #   stdout_str, stderr_str, status = Open3.capture3([env,] cmd... [, opts])
+  #
+  # The arguments env, cmd and opts are passed to Open3.popen3 except
+  # opts[:stdin_data] and opts[:stdin_data].  See Process.spawn.
+  #
+  # If opts[:stdin_data] is specified, it is sent to the command's standard input.
+  #
+  # If opts[:binmode] is true, internal pipes are set to binary mode.
   #
-  def popen3(*cmd)
-    pw = IO::pipe   # pipe[0] for read, pipe[1] for write
-    pr = IO::pipe
-    pe = IO::pipe
+  # Example:
+  #
+  #   # dot is a command of graphviz.
+  #   graph = <<'End'
+  #     digraph g {
+  #       a -> b
+  #     }
+  #   End
+  #   layouted_graph, dot_log = Open3.capture3("dot -v", :stdin_data=>graph)
+  #
+  #   o, e, s = Open3.capture3("echo a; sort >&2", :stdin_data=>"foo\nbar\nbaz\n")
+  #   p o #=> "a\n"
+  #   p e #=> "bar\nbaz\nfoo\n"
+  #   p s #=> #<Process::Status: pid 32682 exit 0>
+  #
+  #   # generate a thumnail image using the convert command of ImageMagick.
+  #   # However, if the image stored really in a file,
+  #   # system("convert", "-thumbnail", "80", "png:#{filename}", "png:-") is better
+  #   # because memory consumption.
+  #   # But if the image is stored in a DB or generated by gnuplot Open3.capture2 example,
+  #   # Open3.capture3 is considerable.
+  #   #
+  #   image = File.read("/usr/share/openclipart/png/animals/mammals/sheep-md-v0.1.png", :binmode=>true)
+  #   thumnail, err, s = Open3.capture3("convert -thumbnail 80 png:- png:-", :stdin_data=>image, :binmode=>true)
+  #   if s.success?
+  #     STDOUT.binmode; print thumnail
+  #   end
+  #
+  def capture3(*cmd, &block)
+    if Hash === cmd.last
+      opts = cmd.pop.dup
+    else
+      opts = {}
+    end
 
-    pid = fork{
-      # child
-      fork{
-	# grandchild
-	pw[1].close
-	STDIN.reopen(pw[0])
-	pw[0].close
+    stdin_data = opts.delete(:stdin_data) || ''
+    binmode = opts.delete(:binmode)
 
-	pr[0].close
-	STDOUT.reopen(pr[1])
-	pr[1].close
+    popen3(*cmd, opts) {|i, o, e, t|
+      if binmode
+        i.binmode
+        o.binmode
+        e.binmode
+      end
+      out_reader = Thread.new { o.read }
+      err_reader = Thread.new { e.read }
+      i.write stdin_data
+      i.close
+      [out_reader.value, err_reader.value, t.value]
+    }
+  end
+  module_function :capture3
+
+  # Open3.capture2 captures the standard output of a command.
+  #
+  #   stdout_str, status = Open3.capture2([env,] cmd... [, opts])
+  #
+  # The arguments env, cmd and opts are passed to Open3.popen3 except
+  # opts[:stdin_data] and opts[:stdin_data].  See Process.spawn.
+  #
+  # If opts[:stdin_data] is specified, it is sent to the command's standard input.
+  #
+  # If opts[:binmode] is true, internal pipes are set to binary mode.
+  #
+  # Example:
+  #
+  #   # factor is a command for integer factorization.
+  #   o, s = Open3.capture2("factor", :stdin_data=>"42")
+  #   p o #=> "42: 2 3 7\n"
+  #
+  #   # generate x**2 graph in png using gnuplot.
+  #   gnuplot_commands = <<"End"
+  #     set terminal png
+  #     plot x**2, "-" with lines
+  #     1 14
+  #     2 1
+  #     3 8
+  #     4 5
+  #     e
+  #   End
+  #   image, s = Open3.capture2("gnuplot", :stdin_data=>gnuplot_commands, :binmode=>true)
+  #
+  def capture2(*cmd, &block)
+    if Hash === cmd.last
+      opts = cmd.pop.dup
+    else
+      opts = {}
+    end
 
-	pe[0].close
-	STDERR.reopen(pe[1])
-	pe[1].close
+    stdin_data = opts.delete(:stdin_data) || ''
+    binmode = opts.delete(:binmode)
 
-	exec(*cmd)
-      }
-      exit!(0)
+    popen2(*cmd, opts) {|i, o, t|
+      if binmode
+        i.binmode
+        o.binmode
+      end
+      out_reader = Thread.new { o.read }
+      i.write stdin_data
+      i.close
+      [out_reader.value, t.value]
     }
+  end
+  module_function :capture2
 
-    pw[0].close
-    pr[1].close
-    pe[1].close
-    Process.waitpid(pid)
-    pi = [pw[1], pr[0], pe[0]]
-    pw[1].sync = true
+  # Open3.capture2e captures the standard output and the standard error of a command.
+  #
+  #   stdout_and_stderr_str, status = Open3.capture2e([env,] cmd... [, opts])
+  #
+  # The arguments env, cmd and opts are passed to Open3.popen3 except
+  # opts[:stdin_data] and opts[:stdin_data].  See Process.spawn.
+  #
+  # If opts[:stdin_data] is specified, it is sent to the command's standard input.
+  #
+  # If opts[:binmode] is true, internal pipes are set to binary mode.
+  #
+  # Example:
+  #
+  #   # capture make log
+  #   make_log, s = Open3.capture2e("make")
+  #
+  def capture2e(*cmd, &block)
+    if Hash === cmd.last
+      opts = cmd.pop.dup
+    else
+      opts = {}
+    end
+
+    stdin_data = opts.delete(:stdin_data) || ''
+    binmode = opts.delete(:binmode)
+
+    popen2e(*cmd, opts) {|i, oe, t|
+      if binmode
+        i.binmode
+        oe.binmode
+      end
+      outerr_reader = Thread.new { oe.read }
+      i.write stdin_data
+      i.close
+      [outerr_reader.value, t.value]
+    }
+  end
+  module_function :capture2e
+
+  # Open3.pipeline_rw starts a list of commands as a pipeline with pipes
+  # which connects stdin of the first command and stdout of the last command.
+  #
+  #   Open3.pipeline_rw(cmd1, cmd2, ... [, opts]) {|first_stdin, last_stdout, wait_threads|
+  #     ...
+  #   }
+  #
+  #   first_stdin, last_stdout, wait_threads = Open3.pipeline_rw(cmd1, cmd2, ... [, opts])
+  #   ...
+  #   first_stdin.close
+  #   last_stdout.close
+  #
+  # Each cmd is a string or an array.
+  # If it is an array, the elements are passed to Process.spawn.
+  #
+  #   cmd:
+  #     commandline                              command line string which is passed to a shell
+  #     [env, commandline, opts]                 command line string which is passed to a shell
+  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
+  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  #
+  #   Note that env and opts are optional, as Process.spawn.
+  #
+  # The option to pass Process.spawn is constructed by merging
+  # +opts+, the last hash element of the array and
+  # specification for the pipe between each commands.
+  #
+  # Example:
+  #
+  #   Open3.pipeline_rw("tr -dc A-Za-z", "wc -c") {|i,o,ts|
+  #     i.puts "All persons more than a mile high to leave the court."
+  #     i.close
+  #     p o.gets #=> "42\n"
+  #   }
+  #
+  #   Open3.pipeline_rw("sort", "cat -n") {|stdin, stdout, wait_thrs|
+  #     stdin.puts "foo"
+  #     stdin.puts "bar"
+  #     stdin.puts "baz"
+  #     stdin.close     # send EOF to sort.
+  #     p stdout.read   #=> "     1\tbar\n     2\tbaz\n     3\tfoo\n"
+  #   }
+  def pipeline_rw(*cmds, &block)
+    if Hash === cmds.last
+      opts = cmds.pop.dup
+    else
+      opts = {}
+    end
+
+    in_r, in_w = IO.pipe
+    opts[:in] = in_r
+    in_w.sync = true
+
+    out_r, out_w = IO.pipe
+    opts[:out] = out_w
+
+    pipeline_run(cmds, opts, [in_r, out_w], [in_w, out_r], &block)
+  end
+  module_function :pipeline_rw
+
+  # Open3.pipeline_r starts a list of commands as a pipeline with a pipe
+  # which connects stdout of the last command.
+  #
+  #   Open3.pipeline_r(cmd1, cmd2, ... [, opts]) {|last_stdout, wait_threads|
+  #     ...
+  #   }
+  #
+  #   last_stdout, wait_threads = Open3.pipeline_r(cmd1, cmd2, ... [, opts])
+  #   ...
+  #   last_stdout.close
+  #
+  # Each cmd is a string or an array.
+  # If it is an array, the elements are passed to Process.spawn.
+  #
+  #   cmd:
+  #     commandline                              command line string which is passed to a shell
+  #     [env, commandline, opts]                 command line string which is passed to a shell
+  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
+  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  #
+  #   Note that env and opts are optional, as Process.spawn.
+  #
+  # Example:
+  #
+  #   Open3.pipeline_r("zcat /var/log/apache2/access.log.*.gz",
+  #                    [{"LANG"=>"C"}, "grep", "GET /favicon.ico"],
+  #                    "logresolve") {|o, ts|
+  #     o.each_line {|line|
+  #       ...
+  #     }
+  #   }
+  #
+  #   Open3.pipeline_r("yes", "head -10") {|o, ts|
+  #     p o.read      #=> "y\ny\ny\ny\ny\ny\ny\ny\ny\ny\n"
+  #     p ts[0].value #=> #<Process::Status: pid 24910 SIGPIPE (signal 13)>
+  #     p ts[1].value #=> #<Process::Status: pid 24913 exit 0>
+  #   }
+  #
+  def pipeline_r(*cmds, &block)
+    if Hash === cmds.last
+      opts = cmds.pop.dup
+    else
+      opts = {}
+    end
+
+    out_r, out_w = IO.pipe
+    opts[:out] = out_w
+
+    pipeline_run(cmds, opts, [out_w], [out_r], &block)
+  end
+  module_function :pipeline_r
+
+  # Open3.pipeline_w starts a list of commands as a pipeline with a pipe
+  # which connects stdin of the first command.
+  #
+  #   Open3.pipeline_w(cmd1, cmd2, ... [, opts]) {|first_stdin, wait_threads|
+  #     ...
+  #   }
+  #
+  #   first_stdin, wait_threads = Open3.pipeline_w(cmd1, cmd2, ... [, opts])
+  #   ...
+  #   first_stdin.close
+  #
+  # Each cmd is a string or an array.
+  # If it is an array, the elements are passed to Process.spawn.
+  #
+  #   cmd:
+  #     commandline                              command line string which is passed to a shell
+  #     [env, commandline, opts]                 command line string which is passed to a shell
+  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
+  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  #
+  #   Note that env and opts are optional, as Process.spawn.
+  #
+  # Example:
+  #
+  #   Open3.pipeline_w("bzip2 -c", :out=>"/tmp/hello.bz2") {|i, ts|
+  #     i.puts "hello"
+  #   }
+  #
+  def pipeline_w(*cmds, &block)
+    if Hash === cmds.last
+      opts = cmds.pop.dup
+    else
+      opts = {}
+    end
+
+    in_r, in_w = IO.pipe
+    opts[:in] = in_r
+    in_w.sync = true
+
+    pipeline_run(cmds, opts, [in_r], [in_w], &block)
+  end
+  module_function :pipeline_w
+
+  # Open3.pipeline_start starts a list of commands as a pipeline.
+  # No pipe made for stdin of the first command and
+  # stdout of the last command.
+  #
+  #   Open3.pipeline_start(cmd1, cmd2, ... [, opts]) {|wait_threads|
+  #     ...
+  #   }
+  #
+  #   wait_threads = Open3.pipeline_start(cmd1, cmd2, ... [, opts])
+  #   ...
+  #
+  # Each cmd is a string or an array.
+  # If it is an array, the elements are passed to Process.spawn.
+  #
+  #   cmd:
+  #     commandline                              command line string which is passed to a shell
+  #     [env, commandline, opts]                 command line string which is passed to a shell
+  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
+  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  #
+  #   Note that env and opts are optional, as Process.spawn.
+  #
+  # Example:
+  #
+  #   # run xeyes in 10 seconds.
+  #   Open3.pipeline_start("xeyes") {|ts|
+  #     sleep 10
+  #     t = ts[0]
+  #     Process.kill("TERM", t.pid)
+  #     p t.value #=> #<Process::Status: pid 911 SIGTERM (signal 15)>
+  #   }
+  #
+  #   # convert pdf to ps and send it to a printer.
+  #   # collect error message of pdftops and lpr.
+  #   pdf_file = "paper.pdf"
+  #   printer = "printer-name"
+  #   err_r, err_w = IO.pipe
+  #   Open3.pipeline_start(["pdftops", pdf_file, "-"],
+  #                        ["lpr", "-P#{printer}"],
+  #                        :err=>err_w) {|ts|
+  #     err_w.close
+  #     p err_r.read # error messages of pdftops and lpr.
+  #   }
+  #
+  def pipeline_start(*cmds, &block)
+    if Hash === cmds.last
+      opts = cmds.pop.dup
+    else
+      opts = {}
+    end
+
+    if block
+      pipeline_run(cmds, opts, [], [], &block)
+    else
+      ts, = pipeline_run(cmds, opts, [], [])
+      ts
+    end
+  end
+  module_function :pipeline_start
+
+  # Open3.pipeline starts a list of commands as a pipeline.
+  # It waits the finish of the commands.
+  # No pipe made for stdin of the first command and
+  # stdout of the last command.
+  #
+  #   status_list = Open3.pipeline(cmd1, cmd2, ... [, opts])
+  #
+  # Each cmd is a string or an array.
+  # If it is an array, the elements are passed to Process.spawn.
+  #
+  #   cmd:
+  #     commandline                              command line string which is passed to a shell
+  #     [env, commandline, opts]                 command line string which is passed to a shell
+  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
+  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  #
+  #   Note that env and opts are optional, as Process.spawn.
+  #
+  # Example:
+  #
+  #   fname = "/usr/share/man/man1/ruby.1.gz"
+  #   p Open3.pipeline(["zcat", fname], "nroff -man", "less")
+  #   #=> [#<Process::Status: pid 11817 exit 0>,
+  #   #    #<Process::Status: pid 11820 exit 0>,
+  #   #    #<Process::Status: pid 11828 exit 0>]
+  #
+  #   fname = "/usr/share/man/man1/ls.1.gz"
+  #   Open3.pipeline(["zcat", fname], "nroff -man", "colcrt")
+  #
+  #   # convert PDF to PS and send to a printer by lpr
+  #   pdf_file = "paper.pdf"
+  #   printer = "printer-name"
+  #   Open3.pipeline(["pdftops", pdf_file, "-"],
+  #                  ["lpr", "-P#{printer}"])
+  #
+  #   # count lines
+  #   Open3.pipeline("sort", "uniq -c", :in=>"names.txt", :out=>"count")
+  #
+  #   # cyclic pipeline
+  #   r,w = IO.pipe
+  #   w.print "ibase=14\n10\n"
+  #   Open3.pipeline("bc", "tee /dev/tty", :in=>r, :out=>w)
+  #   #=> 14
+  #   #   18
+  #   #   22
+  #   #   30
+  #   #   42
+  #   #   58
+  #   #   78
+  #   #   106
+  #   #   202
+  #
+  def pipeline(*cmds)
+    if Hash === cmds.last
+      opts = cmds.pop.dup
+    else
+      opts = {}
+    end
+
+    pipeline_run(cmds, opts, [], []) {|ts|
+      ts.map {|t| t.value }
+    }
+  end
+  module_function :pipeline
+
+  def pipeline_run(cmds, pipeline_opts, child_io, parent_io, &block) # :nodoc:
+    if cmds.empty?
+      raise ArgumentError, "no commands"
+    end
+
+    opts_base = pipeline_opts.dup
+    opts_base.delete :in
+    opts_base.delete :out
+
+    wait_thrs = []
+    r = nil
+    cmds.each_with_index {|cmd, i|
+      cmd_opts = opts_base.dup
+      if String === cmd
+        cmd = [cmd]
+      else
+        cmd_opts.update cmd.pop if Hash === cmd.last
+      end
+      if i == 0
+        if !cmd_opts.include?(:in)
+          if pipeline_opts.include?(:in)
+            cmd_opts[:in] = pipeline_opts[:in]
+          end
+        end
+      else
+        cmd_opts[:in] = r
+      end
+      if i != cmds.length - 1
+        r2, w2 = IO.pipe
+        cmd_opts[:out] = w2
+      else
+        if !cmd_opts.include?(:out)
+          if pipeline_opts.include?(:out)
+            cmd_opts[:out] = pipeline_opts[:out]
+          end
+        end
+      end
+      pid = spawn(*cmd, cmd_opts)
+      wait_thrs << Process.detach(pid)
+      r.close if r
+      w2.close if w2
+      r = r2
+    }
+    result = parent_io + [wait_thrs]
+    child_io.each {|io| io.close }
     if defined? yield
       begin
-	return yield(*pi)
+	return yield(*result)
       ensure
-	pi.each{|p| p.close unless p.closed?}
+	parent_io.each{|io| io.close unless io.closed?}
+        wait_thrs.each {|t| t.join }
       end
     end
-    pi
+    result
   end
-  module_function :popen3
+  module_function :pipeline_run
+  class << self
+    private :pipeline_run
+  end
+
 end
 
 if $0 == __FILE__
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 417997d9bb..1751aa0a5f 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1,15 +1,15 @@
 #
 # optparse.rb - command-line option analysis with the OptionParser class.
-# 
+#
 # Author:: Nobu Nakada
 # Documentation:: Nobu Nakada and Gavin Sinclair.
 #
-# See OptionParser for documentation. 
+# See OptionParser for documentation.
 #
 
 
-# == Developer Documentation (not for RDoc output) 
-# 
+# == Developer Documentation (not for RDoc output)
+#
 # === Class tree
 #
 # - OptionParser:: front end
@@ -51,7 +51,7 @@
 # solution.
 #
 # === Features
-# 
+#
 # 1. The argument specification and the code to handle it are written in the
 #    same place.
 # 2. It can output an option summary; you don't need to maintain this string
@@ -88,12 +88,12 @@
 #   require 'optparse/time'
 #   require 'ostruct'
 #   require 'pp'
-#   
+#
 #   class OptparseExample
-#   
+#
 #     CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
 #     CODE_ALIASES = { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
-#   
+#
 #     #
 #     # Return a structure describing the options.
 #     #
@@ -106,19 +106,19 @@
 #       options.encoding = "utf8"
 #       options.transfer_type = :auto
 #       options.verbose = false
-#       
+#
 #       opts = OptionParser.new do |opts|
 #         opts.banner = "Usage: example.rb [options]"
-#       
+#
 #         opts.separator ""
 #         opts.separator "Specific options:"
-#       
+#
 #         # Mandatory argument.
 #         opts.on("-r", "--require LIBRARY",
 #                 "Require the LIBRARY before executing your script") do |lib|
 #           options.library << lib
 #         end
-#       
+#
 #         # Optional argument; multi-line description.
 #         opts.on("-i", "--inplace [EXTENSION]",
 #                 "Edit ARGV files in place",
@@ -127,28 +127,28 @@
 #           options.extension = ext || ''
 #           options.extension.sub!(/\A\.?(?=.)/, ".")  # Ensure extension begins with dot.
 #         end
-#       
+#
 #         # Cast 'delay' argument to a Float.
 #         opts.on("--delay N", Float, "Delay N seconds before executing") do |n|
 #           options.delay = n
 #         end
-#       
+#
 #         # Cast 'time' argument to a Time object.
 #         opts.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
 #           options.time = time
 #         end
-#       
+#
 #         # Cast to octal integer.
 #         opts.on("-F", "--irs [OCTAL]", OptionParser::OctalInteger,
 #                 "Specify record separator (default \\0)") do |rs|
 #           options.record_separator = rs
 #         end
-#       
+#
 #         # List of arguments.
 #         opts.on("--list x,y,z", Array, "Example 'list' of arguments") do |list|
 #           options.list = list
 #         end
-#       
+#
 #         # Keyword completion.  We are specifying a specific set of arguments (CODES
 #         # and CODE_ALIASES - notice the latter is a Hash), and the user may provide
 #         # the shortest unambiguous text.
@@ -157,41 +157,41 @@
 #                 "  (#{code_list})") do |encoding|
 #           options.encoding = encoding
 #         end
-#       
+#
 #         # Optional argument with keyword completion.
 #         opts.on("--type [TYPE]", [:text, :binary, :auto],
 #                 "Select transfer type (text, binary, auto)") do |t|
 #           options.transfer_type = t
 #         end
-#       
+#
 #         # Boolean switch.
 #         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
 #           options.verbose = v
 #         end
-#       
+#
 #         opts.separator ""
 #         opts.separator "Common options:"
-#       
+#
 #         # No argument, shows at tail.  This will print an options summary.
 #         # Try it and see!
 #         opts.on_tail("-h", "--help", "Show this message") do
 #           puts opts
 #           exit
 #         end
-#       
+#
 #         # Another typical switch to print the version.
 #         opts.on_tail("--version", "Show version") do
 #           puts OptionParser::Version.join('.')
 #           exit
 #         end
 #       end
-#       
+#
 #       opts.parse!(args)
 #       options
 #     end  # parse()
-#   
+#
 #   end  # class OptparseExample
-#   
+#
 #   options = OptparseExample.parse(ARGV)
 #   pp options
 #
@@ -221,7 +221,7 @@ class OptionParser
     def complete(key, icase = false, pat = nil)
       pat ||= Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'),
                          icase)
-      canon, sw, k, v, cn = nil
+      canon, sw, cn = nil
       candidates = []
       each do |k, *v|
         (if Regexp === k
@@ -276,7 +276,7 @@ class OptionParser
   # Individual switch class.  Not important to the user.
   #
   # Defined within Switch are several Switch-derived classes: NoArgument,
-  # RequiredArgument, etc. 
+  # RequiredArgument, etc.
   #
   class Switch
     attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
@@ -301,7 +301,8 @@ class OptionParser
     end
 
     def self.incompatible_argument_styles(arg, t)
-      raise ArgumentError, "#{arg}: incompatible argument styles\n  #{self}, #{t}"
+      raise(ArgumentError, "#{arg}: incompatible argument styles\n  #{self}, #{t}",
+            ParseError.filter_backtrace(caller(2)))
     end
 
     def self.pattern
@@ -321,10 +322,10 @@ class OptionParser
     # argument pattern. Yields when the pattern doesn't match substring.
     #
     def parse_arg(arg)
-      pattern or return nil, arg
+      pattern or return nil, [arg]
       unless m = pattern.match(arg)
         yield(InvalidArgument, arg)
-        return arg, nil
+        return arg, []
       end
       if String === m
         m = [s = m]
@@ -345,11 +346,11 @@ class OptionParser
     # conversion. Yields at semi-error condition instead of raising an
     # exception.
     #
-    def conv_arg(arg, val = nil)
+    def conv_arg(arg, val = [])
       if conv
         val = conv.call(*val)
       else
-        val = proc {|val| val}.call(*val)
+        val = proc {|v| v}.call(*val)
       end
       return arg, block, val
     end
@@ -368,7 +369,7 @@ class OptionParser
     # +indent+:: Prefix string indents all summarized lines.
     #
     def summarize(sdone = [], ldone = [], width = 1, max = width - 1, indent = "")
-      sopts, lopts, s = [], [], nil
+      sopts, lopts = [], [], nil
       @short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
       @long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
       return if sopts.empty? and lopts.empty? # completely hidden
@@ -383,10 +384,16 @@ class OptionParser
         left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
       end
 
-      left[0] << arg if arg
-      mlen = left.collect {|s| s.length}.max.to_i
+      if arg
+        left[0] << (left[1] ? arg.sub(/\A(\[?)=/, '\1') + ',' : arg)
+      end
+      mlen = left.collect {|ss| ss.length}.max.to_i
       while mlen > width and l = left.shift
-        mlen = left.collect {|s| s.length}.max.to_i if l.length == mlen
+        mlen = left.collect {|ss| ss.length}.max.to_i if l.length == mlen
+        if l.length < width and (r = right[0]) and !r.empty?
+          l = l.to_s.ljust(width) + ' ' + r
+          right.shift
+        end
         yield(indent + l)
       end
 
@@ -406,7 +413,7 @@ class OptionParser
       to
     end
 
-    def match_nonswitch?(str) # :nodoc:
+    def match_nonswitch?(str)  # :nodoc:
       @pattern =~ str unless @short or @long
     end
 
@@ -451,7 +458,7 @@ class OptionParser
           raise MissingArgument if argv.empty?
           arg = argv.shift
         end
-        conv_arg(*parse_arg(arg) {|*exc| raise(*exc)})
+        conv_arg(*parse_arg(arg, &method(:raise)))
       end
     end
 
@@ -504,13 +511,13 @@ class OptionParser
   class List
     # Map from acceptable argument types to pattern and converter pairs.
     attr_reader :atype
-    
+
     # Map from short style option switches to actual switch objects.
     attr_reader :short
-    
+
     # Map from long style option switches to actual switch objects.
     attr_reader :long
-    
+
     # List of all switches and summary string.
     attr_reader :list
 
@@ -527,9 +534,10 @@ class OptionParser
     #
     # See OptionParser.accept.
     #
-    def accept(t, pat = /.*/nm, &block)
+    def accept(t, pat = /.*/m, &block)
       if pat
-        pat.respond_to?(:match) or raise TypeError, "has no `match'"
+        pat.respond_to?(:match) or
+          raise TypeError, "has no `match'", ParseError.filter_backtrace(caller(2))
       else
         pat = t if t.respond_to?(:match)
       end
@@ -555,7 +563,6 @@ class OptionParser
     # +nlopts+:: Negated long style options list.
     #
     def update(sw, sopts, lopts, nsw = nil, nlopts = nil)
-      o = nil
       sopts.each {|o| @short[o] = sw} if sopts
       lopts.each {|o| @long[o] = sw} if lopts
       nlopts.each {|o| @long[o] = nsw} if nsw and nlopts
@@ -567,7 +574,7 @@ class OptionParser
     #
     # Inserts +switch+ at the head of the list, and associates short, long
     # and negated long options. Arguments are:
-    # 
+    #
     # +switch+::      OptionParser::Switch instance to be inserted.
     # +short_opts+::  List of short style options.
     # +long_opts+::   List of long style options.
@@ -583,7 +590,7 @@ class OptionParser
     #
     # Appends +switch+ at the tail of the list, and associates short, long
     # and negated long options. Arguments are:
-    # 
+    #
     # +switch+::      OptionParser::Switch instance to be inserted.
     # +short_opts+::  List of short style options.
     # +long_opts+::   List of long style options.
@@ -630,15 +637,21 @@ class OptionParser
     # method which is called on every option.
     #
     def summarize(*args, &block)
-      list.each do |opt|
+      sum = []
+      list.reverse_each do |opt|
         if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
-          opt.summarize(*args, &block)
+          s = []
+          opt.summarize(*args) {|l| s << l}
+          sum.concat(s.reverse)
         elsif !opt or opt.empty?
-          yield("")
+          sum << ""
+        elsif opt.respond_to?(:each_line)
+          sum.concat([*opt.each_line].reverse)
         else
-          opt.each(&block)
+          sum.concat([*opt.each].reverse)
         end
       end
+      sum.reverse_each(&block)
     end
 
     def add_banner(to)  # :nodoc:
@@ -661,9 +674,10 @@ class OptionParser
     # Completion for hash key.
     #
     def match(key)
-      return key, *fetch(key) {
+      *values = fetch(key) {
         raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
       }
+      return key, *values
     end
   end
 
@@ -742,7 +756,7 @@ class OptionParser
   # Initializes a new instance and evaluates the optional block in context
   # of the instance. Arguments +args+ are passed to #new, see there for
   # description of parameters.
-  # 
+  #
   # This method is *deprecated*, its behavior corresponds to the older #new
   # method.
   #
@@ -824,7 +838,7 @@ class OptionParser
   #
   # Directs to reject specified class argument.
   #
-  # +t+:: Argument class speficier, any object including Class.
+  # +t+:: Argument class specifier, any object including Class.
   #
   #   reject(t)
   #
@@ -960,7 +974,8 @@ class OptionParser
   # +indent+:: Indentation, defaults to @summary_indent.
   #
   def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
-    visit(:summarize, {}, {}, width, max, indent, &(blk || proc {|l| to << l + $/}))
+    blk ||= proc {|l| to << (l.index($/, -1) ? l : l + $/)}
+    visit(:summarize, {}, {}, width, max, indent, &blk)
     to
   end
 
@@ -985,17 +1000,14 @@ class OptionParser
   #
   def notwice(obj, prv, msg)
     unless !prv or prv == obj
-      begin
-        raise ArgumentError, "argument #{msg} given twice: #{obj}"
-      rescue
-        $@[0, 2] = nil
-        raise
-      end
+      raise(ArgumentError, "argument #{msg} given twice: #{obj}",
+            ParseError.filter_backtrace(caller(2)))
     end
     obj
   end
   private :notwice
 
+  SPLAT_PROC = proc {|*a| a.length <= 1 ? a.first : a}
   #
   # Creates an OptionParser::Switch from the parameters. The parsed argument
   # value is passed to the given block, where it can be processed.
@@ -1035,13 +1047,13 @@ class OptionParser
   #     "-x[OPTIONAL]"
   #     "-x"
   #   There is also a special form which matches character range (not full
-  #   set of regural expression):
+  #   set of regular expression):
   #     "-[a-z]MANDATORY"
-  #     "-[a-z][OPTIONAL]" 
+  #     "-[a-z][OPTIONAL]"
   #     "-[a-z]"
   #
   # [Argument style and description:]
-  #   Instead of specifying mandatory or optional orguments directly in the
+  #   Instead of specifying mandatory or optional arguments directly in the
   #   switch parameter, this separate parameter can be used.
   #     "=MANDATORY"
   #     "=[OPTIONAL]"
@@ -1049,7 +1061,7 @@ class OptionParser
   # [Description:]
   #   Description string for the option.
   #     "Run verbosely"
-  # 
+  #
   # [Handler:]
   #   Handler for the parsed argument value. Either give a block or pass a
   #   Proc or Method as an argument.
@@ -1060,7 +1072,6 @@ class OptionParser
     default_style = Switch::NoArgument
     default_pattern = nil
     klass = nil
-    o = nil
     n, q, a = nil
 
     opts.each do |o|
@@ -1075,9 +1086,13 @@ class OptionParser
       end
 
       # directly specified pattern(any object possible to match)
-      if !(String === o) and o.respond_to?(:match)
+      if (!(String === o || Symbol === o)) and o.respond_to?(:match)
         pattern = notwice(o, pattern, 'pattern')
-        conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
+        if pattern.respond_to?(:convert)
+          conv = pattern.method(:convert).to_proc
+        else
+          conv = SPLAT_PROC
+        end
         next
       end
 
@@ -1090,13 +1105,13 @@ class OptionParser
         when CompletingHash
         when nil
           pattern = CompletingHash.new
-          conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
+          conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
         else
           raise ArgumentError, "argument pattern given twice"
         end
-        o.each {|(o, *v)| pattern[o] = v.fetch(0) {o}}
+        o.each {|pat, *v| pattern[pat] = v.fetch(0) {pat}}
       when Module
-        raise ArgumentError, "unsupported argument type: #{o}"
+        raise ArgumentError, "unsupported argument type: #{o}", ParseError.filter_backtrace(caller(4))
       when *ArgumentStyle.keys
         style = notwice(ArgumentStyle[o], style, 'style')
       when /^--no-([^\[\]=\s]*)(.+)?/
@@ -1161,7 +1176,9 @@ class OptionParser
       s = (style || default_style).new(pattern || default_pattern,
                                        conv, sdesc, ldesc, arg, desc, block)
     elsif !block
-      raise ArgumentError, "no switch given" if style or pattern
+      if style or pattern
+        raise ArgumentError, "no switch given", ParseError.filter_backtrace(caller)
+      end
       s = desc
     else
       short << pattern
@@ -1242,13 +1259,13 @@ class OptionParser
   end
 
   def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
-    opt, arg, sw, val, rest = nil
-    nonopt ||= proc {|arg| throw :terminate, arg}
+    opt, arg, val, rest = nil
+    nonopt ||= proc {|a| throw :terminate, a}
     argv.unshift(arg) if arg = catch(:terminate) {
       while arg = argv.shift
         case arg
         # long option
-        when /\A--([^=]*)(?:=(.*))?/nm
+        when /\A--([^=]*)(?:=(.*))?/m
           opt, rest = $1, $2
           begin
             sw, = complete(:long, opt, true)
@@ -1264,7 +1281,7 @@ class OptionParser
           end
 
         # short option
-        when /\A-(.)((=).*|.+)?/nm
+        when /\A-(.)((=).*|.+)?/m
           opt, has_arg, eq, val, rest = $1, $3, $3, $2, $2
           begin
             sw, = search(:short, opt)
@@ -1287,7 +1304,7 @@ class OptionParser
           begin
             opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
             raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
-            argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
+            argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
             val = cb.call(val) if cb
             setter.call(sw.switch_name, val) if setter
           rescue ParseError
@@ -1297,7 +1314,8 @@ class OptionParser
         # non-option argument
         else
           catch(:prune) do
-            visit(:each_option) do |sw|
+            visit(:each_option) do |sw0|
+              sw = sw0
               sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
             end
             nonopt.call(arg)
@@ -1328,8 +1346,7 @@ class OptionParser
   #
   def permute!(argv = default_argv)
     nonopts = []
-    arg = nil
-    order!(argv) {|arg| nonopts << arg}
+    order!(argv, &nonopts.method(:<<))
     argv[0, 0] = nonopts
     argv
   end
@@ -1406,7 +1423,6 @@ class OptionParser
   # +block+.
   #
   def visit(id, *args, &block)
-    el = nil
     @stack.reverse_each do |el|
       el.send(id, *args, &block)
     end
@@ -1439,7 +1455,7 @@ class OptionParser
       search(typ, opt) {|sw| return [sw, opt]} # exact match or...
     end
     raise AmbiguousOption, catch(:ambiguous) {
-      visit(:complete, typ, opt, icase, *pat) {|opt, *sw| return sw}
+      visit(:complete, typ, opt, icase, *pat) {|o, *sw| return sw}
       raise InvalidOption, opt
     }
   end
@@ -1474,6 +1490,7 @@ class OptionParser
   #
   def environment(env = File.basename($0, '.*'))
     env = ENV[env] || ENV[env.upcase] or return
+    require 'shellwords'
     parse(*Shellwords.shellwords(env))
   end
 
@@ -1491,7 +1508,7 @@ class OptionParser
   #
   # Any non-empty string, and no conversion.
   #
-  accept(String, /.+/nm) {|s,*|s}
+  accept(String, /.+/m) {|s,*|s}
 
   #
   # Ruby/C-like integer, octal for 0-7 sequence, binary for 0b, hexadecimal
@@ -1514,9 +1531,16 @@ class OptionParser
 
   #
   # Generic numeric format, converts to Integer for integer format, Float
-  # for float format.
-  #
-  accept(Numeric, %r"\A[-+]?(?:#{octal}|#{float})"io) {|s,| eval(s) if s}
+  # for float format, and Rational for rational format.
+  #
+  real = "[-+]?(?:#{octal}|#{float})"
+  accept(Numeric, /\A(#{real})(?:\/(#{real}))?/io) {|s, d, n|
+    if n
+      Rational(d, n)
+    elsif s
+      eval(s)
+    end
+  }
 
   #
   # Decimal integer format, to be converted to Integer.
@@ -1546,7 +1570,7 @@ class OptionParser
   yesno = CompletingHash.new
   %w[- no false].each {|el| yesno[el] = false}
   %w[+ yes true].each {|el| yesno[el] = true}
-  yesno['nil'] = false          # shoud be nil?
+  yesno['nil'] = false          # should be nil?
   accept(TrueClass, yesno) {|arg, val| val == nil or val}
   #
   # Similar to TrueClass, but defaults to false.
@@ -1558,7 +1582,7 @@ class OptionParser
   #
   accept(Array) do |s,|
     if s
-      s = s.split(',').collect {|s| s unless s.empty?}
+      s = s.split(',').collect {|ss| ss unless ss.empty?}
     end
     s
   end
@@ -1572,7 +1596,8 @@ class OptionParser
       f |= Regexp::IGNORECASE if /i/ =~ o
       f |= Regexp::MULTILINE if /m/ =~ o
       f |= Regexp::EXTENDED if /x/ =~ o
-      k = o.delete("^imx")
+      k = o.delete("imx")
+      k = nil if k.empty?
     end
     Regexp.new(s || all, f, k)
   end
@@ -1604,6 +1629,17 @@ class OptionParser
       argv
     end
 
+    def self.filter_backtrace(array)
+      unless $DEBUG
+        array.delete_if(&%r"\A#{Regexp.quote(__FILE__)}:"o.method(:=~))
+      end
+      array
+    end
+
+    def set_backtrace(array)
+      super(self.class.filter_backtrace(array))
+    end
+
     def set_option(opt, eq)
       if eq
         @args[0] = opt
diff --git a/lib/optparse/version.rb b/lib/optparse/version.rb
index 558d9d710b..76ed564287 100644
--- a/lib/optparse/version.rb
+++ b/lib/optparse/version.rb
@@ -1,7 +1,7 @@
 # OptionParser internal utility
 
 class << OptionParser
-  def show_version(*pkg)
+  def show_version(*pkgs)
     progname = ARGV.options.program_name
     result = false
     show = proc do |klass, cname, version|
@@ -19,14 +19,14 @@ class << OptionParser
       puts str
       result = true
     end
-    if pkg.size == 1 and pkg[0] == "all"
+    if pkgs.size == 1 and pkgs[0] == "all"
       self.search_const(::Object, /\AV(?:ERSION|ersion)\z/) do |klass, cname, version|
         unless cname[1] == ?e and klass.const_defined?(:Version)
           show.call(klass, cname.intern, version)
         end
       end
     else
-      pkg.each do |pkg|
+      pkgs.each do |pkg|
         begin
           pkg = pkg.split(/::|\//).inject(::Object) {|m, c| m.const_get(c)}
           v = case
@@ -46,8 +46,8 @@ class << OptionParser
     result
   end
 
-  def each_const(path, klass = ::Object)
-    path.split(/::|\//).inject(klass) do |klass, name|
+  def each_const(path, base = ::Object)
+    path.split(/::|\//).inject(base) do |klass, name|
       raise NameError, path unless Module === klass
       klass.constants.grep(/#{name}/i) do |c|
         klass.const_defined?(c) or next
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index 6af5bbdac0..aea0c8e124 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -12,13 +12,13 @@
 # OpenStruct allows you to create data objects and set arbitrary attributes.
 # For example:
 #
-#   require 'ostruct' 
+#   require 'ostruct'
 #
 #   record = OpenStruct.new
 #   record.name    = "John Smith"
 #   record.age     = 70
 #   record.pension = 300
-#   
+#
 #   puts record.name     # -> "John Smith"
 #   puts record.address  # -> nil
 #
@@ -41,7 +41,7 @@ class OpenStruct
   #
   #   p data        # -> <OpenStruct country="Australia" population=20000000>
   #
-  # By default, the resulting OpenStruct object will have no attributes. 
+  # By default, the resulting OpenStruct object will have no attributes.
   #
   def initialize(hash=nil)
     @table = {}
@@ -53,7 +53,7 @@ class OpenStruct
     end
   end
 
-  # Duplicate an OpenStruct object members. 
+  # Duplicate an OpenStruct object members.
   def initialize_copy(orig)
     super
     @table = @table.dup
@@ -67,28 +67,35 @@ class OpenStruct
     @table.each_key{|key| new_ostruct_member(key)}
   end
 
+  def modifiable
+    begin
+      @modifiable = true
+    rescue
+      raise TypeError, "can't modify frozen #{self.class}", caller(3)
+    end
+    @table
+  end
+  protected :modifiable
+
   def new_ostruct_member(name)
     name = name.to_sym
     unless self.respond_to?(name)
-      meta = class << self; self; end
-      meta.send(:define_method, name) { @table[name] }
-      meta.send(:define_method, :"#{name}=") { |x| @table[name] = x }
+      class << self; self; end.class_eval do
+        define_method(name) { @table[name] }
+        define_method("#{name}=") { |x| modifiable[name] = x }
+      end
     end
+    name
   end
 
   def method_missing(mid, *args) # :nodoc:
     mname = mid.id2name
     len = args.length
-    if mname =~ /=$/
+    if mname.chomp!('=')
       if len != 1
         raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
       end
-      if self.frozen?
-        raise TypeError, "can't modify frozen #{self.class}", caller(1)
-      end
-      mname.chop!
-      self.new_ostruct_member(mname)
-      @table[mname.intern] = args[0]
+      modifiable[new_ostruct_member(mname)] = args[0]
     elsif len == 0
       @table[mid]
     else
@@ -111,25 +118,23 @@ class OpenStruct
   def inspect
     str = "#<#{self.class}"
 
-    Thread.current[InspectKey] ||= []
-    if Thread.current[InspectKey].include?(self) then
-      str << " ..."
-    else
+    ids = (Thread.current[InspectKey] ||= [])
+    if ids.include?(object_id)
+      return str << ' ...>'
+    end
+
+    ids << object_id
+    begin
       first = true
       for k,v in @table
         str << "," unless first
         first = false
-
-        Thread.current[InspectKey] << v
-        begin
-          str << " #{k}=#{v.inspect}"
-        ensure
-          Thread.current[InspectKey].pop
-        end
+        str << " #{k}=#{v.inspect}"
       end
+      return str << '>'
+    ensure
+      ids.pop
     end
-
-    str << ">"
   end
   alias :to_s :inspect
 
diff --git a/lib/parsearg.rb b/lib/parsearg.rb
deleted file mode 100644
index cab2dba789..0000000000
--- a/lib/parsearg.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-#		parsearg.rb - parse arguments
-#			$Release Version: $
-#			$Revision$
-#			$Date$
-#			by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
-#
-# --
-#
-#	
-#
-
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: parsearg is deprecated after Ruby 1.8.1; use optparse instead"
-
-$RCS_ID=%q$Header$
-
-require "getopts"
-
-def printUsageAndExit()
-  if $USAGE
-    eval($USAGE)
-  end
-  exit()
-end
-
-def setParenthesis(ex, opt, c)
-  if opt != ""
-    ex = sprintf("%s$OPT_%s%s", ex, opt, c)
-  else
-    ex = sprintf("%s%s", ex, c)
-  end
-  return ex
-end
-
-def setOrAnd(ex, opt, c)
-  if opt != ""
-    ex = sprintf("%s$OPT_%s %s%s ", ex, opt, c, c)
-  else
-    ex = sprintf("%s %s%s ", ex, c, c)
-  end
-  return ex
-end
-
-def setExpression(ex, opt, op)
-  if !op
-    ex = sprintf("%s$OPT_%s", ex, opt)
-    return ex
-  end
-  case op.chr
-  when "(", ")"
-    ex = setParenthesis(ex, opt, op.chr)
-  when "|", "&"
-    ex = setOrAnd(ex, opt, op.chr)
-  else
-    return nil
-  end
-  return ex
-end
-
-# parseArgs is obsolete.  Use OptionParser instead.
-
-def parseArgs(argc, nopt, single_opts, *opts)
-  if (noOptions = getopts(single_opts, *opts)) == nil
-    printUsageAndExit()
-  end
-  if nopt
-    ex = nil
-    pos = 0
-    for o in nopt.split(/[()|&]/)
-      pos += o.length
-      ex = setExpression(ex, o, nopt[pos])
-      pos += 1
-    end
-    begin
-      if !eval(ex)
-	printUsageAndExit()
-      end
-    rescue
-      print "Format Error!! : \"" + nopt + "\"\t[parseArgs]\n"
-      exit!(-1)
-    end
-  end
-  if ARGV.length < argc
-    printUsageAndExit()
-  end
-  return noOptions
-end
diff --git a/lib/parsedate.rb b/lib/parsedate.rb
deleted file mode 100644
index b52a79ba47..0000000000
--- a/lib/parsedate.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# = parsedate.rb: Parses dates
-#
-# Author:: Tadayoshi Funaba
-# Documentation:: Konrad Meyer
-#
-# ParseDate munches on a date and turns it into an array of values.
-#
-
-#
-# ParseDate converts a date into an array of values.
-# For example:
-#
-#   require 'parsedate'
-#
-#   ParseDate.parsedate "Tuesday, July 6th, 2007, 18:35:20 UTC"
-#   # => [2007, 7, 6, 18, 35, 20, "UTC", 2]
-#
-# The order is of the form [year, month, day of month, hour, minute, second,
-# timezone, day of the week].
-
-require 'date/format'
-
-module ParseDate
-  #
-  # Parse a string representation of a date into values.
-  # For example:
-  #
-  #   require 'parsedate'
-  #
-  #   ParseDate.parsedate "Tuesday, July 5th, 2007, 18:35:20 UTC"
-  #   # => [2007, 7, 5, 18, 35, 20, "UTC", 2]
-  #
-  # The order is of the form [year, month, day of month, hour, minute,
-  # second, timezone, day of week].
-  #
-  # ParseDate.parsedate can also take a second argument, +comp+, which
-  # is a boolean telling the method to compensate for dates with years
-  # expressed as two digits. Example:
-  #
-  #   require 'parsedate'
-  #
-  #   ParseDate.parsedate "Mon Dec 25 00 06:53:24 UTC", true
-  #   # => [2000, 12, 25, 6, 53, 24, "UTC", 1]
-  #
-  def parsedate(str, comp=false)
-    Date._parse(str, comp).
-      values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday)
-  end
-
-  module_function :parsedate
-
-end
diff --git a/lib/pathname.rb b/lib/pathname.rb
index e4ca5489ce..cede33d273 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -36,27 +36,27 @@
 # === Example 1: Using Pathname
 #
 #   require 'pathname'
-#   p = Pathname.new("/usr/bin/ruby")
-#   size = p.size              # 27662
-#   isdir = p.directory?       # false
-#   dir  = p.dirname           # Pathname:/usr/bin
-#   base = p.basename          # Pathname:ruby
-#   dir, base = p.split        # [Pathname:/usr/bin, Pathname:ruby]
-#   data = p.read
-#   p.open { |f| _ } 
-#   p.each_line { |line| _ }
+#   pn = Pathname.new("/usr/bin/ruby")
+#   size = pn.size              # 27662
+#   isdir = pn.directory?       # false
+#   dir  = pn.dirname           # Pathname:/usr/bin
+#   base = pn.basename          # Pathname:ruby
+#   dir, base = pn.split        # [Pathname:/usr/bin, Pathname:ruby]
+#   data = pn.read
+#   pn.open { |f| _ }
+#   pn.each_line { |line| _ }
 #
 # === Example 2: Using standard Ruby
 #
-#   p = "/usr/bin/ruby"
-#   size = File.size(p)        # 27662
-#   isdir = File.directory?(p) # false
-#   dir  = File.dirname(p)     # "/usr/bin"
-#   base = File.basename(p)    # "ruby"
-#   dir, base = File.split(p)  # ["/usr/bin", "ruby"]
-#   data = File.read(p)
-#   File.open(p) { |f| _ } 
-#   File.foreach(p) { |line| _ }
+#   pn = "/usr/bin/ruby"
+#   size = File.size(pn)        # 27662
+#   isdir = File.directory?(pn) # false
+#   dir  = File.dirname(pn)     # "/usr/bin"
+#   base = File.basename(pn)    # "ruby"
+#   dir, base = File.split(pn)  # ["/usr/bin", "ruby"]
+#   data = File.read(pn)
+#   File.open(pn) { |f| _ }
+#   File.foreach(pn) { |line| _ }
 #
 # === Example 3: Special features
 #
@@ -71,14 +71,14 @@
 #   p5.cleanpath                    # Pathname:articles
 #   p5.realpath                     # Pathname:/home/gavin/articles
 #   p5.children                     # [Pathname:/home/gavin/articles/linux, ...]
-# 
+#
 # == Breakdown of functionality
 #
 # === Core methods
 #
-# These methods are effectively manipulating a String, because that's all a path
-# is.  Except for #mountpoint?, #children, and #realpath, they don't access the
-# filesystem.
+# These methods are effectively manipulating a String, because that's
+# all a path is.  Except for #mountpoint?, #children, #each_child,
+# #realdirpath and #realpath, they don't access the filesystem.
 #
 # - +
 # - #join
@@ -90,7 +90,9 @@
 # - #each_filename
 # - #cleanpath
 # - #realpath
+# - #realdirpath
 # - #children
+# - #each_child
 # - #mountpoint?
 #
 # === File status predicate methods
@@ -165,6 +167,7 @@
 # These methods are a facade for IO:
 # - #each_line(*args, &block)
 # - #read(*args)
+# - #binread(*args)
 # - #readlines(*args)
 # - #sysopen(*args)
 #
@@ -194,6 +197,13 @@ class Pathname
     # to_path is implemented so Pathname objects are usable with File.open, etc.
     TO_PATH = :to_path
   end
+
+  SAME_PATHS = if File::FNM_SYSCASE.nonzero?
+    proc {|a, b| a.casecmp(b).zero?}
+  else
+    proc {|a, b| a == b}
+  end
+
   # :startdoc:
 
   #
@@ -251,19 +261,44 @@ class Pathname
 
   # Return a pathname which is substituted by String#sub.
   def sub(pattern, *rest, &block)
-    self.class.new(@path.sub(pattern, *rest, &block))
+    if block
+      path = @path.sub(pattern, *rest) {|*args|
+        begin
+          old = Thread.current[:pathname_sub_matchdata]
+          Thread.current[:pathname_sub_matchdata] = $~
+          eval("$~ = Thread.current[:pathname_sub_matchdata]", block.binding)
+        ensure
+          Thread.current[:pathname_sub_matchdata] = old
+        end
+        yield(*args)
+      }
+    else
+      path = @path.sub(pattern, *rest)
+    end
+    self.class.new(path)
   end
 
   if File::ALT_SEPARATOR
-    SEPARATOR_PAT = /[#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}]/
+    SEPARATOR_LIST = "#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}"
+    SEPARATOR_PAT = /[#{SEPARATOR_LIST}]/
   else
+    SEPARATOR_LIST = "#{Regexp.quote File::SEPARATOR}"
     SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
   end
 
+  # Return a pathname which the extension of the basename is substituted by
+  # <i>repl</i>.
+  #
+  # If self has no extension part, <i>repl</i> is appended.
+  def sub_ext(repl)
+    ext = File.extname(@path)
+    self.class.new(@path.chomp(ext) + repl)
+  end
+
   # chop_basename(path) -> [pre-basename, basename] or nil
   def chop_basename(path)
     base = File.basename(path)
-    if /\A#{SEPARATOR_PAT}?\z/ =~ base
+    if /\A#{SEPARATOR_PAT}?\z/o =~ base
       return nil
     else
       return path[0, path.rindex(base)], base
@@ -285,7 +320,7 @@ class Pathname
   def prepend_prefix(prefix, relpath)
     if relpath.empty?
       File.dirname(prefix)
-    elsif /#{SEPARATOR_PAT}/ =~ prefix
+    elsif /#{SEPARATOR_PAT}/o =~ prefix
       prefix = File.dirname(prefix)
       prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
       prefix + relpath
@@ -400,58 +435,25 @@ class Pathname
   end
   private :cleanpath_conservative
 
-  def realpath_rec(prefix, unresolved, h)
-    resolved = []
-    until unresolved.empty?
-      n = unresolved.shift
-      if n == '.'
-        next
-      elsif n == '..'
-        resolved.pop
-      else
-        path = prepend_prefix(prefix, File.join(*(resolved + [n])))
-        if h.include? path
-          if h[path] == :resolving
-            raise Errno::ELOOP.new(path)
-          else
-            prefix, *resolved = h[path]
-          end
-        else
-          s = File.lstat(path)
-          if s.symlink?
-            h[path] = :resolving
-            link_prefix, link_names = split_names(File.readlink(path))
-            if link_prefix == ''
-              prefix, *resolved = h[path] = realpath_rec(prefix, resolved + link_names, h)
-            else
-              prefix, *resolved = h[path] = realpath_rec(link_prefix, link_names, h)
-            end
-          else
-            resolved << n
-            h[path] = [prefix, *resolved]
-          end
-        end
-      end
-    end
-    return prefix, *resolved
+  #
+  # Returns the real (absolute) pathname of +self+ in the actual
+  # filesystem not containing symlinks or useless dots.
+  #
+  # All components of the pathname must exist when this method is
+  # called.
+  #
+  def realpath(basedir=nil)
+    self.class.new(File.realpath(@path, basedir))
   end
-  private :realpath_rec
 
   #
-  # Returns a real (absolute) pathname of +self+ in the actual filesystem.
+  # Returns the real (absolute) pathname of +self+ in the actual filesystem.
   # The real pathname doesn't contain symlinks or useless dots.
   #
-  # No arguments should be given; the old behaviour is *obsoleted*. 
+  # The last component of the real pathname can be nonexistent.
   #
-  def realpath
-    path = @path
-    prefix, names = split_names(path)
-    if prefix == ''
-      prefix, names2 = split_names(Dir.pwd)
-      names = names2 + names
-    end
-    prefix, *names = realpath_rec(prefix, names, {})
-    self.class.new(prepend_prefix(prefix, File.join(*names)))
+  def realdirpath(basedir=nil)
+    self.class.new(File.realdirpath(@path, basedir))
   end
 
   # #parent returns the parent directory.
@@ -506,6 +508,7 @@ class Pathname
   #     # yields "usr", "bin", and "ruby".
   #
   def each_filename # :yield: filename
+    return to_enum(__method__) unless block_given?
     prefix, names = split_names(@path)
     names.each {|filename| yield filename }
     nil
@@ -576,7 +579,7 @@ class Pathname
   #   p2 = p1 + "bin/ruby"           # Pathname:/usr/bin/ruby
   #   p3 = p1 + "/etc/passwd"        # Pathname:/etc/passwd
   #
-  # This method doesn't access the file system; it is pure string manipulation. 
+  # This method doesn't access the file system; it is pure string manipulation.
   #
   def +(other)
     other = Pathname.new(other) unless Pathname === other
@@ -652,12 +655,12 @@ class Pathname
   # filename only.
   #
   # For example:
-  #   p = Pathname("/usr/lib/ruby/1.8")
-  #   p.children
+  #   pn = Pathname("/usr/lib/ruby/1.8")
+  #   pn.children
   #       # -> [ Pathname:/usr/lib/ruby/1.8/English.rb,
   #              Pathname:/usr/lib/ruby/1.8/Env.rb,
   #              Pathname:/usr/lib/ruby/1.8/abbrev.rb, ... ]
-  #   p.children(false)
+  #   pn.children(false)
   #       # -> [ Pathname:English.rb, Pathname:Env.rb, Pathname:abbrev.rb, ... ]
   #
   # Note that the result never contain the entries <tt>.</tt> and <tt>..</tt> in
@@ -679,6 +682,36 @@ class Pathname
     result
   end
 
+  # Iterates over the children of the directory
+  # (files and subdirectories, not recursive).
+  # It yields Pathname object for each child.
+  # By default, the yielded pathnames will have enough information to access the files.
+  # If you set +with_directory+ to +false+, then the returned pathnames will contain the filename only.
+  #
+  #   Pathname("/usr/local").each_child {|f| p f }
+  #   #=> #<Pathname:/usr/local/share>
+  #   #   #<Pathname:/usr/local/bin>
+  #   #   #<Pathname:/usr/local/games>
+  #   #   #<Pathname:/usr/local/lib>
+  #   #   #<Pathname:/usr/local/include>
+  #   #   #<Pathname:/usr/local/sbin>
+  #   #   #<Pathname:/usr/local/src>
+  #   #   #<Pathname:/usr/local/man>
+  #
+  #   Pathname("/usr/local").each_child(false) {|f| p f }
+  #   #=> #<Pathname:share>
+  #   #   #<Pathname:bin>
+  #   #   #<Pathname:games>
+  #   #   #<Pathname:lib>
+  #   #   #<Pathname:include>
+  #   #   #<Pathname:sbin>
+  #   #   #<Pathname:src>
+  #   #   #<Pathname:man>
+  #
+  def each_child(with_directory=true, &b)
+    children(with_directory).each(&b)
+  end
+
   #
   # #relative_path_from returns a relative path from the argument to the
   # receiver.  If +self+ is absolute, the argument must be absolute too.  If
@@ -705,12 +738,12 @@ class Pathname
       base_prefix, basename = r
       base_names.unshift basename if basename != '.'
     end
-    if dest_prefix != base_prefix
+    unless SAME_PATHS[dest_prefix, base_prefix]
       raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}"
     end
     while !dest_names.empty? &&
           !base_names.empty? &&
-          dest_names.first == base_names.first
+          SAME_PATHS[dest_names.first, base_names.first]
       dest_names.shift
       base_names.shift
     end
@@ -738,16 +771,14 @@ class Pathname    # * IO *
     IO.foreach(@path, *args, &block)
   end
 
-  # Pathname#foreachline is *obsoleted* at 1.8.1.  Use #each_line.
-  def foreachline(*args, &block)
-    warn "Pathname#foreachline is obsoleted.  Use Pathname#each_line."
-    each_line(*args, &block)
-  end
-
-  # See <tt>IO.read</tt>.  Returns all the bytes from the file, or the first +N+
+  # See <tt>IO.read</tt>.  Returns all data from the file, or the first +N+ bytes
   # if specified.
   def read(*args) IO.read(@path, *args) end
 
+  # See <tt>IO.binread</tt>.  Returns all the bytes from the file, or the first +N+
+  # if specified.
+  def binread(*args) IO.binread(@path, *args) end
+
   # See <tt>IO.readlines</tt>.  Returns all the lines from the file.
   def readlines(*args) IO.readlines(@path, *args) end
 
@@ -834,20 +865,6 @@ class Pathname    # * File *
   # See <tt>File.split</tt>.  Returns the #dirname and the #basename in an
   # Array.
   def split() File.split(@path).map {|f| self.class.new(f) } end
-
-  # Pathname#link is confusing and *obsoleted* because the receiver/argument
-  # order is inverted to corresponding system call.
-  def link(old)
-    warn 'Pathname#link is obsoleted.  Use Pathname#make_link.'
-    File.link(old, @path)
-  end
-
-  # Pathname#symlink is confusing and *obsoleted* because the receiver/argument
-  # order is inverted to corresponding system call.
-  def symlink(old)
-    warn 'Pathname#symlink is obsoleted.  Use Pathname#make_symlink.'
-    File.symlink(old, @path)
-  end
 end
 
 
@@ -929,7 +946,7 @@ end
 
 class Pathname    # * Dir *
   # See <tt>Dir.glob</tt>.  Returns or yields Pathname objects.
-  def Pathname.glob(*args) # :yield: p
+  def Pathname.glob(*args) # :yield: pathname
     if block_given?
       Dir.glob(*args) {|f| yield self.new(f) }
     else
@@ -941,18 +958,6 @@ class Pathname    # * Dir *
   def Pathname.getwd() self.new(Dir.getwd) end
   class << self; alias pwd getwd end
 
-  # Pathname#chdir is *obsoleted* at 1.8.1.
-  def chdir(&block)
-    warn "Pathname#chdir is obsoleted.  Use Dir.chdir."
-    Dir.chdir(@path, &block)
-  end
-
-  # Pathname#chroot is *obsoleted* at 1.8.1.
-  def chroot
-    warn "Pathname#chroot is obsoleted.  Use Dir.chroot."
-    Dir.chroot(@path)
-  end
-
   # Return the entries (files and subdirectories) in the directory, each as a
   # Pathname object.
   def entries() Dir.entries(@path).map {|f| self.class.new(f) } end
@@ -961,16 +966,10 @@ class Pathname    # * Dir *
   # yields a Pathname object for each entry.
   #
   # This method has existed since 1.8.1.
-  def each_entry(&block) # :yield: p
+  def each_entry(&block) # :yield: pathname
     Dir.foreach(@path) {|f| yield self.class.new(f) }
   end
 
-  # Pathname#dir_foreach is *obsoleted* at 1.8.1.
-  def dir_foreach(*args, &block)
-    warn "Pathname#dir_foreach is obsoleted.  Use Pathname#each_entry."
-    each_entry(*args, &block)
-  end
-
   # See <tt>Dir.mkdir</tt>.  Create the referenced directory.
   def mkdir(*args) Dir.mkdir(@path, *args) end
 
@@ -995,7 +994,7 @@ class Pathname    # * Find *
   # If +self+ is <tt>.</tt>, yielded pathnames begin with a filename in the
   # current directory, not <tt>./</tt>.
   #
-  def find(&block) # :yield: p
+  def find(&block) # :yield: pathname
     require 'find'
     if @path == '.'
       Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
@@ -1037,18 +1036,10 @@ class Pathname    # * mixed *
     end
   end
   alias delete unlink
+end
 
-  # This method is *obsoleted* at 1.8.1.  Use #each_line or #each_entry.
-  def foreach(*args, &block)
-    warn "Pathname#foreach is obsoleted.  Use each_line or each_entry."
-    if FileTest.directory? @path
-      # For polymorphism between Dir.foreach and IO.foreach,
-      # Pathname#foreach doesn't yield Pathname object.
-      Dir.foreach(@path, *args, &block)
-    else
-      IO.foreach(@path, *args, &block)
-    end
-  end
+class Pathname
+  undef =~
 end
 
 module Kernel
diff --git a/lib/ping.rb b/lib/ping.rb
deleted file mode 100644
index c2966b619c..0000000000
--- a/lib/ping.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# = ping.rb: Check a host for upness
-#
-# Author:: Yukihiro Matsumoto
-# Documentation:: Konrad Meyer
-# 
-# Performs the function of the basic network testing tool, ping.
-# See: Ping.
-#
-
-require 'timeout'
-require "socket"
-
-# 
-# Ping contains routines to test for the reachability of remote hosts.
-# Currently the only routine implemented is pingecho().
-#
-# Ping.pingecho uses a TCP echo (not an ICMP echo) to determine if the
-# remote host is reachable. This is usually adequate to tell that a remote
-# host is available to telnet, ftp, or ssh to.
-#
-# Warning: Ping.pingecho may block for a long time if DNS resolution is
-# slow. Requiring 'resolv-replace' allows non-blocking name resolution.
-#
-# Usage:
-# 
-#   require 'ping'
-#
-#   puts "'jimmy' is alive and kicking" if Ping.pingecho('jimmy', 10)
-#
-module Ping
-
-  # 
-  # Return true if we can open a connection to the hostname or IP address
-  # +host+ on port +service+ (which defaults to the "echo" port) waiting up
-  # to +timeout+ seconds.
-  #
-  # Example:
-  #
-  #   require 'ping'
-  #
-  #   Ping.pingecho "google.com", 10, 80
-  #
-  def pingecho(host, timeout=5, service="echo")
-    begin
-      timeout(timeout) do
-	s = TCPSocket.new(host, service)
-	s.close
-      end
-    rescue Errno::ECONNREFUSED
-      return true
-    rescue Timeout::Error, StandardError
-      return false
-    end
-    return true
-  end
-  module_function :pingecho
-end
-
-if $0 == __FILE__
-  host = ARGV[0]
-  host ||= "localhost"
-  printf("%s alive? - %s\n", host,  Ping::pingecho(host, 5))
-end
diff --git a/lib/pp.rb b/lib/pp.rb
index 8080d879f9..cda282448b 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -1,10 +1,10 @@
 # == Pretty-printer for Ruby objects.
-# 
+#
 # = Which seems better?
-# 
+#
 # non-pretty-printed output by #p is:
 #   #<PP:0x81fedf0 @genspace=#<Proc:0x81feda0>, @group_queue=#<PrettyPrint::GroupQueue:0x81fed3c @queue=[[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], []]>, @buffer=[], @newline="\n", @group_stack=[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], @buffer_width=0, @indent=0, @maxwidth=79, @output_width=2, @output=#<IO:0x8114ee4>>
-# 
+#
 # pretty-printed output by #pp is:
 #   #<PP:0x81fedf0
 #    @buffer=[],
@@ -22,17 +22,17 @@
 #    @newline="\n",
 #    @output=#<IO:0x8114ee4>,
 #    @output_width=2>
-# 
+#
 # I like the latter.  If you do too, this library is for you.
-# 
+#
 # = Usage
-# 
+#
 #   pp(obj)
 #
 # output +obj+ to +$>+ in pretty printed format.
-# 
+#
 # It returns +nil+.
-# 
+#
 # = Output Customization
 # To define your customized pretty printing function for your classes,
 # redefine a method #pretty_print(+pp+) in the class.
@@ -54,12 +54,12 @@ module Kernel
   private
   # prints arguments in pretty form.
   #
-  # pp returns nil.
+  # pp returns argument(s).
   def pp(*objs) # :doc:
     objs.each {|obj|
       PP.pp(obj)
     }
-    nil
+    objs.size <= 1 ? objs.first : objs
   end
   module_function :pp
 end
@@ -67,10 +67,10 @@ end
 class PP < PrettyPrint
   # Outputs +obj+ to +out+ in pretty printed format of
   # +width+ columns in width.
-  # 
+  #
   # If +out+ is omitted, +$>+ is assumed.
   # If +width+ is omitted, 79 is assumed.
-  # 
+  #
   # PP.pp returns +out+.
   def PP.pp(obj, out=$>, width=79)
     q = PP.new(out, width)
@@ -82,7 +82,7 @@ class PP < PrettyPrint
 
   # Outputs +obj+ to +out+ like PP.pp but with no indent and
   # newline.
-  # 
+  #
   # PP.singleline_pp returns +out+.
   def PP.singleline_pp(obj, out=$>)
     q = SingleLine.new(out)
@@ -105,59 +105,81 @@ class PP < PrettyPrint
   end
 
   module PPMethods
-    InspectKey = :__inspect_key__
-
     def guard_inspect_key
-      if Thread.current[InspectKey] == nil
-        Thread.current[InspectKey] = []
+      if Thread.current[:__recursive_key__] == nil
+        Thread.current[:__recursive_key__] = {}.untrust
       end
 
-      save = Thread.current[InspectKey]
+      if Thread.current[:__recursive_key__][:inspect] == nil
+        Thread.current[:__recursive_key__][:inspect] = {}.untrust
+      end
+
+      save = Thread.current[:__recursive_key__][:inspect]
 
       begin
-        Thread.current[InspectKey] = []
+        Thread.current[:__recursive_key__][:inspect] = {}.untrust
         yield
       ensure
-        Thread.current[InspectKey] = save
+        Thread.current[:__recursive_key__][:inspect] = save
       end
     end
 
+    def check_inspect_key(id)
+      Thread.current[:__recursive_key__] &&
+      Thread.current[:__recursive_key__][:inspect] &&
+      Thread.current[:__recursive_key__][:inspect].include?(id)
+    end
+    def push_inspect_key(id)
+      Thread.current[:__recursive_key__][:inspect][id] = true
+    end
+    def pop_inspect_key(id)
+      Thread.current[:__recursive_key__][:inspect].delete id
+    end
+
     # Adds +obj+ to the pretty printing buffer
     # using Object#pretty_print or Object#pretty_print_cycle.
-    # 
+    #
     # Object#pretty_print_cycle is used when +obj+ is already
     # printed, a.k.a the object reference chain has a cycle.
     def pp(obj)
-      id = obj.__id__
+      id = obj.object_id
 
-      if Thread.current[InspectKey].include? id
+      if check_inspect_key(id)
         group {obj.pretty_print_cycle self}
         return
       end
 
       begin
-        Thread.current[InspectKey] << id
+        push_inspect_key(id)
         group {obj.pretty_print self}
       ensure
-        Thread.current[InspectKey].pop unless PP.sharing_detection
+        pop_inspect_key(id) unless PP.sharing_detection
       end
     end
 
     # A convenience method which is same as follows:
-    # 
+    #
     #   group(1, '#<' + obj.class.name, '>') { ... }
     def object_group(obj, &block) # :yield:
       group(1, '#<' + obj.class.name, '>', &block)
     end
 
+    PointerMask = (1 << ([""].pack("p").size * 8)) - 1
+
+    case Object.new.inspect
+    when /\A\#<Object:0x([0-9a-f]+)>\z/
+      PointerFormat = "%0#{$1.length}x"
+    else
+      PointerFormat = "%x"
+    end
+
     def object_address_group(obj, &block)
-      id = "%x" % (obj.__id__ * 2)
-      id.sub!(/\Af(?=[[:xdigit:]]{2}+\z)/, '') if id.sub!(/\A\.\./, '')
+      id = PointerFormat % (obj.object_id * 2 & PointerMask)
       group(1, "\#<#{obj.class}:0x#{id}", '>', &block)
     end
 
     # A convenience method which is same as follows:
-    # 
+    #
     #   text ','
     #   breakable
     def comma_breakable
@@ -167,23 +189,23 @@ class PP < PrettyPrint
 
     # Adds a separated list.
     # The list is separated by comma with breakable space, by default.
-    # 
+    #
     # #seplist iterates the +list+ using +iter_method+.
     # It yields each object to the block given for #seplist.
     # The procedure +separator_proc+ is called between each yields.
-    # 
+    #
     # If the iteration is zero times, +separator_proc+ is not called at all.
-    # 
+    #
     # If +separator_proc+ is nil or not given,
     # +lambda { comma_breakable }+ is used.
     # If +iter_method+ is not given, :each is used.
-    # 
+    #
     # For example, following 3 code fragments has similar effect.
-    # 
+    #
     #   q.seplist([1,2,3]) {|v| xxx v }
-    # 
-    #   q.seplist([1,2,3], lambda { comma_breakable }, :each) {|v| xxx v }
-    # 
+    #
+    #   q.seplist([1,2,3], lambda { q.comma_breakable }, :each) {|v| xxx v }
+    #
     #   xxx 1
     #   q.comma_breakable
     #   xxx 2
@@ -242,22 +264,35 @@ class PP < PrettyPrint
   module ObjectMixin
     # 1. specific pretty_print
     # 2. specific inspect
-    # 3. specific to_s if instance variable is empty
+    # 3. specific to_s
     # 4. generic pretty_print
 
     # A default pretty printing method for general objects.
     # It calls #pretty_print_instance_variables to list instance variables.
-    # 
+    #
     # If +self+ has a customized (redefined) #inspect method,
     # the result of self.inspect is used but it obviously has no
     # line break hints.
-    # 
+    #
     # This module provides predefined #pretty_print methods for some of
     # the most commonly used built-in classes for convenience.
     def pretty_print(q)
-      if /\(Kernel\)#/ !~ method(:inspect).inspect
+      method_method = Object.instance_method(:method).bind(self)
+      begin
+        inspect_method = method_method.call(:inspect)
+      rescue NameError
+      end
+      begin
+        to_s_method = method_method.call(:to_s)
+      rescue NameError
+      end
+      if inspect_method && /\(Kernel\)#/ !~ inspect_method.inspect
+        q.text self.inspect
+      elsif !inspect_method && self.respond_to?(:inspect)
         q.text self.inspect
-      elsif /\(Kernel\)#/ !~ method(:to_s).inspect && instance_variables.empty?
+      elsif to_s_method && /\(Kernel\)#/ !~ to_s_method.inspect
+        q.text self.to_s
+      elsif !to_s_method && self.respond_to?(:to_s)
         q.text self.to_s
       else
         q.pp_object(self)
@@ -274,7 +309,7 @@ class PP < PrettyPrint
     end
 
     # Returns a sorted array of instance variable names.
-    # 
+    #
     # This method should return an array of names of instance variables as symbols or strings as:
     # +[:@a, :@b]+.
     def pretty_print_instance_variables
@@ -283,13 +318,13 @@ class PP < PrettyPrint
 
     # Is #inspect implementation using #pretty_print.
     # If you implement #pretty_print, it can be used as follows.
-    # 
+    #
     #   alias inspect pretty_print_inspect
     #
     # However, doing this requires that every class that #inspect is called on
     # implement #pretty_print, or a RuntimeError will be raised.
     def pretty_print_inspect
-      if /\(PP::ObjectMixin\)#/ =~ method(:pretty_print).inspect
+      if /\(PP::ObjectMixin\)#/ =~ Object.instance_method(:method).bind(self).call(:pretty_print).inspect
         raise "pretty_print is not overridden for #{self.class}"
       end
       PP.singleline_pp(self, '')
@@ -323,13 +358,17 @@ end
 
 class << ENV
   def pretty_print(q)
-    q.pp_hash self
+    h = {}
+    ENV.keys.sort.each {|k|
+      h[k] = ENV[k]
+    }
+    q.pp_hash h
   end
 end
 
 class Struct
   def pretty_print(q)
-    q.group(1, '#<struct ' + PP.mcall(self, Kernel, :class).name, '>') {
+    q.group(1, sprintf("#<struct %s", PP.mcall(self, Kernel, :class).name), '>') {
       q.seplist(PP.mcall(self, Struct, :members), lambda { q.text "," }) {|member|
         q.breakable
         q.text member.to_s
@@ -441,10 +480,24 @@ end
 
 class MatchData
   def pretty_print(q)
+    nc = []
+    self.regexp.named_captures.each {|name, indexes|
+      indexes.each {|i| nc[i] = name }
+    }
     q.object_group(self) {
       q.breakable
-      q.seplist(1..self.size, lambda { q.breakable }) {|i|
-        q.pp self[i-1]
+      q.seplist(0...self.size, lambda { q.breakable }) {|i|
+        if i == 0
+          q.pp self[i]
+        else
+          if nc[i]
+            q.text nc[i]
+          else
+            q.pp i
+          end
+          q.text ':'
+          q.pp self[i]
+        end
       }
     }
   end
@@ -469,179 +522,3 @@ end
     end
   }
 }
-
-# :enddoc:
-if __FILE__ == $0
-  require 'test/unit'
-
-  class PPTest < Test::Unit::TestCase
-    def test_list0123_12
-      assert_equal("[0, 1, 2, 3]\n", PP.pp([0,1,2,3], '', 12))
-    end
-
-    def test_list0123_11
-      assert_equal("[0,\n 1,\n 2,\n 3]\n", PP.pp([0,1,2,3], '', 11))
-    end
-
-    OverriddenStruct = Struct.new("OverriddenStruct", :members, :class)
-    def test_struct_override_members # [ruby-core:7865]
-      a = OverriddenStruct.new(1,2)
-      assert_equal("#<struct Struct::OverriddenStruct members=1, class=2>\n", PP.pp(a, ''))
-    end
-  end
-
-  class HasInspect
-    def initialize(a)
-      @a = a
-    end
-
-    def inspect
-      return "<inspect:#{@a.inspect}>"
-    end
-  end
-
-  class HasPrettyPrint
-    def initialize(a)
-      @a = a
-    end
-
-    def pretty_print(q)
-      q.text "<pretty_print:"
-      q.pp @a
-      q.text ">"
-    end
-  end
-
-  class HasBoth
-    def initialize(a)
-      @a = a
-    end
-
-    def inspect
-      return "<inspect:#{@a.inspect}>"
-    end
-
-    def pretty_print(q)
-      q.text "<pretty_print:"
-      q.pp @a
-      q.text ">"
-    end
-  end
-
-  class PrettyPrintInspect < HasPrettyPrint
-    alias inspect pretty_print_inspect
-  end
-
-  class PrettyPrintInspectWithoutPrettyPrint
-    alias inspect pretty_print_inspect
-  end
-
-  class PPInspectTest < Test::Unit::TestCase
-    def test_hasinspect
-      a = HasInspect.new(1)
-      assert_equal("<inspect:1>\n", PP.pp(a, ''))
-    end
-
-    def test_hasprettyprint
-      a = HasPrettyPrint.new(1)
-      assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
-    end
-
-    def test_hasboth
-      a = HasBoth.new(1)
-      assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
-    end
-
-    def test_pretty_print_inspect
-      a = PrettyPrintInspect.new(1)
-      assert_equal("<pretty_print:1>", a.inspect)
-      a = PrettyPrintInspectWithoutPrettyPrint.new
-      assert_raise(RuntimeError) { a.inspect }
-    end
-
-    def test_proc
-      a = proc {1}
-      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
-    end
-
-    def test_to_s_with_iv
-      a = Object.new
-      def a.to_s() "aaa" end
-      a.instance_eval { @a = nil }
-      result = PP.pp(a, '')
-      assert_equal("#{a.inspect}\n", result)
-      assert_match(/\A#<Object.*>\n\z/m, result)
-      a = 1.0
-      a.instance_eval { @a = nil }
-      result = PP.pp(a, '')
-      assert_equal("#{a.inspect}\n", result)
-    end
-    
-    def test_to_s_without_iv
-      a = Object.new
-      def a.to_s() "aaa" end
-      result = PP.pp(a, '')
-      assert_equal("#{a.inspect}\n", result)
-      assert_equal("aaa\n", result)
-    end
-  end
-
-  class PPCycleTest < Test::Unit::TestCase
-    def test_array
-      a = []
-      a << a
-      assert_equal("[[...]]\n", PP.pp(a, ''))
-      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
-    end
-
-    def test_hash
-      a = {}
-      a[0] = a
-      assert_equal("{0=>{...}}\n", PP.pp(a, ''))
-      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
-    end
-
-    S = Struct.new("S", :a, :b)
-    def test_struct
-      a = S.new(1,2)
-      a.b = a
-      assert_equal("#<struct Struct::S a=1, b=#<struct Struct::S:...>>\n", PP.pp(a, ''))
-      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
-    end
-
-    def test_object
-      a = Object.new
-      a.instance_eval {@a = a}
-      assert_equal(a.inspect + "\n", PP.pp(a, ''))
-    end
-
-    def test_anonymous
-      a = Class.new.new
-      assert_equal(a.inspect + "\n", PP.pp(a, ''))
-    end
-
-    def test_withinspect
-      a = []
-      a << HasInspect.new(a)
-      assert_equal("[<inspect:[...]>]\n", PP.pp(a, ''))
-      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
-    end
-
-    def test_share_nil
-      begin
-        PP.sharing_detection = true
-        a = [nil, nil]
-        assert_equal("[nil, nil]\n", PP.pp(a, ''))
-      ensure
-        PP.sharing_detection = false
-      end
-    end
-  end
-
-  class PPSingleLineTest < Test::Unit::TestCase
-    def test_hash
-      assert_equal("{1=>1}", PP.singleline_pp({ 1 => 1}, '')) # [ruby-core:02699]
-      assert_equal("[1#{', 1'*99}]", PP.singleline_pp([1]*100, ''))
-    end
-  end
-end
diff --git a/lib/prettyprint.rb b/lib/prettyprint.rb
index 315c422e9e..2c1fff3258 100644
--- a/lib/prettyprint.rb
+++ b/lib/prettyprint.rb
@@ -1,8 +1,6 @@
-# $Id$
-
 # This class implements a pretty printing algorithm. It finds line breaks and
 # nice indentations for grouped structure.
-# 
+#
 # By default, the class assumes that primitive elements are strings and each
 # byte in the strings have single column in width. But it can be used for
 # other situations by giving suitable arguments for some methods:
@@ -18,28 +16,28 @@
 # == Bugs
 # * Box based formatting?
 # * Other (better) model/algorithm?
-# 
+#
 # == References
 # Christian Lindig, Strictly Pretty, March 2000,
 # http://www.st.cs.uni-sb.de/~lindig/papers/#pretty
-# 
+#
 # Philip Wadler, A prettier printer, March 1998,
 # http://homepages.inf.ed.ac.uk/wadler/topics/language-design.html#prettier
-# 
+#
 # == Author
 # Tanaka Akira <akr@m17n.org>
-# 
+#
 class PrettyPrint
 
   # This is a convenience method which is same as follows:
-  # 
+  #
   #   begin
   #     q = PrettyPrint.new(output, maxwidth, newline, &genspace)
   #     ...
   #     q.flush
   #     output
   #   end
-  # 
+  #
   def PrettyPrint.format(output='', maxwidth=79, newline="\n", genspace=lambda {|n| ' ' * n})
     q = PrettyPrint.new(output, maxwidth, newline, &genspace)
     yield q
@@ -377,520 +375,3 @@ class PrettyPrint
     end
   end
 end
-
-if __FILE__ == $0
-  require 'test/unit'
-
-  class WadlerExample < Test::Unit::TestCase # :nodoc:
-    def setup
-      @tree = Tree.new("aaaa", Tree.new("bbbbb", Tree.new("ccc"),
-                                                 Tree.new("dd")),
-                               Tree.new("eee"),
-                               Tree.new("ffff", Tree.new("gg"),
-                                                Tree.new("hhh"),
-                                                Tree.new("ii")))
-    end
-
-    def hello(width)
-      PrettyPrint.format('', width) {|hello|
-        hello.group {
-          hello.group {
-            hello.group {
-              hello.group {
-                hello.text 'hello'
-                hello.breakable; hello.text 'a'
-              }
-              hello.breakable; hello.text 'b'
-            }
-            hello.breakable; hello.text 'c'
-          }
-          hello.breakable; hello.text 'd'
-        }
-      }
-    end
-
-    def test_hello_00_06
-      expected = <<'End'.chomp
-hello
-a
-b
-c
-d
-End
-      assert_equal(expected, hello(0))
-      assert_equal(expected, hello(6))
-    end
-
-    def test_hello_07_08
-      expected = <<'End'.chomp
-hello a
-b
-c
-d
-End
-      assert_equal(expected, hello(7))
-      assert_equal(expected, hello(8))
-    end
-
-    def test_hello_09_10
-      expected = <<'End'.chomp
-hello a b
-c
-d
-End
-      out = hello(9); assert_equal(expected, out)
-      out = hello(10); assert_equal(expected, out)
-    end
-
-    def test_hello_11_12
-      expected = <<'End'.chomp
-hello a b c
-d
-End
-      assert_equal(expected, hello(11))
-      assert_equal(expected, hello(12))
-    end
-
-    def test_hello_13
-      expected = <<'End'.chomp
-hello a b c d
-End
-      assert_equal(expected, hello(13))
-    end
-
-    def tree(width)
-      PrettyPrint.format('', width) {|q| @tree.show(q)}
-    end
-
-    def test_tree_00_19
-      expected = <<'End'.chomp
-aaaa[bbbbb[ccc,
-           dd],
-     eee,
-     ffff[gg,
-          hhh,
-          ii]]
-End
-      assert_equal(expected, tree(0))
-      assert_equal(expected, tree(19))
-    end
-
-    def test_tree_20_22
-      expected = <<'End'.chomp
-aaaa[bbbbb[ccc, dd],
-     eee,
-     ffff[gg,
-          hhh,
-          ii]]
-End
-      assert_equal(expected, tree(20))
-      assert_equal(expected, tree(22))
-    end
-
-    def test_tree_23_43
-      expected = <<'End'.chomp
-aaaa[bbbbb[ccc, dd],
-     eee,
-     ffff[gg, hhh, ii]]
-End
-      assert_equal(expected, tree(23))
-      assert_equal(expected, tree(43))
-    end
-
-    def test_tree_44
-      assert_equal(<<'End'.chomp, tree(44))
-aaaa[bbbbb[ccc, dd], eee, ffff[gg, hhh, ii]]
-End
-    end
-
-    def tree_alt(width)
-      PrettyPrint.format('', width) {|q| @tree.altshow(q)}
-    end
-
-    def test_tree_alt_00_18
-      expected = <<'End'.chomp
-aaaa[
-  bbbbb[
-    ccc,
-    dd
-  ],
-  eee,
-  ffff[
-    gg,
-    hhh,
-    ii
-  ]
-]
-End
-      assert_equal(expected, tree_alt(0))
-      assert_equal(expected, tree_alt(18))
-    end
-
-    def test_tree_alt_19_20
-      expected = <<'End'.chomp
-aaaa[
-  bbbbb[ ccc, dd ],
-  eee,
-  ffff[
-    gg,
-    hhh,
-    ii
-  ]
-]
-End
-      assert_equal(expected, tree_alt(19))
-      assert_equal(expected, tree_alt(20))
-    end
-
-    def test_tree_alt_20_49
-      expected = <<'End'.chomp
-aaaa[
-  bbbbb[ ccc, dd ],
-  eee,
-  ffff[ gg, hhh, ii ]
-]
-End
-      assert_equal(expected, tree_alt(21))
-      assert_equal(expected, tree_alt(49))
-    end
-
-    def test_tree_alt_50
-      expected = <<'End'.chomp
-aaaa[ bbbbb[ ccc, dd ], eee, ffff[ gg, hhh, ii ] ]
-End
-      assert_equal(expected, tree_alt(50))
-    end
-
-    class Tree # :nodoc:
-      def initialize(string, *children)
-        @string = string
-        @children = children
-      end
-
-      def show(q)
-        q.group {
-          q.text @string
-          q.nest(@string.length) {
-            unless @children.empty?
-              q.text '['
-              q.nest(1) {
-                first = true
-                @children.each {|t|
-                  if first
-                    first = false
-                  else
-                    q.text ','
-                    q.breakable
-                  end
-                  t.show(q)
-                }
-              }
-              q.text ']'
-            end
-          }
-        }
-      end
-
-      def altshow(q)
-        q.group {
-          q.text @string
-          unless @children.empty?
-            q.text '['
-            q.nest(2) {
-              q.breakable
-              first = true
-              @children.each {|t|
-                if first
-                  first = false
-                else
-                  q.text ','
-                  q.breakable
-                end
-                t.altshow(q)
-              }
-            }
-            q.breakable
-            q.text ']'
-          end
-        }
-      end
-
-    end
-  end
-
-  class StrictPrettyExample < Test::Unit::TestCase # :nodoc:
-    def prog(width)
-      PrettyPrint.format('', width) {|q|
-        q.group {
-          q.group {q.nest(2) {
-                       q.text "if"; q.breakable;
-                       q.group {
-                         q.nest(2) {
-                           q.group {q.text "a"; q.breakable; q.text "=="}
-                           q.breakable; q.text "b"}}}}
-          q.breakable
-          q.group {q.nest(2) {
-                       q.text "then"; q.breakable;
-                       q.group {
-                         q.nest(2) {
-                           q.group {q.text "a"; q.breakable; q.text "<<"}
-                           q.breakable; q.text "2"}}}}
-          q.breakable
-          q.group {q.nest(2) {
-                       q.text "else"; q.breakable;
-                       q.group {
-                         q.nest(2) {
-                           q.group {q.text "a"; q.breakable; q.text "+"}
-                           q.breakable; q.text "b"}}}}}
-      }
-    end
-
-    def test_00_04
-      expected = <<'End'.chomp
-if
-  a
-    ==
-    b
-then
-  a
-    <<
-    2
-else
-  a
-    +
-    b
-End
-      assert_equal(expected, prog(0))
-      assert_equal(expected, prog(4))
-    end
-
-    def test_05
-      expected = <<'End'.chomp
-if
-  a
-    ==
-    b
-then
-  a
-    <<
-    2
-else
-  a +
-    b
-End
-      assert_equal(expected, prog(5))
-    end
-
-    def test_06
-      expected = <<'End'.chomp
-if
-  a ==
-    b
-then
-  a <<
-    2
-else
-  a +
-    b
-End
-      assert_equal(expected, prog(6))
-    end
-
-    def test_07
-      expected = <<'End'.chomp
-if
-  a ==
-    b
-then
-  a <<
-    2
-else
-  a + b
-End
-      assert_equal(expected, prog(7))
-    end
-
-    def test_08
-      expected = <<'End'.chomp
-if
-  a == b
-then
-  a << 2
-else
-  a + b
-End
-      assert_equal(expected, prog(8))
-    end
-
-    def test_09
-      expected = <<'End'.chomp
-if a == b
-then
-  a << 2
-else
-  a + b
-End
-      assert_equal(expected, prog(9))
-    end
-
-    def test_10
-      expected = <<'End'.chomp
-if a == b
-then
-  a << 2
-else a + b
-End
-      assert_equal(expected, prog(10))
-    end
-
-    def test_11_31
-      expected = <<'End'.chomp
-if a == b
-then a << 2
-else a + b
-End
-      assert_equal(expected, prog(11))
-      assert_equal(expected, prog(15))
-      assert_equal(expected, prog(31))
-    end
-
-    def test_32
-      expected = <<'End'.chomp
-if a == b then a << 2 else a + b
-End
-      assert_equal(expected, prog(32))
-    end
-
-  end
-
-  class TailGroup < Test::Unit::TestCase # :nodoc:
-    def test_1
-      out = PrettyPrint.format('', 10) {|q|
-        q.group {
-          q.group {
-            q.text "abc"
-            q.breakable
-            q.text "def"
-          }
-          q.group {
-            q.text "ghi"
-            q.breakable
-            q.text "jkl"
-          }
-        }
-      }
-      assert_equal("abc defghi\njkl", out)
-    end
-  end
-
-  class NonString < Test::Unit::TestCase # :nodoc:
-    def format(width)
-      PrettyPrint.format([], width, 'newline', lambda {|n| "#{n} spaces"}) {|q|
-        q.text(3, 3)
-        q.breakable(1, 1)
-        q.text(3, 3)
-      }
-    end
-
-    def test_6
-      assert_equal([3, "newline", "0 spaces", 3], format(6))
-    end
-
-    def test_7
-      assert_equal([3, 1, 3], format(7))
-    end
-
-  end
-
-  class Fill < Test::Unit::TestCase # :nodoc:
-    def format(width)
-      PrettyPrint.format('', width) {|q|
-        q.group {
-          q.text 'abc'
-          q.fill_breakable
-          q.text 'def'
-          q.fill_breakable
-          q.text 'ghi'
-          q.fill_breakable
-          q.text 'jkl'
-          q.fill_breakable
-          q.text 'mno'
-          q.fill_breakable
-          q.text 'pqr'
-          q.fill_breakable
-          q.text 'stu'
-        }
-      }
-    end
-
-    def test_00_06
-      expected = <<'End'.chomp
-abc
-def
-ghi
-jkl
-mno
-pqr
-stu
-End
-      assert_equal(expected, format(0))
-      assert_equal(expected, format(6))
-    end
-
-    def test_07_10
-      expected = <<'End'.chomp
-abc def
-ghi jkl
-mno pqr
-stu
-End
-      assert_equal(expected, format(7))
-      assert_equal(expected, format(10))
-    end
-
-    def test_11_14
-      expected = <<'End'.chomp
-abc def ghi
-jkl mno pqr
-stu
-End
-      assert_equal(expected, format(11))
-      assert_equal(expected, format(14))
-    end
-
-    def test_15_18
-      expected = <<'End'.chomp
-abc def ghi jkl
-mno pqr stu
-End
-      assert_equal(expected, format(15))
-      assert_equal(expected, format(18))
-    end
-
-    def test_19_22
-      expected = <<'End'.chomp
-abc def ghi jkl mno
-pqr stu
-End
-      assert_equal(expected, format(19))
-      assert_equal(expected, format(22))
-    end
-
-    def test_23_26
-      expected = <<'End'.chomp
-abc def ghi jkl mno pqr
-stu
-End
-      assert_equal(expected, format(23))
-      assert_equal(expected, format(26))
-    end
-
-    def test_27
-      expected = <<'End'.chomp
-abc def ghi jkl mno pqr stu
-End
-      assert_equal(expected, format(27))
-    end
-
-  end
-end
diff --git a/lib/prime.rb b/lib/prime.rb
new file mode 100644
index 0000000000..a40d90e3d7
--- /dev/null
+++ b/lib/prime.rb
@@ -0,0 +1,495 @@
+#
+# = prime.rb
+#
+# Prime numbers and factorization library.
+#
+# Copyright::
+#   Copyright (c) 1998-2008 Keiju ISHITSUKA(SHL Japan Inc.)
+#   Copyright (c) 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+#
+# Documentation::
+#   Yuki Sonoda
+#
+
+require "singleton"
+require "forwardable"
+
+class Integer
+  # Re-composes a prime factorization and returns the product.
+  #
+  # See Prime#int_from_prime_division for more details.
+  def Integer.from_prime_division(pd)
+    Prime.int_from_prime_division(pd)
+  end
+
+  # Returns the factorization of +self+.
+  #
+  # See Prime#prime_division for more details.
+  def prime_division(generator = Prime::Generator23.new)
+    Prime.prime_division(self, generator)
+  end
+
+  # Returns true if +self+ is a prime number, false for a composite.
+  def prime?
+    Prime.prime?(self)
+  end
+
+  # Iterates the given block over all prime numbers.
+  #
+  # See +Prime+#each for more details.
+  def Integer.each_prime(ubound, &block) # :yields: prime
+    Prime.each(ubound, &block)
+  end
+end
+
+#
+# The set of all prime numbers.
+#
+# == Example
+#  Prime.each(100) do |prime|
+#    p prime  #=> 2, 3, 5, 7, 11, ...., 97
+#  end
+#
+# == Retrieving the instance
+# +Prime+.new is obsolete. Now +Prime+ has the default instance and you can
+# access it as +Prime+.instance.
+#
+# For convenience, each instance method of +Prime+.instance can be accessed
+# as a class method of +Prime+.
+#
+# e.g.
+#  Prime.instance.prime?(2)  #=> true
+#  Prime.prime?(2)           #=> true
+#
+# == Generators
+# A "generator" provides an implementation of enumerating pseudo-prime
+# numbers and it remembers the position of enumeration and upper bound.
+# Futhermore, it is a external iterator of prime enumeration which is
+# compatible to an Enumerator.
+#
+# +Prime+::+PseudoPrimeGenerator+ is the base class for generators.
+# There are few implementations of generator.
+#
+# [+Prime+::+EratosthenesGenerator+]
+#   Uses eratosthenes's sieve.
+# [+Prime+::+TrialDivisionGenerator+]
+#   Uses the trial division method.
+# [+Prime+::+Generator23+]
+#   Generates all positive integers which is not divided by 2 nor 3.
+#   This sequence is very bad as a pseudo-prime sequence. But this
+#   is faster and uses much less memory than other generators. So,
+#   it is suitable for factorizing an integer which is not large but
+#   has many prime factors. e.g. for Prime#prime? .
+class Prime
+  include Enumerable
+  @the_instance = Prime.new
+
+  # obsolete. Use +Prime+::+instance+ or class methods of +Prime+.
+  def initialize
+    @generator = EratosthenesGenerator.new
+    extend OldCompatibility
+    warn "Prime::new is obsolete. use Prime::instance or class methods of Prime."
+  end
+
+  class << self
+    extend Forwardable
+    include Enumerable
+    # Returns the default instance of Prime.
+    def instance; @the_instance end
+
+    def method_added(method) # :nodoc:
+      (class<< self;self;end).def_delegator :instance, method
+    end
+  end
+
+  # Iterates the given block over all prime numbers.
+  #
+  # == Parameters
+  # +ubound+::
+  #   Optional. An arbitrary positive number.
+  #   The upper bound of enumeration. The method enumerates
+  #   prime numbers infinitely if +ubound+ is nil.
+  # +generator+::
+  #   Optional. An implementation of pseudo-prime generator.
+  #
+  # == Return value
+  # An evaluated value of the given block at the last time.
+  # Or an enumerator which is compatible to an +Enumerator+
+  # if no block given.
+  #
+  # == Description
+  # Calls +block+ once for each prime number, passing the prime as
+  # a parameter.
+  #
+  # +ubound+::
+  #   Upper bound of prime numbers. The iterator stops after
+  #   yields all prime numbers p <= +ubound+.
+  #
+  # == Note
+  # +Prime+.+new+ returns a object extended by +Prime+::+OldCompatibility+
+  # in order to compatibility to Ruby 1.8, and +Prime+#each is overwritten
+  # by +Prime+::+OldCompatibility+#+each+.
+  #
+  # +Prime+.+new+ is now obsolete. Use +Prime+.+instance+.+each+ or simply
+  # +Prime+.+each+.
+  def each(ubound = nil, generator = EratosthenesGenerator.new, &block)
+    generator.upper_bound = ubound
+    generator.each(&block)
+  end
+
+
+  # Returns true if +value+ is prime, false for a composite.
+  #
+  # == Parameters
+  # +value+:: an arbitrary integer to be checked.
+  # +generator+:: optional. A pseudo-prime generator.
+  def prime?(value, generator = Prime::Generator23.new)
+    value = -value if value < 0
+    return false if value < 2
+    for num in generator
+      q,r = value.divmod num
+      return true if q < num
+      return false if r == 0
+    end
+  end
+
+  # Re-composes a prime factorization and returns the product.
+  #
+  # == Parameters
+  # +pd+:: Array of pairs of integers. The each internal
+  #        pair consists of a prime number -- a prime factor --
+  #        and a natural number -- an exponent.
+  #
+  # == Example
+  # For [[p_1, e_1], [p_2, e_2], ...., [p_n, e_n]], it returns
+  # p_1**e_1 * p_2**e_2 * .... * p_n**e_n.
+  #
+  #  Prime.int_from_prime_division([[2,2], [3,1]])  #=> 12
+  def int_from_prime_division(pd)
+    pd.inject(1){|value, (prime, index)|
+      value *= prime**index
+    }
+  end
+
+  # Returns the factorization of +value+.
+  #
+  # == Parameters
+  # +value+:: An arbitrary integer.
+  # +generator+:: Optional. A pseudo-prime generator.
+  #               +generator+.succ must return the next
+  #               pseudo-prime number in the ascendent
+  #               order. It must generate all prime numbers,
+  #               but may generate non prime numbers.
+  #
+  # === Exceptions
+  # +ZeroDivisionError+:: when +value+ is zero.
+  #
+  # == Example
+  # For an arbitrary integer
+  # n = p_1**e_1 * p_2**e_2 * .... * p_n**e_n,
+  # prime_division(n) returns
+  # [[p_1, e_1], [p_2, e_2], ...., [p_n, e_n]].
+  #
+  #  Prime.prime_division(12) #=> [[2,2], [3,1]]
+  #
+  def prime_division(value, generator= Prime::Generator23.new)
+    raise ZeroDivisionError if value == 0
+    if value < 0
+      value = -value
+      pv = [[-1, 1]]
+    else
+      pv = []
+    end
+    for prime in generator
+      count = 0
+      while (value1, mod = value.divmod(prime)
+	     mod) == 0
+	value = value1
+	count += 1
+      end
+      if count != 0
+	pv.push [prime, count]
+      end
+      break if value1 <= prime
+    end
+    if value > 1
+      pv.push [value, 1]
+    end
+    return pv
+  end
+
+  # An abstract class for enumerating pseudo-prime numbers.
+  #
+  # Concrete subclasses should override succ, next, rewind.
+  class PseudoPrimeGenerator
+    include Enumerable
+
+    def initialize(ubound = nil)
+      @ubound = ubound
+    end
+
+    def upper_bound=(ubound)
+      @ubound = ubound
+    end
+    def upper_bound
+      @ubound
+    end
+
+    # returns the next pseudo-prime number, and move the internal
+    # position forward.
+    #
+    # +PseudoPrimeGenerator+#succ raises +NotImplementedError+.
+    def succ
+      raise NotImplementedError, "need to define `succ'"
+    end
+
+    # alias of +succ+.
+    def next
+      raise NotImplementedError, "need to define `next'"
+    end
+
+    # Rewinds the internal position for enumeration.
+    #
+    # See +Enumerator+#rewind.
+    def rewind
+      raise NotImplementedError, "need to define `rewind'"
+    end
+
+    # Iterates the given block for each prime numbers.
+    def each(&block)
+      return self.dup unless block
+      if @ubound
+	last_value = nil
+	loop do
+	  prime = succ
+	  break last_value if prime > @ubound
+	  last_value = block.call(prime)
+	end
+      else
+	loop do
+	  block.call(succ)
+	end
+      end
+    end
+
+    # see +Enumerator+#with_index.
+    alias with_index each_with_index
+
+    # see +Enumerator+#with_object.
+    def with_object(obj)
+      return enum_for(:with_object) unless block_given?
+      each do |prime|
+	yield prime, obj
+      end
+    end
+  end
+
+  # An implementation of +PseudoPrimeGenerator+.
+  #
+  # Uses +EratosthenesSieve+.
+  class EratosthenesGenerator < PseudoPrimeGenerator
+    def initialize
+      @last_prime = nil
+      super
+    end
+
+    def succ
+      @last_prime = @last_prime ? EratosthenesSieve.instance.next_to(@last_prime) : 2
+    end
+    def rewind
+      initialize
+    end
+    alias next succ
+  end
+
+  # An implementation of +PseudoPrimeGenerator+ which uses
+  # a prime table generated by trial division.
+  class TrialDivisionGenerator<PseudoPrimeGenerator
+    def initialize
+      @index = -1
+      super
+    end
+
+    def succ
+      TrialDivision.instance[@index += 1]
+    end
+    def rewind
+      initialize
+    end
+    alias next succ
+  end
+
+  # Generates all integer which are greater than 2 and
+  # are not divided by 2 nor 3.
+  #
+  # This is a pseudo-prime generator, suitable on
+  # checking primality of a integer by brute force
+  # method.
+  class Generator23<PseudoPrimeGenerator
+    def initialize
+      @prime = 1
+      @step = nil
+      super
+    end
+
+    def succ
+      loop do
+	if (@step)
+	  @prime += @step
+	  @step = 6 - @step
+	else
+	  case @prime
+	  when 1; @prime = 2
+	  when 2; @prime = 3
+	  when 3; @prime = 5; @step = 2
+	  end
+	end
+	return @prime
+      end
+    end
+    alias next succ
+    def rewind
+      initialize
+    end
+  end
+
+
+
+
+  # Internal use. An implementation of prime table by trial division method.
+  class TrialDivision
+    include Singleton
+
+    def initialize # :nodoc:
+      # These are included as class variables to cache them for later uses.  If memory
+      #   usage is a problem, they can be put in Prime#initialize as instance variables.
+
+      # There must be no primes between @primes[-1] and @next_to_check.
+      @primes = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101]
+      # @next_to_check % 6 must be 1.
+      @next_to_check = 103            # @primes[-1] - @primes[-1] % 6 + 7
+      @ulticheck_index = 3            # @primes.index(@primes.reverse.find {|n|
+      #   n < Math.sqrt(@@next_to_check) })
+      @ulticheck_next_squared = 121   # @primes[@ulticheck_index + 1] ** 2
+    end
+
+    # Returns the cached prime numbers.
+    def cache
+      return @primes
+    end
+    alias primes cache
+    alias primes_so_far cache
+
+    # Returns the +index+th prime number.
+    #
+    # +index+ is a 0-based index.
+    def [](index)
+      while index >= @primes.length
+	# Only check for prime factors up to the square root of the potential primes,
+	#   but without the performance hit of an actual square root calculation.
+	if @next_to_check + 4 > @ulticheck_next_squared
+	  @ulticheck_index += 1
+	  @ulticheck_next_squared = @primes.at(@ulticheck_index + 1) ** 2
+	end
+	# Only check numbers congruent to one and five, modulo six. All others
+
+	#   are divisible by two or three.  This also allows us to skip checking against
+	#   two and three.
+	@primes.push @next_to_check if @primes[2..@ulticheck_index].find {|prime| @next_to_check % prime == 0 }.nil?
+	@next_to_check += 4
+	@primes.push @next_to_check if @primes[2..@ulticheck_index].find {|prime| @next_to_check % prime == 0 }.nil?
+	@next_to_check += 2
+      end
+      return @primes[index]
+    end
+  end
+
+  # Internal use. An implementation of eratosthenes's sieve
+  class EratosthenesSieve
+    include Singleton
+
+    BITS_PER_ENTRY = 16  # each entry is a set of 16-bits in a Fixnum
+    NUMS_PER_ENTRY = BITS_PER_ENTRY * 2 # twiced because even numbers are omitted
+    ENTRIES_PER_TABLE = 8
+    NUMS_PER_TABLE = NUMS_PER_ENTRY * ENTRIES_PER_TABLE
+    FILLED_ENTRY = (1 << NUMS_PER_ENTRY) - 1
+
+    def initialize # :nodoc:
+      # bitmap for odd prime numbers less than 256.
+      # For an arbitrary odd number n, @tables[i][j][k] is
+      # * 1 if n is prime,
+      # * 0 if n is composite,
+      # where i,j,k = indices(n)
+      @tables = [[0xcb6e, 0x64b4, 0x129a, 0x816d, 0x4c32, 0x864a, 0x820d, 0x2196].freeze]
+    end
+
+    # returns the least odd prime number which is greater than +n+.
+    def next_to(n)
+      n = (n-1).div(2)*2+3 # the next odd number to given n
+      table_index, integer_index, bit_index = indices(n)
+      loop do
+	extend_table until @tables.length > table_index
+	for j in integer_index...ENTRIES_PER_TABLE
+	  if !@tables[table_index][j].zero?
+	    for k in bit_index...BITS_PER_ENTRY
+	      return NUMS_PER_TABLE*table_index + NUMS_PER_ENTRY*j + 2*k+1 if !@tables[table_index][j][k].zero?
+	    end
+	  end
+	  bit_index = 0
+	end
+	table_index += 1; integer_index = 0
+      end
+    end
+
+    private
+    # for an odd number +n+, returns (i, j, k) such that @tables[i][j][k] represents primarity of the number
+    def indices(n)
+      #   binary digits of n: |0|1|2|3|4|5|6|7|8|9|10|11|....
+      #   indices:            |-|    k  |  j  |     i
+      # because of NUMS_PER_ENTRY, NUMS_PER_TABLE
+
+      k = (n & 0b00011111) >> 1
+      j = (n & 0b11100000) >> 5
+      i = n >> 8
+      return i, j, k
+    end
+
+    def extend_table
+      lbound = NUMS_PER_TABLE * @tables.length
+      ubound = lbound + NUMS_PER_TABLE
+      new_table = [FILLED_ENTRY] * ENTRIES_PER_TABLE # which represents primarity in lbound...ubound
+      (3..Integer(Math.sqrt(ubound))).step(2) do |p|
+	i, j, k = indices(p)
+	next if @tables[i][j][k].zero?
+
+	start = (lbound.div(p)+1)*p  # least multiple of p which is >= lbound
+	start += p if start.even?
+	(start...ubound).step(2*p) do |n|
+	  _, j, k = indices(n)
+	  new_table[j] &= FILLED_ENTRY^(1<<k)
+	end
+      end
+      @tables << new_table.freeze
+    end
+  end
+
+  # Provides a +Prime+ object with compatibility to Ruby 1.8 when instantiated via +Prime+.+new+.
+  module OldCompatibility
+    # Returns the next prime number and forwards internal pointer.
+    def succ
+      @generator.succ
+    end
+    alias next succ
+
+    # Overwrites Prime#each.
+    #
+    # Iterates the given block over all prime numbers. Note that enumeration starts from
+    # the current position of internal pointer, not rewound.
+    def each(&block)
+      return @generator.dup unless block_given?
+      loop do
+	yield succ
+      end
+    end
+  end
+end
diff --git a/lib/profile.rb b/lib/profile.rb
index 104cb205b9..2aeecce908 100644
--- a/lib/profile.rb
+++ b/lib/profile.rb
@@ -1,5 +1,9 @@
 require 'profiler'
 
+RubyVM::InstructionSequence.compile_option = {
+  :trace_instruction => true,
+  :specialized_instruction => false
+}
 END {
   Profiler__::print_profile(STDERR)
 }
diff --git a/lib/profiler.rb b/lib/profiler.rb
index 9762fa1181..a4b8889093 100644
--- a/lib/profiler.rb
+++ b/lib/profiler.rb
@@ -34,7 +34,7 @@ module_function
     total = Process.times[0] - @@start
     if total == 0 then total = 0.01 end
     data = @@map.values
-    data.sort!{|a,b| b[2] <=> a[2]}
+    data = data.sort_by{|x| -x[2]}
     sum = 0
     f.printf "  %%   cumulative   self              self     total\n"
     f.printf " time   seconds   seconds    calls  ms/call  ms/call  name\n"
diff --git a/lib/pstore.rb b/lib/pstore.rb
index 6df64474ab..9fb0249f3c 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -3,59 +3,61 @@
 # pstore.rb -
 #   originally by matz
 #   documentation by Kev Jackson and James Edward Gray II
+#   improved by Hongli Lai
 #
 # See PStore for documentation.
 
 
 require "fileutils"
 require "digest/md5"
+require "thread"
 
 #
-# PStore implements a file based persistance mechanism based on a Hash.  User
+# PStore implements a file based persistence mechanism based on a Hash.  User
 # code can store hierarchies of Ruby objects (values) into the data store file
-# by name (keys).  An object hierarchy may be just a single object.  User code 
+# by name (keys).  An object hierarchy may be just a single object.  User code
 # may later read values back from the data store or even update data, as needed.
-# 
+#
 # The transactional behavior ensures that any changes succeed or fail together.
 # This can be used to ensure that the data store is not left in a transitory
-# state, where some values were upated but others were not.
-# 
-# Behind the scenes, Ruby objects are stored to the data store file with 
-# Marshal.  That carries the usual limitations.  Proc objects cannot be 
+# state, where some values were updated but others were not.
+#
+# Behind the scenes, Ruby objects are stored to the data store file with
+# Marshal.  That carries the usual limitations.  Proc objects cannot be
 # marshalled, for example.
 #
 # == Usage example:
-# 
+#
 #  require "pstore"
-#  
+#
 #  # a mock wiki object...
 #  class WikiPage
 #    def initialize( page_name, author, contents )
 #      @page_name = page_name
 #      @revisions = Array.new
-#      
+#
 #      add_revision(author, contents)
 #    end
-#    
+#
 #    attr_reader :page_name
-#    
+#
 #    def add_revision( author, contents )
 #      @revisions << { :created  => Time.now,
 #                      :author   => author,
 #                      :contents => contents }
 #    end
-#    
+#
 #    def wiki_page_references
 #      [@page_name] + @revisions.last[:contents].scan(/\b(?:[A-Z]+[a-z]+){2,}/)
 #    end
-#    
+#
 #    # ...
 #  end
-#  
+#
 #  # create a new page...
 #  home_page = WikiPage.new( "HomePage", "James Edward Gray II",
 #                            "A page about the JoysOfDocumentation..." )
-#  
+#
 #  # then we want to update page data and the index together, or not at all...
 #  wiki = PStore.new("wiki_pages.pstore")
 #  wiki.transaction do  # begin transaction; do all of this or none of it
@@ -66,9 +68,9 @@ require "digest/md5"
 #    # update wiki index...
 #    wiki[:wiki_index].push(*home_page.wiki_page_references)
 #  end                   # commit changes to wiki data store file
-#  
+#
 #  ### Some time later... ###
-#  
+#
 #  # read wiki data...
 #  wiki.transaction(true) do  # begin read-only transaction, no changes allowed
 #    wiki.roots.each do |data_root_name|
@@ -77,6 +79,20 @@ require "digest/md5"
 #    end
 #  end
 #
+# == Transaction modes
+#
+# By default, file integrity is only ensured as long as the operating system
+# (and the underlying hardware) doesn't raise any unexpected I/O errors. If an
+# I/O error occurs while PStore is writing to its file, then the file will
+# become corrupted.
+#
+# You can prevent this by setting <em>pstore.ultra_safe = true</em>.
+# However, this results in a minor performance loss, and only works on platforms
+# that support atomic file renames. Please consult the documentation for
+# +ultra_safe+ for details.
+#
+# Needless to say, if you're storing valuable data with PStore, then you should
+# backup the PStore files from time to time.
 class PStore
   binmode = defined?(File::BINARY) ? File::BINARY : 0
   RDWR_ACCESS = File::RDWR | File::CREAT | binmode
@@ -87,11 +103,23 @@ class PStore
   class Error < StandardError
   end
 
-  # 
-  # To construct a PStore object, pass in the _file_ path where you would like 
+  # Whether PStore should do its best to prevent file corruptions, even when under
+  # unlikely-to-occur error conditions such as out-of-space conditions and other
+  # unusual OS filesystem errors. Setting this flag comes at the price in the form
+  # of a performance loss.
+  #
+  # This flag only has effect on platforms on which file renames are atomic (e.g.
+  # all POSIX platforms: Linux, MacOS X, FreeBSD, etc). The default value is false.
+  attr_accessor :ultra_safe
+
+  #
+  # To construct a PStore object, pass in the _file_ path where you would like
   # the data to be stored.
-  # 
-  def initialize(file)
+  #
+  # PStore objects are always reentrant. But if _thread_safe_ is set to true,
+  # then it will become thread-safe at the cost of a minor performance hit.
+  #
+  def initialize(file, thread_safe = false)
     dir = File::dirname(file)
     unless File::directory? dir
       raise PStore::Error, format("directory %s does not exist", dir)
@@ -99,19 +127,21 @@ class PStore
     if File::exist? file and not File::readable? file
       raise PStore::Error, format("file %s not readable", file)
     end
-    @transaction = false
     @filename = file
     @abort = false
+    @ultra_safe = false
+    @thread_safe = thread_safe
+    @lock = Mutex.new
   end
 
   # Raises PStore::Error if the calling code is not in a PStore#transaction.
   def in_transaction
-    raise PStore::Error, "not in transaction" unless @transaction
+    raise PStore::Error, "not in transaction" unless @lock.locked?
   end
-  # 
+  #
   # Raises PStore::Error if the calling code is not in a PStore#transaction or
   # if the code is in a read-only PStore#transaction.
-  # 
+  #
   def in_transaction_wr()
     in_transaction()
     raise PStore::Error, "in read-only transaction" if @rdonly
@@ -119,9 +149,9 @@ class PStore
   private :in_transaction, :in_transaction_wr
 
   #
-  # Retrieves a value from the PStore file data, by _name_.  The hierarchy of 
+  # Retrieves a value from the PStore file data, by _name_.  The hierarchy of
   # Ruby objects stored under that root _name_ will be returned.
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction.  It will
   # raise PStore::Error if called at any other time.
   #
@@ -130,22 +160,22 @@ class PStore
     @table[name]
   end
   #
-  # This method is just like PStore#[], save that you may also provide a 
-  # _default_ value for the object.  In the event the specified _name_ is not 
-  # found in the data store, your _default_ will be returned instead.  If you do 
-  # not specify a default, PStore::Error will be raised if the object is not 
+  # This method is just like PStore#[], save that you may also provide a
+  # _default_ value for the object.  In the event the specified _name_ is not
+  # found in the data store, your _default_ will be returned instead.  If you do
+  # not specify a default, PStore::Error will be raised if the object is not
   # found.
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction.  It will
   # raise PStore::Error if called at any other time.
   #
   def fetch(name, default=PStore::Error)
     in_transaction
     unless @table.key? name
-      if default==PStore::Error
-	raise PStore::Error, format("undefined root name `%s'", name)
+      if default == PStore::Error
+        raise PStore::Error, format("undefined root name `%s'", name)
       else
-	return default
+        return default
       end
     end
     @table[name]
@@ -154,11 +184,11 @@ class PStore
   # Stores an individual Ruby object or a hierarchy of Ruby objects in the data
   # store file under the root _name_.  Assigning to a _name_ already in the data
   # store clobbers the old data.
-  # 
+  #
   # == Example:
-  # 
+  #
   #  require "pstore"
-  #  
+  #
   #  store = PStore.new("data_file.pstore")
   #  store.transaction do  # begin transaction
   #    # load some data into the store...
@@ -166,7 +196,7 @@ class PStore
   #    store[:obj_heirarchy] = { "Kev Jackson" => ["rational.rb", "pstore.rb"],
   #                              "James Gray"  => ["erb.rb", "pstore.rb"] }
   #  end                   # commit changes to data store file
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction and it cannot
   # be read-only.  It will raise PStore::Error if called at any other time.
   #
@@ -176,7 +206,7 @@ class PStore
   end
   #
   # Removes an object hierarchy from the data store, by _name_.
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction and it cannot
   # be read-only.  It will raise PStore::Error if called at any other time.
   #
@@ -187,7 +217,7 @@ class PStore
 
   #
   # Returns the names of all object hierarchies currently in the store.
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction.  It will
   # raise PStore::Error if called at any other time.
   #
@@ -197,7 +227,7 @@ class PStore
   end
   #
   # Returns true if the supplied _name_ is currently in the data store.
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction.  It will
   # raise PStore::Error if called at any other time.
   #
@@ -213,22 +243,22 @@ class PStore
   #
   # Ends the current PStore#transaction, committing any changes to the data
   # store immediately.
-  # 
+  #
   # == Example:
-  # 
+  #
   #  require "pstore"
-  #   
+  #
   #  store = PStore.new("data_file.pstore")
   #  store.transaction do  # begin transaction
   #    # load some data into the store...
   #    store[:one] = 1
   #    store[:two] = 2
-  #  
+  #
   #    store.commit        # end transaction here, committing changes
-  #  
+  #
   #    store[:three] = 3   # this change is never reached
   #  end
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction.  It will
   # raise PStore::Error if called at any other time.
   #
@@ -240,21 +270,21 @@ class PStore
   #
   # Ends the current PStore#transaction, discarding any changes to the data
   # store.
-  # 
+  #
   # == Example:
-  # 
+  #
   #  require "pstore"
-  #   
+  #
   #  store = PStore.new("data_file.pstore")
   #  store.transaction do  # begin transaction
   #    store[:one] = 1     # this change is not applied, see below...
   #    store[:two] = 2     # this change is not applied, see below...
-  #  
+  #
   #    store.abort         # end transaction here, discard all changes
-  #  
+  #
   #    store[:three] = 3   # this change is never reached
   #  end
-  # 
+  #
   # *WARNING*:  This method is only valid in a PStore#transaction.  It will
   # raise PStore::Error if called at any other time.
   #
@@ -266,109 +296,216 @@ class PStore
 
   #
   # Opens a new transaction for the data store.  Code executed inside a block
-  # passed to this method may read and write data to and from the data store 
+  # passed to this method may read and write data to and from the data store
   # file.
-  # 
+  #
   # At the end of the block, changes are committed to the data store
-  # automatically.  You may exit the transaction early with a call to either 
+  # automatically.  You may exit the transaction early with a call to either
   # PStore#commit or PStore#abort.  See those methods for details about how
-  # changes are handled.  Raising an uncaught Exception in the block is 
+  # changes are handled.  Raising an uncaught Exception in the block is
   # equivalent to calling PStore#abort.
-  # 
+  #
   # If _read_only_ is set to +true+, you will only be allowed to read from the
   # data store during the transaction and any attempts to change the data will
   # raise a PStore::Error.
-  # 
+  #
   # Note that PStore does not support nested transactions.
   #
-  def transaction(read_only=false)  # :yields:  pstore
-    raise PStore::Error, "nested transaction" if @transaction
-    begin
+  def transaction(read_only = false, &block)  # :yields:  pstore
+    value = nil
+    raise PStore::Error, "nested transaction" if !@thread_safe && @lock.locked?
+    @lock.synchronize do
       @rdonly = read_only
       @abort = false
-      @transaction = true
-      value = nil
-      new_file = @filename + ".new"
+      file = open_and_lock_file(@filename, read_only)
+      if file
+        begin
+          @table, checksum, original_data_size = load_data(file, read_only)
 
-      content = nil
-      unless read_only
-        file = File.open(@filename, RDWR_ACCESS)
-        file.flock(File::LOCK_EX)
-        commit_new(file) if FileTest.exist?(new_file)
-        content = file.read()
+          catch(:pstore_abort_transaction) do
+            value = yield(self)
+          end
+
+          if !@abort && !read_only
+            save_data(checksum, original_data_size, file)
+          end
+        ensure
+          file.close if !file.closed?
+        end
       else
+        # This can only occur if read_only == true.
+        @table = {}
+        catch(:pstore_abort_transaction) do
+          value = yield(self)
+        end
+      end
+    end
+    value
+  rescue ThreadError
+    raise PStore::Error, "nested transaction"
+  end
+
+  private
+  # Constant for relieving Ruby's garbage collector.
+  EMPTY_STRING = ""
+  EMPTY_MARSHAL_DATA = Marshal.dump({})
+  EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
+
+  #
+  # Open the specified filename (either in read-only mode or in
+  # read-write mode) and lock it for reading or writing.
+  #
+  # The opened File object will be returned. If _read_only_ is true,
+  # and the file does not exist, then nil will be returned.
+  #
+  # All exceptions are propagated.
+  #
+  def open_and_lock_file(filename, read_only)
+    if read_only
+      begin
+        file = File.new(filename, RD_ACCESS)
         begin
-          file = File.open(@filename, RD_ACCESS)
           file.flock(File::LOCK_SH)
-          content = (File.open(new_file, RD_ACCESS) {|n| n.read} rescue file.read())
-        rescue Errno::ENOENT
-          content = ""
+          return file
+        rescue
+          file.close
+          raise
         end
+      rescue Errno::ENOENT
+        return nil
       end
+    else
+      file = File.new(filename, RDWR_ACCESS)
+      file.flock(File::LOCK_EX)
+      return file
+    end
+  end
 
-      if content != ""
-	@table = load(content)
-        if !read_only
-          size = content.size
-          md5 = Digest::MD5.digest(content)
+  # Load the given PStore file.
+  # If +read_only+ is true, the unmarshalled Hash will be returned.
+  # If +read_only+ is false, a 3-tuple will be returned: the unmarshalled
+  # Hash, an MD5 checksum of the data, and the size of the data.
+  def load_data(file, read_only)
+    if read_only
+      begin
+        table = load(file)
+        if !table.is_a?(Hash)
+          raise Error, "PStore file seems to be corrupted."
         end
+      rescue EOFError
+        # This seems to be a newly-created file.
+        table = {}
+      end
+      table
+    else
+      data = file.read
+      if data.empty?
+        # This seems to be a newly-created file.
+        table = {}
+        checksum = empty_marshal_checksum
+        size = empty_marshal_data.size
       else
-	@table = {}
+        table = load(data)
+        checksum = Digest::MD5.digest(data)
+        size = data.size
+        if !table.is_a?(Hash)
+          raise Error, "PStore file seems to be corrupted."
+        end
       end
-      content = nil		# unreference huge data
+      data.replace(EMPTY_STRING)
+      [table, checksum, size]
+    end
+  end
 
-      begin
-	catch(:pstore_abort_transaction) do
-	  value = yield(self)
-	end
-      rescue Exception
-	@abort = true
-	raise
-      ensure
-	if !read_only and !@abort
-          tmp_file = @filename + ".tmp"
-	  content = dump(@table)
-	  if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
-            File.open(tmp_file, WR_ACCESS) {|t| t.write(content)}
-            File.rename(tmp_file, new_file)
-            commit_new(file)
-          end
-          content = nil		# unreference huge data
-	end
+  def on_windows?
+    is_windows = RUBY_PLATFORM =~ /mswin/  ||
+                 RUBY_PLATFORM =~ /mingw/  ||
+                 RUBY_PLATFORM =~ /bccwin/ ||
+                 RUBY_PLATFORM =~ /wince/
+    self.class.__send__(:define_method, :on_windows?) do
+      is_windows
+    end
+    is_windows
+  end
+
+  # Check whether Marshal.dump supports the 'canonical' option. This option
+  # makes sure that Marshal.dump always dumps data structures in the same order.
+  # This is important because otherwise, the checksums that we generate may differ.
+  def marshal_dump_supports_canonical_option?
+    begin
+      Marshal.dump(nil, -1, true)
+      result = true
+    rescue
+      result = false
+    end
+    self.class.__send__(:define_method, :marshal_dump_supports_canonical_option?) do
+      result
+    end
+    result
+  end
+
+  def save_data(original_checksum, original_file_size, file)
+    # We only want to save the new data if the size or checksum has changed.
+    # This results in less filesystem calls, which is good for performance.
+    if marshal_dump_supports_canonical_option?
+      new_data = Marshal.dump(@table, -1, true)
+    else
+      new_data = dump(@table)
+    end
+    new_checksum = Digest::MD5.digest(new_data)
+
+    if new_data.size != original_file_size || new_checksum != original_checksum
+      if @ultra_safe && !on_windows?
+        # Windows doesn't support atomic file renames.
+        save_data_with_atomic_file_rename_strategy(new_data, file)
+      else
+        save_data_with_fast_strategy(new_data, file)
       end
+    end
+
+    new_data.replace(EMPTY_STRING)
+  end
+
+  def save_data_with_atomic_file_rename_strategy(data, file)
+    temp_filename = "#{@filename}.tmp.#{Process.pid}.#{rand 1000000}"
+    temp_file = File.new(temp_filename, WR_ACCESS)
+    begin
+      temp_file.flock(File::LOCK_EX)
+      temp_file.write(data)
+      temp_file.flush
+      File.rename(temp_filename, @filename)
+    rescue
+      File.unlink(temp_file) rescue nil
+      raise
     ensure
-      @table = nil
-      @transaction = false
-      file.close if file
+      temp_file.close
     end
-    value
   end
 
-  # This method is just a wrapped around Marshal.dump.
+  def save_data_with_fast_strategy(data, file)
+    file.rewind
+    file.truncate(0)
+    file.write(data)
+  end
+
+
+  # This method is just a wrapped around Marshal.dump
+  # to allow subclass overriding used in YAML::Store.
   def dump(table)  # :nodoc:
     Marshal::dump(table)
   end
 
   # This method is just a wrapped around Marshal.load.
+  # to allow subclass overriding used in YAML::Store.
   def load(content)  # :nodoc:
     Marshal::load(content)
   end
 
-  # This method is just a wrapped around Marshal.load.
-  def load_file(file)  # :nodoc:
-    Marshal::load(file)
+  def empty_marshal_data
+    EMPTY_MARSHAL_DATA
   end
-
-  private
-  # Commits changes to the data store file.
-  def commit_new(f)
-    f.truncate(0)
-    f.rewind
-    new_file = @filename + ".new"
-    File.open(new_file, RD_ACCESS) do |nf|
-      FileUtils.copy_stream(nf, f)
-    end
-    File.unlink(new_file)
+  def empty_marshal_checksum
+    EMPTY_MARSHAL_CHECKSUM
   end
 end
 
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
index a7408dd00a..9b7a76bc58 100644
--- a/lib/racc/parser.rb
+++ b/lib/racc/parser.rb
@@ -31,10 +31,10 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = '1.4.5'
-    Racc_Runtime_Revision = '$originalRevision: 1.8 $'.split[1]
+    Racc_Runtime_Revision = %w$originalRevision: 1.8 $[1]
 
     Racc_Runtime_Core_Version_R = '1.4.5'
-    Racc_Runtime_Core_Revision_R = '$originalRevision: 1.8 $'.split[1]
+    Racc_Runtime_Core_Revision_R = %w$originalRevision: 1.8 $[1]
     begin
       require 'racc/cparse'
     # Racc_Runtime_Core_Version_C  = (defined in extention)
@@ -159,7 +159,6 @@ module Racc
       reduce_n,     use_result,   * = arg
 
       _racc_init_sysvars
-      tok = nil
       act = nil
       i = nil
       nerr = 0
@@ -189,7 +188,7 @@ module Racc
             ;
           end
 
-          while not (i = action_pointer[@racc_state[-1]]) or
+          while not(i = action_pointer[@racc_state[-1]]) or
                 not @racc_read_next or
                 @racc_t == 0   # $
             unless i and i += @racc_t and
@@ -389,7 +388,7 @@ module Racc
         toks.each {|t| out.print ' ', racc_token2str(t) }
       end
       out.puts " --> #{racc_token2str(sim)}"
-          
+
       racc_print_stacks tstack, vstack
       @racc_debug_out.puts
     end
diff --git a/lib/rake.rb b/lib/rake.rb
new file mode 100644
index 0000000000..b46b196878
--- /dev/null
+++ b/lib/rake.rb
@@ -0,0 +1,2485 @@
+#--
+
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008 by Jim Weirich (jim@weirichhouse.org)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#++
+#
+# = Rake -- Ruby Make
+#
+# This is the main file for the Rake application.  Normally it is referenced
+# as a library via a require statement, but it can be distributed
+# independently as an application.
+
+RAKEVERSION = '0.8.7'
+
+require 'rbconfig'
+require 'fileutils'
+require 'singleton'
+require 'monitor'
+require 'optparse'
+require 'ostruct'
+
+require 'rake/win32'
+
+$trace = false
+
+######################################################################
+# Rake extensions to Module.
+#
+class Module
+  # Check for an existing method in the current class before extending.  IF
+  # the method already exists, then a warning is printed and the extension is
+  # not added.  Otherwise the block is yielded and any definitions in the
+  # block will take effect.
+  #
+  # Usage:
+  #
+  #   class String
+  #     rake_extension("xyz") do
+  #       def xyz
+  #         ...
+  #       end
+  #     end
+  #   end
+  #
+  def rake_extension(method)
+    if method_defined?(method)
+      $stderr.puts "WARNING: Possible conflict with Rake extension: #{self}##{method} already exists"
+    else
+      yield
+    end
+  end
+end # module Module
+
+
+######################################################################
+# User defined methods to be added to String.
+#
+class String
+  rake_extension("ext") do
+    # Replace the file extension with +newext+.  If there is no extension on
+    # the string, append the new extension to the end.  If the new extension
+    # is not given, or is the empty string, remove any existing extension.
+    #
+    # +ext+ is a user added method for the String class.
+    def ext(newext='')
+      return self.dup if ['.', '..'].include? self
+      if newext != ''
+        newext = (newext =~ /^\./) ? newext : ("." + newext)
+      end
+      self.chomp(File.extname(self)) << newext
+    end
+  end
+
+  rake_extension("pathmap") do
+    # Explode a path into individual components.  Used by +pathmap+.
+    def pathmap_explode
+      head, tail = File.split(self)
+      return [self] if head == self
+      return [tail] if head == '.' || tail == '/'
+      return [head, tail] if head == '/'
+      return head.pathmap_explode + [tail]
+    end
+    protected :pathmap_explode
+
+    # Extract a partial path from the path.  Include +n+ directories from the
+    # front end (left hand side) if +n+ is positive.  Include |+n+|
+    # directories from the back end (right hand side) if +n+ is negative.
+    def pathmap_partial(n)
+      dirs = File.dirname(self).pathmap_explode
+      partial_dirs =
+        if n > 0
+          dirs[0...n]
+        elsif n < 0
+          dirs.reverse[0...-n].reverse
+        else
+          "."
+        end
+      File.join(partial_dirs)
+    end
+    protected :pathmap_partial
+
+    # Preform the pathmap replacement operations on the given path. The
+    # patterns take the form 'pat1,rep1;pat2,rep2...'.
+    def pathmap_replace(patterns, &block)
+      result = self
+      patterns.split(';').each do |pair|
+        pattern, replacement = pair.split(',')
+        pattern = Regexp.new(pattern)
+        if replacement == '*' && block_given?
+          result = result.sub(pattern, &block)
+        elsif replacement
+          result = result.sub(pattern, replacement)
+        else
+          result = result.sub(pattern, '')
+        end
+      end
+      result
+    end
+    protected :pathmap_replace
+
+    # Map the path according to the given specification.  The specification
+    # controls the details of the mapping.  The following special patterns are
+    # recognized:
+    #
+    # * <b>%p</b> -- The complete path.
+    # * <b>%f</b> -- The base file name of the path, with its file extension,
+    #   but without any directories.
+    # * <b>%n</b> -- The file name of the path without its file extension.
+    # * <b>%d</b> -- The directory list of the path.
+    # * <b>%x</b> -- The file extension of the path.  An empty string if there
+    #   is no extension.
+    # * <b>%X</b> -- Everything *but* the file extension.
+    # * <b>%s</b> -- The alternate file separater if defined, otherwise use
+    #   the standard file separator.
+    # * <b>%%</b> -- A percent sign.
+    #
+    # The %d specifier can also have a numeric prefix (e.g. '%2d'). If the
+    # number is positive, only return (up to) +n+ directories in the path,
+    # starting from the left hand side.  If +n+ is negative, return (up to)
+    # |+n+| directories from the right hand side of the path.
+    #
+    # Examples:
+    #
+    #   'a/b/c/d/file.txt'.pathmap("%2d")   => 'a/b'
+    #   'a/b/c/d/file.txt'.pathmap("%-2d")  => 'c/d'
+    #
+    # Also the %d, %p, %f, %n, %x, and %X operators can take a
+    # pattern/replacement argument to perform simple string substititions on a
+    # particular part of the path.  The pattern and replacement are speparated
+    # by a comma and are enclosed by curly braces.  The replacement spec comes
+    # after the % character but before the operator letter.  (e.g.
+    # "%{old,new}d").  Muliple replacement specs should be separated by
+    # semi-colons (e.g. "%{old,new;src,bin}d").
+    #
+    # Regular expressions may be used for the pattern, and back refs may be
+    # used in the replacement text.  Curly braces, commas and semi-colons are
+    # excluded from both the pattern and replacement text (let's keep parsing
+    # reasonable).
+    #
+    # For example:
+    #
+    #    "src/org/onestepback/proj/A.java".pathmap("%{^src,bin}X.class")
+    #
+    # returns:
+    #
+    #    "bin/org/onestepback/proj/A.class"
+    #
+    # If the replacement text is '*', then a block may be provided to perform
+    # some arbitrary calculation for the replacement.
+    #
+    # For example:
+    #
+    #   "/path/to/file.TXT".pathmap("%X%{.*,*}x") { |ext|
+    #      ext.downcase
+    #   }
+    #
+    # Returns:
+    #
+    #  "/path/to/file.txt"
+    #
+    def pathmap(spec=nil, &block)
+      return self if spec.nil?
+      result = ''
+      spec.scan(/%\{[^}]*\}-?\d*[sdpfnxX%]|%-?\d+d|%.|[^%]+/) do |frag|
+        case frag
+        when '%f'
+          result << File.basename(self)
+        when '%n'
+          result << File.basename(self).ext
+        when '%d'
+          result << File.dirname(self)
+        when '%x'
+          result << File.extname(self)
+        when '%X'
+          result << self.ext
+        when '%p'
+          result << self
+        when '%s'
+          result << (File::ALT_SEPARATOR || File::SEPARATOR)
+        when '%-'
+          # do nothing
+        when '%%'
+          result << "%"
+        when /%(-?\d+)d/
+          result << pathmap_partial($1.to_i)
+        when /^%\{([^}]*)\}(\d*[dpfnxX])/
+          patterns, operator = $1, $2
+          result << pathmap('%' + operator).pathmap_replace(patterns, &block)
+        when /^%/
+          fail ArgumentError, "Unknown pathmap specifier #{frag} in '#{spec}'"
+        else
+          result << frag
+        end
+      end
+      result
+    end
+  end
+end # class String
+
+##############################################################################
+module Rake
+
+  # Errors -----------------------------------------------------------
+
+  # Error indicating an ill-formed task declaration.
+  class TaskArgumentError < ArgumentError
+  end
+
+  # Error indicating a recursion overflow error in task selection.
+  class RuleRecursionOverflowError < StandardError
+    def initialize(*args)
+      super
+      @targets = []
+    end
+
+    def add_target(target)
+      @targets << target
+    end
+
+    def message
+      super + ": [" + @targets.reverse.join(' => ') + "]"
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Rake module singleton methods.
+  #
+  class << self
+    # Current Rake Application
+    def application
+      @application ||= Rake::Application.new
+    end
+
+    # Set the current Rake application object.
+    def application=(app)
+      @application = app
+    end
+
+    # Return the original directory where the Rake application was started.
+    def original_dir
+      application.original_dir
+    end
+
+  end
+
+  ####################################################################
+  # Mixin for creating easily cloned objects.
+  #
+  module Cloneable
+    # Clone an object by making a new object and setting all the instance
+    # variables to the same values.
+    def dup
+      sibling = self.class.new
+      instance_variables.each do |ivar|
+        value = self.instance_variable_get(ivar)
+        new_value = value.clone rescue value
+        sibling.instance_variable_set(ivar, new_value)
+      end
+      sibling.taint if tainted?
+      sibling
+    end
+
+    def clone
+      sibling = dup
+      sibling.freeze if frozen?
+      sibling
+    end
+  end
+
+  ####################################################################
+  # Exit status class for times the system just gives us a nil.
+  class PseudoStatus
+    attr_reader :exitstatus
+    def initialize(code=0)
+      @exitstatus = code
+    end
+    def to_i
+      @exitstatus << 8
+    end
+    def >>(n)
+      to_i >> n
+    end
+    def stopped?
+      false
+    end
+    def exited?
+      true
+    end
+  end
+
+  ####################################################################
+  # TaskAguments manage the arguments passed to a task.
+  #
+  class TaskArguments
+    include Enumerable
+
+    attr_reader :names
+
+    # Create a TaskArgument object with a list of named arguments
+    # (given by :names) and a set of associated values (given by
+    # :values).  :parent is the parent argument object.
+    def initialize(names, values, parent=nil)
+      @names = names
+      @parent = parent
+      @hash = {}
+      names.each_with_index { |name, i|
+        @hash[name.to_sym] = values[i] unless values[i].nil?
+      }
+    end
+
+    # Create a new argument scope using the prerequisite argument
+    # names.
+    def new_scope(names)
+      values = names.collect { |n| self[n] }
+      self.class.new(names, values, self)
+    end
+
+    # Find an argument value by name or index.
+    def [](index)
+      lookup(index.to_sym)
+    end
+
+    # Specify a hash of default values for task arguments. Use the
+    # defaults only if there is no specific value for the given
+    # argument.
+    def with_defaults(defaults)
+      @hash = defaults.merge(@hash)
+    end
+
+    def each(&block)
+      @hash.each(&block)
+    end
+
+    def method_missing(sym, *args, &block)
+      lookup(sym.to_sym)
+    end
+
+    def to_hash
+      @hash
+    end
+
+    def to_s
+      @hash.inspect
+    end
+
+    def inspect
+      to_s
+    end
+
+    protected
+
+    def lookup(name)
+      if @hash.has_key?(name)
+        @hash[name]
+      elsif ENV.has_key?(name.to_s)
+        ENV[name.to_s]
+      elsif ENV.has_key?(name.to_s.upcase)
+        ENV[name.to_s.upcase]
+      elsif @parent
+        @parent.lookup(name)
+      end
+    end
+  end
+
+  EMPTY_TASK_ARGS = TaskArguments.new([], [])
+
+  ####################################################################
+  # InvocationChain tracks the chain of task invocations to detect
+  # circular dependencies.
+  class InvocationChain
+    def initialize(value, tail)
+      @value = value
+      @tail = tail
+    end
+
+    def member?(obj)
+      @value == obj || @tail.member?(obj)
+    end
+
+    def append(value)
+      if member?(value)
+        fail RuntimeError, "Circular dependency detected: #{to_s} => #{value}"
+      end
+      self.class.new(value, self)
+    end
+
+    def to_s
+      "#{prefix}#{@value}"
+    end
+
+    def self.append(value, chain)
+      chain.append(value)
+    end
+
+    private
+
+    def prefix
+      "#{@tail.to_s} => "
+    end
+
+    class EmptyInvocationChain
+      def member?(obj)
+        false
+      end
+      def append(value)
+        InvocationChain.new(value, self)
+      end
+      def to_s
+        "TOP"
+      end
+    end
+
+    EMPTY = EmptyInvocationChain.new
+
+  end # class InvocationChain
+
+end # module Rake
+
+module Rake
+
+  ###########################################################################
+  # A Task is the basic unit of work in a Rakefile.  Tasks have associated
+  # actions (possibly more than one) and a list of prerequisites.  When
+  # invoked, a task will first ensure that all of its prerequisites have an
+  # opportunity to run and then it will execute its own actions.
+  #
+  # Tasks are not usually created directly using the new method, but rather
+  # use the +file+ and +task+ convenience methods.
+  #
+  class Task
+    # List of prerequisites for a task.
+    attr_reader :prerequisites
+
+    # List of actions attached to a task.
+    attr_reader :actions
+
+    # Application owning this task.
+    attr_accessor :application
+
+    # Comment for this task.  Restricted to a single line of no more than 50
+    # characters.
+    attr_reader :comment
+
+    # Full text of the (possibly multi-line) comment.
+    attr_reader :full_comment
+
+    # Array of nested namespaces names used for task lookup by this task.
+    attr_reader :scope
+
+    # Return task name
+    def to_s
+      name
+    end
+
+    def inspect
+      "<#{self.class} #{name} => [#{prerequisites.join(', ')}]>"
+    end
+
+    # List of sources for task.
+    attr_writer :sources
+    def sources
+      @sources ||= []
+    end
+
+    # First source from a rule (nil if no sources)
+    def source
+      @sources.first if defined?(@sources)
+    end
+
+    # Create a task named +task_name+ with no actions or prerequisites. Use
+    # +enhance+ to add actions and prerequisites.
+    def initialize(task_name, app)
+      @name = task_name.to_s
+      @prerequisites = []
+      @actions = []
+      @already_invoked = false
+      @full_comment = nil
+      @comment = nil
+      @lock = Monitor.new
+      @application = app
+      @scope = app.current_scope
+      @arg_names = nil
+    end
+
+    # Enhance a task with prerequisites or actions.  Returns self.
+    def enhance(deps=nil, &block)
+      @prerequisites |= deps if deps
+      @actions << block if block_given?
+      self
+    end
+
+    # Name of the task, including any namespace qualifiers.
+    def name
+      @name.to_s
+    end
+
+    # Name of task with argument list description.
+    def name_with_args # :nodoc:
+      if arg_description
+        "#{name}#{arg_description}"
+      else
+        name
+      end
+    end
+
+    # Argument description (nil if none).
+    def arg_description # :nodoc:
+      @arg_names ? "[#{(arg_names || []).join(',')}]" : nil
+    end
+
+    # Name of arguments for this task.
+    def arg_names
+      @arg_names || []
+    end
+
+    # Reenable the task, allowing its tasks to be executed if the task
+    # is invoked again.
+    def reenable
+      @already_invoked = false
+    end
+
+    # Clear the existing prerequisites and actions of a rake task.
+    def clear
+      clear_prerequisites
+      clear_actions
+      self
+    end
+
+    # Clear the existing prerequisites of a rake task.
+    def clear_prerequisites
+      prerequisites.clear
+      self
+    end
+
+    # Clear the existing actions on a rake task.
+    def clear_actions
+      actions.clear
+      self
+    end
+
+    # Invoke the task if it is needed.  Prerequites are invoked first.
+    def invoke(*args)
+      task_args = TaskArguments.new(arg_names, args)
+      invoke_with_call_chain(task_args, InvocationChain::EMPTY)
+    end
+
+    # Same as invoke, but explicitly pass a call chain to detect
+    # circular dependencies.
+    def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
+      new_chain = InvocationChain.append(self, invocation_chain)
+      @lock.synchronize do
+        if application.options.trace
+          puts "** Invoke #{name} #{format_trace_flags}"
+        end
+        return if @already_invoked
+        @already_invoked = true
+        invoke_prerequisites(task_args, new_chain)
+        execute(task_args) if needed?
+      end
+    end
+    protected :invoke_with_call_chain
+
+    # Invoke all the prerequisites of a task.
+    def invoke_prerequisites(task_args, invocation_chain) # :nodoc:
+      @prerequisites.each { |n|
+        prereq = application[n, @scope]
+        prereq_args = task_args.new_scope(prereq.arg_names)
+        prereq.invoke_with_call_chain(prereq_args, invocation_chain)
+      }
+    end
+
+    # Format the trace flags for display.
+    def format_trace_flags
+      flags = []
+      flags << "first_time" unless @already_invoked
+      flags << "not_needed" unless needed?
+      flags.empty? ? "" : "(" + flags.join(", ") + ")"
+    end
+    private :format_trace_flags
+
+    # Execute the actions associated with this task.
+    def execute(args=nil)
+      args ||= EMPTY_TASK_ARGS
+      if application.options.dryrun
+        puts "** Execute (dry run) #{name}"
+        return
+      end
+      if application.options.trace
+        puts "** Execute #{name}"
+      end
+      application.enhance_with_matching_rule(name) if @actions.empty?
+      @actions.each do |act|
+        case act.arity
+        when 1
+          act.call(self)
+        else
+          act.call(self, args)
+        end
+      end
+    end
+
+    # Is this task needed?
+    def needed?
+      true
+    end
+
+    # Timestamp for this task.  Basic tasks return the current time for their
+    # time stamp.  Other tasks can be more sophisticated.
+    def timestamp
+      @prerequisites.collect { |p| application[p].timestamp }.max || Time.now
+    end
+
+    # Add a description to the task.  The description can consist of an option
+    # argument list (enclosed brackets) and an optional comment.
+    def add_description(description)
+      return if ! description
+      comment = description.strip
+      add_comment(comment) if comment && ! comment.empty?
+    end
+
+    # Writing to the comment attribute is the same as adding a description.
+    def comment=(description)
+      add_description(description)
+    end
+
+    # Add a comment to the task.  If a comment alread exists, separate
+    # the new comment with " / ".
+    def add_comment(comment)
+      if @full_comment
+        @full_comment << " / "
+      else
+        @full_comment = ''
+      end
+      @full_comment << comment
+      if @full_comment =~ /\A([^.]+?\.)( |$)/
+        @comment = $1
+      else
+        @comment = @full_comment
+      end
+    end
+    private :add_comment
+
+    # Set the names of the arguments for this task. +args+ should be
+    # an array of symbols, one for each argument name.
+    def set_arg_names(args)
+      @arg_names = args.map { |a| a.to_sym }
+    end
+
+    # Return a string describing the internal state of a task.  Useful for
+    # debugging.
+    def investigation
+      result = "------------------------------\n"
+      result << "Investigating #{name}\n"
+      result << "class: #{self.class}\n"
+      result <<  "task needed: #{needed?}\n"
+      result <<  "timestamp: #{timestamp}\n"
+      result << "pre-requisites: \n"
+      prereqs = @prerequisites.collect {|name| application[name]}
+      prereqs.sort! {|a,b| a.timestamp <=> b.timestamp}
+      prereqs.each do |p|
+        result << "--#{p.name} (#{p.timestamp})\n"
+      end
+      latest_prereq = @prerequisites.collect{|n| application[n].timestamp}.max
+      result <<  "latest-prerequisite time: #{latest_prereq}\n"
+      result << "................................\n\n"
+      return result
+    end
+
+    # ----------------------------------------------------------------
+    # Rake Module Methods
+    #
+    class << self
+
+      # Clear the task list.  This cause rake to immediately forget all the
+      # tasks that have been assigned.  (Normally used in the unit tests.)
+      def clear
+        Rake.application.clear
+      end
+
+      # List of all defined tasks.
+      def tasks
+        Rake.application.tasks
+      end
+
+      # Return a task with the given name.  If the task is not currently
+      # known, try to synthesize one from the defined rules.  If no rules are
+      # found, but an existing file matches the task name, assume it is a file
+      # task with no dependencies or actions.
+      def [](task_name)
+        Rake.application[task_name]
+      end
+
+      # TRUE if the task name is already defined.
+      def task_defined?(task_name)
+        Rake.application.lookup(task_name) != nil
+      end
+
+      # Define a task given +args+ and an option block.  If a rule with the
+      # given name already exists, the prerequisites and actions are added to
+      # the existing task.  Returns the defined task.
+      def define_task(*args, &block)
+        Rake.application.define_task(self, *args, &block)
+      end
+
+      # Define a rule for synthesizing tasks.
+      def create_rule(*args, &block)
+        Rake.application.create_rule(*args, &block)
+      end
+
+      # Apply the scope to the task name according to the rules for
+      # this kind of task.  Generic tasks will accept the scope as
+      # part of the name.
+      def scope_name(scope, task_name)
+        (scope + [task_name]).join(':')
+      end
+
+    end # class << Rake::Task
+  end # class Rake::Task
+
+
+  ###########################################################################
+  # A FileTask is a task that includes time based dependencies.  If any of a
+  # FileTask's prerequisites have a timestamp that is later than the file
+  # represented by this task, then the file must be rebuilt (using the
+  # supplied actions).
+  #
+  class FileTask < Task
+
+    # Is this file task needed?  Yes if it doesn't exist, or if its time stamp
+    # is out of date.
+    def needed?
+      ! File.exist?(name) || out_of_date?(timestamp)
+    end
+
+    # Time stamp for file task.
+    def timestamp
+      if File.exist?(name)
+        File.mtime(name.to_s)
+      else
+        Rake::EARLY
+      end
+    end
+
+    private
+
+    # Are there any prerequisites with a later time than the given time stamp?
+    def out_of_date?(stamp)
+      @prerequisites.any? { |n| application[n].timestamp > stamp}
+    end
+
+    # ----------------------------------------------------------------
+    # Task class methods.
+    #
+    class << self
+      # Apply the scope to the task name according to the rules for this kind
+      # of task.  File based tasks ignore the scope when creating the name.
+      def scope_name(scope, task_name)
+        task_name
+      end
+    end
+  end # class Rake::FileTask
+
+  ###########################################################################
+  # A FileCreationTask is a file task that when used as a dependency will be
+  # needed if and only if the file has not been created.  Once created, it is
+  # not re-triggered if any of its dependencies are newer, nor does trigger
+  # any rebuilds of tasks that depend on it whenever it is updated.
+  #
+  class FileCreationTask < FileTask
+    # Is this file task needed?  Yes if it doesn't exist.
+    def needed?
+      ! File.exist?(name)
+    end
+
+    # Time stamp for file creation task.  This time stamp is earlier
+    # than any other time stamp.
+    def timestamp
+      Rake::EARLY
+    end
+  end
+
+  ###########################################################################
+  # Same as a regular task, but the immediate prerequisites are done in
+  # parallel using Ruby threads.
+  #
+  class MultiTask < Task
+    private
+    def invoke_prerequisites(args, invocation_chain)
+      threads = @prerequisites.collect { |p|
+        Thread.new(p) { |r| application[r].invoke_with_call_chain(args, invocation_chain) }
+      }
+      threads.each { |t| t.join }
+    end
+  end
+end # module Rake
+
+## ###########################################################################
+# Task Definition Functions ...
+
+# Declare a basic task.
+#
+# Example:
+#   task :clobber => [:clean] do
+#     rm_rf "html"
+#   end
+#
+def task(*args, &block)
+  Rake::Task.define_task(*args, &block)
+end
+
+
+# Declare a file task.
+#
+# Example:
+#   file "config.cfg" => ["config.template"] do
+#     open("config.cfg", "w") do |outfile|
+#       open("config.template") do |infile|
+#         while line = infile.gets
+#           outfile.puts line
+#         end
+#       end
+#     end
+#  end
+#
+def file(*args, &block)
+  Rake::FileTask.define_task(*args, &block)
+end
+
+# Declare a file creation task.
+# (Mainly used for the directory command).
+def file_create(args, &block)
+  Rake::FileCreationTask.define_task(args, &block)
+end
+
+# Declare a set of files tasks to create the given directories on demand.
+#
+# Example:
+#   directory "testdata/doc"
+#
+def directory(dir)
+  Rake.each_dir_parent(dir) do |d|
+    file_create d do |t|
+      mkdir_p t.name if ! File.exist?(t.name)
+    end
+  end
+end
+
+# Declare a task that performs its prerequisites in parallel. Multitasks does
+# *not* guarantee that its prerequisites will execute in any given order
+# (which is obvious when you think about it)
+#
+# Example:
+#   multitask :deploy => [:deploy_gem, :deploy_rdoc]
+#
+def multitask(args, &block)
+  Rake::MultiTask.define_task(args, &block)
+end
+
+# Create a new rake namespace and use it for evaluating the given block.
+# Returns a NameSpace object that can be used to lookup tasks defined in the
+# namespace.
+#
+# E.g.
+#
+#   ns = namespace "nested" do
+#     task :run
+#   end
+#   task_run = ns[:run] # find :run in the given namespace.
+#
+def namespace(name=nil, &block)
+  Rake.application.in_namespace(name, &block)
+end
+
+# Declare a rule for auto-tasks.
+#
+# Example:
+#  rule '.o' => '.c' do |t|
+#    sh %{cc -o #{t.name} #{t.source}}
+#  end
+#
+def rule(*args, &block)
+  Rake::Task.create_rule(*args, &block)
+end
+
+# Describe the next rake task.
+#
+# Example:
+#   desc "Run the Unit Tests"
+#   task :test => [:build]
+#     runtests
+#   end
+#
+def desc(description)
+  Rake.application.last_description = description
+end
+
+# Import the partial Rakefiles +fn+.  Imported files are loaded _after_ the
+# current file is completely loaded.  This allows the import statement to
+# appear anywhere in the importing file, and yet allowing the imported files
+# to depend on objects defined in the importing file.
+#
+# A common use of the import statement is to include files containing
+# dependency declarations.
+#
+# See also the --rakelibdir command line option.
+#
+# Example:
+#   import ".depend", "my_rules"
+#
+def import(*fns)
+  fns.each do |fn|
+    Rake.application.add_import(fn)
+  end
+end
+
+#############################################################################
+# This a FileUtils extension that defines several additional commands to be
+# added to the FileUtils utility functions.
+#
+module FileUtils
+  RUBY_EXT = ((RbConfig::CONFIG['ruby_install_name'] =~ /\.(com|cmd|exe|bat|rb|sh)$/) ?
+    "" :
+    RbConfig::CONFIG['EXEEXT'])
+
+  RUBY = File.join(
+    RbConfig::CONFIG['bindir'],
+    RbConfig::CONFIG['ruby_install_name'] + RUBY_EXT).
+    sub(/.*\s.*/m, '"\&"')
+
+  OPT_TABLE['sh']  = %w(noop verbose)
+  OPT_TABLE['ruby'] = %w(noop verbose)
+
+  # Run the system command +cmd+. If multiple arguments are given the command
+  # is not run with the shell (same semantics as Kernel::exec and
+  # Kernel::system).
+  #
+  # Example:
+  #   sh %{ls -ltr}
+  #
+  #   sh 'ls', 'file with spaces'
+  #
+  #   # check exit status after command runs
+  #   sh %{grep pattern file} do |ok, res|
+  #     if ! ok
+  #       puts "pattern not found (status = #{res.exitstatus})"
+  #     end
+  #   end
+  #
+  def sh(*cmd, &block)
+    options = (Hash === cmd.last) ? cmd.pop : {}
+    unless block_given?
+      show_command = cmd.join(" ")
+      show_command = show_command[0,42] + "..." unless $trace
+      # TODO code application logic heref show_command.length > 45
+      block = lambda { |ok, status|
+        ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
+      }
+    end
+    if RakeFileUtils.verbose_flag == :default
+      options[:verbose] = true
+    else
+      options[:verbose] ||= RakeFileUtils.verbose_flag
+    end
+    options[:noop]    ||= RakeFileUtils.nowrite_flag
+    rake_check_options options, :noop, :verbose
+    rake_output_message cmd.join(" ") if options[:verbose]
+    unless options[:noop]
+      res = rake_system(*cmd)
+      status = $?
+      status = PseudoStatus.new(1) if !res && status.nil?
+      block.call(res, status)
+    end
+  end
+
+  def rake_system(*cmd)
+    system(*cmd)
+  end
+  private :rake_system
+
+  # Run a Ruby interpreter with the given arguments.
+  #
+  # Example:
+  #   ruby %{-pe '$_.upcase!' <README}
+  #
+  def ruby(*args,&block)
+    options = (Hash === args.last) ? args.pop : {}
+    if args.length > 1 then
+      sh(*([RUBY] + args + [options]), &block)
+    else
+      sh("#{RUBY} #{args.first}", options, &block)
+    end
+  end
+
+  LN_SUPPORTED = [true]
+
+  #  Attempt to do a normal file link, but fall back to a copy if the link
+  #  fails.
+  def safe_ln(*args)
+    unless LN_SUPPORTED[0]
+      cp(*args)
+    else
+      begin
+        ln(*args)
+      rescue StandardError, NotImplementedError => ex
+        LN_SUPPORTED[0] = false
+        cp(*args)
+      end
+    end
+  end
+
+  # Split a file path into individual directory names.
+  #
+  # Example:
+  #   split_all("a/b/c") =>  ['a', 'b', 'c']
+  #
+  def split_all(path)
+    head, tail = File.split(path)
+    return [tail] if head == '.' || tail == '/'
+    return [head, tail] if head == '/'
+    return split_all(head) + [tail]
+  end
+end
+
+#############################################################################
+# RakeFileUtils provides a custom version of the FileUtils methods that
+# respond to the <tt>verbose</tt> and <tt>nowrite</tt> commands.
+#
+module RakeFileUtils
+  include FileUtils
+
+  class << self
+    attr_accessor :verbose_flag, :nowrite_flag
+  end
+  RakeFileUtils.verbose_flag = :default
+  RakeFileUtils.nowrite_flag = false
+
+  $fileutils_verbose = true
+  $fileutils_nowrite = false
+
+  FileUtils::OPT_TABLE.each do |name, opts|
+    default_options = []
+    if opts.include?(:verbose) || opts.include?("verbose")
+      default_options << ':verbose => RakeFileUtils.verbose_flag'
+    end
+    if opts.include?(:noop) || opts.include?("noop")
+      default_options << ':noop => RakeFileUtils.nowrite_flag'
+    end
+
+    next if default_options.empty?
+    module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+    def #{name}( *args, &block )
+      super(
+        *rake_merge_option(args,
+          #{default_options.join(', ')}
+          ), &block)
+    end
+    EOS
+  end
+
+  # Get/set the verbose flag controlling output from the FileUtils utilities.
+  # If verbose is true, then the utility method is echoed to standard output.
+  #
+  # Examples:
+  #    verbose              # return the current value of the verbose flag
+  #    verbose(v)           # set the verbose flag to _v_.
+  #    verbose(v) { code }  # Execute code with the verbose flag set temporarily to _v_.
+  #                         # Return to the original value when code is done.
+  def verbose(value=nil)
+    oldvalue = RakeFileUtils.verbose_flag
+    RakeFileUtils.verbose_flag = value unless value.nil?
+    if block_given?
+      begin
+        yield
+      ensure
+        RakeFileUtils.verbose_flag = oldvalue
+      end
+    end
+    RakeFileUtils.verbose_flag
+  end
+
+  # Get/set the nowrite flag controlling output from the FileUtils utilities.
+  # If verbose is true, then the utility method is echoed to standard output.
+  #
+  # Examples:
+  #    nowrite              # return the current value of the nowrite flag
+  #    nowrite(v)           # set the nowrite flag to _v_.
+  #    nowrite(v) { code }  # Execute code with the nowrite flag set temporarily to _v_.
+  #                         # Return to the original value when code is done.
+  def nowrite(value=nil)
+    oldvalue = RakeFileUtils.nowrite_flag
+    RakeFileUtils.nowrite_flag = value unless value.nil?
+    if block_given?
+      begin
+        yield
+      ensure
+        RakeFileUtils.nowrite_flag = oldvalue
+      end
+    end
+    oldvalue
+  end
+
+  # Use this function to prevent protentially destructive ruby code from
+  # running when the :nowrite flag is set.
+  #
+  # Example:
+  #
+  #   when_writing("Building Project") do
+  #     project.build
+  #   end
+  #
+  # The following code will build the project under normal conditions. If the
+  # nowrite(true) flag is set, then the example will print:
+  #      DRYRUN: Building Project
+  # instead of actually building the project.
+  #
+  def when_writing(msg=nil)
+    if RakeFileUtils.nowrite_flag
+      puts "DRYRUN: #{msg}" if msg
+    else
+      yield
+    end
+  end
+
+  # Merge the given options with the default values.
+  def rake_merge_option(args, defaults)
+    if Hash === args.last
+      defaults.update(args.last)
+      args.pop
+    end
+    args.push defaults
+    args
+  end
+  private :rake_merge_option
+
+  # Send the message to the default rake output (which is $stderr).
+  def rake_output_message(message)
+    $stderr.puts(message)
+  end
+  private :rake_output_message
+
+  # Check that the options do not contain options not listed in +optdecl+.  An
+  # ArgumentError exception is thrown if non-declared options are found.
+  def rake_check_options(options, *optdecl)
+    h = options.dup
+    optdecl.each do |name|
+      h.delete name
+    end
+    raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
+  end
+  private :rake_check_options
+
+  extend self
+end
+
+#############################################################################
+# Include the FileUtils file manipulation functions in the top level module,
+# but mark them private so that they don't unintentionally define methods on
+# other objects.
+
+include RakeFileUtils
+private(*FileUtils.instance_methods(false))
+private(*RakeFileUtils.instance_methods(false))
+
+######################################################################
+module Rake
+
+  ###########################################################################
+  # A FileList is essentially an array with a few helper methods defined to
+  # make file manipulation a bit easier.
+  #
+  # FileLists are lazy.  When given a list of glob patterns for possible files
+  # to be included in the file list, instead of searching the file structures
+  # to find the files, a FileList holds the pattern for latter use.
+  #
+  # This allows us to define a number of FileList to match any number of
+  # files, but only search out the actual files when then FileList itself is
+  # actually used.  The key is that the first time an element of the
+  # FileList/Array is requested, the pending patterns are resolved into a real
+  # list of file names.
+  #
+  class FileList
+
+    include Cloneable
+
+    # == Method Delegation
+    #
+    # The lazy evaluation magic of FileLists happens by implementing all the
+    # array specific methods to call +resolve+ before delegating the heavy
+    # lifting to an embedded array object (@items).
+    #
+    # In addition, there are two kinds of delegation calls.  The regular kind
+    # delegates to the @items array and returns the result directly.  Well,
+    # almost directly.  It checks if the returned value is the @items object
+    # itself, and if so will return the FileList object instead.
+    #
+    # The second kind of delegation call is used in methods that normally
+    # return a new Array object.  We want to capture the return value of these
+    # methods and wrap them in a new FileList object.  We enumerate these
+    # methods in the +SPECIAL_RETURN+ list below.
+
+    # List of array methods (that are not in +Object+) that need to be
+    # delegated.
+    ARRAY_METHODS = (Array.instance_methods - (Object.instance_methods - [:<=>])).map { |n| n.to_s }
+
+    # List of additional methods that must be delegated.
+    MUST_DEFINE = %w[to_a inspect]
+
+    # List of methods that should not be delegated here (we define special
+    # versions of them explicitly below).
+    MUST_NOT_DEFINE = %w[to_a to_ary partition *]
+
+    # List of delegated methods that return new array values which need
+    # wrapping.
+    SPECIAL_RETURN = %w[
+      map collect sort sort_by select find_all reject grep
+      compact flatten uniq values_at
+      + - & |
+    ]
+
+    DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).collect{ |s| s.to_s }.sort.uniq
+
+    # Now do the delegation.
+    DELEGATING_METHODS.each_with_index do |sym, i|
+      if SPECIAL_RETURN.include?(sym)
+        define_method(sym) do |*args, &block|
+          resolve
+          result = @items.send(sym, *args, &block)
+          FileList.new.import(result)
+        end
+      else
+        define_method(sym) do |*args, &block|
+          resolve
+          result = @items.send(sym, *args, &block)
+          result.object_id == @items.object_id ? self : result
+        end
+      end
+    end
+
+    # Create a file list from the globbable patterns given.  If you wish to
+    # perform multiple includes or excludes at object build time, use the
+    # "yield self" pattern.
+    #
+    # Example:
+    #   file_list = FileList.new('lib/**/*.rb', 'test/test*.rb')
+    #
+    #   pkg_files = FileList.new('lib/**/*') do |fl|
+    #     fl.exclude(/\bCVS\b/)
+    #   end
+    #
+    def initialize(*patterns)
+      @pending_add = []
+      @pending = false
+      @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
+      @exclude_procs = DEFAULT_IGNORE_PROCS.dup
+      @exclude_re = nil
+      @items = []
+      patterns.each { |pattern| include(pattern) }
+      yield self if block_given?
+    end
+
+    # Add file names defined by glob patterns to the file list.  If an array
+    # is given, add each element of the array.
+    #
+    # Example:
+    #   file_list.include("*.java", "*.cfg")
+    #   file_list.include %w( math.c lib.h *.o )
+    #
+    def include(*filenames)
+      # TODO: check for pending
+      filenames.each do |fn|
+        if fn.respond_to? :to_ary
+          include(*fn.to_ary)
+        else
+          @pending_add << fn
+        end
+      end
+      @pending = true
+      self
+    end
+    alias :add :include
+
+    # Register a list of file name patterns that should be excluded from the
+    # list.  Patterns may be regular expressions, glob patterns or regular
+    # strings.  In addition, a block given to exclude will remove entries that
+    # return true when given to the block.
+    #
+    # Note that glob patterns are expanded against the file system. If a file
+    # is explicitly added to a file list, but does not exist in the file
+    # system, then an glob pattern in the exclude list will not exclude the
+    # file.
+    #
+    # Examples:
+    #   FileList['a.c', 'b.c'].exclude("a.c") => ['b.c']
+    #   FileList['a.c', 'b.c'].exclude(/^a/)  => ['b.c']
+    #
+    # If "a.c" is a file, then ...
+    #   FileList['a.c', 'b.c'].exclude("a.*") => ['b.c']
+    #
+    # If "a.c" is not a file, then ...
+    #   FileList['a.c', 'b.c'].exclude("a.*") => ['a.c', 'b.c']
+    #
+    def exclude(*patterns, &block)
+      patterns.each do |pat|
+        @exclude_patterns << pat
+      end
+      if block_given?
+        @exclude_procs << block
+      end
+      resolve_exclude if ! @pending
+      self
+    end
+
+
+    # Clear all the exclude patterns so that we exclude nothing.
+    def clear_exclude
+      @exclude_patterns = []
+      @exclude_procs = []
+      calculate_exclude_regexp if ! @pending
+      self
+    end
+
+    # Define equality.
+    def ==(array)
+      to_ary == array
+    end
+
+    # Return the internal array object.
+    def to_a
+      resolve
+      @items
+    end
+
+    # Return the internal array object.
+    def to_ary
+      to_a
+    end
+
+    # Lie about our class.
+    def is_a?(klass)
+      klass == Array || super(klass)
+    end
+    alias kind_of? is_a?
+
+    # Redefine * to return either a string or a new file list.
+    def *(other)
+      result = @items * other
+      case result
+      when Array
+        FileList.new.import(result)
+      else
+        result
+      end
+    end
+
+    # Resolve all the pending adds now.
+    def resolve
+      if @pending
+        @pending = false
+        @pending_add.each do |fn| resolve_add(fn) end
+        @pending_add = []
+        resolve_exclude
+      end
+      self
+    end
+
+    def calculate_exclude_regexp
+      ignores = []
+      @exclude_patterns.each do |pat|
+        case pat
+        when Regexp
+          ignores << pat
+        when /[*?]/
+          Dir[pat].each do |p| ignores << p end
+        else
+          ignores << Regexp.quote(pat)
+        end
+      end
+      if ignores.empty?
+        @exclude_re = /^$/
+      else
+        re_str = ignores.collect { |p| "(" + p.to_s + ")" }.join("|")
+        @exclude_re = Regexp.new(re_str)
+      end
+    end
+
+    def resolve_add(fn)
+      case fn
+      when %r{[*?\[\{]}
+        add_matching(fn)
+      else
+        self << fn
+      end
+    end
+    private :resolve_add
+
+    def resolve_exclude
+      calculate_exclude_regexp
+      reject! { |fn| exclude?(fn) }
+      self
+    end
+    private :resolve_exclude
+
+    # Return a new FileList with the results of running +sub+ against each
+    # element of the oringal list.
+    #
+    # Example:
+    #   FileList['a.c', 'b.c'].sub(/\.c$/, '.o')  => ['a.o', 'b.o']
+    #
+    def sub(pat, rep)
+      inject(FileList.new) { |res, fn| res << fn.sub(pat,rep) }
+    end
+
+    # Return a new FileList with the results of running +gsub+ against each
+    # element of the original list.
+    #
+    # Example:
+    #   FileList['lib/test/file', 'x/y'].gsub(/\//, "\\")
+    #      => ['lib\\test\\file', 'x\\y']
+    #
+    def gsub(pat, rep)
+      inject(FileList.new) { |res, fn| res << fn.gsub(pat,rep) }
+    end
+
+    # Same as +sub+ except that the oringal file list is modified.
+    def sub!(pat, rep)
+      each_with_index { |fn, i| self[i] = fn.sub(pat,rep) }
+      self
+    end
+
+    # Same as +gsub+ except that the original file list is modified.
+    def gsub!(pat, rep)
+      each_with_index { |fn, i| self[i] = fn.gsub(pat,rep) }
+      self
+    end
+
+    # Apply the pathmap spec to each of the included file names, returning a
+    # new file list with the modified paths.  (See String#pathmap for
+    # details.)
+    def pathmap(spec=nil)
+      collect { |fn| fn.pathmap(spec) }
+    end
+
+    # Return a new FileList with <tt>String#ext</tt> method applied
+    # to each member of the array.
+    #
+    # This method is a shortcut for:
+    #
+    #    array.collect { |item| item.ext(newext) }
+    #
+    # +ext+ is a user added method for the Array class.
+    def ext(newext='')
+      collect { |fn| fn.ext(newext) }
+    end
+
+
+    # Grep each of the files in the filelist using the given pattern. If a
+    # block is given, call the block on each matching line, passing the file
+    # name, line number, and the matching line of text.  If no block is given,
+    # a standard emac style file:linenumber:line message will be printed to
+    # standard out.
+    def egrep(pattern, *options)
+      each do |fn|
+        open(fn, "rb", *options) do |inf|
+          count = 0
+          inf.each do |line|
+            count += 1
+            if pattern.match(line)
+              if block_given?
+                yield fn, count, line
+              else
+                puts "#{fn}:#{count}:#{line}"
+              end
+            end
+          end
+        end
+      end
+    end
+
+    # Return a new file list that only contains file names from the current
+    # file list that exist on the file system.
+    def existing
+      select { |fn| File.exist?(fn) }
+    end
+
+    # Modify the current file list so that it contains only file name that
+    # exist on the file system.
+    def existing!
+      resolve
+      @items = @items.select { |fn| File.exist?(fn) }
+      self
+    end
+
+    # FileList version of partition.  Needed because the nested arrays should
+    # be FileLists in this version.
+    def partition(&block)       # :nodoc:
+      resolve
+      result = @items.partition(&block)
+      [
+        FileList.new.import(result[0]),
+        FileList.new.import(result[1]),
+      ]
+    end
+
+    # Convert a FileList to a string by joining all elements with a space.
+    def to_s
+      resolve
+      self.join(' ')
+    end
+
+    # Add matching glob patterns.
+    def add_matching(pattern)
+      Dir[pattern].each do |fn|
+        self << fn unless exclude?(fn)
+      end
+    end
+    private :add_matching
+
+    # Should the given file name be excluded?
+    def exclude?(fn)
+      calculate_exclude_regexp unless @exclude_re
+      fn =~ @exclude_re || @exclude_procs.any? { |p| p.call(fn) }
+    end
+
+    DEFAULT_IGNORE_PATTERNS = [
+      /(^|[\/\\])CVS([\/\\]|$)/,
+      /(^|[\/\\])\.svn([\/\\]|$)/,
+      /\.bak$/,
+      /~$/
+    ]
+    DEFAULT_IGNORE_PROCS = [
+      proc { |fn| fn =~ /(^|[\/\\])core$/ && ! File.directory?(fn) }
+    ]
+#    @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
+
+    def import(array)
+      @items = array
+      self
+    end
+
+    class << self
+      # Create a new file list including the files listed. Similar to:
+      #
+      #   FileList.new(*args)
+      def [](*args)
+        new(*args)
+      end
+    end
+  end # FileList
+end
+
+module Rake
+  class << self
+
+    # Yield each file or directory component.
+    def each_dir_parent(dir)    # :nodoc:
+      old_length = nil
+      while dir != '.' && dir.length != old_length
+        yield(dir)
+        old_length = dir.length
+        dir = File.dirname(dir)
+      end
+    end
+  end
+end # module Rake
+
+# Alias FileList to be available at the top level.
+FileList = Rake::FileList
+
+#############################################################################
+module Rake
+
+  # Default Rakefile loader used by +import+.
+  class DefaultLoader
+    def load(fn)
+      Kernel.load(File.expand_path(fn))
+    end
+  end
+
+  # EarlyTime is a fake timestamp that occurs _before_ any other time value.
+  class EarlyTime
+    include Comparable
+    include Singleton
+
+    def <=>(other)
+      -1
+    end
+
+    def to_s
+      "<EARLY TIME>"
+    end
+  end
+
+  EARLY = EarlyTime.instance
+end # module Rake
+
+#############################################################################
+# Extensions to time to allow comparisons with an early time class.
+#
+class Time
+  alias rake_original_time_compare :<=>
+  def <=>(other)
+    if Rake::EarlyTime === other
+      - other.<=>(self)
+    else
+      rake_original_time_compare(other)
+    end
+  end
+end # class Time
+
+module Rake
+
+  ####################################################################
+  # The NameSpace class will lookup task names in the the scope
+  # defined by a +namespace+ command.
+  #
+  class NameSpace
+
+    # Create a namespace lookup object using the given task manager
+    # and the list of scopes.
+    def initialize(task_manager, scope_list)
+      @task_manager = task_manager
+      @scope = scope_list.dup
+    end
+
+    # Lookup a task named +name+ in the namespace.
+    def [](name)
+      @task_manager.lookup(name, @scope)
+    end
+
+    # Return the list of tasks defined in this and nested namespaces.
+    def tasks
+      @task_manager.tasks_in_scope(@scope)
+    end
+  end # NameSpace
+
+
+  ####################################################################
+  # The TaskManager module is a mixin for managing tasks.
+  module TaskManager
+    # Track the last comment made in the Rakefile.
+    attr_accessor :last_description
+    alias :last_comment :last_description    # Backwards compatibility
+
+    def initialize
+      super
+      @tasks = Hash.new
+      @rules = Array.new
+      @scope = Array.new
+      @last_description = nil
+    end
+
+    def create_rule(*args, &block)
+      pattern, arg_names, deps = resolve_args(args)
+      pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
+      @rules << [pattern, deps, block]
+    end
+
+    def define_task(task_class, *args, &block)
+      task_name, arg_names, deps = resolve_args(args)
+      task_name = task_class.scope_name(@scope, task_name)
+      deps = [deps] unless deps.respond_to?(:to_ary)
+      deps = deps.collect {|d| d.to_s }
+      task = intern(task_class, task_name)
+      task.set_arg_names(arg_names) unless arg_names.empty?
+      task.add_description(@last_description)
+      @last_description = nil
+      task.enhance(deps, &block)
+      task
+    end
+
+    # Lookup a task.  Return an existing task if found, otherwise
+    # create a task of the current type.
+    def intern(task_class, task_name)
+      @tasks[task_name.to_s] ||= task_class.new(task_name, self)
+    end
+
+    # Find a matching task for +task_name+.
+    def [](task_name, scopes=nil)
+      task_name = task_name.to_s
+      self.lookup(task_name, scopes) or
+        enhance_with_matching_rule(task_name) or
+        synthesize_file_task(task_name) or
+        fail "Don't know how to build task '#{task_name}'"
+    end
+
+    def synthesize_file_task(task_name)
+      return nil unless File.exist?(task_name)
+      define_task(Rake::FileTask, task_name)
+    end
+
+    # Resolve the arguments for a task/rule.  Returns a triplet of
+    # [task_name, arg_name_list, prerequisites].
+    def resolve_args(args)
+      if args.last.is_a?(Hash)
+        deps = args.pop
+        resolve_args_with_dependencies(args, deps)
+      else
+        resolve_args_without_dependencies(args)
+      end
+    end
+
+    # Resolve task arguments for a task or rule when there are no
+    # dependencies declared.
+    #
+    # The patterns recognized by this argument resolving function are:
+    #
+    #   task :t
+    #   task :t, [:a]
+    #   task :t, :a                 (deprecated)
+    #
+    def resolve_args_without_dependencies(args)
+      task_name = args.shift
+      if args.size == 1 && args.first.respond_to?(:to_ary)
+        arg_names = args.first.to_ary
+      else
+        arg_names = args
+      end
+      [task_name, arg_names, []]
+    end
+    private :resolve_args_without_dependencies
+
+    # Resolve task arguments for a task or rule when there are
+    # dependencies declared.
+    #
+    # The patterns recognized by this argument resolving function are:
+    #
+    #   task :t => [:d]
+    #   task :t, [a] => [:d]
+    #   task :t, :needs => [:d]                 (deprecated)
+    #   task :t, :a, :needs => [:d]             (deprecated)
+    #
+    def resolve_args_with_dependencies(args, hash) # :nodoc:
+      fail "Task Argument Error" if hash.size != 1
+      key, value = hash.map { |k, v| [k,v] }.first
+      if args.empty?
+        task_name = key
+        arg_names = []
+        deps = value
+      elsif key == :needs
+        task_name = args.shift
+        arg_names = args
+        deps = value
+      else
+        task_name = args.shift
+        arg_names = key
+        deps = value
+      end
+      deps = [deps] unless deps.respond_to?(:to_ary)
+      [task_name, arg_names, deps]
+    end
+    private :resolve_args_with_dependencies
+
+    # If a rule can be found that matches the task name, enhance the
+    # task with the prerequisites and actions from the rule.  Set the
+    # source attribute of the task appropriately for the rule.  Return
+    # the enhanced task or nil of no rule was found.
+    def enhance_with_matching_rule(task_name, level=0)
+      fail Rake::RuleRecursionOverflowError,
+        "Rule Recursion Too Deep" if level >= 16
+      @rules.each do |pattern, extensions, block|
+        if md = pattern.match(task_name)
+          task = attempt_rule(task_name, extensions, block, level)
+          return task if task
+        end
+      end
+      nil
+    rescue Rake::RuleRecursionOverflowError => ex
+      ex.add_target(task_name)
+      fail ex
+    end
+
+    # List of all defined tasks in this application.
+    def tasks
+      @tasks.values.sort_by { |t| t.name }
+    end
+
+    # List of all the tasks defined in the given scope (and its
+    # sub-scopes).
+    def tasks_in_scope(scope)
+      prefix = scope.join(":")
+      tasks.select { |t|
+        /^#{prefix}:/ =~ t.name
+      }
+    end
+
+    # Clear all tasks in this application.
+    def clear
+      @tasks.clear
+      @rules.clear
+    end
+
+    # Lookup a task, using scope and the scope hints in the task name.
+    # This method performs straight lookups without trying to
+    # synthesize file tasks or rules.  Special scope names (e.g. '^')
+    # are recognized.  If no scope argument is supplied, use the
+    # current scope.  Return nil if the task cannot be found.
+    def lookup(task_name, initial_scope=nil)
+      initial_scope ||= @scope
+      task_name = task_name.to_s
+      if task_name =~ /^rake:/
+        scopes = []
+        task_name = task_name.sub(/^rake:/, '')
+      elsif task_name =~ /^(\^+)/
+        scopes = initial_scope[0, initial_scope.size - $1.size]
+        task_name = task_name.sub(/^(\^+)/, '')
+      else
+        scopes = initial_scope
+      end
+      lookup_in_scope(task_name, scopes)
+    end
+
+    # Lookup the task name
+    def lookup_in_scope(name, scope)
+      n = scope.size
+      while n >= 0
+        tn = (scope[0,n] + [name]).join(':')
+        task = @tasks[tn]
+        return task if task
+        n -= 1
+      end
+      nil
+    end
+    private :lookup_in_scope
+
+    # Return the list of scope names currently active in the task
+    # manager.
+    def current_scope
+      @scope.dup
+    end
+
+    # Evaluate the block in a nested namespace named +name+.  Create
+    # an anonymous namespace if +name+ is nil.
+    def in_namespace(name)
+      name ||= generate_name
+      @scope.push(name)
+      ns = NameSpace.new(self, @scope)
+      yield(ns)
+      ns
+    ensure
+      @scope.pop
+    end
+
+    private
+
+    # Generate an anonymous namespace name.
+    def generate_name
+      @seed ||= 0
+      @seed += 1
+      "_anon_#{@seed}"
+    end
+
+    def trace_rule(level, message)
+      puts "#{"    "*level}#{message}" if Rake.application.options.trace_rules
+    end
+
+    # Attempt to create a rule given the list of prerequisites.
+    def attempt_rule(task_name, extensions, block, level)
+      sources = make_sources(task_name, extensions)
+      prereqs = sources.collect { |source|
+        trace_rule level, "Attempting Rule #{task_name} => #{source}"
+        if File.exist?(source) || Rake::Task.task_defined?(source)
+          trace_rule level, "(#{task_name} => #{source} ... EXIST)"
+          source
+        elsif parent = enhance_with_matching_rule(source, level+1)
+          trace_rule level, "(#{task_name} => #{source} ... ENHANCE)"
+          parent.name
+        else
+          trace_rule level, "(#{task_name} => #{source} ... FAIL)"
+          return nil
+        end
+      }
+      task = FileTask.define_task({task_name => prereqs}, &block)
+      task.sources = prereqs
+      task
+    end
+
+    # Make a list of sources from the list of file name extensions /
+    # translation procs.
+    def make_sources(task_name, extensions)
+      extensions.collect { |ext|
+        case ext
+        when /%/
+          task_name.pathmap(ext)
+        when %r{/}
+          ext
+        when /^\./
+          task_name.ext(ext)
+        when String
+          ext
+        when Proc
+          if ext.arity == 1
+            ext.call(task_name)
+          else
+            ext.call
+          end
+        else
+          fail "Don't know how to handle rule dependent: #{ext.inspect}"
+        end
+      }.flatten
+    end
+
+  end # TaskManager
+
+  ######################################################################
+  # Rake main application object.  When invoking +rake+ from the
+  # command line, a Rake::Application object is created and run.
+  #
+  class Application
+    include TaskManager
+
+    # The name of the application (typically 'rake')
+    attr_reader :name
+
+    # The original directory where rake was invoked.
+    attr_reader :original_dir
+
+    # Name of the actual rakefile used.
+    attr_reader :rakefile
+
+    # List of the top level task names (task names from the command line).
+    attr_reader :top_level_tasks
+
+    DEFAULT_RAKEFILES = ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb'].freeze
+
+    # Initialize a Rake::Application object.
+    def initialize
+      super
+      @name = 'rake'
+      @rakefiles = DEFAULT_RAKEFILES.dup
+      @rakefile = nil
+      @pending_imports = []
+      @imported = []
+      @loaders = {}
+      @default_loader = Rake::DefaultLoader.new
+      @original_dir = Dir.pwd
+      @top_level_tasks = []
+      add_loader('rb', DefaultLoader.new)
+      add_loader('rf', DefaultLoader.new)
+      add_loader('rake', DefaultLoader.new)
+      @tty_output = STDOUT.tty?
+    end
+
+    # Run the Rake application.  The run method performs the following three steps:
+    #
+    # * Initialize the command line options (+init+).
+    # * Define the tasks (+load_rakefile+).
+    # * Run the top level tasks (+run_tasks+).
+    #
+    # If you wish to build a custom rake command, you should call +init+ on your
+    # application.  The define any tasks.  Finally, call +top_level+ to run your top
+    # level tasks.
+    def run
+      init
+      load_rakefile
+      top_level
+    end
+
+    # Initialize the command line parameters and app name.
+    def init(app_name='rake')
+      standard_exception_handling do
+        @name = app_name
+        handle_options
+        collect_tasks
+      end
+    end
+
+    # Find the rakefile and then load it and any pending imports.
+    def load_rakefile
+      standard_exception_handling do
+        raw_load_rakefile
+      end
+    end
+
+    # Run the top level tasks of a Rake application.
+    def top_level
+      standard_exception_handling do
+        if options.show_tasks
+          display_tasks_and_comments
+        elsif options.show_prereqs
+          display_prerequisites
+        else
+          top_level_tasks.each { |task_name| invoke_task(task_name) }
+        end
+      end
+    end
+
+    # Add a loader to handle imported files ending in the extension
+    # +ext+.
+    def add_loader(ext, loader)
+      ext = ".#{ext}" unless ext =~ /^\./
+      @loaders[ext] = loader
+    end
+
+    # Application options from the command line
+    def options
+      @options ||= OpenStruct.new
+    end
+
+    # private ----------------------------------------------------------------
+
+    def invoke_task(task_string)
+      name, args = parse_task_string(task_string)
+      t = self[name]
+      t.invoke(*args)
+    end
+
+    def parse_task_string(string)
+      if string =~ /^([^\[]+)(\[(.*)\])$/
+        name = $1
+        args = $3.split(/\s*,\s*/)
+      else
+        name = string
+        args = []
+      end
+      [name, args]
+    end
+
+    # Provide standard execption handling for the given block.
+    def standard_exception_handling
+      begin
+        yield
+      rescue SystemExit => ex
+        # Exit silently with current status
+        raise
+      rescue OptionParser::InvalidOption => ex
+        # Exit silently
+        exit(false)
+      rescue Exception => ex
+        # Exit with error message
+        $stderr.puts "#{name} aborted!"
+        $stderr.puts ex.message
+        if options.trace or true
+          $stderr.puts ex.backtrace.join("\n")
+        else
+          $stderr.puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
+          $stderr.puts "(See full trace by running task with --trace)"
+        end
+        exit(false)
+      end
+    end
+
+    # True if one of the files in RAKEFILES is in the current directory.
+    # If a match is found, it is copied into @rakefile.
+    def have_rakefile
+      @rakefiles.each do |fn|
+        if File.exist?(fn)
+          others = Dir.glob(fn, File::FNM_CASEFOLD)
+          return others.size == 1 ? others.first : fn
+        elsif fn == ''
+          return fn
+        end
+      end
+      return nil
+    end
+
+    # True if we are outputting to TTY, false otherwise
+    def tty_output?
+      @tty_output
+    end
+
+    # Override the detected TTY output state (mostly for testing)
+    def tty_output=( tty_output_state )
+      @tty_output = tty_output_state
+    end
+
+    # We will truncate output if we are outputting to a TTY or if we've been
+    # given an explicit column width to honor
+    def truncate_output?
+      tty_output? || ENV['RAKE_COLUMNS']
+    end
+
+    # Display the tasks and comments.
+    def display_tasks_and_comments
+      displayable_tasks = tasks.select { |t|
+        t.comment && t.name =~ options.show_task_pattern
+      }
+      if options.full_description
+        displayable_tasks.each do |t|
+          puts "#{name} #{t.name_with_args}"
+          t.full_comment.split("\n").each do |line|
+            puts "    #{line}"
+          end
+          puts
+        end
+      else
+        width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
+        max_column = truncate_output? ? terminal_width - name.size - width - 7 : nil
+        displayable_tasks.each do |t|
+          printf "#{name} %-#{width}s  # %s\n",
+            t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
+        end
+      end
+    end
+
+    def terminal_width
+      if ENV['RAKE_COLUMNS']
+        result = ENV['RAKE_COLUMNS'].to_i
+      else
+        result = unix? ? dynamic_width : 80
+      end
+      (result < 10) ? 80 : result
+    rescue
+      80
+    end
+
+    # Calculate the dynamic width of the
+    def dynamic_width
+      @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
+    end
+
+    def dynamic_width_stty
+      %x{stty size 2>/dev/null}.split[1].to_i
+    end
+
+    def dynamic_width_tput
+      %x{tput cols 2>/dev/null}.to_i
+    end
+
+    def unix?
+      RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
+    end
+
+    def windows?
+      Win32.windows?
+    end
+
+    def truncate(string, width)
+      if string.length <= width
+        string
+      else
+        ( string[0, width-3] || "" ) + "..."
+      end
+    end
+
+    # Display the tasks and prerequisites
+    def display_prerequisites
+      tasks.each do |t|
+        puts "#{name} #{t.name}"
+        t.prerequisites.each { |pre| puts "    #{pre}" }
+      end
+    end
+
+    # A list of all the standard options used in rake, suitable for
+    # passing to OptionParser.
+    def standard_rake_options
+      [
+        ['--classic-namespace', '-C', "Put Task and FileTask in the top level namespace",
+          lambda { |value|
+            require 'rake/classic_namespace'
+            options.classic_namespace = true
+          }
+        ],
+        ['--describe', '-D [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
+          lambda { |value|
+            options.show_tasks = true
+            options.full_description = true
+            options.show_task_pattern = Regexp.new(value || '')
+          }
+        ],
+        ['--dry-run', '-n', "Do a dry run without executing actions.",
+          lambda { |value|
+            verbose(true)
+            nowrite(true)
+            options.dryrun = true
+            options.trace = true
+          }
+        ],
+        ['--execute',  '-e CODE', "Execute some Ruby code and exit.",
+          lambda { |value|
+            eval(value)
+            exit
+          }
+        ],
+        ['--execute-print',  '-p CODE', "Execute some Ruby code, print the result, then exit.",
+          lambda { |value|
+            puts eval(value)
+            exit
+          }
+        ],
+        ['--execute-continue',  '-E CODE',
+          "Execute some Ruby code, then continue with normal task processing.",
+          lambda { |value| eval(value) }
+        ],
+        ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
+          lambda { |value| $:.push(value) }
+        ],
+        ['--prereqs', '-P', "Display the tasks and dependencies, then exit.",
+          lambda { |value| options.show_prereqs = true }
+        ],
+        ['--quiet', '-q', "Do not log messages to standard output.",
+          lambda { |value| verbose(false) }
+        ],
+        ['--rakefile', '-f [FILE]', "Use FILE as the rakefile.",
+          lambda { |value|
+            value ||= ''
+            @rakefiles.clear
+            @rakefiles << value
+          }
+        ],
+        ['--rakelibdir', '--rakelib', '-R RAKELIBDIR',
+          "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')",
+          lambda { |value| options.rakelib = value.split(':') }
+        ],
+        ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
+          lambda { |value|
+            begin
+              require value
+            rescue LoadError => ex
+              begin
+                rake_require value
+              rescue LoadError => ex2
+                raise ex
+              end
+            end
+          }
+        ],
+        ['--rules', "Trace the rules resolution.",
+          lambda { |value| options.trace_rules = true }
+        ],
+        ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Rakefile.",
+          lambda { |value| options.nosearch = true }
+        ],
+        ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",
+          lambda { |value|
+            verbose(false)
+            options.silent = true
+          }
+        ],
+        ['--system',  '-g',
+          "Using system wide (global) rakefiles (usually '~/.rake/*.rake').",
+          lambda { |value| options.load_system = true }
+        ],
+        ['--no-system', '--nosystem', '-G',
+          "Use standard project Rakefile search paths, ignore system wide rakefiles.",
+          lambda { |value| options.ignore_system = true }
+        ],
+        ['--tasks', '-T [PATTERN]', "Display the tasks (matching optional PATTERN) with descriptions, then exit.",
+          lambda { |value|
+            options.show_tasks = true
+            options.show_task_pattern = Regexp.new(value || '')
+            options.full_description = false
+          }
+        ],
+        ['--trace', '-t', "Turn on invoke/execute tracing, enable full backtrace.",
+          lambda { |value|
+            options.trace = true
+            verbose(true)
+          }
+        ],
+        ['--verbose', '-v', "Log message to standard output.",
+          lambda { |value| verbose(true) }
+        ],
+        ['--version', '-V', "Display the program version.",
+          lambda { |value|
+            puts "rake, version #{RAKEVERSION}"
+            exit
+          }
+        ]
+      ]
+    end
+
+    # Read and handle the command line options.
+    def handle_options
+      options.rakelib = ['rakelib']
+
+      OptionParser.new do |opts|
+        opts.banner = "rake [-f rakefile] {options} targets..."
+        opts.separator ""
+        opts.separator "Options are ..."
+
+        opts.on_tail("-h", "--help", "-H", "Display this help message.") do
+          puts opts
+          exit
+        end
+
+        standard_rake_options.each { |args| opts.on(*args) }
+      end.parse!
+
+      # If class namespaces are requested, set the global options
+      # according to the values in the options structure.
+      if options.classic_namespace
+        $show_tasks = options.show_tasks
+        $show_prereqs = options.show_prereqs
+        $trace = options.trace
+        $dryrun = options.dryrun
+        $silent = options.silent
+      end
+    end
+
+    # Similar to the regular Ruby +require+ command, but will check
+    # for *.rake files in addition to *.rb files.
+    def rake_require(file_name, paths=$LOAD_PATH, loaded=$")
+      return false if loaded.include?(file_name)
+      paths.each do |path|
+        fn = file_name + ".rake"
+        full_path = File.join(path, fn)
+        if File.exist?(full_path)
+          load full_path
+          loaded << fn
+          return true
+        end
+      end
+      fail LoadError, "Can't find #{file_name}"
+    end
+
+    def find_rakefile_location
+      here = Dir.pwd
+      while ! (fn = have_rakefile)
+        Dir.chdir("..")
+        if Dir.pwd == here || options.nosearch
+          return nil
+        end
+        here = Dir.pwd
+      end
+      [fn, here]
+    ensure
+      Dir.chdir(Rake.original_dir)
+    end
+
+    def raw_load_rakefile # :nodoc:
+      rakefile, location = find_rakefile_location
+      if (! options.ignore_system) &&
+          (options.load_system || rakefile.nil?) &&
+          system_dir && File.directory?(system_dir)
+        puts "(in #{Dir.pwd})" unless options.silent
+        glob("#{system_dir}/*.rake") do |name|
+          add_import name
+        end
+      else
+        fail "No Rakefile found (looking for: #{@rakefiles.join(', ')})" if
+          rakefile.nil?
+        @rakefile = rakefile
+        Dir.chdir(location)
+        puts "(in #{Dir.pwd})" unless options.silent
+        $rakefile = @rakefile if options.classic_namespace
+        load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
+        options.rakelib.each do |rlib|
+          glob("#{rlib}/*.rake") do |name|
+            add_import name
+          end
+        end
+      end
+      load_imports
+    end
+
+    def glob(path, &block)
+      Dir[path.gsub("\\", '/')].each(&block)
+    end
+    private :glob
+
+    # The directory path containing the system wide rakefiles.
+    def system_dir
+      @system_dir ||= ENV['RAKE_SYSTEM'] || standard_system_dir
+    end
+
+    # The standard directory containing system wide rake files.
+    unless method_defined?(:standard_system_dir)
+      def standard_system_dir #:nodoc:
+        File.expand_path('~/.rake')
+      end
+    end
+    private :standard_system_dir
+
+    # Collect the list of tasks on the command line.  If no tasks are
+    # given, return a list containing only the default task.
+    # Environmental assignments are processed at this time as well.
+    def collect_tasks
+      @top_level_tasks = []
+      ARGV.each do |arg|
+        if arg =~ /^(\w+)=(.*)$/
+          ENV[$1] = $2
+        else
+          @top_level_tasks << arg unless arg =~ /^-/
+        end
+      end
+      @top_level_tasks.push("default") if @top_level_tasks.size == 0
+    end
+
+    # Add a file to the list of files to be imported.
+    def add_import(fn)
+      @pending_imports << fn
+    end
+
+    # Load the pending list of imported files.
+    def load_imports
+      while fn = @pending_imports.shift
+        next if @imported.member?(fn)
+        if fn_task = lookup(fn)
+          fn_task.invoke
+        end
+        ext = File.extname(fn)
+        loader = @loaders[ext] || @default_loader
+        loader.load(fn)
+        @imported << fn
+      end
+    end
+
+    # Warn about deprecated use of top level constant names.
+    def const_warning(const_name)
+      @const_warning ||= false
+      if ! @const_warning
+        $stderr.puts %{WARNING: Deprecated reference to top-level constant '#{const_name}' } +
+          %{found at: #{rakefile_location}} # '
+        $stderr.puts %{    Use --classic-namespace on rake command}
+        $stderr.puts %{    or 'require "rake/classic_namespace"' in Rakefile}
+      end
+      @const_warning = true
+    end
+
+    def rakefile_location
+      begin
+        fail
+      rescue RuntimeError => ex
+        ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
+      end
+    end
+  end
+end
+
+
+class Module
+  # Rename the original handler to make it available.
+  alias :rake_original_const_missing :const_missing
+
+  # Check for deprecated uses of top level (i.e. in Object) uses of
+  # Rake class names.  If someone tries to reference the constant
+  # name, display a warning and return the proper object.  Using the
+  # --classic-namespace command line option will define these
+  # constants in Object and avoid this handler.
+  def const_missing(const_name)
+    case const_name
+    when :Task
+      Rake.application.const_warning(const_name)
+      Rake::Task
+    when :FileTask
+      Rake.application.const_warning(const_name)
+      Rake::FileTask
+    when :FileCreationTask
+      Rake.application.const_warning(const_name)
+      Rake::FileCreationTask
+    when :RakeApp
+      Rake.application.const_warning(const_name)
+      Rake::Application
+    else
+      rake_original_const_missing(const_name)
+    end
+  end
+end
diff --git a/lib/rake/classic_namespace.rb b/lib/rake/classic_namespace.rb
new file mode 100644
index 0000000000..feb7569966
--- /dev/null
+++ b/lib/rake/classic_namespace.rb
@@ -0,0 +1,8 @@
+# The following classes used to be in the top level namespace.
+# Loading this file enables compatibility with older Rakefile that
+# referenced Task from the top level.
+
+Task = Rake::Task
+FileTask = Rake::FileTask
+FileCreationTask = Rake::FileCreationTask
+RakeApp = Rake::Application
diff --git a/lib/rake/clean.rb b/lib/rake/clean.rb
new file mode 100644
index 0000000000..62f27d5751
--- /dev/null
+++ b/lib/rake/clean.rb
@@ -0,0 +1,31 @@
+# The 'rake/clean' file defines two file lists (CLEAN and CLOBBER) and
+# two rake tasks (:clean and :clobber).
+#
+# [:clean] Clean up the project by deleting scratch files and backup
+#          files.  Add files to the CLEAN file list to have the :clean
+#          target handle them.
+#
+# [:clobber] Clobber all generated and non-source files in a project.
+#            The task depends on :clean, so all the clean files will
+#            be deleted as well as files in the CLOBBER file list.
+#            The intent of this task is to return a project to its
+#            pristine, just unpacked state.
+
+require 'rake'
+
+CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
+CLEAN.clear_exclude.exclude { |fn|
+  fn.pathmap("%f") == 'core' && File.directory?(fn)
+}
+
+desc "Remove any temporary products."
+task :clean do
+  CLEAN.each { |fn| rm_r fn rescue nil }
+end
+
+CLOBBER = Rake::FileList.new
+
+desc "Remove any generated file."
+task :clobber => [:clean] do
+  CLOBBER.each { |fn| rm_r fn rescue nil }
+end
diff --git a/lib/rake/contrib/compositepublisher.rb b/lib/rake/contrib/compositepublisher.rb
new file mode 100644
index 0000000000..31ef080dd7
--- /dev/null
+++ b/lib/rake/contrib/compositepublisher.rb
@@ -0,0 +1,20 @@
+module Rake
+
+  # Manage several publishers as a single entity.
+  class CompositePublisher
+    def initialize
+      @publishers = []
+    end
+
+    # Add a publisher to the composite.
+    def add(pub)
+      @publishers << pub
+    end
+
+    # Upload all the individual publishers.
+    def upload
+      @publishers.each { |p| p.upload }
+    end
+  end
+
+end
diff --git a/lib/rake/contrib/ftptools.rb b/lib/rake/contrib/ftptools.rb
new file mode 100644
index 0000000000..4c6897f02e
--- /dev/null
+++ b/lib/rake/contrib/ftptools.rb
@@ -0,0 +1,151 @@
+# = Tools for FTP uploading.
+#
+# This file is still under development and is not released for general
+# use.
+
+require 'date'
+require 'net/ftp'
+
+module Rake # :nodoc:
+
+  ####################################################################
+  # <b>Note:</b> <em> Not released for general use.</em>
+  class FtpFile
+    attr_reader :name, :size, :owner, :group, :time
+
+    def self.date
+      @date_class ||= Date
+    end
+
+    def self.time
+      @time_class ||= Time
+    end
+
+    def initialize(path, entry)
+      @path = path
+      @mode, line, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
+      @size = size.to_i
+      @time = determine_time(d1, d2, d3)
+    end
+
+    def path
+      File.join(@path, @name)
+    end
+
+    def directory?
+      @mode[0] == ?d
+    end
+
+    def mode
+      parse_mode(@mode)
+    end
+
+    def symlink?
+      @mode[0] == ?l
+    end
+
+    private # --------------------------------------------------------
+
+    def parse_mode(m)
+      result = 0
+      (1..9).each do |i|
+        result = 2*result + ((m[i]==?-) ? 0 : 1)
+      end
+      result
+    end
+
+    def determine_time(d1, d2, d3)
+      now = self.class.time.now
+      if /:/ =~ d3
+        h, m = d3.split(':')
+        result = Time.parse("#{d1} #{d2} #{now.year} #{d3}")
+        if result > now
+          result = Time.parse("#{d1} #{d2} #{now.year-1} #{d3}")
+        end
+      else
+        result = Time.parse("#{d1} #{d2} #{d3}")
+      end
+      result
+#       elements = ParseDate.parsedate("#{d1} #{d2} #{d3}")
+#       if elements[0].nil?
+#         today = self.class.date.today
+#         if elements[1] > today.month
+#           elements[0] = today.year - 1
+#         else
+#           elements[0] = today.year
+#         end
+#       end
+#       elements = elements.collect { |el| el.nil? ? 0 : el }
+#       Time.mktime(*elements[0,7])
+    end
+  end
+
+  ####################################################################
+  # Manage the uploading of files to an FTP account.
+  class FtpUploader
+
+    # Log uploads to standard output when true.
+    attr_accessor :verbose
+
+    class << FtpUploader
+      # Create an uploader and pass it to the given block as +up+.
+      # When the block is complete, close the uploader.
+      def connect(path, host, account, password)
+        up = self.new(path, host, account, password)
+        begin
+          yield(up)
+        ensure
+          up.close
+        end
+      end
+    end
+
+    # Create an FTP uploader targetting the directory +path+ on +host+
+    # using the given account and password.  +path+ will be the root
+    # path of the uploader.
+    def initialize(path, host, account, password)
+      @created = Hash.new
+      @path = path
+      @ftp = Net::FTP.new(host, account, password)
+      makedirs(@path)
+      @ftp.chdir(@path)
+    end
+
+    # Create the directory +path+ in the uploader root path.
+    def makedirs(path)
+      route = []
+      File.split(path).each do |dir|
+        route << dir
+        current_dir = File.join(route)
+        if @created[current_dir].nil?
+          @created[current_dir] = true
+          puts "Creating Directory  #{current_dir}" if @verbose
+          @ftp.mkdir(current_dir) rescue nil
+        end
+      end
+    end
+
+    # Upload all files matching +wildcard+ to the uploader's root
+    # path.
+    def upload_files(wildcard)
+      Dir[wildcard].each do |fn|
+        upload(fn)
+      end
+    end
+
+    # Close the uploader.
+    def close
+      @ftp.close
+    end
+
+    private # --------------------------------------------------------
+
+    # Upload a single file to the uploader's root path.
+    def upload(file)
+      puts "Uploading #{file}" if @verbose
+      dir = File.dirname(file)
+      makedirs(dir)
+      @ftp.putbinaryfile(file, file) unless File.directory?(file)
+    end
+  end
+end
diff --git a/lib/rake/contrib/publisher.rb b/lib/rake/contrib/publisher.rb
new file mode 100644
index 0000000000..7f69d3a654
--- /dev/null
+++ b/lib/rake/contrib/publisher.rb
@@ -0,0 +1,73 @@
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008 by Jim Weirich (jim@weirichhouse.org)
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+
+# Configuration information about an upload host system.
+# * name   :: Name of host system.
+# * webdir :: Base directory for the web information for the
+#             application.  The application name (APP) is appended to
+#             this directory before using.
+# * pkgdir :: Directory on the host system where packages can be
+#             placed.
+HostInfo = Struct.new(:name, :webdir, :pkgdir)
+
+# Manage several publishers as a single entity.
+class CompositePublisher
+  def initialize
+    @publishers = []
+  end
+
+  # Add a publisher to the composite.
+  def add(pub)
+    @publishers << pub
+  end
+
+  # Upload all the individual publishers.
+  def upload
+    @publishers.each { |p| p.upload }
+  end
+end
+
+# Publish an entire directory to an existing remote directory using
+# SSH.
+class SshDirPublisher
+  def initialize(host, remote_dir, local_dir)
+    @host = host
+    @remote_dir = remote_dir
+    @local_dir = local_dir
+  end
+
+  def upload
+    run %{scp -rq #{@local_dir}/* #{@host}:#{@remote_dir}}
+  end
+end
+
+# Publish an entire directory to a fresh remote directory using SSH.
+class SshFreshDirPublisher < SshDirPublisher
+  def upload
+    run %{ssh #{@host} rm -rf #{@remote_dir}} rescue nil
+    run %{ssh #{@host} mkdir #{@remote_dir}}
+    super
+  end
+end
+
+# Publish a list of files to an existing remote directory.
+class SshFilePublisher
+  # Create a publisher using the give host information.
+  def initialize(host, remote_dir, local_dir, *files)
+    @host = host
+    @remote_dir = remote_dir
+    @local_dir = local_dir
+    @files = files
+  end
+
+  # Upload the local directory to the remote directory.
+  def upload
+    @files.each do |fn|
+      run %{scp -q #{@local_dir}/#{fn} #{@host}:#{@remote_dir}}
+    end
+  end
+end
diff --git a/lib/rake/contrib/rubyforgepublisher.rb b/lib/rake/contrib/rubyforgepublisher.rb
new file mode 100644
index 0000000000..a4b96936c8
--- /dev/null
+++ b/lib/rake/contrib/rubyforgepublisher.rb
@@ -0,0 +1,16 @@
+require 'rake/contrib/sshpublisher'
+
+module Rake
+
+  class RubyForgePublisher < SshDirPublisher
+    attr_reader :project, :proj_id, :user
+
+    def initialize(projname, user)
+      super(
+        "#{user}@rubyforge.org",
+        "/var/www/gforge-projects/#{projname}",
+        "html")
+    end
+  end
+
+end
diff --git a/lib/rake/contrib/sshpublisher.rb b/lib/rake/contrib/sshpublisher.rb
new file mode 100644
index 0000000000..e679716c7b
--- /dev/null
+++ b/lib/rake/contrib/sshpublisher.rb
@@ -0,0 +1,45 @@
+require 'rake/contrib/compositepublisher'
+
+module Rake
+
+  # Publish an entire directory to an existing remote directory using
+  # SSH.
+  class SshDirPublisher
+    def initialize(host, remote_dir, local_dir)
+      @host = host
+      @remote_dir = remote_dir
+      @local_dir = local_dir
+    end
+
+    def upload
+      sh %{scp -rq #{@local_dir}/* #{@host}:#{@remote_dir}}
+    end
+  end
+
+  # Publish an entire directory to a fresh remote directory using SSH.
+  class SshFreshDirPublisher < SshDirPublisher
+    def upload
+      sh %{ssh #{@host} rm -rf #{@remote_dir}} rescue nil
+      sh %{ssh #{@host} mkdir #{@remote_dir}}
+      super
+    end
+  end
+
+  # Publish a list of files to an existing remote directory.
+  class SshFilePublisher
+    # Create a publisher using the give host information.
+    def initialize(host, remote_dir, local_dir, *files)
+      @host = host
+      @remote_dir = remote_dir
+      @local_dir = local_dir
+      @files = files
+    end
+
+    # Upload the local directory to the remote directory.
+    def upload
+      @files.each do |fn|
+        sh %{scp -q #{@local_dir}/#{fn} #{@host}:#{@remote_dir}}
+      end
+    end
+  end
+end
diff --git a/lib/rake/gempackagetask.rb b/lib/rake/gempackagetask.rb
new file mode 100644
index 0000000000..3a99ff2b87
--- /dev/null
+++ b/lib/rake/gempackagetask.rb
@@ -0,0 +1,95 @@
+# Define a package task library to aid in the definition of GEM
+# packages.
+
+require 'rubygems'
+require 'rake'
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
+
+module Rake
+
+  # Create a package based upon a Gem spec.  Gem packages, as well as
+  # zip files and tar/gzipped packages can be produced by this task.
+  #
+  # In addition to the Rake targets generated by PackageTask, a
+  # GemPackageTask will also generate the following tasks:
+  #
+  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.gem"</b>]
+  #   Create a Ruby GEM package with the given name and version.
+  #
+  # Example using a Ruby GEM spec:
+  #
+  #   require 'rubygems'
+  #
+  #   spec = Gem::Specification.new do |s|
+  #     s.platform = Gem::Platform::RUBY
+  #     s.summary = "Ruby based make-like utility."
+  #     s.name = 'rake'
+  #     s.version = PKG_VERSION
+  #     s.requirements << 'none'
+  #     s.require_path = 'lib'
+  #     s.autorequire = 'rake'
+  #     s.files = PKG_FILES
+  #     s.description = <<EOF
+  #   Rake is a Make-like program implemented in Ruby. Tasks
+  #   and dependencies are specified in standard Ruby syntax.
+  #   EOF
+  #   end
+  #
+  #   Rake::GemPackageTask.new(spec) do |pkg|
+  #     pkg.need_zip = true
+  #     pkg.need_tar = true
+  #   end
+  #
+  class GemPackageTask < PackageTask
+    # Ruby GEM spec containing the metadata for this package.  The
+    # name, version and package_files are automatically determined
+    # from the GEM spec and don't need to be explicitly provided.
+    attr_accessor :gem_spec
+
+    # Create a GEM Package task library.  Automatically define the gem
+    # if a block is given.  If no block is supplied, then +define+
+    # needs to be called to define the task.
+    def initialize(gem_spec)
+      init(gem_spec)
+      yield self if block_given?
+      define if block_given?
+    end
+
+    # Initialization tasks without the "yield self" or define
+    # operations.
+    def init(gem)
+      super(gem.name, gem.version)
+      @gem_spec = gem
+      @package_files += gem_spec.files if gem_spec.files
+    end
+
+    # Create the Rake tasks and actions specified by this
+    # GemPackageTask.  (+define+ is automatically called if a block is
+    # given to +new+).
+    def define
+      super
+      task :package => [:gem]
+      desc "Build the gem file #{gem_file}"
+      task :gem => ["#{package_dir}/#{gem_file}"]
+      file "#{package_dir}/#{gem_file}" => [package_dir] + @gem_spec.files do
+        when_writing("Creating GEM") {
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "#{package_dir}/#{gem_file}"
+          }
+        }
+      end
+    end
+
+    def gem_file
+      if @gem_spec.platform == Gem::Platform::RUBY
+        "#{package_name}.gem"
+      else
+        "#{package_name}-#{@gem_spec.platform}.gem"
+      end
+    end
+
+  end
+end
diff --git a/lib/rake/loaders/makefile.rb b/lib/rake/loaders/makefile.rb
new file mode 100644
index 0000000000..9a2ac8090e
--- /dev/null
+++ b/lib/rake/loaders/makefile.rb
@@ -0,0 +1,38 @@
+module Rake
+
+  # Makefile loader to be used with the import file loader.
+  class MakefileLoader
+    SPACE_MARK = "\0"
+
+    # Load the makefile dependencies in +fn+.
+    def load(fn)
+      lines = open(fn) {|mf| mf.read}
+      lines.gsub!(/\\ /, SPACE_MARK)
+      lines.gsub!(/#[^\n]*\n/m, "")
+      lines.gsub!(/\\\n/, ' ')
+      lines.each_line do |line|
+        process_line(line)
+      end
+    end
+
+    private
+
+    # Process one logical line of makefile data.
+    def process_line(line)
+      file_tasks, args = line.split(':', 2)
+      return if args.nil?
+      dependents = args.split.map {|arg| respace(arg)}
+      file_tasks.scan(/\S+/) do |file_task|
+        file_task = respace(file_task)
+        file file_task => dependents
+      end
+    end
+
+    def respace(str)
+      str.tr(SPACE_MARK, ' ')
+    end
+  end
+
+  # Install the handler
+  Rake.application.add_loader('mf', MakefileLoader.new)
+end
diff --git a/lib/rake/packagetask.rb b/lib/rake/packagetask.rb
new file mode 100644
index 0000000000..e77345c198
--- /dev/null
+++ b/lib/rake/packagetask.rb
@@ -0,0 +1,182 @@
+# Define a package task library to aid in the definition of
+# redistributable package files.
+
+require 'rake'
+require 'rake/tasklib'
+
+module Rake
+
+  # Create a packaging task that will package the project into
+  # distributable files (e.g zip archive or tar files).
+  #
+  # The PackageTask will create the following targets:
+  #
+  # [<b>:package</b>]
+  #   Create all the requested package files.
+  #
+  # [<b>:clobber_package</b>]
+  #   Delete all the package files.  This target is automatically
+  #   added to the main clobber target.
+  #
+  # [<b>:repackage</b>]
+  #   Rebuild the package files from scratch, even if they are not out
+  #   of date.
+  #
+  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tgz"</b>]
+  #   Create a gzipped tar package (if <em>need_tar</em> is true).
+  #
+  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.gz"</b>]
+  #   Create a gzipped tar package (if <em>need_tar_gz</em> is true).
+  #
+  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.bz2"</b>]
+  #   Create a bzip2'd tar package (if <em>need_tar_bz2</em> is true).
+  #
+  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.zip"</b>]
+  #   Create a zip package archive (if <em>need_zip</em> is true).
+  #
+  # Example:
+  #
+  #   Rake::PackageTask.new("rake", "1.2.3") do |p|
+  #     p.need_tar = true
+  #     p.package_files.include("lib/**/*.rb")
+  #   end
+  #
+  class PackageTask < TaskLib
+    # Name of the package (from the GEM Spec).
+    attr_accessor :name
+
+    # Version of the package (e.g. '1.3.2').
+    attr_accessor :version
+
+    # Directory used to store the package files (default is 'pkg').
+    attr_accessor :package_dir
+
+    # True if a gzipped tar file (tgz) should be produced (default is false).
+    attr_accessor :need_tar
+
+    # True if a gzipped tar file (tar.gz) should be produced (default is false).
+    attr_accessor :need_tar_gz
+
+    # True if a bzip2'd tar file (tar.bz2) should be produced (default is false).
+    attr_accessor :need_tar_bz2
+
+    # True if a zip file should be produced (default is false)
+    attr_accessor :need_zip
+
+    # List of files to be included in the package.
+    attr_accessor :package_files
+
+    # Tar command for gzipped or bzip2ed archives.  The default is 'tar'.
+    attr_accessor :tar_command
+
+    # Zip command for zipped archives.  The default is 'zip'.
+    attr_accessor :zip_command
+
+    # Create a Package Task with the given name and version.
+    def initialize(name=nil, version=nil)
+      init(name, version)
+      yield self if block_given?
+      define unless name.nil?
+    end
+
+    # Initialization that bypasses the "yield self" and "define" step.
+    def init(name, version)
+      @name = name
+      @version = version
+      @package_files = Rake::FileList.new
+      @package_dir = 'pkg'
+      @need_tar = false
+      @need_tar_gz = false
+      @need_tar_bz2 = false
+      @need_zip = false
+      @tar_command = 'tar'
+      @zip_command = 'zip'
+    end
+
+    # Create the tasks defined by this task library.
+    def define
+      fail "Version required (or :noversion)" if @version.nil?
+      @version = nil if :noversion == @version
+
+      desc "Build all the packages"
+      task :package
+
+      desc "Force a rebuild of the package files"
+      task :repackage => [:clobber_package, :package]
+
+      desc "Remove package products"
+      task :clobber_package do
+        rm_r package_dir rescue nil
+      end
+
+      task :clobber => [:clobber_package]
+
+      [
+        [need_tar, tgz_file, "z"],
+        [need_tar_gz, tar_gz_file, "z"],
+        [need_tar_bz2, tar_bz2_file, "j"]
+      ].each do |(need, file, flag)|
+        if need
+          task :package => ["#{package_dir}/#{file}"]
+          file "#{package_dir}/#{file}" => [package_dir_path] + package_files do
+            chdir(package_dir) do
+              sh %{#{@tar_command} #{flag}cvf #{file} #{package_name}}
+            end
+          end
+        end
+      end
+
+      if need_zip
+        task :package => ["#{package_dir}/#{zip_file}"]
+        file "#{package_dir}/#{zip_file}" => [package_dir_path] + package_files do
+          chdir(package_dir) do
+            sh %{#{@zip_command} -r #{zip_file} #{package_name}}
+          end
+        end
+      end
+
+      directory package_dir
+
+      file package_dir_path => @package_files do
+        mkdir_p package_dir rescue nil
+        @package_files.each do |fn|
+          f = File.join(package_dir_path, fn)
+          fdir = File.dirname(f)
+          mkdir_p(fdir) if !File.exist?(fdir)
+          if File.directory?(fn)
+            mkdir_p(f)
+          else
+            rm_f f
+            safe_ln(fn, f)
+          end
+        end
+      end
+      self
+    end
+
+    def package_name
+      @version ? "#{@name}-#{@version}" : @name
+    end
+
+    def package_dir_path
+      "#{package_dir}/#{package_name}"
+    end
+
+    def tgz_file
+      "#{package_name}.tgz"
+    end
+
+    def tar_gz_file
+      "#{package_name}.tar.gz"
+    end
+
+    def tar_bz2_file
+      "#{package_name}.tar.bz2"
+    end
+
+    def zip_file
+      "#{package_name}.zip"
+    end
+  end
+
+end
diff --git a/lib/rake/rake_test_loader.rb b/lib/rake/rake_test_loader.rb
new file mode 100644
index 0000000000..8d7dad3c94
--- /dev/null
+++ b/lib/rake/rake_test_loader.rb
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+# Load the test files from the command line.
+
+ARGV.each { |f| load f unless f =~ /^-/  }
diff --git a/lib/rake/rdoctask.rb b/lib/rake/rdoctask.rb
new file mode 100644
index 0000000000..983a260dc5
--- /dev/null
+++ b/lib/rake/rdoctask.rb
@@ -0,0 +1,208 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Rake
+
+  # Create a documentation task that will generate the RDoc files for
+  # a project.
+  #
+  # The RDocTask will create the following targets:
+  #
+  # [<b>:<em>rdoc</em></b>]
+  #   Main task for this RDOC task.
+  #
+  # [<b>:clobber_<em>rdoc</em></b>]
+  #   Delete all the rdoc files.  This target is automatically
+  #   added to the main clobber target.
+  #
+  # [<b>:re<em>rdoc</em></b>]
+  #   Rebuild the rdoc files from scratch, even if they are not out
+  #   of date.
+  #
+  # Simple Example:
+  #
+  #   Rake::RDocTask.new do |rd|
+  #     rd.main = "README.rdoc"
+  #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+  #   end
+  #
+  # The +rd+ object passed to the block is an RDocTask object. See the
+  # attributes list for the RDocTask class for available customization options.
+  #
+  # == Specifying different task names
+  #
+  # You may wish to give the task a different name, such as if you are
+  # generating two sets of documentation.  For instance, if you want to have a
+  # development set of documentation including private methods:
+  #
+  #   Rake::RDocTask.new(:rdoc_dev) do |rd|
+  #     rd.main = "README.doc"
+  #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+  #     rd.options << "--all"
+  #   end
+  #
+  # The tasks would then be named :<em>rdoc_dev</em>, :clobber_<em>rdoc_dev</em>, and
+  # :re<em>rdoc_dev</em>.
+  #
+  # If you wish to have completely different task names, then pass a Hash as
+  # first argument. With the <tt>:rdoc</tt>, <tt>:clobber_rdoc</tt> and
+  # <tt>:rerdoc</tt> options, you can customize the task names to your liking.
+  # For example:
+  #
+  #   Rake::RDocTask.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force")
+  #
+  # This will create the tasks <tt>:rdoc</tt>, <tt>:rdoc_clean</tt> and
+  # <tt>:rdoc:force</tt>.
+  #
+  class RDocTask < TaskLib
+    # Name of the main, top level task.  (default is :rdoc)
+    attr_accessor :name
+
+    # Name of directory to receive the html output files. (default is "html")
+    attr_accessor :rdoc_dir
+
+    # Title of RDoc documentation. (defaults to rdoc's default)
+    attr_accessor :title
+
+    # Name of file to be used as the main, top level file of the
+    # RDoc. (default is none)
+    attr_accessor :main
+
+    # Name of template to be used by rdoc. (defaults to rdoc's default)
+    attr_accessor :template
+
+    # List of files to be included in the rdoc generation. (default is [])
+    attr_accessor :rdoc_files
+
+    # Additional list of options to be passed rdoc.  (default is [])
+    attr_accessor :options
+
+    # Whether to run the rdoc process as an external shell (default is false)
+    attr_accessor :external
+
+    attr_accessor :inline_source
+
+    # Create an RDoc task with the given name. See the RDocTask class overview
+    # for documentation.
+    def initialize(name = :rdoc)  # :yield: self
+      if name.is_a?(Hash)
+        invalid_options = name.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
+        if !invalid_options.empty?
+          raise ArgumentError, "Invalid option(s) passed to RDocTask.new: #{invalid_options.join(", ")}"
+        end
+      end
+
+      @name = name
+      @rdoc_files = Rake::FileList.new
+      @rdoc_dir = 'html'
+      @main = nil
+      @title = nil
+      @template = nil
+      @external = false
+      @inline_source = true
+      @options = []
+      yield self if block_given?
+      define
+    end
+
+    # Create the tasks defined by this task lib.
+    def define
+      if rdoc_task_name != "rdoc"
+        desc "Build the RDOC HTML Files"
+      else
+        desc "Build the #{rdoc_task_name} HTML Files"
+      end
+      task rdoc_task_name
+
+      desc "Force a rebuild of the RDOC files"
+      task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
+
+      desc "Remove rdoc products"
+      task clobber_task_name do
+        rm_r rdoc_dir rescue nil
+      end
+
+      task :clobber => [clobber_task_name]
+
+      directory @rdoc_dir
+      task rdoc_task_name => [rdoc_target]
+      file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
+        rm_r @rdoc_dir rescue nil
+        @before_running_rdoc.call if @before_running_rdoc
+        args = option_list + @rdoc_files
+        if @external
+          argstring = args.join(' ')
+          sh %{ruby -Ivendor vendor/rd #{argstring}}
+        else
+          require 'rdoc/rdoc'
+          RDoc::RDoc.new.document(args)
+        end
+      end
+      self
+    end
+
+    # List of options that will be supplied to RDoc
+    def option_list
+      result = @options.dup
+      result << "-o" << @rdoc_dir
+      result << "--main" << quote(main) if main
+      result << "--title" << quote(title) if title
+      result << "-T" << quote(template) if template
+      result << "--inline-source" if inline_source && !@options.include?("--inline-source") && !@options.include?("-S")
+      result
+    end
+
+    def quote(str)
+      if @external
+        "'#{str}'"
+      else
+        str
+      end
+    end
+
+    def option_string
+      option_list.join(' ')
+    end
+
+    # The block passed to this method will be called just before running the
+    # RDoc generator. It is allowed to modify RDocTask attributes inside the
+    # block.
+    def before_running_rdoc(&block)
+      @before_running_rdoc = block
+    end
+
+    private
+
+    def rdoc_target
+      "#{rdoc_dir}/index.html"
+    end
+
+    def rdoc_task_name
+      case name
+      when Hash
+        (name[:rdoc] || "rdoc").to_s
+      else
+        name.to_s
+      end
+    end
+
+    def clobber_task_name
+      case name
+      when Hash
+        (name[:clobber_rdoc] || "clobber_rdoc").to_s
+      else
+        "clobber_#{name}"
+      end
+    end
+
+    def rerdoc_task_name
+      case name
+      when Hash
+        (name[:rerdoc] || "rerdoc").to_s
+      else
+        "re#{name}"
+      end
+    end
+
+  end
+end
diff --git a/lib/rake/runtest.rb b/lib/rake/runtest.rb
new file mode 100644
index 0000000000..f6928d57b8
--- /dev/null
+++ b/lib/rake/runtest.rb
@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'test/unit/assertions'
+
+module Rake
+  include Test::Unit::Assertions
+
+  def run_tests(pattern='test/test*.rb', log_enabled=false)
+    Dir["#{pattern}"].each { |fn|
+      puts fn if log_enabled
+      begin
+        load fn
+      rescue Exception => ex
+        puts "Error in #{fn}: #{ex.message}"
+        puts ex.backtrace
+        assert false
+      end
+    }
+  end
+
+  extend self
+end
diff --git a/lib/rake/tasklib.rb b/lib/rake/tasklib.rb
new file mode 100644
index 0000000000..a5a4494369
--- /dev/null
+++ b/lib/rake/tasklib.rb
@@ -0,0 +1,21 @@
+require 'rake'
+
+module Rake
+
+  # Base class for Task Libraries.
+  class TaskLib
+    include Cloneable
+
+    # Make a symbol by pasting two strings together.
+    #
+    # NOTE: DEPRECATED! This method is kinda stupid. I don't know why
+    # I didn't just use string interpolation. But now other task
+    # libraries depend on this so I can't remove it without breaking
+    # other people's code. So for now it stays for backwards
+    # compatibility. BUT DON'T USE IT.
+    def paste(a,b)              # :nodoc:
+      (a.to_s + b.to_s).intern
+    end
+  end
+
+end
diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
new file mode 100644
index 0000000000..c400205ff3
--- /dev/null
+++ b/lib/rake/testtask.rb
@@ -0,0 +1,150 @@
+# Define a task library for running unit tests.
+
+require 'rake'
+require 'rake/tasklib'
+
+module Rake
+
+  # Create a task that runs a set of tests.
+  #
+  # Example:
+  #
+  #   Rake::TestTask.new do |t|
+  #     t.libs << "test"
+  #     t.test_files = FileList['test/test*.rb']
+  #     t.verbose = true
+  #   end
+  #
+  # If rake is invoked with a "TEST=filename" command line option,
+  # then the list of test files will be overridden to include only the
+  # filename specified on the command line.  This provides an easy way
+  # to run just one test.
+  #
+  # If rake is invoked with a "TESTOPTS=options" command line option,
+  # then the given options are passed to the test process after a
+  # '--'.  This allows Test::Unit options to be passed to the test
+  # suite.
+  #
+  # Examples:
+  #
+  #   rake test                           # run tests normally
+  #   rake test TEST=just_one_file.rb     # run just one test file.
+  #   rake test TESTOPTS="-v"             # run in verbose mode
+  #   rake test TESTOPTS="--runner=fox"   # use the fox test runner
+  #
+  class TestTask < TaskLib
+
+    # Name of test task. (default is :test)
+    attr_accessor :name
+
+    # List of directories to added to $LOAD_PATH before running the
+    # tests. (default is 'lib')
+    attr_accessor :libs
+
+    # True if verbose test output desired. (default is false)
+    attr_accessor :verbose
+
+    # Test options passed to the test suite.  An explicit
+    # TESTOPTS=opts on the command line will override this. (default
+    # is NONE)
+    attr_accessor :options
+
+    # Request that the tests be run with the warning flag set.
+    # E.g. warning=true implies "ruby -w" used to run the tests.
+    attr_accessor :warning
+
+    # Glob pattern to match test files. (default is 'test/test*.rb')
+    attr_accessor :pattern
+
+    # Style of test loader to use.  Options are:
+    #
+    # * :rake -- Rake provided test loading script (default).
+    # * :testrb -- Ruby provided test loading script.
+    # * :direct -- Load tests using command line loader.
+    #
+    attr_accessor :loader
+
+    # Array of commandline options to pass to ruby when running test loader.
+    attr_accessor :ruby_opts
+
+    # Explicitly define the list of test files to be included in a
+    # test.  +list+ is expected to be an array of file names (a
+    # FileList is acceptable).  If both +pattern+ and +test_files+ are
+    # used, then the list of test files is the union of the two.
+    def test_files=(list)
+      @test_files = list
+    end
+
+    # Create a testing task.
+    def initialize(name=:test)
+      @name = name
+      @libs = ["lib"]
+      @pattern = nil
+      @options = nil
+      @test_files = nil
+      @verbose = false
+      @warning = false
+      @loader = :rake
+      @ruby_opts = []
+      yield self if block_given?
+      @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
+      define
+    end
+
+    # Create the tasks defined by this task lib.
+    def define
+      lib_path = @libs.join(File::PATH_SEPARATOR)
+      desc "Run tests" + (@name==:test ? "" : " for #{@name}")
+      task @name do
+        run_code = ''
+        RakeFileUtils.verbose(@verbose) do
+          run_code =
+            case @loader
+            when :direct
+              "-e 'ARGV.each{|f| load f}'"
+            when :testrb
+              "-S testrb"
+            when :rake
+              rake_loader
+            end
+          @ruby_opts.unshift( "-I\"#{lib_path}\"" )
+          @ruby_opts.unshift( "-w" ) if @warning
+          ruby @ruby_opts.join(" ") +
+            " \"#{run_code}\" " +
+            file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
+            " #{option_list}"
+        end
+      end
+      self
+    end
+
+    def option_list # :nodoc:
+      ENV['TESTOPTS'] || @options || ""
+    end
+
+    def file_list # :nodoc:
+      if ENV['TEST']
+        FileList[ ENV['TEST'] ]
+      else
+        result = []
+        result += @test_files.to_a if @test_files
+        result += FileList[ @pattern ].to_a if @pattern
+        FileList[result]
+      end
+    end
+
+    def rake_loader # :nodoc:
+      find_file('rake/rake_test_loader') or
+        fail "unable to find rake test loader"
+    end
+
+    def find_file(fn) # :nodoc:
+      $LOAD_PATH.each do |path|
+        file_path = File.join(path, "#{fn}.rb")
+        return file_path if File.exist? file_path
+      end
+      nil
+    end
+
+  end
+end
diff --git a/lib/rake/win32.rb b/lib/rake/win32.rb
new file mode 100644
index 0000000000..0ab31c2822
--- /dev/null
+++ b/lib/rake/win32.rb
@@ -0,0 +1,46 @@
+module Rake
+
+  # Win 32 interface methods for Rake. Windows specific functionality
+  # will be placed here to collect that knowledge in one spot.
+  module Win32
+    class << self
+      # True if running on a windows system.
+      if File::ALT_SEPARATOR == '\\' # assume other DOSish systems are extinct.
+        def windows?; true end
+      else
+        def windows?; false end
+      end
+    end
+
+    class << self
+      # The standard directory containing system wide rake files on
+      # Win 32 systems. Try the following environment variables (in
+      # order):
+      #
+      # * APPDATA
+      # * HOME
+      # * HOMEDRIVE + HOMEPATH
+      # * USERPROFILE
+      #
+      # If the above are not defined, retruns the personal folder.
+      def win32_system_dir #:nodoc:
+        win32_shared_path = ENV['APPDATA']
+        if !win32_shared_path or win32_shared_path.empty?
+          win32_shared_path = '~'
+        end
+        File.expand_path('Rake', win32_shared_path)
+      end
+
+      # Normalize a win32 path so that the slashes are all forward slashes.
+      def normalize(path)
+        path.tr('\\', '/')
+      end
+    end if windows?
+  end
+
+  if Win32.windows?
+    def standard_system_dir
+      Win32.win32_system_dir
+    end
+  end
+end
diff --git a/lib/rational.rb b/lib/rational.rb
index ce754cfa3c..a1aeca1e40 100644
--- a/lib/rational.rb
+++ b/lib/rational.rb
@@ -1,530 +1,23 @@
-#
-#   rational.rb -
-#       $Release Version: 0.5 $
-#       $Revision: 1.7 $
-#       $Date: 1999/08/24 12:49:28 $
-#       by Keiju ISHITSUKA(SHL Japan Inc.)
-#
-# Documentation by Kevin Jackson and Gavin Sinclair.
-# 
-# When you <tt>require 'rational'</tt>, all interactions between numbers
-# potentially return a rational result.  For example:
-#
-#   1.quo(2)              # -> 0.5
-#   require 'rational'
-#   1.quo(2)              # -> Rational(1,2)
-# 
-# See Rational for full documentation.
-#
+# :enddoc:
 
-
-#
-# Creates a Rational number (i.e. a fraction).  +a+ and +b+ should be Integers:
-# 
-#   Rational(1,3)           # -> 1/3
-#
-# Note: trying to construct a Rational with floating point or real values
-# produces errors:
-#
-#   Rational(1.1, 2.3)      # -> NoMethodError
-#
-def Rational(a, b = 1)
-  if a.kind_of?(Rational) && b == 1
-    a
-  else
-    Rational.reduce(a, b)
-  end
-end
-
-#
-# Rational implements a rational class for numbers.
-#
-# <em>A rational number is a number that can be expressed as a fraction p/q
-# where p and q are integers and q != 0.  A rational number p/q is said to have
-# numerator p and denominator q.  Numbers that are not rational are called
-# irrational numbers.</em> (http://mathworld.wolfram.com/RationalNumber.html)
-#
-# To create a Rational Number:
-#   Rational(a,b)             # -> a/b
-#   Rational.new!(a,b)        # -> a/b
-#
-# Examples:
-#   Rational(5,6)             # -> 5/6
-#   Rational(5)               # -> 5/1
-# 
-# Rational numbers are reduced to their lowest terms:
-#   Rational(6,10)            # -> 3/5
-#
-# But not if you use the unusual method "new!":
-#   Rational.new!(6,10)       # -> 6/10
-#
-# Division by zero is obviously not allowed:
-#   Rational(3,0)             # -> ZeroDivisionError
-#
-class Rational < Numeric
-  @RCS_ID='-$Id: rational.rb,v 1.7 1999/08/24 12:49:28 keiju Exp keiju $-'
-
-  #
-  # Reduces the given numerator and denominator to their lowest terms.  Use
-  # Rational() instead.
-  #
-  def Rational.reduce(num, den = 1)
-    raise ZeroDivisionError, "denominator is zero" if den == 0
-
-    if den < 0
-      num = -num
-      den = -den
-    end
-    gcd = num.gcd(den)
-    num = num.div(gcd)
-    den = den.div(gcd)
-    if den == 1 && defined?(Unify)
-      num
-    else
-      new!(num, den)
-    end
-  end
-
-  #
-  # Implements the constructor.  This method does not reduce to lowest terms or
-  # check for division by zero.  Therefore #Rational() should be preferred in
-  # normal use.
-  #
-  def Rational.new!(num, den = 1)
-    new(num, den)
-  end
-
-  private_class_method :new
-
-  #
-  # This method is actually private.
-  #
-  def initialize(num, den)
-    if den < 0
-      num = -num
-      den = -den
-    end
-    if num.kind_of?(Integer) and den.kind_of?(Integer)
-      @numerator = num
-      @denominator = den
-    else
-      @numerator = num.to_i
-      @denominator = den.to_i
-    end
-  end
-
-  #
-  # Returns the addition of this value and +a+.
-  #
-  # Examples:
-  #   r = Rational(3,4)      # -> Rational(3,4)
-  #   r + 1                  # -> Rational(7,4)
-  #   r + 0.5                # -> 1.25
-  #
-  def + (a)
-    if a.kind_of?(Rational)
-      num = @numerator * a.denominator
-      num_a = a.numerator * @denominator
-      Rational(num + num_a, @denominator * a.denominator)
-    elsif a.kind_of?(Integer)
-      self + Rational.new!(a, 1)
-    elsif a.kind_of?(Float)
-      Float(self) + a
-    else
-      x, y = a.coerce(self)
-      x + y
-    end
-  end
-
-  #
-  # Returns the difference of this value and +a+.
-  # subtracted.
-  #
-  # Examples:
-  #   r = Rational(3,4)    # -> Rational(3,4)
-  #   r - 1                # -> Rational(-1,4)
-  #   r - 0.5              # -> 0.25
-  #
-  def - (a)
-    if a.kind_of?(Rational)
-      num = @numerator * a.denominator
-      num_a = a.numerator * @denominator
-      Rational(num - num_a, @denominator*a.denominator)
-    elsif a.kind_of?(Integer)
-      self - Rational.new!(a, 1)
-    elsif a.kind_of?(Float)
-      Float(self) - a
-    else
-      x, y = a.coerce(self)
-      x - y
-    end
-  end
-
-  #
-  # Returns the product of this value and +a+.
-  #
-  # Examples:
-  #   r = Rational(3,4)    # -> Rational(3,4)
-  #   r * 2                # -> Rational(3,2)
-  #   r * 4                # -> Rational(3,1)
-  #   r * 0.5              # -> 0.375
-  #   r * Rational(1,2)    # -> Rational(3,8)
-  #
-  def * (a)
-    if a.kind_of?(Rational)
-      num = @numerator * a.numerator
-      den = @denominator * a.denominator
-      Rational(num, den)
-    elsif a.kind_of?(Integer)
-      self * Rational.new!(a, 1)
-    elsif a.kind_of?(Float)
-      Float(self) * a
-    else
-      x, y = a.coerce(self)
-      x * y
-    end
-  end
-
-  #
-  # Returns the quotient of this value and +a+.
-  #   r = Rational(3,4)    # -> Rational(3,4)
-  #   r / 2                # -> Rational(3,8)
-  #   r / 2.0              # -> 0.375
-  #   r / Rational(1,2)    # -> Rational(3,2)
-  #
-  def / (a)
-    if a.kind_of?(Rational)
-      num = @numerator * a.denominator
-      den = @denominator * a.numerator
-      Rational(num, den)
-    elsif a.kind_of?(Integer)
-      raise ZeroDivisionError, "division by zero" if a == 0
-      self / Rational.new!(a, 1)
-    elsif a.kind_of?(Float)
-      Float(self) / a
-    else
-      x, y = a.coerce(self)
-      x / y
-    end
-  end
-
-  #
-  # Returns this value raised to the given power.
-  #
-  # Examples:
-  #   r = Rational(3,4)    # -> Rational(3,4)
-  #   r ** 2               # -> Rational(9,16)
-  #   r ** 2.0             # -> 0.5625
-  #   r ** Rational(1,2)   # -> 0.866025403784439
-  #
-  def ** (other)
-    if other.kind_of?(Rational)
-      Float(self) ** other
-    elsif other.kind_of?(Integer)
-      if other > 0
-	num = @numerator ** other
-	den = @denominator ** other
-      elsif other < 0
-	num = @denominator ** -other
-	den = @numerator ** -other
-      elsif other == 0
-	num = 1
-	den = 1
-      end
-      Rational.new!(num, den)
-    elsif other.kind_of?(Float)
-      Float(self) ** other
-    else
-      x, y = other.coerce(self)
-      x ** y
-    end
-  end
-
-  #
-  # Returns the remainder when this value is divided by +other+.
-  #
-  # Examples:
-  #   r = Rational(7,4)    # -> Rational(7,4)
-  #   r % Rational(1,2)    # -> Rational(1,4)
-  #   r % 1                # -> Rational(3,4)
-  #   r % Rational(1,7)    # -> Rational(1,28)
-  #   r % 0.26             # -> 0.19
-  #
-  def % (other)
-    value = (self / other).to_i
-    return self - other * value
-  end
-
-  #
-  # Returns the quotient _and_ remainder.
-  #
-  # Examples:
-  #   r = Rational(7,4)        # -> Rational(7,4)
-  #   r.divmod Rational(1,2)   # -> [3, Rational(1,4)]
-  #
-  def divmod(other)
-    value = (self / other).to_i
-    return value, self - other * value
-  end
-
-  #
-  # Returns the absolute value.
-  #
-  def abs
-    if @numerator > 0
-      Rational.new!(@numerator, @denominator)
-    else
-      Rational.new!(-@numerator, @denominator)
-    end
-  end
-
-  #
-  # Returns +true+ iff this value is numerically equal to +other+.
-  #
-  # But beware:
-  #   Rational(1,2) == Rational(4,8)          # -> true
-  #   Rational(1,2) == Rational.new!(4,8)     # -> false
-  #
-  # Don't use Rational.new!
-  #
-  def == (other)
-    if other.kind_of?(Rational)
-      @numerator == other.numerator and @denominator == other.denominator
-    elsif other.kind_of?(Integer)
-      self == Rational.new!(other, 1)
-    elsif other.kind_of?(Float)
-      Float(self) == other
-    else
-      other == self
-    end
-  end
-
-  #
-  # Standard comparison operator.
-  #
-  def <=> (other)
-    if other.kind_of?(Rational)
-      num = @numerator * other.denominator
-      num_a = other.numerator * @denominator
-      v = num - num_a
-      if v > 0
-	return 1
-      elsif v < 0
-	return  -1
-      else
-	return 0
-      end
-    elsif other.kind_of?(Integer)
-      return self <=> Rational.new!(other, 1)
-    elsif other.kind_of?(Float)
-      return Float(self) <=> other
-    elsif defined? other.coerce
-      x, y = other.coerce(self)
-      return x <=> y
-    else
-      return nil
-    end
-  end
-
-  def coerce(other)
-    if other.kind_of?(Float)
-      return other, self.to_f
-    elsif other.kind_of?(Integer)
-      return Rational.new!(other, 1), self
-    else
-      super
-    end
-  end
-
-  #
-  # Converts the rational to an Integer.  Not the _nearest_ integer, the
-  # truncated integer.  Study the following example carefully:
-  #   Rational(+7,4).to_i             # -> 1
-  #   Rational(-7,4).to_i             # -> -2
-  #   (-1.75).to_i                    # -> -1
-  #
-  # In other words:
-  #   Rational(-7,4) == -1.75                 # -> true
-  #   Rational(-7,4).to_i == (-1.75).to_i     # false
-  #
-  def to_i
-    Integer(@numerator.div(@denominator))
-  end
-
-  #
-  # Converts the rational to a Float.
-  #
-  def to_f
-    @numerator.to_f/@denominator.to_f
-  end
-
-  #
-  # Returns a string representation of the rational number.
-  #
-  # Example:
-  #   Rational(3,4).to_s          #  "3/4"
-  #   Rational(8).to_s            #  "8"
-  #
-  def to_s
-    if @denominator == 1
-      @numerator.to_s
-    else
-      @numerator.to_s+"/"+@denominator.to_s
-    end
-  end
-
-  #
-  # Returns +self+.
-  #
-  def to_r
-    self
-  end
-
-  #
-  # Returns a reconstructable string representation:
-  #
-  #   Rational(5,8).inspect     # -> "Rational(5, 8)"
-  #
-  def inspect
-    sprintf("Rational(%s, %s)", @numerator.inspect, @denominator.inspect)
-  end
-
-  #
-  # Returns a hash code for the object.
-  #
-  def hash
-    @numerator.hash ^ @denominator.hash
-  end
-
-  attr :numerator
-  attr :denominator
-
-  private :initialize
-end
-
-class Integer
-  #
-  # In an integer, the value _is_ the numerator of its rational equivalent.
-  # Therefore, this method returns +self+.
-  #
-  def numerator
-    self
-  end
-
-  #
-  # In an integer, the denominator is 1.  Therefore, this method returns 1.
-  #
-  def denominator
-    1
-  end
-
-  #
-  # Returns a Rational representation of this integer.
-  #
-  def to_r
-    Rational(self, 1)
-  end
-
-  #
-  # Returns the <em>greatest common denominator</em> of the two numbers (+self+
-  # and +n+).
-  #
-  # Examples:
-  #   72.gcd 168           # -> 24
-  #   19.gcd 36            # -> 1
-  #
-  # The result is positive, no matter the sign of the arguments.
-  #
-  def gcd(other)
-    min = self.abs
-    max = other.abs
-    while min > 0
-      tmp = min
-      min = max % min
-      max = tmp
-    end
-    max
-  end
-
-  #
-  # Returns the <em>lowest common multiple</em> (LCM) of the two arguments
-  # (+self+ and +other+).
-  #
-  # Examples:
-  #   6.lcm 7        # -> 42
-  #   6.lcm 9        # -> 18
-  #
-  def lcm(other)
-    if self.zero? or other.zero?
-      0
-    else
-      (self.div(self.gcd(other)) * other).abs
-    end
-  end
-
-  #
-  # Returns the GCD _and_ the LCM (see #gcd and #lcm) of the two arguments
-  # (+self+ and +other+).  This is more efficient than calculating them
-  # separately.
-  #
-  # Example:
-  #   6.gcdlcm 9     # -> [3, 18]
-  #
-  def gcdlcm(other)
-    gcd = self.gcd(other)
-    if self.zero? or other.zero?
-      [gcd, 0]
-    else
-      [gcd, (self.div(gcd) * other).abs]
-    end
-  end
-end
+warn('lib/rational.rb is deprecated') if $VERBOSE
 
 class Fixnum
-  undef quo
-  # If Rational is defined, returns a Rational number instead of a Fixnum.
-  def quo(other)
-    Rational.new!(self,1) / other
-  end
+
+  alias quof fdiv
   alias rdiv quo
 
-  # Returns a Rational number if the result is in fact rational (i.e. +other+ < 0).
-  def rpower (other)
-    if other >= 0
-      self.power!(other)
-    else
-      Rational.new!(self,1)**other
-    end
-  end
+  alias power! ** unless method_defined? :power!
+  alias rpower **
 
-  unless defined? 1.power!
-    alias power! **
-    alias ** rpower
-  end
 end
 
 class Bignum
-  unless defined? Complex
-    alias power! **
-  end
 
-  undef quo
-  # If Rational is defined, returns a Rational number instead of a Bignum.
-  def quo(other)
-    Rational.new!(self,1) / other
-  end
+  alias quof fdiv
   alias rdiv quo
 
-  # Returns a Rational number if the result is in fact rational (i.e. +other+ < 0).
-  def rpower (other)
-    if other >= 0
-      self.power!(other)
-    else
-      Rational.new!(self, 1)**other
-    end
-  end
+  alias power! ** unless method_defined? :power!
+  alias rpower **
 
-  unless defined? Complex
-    alias ** rpower
-  end
 end
diff --git a/lib/rbconfig/datadir.rb b/lib/rbconfig/datadir.rb
new file mode 100644
index 0000000000..554b7fead7
--- /dev/null
+++ b/lib/rbconfig/datadir.rb
@@ -0,0 +1,20 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+module RbConfig
+
+  ##
+  # Return the path to the data directory associated with the given package
+  # name.  Normally this is just
+  # "#{RbConfig::CONFIG['datadir']}/#{package_name}", but may be modified by
+  # packages like RubyGems to handle versioned data directories.
+
+  def self.datadir(package_name)
+    File.join(CONFIG['datadir'], package_name)
+  end unless RbConfig.respond_to?(:datadir)
+
+end
+
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
new file mode 100644
index 0000000000..7ce7b53a35
--- /dev/null
+++ b/lib/rdoc.rb
@@ -0,0 +1,421 @@
+$DEBUG_RDOC = nil
+
+# :main: README.txt
+
+##
+# = \RDoc - Ruby Documentation System
+#
+# This package contains RDoc and RDoc::Markup.  RDoc is an application that
+# produces documentation for one or more Ruby source files.  It works similarly
+# to JavaDoc, parsing the source, and extracting the definition for classes,
+# modules, and methods (along with includes and requires).  It associates with
+# these optional documentation contained in the immediately preceding comment
+# block, and then renders the result using a pluggable output formatter.
+# RDoc::Markup is a library that converts plain text into various output
+# formats.  The markup library is used to interpret the comment blocks that
+# RDoc uses to document methods, classes, and so on.
+#
+# == Roadmap
+#
+# * If you want to use RDoc to create documentation for your Ruby source files,
+#   read on.
+# * If you want to generate documentation for extensions written in C, see
+#   RDoc::Parser::C
+# * If you want to drive RDoc programmatically, see RDoc::RDoc.
+# * If you want to use the library to format text blocks into HTML, have a look
+#   at RDoc::Markup.
+# * If you want to try writing your own HTML output template, see
+#   RDoc::Generator::HTML
+#
+# == Summary
+#
+# Once installed, you can create documentation using the +rdoc+ command
+#
+#   % rdoc [options] [names...]
+#
+# For an up-to-date option summary, type
+#
+#   % rdoc --help
+#
+# A typical use might be to generate documentation for a package of Ruby
+# source (such as RDoc itself).
+#
+#   % rdoc
+#
+# This command generates documentation for all the Ruby and C source
+# files in and below the current directory.  These will be stored in a
+# documentation tree starting in the subdirectory +doc+.
+#
+# You can make this slightly more useful for your readers by having the
+# index page contain the documentation for the primary file.  In our
+# case, we could type
+#
+#   % rdoc --main rdoc.rb
+#
+# You'll find information on the various formatting tricks you can use
+# in comment blocks in the documentation this generates.
+#
+# RDoc uses file extensions to determine how to process each file.  File names
+# ending +.rb+ and +.rbw+ are assumed to be Ruby source.  Files
+# ending +.c+ are parsed as C files.  All other files are assumed to
+# contain just Markup-style markup (with or without leading '#' comment
+# markers).  If directory names are passed to RDoc, they are scanned
+# recursively for C and Ruby source files only.
+#
+# == \Options
+#
+# rdoc can be passed a variety of command-line options.  In addition,
+# options can be specified via the +RDOCOPT+ environment variable, which
+# functions similarly to the +RUBYOPT+ environment variable.
+#
+#   % export RDOCOPT="-S"
+#
+# will make rdoc default to inline method source code.  Command-line options
+# always will override those in +RDOCOPT+.
+#
+# Run:
+#
+#   rdoc --help
+#
+# for full details on rdoc's options.
+#
+# == Documenting Source Code
+#
+# Comment blocks can be written fairly naturally, either using <tt>#</tt> on
+# successive lines of the comment, or by including the comment in
+# a =begin/=end block.  If you use the latter form, the =begin line must be
+# flagged with an RDoc tag:
+#
+#   =begin rdoc
+#   Documentation to be processed by RDoc.
+#
+#   ...
+#   =end
+#
+# RDoc stops processing comments if it finds a comment line containing
+# a <tt>--</tt>.  This can be used to separate external from internal
+# comments, or to stop a comment being associated with a method, class, or
+# module.  Commenting can be turned back on with a line that starts with a
+# <tt>++</tt>.
+#
+#   ##
+#   # Extract the age and calculate the date-of-birth.
+#   #--
+#   # FIXME: fails if the birthday falls on February 29th
+#   #++
+#   # The DOB is returned as a Time object.
+#
+#   def get_dob(person)
+#     # ...
+#   end
+#
+# Names of classes, files, and any method names containing an
+# underscore or preceded by a hash character are automatically hyperlinked
+# from comment text to their description.
+#
+# Method parameter lists are extracted and displayed with the method
+# description.  If a method calls +yield+, then the parameters passed to yield
+# will also be displayed:
+#
+#   def fred
+#     ...
+#     yield line, address
+#
+# This will get documented as:
+#
+#   fred() { |line, address| ... }
+#
+# You can override this using a comment containing ':yields: ...' immediately
+# after the method definition
+#
+#   def fred # :yields: index, position
+#     # ...
+#
+#     yield line, address
+#
+# which will get documented as
+#
+#    fred() { |index, position| ... }
+#
+# +:yields:+ is an example of a documentation directive.  These appear
+# immediately after the start of the document element they are modifying.
+#
+# RDoc automatically cross-references words with underscores or camel-case.
+# To suppress cross-references, prefix the word with a \\ character.  To
+# include special characters like "\\n", you'll need to use two \\
+# characters like "\\\\\\n".
+#
+# == \Markup
+#
+# * The markup engine looks for a document's natural left margin.  This is
+#   used as the initial margin for the document.
+#
+# * Consecutive lines starting at this margin are considered to be a
+#   paragraph.
+#
+# * If a paragraph starts with a "*", "-", or with "<digit>.", then it is
+#   taken to be the start of a list.  The margin in increased to be the first
+#   non-space following the list start flag.  Subsequent lines should be
+#   indented to this new margin until the list ends.  For example:
+#
+#      * this is a list with three paragraphs in
+#        the first item.  This is the first paragraph.
+#
+#        And this is the second paragraph.
+#
+#        1. This is an indented, numbered list.
+#        2. This is the second item in that list
+#
+#        This is the third conventional paragraph in the
+#        first list item.
+#
+#      * This is the second item in the original list
+#
+# * You can also construct labeled lists, sometimes called description
+#   or definition lists.  Do this by putting the label in square brackets
+#   and indenting the list body:
+#
+#       [cat]  a small furry mammal
+#              that seems to sleep a lot
+#
+#       [ant]  a little insect that is known
+#              to enjoy picnics
+#
+#   A minor variation on labeled lists uses two colons to separate the
+#   label from the list body:
+#
+#       cat::  a small furry mammal
+#              that seems to sleep a lot
+#
+#       ant::  a little insect that is known
+#              to enjoy picnics
+#
+#   This latter style guarantees that the list bodies' left margins are
+#   aligned: think of them as a two column table.
+#
+# * Any line that starts to the right of the current margin is treated
+#   as verbatim text.  This is useful for code listings.  The example of a
+#   list above is also verbatim text.
+#
+# * A line starting with an equals sign (=) is treated as a
+#   heading.  Level one headings have one equals sign, level two headings
+#   have two,and so on.
+#
+# * A line starting with three or more hyphens (at the current indent)
+#   generates a horizontal rule.  The more hyphens, the thicker the rule
+#   (within reason, and if supported by the output device)
+#
+# * You can use markup within text (except verbatim) to change the
+#   appearance of parts of that text.  Out of the box, RDoc::Markup
+#   supports word-based and general markup.
+#
+#   Word-based markup uses flag characters around individual words:
+#
+#   [<tt>\*word*</tt>]  displays word in a *bold* font
+#   [<tt>\_word_</tt>]  displays word in an _emphasized_ font
+#   [<tt>\+word+</tt>]  displays word in a +code+ font
+#
+#   General markup affects text between a start delimiter and and end
+#   delimiter.  Not surprisingly, these delimiters look like HTML markup.
+#
+#   [<tt>\<b>text...</b></tt>]    displays word in a *bold* font
+#   [<tt>\<em>text...</em></tt>]  displays word in an _emphasized_ font
+#   [<tt>\<i>text...</i></tt>]    displays word in an <i>italicized</i> font
+#   [<tt>\<tt>text...\</tt></tt>] displays word in a +code+ font
+#
+#   Unlike conventional Wiki markup, general markup can cross line
+#   boundaries.  You can turn off the interpretation of markup by
+#   preceding the first character with a backslash.  This only works for
+#   simple markup, not HTML-style markup.
+#
+# * Hyperlinks to the web starting http:, mailto:, ftp:, or www. are
+#   recognized.  An HTTP url that references an external image file is
+#   converted into an inline \<IMG..>.  Hyperlinks starting 'link:' are
+#   assumed to refer to local files whose path is relative to the --op
+#   directory.
+#
+#   Hyperlinks can also be of the form <tt>label</tt>[url], in which
+#   case the label is used in the displayed text, and +url+ is
+#   used as the target.  If +label+ contains multiple words,
+#   put it in braces: <em>{multi word label}[</em>url<em>]</em>.
+#
+#   Example hyperlinks:
+#
+#     link:RDoc.html
+#     http://rdoc.rubyforge.org
+#     mailto:user@example.com
+#     {RDoc Documentation}[http://rdoc.rubyforge.org]
+#     {RDoc Markup}[link:RDoc/Markup.html]
+#
+# == Directives
+#
+# [+:nodoc:+ / +:nodoc:+ all]
+#   This directive prevents documentation for the element from
+#   being generated.  For classes and modules, the methods, aliases,
+#   constants, and attributes directly within the affected class or
+#   module also will be omitted.  By default, though, modules and
+#   classes within that class of module _will_ be documented.  This is
+#   turned off by adding the +all+ modifier.
+#
+#     module MyModule # :nodoc:
+#       class Input
+#       end
+#     end
+#
+#     module OtherModule # :nodoc: all
+#       class Output
+#       end
+#     end
+#
+#   In the above code, only class <tt>MyModule::Input</tt> will be documented.
+#   The +:nodoc:+ directive is global across all files for the class or module
+#   to which it applies, so use +:stopdoc:+/+:startdoc:+ to suppress
+#   documentation only for a particular set of methods, etc.
+#
+# [+:doc:+]
+#   Forces a method or attribute to be documented even if it wouldn't be
+#   otherwise.  Useful if, for example, you want to include documentation of a
+#   particular private method.
+#
+# [+:notnew:+]
+#   Only applicable to the +initialize+ instance method.  Normally RDoc
+#   assumes that the documentation and parameters for +initialize+ are
+#   actually for the +new+ method, and so fakes out a +new+ for the class.
+#   The +:notnew:+ modifier stops this.  Remember that +initialize+ is private,
+#   so you won't see the documentation unless you use the +-a+ command line
+#   option.
+#
+# Comment blocks can contain other directives:
+#
+# [<tt>:section: title</tt>]
+#   Starts a new section in the output.  The title following +:section:+ is
+#   used as the section heading, and the remainder of the comment containing
+#   the section is used as introductory text.  Subsequent methods, aliases,
+#   attributes, and classes will be documented in this section.  A :section:
+#   comment block may have one or more lines before the :section: directive.
+#   These will be removed, and any identical lines at the end of the block are
+#   also removed.  This allows you to add visual cues such as:
+#
+#     # ----------------------------------------
+#     # :section: My Section
+#     # This is the section that I wrote.
+#     # See it glisten in the noon-day sun.
+#     # ----------------------------------------
+#
+# [+:call-seq:+]
+#   Lines up to the next blank line in the comment are treated as the method's
+#   calling sequence, overriding the default parsing of method parameters and
+#   yield arguments.
+#
+# [+:include:+ _filename_]
+#   \Include the contents of the named file at this point.  The file will be
+#   searched for in the directories listed by the +--include+ option, or in
+#   the current directory by default.  The contents of the file will be
+#   shifted to have the same indentation as the ':' at the start of
+#   the :include: directive.
+#
+# [+:title:+ _text_]
+#   Sets the title for the document.  Equivalent to the <tt>--title</tt>
+#   command line parameter.  (The command line parameter overrides any :title:
+#   directive in the source).
+#
+# [+:enddoc:+]
+#   Document nothing further at the current level.
+#
+# [+:main:+ _name_]
+#   Equivalent to the <tt>--main</tt> command line parameter.
+#
+# [+:stopdoc:+ / +:startdoc:+]
+#   Stop and start adding new documentation elements to the current container.
+#   For example, if a class has a number of constants that you don't want to
+#   document, put a +:stopdoc:+ before the first, and a +:startdoc:+ after the
+#   last.  If you don't specify a +:startdoc:+ by the end of the container,
+#   disables documentation for the entire class or module.
+#
+# Further directives can be found in RDoc::Parser::Ruby and RDoc::Parser::C
+#
+# == Other stuff
+#
+# RDoc is currently being maintained by Eric Hodel <drbrain@segment7.net>
+#
+# Dave Thomas <dave@pragmaticprogrammer.com> is the original author of RDoc.
+#
+# == Credits
+#
+# * The Ruby parser in rdoc/parse.rb is based heavily on the outstanding
+#   work of Keiju ISHITSUKA of Nippon Rational Inc, who produced the Ruby
+#   parser for irb and the rtags package.
+#
+# * Charset patch from MoonWolf.
+#
+# * Rich Kilmer wrote the kilmer.rb output template.
+#
+# * Dan Brickley led the design of the RDF format.
+#
+# == License
+#
+# RDoc is Copyright (c) 2001-2003 Dave Thomas, The Pragmatic Programmers.  It
+# is free software, and may be redistributed under the terms specified
+# in the README file of the Ruby distribution.
+#
+# == Warranty
+#
+# This software is provided "as is" and without any express or implied
+# warranties, including, without limitation, the implied warranties of
+# merchantibility and fitness for a particular purpose.
+
+module RDoc
+
+  ##
+  # Exception thrown by any rdoc error.
+
+  class Error < RuntimeError; end
+
+  def self.const_missing const_name # :nodoc:
+    if const_name.to_s == 'RDocError' then
+      warn "RDoc::RDocError is deprecated"
+      return Error
+    end
+
+    super
+  end
+
+  ##
+  # RDoc version you are using
+
+  VERSION = '2.5.8'
+
+  ##
+  # Name of the dotfile that contains the description of files to be processed
+  # in the current directory
+
+  DOT_DOC_FILENAME = ".document"
+
+  ##
+  # General RDoc modifiers
+
+  GENERAL_MODIFIERS = %w[nodoc].freeze
+
+  ##
+  # RDoc modifiers for classes
+
+  CLASS_MODIFIERS = GENERAL_MODIFIERS
+
+  ##
+  # RDoc modifiers for attributes
+
+  ATTR_MODIFIERS = GENERAL_MODIFIERS
+
+  ##
+  # RDoc modifiers for constants
+
+  CONSTANT_MODIFIERS = GENERAL_MODIFIERS
+
+  ##
+  # RDoc modifiers for methods
+
+  METHOD_MODIFIERS = GENERAL_MODIFIERS +
+    %w[arg args yield yields notnew not-new not_new doc]
+
+end
+
diff --git a/lib/rdoc/README b/lib/rdoc/README
deleted file mode 100644
index 89ea0fbd3f..0000000000
--- a/lib/rdoc/README
+++ /dev/null
@@ -1,489 +0,0 @@
-= RDOC - Ruby Documentation System
-
-This package contains Rdoc and SimpleMarkup. Rdoc is an application
-that produces documentation for one or more Ruby source files. We work
-similarly to JavaDoc, parsing the source, and extracting the
-definition for classes, modules, and methods (along with includes and
-requires).  We associate with these optional documentation contained
-in the immediately preceding comment block, and then render the result
-using a pluggable output formatter. (Currently, HTML is the only
-supported format. Markup is a library that converts plain text into
-various output formats. The Markup library is used to interpret the
-comment blocks that Rdoc uses to document methods, classes, and so on.
-
-This library contains two packages, rdoc itself and a text markup
-library, 'markup'. 
-
-== Roadmap
-
-* If you want to use Rdoc to create documentation for your Ruby source
-  files, read on.
-* If you want to include extensions written in C, see rdoc/parsers/parse_c.rb.
-* For information on the various markups available in comment
-  blocks, see markup/simple_markup.rb.
-* If you want to drive Rdoc programatically, see RDoc::RDoc.
-* If you want to use the library to format text blocks into HTML,
-  have a look at SM::SimpleMarkup.
-* If you want to try writing your own HTML output template, see
-  RDoc::Page.
-
-== Summary
-
-Once installed, you can create documentation using the 'rdoc' command
-(the command is 'rdoc.bat' under Windows)
-
-  % rdoc [options]  [names...]
-
-Type "rdoc --help" for an up-to-date option summary.
-
-A typical use might be to generate documentation for a package of Ruby
-source (such as rdoc itself). 
-
-  % rdoc
-
-This command generates documentation for all the Ruby and C source
-files in and below the current directory. These will be stored in a
-documentation tree starting in the subdirectory 'doc'.
-
-You can make this slightly more useful for your readers by having the
-index page contain the documentation for the primary file. In our
-case, we could type
-
-  % rdoc --main rdoc/rdoc.rb
-
-You'll find information on the various formatting tricks you can use
-in comment blocks in the documentation this generates.
-
-RDoc uses file extensions to determine how to process each file. File
-names ending <tt>.rb</tt> and <tt>.rbw</tt> are assumed to be Ruby
-source. Files ending <tt>.c</tt> are parsed as C files. All other
-files are assumed to contain just SimpleMarkup-style markup (with or
-without leading '#' comment markers). If directory names are passed to
-RDoc, they are scanned recursively for C and Ruby source files only.
-
-== Credits
-
-* The Ruby parser in rdoc/parse.rb is based heavily on the outstanding
-  work of Keiju ISHITSUKA of Nippon Rational Inc, who produced the Ruby
-  parser for irb and the rtags package.
-
-* Code to diagram classes and modules was written by Sergey A Yanovitsky
-  (Jah) of Enticla. 
-
-* Charset patch from MoonWolf.
-
-* Rich Kilmer wrote the kilmer.rb output template.
-
-* Dan Brickley led the design of the RDF format.
-
-== License
-
-RDoc is Copyright (c) 2001-2003 Dave Thomas, The Pragmatic Programmers.  It
-is free software, and may be redistributed under the terms specified
-in the README file of the Ruby distribution.
-
-= Usage
-
-RDoc is invoked from the command line using:
-
-   % rdoc <options> [name...]
-
-Files are parsed, and the information they contain collected, before
-any output is produced. This allows cross references between all files
-to be resolved. If a name is a directory, it is traversed. If no
-names are specified, all Ruby files in the current directory (and
-subdirectories) are processed.
-
-Options are:
-
-[<tt>--accessor</tt> <i>name[,name...]</i>]
-    specifies the name(s) of additional methods that should be treated
-    as if they were <tt>attr_</tt><i>xxx</i> methods. Specifying
-    "--accessor db_opt" means lines such as
-
-         db_opt :name, :age
-  
-    will get parsed and displayed in the documentation. Each name may have an
-    optional "=flagtext" appended, in which case the given flagtext will appear
-    where (for example) the 'rw' appears for attr_accessor.
-
-[<tt>--all</tt>]
-    include protected and private methods in the output (by default
-    only public methods are included)
-
-[<tt>--charset</tt> _charset_]
-    Set the character set for the generated HTML.
-
-[<tt>--diagram</tt>]
-    include diagrams showing modules and classes.  This is currently
-    an experimental feature, and may not be supported by all output
-    templates. You need dot V1.8.6 or later to use the --diagram
-    option correctly (http://www.research.att.com/sw/tools/graphviz/).
-
-[<tt>--exclude</tt> <i>pattern</i>]
-    exclude files and directories matching this pattern from processing
-
-[<tt>--extension</tt> <i>new=old</i>]
-    treat files ending <i>.new</i> as if they ended
-    <i>.old</i>. Saying '--extension cgi=rb' causes RDoc to treat .cgi
-    files as Ruby source.
-
-[<tt>fileboxes</tt>]
-    Classes are put in boxes which represents files, where these
-    classes reside. Classes shared between more than one file are
-    shown with list of files that sharing them.  Silently discarded if
-    --diagram is not given Experimental.
-
-[<tt>--fmt</tt> _fmt_]
-    generate output in a particular format.
-
-[<tt>--help</tt>]
-    generate a usage summary.
-
-[<tt>--help-output</tt>]
-    explain the various output options.
-
-[<tt>--image-format</tt> <i>gif/png/jpg/jpeg</i>]
-    sets output image format for diagrams. Can be png, gif, jpeg,
-    jpg. If this option is omitted, png is used. Requires --diagram.
-
-[<tt>--include</tt> <i>dir,...</i>]
-    specify one or more directories to be searched when satisfying
-    :+include+: directives. Multiple <tt>--include</tt> options may be
-    given. The directory containing the file currently being processed
-    is always searched.
-
-[<tt>--inline-source</tt>]
-    By default, the source code of methods is shown in a popup. With
-    this option, it's displayed inline.
-
-[<tt>line-numbers</tt>]
-    include line numbers in the source code
-
-[<tt>--main</tt> _name_]
-    the class of module _name_ will appear on the index page. If you
-    want to set a particular file as a main page (a README, for
-    example) simply specifiy its name as the first on the command
-    line.
-
-[<tt>--merge</tt>]
-    when generating _ri_ output, if classes being processed already
-    exist in the destination directory, merge in the current details
-    rather than overwrite them.
-
-[<tt>--one-file</tt>]
-    place all the output into a single file
-
-[<tt>--op</tt> _dir_]
-    set the output directory to _dir_ (the default is the directory
-    "doc")
-
-[<tt>--op-name</tt> _name_]
-    set the name of the output. Has no effect for HTML.
-    "doc")
-
-[<tt>--opname</tt> _name_]
-    set the output name (has no effect for HTML).
-
-[<tt>--promiscuous</tt>]
-    If a module or class is defined in more than one source file, and
-    you click on a particular file's name in the top navigation pane,
-    RDoc will normally only show you the inner classes and modules of
-    that class that are defined in the particular file. Using this
-    option makes it show all classes and modules defined in the class,
-    regardless of the file they were defined in.
-
-[<tt>--quiet</tt>]
-    do not display progress messages
-
-[<tt>--ri</tt>, <tt>--ri-site</tt>, _and_ <tt>--ri-system</tt>]
-    generate output than can be read by the _ri_ command-line tool.
-    By default --ri places its output in ~/.rdoc, --ri-site in
-    $datadir/ri/<ver>/site, and --ri-system in
-    $datadir/ri/<ver>/system. All can be overridden with a subsequent
-    --op option. All default directories are in ri's default search
-    path.
-
-[<tt>--show-hash</tt>]
-    A name of the form #name in a comment is a possible hyperlink to
-    an instance method name. When displayed, the '#' is removed unless
-    this option is specified
-
-[<tt>--style</tt> <i>stylesheet url</i>]
-    specifies the URL of an external stylesheet to use (rather than
-    generating one of our own)
-
-[<tt>tab-width</tt> _n_]
-    set the width of tab characters (default 8)
-
-[<tt>--template</tt> <i>name</i>]
-    specify an alternate template to use when generating output (the
-    default is 'standard'). This template should be in a directory
-    accessible via $: as rdoc/generators/xxxx_template, where 'xxxx'
-    depends on the output formatter.
-
-[<tt>--version</tt>]
-   display  RDoc's version
-
-[<tt>--webcvs</tt> _url_]
-    Specify a URL for linking to a web frontend to CVS. If the URL
-    contains a '\%s', the name of the current file will be
-    substituted; if the URL doesn't contain a '\%s', the filename will
-    be appended to it.
-
-= Example
-
-A typical small Ruby program commented using RDoc might be as follows. You
-can see the formatted result in EXAMPLE.rb and Anagram.
-
-      :include: EXAMPLE.rb
-
-= Markup
-
-Comment blocks can be written fairly naturally, either using '#' on
-successive lines of the comment, or by including the comment in 
-an =begin/=end block. If you use the latter form, the =begin line
-must be flagged with an RDoc tag:
-
-  =begin rdoc
-  Documentation to 
-  be processed by RDoc.
-  =end
-
-Paragraphs are lines that share the left margin. Text indented past
-this margin are formatted verbatim.
-
-1. Lists are typed as indented paragraphs with:
-   * a '*' or '-' (for bullet lists)
-   * a digit followed by a period for 
-     numbered lists
-   * an upper or lower case letter followed
-     by a period for alpha lists.
-
-   For example, the input that produced the above paragraph looked like
-       1. Lists are typed as indented 
-          paragraphs with:
-          * a '*' or '-' (for bullet lists)
-          * a digit followed by a period for 
-            numbered lists
-          * an upper or lower case letter followed
-            by a period for alpha lists.
-
-2. Labeled lists (sometimes called description
-   lists) are typed using square brackets for the label.
-      [cat]   small domestic animal
-      [+cat+] command to copy standard input
-
-3. Labeled lists may also be produced by putting a double colon
-   after the label. This sets the result in tabular form, so the
-   descriptions all line up. This was used to create the 'author'
-   block at the bottom of this description.
-      cat::   small domestic animal
-      +cat+:: command to copy standard input
-
-   For both kinds of labeled lists, if the body text starts on the same
-   line as the label, then the start of that text determines the block
-   indent for the rest of the body. The text may also start on the line
-   following the label, indented from the start of the label. This is
-   often preferable if the label is long. Both the following are
-   valid labeled list entries:
-
-      <tt>--output</tt> <i>name [, name]</i>::
-          specify the name of one or more output files. If multiple
-          files are present, the first is used as the index.
-
-      <tt>--quiet:</tt>:: do not output the names, sizes, byte counts,
-                          index areas, or bit ratios of units as
-                          they are processed.
-
-4. Headings are entered using equals signs
-
-      = Level One Heading
-      == Level Two Heading
-   and so on
-
-5. Rules (horizontal lines) are entered using three or
-   more hyphens.
-
-6. Non-verbatim text can be marked up:
-
-   _italic_::     \_word_ or \<em>text</em>
-   *bold*::       \*word* or \<b>text</b>
-   +typewriter+:: \+word+ or \<tt>text</tt>
-
-   The first form only works around 'words', where a word is a
-   sequence of upper and lower case letters and underscores. Putting a
-   backslash before inline markup stops it being interpreted, which is
-   how I created the table above:
-
-     _italic_::     \_word_ or \<em>text</em>
-     *bold*::       \*word* or \<b>text</b>
-     +typewriter+:: \+word+ or \<tt>text</tt>
-
-7. Names of classes, source files, and any method names
-   containing an underscore or preceded by a hash
-   character are automatically hyperlinked from
-   comment text to their description. 
-
-8. Hyperlinks to the web starting http:, mailto:, ftp:, or www. are
-   recognized. An HTTP url that references an external image file is
-   converted into an inline <IMG..>.  Hyperlinks starting 'link:' are
-   assumed to refer to local files whose path is relative to the --op
-   directory.
-
-   Hyperlinks can also be of the form <tt>label</tt>[url], in which
-   case the label is used in the displayed text, and <tt>url</tt> is
-   used as the target. If <tt>label</tt> contains multiple words,
-   put it in braces: <em>{multi word label}[</em>url<em>]</em>.
-       
-9. Method parameter lists are extracted and displayed with
-   the method description. If a method calls +yield+, then
-   the parameters passed to yield will also be displayed:
-
-      def fred
-        ...
-        yield line, address
-
-   This will get documented as
-
-      fred() { |line, address| ... }
-
-   You can override this using a comment containing 
-   ':yields: ...' immediately after the method definition
-
-      def fred      # :yields: index, position
-        ...
-        yield line, address
-
-   which will get documented as
-
-       fred() { |index, position| ... }
-
-
-10. ':yields:' is an example of a documentation modifier. These appear
-    immediately after the start of the document element they are modifying.
-    Other modifiers include
-
-    [<tt>:nodoc:</tt><i>[all]</i>]
-         don't include this element in the documentation.  For classes
-         and modules, the methods, aliases, constants, and attributes
-         directly within the affected class or module will also be
-         omitted.  By default, though, modules and classes within that
-         class of module _will_ be documented. This is turned off by
-         adding the +all+ modifier.
-
-              module SM  #:nodoc:
-                class Input
-                end
-              end
-              module Markup #:nodoc: all
-                class Output
-                end
-              end
-
-         In the above code, only class <tt>SM::Input</tt> will be
-         documented.
-
-    [<tt>:doc:</tt>]
-         force a method or attribute to be documented even if it
-         wouldn't otherwise be. Useful if, for example, you want to
-         include documentation of a particular private method.
-
-    [<tt>:notnew:</tt>]
-         only applicable to the +initialize+ instance method. Normally
-         RDoc assumes that the documentation and parameters for
-         #initialize are actually for the ::new method, and so fakes
-         out a ::new for the class. THe :notnew: modifier stops
-         this. Remember that #initialize is protected, so you won't
-         see the documentation unless you use the -a command line
-         option.
-
-
-11. RDoc stops processing comments if it finds a comment
-    line containing '<tt>#--</tt>'. This can be used to 
-    separate external from internal comments, or 
-    to stop a comment being associated with a method, 
-    class, or module. Commenting can be turned back on with
-    a line that starts '<tt>#++</tt>'.
-
-        # Extract the age and calculate the
-        # date-of-birth.
-        #--
-        # FIXME: fails if the birthday falls on
-        # February 29th
-        #++
-        # The DOB is returned as a Time object.
-
-        def get_dob(person)
-           ...
-
-12. Comment blocks can contain other directives:
-
-    [<tt>:section: title</tt>]
-        Starts a new section in the output. The title following
-	<tt>:section:</tt> is used as the section heading, and the
-	remainder of the comment containing the section is used as
-	introductory text. Subsequent methods, aliases, attributes,
-	and classes will be documented in this section. A :section:
-	comment block may have one or more lines before the :section:
-	directive. These will be removed, and any identical lines at
-	the end of the block are also removed. This allows you to add
-	visual cues such as
-
-           # ----------------------------------------
-	   # :section: My Section
-	   # This is the section that I wrote.
-	   # See it glisten in the noon-day sun.
-           # ----------------------------------------
-
-    [<tt>call-seq:</tt>]
-        lines up to the next blank line in the comment are treated as
-        the method's calling sequence, overriding the
-        default parsing of method parameters and yield arguments.
-
-    [<tt>:include:</tt><i>filename</i>] 
-         include the contents of the named file at this point. The
-         file will be searched for in the directories listed by
-         the <tt>--include</tt> option, or in the current
-         directory by default.  The contents of the file will be
-         shifted to have the same indentation as the ':' at the
-         start of the :include: directive.
-
-    [<tt>:title:</tt><i>text</i>]
-         Sets the title for the document. Equivalent to the --title command
-         line parameter. (The command line parameter overrides any :title:
-         directive in the source).
-
-    [<tt>:enddoc:</tt>]
-         Document nothing further at the current level.
-
-    [<tt>:main:</tt><i>name</i>]
-         Equivalent to the --main command line parameter.
-
-    [<tt>:stopdoc: / :startdoc:</tt>]
-         Stop and start adding new documentation elements to the
-         current container. For example, if a class has a number of
-         constants that you don't want to document, put a
-         <tt>:stopdoc:</tt> before the first, and a
-         <tt>:startdoc:</tt> after the last. If you don't specifiy a
-         <tt>:startdoc:</tt> by the end of the container, disables
-         documentation for the entire class or module.
-
-
----
-
-See also markup/simple_markup.rb.
-
-= Other stuff
-
-Author::   Dave Thomas <dave@pragmaticprogrammer.com>
-Requires:: Ruby 1.8.1 or later
-License::  Copyright (c) 2001-2003 Dave Thomas.
-           Released under the same license as Ruby.
-
-== Warranty
-
-This software is provided "as is" and without any express or
-implied warranties, including, without limitation, the implied
-warranties of merchantibility and fitness for a particular
-purpose.
diff --git a/lib/rdoc/alias.rb b/lib/rdoc/alias.rb
new file mode 100644
index 0000000000..6cd9af09d4
--- /dev/null
+++ b/lib/rdoc/alias.rb
@@ -0,0 +1,54 @@
+require 'rdoc/code_object'
+
+##
+# Represent an alias, which is an old_name/new_name pair associated with a
+# particular context
+
+class RDoc::Alias < RDoc::CodeObject
+
+  ##
+  # Allow comments to be overridden
+
+  attr_writer :comment
+
+  ##
+  # Aliased name
+
+  attr_accessor :new_name
+
+  ##
+  # Aliasee's name
+
+  attr_accessor :old_name
+
+  ##
+  # Source file token stream
+
+  attr_accessor :text
+
+  ##
+  # Creates a new Alias with a token stream of +text+ that aliases +old_name+
+  # to +new_name+ and has +comment+
+
+  def initialize(text, old_name, new_name, comment)
+    super()
+    @text = text
+    @old_name = old_name
+    @new_name = new_name
+    self.comment = comment
+  end
+
+  def inspect # :nodoc:
+    parent_name = parent ? parent.name : '(unknown)'
+    "#<%s:0x%x %s.alias_method %s, %s>" % [
+      self.class, object_id,
+      parent_name, @old_name, @new_name,
+    ]
+  end
+
+  def to_s # :nodoc:
+    "alias: #{self.old_name} -> #{self.new_name}\n#{self.comment}"
+  end
+
+end
+
diff --git a/lib/rdoc/anon_class.rb b/lib/rdoc/anon_class.rb
new file mode 100644
index 0000000000..0a684f2dfb
--- /dev/null
+++ b/lib/rdoc/anon_class.rb
@@ -0,0 +1,10 @@
+require 'rdoc/class_module'
+
+##
+# An anonymous class like:
+#
+#   c = Class.new do end
+
+class RDoc::AnonClass < RDoc::ClassModule
+end
+
diff --git a/lib/rdoc/any_method.rb b/lib/rdoc/any_method.rb
new file mode 100644
index 0000000000..d742daa7b8
--- /dev/null
+++ b/lib/rdoc/any_method.rb
@@ -0,0 +1,290 @@
+require 'rdoc/code_object'
+require 'rdoc/tokenstream'
+
+##
+# AnyMethod is the base class for objects representing methods
+
+class RDoc::AnyMethod < RDoc::CodeObject
+
+  MARSHAL_VERSION = 1 # :nodoc:
+
+  include Comparable
+
+  ##
+  # Method name
+
+  attr_writer :name
+
+  ##
+  # public, protected, private
+
+  attr_accessor :visibility
+
+  ##
+  # Parameters yielded by the called block
+
+  attr_accessor :block_params
+
+  ##
+  # Don't rename \#initialize to \::new
+
+  attr_accessor :dont_rename_initialize
+
+  ##
+  # Is this a singleton method?
+
+  attr_accessor :singleton
+
+  ##
+  # Source file token stream
+
+  attr_reader :text
+
+  ##
+  # Array of other names for this method
+
+  attr_reader :aliases
+
+  ##
+  # The method we're aliasing
+
+  attr_accessor :is_alias_for
+
+  ##
+  # Parameters for this method
+
+  attr_accessor :params
+
+  ##
+  # Different ways to call this method
+
+  attr_accessor :call_seq
+
+  include RDoc::TokenStream
+
+  def initialize(text, name)
+    super()
+
+    @text = text
+    @name = name
+
+    @aliases                = []
+    @block_params           = nil
+    @call_seq               = nil
+    @dont_rename_initialize = false
+    @is_alias_for           = nil
+    @params                 = nil
+    @parent_name            = nil
+    @singleton              = nil
+    @token_stream           = nil
+    @visibility             = :public
+  end
+
+  ##
+  # Order by #singleton then #name
+
+  def <=>(other)
+    [@singleton ? 0 : 1, @name] <=> [other.singleton ? 0 : 1, other.name]
+  end
+
+  ##
+  # Adds +method+ as an alias for this method
+
+  def add_alias(method)
+    @aliases << method
+  end
+
+  ##
+  # HTML fragment reference for this method
+
+  def aref
+    type = singleton ? 'c' : 'i'
+
+    "method-#{type}-#{CGI.escape name}"
+  end
+
+  ##
+  # The call_seq or the param_seq with method name, if there is no call_seq.
+  #
+  # Use this for displaying a method's argument lists.
+
+  def arglists
+    if @call_seq then
+      @call_seq
+    elsif @params then
+      "#{name}#{param_seq}"
+    end
+  end
+
+  ##
+  # HTML id-friendly method name
+
+  def html_name
+    @name.gsub(/[^a-z]+/, '-')
+  end
+
+  def inspect # :nodoc:
+    alias_for = @is_alias_for ? " (alias for #{@is_alias_for.name})" : nil
+    "#<%s:0x%x %s (%s)%s>" % [
+      self.class, object_id,
+      full_name,
+      visibility,
+      alias_for,
+    ]
+  end
+
+  ##
+  # Full method name including namespace
+
+  def full_name
+    @full_name ||= "#{@parent ? @parent.full_name : '(unknown)'}#{pretty_name}"
+  end
+
+  ##
+  # Dumps this AnyMethod for use by ri.  See also #marshal_load
+
+  def marshal_dump
+    aliases = @aliases.map do |a|
+      [a.full_name, parse(a.comment)]
+    end
+
+    [ MARSHAL_VERSION,
+      @name,
+      full_name,
+      @singleton,
+      @visibility,
+      parse(@comment),
+      @call_seq,
+      @block_params,
+      aliases,
+      @params,
+    ]
+  end
+
+  ##
+  # Loads this AnyMethod from +array+.  For a loaded AnyMethod the following
+  # methods will return cached values:
+  #
+  # * #full_name
+  # * #parent_name
+
+  def marshal_load(array)
+    @dont_rename_initialize = nil
+    @is_alias_for           = nil
+    @token_stream           = nil
+    @aliases                = []
+
+    @name         = array[1]
+    @full_name    = array[2]
+    @singleton    = array[3]
+    @visibility   = array[4]
+    @comment      = array[5]
+    @call_seq     = array[6]
+    @block_params = array[7]
+    @params       = array[9]
+
+    @parent_name = if @full_name =~ /#/ then
+                     $`
+                   else
+                     name = @full_name.split('::')
+                     name.pop
+                     name.join '::'
+                   end
+
+    array[8].each do |new_name, comment|
+      add_alias RDoc::Alias.new(nil, @name, new_name, comment)
+    end
+  end
+
+  ##
+  # Method name
+
+  def name
+    return @name if @name
+
+    @name = @call_seq[/^.*?\.(\w+)/, 1] || @call_seq if @call_seq
+  end
+
+  ##
+  # Pretty parameter list for this method
+
+  def param_seq
+    params = @params.gsub(/\s*\#.*/, '')
+    params = params.tr("\n", " ").squeeze(" ")
+    params = "(#{params})" unless params[0] == ?(
+
+    if @block_params then
+      # If this method has explicit block parameters, remove any explicit
+      # &block
+      params.sub!(/,?\s*&\w+/, '')
+
+      block = @block_params.gsub(/\s*\#.*/, '')
+      block = block.tr("\n", " ").squeeze(" ")
+      if block[0] == ?(
+        block.sub!(/^\(/, '').sub!(/\)/, '')
+      end
+      params << " { |#{block}| ... }"
+    end
+
+    params
+  end
+
+  ##
+  # Name of our parent with special handling for un-marshaled methods
+
+  def parent_name
+    @parent_name || super
+  end
+
+  ##
+  # Path to this method
+
+  def path
+    "#{@parent.path}##{aref}"
+  end
+
+  ##
+  # Method name with class/instance indicator
+
+  def pretty_name
+    "#{singleton ? '::' : '#'}#{@name}"
+  end
+
+  def pretty_print q # :nodoc:
+    alias_for = @is_alias_for ? "alias for #{@is_alias_for.name}" : nil
+
+    q.group 2, "[#{self.class.name} #{full_name} #{visibility}", "]" do
+      if alias_for then
+        q.breakable
+        q.text alias_for
+      end
+
+      if text then
+        q.breakable
+        q.text "text:"
+        q.breakable
+        q.pp @text
+      end
+
+      unless comment.empty? then
+        q.breakable
+        q.text "comment:"
+        q.breakable
+        q.pp @comment
+      end
+    end
+  end
+
+  def to_s # :nodoc:
+    "#{self.class.name}: #{full_name} (#{@text})\n#{@comment}"
+  end
+
+  ##
+  # Type of method (class or instance)
+
+  def type
+    singleton ? 'class' : 'instance'
+  end
+
+end
+
diff --git a/lib/rdoc/attr.rb b/lib/rdoc/attr.rb
new file mode 100644
index 0000000000..9b8c4562c2
--- /dev/null
+++ b/lib/rdoc/attr.rb
@@ -0,0 +1,178 @@
+require 'rdoc/code_object'
+
+##
+# An attribute created by \#attr, \#attr_reader, \#attr_writer or
+# \#attr_accessor
+
+class RDoc::Attr < RDoc::CodeObject
+
+  MARSHAL_VERSION = 0 # :nodoc:
+
+  ##
+  # Name of the attribute
+
+  attr_accessor :name
+
+  ##
+  # Is the attribute readable, writable or both?
+
+  attr_accessor :rw
+
+  ##
+  # Source file token stream
+
+  attr_accessor :text
+
+  ##
+  # public, protected, private
+
+  attr_accessor :visibility
+
+  def initialize(text, name, rw, comment)
+    super()
+    @text = text
+    @name = name
+    @rw = rw
+    @visibility = :public
+    self.comment = comment
+  end
+
+  ##
+  # Attributes are ordered by name
+
+  def <=>(other)
+    self.name <=> other.name
+  end
+
+  ##
+  # Attributes are equal when their names and rw is identical
+
+  def == other
+    self.class == other.class and
+      self.name == other.name and
+      self.rw == other.rw
+  end
+
+  ##
+  # Returns nil, for duck typing with RDoc::AnyMethod
+
+  def arglists
+  end
+
+  ##
+  # Returns nil, for duck typing with RDoc::AnyMethod
+
+  def block_params
+  end
+
+  ##
+  # Returns nil, for duck typing with RDoc::AnyMethod
+
+  def call_seq
+  end
+
+  ##
+  # Partially bogus as Attr has no parent.  For duck typing with
+  # RDoc::AnyMethod.
+
+  def full_name
+    @full_name ||= "#{@parent ? @parent.full_name : '(unknown)'}##{name}"
+  end
+
+  ##
+  # An HTML id-friendly representation of #name
+
+  def html_name
+    @name.gsub(/[^a-z]+/, '-')
+  end
+
+  def inspect # :nodoc:
+    attr = case rw
+           when 'RW' then :attr_accessor
+           when 'R'  then :attr_reader
+           when 'W'  then :attr_writer
+           else
+               " (#{rw})"
+           end
+
+      "#<%s:0x%x %s.%s :%s>" % [
+        self.class, object_id,
+        parent_name, attr, @name,
+      ]
+  end
+
+  ##
+  # Dumps this Attr for use by ri.  See also #marshal_load
+
+  def marshal_dump
+    [ MARSHAL_VERSION,
+      @name,
+      full_name,
+      @rw,
+      @visibility,
+      parse(@comment),
+    ]
+  end
+
+  ##
+  # Loads this AnyMethod from +array+.  For a loaded AnyMethod the following
+  # methods will return cached values:
+  #
+  # * #full_name
+  # * #parent_name
+
+  def marshal_load array
+    @name       = array[1]
+    @full_name  = array[2]
+    @rw         = array[3]
+    @visibility = array[4]
+    @comment    = array[5]
+
+    @parent_name = @full_name
+  end
+
+  ##
+  # Name of our parent with special handling for un-marshaled methods
+
+  def parent_name
+    @parent_name || super
+  end
+
+  ##
+  # For duck typing with RDoc::AnyMethod, returns nil
+
+  def params
+    nil
+  end
+
+  ##
+  # URL path for this attribute
+
+  def path
+    "#{@parent.path}##{@name}"
+  end
+
+  ##
+  # For duck typing with RDoc::AnyMethod
+
+  def singleton
+    false
+  end
+
+  def to_s # :nodoc:
+    "#{type} #{name}\n#{comment}"
+  end
+
+  ##
+  # Returns attr_reader, attr_writer or attr_accessor as appropriate
+
+  def type
+    case @rw
+    when 'RW' then 'attr_accessor'
+    when 'R'  then 'attr_reader'
+    when 'W'  then 'attr_writer'
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb
new file mode 100644
index 0000000000..16b85d7918
--- /dev/null
+++ b/lib/rdoc/class_module.rb
@@ -0,0 +1,215 @@
+require 'rdoc/context'
+
+##
+# ClassModule is the base class for objects representing either a class or a
+# module.
+
+class RDoc::ClassModule < RDoc::Context
+
+  MARSHAL_VERSION = 0 # :nodoc:
+
+  attr_accessor :diagram
+
+  ##
+  # Creates a new ClassModule with +name+ with optional +superclass+
+
+  def initialize(name, superclass = 'Object')
+    @diagram    = nil
+    @full_name  = nil
+    @name       = name
+    @superclass = superclass
+    super()
+  end
+
+  ##
+  # Ancestors list for this ClassModule (abstract)
+
+  def ancestors
+    raise NotImplementedError
+  end
+
+  ##
+  # Appends +comment+ to the current comment, but separated by a rule.  Works
+  # more like <tt>+=</tt>.
+
+  def comment=(comment)
+    return if comment.empty?
+
+    comment = "#{@comment}\n---\n#{normalize_comment comment}" unless
+      @comment.empty?
+
+    super
+  end
+
+  ##
+  # Finds a class or module with +name+ in this namespace or its descendents
+
+  def find_class_named(name)
+    return self if full_name == name
+    return self if @name == name
+
+    @classes.values.find do |klass|
+      next if klass == self
+      klass.find_class_named name
+    end
+  end
+
+  ##
+  # Return the fully qualified name of this class or module
+
+  def full_name
+    @full_name ||= if RDoc::ClassModule === @parent then
+                     "#{@parent.full_name}::#{@name}"
+                   else
+                     @name
+                   end
+  end
+
+  ##
+  # 'module' or 'class'
+
+  def type
+    module? ? 'module' : 'class'
+  end
+
+  def marshal_dump # :nodoc:
+    attrs = attributes.sort.map do |attr|
+      [attr.name, attr.rw]
+    end
+
+    method_types = methods_by_type.map do |type, visibilities|
+      visibilities = visibilities.map do |visibility, methods|
+        method_names = methods.map do |method|
+          method.name
+        end
+
+        [visibility, method_names.uniq]
+      end
+
+      [type, visibilities]
+    end
+
+    [ MARSHAL_VERSION,
+      @name,
+      full_name,
+      @superclass,
+      parse(@comment),
+      attrs,
+      constants.map do |const|
+        [const.name, parse(const.comment)]
+      end,
+      includes.map do |incl|
+        [incl.name, parse(incl.comment)]
+      end,
+      method_types,
+    ]
+  end
+
+  def marshal_load array # :nodoc:
+    initialize_methods_etc
+    @document_self    = true
+    @done_documenting = false
+    @current_section  = nil
+
+    @name       = array[1]
+    @full_name  = array[2]
+    @superclass = array[3]
+    @comment    = array[4]
+
+    array[5].each do |name, rw|
+      add_attribute RDoc::Attr.new(nil, name, rw, nil)
+    end
+
+    array[6].each do |name, comment|
+      add_constant RDoc::Constant.new(name, nil, comment)
+    end
+
+    array[7].each do |name, comment|
+      add_include RDoc::Include.new(name, comment)
+    end
+
+    array[8].each do |type, visibilities|
+      visibilities.each do |visibility, methods|
+        @visibility = visibility
+
+        methods.each do |name|
+          method = RDoc::AnyMethod.new nil, name
+          method.singleton = true if type == 'class'
+          add_method method
+        end
+      end
+    end
+  end
+
+  ##
+  # Merges +class_module+ into this ClassModule
+
+  def merge class_module
+    comment = class_module.comment
+
+    if comment then
+      document = parse @comment
+
+      comment.parts.concat document.parts
+
+      @comment = comment
+    end
+
+    class_module.each_attribute do |attr|
+      if match = attributes.find { |a| a.name == attr.name } then
+        match.rw = [match.rw, attr.rw].compact.join
+      else
+        add_attribute attr
+      end
+    end
+
+    class_module.each_constant do |const|
+      add_constant const
+    end
+
+    class_module.each_include do |incl|
+      add_include incl
+    end
+
+    class_module.each_method do |meth|
+      add_method meth
+    end
+  end
+
+  ##
+  # Does this object represent a module?
+
+  def module?
+    false
+  end
+
+  ##
+  # Path to this class or module
+
+  def path
+    http_url RDoc::RDoc.current.generator.class_dir
+  end
+
+  ##
+  # Get the superclass of this class.  Attempts to retrieve the superclass
+  # object, returns the name if it is not known.
+
+  def superclass
+    RDoc::TopLevel.find_class_named_from(@superclass, parent) || @superclass
+  end
+
+  ##
+  # Set the superclass of this class to +superclass+
+
+  def superclass=(superclass)
+    raise NoMethodError, "#{full_name} is a module" if module?
+
+    @superclass = superclass if @superclass.nil? or @superclass == 'Object'
+  end
+
+  def to_s # :nodoc:
+    "#{self.class}: #{full_name} #{@comment} #{super}"
+  end
+
+end
+
diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb
new file mode 100644
index 0000000000..f8c4e33f7e
--- /dev/null
+++ b/lib/rdoc/code_object.rb
@@ -0,0 +1,180 @@
+require 'rdoc'
+require 'rdoc/text'
+
+##
+# Base class for the RDoc code tree.
+#
+# We contain the common stuff for contexts (which are containers) and other
+# elements (methods, attributes and so on)
+#
+# Here's the tree of the CodeObject subclasses:
+#
+# * RDoc::Context
+#   * RDoc::TopLevel
+#   * RDoc::ClassModule
+#     * RDoc::AnonClass
+#     * RDoc::NormalClass
+#     * RDoc::NormalModule
+#     * RDoc::SingleClass
+# * RDoc::AnyMethod
+#   * RDoc::GhostMethod
+#   * RDoc::MetaMethod
+# * RDoc::Alias
+# * RDoc::Attr
+# * RDoc::Constant
+# * RDoc::Require
+# * RDoc::Include
+
+class RDoc::CodeObject
+
+  include RDoc::Text
+
+  ##
+  # Our comment
+
+  attr_reader :comment
+
+  ##
+  # Do we document our children?
+
+  attr_reader :document_children
+
+  ##
+  # Do we document ourselves?
+
+  attr_reader :document_self
+
+  ##
+  # Are we done documenting (ie, did we come across a :enddoc:)?
+
+  attr_accessor :done_documenting
+
+  ##
+  # Force documentation of this CodeObject
+
+  attr_accessor :force_documentation
+
+  ##
+  # Hash of arbitrary metadata for this CodeObject
+
+  attr_reader :metadata
+
+  ##
+  # Our parent CodeObject
+
+  attr_accessor :parent
+
+  ##
+  # Which section are we in
+
+  attr_accessor :section
+
+  ##
+  # We are the model of the code, but we know that at some point we will be
+  # worked on by viewers. By implementing the Viewable protocol, viewers can
+  # associated themselves with these objects.
+
+  attr_accessor :viewer
+
+  ##
+  # Creates a new CodeObject that will document itself and its children
+
+  def initialize
+    @metadata = {}
+    @comment = ''
+
+    @document_children   = true
+    @document_self       = true
+    @done_documenting    = false
+    @force_documentation = false
+
+    @parent = nil
+  end
+
+  ##
+  # Replaces our comment with +comment+, unless it is empty.
+
+  def comment=(comment)
+    @comment = case comment
+               when NilClass               then ''
+               when RDoc::Markup::Document then comment
+               else
+                 if comment and not comment.empty? then
+                   normalize_comment comment
+                 else
+                   @comment
+                 end
+               end
+  end
+
+  ##
+  # Enables or disables documentation of this CodeObject's children.  Calls
+  # remove_classes_and_modules when disabling.
+
+  def document_children=(document_children)
+    @document_children = document_children
+    remove_classes_and_modules unless document_children
+  end
+
+  ##
+  # Enables or disables documentation of this CodeObject.  Calls
+  # remove_methods_etc when disabling.
+
+  def document_self=(document_self)
+    @document_self = document_self
+    remove_methods_etc unless document_self
+  end
+
+  ##
+  # Does this class have a comment with content or is document_self false.
+
+  def documented?
+    !(@document_self and @comment.empty?)
+  end
+
+  ##
+  # File name of our parent
+
+  def parent_file_name
+    @parent ? @parent.base_name : '(unknown)'
+  end
+
+  ##
+  # Name of our parent
+
+  def parent_name
+    @parent ? @parent.full_name : '(unknown)'
+  end
+
+  ##
+  # Callback called upon disabling documentation of children.  See
+  # #document_children=
+
+  def remove_classes_and_modules
+  end
+
+  ##
+  # Callback called upon disabling documentation of ourself.  See
+  # #document_self=
+
+  def remove_methods_etc
+  end
+
+  ##
+  # Enable capture of documentation
+
+  def start_doc
+    @document_self = true
+    @document_children = true
+  end
+
+  ##
+  # Disable capture of documentation
+
+  def stop_doc
+    @document_self = false
+    @document_children = false
+  end
+
+end
+
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index d6c4f1bdb9..c60dad92df 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -1,765 +1,23 @@
-# We represent the various high-level code constructs that appear
-# in Ruby programs: classes, modules, methods, and so on.
+# We represent the various high-level code constructs that appear in Ruby
+# programs: classes, modules, methods, and so on.
 
-require 'rdoc/tokenstream'
+require 'rdoc/code_object'
+require 'rdoc/context'
+require 'rdoc/top_level'
 
-module RDoc
+require 'rdoc/class_module'
+require 'rdoc/normal_class'
+require 'rdoc/normal_module'
+require 'rdoc/anon_class'
+require 'rdoc/single_class'
 
+require 'rdoc/any_method'
+require 'rdoc/alias'
+require 'rdoc/ghost_method'
+require 'rdoc/meta_method'
 
-  # We contain the common stuff for contexts (which are containers)
-  # and other elements (methods, attributes and so on)
-  #
-  class CodeObject
+require 'rdoc/attr'
+require 'rdoc/constant'
+require 'rdoc/require'
+require 'rdoc/include'
 
-    attr_accessor :parent
-
-    # We are the model of the code, but we know that at some point
-    # we will be worked on by viewers. By implementing the Viewable
-    # protocol, viewers can associated themselves with these objects.
-
-    attr_accessor :viewer
-
-    # are we done documenting (ie, did we come across a :enddoc:)?
-
-    attr_accessor :done_documenting
-
-    # Which section are we in
-
-    attr_accessor :section
-
-    # do we document ourselves?
-
-    attr_reader :document_self
-
-    def document_self=(val)
-      @document_self = val
-      if !val
-	remove_methods_etc
-      end
-    end
-
-    # set and cleared by :startdoc: and :enddoc:, this is used to toggle
-    # the capturing of documentation
-    def start_doc
-      @document_self = true
-      @document_children = true
-    end
-
-    def stop_doc
-      @document_self = false
-      @document_children = false
-    end
-
-    # do we document ourselves and our children
-
-    attr_reader :document_children
-
-    def document_children=(val)
-      @document_children = val
-      if !val
-	remove_classes_and_modules
-      end
-    end
-
-    # Do we _force_ documentation, even is we wouldn't normally show the entity
-    attr_accessor :force_documentation
-
-    # Default callbacks to nothing, but this is overridden for classes
-    # and modules
-    def remove_classes_and_modules
-    end
-
-    def remove_methods_etc
-    end
-
-    def initialize
-      @document_self = true
-      @document_children = true
-      @force_documentation = false
-      @done_documenting = false
-    end
-
-    # Access the code object's comment
-    attr_reader :comment
-
-    # Update the comment, but don't overwrite a real comment
-    # with an empty one
-    def comment=(comment)
-      @comment = comment unless comment.empty?
-    end
-
-    # There's a wee trick we pull. Comment blocks can have directives that
-    # override the stuff we extract during the parse. So, we have a special
-    # class method, attr_overridable, that lets code objects list
-    # those directives. Wehn a comment is assigned, we then extract
-    # out any matching directives and update our object
-
-    def CodeObject.attr_overridable(name, *aliases)
-      @overridables ||= {}
-
-      attr_accessor name
-
-      aliases.unshift name
-      aliases.each do |directive_name|
-        @overridables[directive_name.to_s] = name
-      end
-    end
-
-  end
-
-  # A Context is something that can hold modules, classes, methods, 
-  # attributes, aliases, requires, and includes. Classes, modules, and
-  # files are all Contexts.
-
-  class Context < CodeObject
-    attr_reader   :name, :method_list, :attributes, :aliases, :constants
-    attr_reader   :requires, :includes, :in_files, :visibility
-
-    attr_reader   :sections
-
-    class Section
-      attr_reader :title, :comment, :sequence
-
-      @@sequence = "SEC00000"
-
-      def initialize(title, comment)
-        @title = title
-        @@sequence.succ!
-        @sequence = @@sequence.dup
-        set_comment(comment)
-      end
-
-      private
-
-      # Set the comment for this section from the original comment block
-      # If the first line contains :section:, strip it and use the rest. Otherwise
-      # remove lines up to the line containing :section:, and look for 
-      # those lines again at the end and remove them. This lets us write
-      #
-      #   # ---------------------
-      #   # :SECTION: The title
-      #   # The body
-      #   # ---------------------
-
-      def set_comment(comment)
-        return unless comment
-
-        if comment =~ /^.*?:section:.*$/
-          start = $`
-          rest = $'
-          if start.empty?
-            @comment = rest
-          else
-            @comment = rest.sub(/#{start.chomp}\Z/, '')
-          end
-        else
-          @comment = comment
-        end
-        @comment = nil if @comment.empty?
-      end
-    end
-
-
-    def initialize
-      super()
-
-      @in_files    = []
-
-      @name    ||= "unknown"
-      @comment ||= ""
-      @parent  = nil
-      @visibility = :public
-
-      @current_section = Section.new(nil, nil)
-      @sections = [ @current_section ]
-
-      initialize_methods_etc
-      initialize_classes_and_modules
-    end
-
-    # map the class hash to an array externally
-    def classes
-      @classes.values
-    end
-
-    # map the module hash to an array externally
-    def modules
-      @modules.values
-    end
-
-    # Change the default visibility for new methods
-    def ongoing_visibility=(vis)
-      @visibility = vis
-    end
-
-    # Given an array +methods+ of method names, set the
-    # visibility of the corresponding AnyMethod object
-
-    def set_visibility_for(methods, vis, singleton=false)
-      count = 0
-      @method_list.each do |m|
-        if methods.include?(m.name) && m.singleton == singleton
-          m.visibility = vis
-          count += 1
-        end
-      end
-
-      return if count == methods.size || singleton
-
-      # perhaps we need to look at attributes
-
-      @attributes.each do |a|
-        if methods.include?(a.name)
-          a.visibility = vis
-          count += 1
-        end
-      end
-    end
-
-    # Record the file that we happen to find it in
-    def record_location(toplevel)
-      @in_files << toplevel unless @in_files.include?(toplevel)
-    end
-
-    # Return true if at least part of this thing was defined in +file+
-    def defined_in?(file)
-      @in_files.include?(file)
-    end
-
-    def add_class(class_type, name, superclass)
-      add_class_or_module(@classes, class_type, name, superclass)
-    end
-
-    def add_module(class_type, name)
-      add_class_or_module(@modules, class_type, name, nil)
-    end
-
-    def add_method(a_method)
-      puts "Adding #@visibility method #{a_method.name} to #@name" if $DEBUG
-      a_method.visibility = @visibility
-      add_to(@method_list, a_method)
-    end
-
-    def add_attribute(an_attribute)
-      add_to(@attributes, an_attribute)
-    end
-
-    def add_alias(an_alias)
-      meth = find_instance_method_named(an_alias.old_name)
-      if meth
-        new_meth = AnyMethod.new(an_alias.text, an_alias.new_name)
-        new_meth.is_alias_for = meth
-        new_meth.singleton    = meth.singleton
-        new_meth.params       = meth.params
-        new_meth.comment = "Alias for \##{meth.name}"
-        meth.add_alias(new_meth)
-        add_method(new_meth)
-      else
-        add_to(@aliases, an_alias)
-      end
-    end
-
-    def add_include(an_include)
-      add_to(@includes, an_include)
-    end
-
-    def add_constant(const)
-      add_to(@constants, const)
-    end
-
-    # Requires always get added to the top-level (file) context
-    def add_require(a_require)
-      if self.kind_of? TopLevel
-        add_to(@requires, a_require)
-      else
-        parent.add_require(a_require)
-      end
-    end
-
-    def add_class_or_module(collection, class_type, name, superclass=nil)
-      cls = collection[name]
-      if cls
-        puts "Reusing class/module #{name}" if $DEBUG
-      else
-        cls = class_type.new(name, superclass)
-        puts "Adding class/module #{name} to #@name" if $DEBUG
-#        collection[name] = cls if @document_self  && !@done_documenting
-        collection[name] = cls if !@done_documenting
-        cls.parent = self
-        cls.section = @current_section
-      end
-      cls
-    end
-
-    def add_to(array, thing)
-      array <<  thing if @document_self  && !@done_documenting
-      thing.parent = self
-      thing.section = @current_section
-    end
-
-    # If a class's documentation is turned off after we've started
-    # collecting methods etc., we need to remove the ones
-    # we have
-
-    def remove_methods_etc
-      initialize_methods_etc
-    end
-
-    def initialize_methods_etc
-      @method_list = []
-      @attributes  = []
-      @aliases     = []
-      @requires    = []
-      @includes    = []
-      @constants   = []
-    end
-
-    # and remove classes and modules when we see a :nodoc: all
-    def remove_classes_and_modules
-      initialize_classes_and_modules
-    end
-
-    def initialize_classes_and_modules
-      @classes     = {}
-      @modules     = {}
-    end
-
-    # Find a named module
-    def find_module_named(name)
-      return self if self.name == name
-      res = @modules[name] || @classes[name]
-      return res if res
-      find_enclosing_module_named(name)
-    end
-
-    # find a module at a higher scope
-    def find_enclosing_module_named(name)
-      parent && parent.find_module_named(name)
-    end
-
-    # Iterate over all the classes and modules in
-    # this object
-
-    def each_classmodule
-      @modules.each_value {|m| yield m}
-      @classes.each_value {|c| yield c}
-    end
-
-    def each_method
-      @method_list.each {|m| yield m}
-    end
-
-    def each_attribute 
-      @attributes.each {|a| yield a}
-    end
-
-    def each_constant
-      @constants.each {|c| yield c}
-    end
-
-    # Return the toplevel that owns us
-
-    def toplevel
-      return @toplevel if defined? @toplevel
-      @toplevel = self
-      @toplevel = @toplevel.parent until TopLevel === @toplevel
-      @toplevel
-    end
-
-    # allow us to sort modules by name
-    def <=>(other)
-      name <=> other.name
-    end
-
-    # Look up the given symbol. If method is non-nil, then
-    # we assume the symbol references a module that
-    # contains that method
-    def find_symbol(symbol, method=nil)
-      result = nil
-      case symbol
-      when /^::(.*)/
-        result = toplevel.find_symbol($1)
-      when /::/
-        modules = symbol.split(/::/)
-        unless modules.empty?
-          module_name = modules.shift
-          result = find_module_named(module_name)
-          if result
-            modules.each do |module_name|
-              result = result.find_module_named(module_name)
-              break unless result
-            end
-          end
-        end
-      else
-        # if a method is specified, then we're definitely looking for
-        # a module, otherwise it could be any symbol
-        if method
-          result = find_module_named(symbol)
-        else
-          result = find_local_symbol(symbol)
-          if result.nil?
-            if symbol =~ /^[A-Z]/
-              result = parent
-              while result && result.name != symbol
-                result = result.parent
-              end
-            end
-          end
-        end
-      end
-      if result && method
-        if !result.respond_to?(:find_local_symbol)
-          p result.name
-          p method
-          fail
-        end
-        result = result.find_local_symbol(method)
-      end
-      result
-    end
-           
-    def find_local_symbol(symbol)
-      res = find_method_named(symbol) ||
-            find_constant_named(symbol) ||
-            find_attribute_named(symbol) ||
-            find_module_named(symbol) 
-    end
-
-    # Handle sections
-
-    def set_current_section(title, comment)
-      @current_section = Section.new(title, comment)
-      @sections << @current_section
-    end
-
-    private
-
-    # Find a named method, or return nil
-    def find_method_named(name)
-      @method_list.find {|meth| meth.name == name}
-    end
-
-    # Find a named instance method, or return nil
-    def find_instance_method_named(name)
-      @method_list.find {|meth| meth.name == name && !meth.singleton}
-    end
-
-    # Find a named constant, or return nil
-    def find_constant_named(name)
-      @constants.find {|m| m.name == name}
-    end
-
-    # Find a named attribute, or return nil
-    def find_attribute_named(name)
-      @attributes.find {|m| m.name == name}
-    end
-    
-  end
-
-
-  # A TopLevel context is a source file
-
-  class TopLevel < Context
-    attr_accessor :file_stat
-    attr_accessor :file_relative_name
-    attr_accessor :file_absolute_name
-    attr_accessor :diagram
-    
-    @@all_classes = {}
-    @@all_modules = {}
-
-    def TopLevel::reset
-      @@all_classes = {}
-      @@all_modules = {}
-    end
-
-    def initialize(file_name)
-      super()
-      @name = "TopLevel"
-      @file_relative_name = file_name
-      @file_absolute_name = file_name
-      @file_stat          = File.stat(file_name)
-      @diagram            = nil
-    end
-
-    def full_name
-      nil
-    end
-
-    # Adding a class or module to a TopLevel is special, as we only
-    # want one copy of a particular top-level class. For example,
-    # if both file A and file B implement class C, we only want one
-    # ClassModule object for C. This code arranges to share
-    # classes and modules between files.
-
-    def add_class_or_module(collection, class_type, name, superclass)
-      cls = collection[name]
-      if cls
-        puts "Reusing class/module #{name}" if $DEBUG
-      else
-        if class_type == NormalModule
-          all = @@all_modules
-        else
-          all = @@all_classes
-        end
-        cls = all[name]
-        if !cls
-          cls = class_type.new(name, superclass)
-          all[name] = cls  unless @done_documenting
-        end
-        puts "Adding class/module #{name} to #@name" if $DEBUG
-        collection[name] = cls unless @done_documenting
-        cls.parent = self
-      end
-      cls
-    end
-
-    def TopLevel.all_classes_and_modules
-      @@all_classes.values + @@all_modules.values
-    end
-
-    def TopLevel.find_class_named(name)
-     @@all_classes.each_value do |c|
-        res = c.find_class_named(name) 
-        return res if res
-      end
-      nil
-    end
-
-    def find_local_symbol(symbol)
-      find_class_or_module_named(symbol) || super
-    end
-
-    def find_class_or_module_named(symbol)
-      @@all_classes.each_value {|c| return c if c.name == symbol}
-      @@all_modules.each_value {|m| return m if m.name == symbol}
-      nil
-    end
-
-    # Find a named module
-    def find_module_named(name)
-      find_class_or_module_named(name) || find_enclosing_module_named(name)
-    end
-
-
-  end
-
-  # ClassModule is the base class for objects representing either a
-  # class or a module.
-
-  class ClassModule < Context
-
-    attr_reader   :superclass
-    attr_accessor :diagram
-
-    def initialize(name, superclass = nil)
-      @name       = name
-      @diagram    = nil
-      @superclass = superclass
-      @comment    = ""
-      super()
-    end
-
-    # Return the fully qualified name of this class or module
-    def full_name
-      if @parent && @parent.full_name
-        @parent.full_name + "::" + @name
-      else
-        @name
-      end
-    end
-
-    def http_url(prefix)
-      path = full_name.split("::")
-      File.join(prefix, *path) + ".html"
-    end
-
-    # Return +true+ if this object represents a module
-    def is_module?
-      false
-    end
-
-    # to_s is simply for debugging
-    def to_s
-      res = self.class.name + ": " + @name 
-      res << @comment.to_s
-      res << super
-      res
-    end
-
-    def find_class_named(name)
-      return self if full_name == name
-      @classes.each_value {|c| return c if c.find_class_named(name) }
-      nil
-    end
-  end
-
-  # Anonymous classes
-  class AnonClass < ClassModule
-  end
-
-  # Normal classes
-  class NormalClass < ClassModule
-  end
-
-  # Singleton classes
-  class SingleClass < ClassModule
-  end
-
-  # Module
-  class NormalModule < ClassModule
-    def is_module?
-      true
-    end
-  end
-
-
-  # AnyMethod is the base class for objects representing methods
-
-  class AnyMethod < CodeObject
-    attr_accessor :name
-    attr_accessor :visibility
-    attr_accessor :block_params
-    attr_accessor :dont_rename_initialize
-    attr_accessor :singleton
-    attr_reader   :aliases           # list of other names for this method
-    attr_accessor :is_alias_for      # or a method we're aliasing
-
-    attr_overridable :params, :param, :parameters, :parameter
-
-    attr_accessor :call_seq
-
-
-    include TokenStream
-
-    def initialize(text, name)
-      super()
-      @text = text
-      @name = name
-      @token_stream  = nil
-      @visibility    = :public
-      @dont_rename_initialize = false
-      @block_params  = nil
-      @aliases       = []
-      @is_alias_for  = nil
-      @comment = ""
-      @call_seq = nil
-    end
-
-    def <=>(other)
-      @name <=> other.name
-    end
-
-    def to_s
-      res = self.class.name + ": " + @name + " (" + @text + ")\n"
-      res << @comment.to_s
-      res
-    end
-
-    def param_seq
-      p = params.gsub(/\s*\#.*/, '')
-      p = p.tr("\n", " ").squeeze(" ")
-      p = "(" + p + ")" unless p[0] == ?(
-
-      if (block = block_params)
-        # If this method has explicit block parameters, remove any
-        # explicit &block
-$stderr.puts p
-        p.sub!(/,?\s*&\w+/)
-$stderr.puts p
-
-        block.gsub!(/\s*\#.*/, '')
-        block = block.tr("\n", " ").squeeze(" ")
-        if block[0] == ?(
-          block.sub!(/^\(/, '').sub!(/\)/, '')
-        end
-        p << " {|#{block}| ...}"
-      end
-      p
-    end
-
-    def add_alias(method)
-      @aliases << method
-    end
-  end
-
-
-  # Represent an alias, which is an old_name/ new_name pair associated
-  # with a particular context
-  class Alias < CodeObject
-    attr_accessor :text, :old_name, :new_name, :comment
-    
-    def initialize(text, old_name, new_name, comment)
-      super()
-      @text = text
-      @old_name = old_name
-      @new_name = new_name
-      self.comment = comment
-    end
-
-    def to_s
-      "alias: #{self.old_name} ->  #{self.new_name}\n#{self.comment}"
-    end
-  end
-
-  # Represent a constant
-  class Constant < CodeObject
-    attr_accessor :name, :value
-
-    def initialize(name, value, comment)
-      super()
-      @name = name
-      @value = value
-      self.comment = comment
-    end
-  end
-
-  # Represent attributes
-  class Attr < CodeObject
-    attr_accessor :text, :name, :rw, :visibility
-
-    def initialize(text, name, rw, comment)
-      super()
-      @text = text
-      @name = name
-      @rw = rw
-      @visibility = :public
-      self.comment = comment
-    end
-
-    def to_s
-      "attr: #{self.name} #{self.rw}\n#{self.comment}"
-    end
-
-    def <=>(other)
-      self.name <=> other.name
-    end
-  end
-
-  # a required file
-
-  class Require < CodeObject
-    attr_accessor :name
-
-    def initialize(name, comment)
-      super()
-      @name = name.gsub(/'|"/, "") #'
-      self.comment = comment
-    end
-
-  end
-
-  # an included module
-  class Include < CodeObject
-    attr_accessor :name
-
-    def initialize(name, comment)
-      super()
-      @name = name
-      self.comment = comment
-    end
-
-  end
-
-end
diff --git a/lib/rdoc/constant.rb b/lib/rdoc/constant.rb
new file mode 100644
index 0000000000..908990855d
--- /dev/null
+++ b/lib/rdoc/constant.rb
@@ -0,0 +1,58 @@
+require 'rdoc/code_object'
+
+##
+# A constant
+
+class RDoc::Constant < RDoc::CodeObject
+
+  ##
+  # The constant's name
+
+  attr_accessor :name
+
+  ##
+  # The constant's value
+
+  attr_accessor :value
+
+  ##
+  # Creates a new constant with +name+, +value+ and +comment+
+
+  def initialize(name, value, comment)
+    super()
+    @name = name
+    @value = value
+    self.comment = comment
+  end
+
+  ##
+  # Constants are ordered by name
+
+  def <=> other
+    return unless self.class === other
+
+    [parent_name, name] <=> [other.parent_name, other.name]
+  end
+
+  def == other
+    self.class == other.class and
+      @parent == other.parent and
+      @name == other.name
+  end
+
+  def inspect # :nodoc:
+      "#<%s:0x%x %s::%s>" % [
+        self.class, object_id,
+        parent_name, @name,
+      ]
+  end
+
+  ##
+  # Path to this constant
+
+  def path
+    "#{@parent.path}##{@name}"
+  end
+
+end
+
diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb
new file mode 100644
index 0000000000..d55c5a9164
--- /dev/null
+++ b/lib/rdoc/context.rb
@@ -0,0 +1,767 @@
+require 'rdoc/code_object'
+
+##
+# A Context is something that can hold modules, classes, methods, attributes,
+# aliases, requires, and includes. Classes, modules, and files are all
+# Contexts.
+
+class RDoc::Context < RDoc::CodeObject
+
+  include Comparable
+
+  ##
+  # Types of methods
+
+  TYPES = %w[class instance]
+
+  ##
+  # Method visibilities
+
+  VISIBILITIES = [:public, :protected, :private]
+
+  ##
+  # Aliased methods
+
+  attr_reader :aliases
+
+  ##
+  # attr* methods
+
+  attr_reader :attributes
+
+  ##
+  # Constants defined
+
+  attr_reader :constants
+
+  ##
+  # Current section of documentation
+
+  attr_reader :current_section
+
+  ##
+  # Files this context is found in
+
+  attr_reader :in_files
+
+  ##
+  # Modules this context includes
+
+  attr_reader :includes
+
+  ##
+  # Methods defined in this context
+
+  attr_reader :method_list
+
+  ##
+  # Name of this class excluding namespace.  See also full_name
+
+  attr_reader :name
+
+  ##
+  # Files this context requires
+
+  attr_reader :requires
+
+  ##
+  # Sections in this context
+
+  attr_reader :sections
+
+  ##
+  # Aliases that haven't been resolved to a method
+
+  attr_accessor :unmatched_alias_lists
+
+  ##
+  # Current visibility of this context
+
+  attr_reader :visibility
+
+  ##
+  # A per-comment section of documentation like:
+  #
+  #   # :SECTION: The title
+  #   # The body
+
+  class Section
+
+    ##
+    # Section comment
+
+    attr_reader :comment
+
+    ##
+    # Context this Section lives in
+
+    attr_reader :parent
+
+    ##
+    # Section sequence number (for linking)
+
+    attr_reader :sequence
+
+    ##
+    # Section title
+
+    attr_reader :title
+
+    @@sequence = "SEC00000"
+
+    ##
+    # Creates a new section with +title+ and +comment+
+
+    def initialize(parent, title, comment)
+      @parent = parent
+      @title = title
+
+      @@sequence.succ!
+      @sequence = @@sequence.dup
+
+      set_comment comment
+    end
+
+    ##
+    # Sections are equal when they have the same #sequence
+
+    def ==(other)
+      self.class === other and @sequence == other.sequence
+    end
+
+    def inspect # :nodoc:
+      "#<%s:0x%x %s %p>" % [
+        self.class, object_id,
+        @sequence, title
+      ]
+    end
+
+    ##
+    # Set the comment for this section from the original comment block If
+    # the first line contains :section:, strip it and use the rest.
+    # Otherwise remove lines up to the line containing :section:, and look
+    # for those lines again at the end and remove them. This lets us write
+    #
+    #   # blah blah blah
+    #   #
+    #   # :SECTION: The title
+    #   # The body
+
+    def set_comment(comment)
+      return unless comment
+
+      if comment =~ /^#[ \t]*:section:.*\n/ then
+        start = $`
+        rest = $'
+
+        if start.empty?
+          @comment = rest
+        else
+          @comment = rest.sub(/#{start.chomp}\Z/, '')
+        end
+      else
+        @comment = comment
+      end
+
+      @comment = nil if @comment.empty?
+    end
+
+  end
+
+  ##
+  # Creates an unnamed empty context with public visibility
+
+  def initialize
+    super
+
+    @in_files = []
+
+    @name    ||= "unknown"
+    @comment ||= ""
+    @parent  = nil
+    @visibility = :public
+
+    @current_section = Section.new self, nil, nil
+    @sections = [@current_section]
+
+    initialize_methods_etc
+    initialize_classes_and_modules
+  end
+
+  ##
+  # Sets the defaults for classes and modules
+
+  def initialize_classes_and_modules
+    @classes = {}
+    @modules = {}
+  end
+
+  ##
+  # Sets the defaults for methods and so-forth
+
+  def initialize_methods_etc
+    @method_list = []
+    @attributes  = []
+    @aliases     = []
+    @requires    = []
+    @includes    = []
+    @constants   = []
+
+    # This Hash maps a method name to a list of unmatched aliases (aliases of
+    # a method not yet encountered).
+    @unmatched_alias_lists = {}
+  end
+
+  ##
+  # Contexts are sorted by full_name
+
+  def <=>(other)
+    full_name <=> other.full_name
+  end
+
+  ##
+  # Adds +an_alias+ that is automatically resolved
+
+  def add_alias(an_alias)
+    meth = find_instance_method_named(an_alias.old_name)
+
+    if meth then
+      add_alias_impl an_alias, meth
+    else
+      add_to @aliases, an_alias
+      unmatched_alias_list = @unmatched_alias_lists[an_alias.old_name] ||= []
+      unmatched_alias_list.push an_alias
+    end
+
+    an_alias
+  end
+
+  ##
+  # Turns +an_alias+ into an AnyMethod that points to +meth+
+
+  def add_alias_impl(an_alias, meth)
+    new_meth = RDoc::AnyMethod.new an_alias.text, an_alias.new_name
+    new_meth.is_alias_for = meth
+    new_meth.singleton    = meth.singleton
+    new_meth.params       = meth.params
+
+    new_meth.comment      = an_alias.comment
+
+    meth.add_alias new_meth
+
+    add_method new_meth
+
+    # aliases don't use ongoing visibility
+    new_meth.visibility = meth.visibility
+
+    new_meth
+  end
+
+  ##
+  # Adds +attribute+
+
+  def add_attribute(attribute)
+    add_to @attributes, attribute
+  end
+
+  ##
+  # Adds a class named +name+ with +superclass+.
+  #
+  # Given <tt>class Container::Item</tt> RDoc assumes +Container+ is a module
+  # unless it later sees <tt>class Container</tt>.  add_class automatically
+  # upgrades +name+ to a class in this case.
+
+  def add_class(class_type, name, superclass = 'Object')
+    klass = add_class_or_module @classes, class_type, name, superclass
+
+    existing = klass.superclass
+    existing = existing.name if existing and not String === existing
+
+    if superclass != existing and superclass != 'Object' then
+      klass.superclass = superclass
+    end
+
+    # If the parser encounters Container::Item before encountering
+    # Container, then it assumes that Container is a module.  This may not
+    # be the case, so remove Container from the module list if present and
+    # transfer any contained classes and modules to the new class.
+
+    mod = RDoc::TopLevel.modules_hash.delete klass.full_name
+
+    if mod then
+      klass.classes_hash.update mod.classes_hash
+      klass.modules_hash.update mod.modules_hash
+      klass.method_list.concat mod.method_list
+
+      @modules.delete klass.name
+    end
+
+    RDoc::TopLevel.classes_hash[klass.full_name] = klass
+
+    klass
+  end
+
+  ##
+  # Instantiates a +class_type+ named +name+ and adds it the modules or
+  # classes Hash +collection+.
+
+  def add_class_or_module(collection, class_type, name, superclass = nil)
+    full_name = child_name name
+
+    mod = collection[name]
+
+    if mod then
+      mod.superclass = superclass unless mod.module?
+    else
+      all = if class_type == RDoc::NormalModule then
+              RDoc::TopLevel.modules_hash
+            else
+              RDoc::TopLevel.classes_hash
+            end
+
+      mod = all[full_name]
+
+      unless mod then
+        mod = class_type.new name, superclass
+      else
+        # If the class has been encountered already, check that its
+        # superclass has been set (it may not have been, depending on the
+        # context in which it was encountered).
+        if class_type == RDoc::NormalClass then
+          mod.superclass = superclass unless mod.superclass
+        end
+      end
+
+      unless @done_documenting then
+        all[full_name] = mod
+        collection[name] = mod
+      end
+
+      mod.section = @current_section
+      mod.parent = self
+    end
+
+    mod
+  end
+
+  ##
+  # Adds +constant+
+
+  def add_constant(constant)
+    add_to @constants, constant
+  end
+
+  ##
+  # Adds included module +include+
+
+  def add_include(include)
+    add_to @includes, include
+  end
+
+  ##
+  # Adds +method+
+
+  def add_method(method)
+    method.visibility = @visibility
+    add_to @method_list, method
+
+    unmatched_alias_list = @unmatched_alias_lists[method.name]
+    if unmatched_alias_list then
+      unmatched_alias_list.each do |unmatched_alias|
+        add_alias_impl unmatched_alias, method
+        @aliases.delete unmatched_alias
+      end
+
+      @unmatched_alias_lists.delete method.name
+    end
+  end
+
+  ##
+  # Adds a module named +name+.  If RDoc already knows +name+ is a class then
+  # that class is returned instead.  See also #add_class
+
+  def add_module(class_type, name)
+    return @classes[name] if @classes.key? name
+
+    add_class_or_module @modules, class_type, name, nil
+  end
+
+  ##
+  # Adds an alias from +from+ to +name+
+
+  def add_module_alias from, name
+    to_name = child_name name
+
+    unless @done_documenting then
+      if from.module? then
+        RDoc::TopLevel.modules_hash
+      else
+        RDoc::TopLevel.classes_hash
+      end[to_name] = from
+
+      if from.module? then
+        @modules
+      else
+        @classes
+      end[name] = from
+    end
+
+    from
+  end
+
+  ##
+  # Adds +require+ to this context's top level
+
+  def add_require(require)
+    if RDoc::TopLevel === self then
+      add_to @requires, require
+    else
+      parent.add_require require
+    end
+  end
+
+  ##
+  # Adds +thing+ to the collection +array+
+
+  def add_to(array, thing)
+    array << thing if @document_self and not @done_documenting
+    thing.parent = self
+    thing.section = @current_section
+  end
+
+  ##
+  # Creates the full name for a child with +name+
+
+  def child_name name
+    if RDoc::TopLevel === self then
+      name
+    else
+      "#{self.full_name}::#{name}"
+    end
+  end
+
+  ##
+  # Array of classes in this context
+
+  def classes
+    @classes.values
+  end
+
+  ##
+  # All classes and modules in this namespace
+
+  def classes_and_modules
+    classes + modules
+  end
+
+  ##
+  # Hash of classes keyed by class name
+
+  def classes_hash
+    @classes
+  end
+
+  ##
+  # Is part of this thing was defined in +file+?
+
+  def defined_in?(file)
+    @in_files.include?(file)
+  end
+
+  ##
+  # Iterator for attributes
+
+  def each_attribute # :yields: attribute
+    @attributes.each { |a| yield a }
+  end
+
+  ##
+  # Iterator for classes and modules
+
+  def each_classmodule(&block) # :yields: module
+    classes_and_modules.sort.each(&block)
+  end
+
+  ##
+  # Iterator for constants
+
+  def each_constant # :yields: constant
+    @constants.each {|c| yield c}
+  end
+
+  ##
+  # Iterator for included modules
+
+  def each_include # :yields: include
+    @includes.each do |i| yield i end
+  end
+
+  ##
+  # Iterator for methods
+
+  def each_method # :yields: method
+    @method_list.sort.each {|m| yield m}
+  end
+
+  ##
+  # Finds an attribute with +name+ in this context
+
+  def find_attribute_named(name)
+    @attributes.find { |m| m.name == name }
+  end
+
+  ##
+  # Finds a class method with +name+ in this context
+
+  def find_class_method_named(name)
+    @method_list.find { |meth| meth.singleton && meth.name == name }
+  end
+
+  ##
+  # Finds a constant with +name+ in this context
+
+  def find_constant_named(name)
+    @constants.find {|m| m.name == name}
+  end
+
+  ##
+  # Find a module at a higher scope
+
+  def find_enclosing_module_named(name)
+    parent && parent.find_module_named(name)
+  end
+
+  ##
+  # Finds a file with +name+ in this context
+
+  def find_file_named(name)
+    top_level.class.find_file_named(name)
+  end
+
+  ##
+  # Finds an instance method with +name+ in this context
+
+  def find_instance_method_named(name)
+    @method_list.find { |meth| !meth.singleton && meth.name == name }
+  end
+
+  ##
+  # Finds a method, constant, attribute, module or files named +symbol+ in
+  # this context
+
+  def find_local_symbol(symbol)
+    find_method_named(symbol) or
+    find_constant_named(symbol) or
+    find_attribute_named(symbol) or
+    find_module_named(symbol) or
+    find_file_named(symbol)
+  end
+
+  ##
+  # Finds a instance or module method with +name+ in this context
+
+  def find_method_named(name)
+    case name
+    when /\A#/ then
+      find_instance_method_named name[1..-1]
+    when /\A::/ then
+      find_class_method_named name[2..-1]
+    else
+      @method_list.find { |meth| meth.name == name }
+    end
+  end
+
+  ##
+  # Find a module with +name+ using ruby's scoping rules
+
+  def find_module_named(name)
+    res = @modules[name] || @classes[name]
+    return res if res
+    return self if self.name == name
+    find_enclosing_module_named name
+  end
+
+  ##
+  # Look up +symbol+.  If +method+ is non-nil, then we assume the symbol
+  # references a module that contains that method.
+
+  def find_symbol(symbol, method = nil)
+    result = nil
+
+    case symbol
+    when /^::([A-Z].*)/ then
+      result = top_level.find_symbol($1)
+    when /::/ then
+      modules = symbol.split(/::/)
+
+      unless modules.empty? then
+        module_name = modules.shift
+        result = find_module_named(module_name)
+
+        if result then
+          modules.each do |name|
+            result = result.find_module_named name
+            break unless result
+          end
+        end
+      end
+    end
+
+    unless result then
+      # if a method is specified, then we're definitely looking for
+      # a module, otherwise it could be any symbol
+      if method then
+        result = find_module_named symbol
+      else
+        result = find_local_symbol symbol
+        if result.nil? then
+          if symbol =~ /^[A-Z]/ then
+            result = parent
+            while result && result.name != symbol do
+              result = result.parent
+            end
+          end
+        end
+      end
+    end
+
+    result = result.find_local_symbol method if result and method
+
+    result
+  end
+
+  ##
+  # The full name for this context.  This method is overridden by subclasses.
+
+  def full_name
+    '(unknown)'
+  end
+
+  ##
+  # URL for this with a +prefix+
+
+  def http_url(prefix)
+    path = full_name
+    path = path.gsub(/<<\s*(\w*)/, 'from-\1') if path =~ /<</
+    path = [prefix] + path.split('::')
+
+    File.join(*path.compact) + '.html'
+  end
+
+  ##
+  # Breaks method_list into a nested hash by type (class or instance) and
+  # visibility (public, protected private)
+
+  def methods_by_type
+    methods = {}
+
+    TYPES.each do |type|
+      visibilities = {}
+      VISIBILITIES.each do |vis|
+        visibilities[vis] = []
+      end
+
+      methods[type] = visibilities
+    end
+
+    each_method do |method|
+      methods[method.type][method.visibility] << method
+    end
+
+    methods
+  end
+
+  ##
+  # Yields Method and Attr entries matching the list of names in +methods+.
+  # Attributes are only returned when +singleton+ is false.
+
+  def methods_matching(methods, singleton = false)
+    count = 0
+
+    @method_list.each do |m|
+      if methods.include? m.name and m.singleton == singleton then
+        yield m
+        count += 1
+      end
+    end
+
+    return if count == methods.size || singleton
+
+    @attributes.each do |a|
+      yield a if methods.include? a.name
+    end
+  end
+
+  ##
+  # Array of modules in this context
+
+  def modules
+    @modules.values
+  end
+
+  ##
+  # Hash of modules keyed by module name
+
+  def modules_hash
+    @modules
+  end
+
+  ##
+  # Changes the visibility for new methods to +visibility+
+
+  def ongoing_visibility=(visibility)
+    @visibility = visibility
+  end
+
+  ##
+  # Record which file +top_level+ is in
+
+  def record_location(top_level)
+    @in_files << top_level unless @in_files.include?(top_level)
+  end
+
+  ##
+  # If a class's documentation is turned off after we've started collecting
+  # methods etc., we need to remove the ones we have
+
+  def remove_methods_etc
+    initialize_methods_etc
+  end
+
+  ##
+  # Given an array +methods+ of method names, set the visibility of each to
+  # +visibility+
+
+  def set_visibility_for(methods, visibility, singleton = false)
+    methods_matching methods, singleton do |m|
+      m.visibility = visibility
+    end
+  end
+
+  ##
+  # Removes classes and modules when we see a :nodoc: all
+
+  def remove_classes_and_modules
+    initialize_classes_and_modules
+  end
+
+  ##
+  # Creates a new section with +title+ and +comment+
+
+  def set_current_section(title, comment)
+    @current_section = Section.new self, title, comment
+    @sections << @current_section
+  end
+
+  ##
+  # Return the TopLevel that owns us
+
+  def top_level
+    return @top_level if defined? @top_level
+    @top_level = self
+    @top_level = @top_level.parent until RDoc::TopLevel === @top_level
+    @top_level
+  end
+
+end
+
diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb
deleted file mode 100644
index 9fdc49c02e..0000000000
--- a/lib/rdoc/diagram.rb
+++ /dev/null
@@ -1,335 +0,0 @@
-# A wonderful hack by to draw package diagrams using the dot package.
-# Originally written by  Jah, team Enticla.
-#
-# You must have the V1.7 or later in your path
-# http://www.research.att.com/sw/tools/graphviz/
-
-require "rdoc/dot/dot"
-require 'rdoc/options'
-
-module RDoc
-
-  # Draw a set of diagrams representing the modules and classes in the
-  # system. We draw one diagram for each file, and one for each toplevel
-  # class or module. This means there will be overlap. However, it also
-  # means that you'll get better context for objects.
-  #
-  # To use, simply
-  #
-  #   d = Diagram.new(info)   # pass in collection of top level infos
-  #   d.draw
-  #
-  # The results will be written to the +dot+ subdirectory. The process
-  # also sets the +diagram+ attribute in each object it graphs to
-  # the name of the file containing the image. This can be used
-  # by output generators to insert images.
-
-  class Diagram
-
-    FONT = "Arial"
-
-    DOT_PATH = "dot"
-
-    # Pass in the set of top level objects. The method also creates
-    # the subdirectory to hold the images
-
-    def initialize(info, options)
-      @info = info
-      @options = options
-      @counter = 0
-      File.makedirs(DOT_PATH)
-      @diagram_cache = {}
-    end
-
-    # Draw the diagrams. We traverse the files, drawing a diagram for
-    # each. We also traverse each top-level class and module in that
-    # file drawing a diagram for these too. 
-
-    def draw
-      unless @options.quiet
-        $stderr.print "Diagrams: "
-        $stderr.flush
-      end
-
-      @info.each_with_index do |i, file_count|
-        @done_modules = {}
-        @local_names = find_names(i)
-        @global_names = []
-        @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
-                                    'fontname' => FONT,
-                                    'fontsize' => '8',
-                                    'bgcolor'  => 'lightcyan1',
-                                    'compound' => 'true')
-        
-        # it's a little hack %) i'm too lazy to create a separate class
-        # for default node
-        graph << DOT::DOTNode.new('name' => 'node',
-                                  'fontname' => FONT,
-                                  'color' => 'black',
-                                  'fontsize' => 8)
-        
-        i.modules.each do |mod|
-          draw_module(mod, graph, true, i.file_relative_name)
-        end
-        add_classes(i, graph, i.file_relative_name)
-
-        i.diagram = convert_to_png("f_#{file_count}", graph)
-        
-        # now go through and document each top level class and
-        # module independently
-        i.modules.each_with_index do |mod, count|
-          @done_modules = {}
-          @local_names = find_names(mod)
-          @global_names = []
-
-          @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
-                                      'fontname' => FONT,
-                                      'fontsize' => '8',
-                                      'bgcolor'  => 'lightcyan1',
-                                      'compound' => 'true')
-
-          graph << DOT::DOTNode.new('name' => 'node',
-                                    'fontname' => FONT,
-                                    'color' => 'black',
-                                    'fontsize' => 8)
-          draw_module(mod, graph, true)
-          mod.diagram = convert_to_png("m_#{file_count}_#{count}", 
-                                       graph) 
-        end
-      end
-      $stderr.puts unless @options.quiet
-    end
-
-    #######
-    private
-    #######
-
-    def find_names(mod)
-      return [mod.full_name] + mod.classes.collect{|cl| cl.full_name} +
-        mod.modules.collect{|m| find_names(m)}.flatten
-    end
-
-    def find_full_name(name, mod)
-      full_name = name.dup
-      return full_name if @local_names.include?(full_name)
-      mod_path = mod.full_name.split('::')[0..-2]
-      unless mod_path.nil?
-        until mod_path.empty?
-          full_name = mod_path.pop + '::' + full_name
-          return full_name if @local_names.include?(full_name)
-        end
-      end
-      return name
-    end
-
-    def draw_module(mod, graph, toplevel = false, file = nil)
-      return if  @done_modules[mod.full_name] and not toplevel
-
-      @counter += 1
-      url = mod.http_url("classes")
-      m = DOT::DOTSubgraph.new('name' => "cluster_#{mod.full_name.gsub( /:/,'_' )}",
-                               'label' => mod.name,
-                               'fontname' => FONT,
-                               'color' => 'blue', 
-                               'style' => 'filled', 
-                               'URL'   => %{"#{url}"},
-                               'fillcolor' => toplevel ? 'palegreen1' : 'palegreen3')
-      
-      @done_modules[mod.full_name] = m
-      add_classes(mod, m, file)
-      graph << m
-
-      unless mod.includes.empty?
-        mod.includes.each do |m|
-          m_full_name = find_full_name(m.name, mod)
-          if @local_names.include?(m_full_name)
-            @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
-                                      'to' => "#{mod.full_name.gsub( /:/,'_' )}",
-                                      'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}",
-                                      'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
-          else
-            unless @global_names.include?(m_full_name)
-              path = m_full_name.split("::")
-              url = File.join('classes', *path) + ".html"
-              @global_graph << DOT::DOTNode.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
-                                        'shape' => 'box',
-                                        'label' => "#{m_full_name}",
-                                        'URL'   => %{"#{url}"})
-              @global_names << m_full_name
-            end
-            @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
-                                      'to' => "#{mod.full_name.gsub( /:/,'_' )}",
-                                      'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
-          end
-        end
-      end
-    end
-
-    def add_classes(container, graph, file = nil )
-
-      use_fileboxes = Options.instance.fileboxes
-
-      files = {}
-
-      # create dummy node (needed if empty and for module includes)
-      if container.full_name
-        graph << DOT::DOTNode.new('name'     => "#{container.full_name.gsub( /:/,'_' )}",
-                                  'label'    => "",
-                                  'width'  => (container.classes.empty? and 
-                                               container.modules.empty?) ? 
-                                  '0.75' : '0.01',
-                                  'height' => '0.01',
-                                  'shape' => 'plaintext')
-      end
-      container.classes.each_with_index do |cl, cl_index|
-        last_file = cl.in_files[-1].file_relative_name
-
-        if use_fileboxes && !files.include?(last_file)
-          @counter += 1
-          files[last_file] =
-            DOT::DOTSubgraph.new('name'     => "cluster_#{@counter}",
-                                 'label'    => "#{last_file}",
-                                 'fontname' => FONT,
-                                 'color'=>
-                                 last_file == file ? 'red' : 'black')
-        end
-
-        next if cl.name == 'Object' || cl.name[0,2] == "<<"
-
-        url = cl.http_url("classes")
-        
-        label = cl.name.dup
-        if use_fileboxes && cl.in_files.length > 1
-          label <<  '\n[' + 
-                        cl.in_files.collect {|i|
-                             i.file_relative_name 
-                        }.sort.join( '\n' ) +
-                    ']'
-        end 
-                
-        attrs = {
-          'name' => "#{cl.full_name.gsub( /:/, '_' )}",
-          'fontcolor' => 'black',
-          'style'=>'filled',
-          'color'=>'palegoldenrod',
-          'label' => label,
-          'shape' => 'ellipse',
-          'URL'   => %{"#{url}"}
-        }
-
-        c = DOT::DOTNode.new(attrs)
-        
-        if use_fileboxes
-          files[last_file].push c 
-        else
-          graph << c
-        end
-      end
-      
-      if use_fileboxes
-        files.each_value do |val|
-          graph << val
-        end
-      end
-      
-      unless container.classes.empty?
-        container.classes.each_with_index do |cl, cl_index|
-          cl.includes.each do |m|
-            m_full_name = find_full_name(m.name, cl)
-            if @local_names.include?(m_full_name)
-              @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
-                                      'to' => "#{cl.full_name.gsub( /:/,'_' )}",
-                                      'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}")
-            else
-              unless @global_names.include?(m_full_name)
-                path = m_full_name.split("::")
-                url = File.join('classes', *path) + ".html"
-                @global_graph << DOT::DOTNode.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
-                                          'shape' => 'box',
-                                          'label' => "#{m_full_name}",
-                                          'URL'   => %{"#{url}"})
-                @global_names << m_full_name
-              end
-              @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
-                                      'to' => "#{cl.full_name.gsub( /:/, '_')}")
-            end
-          end
-
-          sclass = cl.superclass
-          next if sclass.nil? || sclass == 'Object'
-          sclass_full_name = find_full_name(sclass,cl)
-          unless @local_names.include?(sclass_full_name) or @global_names.include?(sclass_full_name)
-            path = sclass_full_name.split("::")
-            url = File.join('classes', *path) + ".html"
-            @global_graph << DOT::DOTNode.new(
-                       'name' => "#{sclass_full_name.gsub( /:/, '_' )}",
-                       'label' => sclass_full_name,
-                       'URL'   => %{"#{url}"})
-            @global_names << sclass_full_name
-          end
-          @global_graph << DOT::DOTEdge.new('from' => "#{sclass_full_name.gsub( /:/,'_' )}",
-                                    'to' => "#{cl.full_name.gsub( /:/, '_')}")
-        end
-      end
-
-      container.modules.each do |submod|
-        draw_module(submod, graph)
-      end
-      
-    end
-
-    def convert_to_png(file_base, graph)
-      str = graph.to_s
-      return @diagram_cache[str] if @diagram_cache[str]
-      op_type = Options.instance.image_format
-      dotfile = File.join(DOT_PATH, file_base)
-      src = dotfile + ".dot"
-      dot = dotfile + "." + op_type
-
-      unless @options.quiet
-        $stderr.print "."
-        $stderr.flush
-      end
-
-      File.open(src, 'w+' ) do |f|
-        f << str << "\n"
-      end
-      
-      system "dot", "-T#{op_type}", src, "-o", dot
-
-      # Now construct the imagemap wrapper around
-      # that png
-
-      ret = wrap_in_image_map(src, dot)
-      @diagram_cache[str] = ret
-      return ret
-    end
-
-    # Extract the client-side image map from dot, and use it
-    # to generate the imagemap proper. Return the whole
-    # <map>..<img> combination, suitable for inclusion on
-    # the page
-
-    def wrap_in_image_map(src, dot)
-      res = %{<map id="map" name="map">\n}
-      dot_map = `dot -Tismap #{src}`
-      dot_map.each do |area|
-        unless area =~ /^rectangle \((\d+),(\d+)\) \((\d+),(\d+)\) ([\/\w.]+)\s*(.*)/
-          $stderr.puts "Unexpected output from dot:\n#{area}"
-          return nil
-        end
-        
-        xs, ys = [$1.to_i, $3.to_i], [$2.to_i, $4.to_i]
-        url, area_name = $5, $6
-
-        res <<  %{  <area shape="rect" coords="#{xs.min},#{ys.min},#{xs.max},#{ys.max}" }
-        res <<  %{     href="#{url}" alt="#{area_name}" />\n}
-      end
-      res << "</map>\n"
-#      map_file = src.sub(/.dot/, '.map')
-#      system("dot -Timap #{src} -o #{map_file}")
-      res << %{<img src="#{dot}" usemap="#map" border="0" alt="#{dot}">}
-      return res
-    end
-  end
-end
diff --git a/lib/rdoc/dot/dot.rb b/lib/rdoc/dot/dot.rb
deleted file mode 100644
index 6dbb7cb237..0000000000
--- a/lib/rdoc/dot/dot.rb
+++ /dev/null
@@ -1,255 +0,0 @@
-module DOT
-
-    # these glogal vars are used to make nice graph source
-    $tab = '    '
-    $tab2 = $tab * 2
-
-    # if we don't like 4 spaces, we can change it any time
-    def change_tab( t )
-        $tab = t
-        $tab2 = t * 2
-    end
-
-    # options for node declaration
-    NODE_OPTS = [
-        'bgcolor',
-        'color',
-        'fontcolor',
-        'fontname',
-        'fontsize',
-        'height',
-        'width',
-        'label',
-        'layer',
-        'rank',
-        'shape',
-        'shapefile',
-        'style',
-        'URL',
-    ]
-
-    # options for edge declaration
-    EDGE_OPTS = [
-        'color',
-        'decorate',
-        'dir',
-        'fontcolor',
-        'fontname',
-        'fontsize',
-        'id',
-        'label',
-        'layer',
-        'lhead',
-        'ltail',
-        'minlen',
-        'style',
-        'weight'
-    ]
-
-    # options for graph declaration
-    GRAPH_OPTS = [
-        'bgcolor',
-        'center',
-        'clusterrank',
-        'color',
-        'compound',
-        'concentrate',
-        'fillcolor',
-        'fontcolor',
-        'fontname',
-        'fontsize',
-        'label',
-        'layerseq',
-        'margin',
-        'mclimit',
-        'nodesep',
-        'nslimit',
-        'ordering',
-        'orientation',
-        'page',
-        'rank',
-        'rankdir',
-        'ranksep',
-        'ratio',
-        'size',
-        'style',
-        'URL'
-    ]
-
-    # a root class for any element in dot notation
-    class DOTSimpleElement
-        attr_accessor :name
-
-        def initialize( params = {} )
-            @label = params['name'] ? params['name'] : ''
-        end
-
-        def to_s
-            @name
-        end
-    end
-
-    # an element that has options ( node, edge or graph )
-    class DOTElement < DOTSimpleElement
-        #attr_reader :parent
-        attr_accessor :name, :options
-
-        def initialize( params = {}, option_list = [] )
-            super( params )
-            @name = params['name'] ? params['name'] : nil
-            @parent = params['parent'] ? params['parent'] : nil
-            @options = {}
-            option_list.each{ |i|
-                @options[i] = params[i] if params[i]
-            }
-            @options['label'] ||= @name if @name != 'node'
-        end
-
-        def each_option
-            @options.each{ |i| yield i }
-        end
-
-        def each_option_pair
-            @options.each_pair{ |key, val| yield key, val }
-        end
-
-        #def parent=( thing )
-        #    @parent.delete( self ) if defined?( @parent ) and @parent
-        #    @parent = thing
-        #end
-    end
-
-
-    # this is used when we build nodes that have shape=record
-    # ports don't have options :)
-    class DOTPort < DOTSimpleElement
-        attr_accessor :label
-
-        def initialize( params = {} )
-            super( params )
-            @name = params['label'] ? params['label'] : ''
-        end
-        def to_s
-            ( @name && @name != "" ? "<#{@name}>" : "" ) + "#{@label}"
-        end
-    end
-
-    # node element
-    class DOTNode < DOTElement
-
-        def initialize( params = {}, option_list = NODE_OPTS )
-            super( params, option_list )
-            @ports = params['ports'] ? params['ports'] : []
-        end
-
-        def each_port
-            @ports.each{ |i| yield i }
-        end
-
-        def << ( thing )
-            @ports << thing
-        end
-
-        def push ( thing )
-            @ports.push( thing )
-        end
-
-        def pop
-            @ports.pop
-        end
-
-        def to_s( t = '' )
-
-            label = @options['shape'] != 'record' && @ports.length == 0 ?
-                @options['label'] ?
-                    t + $tab + "label = \"#{@options['label']}\"\n" :
-                    '' :
-                t + $tab + 'label = "' + " \\\n" +
-                t + $tab2 + "#{@options['label']}| \\\n" +
-                @ports.collect{ |i|
-                    t + $tab2 + i.to_s
-                }.join( "| \\\n" ) + " \\\n" +
-                t + $tab + '"' + "\n"
-
-            t + "#{@name} [\n" +
-            @options.to_a.collect{ |i|
-                i[1] && i[0] != 'label' ?
-                    t + $tab + "#{i[0]} = #{i[1]}" : nil
-            }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
-            label +
-            t + "]\n"
-        end
-    end
-
-    # subgraph element is the same to graph, but has another header in dot
-    # notation
-    class DOTSubgraph < DOTElement
-
-        def initialize( params = {}, option_list = GRAPH_OPTS )
-            super( params, option_list )
-            @nodes = params['nodes'] ? params['nodes'] : []
-            @dot_string = 'subgraph'
-        end
-
-        def each_node
-            @nodes.each{ |i| yield i }
-        end
-
-        def << ( thing )
-            @nodes << thing
-        end
-
-        def push( thing )
-            @nodes.push( thing )
-        end
-
-        def pop
-            @nodes.pop
-        end
-
-        def to_s( t = '' )
-          hdr = t + "#{@dot_string} #{@name} {\n"
-
-          options = @options.to_a.collect{ |name, val|
-            val && name != 'label' ?
-            t + $tab + "#{name} = #{val}" :
-              name ? t + $tab + "#{name} = \"#{val}\"" : nil
-          }.compact.join( "\n" ) + "\n"
-
-          nodes = @nodes.collect{ |i|
-            i.to_s( t + $tab )
-          }.join( "\n" ) + "\n"
-          hdr + options + nodes + t + "}\n"
-        end
-    end
-
-    # this is graph
-    class DOTDigraph < DOTSubgraph
-        def initialize( params = {}, option_list = GRAPH_OPTS )
-            super( params, option_list )
-            @dot_string = 'digraph'
-        end
-    end
-
-    # this is edge
-    class DOTEdge < DOTElement
-        attr_accessor :from, :to
-        def initialize( params = {}, option_list = EDGE_OPTS )
-            super( params, option_list )
-            @from = params['from'] ? params['from'] : nil
-            @to = params['to'] ? params['to'] : nil
-        end
-
-        def to_s( t = '' )
-            t + "#{@from} -> #{to} [\n" +
-            @options.to_a.collect{ |i|
-                i[1] && i[0] != 'label' ?
-                    t + $tab + "#{i[0]} = #{i[1]}" :
-                    i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
-            }.compact.join( "\n" ) + "\n" + t + "]\n"
-        end
-    end
-end
-
-
-
diff --git a/lib/rdoc/generator.rb b/lib/rdoc/generator.rb
new file mode 100644
index 0000000000..b65002977a
--- /dev/null
+++ b/lib/rdoc/generator.rb
@@ -0,0 +1,8 @@
+require 'rdoc'
+
+##
+# Namespace for generators
+
+module RDoc::Generator
+end
+
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
new file mode 100644
index 0000000000..497be0eb8b
--- /dev/null
+++ b/lib/rdoc/generator/darkfish.rb
@@ -0,0 +1,453 @@
+# -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
+# vim: noet ts=2 sts=8 sw=2
+
+require 'pathname'
+require 'fileutils'
+require 'erb'
+
+require 'rdoc/generator/markup'
+
+$DARKFISH_DRYRUN = false # TODO make me non-global
+
+#
+# Darkfish RDoc HTML Generator
+#
+# $Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $
+#
+# == Author/s
+# * Michael Granger (ged@FaerieMUD.org)
+#
+# == Contributors
+# * Mahlon E. Smith (mahlon@martini.nu)
+# * Eric Hodel (drbrain@segment7.net)
+#
+# == License
+#
+# Copyright (c) 2007, 2008, Michael Granger. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# * Neither the name of the author/s, nor the names of the project's
+#   contributors may be used to endorse or promote products derived from this
+#   software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+class RDoc::Generator::Darkfish
+
+	RDoc::RDoc.add_generator( self )
+
+	include ERB::Util
+
+	# Subversion rev
+	SVNRev = %$Rev: 52 $
+
+	# Subversion ID
+	SVNId = %$Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $
+
+	# Path to this file's parent directory. Used to find templates and other
+	# resources.
+	GENERATOR_DIR = File.join 'rdoc', 'generator'
+
+	# Release Version
+	VERSION = '1.1.6'
+
+	# Directory where generated classes live relative to the root
+	CLASS_DIR = nil
+
+	# Directory where generated files live relative to the root
+	FILE_DIR = nil
+
+
+	#################################################################
+	###	C L A S S   M E T H O D S
+	#################################################################
+
+	### Standard generator factory method
+	def self::for( options )
+		new( options )
+	end
+
+
+	#################################################################
+	###	I N S T A N C E   M E T H O D S
+	#################################################################
+
+	### Initialize a few instance variables before we start
+	def initialize( options )
+		@options = options
+
+		template = @options.template || 'darkfish'
+
+		template_dir = $LOAD_PATH.map do |path|
+			File.join File.expand_path(path), GENERATOR_DIR, 'template', template
+		end.find do |dir|
+			File.directory? dir
+		end
+
+		raise RDoc::Error, "could not find template #{template.inspect}" unless
+			template_dir
+
+		@template_dir = Pathname.new File.expand_path(template_dir)
+
+		@files      = nil
+		@classes    = nil
+
+		@basedir = Pathname.pwd.expand_path
+	end
+
+	######
+	public
+	######
+
+	# The output directory
+	attr_reader :outputdir
+
+
+	### Output progress information if debugging is enabled
+	def debug_msg( *msg )
+		return unless $DEBUG_RDOC
+		$stderr.puts( *msg )
+	end
+
+	def class_dir
+		CLASS_DIR
+	end
+
+	def file_dir
+		FILE_DIR
+	end
+
+	### Create the directories the generated docs will live in if
+	### they don't already exist.
+	def gen_sub_directories
+		@outputdir.mkpath
+	end
+
+	### Copy over the stylesheet into the appropriate place in the output
+	### directory.
+	def write_style_sheet
+		debug_msg "Copying static files"
+		options = { :verbose => $DEBUG_RDOC, :noop => $DARKFISH_DRYRUN }
+
+		FileUtils.cp @template_dir + 'rdoc.css', '.', options
+
+		Dir[(@template_dir + "{js,images}/**/*").to_s].each do |path|
+			next if File.directory? path
+			next if path =~ /#{File::SEPARATOR}\./
+
+			dst = Pathname.new(path).relative_path_from @template_dir
+
+			# I suck at glob
+			dst_dir = dst.dirname
+			FileUtils.mkdir_p dst_dir, options unless File.exist? dst_dir
+
+			FileUtils.cp @template_dir + path, dst, options
+		end
+	end
+
+	### Build the initial indices and output objects
+	### based on an array of TopLevel objects containing
+	### the extracted information.
+	def generate( top_levels )
+		@outputdir = Pathname.new( @options.op_dir ).expand_path( @basedir )
+
+		@files = top_levels.sort
+		@classes = RDoc::TopLevel.all_classes_and_modules.sort
+		@methods = @classes.map { |m| m.method_list }.flatten.sort
+		@modsort = get_sorted_module_list( @classes )
+
+		# Now actually write the output
+		write_style_sheet
+		generate_index
+		generate_class_files
+		generate_file_files
+
+	rescue StandardError => err
+		debug_msg "%s: %s\n  %s" % [ err.class.name, err.message, err.backtrace.join("\n  ") ]
+		raise
+	end
+
+	#########
+	protected
+	#########
+
+	### Return a list of the documented modules sorted by salience first, then
+	### by name.
+	def get_sorted_module_list( classes )
+		nscounts = classes.inject({}) do |counthash, klass|
+			top_level = klass.full_name.gsub( /::.*/, '' )
+			counthash[top_level] ||= 0
+			counthash[top_level] += 1
+
+			counthash
+		end
+
+		# Sort based on how often the top level namespace occurs, and then on the
+		# name of the module -- this works for projects that put their stuff into
+		# a namespace, of course, but doesn't hurt if they don't.
+		classes.sort_by do |klass|
+			top_level = klass.full_name.gsub( /::.*/, '' )
+			[
+				nscounts[ top_level ] * -1,
+				klass.full_name
+			]
+		end.select do |klass|
+			klass.document_self
+		end
+	end
+
+	### Generate an index page which lists all the classes which
+	### are documented.
+	def generate_index
+		template_file = @template_dir + 'index.rhtml'
+		return unless template_file.exist?
+
+		debug_msg "Rendering the index page..."
+
+		template_src = template_file.read
+		template = ERB.new( template_src, nil, '<>' )
+		template.filename = template_file.to_s
+		context = binding()
+
+		output = nil
+
+		begin
+			output = template.result( context )
+		rescue NoMethodError => err
+			raise RDoc::Error, "Error while evaluating %s: %s (at %p)" % [
+				template_file,
+				err.message,
+				eval( "_erbout[-50,50]", context )
+			], err.backtrace
+		end
+
+		outfile = @basedir + @options.op_dir + 'index.html'
+		unless $DARKFISH_DRYRUN
+			debug_msg "Outputting to %s" % [outfile.expand_path]
+			outfile.open( 'w', 0644 ) do |fh|
+				fh.print( output )
+			end
+		else
+			debug_msg "Would have output to %s" % [outfile.expand_path]
+		end
+	end
+
+	### Generate a documentation file for each class
+	def generate_class_files
+		template_file = @template_dir + 'classpage.rhtml'
+		return unless template_file.exist?
+		debug_msg "Generating class documentation in #@outputdir"
+
+		@classes.each do |klass|
+			debug_msg "  working on %s (%s)" % [ klass.full_name, klass.path ]
+			outfile    = @outputdir + klass.path
+			rel_prefix = @outputdir.relative_path_from( outfile.dirname )
+			svninfo    = self.get_svninfo( klass )
+
+			debug_msg "  rendering #{outfile}"
+			self.render_template( template_file, binding(), outfile )
+		end
+	end
+
+	### Generate a documentation file for each file
+	def generate_file_files
+		template_file = @template_dir + 'filepage.rhtml'
+		return unless template_file.exist?
+		debug_msg "Generating file documentation in #@outputdir"
+
+		@files.each do |file|
+			outfile     = @outputdir + file.path
+			debug_msg "  working on %s (%s)" % [ file.full_name, outfile ]
+			rel_prefix  = @outputdir.relative_path_from( outfile.dirname )
+			context     = binding()
+
+			debug_msg "  rendering #{outfile}"
+			self.render_template( template_file, binding(), outfile )
+		end
+	end
+
+
+	### Return a string describing the amount of time in the given number of
+	### seconds in terms a human can understand easily.
+	def time_delta_string( seconds )
+		return 'less than a minute' if seconds < 1.minute
+		return (seconds / 1.minute).to_s + ' minute' + (seconds/60 == 1 ? '' : 's') if seconds < 50.minutes
+		return 'about one hour' if seconds < 90.minutes
+		return (seconds / 1.hour).to_s + ' hours' if seconds < 18.hours
+		return 'one day' if seconds < 1.day
+		return 'about one day' if seconds < 2.days
+		return (seconds / 1.day).to_s + ' days' if seconds < 1.week
+		return 'about one week' if seconds < 2.week
+		return (seconds / 1.week).to_s + ' weeks' if seconds < 3.months
+		return (seconds / 1.month).to_s + ' months' if seconds < 1.year
+		return (seconds / 1.year).to_s + ' years'
+	end
+
+
+	# %q$Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $"
+	SVNID_PATTERN = /
+		\$Id:\s
+			(\S+)\s					# filename
+			(\d+)\s					# rev
+			(\d{4}-\d{2}-\d{2})\s	# Date (YYYY-MM-DD)
+			(\d{2}:\d{2}:\d{2}Z)\s	# Time (HH:MM:SSZ)
+			(\w+)\s				 	# committer
+		\$$
+	/x
+
+	### Try to extract Subversion information out of the first constant whose value looks like
+	### a subversion Id tag. If no matching constant is found, and empty hash is returned.
+	def get_svninfo( klass )
+		constants = klass.constants or return {}
+
+		constants.find {|c| c.value =~ SVNID_PATTERN } or return {}
+
+		filename, rev, date, time, committer = $~.captures
+		commitdate = Time.parse( date + ' ' + time )
+
+		return {
+			:filename    => filename,
+			:rev         => Integer( rev ),
+			:commitdate  => commitdate,
+			:commitdelta => time_delta_string( Time.now.to_i - commitdate.to_i ),
+			:committer   => committer,
+		}
+	end
+
+
+	### Load and render the erb template in the given +template_file+ within the
+	### specified +context+ (a Binding object) and write it out to +outfile+.
+	### Both +template_file+ and +outfile+ should be Pathname-like objects.
+
+	def render_template( template_file, context, outfile )
+		template_src = template_file.read
+		template = ERB.new( template_src, nil, '<>' )
+		template.filename = template_file.to_s
+
+		output = begin
+							 template.result( context )
+						 rescue NoMethodError => err
+							 raise RDoc::Error, "Error while evaluating %s: %s (at %p)" % [
+								 template_file.to_s,
+								 err.message,
+								 eval( "_erbout[-50,50]", context )
+							 ], err.backtrace
+						 end
+
+		unless $DARKFISH_DRYRUN
+			outfile.dirname.mkpath
+			outfile.open( 'w', 0644 ) do |ofh|
+				ofh.print( output )
+			end
+		else
+			debug_msg "  would have written %d bytes to %s" %
+			[ output.length, outfile ]
+		end
+	end
+
+end # Roc::Generator::Darkfish
+
+# :stopdoc:
+
+### Time constants
+module TimeConstantMethods # :nodoc:
+
+	### Number of seconds (returns receiver unmodified)
+	def seconds
+		return self
+	end
+	alias_method :second, :seconds
+
+	### Returns number of seconds in <receiver> minutes
+	def minutes
+		return self * 60
+	end
+	alias_method :minute, :minutes
+
+	### Returns the number of seconds in <receiver> hours
+	def hours
+		return self * 60.minutes
+	end
+	alias_method :hour, :hours
+
+	### Returns the number of seconds in <receiver> days
+	def days
+		return self * 24.hours
+	end
+	alias_method :day, :days
+
+	### Return the number of seconds in <receiver> weeks
+	def weeks
+		return self * 7.days
+	end
+	alias_method :week, :weeks
+
+	### Returns the number of seconds in <receiver> fortnights
+	def fortnights
+		return self * 2.weeks
+	end
+	alias_method :fortnight, :fortnights
+
+	### Returns the number of seconds in <receiver> months (approximate)
+	def months
+		return self * 30.days
+	end
+	alias_method :month, :months
+
+	### Returns the number of seconds in <receiver> years (approximate)
+	def years
+		return (self * 365.25.days).to_i
+	end
+	alias_method :year, :years
+
+
+	### Returns the Time <receiver> number of seconds before the
+	### specified +time+. E.g., 2.hours.before( header.expiration )
+	def before( time )
+		return time - self
+	end
+
+
+	### Returns the Time <receiver> number of seconds ago. (e.g.,
+	### expiration > 2.hours.ago )
+	def ago
+		return self.before( ::Time.now )
+	end
+
+
+	### Returns the Time <receiver> number of seconds after the given +time+.
+	### E.g., 10.minutes.after( header.expiration )
+	def after( time )
+		return time + self
+	end
+
+	# Reads best without arguments:  10.minutes.from_now
+	def from_now
+		return self.after( ::Time.now )
+	end
+end # module TimeConstantMethods
+
+
+# Extend Numeric with time constants
+class Numeric # :nodoc:
+	include TimeConstantMethods
+end
+
diff --git a/lib/rdoc/generator/markup.rb b/lib/rdoc/generator/markup.rb
new file mode 100644
index 0000000000..a90b15a1e7
--- /dev/null
+++ b/lib/rdoc/generator/markup.rb
@@ -0,0 +1,171 @@
+require 'rdoc/text'
+require 'rdoc/code_objects'
+require 'rdoc/generator'
+require 'rdoc/markup/to_html_crossref'
+
+##
+# Handle common RDoc::Markup tasks for various CodeObjects
+
+module RDoc::Generator::Markup
+
+  ##
+  # Generates a relative URL from this object's path to +target_path+
+
+  def aref_to(target_path)
+    RDoc::Markup::ToHtml.gen_relative_url path, target_path
+  end
+
+  ##
+  # Generates a relative URL from +from_path+ to this object's path
+
+  def as_href(from_path)
+    RDoc::Markup::ToHtml.gen_relative_url from_path, path
+  end
+
+  ##
+  # Handy wrapper for marking up this object's comment
+
+  def description
+    markup @comment
+  end
+
+  ##
+  # Creates an RDoc::Markup::ToHtmlCrossref formatter
+
+  def formatter
+    return @formatter if defined? @formatter
+
+    show_hash = RDoc::RDoc.current.options.show_hash
+    this = RDoc::Context === self ? self : @parent
+    @formatter = RDoc::Markup::ToHtmlCrossref.new this.path, this, show_hash
+  end
+
+  ##
+  # Build a webcvs URL starting for the given +url+ with +full_path+ appended
+  # as the destination path.  If +url+ contains '%s' +full_path+ will be
+  # sprintf'd into +url+ instead.
+
+  def cvs_url(url, full_path)
+    if /%s/ =~ url then
+      sprintf url, full_path
+    else
+      url + full_path
+    end
+  end
+
+end
+
+class RDoc::AnyMethod
+
+  include RDoc::Generator::Markup
+
+  ##
+  # Prepend +src+ with line numbers.  Relies on the first line of a source
+  # code listing having:
+  #
+  #    # File xxxxx, line dddd
+
+  def add_line_numbers(src)
+    if src =~ /\A.*, line (\d+)/ then
+      first = $1.to_i - 1
+      last  = first + src.count("\n")
+      size = last.to_s.length
+
+      line = first
+      src.gsub!(/^/) do
+        res = if line == first then
+                " " * (size + 2)
+              else
+                "%2$*1$d: " % [size, line]
+              end
+
+        line += 1
+        res
+      end
+    end
+  end
+
+  ##
+  # Turns the method's token stream into HTML
+
+  def markup_code
+    return '' unless @token_stream
+
+    src = ""
+
+    @token_stream.each do |t|
+      next unless t
+      #        style = STYLE_MAP[t.class]
+      style = case t
+              when RDoc::RubyToken::TkCONSTANT then "ruby-constant"
+              when RDoc::RubyToken::TkKW       then "ruby-keyword kw"
+              when RDoc::RubyToken::TkIVAR     then "ruby-ivar"
+              when RDoc::RubyToken::TkOp       then "ruby-operator"
+              when RDoc::RubyToken::TkId       then "ruby-identifier"
+              when RDoc::RubyToken::TkNode     then "ruby-node"
+              when RDoc::RubyToken::TkCOMMENT  then "ruby-comment cmt"
+              when RDoc::RubyToken::TkREGEXP   then "ruby-regexp re"
+              when RDoc::RubyToken::TkSTRING   then "ruby-value str"
+              when RDoc::RubyToken::TkVal      then "ruby-value"
+              else
+                nil
+              end
+
+      text = CGI.escapeHTML t.text
+
+      if style
+        src << "<span class=\"#{style}\">#{text}</span>"
+      else
+        src << text
+      end
+    end
+
+    add_line_numbers src
+
+    src
+  end
+
+end
+
+class RDoc::Attr
+
+  include RDoc::Generator::Markup
+
+end
+
+class RDoc::Constant
+
+  include RDoc::Generator::Markup
+
+end
+
+class RDoc::Context
+
+  include RDoc::Generator::Markup
+
+end
+
+class RDoc::Context::Section
+
+  include RDoc::Generator::Markup
+
+end
+
+class RDoc::TopLevel
+
+  ##
+  # Returns a URL for this source file on some web repository.  Use the -W
+  # command line option to set.
+
+  def cvs_url
+    url = RDoc::RDoc.current.options.webcvs
+
+    if /%s/ =~ url then
+      url % @absolute_name
+    else
+      url + @absolute_name
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
new file mode 100644
index 0000000000..819eb52d40
--- /dev/null
+++ b/lib/rdoc/generator/ri.rb
@@ -0,0 +1,82 @@
+require 'rdoc/generator'
+require 'rdoc/ri'
+
+##
+# Generates ri data files
+
+class RDoc::Generator::RI
+
+  RDoc::RDoc.add_generator self
+
+  def self.for options
+    new options
+  end
+
+  ##
+  # Set up a new ri generator
+
+  def initialize options #:not-new:
+    @options     = options
+    @store       = RDoc::RI::Store.new '.'
+    @old_siginfo = nil
+    @current     = nil
+  end
+
+  ##
+  # Build the initial indices and output objects based on an array of TopLevel
+  # objects containing the extracted information.
+
+  def generate top_levels
+    install_siginfo_handler
+
+    @store.load_cache
+
+    RDoc::TopLevel.all_classes_and_modules.each do |klass|
+      @current = "#{klass.class}: #{klass.full_name}"
+
+      @store.save_class klass
+
+      klass.each_method do |method|
+        @current = "#{method.class}: #{method.full_name}"
+        @store.save_method klass, method
+      end
+
+      klass.each_attribute do |attribute|
+        @store.save_method klass, attribute
+      end
+    end
+
+    @current = 'saving cache'
+
+    @store.save_cache
+
+  ensure
+    @current = nil
+
+    remove_siginfo_handler
+  end
+
+  ##
+  # Installs a siginfo handler that prints the current filename.
+
+  def install_siginfo_handler
+    return unless Signal.list.key? 'INFO'
+
+    @old_siginfo = trap 'INFO' do
+      puts @current if @current
+    end
+  end
+
+  ##
+  # Removes a siginfo handler and replaces the previous
+
+  def remove_siginfo_handler
+    return unless Signal.list.key? 'INFO'
+
+    handler = @old_siginfo || 'DEFAULT'
+
+    trap 'INFO', handler
+  end
+
+end
+
diff --git a/install-sh b/lib/rdoc/generator/template/darkfish/.document
index e69de29bb2..e69de29bb2 100644
--- a/install-sh
+++ b/lib/rdoc/generator/template/darkfish/.document
diff --git a/lib/rdoc/generator/template/darkfish/classpage.rhtml b/lib/rdoc/generator/template/darkfish/classpage.rhtml
new file mode 100644
index 0000000000..7151087988
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/classpage.rhtml
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="<%= @options.charset %>"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<meta content="text/html; charset=<%= @options.charset %>" http-equiv="Content-Type" />
+
+	<title><%= klass.type.capitalize %>: <%= klass.full_name %></title>
+
+	<link rel="stylesheet" href="<%= rel_prefix %>/rdoc.css" type="text/css" media="screen" />
+
+	<script src="<%= rel_prefix %>/js/jquery.js" type="text/javascript"
+		charset="utf-8"></script>
+	<script src="<%= rel_prefix %>/js/thickbox-compressed.js" type="text/javascript"
+		charset="utf-8"></script>
+	<script src="<%= rel_prefix %>/js/quicksearch.js" type="text/javascript"
+		charset="utf-8"></script>
+	<script src="<%= rel_prefix %>/js/darkfish.js" type="text/javascript"
+		charset="utf-8"></script>
+
+</head>
+<body class="<%= klass.type %>">
+
+	<div id="metadata">
+		<div id="home-metadata">
+			<div id="home-section" class="section">
+        <h3 class="section-header">
+          <a href="<%= rel_prefix %>/index.html">Home</a>
+          <a href="<%= rel_prefix %>/index.html#classes">Classes</a>
+          <a href="<%= rel_prefix %>/index.html#methods">Methods</a>
+        </h3>
+			</div>
+		</div>
+
+		<div id="file-metadata">
+			<div id="file-list-section" class="section">
+				<h3 class="section-header">In Files</h3>
+				<div class="section-body">
+					<ul>
+					<% klass.in_files.each do |tl| %>
+						<li><a href="<%= rel_prefix %>/<%= h tl.path %>?TB_iframe=true&amp;height=550&amp;width=785"
+							class="thickbox" title="<%= h tl.absolute_name %>"><%= h tl.absolute_name %></a></li>
+					<% end %>
+					</ul>
+				</div>
+			</div>
+
+			<% if !svninfo.empty? %>
+			<div id="file-svninfo-section" class="section">
+				<h3 class="section-header">Subversion Info</h3>
+				<div class="section-body">
+					<dl class="svninfo">
+						<dt>Rev</dt>
+						<dd><%= svninfo[:rev] %></dd>
+
+						<dt>Last Checked In</dt>
+						<dd><%= svninfo[:commitdate].strftime('%Y-%m-%d %H:%M:%S') %>
+							(<%= svninfo[:commitdelta] %> ago)</dd>
+
+						<dt>Checked in by</dt>
+						<dd><%= svninfo[:committer] %></dd>
+					</dl>
+				</div>
+			</div>
+			<% end %>
+		</div>
+
+		<div id="class-metadata">
+
+			<!-- Parent Class -->
+			<% if klass.type == 'class' %>
+			<div id="parent-class-section" class="section">
+				<h3 class="section-header">Parent</h3>
+				<% unless String === klass.superclass %>
+				<p class="link"><a href="<%= klass.aref_to klass.superclass.path %>"><%= klass.superclass.full_name %></a></p>
+				<% else %>
+				<p class="link"><%= klass.superclass %></p>
+				<% end %>
+			</div>
+			<% end %>
+
+			<!-- Namespace Contents -->
+			<% unless klass.classes_and_modules.empty? %>
+			<div id="namespace-list-section" class="section">
+				<h3 class="section-header">Namespace</h3>
+				<ul class="link-list">
+					<% (klass.modules.sort + klass.classes.sort).each do |mod| %>
+					<li><span class="type"><%= mod.type.upcase %></span> <a href="<%= klass.aref_to mod.path %>"><%= mod.full_name %></a></li>
+					<% end %>
+				</ul>
+			</div>
+			<% end %>
+
+			<!-- Method Quickref -->
+			<% unless klass.method_list.empty? %>
+			<div id="method-list-section" class="section">
+				<h3 class="section-header">Methods</h3>
+				<ul class="link-list">
+					<% klass.each_method do |meth| %>
+					<li><a href="#<%= meth.aref %>"><%= meth.singleton ? '::' : '#' %><%= meth.name %></a></li>
+					<% end %>
+				</ul>
+			</div>
+			<% end %>
+
+			<!-- Included Modules -->
+			<% unless klass.includes.empty? %>
+			<div id="includes-section" class="section">
+				<h3 class="section-header">Included Modules</h3>
+				<ul class="link-list">
+				<% klass.each_include do |inc| %>
+				<% unless String === inc.module %>
+					<li><a class="include" href="<%= klass.aref_to inc.module.path %>"><%= inc.module.full_name %></a></li>
+				<% else %>
+					<li><span class="include"><%= inc.name %></span></li>
+				<% end %>
+				<% end %>
+				</ul>
+			</div>
+			<% end %>
+		</div>
+
+		<div id="project-metadata">
+			<% simple_files = @files.select {|tl| tl.parser == RDoc::Parser::Simple } %>
+			<% unless simple_files.empty? then %>
+			<div id="fileindex-section" class="section project-section">
+				<h3 class="section-header">Files</h3>
+				<ul>
+				<% simple_files.each do |file| %>
+					<li class="file"><a href="<%= rel_prefix %>/<%= file.path %>"><%= h file.base_name %></a></li>
+				<% end %>
+				</ul>
+			</div>
+			<% end %>
+
+			<div id="classindex-section" class="section project-section">
+				<h3 class="section-header">Class Index
+					<span class="search-toggle"><img src="<%= rel_prefix %>/images/find.png"
+						height="16" width="16" alt="[+]"
+						title="show/hide quicksearch" /></span></h3>
+				<form action="#" method="get" accept-charset="utf-8" class="initially-hidden">
+				<fieldset>
+					<legend>Quicksearch</legend>
+					<input type="text" name="quicksearch" value=""
+						class="quicksearch-field" />
+				</fieldset>
+				</form>
+
+				<ul class="link-list">
+				<% @modsort.each do |index_klass| %>
+					<li><a href="<%= rel_prefix %>/<%= index_klass.path %>"><%= index_klass.full_name %></a></li>
+				<% end %>
+				</ul>
+				<div id="no-class-search-results" style="display: none;">No matching classes.</div>
+			</div>
+
+			<% if $DEBUG_RDOC %>
+			<div id="debugging-toggle"><img src="<%= rel_prefix %>/images/bug.png"
+				alt="toggle debugging" height="16" width="16" /></div>
+			<% end %>
+		</div>
+	</div>
+
+	<div id="documentation">
+		<h1 class="<%= klass.type %>"><%= klass.full_name %></h1>
+
+		<div id="description">
+			<%= klass.description %>
+		</div>
+
+		<!-- Constants -->
+		<% unless klass.constants.empty? %>
+		<div id="constants-list" class="section">
+			<h3 class="section-header">Constants</h3>
+			<dl>
+			<% klass.each_constant do |const| %>
+				<dt><a name="<%= const.name %>"><%= const.name %></a></dt>
+				<% if const.comment %>
+				<dd class="description"><%= const.description.strip %></dd>
+				<% else %>
+				<dd class="description missing-docs">(Not documented)</dd>
+				<% end %>
+			<% end %>
+			</dl>
+		</div>
+		<% end %>
+
+		<!-- Attributes -->
+		<% unless klass.attributes.empty? %>
+		<div id="attribute-method-details" class="method-section section">
+			<h3 class="section-header">Attributes</h3>
+
+			<% klass.each_attribute do |attrib| %>
+			<div id="<%= attrib.html_name %>-attribute-method" class="method-detail">
+				<a name="<%= h attrib.name %>"></a>
+				<% if attrib.rw =~ /w/i %>
+				<a name="<%= h attrib.name %>="></a>
+				<% end %>
+				<div class="method-heading attribute-method-heading">
+					<span class="method-name"><%= h attrib.name %></span><span
+						class="attribute-access-type">[<%= attrib.rw %>]</span>
+				</div>
+
+				<div class="method-description">
+				<% if attrib.comment %>
+				<%= attrib.description.strip %>
+				<% else %>
+				<p class="missing-docs">(Not documented)</p>
+				<% end %>
+				</div>
+			</div>
+			<% end %>
+		</div>
+		<% end %>
+
+		<!-- Methods -->
+		<% klass.methods_by_type.each do |type, visibilities|
+			 next if visibilities.empty?
+			 visibilities.each do |visibility, methods|
+				 next if methods.empty? %>
+		<div id="<%= visibility %>-<%= type %>-method-details" class="method-section section">
+			<h3 class="section-header"><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</h3>
+
+		<% methods.each do |method| %>
+			<div id="<%= method.html_name %>-method" class="method-detail <%= method.is_alias_for ? "method-alias" : '' %>">
+				<a name="<%= h method.aref %>"></a>
+
+				<div class="method-heading">
+				<% if method.call_seq %>
+					<span class="method-callseq"><%= method.call_seq.strip.gsub(/->/, '&rarr;').gsub( /^\w.+\./m, '') %></span>
+					<span class="method-click-advice">click to toggle source</span>
+				<% else %>
+					<span class="method-name"><%= h method.name %></span><span
+						class="method-args"><%= method.params %></span>
+					<span class="method-click-advice">click to toggle source</span>
+				<% end %>
+				</div>
+
+				<div class="method-description">
+					<% if method.comment %>
+					<%= method.description.strip %>
+					<% else %>
+					<p class="missing-docs">(Not documented)</p>
+					<% end %>
+
+					<% if method.token_stream %>
+					<div class="method-source-code"
+						id="<%= method.html_name %>-source">
+<pre>
+<%= method.markup_code %>
+</pre>
+					</div>
+					<% end %>
+				</div>
+
+				<% unless method.aliases.empty? %>
+				<div class="aliases">
+					Also aliased as: <%= method.aliases.map do |aka|
+						%{<a href="#{ klass.aref_to aka.path}">#{h aka.name}</a>}
+					end.join(", ") %>
+				</div>
+				<% end %>
+
+				<% if method.is_alias_for then %>
+				<div class="aliases">
+          Alias for: <a href="<%= klass.aref_to method.is_alias_for.path %>"><%= h method.is_alias_for.name %></a>
+				</div>
+				<% end %>
+			</div>
+
+		<% end %>
+		</div>
+	<% end
+		 end %>
+
+	</div>
+
+
+	<div id="rdoc-debugging-section-dump" class="debugging-section">
+	<% if $DEBUG_RDOC
+			 require 'pp' %>
+<pre><%= h PP.pp(klass, _erbout) %></pre>
+		</div>
+	<% else %>
+		<p>Disabled; run with --debug to generate this.</p>
+	<% end %>
+	</div>
+
+	<div id="validator-badges">
+		<p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+		<p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+			Rdoc Generator</a> <%= RDoc::Generator::Darkfish::VERSION %></small>.</p>
+	</div>
+
+</body>
+</html>
+
diff --git a/lib/rdoc/generator/template/darkfish/filepage.rhtml b/lib/rdoc/generator/template/darkfish/filepage.rhtml
new file mode 100644
index 0000000000..33216dc8f1
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/filepage.rhtml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<meta content="text/html; charset=<%= @options.charset %>" http-equiv="Content-Type" />
+
+	<title>File: <%= file.base_name %> [<%= @options.title %>]</title>
+
+	<link type="text/css" media="screen" href="<%= rel_prefix %>/rdoc.css" rel="stylesheet" />
+
+	<script src="<%= rel_prefix %>/js/jquery.js" type="text/javascript"
+		charset="utf-8"></script>
+	<script src="<%= rel_prefix %>/js/thickbox-compressed.js" type="text/javascript"
+		charset="utf-8"></script>
+	<script src="<%= rel_prefix %>/js/quicksearch.js" type="text/javascript"
+		charset="utf-8"></script>
+	<script src="<%= rel_prefix %>/js/darkfish.js" type="text/javascript"
+		charset="utf-8"></script>
+</head>
+
+<% if file.parser == RDoc::Parser::Simple %>
+<body class="file">
+	<div id="metadata">
+		<div id="home-metadata">
+			<div id="home-section" class="section">
+        <h3 class="section-header">
+          <a href="<%= rel_prefix %>/index.html">Home</a>
+          <a href="<%= rel_prefix %>/index.html#classes">Classes</a>
+          <a href="<%= rel_prefix %>/index.html#methods">Methods</a>
+        </h3>
+			</div>
+		</div>
+
+		<div id="project-metadata">
+			<% simple_files = @files.select { |f| f.parser == RDoc::Parser::Simple } %>
+			<% unless simple_files.empty? then %>
+			<div id="fileindex-section" class="section project-section">
+				<h3 class="section-header">Files</h3>
+				<ul>
+				<% simple_files.each do |f| %>
+					<li class="file"><a href="<%= rel_prefix %>/<%= f.path %>"><%= h f.base_name %></a></li>
+				<% end %>
+				</ul>
+			</div>
+			<% end %>
+
+			<div id="classindex-section" class="section project-section">
+				<h3 class="section-header">Class Index
+					<span class="search-toggle"><img src="<%= rel_prefix %>/images/find.png"
+						height="16" width="16" alt="[+]"
+						title="show/hide quicksearch" /></span></h3>
+				<form action="#" method="get" accept-charset="utf-8" class="initially-hidden">
+				<fieldset>
+					<legend>Quicksearch</legend>
+					<input type="text" name="quicksearch" value=""
+						class="quicksearch-field" />
+				</fieldset>
+				</form>
+
+				<ul class="link-list">
+				<% @modsort.each do |index_klass| %>
+					<li><a href="<%= rel_prefix %>/<%= index_klass.path %>"><%= index_klass.full_name %></a></li>
+				<% end %>
+				</ul>
+				<div id="no-class-search-results" style="display: none;">No matching classes.</div>
+			</div>
+
+			<% if $DEBUG_RDOC %>
+			<div id="debugging-toggle"><img src="<%= rel_prefix %>/images/bug.png"
+				alt="toggle debugging" height="16" width="16" /></div>
+			<% end %>
+		</div>
+	</div>
+
+	<div id="documentation">
+		<%= file.description %>
+	</div>
+
+	<div id="validator-badges">
+		<p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+		<p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+			Rdoc Generator</a> <%= RDoc::Generator::Darkfish::VERSION %></small>.</p>
+	</div>
+</body>
+<% else %>
+<body class="file file-popup">
+	<div id="metadata">
+		<dl>
+			<dt class="modified-date">Last Modified</dt>
+			<dd class="modified-date"><%= file.last_modified %></dd>
+
+			<% if file.requires %>
+			<dt class="requires">Requires</dt>
+			<dd class="requires">
+				<ul>
+				<% file.requires.each do |require| %>
+					<li><%= require.name %></li>
+				<% end %>
+				</ul>
+			</dd>
+			<% end %>
+
+			<% if @options.webcvs %>
+			<dt class="scs-url">Trac URL</dt>
+			<dd class="scs-url"><a target="_top"
+				href="<%= file.cvs_url %>"><%= file.cvs_url %></a></dd>
+			<% end %>
+		</dl>
+	</div>
+
+	<div id="documentation">
+		<% if file.comment %>
+		<div class="description">
+			<h2>Description</h2>
+			<%= file.description %>
+		</div>
+		<% end %>
+	</div>
+</body>
+<% end %>
+</html>
+
diff --git a/lib/rdoc/generator/template/darkfish/images/brick.png b/lib/rdoc/generator/template/darkfish/images/brick.png
new file mode 100644
index 0000000000..7851cf34c9
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/brick.png
diff --git a/lib/rdoc/generator/template/darkfish/images/brick_link.png b/lib/rdoc/generator/template/darkfish/images/brick_link.png
new file mode 100644
index 0000000000..9ebf013a23
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/brick_link.png
diff --git a/lib/rdoc/generator/template/darkfish/images/bug.png b/lib/rdoc/generator/template/darkfish/images/bug.png
new file mode 100644
index 0000000000..2d5fb90ec6
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/bug.png
diff --git a/lib/rdoc/generator/template/darkfish/images/bullet_black.png b/lib/rdoc/generator/template/darkfish/images/bullet_black.png
new file mode 100644
index 0000000000..57619706d1
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/bullet_black.png
diff --git a/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png b/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png
new file mode 100644
index 0000000000..b47ce55f68
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png
diff --git a/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png b/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png
new file mode 100644
index 0000000000..9ab4a89664
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png
diff --git a/lib/rdoc/generator/template/darkfish/images/date.png b/lib/rdoc/generator/template/darkfish/images/date.png
new file mode 100644
index 0000000000..783c83357f
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/date.png
diff --git a/lib/rdoc/generator/template/darkfish/images/find.png b/lib/rdoc/generator/template/darkfish/images/find.png
new file mode 100644
index 0000000000..1547479646
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/find.png
diff --git a/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif b/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif
new file mode 100644
index 0000000000..82290f4833
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif
diff --git a/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png b/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png
new file mode 100644
index 0000000000..c6473b324e
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png
diff --git a/lib/rdoc/generator/template/darkfish/images/package.png b/lib/rdoc/generator/template/darkfish/images/package.png
new file mode 100644
index 0000000000..da3c2a2d74
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/package.png
diff --git a/lib/rdoc/generator/template/darkfish/images/page_green.png b/lib/rdoc/generator/template/darkfish/images/page_green.png
new file mode 100644
index 0000000000..de8e003f9f
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/page_green.png
diff --git a/lib/rdoc/generator/template/darkfish/images/page_white_text.png b/lib/rdoc/generator/template/darkfish/images/page_white_text.png
new file mode 100644
index 0000000000..813f712f72
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/page_white_text.png
diff --git a/lib/rdoc/generator/template/darkfish/images/page_white_width.png b/lib/rdoc/generator/template/darkfish/images/page_white_width.png
new file mode 100644
index 0000000000..1eb880947d
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/page_white_width.png
diff --git a/lib/rdoc/generator/template/darkfish/images/plugin.png b/lib/rdoc/generator/template/darkfish/images/plugin.png
new file mode 100644
index 0000000000..6187b15aec
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/plugin.png
diff --git a/lib/rdoc/generator/template/darkfish/images/ruby.png b/lib/rdoc/generator/template/darkfish/images/ruby.png
new file mode 100644
index 0000000000..f763a16880
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/ruby.png
diff --git a/lib/rdoc/generator/template/darkfish/images/tag_green.png b/lib/rdoc/generator/template/darkfish/images/tag_green.png
new file mode 100644
index 0000000000..83ec984bd7
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/tag_green.png
diff --git a/lib/rdoc/generator/template/darkfish/images/wrench.png b/lib/rdoc/generator/template/darkfish/images/wrench.png
new file mode 100644
index 0000000000..5c8213fef5
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/wrench.png
diff --git a/lib/rdoc/generator/template/darkfish/images/wrench_orange.png b/lib/rdoc/generator/template/darkfish/images/wrench_orange.png
new file mode 100644
index 0000000000..565a9330e0
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/wrench_orange.png
diff --git a/lib/rdoc/generator/template/darkfish/images/zoom.png b/lib/rdoc/generator/template/darkfish/images/zoom.png
new file mode 100644
index 0000000000..908612e394
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/images/zoom.png
diff --git a/lib/rdoc/generator/template/darkfish/index.rhtml b/lib/rdoc/generator/template/darkfish/index.rhtml
new file mode 100644
index 0000000000..e853235ddb
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/index.rhtml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	<meta content="text/html; charset=<%= @options.charset %>" http-equiv="Content-Type" />
+
+	<title><%= h @options.title %></title>
+
+	<link type="text/css" media="screen" href="rdoc.css" rel="stylesheet" />
+
+	<script src="js/jquery.js" type="text/javascript" charset="utf-8"></script>
+	<script src="js/thickbox-compressed.js" type="text/javascript" charset="utf-8"></script>
+	<script src="js/quicksearch.js" type="text/javascript" charset="utf-8"></script>
+	<script src="js/darkfish.js" type="text/javascript" charset="utf-8"></script>
+
+</head>
+<body class="indexpage">
+
+	<% $stderr.sync = true %>
+	<h1><%= h @options.title %></h1>
+
+	<% if @options.main_page && main_page = @files.find { |f| f.full_name == @options.main_page } %>
+	<div id="main">
+		<%= main_page.description.sub(%r{^\s*<h1.*?/h1>}i, '') %>
+	</div>
+	<% else %>
+	<p>This is the API documentation for '<%= @options.title %>'.</p>
+	<% end %>
+
+	<% simple_files = @files.select {|tl| tl.parser == RDoc::Parser::Simple } %>
+	<% unless simple_files.empty? then %>
+	<h2>Files</h2>
+	<ul>
+		<% simple_files.sort.each do |file| %>
+			<li class="file"><a href="<%= file.path %>"><%= h file.base_name %></a></li>
+		<% end %>
+	</ul>
+	<% end %>
+
+	<h2 id="classes">Classes/Modules</h2>
+	<ul>
+		<% @modsort.each do |klass| %>
+		<li class="<%= klass.type %>"><a href="<%= klass.path %>"><%= klass.full_name %></a></li>
+		<% end %>
+	</ul>
+
+	<h2 id="methods">Methods</h2>
+	<ul>
+		<% RDoc::TopLevel.all_classes_and_modules.map do |mod|
+				 mod.method_list
+			 end.flatten.sort.each do |method| %>
+			<li><a href="<%= method.path %>"><%= method.pretty_name %> &mdash; <%= method.parent.full_name %></a></li>
+		<% end %>
+	</ul>
+
+	<div id="validator-badges">
+		<p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+		<p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+			Rdoc Generator</a> <%= RDoc::Generator::Darkfish::VERSION %></small>.</p>
+	</div>
+</body>
+</html>
diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
new file mode 100644
index 0000000000..84565c1e2d
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -0,0 +1,116 @@
+/**
+ *
+ * Darkfish Page Functions
+ * $Id: darkfish.js 53 2009-01-07 02:52:03Z deveiant $
+ *
+ * Author: Michael Granger <mgranger@laika.com>
+ *
+ */
+
+/* Provide console simulation for firebug-less environments */
+if (!("console" in window) || !("firebug" in console)) {
+    var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
+    "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
+
+    window.console = {};
+    for (var i = 0; i < names.length; ++i)
+        window.console[names[i]] = function() {};
+};
+
+
+/**
+ * Unwrap the first element that matches the given @expr@ from the targets and return them.
+ */
+$.fn.unwrap = function( expr ) {
+  return this.each( function() {
+     $(this).parents( expr ).eq( 0 ).after( this ).remove();
+  });
+};
+
+
+function showSource( e ) {
+	var target = e.target;
+	var codeSections = $(target).
+		parents('.method-detail').
+		find('.method-source-code');
+
+	$(target).
+		parents('.method-detail').
+		find('.method-source-code').
+		slideToggle();
+};
+
+function hookSourceViews() {
+	$('.method-description,.method-heading').click( showSource );
+};
+
+function toggleDebuggingSection() {
+	$('.debugging-section').slideToggle();
+};
+
+function hookDebuggingToggle() {
+	$('#debugging-toggle img').click( toggleDebuggingSection );
+};
+
+function hookQuickSearch() {
+	$('.quicksearch-field').each( function() {
+		var searchElems = $(this).parents('.section').find( 'li' );
+		var toggle = $(this).parents('.section').find('h3 .search-toggle');
+		// console.debug( "Toggle is: %o", toggle );
+		var qsbox = $(this).parents('form').get( 0 );
+
+		$(this).quicksearch( this, searchElems, {
+			noSearchResultsIndicator: 'no-class-search-results',
+			focusOnLoad: false
+		});
+		$(toggle).click( function() {
+			// console.debug( "Toggling qsbox: %o", qsbox );
+			$(qsbox).toggle();
+		});
+	});
+};
+
+function highlightTarget( anchor ) {
+	console.debug( "Highlighting target '%s'.", anchor );
+
+	$("a[name=" + anchor + "]").each( function() {
+		if ( !$(this).parent().parent().hasClass('target-section') ) {
+			console.debug( "Wrapping the target-section" );
+			$('div.method-detail').unwrap( 'div.target-section' );
+			$(this).parent().wrap( '<div class="target-section"></div>' );
+		} else {
+			console.debug( "Already wrapped." );
+		}
+	});
+};
+
+function highlightLocationTarget() {
+	console.debug( "Location hash: %s", window.location.hash );
+	if ( ! window.location.hash || window.location.hash.length == 0 ) return;
+
+	var anchor = window.location.hash.substring(1);
+	console.debug( "Found anchor: %s; matching %s", anchor, "a[name=" + anchor + "]" );
+
+	highlightTarget( anchor );
+};
+
+function highlightClickTarget( event ) {
+	console.debug( "Highlighting click target for event %o", event.target );
+	try {
+		var anchor = $(event.target).attr( 'href' ).substring(1);
+		console.debug( "Found target anchor: %s", anchor );
+		highlightTarget( anchor );
+	} catch ( err ) {
+		console.error( "Exception while highlighting: %o", err );
+	};
+};
+
+
+$(document).ready( function() {
+	hookSourceViews();
+	hookDebuggingToggle();
+	hookQuickSearch();
+	highlightLocationTarget();
+
+	$('ul.link-list a').bind( "click", highlightClickTarget );
+});
diff --git a/lib/rdoc/generator/template/darkfish/js/jquery.js b/lib/rdoc/generator/template/darkfish/js/jquery.js
new file mode 100644
index 0000000000..afe9e74c90
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/js/jquery.js
@@ -0,0 +1,32 @@
+/*
+ * jQuery 1.2.6 - New Wave Javascript
+ *
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2008-09-25 09:50:52 -0700 (Thu, 25 Sep 2008) $
+ * $Rev: 38 $
+ */
+(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
+return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
+return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
+selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
+return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
+this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
+return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
+jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
+script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
+for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
+for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
+jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
+ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
+while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
+while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
+for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
+jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
+xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
+jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
+for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
+s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
+e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
+\ No newline at end of file
diff --git a/lib/rdoc/generator/template/darkfish/js/quicksearch.js b/lib/rdoc/generator/template/darkfish/js/quicksearch.js
new file mode 100644
index 0000000000..70dbd33cd9
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/js/quicksearch.js
@@ -0,0 +1,114 @@
+/**
+ *
+ * JQuery QuickSearch - Hook up a form field to hide non-matching elements.
+ * $Id: quicksearch.js 53 2009-01-07 02:52:03Z deveiant $
+ *
+ * Author: Michael Granger <mgranger@laika.com>
+ *
+ */
+jQuery.fn.quicksearch = function( target, searchElems, options ) {
+	// console.debug( "Quicksearch fn" );
+
+	var settings = {
+		delay: 250,
+		clearButton: false,
+		highlightMatches: false,
+		focusOnLoad: false,
+		noSearchResultsIndicator: null
+	};
+	if ( options ) $.extend( settings, options );
+
+	return jQuery(this).each( function() {
+		// console.debug( "Creating a new quicksearch on %o for %o", this, searchElems );
+		new jQuery.quicksearch( this, searchElems, settings );
+	});
+};
+
+
+jQuery.quicksearch = function( searchBox, searchElems, settings ) {
+	var timeout;
+	var boxdiv = $(searchBox).parents('div').eq(0);
+
+	function init() {
+		setupKeyEventHandlers();
+		focusOnLoad();
+	};
+
+	function setupKeyEventHandlers() {
+		// console.debug( "Hooking up the 'keypress' event to %o", searchBox );
+		$(searchBox).
+			unbind( 'keyup' ).
+			keyup( function(e) { return onSearchKey( e.keyCode ); });
+		$(searchBox).
+			unbind( 'keypress' ).
+			keypress( function(e) {
+				switch( e.which ) {
+					// Execute the search on Enter, Tab, or Newline
+					case 9:
+					case 13:
+					case 10:
+						clearTimeout( timeout );
+						e.preventDefault();
+						doQuickSearch();
+						break;
+
+					// Allow backspace
+					case 8:
+						return true;
+						break;
+
+					// Only allow valid search characters
+					default:
+						return validQSChar( e.charCode );
+				}
+			});
+	};
+
+	function focusOnLoad() {
+		if ( !settings.focusOnLoad ) return false;
+		$(searchBox).focus();
+	};
+
+	function onSearchKey ( code ) {
+		clearTimeout( timeout );
+		// console.debug( "...scheduling search." );
+		timeout = setTimeout( doQuickSearch, settings.delay );
+	};
+
+	function validQSChar( code ) {
+		var c = String.fromCharCode( code );
+		return (
+			(c == ':') ||
+			(c >= 'a' && c <= 'z') ||
+			(c >= 'A' && c <= 'Z')
+		  );
+	};
+
+	function doQuickSearch() {
+		var searchText = searchBox.value;
+		var pat = new RegExp( searchText, "im" );
+		var shownCount = 0;
+
+		if ( settings.noSearchResultsIndicator ) {
+			$('#' + settings.noSearchResultsIndicator).hide();
+		}
+
+		// All elements start out hidden
+		$(searchElems).each( function(index) {
+			var str = $(this).text();
+
+			if ( pat.test(str) ) {
+				shownCount += 1;
+				$(this).fadeIn();
+			} else {
+				$(this).hide();
+			}
+		});
+
+		if ( shownCount == 0 && settings.noSearchResultsIndicator ) {
+			$('#' + settings.noSearchResultsIndicator).slideDown();
+		}
+	};
+
+	init();
+};
diff --git a/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js b/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js
new file mode 100644
index 0000000000..3a3fdae1fb
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js
@@ -0,0 +1,10 @@
+/*
+ * Thickbox 3 - One Box To Rule Them All.
+ * By Cody Lindley (http://www.codylindley.com)
+ * Copyright (c) 2007 cody lindley
+ * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
+*/
+
+var tb_pathToImage = "../images/loadingAnimation.gif";
+
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('$(o).2S(9(){1u(\'a.18, 3n.18, 3i.18\');1w=1p 1t();1w.L=2H});9 1u(b){$(b).s(9(){6 t=X.Q||X.1v||M;6 a=X.u||X.23;6 g=X.1N||P;19(t,a,g);X.2E();H P})}9 19(d,f,g){3m{3(2t o.v.J.2i==="2g"){$("v","11").r({A:"28%",z:"28%"});$("11").r("22","2Z");3(o.1Y("1F")===M){$("v").q("<U 5=\'1F\'></U><4 5=\'B\'></4><4 5=\'8\'></4>");$("#B").s(G)}}n{3(o.1Y("B")===M){$("v").q("<4 5=\'B\'></4><4 5=\'8\'></4>");$("#B").s(G)}}3(1K()){$("#B").1J("2B")}n{$("#B").1J("2z")}3(d===M){d=""}$("v").q("<4 5=\'K\'><1I L=\'"+1w.L+"\' /></4>");$(\'#K\').2y();6 h;3(f.O("?")!==-1){h=f.3l(0,f.O("?"))}n{h=f}6 i=/\\.2s$|\\.2q$|\\.2m$|\\.2l$|\\.2k$/;6 j=h.1C().2h(i);3(j==\'.2s\'||j==\'.2q\'||j==\'.2m\'||j==\'.2l\'||j==\'.2k\'){1D="";1G="";14="";1z="";1x="";R="";1n="";1r=P;3(g){E=$("a[@1N="+g+"]").36();25(D=0;((D<E.1c)&&(R===""));D++){6 k=E[D].u.1C().2h(i);3(!(E[D].u==f)){3(1r){1z=E[D].Q;1x=E[D].u;R="<1e 5=\'1X\'>&1d;&1d;<a u=\'#\'>2T &2R;</a></1e>"}n{1D=E[D].Q;1G=E[D].u;14="<1e 5=\'1U\'>&1d;&1d;<a u=\'#\'>&2O; 2N</a></1e>"}}n{1r=1b;1n="1t "+(D+1)+" 2L "+(E.1c)}}}S=1p 1t();S.1g=9(){S.1g=M;6 a=2x();6 x=a[0]-1M;6 y=a[1]-1M;6 b=S.z;6 c=S.A;3(b>x){c=c*(x/b);b=x;3(c>y){b=b*(y/c);c=y}}n 3(c>y){b=b*(y/c);c=y;3(b>x){c=c*(x/b);b=x}}13=b+30;1a=c+2G;$("#8").q("<a u=\'\' 5=\'1L\' Q=\'1o\'><1I 5=\'2F\' L=\'"+f+"\' z=\'"+b+"\' A=\'"+c+"\' 23=\'"+d+"\'/></a>"+"<4 5=\'2D\'>"+d+"<4 5=\'2C\'>"+1n+14+R+"</4></4><4 5=\'2A\'><a u=\'#\' 5=\'Z\' Q=\'1o\'>1l</a> 1k 1j 1s</4>");$("#Z").s(G);3(!(14==="")){9 12(){3($(o).N("s",12)){$(o).N("s",12)}$("#8").C();$("v").q("<4 5=\'8\'></4>");19(1D,1G,g);H P}$("#1U").s(12)}3(!(R==="")){9 1i(){$("#8").C();$("v").q("<4 5=\'8\'></4>");19(1z,1x,g);H P}$("#1X").s(1i)}o.1h=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}n 3(I==3k){3(!(R=="")){o.1h="";1i()}}n 3(I==3j){3(!(14=="")){o.1h="";12()}}};16();$("#K").C();$("#1L").s(G);$("#8").r({Y:"T"})};S.L=f}n{6 l=f.2r(/^[^\\?]+\\??/,\'\');6 m=2p(l);13=(m[\'z\']*1)+30||3h;1a=(m[\'A\']*1)+3g||3f;W=13-30;V=1a-3e;3(f.O(\'2j\')!=-1){1E=f.1B(\'3d\');$("#15").C();3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"</4><4 5=\'2e\'><a u=\'#\' 5=\'Z\' Q=\'1o\'>1l</a> 1k 1j 1s</4></4><U 1W=\'0\' 2d=\'0\' L=\'"+1E[0]+"\' 5=\'15\' 1v=\'15"+1f.2c(1f.1y()*2b)+"\' 1g=\'1m()\' J=\'z:"+(W+29)+"p;A:"+(V+17)+"p;\' > </U>")}n{$("#B").N();$("#8").q("<U 1W=\'0\' 2d=\'0\' L=\'"+1E[0]+"\' 5=\'15\' 1v=\'15"+1f.2c(1f.1y()*2b)+"\' 1g=\'1m()\' J=\'z:"+(W+29)+"p;A:"+(V+17)+"p;\'> </U>")}}n{3($("#8").r("Y")!="T"){3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"</4><4 5=\'2e\'><a u=\'#\' 5=\'Z\'>1l</a> 1k 1j 1s</4></4><4 5=\'F\' J=\'z:"+W+"p;A:"+V+"p\'></4>")}n{$("#B").N();$("#8").q("<4 5=\'F\' 3c=\'3b\' J=\'z:"+W+"p;A:"+V+"p;\'></4>")}}n{$("#F")[0].J.z=W+"p";$("#F")[0].J.A=V+"p";$("#F")[0].3a=0;$("#1H").11(d)}}$("#Z").s(G);3(f.O(\'37\')!=-1){$("#F").q($(\'#\'+m[\'26\']).1T());$("#8").24(9(){$(\'#\'+m[\'26\']).q($("#F").1T())});16();$("#K").C();$("#8").r({Y:"T"})}n 3(f.O(\'2j\')!=-1){16();3($.1q.35){$("#K").C();$("#8").r({Y:"T"})}}n{$("#F").34(f+="&1y="+(1p 33().32()),9(){16();$("#K").C();1u("#F a.18");$("#8").r({Y:"T"})})}}3(!m[\'1A\']){o.21=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}}}}31(e){}}9 1m(){$("#K").C();$("#8").r({Y:"T"})}9 G(){$("#2Y").N("s");$("#Z").N("s");$("#8").2X("2W",9(){$(\'#8,#B,#1F\').2V("24").N().C()});$("#K").C();3(2t o.v.J.2i=="2g"){$("v","11").r({A:"1Z",z:"1Z"});$("11").r("22","")}o.1h="";o.21="";H P}9 16(){$("#8").r({2U:\'-\'+20((13/2),10)+\'p\',z:13+\'p\'});3(!(1V.1q.2Q&&1V.1q.2P<7)){$("#8").r({38:\'-\'+20((1a/2),10)+\'p\'})}}9 2p(a){6 b={};3(!a){H b}6 c=a.1B(/[;&]/);25(6 i=0;i<c.1c;i++){6 d=c[i].1B(\'=\');3(!d||d.1c!=2){39}6 e=2a(d[0]);6 f=2a(d[1]);f=f.2r(/\\+/g,\' \');b[e]=f}H b}9 2x(){6 a=o.2M;6 w=1S.2o||1R.2o||(a&&a.1Q)||o.v.1Q;6 h=1S.1P||1R.1P||(a&&a.2n)||o.v.2n;1O=[w,h];H 1O}9 1K(){6 a=2K.2J.1C();3(a.O(\'2I\')!=-1&&a.O(\'3o\')!=-1){H 1b}}',62,211,'|||if|div|id|var||TB_window|function||||||||||||||else|document|px|append|css|click||href|body||||width|height|TB_overlay|remove|TB_Counter|TB_TempArray|TB_ajaxContent|tb_remove|return|keycode|style|TB_load|src|null|unbind|indexOf|false|title|TB_NextHTML|imgPreloader|block|iframe|ajaxContentH|ajaxContentW|this|display|TB_closeWindowButton||html|goPrev|TB_WIDTH|TB_PrevHTML|TB_iframeContent|tb_position||thickbox|tb_show|TB_HEIGHT|true|length|nbsp|span|Math|onload|onkeydown|goNext|Esc|or|close|tb_showIframe|TB_imageCount|Close|new|browser|TB_FoundURL|Key|Image|tb_init|name|imgLoader|TB_NextURL|random|TB_NextCaption|modal|split|toLowerCase|TB_PrevCaption|urlNoQuery|TB_HideSelect|TB_PrevURL|TB_ajaxWindowTitle|img|addClass|tb_detectMacXFF|TB_ImageOff|150|rel|arrayPageSize|innerHeight|clientWidth|self|window|children|TB_prev|jQuery|frameborder|TB_next|getElementById|auto|parseInt|onkeyup|overflow|alt|unload|for|inlineId||100||unescape|1000|round|hspace|TB_closeAjaxWindow|TB_title|undefined|match|maxHeight|TB_iframe|bmp|gif|png|clientHeight|innerWidth|tb_parseQuery|jpeg|replace|jpg|typeof|which|keyCode|event|tb_getPageSize|show|TB_overlayBG|TB_closeWindow|TB_overlayMacFFBGHack|TB_secondLine|TB_caption|blur|TB_Image|60|tb_pathToImage|mac|userAgent|navigator|of|documentElement|Prev|lt|version|msie|gt|ready|Next|marginLeft|trigger|fast|fadeOut|TB_imageOff|hidden||catch|getTime|Date|load|safari|get|TB_inline|marginTop|continue|scrollTop|TB_modal|class|TB_|45|440|40|630|input|188|190|substr|try|area|firefox'.split('|'),0,{}))
+\ No newline at end of file
diff --git a/lib/rdoc/generator/template/darkfish/rdoc.css b/lib/rdoc/generator/template/darkfish/rdoc.css
new file mode 100644
index 0000000000..ffe996001a
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/rdoc.css
@@ -0,0 +1,706 @@
+/*
+ * "Darkfish" Rdoc CSS
+ * $Id: rdoc.css 54 2009-01-27 01:09:48Z deveiant $
+ *
+ * Author: Michael Granger <ged@FaerieMUD.org>
+ *
+ */
+
+/* Base Green is: #6C8C22 */
+
+*{ padding: 0; margin: 0; }
+
+body {
+  background: #efefef;
+	font: 14px "Helvetica Neue", Helvetica, Tahoma, sans-serif;
+}
+body.class, body.module, body.file {
+    margin-left: 40px;
+}
+body.file-popup {
+	font-size: 90%;
+	margin-left: 0;
+}
+
+h1 {
+	font-size: 300%;
+	text-shadow: rgba(135,145,135,0.65) 2px 2px 3px;
+	color: #6C8C22;
+}
+h2,h3,h4 { margin-top: 1.5em; }
+
+:link,
+:visited {
+	color: #6C8C22;
+	text-decoration: none;
+}
+:link:hover,
+:visited:hover {
+ 	border-bottom: 1px dotted #6C8C22;
+}
+
+pre {
+	background: #ddd;
+	padding: 0.5em 0;
+}
+
+
+/* @group Generic Classes */
+
+.initially-hidden {
+	display: none;
+}
+
+.quicksearch-field {
+	width: 98%;
+	background: #ddd;
+	border: 1px solid #aaa;
+	height: 1.5em;
+	-webkit-border-radius: 4px;
+}
+.quicksearch-field:focus {
+	background: #f1edba;
+}
+
+.missing-docs {
+	font-size: 120%;
+	background: white url(images/wrench_orange.png) no-repeat 4px center;
+	color: #ccc;
+	line-height: 2em;
+	border: 1px solid #d00;
+	opacity: 1;
+	padding-left: 20px;
+	text-indent: 24px;
+	letter-spacing: 3px;
+	font-weight: bold;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+
+.target-section {
+	border: 2px solid #dcce90;
+	border-left-width: 8px;
+	padding: 0 1em;
+	background: #fff3c2;
+}
+
+/* @end */
+
+
+/* @group Index Page, Standalone file pages */
+body.indexpage {
+	margin: 1em 3em;
+}
+body.indexpage p,
+body.indexpage div,
+body.file p {
+	margin: 1em 0;
+}
+
+.indexpage ul,
+.file #documentation ul {
+	line-height: 160%;
+	list-style: none;
+}
+.indexpage ul :link,
+.indexpage ul :visited {
+	font-size: 16px;
+}
+
+.indexpage li,
+.file #documentation li {
+	padding-left: 20px;
+	background: url(images/bullet_black.png) no-repeat left 4px;
+}
+.indexpage li.module {
+	background: url(images/package.png) no-repeat left 4px;
+}
+.indexpage li.class {
+	background: url(images/ruby.png) no-repeat left 4px;
+}
+.indexpage li.file {
+	background: url(images/page_white_text.png) no-repeat left 4px;
+}
+.file li p,
+.indexpage li p {
+  margin: 0 0;
+}
+
+/* @end */
+
+/* @group Top-Level Structure */
+
+.class #metadata,
+.file #metadata,
+.module #metadata {
+	float: left;
+	width: 260px;
+}
+
+.class #documentation,
+.file #documentation,
+.module #documentation {
+	margin: 2em 1em 5em 300px;
+	min-width: 340px;
+}
+
+.file #metadata {
+	margin: 0.8em;
+}
+
+#validator-badges {
+	clear: both;
+	margin: 1em 1em 2em;
+}
+
+/* @end */
+
+/* @group Metadata Section */
+#metadata .section {
+	background-color: #dedede;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border: 1px solid #aaa;
+	margin: 0 8px 16px;
+	font-size: 90%;
+	overflow: hidden;
+}
+#metadata h3.section-header {
+	margin: 0;
+	padding: 2px 8px;
+	background: #ccc;
+	color: #666;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-topright: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-bottom: 1px solid #aaa;
+}
+#metadata #home-section h3.section-header {
+  border-bottom: 0;
+}
+
+#metadata ul,
+#metadata dl,
+#metadata p {
+	padding:  8px;
+	list-style: none;
+}
+
+#file-metadata ul {
+	padding-left: 28px;
+	list-style-image: url(images/page_green.png);
+}
+
+dl.svninfo {
+	color: #666;
+	margin: 0;
+}
+dl.svninfo dt {
+	font-weight: bold;
+}
+
+ul.link-list li {
+	white-space: nowrap;
+}
+ul.link-list .type {
+	font-size: 8px;
+	text-transform: uppercase;
+	color: white;
+	background: #969696;
+	padding: 2px 4px;
+	-webkit-border-radius: 5px;
+}
+
+/* @end */
+
+
+/* @group Project Metadata Section */
+#project-metadata {
+	margin-top: 3em;
+}
+
+.file #project-metadata {
+  margin-top: 0em;
+}
+
+#project-metadata .section {
+	border: 1px solid #aaa;
+}
+#project-metadata h3.section-header {
+	border-bottom: 1px solid #aaa;
+	position: relative;
+}
+#project-metadata h3.section-header .search-toggle {
+	position: absolute;
+	right: 5px;
+}
+
+
+#project-metadata form {
+	color: #777;
+	background: #ccc;
+	padding: 8px 8px 16px;
+	border-bottom: 1px solid #bbb;
+}
+#project-metadata fieldset {
+	border: 0;
+}
+
+#no-class-search-results {
+	margin: 0 auto 1em;
+	text-align: center;
+	font-size: 14px;
+	font-weight: bold;
+	color: #aaa;
+}
+
+/* @end */
+
+
+/* @group Documentation Section */
+#description {
+	font-size: 100%;
+	color: #333;
+}
+
+#description p {
+	margin: 1em 0.4em;
+}
+
+#description li p {
+  margin: 0;
+}
+
+#description ul {
+	margin-left: 1.5em;
+}
+#description ul li {
+	line-height: 1.4em;
+}
+
+#description dl,
+#documentation dl {
+	margin: 8px 1.5em;
+	border: 1px solid #ccc;
+}
+#description dl {
+	font-size: 14px;
+}
+
+#description dt,
+#documentation dt {
+	padding: 2px 4px;
+	font-weight: bold;
+	background: #ddd;
+}
+#description dd,
+#documentation dd  {
+	padding: 2px 12px;
+}
+#description dd + dt,
+#documentation dd + dt {
+	margin-top: 0.7em;
+}
+
+#documentation .section {
+	font-size: 90%;
+}
+#documentation h3.section-header {
+	margin-top: 2em;
+	padding: 0.75em 0.5em;
+	background-color: #dedede;
+	color: #333;
+	font-size: 150%;
+	border: 1px solid #bbb;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+#constants-list > dl,
+#attributes-list > dl {
+	margin: 1em 0 2em;
+	border: 0;
+}
+#constants-list > dl dt,
+#attributes-list > dl dt {
+	padding-left: 0;
+	font-weight: bold;
+	font-family: Monaco, "Andale Mono";
+	background: inherit;
+}
+#constants-list > dl dt a,
+#attributes-list > dl dt a {
+	color: inherit;
+}
+#constants-list > dl dd,
+#attributes-list > dl dd {
+	margin: 0 0 1em 0;
+	padding: 0;
+	color: #666;
+}
+
+/* @group Method Details */
+
+#documentation .method-source-code {
+	display: none;
+}
+
+#documentation .method-detail {
+	margin: 0.5em 0;
+	padding: 0.5em 0;
+	cursor: pointer;
+}
+#documentation .method-detail:hover {
+	background-color: #f1edba;
+}
+#documentation .method-heading {
+	position: relative;
+	padding: 2px 4px 0 20px;
+	font-size: 125%;
+	font-weight: bold;
+	color: #333;
+	background: url(images/brick.png) no-repeat left bottom;
+}
+#documentation .method-heading :link,
+#documentation .method-heading :visited {
+	color: inherit;
+}
+#documentation .method-click-advice {
+	position: absolute;
+	top: 2px;
+	right: 5px;
+	font-size: 10px;
+	color: #9b9877;
+	visibility: hidden;
+	padding-right: 20px;
+	line-height: 20px;
+	background: url(images/zoom.png) no-repeat right top;
+}
+#documentation .method-detail:hover .method-click-advice {
+	visibility: visible;
+}
+
+#documentation .method-alias .method-heading {
+	color: #666;
+	background: url(images/brick_link.png) no-repeat left bottom;
+}
+
+#documentation .method-description,
+#documentation .aliases {
+	margin: 0 20px;
+	line-height: 1.2em;
+	color: #666;
+}
+#documentation .aliases {
+	padding-top: 4px;
+	font-style: italic;
+	cursor: default;
+}
+#documentation .method-description p {
+	padding: 0;
+}
+#documentation .method-description p + p {
+	margin-bottom: 0.5em;
+}
+#documentation .method-description ul {
+  margin-left: 1.5em;
+}
+
+#documentation .attribute-method-heading {
+	background: url(images/tag_green.png) no-repeat left bottom;
+}
+#documentation #attribute-method-details .method-detail:hover {
+	background-color: transparent;
+	cursor: default;
+}
+#documentation .attribute-access-type {
+	font-size: 60%;
+	text-transform: uppercase;
+	vertical-align: super;
+	padding: 0 2px;
+}
+/* @end */
+
+/* @end */
+
+
+
+/* @group Source Code */
+
+div.method-source-code {
+    background: #262626;
+    color: #efefef;
+    margin: 1em;
+    padding: 0.5em;
+    border: 1px dashed #999;
+    overflow: hidden;
+}
+
+div.method-source-code pre {
+	background: inherit;
+	padding: 0;
+	color: white;
+	overflow: auto;
+}
+
+/* @group Ruby keyword styles */
+
+.ruby-constant   { color: #7fffd4; background: transparent; }
+.ruby-keyword    { color: #00ffff; background: transparent; }
+.ruby-ivar       { color: #eedd82; background: transparent; }
+.ruby-operator   { color: #00ffee; background: transparent; }
+.ruby-identifier { color: #ffdead; background: transparent; }
+.ruby-node       { color: #ffa07a; background: transparent; }
+.ruby-comment    { color: #b22222; font-weight: bold; background: transparent; }
+.ruby-regexp     { color: #ffa07a; background: transparent; }
+.ruby-value      { color: #7fffd4; background: transparent; }
+
+/* @end */
+/* @end */
+
+
+/* @group File Popup Contents */
+
+.file #metadata,
+.file-popup #metadata {
+}
+
+.file-popup dl {
+	font-size: 80%;
+	padding: 0.75em;
+	background-color: #dedede;
+	color: #333;
+	border: 1px solid #bbb;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+.file dt {
+	font-weight: bold;
+	padding-left: 22px;
+	line-height: 20px;
+	background: url(images/page_white_width.png) no-repeat left top;
+}
+.file dt.modified-date {
+	background: url(images/date.png) no-repeat left top;
+}
+.file dt.requires {
+	background: url(images/plugin.png) no-repeat left top;
+}
+.file dt.scs-url {
+	background: url(images/wrench.png) no-repeat left top;
+}
+
+.file dl dd {
+	margin: 0 0 1em 0;
+}
+.file #metadata dl dd ul {
+	list-style: circle;
+	margin-left: 20px;
+	padding-top: 0;
+}
+.file #metadata dl dd ul li {
+}
+
+
+.file h2 {
+	margin-top: 2em;
+	padding: 0.75em 0.5em;
+	background-color: #dedede;
+	color: #333;
+	font-size: 120%;
+	border: 1px solid #bbb;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+/* @end */
+
+
+
+
+/* @group ThickBox Styles */
+#TB_window {
+	font: 12px Arial, Helvetica, sans-serif;
+	color: #333333;
+}
+
+#TB_secondLine {
+	font: 10px Arial, Helvetica, sans-serif;
+	color:#666666;
+}
+
+#TB_window :link,
+#TB_window :visited        { color: #666666; }
+#TB_window :link:hover,
+#TB_window :visited:hover  { color: #000;    }
+#TB_window :link:active,
+#TB_window :visited:active { color: #666666; }
+#TB_window :link:focus,
+#TB_window :visited:focus  { color: #666666; }
+
+#TB_overlay {
+	position: fixed;
+	z-index:100;
+	top: 0px;
+	left: 0px;
+	height:100%;
+	width:100%;
+}
+
+.TB_overlayMacFFBGHack {background: url(images/macFFBgHack.png) repeat;}
+.TB_overlayBG {
+	background-color:#000;
+	filter:alpha(opacity=75);
+	-moz-opacity: 0.75;
+	opacity: 0.75;
+}
+
+* html #TB_overlay { /* ie6 hack */
+     position: absolute;
+     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+#TB_window {
+	position: fixed;
+	background: #ffffff;
+	z-index: 102;
+	color:#000000;
+	display:none;
+	border: 4px solid #525252;
+	text-align:left;
+	top:50%;
+	left:50%;
+}
+
+* html #TB_window { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+}
+
+#TB_window img#TB_Image {
+	display:block;
+	margin: 15px 0 0 15px;
+	border-right: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	border-top: 1px solid #666;
+	border-left: 1px solid #666;
+}
+
+#TB_caption{
+	height:25px;
+	padding:7px 30px 10px 25px;
+	float:left;
+}
+
+#TB_closeWindow{
+	height:25px;
+	padding:11px 25px 10px 0;
+	float:right;
+}
+
+#TB_closeAjaxWindow{
+	padding:7px 10px 5px 0;
+	margin-bottom:1px;
+	text-align:right;
+	float:right;
+}
+
+#TB_ajaxWindowTitle{
+	float:left;
+	padding:7px 0 5px 10px;
+	margin-bottom:1px;
+	font-size: 22px;
+}
+
+#TB_title{
+	background-color: #6C8C22;
+	color: #dedede;
+	height:40px;
+}
+#TB_title :link,
+#TB_title :visited {
+	color: white !important;
+	border-bottom: 1px dotted #dedede;
+}
+
+#TB_ajaxContent{
+	clear:both;
+	padding:2px 15px 15px 15px;
+	overflow:auto;
+	text-align:left;
+	line-height:1.4em;
+}
+
+#TB_ajaxContent.TB_modal{
+	padding:15px;
+}
+
+#TB_ajaxContent p{
+	padding:5px 0px 5px 0px;
+}
+
+#TB_load{
+	position: fixed;
+	display:none;
+	height:13px;
+	width:208px;
+	z-index:103;
+	top: 50%;
+	left: 50%;
+	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
+}
+
+* html #TB_load { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+}
+
+#TB_HideSelect{
+	z-index:99;
+	position:fixed;
+	top: 0;
+	left: 0;
+	background-color:#fff;
+	border:none;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+	height:100%;
+	width:100%;
+}
+
+* html #TB_HideSelect { /* ie6 hack */
+     position: absolute;
+     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+#TB_iframeContent{
+	clear:both;
+	border:none;
+	margin-bottom:-1px;
+	margin-top:1px;
+	_margin-bottom:1px;
+}
+
+/* @end */
+
+/* @group Debugging Section */
+
+#debugging-toggle {
+	text-align: center;
+}
+#debugging-toggle img {
+	cursor: pointer;
+}
+
+#rdoc-debugging-section-dump {
+	display: none;
+	margin: 0 2em 2em;
+	background: #ccc;
+	border: 1px solid #999;
+}
+
+
+
+/* @end */
diff --git a/lib/rdoc/generators/chm_generator.rb b/lib/rdoc/generators/chm_generator.rb
deleted file mode 100644
index 51eeda8dd1..0000000000
--- a/lib/rdoc/generators/chm_generator.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'rdoc/generators/html_generator'
-
-module Generators
-
-  class CHMGenerator < HTMLGenerator
-
-    HHC_PATH = "c:/Program Files/HTML Help Workshop/hhc.exe"
-
-    # Standard generator factory
-    def CHMGenerator.for(options)
-      CHMGenerator.new(options)
-    end
-
-    
-    def initialize(*args)
-      super
-      @op_name = @options.op_name || "rdoc"
-      check_for_html_help_workshop
-    end
-
-    def check_for_html_help_workshop
-      stat = File.stat(HHC_PATH)
-    rescue
-      $stderr <<
-	"\n.chm output generation requires that Microsoft's Html Help\n" <<
-	"Workshop is installed. RDoc looks for it in:\n\n    " <<
-	HHC_PATH <<
-	"\n\nYou can download a copy for free from:\n\n" <<
-	"    http://msdn.microsoft.com/library/default.asp?" <<
-	"url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp\n\n"
-      
-      exit 99
-    end
-
-    # Generate the html as normal, then wrap it
-    # in a help project
-    def generate(info)
-      super
-      @project_name = @op_name + ".hhp"
-      create_help_project
-    end
-
-    # The project contains the project file, a table of contents
-    # and an index
-    def create_help_project
-      create_project_file
-      create_contents_and_index
-      compile_project
-    end
-
-    # The project file links together all the various
-    # files that go to make up the help.
-
-    def create_project_file
-      template = TemplatePage.new(RDoc::Page::HPP_FILE)
-      values = { "title" => @options.title, "opname" => @op_name }
-      files = []
-      @files.each do |f|
-	files << { "html_file_name" => f.path }
-      end
-
-      values['all_html_files'] = files
-      
-      File.open(@project_name, "w") do |f|
-        template.write_html_on(f, values)
-      end
-    end
-
-    # The contents is a list of all files and modules.
-    # For each we include  as sub-entries the list
-    # of methods they contain. As we build the contents
-    # we also build an index file
-
-    def create_contents_and_index
-      contents = []
-      index    = []
-
-      (@files+@classes).sort.each do |entry|
-	content_entry = { "c_name" => entry.name, "ref" => entry.path }
-	index << { "name" => entry.name, "aref" => entry.path }
-
-	internals = []
-
-	methods = entry.build_method_summary_list(entry.path)
-
-	content_entry["methods"] = methods unless methods.empty?
-        contents << content_entry
-	index.concat methods
-      end
-
-      values = { "contents" => contents }
-      template = TemplatePage.new(RDoc::Page::CONTENTS)
-      File.open("contents.hhc", "w") do |f|
-	template.write_html_on(f, values)
-      end
-
-      values = { "index" => index }
-      template = TemplatePage.new(RDoc::Page::CHM_INDEX)
-      File.open("index.hhk", "w") do |f|
-	template.write_html_on(f, values)
-      end      
-    end
-
-    # Invoke the windows help compiler to compiler the project
-    def compile_project
-      system(HHC_PATH, @project_name)
-    end
-
-  end
-
-
-end
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
deleted file mode 100644
index 1f9b808e8d..0000000000
--- a/lib/rdoc/generators/html_generator.rb
+++ /dev/null
@@ -1,1509 +0,0 @@
-# We're responsible for generating all the HTML files
-# from the object tree defined in code_objects.rb. We
-# generate:
-#
-# [files]   an html file for each input file given. These
-#           input files appear as objects of class
-#           TopLevel
-#
-# [classes] an html file for each class or module encountered.
-#           These classes are not grouped by file: if a file
-#           contains four classes, we'll generate an html
-#           file for the file itself, and four html files 
-#           for the individual classes. 
-#
-# [indices] we generate three indices for files, classes,
-#           and methods. These are displayed in a browser
-#           like window with three index panes across the
-#           top and the selected description below
-#
-# Method descriptions appear in whatever entity (file, class,
-# or module) that contains them.
-#
-# We generate files in a structure below a specified subdirectory,
-# normally +doc+.
-#
-#  opdir
-#     |
-#     |___ files
-#     |       |__  per file summaries
-#     |
-#     |___ classes
-#             |__ per class/module descriptions
-#
-# HTML is generated using the Template class.
-#
-
-require 'ftools'
-
-require 'rdoc/options'
-require 'rdoc/template'
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_html'
-require 'cgi'
-
-module Generators
-
-  # Name of sub-direcories that hold file and class/module descriptions
-
-  FILE_DIR  = "files"
-  CLASS_DIR = "classes"
-  CSS_NAME  = "rdoc-style.css"
-  
-
-  ##
-  # Build a hash of all items that can be cross-referenced.
-  # This is used when we output required and included names: 
-  # if the names appear in this hash, we can generate
-  # an html cross reference to the appropriate description.
-  # We also use this when parsing comment blocks: any decorated 
-  # words matching an entry in this list are hyperlinked.
-
-  class AllReferences
-    @@refs = {}
-    
-    def AllReferences::reset
-      @@refs = {}
-    end
-
-    def AllReferences.add(name, html_class)
-      @@refs[name] = html_class
-    end
-
-    def AllReferences.[](name)
-      @@refs[name]
-    end
-
-    def AllReferences.keys
-      @@refs.keys
-    end
-  end
-
-
-  ##
-  # Subclass of the SM::ToHtml class that supports looking
-  # up words in the AllReferences list. Those that are
-  # found (like AllReferences in this comment) will
-  # be hyperlinked
-
-  class HyperlinkHtml < SM::ToHtml
-    # We need to record the html path of our caller so we can generate
-    # correct relative paths for any hyperlinks that we find
-    def initialize(from_path, context)
-      super()
-      @from_path = from_path
-
-      @parent_name = context.parent_name
-      @parent_name += "::" if @parent_name
-      @context = context
-    end
-
-    # We're invoked when any text matches the CROSSREF pattern
-    # (defined in MarkUp). If we fine the corresponding reference,
-    # generate a hyperlink. If the name we're looking for contains
-    # no punctuation, we look for it up the module/class chain. For
-    # example, HyperlinkHtml is found, even without the Generators::
-    # prefix, because we look for it in module Generators first.
-
-    def handle_special_CROSSREF(special)
-      name = special.text
-      if name[0,1] == '#'
-        lookup = name[1..-1]
-        name = lookup unless Options.instance.show_hash
-      else
-        lookup = name
-      end
-
-      # Find class, module, or method in class or module.
-      if /([A-Z]\w*)[.\#](\w+[!?=]?)/ =~ lookup
-        container = $1
-        method = $2
-        ref = @context.find_symbol(container, method)
-      elsif /([A-Za-z]\w*)[.\#](\w+(\([\.\w+\*\/\+\-\=\<\>]+\))?)/ =~ lookup
-        container = $1
-        method = $2
-        ref = @context.find_symbol(container, method)
-      else
-        ref = @context.find_symbol(lookup)
-      end
-
-      if ref and ref.document_self
-        "<a href=\"#{ref.as_href(@from_path)}\">#{name}</a>"
-      else
-        name
-      end
-    end
-
-
-    # Generate a hyperlink for url, labeled with text. Handle the
-    # special cases for img: and link: described under handle_special_HYPEDLINK
-    def gen_url(url, text)
-      if url =~ /([A-Za-z]+):(.*)/
-        type = $1
-        path = $2
-      else
-        type = "http"
-        path = url
-        url  = "http://#{url}"
-      end
-
-      if type == "link"
-        if path[0,1] == '#'     # is this meaningful?
-          url = path
-        else
-          url = HTMLGenerator.gen_url(@from_path, path)
-        end
-      end
-
-      if (type == "http" || type == "link") && 
-          url =~ /\.(gif|png|jpg|jpeg|bmp)$/
-
-        "<img src=\"#{url}\" />"
-      else
-        "<a href=\"#{url}\">#{text.sub(%r{^#{type}:/*}, '')}</a>"
-      end
-    end
-
-    # And we're invoked with a potential external hyperlink mailto:
-    # just gets inserted. http: links are checked to see if they
-    # reference an image. If so, that image gets inserted using an
-    # <img> tag. Otherwise a conventional <a href> is used.  We also
-    # support a special type of hyperlink, link:, which is a reference
-    # to a local file whose path is relative to the --op directory.
-
-    def handle_special_HYPERLINK(special)
-      url = special.text
-      gen_url(url, url)
-    end
-
-    # HEre's a hypedlink where the label is different to the URL
-    #  <label>[url]
-    #
-    
-    def handle_special_TIDYLINK(special)
-      text = special.text
-#      unless text =~ /(\S+)\[(.*?)\]/
-      unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/ 
-        return text
-      end
-      label = $1
-      url   = $2
-      gen_url(url, label)
-    end
-
-  end
-
-
-  
-  #####################################################################
-  #
-  # Handle common markup tasks for the various Html classes
-  #
-
-  module MarkUp
-
-    # Convert a string in markup format into HTML. We keep a cached
-    # SimpleMarkup object lying around after the first time we're
-    # called per object.
-
-    def markup(str, remove_para=false)
-      return '' unless str
-      unless defined? @markup
-        @markup = SM::SimpleMarkup.new
-
-        # class names, variable names, or instance variables
-        @markup.add_special(/(
-                               \w+(::\w+)*[.\#]\w+(\([\.\w+\*\/\+\-\=\<\>]+\))?  # A::B.meth(**) (for operator in Fortran95)
-                             | \#\w+(\([.\w\*\/\+\-\=\<\>]+\))?  #  meth(**) (for operator in Fortran95)
-                             | \b([A-Z]\w*(::\w+)*[.\#]\w+)  #    A::B.meth
-                             | \b([A-Z]\w+(::\w+)*)       #    A::B..
-                             | \#\w+[!?=]?                #    #meth_name 
-                             | \b\w+([_\/\.]+\w+)*[!?=]?  #    meth_name
-                             )/x, 
-                            :CROSSREF)
-
-        # external hyperlinks
-        @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
-
-        # and links of the form  <text>[<url>]
-        @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
-#        @markup.add_special(/\b(\S+?\[\S+?\.\S+?\])/, :TIDYLINK)
-
-      end
-      unless defined? @html_formatter
-        @html_formatter = HyperlinkHtml.new(self.path, self)
-      end
-
-      # Convert leading comment markers to spaces, but only
-      # if all non-blank lines have them
-
-      if str =~ /^(?>\s*)[^\#]/
-        content = str
-      else
-        content = str.gsub(/^\s*(#+)/)  { $1.tr('#',' ') }
-      end
-
-      res = @markup.convert(content, @html_formatter)
-      if remove_para
-        res.sub!(/^<p>/, '')
-        res.sub!(/<\/p>$/, '')
-      end
-      res
-    end
-
-    # Qualify a stylesheet URL; if if +css_name+ does not begin with '/' or
-    # 'http[s]://', prepend a prefix relative to +path+. Otherwise, return it
-    # unmodified.
-
-    def style_url(path, css_name=nil)
-#      $stderr.puts "style_url( #{path.inspect}, #{css_name.inspect} )"
-      css_name ||= CSS_NAME
-      if %r{^(https?:/)?/} =~ css_name
-        return css_name
-      else
-        return HTMLGenerator.gen_url(path, css_name)
-      end
-    end
-
-    # Build a webcvs URL with the given 'url' argument. URLs with a '%s' in them
-    # get the file's path sprintfed into them; otherwise they're just catenated
-    # together.
-
-    def cvs_url(url, full_path)
-      if /%s/ =~ url
-        return sprintf( url, full_path )
-      else
-        return url + full_path
-      end
-    end
-  end
-
-
-  #####################################################################
-  #
-  # A Context is built by the parser to represent a container: contexts
-  # hold classes, modules, methods, require lists and include lists.
-  # ClassModule and TopLevel are the context objects we process here
-  # 
-  class ContextUser
-
-    include MarkUp
-
-    attr_reader :context
-    
-    def initialize(context, options)
-      @context = context
-      @options = options
-    end
-      
-    # convenience method to build a hyperlink
-    def href(link, cls, name)
-      %{<a href="#{link}" class="#{cls}">#{name}</a>} #"
-    end
-
-    # return a reference to outselves to be used as an href=
-    # the form depends on whether we're all in one file
-    # or in multiple files
-
-    def as_href(from_path)
-      if @options.all_one_file
-        "#" + path
-      else
-        HTMLGenerator.gen_url(from_path, path)
-      end
-    end
-
-    # Create a list of HtmlMethod objects for each method
-    # in the corresponding context object. If the @options.show_all
-    # variable is set (corresponding to the <tt>--all</tt> option,
-    # we include all methods, otherwise just the public ones.
-
-    def collect_methods
-      list = @context.method_list
-      unless @options.show_all
-        list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
-      end
-      @methods = list.collect {|m| HtmlMethod.new(m, self, @options) }
-    end
-
-    # Build a summary list of all the methods in this context
-    def build_method_summary_list(path_prefix="")
-      collect_methods unless @methods
-      meths = @methods.sort
-      res = []
-      meths.each do |meth|
-	res << {
-          "name" => CGI.escapeHTML(meth.name),
-          "aref" => "#{path_prefix}\##{meth.aref}" 
-        }
-      end
-      res
-    end
-
-
-    # Build a list of aliases for which we couldn't find a
-    # corresponding method
-    def build_alias_summary_list(section)
-      values = []
-      @context.aliases.each do |al|
-        next unless al.section == section
-        res = {
-          'old_name' => al.old_name,
-          'new_name' => al.new_name,
-        }
-        if al.comment && !al.comment.empty?
-          res['desc'] = markup(al.comment, true)
-        end
-        values << res
-      end
-      values
-    end
-    
-    # Build a list of constants
-    def build_constants_summary_list(section)
-      values = []
-      @context.constants.each do |co|
-        next unless co.section == section
-        res = {
-          'name'  => co.name,
-          'value' => CGI.escapeHTML(co.value)
-        }
-        res['desc'] = markup(co.comment, true) if co.comment && !co.comment.empty?
-        values << res
-      end
-      values
-    end
-    
-    def build_requires_list(context)
-      potentially_referenced_list(context.requires) {|fn| [fn + ".rb"] }
-    end
-
-    def build_include_list(context)
-      potentially_referenced_list(context.includes)
-    end
-
-    # Build a list from an array of <i>Htmlxxx</i> items. Look up each
-    # in the AllReferences hash: if we find a corresponding entry,
-    # we generate a hyperlink to it, otherwise just output the name.
-    # However, some names potentially need massaging. For example,
-    # you may require a Ruby file without the .rb extension,
-    # but the file names we know about may have it. To deal with
-    # this, we pass in a block which performs the massaging,
-    # returning an array of alternative names to match
-
-    def potentially_referenced_list(array)
-      res = []
-      array.each do |i|
-        ref = AllReferences[i.name] 
-#         if !ref
-#           container = @context.parent
-#           while !ref && container
-#             name = container.name + "::" + i.name
-#             ref = AllReferences[name] 
-#             container = container.parent
-#           end
-#         end
-
-        ref = @context.find_symbol(i.name)
-        ref = ref.viewer if ref
-
-        if !ref && block_given?
-          possibles = yield(i.name)
-          while !ref and !possibles.empty?
-            ref = AllReferences[possibles.shift]
-          end
-        end
-        h_name = CGI.escapeHTML(i.name)
-        if ref and ref.document_self
-          path = url(ref.path)
-          res << { "name" => h_name, "aref" => path }
-        else
-          res << { "name" => h_name }
-        end
-      end
-      res
-    end
-
-    # Build an array of arrays of method details. The outer array has up
-    # to six entries, public, private, and protected for both class
-    # methods, the other for instance methods. The inner arrays contain
-    # a hash for each method
-
-    def build_method_detail_list(section)
-      outer = []
-
-      methods = @methods.sort
-      for singleton in [true, false]
-        for vis in [ :public, :protected, :private ] 
-          res = []
-          methods.each do |m|
-            if m.section == section and
-                m.document_self and 
-                m.visibility == vis and 
-                m.singleton == singleton
-              row = {}
-              if m.call_seq
-                row["callseq"] = m.call_seq.gsub(/->/, '&rarr;')
-              else
-                row["name"]        = CGI.escapeHTML(m.name)
-                row["params"]      = m.params
-              end
-              desc = m.description.strip
-              row["m_desc"]      = desc unless desc.empty?
-              row["aref"]        = m.aref
-              row["visibility"]  = m.visibility.to_s
-
-              alias_names = []
-              m.aliases.each do |other|
-                if other.viewer   # won't be if the alias is private
-                  alias_names << {
-                    'name' => other.name,
-                    'aref'  => other.viewer.as_href(path)
-                  } 
-                end
-              end
-              unless alias_names.empty?
-                row["aka"] = alias_names
-              end
-
-              if @options.inline_source
-                code = m.source_code
-                row["sourcecode"] = code if code
-              else
-                code = m.src_url
-                if code
-                  row["codeurl"] = code
-                  row["imgurl"]  = m.img_url
-                end
-              end
-              res << row
-            end
-          end
-          if res.size > 0 
-            outer << {
-              "type"    => vis.to_s.capitalize,
-              "category"    => singleton ? "Class" : "Instance",
-              "methods" => res
-            }
-          end
-        end
-      end
-      outer
-    end
-
-    # Build the structured list of classes and modules contained
-    # in this context. 
-
-    def build_class_list(level, from, section, infile=nil)
-      res = ""
-      prefix = "&nbsp;&nbsp;::" * level;
-
-      from.modules.sort.each do |mod|
-        next unless mod.section == section
-        next if infile && !mod.defined_in?(infile)
-        if mod.document_self
-          res << 
-            prefix <<
-            "Module " <<
-            href(url(mod.viewer.path), "link", mod.full_name) <<
-            "<br />\n" <<
-            build_class_list(level + 1, mod, section, infile)
-        end
-      end
-
-      from.classes.sort.each do |cls|
-        next unless cls.section == section
-        next if infile && !cls.defined_in?(infile)
-        if cls.document_self
-          res      <<
-            prefix << 
-            "Class " <<
-            href(url(cls.viewer.path), "link", cls.full_name) <<
-            "<br />\n" <<
-            build_class_list(level + 1, cls, section, infile)
-        end
-      end
-
-      res
-    end
-    
-    def url(target)
-      HTMLGenerator.gen_url(path, target)
-    end
-
-    def aref_to(target)
-      if @options.all_one_file
-        "#" + target
-      else
-        url(target)
-      end
-    end
-
-    def document_self
-      @context.document_self
-    end
-
-    def diagram_reference(diagram)
-      res = diagram.gsub(/((?:src|href)=")(.*?)"/) {
-        $1 + url($2) + '"'
-      }
-      res
-    end
-
-
-    # Find a symbol in ourselves or our parent
-    def find_symbol(symbol, method=nil)
-      res = @context.find_symbol(symbol, method)
-      if res
-        res = res.viewer
-      end
-      res
-    end
-
-    # create table of contents if we contain sections
-      
-    def add_table_of_sections
-      toc = []
-      @context.sections.each do |section|
-        if section.title
-          toc << {
-            'secname' => section.title,
-            'href'    => section.sequence
-          }
-        end
-      end
-      
-      @values['toc'] = toc unless toc.empty?
-    end
-
-
-  end
-
-  #####################################################################
-  #
-  # Wrap a ClassModule context
-
-  class HtmlClass < ContextUser
-
-    attr_reader :path
-
-    def initialize(context, html_file, prefix, options)
-      super(context, options)
-
-      @html_file = html_file
-      @is_module = context.is_module?
-      @values    = {}
-
-      context.viewer = self
-
-      if options.all_one_file
-        @path = context.full_name
-      else
-        @path = http_url(context.full_name, prefix)
-      end
-
-      collect_methods
-
-      AllReferences.add(name, self)
-    end
-
-    # return the relative file name to store this class in,
-    # which is also its url
-    def http_url(full_name, prefix)
-      path = full_name.dup
-      if path['<<']
-        path.gsub!(/<<\s*(\w*)/) { "from-#$1" }
-      end
-      File.join(prefix, path.split("::")) + ".html"
-    end
-
-
-    def name
-      @context.full_name
-    end
-
-    def parent_name
-      @context.parent.full_name
-    end
-
-    def index_name
-      name
-    end
-
-    def write_on(f)
-      value_hash
-      template = TemplatePage.new(RDoc::Page::BODY,
-                                      RDoc::Page::CLASS_PAGE,
-                                      RDoc::Page::METHOD_LIST)
-      template.write_html_on(f, @values)
-    end
-
-    def value_hash
-      class_attribute_values
-      add_table_of_sections
-
-      @values["charset"] = @options.charset
-      @values["style_url"] = style_url(path, @options.css)
-
-      d = markup(@context.comment)
-      @values["description"] = d unless d.empty?
-
-      ml = build_method_summary_list
-      @values["methods"] = ml unless ml.empty?
-
-      il = build_include_list(@context)
-      @values["includes"] = il unless il.empty?
-
-      @values["sections"] = @context.sections.map do |section|
-
-        secdata = {
-          "sectitle" => section.title,
-          "secsequence" => section.sequence,
-          "seccomment" => markup(section.comment)
-        }
-
-        al = build_alias_summary_list(section)
-        secdata["aliases"] = al unless al.empty?
-        
-        co = build_constants_summary_list(section)
-        secdata["constants"] = co unless co.empty?
-        
-        al = build_attribute_list(section)
-        secdata["attributes"] = al unless al.empty?
-        
-        cl = build_class_list(0, @context, section)
-        secdata["classlist"] = cl unless cl.empty?
-        
-        mdl = build_method_detail_list(section)
-        secdata["method_list"] = mdl unless mdl.empty?
-
-        secdata
-      end
-
-      @values
-    end
-
-    def build_attribute_list(section)
-      atts = @context.attributes.sort
-      res = []
-      atts.each do |att|
-        next unless att.section == section
-        if att.visibility == :public || att.visibility == :protected || @options.show_all
-          entry = {
-            "name"   => CGI.escapeHTML(att.name), 
-            "rw"     => att.rw, 
-            "a_desc" => markup(att.comment, true)
-          }
-          unless att.visibility == :public || att.visibility == :protected
-            entry["rw"] << "-"
-          end
-          res << entry
-        end
-      end
-      res
-    end
-
-    def class_attribute_values
-      h_name = CGI.escapeHTML(name)
-
-      @values["classmod"]  = @is_module ? "Module" : "Class"
-      @values["title"]     = "#{@values['classmod']}: #{h_name}"
-
-      c = @context
-      c = c.parent while c and !c.diagram
-      if c && c.diagram
-        @values["diagram"] = diagram_reference(c.diagram)
-      end
-
-      @values["full_name"] = h_name
-
-      parent_class = @context.superclass
-
-      if parent_class
-	@values["parent"] = CGI.escapeHTML(parent_class)
-
-	if parent_name
-	  lookup = parent_name + "::" + parent_class
-	else
-	  lookup = parent_class
-	end
-
-	parent_url = AllReferences[lookup] || AllReferences[parent_class]
-
-	if parent_url and parent_url.document_self
-	  @values["par_url"] = aref_to(parent_url.path)
-	end
-      end
-
-      files = []
-      @context.in_files.each do |f|
-        res = {}
-        full_path = CGI.escapeHTML(f.file_absolute_name)
-
-        res["full_path"]     = full_path
-        res["full_path_url"] = aref_to(f.viewer.path) if f.document_self
-
-        if @options.webcvs
-          res["cvsurl"] = cvs_url( @options.webcvs, full_path )
-        end
-
-        files << res
-      end
-
-      @values['infiles'] = files
-    end
-
-    def <=>(other)
-      self.name <=> other.name
-    end
-
-  end
-
-  #####################################################################
-  #
-  # Handles the mapping of a file's information to HTML. In reality,
-  # a file corresponds to a +TopLevel+ object, containing modules,
-  # classes, and top-level methods. In theory it _could_ contain
-  # attributes and aliases, but we ignore these for now.
-
-  class HtmlFile < ContextUser
-
-    attr_reader :path
-    attr_reader :name
-
-    def initialize(context, options, file_dir)
-      super(context, options)
-
-      @values = {}
-
-      if options.all_one_file
-        @path = filename_to_label
-      else
-        @path = http_url(file_dir)
-      end
-
-      @name = @context.file_relative_name
-
-      collect_methods
-      AllReferences.add(name, self)
-      context.viewer = self
-    end
-
-    def http_url(file_dir)
-      File.join(file_dir, @context.file_relative_name.tr('.', '_')) +
-        ".html"
-    end
-
-    def filename_to_label
-      @context.file_relative_name.gsub(/%|\/|\?|\#/) {|s| '%' + ("%x" % s[0]) }
-    end
-
-    def index_name
-      name
-    end
-
-    def parent_name
-      nil
-    end
-
-    def value_hash
-      file_attribute_values
-      add_table_of_sections
-
-      @values["charset"]   = @options.charset
-      @values["href"]      = path
-      @values["style_url"] = style_url(path, @options.css)
-
-      if @context.comment
-        d = markup(@context.comment)
-        @values["description"] = d if d.size > 0
-      end
-
-      ml = build_method_summary_list
-      @values["methods"] = ml unless ml.empty?
-
-      il = build_include_list(@context)
-      @values["includes"] = il unless il.empty?
-
-      rl = build_requires_list(@context)
-      @values["requires"] = rl unless rl.empty?
-
-      if @options.promiscuous
-        file_context = nil
-      else
-        file_context = @context
-      end
-
-
-      @values["sections"] = @context.sections.map do |section|
-
-        secdata = {
-          "sectitle" => section.title,
-          "secsequence" => section.sequence,
-          "seccomment" => markup(section.comment)
-        }
-
-        cl = build_class_list(0, @context, section, file_context)
-        @values["classlist"] = cl unless cl.empty?
-
-        mdl = build_method_detail_list(section)
-        secdata["method_list"] = mdl unless mdl.empty?
-
-        al = build_alias_summary_list(section)
-        secdata["aliases"] = al unless al.empty?
-        
-        co = build_constants_summary_list(section)
-        @values["constants"] = co unless co.empty?
-
-        secdata
-      end
-      
-      @values
-    end
-    
-    def write_on(f)
-      value_hash
-      template = TemplatePage.new(RDoc::Page::BODY,
-                                  RDoc::Page::FILE_PAGE,
-                                  RDoc::Page::METHOD_LIST)
-      template.write_html_on(f, @values)
-    end
-
-    def file_attribute_values
-      full_path = @context.file_absolute_name
-      short_name = File.basename(full_path)
-      
-      @values["title"] = CGI.escapeHTML("File: #{short_name}")
-
-      if @context.diagram
-        @values["diagram"] = diagram_reference(@context.diagram)
-      end
-
-      @values["short_name"]   = CGI.escapeHTML(short_name)
-      @values["full_path"]    = CGI.escapeHTML(full_path)
-      @values["dtm_modified"] = @context.file_stat.mtime.to_s
-
-      if @options.webcvs
-        @values["cvsurl"] = cvs_url( @options.webcvs, @values["full_path"] )
-      end
-    end
-
-    def <=>(other)
-      self.name <=> other.name
-    end
-  end
-
-  #####################################################################
-
-  class HtmlMethod
-    include MarkUp
-
-    attr_reader :context
-    attr_reader :src_url
-    attr_reader :img_url
-    attr_reader :source_code
-
-    @@seq = "M000000"
-
-    @@all_methods = []
-
-    def HtmlMethod::reset
-      @@all_methods = []
-    end
-
-    def initialize(context, html_class, options)
-      @context    = context
-      @html_class = html_class
-      @options    = options
-      @@seq       = @@seq.succ
-      @seq        = @@seq
-      @@all_methods << self
-
-      context.viewer = self
-
-      if (ts = @context.token_stream)
-        @source_code = markup_code(ts)
-        unless @options.inline_source
-          @src_url = create_source_code_file(@source_code)
-          @img_url = HTMLGenerator.gen_url(path, 'source.png')
-        end
-      end
-
-      AllReferences.add(name, self)
-    end
-    
-    # return a reference to outselves to be used as an href=
-    # the form depends on whether we're all in one file
-    # or in multiple files
-
-    def as_href(from_path)
-      if @options.all_one_file
-        "#" + path
-      else
-        HTMLGenerator.gen_url(from_path, path)
-      end
-    end
-
-    def name
-      @context.name
-    end
-
-    def section
-      @context.section
-    end
-
-    def index_name
-      "#{@context.name} (#{@html_class.name})"
-    end
-
-    def parent_name
-      if @context.parent.parent
-        @context.parent.parent.full_name
-      else
-        nil
-      end
-    end
-
-    def aref
-      @seq
-    end
-
-    def path
-      if @options.all_one_file
-	aref
-      else
-	@html_class.path + "#" + aref
-      end
-    end
-
-    def description
-      markup(@context.comment)
-    end
-
-    def visibility
-      @context.visibility
-    end
-
-    def singleton
-      @context.singleton
-    end
-
-    def call_seq
-      cs = @context.call_seq
-      if cs
-        cs.gsub(/\n/, "<br />\n")
-      else
-        nil
-      end
-    end
-
-    def params
-      # params coming from a call-seq in 'C' will start with the
-      # method name
-      p = @context.params
-      if p !~ /^\w/
-        p = @context.params.gsub(/\s*\#.*/, '')
-        p = p.tr("\n", " ").squeeze(" ")
-        p = "(" + p + ")" unless p[0] == ?(
-        
-        if (block = @context.block_params)
-         # If this method has explicit block parameters, remove any
-         # explicit &block
-
-         p.sub!(/,?\s*&\w+/, '')
-
-          block.gsub!(/\s*\#.*/, '')
-          block = block.tr("\n", " ").squeeze(" ")
-          if block[0] == ?(
-            block.sub!(/^\(/, '').sub!(/\)/, '')
-          end
-          p << " {|#{block.strip}| ...}"
-        end
-      end
-      CGI.escapeHTML(p)
-    end
-    
-    def create_source_code_file(code_body)
-      meth_path = @html_class.path.sub(/\.html$/, '.src')
-      File.makedirs(meth_path)
-      file_path = File.join(meth_path, @seq) + ".html"
-
-      template = TemplatePage.new(RDoc::Page::SRC_PAGE)
-      File.open(file_path, "w") do |f|
-        values = {
-          'title'     => CGI.escapeHTML(index_name),
-          'code'      => code_body,
-          'style_url' => style_url(file_path, @options.css),
-          'charset'   => @options.charset
-        }
-        template.write_html_on(f, values)
-      end
-      HTMLGenerator.gen_url(path, file_path)
-    end
-
-    def HtmlMethod.all_methods
-      @@all_methods
-    end
-
-    def <=>(other)
-      @context <=> other.context
-    end
-
-    ##
-    # Given a sequence of source tokens, mark up the source code
-    # to make it look purty.
-
-
-    def markup_code(tokens)
-      src = ""
-      tokens.each do |t|
-        next unless t
-        #    p t.class
-#        style = STYLE_MAP[t.class]
-        style = case t
-                when RubyToken::TkCONSTANT then "ruby-constant"
-                when RubyToken::TkKW       then "ruby-keyword kw"
-                when RubyToken::TkIVAR     then "ruby-ivar"
-                when RubyToken::TkOp       then "ruby-operator"
-                when RubyToken::TkId       then "ruby-identifier"
-                when RubyToken::TkNode     then "ruby-node"
-                when RubyToken::TkCOMMENT  then "ruby-comment cmt"
-                when RubyToken::TkREGEXP   then "ruby-regexp re"
-                when RubyToken::TkSTRING   then "ruby-value str"
-                when RubyToken::TkVal      then "ruby-value"
-                else
-                    nil
-                end
-
-        text = CGI.escapeHTML(t.text)
-
-        if style
-          src << "<span class=\"#{style}\">#{text}</span>"
-        else
-          src << text
-        end
-      end
-
-      add_line_numbers(src) if Options.instance.include_line_numbers
-      src
-    end
-
-    # we rely on the fact that the first line of a source code
-    # listing has 
-    #    # File xxxxx, line dddd
-
-    def add_line_numbers(src)
-      if src =~ /\A.*, line (\d+)/
-        first = $1.to_i - 1
-        last  = first + src.count("\n")
-        size = last.to_s.length
-        real_fmt = "%#{size}d: "
-        fmt = " " * (size+2)
-        src.gsub!(/^/) do
-          res = sprintf(fmt, first) 
-          first += 1
-          fmt = real_fmt
-          res
-        end
-      end
-    end
-
-    def document_self
-      @context.document_self
-    end
-
-    def aliases
-      @context.aliases
-    end
-
-    def find_symbol(symbol, method=nil)
-      res = @context.parent.find_symbol(symbol, method)
-      if res
-        res = res.viewer
-      end
-      res
-    end
-  end
-
-  #####################################################################
-
-  class HTMLGenerator
-
-    include MarkUp
-
-    ##
-    # convert a target url to one that is relative to a given
-    # path
-    
-    def HTMLGenerator.gen_url(path, target)
-      from          = File.dirname(path)
-      to, to_file   = File.split(target)
-      
-      from = from.split("/")
-      to   = to.split("/")
-      
-      while from.size > 0 and to.size > 0 and from[0] == to[0]
-        from.shift
-        to.shift
-      end
-      
-      from.fill("..")
-      from.concat(to)
-      from << to_file
-      File.join(*from)
-    end
-
-    # Generators may need to return specific subclasses depending
-    # on the options they are passed. Because of this
-    # we create them using a factory
-
-    def HTMLGenerator.for(options)
-      AllReferences::reset
-      HtmlMethod::reset
-
-      if options.all_one_file
-        HTMLGeneratorInOne.new(options)
-      else
-        HTMLGenerator.new(options)
-      end
-    end
-
-    class <<self
-      protected :new
-    end
-
-    # Set up a new HTML generator. Basically all we do here is load
-    # up the correct output temlate
-
-    def initialize(options) #:not-new:
-      @options    = options
-      load_html_template
-    end
-
-
-    ##
-    # Build the initial indices and output objects
-    # based on an array of TopLevel objects containing
-    # the extracted information. 
-
-    def generate(toplevels)
-      @toplevels  = toplevels
-      @files      = []
-      @classes    = []
-
-      write_style_sheet
-      gen_sub_directories()
-      build_indices
-      generate_html
-    end
-
-    private
-
-    ##
-    # Load up the HTML template specified in the options.
-    # If the template name contains a slash, use it literally
-    #
-    def load_html_template
-      template = @options.template
-      unless template =~ %r{/|\\}
-        template = File.join("rdoc/generators/template",
-                             @options.generator.key, template)
-      end
-      require template
-      extend RDoc::Page
-    rescue LoadError
-      $stderr.puts "Could not find HTML template '#{template}'"
-      exit 99
-    end
-
-    ##
-    # Write out the style sheet used by the main frames
-    #
-    
-    def write_style_sheet
-      template = TemplatePage.new(RDoc::Page::STYLE)
-      unless @options.css
-        File.open(CSS_NAME, "w") do |f|
-          values = { "fonts" => RDoc::Page::FONTS }
-          template.write_html_on(f, values)
-        end
-      end
-    end
-
-    ##
-    # See the comments at the top for a description of the
-    # directory structure
-
-    def gen_sub_directories
-      File.makedirs(FILE_DIR, CLASS_DIR)
-    rescue 
-      $stderr.puts $!.message
-      exit 1
-    end
-
-    ##
-    # Generate:
-    #
-    # * a list of HtmlFile objects for each TopLevel object.
-    # * a list of HtmlClass objects for each first level
-    #   class or module in the TopLevel objects
-    # * a complete list of all hyperlinkable terms (file,
-    #   class, module, and method names)
-
-    def build_indices
-
-      @toplevels.each do |toplevel|
-        @files << HtmlFile.new(toplevel, @options, FILE_DIR)
-      end
-
-      RDoc::TopLevel.all_classes_and_modules.each do |cls|
-        build_class_list(cls, @files[0], CLASS_DIR)
-      end
-    end
-
-    def build_class_list(from, html_file, class_dir)
-      @classes << HtmlClass.new(from, html_file, class_dir, @options)
-      from.each_classmodule do |mod|
-        build_class_list(mod, html_file, class_dir)
-      end
-    end
-
-    ##
-    # Generate all the HTML
-    #
-    def generate_html
-      # the individual descriptions for files and classes
-      gen_into(@files)
-      gen_into(@classes)
-      # and the index files
-      gen_file_index
-      gen_class_index
-      gen_method_index
-      gen_main_index
-      
-      # this method is defined in the template file
-      write_extra_pages if defined? write_extra_pages
-    end
-
-    def gen_into(list)
-      list.each do |item|
-        if item.document_self
-          op_file = item.path
-          File.makedirs(File.dirname(op_file))
-          File.open(op_file, "w") { |file| item.write_on(file) }
-        end
-      end
-
-    end
-
-    def gen_file_index
-      gen_an_index(@files, 'Files', 
-                   RDoc::Page::FILE_INDEX, 
-                   "fr_file_index.html")
-    end
-
-    def gen_class_index
-      gen_an_index(@classes, 'Classes',
-                   RDoc::Page::CLASS_INDEX,
-                   "fr_class_index.html")
-    end
-
-    def gen_method_index
-      gen_an_index(HtmlMethod.all_methods, 'Methods', 
-                   RDoc::Page::METHOD_INDEX,
-                   "fr_method_index.html")
-    end
-
-    
-    def gen_an_index(collection, title, template, filename)
-      template = TemplatePage.new(RDoc::Page::FR_INDEX_BODY, template)
-      res = []
-      collection.sort.each do |f|
-        if f.document_self
-          res << { "href" => f.path, "name" => f.index_name }
-        end
-      end
-
-      values = {
-        "entries"    => res,
-        'list_title' => CGI.escapeHTML(title),
-        'index_url'  => main_url,
-        'charset'    => @options.charset,
-        'style_url'  => style_url('', @options.css),
-      }
-
-      File.open(filename, "w") do |f|
-        template.write_html_on(f, values)
-      end
-    end
-
-    # The main index page is mostly a template frameset, but includes
-    # the initial page. If the <tt>--main</tt> option was given,
-    # we use this as our main page, otherwise we use the
-    # first file specified on the command line.
-
-    def gen_main_index
-      template = TemplatePage.new(RDoc::Page::INDEX)
-      File.open("index.html", "w") do |f|
-        values = {
-          "initial_page" => main_url,
-          'title'        => CGI.escapeHTML(@options.title),
-          'charset'      => @options.charset
-        }
-        if @options.inline_source
-          values['inline_source'] = true
-        end
-        template.write_html_on(f, values)
-      end
-    end
-
-    # return the url of the main page
-    def main_url
-      main_page = @options.main_page
-      ref = nil
-      if main_page
-        ref = AllReferences[main_page]
-        if ref
-          ref = ref.path
-        else
-          $stderr.puts "Could not find main page #{main_page}"
-        end
-      end
-
-      unless ref
-        for file in @files
-          if file.document_self
-            ref = file.path 
-            break
-          end
-        end
-      end
-
-      unless ref
-        $stderr.puts "Couldn't find anything to document"
-        $stderr.puts "Perhaps you've used :stopdoc: in all classes"
-        exit(1)
-      end
-
-      ref
-    end
-
-
-  end
-
-
-  ######################################################################
-
-
-  class HTMLGeneratorInOne < HTMLGenerator
-
-    def initialize(*args)
-      super
-    end
-
-    ##
-    # Build the initial indices and output objects
-    # based on an array of TopLevel objects containing
-    # the extracted information. 
-
-    def generate(info)
-      @toplevels  = info
-      @files      = []
-      @classes    = []
-      @hyperlinks = {}
-
-      build_indices
-      generate_xml
-    end
-
-
-    ##
-    # Generate:
-    #
-    # * a list of HtmlFile objects for each TopLevel object.
-    # * a list of HtmlClass objects for each first level
-    #   class or module in the TopLevel objects
-    # * a complete list of all hyperlinkable terms (file,
-    #   class, module, and method names)
-
-    def build_indices
-
-      @toplevels.each do |toplevel|
-        @files << HtmlFile.new(toplevel, @options, FILE_DIR)
-      end
-
-      RDoc::TopLevel.all_classes_and_modules.each do |cls|
-        build_class_list(cls, @files[0], CLASS_DIR)
-      end
-    end
-
-    def build_class_list(from, html_file, class_dir)
-      @classes << HtmlClass.new(from, html_file, class_dir, @options)
-      from.each_classmodule do |mod|
-        build_class_list(mod, html_file, class_dir)
-      end
-    end
-
-    ##
-    # Generate all the HTML. For the one-file case, we generate
-    # all the information in to one big hash
-    #
-    def generate_xml
-      values = { 
-        'charset' => @options.charset,
-        'files'   => gen_into(@files),
-        'classes' => gen_into(@classes),
-        'title'        => CGI.escapeHTML(@options.title),
-      }
-      
-      # this method is defined in the template file
-      write_extra_pages if defined? write_extra_pages
-
-      template = TemplatePage.new(RDoc::Page::ONE_PAGE)
-
-      if @options.op_name
-        opfile = File.open(@options.op_name, "w")
-      else
-        opfile = $stdout
-      end
-      template.write_html_on(opfile, values)
-    end
-
-    def gen_into(list)
-      res = []
-      list.each do |item|
-        res << item.value_hash
-      end
-      res
-    end
-
-    def gen_file_index
-      gen_an_index(@files, 'Files')
-    end
-
-    def gen_class_index
-      gen_an_index(@classes, 'Classes')
-    end
-
-    def gen_method_index
-      gen_an_index(HtmlMethod.all_methods, 'Methods')
-    end
-
-    
-    def gen_an_index(collection, title)
-      res = []
-      collection.sort.each do |f|
-        if f.document_self
-          res << { "href" => f.path, "name" => f.index_name }
-        end
-      end
-
-      return {
-        "entries" => res,
-        'list_title' => title,
-        'index_url'  => main_url,
-      }
-    end
-
-  end
-end
diff --git a/lib/rdoc/generators/ri_generator.rb b/lib/rdoc/generators/ri_generator.rb
deleted file mode 100644
index c7d0bbd8f0..0000000000
--- a/lib/rdoc/generators/ri_generator.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-# We're responsible for generating all the HTML files
-# from the object tree defined in code_objects.rb. We
-# generate:
-#
-# [files]   an html file for each input file given. These
-#           input files appear as objects of class
-#           TopLevel
-#
-# [classes] an html file for each class or module encountered.
-#           These classes are not grouped by file: if a file
-#           contains four classes, we'll generate an html
-#           file for the file itself, and four html files 
-#           for the individual classes. 
-#
-# [indices] we generate three indices for files, classes,
-#           and methods. These are displayed in a browser
-#           like window with three index panes across the
-#           top and the selected description below
-#
-# Method descriptions appear in whatever entity (file, class,
-# or module) that contains them.
-#
-# We generate files in a structure below a specified subdirectory,
-# normally +doc+.
-#
-#  opdir
-#     |
-#     |___ files
-#     |       |__  per file summaries
-#     |
-#     |___ classes
-#             |__ per class/module descriptions
-#
-# HTML is generated using the Template class.
-#
-
-require 'ftools'
-
-require 'rdoc/options'
-require 'rdoc/template'
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_flow'
-require 'cgi'
-
-require 'rdoc/ri/ri_cache'
-require 'rdoc/ri/ri_reader'
-require 'rdoc/ri/ri_writer'
-require 'rdoc/ri/ri_descriptions'
-
-module Generators
-
-
-  class RIGenerator
-
-    # Generators may need to return specific subclasses depending
-    # on the options they are passed. Because of this
-    # we create them using a factory
-
-    def RIGenerator.for(options)
-      new(options)
-    end
-
-    class <<self
-      protected :new
-    end
-
-    # Set up a new HTML generator. Basically all we do here is load
-    # up the correct output temlate
-
-    def initialize(options) #:not-new:
-      @options   = options
-      @ri_writer = RI::RiWriter.new(".")
-      @markup    = SM::SimpleMarkup.new
-      @to_flow   = SM::ToFlow.new
-    end
-
-
-    ##
-    # Build the initial indices and output objects
-    # based on an array of TopLevel objects containing
-    # the extracted information. 
-
-    def generate(toplevels)
-      RDoc::TopLevel.all_classes_and_modules.each do |cls|
-        process_class(cls)
-      end
-    end
-
-    def process_class(from_class)
-      generate_class_info(from_class)
-
-      # now recure into this classes constituent classess
-      from_class.each_classmodule do |mod|
-        process_class(mod)
-      end
-    end
-
-    def generate_class_info(cls)
-      if cls === RDoc::NormalModule
-        cls_desc = RI::ModuleDescription.new
-      else
-        cls_desc = RI::ClassDescription.new
-        cls_desc.superclass  = cls.superclass
-      end
-      cls_desc.name        = cls.name
-      cls_desc.full_name   = cls.full_name
-      cls_desc.comment     = markup(cls.comment)
-
-      cls_desc.attributes =cls.attributes.sort.map do |a|
-        RI::Attribute.new(a.name, a.rw, markup(a.comment))
-      end
-
-      cls_desc.constants = cls.constants.map do |c|
-        RI::Constant.new(c.name, c.value, markup(c.comment))
-      end
-
-      cls_desc.includes = cls.includes.map do |i|
-        RI::IncludedModule.new(i.name)
-      end
-
-      class_methods, instance_methods = method_list(cls)
-
-      cls_desc.class_methods = class_methods.map do |m|
-        RI::MethodSummary.new(m.name)
-      end
-      cls_desc.instance_methods = instance_methods.map do |m|
-        RI::MethodSummary.new(m.name)
-      end
-
-      update_or_replace(cls_desc)
-
-      class_methods.each do |m|
-        generate_method_info(cls_desc, m)
-      end
-
-      instance_methods.each do |m|
-        generate_method_info(cls_desc, m)
-      end
-    end
-
-
-    def generate_method_info(cls_desc, method)
-      meth_desc = RI::MethodDescription.new
-      meth_desc.name = method.name
-      meth_desc.full_name = cls_desc.full_name
-      if method.singleton
-        meth_desc.full_name += "::"
-      else
-        meth_desc.full_name += "#"
-      end
-      meth_desc.full_name << method.name
-
-      meth_desc.comment = markup(method.comment)
-      meth_desc.params = params_of(method)
-      meth_desc.visibility = method.visibility.to_s
-      meth_desc.is_singleton = method.singleton
-      meth_desc.block_params = method.block_params
-
-      meth_desc.aliases = method.aliases.map do |a|
-        RI::AliasName.new(a.name)
-      end
-
-      @ri_writer.add_method(cls_desc, meth_desc)
-    end
-
-    private
-
-    # return a list of class and instance methods that we'll be
-    # documenting
-
-    def method_list(cls)
-      list = cls.method_list
-      unless @options.show_all
-        list = list.find_all do |m|
-          m.visibility == :public || m.visibility == :protected || m.force_documentation
-        end
-      end
-
-      c = []
-      i = []
-      list.sort.each do |m|
-        if m.singleton
-          c << m
-        else
-          i << m
-        end
-      end
-      return c,i
-    end
-    
-    def params_of(method)
-      if method.call_seq
-        method.call_seq
-      else
-        params = method.params || ""
-        
-        p = params.gsub(/\s*\#.*/, '')
-        p = p.tr("\n", " ").squeeze(" ")
-        p = "(" + p + ")" unless p[0] == ?(
-        
-        if (block = method.block_params)
-          block.gsub!(/\s*\#.*/, '')
-          block = block.tr("\n", " ").squeeze(" ")
-          if block[0] == ?(
-            block.sub!(/^\(/, '').sub!(/\)/, '')
-          end
-          p << " {|#{block.strip}| ...}"
-        end
-        p
-      end
-    end
-
-    def markup(comment)
-      return nil if !comment || comment.empty?
-
-      # Convert leading comment markers to spaces, but only
-      # if all non-blank lines have them
-      
-      if comment =~ /^(?>\s*)[^\#]/
-        content = comment
-      else
-        content = comment.gsub(/^\s*(#+)/)  { $1.tr('#',' ') }
-      end
-      @markup.convert(content, @to_flow)
-    end
-
-
-    # By default we replace existing classes with the
-    # same name. If the --merge option was given, we instead
-    # merge this definition into an existing class. We add
-    # our methods, aliases, etc to that class, but do not
-    # change the class's description.
-
-    def update_or_replace(cls_desc)
-      old_cls = nil
-
-      if @options.merge
-        rdr = RI::RiReader.new(RI::RiCache.new(@options.op_dir))
-
-        namespace = rdr.top_level_namespace
-        namespace = rdr.lookup_namespace_in(cls_desc.name, namespace)
-        if namespace.empty?
-          $stderr.puts "You asked me to merge this source into existing "
-          $stderr.puts "documentation. This file references a class or "
-          $stderr.puts "module called #{cls_desc.name} which I don't"
-          $stderr.puts "have existing documentation for."
-          $stderr.puts 
-          $stderr.puts "Perhaps you need to generate its documentation first"
-          exit 1
-        else
-          old_cls = namespace[0]
-        end
-      end
-
-      if old_cls.nil?
-        # no merge: simply overwrite
-        @ri_writer.remove_class(cls_desc)
-        @ri_writer.add_class(cls_desc)
-      else
-        # existing class: merge in
-        old_desc = rdr.get_class(old_cls)
-
-        old_desc.merge_in(cls_desc)
-        @ri_writer.add_class(old_desc)
-      end
-    end
-  end
-end
diff --git a/lib/rdoc/generators/template/chm/chm.rb b/lib/rdoc/generators/template/chm/chm.rb
deleted file mode 100644
index 4a89c26520..0000000000
--- a/lib/rdoc/generators/template/chm/chm.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-module RDoc
-module Page
-
-require "rdoc/generators/template/html/html"
-
-# This is a nasty little hack, but hhc doesn't support the <?xml
-# tag, so...
-
-BODY.sub!(/<\?xml.*\?>/, '')
-SRC_PAGE.sub!(/<\?xml.*\?>/, '')
-
-HPP_FILE = %{
-[OPTIONS]
-Auto Index = Yes
-Compatibility=1.1 or later
-Compiled file=%opname%.chm
-Contents file=contents.hhc
-Full-text search=Yes
-Index file=index.hhk
-Language=0x409 English(United States)
-Title=%title%
-
-[FILES]
-START:all_html_files
-%html_file_name%
-END:all_html_files
-}
-
-CONTENTS = %{
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<OBJECT type="text/site properties">
-	<param name="Foreground" value="0x80">
-	<param name="Window Styles" value="0x800025">
-	<param name="ImageType" value="Folder">
-</OBJECT>
-<UL>
-START:contents
-	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="%c_name%">
-		<param name="Local" value="%ref%">
-		</OBJECT>
-IF:methods
-<ul>
-START:methods
-	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="%name%">
-		<param name="Local" value="%aref%">
-		</OBJECT>
-END:methods
-</ul>
-ENDIF:methods
-        </LI>
-END:contents
-</UL>
-</BODY></HTML>
-}
-
-
-CHM_INDEX  = %{
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<OBJECT type="text/site properties">
-	<param name="Foreground" value="0x80">
-	<param name="Window Styles" value="0x800025">
-	<param name="ImageType" value="Folder">
-</OBJECT>
-<UL>
-START:index
-	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="%name%">
-		<param name="Local" value="%aref%">
-		</OBJECT>
-END:index
-</UL>
-</BODY></HTML>
-}
-end
-end
diff --git a/lib/rdoc/generators/template/html/hefss.rb b/lib/rdoc/generators/template/html/hefss.rb
deleted file mode 100644
index e68ca85823..0000000000
--- a/lib/rdoc/generators/template/html/hefss.rb
+++ /dev/null
@@ -1,418 +0,0 @@
-module RDoc
-module Page
-
-
-FONTS = "Verdana, Arial, Helvetica, sans-serif"
-
-STYLE = %{
-body,p { font-family: Verdana, Arial, Helvetica, sans-serif; 
-       color: #000040; background: #BBBBBB;
-}
-
-td { font-family: Verdana, Arial, Helvetica, sans-serif; 
-       color: #000040;
-}
-
-.attr-rw { font-size: small; color: #444488 }
-
-.title-row {color:      #eeeeff;
-	    background: #BBBBDD;
-}
-
-.big-title-font { color: white;
-                  font-family: Verdana, Arial, Helvetica, sans-serif;
-                  font-size: large; 
-                  height: 50px}
-
-.small-title-font { color: purple;
-                    font-family: Verdana, Arial, Helvetica, sans-serif;
-                    font-size: small; }
-
-.aqua { color: purple }
-
-.method-name, attr-name {
-      font-family: monospace; font-weight: bold;
-}
-
-.tablesubtitle {
-   width: 100%;
-   margin-top: 1ex;
-   margin-bottom: .5ex;
-   padding: 5px 0px 5px 20px;
-   font-size: large;
-   color: purple;
-   background: #BBBBCC;
-}
-
-.tablesubsubtitle {
-   width: 100%;
-   margin-top: 1ex;
-   margin-bottom: .5ex;
-   padding: 5px 0px 5px 20px;
-   font-size: medium;
-   color: white;
-   background: #BBBBCC;
-}
-
-.name-list {
-  font-family: monospace;
-  margin-left: 40px;
-  margin-bottom: 2ex;
-  line-height: 140%;
-}
-
-.description {
-  margin-left: 40px;
-  margin-bottom: 2ex;
-  line-height: 140%;
-}
-
-.methodtitle {
-  font-size: medium;
-  text_decoration: none;
-  padding: 3px 3px 3px 20px;
-  color: #0000AA;
-}
-
-.column-title {
-  font-size: medium;
-  font-weight: bold;
-  text_decoration: none;
-  padding: 3px 3px 3px 20px;
-  color: #3333CC;
-  }
-
-.variable-name {
-  font-family: monospace;
-  font-size: medium;
-  text_decoration: none;
-  padding: 3px 3px 3px 20px;
-  color: #0000AA;
-}
-
-.row-name {
-  font-size: medium;
-  font-weight: medium;
-  font-family: monospace;
-  text_decoration: none;
-  padding: 3px 3px 3px 20px;
-}
-
-.paramsig {
-   font-size: small;
-}
-
-.srcbut { float: right }
-
-}
-
-
-############################################################################
-
-
-BODY = %{
-<html><head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
-  <script type="text/javascript" language="JavaScript">
-  <!--
-  function popCode(url) {
-    parent.frames.source.location = url
-  }
-  //-->
-  </script>
-</head>
-<body bgcolor="#BBBBBB">
-
-!INCLUDE!  <!-- banner header -->
-
-IF:diagram
-<table width="100%"><tr><td align="center">
-%diagram%
-</td></tr></table>
-ENDIF:diagram
-
-IF:description
-<div class="description">%description%</div>
-ENDIF:description
-
-IF:requires
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Required files</td></tr>
-</table><br />
-<div class="name-list">
-START:requires
-HREF:aref:name:
-END:requires
-ENDIF:requires
-</div>
-
-IF:methods
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Subroutines and Functions</td></tr>
-</table><br />
-<div class="name-list">
-START:methods
-HREF:aref:name:,
-END:methods
-</div>
-ENDIF:methods
-
-IF:attributes
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Arguments</td></tr>
-</table><br />
-<table cellspacing="5">
-START:attributes
-     <tr valign="top">
-IF:rw
-       <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
-ENDIF:rw
-IFNOT:rw
-       <td></td>
-ENDIF:rw
-       <td class="attr-name">%name%</td>
-       <td>%a_desc%</td>
-     </tr>
-END:attributes
-</table>
-ENDIF:attributes
-
-IF:classlist
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Modules</td></tr>
-</table><br />
-%classlist%<br />
-ENDIF:classlist
-
-  !INCLUDE!  <!-- method descriptions -->
-
-</body>
-</html>
-}
-
-###############################################################################
-
-FILE_PAGE = <<_FILE_PAGE_
-<table width="100%">
- <tr class="title-row">
- <td><table width="100%"><tr>
-   <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font>%short_name%</td>
-   <td align="right"><table cellspacing="0" cellpadding="2">
-         <tr>
-           <td  class="small-title-font">Path:</td>
-           <td class="small-title-font">%full_path%
-IF:cvsurl
-				&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-           </td>
-         </tr>
-         <tr>
-           <td class="small-title-font">Modified:</td>
-           <td class="small-title-font">%dtm_modified%</td>
-         </tr>
-        </table>
-    </td></tr></table></td>
-  </tr>
-</table><br />
-_FILE_PAGE_
-
-###################################################################
-
-CLASS_PAGE = %{
-<table width="100%" border="0" cellspacing="0">
- <tr class="title-row">
- <td class="big-title-font">
-   <font size="-3"><b>%classmod%</b><br /></font>%full_name%
- </td>
- <td align="right">
-   <table cellspacing="0" cellpadding="2">
-     <tr valign="top">
-      <td class="small-title-font">In:</td>
-      <td class="small-title-font">
-START:infiles
-HREF:full_path_url:full_path:
-IF:cvsurl
-&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-END:infiles
-      </td>
-     </tr>
-IF:parent
-     <tr>
-      <td class="small-title-font">Parent:</td>
-      <td class="small-title-font">
-IF:par_url
-        <a href="%par_url%" class="cyan">
-ENDIF:par_url
-%parent%
-IF:par_url
-         </a>
-ENDIF:par_url
-      </td>
-     </tr>
-ENDIF:parent
-   </table>
-  </td>
-  </tr>
-</table><br />
-}
-
-###################################################################
-
-METHOD_LIST = %{
-IF:includes
-<div class="tablesubsubtitle">Uses</div><br />
-<div class="name-list">
-START:includes
-    <span class="method-name">HREF:aref:name:</span>
-END:includes
-</div>
-ENDIF:includes
-
-IF:method_list
-START:method_list
-IF:methods
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
-</table>
-START:methods
-<table width="100%" cellspacing="0" cellpadding="5" border="0">
-<tr><td class="methodtitle">
-<a name="%aref%">
-<b>%name%</b>%params% 
-IF:codeurl
-<a href="%codeurl%" target="source" class="srclink">src</a>
-ENDIF:codeurl
-</a></td></tr>
-</table>
-IF:m_desc
-<div class="description">
-%m_desc%
-</div>
-ENDIF:m_desc
-END:methods
-ENDIF:methods
-END:method_list
-ENDIF:method_list
-}
-
-=begin
-=end
-
-########################## Source code ##########################
-
-SRC_PAGE = %{
-<html>
-<head><title>%title%</title>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style type="text/css">
-  .kw { color: #3333FF; font-weight: bold }
-  .cmt { color: green; font-style: italic }
-  .str { color: #662222; font-style: italic }
-  .re  { color: #662222; }
-.ruby-comment    { color: green; font-style: italic }
-.ruby-constant   { color: #4433aa; font-weight: bold; }
-.ruby-identifier { color: #222222;  }
-.ruby-ivar       { color: #2233dd; }
-.ruby-keyword    { color: #3333FF; font-weight: bold }
-.ruby-node       { color: #777777; }
-.ruby-operator   { color: #111111;  }
-.ruby-regexp     { color: #662222; }
-.ruby-value      { color: #662222; font-style: italic }
-</style>
-</head>
-<body bgcolor="#BBBBBB">
-<pre>%code%</pre>
-</body>
-</html>
-}
-
-########################## Index ################################
-
-FR_INDEX_BODY = %{
-!INCLUDE!
-}
-
-FILE_INDEX = %{
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style type="text/css">
-<!--
-  body {
-background-color: #bbbbbb;
-     font-family: #{FONTS}; 
-       font-size: 11px; 
-      font-style: normal;
-     line-height: 14px; 
-           color: #000040;
-  }
-div.banner {
-  background: #bbbbcc;
-  color:      white;
-  padding: 1;
-  margin: 0;
-  font-size: 90%;
-  font-weight: bold;
-  line-height: 1.1;
-  text-align: center;
-  width: 100%;
-}
-  
--->
-</style>
-<base target="docwin">
-</head>
-<body>
-<div class="banner">%list_title%</div>
-START:entries
-<a href="%href%">%name%</a><br />
-END:entries
-</body></html>
-}
-
-CLASS_INDEX = FILE_INDEX
-METHOD_INDEX = FILE_INDEX
-
-INDEX = %{
-<html>
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-</head>
-
-<frameset cols="20%,*">
-    <frameset rows="15%,35%,50%">
-        <frame src="fr_file_index.html"   title="Files" name="Files">
-        <frame src="fr_class_index.html"  name="Modules">
-        <frame src="fr_method_index.html" name="Subroutines and Functions">
-    </frameset>
-    <frameset rows="80%,20%">
-      <frame  src="%initial_page%" name="docwin">
-      <frame  src="blank.html" name="source">
-    </frameset>
-    <noframes>
-          <body bgcolor="#BBBBBB">
-            Click <a href="html/index.html">here</a> for a non-frames
-            version of this page.
-          </body>
-    </noframes>
-</frameset>
-
-</html>
-}
-
-# and a blank page to use as a target
-BLANK = %{
-<html><body bgcolor="#BBBBBB"></body></html>
-}
-
-def write_extra_pages
-  template = TemplatePage.new(BLANK)
-  File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
-end
-
-end
-end
diff --git a/lib/rdoc/generators/template/html/html.rb b/lib/rdoc/generators/template/html/html.rb
deleted file mode 100644
index 7f9e599465..0000000000
--- a/lib/rdoc/generators/template/html/html.rb
+++ /dev/null
@@ -1,711 +0,0 @@
-#
-# = CSS2 RDoc HTML template
-#
-# This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a
-# bit more of the appearance of the output to cascading stylesheets than the
-# default. It was designed for clean inline code display, and uses DHTMl to
-# toggle the visbility of each method's source with each click on the '[source]'
-# link.
-#
-# == Authors
-#
-# * Michael Granger <ged@FaerieMUD.org>
-#
-# Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved.
-#
-# This work is licensed under the Creative Commons Attribution License. To view
-# a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or
-# send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California
-# 94305, USA.
-#
-
-module RDoc
-  module Page
-
-    FONTS = "Verdana,Arial,Helvetica,sans-serif"
-
-STYLE = %{
-body {
-    font-family: Verdana,Arial,Helvetica,sans-serif;
-    font-size:   90%;
-    margin: 0;
-    margin-left: 40px;
-    padding: 0;
-    background: white;
-}
-
-h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
-h1 { font-size: 150%; }
-h2,h3,h4 { margin-top: 1em; }
-
-a { background: #eef; color: #039; text-decoration: none; }
-a:hover { background: #039; color: #eef; }
-
-/* Override the base stylesheet's Anchor inside a table cell */
-td > a {
-  background: transparent;
-  color: #039;
-  text-decoration: none;
-}
-
-/* and inside a section title */
-.section-title > a {
-  background: transparent;
-  color: #eee;
-  text-decoration: none;
-}
-
-/* === Structural elements =================================== */
-
-div#index {
-    margin: 0;
-    margin-left: -40px;
-    padding: 0;
-    font-size: 90%;
-}
-
-
-div#index a {
-    margin-left: 0.7em;
-}
-
-div#index .section-bar {
-   margin-left: 0px;
-   padding-left: 0.7em;
-   background: #ccc;
-   font-size: small;
-}
-
-
-div#classHeader, div#fileHeader {
-    width: auto;
-    color: white;
-    padding: 0.5em 1.5em 0.5em 1.5em;
-    margin: 0;
-    margin-left: -40px;
-    border-bottom: 3px solid #006;
-}
-
-div#classHeader a, div#fileHeader a {
-    background: inherit;
-    color: white;
-}
-
-div#classHeader td, div#fileHeader td {
-    background: inherit;
-    color: white;
-}
-
-
-div#fileHeader {
-    background: #057;
-}
-
-div#classHeader {
-    background: #048;
-}
-
-
-.class-name-in-header {
-  font-size:  180%;
-  font-weight: bold;
-}
-
-
-div#bodyContent {
-    padding: 0 1.5em 0 1.5em;
-}
-
-div#description {
-    padding: 0.5em 1.5em;
-    background: #efefef;
-    border: 1px dotted #999;
-}
-
-div#description h1,h2,h3,h4,h5,h6 {
-    color: #125;;
-    background: transparent;
-}
-
-div#validator-badges {
-    text-align: center;
-}
-div#validator-badges img { border: 0; }
-
-div#copyright {
-    color: #333;
-    background: #efefef;
-    font: 0.75em sans-serif;
-    margin-top: 5em;
-    margin-bottom: 0;
-    padding: 0.5em 2em;
-}
-
-
-/* === Classes =================================== */
-
-table.header-table {
-    color: white;
-    font-size: small;
-}
-
-.type-note {
-    font-size: small;
-    color: #DEDEDE;
-}
-
-.xxsection-bar {
-    background: #eee;
-    color: #333;
-    padding: 3px;
-}
-
-.section-bar {
-   color: #333;
-   border-bottom: 1px solid #999;
-    margin-left: -20px;
-}
-
-
-.section-title {
-    background: #79a;
-    color: #eee;
-    padding: 3px;
-    margin-top: 2em;
-    margin-left: -30px;
-    border: 1px solid #999;
-}
-
-.top-aligned-row {  vertical-align: top }
-.bottom-aligned-row { vertical-align: bottom }
-
-/* --- Context section classes ----------------------- */
-
-.context-row { }
-.context-item-name { font-family: monospace; font-weight: bold; color: black; }
-.context-item-value { font-size: small; color: #448; }
-.context-item-desc { color: #333; padding-left: 2em; }
-
-/* --- Method classes -------------------------- */
-.method-detail {
-    background: #efefef;
-    padding: 0;
-    margin-top: 0.5em;
-    margin-bottom: 1em;
-    border: 1px dotted #ccc;
-}
-.method-heading {
-  color: black;
-  background: #ccc;
-  border-bottom: 1px solid #666;
-  padding: 0.2em 0.5em 0 0.5em;
-}
-.method-signature { color: black; background: inherit; }
-.method-name { font-weight: bold; }
-.method-args { font-style: italic; }
-.method-description { padding: 0 0.5em 0 0.5em; }
-
-/* --- Source code sections -------------------- */
-
-a.source-toggle { font-size: 90%; }
-div.method-source-code {
-    background: #262626;
-    color: #ffdead;
-    margin: 1em;
-    padding: 0.5em;
-    border: 1px dashed #999;
-    overflow: hidden;
-}
-
-div.method-source-code pre { color: #ffdead; overflow: hidden; }
-
-/* --- Ruby keyword styles --------------------- */
-
-.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
-
-.ruby-constant  { color: #7fffd4; background: transparent; }
-.ruby-keyword { color: #00ffff; background: transparent; }
-.ruby-ivar    { color: #eedd82; background: transparent; }
-.ruby-operator  { color: #00ffee; background: transparent; }
-.ruby-identifier { color: #ffdead; background: transparent; }
-.ruby-node    { color: #ffa07a; background: transparent; }
-.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
-.ruby-regexp  { color: #ffa07a; background: transparent; }
-.ruby-value   { color: #7fffd4; background: transparent; }
-}
-
-
-#####################################################################
-### H E A D E R   T E M P L A T E  
-#####################################################################
-
-XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-}
-
-HEADER = XHTML_PREAMBLE + %{
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-}
-
-
-#####################################################################
-### C O N T E X T   C O N T E N T   T E M P L A T E
-#####################################################################
-
-CONTEXT_CONTENT = %{
-}
-
-
-#####################################################################
-### F O O T E R   T E M P L A T E
-#####################################################################
-FOOTER = %{
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
-}
-
-
-#####################################################################
-### F I L E   P A G E   H E A D E R   T E M P L A T E
-#####################################################################
-
-FILE_PAGE = %{
-  <div id="fileHeader">
-    <h1>%short_name%</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>%full_path%
-IF:cvsurl
-        &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>%dtm_modified%</td>
-    </tr>
-    </table>
-  </div>
-}
-
-
-#####################################################################
-### C L A S S   P A G E   H E A D E R   T E M P L A T E
-#####################################################################
-
-CLASS_PAGE = %{
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>%classmod%</strong></td>
-          <td class="class-name-in-header">%full_name%</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-START:infiles
-IF:full_path_url
-                <a href="%full_path_url%">
-ENDIF:full_path_url
-                %full_path%
-IF:full_path_url
-                </a>
-ENDIF:full_path_url
-IF:cvsurl
-        &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-        <br />
-END:infiles
-            </td>
-        </tr>
-
-IF:parent
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-IF:par_url
-                <a href="%par_url%">
-ENDIF:par_url
-                %parent%
-IF:par_url
-               </a>
-ENDIF:par_url
-            </td>
-        </tr>
-ENDIF:parent
-        </table>
-    </div>
-}
-
-
-#####################################################################
-### M E T H O D   L I S T   T E M P L A T E
-#####################################################################
-
-METHOD_LIST = %{
-
-  <div id="contextContent">
-IF:diagram
-    <div id="diagram">
-      %diagram%
-    </div>
-ENDIF:diagram
-
-IF:description
-    <div id="description">
-      %description%
-    </div>
-ENDIF:description
-
-IF:requires
-    <div id="requires-list">
-      <h3 class="section-bar">Required files</h3>
-
-      <div class="name-list">
-START:requires
-      HREF:aref:name:&nbsp;&nbsp;
-END:requires
-      </div>
-    </div>
-ENDIF:requires
-
-IF:toc
-    <div id="contents-list">
-      <h3 class="section-bar">Contents</h3>
-      <ul>
-START:toc
-      <li><a href="#%href%">%secname%</a></li>
-END:toc
-     </ul>
-ENDIF:toc
-   </div>
-
-IF:methods
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-START:methods
-      HREF:aref:name:&nbsp;&nbsp;
-END:methods
-      </div>
-    </div>
-ENDIF:methods
-
-  </div>
-
-
-    <!-- if includes -->
-IF:includes
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
-
-      <div id="includes-list">
-START:includes
-        <span class="include-name">HREF:aref:name:</span>
-END:includes
-      </div>
-    </div>
-ENDIF:includes
-
-START:sections
-    <div id="section">
-IF:sectitle
-      <h2 class="section-title"><a name="%secsequence%">%sectitle%</a></h2>
-IF:seccomment
-      <div class="section-comment">
-        %seccomment%
-      </div>      
-ENDIF:seccomment
-ENDIF:sectitle
-
-IF:classlist
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      %classlist%
-    </div>
-ENDIF:classlist
-
-IF:constants
-    <div id="constants-list">
-      <h3 class="section-bar">Constants</h3>
-
-      <div class="name-list">
-        <table summary="Constants">
-START:constants
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">%name%</td>
-          <td>=</td>
-          <td class="context-item-value">%value%</td>
-IF:desc
-          <td width="3em">&nbsp;</td>
-          <td class="context-item-desc">%desc%</td>
-ENDIF:desc
-        </tr>
-END:constants
-        </table>
-      </div>
-    </div>
-ENDIF:constants
-
-IF:aliases
-    <div id="aliases-list">
-      <h3 class="section-bar">External Aliases</h3>
-
-      <div class="name-list">
-                        <table summary="aliases">
-START:aliases
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">%old_name%</td>
-          <td>-&gt;</td>
-          <td class="context-item-value">%new_name%</td>
-        </tr>
-IF:desc
-      <tr class="top-aligned-row context-row">
-        <td>&nbsp;</td>
-        <td colspan="2" class="context-item-desc">%desc%</td>
-      </tr>
-ENDIF:desc
-END:aliases
-                        </table>
-      </div>
-    </div>
-ENDIF:aliases
-
-
-IF:attributes
-    <div id="attribute-list">
-      <h3 class="section-bar">Attributes</h3>
-
-      <div class="name-list">
-        <table>
-START:attributes
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">%name%</td>
-IF:rw
-          <td class="context-item-value">&nbsp;[%rw%]&nbsp;</td>
-ENDIF:rw
-IFNOT:rw
-          <td class="context-item-value">&nbsp;&nbsp;</td>
-ENDIF:rw
-          <td class="context-item-desc">%a_desc%</td>
-        </tr>
-END:attributes
-        </table>
-      </div>
-    </div>
-ENDIF:attributes
-      
-
-
-    <!-- if method_list -->
-IF:method_list
-    <div id="methods">
-START:method_list
-IF:methods
-      <h3 class="section-bar">%type% %category% methods</h3>
-
-START:methods
-      <div id="method-%aref%" class="method-detail">
-        <a name="%aref%"></a>
-
-        <div class="method-heading">
-IF:codeurl
-          <a href="%codeurl%" target="Code" class="method-signature"
-            onclick="popupCode('%codeurl%');return false;">
-ENDIF:codeurl
-IF:sourcecode
-          <a href="#%aref%" class="method-signature">
-ENDIF:sourcecode
-IF:callseq
-          <span class="method-name">%callseq%</span>
-ENDIF:callseq
-IFNOT:callseq
-          <span class="method-name">%name%</span><span class="method-args">%params%</span>
-ENDIF:callseq
-IF:codeurl
-          </a>
-ENDIF:codeurl
-IF:sourcecode
-          </a>
-ENDIF:sourcecode
-        </div>
-      
-        <div class="method-description">
-IF:m_desc
-          %m_desc%
-ENDIF:m_desc
-IF:sourcecode
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('%aref%-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="%aref%-source">
-<pre>
-%sourcecode%
-</pre>
-          </div>
-ENDIF:sourcecode
-        </div>
-      </div>
-
-END:methods
-ENDIF:methods
-END:method_list
-
-    </div>
-ENDIF:method_list
-END:sections
-}
-
-
-#####################################################################
-### B O D Y   T E M P L A T E
-#####################################################################
-
-BODY = HEADER + %{
-
-!INCLUDE!  <!-- banner header -->
-
-  <div id="bodyContent">
-
-} +  METHOD_LIST + %{
-
-  </div>
-
-} + FOOTER
-
-
-
-#####################################################################
-### S O U R C E   C O D E   T E M P L A T E
-#####################################################################
-
-SRC_PAGE = XHTML_PREAMBLE + %{
-<html>
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
-  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
-</head>
-<body class="standalone-code">
-  <pre>%code%</pre>
-</body>
-</html>
-}
-
-
-#####################################################################
-### I N D E X   F I L E   T E M P L A T E S
-#####################################################################
-
-FR_INDEX_BODY = %{
-!INCLUDE!
-}
-
-FILE_INDEX = XHTML_PREAMBLE + %{
-<!--
-
-    %list_title%
-
-  -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>%list_title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
-  <link rel="stylesheet" href="%style_url%" type="text/css" />
-  <base target="docwin" />
-</head>
-<body>
-<div id="index">
-  <h1 class="section-bar">%list_title%</h1>
-  <div id="index-entries">
-START:entries
-    <a href="%href%">%name%</a><br />
-END:entries
-  </div>
-</div>
-</body>
-</html>
-}
-
-CLASS_INDEX = FILE_INDEX
-METHOD_INDEX = FILE_INDEX
-
-INDEX = %{<?xml version="1.0" encoding="%charset%"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-
-<!--
-
-    %title%
-
-  -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
-</head>
-<frameset rows="20%, 80%">
-    <frameset cols="25%,35%,45%">
-        <frame src="fr_file_index.html"   title="Files" name="Files" />
-        <frame src="fr_class_index.html"  name="Classes" />
-        <frame src="fr_method_index.html" name="Methods" />
-    </frameset>
-    <frame src="%initial_page%" name="docwin" />
-</frameset>
-</html>
-}
-
-
-
-  end # module Page
-end # class RDoc
-
-require 'rdoc/generators/template/html/one_page_html'
diff --git a/lib/rdoc/generators/template/html/kilmer.rb b/lib/rdoc/generators/template/html/kilmer.rb
deleted file mode 100644
index 55071fc026..0000000000
--- a/lib/rdoc/generators/template/html/kilmer.rb
+++ /dev/null
@@ -1,435 +0,0 @@
-module RDoc
-module Page
-
-
-FONTS = "Verdana, Arial, Helvetica, sans-serif"
-
-STYLE = %{
-body,td,p { font-family: %fonts%; 
-       color: #000040;
-}
-
-.attr-rw { font-size: xx-small; color: #444488 }
-
-.title-row { background-color: #CCCCFF;
-             color:      #000010;
-}
-
-.big-title-font { 
-  color: black;
-  font-weight: bold;
-  font-family: %fonts%; 
-  font-size: large; 
-  height: 60px;
-  padding: 10px 3px 10px 3px;
-}
-
-.small-title-font { color: black;
-                    font-family: %fonts%;
-                    font-size:10; }
-
-.aqua { color: black }
-
-.method-name, .attr-name {
-      font-family: font-family: %fonts%; 
-      font-weight: bold;
-      font-size: small;
-      margin-left: 20px;
-      color: #000033;
-}
-
-.tablesubtitle, .tablesubsubtitle {
-   width: 100%;
-   margin-top: 1ex;
-   margin-bottom: .5ex;
-   padding: 5px 0px 5px 3px;
-   font-size: large;
-   color: black;
-   background-color: #CCCCFF;
-   border: thin;
-}
-
-.name-list {
-  margin-left: 5px;
-  margin-bottom: 2ex;
-  line-height: 105%;
-}
-
-.description {
-  margin-left: 5px;
-  margin-bottom: 2ex;
-  line-height: 105%;
-  font-size: small;
-}
-
-.methodtitle {
-  font-size: small;
-  font-weight: bold;
-  text-decoration: none;
-  color: #000033;
-  background-color: white; 
-}
-
-.srclink {
-  font-size: small;
-  font-weight: bold;
-  text-decoration: none;
-  color: #0000DD;
-  background-color: white;
-}
-
-.paramsig {
-   font-size: small;
-}
-
-.srcbut { float: right }
-
-}
-
-
-############################################################################
-
-
-BODY = %{
-<html><head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
-  <script type="text/javascript" language="JavaScript">
-  <!--
-  function popCode(url) {
-    parent.frames.source.location = url
-  }
-  //-->
-  </script>
-</head>
-<body bgcolor="white">
-
-!INCLUDE!  <!-- banner header -->
-
-IF:diagram
-<table width="100%"><tr><td align="center">
-%diagram%
-</td></tr></table>
-ENDIF:diagram
-
-IF:description
-<div class="description">%description%</div>
-ENDIF:description
-
-IF:requires
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Required files</td></tr>
-</table><br />
-<div class="name-list">
-START:requires
-HREF:aref:name:
-END:requires
-ENDIF:requires
-</div>
-
-IF:methods
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Methods</td></tr>
-</table><br />
-<div class="name-list">
-START:methods
-HREF:aref:name:,
-END:methods
-</div>
-ENDIF:methods
-
-
-START:sections
-    <div id="section">
-IF:sectitle
-      <h2 class="section-title"><a name="%secsequence%">%sectitle%</a></h2>
-IF:seccomment
-      <div class="section-comment">
-        %seccomment%
-      </div>      
-ENDIF:seccomment
-ENDIF:sectitle
-
-IF:attributes
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Attributes</td></tr>
-</table><br />
-<table cellspacing="5">
-START:attributes
-     <tr valign="top">
-IF:rw
-       <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
-ENDIF:rw
-IFNOT:rw
-       <td></td>
-ENDIF:rw
-       <td class="attr-name">%name%</td>
-       <td>%a_desc%</td>
-     </tr>
-END:attributes
-</table>
-ENDIF:attributes
-
-IF:classlist
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Classes and Modules</td></tr>
-</table><br />
-%classlist%<br />
-ENDIF:classlist
-
-  !INCLUDE!  <!-- method descriptions -->
-
-END:sections
-
-</body>
-</html>
-}
-
-###############################################################################
-
-FILE_PAGE = <<_FILE_PAGE_
-<table width="100%">
- <tr class="title-row">
- <td><table width="100%"><tr>
-   <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font>%short_name%</td>
-   <td align="right"><table cellspacing="0" cellpadding="2">
-         <tr>
-           <td  class="small-title-font">Path:</td>
-           <td class="small-title-font">%full_path%
-IF:cvsurl
-				&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-           </td>
-         </tr>
-         <tr>
-           <td class="small-title-font">Modified:</td>
-           <td class="small-title-font">%dtm_modified%</td>
-         </tr>
-        </table>
-    </td></tr></table></td>
-  </tr>
-</table><br />
-_FILE_PAGE_
-
-###################################################################
-
-CLASS_PAGE = %{
-<table width="100%" border="0" cellspacing="0">
- <tr class="title-row">
- <td class="big-title-font">
-   <font size="-3"><b>%classmod%</b><br /></font>%full_name%
- </td>
- <td align="right">
-   <table cellspacing="0" cellpadding="2">
-     <tr valign="top">
-      <td class="small-title-font">In:</td>
-      <td class="small-title-font">
-START:infiles
-HREF:full_path_url:full_path:
-IF:cvsurl
-&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-END:infiles
-      </td>
-     </tr>
-IF:parent
-     <tr>
-      <td class="small-title-font">Parent:</td>
-      <td class="small-title-font">
-IF:par_url
-        <a href="%par_url%" class="cyan">
-ENDIF:par_url
-%parent%
-IF:par_url
-         </a>
-ENDIF:par_url
-      </td>
-     </tr>
-ENDIF:parent
-   </table>
-  </td>
-  </tr>
-</table><br />
-}
-
-###################################################################
-
-METHOD_LIST = %{
-IF:includes
-<div class="tablesubsubtitle">Included modules</div><br />
-<div class="name-list">
-START:includes
-    <span class="method-name">HREF:aref:name:</span>
-END:includes
-</div>
-ENDIF:includes
-
-IF:method_list
-START:method_list
-IF:methods
-<table cellpadding=5 width="100%">
-<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
-</table>
-START:methods
-<table width="100%" cellspacing="0" cellpadding="5" border="0">
-<tr><td class="methodtitle">
-<a name="%aref%">
-IF:callseq
-<b>%callseq%</b>
-ENDIF:callseq
-IFNOT:callseq
- <b>%name%</b>%params%
-ENDIF:callseq
-IF:codeurl
-<a href="%codeurl%" target="source" class="srclink">src</a>
-ENDIF:codeurl
-</a></td></tr>
-</table>
-IF:m_desc
-<div class="description">
-%m_desc%
-</div>
-ENDIF:m_desc
-IF:aka
-<div class="aka">
-This method is also aliased as
-START:aka
-<a href="%aref%">%name%</a>
-END:aka
-</div>
-ENDIF:aka
-IF:sourcecode
-<pre class="source">
-%sourcecode%
-</pre>
-ENDIF:sourcecode
-END:methods
-ENDIF:methods
-END:method_list
-ENDIF:method_list
-}
-
-=begin
-=end
-
-########################## Source code ##########################
-
-SRC_PAGE = %{
-<html>
-<head><title>%title%</title>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style type="text/css">
-.ruby-comment    { color: green; font-style: italic }
-.ruby-constant   { color: #4433aa; font-weight: bold; }
-.ruby-identifier { color: #222222;  }
-.ruby-ivar       { color: #2233dd; }
-.ruby-keyword    { color: #3333FF; font-weight: bold }
-.ruby-node       { color: #777777; }
-.ruby-operator   { color: #111111;  }
-.ruby-regexp     { color: #662222; }
-.ruby-value      { color: #662222; font-style: italic }
-  .kw { color: #3333FF; font-weight: bold }
-  .cmt { color: green; font-style: italic }
-  .str { color: #662222; font-style: italic }
-  .re  { color: #662222; }
-</style>
-</head>
-<body bgcolor="white">
-<pre>%code%</pre>
-</body>
-</html>
-}
-
-########################## Index ################################
-
-FR_INDEX_BODY = %{
-!INCLUDE!
-}
-
-FILE_INDEX = %{
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style>
-<!--
-  body {
-background-color: #ddddff;
-     font-family: #{FONTS}; 
-       font-size: 11px; 
-      font-style: normal;
-     line-height: 14px; 
-           color: #000040;
-  }
-div.banner {
-  background: #0000aa;
-  color:      white;
-  padding: 1;
-  margin: 0;
-  font-size: 90%;
-  font-weight: bold;
-  line-height: 1.1;
-  text-align: center;
-  width: 100%;
-}
-  
--->
-</style>
-<base target="docwin">
-</head>
-<body>
-<div class="banner">%list_title%</div>
-START:entries
-<a href="%href%">%name%</a><br />
-END:entries
-</body></html>
-}
-
-CLASS_INDEX = FILE_INDEX
-METHOD_INDEX = FILE_INDEX
-
-INDEX = %{
-<html>
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-</head>
-
-<frameset cols="20%,*">
-    <frameset rows="15%,35%,50%">
-        <frame src="fr_file_index.html"   title="Files" name="Files">
-        <frame src="fr_class_index.html"  name="Classes">
-        <frame src="fr_method_index.html" name="Methods">
-    </frameset>
-IF:inline_source
-      <frame  src="%initial_page%" name="docwin">
-ENDIF:inline_source
-IFNOT:inline_source
-    <frameset rows="80%,20%">
-      <frame  src="%initial_page%" name="docwin">
-      <frame  src="blank.html" name="source">
-    </frameset>
-ENDIF:inline_source
-    <noframes>
-          <body bgcolor="white">
-            Click <a href="html/index.html">here</a> for a non-frames
-            version of this page.
-          </body>
-    </noframes>
-</frameset>
-
-</html>
-}
-
-# and a blank page to use as a target
-BLANK = %{
-<html><body bgcolor="white"></body></html>
-}
-
-def write_extra_pages
-  template = TemplatePage.new(BLANK)
-  File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
-end
-
-end
-end
diff --git a/lib/rdoc/generators/template/html/old_html.rb b/lib/rdoc/generators/template/html/old_html.rb
deleted file mode 100644
index ca66302a08..0000000000
--- a/lib/rdoc/generators/template/html/old_html.rb
+++ /dev/null
@@ -1,728 +0,0 @@
-module RDoc
-
-# This is how you define the HTML that RDoc generates. Simply create
-# a file in rdoc/generators/html_templates that creates the
-# module RDoc::Page and populate it as described below. Then invoke
-# rdoc using the --template <name of your file> option, and
-# your template will be used.
-#
-# The constants defining pages use a simple templating system:
-#
-# * The templating system is passed a hash. Keys in the hash correspond
-#   to tags on this page. The tag %abc% is looked up in the hash,
-#   and is replaced by the corresponding hash value.
-#
-# * Some tags are optional. You can detect this using IF/ENDIF
-#
-#      IF: title
-#      The value of title is %title%
-#      ENDIF: title
-#
-# * Some entries in the hash have values that are arrays, where each
-#   entry in the array is itself a hash. These are used to generate
-#   lists using the START: construct. For example, given a hash
-#   containing
-# 
-#      { 'people' => [ { 'name' => 'Fred', 'age' => '12' },
-#                      { 'name' => 'Mary', 'age' => '21' } ]
-#
-#   You could generate a simple table using
-#
-#      <table>
-#      START:people
-#        <tr><td>%name%<td>%age%</tr>
-#      END:people
-#      </table>
-#
-#   These lists can be nested to an arbitrary depth
-#
-# * the construct HREF:url:name: generates <a href="%url%">%name%</a>
-#   if +url+ is defined in the hash, or %name% otherwise.
-#
-#
-# Your file must contain the following constants
-#
-# [*FONTS*]  a list of fonts to be used
-# [*STYLE*]  a CSS section (without the <style> or comments). This is
-#            used to generate a style.css file
-#
-# [*BODY*] 
-#   The main body of all non-index RDoc pages. BODY will contain
-#   two !INCLUDE!s. The first is used to include a document-type
-#   specific header (FILE_PAGE or CLASS_PAGE). The second include
-#   is for the method list (METHOD_LIST). THe body is passed:
-#
-#   %title%::
-#       the page's title
-#
-#   %style_url%::
-#       the url of a style sheet for this page
-#
-#   %diagram%::
-#       the optional URL of a diagram for this page
-#
-#   %description%::
-#       a (potentially multi-paragraph) string containing the
-#       description for th file/class/module.
-#
-#   %requires%::
-#       an optional list of %aref%/%name% pairs, one for each module
-#       required by this file.
-#
-#   %methods%::
-#       an optional list of %aref%/%name%, one for each method
-#       documented on this page. This is intended to be an index.
-#
-#   %attributes%::  
-#       An optional list. For each attribute it contains:
-#       %name%::   the attribute name
-#       %rw%::     r/o, w/o, or r/w
-#       %a_desc%:: description of the attribute
-#
-#   %classlist%:: 
-#       An optional string containing an already-formatted list of
-#       classes and modules documented in this file
-#
-#   For FILE_PAGE entries, the body will be passed
-#
-#   %short_name%::  
-#       The name of the file
-#
-#   %full_path%::
-#       The full path to the file
-#
-#   %dtm_modified%::
-#       The date/time the file was last changed
-#
-#   For class and module pages, the body will be passed
-#
-#   %classmod%::
-#       The name of the class or module
-#
-#   %files%::
-#       A list. For each file this class is defined in, it contains:
-#       %full_path_url%:: an (optional) URL of the RDoc page
-#                         for this file
-#       %full_path%::     the name of the file
-#
-#   %par_url%::
-#       The (optional) URL of the RDoc page documenting this class's
-#       parent class
-#
-#   %parent%::
-#       The name of this class's parent.
-#
-#   For both files and classes, the body is passed the following information
-#   on includes and methods:
-#
-#   %includes%::    
-#       Optional list of included modules. For each, it receives
-#       %aref%:: optional URL to RDoc page for the module
-#       %name%:: the name of the module
-#
-#   %method_list%::
-#       Optional list of methods of a particular class and category.
-#
-#   Each method list entry contains:
-#
-#   %type%::        public/private/protected
-#   %category%::    instance/class
-#   %methods%::     a list of method descriptions
-#
-#   Each method description contains:
-#
-#   %aref%::        a target aref, used when referencing this method
-#                   description. You should code this as <a name="%aref%">
-#   %codeurl%::     the optional URL to the page containing this method's
-#                   source code.
-#   %name%::        the method's name
-#   %params%::      the method's parameters
-#   %callseq%::     a full calling sequence
-#   %m_desc%::      the (potentially multi-paragraph) description of
-#                   this method.
-#
-# [*CLASS_PAGE*]
-#         Header for pages documenting classes and modules. See
-#         BODY above for the available parameters.
-#
-# [*FILE_PAGE*]
-#         Header for pages documenting files. See
-#         BODY above for the available parameters.
-#
-# [*METHOD_LIST*]
-#         Controls the display of the listing of methods. See BODY for
-#         parameters.
-#
-# [*INDEX*]
-#         The top-level index page. For a browser-like environment
-#         define a frame set that includes the file, class, and 
-#         method indices. Passed
-#         %title%:: title of page
-#         %initial_page% :: url of initial page to display
-#
-# [*CLASS_INDEX*]
-#         Individual files for the three indexes. Passed:
-#         %index_url%:: URL of main index page
-#         %entries%::   List of
-#                       %name%:: name of an index entry
-#                       %href%:: url of corresponding page
-# [*METHOD_INDEX*]
-#         Same as CLASS_INDEX for methods
-#
-# [*FILE_INDEX*]
-#         Same as CLASS_INDEX for methods
-#
-# [*FR_INDEX_BODY*]
-#         A wrapper around CLASS_INDEX, METHOD_INDEX, and FILE_INDEX.
-#         If those index strings contain the complete HTML for the
-#         output, then FR_INDEX_BODY can simply be !INCLUDE!
-#
-# [*SRC_PAGE*]
-#         Page used to display source code. Passed %title% and %code%,
-#         the latter being a multi-line string of code.
-
-module Page
-
-FONTS = "Verdana, Arial, Helvetica, sans-serif"
-
-STYLE = %{
-body,td,p { font-family: %fonts%; 
-       color: #000040;
-}
-
-.attr-rw { font-size: x-small; color: #444488 }
-
-.title-row { background: #0000aa;
-             color:      #eeeeff;
-}
-
-.big-title-font { color: white;
-                  font-family: %fonts%;
-                  font-size: large; 
-                  height: 50px}
-
-.small-title-font { color: aqua;
-                    font-family: %fonts%;
-                    font-size: xx-small; }
-
-.aqua { color: aqua }
-
-.method-name, attr-name {
-      font-family: monospace; font-weight: bold;
-}
-
-.tablesubtitle, .tablesubsubtitle {
-   width: 100%;
-   margin-top: 1ex;
-   margin-bottom: .5ex;
-   padding: 5px 0px 5px 20px;
-   font-size: large;
-   color: aqua;
-   background: #3333cc;
-}
-
-.name-list {
-  font-family: monospace;
-  margin-left: 40px;
-  margin-bottom: 2ex;
-  line-height: 140%;
-}
-
-.description {
-  margin-left: 40px;
-  margin-top: -2ex;
-  margin-bottom: 2ex;
-}
-
-.description p {
-  line-height: 140%;
-}
-
-.aka {
-  margin-left: 40px;
-  margin-bottom: 2ex;
-  line-height: 100%;
-  font-size:   small;
-  color:       #808080;
-}
-
-.methodtitle {
-  font-size: medium;
-  text-decoration: none;
-  color: #0000AA;
-  background: white; 
-}
-
-.paramsig {
-   font-size: small;
-}
-
-.srcbut { float: right }
-
-pre { font-size: 1.2em; }
-tt  { font-size: 1.2em; }
-
-pre.source {
-  border-style: groove;
-  background-color: #ddddff;
-  margin-left:  40px;
-  padding: 1em 0em 1em 2em;
-}
-
-.classlist {
-  margin-left: 40px;
-  margin-bottom: 2ex;
-  line-height: 140%;
-}
-
-li {
-  display:    list-item;
-  margin-top: .6em;
-}
-
-.ruby-comment    { color: green; font-style: italic }
-.ruby-constant   { color: #4433aa; font-weight: bold; }
-.ruby-identifier { color: #222222;  }
-.ruby-ivar       { color: #2233dd; }
-.ruby-keyword    { color: #3333FF; font-weight: bold }
-.ruby-node       { color: #777777; }
-.ruby-operator   { color: #111111;  }
-.ruby-regexp     { color: #662222; }
-.ruby-value      { color: #662222; font-style: italic }
-
-}
-
-
-############################################################################
-
-
-HEADER = %{
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
-  <link rel=StyleSheet href="%style_url%" type="text/css" media="screen" />
-  <script type="text/javascript" language="JavaScript">
-  <!--
-  function popCode(url) {
-    window.open(url, "Code", 
-          "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-  //-->
-  </script>
-</head>
-}
-
-
-###################################################################
-
-METHOD_LIST = %{
-IF:includes
-<table summary="Included modules" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Included modules</td></tr>
-</table>
-<div class="name-list">
-START:includes
-    <span class="method-name">HREF:aref:name:</span>
-END:includes
-</div>
-ENDIF:includes
-
-IF:method_list
-START:method_list
-IF:methods
-<table summary="Method list" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
-</table>
-START:methods
-<table summary="method"  width="100%" cellspacing="0" cellpadding="5" border="0">
-<tr><td class="methodtitle">
-<a name="%aref%"></a>
-IF:codeurl
-<a href="%codeurl%" target="Code" class="methodtitle"
- onClick="popCode('%codeurl%');return false;">
-ENDIF:codeurl
-IF:callseq
-<b>%callseq%</b>
-ENDIF:callseq
-IFNOT:callseq
-<b>%name%</b>%params%
-ENDIF:callseq
-IF:codeurl
-</a>
-ENDIF:codeurl
-</td></tr>
-</table>
-IF:m_desc
-<div class="description">
-%m_desc%
-</div>
-ENDIF:m_desc
-IF:aka
-<div class="aka">
-This method is also aliased as
-START:aka
-<a href="%aref%">%name%</a>
-END:aka
-</div>
-ENDIF:aka
-IF:sourcecode
-<pre class="source">
-%sourcecode%
-</pre>
-ENDIF:sourcecode
-END:methods
-ENDIF:methods
-END:method_list
-ENDIF:method_list
-}
-
-###################################################################
-
-CONTEXT_CONTENT = %{
-IF:diagram
-<table summary="Diagram of classes and modules" width="100%">
-<tr><td align="center">
-%diagram%
-</td></tr></table>
-ENDIF:diagram
-
-
-IF:description
-<div class="description">%description%</div>
-ENDIF:description
-
-IF:requires
-<table summary="Requires" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Required files</td></tr>
-</table>
-<div class="name-list">
-START:requires
-HREF:aref:name:&nbsp; &nbsp;
-END:requires
-</div>
-ENDIF:requires
-
-IF:methods
-<table summary="Methods" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Methods</td></tr>
-</table>
-<div class="name-list">
-START:methods
-HREF:aref:name:&nbsp; &nbsp;
-END:methods
-</div>
-ENDIF:methods
-
-IF:constants
-<table summary="Constants" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Constants</td></tr>
-</table>
-<table cellpadding="5">
-START:constants
-<tr valign="top"><td>%name%</td><td>=</td><td>%value%</td></tr>
-IF:desc
-<tr><td></td><td></td><td>%desc%</td></tr>
-ENDIF:desc
-END:constants
-</table>
-ENDIF:constants
-
-IF:aliases
-<table summary="Aliases" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">External Aliases</td></tr>
-</table>
-<div class="name-list">
-START:aliases
-%old_name% -> %new_name%<br />
-END:aliases
-</div>
-ENDIF:aliases
-
-IF:attributes
-<table summary="Attributes" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Attributes</td></tr>
-</table>
-<table summary="Attribute details" cellspacing="5">
-START:attributes
-     <tr valign="top">
-       <td class="attr-name">%name%</td>
-IF:rw
-       <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
-ENDIF:rw
-IFNOT:rw
-       <td></td>
-ENDIF:rw
-       <td>%a_desc%</td>
-     </tr>
-END:attributes
-</table>
-ENDIF:attributes
-
-IF:classlist
-<table summary="List of classes" cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Classes and Modules</td></tr>
-</table>
-<div class="classlist">
-%classlist%
-</div>
-ENDIF:classlist
-}
-
-###############################################################################
-
-BODY = HEADER + %{
-<body bgcolor="white">
-!INCLUDE!  <!-- banner header -->
-} +
-CONTEXT_CONTENT + METHOD_LIST +
-%{
-</body>
-</html>
-}
-
-
-###############################################################################
-
-FILE_PAGE = <<_FILE_PAGE_
-<table summary="Information on file" width="100%">
- <tr class="title-row">
- <td><table summary="layout" width="100%"><tr>
-   <td class="big-title-font" colspan="2">%short_name%</td>
-   <td align="right"><table summary="layout" cellspacing="0" cellpadding="2">
-         <tr>
-           <td  class="small-title-font">Path:</td>
-           <td class="small-title-font">%full_path%
-IF:cvsurl
-				&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-           </td>
-         </tr>
-         <tr>
-           <td class="small-title-font">Modified:</td>
-           <td class="small-title-font">%dtm_modified%</td>
-         </tr>
-        </table>
-    </td></tr></table></td>
-  </tr>
-</table>
-_FILE_PAGE_
-
-###################################################################
-
-CLASS_PAGE = %{
-<table summary="Information on class" width="100%" border="0" cellspacing="0">
- <tr class="title-row">
- <td class="big-title-font">
-   <sup><font color="aqua">%classmod%</font></sup> %full_name%
- </td>
- <td align="right">
-   <table summary="layout" cellspacing="0" cellpadding="2">
-     <tr valign="top">
-      <td class="small-title-font">In:</td>
-      <td class="small-title-font">
-START:infiles
-IF:full_path_url
-        <a href="%full_path_url%" class="aqua">
-ENDIF:full_path_url
-%full_path%
-IF:full_path_url
-         </a>
-ENDIF:full_path_url
-IF:cvsurl
-         &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-ENDIF:cvsurl
-<br />
-END:infiles
-      </td>
-     </tr>
-IF:parent
-     <tr>
-      <td class="small-title-font">Parent:</td>
-      <td class="small-title-font">
-IF:par_url
-        <a href="%par_url%" class="aqua">
-ENDIF:par_url
-%parent%
-IF:par_url
-         </a>
-ENDIF:par_url
-      </td>
-     </tr>
-ENDIF:parent
-   </table>
-  </td>
-  </tr>
-</table>
-}
-
-=begin
-=end
-
-########################## Source code ##########################
-
-SRC_PAGE = %{
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<title>%title%</title>
-<link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
-</head>
-<body bgcolor="white">
-<pre>%code%</pre>
-</body>
-</html>
-}
-
-########################## Index ################################
-
-FR_INDEX_BODY = %{
-!INCLUDE!
-}
-
-FILE_INDEX = %{
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<title>%list_title%</title>
-<style type="text/css">
-<!--
-  body {
-background-color: #ddddff;
-     font-family: #{FONTS}; 
-       font-size: 11px; 
-      font-style: normal;
-     line-height: 14px; 
-           color: #000040;
-  }
-div.banner {
-  background: #0000aa;
-  color:      white;
-  padding: 1;
-  margin: 0;
-  font-size: 90%;
-  font-weight: bold;
-  line-height: 1.1;
-  text-align: center;
-  width: 100%;
-}
-
-A.xx { color: white; font-weight: bold; }
--->
-</style>
-<base target="docwin">
-</head>
-<body>
-<div class="banner"><a href="%index_url%" class="xx">%list_title%</a></div>
-START:entries
-<a href="%href%">%name%</a><br />
-END:entries
-</body></html>
-}
-
-CLASS_INDEX = FILE_INDEX
-METHOD_INDEX = FILE_INDEX
-
-INDEX = %{
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<title>%title%</title></head>
-
-<frameset rows="20%, 80%">
-    <frameset cols="25%,35%,45%">
-        <frame src="fr_file_index.html"   title="Files" name="Files">
-        <frame src="fr_class_index.html"  name="Classes">
-        <frame src="fr_method_index.html" name="Methods">
-    </frameset>
-    <frame  src="%initial_page%" name="docwin">
-    <noframes>
-          <body bgcolor="white">
-            Sorry, RDoc currently only generates HTML using frames.
-          </body>
-    </noframes>
-</frameset>
-
-</html>
-}
-
-######################################################################
-#
-# The following is used for the -1 option
-#
-
-CONTENTS_XML = %{
-IF:description
-%description%
-ENDIF:description
-
-IF:requires
-<h4>Requires:</h4>
-<ul>
-START:requires
-IF:aref
-<li><a href="%aref%">%name%</a></li>
-ENDIF:aref
-IFNOT:aref
-<li>%name%</li>
-ENDIF:aref 
-END:requires
-</ul>
-ENDIF:requires
-
-IF:attributes
-<h4>Attributes</h4>
-<table>
-START:attributes
-<tr><td>%name%</td><td>%rw%</td><td>%a_desc%</td></tr>
-END:attributes
-</table>
-ENDIF:attributes
-
-IF:includes
-<h4>Includes</h4>
-<ul>
-START:includes
-IF:aref
-<li><a href="%aref%">%name%</a></li>
-ENDIF:aref
-IFNOT:aref
-<li>%name%</li>
-ENDIF:aref 
-END:includes
-</ul>
-ENDIF:includes
-
-IF:method_list
-<h3>Methods</h3>
-START:method_list
-IF:methods
-START:methods
-<h4>%type% %category% method: <a name="%aref%">%name%%params%</a></h4>
-
-IF:m_desc
-%m_desc%
-ENDIF:m_desc
-
-IF:sourcecode
-<blockquote><pre>
-%sourcecode%
-</pre></blockquote>
-ENDIF:sourcecode
-END:methods
-ENDIF:methods
-END:method_list
-ENDIF:method_list
-}
-
-
-end
-end
-
-require 'rdoc/generators/template/html/one_page_html'
diff --git a/lib/rdoc/generators/template/html/one_page_html.rb b/lib/rdoc/generators/template/html/one_page_html.rb
deleted file mode 100644
index 19441f4725..0000000000
--- a/lib/rdoc/generators/template/html/one_page_html.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-module RDoc
-module Page
-######################################################################
-#
-# The following is used for the -1 option
-#
-
-CONTENTS_XML = %{
-IF:description
-%description%
-ENDIF:description
-
-IF:requires
-<h4>Requires:</h4>
-<ul>
-START:requires
-IF:aref
-<li><a href="%aref%">%name%</a></li>
-ENDIF:aref
-IFNOT:aref
-<li>%name%</li>
-ENDIF:aref 
-END:requires
-</ul>
-ENDIF:requires
-
-IF:attributes
-<h4>Attributes</h4>
-<table>
-START:attributes
-<tr><td>%name%</td><td>%rw%</td><td>%a_desc%</td></tr>
-END:attributes
-</table>
-ENDIF:attributes
-
-IF:includes
-<h4>Includes</h4>
-<ul>
-START:includes
-IF:aref
-<li><a href="%aref%">%name%</a></li>
-ENDIF:aref
-IFNOT:aref
-<li>%name%</li>
-ENDIF:aref 
-END:includes
-</ul>
-ENDIF:includes
-
-IF:method_list
-<h3>Methods</h3>
-START:method_list
-IF:methods
-START:methods
-<h4>%type% %category% method: 
-IF:callseq
-<a name="%aref%">%callseq%</a>
-ENDIF:callseq
-IFNOT:callseq
-<a name="%aref%">%name%%params%</a></h4>
-ENDIF:callseq
-
-IF:m_desc
-%m_desc%
-ENDIF:m_desc
-
-IF:sourcecode
-<blockquote><pre>
-%sourcecode%
-</pre></blockquote>
-ENDIF:sourcecode
-END:methods
-ENDIF:methods
-END:method_list
-ENDIF:method_list
-}
-
-########################################################################
-
-ONE_PAGE = %{
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
-</head>
-<body>
-START:files
-<h2>File: %short_name%</h2>
-<table>
-  <tr><td>Path:</td><td>%full_path%</td></tr>
-  <tr><td>Modified:</td><td>%dtm_modified%</td></tr>
-</table>
-} + CONTENTS_XML + %{
-END:files
-
-IF:classes
-<h2>Classes</h2>
-START:classes
-IF:parent
-<h3>%classmod% %full_name% &lt; HREF:par_url:parent:</h3>
-ENDIF:parent
-IFNOT:parent
-<h3>%classmod% %full_name%</h3>
-ENDIF:parent
-
-IF:infiles
-(in files
-START:infiles
-HREF:full_path_url:full_path:
-END:infiles
-)
-ENDIF:infiles
-} + CONTENTS_XML + %{
-END:classes
-ENDIF:classes
-</body>
-</html>
-}
-
-end
-end
diff --git a/lib/rdoc/generators/template/xml/rdf.rb b/lib/rdoc/generators/template/xml/rdf.rb
deleted file mode 100644
index 1545d81a2f..0000000000
--- a/lib/rdoc/generators/template/xml/rdf.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-module RDoc
-module Page
-
-
-
-CONTENTS_RDF = %{
-IF:description
-    <description rd:parseType="Literal">
-%description%
-    </description>
-ENDIF:description
-
-IF:requires
-START:requires
-         <rd:required-file rd:name="%name%" />
-END:requires
-ENDIF:requires
-
-IF:attributes
-START:attributes
-        <contents>
-        <Attribute rd:name="%name%">
-IF:rw
-          <attribute-rw>%rw%</attribute-rw>
-ENDIF:rw
-          <description rdf:parseType="Literal">%a_desc%</description>
-        </Attribute>
-        </contents>
-END:attributes
-ENDIF:attributes
-
-IF:includes
-      <IncludedModuleList>
-START:includes
-        <included-module rd:name="%name%"  />
-END:includes
-      </IncludedModuleList>
-ENDIF:includes
-
-IF:method_list
-START:method_list
-IF:methods
-START:methods
-	<contents>
-        <Method rd:name="%name%" rd:visibility="%type%"
-                rd:category="%category%" rd:id="%aref%">
-          <parameters>%params%</parameters>
-IF:m_desc
-          <description rdf:parseType="Literal">
-%m_desc%
-          </description>
-ENDIF:m_desc
-IF:sourcecode
-          <source-code-listing rdf:parseType="Literal">
-%sourcecode%
-          </source-code-listing>
-ENDIF:sourcecode
-        </Method>
-       </contents>
-END:methods
-ENDIF:methods
-END:method_list
-ENDIF:method_list
-     <!-- end method list -->
-}
-
-########################################################################
-
-ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://pragprog.com/rdoc/rdoc.rdf#"
-        xmlns:rd="http://pragprog.com/rdoc/rdoc.rdf#">
-
-<!-- RDoc -->
-START:files
-  <rd:File rd:name="%short_name%" rd:id="%href%">
-      <path>%full_path%</path>
-      <dtm-modified>%dtm_modified%</dtm-modified>
-} + CONTENTS_RDF + %{
-  </rd:File>
-END:files
-START:classes
-  <%classmod% rd:name="%full_name%" rd:id="%full_name%">
-    <classmod-info>
-IF:infiles
-      <InFiles>
-START:infiles
-        <infile>
-          <File rd:name="%full_path%"
-IF:full_path_url
-                rdf:about="%full_path_url%"
-ENDIF:full_path_url
-           />
-         </infile>
-END:infiles
-      </InFiles>
-ENDIF:infiles
-IF:parent
-     <superclass>HREF:par_url:parent:</superclass>
-ENDIF:parent
-    </classmod-info>
-} + CONTENTS_RDF + %{
-  </%classmod%>
-END:classes
-<!-- /RDoc -->
-</rdf:RDF>
-}
-
-
-end
-end
-
diff --git a/lib/rdoc/generators/template/xml/xml.rb b/lib/rdoc/generators/template/xml/xml.rb
deleted file mode 100644
index 4a0c8c9ac4..0000000000
--- a/lib/rdoc/generators/template/xml/xml.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-module RDoc
-module Page
-
-
-
-CONTENTS_XML = %{
-IF:description
-    <description>
-%description%
-    </description>
-ENDIF:description
-    <contents>
-IF:requires
-      <required-file-list>
-START:requires
-         <required-file name="%name%"
-IF:aref 
-                        href="%aref%"
-ENDIF:aref
-         />
-END:requires
-      </required-file-list>
-ENDIF:requires
-IF:attributes
-      <attribute-list>
-START:attributes
-        <attribute name="%name%">
-IF:rw
-          <attribute-rw>%rw%</attribute-rw>
-ENDIF:rw
-          <description>%a_desc%</description>
-        </attribute>
-END:attributes
-      </attribute-list>
-ENDIF:attributes
-IF:includes
-      <included-module-list>
-START:includes
-        <included-module name="%name%"
-IF:aref
-                         href="%aref%"
-ENDIF:aref
-        />
-END:includes
-      </included-module-list>
-ENDIF:includes
-IF:method_list
-      <method-list>
-START:method_list
-IF:methods
-START:methods
-        <method name="%name%" type="%type%" category="%category%" id="%aref%">
-          <parameters>%params%</parameters>
-IF:m_desc
-          <description>
-%m_desc%
-          </description>
-ENDIF:m_desc
-IF:sourcecode
-          <source-code-listing>
-%sourcecode%
-          </source-code-listing>
-ENDIF:sourcecode
-        </method>
-END:methods
-ENDIF:methods
-END:method_list
-      </method-list>
-ENDIF:method_list
-     </contents>
-}
-
-########################################################################
-
-ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
-<rdoc>
-<file-list>
-START:files
-  <file name="%short_name%" id="%href%">
-    <file-info>
-      <path>%full_path%</path>
-      <dtm-modified>%dtm_modified%</dtm-modified>
-    </file-info>
-} + CONTENTS_XML + %{
-  </file>
-END:files
-</file-list>
-<class-module-list>
-START:classes
-  <%classmod% name="%full_name%" id="%full_name%">
-    <classmod-info>
-IF:infiles
-      <infiles>      
-START:infiles
-        <infile>HREF:full_path_url:full_path:</infile>
-END:infiles
-      </infiles>
-ENDIF:infiles
-IF:parent
-     <superclass>HREF:par_url:parent:</superclass>
-ENDIF:parent
-    </classmod-info>
-} + CONTENTS_XML + %{
-  </%classmod%>
-END:classes
-</class-module-list>
-</rdoc>
-}
-
-
-end
-end
diff --git a/lib/rdoc/generators/xml_generator.rb b/lib/rdoc/generators/xml_generator.rb
deleted file mode 100644
index 8c1a76d62b..0000000000
--- a/lib/rdoc/generators/xml_generator.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-
-require 'ftools'
-
-require 'rdoc/options'
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_html'
-require 'rdoc/generators/html_generator'
-
-module Generators
-
-  # Generate XML output as one big file
-
-  class XMLGenerator < HTMLGenerator
-
-    # Standard generator factory
-    def XMLGenerator.for(options)
-      XMLGenerator.new(options)
-    end
-
-    
-    def initialize(*args)
-      super
-    end
-
-    ##
-    # Build the initial indices and output objects
-    # based on an array of TopLevel objects containing
-    # the extracted information. 
-
-    def generate(info)
-      @info       = info
-      @files      = []
-      @classes    = []
-      @hyperlinks = {}
-
-      build_indices
-      generate_xml
-    end
-
-
-    ##
-    # Generate:
-    #
-    # * a list of HtmlFile objects for each TopLevel object.
-    # * a list of HtmlClass objects for each first level
-    #   class or module in the TopLevel objects
-    # * a complete list of all hyperlinkable terms (file,
-    #   class, module, and method names)
-
-    def build_indices
-
-      @info.each do |toplevel|
-        @files << HtmlFile.new(toplevel, @options, FILE_DIR)
-      end
-
-      RDoc::TopLevel.all_classes_and_modules.each do |cls|
-        build_class_list(cls, @files[0], CLASS_DIR)
-      end
-    end
-
-    def build_class_list(from, html_file, class_dir)
-      @classes << HtmlClass.new(from, html_file, class_dir, @options)
-      from.each_classmodule do |mod|
-        build_class_list(mod, html_file, class_dir)
-      end
-    end
-
-    ##
-    # Generate all the HTML. For the one-file case, we generate
-    # all the information in to one big hash
-    #
-    def generate_xml
-      values = { 
-        'charset' => @options.charset,
-        'files'   => gen_into(@files),
-        'classes' => gen_into(@classes)
-      }
-      
-      # this method is defined in the template file
-      write_extra_pages if defined? write_extra_pages
-
-      template = TemplatePage.new(RDoc::Page::ONE_PAGE)
-
-      if @options.op_name
-        opfile = File.open(@options.op_name, "w")
-      else
-        opfile = $stdout
-      end
-      template.write_html_on(opfile, values)
-    end
-
-    def gen_into(list)
-      res = []
-      list.each do |item|
-        res << item.value_hash
-      end
-      res
-    end
-
-    def gen_file_index
-      gen_an_index(@files, 'Files')
-    end
-
-    def gen_class_index
-      gen_an_index(@classes, 'Classes')
-    end
-
-    def gen_method_index
-      gen_an_index(HtmlMethod.all_methods, 'Methods')
-    end
-
-    
-    def gen_an_index(collection, title)
-      res = []
-      collection.sort.each do |f|
-        if f.document_self
-          res << { "href" => f.path, "name" => f.index_name }
-        end
-      end
-
-      return {
-        "entries" => res,
-        'list_title' => title,
-        'index_url'  => main_url,
-      }
-    end
-
-  end
-
-end
diff --git a/lib/rdoc/ghost_method.rb b/lib/rdoc/ghost_method.rb
new file mode 100644
index 0000000000..192b46f51f
--- /dev/null
+++ b/lib/rdoc/ghost_method.rb
@@ -0,0 +1,8 @@
+require 'rdoc/any_method'
+
+##
+# GhostMethod represents a method referenced only by a comment
+
+class RDoc::GhostMethod < RDoc::AnyMethod
+end
+
diff --git a/lib/rdoc/include.rb b/lib/rdoc/include.rb
new file mode 100644
index 0000000000..11a9bdc7ef
--- /dev/null
+++ b/lib/rdoc/include.rb
@@ -0,0 +1,61 @@
+require 'rdoc/code_object'
+
+##
+# A Module include in a class with \#include
+
+class RDoc::Include < RDoc::CodeObject
+
+  ##
+  # Name of included module
+
+  attr_accessor :name
+
+  ##
+  # Creates a new Include for +name+ with +comment+
+
+  def initialize(name, comment)
+    super()
+    @name = name
+    self.comment = comment
+  end
+
+  ##
+  # Includes are sorted by name
+
+  def <=> other
+    return unless self.class === other
+
+    name <=> other.name
+  end
+
+  def == other # :nodoc:
+    self.class == other.class and
+      self.name == other.name
+  end
+
+  ##
+  # Full name based on #module
+
+  def full_name
+    m = self.module
+    RDoc::ClassModule === m ? m.full_name : @name
+  end
+
+  def inspect # :nodoc:
+    "#<%s:0x%x %s.include %s>" % [
+      self.class,
+      object_id,
+      parent_name, @name,
+    ]
+  end
+
+  ##
+  # Attempts to locate the included module object.  Returns the name if not
+  # known.
+
+  def module
+    RDoc::TopLevel.find_module_named(@name) || @name
+  end
+
+end
+
diff --git a/lib/rdoc/known_classes.rb b/lib/rdoc/known_classes.rb
new file mode 100644
index 0000000000..720a35f497
--- /dev/null
+++ b/lib/rdoc/known_classes.rb
@@ -0,0 +1,69 @@
+module RDoc
+
+  ##
+  # Ruby's built-in classes, modules and exceptions
+
+  KNOWN_CLASSES = {
+    "rb_cArray"            => "Array",
+    "rb_cBasicObject"      => "BasicObject",
+    "rb_cBignum"           => "Bignum",
+    "rb_cClass"            => "Class",
+    "rb_cData"             => "Data",
+    "rb_cDir"              => "Dir",
+    "rb_cFalseClass"       => "FalseClass",
+    "rb_cFile"             => "File",
+    "rb_cFixnum"           => "Fixnum",
+    "rb_cFloat"            => "Float",
+    "rb_cHash"             => "Hash",
+    "rb_cIO"               => "IO",
+    "rb_cInteger"          => "Integer",
+    "rb_cModule"           => "Module",
+    "rb_cNilClass"         => "NilClass",
+    "rb_cNumeric"          => "Numeric",
+    "rb_cObject"           => "Object",
+    "rb_cProc"             => "Proc",
+    "rb_cRange"            => "Range",
+    "rb_cRegexp"           => "Regexp",
+    "rb_cRubyVM"           => "RubyVM",
+    "rb_cString"           => "String",
+    "rb_cStruct"           => "Struct",
+    "rb_cSymbol"           => "Symbol",
+    "rb_cThread"           => "Thread",
+    "rb_cTime"             => "Time",
+    "rb_cTrueClass"        => "TrueClass",
+
+    "rb_eArgError"         => "ArgError",
+    "rb_eEOFError"         => "EOFError",
+    "rb_eException"        => "Exception",
+    "rb_eFatal"            => "Fatal",
+    "rb_eFloatDomainError" => "FloatDomainError",
+    "rb_eIOError"          => "IOError",
+    "rb_eIndexError"       => "IndexError",
+    "rb_eInterrupt"        => "Interrupt",
+    "rb_eLoadError"        => "LoadError",
+    "rb_eNameError"        => "NameError",
+    "rb_eNoMemError"       => "NoMemError",
+    "rb_eNotImpError"      => "NotImpError",
+    "rb_eRangeError"       => "RangeError",
+    "rb_eRuntimeError"     => "RuntimeError",
+    "rb_eScriptError"      => "ScriptError",
+    "rb_eSecurityError"    => "SecurityError",
+    "rb_eSignal"           => "Signal",
+    "rb_eStandardError"    => "StandardError",
+    "rb_eSyntaxError"      => "SyntaxError",
+    "rb_eSystemCallError"  => "SystemCallError",
+    "rb_eSystemExit"       => "SystemExit",
+    "rb_eTypeError"        => "TypeError",
+    "rb_eZeroDivError"     => "ZeroDivError",
+
+    "rb_mComparable"       => "Comparable",
+    "rb_mEnumerable"       => "Enumerable",
+    "rb_mErrno"            => "Errno",
+    "rb_mFileTest"         => "FileTest",
+    "rb_mGC"               => "GC",
+    "rb_mKernel"           => "Kernel",
+    "rb_mMath"             => "Math",
+    "rb_mProcess"          => "Process"
+  }
+
+end
diff --git a/lib/rdoc/markup.rb b/lib/rdoc/markup.rb
new file mode 100644
index 0000000000..32c8179e0d
--- /dev/null
+++ b/lib/rdoc/markup.rb
@@ -0,0 +1,124 @@
+require 'rdoc'
+
+##
+# RDoc::Markup parses plain text documents and attempts to decompose them into
+# their constituent parts.  Some of these parts are high-level: paragraphs,
+# chunks of verbatim text, list entries and the like.  Other parts happen at
+# the character level: a piece of bold text, a word in code font.  This markup
+# is similar in spirit to that used on WikiWiki webs, where folks create web
+# pages using a simple set of formatting rules.
+#
+# RDoc::Markup itself does no output formatting: this is left to a different
+# set of classes.
+#
+# RDoc::Markup is extendable at runtime: you can add \new markup elements to
+# be recognised in the documents that RDoc::Markup parses.
+#
+# RDoc::Markup is intended to be the basis for a family of tools which share
+# the common requirement that simple, plain-text should be rendered in a
+# variety of different output formats and media.  It is envisaged that
+# RDoc::Markup could be the basis for formatting RDoc style comment blocks,
+# Wiki entries, and online FAQs.
+#
+# == Synopsis
+#
+# This code converts +input_string+ to HTML.  The conversion takes place in
+# the +convert+ method, so you can use the same RDoc::Markup converter to
+# convert multiple input strings.
+#
+#   require 'rdoc/markup/to_html'
+#
+#   h = RDoc::Markup::ToHtml.new
+#
+#   puts h.convert(input_string)
+#
+# You can extend the RDoc::Markup parser to recognise new markup
+# sequences, and to add special processing for text that matches a
+# regular expression.  Here we make WikiWords significant to the parser,
+# and also make the sequences {word} and \<no>text...</no> signify
+# strike-through text.  When then subclass the HTML output class to deal
+# with these:
+#
+#   require 'rdoc/markup'
+#   require 'rdoc/markup/to_html'
+#
+#   class WikiHtml < RDoc::Markup::ToHtml
+#     def handle_special_WIKIWORD(special)
+#       "<font color=red>" + special.text + "</font>"
+#     end
+#   end
+#
+#   m = RDoc::Markup.new
+#   m.add_word_pair("{", "}", :STRIKE)
+#   m.add_html("no", :STRIKE)
+#
+#   m.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+#
+#   wh = WikiHtml.new
+#   wh.add_tag(:STRIKE, "<strike>", "</strike>")
+#
+#   puts "<body>#{wh.convert ARGF.read}</body>"
+#
+#--
+# Author::   Dave Thomas,  dave@pragmaticprogrammer.com
+# License::  Ruby license
+
+class RDoc::Markup
+
+  attr_reader :attribute_manager
+
+  ##
+  # Take a block of text and use various heuristics to determine it's
+  # structure (paragraphs, lists, and so on).  Invoke an event handler as we
+  # identify significant chunks.
+
+  def initialize
+    @attribute_manager = RDoc::Markup::AttributeManager.new
+    @output = nil
+  end
+
+  ##
+  # Add to the sequences used to add formatting to an individual word (such
+  # as *bold*).  Matching entries will generate attributes that the output
+  # formatters can recognize by their +name+.
+
+  def add_word_pair(start, stop, name)
+    @attribute_manager.add_word_pair(start, stop, name)
+  end
+
+  ##
+  # Add to the sequences recognized as general markup.
+
+  def add_html(tag, name)
+    @attribute_manager.add_html(tag, name)
+  end
+
+  ##
+  # Add to other inline sequences.  For example, we could add WikiWords using
+  # something like:
+  #
+  #    parser.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+  #
+  # Each wiki word will be presented to the output formatter via the
+  # accept_special method.
+
+  def add_special(pattern, name)
+    @attribute_manager.add_special(pattern, name)
+  end
+
+  ##
+  # We take +text+, parse it then invoke the output +formatter+ using a
+  # Visitor to render the result.
+
+  def convert text, formatter
+    document = RDoc::Markup::Parser.parse text
+
+    document.accept formatter
+  end
+
+end
+
+require 'rdoc/markup/parser'
+require 'rdoc/markup/attribute_manager'
+require 'rdoc/markup/inline'
+
diff --git a/lib/rdoc/markup/.document b/lib/rdoc/markup/.document
deleted file mode 100644
index 3cf4f21bd7..0000000000
--- a/lib/rdoc/markup/.document
+++ /dev/null
@@ -1,2 +0,0 @@
-simple_markup
-simple_markup.rb
diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb
new file mode 100644
index 0000000000..5b9e070efb
--- /dev/null
+++ b/lib/rdoc/markup/attribute_manager.rb
@@ -0,0 +1,318 @@
+##
+# Manages changes of attributes in a block of text
+
+class RDoc::Markup::AttributeManager
+
+  ##
+  # The NUL character
+
+  NULL = "\000".freeze
+
+  #--
+  # We work by substituting non-printing characters in to the text. For now
+  # I'm assuming that I can substitute a character in the range 0..8 for a 7
+  # bit character without damaging the encoded string, but this might be
+  # optimistic
+  #++
+
+  A_PROTECT  = 004 # :nodoc:
+
+  PROTECT_ATTR  = A_PROTECT.chr # :nodoc:
+
+  ##
+  # This maps delimiters that occur around words (such as *bold* or +tt+)
+  # where the start and end delimiters and the same. This lets us optimize
+  # the regexp
+
+  attr_reader :matching_word_pairs
+
+  ##
+  # And this is used when the delimiters aren't the same. In this case the
+  # hash maps a pattern to the attribute character
+
+  attr_reader :word_pair_map
+
+  ##
+  # This maps HTML tags to the corresponding attribute char
+
+  attr_reader :html_tags
+
+  ##
+  # A \ in front of a character that would normally be processed turns off
+  # processing. We do this by turning \< into <#{PROTECT}
+
+  attr_reader :protectable
+
+  ##
+  # And this maps _special_ sequences to a name. A special sequence is
+  # something like a WikiWord
+
+  attr_reader :special
+
+  ##
+  # Creates a new attribute manager that understands bold, emphasized and
+  # teletype text.
+
+  def initialize
+    @html_tags = {}
+    @matching_word_pairs = {}
+    @protectable = %w[<\\]
+    @special = {}
+    @word_pair_map = {}
+
+    add_word_pair "*", "*", :BOLD
+    add_word_pair "_", "_", :EM
+    add_word_pair "+", "+", :TT
+
+    add_html "em", :EM
+    add_html "i",  :EM
+    add_html "b",  :BOLD
+    add_html "tt",   :TT
+    add_html "code", :TT
+  end
+
+
+  ##
+  # Return an attribute object with the given turn_on and turn_off bits set
+
+  def attribute(turn_on, turn_off)
+    RDoc::Markup::AttrChanger.new turn_on, turn_off
+  end
+
+  def change_attribute(current, new)
+    diff = current ^ new
+    attribute(new & diff, current & diff)
+  end
+
+  def changed_attribute_by_name(current_set, new_set)
+    current = new = 0
+    current_set.each do |name|
+      current |= RDoc::Markup::Attribute.bitmap_for(name)
+    end
+
+    new_set.each do |name|
+      new |= RDoc::Markup::Attribute.bitmap_for(name)
+    end
+
+    change_attribute(current, new)
+  end
+
+  def copy_string(start_pos, end_pos)
+    res = @str[start_pos...end_pos]
+    res.gsub!(/\000/, '')
+    res
+  end
+
+  ##
+  # Map attributes like <b>text</b>to the sequence
+  # \001\002<char>\001\003<char>, where <char> is a per-attribute specific
+  # character
+
+  def convert_attrs(str, attrs)
+    # first do matching ones
+    tags = @matching_word_pairs.keys.join("")
+
+    re = /(^|\W)([#{tags}])([#:\\]?[\w.\/-]+?\S?)\2(\W|$)/
+
+    1 while str.gsub!(re) do
+      attr = @matching_word_pairs[$2]
+      attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr)
+      $1 + NULL * $2.length + $3 + NULL * $2.length + $4
+    end
+
+    # then non-matching
+    unless @word_pair_map.empty? then
+      @word_pair_map.each do |regexp, attr|
+        str.gsub!(regexp) {
+          attrs.set_attrs($`.length + $1.length, $2.length, attr)
+          NULL * $1.length + $2 + NULL * $3.length
+        }
+      end
+    end
+  end
+
+  ##
+  # Converts HTML tags to RDoc attributes
+
+  def convert_html(str, attrs)
+    tags = @html_tags.keys.join '|'
+
+    1 while str.gsub!(/<(#{tags})>(.*?)<\/\1>/i) {
+      attr = @html_tags[$1.downcase]
+      html_length = $1.length + 2
+      seq = NULL * html_length
+      attrs.set_attrs($`.length + html_length, $2.length, attr)
+      seq + $2 + seq + NULL
+    }
+  end
+
+  ##
+  # Converts special sequences to RDoc attributes
+
+  def convert_specials(str, attrs)
+    unless @special.empty?
+      @special.each do |regexp, attr|
+        str.scan(regexp) do
+          attrs.set_attrs($`.length, $&.length,
+                          attr | RDoc::Markup::Attribute::SPECIAL)
+        end
+      end
+    end
+  end
+
+  ##
+  # Escapes special sequences of text to prevent conversion to RDoc
+
+  def mask_protected_sequences
+    @str.gsub!(/\\([#{Regexp.escape @protectable.join('')}])/,
+               "\\1#{PROTECT_ATTR}")
+  end
+
+  ##
+  # Unescapes special sequences of text
+
+  def unmask_protected_sequences
+    @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
+  end
+
+  ##
+  # Adds a markup class with +name+ for words wrapped in the +start+ and
+  # +stop+ character.  To make words wrapped with "*" bold:
+  #
+  #   am.add_word_pair '*', '*', :BOLD
+
+  def add_word_pair(start, stop, name)
+    raise ArgumentError, "Word flags may not start with '<'" if
+      start[0,1] == '<'
+
+    bitmap = RDoc::Markup::Attribute.bitmap_for name
+
+    if start == stop then
+      @matching_word_pairs[start] = bitmap
+    else
+      pattern = /(#{Regexp.escape start})(\S+)(#{Regexp.escape stop})/
+      @word_pair_map[pattern] = bitmap
+    end
+
+    @protectable << start[0,1]
+    @protectable.uniq!
+  end
+
+  ##
+  # Adds a markup class with +name+ for words surrounded by HTML tag +tag+.
+  # To process emphasis tags:
+  #
+  #   am.add_html 'em', :EM
+
+  def add_html(tag, name)
+    @html_tags[tag.downcase] = RDoc::Markup::Attribute.bitmap_for name
+  end
+
+  ##
+  # Adds a special handler for +pattern+ with +name+.  A simple URL handler
+  # would be:
+  #
+  #   @am.add_special(/((https?:)\S+\w)/, :HYPERLINK)
+
+  def add_special(pattern, name)
+    @special[pattern] = RDoc::Markup::Attribute.bitmap_for name
+  end
+
+  ##
+  # Processes +str+ converting attributes, HTML and specials
+
+  def flow(str)
+    @str = str
+
+    mask_protected_sequences
+
+    @attrs = RDoc::Markup::AttrSpan.new @str.length
+
+    convert_attrs    @str, @attrs
+    convert_html     @str, @attrs
+    convert_specials @str, @attrs
+
+    unmask_protected_sequences
+
+    split_into_flow
+  end
+
+  ##
+  # Debug method that prints a string along with its attributes
+
+  def display_attributes
+    puts
+    puts @str.tr(NULL, "!")
+    bit = 1
+    16.times do |bno|
+      line = ""
+      @str.length.times do |i|
+        if (@attrs[i] & bit) == 0
+          line << " "
+        else
+          if bno.zero?
+            line << "S"
+          else
+            line << ("%d" % (bno+1))
+          end
+        end
+      end
+      puts(line) unless line =~ /^ *$/
+      bit <<= 1
+    end
+  end
+
+  def split_into_flow
+    res = []
+    current_attr = 0
+    str = ""
+
+    str_len = @str.length
+
+    # skip leading invisible text
+    i = 0
+    i += 1 while i < str_len and @str[i].chr == "\0"
+    start_pos = i
+
+    # then scan the string, chunking it on attribute changes
+    while i < str_len
+      new_attr = @attrs[i]
+      if new_attr != current_attr
+        if i > start_pos
+          res << copy_string(start_pos, i)
+          start_pos = i
+        end
+
+        res << change_attribute(current_attr, new_attr)
+        current_attr = new_attr
+
+        if (current_attr & RDoc::Markup::Attribute::SPECIAL) != 0 then
+          i += 1 while
+            i < str_len and (@attrs[i] & RDoc::Markup::Attribute::SPECIAL) != 0
+
+          res << RDoc::Markup::Special.new(current_attr,
+                                           copy_string(start_pos, i))
+          start_pos = i
+          next
+        end
+      end
+
+      # move on, skipping any invisible characters
+      begin
+        i += 1
+      end while i < str_len and @str[i].chr == "\0"
+    end
+
+    # tidy up trailing text
+    if start_pos < str_len
+      res << copy_string(start_pos, str_len)
+    end
+
+    # and reset to all attributes off
+    res << change_attribute(current_attr, 0) if current_attr != 0
+
+    res
+  end
+
+end
+
diff --git a/lib/rdoc/markup/blank_line.rb b/lib/rdoc/markup/blank_line.rb
new file mode 100644
index 0000000000..a8c07c8e57
--- /dev/null
+++ b/lib/rdoc/markup/blank_line.rb
@@ -0,0 +1,19 @@
+##
+# An empty line
+
+class RDoc::Markup::BlankLine
+
+  def == other # :nodoc:
+    self.class == other.class
+  end
+
+  def accept visitor
+    visitor.accept_blank_line self
+  end
+
+  def pretty_print q # :nodoc:
+    q.text 'blankline'
+  end
+
+end
+
diff --git a/lib/rdoc/markup/document.rb b/lib/rdoc/markup/document.rb
new file mode 100644
index 0000000000..7963e9afe1
--- /dev/null
+++ b/lib/rdoc/markup/document.rb
@@ -0,0 +1,72 @@
+##
+# A Document containing lists, headings, paragraphs, etc.
+
+class RDoc::Markup::Document
+
+  ##
+  # The parts of the Document
+
+  attr_reader :parts
+
+  ##
+  # Creates a new Document with +parts+
+
+  def initialize *parts
+    @parts = []
+    @parts.push(*parts)
+  end
+
+  ##
+  # Appends +part+ to the document
+
+  def << part
+    case part
+    when RDoc::Markup::Document then
+      unless part.empty? then
+        parts.push(*part.parts)
+        parts << RDoc::Markup::BlankLine.new
+      end
+    when String then
+      raise ArgumentError,
+            "expected RDoc::Markup::Document and friends, got String" unless
+        part.empty?
+    else
+      parts << part
+    end
+  end
+
+  def == other # :nodoc:
+    self.class == other.class and @parts == other.parts
+  end
+
+  def accept visitor
+    visitor.start_accepting
+
+    @parts.each do |item|
+      item.accept visitor
+    end
+
+    visitor.end_accepting
+  end
+
+  def empty?
+    @parts.empty?
+  end
+
+  def pretty_print q # :nodoc:
+    q.group 2, '[doc: ', ']' do
+      q.seplist @parts do |part|
+        q.pp part
+      end
+    end
+  end
+
+  ##
+  # Appends +parts+ to the document
+
+  def push *parts
+    self.parts.push(*parts)
+  end
+
+end
+
diff --git a/lib/rdoc/markup/formatter.rb b/lib/rdoc/markup/formatter.rb
new file mode 100644
index 0000000000..993e523f0c
--- /dev/null
+++ b/lib/rdoc/markup/formatter.rb
@@ -0,0 +1,143 @@
+require 'rdoc/markup'
+
+##
+# Base class for RDoc markup formatters
+#
+# Formatters use a visitor pattern to convert content into output.
+
+class RDoc::Markup::Formatter
+
+  InlineTag = Struct.new(:bit, :on, :off)
+
+  ##
+  # Creates a new Formatter
+
+  def initialize
+    @markup = RDoc::Markup.new
+    @am = @markup.attribute_manager
+    @attr_tags = []
+
+    @in_tt = 0
+    @tt_bit = RDoc::Markup::Attribute.bitmap_for :TT
+  end
+
+  ##
+  # Add a new set of tags for an attribute. We allow separate start and end
+  # tags for flexibility
+
+  def add_tag(name, start, stop)
+    attr = RDoc::Markup::Attribute.bitmap_for name
+    @attr_tags << InlineTag.new(attr, start, stop)
+  end
+
+  ##
+  # Allows +tag+ to be decorated with additional information.
+
+  def annotate(tag)
+    tag
+  end
+
+  ##
+  # Marks up +content+
+
+  def convert(content)
+    @markup.convert content, self
+  end
+
+  ##
+  # Converts flow items +flow+
+
+  def convert_flow(flow)
+    res = []
+
+    flow.each do |item|
+      case item
+      when String then
+        res << convert_string(item)
+      when RDoc::Markup::AttrChanger then
+        off_tags res, item
+        on_tags res, item
+      when RDoc::Markup::Special then
+        res << convert_special(item)
+      else
+        raise "Unknown flow element: #{item.inspect}"
+      end
+    end
+
+    res.join
+  end
+
+  ##
+  # Converts added specials.  See RDoc::Markup#add_special
+
+  def convert_special(special)
+    handled = false
+
+    RDoc::Markup::Attribute.each_name_of special.type do |name|
+      method_name = "handle_special_#{name}"
+
+      if respond_to? method_name then
+        special.text = send method_name, special
+        handled = true
+      end
+    end
+
+    raise "Unhandled special: #{special}" unless handled
+
+    special.text
+  end
+
+  ##
+  # Converts a string to be fancier if desired
+
+  def convert_string string
+    string
+  end
+
+  ##
+  # Are we currently inside tt tags?
+
+  def in_tt?
+    @in_tt > 0
+  end
+
+  def on_tags res, item
+    attr_mask = item.turn_on
+    return if attr_mask.zero?
+
+    @attr_tags.each do |tag|
+      if attr_mask & tag.bit != 0 then
+        res << annotate(tag.on)
+        @in_tt += 1 if tt? tag
+      end
+    end
+  end
+
+  def off_tags res, item
+    attr_mask = item.turn_off
+    return if attr_mask.zero?
+
+    @attr_tags.reverse_each do |tag|
+      if attr_mask & tag.bit != 0 then
+        @in_tt -= 1 if tt? tag
+        res << annotate(tag.off)
+      end
+    end
+  end
+
+  ##
+  # Is +tag+ a tt tag?
+
+  def tt? tag
+    tag.bit == @tt_bit
+  end
+
+end
+
+class RDoc::Markup
+  autoload :ToAnsi,         'rdoc/markup/to_ansi'
+  autoload :ToBs,           'rdoc/markup/to_bs'
+  autoload :ToHtml,         'rdoc/markup/to_html'
+  autoload :ToHtmlCrossref, 'rdoc/markup/to_html_crossref'
+  autoload :ToRdoc,         'rdoc/markup/to_rdoc'
+end
diff --git a/lib/rdoc/markup/formatter_test_case.rb b/lib/rdoc/markup/formatter_test_case.rb
new file mode 100644
index 0000000000..26c8d63332
--- /dev/null
+++ b/lib/rdoc/markup/formatter_test_case.rb
@@ -0,0 +1,353 @@
+require 'minitest/unit'
+require 'rdoc/markup/formatter'
+
+##
+# Test case for creating new RDoc::Markup formatters.  See
+# test/test_rdoc_markup_to_*.rb for examples.
+
+class RDoc::Markup::FormatterTestCase < MiniTest::Unit::TestCase
+
+  def setup
+    super
+
+    @m = RDoc::Markup.new
+    @am = RDoc::Markup::AttributeManager.new
+    @RM = RDoc::Markup
+
+    @bullet_list = @RM::List.new(:BULLET,
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
+
+    @label_list = @RM::List.new(:LABEL,
+      @RM::ListItem.new('cat', @RM::Paragraph.new('cats are cool')),
+      @RM::ListItem.new('dog', @RM::Paragraph.new('dogs are cool too')))
+
+    @lalpha_list = @RM::List.new(:LALPHA,
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
+
+    @note_list = @RM::List.new(:NOTE,
+      @RM::ListItem.new('cat', @RM::Paragraph.new('cats are cool')),
+      @RM::ListItem.new('dog', @RM::Paragraph.new('dogs are cool too')))
+
+    @number_list = @RM::List.new(:NUMBER,
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
+
+    @ualpha_list = @RM::List.new(:UALPHA,
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
+      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
+  end
+
+  def self.add_visitor_tests
+    self.class_eval do
+      def test_start_accepting
+        @to.start_accepting
+
+        start_accepting
+      end
+
+      def test_end_accepting
+        @to.start_accepting
+        @to.res << 'hi'
+
+        end_accepting
+      end
+
+      def test_accept_blank_line
+        @to.start_accepting
+
+        @to.accept_blank_line @RM::BlankLine.new
+
+        accept_blank_line
+      end
+
+      def test_accept_heading
+        @to.start_accepting
+
+        @to.accept_heading @RM::Heading.new(5, 'Hello')
+
+        accept_heading
+      end
+
+      def test_accept_paragraph
+        @to.start_accepting
+
+        @to.accept_paragraph @RM::Paragraph.new('hi')
+
+        accept_paragraph
+      end
+
+      def test_accept_verbatim
+        @to.start_accepting
+
+        @to.accept_verbatim @RM::Verbatim.new('  ', 'hi', "\n",
+                                              '  ', 'world', "\n")
+
+        accept_verbatim
+      end
+
+      def test_accept_raw
+        @to.start_accepting
+
+        @to.accept_raw @RM::Raw.new("<table>",
+                                    "<tr><th>Name<th>Count",
+                                    "<tr><td>a<td>1",
+                                    "<tr><td>b<td>2",
+                                    "</table>")
+
+        accept_raw
+      end
+
+      def test_accept_rule
+        @to.start_accepting
+
+        @to.accept_rule @RM::Rule.new(4)
+
+        accept_rule
+      end
+
+      def test_accept_list_item_start_bullet
+        @to.start_accepting
+
+        @to.accept_list_start @bullet_list
+
+        @to.accept_list_item_start @bullet_list.items.first
+
+        accept_list_item_start_bullet
+      end
+
+      def test_accept_list_item_start_label
+        @to.start_accepting
+
+        @to.accept_list_start @label_list
+
+        @to.accept_list_item_start @label_list.items.first
+
+        accept_list_item_start_label
+      end
+
+      def test_accept_list_item_start_lalpha
+        @to.start_accepting
+
+        @to.accept_list_start @lalpha_list
+
+        @to.accept_list_item_start @lalpha_list.items.first
+
+        accept_list_item_start_lalpha
+      end
+
+      def test_accept_list_item_start_note
+        @to.start_accepting
+
+        @to.accept_list_start @note_list
+
+        @to.accept_list_item_start @note_list.items.first
+
+        accept_list_item_start_note
+      end
+
+      def test_accept_list_item_start_number
+        @to.start_accepting
+
+        @to.accept_list_start @number_list
+
+        @to.accept_list_item_start @number_list.items.first
+
+        accept_list_item_start_number
+      end
+
+      def test_accept_list_item_start_ualpha
+        @to.start_accepting
+
+        @to.accept_list_start @ualpha_list
+
+        @to.accept_list_item_start @ualpha_list.items.first
+
+        accept_list_item_start_ualpha
+      end
+
+      def test_accept_list_item_end_bullet
+        @to.start_accepting
+
+        @to.accept_list_start @bullet_list
+
+        @to.accept_list_item_start @bullet_list.items.first
+
+        @to.accept_list_item_end @bullet_list.items.first
+
+        accept_list_item_end_bullet
+      end
+
+      def test_accept_list_item_end_label
+        @to.start_accepting
+
+        @to.accept_list_start @label_list
+
+        @to.accept_list_item_start @label_list.items.first
+
+        @to.accept_list_item_end @label_list.items.first
+
+        accept_list_item_end_label
+      end
+
+      def test_accept_list_item_end_lalpha
+        @to.start_accepting
+
+        @to.accept_list_start @lalpha_list
+
+        @to.accept_list_item_start @lalpha_list.items.first
+
+        @to.accept_list_item_end @lalpha_list.items.first
+
+        accept_list_item_end_lalpha
+      end
+
+      def test_accept_list_item_end_note
+        @to.start_accepting
+
+        @to.accept_list_start @note_list
+
+        @to.accept_list_item_start @note_list.items.first
+
+        @to.accept_list_item_end @note_list.items.first
+
+        accept_list_item_end_note
+      end
+
+      def test_accept_list_item_end_number
+        @to.start_accepting
+
+        @to.accept_list_start @number_list
+
+        @to.accept_list_item_start @number_list.items.first
+
+        @to.accept_list_item_end @number_list.items.first
+
+        accept_list_item_end_number
+      end
+
+      def test_accept_list_item_end_ualpha
+        @to.start_accepting
+
+        @to.accept_list_start @ualpha_list
+
+        @to.accept_list_item_start @ualpha_list.items.first
+
+        @to.accept_list_item_end @ualpha_list.items.first
+
+        accept_list_item_end_ualpha
+      end
+
+      def test_accept_list_start_bullet
+        @to.start_accepting
+
+        @to.accept_list_start @bullet_list
+
+        accept_list_start_bullet
+      end
+
+      def test_accept_list_start_label
+        @to.start_accepting
+
+        @to.accept_list_start @label_list
+
+        accept_list_start_label
+      end
+
+      def test_accept_list_start_lalpha
+        @to.start_accepting
+
+        @to.accept_list_start @lalpha_list
+
+        accept_list_start_lalpha
+      end
+
+      def test_accept_list_start_note
+        @to.start_accepting
+
+        @to.accept_list_start @note_list
+
+        accept_list_start_note
+      end
+
+      def test_accept_list_start_number
+        @to.start_accepting
+
+        @to.accept_list_start @number_list
+
+        accept_list_start_number
+      end
+
+      def test_accept_list_start_ualpha
+        @to.start_accepting
+
+        @to.accept_list_start @ualpha_list
+
+        accept_list_start_ualpha
+      end
+
+      def test_accept_list_end_bullet
+        @to.start_accepting
+
+        @to.accept_list_start @bullet_list
+
+        @to.accept_list_end @bullet_list
+
+        accept_list_end_bullet
+      end
+
+      def test_accept_list_end_label
+        @to.start_accepting
+
+        @to.accept_list_start @label_list
+
+        @to.accept_list_end @label_list
+
+        accept_list_end_label
+      end
+
+      def test_accept_list_end_lalpha
+        @to.start_accepting
+
+        @to.accept_list_start @lalpha_list
+
+        @to.accept_list_end @lalpha_list
+
+        accept_list_end_lalpha
+      end
+
+      def test_accept_list_end_number
+        @to.start_accepting
+
+        @to.accept_list_start @number_list
+
+        @to.accept_list_end @number_list
+
+        accept_list_end_number
+      end
+
+      def test_accept_list_end_note
+        @to.start_accepting
+
+        @to.accept_list_start @note_list
+
+        @to.accept_list_end @note_list
+
+        accept_list_end_note
+      end
+
+      def test_accept_list_end_ualpha
+        @to.start_accepting
+
+        @to.accept_list_start @ualpha_list
+
+        @to.accept_list_end @ualpha_list
+
+        accept_list_end_ualpha
+      end
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/markup/heading.rb b/lib/rdoc/markup/heading.rb
new file mode 100644
index 0000000000..21e2574d68
--- /dev/null
+++ b/lib/rdoc/markup/heading.rb
@@ -0,0 +1,17 @@
+##
+# A heading with a level (1-6) and text
+
+class RDoc::Markup::Heading < Struct.new :level, :text
+
+  def accept visitor
+    visitor.accept_heading self
+  end
+
+  def pretty_print q # :nodoc:
+    q.group 2, "[head: #{level} ", ']' do
+      q.pp text
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/markup/inline.rb b/lib/rdoc/markup/inline.rb
new file mode 100644
index 0000000000..1b5eac45ae
--- /dev/null
+++ b/lib/rdoc/markup/inline.rb
@@ -0,0 +1,127 @@
+class RDoc::Markup
+
+  ##
+  # We manage a set of attributes. Each attribute has a symbol name and a bit
+  # value.
+
+  class Attribute
+
+    ##
+    # Special attribute type.  See RDoc::Markup#add_special
+
+    SPECIAL = 1
+
+    @@name_to_bitmap = { :_SPECIAL_ => SPECIAL }
+    @@next_bitmap = 2
+
+    def self.bitmap_for(name)
+      bitmap = @@name_to_bitmap[name]
+      unless bitmap then
+        bitmap = @@next_bitmap
+        @@next_bitmap <<= 1
+        @@name_to_bitmap[name] = bitmap
+      end
+      bitmap
+    end
+
+    def self.as_string(bitmap)
+      return "none" if bitmap.zero?
+      res = []
+      @@name_to_bitmap.each do |name, bit|
+        res << name if (bitmap & bit) != 0
+      end
+      res.join(",")
+    end
+
+    def self.each_name_of(bitmap)
+      @@name_to_bitmap.each do |name, bit|
+        next if bit == SPECIAL
+        yield name.to_s if (bitmap & bit) != 0
+      end
+    end
+
+  end
+
+  AttrChanger = Struct.new :turn_on, :turn_off # :nodoc:
+
+  ##
+  # An AttrChanger records a change in attributes. It contains a bitmap of the
+  # attributes to turn on, and a bitmap of those to turn off.
+
+  class AttrChanger
+    def to_s # :nodoc:
+      "Attr: +#{Attribute.as_string turn_on}/-#{Attribute.as_string turn_on}"
+    end
+  end
+
+  ##
+  # An array of attributes which parallels the characters in a string.
+
+  class AttrSpan
+
+    ##
+    # Creates a new AttrSpan for +length+ characters
+
+    def initialize(length)
+      @attrs = Array.new(length, 0)
+    end
+
+    ##
+    # Toggles +bits+ from +start+ to +length+
+    def set_attrs(start, length, bits)
+      for i in start ... (start+length)
+        @attrs[i] |= bits
+      end
+    end
+
+    ##
+    # Acccesses flags for character +n+
+
+    def [](n)
+      @attrs[n]
+    end
+
+  end
+
+  ##
+  # Hold details of a special sequence
+
+  class Special
+
+    ##
+    # Special type
+
+    attr_reader   :type
+
+    ##
+    # Special text
+
+    attr_accessor :text
+
+    ##
+    # Creates a new special sequence of +type+ with +text+
+
+    def initialize(type, text)
+      @type, @text = type, text
+    end
+
+    ##
+    # Specials are equal when the have the same text and type
+
+    def ==(o)
+      self.text == o.text && self.type == o.type
+    end
+
+    def inspect # :nodoc:
+      "#<RDoc::Markup::Special:0x%x @type=%p, name=%p @text=%p>" % [
+        object_id, @type, RDoc::Markup::Attribute.as_string(type), text.dump]
+    end
+
+    def to_s # :nodoc:
+      "Special: type=#{type}, name=#{RDoc::Markup::Attribute.as_string type}, text=#{text.dump}"
+    end
+
+  end
+
+end
+
diff --git a/lib/rdoc/markup/list.rb b/lib/rdoc/markup/list.rb
new file mode 100644
index 0000000000..75326ed836
--- /dev/null
+++ b/lib/rdoc/markup/list.rb
@@ -0,0 +1,78 @@
+##
+# A List of ListItems
+
+class RDoc::Markup::List
+
+  ##
+  # The list's type
+
+  attr_accessor :type
+
+  ##
+  # Items in the list
+
+  attr_reader :items
+
+  ##
+  # Creates a new list of +type+ with +items+
+
+  def initialize type = nil, *items
+    @type = type
+    @items = []
+    @items.push(*items)
+  end
+
+  ##
+  # Appends +item+ to the list
+
+  def << item
+    @items << item
+  end
+
+  def == other # :nodoc:
+    self.class == other.class and
+      @type == other.type and
+      @items == other.items
+  end
+
+  def accept visitor
+    visitor.accept_list_start self
+
+    @items.each do |item|
+      item.accept visitor
+    end
+
+    visitor.accept_list_end self
+  end
+
+  ##
+  # Is the list empty?
+
+  def empty?
+    @items.empty?
+  end
+
+  ##
+  # Returns the last item in the list
+
+  def last
+    @items.last
+  end
+
+  def pretty_print q # :nodoc:
+    q.group 2, "[list: #{@type} ", ']' do
+      q.seplist @items do |item|
+        q.pp item
+      end
+    end
+  end
+
+  ##
+  # Appends +items+ to the list
+
+  def push *items
+    @items.push(*items)
+  end
+
+end
+
diff --git a/lib/rdoc/markup/list_item.rb b/lib/rdoc/markup/list_item.rb
new file mode 100644
index 0000000000..500e814fe1
--- /dev/null
+++ b/lib/rdoc/markup/list_item.rb
@@ -0,0 +1,83 @@
+##
+# An item within a List that contains paragraphs, headings, etc.
+
+class RDoc::Markup::ListItem
+
+  ##
+  # The label for the ListItem
+
+  attr_accessor :label
+
+  ##
+  # Parts of the ListItem
+
+  attr_reader :parts
+
+  ##
+  # Creates a new ListItem with an optional +label+ containing +parts+
+
+  def initialize label = nil, *parts
+    @label = label
+    @parts = []
+    @parts.push(*parts)
+  end
+
+  ##
+  # Appends +part+ to the ListItem
+
+  def << part
+    @parts << part
+  end
+
+  def == other # :nodoc:
+    self.class == other.class and
+      @label == other.label and
+      @parts == other.parts
+  end
+
+  def accept visitor
+    visitor.accept_list_item_start self
+
+    @parts.each do |part|
+      part.accept visitor
+    end
+
+    visitor.accept_list_item_end self
+  end
+
+  ##
+  # Is the ListItem empty?
+
+  def empty?
+    @parts.empty?
+  end
+
+  ##
+  # Length of parts in the ListItem
+
+  def length
+    @parts.length
+  end
+
+  def pretty_print q # :nodoc:
+    q.group 2, '[item: ', ']' do
+      if @label then
+        q.text @label
+        q.breakable
+      end
+
+      q.seplist @parts do |part|
+        q.pp part
+      end
+    end
+  end
+
+  ##
+  # Adds +parts+ to the ListItem
+
+  def push *parts
+    @parts.push(*parts)
+  end
+
+end
+
diff --git a/lib/rdoc/markup/paragraph.rb b/lib/rdoc/markup/paragraph.rb
new file mode 100644
index 0000000000..a9923ed24d
--- /dev/null
+++ b/lib/rdoc/markup/paragraph.rb
@@ -0,0 +1,11 @@
+##
+# A Paragraph of text
+
+class RDoc::Markup::Paragraph < RDoc::Markup::Raw
+
+  def accept visitor
+    visitor.accept_paragraph self
+  end
+
+end
+
diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb
new file mode 100644
index 0000000000..c214f74782
--- /dev/null
+++ b/lib/rdoc/markup/parser.rb
@@ -0,0 +1,529 @@
+require 'strscan'
+require 'rdoc/text'
+
+##
+# A recursive-descent parser for RDoc markup.
+#
+# The parser tokenizes an input string then parses the tokens into a Document.
+# Documents can be converted into output formats by writing a visitor like
+# RDoc::Markup::ToHTML.
+#
+# The parser only handles the block-level constructs Paragraph, List,
+# ListItem, Heading, Verbatim, BlankLine and Rule.  Inline markup such as
+# <tt>\+blah\+</tt> is handled separately by RDoc::Markup::AttributeManager.
+#
+# To see what markup the Parser implements read RDoc.  To see how to use
+# RDoc markup to format text in your program read RDoc::Markup.
+
+class RDoc::Markup::Parser
+
+  include RDoc::Text
+
+  ##
+  # List token types
+
+  LIST_TOKENS = [
+    :BULLET,
+    :LABEL,
+    :LALPHA,
+    :NOTE,
+    :NUMBER,
+    :UALPHA,
+  ]
+
+  ##
+  # Parser error subclass
+
+  class Error < RuntimeError; end
+
+  ##
+  # Raised when the parser is unable to handle the given markup
+
+  class ParseError < Error; end
+
+  ##
+  # Enables display of debugging information
+
+  attr_accessor :debug
+
+  ##
+  # Token accessor
+
+  attr_reader :tokens
+
+  ##
+  # Parsers +str+ into a Document
+
+  def self.parse str
+    parser = new
+    #parser.debug = true
+    parser.tokenize str
+    RDoc::Markup::Document.new(*parser.parse)
+  end
+
+  ##
+  # Returns a token stream for +str+, for testing
+
+  def self.tokenize str
+    parser = new
+    parser.tokenize str
+    parser.tokens
+  end
+
+  ##
+  # Creates a new Parser.  See also ::parse
+
+  def initialize
+    @tokens = []
+    @current_token = nil
+    @debug = false
+
+    @line = 0
+    @line_pos = 0
+  end
+
+  ##
+  # Builds a Heading of +level+
+
+  def build_heading level
+    heading = RDoc::Markup::Heading.new level, text
+    skip :NEWLINE
+
+    heading
+  end
+
+  ##
+  # Builds a List flush to +margin+
+
+  def build_list margin
+    p :list_start => margin if @debug
+
+    list = RDoc::Markup::List.new
+
+    until @tokens.empty? do
+      type, data, column, = get
+
+      case type
+      when :BULLET, :LABEL, :LALPHA, :NOTE, :NUMBER, :UALPHA then
+        list_type = type
+
+        if column < margin then
+          unget
+          break
+        end
+
+        if list.type and list.type != list_type then
+          unget
+          break
+        end
+
+        list.type = list_type
+
+        case type
+        when :NOTE, :LABEL then
+          _, indent, = get # SPACE
+          if :NEWLINE == peek_token.first then
+            get
+            peek_type, new_indent, peek_column, = peek_token
+            indent = new_indent if
+              peek_type == :INDENT and peek_column >= column
+            unget
+          end
+        else
+          data = nil
+          _, indent, = get
+        end
+
+        list_item = build_list_item(margin + indent, data)
+
+        list << list_item if list_item
+      else
+        unget
+        break
+      end
+    end
+
+    p :list_end => margin if @debug
+
+    return nil if list.empty?
+
+    list
+  end
+
+  ##
+  # Builds a ListItem that is flush to +indent+ with type +item_type+
+
+  def build_list_item indent, item_type = nil
+    p :list_item_start => [indent, item_type] if @debug
+
+    list_item = RDoc::Markup::ListItem.new item_type
+
+    until @tokens.empty? do
+      type, data, column = get
+
+      if column < indent and
+         not type == :NEWLINE and
+         (type != :INDENT or data < indent) then
+        unget
+        break
+      end
+
+      case type
+      when :INDENT then
+        unget
+        list_item.push(*parse(indent))
+      when :TEXT then
+        unget
+        list_item << build_paragraph(indent)
+      when :HEADER then
+        list_item << build_heading(data)
+      when :NEWLINE then
+        list_item << RDoc::Markup::BlankLine.new
+      when *LIST_TOKENS then
+        unget
+        list_item << build_list(column)
+      else
+        raise ParseError, "Unhandled token #{@current_token.inspect}"
+      end
+    end
+
+    p :list_item_end => [indent, item_type] if @debug
+
+    return nil if list_item.empty?
+
+    list_item.parts.shift if
+      RDoc::Markup::BlankLine === list_item.parts.first and
+      list_item.length > 1
+
+    list_item
+  end
+
+  ##
+  # Builds a Paragraph that is flush to +margin+
+
+  def build_paragraph margin
+    p :paragraph_start => margin if @debug
+
+    paragraph = RDoc::Markup::Paragraph.new
+
+    until @tokens.empty? do
+      type, data, column, = get
+
+      case type
+      when :INDENT then
+        next if data == margin and peek_token[0] == :TEXT
+
+        unget
+        break
+      when :TEXT then
+        if column != margin then
+          unget
+          break
+        end
+
+        paragraph << data
+        skip :NEWLINE
+      else
+        unget
+        break
+      end
+    end
+
+    p :paragraph_end => margin if @debug
+
+    paragraph
+  end
+
+  ##
+  # Builds a Verbatim that is flush to +margin+
+
+  def build_verbatim margin
+    p :verbatim_begin => margin if @debug
+    verbatim = RDoc::Markup::Verbatim.new
+
+    until @tokens.empty? do
+      type, data, column, = get
+
+      case type
+      when :INDENT then
+        if margin >= data then
+          unget
+          break
+        end
+
+        indent = data - margin
+
+        verbatim << ' ' * indent
+      when :HEADER then
+        verbatim << '=' * data
+
+        _, _, peek_column, = peek_token
+        peek_column ||= column + data
+        verbatim << ' ' * (peek_column - column - data)
+      when :RULE then
+        width = 2 + data
+        verbatim << '-' * width
+
+        _, _, peek_column, = peek_token
+        peek_column ||= column + data + 2
+        verbatim << ' ' * (peek_column - column - width)
+      when :TEXT then
+        verbatim << data
+      when *LIST_TOKENS then
+        if column <= margin then
+          unget
+          break
+        end
+
+        list_marker = case type
+                      when :BULLET                   then '*'
+                      when :LABEL                    then "[#{data}]"
+                      when :LALPHA, :NUMBER, :UALPHA then "#{data}."
+                      when :NOTE                     then "#{data}::"
+                      end
+
+        verbatim << list_marker
+
+        _, data, = get
+
+        verbatim << ' ' * (data - list_marker.length)
+      when :NEWLINE then
+        verbatim << data
+        break unless [:INDENT, :NEWLINE].include? peek_token[0]
+      else
+        unget
+        break
+      end
+    end
+
+    verbatim.normalize
+
+    p :verbatim_end => margin if @debug
+
+    verbatim
+  end
+
+  ##
+  # Pulls the next token from the stream.
+
+  def get
+    @current_token = @tokens.shift
+    p :get => @current_token if @debug
+    @current_token
+  end
+
+  ##
+  # Parses the tokens into a Document
+
+  def parse indent = 0
+    p :parse_start => indent if @debug
+
+    document = []
+
+    until @tokens.empty? do
+      type, data, column, = get
+
+      if type != :INDENT and column < indent then
+        unget
+        break
+      end
+
+      case type
+      when :HEADER then
+        document << build_heading(data)
+      when :INDENT then
+        if indent > data then
+          unget
+          break
+        elsif indent == data then
+          next
+        end
+
+        unget
+        document << build_verbatim(indent)
+      when :NEWLINE then
+        document << RDoc::Markup::BlankLine.new
+        skip :NEWLINE, false
+      when :RULE then
+        document << RDoc::Markup::Rule.new(data)
+        skip :NEWLINE
+      when :TEXT then
+        unget
+        document << build_paragraph(indent)
+
+        # we're done with this paragraph (indent mismatch)
+        break if peek_token[0] == :TEXT
+      when *LIST_TOKENS then
+        unget
+
+        list = build_list(indent)
+
+        document << list if list
+
+        # we're done with this list (indent mismatch)
+        break if LIST_TOKENS.include? peek_token.first and indent > 0
+      else
+        type, data, column, line = @current_token
+        raise ParseError,
+              "Unhandled token #{type} (#{data.inspect}) at #{line}:#{column}"
+      end
+    end
+
+    p :parse_end => indent if @debug
+
+    document
+  end
+
+  ##
+  # Returns the next token on the stream without modifying the stream
+
+  def peek_token
+    token = @tokens.first || []
+    p :peek => token if @debug
+    token
+  end
+
+  ##
+  # Skips a token of +token_type+, optionally raising an error.
+
+  def skip token_type, error = true
+    type, data, = get
+
+    return unless type # end of stream
+
+    return @current_token if token_type == type
+
+    unget
+
+    raise ParseError, "expected #{token_type} got #{@current_token.inspect}" if
+      error
+  end
+
+  ##
+  # Consumes tokens until NEWLINE and turns them back into text
+
+  def text
+    text = ''
+
+    loop do
+      type, data, = get
+
+      text << case type
+              when :BULLET then
+                _, space, = get # SPACE
+                "*#{' ' * (space - 1)}"
+              when :LABEL then
+                _, space, = get # SPACE
+                "[#{data}]#{' ' * (space - data.length - 2)}"
+              when :LALPHA, :NUMBER, :UALPHA then
+                _, space, = get # SPACE
+                "#{data}.#{' ' * (space - 2)}"
+              when :NOTE then
+                _, space = get # SPACE
+                "#{data}::#{' ' * (space - data.length - 2)}"
+              when :TEXT then
+                data
+              when :NEWLINE then
+                unget
+                break
+              when nil then
+                break
+              else
+                raise ParseError, "unhandled token #{@current_token.inspect}"
+              end
+    end
+
+    text
+  end
+
+  ##
+  # Calculates the column and line of the current token based on +offset+.
+
+  def token_pos offset
+    [offset - @line_pos, @line]
+  end
+
+  ##
+  # Turns text +input+ into a stream of tokens
+
+  def tokenize input
+    s = StringScanner.new input
+
+    @line = 0
+    @line_pos = 0
+
+    until s.eos? do
+      pos = s.pos
+
+      @tokens << case
+                 when s.scan(/\r?\n/) then
+                   token = [:NEWLINE, s.matched, *token_pos(pos)]
+                   @line_pos = s.pos
+                   @line += 1
+                   token
+                 when s.scan(/ +/) then
+                   [:INDENT, s.matched_size, *token_pos(pos)]
+                 when s.scan(/(=+)\s*/) then
+                   level = s[1].length
+                   level = 6 if level > 6
+                   @tokens << [:HEADER, level, *token_pos(pos)]
+
+                   pos = s.pos
+                   s.scan(/.*/)
+                   [:TEXT, s.matched, *token_pos(pos)]
+                 when s.scan(/^(-{3,}) *$/) then
+                   [:RULE, s[1].length - 2, *token_pos(pos)]
+                 when s.scan(/([*-])\s+/) then
+                   @tokens << [:BULLET, :BULLET, *token_pos(pos)]
+                   [:SPACE, s.matched_size, *token_pos(pos)]
+                 when s.scan(/([a-z]|\d+)\.[ \t]+\S/i) then
+                   list_label = s[1]
+                   width      = s.matched_size - 1
+
+                   s.pos -= 1 # unget \S
+
+                   list_type = case list_label
+                               when /[a-z]/ then :LALPHA
+                               when /[A-Z]/ then :UALPHA
+                               when /\d/    then :NUMBER
+                               else
+                                 raise ParseError, "BUG token #{list_label}"
+                               end
+
+                   @tokens << [list_type, list_label, *token_pos(pos)]
+                   [:SPACE, width, *token_pos(pos)]
+                 when s.scan(/\[(.*?)\]( +|$)/) then
+                   @tokens << [:LABEL, s[1], *token_pos(pos)]
+                   [:SPACE, s.matched_size, *token_pos(pos)]
+                 when s.scan(/(.*?)::( +|$)/) then
+                   @tokens << [:NOTE, s[1], *token_pos(pos)]
+                   [:SPACE, s.matched_size, *token_pos(pos)]
+                 else s.scan(/.*/)
+                   [:TEXT, s.matched, *token_pos(pos)]
+                 end
+    end
+
+    self
+  end
+
+  ##
+  # Returns the current token or +token+ to the token stream
+
+  def unget token = @current_token
+    p :unget => token if @debug
+    raise Error, 'too many #ungets' if token == @tokens.first
+    @tokens.unshift token if token
+  end
+
+end
+
+require 'rdoc/markup/blank_line'
+require 'rdoc/markup/document'
+require 'rdoc/markup/heading'
+require 'rdoc/markup/list'
+require 'rdoc/markup/list_item'
+require 'rdoc/markup/raw'
+require 'rdoc/markup/paragraph'
+require 'rdoc/markup/rule'
+require 'rdoc/markup/verbatim'
+
diff --git a/lib/rdoc/markup/preprocess.rb b/lib/rdoc/markup/preprocess.rb
new file mode 100644
index 0000000000..cefb498916
--- /dev/null
+++ b/lib/rdoc/markup/preprocess.rb
@@ -0,0 +1,130 @@
+require 'rdoc/markup'
+
+##
+# Handle common directives that can occur in a block of text:
+#
+# : include : filename
+#
+# RDoc plugin authors can register additional directives to be handled through
+# RDoc::Markup::PreProcess::register
+
+class RDoc::Markup::PreProcess
+
+  @registered = {}
+
+  ##
+  # Registers +directive+ as one handled by RDoc.  If a block is given the
+  # directive will be replaced by the result of the block, otherwise the
+  # directive will be removed from the processed text.
+
+  def self.register directive, &block
+    @registered[directive] = block
+  end
+
+  ##
+  # Registered directives
+
+  def self.registered
+    @registered
+  end
+
+  ##
+  # Creates a new pre-processor for +input_file_name+ that will look for
+  # included files in +include_path+
+
+  def initialize(input_file_name, include_path)
+    @input_file_name = input_file_name
+    @include_path = include_path
+  end
+
+  ##
+  # Look for directives in a chunk of +text+.
+  #
+  # Options that we don't handle are yielded.  If the block returns false the
+  # directive is restored to the text.  If the block returns nil or no block
+  # was given the directive is handled according to the registered directives.
+  # If a String was returned the directive is replaced with the string.
+  #
+  # If no matching directive was registered the directive is restored to the
+  # text.
+  #
+  # If +code_object+ is given and the param is set as metadata on the
+  # +code_object+.  See RDoc::CodeObject#metadata
+
+  def handle text, code_object = nil
+    text.gsub!(/^([ \t]*#?[ \t]*):(\w+):([ \t]*)(.+)?\n/) do
+      next $& if $3.empty? and $4 and $4[0, 1] == ':'
+
+      prefix    = $1
+      directive = $2.downcase
+      param     = $4
+
+      case directive
+      when 'include' then
+        filename = param.split[0]
+        include_file filename, prefix
+
+      else
+        result = yield directive, param if block_given?
+
+        case result
+        when nil then
+          code_object.metadata[directive] = param if code_object
+          if RDoc::Markup::PreProcess.registered.include? directive then
+            handler = RDoc::Markup::PreProcess.registered[directive]
+            result = handler.call directive, param if handler
+          else
+            result = "#{prefix}:#{directive}: #{param}\n"
+          end
+        when false then
+          result = "#{prefix}:#{directive}: #{param}\n"
+        end
+
+        result
+      end
+    end
+
+    text
+  end
+
+  ##
+  # Include a file, indenting it correctly.
+
+  def include_file(name, indent)
+    if full_name = find_include_file(name) then
+      content = if defined?(Encoding) then
+                  File.binread full_name
+                else
+                  File.read full_name
+                end
+      # HACK determine content type and force encoding
+      content = content.sub(/\A# .*coding[=:].*$/, '').lstrip
+
+      # strip leading '#'s, but only if all lines start with them
+      if content =~ /^[^#]/ then
+        content.gsub(/^/, indent)
+      else
+        content.gsub(/^#?/, indent)
+      end
+    else
+      warn "Couldn't find file to include '#{name}' from #{@input_file_name}"
+      ''
+    end
+  end
+
+  ##
+  # Look for the given file in the directory containing the current file,
+  # and then in each of the directories specified in the RDOC_INCLUDE path
+
+  def find_include_file(name)
+    to_search = [File.dirname(@input_file_name)].concat @include_path
+    to_search.each do |dir|
+      full_name = File.join(dir, name)
+      stat = File.stat(full_name) rescue next
+      return full_name if stat.readable?
+    end
+    nil
+  end
+
+end
+
diff --git a/lib/rdoc/markup/raw.rb b/lib/rdoc/markup/raw.rb
new file mode 100644
index 0000000000..1124be7cc8
--- /dev/null
+++ b/lib/rdoc/markup/raw.rb
@@ -0,0 +1,65 @@
+##
+# A section of text that is added to the output document as-is
+
+class RDoc::Markup::Raw
+
+  ##
+  # The component parts of the list
+
+  attr_reader :parts
+
+  ##
+  # Creates a new Raw containing +parts+
+
+  def initialize *parts
+    @parts = []
+    @parts.push(*parts)
+  end
+
+  ##
+  # Appends +text+
+
+  def << text
+    @parts << text
+  end
+
+  def == other # :nodoc:
+    self.class == other.class and text == other.text
+  end
+
+  def accept visitor
+    visitor.accept_raw self
+  end
+
+  ##
+  # Appends +other+'s parts
+
+  def merge other
+    @parts.push(*other.parts)
+  end
+
+  def pretty_print q # :nodoc:
+    self.class.name =~ /.*::(\w{4})/i
+
+    q.group 2, "[#{$1.downcase}: ", ']' do
+      q.seplist @parts do |part|
+        q.pp part
+      end
+    end
+  end
+
+  ##
+  # Appends +texts+ onto this Paragraph
+
+  def push *texts
+    self.parts.push(*texts)
+  end
+
+  ##
+  # The raw text
+
+  def text
+    @parts.join ' '
+  end
+
+end
diff --git a/lib/rdoc/markup/rule.rb b/lib/rdoc/markup/rule.rb
new file mode 100644
index 0000000000..4fcd040d2b
--- /dev/null
+++ b/lib/rdoc/markup/rule.rb
@@ -0,0 +1,17 @@
+##
+# A horizontal rule with a weight
+
+class RDoc::Markup::Rule < Struct.new :weight
+
+  def accept visitor
+    visitor.accept_rule self
+  end
+
+  def pretty_print q # :nodoc:
+    q.group 2, '[rule:', ']' do
+      q.pp weight
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/markup/sample/rdoc2latex.rb b/lib/rdoc/markup/sample/rdoc2latex.rb
deleted file mode 100644
index 26563b75da..0000000000
--- a/lib/rdoc/markup/sample/rdoc2latex.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/local/bin/ruby
-# Illustration of a script to convert an RDoc-style file to a LaTeX
-# document
-
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_latex'
-
-p = SM::SimpleMarkup.new
-h = SM::ToLaTeX.new
-
-#puts "\\documentclass{report}"
-#puts "\\usepackage{tabularx}"
-#puts "\\usepackage{parskip}"
-#puts "\\begin{document}"
-puts p.convert(ARGF.read, h)
-#puts "\\end{document}"
diff --git a/lib/rdoc/markup/sample/sample.rb b/lib/rdoc/markup/sample/sample.rb
deleted file mode 100644
index a375b54564..0000000000
--- a/lib/rdoc/markup/sample/sample.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# This program illustrates the basic use of the SimpleMarkup
-# class. It extracts the first comment block from the 
-# simple_markup.rb file and converts it into HTML on
-# standard output. Run it using
-#
-#  % ruby sample.rb
-#
-# You should be in the sample/ directory when you do this,
-# as it hardwires the path to the files it needs to require.
-# This isn't necessary in the code you write once you've 
-# installed the package.
-#
-# For a better way of formatting code comment blocks (and more)
-# see the rdoc package.
-#
-
-$:.unshift "../../.."
-
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_html'
-
-# Extract the comment block from the source file
-
-input_string = ""
-
-File.foreach("../simple_markup.rb") do |line|
-  break unless line.gsub!(/^\# ?/, '')
-  input_string << line
-end
-
-# Create a markup object
-markup = SM::SimpleMarkup.new
-
-# Attach it to an HTML formatter
-h = SM::ToHtml.new
-
-# And convert out comment block to html. Wrap it a body
-# tag pair to let browsers view it
-
-puts "<html><body>"
-puts markup.convert(input_string, h)
-puts "</body></html>"
diff --git a/lib/rdoc/markup/simple_markup.rb b/lib/rdoc/markup/simple_markup.rb
deleted file mode 100644
index 8193ca02d4..0000000000
--- a/lib/rdoc/markup/simple_markup.rb
+++ /dev/null
@@ -1,476 +0,0 @@
-# = Introduction
-#
-# SimpleMarkup parses plain text documents and attempts to decompose
-# them into their constituent parts. Some of these parts are high-level:
-# paragraphs, chunks of verbatim text, list entries and the like. Other
-# parts happen at the character level: a piece of bold text, a word in
-# code font. This markup is similar in spirit to that used on WikiWiki
-# webs, where folks create web pages using a simple set of formatting
-# rules.
-#
-# SimpleMarkup itself does no output formatting: this is left to a
-# different set of classes.
-#
-# SimpleMarkup is extendable at runtime: you can add new markup
-# elements to be recognised in the documents that SimpleMarkup parses.
-#
-# SimpleMarkup is intended to be the basis for a family of tools which
-# share the common requirement that simple, plain-text should be
-# rendered in a variety of different output formats and media. It is
-# envisaged that SimpleMarkup could be the basis for formating RDoc
-# style comment blocks, Wiki entries, and online FAQs.
-#
-# = Basic Formatting
-#
-# * SimpleMarkup looks for a document's natural left margin. This is
-#   used as the initial margin for the document.
-#
-# * Consecutive lines starting at this margin are considered to be a
-#   paragraph.
-#
-# * If a paragraph starts with a "*", "-", or with "<digit>.", then it is
-#   taken to be the start of a list. The margin in increased to be the
-#   first non-space following the list start flag. Subsequent lines
-#   should be indented to this new margin until the list ends. For
-#   example:
-#
-#      * this is a list with three paragraphs in
-#        the first item. This is the first paragraph.
-#
-#        And this is the second paragraph.
-#
-#        1. This is an indented, numbered list.
-#        2. This is the second item in that list
-#
-#        This is the third conventional paragraph in the
-#        first list item.
-#
-#      * This is the second item in the original list
-#
-# * You can also construct labeled lists, sometimes called description
-#   or definition lists. Do this by putting the label in square brackets
-#   and indenting the list body:
-#
-#       [cat]  a small furry mammal
-#              that seems to sleep a lot
-#
-#       [ant]  a little insect that is known
-#              to enjoy picnics
-#
-#   A minor variation on labeled lists uses two colons to separate the
-#   label from the list body:
-#
-#       cat::  a small furry mammal
-#              that seems to sleep a lot
-#
-#       ant::  a little insect that is known
-#              to enjoy picnics
-#     
-#   This latter style guarantees that the list bodies' left margins are
-#   aligned: think of them as a two column table.
-#
-# * Any line that starts to the right of the current margin is treated
-#   as verbatim text. This is useful for code listings. The example of a
-#   list above is also verbatim text.
-#
-# * A line starting with an equals sign (=) is treated as a
-#   heading. Level one headings have one equals sign, level two headings
-#   have two,and so on.
-#
-# * A line starting with three or more hyphens (at the current indent)
-#   generates a horizontal rule. THe more hyphens, the thicker the rule
-#   (within reason, and if supported by the output device)
-#
-# * You can use markup within text (except verbatim) to change the
-#   appearance of parts of that text. Out of the box, SimpleMarkup
-#   supports word-based and general markup.
-#
-#   Word-based markup uses flag characters around individual words:
-#
-#   [\*word*]  displays word in a *bold* font
-#   [\_word_]  displays word in an _emphasized_ font
-#   [\+word+]  displays word in a +code+ font
-#
-#   General markup affects text between a start delimiter and and end
-#   delimiter. Not surprisingly, these delimiters look like HTML markup.
-#
-#   [\<b>text...</b>]    displays word in a *bold* font
-#   [\<em>text...</em>]  displays word in an _emphasized_ font
-#   [\<i>text...</i>]    displays word in an _emphasized_ font
-#   [\<tt>text...</tt>]  displays word in a +code+ font
-#
-#   Unlike conventional Wiki markup, general markup can cross line
-#   boundaries. You can turn off the interpretation of markup by
-#   preceding the first character with a backslash, so \\\<b>bold
-#   text</b> and \\\*bold* produce \<b>bold text</b> and \*bold
-#   respectively.
-#
-# = Using SimpleMarkup
-#
-# For information on using SimpleMarkup programatically, 
-# see SM::SimpleMarkup.
-#
-# Author::   Dave Thomas,  dave@pragmaticprogrammer.com
-# Version::  0.0
-# License::  Ruby license
-
-
-
-require 'rdoc/markup/simple_markup/fragments'
-require 'rdoc/markup/simple_markup/lines.rb'
-
-module SM  #:nodoc:
-
-  # == Synopsis
-  #
-  # This code converts <tt>input_string</tt>, which is in the format
-  # described in markup/simple_markup.rb, to HTML. The conversion
-  # takes place in the +convert+ method, so you can use the same
-  # SimpleMarkup object to convert multiple input strings.
-  #
-  #   require 'rdoc/markup/simple_markup'
-  #   require 'rdoc/markup/simple_markup/to_html'
-  #
-  #   p = SM::SimpleMarkup.new
-  #   h = SM::ToHtml.new
-  #
-  #   puts p.convert(input_string, h)
-  #
-  # You can extend the SimpleMarkup parser to recognise new markup
-  # sequences, and to add special processing for text that matches a
-  # regular epxression. Here we make WikiWords significant to the parser,
-  # and also make the sequences {word} and \<no>text...</no> signify
-  # strike-through text. When then subclass the HTML output class to deal
-  # with these:
-  #
-  #   require 'rdoc/markup/simple_markup'
-  #   require 'rdoc/markup/simple_markup/to_html'
-  #
-  #   class WikiHtml < SM::ToHtml
-  #     def handle_special_WIKIWORD(special)
-  #       "<font color=red>" + special.text + "</font>"
-  #     end
-  #   end
-  #
-  #   p = SM::SimpleMarkup.new
-  #   p.add_word_pair("{", "}", :STRIKE)
-  #   p.add_html("no", :STRIKE)
-  #
-  #   p.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
-  #
-  #   h = WikiHtml.new
-  #   h.add_tag(:STRIKE, "<strike>", "</strike>")
-  #
-  #   puts "<body>" + p.convert(ARGF.read, h) + "</body>"
-  #
-  # == Output Formatters
-  #
-  # _missing_
-  #
-  #
-
-  class SimpleMarkup
-
-    SPACE = ?\s
-
-    # List entries look like:
-    #  *       text
-    #  1.      text
-    #  [label] text
-    #  label:: text
-    #
-    # Flag it as a list entry, and
-    # work out the indent for subsequent lines
-
-    SIMPLE_LIST_RE = /^(
-                  (  \*          (?# bullet)
-                    |-           (?# bullet)
-                    |\d+\.       (?# numbered )
-                    |[A-Za-z]\.  (?# alphabetically numbered )
-                  )
-                  \s+
-                )\S/x
-
-    LABEL_LIST_RE = /^(
-                        (  \[.*?\]    (?# labeled  )
-                          |\S.*::     (?# note     )
-                        )(?:\s+|$)
-                      )/x
-
-
-    ##
-    # take a block of text and use various heuristics to determine
-    # it's structure (paragraphs, lists, and so on). Invoke an
-    # event handler as we identify significant chunks.
-    #
-
-    def initialize
-      @am = AttributeManager.new
-      @output = nil
-    end
-
-    ##
-    # Add to the sequences used to add formatting to an individual word 
-    # (such as *bold*). Matching entries will generate attibutes
-    # that the output formatters can recognize by their +name+
-
-    def add_word_pair(start, stop, name)
-      @am.add_word_pair(start, stop, name)
-    end
-
-    ##
-    # Add to the sequences recognized as general markup
-    #
-
-    def add_html(tag, name)
-      @am.add_html(tag, name)
-    end
-
-    ##
-    # Add to other inline sequences. For example, we could add
-    # WikiWords using something like:
-    #
-    #    parser.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
-    #
-    # Each wiki word will be presented to the output formatter 
-    # via the accept_special method
-    #
-
-    def add_special(pattern, name)
-      @am.add_special(pattern, name)
-    end
-
-
-    # We take a string, split it into lines, work out the type of
-    # each line, and from there deduce groups of lines (for example
-    # all lines in a paragraph). We then invoke the output formatter
-    # using a Visitor to display the result
-
-    def convert(str, op)
-      @lines = Lines.new(str.split(/\r?\n/).collect { |aLine| 
-                           Line.new(aLine) })
-      return "" if @lines.empty?
-      @lines.normalize
-      assign_types_to_lines
-      group = group_lines
-      # call the output formatter to handle the result
-      #      group.to_a.each {|i| p i}
-      group.accept(@am, op)
-    end
-
-
-    #######
-    private
-    #######
-
-
-    ##
-    # Look through the text at line indentation. We flag each line as being
-    # Blank, a paragraph, a list element, or verbatim text
-    #
-
-    def assign_types_to_lines(margin = 0, level = 0)
-
-      while line = @lines.next
-        if line.isBlank?
-          line.stamp(Line::BLANK, level)
-          next
-        end
-        
-        # if a line contains non-blanks before the margin, then it must belong
-        # to an outer level
-
-        text = line.text
-        
-        for i in 0...margin
-          if text[i] != SPACE
-            @lines.unget
-            return
-          end
-        end
-
-        active_line = text[margin..-1]
-
-        # Rules (horizontal lines) look like
-        #
-        #  ---   (three or more hyphens)
-        #
-        # The more hyphens, the thicker the rule
-        #
-
-        if /^(---+)\s*$/ =~ active_line
-          line.stamp(Line::RULE, level, $1.length-2)
-          next
-        end
-
-        # Then look for list entries. First the ones that have to have
-        # text following them (* xxx, - xxx, and dd. xxx)
-
-        if SIMPLE_LIST_RE =~ active_line
-
-          offset = margin + $1.length
-          prefix = $2
-          prefix_length = prefix.length
-
-          flag = case prefix
-                 when "*","-" then ListBase::BULLET
-                 when /^\d/   then ListBase::NUMBER
-                 when /^[A-Z]/ then ListBase::UPPERALPHA
-                 when /^[a-z]/ then ListBase::LOWERALPHA
-                 else raise "Invalid List Type: #{self.inspect}"
-                 end
-
-          line.stamp(Line::LIST, level+1, prefix, flag)
-          text[margin, prefix_length] = " " * prefix_length
-          assign_types_to_lines(offset, level + 1)
-          next
-        end
-
-
-        if LABEL_LIST_RE =~ active_line
-          offset = margin + $1.length
-          prefix = $2
-          prefix_length = prefix.length
-
-          next if handled_labeled_list(line, level, margin, offset, prefix)
-        end
-
-        # Headings look like
-        # = Main heading
-        # == Second level
-        # === Third
-        #
-        # Headings reset the level to 0
-
-        if active_line[0] == ?= and active_line =~ /^(=+)\s*(.*)/
-          prefix_length = $1.length
-          prefix_length = 6 if prefix_length > 6
-          line.stamp(Line::HEADING, 0, prefix_length)
-          line.strip_leading(margin + prefix_length)
-          next
-        end
-        
-        # If the character's a space, then we have verbatim text,
-        # otherwise 
-
-        if active_line[0] == SPACE
-          line.strip_leading(margin) if margin > 0
-          line.stamp(Line::VERBATIM, level)
-        else
-          line.stamp(Line::PARAGRAPH, level)
-        end
-      end
-    end
-
-    # Handle labeled list entries, We have a special case
-    # to deal with. Because the labels can be long, they force
-    # the remaining block of text over the to right:
-    #
-    # this is a long label that I wrote:: and here is the
-    #                                     block of text with
-    #                                     a silly margin
-    #
-    # So we allow the special case. If the label is followed
-    # by nothing, and if the following line is indented, then
-    # we take the indent of that line as the new margin
-    #
-    # this is a long label that I wrote::
-    #     here is a more reasonably indented block which
-    #     will ab attached to the label.
-    #
-    
-    def handled_labeled_list(line, level, margin, offset, prefix)
-      prefix_length = prefix.length
-      text = line.text
-      flag = nil
-      case prefix
-      when /^\[/
-        flag = ListBase::LABELED
-        prefix = prefix[1, prefix.length-2]
-      when /:$/
-        flag = ListBase::NOTE
-        prefix.chop!
-      else raise "Invalid List Type: #{self.inspect}"
-      end
-      
-      # body is on the next line
-      
-      if text.length <= offset
-        original_line = line
-        line = @lines.next
-        return(false) unless line
-        text = line.text
-        
-        for i in 0..margin
-          if text[i] != SPACE
-            @lines.unget
-            return false
-          end
-        end
-        i = margin
-        i += 1 while text[i] == SPACE
-        if i >= text.length
-          @lines.unget
-          return false
-        else
-          offset = i
-          prefix_length = 0
-          @lines.delete(original_line)
-        end
-      end
-      
-      line.stamp(Line::LIST, level+1, prefix, flag)
-      text[margin, prefix_length] = " " * prefix_length
-      assign_types_to_lines(offset, level + 1)
-      return true
-    end
-
-    # Return a block consisting of fragments which are
-    # paragraphs, list entries or verbatim text. We merge consecutive
-    # lines of the same type and level together. We are also slightly
-    # tricky with lists: the lines following a list introduction
-    # look like paragraph lines at the next level, and we remap them
-    # into list entries instead
-
-    def group_lines
-      @lines.rewind
-
-      inList = false
-      wantedType = wantedLevel = nil
-
-      block = LineCollection.new
-      group = nil
-
-      while line = @lines.next
-        if line.level == wantedLevel and line.type == wantedType
-          group.add_text(line.text)
-        else
-          group = block.fragment_for(line)
-          block.add(group)
-          if line.type == Line::LIST
-            wantedType = Line::PARAGRAPH
-          else
-            wantedType = line.type
-          end
-          wantedLevel = line.type == Line::HEADING ? line.param : line.level
-        end
-      end
-
-      block.normalize
-      block
-    end
-
-    ## for debugging, we allow access to our line contents as text
-    def content
-      @lines.as_text
-    end
-    public :content
-
-    ## for debugging, return the list of line types
-    def get_line_types
-      @lines.line_types
-    end
-    public :get_line_types
-  end
-
-end
diff --git a/lib/rdoc/markup/simple_markup/fragments.rb b/lib/rdoc/markup/simple_markup/fragments.rb
deleted file mode 100644
index 6ca06382ab..0000000000
--- a/lib/rdoc/markup/simple_markup/fragments.rb
+++ /dev/null
@@ -1,328 +0,0 @@
-require 'rdoc/markup/simple_markup/lines.rb'
-#require 'rdoc/markup/simple_markup/to_flow.rb'
-
-module SM
-
-  ##
-  # A Fragment is a chunk of text, subclassed as a paragraph, a list
-  # entry, or verbatim text
-
-  class Fragment
-    attr_reader   :level, :param, :txt
-    attr_accessor :type
-
-    def initialize(level, param, type, txt)
-      @level = level
-      @param = param
-      @type  = type
-      @txt   = ""
-      add_text(txt) if txt
-    end
-
-    def add_text(txt)
-      @txt << " " if @txt.length > 0
-      @txt << txt.tr_s("\n ", "  ").strip
-    end
-
-    def to_s
-      "L#@level: #{self.class.name.split('::')[-1]}\n#@txt"
-    end
-
-    ######
-    # This is a simple factory system that lets us associate fragement
-    # types (a string) with a subclass of fragment
-
-    TYPE_MAP = {}
-
-    def Fragment.type_name(name)
-      TYPE_MAP[name] = self
-    end
-
-    def Fragment.for(line)
-      klass =  TYPE_MAP[line.type] ||
-        raise("Unknown line type: '#{line.type.inspect}:' '#{line.text}'")
-      return klass.new(line.level, line.param, line.flag, line.text)
-    end
-  end
-
-  ##
-  # A paragraph is a fragment which gets wrapped to fit. We remove all
-  # newlines when we're created, and have them put back on output
-
-  class Paragraph < Fragment
-    type_name Line::PARAGRAPH
-  end
-
-  class BlankLine < Paragraph
-    type_name Line::BLANK
-  end
-
-  class Heading < Paragraph
-    type_name Line::HEADING
-
-    def head_level
-      @param.to_i
-    end
-  end
-
-  ##
-  # A List is a fragment with some kind of label
-  #
-
-  class ListBase < Paragraph
-    # List types
-    BULLET  = :BULLET
-    NUMBER  = :NUMBER
-    UPPERALPHA  = :UPPERALPHA
-    LOWERALPHA  = :LOWERALPHA
-    LABELED = :LABELED
-    NOTE    = :NOTE
-  end
-
-  class ListItem < ListBase
-    type_name Line::LIST
-
-    #  def label
-    #    am = AttributeManager.new(@param)
-    #    am.flow
-    #  end
-  end
-
-  class ListStart < ListBase
-    def initialize(level, param, type)
-      super(level, param, type, nil)
-    end
-  end
-
-  class ListEnd < ListBase
-    def initialize(level, type)
-      super(level, "", type, nil)
-    end
-  end
-
-  ##
-  # Verbatim code contains lines that don't get wrapped.
-
-  class Verbatim < Fragment
-    type_name  Line::VERBATIM
-
-    def add_text(txt)
-      @txt << txt.chomp << "\n"
-    end
-
-  end
-
-  ##
-  # A horizontal rule
-  class Rule < Fragment
-    type_name Line::RULE
-  end
-
-
-  # Collect groups of lines together. Each group
-  # will end up containing a flow of text
-
-  class LineCollection
-    
-    def initialize
-      @fragments = []
-    end
-
-    def add(fragment)
-      @fragments << fragment
-    end
-
-    def each(&b)
-      @fragments.each(&b)
-    end
-
-    # For testing
-    def to_a
-      @fragments.map {|fragment| fragment.to_s}
-    end
-
-    # Factory for different fragment types
-    def fragment_for(*args)
-      Fragment.for(*args)
-    end
-
-    # tidy up at the end
-    def normalize
-      change_verbatim_blank_lines
-      add_list_start_and_ends
-      add_list_breaks
-      tidy_blank_lines
-    end
-
-    def to_s
-      @fragments.join("\n----\n")
-    end
-
-    def accept(am, visitor)
-
-      visitor.start_accepting
-
-      @fragments.each do |fragment|
-        case fragment
-        when Verbatim
-          visitor.accept_verbatim(am, fragment)
-        when Rule
-          visitor.accept_rule(am, fragment)
-        when ListStart
-          visitor.accept_list_start(am, fragment)
-        when ListEnd
-          visitor.accept_list_end(am, fragment)
-        when ListItem
-          visitor.accept_list_item(am, fragment)
-        when BlankLine
-          visitor.accept_blank_line(am, fragment)
-        when Heading
-          visitor.accept_heading(am, fragment)
-        when Paragraph
-          visitor.accept_paragraph(am, fragment)
-        end
-      end
-
-      visitor.end_accepting
-    end
-    #######
-    private
-    #######
-
-    # If you have:
-    #
-    #    normal paragraph text.
-    #
-    #       this is code
-    #   
-    #       and more code
-    #
-    # You'll end up with the fragments Paragraph, BlankLine, 
-    # Verbatim, BlankLine, Verbatim, BlankLine, etc
-    #
-    # The BlankLine in the middle of the verbatim chunk needs to
-    # be changed to a real verbatim newline, and the two
-    # verbatim blocks merged
-    #
-    #    
-    def change_verbatim_blank_lines
-      frag_block = nil
-      blank_count = 0
-      @fragments.each_with_index do |frag, i|
-        if frag_block.nil?
-          frag_block = frag if Verbatim === frag
-        else
-          case frag
-          when Verbatim
-            blank_count.times { frag_block.add_text("\n") }
-            blank_count = 0
-            frag_block.add_text(frag.txt)
-            @fragments[i] = nil    # remove out current fragment
-          when BlankLine
-            if frag_block
-              blank_count += 1
-              @fragments[i] = nil
-            end
-          else
-            frag_block = nil
-            blank_count = 0
-          end
-        end
-      end
-      @fragments.compact!
-    end
-
-    # List nesting is implicit given the level of
-    # Make it explicit, just to make life a tad
-    # easier for the output processors
-
-    def add_list_start_and_ends
-      level = 0
-      res = []
-      type_stack = []
-
-      @fragments.each do |fragment|
-        # $stderr.puts "#{level} : #{fragment.class.name} : #{fragment.level}"
-        new_level = fragment.level
-        while (level < new_level)
-          level += 1
-          type = fragment.type
-          res << ListStart.new(level, fragment.param, type) if type
-          type_stack.push type
-          # $stderr.puts "Start: #{level}"
-        end
-
-        while level > new_level
-          type = type_stack.pop
-          res << ListEnd.new(level, type) if type
-          level -= 1
-          # $stderr.puts "End: #{level}, #{type}"
-        end
-
-        res << fragment
-        level = fragment.level
-      end
-      level.downto(1) do |i|
-        type = type_stack.pop
-        res << ListEnd.new(i, type) if type
-      end
-
-      @fragments = res
-    end
-
-    # now insert start/ends between list entries at the
-    # same level that have different element types
-
-    def add_list_breaks
-      res = @fragments
-
-      @fragments = []
-      list_stack = []
-
-      res.each do |fragment|
-        case fragment
-        when ListStart
-          list_stack.push fragment
-        when ListEnd
-          start = list_stack.pop
-          fragment.type = start.type
-        when ListItem
-          l = list_stack.last
-          if fragment.type != l.type
-            @fragments << ListEnd.new(l.level, l.type)
-            start = ListStart.new(l.level, fragment.param, fragment.type)
-            @fragments << start
-            list_stack.pop
-            list_stack.push start
-          end
-        else
-          ;
-        end
-        @fragments << fragment
-      end
-    end
-
-    # Finally tidy up the blank lines:
-    # * change Blank/ListEnd into ListEnd/Blank
-    # * remove blank lines at the front
-
-    def tidy_blank_lines
-      (@fragments.size - 1).times do |i|
-        if @fragments[i].kind_of?(BlankLine) and 
-            @fragments[i+1].kind_of?(ListEnd)
-          @fragments[i], @fragments[i+1] = @fragments[i+1], @fragments[i] 
-        end
-      end
-
-      # remove leading blanks
-      @fragments.each_with_index do |f, i|
-        break unless f.kind_of? BlankLine
-        @fragments[i] = nil
-      end
-
-      @fragments.compact!
-    end
-
-  end
-  
-end
diff --git a/lib/rdoc/markup/simple_markup/inline.rb b/lib/rdoc/markup/simple_markup/inline.rb
deleted file mode 100644
index d54fe1e667..0000000000
--- a/lib/rdoc/markup/simple_markup/inline.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-module SM
-
-  # We manage a set of attributes. Each attribute has a symbol name
-  # and a bit value
-
-  class Attribute
-    SPECIAL = 1
-
-    @@name_to_bitmap = { :_SPECIAL_ => SPECIAL }
-    @@next_bitmap = 2
-
-    def Attribute.bitmap_for(name)
-      bitmap = @@name_to_bitmap[name]
-      if !bitmap
-        bitmap = @@next_bitmap
-        @@next_bitmap <<= 1
-        @@name_to_bitmap[name] = bitmap
-      end
-      bitmap
-    end
-
-    def Attribute.as_string(bitmap)
-      return "none" if bitmap.zero?
-      res = []
-      @@name_to_bitmap.each do |name, bit|
-        res << name if (bitmap & bit) != 0
-      end
-      res.join(",")
-    end
-
-    def Attribute.each_name_of(bitmap)
-      @@name_to_bitmap.each do |name, bit|
-        next if bit == SPECIAL
-        yield name.to_s if (bitmap & bit) != 0
-      end
-    end
-  end
-
-
-  # An AttrChanger records a change in attributes. It contains
-  # a bitmap of the attributes to turn on, and a bitmap of those to
-  # turn off
-
-  AttrChanger = Struct.new(:turn_on, :turn_off)
-  class AttrChanger
-    def to_s
-      "Attr: +#{Attribute.as_string(@turn_on)}/-#{Attribute.as_string(@turn_on)}"
-    end
-  end
-
-  # An array of attributes which parallels the characters in a string
-  class AttrSpan
-    def initialize(length)
-      @attrs = Array.new(length, 0)
-    end
-
-    def set_attrs(start, length, bits)
-      for i in start ... (start+length)
-        @attrs[i] |= bits
-      end
-    end
-
-    def [](n)
-      @attrs[n]
-    end
-  end
-
-  ##
-  # Hold details of a special sequence
-
-  class Special
-    attr_reader   :type
-    attr_accessor :text
-
-    def initialize(type, text)
-      @type, @text = type, text
-    end
-
-    def ==(o)
-      self.text == o.text && self.type == o.type
-    end
-
-    def to_s
-      "Special: type=#{type}, text=#{text.dump}"
-    end
-  end
-  
-  class AttributeManager
-
-    NULL = "\000".freeze
-
-    ##
-    # We work by substituting non-printing characters in to the
-    # text. For now I'm assuming that I can substitute
-    # a character in the range 0..8 for a 7 bit character
-    # without damaging the encoded string, but this might
-    # be optimistic
-    #
-
-    A_PROTECT  = 004
-    PROTECT_ATTR  = A_PROTECT.chr
-
-    # This maps delimiters that occur around words (such as
-    # *bold* or +tt+) where the start and end delimiters
-    # and the same. This lets us optimize the regexp
-    MATCHING_WORD_PAIRS = {}
-
-    # And this is used when the delimiters aren't the same. In this
-    # case the hash maps a pattern to the attribute character
-    WORD_PAIR_MAP = {}
-
-    # This maps HTML tags to the corresponding attribute char
-    HTML_TAGS = {}
-
-    # And this maps _special_ sequences to a name. A special sequence
-    # is something like a WikiWord
-    SPECIAL = {}
-
-    # Return an attribute object with the given turn_on
-    # and turn_off bits set
-
-    def attribute(turn_on, turn_off)
-      AttrChanger.new(turn_on, turn_off)
-    end
-
-
-    def change_attribute(current, new)
-      diff = current ^ new
-      attribute(new & diff, current & diff)
-    end
-
-    def changed_attribute_by_name(current_set, new_set)
-      current = new = 0
-      current_set.each {|name| current |= Attribute.bitmap_for(name) }
-      new_set.each {|name| new |= Attribute.bitmap_for(name) }
-      change_attribute(current, new)
-    end
-
-    def copy_string(start_pos, end_pos)
-      res = @str[start_pos...end_pos]
-      res.gsub!(/\000/, '')
-      res
-    end
-
-    # Map attributes like <b>text</b>to the sequence \001\002<char>\001\003<char>,
-    # where <char> is a per-attribute specific character
-
-    def convert_attrs(str, attrs)
-      # first do matching ones
-      tags = MATCHING_WORD_PAIRS.keys.join("")
-      re = "(^|\\W)([#{tags}])([A-Za-z_]+?)\\2(\\W|\$)"
-#      re = "(^|\\W)([#{tags}])(\\S+?)\\2(\\W|\$)"
-      1 while str.gsub!(Regexp.new(re)) {
-        attr = MATCHING_WORD_PAIRS[$2];
-        attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr)
-        $1 + NULL*$2.length + $3 + NULL*$2.length + $4
-      }
-
-      # then non-matching
-      unless WORD_PAIR_MAP.empty?
-        WORD_PAIR_MAP.each do |regexp, attr|
-          str.gsub!(regexp) { 
-            attrs.set_attrs($`.length + $1.length, $2.length, attr)
-            NULL*$1.length + $2 + NULL*$3.length
-          }
-        end
-      end
-    end
-
-    def convert_html(str, attrs)
-      tags = HTML_TAGS.keys.join("|")
-      re = "<(#{tags})>(.*?)</\\1>"
-      1 while str.gsub!(Regexp.new(re, Regexp::IGNORECASE)) {
-        attr = HTML_TAGS[$1.downcase]
-        html_length = $1.length + 2
-        seq = NULL * html_length
-        attrs.set_attrs($`.length + html_length, $2.length, attr)
-        seq + $2 + seq + NULL
-      }
-    end
-
-    def convert_specials(str, attrs)
-      unless SPECIAL.empty?
-        SPECIAL.each do |regexp, attr|
-          str.scan(regexp) do
-            attrs.set_attrs($`.length, $&.length, attr | Attribute::SPECIAL)
-          end
-        end
-      end
-    end
-
-    # A \ in front of a character that would normally be
-    # processed turns off processing. We do this by turning
-    # \< into <#{PROTECT}
-    
-    PROTECTABLE = [ "<" << "\\" ]  #"
-
-
-    def mask_protected_sequences
-      protect_pattern = Regexp.new("\\\\([#{Regexp.escape(PROTECTABLE.join(''))}])")
-      @str.gsub!(protect_pattern, "\\1#{PROTECT_ATTR}")
-    end
-
-    def unmask_protected_sequences
-      @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
-    end
-
-    def initialize
-      add_word_pair("*", "*", :BOLD)
-      add_word_pair("_", "_", :EM)
-      add_word_pair("+", "+", :TT)
-      
-      add_html("em", :EM)
-      add_html("i",  :EM)
-      add_html("b",  :BOLD)
-      add_html("tt",   :TT)
-      add_html("code", :TT)
-
-      add_special(/<!--(.*?)-->/, :COMMENT)
-    end
-
-    def add_word_pair(start, stop, name)
-      raise "Word flags may not start '<'" if start[0] == ?<
-      bitmap = Attribute.bitmap_for(name)
-      if start == stop
-        MATCHING_WORD_PAIRS[start] = bitmap
-      else
-        pattern = Regexp.new("(" + Regexp.escape(start) + ")" +
-#                             "([A-Za-z]+)" +
-                             "(\\S+)" +
-                             "(" + Regexp.escape(stop) +")")
-        WORD_PAIR_MAP[pattern] = bitmap
-      end
-      PROTECTABLE << start[0,1]
-      PROTECTABLE.uniq!
-    end
-
-    def add_html(tag, name)
-      HTML_TAGS[tag.downcase] = Attribute.bitmap_for(name)
-    end
-
-    def add_special(pattern, name)
-      SPECIAL[pattern] = Attribute.bitmap_for(name)
-    end
-
-    def flow(str)
-      @str = str
-
-      puts("Before flow, str='#{@str.dump}'") if $DEBUG
-      mask_protected_sequences
- 
-      @attrs = AttrSpan.new(@str.length)
-
-      puts("After protecting, str='#{@str.dump}'") if $DEBUG
-      convert_attrs(@str, @attrs)
-      convert_html(@str, @attrs)
-      convert_specials(str, @attrs)
-      unmask_protected_sequences
-      puts("After flow, str='#{@str.dump}'") if $DEBUG
-      return split_into_flow
-    end
-
-    def display_attributes
-      puts
-      puts @str.tr(NULL, "!")
-      bit = 1
-      16.times do |bno|
-        line = ""
-        @str.length.times do |i|
-          if (@attrs[i] & bit) == 0
-            line << " "
-          else
-            if bno.zero?
-              line << "S"
-            else
-              line << ("%d" % (bno+1))
-            end
-          end
-        end
-        puts(line) unless line =~ /^ *$/
-        bit <<= 1
-      end
-    end
-
-    def split_into_flow
-
-      display_attributes if $DEBUG
-
-      res = []
-      current_attr = 0
-      str = ""
-
-      
-      str_len = @str.length
-
-      # skip leading invisible text
-      i = 0
-      i += 1 while i < str_len and @str[i].zero?
-      start_pos = i
-
-      # then scan the string, chunking it on attribute changes
-      while i < str_len
-        new_attr = @attrs[i]
-        if new_attr != current_attr
-          if i > start_pos
-            res << copy_string(start_pos, i)
-            start_pos = i
-          end
-
-          res << change_attribute(current_attr, new_attr)
-          current_attr = new_attr
-
-          if (current_attr & Attribute::SPECIAL) != 0
-            i += 1 while i < str_len and (@attrs[i] & Attribute::SPECIAL) != 0
-            res << Special.new(current_attr, copy_string(start_pos, i))
-            start_pos = i
-            next
-          end
-        end
-
-        # move on, skipping any invisible characters
-        begin
-          i += 1
-        end while i < str_len and @str[i].zero?
-      end
-      
-      # tidy up trailing text
-      if start_pos < str_len
-        res << copy_string(start_pos, str_len)
-      end
-
-      # and reset to all attributes off
-      res << change_attribute(current_attr, 0) if current_attr != 0
-
-      return res
-    end
-
-  end
-
-end
diff --git a/lib/rdoc/markup/simple_markup/lines.rb b/lib/rdoc/markup/simple_markup/lines.rb
deleted file mode 100644
index 4e294f27dc..0000000000
--- a/lib/rdoc/markup/simple_markup/lines.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-##########################################################################
-#
-# We store the lines we're working on as objects of class Line.
-# These contain the text of the line, along with a flag indicating the
-# line type, and an indentation level
-
-module SM
-
-  class Line
-    INFINITY = 9999
-
-    BLANK     = :BLANK
-    HEADING   = :HEADING
-    LIST      = :LIST
-    RULE      = :RULE
-    PARAGRAPH = :PARAGRAPH
-    VERBATIM  = :VERBATIM
-    
-    # line type
-    attr_accessor :type
-
-    # The indentation nesting level
-    attr_accessor :level
-
-    # The contents
-    attr_accessor :text
-
-    # A prefix or parameter. For LIST lines, this is
-    # the text that introduced the list item (the label)
-    attr_accessor  :param
-
-    # A flag. For list lines, this is the type of the list
-    attr_accessor :flag
-
-    # the number of leading spaces
-    attr_accessor :leading_spaces
-
-    # true if this line has been deleted from the list of lines
-    attr_accessor :deleted
-    
-
-    def initialize(text)
-      @text    = text.dup
-      @deleted = false
-
-      # expand tabs
-      1 while @text.gsub!(/\t+/) { ' ' * (8*$&.length - $`.length % 8)}  && $~ #`
-
-      # Strip trailing whitespace
-      @text.sub!(/\s+$/, '')
-
-      # and look for leading whitespace
-      if @text.length > 0
-        @text =~ /^(\s*)/
-        @leading_spaces = $1.length
-      else
-        @leading_spaces = INFINITY
-      end
-    end
-
-    # Return true if this line is blank
-    def isBlank?
-      @text.length.zero?
-    end
-
-    # stamp a line with a type, a level, a prefix, and a flag
-    def stamp(type, level, param="", flag=nil)
-      @type, @level, @param, @flag = type, level, param, flag
-    end
-
-    ##
-    # Strip off the leading margin
-    #
-
-    def strip_leading(size)
-      if @text.size > size
-        @text[0,size] = ""
-      else
-        @text = ""
-      end
-    end
-
-    def to_s
-      "#@type#@level: #@text"
-    end
-  end
-
-  ###############################################################################
-  #
-  # A container for all the lines
-  #
-
-  class Lines
-    include Enumerable
-
-    attr_reader :lines   # for debugging
-
-    def initialize(lines)
-      @lines = lines
-      rewind
-    end
-
-    def empty?
-      @lines.size.zero?
-    end
-
-    def each
-      @lines.each do |line|
-        yield line unless line.deleted
-      end
-    end
-
-#    def [](index)
-#      @lines[index]
-#    end
-
-    def rewind
-      @nextline = 0
-    end
-
-    def next
-      begin
-        res = @lines[@nextline]
-        @nextline += 1 if @nextline < @lines.size
-      end while res and res.deleted and @nextline < @lines.size
-      res
-    end
-
-    def unget
-      @nextline -= 1
-    end
-
-    def delete(a_line)
-      a_line.deleted = true
-    end
-
-    def normalize
-      margin = @lines.collect{|l| l.leading_spaces}.min
-      margin = 0 if margin == Line::INFINITY
-      @lines.each {|line| line.strip_leading(margin) } if margin > 0
-    end
-
-    def as_text
-      @lines.map {|l| l.text}.join("\n")
-    end
-
-    def line_types
-      @lines.map {|l| l.type }
-    end
-  end
-end
diff --git a/lib/rdoc/markup/simple_markup/preprocess.rb b/lib/rdoc/markup/simple_markup/preprocess.rb
deleted file mode 100644
index 101c9bdeb1..0000000000
--- a/lib/rdoc/markup/simple_markup/preprocess.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-module SM
-
-  ## 
-  # Handle common directives that can occur in a block of text:
-  #
-  # : include : filename
-  #
-
-  class PreProcess
-
-    def initialize(input_file_name, include_path)
-      @input_file_name = input_file_name
-      @include_path = include_path
-    end
-
-    # Look for common options in a chunk of text. Options that
-    # we don't handle are passed back to our caller
-    # as |directive, param| 
-
-    def handle(text)
-      text.gsub!(/^([ \t#]*):(\w+):\s*(.+)?\n/) do 
-        prefix    = $1
-        directive = $2.downcase
-        param     = $3
-
-        case directive
-        when "include"
-          filename = param.split[0]
-          include_file(filename, prefix)
-
-        else
-          yield(directive, param)
-        end
-      end
-    end
-
-    #######
-    private
-    #######
-
-    # Include a file, indenting it correctly
-
-    def include_file(name, indent)
-      if (full_name = find_include_file(name))
-        content = File.open(full_name) {|f| f.read}
-        # strip leading '#'s, but only if all lines start with them
-        if content =~ /^[^#]/
-          content.gsub(/^/, indent)
-        else
-          content.gsub(/^#?/, indent)
-        end
-      else
-        $stderr.puts "Couldn't find file to include: '#{name}'"
-        ''
-      end
-    end
-
-    # Look for the given file in the directory containing the current
-    # file, and then in each of the directories specified in the
-    # RDOC_INCLUDE path
-
-    def find_include_file(name)
-      to_search = [ File.dirname(@input_file_name) ].concat @include_path
-      to_search.each do |dir|
-        full_name = File.join(dir, name)
-        stat = File.stat(full_name) rescue next
-        return full_name if stat.readable?
-      end
-      nil
-    end
-
-  end
-end
diff --git a/lib/rdoc/markup/simple_markup/to_flow.rb b/lib/rdoc/markup/simple_markup/to_flow.rb
deleted file mode 100644
index 048e71abce..0000000000
--- a/lib/rdoc/markup/simple_markup/to_flow.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-require 'rdoc/markup/simple_markup/fragments'
-require 'rdoc/markup/simple_markup/inline'
-require 'cgi'
-
-module SM
-
-  module Flow
-    P = Struct.new(:body)
-    VERB = Struct.new(:body)
-    RULE = Struct.new(:width)
-    class LIST
-      attr_reader :type, :contents
-      def initialize(type)
-        @type = type
-        @contents = []
-      end
-      def <<(stuff)
-        @contents << stuff
-      end
-    end
-    LI = Struct.new(:label, :body)
-    H = Struct.new(:level, :text)
-  end
-
-  class ToFlow
-    LIST_TYPE_TO_HTML = {
-      SM::ListBase::BULLET     =>  [ "<ul>", "</ul>" ],
-      SM::ListBase::NUMBER     =>  [ "<ol>", "</ol>" ],
-      SM::ListBase::UPPERALPHA =>  [ "<ol>", "</ol>" ],
-      SM::ListBase::LOWERALPHA =>  [ "<ol>", "</ol>" ],
-      SM::ListBase::LABELED    =>  [ "<dl>", "</dl>" ],
-      SM::ListBase::NOTE       =>  [ "<table>", "</table>" ],
-    }
-
-    InlineTag = Struct.new(:bit, :on, :off)
-
-    def initialize
-      init_tags
-    end
-
-    ##
-    # Set up the standard mapping of attributes to HTML tags
-    #
-    def init_tags
-      @attr_tags = [
-        InlineTag.new(SM::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
-        InlineTag.new(SM::Attribute.bitmap_for(:TT),   "<tt>", "</tt>"),
-        InlineTag.new(SM::Attribute.bitmap_for(:EM),   "<em>", "</em>"),
-      ]
-    end
-
-    ##
-    # Add a new set of HTML tags for an attribute. We allow
-    # separate start and end tags for flexibility
-    #
-    def add_tag(name, start, stop)
-      @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
-    end
-
-    ##
-    # Given an HTML tag, decorate it with class information
-    # and the like if required. This is a no-op in the base
-    # class, but is overridden in HTML output classes that
-    # implement style sheets
-
-    def annotate(tag)
-      tag
-    end
-
-    ## 
-    # Here's the client side of the visitor pattern
-
-    def start_accepting
-      @res = []
-      @list_stack = []
-    end
-
-    def end_accepting
-      @res
-    end
-
-    def accept_paragraph(am, fragment)
-      @res << Flow::P.new((convert_flow(am.flow(fragment.txt))))
-    end
-
-    def accept_verbatim(am, fragment)
-      @res << Flow::VERB.new((convert_flow(am.flow(fragment.txt))))
-    end
-
-    def accept_rule(am, fragment)
-      size = fragment.param
-      size = 10 if size > 10
-      @res << Flow::RULE.new(size)
-    end
-
-    def accept_list_start(am, fragment)
-      @list_stack.push(@res)
-      list = Flow::LIST.new(fragment.type)
-      @res << list
-      @res = list
-    end
-
-    def accept_list_end(am, fragment)
-      @res = @list_stack.pop
-    end
-
-    def accept_list_item(am, fragment)
-      @res << Flow::LI.new(fragment.param, convert_flow(am.flow(fragment.txt)))
-    end
-
-    def accept_blank_line(am, fragment)
-      # @res << annotate("<p />") << "\n"
-    end
-
-    def accept_heading(am, fragment)
-      @res << Flow::H.new(fragment.head_level, convert_flow(am.flow(fragment.txt)))
-    end
-
-
-    #######################################################################
-
-    private
-
-    #######################################################################
-
-    def on_tags(res, item)
-      attr_mask = item.turn_on
-      return if attr_mask.zero?
-
-      @attr_tags.each do |tag|
-        if attr_mask & tag.bit != 0
-          res << annotate(tag.on)
-        end
-      end
-    end
-
-    def off_tags(res, item)
-      attr_mask = item.turn_off
-      return if attr_mask.zero?
-
-      @attr_tags.reverse_each do |tag|
-        if attr_mask & tag.bit != 0
-          res << annotate(tag.off)
-        end
-      end
-    end
-
-    def convert_flow(flow)
-      res = ""
-      flow.each do |item|
-        case item
-        when String
-          res << convert_string(item)
-        when AttrChanger
-          off_tags(res, item)
-          on_tags(res,  item)
-        when Special
-          res << convert_special(item)
-        else
-          raise "Unknown flow element: #{item.inspect}"
-        end
-      end
-      res
-    end
-
-    # some of these patterns are taken from SmartyPants...
-
-    def convert_string(item)
-      CGI.escapeHTML(item)
-    end
-
-    def convert_special(special)
-      handled = false
-      Attribute.each_name_of(special.type) do |name|
-        method_name = "handle_special_#{name}"
-        if self.respond_to? method_name
-          special.text = send(method_name, special)
-          handled = true
-        end
-      end
-      raise "Unhandled special: #{special}" unless handled
-      special.text
-    end
-
-
-  end
-
-end
diff --git a/lib/rdoc/markup/simple_markup/to_html.rb b/lib/rdoc/markup/simple_markup/to_html.rb
deleted file mode 100644
index 26b5f4ce70..0000000000
--- a/lib/rdoc/markup/simple_markup/to_html.rb
+++ /dev/null
@@ -1,289 +0,0 @@
-require 'rdoc/markup/simple_markup/fragments'
-require 'rdoc/markup/simple_markup/inline'
-
-require 'cgi'
-
-module SM
-
-  class ToHtml
-
-    LIST_TYPE_TO_HTML = {
-      ListBase::BULLET =>  [ "<ul>", "</ul>" ],
-      ListBase::NUMBER =>  [ "<ol>", "</ol>" ],
-      ListBase::UPPERALPHA =>  [ "<ol>", "</ol>" ],
-      ListBase::LOWERALPHA =>  [ "<ol>", "</ol>" ],
-      ListBase::LABELED => [ "<dl>", "</dl>" ],
-      ListBase::NOTE    => [ "<table>", "</table>" ],
-    }
-
-    InlineTag = Struct.new(:bit, :on, :off)
-
-    def initialize
-      init_tags
-    end
-
-    ##
-    # Set up the standard mapping of attributes to HTML tags
-    #
-    def init_tags
-      @attr_tags = [
-        InlineTag.new(SM::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
-        InlineTag.new(SM::Attribute.bitmap_for(:TT),   "<tt>", "</tt>"),
-        InlineTag.new(SM::Attribute.bitmap_for(:EM),   "<em>", "</em>"),
-      ]
-    end
-
-    ##
-    # Add a new set of HTML tags for an attribute. We allow
-    # separate start and end tags for flexibility
-    #
-    def add_tag(name, start, stop)
-      @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
-    end
-
-    ##
-    # Given an HTML tag, decorate it with class information
-    # and the like if required. This is a no-op in the base
-    # class, but is overridden in HTML output classes that
-    # implement style sheets
-
-    def annotate(tag)
-      tag
-    end
-
-    ## 
-    # Here's the client side of the visitor pattern
-
-    def start_accepting
-      @res = ""
-      @in_list_entry = []
-    end
-
-    def end_accepting
-      @res
-    end
-
-    def accept_paragraph(am, fragment)
-      @res << annotate("<p>") + "\n"
-      @res << wrap(convert_flow(am.flow(fragment.txt)))
-      @res << annotate("</p>") + "\n"
-    end
-
-    def accept_verbatim(am, fragment)
-      @res << annotate("<pre>") + "\n"
-      @res << CGI.escapeHTML(fragment.txt)
-      @res << annotate("</pre>") << "\n"
-    end
-
-    def accept_rule(am, fragment)
-      size = fragment.param
-      size = 10 if size > 10
-      @res << "<hr size=\"#{size}\"></hr>"
-    end
-
-    def accept_list_start(am, fragment)
-      @res << html_list_name(fragment.type, true) <<"\n"
-      @in_list_entry.push false
-    end
-
-    def accept_list_end(am, fragment)
-      if tag = @in_list_entry.pop
-        @res << annotate(tag) << "\n"
-      end
-      @res << html_list_name(fragment.type, false) <<"\n"
-    end
-
-    def accept_list_item(am, fragment)
-      if tag = @in_list_entry.last
-        @res << annotate(tag) << "\n"
-      end
-      @res << list_item_start(am, fragment)
-      @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
-      @in_list_entry[-1] = list_end_for(fragment.type)
-    end
-
-    def accept_blank_line(am, fragment)
-      # @res << annotate("<p />") << "\n"
-    end
-
-    def accept_heading(am, fragment)
-      @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
-    end
-
-    # This is a higher speed (if messier) version of wrap
-
-    def wrap(txt, line_len = 76)
-      res = ""
-      sp = 0
-      ep = txt.length
-      while sp < ep
-        # scan back for a space
-        p = sp + line_len - 1
-        if p >= ep
-          p = ep
-        else
-          while p > sp and txt[p] != ?\s
-            p -= 1
-          end
-          if p <= sp
-            p = sp + line_len
-            while p < ep and txt[p] != ?\s
-              p += 1
-            end
-          end
-        end
-        res << txt[sp...p] << "\n"
-        sp = p
-        sp += 1 while sp < ep and txt[sp] == ?\s
-      end
-      res
-    end
-
-    #######################################################################
-
-    private
-
-    #######################################################################
-
-    def on_tags(res, item)
-      attr_mask = item.turn_on
-      return if attr_mask.zero?
-
-      @attr_tags.each do |tag|
-        if attr_mask & tag.bit != 0
-          res << annotate(tag.on)
-        end
-      end
-    end
-
-    def off_tags(res, item)
-      attr_mask = item.turn_off
-      return if attr_mask.zero?
-
-      @attr_tags.reverse_each do |tag|
-        if attr_mask & tag.bit != 0
-          res << annotate(tag.off)
-        end
-      end
-    end
-
-    def convert_flow(flow)
-      res = ""
-      flow.each do |item|
-        case item
-        when String
-          res << convert_string(item)
-        when AttrChanger
-          off_tags(res, item)
-          on_tags(res,  item)
-        when Special
-          res << convert_special(item)
-        else
-          raise "Unknown flow element: #{item.inspect}"
-        end
-      end
-      res
-    end
-
-    # some of these patterns are taken from SmartyPants...
-
-    def convert_string(item)
-      CGI.escapeHTML(item).
-      
-      
-      # convert -- to em-dash, (-- to en-dash)
-        gsub(/---?/, '&#8212;'). #gsub(/--/, '&#8211;').
-
-      # convert ... to elipsis (and make sure .... becomes .<elipsis>)
-        gsub(/\.\.\.\./, '.&#8230;').gsub(/\.\.\./, '&#8230;').
-
-      # convert single closing quote
-        gsub(%r{([^ \t\r\n\[\{\(])\'}) { "#$1&#8217;" }.
-        gsub(%r{\'(?=\W|s\b)}) { "&#8217;" }.
-
-      # convert single opening quote
-        gsub(/'/, '&#8216;').
-
-      # convert double closing quote
-        gsub(%r{([^ \t\r\n\[\{\(])\'(?=\W)}) { "#$1&#8221;" }.
-
-      # convert double opening quote
-        gsub(/'/, '&#8220;').
-
-      # convert copyright
-        gsub(/\(c\)/, '&#169;').
-
-      # convert and registered trademark
-        gsub(/\(r\)/, '&#174;')
-
-    end
-
-    def convert_special(special)
-      handled = false
-      Attribute.each_name_of(special.type) do |name|
-        method_name = "handle_special_#{name}"
-        if self.respond_to? method_name
-          special.text = send(method_name, special)
-          handled = true
-        end
-      end
-      raise "Unhandled special: #{special}" unless handled
-      special.text
-    end
-
-    def convert_heading(level, flow)
-      res =
-        annotate("<h#{level}>") + 
-        convert_flow(flow) + 
-        annotate("</h#{level}>\n")
-    end
-
-    def html_list_name(list_type, is_open_tag)
-      tags = LIST_TYPE_TO_HTML[list_type] || raise("Invalid list type: #{list_type.inspect}")
-      annotate(tags[ is_open_tag ? 0 : 1])
-    end
-
-    def list_item_start(am, fragment)
-      case fragment.type
-      when ListBase::BULLET, ListBase::NUMBER
-        annotate("<li>")
-
-      when ListBase::UPPERALPHA
-	annotate("<li type=\"A\">")
-
-      when ListBase::LOWERALPHA
-	annotate("<li type=\"a\">")
-
-      when ListBase::LABELED
-        annotate("<dt>") +
-          convert_flow(am.flow(fragment.param)) + 
-          annotate("</dt>") +
-          annotate("<dd>")
-
-      when ListBase::NOTE
-        annotate("<tr>") +
-          annotate("<td valign=\"top\">") +
-          convert_flow(am.flow(fragment.param)) + 
-          annotate("</td>") +
-          annotate("<td>")
-      else
-        raise "Invalid list type"
-      end
-    end
-
-    def list_end_for(fragment_type)
-      case fragment_type
-      when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA
-        "</li>"
-      when ListBase::LABELED
-        "</dd>"
-      when ListBase::NOTE
-        "</td></tr>"
-      else
-        raise "Invalid list type"
-      end
-    end
-
-  end
-
-end
diff --git a/lib/rdoc/markup/simple_markup/to_latex.rb b/lib/rdoc/markup/simple_markup/to_latex.rb
deleted file mode 100644
index 6c16278652..0000000000
--- a/lib/rdoc/markup/simple_markup/to_latex.rb
+++ /dev/null
@@ -1,333 +0,0 @@
-require 'rdoc/markup/simple_markup/fragments'
-require 'rdoc/markup/simple_markup/inline'
-
-require 'cgi'
-
-module SM
-
-  # Convert SimpleMarkup to basic LaTeX report format
-
-  class ToLaTeX
-
-    BS = "\020"   # \
-    OB = "\021"   # {
-    CB = "\022"   # }
-    DL = "\023"   # Dollar
-
-    BACKSLASH   = "#{BS}symbol#{OB}92#{CB}"
-    HAT         = "#{BS}symbol#{OB}94#{CB}"
-    BACKQUOTE   = "#{BS}symbol#{OB}0#{CB}"
-    TILDE       = "#{DL}#{BS}sim#{DL}"
-    LESSTHAN    = "#{DL}<#{DL}"
-    GREATERTHAN = "#{DL}>#{DL}"
-
-    def self.l(str)
-      str.tr('\\', BS).tr('{', OB).tr('}', CB).tr('$', DL)
-    end
-
-    def l(arg)
-      SM::ToLaTeX.l(arg)
-    end
-
-    LIST_TYPE_TO_LATEX = {
-      ListBase::BULLET =>  [ l("\\begin{itemize}"), l("\\end{itemize}") ],
-      ListBase::NUMBER =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\arabic" ],
-      ListBase::UPPERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\Alph" ],
-      ListBase::LOWERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\alph" ],
-      ListBase::LABELED => [ l("\\begin{description}"), l("\\end{description}") ],
-      ListBase::NOTE    => [
-        l("\\begin{tabularx}{\\linewidth}{@{} l X @{}}"), 
-        l("\\end{tabularx}") ],
-    }
-
-    InlineTag = Struct.new(:bit, :on, :off)
-
-    def initialize
-      init_tags
-      @list_depth = 0
-      @prev_list_types = []
-    end
-
-    ##
-    # Set up the standard mapping of attributes to LaTeX
-    #
-    def init_tags
-      @attr_tags = [
-        InlineTag.new(SM::Attribute.bitmap_for(:BOLD), l("\\textbf{"), l("}")),
-        InlineTag.new(SM::Attribute.bitmap_for(:TT),   l("\\texttt{"), l("}")),
-        InlineTag.new(SM::Attribute.bitmap_for(:EM),   l("\\emph{"), l("}")),
-      ]
-    end
-
-    ##
-    # Escape a LaTeX string
-    def escape(str)
-# $stderr.print "FE: ", str
-      s = str.
-#        sub(/\s+$/, '').
-        gsub(/([_\${}&%#])/, "#{BS}\\1").
-        gsub(/\\/, BACKSLASH).
-        gsub(/\^/, HAT).
-        gsub(/~/,  TILDE).
-        gsub(/</,  LESSTHAN).
-        gsub(/>/,  GREATERTHAN).
-        gsub(/,,/, ",{},").
-        gsub(/\`/,  BACKQUOTE)
-# $stderr.print "-> ", s, "\n"
-      s
-    end
-
-    ##
-    # Add a new set of LaTeX tags for an attribute. We allow
-    # separate start and end tags for flexibility
-    #
-    def add_tag(name, start, stop)
-      @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
-    end
-
-
-    ## 
-    # Here's the client side of the visitor pattern
-
-    def start_accepting
-      @res = ""
-      @in_list_entry = []
-    end
-
-    def end_accepting
-      @res.tr(BS, '\\').tr(OB, '{').tr(CB, '}').tr(DL, '$')
-    end
-
-    def accept_paragraph(am, fragment)
-      @res << wrap(convert_flow(am.flow(fragment.txt)))
-      @res << "\n"
-    end
-
-    def accept_verbatim(am, fragment)
-      @res << "\n\\begin{code}\n"
-      @res << fragment.txt.sub(/[\n\s]+\Z/, '')
-      @res << "\n\\end{code}\n\n"
-    end
-
-    def accept_rule(am, fragment)
-      size = fragment.param
-      size = 10 if size > 10
-      @res << "\n\n\\rule{\\linewidth}{#{size}pt}\n\n"
-    end
-
-    def accept_list_start(am, fragment)
-      @res << list_name(fragment.type, true) <<"\n"
-      @in_list_entry.push false
-    end
-
-    def accept_list_end(am, fragment)
-      if tag = @in_list_entry.pop
-        @res << tag << "\n"
-      end
-      @res << list_name(fragment.type, false) <<"\n"
-    end
-
-    def accept_list_item(am, fragment)
-      if tag = @in_list_entry.last
-        @res << tag << "\n"
-      end
-      @res << list_item_start(am, fragment)
-      @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
-      @in_list_entry[-1] = list_end_for(fragment.type)
-    end
-
-    def accept_blank_line(am, fragment)
-      # @res << "\n"
-    end
-
-    def accept_heading(am, fragment)
-      @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
-    end
-
-    # This is a higher speed (if messier) version of wrap
-
-    def wrap(txt, line_len = 76)
-      res = ""
-      sp = 0
-      ep = txt.length
-      while sp < ep
-        # scan back for a space
-        p = sp + line_len - 1
-        if p >= ep
-          p = ep
-        else
-          while p > sp and txt[p] != ?\s
-            p -= 1
-          end
-          if p <= sp
-            p = sp + line_len
-            while p < ep and txt[p] != ?\s
-              p += 1
-            end
-          end
-        end
-        res << txt[sp...p] << "\n"
-        sp = p
-        sp += 1 while sp < ep and txt[sp] == ?\s
-      end
-      res
-    end
-
-    #######################################################################
-
-    private
-
-    #######################################################################
-
-    def on_tags(res, item)
-      attr_mask = item.turn_on
-      return if attr_mask.zero?
-
-      @attr_tags.each do |tag|
-        if attr_mask & tag.bit != 0
-          res << tag.on
-        end
-      end
-    end
-
-    def off_tags(res, item)
-      attr_mask = item.turn_off
-      return if attr_mask.zero?
-
-      @attr_tags.reverse_each do |tag|
-        if attr_mask & tag.bit != 0
-          res << tag.off
-        end
-      end
-    end
-
-    def convert_flow(flow)
-      res = ""
-      flow.each do |item|
-        case item
-        when String
-#          $stderr.puts "Converting '#{item}'"
-          res << convert_string(item)
-        when AttrChanger
-          off_tags(res, item)
-          on_tags(res,  item)
-        when Special
-          res << convert_special(item)
-        else
-          raise "Unknown flow element: #{item.inspect}"
-        end
-      end
-      res
-    end
-
-    # some of these patterns are taken from SmartyPants...
-
-    def convert_string(item)
-
-      escape(item).
-      
-      
-      # convert ... to elipsis (and make sure .... becomes .<elipsis>)
-        gsub(/\.\.\.\./, '.\ldots{}').gsub(/\.\.\./, '\ldots{}').
-
-      # convert single closing quote
-        gsub(%r{([^ \t\r\n\[\{\(])\'}) { "#$1'" }.
-        gsub(%r{\'(?=\W|s\b)}) { "'" }.
-
-      # convert single opening quote
-        gsub(/'/, '`').
-
-      # convert double closing quote
-        gsub(%r{([^ \t\r\n\[\{\(])\"(?=\W)}) { "#$1''" }.
-
-      # convert double opening quote
-        gsub(/"/, "``").
-
-      # convert copyright
-        gsub(/\(c\)/, '\copyright{}')
-
-    end
-
-    def convert_special(special)
-      handled = false
-      Attribute.each_name_of(special.type) do |name|
-        method_name = "handle_special_#{name}"
-        if self.respond_to? method_name
-          special.text = send(method_name, special)
-          handled = true
-        end
-      end
-      raise "Unhandled special: #{special}" unless handled
-      special.text
-    end
-
-    def convert_heading(level, flow)
-      res =
-        case level
-        when 1 then "\\chapter{"
-        when 2 then "\\section{"
-        when 3 then "\\subsection{"
-        when 4 then "\\subsubsection{"
-        else  "\\paragraph{"
-        end +
-        convert_flow(flow) + 
-        "}\n"
-    end
-
-    def list_name(list_type, is_open_tag)
-      tags = LIST_TYPE_TO_LATEX[list_type] || raise("Invalid list type: #{list_type.inspect}")
-      if tags[2] # enumerate
-        if is_open_tag
-          @list_depth += 1
-          if @prev_list_types[@list_depth] != tags[2]
-            case @list_depth
-            when 1
-              roman = "i"
-            when 2
-              roman = "ii"
-            when 3
-              roman = "iii"
-            when 4
-              roman = "iv"
-            else
-              raise("Too deep list: level #{@list_depth}")
-            end
-            @prev_list_types[@list_depth] = tags[2]
-            return l("\\renewcommand{\\labelenum#{roman}}{#{tags[2]}{enum#{roman}}}") + "\n" + tags[0]
-          end
-        else
-          @list_depth -= 1
-        end
-      end
-      tags[ is_open_tag ? 0 : 1]
-    end
-
-    def list_item_start(am, fragment)
-      case fragment.type
-      when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA
-        "\\item "
-
-      when ListBase::LABELED
-        "\\item[" + convert_flow(am.flow(fragment.param)) + "] "
-
-      when ListBase::NOTE
-          convert_flow(am.flow(fragment.param)) + " & "
-      else
-        raise "Invalid list type"
-      end
-    end
-
-    def list_end_for(fragment_type)
-      case fragment_type
-      when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA, ListBase::LABELED
-        ""
-      when ListBase::NOTE
-        "\\\\\n"
-      else
-        raise "Invalid list type"
-      end
-    end
-
-  end
-
-end
diff --git a/lib/rdoc/markup/test/AllTests.rb b/lib/rdoc/markup/test/AllTests.rb
deleted file mode 100644
index b9c8c9dfcc..0000000000
--- a/lib/rdoc/markup/test/AllTests.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'TestParse.rb'
-require 'TestInline.rb'
diff --git a/lib/rdoc/markup/test/TestInline.rb b/lib/rdoc/markup/test/TestInline.rb
deleted file mode 100644
index a067d4c24c..0000000000
--- a/lib/rdoc/markup/test/TestInline.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require "test/unit"
-
-$:.unshift "../../.."
-
-require "rdoc/markup/simple_markup/inline"
-
-class TestInline < Test::Unit::TestCase
-
-
-  def setup
-    @am = SM::AttributeManager.new
-
-    @bold_on  = @am.changed_attribute_by_name([], [:BOLD])
-    @bold_off = @am.changed_attribute_by_name([:BOLD], [])
-    
-    @tt_on    = @am.changed_attribute_by_name([], [:TT])
-    @tt_off   = @am.changed_attribute_by_name([:TT], [])
-    
-    @em_on    = @am.changed_attribute_by_name([], [:EM])
-    @em_off   = @am.changed_attribute_by_name([:EM], [])
-    
-    @bold_em_on   = @am.changed_attribute_by_name([], [:BOLD] | [:EM])
-    @bold_em_off  = @am.changed_attribute_by_name([:BOLD] | [:EM], [])
-    
-    @em_then_bold = @am.changed_attribute_by_name([:EM], [:EM] | [:BOLD])
-    
-    @em_to_bold   = @am.changed_attribute_by_name([:EM], [:BOLD])
-    
-    @am.add_word_pair("{", "}", :WOMBAT)
-    @wombat_on    = @am.changed_attribute_by_name([], [:WOMBAT])
-    @wombat_off   = @am.changed_attribute_by_name([:WOMBAT], [])
-  end
-
-  def crossref(text)
-    [ @am.changed_attribute_by_name([], [:CROSSREF] | [:_SPECIAL_]),
-      SM::Special.new(33, text),
-      @am.changed_attribute_by_name([:CROSSREF] | [:_SPECIAL_], [])
-    ]
-  end
-
-  def test_special
-    # class names, variable names, file names, or instance variables
-    @am.add_special(/(
-                       \b([A-Z]\w+(::\w+)*)
-                       | \#\w+[!?=]?
-                       | \b\w+([_\/\.]+\w+)+[!?=]?
-                      )/x, 
-                    :CROSSREF)
-    
-    assert_equal(["cat"], @am.flow("cat"))
-
-    assert_equal(["cat ", crossref("#fred"), " dog"].flatten,
-                  @am.flow("cat #fred dog"))
-
-    assert_equal([crossref("#fred"), " dog"].flatten,
-                  @am.flow("#fred dog"))
-
-    assert_equal(["cat ", crossref("#fred")].flatten, @am.flow("cat #fred"))
-  end
-
-  def test_basic
-    assert_equal(["cat"], @am.flow("cat"))
-
-    assert_equal(["cat ", @bold_on, "and", @bold_off, " dog"],
-                  @am.flow("cat *and* dog"))
-
-    assert_equal(["cat ", @bold_on, "AND", @bold_off, " dog"],
-                  @am.flow("cat *AND* dog"))
-
-    assert_equal(["cat ", @em_on, "And", @em_off, " dog"],
-                  @am.flow("cat _And_ dog"))
-
-    assert_equal(["cat *and dog*"], @am.flow("cat *and dog*"))
-
-    assert_equal(["*cat and* dog"], @am.flow("*cat and* dog"))
-
-    assert_equal(["cat *and ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat *and *dog*"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " dog"],
-                  @am.flow("cat _and_ dog"))
-
-    assert_equal(["cat_and_dog"],
-                  @am.flow("cat_and_dog"))
-
-    assert_equal(["cat ", @tt_on, "and", @tt_off, " dog"],
-                  @am.flow("cat +and+ dog"))
-
-    assert_equal(["cat ", @bold_on, "a_b_c", @bold_off, " dog"],
-                  @am.flow("cat *a_b_c* dog"))
-
-    assert_equal(["cat __ dog"],
-                  @am.flow("cat __ dog"))
-
-    assert_equal(["cat ", @em_on, "_", @em_off, " dog"],
-                  @am.flow("cat ___ dog"))
-
-  end
-
-  def test_combined
-    assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat _and_ *dog*"))
-
-    assert_equal(["cat ", @em_on, "a__nd", @em_off, " ", @bold_on, "dog", @bold_off], 
-                  @am.flow("cat _a__nd_ *dog*"))
-  end
-
-  def test_html_like
-    assert_equal(["cat ", @tt_on, "dog", @tt_off], @am.flow("cat <tt>dog</Tt>"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off], 
-                  @am.flow("cat <i>and</i> <B>dog</b>"))
-    
-    assert_equal(["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off], 
-                  @am.flow("cat <i>and <B>dog</B></I>"))
-    
-    assert_equal(["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off], 
-                  @am.flow("cat <i>and </i><b>dog</b>"))
-    
-    assert_equal(["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off], 
-                  @am.flow("cat <i>and <b></i>dog</b>"))
-    
-    assert_equal([@tt_on, "cat", @tt_off, " ", @em_on, "and ", @em_to_bold, "dog", @bold_off], 
-                  @am.flow("<tt>cat</tt> <i>and <b></i>dog</b>"))
-
-    assert_equal(["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off], 
-                  @am.flow("cat <i>and <b>dog</b></i>"))
-    
-    assert_equal(["cat ", @bold_em_on, "and", @bold_em_off, " dog"], 
-                  @am.flow("cat <i><b>and</b></i> dog"))
-    
-    
-  end
-
-  def test_protect
-    assert_equal(['cat \\ dog'], @am.flow('cat \\ dog'))
-
-    assert_equal(["cat <tt>dog</Tt>"], @am.flow("cat \\<tt>dog</Tt>"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " <B>dog</b>"], 
-                  @am.flow("cat <i>and</i> \\<B>dog</b>"))
-    
-    assert_equal(["*word* or <b>text</b>"], @am.flow("\\*word* or \\<b>text</b>"))
-
-    assert_equal(["_cat_", @em_on, "dog", @em_off], 
-                  @am.flow("\\_cat_<i>dog</i>"))
-  end
-
-  def test_adding
-    assert_equal(["cat ", @wombat_on, "and", @wombat_off, " dog" ],
-                  @am.flow("cat {and} dog"))
-#    assert_equal(["cat {and} dog" ], @am.flow("cat \\{and} dog"))
-  end
-end
diff --git a/lib/rdoc/markup/test/TestParse.rb b/lib/rdoc/markup/test/TestParse.rb
deleted file mode 100644
index 3ec541ce7a..0000000000
--- a/lib/rdoc/markup/test/TestParse.rb
+++ /dev/null
@@ -1,503 +0,0 @@
-require 'test/unit'
-
-$:.unshift "../../.."
-
-require 'rdoc/markup/simple_markup'
-
-include SM
-
-class TestParse < Test::Unit::TestCase
-
-  class MockOutput
-    def start_accepting
-      @res = []
-      end
-    
-    def end_accepting
-      @res
-    end
-
-    def accept_paragraph(am, fragment)
-      @res << fragment.to_s
-    end
-
-    def accept_verbatim(am, fragment)
-      @res << fragment.to_s
-    end
-
-    def accept_list_start(am, fragment)
-      @res << fragment.to_s
-    end
-
-    def accept_list_end(am, fragment)
-      @res << fragment.to_s
-    end
-
-    def accept_list_item(am, fragment)
-      @res << fragment.to_s
-    end
-
-    def accept_blank_line(am, fragment)
-      @res << fragment.to_s
-    end
-
-    def accept_heading(am, fragment)
-      @res << fragment.to_s
-    end
-
-    def accept_rule(am, fragment)
-      @res << fragment.to_s
-    end
-
-  end
-
-  def basic_conv(str)
-    sm = SimpleMarkup.new
-    mock = MockOutput.new
-    sm.convert(str, mock)
-    sm.content
-  end
-
-  def line_types(str, expected)
-    p = SimpleMarkup.new
-    mock = MockOutput.new
-    p.convert(str, mock)
-    assert_equal(expected, p.get_line_types.map{|type| type.to_s[0,1]}.join(''))
-  end
-
-  def line_groups(str, expected)
-    p = SimpleMarkup.new
-    mock = MockOutput.new
-
-    block = p.convert(str, mock)
-
-    if block != expected
-      rows = (0...([expected.size, block.size].max)).collect{|i|
-        [expected[i]||"nil", block[i]||"nil"] 
-      }
-      printf "\n\n%35s %35s\n", "Expected", "Got"
-      rows.each {|e,g| printf "%35s %35s\n", e.dump, g.dump }
-    end
-
-    assert_equal(expected, block)
-  end
-
-  def test_tabs
-    str = "hello\n  dave"
-    assert_equal(str, basic_conv(str))
-    str = "hello\n\tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n \tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n  \tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n   \tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n    \tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n     \tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n      \tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n       \tdave"
-    assert_equal("hello\n        dave", basic_conv(str))
-    str = "hello\n        \tdave"
-    assert_equal("hello\n                dave", basic_conv(str))
-    str = ".\t\t."
-    assert_equal(".               .", basic_conv(str))
-  end
-
-  def test_whitespace
-    assert_equal("hello", basic_conv("hello"))
-    assert_equal("hello", basic_conv(" hello "))
-    assert_equal("hello", basic_conv(" \t \t hello\t\t"))
-
-    assert_equal("1\n 2\n  3", basic_conv("1\n 2\n  3"))
-    assert_equal("1\n 2\n  3", basic_conv("  1\n   2\n    3"))
-
-    assert_equal("1\n 2\n  3\n1\n 2", basic_conv("1\n 2\n  3\n1\n 2"))
-    assert_equal("1\n 2\n  3\n1\n 2", basic_conv("  1\n   2\n    3\n  1\n   2"))
-
-    assert_equal("1\n 2\n\n  3", basic_conv("  1\n   2\n\n    3"))
-  end
-
-  def test_types
-    str = "now is the time"
-    line_types(str, 'P')
-
-    str = "now is the time\nfor all good men"
-    line_types(str, 'PP')
-
-    str = "now is the time\n  code\nfor all good men"
-    line_types(str, 'PVP')
-
-    str = "now is the time\n  code\n more code\nfor all good men"
-    line_types(str, 'PVVP')
-
-    str = "now is\n---\nthe time"
-    line_types(str, 'PRP')
-
-    str = %{\
-       now is
-       * l1
-       * l2
-       the time}
-    line_types(str, 'PLLP')
-
-    str = %{\
-       now is
-       * l1
-         l1+
-       * l2
-       the time}
-    line_types(str, 'PLPLP')
-
-    str = %{\
-       now is
-       * l1
-         * l1.1
-       * l2
-       the time}
-    line_types(str, 'PLLLP')
-
-    str = %{\
-       now is
-       * l1
-         * l1.1
-           text
-             code
-             code
-
-           text
-       * l2
-       the time}
-    line_types(str, 'PLLPVVBPLP')
-
-    str = %{\
-       now is
-       1. l1
-          * l1.1
-       2. l2
-       the time}
-    line_types(str, 'PLLLP')
-
-    str = %{\
-       now is
-       [cat] l1
-             * l1.1
-       [dog] l2
-       the time}
-    line_types(str, 'PLLLP')
-
-    str = %{\
-       now is
-       [cat] l1
-             continuation
-       [dog] l2
-       the time}
-    line_types(str, 'PLPLP')
-  end
-
-  def test_groups
-    str = "now is the time"
-    line_groups(str, ["L0: Paragraph\nnow is the time"] )
-
-    str = "now is the time\nfor all good men"
-    line_groups(str, ["L0: Paragraph\nnow is the time for all good men"] )
-
-    str = %{\
-      now is the time
-        code _line_ here
-      for all good men}
-
-    line_groups(str,
-                [ "L0: Paragraph\nnow is the time",
-                  "L0: Verbatim\n  code _line_ here\n",
-                  "L0: Paragraph\nfor all good men"
-                ] )
-
-    str = "now is the time\n  code\n more code\nfor all good men"
-    line_groups(str,
-                [ "L0: Paragraph\nnow is the time",
-                  "L0: Verbatim\n  code\n more code\n",
-                  "L0: Paragraph\nfor all good men"
-                ] )
-
-    str = %{\
-       now is
-       * l1
-       * l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-    str = %{\
-       now is
-       * l1
-         l1+
-       * l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1 l1+",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-    str = %{\
-       now is
-       * l1
-         * l1.1
-       * l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1",
-                  "L2: ListStart\n",
-                  "L2: ListItem\nl1.1",
-                  "L2: ListEnd\n",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-    str = %{\
-       now is
-       * l1
-         * l1.1
-           text
-             code
-               code
-
-           text
-       * l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1",
-                  "L2: ListStart\n",
-                  "L2: ListItem\nl1.1 text",
-                  "L2: Verbatim\n  code\n    code\n",
-                  "L2: Paragraph\ntext",
-                  "L2: ListEnd\n",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-    str = %{\
-       now is
-       1. l1
-          * l1.1
-       2. l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1",
-                  "L2: ListStart\n",
-                  "L2: ListItem\nl1.1",
-                  "L2: ListEnd\n",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-    str = %{\
-       now is
-       [cat] l1
-             * l1.1
-       [dog] l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1",
-                  "L2: ListStart\n",
-                  "L2: ListItem\nl1.1",
-                  "L2: ListEnd\n",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-    str = %{\
-       now is
-       [cat] l1
-             continuation
-       [dog] l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1 continuation",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-    
-  end
-
-  def test_verbatim_merge
-    str = %{\
-       now is
-          code
-       the time}
-
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L0: Verbatim\n   code\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-    str = %{\
-       now is
-          code
-          code1
-       the time}
-
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L0: Verbatim\n   code\n   code1\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-    str = %{\
-       now is
-          code
-
-          code1
-       the time}
-
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L0: Verbatim\n   code\n\n   code1\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-    str = %{\
-       now is
-          code
-
-          code1
-
-       the time}
-
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L0: Verbatim\n   code\n\n   code1\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-    str = %{\
-       now is
-          code
-
-          code1
-
-          code2
-       the time}
-
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L0: Verbatim\n   code\n\n   code1\n\n   code2\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-    # Folds multiple blank lines
-    str = %{\
-       now is
-          code
-
-
-          code1
-
-       the time}
-
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L0: Verbatim\n   code\n\n   code1\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-
-  end
- 
-  def test_list_split
-    str = %{\
-       now is
-       * l1
-       1. n1
-       2. n2
-       * l2
-       the time}
-    line_groups(str,
-                [ "L0: Paragraph\nnow is",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl1",
-                  "L1: ListEnd\n",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nn1",
-                  "L1: ListItem\nn2",
-                  "L1: ListEnd\n",
-                  "L1: ListStart\n",
-                  "L1: ListItem\nl2",
-                  "L1: ListEnd\n",
-                  "L0: Paragraph\nthe time"
-                ])
-
-  end
-
-
-  def test_headings
-    str = "= heading one"
-    line_groups(str, 
-                [ "L0: Heading\nheading one"
-                ])
-
-    str = "=== heading three"
-    line_groups(str, 
-                [ "L0: Heading\nheading three"
-                ])
-
-    str = "text\n   === heading three"
-    line_groups(str, 
-                [ "L0: Paragraph\ntext",
-                  "L0: Verbatim\n   === heading three\n"
-                ])
-
-    str = "text\n   code\n   === heading three"
-    line_groups(str, 
-                [ "L0: Paragraph\ntext",
-                  "L0: Verbatim\n   code\n   === heading three\n"
-                ])
-
-    str = "text\n   code\n=== heading three"
-    line_groups(str, 
-                [ "L0: Paragraph\ntext",
-                  "L0: Verbatim\n   code\n",
-                  "L0: Heading\nheading three"
-                ])
-
-  end
-
-  
-end
diff --git a/lib/rdoc/markup/to_ansi.rb b/lib/rdoc/markup/to_ansi.rb
new file mode 100644
index 0000000000..9a5be8babb
--- /dev/null
+++ b/lib/rdoc/markup/to_ansi.rb
@@ -0,0 +1,72 @@
+require 'rdoc/markup/inline'
+
+##
+# Outputs RDoc markup with vibrant ANSI color!
+
+class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
+
+  def initialize
+    super
+
+    @headings.clear
+    @headings[1] = ["\e[1;32m", "\e[m"]
+    @headings[2] = ["\e[4;32m", "\e[m"]
+    @headings[3] = ["\e[32m",   "\e[m"]
+  end
+
+  ##
+  # Maps attributes to ANSI sequences
+
+  def init_tags
+    add_tag :BOLD, "\e[1m", "\e[m"
+    add_tag :TT,   "\e[7m", "\e[m"
+    add_tag :EM,   "\e[4m", "\e[m"
+  end
+
+  def accept_list_item_end list_item
+    width = case @list_type.last
+            when :BULLET then
+              2
+            when :NOTE, :LABEL then
+              @res << "\n"
+              2
+            else
+              bullet = @list_index.last.to_s
+              @list_index[-1] = @list_index.last.succ
+              bullet.length + 2
+            end
+
+    @indent -= width
+  end
+
+  def accept_list_item_start list_item
+    bullet = case @list_type.last
+             when :BULLET then
+               '*'
+             when :NOTE, :LABEL then
+               attributes(list_item.label) + ":\n"
+             else
+               @list_index.last.to_s + '.'
+             end
+
+    case @list_type.last
+    when :NOTE, :LABEL then
+      @indent += 2
+      @prefix = bullet + (' ' * @indent)
+    else
+      @prefix = (' ' * @indent) + bullet.ljust(bullet.length + 1)
+
+      width = bullet.gsub(/\e\[[\d;]*m/, '').length + 1
+
+      @indent += width
+    end
+  end
+
+  def start_accepting
+    super
+
+    @res = ["\e[0m"]
+  end
+
+end
+
diff --git a/lib/rdoc/markup/to_bs.rb b/lib/rdoc/markup/to_bs.rb
new file mode 100644
index 0000000000..e7af129824
--- /dev/null
+++ b/lib/rdoc/markup/to_bs.rb
@@ -0,0 +1,74 @@
+require 'rdoc/markup/inline'
+
+##
+# Outputs RDoc markup with hot backspace action!  You will probably need a
+# pager to use this output format.
+#
+# This formatter won't work on 1.8.6 because it lacks String#chars.
+
+class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
+
+  def initialize
+    super
+
+    @in_b  = false
+    @in_em = false
+  end
+
+  ##
+  # Sets a flag that is picked up by #annotate to do the right thing in
+  # #convert_string
+
+  def init_tags
+    add_tag :BOLD, '+b', '-b'
+    add_tag :EM,   '+_', '-_'
+  end
+
+  def accept_heading heading
+    use_prefix or @res << ' ' * @indent
+    @res << @headings[heading.level][0]
+    @in_b = true
+    @res << attributes(heading.text)
+    @in_b = false
+    @res << @headings[heading.level][1]
+    @res << "\n"
+  end
+
+  ##
+  # Turns on or off special handling for +convert_string+
+
+  def annotate tag
+    case tag
+    when '+b' then @in_b = true
+    when '-b' then @in_b = false
+    when '+_' then @in_em = true
+    when '-_' then @in_em = false
+    end
+
+    ''
+  end
+
+  ##
+  # Calls convert_string on the result of convert_special
+
+  def convert_special special
+    convert_string super
+  end
+
+  ##
+  # Adds bold or underline mixed with backspaces
+
+  def convert_string string
+    return string unless string.respond_to? :chars # your ruby is lame
+    return string unless @in_b or @in_em
+    chars = if @in_b then
+              string.chars.map do |char| "#{char}\b#{char}" end
+            elsif @in_em then
+              string.chars.map do |char| "_\b#{char}" end
+            end
+
+    chars.join
+  end
+
+end
+
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
new file mode 100644
index 0000000000..74e3137eb2
--- /dev/null
+++ b/lib/rdoc/markup/to_html.rb
@@ -0,0 +1,344 @@
+require 'rdoc/markup/formatter'
+require 'rdoc/markup/inline'
+
+require 'cgi'
+
+##
+# Outputs RDoc markup as HTML
+
+class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
+
+  ##
+  # Maps RDoc::Markup::Parser::LIST_TOKENS types to HTML tags
+
+  LIST_TYPE_TO_HTML = {
+    :BULLET => ['<ul>', '</ul>'],
+    :LABEL  => ['<dl>', '</dl>'],
+    :LALPHA => ['<ol style="display: lower-alpha">', '</ol>'],
+    :NOTE   => ['<table>', '</table>'],
+    :NUMBER => ['<ol>', '</ol>'],
+    :UALPHA => ['<ol style="display: upper-alpha">', '</ol>'],
+  }
+
+  attr_reader :res # :nodoc:
+  attr_reader :in_list_entry # :nodoc:
+  attr_reader :list # :nodoc:
+
+  ##
+  # Converts a target url to one that is relative to a given path
+
+  def self.gen_relative_url(path, target)
+    from        = File.dirname path
+    to, to_file = File.split target
+
+    from = from.split "/"
+    to   = to.split "/"
+
+    from.delete '.'
+    to.delete '.'
+
+    while from.size > 0 and to.size > 0 and from[0] == to[0] do
+      from.shift
+      to.shift
+    end
+
+    from.fill ".."
+    from.concat to
+    from << to_file
+    File.join(*from)
+  end
+
+  def initialize
+    super
+
+    @th = nil
+    @in_list_entry = nil
+    @list = nil
+
+    # external hyperlinks
+    @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
+
+    # and links of the form  <text>[<url>]
+    @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
+
+    init_tags
+  end
+
+  ##
+  # Maps attributes to HTML tags
+
+  def init_tags
+    add_tag :BOLD, "<b>",  "</b>"
+    add_tag :TT,   "<tt>", "</tt>"
+    add_tag :EM,   "<em>", "</em>"
+  end
+
+  ##
+  # Generate a hyperlink for url, labeled with text. Handle the
+  # special cases for img: and link: described under handle_special_HYPERLINK
+
+  def gen_url(url, text)
+    if url =~ /([A-Za-z]+):(.*)/ then
+      type = $1
+      path = $2
+    else
+      type = "http"
+      path = url
+      url  = "http://#{url}"
+    end
+
+    if type == "link" then
+      url = if path[0, 1] == '#' then # is this meaningful?
+              path
+            else
+              self.class.gen_relative_url @from_path, path
+            end
+    end
+
+    if (type == "http" or type == "link") and
+       url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then
+      "<img src=\"#{url}\" />"
+    else
+      "<a href=\"#{url}\">#{text.sub(%r{^#{type}:/*}, '')}</a>"
+    end
+  end
+
+  ##
+  # And we're invoked with a potential external hyperlink mailto:
+  # just gets inserted. http: links are checked to see if they
+  # reference an image. If so, that image gets inserted using an
+  # <img> tag. Otherwise a conventional <a href> is used.  We also
+  # support a special type of hyperlink, link:, which is a reference
+  # to a local file whose path is relative to the --op directory.
+
+  def handle_special_HYPERLINK(special)
+    url = special.text
+    gen_url url, url
+  end
+
+  ##
+  # Here's a hypedlink where the label is different to the URL
+  #  <label>[url] or {long label}[url]
+
+  def handle_special_TIDYLINK(special)
+    text = special.text
+
+    return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
+
+    label = $1
+    url   = $2
+    gen_url url, label
+  end
+
+  ##
+  # This is a higher speed (if messier) version of wrap
+
+  def wrap(txt, line_len = 76)
+    res = []
+    sp = 0
+    ep = txt.length
+
+    while sp < ep
+      # scan back for a space
+      p = sp + line_len - 1
+      if p >= ep
+        p = ep
+      else
+        while p > sp and txt[p] != ?\s
+          p -= 1
+        end
+        if p <= sp
+          p = sp + line_len
+          while p < ep and txt[p] != ?\s
+            p += 1
+          end
+        end
+      end
+      res << txt[sp...p] << "\n"
+      sp = p
+      sp += 1 while sp < ep and txt[sp] == ?\s
+    end
+
+    res.join
+  end
+
+  ##
+  # :section: Visitor
+
+  def start_accepting
+    @res = []
+    @in_list_entry = []
+    @list = []
+  end
+
+  def end_accepting
+    @res.join
+  end
+
+  def accept_paragraph(paragraph)
+    @res << annotate("<p>") + "\n"
+    @res << wrap(convert_flow(@am.flow(paragraph.text)))
+    @res << annotate("</p>") + "\n"
+  end
+
+  def accept_verbatim(verbatim)
+    @res << annotate("<pre>") << "\n"
+    @res << CGI.escapeHTML(verbatim.text)
+    @res << annotate("</pre>") << "\n"
+  end
+
+  def accept_rule(rule)
+    size = rule.weight
+    size = 10 if size > 10
+    @res << "<hr style=\"height: #{size}px\"></hr>"
+  end
+
+  def accept_list_start(list)
+    @list << list.type
+    @res << html_list_name(list.type, true) << "\n"
+    @in_list_entry.push false
+  end
+
+  def accept_list_end(list)
+    @list.pop
+    if tag = @in_list_entry.pop
+      @res << annotate(tag) << "\n"
+    end
+    @res << html_list_name(list.type, false) << "\n"
+  end
+
+  def accept_list_item_start(list_item)
+    if tag = @in_list_entry.last
+      @res << annotate(tag) << "\n"
+    end
+
+    @res << list_item_start(list_item, @list.last)
+  end
+
+  def accept_list_item_end(list_item)
+    @in_list_entry[-1] = list_end_for(@list.last)
+  end
+
+  def accept_blank_line(blank_line)
+    # @res << annotate("<p />") << "\n"
+  end
+
+  def accept_heading(heading)
+    @res << convert_heading(heading.level, @am.flow(heading.text))
+  end
+
+  def accept_raw raw
+    @res << raw.parts.join("\n")
+  end
+
+  private
+
+  ##
+  # Converts string +item+
+
+  def convert_string(item)
+    in_tt? ? convert_string_simple(item) : convert_string_fancy(item)
+  end
+
+  ##
+  # Escapes HTML in +item+
+
+  def convert_string_simple(item)
+    CGI.escapeHTML item
+  end
+
+  ##
+  # Converts ampersand, dashes, elipsis, quotes, copyright and registered
+  # trademark symbols to HTML escaped Unicode.
+
+  def convert_string_fancy(item)
+    # convert ampersand before doing anything else
+    item.gsub(/&/, '&amp;').
+
+    # convert -- to em-dash, (-- to en-dash)
+      gsub(/---?/, '&#8212;'). #gsub(/--/, '&#8211;').
+
+    # convert ... to elipsis (and make sure .... becomes .<elipsis>)
+      gsub(/\.\.\.\./, '.&#8230;').gsub(/\.\.\./, '&#8230;').
+
+    # convert single closing quote
+      gsub(%r{([^ \t\r\n\[\{\(])\'}, '\1&#8217;'). # }
+      gsub(%r{\'(?=\W|s\b)}, '&#8217;').
+
+    # convert single opening quote
+      gsub(/'/, '&#8216;').
+
+    # convert double closing quote
+      gsub(%r{([^ \t\r\n\[\{\(])\"(?=\W)}, '\1&#8221;'). # }
+
+    # convert double opening quote
+      gsub(/"/, '&#8220;').
+
+    # convert copyright
+      gsub(/\(c\)/, '&#169;').
+
+    # convert registered trademark
+      gsub(/\(r\)/, '&#174;')
+  end
+
+  ##
+  # Converts headings to hN elements
+
+  def convert_heading(level, flow)
+    [annotate("<h#{level}>"),
+     convert_flow(flow),
+     annotate("</h#{level}>\n")].join
+  end
+
+  ##
+  # Determins the HTML list element for +list_type+ and +open_tag+
+
+  def html_list_name(list_type, open_tag)
+    tags = LIST_TYPE_TO_HTML[list_type]
+    raise RDoc::Error, "Invalid list type: #{list_type.inspect}" unless tags
+    annotate tags[open_tag ? 0 : 1]
+  end
+
+  ##
+  # Starts a list item
+
+  def list_item_start(list_item, list_type)
+    case list_type
+    when :BULLET, :LALPHA, :NUMBER, :UALPHA then
+      annotate("<li>")
+
+    when :LABEL then
+      annotate("<dt>") +
+        convert_flow(@am.flow(list_item.label)) +
+        annotate("</dt>") +
+        annotate("<dd>")
+
+    when :NOTE then
+      annotate("<tr>") +
+        annotate("<td valign=\"top\">") +
+        convert_flow(@am.flow(list_item.label)) +
+        annotate("</td>") +
+        annotate("<td>")
+    else
+      raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
+    end
+  end
+
+  ##
+  # Ends a list item
+
+  def list_end_for(list_type)
+    case list_type
+    when :BULLET, :LALPHA, :NUMBER, :UALPHA then
+      "</li>"
+    when :LABEL then
+      "</dd>"
+    when :NOTE then
+      "</td></tr>"
+    else
+      raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb
new file mode 100644
index 0000000000..44e71486fb
--- /dev/null
+++ b/lib/rdoc/markup/to_html_crossref.rb
@@ -0,0 +1,148 @@
+require 'rdoc/markup/to_html'
+
+##
+# Subclass of the RDoc::Markup::ToHtml class that supports looking up words
+# from a context.  Those that are found will be hyperlinked.
+
+class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
+
+  ##
+  # Regular expression to match class references
+  #
+  # 1) There can be a '\' in front of text to suppress any cross-references
+  # 2) There can be a '::' in front of class names to reference from the
+  #    top-level namespace.
+  # 3) The method can be followed by parenthesis
+
+  CLASS_REGEXP_STR = '\\\\?((?:\:{2})?[A-Z]\w*(?:\:\:\w+)*)'
+
+  ##
+  # Regular expression to match method references.
+  #
+  # See CLASS_REGEXP_STR
+
+  METHOD_REGEXP_STR = '([a-z]\w*[!?=]?)(?:\([\w.+*/=<>-]*\))?'
+
+  ##
+  # Regular expressions matching text that should potentially have
+  # cross-reference links generated are passed to add_special.  Note that
+  # these expressions are meant to pick up text for which cross-references
+  # have been suppressed, since the suppression characters are removed by the
+  # code that is triggered.
+
+  CROSSREF_REGEXP = /(
+                      # A::B::C.meth
+                      #{CLASS_REGEXP_STR}(?:[.#]|::)#{METHOD_REGEXP_STR}
+
+                      # Stand-alone method (proceeded by a #)
+                      | \\?\##{METHOD_REGEXP_STR}
+
+                      # Stand-alone method (proceeded by ::)
+                      | ::#{METHOD_REGEXP_STR}
+
+                      # A::B::C
+                      # The stuff after CLASS_REGEXP_STR is a
+                      # nasty hack.  CLASS_REGEXP_STR unfortunately matches
+                      # words like dog and cat (these are legal "class"
+                      # names in Fortran 95).  When a word is flagged as a
+                      # potential cross-reference, limitations in the markup
+                      # engine suppress other processing, such as typesetting.
+                      # This is particularly noticeable for contractions.
+                      # In order that words like "can't" not
+                      # be flagged as potential cross-references, only
+                      # flag potential class cross-references if the character
+                      # after the cross-referece is a space or sentence
+                      # punctuation.
+                      | #{CLASS_REGEXP_STR}(?=[\s\)\.\?\!\,\;]|\z)
+
+                      # Things that look like filenames
+                      # The key thing is that there must be at least
+                      # one special character (period, slash, or
+                      # underscore).
+                      | (?:\.\.\/)*[-\/\w]+[_\/\.][-\w\/\.]+
+
+                      # Things that have markup suppressed
+                      | \\[^\s]
+                      )/x
+
+  ##
+  # RDoc::CodeObject for generating references
+
+  attr_accessor :context
+
+  ##
+  # Creates a new crossref resolver that generates links relative to +context+
+  # which lives at +from_path+ in the generated files.  '#' characters on
+  # references are removed unless +show_hash+ is true.
+
+  def initialize(from_path, context, show_hash)
+    raise ArgumentError, 'from_path cannot be nil' if from_path.nil?
+    super()
+
+    @markup.add_special(CROSSREF_REGEXP, :CROSSREF)
+
+    @from_path = from_path
+    @context = context
+    @show_hash = show_hash
+
+    @seen = {}
+  end
+
+  ##
+  # We're invoked when any text matches the CROSSREF pattern.  If we find the
+  # corresponding reference, generate a hyperlink.  If the name we're looking
+  # for contains no punctuation, we look for it up the module/class chain.
+  # For example, HyperlinkHtml is found, even without the Generator:: prefix,
+  # because we look for it in module Generator first.
+
+  def handle_special_CROSSREF(special)
+    name = special.text
+
+    # This ensures that words entirely consisting of lowercase letters will
+    # not have cross-references generated (to suppress lots of erroneous
+    # cross-references to "new" in text, for instance)
+    return name if name =~ /\A[a-z]*\z/
+
+    return @seen[name] if @seen.include? name
+
+    lookup = name
+
+    name = name[0, 1] unless @show_hash if name[0, 1] == '#'
+
+    # Find class, module, or method in class or module.
+    #
+    # Do not, however, use an if/elsif/else chain to do so.  Instead, test
+    # each possible pattern until one matches.  The reason for this is that a
+    # string like "YAML.txt" could be the txt() class method of class YAML (in
+    # which case it would match the first pattern, which splits the string
+    # into container and method components and looks up both) or a filename
+    # (in which case it would match the last pattern, which just checks
+    # whether the string as a whole is a known symbol).
+
+    if /#{CLASS_REGEXP_STR}([.#]|::)#{METHOD_REGEXP_STR}/ =~ lookup then
+      container = $1
+      type = $2
+      type = '#' if type == '.'
+      method = "#{type}#{$3}"
+      ref = @context.find_symbol container, method
+    end
+
+    ref = @context.find_symbol lookup unless ref
+
+    out = if lookup == '\\' then
+            lookup
+          elsif lookup =~ /^\\/ then
+            $'
+          elsif ref and ref.document_self then
+            "<a href=\"#{ref.as_href @from_path}\">#{name}</a>"
+          else
+            name
+          end
+
+    @seen[name] = out
+
+    out
+  end
+
+end
+
diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb
new file mode 100644
index 0000000000..867715bb1e
--- /dev/null
+++ b/lib/rdoc/markup/to_rdoc.rb
@@ -0,0 +1,247 @@
+require 'rdoc/markup/inline'
+
+##
+# Outputs RDoc markup as RDoc markup! (mostly)
+
+class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
+
+  attr_accessor :indent
+  attr_reader :list_index
+  attr_reader :list_type
+  attr_reader :list_width
+  attr_reader :prefix
+  attr_reader :res
+
+  def initialize
+    super
+
+    @markup.add_special(/\\[^\s]/, :SUPPRESSED_CROSSREF)
+
+    @width = 78
+    @prefix = ''
+
+    init_tags
+
+    @headings = {}
+    @headings.default = []
+
+    @headings[1] = ['= ',      '']
+    @headings[2] = ['== ',     '']
+    @headings[3] = ['=== ',    '']
+    @headings[4] = ['==== ',   '']
+    @headings[5] = ['===== ',  '']
+    @headings[6] = ['====== ', '']
+  end
+
+  ##
+  # Maps attributes to ANSI sequences
+
+  def init_tags
+    add_tag :BOLD, "<b>", "</b>"
+    add_tag :TT,   "<tt>", "</tt>"
+    add_tag :EM,   "<em>", "</em>"
+  end
+
+  def accept_blank_line blank_line
+    @res << "\n"
+  end
+
+  def accept_heading heading
+    use_prefix or @res << ' ' * @indent
+    @res << @headings[heading.level][0]
+    @res << attributes(heading.text)
+    @res << @headings[heading.level][1]
+    @res << "\n"
+  end
+
+  def accept_list_end list
+    @list_index.pop
+    @list_type.pop
+    @list_width.pop
+  end
+
+  def accept_list_item_end list_item
+    width = case @list_type.last
+            when :BULLET then
+              2
+            when :NOTE, :LABEL then
+              @res << "\n"
+              2
+            else
+              bullet = @list_index.last.to_s
+              @list_index[-1] = @list_index.last.succ
+              bullet.length + 2
+            end
+
+    @indent -= width
+  end
+
+  def accept_list_item_start list_item
+    bullet = case @list_type.last
+             when :BULLET then
+               '*'
+             when :NOTE, :LABEL then
+               attributes(list_item.label) + ":\n"
+             else
+               @list_index.last.to_s + '.'
+             end
+
+    case @list_type.last
+    when :NOTE, :LABEL then
+      @indent += 2
+      @prefix = bullet + (' ' * @indent)
+    else
+      @prefix = (' ' * @indent) + bullet.ljust(bullet.length + 1)
+
+      width = bullet.length + 1
+
+      @indent += width
+    end
+  end
+
+  def accept_list_start list
+    case list.type
+    when :BULLET then
+      @list_index << nil
+      @list_width << 1
+    when :LABEL, :NOTE then
+      @list_index << nil
+      @list_width << 2
+    when :LALPHA then
+      @list_index << 'a'
+      @list_width << list.items.length.to_s.length
+    when :NUMBER then
+      @list_index << 1
+      @list_width << list.items.length.to_s.length
+    when :UALPHA then
+      @list_index << 'A'
+      @list_width << list.items.length.to_s.length
+    else
+      raise RDoc::Error, "invalid list type #{list.type}"
+    end
+
+    @list_type << list.type
+  end
+
+  def accept_paragraph paragraph
+    wrap attributes(paragraph.text)
+  end
+
+  def accept_raw raw
+    @res << raw.parts.join("\n")
+  end
+
+  def accept_rule rule
+    use_prefix or @res << ' ' * @indent
+    @res << '-' * (@width - @indent)
+    @res << "\n"
+  end
+
+  ##
+  # Outputs +verbatim+ flush left and indented 2 columns
+
+  def accept_verbatim verbatim
+    indent = ' ' * (@indent + 2)
+
+    lines = []
+    current_line = []
+
+    # split into lines
+    verbatim.parts.each do |part|
+      current_line << part
+
+      if part == "\n" then
+        lines << current_line
+        current_line = []
+      end
+    end
+
+    lines << current_line unless current_line.empty?
+
+    # calculate margin
+    indented = lines.select { |line| line != ["\n"] }
+    margin = indented.map { |line| line.first.length }.min
+
+    # flush left
+    indented.each { |line| line[0][0...margin] = '' }
+
+    # output
+    use_prefix or @res << indent # verbatim is unlikely to have prefix
+    @res << lines.shift.join
+
+    lines.each do |line|
+      @res << indent unless line == ["\n"]
+      @res << line.join
+    end
+
+    @res << "\n"
+  end
+
+  def attributes text
+    flow = @am.flow text.dup
+    convert_flow flow
+  end
+
+  def end_accepting
+    @res.join
+  end
+
+  def handle_special_SUPPRESSED_CROSSREF special
+    special.text.sub(/\\/, '')
+  end
+
+  def start_accepting
+    @res = [""]
+    @indent = 0
+    @prefix = nil
+
+    @list_index = []
+    @list_type  = []
+    @list_width = []
+  end
+
+  def use_prefix
+    prefix = @prefix
+    @prefix = nil
+    @res << prefix if prefix
+
+    prefix
+  end
+
+  def wrap text
+    return unless text && !text.empty?
+
+    text_len = @width - @indent
+
+    text_len = 20 if text_len < 20
+
+    re = /^(.{0,#{text_len}})[ \n]/
+    next_prefix = ' ' * @indent
+
+    prefix = @prefix || next_prefix
+    @prefix = nil
+
+    @res << prefix
+
+    while text.length > text_len
+      if text =~ re then
+        @res << $1
+        text.slice!(0, $&.length)
+      else
+        @res << text.slice!(0, text_len)
+      end
+
+      @res << "\n" << next_prefix
+    end
+
+    if text.empty? then
+      @res.pop
+      @res.pop
+    else
+      @res << text
+      @res << "\n"
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/markup/to_test.rb b/lib/rdoc/markup/to_test.rb
new file mode 100644
index 0000000000..0afdb96a18
--- /dev/null
+++ b/lib/rdoc/markup/to_test.rb
@@ -0,0 +1,64 @@
+require 'rdoc/markup'
+require 'rdoc/markup/formatter'
+
+##
+# This Markup outputter is used for testing purposes.
+
+class RDoc::Markup::ToTest < RDoc::Markup::Formatter
+
+  ##
+  # :section: Visitor
+
+  def start_accepting
+    @res = []
+    @list = []
+  end
+
+  def end_accepting
+    @res
+  end
+
+  def accept_paragraph(paragraph)
+    @res << paragraph.text
+  end
+
+  def accept_verbatim(verbatim)
+    @res << verbatim.text
+  end
+
+  def accept_list_start(list)
+    @list << case list.type
+             when :BULLET then
+               '*'
+             when :NUMBER then
+               '1'
+             else
+               list.type
+             end
+  end
+
+  def accept_list_end(list)
+    @list.pop
+  end
+
+  def accept_list_item_start(list_item)
+    @res << "#{' ' * (@list.size - 1)}#{@list.last}: "
+  end
+
+  def accept_list_item_end(list_item)
+  end
+
+  def accept_blank_line(blank_line)
+    @res << "\n"
+  end
+
+  def accept_heading(heading)
+    @res << "#{'=' * heading.level} #{heading.text}"
+  end
+
+  def accept_rule(rule)
+    @res << '-' * rule.weight
+  end
+
+end
+
diff --git a/lib/rdoc/markup/verbatim.rb b/lib/rdoc/markup/verbatim.rb
new file mode 100644
index 0000000000..c684d78765
--- /dev/null
+++ b/lib/rdoc/markup/verbatim.rb
@@ -0,0 +1,42 @@
+##
+# A section of verbatim text
+
+class RDoc::Markup::Verbatim < RDoc::Markup::Raw
+
+  def accept visitor
+    visitor.accept_verbatim self
+  end
+
+  ##
+  # Collapses 3+ newlines into two newlines
+
+  def normalize
+    parts = []
+
+    newlines = 0
+
+    @parts.each do |part|
+      case part
+      when /\n/ then
+        newlines += 1
+        parts << part if newlines <= 2
+      else
+        newlines = 0
+        parts << part
+      end
+    end
+
+    parts.slice!(-1) if parts[-2..-1] == ["\n", "\n"]
+
+    @parts = parts
+  end
+
+  ##
+  # The text of the section
+
+  def text
+    @parts.join
+  end
+
+end
+
diff --git a/lib/rdoc/meta_method.rb b/lib/rdoc/meta_method.rb
new file mode 100644
index 0000000000..e0c065c2ba
--- /dev/null
+++ b/lib/rdoc/meta_method.rb
@@ -0,0 +1,8 @@
+require 'rdoc/any_method'
+
+##
+# MetaMethod represents a meta-programmed method
+
+class RDoc::MetaMethod < RDoc::AnyMethod
+end
+
diff --git a/lib/rdoc/normal_class.rb b/lib/rdoc/normal_class.rb
new file mode 100644
index 0000000000..e7ca6fffde
--- /dev/null
+++ b/lib/rdoc/normal_class.rb
@@ -0,0 +1,55 @@
+require 'rdoc/class_module'
+
+##
+# A normal class, neither singleton nor anonymous
+
+class RDoc::NormalClass < RDoc::ClassModule
+
+  ##
+  # Ancestor ClassModules
+
+  def ancestors
+    includes + [superclass]
+  end
+
+  def inspect # :nodoc:
+    superclass = @superclass ? " < #{@superclass}" : nil
+    "<%s:0x%x class %s%s includes: %p attributes: %p methods: %p aliases: %p>" % [
+      self.class, object_id,
+      full_name, superclass, @includes, @attributes, @method_list, @aliases
+    ]
+  end
+
+  def pretty_print q # :nodoc:
+    superclass = @superclass ? " < #{@superclass}" : nil
+
+    q.group 2, "[class #{full_name}#{superclass} ", "]" do
+      q.breakable
+      q.text "includes:"
+      q.breakable
+      q.seplist @includes do |inc| q.pp inc end
+
+      q.breakable
+      q.text "attributes:"
+      q.breakable
+      q.seplist @attributes do |inc| q.pp inc end
+
+      q.breakable
+      q.text "methods:"
+      q.breakable
+      q.seplist @method_list do |inc| q.pp inc end
+
+      q.breakable
+      q.text "aliases:"
+      q.breakable
+      q.seplist @aliases do |inc| q.pp inc end
+
+      q.breakable
+      q.text "comment:"
+      q.breakable
+      q.pp comment
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/normal_module.rb b/lib/rdoc/normal_module.rb
new file mode 100644
index 0000000000..92abe6b440
--- /dev/null
+++ b/lib/rdoc/normal_module.rb
@@ -0,0 +1,64 @@
+require 'rdoc/class_module'
+
+##
+# A normal module, like NormalClass
+
+class RDoc::NormalModule < RDoc::ClassModule
+
+  ##
+  # Included NormalModules
+
+  alias ancestors includes
+
+  def inspect # :nodoc:
+    "#<%s:0x%x module %s includes: %p attributes: %p methods: %p aliases: %p>" % [
+      self.class, object_id,
+      full_name, @includes, @attributes, @method_list, @aliases
+    ]
+  end
+
+  ##
+  # This is a module, returns true
+
+  def module?
+    true
+  end
+
+  def pretty_print q # :nodoc:
+    q.group 2, "[module #{full_name}: ", "]" do
+      q.breakable
+      q.text "includes:"
+      q.breakable
+      q.seplist @includes do |inc| q.pp inc end
+      q.breakable
+
+      q.text "attributes:"
+      q.breakable
+      q.seplist @attributes do |inc| q.pp inc end
+      q.breakable
+
+      q.text "methods:"
+      q.breakable
+      q.seplist @method_list do |inc| q.pp inc end
+      q.breakable
+
+      q.text "aliases:"
+      q.breakable
+      q.seplist @aliases do |inc| q.pp inc end
+      q.breakable
+
+      q.text "comment:"
+      q.breakable
+      q.pp comment
+    end
+  end
+
+  ##
+  # Modules don't have one, raises NoMethodError
+
+  def superclass
+    raise NoMethodError, "#{full_name} is a module"
+  end
+
+end
+
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index bea7e6bdcd..90415f0aa4 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -1,586 +1,441 @@
-# We handle the parsing of options, and subsequently as a singleton
-# object to be queried for option values
+require 'optparse'
 
-require "rdoc/ri/ri_paths"
+require 'rdoc/ri/paths'
 
-class Options
+##
+# RDoc::Options handles the parsing and storage of options
 
-  require 'singleton'
-  require 'getoptlong'
+class RDoc::Options
 
-  include Singleton
+  ##
+  # Character-set
+
+  attr_reader :charset
+
+  ##
+  # Files matching this pattern will be excluded
 
-  # files matching this pattern will be excluded
   attr_accessor :exclude
 
-  # the name of the output directory
-  attr_accessor :op_dir
-  
-  # the name to use for the output
-  attr_reader :op_name
+  ##
+  # The list of files to be processed
 
-  # include private and protected methods in the
-  # output
-  attr_accessor :show_all
-  
-  # name of the file, class or module to display in
-  # the initial index page (if not specified
-  # the first file we encounter is used)
-  attr_accessor :main_page
+  attr_accessor :files
 
-  # merge into classes of the name name when generating ri
-  attr_reader :merge
+  ##
+  # Scan newer sources than the flag file if true.
 
-  # Don't display progress as we process the files
-  attr_reader :quiet
+  attr_reader :force_update
+
+  ##
+  # Description of the output generator (set with the <tt>-fmt</tt> option)
 
-  # description of the output generator (set with the <tt>-fmt</tt>
-  # option
   attr_accessor :generator
 
-  # and the list of files to be processed
-  attr_reader :files
+  ##
+  # Formatter to mark up text with
 
-  # array of directories to search for files to satisfy an :include:
-  attr_reader :rdoc_include
+  attr_accessor :formatter
 
-  # title to be used out the output
-  #attr_writer :title
+  ##
+  # Name of the file, class or module to display in the initial index page (if
+  # not specified the first file we encounter is used)
 
-  # template to be used when generating output
-  attr_reader :template
+  attr_accessor :main_page
 
-  # should diagrams be drawn
-  attr_reader :diagram
+  ##
+  # The name of the output directory
 
-  # should we draw fileboxes in diagrams
-  attr_reader :fileboxes
+  attr_accessor :op_dir
 
-  # include the '#' at the front of hyperlinked instance method names
-  attr_reader :show_hash
+  ##
+  # Is RDoc in pipe mode?
 
-  # image format for diagrams
-  attr_reader :image_format
+  attr_accessor :pipe
 
-  # character-set
-  attr_reader :charset
+  ##
+  # Array of directories to search for files to satisfy an :include:
 
-  # should source code be included inline, or displayed in a popup
-  attr_reader :inline_source
+  attr_reader :rdoc_include
+
+  ##
+  # Include private and protected methods in the output?
+
+  attr_accessor :show_all
 
-  # should the output be placed into a single file
-  attr_reader :all_one_file
+  ##
+  # Include the '#' at the front of hyperlinked instance method names
+
+  attr_reader :show_hash
+
+  ##
+  # The number of columns in a tab
 
-  # the number of columns in a tab
   attr_reader :tab_width
 
-  # include line numbers in the source listings
-  attr_reader :include_line_numbers
+  ##
+  # Template to be used when generating output
 
-  # pattern for additional attr_... style methods
-  attr_reader :extra_accessors
-  attr_reader :extra_accessor_flags
+  attr_reader :template
 
-  # URL of stylesheet
-  attr_reader :css
+  ##
+  # Documentation title
 
+  attr_reader :title
+
+  ##
+  # Verbosity, zero means quiet
+
+  attr_accessor :verbosity
+
+  ##
   # URL of web cvs frontend
+
   attr_reader :webcvs
 
-  # Are we promiscuous about showing module contents across
-  # multiple files
-  attr_reader :promiscuous
+  def initialize # :nodoc:
+    require 'rdoc/rdoc'
+    @op_dir = nil
+    @show_all = false
+    @main_page = nil
+    @exclude = []
+    @generators = RDoc::RDoc::GENERATORS
+    @generator = RDoc::Generator::Darkfish
+    @generator_name = nil
+    @rdoc_include = []
+    @title = nil
+    @template = nil
+    @show_hash = false
+    @tab_width = 8
+    @force_update = true
+    @verbosity = 1
+    @pipe = false
+
+    @webcvs = nil
+
+    @charset = 'utf-8'
+  end
 
-  # scan newer sources than the flag file if true.
-  attr_reader :force_update
+  ##
+  # Parse command line options.
+
+  def parse(argv)
+    ignore_invalid = true
 
-  module OptionList
-
-    OPTION_LIST = [
-      [ "--accessor",      "-A",   "accessorname[,..]",
-        "comma separated list of additional class methods\n" +
-        "that should be treated like 'attr_reader' and\n" +
-        "friends. Option may be repeated. Each accessorname\n" +
-        "may have '=text' appended, in which case that text\n" +
-        "appears where the r/w/rw appears for normal accessors."],
-                                                                   
-      [ "--all",           "-a",   nil,
-        "include all methods (not just public)\nin the output" ],
-
-      [ "--charset",       "-c",   "charset",
-        "specifies HTML character-set" ],
-
-      [ "--debug",         "-D",   nil,
-        "displays lots on internal stuff" ],
-
-      [ "--diagram",       "-d",   nil,
-        "Generate diagrams showing modules and classes.\n" +
-        "You need dot V1.8.6 or later to use the --diagram\n" +
-        "option correctly. Dot is available from\n"+
-        "http://www.research.att.com/sw/tools/graphviz/" ],
-
-      [ "--exclude",       "-x",   "pattern",
-        "do not process files or directories matching\n" +
-        "pattern. Files given explicitly on the command\n" +
-        "line will never be excluded." ],
-
-      [ "--extension",     "-E",   "new=old",
-        "Treat files ending with .new as if they ended with\n" +
-        ".old. Using '-E cgi=rb' will cause xxx.cgi to be\n" +
-        "parsed as a Ruby file"],
-
-      [ "--fileboxes",     "-F",   nil,
-        "classes are put in boxes which represents\n" +
-        "files, where these classes reside. Classes\n" +
-        "shared between more than one file are\n" +
-        "shown with list of files that sharing them.\n" +
-        "Silently discarded if --diagram is not given\n" +
-        "Experimental." ],
-
-      [ "--force-update",  "-U",   nil,
-        "forces to scan all sources even if newer than\n" +
-        "the flag file." ],
-
-      [ "--fmt",           "-f",   "format name",
-        "set the output formatter (see below)" ],
-
-      [ "--help",          "-h",   nil,
-        "you're looking at it" ],
-
-      [ "--help-output",   "-O",   nil,
-        "explain the various output options" ],
-
-      [ "--image-format",  "-I",   "gif/png/jpg/jpeg",
-        "Sets output image format for diagrams. Can\n" +
-        "be png, gif, jpeg, jpg. If this option is\n" +
-        "omitted, png is used. Requires --diagram." ],
-
-      [ "--include",       "-i",   "dir[,dir...]",
-        "set (or add to) the list of directories\n" +
-        "to be searched when satisfying :include:\n" +
-        "requests. Can be used more than once." ],
-
-      [ "--inline-source", "-S",   nil,
-        "Show method source code inline, rather\n" +
-        "than via a popup link" ],
-
-      [ "--line-numbers", "-N", nil,
-        "Include line numbers in the source code" ],
-
-      [ "--main",          "-m",   "name",
-        "'name' will be the initial page displayed" ],
-
-      [ "--merge",         "-M",   nil,
-        "when creating ri output, merge processed classes\n" +
-        "into previously documented classes of the name name"],
-
-      [ "--one-file",      "-1",   nil,
-        "put all the output into a single file" ],
-
-      [ "--op",            "-o",   "dir",
-        "set the output directory" ],
-
-      [ "--opname",       "-n",    "name",
-        "Set the 'name' of the output. Has no\n" +
-        "effect for HTML." ],
-
-      [ "--promiscuous",   "-p",   nil,
-        "When documenting a file that contains a module\n" +
-        "or class also defined in other files, show\n" +
-        "all stuff for that module/class in each files\n" +
-        "page. By default, only show stuff defined in\n" +
-        "that particular file." ],
-
-      [ "--quiet",         "-q",   nil,
-        "don't show progress as we parse" ],
-
-      [ "--ri",            "-r",   nil,
-       "generate output for use by 'ri.' The files are\n" +
-       "stored in the '.rdoc' directory under your home\n"+
-       "directory unless overridden by a subsequent\n" +
-       "--op parameter, so no special privileges are needed." ],
-
-      [ "--ri-site",       "-R",   nil,
-       "generate output for use by 'ri.' The files are\n" +
-       "stored in a site-wide directory, making them accessible\n"+
-       "to others, so special privileges are needed." ],
-
-      [ "--ri-system",     "-Y",   nil,
-       "generate output for use by 'ri.' The files are\n" +
-       "stored in a system-level directory, making them accessible\n"+
-       "to others, so special privileges are needed. This option\n"+
-       "is intended to be used during Ruby installations" ],
-
-      [ "--show-hash",     "-H",   nil,
-        "A name of the form #name in a comment\n" +
-        "is a possible hyperlink to an instance\n" +
-        "method name. When displayed, the '#' is\n" +
-        "removed unless this option is specified" ],
-
-      [ "--style",         "-s",   "stylesheet url",
-        "specifies the URL of a separate stylesheet." ],
-
-      [ "--tab-width",     "-w",   "n",
-        "Set the width of tab characters (default 8)"],
-
-      [ "--template",      "-T",   "template name",
-        "Set the template used when generating output" ],
-
-      [ "--title",         "-t",   "text",
-        "Set 'txt' as the title for the output" ],
-
-      [ "--version",       "-v",   nil,
-        "display  RDoc's version" ],
-
-      [ "--webcvs",        "-W",   "url",
-        "Specify a URL for linking to a web frontend\n" +
-        "to CVS. If the URL contains a '\%s', the\n" +
-        "name of the current file will be substituted;\n" +
-        "if the URL doesn't contain a '\%s', the\n" +
-        "filename will be appended to it." ],
-    ]
-
-    def OptionList.options
-      OPTION_LIST.map do |long, short, arg,|
-        [ long, 
-          short, 
-          arg ? GetoptLong::REQUIRED_ARGUMENT : GetoptLong::NO_ARGUMENT 
-        ]
+    opts = OptionParser.new do |opt|
+      opt.program_name = File.basename $0
+      opt.version = RDoc::VERSION
+      opt.release = nil
+      opt.summary_indent = ' ' * 4
+      opt.banner = <<-EOF
+Usage: #{opt.program_name} [options] [names...]
+
+  Files are parsed, and the information they contain collected, before any
+  output is produced. This allows cross references between all files to be
+  resolved. If a name is a directory, it is traversed. If no names are
+  specified, all Ruby files in the current directory (and subdirectories) are
+  processed.
+
+  How RDoc generates output depends on the output formatter being used, and on
+  the options you give.
+
+  - Darkfish creates frameless HTML output by Michael Granger.
+  - ri creates ri data files
+
+  RDoc understands the following file formats:
+
+      EOF
+
+      parsers = Hash.new { |h,parser| h[parser] = [] }
+
+      RDoc::Parser.parsers.each do |regexp, parser|
+        parsers[parser.name.sub('RDoc::Parser::', '')] << regexp.source
       end
-    end
 
+      parsers.sort.each do |parser, regexp|
+        opt.banner << "  - #{parser}: #{regexp.join ', '}\n"
+      end
 
-    def OptionList.strip_output(text)
-      text =~ /^\s+/
-      leading_spaces = $&
-      text.gsub!(/^#{leading_spaces}/, '')
-      $stdout.puts text
-    end
+      opt.separator nil
+      opt.separator "Parsing Options:"
+      opt.separator nil
 
+      opt.on("--all", "-a",
+             "Include all methods (not just public) in",
+             "the output.") do |value|
+        @show_all = value
+      end
 
-    # Show an error and exit
+      opt.separator nil
 
-    def OptionList.error(msg)
-      $stderr.puts
-      $stderr.puts msg
-      $stderr.puts "\nFor help on options, try 'rdoc --help'\n\n"
-      exit 1
-    end
+      opt.on("--exclude=PATTERN", "-x", Regexp,
+             "Do not process files or directories",
+             "matching PATTERN.") do |value|
+        @exclude << value
+      end
+
+      opt.separator nil
+
+      opt.on("--extension=NEW=OLD", "-E",
+             "Treat files ending with .new as if they",
+             "ended with .old. Using '-E cgi=rb' will",
+             "cause xxx.cgi to be parsed as a Ruby file.") do |value|
+        new, old = value.split(/=/, 2)
 
-    # Show usage and exit
-    
-    def OptionList.usage(generator_names)
-      
-      puts
-      puts(VERSION_STRING)
-      puts
-
-      name = File.basename($0)
-      OptionList.strip_output(<<-EOT)
-          Usage:
-
-            #{name} [options]  [names...]
-
-          Files are parsed, and the information they contain
-          collected, before any output is produced. This allows cross
-          references between all files to be resolved. If a name is a
-          directory, it is traversed. If no names are specified, all
-          Ruby files in the current directory (and subdirectories) are
-          processed.
-
-          Options:
-
-      EOT
-
-      OPTION_LIST.each do |long, short, arg, desc|
-        opt = sprintf("%20s", "#{long}, #{short}")
-        oparg = sprintf("%-7s", arg)
-        print "#{opt} #{oparg}"
-        desc = desc.split("\n")
-        if arg.nil? || arg.length < 7
-          puts desc.shift
-        else
-          puts
+        unless new and old then
+          raise OptionParser::InvalidArgument, "Invalid parameter to '-E'"
         end
-        desc.each do |line|
-          puts(" "*28 + line)
+
+        unless RDoc::Parser.alias_extension old, new then
+          raise OptionParser::InvalidArgument, "Unknown extension .#{old} to -E"
         end
-        puts
       end
 
-      puts "\nAvailable output formatters: " +
-        generator_names.sort.join(', ') + "\n\n"
+      opt.separator nil
 
-      puts "For information on where the output goes, use\n\n"
-      puts "   rdoc --help-output\n\n"
+      opt.on("--[no-]force-update", "-U",
+             "Forces rdoc to scan all sources even if",
+             "newer than the flag file.") do |value|
+        @force_update = value
+      end
 
-      exit 0
-    end
+      opt.separator nil
 
-    def OptionList.help_output
-      OptionList.strip_output(<<-EOT)
-      How RDoc generates output depends on the output formatter being
-      used, and on the options you give.
+      opt.on("--pipe",
+             "Convert RDoc on stdin to HTML") do
+        @pipe = true
+      end
 
-      - HTML output is normally produced into a number of separate files
-        (one per class, module, and file, along with various indices). 
-        These files will appear in the directory given by the --op
-        option (doc/ by default).
+      opt.separator nil
+      opt.separator "Generator Options:"
+      opt.separator nil
 
-      - XML output by default is written to standard output. If a
-        --opname option is given, the output will instead be written
-        to a file with that name in the output directory.
+      opt.on("--charset=CHARSET", "-c",
+             "Specifies the output HTML character-set.") do |value|
+        @charset = value
+      end
 
-      - .chm files (Windows help files) are written in the --op directory.
-        If an --opname parameter is present, that name is used, otherwise
-        the file will be called rdoc.chm.
+      opt.separator nil
 
-      For information on other RDoc options, use "rdoc --help".
-      EOT
-      exit 0
-    end
-  end
+      generator_text = @generators.keys.map { |name| "  #{name}" }.sort
 
-  # Parse command line options. We're passed a hash containing
-  # output generators, keyed by the generator name
+      opt.on("--fmt=FORMAT", "--format=FORMAT", "-f", @generators.keys,
+             "Set the output formatter.  One of:", *generator_text) do |value|
+        @generator_name = value.downcase
+        setup_generator
+      end
 
-  def parse(argv, generators)
-    old_argv = ARGV.dup
-    begin
-      ARGV.replace(argv)
-      @op_dir = "doc"
-      @op_name = nil
-      @show_all = false
-      @main_page = nil
-      @marge     = false
-      @exclude   = []
-      @quiet = false
-      @generator_name = 'html'
-      @generator = generators[@generator_name]
-      @rdoc_include = []
-      @title = nil
-      @template = nil
-      @diagram = false
-      @fileboxes = false
-      @show_hash = false
-      @image_format = 'png'
-      @inline_source = false
-      @all_one_file  = false
-      @tab_width = 8
-      @include_line_numbers = false
-      @extra_accessor_flags = {}
-      @promiscuous = false
-      @force_update = false
-
-      @css = nil
-      @webcvs = nil
-
-      @charset = case $KCODE
-                 when /^S/i
-                   'Shift_JIS'
-                 when /^E/i
-                   'EUC-JP'
-                 else
-                   'iso-8859-1'
-                 end
-
-      accessors = []
-
-      go = GetoptLong.new(*OptionList.options)
-      go.quiet = true
-
-      go.each do |opt, arg|
-	case opt
-        when "--all"           then @show_all      = true
-        when "--charset"       then @charset       = arg
-        when "--debug"         then $DEBUG         = true
-        when "--exclude"       then @exclude       << Regexp.new(arg)
-        when "--inline-source" then @inline_source = true
-        when "--line-numbers"  then @include_line_numbers = true
-        when "--main"          then @main_page     = arg
-        when "--merge"         then @merge         = true
-        when "--one-file"      then @all_one_file  = @inline_source = true
-        when "--op"            then @op_dir        = arg
-        when "--opname"        then @op_name       = arg
-        when "--promiscuous"   then @promiscuous   = true
-        when "--quiet"         then @quiet         = true
-        when "--show-hash"     then @show_hash     = true
-        when "--style"         then @css           = arg
-        when "--template"      then @template      = arg
-        when "--title"         then @title         = arg
-        when "--webcvs"        then @webcvs        = arg
-
-        when "--accessor" 
-          arg.split(/,/).each do |accessor|
-            if accessor =~ /^(\w+)(=(.*))?$/
-              accessors << $1
-              @extra_accessor_flags[$1] = $3
-            end
-          end
-
-        when "--diagram"
-          check_diagram
-          @diagram = true
-
-        when "--fileboxes"
-          @fileboxes = true if @diagram
-
-	when "--fmt"
-          @generator_name = arg.downcase
-          setup_generator(generators)
-
-        when "--help"      
-          OptionList.usage(generators.keys)
-
-        when "--help-output"      
-          OptionList.help_output
-
-        when "--image-format"
-          if ['gif', 'png', 'jpeg', 'jpg'].include?(arg)
-            @image_format = arg
-          else
-            raise GetoptLong::InvalidOption.new("unknown image format: #{arg}")
-          end
-
-        when "--include"   
-          @rdoc_include.concat arg.split(/\s*,\s*/)
-
-        when "--ri", "--ri-site", "--ri-system"
-          @generator_name = "ri"
-          @op_dir = case opt
-                    when "--ri" then RI::Paths::HOMEDIR 
-                    when "--ri-site" then RI::Paths::SITEDIR
-                    when "--ri-system" then RI::Paths::SYSDIR
-                    else fail opt
-                    end
-          setup_generator(generators)
-
-        when "--tab-width"
-          begin
-            @tab_width     = Integer(arg)
-          rescue 
-            $stderr.puts "Invalid tab width: '#{arg}'"
-            exit 1
-          end
-
-        when "--extension"
-          new, old = arg.split(/=/, 2)
-          OptionList.error("Invalid parameter to '-E'") unless new && old
-          unless RDoc::ParserFactory.alias_extension(old, new)
-            OptionList.error("Unknown extension .#{old} to -E")
-          end
-
-        when "--force-update"
-          @force_update = true
-
-	when "--version"
-	  puts VERSION_STRING
-	  exit
-	end
+      opt.separator nil
 
+      opt.on("--include=DIRECTORIES", "-i", Array,
+             "Set (or add to) the list of directories to",
+             "be searched when satisfying :include:",
+             "requests. Can be used more than once.") do |value|
+        @rdoc_include.concat value.map { |dir| dir.strip }
       end
 
-      @files = ARGV.dup
+      opt.separator nil
 
-      @rdoc_include << "." if @rdoc_include.empty?
+      opt.on("--main=NAME", "-m",
+             "NAME will be the initial page displayed.") do |value|
+        @main_page = value
+      end
 
-      if @exclude.empty?
-        @exclude = nil
-      else
-        @exclude = Regexp.new(@exclude.join("|"))
+      opt.separator nil
+
+      opt.on("--output=DIR", "--op", "-o",
+             "Set the output directory.") do |value|
+        @op_dir = value
+      end
+
+      opt.separator nil
+
+      opt.on("--show-hash", "-H",
+             "A name of the form #name in a comment is a",
+             "possible hyperlink to an instance method",
+             "name. When displayed, the '#' is removed",
+             "unless this option is specified.") do |value|
+        @show_hash = value
+      end
+
+      opt.separator nil
+
+      opt.on("--tab-width=WIDTH", "-w", OptionParser::DecimalInteger,
+             "Set the width of tab characters.") do |value|
+        @tab_width = value
+      end
+
+      opt.separator nil
+
+      opt.on("--template=NAME", "-T",
+             "Set the template used when generating",
+             "output.") do |value|
+        @template = value
+      end
+
+      opt.separator nil
+
+      opt.on("--title=TITLE", "-t",
+             "Set TITLE as the title for HTML output.") do |value|
+        @title = value
+      end
+
+      opt.separator nil
+
+      opt.on("--webcvs=URL", "-W",
+             "Specify a URL for linking to a web frontend",
+             "to CVS. If the URL contains a '\%s', the",
+             "name of the current file will be",
+             "substituted; if the URL doesn't contain a",
+             "'\%s', the filename will be appended to it.") do |value|
+        @webcvs = value
+      end
+
+      opt.separator nil
+
+      opt.on("-d", "--diagram", "Prevents -d from tripping --debug")
+
+      opt.separator nil
+      opt.separator "ri Generator Options:"
+      opt.separator nil
+
+      opt.on("--ri", "-r",
+             "Generate output for use by `ri`. The files",
+             "are stored in the '.rdoc' directory under",
+             "your home directory unless overridden by a",
+             "subsequent --op parameter, so no special",
+             "privileges are needed.") do |value|
+        @generator_name = "ri"
+        @op_dir ||= RDoc::RI::Paths::HOMEDIR
+        setup_generator
       end
 
-      check_files
+      opt.separator nil
+
+      opt.on("--ri-site", "-R",
+             "Generate output for use by `ri`. The files",
+             "are stored in a site-wide directory,",
+             "making them accessible to others, so",
+             "special privileges are needed.") do |value|
+        @generator_name = "ri"
+        @op_dir = RDoc::RI::Paths::SITEDIR
+        setup_generator
+      end
 
-      # If no template was specified, use the default
-      # template for the output formatter
+      opt.separator nil
+      opt.separator "Generic Options:"
+      opt.separator nil
 
-      @template ||= @generator_name
+      opt.on("-D", "--[no-]debug",
+             "Displays lots on internal stuff.") do |value|
+        $DEBUG_RDOC = value
+      end
 
-      # Generate a regexp from the accessors
-      unless accessors.empty?
-        re = '^(' + accessors.map{|a| Regexp.quote(a)}.join('|') + ')$' 
-        @extra_accessors = Regexp.new(re)
+      opt.on("--[no-]ignore-invalid",
+             "Ignore invalid options and continue.") do |value|
+        ignore_invalid = value
       end
 
-    rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => error
-      OptionList.error(error.message)
+      opt.on("--quiet", "-q",
+             "Don't show progress as we parse.") do |value|
+        @verbosity = 0
+      end
 
-    ensure
-      ARGV.replace(old_argv)
+      opt.on("--verbose", "-v",
+             "Display extra progress as we parse.") do |value|
+        @verbosity = 2
+      end
+
+      opt.separator nil
     end
-  end
 
+    argv.insert(0, *ENV['RDOCOPT'].split) if ENV['RDOCOPT']
+    ignored = []
+
+    begin
+      opts.parse! argv
+    rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
+      if ignore_invalid then
+        ignored << e.args.join(' ')
+        retry
+      else
+        $stderr.puts opts
+        $stderr.puts
+        $stderr.puts e
+        exit 1
+      end
+    end
 
-  def title
-    @title ||= "RDoc Documentation"
+    if @pipe and not argv.empty? then
+      @pipe = false
+      ignored << '-p (with files)'
+    end
+
+    unless ignored.empty? or quiet then
+      $stderr.puts "invalid options: #{ignored.join ', '}"
+      $stderr.puts '(invalid options are ignored)'
+    end
+
+    @op_dir ||= 'doc'
+    @files = argv.dup
+
+    @rdoc_include << "." if @rdoc_include.empty?
+
+    if @exclude.empty? then
+      @exclude = nil
+    else
+      @exclude = Regexp.new(@exclude.join("|"))
+    end
+
+    check_files
+
+    # If no template was specified, use the default template for the output
+    # formatter
+
+    @template ||= @generator_name
   end
-  
-  # Set the title, but only if not already set. This means that a title set from 
-  # the command line trumps one set in a source file
+
+  ##
+  # Set the title, but only if not already set. This means that a title set
+  # from the command line trumps one set in a source file
 
   def title=(string)
     @title ||= string
   end
 
+  ##
+  # Don't display progress as we process the files
 
-  private
+  def quiet
+    @verbosity.zero?
+  end
 
-  # Set up an output generator for the format in @generator_name
-  def setup_generator(generators)
-    @generator = generators[@generator_name]
-    if !@generator
-      OptionList.error("Invalid output formatter")
-    end
-    
-    if @generator_name == "xml"
-      @all_one_file = true
-      @inline_source = true
-    end
+  def quiet=(bool)
+    @verbosity = bool ? 0 : 1
   end
 
-  # Check that the right version of 'dot' is available.
-  # Unfortuately this doesn't work correctly under Windows NT, 
-  # so we'll bypass the test under Windows
+  private
 
-  def check_diagram
-    return if RUBY_PLATFORM =~ /win/
+  ##
+  # Set up an output generator for the format in @generator_name
 
-    ok = false
-    ver = nil
-    IO.popen("dot -V 2>&1") do |io|
-      ver = io.read
-      if ver =~ /dot.+version(?:\s+gviz)?\s+(\d+)\.(\d+)/
-        ok = ($1.to_i > 1) || ($1.to_i == 1 && $2.to_i >= 8)
-      end
-    end
-    unless ok
-      if ver =~ /^dot.+version/
-        $stderr.puts "Warning: You may need dot V1.8.6 or later to use\n",
-          "the --diagram option correctly. You have:\n\n   ",
-          ver,
-          "\nDiagrams might have strange background colors.\n\n"
-      else
-        $stderr.puts "You need the 'dot' program to produce diagrams.",
-          "(see http://www.research.att.com/sw/tools/graphviz/)\n\n"
-        exit
-      end
-#      exit
+  def setup_generator
+    @generator = @generators[@generator_name]
+
+    unless @generator then
+      raise OptionParser::InvalidArgument, "Invalid output formatter"
     end
   end
-  
+
+  ##
   # Check that the files on the command line exist
-  
+
   def check_files
     @files.each do |f|
-      stat = File.stat f rescue error("File not found: #{f}")
-      error("File '#{f}' not readable") unless stat.readable?
+      stat = File.stat f rescue next
+      raise RDoc::Error, "file '#{f}' not readable" unless stat.readable?
     end
   end
 
-  def error(str)
-    $stderr.puts str
-    exit(1)
-  end
-
 end
+
diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb
new file mode 100644
index 0000000000..1e4ab7c7a4
--- /dev/null
+++ b/lib/rdoc/parser.rb
@@ -0,0 +1,157 @@
+require 'rdoc'
+require 'rdoc/code_objects'
+require 'rdoc/markup/preprocess'
+require 'rdoc/stats'
+
+##
+# A parser is simple a class that implements
+#
+#   #initialize(file_name, body, options)
+#
+# and
+#
+#   #scan
+#
+# The initialize method takes a file name to be used, the body of the file,
+# and an RDoc::Options object. The scan method is then called to return an
+# appropriately parsed TopLevel code object.
+#
+# The ParseFactory is used to redirect to the correct parser given a
+# filename extension. This magic works because individual parsers have to
+# register themselves with us as they are loaded in. The do this using the
+# following incantation
+#
+#   require "rdoc/parser"
+#
+#   class RDoc::Parser::Xyz < RDoc::Parser
+#     parse_files_matching /\.xyz$/ # <<<<
+#
+#     def initialize(file_name, body, options)
+#       ...
+#     end
+#
+#     def scan
+#       ...
+#     end
+#   end
+#
+# Just to make life interesting, if we suspect a plain text file, we also
+# look for a shebang line just in case it's a potential shell script
+
+class RDoc::Parser
+
+  @parsers = []
+
+  class << self
+    attr_reader :parsers
+  end
+
+  ##
+  # Alias an extension to another extension. After this call, files ending
+  # "new_ext" will be parsed using the same parser as "old_ext"
+
+  def self.alias_extension(old_ext, new_ext)
+    old_ext = old_ext.sub(/^\.(.*)/, '\1')
+    new_ext = new_ext.sub(/^\.(.*)/, '\1')
+
+    parser = can_parse "xxx.#{old_ext}"
+    return false unless parser
+
+    RDoc::Parser.parsers.unshift [/\.#{new_ext}$/, parser]
+
+    true
+  end
+
+  ##
+  # Determines if the file is a "binary" file which basically means it has
+  # content that an RDoc parser shouldn't try to consume.
+
+  def self.binary?(file)
+    s = File.read(file, 1024) or return false
+
+    if s[0, 2] == Marshal.dump('')[0, 2] then
+      true
+    elsif file =~ /erb\.rb$/ then
+      false
+    elsif s.scan(/<%|%>/).length >= 4 || s.index("\x00") then
+      true
+    elsif 0.respond_to? :fdiv then
+      s.count("\x00-\x7F", "^ -~\t\r\n").fdiv(s.size) > 0.3
+    else # HACK 1.8.6
+      (s.count("\x00-\x7F", "^ -~\t\r\n").to_f / s.size) > 0.3
+    end
+  end
+
+  ##
+  # Checks if +file+ is a zip file in disguise.  Signatures from
+  # http://www.garykessler.net/library/file_sigs.html
+
+  def self.zip? file
+    zip_signature = File.read file, 4
+
+    zip_signature == "PK\x03\x04" or
+      zip_signature == "PK\x05\x06" or
+      zip_signature == "PK\x07\x08"
+  end
+
+  ##
+  # Return a parser that can handle a particular extension
+
+  def self.can_parse(file_name)
+    parser = RDoc::Parser.parsers.find { |regexp,| regexp =~ file_name }.last
+
+    # HACK Selenium hides a jar file using a .txt extension
+    return if parser == RDoc::Parser::Simple and zip? file_name
+
+    # The default parser must not parse binary files
+    ext_name = File.extname file_name
+    return parser if ext_name.empty?
+    return if parser == RDoc::Parser::Simple and ext_name !~ /txt|rdoc/
+
+    parser
+  end
+
+  ##
+  # Find the correct parser for a particular file name. Return a SimpleParser
+  # for ones that we don't know
+
+  def self.for(top_level, file_name, body, options, stats)
+    return if binary? file_name
+
+    # If no extension, look for shebang
+    if file_name !~ /\.\w+$/ && body =~ %r{\A#!(.+)} then
+      shebang = $1
+      case shebang
+      when %r{env\s+ruby}, %r{/ruby}
+        file_name = "dummy.rb"
+      end
+    end
+
+    parser = can_parse file_name
+
+    return unless parser
+
+    parser.new top_level, file_name, body, options, stats
+  end
+
+  ##
+  # Record which file types this parser can understand.
+  #
+  # It is ok to call this multiple times.
+
+  def self.parse_files_matching(regexp)
+    RDoc::Parser.parsers.unshift [regexp, self]
+  end
+
+  def initialize(top_level, file_name, content, options, stats)
+    @top_level = top_level
+    @file_name = file_name
+    @content = content
+    @options = options
+    @stats = stats
+  end
+
+end
+
+require 'rdoc/parser/simple'
+
diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb
new file mode 100644
index 0000000000..f30167aafc
--- /dev/null
+++ b/lib/rdoc/parser/c.rb
@@ -0,0 +1,705 @@
+require 'rdoc/parser'
+require 'rdoc/parser/ruby'
+require 'rdoc/known_classes'
+
+##
+# We attempt to parse C extension files. Basically we look for
+# the standard patterns that you find in extensions: <tt>rb_define_class,
+# rb_define_method</tt> and so on. We also try to find the corresponding
+# C source for the methods and extract comments, but if we fail
+# we don't worry too much.
+#
+# The comments associated with a Ruby method are extracted from the C
+# comment block associated with the routine that _implements_ that
+# method, that is to say the method whose name is given in the
+# <tt>rb_define_method</tt> call. For example, you might write:
+#
+#   /*
+#    * Returns a new array that is a one-dimensional flattening of this
+#    * array (recursively). That is, for every element that is an array,
+#    * extract its elements into the new array.
+#    *
+#    *    s = [ 1, 2, 3 ]           #=> [1, 2, 3]
+#    *    t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
+#    *    a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
+#    *    a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+#    */
+#    static VALUE
+#    rb_ary_flatten(ary)
+#        VALUE ary;
+#    {
+#        ary = rb_obj_dup(ary);
+#        rb_ary_flatten_bang(ary);
+#        return ary;
+#    }
+#
+#    ...
+#
+#    void
+#    Init_Array()
+#    {
+#      ...
+#      rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
+#
+# Here RDoc will determine from the rb_define_method line that there's a
+# method called "flatten" in class Array, and will look for the implementation
+# in the method rb_ary_flatten. It will then use the comment from that
+# method in the HTML output. This method must be in the same source file
+# as the rb_define_method.
+#
+# The comment blocks may include special directives:
+#
+# [Document-class: <i>name</i>]
+#   This comment block is documentation for the given class. Use this
+#   when the <tt>Init_xxx</tt> method is not named after the class.
+#
+# [Document-method: <i>name</i>]
+#   This comment documents the named method. Use when RDoc cannot
+#   automatically find the method from it's declaration
+#
+# [call-seq:  <i>text up to an empty line</i>]
+#   Because C source doesn't give descripive names to Ruby-level parameters,
+#   you need to document the calling sequence explicitly
+#
+# In addition, RDoc assumes by default that the C method implementing a
+# Ruby function is in the same source file as the rb_define_method call.
+# If this isn't the case, add the comment:
+#
+#   rb_define_method(....);  // in filename
+#
+# As an example, we might have an extension that defines multiple classes
+# in its Init_xxx method. We could document them using
+#
+#   /*
+#    * Document-class:  MyClass
+#    *
+#    * Encapsulate the writing and reading of the configuration
+#    * file. ...
+#    */
+#
+#   /*
+#    * Document-method: read_value
+#    *
+#    * call-seq:
+#    *   cfg.read_value(key)            -> value
+#    *   cfg.read_value(key} { |key| }  -> value
+#    *
+#    * Return the value corresponding to +key+ from the configuration.
+#    * In the second form, if the key isn't found, invoke the
+#    * block and return its value.
+#    */
+
+class RDoc::Parser::C < RDoc::Parser
+
+  parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
+
+  include RDoc::Text
+
+  ##
+  # C file the parser is parsing
+
+  attr_accessor :content
+
+  ##
+  # Resets cross-file state.  Call when parsing different projects that need
+  # separate documentation.
+
+  def self.reset
+    @@enclosure_classes = {}
+    @@known_bodies = {}
+  end
+
+  reset
+
+  ##
+  # Prepare to parse a C file
+
+  def initialize(top_level, file_name, content, options, stats)
+    super
+
+    @known_classes = RDoc::KNOWN_CLASSES.dup
+    @content = handle_tab_width handle_ifdefs_in(@content)
+    @classes = Hash.new
+    @file_dir = File.dirname(@file_name)
+  end
+
+  def do_aliases
+    @content.scan(%r{rb_define_alias\s*\(\s*(\w+),\s*"([^"]+)",\s*"([^"]+)"\s*\)}m) do
+      |var_name, new_name, old_name|
+      class_name = @known_classes[var_name] || var_name
+      class_obj  = find_class(var_name, class_name)
+
+      as = class_obj.add_alias RDoc::Alias.new("", old_name, new_name, "")
+
+      @stats.add_alias as
+    end
+  end
+
+  def do_classes
+    @content.scan(/(\w+)\s* = \s*rb_define_module\s*\(\s*"(\w+)"\s*\)/mx) do
+      |var_name, class_name|
+      handle_class_module(var_name, "module", class_name, nil, nil)
+    end
+
+    # The '.' lets us handle SWIG-generated files
+    @content.scan(/([\w\.]+)\s* = \s*rb_define_class\s*
+              \(
+                 \s*"(\w+)",
+                 \s*(\w+)\s*
+              \)/mx) do |var_name, class_name, parent|
+      handle_class_module(var_name, "class", class_name, parent, nil)
+    end
+
+    @content.scan(/(\w+)\s*=\s*boot_defclass\s*\(\s*"(\w+?)",\s*(\w+?)\s*\)/) do
+      |var_name, class_name, parent|
+      parent = nil if parent == "0"
+      handle_class_module(var_name, "class", class_name, parent, nil)
+    end
+
+    @content.scan(/(\w+)\s* = \s*rb_define_module_under\s*
+              \(
+                 \s*(\w+),
+                 \s*"(\w+)"
+              \s*\)/mx) do |var_name, in_module, class_name|
+      handle_class_module(var_name, "module", class_name, nil, in_module)
+    end
+
+    @content.scan(/([\w\.]+)\s* = \s*rb_define_class_under\s*
+              \(
+                 \s*(\w+),
+                 \s*"(\w+)",
+                 \s*([\w\*\s\(\)\.\->]+)\s*  # for SWIG
+              \s*\)/mx) do |var_name, in_module, class_name, parent|
+      handle_class_module(var_name, "class", class_name, parent, in_module)
+    end
+  end
+
+  def do_constants
+    @content.scan(%r{\Wrb_define_
+                   ( variable          |
+                     readonly_variable |
+                     const             |
+                     global_const      | )
+               \s*\(
+                 (?:\s*(\w+),)?
+                 \s*"(\w+)",
+                 \s*(.*?)\s*\)\s*;
+                 }xm) do |type, var_name, const_name, definition|
+      var_name = "rb_cObject" if !var_name or var_name == "rb_mKernel"
+      handle_constants type, var_name, const_name, definition
+    end
+  end
+
+  ##
+  # Look for includes of the form:
+  #
+  #   rb_include_module(rb_cArray, rb_mEnumerable);
+
+  def do_includes
+    @content.scan(/rb_include_module\s*\(\s*(\w+?),\s*(\w+?)\s*\)/) do |c,m|
+      if cls = @classes[c]
+        m = @known_classes[m] || m
+        cls.add_include RDoc::Include.new(m, "")
+      end
+    end
+  end
+
+  def do_methods
+    @content.scan(%r{rb_define_
+                   (
+                      singleton_method |
+                      method           |
+                      module_function  |
+                      private_method
+                   )
+                   \s*\(\s*([\w\.]+),
+                     \s*"([^"]+)",
+                     \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+                     \s*(-?\w+)\s*\)
+                   (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
+                 }xm) do
+      |type, var_name, meth_name, meth_body, param_count, source_file|
+
+      # Ignore top-object and weird struct.c dynamic stuff
+      next if var_name == "ruby_top_self"
+      next if var_name == "nstr"
+      next if var_name == "envtbl"
+      next if var_name == "argf"   # it'd be nice to handle this one
+
+      var_name = "rb_cObject" if var_name == "rb_mKernel"
+      handle_method(type, var_name, meth_name, meth_body, param_count,
+                    source_file)
+    end
+
+    @content.scan(%r{rb_define_attr\(
+                             \s*([\w\.]+),
+                             \s*"([^"]+)",
+                             \s*(\d+),
+                             \s*(\d+)\s*\);
+                }xm) do |var_name, attr_name, attr_reader, attr_writer|
+      #var_name = "rb_cObject" if var_name == "rb_mKernel"
+      handle_attr(var_name, attr_name,
+                  attr_reader.to_i != 0,
+                  attr_writer.to_i != 0)
+    end
+
+    @content.scan(%r{rb_define_global_function\s*\(
+                             \s*"([^"]+)",
+                             \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+                             \s*(-?\w+)\s*\)
+                (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
+                }xm) do |meth_name, meth_body, param_count, source_file|
+      handle_method("method", "rb_mKernel", meth_name,
+                    meth_body, param_count, source_file)
+    end
+
+    @content.scan(/define_filetest_function\s*\(
+                             \s*"([^"]+)",
+                             \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+                             \s*(-?\w+)\s*\)/xm) do
+      |meth_name, meth_body, param_count|
+
+      handle_method("method", "rb_mFileTest", meth_name, meth_body, param_count)
+      handle_method("singleton_method", "rb_cFile", meth_name, meth_body, param_count)
+    end
+  end
+
+  def find_attr_comment(attr_name)
+    if @content =~ %r{((?>/\*.*?\*/\s+))
+                   rb_define_attr\((?:\s*(\w+),)?\s*"#{attr_name}"\s*,.*?\)\s*;}xmi
+      $1
+    elsif @content =~ %r{Document-attr:\s#{attr_name}\s*?\n((?>.*?\*/))}m
+      $1
+    else
+      ''
+    end
+  end
+
+  ##
+  # Find the C code corresponding to a Ruby method
+
+  def find_body(class_name, meth_name, meth_obj, body, quiet = false)
+    case body
+    when %r"((?>/\*.*?\*/\s*))((?:(?:static|SWIGINTERN)\s+)?(?:intern\s+)?VALUE\s+#{meth_name}
+            \s*(\([^)]*\))([^;]|$))"xm
+      comment = $1
+      body_text = $2
+      params = $3
+
+      remove_private_comments comment if comment
+
+      # see if we can find the whole body
+
+      re = Regexp.escape(body_text) + '[^(]*^\{.*?^\}'
+      body_text = $& if /#{re}/m =~ body
+
+      # The comment block may have been overridden with a 'Document-method'
+      # block. This happens in the interpreter when multiple methods are
+      # vectored through to the same C method but those methods are logically
+      # distinct (for example Kernel.hash and Kernel.object_id share the same
+      # implementation
+
+      override_comment = find_override_comment class_name, meth_obj.name
+      comment = override_comment if override_comment
+
+      find_modifiers comment, meth_obj if comment
+
+      #meth_obj.params = params
+      meth_obj.start_collecting_tokens
+      tk = RDoc::RubyToken::Token.new nil, 1, 1
+      tk.set_text body_text
+      meth_obj.add_token tk
+      meth_obj.comment = strip_stars comment
+    when %r{((?>/\*.*?\*/\s*))^\s*(\#\s*define\s+#{meth_name}\s+(\w+))}m
+      comment = $1
+      body_text = $2
+      find_body class_name, $3, meth_obj, body, true
+      find_modifiers comment, meth_obj
+
+      meth_obj.start_collecting_tokens
+      tk = RDoc::RubyToken::Token.new nil, 1, 1
+      tk.set_text body_text
+      meth_obj.add_token tk
+      meth_obj.comment = strip_stars(comment) + meth_obj.comment.to_s
+    when %r{^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
+      unless find_body(class_name, $1, meth_obj, body, true)
+        warn "No definition for #{meth_name}" unless @options.quiet
+        return false
+      end
+    else
+      # No body, but might still have an override comment
+      comment = find_override_comment(class_name, meth_obj.name)
+
+      if comment
+        find_modifiers(comment, meth_obj)
+        meth_obj.comment = strip_stars comment
+      else
+        warn "No definition for #{meth_name}" unless @options.quiet
+        return false
+      end
+    end
+    true
+  end
+
+  def find_class(raw_name, name)
+    unless @classes[raw_name]
+      if raw_name =~ /^rb_m/
+        container = @top_level.add_module RDoc::NormalModule, name
+      else
+        container = @top_level.add_class RDoc::NormalClass, name
+      end
+
+      container.record_location @top_level
+      @classes[raw_name] = container
+    end
+    @classes[raw_name]
+  end
+
+  ##
+  # Look for class or module documentation above Init_+class_name+(void),
+  # in a Document-class +class_name+ (or module) comment or above an
+  # rb_define_class (or module).  If a comment is supplied above a matching
+  # Init_ and a rb_define_class the Init_ comment is used.
+  #
+  #   /*
+  #    * This is a comment for Foo
+  #    */
+  #   Init_Foo(void) {
+  #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
+  #   }
+  #
+  #   /*
+  #    * Document-class: Foo
+  #    * This is a comment for Foo
+  #    */
+  #   Init_foo(void) {
+  #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
+  #   }
+  #
+  #   /*
+  #    * This is a comment for Foo
+  #    */
+  #   VALUE cFoo = rb_define_class("Foo", rb_cObject);
+
+  def find_class_comment(class_name, class_mod)
+    comment = nil
+
+    if @content =~ %r{
+        ((?>/\*.*?\*/\s+))
+        (static\s+)?
+        void\s+
+        Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)}xmi then # )
+      comment = $1
+    elsif @content =~ %r{Document-(?:class|module):\s+#{class_name}\s*?(?:<\s+[:,\w]+)?\n((?>.*?\*/))}m then
+      comment = $1
+    elsif @content =~ %r{((?>/\*.*?\*/\s+))
+                         ([\w\.\s]+\s* = \s+)?rb_define_(class|module).*?"(#{class_name})"}xm then # "
+      comment = $1
+    end
+
+    return unless comment
+
+    comment = strip_stars comment
+
+    comment = look_for_directives_in class_mod, comment
+
+    class_mod.comment = comment
+  end
+
+  ##
+  # Finds a comment matching +type+ and +const_name+ either above the
+  # comment or in the matching Document- section.
+
+  def find_const_comment(type, const_name)
+    if @content =~ %r{((?>^\s*/\*.*?\*/\s+))
+                   rb_define_#{type}\((?:\s*(\w+),)?\s*"#{const_name}"\s*,.*?\)\s*;}xmi
+      $1
+    elsif @content =~ %r{Document-(?:const|global|variable):\s#{const_name}\s*?\n((?>.*?\*/))}m
+      $1
+    else
+      ''
+    end
+  end
+
+  ##
+  # If the comment block contains a section that looks like:
+  #
+  #    call-seq:
+  #        Array.new
+  #        Array.new(10)
+  #
+  # use it for the parameters.
+
+  def find_modifiers(comment, meth_obj)
+    if comment.sub!(/:nodoc:\s*^\s*\*?\s*$/m, '') or
+       comment.sub!(/\A\/\*\s*:nodoc:\s*\*\/\Z/, '')
+      meth_obj.document_self = false
+    end
+    if comment.sub!(/call-seq:(.*?)^\s*\*?\s*$/m, '') or
+       comment.sub!(/\A\/\*\s*call-seq:(.*?)\*\/\Z/, '')
+      seq = $1
+      seq.gsub!(/^\s*\*\s*/, '')
+      meth_obj.call_seq = seq
+    end
+  end
+
+  def find_override_comment(class_name, meth_name)
+    name = Regexp.escape(meth_name)
+    if @content =~ %r{Document-method:\s+#{class_name}(?:\.|::|#)#{name}\s*?\n((?>.*?\*/))}m then
+      $1
+    elsif @content =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m then
+      $1
+    end
+  end
+
+  def handle_attr(var_name, attr_name, reader, writer)
+    rw = ''
+    rw << 'R' if reader
+    rw << 'W' if writer
+
+    class_name = @known_classes[var_name]
+
+    return unless class_name
+
+    class_obj = find_class(var_name, class_name)
+
+    if class_obj
+      comment = find_attr_comment(attr_name)
+      comment = strip_stars comment
+      att = RDoc::Attr.new '', attr_name, rw, comment
+      @stats.add_method att
+      class_obj.add_attribute(att)
+    end
+  end
+
+  def handle_class_module(var_name, type, class_name, parent, in_module)
+    parent_name = @known_classes[parent] || parent
+
+    if in_module then
+      enclosure = @classes[in_module] || @@enclosure_classes[in_module]
+
+      if enclosure.nil? and enclosure = @known_classes[in_module] then
+        type = /^rb_m/ =~ in_module ? "module" : "class"
+        handle_class_module in_module, type, enclosure, nil, nil
+        enclosure = @classes[in_module]
+      end
+
+      unless enclosure then
+        warn "Enclosing class/module '#{in_module}' for #{type} #{class_name} not known"
+        return
+      end
+    else
+      enclosure = @top_level
+    end
+
+    if type == "class" then
+      full_name = if RDoc::ClassModule === enclosure then
+                    enclosure.full_name + "::#{class_name}"
+                  else
+                    class_name
+                  end
+
+      if @content =~ %r{Document-class:\s+#{full_name}\s*<\s+([:,\w]+)} then
+        parent_name = $1
+      end
+
+      cm = enclosure.add_class RDoc::NormalClass, class_name, parent_name
+
+      @stats.add_class cm
+    else
+      cm = enclosure.add_module RDoc::NormalModule, class_name
+      @stats.add_module cm
+    end
+
+    cm.record_location enclosure.top_level
+
+    find_class_comment cm.full_name, cm
+
+    @classes[var_name] = cm
+    @@enclosure_classes[var_name] = cm
+    @known_classes[var_name] = cm.full_name
+  end
+
+  ##
+  # Adds constant comments.  By providing some_value: at the start ofthe
+  # comment you can override the C value of the comment to give a friendly
+  # definition.
+  #
+  #   /* 300: The perfect score in bowling */
+  #   rb_define_const(cFoo, "PERFECT", INT2FIX(300);
+  #
+  # Will override +INT2FIX(300)+ with the value +300+ in the output RDoc.
+  # Values may include quotes and escaped colons (\:).
+
+  def handle_constants(type, var_name, const_name, definition)
+    class_name = @known_classes[var_name]
+
+    return unless class_name
+
+    class_obj = find_class var_name, class_name
+
+    unless class_obj then
+      warn "Enclosing class/module #{const_name.inspect} not known"
+      return
+    end
+
+    comment = find_const_comment type, const_name
+    comment = strip_stars comment
+    comment = normalize_comment comment
+
+    # In the case of rb_define_const, the definition and comment are in
+    # "/* definition: comment */" form.  The literal ':' and '\' characters
+    # can be escaped with a backslash.
+    if type.downcase == 'const' then
+      elements = comment.split ':'
+
+      if elements.nil? or elements.empty? then
+        con = RDoc::Constant.new const_name, definition, comment
+      else
+        new_definition = elements[0..-2].join(':')
+
+        if new_definition.empty? then # Default to literal C definition
+          new_definition = definition
+        else
+          new_definition.gsub!("\:", ":")
+          new_definition.gsub!("\\", '\\')
+        end
+
+        new_definition.sub!(/\A(\s+)/, '')
+
+        new_comment = if $1.nil? then
+                        elements.last.lstrip
+                      else
+                        "#{$1}#{elements.last.lstrip}"
+                      end
+
+        con = RDoc::Constant.new const_name, new_definition, new_comment
+      end
+    else
+      con = RDoc::Constant.new const_name, definition, comment
+    end
+
+    @stats.add_constant con
+    class_obj.add_constant con
+  end
+
+  ##
+  # Removes #ifdefs that would otherwise confuse us
+
+  def handle_ifdefs_in(body)
+    body.gsub(/^#ifdef HAVE_PROTOTYPES.*?#else.*?\n(.*?)#endif.*?\n/m, '\1')
+  end
+
+  def handle_method(type, var_name, meth_name, meth_body, param_count,
+                    source_file = nil)
+    class_name = @known_classes[var_name]
+
+    return unless class_name
+
+    class_obj = find_class var_name, class_name
+
+    if class_obj then
+      if meth_name == "initialize" then
+        meth_name = "new"
+        type = "singleton_method"
+      end
+
+      meth_obj = RDoc::AnyMethod.new '', meth_name
+      meth_obj.singleton = %w[singleton_method module_function].include? type
+
+      p_count = Integer(param_count) rescue -1
+
+      if p_count < 0 then
+        meth_obj.params = "(...)"
+      elsif p_count == 0
+        meth_obj.params = "()"
+      else
+        meth_obj.params = "(" + (1..p_count).map{|i| "p#{i}"}.join(", ") + ")"
+      end
+
+      if source_file then
+        file_name = File.join @file_dir, source_file
+
+        if File.exist? file_name then
+          body = (@@known_bodies[file_name] ||= File.read(file_name))
+        else
+          warn "unknown source #{source_file} for #{meth_name} in #{@file_name}"
+        end
+      else
+        body = @content
+      end
+
+      if find_body(class_name, meth_body, meth_obj, body) and meth_obj.document_self then
+        class_obj.add_method meth_obj
+        @stats.add_method meth_obj
+        meth_obj.visibility = :private if 'private_method' == type
+      end
+    end
+  end
+
+  def handle_tab_width(body)
+    if /\t/ =~ body
+      tab_width = @options.tab_width
+      body.split(/\n/).map do |line|
+        1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)}  && $~ #`
+        line
+      end .join("\n")
+    else
+      body
+    end
+  end
+
+  ##
+  # Look for directives in a normal comment block:
+  #
+  #   /*
+  #    * :title: My Awesome Project
+  #    */
+  #
+  # This routine modifies it's parameter
+
+  def look_for_directives_in(context, comment)
+    preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
+
+    preprocess.handle comment, context do |directive, param|
+      case directive
+      when 'main' then
+        @options.main_page = param
+        ''
+      when 'title' then
+        @options.title = param
+        ''
+      end
+    end
+
+    comment
+  end
+  ##
+  # Removes lines that are commented out that might otherwise get picked up
+  # when scanning for classes and methods
+
+  def remove_commented_out_lines
+    @content.gsub!(%r{//.*rb_define_}, '//')
+  end
+
+  def remove_private_comments(comment)
+    comment.gsub!(/\/?\*--\n(.*?)\/?\*\+\+/m, '')
+    comment.sub!(/\/?\*--\n.*/m, '')
+  end
+
+  ##
+  # Extract the classes/modules and methods from a C file and return the
+  # corresponding top-level object
+
+  def scan
+    remove_commented_out_lines
+    do_classes
+    do_constants
+    do_methods
+    do_includes
+    do_aliases
+    @top_level
+  end
+
+end
+
diff --git a/lib/rdoc/parser/perl.rb b/lib/rdoc/parser/perl.rb
new file mode 100644
index 0000000000..0023a013a6
--- /dev/null
+++ b/lib/rdoc/parser/perl.rb
@@ -0,0 +1,165 @@
+require 'rdoc/parser'
+
+##
+#
+# This is an attamept to write a basic parser for Perl's
+# POD (Plain old Documentation) format.  Ruby code must
+# co-exist with Perl, and some tasks are easier in Perl
+# than Ruby because of existing libraries.
+#
+# One difficult is that Perl POD has no means of identifying
+# the classes (packages) and methods (subs) with which it
+# is associated, it is more like literate programming in so
+# far as it just happens to be in the same place as the code,
+# but need not be.
+#
+# We would like to support all the markup the POD provides
+# so that it will convert happily to HTML.  At the moment
+# I don't think I can do that: time constraints.
+#
+
+class RDoc::Parser::PerlPOD < RDoc::Parser
+
+  parse_files_matching(/.p[lm]$/)
+
+  ##
+  # Prepare to parse a perl file
+
+  def initialize(top_level, file_name, content, options, stats)
+    super
+
+    preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
+
+    preprocess.handle @content do |directive, param|
+      warn "Unrecognized directive '#{directive}' in #{@file_name}"
+    end
+  end
+
+  ##
+  # Extract the Pod(-like) comments from the code.
+  # At its most basic there will ne no need to distinguish
+  # between the different types of header, etc.
+  #
+  # This uses a simple finite state machine, in a very
+  # procedural pattern. I could "replace case with polymorphism"
+  # but I think it would obscure the intent, scatter the
+  # code all over tha place.  This machine is necessary
+  # because POD requires that directives be preceded by
+  # blank lines, so reading line by line is necessary,
+  # and preserving state about what is seen is necesary.
+
+  def scan
+
+    @top_level.comment ||= ""
+    state=:code_blank
+    line_number = 0
+    line = nil
+
+    # This started out as a really long nested case statement,
+    # which also led to repetitive code.  I'd like to avoid that
+    # so I'm using a "table" instead.
+
+    # Firstly we need some procs to do the transition and processing
+    # work.  Because these are procs they are closures, and they can
+    # use variables in the local scope.
+    #
+    # First, the "nothing to see here" stuff.
+    code_noop = lambda do
+      if line =~ /^\s+$/
+	state = :code_blank
+      end
+    end
+
+    pod_noop = lambda do
+      if line =~ /^\s+$/
+	state = :pod_blank
+      end
+      @top_level.comment += filter(line)
+    end
+
+    begin_noop = lambda do
+      if line =~ /^\s+$/
+	state = :begin_blank
+      end
+      @top_level.comment += filter(line)
+    end
+
+    # Now for the blocks that process code and comments...
+
+    transit_to_pod = lambda do
+      case line
+      when /^=(?:pod|head\d+)/
+	state = :pod_no_blank
+	@top_level.comment += filter(line)
+      when /^=over/
+	state = :over_no_blank
+	@top_level.comment += filter(line)
+      when /^=(?:begin|for)/
+	state = :begin_no_blank
+      end
+    end
+
+    process_pod = lambda do
+      case line
+      when  /^\s*$/
+	state = :pod_blank
+	@top_level.comment += filter(line)
+      when /^=cut/
+	state = :code_no_blank
+      when /^=end/
+	$stderr.puts "'=end' unexpected at #{line_number} in #{@file_name}"
+      else
+	@top_level.comment += filter(line)
+      end
+    end
+
+
+    process_begin = lambda do
+      case line
+      when  /^\s*$/
+	state = :begin_blank
+	@top_level.comment += filter(line)
+      when /^=end/
+	state = :code_no_blank
+      when /^=cut/
+	$stderr.puts "'=cut' unexpected at #{line_number} in #{@file_name}"
+      else
+	@top_level.comment += filter(line)
+      end
+
+    end
+
+
+    transitions = { :code_no_blank => code_noop,
+                    :code_blank => transit_to_pod,
+		    :pod_no_blank => pod_noop,
+		    :pod_blank => process_pod,
+		    :begin_no_blank => begin_noop,
+		    :begin_blank => process_begin}
+    @content.each_line do |l|
+      line = l
+      line_number += 1
+      transitions[state].call
+    end # each line
+
+    @top_level
+  end
+
+  # Filter the perl markup that does the same as the rdoc
+  # filtering.  Only basic for now. Will probably need a
+  # proper parser to cope with C<<...>> etc
+  def filter(comment)
+    return '' if comment =~ /^=pod\s*$/
+    comment.gsub!(/^=pod/, '==')
+    comment.gsub!(/^=head(\d+)/) do
+      "=" * $1.to_i
+    end
+    comment.gsub!(/=item/, '');
+    comment.gsub!(/C<(.*?)>/, '<tt>\1</tt>');
+    comment.gsub!(/I<(.*?)>/, '<i>\1</i>');
+    comment.gsub!(/B<(.*?)>/, '<b>\1</b>');
+    comment
+  end
+
+end
+
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
new file mode 100644
index 0000000000..bfb118c416
--- /dev/null
+++ b/lib/rdoc/parser/ruby.rb
@@ -0,0 +1,1599 @@
+##
+# This file contains stuff stolen outright from:
+#
+#   rtags.rb -
+#   ruby-lex.rb - ruby lexcal analyzer
+#   ruby-token.rb - ruby tokens
+#       by Keiju ISHITSUKA (Nippon Rational Inc.)
+#
+
+require 'rdoc/ruby_token'
+require 'rdoc/ruby_lex'
+
+require 'rdoc/code_objects'
+require 'rdoc/tokenstream'
+require 'rdoc/markup/preprocess'
+require 'rdoc/parser'
+require 'rdoc/parser/ruby_tools'
+
+$TOKEN_DEBUG ||= nil
+
+##
+# Extracts code elements from a source file returning a TopLevel object
+# containing the constituent file elements.
+#
+# This file is based on rtags
+#
+# RubyParser understands how to document:
+# * classes
+# * modules
+# * methods
+# * constants
+# * aliases
+# * private, public, protected
+# * private_class_function, public_class_function
+# * module_function
+# * attr, attr_reader, attr_writer, attr_accessor
+# * extra accessors given on the command line
+# * metaprogrammed methods
+# * require
+# * include
+#
+# == Method Arguments
+#
+#--
+# NOTE: I don't think this works, needs tests, remove the paragraph following
+# this block when known to work
+#
+# The parser extracts the arguments from the method definition.  You can
+# override this with a custom argument definition using the :args: directive:
+#
+#   ##
+#   # This method tries over and over until it is tired
+#
+#   def go_go_go(thing_to_try, tries = 10) # :args: thing_to_try
+#     puts thing_to_try
+#     go_go_go thing_to_try, tries - 1
+#   end
+#
+# If you have a more-complex set of overrides you can use the :call-seq:
+# directive:
+#++
+#
+# The parser extracts the arguments from the method definition.  You can
+# override this with a custom argument definition using the :call-seq:
+# directive:
+#
+#   ##
+#   # This method can be called with a range or an offset and length
+#   #
+#   # :call-seq:
+#   #   my_method(Range)
+#   #   my_method(offset, length)
+#
+#   def my_method(*args)
+#   end
+#
+# The parser extracts +yield+ expressions from method bodies to gather the
+# yielded argument names.  If your method manually calls a block instead of
+# yielding or you want to override the discovered argument names use
+# the :yields: directive:
+#
+#   ##
+#   # My method is awesome
+#
+#   def my_method(&block) # :yields: happy, times
+#     block.call 1, 2
+#   end
+#
+# == Metaprogrammed Methods
+#
+# To pick up a metaprogrammed method, the parser looks for a comment starting
+# with '##' before an identifier:
+#
+#   ##
+#   # This is a meta-programmed method!
+#
+#   add_my_method :meta_method, :arg1, :arg2
+#
+# The parser looks at the token after the identifier to determine the name, in
+# this example, :meta_method.  If a name cannot be found, a warning is printed
+# and 'unknown is used.
+#
+# You can force the name of a method using the :method: directive:
+#
+#   ##
+#   # :method: woo_hoo!
+#
+# By default, meta-methods are instance methods.  To indicate that a method is
+# a singleton method instead use the :singleton-method: directive:
+#
+#   ##
+#   # :singleton-method:
+#
+# You can also use the :singleton-method: directive with a name:
+#
+#   ##
+#   # :singleton-method: woo_hoo!
+#
+# Additionally you can mark a method as an attribute by
+# using :attr:, :attr_reader:, :attr_writer: or :attr_accessor:.  Just like
+# for :method:, the name is optional.
+#
+#   ##
+#   # :attr_reader: my_attr_name
+#
+# == Hidden methods and attributes
+#
+# You can provide documentation for methods that don't appear using
+# the :method:, :singleton-method: and :attr: directives:
+#
+#   ##
+#   # :attr_writer: ghost_writer
+#   # There is an attribute here, but you can't see it!
+#
+#   ##
+#   # :method: ghost_method
+#   # There is a method here, but you can't see it!
+#
+#   ##
+#   # this is a comment for a regular method
+#
+#   def regular_method() end
+#
+# Note that by default, the :method: directive will be ignored if there is a
+# standard rdocable item following it.
+
+class RDoc::Parser::Ruby < RDoc::Parser
+
+  parse_files_matching(/\.rbw?$/)
+
+  include RDoc::RubyToken
+  include RDoc::TokenStream
+  include RDoc::Parser::RubyTools
+
+  ##
+  # RDoc::NormalClass type
+
+  NORMAL = "::"
+
+  ##
+  # RDoc::SingleClass type
+
+  SINGLE = "<<"
+
+  def initialize(top_level, file_name, content, options, stats)
+    super
+
+    @size = 0
+    @token_listeners = nil
+    @scanner = RDoc::RubyLex.new content, @options
+    @scanner.exception_on_syntax_error = false
+    @prev_seek = nil
+
+    reset
+  end
+
+  ##
+  # Look for the first comment in a file that isn't a shebang line.
+
+  def collect_first_comment
+    skip_tkspace
+    comment = ''
+    first_line = true
+
+    tk = get_tk
+
+    while TkCOMMENT === tk
+      if first_line and tk.text =~ /\A#!/ then
+        skip_tkspace
+        tk = get_tk
+      elsif first_line and tk.text =~ /\A#\s*-\*-/ then
+        first_line = false
+        skip_tkspace
+        tk = get_tk
+      else
+        first_line = false
+        comment << tk.text << "\n"
+        tk = get_tk
+
+        if TkNL === tk then
+          skip_tkspace false
+          tk = get_tk
+        end
+      end
+    end
+
+    unget_tk tk
+
+    comment
+  end
+
+  def error(msg)
+    msg = make_message msg
+    $stderr.puts msg
+    exit false
+  end
+
+  ##
+  # Look for a 'call-seq' in the comment, and override the normal parameter
+  # stuff
+
+  def extract_call_seq(comment, meth)
+    if comment.sub!(/:?call-seq:(.*?)^\s*\#?\s*$/m, '') then
+      seq = $1
+      seq.gsub!(/^\s*\#\s*/, '')
+      meth.call_seq = seq
+    end
+
+    meth
+  end
+
+  def get_bool
+    skip_tkspace
+    tk = get_tk
+    case tk
+    when TkTRUE
+      true
+    when TkFALSE, TkNIL
+      false
+    else
+      unget_tk tk
+      true
+    end
+  end
+
+  ##
+  # Look for the name of a class of module (optionally with a leading :: or
+  # with :: separated named) and return the ultimate name and container
+
+  def get_class_or_module(container)
+    skip_tkspace
+    name_t = get_tk
+
+    # class ::A -> A is in the top level
+    case name_t
+    when TkCOLON2, TkCOLON3 then # bug
+      name_t = get_tk
+      container = @top_level
+    end
+
+    skip_tkspace false
+
+    while TkCOLON2 === peek_tk do
+      prev_container = container
+      container = container.find_module_named name_t.name
+      unless container then
+        container = prev_container.add_module RDoc::NormalModule, name_t.name
+      end
+      get_tk
+      name_t = get_tk
+    end
+    skip_tkspace false
+    return [container, name_t]
+  end
+
+  ##
+  # Return a superclass, which can be either a constant of an expression
+
+  def get_class_specification
+    tk = get_tk
+    return "self" if TkSELF === tk
+
+    res = ""
+    while TkCOLON2 === tk or TkCOLON3 === tk or TkCONSTANT === tk do
+      res += tk.name
+      tk = get_tk
+    end
+
+    unget_tk(tk)
+    skip_tkspace false
+
+    get_tkread # empty out read buffer
+
+    tk = get_tk
+
+    case tk
+    when TkNL, TkCOMMENT, TkSEMICOLON then
+      unget_tk(tk)
+      return res
+    end
+
+    res += parse_call_parameters(tk)
+    res
+  end
+
+  ##
+  # Parse a constant, which might be qualified by one or more class or module
+  # names
+
+  def get_constant
+    res = ""
+    skip_tkspace false
+    tk = get_tk
+
+    while TkCOLON2 === tk or TkCOLON3 === tk or TkCONSTANT === tk do
+      res += tk.name
+      tk = get_tk
+    end
+
+#      if res.empty?
+#        warn("Unexpected token #{tk} in constant")
+#      end
+    unget_tk(tk)
+    res
+  end
+
+  ##
+  # Get a constant that may be surrounded by parens
+
+  def get_constant_with_optional_parens
+    skip_tkspace false
+    nest = 0
+    while TkLPAREN === (tk = peek_tk) or TkfLPAREN === tk do
+      get_tk
+      skip_tkspace
+      nest += 1
+    end
+
+    name = get_constant
+
+    while nest > 0
+      skip_tkspace
+      tk = get_tk
+      nest -= 1 if TkRPAREN === tk
+    end
+
+    name
+  end
+
+  def get_symbol_or_name
+    tk = get_tk
+    case tk
+    when TkSYMBOL then
+      text = tk.text.sub(/^:/, '')
+
+      if TkASSIGN === peek_tk then
+        get_tk
+        text << '='
+      end
+
+      text
+    when TkId, TkOp then
+      tk.name
+    when TkSTRING, TkDSTRING then
+      tk.text
+    else
+      raise RDoc::Error, "Name or symbol expected (got #{tk})"
+    end
+  end
+
+  ##
+  # Look for directives in a normal comment block:
+  #
+  #   # :stopdoc:
+  #   # Don't display comment from this point forward
+  #
+  # This routine modifies it's parameter
+
+  def look_for_directives_in(context, comment)
+    preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
+
+    preprocess.handle comment, context do |directive, param|
+      case directive
+      when 'enddoc' then
+        throw :enddoc
+      when 'main' then
+        @options.main_page = param
+        ''
+      when 'method', 'singleton-method',
+           'attr', 'attr_accessor', 'attr_reader', 'attr_writer' then
+        false # handled elsewhere
+      when 'section' then
+        context.set_current_section param, comment
+        comment.replace ''
+        break
+      when 'startdoc' then
+        context.start_doc
+        context.force_documentation = true
+        ''
+      when 'stopdoc' then
+        context.stop_doc
+        ''
+      when 'title' then
+        @options.title = param
+        ''
+      end
+    end
+
+    remove_private_comments comment
+  end
+
+  ##
+  # Adds useful info about the parser to +message+
+
+  def make_message message
+    prefix = "#{@file_name}:"
+
+    prefix << "#{@scanner.line_no}:#{@scanner.char_no}:" if @scanner
+
+    "#{prefix} #{message}"
+  end
+
+  ##
+  # Creates an RDoc::Attr for the name following +tk+, setting the comment to
+  # +comment+.
+
+  def parse_attr(context, single, tk, comment)
+    args = parse_symbol_arg 1
+    if args.size > 0
+      name = args[0]
+      rw = "R"
+      skip_tkspace false
+      tk = get_tk
+      if TkCOMMA === tk then
+        rw = "RW" if get_bool
+      else
+        unget_tk tk
+      end
+      att = RDoc::Attr.new get_tkread, name, rw, comment
+      read_documentation_modifiers att, RDoc::ATTR_MODIFIERS
+      if att.document_self
+        context.add_attribute(att)
+      end
+    else
+      warn("'attr' ignored - looks like a variable")
+    end
+  end
+
+  ##
+  # Creates an RDoc::Attr for each attribute listed after +tk+, setting the
+  # comment for each to +comment+.
+
+  def parse_attr_accessor(context, single, tk, comment)
+    args = parse_symbol_arg
+    read = get_tkread
+    rw = "?"
+
+    # TODO If nodoc is given, don't document any of them
+
+    tmp = RDoc::CodeObject.new
+    read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS
+    return unless tmp.document_self
+
+    case tk.name
+    when "attr_reader"   then rw = "R"
+    when "attr_writer"   then rw = "W"
+    when "attr_accessor" then rw = "RW"
+    else
+      rw = '?'
+    end
+
+    for name in args
+      att = RDoc::Attr.new get_tkread, name, rw, comment
+      context.add_attribute att
+    end
+  end
+
+  def parse_alias(context, single, tk, comment)
+    skip_tkspace
+    if TkLPAREN === peek_tk then
+      get_tk
+      skip_tkspace
+    end
+    new_name = get_symbol_or_name
+
+    @scanner.instance_eval { @lex_state = EXPR_FNAME }
+
+    skip_tkspace
+    if TkCOMMA === peek_tk then
+      get_tk
+      skip_tkspace
+    end
+
+    begin
+      old_name = get_symbol_or_name
+    rescue RDoc::Error
+      return
+    end
+
+    al = RDoc::Alias.new get_tkread, old_name, new_name, comment
+    read_documentation_modifiers al, RDoc::ATTR_MODIFIERS
+    context.add_alias al if al.document_self
+  end
+
+  def parse_call_parameters(tk)
+    end_token = case tk
+                when TkLPAREN, TkfLPAREN
+                  TkRPAREN
+                when TkRPAREN
+                  return ""
+                else
+                  TkNL
+                end
+    nest = 0
+
+    loop do
+      case tk
+      when TkSEMICOLON
+        break
+      when TkLPAREN, TkfLPAREN
+        nest += 1
+      when end_token
+        if end_token == TkRPAREN
+          nest -= 1
+          break if @scanner.lex_state == EXPR_END and nest <= 0
+        else
+          break unless @scanner.continue
+        end
+      when TkCOMMENT, TkASSIGN, TkOPASGN
+        unget_tk(tk)
+        break
+      when nil then
+        break
+      end
+      tk = get_tk
+    end
+    res = get_tkread.tr("\n", " ").strip
+    res = "" if res == ";"
+    res
+  end
+
+  def parse_class(container, single, tk, comment)
+    container, name_t = get_class_or_module container
+
+    case name_t
+    when TkCONSTANT
+      name = name_t.name
+      superclass = "Object"
+
+      if TkLT === peek_tk then
+        get_tk
+        skip_tkspace
+        superclass = get_class_specification
+        superclass = "<unknown>" if superclass.empty?
+      end
+
+      cls_type = single == SINGLE ? RDoc::SingleClass : RDoc::NormalClass
+      cls = container.add_class cls_type, name, superclass
+
+      read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
+      cls.record_location @top_level
+      cls.comment = comment
+
+      @stats.add_class cls
+
+      parse_statements cls
+    when TkLSHFT
+      case name = get_class_specification
+      when "self", container.name
+        parse_statements container, SINGLE
+      when /\A[A-Z]/
+        other = RDoc::TopLevel.find_class_named name
+
+        unless other then
+          other = container.add_module RDoc::NormalModule, name
+          other.record_location @top_level
+          other.comment = comment
+        end
+
+        @stats.add_class other
+
+        read_documentation_modifiers other, RDoc::CLASS_MODIFIERS
+        parse_statements(other, SINGLE)
+      end
+
+    else
+      warn("Expected class name or '<<'. Got #{name_t.class}: #{name_t.text.inspect}")
+    end
+  end
+
+  def parse_constant(container, tk, comment)
+    name = tk.name
+    skip_tkspace false
+    eq_tk = get_tk
+
+    unless TkASSIGN === eq_tk then
+      unget_tk eq_tk
+      return
+    end
+
+    nest = 0
+    get_tkread
+
+    tk = get_tk
+
+    if TkGT === tk then
+      unget_tk tk
+      unget_tk eq_tk
+      return
+    end
+
+    rhs_name = ''
+
+    loop do
+      case tk
+      when TkSEMICOLON then
+        break
+      when TkLPAREN, TkfLPAREN, TkLBRACE, TkLBRACK, TkDO, TkIF, TkUNLESS,
+           TkCASE then
+        nest += 1
+      when TkRPAREN, TkRBRACE, TkRBRACK, TkEND then
+        nest -= 1
+      when TkCOMMENT then
+        if nest <= 0 && @scanner.lex_state == EXPR_END
+          unget_tk tk
+          break
+        end
+      when TkCONSTANT then
+        rhs_name << tk.name
+
+        if nest <= 0 and TkNL === peek_tk then
+          mod = if rhs_name =~ /^::/ then
+                  RDoc::TopLevel.find_class_or_module rhs_name
+                else
+                  container.find_module_named rhs_name
+                end
+
+          container.add_module_alias mod, name if mod
+          get_tk # TkNL
+          break
+        end
+      when TkNL then
+        if nest <= 0 &&
+           (@scanner.lex_state == EXPR_END || !@scanner.continue) then
+          unget_tk tk
+          break
+        end
+      when TkCOLON2, TkCOLON3 then
+        rhs_name << '::'
+      when nil then
+        break
+      end
+      tk = get_tk
+    end
+
+    res = get_tkread.tr("\n", " ").strip
+    res = "" if res == ";"
+
+    con = RDoc::Constant.new name, res, comment
+    read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS
+
+    @stats.add_constant con
+    container.add_constant con if con.document_self
+  end
+
+  ##
+  # Generates an RDoc::Method or RDoc::Attr from +comment+ by looking for
+  # :method: or :attr: directives in +comment+.
+
+  def parse_comment(container, tk, comment)
+    line_no = tk.line_no
+    column  = tk.char_no
+
+    singleton = !!comment.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
+
+    # REFACTOR
+    if comment.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
+      name = $1 unless $1.empty?
+
+      meth = RDoc::GhostMethod.new get_tkread, name
+      meth.singleton = singleton
+
+      meth.start_collecting_tokens
+      indent = TkSPACE.new nil, 1, 1
+      indent.set_text " " * column
+
+      position_comment = TkCOMMENT.new nil, line_no, 1
+      position_comment.set_text "# File #{@top_level.absolute_name}, line #{line_no}"
+      meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
+
+      meth.params = ''
+
+      extract_call_seq comment, meth
+
+      return unless meth.name
+
+      container.add_method meth if meth.document_self
+
+      meth.comment = comment
+
+      @stats.add_method meth
+    elsif comment.sub!(/# +:?(attr(_reader|_writer|_accessor)?:) *(\S*).*?\n/i, '') then
+      rw = case $1
+           when 'attr_reader' then 'R'
+           when 'attr_writer' then 'W'
+           else 'RW'
+           end
+
+      name = $3 unless $3.empty?
+
+      att = RDoc::Attr.new get_tkread, name, rw, comment
+      container.add_attribute att
+
+      @stats.add_method att
+    end
+  end
+
+  def parse_include(context, comment)
+    loop do
+      skip_tkspace_comment
+
+      name = get_constant_with_optional_parens
+      context.add_include RDoc::Include.new(name, comment) unless name.empty?
+
+      return unless TkCOMMA === peek_tk
+      get_tk
+    end
+  end
+
+  ##
+  # Parses a meta-programmed attribute and creates an RDoc::Attr.
+  #
+  # To create foo and bar attributes on class C with comment "My attributes":
+  #
+  #   class C
+  #
+  #     ##
+  #     # :attr:
+  #     #
+  #     # My attributes
+  #
+  #     my_attr :foo, :bar
+  #
+  #   end
+  #
+  # To create a foo attribute on class C with comment "My attribute":
+  #
+  #   class C
+  #
+  #     ##
+  #     # :attr: foo
+  #     #
+  #     # My attribute
+  #
+  #     my_attr :foo, :bar
+  #
+  #   end
+
+  def parse_meta_attr(context, single, tk, comment)
+    args = parse_symbol_arg
+    read = get_tkread
+    rw = "?"
+
+    # If nodoc is given, don't document any of them
+
+    tmp = RDoc::CodeObject.new
+    read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS
+    return unless tmp.document_self
+
+    if comment.sub!(/^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then
+      rw = case $1
+           when 'attr_reader' then 'R'
+           when 'attr_writer' then 'W'
+           else 'RW'
+           end
+      name = $3 unless $3.empty?
+    end
+
+    if name then
+      att = RDoc::Attr.new get_tkread, name, rw, comment
+      context.add_attribute att
+    else
+      args.each do |attr_name|
+        att = RDoc::Attr.new get_tkread, attr_name, rw, comment
+        context.add_attribute att
+      end
+    end
+  end
+
+  ##
+  # Parses a meta-programmed method
+
+  def parse_meta_method(container, single, tk, comment)
+    line_no = tk.line_no
+    column  = tk.char_no
+
+    start_collecting_tokens
+    add_token tk
+    add_token_listener self
+
+    skip_tkspace false
+
+    singleton = !!comment.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
+
+    if comment.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
+      name = $1 unless $1.empty?
+    end
+
+    if name.nil? then
+      name_t = get_tk
+      case name_t
+      when TkSYMBOL then
+        name = name_t.text[1..-1]
+      when TkSTRING then
+        name = name_t.value[1..-2]
+      when TkASSIGN then # ignore
+        remove_token_listener self
+        return
+      else
+        warn "unknown name token #{name_t.inspect} for meta-method '#{tk.name}'"
+        name = 'unknown'
+      end
+    end
+
+    meth = RDoc::MetaMethod.new get_tkread, name
+    meth.singleton = singleton
+
+    remove_token_listener self
+
+    meth.start_collecting_tokens
+    indent = TkSPACE.new nil, 1, 1
+    indent.set_text " " * column
+
+    position_comment = TkCOMMENT.new nil, line_no, 1
+    position_comment.value = "# File #{@top_level.absolute_name}, line #{line_no}"
+    meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
+    meth.add_tokens @token_stream
+
+    token_listener meth do
+      meth.params = ''
+
+      extract_call_seq comment, meth
+
+      container.add_method meth if meth.document_self
+
+      last_tk = tk
+
+      while tk = get_tk do
+        case tk
+        when TkSEMICOLON then
+          break
+        when TkNL then
+          break unless last_tk and TkCOMMA === last_tk
+        when TkSPACE then
+          # expression continues
+        else
+          last_tk = tk
+        end
+      end
+    end
+
+    meth.comment = comment
+
+    @stats.add_method meth
+  end
+
+  ##
+  # Parses a normal method defined by +def+
+
+  def parse_method(container, single, tk, comment)
+    added_container = nil
+    meth = nil
+    name = nil
+    line_no = tk.line_no
+    column  = tk.char_no
+
+    start_collecting_tokens
+    add_token tk
+
+    token_listener self do
+      @scanner.instance_eval do @lex_state = EXPR_FNAME end
+
+      skip_tkspace false
+      name_t = get_tk
+      back_tk = skip_tkspace
+      meth = nil
+      added_container = false
+
+      dot = get_tk
+      if TkDOT === dot or TkCOLON2 === dot then
+        @scanner.instance_eval do @lex_state = EXPR_FNAME end
+        skip_tkspace
+        name_t2 = get_tk
+
+        case name_t
+        when TkSELF, TkMOD then
+          name = name_t2.name
+        when TkCONSTANT then
+          name = name_t2.name
+          prev_container = container
+          container = container.find_module_named(name_t.name)
+          unless container then
+            added_container = true
+            obj = name_t.name.split("::").inject(Object) do |state, item|
+              state.const_get(item)
+            end rescue nil
+
+            type = obj.class == Class ? RDoc::NormalClass : RDoc::NormalModule
+
+            unless [Class, Module].include?(obj.class) then
+              warn("Couldn't find #{name_t.name}. Assuming it's a module")
+            end
+
+            if type == RDoc::NormalClass then
+              sclass = obj.superclass ? obj.superclass.name : nil
+              container = prev_container.add_class type, name_t.name, sclass
+            else
+              container = prev_container.add_module type, name_t.name
+            end
+
+            container.record_location @top_level
+          end
+        when TkIDENTIFIER, TkIVAR then
+          dummy = RDoc::Context.new
+          dummy.parent = container
+          skip_method dummy
+          return
+        else
+          warn "unexpected method name token #{name_t.inspect}"
+          # break
+          skip_method container
+          return
+        end
+
+        meth = RDoc::AnyMethod.new(get_tkread, name)
+        meth.singleton = true
+      else
+        unget_tk dot
+        back_tk.reverse_each do |token|
+          unget_tk token
+        end
+
+        name = case name_t
+               when TkSTAR, TkAMPER then
+                 name_t.text
+               else
+                 unless name_t.respond_to? :name then
+                   warn "expected method name token, . or ::, got #{name_t.inspect}"
+                   skip_method container
+                   return
+                 end
+                 name_t.name
+               end
+
+        meth = RDoc::AnyMethod.new get_tkread, name
+        meth.singleton = (single == SINGLE)
+      end
+    end
+
+    meth.start_collecting_tokens
+    indent = TkSPACE.new nil, 1, 1
+    indent.set_text " " * column
+
+    token = TkCOMMENT.new nil, line_no, 1
+    token.set_text "# File #{@top_level.absolute_name}, line #{line_no}"
+    meth.add_tokens [token, NEWLINE_TOKEN, indent]
+    meth.add_tokens @token_stream
+
+    token_listener meth do
+      @scanner.instance_eval do @continue = false end
+      parse_method_parameters meth
+
+      if meth.document_self then
+        container.add_method meth
+      elsif added_container then
+        container.document_self = false
+      end
+
+      # Having now read the method parameters and documentation modifiers, we
+      # now know whether we have to rename #initialize to ::new
+
+      if name == "initialize" && !meth.singleton then
+        if meth.dont_rename_initialize then
+          meth.visibility = :protected
+        else
+          meth.singleton = true
+          meth.name = "new"
+          meth.visibility = :public
+        end
+      end
+
+      parse_statements container, single, meth
+    end
+
+    extract_call_seq comment, meth
+
+    meth.comment = comment
+
+    @stats.add_method meth
+  end
+
+  def parse_method_or_yield_parameters(method = nil,
+                                       modifiers = RDoc::METHOD_MODIFIERS)
+    skip_tkspace false
+    tk = get_tk
+
+    # Little hack going on here. In the statement
+    #  f = 2*(1+yield)
+    # We see the RPAREN as the next token, so we need
+    # to exit early. This still won't catch all cases
+    # (such as "a = yield + 1"
+    end_token = case tk
+                when TkLPAREN, TkfLPAREN
+                  TkRPAREN
+                when TkRPAREN
+                  return ""
+                else
+                  TkNL
+                end
+    nest = 0
+
+    loop do
+      case tk
+      when TkSEMICOLON then
+        break
+      when TkLBRACE then
+        nest += 1
+      when TkRBRACE then
+        # we might have a.each {|i| yield i }
+        unget_tk(tk) if nest.zero?
+        nest -= 1
+        break if nest <= 0
+      when TkLPAREN, TkfLPAREN then
+        nest += 1
+      when end_token then
+        if end_token == TkRPAREN
+          nest -= 1
+          break if @scanner.lex_state == EXPR_END and nest <= 0
+        else
+          break unless @scanner.continue
+        end
+      when method && method.block_params.nil? && TkCOMMENT then
+        unget_tk tk
+        read_documentation_modifiers method, modifiers
+        @read.pop
+      when TkCOMMENT then
+        @read.pop
+      when nil then
+        break
+      end
+      tk = get_tk
+    end
+
+    res = get_tkread.gsub(/\s+/, ' ').strip
+    res = '' if res == ';'
+    res
+  end
+
+  ##
+  # Capture the method's parameters. Along the way, look for a comment
+  # containing:
+  #
+  #    # yields: ....
+  #
+  # and add this as the block_params for the method
+
+  def parse_method_parameters(method)
+    res = parse_method_or_yield_parameters method
+
+    res = "(#{res})" unless res =~ /\A\(/
+    method.params = res unless method.params
+
+    if method.block_params.nil? then
+      skip_tkspace false
+      read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
+    end
+  end
+
+  def parse_module(container, single, tk, comment)
+    container, name_t = get_class_or_module container
+
+    name = name_t.name
+
+    mod = container.add_module RDoc::NormalModule, name
+    mod.record_location @top_level
+
+    read_documentation_modifiers mod, RDoc::CLASS_MODIFIERS
+    parse_statements(mod)
+    mod.comment = comment
+
+    @stats.add_module mod
+  end
+
+  def parse_require(context, comment)
+    skip_tkspace_comment
+    tk = get_tk
+
+    if TkLPAREN === tk then
+      skip_tkspace_comment
+      tk = get_tk
+    end
+
+    name = tk.text if TkSTRING === tk
+
+    if name then
+      context.add_require RDoc::Require.new(name, comment)
+    else
+      unget_tk tk
+    end
+  end
+
+  ##
+  # The core of the ruby parser.
+
+  def parse_statements(container, single = NORMAL, current_method = nil,
+                       comment = '')
+    nest = 1
+    save_visibility = container.visibility
+
+    non_comment_seen = true
+
+    while tk = get_tk do
+      keep_comment = false
+
+      non_comment_seen = true unless TkCOMMENT === tk
+
+      case tk
+      when TkNL then
+        skip_tkspace
+        tk = get_tk
+
+        if TkCOMMENT === tk then
+          if non_comment_seen then
+            # Look for RDoc in a comment about to be thrown away
+            parse_comment container, tk, comment unless comment.empty?
+
+            comment = ''
+            non_comment_seen = false
+          end
+
+          while TkCOMMENT === tk do
+            comment << tk.text << "\n"
+
+            tk = get_tk        # this is the newline
+            skip_tkspace false # leading spaces
+            tk = get_tk
+          end
+
+          unless comment.empty? then
+            look_for_directives_in container, comment
+
+            if container.done_documenting then
+              container.ongoing_visibility = save_visibility
+            end
+          end
+
+          keep_comment = true
+        else
+          non_comment_seen = true
+        end
+
+        unget_tk tk
+        keep_comment = true
+
+      when TkCLASS then
+        if container.document_children then
+          parse_class container, single, tk, comment
+        else
+          nest += 1
+        end
+
+      when TkMODULE then
+        if container.document_children then
+          parse_module container, single, tk, comment
+        else
+          nest += 1
+        end
+
+      when TkDEF then
+        if container.document_self then
+          parse_method container, single, tk, comment
+        else
+          nest += 1
+        end
+
+      when TkCONSTANT then
+        if container.document_self then
+          parse_constant container, tk, comment
+        end
+
+      when TkALIAS then
+        if container.document_self and not current_method then
+          parse_alias container, single, tk, comment
+        end
+
+      when TkYIELD then
+        if current_method.nil? then
+          warn "Warning: yield outside of method" if container.document_self
+        else
+          parse_yield container, single, tk, current_method
+        end
+
+      # Until and While can have a 'do', which shouldn't increase the nesting.
+      # We can't solve the general case, but we can handle most occurrences by
+      # ignoring a do at the end of a line.
+
+      when  TkUNTIL, TkWHILE then
+        nest += 1
+        skip_optional_do_after_expression
+
+      # 'for' is trickier
+      when TkFOR then
+        nest += 1
+        skip_for_variable
+        skip_optional_do_after_expression
+
+      when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN then
+        nest += 1
+
+      when TkIDENTIFIER then
+        if nest == 1 and current_method.nil? then
+          case tk.name
+          when 'private', 'protected', 'public', 'private_class_method',
+               'public_class_method', 'module_function' then
+            parse_visibility container, single, tk
+            keep_comment = true
+          when 'attr' then
+            parse_attr container, single, tk, comment
+          when /^attr_(reader|writer|accessor)$/ then
+            parse_attr_accessor container, single, tk, comment
+          when 'alias_method' then
+            parse_alias container, single, tk, comment if
+              container.document_self
+          when 'require', 'include' then
+            # ignore
+          else
+            if container.document_self and comment =~ /\A#\#$/ then
+              case comment
+              when /^# +:?attr(_reader|_writer|_accessor)?:/ then
+                parse_meta_attr container, single, tk, comment
+              else
+                parse_meta_method container, single, tk, comment
+              end
+            end
+          end
+        end
+
+        case tk.name
+        when "require" then
+          parse_require container, comment
+        when "include" then
+          parse_include container, comment
+        end
+
+      when TkEND then
+        nest -= 1
+        if nest == 0 then
+          read_documentation_modifiers container, RDoc::CLASS_MODIFIERS
+          container.ongoing_visibility = save_visibility
+
+          parse_comment container, tk, comment unless comment.empty?
+
+          return
+        end
+      end
+
+      comment = '' unless keep_comment
+
+      begin
+        get_tkread
+        skip_tkspace false
+      end while peek_tk == TkNL
+    end
+  end
+
+  def parse_symbol_arg(no = nil)
+    args = []
+    skip_tkspace_comment
+    case tk = get_tk
+    when TkLPAREN
+      loop do
+        skip_tkspace_comment
+        if tk1 = parse_symbol_in_arg
+          args.push tk1
+          break if no and args.size >= no
+        end
+
+        skip_tkspace_comment
+        case tk2 = get_tk
+        when TkRPAREN
+          break
+        when TkCOMMA
+        else
+          warn("unexpected token: '#{tk2.inspect}'") if $DEBUG_RDOC
+          break
+        end
+      end
+    else
+      unget_tk tk
+      if tk = parse_symbol_in_arg
+        args.push tk
+        return args if no and args.size >= no
+      end
+
+      loop do
+        skip_tkspace false
+
+        tk1 = get_tk
+        unless TkCOMMA === tk1 then
+          unget_tk tk1
+          break
+        end
+
+        skip_tkspace_comment
+        if tk = parse_symbol_in_arg
+          args.push tk
+          break if no and args.size >= no
+        end
+      end
+    end
+    args
+  end
+
+  def parse_symbol_in_arg
+    case tk = get_tk
+    when TkSYMBOL
+      tk.text.sub(/^:/, '')
+    when TkSTRING
+      eval @read[-1]
+    else
+      warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG_RDOC
+      nil
+    end
+  end
+
+  def parse_top_level_statements(container)
+    comment = collect_first_comment
+    look_for_directives_in(container, comment)
+    container.comment = comment unless comment.empty?
+    parse_statements container, NORMAL, nil, comment
+  end
+
+  def parse_visibility(container, single, tk)
+    singleton = (single == SINGLE)
+
+    vis_type = tk.name
+
+    vis = case vis_type
+          when 'private'   then :private
+          when 'protected' then :protected
+          when 'public'    then :public
+          when 'private_class_method' then
+            singleton = true
+            :private
+          when 'public_class_method' then
+            singleton = true
+            :public
+          when 'module_function' then
+            singleton = true
+            :public
+          else
+            raise RDoc::Error, "Invalid visibility: #{tk.name}"
+          end
+
+    skip_tkspace_comment false
+
+    case peek_tk
+      # Ryan Davis suggested the extension to ignore modifiers, because he
+      # often writes
+      #
+      #   protected unless $TESTING
+      #
+    when TkNL, TkUNLESS_MOD, TkIF_MOD, TkSEMICOLON then
+      container.ongoing_visibility = vis
+    else
+      if vis_type == 'module_function' then
+        args = parse_symbol_arg
+        container.set_visibility_for args, :private, false
+
+        module_functions = []
+
+        container.methods_matching args do |m|
+          s_m = m.dup
+          s_m.singleton = true if RDoc::AnyMethod === s_m
+          s_m.visibility = :public
+          module_functions << s_m
+        end
+
+        module_functions.each do |s_m|
+          case s_m
+          when RDoc::AnyMethod then
+            container.add_method s_m
+          when RDoc::Attr then
+            container.add_attribute s_m
+          end
+        end
+      else
+        args = parse_symbol_arg
+        container.set_visibility_for args, vis, singleton
+      end
+    end
+  end
+
+  def parse_yield(context, single, tk, method)
+    return if method.block_params
+
+    get_tkread
+    @scanner.instance_eval { @continue = false }
+    method.block_params = parse_method_or_yield_parameters
+  end
+
+  ##
+  # Directives are modifier comments that can appear after class, module, or
+  # method names. For example:
+  #
+  #   def fred # :yields: a, b
+  #
+  # or:
+  #
+  #   class MyClass # :nodoc:
+  #
+  # We return the directive name and any parameters as a two element array
+
+  def read_directive(allowed)
+    tk = get_tk
+    result = nil
+
+    if TkCOMMENT === tk then
+      if tk.text =~ /\s*:?(\w+):\s*(.*)/ then
+        directive = $1.downcase
+        if allowed.include? directive then
+          result = [directive, $2]
+        end
+      end
+    else
+      unget_tk tk
+    end
+
+    result
+  end
+
+  def read_documentation_modifiers(context, allow)
+    dir = read_directive(allow)
+
+    case dir[0]
+    when "notnew", "not_new", "not-new" then
+      context.dont_rename_initialize = true
+
+    when "nodoc" then
+      context.document_self = false
+      if dir[1].downcase == "all"
+        context.document_children = false
+      end
+
+    when "doc" then
+      context.document_self = true
+      context.force_documentation = true
+
+    when "yield", "yields" then
+      unless context.params.nil?
+        context.params.sub!(/(,|)\s*&\w+/,'') # remove parameter &proc
+      end
+
+      context.block_params = dir[1]
+
+    when "arg", "args" then
+      context.params = dir[1]
+    end if dir
+  end
+
+  def remove_private_comments(comment)
+    comment.gsub!(/^#--\n.*?^#\+\+/m, '')
+    comment.sub!(/^#--\n.*/m, '')
+  end
+
+  def scan
+    reset
+
+    catch :eof do
+      catch :enddoc do
+        begin
+          parse_top_level_statements @top_level
+        rescue StandardError => e
+          bytes = ''
+
+          20.times do @scanner.ungetc end
+          count = 0
+          60.times do |i|
+            count = i
+            byte = @scanner.getc
+            break unless byte
+            bytes << byte
+          end
+          count -= 20
+          count.times do @scanner.ungetc end
+
+          $stderr.puts <<-EOF
+
+#{self.class} failure around line #{@scanner.line_no} of
+#{@file_name}
+
+          EOF
+
+          unless bytes.empty? then
+            $stderr.puts
+            $stderr.puts bytes.inspect
+          end
+
+          raise e
+        end
+      end
+    end
+
+    @top_level
+  end
+
+  ##
+  # while, until, and for have an optional do
+
+  def skip_optional_do_after_expression
+    skip_tkspace false
+    tk = get_tk
+    case tk
+    when TkLPAREN, TkfLPAREN then
+      end_token = TkRPAREN
+    else
+      end_token = TkNL
+    end
+
+    b_nest = 0
+    nest = 0
+    @scanner.instance_eval { @continue = false }
+
+    loop do
+      case tk
+      when TkSEMICOLON then
+        break if b_nest.zero?
+      when TkLPAREN, TkfLPAREN then
+        nest += 1
+      when TkBEGIN then
+        b_nest += 1
+      when TkEND then
+        b_nest -= 1
+      when TkDO
+        break if nest.zero?
+      when end_token then
+        if end_token == TkRPAREN
+          nest -= 1
+          break if @scanner.lex_state == EXPR_END and nest.zero?
+        else
+          break unless @scanner.continue
+        end
+      when nil then
+        break
+      end
+      tk = get_tk
+    end
+
+    skip_tkspace false
+
+    get_tk if TkDO === peek_tk
+  end
+
+  ##
+  # skip the var [in] part of a 'for' statement
+
+  def skip_for_variable
+    skip_tkspace false
+    tk = get_tk
+    skip_tkspace false
+    tk = get_tk
+    unget_tk(tk) unless TkIN === tk
+  end
+
+  def skip_method container
+    meth = RDoc::AnyMethod.new "", "anon"
+    parse_method_parameters meth
+    parse_statements container, false, meth
+  end
+
+  ##
+  # Skip spaces until a comment is found
+
+  def skip_tkspace_comment(skip_nl = true)
+    loop do
+      skip_tkspace skip_nl
+      return unless TkCOMMENT === peek_tk
+      get_tk
+    end
+  end
+
+  def warn(msg)
+    return if @options.quiet
+    msg = make_message msg
+    $stderr.puts msg
+  end
+
+end
+
diff --git a/lib/rdoc/parser/ruby_tools.rb b/lib/rdoc/parser/ruby_tools.rb
new file mode 100644
index 0000000000..90c03307b4
--- /dev/null
+++ b/lib/rdoc/parser/ruby_tools.rb
@@ -0,0 +1,157 @@
+##
+# Collection of methods for writing parsers against RDoc::RubyLex and
+# RDoc::RubyToken
+
+module RDoc::Parser::RubyTools
+
+  include RDoc::RubyToken
+
+  ##
+  # Adds a token listener +obj+, but you should probably use token_listener
+
+  def add_token_listener(obj)
+    @token_listeners ||= []
+    @token_listeners << obj
+  end
+
+  ##
+  # Fetches the next token from the scanner
+
+  def get_tk
+    tk = nil
+
+    if @tokens.empty? then
+      tk = @scanner.token
+      @read.push @scanner.get_readed
+      puts "get_tk1 => #{tk.inspect}" if $TOKEN_DEBUG
+    else
+      @read.push @unget_read.shift
+      tk = @tokens.shift
+      puts "get_tk2 => #{tk.inspect}" if $TOKEN_DEBUG
+    end
+
+    tk = nil if TkEND_OF_SCRIPT === tk
+
+    if TkSYMBEG === tk then
+      set_token_position tk.line_no, tk.char_no
+
+      case tk1 = get_tk
+      when TkId, TkOp, TkSTRING, TkDSTRING, TkSTAR, TkAMPER then
+        if tk1.respond_to?(:name) then
+          tk = Token(TkSYMBOL).set_text(":" + tk1.name)
+        else
+          tk = Token(TkSYMBOL).set_text(":" + tk1.text)
+        end
+
+        # remove the identifier we just read (we're about to replace it with a
+        # symbol)
+        @token_listeners.each do |obj|
+          obj.pop_token
+        end if @token_listeners
+      else
+        warn("':' not followed by identifier or operator")
+        tk = tk1
+      end
+    end
+
+    # inform any listeners of our shiny new token
+    @token_listeners.each do |obj|
+      obj.add_token(tk)
+    end if @token_listeners
+
+    tk
+  end
+
+  def get_tk_until(*tokens)
+    read = []
+
+    loop do
+      tk = get_tk
+      case tk when *tokens then unget_tk tk; break end
+      read << tk
+    end
+
+    read
+  end
+
+  ##
+  # Retrieves a String representation of the read tokens
+
+  def get_tkread
+    read = @read.join("")
+    @read = []
+    read
+  end
+
+  ##
+  # Peek equivalent for get_tkread
+
+  def peek_read
+    @read.join('')
+  end
+
+  ##
+  # Peek at the next token, but don't remove it from the stream
+
+  def peek_tk
+    unget_tk(tk = get_tk)
+    tk
+  end
+
+  ##
+  # Removes the token listener +obj+
+
+  def remove_token_listener(obj)
+    @token_listeners.delete(obj)
+  end
+
+  ##
+  # Resets the tools
+
+  def reset
+    @read       = []
+    @tokens     = []
+    @unget_read = []
+    @nest = 0
+  end
+
+  ##
+  # Skips whitespace tokens including newlines if +skip_nl+ is true
+
+  def skip_tkspace(skip_nl = true) # HACK dup
+    tokens = []
+
+    while TkSPACE === (tk = get_tk) or (skip_nl and TkNL === tk) do
+      tokens.push tk
+    end
+
+    unget_tk tk
+    tokens
+  end
+
+  ##
+  # Has +obj+ listen to tokens
+
+  def token_listener(obj)
+    add_token_listener obj
+    yield
+  ensure
+    remove_token_listener obj
+  end
+
+  ##
+  # Returns +tk+ to the scanner
+
+  def unget_tk(tk)
+    @tokens.unshift tk
+    @unget_read.unshift @read.pop
+
+    # Remove this token from any listeners
+    @token_listeners.each do |obj|
+      obj.pop_token
+    end if @token_listeners
+  end
+
+end
+
+
diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb
new file mode 100644
index 0000000000..e99d2d4319
--- /dev/null
+++ b/lib/rdoc/parser/simple.rb
@@ -0,0 +1,44 @@
+##
+# Parse a non-source file. We basically take the whole thing as one big
+# comment. If the first character in the file is '#', we strip leading pound
+# signs.
+
+class RDoc::Parser::Simple < RDoc::Parser
+
+  parse_files_matching(//)
+
+  attr_reader :content # :nodoc:
+
+  ##
+  # Prepare to parse a plain file
+
+  def initialize(top_level, file_name, content, options, stats)
+    super
+
+    preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
+
+    preprocess.handle @content, @top_level
+  end
+
+  ##
+  # Extract the file contents and attach them to the TopLevel as a comment
+
+  def scan
+    comment = remove_coding_comment @content
+    comment = remove_private_comments comment
+
+    @top_level.comment = comment
+    @top_level.parser = self.class
+    @top_level
+  end
+
+  def remove_private_comments(comment)
+    comment.gsub(/^--\n.*?^\+\+/m, '').sub(/^--\n.*/m, '')
+  end
+
+  def remove_coding_comment text
+    text.sub(/\A# .*coding[=:].*$/, '')
+  end
+
+end
+
diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb
deleted file mode 100644
index 25fc66af3f..0000000000
--- a/lib/rdoc/parsers/parse_c.rb
+++ /dev/null
@@ -1,773 +0,0 @@
-# Classes and modules built in to the interpreter. We need
-# these to define superclasses of user objects
-
-require "rdoc/code_objects"
-require "rdoc/parsers/parserfactory"
-require "rdoc/options"
-require "rdoc/rdoc"
-
-module RDoc
-
-  ##
-  # Ruby's built-in classes.
-
-  KNOWN_CLASSES = {
-    "rb_cObject"           => "Object",
-    "rb_cArray"            => "Array",
-    "rb_cBignum"           => "Bignum",
-    "rb_cClass"            => "Class",
-    "rb_cDir"              => "Dir",
-    "rb_cData"             => "Data",
-    "rb_cFalseClass"       => "FalseClass",
-    "rb_cFile"             => "File",
-    "rb_cFixnum"           => "Fixnum",
-    "rb_cFloat"            => "Float",
-    "rb_cHash"             => "Hash",
-    "rb_cInteger"          => "Integer",
-    "rb_cIO"               => "IO",
-    "rb_cModule"           => "Module",
-    "rb_cNilClass"         => "NilClass",
-    "rb_cNumeric"          => "Numeric",
-    "rb_cProc"             => "Proc",
-    "rb_cRange"            => "Range",
-    "rb_cRegexp"           => "Regexp",
-    "rb_cString"           => "String",
-    "rb_cSymbol"           => "Symbol",
-    "rb_cThread"           => "Thread",
-    "rb_cTime"             => "Time",
-    "rb_cTrueClass"        => "TrueClass",
-    "rb_cStruct"           => "Struct",
-    "rb_eException"        => "Exception",
-    "rb_eStandardError"    => "StandardError",
-    "rb_eSystemExit"       => "SystemExit",
-    "rb_eInterrupt"        => "Interrupt",
-    "rb_eSignal"           => "Signal",
-    "rb_eFatal"            => "Fatal",
-    "rb_eArgError"         => "ArgError",
-    "rb_eEOFError"         => "EOFError",
-    "rb_eIndexError"       => "IndexError",
-    "rb_eRangeError"       => "RangeError",
-    "rb_eIOError"          => "IOError",
-    "rb_eRuntimeError"     => "RuntimeError",
-    "rb_eSecurityError"    => "SecurityError",
-    "rb_eSystemCallError"  => "SystemCallError",
-    "rb_eTypeError"        => "TypeError",
-    "rb_eZeroDivError"     => "ZeroDivError",
-    "rb_eNotImpError"      => "NotImpError",
-    "rb_eNoMemError"       => "NoMemError",
-    "rb_eFloatDomainError" => "FloatDomainError",
-    "rb_eScriptError"      => "ScriptError",
-    "rb_eNameError"        => "NameError",
-    "rb_eSyntaxError"      => "SyntaxError",
-    "rb_eLoadError"        => "LoadError",
-
-    "rb_mKernel"           => "Kernel",
-    "rb_mComparable"       => "Comparable",
-    "rb_mEnumerable"       => "Enumerable",
-    "rb_mPrecision"        => "Precision",
-    "rb_mErrno"            => "Errno",
-    "rb_mFileTest"         => "FileTest",
-    "rb_mGC"               => "GC",
-    "rb_mMath"             => "Math",
-    "rb_mProcess"          => "Process"
-  }
-
-  ##
-  # We attempt to parse C extension files. Basically we look for
-  # the standard patterns that you find in extensions: <tt>rb_define_class,
-  # rb_define_method</tt> and so on. We also try to find the corresponding
-  # C source for the methods and extract comments, but if we fail
-  # we don't worry too much.
-  #
-  # The comments associated with a Ruby method are extracted from the C
-  # comment block associated with the routine that _implements_ that
-  # method, that is to say the method whose name is given in the
-  # <tt>rb_define_method</tt> call. For example, you might write:
-  #
-  #  /*
-  #   * Returns a new array that is a one-dimensional flattening of this
-  #   * array (recursively). That is, for every element that is an array,
-  #   * extract its elements into the new array.
-  #   *
-  #   *    s = [ 1, 2, 3 ]           #=> [1, 2, 3]
-  #   *    t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
-  #   *    a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
-  #   *    a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  #   */
-  #   static VALUE
-  #   rb_ary_flatten(ary)
-  #       VALUE ary;
-  #   {
-  #       ary = rb_obj_dup(ary);
-  #       rb_ary_flatten_bang(ary);
-  #       return ary;
-  #   }
-  #
-  #   ...
-  #
-  #   void
-  #   Init_Array()
-  #   {
-  #     ...
-  #     rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
-  #
-  # Here RDoc will determine from the rb_define_method line that there's a
-  # method called "flatten" in class Array, and will look for the implementation
-  # in the method rb_ary_flatten. It will then use the comment from that
-  # method in the HTML output. This method must be in the same source file
-  # as the rb_define_method.
-  #
-  # C classes can be diagramed (see /tc/dl/ruby/ruby/error.c), and RDoc
-  # integrates C and Ruby source into one tree
-  #
-  # The comment blocks may include special direcives:
-  #
-  # [Document-class: <i>name</i>]
-  #   This comment block is documentation for the given class. Use this
-  #   when the <tt>Init_xxx</tt> method is not named after the class.
-  #
-  # [Document-method: <i>name</i>]
-  #   This comment documents the named method. Use when RDoc cannot
-  #   automatically find the method from it's declaration
-  #
-  # [call-seq:  <i>text up to an empty line</i>]
-  #   Because C source doesn't give descripive names to Ruby-level parameters,
-  #   you need to document the calling sequence explicitly
-  #
-  # In additon, RDoc assumes by default that the C method implementing a 
-  # Ruby function is in the same source file as the rb_define_method call.
-  # If this isn't the case, add the comment 
-  #
-  #    rb_define_method(....);  // in: filename
-  #
-  # As an example, we might have an extension that defines multiple classes
-  # in its Init_xxx method. We could document them using
-  #
-  #  
-  #  /*
-  #   * Document-class:  MyClass
-  #   *
-  #   * Encapsulate the writing and reading of the configuration
-  #   * file. ...
-  #   */
-  #  
-  #  /*
-  #   * Document-method: read_value
-  #   *
-  #   * call-seq:
-  #   *   cfg.read_value(key)            -> value
-  #   *   cfg.read_value(key} { |key| }  -> value
-  #   *
-  #   * Return the value corresponding to +key+ from the configuration.
-  #   * In the second form, if the key isn't found, invoke the
-  #   * block and return its value.
-  #   */
-  #
-
-  class C_Parser
-
-    attr_accessor :progress
-
-    extend ParserFactory
-    parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
-
-    @@known_bodies = {}
-
-    # prepare to parse a C file
-    def initialize(top_level, file_name, body, options, stats)
-      @known_classes = KNOWN_CLASSES.dup
-      @body = handle_tab_width(handle_ifdefs_in(body))
-      @options = options
-      @stats   = stats
-      @top_level = top_level
-      @classes = Hash.new
-      @file_dir = File.dirname(file_name)
-      @progress = $stderr unless options.quiet
-    end
-
-    # Extract the classes/modules and methods from a C file
-    # and return the corresponding top-level object
-    def scan
-      remove_commented_out_lines
-      do_classes
-      do_constants
-      do_methods
-      do_includes
-      do_aliases
-      @top_level
-    end
-
-    #######
-    private
-    #######
-
-    def progress(char)
-      unless @options.quiet
-        @progress.print(char)
-        @progress.flush
-      end
-    end
-
-    def warn(msg)
-      $stderr.puts
-      $stderr.puts msg
-      $stderr.flush
-    end
-
-    def remove_private_comments(comment)
-       comment.gsub!(/\/?\*--(.*?)\/?\*\+\+/m, '')
-       comment.sub!(/\/?\*--.*/m, '')
-    end
-
-    ##
-    # removes lines that are commented out that might otherwise get picked up
-    # when scanning for classes and methods
-
-    def remove_commented_out_lines
-      @body.gsub!(%r{//.*rb_define_}, '//')
-    end
-    
-    def handle_class_module(var_name, class_mod, class_name, parent, in_module)
-      progress(class_mod[0, 1])
-
-      parent_name = @known_classes[parent] || parent
-
-      if in_module
-        enclosure = @classes[in_module]
-        unless enclosure
-          if enclosure = @known_classes[in_module]
-            handle_class_module(in_module, (/^rb_m/ =~ in_module ? "module" : "class"),
-                                enclosure, nil, nil)
-            enclosure = @classes[in_module]
-          end
-        end
-        unless enclosure
-          warn("Enclosing class/module '#{in_module}' for " +
-                "#{class_mod} #{class_name} not known")
-          return
-        end
-      else
-        enclosure = @top_level
-      end
-
-      if class_mod == "class" 
-        cm = enclosure.add_class(NormalClass, class_name, parent_name)
-        @stats.num_classes += 1
-      else
-        cm = enclosure.add_module(NormalModule, class_name)
-        @stats.num_modules += 1
-      end
-      cm.record_location(enclosure.toplevel)
-
-      find_class_comment(cm.full_name, cm)
-      @classes[var_name] = cm
-      @known_classes[var_name] = cm.full_name
-    end
-
-    ##
-    # Look for class or module documentation above Init_+class_name+(void),
-    # in a Document-class +class_name+ (or module) comment or above an
-    # rb_define_class (or module).  If a comment is supplied above a matching
-    # Init_ and a rb_define_class the Init_ comment is used.
-    #
-    #   /*
-    #    * This is a comment for Foo
-    #    */
-    #   Init_Foo(void) {
-    #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    #   }
-    #
-    #   /*
-    #    * Document-class: Foo
-    #    * This is a comment for Foo
-    #    */
-    #   Init_foo(void) {
-    #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    #   }
-    #
-    #   /*
-    #    * This is a comment for Foo
-    #    */
-    #   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-
-    def find_class_comment(class_name, class_meth)
-      comment = nil
-      if @body =~ %r{((?>/\*.*?\*/\s+))
-                     (static\s+)?void\s+Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)}xmi
-        comment = $1
-      elsif @body =~ %r{Document-(class|module):\s#{class_name}\s*?\n((?>.*?\*/))}m
-        comment = $2
-      else
-        if @body =~ /rb_define_(class|module)/m then
-          class_name = class_name.split("::").last
-          comments = []
-          @body.split(/(\/\*.*?\*\/)\s*?\n/m).each_with_index do |chunk, index|
-            comments[index] = chunk
-            if chunk =~ /rb_define_(class|module).*?"(#{class_name})"/m then
-              comment = comments[index-1]
-              break
-            end
-          end
-        end
-      end
-      class_meth.comment = mangle_comment(comment) if comment
-    end
-    
-    ############################################################
-
-    def do_classes
-      @body.scan(/(\w+)\s* = \s*rb_define_module\s*\(\s*"(\w+)"\s*\)/mx) do 
-        |var_name, class_name|
-        handle_class_module(var_name, "module", class_name, nil, nil)
-      end
-      
-      # The '.' lets us handle SWIG-generated files
-      @body.scan(/([\w\.]+)\s* = \s*rb_define_class\s*
-                \( 
-                   \s*"(\w+)",
-                   \s*(\w+)\s*
-                \)/mx) do 
-        
-        |var_name, class_name, parent|
-        handle_class_module(var_name, "class", class_name, parent, nil)
-      end
-      
-      @body.scan(/(\w+)\s*=\s*boot_defclass\s*\(\s*"(\w+?)",\s*(\w+?)\s*\)/) do
-        |var_name, class_name, parent|
-        parent = nil if parent == "0"
-        handle_class_module(var_name, "class", class_name, parent, nil)
-      end
-
-      @body.scan(/(\w+)\s* = \s*rb_define_module_under\s*
-                \( 
-                   \s*(\w+),
-                   \s*"(\w+)"
-                \s*\)/mx) do 
-        
-        |var_name, in_module, class_name|
-        handle_class_module(var_name, "module", class_name, nil, in_module)
-      end
-      
-      @body.scan(/([\w\.]+)\s* = \s*rb_define_class_under\s*
-                \( 
-                   \s*(\w+),
-                   \s*"(\w+)",
-                   \s*(\w+)\s*
-                \s*\)/mx) do 
-        
-        |var_name, in_module, class_name, parent|
-        handle_class_module(var_name, "class", class_name, parent, in_module)
-      end
-      
-    end
-
-		###########################################################
-
-    def do_constants
-      @body.scan(%r{\Wrb_define_
-                     (
-                        variable |
-                        readonly_variable |
-                        const |
-                        global_const |
-                      )
-                 \s*\( 
-                   (?:\s*(\w+),)?
-                   \s*"(\w+)",
-                   \s*(.*?)\s*\)\s*;
-                   }xm) do
-        
-        |type, var_name, const_name, definition|
-        var_name = "rb_cObject" if !var_name or var_name == "rb_mKernel"
-				handle_constants(type, var_name, const_name, definition)
-      end
-    end
-    
-    ############################################################
-    
-    def do_methods
-
-      @body.scan(%r{rb_define_
-                     (
-                        singleton_method |
-                        method           |
-                        module_function  |
-                        private_method
-                     )
-                     \s*\(\s*([\w\.]+),
-                       \s*"([^"]+)",
-                       \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
-                       \s*(-?\w+)\s*\)
-                     (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
-                   }xm) do
-        |type, var_name, meth_name, meth_body, param_count, source_file|
-       #" 
-
-        # Ignore top-object and weird struct.c dynamic stuff
-        next if var_name == "ruby_top_self" 
-        next if var_name == "nstr"
-        next if var_name == "envtbl"
-        next if var_name == "argf"   # it'd be nice to handle this one
-
-        var_name = "rb_cObject" if var_name == "rb_mKernel"
-        handle_method(type, var_name, meth_name, 
-                      meth_body, param_count, source_file)
-      end
-
-      @body.scan(%r{rb_define_attr\(
-                               \s*([\w\.]+),
-                               \s*"([^"]+)",
-                               \s*(\d+),
-                               \s*(\d+)\s*\);
-                  }xm) do  #"
-        |var_name, attr_name, attr_reader, attr_writer|
-        
-        #var_name = "rb_cObject" if var_name == "rb_mKernel"
-        handle_attr(var_name, attr_name,
-                    attr_reader.to_i != 0,
-                    attr_writer.to_i != 0)
-      end
-
-      @body.scan(%r{rb_define_global_function\s*\(
-                               \s*"([^"]+)",
-                               \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
-                               \s*(-?\w+)\s*\)
-                  (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
-                  }xm) do  #"
-        |meth_name, meth_body, param_count, source_file|
-        handle_method("method", "rb_mKernel", meth_name, 
-                      meth_body, param_count, source_file)
-      end
-  
-      @body.scan(/define_filetest_function\s*\(
-                               \s*"([^"]+)",
-                               \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
-                               \s*(-?\w+)\s*\)/xm) do  #"
-        |meth_name, meth_body, param_count|
-        
-        handle_method("method", "rb_mFileTest", meth_name, meth_body, param_count)
-        handle_method("singleton_method", "rb_cFile", meth_name, meth_body, param_count)
-      end
-   end
-
-    ############################################################
-    
-    def do_aliases
-      @body.scan(%r{rb_define_alias\s*\(\s*(\w+),\s*"([^"]+)",\s*"([^"]+)"\s*\)}m) do
-        |var_name, new_name, old_name|
-        @stats.num_methods += 1
-        class_name = @known_classes[var_name] || var_name
-        class_obj  = find_class(var_name, class_name)
-
-        class_obj.add_alias(Alias.new("", old_name, new_name, ""))
-      end
-   end
-
-    ##
-    # Adds constant comments.  By providing some_value: at the start ofthe
-    # comment you can override the C value of the comment to give a friendly
-    # definition.
-    #
-    #   /* 300: The perfect score in bowling */
-    #   rb_define_const(cFoo, "PERFECT", INT2FIX(300);
-    #
-    # Will override +INT2FIX(300)+ with the value +300+ in the output RDoc.
-    # Values may include quotes and escaped colons (\:).
-
-    def handle_constants(type, var_name, const_name, definition)
-      #@stats.num_constants += 1
-      class_name = @known_classes[var_name]
-      
-      return unless class_name
-
-      class_obj  = find_class(var_name, class_name)
-
-      unless class_obj
-        warn("Enclosing class/module '#{const_name}' for not known")
-        return
-      end
-      
-      comment = find_const_comment(type, const_name)
-
-      # In the case of rb_define_const, the definition and comment are in
-      # "/* definition: comment */" form.  The literal ':' and '\' characters
-      # can be escaped with a backslash.
-      if type.downcase == 'const' then
-         elements = mangle_comment(comment).split(':')
-         if elements.nil? or elements.empty? then
-            con = Constant.new(const_name, definition, mangle_comment(comment))
-         else
-            new_definition = elements[0..-2].join(':')
-            if new_definition.empty? then # Default to literal C definition
-               new_definition = definition
-            else
-               new_definition.gsub!("\:", ":")
-               new_definition.gsub!("\\", '\\')
-            end
-            new_definition.sub!(/\A(\s+)/, '')
-            new_comment = $1.nil? ? elements.last : "#{$1}#{elements.last.lstrip}"
-            con = Constant.new(const_name, new_definition,
-                               mangle_comment(new_comment))
-         end
-      else
-         con = Constant.new(const_name, definition, mangle_comment(comment))
-      end
-
-      class_obj.add_constant(con)
-    end
-
-    ##
-    # Finds a comment matching +type+ and +const_name+ either above the
-    # comment or in the matching Document- section.
-
-    def find_const_comment(type, const_name)
-      if @body =~ %r{((?>^\s*/\*.*?\*/\s+))
-                     rb_define_#{type}\((?:\s*(\w+),)?\s*"#{const_name}"\s*,.*?\)\s*;}xmi
-        $1
-      elsif @body =~ %r{Document-(?:const|global|variable):\s#{const_name}\s*?\n((?>.*?\*/))}m
-        $1
-      else
-        ''
-      end
-    end
-
-    ###########################################################
-
-    def handle_attr(var_name, attr_name, reader, writer)
-      rw = ''
-      if reader 
-        #@stats.num_methods += 1
-        rw << 'R'
-      end
-      if writer
-        #@stats.num_methods += 1
-        rw << 'W'
-      end
-
-      class_name = @known_classes[var_name]
-
-      return unless class_name
-      
-      class_obj  = find_class(var_name, class_name)
-
-      if class_obj
-        comment = find_attr_comment(attr_name)
-        unless comment.empty?
-          comment = mangle_comment(comment)
-        end
-        att = Attr.new('', attr_name, rw, comment)
-        class_obj.add_attribute(att)
-      end
-
-    end
-
-    ###########################################################
-
-    def find_attr_comment(attr_name)
-      if @body =~ %r{((?>/\*.*?\*/\s+))
-                     rb_define_attr\((?:\s*(\w+),)?\s*"#{attr_name}"\s*,.*?\)\s*;}xmi
-        $1
-      elsif @body =~ %r{Document-attr:\s#{attr_name}\s*?\n((?>.*?\*/))}m
-        $1
-      else
-        ''
-      end
-    end
-
-    ###########################################################
-
-    def handle_method(type, var_name, meth_name, 
-                      meth_body, param_count, source_file = nil)
-      progress(".")
-
-      @stats.num_methods += 1
-      class_name = @known_classes[var_name]
-
-      return unless class_name
-
-      class_obj  = find_class(var_name, class_name)
-      
-      if class_obj
-        if meth_name == "initialize"
-          meth_name = "new"
-          type = "singleton_method"
-        end
-        meth_obj = AnyMethod.new("", meth_name)
-        meth_obj.singleton =
-	  %w{singleton_method module_function}.include?(type) 
-        
-        p_count = (Integer(param_count) rescue -1)
-        
-        if p_count < 0
-          meth_obj.params = "(...)"
-        elsif p_count == 0
-          meth_obj.params = "()"
-        else
-          meth_obj.params = "(" +
-                            (1..p_count).map{|i| "p#{i}"}.join(", ") + 
-                                                ")"
-        end
-
-        if source_file
-          file_name = File.join(@file_dir, source_file)
-          body = (@@known_bodies[source_file] ||= File.read(file_name))
-        else
-          body = @body
-        end
-        if find_body(meth_body, meth_obj, body) and meth_obj.document_self
-          class_obj.add_method(meth_obj)
-        end
-      end
-    end
-    
-    ############################################################
-
-    # Find the C code corresponding to a Ruby method
-    def find_body(meth_name, meth_obj, body, quiet = false)
-      case body
-      when %r{((?>/\*.*?\*/\s*))(?:static\s+)?VALUE\s+#{meth_name}
-              \s*(\(.*?\)).*?^}xm
-        comment, params = $1, $2
-        body_text = $&
-
-        remove_private_comments(comment) if comment
-
-        # see if we can find the whole body
-        
-        re = Regexp.escape(body_text) + '[^(]*^\{.*?^\}'
-        if Regexp.new(re, Regexp::MULTILINE).match(body)
-          body_text = $&
-        end
-
-        # The comment block may have been overridden with a
-        # 'Document-method' block. This happens in the interpreter
-        # when multiple methods are vectored through to the same
-        # C method but those methods are logically distinct (for
-        # example Kernel.hash and Kernel.object_id share the same
-        # implementation
-
-        override_comment = find_override_comment(meth_obj.name)
-        comment = override_comment if override_comment
-
-        find_modifiers(comment, meth_obj) if comment
-        
-#        meth_obj.params = params
-        meth_obj.start_collecting_tokens
-        meth_obj.add_token(RubyToken::Token.new(1,1).set_text(body_text))
-        meth_obj.comment = mangle_comment(comment)
-      when %r{((?>/\*.*?\*/\s*))^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
-        comment = $1
-        find_body($2, meth_obj, body, true)
-        find_modifiers(comment, meth_obj)
-        meth_obj.comment = mangle_comment(comment) + meth_obj.comment
-      when %r{^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
-        unless find_body($1, meth_obj, body, true)
-          warn "No definition for #{meth_name}" unless quiet
-          return false
-        end
-      else
-
-        # No body, but might still have an override comment
-        comment = find_override_comment(meth_obj.name)
-
-        if comment
-          find_modifiers(comment, meth_obj)
-          meth_obj.comment = mangle_comment(comment)
-        else
-          warn "No definition for #{meth_name}" unless quiet
-          return false
-        end
-      end
-      true
-    end
-
-
-    ##
-    # If the comment block contains a section that looks like:
-    #
-    #    call-seq:
-    #        Array.new
-    #        Array.new(10)
-    #
-    # use it for the parameters.
-
-    def find_modifiers(comment, meth_obj)
-      if comment.sub!(/:nodoc:\s*^\s*\*?\s*$/m, '') or
-         comment.sub!(/\A\/\*\s*:nodoc:\s*\*\/\Z/, '')
-        meth_obj.document_self = false
-      end
-      if comment.sub!(/call-seq:(.*?)^\s*\*?\s*$/m, '') or
-         comment.sub!(/\A\/\*\s*call-seq:(.*?)\*\/\Z/, '')
-        seq = $1
-        seq.gsub!(/^\s*\*\s*/, '')
-        meth_obj.call_seq = seq
-      end
-    end
-
-    ############################################################
-
-    def find_override_comment(meth_name)
-      name = Regexp.escape(meth_name)
-      if @body =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m
-        $1
-      end
-    end
-
-    ##
-    # Look for includes of the form:
-    #
-    #     rb_include_module(rb_cArray, rb_mEnumerable);
-
-    def do_includes
-      @body.scan(/rb_include_module\s*\(\s*(\w+?),\s*(\w+?)\s*\)/) do |c,m|
-        if cls = @classes[c]
-          m = @known_classes[m] || m
-          cls.add_include(Include.new(m, ""))
-        end
-      end
-    end
-
-    ##
-    # Remove the /*'s and leading asterisks from C comments
-    
-    def mangle_comment(comment)
-      comment.sub!(%r{/\*+}) { " " * $&.length }
-      comment.sub!(%r{\*+/}) { " " * $&.length }
-      comment.gsub!(/^[ \t]*\*/m) { " " * $&.length }
-      comment
-    end
-
-    def find_class(raw_name, name)
-      unless @classes[raw_name]
-        if raw_name =~ /^rb_m/ 
-          @classes[raw_name] = @top_level.add_module(NormalModule, name)
-        else
-          @classes[raw_name] = @top_level.add_class(NormalClass, name, nil)
-        end
-      end
-      @classes[raw_name]
-    end
-
-    def handle_tab_width(body)
-      if /\t/ =~ body
-        tab_width = Options.instance.tab_width
-        body.split(/\n/).map do |line|
-          1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)}  && $~ #`
-          line
-        end .join("\n")
-      else
-        body
-      end
-    end
-
-    ##
-    # Removes #ifdefs that would otherwise confuse us
-    
-    def handle_ifdefs_in(body)
-      body.gsub(/^#ifdef HAVE_PROTOTYPES.*?#else.*?\n(.*?)#endif.*?\n/m) { $1 }
-    end
-    
-  end
-
-end
-
diff --git a/lib/rdoc/parsers/parse_f95.rb b/lib/rdoc/parsers/parse_f95.rb
deleted file mode 100644
index f3f6d76103..0000000000
--- a/lib/rdoc/parsers/parse_f95.rb
+++ /dev/null
@@ -1,1841 +0,0 @@
-#= parse_f95.rb - Fortran95 Parser
-#
-#== Overview
-#
-#"parse_f95.rb" parses Fortran95 files with suffixes "f90", "F90", "f95"
-#and "F95". Fortran95 files are expected to be conformed to Fortran95
-#standards.
-#
-#== Rules
-#
-#Fundamental rules are same as that of the Ruby parser.
-#But comment markers are '!' not '#'.
-#
-#=== Correspondence between RDoc documentation and Fortran95 programs
-#
-#"parse_f95.rb" parses main programs, modules, subroutines, functions,
-#derived-types, public variables, public constants,
-#defined operators and defined assignments.
-#These components are described in items of RDoc documentation, as follows.
-#
-#Files :: Files (same as Ruby)
-#Classes :: Modules
-#Methods :: Subroutines, functions, variables, constants, derived-types, defined operators, defined assignments
-#Required files :: Files in which imported modules, external subroutines and external functions are defined.
-#Included Modules :: List of imported modules
-#Attributes :: List of derived-types, List of imported modules all of whose components are published again
-#
-#Components listed in 'Methods' (subroutines, functions, ...)
-#defined in modules are described in the item of 'Classes'.
-#On the other hand, components defined in main programs or
-#as external procedures are described in the item of 'Files'.
-#
-#=== Components parsed by default
-#
-#By default, documentation on public components (subroutines, functions, 
-#variables, constants, derived-types, defined operators, 
-#defined assignments) are generated. 
-#With "--all" option, documentation on all components
-#are generated (almost same as the Ruby parser).
-#
-#=== Information parsed automatically
-#
-#The following information is automatically parsed.
-#
-#* Types of arguments
-#* Types of variables and constants
-#* Types of variables in the derived types, and initial values
-#* NAMELISTs and types of variables in them, and initial values
-#
-#Aliases by interface statement are described in the item of 'Methods'.
-#
-#Components which are imported from other modules and published again 
-#are described in the item of 'Methods'.
-#
-#=== Format of comment blocks
-#
-#Comment blocks should be written as follows.
-#Comment blocks are considered to be ended when the line without '!'
-#appears.
-#The indentation is not necessary.
-#
-#     ! (Top of file)
-#     !
-#     ! Comment blocks for the files.
-#     !
-#     !--
-#     ! The comment described in the part enclosed by
-#     ! "!--" and "!++" is ignored.
-#     !++
-#     !
-#     module hogehoge
-#       !
-#       ! Comment blocks for the modules (or the programs).
-#       !
-#
-#       private
-#
-#       logical            :: a     ! a private variable
-#       real, public       :: b     ! a public variable
-#       integer, parameter :: c = 0 ! a public constant
-#
-#       public :: c
-#       public :: MULTI_ARRAY
-#       public :: hoge, foo
-#
-#       type MULTI_ARRAY
-#         !
-#         ! Comment blocks for the derived-types.
-#         !
-#         real, pointer :: var(:) =>null() ! Comments block for the variables.
-#         integer       :: num = 0
-#       end type MULTI_ARRAY
-#
-#     contains
-#
-#       subroutine hoge( in,   &   ! Comment blocks between continuation lines are ignored.
-#           &            out )
-#         !
-#         ! Comment blocks for the subroutines or functions
-#         !
-#         character(*),intent(in):: in ! Comment blocks for the arguments.
-#         character(*),intent(out),allocatable,target  :: in
-#                                      ! Comment blocks can be
-#                                      ! written under Fortran statements.
-#
-#         character(32) :: file ! This comment parsed as a variable in below NAMELIST.
-#         integer       :: id
-#
-#         namelist /varinfo_nml/ file, id
-#                 !
-#                 ! Comment blocks for the NAMELISTs.
-#                 ! Information about variables are described above.
-#                 !
-#
-#       ....
-#
-#       end subroutine hoge
-#
-#       integer function foo( in )
-#         !
-#         ! This part is considered as comment block.
-#
-#         ! Comment blocks under blank lines are ignored.
-#         !
-#         integer, intent(in):: inA ! This part is considered as comment block.
-#
-#                                   ! This part is ignored.
-#
-#       end function foo
-#
-#       subroutine hide( in,   &
-#         &              out )      !:nodoc:
-#         !
-#         ! If "!:nodoc:" is described at end-of-line in subroutine
-#         ! statement as above, the subroutine is ignored.
-#         ! This assignment can be used to modules, subroutines,
-#         ! functions, variables, constants, derived-types,
-#         ! defined operators, defined assignments,
-#         ! list of imported modules ("use" statement).
-#         !
-#
-#       ....
-#
-#       end subroutine hide
-#
-#     end module hogehoge
-#
-
-
-require "rdoc/code_objects"
-
-module RDoc
-
-  class Token
-
-    NO_TEXT = "??".freeze
-
-    def initialize(line_no, char_no)
-      @line_no = line_no
-      @char_no = char_no
-      @text    = NO_TEXT
-    end
-    # Because we're used in contexts that expect to return a token,
-    # we set the text string and then return ourselves
-    def set_text(text)
-      @text = text
-      self
-    end
-
-    attr_reader :line_no, :char_no, :text
-
-  end
-
-  # See rdoc/parsers/parse_f95.rb
-
-  class Fortran95parser
-
-    extend ParserFactory
-    parse_files_matching(/\.((f|F)9(0|5)|F)$/)
-
-    @@external_aliases = []
-    @@public_methods   = []
-
-    # "false":: Comments are below source code
-    # "true" :: Comments are upper source code
-    COMMENTS_ARE_UPPER  = false
-
-    # Internal alias message
-    INTERNAL_ALIAS_MES = "Alias for"
-
-    # External alias message
-    EXTERNAL_ALIAS_MES = "The entity is"
-
-    # prepare to parse a Fortran 95 file
-    def initialize(top_level, file_name, body, options, stats)
-      @body = body
-      @stats = stats
-      @file_name  = file_name
-      @options = options
-      @top_level = top_level
-      @progress = $stderr unless options.quiet
-    end
-
-    # devine code constructs
-    def scan
-
-      # remove private comment
-      remaining_code = remove_private_comments(@body)
-
-      # continuation lines are united to one line
-      remaining_code = united_to_one_line(remaining_code)
-
-      # semicolons are replaced to line feed
-      remaining_code = semicolon_to_linefeed(remaining_code)
-
-      # collect comment for file entity
-      whole_comment, remaining_code = collect_first_comment(remaining_code)
-      @top_level.comment = whole_comment
-
-      # String "remaining_code" is converted to Array "remaining_lines"
-      remaining_lines = remaining_code.split("\n")
-
-      # "module" or "program" parts are parsed (new)
-      #
-      level_depth = 0
-      block_searching_flag = nil
-      block_searching_lines = []
-      pre_comment = []
-      module_program_trailing = ""
-      module_program_name = ""
-      other_block_level_depth = 0
-      other_block_searching_flag = nil
-      remaining_lines.collect!{|line|
-        if !block_searching_flag && !other_block_searching_flag
-          if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i
-            block_searching_flag = :module
-            block_searching_lines << line
-            module_program_name = $1
-            module_program_trailing = find_comments($2)
-            next false
-          elsif line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i ||
-                 line =~ /^\s*?\w/ && !block_start?(line)
-            block_searching_flag = :program
-            block_searching_lines << line
-            module_program_name = $1 || ""
-            module_program_trailing = find_comments($2)
-            next false
-
-          elsif block_start?(line)
-            other_block_searching_flag = true
-            next line
-
-          elsif line =~ /^\s*?!\s?(.*)/
-            pre_comment << line
-            next line
-          else
-            pre_comment = []
-            next line
-          end
-        elsif other_block_searching_flag
-          other_block_level_depth += 1 if block_start?(line)
-          other_block_level_depth -= 1 if block_end?(line)
-          if other_block_level_depth < 0
-            other_block_level_depth = 0
-            other_block_searching_flag = nil
-          end
-          next line
-        end
-
-        block_searching_lines << line
-        level_depth += 1 if block_start?(line)
-        level_depth -= 1 if block_end?(line)
-        if level_depth >= 0
-          next false
-        end
-
-        # "module_program_code" is formatted.
-        # ":nodoc:" flag is checked.
-        #
-        module_program_code = block_searching_lines.join("\n")
-        module_program_code = remove_empty_head_lines(module_program_code)
-        if module_program_trailing =~ /^:nodoc:/
-          # next loop to search next block
-          level_depth = 0
-          block_searching_flag = false
-          block_searching_lines = []
-          pre_comment = []
-          next false
-        end
-
-        # NormalClass is created, and added to @top_level
-        #
-        if block_searching_flag == :module
-          module_name = module_program_name
-          module_code = module_program_code
-          module_trailing = module_program_trailing
-          progress "m"
-          @stats.num_modules += 1
-          f9x_module = @top_level.add_module NormalClass, module_name
-          f9x_module.record_location @top_level
-
-          f9x_comment = COMMENTS_ARE_UPPER ? 
-            find_comments(pre_comment.join("\n"))  + "\n" + module_trailing :
-              module_trailing + "\n" + find_comments(module_code.sub(/^.*$\n/i, ''))
-          f9x_module.comment = f9x_comment
-          parse_program_or_module(f9x_module, module_code)
-
-          TopLevel.all_files.each do |name, toplevel|
-            if toplevel.include_includes?(module_name, @options.ignore_case)
-              if !toplevel.include_requires?(@file_name, @options.ignore_case)
-                toplevel.add_require(Require.new(@file_name, ""))
-              end
-            end
-            toplevel.each_classmodule{|m|
-              if m.include_includes?(module_name, @options.ignore_case)
-                if !m.include_requires?(@file_name, @options.ignore_case)
-                  m.add_require(Require.new(@file_name, ""))
-                end
-              end
-            }
-          end
-        elsif block_searching_flag == :program
-          program_name = module_program_name
-          program_code = module_program_code
-          program_trailing = module_program_trailing
-          progress "p"
-          program_comment = COMMENTS_ARE_UPPER ? 
-            find_comments(pre_comment.join("\n")) + "\n" + program_trailing : 
-              program_trailing + "\n" + find_comments(program_code.sub(/^.*$\n/i, ''))
-          program_comment = "\n\n= <i>Program</i> <tt>#{program_name}</tt>\n\n" \
-                            + program_comment
-          @top_level.comment << program_comment
-          parse_program_or_module(@top_level, program_code, :private)
-        end
-
-        # next loop to search next block
-        level_depth = 0
-        block_searching_flag = false
-        block_searching_lines = []
-        pre_comment = []
-        next false
-      }
-
-      remaining_lines.delete_if{ |line|
-        line == false
-      }
-
-      # External subprograms and functions are parsed
-      #
-      parse_program_or_module(@top_level, remaining_lines.join("\n"),
-                              :public, true)
-
-      @top_level
-    end  # End of scan
-
-    private
-
-    def parse_program_or_module(container, code,
-                                visibility=:public, external=nil)
-      return unless container
-      return unless code
-      remaining_lines = code.split("\n")
-      remaining_code = "#{code}"
-
-      #
-      # Parse variables before "contains" in module
-      #
-      level_depth = 0
-      before_contains_lines = []
-      before_contains_code = nil
-      before_contains_flag = nil
-      remaining_lines.each{ |line|
-        if !before_contains_flag
-          if line =~ /^\s*?module\s+\w+\s*?(!.*?)?$/i
-            before_contains_flag = true
-          end
-        else
-          break if line =~ /^\s*?contains\s*?(!.*?)?$/i
-          level_depth += 1 if block_start?(line)
-          level_depth -= 1 if block_end?(line)
-          break if level_depth < 0
-          before_contains_lines << line
-        end
-      }
-      before_contains_code = before_contains_lines.join("\n")
-      if before_contains_code
-        before_contains_code.gsub!(/^\s*?interface\s+.*?\s+end\s+interface.*?$/im, "")
-        before_contains_code.gsub!(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
-      end
-
-      #
-      # Parse global "use"
-      #
-      use_check_code = "#{before_contains_code}"
-      cascaded_modules_list = []
-      while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
-        use_check_code = $~.pre_match
-        use_check_code << $~.post_match
-        used_mod_name = $1.strip.chomp
-        used_list = $2 || ""
-        used_trailing = $3 || ""
-        next if used_trailing =~ /!:nodoc:/
-        if !container.include_includes?(used_mod_name, @options.ignore_case)
-          progress "."
-          container.add_include Include.new(used_mod_name, "")
-        end
-        if ! (used_list =~ /\,\s*?only\s*?:/i )
-          cascaded_modules_list << "\#" + used_mod_name
-        end
-      end
-
-      #
-      # Parse public and private, and store information.
-      # This information is used when "add_method" and
-      # "set_visibility_for" are called.
-      #
-      visibility_default, visibility_info = 
-                parse_visibility(remaining_lines.join("\n"), visibility, container)
-      @@public_methods.concat visibility_info
-      if visibility_default == :public
-        if !cascaded_modules_list.empty?
-          cascaded_modules = 
-            Attr.new("Cascaded Modules",
-                     "Imported modules all of whose components are published again",
-                     "",
-                     cascaded_modules_list.join(", "))
-          container.add_attribute(cascaded_modules)
-        end
-      end
-
-      #
-      # Check rename elements
-      #
-      use_check_code = "#{before_contains_code}"
-      while use_check_code =~ /^\s*?use\s+(\w+)\s*?\,(.+)$/i
-        use_check_code = $~.pre_match
-        use_check_code << $~.post_match
-        used_mod_name = $1.strip.chomp
-        used_elements = $2.sub(/\s*?only\s*?:\s*?/i, '')
-        used_elements.split(",").each{ |used|
-          if /\s*?(\w+)\s*?=>\s*?(\w+)\s*?/ =~ used
-            local = $1
-            org = $2
-            @@public_methods.collect!{ |pub_meth|
-              if local == pub_meth["name"] ||
-                  local.upcase == pub_meth["name"].upcase &&
-                  @options.ignore_case
-                pub_meth["name"] = org
-                pub_meth["local_name"] = local
-              end
-              pub_meth
-            }
-          end
-        }
-      end
-
-      #
-      # Parse private "use"
-      #
-      use_check_code = remaining_lines.join("\n")
-      while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
-        use_check_code = $~.pre_match
-        use_check_code << $~.post_match
-        used_mod_name = $1.strip.chomp
-        used_trailing = $3 || ""
-        next if used_trailing =~ /!:nodoc:/
-        if !container.include_includes?(used_mod_name, @options.ignore_case)
-          progress "."
-          container.add_include Include.new(used_mod_name, "")
-        end
-      end
-
-      container.each_includes{ |inc|
-        TopLevel.all_files.each do |name, toplevel|
-          indicated_mod = toplevel.find_symbol(inc.name,
-                                               nil, @options.ignore_case)
-          if indicated_mod
-            indicated_name = indicated_mod.parent.file_relative_name
-            if !container.include_requires?(indicated_name, @options.ignore_case)
-              container.add_require(Require.new(indicated_name, ""))
-            end
-            break
-          end
-        end
-      }
-
-      #
-      # Parse derived-types definitions
-      #
-      derived_types_comment = ""
-      remaining_code = remaining_lines.join("\n")
-      while remaining_code =~ /^\s*?
-                                    type[\s\,]+(public|private)?\s*?(::)?\s*?
-                                    (\w+)\s*?(!.*?)?$
-                                    (.*?)
-                                    ^\s*?end\s+type.*?$
-                              /imx
-        remaining_code = $~.pre_match
-        remaining_code << $~.post_match
-        typename = $3.chomp.strip
-        type_elements = $5 || ""
-        type_code = remove_empty_head_lines($&)
-        type_trailing = find_comments($4)
-        next if type_trailing =~ /^:nodoc:/
-        type_visibility = $1
-        type_comment = COMMENTS_ARE_UPPER ? 
-          find_comments($~.pre_match) + "\n" + type_trailing :
-            type_trailing + "\n" + find_comments(type_code.sub(/^.*$\n/i, ''))
-        type_element_visibility_public = true
-        type_code.split("\n").each{ |line|
-          if /^\s*?private\s*?$/ =~ line
-            type_element_visibility_public = nil
-            break
-          end
-        } if type_code
-
-        args_comment = ""
-        type_args_info = nil
-
-        if @options.show_all
-          args_comment = find_arguments(nil, type_code, true)
-        else
-          type_public_args_list = []
-          type_args_info = definition_info(type_code)
-          type_args_info.each{ |arg|
-            arg_is_public = type_element_visibility_public
-            arg_is_public = true if arg.include_attr?("public")
-            arg_is_public = nil if arg.include_attr?("private")
-            type_public_args_list << arg.varname if arg_is_public
-          }
-          args_comment = find_arguments(type_public_args_list, type_code)
-        end
-
-        type = AnyMethod.new("type #{typename}", typename)
-        type.singleton = false
-        type.params = ""
-        type.comment = "<b><em> Derived Type </em></b> :: <tt></tt>\n"
-        type.comment << args_comment if args_comment
-        type.comment << type_comment if type_comment
-        progress "t"
-        @stats.num_methods += 1
-        container.add_method type
-
-        set_visibility(container, typename, visibility_default, @@public_methods)
-
-        if type_visibility
-          type_visibility.gsub!(/\s/,'')
-          type_visibility.gsub!(/\,/,'')
-          type_visibility.gsub!(/:/,'')
-          type_visibility.downcase!
-          if type_visibility == "public"
-            container.set_visibility_for([typename], :public)
-          elsif type_visibility == "private"
-            container.set_visibility_for([typename], :private)
-          end
-        end
-
-        check_public_methods(type, container.name)
-
-        if @options.show_all
-          derived_types_comment << ", " unless derived_types_comment.empty?
-          derived_types_comment << typename
-        else
-          if type.visibility == :public
-          derived_types_comment << ", " unless derived_types_comment.empty?
-          derived_types_comment << typename
-          end
-        end
-
-      end
-
-      if !derived_types_comment.empty?
-        derived_types_table = 
-          Attr.new("Derived Types", "Derived_Types", "", 
-                   derived_types_comment)
-        container.add_attribute(derived_types_table)
-      end
-
-      #
-      # move interface scope
-      #
-      interface_code = ""
-      while remaining_code =~ /^\s*?
-                                   interface(
-                                              \s+\w+                      |
-                                              \s+operator\s*?\(.*?\)       |
-                                              \s+assignment\s*?\(\s*?=\s*?\)
-                                            )?\s*?$
-                                   (.*?)
-                                   ^\s*?end\s+interface.*?$
-                              /imx
-        interface_code << remove_empty_head_lines($&) + "\n"
-        remaining_code = $~.pre_match
-        remaining_code << $~.post_match
-      end
-
-      #
-      # Parse global constants or variables in modules
-      #
-      const_var_defs = definition_info(before_contains_code)
-      const_var_defs.each{|defitem|
-        next if defitem.nodoc
-        const_or_var_type = "Variable"
-        const_or_var_progress = "v"
-        if defitem.include_attr?("parameter")
-          const_or_var_type = "Constant"
-          const_or_var_progress = "c"
-        end
-        const_or_var = AnyMethod.new(const_or_var_type, defitem.varname)
-        const_or_var.singleton = false
-        const_or_var.params = ""
-        self_comment = find_arguments([defitem.varname], before_contains_code)
-        const_or_var.comment = "<b><em>" + const_or_var_type + "</em></b> :: <tt></tt>\n"
-        const_or_var.comment << self_comment if self_comment
-        progress const_or_var_progress
-        @stats.num_methods += 1
-        container.add_method const_or_var
-
-        set_visibility(container, defitem.varname, visibility_default, @@public_methods)
-
-        if defitem.include_attr?("public")
-          container.set_visibility_for([defitem.varname], :public)
-        elsif defitem.include_attr?("private")
-          container.set_visibility_for([defitem.varname], :private)
-        end
-
-        check_public_methods(const_or_var, container.name)
-
-      } if const_var_defs
-
-      remaining_lines = remaining_code.split("\n")
-
-      # "subroutine" or "function" parts are parsed (new)
-      #
-      level_depth = 0
-      block_searching_flag = nil
-      block_searching_lines = []
-      pre_comment = []
-      procedure_trailing = ""
-      procedure_name = ""
-      procedure_params = ""
-      procedure_prefix = ""
-      procedure_result_arg = ""
-      procedure_type = ""
-      contains_lines = []
-      contains_flag = nil
-      remaining_lines.collect!{|line|
-        if !block_searching_flag
-          # subroutine
-          if line =~ /^\s*?
-                           (recursive|pure|elemental)?\s*?
-                           subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
-                     /ix
-            block_searching_flag = :subroutine
-            block_searching_lines << line
-
-            procedure_name = $2.chomp.strip
-            procedure_params = $3 || ""
-            procedure_prefix = $1 || ""
-            procedure_trailing = $4 || "!"
-            next false
-
-          # function
-          elsif line =~ /^\s*?
-                         (recursive|pure|elemental)?\s*?
-                         (
-                             character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | type\s*?\([\w\s]+?\)\s+
-                           | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | double\s+precision\s+
-                           | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                         )?
-                         function\s+(\w+)\s*?
-                         (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
-                        /ix
-            block_searching_flag = :function
-            block_searching_lines << line
-
-            procedure_prefix = $1 || ""
-            procedure_type = $2 ? $2.chomp.strip : nil
-            procedure_name = $8.chomp.strip
-            procedure_params = $9 || ""
-            procedure_result_arg = $11 ? $11.chomp.strip : procedure_name
-            procedure_trailing = $12 || "!"
-            next false
-          elsif line =~ /^\s*?!\s?(.*)/
-            pre_comment << line
-            next line
-          else
-            pre_comment = []
-            next line
-          end
-        end
-        contains_flag = true if line =~ /^\s*?contains\s*?(!.*?)?$/
-        block_searching_lines << line
-        contains_lines << line if contains_flag
-
-        level_depth += 1 if block_start?(line)
-        level_depth -= 1 if block_end?(line)
-        if level_depth >= 0
-          next false
-        end
-
-        # "procedure_code" is formatted.
-        # ":nodoc:" flag is checked.
-        #
-        procedure_code = block_searching_lines.join("\n")
-        procedure_code = remove_empty_head_lines(procedure_code)
-        if procedure_trailing =~ /^!:nodoc:/
-          # next loop to search next block
-          level_depth = 0
-          block_searching_flag = nil
-          block_searching_lines = []
-          pre_comment = []
-          procedure_trailing = ""
-          procedure_name = ""
-          procedure_params = ""
-          procedure_prefix = ""
-          procedure_result_arg = ""
-          procedure_type = ""
-          contains_lines = []
-          contains_flag = nil
-          next false
-        end
-
-        # AnyMethod is created, and added to container
-        #
-        subroutine_function = nil
-        if block_searching_flag == :subroutine
-          subroutine_prefix   = procedure_prefix
-          subroutine_name     = procedure_name
-          subroutine_params   = procedure_params
-          subroutine_trailing = procedure_trailing
-          subroutine_code     = procedure_code
-
-          subroutine_comment = COMMENTS_ARE_UPPER ? 
-            pre_comment.join("\n") + "\n" + subroutine_trailing : 
-              subroutine_trailing + "\n" + subroutine_code.sub(/^.*$\n/i, '')
-          subroutine = AnyMethod.new("subroutine", subroutine_name)
-          parse_subprogram(subroutine, subroutine_params,
-                           subroutine_comment, subroutine_code,
-                           before_contains_code, nil, subroutine_prefix)
-          progress "s"
-          @stats.num_methods += 1
-          container.add_method subroutine
-          subroutine_function = subroutine
-
-        elsif block_searching_flag == :function
-          function_prefix     = procedure_prefix
-          function_type       = procedure_type
-          function_name       = procedure_name
-          function_params_org = procedure_params
-          function_result_arg = procedure_result_arg
-          function_trailing   = procedure_trailing
-          function_code_org   = procedure_code
-
-          function_comment = COMMENTS_ARE_UPPER ?
-            pre_comment.join("\n") + "\n" + function_trailing :
-              function_trailing + "\n " + function_code_org.sub(/^.*$\n/i, '')
-
-          function_code = "#{function_code_org}"
-          if function_type
-            function_code << "\n" + function_type + " :: " + function_result_arg
-          end
-
-          function_params =
-            function_params_org.sub(/^\(/, "\(#{function_result_arg}, ")
-
-          function = AnyMethod.new("function", function_name)
-          parse_subprogram(function, function_params,
-                           function_comment, function_code,
-                           before_contains_code, true, function_prefix)
-
-          # Specific modification due to function
-          function.params.sub!(/\(\s*?#{function_result_arg}\s*?,\s*?/, "\( ")
-          function.params << " result(" + function_result_arg + ")"
-          function.start_collecting_tokens
-          function.add_token Token.new(1,1).set_text(function_code_org)
-
-          progress "f"
-          @stats.num_methods += 1
-          container.add_method function
-          subroutine_function = function
-
-        end
-
-        # The visibility of procedure is specified
-        #
-        set_visibility(container, procedure_name, 
-                       visibility_default, @@public_methods)
-
-        # The alias for this procedure from external modules
-        #
-        check_external_aliases(procedure_name,
-                               subroutine_function.params,
-                               subroutine_function.comment, subroutine_function) if external
-        check_public_methods(subroutine_function, container.name)
-
-
-        # contains_lines are parsed as private procedures
-        if contains_flag
-          parse_program_or_module(container,
-                                  contains_lines.join("\n"), :private)
-        end
-
-        # next loop to search next block
-        level_depth = 0
-        block_searching_flag = nil
-        block_searching_lines = []
-        pre_comment = []
-        procedure_trailing = ""
-        procedure_name = ""
-        procedure_params = ""
-        procedure_prefix = ""
-        procedure_result_arg = ""
-        contains_lines = []
-        contains_flag = nil
-        next false
-      } # End of remaining_lines.collect!{|line|
-
-      # Array remains_lines is converted to String remains_code again
-      #
-      remaining_code = remaining_lines.join("\n")
-
-      #
-      # Parse interface
-      #
-      interface_scope = false
-      generic_name = ""
-      interface_code.split("\n").each{ |line|
-        if /^\s*?
-                 interface(
-                            \s+\w+|
-                            \s+operator\s*?\(.*?\)|
-                            \s+assignment\s*?\(\s*?=\s*?\)
-                          )?
-                 \s*?(!.*?)?$
-           /ix =~ line
-          generic_name = $1 ? $1.strip.chomp : nil
-          interface_trailing = $2 || "!"
-          interface_scope = true
-          interface_scope = false if interface_trailing =~ /!:nodoc:/
-#          if generic_name =~ /operator\s*?\((.*?)\)/i
-#            operator_name = $1
-#            if operator_name && !operator_name.empty?
-#              generic_name = "#{operator_name}"
-#            end
-#          end
-#          if generic_name =~ /assignment\s*?\((.*?)\)/i
-#            assignment_name = $1
-#            if assignment_name && !assignment_name.empty?
-#              generic_name = "#{assignment_name}"
-#            end
-#          end
-        end
-        if /^\s*?end\s+interface/i =~ line
-          interface_scope = false
-          generic_name = nil
-        end
-        # internal alias
-        if interface_scope && /^\s*?module\s+procedure\s+(.*?)(!.*?)?$/i =~ line
-          procedures = $1.strip.chomp
-          procedures_trailing = $2 || "!"
-          next if procedures_trailing =~ /!:nodoc:/
-          procedures.split(",").each{ |proc|
-            proc.strip!
-            proc.chomp!
-            next if generic_name == proc || !generic_name
-            old_meth = container.find_symbol(proc, nil, @options.ignore_case)
-            next if !old_meth
-            nolink = old_meth.visibility == :private ? true : nil
-            nolink = nil if @options.show_all
-            new_meth = 
-               initialize_external_method(generic_name, proc, 
-                                          old_meth.params, nil, 
-                                          old_meth.comment, 
-                                          old_meth.clone.token_stream[0].text, 
-                                          true, nolink)
-            new_meth.singleton = old_meth.singleton
-
-            progress "i"
-            @stats.num_methods += 1
-            container.add_method new_meth
-
-            set_visibility(container, generic_name, visibility_default, @@public_methods)
-
-            check_public_methods(new_meth, container.name)
-
-          }
-        end
-
-        # external aliases
-        if interface_scope
-          # subroutine
-          proc = nil
-          params = nil
-          procedures_trailing = nil
-          if line =~ /^\s*?
-                           (recursive|pure|elemental)?\s*?
-                           subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
-                     /ix
-            proc = $2.chomp.strip
-            generic_name = proc unless generic_name
-            params = $3 || ""
-            procedures_trailing = $4 || "!"
-
-          # function
-          elsif line =~ /^\s*?
-                         (recursive|pure|elemental)?\s*?
-                         (
-                             character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | type\s*?\([\w\s]+?\)\s+
-                           | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | double\s+precision\s+
-                           | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                           | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                         )?
-                         function\s+(\w+)\s*?
-                         (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
-                        /ix
-            proc = $8.chomp.strip
-            generic_name = proc unless generic_name
-            params = $9 || ""
-            procedures_trailing = $12 || "!"
-          else
-            next
-          end
-          next if procedures_trailing =~ /!:nodoc:/
-          indicated_method = nil
-          indicated_file   = nil
-          TopLevel.all_files.each do |name, toplevel|
-            indicated_method = toplevel.find_local_symbol(proc, @options.ignore_case)
-            indicated_file = name
-            break if indicated_method
-          end
-
-          if indicated_method
-            external_method = 
-              initialize_external_method(generic_name, proc, 
-                                         indicated_method.params, 
-                                         indicated_file, 
-                                         indicated_method.comment)
-
-            progress "e"
-            @stats.num_methods += 1
-            container.add_method external_method
-            set_visibility(container, generic_name, visibility_default, @@public_methods)
-            if !container.include_requires?(indicated_file, @options.ignore_case)
-              container.add_require(Require.new(indicated_file, ""))
-            end
-            check_public_methods(external_method, container.name)
-
-          else
-            @@external_aliases << {
-              "new_name"  => generic_name,
-              "old_name"  => proc,
-              "file_or_module" => container,
-              "visibility" => find_visibility(container, generic_name, @@public_methods) || visibility_default
-            }
-          end
-        end
-
-      } if interface_code # End of interface_code.split("\n").each ...
-
-      #
-      # Already imported methods are removed from @@public_methods.
-      # Remainders are assumed to be imported from other modules.
-      #
-      @@public_methods.delete_if{ |method| method["entity_is_discovered"]}
-
-      @@public_methods.each{ |pub_meth|
-        next unless pub_meth["file_or_module"].name == container.name
-        pub_meth["used_modules"].each{ |used_mod|
-          TopLevel.all_classes_and_modules.each{ |modules|
-            if modules.name == used_mod ||
-                modules.name.upcase == used_mod.upcase &&
-                @options.ignore_case
-              modules.method_list.each{ |meth|
-                if meth.name == pub_meth["name"] ||
-                    meth.name.upcase == pub_meth["name"].upcase &&
-                    @options.ignore_case
-                  new_meth = initialize_public_method(meth,
-                                                      modules.name)
-                  if pub_meth["local_name"]
-                    new_meth.name = pub_meth["local_name"]
-                  end
-                  progress "e"
-                  @stats.num_methods += 1
-                  container.add_method new_meth
-                end
-              }
-            end
-          }
-        }
-      }
-
-      container
-    end  # End of parse_program_or_module
-
-    #
-    # Parse arguments, comment, code of subroutine and function.
-    # Return AnyMethod object.
-    #
-    def parse_subprogram(subprogram, params, comment, code, 
-                         before_contains=nil, function=nil, prefix=nil)
-      subprogram.singleton = false
-      prefix = "" if !prefix
-      arguments = params.sub(/\(/, "").sub(/\)/, "").split(",") if params
-      args_comment, params_opt = 
-        find_arguments(arguments, code.sub(/^s*?contains\s*?(!.*?)?$.*/im, ""),
-                       nil, nil, true)
-      params_opt = "( " + params_opt + " ) " if params_opt
-      subprogram.params = params_opt || ""
-      namelist_comment = find_namelists(code, before_contains)
-
-      block_comment = find_comments comment
-      if function
-        subprogram.comment = "<b><em> Function </em></b> :: <em>#{prefix}</em>\n"
-      else
-        subprogram.comment = "<b><em> Subroutine </em></b> :: <em>#{prefix}</em>\n"
-      end
-      subprogram.comment << args_comment if args_comment
-      subprogram.comment << block_comment if block_comment
-      subprogram.comment << namelist_comment if namelist_comment
-
-      # For output source code
-      subprogram.start_collecting_tokens
-      subprogram.add_token Token.new(1,1).set_text(code)
-
-      subprogram
-    end
-
-    #
-    # Collect comment for file entity
-    #
-    def collect_first_comment(body)
-      comment = ""
-      not_comment = ""
-      comment_start = false
-      comment_end   = false
-      body.split("\n").each{ |line|
-        if comment_end
-          not_comment << line
-          not_comment << "\n"
-        elsif /^\s*?!\s?(.*)$/i =~ line
-          comment_start = true
-          comment << $1
-          comment << "\n"
-        elsif /^\s*?$/i =~ line
-          comment_end = true if comment_start && COMMENTS_ARE_UPPER
-        else
-          comment_end = true
-          not_comment << line
-          not_comment << "\n"
-        end
-      }
-      return comment, not_comment
-    end
-
-
-    # Return comments of definitions of arguments
-    #
-    # If "all" argument is true, information of all arguments are returned.
-    # If "modified_params" is true, list of arguments are decorated,
-    # for exameple, optional arguments are parenthetic as "[arg]".
-    #
-    def find_arguments(args, text, all=nil, indent=nil, modified_params=nil)
-      return unless args || all
-      indent = "" unless indent
-      args = ["all"] if all
-      params = "" if modified_params
-      comma = ""
-      return unless text
-      args_rdocforms = "\n"
-      remaining_lines = "#{text}"
-      definitions = definition_info(remaining_lines)
-      args.each{ |arg|
-        arg.strip!
-        arg.chomp!
-        definitions.each { |defitem|
-          if arg == defitem.varname.strip.chomp || all
-            args_rdocforms << <<-"EOF"
-
-#{indent}<tt><b>#{defitem.varname.chomp.strip}#{defitem.arraysuffix}</b> #{defitem.inivalue}</tt> :: 
-#{indent}   <tt>#{defitem.types.chomp.strip}</tt>
-EOF
-            if !defitem.comment.chomp.strip.empty?
-              comment = ""
-              defitem.comment.split("\n").each{ |line|
-                comment << "       " + line + "\n"
-              }
-              args_rdocforms << <<-"EOF"
-
-#{indent}   <tt></tt> :: 
-#{indent}       <tt></tt>
-#{indent}       #{comment.chomp.strip}
-EOF
-            end
-
-            if modified_params
-              if defitem.include_attr?("optional")
-                params << "#{comma}[#{arg}]"
-              else
-                params << "#{comma}#{arg}"
-              end
-              comma = ", "
-            end
-          end
-        }
-      }
-      if modified_params
-        return args_rdocforms, params
-      else
-        return args_rdocforms
-      end
-    end
-
-    # Return comments of definitions of namelists
-    #
-    def find_namelists(text, before_contains=nil)
-      return nil if !text
-      result = ""
-      lines = "#{text}"
-      before_contains = "" if !before_contains
-      while lines =~ /^\s*?namelist\s+\/\s*?(\w+)\s*?\/([\s\w\,]+)$/i
-        lines = $~.post_match
-        nml_comment = COMMENTS_ARE_UPPER ? 
-            find_comments($~.pre_match) : find_comments($~.post_match)
-        nml_name = $1
-        nml_args = $2.split(",")
-        result << "\n\n=== NAMELIST <tt><b>" + nml_name + "</tt></b>\n\n"
-        result << nml_comment + "\n" if nml_comment
-        if lines.split("\n")[0] =~ /^\//i
-          lines = "namelist " + lines
-        end
-        result << find_arguments(nml_args, "#{text}" + "\n" + before_contains)
-      end
-      return result
-    end
-
-    #
-    # Comments just after module or subprogram, or arguments are
-    # returnd. If "COMMENTS_ARE_UPPER" is true, comments just before
-    # modules or subprograms are returnd
-    #
-    def find_comments text
-      return "" unless text
-      lines = text.split("\n")
-      lines.reverse! if COMMENTS_ARE_UPPER
-      comment_block = Array.new
-      lines.each do |line|
-        break if line =~ /^\s*?\w/ || line =~ /^\s*?$/
-        if COMMENTS_ARE_UPPER
-          comment_block.unshift line.sub(/^\s*?!\s?/,"")
-        else
-          comment_block.push line.sub(/^\s*?!\s?/,"")
-        end
-      end
-      nice_lines = comment_block.join("\n").split "\n\s*?\n"
-      nice_lines[0] ||= ""
-      nice_lines.shift
-    end
-
-    def progress(char)
-      unless @options.quiet
-        @progress.print(char)
-        @progress.flush
-      end
-    end
-
-    #
-    # Create method for internal alias
-    #
-    def initialize_public_method(method, parent)
-      return if !method || !parent
-
-      new_meth = AnyMethod.new("External Alias for module", method.name)
-      new_meth.singleton    = method.singleton
-      new_meth.params       = method.params.clone
-      new_meth.comment      = remove_trailing_alias(method.comment.clone)
-      new_meth.comment      << "\n\n#{EXTERNAL_ALIAS_MES} #{parent.strip.chomp}\##{method.name}"
-
-      return new_meth
-    end
-
-    #
-    # Create method for external alias
-    #
-    # If argument "internal" is true, file is ignored.
-    #
-    def initialize_external_method(new, old, params, file, comment, token=nil,
-                                   internal=nil, nolink=nil)
-      return nil unless new || old
-
-      if internal
-        external_alias_header = "#{INTERNAL_ALIAS_MES} "
-        external_alias_text   = external_alias_header + old 
-      elsif file
-        external_alias_header = "#{EXTERNAL_ALIAS_MES} "
-        external_alias_text   = external_alias_header + file + "#" + old
-      else
-        return nil
-      end
-      external_meth = AnyMethod.new(external_alias_text, new)
-      external_meth.singleton    = false
-      external_meth.params       = params
-      external_comment = remove_trailing_alias(comment) + "\n\n" if comment
-      external_meth.comment = external_comment || ""
-      if nolink && token
-        external_meth.start_collecting_tokens
-        external_meth.add_token Token.new(1,1).set_text(token)
-      else
-        external_meth.comment << external_alias_text
-      end
-
-      return external_meth
-    end
-
-
-
-    #
-    # Parse visibility
-    #
-    def parse_visibility(code, default, container)
-      result = []
-      visibility_default = default || :public
-
-      used_modules = []
-      container.includes.each{|i| used_modules << i.name} if container
-
-      remaining_code = code.gsub(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
-      remaining_code.split("\n").each{ |line|
-        if /^\s*?private\s*?$/ =~ line
-          visibility_default = :private
-          break
-        end
-      } if remaining_code
-
-      remaining_code.split("\n").each{ |line|
-        if /^\s*?private\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
-          methods = $2.sub(/!.*$/, '')
-          methods.split(",").each{ |meth|
-            meth.sub!(/!.*$/, '')
-            meth.gsub!(/:/, '')
-            result << {
-              "name" => meth.chomp.strip,
-              "visibility" => :private,
-              "used_modules" => used_modules.clone,
-              "file_or_module" => container,
-              "entity_is_discovered" => nil,
-              "local_name" => nil
-            }
-          }
-        elsif /^\s*?public\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
-          methods = $2.sub(/!.*$/, '')
-          methods.split(",").each{ |meth|
-            meth.sub!(/!.*$/, '')
-            meth.gsub!(/:/, '')
-            result << {
-              "name" => meth.chomp.strip,
-              "visibility" => :public,
-              "used_modules" => used_modules.clone,
-              "file_or_module" => container,
-              "entity_is_discovered" => nil,
-              "local_name" => nil
-            }
-          }
-        end
-      } if remaining_code
-
-      if container
-        result.each{ |vis_info|
-          vis_info["parent"] = container.name
-        }
-      end
-
-      return visibility_default, result
-    end
-
-    #
-    # Set visibility
-    #
-    # "subname" element of "visibility_info" is deleted.
-    #
-    def set_visibility(container, subname, visibility_default, visibility_info)
-      return unless container || subname || visibility_default || visibility_info
-      not_found = true
-      visibility_info.collect!{ |info|
-        if info["name"] == subname ||
-            @options.ignore_case && info["name"].upcase == subname.upcase
-          if info["file_or_module"].name == container.name
-            container.set_visibility_for([subname], info["visibility"])
-            info["entity_is_discovered"] = true
-            not_found = false
-          end
-        end
-        info
-      }
-      if not_found
-        return container.set_visibility_for([subname], visibility_default)
-      else
-        return container
-      end
-    end
-
-    #
-    # Find visibility
-    #
-    def find_visibility(container, subname, visibility_info)
-      return nil if !subname || !visibility_info
-      visibility_info.each{ |info|
-        if info["name"] == subname ||
-            @options.ignore_case && info["name"].upcase == subname.upcase
-          if info["parent"] == container.name
-            return info["visibility"]
-          end
-        end
-      }
-      return nil
-    end
-
-    #
-    # Check external aliases
-    #
-    def check_external_aliases(subname, params, comment, test=nil)
-      @@external_aliases.each{ |alias_item|
-        if subname == alias_item["old_name"] ||
-                    subname.upcase == alias_item["old_name"].upcase &&
-                            @options.ignore_case
-
-          new_meth = initialize_external_method(alias_item["new_name"], 
-                                                subname, params, @file_name, 
-                                                comment)
-          new_meth.visibility = alias_item["visibility"]
-
-          progress "e"
-          @stats.num_methods += 1
-          alias_item["file_or_module"].add_method(new_meth)
-
-          if !alias_item["file_or_module"].include_requires?(@file_name, @options.ignore_case)
-            alias_item["file_or_module"].add_require(Require.new(@file_name, ""))
-          end
-        end
-      }
-    end
-
-    #
-    # Check public_methods
-    #
-    def check_public_methods(method, parent)
-      return if !method || !parent
-      @@public_methods.each{ |alias_item|
-        parent_is_used_module = nil
-        alias_item["used_modules"].each{ |used_module|
-          if used_module == parent ||
-              used_module.upcase == parent.upcase &&
-              @options.ignore_case
-            parent_is_used_module = true
-          end
-        }
-        next if !parent_is_used_module
-
-        if method.name == alias_item["name"] ||
-            method.name.upcase == alias_item["name"].upcase &&
-            @options.ignore_case
-
-          new_meth = initialize_public_method(method, parent)
-          if alias_item["local_name"]
-            new_meth.name = alias_item["local_name"]
-          end
-
-          progress "e"
-          @stats.num_methods += 1
-          alias_item["file_or_module"].add_method new_meth
-        end
-      }
-    end
-
-    #
-    # Continuous lines are united.
-    #
-    # Comments in continuous lines are removed.
-    #
-    def united_to_one_line(f90src)
-      return "" unless f90src
-      lines = f90src.split("\n")
-      previous_continuing = false
-      now_continuing = false
-      body = ""
-      lines.each{ |line|
-        words = line.split("")
-        next if words.empty? && previous_continuing
-        commentout = false
-        brank_flag = true ; brank_char = ""
-        squote = false    ; dquote = false
-        ignore = false
-        words.collect! { |char|
-          if previous_continuing && brank_flag
-            now_continuing = true
-            ignore         = true
-            case char
-            when "!"                       ; break
-            when " " ; brank_char << char  ; next ""
-            when "&"
-              brank_flag = false
-              now_continuing = false
-              next ""
-            else 
-              brank_flag     = false
-              now_continuing = false
-              ignore         = false
-              next brank_char + char
-            end
-          end
-          ignore = false
-
-          if now_continuing
-            next ""
-          elsif !(squote) && !(dquote) && !(commentout)
-            case char
-            when "!" ; commentout = true     ; next char
-            when "\""; dquote = true         ; next char
-            when "\'"; squote = true         ; next char
-            when "&" ; now_continuing = true ; next ""
-            else next char
-            end
-          elsif commentout
-            next char
-          elsif squote
-            case char
-            when "\'"; squote = false ; next char
-            else next char
-            end
-          elsif dquote
-            case char
-            when "\""; dquote = false ; next char
-            else next char
-            end
-          end
-        }
-        if !ignore && !previous_continuing || !brank_flag
-          if previous_continuing
-            body << words.join("")
-          else
-            body << "\n" + words.join("")
-          end
-        end
-        previous_continuing = now_continuing ? true : nil
-        now_continuing = nil
-      }
-      return body
-    end
-
-
-    #
-    # Continuous line checker
-    #
-    def continuous_line?(line)
-      continuous = false
-      if /&\s*?(!.*)?$/ =~ line
-        continuous = true
-        if comment_out?($~.pre_match)
-          continuous = false
-        end
-      end
-      return continuous
-    end
-
-    #
-    # Comment out checker
-    #
-    def comment_out?(line)
-      return nil unless line
-      commentout = false
-      squote = false ; dquote = false
-      line.split("").each { |char|
-        if !(squote) && !(dquote)
-          case char
-          when "!" ; commentout = true ; break
-          when "\""; dquote = true
-          when "\'"; squote = true
-          else next
-          end
-        elsif squote
-          case char
-          when "\'"; squote = false
-          else next
-          end
-        elsif dquote
-          case char
-          when "\""; dquote = false
-          else next
-          end
-        end
-      }
-      return commentout
-    end
-
-    #
-    # Semicolons are replaced to line feed.
-    #
-    def semicolon_to_linefeed(text)
-      return "" unless text
-      lines = text.split("\n")
-      lines.collect!{ |line|
-        words = line.split("")
-        commentout = false
-        squote = false ; dquote = false
-        words.collect! { |char|
-          if !(squote) && !(dquote) && !(commentout)
-            case char
-            when "!" ; commentout = true ; next char
-            when "\""; dquote = true     ; next char
-            when "\'"; squote = true     ; next char
-            when ";" ;                     "\n"
-            else next char
-            end
-          elsif commentout
-            next char
-          elsif squote
-            case char
-            when "\'"; squote = false ; next char
-            else next char
-            end
-          elsif dquote
-            case char
-            when "\""; dquote = false ; next char
-            else next char
-            end
-          end
-        }
-        words.join("")
-      }
-      return lines.join("\n")
-    end
-
-    #
-    # Which "line" is start of block (module, program, block data,
-    # subroutine, function) statement ?
-    #
-    def block_start?(line)
-      return nil if !line
-
-      if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i    ||
-          line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i  ||
-          line =~ /^\s*?block\s+data(\s+\w+)?\s*?(!.*?)?$/i     ||
-          line =~ \
-                  /^\s*?
-                   (recursive|pure|elemental)?\s*?
-                   subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
-                  /ix ||
-          line =~ \
-                  /^\s*?
-                   (recursive|pure|elemental)?\s*?
-                   (
-                       character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                     | type\s*?\([\w\s]+?\)\s+
-                     | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                     | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                     | double\s+precision\s+
-                     | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                     | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
-                   )?
-                   function\s+(\w+)\s*?
-                   (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
-                  /ix
-        return true
-      end
-
-      return nil
-    end
-
-    #
-    # Which "line" is end of block (module, program, block data,
-    # subroutine, function) statement ?
-    #
-    def block_end?(line)
-      return nil if !line
-
-      if line =~ /^\s*?end\s*?(!.*?)?$/i                 ||
-          line =~ /^\s*?end\s+module(\s+\w+)?\s*?(!.*?)?$/i       ||
-          line =~ /^\s*?end\s+program(\s+\w+)?\s*?(!.*?)?$/i      ||
-          line =~ /^\s*?end\s+block\s+data(\s+\w+)?\s*?(!.*?)?$/i  ||
-          line =~ /^\s*?end\s+subroutine(\s+\w+)?\s*?(!.*?)?$/i   ||
-          line =~ /^\s*?end\s+function(\s+\w+)?\s*?(!.*?)?$/i
-        return true
-      end
-
-      return nil
-    end
-
-    #
-    # Remove "Alias for" in end of comments
-    #
-    def remove_trailing_alias(text)
-      return "" if !text
-      lines = text.split("\n").reverse
-      comment_block = Array.new
-      checked = false
-      lines.each do |line|
-        if !checked 
-          if /^\s?#{INTERNAL_ALIAS_MES}/ =~ line ||
-              /^\s?#{EXTERNAL_ALIAS_MES}/ =~ line
-            checked = true
-            next
-          end
-        end
-        comment_block.unshift line
-      end
-      nice_lines = comment_block.join("\n")
-      nice_lines ||= ""
-      return nice_lines
-    end
-
-    # Empty lines in header are removed
-    def remove_empty_head_lines(text)
-      return "" unless text
-      lines = text.split("\n")
-      header = true
-      lines.delete_if{ |line|
-        header = false if /\S/ =~ line
-        header && /^\s*?$/ =~ line
-      }
-      lines.join("\n")
-    end
-
-
-    # header marker "=", "==", ... are removed
-    def remove_header_marker(text)
-      return text.gsub(/^\s?(=+)/, '<tt></tt>\1')
-    end
-
-    def remove_private_comments(body)
-      body.gsub!(/^\s*!--\s*?$.*?^\s*!\+\+\s*?$/m, '')
-      return body
-    end
-
-
-    #
-    # Information of arguments of subroutines and functions in Fortran95
-    #
-    class Fortran95Definition
-
-      # Name of variable
-      #
-      attr_reader   :varname
-
-      # Types of variable
-      #
-      attr_reader   :types
-
-      # Initial Value
-      #
-      attr_reader   :inivalue
-
-      # Suffix of array
-      #
-      attr_reader   :arraysuffix
-
-      # Comments
-      #
-      attr_accessor   :comment
-
-      # Flag of non documentation
-      #
-      attr_accessor   :nodoc
-
-      def initialize(varname, types, inivalue, arraysuffix, comment,
-                     nodoc=false)
-        @varname = varname
-        @types = types
-        @inivalue = inivalue
-        @arraysuffix = arraysuffix
-        @comment = comment
-        @nodoc = nodoc
-      end
-
-      def to_s
-        return <<-EOF
-<Fortran95Definition: 
-  varname=#{@varname}, types=#{types},
-  inivalue=#{@inivalue}, arraysuffix=#{@arraysuffix}, nodoc=#{@nodoc}, 
-  comment=
-#{@comment}
->
-EOF
-      end
-
-      #
-      # If attr is included, true is returned
-      #
-      def include_attr?(attr)
-        return if !attr
-        @types.split(",").each{ |type|
-          return true if type.strip.chomp.upcase == attr.strip.chomp.upcase
-        }
-        return nil
-      end
-
-    end # End of Fortran95Definition
-
-    #
-    # Parse string argument "text", and Return Array of
-    # Fortran95Definition object
-    #
-    def definition_info(text)
-      return nil unless text
-      lines = "#{text}"
-      defs = Array.new
-      comment = ""
-      trailing_comment = ""
-      under_comment_valid = false
-      lines.split("\n").each{ |line|
-        if /^\s*?!\s?(.*)/ =~ line
-          if COMMENTS_ARE_UPPER
-            comment << remove_header_marker($1)
-            comment << "\n"
-          elsif defs[-1] && under_comment_valid
-            defs[-1].comment << "\n"
-            defs[-1].comment << remove_header_marker($1)
-          end
-          next
-        elsif /^\s*?$/ =~ line
-          comment = ""
-          under_comment_valid = false
-          next
-        end
-        type = ""
-        characters = ""
-        if line =~ /^\s*?
-                    (
-                        character\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
-                      | type\s*?\([\w\s]+?\)[\s\,]*
-                      | integer\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
-                      | real\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
-                      | double\s+precision[\s\,]*
-                      | logical\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
-                      | complex\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
-                    )
-                    (.*?::)?
-                    (.+)$
-                   /ix
-          characters = $8
-          type = $1
-          type << $7.gsub(/::/, '').gsub(/^\s*?\,/, '') if $7
-        else
-          under_comment_valid = false
-          next
-        end
-        squote = false ; dquote = false ; bracket = 0
-        iniflag = false; commentflag = false
-        varname = "" ; arraysuffix = "" ; inivalue = ""
-        start_pos = defs.size
-        characters.split("").each { |char|
-          if !(squote) && !(dquote) && bracket <= 0 && !(iniflag) && !(commentflag)
-            case char
-            when "!" ; commentflag = true
-            when "(" ; bracket += 1       ; arraysuffix = char
-            when "\""; dquote = true
-            when "\'"; squote = true
-            when "=" ; iniflag = true     ; inivalue << char
-            when ","
-              defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
-              varname = "" ; arraysuffix = "" ; inivalue = ""
-              under_comment_valid = true
-            when " " ; next
-            else     ; varname << char
-            end
-          elsif commentflag
-            comment << remove_header_marker(char)
-            trailing_comment << remove_header_marker(char)
-          elsif iniflag
-            if dquote
-              case char
-              when "\"" ; dquote = false ; inivalue << char
-              else      ; inivalue << char
-              end
-            elsif squote
-              case char
-              when "\'" ; squote = false ; inivalue << char
-              else      ; inivalue << char
-              end
-            elsif bracket > 0
-              case char
-              when "(" ; bracket += 1 ; inivalue << char
-              when ")" ; bracket -= 1 ; inivalue << char
-              else     ; inivalue << char
-              end
-            else
-              case char
-              when ","
-                defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
-                varname = "" ; arraysuffix = "" ; inivalue = ""
-                iniflag = false
-                under_comment_valid = true
-              when "(" ; bracket += 1 ; inivalue << char
-              when "\""; dquote = true  ; inivalue << char
-              when "\'"; squote = true  ; inivalue << char
-              when "!" ; commentflag = true
-              else     ; inivalue << char
-              end
-            end
-          elsif !(squote) && !(dquote) && bracket > 0
-            case char
-            when "(" ; bracket += 1 ; arraysuffix << char
-            when ")" ; bracket -= 1 ; arraysuffix << char
-            else     ; arraysuffix << char
-            end
-          elsif squote
-            case char
-            when "\'"; squote = false ; inivalue << char
-            else     ; inivalue << char
-            end
-          elsif dquote
-            case char
-            when "\""; dquote = false ; inivalue << char
-            else     ; inivalue << char
-            end
-          end
-        }
-        defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
-        if trailing_comment =~ /^:nodoc:/
-          defs[start_pos..-1].collect!{ |defitem|
-            defitem.nodoc = true
-          }
-        end
-        varname = "" ; arraysuffix = "" ; inivalue = ""
-        comment = ""
-        under_comment_valid = true
-        trailing_comment = ""
-      }
-      return defs
-    end
-
-
-  end # class Fortran95parser
-
-end # module RDoc
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
deleted file mode 100644
index 58ba06084e..0000000000
--- a/lib/rdoc/parsers/parse_rb.rb
+++ /dev/null
@@ -1,2605 +0,0 @@
-#!/usr/local/bin/ruby
-
-# Parse a Ruby source file, building a set of objects
-# representing the modules, classes, methods,
-# requires, and includes we find (these classes
-# are defined in code_objects.rb).
-
-# This file contains stuff stolen outright from:
-#
-#   rtags.rb - 
-#   ruby-lex.rb - ruby lexcal analizer
-#   ruby-token.rb - ruby tokens 
-#   	by Keiju ISHITSUKA (Nippon Rational Inc.)
-#
-
-require "e2mmap"
-require "irb/slex"
-
-require "rdoc/code_objects"
-require "rdoc/tokenstream"
-
-require "rdoc/markup/simple_markup/preprocess"
-
-require "rdoc/parsers/parserfactory"
-
-$TOKEN_DEBUG = $DEBUG
-
-# Definitions of all tokens involved in the lexical analysis
-
-module RubyToken
-  EXPR_BEG   = :EXPR_BEG
-  EXPR_MID   = :EXPR_MID
-  EXPR_END   = :EXPR_END
-  EXPR_ARG   = :EXPR_ARG
-  EXPR_FNAME = :EXPR_FNAME
-  EXPR_DOT   = :EXPR_DOT
-  EXPR_CLASS = :EXPR_CLASS
-  
-  class Token
-    NO_TEXT = "??".freeze
-    attr :text
-
-    def initialize(line_no, char_no)
-      @line_no = line_no
-      @char_no = char_no
-      @text    = NO_TEXT
-    end
-
-    # Because we're used in contexts that expect to return a token,
-    # we set the text string and then return ourselves
-    def set_text(text)
-      @text = text
-      self
-    end
-
-    attr_reader :line_no, :char_no, :text
-  end
-
-  class TkNode < Token
-    attr :node
-  end
-
-  class TkId < Token
-    def initialize(line_no, char_no, name)
-      super(line_no, char_no)
-      @name = name
-    end
-    attr :name
-  end
-
-  class TkKW < TkId
-  end
-
-  class TkVal < Token
-    def initialize(line_no, char_no, value = nil)
-      super(line_no, char_no)
-      set_text(value)
-    end
-  end
-
-  class TkOp < Token
-    def name
-      self.class.op_name
-    end
-  end
-
-  class TkOPASGN < TkOp
-    def initialize(line_no, char_no, op)
-      super(line_no, char_no)
-      op = TkReading2Token[op] unless op.kind_of?(Symbol)
-      @op = op
-    end
-    attr :op
-  end
-
-  class TkUnknownChar < Token
-    def initialize(line_no, char_no, id)
-      super(line_no, char_no)
-      @name = char_no.chr
-    end
-    attr :name
-  end
-
-  class TkError < Token
-  end
-
-  def set_token_position(line, char)
-    @prev_line_no = line
-    @prev_char_no = char
-  end
-
-  def Token(token, value = nil)
-    tk = nil
-    case token
-    when String, Symbol
-      source = token.kind_of?(String) ? TkReading2Token : TkSymbol2Token
-      if (tk = source[token]).nil?
-	IRB.fail TkReading2TokenNoKey, token
-      end
-      tk = Token(tk[0], value) 
-    else 
-      tk = if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
-             token.new(@prev_line_no, @prev_char_no)
-           else
-             token.new(@prev_line_no, @prev_char_no, value)
-           end
-    end
-    tk
-  end
-
-  TokenDefinitions = [
-    [:TkCLASS,      TkKW,  "class",  EXPR_CLASS],
-    [:TkMODULE,     TkKW,  "module", EXPR_BEG],
-    [:TkDEF,	    TkKW,  "def",    EXPR_FNAME],
-    [:TkUNDEF,      TkKW,  "undef",  EXPR_FNAME],
-    [:TkBEGIN,      TkKW,  "begin",  EXPR_BEG],
-    [:TkRESCUE,     TkKW,  "rescue", EXPR_MID],
-    [:TkENSURE,     TkKW,  "ensure", EXPR_BEG],
-    [:TkEND,	    TkKW,  "end",    EXPR_END],
-    [:TkIF,         TkKW,  "if",     EXPR_BEG, :TkIF_MOD],
-    [:TkUNLESS,     TkKW,  "unless", EXPR_BEG, :TkUNLESS_MOD],
-    [:TkTHEN,	    TkKW,  "then",   EXPR_BEG],
-    [:TkELSIF,      TkKW,  "elsif",  EXPR_BEG],
-    [:TkELSE,	    TkKW,  "else",   EXPR_BEG],
-    [:TkCASE,	    TkKW,  "case",   EXPR_BEG],
-    [:TkWHEN,	    TkKW,  "when",   EXPR_BEG],
-    [:TkWHILE,      TkKW,  "while",  EXPR_BEG, :TkWHILE_MOD],
-    [:TkUNTIL,      TkKW,  "until",  EXPR_BEG, :TkUNTIL_MOD],
-    [:TkFOR,	    TkKW,  "for",    EXPR_BEG],
-    [:TkBREAK,      TkKW,  "break",  EXPR_END],
-    [:TkNEXT,	    TkKW,  "next",   EXPR_END],
-    [:TkREDO,	    TkKW,  "redo",   EXPR_END],
-    [:TkRETRY,      TkKW,  "retry",  EXPR_END],
-    [:TkIN,	    TkKW,  "in",     EXPR_BEG],
-    [:TkDO,	    TkKW,  "do",     EXPR_BEG],
-    [:TkRETURN,     TkKW,  "return", EXPR_MID],
-    [:TkYIELD,      TkKW,  "yield",  EXPR_END],
-    [:TkSUPER,      TkKW,  "super",  EXPR_END],
-    [:TkSELF,	    TkKW,  "self",   EXPR_END],
-    [:TkNIL, 	    TkKW,  "nil",    EXPR_END],
-    [:TkTRUE,	    TkKW,  "true",   EXPR_END],
-    [:TkFALSE,      TkKW,  "false",  EXPR_END],
-    [:TkAND,	    TkKW,  "and",    EXPR_BEG],
-    [:TkOR, 	    TkKW,  "or",     EXPR_BEG],
-    [:TkNOT,	    TkKW,  "not",    EXPR_BEG],
-    [:TkIF_MOD,     TkKW],
-    [:TkUNLESS_MOD, TkKW],
-    [:TkWHILE_MOD,  TkKW],
-    [:TkUNTIL_MOD,  TkKW],
-    [:TkALIAS,      TkKW,  "alias",    EXPR_FNAME],
-    [:TkDEFINED,    TkKW,  "defined?", EXPR_END],
-    [:TklBEGIN,     TkKW,  "BEGIN",    EXPR_END],
-    [:TklEND,	    TkKW,  "END",      EXPR_END],
-    [:Tk__LINE__,   TkKW,  "__LINE__", EXPR_END],
-    [:Tk__FILE__,   TkKW,  "__FILE__", EXPR_END],
-
-    [:TkIDENTIFIER, TkId],
-    [:TkFID,	    TkId],
-    [:TkGVAR,	    TkId],
-    [:TkIVAR,	    TkId],
-    [:TkCONSTANT,   TkId],
-
-    [:TkINTEGER,    TkVal],
-    [:TkFLOAT,      TkVal],
-    [:TkSTRING,     TkVal],
-    [:TkXSTRING,    TkVal],
-    [:TkREGEXP,     TkVal],
-    [:TkCOMMENT,    TkVal],
-
-    [:TkDSTRING,    TkNode],
-    [:TkDXSTRING,   TkNode],
-    [:TkDREGEXP,    TkNode],
-    [:TkNTH_REF,    TkId],
-    [:TkBACK_REF,   TkId],
-
-    [:TkUPLUS,      TkOp,   "+@"],
-    [:TkUMINUS,     TkOp,   "-@"],
-    [:TkPOW,	    TkOp,   "**"],
-    [:TkCMP,	    TkOp,   "<=>"],
-    [:TkEQ,	    TkOp,   "=="],
-    [:TkEQQ,	    TkOp,   "==="],
-    [:TkNEQ,	    TkOp,   "!="],
-    [:TkGEQ,	    TkOp,   ">="],
-    [:TkLEQ,	    TkOp,   "<="],
-    [:TkANDOP,      TkOp,   "&&"],
-    [:TkOROP,	    TkOp,   "||"],
-    [:TkMATCH,      TkOp,   "=~"],
-    [:TkNMATCH,     TkOp,   "!~"],
-    [:TkDOT2,	    TkOp,   ".."],
-    [:TkDOT3,	    TkOp,   "..."],
-    [:TkAREF,	    TkOp,   "[]"],
-    [:TkASET,	    TkOp,   "[]="],
-    [:TkLSHFT,      TkOp,   "<<"],
-    [:TkRSHFT,      TkOp,   ">>"],
-    [:TkCOLON2,     TkOp],
-    [:TkCOLON3,     TkOp],
-#   [:OPASGN,	    TkOp],               # +=, -=  etc. #
-    [:TkASSOC,      TkOp,   "=>"],
-    [:TkQUESTION,   TkOp,   "?"],	 #?
-    [:TkCOLON,      TkOp,   ":"],        #:
-    
-    [:TkfLPAREN],         # func( #
-    [:TkfLBRACK],         # func[ #
-    [:TkfLBRACE],         # func{ #
-    [:TkSTAR],            # *arg
-    [:TkAMPER],           # &arg #
-    [:TkSYMBOL,     TkId],          # :SYMBOL
-    [:TkSYMBEG,     TkId], 
-    [:TkGT,	    TkOp,   ">"],
-    [:TkLT,	    TkOp,   "<"],
-    [:TkPLUS,	    TkOp,   "+"],
-    [:TkMINUS,      TkOp,   "-"],
-    [:TkMULT,	    TkOp,   "*"],
-    [:TkDIV,	    TkOp,   "/"],
-    [:TkMOD,	    TkOp,   "%"],
-    [:TkBITOR,      TkOp,   "|"],
-    [:TkBITXOR,     TkOp,   "^"],
-    [:TkBITAND,     TkOp,   "&"],
-    [:TkBITNOT,     TkOp,   "~"],
-    [:TkNOTOP,      TkOp,   "!"],
-
-    [:TkBACKQUOTE,  TkOp,   "`"],
-
-    [:TkASSIGN,     Token,  "="],
-    [:TkDOT,	    Token,  "."],
-    [:TkLPAREN,     Token,  "("],  #(exp)
-    [:TkLBRACK,     Token,  "["],  #[arry]
-    [:TkLBRACE,     Token,  "{"],  #{hash}
-    [:TkRPAREN,     Token,  ")"],
-    [:TkRBRACK,     Token,  "]"],
-    [:TkRBRACE,     Token,  "}"],
-    [:TkCOMMA,      Token,  ","],
-    [:TkSEMICOLON,  Token,  ";"],
-
-    [:TkRD_COMMENT],
-    [:TkSPACE],
-    [:TkNL],
-    [:TkEND_OF_SCRIPT],
-
-    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
-    [:TkAT,	    TkUnknownChar,  "@"],
-    [:TkDOLLAR,     TkUnknownChar,  "\$"], #"
-  ]
-
-  # {reading => token_class}
-  # {reading => [token_class, *opt]}
-  TkReading2Token = {}
-  TkSymbol2Token = {}
-
-  def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
-    token_n = token_n.id2name unless token_n.kind_of?(String)
-    if RubyToken.const_defined?(token_n)
-      IRB.fail AlreadyDefinedToken, token_n
-    end
-
-    token_c =  Class.new super_token
-    RubyToken.const_set token_n, token_c
-#    token_c.inspect
- 
-    if reading
-      if TkReading2Token[reading]
-	IRB.fail TkReading2TokenDuplicateError, token_n, reading
-      end
-      if opts.empty?
-	TkReading2Token[reading] = [token_c]
-      else
-	TkReading2Token[reading] = [token_c].concat(opts)
-      end
-    end
-    TkSymbol2Token[token_n.intern] = token_c
-
-    if token_c <= TkOp
-      token_c.class_eval %{
-        def self.op_name; "#{reading}"; end
-      }
-    end
-  end
-
-  for defs in TokenDefinitions
-    def_token(*defs)
-  end
-
-  NEWLINE_TOKEN = TkNL.new(0,0)
-  NEWLINE_TOKEN.set_text("\n")
-
-end
-
-
-
-# Lexical analyzer for Ruby source
-
-class RubyLex
-
-  ######################################################################
-  #
-  # Read an input stream character by character. We allow for unlimited
-  # ungetting of characters just read.
-  #
-  # We simplify the implementation greatly by reading the entire input
-  # into a buffer initially, and then simply traversing it using
-  # pointers.
-  #
-  # We also have to allow for the <i>here document diversion</i>. This
-  # little gem comes about when the lexer encounters a here
-  # document. At this point we effectively need to split the input
-  # stream into two parts: one to read the body of the here document,
-  # the other to read the rest of the input line where the here
-  # document was initially encountered. For example, we might have
-  #
-  #   do_something(<<-A, <<-B)
-  #     stuff
-  #     for
-  #   A
-  #     stuff
-  #     for
-  #   B
-  #
-  # When the lexer encounters the <<A, it reads until the end of the
-  # line, and keeps it around for later. It then reads the body of the
-  # here document.  Once complete, it needs to read the rest of the
-  # original line, but then skip the here document body.
-  #
-  
-  class BufferedReader
-    
-    attr_reader :line_num
-    
-    def initialize(content)
-      if /\t/ =~ content
-        tab_width = Options.instance.tab_width
-        content = content.split(/\n/).map do |line|
-          1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)}  && $~ #`
-          line
-        end .join("\n")
-      end
-      @content   = content
-      @content << "\n" unless @content[-1,1] == "\n"
-      @size      = @content.size
-      @offset    = 0
-      @hwm       = 0
-      @line_num  = 1
-      @read_back_offset = 0
-      @last_newline = 0
-      @newline_pending = false
-    end
-    
-    def column
-      @offset - @last_newline
-    end
-    
-    def getc
-      return nil if @offset >= @size
-      ch = @content[@offset, 1]
-      
-      @offset += 1
-      @hwm = @offset if @hwm < @offset
-      
-      if @newline_pending
-        @line_num += 1
-        @last_newline = @offset - 1
-        @newline_pending = false
-      end
-      
-      if ch == "\n"
-        @newline_pending = true
-      end
-      ch
-    end
-    
-    def getc_already_read
-      getc
-    end
-    
-    def ungetc(ch)
-      raise "unget past beginning of file" if @offset <= 0
-      @offset -= 1
-      if @content[@offset] == ?\n
-        @newline_pending = false
-      end
-    end
-    
-    def get_read
-      res = @content[@read_back_offset...@offset]
-      @read_back_offset = @offset
-      res
-    end
-    
-    def peek(at)
-      pos = @offset + at
-      if pos >= @size
-        nil
-      else
-        @content[pos, 1]
-      end
-    end
-    
-    def peek_equal(str)
-      @content[@offset, str.length] == str
-    end
-    
-    def divert_read_from(reserve)
-      @content[@offset, 0] = reserve
-      @size      = @content.size
-    end
-  end
-
-  # end of nested class BufferedReader
-
-  extend Exception2MessageMapper
-  def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
-  def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
-  def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
-  def_exception(:TkReading2TokenDuplicateError, 
-		"key duplicate(token_n='%s', key='%s')")
-  def_exception(:SyntaxError, "%s")
-  
-  include RubyToken
-  include IRB
-
-  attr_reader :continue
-  attr_reader :lex_state
-
-  def RubyLex.debug?
-    false
-  end
-
-  def initialize(content)
-    lex_init
-
-    @reader = BufferedReader.new(content)
-
-    @exp_line_no = @line_no = 1
-    @base_char_no = 0
-    @indent = 0
-
-    @ltype = nil
-    @quoted = nil
-    @lex_state = EXPR_BEG
-    @space_seen = false
-    
-    @continue = false
-    @line = ""
-
-    @skip_space = false
-    @read_auto_clean_up = false
-    @exception_on_syntax_error = true
-  end
-
-  attr :skip_space, true
-  attr :read_auto_clean_up, true
-  attr :exception_on_syntax_error, true
-
-  attr :indent
-
-  # io functions
-  def line_no
-    @reader.line_num
-  end
-
-  def char_no
-    @reader.column
-  end
-
-  def get_read
-    @reader.get_read
-  end
-
-  def getc
-    @reader.getc
-  end
-
-  def getc_of_rests
-    @reader.getc_already_read
-  end
-
-  def gets
-    c = getc or return
-    l = ""
-    begin
-      l.concat c unless c == "\r"
-      break if c == "\n"
-    end while c = getc
-    l
-  end
-
-
-  def ungetc(c = nil)
-    @reader.ungetc(c)
-  end
-
-  def peek_equal?(str)
-    @reader.peek_equal(str)
-  end
-
-  def peek(i = 0)
-    @reader.peek(i)
-  end
-
-  def lex
-    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
-	     !@continue or
-	     tk.nil?)
-    end
-    line = get_read
-
-    if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
-      nil
-    else
-      line
-    end
-  end
-
-  def token
-    set_token_position(line_no, char_no)
-    begin
-      begin
-	tk = @OP.match(self)
-	@space_seen = tk.kind_of?(TkSPACE)
-      rescue SyntaxError
-	abort if @exception_on_syntax_error
-	tk = TkError.new(line_no, char_no)
-      end
-    end while @skip_space and tk.kind_of?(TkSPACE)
-    if @read_auto_clean_up
-      get_read
-    end
-#   throw :eof unless tk
-    p tk if $DEBUG
-    tk
-  end
-  
-  ENINDENT_CLAUSE = [
-    "case", "class", "def", "do", "for", "if",
-    "module", "unless", "until", "while", "begin" #, "when"
-  ]
-  DEINDENT_CLAUSE = ["end" #, "when"
-  ]
-
-  PERCENT_LTYPE = {
-    "q" => "\'",
-    "Q" => "\"",
-    "x" => "\`",
-    "r" => "/",
-    "w" => "]"
-  }
-  
-  PERCENT_PAREN = {
-    "{" => "}",
-    "[" => "]",
-    "<" => ">",
-    "(" => ")"
-  }
-
-  Ltype2Token = {
-    "\'" => TkSTRING,
-    "\"" => TkSTRING,
-    "\`" => TkXSTRING,
-    "/" => TkREGEXP,
-    "]" => TkDSTRING
-  }
-  Ltype2Token.default = TkSTRING
-
-  DLtype2Token = {
-    "\"" => TkDSTRING,
-    "\`" => TkDXSTRING,
-    "/" => TkDREGEXP,
-  }
-
-  def lex_init()
-    @OP = SLex.new
-    @OP.def_rules("\0", "\004", "\032") do |chars, io|
-      Token(TkEND_OF_SCRIPT).set_text(chars)
-    end
-
-    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, io|
-      @space_seen = TRUE
-      while (ch = getc) =~ /[ \t\f\r\13]/
-        chars << ch
-      end
-      ungetc
-      Token(TkSPACE).set_text(chars)
-    end
-
-    @OP.def_rule("#") do
-      |op, io|
-      identify_comment
-    end
-
-    @OP.def_rule("=begin", proc{@prev_char_no == 0 && peek(0) =~ /\s/}) do
-      |op, io|
-      str = op
-      @ltype = "="
-
-
-      begin
-        line = ""
-        begin
-          ch = getc
-          line << ch
-        end until ch == "\n"
-        str << line
-      end until line =~ /^=end/
-
-      ungetc
-
-      @ltype = nil
-
-      if str =~ /\A=begin\s+rdoc/i
-        str.sub!(/\A=begin.*\n/, '')
-        str.sub!(/^=end.*/m, '')
-        Token(TkCOMMENT).set_text(str)
-      else
-        Token(TkRD_COMMENT)#.set_text(str)
-      end
-    end
-
-    @OP.def_rule("\n") do
-      print "\\n\n" if RubyLex.debug?
-      case @lex_state
-      when EXPR_BEG, EXPR_FNAME, EXPR_DOT
-	@continue = TRUE
-      else
-	@continue = FALSE
-	@lex_state = EXPR_BEG
-      end
-      Token(TkNL).set_text("\n")
-    end
-
-    @OP.def_rules("*", "**",	
-		  "!", "!=", "!~",
-		  "=", "==", "===", 
-		  "=~", "<=>",	
-		  "<", "<=",
-		  ">", ">=", ">>") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op).set_text(op)
-    end
-
-    @OP.def_rules("<<") do
-      |op, io|
-      tk = nil
-      if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
-	  (@lex_state != EXPR_ARG || @space_seen)
-	c = peek(0)
-	if /[-\w_\"\'\`]/ =~ c
-	  tk = identify_here_document
-	end
-      end
-      if !tk
-        @lex_state = EXPR_BEG
-        tk = Token(op).set_text(op)
-      end
-      tk
-    end
-
-    @OP.def_rules("'", '"') do
-      |op, io|
-      identify_string(op)
-    end
-
-    @OP.def_rules("`") do
-      |op, io|
-      if @lex_state == EXPR_FNAME
-	Token(op).set_text(op)
-      else
-	identify_string(op)
-      end
-    end
-
-    @OP.def_rules('?') do
-      |op, io|
-      if @lex_state == EXPR_END
-	@lex_state = EXPR_BEG
-	Token(TkQUESTION).set_text(op)
-      else
-	ch = getc
-	if @lex_state == EXPR_ARG && ch !~ /\s/
-	  ungetc
-	  @lex_state = EXPR_BEG;
-	  Token(TkQUESTION).set_text(op)
-	else
-          str = op
-          str << ch
-	  if (ch == '\\') #'
-	    str << read_escape
-	  end
-	  @lex_state = EXPR_END
-	  Token(TkINTEGER).set_text(str)
-	end
-      end
-    end
-
-    @OP.def_rules("&", "&&", "|", "||") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op).set_text(op)
-    end
-    
-    @OP.def_rules("+=", "-=", "*=", "**=", 
-		  "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      op =~ /^(.*)=$/
-      Token(TkOPASGN, $1).set_text(op)
-    end
-
-    @OP.def_rule("+@", proc{@lex_state == EXPR_FNAME}) do |op, io|
-      Token(TkUPLUS).set_text(op)
-    end
-
-    @OP.def_rule("-@", proc{@lex_state == EXPR_FNAME}) do |op, io|
-      Token(TkUMINUS).set_text(op)
-    end
-
-    @OP.def_rules("+", "-") do
-      |op, io|
-      catch(:RET) do
-	if @lex_state == EXPR_ARG
-	  if @space_seen and peek(0) =~ /[0-9]/
-	    throw :RET, identify_number(op)
-	  else
-	    @lex_state = EXPR_BEG
-	  end
-	elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
-	  throw :RET, identify_number(op)
-	else
-	  @lex_state = EXPR_BEG
-	end
-	Token(op).set_text(op)
-      end
-    end
-
-    @OP.def_rule(".") do
-      @lex_state = EXPR_BEG
-      if peek(0) =~ /[0-9]/
-	ungetc
-	identify_number("")
-      else
-	# for obj.if
-	@lex_state = EXPR_DOT
-	Token(TkDOT).set_text(".")
-      end
-    end
-
-    @OP.def_rules("..", "...") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op).set_text(op)
-    end
-
-    lex_int2
-  end
-  
-  def lex_int2
-    @OP.def_rules("]", "}", ")") do
-      |op, io|
-      @lex_state = EXPR_END
-      @indent -= 1
-      Token(op).set_text(op)
-    end
-
-    @OP.def_rule(":") do
-      if @lex_state == EXPR_END || peek(0) =~ /\s/
-	@lex_state = EXPR_BEG
-	tk = Token(TkCOLON)
-      else
-	@lex_state = EXPR_FNAME;
-	tk = Token(TkSYMBEG)
-      end
-      tk.set_text(":")
-    end
-
-    @OP.def_rule("::") do
-#      p @lex_state.id2name, @space_seen
-      if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
-	@lex_state = EXPR_BEG
-	tk = Token(TkCOLON3)
-      else
-	@lex_state = EXPR_DOT
-	tk = Token(TkCOLON2)
-      end
-      tk.set_text("::")
-    end
-
-    @OP.def_rule("/") do
-      |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	identify_string(op)
-      elsif peek(0) == '='
-	getc
-	@lex_state = EXPR_BEG
-	Token(TkOPASGN, :/).set_text("/=") #")
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
-	identify_string(op)
-      else 
-	@lex_state = EXPR_BEG
-        Token("/").set_text(op)
-      end
-    end
-
-    @OP.def_rules("^") do
-      @lex_state = EXPR_BEG
-      Token("^").set_text("^")
-    end
-
-    #       @OP.def_rules("^=") do
-    # 	@lex_state = EXPR_BEG
-    # 	Token(TkOPASGN, :^)
-    #       end
-    
-    @OP.def_rules(",", ";") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op).set_text(op)
-    end
-
-    @OP.def_rule("~") do
-      @lex_state = EXPR_BEG
-      Token("~").set_text("~")
-    end
-
-    @OP.def_rule("~@", proc{@lex_state = EXPR_FNAME}) do
-      @lex_state = EXPR_BEG
-      Token("~").set_text("~@")
-    end
-    
-    @OP.def_rule("(") do
-      @indent += 1
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	@lex_state = EXPR_BEG
-	tk = Token(TkfLPAREN)
-      else
-	@lex_state = EXPR_BEG
-	tk = Token(TkLPAREN)
-      end
-      tk.set_text("(")
-    end
-
-    @OP.def_rule("[]", proc{@lex_state == EXPR_FNAME}) do
-      Token("[]").set_text("[]")
-    end
-
-    @OP.def_rule("[]=", proc{@lex_state == EXPR_FNAME}) do
-      Token("[]=").set_text("[]=")
-    end
-
-    @OP.def_rule("[") do
-      @indent += 1
-      if @lex_state == EXPR_FNAME
-	t = Token(TkfLBRACK)
-      else
-	if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	  t = Token(TkLBRACK)
-	elsif @lex_state == EXPR_ARG && @space_seen
-	  t = Token(TkLBRACK)
-	else
-	  t = Token(TkfLBRACK)
-	end
-	@lex_state = EXPR_BEG
-      end
-      t.set_text("[")
-    end
-
-    @OP.def_rule("{") do
-      @indent += 1
-      if @lex_state != EXPR_END && @lex_state != EXPR_ARG
-	t = Token(TkLBRACE)
-      else
-	t = Token(TkfLBRACE)
-      end
-      @lex_state = EXPR_BEG
-      t.set_text("{")
-    end
-
-    @OP.def_rule('\\') do   #'
-      if getc == "\n" 
-	@space_seen = true
-	@continue = true
-	Token(TkSPACE).set_text("\\\n")
-      else 
-	ungetc
-	Token("\\").set_text("\\")  #"
-      end 
-    end 
-
-    @OP.def_rule('%') do
-      |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	identify_quotation('%')
-      elsif peek(0) == '='
-	getc
-	Token(TkOPASGN, "%").set_text("%=")
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
-	identify_quotation('%')
-      else
-	@lex_state = EXPR_BEG
-	Token("%").set_text("%")
-      end
-    end
-
-    @OP.def_rule('$') do  #'
-      identify_gvar
-    end
-
-    @OP.def_rule('@') do
-      if peek(0) =~ /[@\w_]/
-	ungetc
-	identify_identifier
-      else
-	Token("@").set_text("@")
-      end
-    end
-
-    #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do 
-    # 	|op, io|
-    # 	@indent += 1
-    # 	@lex_state = EXPR_FNAME
-    # #	@lex_state = EXPR_END
-    # #	until @rests[0] == "\n" or @rests[0] == ";"
-    # #	  rests.shift
-    # #	end
-    #       end
-
-    @OP.def_rule("__END__", proc{@prev_char_no == 0 && peek(0) =~ /[\r\n]/}) do
-      throw :eof
-    end
-
-    @OP.def_rule("") do
-      |op, io|
-      printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
-      if peek(0) =~ /[0-9]/
-	t = identify_number("")
-      elsif peek(0) =~ /[\w_]/
-	t = identify_identifier
-      end
-      printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
-      t
-    end
-    
-    p @OP if RubyLex.debug?
-  end
-  
-  def identify_gvar
-    @lex_state = EXPR_END
-    str = "$"
-
-    tk = case ch = getc
-         when /[~_*$?!@\/\\;,=:<>".]/   #"
-           str << ch
-           Token(TkGVAR, str)
-           
-         when "-"
-           str << "-" << getc
-           Token(TkGVAR, str)
-           
-         when "&", "`", "'", "+"
-           str << ch
-           Token(TkBACK_REF, str)
-           
-         when /[1-9]/
-           str << ch
-           while (ch = getc) =~ /[0-9]/
-             str << ch
-           end
-           ungetc
-           Token(TkNTH_REF)
-         when /\w/
-           ungetc
-           ungetc
-           return identify_identifier
-         else 
-           ungetc
-           Token("$")     
-         end
-    tk.set_text(str)
-  end
-  
-  def identify_identifier
-    token = ""
-    token.concat getc if peek(0) =~ /[$@]/
-    token.concat getc if peek(0) == "@"
-
-    while (ch = getc) =~ /\w|_/
-      print ":", ch, ":" if RubyLex.debug?
-      token.concat ch
-    end
-    ungetc
-    
-    if ch == "!" or ch == "?"
-      token.concat getc
-    end
-    # fix token
-
-    # $stderr.puts "identifier - #{token}, state = #@lex_state"
-
-    case token
-    when /^\$/
-      return Token(TkGVAR, token).set_text(token)
-    when /^\@/
-      @lex_state = EXPR_END
-      return Token(TkIVAR, token).set_text(token)
-    end
-    
-    if @lex_state != EXPR_DOT
-      print token, "\n" if RubyLex.debug?
-
-      token_c, *trans = TkReading2Token[token]
-      if token_c
-	# reserved word?
-
-	if (@lex_state != EXPR_BEG &&
-	    @lex_state != EXPR_FNAME &&
-	    trans[1])
-	  # modifiers
-	  token_c = TkSymbol2Token[trans[1]]
-	  @lex_state = trans[0]
-	else
-	  if @lex_state != EXPR_FNAME
-	    if ENINDENT_CLAUSE.include?(token)
-	      @indent += 1
-	    elsif DEINDENT_CLAUSE.include?(token)
-	      @indent -= 1
-	    end
-	    @lex_state = trans[0]
-	  else
-	    @lex_state = EXPR_END
-	  end
-	end
-	return Token(token_c, token).set_text(token)
-      end
-    end
-
-    if @lex_state == EXPR_FNAME
-      @lex_state = EXPR_END
-      if peek(0) == '='
-	token.concat getc
-      end
-    elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
-      @lex_state = EXPR_ARG
-    else
-      @lex_state = EXPR_END
-    end
-
-    if token[0, 1] =~ /[A-Z]/
-      return Token(TkCONSTANT, token).set_text(token)
-    elsif token[token.size - 1, 1] =~ /[!?]/
-      return Token(TkFID, token).set_text(token)
-    else
-      return Token(TkIDENTIFIER, token).set_text(token)
-    end
-  end
-
-  def identify_here_document
-    ch = getc
-    if ch == "-"
-      ch = getc
-      indent = true
-    end
-    if /['"`]/ =~ ch            # '
-      lt = ch
-      quoted = ""
-      while (c = getc) && c != lt
-	quoted.concat c
-      end
-    else
-      lt = '"'
-      quoted = ch.dup
-      while (c = getc) && c =~ /\w/
-	quoted.concat c
-      end
-      ungetc
-    end
-
-    ltback, @ltype = @ltype, lt
-    reserve = ""
-
-    while ch = getc
-      reserve << ch
-      if ch == "\\"    #"
-        ch = getc
-	reserve << ch
-      elsif ch == "\n"
-	break
-      end
-    end
-
-    str = ""
-    while (l = gets)
-      l.chomp!
-      l.strip! if indent
-      break if l == quoted
-      str << l.chomp << "\n"
-    end
-
-    @reader.divert_read_from(reserve)
-
-    @ltype = ltback
-    @lex_state = EXPR_END
-    Token(Ltype2Token[lt], str).set_text(str.dump)
-  end
-  
-  def identify_quotation(initial_char)
-    ch = getc
-    if lt = PERCENT_LTYPE[ch]
-      initial_char += ch
-      ch = getc
-    elsif ch =~ /\W/
-      lt = "\""
-    else
-      RubyLex.fail SyntaxError, "unknown type of %string ('#{ch}')"
-    end
-#     if ch !~ /\W/
-#       ungetc
-#       next
-#     end
-    #@ltype = lt
-    @quoted = ch unless @quoted = PERCENT_PAREN[ch]
-    identify_string(lt, @quoted, ch, initial_char)
-  end
-
-  def identify_number(start)
-    str = start.dup
-
-    if start == "+" or start == "-" or start == ""
-      start = getc
-      str << start
-    end
-
-    @lex_state = EXPR_END
-
-    if start == "0"
-      if peek(0) == "x"
-        ch = getc
-        str << ch
-        match = /[0-9a-f_]/
-      else
-        match = /[0-7_]/
-      end
-      while ch = getc
-        if ch !~ match
-          ungetc
-          break
-        else
-          str << ch
-        end
-      end
-      return Token(TkINTEGER).set_text(str)
-    end
-
-    type = TkINTEGER
-    allow_point = TRUE
-    allow_e = TRUE
-    while ch = getc
-      case ch
-      when /[0-9_]/
-        str << ch
-
-      when allow_point && "."
-	type = TkFLOAT
-	if peek(0) !~ /[0-9]/
-	  ungetc
-	  break
-	end
-        str << ch
-	allow_point = false
-
-      when allow_e && "e", allow_e && "E"
-        str << ch
-	type = TkFLOAT
-	if peek(0) =~ /[+-]/
-	  str << getc
-	end
-	allow_e = false
-	allow_point = false
-      else
-	ungetc
-	break
-      end
-    end
-    Token(type).set_text(str)
-  end
-  
-  def identify_string(ltype, quoted = ltype, opener=nil, initial_char = nil)
-    @ltype = ltype
-    @quoted = quoted
-    subtype = nil
-
-    str = ""
-    str << initial_char if initial_char
-    str << (opener||quoted)
-
-    nest = 0
-    begin
-      while ch = getc 
-	str << ch
-	if @quoted == ch 
-          if nest == 0
-            break
-          else
-            nest -= 1
-          end
-        elsif opener == ch
-          nest += 1
-	elsif @ltype != "'" && @ltype != "]" and ch == "#"
-          ch = getc
-          if ch == "{"
-            subtype = true
-            str << ch << skip_inner_expression
-          else
-            ungetc(ch)
-          end
-	elsif ch == '\\' #'
-	  str << read_escape
-	end
-      end
-      if @ltype == "/"
-	if peek(0) =~ /i|o|n|e|s/
-	  str << getc
-	end
-      end
-      if subtype
-	Token(DLtype2Token[ltype], str)
-      else
-	Token(Ltype2Token[ltype], str)
-      end.set_text(str)
-    ensure
-      @ltype = nil
-      @quoted = nil
-      @lex_state = EXPR_END
-    end
-  end
-
-  def skip_inner_expression
-    res = ""
-    nest = 0
-    while (ch = getc)
-      res << ch
-      if ch == '}'
-        break if nest.zero?
-        nest -= 1
-      elsif ch == '{'
-        nest += 1
-      end
-    end
-    res
-  end
-
-  def identify_comment
-    @ltype = "#"
-    comment = "#"
-    while ch = getc
-      if ch == "\\"
-        ch = getc
-        if ch == "\n"
-          ch = " "
-        else
-          comment << "\\" 
-        end
-      else
-        if ch == "\n"
-          @ltype = nil
-          ungetc
-          break
-        end
-      end
-      comment << ch
-    end
-    return Token(TkCOMMENT).set_text(comment)
-  end
-  
-  def read_escape
-    res = ""
-    case ch = getc
-    when /[0-7]/
-      ungetc ch
-      3.times do
-	case ch = getc
-	when /[0-7]/
-	when nil
-	  break
-	else
-	  ungetc
-	  break
-	end
-        res << ch
-      end
-      
-    when "x"
-      res << ch
-      2.times do
-	case ch = getc
-	when /[0-9a-fA-F]/
-	when nil
-	  break
-	else
-	  ungetc
-	  break
-	end
-        res << ch
-      end
-
-    when "M"
-      res << ch
-      if (ch = getc) != '-'
-	ungetc
-      else
-        res << ch
-	if (ch = getc) == "\\" #"
-          res << ch
-	  res << read_escape
-        else
-          res << ch
-	end
-      end
-
-    when "C", "c" #, "^"
-      res << ch
-      if ch == "C" and (ch = getc) != "-"
-	ungetc
-      else
-        res << ch
-        if (ch = getc) == "\\" #"
-          res << ch
-          res << read_escape
-        else
-          res << ch
-        end
-      end
-    else
-      res << ch
-    end
-    res
-  end
-end
-
-
-
-# Extract code elements from a source file, returning a TopLevel
-# object containing the constituent file elements.
-#
-# This file is based on rtags
-
-module RDoc
-
-  GENERAL_MODIFIERS = [ 'nodoc' ].freeze
-
-  CLASS_MODIFIERS = GENERAL_MODIFIERS
-
-  ATTR_MODIFIERS  = GENERAL_MODIFIERS
-
-  CONSTANT_MODIFIERS = GENERAL_MODIFIERS
-
-  METHOD_MODIFIERS = GENERAL_MODIFIERS + 
-    [ 'arg', 'args', 'yield', 'yields', 'notnew', 'not-new', 'not_new', 'doc' ]
-
-
-  class RubyParser
-    include RubyToken
-    include TokenStream
-
-    extend ParserFactory
-
-    parse_files_matching(/\.rbw?$/)
-
-
-    def initialize(top_level, file_name, content, options, stats)
-      @options = options
-      @stats   = stats
-      @size = 0
-      @token_listeners = nil
-      @input_file_name = file_name
-      @scanner = RubyLex.new(content)
-      @scanner.exception_on_syntax_error = false
-      @top_level = top_level
-      @progress = $stderr unless options.quiet
-    end
-
-    def scan
-      @tokens = []
-      @unget_read = []
-      @read = []
-      catch(:eof) do
-        catch(:enddoc) do
-          begin
-            parse_toplevel_statements(@top_level)
-          rescue Exception => e
-            $stderr.puts "\n\n"
-            $stderr.puts "RDoc failure in #@input_file_name at or around " +
-                         "line #{@scanner.line_no} column #{@scanner.char_no}"
-            $stderr.puts 
-            $stderr.puts "Before reporting this, could you check that the file"
-            $stderr.puts "you're documenting compiles cleanly--RDoc is not a"
-            $stderr.puts "full Ruby parser, and gets confused easily if fed"
-            $stderr.puts "invalid programs."
-            $stderr.puts
-            $stderr.puts "The internal error was:\n\n"
-            
-            e.set_backtrace(e.backtrace[0,4])
-            raise
-          end
-        end
-      end
-      @top_level
-    end
-
-    private 
-
-    def make_message(msg)
-      prefix = "\n" + @input_file_name + ":"
-      if @scanner
-        prefix << "#{@scanner.line_no}:#{@scanner.char_no}: "
-      end
-      return prefix + msg
-    end
-
-    def warn(msg)
-      return if @options.quiet
-      msg = make_message msg
-      $stderr.puts msg
-    end
-
-    def error(msg)
-      msg = make_message msg
-      $stderr.puts msg
-      exit(1)
-    end
-
-    def progress(char)
-      unless @options.quiet
-        @progress.print(char)
-	@progress.flush
-      end
-    end
-
-    def add_token_listener(obj)
-      @token_listeners ||= []
-      @token_listeners << obj
-    end
-
-    def remove_token_listener(obj)
-      @token_listeners.delete(obj)
-    end
-
-    def get_tk
-      tk = nil
-      if @tokens.empty?
-	tk = @scanner.token
-	@read.push @scanner.get_read
-	puts "get_tk1 => #{tk.inspect}" if $TOKEN_DEBUG
-      else
-	@read.push @unget_read.shift
-	tk = @tokens.shift
-	puts "get_tk2 => #{tk.inspect}" if $TOKEN_DEBUG
-      end
-
-      if tk.kind_of?(TkSYMBEG)
-        set_token_position(tk.line_no, tk.char_no)
-        tk1 = get_tk
-        if tk1.kind_of?(TkId) || tk1.kind_of?(TkOp)
-          tk = Token(TkSYMBOL).set_text(":" + tk1.name)
-          # remove the identifier we just read (we're about to
-          # replace it with a symbol)
-          @token_listeners.each do |obj|
-            obj.pop_token
-          end if @token_listeners
-        else
-          warn("':' not followed by identifier or operator")
-          tk = tk1
-        end
-      end
-
-      # inform any listeners of our shiny new token
-      @token_listeners.each do |obj|
-        obj.add_token(tk)
-      end if @token_listeners
-
-      tk
-    end
-
-    def peek_tk
-      unget_tk(tk = get_tk)
-      tk
-    end
-
-    def unget_tk(tk)
-      @tokens.unshift tk
-      @unget_read.unshift @read.pop
-
-      # Remove this token from any listeners
-      @token_listeners.each do |obj|
-        obj.pop_token
-      end if @token_listeners
-    end
-
-    def skip_tkspace(skip_nl = true)
-      tokens = []
-      while ((tk = get_tk).kind_of?(TkSPACE) ||
-	     (skip_nl && tk.kind_of?(TkNL)))
-	tokens.push tk
-      end
-      unget_tk(tk)
-      tokens
-    end
-
-    def get_tkread
-      read = @read.join("")
-      @read = []
-      read
-    end
-
-    def peek_read
-      @read.join('')
-    end
-
-    NORMAL = "::"
-    SINGLE = "<<"
-
-    # Look for the first comment in a file that isn't
-    # a shebang line.
-
-    def collect_first_comment
-      skip_tkspace
-      res = ''
-      first_line = true
-
-      tk = get_tk
-      while tk.kind_of?(TkCOMMENT)
-        if first_line && tk.text[0,2] == "#!"
-          skip_tkspace
-          tk = get_tk
-        else
-          res << tk.text << "\n"
-          tk = get_tk
-          if tk.kind_of? TkNL
-            skip_tkspace(false)
-            tk = get_tk
-          end
-        end
-        first_line = false
-      end
-      unget_tk(tk)
-      res
-    end
-
-    def parse_toplevel_statements(container)
-      comment = collect_first_comment
-      look_for_directives_in(container, comment)
-      container.comment = comment unless comment.empty?
-      parse_statements(container, NORMAL, nil, comment)
-    end
-    
-    def parse_statements(container, single=NORMAL, current_method=nil, comment='')
-      nest = 1
-      save_visibility = container.visibility
-      
-#      if container.kind_of?(TopLevel)
-#      else
-#        comment = ''
-#      end
-
-      non_comment_seen = true
-      
-      while tk = get_tk
-        
-        keep_comment = false
-        
-        non_comment_seen = true unless tk.kind_of?(TkCOMMENT)
-        
-	case tk
-
-        when TkNL
-          skip_tkspace(true)   # Skip blanks and newlines
-          tk = get_tk
-          if tk.kind_of?(TkCOMMENT)
-            if non_comment_seen
-              comment = ''
-              non_comment_seen = false
-            end
-            while tk.kind_of?(TkCOMMENT)
-              comment << tk.text << "\n"
-              tk = get_tk          # this is the newline 
-              skip_tkspace(false)  # leading spaces
-              tk = get_tk
-            end
-            unless comment.empty?
-              look_for_directives_in(container, comment) 
-              if container.done_documenting
-                container.ongoing_visibility = save_visibility
-#                return
-              end
-            end
-            keep_comment = true
-          else
-            non_comment_seen = true
-          end
-          unget_tk(tk)
-          keep_comment = true
-
-
-	when TkCLASS
-	  if container.document_children
-            parse_class(container, single, tk, comment)
-	  else
-	    nest += 1
-          end
-
-	when TkMODULE
-	  if container.document_children
-            parse_module(container, single, tk, comment)
-	  else
-	    nest += 1
-          end
-
-	when TkDEF
-	  if container.document_self
-	    parse_method(container, single, tk, comment)
-	  else
-	    nest += 1
-          end
-
-        when TkCONSTANT
-          if container.document_self
-            parse_constant(container, single, tk, comment)
-          end
-
-	when TkALIAS
- 	  if container.document_self
-	    parse_alias(container, single, tk, comment)
-	  end
-
-        when TkYIELD
-          if current_method.nil?
-            warn("Warning: yield outside of method") if container.document_self
-          else
-            parse_yield(container, single, tk, current_method)
-          end
-
-          # Until and While can have a 'do', which shouldn't increas
-          # the nesting. We can't solve the general case, but we can
-          # handle most occurrences by ignoring a do at the end of a line
-
-        when  TkUNTIL, TkWHILE
-          nest += 1
-          puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
-            "line #{tk.line_no}" if $DEBUG
-          skip_optional_do_after_expression
-
-          # 'for' is trickier
-        when TkFOR
-          nest += 1
-          puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
-            "line #{tk.line_no}" if $DEBUG
-          skip_for_variable
-          skip_optional_do_after_expression
-
-	when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN
-	  nest += 1
-          puts "Found #{tk.class} in #{container.name}, nest = #{nest}, " +
-            "line #{tk.line_no}" if $DEBUG
-
-	when TkIDENTIFIER
-          if nest == 1 and current_method.nil?
-            case tk.name
-            when "private", "protected", "public",
-                 "private_class_method", "public_class_method"
-              parse_visibility(container, single, tk)
-              keep_comment = true
-            when "attr"
-              parse_attr(container, single, tk, comment)
-            when /^attr_(reader|writer|accessor)$/, @options.extra_accessors
-              parse_attr_accessor(container, single, tk, comment)
-            when "alias_method"
-              if container.document_self
-	        parse_alias(container, single, tk, comment)
-	      end
-            end
-	  end
-	  
-	  case tk.name
-	  when "require"
-	    parse_require(container, comment)
-	  when "include"
-	    parse_include(container, comment)
-	  end
-
-
-	when TkEND
-          nest -= 1
-          puts "Found 'end' in #{container.name}, nest = #{nest}, line #{tk.line_no}" if $DEBUG
-          puts "Method = #{current_method.name}" if $DEBUG and current_method
-	  if nest == 0
-            read_documentation_modifiers(container, CLASS_MODIFIERS)
-            container.ongoing_visibility = save_visibility
-            return
-          end
-
-	end
-
-        comment = '' unless keep_comment
-	begin
-	  get_tkread
-	  skip_tkspace(false)
-	end while peek_tk == TkNL
-
-      end
-    end
-    
-    def parse_class(container, single, tk, comment, &block)
-      progress("c")
-
-      @stats.num_classes += 1
-
-      container, name_t = get_class_or_module(container)
-
-      case name_t
-      when TkCONSTANT
-	name = name_t.name
-        superclass = "Object"
-
-        if peek_tk.kind_of?(TkLT)
-          get_tk
-          skip_tkspace(true)
-          superclass = get_class_specification
-          superclass = "<unknown>" if superclass.empty?
-        end
-
-	if single == SINGLE
-	  cls_type = SingleClass
-	else
-	  cls_type = NormalClass
-	end
-
-        cls = container.add_class(cls_type, name, superclass)
-        read_documentation_modifiers(cls, CLASS_MODIFIERS)
-        cls.record_location(@top_level)
-	parse_statements(cls)
-        cls.comment = comment
-
-      when TkLSHFT
-	case name = get_class_specification
-	when "self", container.name
-	  parse_statements(container, SINGLE, &block)
-	else
-          other = TopLevel.find_class_named(name)
-          unless other
-#            other = @top_level.add_class(NormalClass, name, nil)
-#            other.record_location(@top_level)
-#            other.comment = comment
-            other = NormalClass.new("Dummy", nil)
-          end
-          read_documentation_modifiers(other, CLASS_MODIFIERS)
-          parse_statements(other, SINGLE, &block)
-	end
-
-      else
-	warn("Expected class name or '<<'. Got #{name_t.class}: #{name_t.text.inspect}")
-      end
-    end
-
-    def parse_module(container, single, tk, comment)
-      progress("m")
-      @stats.num_modules += 1
-      container, name_t  = get_class_or_module(container)
-#      skip_tkspace
-      name = name_t.name
-      mod = container.add_module(NormalModule, name)
-      mod.record_location(@top_level)
-      read_documentation_modifiers(mod, CLASS_MODIFIERS)
-      parse_statements(mod)
-      mod.comment = comment
-    end
-
-    # Look for the name of a class of module (optionally with a leading :: or
-    # with :: separated named) and return the ultimate name and container
-
-    def get_class_or_module(container)
-      skip_tkspace
-      name_t = get_tk
-
-      # class ::A -> A is in the top level
-      if name_t.kind_of?(TkCOLON2)
-        name_t = get_tk
-        container = @top_level
-      end
-
-      skip_tkspace(false)
-
-      while peek_tk.kind_of?(TkCOLON2)
-        prev_container = container
-        container = container.find_module_named(name_t.name)
-        if !container
-#          warn("Couldn't find module #{name_t.name}")
-          container = prev_container.add_module(NormalModule, name_t.name)
-        end
-        get_tk
-        name_t = get_tk
-      end
-      skip_tkspace(false)
-      return [container, name_t]
-    end
-
-    def parse_constant(container, single, tk, comment)
-      name = tk.name
-      skip_tkspace(false)
-      eq_tk = get_tk
-
-      unless eq_tk.kind_of?(TkASSIGN)
-        unget_tk(eq_tk)
-        return
-      end
-
-
-      nest = 0
-      get_tkread
-
-      tk = get_tk
-      if tk.kind_of? TkGT
-        unget_tk(tk)
-        unget_tk(eq_tk)
-        return
-      end
-
-      loop do
-        puts("Param: #{tk}, #{@scanner.continue} " +
-          "#{@scanner.lex_state} #{nest}")  if $DEBUG
-
-        case tk
-        when TkSEMICOLON
-          break
-        when TkLPAREN, TkfLPAREN
-          nest += 1
-        when TkRPAREN
-          nest -= 1
-        when TkCOMMENT
-          if nest <= 0 && @scanner.lex_state == EXPR_END
-            unget_tk(tk)
-            break
-          end
-        when TkNL
-          if (@scanner.lex_state == EXPR_END and nest <= 0) || !@scanner.continue
-            unget_tk(tk)
-            break
-          end
-        end
-        tk = get_tk
-      end
-
-      res = get_tkread.tr("\n", " ").strip
-      res = "" if res == ";"
-      con = Constant.new(name, res, comment)
-      read_documentation_modifiers(con, CONSTANT_MODIFIERS)
-      if con.document_self
-	container.add_constant(con)
-      end
-    end
-
-    def parse_method(container, single, tk, comment)
-      progress(".")
-      @stats.num_methods += 1
-      line_no = tk.line_no
-      column  = tk.char_no
-      
-      start_collecting_tokens
-      add_token(tk)
-      add_token_listener(self)
-      
-      @scanner.instance_eval{@lex_state = EXPR_FNAME}
-      skip_tkspace(false)
-      name_t = get_tk
-      back_tk = skip_tkspace
-      meth = nil
-      added_container = false
-
-      dot = get_tk
-      if dot.kind_of?(TkDOT) or dot.kind_of?(TkCOLON2)
-	@scanner.instance_eval{@lex_state = EXPR_FNAME}
-	skip_tkspace
-	name_t2 = get_tk
-	case name_t
-	when TkSELF
-	  name = name_t2.name
-	when TkCONSTANT
-          name = name_t2.name
-          prev_container = container
-          container = container.find_module_named(name_t.name)
-          if !container
-            added_container = true
-            obj = name_t.name.split("::").inject(Object) do |state, item|
-              state.const_get(item)
-            end rescue nil
-
-            type = obj.class == Class ? NormalClass : NormalModule
-            if not [Class, Module].include?(obj.class)
-              warn("Couldn't find #{name_t.name}. Assuming it's a module")
-            end
-
-            if type == NormalClass then
-              container = prev_container.add_class(type, name_t.name, obj.superclass.name)
-            else
-              container = prev_container.add_module(type, name_t.name)
-            end
-          end
-	else
-	  # warn("Unexpected token '#{name_t2.inspect}'")
-	  # break
-          skip_method(container)
-          return
-	end
-	meth =  AnyMethod.new(get_tkread, name)
-        meth.singleton = true
-      else
-	unget_tk dot
-	back_tk.reverse_each do
-	  |tk|
-	  unget_tk tk
-	end
-	name = name_t.name
-
-        meth =  AnyMethod.new(get_tkread, name)
-        meth.singleton = (single == SINGLE)
-      end
-
-      remove_token_listener(self)
-
-      meth.start_collecting_tokens
-      indent = TkSPACE.new(1,1)
-      indent.set_text(" " * column)
-
-      meth.add_tokens([TkCOMMENT.new(line_no,
-                                     1,
-                                     "# File #{@top_level.file_absolute_name}, line #{line_no}"),
-                        NEWLINE_TOKEN,
-                        indent])
-
-      meth.add_tokens(@token_stream)
-
-      add_token_listener(meth)
-
-      @scanner.instance_eval{@continue = false}
-      parse_method_parameters(meth)
-
-      if meth.document_self
-        container.add_method(meth)
-      elsif added_container
-        container.document_self = false
-      end
-
-      # Having now read the method parameters and documentation modifiers, we
-      # now know whether we have to rename #initialize to ::new
-
-      if name == "initialize" && !meth.singleton
-        if meth.dont_rename_initialize
-          meth.visibility = :protected
-        else
-          meth.singleton = true
-          meth.name = "new"
-          meth.visibility = :public
-        end
-      end
-      
-      parse_statements(container, single, meth)
-      
-      remove_token_listener(meth)
-
-      # Look for a 'call-seq' in the comment, and override the
-      # normal parameter stuff
-
-      if comment.sub!(/:?call-seq:(.*?)^\s*\#?\s*$/m, '')
-        seq = $1
-        seq.gsub!(/^\s*\#\s*/, '')
-        meth.call_seq = seq
-      end
-      
-      meth.comment = comment
-
-    end
-    
-    def skip_method(container)
-      meth =  AnyMethod.new("", "anon")
-      parse_method_parameters(meth)
-      parse_statements(container, false, meth)
-    end
-    
-    # Capture the method's parameters. Along the way,
-    # look for a comment containing 
-    #
-    #    # yields: ....
-    #
-    # and add this as the block_params for the method
-
-    def parse_method_parameters(method)
-      res = parse_method_or_yield_parameters(method)
-      res = "(" + res + ")" unless res[0] == ?(
-      method.params = res unless method.params
-      if method.block_params.nil?
-          skip_tkspace(false)
-	  read_documentation_modifiers(method, METHOD_MODIFIERS)
-      end
-    end
-
-    def parse_method_or_yield_parameters(method=nil, modifiers=METHOD_MODIFIERS)
-      skip_tkspace(false)
-      tk = get_tk
-
-      # Little hack going on here. In the statement
-      #  f = 2*(1+yield)
-      # We see the RPAREN as the next token, so we need
-      # to exit early. This still won't catch all cases
-      # (such as "a = yield + 1"
-      end_token = case tk
-                  when TkLPAREN, TkfLPAREN
-                    TkRPAREN
-                  when TkRPAREN
-                    return ""
-                  else
-                    TkNL
-                  end
-      nest = 0
-
-      loop do
-        puts("Param: #{tk.inspect}, #{@scanner.continue} " +
-          "#{@scanner.lex_state} #{nest}")  if $DEBUG
-        case tk
-        when TkSEMICOLON
-          break
-        when TkLBRACE
-          nest += 1
-        when TkRBRACE
-          # we might have a.each {|i| yield i }
-          unget_tk(tk) if nest.zero?
-          nest -= 1
-          break if nest <= 0
-        when TkLPAREN, TkfLPAREN
-          nest += 1
-        when end_token
-          if end_token == TkRPAREN
-            nest -= 1
-            break if @scanner.lex_state == EXPR_END and nest <= 0
-          else
-            break unless @scanner.continue
-          end
-        when method && method.block_params.nil? && TkCOMMENT
-	  unget_tk(tk)
-	  read_documentation_modifiers(method, modifiers)
-        end
-        tk = get_tk
-      end
-      res = get_tkread.tr("\n", " ").strip
-      res = "" if res == ";"
-      res
-    end
-
-    # skip the var [in] part of a 'for' statement
-    def skip_for_variable
-      skip_tkspace(false)
-      tk = get_tk
-      skip_tkspace(false)
-      tk = get_tk
-      unget_tk(tk) unless tk.kind_of?(TkIN)
-    end
-
-    # while, until, and for have an optional 
-    def skip_optional_do_after_expression
-      skip_tkspace(false)
-      tk = get_tk
-      case tk
-      when TkLPAREN, TkfLPAREN
-        end_token = TkRPAREN
-      else
-        end_token = TkNL
-      end
-
-      nest = 0
-      @scanner.instance_eval{@continue = false}
-
-      loop do
-        puts("\nWhile: #{tk}, #{@scanner.continue} " +
-          "#{@scanner.lex_state} #{nest}") if $DEBUG
-        case tk
-        when TkSEMICOLON
-          break
-        when TkLPAREN, TkfLPAREN
-          nest += 1
-        when TkDO
-          break if nest.zero?
-        when end_token
-          if end_token == TkRPAREN
-            nest -= 1
-            break if @scanner.lex_state == EXPR_END and nest.zero?
-          else
-            break unless @scanner.continue
-          end
-        end
-        tk = get_tk
-      end
-      skip_tkspace(false)
-      if peek_tk.kind_of? TkDO
-        get_tk
-      end
-    end
-    
-    # Return a superclass, which can be either a constant
-    # of an expression
-
-    def get_class_specification
-      tk = get_tk
-      return "self" if tk.kind_of?(TkSELF)
-        
-      res = ""
-      while tk.kind_of?(TkCOLON2) ||
-          tk.kind_of?(TkCOLON3)   ||
-          tk.kind_of?(TkCONSTANT)   
-        
-        res += tk.text
-        tk = get_tk
-      end
-
-      unget_tk(tk)
-      skip_tkspace(false)
-
-      get_tkread # empty out read buffer
-
-      tk = get_tk
-
-      case tk
-      when TkNL, TkCOMMENT, TkSEMICOLON
-        unget_tk(tk)
-        return res
-      end
-
-      res += parse_call_parameters(tk)
-      res
-    end
-
-    def parse_call_parameters(tk)
-
-      end_token = case tk
-                  when TkLPAREN, TkfLPAREN
-                    TkRPAREN
-                  when TkRPAREN
-                    return ""
-                  else
-                    TkNL
-                  end
-      nest = 0
-
-      loop do
-        puts("Call param: #{tk}, #{@scanner.continue} " +
-          "#{@scanner.lex_state} #{nest}") if $DEBUG
-        case tk
-        when TkSEMICOLON
-          break
-        when TkLPAREN, TkfLPAREN
-          nest += 1
-        when end_token
-          if end_token == TkRPAREN
-            nest -= 1
-            break if @scanner.lex_state == EXPR_END and nest <= 0
-          else
-            break unless @scanner.continue
-          end
-        when TkCOMMENT
-	  unget_tk(tk)
-	  break
-        end
-        tk = get_tk
-      end
-      res = get_tkread.tr("\n", " ").strip
-      res = "" if res == ";"
-      res
-    end
-
-
-    # Parse a constant, which might be qualified by
-    # one or more class or module names
-
-    def get_constant
-      res = ""
-      skip_tkspace(false)
-      tk = get_tk
-
-      while tk.kind_of?(TkCOLON2) ||
-          tk.kind_of?(TkCOLON3)   ||
-          tk.kind_of?(TkCONSTANT)          
-        
-        res += tk.text
-        tk = get_tk
-      end
-
-#      if res.empty?
-#        warn("Unexpected token #{tk} in constant")
-#      end 
-      unget_tk(tk)
-      res
-    end
-
-    # Get a constant that may be surrounded by parens
-    
-    def get_constant_with_optional_parens
-      skip_tkspace(false)
-      nest = 0
-      while (tk = peek_tk).kind_of?(TkLPAREN)  || tk.kind_of?(TkfLPAREN)
-        get_tk
-        skip_tkspace(true)
-        nest += 1
-      end
-
-      name = get_constant
-
-      while nest > 0
-        skip_tkspace(true)
-        tk = get_tk
-        nest -= 1 if tk.kind_of?(TkRPAREN)
-      end
-      name
-    end
-
-    # Directives are modifier comments that can appear after class, module,
-    # or method names. For example
-    #
-    #   def fred    # :yields:  a, b
-    #
-    # or
-    #
-    #   class SM  # :nodoc:
-    #
-    # we return the directive name and any parameters as a two element array
-    
-    def read_directive(allowed)
-      tk = get_tk
-      puts "directive: #{tk.inspect}" if $DEBUG
-      result = nil
-      if tk.kind_of?(TkCOMMENT) 
-        if tk.text =~ /\s*:?(\w+):\s*(.*)/
-          directive = $1.downcase
-          if allowed.include?(directive)
-            result = [directive, $2]
-          end
-        end
-      else
-        unget_tk(tk)
-      end
-      result
-    end
-
-    
-    def read_documentation_modifiers(context, allow)
-      dir = read_directive(allow)
-
-      case dir[0]
-
-      when "notnew", "not_new", "not-new"
-        context.dont_rename_initialize = true
-
-      when "nodoc"
-        context.document_self = false
-	if dir[1].downcase == "all"
-	  context.document_children = false
-	end
-
-      when "doc"
-        context.document_self = true
-        context.force_documentation = true
-
-      when "yield", "yields"
-        unless context.params.nil?
-          context.params.sub!(/(,|)\s*&\w+/,'') # remove parameter &proc
-        end
-	context.block_params = dir[1]
-
-      when "arg", "args"
-        context.params = dir[1]
-      end if dir
-    end
-
-    
-    # Look for directives in a normal comment block:
-    #
-    #   #--       - don't display comment from this point forward
-    #  
-    #
-    # This routine modifies it's parameter
-
-    def look_for_directives_in(context, comment)
-
-      preprocess = SM::PreProcess.new(@input_file_name,
-                                      @options.rdoc_include)
-
-      preprocess.handle(comment) do |directive, param|
-        case directive
-        when "stopdoc"
-          context.stop_doc
-          ""
-        when "startdoc"
-          context.start_doc
-          context.force_documentation = true
-          ""
-
-        when "enddoc"
-          #context.done_documenting = true
-          #""
-          throw :enddoc
-
-        when "main"
-          options = Options.instance
-          options.main_page = param
-	  ""
-
-        when "title"
-          options = Options.instance
-          options.title = param
-          ""
-
-        when "section"
-          context.set_current_section(param, comment)
-          comment.replace("") # 1.8 doesn't support #clear
-          break 
-        else
-          warn "Unrecognized directive '#{directive}'"
-          break
-        end
-      end
-
-      remove_private_comments(comment)
-    end
-
-    def remove_private_comments(comment)
-      comment.gsub!(/^#--.*?^#\+\+/m, '')
-      comment.sub!(/^#--.*/m, '')
-    end
-
-
-
-    def get_symbol_or_name
-      tk = get_tk
-      case tk
-      when  TkSYMBOL
-        tk.text.sub(/^:/, '')
-      when TkId, TkOp
-        tk.name
-      when TkSTRING
-        tk.text
-      else
-        raise "Name or symbol expected (got #{tk})"
-      end
-    end
-    
-    def parse_alias(context, single, tk, comment)
-      skip_tkspace
-      if (peek_tk.kind_of? TkLPAREN)
-        get_tk
-        skip_tkspace
-      end
-      new_name = get_symbol_or_name
-      @scanner.instance_eval{@lex_state = EXPR_FNAME}
-      skip_tkspace
-      if (peek_tk.kind_of? TkCOMMA)
-        get_tk
-        skip_tkspace
-      end
-      old_name = get_symbol_or_name
-
-      al = Alias.new(get_tkread, old_name, new_name, comment)
-      read_documentation_modifiers(al, ATTR_MODIFIERS)
-      if al.document_self
-	context.add_alias(al)
-      end
-    end
-
-    def parse_yield_parameters
-      parse_method_or_yield_parameters
-    end
-
-  def parse_yield(context, single, tk, method)
-    if method.block_params.nil?
-      get_tkread
-      @scanner.instance_eval{@continue = false}
-      method.block_params = parse_yield_parameters
-    end
-  end
-
-  def parse_require(context, comment)
-    skip_tkspace_comment
-    tk = get_tk
-    if tk.kind_of? TkLPAREN
-      skip_tkspace_comment
-      tk = get_tk
-    end
-
-    name = nil
-    case tk
-    when TkSTRING
-      name = tk.text
-#    when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
-#      name = tk.name
-    when TkDSTRING
-      warn "Skipping require of dynamic string: #{tk.text}"
- #   else
- #     warn "'require' used as variable"
-    end
-    if name
-      context.add_require(Require.new(name, comment))
-    else
-      unget_tk(tk)
-    end
-  end
-
-  def parse_include(context, comment)
-    loop do
-      skip_tkspace_comment
-      name = get_constant_with_optional_parens
-      unless name.empty?
-        context.add_include(Include.new(name, comment))
-      end
-      return unless peek_tk.kind_of?(TkCOMMA)
-      get_tk
-    end
-  end
-
-    def get_bool
-      skip_tkspace
-      tk = get_tk
-      case tk
-      when TkTRUE
-        true
-      when TkFALSE, TkNIL
-        false
-      else
-        unget_tk tk
-        true
-      end
-    end
-
-    def parse_attr(context, single, tk, comment)
-      args = parse_symbol_arg(1)
-      if args.size > 0
-	name = args[0]
-        rw = "R"
-        skip_tkspace(false)
-        tk = get_tk
-        if tk.kind_of? TkCOMMA
-          rw = "RW" if get_bool
-        else
-          unget_tk tk
-        end
-	att = Attr.new(get_tkread, name, rw, comment)
-	read_documentation_modifiers(att, ATTR_MODIFIERS)
-	if att.document_self
-	  context.add_attribute(att)
-	end
-      else
-	warn("'attr' ignored - looks like a variable")
-      end    
-
-    end
-
-    def parse_visibility(container, single, tk)
-      singleton = (single == SINGLE)
-      vis = case tk.name
-            when "private"   then :private
-            when "protected" then :protected
-            when "public"    then :public
-            when "private_class_method"
-              singleton = true
-              :private
-            when "public_class_method"
-              singleton = true
-              :public
-            else raise "Invalid visibility: #{tk.name}"
-            end
-            
-      skip_tkspace_comment(false)
-      case peek_tk
-        # Ryan Davis suggested the extension to ignore modifiers, because he
-        # often writes
-        #
-        #   protected unless $TESTING
-        #
-      when TkNL, TkUNLESS_MOD, TkIF_MOD
-#        error("Missing argument") if singleton        
-        container.ongoing_visibility = vis
-      else
-        args = parse_symbol_arg
-        container.set_visibility_for(args, vis, singleton)
-      end
-    end
-
-    def parse_attr_accessor(context, single, tk, comment)
-      args = parse_symbol_arg
-      read = get_tkread
-      rw = "?"
-
-      # If nodoc is given, don't document any of them
-
-      tmp = CodeObject.new
-      read_documentation_modifiers(tmp, ATTR_MODIFIERS)
-      return unless tmp.document_self
-
-      case tk.name
-      when "attr_reader"   then rw = "R"
-      when "attr_writer"   then rw = "W"
-      when "attr_accessor" then rw = "RW"
-      else
-        rw = @options.extra_accessor_flags[tk.name]
-      end
-      
-      for name in args
-	att = Attr.new(get_tkread, name, rw, comment)
-        context.add_attribute(att)
-      end    
-    end
-
-    def skip_tkspace_comment(skip_nl = true)
-      loop do
-        skip_tkspace(skip_nl)
-        return unless peek_tk.kind_of? TkCOMMENT
-        get_tk
-      end
-    end
-
-    def parse_symbol_arg(no = nil)
-
-      args = []
-      skip_tkspace_comment
-      case tk = get_tk
-      when TkLPAREN
-	loop do
-	  skip_tkspace_comment
-	  if tk1 = parse_symbol_in_arg
-	    args.push tk1
-	    break if no and args.size >= no
-	  end
-	  
-	  skip_tkspace_comment
-	  case tk2 = get_tk
-	  when TkRPAREN
-	    break
-	  when TkCOMMA
-	  else
-           warn("unexpected token: '#{tk2.inspect}'") if $DEBUG
-	    break
-	  end
-	end
-      else
-	unget_tk tk
-	if tk = parse_symbol_in_arg
-	  args.push tk
-	  return args if no and args.size >= no
-	end
-
-	loop do
-#	  skip_tkspace_comment(false)
-	  skip_tkspace(false)
-
-	  tk1 = get_tk
-	  unless tk1.kind_of?(TkCOMMA) 
-	    unget_tk tk1
-	    break
-	  end
-	  
-	  skip_tkspace_comment
-	  if tk = parse_symbol_in_arg
-	    args.push tk
-	    break if no and args.size >= no
-	  end
-	end
-      end
-      args
-    end
-
-    def parse_symbol_in_arg
-      case tk = get_tk
-      when TkSYMBOL
-        tk.text.sub(/^:/, '')
-      when TkSTRING
-	eval @read[-1]
-      else
-	warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG
-	nil
-      end
-    end
-  end
-
-end
diff --git a/lib/rdoc/parsers/parse_simple.rb b/lib/rdoc/parsers/parse_simple.rb
deleted file mode 100644
index 3f1a546964..0000000000
--- a/lib/rdoc/parsers/parse_simple.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# Parse a non-source file. We basically take the whole thing 
-# as one big comment. If the first character in the file
-# is '#', we strip leading pound signs.
-
-
-require "rdoc/code_objects"
-require "rdoc/markup/simple_markup/preprocess"
-
-module RDoc
-  # See rdoc/parsers/parse_c.rb
-
-  class SimpleParser
-    
-    # prepare to parse a plain file
-    def initialize(top_level, file_name, body, options, stats)
-      
-      preprocess = SM::PreProcess.new(file_name, options.rdoc_include)
-      
-      preprocess.handle(body) do |directive, param|
-        $stderr.puts "Unrecognized directive '#{directive}' in #{file_name}"
-      end
-      
-      @body = body
-      @options = options
-      @top_level = top_level
-    end
-    
-    # Extract the file contents and attach them to the toplevel as a
-    # comment
-    
-    def scan
-      #    @body.gsub(/^(\s\n)+/, '')
-      @top_level.comment = remove_private_comments(@body)
-      @top_level
-    end
-
-    def remove_private_comments(comment)
-      comment.gsub(/^--.*?^\+\+/m, '').sub(/^--.*/m, '')
-    end
-  end
-end
diff --git a/lib/rdoc/parsers/parserfactory.rb b/lib/rdoc/parsers/parserfactory.rb
deleted file mode 100644
index 00a82cf4b1..0000000000
--- a/lib/rdoc/parsers/parserfactory.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-require "rdoc/parsers/parse_simple"
-
-module RDoc
-
-  # A parser is simple a class that implements
-  #
-  #   #initialize(file_name, body, options)
-  #
-  # and
-  #
-  #   #scan
-  #
-  # The initialize method takes a file name to be used, the body of the
-  # file, and an RDoc::Options object. The scan method is then called
-  # to return an appropriately parsed TopLevel code object.
-  #
-  # The ParseFactory is used to redirect to the correct parser given a filename
-  # extension. This magic works because individual parsers have to register 
-  # themselves with us as they are loaded in. The do this using the following
-  # incantation
-  #
-  #
-  #    require "rdoc/parsers/parsefactory"
-  #    
-  #    module RDoc
-  #    
-  #      class XyzParser
-  #        extend ParseFactory                  <<<<
-  #        parse_files_matching /\.xyz$/        <<<<
-  #    
-  #        def initialize(file_name, body, options)
-  #          ...
-  #        end
-  #    
-  #        def scan
-  #          ...
-  #        end
-  #      end
-  #    end
-  #
-  # Just to make life interesting, if we suspect a plain text file, we
-  # also look for a shebang line just in case it's a potential
-  # shell script
-
-
-
-  module ParserFactory
-
-    @@parsers = []
-
-    Parsers = Struct.new(:regexp, :parser)
-
-    # Record the fact that a particular class parses files that
-    # match a given extension
-
-    def parse_files_matching(regexp)
-      @@parsers.unshift Parsers.new(regexp, self)
-    end
-
-    # Return a parser that can handle a particular extension
-
-    def ParserFactory.can_parse(file_name)
-      @@parsers.find {|p| p.regexp.match(file_name) }
-    end
-
-    # Alias an extension to another extension. After this call,
-    # files ending "new_ext" will be parsed using the same parser
-    # as "old_ext"
-
-    def ParserFactory.alias_extension(old_ext, new_ext)
-      parser = ParserFactory.can_parse("xxx.#{old_ext}")
-      return false unless parser
-      @@parsers.unshift Parsers.new(Regexp.new("\\.#{new_ext}$"), parser.parser)
-      true
-    end
-
-    # Find the correct parser for a particular file name. Return a 
-    # SimpleParser for ones that we don't know
-
-    def ParserFactory.parser_for(top_level, file_name, body, options, stats)
-      # If no extension, look for shebang
-      if file_name !~ /\.\w+$/ && body =~ %r{\A#!(.+)}
-        shebang = $1
-        case shebang
-        when %r{env\s+ruby}, %r{/ruby}
-          file_name = "dummy.rb"
-        end
-      end
-      parser_description = can_parse(file_name)
-      if parser_description
-        parser = parser_description.parser 
-      else
-        parser = SimpleParser
-      end
-
-      parser.new(top_level, file_name, body, options, stats)
-    end
-  end
-end
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index 91f5611196..3c08b5e4c1 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -1,298 +1,457 @@
-# See README.
-#
- 
-
-VERSION_STRING = %{RDoc V1.0.1 - 20041108}
+require 'rdoc'
 
+require 'rdoc/parser'
 
-require 'rdoc/parsers/parse_rb.rb'
-require 'rdoc/parsers/parse_c.rb'
-require 'rdoc/parsers/parse_f95.rb'
+# Simple must come first
+require 'rdoc/parser/simple'
+require 'rdoc/parser/ruby'
+require 'rdoc/parser/c'
+require 'rdoc/parser/perl'
 
-require 'rdoc/parsers/parse_simple.rb'
+require 'rdoc/stats'
 require 'rdoc/options'
 
-require 'rdoc/diagram'
-
 require 'find'
-require 'ftools'
+require 'fileutils'
 require 'time'
 
-# We put rdoc stuff in the RDoc module to avoid namespace
-# clutter.
+##
+# Encapsulate the production of rdoc documentation. Basically you can use this
+# as you would invoke rdoc from the command line:
 #
-# ToDo: This isn't universally true.
+#   rdoc = RDoc::RDoc.new
+#   rdoc.document(args)
 #
-# :include: README
+# Where +args+ is an array of strings, each corresponding to an argument you'd
+# give rdoc on the command line. See rdoc/rdoc.rb for details.
 
-module RDoc
+class RDoc::RDoc
 
-  # Name of the dotfile that contains the description of files to be
-  # processed in the current directory
-  DOT_DOC_FILENAME = ".document"
+  ##
+  # File pattern to exclude
 
-  # Simple stats collector
-  class Stats
-    attr_accessor :num_files, :num_classes, :num_modules, :num_methods
-    def initialize
-      @num_files = @num_classes = @num_modules = @num_methods = 0
-      @start = Time.now
-    end
-    def print
-      puts "Files:   #@num_files"
-      puts "Classes: #@num_classes"
-      puts "Modules: #@num_modules"
-      puts "Methods: #@num_methods"
-      puts "Elapsed: " + sprintf("%0.3fs", Time.now - @start)
-    end
+  attr_accessor :exclude
+
+  ##
+  # Generator instance used for creating output
+
+  attr_accessor :generator
+
+  ##
+  # Hash of files and their last modified times.
+
+  attr_reader :last_modified
+
+  ##
+  # RDoc options
+
+  attr_accessor :options
+
+  ##
+  # Accessor for statistics.  Available after each call to parse_files
+
+  attr_reader :stats
+
+  ##
+  # This is the list of supported output generators
+
+  GENERATORS = {}
+
+  ##
+  # Add +klass+ that can generate output after parsing
+
+  def self.add_generator(klass)
+    name = klass.name.sub(/^RDoc::Generator::/, '').downcase
+    GENERATORS[name] = klass
   end
 
+  ##
+  # Active RDoc::RDoc instance
 
-  # Exception thrown by any rdoc error. Only the #message part is
-  # of use externally.
+  def self.current
+    @current
+  end
+
+  ##
+  # Sets the active RDoc::RDoc instance
 
-  class RDocError < Exception
+  def self.current=(rdoc)
+    @current = rdoc
   end
 
-  # Encapsulate the production of rdoc documentation. Basically
-  # you can use this as you would invoke rdoc from the command
-  # line:
-  #
-  #    rdoc = RDoc::RDoc.new
-  #    rdoc.document(args)
-  #
-  # where _args_ is an array of strings, each corresponding to
-  # an argument you'd give rdoc on the command line. See rdoc/rdoc.rb 
-  # for details.
-  
-  class RDoc
-
-    ##
-    # This is the list of output generators that we
-    # support
-    
-    Generator = Struct.new(:file_name, :class_name, :key)
-    
-    GENERATORS = {}
-    $:.collect {|d|
-      File::expand_path(d)
-    }.find_all {|d|
-      File::directory?("#{d}/rdoc/generators")
-    }.each {|dir|
-      Dir::entries("#{dir}/rdoc/generators").each {|gen|
-        next unless /(\w+)_generator.rb$/ =~ gen
-        type = $1
-        unless GENERATORS.has_key? type
-          GENERATORS[type] = Generator.new("rdoc/generators/#{gen}",
-                                           "#{type.upcase}Generator".intern,
-                                           type)
-        end
-      }
-    }                                                    
-
-    #######
-    private
-    #######
-
-    ##
-    # Report an error message and exit
-    
-    def error(msg)
-      raise RDocError.new(msg)
+  def initialize
+    @current       = nil
+    @exclude       = nil
+    @generator     = nil
+    @last_modified = {}
+    @old_siginfo   = nil
+    @options       = nil
+    @stats         = nil
+  end
+
+  ##
+  # Report an error message and exit
+
+  def error(msg)
+    raise RDoc::Error, msg
+  end
+
+  ##
+  # Gathers a set of parseable files from the files and directories listed in
+  # +files+.
+
+  def gather_files files
+    files = ["."] if files.empty?
+
+    file_list = normalized_file_list files, true, @exclude
+
+    file_list = file_list.uniq
+
+    file_list = remove_unparseable file_list
+  end
+
+  ##
+  # Turns RDoc from stdin into HTML
+
+  def handle_pipe
+    @html = RDoc::Markup::ToHtml.new
+
+    out = @html.convert $stdin.read
+
+    $stdout.write out
+  end
+
+  ##
+  # Installs a siginfo handler that prints the current filename.
+
+  def install_siginfo_handler
+    return unless Signal.list.include? 'INFO'
+
+    @old_siginfo = trap 'INFO' do
+      puts @current if @current
     end
-    
-    ##
-    # Create an output dir if it doesn't exist. If it does
-    # exist, but doesn't contain the flag file <tt>created.rid</tt>
-    # then we refuse to use it, as we may clobber some
-    # manually generated documentation
-    
-    def setup_output_dir(op_dir, force)
-      flag_file = output_flag_file(op_dir)
-      if File.exist?(op_dir)
-        unless File.directory?(op_dir)
-          error "'#{op_dir}' exists, and is not a directory" 
-        end
-        begin
-          created = File.read(flag_file)
-        rescue SystemCallError
-          error "\nDirectory #{op_dir} already exists, but it looks like it\n" +
-            "isn't an RDoc directory. Because RDoc doesn't want to risk\n" +
-            "destroying any of your existing files, you'll need to\n" +
-            "specify a different output directory name (using the\n" +
-            "--op <dir> option).\n\n"
-        else
-          last = (Time.parse(created) unless force rescue nil)
+  end
+
+  ##
+  # Create an output dir if it doesn't exist. If it does exist, but doesn't
+  # contain the flag file <tt>created.rid</tt> then we refuse to use it, as
+  # we may clobber some manually generated documentation
+
+  def setup_output_dir(dir, force)
+    flag_file = output_flag_file dir
+
+    last = {}
+
+    if File.exist? dir then
+      error "#{dir} exists and is not a directory" unless File.directory? dir
+
+      begin
+        open flag_file do |io|
+          unless force then
+            Time.parse io.gets
+
+            io.each do |line|
+              file, time = line.split "\t", 2
+              time = Time.parse(time) rescue next
+              last[file] = time
+            end
+          end
         end
-      else
-        File.makedirs(op_dir)
+      rescue SystemCallError, TypeError
+        error <<-ERROR
+
+Directory #{dir} already exists, but it looks like it isn't an RDoc directory.
+
+Because RDoc doesn't want to risk destroying any of your existing files,
+you'll need to specify a different output directory name (using the --op <dir>
+option)
+
+        ERROR
       end
-      last
+    else
+      FileUtils.mkdir_p dir
     end
 
-    # Update the flag file in an output directory.
-    def update_output_dir(op_dir, time)
-      File.open(output_flag_file(op_dir), "w") {|f| f.puts time.rfc2822 }
-    end
+    last
+  end
 
-    # Return the path name of the flag file in an output directory.
-    def output_flag_file(op_dir)
-      File.join(op_dir, "created.rid")
+  ##
+  # Update the flag file in an output directory.
+
+  def update_output_dir(op_dir, time, last = {})
+    open output_flag_file(op_dir), "w" do |f|
+      f.puts time.rfc2822
+      last.each do |n, t|
+        f.puts "#{n}\t#{t.rfc2822}"
+      end
     end
+  end
+
+  ##
+  # Return the path name of the flag file in an output directory.
 
-    # The .document file contains a list of file and directory name
-    # patterns, representing candidates for documentation. It may
-    # also contain comments (starting with '#')
-    def parse_dot_doc_file(in_dir, filename, options)
-      # read and strip comments
-      patterns = File.read(filename).gsub(/#.*/, '')
+  def output_flag_file(op_dir)
+    File.join op_dir, "created.rid"
+  end
 
-      result = []
+  ##
+  # The .document file contains a list of file and directory name patterns,
+  # representing candidates for documentation. It may also contain comments
+  # (starting with '#')
 
-      patterns.split.each do |patt|
-        candidates = Dir.glob(File.join(in_dir, patt))
-        result.concat(normalized_file_list(options,  candidates))
-      end
-      result
+  def parse_dot_doc_file in_dir, filename
+    # read and strip comments
+    patterns = File.read(filename).gsub(/#.*/, '')
+
+    result = []
+
+    patterns.split.each do |patt|
+      candidates = Dir.glob(File.join(in_dir, patt))
+      result.concat normalized_file_list(candidates)
     end
 
+    result
+  end
 
-    # Given a list of files and directories, create a list
-    # of all the Ruby files they contain. 
-    #
-    # If +force_doc+ is true, we always add the given files.
-    # If false, only add files that we guarantee we can parse
-    # It is true when looking at files given on the command line,
-    # false when recursing through subdirectories. 
-    #
-    # The effect of this is that if you want a file with a non-
-    # standard extension parsed, you must name it explicity.
-    #
-
-    def normalized_file_list(options, relative_files, force_doc = false, exclude_pattern=nil)
-      file_list = []
-
-      relative_files.each do |rel_file_name|
-        next if exclude_pattern && exclude_pattern =~ rel_file_name
-        stat = File.stat(rel_file_name)
-        case type = stat.ftype
-        when "file"
-          next if @last_created and stat.mtime < @last_created
-          file_list << rel_file_name.sub(/^\.\//, '') if force_doc || ParserFactory.can_parse(rel_file_name)
-        when "directory"
-          next if rel_file_name == "CVS" || rel_file_name == ".svn"
-          dot_doc = File.join(rel_file_name, DOT_DOC_FILENAME)
-          if File.file?(dot_doc)
-            file_list.concat(parse_dot_doc_file(rel_file_name, dot_doc, options))
-          else
-            file_list.concat(list_files_in_directory(rel_file_name, options))
-          end
+  ##
+  # Given a list of files and directories, create a list of all the Ruby
+  # files they contain.
+  #
+  # If +force_doc+ is true we always add the given files, if false, only
+  # add files that we guarantee we can parse.  It is true when looking at
+  # files given on the command line, false when recursing through
+  # subdirectories.
+  #
+  # The effect of this is that if you want a file with a non-standard
+  # extension parsed, you must name it explicitly.
+
+  def normalized_file_list(relative_files, force_doc = false,
+                           exclude_pattern = nil)
+    file_list = []
+
+    relative_files.each do |rel_file_name|
+      next if exclude_pattern && exclude_pattern =~ rel_file_name
+      stat = File.stat rel_file_name rescue next
+
+      case type = stat.ftype
+      when "file" then
+        next if last_modified = @last_modified[rel_file_name] and
+                stat.mtime.to_i <= last_modified.to_i
+
+        if force_doc or RDoc::Parser.can_parse(rel_file_name) then
+          file_list << rel_file_name.sub(/^\.\//, '')
+          @last_modified[rel_file_name] = stat.mtime
+        end
+      when "directory" then
+        next if rel_file_name == "CVS" || rel_file_name == ".svn"
+
+        dot_doc = File.join rel_file_name, RDoc::DOT_DOC_FILENAME
+
+        if File.file? dot_doc then
+          file_list << parse_dot_doc_file(rel_file_name, dot_doc)
         else
-          raise RDocError.new("I can't deal with a #{type} #{rel_file_name}")
+          file_list << list_files_in_directory(rel_file_name)
         end
+      else
+        raise RDoc::Error, "I can't deal with a #{type} #{rel_file_name}"
       end
-      file_list
     end
 
-    # Return a list of the files to be processed in
-    # a directory. We know that this directory doesn't have
-    # a .document file, so we're looking for real files. However
-    # we may well contain subdirectories which must
-    # be tested for .document files
-    def list_files_in_directory(dir, options)
-      normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude)
-    end
+    file_list.flatten
+  end
 
+  ##
+  # Return a list of the files to be processed in a directory. We know that
+  # this directory doesn't have a .document file, so we're looking for real
+  # files. However we may well contain subdirectories which must be tested
+  # for .document files.
 
-    # Parse each file on the command line, recursively entering
-    # directories
+  def list_files_in_directory dir
+    files = Dir.glob File.join(dir, "*")
 
-    def parse_files(options)
- 
-      file_info = []
+    normalized_file_list files, false, @options.exclude
+  end
 
-      files = options.files
-      files = ["."] if files.empty?
+  ##
+  # Parses +filename+ and returns an RDoc::TopLevel
 
-      file_list = normalized_file_list(options, files, true)
+  def parse_file filename
+    @stats.add_file filename
+    content = read_file_contents filename
 
-      file_list.each do |fn|
-        $stderr.printf("\n%35s: ", File.basename(fn)) unless options.quiet
-        
-        content = File.open(fn, "r") {|f| f.read}
+    return unless content
 
-        top_level = TopLevel.new(fn)
-        parser = ParserFactory.parser_for(top_level, fn, content, options, @stats)
-        file_info << parser.scan
-        @stats.num_files += 1
-      end
+    top_level = RDoc::TopLevel.new filename
 
-      file_info
-    end
+    parser = RDoc::Parser.for top_level, filename, content, @options, @stats
 
+    return unless parser
 
-    public
+    parser.scan
+  rescue => e
+    $stderr.puts <<-EOF
+Before reporting this, could you check that the file you're documenting
+compiles cleanly--RDoc is not a full Ruby parser, and gets confused easily if
+fed invalid programs.
 
-    ###################################################################
-    #
-    # Format up one or more files according to the given arguments.
-    # For simplicity, _argv_ is an array of strings, equivalent to the
-    # strings that would be passed on the command line. (This isn't a
-    # coincidence, as we _do_ pass in ARGV when running
-    # interactively). For a list of options, see rdoc/rdoc.rb. By
-    # default, output will be stored in a directory called +doc+ below
-    # the current directory, so make sure you're somewhere writable
-    # before invoking.
-    #
-    # Throws: RDocError on error
+The internal error was:
 
-    def document(argv)
+\t(#{e.class}) #{e.message}
 
-      TopLevel::reset
+    EOF
 
-      @stats = Stats.new
+    $stderr.puts e.backtrace.join("\n\t") if $RDOC_DEBUG
 
-      options = Options.instance
-      options.parse(argv, GENERATORS)
+    raise e
+    nil
+  end
 
-      @last_created = nil
-      unless options.all_one_file
-        @last_created = setup_output_dir(options.op_dir, options.force_update)
-      end
-      start_time = Time.now
+  ##
+  # Parse each file on the command line, recursively entering directories.
 
-      file_info = parse_files(options)
+  def parse_files files
+    file_list = gather_files files
 
-      if file_info.empty?
-        $stderr.puts "\nNo newer files." unless options.quiet
-      else
-        gen = options.generator
+    return [] if file_list.empty?
+
+    file_info = []
+
+    @stats = RDoc::Stats.new file_list.size, @options.verbosity
+    @stats.begin_adding
+
+    file_info = file_list.map do |filename|
+      @current = filename
+      parse_file filename
+    end.compact
+
+    @stats.done_adding
+
+    file_info
+  end
+
+  ##
+  # Removes file extensions known to be unparseable from +files+
+
+  def remove_unparseable files
+    files.reject do |file|
+      file =~ /\.(?:class|eps|erb|scpt\.txt|ttf|yml)$/i
+    end
+  end
+
+  ##
+  # Format up one or more files according to the given arguments.
+  #
+  # For simplicity, +argv+ is an array of strings, equivalent to the strings
+  # that would be passed on the command line. (This isn't a coincidence, as
+  # we _do_ pass in ARGV when running interactively). For a list of options,
+  # see rdoc/rdoc.rb. By default, output will be stored in a directory
+  # called +doc+ below the current directory, so make sure you're somewhere
+  # writable before invoking.
+  #
+  # Throws: RDoc::Error on error
+
+  def document(argv)
+    RDoc::TopLevel.reset
+    RDoc::Parser::C.reset
+
+    @options = RDoc::Options.new
+    @options.parse argv
+
+    if @options.pipe then
+      handle_pipe
+      exit
+    end
+
+    @exclude = @options.exclude
+
+    @last_modified = setup_output_dir @options.op_dir, @options.force_update
+
+    start_time = Time.now
 
-        $stderr.puts "\nGenerating #{gen.key.upcase}..." unless options.quiet
+    file_info = parse_files @options.files
 
-        require gen.file_name
+    @options.title = "RDoc Documentation"
 
-        gen_class = Generators.const_get(gen.class_name)
-        gen = gen_class.for(options)
+    if file_info.empty?
+      $stderr.puts "\nNo newer files." unless @options.quiet
+    else
+      gen_klass = @options.generator
 
-        pwd = Dir.pwd
+      unless @options.quiet then
+        $stderr.puts "\nGenerating #{gen_klass.name.sub(/^.*::/, '')}..."
+      end
+
+      @generator = gen_klass.for @options
 
-        Dir.chdir(options.op_dir)  unless options.all_one_file
+      pwd = Dir.pwd
 
+      Dir.chdir @options.op_dir do
         begin
-          Diagram.new(file_info, options).draw if options.diagram
-          gen.generate(file_info)
-          update_output_dir(".", start_time)
+          self.class.current = self
+
+          @generator.generate file_info
+          update_output_dir ".", start_time, @last_modified
         ensure
-          Dir.chdir(pwd)
+          self.class.current = nil
         end
       end
+    end
+
+    unless @options.quiet or not @stats then
+      puts
+      @stats.print
+    end
+  end
+
+  def read_file_contents(filename)
+    content = open filename, "rb" do |f| f.read end
+
+    utf8 = content.sub!(/\A\xef\xbb\xbf/, '')
+    if defined? Encoding then
+      if /coding[=:]\s*([^\s;]+)/i =~ content[%r"\A(?:#!.*\n)?.*\n"]
+        enc = ::Encoding.find($1)
+      end
+      if enc ||= (Encoding::UTF_8 if utf8)
+        content.force_encoding(enc)
+      end
+    end
+
+    content
+  rescue Errno::EISDIR, Errno::ENOENT
+    nil
+  end
+
+  ##
+  # Removes a siginfo handler and replaces the previous
+
+  def remove_siginfo_handler
+    return unless Signal.list.key? 'INFO'
 
-      unless options.quiet
-        puts
-        @stats.print
+    handler = @old_siginfo || 'DEFAULT'
+
+    trap 'INFO', handler
+  end
+
+end
+
+begin
+  require 'rubygems'
+
+  if Gem.respond_to? :find_files then
+    rdoc_extensions = Gem.find_files 'rdoc/discover'
+
+    rdoc_extensions.each do |extension|
+      begin
+        load extension
+      rescue => e
+        warn "error loading #{extension.inspect}: #{e.message} (#{e.class})"
       end
     end
   end
+rescue LoadError
 end
 
+# require built-in generators after discovery in case they've been replaced
+require 'rdoc/generator/darkfish'
+require 'rdoc/generator/ri'
+
diff --git a/lib/rdoc/require.rb b/lib/rdoc/require.rb
new file mode 100644
index 0000000000..407b55af35
--- /dev/null
+++ b/lib/rdoc/require.rb
@@ -0,0 +1,32 @@
+require 'rdoc/code_object'
+
+##
+# A file loaded by \#require
+
+class RDoc::Require < RDoc::CodeObject
+
+  ##
+  # Name of the required file
+
+  attr_accessor :name
+
+  ##
+  # Creates a new Require that loads +name+ with +comment+
+
+  def initialize(name, comment)
+    super()
+    @name = name.gsub(/'|"/, "") #'
+    self.comment = comment
+  end
+
+  def inspect # :nodoc:
+    "#<%s:0x%x require '%s' in %s>" % [
+      self.class,
+      object_id,
+      @name,
+      parent_file_name,
+    ]
+  end
+
+end
+
diff --git a/lib/rdoc/ri.rb b/lib/rdoc/ri.rb
new file mode 100644
index 0000000000..17da3fbe83
--- /dev/null
+++ b/lib/rdoc/ri.rb
@@ -0,0 +1,18 @@
+require 'rdoc'
+
+##
+# Namespace for the ri command line tool's implementation.
+#
+# See <tt>ri --help</tt> for details.
+
+module RDoc::RI
+
+  ##
+  # Base RI error class
+
+  class Error < RDoc::Error; end
+
+end
+
+require 'rdoc/ri/store'
+
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
new file mode 100644
index 0000000000..90fbc7c7a2
--- /dev/null
+++ b/lib/rdoc/ri/driver.rb
@@ -0,0 +1,1054 @@
+require 'abbrev'
+require 'optparse'
+
+begin
+  require 'readline'
+rescue LoadError
+end
+
+require 'rdoc/ri'
+require 'rdoc/ri/paths'
+require 'rdoc/markup'
+require 'rdoc/markup/formatter'
+require 'rdoc/text'
+
+##
+# For RubyGems backwards compatibility
+
+require 'rdoc/ri/formatter'
+
+##
+# The RI driver implements the command-line ri tool.
+#
+# The driver supports:
+# * loading RI data from:
+#   * Ruby's standard library
+#   * RubyGems
+#   * ~/.rdoc
+#   * A user-supplied directory
+# * Paging output (uses RI_PAGER environment variable, PAGER environment
+#   variable or the less, more and pager programs)
+# * Interactive mode with tab-completion
+# * Abbreviated names (ri Zl shows Zlib documentation)
+# * Colorized output
+# * Merging output from multiple RI data sources
+
+class RDoc::RI::Driver
+
+  ##
+  # Base Driver error class
+
+  class Error < RDoc::RI::Error; end
+
+  ##
+  # Raised when a name isn't found in the ri data stores
+
+  class NotFoundError < Error
+
+    ##
+    # Name that wasn't found
+
+    alias name message
+
+    def message # :nodoc:
+      "Nothing known about #{super}"
+    end
+  end
+
+  attr_accessor :stores
+
+  ##
+  # Controls the user of the pager vs $stdout
+
+  attr_accessor :use_stdout
+
+  ##
+  # Default options for ri
+
+  def self.default_options
+    options = {}
+    options[:use_stdout] = !$stdout.tty?
+    options[:width] = 72
+    options[:interactive] = false
+    options[:use_cache] = true
+    options[:profile] = false
+
+    # By default all standard paths are used.
+    options[:use_system] = true
+    options[:use_site] = true
+    options[:use_home] = true
+    options[:use_gems] = true
+    options[:extra_doc_dirs] = []
+
+    return options
+  end
+
+  ##
+  # Dump +data_path+ using pp
+
+  def self.dump data_path
+    require 'pp'
+
+    open data_path, 'rb' do |io|
+      pp Marshal.load(io.read)
+    end
+  end
+
+  ##
+  # Parses +argv+ and returns a Hash of options
+
+  def self.process_args argv
+    options = default_options
+
+    opts = OptionParser.new do |opt|
+      opt.accept File do |file,|
+        File.readable?(file) and not File.directory?(file) and file
+      end
+
+      opt.program_name = File.basename $0
+      opt.version = RDoc::VERSION
+      opt.release = nil
+      opt.summary_indent = ' ' * 4
+
+      opt.banner = <<-EOT
+Usage: #{opt.program_name} [options] [names...]
+
+Where name can be:
+
+  Class | Class::method | Class#method | Class.method | method
+
+All class names may be abbreviated to their minimum unambiguous form. If a name
+is ambiguous, all valid options will be listed.
+
+The form '.' method matches either class or instance methods, while #method
+matches only instance and ::method matches only class methods.
+
+For example:
+
+    #{opt.program_name} Fil
+    #{opt.program_name} File
+    #{opt.program_name} File.new
+    #{opt.program_name} zip
+
+Note that shell quoting may be required for method names containing
+punctuation:
+
+    #{opt.program_name} 'Array.[]'
+    #{opt.program_name} compact\\!
+
+To see the default directories ri will search, run:
+
+    #{opt.program_name} --list-doc-dirs
+
+Specifying the --system, --site, --home, --gems or --doc-dir options will
+limit ri to searching only the specified directories.
+
+Options may also be set in the 'RI' environment variable.
+      EOT
+
+      opt.separator nil
+      opt.separator "Options:"
+
+      opt.separator nil
+
+      formatters = RDoc::Markup.constants.grep(/^To[A-Z][a-z]+$/).sort
+      formatters = formatters.sort.map do |formatter|
+        formatter.to_s.sub('To', '').downcase
+      end
+
+      opt.on("--format=NAME", "-f",
+             "Uses the selected formatter. The default",
+             "formatter is bs for paged output and ansi",
+             "otherwise. Valid formatters are:",
+             formatters.join(' '), formatters) do |value|
+        options[:formatter] = RDoc::Markup.const_get "To#{value.capitalize}"
+      end
+
+      opt.separator nil
+
+      opt.on("--no-pager", "-T",
+             "Send output directly to stdout,",
+             "rather than to a pager.") do
+        options[:use_stdout] = true
+      end
+
+      opt.separator nil
+
+      opt.on("--width=WIDTH", "-w", OptionParser::DecimalInteger,
+             "Set the width of the output.") do |value|
+        options[:width] = value
+      end
+
+      opt.separator nil
+
+      opt.on("--interactive", "-i",
+             "In interactive mode you can repeatedly",
+             "look up methods with autocomplete.") do
+        options[:interactive] = true
+      end
+
+      opt.separator nil
+
+      opt.on("--[no-]profile",
+             "Run with the ruby profiler") do |value|
+        options[:profile] = value
+      end
+
+      opt.separator nil
+      opt.separator "Data source options:"
+      opt.separator nil
+
+      opt.on("--list-doc-dirs",
+             "List the directories from which ri will",
+             "source documentation on stdout and exit.") do
+        options[:list_doc_dirs] = true
+      end
+
+      opt.separator nil
+
+      opt.on("--doc-dir=DIRNAME", "-d", Array,
+             "List of directories from which to source",
+             "documentation in addition to the standard",
+             "directories.  May be repeated.") do |value|
+        value.each do |dir|
+          unless File.directory? dir then
+            raise OptionParser::InvalidArgument, "#{dir} is not a directory"
+          end
+
+          options[:extra_doc_dirs] << File.expand_path(dir)
+        end
+      end
+
+      opt.separator nil
+
+      opt.on("--no-standard-docs",
+             "Do not include documentation from",
+             "the Ruby standard library, site_lib,",
+             "installed gems, or ~/.rdoc.",
+             "Use with --doc-dir") do
+        options[:use_system] = false
+        options[:use_site] = false
+        options[:use_gems] = false
+        options[:use_home] = false
+      end
+
+      opt.separator nil
+
+      opt.on("--[no-]system",
+             "Include documentation from Ruby's standard",
+             "library.  Defaults to true.") do |value|
+        options[:use_system] = value
+      end
+
+      opt.separator nil
+
+      opt.on("--[no-]site",
+             "Include documentation from libraries",
+             "installed in site_lib.",
+             "Defaults to true.") do |value|
+        options[:use_site] = value
+      end
+
+      opt.separator nil
+
+      opt.on("--[no-]gems",
+             "Include documentation from RubyGems.",
+             "Defaults to true.") do |value|
+        options[:use_gems] = value
+      end
+
+      opt.separator nil
+
+      opt.on("--[no-]home",
+             "Include documentation stored in ~/.rdoc.",
+             "Defaults to true.") do |value|
+        options[:use_home] = value
+      end
+
+      opt.separator nil
+      opt.separator "Debug options:"
+      opt.separator nil
+
+      opt.on("--dump=CACHE", File,
+             "Dumps data from an ri cache or data file") do |value|
+        options[:dump_path] = value
+      end
+    end
+
+    argv = ENV['RI'].to_s.split.concat argv
+
+    opts.parse! argv
+
+    options[:names] = argv
+
+    options[:use_stdout] ||= !$stdout.tty?
+    options[:use_stdout] ||= options[:interactive]
+    options[:width] ||= 72
+
+    options
+
+  rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
+    puts opts
+    puts
+    puts e
+    exit 1
+  end
+
+  ##
+  # Runs the ri command line executable using +argv+
+
+  def self.run argv = ARGV
+    options = process_args argv
+
+    if options[:dump_path] then
+      dump options[:dump_path]
+      return
+    end
+
+    ri = new options
+    ri.run
+  end
+
+  ##
+  # Creates a new driver using +initial_options+ from ::process_args
+
+  def initialize initial_options = {}
+    @paging = false
+    @classes = nil
+
+    options = self.class.default_options.update(initial_options)
+
+    @formatter_klass = options[:formatter]
+
+    require 'profile' if options[:profile]
+
+    @names = options[:names]
+
+    @doc_dirs = []
+    @stores   = []
+
+    RDoc::RI::Paths.each(options[:use_system], options[:use_site],
+                                   options[:use_home], options[:use_gems],
+                                   *options[:extra_doc_dirs]) do |path, type|
+      @doc_dirs << path
+
+      store = RDoc::RI::Store.new path, type
+      store.load_cache
+      @stores << store
+    end
+
+    @list_doc_dirs = options[:list_doc_dirs]
+
+    @interactive = options[:interactive]
+    @use_stdout  = options[:use_stdout]
+  end
+
+  ##
+  # Adds paths for undocumented classes +also_in+ to +out+
+
+  def add_also_in out, also_in
+    return if also_in.empty?
+
+    out << RDoc::Markup::Rule.new(1)
+    out << RDoc::Markup::Paragraph.new("Also found in:")
+
+    paths = RDoc::Markup::Verbatim.new
+    also_in.each do |store|
+      paths.parts.push '  ', store.friendly_path, "\n"
+    end
+    out << paths
+  end
+
+  ##
+  # Adds a class header to +out+ for class +name+ which is described in
+  # +classes+.
+
+  def add_class out, name, classes
+    heading = if classes.all? { |klass| klass.module? } then
+                name
+              else
+                superclass = classes.map do |klass|
+                  klass.superclass unless klass.module?
+                end.compact.shift || 'Object'
+
+                "#{name} < #{superclass}"
+              end
+
+    out << RDoc::Markup::Heading.new(1, heading)
+    out << RDoc::Markup::BlankLine.new
+  end
+
+  ##
+  # Adds "(from ...)" to +out+ for +store+
+
+  def add_from out, store
+    out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
+  end
+
+  ##
+  # Adds +includes+ to +out+
+
+  def add_includes out, includes
+    return if includes.empty?
+
+    out << RDoc::Markup::Rule.new(1)
+    out << RDoc::Markup::Heading.new(1, "Includes:")
+
+    includes.each do |modules, store|
+      if modules.length == 1 then
+        include = modules.first
+        name = include.name
+        path = store.friendly_path
+        out << RDoc::Markup::Paragraph.new("#{name} (from #{path})")
+
+        if include.comment then
+          out << RDoc::Markup::BlankLine.new
+          out << include.comment
+        end
+      else
+        out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
+
+        wout, with = modules.partition { |incl| incl.comment.empty? }
+
+        out << RDoc::Markup::BlankLine.new unless with.empty?
+
+        with.each do |incl|
+          out << RDoc::Markup::Paragraph.new(incl.name)
+          out << RDoc::Markup::BlankLine.new
+          out << incl.comment
+        end
+
+        unless wout.empty? then
+          verb = RDoc::Markup::Verbatim.new
+
+          wout.each do |incl|
+            verb.push '  ', incl.name, "\n"
+          end
+
+          out << verb
+        end
+      end
+    end
+  end
+
+  ##
+  # Adds a list of +methods+ to +out+ with a heading of +name+
+
+  def add_method_list out, methods, name
+    return unless methods
+
+    out << RDoc::Markup::Heading.new(1, "#{name}:")
+    out << RDoc::Markup::BlankLine.new
+
+    out.push(*methods.map do |method|
+      RDoc::Markup::Verbatim.new '  ', method
+    end)
+
+    out << RDoc::Markup::BlankLine.new
+  end
+
+  ##
+  # Returns ancestor classes of +klass+
+
+  def ancestors_of klass
+    ancestors = []
+
+    unexamined = [klass]
+    seen = []
+
+    loop do
+      break if unexamined.empty?
+      current = unexamined.shift
+      seen << current
+
+      stores = classes[current]
+
+      break unless stores and not stores.empty?
+
+      klasses = stores.map do |store|
+        store.ancestors[current]
+      end.flatten.uniq
+
+      klasses = klasses - seen
+
+      ancestors.push(*klasses)
+      unexamined.push(*klasses)
+    end
+
+    ancestors.reverse
+  end
+
+  ##
+  # For RubyGems backwards compatibility
+
+  def class_cache # :nodoc:
+  end
+
+  ##
+  # Hash mapping a known class or module to the stores it can be loaded from
+
+  def classes
+    return @classes if @classes
+
+    @classes = {}
+
+    @stores.each do |store|
+      store.cache[:modules].each do |mod|
+        # using default block causes searched-for modules to be added
+        @classes[mod] ||= []
+        @classes[mod] << store
+      end
+    end
+
+    @classes
+  end
+
+  ##
+  # Completes +name+ based on the caches.  For Readline
+
+  def complete name
+    klasses = classes.keys
+    completions = []
+
+    klass, selector, method = parse_name name
+
+    # may need to include Foo when given Foo::
+    klass_name = method ? name : klass
+
+    if name !~ /#|\./ then
+      completions.push(*klasses.grep(/^#{klass_name}/))
+    elsif selector then
+      completions << klass if classes.key? klass
+    elsif classes.key? klass_name then
+      completions << klass_name
+    end
+
+    if completions.include? klass and name =~ /#|\.|::/ then
+      methods = list_methods_matching name
+
+      if not methods.empty? then
+        # remove Foo if given Foo:: and a method was found
+        completions.delete klass
+      elsif selector then
+        # replace Foo with Foo:: as given
+        completions.delete klass
+        completions << "#{klass}#{selector}"
+      end
+
+      completions.push(*methods)
+    end
+
+    completions.sort
+  end
+
+  ##
+  # Converts +document+ to text and writes it to the pager
+
+  def display document
+    page do |io|
+      text = document.accept formatter(io)
+
+      io.write text
+    end
+  end
+
+  ##
+  # Outputs formatted RI data for class +name+.  Groups undocumented classes
+
+  def display_class name
+    return if name =~ /#|\./
+
+    klasses = []
+    includes = []
+
+    found = @stores.map do |store|
+      begin
+        klass = store.load_class name
+        klasses  << klass
+        includes << [klass.includes, store] if klass.includes
+        [store, klass]
+      rescue Errno::ENOENT
+      end
+    end.compact
+
+    return if found.empty?
+
+    also_in = []
+
+    includes.reject! do |modules,| modules.empty? end
+
+    out = RDoc::Markup::Document.new
+
+    add_class out, name, klasses
+
+    add_includes out, includes
+
+    found.each do |store, klass|
+      comment = klass.comment
+      class_methods    = store.class_methods[klass.full_name]
+      instance_methods = store.instance_methods[klass.full_name]
+      attributes       = store.attributes[klass.full_name]
+
+      if comment.empty? and !(instance_methods or class_methods) then
+        also_in << store
+        next
+      end
+
+      add_from out, store
+
+      unless comment.empty? then
+        out << RDoc::Markup::Rule.new(1)
+        out << comment
+      end
+
+      if class_methods or instance_methods or not klass.constants.empty? then
+        out << RDoc::Markup::Rule.new
+      end
+
+      unless klass.constants.empty? then
+        out << RDoc::Markup::Heading.new(1, "Constants:")
+        out << RDoc::Markup::BlankLine.new
+        list = RDoc::Markup::List.new :NOTE
+
+        constants = klass.constants.sort_by { |constant| constant.name }
+
+        list.push(*constants.map do |constant|
+          parts = constant.comment.parts if constant.comment
+          parts << RDoc::Markup::Paragraph.new('[not documented]') if
+            parts.empty?
+
+          RDoc::Markup::ListItem.new(constant.name, *parts)
+        end)
+
+        out << list
+      end
+
+      add_method_list out, class_methods,    'Class methods'
+      add_method_list out, instance_methods, 'Instance methods'
+      add_method_list out, attributes,       'Attributes'
+
+      out << RDoc::Markup::BlankLine.new
+    end
+
+    add_also_in out, also_in
+
+    display out
+  end
+
+  ##
+  # Outputs formatted RI data for method +name+
+
+  def display_method name
+    found = load_methods_matching name
+
+    raise NotFoundError, name if found.empty?
+
+    out = RDoc::Markup::Document.new
+
+    out << RDoc::Markup::Heading.new(1, name)
+    out << RDoc::Markup::BlankLine.new
+
+    found.each do |store, methods|
+      methods.each do |method|
+        out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
+
+        unless name =~ /^#{Regexp.escape method.parent_name}/ then
+          out << RDoc::Markup::Heading.new(3, "Implementation from #{method.parent_name}")
+        end
+        out << RDoc::Markup::Rule.new(1)
+
+        if method.arglists then
+          arglists = method.arglists.chomp.split "\n"
+          arglists = arglists.map { |line| ['  ', line, "\n"] }
+          out << RDoc::Markup::Verbatim.new(*arglists.flatten)
+          out << RDoc::Markup::Rule.new(1)
+        end
+
+        out << RDoc::Markup::BlankLine.new
+        out << method.comment
+        out << RDoc::Markup::BlankLine.new
+      end
+    end
+
+    display out
+  end
+
+  ##
+  # Outputs formatted RI data for the class or method +name+.
+  #
+  # Returns true if +name+ was found, false if it was not an alternative could
+  # be guessed, raises an error if +name+ couldn't be guessed.
+
+  def display_name name
+    return true if display_class name
+
+    display_method name if name =~ /::|#|\./
+
+    true
+  rescue NotFoundError
+    matches = list_methods_matching name if name =~ /::|#|\./
+    matches = classes.keys.grep(/^#{name}/) if matches.empty?
+
+    raise if matches.empty?
+
+    page do |io|
+      io.puts "#{name} not found, maybe you meant:"
+      io.puts
+      io.puts matches.join("\n")
+    end
+
+    false
+  end
+
+  ##
+  # Displays each name in +name+
+
+  def display_names names
+    names.each do |name|
+      name = expand_name name
+
+      display_name name
+    end
+  end
+  ##
+  # Expands abbreviated klass +klass+ into a fully-qualified class.  "Zl::Da"
+  # will be expanded to Zlib::DataError.
+
+  def expand_class klass
+    klass.split('::').inject '' do |expanded, klass_part|
+      expanded << '::' unless expanded.empty?
+      short = expanded << klass_part
+
+      subset = classes.keys.select do |klass_name|
+        klass_name =~ /^#{expanded}[^:]*$/
+      end
+
+      abbrevs = Abbrev.abbrev subset
+
+      expanded = abbrevs[short]
+
+      raise NotFoundError, short unless expanded
+
+      expanded.dup
+    end
+  end
+
+  ##
+  # Expands the class portion of +name+ into a fully-qualified class.  See
+  # #expand_class.
+
+  def expand_name name
+    klass, selector, method = parse_name name
+
+    return [selector, method].join if klass.empty?
+
+    "#{expand_class klass}#{selector}#{method}"
+  end
+
+  ##
+  # Yields items matching +name+ including the store they were found in, the
+  # class being searched for, the class they were found in (an ancestor) the
+  # types of methods to look up (from #method_type), and the method name being
+  # searched for
+
+  def find_methods name
+    klass, selector, method = parse_name name
+
+    types = method_type selector
+
+    klasses = nil
+    ambiguous = klass.empty?
+
+    if ambiguous then
+      klasses = classes.keys
+    else
+      klasses = ancestors_of klass
+      klasses.unshift klass
+    end
+
+    methods = []
+
+    klasses.each do |ancestor|
+      ancestors = classes[ancestor]
+
+      next unless ancestors
+
+      klass = ancestor if ambiguous
+
+      ancestors.each do |store|
+        methods << [store, klass, ancestor, types, method]
+      end
+    end
+
+    methods = methods.sort_by do |_, k, a, _, m|
+      [k, a, m].compact
+    end
+
+    methods.each do |item|
+      yield(*item) # :yields: store, klass, ancestor, types, method
+    end
+
+    self
+  end
+
+  ##
+  # Creates a new RDoc::Markup::Formatter.  If a formatter is given with -f,
+  # use it.  If we're outputting to a pager, use bs, otherwise ansi.
+
+  def formatter(io)
+    if @formatter_klass then
+      @formatter_klass.new
+    elsif paging? or !io.tty? then
+      RDoc::Markup::ToBs.new
+    else
+      RDoc::Markup::ToAnsi.new
+    end
+  end
+
+  ##
+  # Runs ri interactively using Readline if it is available.
+
+  def interactive
+    puts "\nEnter the method name you want to look up."
+
+    if defined? Readline then
+      Readline.completion_proc = method :complete
+      puts "You can use tab to autocomplete."
+    end
+
+    puts "Enter a blank line to exit.\n\n"
+
+    loop do
+      name = if defined? Readline then
+               Readline.readline ">> "
+             else
+               print ">> "
+               $stdin.gets
+             end
+
+      return if name.nil? or name.empty?
+
+      name = expand_name name.strip
+
+      begin
+        display_name name
+      rescue NotFoundError => e
+        puts e.message
+      end
+    end
+
+  rescue Interrupt
+    exit
+  end
+
+  ##
+  # Lists classes known to ri
+
+  def list_known_classes
+    classes = []
+
+    stores.each do |store|
+      classes << store.modules
+    end
+
+    classes = classes.flatten.uniq.sort
+
+    page do |io|
+      if paging? or io.tty? then
+        io.puts "Classes and Modules known to ri:"
+        io.puts
+      end
+
+      io.puts classes.join("\n")
+    end
+  end
+
+  ##
+  # Returns an Array of methods matching +name+
+
+  def list_methods_matching name
+    found = []
+
+    find_methods name do |store, klass, ancestor, types, method|
+      if types == :instance or types == :both then
+        methods = store.instance_methods[ancestor]
+
+        if methods then
+          matches = methods.grep(/^#{method}/)
+
+          matches = matches.map do |match|
+            "#{klass}##{match}"
+          end
+
+          found.push(*matches)
+        end
+      end
+
+      if types == :class or types == :both then
+        methods = store.class_methods[ancestor]
+
+        next unless methods
+        matches = methods.grep(/^#{method}/)
+
+        matches = matches.map do |match|
+          "#{klass}::#{match}"
+        end
+
+        found.push(*matches)
+      end
+    end
+
+    found.uniq
+  end
+
+  ##
+  # Loads RI data for method +name+ on +klass+ from +store+.  +type+ and
+  # +cache+ indicate if it is a class or instance method.
+
+  def load_method store, cache, klass, type, name
+    methods = store.send(cache)[klass]
+
+    return unless methods
+
+    method = methods.find do |method_name|
+      method_name == name
+    end
+
+    return unless method
+
+    store.load_method klass, "#{type}#{method}"
+  end
+
+  ##
+  # Returns an Array of RI data for methods matching +name+
+
+  def load_methods_matching name
+    found = []
+
+    find_methods name do |store, klass, ancestor, types, method|
+      methods = []
+
+      methods << load_method(store, :class_methods, ancestor, '::',  method) if
+        types == :class or types == :both
+
+      methods << load_method(store, :instance_methods, ancestor, '#',  method) if
+        types == :instance or types == :both
+
+      found << [store, methods.compact]
+    end
+
+    found.reject do |path, methods| methods.empty? end
+  end
+
+  ##
+  # Returns the type of method (:both, :instance, :class) for +selector+
+
+  def method_type selector
+    case selector
+    when '.', nil then :both
+    when '#'      then :instance
+    else               :class
+    end
+  end
+
+  ##
+  # Paginates output through a pager program.
+
+  def page
+    if pager = setup_pager then
+      begin
+        yield pager
+      ensure
+        pager.close
+      end
+    else
+      yield $stdout
+    end
+  rescue Errno::EPIPE
+  ensure
+    @paging = false
+  end
+
+  ##
+  # Are we using a pager?
+
+  def paging?
+    @paging
+  end
+
+  ##
+  # Extract the class, selector and method name parts from +name+ like
+  # Foo::Bar#baz.
+  #
+  # NOTE: Given Foo::Bar, Bar is considered a class even though it may be a
+  #       method
+
+  def parse_name(name)
+    parts = name.split(/(::|#|\.)/)
+
+    if parts.length == 1 then
+      if parts.first =~ /^[a-z]/ then
+        type = '.'
+        meth = parts.pop
+      else
+        type = nil
+        meth = nil
+      end
+    elsif parts.length == 2 or parts.last =~ /::|#|\./ then
+      type = parts.pop
+      meth = nil
+    elsif parts[-2] != '::' or parts.last !~ /^[A-Z]/ then
+      meth = parts.pop
+      type = parts.pop
+    end
+
+    klass = parts.join
+
+    [klass, type, meth]
+  end
+
+  ##
+  # Looks up and displays ri data according to the options given.
+
+  def run
+    if @list_doc_dirs then
+      puts @doc_dirs
+    elsif @interactive then
+      interactive
+    elsif @names.empty? then
+      list_known_classes
+    else
+      display_names @names
+    end
+  rescue NotFoundError => e
+    abort e.message
+  end
+
+  ##
+  # Sets up a pager program to pass output through.  Tries the RI_PAGER and
+  # PAGER environment variables followed by pager, less then more.
+
+  def setup_pager
+    return if @use_stdout
+
+    pagers = [ENV['RI_PAGER'], ENV['PAGER'], 'pager', 'less', 'more']
+
+    pagers.compact.uniq.each do |pager|
+      next unless File.exist? pager
+
+      io = IO.popen pager, "w" rescue next
+
+      next if $? and $?.exited? # pager didn't work
+
+      @paging = true
+
+      return io
+    end
+
+    @use_stdout = true
+
+    nil
+  end
+
+end
+
diff --git a/lib/rdoc/ri/formatter.rb b/lib/rdoc/ri/formatter.rb
new file mode 100644
index 0000000000..84d37a9d31
--- /dev/null
+++ b/lib/rdoc/ri/formatter.rb
@@ -0,0 +1,5 @@
+##
+# For RubyGems backwards compatibility
+
+module RDoc::RI::Formatter # :nodoc:
+end
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
new file mode 100644
index 0000000000..df12045203
--- /dev/null
+++ b/lib/rdoc/ri/paths.rb
@@ -0,0 +1,112 @@
+require 'rdoc/ri'
+
+##
+# The directories where ri data lives.
+
+module RDoc::RI::Paths
+
+  #:stopdoc:
+  require 'rbconfig'
+
+  version = RbConfig::CONFIG['ruby_version']
+
+  base    = File.join RbConfig::CONFIG['ridir'], version
+  SYSDIR  = File.join base, "system"
+  SITEDIR = File.join base, "site"
+  HOMEDIR = (File.expand_path('~/.rdoc') rescue nil)
+  #:startdoc:
+
+  @gemdirs = nil
+
+  ##
+  # Iterates over each selected path yielding the directory and type.
+  #
+  # Yielded types:
+  # :system:: Where Ruby's ri data is stored.  Yielded when +system+ is
+  #           true
+  # :site:: Where ri for installed libraries are stored.  Yielded when
+  #         +site+ is true.  Normally no ri data is stored here.
+  # :home:: ~/.ri.  Yielded when +home+ is true.
+  # :gem:: ri data for an installed gem.  Yielded when +gems+ is true.
+  # :extra:: ri data directory from the command line.  Yielded for each
+  #          entry in +extra_dirs+
+
+  def self.each system, site, home, gems, *extra_dirs # :yields: directory, type
+    extra_dirs.each do |dir|
+      yield dir, :extra
+    end
+
+    yield SYSDIR,  :system if system
+    yield SITEDIR, :site   if site
+    yield HOMEDIR, :home   if home
+
+    gemdirs.each do |dir|
+      yield dir, :gem
+    end if gems
+
+    nil
+  end
+
+  ##
+  # The latest installed gems' ri directories
+
+  def self.gemdirs
+    return @gemdirs if @gemdirs
+
+    require 'rubygems' unless defined?(Gem)
+
+    # HACK dup'd from Gem.latest_partials and friends
+    all_paths = []
+
+    all_paths = Gem.path.map do |dir|
+      Dir[File.join(dir, 'doc', '*', 'ri')]
+    end.flatten
+
+    ri_paths = {}
+
+    all_paths.each do |dir|
+      base = File.basename File.dirname(dir)
+      if base =~ /(.*)-((\d+\.)*\d+)/ then
+        name, version = $1, $2
+        ver = Gem::Version.new version
+        if ri_paths[name].nil? or ver > ri_paths[name][0] then
+          ri_paths[name] = [ver, dir]
+        end
+      end
+    end
+
+    @gemdirs = ri_paths.map { |k,v| v.last }.sort
+  rescue LoadError
+    @gemdirs = []
+  end
+
+  ##
+  # Returns existing directories from the selected documentation directories
+  # as an Array.
+  #
+  # See also ::each
+
+  def self.path(system, site, home, gems, *extra_dirs)
+    path = raw_path system, site, home, gems, *extra_dirs
+
+    path.select { |directory| File.directory? directory }
+  end
+
+  ##
+  # Returns selected documentation directories including nonexistent
+  # directories.
+  #
+  # See also ::each
+
+  def self.raw_path(system, site, home, gems, *extra_dirs)
+    path = []
+
+    each(system, site, home, gems, *extra_dirs) do |dir, type|
+      path << dir
+    end
+
+    path.compact
+  end
+
+end
+
diff --git a/lib/rdoc/ri/ri_cache.rb b/lib/rdoc/ri/ri_cache.rb
deleted file mode 100644
index 1844ac969e..0000000000
--- a/lib/rdoc/ri/ri_cache.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-module RI
-
-  class ClassEntry
-
-    attr_reader :name
-    attr_reader :path_names
-    
-    def initialize(path_name, name, in_class)
-      @path_names = [ path_name ]
-      @name = name
-      @in_class = in_class
-      @class_methods    = []
-      @instance_methods = []
-      @inferior_classes = []
-    end
-
-    # We found this class in more tha one place, so add
-    # in the name from there.
-    def add_path(path)
-      @path_names << path
-    end
-
-    # read in our methods and any classes
-    # and modules in our namespace. Methods are
-    # stored in files called name-c|i.yaml,
-    # where the 'name' portion is the external
-    # form of the method name and the c|i is a class|instance
-    # flag
-
-    def load_from(dir)
-      Dir.foreach(dir) do |name|
-        next if name =~ /^\./
-
-        # convert from external to internal form, and
-        # extract the instance/class flag
-
-        if name =~ /^(.*?)-(c|i).yaml$/
-          external_name = $1
-          is_class_method = $2 == "c"
-          internal_name = RiWriter.external_to_internal(external_name)
-          list = is_class_method ? @class_methods : @instance_methods
-          path = File.join(dir, name)
-          list << MethodEntry.new(path, internal_name, is_class_method, self)
-        else
-          full_name = File.join(dir, name)
-          if File.directory?(full_name)
-            inf_class = @inferior_classes.find {|c| c.name == name }
-            if inf_class
-              inf_class.add_path(full_name)
-            else
-              inf_class = ClassEntry.new(full_name, name, self)
-              @inferior_classes << inf_class
-            end
-            inf_class.load_from(full_name)
-          end
-        end
-      end
-    end
-
-    # Return a list of any classes or modules that we contain
-    # that match a given string
-
-    def contained_modules_matching(name)
-      @inferior_classes.find_all {|c| c.name[name]}
-    end
-
-    def classes_and_modules
-      @inferior_classes
-    end
-
-    # Return an exact match to a particular name
-    def contained_class_named(name)
-      @inferior_classes.find {|c| c.name == name}
-    end
-
-    # return the list of local methods matching name
-    # We're split into two because we need distinct behavior
-    # when called from the _toplevel_
-    def methods_matching(name, is_class_method)
-      local_methods_matching(name, is_class_method)
-    end
-
-    # Find methods matching 'name' in ourselves and in
-    # any classes we contain
-    def recursively_find_methods_matching(name, is_class_method)
-      res = local_methods_matching(name, is_class_method)
-      @inferior_classes.each do |c|
-        res.concat(c.recursively_find_methods_matching(name, is_class_method))
-      end
-      res
-    end
-
-
-    # Return our full name
-    def full_name
-      res = @in_class.full_name
-      res << "::" unless res.empty?
-      res << @name
-    end
-
-    # Return a list of all out method names
-    def all_method_names
-      res = @class_methods.map {|m| m.full_name }
-      @instance_methods.each {|m| res << m.full_name}
-      res
-    end
-
-    private
-
-    # Return a list of all our methods matching a given string.
-    # Is +is_class_methods+ if 'nil', we don't care if the method
-    # is a class method or not, otherwise we only return
-    # those methods that match
-    def local_methods_matching(name, is_class_method)
-
-      list = case is_class_method
-             when nil then  @class_methods + @instance_methods
-             when true then @class_methods
-             when false then @instance_methods
-             else fail "Unknown is_class_method: #{is_class_method.inspect}"
-             end
-
-      list.find_all {|m| m.name;  m.name[name]}
-    end
-  end
-
-  # A TopLevelEntry is like a class entry, but when asked to search
-  # for methods searches all classes, not just itself
-
-  class TopLevelEntry < ClassEntry
-    def methods_matching(name, is_class_method)
-      res = recursively_find_methods_matching(name, is_class_method)
-    end
-
-    def full_name
-      ""
-    end
-
-    def module_named(name)
-      
-    end
-
-  end
-
-  class MethodEntry
-    attr_reader :name
-    attr_reader :path_name
-
-    def initialize(path_name, name, is_class_method, in_class)
-      @path_name = path_name
-      @name = name
-      @is_class_method = is_class_method
-      @in_class = in_class
-    end
-
-    def full_name
-      res = @in_class.full_name
-      unless res.empty?
-        if @is_class_method
-          res << "::"
-        else
-          res << "#"
-        end
-      end
-      res << @name
-    end
-  end
-
-  # We represent everything know about all 'ri' files
-  # accessible to this program
-
-  class RiCache
-
-    attr_reader :toplevel
-
-    def initialize(dirs)
-      # At the top level we have a dummy module holding the
-      # overall namespace
-      @toplevel = TopLevelEntry.new('', '::', nil)
-
-      dirs.each do |dir|
-        @toplevel.load_from(dir)
-      end
-    end
-
-  end
-end
diff --git a/lib/rdoc/ri/ri_descriptions.rb b/lib/rdoc/ri/ri_descriptions.rb
deleted file mode 100644
index e5ea9f2fbf..0000000000
--- a/lib/rdoc/ri/ri_descriptions.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require 'yaml'
-require 'rdoc/markup/simple_markup/fragments'
-
-# Descriptions are created by RDoc (in ri_generator) and
-# written out in serialized form into the documentation
-# tree. ri then reads these to generate the documentation
-
-module RI
-  class NamedThing
-    attr_reader :name
-    def initialize(name)
-      @name = name
-    end
-    def <=>(other)
-      @name <=> other.name
-    end
-
-    def hash
-      @name.hash
-    end
-
-    def eql?(other)
-      @name.eql?(other)
-    end
-  end
-
-#  Alias          = Struct.new(:old_name, :new_name)
-
-  class AliasName < NamedThing
-  end
-
-  class Attribute < NamedThing
-    attr_reader :rw, :comment
-    def initialize(name, rw, comment)
-      super(name)
-      @rw = rw
-      @comment = comment
-    end
-  end
-
-  class Constant < NamedThing
-    attr_reader :value, :comment
-    def initialize(name, value, comment)
-      super(name)
-      @value = value
-      @comment = comment
-    end
-  end
-
-  class IncludedModule < NamedThing
-  end
-
-
-  class MethodSummary < NamedThing
-    def initialize(name="")
-      super
-    end
-  end
-
-
-
-  class Description
-    attr_accessor :name
-    attr_accessor :full_name
-    attr_accessor :comment
-
-    def serialize
-      self.to_yaml
-    end
-
-    def Description.deserialize(from)
-      YAML.load(from)
-    end
-
-    def <=>(other)
-      @name <=> other.name
-    end
-  end
-  
-  class ModuleDescription < Description
-    
-    attr_accessor :class_methods
-    attr_accessor :instance_methods
-    attr_accessor :attributes
-    attr_accessor :constants
-    attr_accessor :includes
-
-    # merge in another class desscription into this one
-    def merge_in(old)
-      merge(@class_methods, old.class_methods)
-      merge(@instance_methods, old.instance_methods)
-      merge(@attributes, old.attributes)
-      merge(@constants, old.constants)
-      merge(@includes, old.includes)
-      if @comment.nil? || @comment.empty?
-        @comment = old.comment
-      else
-        unless old.comment.nil? or old.comment.empty? then
-          @comment << SM::Flow::RULE.new
-          @comment.concat old.comment
-        end
-      end
-    end
-
-    def display_name
-      "Module"
-    end
-
-    # the 'ClassDescription' subclass overrides this
-    # to format up the name of a parent
-    def superclass_string
-      nil
-    end
-
-    private
-
-    def merge(into, from)
-      names = {}
-      into.each {|i| names[i.name] = i }
-      from.each {|i| names[i.name] = i }
-      into.replace(names.keys.sort.map {|n| names[n]})
-    end
-  end
-  
-  class ClassDescription < ModuleDescription
-    attr_accessor :superclass
-
-    def display_name
-      "Class"
-    end
-
-    def superclass_string
-      if @superclass && @superclass != "Object"
-        @superclass
-      else
-        nil
-      end
-    end
-  end
-
-
-  class MethodDescription < Description
-    
-    attr_accessor :is_class_method
-    attr_accessor :visibility
-    attr_accessor :block_params
-    attr_accessor :is_singleton
-    attr_accessor :aliases
-    attr_accessor :is_alias_for
-    attr_accessor :params
-
-  end
-  
-end
diff --git a/lib/rdoc/ri/ri_display.rb b/lib/rdoc/ri/ri_display.rb
deleted file mode 100644
index 67962fc2c1..0000000000
--- a/lib/rdoc/ri/ri_display.rb
+++ /dev/null
@@ -1,255 +0,0 @@
-require 'rdoc/ri/ri_util'
-require 'rdoc/ri/ri_formatter'
-require 'rdoc/ri/ri_options'
-
-
-# This is a kind of 'flag' module. If you want to write your
-# own 'ri' display module (perhaps because you'r writing
-# an IDE or somesuch beast), you simply write a class
-# which implements the various 'display' methods in 'DefaultDisplay',
-# and include the 'RiDisplay' module in that class. 
-#
-# To access your class from the command line, you can do
-#
-#    ruby -r <your source file>  ../ri ....
-#
-# If folks _really_ want to do this from the command line,
-# I'll build an option in
-
-module RiDisplay
-  @@display_class = nil
-
-  def RiDisplay.append_features(display_class)
-    @@display_class = display_class
-  end
-
-  def RiDisplay.new(*args)
-    @@display_class.new(*args)
-  end
-end
-
-######################################################################
-#
-# A paging display module. Uses the ri_formatter class to do the
-# actual presentation
-#
-
-class  DefaultDisplay
-
-  include RiDisplay
-
-  def initialize(options)
-    @options = options
-    @formatter = @options.formatter.new(@options, "     ")
-  end    
-  
-  
-  ######################################################################
-  
-  def display_usage
-    page do
-      RI::Options::OptionList.usage(short_form=true)
-    end
-  end
-
-
-  ######################################################################
-  
-  def display_method_info(method)
-    page do
-      @formatter.draw_line(method.full_name)
-      display_params(method)
-      @formatter.draw_line
-      display_flow(method.comment)
-      if method.aliases && !method.aliases.empty?
-        @formatter.blankline
-        aka = "(also known as "
-        aka << method.aliases.map {|a| a.name }.join(", ") 
-        aka << ")"
-        @formatter.wrap(aka)
-      end
-    end
-  end
-  
-  ######################################################################
-  
-  def display_class_info(klass, ri_reader)
-    page do 
-      superclass = klass.superclass_string
-      
-      if superclass
-        superclass = " < " + superclass
-      else
-        superclass = ""
-      end
-      
-      @formatter.draw_line(klass.display_name + ": " +
-                           klass.full_name + superclass)
-      
-      display_flow(klass.comment)
-      @formatter.draw_line 
-    
-      unless klass.includes.empty?
-        @formatter.blankline
-        @formatter.display_heading("Includes:", 2, "")
-        incs = []
-        klass.includes.each do |inc|
-          inc_desc = ri_reader.find_class_by_name(inc.name)
-          if inc_desc
-            str = inc.name + "("
-            str << inc_desc.instance_methods.map{|m| m.name}.join(", ")
-            str << ")"
-            incs << str
-          else
-            incs << inc.name
-          end
-      end
-        @formatter.wrap(incs.sort.join(', '))
-      end
-      
-      unless klass.constants.empty?
-        @formatter.blankline
-        @formatter.display_heading("Constants:", 2, "")
-        len = 0
-        klass.constants.each { |c| len = c.name.length if c.name.length > len }
-        len += 2
-        klass.constants.each do |c|
-          @formatter.wrap(c.value, 
-                          @formatter.indent+((c.name+":").ljust(len)))
-        end 
-      end
-      
-      unless klass.class_methods.empty?
-        @formatter.blankline
-        @formatter.display_heading("Class methods:", 2, "")
-        @formatter.wrap(klass.class_methods.map{|m| m.name}.sort.join(', '))
-      end
-      
-      unless klass.instance_methods.empty?
-        @formatter.blankline
-        @formatter.display_heading("Instance methods:", 2, "")
-        @formatter.wrap(klass.instance_methods.map{|m| m.name}.sort.join(', '))
-      end
-      
-      unless klass.attributes.empty?
-        @formatter.blankline
-        @formatter.wrap("Attributes:", "")
-        @formatter.wrap(klass.attributes.map{|a| a.name}.sort.join(', '))
-      end
-    end
-  end
-  
-  ######################################################################
-  
-  # Display a list of method names
-  
-  def display_method_list(methods)
-    page do
-      puts "More than one method matched your request. You can refine"
-      puts "your search by asking for information on one of:\n\n"
-      @formatter.wrap(methods.map {|m| m.full_name} .join(", "))
-    end
-  end
-  
-  ######################################################################
-  
-  def display_class_list(namespaces)
-    page do
-      puts "More than one class or module matched your request. You can refine"
-      puts "your search by asking for information on one of:\n\n"
-      @formatter.wrap(namespaces.map {|m| m.full_name}.join(", "))
-    end
-  end
-  
-  ######################################################################
-
-  def list_known_classes(classes)
-    if classes.empty?
-      warn_no_database
-    else
-      page do 
-        @formatter.draw_line("Known classes and modules")
-        @formatter.blankline
-        @formatter.wrap(classes.sort.join(", "))
-      end
-    end
-  end
-
-  ######################################################################
-
-  def list_known_names(names)
-    if names.empty?
-      warn_no_database
-    else
-      page do 
-        names.each {|n| @formatter.raw_print_line(n)}
-      end
-    end
-  end
-
-  ######################################################################
-
-  private
-
-  ######################################################################
-
-  def page
-    return yield unless pager = setup_pager
-    begin
-      save_stdout = STDOUT.clone
-      STDOUT.reopen(pager)
-      yield
-    ensure
-      STDOUT.reopen(save_stdout)
-      save_stdout.close
-      pager.close
-    end
-  end
-
-  ######################################################################
-
-  def setup_pager
-    unless @options.use_stdout
-      for pager in [ ENV['PAGER'], "less", "more", 'pager' ].compact.uniq
-        return IO.popen(pager, "w") rescue nil
-      end
-      @options.use_stdout = true
-      nil
-    end
-  end
-
-  ######################################################################
-  
-  def display_params(method)
-
-    params = method.params
-
-    if params[0,1] == "("
-      if method.is_singleton
-        params = method.full_name + params
-      else
-        params = method.name + params
-      end
-    end
-    params.split(/\n/).each do |p|
-      @formatter.wrap(p) 
-      @formatter.break_to_newline
-    end
-  end
-  ######################################################################
-  
-  def display_flow(flow)
-    if !flow || flow.empty?
-      @formatter.wrap("(no description...)")
-    else
-      @formatter.display_flow(flow)
-    end
-  end
-
-  ######################################################################
-  
-  def warn_no_database
-    puts "Before using ri, you need to generate documentation"
-    puts "using 'rdoc' with the --ri option"
-  end
-end  # class RiDisplay
diff --git a/lib/rdoc/ri/ri_driver.rb b/lib/rdoc/ri/ri_driver.rb
deleted file mode 100644
index a00f20ee3b..0000000000
--- a/lib/rdoc/ri/ri_driver.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-require 'rdoc/ri/ri_paths'
-require 'rdoc/usage'
-require 'rdoc/ri/ri_cache'
-require 'rdoc/ri/ri_util'
-require 'rdoc/ri/ri_reader'
-require 'rdoc/ri/ri_formatter'
-require 'rdoc/ri/ri_options'
-
-
-######################################################################
-
-class  RiDriver
-
-  def initialize
-    @options = RI::Options.instance
-
-    args = ARGV
-    if ENV["RI"]
-      args = ENV["RI"].split.concat(ARGV)
-    end
-
-    @options.parse(args)
-
-    path = @options.path
-    report_missing_documentation @options.raw_path if path.empty?
-
-    @ri_reader = RI::RiReader.new(RI::RiCache.new(path))
-    @display   = @options.displayer
-  end
-  
-  # Couldn't find documentation in +path+, so tell the user what to do
-
-  def report_missing_documentation(path)
-    STDERR.puts "No ri documentation found in:"
-    path.each do |d|
-      STDERR.puts "     #{d}"
-    end
-    STDERR.puts "\nWas rdoc run to create documentation?\n\n"
-    RDoc::usage("Installing Documentation")
-  end
-  
-  ######################################################################
-  
-  # If the list of matching methods contains exactly one entry, or
-  # if it contains an entry that exactly matches the requested method,
-  # then display that entry, otherwise display the list of
-  # matching method names
-  
-  def report_method_stuff(requested_method_name, methods)
-    if methods.size == 1
-      method = @ri_reader.get_method(methods[0])
-      @display.display_method_info(method)
-    else
-      entries = methods.find_all {|m| m.name == requested_method_name}
-      if entries.size == 1
-        method = @ri_reader.get_method(entries[0])
-        @display.display_method_info(method)
-      else
-        @display.display_method_list(methods)
-      end
-    end
-  end
-  
-  ######################################################################
-  
-  def report_class_stuff(namespaces)
-    if namespaces.size == 1
-      klass = @ri_reader.get_class(namespaces[0])
-      @display.display_class_info(klass, @ri_reader)
-    else 
-#      entries = namespaces.find_all {|m| m.full_name == requested_class_name}
-#      if entries.size == 1
-#        klass = @ri_reader.get_class(entries[0])
-#        @display.display_class_info(klass, @ri_reader)
-#      else
-        @display.display_class_list(namespaces)
-#      end
-    end
-  end
-  
-  ######################################################################
-  
-  
-  def get_info_for(arg)
-    desc = NameDescriptor.new(arg)
-
-    namespaces = @ri_reader.top_level_namespace
-    
-    for class_name in desc.class_names
-      namespaces = @ri_reader.lookup_namespace_in(class_name, namespaces)
-      if namespaces.empty?
-        raise RiError.new("Nothing known about #{arg}")
-      end
-    end
-
-    # at this point, if we have multiple possible namespaces, but one
-    # is an exact match for our requested class, prune down to just it
-
-    full_class_name = desc.full_class_name
-    entries = namespaces.find_all {|m| m.full_name == full_class_name}
-    namespaces = entries if entries.size == 1
-
-    if desc.method_name.nil?
-      report_class_stuff(namespaces)
-    else
-      methods = @ri_reader.find_methods(desc.method_name, 
-                                        desc.is_class_method,
-                                        namespaces)
-
-      if methods.empty?
-        raise RiError.new("Nothing known about #{arg}")
-      else
-        report_method_stuff(desc.method_name, methods)
-      end
-    end
-  end
-
-  ######################################################################
-
-  def process_args
-    if @options.list_classes
-      classes = @ri_reader.full_class_names
-      @display.list_known_classes(classes)
-    elsif @options.list_names
-      names = @ri_reader.all_names
-      @display.list_known_names(names)
-    else
-      if ARGV.size.zero?
-        @display.display_usage
-      else
-        begin
-          ARGV.each do |arg|
-            get_info_for(arg)
-          end
-        rescue RiError => e
-          STDERR.puts(e.message)
-          exit(1)
-        end
-      end
-    end
-  end
-
-end  # class RiDriver
diff --git a/lib/rdoc/ri/ri_formatter.rb b/lib/rdoc/ri/ri_formatter.rb
deleted file mode 100644
index 34eb561ca3..0000000000
--- a/lib/rdoc/ri/ri_formatter.rb
+++ /dev/null
@@ -1,672 +0,0 @@
-module RI
-  class TextFormatter
-
-    attr_reader :indent
-    
-    def initialize(options, indent)
-      @options = options
-      @width   = options.width
-      @indent  = indent
-    end
-    
-    
-    ######################################################################
-    
-    def draw_line(label=nil)
-      len = @width
-      len -= (label.size+1) if label
-      print "-"*len
-      if label
-        print(" ")
-        bold_print(label) 
-      end
-      puts
-    end
-    
-    ######################################################################
-    
-    def wrap(txt,  prefix=@indent, linelen=@width)
-      return unless txt && !txt.empty?
-      work = conv_markup(txt)
-      textLen = linelen - prefix.length
-      patt = Regexp.new("^(.{0,#{textLen}})[ \n]")
-      next_prefix = prefix.tr("^ ", " ")
-
-      res = []
-
-      while work.length > textLen
-        if work =~ patt
-          res << $1
-          work.slice!(0, $&.length)
-        else
-          res << work.slice!(0, textLen)
-        end
-      end
-      res << work if work.length.nonzero?
-      puts(prefix + res.join("\n" + next_prefix))
-    end
-
-    ######################################################################
-
-    def blankline
-      puts
-    end
-    
-    ######################################################################
-
-    # called when we want to ensure a nbew 'wrap' starts on a newline
-    # Only needed for HtmlFormatter, because the rest do their
-    # own line breaking
-
-    def break_to_newline
-    end
-    
-    ######################################################################
-
-    def bold_print(txt)
-      print txt
-    end
-
-    ######################################################################
-
-    def raw_print_line(txt)
-      puts txt
-    end
-
-    ######################################################################
-
-    # convert HTML entities back to ASCII
-    def conv_html(txt)
-      txt.
-          gsub(/&gt;/, '>').
-          gsub(/&lt;/, '<').
-          gsub(/&quot;/, '"').
-          gsub(/&amp;/, '&')
-          
-    end
-
-    # convert markup into display form
-    def conv_markup(txt)
-      txt.
-          gsub(%r{<tt>(.*?)</tt>}) { "+#$1+" } .
-          gsub(%r{<code>(.*?)</code>}) { "+#$1+" } .
-          gsub(%r{<b>(.*?)</b>}) { "*#$1*" } .
-          gsub(%r{<em>(.*?)</em>}) { "_#$1_" }
-    end
-
-    ######################################################################
-
-    def display_list(list)
-      case list.type
-
-      when SM::ListBase::BULLET 
-        prefixer = proc { |ignored| @indent + "*   " }
-
-      when SM::ListBase::NUMBER,
-      SM::ListBase::UPPERALPHA,
-      SM::ListBase::LOWERALPHA
-
-        start = case list.type
-                when SM::ListBase::NUMBER      then 1
-                when  SM::ListBase::UPPERALPHA then 'A'
-                when SM::ListBase::LOWERALPHA  then 'a'
-                end
-        prefixer = proc do |ignored|
-          res = @indent + "#{start}.".ljust(4)
-          start = start.succ
-          res
-        end
-        
-      when SM::ListBase::LABELED
-        prefixer = proc do |li|
-          li.label
-        end
-
-      when SM::ListBase::NOTE
-        longest = 0
-        list.contents.each do |item|
-          if item.kind_of?(SM::Flow::LI) && item.label.length > longest
-            longest = item.label.length
-          end
-        end
-
-        prefixer = proc do |li|
-          @indent + li.label.ljust(longest+1)
-        end
-
-      else
-        fail "unknown list type"
-
-      end
-
-      list.contents.each do |item|
-        if item.kind_of? SM::Flow::LI
-          prefix = prefixer.call(item)
-          display_flow_item(item, prefix)
-        else
-          display_flow_item(item)
-        end
-       end
-    end
-
-    ######################################################################
-
-    def display_flow_item(item, prefix=@indent)
-      case item
-      when SM::Flow::P, SM::Flow::LI
-        wrap(conv_html(item.body), prefix)
-        blankline
-        
-      when SM::Flow::LIST
-        display_list(item)
-
-      when SM::Flow::VERB
-        display_verbatim_flow_item(item, @indent)
-
-      when SM::Flow::H
-        display_heading(conv_html(item.text), item.level, @indent)
-
-      when SM::Flow::RULE
-        draw_line
-
-      else
-        fail "Unknown flow element: #{item.class}"
-      end
-    end
-
-    ######################################################################
-
-    def display_verbatim_flow_item(item, prefix=@indent)
-        item.body.split(/\n/).each do |line|
-          print @indent, conv_html(line), "\n"
-        end
-        blankline
-    end
-
-    ######################################################################
-
-    def display_heading(text, level, indent)
-      text = strip_attributes(text)
-      case level
-      when 1
-        ul = "=" * text.length
-        puts
-        puts text.upcase
-        puts ul
-#        puts
-        
-      when 2
-        ul = "-" * text.length
-        puts
-        puts text
-        puts ul
-#        puts
-      else
-        print indent, text, "\n"
-      end
-    end
-
-
-    def display_flow(flow)
-      flow.each do |f|
-        display_flow_item(f)
-      end
-    end
-
-    def strip_attributes(txt)
-      tokens = txt.split(%r{(</?(?:b|code|em|i|tt)>)})
-      text = [] 
-      attributes = 0
-      tokens.each do |tok|
-        case tok
-        when %r{^</(\w+)>$}, %r{^<(\w+)>$}
-          ;
-        else
-          text << tok
-        end
-      end
-      text.join
-    end
-
-
-  end
-  
-  
-  ######################################################################
-  # Handle text with attributes. We're a base class: there are
-  # different presentation classes (one, for example, uses overstrikes
-  # to handle bold and underlining, while another using ANSI escape
-  # sequences
-  
-  class AttributeFormatter < TextFormatter
-    
-    BOLD      = 1
-    ITALIC    = 2
-    CODE      = 4
-
-    ATTR_MAP = {
-      "b"    => BOLD,
-      "code" => CODE,
-      "em"   => ITALIC,
-      "i"    => ITALIC,
-      "tt"   => CODE
-    }
-
-    # TODO: struct?
-    class AttrChar
-      attr_reader :char
-      attr_reader :attr
-
-      def initialize(char, attr)
-        @char = char
-        @attr = attr
-      end
-    end
-
-    
-    class AttributeString
-      attr_reader :txt
-
-      def initialize
-        @txt = []
-        @optr = 0
-      end
-
-      def <<(char)
-        @txt << char
-      end
-
-      def empty?
-        @optr >= @txt.length
-      end
-
-      # accept non space, then all following spaces
-      def next_word
-        start = @optr
-        len = @txt.length
-
-        while @optr < len && @txt[@optr].char != " "
-          @optr += 1
-        end
-
-        while @optr < len && @txt[@optr].char == " "
-          @optr += 1
-        end
-
-        @txt[start...@optr]
-      end
-    end
-
-    ######################################################################
-    # overrides base class. Looks for <tt>...</tt> etc sequences
-    # and generates an array of AttrChars. This array is then used
-    # as the basis for the split
-
-    def wrap(txt,  prefix=@indent, linelen=@width)
-      return unless txt && !txt.empty?
-
-      txt = add_attributes_to(txt)
-      next_prefix = prefix.tr("^ ", " ")
-      linelen -= prefix.size
-
-      line = []
-
-      until txt.empty?
-        word = txt.next_word
-        if word.size + line.size > linelen
-          write_attribute_text(prefix, line)
-          prefix = next_prefix
-          line = []
-        end
-        line.concat(word)
-      end
-
-      write_attribute_text(prefix, line) if line.length > 0
-    end
-
-    protected
-
-    # overridden in specific formatters
-
-    def write_attribute_text(prefix, line)
-      print prefix
-      line.each do |achar|
-        print achar.char
-      end
-      puts
-    end
-
-    # again, overridden
-
-    def bold_print(txt)
-      print txt
-    end
-
-    private
-
-    def add_attributes_to(txt)
-      tokens = txt.split(%r{(</?(?:b|code|em|i|tt)>)})
-      text = AttributeString.new
-      attributes = 0
-      tokens.each do |tok|
-        case tok
-        when %r{^</(\w+)>$} then attributes &= ~(ATTR_MAP[$1]||0)
-        when %r{^<(\w+)>$}  then attributes  |= (ATTR_MAP[$1]||0)
-        else
-          tok.split(//).each {|ch| text << AttrChar.new(ch, attributes)}
-        end
-      end
-      text
-    end
-
-  end
-
-
-  ##################################################
-  
-  # This formatter generates overstrike-style formatting, which
-  # works with pagers such as man and less.
-
-  class OverstrikeFormatter < AttributeFormatter
-
-    BS = "\C-h"
-
-    def write_attribute_text(prefix, line)
-      print prefix
-      line.each do |achar|
-        attr = achar.attr
-        if (attr & (ITALIC+CODE)) != 0
-          print "_", BS
-        end
-        if (attr & BOLD) != 0
-          print achar.char, BS
-        end
-        print achar.char
-      end
-      puts
-    end
-
-    # draw a string in bold
-    def bold_print(text)
-      text.split(//).each do |ch|
-        print ch, BS, ch
-      end
-    end
-  end
-
-  ##################################################
-  
-  # This formatter uses ANSI escape sequences
-  # to colorize stuff
-  # works with pages such as man and less.
-
-  class AnsiFormatter < AttributeFormatter
-
-    def initialize(*args)
-      print "\033[0m"
-      super
-    end
-
-    def write_attribute_text(prefix, line)
-      print prefix
-      curr_attr = 0
-      line.each do |achar|
-        attr = achar.attr
-        if achar.attr != curr_attr
-          update_attributes(achar.attr)
-          curr_attr = achar.attr
-        end
-        print achar.char
-      end
-      update_attributes(0) unless curr_attr.zero?
-      puts
-    end
-
-
-    def bold_print(txt)
-      print "\033[1m#{txt}\033[m"
-    end
-
-    HEADINGS = {
-      1 => [ "\033[1;32m", "\033[m" ] ,
-      2 => ["\033[4;32m", "\033[m" ],
-      3 => ["\033[32m", "\033[m" ]
-    }
-
-    def display_heading(text, level, indent)
-      level = 3 if level > 3
-      heading = HEADINGS[level]
-      print indent
-      print heading[0]
-      print strip_attributes(text)
-      puts heading[1]
-    end
-    
-    private
-
-    ATTR_MAP = {
-      BOLD   => "1",
-      ITALIC => "33",
-      CODE   => "36"
-    }
-
-    def update_attributes(attr)
-      str = "\033["
-      for quality in [ BOLD, ITALIC, CODE]
-        unless (attr & quality).zero?
-          str << ATTR_MAP[quality]
-        end
-      end
-      print str, "m"
-    end
-  end
-
-  ##################################################
-  
-  # This formatter uses HTML.
-
-  class HtmlFormatter < AttributeFormatter
-
-    def initialize(*args)
-      super
-    end
-
-    def write_attribute_text(prefix, line)
-      curr_attr = 0
-      line.each do |achar|
-        attr = achar.attr
-        if achar.attr != curr_attr
-          update_attributes(curr_attr, achar.attr)
-          curr_attr = achar.attr
-        end
-        print(escape(achar.char))
-      end
-      update_attributes(curr_attr, 0) unless curr_attr.zero?
-    end
-
-    def draw_line(label=nil)
-      if label != nil
-        bold_print(label)
-      end
-      puts("<hr>")
-    end
-
-    def bold_print(txt)
-      tag("b") { txt }
-    end
-
-    def blankline()
-      puts("<p>")
-    end
-
-    def break_to_newline
-      puts("<br>")
-    end
-
-    def display_heading(text, level, indent)
-      level = 4 if level > 4
-      tag("h#{level}") { text }
-      puts
-    end
-    
-    ######################################################################
-
-    def display_list(list)
-
-      case list.type
-      when SM::ListBase::BULLET 
-        list_type = "ul"
-        prefixer = proc { |ignored| "<li>" }
-
-      when SM::ListBase::NUMBER,
-      SM::ListBase::UPPERALPHA,
-      SM::ListBase::LOWERALPHA
-        list_type = "ol"
-        prefixer = proc { |ignored| "<li>" }
-        
-      when SM::ListBase::LABELED
-        list_type = "dl"
-        prefixer = proc do |li|
-          "<dt><b>" + escape(li.label) + "</b><dd>"
-        end
-
-      when SM::ListBase::NOTE
-        list_type = "table"
-        prefixer = proc do |li|
-          %{<tr valign="top"><td>#{li.label.gsub(/ /, '&nbsp;')}</td><td>}
-        end
-      else
-        fail "unknown list type"
-      end
-
-      print "<#{list_type}>"
-      list.contents.each do |item|
-        if item.kind_of? SM::Flow::LI
-          prefix = prefixer.call(item)
-          print prefix
-          display_flow_item(item, prefix)
-        else
-          display_flow_item(item)
-        end
-      end
-      print "</#{list_type}>"
-    end
-
-    def display_verbatim_flow_item(item, prefix=@indent)
-        print("<pre>")
-        puts item.body
-        puts("</pre>")
-    end
-
-    private
-
-    ATTR_MAP = {
-      BOLD   => "b>",
-      ITALIC => "i>",
-      CODE   => "tt>"
-    }
-
-    def update_attributes(current, wanted)
-      str = ""
-      # first turn off unwanted ones
-      off = current & ~wanted
-      for quality in [ BOLD, ITALIC, CODE]
-        if (off & quality) > 0
-          str << "</" + ATTR_MAP[quality]
-        end
-      end
-
-      # now turn on wanted
-      for quality in [ BOLD, ITALIC, CODE]
-        unless (wanted & quality).zero?
-          str << "<" << ATTR_MAP[quality]
-        end
-      end
-      print str
-    end
-
-    def tag(code)
-        print("<#{code}>")
-        print(yield)
-        print("</#{code}>")
-    end
-
-    def escape(str)
-      str.
-          gsub(/&/n, '&amp;').
-          gsub(/\"/n, '&quot;').
-          gsub(/>/n, '&gt;').
-          gsub(/</n, '&lt;')
-    end
-
-  end
-
-  ##################################################
-  
-  # This formatter reduces extra lines for a simpler output.
-  # It improves way output looks for tools like IRC bots.
-
-  class SimpleFormatter < TextFormatter
-
-    ######################################################################
-
-    # No extra blank lines
-
-    def blankline
-    end
-
-    ######################################################################
-
-    # Display labels only, no lines
-
-    def draw_line(label=nil)
-      unless label.nil? then
-        bold_print(label) 
-        puts
-      end
-    end
-
-    ######################################################################
-
-    # Place heading level indicators inline with heading.
-
-    def display_heading(text, level, indent)
-      text = strip_attributes(text)
-      case level
-      when 1
-        puts "= " + text.upcase
-      when 2
-        puts "-- " + text
-      else
-        print indent, text, "\n"
-      end
-    end
-
-  end
-
-
-  # Finally, fill in the list of known formatters
-
-  class TextFormatter
-
-    FORMATTERS = {
-      "ansi"   => AnsiFormatter,
-      "bs"     => OverstrikeFormatter,
-      "html"   => HtmlFormatter,
-      "plain"  => TextFormatter,
-      "simple" => SimpleFormatter,
-    }
-      
-    def TextFormatter.list
-      FORMATTERS.keys.sort.join(", ")
-    end
-
-    def TextFormatter.for(name)
-      FORMATTERS[name.downcase]
-    end
-
-  end
-
-end
-
-
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
deleted file mode 100644
index db9f4afecf..0000000000
--- a/lib/rdoc/ri/ri_options.rb
+++ /dev/null
@@ -1,313 +0,0 @@
-# We handle the parsing of options, and subsequently as a singleton
-# object to be queried for option values
-
-module RI
-
-  require 'rdoc/ri/ri_paths'
-  require 'rdoc/ri/ri_display'
-
-  VERSION_STRING = "ri v1.0.1 - 20041108"
-
-  class Options
-    
-    require 'singleton'
-    require 'getoptlong'
-    
-    include Singleton
-
-    # No not use a pager. Writable, because ri sets it if it
-    # can't find a pager
-    attr_accessor :use_stdout
-
-    # should we just display a class list and exit
-    attr_reader :list_classes
-
-    # should we display a list of all names
-    attr_reader :list_names
-
-    # The width of the output line
-    attr_reader :width
-
-    # the formatting we apply to the output
-    attr_reader :formatter
-
-    # the directory we search for original documentation
-    attr_reader :doc_dir
-
-    module OptionList
-      
-      OPTION_LIST = [
-        [ "--help",          "-h",   nil,
-          "you're looking at it" ],
-
-        [ "--classes",      "-c",   nil,
-          "Display the names of classes and modules we\n" +
-          "know about"],
-
-        [ "--doc-dir",      "-d",   "<dirname>",
-          "A directory to search for documentation. If not\n" +
-          "specified, we search the standard rdoc/ri directories.\n" +
-          "May be repeated."],
-
-        [ "--system",       nil,    nil,
-          "Include documentation from Ruby's standard library:\n  " +
-          RI::Paths::SYSDIR ],
-
-        [ "--site",         nil,    nil,
-          "Include documentation from libraries installed in site_lib:\n  " +
-          RI::Paths::SITEDIR ],
-
-        [ "--home",         nil,    nil,
-          "Include documentation stored in ~/.rdoc:\n  " +
-          (RI::Paths::HOMEDIR || "No ~/.rdoc found") ],
-
-        [ "--gems",         nil,    nil,
-          "Include documentation from Rubygems:\n  " +
-          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
-                                "No Rubygems ri found.") ],
-                                                           
-        [ "--format",       "-f",   "<name>",
-          "Format to use when displaying output:\n" +
-          "   " + RI::TextFormatter.list + "\n" +
-          "Use 'bs' (backspace) with most pager programs.\n" +
-          "To use ANSI, either also use the -T option, or\n" +
-          "tell your pager to allow control characters\n" +
-          "(for example using the -R option to less)"],
-
-        [ "--list-names",    "-l",   nil,
-          "List all the names known to RDoc, one per line"
-        ],
-
-        [ "--no-pager",      "-T",   nil,
-          "Send output directly to stdout." 
-        ],
-
-        [ "--width",         "-w",   "output width",
-        "Set the width of the output" ],
-
-        [ "--version",       "-v",   nil,
-         "Display the version of ri"
-        ],
-
-      ]
-
-      def OptionList.options
-        OPTION_LIST.map do |long, short, arg,|
-          option = []
-          option << long
-          option << short unless short.nil?
-          option << (arg ? GetoptLong::REQUIRED_ARGUMENT :
-                           GetoptLong::NO_ARGUMENT)
-          option
-        end
-      end
-
-
-      def OptionList.strip_output(text)
-        text =~ /^\s+/
-        leading_spaces = $&
-        text.gsub!(/^#{leading_spaces}/, '')
-        $stdout.puts text
-      end
-      
-      
-      # Show an error and exit
-      
-      def OptionList.error(msg)
-        $stderr.puts
-        $stderr.puts msg
-        $stderr.puts "\nFor help on options, try 'ri --help'\n\n"
-        exit 1
-      end
-      
-      # Show usage and exit
-      
-      def OptionList.usage(short_form=false)
-        
-        puts
-        puts(RI::VERSION_STRING)
-        puts
-        
-        name = File.basename($0)
-
-        directories = [
-          RI::Paths::SYSDIR,
-          RI::Paths::SITEDIR,
-          RI::Paths::HOMEDIR
-        ]
-
-        directories << "#{Gem.path}/doc/*/ri" if RI::Paths::GEMDIRS
-
-        directories = directories.join("\n    ")
-
-        OptionList.strip_output(<<-EOT)
-          Usage:
-
-            #{name} [options]  [names...]
-
-          Display information on Ruby classes, modules, and methods.
-          Give the names of classes or methods to see their documentation.
-          Partial names may be given: if the names match more than
-          one entity, a list will be shown, otherwise details on
-          that entity will be displayed.
-
-          Nested classes and modules can be specified using the normal
-          Name::Name notation, and instance methods can be distinguished
-          from class methods using "." (or "#") instead of "::".
-
-          For example:
-
-              ri  File
-              ri  File.new
-              ri  F.n
-              ri  zip
-
-          Note that shell quoting may be required for method names
-          containing punctuation:
-
-              ri 'Array.[]'
-              ri compact\\!
-
-          By default ri searches for documentation in the following
-          directories:
-
-              #{directories}
-
-          Specifying the --system, --site, --home, --gems or --doc-dir
-          options will limit ri to searching only the specified
-          directories.
-
-        EOT
-
-        if short_form
-          puts "For help on options, type 'ri -h'"
-          puts "For a list of classes I know about, type 'ri -c'"
-        else
-          puts "Options:\n\n"
-          OPTION_LIST.each do|long, short, arg, desc|
-            opt = ''
-            opt << (short ? sprintf("%15s", "#{long}, #{short}") :
-                            sprintf("%15s", long))
-            if arg
-              opt << " " << arg
-            end
-            print opt
-            desc = desc.split("\n")
-            if opt.size < 17
-              print " "*(18-opt.size)
-              puts desc.shift
-            else
-              puts
-            end
-            desc.each do |line|
-              puts(" "*18 + line)
-            end
-            puts
-          end
-          puts "Options may also be passed in the 'RI' environment variable"
-          exit 0
-        end
-      end
-    end
-
-    # Show the version and exit
-    def show_version
-      puts VERSION_STRING
-      exit(0)
-    end
-
-    def initialize
-      @use_stdout   = !STDOUT.tty?
-      @width        = 72
-      @formatter    = RI::TextFormatter.for("plain") 
-      @list_classes = false
-      @list_names   = false
-
-      # By default all paths are used.  If any of these are true, only those
-      # directories are used.
-      @use_system = false
-      @use_site = false
-      @use_home = false
-      @use_gems = false
-      @doc_dirs = []
-    end
-
-    # Parse command line options.
-
-    def parse(args)
-    
-      old_argv = ARGV.dup
-
-      ARGV.replace(args)
-
-      begin
-
-        go = GetoptLong.new(*OptionList.options)
-        go.quiet = true
-
-        go.each do |opt, arg|
-          case opt
-          when "--help"       then OptionList.usage
-          when "--version"    then show_version
-          when "--list-names" then @list_names = true
-          when "--no-pager"   then @use_stdout = true
-          when "--classes"    then @list_classes = true
-
-          when "--system"     then @use_system = true
-          when "--site"       then @use_site = true
-          when "--home"       then @use_home = true
-          when "--gems"       then @use_gems = true
-
-          when "--doc-dir"
-            if File.directory?(arg)
-              @doc_dirs << arg
-            else
-              $stderr.puts "Invalid directory: #{arg}"
-              exit 1
-            end
-
-          when "--format"
-            @formatter = RI::TextFormatter.for(arg)
-            unless @formatter
-              $stderr.print "Invalid formatter (should be one of "
-              $stderr.puts RI::TextFormatter.list + ")"
-              exit 1
-            end
-          when "--width"
-            begin
-              @width = Integer(arg)
-            rescue 
-              $stderr.puts "Invalid width: '#{arg}'"
-              exit 1
-            end
-          end
-        end
-
-      rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => error
-        OptionList.error(error.message)
-
-      end
-    end
-
-    # Return the selected documentation directories.
-
-    def path
-      RI::Paths.path(@use_system, @use_site, @use_home, @use_gems, *@doc_dirs)
-    end
-
-    def raw_path
-      RI::Paths.raw_path(@use_system, @use_site, @use_home, @use_gems,
-                         *@doc_dirs)
-    end
-
-    # Return an instance of the displayer (the thing that actually writes
-    # the information). This allows us to load in new displayer classes
-    # at runtime (for example to help with IDE integration)
-    
-    def displayer
-      ::RiDisplay.new(self)
-    end
-  end
-
-end
-
diff --git a/lib/rdoc/ri/ri_paths.rb b/lib/rdoc/ri/ri_paths.rb
deleted file mode 100644
index 32363bf70a..0000000000
--- a/lib/rdoc/ri/ri_paths.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-module RI
-
-  # Encapsulate all the strangeness to do with finding out
-  # where to find RDoc files
-  #
-  # We basically deal with three directories:
-  #
-  # 1. The 'system' documentation directory, which holds
-  #    the documentation distributed with Ruby, and which
-  #    is managed by the Ruby install process
-  # 2. The 'site' directory, which contains site-wide
-  #    documentation added locally.
-  # 3. The 'user' documentation directory, stored under the
-  #    user's own home directory.
-  #
-  # There's contention about all this, but for now:
-  #
-  # system:: $datadir/ri/<ver>/system/...
-  # site::   $datadir/ri/<ver>/site/...
-  # user::   ~/.rdoc
-
-  module Paths
-
-    #:stopdoc:
-    require 'rbconfig'
-    
-    DOC_DIR  = "doc/rdoc"
-
-    version = Config::CONFIG['ruby_version']
-
-    base    = File.join(Config::CONFIG['datadir'], "ri", version)
-    SYSDIR  = File.join(base, "system")
-    SITEDIR = File.join(base, "site")
-    homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
-
-    if homedir
-      HOMEDIR = File.join(homedir, ".rdoc")
-    else
-      HOMEDIR = nil
-    end
-
-    # This is the search path for 'ri'
-    PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
-
-    begin
-      require 'rubygems'
-      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
-      GEMDIRS.each { |path| RI::Paths::PATH << path }
-    rescue LoadError
-      GEMDIRS = nil
-    end
-
-    # Returns the selected documentation directories as an Array, or PATH if no
-    # overriding directories were given.
-
-    def self.path(use_system, use_site, use_home, use_gems, *extra_dirs)
-      path = raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
-      return path.select { |path| File.directory? path }
-    end
-
-    # Returns the selected documentation directories including nonexistent
-    # directories.  Used to print out what paths were searched if no ri was
-    # found.
-
-    def self.raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
-      return PATH unless use_system or use_site or use_home or use_gems or
-                         not extra_dirs.empty?
-
-      path = []
-      path << extra_dirs unless extra_dirs.empty?
-      path << RI::Paths::SYSDIR if use_system
-      path << RI::Paths::SITEDIR if use_site
-      path << RI::Paths::HOMEDIR if use_home
-      path << RI::Paths::GEMDIRS if use_gems
-
-      return path.flatten.compact
-    end
-
-  end
-end
diff --git a/lib/rdoc/ri/ri_reader.rb b/lib/rdoc/ri/ri_reader.rb
deleted file mode 100644
index fb2c373e38..0000000000
--- a/lib/rdoc/ri/ri_reader.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'rdoc/ri/ri_descriptions'
-require 'rdoc/ri/ri_writer'
-require 'rdoc/markup/simple_markup/to_flow'
-
-module RI
-  class RiReader
-
-    def initialize(ri_cache)
-      @cache = ri_cache
-    end
-
-    def top_level_namespace
-      [ @cache.toplevel ]
-    end
-
-    def lookup_namespace_in(target, namespaces)
-      result = []
-      for n in namespaces
-        result.concat(n.contained_modules_matching(target))
-      end
-      result
-    end
-
-    def find_class_by_name(full_name)
-      names = full_name.split(/::/)
-      ns = @cache.toplevel
-      for name in names
-        ns = ns.contained_class_named(name)
-        return nil if ns.nil?
-      end
-      get_class(ns)
-    end
-
-    def find_methods(name, is_class_method, namespaces)
-      result = []
-      namespaces.each do |ns|
-        result.concat ns.methods_matching(name, is_class_method)
-      end
-      result
-    end
-
-    # return the MethodDescription for a given MethodEntry
-    # by deserializing the YAML
-    def get_method(method_entry)
-      path = method_entry.path_name
-      File.open(path) { |f| RI::Description.deserialize(f) }
-    end
-
-    # Return a class description
-    def get_class(class_entry)
-      result = nil
-      for path in class_entry.path_names
-        path = RiWriter.class_desc_path(path, class_entry)
-        desc = File.open(path) {|f| RI::Description.deserialize(f) }
-        if result
-          result.merge_in(desc)
-        else
-          result = desc
-        end
-      end
-      result
-    end
-
-    # return the names of all classes and modules
-    def full_class_names
-      res = []
-      find_classes_in(res, @cache.toplevel)
-    end
-
-    # return a list of all classes, modules, and methods
-    def all_names
-      res = []
-      find_names_in(res, @cache.toplevel)
-    end
-
-    # ----
-    private
-    # ----
-
-    def find_classes_in(res, klass)
-      classes = klass.classes_and_modules
-      for c in classes
-        res << c.full_name
-        find_classes_in(res, c)
-      end
-      res
-    end
-
-    def find_names_in(res, klass)
-      classes = klass.classes_and_modules
-      for c in classes
-        res << c.full_name
-        res.concat c.all_method_names
-        find_names_in(res, c)
-      end
-      res
-    end
-
-  end
-end
diff --git a/lib/rdoc/ri/ri_util.rb b/lib/rdoc/ri/ri_util.rb
deleted file mode 100644
index 8a01255897..0000000000
--- a/lib/rdoc/ri/ri_util.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-######################################################################
-
-class RiError < Exception; end
-#
-# Break argument into its constituent class or module names, an
-# optional method type, and a method name
-
-class NameDescriptor
-
-  attr_reader :class_names
-  attr_reader :method_name
-
-  # true and false have the obvious meaning. nil means we don't care
-  attr_reader :is_class_method
-
-  # arg may be
-  # 1. a class or module name (optionally qualified with other class
-  #    or module names (Kernel, File::Stat etc)
-  # 2. a method name
-  # 3. a method name qualified by a optionally fully qualified class
-  #    or module name
-  #
-  # We're fairly casual about delimiters: folks can say Kernel::puts,
-  # Kernel.puts, or Kernel\#puts for example. There's one exception:
-  # if you say IO::read, we look for a class method, but if you
-  # say IO.read, we look for an instance method
-
-  def initialize(arg)
-    @class_names = []
-    separator = nil
-
-    tokens = arg.split(/(\.|::|#)/)
-
-    # Skip leading '::', '#' or '.', but remember it might
-    # be a method name qualifier
-    separator = tokens.shift if tokens[0] =~ /^(\.|::|#)/
-
-    # Skip leading '::', but remember we potentially have an inst
-
-    # leading stuff must be class names
-    
-    while tokens[0] =~ /^[A-Z]/
-      @class_names << tokens.shift
-      unless tokens.empty?
-        separator = tokens.shift
-        break unless separator == "::"
-      end
-    end
-    
-    # Now must have a single token, the method name, or an empty
-    # array
-    unless tokens.empty?
-      @method_name = tokens.shift
-      # We may now have a trailing !, ?, or = to roll into
-      # the method name
-      if !tokens.empty? && tokens[0] =~ /^[!?=]$/
-        @method_name << tokens.shift
-      end
-
-      if @method_name =~ /::|\.|#/ or !tokens.empty?
-        raise RiError.new("Bad argument: #{arg}") 
-      end
-      if separator && separator != '.'
-        @is_class_method = separator == "::"
-      end
-    end
-  end
-
-  # Return the full class name (with '::' between the components)
-  # or "" if there's no class name
-
-  def full_class_name
-    @class_names.join("::")
-  end
-end
diff --git a/lib/rdoc/ri/ri_writer.rb b/lib/rdoc/ri/ri_writer.rb
deleted file mode 100644
index 78c68e8409..0000000000
--- a/lib/rdoc/ri/ri_writer.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'fileutils'
-
-module RI
-  class RiWriter
-
-    def RiWriter.class_desc_path(dir, class_desc)
-      File.join(dir, "cdesc-" + class_desc.name + ".yaml")
-    end
-
-    
-    # Convert a name from internal form (containing punctuation)
-    # to an external form (where punctuation is replaced
-    # by %xx)
-
-    def RiWriter.internal_to_external(name)
-      name.gsub(/\W/) { sprintf("%%%02x", $&[0]) }
-    end
-
-    # And the reverse operation
-    def RiWriter.external_to_internal(name)
-      name.gsub(/%([0-9a-f]{2,2})/) { $1.to_i(16).chr }
-    end
-
-    def initialize(base_dir)
-      @base_dir = base_dir
-    end
-
-    def remove_class(class_desc)
-      FileUtils.rm_rf(path_to_dir(class_desc.full_name))
-    end
-
-    def add_class(class_desc)
-      dir = path_to_dir(class_desc.full_name)
-      FileUtils.mkdir_p(dir)
-      class_file_name = RiWriter.class_desc_path(dir, class_desc)
-      File.open(class_file_name, "w") do |f|
-        f.write(class_desc.serialize)
-      end
-    end
-
-    def add_method(class_desc, method_desc)
-      dir = path_to_dir(class_desc.full_name)
-      file_name = RiWriter.internal_to_external(method_desc.name)
-      meth_file_name = File.join(dir, file_name)
-      if method_desc.is_singleton
-        meth_file_name += "-c.yaml"
-      else
-        meth_file_name += "-i.yaml"
-      end
-
-      File.open(meth_file_name, "w") do |f|
-        f.write(method_desc.serialize)
-      end
-    end
-
-    private
-
-    def path_to_dir(class_name)
-      File.join(@base_dir, *class_name.split('::'))
-    end
-  end
-end
diff --git a/lib/rdoc/ri/store.rb b/lib/rdoc/ri/store.rb
new file mode 100644
index 0000000000..81ffb7e674
--- /dev/null
+++ b/lib/rdoc/ri/store.rb
@@ -0,0 +1,248 @@
+require 'rdoc/code_objects'
+require 'fileutils'
+
+##
+# A set of ri data.
+#
+# The store manages reading and writing ri data for a project (gem, path,
+# etc.) and maintains a cache of methods, classes and ancestors in the
+# store.
+
+class RDoc::RI::Store
+
+  ##
+  # Path this store reads or writes
+
+  attr_accessor :path
+
+  ##
+  # Type of ri datastore this was loaded from.  See RDoc::RI::Driver,
+  # RDoc::RI::Paths.
+
+  attr_accessor :type
+
+  attr_reader :cache
+
+  ##
+  # Creates a new Store of +type+ that will load or save to +path+
+
+  def initialize path, type = nil
+    @type = type
+    @path = path
+
+    @cache = {
+      :class_methods    => {},
+      :instance_methods => {},
+      :attributes       => {},
+      :modules          => [],
+      :ancestors        => {},
+    }
+  end
+
+  ##
+  # Ancestors cache accessor.  Maps a klass name to an Array of its ancestors
+  # in this store.  If Foo in this store inherits from Object, Kernel won't be
+  # listed (it will be included from ruby's ri store).
+
+  def ancestors
+    @cache[:ancestors]
+  end
+
+  ##
+  # Attributes cache accessor.  Maps a class to an Array of its attributes.
+
+  def attributes
+    @cache[:attributes]
+  end
+
+  ##
+  # Path to the cache file
+
+  def cache_path
+    File.join @path, 'cache.ri'
+  end
+
+  ##
+  # Path to the ri data for +klass_name+
+
+  def class_file klass_name
+    name = klass_name.split('::').last
+    File.join class_path(klass_name), "cdesc-#{name}.ri"
+  end
+
+  ##
+  # Class methods cache accessor.  Maps a class to an Array of its class
+  # methods (not full name).
+
+  def class_methods
+    @cache[:class_methods]
+  end
+
+  ##
+  # Path where data for +klass_name+ will be stored (methods or class data)
+
+  def class_path klass_name
+    File.join @path, *klass_name.split('::')
+  end
+
+  ##
+  # Friendly rendition of #path
+
+  def friendly_path
+    case type
+    when :gem    then
+      sep = Regexp.union(*['/', File::ALT_SEPARATOR].compact)
+      @path =~ /#{sep}doc#{sep}(.*?)#{sep}ri$/
+      "gem #{$1}"
+    when :home   then '~/.ri'
+    when :site   then 'ruby site'
+    when :system then 'ruby core'
+    else @path
+    end
+  end
+
+  def inspect # :nodoc:
+    "#<%s:0x%x %s %p>" % [self.class, object_id, @path, modules.sort]
+  end
+
+  ##
+  # Instance methods cache accessor.  Maps a class to an Array of its
+  # instance methods (not full name).
+
+  def instance_methods
+    @cache[:instance_methods]
+  end
+
+  ##
+  # Loads cache file for this store
+
+  def load_cache
+    open cache_path, 'rb' do |io|
+      @cache = Marshal.load io.read
+    end
+  rescue Errno::ENOENT
+  end
+
+  ##
+  # Loads ri data for +klass_name+
+
+  def load_class klass_name
+    open class_file(klass_name), 'rb' do |io|
+      Marshal.load io.read
+    end
+  end
+
+  ##
+  # Loads ri data for +method_name+ in +klass_name+
+
+  def load_method klass_name, method_name
+    open method_file(klass_name, method_name), 'rb' do |io|
+      Marshal.load io.read
+    end
+  end
+
+  ##
+  # Path to the ri data for +method_name+ in +klass_name+
+
+  def method_file klass_name, method_name
+    method_name = method_name.split('::').last
+    method_name =~ /#(.*)/
+    method_type = $1 ? 'i' : 'c'
+    method_name = $1 if $1
+
+    method_name = if ''.respond_to? :ord then
+                    method_name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+                  else
+                    method_name.gsub(/\W/) { "%%%02x" % $&[0] }
+                  end
+
+    File.join class_path(klass_name), "#{method_name}-#{method_type}.ri"
+  end
+
+  ##
+  # Modules cache accessor.  An Array of all the modules (and classes) in the
+  # store.
+
+  def modules
+    @cache[:modules]
+  end
+
+  ##
+  # Writes the cache file for this store
+
+  def save_cache
+    # HACK mongrel-1.1.5 documents its files twice
+    @cache[:attributes].      each do |_, m| m.uniq!; m.sort! end
+    @cache[:class_methods].   each do |_, m| m.uniq!; m.sort! end
+    @cache[:instance_methods].each do |_, m| m.uniq!; m.sort! end
+
+    open cache_path, 'wb' do |io|
+      Marshal.dump @cache, io
+    end
+  end
+
+  ##
+  # Writes the ri data for +klass+
+
+  def save_class klass
+    FileUtils.mkdir_p class_path(klass.full_name)
+
+    @cache[:modules] << klass.full_name
+
+    path = class_file klass.full_name
+
+    begin
+      disk_klass = nil
+
+      open path, 'rb' do |io|
+        disk_klass = Marshal.load io.read
+      end
+
+      klass.merge disk_klass
+    rescue Errno::ENOENT
+    end
+
+    # BasicObject has no ancestors
+    ancestors = klass.ancestors.compact.map do |ancestor|
+      # HACK for classes we don't know about (class X < RuntimeError)
+      String === ancestor ? ancestor : ancestor.full_name
+    end
+
+    @cache[:ancestors][klass.full_name] ||= []
+    @cache[:ancestors][klass.full_name].push(*ancestors)
+
+    attributes = klass.attributes.map do |attribute|
+      "#{attribute.type} #{attribute.name}"
+    end
+
+    unless attributes.empty? then
+      @cache[:attributes][klass.full_name] ||= []
+      @cache[:attributes][klass.full_name].push(*attributes)
+    end
+
+    open path, 'wb' do |io|
+      Marshal.dump klass, io
+    end
+  end
+
+  ##
+  # Writes the ri data for +method+ on +klass+
+
+  def save_method klass, method
+    FileUtils.mkdir_p class_path(klass.full_name)
+
+    cache = if method.singleton then
+              @cache[:class_methods]
+            else
+              @cache[:instance_methods]
+            end
+    cache[klass.full_name] ||= []
+    cache[klass.full_name] << method.name
+
+    open method_file(klass.full_name, method.full_name), 'wb' do |io|
+      Marshal.dump method, io
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/ruby_lex.rb b/lib/rdoc/ruby_lex.rb
new file mode 100644
index 0000000000..ab5f32ba42
--- /dev/null
+++ b/lib/rdoc/ruby_lex.rb
@@ -0,0 +1,1292 @@
+#--
+#   irb/ruby-lex.rb - ruby lexcal analyzer
+#   	$Release Version: 0.9.5$
+#   	$Revision: 17979 $
+#   	$Date: 2008-07-09 10:17:05 -0700 (Wed, 09 Jul 2008) $
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+#++
+
+require "e2mmap"
+require "irb/slex"
+require "rdoc/ruby_token"
+require "stringio"
+
+##
+# Ruby lexer adapted from irb.
+#
+# The internals are not documented because they are scary.
+
+class RDoc::RubyLex
+
+  # :stopdoc:
+
+  extend Exception2MessageMapper
+
+  def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
+  def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
+  def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
+  def_exception(:TkReading2TokenDuplicateError,
+                "key duplicate(token_n='%s', key='%s')")
+  def_exception(:SyntaxError, "%s")
+
+  def_exception(:TerminateLineInput, "Terminate Line Input")
+
+  include RDoc::RubyToken
+  include IRB
+
+  attr_reader :continue
+  attr_reader :lex_state
+  attr_reader :reader
+
+  class << self
+    attr_accessor :debug_level
+  end
+
+  def self.debug?
+    @debug_level > 0
+  end
+
+  self.debug_level = 0
+
+  def initialize(content, options)
+    lex_init
+
+    if /\t/ =~ content then
+      tab_width = options.tab_width
+      content = content.split(/\n/).map do |line|
+        1 while line.gsub!(/\t+/) {
+          ' ' * (tab_width*$&.length - $`.length % tab_width)
+        }  && $~
+        line
+      end.join("\n")
+    end
+
+    content << "\n" unless content[-1, 1] == "\n"
+
+    set_input StringIO.new content
+
+    @base_char_no = 0
+    @char_no = 0
+    @exp_line_no = @line_no = 1
+    @here_readed = []
+    @readed = []
+    @rests = []
+    @seek = 0
+
+    @here_header = false
+    @indent = 0
+    @indent_stack = []
+    @lex_state = EXPR_BEG
+    @space_seen = false
+
+    @continue = false
+    @line = ""
+
+    @skip_space = false
+    @readed_auto_clean_up = false
+    @exception_on_syntax_error = true
+
+    @prompt = nil
+    @prev_seek = nil
+  end
+
+  def inspect # :nodoc:
+    "#<%s:0x%x lex_state %p space_seen %p>" % [
+      self.class, object_id,
+      @lex_state, @space_seen,
+    ]
+  end
+
+  attr_accessor :skip_space
+  attr_accessor :readed_auto_clean_up
+  attr_accessor :exception_on_syntax_error
+
+  attr_reader :seek
+  attr_reader :char_no
+  attr_reader :line_no
+  attr_reader :indent
+
+  # io functions
+  def set_input(io, p = nil, &block)
+    @io = io
+    if p.respond_to?(:call)
+      @input = p
+    elsif block_given?
+      @input = block
+    else
+      @input = Proc.new{@io.gets}
+    end
+  end
+
+  def get_readed
+    if idx = @readed.reverse.index("\n")
+      @base_char_no = idx
+    else
+      @base_char_no += @readed.size
+    end
+
+    readed = @readed.join("")
+    @readed = []
+    readed
+  end
+
+  def getc
+    while @rests.empty?
+      #      return nil unless buf_input
+      @rests.push nil unless buf_input
+    end
+    c = @rests.shift
+    if @here_header
+      @here_readed.push c
+    else
+      @readed.push c
+    end
+    @seek += 1
+    if c == "\n"
+      @line_no += 1
+      @char_no = 0
+    else
+      @char_no += 1
+    end
+    c
+  end
+
+  def gets
+    l = ""
+    while c = getc
+      l.concat(c)
+      break if c == "\n"
+    end
+    return nil if l == "" and c.nil?
+    l
+  end
+
+  def eof?
+    @io.eof?
+  end
+
+  def getc_of_rests
+    if @rests.empty?
+      nil
+    else
+      getc
+    end
+  end
+
+  def ungetc(c = nil)
+    if @here_readed.empty?
+      c2 = @readed.pop
+    else
+      c2 = @here_readed.pop
+    end
+    c = c2 unless c
+    @rests.unshift c #c =
+    @seek -= 1
+    if c == "\n"
+      @line_no -= 1
+      if idx = @readed.reverse.index("\n")
+        @char_no = @readed.size - idx
+      else
+        @char_no = @base_char_no + @readed.size
+      end
+    else
+      @char_no -= 1
+    end
+  end
+
+  def peek_equal?(str)
+    chrs = str.split(//)
+    until @rests.size >= chrs.size
+      return false unless buf_input
+    end
+    @rests[0, chrs.size] == chrs
+  end
+
+  def peek_match?(regexp)
+    while @rests.empty?
+      return false unless buf_input
+    end
+    regexp =~ @rests.join("")
+  end
+
+  def peek(i = 0)
+    while @rests.size <= i
+      return nil unless buf_input
+    end
+    @rests[i]
+  end
+
+  def buf_input
+    prompt
+    line = @input.call
+    return nil unless line
+    @rests.concat line.split(//)
+    true
+  end
+  private :buf_input
+
+  def set_prompt(p = nil, &block)
+    p = block if block_given?
+    if p.respond_to?(:call)
+      @prompt = p
+    else
+      @prompt = Proc.new{print p}
+    end
+  end
+
+  def prompt
+    if @prompt
+      @prompt.call(@ltype, @indent, @continue, @line_no)
+    end
+  end
+
+  def initialize_input
+    @ltype = nil
+    @quoted = nil
+    @indent = 0
+    @indent_stack = []
+    @lex_state = EXPR_BEG
+    @space_seen = false
+    @here_header = false
+
+    @continue = false
+    prompt
+
+    @line = ""
+    @exp_line_no = @line_no
+  end
+
+  def each_top_level_statement
+    initialize_input
+    catch(:TERM_INPUT) do
+      loop do
+        begin
+          @continue = false
+          prompt
+          unless l = lex
+            throw :TERM_INPUT if @line == ''
+          else
+            #p l
+            @line.concat l
+            if @ltype or @continue or @indent > 0
+              next
+            end
+          end
+          if @line != "\n"
+            yield @line, @exp_line_no
+          end
+          break unless l
+          @line = ''
+          @exp_line_no = @line_no
+
+          @indent = 0
+          @indent_stack = []
+          prompt
+        rescue TerminateLineInput
+          initialize_input
+          prompt
+          get_readed
+        end
+      end
+    end
+  end
+
+  def lex
+    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
+           !@continue or
+      tk.nil?)
+      #p tk
+      #p @lex_state
+      #p self
+    end
+    line = get_readed
+    #      print self.inspect
+    if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
+      nil
+    else
+      line
+    end
+  end
+
+  def token
+    #      require "tracer"
+    #      Tracer.on
+    @prev_seek = @seek
+    @prev_line_no = @line_no
+    @prev_char_no = @char_no
+    begin
+      begin
+        tk = @OP.match(self)
+        @space_seen = tk.kind_of?(TkSPACE)
+      rescue SyntaxError => e
+        raise RDoc::Error, "syntax error: #{e.message}" if
+          @exception_on_syntax_error
+
+        tk = TkError.new(@seek, @line_no, @char_no)
+      end
+    end while @skip_space and tk.kind_of?(TkSPACE)
+
+    if @readed_auto_clean_up
+      get_readed
+    end
+    #      Tracer.off
+    tk
+  end
+
+  ENINDENT_CLAUSE = [
+    "case", "class", "def", "do", "for", "if",
+    "module", "unless", "until", "while", "begin" #, "when"
+  ]
+
+  DEINDENT_CLAUSE = ["end" #, "when"
+  ]
+
+  PERCENT_LTYPE = {
+    "q" => "\'",
+    "Q" => "\"",
+    "x" => "\`",
+    "r" => "/",
+    "w" => "]",
+    "W" => "]",
+    "s" => ":"
+  }
+
+  PERCENT_PAREN = {
+    "{" => "}",
+    "[" => "]",
+    "<" => ">",
+    "(" => ")"
+  }
+
+  PERCENT_PAREN_REV = PERCENT_PAREN.invert
+
+  Ltype2Token = {
+    "\'" => TkSTRING,
+    "\"" => TkSTRING,
+    "\`" => TkXSTRING,
+    "/" => TkREGEXP,
+    "]" => TkDSTRING,
+    ":" => TkSYMBOL
+  }
+  DLtype2Token = {
+    "\"" => TkDSTRING,
+    "\`" => TkDXSTRING,
+    "/" => TkDREGEXP,
+  }
+
+  def lex_init()
+    @OP = IRB::SLex.new
+    @OP.def_rules("\0", "\004", "\032") do |op, io|
+      Token(TkEND_OF_SCRIPT)
+    end
+
+    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |op, io|
+      @space_seen = true
+      str = op
+      while (ch = getc) =~ /[ \t\f\r\13]/ do
+        str << ch
+      end
+      ungetc
+      Token TkSPACE, str
+    end
+
+    @OP.def_rule("#") do |op, io|
+      identify_comment
+    end
+
+    @OP.def_rule("=begin",
+                 proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do
+      |op, io|
+      @ltype = "="
+      res = ''
+      until (ch = getc) == "\n" do res << ch end
+      until peek_equal?("=end") && peek(4) =~ /\s/ do
+        until (ch = getc) == "\n" do res << ch end
+      end
+      res << gets
+      @ltype = nil
+      Token(TkRD_COMMENT, res)
+    end
+
+    @OP.def_rule("\n") do |op, io|
+      print "\\n\n" if RDoc::RubyLex.debug?
+      case @lex_state
+      when EXPR_BEG, EXPR_FNAME, EXPR_DOT
+        @continue = true
+      else
+        @continue = false
+        @lex_state = EXPR_BEG
+        until (@indent_stack.empty? ||
+               [TkLPAREN, TkLBRACK, TkLBRACE,
+                 TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
+          @indent_stack.pop
+        end
+      end
+      @here_header = false
+      @here_readed = []
+      Token(TkNL)
+    end
+
+    @OP.def_rules("*", "**",
+                  "=", "==", "===",
+                  "=~", "<=>",
+                  "<", "<=",
+                  ">", ">=", ">>") do
+      |op, io|
+      case @lex_state
+      when EXPR_FNAME, EXPR_DOT
+        @lex_state = EXPR_ARG
+      else
+        @lex_state = EXPR_BEG
+      end
+      Token(op)
+    end
+
+    @OP.def_rules("!", "!=", "!~") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+
+    @OP.def_rules("<<") do
+      |op, io|
+      tk = nil
+      if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
+        (@lex_state != EXPR_ARG || @space_seen)
+        c = peek(0)
+        if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
+          tk = identify_here_document
+        end
+      end
+      unless tk
+        tk = Token(op)
+        case @lex_state
+        when EXPR_FNAME, EXPR_DOT
+          @lex_state = EXPR_ARG
+        else
+          @lex_state = EXPR_BEG
+        end
+      end
+      tk
+    end
+
+    @OP.def_rules("'", '"') do
+      |op, io|
+      identify_string(op)
+    end
+
+    @OP.def_rules("`") do
+      |op, io|
+      if @lex_state == EXPR_FNAME
+        @lex_state = EXPR_END
+        Token(op)
+      else
+        identify_string(op)
+      end
+    end
+
+    @OP.def_rules('?') do
+      |op, io|
+      if @lex_state == EXPR_END
+        @lex_state = EXPR_BEG
+        Token(TkQUESTION)
+      else
+        ch = getc
+        if @lex_state == EXPR_ARG && ch =~ /\s/
+          ungetc
+          @lex_state = EXPR_BEG;
+          Token(TkQUESTION)
+        else
+          str = ch
+          if ch == '\\'
+            str << read_escape
+          end
+          @lex_state = EXPR_END
+          str << (ch.respond_to?(:ord) ? ch.ord : ch[0])
+          Token(TkINTEGER, str)
+        end
+      end
+    end
+
+    @OP.def_rules("&", "&&", "|", "||") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+
+    @OP.def_rules("+=", "-=", "*=", "**=",
+                  "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      op =~ /^(.*)=$/
+      Token(TkOPASGN, $1)
+    end
+
+    @OP.def_rule("+@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token(op)
+    end
+
+    @OP.def_rule("-@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token(op)
+    end
+
+    @OP.def_rules("+", "-") do
+      |op, io|
+      catch(:RET) do
+        if @lex_state == EXPR_ARG
+          if @space_seen and peek(0) =~ /[0-9]/
+            throw :RET, identify_number
+          else
+            @lex_state = EXPR_BEG
+          end
+        elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
+          throw :RET, identify_number
+        else
+          @lex_state = EXPR_BEG
+        end
+        Token(op)
+      end
+    end
+
+    @OP.def_rule(".") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      if peek(0) =~ /[0-9]/
+        ungetc
+        identify_number
+      else
+        # for "obj.if" etc.
+        @lex_state = EXPR_DOT
+        Token(TkDOT)
+      end
+    end
+
+    @OP.def_rules("..", "...") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+
+    lex_int2
+  end
+
+  def lex_int2
+    @OP.def_rules("]", "}", ")") do
+      |op, io|
+      @lex_state = EXPR_END
+      @indent -= 1
+      @indent_stack.pop
+      Token(op)
+    end
+
+    @OP.def_rule(":") do
+      |op, io|
+      if @lex_state == EXPR_END || peek(0) =~ /\s/
+        @lex_state = EXPR_BEG
+        Token(TkCOLON)
+      else
+        @lex_state = EXPR_FNAME;
+        Token(TkSYMBEG)
+      end
+    end
+
+    @OP.def_rule("::") do
+      |op, io|
+      #      p @lex_state.id2name, @space_seen
+      if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
+        @lex_state = EXPR_BEG
+        Token(TkCOLON3)
+      else
+        @lex_state = EXPR_DOT
+        Token(TkCOLON2)
+      end
+    end
+
+    @OP.def_rule("/") do
+      |op, io|
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+        identify_string(op)
+      elsif peek(0) == '='
+        getc
+        @lex_state = EXPR_BEG
+        Token(TkOPASGN, "/") #/)
+      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+        identify_string(op)
+      else
+        @lex_state = EXPR_BEG
+        Token("/") #/)
+      end
+    end
+
+    @OP.def_rules("^") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token("^")
+    end
+
+    #       @OP.def_rules("^=") do
+    # 	@lex_state = EXPR_BEG
+    # 	Token(OP_ASGN, :^)
+    #       end
+
+    @OP.def_rules(",") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+
+    @OP.def_rules(";") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      until (@indent_stack.empty? ||
+             [TkLPAREN, TkLBRACK, TkLBRACE,
+               TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
+        @indent_stack.pop
+      end
+      Token(op)
+    end
+
+    @OP.def_rule("~") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token("~")
+    end
+
+    @OP.def_rule("~@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token("~")
+    end
+
+    @OP.def_rule("(") do
+      |op, io|
+      @indent += 1
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+        @lex_state = EXPR_BEG
+        tk_c = TkfLPAREN
+      else
+        @lex_state = EXPR_BEG
+        tk_c = TkLPAREN
+      end
+      @indent_stack.push tk_c
+      tk = Token(tk_c)
+    end
+
+    @OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token("[]")
+    end
+
+    @OP.def_rule("[]=", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token("[]=")
+    end
+
+    @OP.def_rule("[") do
+      |op, io|
+      @indent += 1
+      if @lex_state == EXPR_FNAME
+        tk_c = TkfLBRACK
+      else
+        if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+          tk_c = TkLBRACK
+        elsif @lex_state == EXPR_ARG && @space_seen
+          tk_c = TkLBRACK
+        else
+          tk_c = TkfLBRACK
+        end
+        @lex_state = EXPR_BEG
+      end
+      @indent_stack.push tk_c
+      Token(tk_c)
+    end
+
+    @OP.def_rule("{") do
+      |op, io|
+      @indent += 1
+      if @lex_state != EXPR_END && @lex_state != EXPR_ARG
+        tk_c = TkLBRACE
+      else
+        tk_c = TkfLBRACE
+      end
+      @lex_state = EXPR_BEG
+      @indent_stack.push tk_c
+      Token(tk_c)
+    end
+
+    @OP.def_rule('\\') do
+      |op, io|
+      if getc == "\n"
+        @space_seen = true
+        @continue = true
+        Token(TkSPACE)
+      else
+        ungetc
+        Token("\\")
+      end
+    end
+
+    @OP.def_rule('%') do
+      |op, io|
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+        identify_quotation
+      elsif peek(0) == '='
+        getc
+        Token(TkOPASGN, :%)
+      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+        identify_quotation
+      else
+        @lex_state = EXPR_BEG
+        Token("%") #))
+      end
+    end
+
+    @OP.def_rule('$') do
+      |op, io|
+      identify_gvar
+    end
+
+    @OP.def_rule('@') do
+      |op, io|
+      if peek(0) =~ /[\w@]/
+        ungetc
+        identify_identifier
+      else
+        Token("@")
+      end
+    end
+
+    #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do
+    # 	|op, io|
+    # 	@indent += 1
+    # 	@lex_state = EXPR_FNAME
+    # #	@lex_state = EXPR_END
+    # #	until @rests[0] == "\n" or @rests[0] == ";"
+    # #	  rests.shift
+    # #	end
+    #       end
+
+    @OP.def_rule("_") do
+      if peek_match?(/_END__/) and @lex_state == EXPR_BEG then
+        Token(TkEND_OF_SCRIPT)
+      else
+        ungetc
+        identify_identifier
+      end
+    end
+
+    @OP.def_rule("") do
+      |op, io|
+      printf "MATCH: start %s: %s\n", op, io.inspect if RDoc::RubyLex.debug?
+      if peek(0) =~ /[0-9]/
+        t = identify_number
+      else
+        t = identify_identifier
+      end
+      printf "MATCH: end %s: %s\n", op, io.inspect if RDoc::RubyLex.debug?
+      t
+    end
+
+    p @OP if RDoc::RubyLex.debug?
+  end
+
+  def identify_gvar
+    @lex_state = EXPR_END
+
+    case ch = getc
+    when /[~_*$?!@\/\\;,=:<>".]/   #"
+      Token(TkGVAR, "$" + ch)
+    when "-"
+      Token(TkGVAR, "$-" + getc)
+    when "&", "`", "'", "+"
+      Token(TkBACK_REF, "$"+ch)
+    when /[1-9]/
+      ref = ch
+      while (ch = getc) =~ /[0-9]/ do ref << ch end
+      ungetc
+      Token(TkNTH_REF, "$#{ref}")
+    when /\w/
+      ungetc
+      ungetc
+      identify_identifier
+    else
+      ungetc
+      Token("$")
+    end
+  end
+
+  def identify_identifier
+    token = ""
+    if peek(0) =~ /[$@]/
+      token.concat(c = getc)
+      if c == "@" and peek(0) == "@"
+        token.concat getc
+      end
+    end
+
+    # HACK to avoid a warning the regexp is hidden behind an eval
+    # HACK need a better way to detect oniguruma
+    @identifier_re ||= if defined? Encoding then
+                         eval '/[\p{Alnum}_]/u'
+                       else
+                         eval '/[\w\x80-\xff]/'
+                       end
+
+    while (ch = getc) =~ @identifier_re
+      print " :#{ch}: " if RDoc::RubyLex.debug?
+      token.concat ch
+    end
+
+    ungetc
+
+    if (ch == "!" || ch == "?") && token[0,1] =~ /\w/ && peek(0) != "="
+      token.concat getc
+    end
+
+    # almost fix token
+
+    case token
+    when /^\$/
+      return Token(TkGVAR, token)
+    when /^\@\@/
+      @lex_state = EXPR_END
+      # p Token(TkCVAR, token)
+      return Token(TkCVAR, token)
+    when /^\@/
+      @lex_state = EXPR_END
+      return Token(TkIVAR, token)
+    end
+
+    if @lex_state != EXPR_DOT
+      print token, "\n" if RDoc::RubyLex.debug?
+
+      token_c, *trans = TkReading2Token[token]
+      if token_c
+        # reserved word?
+
+        if (@lex_state != EXPR_BEG &&
+            @lex_state != EXPR_FNAME &&
+            trans[1])
+          # modifiers
+          token_c = TkSymbol2Token[trans[1]]
+          @lex_state = trans[0]
+        else
+          if @lex_state != EXPR_FNAME
+            if ENINDENT_CLAUSE.include?(token)
+              # check for ``class = val'' etc.
+              valid = true
+              case token
+              when "class"
+                valid = false unless peek_match?(/^\s*(<<|\w|::)/)
+              when "def"
+                valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
+              when "do"
+                valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&)/)
+              when *ENINDENT_CLAUSE
+                valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&|\|)/)
+              else
+                # no nothing
+              end
+              if valid
+                if token == "do"
+                  if ![TkFOR, TkWHILE, TkUNTIL].include?(@indent_stack.last)
+                    @indent += 1
+                    @indent_stack.push token_c
+                  end
+                else
+                  @indent += 1
+                  @indent_stack.push token_c
+                end
+              end
+
+            elsif DEINDENT_CLAUSE.include?(token)
+              @indent -= 1
+              @indent_stack.pop
+            end
+            @lex_state = trans[0]
+          else
+            @lex_state = EXPR_END
+          end
+        end
+        return Token(token_c, token)
+      end
+    end
+
+    if @lex_state == EXPR_FNAME
+      @lex_state = EXPR_END
+      if peek(0) == '='
+        token.concat getc
+      end
+    elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
+      @lex_state = EXPR_ARG
+    else
+      @lex_state = EXPR_END
+    end
+
+    if token[0, 1] =~ /[A-Z]/
+      return Token(TkCONSTANT, token)
+    elsif token[token.size - 1, 1] =~ /[!?]/
+      return Token(TkFID, token)
+    else
+      return Token(TkIDENTIFIER, token)
+    end
+  end
+
+  def identify_here_document
+    ch = getc
+    #    if lt = PERCENT_LTYPE[ch]
+    if ch == "-"
+      ch = getc
+      indent = true
+    end
+    if /['"`]/ =~ ch
+      lt = ch
+      quoted = ""
+      while (c = getc) && c != lt
+        quoted.concat c
+      end
+    else
+      lt = '"'
+      quoted = ch.dup
+      while (c = getc) && c =~ /\w/
+        quoted.concat c
+      end
+      ungetc
+    end
+
+    ltback, @ltype = @ltype, lt
+    reserve = []
+    while ch = getc
+      reserve.push ch
+      if ch == "\\"
+        reserve.push ch = getc
+      elsif ch == "\n"
+        break
+      end
+    end
+
+    @here_header = false
+    doc = ''
+    while l = gets
+      l = l.sub(/(:?\r)?\n\z/, '')
+      if (indent ? l.strip : l) == quoted
+        break
+      end
+      doc << l
+    end
+
+    @here_header = true
+    @here_readed.concat reserve
+    while ch = reserve.pop
+      ungetc ch
+    end
+
+    @ltype = ltback
+    @lex_state = EXPR_END
+    Token(Ltype2Token[lt], doc)
+  end
+
+  def identify_quotation
+    ch = getc
+    if lt = PERCENT_LTYPE[ch]
+      ch = getc
+    elsif ch =~ /\W/
+      lt = "\""
+    else
+      raise RDoc::Error, "unknown type of %string #{ch.inspect}"
+    end
+    #     if ch !~ /\W/
+    #       ungetc
+    #       next
+    #     end
+    #@ltype = lt
+    @quoted = ch unless @quoted = PERCENT_PAREN[ch]
+    identify_string(lt, @quoted)
+  end
+
+  def identify_number
+    @lex_state = EXPR_END
+
+    num = ''
+
+    if peek(0) == "0" && peek(1) !~ /[.eE]/
+      num << getc
+
+      case peek(0)
+      when /[xX]/
+        ch = getc
+        match = /[0-9a-fA-F_]/
+      when /[bB]/
+        ch = getc
+        match = /[01_]/
+      when /[oO]/
+        ch = getc
+        match = /[0-7_]/
+      when /[dD]/
+        ch = getc
+        match = /[0-9_]/
+      when /[0-7]/
+        match = /[0-7_]/
+      when /[89]/
+        raise RDoc::Error, "Illegal octal digit"
+      else
+        return Token(TkINTEGER, num)
+      end
+
+      num << ch if ch
+
+      len0 = true
+      non_digit = false
+      while ch = getc
+        num << ch
+        if match =~ ch
+          if ch == "_"
+            if non_digit
+              raise RDoc::Error, "trailing `#{ch}' in number"
+            else
+              non_digit = ch
+            end
+          else
+            non_digit = false
+            len0 = false
+          end
+        else
+          ungetc
+          num[-1, 1] = ''
+          if len0
+            raise RDoc::Error, "numeric literal without digits"
+          end
+          if non_digit
+            raise RDoc::Error, "trailing `#{non_digit}' in number"
+          end
+          break
+        end
+      end
+      return Token(TkINTEGER, num)
+    end
+
+    type = TkINTEGER
+    allow_point = true
+    allow_e = true
+    non_digit = false
+    while ch = getc
+      num << ch
+      case ch
+      when /[0-9]/
+        non_digit = false
+      when "_"
+        non_digit = ch
+      when allow_point && "."
+        if non_digit
+          raise RDoc::Error, "trailing `#{non_digit}' in number"
+        end
+        type = TkFLOAT
+        if peek(0) !~ /[0-9]/
+          type = TkINTEGER
+          ungetc
+          num[-1, 1] = ''
+          break
+        end
+        allow_point = false
+      when allow_e && "e", allow_e && "E"
+        if non_digit
+          raise RDoc::Error, "trailing `#{non_digit}' in number"
+        end
+        type = TkFLOAT
+        if peek(0) =~ /[+-]/
+          num << getc
+        end
+        allow_e = false
+        allow_point = false
+        non_digit = ch
+      else
+        if non_digit
+          raise RDoc::Error, "trailing `#{non_digit}' in number"
+        end
+        ungetc
+        num[-1, 1] = ''
+        break
+      end
+    end
+
+    Token(type, num)
+  end
+
+  def identify_string(ltype, quoted = ltype)
+    @ltype = ltype
+    @quoted = quoted
+
+    str = if ltype == quoted then
+            ltype.dup
+          else
+            "%#{PERCENT_PAREN_REV[quoted]}"
+          end
+
+    subtype = nil
+    begin
+      nest = 0
+
+      while ch = getc
+        str << ch
+
+        if @quoted == ch and nest == 0
+          break
+        elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
+          ch = getc
+          subtype = true
+          if ch == "{" then
+            str << ch << skip_inner_expression
+            next
+          else
+            ungetc
+          end
+        elsif ch == '\\' and @ltype == "'" #'
+          case ch = getc
+          when "\\", "\n", "'"
+          else
+            ungetc
+          end
+        elsif ch == '\\' #'
+          str << read_escape
+        end
+
+        if PERCENT_PAREN.values.include?(@quoted)
+          if PERCENT_PAREN[ch] == @quoted
+            nest += 1
+          elsif ch == @quoted
+            nest -= 1
+          end
+        end
+      end
+
+      if @ltype == "/"
+        if peek(0) =~ /i|m|x|o|e|s|u|n/
+          getc
+        end
+      end
+
+      if subtype
+        Token(DLtype2Token[ltype], str)
+      else
+        Token(Ltype2Token[ltype], str)
+      end
+    ensure
+      @ltype = nil
+      @quoted = nil
+      @lex_state = EXPR_END
+    end
+  end
+
+  def skip_inner_expression
+    res = ""
+    nest = 0
+    while ch = getc
+      res << ch
+      if ch == '}'
+        break if nest.zero?
+        nest -= 1
+      elsif ch == '{'
+        nest += 1
+      end
+    end
+    res
+  end
+
+  def identify_comment
+    @ltype = "#"
+
+    comment = '#'
+
+    while ch = getc
+      # if ch == "\\" #"
+      #   read_escape
+      # end
+      if ch == "\n"
+        @ltype = nil
+        ungetc
+        break
+      end
+
+      comment << ch
+    end
+
+    return Token(TkCOMMENT, comment)
+  end
+
+  def read_escape
+    escape = ''
+    ch = getc
+    escape << ch
+
+    case ch
+    when "\n", "\r", "\f"
+    when "\\", "n", "t", "r", "f", "v", "a", "e", "b", "s" #"
+    when /[0-7]/
+      ungetc ch
+      3.times do
+        ch = getc
+        escape << ch
+        case ch
+        when /[0-7]/
+        when nil
+          break
+        else
+          ungetc
+          break
+        end
+      end
+
+    when "x"
+      2.times do
+        ch = getc
+        escape << ch
+        case ch
+        when /[0-9a-fA-F]/
+        when nil
+          break
+        else
+          ungetc
+          break
+        end
+      end
+
+    when "M"
+      ch = getc
+      escape << ch
+      if ch != '-'
+        ungetc
+      else
+        ch = getc
+        escape << ch
+        if ch == "\\" #"
+          escape << read_escape
+        end
+      end
+
+    when "C", "c" #, "^"
+      if ch == "C" and (ch = getc) != "-"
+        escape << ch
+        ungetc
+      elsif (ch = getc) == "\\" #"
+        escape << ch << read_escape
+      end
+    else
+      # other characters
+    end
+
+    escape
+  end
+
+  # :startdoc:
+
+end
+
+#RDoc::RubyLex.debug_level = 1
+
diff --git a/lib/rdoc/ruby_token.rb b/lib/rdoc/ruby_token.rb
new file mode 100644
index 0000000000..0c4f837193
--- /dev/null
+++ b/lib/rdoc/ruby_token.rb
@@ -0,0 +1,416 @@
+#--
+#   irb/ruby-token.rb - ruby tokens
+#   	$Release Version: 0.9.5$
+#   	$Revision: 11708 $
+#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#++
+# Definitions of all tokens involved in the lexical analysis.
+#
+# This class is not documented because it is so deep in the internals.
+
+module RDoc::RubyToken
+  # :stopdoc:
+
+  EXPR_BEG = :EXPR_BEG
+  EXPR_MID = :EXPR_MID
+  EXPR_END = :EXPR_END
+  EXPR_ARG = :EXPR_ARG
+  EXPR_FNAME = :EXPR_FNAME
+  EXPR_DOT = :EXPR_DOT
+  EXPR_CLASS = :EXPR_CLASS
+
+  # for ruby 1.4X
+  if !defined?(Symbol)
+    Symbol = Integer
+  end
+
+  def set_token_position(line, char)
+    @prev_line_no = line
+    @prev_char_no = char
+  end
+
+  class Token
+    def initialize(seek, line_no, char_no, text = nil)
+      @seek = seek
+      @line_no = line_no
+      @char_no = char_no
+      @text = text
+    end
+
+    attr :seek
+    attr :line_no
+    attr :char_no
+
+    attr_accessor :text
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.text == @text
+    end
+
+    ##
+    # Because we're used in contexts that expect to return a token, we set the
+    # text string and then return ourselves
+
+    def set_text(text)
+      @text = text
+      self
+    end
+
+  end
+
+  class TkNode < Token
+    def initialize(seek, line_no, char_no, node = nil)
+      super seek, line_no, char_no
+      @node = node
+    end
+
+    attr :node
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.node == @node
+    end
+
+    def set_text text
+      @node = text
+      self
+    end
+
+    alias text node
+  end
+
+  class TkId < Token
+    def initialize(seek, line_no, char_no, name)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr :name
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.name == @name
+    end
+
+    def set_text text
+      @name = text
+      self
+    end
+
+    alias text name
+  end
+
+  class TkKW < TkId
+  end
+
+  class TkVal < Token
+    def initialize(seek, line_no, char_no, value = nil)
+      super(seek, line_no, char_no)
+      @value = value
+    end
+    attr_accessor :value
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.value == @value
+    end
+
+    def set_text text
+      @value = text
+      self
+    end
+
+    alias text value
+  end
+
+  class TkOp < Token
+    def initialize(seek, line_no, char_no, name = nil)
+      super seek, line_no, char_no
+      @name = name
+    end
+
+    attr_accessor :name
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.name == @name
+    end
+
+    def set_text text
+      @name = text
+      self
+    end
+
+    alias text name
+  end
+
+  class TkOPASGN < TkOp
+    def initialize(seek, line_no, char_no, op)
+      super(seek, line_no, char_no)
+      op = TkReading2Token[op][0] unless op.kind_of?(Symbol)
+      @op = op
+      @text = nil
+    end
+
+    attr :op
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.op == @op
+    end
+
+    def text
+      @text ||= "#{TkToken2Reading[op]}="
+    end
+  end
+
+  class TkUnknownChar < Token
+    def initialize(seek, line_no, char_no, id)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr :name
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.name == @name
+    end
+
+    def set_text text
+      @name = text
+      self
+    end
+
+    alias text name
+  end
+
+  class TkError < Token
+  end
+
+  def Token(token, value = nil)
+    value ||= TkToken2Reading[token]
+
+    case token
+    when String
+      if (tk = TkReading2Token[token]).nil?
+        IRB.fail TkReading2TokenNoKey, token
+      end
+
+      tk = Token(tk[0], value)
+
+      if tk.kind_of?(TkOp) then
+        tk.name = token
+      end
+    when Symbol
+      if (tk = TkSymbol2Token[token]).nil?
+        IRB.fail TkSymbol2TokenNoKey, token
+      end
+
+      tk = Token(tk[0], value)
+    else
+      if token.instance_method(:initialize).arity == 3 then
+        tk = token.new(@prev_seek, @prev_line_no, @prev_char_no)
+        tk.set_text value
+      else
+        tk = token.new(@prev_seek, @prev_line_no, @prev_char_no, value)
+      end
+    end
+
+    tk
+  end
+
+  TokenDefinitions = [
+    [:TkCLASS,      TkKW,  "class",  EXPR_CLASS],
+    [:TkMODULE,     TkKW,  "module", EXPR_BEG],
+    [:TkDEF,        TkKW,  "def",    EXPR_FNAME],
+    [:TkUNDEF,      TkKW,  "undef",  EXPR_FNAME],
+    [:TkBEGIN,      TkKW,  "begin",  EXPR_BEG],
+    [:TkRESCUE,     TkKW,  "rescue", EXPR_MID],
+    [:TkENSURE,     TkKW,  "ensure", EXPR_BEG],
+    [:TkEND,        TkKW,  "end",    EXPR_END],
+    [:TkIF,         TkKW,  "if",     EXPR_BEG, :TkIF_MOD],
+    [:TkUNLESS,     TkKW,  "unless", EXPR_BEG, :TkUNLESS_MOD],
+    [:TkTHEN,       TkKW,  "then",   EXPR_BEG],
+    [:TkELSIF,      TkKW,  "elsif",  EXPR_BEG],
+    [:TkELSE,       TkKW,  "else",   EXPR_BEG],
+    [:TkCASE,       TkKW,  "case",   EXPR_BEG],
+    [:TkWHEN,       TkKW,  "when",   EXPR_BEG],
+    [:TkWHILE,      TkKW,  "while",  EXPR_BEG, :TkWHILE_MOD],
+    [:TkUNTIL,      TkKW,  "until",  EXPR_BEG, :TkUNTIL_MOD],
+    [:TkFOR,        TkKW,  "for",    EXPR_BEG],
+    [:TkBREAK,      TkKW,  "break",  EXPR_END],
+    [:TkNEXT,       TkKW,  "next",   EXPR_END],
+    [:TkREDO,       TkKW,  "redo",   EXPR_END],
+    [:TkRETRY,      TkKW,  "retry",  EXPR_END],
+    [:TkIN,         TkKW,  "in",     EXPR_BEG],
+    [:TkDO,         TkKW,  "do",     EXPR_BEG],
+    [:TkRETURN,     TkKW,  "return", EXPR_MID],
+    [:TkYIELD,      TkKW,  "yield",  EXPR_END],
+    [:TkSUPER,      TkKW,  "super",  EXPR_END],
+    [:TkSELF,       TkKW,  "self",   EXPR_END],
+    [:TkNIL,        TkKW,  "nil",    EXPR_END],
+    [:TkTRUE,       TkKW,  "true",   EXPR_END],
+    [:TkFALSE,      TkKW,  "false",  EXPR_END],
+    [:TkAND,        TkKW,  "and",    EXPR_BEG],
+    [:TkOR,         TkKW,  "or",     EXPR_BEG],
+    [:TkNOT,        TkKW,  "not",    EXPR_BEG],
+    [:TkIF_MOD,     TkKW],
+    [:TkUNLESS_MOD, TkKW],
+    [:TkWHILE_MOD,  TkKW],
+    [:TkUNTIL_MOD,  TkKW],
+    [:TkALIAS,      TkKW,  "alias",    EXPR_FNAME],
+    [:TkDEFINED,    TkKW,  "defined?", EXPR_END],
+    [:TklBEGIN,     TkKW,  "BEGIN",    EXPR_END],
+    [:TklEND,       TkKW,  "END",      EXPR_END],
+    [:Tk__LINE__,   TkKW,  "__LINE__", EXPR_END],
+    [:Tk__FILE__,   TkKW,  "__FILE__", EXPR_END],
+
+    [:TkIDENTIFIER, TkId],
+    [:TkFID,        TkId],
+    [:TkGVAR,       TkId],
+    [:TkCVAR,       TkId],
+    [:TkIVAR,       TkId],
+    [:TkCONSTANT,   TkId],
+
+    [:TkINTEGER,    TkVal],
+    [:TkFLOAT,      TkVal],
+    [:TkSTRING,     TkVal],
+    [:TkXSTRING,    TkVal],
+    [:TkREGEXP,     TkVal],
+    [:TkSYMBOL,     TkVal],
+
+    [:TkDSTRING,    TkNode],
+    [:TkDXSTRING,   TkNode],
+    [:TkDREGEXP,    TkNode],
+    [:TkNTH_REF,    TkNode],
+    [:TkBACK_REF,   TkNode],
+
+    [:TkUPLUS,      TkOp,   "+@"],
+    [:TkUMINUS,     TkOp,   "-@"],
+    [:TkPOW,        TkOp,   "**"],
+    [:TkCMP,        TkOp,   "<=>"],
+    [:TkEQ,         TkOp,   "=="],
+    [:TkEQQ,        TkOp,   "==="],
+    [:TkNEQ,        TkOp,   "!="],
+    [:TkGEQ,        TkOp,   ">="],
+    [:TkLEQ,        TkOp,   "<="],
+    [:TkANDOP,      TkOp,   "&&"],
+    [:TkOROP,       TkOp,   "||"],
+    [:TkMATCH,      TkOp,   "=~"],
+    [:TkNMATCH,     TkOp,   "!~"],
+    [:TkDOT2,       TkOp,   ".."],
+    [:TkDOT3,       TkOp,   "..."],
+    [:TkAREF,       TkOp,   "[]"],
+    [:TkASET,       TkOp,   "[]="],
+    [:TkLSHFT,      TkOp,   "<<"],
+    [:TkRSHFT,      TkOp,   ">>"],
+    [:TkCOLON2,     TkOp,   '::'],
+    [:TkCOLON3,     TkOp,   '::'],
+    #[:OPASGN,       TkOp],               # +=, -=  etc. #
+    [:TkASSOC,      TkOp,   "=>"],
+    [:TkQUESTION,   TkOp,   "?"], #?
+    [:TkCOLON,      TkOp,   ":"],        #:
+
+    [:TkfLPAREN,    Token,  "("], # func( #
+    [:TkfLBRACK,    Token,  "["], # func[ #
+    [:TkfLBRACE,    Token,  "{"], # func{ #
+    [:TkSTAR,       Token,  "*"], # *arg
+    [:TkAMPER,      Token,  "&"], # &arg #
+    [:TkSYMBEG,     Token,  ":"], # :SYMBOL
+
+    [:TkGT,         TkOp,   ">"],
+    [:TkLT,         TkOp,   "<"],
+    [:TkPLUS,       TkOp,   "+"],
+    [:TkMINUS,      TkOp,   "-"],
+    [:TkMULT,       TkOp,   "*"],
+    [:TkDIV,        TkOp,   "/"],
+    [:TkMOD,        TkOp,   "%"],
+    [:TkBITOR,      TkOp,   "|"],
+    [:TkBITXOR,     TkOp,   "^"],
+    [:TkBITAND,     TkOp,   "&"],
+    [:TkBITNOT,     TkOp,   "~"],
+    [:TkNOTOP,      TkOp,   "!"],
+
+    [:TkBACKQUOTE,  TkOp,   "`"],
+
+    [:TkASSIGN,     Token,  "="],
+    [:TkDOT,        Token,  "."],
+    [:TkLPAREN,     Token,  "("],  #(exp)
+    [:TkLBRACK,     Token,  "["],  #[arry]
+    [:TkLBRACE,     Token,  "{"],  #{hash}
+    [:TkRPAREN,     Token,  ")"],
+    [:TkRBRACK,     Token,  "]"],
+    [:TkRBRACE,     Token,  "}"],
+    [:TkCOMMA,      Token,  ","],
+    [:TkSEMICOLON,  Token,  ";"],
+
+    [:TkCOMMENT,    TkVal],
+    [:TkRD_COMMENT],
+    [:TkSPACE,      Token,  " "],
+    [:TkNL,         Token,  "\n"],
+    [:TkEND_OF_SCRIPT],
+
+    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
+    [:TkAT,         TkUnknownChar,  "@"],
+    [:TkDOLLAR,     TkUnknownChar,  "$"],
+  ]
+
+  # {reading => token_class}
+  # {reading => [token_class, *opt]}
+  TkReading2Token = {}
+  TkToken2Reading = {}
+  TkSymbol2Token = {}
+
+  def self.def_token(token_n, super_token = Token, reading = nil, *opts)
+    token_n = token_n.id2name if token_n.kind_of?(Symbol)
+    if const_defined?(token_n)
+      IRB.fail AlreadyDefinedToken, token_n
+    end
+    token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
+
+    if reading
+      TkToken2Reading[token_c] = reading
+
+      return if TkReading2Token[reading]
+
+      if opts.empty?
+        TkReading2Token[reading] = [token_c]
+      else
+        TkReading2Token[reading] = [token_c].concat(opts)
+      end
+    end
+    TkSymbol2Token[token_n.intern] = token_c
+  end
+
+  for defs in TokenDefinitions
+    def_token(*defs)
+  end
+
+  NEWLINE_TOKEN = TkNL.new nil, 0, 0, "\n"
+
+  class TkSYMBOL
+
+    def to_sym
+      @sym ||= text[1..-1].intern
+    end
+
+  end
+
+  # :startdoc:
+end
+
diff --git a/lib/rdoc/single_class.rb b/lib/rdoc/single_class.rb
new file mode 100644
index 0000000000..1226d56f84
--- /dev/null
+++ b/lib/rdoc/single_class.rb
@@ -0,0 +1,13 @@
+require 'rdoc/class_module'
+
+##
+# A singleton class
+
+class RDoc::SingleClass < RDoc::ClassModule
+
+  def ancestors
+    includes + [superclass]
+  end
+
+end
+
diff --git a/lib/rdoc/stats.rb b/lib/rdoc/stats.rb
new file mode 100644
index 0000000000..82e0afdf5d
--- /dev/null
+++ b/lib/rdoc/stats.rb
@@ -0,0 +1,247 @@
+require 'rdoc'
+
+##
+# RDoc stats collector
+
+class RDoc::Stats
+
+  attr_reader :nodoc_constants
+  attr_reader :nodoc_methods
+
+  attr_reader :num_constants
+  attr_reader :num_files
+  attr_reader :num_methods
+
+  attr_reader :total_files
+
+  def initialize(total_files, verbosity = 1)
+    @nodoc_constants = 0
+    @nodoc_methods   = 0
+
+    @num_constants = 0
+    @num_files     = 0
+    @num_methods   = 0
+
+    @total_files = total_files
+
+    @start = Time.now
+
+    @display = case verbosity
+               when 0 then Quiet.new   total_files
+               when 1 then Normal.new  total_files
+               else        Verbose.new total_files
+               end
+  end
+
+  def begin_adding
+    @display.begin_adding
+  end
+
+  def add_alias(as)
+    @display.print_alias as
+    @num_methods += 1
+    @nodoc_methods += 1 if as.document_self and as.comment.empty?
+  end
+
+  def add_class(klass)
+    @display.print_class klass
+  end
+
+  def add_constant(constant)
+    @display.print_constant constant
+    @num_constants += 1
+    @nodoc_constants += 1 if constant.document_self and constant.comment.empty?
+  end
+
+  def add_file(file)
+    @display.print_file @num_files, file
+    @num_files += 1
+  end
+
+  def add_method(method)
+    @display.print_method method
+    @num_methods += 1
+    @nodoc_methods += 1 if method.document_self and method.comment.empty?
+  end
+
+  def add_module(mod)
+    @display.print_module mod
+  end
+
+  def done_adding
+    @display.done_adding
+  end
+
+  def print
+    classes = RDoc::TopLevel.classes
+    num_classes   = classes.length
+    nodoc_classes = classes.select do |klass|
+      klass.document_self and klass.comment.empty?
+    end.length
+
+    modules = RDoc::TopLevel.modules
+    num_modules = modules.length
+    nodoc_modules = modules.select do |mod|
+      mod.document_self and mod.comment.empty?
+    end.length
+
+    items = num_classes + @num_constants + num_modules + @num_methods
+    doc_items = items -
+      nodoc_classes - @nodoc_constants - nodoc_modules - @nodoc_methods
+
+    percent_doc = doc_items.to_f / items * 100
+
+    puts "Files:     %5d" % @num_files
+    puts "Classes:   %5d (%5d undocumented)" % [num_classes, nodoc_classes]
+    puts "Constants: %5d (%5d undocumented)" %
+      [@num_constants, @nodoc_constants]
+    puts "Modules:   %5d (%5d undocumented)" % [num_modules, nodoc_modules]
+    puts "Methods:   %5d (%5d undocumented)" % [@num_methods, @nodoc_methods]
+    puts "%6.2f%% documented" % percent_doc
+    puts
+    puts "Elapsed: %0.1fs" % (Time.now - @start)
+  end
+
+  ##
+  # Stats printer that prints nothing
+
+  class Quiet
+
+    def initialize total_files
+      @total_files = total_files
+    end
+
+    ##
+    # Prints a message at the beginning of parsing
+
+    def begin_adding(*) end
+
+    ##
+    # Prints when an alias is added
+
+    def print_alias(*) end
+
+    ##
+    # Prints when a class is added
+
+    def print_class(*) end
+
+    ##
+    # Prints when a constant is added
+
+    def print_constant(*) end
+
+    ##
+    # Prints when a file is added
+
+    def print_file(*) end
+
+    ##
+    # Prints when a method is added
+
+    def print_method(*) end
+
+    ##
+    # Prints when a module is added
+
+    def print_module(*) end
+
+    ##
+    # Prints when RDoc is done
+
+    def done_adding(*) end
+
+  end
+
+  ##
+  # Stats printer that prints just the files being documented with a progress
+  # bar
+
+  class Normal < Quiet
+
+    def begin_adding # :nodoc:
+      puts "Parsing sources..."
+    end
+
+    ##
+    # Prints a file with a progress bar
+
+    def print_file(files_so_far, filename)
+      progress_bar = sprintf("%3d%% [%2d/%2d]  ",
+                             100 * (files_so_far + 1) / @total_files,
+                             files_so_far + 1,
+                             @total_files)
+
+      if $stdout.tty?
+        # Print a progress bar, but make sure it fits on a single line. Filename
+        # will be truncated if necessary.
+        terminal_width = (ENV['COLUMNS'] || 80).to_i
+        max_filename_size = terminal_width - progress_bar.size
+        if filename.size > max_filename_size
+          # Turn "some_long_filename.rb" to "...ong_filename.rb"
+          filename = filename[(filename.size - max_filename_size) .. -1]
+          filename[0..2] = "..."
+        end
+
+        # Pad the line with whitespaces so that leftover output from the
+        # previous line doesn't show up.
+        line = "#{progress_bar}#{filename}"
+        padding = terminal_width - line.size
+        line << (" " * padding) if padding > 0
+
+        $stdout.print("#{line}\r")
+      else
+        $stdout.puts "#{progress_bar} #{filename}"
+      end
+      $stdout.flush
+    end
+
+    def done_adding # :nodoc:
+      puts
+    end
+
+  end
+
+  ##
+  # Stats printer that prints everything documented, including the documented
+  # status
+
+  class Verbose < Normal
+
+    ##
+    # Returns a marker for RDoc::CodeObject +co+ being undocumented
+
+    def nodoc co
+      " (undocumented)" unless co.documented?
+    end
+
+    def print_alias as # :nodoc:
+      puts "\t\talias #{as.new_name} #{as.old_name}#{nodoc as}"
+    end
+
+    def print_class(klass) # :nodoc:
+      puts "\tclass #{klass.full_name}#{nodoc klass}"
+    end
+
+    def print_constant(constant) # :nodoc:
+      puts "\t\t#{constant.name}#{nodoc constant}"
+    end
+
+    def print_file(files_so_far, file) # :nodoc:
+      super
+      puts
+    end
+
+    def print_method(method) # :nodoc:
+      puts "\t\t#{method.singleton ? '::' : '#'}#{method.name}#{nodoc method}"
+    end
+
+    def print_module(mod) # :nodoc:
+      puts "\tmodule #{mod.full_name}#{nodoc mod}"
+    end
+
+  end
+
+end
+
+
diff --git a/lib/rdoc/task.rb b/lib/rdoc/task.rb
new file mode 100644
index 0000000000..f87ef7dc0e
--- /dev/null
+++ b/lib/rdoc/task.rb
@@ -0,0 +1,33 @@
+#--
+# Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require 'rdoc'
+require 'rake'
+require 'rake/rdoctask'
+
+# :stopdoc:
+module RDoc
+  Task = Rake::RDocTask
+end
+# :startdoc:
+
diff --git a/lib/rdoc/template.rb b/lib/rdoc/template.rb
deleted file mode 100644
index 469e10fb4b..0000000000
--- a/lib/rdoc/template.rb
+++ /dev/null
@@ -1,234 +0,0 @@
-# Cheap-n-cheerful HTML page template system. You create a 
-# template containing:
-#
-# * variable names between percent signs (<tt>%fred%</tt>)
-# * blocks of repeating stuff:
-#
-#     START:key
-#       ... stuff
-#     END:key
-#
-# You feed the code a hash. For simple variables, the values
-# are resolved directly from the hash. For blocks, the hash entry
-# corresponding to +key+ will be an array of hashes. The block will
-# be generated once for each entry. Blocks can be nested arbitrarily
-# deeply.
-#
-# The template may also contain
-#
-#   IF:key
-#     ... stuff
-#   ENDIF:key
-#
-# _stuff_ will only be included in the output if the corresponding
-# key is set in the value hash.
-#
-# Usage:  Given a set of templates <tt>T1, T2,</tt> etc
-#
-#            values = { "name" => "Dave", state => "TX" }
-#
-#            t = TemplatePage.new(T1, T2, T3)
-#            File.open(name, "w") {|f| t.write_html_on(f, values)}
-#         or
-#            res = ''
-#            t.write_html_on(res, values)
-#
-#
-
-class TemplatePage
-
-  ##########
-  # A context holds a stack of key/value pairs (like a symbol
-  # table). When asked to resolve a key, it first searches the top of
-  # the stack, then the next level, and so on until it finds a match
-  # (or runs out of entries)
-
-  class Context
-    def initialize
-      @stack = []
-    end
-
-    def push(hash)
-      @stack.push(hash)
-    end
-
-    def pop
-      @stack.pop
-    end
-
-    # Find a scalar value, throwing an exception if not found. This
-    # method is used when substituting the %xxx% constructs
-
-    def find_scalar(key)
-      @stack.reverse_each do |level|
-        if val = level[key]
-          return val unless val.kind_of? Array
-        end
-      end
-      raise "Template error: can't find variable '#{key}'"
-    end
-
-    # Lookup any key in the stack of hashes
-
-    def lookup(key)
-      @stack.reverse_each do |level|
-        val = level[key]
-        return val if val
-      end
-      nil
-    end
-  end
-
-  #########
-  # Simple class to read lines out of a string
-
-  class LineReader
-    # we're initialized with an array of lines
-    def initialize(lines)
-      @lines = lines
-    end
-
-    # read the next line 
-    def read
-      @lines.shift
-    end
-
-    # Return a list of lines up to the line that matches
-    # a pattern. That last line is discarded.
-    def read_up_to(pattern)
-      res = []
-      while line = read
-        if pattern.match(line)
-          return LineReader.new(res) 
-        else
-          res << line
-        end
-      end
-      raise "Missing end tag in template: #{pattern.source}"
-    end
-
-    # Return a copy of ourselves that can be modified without
-    # affecting us
-    def dup
-      LineReader.new(@lines.dup)
-    end
-  end
-
-
-
-  # +templates+ is an array of strings containing the templates.
-  # We start at the first, and substitute in subsequent ones
-  # where the string <tt>!INCLUDE!</tt> occurs. For example,
-  # we could have the overall page template containing
-  #
-  #   <html><body>
-  #     <h1>Master</h1>
-  #     !INCLUDE!
-  #   </bost></html>
-  #
-  # and substitute subpages in to it by passing [master, sub_page].
-  # This gives us a cheap way of framing pages
-
-  def initialize(*templates)
-    result = "!INCLUDE!"
-    templates.each do |content|
-      result.sub!(/!INCLUDE!/, content)
-    end
-    @lines = LineReader.new(result.split($/))
-  end
-
-  # Render the templates into HTML, storing the result on +op+ 
-  # using the method <tt><<</tt>. The <tt>value_hash</tt> contains
-  # key/value pairs used to drive the substitution (as described above)
-
-  def write_html_on(op, value_hash)
-    @context = Context.new
-    op << substitute_into(@lines, value_hash).tr("\000", '\\')
-  end
-
-
-  # Substitute a set of key/value pairs into the given template. 
-  # Keys with scalar values have them substituted directly into
-  # the page. Those with array values invoke <tt>substitute_array</tt>
-  # (below), which examples a block of the template once for each 
-  # row in the array.
-  #
-  # This routine also copes with the <tt>IF:</tt>_key_ directive,
-  # removing chunks of the template if the corresponding key
-  # does not appear in the hash, and the START: directive, which
-  # loops its contents for each value in an array
-
-  def substitute_into(lines, values)
-    @context.push(values)
-    skip_to = nil
-    result = []
-
-    while line = lines.read
-
-      case line
-
-      when /^IF:(\w+)/
-        lines.read_up_to(/^ENDIF:#$1/) unless @context.lookup($1)
-
-    when /^IFNOT:(\w+)/
-        lines.read_up_to(/^ENDIF:#$1/) if @context.lookup($1)
-
-      when /^ENDIF:/
-        ;
-
-      when /^START:(\w+)/
-        tag = $1
-        body = lines.read_up_to(/^END:#{tag}/)
-        inner_values = @context.lookup(tag)
-        raise "unknown tag: #{tag}" unless inner_values
-        raise "not array: #{tag}"   unless inner_values.kind_of?(Array)
-        inner_values.each do |vals|
-          result << substitute_into(body.dup, vals)
-        end
-      else
-        result << expand_line(line.dup)
-      end
-    end
-
-    @context.pop
-
-    result.join("\n")
-  end
-
-  # Given an individual line, we look for %xxx% constructs and 
-  # HREF:ref:name: constructs, substituting for each.
-
-  def expand_line(line)
-    # Generate a cross reference if a reference is given,
-    # otherwise just fill in the name part
-
-    line.gsub!(/HREF:(\w+?):(\w+?):/) {
-      ref = @context.lookup($1)
-      name = @context.find_scalar($2)
-
-      if ref and !ref.kind_of?(Array)
-	"<a href=\"#{ref}\">#{name}</a>"
-      else
-	name
-      end
-    }
-
-    # Substitute in values for %xxx% constructs.  This is made complex
-    # because the replacement string may contain characters that are
-    # meaningful to the regexp (like \1)
-
-    line = line.gsub(/%([a-zA-Z]\w*)%/) {
-      val = @context.find_scalar($1) 
-      val.tr('\\', "\000")
-    }
-
-
-    line
-  rescue Exception => e
-    $stderr.puts "Error in template: #{e}"
-    $stderr.puts "Original line: #{line}"
-    exit
-  end
-
-end
-
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
new file mode 100644
index 0000000000..5280aa0fd2
--- /dev/null
+++ b/lib/rdoc/text.rb
@@ -0,0 +1,130 @@
+##
+# Methods for manipulating comment text
+
+module RDoc::Text
+
+  ##
+  # Expands tab characters in +text+ to eight spaces
+
+  def expand_tabs text
+    expanded = []
+
+    text.each_line do |line|
+      line.gsub!(/^(.{8}*?)([^\t\r\n]{0,7})\t/) do
+        "#{$1}#{$2}#{' ' * (8 - $2.size)}"
+      end until line !~ /\t/
+
+      expanded << line
+    end
+
+    expanded.join
+  end
+
+  ##
+  # Flush +text+ left based on the shortest line
+
+  def flush_left text
+    indents = []
+
+    text.each_line do |line|
+      indents << (line =~ /[^\s]/ || 9999)
+    end
+
+    indent = indents.min
+
+    flush = []
+
+    text.each_line do |line|
+      line[/^ {0,#{indent}}/] = ''
+      flush << line
+    end
+
+    flush.join
+  end
+
+  ##
+  # Convert a string in markup format into HTML.  Removes the first paragraph
+  # tags if +remove_para+ is true.
+  #
+  # Requires the including class to implement #formatter
+
+  def markup text
+    document = parse text
+
+    document.accept formatter
+  end
+
+  ##
+  # Strips hashes, expands tabs then flushes +text+ to the left
+
+  def normalize_comment text
+    return text if text.empty?
+
+    text = strip_hashes text
+    text = expand_tabs text
+    text = flush_left text
+    strip_newlines text
+  end
+
+  ##
+  # Normalizes +text+ then builds a RDoc::Markup::Document from it
+
+  def parse text
+    return text if RDoc::Markup::Document === text
+
+    text = normalize_comment text
+
+    return RDoc::Markup::Document.new if text =~ /\A\n*\z/
+
+    RDoc::Markup::Parser.parse text
+  rescue RDoc::Markup::Parser::Error => e
+    $stderr.puts <<-EOF
+While parsing markup, RDoc encountered a #{e.class}:
+
+#{e}
+\tfrom #{e.backtrace.join "\n\tfrom "}
+
+---8<---
+#{text}
+---8<---
+
+RDoc #{RDoc::VERSION}
+
+Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_RELEASE_DATE}
+
+Please file a bug report with the above information at:
+
+http://rubyforge.org/tracker/?atid=2472&group_id=627&func=browse
+
+    EOF
+    raise
+  end
+
+  ##
+  # Strips leading # characters from +text+
+
+  def strip_hashes text
+    return text if text =~ /^(?>\s*)[^\#]/
+    text.gsub(/^\s*(#+)/) { $1.tr '#',' ' }
+  end
+
+  ##
+  # Strips leading and trailing \n characters from +text+
+
+  def strip_newlines text
+    text.gsub(/\A\n*(.*?)\n*\z/m, '\1')
+  end
+
+  ##
+  # Strips /* */ style comments
+
+  def strip_stars text
+    text = text.gsub %r%Document-method:\s+[\w:.#]+%, ''
+    text.sub!  %r%/\*+%       do " " * $&.length end
+    text.sub!  %r%\*+/%       do " " * $&.length end
+    text.gsub! %r%^[ \t]*\*%m do " " * $&.length end
+    text
+  end
+
+end
+
diff --git a/lib/rdoc/tokenstream.rb b/lib/rdoc/tokenstream.rb
index 0a0720d8a9..b1e86543f7 100644
--- a/lib/rdoc/tokenstream.rb
+++ b/lib/rdoc/tokenstream.rb
@@ -1,25 +1,52 @@
-# A TokenStream is a list of tokens, gathered during the parse
-# of some entity (say a method). Entities populate these streams
-# by being registered with the lexer. Any class can collect tokens
-# by including TokenStream. From the outside, you use such an object
-# by calling the start_collecting_tokens method, followed by calls
-# to add_token and pop_token
-
-module TokenStream
-  def token_stream
-    @token_stream
+module RDoc; end
+
+##
+# A TokenStream is a list of tokens, gathered during the parse of some entity
+# (say a method). Entities populate these streams by being registered with the
+# lexer. Any class can collect tokens by including TokenStream. From the
+# outside, you use such an object by calling the start_collecting_tokens
+# method, followed by calls to add_token and pop_token.
+
+module RDoc::TokenStream
+
+  ##
+  # Adds +tokens+ to the collected tokens
+
+  def add_tokens(*tokens)
+    tokens.flatten.each { |token| @token_stream << token }
   end
 
-  def start_collecting_tokens
+  alias add_token add_tokens
+
+  ##
+  # Starts collecting tokens
+
+  def collect_tokens
     @token_stream = []
   end
-  def add_token(tk)
-    @token_stream << tk
-  end
-  def add_tokens(tks)
-    tks.each  {|tk| add_token(tk)}
-  end
+
+  alias start_collecting_tokens collect_tokens
+
+  ##
+  # Remove the last token from the collected tokens
+
   def pop_token
     @token_stream.pop
   end
+
+  ##
+  # Current token stream
+
+  def token_stream
+    @token_stream
+  end
+
+  ##
+  # Returns a string representation of the token stream
+
+  def tokens_to_s
+    token_stream.map { |token| token.text }.join ''
+  end
+
 end
+
diff --git a/lib/rdoc/top_level.rb b/lib/rdoc/top_level.rb
new file mode 100644
index 0000000000..306790fc15
--- /dev/null
+++ b/lib/rdoc/top_level.rb
@@ -0,0 +1,248 @@
+require 'rdoc/context'
+
+##
+# A TopLevel context is a representation of the contents of a single file
+
+class RDoc::TopLevel < RDoc::Context
+
+  ##
+  # This TopLevel's File::Stat struct
+
+  attr_accessor :file_stat
+
+  ##
+  # Relative name of this file
+
+  attr_accessor :relative_name
+
+  ##
+  # Absolute name of this file
+
+  attr_accessor :absolute_name
+
+  attr_accessor :diagram
+
+  ##
+  # The parser that processed this file
+
+  attr_accessor :parser
+
+  ##
+  # Returns all classes and modules discovered by RDoc
+
+  def self.all_classes_and_modules
+    classes_hash.values + modules_hash.values
+  end
+
+  ##
+  # Returns all classes discovered by RDoc
+
+  def self.classes
+    classes_hash.values
+  end
+
+  ##
+  # Hash of all classes known to RDoc
+
+  def self.classes_hash
+    @all_classes
+  end
+
+  ##
+  # All TopLevels known to RDoc
+
+  def self.files
+    @all_files.values
+  end
+
+  ##
+  # Hash of all files known to RDoc
+
+  def self.files_hash
+    @all_files
+  end
+
+  ##
+  # Finds the class with +name+ in all discovered classes
+
+  def self.find_class_named(name)
+    classes_hash[name]
+  end
+
+  ##
+  # Finds the class with +name+ starting in namespace +from+
+
+  def self.find_class_named_from name, from
+    from = find_class_named from unless RDoc::Context === from
+
+    until RDoc::TopLevel === from do
+      return nil unless from
+
+      klass = from.find_class_named name
+      return klass if klass
+
+      from = from.parent
+    end
+
+    find_class_named name
+  end
+
+  ##
+  # Finds the class or module with +name+
+
+  def self.find_class_or_module(name)
+    name =~ /^::/
+    name = $' || name
+
+    RDoc::TopLevel.classes_hash[name] || RDoc::TopLevel.modules_hash[name]
+  end
+
+  ##
+  # Finds the file with +name+ in all discovered files
+
+  def self.find_file_named(name)
+    @all_files[name]
+  end
+
+  ##
+  # Finds the module with +name+ in all discovered modules
+
+  def self.find_module_named(name)
+    modules_hash[name]
+  end
+
+  ##
+  # Returns all modules discovered by RDoc
+
+  def self.modules
+    modules_hash.values
+  end
+
+  ##
+  # Hash of all modules known to RDoc
+
+  def self.modules_hash
+    @all_modules
+  end
+
+  ##
+  # Empties RDoc of stored class, module and file information
+
+  def self.reset
+    @all_classes = {}
+    @all_modules = {}
+    @all_files   = {}
+  end
+
+  reset
+
+  ##
+  # Creates a new TopLevel for +file_name+
+
+  def initialize(file_name)
+    super()
+    @name = nil
+    @relative_name = file_name
+    @absolute_name = file_name
+    @file_stat     = File.stat(file_name) rescue nil # HACK for testing
+    @diagram       = nil
+    @parser        = nil
+
+    RDoc::TopLevel.files_hash[file_name] = self
+  end
+
+  ##
+  # Adds +method+ to Object instead of RDoc::TopLevel
+
+  def add_method(method)
+    object = self.class.find_class_named 'Object'
+    object = add_class RDoc::NormalClass, 'Object' unless object
+
+    object.add_method method
+  end
+
+  ##
+  # Base name of this file
+
+  def base_name
+    File.basename @absolute_name
+  end
+
+  ##
+  # See RDoc::TopLevel.find_class_or_module
+
+  def find_class_or_module name
+    RDoc::TopLevel.find_class_or_module name
+  end
+
+  ##
+  # Finds a class or module named +symbol+
+
+  def find_local_symbol(symbol)
+    find_class_or_module(symbol) || super
+  end
+
+  ##
+  # Finds a module or class with +name+
+
+  def find_module_named(name)
+    find_class_or_module(name) || find_enclosing_module_named(name)
+  end
+
+  ##
+  # The name of this file
+
+  def full_name
+    @relative_name
+  end
+
+  ##
+  # URL for this with a +prefix+
+
+  def http_url(prefix)
+    path = [prefix, @relative_name.tr('.', '_')]
+
+    File.join(*path.compact) + '.html'
+  end
+
+  def inspect # :nodoc:
+    "#<%s:0x%x %p modules: %p classes: %p>" % [
+      self.class, object_id,
+      base_name,
+      @modules.map { |n,m| m },
+      @classes.map { |n,c| c }
+    ]
+  end
+
+  ##
+  # Date this file was last modified, if known
+
+  def last_modified
+    @file_stat ? file_stat.mtime.to_s : 'Unknown'
+  end
+
+  ##
+  # Base name of this file
+
+  alias name base_name
+
+  ##
+  # Path to this file
+
+  def path
+    http_url RDoc::RDoc.current.generator.file_dir
+  end
+
+  def pretty_print q # :nodoc:
+    q.group 2, "[#{self.class}: ", "]" do
+      q.text "base name: #{base_name.inspect}"
+      q.breakable
+
+      items = @modules.map { |n,m| m }
+      items.push(*@modules.map { |n,c| c })
+      q.seplist items do |mod| q.pp mod end
+    end
+  end
+
+end
+
diff --git a/lib/rdoc/usage.rb b/lib/rdoc/usage.rb
deleted file mode 100644
index def516b3d7..0000000000
--- a/lib/rdoc/usage.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-# = Synopsis
-#
-# This library allows command-line tools to encapsulate their usage
-# as a comment at the top of the main file. Calling <tt>RDoc::usage</tt>
-# then displays some or all of that comment, and optionally exits
-# the program with an exit status. We always look for the comment
-# in the main program file, so it is safe to call this method
-# from anywhere in the executing program.
-#
-# = Usage
-#
-#   RDoc::usage( [ exit_status ], [ section, ...])
-#   RDoc::usage_no_exit( [ section, ...])
-#
-# where:
-#
-# exit_status::
-#     the integer exit code (default zero). RDoc::usage will exit
-#     the calling program with this status.
-#
-# section::
-#     an optional list of section names. If specified, only the
-#     sections with the given names as headings will be output.
-#     For example, this section is named 'Usage', and the next
-#     section is named 'Examples'. The section names are case
-#     insensitive.
-#
-# = Examples
-#
-#    # Comment block describing usage
-#    # with (optional) section headings
-#    # . . .
-#
-#    require 'rdoc/usage'
-#
-#    # Display all usage and exit with a status of 0
-#
-#    RDoc::usage
-#
-#    # Display all usage and exit with a status of 99
-#
-#    RDoc::usage(99)
-#
-#    # Display usage in the 'Summary' section only, then
-#    # exit with a status of 99
-#
-#    RDoc::usage(99, 'Summary')
-#
-#    # Display information in the Author and Copyright
-#    # sections, then exit 0.
-#    
-#    RDoc::usage('Author', 'Copyright')
-#
-#    # Display information in the Author and Copyright
-#    # sections, but don't exit
-#  
-#    RDoc::usage_no_exit('Author', 'Copyright')
-#
-# = Author
-#
-# Dave Thomas, The Pragmatic Programmers, LLC
-#
-# = Copyright
-#
-# Copyright (c) 2004 Dave Thomas.
-# Licensed under the same terms as Ruby
-#
-
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_flow'
-require 'rdoc/ri/ri_formatter'
-require 'rdoc/ri/ri_options'
-
-module RDoc
-
-  # Display usage information from the comment at the top of
-  # the file. String arguments identify specific sections of the
-  # comment to display. An optional integer first argument
-  # specifies the exit status  (defaults to 0)
-
-  def RDoc.usage(*args)
-    exit_code = 0
-
-    if args.size > 0
-      status = args[0]
-      if status.respond_to?(:to_int)
-        exit_code = status.to_int
-        args.shift
-      end
-    end
-
-    # display the usage and exit with the given code
-    usage_no_exit(*args)
-    exit(exit_code)
-  end
-
-  # Display usage
-  def RDoc.usage_no_exit(*args)
-    main_program_file = caller[-1].sub(/:\d+$/, '')
-    comment = File.open(main_program_file) do |file|
-      find_comment(file)
-    end
-
-    comment = comment.gsub(/^\s*#/, '')
-
-    markup = SM::SimpleMarkup.new
-    flow_convertor = SM::ToFlow.new
-    
-    flow = markup.convert(comment, flow_convertor)
-
-    format = "plain"
-
-    unless args.empty?
-      flow = extract_sections(flow, args)
-    end
-
-    options = RI::Options.instance
-    if args = ENV["RI"]
-      options.parse(args.split)
-    end
-    formatter = options.formatter.new(options, "")
-    formatter.display_flow(flow)
-  end
-
-  ######################################################################
-
-  private
-
-  # Find the first comment in the file (that isn't a shebang line)
-  # If the file doesn't start with a comment, report the fact
-  # and return empty string
-
-  def RDoc.gets(file)
-    if (line = file.gets) && (line =~ /^#!/) # shebang
-      throw :exit, find_comment(file)
-    else
-      line
-    end
-  end
-
-  def RDoc.find_comment(file)
-    catch(:exit) do
-      # skip leading blank lines
-      0 while (line = gets(file)) && (line =~ /^\s*$/)
-
-      comment = []
-      while line && line =~ /^\s*#/
-        comment << line
-        line = gets(file)
-      end
-
-      0 while line && (line = gets(file))
-      return no_comment if comment.empty?
-      return comment.join
-    end
-  end
-
-
-  #####
-  # Given an array of flow items and an array of section names, extract those
-  # sections from the flow which have headings corresponding to
-  # a section name in the list. Return them in the order
-  # of names in the +sections+ array.
-
-  def RDoc.extract_sections(flow, sections)
-    result = []
-    sections.each do |name|
-      name = name.downcase
-      copy_upto_level = nil
-
-      flow.each do |item|
-        case item
-        when SM::Flow::H
-          if copy_upto_level && item.level >= copy_upto_level
-            copy_upto_level = nil
-          else
-            if item.text.downcase == name
-              result << item
-              copy_upto_level = item.level
-            end
-          end
-        else
-          if copy_upto_level
-            result << item
-          end
-        end
-      end
-    end
-    if result.empty?
-      puts "Note to developer: requested section(s) [#{sections.join(', ')}] " +
-           "not found"
-      result = flow
-    end
-    result
-  end
-
-  #####
-  # Report the fact that no doc comment count be found
-  def RDoc.no_comment
-    $stderr.puts "No usage information available for this program"
-    ""
-  end
-end
-
-
-if $0 == __FILE__
-
-  RDoc::usage(*ARGV)
-
-end
diff --git a/lib/readbytes.rb b/lib/readbytes.rb
deleted file mode 100644
index ebb5fc0bd4..0000000000
--- a/lib/readbytes.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# TruncatedDataError is raised when IO#readbytes fails to read enough data.
-
-class TruncatedDataError<IOError
-  def initialize(mesg, data) # :nodoc:
-    @data = data
-    super(mesg)
-  end
-
-  # The read portion of an IO#readbytes attempt.
-  attr_reader :data
-end
-
-class IO
-  # Reads exactly +n+ bytes.
-  #
-  # If the data read is nil an EOFError is raised.
-  #
-  # If the data read is too short a TruncatedDataError is raised and the read
-  # data is obtainable via its #data method.
-  def readbytes(n)
-    str = read(n)
-    if str == nil
-      raise EOFError, "End of file reached"
-    end
-    if str.size < n
-      raise TruncatedDataError.new("data truncated", str) 
-    end
-    str
-  end
-end
-
-if __FILE__ == $0
-  begin
-    loop do
-      print STDIN.readbytes(6)
-    end
-  rescue TruncatedDataError
-    p $!.data
-    raise
-  end
-end
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
index 5d15b4577c..b63eae8f02 100644
--- a/lib/resolv-replace.rb
+++ b/lib/resolv-replace.rb
@@ -2,7 +2,9 @@ require 'socket'
 require 'resolv'
 
 class << IPSocket
+  # :stopdoc:
   alias original_resolv_getaddress getaddress
+  # :startdoc:
   def getaddress(host)
     begin
       return Resolv.getaddress(host).to_s
@@ -12,26 +14,35 @@ class << IPSocket
   end
 end
 
-class TCPSocket
+class TCPSocket < IPSocket
+  # :stopdoc:
   alias original_resolv_initialize initialize
+  # :startdoc:
   def initialize(host, serv, *rest)
     rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
     original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
   end
 end
 
-class UDPSocket
+class UDPSocket < IPSocket
+  # :stopdoc:
   alias original_resolv_bind bind
+  # :startdoc:
   def bind(host, port)
-    original_resolv_bind(IPSocket.getaddress(host), port)
+    host = IPSocket.getaddress(host) if host != ""
+    original_resolv_bind(host, port)
   end
 
+  # :stopdoc:
   alias original_resolv_connect connect
+  # :startdoc:
   def connect(host, port)
     original_resolv_connect(IPSocket.getaddress(host), port)
   end
 
+  # :stopdoc:
   alias original_resolv_send send
+  # :startdoc:
   def send(mesg, flags, *rest)
     if rest.length == 2
       host, port = rest
@@ -54,8 +65,10 @@ class UDPSocket
   end
 end
 
-class SOCKSSocket
+class SOCKSSocket < TCPSocket
+  # :stopdoc:
   alias original_resolv_initialize initialize
+  # :startdoc:
   def initialize(host, serv)
     original_resolv_initialize(IPSocket.getaddress(host), port)
   end
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 1792fd8178..9a96c55931 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -1,239 +1,110 @@
-=begin
-= resolv library
-resolv.rb is a resolver library written in Ruby.
-Since it is written in Ruby, it is thread-aware.
-I.e. it can resolv many hostnames concurrently.
-
-It is possible to lookup various resources of DNS using DNS module directly.
-
-== example
-  p Resolv.getaddress("www.ruby-lang.org")
-  p Resolv.getname("210.251.121.214")
-
-  Resolv::DNS.open {|dns|
-    p dns.getresources("www.ruby-lang.org", Resolv::DNS::Resource::IN::A).collect {|r| r.address}
-    p dns.getresources("ruby-lang.org", Resolv::DNS::Resource::IN::MX).collect {|r| [r.exchange.to_s, r.preference]}
-  }
-
-== Resolv class
-
-=== class methods
---- Resolv.getaddress(name)
---- Resolv.getaddresses(name)
---- Resolv.each_address(name) {|address| ...}
-    They lookups IP addresses of ((|name|)) which represents a hostname
-    as a string by default resolver.
-
-    getaddress returns first entry of lookupped addresses.
-    getaddresses returns lookupped addresses as an array.
-    each_address iterates over lookupped addresses.
-
---- Resolv.getname(address)
---- Resolv.getnames(address)
---- Resolv.each_name(address) {|name| ...}
-    lookups hostnames of ((|address|)) which represents IP address as a string.
-
-    getname returns first entry of lookupped names.
-    getnames returns lookupped names as an array.
-    each_names iterates over lookupped names.
-
-== Resolv::Hosts class
-hostname resolver using /etc/hosts format.
-
-=== class methods
---- Resolv::Hosts.new(hosts='/etc/hosts')
-
-=== methods
---- Resolv::Hosts#getaddress(name)
---- Resolv::Hosts#getaddresses(name)
---- Resolv::Hosts#each_address(name) {|address| ...}
-    address lookup methods.
-
---- Resolv::Hosts#getname(address)
---- Resolv::Hosts#getnames(address)
---- Resolv::Hosts#each_name(address) {|name| ...}
-    hostnames lookup methods.
-
-== Resolv::DNS class
-DNS stub resolver.
-
-=== class methods
---- Resolv::DNS.new(config_info=nil)
-
-    ((|config_info|)) should be nil, a string or a hash.
-    If nil is given, /etc/resolv.conf and platform specific information is used.
-    If a string is given, it should be a filename which format is same as /etc/resolv.conf.
-    If a hash is given, it may contains information for nameserver, search and ndots as follows.
-
-      Resolv::DNS.new({:nameserver=>["210.251.121.21"], :search=>["ruby-lang.org"], :ndots=>1})
-
---- Resolv::DNS.open(config_info=nil)
---- Resolv::DNS.open(config_info=nil) {|dns| ...}
-
-=== methods
---- Resolv::DNS#close
-
---- Resolv::DNS#getaddress(name)
---- Resolv::DNS#getaddresses(name)
---- Resolv::DNS#each_address(name) {|address| ...}
-    address lookup methods.
-
-    ((|name|)) must be a instance of Resolv::DNS::Name or String.  Lookupped
-    address is represented as an instance of Resolv::IPv4 or Resolv::IPv6.
-
---- Resolv::DNS#getname(address)
---- Resolv::DNS#getnames(address)
---- Resolv::DNS#each_name(address) {|name| ...}
-    hostnames lookup methods.
-
-    ((|address|)) must be a instance of Resolv::IPv4, Resolv::IPv6 or String.
-    Lookupped name is represented as an instance of Resolv::DNS::Name.
-
---- Resolv::DNS#getresource(name, typeclass)
---- Resolv::DNS#getresources(name, typeclass)
---- Resolv::DNS#each_resource(name, typeclass) {|resource| ...}
-    They lookup DNS resources of ((|name|)).
-    ((|name|)) must be a instance of Resolv::Name or String.
-
-    ((|typeclass|)) should be one of follows:
-    * Resolv::DNS::Resource::IN::ANY
-    * Resolv::DNS::Resource::IN::NS
-    * Resolv::DNS::Resource::IN::CNAME
-    * Resolv::DNS::Resource::IN::SOA
-    * Resolv::DNS::Resource::IN::HINFO
-    * Resolv::DNS::Resource::IN::MINFO
-    * Resolv::DNS::Resource::IN::MX
-    * Resolv::DNS::Resource::IN::TXT
-    * Resolv::DNS::Resource::IN::ANY
-    * Resolv::DNS::Resource::IN::A
-    * Resolv::DNS::Resource::IN::WKS
-    * Resolv::DNS::Resource::IN::PTR
-    * Resolv::DNS::Resource::IN::AAAA
-
-    Lookupped resource is represented as an instance of (a subclass of)
-    Resolv::DNS::Resource. 
-    (Resolv::DNS::Resource::IN::A, etc.)
-
-== Resolv::DNS::Resource::IN::NS class
---- name
-== Resolv::DNS::Resource::IN::CNAME class
---- name
-== Resolv::DNS::Resource::IN::SOA class
---- mname
---- rname
---- serial
---- refresh
---- retry
---- expire
---- minimum
-== Resolv::DNS::Resource::IN::HINFO class
---- cpu
---- os
-== Resolv::DNS::Resource::IN::MINFO class
---- rmailbx
---- emailbx
-== Resolv::DNS::Resource::IN::MX class
---- preference
---- exchange
-== Resolv::DNS::Resource::IN::TXT class
---- data
-== Resolv::DNS::Resource::IN::A class
---- address
-== Resolv::DNS::Resource::IN::WKS class
---- address
---- protocol
---- bitmap
-== Resolv::DNS::Resource::IN::PTR class
---- name
-== Resolv::DNS::Resource::IN::AAAA class
---- address
-
-== Resolv::DNS::Name class
-
-=== class methods
---- Resolv::DNS::Name.create(name)
-
-=== methods
---- Resolv::DNS::Name#to_s
-
-== Resolv::DNS::Resource class
-
-== Resolv::IPv4 class
-=== class methods
---- Resolv::IPv4.create(address)
-
-=== methods
---- Resolv::IPv4#to_s
---- Resolv::IPv4#to_name
-
-=== constants
---- Resolv::IPv4::Regex
-    regular expression for IPv4 address.
-
-== Resolv::IPv6 class
-=== class methods
---- Resolv::IPv6.create(address)
-
-=== methods
---- Resolv::IPv6#to_s
---- Resolv::IPv6#to_name
-
-=== constants
---- Resolv::IPv6::Regex
-    regular expression for IPv6 address.
-
-== Bugs
-* NIS is not supported.
-* /etc/nsswitch.conf is not supported.
-* IPv6 is not supported.
-
-=end
-
 require 'socket'
 require 'fcntl'
 require 'timeout'
 require 'thread'
 
+begin
+  require 'securerandom'
+rescue LoadError
+end
+
+# Resolv is a thread-aware DNS resolver library written in Ruby.  Resolv can
+# handle multiple DNS requests concurrently without blocking the entire ruby
+# interpreter.
+#
+# See also resolv-replace.rb to replace the libc resolver with Resolv.
+#
+# Resolv can look up various DNS resources using the DNS module directly.
+#
+# Examples:
+#
+#   p Resolv.getaddress "www.ruby-lang.org"
+#   p Resolv.getname "210.251.121.214"
+#
+#   Resolv::DNS.open do |dns|
+#     ress = dns.getresources "www.ruby-lang.org", Resolv::DNS::Resource::IN::A
+#     p ress.map { |r| r.address }
+#     ress = dns.getresources "ruby-lang.org", Resolv::DNS::Resource::IN::MX
+#     p ress.map { |r| [r.exchange.to_s, r.preference] }
+#   end
+#
+#
+# == Bugs
+#
+# * NIS is not supported.
+# * /etc/nsswitch.conf is not supported.
+
 class Resolv
+
+  ##
+  # Looks up the first IP address for +name+.
+
   def self.getaddress(name)
     DefaultResolver.getaddress(name)
   end
 
+  ##
+  # Looks up all IP address for +name+.
+
   def self.getaddresses(name)
     DefaultResolver.getaddresses(name)
   end
 
+  ##
+  # Iterates over all IP addresses for +name+.
+
   def self.each_address(name, &block)
     DefaultResolver.each_address(name, &block)
   end
 
+  ##
+  # Looks up the hostname of +address+.
+
   def self.getname(address)
     DefaultResolver.getname(address)
   end
 
+  ##
+  # Looks up all hostnames for +address+.
+
   def self.getnames(address)
     DefaultResolver.getnames(address)
   end
 
+  ##
+  # Iterates over all hostnames for +address+.
+
   def self.each_name(address, &proc)
     DefaultResolver.each_name(address, &proc)
   end
 
+  ##
+  # Creates a new Resolv using +resolvers+.
+
   def initialize(resolvers=[Hosts.new, DNS.new])
     @resolvers = resolvers
   end
 
+  ##
+  # Looks up the first IP address for +name+.
+
   def getaddress(name)
     each_address(name) {|address| return address}
     raise ResolvError.new("no address for #{name}")
   end
 
+  ##
+  # Looks up all IP address for +name+.
+
   def getaddresses(name)
     ret = []
     each_address(name) {|address| ret << address}
     return ret
   end
 
+  ##
+  # Iterates over all IP addresses for +name+.
+
   def each_address(name)
     if AddressRegex =~ name
       yield name
@@ -249,17 +120,26 @@ class Resolv
     }
   end
 
+  ##
+  # Looks up the hostname of +address+.
+
   def getname(address)
     each_name(address) {|name| return name}
     raise ResolvError.new("no name for #{address}")
   end
 
+  ##
+  # Looks up all hostnames for +address+.
+
   def getnames(address)
     ret = []
     each_name(address) {|name| ret << name}
     return ret
   end
 
+  ##
+  # Iterates over all hostnames for +address+.
+
   def each_name(address)
     yielded = false
     @resolvers.each {|r|
@@ -271,27 +151,37 @@ class Resolv
     }
   end
 
-  class ResolvError < StandardError
-  end
+  ##
+  # Indicates a failure to resolve a name or address.
 
-  class ResolvTimeout < TimeoutError
-  end
+  class ResolvError < StandardError; end
+
+  ##
+  # Indicates a timeout resolving a name or address.
+
+  class ResolvTimeout < TimeoutError; end
+
+  ##
+  # Resolv::Hosts is a hostname resolver that uses the system hosts file.
 
   class Hosts
-    if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM
+    if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
       require 'win32/resolv'
       DefaultFileName = Win32::Resolv.get_hosts_path
     else
       DefaultFileName = '/etc/hosts'
     end
 
+    ##
+    # Creates a new Resolv::Hosts, using +filename+ for its data source.
+
     def initialize(filename = DefaultFileName)
       @filename = filename
       @mutex = Mutex.new
       @initialized = nil
     end
 
-    def lazy_initialize
+    def lazy_initialize # :nodoc:
       @mutex.synchronize {
         unless @initialized
           @name2addr = {}
@@ -322,17 +212,26 @@ class Resolv
       self
     end
 
+    ##
+    # Gets the IP address of +name+ from the hosts file.
+
     def getaddress(name)
       each_address(name) {|address| return address}
       raise ResolvError.new("#{@filename} has no name: #{name}")
     end
 
+    ##
+    # Gets all IP addresses for +name+ from the hosts file.
+
     def getaddresses(name)
       ret = []
       each_address(name) {|address| ret << address}
       return ret
     end
 
+    ##
+    # Iterates over all IP addresses for +name+ retrieved from the hosts file.
+
     def each_address(name, &proc)
       lazy_initialize
       if @name2addr.include?(name)
@@ -340,17 +239,26 @@ class Resolv
       end
     end
 
+    ##
+    # Gets the hostname of +address+ from the hosts file.
+
     def getname(address)
       each_name(address) {|name| return name}
       raise ResolvError.new("#{@filename} has no address: #{address}")
     end
 
+    ##
+    # Gets all hostnames for +address+ from the hosts file.
+
     def getnames(address)
       ret = []
       each_name(address) {|name| ret << name}
       return ret
     end
 
+    ##
+    # Iterates over all hostnames for +address+ retrieved from the hosts file.
+
     def each_name(address, &proc)
       lazy_initialize
       if @addr2name.include?(address)
@@ -359,14 +267,33 @@ class Resolv
     end
   end
 
+  ##
+  # Resolv::DNS is a DNS stub resolver.
+  #
+  # Information taken from the following places:
+  #
+  # * STD0013
+  # * RFC 1035
+  # * ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
+  # * etc.
+
   class DNS
-    # STD0013 (RFC 1035, etc.)
-    # ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
+
+    ##
+    # Default DNS Port
 
     Port = 53
+
+    ##
+    # Default DNS UDP packet size
+
     UDPSize = 512
 
-    DNSThreadGroup = ThreadGroup.new
+    ##
+    # Creates a new DNS resolver.  See Resolv::DNS.new for argument details.
+    #
+    # Yields the created DNS resolver to the block, if given, otherwise
+    # returns it.
 
     def self.open(*args)
       dns = new(*args)
@@ -378,65 +305,135 @@ class Resolv
       end
     end
 
+    ##
+    # Creates a new DNS resolver.
+    #
+    # +config_info+ can be:
+    #
+    # nil:: Uses /etc/resolv.conf.
+    # String:: Path to a file using /etc/resolv.conf's format.
+    # Hash:: Must contain :nameserver, :search and :ndots keys.
+    # :nameserver_port can be used to specify port number of nameserver address.
+    #
+    # The value of :nameserver should be an address string or
+    # an array of address strings.
+    # - :nameserver => '8.8.8.8'
+    # - :nameserver => ['8.8.8.8', '8.8.4.4']
+    #
+    # The value of :nameserver_port should be an array of
+    # pair of nameserver address and port number.
+    # - :nameserver_port => [['8.8.8.8', 53], ['8.8.4.4', 53]]
+    #
+    # Example:
+    #
+    #   Resolv::DNS.new(:nameserver => ['210.251.121.21'],
+    #                   :search => ['ruby-lang.org'],
+    #                   :ndots => 1)
+
     def initialize(config_info=nil)
       @mutex = Mutex.new
       @config = Config.new(config_info)
       @initialized = nil
     end
 
-    def lazy_initialize
+    def lazy_initialize # :nodoc:
       @mutex.synchronize {
         unless @initialized
           @config.lazy_initialize
-
-          if nameserver = @config.single?
-            @requester = Requester::ConnectedUDP.new(nameserver)
-          else
-            @requester = Requester::UnconnectedUDP.new
-          end
-
           @initialized = true
         end
       }
       self
     end
 
+    ##
+    # Closes the DNS resolver.
+
     def close
       @mutex.synchronize {
         if @initialized
-          @requester.close if @requester
-          @requester = nil
           @initialized = false
         end
       }
     end
 
+    ##
+    # Gets the IP address of +name+ from the DNS resolver.
+    #
+    # +name+ can be a Resolv::DNS::Name or a String.  Retrieved address will
+    # be a Resolv::IPv4 or Resolv::IPv6
+
     def getaddress(name)
       each_address(name) {|address| return address}
       raise ResolvError.new("DNS result has no information for #{name}")
     end
 
+    ##
+    # Gets all IP addresses for +name+ from the DNS resolver.
+    #
+    # +name+ can be a Resolv::DNS::Name or a String.  Retrieved addresses will
+    # be a Resolv::IPv4 or Resolv::IPv6
+
     def getaddresses(name)
       ret = []
       each_address(name) {|address| ret << address}
       return ret
     end
 
+    ##
+    # Iterates over all IP addresses for +name+ retrieved from the DNS
+    # resolver.
+    #
+    # +name+ can be a Resolv::DNS::Name or a String.  Retrieved addresses will
+    # be a Resolv::IPv4 or Resolv::IPv6
+
     def each_address(name)
       each_resource(name, Resource::IN::A) {|resource| yield resource.address}
+      if use_ipv6?
+        each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address}
+      end
+    end
+
+    def use_ipv6?
+      begin
+        list = Socket.ip_address_list
+      rescue NotImplementedError
+        return true
+      end
+      list.any? {|a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? }
     end
+    private :use_ipv6?
+
+    ##
+    # Gets the hostname for +address+ from the DNS resolver.
+    #
+    # +address+ must be a Resolv::IPv4, Resolv::IPv6 or a String.  Retrieved
+    # name will be a Resolv::DNS::Name.
 
     def getname(address)
       each_name(address) {|name| return name}
       raise ResolvError.new("DNS result has no information for #{address}")
     end
 
+    ##
+    # Gets all hostnames for +address+ from the DNS resolver.
+    #
+    # +address+ must be a Resolv::IPv4, Resolv::IPv6 or a String.  Retrieved
+    # names will be Resolv::DNS::Name instances.
+
     def getnames(address)
       ret = []
       each_name(address) {|name| ret << name}
       return ret
     end
 
+    ##
+    # Iterates over all hostnames for +address+ retrieved from the DNS
+    # resolver.
+    #
+    # +address+ must be a Resolv::IPv4, Resolv::IPv6 or a String.  Retrieved
+    # names will be Resolv::DNS::Name instances.
+
     def each_name(address)
       case address
       when Name
@@ -451,33 +448,62 @@ class Resolv
       each_resource(ptr, Resource::IN::PTR) {|resource| yield resource.name}
     end
 
+    ##
+    # Look up the +typeclass+ DNS resource of +name+.
+    #
+    # +name+ must be a Resolv::DNS::Name or a String.
+    #
+    # +typeclass+ should be one of the following:
+    #
+    # * Resolv::DNS::Resource::IN::A
+    # * Resolv::DNS::Resource::IN::AAAA
+    # * Resolv::DNS::Resource::IN::ANY
+    # * Resolv::DNS::Resource::IN::CNAME
+    # * Resolv::DNS::Resource::IN::HINFO
+    # * Resolv::DNS::Resource::IN::MINFO
+    # * Resolv::DNS::Resource::IN::MX
+    # * Resolv::DNS::Resource::IN::NS
+    # * Resolv::DNS::Resource::IN::PTR
+    # * Resolv::DNS::Resource::IN::SOA
+    # * Resolv::DNS::Resource::IN::TXT
+    # * Resolv::DNS::Resource::IN::WKS
+    #
+    # Returned resource is represented as a Resolv::DNS::Resource instance,
+    # i.e. Resolv::DNS::Resource::IN::A.
+
     def getresource(name, typeclass)
       each_resource(name, typeclass) {|resource| return resource}
       raise ResolvError.new("DNS result has no information for #{name}")
     end
 
+    ##
+    # Looks up all +typeclass+ DNS resources for +name+.  See #getresource for
+    # argument details.
+
     def getresources(name, typeclass)
       ret = []
       each_resource(name, typeclass) {|resource| ret << resource}
       return ret
     end
 
+    ##
+    # Iterates over all +typeclass+ DNS resources for +name+.  See
+    # #getresource for argument details.
+
     def each_resource(name, typeclass, &proc)
       lazy_initialize
-      q = Queue.new
+      requester = make_requester
       senders = {}
       begin
-        @config.resolv(name) {|candidate, tout, nameserver|
+        @config.resolv(name) {|candidate, tout, nameserver, port|
           msg = Message.new
           msg.rd = 1
           msg.add_question(candidate, typeclass)
-          unless sender = senders[[candidate, nameserver]]
-            sender = senders[[candidate, nameserver]] =
-              @requester.sender(msg, candidate, q, nameserver)
+          unless sender = senders[[candidate, nameserver, port]]
+            sender = senders[[candidate, nameserver, port]] =
+              requester.sender(msg, candidate, nameserver, port)
           end
-          sender.send
-          reply = reply_name = nil
-          timeout(tout, ResolvTimeout) { reply, reply_name = q.pop }
+          reply, reply_name = requester.request(sender, tout)
           case reply.rcode
           when RCode::NoError
             extract_resources(reply, reply_name, typeclass, &proc)
@@ -489,11 +515,20 @@ class Resolv
           end
         }
       ensure
-        @requester.delete(q)
+        requester.close
       end
     end
 
-    def extract_resources(msg, name, typeclass)
+    def make_requester # :nodoc:
+      nameserver_port = @config.nameserver_port
+      if nameserver_port.length == 1
+        Requester::ConnectedUDP.new(*nameserver_port[0])
+      else
+        Requester::UnconnectedUDP.new(*nameserver_port)
+      end
+    end
+
+    def extract_resources(msg, name, typeclass) # :nodoc:
       if typeclass < Resource::ANY
         n0 = Name.create(name)
         msg.each_answer {|n, ttl, data|
@@ -524,91 +559,169 @@ class Resolv
       }
     end
 
-    class Requester
+    if defined? SecureRandom
+      def self.random(arg) # :nodoc:
+        begin
+          SecureRandom.random_number(arg)
+        rescue NotImplementedError
+          rand(arg)
+        end
+      end
+    else
+      def self.random(arg) # :nodoc:
+        rand(arg)
+      end
+    end
+
+
+    def self.rangerand(range) # :nodoc:
+      base = range.begin
+      len = range.end - range.begin
+      if !range.exclude_end?
+        len += 1
+      end
+      base + random(len)
+    end
+
+    RequestID = {}
+    RequestIDMutex = Mutex.new
+
+    def self.allocate_request_id(host, port) # :nodoc:
+      id = nil
+      RequestIDMutex.synchronize {
+        h = (RequestID[[host, port]] ||= {})
+        begin
+          id = rangerand(0x0000..0xffff)
+        end while h[id]
+        h[id] = true
+      }
+      id
+    end
+
+    def self.free_request_id(host, port, id) # :nodoc:
+      RequestIDMutex.synchronize {
+        key = [host, port]
+        if h = RequestID[key]
+          h.delete id
+          if h.empty?
+            RequestID.delete key
+          end
+        end
+      }
+    end
+
+    def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+      begin
+        port = rangerand(1024..65535)
+        udpsock.bind(bind_host, port)
+      rescue Errno::EADDRINUSE
+        retry
+      end
+    end
+
+    class Requester # :nodoc:
       def initialize
         @senders = {}
+        @socks = nil
       end
 
-      def close
-        thread, sock, @thread, @sock = @thread, @sock
-        begin
-          if thread
-            thread.kill
-            thread.join
+      def request(sender, tout)
+        timelimit = Time.now + tout
+        sender.send
+        while true
+          now = Time.now
+          timeout = timelimit - now
+          if timeout <= 0
+            raise ResolvTimeout
+          end
+          select_result = IO.select(@socks, nil, nil, timeout)
+          if !select_result
+            raise ResolvTimeout
+          end
+          reply, from = recv_reply(select_result[0])
+          begin
+            msg = Message.decode(reply)
+          rescue DecodeError
+            next # broken DNS message ignored
+          end
+          if s = @senders[[from,msg.id]]
+            break
+          else
+            # unexpected DNS message ignored
           end
-        ensure
-          sock.close if sock
         end
+        return msg, s.data
       end
 
-      def delete(arg)
-        case arg
-        when Sender
-          @senders.delete_if {|k, s| s == arg }
-        when Queue
-          @senders.delete_if {|k, s| s.queue == arg }
-        else
-          raise ArgumentError.new("neither Sender or Queue: #{arg}")
+      def close
+        socks = @socks
+        @socks = nil
+        if socks
+          socks.each {|sock| sock.close }
         end
       end
 
-      class Sender
-        def initialize(msg, data, sock, queue)
+      class Sender # :nodoc:
+        def initialize(msg, data, sock)
           @msg = msg
           @data = data
           @sock = sock
-          @queue = queue
-        end
-        attr_reader :queue
-
-        def recv(msg)
-          @queue.push([msg, @data])
         end
       end
 
-      class UnconnectedUDP < Requester
-        def initialize
+      class UnconnectedUDP < Requester # :nodoc:
+        def initialize(*nameserver_port)
           super()
-          @sock = UDPSocket.new
-          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
-          @id = {}
-          @id.default = -1
-          @thread = Thread.new {
-            DNSThreadGroup.add Thread.current
-            loop {
-              reply, from = @sock.recvfrom(UDPSize)
-              msg = begin
-                Message.decode(reply)
-              rescue DecodeError
-                STDERR.print("DNS message decoding error: #{reply.inspect}\n")
-                next
-              end
-              if s = @senders[[[from[3],from[1]],msg.id]]
-                s.recv msg
-              else
-                #STDERR.print("non-handled DNS message: #{msg.inspect} from #{from.inspect}\n")
-              end
-            }
+          @nameserver_port = nameserver_port
+          @socks_hash = {}
+          @socks = []
+          nameserver_port.each {|host, port|
+            if host.index(':')
+              bind_host = "::"
+              af = Socket::AF_INET6
+            else
+              bind_host = "0.0.0.0"
+              af = Socket::AF_INET
+            end
+            next if @socks_hash[bind_host]
+            sock = UDPSocket.new(af)
+            sock.do_not_reverse_lookup = true
+            sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
+            DNS.bind_random_port(sock, bind_host)
+            @socks << sock
+            @socks_hash[bind_host] = sock
           }
         end
 
-        def sender(msg, data, queue, host, port=Port)
+        def recv_reply(readable_socks)
+          reply, from = readable_socks[0].recvfrom(UDPSize)
+          return reply, [from[3],from[1]]
+        end
+
+        def sender(msg, data, host, port=Port)
           service = [host, port]
-          id = Thread.exclusive {
-            @id[service] = (@id[service] + 1) & 0xffff
-          }
+          id = DNS.allocate_request_id(host, port)
           request = msg.encode
           request[0,2] = [id].pack('n')
+          sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
           return @senders[[service, id]] =
-            Sender.new(request, data, @sock, host, port, queue)
+            Sender.new(request, data, sock, host, port)
+        end
+
+        def close
+          super
+          @senders.each_key {|service, id|
+            DNS.free_request_id(service[0], service[1], id)
+          }
         end
 
-        class Sender < Requester::Sender
-          def initialize(msg, data, sock, host, port, queue)
-            super(msg, data, sock, queue)
+        class Sender < Requester::Sender # :nodoc:
+          def initialize(msg, data, sock, host, port)
+            super(msg, data, sock)
             @host = host
             @port = port
           end
+          attr_reader :data
 
           def send
             @sock.send(@msg, 0, @host, @port)
@@ -616,104 +729,101 @@ class Resolv
         end
       end
 
-      class ConnectedUDP < Requester
+      class ConnectedUDP < Requester # :nodoc:
         def initialize(host, port=Port)
           super()
           @host = host
           @port = port
-          @sock = UDPSocket.new(host.index(':') ? Socket::AF_INET6 : Socket::AF_INET)
-          @sock.connect(host, port)
-          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
-          @id = -1
-          @thread = Thread.new {
-            DNSThreadGroup.add Thread.current
-            loop {
-              reply = @sock.recv(UDPSize)
-              msg = begin
-                Message.decode(reply)
-              rescue DecodeError
-                STDERR.print("DNS message decoding error: #{reply.inspect}")
-                next
-              end
-              if s = @senders[msg.id]
-                s.recv msg
-              else
-                #STDERR.print("non-handled DNS message: #{msg.inspect}")
-              end
-            }
-          }
+          is_ipv6 = host.index(':')
+          sock = UDPSocket.new(is_ipv6 ? Socket::AF_INET6 : Socket::AF_INET)
+          @socks = [sock]
+          sock.do_not_reverse_lookup = true
+          sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
+          DNS.bind_random_port(sock, is_ipv6 ? "::" : "0.0.0.0")
+          sock.connect(host, port)
+        end
+
+        def recv_reply(readable_socks)
+          reply = readable_socks[0].recv(UDPSize)
+          return reply, nil
         end
 
-        def sender(msg, data, queue, host=@host, port=@port)
+        def sender(msg, data, host=@host, port=@port)
           unless host == @host && port == @port
             raise RequestError.new("host/port don't match: #{host}:#{port}")
           end
-          id = Thread.exclusive { @id = (@id + 1) & 0xffff }
+          id = DNS.allocate_request_id(@host, @port)
           request = msg.encode
           request[0,2] = [id].pack('n')
-          return @senders[id] = Sender.new(request, data, @sock, queue)
+          return @senders[[nil,id]] = Sender.new(request, data, @socks[0])
+        end
+
+        def close
+          super
+          @senders.each_key {|from, id|
+            DNS.free_request_id(@host, @port, id)
+          }
         end
 
-        class Sender < Requester::Sender
+        class Sender < Requester::Sender # :nodoc:
           def send
             @sock.send(@msg, 0)
           end
+          attr_reader :data
         end
       end
 
-      class TCP < Requester
+      class TCP < Requester # :nodoc:
         def initialize(host, port=Port)
           super()
           @host = host
           @port = port
-          @sock = TCPSocket.new
-          @sock.connect(host, port)
-          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
-          @id = -1
+          sock = TCPSocket.new(@host, @port)
+          @socks = [sock]
+          sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
           @senders = {}
-          @thread = Thread.new {
-            DNSThreadGroup.add Thread.current
-            loop {
-              len = @sock.read(2).unpack('n')
-              reply = @sock.read(len)
-              msg = begin
-                Message.decode(reply)
-              rescue DecodeError
-                STDERR.print("DNS message decoding error: #{reply.inspect}")
-                next
-              end
-              if s = @senders[msg.id]
-                s.push msg
-              else
-                #STDERR.print("non-handled DNS message: #{msg.inspect}")
-              end
-            }
-          }
         end
 
-        def sender(msg, data, queue, host=@host, port=@port)
+        def recv_reply(readable_socks)
+          len = readable_socks[0].read(2).unpack('n')[0]
+          reply = @socks[0].read(len)
+          return reply, nil
+        end
+
+        def sender(msg, data, host=@host, port=@port)
           unless host == @host && port == @port
             raise RequestError.new("host/port don't match: #{host}:#{port}")
           end
-          id = Thread.exclusive { @id = (@id + 1) & 0xffff }
+          id = DNS.allocate_request_id(@host, @port)
           request = msg.encode
           request[0,2] = [request.length, id].pack('nn')
-          return @senders[id] = Sender.new(request, data, @sock, queue)
+          return @senders[[nil,id]] = Sender.new(request, data, @socks[0])
         end
 
-        class Sender < Requester::Sender
+        class Sender < Requester::Sender # :nodoc:
           def send
             @sock.print(@msg)
             @sock.flush
           end
+          attr_reader :data
+        end
+
+        def close
+          super
+          @senders.each_key {|from,id|
+            DNS.free_request_id(@host, @port, id)
+          }
         end
       end
 
+      ##
+      # Indicates a problem with the DNS request.
+
       class RequestError < StandardError
       end
     end
 
-    class Config
+    class Config # :nodoc:
       def initialize(config_info=nil)
         @mutex = Mutex.new
         @config_info = config_info
@@ -758,7 +868,7 @@ class Resolv
         if File.exist? filename
           config_hash = Config.parse_resolv_conf(filename)
         else
-          if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+          if /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
             require 'win32/resolv'
             search, nameserver = Win32::Resolv.get_resolv_info
             config_hash = {}
@@ -766,13 +876,13 @@ class Resolv
             config_hash[:search] = [search].flatten if search
           end
         end
-        config_hash
+        config_hash || {}
       end
 
       def lazy_initialize
         @mutex.synchronize {
           unless @initialized
-            @nameserver = []
+            @nameserver_port = []
             @search = nil
             @ndots = 1
             case @config_info
@@ -791,11 +901,18 @@ class Resolv
             else
               raise ArgumentError.new("invalid resolv configuration: #{@config_info.inspect}")
             end
-            @nameserver = config_hash[:nameserver] if config_hash.include? :nameserver
+            if config_hash.include? :nameserver
+              @nameserver_port = config_hash[:nameserver].map {|ns| [ns, Port] }
+            end
+            if config_hash.include? :nameserver_port
+              @nameserver_port = config_hash[:nameserver_port].map {|ns, port| [ns, (port || Port)] }
+            end
             @search = config_hash[:search] if config_hash.include? :search
             @ndots = config_hash[:ndots] if config_hash.include? :ndots
 
-            @nameserver = ['0.0.0.0'] if @nameserver.empty?
+            if @nameserver_port.empty?
+              @nameserver_port << ['0.0.0.0', Port]
+            end
             if @search
               @search = @search.map {|arg| Label.split(arg) }
             else
@@ -807,9 +924,14 @@ class Resolv
               end
             end
 
-            if !@nameserver.kind_of?(Array) ||
-               !@nameserver.all? {|ns| String === ns }
-              raise ArgumentError.new("invalid nameserver config: #{@nameserver.inspect}")
+            if !@nameserver_port.kind_of?(Array) ||
+               @nameserver_port.any? {|ns_port|
+                  !(Array === ns_port) ||
+                  ns_port.length != 2
+                  !(String === ns_port[0]) ||
+                  !(Integer === ns_port[1])
+               }
+              raise ArgumentError.new("invalid nameserver config: #{@nameserver_port.inspect}")
             end
 
             if !@search.kind_of?(Array) ||
@@ -829,13 +951,17 @@ class Resolv
 
       def single?
         lazy_initialize
-        if @nameserver.length == 1
-          return @nameserver[0]
+        if @nameserver_port.length == 1
+          return @nameserver_port[0]
         else
           return nil
         end
       end
 
+      def nameserver_port
+        @nameserver_port
+      end
+
       def generate_candidates(name)
         candidates = nil
         name = Name.create(name)
@@ -856,7 +982,7 @@ class Resolv
 
       def generate_timeouts
         ts = [InitialTimeout]
-        ts << ts[-1] * 2 / @nameserver.length
+        ts << ts[-1] * 2 / @nameserver_port.length
         ts << ts[-1] * 2
         ts << ts[-1] * 2
         return ts
@@ -869,9 +995,9 @@ class Resolv
           candidates.each {|candidate|
             begin
               timeouts.each {|tout|
-                @nameserver.each {|nameserver|
+                @nameserver_port.each {|nameserver, port|
                   begin
-                    yield candidate, tout, nameserver
+                    yield candidate, tout, nameserver, port
                   rescue ResolvTimeout
                   end
                 }
@@ -884,14 +1010,20 @@ class Resolv
         end
       end
 
+      ##
+      # Indicates no such domain was found.
+
       class NXDomain < ResolvError
       end
 
+      ##
+      # Indicates some other unhandled resolver error was encountered.
+
       class OtherResolvError < ResolvError
       end
     end
 
-    module OpCode
+    module OpCode # :nodoc:
       Query = 0
       IQuery = 1
       Status = 2
@@ -899,7 +1031,7 @@ class Resolv
       Update = 5
     end
 
-    module RCode
+    module RCode # :nodoc:
       NoError = 0
       FormErr = 1
       ServFail = 2
@@ -920,20 +1052,26 @@ class Resolv
       BADALG = 21
     end
 
+    ##
+    # Indicates that the DNS response was unable to be decoded.
+
     class DecodeError < StandardError
     end
 
+    ##
+    # Indicates that the DNS request was unable to be encoded.
+
     class EncodeError < StandardError
     end
 
-    module Label
+    module Label # :nodoc:
       def self.split(arg)
         labels = []
         arg.scan(/[^\.]+/) {labels << Str.new($&)}
         return labels
       end
 
-      class Str
+      class Str # :nodoc:
         def initialize(string)
           @string = string
           @downcase = string.downcase
@@ -962,7 +1100,17 @@ class Resolv
       end
     end
 
+    ##
+    # A representation of a DNS name.
+
     class Name
+
+      ##
+      # Creates a new DNS name from +arg+.  +arg+ can be:
+      #
+      # Name:: returns +arg+.
+      # String:: Creates a new Name.
+
       def self.create(arg)
         case arg
         when Name
@@ -974,26 +1122,33 @@ class Resolv
         end
       end
 
-      def initialize(labels, absolute=true)
+      def initialize(labels, absolute=true) # :nodoc:
         @labels = labels
         @absolute = absolute
       end
 
-      def inspect
+      def inspect # :nodoc:
         "#<#{self.class}: #{self.to_s}#{@absolute ? '.' : ''}>"
       end
 
+      ##
+      # True if this name is absolute.
+
       def absolute?
         return @absolute
       end
 
-      def ==(other)
+      def ==(other) # :nodoc:
         return false unless Name === other
-        return @labels == other.to_a && @absolute == other.absolute?
+        return @labels.join == other.to_a.join && @absolute == other.absolute?
       end
-      alias eql? ==
 
-      # tests subdomain-of relation.
+      alias eql? == # :nodoc:
+
+      ##
+      # Returns true if +other+ is a subdomain.
+      #
+      # Example:
       #
       #   domain = Resolv::DNS::Name.create("y.z")
       #   p Resolv::DNS::Name.create("w.x.y.z").subdomain_of?(domain) #=> true
@@ -1003,6 +1158,7 @@ class Resolv
       #   p Resolv::DNS::Name.create("x.y.z.").subdomain_of?(domain) #=> false
       #   p Resolv::DNS::Name.create("w.z").subdomain_of?(domain) #=> false
       #
+
       def subdomain_of?(other)
         raise ArgumentError, "not a domain name: #{other.inspect}" unless Name === other
         return false if @absolute != other.absolute?
@@ -1011,36 +1167,39 @@ class Resolv
         return @labels[-other_len, other_len] == other.to_a
       end
 
-      def hash
+      def hash # :nodoc:
         return @labels.hash ^ @absolute.hash
       end
 
-      def to_a
+      def to_a # :nodoc:
         return @labels
       end
 
-      def length
+      def length # :nodoc:
         return @labels.length
       end
 
-      def [](i)
+      def [](i) # :nodoc:
         return @labels[i]
       end
 
+      ##
       # returns the domain name as a string.
       #
       # The domain name doesn't have a trailing dot even if the name object is
       # absolute.
       #
+      # Example:
+      #
       #   p Resolv::DNS::Name.create("x.y.z.").to_s #=> "x.y.z"
       #   p Resolv::DNS::Name.create("x.y.z").to_s #=> "x.y.z"
-      #
+
       def to_s
         return @labels.join('.')
       end
     end
 
-    class Message
+    class Message # :nodoc:
       @@identifier = -1
 
       def initialize(id = (@@identifier += 1) & 0xffff)
@@ -1153,7 +1312,7 @@ class Resolv
         }.to_s
       end
 
-      class MessageEncoder
+      class MessageEncoder # :nodoc:
         def initialize
           @data = ''
           @names = {}
@@ -1211,7 +1370,7 @@ class Resolv
         end
 
         def put_label(d)
-          self.put_string(d.string)
+          self.put_string(d.to_s)
         end
       end
 
@@ -1248,7 +1407,7 @@ class Resolv
         return o
       end
 
-      class MessageDecoder
+      class MessageDecoder # :nodoc:
         def initialize(data)
           @data = data
           @index = 0
@@ -1256,6 +1415,10 @@ class Resolv
           yield self
         end
 
+        def inspect
+          "\#<#{self.class}: #{@data[0, @index].inspect} #{@data[@index..-1].inspect}>"
+        end
+
         def get_length16
           len, = self.get_unpack('n')
           save_limit = @limit
@@ -1279,6 +1442,7 @@ class Resolv
         def get_unpack(template)
           len = 0
           template.each_byte {|byte|
+            byte = "%c" % byte
             case byte
             when ?c, ?C
               len += 1
@@ -1297,7 +1461,7 @@ class Resolv
         end
 
         def get_string
-          len = @data[@index]
+          len = @data[@index].ord
           raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
           d = @data[@index + 1, len]
           @index += 1 + len
@@ -1320,7 +1484,7 @@ class Resolv
           limit = @index if !limit || @index < limit
           d = []
           while true
-            case @data[@index]
+            case @data[@index].ord
             when 0
               @index += 1
               return d
@@ -1355,71 +1519,104 @@ class Resolv
           name = self.get_name
           type, klass, ttl = self.get_unpack('nnN')
           typeclass = Resource.get_class(type, klass)
-          return name, ttl, self.get_length16 {typeclass.decode_rdata(self)}
+          res = self.get_length16 { typeclass.decode_rdata self }
+          res.instance_variable_set :@ttl, ttl
+          return name, ttl, res
         end
       end
     end
 
+    ##
+    # A DNS query abstract class.
+
     class Query
-      def encode_rdata(msg)
-        raise EncodeError.new("#{self.class} is query.") 
+      def encode_rdata(msg) # :nodoc:
+        raise EncodeError.new("#{self.class} is query.")
       end
 
-      def self.decode_rdata(msg)
-        raise DecodeError.new("#{self.class} is query.") 
+      def self.decode_rdata(msg) # :nodoc:
+        raise DecodeError.new("#{self.class} is query.")
       end
     end
 
+    ##
+    # A DNS resource abstract class.
+
     class Resource < Query
-      ClassHash = {}
 
-      def encode_rdata(msg)
+      ##
+      # Remaining Time To Live for this Resource.
+
+      attr_reader :ttl
+
+      ClassHash = {} # :nodoc:
+
+      def encode_rdata(msg) # :nodoc:
         raise NotImplementedError.new
       end
 
-      def self.decode_rdata(msg)
+      def self.decode_rdata(msg) # :nodoc:
         raise NotImplementedError.new
       end
 
-      def ==(other)
-        return self.class == other.class &&
-          self.instance_variables == other.instance_variables &&
-          self.instance_variables.collect {|name| self.instance_eval name} ==
-            other.instance_variables.collect {|name| other.instance_eval name}
+      def ==(other) # :nodoc:
+        return false unless self.class == other.class
+        s_ivars = self.instance_variables
+        s_ivars.sort!
+        s_ivars.delete "@ttl"
+        o_ivars = other.instance_variables
+        o_ivars.sort!
+        o_ivars.delete "@ttl"
+        return s_ivars == o_ivars &&
+          s_ivars.collect {|name| self.instance_variable_get name} ==
+            o_ivars.collect {|name| other.instance_variable_get name}
       end
 
-      def eql?(other)
+      def eql?(other) # :nodoc:
         return self == other
       end
 
-      def hash
+      def hash # :nodoc:
         h = 0
-        self.instance_variables.each {|name|
-          h ^= self.instance_eval("#{name}.hash")
+        vars = self.instance_variables
+        vars.delete "@ttl"
+        vars.each {|name|
+          h ^= self.instance_variable_get(name).hash
         }
         return h
       end
 
-      def self.get_class(type_value, class_value)
+      def self.get_class(type_value, class_value) # :nodoc:
         return ClassHash[[type_value, class_value]] ||
                Generic.create(type_value, class_value)
       end
 
+      ##
+      # A generic resource abstract class.
+
       class Generic < Resource
+
+        ##
+        # Creates a new generic resource.
+
         def initialize(data)
           @data = data
         end
+
+        ##
+        # Data for this generic resource.
+
         attr_reader :data
 
-        def encode_rdata(msg)
+        def encode_rdata(msg) # :nodoc:
           msg.put_bytes(data)
         end
 
-        def self.decode_rdata(msg)
+        def self.decode_rdata(msg) # :nodoc:
           return self.new(msg.get_bytes)
         end
 
-        def self.create(type_value, class_value)
+        def self.create(type_value, class_value) # :nodoc:
           c = Class.new(Generic)
           c.const_set(:TypeValue, type_value)
           c.const_set(:ClassValue, class_value)
@@ -1429,34 +1626,60 @@ class Resolv
         end
       end
 
+      ##
+      # Domain Name resource abstract class.
+
       class DomainName < Resource
+
+        ##
+        # Creates a new DomainName from +name+.
+
         def initialize(name)
           @name = name
         end
+
+        ##
+        # The name of this DomainName.
+
         attr_reader :name
 
-        def encode_rdata(msg)
+        def encode_rdata(msg) # :nodoc:
           msg.put_name(@name)
         end
 
-        def self.decode_rdata(msg)
+        def self.decode_rdata(msg) # :nodoc:
           return self.new(msg.get_name)
         end
       end
 
       # Standard (class generic) RRs
-      ClassValue = nil
+
+      ClassValue = nil # :nodoc:
+
+      ##
+      # An authoritative name server.
 
       class NS < DomainName
-        TypeValue = 2
+        TypeValue = 2 # :nodoc:
       end
 
+      ##
+      # The canonical name for an alias.
+
       class CNAME < DomainName
-        TypeValue = 5
+        TypeValue = 5 # :nodoc:
       end
 
+      ##
+      # Start Of Authority resource.
+
       class SOA < Resource
-        TypeValue = 6
+
+        TypeValue = 6 # :nodoc:
+
+        ##
+        # Creates a new SOA record.  See the attr documentation for the
+        # details of each argument.
 
         def initialize(mname, rname, serial, refresh, retry_, expire, minimum)
           @mname = mname
@@ -1467,15 +1690,52 @@ class Resolv
           @expire = expire
           @minimum = minimum
         end
-        attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
 
-        def encode_rdata(msg)
+        ##
+        # Name of the host where the master zone file for this zone resides.
+
+        attr_reader :mname
+
+        ##
+        # The person responsible for this domain name.
+
+        attr_reader :rname
+
+        ##
+        # The version number of the zone file.
+
+        attr_reader :serial
+
+        ##
+        # How often, in seconds, a secondary name server is to check for
+        # updates from the primary name server.
+
+        attr_reader :refresh
+
+        ##
+        # How often, in seconds, a secondary name server is to retry after a
+        # failure to check for a refresh.
+
+        attr_reader :retry
+
+        ##
+        # Time in seconds that a secondary name server is to use the data
+        # before refreshing from the primary name server.
+
+        attr_reader :expire
+
+        ##
+        # The minimum number of seconds to be used for TTL values in RRs.
+
+        attr_reader :minimum
+
+        def encode_rdata(msg) # :nodoc:
           msg.put_name(@mname)
           msg.put_name(@rname)
           msg.put_pack('NNNNN', @serial, @refresh, @retry, @expire, @minimum)
         end
 
-        def self.decode_rdata(msg)
+        def self.decode_rdata(msg) # :nodoc:
           mname = msg.get_name
           rname = msg.get_name
           serial, refresh, retry_, expire, minimum = msg.get_unpack('NNNNN')
@@ -1484,106 +1744,172 @@ class Resolv
         end
       end
 
+      ##
+      # A Pointer to another DNS name.
+
       class PTR < DomainName
-        TypeValue = 12
+        TypeValue = 12 # :nodoc:
       end
 
+      ##
+      # Host Information resource.
+
       class HINFO < Resource
-        TypeValue = 13
+
+        TypeValue = 13 # :nodoc:
+
+        ##
+        # Creates a new HINFO running +os+ on +cpu+.
 
         def initialize(cpu, os)
           @cpu = cpu
           @os = os
         end
-        attr_reader :cpu, :os
 
-        def encode_rdata(msg)
+        ##
+        # CPU architecture for this resource.
+
+        attr_reader :cpu
+
+        ##
+        # Operating system for this resource.
+
+        attr_reader :os
+
+        def encode_rdata(msg) # :nodoc:
           msg.put_string(@cpu)
           msg.put_string(@os)
         end
 
-        def self.decode_rdata(msg)
+        def self.decode_rdata(msg) # :nodoc:
           cpu = msg.get_string
           os = msg.get_string
           return self.new(cpu, os)
         end
       end
 
+      ##
+      # Mailing list or mailbox information.
+
       class MINFO < Resource
-        TypeValue = 14
+
+        TypeValue = 14 # :nodoc:
 
         def initialize(rmailbx, emailbx)
           @rmailbx = rmailbx
           @emailbx = emailbx
         end
-        attr_reader :rmailbx, :emailbx
 
-        def encode_rdata(msg)
+        ##
+        # Domain name responsible for this mail list or mailbox.
+
+        attr_reader :rmailbx
+
+        ##
+        # Mailbox to use for error messages related to the mail list or mailbox.
+
+        attr_reader :emailbx
+
+        def encode_rdata(msg) # :nodoc:
           msg.put_name(@rmailbx)
           msg.put_name(@emailbx)
         end
 
-        def self.decode_rdata(msg)
+        def self.decode_rdata(msg) # :nodoc:
           rmailbx = msg.get_string
           emailbx = msg.get_string
           return self.new(rmailbx, emailbx)
         end
       end
 
+      ##
+      # Mail Exchanger resource.
+
       class MX < Resource
-        TypeValue= 15
+
+        TypeValue= 15 # :nodoc:
+
+        ##
+        # Creates a new MX record with +preference+, accepting mail at
+        # +exchange+.
 
         def initialize(preference, exchange)
           @preference = preference
           @exchange = exchange
         end
-        attr_reader :preference, :exchange
 
-        def encode_rdata(msg)
+        ##
+        # The preference for this MX.
+
+        attr_reader :preference
+
+        ##
+        # The host of this MX.
+
+        attr_reader :exchange
+
+        def encode_rdata(msg) # :nodoc:
           msg.put_pack('n', @preference)
           msg.put_name(@exchange)
         end
 
-        def self.decode_rdata(msg)
+        def self.decode_rdata(msg) # :nodoc:
           preference, = msg.get_unpack('n')
           exchange = msg.get_name
           return self.new(preference, exchange)
         end
       end
 
+      ##
+      # Unstructured text resource.
+
       class TXT < Resource
-        TypeValue = 16
+
+        TypeValue = 16 # :nodoc:
 
         def initialize(first_string, *rest_strings)
           @strings = [first_string, *rest_strings]
         end
+
+        ##
+        # Returns an Array of Strings for this TXT record.
+
         attr_reader :strings
 
+        ##
+        # Returns the first string from +strings+.
+
         def data
           @strings[0]
         end
 
-        def encode_rdata(msg)
+        def encode_rdata(msg) # :nodoc:
           msg.put_string_list(@strings)
         end
 
-        def self.decode_rdata(msg)
+        def self.decode_rdata(msg) # :nodoc:
           strings = msg.get_string_list
           return self.new(*strings)
         end
       end
 
+      ##
+      # A Query type requesting any RR.
+
       class ANY < Query
-        TypeValue = 255
+        TypeValue = 255 # :nodoc:
       end
 
-      ClassInsensitiveTypes = [
+      ClassInsensitiveTypes = [ # :nodoc:
         NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, ANY
       ]
 
-      # ARPA Internet specific RRs
+      ##
+      # module IN contains ARPA Internet specific RRs.
+
       module IN
-        ClassValue = 1
+
+        ClassValue = 1 # :nodoc:
 
         ClassInsensitiveTypes.each {|s|
           c = Class.new(s)
@@ -1593,40 +1919,76 @@ class Resolv
           self.const_set(s.name.sub(/.*::/, ''), c)
         }
 
+        ##
+        # IPv4 Address resource
+
         class A < Resource
-          ClassHash[[TypeValue = 1, ClassValue = ClassValue]] = self
+          TypeValue = 1
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+
+          ##
+          # Creates a new A for +address+.
 
           def initialize(address)
             @address = IPv4.create(address)
           end
+
+          ##
+          # The Resolv::IPv4 address for this A.
+
           attr_reader :address
 
-          def encode_rdata(msg)
+          def encode_rdata(msg) # :nodoc:
             msg.put_bytes(@address.address)
           end
 
-          def self.decode_rdata(msg)
+          def self.decode_rdata(msg) # :nodoc:
             return self.new(IPv4.new(msg.get_bytes(4)))
           end
         end
 
+        ##
+        # Well Known Service resource.
+
         class WKS < Resource
-          ClassHash[[TypeValue = 11, ClassValue = ClassValue]] = self
+          TypeValue = 11
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
 
           def initialize(address, protocol, bitmap)
             @address = IPv4.create(address)
             @protocol = protocol
             @bitmap = bitmap
           end
-          attr_reader :address, :protocol, :bitmap
 
-          def encode_rdata(msg)
+          ##
+          # The host these services run on.
+
+          attr_reader :address
+
+          ##
+          # IP protocol number for these services.
+
+          attr_reader :protocol
+
+          ##
+          # A bit map of enabled services on this host.
+          #
+          # If protocol is 6 (TCP) then the 26th bit corresponds to the SMTP
+          # service (port 25).  If this bit is set, then an SMTP server should
+          # be listening on TCP port 25; if zero, SMTP service is not
+          # supported.
+
+          attr_reader :bitmap
+
+          def encode_rdata(msg) # :nodoc:
             msg.put_bytes(@address.address)
             msg.put_pack("n", @protocol)
             msg.put_bytes(@bitmap)
           end
 
-          def self.decode_rdata(msg)
+          def self.decode_rdata(msg) # :nodoc:
             address = IPv4.new(msg.get_bytes(4))
             protocol, = msg.get_unpack("n")
             bitmap = msg.get_bytes
@@ -1634,55 +1996,51 @@ class Resolv
           end
         end
 
+        ##
+        # An IPv6 address record.
+
         class AAAA < Resource
-          ClassHash[[TypeValue = 28, ClassValue = ClassValue]] = self
+          TypeValue = 28
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+
+          ##
+          # Creates a new AAAA for +address+.
 
           def initialize(address)
             @address = IPv6.create(address)
           end
+
+          ##
+          # The Resolv::IPv6 address for this AAAA.
+
           attr_reader :address
 
-          def encode_rdata(msg)
+          def encode_rdata(msg) # :nodoc:
             msg.put_bytes(@address.address)
           end
 
-          def self.decode_rdata(msg)
+          def self.decode_rdata(msg) # :nodoc:
             return self.new(IPv6.new(msg.get_bytes(16)))
           end
         end
 
+        ##
         # SRV resource record defined in RFC 2782
-        # 
+        #
         # These records identify the hostname and port that a service is
         # available at.
-        # 
-        # The format is:
-        #   _Service._Proto.Name TTL Class SRV Priority Weight Port Target
-        #
-        # The fields specific to SRV are defined in RFC 2782 as meaning:
-        # - +priority+ The priority of this target host.  A client MUST attempt
-        #   to contact the target host with the lowest-numbered priority it can
-        #   reach; target hosts with the same priority SHOULD be tried in an
-        #   order defined by the weight field.  The range is 0-65535.  Note that
-        #   it is not widely implemented and should be set to zero.
-        # 
-        # - +weight+ A server selection mechanism.  The weight field specifies
-        #   a relative weight for entries with the same priority. Larger weights
-        #   SHOULD be given a proportionately higher probability of being
-        #   selected. The range of this number is 0-65535.  Domain administrators
-        #   SHOULD use Weight 0 when there isn't any server selection to do, to
-        #   make the RR easier to read for humans (less noisy). Note that it is
-        #   not widely implemented and should be set to zero.
-        #
-        # - +port+  The port on this target host of this service.  The range is 0-
-        #   65535.
-        # 
-        # - +target+ The domain name of the target host. A target of "." means
-        #   that the service is decidedly not available at this domain.
+
         class SRV < Resource
-          ClassHash[[TypeValue = 33, ClassValue = ClassValue]] = self
+          TypeValue = 33
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
 
           # Create a SRV resource record.
+          #
+          # See the documentation for #priority, #weight, #port and #target
+          # for +priority+, +weight+, +port and +target+ respectively.
+
           def initialize(priority, weight, port, target)
             @priority = priority.to_int
             @weight = weight.to_int
@@ -1690,16 +2048,49 @@ class Resolv
             @target = Name.create(target)
           end
 
-          attr_reader :priority, :weight, :port, :target
+          # The priority of this target host.
+          #
+          # A client MUST attempt to contact the target host with the
+          # lowest-numbered priority it can reach; target hosts with the same
+          # priority SHOULD be tried in an order defined by the weight field.
+          # The range is 0-65535.  Note that it is not widely implemented and
+          # should be set to zero.
+
+          attr_reader :priority
+
+          # A server selection mechanism.
+          #
+          # The weight field specifies a relative weight for entries with the
+          # same priority. Larger weights SHOULD be given a proportionately
+          # higher probability of being selected. The range of this number is
+          # 0-65535.  Domain administrators SHOULD use Weight 0 when there
+          # isn't any server selection to do, to make the RR easier to read
+          # for humans (less noisy). Note that it is not widely implemented
+          # and should be set to zero.
+
+          attr_reader :weight
+
+          # The port on this target host of this service.
+          #
+          # The range is 0-65535.
+
+          attr_reader :port
+
+          # The domain name of the target host.
+          #
+          # A target of "." means that the service is decidedly not available
+          # at this domain.
+
+          attr_reader :target
 
-          def encode_rdata(msg)
+          def encode_rdata(msg) # :nodoc:
             msg.put_pack("n", @priority)
             msg.put_pack("n", @weight)
             msg.put_pack("n", @port)
             msg.put_name(@target)
           end
 
-          def self.decode_rdata(msg)
+          def self.decode_rdata(msg) # :nodoc:
             priority, = msg.get_unpack("n")
             weight,   = msg.get_unpack("n")
             port,     = msg.get_unpack("n")
@@ -1707,13 +2098,23 @@ class Resolv
             return self.new(priority, weight, port, target)
           end
         end
-
       end
     end
   end
 
+  ##
+  # A Resolv::DNS IPv4 address.
+
   class IPv4
-    Regex = /\A(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
+
+    ##
+    # Regular expression IPv4 addresses must match.
+
+    Regex256 = /0
+               |1(?:[0-9][0-9]?)?
+               |2(?:[0-4][0-9]?|5[0-5]?|[6-9])?
+               |[3-9][0-9]?/x
+    Regex = /\A(#{Regex256})\.(#{Regex256})\.(#{Regex256})\.(#{Regex256})\z/
 
     def self.create(arg)
       case arg
@@ -1733,68 +2134,105 @@ class Resolv
       end
     end
 
-    def initialize(address)
-      unless address.kind_of?(String) && address.length == 4
-        raise ArgumentError.new('IPv4 address must be 4 bytes')
+    def initialize(address) # :nodoc:
+      unless address.kind_of?(String)
+        raise ArgumentError, 'IPv4 address must be a string'
+      end
+      unless address.length == 4
+        raise ArgumentError, "IPv4 address expects 4 bytes but #{address.length} bytes"
       end
       @address = address
     end
+
+    ##
+    # A String representation of this IPv4 address.
+
+    ##
+    # The raw IPv4 address as a String.
+
     attr_reader :address
 
-    def to_s
+    def to_s # :nodoc:
       return sprintf("%d.%d.%d.%d", *@address.unpack("CCCC"))
     end
 
-    def inspect
+    def inspect # :nodoc:
       return "#<#{self.class} #{self.to_s}>"
     end
 
+    ##
+    # Turns this IPv4 address into a Resolv::DNS::Name.
+
     def to_name
       return DNS::Name.create(
         '%d.%d.%d.%d.in-addr.arpa.' % @address.unpack('CCCC').reverse)
     end
 
-    def ==(other)
+    def ==(other) # :nodoc:
       return @address == other.address
     end
 
-    def eql?(other)
+    def eql?(other) # :nodoc:
       return self == other
     end
 
-    def hash
+    def hash # :nodoc:
       return @address.hash
     end
   end
 
+  ##
+  # A Resolv::DNS IPv6 address.
+
   class IPv6
+
+    ##
+    # IPv6 address format a:b:c:d:e:f:g:h
     Regex_8Hex = /\A
       (?:[0-9A-Fa-f]{1,4}:){7}
          [0-9A-Fa-f]{1,4}
       \z/x
 
+    ##
+    # Compressed IPv6 address format a::b
+
     Regex_CompressedHex = /\A
       ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
       ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
       \z/x
 
+    ##
+    # IPv4 mapped IPv6 address format a:b:c:d:e:f:w.x.y.z
+
     Regex_6Hex4Dec = /\A
       ((?:[0-9A-Fa-f]{1,4}:){6,6})
       (\d+)\.(\d+)\.(\d+)\.(\d+)
       \z/x
 
+    ##
+    # Compressed IPv4 mapped IPv6 address format a::b:w.x.y.z
+
     Regex_CompressedHex4Dec = /\A
       ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
       ((?:[0-9A-Fa-f]{1,4}:)*)
       (\d+)\.(\d+)\.(\d+)\.(\d+)
       \z/x
 
+    ##
+    # A composite IPv6 address Regexp.
+
     Regex = /
       (?:#{Regex_8Hex}) |
       (?:#{Regex_CompressedHex}) |
       (?:#{Regex_6Hex4Dec}) |
       (?:#{Regex_CompressedHex4Dec})/x
 
+    ##
+    # Creates a new IPv6 address from +arg+ which may be:
+    #
+    # IPv6:: returns +arg+.
+    # String:: +arg+ must match one of the IPv6::Regex* constants
+
     def self.create(arg)
       case arg
       when IPv6
@@ -1841,15 +2279,19 @@ class Resolv
       end
     end
 
-    def initialize(address)
+    def initialize(address) # :nodoc:
       unless address.kind_of?(String) && address.length == 16
         raise ArgumentError.new('IPv6 address must be 16 bytes')
       end
       @address = address
     end
+
+    ##
+    # The raw IPv6 address as a String.
+
     attr_reader :address
 
-    def to_s
+    def to_s # :nodoc:
       address = sprintf("%X:%X:%X:%X:%X:%X:%X:%X", *@address.unpack("nnnnnnnn"))
       unless address.sub!(/(^|:)0(:0)+(:|$)/, '::')
         address.sub!(/(^|:)0(:|$)/, '::')
@@ -1857,29 +2299,42 @@ class Resolv
       return address
     end
 
-    def inspect
+    def inspect # :nodoc:
       return "#<#{self.class} #{self.to_s}>"
     end
 
+    ##
+    # Turns this IPv6 address into a Resolv::DNS::Name.
+    #--
+    # ip6.arpa should be searched too. [RFC3152]
+
     def to_name
-      # ip6.arpa should be searched too. [RFC3152]
       return DNS::Name.new(
-        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'int'])
+        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'arpa'])
     end
 
-    def ==(other)
+    def ==(other) # :nodoc:
       return @address == other.address
     end
 
-    def eql?(other)
+    def eql?(other) # :nodoc:
       return self == other
     end
 
-    def hash
+    def hash # :nodoc:
       return @address.hash
     end
   end
 
+  ##
+  # Default resolver to use for Resolv class methods.
+
   DefaultResolver = self.new
+
+  ##
+  # Address Regexp to use for matching IP addresses.
+
   AddressRegex = /(?:#{IPv4::Regex})|(?:#{IPv6::Regex})/
+
 end
+
diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb
index d4b5c38af6..ec4e6c3b8d 100644
--- a/lib/rexml/attlistdecl.rb
+++ b/lib/rexml/attlistdecl.rb
@@ -3,60 +3,60 @@ require 'rexml/child'
 require 'rexml/source'
 
 module REXML
-	# This class needs:
-	# * Documentation
-	# * Work!  Not all types of attlists are intelligently parsed, so we just
-	# spew back out what we get in.  This works, but it would be better if
-	# we formatted the output ourselves.
-	#
-	# AttlistDecls provide *just* enough support to allow namespace
-	# declarations.  If you need some sort of generalized support, or have an
-	# interesting idea about how to map the hideous, terrible design of DTD
-	# AttlistDecls onto an intuitive Ruby interface, let me know.  I'm desperate
-	# for anything to make DTDs more palateable.
-	class AttlistDecl < Child
-		include Enumerable
-
-		# What is this?  Got me.
-		attr_reader :element_name
-
-		# Create an AttlistDecl, pulling the information from a Source.  Notice
-		# that this isn't very convenient; to create an AttlistDecl, you basically
-		# have to format it yourself, and then have the initializer parse it.
-		# Sorry, but for the forseeable future, DTD support in REXML is pretty
-		# weak on convenience.  Have I mentioned how much I hate DTDs?
-		def initialize(source)
-			super()
-			if (source.kind_of? Array)
-				@element_name, @pairs, @contents = *source
-			end
-		end
-	
-		# Access the attlist attribute/value pairs.
-		#  value = attlist_decl[ attribute_name ]
-		def [](key)
-			@pairs[key]
-		end
-
-		# Whether an attlist declaration includes the given attribute definition
-		#  if attlist_decl.include? "xmlns:foobar"
-		def include?(key)
-			@pairs.keys.include? key
-		end
-
-		# Itterate over the key/value pairs:
-		#  attlist_decl.each { |attribute_name, attribute_value| ... }
-		def each(&block)
-			@pairs.each(&block)
-		end
-
-		# Write out exactly what we got in.
-		def write out, indent=-1
-			out << @contents
-		end
-
-		def node_type
-			:attlistdecl
-		end
-	end
+  # This class needs:
+  # * Documentation
+  # * Work!  Not all types of attlists are intelligently parsed, so we just
+  # spew back out what we get in.  This works, but it would be better if
+  # we formatted the output ourselves.
+  #
+  # AttlistDecls provide *just* enough support to allow namespace
+  # declarations.  If you need some sort of generalized support, or have an
+  # interesting idea about how to map the hideous, terrible design of DTD
+  # AttlistDecls onto an intuitive Ruby interface, let me know.  I'm desperate
+  # for anything to make DTDs more palateable.
+  class AttlistDecl < Child
+    include Enumerable
+
+    # What is this?  Got me.
+    attr_reader :element_name
+
+    # Create an AttlistDecl, pulling the information from a Source.  Notice
+    # that this isn't very convenient; to create an AttlistDecl, you basically
+    # have to format it yourself, and then have the initializer parse it.
+    # Sorry, but for the forseeable future, DTD support in REXML is pretty
+    # weak on convenience.  Have I mentioned how much I hate DTDs?
+    def initialize(source)
+      super()
+      if (source.kind_of? Array)
+        @element_name, @pairs, @contents = *source
+      end
+    end
+
+    # Access the attlist attribute/value pairs.
+    #  value = attlist_decl[ attribute_name ]
+    def [](key)
+      @pairs[key]
+    end
+
+    # Whether an attlist declaration includes the given attribute definition
+    #  if attlist_decl.include? "xmlns:foobar"
+    def include?(key)
+      @pairs.keys.include? key
+    end
+
+    # Iterate over the key/value pairs:
+    #  attlist_decl.each { |attribute_name, attribute_value| ... }
+    def each(&block)
+      @pairs.each(&block)
+    end
+
+    # Write out exactly what we got in.
+    def write out, indent=-1
+      out << @contents
+    end
+
+    def node_type
+      :attlistdecl
+    end
+  end
 end
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
index 89c1ada36c..28a5923608 100644
--- a/lib/rexml/attribute.rb
+++ b/lib/rexml/attribute.rb
@@ -2,168 +2,171 @@ require "rexml/namespace"
 require 'rexml/text'
 
 module REXML
-	# Defines an Element Attribute; IE, a attribute=value pair, as in:
-	# <element attribute="value"/>.  Attributes can be in their own
-	# namespaces.  General users of REXML will not interact with the
-	# Attribute class much.
-	class Attribute
-		include Node
-		include Namespace
-
-		# The element to which this attribute belongs
-		attr_reader :element
-		# The normalized value of this attribute.  That is, the attribute with
-		# entities intact.
-		attr_writer :normalized	
-		PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
-
-		# Constructor.
+  # Defines an Element Attribute; IE, a attribute=value pair, as in:
+  # <element attribute="value"/>.  Attributes can be in their own
+  # namespaces.  General users of REXML will not interact with the
+  # Attribute class much.
+  class Attribute
+    include Node
+    include Namespace
+
+    # The element to which this attribute belongs
+    attr_reader :element
+    # The normalized value of this attribute.  That is, the attribute with
+    # entities intact.
+    attr_writer :normalized
+    PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
+
+    NEEDS_A_SECOND_CHECK = /(<|&((#{Entity::NAME});|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));)?)/um
+
+    # Constructor.
     # FIXME: The parser doesn't catch illegal characters in attributes
     #
-    # first:: 
+    # first::
     #   Either: an Attribute, which this new attribute will become a
     #   clone of; or a String, which is the name of this attribute
     # second::
     #   If +first+ is an Attribute, then this may be an Element, or nil.
     #   If nil, then the Element parent of this attribute is the parent
-    #   of the +first+ Attribute.  If the first argument is a String, 
-    #   then this must also be a String, and is the content of the attribute.  
+    #   of the +first+ Attribute.  If the first argument is a String,
+    #   then this must also be a String, and is the content of the attribute.
     #   If this is the content, it must be fully normalized (contain no
     #   illegal characters).
     # parent::
-    #   Ignored unless +first+ is a String; otherwise, may be the Element 
+    #   Ignored unless +first+ is a String; otherwise, may be the Element
     #   parent of this attribute, or nil.
     #
-		#
-		#  Attribute.new( attribute_to_clone )
-		#  Attribute.new( attribute_to_clone, parent_element )
-		#  Attribute.new( "attr", "attr_value" )
-		#  Attribute.new( "attr", "attr_value", parent_element )
-		def initialize( first, second=nil, parent=nil )
-			@normalized = @unnormalized = @element = nil
-			if first.kind_of? Attribute
-				self.name = first.expanded_name
-				@unnormalized = first.value
-				if second.kind_of? Element
-					@element = second
-				else
-					@element = first.element
-				end
-			elsif first.kind_of? String
-				@element = parent
-				self.name = first
-				@normalized = second.to_s
-			else
-				raise "illegal argument #{first.class.name} to Attribute constructor"
-			end
-		end
-
-		# Returns the namespace of the attribute.
-		# 
-		#  e = Element.new( "elns:myelement" )
-		#  e.add_attribute( "nsa:a", "aval" )
-		#  e.add_attribute( "b", "bval" )
-		#  e.attributes.get_attribute( "a" ).prefix   # -> "nsa"
-		#  e.attributes.get_attribute( "b" ).prefix   # -> "elns"
-		#  a = Attribute.new( "x", "y" )
-		#  a.prefix                                   # -> ""
-		def prefix
-			pf = super
-			if pf == ""
-				pf = @element.prefix if @element
-			end
-			pf
-		end
-
-		# Returns the namespace URL, if defined, or nil otherwise
-		# 
-		#  e = Element.new("el")
-		#  e.add_attributes({"xmlns:ns", "http://url"})
-		#  e.namespace( "ns" )              # -> "http://url"
-		def namespace arg=nil
-			arg = prefix if arg.nil?
-			@element.namespace arg
-		end
-
-		# Returns true if other is an Attribute and has the same name and value,
-		# false otherwise.
-		def ==( other )
-			other.kind_of?(Attribute) and other.name==name and other.value==value
-		end
-
-		# Creates (and returns) a hash from both the name and value
-		def hash
-			name.hash + value.hash
-		end
-
-		# Returns this attribute out as XML source, expanding the name
-		#
-		#  a = Attribute.new( "x", "y" )
-		#  a.to_string     # -> "x='y'"
-		#  b = Attribute.new( "ns:x", "y" )
-		#  b.to_string     # -> "ns:x='y'"
-		def to_string
-			if @element and @element.context and @element.context[:attribute_quote] == :quote
-				%Q^#@expanded_name="#{to_s().gsub(/"/, '&quote;')}"^
-			else
-				"#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
-			end
-		end
-
-		# Returns the attribute value, with entities replaced
-		def to_s
-			return @normalized if @normalized
-
-			doctype = nil
-			if @element
-				doc = @element.document
-				doctype = doc.doctype if doc
-			end
-
-			@normalized = Text::normalize( @unnormalized, doctype )
-			@unnormalized = nil
+    #
+    #  Attribute.new( attribute_to_clone )
+    #  Attribute.new( attribute_to_clone, parent_element )
+    #  Attribute.new( "attr", "attr_value" )
+    #  Attribute.new( "attr", "attr_value", parent_element )
+    def initialize( first, second=nil, parent=nil )
+      @normalized = @unnormalized = @element = nil
+      if first.kind_of? Attribute
+        self.name = first.expanded_name
+        @unnormalized = first.value
+        if second.kind_of? Element
+          @element = second
+        else
+          @element = first.element
+        end
+      elsif first.kind_of? String
+        @element = parent
+        self.name = first
+        @normalized = second.to_s
+      else
+        raise "illegal argument #{first.class.name} to Attribute constructor"
+      end
+    end
+
+    # Returns the namespace of the attribute.
+    #
+    #  e = Element.new( "elns:myelement" )
+    #  e.add_attribute( "nsa:a", "aval" )
+    #  e.add_attribute( "b", "bval" )
+    #  e.attributes.get_attribute( "a" ).prefix   # -> "nsa"
+    #  e.attributes.get_attribute( "b" ).prefix   # -> "elns"
+    #  a = Attribute.new( "x", "y" )
+    #  a.prefix                                   # -> ""
+    def prefix
+      pf = super
+      if pf == ""
+        pf = @element.prefix if @element
+      end
+      pf
+    end
+
+    # Returns the namespace URL, if defined, or nil otherwise
+    #
+    #  e = Element.new("el")
+    #  e.add_attributes({"xmlns:ns", "http://url"})
+    #  e.namespace( "ns" )              # -> "http://url"
+    def namespace arg=nil
+      arg = prefix if arg.nil?
+      @element.namespace arg
+    end
+
+    # Returns true if other is an Attribute and has the same name and value,
+    # false otherwise.
+    def ==( other )
+      other.kind_of?(Attribute) and other.name==name and other.value==value
+    end
+
+    # Creates (and returns) a hash from both the name and value
+    def hash
+      name.hash + value.hash
+    end
+
+    # Returns this attribute out as XML source, expanding the name
+    #
+    #  a = Attribute.new( "x", "y" )
+    #  a.to_string     # -> "x='y'"
+    #  b = Attribute.new( "ns:x", "y" )
+    #  b.to_string     # -> "ns:x='y'"
+    def to_string
+      if @element and @element.context and @element.context[:attribute_quote] == :quote
+        %Q^#@expanded_name="#{to_s().gsub(/"/, '&quote;')}"^
+      else
+        "#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
+      end
+    end
+
+    def doctype
+      if @element
+        doc = @element.document
+        doctype = doc.doctype if doc
+      end
+    end
+
+    # Returns the attribute value, with entities replaced
+    def to_s
+      return @normalized if @normalized
+
+      @normalized = Text::normalize( @unnormalized, doctype )
+      @unnormalized = nil
       @normalized
-		end
-
-		# Returns the UNNORMALIZED value of this attribute.  That is, entities
-		# have been expanded to their values
-		def value
-			return @unnormalized if @unnormalized
-			doctype = nil
-			if @element
-				doc = @element.document
-				doctype = doc.doctype if doc
-			end
-			@unnormalized = Text::unnormalize( @normalized, doctype )
-			@normalized = nil
+    end
+
+    # Returns the UNNORMALIZED value of this attribute.  That is, entities
+    # have been expanded to their values
+    def value
+      return @unnormalized if @unnormalized
+      @unnormalized = Text::unnormalize( @normalized, doctype )
+      @normalized = nil
       @unnormalized
-		end
-
-		# Returns a copy of this attribute
-		def clone
-			Attribute.new self
-		end
-
-		# Sets the element of which this object is an attribute.  Normally, this
-		# is not directly called.
-		#
-		# Returns this attribute
-		def element=( element )
-			@element = element
-			self
-		end
-
-		# Removes this Attribute from the tree, and returns true if successfull
-		# 
-		# This method is usually not called directly.
-		def remove
-			@element.attributes.delete self.name unless @element.nil?
-		end
-
-		# Writes this attribute (EG, puts 'key="value"' to the output)
-		def write( output, indent=-1 )
-			output << to_string
-		end
+    end
+
+    # Returns a copy of this attribute
+    def clone
+      Attribute.new self
+    end
+
+    # Sets the element of which this object is an attribute.  Normally, this
+    # is not directly called.
+    #
+    # Returns this attribute
+    def element=( element )
+      @element = element
+
+      if @normalized
+        Text.check( @normalized, NEEDS_A_SECOND_CHECK, doctype )
+      end
+
+      self
+    end
+
+    # Removes this Attribute from the tree, and returns true if successfull
+    #
+    # This method is usually not called directly.
+    def remove
+      @element.attributes.delete self.name unless @element.nil?
+    end
+
+    # Writes this attribute (EG, puts 'key="value"' to the output)
+    def write( output, indent=-1 )
+      output << to_string
+    end
 
     def node_type
       :attribute
@@ -180,6 +183,6 @@ module REXML
       path += "/@#{self.expanded_name}"
       return path
     end
-	end
+  end
 end
 #vim:ts=2 sw=2 noexpandtab:
diff --git a/lib/rexml/cdata.rb b/lib/rexml/cdata.rb
index efcb71160a..e1235d60f8 100644
--- a/lib/rexml/cdata.rb
+++ b/lib/rexml/cdata.rb
@@ -1,39 +1,39 @@
 require "rexml/text"
 
 module REXML
-	class CData < Text
-		START = '<![CDATA['
-		STOP = ']]>'
-		ILLEGAL = /(\]\]>)/
+  class CData < Text
+    START = '<![CDATA['
+    STOP = ']]>'
+    ILLEGAL = /(\]\]>)/
 
-		#	Constructor.  CData is data between <![CDATA[ ... ]]>
-		#
-		# _Examples_
-		#  CData.new( source )
-		#  CData.new( "Here is some CDATA" )
-		#  CData.new( "Some unprocessed data", respect_whitespace_TF, parent_element )
-		def initialize( first, whitespace=true, parent=nil )
-			super( first, whitespace, parent, true, true, ILLEGAL )
-		end
+    #	Constructor.  CData is data between <![CDATA[ ... ]]>
+    #
+    # _Examples_
+    #  CData.new( source )
+    #  CData.new( "Here is some CDATA" )
+    #  CData.new( "Some unprocessed data", respect_whitespace_TF, parent_element )
+    def initialize( first, whitespace=true, parent=nil )
+      super( first, whitespace, parent, false, true, ILLEGAL )
+    end
 
-		# Make a copy of this object
-		# 
-		# _Examples_
-		#  c = CData.new( "Some text" )
-		#  d = c.clone
-		#  d.to_s        # -> "Some text"
-		def clone
-			CData.new self
-		end
+    # Make a copy of this object
+    #
+    # _Examples_
+    #  c = CData.new( "Some text" )
+    #  d = c.clone
+    #  d.to_s        # -> "Some text"
+    def clone
+      CData.new self
+    end
 
-		# Returns the content of this CData object
-		#
-		# _Examples_
-		#  c = CData.new( "Some text" )
-		#  c.to_s        # -> "Some text"
-		def to_s
-			@string
-		end
+    # Returns the content of this CData object
+    #
+    # _Examples_
+    #  c = CData.new( "Some text" )
+    #  c.to_s        # -> "Some text"
+    def to_s
+      @string
+    end
 
     def value
       @string
@@ -42,26 +42,26 @@ module REXML
     # == DEPRECATED
     # See the rexml/formatters package
     #
-		# Generates XML output of this object
-		#
-		# output::
-		#   Where to write the string.  Defaults to $stdout
-		# indent::
+    # Generates XML output of this object
+    #
+    # output::
+    #   Where to write the string.  Defaults to $stdout
+    # indent::
     #   The amount to indent this node by
-		# transitive::
+    # transitive::
     #   Ignored
-		# ie_hack::
+    # ie_hack::
     #   Ignored
-		#
-		# _Examples_
-		#  c = CData.new( " Some text " )
-		#  c.write( $stdout )     #->  <![CDATA[ Some text ]]>
-		def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
+    #
+    # _Examples_
+    #  c = CData.new( " Some text " )
+    #  c.write( $stdout )     #->  <![CDATA[ Some text ]]>
+    def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
       Kernel.warn( "#{self.class.name}.write is deprecated" )
-			indent( output, indent )
-			output << START
-			output << @string
-			output << STOP
-		end
-	end
+      indent( output, indent )
+      output << START
+      output << @string
+      output << STOP
+    end
+  end
 end
diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb
index 6d3c9df5e6..fd59d7283a 100644
--- a/lib/rexml/child.rb
+++ b/lib/rexml/child.rb
@@ -1,96 +1,96 @@
 require "rexml/node"
 
 module REXML
-	##
-	# A Child object is something contained by a parent, and this class
-	# contains methods to support that.  Most user code will not use this
-	# class directly.
-	class Child
-		include Node
-		attr_reader :parent		# The Parent of this object
+  ##
+  # A Child object is something contained by a parent, and this class
+  # contains methods to support that.  Most user code will not use this
+  # class directly.
+  class Child
+    include Node
+    attr_reader :parent		# The Parent of this object
 
-		# Constructor.  Any inheritors of this class should call super to make
-		# sure this method is called.
-		# parent::
-		#   if supplied, the parent of this child will be set to the
-		#   supplied value, and self will be added to the parent
-		def initialize( parent = nil )
-			@parent = nil  
-			# Declare @parent, but don't define it.  The next line sets the 
-			# parent.
-			parent.add( self ) if parent
-		end
+    # Constructor.  Any inheritors of this class should call super to make
+    # sure this method is called.
+    # parent::
+    #   if supplied, the parent of this child will be set to the
+    #   supplied value, and self will be added to the parent
+    def initialize( parent = nil )
+      @parent = nil
+      # Declare @parent, but don't define it.  The next line sets the
+      # parent.
+      parent.add( self ) if parent
+    end
 
-		# Replaces this object with another object.  Basically, calls
-		# Parent.replace_child
-		#
-		# Returns:: self
-		def replace_with( child )
-			@parent.replace_child( self, child )
-			self
-		end
+    # Replaces this object with another object.  Basically, calls
+    # Parent.replace_child
+    #
+    # Returns:: self
+    def replace_with( child )
+      @parent.replace_child( self, child )
+      self
+    end
 
-		# Removes this child from the parent.
-		#
-		# Returns:: self
-		def remove
-			unless @parent.nil?
-				@parent.delete self
-			end
-			self
-		end
+    # Removes this child from the parent.
+    #
+    # Returns:: self
+    def remove
+      unless @parent.nil?
+        @parent.delete self
+      end
+      self
+    end
 
-		# Sets the parent of this child to the supplied argument.
-		#
-		# other::
-		#   Must be a Parent object.  If this object is the same object as the
-		#   existing parent of this child, no action is taken. Otherwise, this
-		#   child is removed from the current parent (if one exists), and is added
-		#   to the new parent.
-		# Returns:: The parent added
-		def parent=( other )
-			return @parent if @parent == other
-			@parent.delete self if defined? @parent and @parent
-			@parent = other
-		end
+    # Sets the parent of this child to the supplied argument.
+    #
+    # other::
+    #   Must be a Parent object.  If this object is the same object as the
+    #   existing parent of this child, no action is taken. Otherwise, this
+    #   child is removed from the current parent (if one exists), and is added
+    #   to the new parent.
+    # Returns:: The parent added
+    def parent=( other )
+      return @parent if @parent == other
+      @parent.delete self if defined? @parent and @parent
+      @parent = other
+    end
 
-		alias :next_sibling :next_sibling_node
-		alias :previous_sibling :previous_sibling_node
+    alias :next_sibling :next_sibling_node
+    alias :previous_sibling :previous_sibling_node
 
-		# Sets the next sibling of this child.  This can be used to insert a child
-		# after some other child.
-		#  a = Element.new("a")
-		#  b = a.add_element("b")
-		#  c = Element.new("c")
-		#  b.next_sibling = c
-		#  # => <a><b/><c/></a>
-		def next_sibling=( other )
-		  parent.insert_after self, other
-		end
+    # Sets the next sibling of this child.  This can be used to insert a child
+    # after some other child.
+    #  a = Element.new("a")
+    #  b = a.add_element("b")
+    #  c = Element.new("c")
+    #  b.next_sibling = c
+    #  # => <a><b/><c/></a>
+    def next_sibling=( other )
+      parent.insert_after self, other
+    end
 
-		# Sets the previous sibling of this child.  This can be used to insert a 
-		# child before some other child.
-		#  a = Element.new("a")
-		#  b = a.add_element("b")
-		#  c = Element.new("c")
-		#  b.previous_sibling = c
-		#  # => <a><b/><c/></a>
-		def previous_sibling=(other)
-		  parent.insert_before self, other
-		end
+    # Sets the previous sibling of this child.  This can be used to insert a
+    # child before some other child.
+    #  a = Element.new("a")
+    #  b = a.add_element("b")
+    #  c = Element.new("c")
+    #  b.previous_sibling = c
+    #  # => <a><b/><c/></a>
+    def previous_sibling=(other)
+      parent.insert_before self, other
+    end
 
-		# Returns:: the document this child belongs to, or nil if this child
-		# belongs to no document
-		def document
-			return parent.document unless parent.nil?
-			nil
-		end
+    # Returns:: the document this child belongs to, or nil if this child
+    # belongs to no document
+    def document
+      return parent.document unless parent.nil?
+      nil
+    end
 
-		# This doesn't yet handle encodings
-		def bytes
-			encoding = document.encoding
+    # This doesn't yet handle encodings
+    def bytes
+      encoding = document.encoding
 
-			to_s
-		end
-	end
+      to_s
+    end
+  end
 end
diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb
index 2b9b4b89c9..e401090376 100644
--- a/lib/rexml/comment.rb
+++ b/lib/rexml/comment.rb
@@ -1,80 +1,80 @@
 require "rexml/child"
 
 module REXML
-	##
-	# Represents an XML comment; that is, text between \<!-- ... -->
-	class Comment < Child
-		include Comparable
-		START = "<!--"
-		STOP = "-->"
+  ##
+  # Represents an XML comment; that is, text between \<!-- ... -->
+  class Comment < Child
+    include Comparable
+    START = "<!--"
+    STOP = "-->"
 
-		# The content text
+    # The content text
 
-		attr_accessor :string
+    attr_accessor :string
 
-		##
-		# Constructor.  The first argument can be one of three types:
-		# @param first If String, the contents of this comment are set to the 
-		# argument.  If Comment, the argument is duplicated.  If
-		# Source, the argument is scanned for a comment.
-		# @param second If the first argument is a Source, this argument 
-		# should be nil, not supplied, or a Parent to be set as the parent 
-		# of this object
-		def initialize( first, second = nil )
-			#puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
-			super(second)
-			if first.kind_of? String
-				@string = first
-			elsif first.kind_of? Comment
-				@string = first.string
-			end
-		end
+    ##
+    # Constructor.  The first argument can be one of three types:
+    # @param first If String, the contents of this comment are set to the
+    # argument.  If Comment, the argument is duplicated.  If
+    # Source, the argument is scanned for a comment.
+    # @param second If the first argument is a Source, this argument
+    # should be nil, not supplied, or a Parent to be set as the parent
+    # of this object
+    def initialize( first, second = nil )
+      #puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
+      super(second)
+      if first.kind_of? String
+        @string = first
+      elsif first.kind_of? Comment
+        @string = first.string
+      end
+    end
 
-		def clone
-			Comment.new self
-		end
+    def clone
+      Comment.new self
+    end
 
     # == DEPRECATED
     # See REXML::Formatters
     #
-		# output::
-		#	 Where to write the string
-		# indent::
-		#	 An integer.	If -1, no indenting will be used; otherwise, the
-		#	 indentation will be this number of spaces, and children will be
-		#	 indented an additional amount.
-		# transitive::
-		#	 Ignored by this class.	The contents of comments are never modified.
-		# ie_hack::
-		#	 Needed for conformity to the child API, but not used by this class.
-		def write( output, indent=-1, transitive=false, ie_hack=false )
+    # output::
+    #	 Where to write the string
+    # indent::
+    #	 An integer.	If -1, no indenting will be used; otherwise, the
+    #	 indentation will be this number of spaces, and children will be
+    #	 indented an additional amount.
+    # transitive::
+    #	 Ignored by this class.	The contents of comments are never modified.
+    # ie_hack::
+    #	 Needed for conformity to the child API, but not used by this class.
+    def write( output, indent=-1, transitive=false, ie_hack=false )
       Kernel.warn("Comment.write is deprecated.  See REXML::Formatters")
-			indent( output, indent )
-			output << START
-			output << @string
-			output << STOP
-		end
+      indent( output, indent )
+      output << START
+      output << @string
+      output << STOP
+    end
 
-		alias :to_s :string
+    alias :to_s :string
 
-		##
-		# Compares this Comment to another; the contents of the comment are used
-		# in the comparison.
-		def <=>(other)
-			other.to_s <=> @string
-		end
+    ##
+    # Compares this Comment to another; the contents of the comment are used
+    # in the comparison.
+    def <=>(other)
+      other.to_s <=> @string
+    end
 
-		##
-		# Compares this Comment to another; the contents of the comment are used
-		# in the comparison.
-		def ==( other )
-			other.kind_of? Comment and
-			(other <=> self) == 0
-		end
+    ##
+    # Compares this Comment to another; the contents of the comment are used
+    # in the comparison.
+    def ==( other )
+      other.kind_of? Comment and
+      (other <=> self) == 0
+    end
 
     def node_type
       :comment
     end
-	end
+  end
 end
 #vim:ts=2 sw=2 noexpandtab:
diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index 05cd4ab331..1a946a1587 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -15,11 +15,11 @@ module REXML
     STOP = ">"
     SYSTEM = "SYSTEM"
     PUBLIC = "PUBLIC"
-    DEFAULT_ENTITIES = { 
-      'gt'=>EntityConst::GT, 
-      'lt'=>EntityConst::LT, 
-      'quot'=>EntityConst::QUOT, 
-      "apos"=>EntityConst::APOS 
+    DEFAULT_ENTITIES = {
+      'gt'=>EntityConst::GT,
+      'lt'=>EntityConst::LT,
+      'quot'=>EntityConst::QUOT,
+      "apos"=>EntityConst::APOS
     }
 
     # name is the name of the doctype
@@ -33,7 +33,7 @@ module REXML
     #   dt = DocType.new( doctype_to_clone )
     #   # Incomplete.  Shallow clone of doctype
     #
-    # +Note+ that the constructor: 
+    # +Note+ that the constructor:
     #
     #  Doctype.new( Source.new( "<!DOCTYPE foo 'bar'>" ) )
     #
@@ -117,7 +117,6 @@ module REXML
       unless @children.empty?
         next_indent = indent + 1
         output << ' ['
-        child = nil    # speed
         @children.each { |child|
           output << "\n"
           f.write( child, output )
@@ -140,8 +139,8 @@ module REXML
       @entities = DEFAULT_ENTITIES.clone if @entities == DEFAULT_ENTITIES
       @entities[ child.name ] = child if child.kind_of? Entity
     end
-    
-    # This method retrieves the public identifier identifying the document's 
+
+    # This method retrieves the public identifier identifying the document's
     # DTD.
     #
     # Method contributed by Henrik Martensson
@@ -153,7 +152,7 @@ module REXML
         strip_quotes(@long_name)
       end
     end
-    
+
     # This method retrieves the system identifier identifying the document's DTD
     #
     # Method contributed by Henrik Martensson
@@ -165,16 +164,16 @@ module REXML
         @uri.kind_of?(String) ? strip_quotes(@uri) : nil
       end
     end
-    
+
     # This method returns a list of notations that have been declared in the
-    # _internal_ DTD subset. Notations in the external DTD subset are not 
+    # _internal_ DTD subset. Notations in the external DTD subset are not
     # listed.
     #
     # Method contributed by Henrik Martensson
     def notations
       children().select {|node| node.kind_of?(REXML::NotationDecl)}
     end
-    
+
     # Retrieves a named notation. Only notations declared in the internal
     # DTD subset can be retrieved.
     #
@@ -184,12 +183,12 @@ module REXML
         notation_decl.name == name
       }
     end
-    
+
     private
-    
+
     # Method contributed by Henrik Martensson
     def strip_quotes(quoted_string)
-      quoted_string =~ /^[\'\"].*[\´\"]$/ ?
+      quoted_string =~ /^[\'\"].*[\'\"]$/ ?
         quoted_string[1, quoted_string.length-2] :
         quoted_string
     end
@@ -218,7 +217,7 @@ module REXML
       output << to_s
     end
   end
-  
+
   public
   class ElementDecl < Declaration
     def initialize( src )
@@ -251,7 +250,7 @@ module REXML
 
     def to_s
       "<!NOTATION #@name #@middle#{
-        @public ? ' ' + public.inspect : '' 
+        @public ? ' ' + public.inspect : ''
       }#{
         @system ? ' ' +@system.inspect : ''
       }>"
@@ -260,7 +259,7 @@ module REXML
     def write( output, indent=-1 )
       output << to_s
     end
-    
+
     # This method retrieves the name of the notation.
     #
     # Method contributed by Henrik Martensson
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
index 81e63c60f1..0337553a2e 100644
--- a/lib/rexml/document.rb
+++ b/lib/rexml/document.rb
@@ -16,129 +16,132 @@ module REXML
   # Document has a single child that can be accessed by root().
   # Note that if you want to have an XML declaration written for a document
   # you create, you must add one; REXML documents do not write a default
-	# declaration for you.  See |DECLARATION| and |write|.
-	class Document < Element
-		# A convenient default XML declaration.  If you want an XML declaration,
-		# the easiest way to add one is mydoc << Document::DECLARATION
+  # declaration for you.  See |DECLARATION| and |write|.
+  class Document < Element
+    # A convenient default XML declaration.  If you want an XML declaration,
+    # the easiest way to add one is mydoc << Document::DECLARATION
     # +DEPRECATED+
     # Use: mydoc << XMLDecl.default
-		DECLARATION = XMLDecl.default
-
-		# Constructor
-		# @param source if supplied, must be a Document, String, or IO. 
-		# Documents have their context and Element attributes cloned.
-	  # Strings are expected to be valid XML documents.  IOs are expected
-	  # to be sources of valid XML documents.
-	  # @param context if supplied, contains the context of the document;
-	  # this should be a Hash.
-		def initialize( source = nil, context = {} )
-			super()
-			@context = context
-			return if source.nil?
-			if source.kind_of? Document
-				@context = source.context
-				super source
-			else
-				build(  source )
-			end
-		end
+    DECLARATION = XMLDecl.default
+
+    # Constructor
+    # @param source if supplied, must be a Document, String, or IO.
+    # Documents have their context and Element attributes cloned.
+    # Strings are expected to be valid XML documents.  IOs are expected
+    # to be sources of valid XML documents.
+    # @param context if supplied, contains the context of the document;
+    # this should be a Hash.
+    def initialize( source = nil, context = {} )
+      @entity_expansion_count = 0
+      super()
+      @context = context
+      return if source.nil?
+      if source.kind_of? Document
+        @context = source.context
+        super source
+      else
+        build(  source )
+      end
+    end
 
     def node_type
       :document
     end
 
-		# Should be obvious
-		def clone
-			Document.new self
-		end
+    # Should be obvious
+    def clone
+      Document.new self
+    end
 
-		# According to the XML spec, a root node has no expanded name
-		def expanded_name
-			''
-			#d = doc_type
-			#d ? d.name : "UNDEFINED"
-		end
+    # According to the XML spec, a root node has no expanded name
+    def expanded_name
+      ''
+      #d = doc_type
+      #d ? d.name : "UNDEFINED"
+    end
 
-		alias :name :expanded_name
+    alias :name :expanded_name
 
-		# We override this, because XMLDecls and DocTypes must go at the start
-		# of the document
-		def add( child )
-			if child.kind_of? XMLDecl
-				@children.unshift child
+    # We override this, because XMLDecls and DocTypes must go at the start
+    # of the document
+    def add( child )
+      if child.kind_of? XMLDecl
+        if @children[0].kind_of? XMLDecl
+          @children[0] = child
+        else
+          @children.unshift child
+        end
         child.parent = self
-			elsif child.kind_of? DocType
-        # Find first Element or DocType node and insert the decl right 
+      elsif child.kind_of? DocType
+        # Find first Element or DocType node and insert the decl right
         # before it.  If there is no such node, just insert the child at the
         # end.  If there is a child and it is an DocType, then replace it.
-        insert_before_index = 0
-        @children.find { |x| 
-          insert_before_index += 1
+        insert_before_index = @children.find_index { |x|
           x.kind_of?(Element) || x.kind_of?(DocType)
         }
-        if @children[ insert_before_index ] # Not null = not end of list
-          if @children[ insert_before_index ].kind_of DocType
+        if insert_before_index # Not null = not end of list
+          if @children[ insert_before_index ].kind_of? DocType
             @children[ insert_before_index ] = child
           else
-            @children[ index_before_index-1, 0 ] = child
+            @children[ insert_before_index-1, 0 ] = child
           end
         else  # Insert at end of list
-          @children[insert_before_index] = child
+          @children << child
         end
-				child.parent = self
-			else
-				rv = super
-				raise "attempted adding second root element to document" if @elements.size > 1
-				rv
-			end
-		end
-		alias :<< :add
-
-		def add_element(arg=nil, arg2=nil)
-			rv = super
-			raise "attempted adding second root element to document" if @elements.size > 1
-			rv
-		end
-
-		# @return the root Element of the document, or nil if this document
-		# has no children.
-		def root
+        child.parent = self
+      else
+        rv = super
+        raise "attempted adding second root element to document" if @elements.size > 1
+        rv
+      end
+    end
+    alias :<< :add
+
+    def add_element(arg=nil, arg2=nil)
+      rv = super
+      raise "attempted adding second root element to document" if @elements.size > 1
+      rv
+    end
+
+    # @return the root Element of the document, or nil if this document
+    # has no children.
+    def root
       elements[1]
       #self
       #@children.find { |item| item.kind_of? Element }
-		end
-
-		# @return the DocType child of the document, if one exists,
-		# and nil otherwise.
-		def doctype
-			@children.find { |item| item.kind_of? DocType }
-		end
-
-		# @return the XMLDecl of this document; if no XMLDecl has been
-		# set, the default declaration is returned.
-		def xml_decl
-			rv = @children[0]
+    end
+
+    # @return the DocType child of the document, if one exists,
+    # and nil otherwise.
+    def doctype
+      @children.find { |item| item.kind_of? DocType }
+    end
+
+    # @return the XMLDecl of this document; if no XMLDecl has been
+    # set, the default declaration is returned.
+    def xml_decl
+      rv = @children[0]
       return rv if rv.kind_of? XMLDecl
       rv = @children.unshift(XMLDecl.default)[0]
-		end
-
-		# @return the XMLDecl version of this document as a String.
-		# If no XMLDecl has been set, returns the default version.
-		def version
-			xml_decl().version
-		end
-
-		# @return the XMLDecl encoding of this document as a String.
-		# If no XMLDecl has been set, returns the default encoding.
-		def encoding
-			xml_decl().encoding
-		end
-
-		# @return the XMLDecl standalone value of this document as a String.
-		# If no XMLDecl has been set, returns the default setting.
-		def stand_alone?
-			xml_decl().stand_alone?
-		end
+    end
+
+    # @return the XMLDecl version of this document as a String.
+    # If no XMLDecl has been set, returns the default version.
+    def version
+      xml_decl().version
+    end
+
+    # @return the XMLDecl encoding of this document as a String.
+    # If no XMLDecl has been set, returns the default encoding.
+    def encoding
+      xml_decl().encoding
+    end
+
+    # @return the XMLDecl standalone value of this document as a String.
+    # If no XMLDecl has been set, returns the default setting.
+    def stand_alone?
+      xml_decl().stand_alone?
+    end
 
     # Write the XML tree out, optionally with indent.  This writes out the
     # entire XML document, including XML declarations, doctype declarations,
@@ -147,7 +150,7 @@ module REXML
     # A controversial point is whether Document should always write the XML
     # declaration (<?xml version='1.0'?>) whether or not one is given by the
     # user (or source document).  REXML does not write one if one was not
-    # specified, because it adds unneccessary bandwidth to applications such
+    # specified, because it adds unnecessary bandwidth to applications such
     # as XML-RPC.
     #
     # See also the classes in the rexml/formatters package for the proper way
@@ -166,9 +169,9 @@ module REXML
     # indent::
     #   An integer.  If -1, no indenting will be used; otherwise, the
     #   indentation will be twice this number of spaces, and children will be
-    #   indented an additional amount.  For a value of 3, every item will be 
+    #   indented an additional amount.  For a value of 3, every item will be
     #   indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1
-    # trans::
+    # transitive::
     #   If transitive is true and indent is >= 0, then the output will be
     #   pretty-printed in such a way that the added whitespace does not affect
     #   the absolute *value* of the document -- that is, it leaves the value
@@ -177,14 +180,15 @@ module REXML
     #   Internet Explorer is the worst piece of crap to have ever been
     #   written, with the possible exception of Windows itself.  Since IE is
     #   unable to parse proper XML, we have to provide a hack to generate XML
-    #   that IE's limited abilities can handle.  This hack inserts a space 
+    #   that IE's limited abilities can handle.  This hack inserts a space
     #   before the /> on empty tags.  Defaults to false
-		def write( output=$stdout, indent=-1, trans=false, ie_hack=false )
+    def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
       if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
         output = Output.new( output, xml_decl.encoding )
       end
       formatter = if indent > -1
-          if trans
+          if transitive
+            require "rexml/formatters/transitive"
             REXML::Formatters::Transitive.new( indent, ie_hack )
           else
             REXML::Formatters::Pretty.new( indent, ie_hack )
@@ -193,16 +197,37 @@ module REXML
           REXML::Formatters::Default.new( ie_hack )
         end
       formatter.write( self, output )
-		end
+    end
+
+
+    def Document::parse_stream( source, listener )
+      Parsers::StreamParser.new( source, listener ).parse
+    end
 
-		
-		def Document::parse_stream( source, listener )
-			Parsers::StreamParser.new( source, listener ).parse
-		end
+    @@entity_expansion_limit = 10_000
 
-		private
-		def build( source )
+    # Set the entity expansion limit. By default the limit is set to 10000.
+    def Document::entity_expansion_limit=( val )
+      @@entity_expansion_limit = val
+    end
+
+    # Get the entity expansion limit. By default the limit is set to 10000.
+    def Document::entity_expansion_limit
+      return @@entity_expansion_limit
+    end
+
+    attr_reader :entity_expansion_count
+
+    def record_entity_expansion
+      @entity_expansion_count += 1
+      if @entity_expansion_count > @@entity_expansion_limit
+        raise "number of entity expansions exceeded, processing aborted."
+      end
+    end
+
+    private
+    def build( source )
       Parsers::TreeParser.new( source, self ).parse
-		end
-	end
+    end
+  end
 end
diff --git a/lib/rexml/dtd/attlistdecl.rb b/lib/rexml/dtd/attlistdecl.rb
index e176bb0749..25955ee274 100644
--- a/lib/rexml/dtd/attlistdecl.rb
+++ b/lib/rexml/dtd/attlistdecl.rb
@@ -1,10 +1,10 @@
 require "rexml/child"
 module REXML
-	module DTD
-		class AttlistDecl < Child
-			START = "<!ATTLIST"
-			START_RE = /^\s*#{START}/um
-			PATTERN_RE = /\s*(#{START}.*?>)/um
-		end
-	end
+  module DTD
+    class AttlistDecl < Child
+      START = "<!ATTLIST"
+      START_RE = /^\s*#{START}/um
+      PATTERN_RE = /\s*(#{START}.*?>)/um
+    end
+  end
 end
diff --git a/lib/rexml/dtd/dtd.rb b/lib/rexml/dtd/dtd.rb
index 4f735d4812..966e39ea57 100644
--- a/lib/rexml/dtd/dtd.rb
+++ b/lib/rexml/dtd/dtd.rb
@@ -6,46 +6,46 @@ require "rexml/dtd/attlistdecl"
 require "rexml/parent"
 
 module REXML
-	module DTD
-		class Parser
-			def Parser.parse( input )
-				case input
-				when String
-					parse_helper input
-				when File
-					parse_helper input.read
-				end
-			end
+  module DTD
+    class Parser
+      def Parser.parse( input )
+        case input
+        when String
+          parse_helper input
+        when File
+          parse_helper input.read
+        end
+      end
 
-			# Takes a String and parses it out
-			def Parser.parse_helper( input )
-				contents = Parent.new
-				while input.size > 0
-					case input
-					when ElementDecl.PATTERN_RE
-						match = $&
-						source = $'
-						contents << ElementDecl.new( match )
-					when AttlistDecl.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << AttlistDecl.new( matchdata )
-					when EntityDecl.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << EntityDecl.new( matchdata )
-					when Comment.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << Comment.new( matchdata )
-					when NotationDecl.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << NotationDecl.new( matchdata )
-					end
-				end
-				contents
-			end
-		end
-	end
+      # Takes a String and parses it out
+      def Parser.parse_helper( input )
+        contents = Parent.new
+        while input.size > 0
+          case input
+          when ElementDecl.PATTERN_RE
+            match = $&
+            source = $'
+            contents << ElementDecl.new( match )
+          when AttlistDecl.PATTERN_RE
+            matchdata = $~
+            source = $'
+            contents << AttlistDecl.new( matchdata )
+          when EntityDecl.PATTERN_RE
+            matchdata = $~
+            source = $'
+            contents << EntityDecl.new( matchdata )
+          when Comment.PATTERN_RE
+            matchdata = $~
+            source = $'
+            contents << Comment.new( matchdata )
+          when NotationDecl.PATTERN_RE
+            matchdata = $~
+            source = $'
+            contents << NotationDecl.new( matchdata )
+          end
+        end
+        contents
+      end
+    end
+  end
 end
diff --git a/lib/rexml/dtd/elementdecl.rb b/lib/rexml/dtd/elementdecl.rb
index c4e620f389..a0bf641300 100644
--- a/lib/rexml/dtd/elementdecl.rb
+++ b/lib/rexml/dtd/elementdecl.rb
@@ -1,17 +1,17 @@
 require "rexml/child"
 module REXML
-	module DTD
-		class ElementDecl < Child
-			START = "<!ELEMENT"
-			START_RE = /^\s*#{START}/um
-			PATTERN_RE = /^\s*(#{START}.*?)>/um
-			PATTERN_RE = /^\s*#{START}\s+((?:[:\w_][-\.\w_]*:)?[-!\*\.\w_]*)(.*?)>/
-			#\s*((((["']).*?\5)|[^\/'">]*)*?)(\/)?>/um, true)
+  module DTD
+    class ElementDecl < Child
+      START = "<!ELEMENT"
+      START_RE = /^\s*#{START}/um
+      PATTERN_RE = /^\s*(#{START}.*?)>/um
+      PATTERN_RE = /^\s*#{START}\s+((?:[:\w_][-\.\w_]*:)?[-!\*\.\w_]*)(.*?)>/
+      #\s*((((["']).*?\5)|[^\/'">]*)*?)(\/)?>/um, true)
 
-			def initialize match
-				@name = match[1]
-				@rest = match[2]
-			end
-		end
-	end
+      def initialize match
+        @name = match[1]
+        @rest = match[2]
+      end
+    end
+  end
 end
diff --git a/lib/rexml/dtd/entitydecl.rb b/lib/rexml/dtd/entitydecl.rb
index a5f1520f2b..a9286b2b90 100644
--- a/lib/rexml/dtd/entitydecl.rb
+++ b/lib/rexml/dtd/entitydecl.rb
@@ -1,56 +1,56 @@
 require "rexml/child"
 module REXML
-	module DTD
-		class EntityDecl < Child
-			START = "<!ENTITY"
-			START_RE = /^\s*#{START}/um
-			PUBLIC = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+PUBLIC\s+((["']).*?\3)\s+((["']).*?\5)\s*>/um
-			SYSTEM = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+SYSTEM\s+((["']).*?\3)(?:\s+NDATA\s+\w+)?\s*>/um
-			PLAIN = /^\s*#{START}\s+(\w+)\s+((["']).*?\3)\s*>/um
-			PERCENT = /^\s*#{START}\s+%\s+(\w+)\s+((["']).*?\3)\s*>/um
-			# <!ENTITY name SYSTEM "...">
-			# <!ENTITY name "...">
-			def initialize src
-				super()
-				md = nil
-				if src.match( PUBLIC )
-					md = src.match( PUBLIC, true )
-					@middle = "PUBLIC"
-					@content = "#{md[2]} #{md[4]}"
-				elsif src.match( SYSTEM )
-					md = src.match( SYSTEM, true )
-					@middle = "SYSTEM"
-					@content = md[2]
-				elsif src.match( PLAIN )
-					md = src.match( PLAIN, true )
-					@middle = ""
-					@content = md[2]
-				elsif src.match( PERCENT )
-					md = src.match( PERCENT, true )
-					@middle = ""
-					@content = md[2]
-				end
-				raise ParseException.new("failed Entity match", src) if md.nil?
-				@name = md[1]
-			end
+  module DTD
+    class EntityDecl < Child
+      START = "<!ENTITY"
+      START_RE = /^\s*#{START}/um
+      PUBLIC = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+PUBLIC\s+((["']).*?\3)\s+((["']).*?\5)\s*>/um
+      SYSTEM = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+SYSTEM\s+((["']).*?\3)(?:\s+NDATA\s+\w+)?\s*>/um
+      PLAIN = /^\s*#{START}\s+(\w+)\s+((["']).*?\3)\s*>/um
+      PERCENT = /^\s*#{START}\s+%\s+(\w+)\s+((["']).*?\3)\s*>/um
+      # <!ENTITY name SYSTEM "...">
+      # <!ENTITY name "...">
+      def initialize src
+        super()
+        md = nil
+        if src.match( PUBLIC )
+          md = src.match( PUBLIC, true )
+          @middle = "PUBLIC"
+          @content = "#{md[2]} #{md[4]}"
+        elsif src.match( SYSTEM )
+          md = src.match( SYSTEM, true )
+          @middle = "SYSTEM"
+          @content = md[2]
+        elsif src.match( PLAIN )
+          md = src.match( PLAIN, true )
+          @middle = ""
+          @content = md[2]
+        elsif src.match( PERCENT )
+          md = src.match( PERCENT, true )
+          @middle = ""
+          @content = md[2]
+        end
+        raise ParseException.new("failed Entity match", src) if md.nil?
+        @name = md[1]
+      end
 
-			def to_s
-				rv = "<!ENTITY #@name "
-				rv << "#@middle " if @middle.size > 0
-				rv << @content
-				rv
-			end
+      def to_s
+        rv = "<!ENTITY #@name "
+        rv << "#@middle " if @middle.size > 0
+        rv << @content
+        rv
+      end
 
-			def write( output, indent )
+      def write( output, indent )
         indent( output, indent )
-				output << to_s
-			end
+        output << to_s
+      end
 
-			def EntityDecl.parse_source source, listener
-				md = source.match( PATTERN_RE, true )
-				thing = md[0].squeeze(" \t\n\r")
-				listener.send inspect.downcase, thing 
-			end
-		end
-	end
+      def EntityDecl.parse_source source, listener
+        md = source.match( PATTERN_RE, true )
+        thing = md[0].squeeze(" \t\n\r")
+        listener.send inspect.downcase, thing
+      end
+    end
+  end
 end
diff --git a/lib/rexml/dtd/notationdecl.rb b/lib/rexml/dtd/notationdecl.rb
index a47ff8f24b..17d1b9ef29 100644
--- a/lib/rexml/dtd/notationdecl.rb
+++ b/lib/rexml/dtd/notationdecl.rb
@@ -1,39 +1,39 @@
 require "rexml/child"
 module REXML
-	module DTD
-		class NotationDecl < Child
-			START = "<!NOTATION"
-			START_RE = /^\s*#{START}/um
-			PUBLIC = /^\s*#{START}\s+(\w[\w-]*)\s+(PUBLIC)\s+((["']).*?\4)\s*>/um
-			SYSTEM = /^\s*#{START}\s+(\w[\w-]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
-			def initialize src
-				super()
-				if src.match( PUBLIC )
-					md = src.match( PUBLIC, true )
-				elsif src.match( SYSTEM )
-					md = src.match( SYSTEM, true )
-				else
-					raise ParseException.new( "error parsing notation: no matching pattern", src )
-				end
-				@name = md[1]
-				@middle = md[2]
-				@rest = md[3]
-			end
+  module DTD
+    class NotationDecl < Child
+      START = "<!NOTATION"
+      START_RE = /^\s*#{START}/um
+      PUBLIC = /^\s*#{START}\s+(\w[\w-]*)\s+(PUBLIC)\s+((["']).*?\4)\s*>/um
+      SYSTEM = /^\s*#{START}\s+(\w[\w-]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
+      def initialize src
+        super()
+        if src.match( PUBLIC )
+          md = src.match( PUBLIC, true )
+        elsif src.match( SYSTEM )
+          md = src.match( SYSTEM, true )
+        else
+          raise ParseException.new( "error parsing notation: no matching pattern", src )
+        end
+        @name = md[1]
+        @middle = md[2]
+        @rest = md[3]
+      end
 
-			def to_s
-				"<!NOTATION #@name #@middle #@rest>"
-			end
+      def to_s
+        "<!NOTATION #@name #@middle #@rest>"
+      end
 
-			def write( output, indent )
+      def write( output, indent )
         indent( output, indent )
-				output << to_s
-			end
+        output << to_s
+      end
 
-			def NotationDecl.parse_source source, listener
-				md = source.match( PATTERN_RE, true )
-				thing = md[0].squeeze(" \t\n\r")
-				listener.send inspect.downcase, thing 
-			end
-		end
-	end
+      def NotationDecl.parse_source source, listener
+        md = source.match( PATTERN_RE, true )
+        thing = md[0].squeeze(" \t\n\r")
+        listener.send inspect.downcase, thing
+      end
+    end
+  end
 end
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 92612036a1..f999b0b2b1 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -30,13 +30,13 @@ module REXML
     attr_accessor :context
 
     # Constructor
-    # arg:: 
+    # arg::
     # 	if not supplied, will be set to the default value.
     # 	If a String, the name of this object will be set to the argument.
-    # 	If an Element, the object will be shallowly cloned; name, 
+    # 	If an Element, the object will be shallowly cloned; name,
     # 	attributes, and namespaces will be copied.  Children will +not+ be
     # 	copied.
-    # parent:: 
+    # parent::
     # 	if supplied, must be a Parent, and will be used as
     # 	the parent of this object.
     # context::
@@ -97,7 +97,7 @@ module REXML
       self.class.new self
     end
 
-    # Evaluates to the root node of the document that this element 
+    # Evaluates to the root node of the document that this element
     # belongs to. If this element doesn't belong to a document, but does
     # belong to another Element, the parent's root will be returned, until the
     # earliest ancestor is found.
@@ -137,8 +137,8 @@ module REXML
     # is the case if:
     # 1. Neither :+respect_whitespace+ nor :+compress_whitespace+ has any value
     # 2. The context has :+respect_whitespace+ set to :+all+ or
-    #    an array containing the name of this element, and 
-    #    :+compress_whitespace+ isn't set to :+all+ or an array containing the 
+    #    an array containing the name of this element, and
+    #    :+compress_whitespace+ isn't set to :+all+ or an array containing the
     #    name of this element.
     # The evaluation is tested against +expanded_name+, and so is namespace
     # sensitive.
@@ -162,7 +162,7 @@ module REXML
       @ignore_whitespace_nodes = false
       if @context
         if @context[:ignore_whitespace_nodes]
-          @ignore_whitespace_nodes = 
+          @ignore_whitespace_nodes =
             (@context[:ignore_whitespace_nodes] == :all or
              @context[:ignore_whitespace_nodes].include? expanded_name)
         end
@@ -206,13 +206,13 @@ module REXML
       return namespaces
     end
 
-    # Evalutas to the URI for a prefix, or the empty string if no such 
+    # Evalutas to the URI for a prefix, or the empty string if no such
     # namespace is declared for this element. Evaluates recursively for
     # ancestors.  Returns the default namespace, if there is one.
-    # prefix:: 
+    # prefix::
     #   the prefix to search for.  If not supplied, returns the default
     #   namespace if one exists
-    # Returns:: 
+    # Returns::
     #   the namespace URI as a String, or nil if no such namespace
     #   exists.  If the namespace is undefined, returns an empty string
     #  doc = Document.new("<a xmlns='1' xmlns:y='2'><b/><c xmlns:z='3'/></a>")
@@ -235,10 +235,10 @@ module REXML
     end
 
     # Adds a namespace to this element.
-    # prefix:: 
+    # prefix::
     #   the prefix string, or the namespace URI if +uri+ is not
     #   supplied
-    # uri::    
+    # uri::
     #   the namespace URI.  May be nil, in which +prefix+ is used as
     #   the URI
     # Evaluates to: this Element
@@ -280,12 +280,12 @@ module REXML
 
     # Adds a child to this element, optionally setting attributes in
     # the element.
-    # element:: 
+    # element::
     #   optional.  If Element, the element is added.
     #   Otherwise, a new Element is constructed with the argument (see
     #   Element.initialize).
-    # attrs:: 
-    #   If supplied, must be a Hash containing String name,value 
+    # attrs::
+    #   If supplied, must be a Hash containing String name,value
     #   pairs, which will be used to set the attributes of the new Element.
     # Returns:: the Element that was added
     #  el = doc.add_element 'my-tag'
@@ -296,15 +296,15 @@ module REXML
       raise "First argument must be either an element name, or an Element object" if element.nil?
       el = @elements.add(element)
       attrs.each do |key, value|
-        el.attributes[key]=Attribute.new(key,value,self)
+        el.attributes[key]=value
       end	if attrs.kind_of? Hash
       el
     end
 
     # Deletes a child element.
-    # element:: 
-    #   Must be an +Element+, +String+, or +Integer+.  If Element, 
-    #   the element is removed.  If String, the element is found (via XPath) 
+    # element::
+    #   Must be an +Element+, +String+, or +Integer+.  If Element,
+    #   the element is removed.  If String, the element is found (via XPath)
     #   and removed.  <em>This means that any parent can remove any
     #   descendant.<em>  If Integer, the Element indexed by that number will be
     #   removed.
@@ -327,14 +327,14 @@ module REXML
 
     # Iterates through the child elements, yielding for each Element that
     # has a particular attribute set.
-    # key:: 
+    # key::
     #   the name of the attribute to search for
-    # value:: 
+    # value::
     #   the value of the attribute
-    # max:: 
-    #   (optional) causes this method to return after yielding 
+    # max::
+    #   (optional) causes this method to return after yielding
     #   for this number of matching children
-    # name:: 
+    # name::
     #   (optional) if supplied, this is an XPath that filters
     #   the children to check.
     #
@@ -348,7 +348,7 @@ module REXML
     #  # Yields d
     #  doc.root.each_element_with_attribute( 'id', '1', 0, 'd' ) {|e| p e}
     def each_element_with_attribute( key, value=nil, max=0, name=nil, &block ) # :yields: Element
-      each_with_something( proc {|child| 
+      each_with_something( proc {|child|
         if value.nil?
           child.attributes[key] != nil
         else
@@ -359,13 +359,13 @@ module REXML
 
     # Iterates through the children, yielding for each Element that
     # has a particular text set.
-    # text:: 
-    #   the text to search for.  If nil, or not supplied, will itterate
+    # text::
+    #   the text to search for.  If nil, or not supplied, will iterate
     #   over all +Element+ children that contain at least one +Text+ node.
-    # max:: 
+    # max::
     #   (optional) causes this method to return after yielding
     #   for this number of matching children
-    # name:: 
+    # name::
     #   (optional) if supplied, this is an XPath that filters
     #   the children to check.
     #
@@ -379,7 +379,7 @@ module REXML
     #  # Yields d
     #  doc.each_element_with_text(nil, 0, 'd'){|e|p e}
     def each_element_with_text( text=nil, max=0, name=nil, &block ) # :yields: Element
-      each_with_something( proc {|child| 
+      each_with_something( proc {|child|
         if text.nil?
           child.has_text?
         else
@@ -408,7 +408,7 @@ module REXML
     #  doc.root.elements['c'].next_element          #-> nil
     def next_element
       element = next_sibling
-      element = element.next_sibling until element.nil? or element.kind_of? Element 
+      element = element.next_sibling until element.nil? or element.kind_of? Element
       return element
     end
 
@@ -477,7 +477,7 @@ module REXML
     # this method with a nil argument.  In this case, the next Text
     # child becomes the first Text child.  In no case is the order of
     # any siblings disturbed.
-    # text:: 
+    # text::
     #   If a String, a new Text child is created and added to
     #   this Element as the first Text child.  If Text, the text is set
     #   as the first Child element.  If nil, then any existing first Text
@@ -492,7 +492,7 @@ module REXML
     def text=( text )
       if text.kind_of? String
         text = Text.new( text, whitespace(), nil, raw() )
-      elsif text and !text.kind_of? Text
+      elsif !text.nil? and !text.kind_of? Text
         text = Text.new( text.to_s, whitespace(), nil, raw() )
       end
       old_text = get_text
@@ -520,7 +520,7 @@ module REXML
     # Note that at the end of this example, the branch has <b>3</b> nodes; the 'e'
     # element and <b>2</b> Text node children.
     def add_text( text )
-      if text.kind_of? String 
+      if text.kind_of? String
         if @children[-1].kind_of? Text
           @children[-1] << text
           return
@@ -552,9 +552,25 @@ module REXML
 
     def attribute( name, namespace=nil )
       prefix = nil
-      prefix = namespaces.index(namespace) if namespace
+      if namespaces.respond_to? :key
+        prefix = namespaces.key(namespace) if namespace
+      else
+        prefix = namespaces.index(namespace) if namespace
+      end
       prefix = nil if prefix == 'xmlns'
-      attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
+
+      ret_val =
+        attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
+
+      return ret_val unless ret_val.nil?
+      return nil if prefix.nil?
+
+      # now check that prefix'es namespace is not the same as the
+      # default namespace
+      return nil unless ( namespaces[ prefix ] == namespaces[ 'xmlns' ] )
+
+      attributes.get_attribute( name )
+
     end
 
     # Evaluates to +true+ if this element has any attributes set, false
@@ -570,7 +586,7 @@ module REXML
     #   the attribute is added to the list of Element attributes.  If String,
     #   the argument is used as the name of the new attribute, and the value
     #   parameter must be supplied.
-    # value:: 
+    # value::
     #   Required if +key+ is a String, and ignored if the first argument is
     #   an Attribute.  This is a String, and is used as the value
     #   of the new Attribute.  This should be the unnormalized value of the
@@ -605,7 +621,7 @@ module REXML
     #   either an Attribute or a String.  In either case, the
     #   attribute is found by matching the attribute name to the argument,
     #   and then removed.  If no attribute is found, no action is taken.
-    # Returns:: 
+    # Returns::
     #   the attribute removed, or nil if this Element did not contain
     #   a matching attribute
     #  e = Element.new('E')
@@ -622,7 +638,7 @@ module REXML
     # Other Utilities                               #
     #################################################
 
-    # Get an array of all CData children.  
+    # Get an array of all CData children.
     # IMMUTABLE
     def cdatas
       find_all { |child| child.kind_of? CData }.freeze
@@ -665,16 +681,17 @@ module REXML
     #   Internet Explorer is the worst piece of crap to have ever been
     #   written, with the possible exception of Windows itself.  Since IE is
     #   unable to parse proper XML, we have to provide a hack to generate XML
-    #   that IE's limited abilities can handle.  This hack inserts a space 
+    #   that IE's limited abilities can handle.  This hack inserts a space
     #   before the /> on empty tags.  Defaults to false
     #
     #  out = ''
     #  doc.write( out )     #-> doc is written to the string 'out'
     #  doc.write( $stdout ) #-> doc written to the console
-    def write(writer=$stdout, indent=-1, transitive=false, ie_hack=false)
+    def write(output=$stdout, indent=-1, transitive=false, ie_hack=false)
       Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters")
       formatter = if indent > -1
           if transitive
+            require "rexml/formatters/transitive"
             REXML::Formatters::Transitive.new( indent, ie_hack )
           else
             REXML::Formatters::Pretty.new( indent, ie_hack )
@@ -690,8 +707,8 @@ module REXML
     def __to_xpath_helper node
       rv = node.expanded_name.clone
       if node.parent
-        results = node.parent.find_all {|n| 
-          n.kind_of?(REXML::Element) and n.expanded_name == node.expanded_name 
+        results = node.parent.find_all {|n|
+          n.kind_of?(REXML::Element) and n.expanded_name == node.expanded_name
         }
         if results.length > 1
           idx = results.index( node )
@@ -704,7 +721,6 @@ module REXML
     # A private helper method
     def each_with_something( test, max=0, name=nil )
       num = 0
-      child=nil
       @elements.each( name ){ |child|
         yield child if test.call(child) and num += 1
         return if max>0 and num == max
@@ -718,7 +734,7 @@ module REXML
 
   # A class which provides filtering of children for Elements, and
   # XPath search support.  You are expected to only encounter this class as
-  # the <tt>element.elements</tt> object.  Therefore, you are 
+  # the <tt>element.elements</tt> object.  Therefore, you are
   # _not_ expected to instantiate this yourself.
   class Elements
     include Enumerable
@@ -730,7 +746,7 @@ module REXML
 
     # Fetches a child element.  Filters only Element children, regardless of
     # the XPath match.
-    # index:: 
+    # index::
     #   the search parameter.  This is either an Integer, which
     #   will be used to find the index'th child Element, or an XPath,
     #   which will be used to search for the Element.  <em>Because
@@ -740,7 +756,7 @@ module REXML
     #   child element is at index 1, not 0, and the +n+th element is at index
     #   +n+, not <tt>n-1</tt>.  This is because XPath indexes element children
     #   starting from 1, not 0, and the indexes should be the same.
-    # name:: 
+    # name::
     #   optional, and only used in the first argument is an
     #   Integer.  In that case, the index'th child Element that has the
     #   supplied name will be returned.  Note again that the indexes start at 1.
@@ -754,15 +770,14 @@ module REXML
         raise "index (#{index}) must be >= 1" if index < 1
         name = literalize(name) if name
         num = 0
-        child = nil
         @element.find { |child|
           child.kind_of? Element and
-          (name.nil? ? true : child.has_name?( name )) and 
+          (name.nil? ? true : child.has_name?( name )) and
           (num += 1) == index
         }
       else
         return XPath::first( @element, index )
-        #{ |element| 
+        #{ |element|
         #	return element if element.kind_of? Element
         #}
         #return nil
@@ -772,7 +787,7 @@ module REXML
     # Sets an element, replacing any previous matching element.  If no
     # existing element is found ,the element is added.
     # index:: Used to find a matching element to replace.  See []().
-    # element:: 
+    # element::
     #   The element to replace the existing element with
     #   the previous element
     # Returns:: nil if no previous element was found.
@@ -797,12 +812,12 @@ module REXML
       @element.find{ |child| child.kind_of? Element}.nil?
     end
 
-    # Returns the index of the supplied child (starting at 1), or -1 if 
+    # Returns the index of the supplied child (starting at 1), or -1 if
     # the element is not a child
     # element:: an +Element+ child
     def index element
       rv = 0
-      found = @element.find do |child| 
+      found = @element.find do |child|
         child.kind_of? Element and
         (rv += 1) and
         child == element
@@ -812,7 +827,7 @@ module REXML
     end
 
     # Deletes a child Element
-    # element:: 
+    # element::
     #   Either an Element, which is removed directly; an
     #   xpath, where the first matching child is removed; or an Integer,
     #   where the n'th Element is removed.
@@ -839,7 +854,7 @@ module REXML
     #  deleted = doc.elements.delete_all 'a/c' #-> [<c/>, <c/>, <c/>, <c/>]
     def delete_all( xpath )
       rv = []
-      XPath::each( @element, xpath) {|element| 
+      XPath::each( @element, xpath) {|element|
         rv << element if element.kind_of? Element
       }
       rv.each do |element|
@@ -850,7 +865,7 @@ module REXML
     end
 
     # Adds an element
-    # element:: 
+    # element::
     #   if supplied, is either an Element, String, or
     #   Source (see Element.initialize).  If not supplied or nil, a
     #   new, default Element will be constructed
@@ -875,8 +890,8 @@ module REXML
 
     # Iterates through all of the child Elements, optionally filtering
     # them by a given XPath
-    # xpath:: 
-    #   optional.  If supplied, this is a String XPath, and is used to 
+    # xpath::
+    #   optional.  If supplied, this is a String XPath, and is used to
     #   filter the children, so that only matching children are yielded.  Note
     #   that XPaths are automatically filtered for Elements, so that
     #   non-Element children will not be yielded
@@ -893,8 +908,8 @@ module REXML
 
     def collect( xpath=nil, &block )
       collection = []
-      XPath::each( @element, xpath ) {|e| 
-        collection << yield(e)  if e.kind_of?(Element) 
+      XPath::each( @element, xpath ) {|e|
+        collection << yield(e)  if e.kind_of?(Element)
       }
       collection
     end
@@ -929,7 +944,7 @@ module REXML
     # supplied XPath matches non-Element children.
     #  doc = Document.new '<a>sean<b/>elliott<c/></a>'
     #  doc.root.elements.to_a                  #-> [ <b/>, <c/> ]
-    #  doc.root.elements.to_a("child::node()") #-> [ <b/>, <c/> ] 
+    #  doc.root.elements.to_a("child::node()") #-> [ <b/>, <c/> ]
     #  XPath.match(doc.root, "child::node()")  #-> [ sean, <b/>, elliott, <c/> ]
     def to_a( xpath=nil )
       rv = XPath.match( @element, xpath )
@@ -949,7 +964,7 @@ module REXML
   # ATTRIBUTES                                                           #
   ########################################################################
 
-  # A class that defines the set of Attributes of an Element and provides 
+  # A class that defines the set of Attributes of an Element and provides
   # operations for accessing elements in that set.
   class Attributes < Hash
     # Constructor
@@ -961,11 +976,11 @@ module REXML
     # Fetches an attribute value.  If you want to get the Attribute itself,
     # use get_attribute()
     # name:: an XPath attribute name.  Namespaces are relevant here.
-    # Returns:: 
+    # Returns::
     #   the String value of the matching attribute, or +nil+ if no
     #   matching attribute was found.  This is the unnormalized value
     #   (with entities expanded).
-    # 
+    #
     #  doc = Document.new "<a foo:att='1' bar:att='2' att='&lt;'/>"
     #  doc.root.attributes['att']         #-> '<'
     #  doc.root.attributes['bar:att']     #-> '2'
@@ -989,9 +1004,9 @@ module REXML
     end
     alias :size :length
 
-    # Itterates over the attributes of an Element.  Yields actual Attribute
+    # Iterates over the attributes of an Element.  Yields actual Attribute
     # nodes, not String values.
-    # 
+    #
     #  doc = Document.new '<a x="1" y="2"/>'
     #  doc.root.attributes.each_attribute {|attr|
     #    p attr.expanded_name+" => "+attr.value
@@ -1006,19 +1021,19 @@ module REXML
       end
     end
 
-    # Itterates over each attribute of an Element, yielding the expanded name
+    # Iterates over each attribute of an Element, yielding the expanded name
     # and value as a pair of Strings.
     #
     #  doc = Document.new '<a x="1" y="2"/>'
     #  doc.root.attributes.each {|name, value| p name+" => "+value }
     def each
       each_attribute do |attr|
-        yield attr.expanded_name, attr.value
+        yield [attr.expanded_name, attr.value]
       end
     end
 
     # Fetches an attribute
-    # name:: 
+    # name::
     #   the name by which to search for the attribute.  Can be a
     #   <tt>prefix:name</tt> namespace name.
     # Returns:: The first matching attribute, or nil if there was none.  This
@@ -1062,10 +1077,10 @@ module REXML
     # Sets an attribute, overwriting any existing attribute value by the
     # same name.  Namespace is significant.
     # name:: the name of the attribute
-    # value:: 
+    # value::
     #   (optional) If supplied, the value of the attribute.  If
     #   nil, any existing matching attribute is deleted.
-    # Returns:: 
+    # Returns::
     #   Owning element
     #  doc = Document.new "<a x:foo='1' foo='3'/>"
     #  doc.root.attributes['y:foo'] = '2'
@@ -1094,13 +1109,13 @@ module REXML
         old_attr[value.prefix] = value
       elsif old_attr.prefix != value.prefix
         # Check for conflicting namespaces
-        raise ParseException.new( 
+        raise ParseException.new(
           "Namespace conflict in adding attribute \"#{value.name}\": "+
           "Prefix \"#{old_attr.prefix}\" = "+
           "\"#{@element.namespace(old_attr.prefix)}\" and prefix "+
-          "\"#{value.prefix}\" = \"#{@element.namespace(value.prefix)}\"") if 
+          "\"#{value.prefix}\" = \"#{@element.namespace(value.prefix)}\"") if
           value.prefix != "xmlns" and old_attr.prefix != "xmlns" and
-          @element.namespace( old_attr.prefix ) == 
+          @element.namespace( old_attr.prefix ) ==
             @element.namespace( value.prefix )
           store value.name, { old_attr.prefix	=> old_attr,
             value.prefix		=> value }
@@ -1110,7 +1125,7 @@ module REXML
       return @element
     end
 
-    # Returns an array of Strings containing all of the prefixes declared 
+    # Returns an array of Strings containing all of the prefixes declared
     # by this set of # attributes.  The array does not include the default
     # namespace declaration, if one exists.
     #  doc = Document.new("<a xmlns='foo' xmlns:x='bar' xmlns:y='twee' "+
@@ -1149,7 +1164,7 @@ module REXML
     end
 
     # Removes an attribute
-    # attribute:: 
+    # attribute::
     #   either a String, which is the name of the attribute to remove --
     #   namespaces are significant here -- or the attribute to remove.
     # Returns:: the owning element
@@ -1197,12 +1212,12 @@ module REXML
     alias :<< :add
 
     # Deletes all attributes matching a name.  Namespaces are significant.
-    # name:: 
+    # name::
     #   A String; all attributes that match this path will be removed
     # Returns:: an Array of the Attributes that were removed
     def delete_all( name )
       rv = []
-      each_attribute { |attribute| 
+      each_attribute { |attribute|
         rv << attribute if attribute.expanded_name == name
       }
       rv.each{ |attr| attr.remove }
@@ -1212,16 +1227,20 @@ module REXML
     # The +get_attribute_ns+ method retrieves a method by its namespace
     # and name. Thus it is possible to reliably identify an attribute
     # even if an XML processor has changed the prefix.
-    # 
+    #
     # Method contributed by Henrik Martensson
     def get_attribute_ns(namespace, name)
+      result = nil
       each_attribute() { |attribute|
         if name == attribute.name &&
-          namespace == attribute.namespace()
-          return attribute
+          namespace == attribute.namespace() &&
+          ( !namespace.empty? || !attribute.fully_expanded_name.index(':') )
+          # foo will match xmlns:foo, but only if foo isn't also an attribute
+          result = attribute if !result or !namespace.empty? or
+                                !attribute.fully_expanded_name.index(':')
         end
       }
-      nil
+      result
     end
   end
 end
diff --git a/lib/rexml/encoding.rb b/lib/rexml/encoding.rb
index a01763be99..3feffb80f4 100644
--- a/lib/rexml/encoding.rb
+++ b/lib/rexml/encoding.rb
@@ -29,7 +29,7 @@ module REXML
         if enc and enc != UTF_8
           @encoding = enc
           raise ArgumentError, "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
-          @encoding.untaint 
+          @encoding.untaint
           begin
             require 'rexml/encodings/ICONV.rb'
             Encoding.apply(self, "ICONV")
@@ -56,14 +56,14 @@ module REXML
 
     def check_encoding str
       # We have to recognize UTF-16, LSB UTF-16, and UTF-8
-      if str[0] == 0xfe && str[1] == 0xff
+      if str[0,2] == "\xfe\xff"
         str[0,2] = ""
         return UTF_16
-      elsif str[0] == 0xff && str[1] == 0xfe
+      elsif str[0,2] == "\xff\xfe"
         str[0,2] = ""
         return UNILE
       end
-      str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/um
+      str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/m
       return $3.upcase if $3
       return UTF_8
     end
diff --git a/lib/rexml/encodings/CP-1252.rb b/lib/rexml/encodings/CP-1252.rb
index 8675f9ff98..587c5bdd68 100644
--- a/lib/rexml/encodings/CP-1252.rb
+++ b/lib/rexml/encodings/CP-1252.rb
@@ -3,12 +3,12 @@
 #
 module REXML
   module Encoding
-  	register( "CP-1252" ) do |o|
-  		class << o
-  			alias encode encode_cp1252
-			alias decode decode_cp1252
-  		end
-  	end
+    register( "CP-1252" ) do |o|
+      class << o
+        alias encode encode_cp1252
+      alias decode decode_cp1252
+      end
+    end
 
     # Convert from UTF-8
     def encode_cp1252(content)
@@ -58,7 +58,7 @@ module REXML
       end
       array_enc.pack('C*')
     end
-    
+
     # Convert to UTF-8
     def decode_cp1252(str)
       array_latin9 = str.unpack('C*')
diff --git a/lib/rexml/encodings/ISO-8859-15.rb b/lib/rexml/encodings/ISO-8859-15.rb
index 8dea0d38a4..08a19cb755 100644
--- a/lib/rexml/encodings/ISO-8859-15.rb
+++ b/lib/rexml/encodings/ISO-8859-15.rb
@@ -3,10 +3,10 @@
 #
 module REXML
   module Encoding
-  	register("ISO-8859-15") do |o|
-  		alias encode to_iso_8859_15
+    register("ISO-8859-15") do |o|
+      alias encode to_iso_8859_15
       alias decode from_iso_8859_15
-  	end
+    end
 
     # Convert from UTF-8
     def to_iso_8859_15(content)
@@ -46,7 +46,7 @@ module REXML
       end
       array_enc.pack('C*')
     end
-    
+
     # Convert to UTF-8
     def from_iso_8859_15(str)
       array_latin9 = str.unpack('C*')
diff --git a/lib/rexml/encodings/UNILE.rb b/lib/rexml/encodings/UNILE.rb
index d054140c40..1a18f0c932 100644
--- a/lib/rexml/encodings/UNILE.rb
+++ b/lib/rexml/encodings/UNILE.rb
@@ -18,7 +18,7 @@ module REXML
     def decode_unile(str)
       array_enc=str.unpack('C*')
       array_utf8 = []
-      0.step(array_enc.size-1, 2){|i| 
+      0.step(array_enc.size-1, 2){|i|
         array_utf8 << (array_enc.at(i) + array_enc.at(i+1)*0x100)
       }
       array_utf8.pack('U*')
diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
index 007c493d9c..2ec058eed5 100644
--- a/lib/rexml/encodings/UTF-16.rb
+++ b/lib/rexml/encodings/UTF-16.rb
@@ -19,7 +19,7 @@ module REXML
       str = str[2..-1] if /^\376\377/n =~ str
       array_enc=str.unpack('C*')
       array_utf8 = []
-      0.step(array_enc.size-1, 2){|i| 
+      0.step(array_enc.size-1, 2){|i|
         array_utf8 << (array_enc.at(i+1) + array_enc.at(i)*0x100)
       }
       array_utf8.pack('U*')
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
index ff2d45f39b..3d81fbc738 100644
--- a/lib/rexml/entity.rb
+++ b/lib/rexml/entity.rb
@@ -3,163 +3,164 @@ require 'rexml/source'
 require 'rexml/xmltokens'
 
 module REXML
-	# God, I hate DTDs.  I really do.  Why this idiot standard still
-	# plagues us is beyond me.
-	class Entity < Child
-		include XMLTokens
-		PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
-		SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
-		PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
-		EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
-		NDATADECL = "\\s+NDATA\\s+#{NAME}"
-		PEREFERENCE = "%#{NAME};"
-		ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
-		PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
-		ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
-		PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
-		GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
-		ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
+  # God, I hate DTDs.  I really do.  Why this idiot standard still
+  # plagues us is beyond me.
+  class Entity < Child
+    include XMLTokens
+    PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
+    SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
+    PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
+    EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
+    NDATADECL = "\\s+NDATA\\s+#{NAME}"
+    PEREFERENCE = "%#{NAME};"
+    ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
+    PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
+    ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
+    PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
+    GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
+    ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
 
-		attr_reader :name, :external, :ref, :ndata, :pubid
+    attr_reader :name, :external, :ref, :ndata, :pubid
 
-		# Create a new entity.  Simple entities can be constructed by passing a
-		# name, value to the constructor; this creates a generic, plain entity
-		# reference. For anything more complicated, you have to pass a Source to
-		# the constructor with the entity definiton, or use the accessor methods.
-		# +WARNING+: There is no validation of entity state except when the entity
-		# is read from a stream.  If you start poking around with the accessors,
-		# you can easily create a non-conformant Entity.  The best thing to do is
-		# dump the stupid DTDs and use XMLSchema instead.
-		# 
-		#  e = Entity.new( 'amp', '&' )
-		def initialize stream, value=nil, parent=nil, reference=false
-			super(parent)
-			@ndata = @pubid = @value = @external = nil
-			if stream.kind_of? Array
-				@name = stream[1]
-				if stream[-1] == '%'
-					@reference = true 
-					stream.pop
-				else
-					@reference = false
-				end
-				if stream[2] =~ /SYSTEM|PUBLIC/
-					@external = stream[2]
-					if @external == 'SYSTEM'
-						@ref = stream[3]
-						@ndata = stream[4] if stream.size == 5
-					else
-						@pubid = stream[3]
-						@ref = stream[4]
-					end
-				else
-					@value = stream[2]
-				end
-			else
-				@reference = reference
-				@external = nil
-				@name = stream
-				@value = value
-			end
-		end
+    # Create a new entity.  Simple entities can be constructed by passing a
+    # name, value to the constructor; this creates a generic, plain entity
+    # reference. For anything more complicated, you have to pass a Source to
+    # the constructor with the entity definition, or use the accessor methods.
+    # +WARNING+: There is no validation of entity state except when the entity
+    # is read from a stream.  If you start poking around with the accessors,
+    # you can easily create a non-conformant Entity.  The best thing to do is
+    # dump the stupid DTDs and use XMLSchema instead.
+    #
+    #  e = Entity.new( 'amp', '&' )
+    def initialize stream, value=nil, parent=nil, reference=false
+      super(parent)
+      @ndata = @pubid = @value = @external = nil
+      if stream.kind_of? Array
+        @name = stream[1]
+        if stream[-1] == '%'
+          @reference = true
+          stream.pop
+        else
+          @reference = false
+        end
+        if stream[2] =~ /SYSTEM|PUBLIC/
+          @external = stream[2]
+          if @external == 'SYSTEM'
+            @ref = stream[3]
+            @ndata = stream[4] if stream.size == 5
+          else
+            @pubid = stream[3]
+            @ref = stream[4]
+          end
+        else
+          @value = stream[2]
+        end
+      else
+        @reference = reference
+        @external = nil
+        @name = stream
+        @value = value
+      end
+    end
 
-		# Evaluates whether the given string matchs an entity definition,
-		# returning true if so, and false otherwise.
-		def Entity::matches? string
-			(ENTITYDECL =~ string) == 0
-		end
+    # Evaluates whether the given string matchs an entity definition,
+    # returning true if so, and false otherwise.
+    def Entity::matches? string
+      (ENTITYDECL =~ string) == 0
+    end
 
-		# Evaluates to the unnormalized value of this entity; that is, replacing
-		# all entities -- both %ent; and &ent; entities.  This differs from
-		# +value()+ in that +value+ only replaces %ent; entities.
-		def unnormalized
-			v = value()
-			return nil if v.nil?
-			@unnormalized = Text::unnormalize(v, parent)
-			@unnormalized
-		end
+    # Evaluates to the unnormalized value of this entity; that is, replacing
+    # all entities -- both %ent; and &ent; entities.  This differs from
+    # +value()+ in that +value+ only replaces %ent; entities.
+    def unnormalized
+      document.record_entity_expansion unless document.nil?
+      v = value()
+      return nil if v.nil?
+      @unnormalized = Text::unnormalize(v, parent)
+      @unnormalized
+    end
 
-		#once :unnormalized
+    #once :unnormalized
 
-		# Returns the value of this entity unprocessed -- raw.  This is the
-		# normalized value; that is, with all %ent; and &ent; entities intact
-		def normalized
-			@value
-		end
+    # Returns the value of this entity unprocessed -- raw.  This is the
+    # normalized value; that is, with all %ent; and &ent; entities intact
+    def normalized
+      @value
+    end
 
-		# Write out a fully formed, correct entity definition (assuming the Entity
-		# object itself is valid.)
+    # Write out a fully formed, correct entity definition (assuming the Entity
+    # object itself is valid.)
     #
     # out::
     #   An object implementing <TT>&lt;&lt;<TT> to which the entity will be
     #   output
     # indent::
     #   *DEPRECATED* and ignored
-		def write out, indent=-1
-			out << '<!ENTITY '
-			out << '% ' if @reference
-			out << @name
-			out << ' '
-			if @external
-				out << @external << ' '
-				if @pubid
-					q = @pubid.include?('"')?"'":'"'
-					out << q << @pubid << q << ' '
-				end
-				q = @ref.include?('"')?"'":'"'
-				out << q << @ref << q
-				out << ' NDATA ' << @ndata if @ndata
-			else
-				q = @value.include?('"')?"'":'"'
-				out << q << @value << q
-			end
-			out << '>'
-		end
+    def write out, indent=-1
+      out << '<!ENTITY '
+      out << '% ' if @reference
+      out << @name
+      out << ' '
+      if @external
+        out << @external << ' '
+        if @pubid
+          q = @pubid.include?('"')?"'":'"'
+          out << q << @pubid << q << ' '
+        end
+        q = @ref.include?('"')?"'":'"'
+        out << q << @ref << q
+        out << ' NDATA ' << @ndata if @ndata
+      else
+        q = @value.include?('"')?"'":'"'
+        out << q << @value << q
+      end
+      out << '>'
+    end
 
-		# Returns this entity as a string.  See write().
-		def to_s
-			rv = ''
-			write rv
-			rv
-		end
+    # Returns this entity as a string.  See write().
+    def to_s
+      rv = ''
+      write rv
+      rv
+    end
 
-		PEREFERENCE_RE = /#{PEREFERENCE}/um
-		# Returns the value of this entity.  At the moment, only internal entities
-		# are processed.  If the value contains internal references (IE,
-		# %blah;), those are replaced with their values.  IE, if the doctype
-		# contains:
-		#  <!ENTITY % foo "bar">
-		#  <!ENTITY yada "nanoo %foo; nanoo>
-		# then:
-		#  doctype.entity('yada').value   #-> "nanoo bar nanoo"
-		def value
-			if @value
-				matches = @value.scan(PEREFERENCE_RE)
-				rv = @value.clone
-				if @parent
-					matches.each do |entity_reference|
-						entity_value = @parent.entity( entity_reference[0] )
-						rv.gsub!( /%#{entity_reference};/um, entity_value )
-					end
-				end
-				return rv
-			end
-			nil
-		end
-	end
+    PEREFERENCE_RE = /#{PEREFERENCE}/um
+    # Returns the value of this entity.  At the moment, only internal entities
+    # are processed.  If the value contains internal references (IE,
+    # %blah;), those are replaced with their values.  IE, if the doctype
+    # contains:
+    #  <!ENTITY % foo "bar">
+    #  <!ENTITY yada "nanoo %foo; nanoo>
+    # then:
+    #  doctype.entity('yada').value   #-> "nanoo bar nanoo"
+    def value
+      if @value
+        matches = @value.scan(PEREFERENCE_RE)
+        rv = @value.clone
+        if @parent
+          matches.each do |entity_reference|
+            entity_value = @parent.entity( entity_reference[0] )
+            rv.gsub!( /%#{entity_reference.join};/um, entity_value )
+          end
+        end
+        return rv
+      end
+      nil
+    end
+  end
 
-	# This is a set of entity constants -- the ones defined in the XML
-	# specification.  These are +gt+, +lt+, +amp+, +quot+ and +apos+.
-	module EntityConst
-		# +>+
-		GT = Entity.new( 'gt', '>' )
-		# +<+
-		LT = Entity.new( 'lt', '<' )
-		# +&+
-		AMP = Entity.new( 'amp', '&' )
-		# +"+
-		QUOT = Entity.new( 'quot', '"' )
-		# +'+
-		APOS = Entity.new( 'apos', "'" )
-	end
+  # This is a set of entity constants -- the ones defined in the XML
+  # specification.  These are +gt+, +lt+, +amp+, +quot+ and +apos+.
+  module EntityConst
+    # +>+
+    GT = Entity.new( 'gt', '>' )
+    # +<+
+    LT = Entity.new( 'lt', '<' )
+    # +&+
+    AMP = Entity.new( 'amp', '&' )
+    # +"+
+    QUOT = Entity.new( 'quot', '"' )
+    # +'+
+    APOS = Entity.new( 'apos', "'" )
+  end
 end
diff --git a/lib/rexml/formatters/default.rb b/lib/rexml/formatters/default.rb
index 77381bdf84..db44453e1e 100644
--- a/lib/rexml/formatters/default.rb
+++ b/lib/rexml/formatters/default.rb
@@ -21,7 +21,7 @@ module REXML
       def write( node, output )
         case node
 
-        when Document 
+        when Document
           if node.xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
             output = Output.new( output, node.xml_decl.encoding )
           end
@@ -63,14 +63,16 @@ module REXML
       def write_element( node, output )
         output << "<#{node.expanded_name}"
 
-        node.attributes.each_attribute do |attr|
+        node.attributes.to_a.map { |a|
+          Hash === a ? a.values : a
+        }.flatten.sort_by {|attr| attr.name}.each do |attr|
           output << " "
           attr.write( output )
         end unless node.attributes.empty?
 
         if node.children.empty?
           output << " " if @ie_hack
-          output << "/" 
+          output << "/"
         else
           output << ">"
           node.children.each { |child|
diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb
index 22b6d857cd..dc4e8026b0 100644
--- a/lib/rexml/formatters/pretty.rb
+++ b/lib/rexml/formatters/pretty.rb
@@ -31,6 +31,7 @@ module REXML
         @level = 0
         @ie_hack = ie_hack
         @width = 80
+        @compact = false
       end
 
       protected
@@ -47,7 +48,7 @@ module REXML
           if @ie_hack
             output << " "
           end
-          output << "/" 
+          output << "/"
         else
           output << ">"
           # If compact and all children are text, and if the formatted output
@@ -87,7 +88,7 @@ module REXML
         s = node.to_s()
         s.gsub!(/\s/,' ')
         s.squeeze!(" ")
-        s = wrap(s, 80-@level)
+        s = wrap(s, @width - @level)
         s = indent_text(s, @level, " ", true)
         output << (' '*@level + s)
       end
@@ -125,9 +126,10 @@ module REXML
       end
 
       def wrap(string, width)
-        # Recursivly wrap string at width.
+        # Recursively wrap string at width.
         return string if string.length <= width
         place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
+        return string if place.nil?
         return string[0,place] + "\n" + wrap(string[place+1..-1], width)
       end
 
diff --git a/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb
index 1d80f21fbb..3a52e03f01 100644
--- a/lib/rexml/formatters/transitive.rb
+++ b/lib/rexml/formatters/transitive.rb
@@ -12,9 +12,10 @@ module REXML
     # formatted.  Since this formatter does not alter whitespace nodes, the
     # results of formatting already formatted XML will be odd.
     class Transitive < Default
-      def initialize( indentation=2 )
+      def initialize( indentation=2, ie_hack=false )
         @indentation = indentation
         @level = 0
+        @ie_hack = ie_hack
       end
 
       protected
@@ -29,7 +30,8 @@ module REXML
         output << "\n"
         output << ' '*@level
         if node.children.empty?
-          output << "/" 
+          output << " " if @ie_hack
+          output << "/"
         else
           output << ">"
           # If compact and all children are text, and if the formatted output
diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb
index 8293e9c5ac..2d30e5fe92 100644
--- a/lib/rexml/functions.rb
+++ b/lib/rexml/functions.rb
@@ -48,7 +48,7 @@ module REXML
     # UNTESTED
     def Functions::local_name( node_set=nil )
       get_namespace( node_set ) do |node|
-        return node.local_name 
+        return node.local_name
       end
     end
 
@@ -57,7 +57,7 @@ module REXML
     end
 
     def Functions::name( node_set=nil )
-      get_namespace( node_set ) do |node| 
+      get_namespace( node_set ) do |node|
         node.expanded_name
       end
     end
@@ -66,7 +66,7 @@ module REXML
     def Functions::get_namespace( node_set = nil )
       if node_set == nil
         yield @@context[:node] if defined? @@context[:node].namespace
-      else  
+      else
         if node_set.respond_to? :each
           node_set.each { |node| yield node if defined? node.namespace }
         elsif node_set.respond_to? :namespace
@@ -81,15 +81,15 @@ module REXML
     #
     # A number is converted to a string as follows
     #
-    # NaN is converted to the string NaN 
+    # NaN is converted to the string NaN
     #
-    # positive zero is converted to the string 0 
+    # positive zero is converted to the string 0
     #
-    # negative zero is converted to the string 0 
+    # negative zero is converted to the string 0
     #
-    # positive infinity is converted to the string Infinity 
+    # positive infinity is converted to the string Infinity
     #
-    # negative infinity is converted to the string -Infinity 
+    # negative infinity is converted to the string -Infinity
     #
     # if the number is an integer, the number is represented in decimal form
     # as a Number with no decimal point and no leading zeros, preceded by a
@@ -156,7 +156,7 @@ module REXML
       string(string).include?(string(test))
     end
 
-    # Kouhei fixed this 
+    # Kouhei fixed this
     def Functions::substring_before( string, test )
       ruby_string = string(string)
       ruby_index = ruby_string.index(string(test))
@@ -166,7 +166,7 @@ module REXML
         ruby_string[ 0...ruby_index ]
       end
     end
- 
+
     # Kouhei fixed this too
     def Functions::substring_after( string, test )
       ruby_string = string(string)
@@ -175,11 +175,11 @@ module REXML
       ""
     end
 
-    # Take equal portions of Mike Stok and Sean Russell; mix 
+    # Take equal portions of Mike Stok and Sean Russell; mix
     # vigorously, and pour into a tall, chilled glass.  Serves 10,000.
     def Functions::substring( string, start, length=nil )
       ruby_string = string(string)
-      ruby_length = if length.nil? 
+      ruby_length = if length.nil?
                       ruby_string.length.to_f
                     else
                       number(length)
@@ -188,15 +188,15 @@ module REXML
 
       # Handle the special cases
       return '' if (
-        ruby_length.nan? or 
+        ruby_length.nan? or
         ruby_start.nan? or
         ruby_start.infinite?
       )
 
       infinite_length = ruby_length.infinite? == 1
       ruby_length = ruby_string.length if infinite_length
-        
-      # Now, get the bounds.  The XPath bounds are 1..length; the ruby bounds 
+
+      # Now, get the bounds.  The XPath bounds are 1..length; the ruby bounds
       # are 0..length.  Therefore, we have to offset the bounds by one.
       ruby_start = ruby_start.round - 1
       ruby_length = ruby_length.round
@@ -235,7 +235,7 @@ module REXML
       # from string then we ignore the second &
       # subsequent mappings
       #
-      # if a charactcer maps to nil then we delete it
+      # if a character maps to nil then we delete it
       # in the output.  This happens if the from
       # string is longer than the to string
       #
@@ -247,7 +247,7 @@ module REXML
       0.upto(from.length - 1) { |pos|
         from_char = from[pos]
         unless map.has_key? from_char
-          map[from_char] = 
+          map[from_char] =
           if pos < to.length
             to[pos]
           else
@@ -256,9 +256,15 @@ module REXML
         end
       }
 
-      string(string).unpack('U*').collect { |c|
-        if map.has_key? c then map[c] else c end
-      }.compact.pack('U*')
+      if ''.respond_to? :chars
+        string(string).chars.collect { |c|
+          if map.has_key? c then map[c] else c end
+        }.compact.join
+      else
+        string(string).unpack('U*').collect { |c|
+          if map.has_key? c then map[c] else c end
+        }.compact.pack('U*')
+      end
     end
 
     # UNTESTED
@@ -353,7 +359,7 @@ module REXML
       nodes = [nodes] unless nodes.kind_of? Array
       nodes.inject(0) { |r,n| r += number(string(n)) }
     end
-    
+
     def Functions::floor( number )
       number(number).floor
     end
diff --git a/lib/rexml/instruction.rb b/lib/rexml/instruction.rb
index c16b894b4a..f8b734a5b5 100644
--- a/lib/rexml/instruction.rb
+++ b/lib/rexml/instruction.rb
@@ -2,62 +2,62 @@ require "rexml/child"
 require "rexml/source"
 
 module REXML
-	# Represents an XML Instruction; IE, <? ... ?>
-	# TODO: Add parent arg (3rd arg) to constructor
-	class Instruction < Child
-		START = '<\?'
-		STOP = '\?>'
+  # Represents an XML Instruction; IE, <? ... ?>
+  # TODO: Add parent arg (3rd arg) to constructor
+  class Instruction < Child
+    START = '<\?'
+    STOP = '\?>'
 
-		# target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
-		# content is everything else.
-		attr_accessor :target, :content
+    # target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
+    # content is everything else.
+    attr_accessor :target, :content
 
-		# Constructs a new Instruction
-		# @param target can be one of a number of things.  If String, then 
-		# the target of this instruction is set to this.  If an Instruction,
-		# then the Instruction is shallowly cloned (target and content are
-		# copied).  If a Source, then the source is scanned and parsed for
-		# an Instruction declaration.
-		# @param content Must be either a String, or a Parent.  Can only
-		# be a Parent if the target argument is a Source.  Otherwise, this
-		# String is set as the content of this instruction.
-		def initialize(target, content=nil)
-			if target.kind_of? String
-				super()
-				@target = target
-				@content = content
-			elsif target.kind_of? Instruction
-				super(content)
-				@target = target.target
-				@content = target.content
-			end
-			@content.strip! if @content
-		end
+    # Constructs a new Instruction
+    # @param target can be one of a number of things.  If String, then
+    # the target of this instruction is set to this.  If an Instruction,
+    # then the Instruction is shallowly cloned (target and content are
+    # copied).  If a Source, then the source is scanned and parsed for
+    # an Instruction declaration.
+    # @param content Must be either a String, or a Parent.  Can only
+    # be a Parent if the target argument is a Source.  Otherwise, this
+    # String is set as the content of this instruction.
+    def initialize(target, content=nil)
+      if target.kind_of? String
+        super()
+        @target = target
+        @content = content
+      elsif target.kind_of? Instruction
+        super(content)
+        @target = target.target
+        @content = target.content
+      end
+      @content.strip! if @content
+    end
+
+    def clone
+      Instruction.new self
+    end
 
-		def clone
-			Instruction.new self
-		end
-		
     # == DEPRECATED
     # See the rexml/formatters package
     #
-		def write writer, indent=-1, transitive=false, ie_hack=false
+    def write writer, indent=-1, transitive=false, ie_hack=false
       Kernel.warn( "#{self.class.name}.write is deprecated" )
-			indent(writer, indent)
-			writer << START.sub(/\\/u, '')
-			writer << @target
-			writer << ' '
-			writer << @content
-			writer << STOP.sub(/\\/u, '')
-		end
+      indent(writer, indent)
+      writer << START.sub(/\\/u, '')
+      writer << @target
+      writer << ' '
+      writer << @content
+      writer << STOP.sub(/\\/u, '')
+    end
 
-		# @return true if other is an Instruction, and the content and target
-		# of the other matches the target and content of this object.
-		def ==( other )
-			other.kind_of? Instruction and
-			other.target == @target and
-			other.content == @content
-		end
+    # @return true if other is an Instruction, and the content and target
+    # of the other matches the target and content of this object.
+    def ==( other )
+      other.kind_of? Instruction and
+      other.target == @target and
+      other.content == @content
+    end
 
     def node_type
       :processing_instruction
@@ -66,5 +66,5 @@ module REXML
     def inspect
       "<?p-i #{target} ...?>"
     end
-	end
+  end
 end
diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb
index 943ec5f1a0..c8701f3abb 100644
--- a/lib/rexml/light/node.rb
+++ b/lib/rexml/light/node.rb
@@ -1,196 +1,195 @@
 require 'rexml/xmltokens'
-require 'rexml/light/node'
 
 # [ :element, parent, name, attributes, children* ]
-	# a = Node.new
-	# a << "B"		# => <a>B</a>
-	# a.b			# => <a>B<b/></a>
-	# a.b[1]			# => <a>B<b/><b/><a>
-	# a.b[1]["x"] = "y"	# => <a>B<b/><b x="y"/></a>
-	# a.b[0].c		# => <a>B<b><c/></b><b x="y"/></a>
-	# a.b.c << "D"		# => <a>B<b><c>D</c></b><b x="y"/></a>
+  # a = Node.new
+  # a << "B"		# => <a>B</a>
+  # a.b			# => <a>B<b/></a>
+  # a.b[1]			# => <a>B<b/><b/><a>
+  # a.b[1]["x"] = "y"	# => <a>B<b/><b x="y"/></a>
+  # a.b[0].c		# => <a>B<b><c/></b><b x="y"/></a>
+  # a.b.c << "D"		# => <a>B<b><c>D</c></b><b x="y"/></a>
 module REXML
-	module Light
-		# Represents a tagged XML element.  Elements are characterized by
-		# having children, attributes, and names, and can themselves be
-		# children.
-		class Node
-			NAMESPLIT = /^(?:(#{XMLTokens::NCNAME_STR}):)?(#{XMLTokens::NCNAME_STR})/u
-			PARENTS = [ :element, :document, :doctype ]
-			# Create a new element.
-			def initialize node=nil
-				@node = node
-				if node.kind_of? String
-					node = [ :text, node ]
-				elsif node.nil?
-					node = [ :document, nil, nil ]
-				elsif node[0] == :start_element
-					node[0] = :element
-				elsif node[0] == :start_doctype
-					node[0] = :doctype
-				elsif node[0] == :start_document
-					node[0] = :document
-				end
-			end
-
-			def size
-				if PARENTS.include? @node[0]
-					@node[-1].size
-				else
-					0
-				end
-			end
-
-			def each( &block )
-				size.times { |x| yield( at(x+4) ) }
-			end
-
-			def name
-				at(2)
-			end
-
-			def name=( name_str, ns=nil )
-				pfx = ''
-				pfx = "#{prefix(ns)}:" if ns
-				_old_put(2, "#{pfx}#{name_str}")
-			end
-
-			def parent=( node )
-				_old_put(1,node)
-			end
-
-			def local_name
-				namesplit
-				@name
-			end
-
-			def local_name=( name_str )
-				_old_put( 1, "#@prefix:#{name_str}" )
-			end
-
-			def prefix( namespace=nil )
-				prefix_of( self, namespace )
-			end
-
-			def namespace( prefix=prefix() )
-				namespace_of( self, prefix )
-			end
-
-			def namespace=( namespace )
-				@prefix = prefix( namespace )
-				pfx = ''
-				pfx = "#@prefix:" if @prefix.size > 0
-				_old_put(1, "#{pfx}#@name")
-			end
-
-			def []( reference, ns=nil )
-				if reference.kind_of? String
-					pfx = ''
-					pfx = "#{prefix(ns)}:" if ns
-					at(3)["#{pfx}#{reference}"]
-				elsif reference.kind_of? Range
-					_old_get( Range.new(4+reference.begin, reference.end, reference.exclude_end?) )
-				else
-					_old_get( 4+reference )
-				end
-			end
-
-			def =~( path )
-				XPath.match( self, path )
-			end
-
-			# Doesn't handle namespaces yet
-			def []=( reference, ns, value=nil )
-				if reference.kind_of? String
-					value = ns unless value
-					at( 3 )[reference] = value
-				elsif reference.kind_of? Range
-					_old_put( Range.new(3+reference.begin, reference.end, reference.exclude_end?), ns )
-				else
-					if value
-						_old_put( 4+reference, ns, value )
-					else
-						_old_put( 4+reference, ns )
-					end
-				end
-			end
-
-			# Append a child to this element, optionally under a provided namespace.
-			# The namespace argument is ignored if the element argument is an Element
-			# object.  Otherwise, the element argument is a string, the namespace (if
-			# provided) is the namespace the element is created in.
-			def << element
-				if node_type() == :text
-					at(-1) << element
-				else
-					newnode = Node.new( element )
-					newnode.parent = self
-					self.push( newnode )
-				end
-				at(-1)
-			end
-
-			def node_type
-				_old_get(0)
-			end
-
-			def text=( foo )
-				replace = at(4).kind_of?(String)? 1 : 0
-				self._old_put(4,replace, normalizefoo)
-			end
-
-			def root
-				context = self
-				context = context.at(1) while context.at(1)
-			end
-
-			def has_name?( name, namespace = '' )
-				at(3) == name and namespace() == namespace
-			end
-
-			def children
-				self
-			end
-
-			def parent
-				at(1)
-			end
-
-			def to_s
-
-			end
-
-			private
-
-			def namesplit
-				return if @name.defined?
-				at(2) =~ NAMESPLIT
-				@prefix = '' || $1
-				@name = $2
-			end
-
-			def namespace_of( node, prefix=nil )
-				if not prefix
-					name = at(2)
-					name =~ NAMESPLIT
-					prefix = $1
-				end
-				to_find = 'xmlns'
-				to_find = "xmlns:#{prefix}" if not prefix.nil?
-				ns = at(3)[ to_find ]
-				ns ? ns : namespace_of( @node[0], prefix )
-			end
-
-			def prefix_of( node, namespace=nil )
-				if not namespace
-					name = node.name
-					name =~ NAMESPLIT
-					$1
-				else
-					ns = at(3).find { |k,v| v == namespace }
-					ns ? ns : prefix_of( node.parent, namespace )
-				end
-			end
-		end
-	end
+  module Light
+    # Represents a tagged XML element.  Elements are characterized by
+    # having children, attributes, and names, and can themselves be
+    # children.
+    class Node
+      NAMESPLIT = /^(?:(#{XMLTokens::NCNAME_STR}):)?(#{XMLTokens::NCNAME_STR})/u
+      PARENTS = [ :element, :document, :doctype ]
+      # Create a new element.
+      def initialize node=nil
+        @node = node
+        if node.kind_of? String
+          node = [ :text, node ]
+        elsif node.nil?
+          node = [ :document, nil, nil ]
+        elsif node[0] == :start_element
+          node[0] = :element
+        elsif node[0] == :start_doctype
+          node[0] = :doctype
+        elsif node[0] == :start_document
+          node[0] = :document
+        end
+      end
+
+      def size
+        if PARENTS.include? @node[0]
+          @node[-1].size
+        else
+          0
+        end
+      end
+
+      def each( &block )
+        size.times { |x| yield( at(x+4) ) }
+      end
+
+      def name
+        at(2)
+      end
+
+      def name=( name_str, ns=nil )
+        pfx = ''
+        pfx = "#{prefix(ns)}:" if ns
+        _old_put(2, "#{pfx}#{name_str}")
+      end
+
+      def parent=( node )
+        _old_put(1,node)
+      end
+
+      def local_name
+        namesplit
+        @name
+      end
+
+      def local_name=( name_str )
+        _old_put( 1, "#@prefix:#{name_str}" )
+      end
+
+      def prefix( namespace=nil )
+        prefix_of( self, namespace )
+      end
+
+      def namespace( prefix=prefix() )
+        namespace_of( self, prefix )
+      end
+
+      def namespace=( namespace )
+        @prefix = prefix( namespace )
+        pfx = ''
+        pfx = "#@prefix:" if @prefix.size > 0
+        _old_put(1, "#{pfx}#@name")
+      end
+
+      def []( reference, ns=nil )
+        if reference.kind_of? String
+          pfx = ''
+          pfx = "#{prefix(ns)}:" if ns
+          at(3)["#{pfx}#{reference}"]
+        elsif reference.kind_of? Range
+          _old_get( Range.new(4+reference.begin, reference.end, reference.exclude_end?) )
+        else
+          _old_get( 4+reference )
+        end
+      end
+
+      def =~( path )
+        XPath.match( self, path )
+      end
+
+      # Doesn't handle namespaces yet
+      def []=( reference, ns, value=nil )
+        if reference.kind_of? String
+          value = ns unless value
+          at( 3 )[reference] = value
+        elsif reference.kind_of? Range
+          _old_put( Range.new(3+reference.begin, reference.end, reference.exclude_end?), ns )
+        else
+          if value
+            _old_put( 4+reference, ns, value )
+          else
+            _old_put( 4+reference, ns )
+          end
+        end
+      end
+
+      # Append a child to this element, optionally under a provided namespace.
+      # The namespace argument is ignored if the element argument is an Element
+      # object.  Otherwise, the element argument is a string, the namespace (if
+      # provided) is the namespace the element is created in.
+      def << element
+        if node_type() == :text
+          at(-1) << element
+        else
+          newnode = Node.new( element )
+          newnode.parent = self
+          self.push( newnode )
+        end
+        at(-1)
+      end
+
+      def node_type
+        _old_get(0)
+      end
+
+      def text=( foo )
+        replace = at(4).kind_of?(String)? 1 : 0
+        self._old_put(4,replace, normalizefoo)
+      end
+
+      def root
+        context = self
+        context = context.at(1) while context.at(1)
+      end
+
+      def has_name?( name, namespace = '' )
+        at(3) == name and namespace() == namespace
+      end
+
+      def children
+        self
+      end
+
+      def parent
+        at(1)
+      end
+
+      def to_s
+
+      end
+
+      private
+
+      def namesplit
+        return if @name.defined?
+        at(2) =~ NAMESPLIT
+        @prefix = '' || $1
+        @name = $2
+      end
+
+      def namespace_of( node, prefix=nil )
+        if not prefix
+          name = at(2)
+          name =~ NAMESPLIT
+          prefix = $1
+        end
+        to_find = 'xmlns'
+        to_find = "xmlns:#{prefix}" if not prefix.nil?
+        ns = at(3)[ to_find ]
+        ns ? ns : namespace_of( @node[0], prefix )
+      end
+
+      def prefix_of( node, namespace=nil )
+        if not namespace
+          name = node.name
+          name =~ NAMESPLIT
+          $1
+        else
+          ns = at(3).find { |k,v| v == namespace }
+          ns ? ns : prefix_of( node.parent, namespace )
+        end
+      end
+    end
+  end
 end
diff --git a/lib/rexml/namespace.rb b/lib/rexml/namespace.rb
index 3e8790580b..aeb339ee83 100644
--- a/lib/rexml/namespace.rb
+++ b/lib/rexml/namespace.rb
@@ -1,47 +1,47 @@
 require 'rexml/xmltokens'
 
 module REXML
-	# Adds named attributes to an object.
-	module Namespace
-		# The name of the object, valid if set
-		attr_reader :name, :expanded_name
-		# The expanded name of the object, valid if name is set
-		attr_accessor :prefix
-		include XMLTokens
-		NAMESPLIT = /^(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})/u
+  # Adds named attributes to an object.
+  module Namespace
+    # The name of the object, valid if set
+    attr_reader :name, :expanded_name
+    # The expanded name of the object, valid if name is set
+    attr_accessor :prefix
+    include XMLTokens
+    NAMESPLIT = /^(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})/u
 
-		# Sets the name and the expanded name
-		def name=( name )
-			@expanded_name = name
-			name =~ NAMESPLIT
-			if $1
-				@prefix = $1
-			else
-				@prefix = ""
-				@namespace = ""
-			end
-			@name = $2
-		end
+    # Sets the name and the expanded name
+    def name=( name )
+      @expanded_name = name
+      name =~ NAMESPLIT
+      if $1
+        @prefix = $1
+      else
+        @prefix = ""
+        @namespace = ""
+      end
+      @name = $2
+    end
 
-		# Compares names optionally WITH namespaces
-		def has_name?( other, ns=nil )
-			if ns
-				return (namespace() == ns and name() == other)
-			elsif other.include? ":"
-				return fully_expanded_name == other
-			else
-				return name == other
-			end
-		end
+    # Compares names optionally WITH namespaces
+    def has_name?( other, ns=nil )
+      if ns
+        return (namespace() == ns and name() == other)
+      elsif other.include? ":"
+        return fully_expanded_name == other
+      else
+        return name == other
+      end
+    end
 
-		alias :local_name :name
+    alias :local_name :name
 
-		# Fully expand the name, even if the prefix wasn't specified in the
-		# source file.
-		def fully_expanded_name
-			ns = prefix
-			return "#{ns}:#@name" if ns.size > 0 
-			return @name
-		end
-	end
+    # Fully expand the name, even if the prefix wasn't specified in the
+    # source file.
+    def fully_expanded_name
+      ns = prefix
+      return "#{ns}:#@name" if ns.size > 0
+      return @name
+    end
+  end
 end
diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb
index 9780376829..85457f1ad0 100644
--- a/lib/rexml/node.rb
+++ b/lib/rexml/node.rb
@@ -3,63 +3,63 @@ require "rexml/formatters/pretty"
 require "rexml/formatters/default"
 
 module REXML
-	# Represents a node in the tree.  Nodes are never encountered except as
-	# superclasses of other objects.  Nodes have siblings.
-	module Node
-		# @return the next sibling (nil if unset)
-		def next_sibling_node
-			return nil if @parent.nil?
-			@parent[ @parent.index(self) + 1 ]
-		end
+  # Represents a node in the tree.  Nodes are never encountered except as
+  # superclasses of other objects.  Nodes have siblings.
+  module Node
+    # @return the next sibling (nil if unset)
+    def next_sibling_node
+      return nil if @parent.nil?
+      @parent[ @parent.index(self) + 1 ]
+    end
 
-		# @return the previous sibling (nil if unset)
-		def previous_sibling_node
-			return nil if @parent.nil?
-			ind = @parent.index(self)
-			return nil if ind == 0
-			@parent[ ind - 1 ]
-		end
+    # @return the previous sibling (nil if unset)
+    def previous_sibling_node
+      return nil if @parent.nil?
+      ind = @parent.index(self)
+      return nil if ind == 0
+      @parent[ ind - 1 ]
+    end
 
     # indent::
     #   *DEPRECATED* This parameter is now ignored.  See the formatters in the
     #   REXML::Formatters package for changing the output style.
-		def to_s indent=nil
+    def to_s indent=nil
       unless indent.nil?
         Kernel.warn( "#{self.class.name}.to_s(indent) parameter is deprecated" )
         f = REXML::Formatters::Pretty.new( indent )
-        f.write( self, rv, indent )
+        f.write( self, rv = "" )
       else
         f = REXML::Formatters::Default.new
         f.write( self, rv = "" )
       end
       return rv
-		end
+    end
 
-		def indent to, ind
+    def indent to, ind
  			if @parent and @parent.context and not @parent.context[:indentstyle].nil? then
  				indentstyle = @parent.context[:indentstyle]
  			else
  				indentstyle = '  '
  			end
  			to << indentstyle*ind unless ind<1
-		end
+    end
 
-		def parent?
-			false;
-		end
+    def parent?
+      false;
+    end
 
 
-		# Visit all subnodes of +self+ recursively
-		def each_recursive(&block) # :yields: node
-			self.elements.each {|node|
-				block.call(node)
-				node.each_recursive(&block)
-			}
-		end
+    # Visit all subnodes of +self+ recursively
+    def each_recursive(&block) # :yields: node
+      self.elements.each {|node|
+        block.call(node)
+        node.each_recursive(&block)
+      }
+    end
 
-		# Find (and return) first subnode (recursively) for which the block 
+    # Find (and return) first subnode (recursively) for which the block
     # evaluates to true. Returns +nil+ if none was found.
-		def find_first_recursive(&block) # :yields: node
+    def find_first_recursive(&block) # :yields: node
       each_recursive {|node|
         return node if block.call(node)
       }
@@ -71,5 +71,5 @@ module REXML
     def index_in_parent
       parent.index(self)+1
     end
-	end
+  end
 end
diff --git a/lib/rexml/output.rb b/lib/rexml/output.rb
index be4d23d42d..b7f17b9dff 100644
--- a/lib/rexml/output.rb
+++ b/lib/rexml/output.rb
@@ -1,24 +1,24 @@
 require 'rexml/encoding'
 
 module REXML
-	class Output
-		include Encoding
-    
+  class Output
+    include Encoding
+
     attr_reader :encoding
 
-		def initialize real_IO, encd="iso-8859-1"
-			@output = real_IO
-			self.encoding = encd
+    def initialize real_IO, encd="iso-8859-1"
+      @output = real_IO
+      self.encoding = encd
 
-			@to_utf = encd == UTF_8 ? false : true
-		end
+      @to_utf = encd == UTF_8 ? false : true
+    end
 
-		def <<( content )
-			@output << (@to_utf ? self.encode(content) : content)
-		end
+    def <<( content )
+      @output << (@to_utf ? self.encode(content) : content)
+    end
 
     def to_s
       "Output[#{encoding}]"
     end
-	end
+  end
 end
diff --git a/lib/rexml/parent.rb b/lib/rexml/parent.rb
index a20aaaef6b..0a9f805109 100644
--- a/lib/rexml/parent.rb
+++ b/lib/rexml/parent.rb
@@ -6,14 +6,14 @@ module REXML
   # object.
   class Parent < Child
     include Enumerable
-    
+
     # Constructor
     # @param parent if supplied, will be set as the parent of this object
     def initialize parent=nil
       super(parent)
       @children = []
     end
-    
+
     def add( object )
       #puts "PARENT GOTS #{size} CHILDREN"
       object.parent = self
@@ -21,47 +21,48 @@ module REXML
       #puts "PARENT NOW GOTS #{size} CHILDREN"
       object
     end
-    
+
     alias :push :add
     alias :<< :push
-    
+
     def unshift( object )
       object.parent = self
       @children.unshift object
     end
-    
+
     def delete( object )
       found = false
       @children.delete_if {|c| c.equal?(object) and found = true }
       object.parent = nil if found
+      found ? object : nil
     end
-    
+
     def each(&block)
       @children.each(&block)
     end
-    
+
     def delete_if( &block )
       @children.delete_if(&block)
     end
-    
+
     def delete_at( index )
       @children.delete_at index
     end
-    
+
     def each_index( &block )
       @children.each_index(&block)
     end
-    
+
     # Fetches a child at a given index
     # @param index the Integer index of the child to fetch
     def []( index )
       @children[index]
     end
-    
+
     alias :each_child :each
-    
-    
-    
+
+
+
     # Set an index entry.  See Array.[]=
     # @param index the index of the element to set
     # @param opt either the object to set, or an Integer length
@@ -71,7 +72,7 @@ module REXML
       args[-1].parent = self
       @children[*args[0..-2]] = args[-1]
     end
-    
+
     # Inserts an child before another child
     # @param child1 this is either an xpath or an Element.  If an Element,
     # child2 will be inserted before child1 in the child list of the parent.
@@ -91,7 +92,7 @@ module REXML
       end
       self
     end
-    
+
     # Inserts an child after another child
     # @param child1 this is either an xpath or an Element.  If an Element,
     # child2 will be inserted after child1 in the child list of the parent.
@@ -111,11 +112,11 @@ module REXML
       end
       self
     end
-    
+
     def to_a
       @children.dup
     end
-    
+
     # Fetches the index of a given child
     # @param child the child to get the index of
     # @return the index of the child, or nil if the object is not a child
@@ -125,24 +126,24 @@ module REXML
       @children.find { |i| count += 1 ; i.hash == child.hash }
       count
     end
-    
+
     # @return the number of children of this parent
     def size
       @children.size
     end
-    
+
     alias :length :size
-    
+
     # Replaces one child with another, making sure the nodelist is correct
     # @param to_replace the child to replace (must be a Child)
-    # @param replacement the child to insert into the nodelist (must be a 
+    # @param replacement the child to insert into the nodelist (must be a
     # Child)
     def replace_child( to_replace, replacement )
       @children.map! {|c| c.equal?( to_replace ) ? replacement : c }
       to_replace.parent = nil
       replacement.parent = self
     end
-    
+
     # Deeply clones this object.  This creates a complete duplicate of this
     # Parent, including all descendants.
     def deep_clone
@@ -156,9 +157,9 @@ module REXML
       end
       cl
     end
-    
+
     alias :children :to_a
-    
+
     def parent?
       true
     end
diff --git a/lib/rexml/parseexception.rb b/lib/rexml/parseexception.rb
index feb7a7e638..0481f72818 100644
--- a/lib/rexml/parseexception.rb
+++ b/lib/rexml/parseexception.rb
@@ -30,7 +30,7 @@ module REXML
         err << "Last 80 unconsumed characters:\n"
         err << @source.buffer[0..80].gsub(/\n/, ' ')
       end
-      
+
       err
     end
 
@@ -40,12 +40,12 @@ module REXML
     end
 
     def line
-      @source.current_line[2] if @source and defined? @source.current_line and 
+      @source.current_line[2] if @source and defined? @source.current_line and
       @source.current_line
     end
 
     def context
       @source.current_line
     end
-  end  
+  end
 end
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index fc2354a67f..ade35d7921 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -25,15 +25,21 @@ module REXML
     #
     # Nat Price gave me some good ideas for the API.
     class BaseParser
-      NCNAME_STR= '[\w:][\-\w\d.]*'
+      LETTER = '[:alpha:]'
+      DIGIT = '[:digit:]'
+
+      COMBININGCHAR = '' # TODO
+      EXTENDER = ''      # TODO
+
+      NCNAME_STR= "[#{LETTER}_:][-[:alnum:]._:#{COMBININGCHAR}#{EXTENDER}]*"
       NAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})"
       UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
 
-      NAMECHAR = '[\-\w\d\.:]'
+      NAMECHAR = '[\-\w\.:]'
       NAME = "([\\w:]#{NAMECHAR}*)"
       NMTOKEN = "(?:#{NAMECHAR})+"
       NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
-      REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
+      REFERENCE = "&(?:#{NAME};|#\\d+;|#x[0-9a-fA-F]+;)"
       REFERENCE_RE = /#{REFERENCE}/
 
       DOCTYPE_START = /\A\s*<!DOCTYPE\s/um
@@ -53,7 +59,7 @@ module REXML
 
       VERSION = /\bversion\s*=\s*["'](.*?)['"]/um
       ENCODING = /\bencoding\s*=\s*["'](.*?)['"]/um
-      STANDALONE = /\bstandalone\s*=\s["'](.*?)['"]/um
+      STANDALONE = /\bstandalone\s*=\s*["'](.*?)['"]/um
 
       ENTITY_START = /^\s*<!ENTITY/
       IDENTITY = /^([!\*\w\-]+)(\s+#{NCNAME_STR})?(\s+["'](.*?)['"])?(\s+['"](.*?)["'])?/u
@@ -92,11 +98,11 @@ module REXML
 
       EREFERENCE = /&(?!#{NAME};)/
 
-      DEFAULT_ENTITIES = { 
-        'gt' => [/&gt;/, '&gt;', '>', />/], 
-        'lt' => [/&lt;/, '&lt;', '<', /</], 
-        'quot' => [/&quot;/, '&quot;', '"', /"/], 
-        "apos" => [/&apos;/, "&apos;", "'", /'/] 
+      DEFAULT_ENTITIES = {
+        'gt' => [/&gt;/, '&gt;', '>', />/],
+        'lt' => [/&lt;/, '&lt;', '<', /</],
+        'quot' => [/&quot;/, '&quot;', '"', /"/],
+        "apos" => [/&apos;/, "&apos;", "'", /'/]
       }
 
 
@@ -167,9 +173,9 @@ module REXML
       # Peek at the +depth+ event in the stack.  The first element on the stack
       # is at depth 0.  If +depth+ is -1, will parse to the end of the input
       # stream and return the last event, which is always :end_document.
-      # Be aware that this causes the stream to be parsed up to the +depth+ 
-      # event, so you can effectively pre-parse the entire document (pull the 
-      # entire thing into memory) using this method.  
+      # Be aware that this causes the stream to be parsed up to the +depth+
+      # event, so you can effectively pre-parse the entire document (pull the
+      # entire thing into memory) using this method.
       def peek depth=0
         raise %Q[Illegal argument "#{depth}"] if depth < -1
         temp = []
@@ -242,12 +248,17 @@ module REXML
             @document_status = :after_doctype
             @source.read if @source.buffer.size<2
             md = @source.match(/\s*/um, true)
+            if @source.encoding == "UTF-8"
+              if @source.buffer.respond_to? :force_encoding
+                @source.buffer.force_encoding(Encoding::UTF_8)
+              end
+            end
           end
         end
         if @document_status == :in_doctype
           md = @source.match(/\s*(.*?>)/um)
           case md[1]
-          when SYSTEMENTITY 
+          when SYSTEMENTITY
             match = @source.match( SYSTEMENTITY, true )[1]
             return [ :externalentity, match ]
 
@@ -326,7 +337,7 @@ module REXML
               #md = @source.match_to_consume( '>', CLOSE_MATCH)
               md = @source.match( CLOSE_MATCH, true )
               raise REXML::ParseException.new( "Missing end tag for "+
-                "'#{last_tag}' (got \"#{md[1]}\")", 
+                "'#{last_tag}' (got \"#{md[1]}\")",
                 @source) unless last_tag == md[1]
               return [ :end_element, last_tag ]
             elsif @source.buffer[1] == ?!
@@ -335,6 +346,12 @@ module REXML
               raise REXML::ParseException.new("Malformed node", @source) unless md
               if md[0][2] == ?-
                 md = @source.match( COMMENT_PATTERN, true )
+
+                case md[1]
+                when /--/, /-$/
+                  raise REXML::ParseException.new("Malformed comment", @source)
+                end
+
                 return [ :comment, md[1] ] if md
               else
                 md = @source.match( CDATA_PATTERN, true )
@@ -353,7 +370,7 @@ module REXML
               unless md
                 # Check for missing attribute quotes
                 raise REXML::ParseException.new("missing attribute quote", @source) if @source.match(MISSING_ATTRIBUTE_QUOTES )
-                raise REXML::ParseException.new("malformed XML: missing tag start", @source) 
+                raise REXML::ParseException.new("malformed XML: missing tag start", @source)
               end
               attributes = {}
               prefixes = Set.new
@@ -362,7 +379,7 @@ module REXML
               if md[4].size > 0
                 attrs = md[4].scan( ATTRIBUTE_PATTERN )
                 raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
-                attrs.each { |a,b,c,d,e| 
+                attrs.each { |a,b,c,d,e|
                   if b == "xmlns"
                     if c == "xml"
                       if d != "http://www.w3.org/XML/1998/namespace"
@@ -379,10 +396,16 @@ module REXML
                   elsif b
                     prefixes << b unless b == "xml"
                   end
-                  attributes[a] = e 
+
+                  if attributes.has_key? a
+                    msg = "Duplicate attribute #{a.inspect}"
+                    raise REXML::ParseException.new( msg, @source, self)
+                  end
+
+                  attributes[a] = e
                 }
               end
-        
+
               # Verify that all of the prefixes have been defined
               for prefix in prefixes
                 unless @nsstack.find{|k| k.member?(prefix)}
@@ -436,7 +459,7 @@ module REXML
         # Doing it like this rather than in a loop improves the speed
         copy.gsub!( EREFERENCE, '&amp;' )
         entities.each do |key, value|
-          copy.gsub!( value, "&#{key};" ) unless entity_filter and 
+          copy.gsub!( value, "&#{key};" ) unless entity_filter and
                                       entity_filter.include?(entity)
         end if entities
         copy.gsub!( EREFERENCE, '&amp;' )
@@ -452,7 +475,7 @@ module REXML
         rv.gsub!( /\r\n?/, "\n" )
         matches = rv.scan( REFERENCE_RE )
         return rv if matches.size == 0
-        rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {|m|
+        rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {
           m=$1
           m = "0#{m}" if m[0] == ?x
           [Integer(m)].pack('U*')
@@ -465,15 +488,12 @@ module REXML
               if entity_value
                 re = /&#{entity_reference};/
                 rv.gsub!( re, entity_value )
+              else
+                er = DEFAULT_ENTITIES[entity_reference]
+                rv.gsub!( er[0], er[2] ) if er
               end
             end
           end
-          matches.each do |entity_reference|
-            unless filter and filter.include?(entity_reference)
-              er = DEFAULT_ENTITIES[entity_reference]
-              rv.gsub!( er[0], er[2] ) if er
-            end
-          end
           rv.gsub!( /&amp;/, '&' )
         end
         rv
diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb
index 0f35034993..ca9692c449 100644
--- a/lib/rexml/parsers/lightparser.rb
+++ b/lib/rexml/parsers/lightparser.rb
@@ -3,12 +3,12 @@ require 'rexml/parsers/baseparser'
 require 'rexml/light/node'
 
 module REXML
-	module Parsers
-		class LightParser
-			def initialize stream
-				@stream = stream
-				@parser = REXML::Parsers::BaseParser.new( stream )
-			end
+  module Parsers
+    class LightParser
+      def initialize stream
+        @stream = stream
+        @parser = REXML::Parsers::BaseParser.new( stream )
+      end
 
       def add_listener( listener )
         @parser.add_listener( listener )
@@ -19,42 +19,40 @@ module REXML
         @parser.stream = @stream
       end
 
-			def parse
-				root = context = [ :document ]
-				while true
-					event = @parser.pull
-					case event[0]
-					when :end_document
-						break
-					when :end_doctype
-						context = context[1]
-					when :start_element, :start_doctype
-						new_node = event
-						context << new_node
-						new_node[1,0] = [context]
-						context = new_node
-					when :end_element, :end_doctype
-						context = context[1]
-					else
-						new_node = event
-						context << new_node
-						new_node[1,0] = [context]
-					end
-				end
-				root
-			end
-		end
+      def parse
+        root = context = [ :document ]
+        while true
+          event = @parser.pull
+          case event[0]
+          when :end_document
+            break
+          when :start_element, :start_doctype
+            new_node = event
+            context << new_node
+            new_node[1,0] = [context]
+            context = new_node
+          when :end_element, :end_doctype
+            context = context[1]
+          else
+            new_node = event
+            context << new_node
+            new_node[1,0] = [context]
+          end
+        end
+        root
+      end
+    end
 
-		# An element is an array.  The array contains:
-		#  0			The parent element
-		#  1			The tag name
-		#  2			A hash of attributes
-		#  3..-1	The child elements
-		# An element is an array of size > 3
-		# Text is a String
-		# PIs are [ :processing_instruction, target, data ]
-		# Comments are [ :comment, data ]
-		# DocTypes are DocType structs
-		# The root is an array with XMLDecls, Text, DocType, Array, Text
-	end
+    # An element is an array.  The array contains:
+    #  0			The parent element
+    #  1			The tag name
+    #  2			A hash of attributes
+    #  3..-1	The child elements
+    # An element is an array of size > 3
+    # Text is a String
+    # PIs are [ :processing_instruction, target, data ]
+    # Comments are [ :comment, data ]
+    # DocTypes are DocType structs
+    # The root is an array with XMLDecls, Text, DocType, Array, Text
+  end
 end
diff --git a/lib/rexml/parsers/pullparser.rb b/lib/rexml/parsers/pullparser.rb
index 36dc7160c3..68a4ff7eae 100644
--- a/lib/rexml/parsers/pullparser.rb
+++ b/lib/rexml/parsers/pullparser.rb
@@ -68,7 +68,7 @@ module REXML
         event = @parser.pull
         case event[0]
         when :entitydecl
-          @entities[ event[1] ] = 
+          @entities[ event[1] ] =
             event[2] unless event[2] =~ /PUBLIC|SYSTEM/
         when :text
           unnormalized = @parser.unnormalize( event[1], @entities )
diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb
index e402eb7747..d0f0c5155e 100644
--- a/lib/rexml/parsers/sax2parser.rb
+++ b/lib/rexml/parsers/sax2parser.rb
@@ -4,162 +4,171 @@ require 'rexml/namespace'
 require 'rexml/text'
 
 module REXML
-	module Parsers
+  module Parsers
     # SAX2Parser
-		class SAX2Parser
-			def initialize source
-				@parser = BaseParser.new(source)
-				@listeners = []
-				@procs = []
-				@namespace_stack = []
-				@has_listeners = false
-				@tag_stack = []
+    class SAX2Parser
+      def initialize source
+        @parser = BaseParser.new(source)
+        @listeners = []
+        @procs = []
+        @namespace_stack = []
+        @has_listeners = false
+        @tag_stack = []
         @entities = {}
-			end
+      end
 
       def source
         @parser.source
       end
-			
+
       def add_listener( listener )
         @parser.add_listener( listener )
       end
 
-			# Listen arguments:
-			#
-			# Symbol, Array, Block
-			# 	Listen to Symbol events on Array elements
-			# Symbol, Block
-			#   Listen to Symbol events
-			# Array, Listener
-			# 	Listen to all events on Array elements
-			# Array, Block
-			# 	Listen to :start_element events on Array elements
-			# Listener
-			# 	Listen to All events
-			#
-			# Symbol can be one of: :start_element, :end_element,
-			# :start_prefix_mapping, :end_prefix_mapping, :characters,
-			# :processing_instruction, :doctype, :attlistdecl, :elementdecl,
-			# :entitydecl, :notationdecl, :cdata, :xmldecl, :comment
+      # Listen arguments:
+      #
+      # Symbol, Array, Block
+      # 	Listen to Symbol events on Array elements
+      # Symbol, Block
+      #   Listen to Symbol events
+      # Array, Listener
+      # 	Listen to all events on Array elements
+      # Array, Block
+      # 	Listen to :start_element events on Array elements
+      # Listener
+      # 	Listen to All events
+      #
+      # Symbol can be one of: :start_element, :end_element,
+      # :start_prefix_mapping, :end_prefix_mapping, :characters,
+      # :processing_instruction, :doctype, :attlistdecl, :elementdecl,
+      # :entitydecl, :notationdecl, :cdata, :xmldecl, :comment
       #
       # There is an additional symbol that can be listened for: :progress.
-      # This will be called for every event generated, passing in the current 
+      # This will be called for every event generated, passing in the current
       # stream position.
-			#
-			# Array contains regular expressions or strings which will be matched
-			# against fully qualified element names.
-			#
-			# Listener must implement the methods in SAX2Listener
-			#
-			# Block will be passed the same arguments as a SAX2Listener method would
-			# be, where the method name is the same as the matched Symbol.
-			# See the SAX2Listener for more information.
-			def listen( *args, &blok )
-				if args[0].kind_of? Symbol
-					if args.size == 2
-						args[1].each { |match| @procs << [args[0], match, blok] }
-					else
-						add( [args[0], nil, blok] )
-					end
-				elsif args[0].kind_of? Array
-					if args.size == 2
-						args[0].each { |match| add( [nil, match, args[1]] ) }
-					else
-						args[0].each { |match| add( [ :start_element, match, blok ] ) }
-					end
-				else
-					add([nil, nil, args[0]])
-				end
-			end
-			
-			def deafen( listener=nil, &blok )
-				if listener
-					@listeners.delete_if {|item| item[-1] == listener }
-					@has_listeners = false if @listeners.size == 0
-				else
-					@procs.delete_if {|item| item[-1] == blok }
-				end
-			end
-			
-			def parse
-				@procs.each { |sym,match,block| block.call if sym == :start_document }
-				@listeners.each { |sym,match,block| 
-					block.start_document if sym == :start_document or sym.nil?
-				}
-				root = context = []
-				while true
-					event = @parser.pull
-					case event[0]
-					when :end_document
-						handle( :end_document )
-						break
+      #
+      # Array contains regular expressions or strings which will be matched
+      # against fully qualified element names.
+      #
+      # Listener must implement the methods in SAX2Listener
+      #
+      # Block will be passed the same arguments as a SAX2Listener method would
+      # be, where the method name is the same as the matched Symbol.
+      # See the SAX2Listener for more information.
+      def listen( *args, &blok )
+        if args[0].kind_of? Symbol
+          if args.size == 2
+            args[1].each { |match| @procs << [args[0], match, blok] }
+          else
+            add( [args[0], nil, blok] )
+          end
+        elsif args[0].kind_of? Array
+          if args.size == 2
+            args[0].each { |match| add( [nil, match, args[1]] ) }
+          else
+            args[0].each { |match| add( [ :start_element, match, blok ] ) }
+          end
+        else
+          add([nil, nil, args[0]])
+        end
+      end
+
+      def deafen( listener=nil, &blok )
+        if listener
+          @listeners.delete_if {|item| item[-1] == listener }
+          @has_listeners = false if @listeners.size == 0
+        else
+          @procs.delete_if {|item| item[-1] == blok }
+        end
+      end
+
+      def parse
+        @procs.each { |sym,match,block| block.call if sym == :start_document }
+        @listeners.each { |sym,match,block|
+          block.start_document if sym == :start_document or sym.nil?
+        }
+        root = context = []
+        while true
+          event = @parser.pull
+          case event[0]
+          when :end_document
+            handle( :end_document )
+            break
           when :start_doctype
             handle( :doctype, *event[1..-1])
-					when :end_doctype
-						context = context[1]
-					when :start_element
-						@tag_stack.push(event[1])
-						# find the observers for namespaces
-						procs = get_procs( :start_prefix_mapping, event[1] )
-						listeners = get_listeners( :start_prefix_mapping, event[1] )
-						if procs or listeners
-							# break out the namespace declarations
-							# The attributes live in event[2]
-							event[2].each {|n, v| event[2][n] = @parser.normalize(v)}
-							nsdecl = event[2].find_all { |n, value| n =~ /^xmlns(:|$)/ }
-							nsdecl.collect! { |n, value| [ n[6..-1], value ] }
-							@namespace_stack.push({})
-							nsdecl.each do |n,v|
-								@namespace_stack[-1][n] = v
-								# notify observers of namespaces
-								procs.each { |ob| ob.call( n, v ) } if procs
-								listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners
-							end
-						end
-						event[1] =~ Namespace::NAMESPLIT
-						prefix = $1
-						local = $2
-						uri = get_namespace(prefix)
-						# find the observers for start_element
-						procs = get_procs( :start_element, event[1] )
-						listeners = get_listeners( :start_element, event[1] )
-						# notify observers
-						procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs
-						listeners.each { |ob| 
-							ob.start_element( uri, local, event[1], event[2] ) 
-						} if listeners
-					when :end_element
-						@tag_stack.pop
-						event[1] =~ Namespace::NAMESPLIT
-						prefix = $1
-						local = $2
-						uri = get_namespace(prefix)
-						# find the observers for start_element
-						procs = get_procs( :end_element, event[1] )
-						listeners = get_listeners( :end_element, event[1] )
-						# notify observers
-						procs.each { |ob| ob.call( uri, local, event[1] ) } if procs
-						listeners.each { |ob| 
-							ob.end_element( uri, local, event[1] ) 
-						} if listeners
+          when :end_doctype
+            context = context[1]
+          when :start_element
+            @tag_stack.push(event[1])
+            # find the observers for namespaces
+            procs = get_procs( :start_prefix_mapping, event[1] )
+            listeners = get_listeners( :start_prefix_mapping, event[1] )
+            if procs or listeners
+              # break out the namespace declarations
+              # The attributes live in event[2]
+              event[2].each {|n, v| event[2][n] = @parser.normalize(v)}
+              nsdecl = event[2].find_all { |n, value| n =~ /^xmlns(:|$)/ }
+              nsdecl.collect! { |n, value| [ n[6..-1], value ] }
+              @namespace_stack.push({})
+              nsdecl.each do |n,v|
+                @namespace_stack[-1][n] = v
+                # notify observers of namespaces
+                procs.each { |ob| ob.call( n, v ) } if procs
+                listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners
+              end
+            end
+            event[1] =~ Namespace::NAMESPLIT
+            prefix = $1
+            local = $2
+            uri = get_namespace(prefix)
+            # find the observers for start_element
+            procs = get_procs( :start_element, event[1] )
+            listeners = get_listeners( :start_element, event[1] )
+            # notify observers
+            procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs
+            listeners.each { |ob|
+              ob.start_element( uri, local, event[1], event[2] )
+            } if listeners
+          when :end_element
+            @tag_stack.pop
+            event[1] =~ Namespace::NAMESPLIT
+            prefix = $1
+            local = $2
+            uri = get_namespace(prefix)
+            # find the observers for start_element
+            procs = get_procs( :end_element, event[1] )
+            listeners = get_listeners( :end_element, event[1] )
+            # notify observers
+            procs.each { |ob| ob.call( uri, local, event[1] ) } if procs
+            listeners.each { |ob|
+              ob.end_element( uri, local, event[1] )
+            } if listeners
 
-						namespace_mapping = @namespace_stack.pop
-						# find the observers for namespaces
-						procs = get_procs( :end_prefix_mapping, event[1] )
-						listeners = get_listeners( :end_prefix_mapping, event[1] )
-						if procs or listeners
-							namespace_mapping.each do |prefix, uri|
-								# notify observers of namespaces
-								procs.each { |ob| ob.call( prefix ) } if procs
-								listeners.each { |ob| ob.end_prefix_mapping(prefix) } if listeners
-							end
-						end
-					when :text
+            namespace_mapping = @namespace_stack.pop
+            # find the observers for namespaces
+            procs = get_procs( :end_prefix_mapping, event[1] )
+            listeners = get_listeners( :end_prefix_mapping, event[1] )
+            if procs or listeners
+              namespace_mapping.each do |ns_prefix, ns_uri|
+                # notify observers of namespaces
+                procs.each { |ob| ob.call( ns_prefix ) } if procs
+                listeners.each { |ob| ob.end_prefix_mapping(ns_prefix) } if listeners
+              end
+            end
+          when :text
             #normalized = @parser.normalize( event[1] )
             #handle( :characters, normalized )
             copy = event[1].clone
-            @entities.each { |key, value| copy = copy.gsub("&#{key};", value) }
+
+            esub = proc { |match|
+              if @entities.has_key?($1)
+                @entities[$1].gsub(Text::REFERENCE, &esub)
+              else
+                match
+              end
+            }
+
+            copy.gsub!( Text::REFERENCE, &esub )
             copy.gsub!( Text::NUMERICENTITY ) {|m|
               m=$1
               m = "0#{m}" if m[0] == ?x
@@ -168,71 +177,71 @@ module REXML
             handle( :characters, copy )
           when :entitydecl
             @entities[ event[1] ] = event[2] if event.size == 3
-						handle( *event )
-					when :processing_instruction, :comment, :attlistdecl, 
-						:elementdecl, :cdata, :notationdecl, :xmldecl
-						handle( *event )
-					end
+            handle( *event )
+          when :processing_instruction, :comment, :attlistdecl,
+            :elementdecl, :cdata, :notationdecl, :xmldecl
+            handle( *event )
+          end
           handle( :progress, @parser.position )
-				end
-			end
+        end
+      end
 
-			private
-			def handle( symbol, *arguments )
-				tag = @tag_stack[-1]
-				procs = get_procs( symbol, tag )
-				listeners = get_listeners( symbol, tag )
-				# notify observers
-				procs.each { |ob| ob.call( *arguments ) } if procs
-				listeners.each { |l| 
-					l.send( symbol.to_s, *arguments ) 
-				} if listeners
-			end
+      private
+      def handle( symbol, *arguments )
+        tag = @tag_stack[-1]
+        procs = get_procs( symbol, tag )
+        listeners = get_listeners( symbol, tag )
+        # notify observers
+        procs.each { |ob| ob.call( *arguments ) } if procs
+        listeners.each { |l|
+          l.send( symbol.to_s, *arguments )
+        } if listeners
+      end
 
-			# The following methods are duplicates, but it is faster than using
-			# a helper
-			def get_procs( symbol, name )
-				return nil if @procs.size == 0
-				@procs.find_all do |sym, match, block|
+      # The following methods are duplicates, but it is faster than using
+      # a helper
+      def get_procs( symbol, name )
+        return nil if @procs.size == 0
+        @procs.find_all do |sym, match, block|
           #puts sym.inspect+"=="+symbol.inspect+ "\t"+match.inspect+"=="+name.inspect+ "\t"+( (sym.nil? or symbol == sym) and ((name.nil? and match.nil?) or match.nil? or ( (name == match) or (match.kind_of? Regexp and name =~ match)))).to_s
-					(
-						(sym.nil? or symbol == sym) and 
-						((name.nil? and match.nil?) or match.nil? or (
-							(name == match) or
-							(match.kind_of? Regexp and name =~ match)
-							)
-						)
-					)
-				end.collect{|x| x[-1]}
-			end
-			def get_listeners( symbol, name )
-				return nil if @listeners.size == 0
-				@listeners.find_all do |sym, match, block|
-					(
-						(sym.nil? or symbol == sym) and 
-						((name.nil? and match.nil?) or match.nil? or (
-							(name == match) or
-							(match.kind_of? Regexp and name =~ match)
-							)
-						)
-					)
-				end.collect{|x| x[-1]}
-			end
+          (
+            (sym.nil? or symbol == sym) and
+            ((name.nil? and match.nil?) or match.nil? or (
+              (name == match) or
+              (match.kind_of? Regexp and name =~ match)
+              )
+            )
+          )
+        end.collect{|x| x[-1]}
+      end
+      def get_listeners( symbol, name )
+        return nil if @listeners.size == 0
+        @listeners.find_all do |sym, match, block|
+          (
+            (sym.nil? or symbol == sym) and
+            ((name.nil? and match.nil?) or match.nil? or (
+              (name == match) or
+              (match.kind_of? Regexp and name =~ match)
+              )
+            )
+          )
+        end.collect{|x| x[-1]}
+      end
 
-			def add( pair )
-				if pair[-1].respond_to? :call
-					@procs << pair unless @procs.include? pair
-				else
-					@listeners << pair unless @listeners.include? pair
-					@has_listeners = true
-				end
-			end
+      def add( pair )
+        if pair[-1].respond_to? :call
+          @procs << pair unless @procs.include? pair
+        else
+          @listeners << pair unless @listeners.include? pair
+          @has_listeners = true
+        end
+      end
 
-			def get_namespace( prefix ) 
+      def get_namespace( prefix )
         uris = (@namespace_stack.find_all { |ns| not ns[prefix].nil? }) ||
-					(@namespace_stack.find { |ns| not ns[nil].nil? })
-				uris[-1][prefix] unless uris.nil? or 0 == uris.size
-			end
-		end
-	end
+          (@namespace_stack.find { |ns| not ns[nil].nil? })
+        uris[-1][prefix] unless uris.nil? or 0 == uris.size
+      end
+    end
+  end
 end
diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb
index 256d0f611c..073fcc2c21 100644
--- a/lib/rexml/parsers/streamparser.rb
+++ b/lib/rexml/parsers/streamparser.rb
@@ -5,11 +5,11 @@ module REXML
         @listener = listener
         @parser = BaseParser.new( source )
       end
-      
+
       def add_listener( listener )
         @parser.add_listener( listener )
       end
-      
+
       def parse
         # entity string
         while true
diff --git a/lib/rexml/parsers/treeparser.rb b/lib/rexml/parsers/treeparser.rb
index 5c3e142ea7..7f618cb319 100644
--- a/lib/rexml/parsers/treeparser.rb
+++ b/lib/rexml/parsers/treeparser.rb
@@ -30,7 +30,10 @@ module REXML
               return
             when :start_element
               tag_stack.push(event[1])
-              el = @build_context = @build_context.add_element( event[1], event[2] )
+              el = @build_context = @build_context.add_element( event[1] )
+              event[2].each do |key, value|
+                el.attributes[key]=Attribute.new(key,value,self)
+              end
             when :end_element
               tag_stack.pop
               @build_context = @build_context.parent
@@ -39,8 +42,8 @@ module REXML
                 if @build_context[-1].instance_of? Text
                   @build_context[-1] << event[1]
                 else
-                  @build_context.add( 
-                    Text.new(event[1], @build_context.whitespace, nil, true) 
+                  @build_context.add(
+                    Text.new(event[1], @build_context.whitespace, nil, true)
                   ) unless (
                     @build_context.ignore_whitespace_nodes and
                     event[1].strip.size==0
diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb
index adc4af18e2..96c55d837e 100644
--- a/lib/rexml/parsers/ultralightparser.rb
+++ b/lib/rexml/parsers/ultralightparser.rb
@@ -2,12 +2,12 @@ require 'rexml/parsers/streamparser'
 require 'rexml/parsers/baseparser'
 
 module REXML
-	module Parsers
-		class UltraLightParser
-			def initialize stream
-				@stream = stream
-				@parser = REXML::Parsers::BaseParser.new( stream )
-			end
+  module Parsers
+    class UltraLightParser
+      def initialize stream
+        @stream = stream
+        @parser = REXML::Parsers::BaseParser.new( stream )
+      end
 
       def add_listener( listener )
         @parser.add_listener( listener )
@@ -18,39 +18,39 @@ module REXML
         @parser.stream = @stream
       end
 
-			def parse
-				root = context = []
-				while true
-					event = @parser.pull
-					case event[0]
-					when :end_document
-						break
-					when :end_doctype
-						context = context[1]
-					when :start_element, :doctype
-						context << event
-						event[1,0] = [context]
-						context = event
-					when :end_element
-						context = context[1]
-					else
-						context << event
-					end
-				end
-				root
-			end
-		end
+      def parse
+        root = context = []
+        while true
+          event = @parser.pull
+          case event[0]
+          when :end_document
+            break
+          when :end_doctype
+            context = context[1]
+          when :start_element, :doctype
+            context << event
+            event[1,0] = [context]
+            context = event
+          when :end_element
+            context = context[1]
+          else
+            context << event
+          end
+        end
+        root
+      end
+    end
 
-		# An element is an array.  The array contains:
-		#  0			The parent element
-		#  1			The tag name
-		#  2			A hash of attributes
-		#  3..-1	The child elements
-		# An element is an array of size > 3
-		# Text is a String
-		# PIs are [ :processing_instruction, target, data ]
-		# Comments are [ :comment, data ]
-		# DocTypes are DocType structs
-		# The root is an array with XMLDecls, Text, DocType, Array, Text
-	end
+    # An element is an array.  The array contains:
+    #  0			The parent element
+    #  1			The tag name
+    #  2			A hash of attributes
+    #  3..-1	The child elements
+    # An element is an array of size > 3
+    # Text is a String
+    # PIs are [ :processing_instruction, target, data ]
+    # Comments are [ :comment, data ]
+    # DocTypes are DocType structs
+    # The root is an array with XMLDecls, Text, DocType, Array, Text
+  end
 end
diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb
index de2530e347..a37dbdd4b6 100644
--- a/lib/rexml/parsers/xpathparser.rb
+++ b/lib/rexml/parsers/xpathparser.rb
@@ -17,8 +17,9 @@ module REXML
       end
 
       def parse path
+        path = path.dup
         path.gsub!(/([\(\[])\s+/, '\1') # Strip ignorable spaces
-        path.gsub!( /\s+([\]\)])/, '\1' )
+        path.gsub!( /\s+([\]\)])/, '\1')
         parsed = []
         path = OrExpr(path, parsed)
         parsed
@@ -39,10 +40,10 @@ module REXML
           case op
           when :node
           when :attribute
-						string << "/" if string.size > 0
-						string << "@"
+            string << "/" if string.size > 0
+            string << "@"
           when :child
-						string << "/" if string.size > 0
+            string << "/" if string.size > 0
           when :descendant_or_self
             string << "/"
           when :self
@@ -51,10 +52,10 @@ module REXML
             string << ".."
           when :any
             string << "*"
-					when :text
-						string << "text()"
-          when :following, :following_sibling, 
-                :ancestor, :ancestor_or_self, :descendant, 
+          when :text
+            string << "text()"
+          when :following, :following_sibling,
+                :ancestor, :ancestor_or_self, :descendant,
                 :namespace, :preceding, :preceding_sibling
             string << "/" unless string.size == 0
             string << op.to_s.tr("_", "-")
@@ -70,13 +71,13 @@ module REXML
             string << ']'
           when :document
             document = true
-					when :function
-						string << path.shift
-						string << "( "
-						string << predicate_to_string( path.shift[0] ) {|x| abbreviate( x )}
-						string << " )"
-					when :literal
-						string << %Q{ "#{path.shift}" }
+          when :function
+            string << path.shift
+            string << "( "
+            string << predicate_to_string( path.shift[0] ) {|x| abbreviate( x )}
+            string << " )"
+          when :literal
+            string << %Q{ "#{path.shift}" }
           else
             string << "/" unless string.size == 0
             string << "UNKNOWN("
@@ -84,7 +85,7 @@ module REXML
             string << ")"
           end
         end
-				string = "/"+string if document
+        string = "/"+string if document
         return string
       end
 
@@ -97,7 +98,7 @@ module REXML
           case op
           when :node
             string << "node()"
-          when :attribute, :child, :following, :following_sibling, 
+          when :attribute, :child, :following, :following_sibling,
                 :ancestor, :ancestor_or_self, :descendant, :descendant_or_self,
                 :namespace, :preceding, :preceding_sibling, :self, :parent
             string << "/" unless string.size == 0
@@ -249,7 +250,7 @@ module REXML
 
             parsed.concat(n)
           end
-          
+
           if path.size > 0
             if path[0] == ?/
               if path[1] == ?/
@@ -332,12 +333,12 @@ module REXML
           predicates << expr[1..-2] if expr
         end
         #puts "PREDICATES = #{predicates.inspect}"
-        predicates.each{ |expr| 
-          #puts "ORING #{expr}"
+        predicates.each{ |pred|
+          #puts "ORING #{pred}"
           preds = []
           parsed << :predicate
           parsed << preds
-          OrExpr(expr, preds) 
+          OrExpr(pred, preds)
         }
         #puts "PREDICATES = #{predicates.inspect}"
         path
@@ -551,7 +552,7 @@ module REXML
           end
         end
         #puts "BEFORE WITH '#{rest}'"
-        rest = LocationPath(rest, n) if rest =~ /\A[\/\.\@\[\w_*]/
+        rest = LocationPath(rest, n) if rest =~ /\A[\/\.\@\[\w*]/
         parsed.concat(n)
         return rest
       end
@@ -600,13 +601,13 @@ module REXML
           #puts "LITERAL or NUMBER: #$1"
           varname = $1.nil? ? $2 : $1
           path = $'
-          parsed << :literal 
+          parsed << :literal
           parsed << (varname.include?('.') ? varname.to_f : varname.to_i)
         when LITERAL
           #puts "LITERAL or NUMBER: #$1"
           varname = $1.nil? ? $2 : $1
           path = $'
-          parsed << :literal 
+          parsed << :literal
           parsed << varname
         when /^\(/                                               #/
           path, contents = get_group(path)
@@ -649,43 +650,43 @@ module REXML
         return nil unless depth==0
         [string[ind..-1], string[0..ind-1]]
       end
-      
+
       def parse_args( string )
         arguments = []
         ind = 0
-				inquot = false
-				inapos = false
+        inquot = false
+        inapos = false
         depth = 1
         begin
           case string[ind]
           when ?"
-          	inquot = !inquot unless inapos
+            inquot = !inquot unless inapos
           when ?'
-          	inapos = !inapos unless inquot
+            inapos = !inapos unless inquot
           else
-          	unless inquot or inapos
-          		case string[ind]
-							when ?(
-								depth += 1
+            unless inquot or inapos
+              case string[ind]
+              when ?(
+                depth += 1
                 if depth == 1
-                	string = string[1..-1]
-                	ind -= 1
+                  string = string[1..-1]
+                  ind -= 1
+                end
+              when ?)
+                depth -= 1
+                if depth == 0
+                  s = string[0,ind].strip
+                  arguments << s unless s == ""
+                  string = string[ind+1..-1]
                 end
-							when ?)
-								depth -= 1
-								if depth == 0
-									s = string[0,ind].strip
-									arguments << s unless s == ""
-									string = string[ind+1..-1]
-								end
-							when ?,
-								if depth == 1
-									s = string[0,ind].strip
-									arguments << s unless s == ""
-									string = string[ind+1..-1]
-									ind = -1 
-								end
-							end
+              when ?,
+                if depth == 1
+                  s = string[0,ind].strip
+                  arguments << s unless s == ""
+                  string = string[ind+1..-1]
+                  ind = -1
+                end
+              end
             end
           end
           ind += 1
diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb
index c099db8579..3ad8023470 100644
--- a/lib/rexml/quickpath.rb
+++ b/lib/rexml/quickpath.rb
@@ -2,265 +2,265 @@ require 'rexml/functions'
 require 'rexml/xmltokens'
 
 module REXML
-	class QuickPath
-		include Functions
-		include XMLTokens
+  class QuickPath
+    include Functions
+    include XMLTokens
 
-		EMPTY_HASH = {}
+    EMPTY_HASH = {}
 
-		def QuickPath::first element, path, namespaces=EMPTY_HASH
-			match(element, path, namespaces)[0]
-		end
+    def QuickPath::first element, path, namespaces=EMPTY_HASH
+      match(element, path, namespaces)[0]
+    end
 
-		def QuickPath::each element, path, namespaces=EMPTY_HASH, &block
-			path = "*" unless path
-			match(element, path, namespaces).each( &block )
-		end
+    def QuickPath::each element, path, namespaces=EMPTY_HASH, &block
+      path = "*" unless path
+      match(element, path, namespaces).each( &block )
+    end
 
-		def QuickPath::match element, path, namespaces=EMPTY_HASH
-			raise "nil is not a valid xpath" unless path
-			results = nil
-			Functions::namespace_context = namespaces
-			case path
-			when /^\/([^\/]|$)/u
-				# match on root
-				path = path[1..-1]
-				return [element.root.parent] if path == ''
-				results = filter([element.root], path)
-			when /^[-\w]*::/u
-				results = filter([element], path)
-			when /^\*/u
-				results = filter(element.to_a, path)
-			when /^[\[!\w:]/u
-				# match on child
-				matches = []
-				children = element.to_a
-				results = filter(children, path)
-			else
-				results = filter([element], path)
-			end
-			return results
-		end
+    def QuickPath::match element, path, namespaces=EMPTY_HASH
+      raise "nil is not a valid xpath" unless path
+      results = nil
+      Functions::namespace_context = namespaces
+      case path
+      when /^\/([^\/]|$)/u
+        # match on root
+        path = path[1..-1]
+        return [element.root.parent] if path == ''
+        results = filter([element.root], path)
+      when /^[-\w]*::/u
+        results = filter([element], path)
+      when /^\*/u
+        results = filter(element.to_a, path)
+      when /^[\[!\w:]/u
+        # match on child
+        matches = []
+        children = element.to_a
+        results = filter(children, path)
+      else
+        results = filter([element], path)
+      end
+      return results
+    end
 
-		# Given an array of nodes it filters the array based on the path. The
-		# result is that when this method returns, the array will contain elements
-		# which match the path
-		def QuickPath::filter elements, path
-			return elements if path.nil? or path == '' or elements.size == 0
-			case path
-			when /^\/\//u											# Descendant
-				return axe( elements, "descendant-or-self", $' )
-			when /^\/?\b(\w[-\w]*)\b::/u							# Axe
-				axe_name = $1
-				rest = $'
-				return axe( elements, $1, $' )
-			when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u	# Child
-				rest = $'
-				results = []
-				elements.each do |element|
-					results |= filter( element.to_a, rest )
-				end
-				return results
-			when /^\/?(\w[-\w]*)\(/u							# / Function
-				return function( elements, $1, $' )
-			when Namespace::NAMESPLIT		# Element name
-				name = $2
-				ns = $1
-				rest = $'
-				elements.delete_if do |element|
-					!(element.kind_of? Element and 
-						(element.expanded_name == name or
-						 (element.name == name and
-						  element.namespace == Functions.namespace_context[ns])))
-				end
-				return filter( elements, rest )
-			when /^\/\[/u
-				matches = []
-				elements.each do |element|
-					matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element
-				end
-				return matches
-			when /^\[/u												# Predicate
-				return predicate( elements, path )
-			when /^\/?\.\.\./u										# Ancestor
-				return axe( elements, "ancestor", $' )
-			when /^\/?\.\./u											# Parent
-				return filter( elements.collect{|e|e.parent}, $' )
-			when /^\/?\./u												# Self
-				return filter( elements, $' )
-			when /^\*/u													# Any
-				results = []
-				elements.each do |element|
-					results |= filter( [element], $' ) if element.kind_of? Element
-					#if element.kind_of? Element
-					#	children = element.to_a
-					#	children.delete_if { |child| !child.kind_of?(Element) }
-					#	results |= filter( children, $' )
-					#end
-				end
-				return results
-			end
-			return []
-		end
+    # Given an array of nodes it filters the array based on the path. The
+    # result is that when this method returns, the array will contain elements
+    # which match the path
+    def QuickPath::filter elements, path
+      return elements if path.nil? or path == '' or elements.size == 0
+      case path
+      when /^\/\//u											# Descendant
+        return axe( elements, "descendant-or-self", $' )
+      when /^\/?\b(\w[-\w]*)\b::/u							# Axe
+        axe_name = $1
+        rest = $'
+        return axe( elements, $1, $' )
+      when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u	# Child
+        rest = $'
+        results = []
+        elements.each do |element|
+          results |= filter( element.to_a, rest )
+        end
+        return results
+      when /^\/?(\w[-\w]*)\(/u							# / Function
+        return function( elements, $1, $' )
+      when Namespace::NAMESPLIT		# Element name
+        name = $2
+        ns = $1
+        rest = $'
+        elements.delete_if do |element|
+          !(element.kind_of? Element and
+            (element.expanded_name == name or
+             (element.name == name and
+              element.namespace == Functions.namespace_context[ns])))
+        end
+        return filter( elements, rest )
+      when /^\/\[/u
+        matches = []
+        elements.each do |element|
+          matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element
+        end
+        return matches
+      when /^\[/u												# Predicate
+        return predicate( elements, path )
+      when /^\/?\.\.\./u										# Ancestor
+        return axe( elements, "ancestor", $' )
+      when /^\/?\.\./u											# Parent
+        return filter( elements.collect{|e|e.parent}, $' )
+      when /^\/?\./u												# Self
+        return filter( elements, $' )
+      when /^\*/u													# Any
+        results = []
+        elements.each do |element|
+          results |= filter( [element], $' ) if element.kind_of? Element
+          #if element.kind_of? Element
+          #	children = element.to_a
+          #	children.delete_if { |child| !child.kind_of?(Element) }
+          #	results |= filter( children, $' )
+          #end
+        end
+        return results
+      end
+      return []
+    end
 
-		def QuickPath::axe( elements, axe_name, rest )
-			matches = []
-			matches = filter( elements.dup, rest ) if axe_name =~ /-or-self$/u
-			case axe_name
-			when /^descendant/u
-				elements.each do |element|
-					matches |= filter( element.to_a, "descendant-or-self::#{rest}" ) if element.kind_of? Element
-				end
-			when /^ancestor/u
-				elements.each do |element|
-					while element.parent
-						matches << element.parent
-						element = element.parent
-					end
-				end
-				matches = filter( matches, rest )
-			when "self"
-				matches = filter( elements, rest )
-			when "child"
-				elements.each do |element|
-					matches |= filter( element.to_a, rest ) if element.kind_of? Element
-				end
-			when "attribute"
-				elements.each do |element|
-					matches << element.attributes[ rest ] if element.kind_of? Element
-				end
-			when "parent"
-				matches = filter(elements.collect{|element| element.parent}.uniq, rest)
-			when "following-sibling"
-				matches = filter(elements.collect{|element| element.next_sibling}.uniq,
-					rest)
-			when "previous-sibling"
-				matches = filter(elements.collect{|element| 
-					element.previous_sibling}.uniq, rest )
-			end
-			return matches.uniq
-		end
+    def QuickPath::axe( elements, axe_name, rest )
+      matches = []
+      matches = filter( elements.dup, rest ) if axe_name =~ /-or-self$/u
+      case axe_name
+      when /^descendant/u
+        elements.each do |element|
+          matches |= filter( element.to_a, "descendant-or-self::#{rest}" ) if element.kind_of? Element
+        end
+      when /^ancestor/u
+        elements.each do |element|
+          while element.parent
+            matches << element.parent
+            element = element.parent
+          end
+        end
+        matches = filter( matches, rest )
+      when "self"
+        matches = filter( elements, rest )
+      when "child"
+        elements.each do |element|
+          matches |= filter( element.to_a, rest ) if element.kind_of? Element
+        end
+      when "attribute"
+        elements.each do |element|
+          matches << element.attributes[ rest ] if element.kind_of? Element
+        end
+      when "parent"
+        matches = filter(elements.collect{|element| element.parent}.uniq, rest)
+      when "following-sibling"
+        matches = filter(elements.collect{|element| element.next_sibling}.uniq,
+          rest)
+      when "previous-sibling"
+        matches = filter(elements.collect{|element|
+          element.previous_sibling}.uniq, rest )
+      end
+      return matches.uniq
+    end
 
-		# A predicate filters a node-set with respect to an axis to produce a
-		# new node-set. For each node in the node-set to be filtered, the 
-		# PredicateExpr is evaluated with that node as the context node, with 
-		# the number of nodes in the node-set as the context size, and with the 
-		# proximity position of the node in the node-set with respect to the
-		# axis as the context position; if PredicateExpr evaluates to true for
-		# that node, the node is included in the new node-set; otherwise, it is
-		# not included.
-		#
-		# A PredicateExpr is evaluated by evaluating the Expr and converting
-		# the result to a boolean. If the result is a number, the result will
-		# be converted to true if the number is equal to the context position
-		# and will be converted to false otherwise; if the result is not a
-		# number, then the result will be converted as if by a call to the
-		# boolean function. Thus a location path para[3] is equivalent to
-		# para[position()=3].
-		def QuickPath::predicate( elements, path ) 
-			ind = 1
-			bcount = 1
-			while bcount > 0
-				bcount += 1 if path[ind] == ?[
-				bcount -= 1 if path[ind] == ?]
-				ind += 1
-			end
-			ind -= 1
-			predicate = path[1..ind-1]
-			rest = path[ind+1..-1]
+    OPERAND_ = '((?=(?:(?!and|or).)*[^\s<>=])[^\s<>=]+)'
+    # A predicate filters a node-set with respect to an axis to produce a
+    # new node-set. For each node in the node-set to be filtered, the
+    # PredicateExpr is evaluated with that node as the context node, with
+    # the number of nodes in the node-set as the context size, and with the
+    # proximity position of the node in the node-set with respect to the
+    # axis as the context position; if PredicateExpr evaluates to true for
+    # that node, the node is included in the new node-set; otherwise, it is
+    # not included.
+    #
+    # A PredicateExpr is evaluated by evaluating the Expr and converting
+    # the result to a boolean. If the result is a number, the result will
+    # be converted to true if the number is equal to the context position
+    # and will be converted to false otherwise; if the result is not a
+    # number, then the result will be converted as if by a call to the
+    # boolean function. Thus a location path para[3] is equivalent to
+    # para[position()=3].
+    def QuickPath::predicate( elements, path )
+      ind = 1
+      bcount = 1
+      while bcount > 0
+        bcount += 1 if path[ind] == ?[
+        bcount -= 1 if path[ind] == ?]
+        ind += 1
+      end
+      ind -= 1
+      predicate = path[1..ind-1]
+      rest = path[ind+1..-1]
 
-			# have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c'
-			predicate.gsub!( /([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)/u ) { 
-				"#$1 #$2 #$3 and #$3 #$4 #$5"
-			}
-			# Let's do some Ruby trickery to avoid some work:
-			predicate.gsub!( /&/u, "&&" )
-			predicate.gsub!( /=/u, "==" )
-			predicate.gsub!( /@(\w[-\w.]*)/u ) {
-				"attribute(\"#$1\")" 
-			}
-			predicate.gsub!( /\bmod\b/u, "%" )
-			predicate.gsub!( /\b(\w[-\w.]*\()/u ) {
-				fname = $1
-				fname.gsub( /-/u, "_" )
-			}
-			
-			Functions.pair = [ 0, elements.size ]
-			results = []
-			elements.each do |element|
-				Functions.pair[0] += 1
-				Functions.node = element
-				res = eval( predicate )
-				case res
-				when true
-					results << element
-				when Fixnum
-					results << element if Functions.pair[0] == res
-				when String
-					results << element
-				end
-			end
-			return filter( results, rest )
-		end
+      # have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c'
+      #
+      predicate.gsub!(
+        /#{OPERAND_}\s*([<>=])\s*#{OPERAND_}\s*([<>=])\s*#{OPERAND_}/u,
+        '\1 \2 \3 and \3 \4 \5' )
+      # Let's do some Ruby trickery to avoid some work:
+      predicate.gsub!( /&/u, "&&" )
+      predicate.gsub!( /=/u, "==" )
+      predicate.gsub!( /@(\w[-\w.]*)/u, 'attribute("\1")' )
+      predicate.gsub!( /\bmod\b/u, "%" )
+      predicate.gsub!( /\b(\w[-\w.]*\()/u ) {
+        fname = $1
+        fname.gsub( /-/u, "_" )
+      }
 
-		def QuickPath::attribute( name )
-			return Functions.node.attributes[name] if Functions.node.kind_of? Element
-		end
+      Functions.pair = [ 0, elements.size ]
+      results = []
+      elements.each do |element|
+        Functions.pair[0] += 1
+        Functions.node = element
+        res = eval( predicate )
+        case res
+        when true
+          results << element
+        when Fixnum
+          results << element if Functions.pair[0] == res
+        when String
+          results << element
+        end
+      end
+      return filter( results, rest )
+    end
 
-		def QuickPath::name()
-			return Functions.node.name if Functions.node.kind_of? Element
-		end
+    def QuickPath::attribute( name )
+      return Functions.node.attributes[name] if Functions.node.kind_of? Element
+    end
 
-		def QuickPath::method_missing( id, *args )
-			begin
-				Functions.send( id.id2name, *args )
-			rescue Exception
-				raise "METHOD: #{id.id2name}(#{args.join ', '})\n#{$!.message}"
-			end
-		end
+    def QuickPath::name()
+      return Functions.node.name if Functions.node.kind_of? Element
+    end
 
-		def QuickPath::function( elements, fname, rest )
-			args = parse_args( elements, rest )
-			Functions.pair = [0, elements.size]
-			results = []
-			elements.each do |element|
-				Functions.pair[0] += 1
-				Functions.node = element
-				res = Functions.send( fname, *args )
-				case res
-				when true
-					results << element
-				when Fixnum
-					results << element if Functions.pair[0] == res
-				end
-			end
-			return results
-		end
+    def QuickPath::method_missing( id, *args )
+      begin
+        Functions.send( id.id2name, *args )
+      rescue Exception
+        raise "METHOD: #{id.id2name}(#{args.join ', '})\n#{$!.message}"
+      end
+    end
 
-		def QuickPath::parse_args( element, string )
-			# /.*?(?:\)|,)/
-			arguments = []
-			buffer = ""
-			while string and string != ""
-				c = string[0]
-				string.sub!(/^./u, "")
-				case c
-				when ?,
-					# if depth = 1, then we start a new argument
-					arguments << evaluate( buffer )
-					#arguments << evaluate( string[0..count] )
-				when ?(
-					# start a new method call
-					function( element, buffer, string )
-					buffer = ""
-				when ?)
-					# close the method call and return arguments
-					return arguments
-				else
-					buffer << c
-				end
-			end
-			""
-		end
-	end
+    def QuickPath::function( elements, fname, rest )
+      args = parse_args( elements, rest )
+      Functions.pair = [0, elements.size]
+      results = []
+      elements.each do |element|
+        Functions.pair[0] += 1
+        Functions.node = element
+        res = Functions.send( fname, *args )
+        case res
+        when true
+          results << element
+        when Fixnum
+          results << element if Functions.pair[0] == res
+        end
+      end
+      return results
+    end
+
+    def QuickPath::parse_args( element, string )
+      # /.*?(?:\)|,)/
+      arguments = []
+      buffer = ""
+      while string and string != ""
+        c = string[0]
+        string.sub!(/^./u, "")
+        case c
+        when ?,
+          # if depth = 1, then we start a new argument
+          arguments << evaluate( buffer )
+          #arguments << evaluate( string[0..count] )
+        when ?(
+          # start a new method call
+          function( element, buffer, string )
+          buffer = ""
+        when ?)
+          # close the method call and return arguments
+          return arguments
+        else
+          buffer << c
+        end
+      end
+      ""
+    end
+  end
 end
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
index 8af1697e51..f89951171a 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -5,27 +5,26 @@
 # non-validating[http://www.w3.org/TR/2004/REC-xml-20040204/#sec-conformance]
 # toolkit with an intuitive API.  REXML passes 100% of the non-validating Oasis
 # tests[http://www.oasis-open.org/committees/xml-conformance/xml-test-suite.shtml],
-# and provides tree, stream, SAX2, pull, and lightweight APIs.  REXML also 
-# includes a full XPath[http://www.w3c.org/tr/xpath] 1.0 implementation. Since 
+# and provides tree, stream, SAX2, pull, and lightweight APIs.  REXML also
+# includes a full XPath[http://www.w3c.org/tr/xpath] 1.0 implementation. Since
 # Ruby 1.8, REXML is included in the standard Ruby distribution.
 #
 # Main page:: http://www.germane-software.com/software/rexml
 # Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom>
-# Version:: 3.1.7.2
-# Date:: 2007/275
-# Revision:: $Revision$
-# 
+# Date:: 2008/019
+# Version:: 3.1.7.3
+#
 # This API documentation can be downloaded from the REXML home page, or can
 # be accessed online[http://www.germane-software.com/software/rexml_doc]
 #
 # A tutorial is available in the REXML distribution in docs/tutorial.html,
-# or can be accessed 
+# or can be accessed
 # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
 module REXML
-  COPYRIGHT = "Copyright \xC2\xA9 2001-2006 Sean Russell <ser@germane-software.com>"
-  VERSION = "3.1.7.2"
-  DATE = "2007/275"
-  REVISION = "$Revision$".gsub(/\$Revision:|\$/,'').strip
+  COPYRIGHT = "Copyright © 2001-2008 Sean Russell <ser@germane-software.com>"
+  DATE = "2008/019"
+  VERSION = "3.1.7.3"
+  REVISION = %w$Revision$[1] || ''
 
   Copyright = COPYRIGHT
   Version = VERSION
diff --git a/lib/rexml/sax2listener.rb b/lib/rexml/sax2listener.rb
index 8db1389d06..6830e4483a 100644
--- a/lib/rexml/sax2listener.rb
+++ b/lib/rexml/sax2listener.rb
@@ -1,97 +1,97 @@
 module REXML
-	# A template for stream parser listeners.
-	# Note that the declarations (attlistdecl, elementdecl, etc) are trivially
-	# processed; REXML doesn't yet handle doctype entity declarations, so you 
-	# have to parse them out yourself.
-	# === Missing methods from SAX2
-	#  ignorable_whitespace
-	# === Methods extending SAX2 
-	# +WARNING+
-	# These methods are certainly going to change, until DTDs are fully
-	# supported.  Be aware of this.
-	#  start_document
-	#  end_document
-	#  doctype
-	#  elementdecl
-	#  attlistdecl
-	#  entitydecl
-	#  notationdecl
-	#  cdata
-	#  xmldecl
-	#  comment
-	module SAX2Listener
-		def start_document
-		end
-		def end_document
-		end
-		def start_prefix_mapping prefix, uri
-		end
-		def end_prefix_mapping prefix
-		end
-		def start_element uri, localname, qname, attributes
-		end
-		def end_element uri, localname, qname
-		end
-		def characters text
-		end
-		def processing_instruction target, data
-		end
-		# Handles a doctype declaration. Any attributes of the doctype which are
-		# not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
-		# @p name the name of the doctype; EG, "me"
-		# @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
-		# @p long_name the supplied long name, or nil.  EG, "foo"
-		# @p uri the uri of the doctype, or nil.  EG, "bar"
-		def doctype name, pub_sys, long_name, uri
-		end
-		# If a doctype includes an ATTLIST declaration, it will cause this
-		# method to be called.  The content is the declaration itself, unparsed.
-		# EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
-		# attr CDATA #REQUIRED".  This is the same for all of the .*decl
-		# methods.
-		def attlistdecl(element, pairs, contents)
-		end
-		# <!ELEMENT ...>
-		def elementdecl content
-		end
-		# <!ENTITY ...>
-		# The argument passed to this method is an array of the entity
-		# declaration.  It can be in a number of formats, but in general it
-		# returns (example, result):
-		#  <!ENTITY % YN '"Yes"'>  
-		#  ["%", "YN", "'\"Yes\"'", "\""]
-		#  <!ENTITY % YN 'Yes'>
-		#  ["%", "YN", "'Yes'", "s"]
-		#  <!ENTITY WhatHeSaid "He said %YN;">
-		#  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
-		#  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
-		#  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
-		def entitydecl name, decl
-		end
-		# <!NOTATION ...>
-		def notationdecl content
-		end
-		# Called when <![CDATA[ ... ]]> is encountered in a document.
-		# @p content "..."
-		def cdata content
-		end
-		# Called when an XML PI is encountered in the document.
-		# EG: <?xml version="1.0" encoding="utf"?>
-		# @p version the version attribute value.  EG, "1.0"
-		# @p encoding the encoding attribute value, or nil.  EG, "utf"
-		# @p standalone the standalone attribute value, or nil.  EG, nil
+  # A template for stream parser listeners.
+  # Note that the declarations (attlistdecl, elementdecl, etc) are trivially
+  # processed; REXML doesn't yet handle doctype entity declarations, so you
+  # have to parse them out yourself.
+  # === Missing methods from SAX2
+  #  ignorable_whitespace
+  # === Methods extending SAX2
+  # +WARNING+
+  # These methods are certainly going to change, until DTDs are fully
+  # supported.  Be aware of this.
+  #  start_document
+  #  end_document
+  #  doctype
+  #  elementdecl
+  #  attlistdecl
+  #  entitydecl
+  #  notationdecl
+  #  cdata
+  #  xmldecl
+  #  comment
+  module SAX2Listener
+    def start_document
+    end
+    def end_document
+    end
+    def start_prefix_mapping prefix, uri
+    end
+    def end_prefix_mapping prefix
+    end
+    def start_element uri, localname, qname, attributes
+    end
+    def end_element uri, localname, qname
+    end
+    def characters text
+    end
+    def processing_instruction target, data
+    end
+    # Handles a doctype declaration. Any attributes of the doctype which are
+    # not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
+    # @p name the name of the doctype; EG, "me"
+    # @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
+    # @p long_name the supplied long name, or nil.  EG, "foo"
+    # @p uri the uri of the doctype, or nil.  EG, "bar"
+    def doctype name, pub_sys, long_name, uri
+    end
+    # If a doctype includes an ATTLIST declaration, it will cause this
+    # method to be called.  The content is the declaration itself, unparsed.
+    # EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
+    # attr CDATA #REQUIRED".  This is the same for all of the .*decl
+    # methods.
+    def attlistdecl(element, pairs, contents)
+    end
+    # <!ELEMENT ...>
+    def elementdecl content
+    end
+    # <!ENTITY ...>
+    # The argument passed to this method is an array of the entity
+    # declaration.  It can be in a number of formats, but in general it
+    # returns (example, result):
+    #  <!ENTITY % YN '"Yes"'>
+    #  ["%", "YN", "'\"Yes\"'", "\""]
+    #  <!ENTITY % YN 'Yes'>
+    #  ["%", "YN", "'Yes'", "s"]
+    #  <!ENTITY WhatHeSaid "He said %YN;">
+    #  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
+    #  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
+    #  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+    #  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
+    #  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+    #  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
+    #  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
+    def entitydecl name, decl
+    end
+    # <!NOTATION ...>
+    def notationdecl content
+    end
+    # Called when <![CDATA[ ... ]]> is encountered in a document.
+    # @p content "..."
+    def cdata content
+    end
+    # Called when an XML PI is encountered in the document.
+    # EG: <?xml version="1.0" encoding="utf"?>
+    # @p version the version attribute value.  EG, "1.0"
+    # @p encoding the encoding attribute value, or nil.  EG, "utf"
+    # @p standalone the standalone attribute value, or nil.  EG, nil
     # @p spaced the declaration is followed by a line break
-		def xmldecl version, encoding, standalone
-		end
-		# Called when a comment is encountered.
-		# @p comment The content of the comment
-		def comment comment
-		end
+    def xmldecl version, encoding, standalone
+    end
+    # Called when a comment is encountered.
+    # @p comment The content of the comment
+    def comment comment
+    end
     def progress position
     end
-	end	
+  end
 end
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
index ce7a2c98b0..1206150b16 100644
--- a/lib/rexml/source.rb
+++ b/lib/rexml/source.rb
@@ -7,13 +7,14 @@ module REXML
     # @param arg Either a String, or an IO
     # @return a Source, or nil if a bad argument was given
     def SourceFactory::create_from(arg)
-      if arg.kind_of? String
-        Source.new(arg)
-      elsif arg.respond_to? :read and
-            arg.respond_to? :readline and
-            arg.respond_to? :nil? and
-            arg.respond_to? :eof?
+      if arg.respond_to? :read and
+          arg.respond_to? :readline and
+          arg.respond_to? :nil? and
+          arg.respond_to? :eof?
         IOSource.new(arg)
+      elsif arg.respond_to? :to_str
+        require 'stringio'
+        IOSource.new(StringIO.new(arg))
       elsif arg.kind_of? Source
         arg
       else
@@ -58,6 +59,9 @@ module REXML
         @to_utf = true
       else
         @to_utf = false
+        if @buffer.respond_to? :force_encoding
+          @buffer.force_encoding Encoding::UTF_8
+        end
       end
     end
 
@@ -65,9 +69,9 @@ module REXML
     # usual scan() method.  For one thing, the pattern argument has some
     # requirements; for another, the source can be consumed.  You can easily
     # confuse this method.  Originally, the patterns were easier
-    # to construct and this method more robust, because this method 
-    # generated search regexes on the fly; however, this was 
-    # computationally expensive and slowed down the entire REXML package 
+    # to construct and this method more robust, because this method
+    # generated search regexes on the fly; however, this was
+    # computationally expensive and slowed down the entire REXML package
     # considerably, since this is by far the most commonly called method.
     # @param pattern must be a Regexp, and must be in the form of
     # /^\s*(#{your pattern, with no groups})(.*)/.  The first group
@@ -143,21 +147,30 @@ module REXML
       # the XML spec.  If there is one, we can determine the encoding from
       # it.
       @buffer = ""
-      str = @source.read( 2 )
+      str = @source.read( 2 ) || ''
       if encoding
         self.encoding = encoding
-      elsif 0xfe == str[0] && 0xff == str[1]
+      elsif str[0,2] == "\xfe\xff"
         @line_break = "\000>"
-      elsif 0xff == str[0] && 0xfe == str[1]
+      elsif str[0,2] == "\xff\xfe"
         @line_break = ">\000"
-      elsif 0xef == str[0] && 0xbb == str[1]
+      elsif str[0,2] == "\xef\xbb"
         str += @source.read(1)
-        str = '' if (0xbf == str[2])
+        str = '' if (str[2,1] == "\xBF")
         @line_break = ">"
       else
         @line_break = ">"
       end
-      super str+@source.readline( @line_break )
+      super( @source.eof? ? str : str+@source.readline( @line_break ) )
+
+      if !@to_utf and
+          @buffer.respond_to?(:force_encoding) and
+          @source.respond_to?(:external_encoding) and
+          @source.external_encoding != ::Encoding::UTF_8
+        @force_utf8 = true
+      else
+        @force_utf8 = false
+      end
     end
 
     def scan(pattern, cons=false)
@@ -170,11 +183,7 @@ module REXML
       if rv.size == 0
         until @buffer =~ pattern or @source.nil?
           begin
-            # READLINE OPT
-            #str = @source.read(@block_size)
-            str = @source.readline(@line_break)
-            str = decode(str) if @to_utf and str
-            @buffer << str
+            @buffer << readline
           rescue Iconv::IllegalSequence
             raise
           rescue
@@ -189,9 +198,7 @@ module REXML
 
     def read
       begin
-        str = @source.readline(@line_break)
-        str = decode(str) if @to_utf and str 
-        @buffer << str
+        @buffer << readline
       rescue Exception, NameError
         @source = nil
       end
@@ -206,9 +213,7 @@ module REXML
       @buffer = $' if cons and rv
       while !rv and @source
         begin
-          str = @source.readline(@line_break)
-          str = decode(str) if @to_utf and str
-          @buffer << str
+          @buffer << readline
           rv = pattern.match(@buffer)
           @buffer = $' if cons and rv
         rescue
@@ -218,13 +223,13 @@ module REXML
       rv.taint
       rv
     end
-    
+
     def empty?
       super and ( @source.nil? || @source.eof? )
     end
 
     def position
-      @er_source.stat.pipe? ? 0 : @er_source.pos
+      @er_source.pos rescue 0
     end
 
     # @return the current line in the source
@@ -247,5 +252,18 @@ module REXML
       end
       [pos, lineno, line]
     end
+
+    private
+    def readline
+      str = @source.readline(@line_break)
+      return nil if str.nil?
+
+      if @to_utf
+        decode(str)
+      else
+        str.force_encoding(::Encoding::UTF_8) if @force_utf8
+        str
+      end
+    end
   end
 end
diff --git a/lib/rexml/streamlistener.rb b/lib/rexml/streamlistener.rb
index 6f401125b5..619c529578 100644
--- a/lib/rexml/streamlistener.rb
+++ b/lib/rexml/streamlistener.rb
@@ -1,92 +1,92 @@
 module REXML
-	# A template for stream parser listeners.
-	# Note that the declarations (attlistdecl, elementdecl, etc) are trivially
-	# processed; REXML doesn't yet handle doctype entity declarations, so you 
-	# have to parse them out yourself.
-	module StreamListener
-		# Called when a tag is encountered.
-		# @p name the tag name
-		# @p attrs an array of arrays of attribute/value pairs, suitable for
-		# use with assoc or rassoc.  IE, <tag attr1="value1" attr2="value2">
-		# will result in 
-		# tag_start( "tag", # [["attr1","value1"],["attr2","value2"]])
-		def tag_start name, attrs
-		end
-		# Called when the end tag is reached.  In the case of <tag/>, tag_end
-		# will be called immidiately after tag_start
-		# @p the name of the tag
-		def tag_end name
-		end
-		# Called when text is encountered in the document
-		# @p text the text content.
-		def text text
-		end
-		# Called when an instruction is encountered.  EG: <?xsl sheet='foo'?>
-		# @p name the instruction name; in the example, "xsl"
-		# @p instruction the rest of the instruction.  In the example,
-		# "sheet='foo'"
-		def instruction name, instruction
-		end
-		# Called when a comment is encountered.
-		# @p comment The content of the comment
-		def comment comment
-		end
-		# Handles a doctype declaration. Any attributes of the doctype which are
-		# not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
-		# @p name the name of the doctype; EG, "me"
-		# @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
-		# @p long_name the supplied long name, or nil.  EG, "foo"
-		# @p uri the uri of the doctype, or nil.  EG, "bar"
-		def doctype name, pub_sys, long_name, uri
-		end
-		# Called when the doctype is done
-		def doctype_end
-		end
-		# If a doctype includes an ATTLIST declaration, it will cause this
-		# method to be called.  The content is the declaration itself, unparsed.
-		# EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
-		# attr CDATA #REQUIRED".  This is the same for all of the .*decl
-		# methods.
-		def attlistdecl element_name, attributes, raw_content
-		end
-		# <!ELEMENT ...>
-		def elementdecl content
-		end
-		# <!ENTITY ...>
-		# The argument passed to this method is an array of the entity
-		# declaration.  It can be in a number of formats, but in general it
-		# returns (example, result):
-		#  <!ENTITY % YN '"Yes"'>  
-		#  ["%", "YN", "'\"Yes\"'", "\""]
-		#  <!ENTITY % YN 'Yes'>
-		#  ["%", "YN", "'Yes'", "s"]
-		#  <!ENTITY WhatHeSaid "He said %YN;">
-		#  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
-		#  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
-		#  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
-		def entitydecl content
-		end
-		# <!NOTATION ...>
-		def notationdecl content
-		end
-		# Called when %foo; is encountered in a doctype declaration.
-		# @p content "foo"
-		def entity content
-		end
-		# Called when <![CDATA[ ... ]]> is encountered in a document.
-		# @p content "..."
-		def cdata content
-		end
-		# Called when an XML PI is encountered in the document.
-		# EG: <?xml version="1.0" encoding="utf"?>
-		# @p version the version attribute value.  EG, "1.0"
-		# @p encoding the encoding attribute value, or nil.  EG, "utf"
-		# @p standalone the standalone attribute value, or nil.  EG, nil
-		def xmldecl version, encoding, standalone
-		end
-	end
+  # A template for stream parser listeners.
+  # Note that the declarations (attlistdecl, elementdecl, etc) are trivially
+  # processed; REXML doesn't yet handle doctype entity declarations, so you
+  # have to parse them out yourself.
+  module StreamListener
+    # Called when a tag is encountered.
+    # @p name the tag name
+    # @p attrs an array of arrays of attribute/value pairs, suitable for
+    # use with assoc or rassoc.  IE, <tag attr1="value1" attr2="value2">
+    # will result in
+    # tag_start( "tag", # [["attr1","value1"],["attr2","value2"]])
+    def tag_start name, attrs
+    end
+    # Called when the end tag is reached.  In the case of <tag/>, tag_end
+    # will be called immidiately after tag_start
+    # @p the name of the tag
+    def tag_end name
+    end
+    # Called when text is encountered in the document
+    # @p text the text content.
+    def text text
+    end
+    # Called when an instruction is encountered.  EG: <?xsl sheet='foo'?>
+    # @p name the instruction name; in the example, "xsl"
+    # @p instruction the rest of the instruction.  In the example,
+    # "sheet='foo'"
+    def instruction name, instruction
+    end
+    # Called when a comment is encountered.
+    # @p comment The content of the comment
+    def comment comment
+    end
+    # Handles a doctype declaration. Any attributes of the doctype which are
+    # not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
+    # @p name the name of the doctype; EG, "me"
+    # @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
+    # @p long_name the supplied long name, or nil.  EG, "foo"
+    # @p uri the uri of the doctype, or nil.  EG, "bar"
+    def doctype name, pub_sys, long_name, uri
+    end
+    # Called when the doctype is done
+    def doctype_end
+    end
+    # If a doctype includes an ATTLIST declaration, it will cause this
+    # method to be called.  The content is the declaration itself, unparsed.
+    # EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
+    # attr CDATA #REQUIRED".  This is the same for all of the .*decl
+    # methods.
+    def attlistdecl element_name, attributes, raw_content
+    end
+    # <!ELEMENT ...>
+    def elementdecl content
+    end
+    # <!ENTITY ...>
+    # The argument passed to this method is an array of the entity
+    # declaration.  It can be in a number of formats, but in general it
+    # returns (example, result):
+    #  <!ENTITY % YN '"Yes"'>
+    #  ["%", "YN", "'\"Yes\"'", "\""]
+    #  <!ENTITY % YN 'Yes'>
+    #  ["%", "YN", "'Yes'", "s"]
+    #  <!ENTITY WhatHeSaid "He said %YN;">
+    #  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
+    #  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
+    #  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+    #  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
+    #  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+    #  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
+    #  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
+    def entitydecl content
+    end
+    # <!NOTATION ...>
+    def notationdecl content
+    end
+    # Called when %foo; is encountered in a doctype declaration.
+    # @p content "foo"
+    def entity content
+    end
+    # Called when <![CDATA[ ... ]]> is encountered in a document.
+    # @p content "..."
+    def cdata content
+    end
+    # Called when an XML PI is encountered in the document.
+    # EG: <?xml version="1.0" encoding="utf"?>
+    # @p version the version attribute value.  EG, "1.0"
+    # @p encoding the encoding attribute value, or nil.  EG, "utf"
+    # @p standalone the standalone attribute value, or nil.  EG, nil
+    def xmldecl version, encoding, standalone
+    end
+  end
 end
diff --git a/lib/rexml/syncenumerator.rb b/lib/rexml/syncenumerator.rb
index 955e006cb2..11609bdf3d 100644
--- a/lib/rexml/syncenumerator.rb
+++ b/lib/rexml/syncenumerator.rb
@@ -6,8 +6,7 @@ module REXML
     # Enumerable objects.
     def initialize(*enums)
       @gens = enums
-      @biggest = @gens[0]
-      @gens.each {|x| @biggest = x if x.size > @biggest.size }
+      @length = @gens.collect {|x| x.size }.max
     end
 
     # Returns the number of enumerated Enumerable objects, i.e. the size
@@ -24,8 +23,8 @@ module REXML
 
     # Enumerates rows of the Enumerable objects.
     def each
-      @biggest.zip( *@gens ) {|a|
-        yield(*a[1..-1])
+      @length.times {|i|
+        yield @gens.collect {|x| x[i]}
       }
       self
     end
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index 9804aa710b..6623c0c03b 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -18,25 +18,57 @@ module REXML
     # If +raw+ is true, then REXML leaves the value alone
     attr_accessor :raw
 
-    ILLEGAL = /(<|&(?!(#{Entity::NAME})|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));))/um
-    NUMERICENTITY = /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ 
+    NEEDS_A_SECOND_CHECK = /(<|&((#{Entity::NAME});|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));)?)/um
+    NUMERICENTITY = /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/
+    VALID_CHAR = [
+      0x9, 0xA, 0xD,
+      (0x20..0xD7FF),
+      (0xE000..0xFFFD),
+      (0x10000..0x10FFFF)
+    ]
+
+    if String.method_defined? :encode
+      VALID_XML_CHARS = Regexp.new('^['+
+        VALID_CHAR.map { |item|
+          case item
+          when Fixnum
+            [item].pack('U').force_encoding('utf-8')
+          when Range
+            [item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8')
+          end
+        }.join +
+      ']*$')
+    else
+      VALID_XML_CHARS = /^(
+           [\x09\x0A\x0D\x20-\x7E]            # ASCII
+         | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+         |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+         | [\xE1-\xEC\xEE][\x80-\xBF]{2}      # straight 3-byte
+         |  \xEF[\x80-\xBE]{2}                #
+         |  \xEF\xBF[\x80-\xBD]               # excluding U+fffe and U+ffff
+         |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+         |  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+         | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+         |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+       )*$/nx;
+    end
 
     # Constructor
     # +arg+ if a String, the content is set to the String.  If a Text,
-    # the object is shallowly cloned.  
+    # the object is shallowly cloned.
     #
     # +respect_whitespace+ (boolean, false) if true, whitespace is
     # respected
     #
     # +parent+ (nil) if this is a Parent object, the parent
-    # will be set to this.  
+    # will be set to this.
     #
     # +raw+ (nil) This argument can be given three values.
-    # If true, then the value of used to construct this object is expected to 
-    # contain no unescaped XML markup, and REXML will not change the text. If 
+    # If true, then the value of used to construct this object is expected to
+    # contain no unescaped XML markup, and REXML will not change the text. If
     # this value is false, the string may contain any characters, and REXML will
     # escape any and all defined entities whose values are contained in the
-    # text.  If this value is nil (the default), then the raw value of the 
+    # text.  If this value is nil (the default), then the raw value of the
     # parent will be used as the raw value for this node.  If there is no raw
     # value for the parent, and no value is supplied, the default is false.
     # Use this field if you have entities defined for some text, and you don't
@@ -56,17 +88,16 @@ module REXML
     #   Text.new( "sean russell", false, nil, true, ["s"] ) #-> "sean russell"
     # In the last example, the +entity_filter+ argument is ignored.
     #
-    # +pattern+ INTERNAL USE ONLY
-    def initialize(arg, respect_whitespace=false, parent=nil, raw=nil, 
-      entity_filter=nil, illegal=ILLEGAL )
+    # +illegal+ INTERNAL USE ONLY
+    def initialize(arg, respect_whitespace=false, parent=nil, raw=nil,
+      entity_filter=nil, illegal=NEEDS_A_SECOND_CHECK )
 
       @raw = false
+      @parent = nil
 
       if parent
         super( parent )
-        @raw = parent.raw 
-      else
-        @parent = nil
+        @raw = parent.raw
       end
 
       @raw = raw unless raw.nil?
@@ -74,7 +105,7 @@ module REXML
       @normalized = @unnormalized = nil
 
       if arg.kind_of? String
-        @string = arg.clone
+        @string = arg.dup
         @string.squeeze!(" \n\t") unless respect_whitespace
       elsif arg.kind_of? Text
         @string = arg.to_s
@@ -85,10 +116,55 @@ module REXML
 
       @string.gsub!( /\r\n?/, "\n" )
 
-      # check for illegal characters
-      if @raw
-        if @string =~ illegal
-          raise "Illegal character '#{$1}' in raw string \"#{@string}\""
+      Text.check(@string, illegal, doctype) if @raw
+    end
+
+    def parent= parent
+      super(parent)
+      Text.check(@string, NEEDS_A_SECOND_CHECK, doctype) if @raw and @parent
+    end
+
+    # check for illegal characters
+    def Text.check string, pattern, doctype
+
+      # illegal anywhere
+      if string !~ VALID_XML_CHARS
+        if String.method_defined? :encode
+          string.chars.each do |c|
+            case c.ord
+            when *VALID_CHAR
+            else
+              raise "Illegal character #{c.inspect} in raw string \"#{string}\""
+            end
+          end
+        else
+          string.scan(/[\x00-\x7F]|[\x80-\xBF][\xC0-\xF0]*|[\xC0-\xF0]/n) do |c|
+            case c.unpack('U')
+            when *VALID_CHAR
+            else
+              raise "Illegal character #{c.inspect} in raw string \"#{string}\""
+            end
+          end
+        end
+      end
+
+      # context sensitive
+      string.scan(pattern) do
+        if $1[-1] != ?;
+          raise "Illegal character '#{$1}' in raw string \"#{string}\""
+        elsif $1[0] == ?&
+          if $5 and $5[0] == ?#
+            case ($5[1] == ?x ? $5[2..-1].to_i(16) : $5[1..-1].to_i)
+            when *VALID_CHAR
+            else
+              raise "Illegal character '#{$1}' in raw string \"#{string}\""
+            end
+          # FIXME: below can't work but this needs API change.
+          # elsif @parent and $3 and !SUBSTITUTES.include?($1)
+          #   if !doctype or !doctype.entities.has_key?($3)
+          #     raise "Undeclared entity '#{$1}' in raw string \"#{string}\""
+          #   end
+          end
         end
       end
     end
@@ -120,17 +196,24 @@ module REXML
       to_s() <=> other.to_s
     end
 
+    def doctype
+      if @parent
+        doc = @parent.document
+        doc.doctype if doc
+      end
+    end
+
     REFERENCE = /#{Entity::REFERENCE}/
     # Returns the string value of this text node.  This string is always
     # escaped, meaning that it is a valid XML text node string, and all
     # entities that can be escaped, have been inserted.  This method respects
     # the entity filter set in the constructor.
-    #   
-    #   # Assume that the entity "s" is defined to be "sean", and that the 
+    #
+    #   # Assume that the entity "s" is defined to be "sean", and that the
     #   # entity "r" is defined to be "russell"
-    #   t = Text.new( "< & sean russell", false, nil, false, ['s'] ) 
+    #   t = Text.new( "< & sean russell", false, nil, false, ['s'] )
     #   t.to_s   #-> "&lt; &amp; &s; russell"
-    #   t = Text.new( "< & &s; russell", false, nil, false ) 
+    #   t = Text.new( "< & &s; russell", false, nil, false )
     #   t.to_s   #-> "&lt; &amp; &s; russell"
     #   u = Text.new( "sean russell", false, nil, true )
     #   u.to_s   #-> "sean russell"
@@ -138,12 +221,6 @@ module REXML
       return @string if @raw
       return @normalized if @normalized
 
-      doctype = nil
-      if @parent
-        doc = @parent.document
-        doctype = doc.doctype if doc
-      end
-
       @normalized = Text::normalize( @string, doctype, @entity_filter )
     end
 
@@ -156,25 +233,20 @@ module REXML
     # console.  This ignores the 'raw' attribute setting, and any
     # entity_filter.
     #
-    #   # Assume that the entity "s" is defined to be "sean", and that the 
+    #   # Assume that the entity "s" is defined to be "sean", and that the
     #   # entity "r" is defined to be "russell"
-    #   t = Text.new( "< & sean russell", false, nil, false, ['s'] ) 
+    #   t = Text.new( "< & sean russell", false, nil, false, ['s'] )
     #   t.value   #-> "< & sean russell"
     #   t = Text.new( "< & &s; russell", false, nil, false )
     #   t.value   #-> "< & sean russell"
     #   u = Text.new( "sean russell", false, nil, true )
     #   u.value   #-> "sean russell"
     def value
-      @unnormalized if @unnormalized
-      doctype = nil
-      if @parent
-        doc = @parent.document
-        doctype = doc.doctype if doc
-      end
+      return @unnormalized if @unnormalized
       @unnormalized = Text::unnormalize( @string, doctype )
     end
 
-    # Sets the contents of this text node.  This expects the text to be 
+    # Sets the contents of this text node.  This expects the text to be
     # unnormalized.  It returns self.
     #
     #   e = Element.new( "a" )
@@ -187,9 +259,9 @@ module REXML
       @normalized = nil
       @raw = false
     end
- 
+
      def wrap(string, width, addnewline=false)
-       # Recursivly wrap string at width.
+       # Recursively wrap string at width.
        return string if string.length <= width
        place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
        if addnewline then
@@ -202,7 +274,7 @@ module REXML
     def indent_text(string, level=1, style="\t", indentfirstline=true)
       return string if level < 0
       new_string = ''
-      string.each { |line|
+      string.each_line { |line|
         indent_string = style * level
         new_line = (indent_string + line).sub(/[\s]+$/,'')
         new_string << new_line
@@ -210,11 +282,11 @@ module REXML
       new_string.strip! unless indentfirstline
       return new_string
     end
- 
+
     # == DEPRECATED
     # See REXML::Formatters
     #
-    def write( writer, indent=-1, transitive=false, ie_hack=false ) 
+    def write( writer, indent=-1, transitive=false, ie_hack=false )
       Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters")
       formatter = if indent > -1
           REXML::Formatters::Pretty.new( indent )
@@ -265,7 +337,7 @@ module REXML
       if copy =~ illegal
         raise ParseException.new( "malformed text: Illegal character #$& in \"#{copy}\"" )
       end if illegal
-      
+
       copy.gsub!( /\r\n?/, "\n" )
       if copy.include? ?&
         copy.gsub!( SETUTITSBUS[0], SLAICEPS[0] )
@@ -273,7 +345,7 @@ module REXML
         copy.gsub!( SETUTITSBUS[2], SLAICEPS[2] )
         copy.gsub!( SETUTITSBUS[3], SLAICEPS[3] )
         copy.gsub!( SETUTITSBUS[4], SLAICEPS[4] )
-        copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {|m|
+        copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {
           m=$1
           #m='0' if m==''
           m = "0#{m}" if m[0] == ?x
@@ -286,15 +358,15 @@ module REXML
     EREFERENCE = /&(?!#{Entity::NAME};)/
     # Escapes all possible entities
     def Text::normalize( input, doctype=nil, entity_filter=nil )
-      copy = input
+      copy = input.to_s
       # Doing it like this rather than in a loop improves the speed
       #copy = copy.gsub( EREFERENCE, '&amp;' )
       copy = copy.gsub( "&", "&amp;" )
       if doctype
         # Replace all ampersands that aren't part of an entity
         doctype.entities.each_value do |entity|
-          copy = copy.gsub( entity.value, 
-            "&#{entity.name};" ) if entity.value and 
+          copy = copy.gsub( entity.value,
+            "&#{entity.name};" ) if entity.value and
               not( entity_filter and entity_filter.include?(entity) )
         end
       else
@@ -308,37 +380,25 @@ module REXML
 
     # Unescapes all possible entities
     def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
-      rv = string.clone
-      rv.gsub!( /\r\n?/, "\n" )
-      matches = rv.scan( REFERENCE )
-      return rv if matches.size == 0
-      rv.gsub!( NUMERICENTITY ) {|m|
-        m=$1
-        m = "0#{m}" if m[0] == ?x
-        [Integer(m)].pack('U*')
-      }
-      matches.collect!{|x|x[0]}.compact!
-      if matches.size > 0
-        if doctype
-          matches.each do |entity_reference|
-            unless filter and filter.include?(entity_reference)
-              entity_value = doctype.entity( entity_reference )
-              re = /&#{entity_reference};/
-              rv.gsub!( re, entity_value ) if entity_value
-            end
+      string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
+        ref = $&
+        if ref[1] == ?#
+          if ref[2] == ?x
+            [ref[3...-1].to_i(16)].pack('U*')
+          else
+            [ref[2...-1].to_i].pack('U*')
           end
+        elsif ref == '&amp;'
+          '&'
+        elsif filter and filter.include?( ref[1...-1] )
+          ref
+        elsif doctype
+          doctype.entity( ref[1...-1] ) or ref
         else
-          matches.each do |entity_reference|
-            unless filter and filter.include?(entity_reference)
-              entity_value = DocType::DEFAULT_ENTITIES[ entity_reference ]
-              re = /&#{entity_reference};/
-              rv.gsub!( re, entity_value.value ) if entity_value
-            end
-          end
+          entity_value = DocType::DEFAULT_ENTITIES[ ref[1...-1] ]
+          entity_value ? entity_value.value : ref
         end
-        rv.gsub!( /&amp;/, '&' )
-      end
-      rv
+      }
     end
   end
 end
diff --git a/lib/rexml/validation/relaxng.rb b/lib/rexml/validation/relaxng.rb
index 969f51bc95..2441901d7b 100644
--- a/lib/rexml/validation/relaxng.rb
+++ b/lib/rexml/validation/relaxng.rb
@@ -79,7 +79,7 @@ module REXML
             when "mixed"
               states << Interleave.new( self )
               states[-2] << states[-1]
-              states[-1] << TEXT 
+              states[-1] << TEXT
             when "define"
               states << [ event[2]["name"] ]
             when "ref"
@@ -102,7 +102,7 @@ module REXML
             case event[1]
             when "element", "attribute"
               states[-1] << event
-            when "zeroOrMore", "oneOrMore", "choice", "optional", 
+            when "zeroOrMore", "oneOrMore", "choice", "optional",
               "interleave", "group", "mixed"
               states.pop
             when "define"
@@ -139,7 +139,7 @@ module REXML
         @events.each {|s| s.reset if s.kind_of? State }
       end
 
-      def previous=( previous ) 
+      def previous=( previous )
         @previous << previous
       end
 
@@ -183,7 +183,7 @@ module REXML
       end
 
       def inspect
-        "< #{to_s} #{@events.collect{|e| 
+        "< #{to_s} #{@events.collect{|e|
           pre = e == @events[@current] ? '#' : ''
           pre + e.inspect unless self == e
         }.join(', ')} >"
@@ -201,15 +201,15 @@ module REXML
       protected
       def expand_ref_in( arry, ind )
         new_events = []
-        @references[ arry[ind].to_s ].each{ |evt| 
+        @references[ arry[ind].to_s ].each{ |evt|
           add_event_to_arry(new_events,evt)
         }
         arry[ind,1] = new_events
       end
 
-      def add_event_to_arry( arry, evt ) 
+      def add_event_to_arry( arry, evt )
         evt = generate_event( evt )
-        if evt.kind_of? String 
+        if evt.kind_of? String
           arry[-1].event_arg = evt if arry[-1].kind_of? Event and @value
           @value = false
         else
@@ -272,7 +272,7 @@ module REXML
       end
 
       def matches?(event)
-        @events[@current].matches?(event) || 
+        @events[@current].matches?(event) ||
         (@current == 0 and @previous[-1].matches?(event))
       end
 
@@ -319,7 +319,7 @@ module REXML
       end
 
       def reset
-        super 
+        super
         @ord = 0
       end
 
@@ -345,7 +345,7 @@ module REXML
       end
 
       def matches?( event )
-        @events[@current].matches?(event) || 
+        @events[@current].matches?(event) ||
         (@current == 0 and @ord > 0 and @previous[-1].matches?(event))
       end
 
@@ -412,7 +412,7 @@ module REXML
         #puts "IN CHOICE EXPECTED"
         #puts "EVENTS = #{@events.inspect}"
         return [@events[@current]] if @events.size > 0
-        return @choices.collect do |x| 
+        return @choices.collect do |x|
           if x[0].kind_of? State
             x[0].expected
           else
@@ -426,17 +426,17 @@ module REXML
       end
 
       protected
-      def add_event_to_arry( arry, evt ) 
+      def add_event_to_arry( arry, evt )
         if evt.kind_of? State or evt.class == Ref
           arry << [evt]
-        elsif evt[0] == :text 
+        elsif evt[0] == :text
          if arry[-1] and
-            arry[-1][-1].kind_of?( Event ) and 
+            arry[-1][-1].kind_of?( Event ) and
             arry[-1][-1].event_type == :text and @value
 
             arry[-1][-1].event_arg = evt[1]
             @value = false
-          end
+         end
         else
           arry << [] if evt[0] == :start_element
           arry[-1] << generate_event( evt )
@@ -478,7 +478,7 @@ module REXML
           @choices[idx] = old
           @choice += 1
         end
-        
+
        #puts "In next with #{event.inspect}."
        #puts "events is #{@events.inspect}"
         @events = [] unless @events
@@ -490,7 +490,7 @@ module REXML
         next_current(event) unless @events[@current]
         return nil unless @events[@current]
 
-        expand_ref_in( @events, @current ) if @events[@current].class == Ref 
+        expand_ref_in( @events, @current ) if @events[@current].class == Ref
        #puts "In next with #{event.inspect}."
        #puts "Next (#@current) is #{@events[@current]}"
         if ( @events[@current].kind_of? State )
@@ -530,7 +530,7 @@ module REXML
         #puts "IN CHOICE EXPECTED"
         #puts "EVENTS = #{@events.inspect}"
         return [@events[@current]] if @events[@current]
-        return @choices[@choice..-1].collect do |x| 
+        return @choices[@choice..-1].collect do |x|
           if x[0].kind_of? State
             x[0].expected
           else
diff --git a/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb
index 160ea96b31..f0ffa78912 100644
--- a/lib/rexml/validation/validation.rb
+++ b/lib/rexml/validation/validation.rb
@@ -14,7 +14,7 @@ module REXML
       def dump
         puts @root.inspect
       end
-      def validate( event ) 
+      def validate( event )
         #puts "Current: #@current"
         #puts "Event: #{event.inspect}"
         @attr_stack = [] unless defined? @attr_stack
@@ -33,12 +33,12 @@ module REXML
             sattr = [:start_attribute, nil]
             eattr = [:end_attribute]
             text = [:text, nil]
-            k,v = event[2].find { |k,v| 
-              sattr[1] = k
+            k,v = event[2].find { |key,value|
+              sattr[1] = key
               #puts "Looking for #{sattr.inspect}"
               m = @current.next( sattr )
               #puts "Got #{m.inspect}"
-              if m 
+              if m
                 # If the state has text children...
                 #puts "Looking for #{eattr.inspect}"
                 #puts "Expect #{m.expected}"
@@ -47,7 +47,7 @@ module REXML
                   @current = m
                 else
                   #puts "Didn't get end"
-                  text[1] = v
+                  text[1] = value
                   #puts "Looking for #{text.inspect}"
                   m = m.next( text )
                   #puts "Got #{m.inspect}"
diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb
index 427eb78cf8..361e4b7106 100644
--- a/lib/rexml/xmldecl.rb
+++ b/lib/rexml/xmldecl.rb
@@ -2,40 +2,40 @@ require 'rexml/encoding'
 require 'rexml/source'
 
 module REXML
-	# NEEDS DOCUMENTATION
-	class XMLDecl < Child
-		include Encoding
+  # NEEDS DOCUMENTATION
+  class XMLDecl < Child
+    include Encoding
 
-		DEFAULT_VERSION = "1.0";
-		DEFAULT_ENCODING = "UTF-8";
-		DEFAULT_STANDALONE = "no";
-		START = '<\?xml';
-		STOP = '\?>';
+    DEFAULT_VERSION = "1.0";
+    DEFAULT_ENCODING = "UTF-8";
+    DEFAULT_STANDALONE = "no";
+    START = '<\?xml';
+    STOP = '\?>';
 
-		attr_accessor :version, :standalone
+    attr_accessor :version, :standalone
     attr_reader :writeencoding, :writethis
 
-		def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
+    def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
       @writethis = true
       @writeencoding = !encoding.nil?
-			if version.kind_of? XMLDecl
-				super()
-				@version = version.version
-				self.encoding = version.encoding
+      if version.kind_of? XMLDecl
+        super()
+        @version = version.version
+        self.encoding = version.encoding
         @writeencoding = version.writeencoding
-				@standalone = version.standalone
-			else
-				super()
-				@version = version
-				self.encoding = encoding
-				@standalone = standalone
-			end
-			@version = DEFAULT_VERSION if @version.nil?
-		end
-
-		def clone
-			XMLDecl.new(self)
-		end
+        @standalone = version.standalone
+      else
+        super()
+        @version = version
+        self.encoding = encoding
+        @standalone = standalone
+      end
+      @version = DEFAULT_VERSION if @version.nil?
+    end
+
+    def clone
+      XMLDecl.new(self)
+    end
 
     # indent::
     #   Ignored.  There must be no whitespace before an XML declaration
@@ -43,35 +43,35 @@ module REXML
     #   Ignored
     # ie_hack::
     #   Ignored
-		def write(writer, indent=-1, transitive=false, ie_hack=false)
+    def write(writer, indent=-1, transitive=false, ie_hack=false)
       return nil unless @writethis or writer.kind_of? Output
-			writer << START.sub(/\\/u, '')
+      writer << START.sub(/\\/u, '')
       if writer.kind_of? Output
         writer << " #{content writer.encoding}"
       else
         writer << " #{content encoding}"
       end
-			writer << STOP.sub(/\\/u, '')
-		end
-
-		def ==( other )
-		  other.kind_of?(XMLDecl) and
-		  other.version == @version and
-		  other.encoding == self.encoding and
-		  other.standalone == @standalone
-		end
-
-		def xmldecl version, encoding, standalone
-			@version = version
-			self.encoding = encoding
-			@standalone = standalone
-		end
-
-		def node_type
-			:xmldecl
-		end
-
-		alias :stand_alone? :standalone
+      writer << STOP.sub(/\\/u, '')
+    end
+
+    def ==( other )
+      other.kind_of?(XMLDecl) and
+      other.version == @version and
+      other.encoding == self.encoding and
+      other.standalone == @standalone
+    end
+
+    def xmldecl version, encoding, standalone
+      @version = version
+      self.encoding = encoding
+      @standalone = standalone
+    end
+
+    def node_type
+      :xmldecl
+    end
+
+    alias :stand_alone? :standalone
     alias :old_enc= :encoding=
 
     def encoding=( enc )
@@ -108,12 +108,12 @@ module REXML
       START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
     end
 
-		private
-		def content(enc)
-			rv = "version='#@version'"
-			rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
-			rv << " standalone='#@standalone'" if @standalone
-			rv
-		end
-	end
+    private
+    def content(enc)
+      rv = "version='#@version'"
+      rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
+      rv << " standalone='#@standalone'" if @standalone
+      rv
+    end
+  end
 end
diff --git a/lib/rexml/xmltokens.rb b/lib/rexml/xmltokens.rb
index 6bbe5b07d5..7dc4e8b2ba 100644
--- a/lib/rexml/xmltokens.rb
+++ b/lib/rexml/xmltokens.rb
@@ -1,18 +1,18 @@
 module REXML
-	# Defines a number of tokens used for parsing XML.  Not for general
-	# consumption.
-	module XMLTokens
-		NCNAME_STR= '[\w:][\-\w\d.]*'
-		NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
+  # Defines a number of tokens used for parsing XML.  Not for general
+  # consumption.
+  module XMLTokens
+    NCNAME_STR= '[\w:][\-\w.]*'
+    NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
 
-		NAMECHAR = '[\-\w\d\.:]'
-		NAME = "([\\w:]#{NAMECHAR}*)"
-		NMTOKEN = "(?:#{NAMECHAR})+"
-		NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
-		REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
+    NAMECHAR = '[\-\w\.:]'
+    NAME = "([\\w:]#{NAMECHAR}*)"
+    NMTOKEN = "(?:#{NAMECHAR})+"
+    NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
+    REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
 
-		#REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
-		#ENTITYREF = "&#{NAME};"
-		#CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
-	end
+    #REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
+    #ENTITYREF = "&#{NAME};"
+    #CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
+  end
 end
diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb
index 939399e283..5f7ecefe29 100644
--- a/lib/rexml/xpath.rb
+++ b/lib/rexml/xpath.rb
@@ -2,65 +2,76 @@ require 'rexml/functions'
 require 'rexml/xpath_parser'
 
 module REXML
-	# Wrapper class.  Use this class to access the XPath functions.
-	class XPath
-		include Functions
-		EMPTY_HASH = {}
+  # Wrapper class.  Use this class to access the XPath functions.
+  class XPath
+    include Functions
+    EMPTY_HASH = {}
 
-		# Finds and returns the first node that matches the supplied xpath.
-		# element::
-		# 	The context element
-		# path::
-		# 	The xpath to search for.  If not supplied or nil, returns the first
-		# 	node matching '*'.
-		# namespaces::
-		# 	If supplied, a Hash which defines a namespace mapping.
-		#
-		#  XPath.first( node )
-		#  XPath.first( doc, "//b"} )
-		#  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
+    # Finds and returns the first node that matches the supplied xpath.
+    # element::
+    # 	The context element
+    # path::
+    # 	The xpath to search for.  If not supplied or nil, returns the first
+    # 	node matching '*'.
+    # namespaces::
+    # 	If supplied, a Hash which defines a namespace mapping.
+    # variables::
+    #   If supplied, a Hash which maps $variables in the query
+    #   to values. This can be used to avoid XPath injection attacks
+    #   or to automatically handle escaping string values.
+    #
+    #  XPath.first( node )
+    #  XPath.first( doc, "//b"} )
+    #  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
+    #  XPath.first( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"})
     def XPath::first element, path=nil, namespaces=nil, variables={}
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path, element).flatten[0]
-		end
+      parser = XPathParser.new
+      parser.namespaces = namespaces
+      parser.variables = variables
+      path = "*" unless path
+      element = [element] unless element.kind_of? Array
+      parser.parse(path, element).flatten[0]
+    end
 
-		# Itterates over nodes that match the given path, calling the supplied
-		# block with the match.
-		# element::
-		#   The context element
-		# path::
-		#   The xpath to search for.  If not supplied or nil, defaults to '*'
-		# namespaces::
-		# 	If supplied, a Hash which defines a namespace mapping
-		#
-		#  XPath.each( node ) { |el| ... }
-		#  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
-		#  XPath.each( node, 'ancestor::x' ) { |el| ... }
-		def XPath::each element, path=nil, namespaces=nil, variables={}, &block
+    # Iterates over nodes that match the given path, calling the supplied
+    # block with the match.
+    # element::
+    #   The context element
+    # path::
+    #   The xpath to search for.  If not supplied or nil, defaults to '*'
+    # namespaces::
+    # 	If supplied, a Hash which defines a namespace mapping
+    # variables::
+    #   If supplied, a Hash which maps $variables in the query
+    #   to values. This can be used to avoid XPath injection attacks
+    #   or to automatically handle escaping string values.
+    #
+    #  XPath.each( node ) { |el| ... }
+    #  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
+    #  XPath.each( node, 'ancestor::x' ) { |el| ... }
+    #  XPath.each( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) \
+    #    {|el| ... }
+    def XPath::each element, path=nil, namespaces=nil, variables={}, &block
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path, element).each( &block )
-		end
+      parser = XPathParser.new
+      parser.namespaces = namespaces
+      parser.variables = variables
+      path = "*" unless path
+      element = [element] unless element.kind_of? Array
+      parser.parse(path, element).each( &block )
+    end
 
-		# Returns an array of nodes matching a given XPath.  
-		def XPath::match element, path=nil, namespaces=nil, variables={}
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path,element)
-		end
-	end
+    # Returns an array of nodes matching a given XPath.
+    def XPath::match element, path=nil, namespaces=nil, variables={}
+      parser = XPathParser.new
+      parser.namespaces = namespaces
+      parser.variables = variables
+      path = "*" unless path
+      element = [element] unless element.kind_of? Array
+      parser.parse(path,element)
+    end
+  end
 end
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index eb608fdb34..d9088a25d9 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -88,7 +88,7 @@ module REXML
 
       case path[0]
       when :document
-        # do nothing 
+        # do nothing
         return first( path[1..-1], node )
       when :child
         for c in node.children
@@ -123,7 +123,7 @@ module REXML
     end
 
 
-    def match( path_stack, nodeset ) 
+    def match( path_stack, nodeset )
       #puts "MATCH: path_stack = #{path_stack.inspect}"
       #puts "MATCH: nodeset = #{nodeset.inspect}"
       r = expr( path_stack, nodeset )
@@ -136,7 +136,7 @@ module REXML
 
     # Returns a String namespace for a node, given a prefix
     # The rules are:
-    # 
+    #
     #  1. Use the supplied namespace mapping first.
     #  2. If no mapping was supplied, use the context node to look up the namespace
     def get_namespace( node, prefix )
@@ -187,8 +187,8 @@ module REXML
                 #puts "node.namespace == #{ns.inspect} => #{node.namespace == ns}"
               end
             end
-            !(node.node_type == :element and 
-              node.name == name and 
+            !(node.node_type == :element and
+              node.name == name and
               node.namespace == ns )
           end
           node_types = ELEMENTS
@@ -205,7 +205,7 @@ module REXML
         when :processing_instruction
           target = path_stack.shift
           nodeset.delete_if do |node|
-            (node.node_type != :processing_instruction) or 
+            (node.node_type != :processing_instruction) or
             ( target!='' and ( node.target != target ) )
           end
 
@@ -222,7 +222,7 @@ module REXML
         when :child
           new_nodeset = []
           nt = nil
-          for node in nodeset
+          nodeset.each do |node|
             nt = node.node_type
             new_nodeset += node.children if nt == :element or nt == :document
           end
@@ -231,7 +231,7 @@ module REXML
 
         when :literal
           return path_stack.shift
-        
+
         when :attribute
           new_nodeset = []
           case path_stack.shift
@@ -266,7 +266,7 @@ module REXML
 
         when :ancestor
           new_nodeset = []
-          for node in nodeset
+          nodeset.each do |node|
             while node.parent
               node = node.parent
               new_nodeset << node unless new_nodeset.include? node
@@ -277,7 +277,7 @@ module REXML
 
         when :ancestor_or_self
           new_nodeset = []
-          for node in nodeset
+          nodeset.each do |node|
             if node.node_type == :element
               new_nodeset << node
               while ( node.parent )
@@ -341,7 +341,7 @@ module REXML
         when :descendant
           results = []
           nt = nil
-          for node in nodeset
+          nodeset.each do |node|
             nt = node.node_type
             results += expr( path_stack.dclone.unshift( :descendant_or_self ),
               node.children ) if nt == :element or nt == :document
@@ -376,7 +376,7 @@ module REXML
 
         when :preceding
           new_nodeset = []
-          for node in nodeset
+          nodeset.each do |node|
             new_nodeset += preceding( node )
           end
           #puts "NEW NODESET => #{new_nodeset.inspect}"
@@ -385,7 +385,7 @@ module REXML
 
         when :following
           new_nodeset = []
-          for node in nodeset
+          nodeset.each do |node|
             new_nodeset += following( node )
           end
           nodeset = new_nodeset
@@ -395,7 +395,7 @@ module REXML
           #puts "In :namespace"
           new_nodeset = []
           prefix = path_stack.shift
-          for node in nodeset
+          nodeset.each do |node|
             if (node.node_type == :element or node.node_type == :attribute)
               if @namespaces
                 namespaces = @namespaces
@@ -419,10 +419,10 @@ module REXML
           return @variables[ var_name ]
 
         # :and, :or, :eq, :neq, :lt, :lteq, :gt, :gteq
-				# TODO: Special case for :or and :and -- not evaluate the right
-				# operand if the left alone determines result (i.e. is true for
-				# :or and false for :and).
-        when :eq, :neq, :lt, :lteq, :gt, :gteq, :and, :or
+        # TODO: Special case for :or and :and -- not evaluate the right
+        # operand if the left alone determines result (i.e. is true for
+        # :or and false for :and).
+        when :eq, :neq, :lt, :lteq, :gt, :gteq, :or
           left = expr( path_stack.shift, nodeset.dup, context )
           #puts "LEFT => #{left.inspect} (#{left.class.name})"
           right = expr( path_stack.shift, nodeset.dup, context )
@@ -434,7 +434,8 @@ module REXML
         when :and
           left = expr( path_stack.shift, nodeset.dup, context )
           #puts "LEFT => #{left.inspect} (#{left.class.name})"
-          if left == false || left.nil? || !left.inject(false) {|a,b| a | b}
+          return [] unless left
+          if left.respond_to?(:inject) and !left.inject(false) {|a,b| a | b}
             return []
           end
           right = expr( path_stack.shift, nodeset.dup, context )
@@ -481,23 +482,23 @@ module REXML
         when :function
           func_name = path_stack.shift.tr('-','_')
           arguments = path_stack.shift
-          #puts "FUNCTION 0: #{func_name}(#{arguments.collect{|a|a.inspect}.join(', ')})" 
+          #puts "FUNCTION 0: #{func_name}(#{arguments.collect{|a|a.inspect}.join(', ')})"
           subcontext = context ? nil : { :size => nodeset.size }
 
           res = []
           cont = context
-          nodeset.each_with_index { |n, i| 
+          nodeset.each_with_index { |n, i|
             if subcontext
               subcontext[:node]  = n
               subcontext[:index] = i
               cont = subcontext
             end
             arg_clone = arguments.dclone
-            args = arg_clone.collect { |arg| 
+            args = arg_clone.collect { |arg|
               #puts "FUNCTION 1: Calling expr( #{arg.inspect}, [#{n.inspect}] )"
-              expr( arg, [n], cont ) 
+              expr( arg, [n], cont )
             }
-            #puts "FUNCTION 2: #{func_name}(#{args.collect{|a|a.inspect}.join(', ')})" 
+            #puts "FUNCTION 2: #{func_name}(#{args.collect{|a|a.inspect}.join(', ')})"
             Functions.context = cont
             res << Functions.send( func_name, *args )
             #puts "FUNCTION 3: #{res[-1].inspect}"
@@ -515,10 +516,10 @@ module REXML
     # FIXME
     # The next two methods are BAD MOJO!
     # This is my achilles heel.  If anybody thinks of a better
-    # way of doing this, be my guest.  This really sucks, but 
+    # way of doing this, be my guest.  This really sucks, but
     # it is a wonder it works at all.
     # ########################################################
-    
+
     def descendant_or_self( path_stack, nodeset )
       rs = []
       #puts "#"*80
@@ -547,7 +548,7 @@ module REXML
     # Reorders an array of nodes so that they are in document order
     # It tries to do this efficiently.
     #
-    # FIXME: I need to get rid of this, but the issue is that most of the XPath 
+    # FIXME: I need to get rid of this, but the issue is that most of the XPath
     # interpreter functions as a filter, which means that we lose context going
     # in and out of function calls.  If I knew what the index of the nodes was,
     # I wouldn't have to do this.  Maybe add a document IDX for each node?
@@ -555,7 +556,7 @@ module REXML
     def document_order( array_of_nodes )
       new_arry = []
       array_of_nodes.each { |node|
-        node_idx = [] 
+        node_idx = []
         np = node.node_type == :attribute ? node.element : node
         while np.parent and np.parent.node_type == :element
           node_idx << np.parent.index( np )
@@ -579,7 +580,7 @@ module REXML
 
     # Builds a nodeset of all of the preceding nodes of the supplied node,
     # in reverse document order
-    # preceding:: includes every element in the document that precedes this node, 
+    # preceding:: includes every element in the document that precedes this node,
     # except for ancestors
     def preceding( node )
       #puts "IN PRECEDING"
@@ -609,9 +610,9 @@ module REXML
      #puts "NODE: #{node.inspect}"
      #puts "PREVIOUS NODE: #{node.previous_sibling_node.inspect}"
      #puts "PARENT NODE: #{node.parent}"
-      psn = node.previous_sibling_node 
+      psn = node.previous_sibling_node
       if psn.nil?
-        if node.parent.nil? or node.parent.class == Document 
+        if node.parent.nil? or node.parent.class == Document
           return nil
         end
         return node.parent
@@ -647,9 +648,9 @@ module REXML
     end
 
     def next_sibling_node(node)
-      psn = node.next_sibling_node 
+      psn = node.next_sibling_node
       while psn.nil?
-        if node.parent.nil? or node.parent.class == Document 
+        if node.parent.nil? or node.parent.class == Document
           return nil
         end
         node = node.parent
@@ -675,7 +676,7 @@ module REXML
     def equality_relational_compare( set1, op, set2 )
       #puts "EQ_REL_COMP(#{set1.inspect} #{op.inspect} #{set2.inspect})"
       if set1.kind_of? Array and set2.kind_of? Array
-			  #puts "#{set1.size} & #{set2.size}"
+        #puts "#{set1.size} & #{set2.size}"
         if set1.size == 1 and set2.size == 1
           set1 = set1[0]
           set2 = set2[0]
@@ -696,7 +697,7 @@ module REXML
           return res
         end
       end
-		  #puts "EQ_REL_COMP: #{set1.inspect} (#{set1.class.name}), #{op}, #{set2.inspect} (#{set2.class.name})"
+      #puts "EQ_REL_COMP: #{set1.inspect} (#{set1.class.name}), #{op}, #{set2.inspect} (#{set2.class.name})"
       #puts "COMPARING VALUES"
       # If one is nodeset and other is number, compare number to each item
       # in nodeset s.t. number op number(string(item))
@@ -705,7 +706,7 @@ module REXML
       # If one is nodeset and other is boolean, compare boolean to each item
       # in nodeset s.t. boolean op boolean(item)
       if set1.kind_of? Array or set2.kind_of? Array
-			  #puts "ISA ARRAY"
+        #puts "ISA ARRAY"
         if set1.kind_of? Array
           a = set1
           b = set2
@@ -724,7 +725,7 @@ module REXML
           #puts "B = #{b.inspect}"
           return a.collect {|v| compare( Functions::number(v), op, b )}
         else
-				  #puts "Functions::string( #{b}(#{b.class.name}) ) = #{Functions::string(b)}"
+          #puts "Functions::string( #{b}(#{b.class.name}) ) = #{Functions::string(b)}"
           b = Functions::string( b )
           return a.collect { |v| compare( Functions::string(v), op, b ) }
         end
diff --git a/lib/rinda/.document b/lib/rinda/.document
new file mode 100644
index 0000000000..598977af68
--- /dev/null
+++ b/lib/rinda/.document
@@ -0,0 +1,3 @@
+rinda.rb
+ring.rb
+tuplespace.rb
diff --git a/lib/rinda/rinda.rb b/lib/rinda/rinda.rb
index 6c59e68654..18e284a544 100644
--- a/lib/rinda/rinda.rb
+++ b/lib/rinda/rinda.rb
@@ -58,7 +58,7 @@ module Rinda
 
     ##
     # The number of elements in the tuple.
-    
+
     def size
       @tuple.size
     end
@@ -162,7 +162,7 @@ module Rinda
       end
       return true
     end
-    
+
     ##
     # Alias for #match.
 
@@ -171,7 +171,7 @@ module Rinda
     end
 
   end
-  
+
   ##
   # <i>Documentation?</i>
 
@@ -184,7 +184,7 @@ module Rinda
       @drb_uri = uri
       @drb_ref = ref
     end
-    
+
     ##
     # This DRbObjectTemplate matches +ro+ if the remote object's drburi and
     # drbref are the same.  +nil+ is used as a wildcard.
@@ -213,14 +213,14 @@ module Rinda
     def initialize(ts)
       @ts = ts
     end
-    
+
     ##
     # Adds +tuple+ to the proxied TupleSpace.  See TupleSpace#write.
 
     def write(tuple, sec=nil)
       @ts.write(tuple, sec)
     end
-    
+
     ##
     # Takes +tuple+ from the proxied TupleSpace.  See TupleSpace#take.
 
@@ -229,14 +229,14 @@ module Rinda
       @ts.move(DRbObject.new(port), tuple, sec, &block)
       port[0]
     end
-    
+
     ##
     # Reads +tuple+ from the proxied TupleSpace.  See TupleSpace#read.
 
     def read(tuple, sec=nil, &block)
       @ts.read(tuple, sec, &block)
     end
-    
+
     ##
     # Reads all tuples matching +tuple+ from the proxied TupleSpace.  See
     # TupleSpace#read_all.
@@ -244,7 +244,7 @@ module Rinda
     def read_all(tuple)
       @ts.read_all(tuple)
     end
-    
+
     ##
     # Registers for notifications of event +ev+ on the proxied TupleSpace.
     # See TupleSpace#notify
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index ac8a716216..b25fd99856 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -19,7 +19,7 @@ module Rinda
   # 1. A RingServer begins listening on the broadcast UDP address.
   # 2. A RingFinger sends a UDP packet containing the DRb URI where it will
   #    listen for a reply.
-  # 3. The RingServer recieves the UDP packet and connects back to the
+  # 3. The RingServer receives the UDP packet and connects back to the
   #    provided DRb URI with the DRb service.
 
   class RingServer
@@ -49,7 +49,7 @@ module Rinda
 	end
       end
     end
-  
+
     ##
     # Extracts the response URI from +msg+ and adds it to TupleSpace where it
     # will be picked up by +reply_service+ for notification.
@@ -74,13 +74,13 @@ module Rinda
 	end
       end
     end
-    
+
     ##
     # Pulls lookup tuples out of the TupleSpace and sends their DRb object the
     # address of the local TupleSpace.
 
     def do_reply
-      tuple = @ts.take([:lookup_ring, nil])
+      tuple = @ts.take([:lookup_ring, DRbObject])
       Thread.new { tuple[1].call(@ts) rescue nil}
     rescue
     end
@@ -104,7 +104,7 @@ module Rinda
     # created RingFinger.
 
     def self.finger
-      unless @@finger 
+      unless @@finger
 	@@finger = self.new
 	@@finger.lookup_ring_any
       end
@@ -119,7 +119,7 @@ module Rinda
     end
 
     ##
-    # Contains all discoverd TupleSpaces except for the primary.
+    # Contains all discovered TupleSpaces except for the primary.
 
     def self.to_a
       finger.to_a
@@ -207,7 +207,7 @@ module Rinda
 	  @rings.push(it)
 	end
       end
-      
+
       @primary = queue.pop
       raise('RingNotFound') if @primary.nil?
       @primary
@@ -256,15 +256,15 @@ if __FILE__ == $0
     $stdin.gets
   when 'w'
     finger = Rinda::RingFinger.new(nil)
-    finger.lookup_ring do |ts|
-      p ts
-      ts.write([:hello, :world])
+    finger.lookup_ring do |ts2|
+      p ts2
+      ts2.write([:hello, :world])
     end
   when 'r'
     finger = Rinda::RingFinger.new(nil)
-    finger.lookup_ring do |ts|
-      p ts
-      p ts.take([nil, nil])
+    finger.lookup_ring do |ts2|
+      p ts2
+      p ts2.take([nil, nil])
     end
   end
 end
diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
index 6d58a0fd15..113aa0de15 100644
--- a/lib/rinda/tuplespace.rb
+++ b/lib/rinda/tuplespace.rb
@@ -2,6 +2,8 @@ require 'monitor'
 require 'thread'
 require 'drb/drb'
 require 'rinda/rinda'
+require 'enumerator'
+require 'forwardable'
 
 module Rinda
 
@@ -71,14 +73,14 @@ module Rinda
     end
 
     ##
-    # Reset the expiry time according to +sec_or_renewer+.  
+    # Reset the expiry time according to +sec_or_renewer+.
     #
     # +nil+::    it is set to expire in the far future.
     # +false+::  it has expired.
     # Numeric::  it will expire in that many seconds.
     #
     # Otherwise the argument refers to some kind of renewer object
-    # which will reset its expiry time. 
+    # which will reset its expiry time.
 
     def renew(sec_or_renewer)
       sec, @renewer = get_renewer(sec_or_renewer)
@@ -166,7 +168,7 @@ module Rinda
     def match(tuple)
       @tuple.match(tuple)
     end
-    
+
     alias === match
 
     def make_tuple(ary) # :nodoc:
@@ -222,11 +224,11 @@ module Rinda
   #
   #   ts = Rinda::TupleSpace.new
   #   observer = ts.notify 'write', [nil]
-  #   
+  #
   #   Thread.start do
   #     observer.each { |t| p t }
   #   end
-  #   
+  #
   #   3.times { |i| ts.write [i] }
   #
   # Outputs:
@@ -274,7 +276,7 @@ module Rinda
         it = pop
         yield(it)
       end
-    rescue 
+    rescue
     ensure
       cancel
     end
@@ -286,45 +288,70 @@ module Rinda
   # of Tuplespace.
 
   class TupleBag
+    class TupleBin
+      extend Forwardable
+      def_delegators '@bin', :find_all, :delete_if, :each, :empty?
+
+      def initialize
+        @bin = []
+      end
+
+      def add(tuple)
+        @bin.push(tuple)
+      end
+
+      def delete(tuple)
+        idx = @bin.rindex(tuple)
+        @bin.delete_at(idx) if idx
+      end
+
+      def find(&blk)
+        @bin.reverse_each do |x|
+          return x if yield(x)
+        end
+        nil
+      end
+    end
 
     def initialize # :nodoc:
       @hash = {}
+      @enum = enum_for(:each_entry)
     end
 
     ##
     # +true+ if the TupleBag to see if it has any expired entries.
 
     def has_expires?
-      @hash.each do |k, v|
-        v.each do |tuple|
-          return true if tuple.expires
-        end
+      @enum.find do |tuple|
+        tuple.expires
       end
-      false
     end
 
     ##
-    # Add +ary+ to the TupleBag.
+    # Add +tuple+ to the TupleBag.
 
-    def push(ary)
-      size = ary.size
-      @hash[size] ||= []
-      @hash[size].push(ary)
+    def push(tuple)
+      key = bin_key(tuple)
+      @hash[key] ||= TupleBin.new
+      @hash[key].add(tuple)
     end
 
     ##
-    # Removes +ary+ from the TupleBag.
+    # Removes +tuple+ from the TupleBag.
 
-    def delete(ary)
-      size = ary.size
-      @hash.fetch(size, []).delete(ary)
+    def delete(tuple)
+      key = bin_key(tuple)
+      bin = @hash[key]
+      return nil unless bin
+      bin.delete(tuple)
+      @hash.delete(key) if bin.empty?
+      tuple
     end
 
     ##
     # Finds all live tuples that match +template+.
-
     def find_all(template)
-      @hash.fetch(template.size, []).find_all do |tuple|
+      bin_for_find(template).find_all do |tuple|
         tuple.alive? && template.match(tuple)
       end
     end
@@ -333,7 +360,7 @@ module Rinda
     # Finds a live tuple that matches +template+.
 
     def find(template)
-      @hash.fetch(template.size, []).find do |tuple|
+      bin_for_find(template).find do |tuple|
         tuple.alive? && template.match(tuple)
       end
     end
@@ -343,7 +370,7 @@ module Rinda
     # +tuple+ and are alive.
 
     def find_all_template(tuple)
-      @hash.fetch(tuple.size, []).find_all do |template|
+      @enum.find_all do |template|
         template.alive? && template.match(tuple)
       end
     end
@@ -354,20 +381,39 @@ module Rinda
 
     def delete_unless_alive
       deleted = []
-      @hash.keys.each do |size|
-        ary = []
-        @hash[size].each do |tuple|
+      @hash.each do |key, bin|
+        bin.delete_if do |tuple|
           if tuple.alive?
-            ary.push(tuple)
+            false
           else
             deleted.push(tuple)
+            true
           end
         end
-        @hash[size] = ary
       end
       deleted
     end
 
+    private
+    def each_entry(&blk)
+      @hash.each do |k, v|
+        v.each(&blk)
+      end
+    end
+
+    def bin_key(tuple)
+      head = tuple[0]
+      if head.class == Symbol
+        return head
+      else
+        false
+      end
+    end
+
+    def bin_for_find(template)
+      key = bin_key(template)
+      key ? @hash.fetch(key, []) : @enum
+    end
   end
 
   ##
@@ -403,7 +449,7 @@ module Rinda
     # Adds +tuple+
 
     def write(tuple, sec=nil)
-      entry = TupleEntry.new(tuple, sec)
+      entry = create_entry(tuple, sec)
       synchronize do
         if entry.expired?
           @read_waiter.find_all_template(entry).each do |template|
@@ -529,6 +575,10 @@ module Rinda
 
     private
 
+    def create_entry(tuple, sec)
+      TupleEntry.new(tuple, sec)
+    end
+
     ##
     # Removes dead tuples.
 
@@ -567,11 +617,11 @@ module Rinda
       return if @keeper && @keeper.alive?
       @keeper = Thread.new do
         while true
+          sleep(@period)
           synchronize do
             break unless need_keeper?
             keep_clean
           end
-          sleep(@period)
         end
       end
     end
diff --git a/lib/rss.rb b/lib/rss.rb
index 495edb1b98..a1d0f76ba1 100644
--- a/lib/rss.rb
+++ b/lib/rss.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 Kouhei Sutou.  You can redistribute it and/or
+# Copyright (c) 2003-2007 Kouhei Sutou.  You can redistribute it and/or
 # modify it under the same terms as Ruby.
 #
 # Author:: Kouhei Sutou <kou@cozmixng.org>
@@ -6,11 +6,14 @@
 
 require 'rss/1.0'
 require 'rss/2.0'
+require 'rss/atom'
 require 'rss/content'
 require 'rss/dublincore'
 require 'rss/image'
+require 'rss/itunes'
+require 'rss/slash'
 require 'rss/syndication'
-#require 'rss/taxonomy'
+require 'rss/taxonomy'
 require 'rss/trackback'
 
 require "rss/maker"
diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb
index 69e01ddd57..28ef768274 100644
--- a/lib/rss/0.9.rb
+++ b/lib/rss/0.9.rb
@@ -8,7 +8,7 @@ module RSS
 
     def self.append_features(klass)
       super
-      
+
       klass.install_must_call_validator('', "")
     end
   end
@@ -22,10 +22,13 @@ module RSS
       install_have_child_element(name, "", nil)
     end
 
-    attr_accessor :rss_version, :version, :encoding, :standalone
-    
-    def initialize(rss_version, version=nil, encoding=nil, standalone=nil)
+    attr_writer :feed_version
+    alias_method(:rss_version, :feed_version)
+    alias_method(:rss_version=, :feed_version=)
+
+    def initialize(feed_version, version=nil, encoding=nil, standalone=nil)
       super
+      @feed_type = "rss"
     end
 
     def items
@@ -57,12 +60,14 @@ module RSS
       items.each do |item|
         item.setup_maker(maker.items)
       end
+      image.setup_maker(maker) if image
+      textinput.setup_maker(maker) if textinput
     end
 
     private
     def _attrs
       [
-        ["version", true, "rss_version"],
+        ["version", true, "feed_version"],
       ]
     end
 
@@ -118,7 +123,7 @@ module RSS
       def not_need_to_call_setup_maker_variables
         %w(image textInput)
       end
-    
+
       class SkipDays < Element
         include RSS09
 
@@ -141,11 +146,11 @@ module RSS
               self.content = args[0]
             end
           end
-      
+
         end
-        
+
       end
-      
+
       class SkipHours < Element
         include RSS09
 
@@ -169,13 +174,13 @@ module RSS
             end
           end
         end
-        
+
       end
-      
+
       class Image < Element
 
         include RSS09
-        
+
         %w(url title link).each do |name|
           install_text_element(name, "", nil)
         end
@@ -234,9 +239,9 @@ module RSS
           end
         end
       end
-      
+
       class Item < Element
-        
+
         include RSS09
 
         [
@@ -264,7 +269,7 @@ module RSS
           @enclosure.setup_maker(item) if @enclosure
           @source.setup_maker(item) if @source
         end
-        
+
         class Source < Element
 
           include RSS09
@@ -274,7 +279,7 @@ module RSS
           ].each do |name, uri, required|
             install_get_attribute(name, uri, required)
           end
-          
+
           content_setup
 
           def initialize(*args)
@@ -336,7 +341,7 @@ module RSS
         class Category < Element
 
           include RSS09
-          
+
           [
             ["domain", "", false]
           ].each do |name, uri, required|
@@ -364,11 +369,11 @@ module RSS
             category.domain = domain
             category.content = content
           end
-          
+
         end
 
       end
-      
+
       class TextInput < Element
 
         include RSS09
@@ -394,29 +399,30 @@ module RSS
           maker.textinput
         end
       end
-      
+
     end
-    
+
   end
 
   RSS09::ELEMENTS.each do |name|
-    BaseListener.install_get_text_element("", name, "#{name}=")
+    BaseListener.install_get_text_element("", name, name)
   end
 
   module ListenerMixin
     private
-    def start_rss(tag_name, prefix, attrs, ns)
-      check_ns(tag_name, prefix, ns, "")
-      
+    def initial_start_rss(tag_name, prefix, attrs, ns)
+      check_ns(tag_name, prefix, ns, "", false)
+
       @rss = Rss.new(attrs['version'], @version, @encoding, @standalone)
       @rss.do_validate = @do_validate
       @rss.xml_stylesheets = @xml_stylesheets
       @last_element = @rss
-      @proc_stack.push Proc.new { |text, tags|
+      pr = Proc.new do |text, tags|
         @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate
-      }
+      end
+      @proc_stack.push(pr)
     end
-    
+
   end
 
 end
diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb
index a945434fbf..2ff53b4723 100644
--- a/lib/rss/1.0.rb
+++ b/lib/rss/1.0.rb
@@ -8,7 +8,7 @@ module RSS
 
     def self.append_features(klass)
       super
-      
+
       klass.install_must_call_validator('', ::RSS::URI)
     end
 
@@ -45,10 +45,10 @@ module RSS
       __send__("install_have_#{type}_element", tag, ::RSS::URI, occurs)
     end
 
-    attr_accessor :rss_version, :version, :encoding, :standalone
-    
+    alias_method(:rss_version, :feed_version)
     def initialize(version=nil, encoding=nil, standalone=nil)
       super('1.0', version, encoding, standalone)
+      @feed_type = "rss"
     end
 
     def full_name
@@ -64,13 +64,13 @@ module RSS
           URI
         end
       end
-      
+
       [
         ["resource", [URI, ""], true]
       ].each do |name, uri, required|
         install_get_attribute(name, uri, required)
       end
-      
+
       def initialize(*args)
         if Utils.element_initialize_arguments?(args)
           super
@@ -98,10 +98,10 @@ module RSS
       end
 
       @tag_name = 'Seq'
-      
+
       install_have_children_element("li", URI, "*")
       install_must_call_validator('rdf', ::RSS::RDF::URI)
-      
+
       def initialize(*args)
         if Utils.element_initialize_arguments?(args)
           super
@@ -114,7 +114,7 @@ module RSS
       def full_name
         tag_name_with_prefix(PREFIX)
       end
-      
+
       def setup_maker(target)
         lis.each do |li|
           target << li.resource
@@ -135,10 +135,10 @@ module RSS
       end
 
       @tag_name = 'Bag'
-      
+
       install_have_children_element("li", URI, "*")
       install_must_call_validator('rdf', URI)
-      
+
       def initialize(*args)
         if Utils.element_initialize_arguments?(args)
           super
@@ -151,7 +151,7 @@ module RSS
       def full_name
         tag_name_with_prefix(PREFIX)
       end
-      
+
       def setup_maker(target)
         lis.each do |li|
           target << li.resource
@@ -162,7 +162,7 @@ module RSS
     class Channel < Element
 
       include RSS10
-      
+
       class << self
 
         def required_uri
@@ -202,17 +202,17 @@ module RSS
       def maker_target(maker)
         maker.channel
       end
-      
+
       def setup_maker_attributes(channel)
         channel.about = about
       end
 
       class Image < Element
-        
+
         include RSS10
 
         class << self
-          
+
           def required_uri
             ::RSS::URI
           end
@@ -225,7 +225,7 @@ module RSS
           install_get_attribute(name, uri, required, nil, nil,
                                 "#{PREFIX}:#{name}")
         end
-      
+
         def initialize(*args)
           if Utils.element_initialize_arguments?(args)
             super
@@ -237,11 +237,11 @@ module RSS
       end
 
       class Textinput < Element
-        
+
         include RSS10
 
         class << self
-          
+
           def required_uri
             ::RSS::URI
           end
@@ -254,7 +254,7 @@ module RSS
           install_get_attribute(name, uri, required, nil, nil,
                                 "#{PREFIX}:#{name}")
         end
-      
+
         def initialize(*args)
           if Utils.element_initialize_arguments?(args)
             super
@@ -264,7 +264,7 @@ module RSS
           end
         end
       end
-      
+
       class Items < Element
 
         include RSS10
@@ -272,16 +272,16 @@ module RSS
         Seq = ::RSS::RDF::Seq
 
         class << self
-          
+
           def required_uri
             ::RSS::URI
           end
-          
+
         end
 
         install_have_child_element("Seq", URI, nil)
         install_must_call_validator('rdf', URI)
-        
+
         def initialize(*args)
           if Utils.element_initialize_arguments?(args)
             super
@@ -309,7 +309,7 @@ module RSS
       include RSS10
 
       class << self
-        
+
         def required_uri
           ::RSS::URI
         end
@@ -351,7 +351,7 @@ module RSS
         def required_uri
           ::RSS::URI
         end
-        
+
       end
 
 
@@ -430,21 +430,22 @@ module RSS
   end
 
   RSS10::ELEMENTS.each do |name|
-    BaseListener.install_get_text_element(URI, name, "#{name}=")
+    BaseListener.install_get_text_element(URI, name, name)
   end
 
   module ListenerMixin
     private
-    def start_RDF(tag_name, prefix, attrs, ns)
-      check_ns(tag_name, prefix, ns, RDF::URI)
+    def initial_start_RDF(tag_name, prefix, attrs, ns)
+      check_ns(tag_name, prefix, ns, RDF::URI, false)
 
       @rss = RDF.new(@version, @encoding, @standalone)
       @rss.do_validate = @do_validate
       @rss.xml_stylesheets = @xml_stylesheets
       @last_element = @rss
-      @proc_stack.push Proc.new { |text, tags|
+      pr = Proc.new do |text, tags|
         @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate
-      }
+      end
+      @proc_stack.push(pr)
     end
   end
 
diff --git a/lib/rss/2.0.rb b/lib/rss/2.0.rb
index 44bdb4f1ae..9622c598d9 100644
--- a/lib/rss/2.0.rb
+++ b/lib/rss/2.0.rb
@@ -29,7 +29,7 @@ module RSS
       Category = Item::Category
 
       class Item
-      
+
         [
           ["comments", "?"],
           ["author", "?"],
@@ -57,9 +57,9 @@ module RSS
           _setup_maker_element(item)
           @guid.setup_maker(item) if @guid
         end
-        
+
         class Guid < Element
-          
+
           include RSS09
 
           [
@@ -105,7 +105,7 @@ module RSS
   end
 
   RSS09::ELEMENTS.each do |name|
-    BaseListener.install_get_text_element("", name, "#{name}=")
+    BaseListener.install_get_text_element("", name, name)
   end
 
 end
diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb
new file mode 100644
index 0000000000..ff8ff2249a
--- /dev/null
+++ b/lib/rss/atom.rb
@@ -0,0 +1,748 @@
+require 'rss/parser'
+
+module RSS
+  module Atom
+    URI = "http://www.w3.org/2005/Atom"
+    XHTML_URI = "http://www.w3.org/1999/xhtml"
+
+    module CommonModel
+      NSPOOL = {}
+      ELEMENTS = []
+
+      def self.append_features(klass)
+        super
+        klass.install_must_call_validator("atom", URI)
+        [
+         ["lang", :xml],
+         ["base", :xml],
+        ].each do |name, uri, required|
+          klass.install_get_attribute(name, uri, required, [nil, :inherit])
+        end
+        klass.class_eval do
+          class << self
+            def required_uri
+              URI
+            end
+
+            def need_parent?
+              true
+            end
+          end
+        end
+      end
+    end
+
+    module ContentModel
+      module ClassMethods
+        def content_type
+          @content_type ||= nil
+        end
+      end
+
+      class << self
+        def append_features(klass)
+          super
+          klass.extend(ClassMethods)
+          klass.content_setup(klass.content_type, klass.tag_name)
+        end
+      end
+
+      def maker_target(target)
+        target
+      end
+
+      private
+      def setup_maker_element_writer
+        "#{self.class.name.split(/::/).last.downcase}="
+      end
+
+      def setup_maker_element(target)
+        target.__send__(setup_maker_element_writer, content)
+        super
+      end
+    end
+
+    module URIContentModel
+      class  << self
+        def append_features(klass)
+          super
+          klass.class_eval do
+            @content_type = [nil, :uri]
+            include(ContentModel)
+          end
+        end
+      end
+    end
+
+    module TextConstruct
+      def self.append_features(klass)
+        super
+        klass.class_eval do
+          [
+           ["type", ""],
+          ].each do |name, uri, required|
+            install_get_attribute(name, uri, required, :text_type)
+          end
+
+          content_setup
+          add_need_initialize_variable("xhtml")
+
+          class << self
+            def xml_getter
+              "xhtml"
+            end
+
+            def xml_setter
+              "xhtml="
+            end
+          end
+        end
+      end
+
+      attr_writer :xhtml
+      def xhtml
+        return @xhtml if @xhtml.nil?
+        if @xhtml.is_a?(XML::Element) and
+            [@xhtml.name, @xhtml.uri] == ["div", XHTML_URI]
+          return @xhtml
+        end
+
+        children = @xhtml
+        children = [children] unless children.is_a?(Array)
+        XML::Element.new("div", nil, XHTML_URI,
+                         {"xmlns" => XHTML_URI}, children)
+      end
+
+      def have_xml_content?
+        @type == "xhtml"
+      end
+
+      def atom_validate(ignore_unknown_element, tags, uri)
+        if have_xml_content?
+          if @xhtml.nil?
+            raise MissingTagError.new("div", tag_name)
+          end
+          unless [@xhtml.name, @xhtml.uri] == ["div", XHTML_URI]
+            raise NotExpectedTagError.new(@xhtml.name, @xhtml.uri, tag_name)
+          end
+        end
+      end
+
+      private
+      def maker_target(target)
+        target.__send__(self.class.name.split(/::/).last.downcase) {|x| x}
+      end
+
+      def setup_maker_attributes(target)
+        target.type = type
+        target.content = content
+        target.xml_content = @xhtml
+      end
+    end
+
+    module PersonConstruct
+      def self.append_features(klass)
+        super
+        klass.class_eval do
+          [
+           ["name", nil],
+           ["uri", "?"],
+           ["email", "?"],
+          ].each do |tag, occurs|
+            install_have_attribute_element(tag, URI, occurs, nil, :content)
+          end
+        end
+      end
+
+      def maker_target(target)
+        target.__send__("new_#{self.class.name.split(/::/).last.downcase}")
+      end
+
+      class Name < RSS::Element
+        include CommonModel
+        include ContentModel
+      end
+
+      class Uri < RSS::Element
+        include CommonModel
+        include URIContentModel
+      end
+
+      class Email < RSS::Element
+        include CommonModel
+        include ContentModel
+      end
+    end
+
+    module DateConstruct
+      def self.append_features(klass)
+        super
+        klass.class_eval do
+          @content_type = :w3cdtf
+          include(ContentModel)
+        end
+      end
+
+      def atom_validate(ignore_unknown_element, tags, uri)
+        raise NotAvailableValueError.new(tag_name, "") if content.nil?
+      end
+    end
+
+    module DuplicateLinkChecker
+      def validate_duplicate_links(links)
+        link_infos = {}
+        links.each do |link|
+          rel = link.rel || "alternate"
+          next unless rel == "alternate"
+          key = [link.hreflang, link.type]
+          if link_infos.has_key?(key)
+            raise TooMuchTagError.new("link", tag_name)
+          end
+          link_infos[key] = true
+        end
+      end
+    end
+
+    class Feed < RSS::Element
+      include RootElementMixin
+      include CommonModel
+      include DuplicateLinkChecker
+
+      install_ns('', URI)
+
+      [
+       ["author", "*", :children],
+       ["category", "*", :children, "categories"],
+       ["contributor", "*", :children],
+       ["generator", "?"],
+       ["icon", "?", nil, :content],
+       ["id", nil, nil, :content],
+       ["link", "*", :children],
+       ["logo", "?"],
+       ["rights", "?"],
+       ["subtitle", "?", nil, :content],
+       ["title", nil, nil, :content],
+       ["updated", nil, nil, :content],
+       ["entry", "*", :children, "entries"],
+      ].each do |tag, occurs, type, *args|
+        type ||= :child
+        __send__("install_have_#{type}_element",
+                 tag, URI, occurs, tag, *args)
+      end
+
+      def initialize(version=nil, encoding=nil, standalone=nil)
+        super("1.0", version, encoding, standalone)
+        @feed_type = "atom"
+        @feed_subtype = "feed"
+      end
+
+      alias_method :items, :entries
+
+      def have_author?
+        authors.any? {|author| !author.to_s.empty?} or
+          entries.any? {|entry| entry.have_author?(false)}
+      end
+
+      private
+      def atom_validate(ignore_unknown_element, tags, uri)
+        unless have_author?
+          raise MissingTagError.new("author", tag_name)
+        end
+        validate_duplicate_links(links)
+      end
+
+      def have_required_elements?
+        super and have_author?
+      end
+
+      def maker_target(maker)
+        maker.channel
+      end
+
+      def setup_maker_element(channel)
+        prev_dc_dates = channel.dc_dates.to_a.dup
+        super
+        channel.about = id.content if id
+        channel.dc_dates.replace(prev_dc_dates)
+      end
+
+      def setup_maker_elements(channel)
+        super
+        items = channel.maker.items
+        entries.each do |entry|
+          entry.setup_maker(items)
+        end
+      end
+
+      class Author < RSS::Element
+        include CommonModel
+        include PersonConstruct
+      end
+
+      class Category < RSS::Element
+        include CommonModel
+
+        [
+         ["term", "", true],
+         ["scheme", "", false, [nil, :uri]],
+         ["label", ""],
+        ].each do |name, uri, required, type|
+          install_get_attribute(name, uri, required, type)
+        end
+
+        private
+        def maker_target(target)
+          target.new_category
+        end
+      end
+
+      class Contributor < RSS::Element
+        include CommonModel
+        include PersonConstruct
+      end
+
+      class Generator < RSS::Element
+        include CommonModel
+        include ContentModel
+
+        [
+         ["uri", "", false, [nil, :uri]],
+         ["version", ""],
+        ].each do |name, uri, required, type|
+          install_get_attribute(name, uri, required, type)
+        end
+
+        private
+        def setup_maker_attributes(target)
+          target.generator do |generator|
+            generator.uri = uri if uri
+            generator.version = version if version
+          end
+        end
+      end
+
+      class Icon < RSS::Element
+        include CommonModel
+        include URIContentModel
+      end
+
+      class Id < RSS::Element
+        include CommonModel
+        include URIContentModel
+      end
+
+      class Link < RSS::Element
+        include CommonModel
+
+        [
+         ["href", "", true, [nil, :uri]],
+         ["rel", ""],
+         ["type", ""],
+         ["hreflang", ""],
+         ["title", ""],
+         ["length", ""],
+        ].each do |name, uri, required, type|
+          install_get_attribute(name, uri, required, type)
+        end
+
+        private
+        def maker_target(target)
+          target.new_link
+        end
+      end
+
+      class Logo < RSS::Element
+        include CommonModel
+        include URIContentModel
+
+        def maker_target(target)
+          target.maker.image
+        end
+
+        private
+        def setup_maker_element_writer
+          "url="
+        end
+      end
+
+      class Rights < RSS::Element
+        include CommonModel
+        include TextConstruct
+      end
+
+      class Subtitle < RSS::Element
+        include CommonModel
+        include TextConstruct
+      end
+
+      class Title < RSS::Element
+        include CommonModel
+        include TextConstruct
+      end
+
+      class Updated < RSS::Element
+        include CommonModel
+        include DateConstruct
+      end
+
+      class Entry < RSS::Element
+        include CommonModel
+        include DuplicateLinkChecker
+
+        [
+         ["author", "*", :children],
+         ["category", "*", :children, "categories"],
+         ["content", "?", :child],
+         ["contributor", "*", :children],
+         ["id", nil, nil, :content],
+         ["link", "*", :children],
+         ["published", "?", :child, :content],
+         ["rights", "?", :child],
+         ["source", "?"],
+         ["summary", "?", :child],
+         ["title", nil],
+         ["updated", nil, :child, :content],
+        ].each do |tag, occurs, type, *args|
+          type ||= :attribute
+          __send__("install_have_#{type}_element",
+                   tag, URI, occurs, tag, *args)
+        end
+
+        def have_author?(check_parent=true)
+          authors.any? {|author| !author.to_s.empty?} or
+            (check_parent and @parent and @parent.have_author?) or
+            (source and source.have_author?)
+        end
+
+        private
+        def atom_validate(ignore_unknown_element, tags, uri)
+          unless have_author?
+            raise MissingTagError.new("author", tag_name)
+          end
+          validate_duplicate_links(links)
+        end
+
+        def have_required_elements?
+          super and have_author?
+        end
+
+        def maker_target(items)
+          if items.respond_to?("items")
+            # For backward compatibility
+            items = items.items
+          end
+          items.new_item
+        end
+
+        Author = Feed::Author
+        Category = Feed::Category
+
+        class Content < RSS::Element
+          include CommonModel
+
+          class << self
+            def xml_setter
+              "xml="
+            end
+
+            def xml_getter
+              "xml"
+            end
+          end
+
+          [
+           ["type", ""],
+           ["src", "", false, [nil, :uri]],
+          ].each do |name, uri, required, type|
+            install_get_attribute(name, uri, required, type)
+          end
+
+          content_setup
+          add_need_initialize_variable("xml")
+
+          attr_writer :xml
+          def have_xml_content?
+            inline_xhtml? or inline_other_xml?
+          end
+
+          def xml
+            return @xml unless inline_xhtml?
+            return @xml if @xml.nil?
+            if @xml.is_a?(XML::Element) and
+                [@xml.name, @xml.uri] == ["div", XHTML_URI]
+              return @xml
+            end
+
+            children = @xml
+            children = [children] unless children.is_a?(Array)
+            XML::Element.new("div", nil, XHTML_URI,
+                             {"xmlns" => XHTML_URI}, children)
+          end
+
+          def xhtml
+            if inline_xhtml?
+              xml
+            else
+              nil
+            end
+          end
+
+          def atom_validate(ignore_unknown_element, tags, uri)
+            if out_of_line?
+              raise MissingAttributeError.new(tag_name, "type") if @type.nil?
+              unless (content.nil? or content.empty?)
+                raise NotAvailableValueError.new(tag_name, content)
+              end
+            elsif inline_xhtml?
+              if @xml.nil?
+                raise MissingTagError.new("div", tag_name)
+              end
+              unless @xml.name == "div" and @xml.uri == XHTML_URI
+                raise NotExpectedTagError.new(@xml.name, @xml.uri, tag_name)
+              end
+            end
+          end
+
+          def inline_text?
+            !out_of_line? and [nil, "text", "html"].include?(@type)
+          end
+
+          def inline_html?
+            return false if out_of_line?
+            @type == "html" or mime_split == ["text", "html"]
+          end
+
+          def inline_xhtml?
+            !out_of_line? and @type == "xhtml"
+          end
+
+          def inline_other?
+            return false if out_of_line?
+            media_type, subtype = mime_split
+            return false if media_type.nil? or subtype.nil?
+            true
+          end
+
+          def inline_other_text?
+            return false unless inline_other?
+            return false if inline_other_xml?
+
+            media_type, subtype = mime_split
+            return true if "text" == media_type.downcase
+            false
+          end
+
+          def inline_other_xml?
+            return false unless inline_other?
+
+            media_type, subtype = mime_split
+            normalized_mime_type = "#{media_type}/#{subtype}".downcase
+            if /(?:\+xml|^xml)$/ =~ subtype or
+                %w(text/xml-external-parsed-entity
+                   application/xml-external-parsed-entity
+                   application/xml-dtd).find {|x| x == normalized_mime_type}
+              return true
+            end
+            false
+          end
+
+          def inline_other_base64?
+            inline_other? and !inline_other_text? and !inline_other_xml?
+          end
+
+          def out_of_line?
+            not @src.nil?
+          end
+
+          def mime_split
+            media_type = subtype = nil
+            if /\A\s*([a-z]+)\/([a-z\+]+)\s*(?:;.*)?\z/i =~ @type.to_s
+              media_type = $1.downcase
+              subtype = $2.downcase
+            end
+            [media_type, subtype]
+          end
+
+          def need_base64_encode?
+            inline_other_base64?
+          end
+
+          private
+          def empty_content?
+            out_of_line? or super
+          end
+        end
+
+        Contributor = Feed::Contributor
+        Id = Feed::Id
+        Link = Feed::Link
+
+        class Published < RSS::Element
+          include CommonModel
+          include DateConstruct
+        end
+
+        Rights = Feed::Rights
+
+        class Source < RSS::Element
+          include CommonModel
+
+          [
+           ["author", "*", :children],
+           ["category", "*", :children, "categories"],
+           ["contributor", "*", :children],
+           ["generator", "?"],
+           ["icon", "?"],
+           ["id", "?", nil, :content],
+           ["link", "*", :children],
+           ["logo", "?"],
+           ["rights", "?"],
+           ["subtitle", "?"],
+           ["title", "?"],
+           ["updated", "?", nil, :content],
+          ].each do |tag, occurs, type, *args|
+            type ||= :attribute
+            __send__("install_have_#{type}_element",
+                     tag, URI, occurs, tag, *args)
+          end
+
+          def have_author?
+            !author.to_s.empty?
+          end
+
+          Author = Feed::Author
+          Category = Feed::Category
+          Contributor = Feed::Contributor
+          Generator = Feed::Generator
+          Icon = Feed::Icon
+          Id = Feed::Id
+          Link = Feed::Link
+          Logo = Feed::Logo
+          Rights = Feed::Rights
+          Subtitle = Feed::Subtitle
+          Title = Feed::Title
+          Updated = Feed::Updated
+        end
+
+        class Summary < RSS::Element
+          include CommonModel
+          include TextConstruct
+        end
+
+        Title = Feed::Title
+        Updated = Feed::Updated
+      end
+    end
+
+    class Entry < RSS::Element
+      include RootElementMixin
+      include CommonModel
+      include DuplicateLinkChecker
+
+      [
+       ["author", "*", :children],
+       ["category", "*", :children, "categories"],
+       ["content", "?"],
+       ["contributor", "*", :children],
+       ["id", nil, nil, :content],
+       ["link", "*", :children],
+       ["published", "?", :child, :content],
+       ["rights", "?"],
+       ["source", "?"],
+       ["summary", "?"],
+       ["title", nil],
+       ["updated", nil, nil, :content],
+      ].each do |tag, occurs, type, *args|
+        type ||= :attribute
+        __send__("install_have_#{type}_element",
+                 tag, URI, occurs, tag, *args)
+      end
+
+      def initialize(version=nil, encoding=nil, standalone=nil)
+        super("1.0", version, encoding, standalone)
+        @feed_type = "atom"
+        @feed_subtype = "entry"
+      end
+
+      def items
+        [self]
+      end
+
+      def setup_maker(maker)
+        maker = maker.maker if maker.respond_to?("maker")
+        super(maker)
+      end
+
+      def have_author?
+        authors.any? {|author| !author.to_s.empty?} or
+          (source and source.have_author?)
+      end
+
+      private
+      def atom_validate(ignore_unknown_element, tags, uri)
+        unless have_author?
+          raise MissingTagError.new("author", tag_name)
+        end
+        validate_duplicate_links(links)
+      end
+
+      def have_required_elements?
+        super and have_author?
+      end
+
+      def maker_target(maker)
+        maker.items.new_item
+      end
+
+      Author = Feed::Entry::Author
+      Category = Feed::Entry::Category
+      Content = Feed::Entry::Content
+      Contributor = Feed::Entry::Contributor
+      Id = Feed::Entry::Id
+      Link = Feed::Entry::Link
+      Published = Feed::Entry::Published
+      Rights = Feed::Entry::Rights
+      Source = Feed::Entry::Source
+      Summary = Feed::Entry::Summary
+      Title = Feed::Entry::Title
+      Updated = Feed::Entry::Updated
+    end
+  end
+
+  Atom::CommonModel::ELEMENTS.each do |name|
+    BaseListener.install_get_text_element(Atom::URI, name, "#{name}=")
+  end
+
+  module ListenerMixin
+    private
+    def initial_start_feed(tag_name, prefix, attrs, ns)
+      check_ns(tag_name, prefix, ns, Atom::URI, false)
+
+      @rss = Atom::Feed.new(@version, @encoding, @standalone)
+      @rss.do_validate = @do_validate
+      @rss.xml_stylesheets = @xml_stylesheets
+      @rss.lang = attrs["xml:lang"]
+      @rss.base = attrs["xml:base"]
+      @last_element = @rss
+      pr = Proc.new do |text, tags|
+        @rss.validate_for_stream(tags) if @do_validate
+      end
+      @proc_stack.push(pr)
+    end
+
+    def initial_start_entry(tag_name, prefix, attrs, ns)
+      check_ns(tag_name, prefix, ns, Atom::URI, false)
+
+      @rss = Atom::Entry.new(@version, @encoding, @standalone)
+      @rss.do_validate = @do_validate
+      @rss.xml_stylesheets = @xml_stylesheets
+      @rss.lang = attrs["xml:lang"]
+      @rss.base = attrs["xml:base"]
+      @last_element = @rss
+      pr = Proc.new do |text, tags|
+        @rss.validate_for_stream(tags) if @do_validate
+      end
+      @proc_stack.push(pr)
+    end
+  end
+end
diff --git a/lib/rss/content.rb b/lib/rss/content.rb
index 1b13f39fcf..b12ee918aa 100644
--- a/lib/rss/content.rb
+++ b/lib/rss/content.rb
@@ -1,38 +1,31 @@
-require "rss/1.0"
+require "rss/rss"
 
 module RSS
-
   CONTENT_PREFIX = 'content'
   CONTENT_URI = "http://purl.org/rss/1.0/modules/content/"
 
-  RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)
-
   module ContentModel
-
     extend BaseModel
 
-    ELEMENTS = []
+    ELEMENTS = ["#{CONTENT_PREFIX}_encoded"]
 
     def self.append_features(klass)
       super
 
       klass.install_must_call_validator(CONTENT_PREFIX, CONTENT_URI)
-      %w(encoded).each do |name|
-        klass.install_text_element(name, CONTENT_URI, "?",
-                                   "#{CONTENT_PREFIX}_#{name}")
+      ELEMENTS.each do |full_name|
+        name = full_name[(CONTENT_PREFIX.size + 1)..-1]
+        klass.install_text_element(name, CONTENT_URI, "?", full_name)
       end
     end
   end
 
-  class RDF
-    class Item; include ContentModel; end
-  end
-
   prefix_size = CONTENT_PREFIX.size + 1
-  ContentModel::ELEMENTS.uniq!
   ContentModel::ELEMENTS.each do |full_name|
     name = full_name[prefix_size..-1]
-    BaseListener.install_get_text_element(CONTENT_URI, name, "#{full_name}=")
+    BaseListener.install_get_text_element(CONTENT_URI, name, full_name)
   end
-
 end
+
+require 'rss/content/1.0'
+require 'rss/content/2.0'
diff --git a/lib/rss/content/1.0.rb b/lib/rss/content/1.0.rb
new file mode 100644
index 0000000000..e5dc857930
--- /dev/null
+++ b/lib/rss/content/1.0.rb
@@ -0,0 +1,9 @@
+require 'rss/1.0'
+
+module RSS
+  RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)
+
+  class RDF
+    class Item; include ContentModel; end
+  end
+end
diff --git a/lib/rss/content/2.0.rb b/lib/rss/content/2.0.rb
new file mode 100644
index 0000000000..8491a99937
--- /dev/null
+++ b/lib/rss/content/2.0.rb
@@ -0,0 +1,11 @@
+require "rss/2.0"
+
+module RSS
+  Rss.install_ns(CONTENT_PREFIX, CONTENT_URI)
+
+  class Rss
+    class Channel
+      class Item; include ContentModel; end
+    end
+  end
+end
diff --git a/lib/rss/converter.rb b/lib/rss/converter.rb
index d928c48223..3e79eba4fb 100644
--- a/lib/rss/converter.rb
+++ b/lib/rss/converter.rb
@@ -3,10 +3,14 @@ require "rss/utils"
 module RSS
 
   class Converter
-    
+
     include Utils
 
     def initialize(to_enc, from_enc=nil)
+      if "".respond_to?(:encode)
+        @to_encoding = to_enc
+        return
+      end
       normalized_to_enc = to_enc.downcase.gsub(/-/, '_')
       from_enc ||= 'utf-8'
       normalized_from_enc = from_enc.downcase.gsub(/-/, '_')
@@ -23,7 +27,11 @@ module RSS
     end
 
     def convert(value)
-      value
+      if value.is_a?(String) and value.respond_to?(:encode)
+        value.encode(@to_encoding)
+      else
+        value
+      end
     end
 
     def def_convert(depth=0)
@@ -55,11 +63,11 @@ module RSS
         raise UnknownConversionMethodError.new(to_enc, from_enc)
       end
     end
-    
+
     def def_else_enc(to_enc, from_enc)
       def_iconv_convert(to_enc, from_enc, 0)
     end
-    
+
     def def_same_enc()
       def_convert do |value|
         value
@@ -80,8 +88,12 @@ module RSS
         end
       rescue LoadError
         require 'nkf'
-        def_convert(1) do |value|
-          "NKF.nkf(#{nkf_arg.dump}, #{value})"
+        if NKF.const_defined?(:UTF8)
+          def_convert(1) do |value|
+            "NKF.nkf(#{nkf_arg.dump}, #{value})"
+          end
+        else
+          def_iconv_convert(to_enc, from_enc, 1)
         end
       end
     end
@@ -89,40 +101,40 @@ module RSS
     def def_to_euc_jp_from_utf_8
       def_uconv_convert_if_can('u8toeuc', 'EUC-JP', 'UTF-8', '-We')
     end
-    
+
     def def_to_utf_8_from_euc_jp
       def_uconv_convert_if_can('euctou8', 'UTF-8', 'EUC-JP', '-Ew')
     end
-    
+
     def def_to_shift_jis_from_utf_8
       def_uconv_convert_if_can('u8tosjis', 'Shift_JIS', 'UTF-8', '-Ws')
     end
-    
+
     def def_to_utf_8_from_shift_jis
       def_uconv_convert_if_can('sjistou8', 'UTF-8', 'Shift_JIS', '-Sw')
     end
-    
+
     def def_to_euc_jp_from_shift_jis
       require "nkf"
       def_convert do |value|
         "NKF.nkf('-Se', #{value})"
       end
     end
-    
+
     def def_to_shift_jis_from_euc_jp
       require "nkf"
       def_convert do |value|
         "NKF.nkf('-Es', #{value})"
       end
     end
-    
+
     def def_to_euc_jp_from_iso_2022_jp
       require "nkf"
       def_convert do |value|
         "NKF.nkf('-Je', #{value})"
       end
     end
-    
+
     def def_to_iso_2022_jp_from_euc_jp
       require "nkf"
       def_convert do |value|
@@ -135,7 +147,7 @@ module RSS
         "#{value}.unpack('C*').pack('U*')"
       end
     end
-    
+
     def def_to_iso_8859_1_from_utf_8
       def_convert do |value|
         <<-EOC
@@ -152,7 +164,7 @@ module RSS
         EOC
       end
     end
-    
+
   end
-  
+
 end
diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb
index 8a4afd4dd9..53a4ca70d6 100644
--- a/lib/rss/dublincore.rb
+++ b/lib/rss/dublincore.rb
@@ -1,11 +1,8 @@
-require "rss/1.0"
+require "rss/rss"
 
 module RSS
-
   DC_PREFIX = 'dc'
   DC_URI = "http://purl.org/dc/elements/1.1/"
-  
-  RDF.install_ns(DC_PREFIX, DC_URI)
 
   module BaseDublinCoreModel
     def append_features(klass)
@@ -28,7 +25,7 @@ module RSS
           def #{full_name}
             @#{full_name}.first and @#{full_name}.first.value
           end
-          
+
           def #{full_name}=(new_value)
             @#{full_name}[0] = Utils.new_with_value_if_need(#{klass_name}, new_value)
           end
@@ -36,12 +33,24 @@ module RSS
         EOC
       end
       klass.module_eval(<<-EOC, *get_file_and_line_from_caller(0))
-        alias date #{DC_PREFIX}_date
-        alias date= #{DC_PREFIX}_date=
+        if method_defined?(:date)
+          alias date_without_#{DC_PREFIX}_date= date=
+
+          def date=(value)
+            self.date_without_#{DC_PREFIX}_date = value
+            self.#{DC_PREFIX}_date = value
+          end
+        else
+          alias date #{DC_PREFIX}_date
+          alias date= #{DC_PREFIX}_date=
+        end
+
+        # For backward compatibility
+        alias #{DC_PREFIX}_rightses #{DC_PREFIX}_rights_list
       EOC
     end
   end
-  
+
   module DublinCoreModel
 
     extend BaseModel
@@ -61,32 +70,32 @@ module RSS
       "language" => nil,
       "relation" => nil,
       "coverage" => nil,
-      "rights" => "rightses" # FIXME
+      "rights" => "rights_list"
     }
 
     DATE_ELEMENTS = {
       "date" => "w3cdtf",
     }
-    
+
     ELEMENT_NAME_INFOS = DublinCoreModel::TEXT_ELEMENTS.to_a
     DublinCoreModel::DATE_ELEMENTS.each do |name, |
       ELEMENT_NAME_INFOS << [name, nil]
     end
-    
+
     ELEMENTS = TEXT_ELEMENTS.keys + DATE_ELEMENTS.keys
 
     ELEMENTS.each do |name, plural_name|
       module_eval(<<-EOC, *get_file_and_line_from_caller(0))
         class DublinCore#{Utils.to_class_name(name)} < Element
           include RSS10
-          
+
           content_setup
 
           class << self
             def required_prefix
               DC_PREFIX
             end
-        
+
             def required_uri
               DC_URI
             end
@@ -96,7 +105,7 @@ module RSS
 
           alias_method(:value, :content)
           alias_method(:value=, :content=)
-          
+
           def initialize(*args)
             if Utils.element_initialize_arguments?(args)
               super
@@ -105,7 +114,7 @@ module RSS
               self.content = args[0]
             end
           end
-      
+
           def full_name
             tag_name_with_prefix(DC_PREFIX)
           end
@@ -122,13 +131,14 @@ module RSS
     end
 
     DATE_ELEMENTS.each do |name, type|
+      tag_name = "#{DC_PREFIX}:#{name}"
       module_eval(<<-EOC, *get_file_and_line_from_caller(0))
         class DublinCore#{Utils.to_class_name(name)} < Element
           remove_method(:content=)
           remove_method(:value=)
 
-          date_writer("content", #{type.dump}, #{name.dump})
-          
+          date_writer("content", #{type.dump}, #{tag_name.dump})
+
           alias_method(:value=, :content=)
         end
       EOC
@@ -138,13 +148,6 @@ module RSS
   # For backward compatibility
   DublincoreModel = DublinCoreModel
 
-  class RDF
-    class Channel; include DublinCoreModel; end
-    class Image; include DublinCoreModel; end
-    class Item; include DublinCoreModel; end
-    class Textinput; include DublinCoreModel; end
-  end
-
   DublinCoreModel::ELEMENTS.each do |name|
     class_name = Utils.to_class_name(name)
     BaseListener.install_class_name(DC_URI, name, "DublinCore#{class_name}")
@@ -152,3 +155,7 @@ module RSS
 
   DublinCoreModel::ELEMENTS.collect! {|name| "#{DC_PREFIX}_#{name}"}
 end
+
+require 'rss/dublincore/1.0'
+require 'rss/dublincore/2.0'
+require 'rss/dublincore/atom'
diff --git a/lib/rss/dublincore/1.0.rb b/lib/rss/dublincore/1.0.rb
new file mode 100644
index 0000000000..efe2f5dad4
--- /dev/null
+++ b/lib/rss/dublincore/1.0.rb
@@ -0,0 +1,12 @@
+require "rss/1.0"
+
+module RSS
+  RDF.install_ns(DC_PREFIX, DC_URI)
+
+  class RDF
+    class Channel; include DublinCoreModel; end
+    class Image; include DublinCoreModel; end
+    class Item; include DublinCoreModel; end
+    class Textinput; include DublinCoreModel; end
+  end
+end
diff --git a/lib/rss/dublincore/2.0.rb b/lib/rss/dublincore/2.0.rb
new file mode 100644
index 0000000000..a79c1e84a4
--- /dev/null
+++ b/lib/rss/dublincore/2.0.rb
@@ -0,0 +1,12 @@
+require "rss/2.0"
+
+module RSS
+  Rss.install_ns(DC_PREFIX, DC_URI)
+
+  class Rss
+    class Channel
+      include DublinCoreModel
+      class Item; include DublinCoreModel; end
+    end
+  end
+end
diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb
new file mode 100644
index 0000000000..8db9066bb8
--- /dev/null
+++ b/lib/rss/dublincore/atom.rb
@@ -0,0 +1,16 @@
+require "rss/atom"
+
+module RSS
+  module Atom
+    Feed.install_ns(DC_PREFIX, DC_URI)
+
+    class Feed
+      include DublinCoreModel
+      class Entry; include DublinCoreModel; end
+    end
+
+    class Entry
+      include DublinCoreModel
+    end
+  end
+end
diff --git a/lib/rss/image.rb b/lib/rss/image.rb
index a9e9e9094e..e79e9f5e65 100644
--- a/lib/rss/image.rb
+++ b/lib/rss/image.rb
@@ -4,7 +4,7 @@ require 'rss/dublincore'
 module RSS
 
   IMAGE_PREFIX = 'image'
-  IMAGE_URI = 'http://web.resource.org/rss/1.0/modules/image/'
+  IMAGE_URI = 'http://purl.org/rss/1.0/modules/image/'
 
   RDF.install_ns(IMAGE_PREFIX, IMAGE_URI)
 
@@ -15,7 +15,7 @@ module RSS
     BaseListener.install_class_name(IMAGE_URI, name, "Image#{class_name}")
     IMAGE_ELEMENTS << "#{IMAGE_PREFIX}_#{name}"
   end
-  
+
   module ImageModelUtils
     def validate_one_tag_name(ignore_unknown_element, name, tags)
       if !ignore_unknown_element
@@ -25,7 +25,7 @@ module RSS
       raise TooMuchTagError.new(name, tag_name) if tags.size > 1
     end
   end
-  
+
   module ImageItemModel
     include ImageModelUtils
     extend BaseModel
@@ -43,12 +43,12 @@ module RSS
       include DublinCoreModel
 
       @tag_name = "item"
-      
+
       class << self
         def required_prefix
           IMAGE_PREFIX
         end
-        
+
         def required_uri
           IMAGE_URI
         end
@@ -69,7 +69,7 @@ module RSS
         disp_name = "#{IMAGE_PREFIX}:#{tag}"
         install_text_element(tag, IMAGE_URI, "?",
                              full_name, :integer, disp_name)
-        BaseListener.install_get_text_element(IMAGE_URI, tag, "#{full_name}=")
+        BaseListener.install_get_text_element(IMAGE_URI, tag, full_name)
       end
 
       alias width= image_width=
@@ -102,11 +102,11 @@ module RSS
       end
     end
   end
-  
+
   module ImageFaviconModel
     include ImageModelUtils
     extend BaseModel
-    
+
     def self.append_features(klass)
       super
 
@@ -122,12 +122,12 @@ module RSS
       include DublinCoreModel
 
       @tag_name = "favicon"
-      
+
       class << self
         def required_prefix
           IMAGE_PREFIX
         end
-        
+
         def required_uri
           IMAGE_URI
         end
@@ -142,8 +142,8 @@ module RSS
       end
 
       AVAILABLE_SIZES = %w(small medium large)
-      alias_method :_size=, :size=
-      private :_size=
+      alias_method :set_size, :size=
+      private :set_size
       def size=(new_value)
         if @do_validate and !new_value.nil?
           new_value = new_value.strip
@@ -152,9 +152,9 @@ module RSS
             raise NotAvailableValueError.new(full_name, new_value, attr_name)
           end
         end
-        __send__(:_size=, new_value)
+        set_size(new_value)
       end
-      
+
       alias image_size= size=
       alias image_size size
 
diff --git a/lib/rss/itunes.rb b/lib/rss/itunes.rb
new file mode 100644
index 0000000000..f95ca7aa2e
--- /dev/null
+++ b/lib/rss/itunes.rb
@@ -0,0 +1,410 @@
+require 'rss/2.0'
+
+module RSS
+  ITUNES_PREFIX = 'itunes'
+  ITUNES_URI = 'http://www.itunes.com/dtds/podcast-1.0.dtd'
+
+  Rss.install_ns(ITUNES_PREFIX, ITUNES_URI)
+
+  module ITunesModelUtils
+    include Utils
+
+    def def_class_accessor(klass, name, type, *args)
+        normalized_name = name.gsub(/-/, "_")
+      full_name = "#{ITUNES_PREFIX}_#{normalized_name}"
+      klass_name = "ITunes#{Utils.to_class_name(normalized_name)}"
+
+      case type
+      when :element, :attribute
+        klass::ELEMENTS << full_name
+        def_element_class_accessor(klass, name, full_name, klass_name, *args)
+      when :elements
+        klass::ELEMENTS << full_name
+        def_elements_class_accessor(klass, name, full_name, klass_name, *args)
+      else
+        klass.install_must_call_validator(ITUNES_PREFIX, ITUNES_URI)
+        klass.install_text_element(normalized_name, ITUNES_URI, "?",
+                                   full_name, type, name)
+      end
+    end
+
+    def def_element_class_accessor(klass, name, full_name, klass_name,
+                                   recommended_attribute_name=nil)
+      klass.install_have_child_element(name, ITUNES_PREFIX, "?", full_name)
+    end
+
+    def def_elements_class_accessor(klass, name, full_name, klass_name,
+                                    plural_name, recommended_attribute_name=nil)
+      full_plural_name = "#{ITUNES_PREFIX}_#{plural_name}"
+      klass.install_have_children_element(name, ITUNES_PREFIX, "*",
+                                          full_name, full_plural_name)
+    end
+  end
+
+  module ITunesBaseModel
+    extend ITunesModelUtils
+
+    ELEMENTS = []
+
+    ELEMENT_INFOS = [["author"],
+                     ["block", :yes_other],
+                     ["explicit", :yes_clean_other],
+                     ["keywords", :csv],
+                     ["subtitle"],
+                     ["summary"]]
+  end
+
+  module ITunesChannelModel
+    extend BaseModel
+    extend ITunesModelUtils
+    include ITunesBaseModel
+
+    ELEMENTS = []
+
+    class << self
+      def append_features(klass)
+        super
+
+        return if klass.instance_of?(Module)
+        ELEMENT_INFOS.each do |name, type, *additional_infos|
+          def_class_accessor(klass, name, type, *additional_infos)
+        end
+      end
+    end
+
+    ELEMENT_INFOS = [
+                     ["category", :elements, "categories", "text"],
+                     ["image", :attribute, "href"],
+                     ["owner", :element],
+                     ["new-feed-url"],
+                    ] + ITunesBaseModel::ELEMENT_INFOS
+
+    class ITunesCategory < Element
+      include RSS09
+
+      @tag_name = "category"
+
+      class << self
+        def required_prefix
+          ITUNES_PREFIX
+        end
+
+        def required_uri
+          ITUNES_URI
+        end
+      end
+
+      [
+        ["text", "", true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required)
+      end
+
+      ITunesCategory = self
+      install_have_children_element("category", ITUNES_URI, "*",
+                                    "#{ITUNES_PREFIX}_category",
+                                    "#{ITUNES_PREFIX}_categories")
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.text = args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(ITUNES_PREFIX)
+      end
+
+      private
+      def maker_target(categories)
+        if text or !itunes_categories.empty?
+          categories.new_category
+        else
+          nil
+        end
+      end
+
+      def setup_maker_attributes(category)
+        category.text = text if text
+      end
+
+      def setup_maker_elements(category)
+        super(category)
+        itunes_categories.each do |sub_category|
+          sub_category.setup_maker(category)
+        end
+      end
+    end
+
+    class ITunesImage < Element
+      include RSS09
+
+      @tag_name = "image"
+
+      class << self
+        def required_prefix
+          ITUNES_PREFIX
+        end
+
+        def required_uri
+          ITUNES_URI
+        end
+      end
+
+      [
+        ["href", "", true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required)
+      end
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.href = args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(ITUNES_PREFIX)
+      end
+
+      private
+      def maker_target(target)
+        if href
+          target.itunes_image {|image| image}
+        else
+          nil
+        end
+      end
+
+      def setup_maker_attributes(image)
+        image.href = href
+      end
+    end
+
+    class ITunesOwner < Element
+      include RSS09
+
+      @tag_name = "owner"
+
+      class << self
+        def required_prefix
+          ITUNES_PREFIX
+        end
+
+        def required_uri
+          ITUNES_URI
+        end
+      end
+
+      install_must_call_validator(ITUNES_PREFIX, ITUNES_URI)
+      [
+        ["name"],
+        ["email"],
+      ].each do |name,|
+        ITunesBaseModel::ELEMENT_INFOS << name
+        install_text_element(name, ITUNES_URI, nil, "#{ITUNES_PREFIX}_#{name}")
+      end
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.itunes_name = args[0]
+          self.itunes_email = args[1]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(ITUNES_PREFIX)
+      end
+
+      private
+      def maker_target(target)
+        target.itunes_owner
+      end
+
+      def setup_maker_element(owner)
+        super(owner)
+        owner.itunes_name = itunes_name
+        owner.itunes_email = itunes_email
+      end
+    end
+  end
+
+  module ITunesItemModel
+    extend BaseModel
+    extend ITunesModelUtils
+    include ITunesBaseModel
+
+    class << self
+      def append_features(klass)
+        super
+
+        return if klass.instance_of?(Module)
+        ELEMENT_INFOS.each do |name, type|
+          def_class_accessor(klass, name, type)
+        end
+      end
+    end
+
+    ELEMENT_INFOS = ITunesBaseModel::ELEMENT_INFOS +
+      [["duration", :element, "content"]]
+
+    class ITunesDuration < Element
+      include RSS09
+
+      @tag_name = "duration"
+
+      class << self
+        def required_prefix
+          ITUNES_PREFIX
+        end
+
+        def required_uri
+          ITUNES_URI
+        end
+
+        def parse(duration, do_validate=true)
+          if do_validate and /\A(?:
+                                  \d?\d:[0-5]\d:[0-5]\d|
+                                  [0-5]?\d:[0-5]\d
+                                )\z/x !~ duration
+            raise ArgumentError,
+                    "must be one of HH:MM:SS, H:MM:SS, MM::SS, M:SS: " +
+                    duration.inspect
+          end
+
+          components = duration.split(':')
+          components[3..-1] = nil if components.size > 3
+
+          components.unshift("00") until components.size == 3
+
+          components.collect do |component|
+            component.to_i
+          end
+        end
+
+        def construct(hour, minute, second)
+          components = [minute, second]
+          if components.include?(nil)
+            nil
+          else
+            components.unshift(hour) if hour and hour > 0
+            components.collect do |component|
+              "%02d" % component
+            end.join(":")
+          end
+        end
+      end
+
+      content_setup
+      alias_method(:value, :content)
+      remove_method(:content=)
+
+      attr_reader :hour, :minute, :second
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          args = args[0] if args.size == 1 and args[0].is_a?(Array)
+          if args.size == 1
+            self.content = args[0]
+          elsif args.size > 3
+            raise ArgumentError,
+                    "must be (do_validate, params), (content), " +
+                    "(minute, second), ([minute, second]), "  +
+                    "(hour, minute, second) or ([hour, minute, second]): " +
+                    args.inspect
+          else
+            @second, @minute, @hour = args.reverse
+            update_content
+          end
+        end
+      end
+
+      def content=(value)
+        if value.nil?
+          @content = nil
+        elsif value.is_a?(self.class)
+          self.content = value.content
+        else
+          begin
+            @hour, @minute, @second = self.class.parse(value, @do_validate)
+          rescue ArgumentError
+            raise NotAvailableValueError.new(tag_name, value)
+          end
+          @content = value
+        end
+      end
+      alias_method(:value=, :content=)
+
+      def hour=(hour)
+        @hour = @do_validate ? Integer(hour) : hour.to_i
+        update_content
+        hour
+      end
+
+      def minute=(minute)
+        @minute = @do_validate ? Integer(minute) : minute.to_i
+        update_content
+        minute
+      end
+
+      def second=(second)
+        @second = @do_validate ? Integer(second) : second.to_i
+        update_content
+        second
+      end
+
+      def full_name
+        tag_name_with_prefix(ITUNES_PREFIX)
+      end
+
+      private
+      def update_content
+        @content = self.class.construct(hour, minute, second)
+      end
+
+      def maker_target(target)
+        if @content
+          target.itunes_duration {|duration| duration}
+        else
+          nil
+        end
+      end
+
+      def setup_maker_element(duration)
+        super(duration)
+        duration.content = @content
+      end
+    end
+  end
+
+  class Rss
+    class Channel
+      include ITunesChannelModel
+      class Item; include ITunesItemModel; end
+    end
+  end
+
+  element_infos =
+    ITunesChannelModel::ELEMENT_INFOS + ITunesItemModel::ELEMENT_INFOS
+  element_infos.each do |name, type|
+    case type
+    when :element, :elements, :attribute
+      class_name = Utils.to_class_name(name)
+      BaseListener.install_class_name(ITUNES_URI, name, "ITunes#{class_name}")
+    else
+      accessor_base = "#{ITUNES_PREFIX}_#{name.gsub(/-/, '_')}"
+      BaseListener.install_get_text_element(ITUNES_URI, name, accessor_base)
+    end
+  end
+end
diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb
index 9ed799ac7f..a7ee200b32 100644
--- a/lib/rss/maker.rb
+++ b/lib/rss/maker.rb
@@ -1,37 +1,54 @@
 require "rss/rss"
 
 module RSS
-
   module Maker
-
     MAKERS = {}
-    
+
     class << self
       def make(version, &block)
-        maker(version).make(&block)
+        self[version].make(&block)
       end
 
-      def maker(version)
-        MAKERS[version]
+      def [](version)
+        maker_info = maker(version)
+        raise UnsupportedMakerVersionError.new(version) if maker_info.nil?
+        maker_info[:maker]
+      end
+
+      def add_maker(version, normalized_version, maker)
+        MAKERS[version] = {:maker => maker, :version => normalized_version}
       end
 
-      def add_maker(version, maker)
-        MAKERS[version] = maker
+      def versions
+        MAKERS.keys.uniq.sort
       end
 
-      def filename_to_version(filename)
-        File.basename(filename, ".*")
+      def makers
+        MAKERS.values.collect {|info| info[:maker]}.uniq
+      end
+
+      def supported?(version)
+        versions.include?(version)
+      end
+
+      private
+      # Can I remove this method?
+      def maker(version)
+        MAKERS[version]
       end
     end
   end
-  
 end
 
 require "rss/maker/1.0"
 require "rss/maker/2.0"
+require "rss/maker/feed"
+require "rss/maker/entry"
 require "rss/maker/content"
 require "rss/maker/dublincore"
+require "rss/maker/slash"
 require "rss/maker/syndication"
 require "rss/maker/taxonomy"
 require "rss/maker/trackback"
 require "rss/maker/image"
+require "rss/maker/itunes"
diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb
index b82585fb96..aede4d7c20 100644
--- a/lib/rss/maker/0.9.rb
+++ b/lib/rss/maker/0.9.rb
@@ -4,16 +4,17 @@ require "rss/maker/base"
 
 module RSS
   module Maker
-    
+
     class RSS09 < RSSBase
-      
-      def initialize(rss_version="0.91")
+
+      def initialize(feed_version)
         super
+        @feed_type = "rss"
       end
-      
+
       private
-      def make_rss
-        Rss.new(@rss_version, @version, @encoding, @standalone)
+      def make_feed
+        Rss.new(@feed_version, @version, @encoding, @standalone)
       end
 
       def setup_elements(rss)
@@ -21,204 +22,487 @@ module RSS
       end
 
       class Channel < ChannelBase
-        
-        def to_rss(rss)
+        def to_feed(rss)
           channel = Rss::Channel.new
           set = setup_values(channel)
-          if set
+          _not_set_required_variables = not_set_required_variables
+          if _not_set_required_variables.empty?
             rss.channel = channel
+            set_parent(channel, rss)
             setup_items(rss)
             setup_image(rss)
             setup_textinput(rss)
-            setup_other_elements(rss)
-            if rss.channel.image
-              rss
-            else
-              nil
-            end
-          elsif variable_is_set?
-            raise NotSetError.new("maker.channel", not_set_required_variables)
+            setup_other_elements(rss, channel)
+            rss
+          else
+            raise NotSetError.new("maker.channel", _not_set_required_variables)
           end
         end
-        
-        def have_required_values?
-          @title and @link and @description and @language
-        end
-        
+
         private
         def setup_items(rss)
-          @maker.items.to_rss(rss)
+          @maker.items.to_feed(rss)
         end
-        
+
         def setup_image(rss)
-          @maker.image.to_rss(rss)
+          @maker.image.to_feed(rss)
         end
-        
+
         def setup_textinput(rss)
-          @maker.textinput.to_rss(rss)
+          @maker.textinput.to_feed(rss)
         end
-        
+
         def variables
           super + ["pubDate"]
         end
 
         def required_variable_names
-          %w(title link description language)
+          %w(link language)
+        end
+
+        def not_set_required_variables
+          vars = super
+          vars << "description" unless description {|d| d.have_required_values?}
+          vars << "title" unless title {|t| t.have_required_values?}
+          vars
         end
-        
+
         class SkipDays < SkipDaysBase
-          def to_rss(rss, channel)
+          def to_feed(rss, channel)
             unless @days.empty?
               skipDays = Rss::Channel::SkipDays.new
               channel.skipDays = skipDays
+              set_parent(skipDays, channel)
               @days.each do |day|
-                day.to_rss(rss, skipDays.days)
+                day.to_feed(rss, skipDays.days)
               end
             end
           end
-          
+
           class Day < DayBase
-            def to_rss(rss, days)
+            def to_feed(rss, days)
               day = Rss::Channel::SkipDays::Day.new
               set = setup_values(day)
               if set
                 days << day
-                setup_other_elements(rss)
+                set_parent(day, days)
+                setup_other_elements(rss, day)
               end
             end
 
-            def have_required_values?
-              @content
+            private
+            def required_variable_names
+              %w(content)
             end
           end
         end
-        
+
         class SkipHours < SkipHoursBase
-          def to_rss(rss, channel)
+          def to_feed(rss, channel)
             unless @hours.empty?
               skipHours = Rss::Channel::SkipHours.new
               channel.skipHours = skipHours
+              set_parent(skipHours, channel)
               @hours.each do |hour|
-                hour.to_rss(rss, skipHours.hours)
+                hour.to_feed(rss, skipHours.hours)
               end
             end
           end
-          
+
           class Hour < HourBase
-            def to_rss(rss, hours)
+            def to_feed(rss, hours)
               hour = Rss::Channel::SkipHours::Hour.new
               set = setup_values(hour)
               if set
                 hours << hour
-                setup_other_elements(rss)
+                set_parent(hour, hours)
+                setup_other_elements(rss, hour)
               end
             end
 
-            def have_required_values?
-              @content
+            private
+            def required_variable_names
+              %w(content)
             end
           end
         end
-        
+
         class Cloud < CloudBase
-          def to_rss(*args)
+          def to_feed(*args)
           end
         end
 
         class Categories < CategoriesBase
-          def to_rss(*args)
+          def to_feed(*args)
           end
 
           class Category < CategoryBase
           end
         end
+
+        class Links < LinksBase
+          def to_feed(rss, channel)
+            return if @links.empty?
+            @links.first.to_feed(rss, channel)
+          end
+
+          class Link < LinkBase
+            def to_feed(rss, channel)
+              if have_required_values?
+                channel.link = href
+              else
+                raise NotSetError.new("maker.channel.link",
+                                      not_set_required_variables)
+              end
+            end
+
+            private
+            def required_variable_names
+              %w(href)
+            end
+          end
+        end
+
+        class Authors < AuthorsBase
+          def to_feed(rss, channel)
+          end
+
+          class Author < AuthorBase
+            def to_feed(rss, channel)
+            end
+          end
+        end
+
+        class Contributors < ContributorsBase
+          def to_feed(rss, channel)
+          end
+
+          class Contributor < ContributorBase
+          end
+        end
+
+        class Generator < GeneratorBase
+          def to_feed(rss, channel)
+          end
+        end
+
+        class Copyright < CopyrightBase
+          def to_feed(rss, channel)
+            channel.copyright = content if have_required_values?
+          end
+
+          private
+          def required_variable_names
+            %w(content)
+          end
+        end
+
+        class Description < DescriptionBase
+          def to_feed(rss, channel)
+            channel.description = content if have_required_values?
+          end
+
+          private
+          def required_variable_names
+            %w(content)
+          end
+        end
+
+        class Title < TitleBase
+          def to_feed(rss, channel)
+            channel.title = content if have_required_values?
+          end
+
+          private
+          def required_variable_names
+            %w(content)
+          end
+        end
       end
-      
+
       class Image < ImageBase
-        def to_rss(rss)
+        def to_feed(rss)
           image = Rss::Channel::Image.new
           set = setup_values(image)
           if set
             image.link = link
             rss.channel.image = image
-            setup_other_elements(rss)
+            set_parent(image, rss.channel)
+            setup_other_elements(rss, image)
+          elsif required_element?
+            raise NotSetError.new("maker.image", not_set_required_variables)
           end
         end
-        
-        def have_required_values?
-          @url and @title and link
+
+        private
+        def required_variable_names
+          %w(url title link)
+        end
+
+        def required_element?
+          true
         end
       end
-      
+
       class Items < ItemsBase
-        def to_rss(rss)
+        def to_feed(rss)
           if rss.channel
             normalize.each do |item|
-              item.to_rss(rss)
+              item.to_feed(rss)
             end
-            setup_other_elements(rss)
+            setup_other_elements(rss, rss.items)
           end
         end
-        
+
         class Item < ItemBase
-          def to_rss(rss)
+          def to_feed(rss)
             item = Rss::Channel::Item.new
             set = setup_values(item)
-            if set
+            _not_set_required_variables = not_set_required_variables
+            if _not_set_required_variables.empty?
               rss.items << item
-              setup_other_elements(rss)
+              set_parent(item, rss.channel)
+              setup_other_elements(rss, item)
+            elsif variable_is_set?
+              raise NotSetError.new("maker.items", _not_set_required_variables)
             end
           end
-          
+
           private
-          def have_required_values?
-            @title and @link
+          def required_variable_names
+            []
+          end
+
+          def not_set_required_variables
+            vars = super
+            if @maker.feed_version == "0.91"
+              vars << "title" unless title {|t| t.have_required_values?}
+              vars << "link" unless link {|l| l.have_required_values?}
+            end
+            vars
           end
 
           class Guid < GuidBase
-            def to_rss(*args)
+            def to_feed(*args)
             end
           end
-        
+
           class Enclosure < EnclosureBase
-            def to_rss(*args)
+            def to_feed(*args)
             end
           end
-        
+
           class Source < SourceBase
-            def to_rss(*args)
+            def to_feed(*args)
+            end
+
+            class Authors < AuthorsBase
+              def to_feed(*args)
+              end
+
+              class Author < AuthorBase
+              end
+            end
+
+            class Categories < CategoriesBase
+              def to_feed(*args)
+              end
+
+              class Category < CategoryBase
+              end
+            end
+
+            class Contributors < ContributorsBase
+              def to_feed(*args)
+              end
+
+              class Contributor < ContributorBase
+              end
+            end
+
+            class Generator < GeneratorBase
+              def to_feed(*args)
+              end
+            end
+
+            class Icon < IconBase
+              def to_feed(*args)
+              end
+            end
+
+            class Links < LinksBase
+              def to_feed(*args)
+              end
+
+              class Link < LinkBase
+              end
+            end
+
+            class Logo < LogoBase
+              def to_feed(*args)
+              end
+            end
+
+            class Rights < RightsBase
+              def to_feed(*args)
+              end
+            end
+
+            class Subtitle < SubtitleBase
+              def to_feed(*args)
+              end
+            end
+
+            class Title < TitleBase
+              def to_feed(*args)
+              end
             end
           end
-        
+
           class Categories < CategoriesBase
-            def to_rss(*args)
+            def to_feed(*args)
             end
 
             class Category < CategoryBase
             end
           end
-          
+
+          class Authors < AuthorsBase
+            def to_feed(*args)
+            end
+
+            class Author < AuthorBase
+            end
+          end
+
+          class Links < LinksBase
+            def to_feed(rss, item)
+              return if @links.empty?
+              @links.first.to_feed(rss, item)
+            end
+
+            class Link < LinkBase
+              def to_feed(rss, item)
+                if have_required_values?
+                  item.link = href
+                else
+                  raise NotSetError.new("maker.link",
+                                        not_set_required_variables)
+                end
+              end
+
+              private
+              def required_variable_names
+                %w(href)
+              end
+            end
+          end
+
+          class Contributors < ContributorsBase
+            def to_feed(rss, item)
+            end
+
+            class Contributor < ContributorBase
+            end
+          end
+
+          class Rights < RightsBase
+            def to_feed(rss, item)
+            end
+          end
+
+          class Description < DescriptionBase
+            def to_feed(rss, item)
+              item.description = content if have_required_values?
+            end
+
+            private
+            def required_variable_names
+              %w(content)
+            end
+          end
+
+          class Content < ContentBase
+            def to_feed(rss, item)
+            end
+          end
+
+          class Title < TitleBase
+            def to_feed(rss, item)
+              item.title = content if have_required_values?
+            end
+
+            private
+            def required_variable_names
+              %w(content)
+            end
+          end
         end
       end
-      
+
       class Textinput < TextinputBase
-        def to_rss(rss)
+        def to_feed(rss)
           textInput = Rss::Channel::TextInput.new
           set = setup_values(textInput)
           if set
             rss.channel.textInput = textInput
-            setup_other_elements(rss)
+            set_parent(textInput, rss.channel)
+            setup_other_elements(rss, textInput)
           end
         end
 
         private
-        def have_required_values?
-          @title and @description and @name and @link
+        def required_variable_names
+          %w(title description name link)
         end
       end
     end
-    
-    add_maker(filename_to_version(__FILE__), RSS09)
-    add_maker(filename_to_version(__FILE__) + "1", RSS09)
+
+    class RSS091 < RSS09
+      def initialize(feed_version="0.91")
+        super
+      end
+
+      class Channel < RSS09::Channel
+      end
+
+      class Items < RSS09::Items
+        class Item < RSS09::Items::Item
+        end
+      end
+
+      class Image < RSS09::Image
+      end
+
+      class Textinput < RSS09::Textinput
+      end
+    end
+
+    class RSS092 < RSS09
+      def initialize(feed_version="0.92")
+        super
+      end
+
+      class Channel < RSS09::Channel
+      end
+
+      class Items < RSS09::Items
+        class Item < RSS09::Items::Item
+        end
+      end
+
+      class Image < RSS09::Image
+      end
+
+      class Textinput < RSS09::Textinput
+      end
+    end
+
+    add_maker("0.9", "0.92", RSS092)
+    add_maker("0.91", "0.91", RSS091)
+    add_maker("0.92", "0.92", RSS092)
+    add_maker("rss0.9", "0.92", RSS092)
+    add_maker("rss0.91", "0.91", RSS091)
+    add_maker("rss0.92", "0.92", RSS092)
   end
 end
diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb
index 3e6542a007..0d8075f836 100644
--- a/lib/rss/maker/1.0.rb
+++ b/lib/rss/maker/1.0.rb
@@ -7,12 +7,13 @@ module RSS
 
     class RSS10 < RSSBase
 
-      def initialize
-        super("1.0")
+      def initialize(feed_version="1.0")
+        super
+        @feed_type = "rss"
       end
 
       private
-      def make_rss
+      def make_feed
         RDF.new(@version, @encoding, @standalone)
       end
 
@@ -24,44 +25,48 @@ module RSS
       end
 
       class Channel < ChannelBase
+        include SetupDefaultLanguage
 
-        def to_rss(rss)
-          set = false
-          if @about
-            channel = RDF::Channel.new(@about)
-            set = setup_values(channel)
-            if set
+        def to_feed(rss)
+          set_default_values do
+            _not_set_required_variables = not_set_required_variables
+            if _not_set_required_variables.empty?
+              channel = RDF::Channel.new(@about)
+              set = setup_values(channel)
               channel.dc_dates.clear
               rss.channel = channel
+              set_parent(channel, rss)
               setup_items(rss)
               setup_image(rss)
               setup_textinput(rss)
-              setup_other_elements(rss)
+              setup_other_elements(rss, channel)
+            else
+              raise NotSetError.new("maker.channel", _not_set_required_variables)
             end
           end
-
-          if (!@about or !set) and variable_is_set?
-            raise NotSetError.new("maker.channel", not_set_required_variables)
-          end
-        end
-
-        def have_required_values?
-          @about and @title and @link and @description
         end
 
         private
         def setup_items(rss)
           items = RDF::Channel::Items.new
           seq = items.Seq
-          @maker.items.normalize.each do |item|
-            seq.lis << RDF::Channel::Items::Seq::Li.new(item.link)
+          set_parent(items, seq)
+          target_items = @maker.items.normalize
+          raise NotSetError.new("maker", ["items"]) if target_items.empty?
+          target_items.each do |item|
+            li = RDF::Channel::Items::Seq::Li.new(item.link)
+            seq.lis << li
+            set_parent(li, seq)
           end
           rss.channel.items = items
+          set_parent(rss.channel, items)
         end
-        
+
         def setup_image(rss)
           if @maker.image.have_required_values?
-            rss.channel.image = RDF::Channel::Image.new(@maker.image.url)
+            image = RDF::Channel::Image.new(@maker.image.url)
+            rss.channel.image = image
+            set_parent(image, rss.channel)
           end
         end
 
@@ -69,136 +74,362 @@ module RSS
           if @maker.textinput.have_required_values?
             textinput = RDF::Channel::Textinput.new(@maker.textinput.link)
             rss.channel.textinput = textinput
+            set_parent(textinput, rss.channel)
           end
         end
 
         def required_variable_names
-          %w(about title link description)
+          %w(about link)
+        end
+
+        def not_set_required_variables
+          vars = super
+          vars << "description" unless description {|d| d.have_required_values?}
+          vars << "title" unless title {|t| t.have_required_values?}
+          vars
         end
-        
+
         class SkipDays < SkipDaysBase
-          def to_rss(*args)
+          def to_feed(*args)
           end
-          
+
           class Day < DayBase
           end
         end
-        
+
         class SkipHours < SkipHoursBase
-          def to_rss(*args)
+          def to_feed(*args)
           end
 
           class Hour < HourBase
           end
         end
-        
+
         class Cloud < CloudBase
-          def to_rss(*args)
+          def to_feed(*args)
           end
         end
 
         class Categories < CategoriesBase
-          def to_rss(*args)
+          def to_feed(*args)
           end
 
           class Category < CategoryBase
           end
         end
+
+        class Links < LinksBase
+          def to_feed(rss, channel)
+            return if @links.empty?
+            @links.first.to_feed(rss, channel)
+          end
+
+          class Link < LinkBase
+            def to_feed(rss, channel)
+              if have_required_values?
+                channel.link = href
+              else
+                raise NotSetError.new("maker.channel.link",
+                                      not_set_required_variables)
+              end
+            end
+
+            private
+            def required_variable_names
+              %w(href)
+            end
+          end
+        end
+
+        class Authors < AuthorsBase
+          def to_feed(rss, channel)
+          end
+
+          class Author < AuthorBase
+            def to_feed(rss, channel)
+            end
+          end
+        end
+
+        class Contributors < ContributorsBase
+          def to_feed(rss, channel)
+          end
+
+          class Contributor < ContributorBase
+          end
+        end
+
+        class Generator < GeneratorBase
+          def to_feed(rss, channel)
+          end
+        end
+
+        class Copyright < CopyrightBase
+          def to_feed(rss, channel)
+          end
+        end
+
+        class Description < DescriptionBase
+          def to_feed(rss, channel)
+            channel.description = content if have_required_values?
+          end
+
+          private
+          def required_variable_names
+            %w(content)
+          end
+        end
+
+        class Title < TitleBase
+          def to_feed(rss, channel)
+            channel.title = content if have_required_values?
+          end
+
+          private
+          def required_variable_names
+            %w(content)
+          end
+        end
       end
 
       class Image < ImageBase
-        def to_rss(rss)
+        def to_feed(rss)
           if @url
             image = RDF::Image.new(@url)
             set = setup_values(image)
             if set
               rss.image = image
-              setup_other_elements(rss)
+              set_parent(image, rss)
+              setup_other_elements(rss, image)
             end
           end
         end
 
         def have_required_values?
-          @url and @title and link and @maker.channel.have_required_values?
+          super and @maker.channel.have_required_values?
         end
 
         private
         def variables
           super + ["link"]
         end
+
+        def required_variable_names
+          %w(url title link)
+        end
       end
 
       class Items < ItemsBase
-        def to_rss(rss)
+        def to_feed(rss)
           if rss.channel
             normalize.each do |item|
-              item.to_rss(rss)
+              item.to_feed(rss)
             end
-            setup_other_elements(rss)
+            setup_other_elements(rss, rss.items)
           end
         end
 
         class Item < ItemBase
-          def to_rss(rss)
-            if @link
-              item = RDF::Item.new(@link)
+          def to_feed(rss)
+            set_default_values do
+              item = RDF::Item.new(link)
               set = setup_values(item)
               if set
                 item.dc_dates.clear
                 rss.items << item
-                setup_other_elements(rss)
+                set_parent(item, rss)
+                setup_other_elements(rss, item)
+              elsif !have_required_values?
+                raise NotSetError.new("maker.item", not_set_required_variables)
               end
             end
           end
 
-          def have_required_values?
-            @title and @link
+          private
+          def required_variable_names
+            %w(link)
+          end
+
+          def variables
+            super + %w(link)
+          end
+
+          def not_set_required_variables
+            set_default_values do
+              vars = super
+              vars << "title" unless title {|t| t.have_required_values?}
+              vars
+            end
           end
 
           class Guid < GuidBase
-            def to_rss(*args)
+            def to_feed(*args)
             end
           end
-        
+
           class Enclosure < EnclosureBase
-            def to_rss(*args)
+            def to_feed(*args)
             end
           end
-        
+
           class Source < SourceBase
-            def to_rss(*args)
+            def to_feed(*args)
+            end
+
+            class Authors < AuthorsBase
+              def to_feed(*args)
+              end
+
+              class Author < AuthorBase
+              end
+            end
+
+            class Categories < CategoriesBase
+              def to_feed(*args)
+              end
+
+              class Category < CategoryBase
+              end
+            end
+
+            class Contributors < ContributorsBase
+              def to_feed(*args)
+              end
+
+              class Contributor < ContributorBase
+              end
+            end
+
+            class Generator < GeneratorBase
+              def to_feed(*args)
+              end
+            end
+
+            class Icon < IconBase
+              def to_feed(*args)
+              end
+            end
+
+            class Links < LinksBase
+              def to_feed(*args)
+              end
+
+              class Link < LinkBase
+              end
+            end
+
+            class Logo < LogoBase
+              def to_feed(*args)
+              end
+            end
+
+            class Rights < RightsBase
+              def to_feed(*args)
+              end
+            end
+
+            class Subtitle < SubtitleBase
+              def to_feed(*args)
+              end
+            end
+
+            class Title < TitleBase
+              def to_feed(*args)
+              end
             end
           end
-        
+
           class Categories < CategoriesBase
-            def to_rss(*args)
+            def to_feed(*args)
             end
 
             class Category < CategoryBase
             end
           end
+
+          class Authors < AuthorsBase
+            def to_feed(*args)
+            end
+
+            class Author < AuthorBase
+            end
+          end
+
+          class Links < LinksBase
+            def to_feed(*args)
+            end
+
+            class Link < LinkBase
+            end
+          end
+
+          class Contributors < ContributorsBase
+            def to_feed(rss, item)
+            end
+
+            class Contributor < ContributorBase
+            end
+          end
+
+          class Rights < RightsBase
+            def to_feed(rss, item)
+            end
+          end
+
+          class Description < DescriptionBase
+            def to_feed(rss, item)
+              item.description = content if have_required_values?
+            end
+
+            private
+            def required_variable_names
+              %w(content)
+            end
+          end
+
+          class Content < ContentBase
+            def to_feed(rss, item)
+            end
+          end
+
+          class Title < TitleBase
+            def to_feed(rss, item)
+              item.title = content if have_required_values?
+            end
+
+            private
+            def required_variable_names
+              %w(content)
+            end
+          end
         end
       end
-      
+
       class Textinput < TextinputBase
-        def to_rss(rss)
+        def to_feed(rss)
           if @link
             textinput = RDF::Textinput.new(@link)
             set = setup_values(textinput)
             if set
               rss.textinput = textinput
-              setup_other_elements(rss)
+              set_parent(textinput, rss)
+              setup_other_elements(rss, textinput)
             end
           end
         end
 
         def have_required_values?
-          @title and @description and @name and @link and
-            @maker.channel.have_required_values?
+          super and @maker.channel.have_required_values?
+        end
+
+        private
+        def required_variable_names
+          %w(title description name link)
         end
       end
     end
 
-    add_maker(filename_to_version(__FILE__), RSS10)
+    add_maker("1.0", "1.0", RSS10)
+    add_maker("rss1.0", "1.0", RSS10)
   end
 end
diff --git a/lib/rss/maker/2.0.rb b/lib/rss/maker/2.0.rb
index a958661614..15b1349c2a 100644
--- a/lib/rss/maker/2.0.rb
+++ b/lib/rss/maker/2.0.rb
@@ -4,165 +4,220 @@ require "rss/maker/0.9"
 
 module RSS
   module Maker
-    
+
     class RSS20 < RSS09
-      
-      def initialize(rss_version="2.0")
+
+      def initialize(feed_version="2.0")
         super
       end
 
       class Channel < RSS09::Channel
 
-        def have_required_values?
-          @title and @link and @description
-        end
-
+        private
         def required_variable_names
-          %w(title link description)
+          %w(link)
         end
-        
+
         class SkipDays < RSS09::Channel::SkipDays
           class Day < RSS09::Channel::SkipDays::Day
           end
         end
-        
+
         class SkipHours < RSS09::Channel::SkipHours
           class Hour < RSS09::Channel::SkipHours::Hour
           end
         end
-        
+
         class Cloud < RSS09::Channel::Cloud
-          def to_rss(rss, channel)
+          def to_feed(rss, channel)
             cloud = Rss::Channel::Cloud.new
             set = setup_values(cloud)
             if set
               channel.cloud = cloud
-              setup_other_elements(rss)
+              set_parent(cloud, channel)
+              setup_other_elements(rss, cloud)
             end
           end
 
-          def have_required_values?
-            @domain and @port and @path and
-              @registerProcedure and @protocol
+          private
+          def required_variable_names
+            %w(domain port path registerProcedure protocol)
           end
         end
 
         class Categories < RSS09::Channel::Categories
-          def to_rss(rss, channel)
+          def to_feed(rss, channel)
             @categories.each do |category|
-              category.to_rss(rss, channel)
+              category.to_feed(rss, channel)
             end
           end
-          
+
           class Category < RSS09::Channel::Categories::Category
-            def to_rss(rss, channel)
+            def to_feed(rss, channel)
               category = Rss::Channel::Category.new
               set = setup_values(category)
               if set
                 channel.categories << category
-                setup_other_elements(rss)
+                set_parent(category, channel)
+                setup_other_elements(rss, category)
               end
             end
-            
-            def have_required_values?
-              @content
+
+            private
+            def required_variable_names
+              %w(content)
             end
           end
         end
-        
+
+        class Generator < GeneratorBase
+          def to_feed(rss, channel)
+            channel.generator = content
+          end
+
+          private
+          def required_variable_names
+            %w(content)
+          end
+        end
       end
-      
+
       class Image < RSS09::Image
+        private
+        def required_element?
+          false
+        end
       end
-      
+
       class Items < RSS09::Items
-        
         class Item < RSS09::Items::Item
+          private
+          def required_variable_names
+            []
+          end
 
-          def have_required_values?
-            @title or @description
+          def not_set_required_variables
+            vars = super
+            if !title {|t| t.have_required_values?} and
+                !description {|d| d.have_required_values?}
+              vars << "title or description"
+            end
+            vars
           end
 
-          private
           def variables
             super + ["pubDate"]
           end
 
           class Guid < RSS09::Items::Item::Guid
-            def to_rss(rss, item)
+            def to_feed(rss, item)
               guid = Rss::Channel::Item::Guid.new
               set = setup_values(guid)
               if set
                 item.guid = guid
-                setup_other_elements(rss)
+                set_parent(guid, item)
+                setup_other_elements(rss, guid)
               end
             end
-            
-            def have_required_values?
-              @content
+
+            private
+            def required_variable_names
+              %w(content)
             end
           end
 
           class Enclosure < RSS09::Items::Item::Enclosure
-            def to_rss(rss, item)
+            def to_feed(rss, item)
               enclosure = Rss::Channel::Item::Enclosure.new
               set = setup_values(enclosure)
               if set
                 item.enclosure = enclosure
-                setup_other_elements(rss)
+                set_parent(enclosure, item)
+                setup_other_elements(rss, enclosure)
               end
             end
-            
-            def have_required_values?
-              @url and @length and @type
+
+            private
+            def required_variable_names
+              %w(url length type)
             end
           end
 
           class Source < RSS09::Items::Item::Source
-            def to_rss(rss, item)
+            def to_feed(rss, item)
               source = Rss::Channel::Item::Source.new
               set = setup_values(source)
               if set
                 item.source = source
-                setup_other_elements(rss)
+                set_parent(source, item)
+                setup_other_elements(rss, source)
               end
             end
-            
-            def have_required_values?
-              @url and @content
+
+            private
+            def required_variable_names
+              %w(url content)
+            end
+
+            class Links < RSS09::Items::Item::Source::Links
+              def to_feed(rss, source)
+                return if @links.empty?
+                @links.first.to_feed(rss, source)
+              end
+
+              class Link < RSS09::Items::Item::Source::Links::Link
+                def to_feed(rss, source)
+                  source.url = href
+                end
+              end
             end
           end
 
           class Categories < RSS09::Items::Item::Categories
-            def to_rss(rss, item)
+            def to_feed(rss, item)
               @categories.each do |category|
-                category.to_rss(rss, item)
+                category.to_feed(rss, item)
               end
             end
-          
+
             class Category < RSS09::Items::Item::Categories::Category
-              def to_rss(rss, item)
+              def to_feed(rss, item)
                 category = Rss::Channel::Item::Category.new
                 set = setup_values(category)
                 if set
                   item.categories << category
+                  set_parent(category, item)
                   setup_other_elements(rss)
                 end
               end
-              
-              def have_required_values?
-                @content
+
+              private
+              def required_variable_names
+                %w(content)
+              end
+            end
+          end
+
+          class Authors < RSS09::Items::Item::Authors
+            def to_feed(rss, item)
+              return if @authors.empty?
+              @authors.first.to_feed(rss, item)
+            end
+
+            class Author < RSS09::Items::Item::Authors::Author
+              def to_feed(rss, item)
+                item.author = name
               end
             end
           end
         end
-        
       end
-      
+
       class Textinput < RSS09::Textinput
       end
     end
-    
-    add_maker(filename_to_version(__FILE__), RSS20)
+
+    add_maker("2.0", "2.0", RSS20)
+    add_maker("rss2.0", "2.0", RSS20)
   end
 end
diff --git a/lib/rss/maker/atom.rb b/lib/rss/maker/atom.rb
new file mode 100644
index 0000000000..fd3198cd9e
--- /dev/null
+++ b/lib/rss/maker/atom.rb
@@ -0,0 +1,172 @@
+require "rss/atom"
+
+require "rss/maker/base"
+
+module RSS
+  module Maker
+    module AtomPersons
+      module_function
+      def def_atom_persons(klass, name, maker_name, plural=nil)
+        plural ||= "#{name}s"
+        klass_name = Utils.to_class_name(name)
+        plural_klass_name = Utils.to_class_name(plural)
+
+        klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1)
+          class #{plural_klass_name} < #{plural_klass_name}Base
+            class #{klass_name} < #{klass_name}Base
+              def to_feed(feed, current)
+                #{name} = feed.class::#{klass_name}.new
+                set = setup_values(#{name})
+                unless set
+                  raise NotSetError.new(#{maker_name.dump},
+                                        not_set_required_variables)
+                end
+                current.#{plural} << #{name}
+                set_parent(#{name}, current)
+                setup_other_elements(#{name})
+              end
+
+              private
+              def required_variable_names
+                %w(name)
+              end
+            end
+          end
+EOC
+      end
+    end
+
+    module AtomTextConstruct
+      class << self
+        def def_atom_text_construct(klass, name, maker_name, klass_name=nil,
+                                    atom_klass_name=nil)
+          klass_name ||= Utils.to_class_name(name)
+          atom_klass_name ||= Utils.to_class_name(name)
+
+          klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1)
+            class #{klass_name} < #{klass_name}Base
+              include #{self.name}
+              def to_feed(feed, current)
+                #{name} = current.class::#{atom_klass_name}.new
+                if setup_values(#{name})
+                  current.#{name} = #{name}
+                  set_parent(#{name}, current)
+                  setup_other_elements(feed)
+                elsif variable_is_set?
+                  raise NotSetError.new(#{maker_name.dump},
+                                        not_set_required_variables)
+                end
+              end
+            end
+          EOC
+        end
+      end
+
+      private
+      def required_variable_names
+        if type == "xhtml"
+          %w(xml_content)
+        else
+          %w(content)
+        end
+      end
+
+      def variables
+        if type == "xhtml"
+          super + %w(xhtml)
+        else
+          super
+        end
+      end
+    end
+
+    module AtomCategory
+      def to_feed(feed, current)
+        category = feed.class::Category.new
+        set = setup_values(category)
+        if set
+          current.categories << category
+          set_parent(category, current)
+          setup_other_elements(feed)
+        else
+          raise NotSetError.new(self.class.not_set_name,
+                                not_set_required_variables)
+        end
+      end
+
+      private
+      def required_variable_names
+        %w(term)
+      end
+
+      def variables
+        super + ["term", "scheme"]
+      end
+    end
+
+    module AtomLink
+      def to_feed(feed, current)
+        link = feed.class::Link.new
+        set = setup_values(link)
+        if set
+          current.links << link
+          set_parent(link, current)
+          setup_other_elements(feed)
+        else
+          raise NotSetError.new(self.class.not_set_name,
+                                not_set_required_variables)
+        end
+      end
+
+      private
+      def required_variable_names
+        %w(href)
+      end
+    end
+
+    module AtomGenerator
+      def to_feed(feed, current)
+        generator = current.class::Generator.new
+        if setup_values(generator)
+          current.generator = generator
+          set_parent(generator, current)
+          setup_other_elements(feed)
+        elsif variable_is_set?
+          raise NotSetError.new(self.class.not_set_name,
+                                not_set_required_variables)
+        end
+      end
+
+      private
+      def required_variable_names
+        %w(content)
+      end
+    end
+
+    module AtomLogo
+      def to_feed(feed, current)
+        logo = current.class::Logo.new
+        class << logo
+          alias_method(:uri=, :content=)
+        end
+        set = setup_values(logo)
+        class << logo
+          remove_method(:uri=)
+        end
+        if set
+          current.logo = logo
+          set_parent(logo, current)
+          setup_other_elements(feed)
+        elsif variable_is_set?
+          raise NotSetError.new(self.class.not_set_name,
+                                not_set_required_variables)
+        end
+      end
+
+      private
+      def required_variable_names
+        %w(uri)
+      end
+    end
+  end
+end
diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb
index 2327dd98e4..88ea831164 100644
author	Takashi Kokubun <takashikkbn@gmail.com>	2020-02-28 23:58:33 -0800
committer	NARUSE, Yui <naruse@airemix.jp>	2020-03-15 19:35:24 +0900
commit	a36ead3f4fe801ddaebe6d1ed905e9e3276dbac7 (patch)
tree	53de69643c057929db9305329fa16989b96c9ded /test/ruby/test_rubyoptions.rb
parent	17e925b9917f4877f2da8c64316feb3ce1ca2932 (diff)